diff --git a/linux-5.10/rk3568_patch/kernel.patch b/linux-5.10/rk3568_patch/kernel.patch old mode 100644 new mode 100755 index 5d56e35b97fcd7e4e955494b601eb274495c78e7..2ff0568a511b78936e4cca7c3ae7e69e324a856e --- a/linux-5.10/rk3568_patch/kernel.patch +++ b/linux-5.10/rk3568_patch/kernel.patch @@ -1,5262 +1,5 @@ -From 2805888b31e0179a6c108d1c425cc81c24badb1e Mon Sep 17 00:00:00 2001 -From: zhujiaxin -Date: Mon, 27 Nov 2023 11:56:20 +0800 -Subject: [PATCH] update rk3568 patch - -Signed-off-by: zhujiaxin ---- - .../bindings/devfreq/event/rockchip-dfi.txt | 18 +- - .../bindings/display/bridge/analogix_dp.txt | 6 + - .../bindings/iio/adc/rockchip-saradc.yaml | 1 + - .../bindings/iommu/rockchip,iommu.txt | 4 + - .../mtd/rockchip,nand-controller.yaml | 161 + - .../bindings/nvmem/rockchip-efuse.yaml | 3 + - .../bindings/nvmem/rockchip-otp.txt | 2 + - .../bindings/phy/phy-rockchip-typec.txt | 35 + - .../bindings/power/rockchip-io-domain.txt | 26 +- - .../bindings/soc/rockchip/power_domain.txt | 3 + - .../devicetree/bindings/sound/rt5651.txt | 2 + - .../devicetree/bindings/spi/spi-rockchip.yaml | 1 + - .../bindings/thermal/rockchip-thermal.txt | 1 + - arch/arm/boot/dts/rk3036.dtsi | 13 +- - arch/arm/boot/dts/rk3066a-rayeager.dts | 14 + - arch/arm/boot/dts/rk3066a.dtsi | 8 +- - arch/arm/boot/dts/rk3188.dtsi | 8 +- - arch/arm/boot/dts/rk322x.dtsi | 8 +- - arch/arm/boot/dts/rk3288.dtsi | 8 +- - arch/arm/boot/dts/rv1108.dtsi | 16 +- - arch/arm/kernel/psci_smp.c | 3 +- - arch/arm/kernel/reboot.c | 7 +- - arch/arm64/Kconfig.platforms | 3 - - arch/arm64/Makefile | 13 + - arch/arm64/boot/dts/rockchip/Makefile | 40 + - .../boot/dts/rockchip/px30-ad-d6-anx6345.dts | 759 + - .../px30-ad-r35-mb-rk618-dual-lvds.dts | 147 + - .../px30-ad-r35-mb-rk618-hdmi-lvds.dts | 241 + - .../rockchip/px30-ad-r35-mb-rk618-hdmi.dts | 105 + - .../rockchip/px30-ad-r35-mb-rk618-lvds.dts | 146 + - .../boot/dts/rockchip/px30-ad-r35-mb.dtsi | 823 + - .../arm64/boot/dts/rockchip/px30-android.dtsi | 131 + - .../dts/rockchip/px30-ddr4p416dd6-timing.dtsi | 216 + - .../rockchip/px30-dram-default-timing.dtsi | 294 + - .../dts/rockchip/px30-evb-ddr3-lvds-v10.dts | 689 + - .../dts/rockchip/px30-evb-ddr3-v10-avb.dts | 109 + - .../dts/rockchip/px30-evb-ddr3-v10-linux.dts | 939 + - .../px30-evb-ddr3-v10-robot-linux.dts | 627 + - .../px30-evb-ddr3-v10-robot-no-gpu-linux.dts | 627 + - .../boot/dts/rockchip/px30-evb-ddr3-v10.dts | 127 + - .../boot/dts/rockchip/px30-evb-ddr3-v10.dtsi | 815 + - .../dts/rockchip/px30-evb-ddr3-v11-avb.dts | 276 + - .../dts/rockchip/px30-evb-ddr3-v11-linux.dts | 296 + - .../boot/dts/rockchip/px30-evb-ddr3-v11.dts | 293 + - .../boot/dts/rockchip/px30-evb-ddr4-v10.dts | 853 + - .../dts/rockchip/px30-evb-ext-rk618-avb.dts | 11 + - .../boot/dts/rockchip/px30-evb-ext-rk618.dts | 33 + - .../boot/dts/rockchip/px30-evb-ext-rk618.dtsi | 202 + - .../boot/dts/rockchip/px30-robot-no-gpu.dtsi | 57 + - arch/arm64/boot/dts/rockchip/px30-robot.dtsi | 93 + - .../dts/rockchip/px30-z7-a0-rk618-dsi.dts | 875 + - arch/arm64/boot/dts/rockchip/px30.dtsi | 35 +- - .../rockchip/rk1808-dram-default-timing.dtsi | 302 + - .../boot/dts/rockchip/rk1808-evb-v10.dts | 305 + - .../dts/rockchip/rk1808-evb-x4-second.dts | 272 + - .../arm64/boot/dts/rockchip/rk1808-evb-x4.dts | 271 + - arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi | 717 + - arch/arm64/boot/dts/rockchip/rk1808-fpga.dts | 58 + - arch/arm64/boot/dts/rockchip/rk1808.dtsi | 3040 + - arch/arm64/boot/dts/rockchip/rk1808k.dtsi | 51 + - .../boot/dts/rockchip/rk3308-ai-va-v10.dts | 681 + - .../boot/dts/rockchip/rk3308-evb-amic-v10.dts | 55 + - .../boot/dts/rockchip/rk3308-evb-amic-v11.dts | 56 + - .../dts/rockchip/rk3308-evb-dmic-i2s-v10.dts | 101 + - .../dts/rockchip/rk3308-evb-dmic-i2s-v11.dts | 77 + - .../dts/rockchip/rk3308-evb-dmic-pdm-v10.dts | 88 + - .../dts/rockchip/rk3308-evb-dmic-pdm-v11.dts | 92 + - .../boot/dts/rockchip/rk3308-evb-ext-v10.dtsi | 235 + - .../boot/dts/rockchip/rk3308-evb-v10.dtsi | 780 + - .../boot/dts/rockchip/rk3308-evb-v11.dtsi | 835 + - arch/arm64/boot/dts/rockchip/rk3308-fpga.dts | 51 + - .../arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 4 +- - .../rk3308-voice-module-board-v10.dts | 19 + - arch/arm64/boot/dts/rockchip/rk3308.dtsi | 40 +- - .../dts/rockchip/rk3308b-evb-amic-v10.dts | 62 + - .../dts/rockchip/rk3308b-evb-ext-v10.dtsi | 124 + - .../boot/dts/rockchip/rk3308b-evb-v10.dtsi | 784 + - arch/arm64/boot/dts/rockchip/rk3308k.dtsi | 46 + - .../dts/rockchip/rk3326-863-cif-sensor.dtsi | 54 + - .../dts/rockchip/rk3326-863-lp3-v10-avb.dts | 112 + - .../rockchip/rk3326-863-lp3-v10-rkisp1.dts | 103 + - .../boot/dts/rockchip/rk3326-863-lp3-v10.dts | 42 + - .../boot/dts/rockchip/rk3326-863-lp3-v10.dtsi | 833 + - .../boot/dts/rockchip/rk3326-86v-v10.dts | 840 + - .../dts/rockchip/rk3326-evb-ai-va-v10.dts | 1308 + - .../rk3326-evb-ai-va-v11-i2s-dmic.dts | 1330 + - .../dts/rockchip/rk3326-evb-ai-va-v11.dts | 1317 + - .../dts/rockchip/rk3326-evb-ai-va-v12.dts | 1317 + - .../dts/rockchip/rk3326-evb-lp3-v10-avb.dts | 91 + - .../dts/rockchip/rk3326-evb-lp3-v10-linux.dts | 1024 + - .../rk3326-evb-lp3-v10-robot-linux.dts | 748 + - .../rk3326-evb-lp3-v10-robot-no-gpu-linux.dts | 728 + - .../boot/dts/rockchip/rk3326-evb-lp3-v10.dts | 37 + - .../boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi | 887 + - .../dts/rockchip/rk3326-evb-lp3-v11-avb.dts | 351 + - .../boot/dts/rockchip/rk3326-evb-lp3-v11.dts | 297 + - .../arm64/boot/dts/rockchip/rk3326-linux.dtsi | 120 + - .../boot/dts/rockchip/rk3328-android.dtsi | 88 + - .../dts/rockchip/rk3328-box-liantong-avb.dts | 13 + - .../boot/dts/rockchip/rk3328-box-liantong.dts | 34 + - .../dts/rockchip/rk3328-box-liantong.dtsi | 673 + - .../rockchip/rk3328-box-plus-dram-timing.dtsi | 221 + - .../rockchip/rk3328-dram-2layer-timing.dtsi | 257 + - .../rockchip/rk3328-dram-default-timing.dtsi | 311 + - .../dts/rockchip/rk3328-evb-android-avb.dts | 13 + - .../boot/dts/rockchip/rk3328-evb-android.dts | 34 + - .../boot/dts/rockchip/rk3328-evb-android.dtsi | 715 + - arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 22 +- - .../boot/dts/rockchip/rk3328-nanopi-r2s.dts | 4 +- - .../arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 +- - .../rockchip/rk3328-rock64-android-avb.dts | 32 + - .../dts/rockchip/rk3328-rock64-android.dts | 34 + - .../dts/rockchip/rk3328-rock64-android.dtsi | 612 + - .../arm64/boot/dts/rockchip/rk3328-rock64.dts | 14 +- - arch/arm64/boot/dts/rockchip/rk3328.dtsi | 38 +- - .../boot/dts/rockchip/rk3368-808-evb.dts | 189 + - arch/arm64/boot/dts/rockchip/rk3368-808.dtsi | 982 + - .../boot/dts/rockchip/rk3368-android.dtsi | 357 + - .../boot/dts/rockchip/rk3368-cif-sensor.dtsi | 35 + - .../rockchip/rk3368-dram-default-timing.dtsi | 66 + - .../arm64/boot/dts/rockchip/rk3368-p9-avb.dts | 35 + - arch/arm64/boot/dts/rockchip/rk3368-p9.dts | 34 + - arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi | 841 + - .../dts/rockchip/rk3368-px5-evb-android.dts | 993 + - .../boot/dts/rockchip/rk3368-r88-dcdc.dts | 676 + - .../boot/dts/rockchip/rk3368-sheep-lvds.dts | 662 + - arch/arm64/boot/dts/rockchip/rk3368-sheep.dts | 746 + - .../dts/rockchip/rk3368-sziauto-rk618.dts | 808 + - .../arm64/boot/dts/rockchip/rk3368-tablet.dts | 1070 + - .../boot/dts/rockchip/rk3368-xikp-avb.dts | 139 + - arch/arm64/boot/dts/rockchip/rk3368-xikp.dts | 33 + - arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi | 893 + - arch/arm64/boot/dts/rockchip/rk3368.dtsi | 24 +- - .../dts/rockchip/rk3368a-817-tablet-bnd.dts | 1074 + - .../boot/dts/rockchip/rk3368a-817-tablet.dts | 1333 + - .../boot/dts/rockchip/rk3399-android.dtsi | 339 + - .../boot/dts/rockchip/rk3399-box-rev1.dts | 134 + - .../boot/dts/rockchip/rk3399-box-rev2.dts | 158 + - arch/arm64/boot/dts/rockchip/rk3399-box.dtsi | 891 + - .../rockchip/rk3399-dram-default-timing.dtsi | 80 + - .../boot/dts/rockchip/rk3399-early-opp.dtsi | 127 + - .../boot/dts/rockchip/rk3399-evb-cros.dtsi | 181 + - .../rk3399-evb-ind-lpddr4-android-avb.dts | 389 + - .../rk3399-evb-ind-lpddr4-android.dts | 157 + - .../rockchip/rk3399-evb-ind-lpddr4-linux.dts | 321 + - .../rk3399-evb-ind-lpddr4-v13-android-avb.dts | 425 + - .../boot/dts/rockchip/rk3399-evb-ind.dtsi | 1430 + - .../dts/rockchip/rk3399-evb-rev1-android.dts | 145 + - .../dts/rockchip/rk3399-evb-rev1-cros.dts | 51 + - .../boot/dts/rockchip/rk3399-evb-rev1.dtsi | 352 + - .../dts/rockchip/rk3399-evb-rev2-android.dts | 156 + - .../dts/rockchip/rk3399-evb-rev2-cros.dts | 51 + - .../boot/dts/rockchip/rk3399-evb-rev2.dtsi | 366 + - .../rockchip/rk3399-evb-rev3-android-edp.dts | 126 + - .../rockchip/rk3399-evb-rev3-android-lp4.dts | 233 + - .../rk3399-evb-rev3-android-mipi-edp.dts | 300 + - .../dts/rockchip/rk3399-evb-rev3-android.dts | 176 + - .../dts/rockchip/rk3399-evb-rev3-cros.dts | 51 + - .../boot/dts/rockchip/rk3399-evb-rev3.dtsi | 353 + - arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi | 646 + - .../rockchip/rk3399-excavator-sapphire.dtsi | 324 + - .../dts/rockchip/rk3399-firefly-android.dts | 1102 + - .../dts/rockchip/rk3399-firefly-linux.dts | 1074 + - arch/arm64/boot/dts/rockchip/rk3399-fpga.dts | 64 + - .../boot/dts/rockchip/rk3399-gru-gru.dts | 165 + - .../boot/dts/rockchip/rk3399-gru-kevin-r0.dts | 118 + - .../boot/dts/rockchip/rk3399-gru-kevin-r1.dts | 85 + - .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 2 +- - arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 +- - .../arm64/boot/dts/rockchip/rk3399-linux.dtsi | 306 + - .../dts/rockchip/rk3399-mid-818-android.dts | 1121 + - arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 304 +- - .../boot/dts/rockchip/rk3399-roc-pc.dtsi | 3 - - .../boot/dts/rockchip/rk3399-rock960-ab.dts | 1088 + - .../boot/dts/rockchip/rk3399-rock960.dts | 53 +- - .../rk3399-sapphire-excavator-box.dts | 181 + - .../rk3399-sapphire-excavator-edp-avb.dts | 128 + - .../rk3399-sapphire-excavator-edp.dts | 82 + - .../rk3399-sapphire-excavator-edp.dtsi | 488 + - ...ire-excavator-linux-for-rk1808-cascade.dts | 487 + - .../rk3399-sapphire-excavator-linux.dts | 452 + - .../rk3399-sapphire-excavator-lp4-linux.dts | 497 + - .../boot/dts/rockchip/rk3399-sapphire.dtsi | 2 + - .../dts/rockchip/rk3399-sched-energy.dtsi | 121 + - .../boot/dts/rockchip/rk3399-tve1030g-avb.dts | 170 + - .../boot/dts/rockchip/rk3399-tve1030g.dts | 42 + - .../boot/dts/rockchip/rk3399-tve1030g.dtsi | 1039 + - .../boot/dts/rockchip/rk3399-tve1205g.dts | 1179 + - .../dts/rockchip/rk3399-videostrong-linux.dts | 293 + - .../boot/dts/rockchip/rk3399-vop-clk-set.dtsi | 181 + - arch/arm64/boot/dts/rockchip/rk3399.dtsi | 401 +- - arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi | 24 + - .../rockchip/rk3399pro-evb-lp4-v11-linux.dts | 1293 + - .../dts/rockchip/rk3399pro-evb-v10-linux.dts | 1203 + - .../boot/dts/rockchip/rk3399pro-evb-v10.dts | 1061 + - .../dts/rockchip/rk3399pro-evb-v11-linux.dts | 1223 + - .../boot/dts/rockchip/rk3399pro-evb-v11.dts | 1045 + - .../dts/rockchip/rk3399pro-evb-v14-linux.dts | 247 + - .../dts/rockchip/rk3399pro-npu-evb-v10.dts | 140 + - .../boot/dts/rockchip/rk3399pro-npu.dtsi | 826 + - .../boot/dts/rockchip/rk3566-box-demo-v10.dts | 15 + - .../dts/rockchip/rk3566-box-demo-v10.dtsi | 528 + - arch/arm64/boot/dts/rockchip/rk3566-box.dtsi | 436 + - arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi | 100 + - .../dts/rockchip/rk3566-evb-mipitest-v10.dts | 7 + - .../dts/rockchip/rk3566-evb-mipitest-v10.dtsi | 507 + - arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi | 7 + - .../rockchip/rk3566-evb1-ddr4-v10-linux.dts | 13 + - .../rockchip/rk3566-evb1-ddr4-v10-lvds.dts | 99 + - .../dts/rockchip/rk3566-evb1-ddr4-v10.dts | 7 + - .../dts/rockchip/rk3566-evb1-ddr4-v10.dtsi | 489 + - .../rockchip/rk3566-evb2-lp4x-v10-eink.dts | 345 + - .../rk3566-evb2-lp4x-v10-i2s-mic-array.dts | 102 + - .../rockchip/rk3566-evb2-lp4x-v10-linux.dts | 8 + - .../rk3566-evb2-lp4x-v10-pdm-mic-array.dts | 111 + - .../dts/rockchip/rk3566-evb2-lp4x-v10.dts | 8 + - .../dts/rockchip/rk3566-evb2-lp4x-v10.dtsi | 599 + - .../rockchip/rk3566-evb3-ddr3-v10-linux.dts | 8 + - .../dts/rockchip/rk3566-evb3-ddr3-v10.dts | 8 + - .../dts/rockchip/rk3566-evb3-ddr3-v10.dtsi | 499 + - .../dts/rockchip/rk3566-evb5-lp4x-v10.dts | 7 + - .../dts/rockchip/rk3566-evb5-lp4x-v10.dtsi | 317 + - .../dts/rockchip/rk3566-rk817-eink-w103.dts | 1115 + - .../dts/rockchip/rk3566-rk817-eink-w6.dts | 968 + - .../boot/dts/rockchip/rk3566-rk817-eink.dts | 957 + - .../dts/rockchip/rk3566-rk817-tablet-k108.dts | 1307 + - .../rockchip/rk3566-rk817-tablet-rkg11.dts | 1180 + - .../dts/rockchip/rk3566-rk817-tablet-v10.dts | 1208 + - .../boot/dts/rockchip/rk3566-rk817-tablet.dts | 1213 + - arch/arm64/boot/dts/rockchip/rk3566.dtsi | 53 + - .../boot/dts/rockchip/rk3568-android.dtsi | 74 + - .../rockchip/rk3568-dram-default-timing.dtsi | 81 + - arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi | 1807 + - .../rk3568-evb1-ddr4-v10-linux-spi-nor.dts | 18 + - .../rockchip/rk3568-evb1-ddr4-v10-linux.dts | 8 + - .../dts/rockchip/rk3568-evb1-ddr4-v10.dts | 8 + - .../dts/rockchip/rk3568-evb1-ddr4-v10.dtsi | 490 + - .../rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts | 79 + - .../dts/rockchip/rk3568-evb2-lp4x-v10.dts | 8 + - .../dts/rockchip/rk3568-evb2-lp4x-v10.dtsi | 493 + - .../boot/dts/rockchip/rk3568-evb4-lp3-v10.dts | 12 + - .../dts/rockchip/rk3568-evb5-ddr4-v10.dts | 8 + - .../dts/rockchip/rk3568-evb5-ddr4-v10.dtsi | 539 + - .../rockchip/rk3568-evb6-ddr3-v10-linux.dts | 8 + - ...568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts | 127 + - .../rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts | 96 + - ...3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts | 70 + - .../dts/rockchip/rk3568-evb6-ddr3-v10.dts | 8 + - .../dts/rockchip/rk3568-evb6-ddr3-v10.dtsi | 490 + - .../dts/rockchip/rk3568-evb7-ddr4-v10.dts | 12 + - .../rockchip/rk3568-iotest-ddr3-v10-linux.dts | 69 + - .../dts/rockchip/rk3568-iotest-ddr3-v10.dts | 47 + - .../arm64/boot/dts/rockchip/rk3568-linux.dtsi | 60 + - .../rk3568-nvr-demo-v10-linux-spi-nand.dts | 31 + - .../rockchip/rk3568-nvr-demo-v10-linux.dts | 27 + - .../boot/dts/rockchip/rk3568-nvr-demo-v10.dts | 27 + - .../dts/rockchip/rk3568-nvr-demo-v10.dtsi | 442 + - .../rk3568-nvr-demo-v12-linux-spi-nand.dts | 20 + - .../rockchip/rk3568-nvr-demo-v12-linux.dts | 16 + - .../dts/rockchip/rk3568-nvr-demo-v12.dtsi | 39 + - .../boot/dts/rockchip/rk3568-nvr-linux.dtsi | 55 + - arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi | 510 + - .../boot/dts/rockchip/rk3568-pinctrl.dtsi | 3119 + - .../dts/rockchip/rk3568-toybrick-base.dts | 14 + - .../dts/rockchip/rk3568-toybrick-edp.dtsi | 141 + - .../rk3568-toybrick-mipi-tx0-beiqicloud.dtsi | 395 + - .../rockchip/rk3568-toybrick-mipi-tx0.dtsi | 91 + - .../rockchip/rk3568-toybrick-mipi-tx1.dtsi | 97 + - .../rockchip/rk3568-toybrick-x0-android.dts | 13 + - .../rk3568-toybrick-x0-linux-factory.dts | 155 + - .../dts/rockchip/rk3568-toybrick-x0-linux.dts | 21 + - .../boot/dts/rockchip/rk3568-toybrick-x0.dtsi | 868 + - .../rockchip/rk3568-toybrick-x10-linux.dts | 13 + - .../dts/rockchip/rk3568-toybrick-x10.dtsi | 816 + - .../boot/dts/rockchip/rk3568-toybrick.dtsi | 1891 + - arch/arm64/boot/dts/rockchip/rk3568.dtsi | 3449 + - .../boot/dts/rockchip/rockchip-pinconf.dtsi | 382 + - arch/arm64/include/asm/system_info.h | 14 + - arch/arm64/kernel/cpuinfo.c | 6 + - arch/arm64/kernel/process.c | 2 + - drivers/Kconfig | 5 + - drivers/Makefile | 3 + - drivers/block/nbd.c | 6 - - drivers/clk/Kconfig | 7 + - drivers/clk/clk.c | 2 +- - drivers/clk/rockchip/Kconfig | 60 +- - drivers/clk/rockchip/Makefile | 5 + - drivers/clk/rockchip/clk-cpu.c | 92 +- - drivers/clk/rockchip/clk-dclk-divider.c | 168 + - drivers/clk/rockchip/clk-ddr.c | 171 +- - drivers/clk/rockchip/clk-half-divider.c | 35 +- - drivers/clk/rockchip/clk-pll.c | 779 +- - drivers/clk/rockchip/clk-pvtm.c | 310 + - drivers/clk/rockchip/clk-px30.c | 232 +- - drivers/clk/rockchip/clk-rk1808.c | 1249 + - drivers/clk/rockchip/clk-rk3036.c | 120 +- - drivers/clk/rockchip/clk-rk3128.c | 160 +- - drivers/clk/rockchip/clk-rk3188.c | 164 +- - drivers/clk/rockchip/clk-rk3228.c | 246 +- - drivers/clk/rockchip/clk-rk3288.c | 183 +- - drivers/clk/rockchip/clk-rk3308.c | 186 +- - drivers/clk/rockchip/clk-rk3328.c | 248 +- - drivers/clk/rockchip/clk-rk3368.c | 189 +- - drivers/clk/rockchip/clk-rk3399.c | 589 +- - drivers/clk/rockchip/clk-rk3568.c | 1757 + - drivers/clk/rockchip/clk-rv1108.c | 131 +- - drivers/clk/rockchip/clk-rv1126.c | 1586 + - drivers/clk/rockchip/clk.c | 200 +- - drivers/clk/rockchip/clk.h | 358 +- - drivers/clk/rockchip/regmap/Kconfig | 16 + - drivers/clk/rockchip/regmap/Makefile | 13 + - .../rockchip/regmap/clk-regmap-composite.c | 400 + - .../clk/rockchip/regmap/clk-regmap-divider.c | 104 + - .../regmap/clk-regmap-fractional-divider.c | 157 + - drivers/clk/rockchip/regmap/clk-regmap-gate.c | 82 + - drivers/clk/rockchip/regmap/clk-regmap-mux.c | 79 + - drivers/clk/rockchip/regmap/clk-regmap-pll.c | 363 + - drivers/clk/rockchip/regmap/clk-regmap.h | 311 + - drivers/clk/rockchip/regmap/clk-rk618.c | 408 + - drivers/clk/rockchip/regmap/clk-rk628.c | 569 + - drivers/clocksource/Kconfig | 4 +- - drivers/clocksource/timer-rockchip.c | 33 + - drivers/cpufreq/Kconfig.arm | 10 + - drivers/cpufreq/Makefile | 1 + - drivers/cpufreq/cpufreq-dt-platdev.c | 37 +- - drivers/cpufreq/cpufreq-dt.c | 168 +- - drivers/cpufreq/cpufreq.c | 7 +- - drivers/cpufreq/cpufreq_userspace.c | 6 +- - drivers/cpufreq/rockchip-cpufreq.c | 638 + - drivers/cpufreq/rockchip-cpufreq.h | 24 + - drivers/cpuidle/driver.c | 1 + - drivers/cpuidle/governor.c | 2 + - drivers/devfreq/Kconfig | 13 +- - drivers/devfreq/Makefile | 3 +- - drivers/devfreq/devfreq.c | 35 + - drivers/devfreq/event/Kconfig | 7 + - drivers/devfreq/event/Makefile | 1 + - drivers/devfreq/event/rockchip-dfi.c | 563 +- - drivers/devfreq/event/rockchip-nocp.c | 166 + - drivers/devfreq/rk3399_dmc.c | 518 - - drivers/devfreq/rockchip_bus.c | 500 + - drivers/devfreq/rockchip_dmc.c | 3283 + - drivers/devfreq/rockchip_dmc_common.c | 168 + - drivers/devfreq/rockchip_dmc_dbg.c | 1061 + - drivers/devfreq/rockchip_dmc_timing.h | 1307 + - drivers/dma-buf/Kconfig | 1 - - drivers/dma-buf/dma-buf.c | 144 +- - drivers/dma-buf/dma-fence.c | 70 +- - drivers/dma-buf/dma-heap.c | 223 +- - drivers/dma-buf/heaps/Kconfig | 16 +- - drivers/dma-buf/heaps/Makefile | 3 +- - drivers/dma-buf/heaps/cma_heap.c | 336 +- - drivers/dma-buf/heaps/deferred-free-helper.c | 138 + - drivers/dma-buf/heaps/deferred-free-helper.h | 55 + - drivers/dma-buf/heaps/heap-helpers.c | 271 - - drivers/dma-buf/heaps/heap-helpers.h | 53 - - drivers/dma-buf/heaps/page_pool.c | 247 + - drivers/dma-buf/heaps/page_pool.h | 55 + - drivers/dma-buf/heaps/system_heap.c | 575 +- - drivers/dma-buf/sw_sync.c | 12 + - drivers/dma-buf/sync_debug.c | 2 + - drivers/dma-buf/sync_debug.h | 7 + - drivers/firmware/Kconfig | 9 +- - drivers/firmware/Makefile | 1 + - drivers/firmware/rockchip_sip.c | 578 + - drivers/gpio/Kconfig | 8 + - drivers/gpio/Makefile | 1 + - drivers/gpio/gpio-rockchip.c | 746 + - drivers/gpio/gpiolib-of.c | 11 + - drivers/gpio/gpiolib-of.h | 5 + - drivers/gpu/Makefile | 2 +- - drivers/gpu/arm/Kbuild | 31 + - drivers/gpu/arm/Kconfig | 48 + - drivers/gpu/arm/bifrost/Kbuild | 229 + - drivers/gpu/arm/bifrost/Kconfig | 308 + - drivers/gpu/arm/bifrost/Makefile | 38 + - drivers/gpu/arm/bifrost/Makefile.kbase | 23 + - drivers/gpu/arm/bifrost/Mconfig | 277 + - drivers/gpu/arm/bifrost/arbiter/Kbuild | 24 + - .../arm/bifrost/arbiter/mali_kbase_arbif.c | 175 + - .../arm/bifrost/arbiter/mali_kbase_arbif.h | 133 + - .../bifrost/arbiter/mali_kbase_arbiter_defs.h | 95 + - .../arbiter/mali_kbase_arbiter_interface.h | 181 + - .../bifrost/arbiter/mali_kbase_arbiter_pm.c | 676 + - .../bifrost/arbiter/mali_kbase_arbiter_pm.h | 159 + - drivers/gpu/arm/bifrost/backend/gpu/Kbuild | 65 + - .../backend/gpu/mali_kbase_backend_config.h | 31 + - .../gpu/mali_kbase_cache_policy_backend.c | 34 + - .../gpu/mali_kbase_cache_policy_backend.h | 39 + - .../gpu/mali_kbase_clk_rate_trace_mgr.c | 287 + - .../gpu/mali_kbase_clk_rate_trace_mgr.h | 155 + - .../gpu/mali_kbase_debug_job_fault_backend.c | 164 + - .../bifrost/backend/gpu/mali_kbase_devfreq.c | 847 + - .../bifrost/backend/gpu/mali_kbase_devfreq.h | 47 + - .../backend/gpu/mali_kbase_gpuprops_backend.c | 158 + - .../backend/gpu/mali_kbase_instr_backend.c | 520 + - .../backend/gpu/mali_kbase_instr_defs.h | 63 + - .../backend/gpu/mali_kbase_instr_internal.h | 44 + - .../backend/gpu/mali_kbase_irq_internal.h | 44 + - .../backend/gpu/mali_kbase_irq_linux.c | 504 + - .../bifrost/backend/gpu/mali_kbase_jm_as.c | 245 + - .../bifrost/backend/gpu/mali_kbase_jm_defs.h | 113 + - .../bifrost/backend/gpu/mali_kbase_jm_hw.c | 1462 + - .../backend/gpu/mali_kbase_jm_internal.h | 181 + - .../bifrost/backend/gpu/mali_kbase_jm_rb.c | 1659 + - .../bifrost/backend/gpu/mali_kbase_jm_rb.h | 83 + - .../backend/gpu/mali_kbase_js_backend.c | 365 + - .../backend/gpu/mali_kbase_js_internal.h | 74 + - .../backend/gpu/mali_kbase_l2_mmu_config.c | 133 + - .../backend/gpu/mali_kbase_l2_mmu_config.h | 55 + - .../backend/gpu/mali_kbase_pm_always_on.c | 67 + - .../backend/gpu/mali_kbase_pm_always_on.h | 81 + - .../backend/gpu/mali_kbase_pm_backend.c | 788 + - .../bifrost/backend/gpu/mali_kbase_pm_ca.c | 114 + - .../bifrost/backend/gpu/mali_kbase_pm_ca.h | 89 + - .../backend/gpu/mali_kbase_pm_ca_devfreq.h | 60 + - .../backend/gpu/mali_kbase_pm_coarse_demand.c | 66 + - .../backend/gpu/mali_kbase_pm_coarse_demand.h | 69 + - .../bifrost/backend/gpu/mali_kbase_pm_defs.h | 560 + - .../backend/gpu/mali_kbase_pm_driver.c | 2545 + - .../backend/gpu/mali_kbase_pm_internal.h | 739 + - .../backend/gpu/mali_kbase_pm_l2_states.h | 38 + - .../backend/gpu/mali_kbase_pm_mcu_states.h | 39 + - .../backend/gpu/mali_kbase_pm_metrics.c | 324 + - .../backend/gpu/mali_kbase_pm_policy.c | 268 + - .../backend/gpu/mali_kbase_pm_policy.h | 106 + - .../backend/gpu/mali_kbase_pm_shader_states.h | 45 + - .../arm/bifrost/backend/gpu/mali_kbase_time.c | 81 + - drivers/gpu/arm/bifrost/build.bp | 186 + - .../context/backend/mali_kbase_context_csf.c | 177 + - .../context/backend/mali_kbase_context_jm.c | 230 + - .../arm/bifrost/context/mali_kbase_context.c | 339 + - .../arm/bifrost/context/mali_kbase_context.h | 157 + - .../context/mali_kbase_context_internal.h | 60 + - drivers/gpu/arm/bifrost/csf/Kbuild | 40 + - .../arm/bifrost/csf/mali_base_csf_kernel.h | 598 + - .../csf/mali_gpu_csf_control_registers.h | 33 + - .../arm/bifrost/csf/mali_gpu_csf_registers.h | 1252 + - drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c | 2547 + - drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h | 444 + - .../bifrost/csf/mali_kbase_csf_csg_debugfs.c | 460 + - .../bifrost/csf/mali_kbase_csf_csg_debugfs.h | 48 + - .../gpu/arm/bifrost/csf/mali_kbase_csf_defs.h | 883 + - .../arm/bifrost/csf/mali_kbase_csf_firmware.c | 1993 + - .../arm/bifrost/csf/mali_kbase_csf_firmware.h | 663 + - .../bifrost/csf/mali_kbase_csf_firmware_cfg.c | 306 + - .../bifrost/csf/mali_kbase_csf_firmware_cfg.h | 72 + - .../csf/mali_kbase_csf_firmware_no_mali.c | 1012 + - .../csf/mali_kbase_csf_heap_context_alloc.c | 196 + - .../csf/mali_kbase_csf_heap_context_alloc.h | 76 + - .../arm/bifrost/csf/mali_kbase_csf_ioctl.h | 379 + - .../gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c | 1737 + - .../gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h | 305 + - .../bifrost/csf/mali_kbase_csf_kcpu_debugfs.c | 199 + - .../bifrost/csf/mali_kbase_csf_kcpu_debugfs.h | 38 + - .../csf/mali_kbase_csf_protected_memory.c | 120 + - .../csf/mali_kbase_csf_protected_memory.h | 72 + - .../bifrost/csf/mali_kbase_csf_reset_gpu.c | 355 + - .../bifrost/csf/mali_kbase_csf_scheduler.c | 4135 ++ - .../bifrost/csf/mali_kbase_csf_scheduler.h | 408 + - .../bifrost/csf/mali_kbase_csf_tiler_heap.c | 584 + - .../bifrost/csf/mali_kbase_csf_tiler_heap.h | 113 + - .../csf/mali_kbase_csf_tiler_heap_debugfs.c | 107 + - .../csf/mali_kbase_csf_tiler_heap_debugfs.h | 38 + - .../csf/mali_kbase_csf_tiler_heap_def.h | 112 + - .../arm/bifrost/csf/mali_kbase_csf_timeout.c | 169 + - .../arm/bifrost/csf/mali_kbase_csf_timeout.h | 69 + - .../bifrost/csf/mali_kbase_csf_tl_reader.c | 555 + - .../bifrost/csf/mali_kbase_csf_tl_reader.h | 181 + - .../bifrost/csf/mali_kbase_csf_trace_buffer.c | 623 + - .../bifrost/csf/mali_kbase_csf_trace_buffer.h | 177 + - .../mali_kbase_debug_ktrace_codes_csf.h | 116 + - .../mali_kbase_debug_ktrace_codes_jm.h | 173 + - .../backend/mali_kbase_debug_ktrace_csf.c | 143 + - .../backend/mali_kbase_debug_ktrace_csf.h | 148 + - .../mali_kbase_debug_ktrace_defs_csf.h | 85 + - .../backend/mali_kbase_debug_ktrace_defs_jm.h | 102 + - .../backend/mali_kbase_debug_ktrace_jm.c | 115 + - .../backend/mali_kbase_debug_ktrace_jm.h | 309 + - .../mali_kbase_debug_linux_ktrace_csf.h | 147 + - .../mali_kbase_debug_linux_ktrace_jm.h | 165 + - .../bifrost/debug/mali_kbase_debug_ktrace.c | 356 + - .../bifrost/debug/mali_kbase_debug_ktrace.h | 226 + - .../debug/mali_kbase_debug_ktrace_codes.h | 165 + - .../debug/mali_kbase_debug_ktrace_defs.h | 183 + - .../debug/mali_kbase_debug_ktrace_internal.h | 89 + - .../debug/mali_kbase_debug_linux_ktrace.h | 111 + - .../device/backend/mali_kbase_device_csf.c | 274 + - .../device/backend/mali_kbase_device_hw_csf.c | 161 + - .../device/backend/mali_kbase_device_hw_jm.c | 100 + - .../device/backend/mali_kbase_device_jm.c | 264 + - .../arm/bifrost/device/mali_kbase_device.c | 411 + - .../arm/bifrost/device/mali_kbase_device.h | 177 + - .../arm/bifrost/device/mali_kbase_device_hw.c | 184 + - .../device/mali_kbase_device_internal.h | 78 + - .../gpu/backend/mali_kbase_gpu_fault_csf.c | 105 + - .../gpu/backend/mali_kbase_gpu_fault_jm.c | 177 + - .../gpu/backend/mali_kbase_gpu_regmap_csf.h | 297 + - .../gpu/backend/mali_kbase_gpu_regmap_jm.h | 288 + - drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c | 41 + - drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.h | 31 + - .../bifrost/gpu/mali_kbase_gpu_coherency.h | 31 + - .../arm/bifrost/gpu/mali_kbase_gpu_fault.h | 48 + - .../gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h | 119 + - .../arm/bifrost/gpu/mali_kbase_gpu_regmap.h | 428 + - drivers/gpu/arm/bifrost/ipa/Kbuild | 28 + - drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c | 672 + - drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h | 254 + - .../arm/bifrost/ipa/mali_kbase_ipa_debugfs.c | 322 + - .../arm/bifrost/ipa/mali_kbase_ipa_debugfs.h | 68 + - .../arm/bifrost/ipa/mali_kbase_ipa_simple.c | 356 + - .../arm/bifrost/ipa/mali_kbase_ipa_simple.h | 45 + - .../ipa/mali_kbase_ipa_vinstr_common.c | 349 + - .../ipa/mali_kbase_ipa_vinstr_common.h | 217 + - .../bifrost/ipa/mali_kbase_ipa_vinstr_g7x.c | 490 + - .../gpu/arm/bifrost/jm/mali_base_jm_kernel.h | 1079 + - .../gpu/arm/bifrost/jm/mali_kbase_jm_defs.h | 844 + - .../gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h | 216 + - drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h | 892 + - .../gpu/arm/bifrost/jm/mali_kbase_js_defs.h | 409 + - .../arm/bifrost/mali_base_hwconfig_features.h | 515 + - .../arm/bifrost/mali_base_hwconfig_issues.h | 684 + - drivers/gpu/arm/bifrost/mali_base_kernel.h | 807 + - drivers/gpu/arm/bifrost/mali_base_mem_priv.h | 57 + - drivers/gpu/arm/bifrost/mali_kbase.h | 614 + - .../arm/bifrost/mali_kbase_as_fault_debugfs.c | 113 + - .../arm/bifrost/mali_kbase_as_fault_debugfs.h | 50 + - drivers/gpu/arm/bifrost/mali_kbase_bits.h | 41 + - .../gpu/arm/bifrost/mali_kbase_cache_policy.c | 67 + - .../gpu/arm/bifrost/mali_kbase_cache_policy.h | 50 + - drivers/gpu/arm/bifrost/mali_kbase_caps.h | 65 + - drivers/gpu/arm/bifrost/mali_kbase_ccswe.c | 105 + - drivers/gpu/arm/bifrost/mali_kbase_ccswe.h | 97 + - drivers/gpu/arm/bifrost/mali_kbase_config.c | 48 + - drivers/gpu/arm/bifrost/mali_kbase_config.h | 393 + - .../arm/bifrost/mali_kbase_config_defaults.h | 213 + - .../gpu/arm/bifrost/mali_kbase_core_linux.c | 5001 ++ - .../arm/bifrost/mali_kbase_cs_experimental.h | 51 + - .../gpu/arm/bifrost/mali_kbase_ctx_sched.c | 355 + - .../gpu/arm/bifrost/mali_kbase_ctx_sched.h | 209 + - drivers/gpu/arm/bifrost/mali_kbase_debug.c | 44 + - drivers/gpu/arm/bifrost/mali_kbase_debug.h | 169 + - .../arm/bifrost/mali_kbase_debug_job_fault.c | 566 + - .../arm/bifrost/mali_kbase_debug_job_fault.h | 116 + - .../arm/bifrost/mali_kbase_debug_mem_view.c | 313 + - .../arm/bifrost/mali_kbase_debug_mem_view.h | 40 + - .../arm/bifrost/mali_kbase_debugfs_helper.c | 183 + - .../arm/bifrost/mali_kbase_debugfs_helper.h | 141 + - drivers/gpu/arm/bifrost/mali_kbase_defs.h | 1807 + - .../arm/bifrost/mali_kbase_disjoint_events.c | 81 + - .../gpu/arm/bifrost/mali_kbase_dma_fence.c | 473 + - .../gpu/arm/bifrost/mali_kbase_dma_fence.h | 144 + - .../gpu/arm/bifrost/mali_kbase_dummy_job_wa.c | 442 + - .../gpu/arm/bifrost/mali_kbase_dummy_job_wa.h | 74 + - drivers/gpu/arm/bifrost/mali_kbase_event.c | 274 + - drivers/gpu/arm/bifrost/mali_kbase_fence.c | 154 + - drivers/gpu/arm/bifrost/mali_kbase_fence.h | 284 + - .../gpu/arm/bifrost/mali_kbase_fence_defs.h | 64 + - .../gpu/arm/bifrost/mali_kbase_fence_ops.c | 84 + - drivers/gpu/arm/bifrost/mali_kbase_gator.h | 53 + - .../bifrost/mali_kbase_gpu_memory_debugfs.c | 104 + - .../bifrost/mali_kbase_gpu_memory_debugfs.h | 54 + - drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c | 649 + - drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h | 135 + - .../arm/bifrost/mali_kbase_gpuprops_types.h | 98 + - drivers/gpu/arm/bifrost/mali_kbase_gwt.c | 273 + - drivers/gpu/arm/bifrost/mali_kbase_gwt.h | 55 + - drivers/gpu/arm/bifrost/mali_kbase_hw.c | 437 + - drivers/gpu/arm/bifrost/mali_kbase_hw.h | 70 + - .../arm/bifrost/mali_kbase_hwaccess_backend.h | 45 + - .../arm/bifrost/mali_kbase_hwaccess_defs.h | 51 + - .../bifrost/mali_kbase_hwaccess_gpuprops.h | 87 + - .../arm/bifrost/mali_kbase_hwaccess_instr.h | 151 + - .../gpu/arm/bifrost/mali_kbase_hwaccess_jm.h | 304 + - .../gpu/arm/bifrost/mali_kbase_hwaccess_pm.h | 229 + - .../arm/bifrost/mali_kbase_hwaccess_time.h | 56 + - drivers/gpu/arm/bifrost/mali_kbase_hwcnt.c | 794 + - .../bifrost/mali_kbase_hwcnt_accumulator.h | 146 + - .../arm/bifrost/mali_kbase_hwcnt_backend.h | 220 + - .../arm/bifrost/mali_kbase_hwcnt_backend_jm.c | 736 + - .../arm/bifrost/mali_kbase_hwcnt_backend_jm.h | 61 + - .../arm/bifrost/mali_kbase_hwcnt_context.h | 119 + - .../gpu/arm/bifrost/mali_kbase_hwcnt_gpu.c | 571 + - .../gpu/arm/bifrost/mali_kbase_hwcnt_gpu.h | 217 + - .../gpu/arm/bifrost/mali_kbase_hwcnt_legacy.c | 152 + - .../gpu/arm/bifrost/mali_kbase_hwcnt_legacy.h | 94 + - .../gpu/arm/bifrost/mali_kbase_hwcnt_reader.h | 106 + - .../gpu/arm/bifrost/mali_kbase_hwcnt_types.c | 604 + - .../gpu/arm/bifrost/mali_kbase_hwcnt_types.h | 1142 + - .../bifrost/mali_kbase_hwcnt_virtualizer.c | 790 + - .../bifrost/mali_kbase_hwcnt_virtualizer.h | 145 + - drivers/gpu/arm/bifrost/mali_kbase_ioctl.h | 838 + - drivers/gpu/arm/bifrost/mali_kbase_jd.c | 1819 + - .../gpu/arm/bifrost/mali_kbase_jd_debugfs.c | 250 + - .../gpu/arm/bifrost/mali_kbase_jd_debugfs.h | 45 + - drivers/gpu/arm/bifrost/mali_kbase_jm.c | 155 + - drivers/gpu/arm/bifrost/mali_kbase_jm.h | 119 + - drivers/gpu/arm/bifrost/mali_kbase_js.c | 3760 ++ - drivers/gpu/arm/bifrost/mali_kbase_js.h | 40 + - .../gpu/arm/bifrost/mali_kbase_js_ctx_attr.c | 283 + - .../gpu/arm/bifrost/mali_kbase_js_ctx_attr.h | 155 + - .../gpu/arm/bifrost/mali_kbase_kinstr_jm.c | 895 + - .../gpu/arm/bifrost/mali_kbase_kinstr_jm.h | 283 + - .../arm/bifrost/mali_kbase_kinstr_jm_reader.h | 70 + - drivers/gpu/arm/bifrost/mali_kbase_linux.h | 48 + - drivers/gpu/arm/bifrost/mali_kbase_mem.c | 4734 ++ - drivers/gpu/arm/bifrost/mali_kbase_mem.h | 1962 + - .../gpu/arm/bifrost/mali_kbase_mem_linux.c | 3425 + - .../gpu/arm/bifrost/mali_kbase_mem_linux.h | 478 + - .../gpu/arm/bifrost/mali_kbase_mem_lowlevel.h | 166 + - drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c | 856 + - .../arm/bifrost/mali_kbase_mem_pool_debugfs.c | 191 + - .../arm/bifrost/mali_kbase_mem_pool_debugfs.h | 123 + - .../arm/bifrost/mali_kbase_mem_pool_group.c | 115 + - .../arm/bifrost/mali_kbase_mem_pool_group.h | 92 + - .../bifrost/mali_kbase_mem_profile_debugfs.c | 134 + - .../bifrost/mali_kbase_mem_profile_debugfs.h | 64 + - .../mali_kbase_mem_profile_debugfs_buf_size.h | 39 + - .../arm/bifrost/mali_kbase_mipe_gen_header.h | 219 + - .../gpu/arm/bifrost/mali_kbase_mipe_proto.h | 127 + - .../gpu/arm/bifrost/mali_kbase_native_mgm.c | 153 + - .../gpu/arm/bifrost/mali_kbase_native_mgm.h | 39 + - .../arm/bifrost/mali_kbase_platform_fake.c | 124 + - drivers/gpu/arm/bifrost/mali_kbase_pm.c | 292 + - drivers/gpu/arm/bifrost/mali_kbase_pm.h | 251 + - .../bifrost/mali_kbase_regs_history_debugfs.c | 245 + - .../bifrost/mali_kbase_regs_history_debugfs.h | 85 + - .../gpu/arm/bifrost/mali_kbase_reset_gpu.h | 129 + - drivers/gpu/arm/bifrost/mali_kbase_smc.c | 91 + - drivers/gpu/arm/bifrost/mali_kbase_smc.h | 72 + - drivers/gpu/arm/bifrost/mali_kbase_softjobs.c | 1805 + - drivers/gpu/arm/bifrost/mali_kbase_strings.c | 28 + - drivers/gpu/arm/bifrost/mali_kbase_strings.h | 24 + - drivers/gpu/arm/bifrost/mali_kbase_sync.h | 231 + - .../gpu/arm/bifrost/mali_kbase_sync_android.c | 542 + - .../gpu/arm/bifrost/mali_kbase_sync_common.c | 51 + - .../gpu/arm/bifrost/mali_kbase_sync_file.c | 372 + - .../arm/bifrost/mali_kbase_trace_gpu_mem.c | 227 + - .../arm/bifrost/mali_kbase_trace_gpu_mem.h | 103 + - drivers/gpu/arm/bifrost/mali_kbase_utility.h | 55 + - drivers/gpu/arm/bifrost/mali_kbase_vinstr.c | 1083 + - drivers/gpu/arm/bifrost/mali_kbase_vinstr.h | 91 + - drivers/gpu/arm/bifrost/mali_linux_trace.h | 552 + - drivers/gpu/arm/bifrost/mali_malisw.h | 109 + - .../bifrost/mali_power_gpu_frequency_trace.c | 27 + - .../bifrost/mali_power_gpu_frequency_trace.h | 69 + - drivers/gpu/arm/bifrost/mali_uk.h | 84 + - .../bifrost/mmu/backend/mali_kbase_mmu_csf.c | 532 + - .../bifrost/mmu/backend/mali_kbase_mmu_jm.c | 440 + - drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c | 2275 + - drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h | 156 + - .../gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h | 107 + - .../bifrost/mmu/mali_kbase_mmu_hw_direct.c | 274 + - .../arm/bifrost/mmu/mali_kbase_mmu_internal.h | 73 + - .../bifrost/mmu/mali_kbase_mmu_mode_aarch64.c | 200 + - .../bifrost/mmu/mali_kbase_mmu_mode_lpae.c | 215 + - drivers/gpu/arm/bifrost/platform/Kconfig | 30 + - .../arm/bifrost/platform/devicetree/Kbuild | 25 + - .../devicetree/mali_kbase_clk_rate_trace.c | 68 + - .../devicetree/mali_kbase_config_devicetree.c | 41 + - .../devicetree/mali_kbase_config_platform.h | 49 + - .../devicetree/mali_kbase_runtime_pm.c | 185 + - drivers/gpu/arm/bifrost/platform/rk/Kbuild | 17 + - .../gpu/arm/bifrost/platform/rk/custom_log.h | 192 + - .../platform/rk/mali_kbase_config_platform.h | 88 + - .../platform/rk/mali_kbase_config_rk.c | 459 + - .../arm/bifrost/platform/rk/mali_kbase_rk.h | 62 + - .../gpu/arm/bifrost/platform/vexpress/Kbuild | 24 + - .../vexpress/mali_kbase_config_platform.h | 39 + - .../vexpress/mali_kbase_config_vexpress.c | 69 + - .../bifrost/platform/vexpress_1xv7_a57/Kbuild | 24 + - .../mali_kbase_config_platform.h | 39 + - .../mali_kbase_config_vexpress.c | 65 + - .../platform/vexpress_6xvirtex7_10mhz/Kbuild | 25 + - .../mali_kbase_config_platform.h | 39 + - .../mali_kbase_config_vexpress.c | 67 + - .../gpu/arm/bifrost/protected_mode_switcher.h | 69 + - drivers/gpu/arm/bifrost/tests/Kbuild | 24 + - drivers/gpu/arm/bifrost/tests/Kconfig | 24 + - drivers/gpu/arm/bifrost/tests/Mconfig | 38 + - .../bifrost/tests/include/kutf/kutf_helpers.h | 85 + - .../tests/include/kutf/kutf_helpers_user.h | 179 + - .../arm/bifrost/tests/include/kutf/kutf_mem.h | 73 + - .../tests/include/kutf/kutf_resultset.h | 181 + - .../bifrost/tests/include/kutf/kutf_suite.h | 569 + - .../bifrost/tests/include/kutf/kutf_utils.h | 60 + - drivers/gpu/arm/bifrost/tests/kutf/Kbuild | 26 + - drivers/gpu/arm/bifrost/tests/kutf/Kconfig | 28 + - drivers/gpu/arm/bifrost/tests/kutf/Makefile | 35 + - drivers/gpu/arm/bifrost/tests/kutf/build.bp | 36 + - .../gpu/arm/bifrost/tests/kutf/kutf_helpers.c | 131 + - .../bifrost/tests/kutf/kutf_helpers_user.c | 468 + - drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c | 108 + - .../arm/bifrost/tests/kutf/kutf_resultset.c | 164 + - .../gpu/arm/bifrost/tests/kutf/kutf_suite.c | 1224 + - .../gpu/arm/bifrost/tests/kutf/kutf_utils.c | 76 + - .../mali_kutf_clk_rate_trace/kernel/Kbuild | 26 + - .../mali_kutf_clk_rate_trace/kernel/Kconfig | 30 + - .../mali_kutf_clk_rate_trace/kernel/Makefile | 57 + - .../mali_kutf_clk_rate_trace/kernel/build.bp | 34 + - .../kernel/mali_kutf_clk_rate_trace_test.c | 890 + - .../mali_kutf_clk_rate_trace_test.h | 148 + - .../bifrost/tests/mali_kutf_irq_test/Kbuild | 26 + - .../bifrost/tests/mali_kutf_irq_test/Kconfig | 29 + - .../bifrost/tests/mali_kutf_irq_test/Makefile | 51 + - .../bifrost/tests/mali_kutf_irq_test/build.bp | 35 + - .../mali_kutf_irq_test_main.c | 278 + - .../arm/bifrost/thirdparty/mali_kbase_mmap.c | 368 + - .../tl/backend/mali_kbase_timeline_csf.c | 172 + - .../tl/backend/mali_kbase_timeline_jm.c | 97 + - .../gpu/arm/bifrost/tl/mali_kbase_timeline.c | 308 + - .../gpu/arm/bifrost/tl/mali_kbase_timeline.h | 121 + - .../arm/bifrost/tl/mali_kbase_timeline_io.c | 362 + - .../arm/bifrost/tl/mali_kbase_timeline_priv.h | 73 + - .../arm/bifrost/tl/mali_kbase_tl_serialize.h | 125 + - .../gpu/arm/bifrost/tl/mali_kbase_tlstream.c | 306 + - .../gpu/arm/bifrost/tl/mali_kbase_tlstream.h | 169 + - .../arm/bifrost/tl/mali_kbase_tracepoints.c | 2974 + - .../arm/bifrost/tl/mali_kbase_tracepoints.h | 2926 + - drivers/gpu/arm/bifrost_for_linux/Kbuild | 172 + - drivers/gpu/arm/bifrost_for_linux/Kconfig | 196 + - drivers/gpu/arm/bifrost_for_linux/Makefile | 42 + - .../gpu/arm/bifrost_for_linux/Makefile.kbase | 17 + - .../arm/bifrost_for_linux/backend/gpu/Kbuild | 60 + - .../backend/gpu/mali_kbase_backend_config.h | 29 + - .../gpu/mali_kbase_cache_policy_backend.c | 29 + - .../gpu/mali_kbase_cache_policy_backend.h | 34 + - .../gpu/mali_kbase_debug_job_fault_backend.c | 157 + - .../backend/gpu/mali_kbase_devfreq.c | 495 + - .../backend/gpu/mali_kbase_devfreq.h | 25 + - .../backend/gpu/mali_kbase_device_hw.c | 255 + - .../backend/gpu/mali_kbase_device_internal.h | 67 + - .../backend/gpu/mali_kbase_gpu.c | 123 + - .../backend/gpu/mali_kbase_gpuprops_backend.c | 110 + - .../backend/gpu/mali_kbase_instr_backend.c | 492 + - .../backend/gpu/mali_kbase_instr_defs.h | 58 + - .../backend/gpu/mali_kbase_instr_internal.h | 45 + - .../backend/gpu/mali_kbase_irq_internal.h | 39 + - .../backend/gpu/mali_kbase_irq_linux.c | 469 + - .../backend/gpu/mali_kbase_jm_as.c | 235 + - .../backend/gpu/mali_kbase_jm_defs.h | 123 + - .../backend/gpu/mali_kbase_jm_hw.c | 1512 + - .../backend/gpu/mali_kbase_jm_internal.h | 164 + - .../backend/gpu/mali_kbase_jm_rb.c | 1947 + - .../backend/gpu/mali_kbase_jm_rb.h | 76 + - .../backend/gpu/mali_kbase_js_affinity.c | 303 + - .../backend/gpu/mali_kbase_js_affinity.h | 129 + - .../backend/gpu/mali_kbase_js_backend.c | 356 + - .../backend/gpu/mali_kbase_js_internal.h | 69 + - .../backend/gpu/mali_kbase_mmu_hw_direct.c | 401 + - .../backend/gpu/mali_kbase_mmu_hw_direct.h | 42 + - .../backend/gpu/mali_kbase_pm_always_on.c | 63 + - .../backend/gpu/mali_kbase_pm_always_on.h | 77 + - .../backend/gpu/mali_kbase_pm_backend.c | 478 + - .../backend/gpu/mali_kbase_pm_ca.c | 182 + - .../backend/gpu/mali_kbase_pm_ca.h | 92 + - .../backend/gpu/mali_kbase_pm_ca_devfreq.c | 129 + - .../backend/gpu/mali_kbase_pm_ca_devfreq.h | 55 + - .../backend/gpu/mali_kbase_pm_ca_fixed.c | 65 + - .../backend/gpu/mali_kbase_pm_ca_fixed.h | 40 + - .../backend/gpu/mali_kbase_pm_coarse_demand.c | 70 + - .../backend/gpu/mali_kbase_pm_coarse_demand.h | 64 + - .../backend/gpu/mali_kbase_pm_defs.h | 519 + - .../backend/gpu/mali_kbase_pm_demand.c | 73 + - .../backend/gpu/mali_kbase_pm_demand.h | 64 + - .../backend/gpu/mali_kbase_pm_driver.c | 1672 + - .../backend/gpu/mali_kbase_pm_internal.h | 548 + - .../backend/gpu/mali_kbase_pm_metrics.c | 401 + - .../backend/gpu/mali_kbase_pm_policy.c | 973 + - .../backend/gpu/mali_kbase_pm_policy.h | 227 + - .../backend/gpu/mali_kbase_time.c | 103 + - .../backend/gpu/mali_kbase_time.h | 52 + - .../gpu/arm/bifrost_for_linux/docs/Doxyfile | 126 + - .../docs/policy_operation_diagram.dot | 112 + - .../docs/policy_overview.dot | 63 + - drivers/gpu/arm/bifrost_for_linux/ipa/Kbuild | 27 + - .../bifrost_for_linux/ipa/mali_kbase_ipa.c | 580 + - .../bifrost_for_linux/ipa/mali_kbase_ipa.h | 165 + - .../ipa/mali_kbase_ipa_debugfs.c | 219 + - .../ipa/mali_kbase_ipa_debugfs.h | 49 + - .../ipa/mali_kbase_ipa_simple.c | 327 + - .../ipa/mali_kbase_ipa_simple.h | 40 + - .../ipa/mali_kbase_ipa_vinstr_common.c | 217 + - .../ipa/mali_kbase_ipa_vinstr_common.h | 161 + - .../ipa/mali_kbase_ipa_vinstr_g71.c | 136 + - .../mali_base_hwconfig_features.h | 282 + - .../mali_base_hwconfig_issues.h | 1126 + - .../arm/bifrost_for_linux/mali_base_kernel.h | 1822 + - .../bifrost_for_linux/mali_base_mem_priv.h | 52 + - .../mali_base_vendor_specific_func.h | 24 + - .../gpu/arm/bifrost_for_linux/mali_kbase.h | 616 + - .../mali_kbase_10969_workaround.c | 210 + - .../mali_kbase_10969_workaround.h | 23 + - .../mali_kbase_as_fault_debugfs.c | 102 + - .../mali_kbase_as_fault_debugfs.h | 45 + - .../mali_kbase_cache_policy.c | 54 + - .../mali_kbase_cache_policy.h | 45 + - .../arm/bifrost_for_linux/mali_kbase_config.c | 51 + - .../arm/bifrost_for_linux/mali_kbase_config.h | 343 + - .../mali_kbase_config_defaults.h | 226 + - .../bifrost_for_linux/mali_kbase_context.c | 362 + - .../bifrost_for_linux/mali_kbase_context.h | 90 + - .../bifrost_for_linux/mali_kbase_core_linux.c | 4971 ++ - .../bifrost_for_linux/mali_kbase_ctx_sched.c | 203 + - .../bifrost_for_linux/mali_kbase_ctx_sched.h | 131 + - .../arm/bifrost_for_linux/mali_kbase_debug.c | 39 + - .../arm/bifrost_for_linux/mali_kbase_debug.h | 164 + - .../mali_kbase_debug_job_fault.c | 499 + - .../mali_kbase_debug_job_fault.h | 96 + - .../mali_kbase_debug_mem_view.c | 306 + - .../mali_kbase_debug_mem_view.h | 25 + - .../arm/bifrost_for_linux/mali_kbase_defs.h | 1641 + - .../arm/bifrost_for_linux/mali_kbase_device.c | 674 + - .../mali_kbase_disjoint_events.c | 76 + - .../bifrost_for_linux/mali_kbase_dma_fence.c | 449 + - .../bifrost_for_linux/mali_kbase_dma_fence.h | 131 + - .../arm/bifrost_for_linux/mali_kbase_event.c | 259 + - .../arm/bifrost_for_linux/mali_kbase_fence.c | 196 + - .../arm/bifrost_for_linux/mali_kbase_fence.h | 270 + - .../bifrost_for_linux/mali_kbase_fence_defs.h | 51 + - .../arm/bifrost_for_linux/mali_kbase_gator.h | 45 + - .../bifrost_for_linux/mali_kbase_gator_api.c | 334 + - .../bifrost_for_linux/mali_kbase_gator_api.h | 219 + - .../mali_kbase_gator_hwcnt_names.h | 2167 + - .../mali_kbase_gator_hwcnt_names_thex.h | 291 + - .../mali_kbase_gator_hwcnt_names_tmix.h | 291 + - .../mali_kbase_gator_hwcnt_names_tsix.h | 291 + - .../arm/bifrost_for_linux/mali_kbase_gpu_id.h | 118 + - .../mali_kbase_gpu_memory_debugfs.c | 97 + - .../mali_kbase_gpu_memory_debugfs.h | 37 + - .../bifrost_for_linux/mali_kbase_gpuprops.c | 514 + - .../bifrost_for_linux/mali_kbase_gpuprops.h | 84 + - .../mali_kbase_gpuprops_types.h | 92 + - .../gpu/arm/bifrost_for_linux/mali_kbase_hw.c | 446 + - .../gpu/arm/bifrost_for_linux/mali_kbase_hw.h | 65 + - .../mali_kbase_hwaccess_backend.h | 54 + - .../mali_kbase_hwaccess_defs.h | 36 + - .../mali_kbase_hwaccess_gpuprops.h | 47 + - .../mali_kbase_hwaccess_instr.h | 116 + - .../mali_kbase_hwaccess_jm.h | 381 + - .../mali_kbase_hwaccess_pm.h | 209 + - .../mali_kbase_hwaccess_time.h | 53 + - .../mali_kbase_hwcnt_reader.h | 66 + - .../arm/bifrost_for_linux/mali_kbase_ioctl.h | 658 + - .../gpu/arm/bifrost_for_linux/mali_kbase_jd.c | 1847 + - .../bifrost_for_linux/mali_kbase_jd_debugfs.c | 235 + - .../bifrost_for_linux/mali_kbase_jd_debugfs.h | 40 + - .../gpu/arm/bifrost_for_linux/mali_kbase_jm.c | 131 + - .../gpu/arm/bifrost_for_linux/mali_kbase_jm.h | 110 + - .../gpu/arm/bifrost_for_linux/mali_kbase_js.c | 2798 + - .../gpu/arm/bifrost_for_linux/mali_kbase_js.h | 925 + - .../mali_kbase_js_ctx_attr.c | 301 + - .../mali_kbase_js_ctx_attr.h | 158 + - .../bifrost_for_linux/mali_kbase_js_defs.h | 386 + - .../arm/bifrost_for_linux/mali_kbase_linux.h | 43 + - .../arm/bifrost_for_linux/mali_kbase_mem.c | 2875 + - .../arm/bifrost_for_linux/mali_kbase_mem.h | 1142 + - .../bifrost_for_linux/mali_kbase_mem_linux.c | 2678 + - .../bifrost_for_linux/mali_kbase_mem_linux.h | 240 + - .../mali_kbase_mem_lowlevel.h | 89 + - .../bifrost_for_linux/mali_kbase_mem_pool.c | 651 + - .../mali_kbase_mem_pool_debugfs.c | 88 + - .../mali_kbase_mem_pool_debugfs.h | 40 + - .../mali_kbase_mem_profile_debugfs.c | 121 + - .../mali_kbase_mem_profile_debugfs.h | 59 + - .../mali_kbase_mem_profile_debugfs_buf_size.h | 33 + - .../arm/bifrost_for_linux/mali_kbase_mmu.c | 2138 + - .../arm/bifrost_for_linux/mali_kbase_mmu_hw.h | 123 + - .../mali_kbase_mmu_mode_aarch64.c | 214 + - .../mali_kbase_mmu_mode_lpae.c | 199 + - .../mali_kbase_platform_fake.c | 119 + - .../gpu/arm/bifrost_for_linux/mali_kbase_pm.c | 205 + - .../gpu/arm/bifrost_for_linux/mali_kbase_pm.h | 171 + - .../mali_kbase_profiling_gator_api.h | 40 + - .../mali_kbase_regs_history_debugfs.c | 130 + - .../mali_kbase_regs_history_debugfs.h | 50 + - .../arm/bifrost_for_linux/mali_kbase_replay.c | 1166 + - .../arm/bifrost_for_linux/mali_kbase_smc.c | 74 + - .../arm/bifrost_for_linux/mali_kbase_smc.h | 67 + - .../bifrost_for_linux/mali_kbase_softjobs.c | 1513 + - .../bifrost_for_linux/mali_kbase_strings.c | 23 + - .../bifrost_for_linux/mali_kbase_strings.h | 19 + - .../arm/bifrost_for_linux/mali_kbase_sync.h | 203 + - .../mali_kbase_sync_android.c | 537 + - .../mali_kbase_sync_common.c | 43 + - .../bifrost_for_linux/mali_kbase_sync_file.c | 348 + - .../bifrost_for_linux/mali_kbase_tlstream.c | 2569 + - .../bifrost_for_linux/mali_kbase_tlstream.h | 623 + - .../bifrost_for_linux/mali_kbase_trace_defs.h | 264 + - .../mali_kbase_trace_timeline.c | 236 + - .../mali_kbase_trace_timeline.h | 363 + - .../mali_kbase_trace_timeline_defs.h | 140 + - .../arm/bifrost_for_linux/mali_kbase_uku.h | 532 + - .../bifrost_for_linux/mali_kbase_utility.c | 33 + - .../bifrost_for_linux/mali_kbase_utility.h | 37 + - .../arm/bifrost_for_linux/mali_kbase_vinstr.c | 2072 + - .../arm/bifrost_for_linux/mali_kbase_vinstr.h | 155 + - .../mali_linux_kbase_trace.h | 201 + - .../arm/bifrost_for_linux/mali_linux_trace.h | 189 + - .../gpu/arm/bifrost_for_linux/mali_malisw.h | 131 + - .../bifrost_for_linux/mali_midg_coherency.h | 26 + - .../arm/bifrost_for_linux/mali_midg_regmap.h | 611 + - .../gpu/arm/bifrost_for_linux/mali_timeline.h | 396 + - drivers/gpu/arm/bifrost_for_linux/mali_uk.h | 141 + - .../arm/bifrost_for_linux/platform/Kconfig | 24 + - .../platform/devicetree/Kbuild | 18 + - .../devicetree/mali_kbase_config_devicetree.c | 40 + - .../devicetree/mali_kbase_config_platform.h | 80 + - .../devicetree/mali_kbase_runtime_pm.c | 121 + - .../platform/mali_kbase_platform_common.h | 26 + - .../arm/bifrost_for_linux/platform/rk/Kbuild | 17 + - .../platform/rk/custom_log.h | 192 + - .../platform/rk/mali_kbase_config_platform.h | 88 + - .../platform/rk/mali_kbase_config_rk.c | 459 + - .../platform/rk/mali_kbase_rk.h | 62 + - .../platform/vexpress/Kbuild | 19 + - .../vexpress/mali_kbase_config_platform.h | 75 + - .../vexpress/mali_kbase_config_vexpress.c | 85 + - .../vexpress/mali_kbase_cpu_vexpress.c | 279 + - .../vexpress/mali_kbase_cpu_vexpress.h | 38 + - .../platform/vexpress_1xv7_a57/Kbuild | 18 + - .../mali_kbase_config_platform.h | 73 + - .../mali_kbase_config_vexpress.c | 79 + - .../platform/vexpress_6xvirtex7_10mhz/Kbuild | 19 + - .../mali_kbase_config_platform.h | 75 + - .../mali_kbase_config_vexpress.c | 83 + - .../mali_kbase_cpu_vexpress.c | 71 + - .../mali_kbase_cpu_vexpress.h | 28 + - .../platform_dummy/mali_ukk_os.h | 53 + - .../protected_mode_switcher.h | 64 + - drivers/gpu/arm/bifrost_for_linux/sconscript | 72 + - .../gpu/arm/bifrost_for_linux/tests/Kbuild | 17 + - .../gpu/arm/bifrost_for_linux/tests/Kconfig | 17 + - .../tests/include/kutf/kutf_helpers.h | 216 + - .../tests/include/kutf/kutf_helpers_user.h | 179 + - .../tests/include/kutf/kutf_mem.h | 68 + - .../tests/include/kutf/kutf_resultset.h | 121 + - .../tests/include/kutf/kutf_suite.h | 568 + - .../tests/include/kutf/kutf_utils.h | 55 + - .../arm/bifrost_for_linux/tests/kutf/Kbuild | 20 + - .../arm/bifrost_for_linux/tests/kutf/Kconfig | 22 + - .../arm/bifrost_for_linux/tests/kutf/Makefile | 29 + - .../tests/kutf/kutf_helpers.c | 768 + - .../tests/kutf/kutf_helpers_user.c | 460 + - .../bifrost_for_linux/tests/kutf/kutf_mem.c | 102 + - .../tests/kutf/kutf_resultset.c | 95 + - .../bifrost_for_linux/tests/kutf/kutf_suite.c | 1398 + - .../bifrost_for_linux/tests/kutf/kutf_utils.c | 71 + - .../bifrost_for_linux/tests/kutf/sconscript | 21 + - .../tests/mali_kutf_irq_test/Kbuild | 20 + - .../tests/mali_kutf_irq_test/Kconfig | 23 + - .../tests/mali_kutf_irq_test/Makefile | 47 + - .../mali_kutf_irq_test_main.c | 269 + - .../tests/mali_kutf_irq_test/sconscript | 30 + - .../arm/bifrost_for_linux/tests/sconscript | 38 + - drivers/gpu/arm/mali400/.gitignore | 1 + - drivers/gpu/arm/mali400/Kbuild | 2 + - drivers/gpu/arm/mali400/mali/.gitignore | 1 + - drivers/gpu/arm/mali400/mali/Kbuild | 254 + - drivers/gpu/arm/mali400/mali/Kconfig | 118 + - drivers/gpu/arm/mali400/mali/Makefile | 206 + - .../arm/mali400/mali/common/mali_broadcast.c | 142 + - .../arm/mali400/mali/common/mali_broadcast.h | 57 + - .../mali400/mali/common/mali_control_timer.c | 139 + - .../mali400/mali/common/mali_control_timer.h | 30 + - .../gpu/arm/mali400/mali/common/mali_dlbu.c | 213 + - .../gpu/arm/mali400/mali/common/mali_dlbu.h | 45 + - .../mali400/mali/common/mali_dvfs_policy.c | 308 + - .../mali400/mali/common/mali_dvfs_policy.h | 34 + - .../arm/mali400/mali/common/mali_executor.c | 2707 + - .../arm/mali400/mali/common/mali_executor.h | 102 + - drivers/gpu/arm/mali400/mali/common/mali_gp.c | 357 + - drivers/gpu/arm/mali400/mali/common/mali_gp.h | 127 + - .../gpu/arm/mali400/mali/common/mali_gp_job.c | 306 + - .../gpu/arm/mali400/mali/common/mali_gp_job.h | 324 + - .../gpu/arm/mali400/mali/common/mali_group.c | 1875 + - .../gpu/arm/mali400/mali/common/mali_group.h | 460 + - .../arm/mali400/mali/common/mali_hw_core.c | 47 + - .../arm/mali400/mali/common/mali_hw_core.h | 111 + - .../mali400/mali/common/mali_kernel_common.h | 181 + - .../mali400/mali/common/mali_kernel_core.c | 1349 + - .../mali400/mali/common/mali_kernel_core.h | 57 + - .../mali/common/mali_kernel_utilization.c | 440 + - .../mali/common/mali_kernel_utilization.h | 72 + - .../mali400/mali/common/mali_kernel_vsync.c | 45 + - .../arm/mali400/mali/common/mali_l2_cache.c | 534 + - .../arm/mali400/mali/common/mali_l2_cache.h | 124 + - .../mali400/mali/common/mali_mem_validation.c | 68 + - .../mali400/mali/common/mali_mem_validation.h | 19 + - .../gpu/arm/mali400/mali/common/mali_mmu.c | 433 + - .../gpu/arm/mali400/mali/common/mali_mmu.h | 124 + - .../mali/common/mali_mmu_page_directory.c | 495 + - .../mali/common/mali_mmu_page_directory.h | 110 + - .../gpu/arm/mali400/mali/common/mali_osk.h | 1389 + - .../arm/mali400/mali/common/mali_osk_bitops.h | 162 + - .../arm/mali400/mali/common/mali_osk_list.h | 273 + - .../arm/mali400/mali/common/mali_osk_mali.h | 152 + - .../mali400/mali/common/mali_osk_profiling.h | 146 + - .../arm/mali400/mali/common/mali_osk_types.h | 471 + - drivers/gpu/arm/mali400/mali/common/mali_pm.c | 1362 + - drivers/gpu/arm/mali400/mali/common/mali_pm.h | 91 + - .../arm/mali400/mali/common/mali_pm_domain.c | 209 + - .../arm/mali400/mali/common/mali_pm_domain.h | 104 + - .../arm/mali400/mali/common/mali_pm_metrics.c | 255 + - .../arm/mali400/mali/common/mali_pm_metrics.h | 74 + - .../gpu/arm/mali400/mali/common/mali_pmu.c | 270 + - .../gpu/arm/mali400/mali/common/mali_pmu.h | 123 + - drivers/gpu/arm/mali400/mali/common/mali_pp.c | 502 + - drivers/gpu/arm/mali400/mali/common/mali_pp.h | 138 + - .../gpu/arm/mali400/mali/common/mali_pp_job.c | 316 + - .../gpu/arm/mali400/mali/common/mali_pp_job.h | 594 + - .../arm/mali400/mali/common/mali_scheduler.c | 1548 + - .../arm/mali400/mali/common/mali_scheduler.h | 131 + - .../mali/common/mali_scheduler_types.h | 29 + - .../arm/mali400/mali/common/mali_session.c | 155 + - .../arm/mali400/mali/common/mali_session.h | 136 + - .../arm/mali400/mali/common/mali_soft_job.c | 438 + - .../arm/mali400/mali/common/mali_soft_job.h | 190 + - .../mali/common/mali_spinlock_reentrant.c | 77 + - .../mali/common/mali_spinlock_reentrant.h | 70 + - .../arm/mali400/mali/common/mali_timeline.c | 1964 + - .../arm/mali400/mali/common/mali_timeline.h | 587 + - .../mali/common/mali_timeline_fence_wait.c | 218 + - .../mali/common/mali_timeline_fence_wait.h | 67 + - .../mali/common/mali_timeline_sync_fence.c | 179 + - .../mali/common/mali_timeline_sync_fence.h | 51 + - .../gpu/arm/mali400/mali/common/mali_ukk.h | 551 + - .../mali/common/mali_user_settings_db.c | 147 + - .../mali/common/mali_user_settings_db.h | 39 + - .../mali/include/linux/mali/mali_utgard.h | 526 + - .../include/linux/mali/mali_utgard_ioctl.h | 97 + - .../linux/mali/mali_utgard_profiling_events.h | 190 + - .../mali/mali_utgard_profiling_gator_api.h | 305 + - .../include/linux/mali/mali_utgard_uk_types.h | 1108 + - .../linux/license/gpl/mali_kernel_license.h | 30 + - .../gpu/arm/mali400/mali/linux/mali_devfreq.c | 354 + - .../gpu/arm/mali400/mali/linux/mali_devfreq.h | 17 + - .../mali/linux/mali_device_pause_resume.c | 36 + - .../arm/mali400/mali/linux/mali_dma_fence.c | 439 + - .../arm/mali400/mali/linux/mali_dma_fence.h | 124 + - .../mali400/mali/linux/mali_internal_sync.c | 783 + - .../mali400/mali/linux/mali_internal_sync.h | 191 + - .../mali400/mali/linux/mali_kernel_linux.c | 1154 + - .../mali400/mali/linux/mali_kernel_linux.h | 36 + - .../mali400/mali/linux/mali_kernel_sysfs.c | 1410 + - .../mali400/mali/linux/mali_kernel_sysfs.h | 29 + - .../arm/mali400/mali/linux/mali_linux_trace.h | 161 + - .../gpu/arm/mali400/mali/linux/mali_memory.c | 531 + - .../gpu/arm/mali400/mali/linux/mali_memory.h | 143 + - .../mali/linux/mali_memory_block_alloc.c | 362 + - .../mali/linux/mali_memory_block_alloc.h | 58 + - .../arm/mali400/mali/linux/mali_memory_cow.c | 776 + - .../arm/mali400/mali/linux/mali_memory_cow.h | 48 + - .../mali/linux/mali_memory_defer_bind.c | 262 + - .../mali/linux/mali_memory_defer_bind.h | 64 + - .../mali400/mali/linux/mali_memory_dma_buf.c | 369 + - .../mali400/mali/linux/mali_memory_dma_buf.h | 53 + - .../mali400/mali/linux/mali_memory_external.c | 89 + - .../mali400/mali/linux/mali_memory_external.h | 29 + - .../mali400/mali/linux/mali_memory_manager.c | 993 + - .../mali400/mali/linux/mali_memory_manager.h | 51 + - .../mali400/mali/linux/mali_memory_os_alloc.c | 810 + - .../mali400/mali/linux/mali_memory_os_alloc.h | 54 + - .../mali400/mali/linux/mali_memory_secure.c | 170 + - .../mali400/mali/linux/mali_memory_secure.h | 30 + - .../mali/linux/mali_memory_swap_alloc.c | 943 + - .../mali/linux/mali_memory_swap_alloc.h | 121 + - .../mali400/mali/linux/mali_memory_types.h | 219 + - .../arm/mali400/mali/linux/mali_memory_ump.c | 154 + - .../arm/mali400/mali/linux/mali_memory_ump.h | 29 + - .../arm/mali400/mali/linux/mali_memory_util.c | 158 + - .../arm/mali400/mali/linux/mali_memory_util.h | 20 + - .../mali400/mali/linux/mali_memory_virtual.c | 127 + - .../mali400/mali/linux/mali_memory_virtual.h | 35 + - .../arm/mali400/mali/linux/mali_osk_atomics.c | 59 + - .../arm/mali400/mali/linux/mali_osk_bitmap.c | 152 + - .../gpu/arm/mali400/mali/linux/mali_osk_irq.c | 200 + - .../arm/mali400/mali/linux/mali_osk_locks.c | 287 + - .../arm/mali400/mali/linux/mali_osk_locks.h | 326 + - .../mali/linux/mali_osk_low_level_mem.c | 146 + - .../arm/mali400/mali/linux/mali_osk_mali.c | 505 + - .../arm/mali400/mali/linux/mali_osk_math.c | 27 + - .../arm/mali400/mali/linux/mali_osk_memory.c | 61 + - .../arm/mali400/mali/linux/mali_osk_misc.c | 81 + - .../mali/linux/mali_osk_notification.c | 182 + - .../gpu/arm/mali400/mali/linux/mali_osk_pm.c | 83 + - .../mali400/mali/linux/mali_osk_profiling.c | 1282 + - .../mali400/mali/linux/mali_osk_specific.h | 74 + - .../arm/mali400/mali/linux/mali_osk_time.c | 59 + - .../arm/mali400/mali/linux/mali_osk_timers.c | 76 + - .../mali400/mali/linux/mali_osk_wait_queue.c | 78 + - .../gpu/arm/mali400/mali/linux/mali_osk_wq.c | 240 + - .../mali/linux/mali_pmu_power_up_down.c | 23 + - .../mali/linux/mali_profiling_events.h | 17 + - .../mali/linux/mali_profiling_gator_api.h | 17 + - .../mali/linux/mali_profiling_internal.c | 275 + - .../mali/linux/mali_profiling_internal.h | 35 + - .../gpu/arm/mali400/mali/linux/mali_sync.c | 665 + - .../gpu/arm/mali400/mali/linux/mali_sync.h | 169 + - .../arm/mali400/mali/linux/mali_uk_types.h | 17 + - .../arm/mali400/mali/linux/mali_ukk_core.c | 171 + - .../gpu/arm/mali400/mali/linux/mali_ukk_gp.c | 91 + - .../gpu/arm/mali400/mali/linux/mali_ukk_mem.c | 333 + - .../gpu/arm/mali400/mali/linux/mali_ukk_pp.c | 105 + - .../mali400/mali/linux/mali_ukk_profiling.c | 183 + - .../mali400/mali/linux/mali_ukk_soft_job.c | 90 + - .../mali400/mali/linux/mali_ukk_timeline.c | 88 + - .../arm/mali400/mali/linux/mali_ukk_vsync.c | 39 + - .../mali400/mali/linux/mali_ukk_wrappers.h | 82 + - .../gpu/arm/mali400/mali/platform/arm/arm.c | 629 + - .../mali/platform/arm/arm_core_scaling.c | 122 + - .../mali/platform/arm/arm_core_scaling.h | 44 + - .../arm/mali400/mali/platform/arm/juno_opp.c | 127 + - .../arm/mali400/mali/platform/rk/custom_log.h | 209 + - drivers/gpu/arm/mali400/mali/platform/rk/rk.c | 676 + - .../gpu/arm/mali400/mali/platform/rk/rk_ext.h | 37 + - drivers/gpu/arm/mali400/mali/readme.txt | 28 + - .../gpu/arm/mali400/mali/regs/mali_200_regs.h | 131 + - .../gpu/arm/mali400/mali/regs/mali_gp_regs.h | 172 + - .../mali/timestamp-arm11-cc/mali_timestamp.c | 13 + - .../mali/timestamp-arm11-cc/mali_timestamp.h | 48 + - .../mali/timestamp-default/mali_timestamp.c | 13 + - .../mali/timestamp-default/mali_timestamp.h | 26 + - drivers/gpu/arm/mali400/rk_ver_info.txt | 11 + - drivers/gpu/arm/mali400/ump/Kbuild | 92 + - drivers/gpu/arm/mali400/ump/Kconfig | 17 + - drivers/gpu/arm/mali400/ump/Makefile | 67 + - drivers/gpu/arm/mali400/ump/Makefile.common | 20 + - .../gpu/arm/mali400/ump/arch-default/config.h | 24 + - .../arm/mali400/ump/arch-pb-virtex5/config.h | 18 + - drivers/gpu/arm/mali400/ump/arch/config.h | 24 + - .../arm/mali400/ump/common/ump_kernel_api.c | 455 + - .../mali400/ump/common/ump_kernel_common.c | 358 + - .../mali400/ump/common/ump_kernel_common.h | 125 + - .../common/ump_kernel_descriptor_mapping.c | 155 + - .../common/ump_kernel_descriptor_mapping.h | 89 + - .../ump/common/ump_kernel_memory_backend.h | 48 + - .../mali400/ump/common/ump_kernel_ref_drv.c | 181 + - .../arm/mali400/ump/common/ump_kernel_types.h | 58 + - drivers/gpu/arm/mali400/ump/common/ump_osk.h | 48 + - .../gpu/arm/mali400/ump/common/ump_uk_types.h | 202 + - drivers/gpu/arm/mali400/ump/common/ump_ukk.h | 60 + - .../linux/license/gpl/ump_kernel_license.h | 30 + - drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h | 54 + - .../arm/mali400/ump/linux/ump_kernel_linux.c | 449 + - .../arm/mali400/ump/linux/ump_kernel_linux.h | 18 + - .../ump_kernel_memory_backend_dedicated.c | 271 + - .../ump_kernel_memory_backend_dedicated.h | 23 + - .../ump/linux/ump_kernel_memory_backend_os.c | 235 + - .../ump/linux/ump_kernel_memory_backend_os.h | 23 + - .../ump/linux/ump_kernel_random_mapping.c | 222 + - .../ump/linux/ump_kernel_random_mapping.h | 84 + - .../mali400/ump/linux/ump_memory_backend.c | 65 + - .../arm/mali400/ump/linux/ump_osk_atomics.c | 27 + - .../mali400/ump/linux/ump_osk_low_level_mem.c | 314 + - .../gpu/arm/mali400/ump/linux/ump_osk_misc.c | 36 + - .../mali400/ump/linux/ump_ukk_ref_wrappers.c | 230 + - .../mali400/ump/linux/ump_ukk_ref_wrappers.h | 36 + - .../arm/mali400/ump/linux/ump_ukk_wrappers.c | 280 + - .../arm/mali400/ump/linux/ump_ukk_wrappers.h | 46 + - drivers/gpu/arm/mali400/ump/readme.txt | 28 + - drivers/gpu/arm/mali400/umplock/Makefile | 69 + - .../gpu/arm/mali400/umplock/umplock_driver.c | 618 + - .../gpu/arm/mali400/umplock/umplock_ioctl.h | 66 + - drivers/gpu/arm/midgard/Kbuild | 221 + - drivers/gpu/arm/midgard/Kconfig | 248 + - drivers/gpu/arm/midgard/Makefile | 42 + - drivers/gpu/arm/midgard/Makefile.kbase | 17 + - drivers/gpu/arm/midgard/backend/gpu/Kbuild | 60 + - .../backend/gpu/mali_kbase_backend_config.h | 29 + - .../gpu/mali_kbase_cache_policy_backend.c | 29 + - .../gpu/mali_kbase_cache_policy_backend.h | 34 + - .../gpu/mali_kbase_debug_job_fault_backend.c | 157 + - .../midgard/backend/gpu/mali_kbase_devfreq.c | 458 + - .../midgard/backend/gpu/mali_kbase_devfreq.h | 24 + - .../backend/gpu/mali_kbase_device_hw.c | 255 + - .../backend/gpu/mali_kbase_device_internal.h | 67 + - .../arm/midgard/backend/gpu/mali_kbase_gpu.c | 123 + - .../backend/gpu/mali_kbase_gpuprops_backend.c | 110 + - .../backend/gpu/mali_kbase_instr_backend.c | 492 + - .../backend/gpu/mali_kbase_instr_defs.h | 58 + - .../backend/gpu/mali_kbase_instr_internal.h | 45 + - .../backend/gpu/mali_kbase_irq_internal.h | 39 + - .../backend/gpu/mali_kbase_irq_linux.c | 469 + - .../midgard/backend/gpu/mali_kbase_jm_as.c | 237 + - .../midgard/backend/gpu/mali_kbase_jm_defs.h | 123 + - .../midgard/backend/gpu/mali_kbase_jm_hw.c | 1518 + - .../backend/gpu/mali_kbase_jm_internal.h | 164 + - .../midgard/backend/gpu/mali_kbase_jm_rb.c | 1952 + - .../midgard/backend/gpu/mali_kbase_jm_rb.h | 76 + - .../backend/gpu/mali_kbase_js_affinity.c | 303 + - .../backend/gpu/mali_kbase_js_affinity.h | 129 + - .../backend/gpu/mali_kbase_js_backend.c | 356 + - .../backend/gpu/mali_kbase_js_internal.h | 69 + - .../backend/gpu/mali_kbase_mmu_hw_direct.c | 407 + - .../backend/gpu/mali_kbase_mmu_hw_direct.h | 42 + - .../backend/gpu/mali_kbase_pm_always_on.c | 63 + - .../backend/gpu/mali_kbase_pm_always_on.h | 77 + - .../backend/gpu/mali_kbase_pm_backend.c | 482 + - .../midgard/backend/gpu/mali_kbase_pm_ca.c | 182 + - .../midgard/backend/gpu/mali_kbase_pm_ca.h | 92 + - .../backend/gpu/mali_kbase_pm_ca_devfreq.c | 129 + - .../backend/gpu/mali_kbase_pm_ca_devfreq.h | 55 + - .../backend/gpu/mali_kbase_pm_ca_fixed.c | 65 + - .../backend/gpu/mali_kbase_pm_ca_fixed.h | 40 + - .../backend/gpu/mali_kbase_pm_coarse_demand.c | 70 + - .../backend/gpu/mali_kbase_pm_coarse_demand.h | 64 + - .../midgard/backend/gpu/mali_kbase_pm_defs.h | 519 + - .../backend/gpu/mali_kbase_pm_demand.c | 73 + - .../backend/gpu/mali_kbase_pm_demand.h | 64 + - .../backend/gpu/mali_kbase_pm_driver.c | 1713 + - .../backend/gpu/mali_kbase_pm_internal.h | 548 + - .../backend/gpu/mali_kbase_pm_metrics.c | 401 + - .../backend/gpu/mali_kbase_pm_policy.c | 973 + - .../backend/gpu/mali_kbase_pm_policy.h | 227 + - .../arm/midgard/backend/gpu/mali_kbase_time.c | 103 + - .../arm/midgard/backend/gpu/mali_kbase_time.h | 52 + - drivers/gpu/arm/midgard/docs/Doxyfile | 126 + - .../midgard/docs/policy_operation_diagram.dot | 112 + - .../gpu/arm/midgard/docs/policy_overview.dot | 63 + - drivers/gpu/arm/midgard/ipa/Kbuild | 24 + - drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c | 585 + - drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h | 148 + - .../arm/midgard/ipa/mali_kbase_ipa_debugfs.c | 219 + - .../arm/midgard/ipa/mali_kbase_ipa_debugfs.h | 49 + - .../arm/midgard/ipa/mali_kbase_ipa_simple.c | 222 + - .../arm/midgard/mali_base_hwconfig_features.h | 311 + - .../arm/midgard/mali_base_hwconfig_issues.h | 1098 + - drivers/gpu/arm/midgard/mali_base_kernel.h | 1858 + - drivers/gpu/arm/midgard/mali_base_mem_priv.h | 52 + - .../midgard/mali_base_vendor_specific_func.h | 24 + - drivers/gpu/arm/midgard/mali_kbase.h | 612 + - .../arm/midgard/mali_kbase_10969_workaround.c | 209 + - .../arm/midgard/mali_kbase_10969_workaround.h | 23 + - .../arm/midgard/mali_kbase_as_fault_debugfs.c | 102 + - .../arm/midgard/mali_kbase_as_fault_debugfs.h | 45 + - .../gpu/arm/midgard/mali_kbase_cache_policy.c | 64 + - .../gpu/arm/midgard/mali_kbase_cache_policy.h | 45 + - drivers/gpu/arm/midgard/mali_kbase_config.c | 51 + - drivers/gpu/arm/midgard/mali_kbase_config.h | 345 + - .../arm/midgard/mali_kbase_config_defaults.h | 227 + - drivers/gpu/arm/midgard/mali_kbase_context.c | 342 + - drivers/gpu/arm/midgard/mali_kbase_context.h | 90 + - .../gpu/arm/midgard/mali_kbase_core_linux.c | 4990 ++ - .../gpu/arm/midgard/mali_kbase_ctx_sched.c | 208 + - .../gpu/arm/midgard/mali_kbase_ctx_sched.h | 134 + - drivers/gpu/arm/midgard/mali_kbase_debug.c | 39 + - drivers/gpu/arm/midgard/mali_kbase_debug.h | 164 + - .../arm/midgard/mali_kbase_debug_job_fault.c | 499 + - .../arm/midgard/mali_kbase_debug_job_fault.h | 96 + - .../arm/midgard/mali_kbase_debug_mem_view.c | 306 + - .../arm/midgard/mali_kbase_debug_mem_view.h | 25 + - drivers/gpu/arm/midgard/mali_kbase_defs.h | 1602 + - drivers/gpu/arm/midgard/mali_kbase_device.c | 674 + - .../arm/midgard/mali_kbase_disjoint_events.c | 76 + - .../gpu/arm/midgard/mali_kbase_dma_fence.c | 449 + - .../gpu/arm/midgard/mali_kbase_dma_fence.h | 131 + - drivers/gpu/arm/midgard/mali_kbase_event.c | 259 + - drivers/gpu/arm/midgard/mali_kbase_fence.c | 200 + - drivers/gpu/arm/midgard/mali_kbase_fence.h | 275 + - .../gpu/arm/midgard/mali_kbase_fence_defs.h | 51 + - drivers/gpu/arm/midgard/mali_kbase_gator.h | 45 + - .../gpu/arm/midgard/mali_kbase_gator_api.c | 334 + - .../gpu/arm/midgard/mali_kbase_gator_api.h | 219 + - .../midgard/mali_kbase_gator_hwcnt_names.h | 2170 + - .../mali_kbase_gator_hwcnt_names_thex.h | 291 + - .../mali_kbase_gator_hwcnt_names_tmix.h | 291 + - .../mali_kbase_gator_hwcnt_names_tsix.h | 291 + - drivers/gpu/arm/midgard/mali_kbase_gpu_id.h | 123 + - .../midgard/mali_kbase_gpu_memory_debugfs.c | 97 + - .../midgard/mali_kbase_gpu_memory_debugfs.h | 37 + - drivers/gpu/arm/midgard/mali_kbase_gpuprops.c | 510 + - drivers/gpu/arm/midgard/mali_kbase_gpuprops.h | 84 + - .../arm/midgard/mali_kbase_gpuprops_types.h | 92 + - drivers/gpu/arm/midgard/mali_kbase_hw.c | 453 + - drivers/gpu/arm/midgard/mali_kbase_hw.h | 65 + - .../arm/midgard/mali_kbase_hwaccess_backend.h | 54 + - .../arm/midgard/mali_kbase_hwaccess_defs.h | 36 + - .../midgard/mali_kbase_hwaccess_gpuprops.h | 47 + - .../arm/midgard/mali_kbase_hwaccess_instr.h | 116 + - .../gpu/arm/midgard/mali_kbase_hwaccess_jm.h | 381 + - .../gpu/arm/midgard/mali_kbase_hwaccess_pm.h | 209 + - .../arm/midgard/mali_kbase_hwaccess_time.h | 53 + - .../gpu/arm/midgard/mali_kbase_hwcnt_reader.h | 66 + - drivers/gpu/arm/midgard/mali_kbase_ioctl.h | 656 + - drivers/gpu/arm/midgard/mali_kbase_jd.c | 1903 + - .../gpu/arm/midgard/mali_kbase_jd_debugfs.c | 233 + - .../gpu/arm/midgard/mali_kbase_jd_debugfs.h | 39 + - drivers/gpu/arm/midgard/mali_kbase_jm.c | 131 + - drivers/gpu/arm/midgard/mali_kbase_jm.h | 110 + - drivers/gpu/arm/midgard/mali_kbase_js.c | 2834 + - drivers/gpu/arm/midgard/mali_kbase_js.h | 925 + - .../gpu/arm/midgard/mali_kbase_js_ctx_attr.c | 301 + - .../gpu/arm/midgard/mali_kbase_js_ctx_attr.h | 158 + - drivers/gpu/arm/midgard/mali_kbase_js_defs.h | 386 + - drivers/gpu/arm/midgard/mali_kbase_linux.h | 43 + - drivers/gpu/arm/midgard/mali_kbase_mem.c | 2657 + - drivers/gpu/arm/midgard/mali_kbase_mem.h | 1068 + - .../gpu/arm/midgard/mali_kbase_mem_linux.c | 2578 + - .../gpu/arm/midgard/mali_kbase_mem_linux.h | 231 + - .../gpu/arm/midgard/mali_kbase_mem_lowlevel.h | 45 + - drivers/gpu/arm/midgard/mali_kbase_mem_pool.c | 569 + - .../arm/midgard/mali_kbase_mem_pool_debugfs.c | 81 + - .../arm/midgard/mali_kbase_mem_pool_debugfs.h | 36 + - .../midgard/mali_kbase_mem_profile_debugfs.c | 121 + - .../midgard/mali_kbase_mem_profile_debugfs.h | 59 + - .../mali_kbase_mem_profile_debugfs_buf_size.h | 33 + - drivers/gpu/arm/midgard/mali_kbase_mmu.c | 2088 + - drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h | 123 + - drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h | 47 + - .../arm/midgard/mali_kbase_mmu_mode_aarch64.c | 200 + - .../arm/midgard/mali_kbase_mmu_mode_lpae.c | 198 + - .../arm/midgard/mali_kbase_platform_fake.c | 124 + - drivers/gpu/arm/midgard/mali_kbase_pm.c | 205 + - drivers/gpu/arm/midgard/mali_kbase_pm.h | 171 + - .../midgard/mali_kbase_profiling_gator_api.h | 40 + - .../midgard/mali_kbase_regs_history_debugfs.c | 130 + - .../midgard/mali_kbase_regs_history_debugfs.h | 50 + - drivers/gpu/arm/midgard/mali_kbase_replay.c | 1166 + - drivers/gpu/arm/midgard/mali_kbase_smc.c | 86 + - drivers/gpu/arm/midgard/mali_kbase_smc.h | 67 + - drivers/gpu/arm/midgard/mali_kbase_softjobs.c | 1549 + - drivers/gpu/arm/midgard/mali_kbase_strings.c | 23 + - drivers/gpu/arm/midgard/mali_kbase_strings.h | 19 + - drivers/gpu/arm/midgard/mali_kbase_sync.h | 203 + - .../gpu/arm/midgard/mali_kbase_sync_android.c | 537 + - .../gpu/arm/midgard/mali_kbase_sync_common.c | 43 + - .../gpu/arm/midgard/mali_kbase_sync_file.c | 359 + - drivers/gpu/arm/midgard/mali_kbase_tlstream.c | 2572 + - drivers/gpu/arm/midgard/mali_kbase_tlstream.h | 623 + - .../gpu/arm/midgard/mali_kbase_trace_defs.h | 264 + - .../arm/midgard/mali_kbase_trace_timeline.c | 236 + - .../arm/midgard/mali_kbase_trace_timeline.h | 363 + - .../midgard/mali_kbase_trace_timeline_defs.h | 140 + - drivers/gpu/arm/midgard/mali_kbase_uku.h | 545 + - drivers/gpu/arm/midgard/mali_kbase_utility.c | 33 + - drivers/gpu/arm/midgard/mali_kbase_utility.h | 37 + - drivers/gpu/arm/midgard/mali_kbase_vinstr.c | 2070 + - drivers/gpu/arm/midgard/mali_kbase_vinstr.h | 155 + - .../gpu/arm/midgard/mali_linux_kbase_trace.h | 201 + - drivers/gpu/arm/midgard/mali_linux_trace.h | 189 + - drivers/gpu/arm/midgard/mali_malisw.h | 131 + - drivers/gpu/arm/midgard/mali_midg_coherency.h | 26 + - drivers/gpu/arm/midgard/mali_midg_regmap.h | 611 + - drivers/gpu/arm/midgard/mali_timeline.h | 396 + - drivers/gpu/arm/midgard/mali_uk.h | 141 + - drivers/gpu/arm/midgard/platform/Kconfig | 24 + - .../arm/midgard/platform/devicetree/Kbuild | 18 + - .../devicetree/mali_kbase_config_devicetree.c | 31 + - .../devicetree/mali_kbase_config_platform.h | 73 + - .../devicetree/mali_kbase_runtime_pm.c | 100 + - .../platform/mali_kbase_platform_common.h | 28 + - .../platform/mali_kbase_platform_fake.h | 38 + - drivers/gpu/arm/midgard/platform/rk/Kbuild | 17 + - .../gpu/arm/midgard/platform/rk/custom_log.h | 209 + - .../platform/rk/mali_kbase_config_platform.h | 88 + - .../platform/rk/mali_kbase_config_rk.c | 492 + - .../arm/midgard/platform/rk/mali_kbase_rk.h | 62 + - .../gpu/arm/midgard/platform/vexpress/Kbuild | 18 + - .../vexpress/mali_kbase_config_platform.h | 75 + - .../vexpress/mali_kbase_config_vexpress.c | 85 + - .../vexpress/mali_kbase_cpu_vexpress.c | 279 + - .../vexpress/mali_kbase_cpu_vexpress.h | 38 + - .../midgard/platform/vexpress_1xv7_a57/Kbuild | 16 + - .../mali_kbase_config_platform.h | 73 + - .../mali_kbase_config_vexpress.c | 79 + - .../platform/vexpress_6xvirtex7_10mhz/Kbuild | 18 + - .../mali_kbase_config_platform.h | 75 + - .../mali_kbase_config_vexpress.c | 83 + - .../mali_kbase_cpu_vexpress.c | 71 + - .../mali_kbase_cpu_vexpress.h | 28 + - .../arm/midgard/platform_dummy/mali_ukk_os.h | 53 + - .../gpu/arm/midgard/protected_mode_switcher.h | 64 + - drivers/gpu/arm/midgard/rename.h | 422 + - drivers/gpu/arm/midgard/sconscript | 92 + - drivers/gpu/arm/midgard/tests/Kbuild | 17 + - drivers/gpu/arm/midgard/tests/Kconfig | 17 + - .../arm/midgard/tests/include/kutf/kutf_mem.h | 65 + - .../tests/include/kutf/kutf_resultset.h | 121 + - .../midgard/tests/include/kutf/kutf_suite.h | 508 + - .../midgard/tests/include/kutf/kutf_utils.h | 55 + - drivers/gpu/arm/midgard/tests/kutf/Kbuild | 20 + - drivers/gpu/arm/midgard/tests/kutf/Kconfig | 22 + - drivers/gpu/arm/midgard/tests/kutf/Makefile | 29 + - drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c | 94 + - .../arm/midgard/tests/kutf/kutf_resultset.c | 95 + - .../gpu/arm/midgard/tests/kutf/kutf_suite.c | 1041 + - .../gpu/arm/midgard/tests/kutf/kutf_utils.c | 71 + - drivers/gpu/arm/midgard/tests/kutf/sconscript | 21 + - .../midgard/tests/mali_kutf_irq_test/Kbuild | 20 + - .../midgard/tests/mali_kutf_irq_test/Kconfig | 23 + - .../midgard/tests/mali_kutf_irq_test/Makefile | 51 + - .../mali_kutf_irq_test_main.c | 257 + - .../tests/mali_kutf_irq_test/sconscript | 30 + - drivers/gpu/arm/midgard/tests/sconscript | 37 + - drivers/gpu/arm/sconscript | 25 + - drivers/gpu/drm/Kconfig | 4 + - .../drm/bridge/analogix/analogix_dp_core.c | 742 +- - .../drm/bridge/analogix/analogix_dp_core.h | 46 +- - .../gpu/drm/bridge/analogix/analogix_dp_reg.c | 959 +- - .../gpu/drm/bridge/analogix/analogix_dp_reg.h | 97 +- - drivers/gpu/drm/bridge/synopsys/Makefile | 5 +- - drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 3 + - .../gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c | 748 + - .../gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h | 54 + - .../drm/bridge/synopsys/dw-hdmi-qp-audio.h | 29 + - .../bridge/synopsys/dw-hdmi-qp-i2s-audio.c | 262 + - drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 2455 + - drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h | 824 + - drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1744 +- - drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 55 + - drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 111 +- - drivers/gpu/drm/drm_atomic_helper.c | 12 +- - drivers/gpu/drm/drm_atomic_state_helper.c | 7 + - drivers/gpu/drm/drm_atomic_uapi.c | 14 + - drivers/gpu/drm/drm_auth.c | 42 +- - drivers/gpu/drm/drm_color_mgmt.c | 41 +- - drivers/gpu/drm/drm_debugfs.c | 3 +- - drivers/gpu/drm/drm_edid.c | 122 +- - drivers/gpu/drm/drm_file.c | 69 +- - drivers/gpu/drm/drm_fourcc.c | 10 + - drivers/gpu/drm/drm_ioctl.c | 8 +- - drivers/gpu/drm/drm_lease.c | 81 +- - drivers/gpu/drm/drm_mipi_dsi.c | 1 + - drivers/gpu/drm/drm_mode_config.c | 16 + - drivers/gpu/drm/drm_modes.c | 2 + - drivers/gpu/drm/drm_prime.c | 23 + - drivers/gpu/drm/drm_sync_helper.c | 314 + - drivers/gpu/drm/drm_vblank.c | 9 +- - drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 +- - drivers/gpu/drm/i915/gt/uc/intel_guc.c | 18 + - drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 131 +- - drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 80 +- - drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 5 - - drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 27 +- - drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 - - drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 6 +- - drivers/gpu/drm/nouveau/nouveau_drm.c | 42 +- - drivers/gpu/drm/nouveau/nouveau_drv.h | 5 - - drivers/gpu/drm/panel/Kconfig | 1 - - drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 12 +- - drivers/gpu/drm/panel/panel-simple.c | 493 +- - drivers/gpu/drm/panel/panel-simple.h | 19 + - drivers/gpu/drm/rockchip/Kconfig | 34 +- - drivers/gpu/drm/rockchip/Makefile | 12 +- - .../gpu/drm/rockchip/analogix_dp-rockchip.c | 426 +- - drivers/gpu/drm/rockchip/cdn-dp-core.c | 109 +- - drivers/gpu/drm/rockchip/cdn-dp-core.h | 5 +- - .../gpu/drm/rockchip/cdn-dp-link-training.c | 439 + - drivers/gpu/drm/rockchip/dw-dp.c | 2519 + - .../gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 596 +- - .../gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c | 1591 + - drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 3007 +- - drivers/gpu/drm/rockchip/ebc-dev/Kconfig | 14 + - drivers/gpu/drm/rockchip/ebc-dev/Makefile | 9 + - .../drm/rockchip/ebc-dev/bufmanage/Makefile | 3 + - .../drm/rockchip/ebc-dev/bufmanage/buf_list.c | 171 + - .../drm/rockchip/ebc-dev/bufmanage/buf_list.h | 95 + - .../rockchip/ebc-dev/bufmanage/buf_manage.c | 327 + - .../rockchip/ebc-dev/bufmanage/buf_manage.h | 49 + - drivers/gpu/drm/rockchip/ebc-dev/ebc_dev.h | 114 + - drivers/gpu/drm/rockchip/ebc-dev/ebc_dev_v8.S | 55302 ++++++++++++++++ - drivers/gpu/drm/rockchip/ebc-dev/ebc_panel.h | 50 + - drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c | 36 + - .../gpu/drm/rockchip/ebc-dev/epdlut/Makefile | 5 + - .../gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c | 72 + - .../gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.h | 66 + - .../rockchip/ebc-dev/epdlut/pvi_waveform_v8.S | 18656 ++++++ - .../rockchip/ebc-dev/epdlut/rkf_waveform_v8.S | 19357 ++++++ - .../gpu/drm/rockchip/ebc-dev/pmic/Makefile | 4 + - .../gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.c | 70 + - .../gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h | 60 + - .../gpu/drm/rockchip/ebc-dev/pmic/tps65185.c | 672 + - .../gpu/drm/rockchip/ebc-dev/tcon/Makefile | 3 + - .../gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c | 416 + - .../gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.h | 119 + - .../gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c | 301 + - drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- - drivers/gpu/drm/rockchip/rk3066_hdmi.c | 2 +- - drivers/gpu/drm/rockchip/rk618/Kconfig | 9 + - drivers/gpu/drm/rockchip/rk618/Makefile | 12 + - drivers/gpu/drm/rockchip/rk618/rk618_dither.c | 50 + - drivers/gpu/drm/rockchip/rk618/rk618_dither.h | 17 + - drivers/gpu/drm/rockchip/rk618/rk618_dsi.c | 1201 + - drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c | 1605 + - drivers/gpu/drm/rockchip/rk618/rk618_lvds.c | 310 + - drivers/gpu/drm/rockchip/rk618/rk618_rgb.c | 303 + - drivers/gpu/drm/rockchip/rk618/rk618_scaler.c | 424 + - drivers/gpu/drm/rockchip/rk618/rk618_vif.c | 260 + - drivers/gpu/drm/rockchip/rk628/Kconfig | 8 + - drivers/gpu/drm/rockchip/rk628/Makefile | 14 + - .../gpu/drm/rockchip/rk628/rk628_combrxphy.c | 995 + - .../gpu/drm/rockchip/rk628/rk628_combtxphy.c | 515 + - .../gpu/drm/rockchip/rk628/rk628_combtxphy.h | 13 + - drivers/gpu/drm/rockchip/rk628/rk628_dsi.c | 1395 + - drivers/gpu/drm/rockchip/rk628/rk628_gvi.c | 668 + - drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c | 1615 + - drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c | 982 + - drivers/gpu/drm/rockchip/rk628/rk628_lvds.c | 325 + - .../drm/rockchip/rk628/rk628_post_process.c | 488 + - drivers/gpu/drm/rockchip/rk628/rk628_rgb.c | 387 + - .../gpu/drm/rockchip/rockchip-mipi-csi-tx.c | 1403 + - .../gpu/drm/rockchip/rockchip-mipi-csi-tx.h | 289 + - .../gpu/drm/rockchip/rockchip_drm_backlight.c | 514 + - .../gpu/drm/rockchip/rockchip_drm_backlight.h | 64 + - .../gpu/drm/rockchip/rockchip_drm_debugfs.c | 217 + - .../gpu/drm/rockchip/rockchip_drm_debugfs.h | 72 + - drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 1399 +- - drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 387 +- - drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 150 +- - drivers/gpu/drm/rockchip/rockchip_drm_fb.h | 16 + - drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 18 +- - drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 637 +- - drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 47 +- - drivers/gpu/drm/rockchip/rockchip_drm_logo.c | 1071 + - drivers/gpu/drm/rockchip/rockchip_drm_logo.h | 42 + - drivers/gpu/drm/rockchip/rockchip_drm_tve.c | 615 + - drivers/gpu/drm/rockchip/rockchip_drm_tve.h | 165 + - drivers/gpu/drm/rockchip/rockchip_drm_vconn.c | 537 + - drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4645 +- - drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 1142 +- - drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 8670 +++ - drivers/gpu/drm/rockchip/rockchip_drm_vvop.c | 371 + - drivers/gpu/drm/rockchip/rockchip_lvds.c | 971 +- - drivers/gpu/drm/rockchip/rockchip_rgb.c | 487 +- - drivers/gpu/drm/rockchip/rockchip_rgb.h | 6 +- - drivers/gpu/drm/rockchip/rockchip_vop2_clk.c | 337 + - drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 2796 + - drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2416 +- - drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 816 +- - drivers/i2c/busses/i2c-rk3x.c | 269 +- - drivers/i2c/i2c-core-base.c | 51 +- - drivers/iio/adc/Kconfig | 7 + - drivers/iio/adc/rockchip_saradc.c | 143 +- - drivers/input/Kconfig | 4 + - drivers/input/Makefile | 2 + - drivers/input/keyboard/Kconfig | 3 + - drivers/input/keyboard/hil_kbd.c | 1 - - drivers/input/keyboard/rk_keys.c | 555 + - drivers/input/remotectl/Kconfig | 19 + - drivers/input/remotectl/Makefile | 8 + - .../input/remotectl/rockchip_pwm_remotectl.c | 828 + - .../input/remotectl/rockchip_pwm_remotectl.h | 160 + - drivers/input/sensors/Kconfig | 23 + - drivers/input/sensors/Makefile | 15 + - drivers/input/sensors/accel/Kconfig | 149 + - drivers/input/sensors/accel/Makefile | 22 + - drivers/input/sensors/accel/bma2xx.c | 2268 + - drivers/input/sensors/accel/da223_core.c | 1907 + - drivers/input/sensors/accel/da223_core.h | 303 + - drivers/input/sensors/accel/da223_cust.c | 898 + - drivers/input/sensors/accel/da223_cust.h | 44 + - drivers/input/sensors/accel/dmard10.c | 454 + - drivers/input/sensors/accel/icm2060x_acc.c | 260 + - drivers/input/sensors/accel/kxtik.c | 359 + - drivers/input/sensors/accel/kxtj9.c | 332 + - drivers/input/sensors/accel/lis3dh.c | 303 + - drivers/input/sensors/accel/lsm303d.c | 362 + - drivers/input/sensors/accel/lsm330_acc.c | 278 + - drivers/input/sensors/accel/mc3230.c | 1353 + - drivers/input/sensors/accel/mma7660.c | 258 + - drivers/input/sensors/accel/mma8452.c | 424 + - drivers/input/sensors/accel/mpu6500_acc.c | 300 + - drivers/input/sensors/accel/mpu6880_acc.c | 296 + - drivers/input/sensors/accel/mxc622x.c | 284 + - drivers/input/sensors/accel/mxc6655xa.c | 262 + - drivers/input/sensors/accel/sc7660.c | 1655 + - drivers/input/sensors/accel/sc7a20.c | 1768 + - drivers/input/sensors/accel/sc7a30.c | 1215 + - drivers/input/sensors/accel/stk8baxx.c | 957 + - drivers/input/sensors/angle/Kconfig | 27 + - drivers/input/sensors/angle/Makefile | 3 + - drivers/input/sensors/angle/angle_kxtik.c | 398 + - drivers/input/sensors/angle/angle_lis3dh.c | 342 + - drivers/input/sensors/compass/Kconfig | 58 + - drivers/input/sensors/compass/Makefile | 8 + - drivers/input/sensors/compass/ak09911.c | 667 + - drivers/input/sensors/compass/ak09918.c | 692 + - drivers/input/sensors/compass/ak8963.c | 714 + - drivers/input/sensors/compass/ak8975.c | 650 + - drivers/input/sensors/gyro/Kconfig | 42 + - drivers/input/sensors/gyro/Makefile | 11 + - drivers/input/sensors/gyro/ewtsa.c | 461 + - drivers/input/sensors/gyro/icm2060x_gyro.c | 216 + - drivers/input/sensors/gyro/l3g20d.c | 257 + - drivers/input/sensors/gyro/l3g4200d.c | 257 + - drivers/input/sensors/gyro/lsm330_gyro.c | 262 + - drivers/input/sensors/gyro/mpu6500_gyro.c | 216 + - drivers/input/sensors/gyro/mpu6880_gyro.c | 216 + - drivers/input/sensors/hall/Kconfig | 16 + - drivers/input/sensors/hall/Makefile | 3 + - drivers/input/sensors/hall/mh248.c | 165 + - drivers/input/sensors/hall/och165t_hall.c | 159 + - drivers/input/sensors/lsensor/Kconfig | 50 + - drivers/input/sensors/lsensor/Makefile | 13 + - drivers/input/sensors/lsensor/cm3217.c | 237 + - drivers/input/sensors/lsensor/cm3218.c | 415 + - drivers/input/sensors/lsensor/cm3232.c | 245 + - drivers/input/sensors/lsensor/isl29023.c | 273 + - drivers/input/sensors/lsensor/ls_al3006.c | 301 + - drivers/input/sensors/lsensor/ls_ap321xx.c | 415 + - drivers/input/sensors/lsensor/ls_em3071x.c | 283 + - drivers/input/sensors/lsensor/ls_stk3171.c | 321 + - drivers/input/sensors/lsensor/ls_stk3410.c | 374 + - drivers/input/sensors/lsensor/ls_us5152.c | 440 + - drivers/input/sensors/lsensor/ls_us5152.h | 235 + - drivers/input/sensors/pressure/Kconfig | 15 + - drivers/input/sensors/pressure/Makefile | 7 + - drivers/input/sensors/pressure/pr_ms5607.c | 297 + - drivers/input/sensors/psensor/Kconfig | 32 + - drivers/input/sensors/psensor/Makefile | 8 + - drivers/input/sensors/psensor/ps_al3006.c | 261 + - drivers/input/sensors/psensor/ps_ap321xx.c | 325 + - drivers/input/sensors/psensor/ps_em3071x.c | 280 + - drivers/input/sensors/psensor/ps_stk3171.c | 268 + - drivers/input/sensors/psensor/ps_stk3410.c | 377 + - drivers/input/sensors/sensor-dev.c | 2042 + - drivers/input/sensors/sensor-i2c.c | 245 + - drivers/input/sensors/temperature/Kconfig | 15 + - drivers/input/sensors/temperature/Makefile | 7 + - .../input/sensors/temperature/tmp_ms5607.c | 314 + - drivers/input/touchscreen/Kconfig | 18 + - drivers/input/touchscreen/Makefile | 4 + - drivers/input/touchscreen/cy8c_touchpad.c | 296 + - drivers/input/touchscreen/cyttsp5/Kconfig | 205 + - drivers/input/touchscreen/cyttsp5/Makefile | 23 + - .../input/touchscreen/cyttsp5/cyttsp5_btn.c | 369 + - .../input/touchscreen/cyttsp5/cyttsp5_core.c | 6292 ++ - .../input/touchscreen/cyttsp5/cyttsp5_core.h | 182 + - .../input/touchscreen/cyttsp5/cyttsp5_debug.c | 393 + - .../cyttsp5/cyttsp5_device_access.c | 5219 ++ - .../touchscreen/cyttsp5/cyttsp5_devtree.c | 785 + - .../input/touchscreen/cyttsp5/cyttsp5_i2c.c | 248 + - .../touchscreen/cyttsp5/cyttsp5_loader.c | 1586 + - .../touchscreen/cyttsp5/cyttsp5_mt_common.c | 793 + - .../input/touchscreen/cyttsp5/cyttsp5_mta.c | 85 + - .../input/touchscreen/cyttsp5/cyttsp5_mtb.c | 93 + - .../touchscreen/cyttsp5/cyttsp5_params.h | 1548 + - .../cyttsp5/cyttsp5_params_pid00.h | 1548 + - .../cyttsp5/cyttsp5_params_pid01.h | 1548 + - .../touchscreen/cyttsp5/cyttsp5_platform.c | 289 + - .../touchscreen/cyttsp5/cyttsp5_platform.h | 60 + - .../touchscreen/cyttsp5/cyttsp5_proximity.c | 555 + - .../input/touchscreen/cyttsp5/cyttsp5_regs.h | 1202 + - .../input/touchscreen/cyttsp5/cyttsp5_spi.c | 255 + - .../cyttsp5/cyttsp5_test_device_access_api.c | 442 + - .../touchscreen/focaltech_touch/Makefile | 18 + - .../focaltech_touch/focaltech_common.h | 159 + - .../focaltech_touch/focaltech_config.h | 244 + - .../focaltech_touch/focaltech_core.c | 1783 + - .../focaltech_touch/focaltech_core.h | 254 + - .../focaltech_touch/focaltech_esdcheck.c | 552 + - .../focaltech_touch/focaltech_ex_fun.c | 1130 + - .../focaltech_touch/focaltech_ex_mode.c | 382 + - .../focaltech_touch/focaltech_flash.c | 1971 + - .../focaltech_touch/focaltech_flash.h | 182 + - .../focaltech_touch/focaltech_flash/Makefile | 8 + - .../focaltech_upgrade_ft8201.c | 1033 + - .../focaltech_touch/focaltech_gesture.c | 597 + - .../focaltech_touch/focaltech_i2c.c | 240 + - .../focaltech_point_report_check.c | 135 + - .../focaltech_touch/focaltech_test/Makefile | 11 + - .../focaltech_test/focaltech_test.c | 1948 + - .../focaltech_test/focaltech_test.h | 589 + - .../focaltech_test/focaltech_test_ini.c | 1220 + - .../focaltech_test/focaltech_test_ini.h | 144 + - .../focaltech_test/supported_ic/Makefile | 6 + - .../supported_ic/focaltech_test_ft8201.c | 1034 + - .../include/firmware/fw_sample.h | 0 - .../FT8006M_Pramboot_V1.6_20180426_le.h | 299 + - .../focaltech_touch_ft5436/Makefile | 16 + - .../focaltech_touch_ft5436/focaltech_common.h | 166 + - .../focaltech_touch_ft5436/focaltech_config.h | 241 + - .../focaltech_touch_ft5436/focaltech_core.c | 1747 + - .../focaltech_touch_ft5436/focaltech_core.h | 263 + - .../focaltech_esdcheck.c | 464 + - .../focaltech_touch_ft5436/focaltech_ex_fun.c | 1181 + - .../focaltech_ex_mode.c | 307 + - .../focaltech_touch_ft5436/focaltech_flash.c | 2011 + - .../focaltech_touch_ft5436/focaltech_flash.h | 205 + - .../focaltech_flash/Makefile | 7 + - .../focaltech_upgrade_ft5436.c | 154 + - .../focaltech_gesture.c | 460 + - .../focaltech_touch_ft5436/focaltech_i2c.c | 193 + - .../focaltech_point_report_check.c | 135 + - .../include/firmware/fw_sample.h | 3223 + - drivers/input/touchscreen/gsl3673.c | 1302 + - drivers/input/touchscreen/gsl3673.h | 5091 ++ - drivers/input/touchscreen/gsl3673_800x1280.c | 1247 + - drivers/input/touchscreen/gsl3673_800x1280.h | 5187 ++ - drivers/input/touchscreen/gsl3676/Makefile | 3 + - drivers/input/touchscreen/gsl3676/gsl3676.c | 1261 + - .../touchscreen/gsl3676/rk3368_th863c_10.h | 5331 ++ - drivers/input/touchscreen/gsl_point_id.c | 3100 + - drivers/input/touchscreen/gslx680.c | 1905 + - drivers/input/touchscreen/gslx680.h | 10368 +++ - drivers/input/touchscreen/gslx6801.c | 1680 + - drivers/input/touchscreen/gslx6801.h | 4955 ++ - .../input/touchscreen/gslx680_d708/Makefile | 9 + - .../gslx680_d708/rockchip_gsl3670.h | 5047 ++ - .../gslx680_d708/rockchip_gslX680.c | 1393 + - .../gslx680_d708/rockchip_gslX680_88v.h | 5248 ++ - drivers/input/touchscreen/gslx680_firefly.c | 1130 + - drivers/input/touchscreen/gslx680_firefly.h | 5120 ++ - drivers/input/touchscreen/gslx680_pad.c | 1198 + - drivers/input/touchscreen/gslx680_pad.h | 10232 +++ - drivers/input/touchscreen/gslx680a.c | 1320 + - .../gt1x/GT5688_Config_20170713_1080_1920.cfg | 1 + - drivers/input/touchscreen/gt1x/Makefile | 8 + - drivers/input/touchscreen/gt1x/gt1x.c | 809 + - drivers/input/touchscreen/gt1x/gt1x.h | 64 + - drivers/input/touchscreen/gt1x/gt1x_cfg.h | 27 + - drivers/input/touchscreen/gt1x/gt1x_extents.c | 928 + - .../input/touchscreen/gt1x/gt1x_firmware.h | 548 + - drivers/input/touchscreen/gt1x/gt1x_generic.c | 2445 + - drivers/input/touchscreen/gt1x/gt1x_generic.h | 595 + - drivers/input/touchscreen/gt1x/gt1x_tools.c | 433 + - drivers/input/touchscreen/gt1x/gt1x_update.c | 1456 + - ...T9110P(2020)V71_Config_20201028_170326.cfg | 19 + - .../GT9110P_Config_20160217_1526_2048_97.cfg | 1 + - .../gt9xx/GT9271_Config_20170526.cfg | 1 + - ...-1398V1-1060-GT911_Config_20201204_V66.cfg | 1 + - drivers/input/touchscreen/gt9xx/Makefile | 6 + - ...GT9271_1060_Config_20140821_1341110X42.cfg | 1 + - ...WGJ10162_GT9271_Config_20140820_182456.cfg | 1 + - ...0187_GT910_Config_20140623_104014_0X41.cfg | 1 + - ...187_GT9271_Config_20140623_104014_0X41.cfg | 1 + - ...006B_GT911_Config_20140625_085816_0X43.cfg | 1 + - ...06B_GT9271_Config_20140625_085816_0X41.cfg | 1 + - drivers/input/touchscreen/gt9xx/goodix_tool.c | 627 + - drivers/input/touchscreen/gt9xx/gt9xx.c | 3236 + - drivers/input/touchscreen/gt9xx/gt9xx.h | 397 + - drivers/input/touchscreen/gt9xx/gt9xx_cfg.h | 65 + - .../input/touchscreen/gt9xx/gt9xx_firmware.h | 2338 + - .../input/touchscreen/gt9xx/gt9xx_update.c | 3637 + - .../hyn_cst2xx/CST21680SE_S126_D863_7.h | 514 + - .../hyn_cst2xx/CST21680SE_S126_D89.h | 514 + - drivers/input/touchscreen/hyn_cst2xx/Makefile | 2 + - .../input/touchscreen/hyn_cst2xx/hyn_cst2xx.c | 1970 + - drivers/input/touchscreen/tp_gslx680_board.h | 4908 ++ - drivers/input/touchscreen/tp_suspend.h | 109 + - .../LX20JS06_A1_CT363_V03_5198_121015.dat | 4096 ++ - drivers/input/touchscreen/vtl_ts/Makefile | 9 + - drivers/input/touchscreen/vtl_ts/apk.c | 232 + - drivers/input/touchscreen/vtl_ts/apk.h | 7 + - drivers/input/touchscreen/vtl_ts/chip.c | 860 + - drivers/input/touchscreen/vtl_ts/chip.h | 13 + - ...07&f317&f316_CT363S_01_V10_F7E9_140212.dat | 2048 + - .../lx--js77_97_CT365_V01_E7DA_130419.dat | 2048 + - drivers/input/touchscreen/vtl_ts/tp_fw.h | 2051 + - drivers/input/touchscreen/vtl_ts/vtl_ts.c | 728 + - drivers/input/touchscreen/vtl_ts/vtl_ts.h | 193 + - .../wgj36js07_A1_CT363_V01_0187_140306.dat | 2048 + - drivers/input/touchscreen/wacom_w9013.c | 510 + - drivers/iommu/Kconfig | 3 +- - drivers/iommu/dma-iommu-ops.c | 473 + - drivers/iommu/dma-iommu.c | 50 + - drivers/iommu/iommu.c | 155 +- - drivers/iommu/rockchip-iommu.c | 690 +- - drivers/irqchip/Kconfig | 5 +- - drivers/irqchip/irq-gic-v3-its.c | 60 +- - drivers/irqchip/irq-gic-v3.c | 26 + - drivers/irqchip/irq-gic-v4.c | 19 + - drivers/irqchip/irq-meson-gpio.c | 89 +- - drivers/mailbox/rockchip-mailbox.c | 135 +- - drivers/media/i2c/Kconfig | 11 + - drivers/media/i2c/Makefile | 1 + - drivers/media/i2c/gc8034.c | 2827 + - drivers/media/i2c/rk628_csi.c | 2696 + - drivers/media/i2c/rk628_csi.h | 344 + - drivers/media/platform/Kconfig | 3 + - drivers/media/platform/Makefile | 3 + - drivers/media/platform/rockchip-tsp/Kconfig | 12 + - drivers/media/platform/rockchip-tsp/Makefile | 6 + - .../platform/rockchip-tsp/rockchip_tsp.c | 1182 + - .../platform/rockchip-tsp/rockchip_tsp.h | 230 + - drivers/media/platform/rockchip/cif/Kconfig | 40 + - drivers/media/platform/rockchip/cif/Makefile | 11 + - drivers/media/platform/rockchip/cif/capture.c | 7915 +++ - .../media/platform/rockchip/cif/cif-luma.c | 520 + - .../media/platform/rockchip/cif/cif-luma.h | 83 + - .../media/platform/rockchip/cif/cif-scale.c | 1202 + - drivers/media/platform/rockchip/cif/common.c | 187 + - drivers/media/platform/rockchip/cif/common.h | 27 + - drivers/media/platform/rockchip/cif/dev.c | 1928 + - drivers/media/platform/rockchip/cif/dev.h | 786 + - drivers/media/platform/rockchip/cif/hw.c | 1186 + - drivers/media/platform/rockchip/cif/hw.h | 130 + - .../media/platform/rockchip/cif/mipi-csi2.c | 940 + - .../media/platform/rockchip/cif/mipi-csi2.h | 159 + - drivers/media/platform/rockchip/cif/procfs.c | 406 + - drivers/media/platform/rockchip/cif/procfs.h | 25 + - drivers/media/platform/rockchip/cif/regs.h | 979 + - .../media/platform/rockchip/cif/subdev-itf.c | 635 + - .../media/platform/rockchip/cif/subdev-itf.h | 69 + - drivers/media/platform/rockchip/cif/version.h | 74 + - drivers/media/platform/rockchip/isp/Kconfig | 39 + - drivers/media/platform/rockchip/isp/Makefile | 42 + - drivers/media/platform/rockchip/isp/bridge.c | 629 + - drivers/media/platform/rockchip/isp/bridge.h | 105 + - .../media/platform/rockchip/isp/bridge_v20.c | 1094 + - .../media/platform/rockchip/isp/bridge_v30.c | 236 + - drivers/media/platform/rockchip/isp/capture.c | 1717 + - drivers/media/platform/rockchip/isp/capture.h | 295 + - .../media/platform/rockchip/isp/capture_v1x.c | 957 + - .../media/platform/rockchip/isp/capture_v1x.h | 17 + - .../media/platform/rockchip/isp/capture_v20.c | 1969 + - .../media/platform/rockchip/isp/capture_v21.c | 1699 + - .../media/platform/rockchip/isp/capture_v2x.h | 48 + - .../media/platform/rockchip/isp/capture_v30.c | 1495 + - .../media/platform/rockchip/isp/capture_v3x.h | 23 + - drivers/media/platform/rockchip/isp/common.c | 369 + - drivers/media/platform/rockchip/isp/common.h | 212 + - drivers/media/platform/rockchip/isp/csi.c | 637 + - drivers/media/platform/rockchip/isp/csi.h | 83 + - drivers/media/platform/rockchip/isp/dev.c | 913 + - drivers/media/platform/rockchip/isp/dev.h | 238 + - drivers/media/platform/rockchip/isp/dmarx.c | 1183 + - drivers/media/platform/rockchip/isp/dmarx.h | 67 + - drivers/media/platform/rockchip/isp/hw.c | 1019 + - drivers/media/platform/rockchip/isp/hw.h | 89 + - .../platform/rockchip/isp/isp_external.h | 44 + - .../media/platform/rockchip/isp/isp_ispp.h | 138 + - .../platform/rockchip/isp/isp_mipi_luma.c | 524 + - .../platform/rockchip/isp/isp_mipi_luma.h | 79 + - .../media/platform/rockchip/isp/isp_params.c | 459 + - .../media/platform/rockchip/isp/isp_params.h | 147 + - .../platform/rockchip/isp/isp_params_v1x.c | 2352 + - .../platform/rockchip/isp/isp_params_v1x.h | 87 + - .../platform/rockchip/isp/isp_params_v21.c | 4195 ++ - .../platform/rockchip/isp/isp_params_v21.h | 175 + - .../platform/rockchip/isp/isp_params_v2x.c | 4466 ++ - .../platform/rockchip/isp/isp_params_v2x.h | 359 + - .../platform/rockchip/isp/isp_params_v3x.c | 4688 ++ - .../platform/rockchip/isp/isp_params_v3x.h | 210 + - .../media/platform/rockchip/isp/isp_stats.c | 373 + - .../media/platform/rockchip/isp/isp_stats.h | 89 + - .../platform/rockchip/isp/isp_stats_v1x.c | 420 + - .../platform/rockchip/isp/isp_stats_v1x.h | 42 + - .../platform/rockchip/isp/isp_stats_v21.c | 1166 + - .../platform/rockchip/isp/isp_stats_v21.h | 52 + - .../platform/rockchip/isp/isp_stats_v2x.c | 1526 + - .../platform/rockchip/isp/isp_stats_v2x.h | 70 + - .../platform/rockchip/isp/isp_stats_v3x.c | 1309 + - .../platform/rockchip/isp/isp_stats_v3x.h | 52 + - drivers/media/platform/rockchip/isp/procfs.c | 805 + - drivers/media/platform/rockchip/isp/procfs.h | 21 + - drivers/media/platform/rockchip/isp/regs.c | 328 + - drivers/media/platform/rockchip/isp/regs.h | 2031 + - .../media/platform/rockchip/isp/regs_v2x.h | 2717 + - .../media/platform/rockchip/isp/regs_v3x.h | 1822 + - drivers/media/platform/rockchip/isp/rkisp.c | 3578 + - drivers/media/platform/rockchip/isp/rkisp.h | 197 + - .../platform/rockchip/isp/rkisp_tb_helper.c | 266 + - .../platform/rockchip/isp/rkisp_tb_helper.h | 33 + - drivers/media/platform/rockchip/isp/version.h | 224 + - .../platform/rockchip/isp/videobuf2-rdma-sg.c | 608 + - drivers/media/platform/rockchip/isp1/Kconfig | 12 + - drivers/media/platform/rockchip/isp1/Makefile | 10 + - .../media/platform/rockchip/isp1/capture.c | 2313 + - .../media/platform/rockchip/isp1/capture.h | 219 + - drivers/media/platform/rockchip/isp1/common.h | 133 + - drivers/media/platform/rockchip/isp1/dev.c | 1200 + - drivers/media/platform/rockchip/isp1/dev.h | 173 + - drivers/media/platform/rockchip/isp1/dmarx.c | 687 + - drivers/media/platform/rockchip/isp1/dmarx.h | 29 + - .../media/platform/rockchip/isp1/isp_params.c | 2655 + - .../media/platform/rockchip/isp1/isp_params.h | 151 + - .../media/platform/rockchip/isp1/isp_stats.c | 684 + - .../media/platform/rockchip/isp1/isp_stats.h | 112 + - drivers/media/platform/rockchip/isp1/regs.c | 244 + - drivers/media/platform/rockchip/isp1/regs.h | 1994 + - drivers/media/platform/rockchip/isp1/rkisp1.c | 1873 + - drivers/media/platform/rockchip/isp1/rkisp1.h | 163 + - .../media/platform/rockchip/isp1/version.h | 61 + - drivers/media/platform/rockchip/ispp/Kconfig | 31 + - drivers/media/platform/rockchip/ispp/Makefile | 23 + - drivers/media/platform/rockchip/ispp/common.c | 595 + - drivers/media/platform/rockchip/ispp/common.h | 145 + - drivers/media/platform/rockchip/ispp/dev.c | 385 + - drivers/media/platform/rockchip/ispp/dev.h | 60 + - drivers/media/platform/rockchip/ispp/fec.c | 480 + - drivers/media/platform/rockchip/ispp/fec.h | 27 + - drivers/media/platform/rockchip/ispp/hw.c | 510 + - drivers/media/platform/rockchip/ispp/hw.h | 67 + - drivers/media/platform/rockchip/ispp/ispp.c | 590 + - drivers/media/platform/rockchip/ispp/ispp.h | 50 + - drivers/media/platform/rockchip/ispp/params.c | 427 + - drivers/media/platform/rockchip/ispp/params.h | 69 + - .../media/platform/rockchip/ispp/params_v10.c | 739 + - .../media/platform/rockchip/ispp/params_v20.c | 209 + - drivers/media/platform/rockchip/ispp/procfs.c | 143 + - drivers/media/platform/rockchip/ispp/procfs.h | 21 + - drivers/media/platform/rockchip/ispp/regs.h | 523 + - drivers/media/platform/rockchip/ispp/stats.c | 388 + - drivers/media/platform/rockchip/ispp/stats.h | 53 + - drivers/media/platform/rockchip/ispp/stream.c | 2016 + - drivers/media/platform/rockchip/ispp/stream.h | 280 + - .../media/platform/rockchip/ispp/stream_v10.c | 1733 + - .../media/platform/rockchip/ispp/stream_v20.c | 463 + - .../media/platform/rockchip/ispp/version.h | 138 + - drivers/media/usb/uvc/uvc_driver.c | 7 +- - drivers/media/v4l2-core/v4l2-async.c | 54 + - drivers/mfd/rk808.c | 928 +- - drivers/mmc/core/block.c | 3 + - drivers/mmc/core/block.h | 1 + - drivers/mmc/core/core.h | 2 + - drivers/mmc/core/host.c | 45 + - drivers/mmc/core/sdio.c | 424 +- - drivers/mmc/host/Makefile | 1 + - drivers/mmc/host/dw_mmc-rockchip.c | 95 +- - drivers/mmc/host/dw_mmc.h | 2 + - drivers/mmc/host/rk_sdmmc.h | 387 + - drivers/mmc/host/rk_sdmmc_ops.c | 194 + - drivers/mmc/host/rk_sdmmc_ops.h | 11 + - drivers/mmc/host/sdhci-of-dwcmshc.c | 260 +- - drivers/mtd/nand/raw/Kconfig | 12 + - drivers/mtd/nand/raw/Makefile | 1 + - .../mtd/nand/raw/rockchip-nand-controller.c | 1495 + - .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 10 - - drivers/net/ethernet/stmicro/stmmac/Makefile | 3 +- - .../ethernet/stmicro/stmmac/dwmac-rk-tool.c | 1613 + - .../ethernet/stmicro/stmmac/dwmac-rk-tool.h | 25 + - .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 932 +- - drivers/net/wireless/Kconfig | 1 + - drivers/net/wireless/Makefile | 1 + - drivers/net/wireless/marvell/mwifiex/usb.c | 3 +- - drivers/net/wireless/rockchip_wlan/Kconfig | 39 + - drivers/net/wireless/rockchip_wlan/Makefile | 3 + - .../net/wireless/rockchip_wlan/rkwifi/Kconfig | 33 + - .../wireless/rockchip_wlan/rkwifi/Makefile | 10 + - .../rockchip_wlan/rkwifi/bcmdhd_wifi6/Kconfig | 59 + - .../rkwifi/bcmdhd_wifi6/Makefile | 258 + - .../rkwifi/bcmdhd_wifi6/aiutils.c | 2099 + - .../rkwifi/bcmdhd_wifi6/bcm_app_utils.c | 1033 + - .../rkwifi/bcmdhd_wifi6/bcmbloom.c | 243 + - .../rkwifi/bcmdhd_wifi6/bcmevent.c | 396 + - .../rkwifi/bcmdhd_wifi6/bcmsdh.c | 893 + - .../rkwifi/bcmdhd_wifi6/bcmsdh_linux.c | 524 + - .../rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc.c | 1801 + - .../rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc_linux.c | 381 + - .../rkwifi/bcmdhd_wifi6/bcmsdspi_linux.c | 438 + - .../rkwifi/bcmdhd_wifi6/bcmspibrcm.c | 1800 + - .../rkwifi/bcmdhd_wifi6/bcmstdlib_s.c | 314 + - .../rkwifi/bcmdhd_wifi6/bcmutils.c | 4379 ++ - .../rkwifi/bcmdhd_wifi6/bcmwifi_channels.c | 1494 + - .../rkwifi/bcmdhd_wifi6/bcmwifi_channels.h | 816 + - .../rkwifi/bcmdhd_wifi6/bcmwifi_rates.h | 832 + - .../rkwifi/bcmdhd_wifi6/bcmwifi_rspec.h | 213 + - .../rkwifi/bcmdhd_wifi6/bcmxtlv.c | 623 + - .../rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus.c | 2903 + - .../rkwifi/bcmdhd_wifi6/dbus_usb.c | 1173 + - .../rkwifi/bcmdhd_wifi6/dbus_usb_linux.c | 3404 + - .../rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h | 3433 + - .../rkwifi/bcmdhd_wifi6/dhd_bus.h | 357 + - .../rkwifi/bcmdhd_wifi6/dhd_buzzz.h | 38 + - .../rkwifi/bcmdhd_wifi6/dhd_ccode.c | 274 + - .../rkwifi/bcmdhd_wifi6/dhd_cdc.c | 981 + - .../rkwifi/bcmdhd_wifi6/dhd_cfg80211.c | 332 + - .../rkwifi/bcmdhd_wifi6/dhd_cfg80211.h | 55 + - .../rkwifi/bcmdhd_wifi6/dhd_common.c | 7496 +++ - .../rkwifi/bcmdhd_wifi6/dhd_config.c | 4730 ++ - .../rkwifi/bcmdhd_wifi6/dhd_config.h | 384 + - .../rkwifi/bcmdhd_wifi6/dhd_csi.c | 220 + - .../rkwifi/bcmdhd_wifi6/dhd_csi.h | 77 + - .../rkwifi/bcmdhd_wifi6/dhd_custom_gpio.c | 279 + - .../rkwifi/bcmdhd_wifi6/dhd_custom_hikey.c | 294 + - .../bcmdhd_wifi6/dhd_custom_memprealloc.c | 562 + - .../rkwifi/bcmdhd_wifi6/dhd_dbg.h | 367 + - .../rkwifi/bcmdhd_wifi6/dhd_dbg_ring.c | 426 + - .../rkwifi/bcmdhd_wifi6/dhd_dbg_ring.h | 141 + - .../rkwifi/bcmdhd_wifi6/dhd_debug.c | 2411 + - .../rkwifi/bcmdhd_wifi6/dhd_debug.h | 853 + - .../rkwifi/bcmdhd_wifi6/dhd_debug_linux.c | 516 + - .../rkwifi/bcmdhd_wifi6/dhd_flowring.c | 1238 + - .../rkwifi/bcmdhd_wifi6/dhd_flowring.h | 289 + - .../rkwifi/bcmdhd_wifi6/dhd_gpio.c | 350 + - .../rkwifi/bcmdhd_wifi6/dhd_ip.c | 1429 + - .../rkwifi/bcmdhd_wifi6/dhd_ip.h | 97 + - .../rkwifi/bcmdhd_wifi6/dhd_linux.c | 22453 +++++++ - .../rkwifi/bcmdhd_wifi6/dhd_linux.h | 448 + - .../rkwifi/bcmdhd_wifi6/dhd_linux_exportfs.c | 1420 + - .../rkwifi/bcmdhd_wifi6/dhd_linux_lb.c | 1324 + - .../rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c | 1472 + - .../rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h | 125 + - .../rkwifi/bcmdhd_wifi6/dhd_linux_platdev.c | 1041 + - .../rkwifi/bcmdhd_wifi6/dhd_linux_priv.h | 432 + - .../rkwifi/bcmdhd_wifi6/dhd_linux_sched.c | 52 + - .../rkwifi/bcmdhd_wifi6/dhd_linux_wq.c | 397 + - .../rkwifi/bcmdhd_wifi6/dhd_linux_wq.h | 93 + - .../rkwifi/bcmdhd_wifi6/dhd_mschdbg.c | 789 + - .../rkwifi/bcmdhd_wifi6/dhd_mschdbg.h | 40 + - .../rkwifi/bcmdhd_wifi6/dhd_msgbuf.c | 11162 ++++ - .../rkwifi/bcmdhd_wifi6/dhd_pcie.c | 11618 ++++ - .../rkwifi/bcmdhd_wifi6/dhd_pcie.h | 596 + - .../rkwifi/bcmdhd_wifi6/dhd_pcie_linux.c | 2738 + - .../rkwifi/bcmdhd_wifi6/dhd_pno.c | 4458 ++ - .../rkwifi/bcmdhd_wifi6/dhd_pno.h | 590 + - .../rkwifi/bcmdhd_wifi6/dhd_proto.h | 243 + - .../rkwifi/bcmdhd_wifi6/dhd_rtt.c | 4103 ++ - .../rkwifi/bcmdhd_wifi6/dhd_rtt.h | 537 + - .../rkwifi/bcmdhd_wifi6/dhd_sdio.c | 10489 +++ - .../rkwifi/bcmdhd_wifi6/dhd_static_buf.c | 586 + - .../rkwifi/bcmdhd_wifi6/dhd_wlfc.c | 4616 ++ - .../rkwifi/bcmdhd_wifi6/dhd_wlfc.h | 796 + - .../rkwifi/bcmdhd_wifi6/dngl_stats.h | 387 + - .../rkwifi/bcmdhd_wifi6/dngl_wlhdr.h | 44 + - .../rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c | 113 + - .../rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.h | 39 + - .../rkwifi/bcmdhd_wifi6/hdf_public_ap6275s.h | 125 + - .../rkwifi/bcmdhd_wifi6/hnd_pktpool.c | 1428 + - .../rkwifi/bcmdhd_wifi6/hnd_pktq.c | 1429 + - .../rkwifi/bcmdhd_wifi6/hndlhl.c | 538 + - .../rkwifi/bcmdhd_wifi6/hndmem.c | 430 + - .../rkwifi/bcmdhd_wifi6/hndpmu.c | 789 + - .../rkwifi/bcmdhd_wifi6/include/802.11.h | 5364 ++ - .../rkwifi/bcmdhd_wifi6/include/802.11e.h | 140 + - .../rkwifi/bcmdhd_wifi6/include/802.11s.h | 335 + - .../rkwifi/bcmdhd_wifi6/include/802.1d.h | 54 + - .../rkwifi/bcmdhd_wifi6/include/802.3.h | 56 + - .../rkwifi/bcmdhd_wifi6/include/aidmp.h | 430 + - .../rkwifi/bcmdhd_wifi6/include/bcm_cfg.h | 33 + - .../bcmdhd_wifi6/include/bcm_mpool_pub.h | 351 + - .../rkwifi/bcmdhd_wifi6/include/bcm_ring.h | 614 + - .../rkwifi/bcmdhd_wifi6/include/bcmarp.h | 91 + - .../rkwifi/bcmdhd_wifi6/include/bcmbloom.h | 80 + - .../rkwifi/bcmdhd_wifi6/include/bcmcdc.h | 122 + - .../rkwifi/bcmdhd_wifi6/include/bcmdefs.h | 616 + - .../rkwifi/bcmdhd_wifi6/include/bcmdevs.h | 945 + - .../rkwifi/bcmdhd_wifi6/include/bcmdhcp.h | 93 + - .../rkwifi/bcmdhd_wifi6/include/bcmendian.h | 417 + - .../rkwifi/bcmdhd_wifi6/include/bcmeth.h | 116 + - .../rkwifi/bcmdhd_wifi6/include/bcmevent.h | 1297 + - .../rkwifi/bcmdhd_wifi6/include/bcmicmp.h | 90 + - .../rkwifi/bcmdhd_wifi6/include/bcmiov.h | 357 + - .../rkwifi/bcmdhd_wifi6/include/bcmip.h | 251 + - .../rkwifi/bcmdhd_wifi6/include/bcmipv6.h | 162 + - .../rkwifi/bcmdhd_wifi6/include/bcmmsgbuf.h | 1395 + - .../rkwifi/bcmdhd_wifi6/include/bcmnvram.h | 329 + - .../rkwifi/bcmdhd_wifi6/include/bcmpcie.h | 537 + - .../rkwifi/bcmdhd_wifi6/include/bcmpcispi.h | 182 + - .../rkwifi/bcmdhd_wifi6/include/bcmperf.h | 40 + - .../rkwifi/bcmdhd_wifi6/include/bcmsdbus.h | 184 + - .../rkwifi/bcmdhd_wifi6/include/bcmsdh.h | 279 + - .../bcmdhd_wifi6/include/bcmsdh_sdmmc.h | 130 + - .../rkwifi/bcmdhd_wifi6/include/bcmsdpcm.h | 310 + - .../rkwifi/bcmdhd_wifi6/include/bcmsdspi.h | 139 + - .../rkwifi/bcmdhd_wifi6/include/bcmsdstd.h | 282 + - .../rkwifi/bcmdhd_wifi6/include/bcmspi.h | 44 + - .../rkwifi/bcmdhd_wifi6/include/bcmspibrcm.h | 168 + - .../rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h | 1014 + - .../rkwifi/bcmdhd_wifi6/include/bcmsrom_tbl.h | 1459 + - .../rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h | 52 + - .../rkwifi/bcmdhd_wifi6/include/bcmtcp.h | 93 + - .../rkwifi/bcmdhd_wifi6/include/bcmtlv.h | 343 + - .../rkwifi/bcmdhd_wifi6/include/bcmudp.h | 61 + - .../rkwifi/bcmdhd_wifi6/include/bcmutils.h | 1342 + - .../bcmdhd_wifi6/include/brcm_nl80211.h | 73 + - .../rkwifi/bcmdhd_wifi6/include/dbus.h | 599 + - .../rkwifi/bcmdhd_wifi6/include/dhd_daemon.h | 67 + - .../rkwifi/bcmdhd_wifi6/include/dhdioctl.h | 278 + - .../rkwifi/bcmdhd_wifi6/include/dnglevent.h | 142 + - .../rkwifi/bcmdhd_wifi6/include/eapol.h | 283 + - .../rkwifi/bcmdhd_wifi6/include/epivers.h | 52 + - .../rkwifi/bcmdhd_wifi6/include/etd.h | 626 + - .../rkwifi/bcmdhd_wifi6/include/ethernet.h | 225 + - .../rkwifi/bcmdhd_wifi6/include/event_log.h | 423 + - .../bcmdhd_wifi6/include/event_log_payload.h | 1017 + - .../bcmdhd_wifi6/include/event_log_set.h | 124 + - .../bcmdhd_wifi6/include/event_log_tag.h | 479 + - .../rkwifi/bcmdhd_wifi6/include/event_trace.h | 124 + - .../rkwifi/bcmdhd_wifi6/include/fils.h | 295 + - .../rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h | 90 + - .../rkwifi/bcmdhd_wifi6/include/hnd_cons.h | 87 + - .../rkwifi/bcmdhd_wifi6/include/hnd_debug.h | 169 + - .../rkwifi/bcmdhd_wifi6/include/hnd_pktpool.h | 244 + - .../rkwifi/bcmdhd_wifi6/include/hnd_pktq.h | 326 + - .../rkwifi/bcmdhd_wifi6/include/hnd_trap.h | 40 + - .../rkwifi/bcmdhd_wifi6/include/hndchipc.h | 54 + - .../rkwifi/bcmdhd_wifi6/include/hndlhl.h | 62 + - .../rkwifi/bcmdhd_wifi6/include/hndmem.h | 81 + - .../rkwifi/bcmdhd_wifi6/include/hndoobr.h | 76 + - .../rkwifi/bcmdhd_wifi6/include/hndpmu.h | 80 + - .../rkwifi/bcmdhd_wifi6/include/hndsoc.h | 351 + - .../rkwifi/bcmdhd_wifi6/include/linux_osl.h | 636 + - .../rkwifi/bcmdhd_wifi6/include/linux_pkt.h | 236 + - .../rkwifi/bcmdhd_wifi6/include/linuxver.h | 900 + - .../rkwifi/bcmdhd_wifi6/include/lpflags.h | 46 + - .../rkwifi/bcmdhd_wifi6/include/mbo.h | 286 + - .../rkwifi/bcmdhd_wifi6/include/miniopt.h | 80 + - .../rkwifi/bcmdhd_wifi6/include/msf.h | 67 + - .../rkwifi/bcmdhd_wifi6/include/msgtrace.h | 63 + - .../rkwifi/bcmdhd_wifi6/include/nan.h | 1559 + - .../rkwifi/bcmdhd_wifi6/include/osl.h | 378 + - .../rkwifi/bcmdhd_wifi6/include/osl_decl.h | 38 + - .../rkwifi/bcmdhd_wifi6/include/osl_ext.h | 766 + - .../rkwifi/bcmdhd_wifi6/include/p2p.h | 702 + - .../bcmdhd_wifi6/include/packed_section_end.h | 60 + - .../include/packed_section_start.h | 105 + - .../rkwifi/bcmdhd_wifi6/include/pcicfg.h | 402 + - .../rkwifi/bcmdhd_wifi6/include/pcie_core.h | 1193 + - .../rkwifi/bcmdhd_wifi6/include/rte_ioctl.h | 104 + - .../rkwifi/bcmdhd_wifi6/include/sbchipc.h | 4619 ++ - .../rkwifi/bcmdhd_wifi6/include/sbconfig.h | 286 + - .../rkwifi/bcmdhd_wifi6/include/sbgci.h | 274 + - .../rkwifi/bcmdhd_wifi6/include/sbhndarm.h | 142 + - .../rkwifi/bcmdhd_wifi6/include/sbhnddma.h | 450 + - .../rkwifi/bcmdhd_wifi6/include/sbpcmcia.h | 138 + - .../rkwifi/bcmdhd_wifi6/include/sbsdio.h | 189 + - .../rkwifi/bcmdhd_wifi6/include/sbsdpcmdev.h | 312 + - .../rkwifi/bcmdhd_wifi6/include/sbsocram.h | 205 + - .../rkwifi/bcmdhd_wifi6/include/sbsysmem.h | 181 + - .../rkwifi/bcmdhd_wifi6/include/sdio.h | 626 + - .../rkwifi/bcmdhd_wifi6/include/sdioh.h | 451 + - .../rkwifi/bcmdhd_wifi6/include/sdiovar.h | 125 + - .../rkwifi/bcmdhd_wifi6/include/sdspi.h | 79 + - .../rkwifi/bcmdhd_wifi6/include/siutils.h | 810 + - .../rkwifi/bcmdhd_wifi6/include/spid.h | 169 + - .../rkwifi/bcmdhd_wifi6/include/trxhdr.h | 96 + - .../rkwifi/bcmdhd_wifi6/include/typedefs.h | 368 + - .../rkwifi/bcmdhd_wifi6/include/usbrdl.h | 135 + - .../rkwifi/bcmdhd_wifi6/include/vlan.h | 98 + - .../rkwifi/bcmdhd_wifi6/include/wlfc_proto.h | 414 + - .../rkwifi/bcmdhd_wifi6/include/wlioctl.h | 20752 ++++++ - .../bcmdhd_wifi6/include/wlioctl_defs.h | 2466 + - .../bcmdhd_wifi6/include/wlioctl_utils.h | 62 + - .../rkwifi/bcmdhd_wifi6/include/wpa.h | 312 + - .../rkwifi/bcmdhd_wifi6/include/wps.h | 386 + - .../rkwifi/bcmdhd_wifi6/linux_osl.c | 2124 + - .../rkwifi/bcmdhd_wifi6/linux_osl_priv.h | 185 + - .../rkwifi/bcmdhd_wifi6/linux_pkt.c | 694 + - .../rkwifi/bcmdhd_wifi6/otpdefs.h | 122 + - .../rkwifi/bcmdhd_wifi6/pcie_core.c | 159 + - .../rkwifi/bcmdhd_wifi6/sbutils.c | 1094 + - .../rkwifi/bcmdhd_wifi6/siutils.c | 3801 ++ - .../rkwifi/bcmdhd_wifi6/siutils_priv.h | 356 + - .../rkwifi/bcmdhd_wifi6/wl_android.c | 6644 ++ - .../rkwifi/bcmdhd_wifi6/wl_android.h | 420 + - .../rkwifi/bcmdhd_wifi6/wl_android_ext.c | 7974 +++ - .../rkwifi/bcmdhd_wifi6/wl_cfg80211.c | 25039 +++++++ - .../rkwifi/bcmdhd_wifi6/wl_cfg80211.h | 2451 + - .../rkwifi/bcmdhd_wifi6/wl_cfg_btcoex.c | 569 + - .../rkwifi/bcmdhd_wifi6/wl_cfgnan.c | 8182 +++ - .../rkwifi/bcmdhd_wifi6/wl_cfgnan.h | 899 + - .../rkwifi/bcmdhd_wifi6/wl_cfgp2p.c | 2792 + - .../rkwifi/bcmdhd_wifi6/wl_cfgp2p.h | 458 + - .../rkwifi/bcmdhd_wifi6/wl_cfgscan.c | 3348 + - .../rkwifi/bcmdhd_wifi6/wl_cfgscan.h | 101 + - .../rkwifi/bcmdhd_wifi6/wl_cfgvendor.c | 8751 +++ - .../rkwifi/bcmdhd_wifi6/wl_cfgvendor.h | 721 + - .../rkwifi/bcmdhd_wifi6/wl_dbg.h | 381 + - .../rkwifi/bcmdhd_wifi6/wl_escan.c | 1692 + - .../rkwifi/bcmdhd_wifi6/wl_escan.h | 78 + - .../rkwifi/bcmdhd_wifi6/wl_event.c | 506 + - .../rkwifi/bcmdhd_wifi6/wl_ext_genl.c | 569 + - .../rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.c | 4342 ++ - .../rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.h | 178 + - .../rkwifi/bcmdhd_wifi6/wl_linux_mon.c | 474 + - .../rkwifi/bcmdhd_wifi6/wl_roam.c | 375 + - .../rkwifi/bcmdhd_wifi6/wldev_common.c | 535 + - .../rkwifi/bcmdhd_wifi6/wldev_common.h | 135 + - .../rockchip_wlan/rkwifi/rk_wifi_config.c | 30 + - drivers/nvmem/core.c | 4 + - drivers/nvmem/rockchip-efuse.c | 348 +- - drivers/nvmem/rockchip-otp.c | 22 +- - drivers/of/Kconfig | 7 + - drivers/opp/debugfs.c | 44 + - drivers/opp/of.c | 2 +- - drivers/pci/controller/Makefile | 7 +- - drivers/pci/controller/dwc/Kconfig | 9 + - drivers/pci/controller/dwc/Makefile | 1 + - drivers/pci/controller/dwc/pcie-designware.h | 1 + - drivers/pci/controller/dwc/pcie-dw-rockchip.c | 1789 + - drivers/pci/controller/pcie-rockchip.c | 5 + - drivers/pci/controller/rockchip-pcie-dma.c | 763 + - drivers/pci/controller/rockchip-pcie-dma.h | 199 + - drivers/phy/rockchip/Kconfig | 100 + - drivers/phy/rockchip/Makefile | 15 +- - .../rockchip/phy-rockchip-csi2-dphy-common.h | 114 + - .../phy/rockchip/phy-rockchip-csi2-dphy-hw.c | 1078 + - drivers/phy/rockchip/phy-rockchip-csi2-dphy.c | 658 + - .../phy/rockchip/phy-rockchip-inno-combphy.c | 1024 + - .../phy/rockchip/phy-rockchip-inno-dsidphy.c | 434 +- - .../phy/rockchip/phy-rockchip-inno-hdmi-phy.c | 1335 + - .../rockchip/phy-rockchip-inno-mipi-dphy.c | 853 + - drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 2597 +- - drivers/phy/rockchip/phy-rockchip-inno-usb3.c | 1132 + - .../phy-rockchip-inno-video-combo-phy.c | 874 + - .../rockchip/phy-rockchip-inno-video-phy.c | 245 + - drivers/phy/rockchip/phy-rockchip-mipi-rx.c | 1800 + - .../rockchip/phy-rockchip-naneng-combphy.c | 850 + - .../phy/rockchip/phy-rockchip-naneng-edp.c | 400 + - .../phy/rockchip/phy-rockchip-naneng-usb2.c | 1929 + - drivers/phy/rockchip/phy-rockchip-pcie.c | 12 +- - .../phy/rockchip/phy-rockchip-samsung-dcphy.c | 1973 + - .../phy-rockchip-samsung-hdptx-hdmi.c | 1944 + - .../phy/rockchip/phy-rockchip-samsung-hdptx.c | 1188 + - .../phy/rockchip/phy-rockchip-snps-pcie3.c | 277 + - drivers/phy/rockchip/phy-rockchip-typec.c | 733 +- - drivers/phy/rockchip/phy-rockchip-usb.c | 628 +- - drivers/phy/rockchip/phy-rockchip-usbdp.c | 1458 + - drivers/pinctrl/Kconfig | 7 +- - drivers/pinctrl/pinctrl-rk628.c | 1768 + - drivers/pinctrl/pinctrl-rk805.c | 350 +- - drivers/pinctrl/pinctrl-rockchip.c | 1753 +- - drivers/pinctrl/pinctrl-rockchip.h | 277 + - drivers/power/ec_battery.c | 466 + - drivers/power/reset/gpio-poweroff.c | 1 - - drivers/power/reset/reboot-mode.h | 7 + - drivers/power/supply/Kconfig | 46 +- - drivers/power/supply/Makefile | 7 + - drivers/power/supply/ab8500_btemp.c | 1 - - drivers/power/supply/ab8500_charger.c | 19 +- - drivers/power/supply/ab8500_fg.c | 1 - - drivers/power/supply/axp288_fuel_gauge.c | 4 +- - drivers/power/supply/bq25700_charger.c | 2105 + - drivers/power/supply/charger-manager.c | 1 - - drivers/power/supply/cw2015_battery.c | 4 +- - drivers/power/supply/max17042_battery.c | 10 +- - drivers/power/supply/power_supply_core.c | 78 + - drivers/power/supply/power_supply_sysfs.c | 1 + - drivers/power/supply/rk816_battery.c | 5172 ++ - drivers/power/supply/rk816_battery.h | 286 + - drivers/power/supply/rk817_battery.c | 3418 + - drivers/power/supply/rk817_charger.c | 1798 + - drivers/power/supply/rk818_battery.c | 3622 + - drivers/power/supply/rk818_battery.h | 168 + - drivers/power/supply/rk818_charger.c | 1889 + - drivers/power/supply/rt5033_battery.c | 7 - - drivers/power/supply/sc2731_charger.c | 1 - - drivers/power/supply/sc27xx_fuel_gauge.c | 1 - - drivers/power/supply/smb347-charger.c | 10 - - drivers/power/sy6982c_charger.c | 401 + - drivers/power/universal_charger.c | 419 + - drivers/pwm/Kconfig | 6 + - drivers/pwm/pwm-rockchip.c | 109 +- - drivers/pwm/sysfs.c | 43 + - drivers/regulator/Kconfig | 6 + - drivers/regulator/Makefile | 4 + - drivers/regulator/core.c | 345 + - drivers/regulator/fan53555.c | 399 +- - drivers/regulator/lp8752.c | 316 + - drivers/regulator/mp8865-regulator.c | 248 + - drivers/regulator/of_regulator.c | 8 +- - drivers/regulator/rk808-regulator.c | 534 +- - drivers/regulator/scmi-regulator.c | 421 + - drivers/regulator/syr82x.c | 520 + - drivers/regulator/tps549b22-regulator.c | 437 + - drivers/regulator/xz3216.c | 404 + - drivers/rk_nand/Kconfig | 10 + - drivers/rk_nand/Makefile | 9 + - drivers/rk_nand/rk_ftl_api.h | 41 + - drivers/rk_nand/rk_ftl_arm_v7.S | 30165 +++++++++ - drivers/rk_nand/rk_ftl_arm_v7_thumb.S | 30192 +++++++++ - drivers/rk_nand/rk_ftl_arm_v8.S | 27968 ++++++++ - drivers/rk_nand/rk_ftlv5_arm32.S | 27612 ++++++++ - drivers/rk_nand/rk_ftlv5_arm64.S | 25632 +++++++ - drivers/rk_nand/rk_nand_base.c | 456 + - drivers/rk_nand/rk_nand_base.h | 46 + - drivers/rk_nand/rk_nand_blk.c | 711 + - drivers/rk_nand/rk_nand_blk.h | 67 + - drivers/rk_nand/rk_zftl_arm32.S | 37095 +++++++++++ - drivers/rk_nand/rk_zftl_arm64.S | 35207 ++++++++++ - drivers/rkflash/Kconfig | 80 + - drivers/rkflash/Makefile | 14 + - drivers/rkflash/flash.c | 505 + - drivers/rkflash/flash.h | 132 + - drivers/rkflash/flash_com.h | 77 + - drivers/rkflash/nand_boot.c | 83 + - drivers/rkflash/nandc.c | 467 + - drivers/rkflash/nandc.h | 346 + - drivers/rkflash/rk_sftl.h | 48 + - drivers/rkflash/rk_sftl_arm_v7.S | 15787 +++++ - drivers/rkflash/rk_sftl_arm_v7_thumb.S | 15586 +++++ - drivers/rkflash/rk_sftl_arm_v8.S | 15768 +++++ - drivers/rkflash/rkflash_api.h | 58 + - drivers/rkflash/rkflash_blk.c | 789 + - drivers/rkflash/rkflash_blk.h | 121 + - drivers/rkflash/rkflash_debug.c | 116 + - drivers/rkflash/rkflash_debug.h | 42 + - drivers/rkflash/rknandc_base.c | 192 + - drivers/rkflash/rksfc_base.c | 267 + - drivers/rkflash/sfc.c | 255 + - drivers/rkflash/sfc.h | 224 + - drivers/rkflash/sfc_nand.c | 1051 + - drivers/rkflash/sfc_nand.h | 133 + - drivers/rkflash/sfc_nand_boot.c | 89 + - drivers/rkflash/sfc_nand_mtd.c | 423 + - drivers/rkflash/sfc_nand_mtd.h | 82 + - drivers/rkflash/sfc_nand_mtd_bbt.c | 441 + - drivers/rkflash/sfc_nor.c | 783 + - drivers/rkflash/sfc_nor.h | 176 + - drivers/rkflash/sfc_nor_boot.c | 180 + - drivers/rkflash/sfc_nor_mtd.c | 266 + - drivers/rkflash/typedef.h | 30 + - drivers/soc/rockchip/Kconfig | 125 +- - drivers/soc/rockchip/Kconfig.cpu | 62 + - drivers/soc/rockchip/Makefile | 14 + - drivers/soc/rockchip/flash_vendor_storage.c | 363 + - drivers/soc/rockchip/flash_vendor_storage.h | 16 + - drivers/soc/rockchip/grf.c | 65 + - drivers/soc/rockchip/io-domain.c | 95 +- - drivers/soc/rockchip/mtd_vendor_storage.c | 462 + - drivers/soc/rockchip/pm_domains.c | 1000 +- - drivers/soc/rockchip/rk_camera_sensor_info.h | 421 + - drivers/soc/rockchip/rk_fiq_debugger.c | 1051 + - drivers/soc/rockchip/rk_vendor_storage.c | 52 + - drivers/soc/rockchip/rockchip-cpuinfo.c | 243 + - drivers/soc/rockchip/rockchip_debug.c | 423 + - drivers/soc/rockchip/rockchip_debug.h | 14 + - drivers/soc/rockchip/rockchip_decompress.c | 333 + - drivers/soc/rockchip/rockchip_ipa.c | 232 + - drivers/soc/rockchip/rockchip_opp_select.c | 1211 + - drivers/soc/rockchip/rockchip_pm_config.c | 303 + - drivers/soc/rockchip/rockchip_pvtm.c | 985 + - drivers/soc/rockchip/rockchip_ramdisk.c | 285 + - .../soc/rockchip/rockchip_system_monitor.c | 1698 + - .../rockchip/rockchip_thunderboot_crypto.c | 440 + - .../soc/rockchip/rockchip_thunderboot_mmc.c | 148 + - .../soc/rockchip/rockchip_thunderboot_sfc.c | 141 + - drivers/soc/rockchip/sdmmc_vendor_storage.c | 635 + - drivers/spi/spi-rockchip.c | 173 +- - drivers/spi/spidev.c | 1 + - drivers/staging/android/Kconfig | 2 + - drivers/staging/android/Makefile | 1 + - drivers/staging/android/fiq_debugger/Kconfig | 72 + - drivers/staging/android/fiq_debugger/Makefile | 2 + - .../android/fiq_debugger/fiq_debugger.c | 1672 + - .../android/fiq_debugger/fiq_debugger.h | 73 + - .../android/fiq_debugger/fiq_debugger_arm.c | 273 + - .../android/fiq_debugger/fiq_debugger_arm64.c | 198 + - .../android/fiq_debugger/fiq_debugger_priv.h | 39 + - .../fiq_debugger/fiq_debugger_ringbuf.h | 94 + - .../android/fiq_debugger/fiq_watchdog.c | 56 + - .../android/fiq_debugger/fiq_watchdog.h | 20 + - drivers/staging/android/ion/Kconfig | 15 +- - drivers/staging/android/ion/Makefile | 6 +- - drivers/staging/android/ion/heaps/Kconfig | 15 + - drivers/staging/android/ion/heaps/Makefile | 5 + - .../android/ion/{ => heaps}/ion_cma_heap.c | 65 +- - .../android/ion/{ => heaps}/ion_page_pool.c | 19 +- - .../staging/android/ion/heaps/ion_page_pool.h | 67 + - .../android/ion/{ => heaps}/ion_system_heap.c | 229 +- - drivers/staging/android/ion/ion.c | 592 +- - drivers/staging/android/ion/ion.h | 302 - - drivers/staging/android/ion/ion_buffer.c | 278 + - drivers/staging/android/ion/ion_dma_buf.c | 359 + - drivers/staging/android/ion/ion_heap.c | 323 +- - drivers/staging/android/ion/ion_private.h | 58 + - .../staging/android/ion/ion_protected_heap.c | 526 + - drivers/staging/android/ion/ion_trace.h | 55 + - drivers/staging/android/ion/rockchip/Makefile | 3 + - .../android/ion/rockchip/rockchip_ion.c | 224 + - .../ion/rockchip/rockchip_ion_snapshot.c | 145 + - drivers/staging/blackbox/Kconfig | 11 + - drivers/staging/blackbox/Makefile | 2 + - drivers/staging/blackbox/blackbox_storage.c | 2 +- - drivers/staging/blackbox/rockchip/Makefile | 4 + - .../blackbox/rockchip/system_adapter.c | 312 + - .../rockchip/system_adapter_by_memory.c | 313 + - drivers/thermal/rockchip_thermal.c | 584 +- - drivers/thermal/thermal_core.c | 1 + - drivers/thermal/thermal_core.h | 2 - - drivers/tty/serial/8250/8250.h | 15 + - drivers/tty/serial/8250/8250_core.c | 10 +- - drivers/tty/serial/8250/8250_dma.c | 205 +- - drivers/tty/serial/8250/8250_dw.c | 92 +- - drivers/tty/serial/8250/8250_dwlib.c | 12 + - drivers/tty/serial/8250/8250_port.c | 103 +- - drivers/tty/vt/keyboard.c | 1 + - drivers/usb/core/hub.c | 6 +- - drivers/usb/core/quirks.c | 8 + - drivers/usb/dwc2/core.h | 4 + - drivers/usb/dwc2/gadget.c | 13 + - drivers/usb/dwc2/hcd.c | 59 +- - drivers/usb/dwc2/hcd_intr.c | 9 +- - drivers/usb/dwc2/hcd_queue.c | 8 +- - drivers/usb/dwc2/params.c | 10 + - drivers/usb/dwc2/platform.c | 119 +- - drivers/usb/dwc3/Kconfig | 10 + - drivers/usb/dwc3/Makefile | 1 + - drivers/usb/dwc3/core.c | 221 +- - drivers/usb/dwc3/core.h | 88 +- - drivers/usb/dwc3/debug.h | 8 +- - drivers/usb/dwc3/debugfs.c | 16 +- - drivers/usb/dwc3/drd.c | 44 +- - drivers/usb/dwc3/dwc3-imx8mp.c | 364 + - drivers/usb/dwc3/dwc3-keystone.c | 9 +- - drivers/usb/dwc3/dwc3-pci.c | 69 +- - drivers/usb/dwc3/dwc3-qcom.c | 14 + - drivers/usb/dwc3/ep0.c | 12 +- - drivers/usb/dwc3/gadget.c | 563 +- - drivers/usb/dwc3/gadget.h | 6 +- - drivers/usb/dwc3/trace.c | 7 + - drivers/usb/gadget/Kconfig | 39 + - drivers/usb/gadget/composite.c | 104 +- - drivers/usb/gadget/configfs.c | 294 +- - drivers/usb/gadget/epautoconf.c | 24 + - drivers/usb/gadget/function/Makefile | 6 + - drivers/usb/gadget/function/f_accessory.c | 1556 + - drivers/usb/gadget/function/f_audio_source.c | 1071 + - drivers/usb/gadget/function/f_fs.c | 18 +- - drivers/usb/gadget/function/f_mass_storage.c | 10 + - drivers/usb/gadget/function/f_midi.c | 66 + - drivers/usb/gadget/function/f_printer.c | 5 + - drivers/usb/gadget/function/f_rndis.c | 26 +- - drivers/usb/gadget/function/f_uac1.c | 0 - drivers/usb/gadget/function/f_uac1_legacy.c | 6 + - drivers/usb/gadget/function/f_uac2.c | 395 +- - drivers/usb/gadget/function/f_uvc.c | 448 +- - drivers/usb/gadget/function/u_audio.c | 368 +- - drivers/usb/gadget/function/u_audio.h | 12 + - drivers/usb/gadget/function/u_ether.c | 33 +- - drivers/usb/gadget/function/u_ether.h | 12 + - .../usb/gadget/function/u_ether_configfs.h | 15 +- - drivers/usb/gadget/function/u_serial.c | 8 +- - drivers/usb/gadget/function/u_uac.h | 194 + - drivers/usb/gadget/function/u_uac1.h | 0 - drivers/usb/gadget/function/u_uac1_legacy.c | 4 + - drivers/usb/gadget/function/u_uac2.h | 4 + - drivers/usb/gadget/function/u_uvc.h | 9 +- - drivers/usb/gadget/function/uvc.h | 9 +- - drivers/usb/gadget/function/uvc_configfs.c | 358 +- - drivers/usb/gadget/function/uvc_queue.c | 8 + - drivers/usb/gadget/function/uvc_v4l2.c | 24 +- - drivers/usb/gadget/function/uvc_video.c | 40 +- - drivers/usb/gadget/legacy/audio.c | 0 - drivers/usb/gadget/legacy/webcam.c | 2 + - drivers/usb/gadget/udc/core.c | 113 +- - drivers/usb/gadget/udc/snps_udc_core.c | 30 +- - drivers/usb/gadget/udc/trace.c | 3 + - drivers/usb/gadget/udc/udc-xilinx.c | 2 +- - drivers/usb/host/Makefile | 6 +- - drivers/usb/host/ehci-platform.c | 49 + - drivers/usb/host/ohci-platform.c | 4 +- - drivers/usb/host/xhci-hub.c | 7 + - drivers/usb/host/xhci-mem.c | 174 +- - drivers/usb/host/xhci-mtk-sch.c | 244 +- - drivers/usb/host/xhci-mtk.c | 19 +- - drivers/usb/host/xhci-mtk.h | 40 +- - drivers/usb/host/xhci-pci.c | 4 +- - drivers/usb/host/xhci-plat.c | 43 +- - drivers/usb/host/xhci-plat.h | 8 + - drivers/usb/host/xhci-ring.c | 905 +- - drivers/usb/host/xhci-trace.c | 3 + - drivers/usb/host/xhci.c | 228 +- - drivers/usb/host/xhci.h | 90 +- - drivers/usb/storage/scsiglue.c | 4 + - drivers/usb/storage/unusual_devs.h | 6 + - drivers/usb/storage/unusual_uas.h | 18 + - drivers/usb/typec/altmodes/Kconfig | 1 + - drivers/usb/typec/altmodes/displayport.c | 68 +- - drivers/usb/typec/class.c | 450 +- - drivers/usb/typec/mux/intel_pmc_mux.c | 17 +- - drivers/usb/typec/tcpm/Kconfig | 7 + - drivers/usb/typec/tcpm/Makefile | 1 + - drivers/usb/typec/tcpm/fusb302.c | 29 +- - drivers/usb/typec/tcpm/tcpci.c | 176 +- - drivers/usb/typec/tcpm/tcpci.h | 47 +- - drivers/usb/typec/tcpm/tcpci_husb311.c | 298 + - drivers/usb/typec/tcpm/tcpci_maxim.c | 70 +- - drivers/usb/typec/tcpm/tcpm.c | 1308 +- - drivers/usb/typec/tcpm/wcove.c | 3 +- - drivers/usb/typec/ucsi/Kconfig | 1 + - drivers/usb/typec/ucsi/displayport.c | 32 +- - drivers/usb/typec/ucsi/ucsi.c | 56 +- - drivers/usb/typec/ucsi/ucsi.h | 4 + - drivers/video/Kconfig | 5 + - drivers/video/Makefile | 1 + - drivers/video/backlight/pwm_bl.c | 2 + - drivers/video/rockchip/Kconfig | 5 + - drivers/video/rockchip/Makefile | 5 + - drivers/video/rockchip/iep/Kconfig | 10 + - drivers/video/rockchip/iep/Makefile | 4 + - .../video/rockchip/iep/hw_iep_config_addr.h | 99 + - drivers/video/rockchip/iep/hw_iep_reg.c | 1530 + - drivers/video/rockchip/iep/hw_iep_reg.h | 525 + - drivers/video/rockchip/iep/iep.h | 276 + - drivers/video/rockchip/iep/iep_drv.c | 1320 + - drivers/video/rockchip/iep/iep_drv.h | 159 + - drivers/video/rockchip/iep/iep_iommu_drm.c | 465 + - drivers/video/rockchip/iep/iep_iommu_ops.c | 244 + - drivers/video/rockchip/iep/iep_iommu_ops.h | 121 + - drivers/video/rockchip/mpp/Kconfig | 68 + - drivers/video/rockchip/mpp/Makefile | 28 + - .../video/rockchip/mpp/hack/mpp_hack_px30.c | 230 + - .../video/rockchip/mpp/hack/mpp_hack_px30.h | 27 + - .../mpp/hack/mpp_rkvdec2_hack_rk3568.c | 732 + - .../mpp/hack/mpp_rkvdec2_link_hack_rk3568.c | 213 + - drivers/video/rockchip/mpp/mpp_common.c | 2173 + - drivers/video/rockchip/mpp/mpp_common.h | 784 + - drivers/video/rockchip/mpp/mpp_debug.h | 127 + - drivers/video/rockchip/mpp/mpp_iep2.c | 1019 + - drivers/video/rockchip/mpp/mpp_iommu.c | 493 + - drivers/video/rockchip/mpp/mpp_iommu.h | 140 + - drivers/video/rockchip/mpp/mpp_jpgdec.c | 648 + - drivers/video/rockchip/mpp/mpp_rkvdec.c | 1949 + - drivers/video/rockchip/mpp/mpp_rkvdec2.c | 1277 + - drivers/video/rockchip/mpp/mpp_rkvdec2.h | 220 + - drivers/video/rockchip/mpp/mpp_rkvdec2_link.c | 1956 + - drivers/video/rockchip/mpp/mpp_rkvdec2_link.h | 169 + - drivers/video/rockchip/mpp/mpp_rkvenc.c | 1512 + - drivers/video/rockchip/mpp/mpp_rkvenc2.c | 1712 + - drivers/video/rockchip/mpp/mpp_service.c | 436 + - drivers/video/rockchip/mpp/mpp_vdpu1.c | 876 + - drivers/video/rockchip/mpp/mpp_vdpu2.c | 770 + - drivers/video/rockchip/mpp/mpp_vepu1.c | 797 + - drivers/video/rockchip/mpp/mpp_vepu2.c | 1165 + - .../video/rockchip/mpp/rockchip_iep2_regs.h | 174 + - drivers/video/rockchip/rga/Kconfig | 10 + - drivers/video/rockchip/rga/Makefile | 4 + - drivers/video/rockchip/rga/RGA_API.c | 201 + - drivers/video/rockchip/rga/RGA_API.h | 40 + - drivers/video/rockchip/rga/rga.h | 508 + - drivers/video/rockchip/rga/rga_drv.c | 2550 + - drivers/video/rockchip/rga/rga_mmu_info.c | 1315 + - drivers/video/rockchip/rga/rga_mmu_info.h | 24 + - drivers/video/rockchip/rga/rga_reg_info.c | 1587 + - drivers/video/rockchip/rga/rga_reg_info.h | 467 + - drivers/video/rockchip/rga/rga_rop.h | 56 + - drivers/video/rockchip/rga/rga_type.h | 49 + - drivers/video/rockchip/rga2/Kconfig | 30 + - drivers/video/rockchip/rga2/Makefile | 5 + - drivers/video/rockchip/rga2/RGA2_API.c | 23 + - drivers/video/rockchip/rga2/RGA2_API.h | 59 + - drivers/video/rockchip/rga2/rga2.h | 792 + - drivers/video/rockchip/rga2/rga2_debugger.c | 396 + - drivers/video/rockchip/rga2/rga2_debugger.h | 120 + - drivers/video/rockchip/rga2/rga2_drv.c | 2264 + - drivers/video/rockchip/rga2/rga2_mmu_info.c | 1831 + - drivers/video/rockchip/rga2/rga2_mmu_info.h | 35 + - drivers/video/rockchip/rga2/rga2_reg_info.c | 1689 + - drivers/video/rockchip/rga2/rga2_reg_info.h | 331 + - drivers/video/rockchip/rga2/rga2_rop.h | 56 + - drivers/video/rockchip/rga2/rga2_type.h | 49 + - fs/ubifs/recovery.c | 41 +- - fs/xfs/xfs_inode.c | 14 +- - include/drm/bridge/analogix_dp.h | 34 +- - include/drm/bridge/dw_hdmi.h | 106 +- - include/drm/bridge/dw_mipi_dsi.h | 1 + - include/drm/drm_auth.h | 1 - - include/drm/drm_connector.h | 54 + - include/drm/drm_crtc.h | 11 +- - include/drm/drm_drv.h | 10 + - include/drm/drm_edid.h | 32 + - include/drm/drm_file.h | 21 +- - include/drm/drm_mipi_dsi.h | 12 + - include/drm/drm_mode_config.h | 13 + - include/drm/drm_mode_object.h | 2 +- - include/drm/drm_prime.h | 1 + - include/drm/drm_sync_helper.h | 156 + - include/dt-bindings/clock/px30-cru.h | 2 + - include/dt-bindings/clock/rk1808-cru.h | 473 + - include/dt-bindings/clock/rk3036-cru.h | 4 + - include/dt-bindings/clock/rk3128-cru.h | 1 + - include/dt-bindings/clock/rk3188-cru-common.h | 7 +- - include/dt-bindings/clock/rk3288-cru.h | 4 + - include/dt-bindings/clock/rk3368-cru.h | 1 + - include/dt-bindings/clock/rk3399-cru.h | 21 +- - include/dt-bindings/clock/rk3568-cru.h | 932 + - include/dt-bindings/clock/rk618-cru.h | 38 + - include/dt-bindings/clock/rk628-cgu.h | 50 + - include/dt-bindings/clock/rockchip,rk3036.h | 155 + - include/dt-bindings/clock/rockchip,rk312x.h | 167 + - include/dt-bindings/clock/rockchip,rk3188.h | 13 + - include/dt-bindings/clock/rockchip,rk3228.h | 167 + - include/dt-bindings/clock/rockchip,rk3288.h | 220 + - include/dt-bindings/clock/rockchip,rk3368.h | 263 + - include/dt-bindings/clock/rockchip-ddr.h | 63 + - include/dt-bindings/clock/rockchip.h | 101 + - include/dt-bindings/clock/rv1126-cru.h | 633 + - include/dt-bindings/display/drm_mipi_dsi.h | 53 + - .../dt-bindings/display/media-bus-format.h | 152 + - include/dt-bindings/display/mipi_dsi.h | 106 + - include/dt-bindings/display/rockchip_vop.h | 21 + - include/dt-bindings/dram/rockchip,rk322x.h | 90 + - include/dt-bindings/dram/rockchip,rk3368.h | 80 + - include/dt-bindings/input/rk-input.h | 814 + - include/dt-bindings/memory/px30-dram.h | 132 + - include/dt-bindings/memory/rk1808-dram.h | 180 + - include/dt-bindings/memory/rk3128-dram.h | 95 + - include/dt-bindings/memory/rk3288-dram.h | 127 + - include/dt-bindings/memory/rk3328-dram.h | 159 + - include/dt-bindings/memory/rk3368-dram.h | 109 + - include/dt-bindings/memory/rk3399-dram.h | 107 + - include/dt-bindings/memory/rk3568-dram.h | 111 + - include/dt-bindings/memory/rockchip-dram.h | 94 + - include/dt-bindings/memory/rv1126-dram.h | 161 + - include/dt-bindings/phy/phy-snps-pcie3.h | 21 + - include/dt-bindings/pinctrl/rockchip-rk3036.h | 267 + - include/dt-bindings/pinctrl/rockchip-rk312x.h | 384 + - include/dt-bindings/pinctrl/rockchip-rk3188.h | 457 + - include/dt-bindings/pinctrl/rockchip-rk3288.h | 666 + - include/dt-bindings/power/rk1808-power.h | 20 + - include/dt-bindings/power/rk3568-power.h | 32 + - include/dt-bindings/power/rk3588-power.h | 69 + - include/dt-bindings/power/rv1126-power.h | 34 + - include/dt-bindings/reset/rk628-rgu.h | 43 + - include/dt-bindings/sensor-dev.h | 18 + - include/dt-bindings/soc/rockchip,boot-mode.h | 10 +- - .../dt-bindings/soc/rockchip-system-status.h | 48 + - include/dt-bindings/suspend/rockchip-px30.h | 53 + - include/dt-bindings/suspend/rockchip-rk1808.h | 46 + - include/dt-bindings/suspend/rockchip-rk322x.h | 57 + - include/dt-bindings/suspend/rockchip-rk3288.h | 59 + - include/dt-bindings/suspend/rockchip-rk3308.h | 104 + - include/dt-bindings/suspend/rockchip-rk3328.h | 19 + - include/dt-bindings/suspend/rockchip-rk3368.h | 56 + - include/dt-bindings/suspend/rockchip-rk3399.h | 61 + - include/dt-bindings/suspend/rockchip-rk3568.h | 57 + - include/dt-bindings/suspend/rockchip-rv1126.h | 46 + - include/linux/android_kabi.h | 113 + - include/linux/bpf.h | 3 +- - include/linux/clk-provider.h | 9 + - include/linux/clk/rockchip.h | 18 + - include/linux/cpuset.h | 7 +- - include/linux/dma-buf-cache.h | 32 + - include/linux/dma-buf.h | 116 +- - include/linux/dma-fence.h | 3 + - include/linux/dma-heap.h | 62 +- - include/linux/dma-iommu.h | 16 + - include/linux/dma-map-ops.h | 14 + - include/linux/dma-mapping.h | 17 + - include/linux/dmaengine.h | 5 + - include/linux/energy_model.h | 12 +- - include/linux/extcon.h | 1 + - include/linux/freezer.h | 6 + - include/linux/initramfs.h | 40 + - include/linux/iommu.h | 47 +- - include/linux/iova.h | 1 + - include/linux/irqchip/arm-gic-v3.h | 2 + - include/linux/irqchip/arm-gic-v4.h | 4 + - include/linux/memblock.h | 24 +- - include/linux/memory_group_manager.h | 198 + - include/linux/mfd/rk808.h | 453 +- - include/linux/mm.h | 2 + - include/linux/mmc/host.h | 4 + - include/linux/mmu_context.h | 8 + - include/linux/phy/pcie.h | 12 + - include/linux/phy/phy-rockchip-typec.h | 34 + - include/linux/power/bq25700-charge.h | 20 + - include/linux/power/cw2015_battery.h | 119 + - include/linux/power/rk_usbbc.h | 44 + - include/linux/power_supply.h | 23 + - include/linux/pwm.h | 3 + - include/linux/reboot.h | 20 + - include/linux/regulator/driver.h | 3 + - include/linux/regulator/fan53555.h | 2 + - include/linux/rfkill-bt.h | 73 + - include/linux/rfkill-wlan.h | 62 + - include/linux/rk_keys.h | 19 + - include/linux/rockchip-iovmm.h | 91 + - include/linux/rockchip/cpu.h | 186 + - include/linux/rockchip/grf.h | 700 + - include/linux/rockchip/psci.h | 76 + - include/linux/rockchip/rockchip_sip.h | 350 + - include/linux/rockchip_ion.h | 41 + - include/linux/sched.h | 2 +- - include/linux/sched/signal.h | 1 + - include/linux/sched/xacct.h | 9 + - include/linux/sensor-dev.h | 350 + - include/linux/soc/rockchip/pvtm.h | 17 + - include/linux/soc/rockchip/rk_fiq_debugger.h | 22 + - .../linux/soc/rockchip/rk_vendor_storage.h | 58 + - .../linux/soc/rockchip/rockchip_decompress.h | 22 + - .../rockchip/rockchip_thunderboot_crypto.h | 9 + - include/linux/stmmac.h | 1 + - include/linux/thermal.h | 5 + - include/linux/usb/audio-v2.h | 0 - include/linux/usb/audio.h | 0 - include/linux/usb/composite.h | 3 + - include/linux/usb/f_accessory.h | 23 + - include/linux/usb/gadget.h | 20 + - include/linux/usb/pd.h | 7 + - include/linux/usb/pd_ext_sdb.h | 4 - - include/linux/usb/pd_vdo.h | 314 +- - include/linux/usb/quirks.h | 3 + - include/linux/usb/tcpm.h | 56 +- - include/linux/usb/typec.h | 39 + - include/linux/usb/typec_altmode.h | 10 + - include/linux/usb/typec_tbt.h | 6 +- - include/linux/usb/usbnet.h | 2 - - include/linux/wakelock.h | 76 + - include/linux/wakeup_reason.h | 37 + - include/media/v4l2-async.h | 15 + - include/soc/rockchip/android-version.h | 17 + - include/soc/rockchip/pm_domains.h | 53 + - include/soc/rockchip/rk3368-mailbox.h | 22 + - include/soc/rockchip/rkfb_dmc.h | 11 + - include/soc/rockchip/rockchip-system-status.h | 53 + - include/soc/rockchip/rockchip_dmc.h | 121 + - include/soc/rockchip/rockchip_iommu.h | 24 + - include/soc/rockchip/rockchip_ipa.h | 40 + - include/soc/rockchip/rockchip_opp_select.h | 152 + - include/soc/rockchip/rockchip_sip.h | 8 +- - .../soc/rockchip/rockchip_system_monitor.h | 205 + - include/soc/rockchip/scpi.h | 147 + - include/trace/events/cpuhp.h | 22 + - include/trace/events/sched.h | 7 +- - include/trace/events/thermal_ipa_power.h | 47 + - include/uapi/drm/drm_fourcc.h | 2 + - include/uapi/drm/rockchip_drm.h | 134 + - include/uapi/linux/fec-config.h | 33 + - include/uapi/linux/media-bus-format.h | 6 +- - include/uapi/linux/rk-camera-module.h | 560 + - include/uapi/linux/rk-led-flash.h | 9 + - include/uapi/linux/rk-pcie-dma.h | 61 + - include/uapi/linux/rk-preisp.h | 118 + - include/uapi/linux/rk-video-format.h | 35 + - include/uapi/linux/rk803.h | 16 + - include/uapi/linux/rk_vcm_head.h | 115 + - include/uapi/linux/rkcif-config.h | 57 + - include/uapi/linux/rkisp1-config.h | 872 + - include/uapi/linux/rkisp2-config.h | 1853 + - include/uapi/linux/rkisp21-config.h | 804 + - include/uapi/linux/rkisp3-config.h | 1072 + - include/uapi/linux/rkispp-config.h | 370 + - include/uapi/linux/serial_reg.h | 1 + - include/uapi/linux/usb/f_accessory.h | 146 + - include/uapi/linux/usb/g_uvc.h | 4 +- - include/uapi/linux/usb/video.h | 58 + - include/uapi/linux/videodev2.h | 1 + - init/Kconfig | 6 + - init/initramfs.c | 23 + - init/main.c | 8 + - ipc/msg.c | 2 +- - ipc/sem.c | 6 +- - ipc/shm.c | 2 +- - ipc/util.c | 16 +- - kernel/bpf/syscall.c | 57 +- - kernel/bpf/verifier.c | 17 +- - kernel/cgroup/cgroup-v1.c | 3 +- - kernel/cgroup/cpuset.c | 150 +- - kernel/cgroup/legacy_freezer.c | 1 + - kernel/cpu.c | 6 +- - kernel/irq/generic-chip.c | 1 + - kernel/power/Makefile | 1 + - kernel/power/energy_model.c | 24 +- - kernel/power/hibernate.c | 2 +- - kernel/power/power.h | 2 +- - kernel/power/process.c | 13 +- - kernel/power/snapshot.c | 14 +- - kernel/power/suspend.c | 19 +- - kernel/power/wakeup_reason.c | 438 + - kernel/reboot.c | 21 + - kernel/sched/core.c | 65 +- - kernel/sched/fair.c | 16 +- - kernel/sched/loadavg.c | 1 + - kernel/sched/pelt.c | 38 +- - kernel/sched/rt.c | 40 +- - kernel/sched/sched-pelt.h | 21 +- - kernel/sched/sched.h | 2 + - kernel/sched/topology.c | 3 + - kernel/sched/wait.c | 8 +- - make-boot.sh | 31 + - make-ohos.sh | 142 + - mm/hugetlb.c | 23 +- - mm/memblock.c | 51 + - mm/page_alloc.c | 23 +- - net/bluetooth/l2cap_sock.c | 10 +- - net/bluetooth/sco.c | 18 +- - net/rfkill/Kconfig | 9 + - net/rfkill/Makefile | 2 + - net/rfkill/rfkill-bt.c | 827 + - net/rfkill/rfkill-wlan.c | 979 + - scripts/Makefile | 1 + - scripts/Makefile.lib | 5 +- - scripts/clang-wrapper.py | 102 + - scripts/dtc/checks.c | 18 + - scripts/mkimg | 235 + - scripts/repack-bootimg | 153 + - scripts/resource_tool.c | 1575 + - security/Kconfig.hardening | 3 +- - sound/drivers/aloop.c | 26 +- - sound/soc/codecs/Kconfig | 63 +- - sound/soc/codecs/Makefile | 26 + - sound/soc/codecs/bt-sco.c | 8 +- - sound/soc/codecs/dummy-codec.c | 115 + - sound/soc/codecs/es7202.c | 1170 + - sound/soc/codecs/es7202.h | 95 + - sound/soc/codecs/es7210.c | 1754 + - sound/soc/codecs/es7210.h | 76 + - sound/soc/codecs/es7243e.c | 2671 + - sound/soc/codecs/es7243e_usr_cfg.h | 274 + - sound/soc/codecs/es8311.c | 756 + - sound/soc/codecs/es8311.h | 69 + - sound/soc/codecs/es8323.c | 998 + - sound/soc/codecs/es8323.h | 151 + - sound/soc/codecs/es8328.c | 18 + - sound/soc/codecs/es8396.c | 3207 + - sound/soc/codecs/es8396.h | 354 + - sound/soc/codecs/rk1000_codec.c | 580 + - sound/soc/codecs/rk1000_codec.h | 320 + - sound/soc/codecs/rk312x_codec.c | 2526 + - sound/soc/codecs/rk312x_codec.h | 566 + - sound/soc/codecs/rk3228_codec.c | 543 + - sound/soc/codecs/rk3228_codec.h | 218 + - sound/soc/codecs/rk3308_codec.c | 5128 ++ - sound/soc/codecs/rk3308_codec.h | 1069 + - sound/soc/codecs/rk3308_codec_provider.h | 28 + - sound/soc/codecs/rk817_codec.c | 1364 + - sound/soc/codecs/rk817_codec.h | 215 + - sound/soc/codecs/rk_codec_digital.c | 1109 + - sound/soc/codecs/rk_codec_digital.h | 319 + - sound/soc/codecs/rt5640.c | 4 +- - sound/soc/codecs/rt5651.c | 85 +- - sound/soc/codecs/rt5651.h | 3 + - sound/soc/codecs/wm8974.c | 38 + - sound/soc/rockchip/Kconfig | 39 + - sound/soc/rockchip/Makefile | 19 +- - sound/soc/rockchip/rockchip_audio_pwm.c | 372 + - sound/soc/rockchip/rockchip_audio_pwm.h | 48 + - sound/soc/rockchip/rockchip_cdndp.c | 166 + - sound/soc/rockchip/rockchip_da7219.c | 235 + - sound/soc/rockchip/rockchip_hdmi.c | 279 + - sound/soc/rockchip/rockchip_hdmi_analog.c | 222 + - sound/soc/rockchip/rockchip_hdmi_dp.c | 193 + - sound/soc/rockchip/rockchip_i2s.c | 226 +- - sound/soc/rockchip/rockchip_i2s.h | 10 +- - sound/soc/rockchip/rockchip_i2s_tdm.c | 1952 + - sound/soc/rockchip/rockchip_i2s_tdm.h | 393 + - sound/soc/rockchip/rockchip_multi_dais.c | 541 + - sound/soc/rockchip/rockchip_multi_dais.h | 33 + - sound/soc/rockchip/rockchip_multi_dais_pcm.c | 704 + - sound/soc/rockchip/rockchip_multicodecs.c | 809 + - sound/soc/rockchip/rockchip_pdm.c | 136 +- - sound/soc/rockchip/rockchip_pdm.h | 6 + - sound/soc/rockchip/rockchip_rt5651.c | 245 + - sound/soc/rockchip/rockchip_spdif.c | 45 +- - sound/soc/rockchip/rockchip_spdifrx.c | 415 + - sound/soc/rockchip/rockchip_spdifrx.h | 113 + - sound/soc/rockchip/rockchip_vad.c | 1316 + - sound/soc/rockchip/rockchip_vad.h | 231 + - sound/soc/rockchip/vad_preprocess.h | 29 + - sound/soc/rockchip/vad_preprocess_arm.S | 348 + - sound/soc/rockchip/vad_preprocess_arm64.S | 273 + - sound/soc/rockchip/vad_preprocess_thumb.S | 360 + - sound/usb/quirks.c | 6 + - .../multibuff/device_app/aio_multibuff.c | 68 +- - .../simple/device_app/aio_simple.c | 68 +- - 2840 files changed, 1645582 insertions(+), 12930 deletions(-) - create mode 100644 Documentation/devicetree/bindings/mtd/rockchip,nand-controller.yaml - create mode 100755 arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi-lvds.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-lvds.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/px30-android.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/px30-ddr4p416dd6-timing.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/px30-dram-default-timing.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts - create mode 100755 arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/px30-robot-no-gpu.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/px30-robot.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk1808-fpga.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk1808.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk1808k.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308-fpga.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308b-evb-ext-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3308k.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3328-android.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3328-dram-2layer-timing.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3328-evb-android.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-808.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-android.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-p9.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-sheep.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-tablet.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-xikp.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-android.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-box.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-dram-default-timing.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-fpga.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-box.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-i2s-mic-array.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-pdm-mic-array.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3566.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-android.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb4-lp3-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rk3568.dtsi - create mode 100755 arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi - create mode 100755 arch/arm64/include/asm/system_info.h - create mode 100755 drivers/clk/rockchip/clk-dclk-divider.c - create mode 100755 drivers/clk/rockchip/clk-pvtm.c - create mode 100755 drivers/clk/rockchip/clk-rk1808.c - create mode 100755 drivers/clk/rockchip/clk-rk3568.c - create mode 100755 drivers/clk/rockchip/clk-rv1126.c - create mode 100755 drivers/clk/rockchip/regmap/Kconfig - create mode 100755 drivers/clk/rockchip/regmap/Makefile - create mode 100755 drivers/clk/rockchip/regmap/clk-regmap-composite.c - create mode 100755 drivers/clk/rockchip/regmap/clk-regmap-divider.c - create mode 100755 drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c - create mode 100755 drivers/clk/rockchip/regmap/clk-regmap-gate.c - create mode 100755 drivers/clk/rockchip/regmap/clk-regmap-mux.c - create mode 100755 drivers/clk/rockchip/regmap/clk-regmap-pll.c - create mode 100755 drivers/clk/rockchip/regmap/clk-regmap.h - create mode 100755 drivers/clk/rockchip/regmap/clk-rk618.c - create mode 100755 drivers/clk/rockchip/regmap/clk-rk628.c - create mode 100755 drivers/cpufreq/rockchip-cpufreq.c - create mode 100755 drivers/cpufreq/rockchip-cpufreq.h - create mode 100755 drivers/devfreq/event/rockchip-nocp.c - delete mode 100644 drivers/devfreq/rk3399_dmc.c - create mode 100755 drivers/devfreq/rockchip_bus.c - create mode 100755 drivers/devfreq/rockchip_dmc.c - create mode 100755 drivers/devfreq/rockchip_dmc_common.c - create mode 100755 drivers/devfreq/rockchip_dmc_dbg.c - create mode 100755 drivers/devfreq/rockchip_dmc_timing.h - create mode 100755 drivers/dma-buf/heaps/deferred-free-helper.c - create mode 100755 drivers/dma-buf/heaps/deferred-free-helper.h - delete mode 100644 drivers/dma-buf/heaps/heap-helpers.c - delete mode 100644 drivers/dma-buf/heaps/heap-helpers.h - create mode 100755 drivers/dma-buf/heaps/page_pool.c - create mode 100755 drivers/dma-buf/heaps/page_pool.h - create mode 100755 drivers/firmware/rockchip_sip.c - create mode 100755 drivers/gpio/gpio-rockchip.c - create mode 100755 drivers/gpu/arm/Kbuild - create mode 100755 drivers/gpu/arm/Kconfig - create mode 100755 drivers/gpu/arm/bifrost/Kbuild - create mode 100755 drivers/gpu/arm/bifrost/Kconfig - create mode 100755 drivers/gpu/arm/bifrost/Makefile - create mode 100755 drivers/gpu/arm/bifrost/Makefile.kbase - create mode 100755 drivers/gpu/arm/bifrost/Mconfig - create mode 100755 drivers/gpu/arm/bifrost/arbiter/Kbuild - create mode 100755 drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c - create mode 100755 drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h - create mode 100755 drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h - create mode 100755 drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_interface.h - create mode 100755 drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c - create mode 100755 drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/Kbuild - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h - create mode 100755 drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c - create mode 100755 drivers/gpu/arm/bifrost/build.bp - create mode 100755 drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c - create mode 100755 drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c - create mode 100755 drivers/gpu/arm/bifrost/context/mali_kbase_context.c - create mode 100755 drivers/gpu/arm/bifrost/context/mali_kbase_context.h - create mode 100755 drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h - create mode 100755 drivers/gpu/arm/bifrost/csf/Kbuild - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_base_csf_kernel.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_gpu_csf_control_registers.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_gpu_csf_registers.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c - create mode 100755 drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h - create mode 100755 drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h - create mode 100755 drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h - create mode 100755 drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c - create mode 100755 drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h - create mode 100755 drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h - create mode 100755 drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h - create mode 100755 drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c - create mode 100755 drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h - create mode 100755 drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h - create mode 100755 drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h - create mode 100755 drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c - create mode 100755 drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h - create mode 100755 drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h - create mode 100755 drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h - create mode 100755 drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h - create mode 100755 drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h - create mode 100755 drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c - create mode 100755 drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c - create mode 100755 drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c - create mode 100755 drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c - create mode 100755 drivers/gpu/arm/bifrost/device/mali_kbase_device.c - create mode 100755 drivers/gpu/arm/bifrost/device/mali_kbase_device.h - create mode 100755 drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c - create mode 100755 drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h - create mode 100755 drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c - create mode 100755 drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c - create mode 100755 drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h - create mode 100755 drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h - create mode 100755 drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c - create mode 100755 drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.h - create mode 100755 drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h - create mode 100755 drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h - create mode 100755 drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h - create mode 100755 drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h - create mode 100755 drivers/gpu/arm/bifrost/ipa/Kbuild - create mode 100755 drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c - create mode 100755 drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h - create mode 100755 drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c - create mode 100755 drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h - create mode 100755 drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_common.c - create mode 100755 drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_common.h - create mode 100755 drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_g7x.c - create mode 100755 drivers/gpu/arm/bifrost/jm/mali_base_jm_kernel.h - create mode 100755 drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h - create mode 100755 drivers/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h - create mode 100755 drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h - create mode 100755 drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h - create mode 100755 drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h - create mode 100755 drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h - create mode 100755 drivers/gpu/arm/bifrost/mali_base_kernel.h - create mode 100755 drivers/gpu/arm/bifrost/mali_base_mem_priv.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_bits.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_caps.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_ccswe.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_ccswe.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_config.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_config.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_core_linux.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_debug.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_debug.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_defs.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_dma_fence.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_dma_fence.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_event.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_fence.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_fence.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_gator.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_gwt.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_gwt.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hw.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hw.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt_accumulator.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend_jm.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend_jm.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt_context.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt_gpu.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt_gpu.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt_legacy.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt_legacy.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt_types.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt_types.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt_virtualizer.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_hwcnt_virtualizer.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_ioctl.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_jd.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_jm.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_jm.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_js.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_js.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_linux.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mem.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mem.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_pm.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_pm.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_smc.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_smc.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_softjobs.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_strings.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_strings.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_sync.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_sync_android.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_sync_common.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_sync_file.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_utility.h - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_vinstr.c - create mode 100755 drivers/gpu/arm/bifrost/mali_kbase_vinstr.h - create mode 100755 drivers/gpu/arm/bifrost/mali_linux_trace.h - create mode 100755 drivers/gpu/arm/bifrost/mali_malisw.h - create mode 100755 drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c - create mode 100755 drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h - create mode 100755 drivers/gpu/arm/bifrost/mali_uk.h - create mode 100755 drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c - create mode 100755 drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c - create mode 100755 drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c - create mode 100755 drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h - create mode 100755 drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h - create mode 100755 drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c - create mode 100755 drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h - create mode 100755 drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c - create mode 100755 drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_lpae.c - create mode 100755 drivers/gpu/arm/bifrost/platform/Kconfig - create mode 100755 drivers/gpu/arm/bifrost/platform/devicetree/Kbuild - create mode 100755 drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c - create mode 100755 drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c - create mode 100755 drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c - create mode 100755 drivers/gpu/arm/bifrost/platform/rk/Kbuild - create mode 100755 drivers/gpu/arm/bifrost/platform/rk/custom_log.h - create mode 100755 drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c - create mode 100755 drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h - create mode 100755 drivers/gpu/arm/bifrost/platform/vexpress/Kbuild - create mode 100755 drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c - create mode 100755 drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild - create mode 100755 drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c - create mode 100755 drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild - create mode 100755 drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c - create mode 100755 drivers/gpu/arm/bifrost/protected_mode_switcher.h - create mode 100755 drivers/gpu/arm/bifrost/tests/Kbuild - create mode 100755 drivers/gpu/arm/bifrost/tests/Kconfig - create mode 100755 drivers/gpu/arm/bifrost/tests/Mconfig - create mode 100755 drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h - create mode 100755 drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h - create mode 100755 drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h - create mode 100755 drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h - create mode 100755 drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h - create mode 100755 drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h - create mode 100755 drivers/gpu/arm/bifrost/tests/kutf/Kbuild - create mode 100755 drivers/gpu/arm/bifrost/tests/kutf/Kconfig - create mode 100755 drivers/gpu/arm/bifrost/tests/kutf/Makefile - create mode 100755 drivers/gpu/arm/bifrost/tests/kutf/build.bp - create mode 100755 drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c - create mode 100755 drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c - create mode 100755 drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c - create mode 100755 drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c - create mode 100755 drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c - create mode 100755 drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c - create mode 100755 drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild - create mode 100755 drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kconfig - create mode 100755 drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Makefile - create mode 100755 drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp - create mode 100755 drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c - create mode 100755 drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h - create mode 100755 drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild - create mode 100755 drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kconfig - create mode 100755 drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Makefile - create mode 100755 drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp - create mode 100755 drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c - create mode 100755 drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c - create mode 100755 drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c - create mode 100755 drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c - create mode 100755 drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c - create mode 100755 drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h - create mode 100755 drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c - create mode 100755 drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h - create mode 100755 drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h - create mode 100755 drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c - create mode 100755 drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h - create mode 100755 drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c - create mode 100755 drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/Kbuild - create mode 100755 drivers/gpu/arm/bifrost_for_linux/Kconfig - create mode 100755 drivers/gpu/arm/bifrost_for_linux/Makefile - create mode 100755 drivers/gpu/arm/bifrost_for_linux/Makefile.kbase - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/Kbuild - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_backend_config.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_cache_policy_backend.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_cache_policy_backend.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_debug_job_fault_backend.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_devfreq.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_devfreq.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_device_hw.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_device_internal.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_gpu.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_gpuprops_backend.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_backend.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_defs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_internal.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_irq_internal.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_irq_linux.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_as.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_defs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_hw.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_internal.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_rb.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_rb.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_affinity.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_affinity.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_backend.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_internal.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_mmu_hw_direct.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_mmu_hw_direct.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_always_on.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_always_on.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_backend.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_devfreq.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_devfreq.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_fixed.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_fixed.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_coarse_demand.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_coarse_demand.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_defs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_demand.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_demand.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_driver.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_internal.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_metrics.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_policy.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_policy.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_time.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_time.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/docs/Doxyfile - create mode 100755 drivers/gpu/arm/bifrost_for_linux/docs/policy_operation_diagram.dot - create mode 100755 drivers/gpu/arm/bifrost_for_linux/docs/policy_overview.dot - create mode 100755 drivers/gpu/arm/bifrost_for_linux/ipa/Kbuild - create mode 100755 drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_simple.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_simple.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_common.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_common.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_g71.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_base_hwconfig_features.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_base_hwconfig_issues.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_base_kernel.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_base_mem_priv.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_base_vendor_specific_func.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_10969_workaround.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_10969_workaround.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_as_fault_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_as_fault_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_cache_policy.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_cache_policy.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_config.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_config.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_config_defaults.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_context.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_context.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_core_linux.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_ctx_sched.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_ctx_sched.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_job_fault.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_job_fault.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_mem_view.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_mem_view.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_defs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_device.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_disjoint_events.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_dma_fence.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_dma_fence.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_event.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence_defs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_api.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_api.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_thex.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_tmix.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_tsix.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_id.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_memory_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_memory_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops_types.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_hw.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_hw.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_backend.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_defs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_gpuprops.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_instr.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_jm.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_pm.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_time.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwcnt_reader.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_ioctl.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_jm.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_jm.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_js.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_js.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_ctx_attr.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_ctx_attr.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_defs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_linux.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_linux.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_linux.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_lowlevel.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs_buf_size.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_hw.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_mode_aarch64.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_mode_lpae.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_platform_fake.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_pm.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_pm.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_profiling_gator_api.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_regs_history_debugfs.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_regs_history_debugfs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_replay.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_smc.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_smc.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_softjobs.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_strings.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_strings.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_android.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_common.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_file.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_tlstream.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_tlstream.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_defs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline_defs.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_uku.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_utility.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_utility.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_vinstr.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_kbase_vinstr.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_linux_kbase_trace.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_linux_trace.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_malisw.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_midg_coherency.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_midg_regmap.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_timeline.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/mali_uk.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/Kconfig - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/devicetree/Kbuild - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_config_devicetree.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_runtime_pm.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/mali_kbase_platform_common.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/rk/Kbuild - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/rk/custom_log.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_config_rk.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_rk.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/vexpress/Kbuild - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_config_vexpress.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_cpu_vexpress.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_cpu_vexpress.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/Kbuild - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/Kbuild - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/platform_dummy/mali_ukk_os.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/protected_mode_switcher.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/sconscript - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/Kbuild - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/Kconfig - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_helpers.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_helpers_user.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_mem.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_resultset.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_suite.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_utils.h - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/kutf/Kbuild - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/kutf/Kconfig - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/kutf/Makefile - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_helpers.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_helpers_user.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_mem.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_resultset.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_suite.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_utils.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/kutf/sconscript - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Kbuild - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Kconfig - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Makefile - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/sconscript - create mode 100755 drivers/gpu/arm/bifrost_for_linux/tests/sconscript - create mode 100755 drivers/gpu/arm/mali400/.gitignore - create mode 100755 drivers/gpu/arm/mali400/Kbuild - create mode 100755 drivers/gpu/arm/mali400/mali/.gitignore - create mode 100755 drivers/gpu/arm/mali400/mali/Kbuild - create mode 100755 drivers/gpu/arm/mali400/mali/Kconfig - create mode 100755 drivers/gpu/arm/mali400/mali/Makefile - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_broadcast.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_broadcast.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_control_timer.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_control_timer.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_dlbu.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_dlbu.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_executor.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_executor.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_gp.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_gp.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_gp_job.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_gp_job.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_group.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_group.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_hw_core.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_hw_core.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_mmu.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_mmu.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_osk.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_osk_list.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_osk_types.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_pm.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_pm.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_pmu.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_pmu.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_pp.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_pp.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_pp_job.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_pp_job.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_scheduler.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_scheduler.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_session.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_session.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_soft_job.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_soft_job.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_timeline.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_timeline.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_ukk.h - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c - create mode 100755 drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h - create mode 100755 drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h - create mode 100755 drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h - create mode 100755 drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h - create mode 100755 drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h - create mode 100755 drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_sync.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_sync.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c - create mode 100755 drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h - create mode 100755 drivers/gpu/arm/mali400/mali/platform/arm/arm.c - create mode 100755 drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c - create mode 100755 drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h - create mode 100755 drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c - create mode 100755 drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h - create mode 100755 drivers/gpu/arm/mali400/mali/platform/rk/rk.c - create mode 100755 drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h - create mode 100755 drivers/gpu/arm/mali400/mali/readme.txt - create mode 100755 drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h - create mode 100755 drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h - create mode 100755 drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c - create mode 100755 drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h - create mode 100755 drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c - create mode 100755 drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h - create mode 100755 drivers/gpu/arm/mali400/rk_ver_info.txt - create mode 100755 drivers/gpu/arm/mali400/ump/Kbuild - create mode 100755 drivers/gpu/arm/mali400/ump/Kconfig - create mode 100755 drivers/gpu/arm/mali400/ump/Makefile - create mode 100755 drivers/gpu/arm/mali400/ump/Makefile.common - create mode 100755 drivers/gpu/arm/mali400/ump/arch-default/config.h - create mode 100755 drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h - create mode 100755 drivers/gpu/arm/mali400/ump/arch/config.h - create mode 100755 drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c - create mode 100755 drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c - create mode 100755 drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h - create mode 100755 drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c - create mode 100755 drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h - create mode 100755 drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h - create mode 100755 drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c - create mode 100755 drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h - create mode 100755 drivers/gpu/arm/mali400/ump/common/ump_osk.h - create mode 100755 drivers/gpu/arm/mali400/ump/common/ump_uk_types.h - create mode 100755 drivers/gpu/arm/mali400/ump/common/ump_ukk.h - create mode 100755 drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c - create mode 100755 drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h - create mode 100755 drivers/gpu/arm/mali400/ump/readme.txt - create mode 100755 drivers/gpu/arm/mali400/umplock/Makefile - create mode 100755 drivers/gpu/arm/mali400/umplock/umplock_driver.c - create mode 100755 drivers/gpu/arm/mali400/umplock/umplock_ioctl.h - create mode 100755 drivers/gpu/arm/midgard/Kbuild - create mode 100755 drivers/gpu/arm/midgard/Kconfig - create mode 100755 drivers/gpu/arm/midgard/Makefile - create mode 100755 drivers/gpu/arm/midgard/Makefile.kbase - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/Kbuild - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c - create mode 100755 drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h - create mode 100755 drivers/gpu/arm/midgard/docs/Doxyfile - create mode 100755 drivers/gpu/arm/midgard/docs/policy_operation_diagram.dot - create mode 100755 drivers/gpu/arm/midgard/docs/policy_overview.dot - create mode 100755 drivers/gpu/arm/midgard/ipa/Kbuild - create mode 100755 drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c - create mode 100755 drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h - create mode 100755 drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c - create mode 100755 drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h - create mode 100755 drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c - create mode 100755 drivers/gpu/arm/midgard/mali_base_hwconfig_features.h - create mode 100755 drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h - create mode 100755 drivers/gpu/arm/midgard/mali_base_kernel.h - create mode 100755 drivers/gpu/arm/midgard/mali_base_mem_priv.h - create mode 100755 drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_cache_policy.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_cache_policy.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_config.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_config.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_config_defaults.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_context.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_context.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_core_linux.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_debug.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_debug.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_defs.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_device.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_dma_fence.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_dma_fence.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_event.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_fence.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_fence.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_fence_defs.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_gator.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_gator_api.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_gator_api.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_gpu_id.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_gpuprops.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_gpuprops.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_hw.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_hw.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_ioctl.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_jd.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_jm.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_jm.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_js.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_js.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_js_defs.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_linux.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mem.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mem.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mem_linux.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mem_linux.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mem_pool.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mmu.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_platform_fake.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_pm.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_pm.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_replay.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_smc.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_smc.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_softjobs.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_strings.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_strings.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_sync.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_sync_android.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_sync_common.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_sync_file.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_tlstream.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_tlstream.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_trace_defs.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_uku.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_utility.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_utility.h - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_vinstr.c - create mode 100755 drivers/gpu/arm/midgard/mali_kbase_vinstr.h - create mode 100755 drivers/gpu/arm/midgard/mali_linux_kbase_trace.h - create mode 100755 drivers/gpu/arm/midgard/mali_linux_trace.h - create mode 100755 drivers/gpu/arm/midgard/mali_malisw.h - create mode 100755 drivers/gpu/arm/midgard/mali_midg_coherency.h - create mode 100755 drivers/gpu/arm/midgard/mali_midg_regmap.h - create mode 100755 drivers/gpu/arm/midgard/mali_timeline.h - create mode 100755 drivers/gpu/arm/midgard/mali_uk.h - create mode 100755 drivers/gpu/arm/midgard/platform/Kconfig - create mode 100755 drivers/gpu/arm/midgard/platform/devicetree/Kbuild - create mode 100755 drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c - create mode 100755 drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c - create mode 100755 drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h - create mode 100755 drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h - create mode 100755 drivers/gpu/arm/midgard/platform/rk/Kbuild - create mode 100755 drivers/gpu/arm/midgard/platform/rk/custom_log.h - create mode 100755 drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c - create mode 100755 drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h - create mode 100755 drivers/gpu/arm/midgard/platform/vexpress/Kbuild - create mode 100755 drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c - create mode 100755 drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c - create mode 100755 drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h - create mode 100755 drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild - create mode 100755 drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c - create mode 100755 drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/Kbuild - create mode 100755 drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h - create mode 100755 drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c - create mode 100755 drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c - create mode 100755 drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h - create mode 100755 drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h - create mode 100755 drivers/gpu/arm/midgard/protected_mode_switcher.h - create mode 100755 drivers/gpu/arm/midgard/rename.h - create mode 100755 drivers/gpu/arm/midgard/sconscript - create mode 100755 drivers/gpu/arm/midgard/tests/Kbuild - create mode 100755 drivers/gpu/arm/midgard/tests/Kconfig - create mode 100755 drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h - create mode 100755 drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h - create mode 100755 drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h - create mode 100755 drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h - create mode 100755 drivers/gpu/arm/midgard/tests/kutf/Kbuild - create mode 100755 drivers/gpu/arm/midgard/tests/kutf/Kconfig - create mode 100755 drivers/gpu/arm/midgard/tests/kutf/Makefile - create mode 100755 drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c - create mode 100755 drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c - create mode 100755 drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c - create mode 100755 drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c - create mode 100755 drivers/gpu/arm/midgard/tests/kutf/sconscript - create mode 100755 drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kbuild - create mode 100755 drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig - create mode 100755 drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile - create mode 100755 drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c - create mode 100755 drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/sconscript - create mode 100755 drivers/gpu/arm/midgard/tests/sconscript - create mode 100755 drivers/gpu/arm/sconscript - create mode 100755 drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c - create mode 100755 drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h - create mode 100755 drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h - create mode 100755 drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c - create mode 100755 drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c - create mode 100755 drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h - create mode 100755 drivers/gpu/drm/drm_sync_helper.c - create mode 100755 drivers/gpu/drm/panel/panel-simple.h - create mode 100755 drivers/gpu/drm/rockchip/cdn-dp-link-training.c - create mode 100755 drivers/gpu/drm/rockchip/dw-dp.c - create mode 100755 drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/Kconfig - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/Makefile - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.h - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.h - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/ebc_dev.h - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/ebc_dev_v8.S - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/ebc_panel.h - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.h - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/epdlut/pvi_waveform_v8.S - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/epdlut/rkf_waveform_v8.S - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/pmic/Makefile - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.c - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/pmic/tps65185.c - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.h - create mode 100755 drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c - create mode 100755 drivers/gpu/drm/rockchip/rk618/Kconfig - create mode 100755 drivers/gpu/drm/rockchip/rk618/Makefile - create mode 100755 drivers/gpu/drm/rockchip/rk618/rk618_dither.c - create mode 100755 drivers/gpu/drm/rockchip/rk618/rk618_dither.h - create mode 100755 drivers/gpu/drm/rockchip/rk618/rk618_dsi.c - create mode 100755 drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c - create mode 100755 drivers/gpu/drm/rockchip/rk618/rk618_lvds.c - create mode 100755 drivers/gpu/drm/rockchip/rk618/rk618_rgb.c - create mode 100755 drivers/gpu/drm/rockchip/rk618/rk618_scaler.c - create mode 100755 drivers/gpu/drm/rockchip/rk618/rk618_vif.c - create mode 100755 drivers/gpu/drm/rockchip/rk628/Kconfig - create mode 100755 drivers/gpu/drm/rockchip/rk628/Makefile - create mode 100755 drivers/gpu/drm/rockchip/rk628/rk628_combrxphy.c - create mode 100755 drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c - create mode 100755 drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h - create mode 100755 drivers/gpu/drm/rockchip/rk628/rk628_dsi.c - create mode 100755 drivers/gpu/drm/rockchip/rk628/rk628_gvi.c - create mode 100755 drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c - create mode 100755 drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c - create mode 100755 drivers/gpu/drm/rockchip/rk628/rk628_lvds.c - create mode 100755 drivers/gpu/drm/rockchip/rk628/rk628_post_process.c - create mode 100755 drivers/gpu/drm/rockchip/rk628/rk628_rgb.c - create mode 100755 drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c - create mode 100755 drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.h - create mode 100755 drivers/gpu/drm/rockchip/rockchip_drm_backlight.c - create mode 100755 drivers/gpu/drm/rockchip/rockchip_drm_backlight.h - create mode 100755 drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c - create mode 100755 drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h - create mode 100755 drivers/gpu/drm/rockchip/rockchip_drm_logo.c - create mode 100755 drivers/gpu/drm/rockchip/rockchip_drm_logo.h - create mode 100755 drivers/gpu/drm/rockchip/rockchip_drm_tve.c - create mode 100755 drivers/gpu/drm/rockchip/rockchip_drm_tve.h - create mode 100755 drivers/gpu/drm/rockchip/rockchip_drm_vconn.c - create mode 100755 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c - create mode 100755 drivers/gpu/drm/rockchip/rockchip_drm_vvop.c - create mode 100755 drivers/gpu/drm/rockchip/rockchip_vop2_clk.c - create mode 100755 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c - create mode 100755 drivers/input/keyboard/rk_keys.c - create mode 100755 drivers/input/remotectl/Kconfig - create mode 100755 drivers/input/remotectl/Makefile - create mode 100755 drivers/input/remotectl/rockchip_pwm_remotectl.c - create mode 100755 drivers/input/remotectl/rockchip_pwm_remotectl.h - create mode 100755 drivers/input/sensors/Kconfig - create mode 100755 drivers/input/sensors/Makefile - create mode 100755 drivers/input/sensors/accel/Kconfig - create mode 100755 drivers/input/sensors/accel/Makefile - create mode 100755 drivers/input/sensors/accel/bma2xx.c - create mode 100755 drivers/input/sensors/accel/da223_core.c - create mode 100755 drivers/input/sensors/accel/da223_core.h - create mode 100755 drivers/input/sensors/accel/da223_cust.c - create mode 100755 drivers/input/sensors/accel/da223_cust.h - create mode 100755 drivers/input/sensors/accel/dmard10.c - create mode 100755 drivers/input/sensors/accel/icm2060x_acc.c - create mode 100755 drivers/input/sensors/accel/kxtik.c - create mode 100755 drivers/input/sensors/accel/kxtj9.c - create mode 100755 drivers/input/sensors/accel/lis3dh.c - create mode 100755 drivers/input/sensors/accel/lsm303d.c - create mode 100755 drivers/input/sensors/accel/lsm330_acc.c - create mode 100755 drivers/input/sensors/accel/mc3230.c - create mode 100755 drivers/input/sensors/accel/mma7660.c - create mode 100755 drivers/input/sensors/accel/mma8452.c - create mode 100755 drivers/input/sensors/accel/mpu6500_acc.c - create mode 100755 drivers/input/sensors/accel/mpu6880_acc.c - create mode 100755 drivers/input/sensors/accel/mxc622x.c - create mode 100755 drivers/input/sensors/accel/mxc6655xa.c - create mode 100755 drivers/input/sensors/accel/sc7660.c - create mode 100755 drivers/input/sensors/accel/sc7a20.c - create mode 100755 drivers/input/sensors/accel/sc7a30.c - create mode 100755 drivers/input/sensors/accel/stk8baxx.c - create mode 100755 drivers/input/sensors/angle/Kconfig - create mode 100755 drivers/input/sensors/angle/Makefile - create mode 100755 drivers/input/sensors/angle/angle_kxtik.c - create mode 100755 drivers/input/sensors/angle/angle_lis3dh.c - create mode 100755 drivers/input/sensors/compass/Kconfig - create mode 100755 drivers/input/sensors/compass/Makefile - create mode 100755 drivers/input/sensors/compass/ak09911.c - create mode 100755 drivers/input/sensors/compass/ak09918.c - create mode 100755 drivers/input/sensors/compass/ak8963.c - create mode 100755 drivers/input/sensors/compass/ak8975.c - create mode 100755 drivers/input/sensors/gyro/Kconfig - create mode 100755 drivers/input/sensors/gyro/Makefile - create mode 100755 drivers/input/sensors/gyro/ewtsa.c - create mode 100755 drivers/input/sensors/gyro/icm2060x_gyro.c - create mode 100755 drivers/input/sensors/gyro/l3g20d.c - create mode 100755 drivers/input/sensors/gyro/l3g4200d.c - create mode 100755 drivers/input/sensors/gyro/lsm330_gyro.c - create mode 100755 drivers/input/sensors/gyro/mpu6500_gyro.c - create mode 100755 drivers/input/sensors/gyro/mpu6880_gyro.c - create mode 100755 drivers/input/sensors/hall/Kconfig - create mode 100755 drivers/input/sensors/hall/Makefile - create mode 100755 drivers/input/sensors/hall/mh248.c - create mode 100755 drivers/input/sensors/hall/och165t_hall.c - create mode 100755 drivers/input/sensors/lsensor/Kconfig - create mode 100755 drivers/input/sensors/lsensor/Makefile - create mode 100755 drivers/input/sensors/lsensor/cm3217.c - create mode 100755 drivers/input/sensors/lsensor/cm3218.c - create mode 100755 drivers/input/sensors/lsensor/cm3232.c - create mode 100755 drivers/input/sensors/lsensor/isl29023.c - create mode 100755 drivers/input/sensors/lsensor/ls_al3006.c - create mode 100755 drivers/input/sensors/lsensor/ls_ap321xx.c - create mode 100755 drivers/input/sensors/lsensor/ls_em3071x.c - create mode 100755 drivers/input/sensors/lsensor/ls_stk3171.c - create mode 100755 drivers/input/sensors/lsensor/ls_stk3410.c - create mode 100755 drivers/input/sensors/lsensor/ls_us5152.c - create mode 100755 drivers/input/sensors/lsensor/ls_us5152.h - create mode 100755 drivers/input/sensors/pressure/Kconfig - create mode 100755 drivers/input/sensors/pressure/Makefile - create mode 100755 drivers/input/sensors/pressure/pr_ms5607.c - create mode 100755 drivers/input/sensors/psensor/Kconfig - create mode 100755 drivers/input/sensors/psensor/Makefile - create mode 100755 drivers/input/sensors/psensor/ps_al3006.c - create mode 100755 drivers/input/sensors/psensor/ps_ap321xx.c - create mode 100755 drivers/input/sensors/psensor/ps_em3071x.c - create mode 100755 drivers/input/sensors/psensor/ps_stk3171.c - create mode 100755 drivers/input/sensors/psensor/ps_stk3410.c - create mode 100755 drivers/input/sensors/sensor-dev.c - create mode 100755 drivers/input/sensors/sensor-i2c.c - create mode 100755 drivers/input/sensors/temperature/Kconfig - create mode 100755 drivers/input/sensors/temperature/Makefile - create mode 100755 drivers/input/sensors/temperature/tmp_ms5607.c - create mode 100755 drivers/input/touchscreen/cy8c_touchpad.c - create mode 100755 drivers/input/touchscreen/cyttsp5/Kconfig - create mode 100755 drivers/input/touchscreen/cyttsp5/Makefile - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_core.c - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_core.h - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_params.h - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid00.h - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid01.h - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_platform.h - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c - create mode 100755 drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c - create mode 100755 drivers/input/touchscreen/focaltech_touch/Makefile - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_common.h - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_config.h - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_core.c - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_core.h - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_esdcheck.c - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_ex_fun.c - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_ex_mode.c - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_flash.c - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_flash.h - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_flash/Makefile - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_flash/focaltech_upgrade_ft8201.c - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_gesture.c - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_i2c.c - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_point_report_check.c - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_test/Makefile - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.c - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.h - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.c - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.h - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/Makefile - create mode 100755 drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/focaltech_test_ft8201.c - create mode 100755 drivers/input/touchscreen/focaltech_touch/include/firmware/fw_sample.h - create mode 100755 drivers/input/touchscreen/focaltech_touch/include/pramboot/FT8006M_Pramboot_V1.6_20180426_le.h - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/Makefile - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_common.h - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_config.h - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.c - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.h - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_esdcheck.c - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_fun.c - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_mode.c - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.c - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.h - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/Makefile - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/focaltech_upgrade_ft5436.c - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_gesture.c - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_i2c.c - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_point_report_check.c - create mode 100755 drivers/input/touchscreen/focaltech_touch_ft5436/include/firmware/fw_sample.h - create mode 100755 drivers/input/touchscreen/gsl3673.c - create mode 100755 drivers/input/touchscreen/gsl3673.h - create mode 100755 drivers/input/touchscreen/gsl3673_800x1280.c - create mode 100755 drivers/input/touchscreen/gsl3673_800x1280.h - create mode 100755 drivers/input/touchscreen/gsl3676/Makefile - create mode 100755 drivers/input/touchscreen/gsl3676/gsl3676.c - create mode 100755 drivers/input/touchscreen/gsl3676/rk3368_th863c_10.h - create mode 100755 drivers/input/touchscreen/gsl_point_id.c - create mode 100755 drivers/input/touchscreen/gslx680.c - create mode 100755 drivers/input/touchscreen/gslx680.h - create mode 100755 drivers/input/touchscreen/gslx6801.c - create mode 100755 drivers/input/touchscreen/gslx6801.h - create mode 100755 drivers/input/touchscreen/gslx680_d708/Makefile - create mode 100755 drivers/input/touchscreen/gslx680_d708/rockchip_gsl3670.h - create mode 100755 drivers/input/touchscreen/gslx680_d708/rockchip_gslX680.c - create mode 100755 drivers/input/touchscreen/gslx680_d708/rockchip_gslX680_88v.h - create mode 100755 drivers/input/touchscreen/gslx680_firefly.c - create mode 100755 drivers/input/touchscreen/gslx680_firefly.h - create mode 100755 drivers/input/touchscreen/gslx680_pad.c - create mode 100755 drivers/input/touchscreen/gslx680_pad.h - create mode 100755 drivers/input/touchscreen/gslx680a.c - create mode 100755 drivers/input/touchscreen/gt1x/GT5688_Config_20170713_1080_1920.cfg - create mode 100755 drivers/input/touchscreen/gt1x/Makefile - create mode 100755 drivers/input/touchscreen/gt1x/gt1x.c - create mode 100755 drivers/input/touchscreen/gt1x/gt1x.h - create mode 100755 drivers/input/touchscreen/gt1x/gt1x_cfg.h - create mode 100755 drivers/input/touchscreen/gt1x/gt1x_extents.c - create mode 100755 drivers/input/touchscreen/gt1x/gt1x_firmware.h - create mode 100755 drivers/input/touchscreen/gt1x/gt1x_generic.c - create mode 100755 drivers/input/touchscreen/gt1x/gt1x_generic.h - create mode 100755 drivers/input/touchscreen/gt1x/gt1x_tools.c - create mode 100755 drivers/input/touchscreen/gt1x/gt1x_update.c - create mode 100755 drivers/input/touchscreen/gt9xx/GT9110P(2020)V71_Config_20201028_170326.cfg - create mode 100755 drivers/input/touchscreen/gt9xx/GT9110P_Config_20160217_1526_2048_97.cfg - create mode 100755 drivers/input/touchscreen/gt9xx/GT9271_Config_20170526.cfg - create mode 100755 drivers/input/touchscreen/gt9xx/HLS-0102-1398V1-1060-GT911_Config_20201204_V66.cfg - create mode 100755 drivers/input/touchscreen/gt9xx/Makefile - create mode 100755 drivers/input/touchscreen/gt9xx/WGJ10162B_GT9271_1060_Config_20140821_1341110X42.cfg - create mode 100755 drivers/input/touchscreen/gt9xx/WGJ10162_GT9271_Config_20140820_182456.cfg - create mode 100755 drivers/input/touchscreen/gt9xx/WGJ10187_GT910_Config_20140623_104014_0X41.cfg - create mode 100755 drivers/input/touchscreen/gt9xx/WGJ10187_GT9271_Config_20140623_104014_0X41.cfg - create mode 100755 drivers/input/touchscreen/gt9xx/WGJ89006B_GT911_Config_20140625_085816_0X43.cfg - create mode 100755 drivers/input/touchscreen/gt9xx/WGJ89006B_GT9271_Config_20140625_085816_0X41.cfg - create mode 100755 drivers/input/touchscreen/gt9xx/goodix_tool.c - create mode 100755 drivers/input/touchscreen/gt9xx/gt9xx.c - create mode 100755 drivers/input/touchscreen/gt9xx/gt9xx.h - create mode 100755 drivers/input/touchscreen/gt9xx/gt9xx_cfg.h - create mode 100755 drivers/input/touchscreen/gt9xx/gt9xx_firmware.h - create mode 100755 drivers/input/touchscreen/gt9xx/gt9xx_update.c - create mode 100755 drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D863_7.h - create mode 100755 drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D89.h - create mode 100755 drivers/input/touchscreen/hyn_cst2xx/Makefile - create mode 100755 drivers/input/touchscreen/hyn_cst2xx/hyn_cst2xx.c - create mode 100755 drivers/input/touchscreen/tp_gslx680_board.h - create mode 100755 drivers/input/touchscreen/tp_suspend.h - create mode 100755 drivers/input/touchscreen/vtl_ts/LX20JS06_A1_CT363_V03_5198_121015.dat - create mode 100755 drivers/input/touchscreen/vtl_ts/Makefile - create mode 100755 drivers/input/touchscreen/vtl_ts/apk.c - create mode 100755 drivers/input/touchscreen/vtl_ts/apk.h - create mode 100755 drivers/input/touchscreen/vtl_ts/chip.c - create mode 100755 drivers/input/touchscreen/vtl_ts/chip.h - create mode 100755 drivers/input/touchscreen/vtl_ts/f307&f317&f316_CT363S_01_V10_F7E9_140212.dat - create mode 100755 drivers/input/touchscreen/vtl_ts/lx--js77_97_CT365_V01_E7DA_130419.dat - create mode 100755 drivers/input/touchscreen/vtl_ts/tp_fw.h - create mode 100755 drivers/input/touchscreen/vtl_ts/vtl_ts.c - create mode 100755 drivers/input/touchscreen/vtl_ts/vtl_ts.h - create mode 100755 drivers/input/touchscreen/vtl_ts/wgj36js07_A1_CT363_V01_0187_140306.dat - create mode 100755 drivers/input/touchscreen/wacom_w9013.c - create mode 100755 drivers/iommu/dma-iommu-ops.c - create mode 100755 drivers/media/i2c/gc8034.c - create mode 100755 drivers/media/i2c/rk628_csi.c - create mode 100755 drivers/media/i2c/rk628_csi.h - create mode 100755 drivers/media/platform/rockchip-tsp/Kconfig - create mode 100755 drivers/media/platform/rockchip-tsp/Makefile - create mode 100755 drivers/media/platform/rockchip-tsp/rockchip_tsp.c - create mode 100755 drivers/media/platform/rockchip-tsp/rockchip_tsp.h - create mode 100755 drivers/media/platform/rockchip/cif/Kconfig - create mode 100755 drivers/media/platform/rockchip/cif/Makefile - create mode 100755 drivers/media/platform/rockchip/cif/capture.c - create mode 100755 drivers/media/platform/rockchip/cif/cif-luma.c - create mode 100755 drivers/media/platform/rockchip/cif/cif-luma.h - create mode 100755 drivers/media/platform/rockchip/cif/cif-scale.c - create mode 100755 drivers/media/platform/rockchip/cif/common.c - create mode 100755 drivers/media/platform/rockchip/cif/common.h - create mode 100755 drivers/media/platform/rockchip/cif/dev.c - create mode 100755 drivers/media/platform/rockchip/cif/dev.h - create mode 100755 drivers/media/platform/rockchip/cif/hw.c - create mode 100755 drivers/media/platform/rockchip/cif/hw.h - create mode 100755 drivers/media/platform/rockchip/cif/mipi-csi2.c - create mode 100755 drivers/media/platform/rockchip/cif/mipi-csi2.h - create mode 100755 drivers/media/platform/rockchip/cif/procfs.c - create mode 100755 drivers/media/platform/rockchip/cif/procfs.h - create mode 100755 drivers/media/platform/rockchip/cif/regs.h - create mode 100755 drivers/media/platform/rockchip/cif/subdev-itf.c - create mode 100755 drivers/media/platform/rockchip/cif/subdev-itf.h - create mode 100755 drivers/media/platform/rockchip/cif/version.h - create mode 100755 drivers/media/platform/rockchip/isp/Kconfig - create mode 100755 drivers/media/platform/rockchip/isp/Makefile - create mode 100755 drivers/media/platform/rockchip/isp/bridge.c - create mode 100755 drivers/media/platform/rockchip/isp/bridge.h - create mode 100755 drivers/media/platform/rockchip/isp/bridge_v20.c - create mode 100755 drivers/media/platform/rockchip/isp/bridge_v30.c - create mode 100755 drivers/media/platform/rockchip/isp/capture.c - create mode 100755 drivers/media/platform/rockchip/isp/capture.h - create mode 100755 drivers/media/platform/rockchip/isp/capture_v1x.c - create mode 100755 drivers/media/platform/rockchip/isp/capture_v1x.h - create mode 100755 drivers/media/platform/rockchip/isp/capture_v20.c - create mode 100755 drivers/media/platform/rockchip/isp/capture_v21.c - create mode 100755 drivers/media/platform/rockchip/isp/capture_v2x.h - create mode 100755 drivers/media/platform/rockchip/isp/capture_v30.c - create mode 100755 drivers/media/platform/rockchip/isp/capture_v3x.h - create mode 100755 drivers/media/platform/rockchip/isp/common.c - create mode 100755 drivers/media/platform/rockchip/isp/common.h - create mode 100755 drivers/media/platform/rockchip/isp/csi.c - create mode 100755 drivers/media/platform/rockchip/isp/csi.h - create mode 100755 drivers/media/platform/rockchip/isp/dev.c - create mode 100755 drivers/media/platform/rockchip/isp/dev.h - create mode 100755 drivers/media/platform/rockchip/isp/dmarx.c - create mode 100755 drivers/media/platform/rockchip/isp/dmarx.h - create mode 100755 drivers/media/platform/rockchip/isp/hw.c - create mode 100755 drivers/media/platform/rockchip/isp/hw.h - create mode 100755 drivers/media/platform/rockchip/isp/isp_external.h - create mode 100755 drivers/media/platform/rockchip/isp/isp_ispp.h - create mode 100755 drivers/media/platform/rockchip/isp/isp_mipi_luma.c - create mode 100755 drivers/media/platform/rockchip/isp/isp_mipi_luma.h - create mode 100755 drivers/media/platform/rockchip/isp/isp_params.c - create mode 100755 drivers/media/platform/rockchip/isp/isp_params.h - create mode 100755 drivers/media/platform/rockchip/isp/isp_params_v1x.c - create mode 100755 drivers/media/platform/rockchip/isp/isp_params_v1x.h - create mode 100755 drivers/media/platform/rockchip/isp/isp_params_v21.c - create mode 100755 drivers/media/platform/rockchip/isp/isp_params_v21.h - create mode 100755 drivers/media/platform/rockchip/isp/isp_params_v2x.c - create mode 100755 drivers/media/platform/rockchip/isp/isp_params_v2x.h - create mode 100755 drivers/media/platform/rockchip/isp/isp_params_v3x.c - create mode 100755 drivers/media/platform/rockchip/isp/isp_params_v3x.h - create mode 100755 drivers/media/platform/rockchip/isp/isp_stats.c - create mode 100755 drivers/media/platform/rockchip/isp/isp_stats.h - create mode 100755 drivers/media/platform/rockchip/isp/isp_stats_v1x.c - create mode 100755 drivers/media/platform/rockchip/isp/isp_stats_v1x.h - create mode 100755 drivers/media/platform/rockchip/isp/isp_stats_v21.c - create mode 100755 drivers/media/platform/rockchip/isp/isp_stats_v21.h - create mode 100755 drivers/media/platform/rockchip/isp/isp_stats_v2x.c - create mode 100755 drivers/media/platform/rockchip/isp/isp_stats_v2x.h - create mode 100755 drivers/media/platform/rockchip/isp/isp_stats_v3x.c - create mode 100755 drivers/media/platform/rockchip/isp/isp_stats_v3x.h - create mode 100755 drivers/media/platform/rockchip/isp/procfs.c - create mode 100755 drivers/media/platform/rockchip/isp/procfs.h - create mode 100755 drivers/media/platform/rockchip/isp/regs.c - create mode 100755 drivers/media/platform/rockchip/isp/regs.h - create mode 100755 drivers/media/platform/rockchip/isp/regs_v2x.h - create mode 100755 drivers/media/platform/rockchip/isp/regs_v3x.h - create mode 100755 drivers/media/platform/rockchip/isp/rkisp.c - create mode 100755 drivers/media/platform/rockchip/isp/rkisp.h - create mode 100755 drivers/media/platform/rockchip/isp/rkisp_tb_helper.c - create mode 100755 drivers/media/platform/rockchip/isp/rkisp_tb_helper.h - create mode 100755 drivers/media/platform/rockchip/isp/version.h - create mode 100755 drivers/media/platform/rockchip/isp/videobuf2-rdma-sg.c - create mode 100755 drivers/media/platform/rockchip/isp1/Kconfig - create mode 100755 drivers/media/platform/rockchip/isp1/Makefile - create mode 100755 drivers/media/platform/rockchip/isp1/capture.c - create mode 100755 drivers/media/platform/rockchip/isp1/capture.h - create mode 100755 drivers/media/platform/rockchip/isp1/common.h - create mode 100755 drivers/media/platform/rockchip/isp1/dev.c - create mode 100755 drivers/media/platform/rockchip/isp1/dev.h - create mode 100755 drivers/media/platform/rockchip/isp1/dmarx.c - create mode 100755 drivers/media/platform/rockchip/isp1/dmarx.h - create mode 100755 drivers/media/platform/rockchip/isp1/isp_params.c - create mode 100755 drivers/media/platform/rockchip/isp1/isp_params.h - create mode 100755 drivers/media/platform/rockchip/isp1/isp_stats.c - create mode 100755 drivers/media/platform/rockchip/isp1/isp_stats.h - create mode 100755 drivers/media/platform/rockchip/isp1/regs.c - create mode 100755 drivers/media/platform/rockchip/isp1/regs.h - create mode 100755 drivers/media/platform/rockchip/isp1/rkisp1.c - create mode 100755 drivers/media/platform/rockchip/isp1/rkisp1.h - create mode 100755 drivers/media/platform/rockchip/isp1/version.h - create mode 100755 drivers/media/platform/rockchip/ispp/Kconfig - create mode 100755 drivers/media/platform/rockchip/ispp/Makefile - create mode 100755 drivers/media/platform/rockchip/ispp/common.c - create mode 100755 drivers/media/platform/rockchip/ispp/common.h - create mode 100755 drivers/media/platform/rockchip/ispp/dev.c - create mode 100755 drivers/media/platform/rockchip/ispp/dev.h - create mode 100755 drivers/media/platform/rockchip/ispp/fec.c - create mode 100755 drivers/media/platform/rockchip/ispp/fec.h - create mode 100755 drivers/media/platform/rockchip/ispp/hw.c - create mode 100755 drivers/media/platform/rockchip/ispp/hw.h - create mode 100755 drivers/media/platform/rockchip/ispp/ispp.c - create mode 100755 drivers/media/platform/rockchip/ispp/ispp.h - create mode 100755 drivers/media/platform/rockchip/ispp/params.c - create mode 100755 drivers/media/platform/rockchip/ispp/params.h - create mode 100755 drivers/media/platform/rockchip/ispp/params_v10.c - create mode 100755 drivers/media/platform/rockchip/ispp/params_v20.c - create mode 100755 drivers/media/platform/rockchip/ispp/procfs.c - create mode 100755 drivers/media/platform/rockchip/ispp/procfs.h - create mode 100755 drivers/media/platform/rockchip/ispp/regs.h - create mode 100755 drivers/media/platform/rockchip/ispp/stats.c - create mode 100755 drivers/media/platform/rockchip/ispp/stats.h - create mode 100755 drivers/media/platform/rockchip/ispp/stream.c - create mode 100755 drivers/media/platform/rockchip/ispp/stream.h - create mode 100755 drivers/media/platform/rockchip/ispp/stream_v10.c - create mode 100755 drivers/media/platform/rockchip/ispp/stream_v20.c - create mode 100755 drivers/media/platform/rockchip/ispp/version.h - create mode 100755 drivers/mmc/host/rk_sdmmc.h - create mode 100755 drivers/mmc/host/rk_sdmmc_ops.c - create mode 100755 drivers/mmc/host/rk_sdmmc_ops.h - create mode 100644 drivers/mtd/nand/raw/rockchip-nand-controller.c - create mode 100755 drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.c - create mode 100755 drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.h - create mode 100755 drivers/net/wireless/rockchip_wlan/Kconfig - create mode 100755 drivers/net/wireless/rockchip_wlan/Makefile - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/Kconfig - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/Makefile - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Kconfig - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Makefile - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcm_app_utils.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmbloom.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmevent.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_linux.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc_linux.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdspi_linux.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmspibrcm.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmstdlib_s.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmutils.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rates.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rspec.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_buzzz.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cdc.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_common.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_gpio.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_hikey.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_memprealloc.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug_linux.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_gpio.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_exportfs.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_lb.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_platdev.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_priv.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_msgbuf.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie_linux.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_proto.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_sdio.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_static_buf.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_stats.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_wlhdr.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hdf_public_ap6275s.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktpool.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktq.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndlhl.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndmem.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndpmu.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11e.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.3.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/aidmp.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_cfg.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_ring.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmarp.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmbloom.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmcdc.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdefs.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmendian.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmevent.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmicmp.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmip.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmipv6.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmmsgbuf.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmnvram.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcie.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcispi.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh_sdmmc.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdpcm.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdspi.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdstd.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspi.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspibrcm.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_tbl.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtcp.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtlv.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmudp.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmutils.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dbus.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhd_daemon.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhdioctl.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/epivers.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/etd.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ethernet.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_payload.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_set.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_tag.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_trace.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fils.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_cons.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_debug.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktpool.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktq.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_trap.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndchipc.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndlhl.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndmem.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndpmu.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndsoc.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_pkt.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/lpflags.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/mbo.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/miniopt.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msf.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/nan.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_decl.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_ext.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/p2p.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_end.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_start.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcicfg.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcie_core.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/rte_ioctl.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbconfig.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbgci.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndarm.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhnddma.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdio.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdpcmdev.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsocram.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsysmem.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdio.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdioh.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdiovar.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdspi.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/spid.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/typedefs.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/usbrdl.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/vlan.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_defs.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_utils.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wpa.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wps.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_pkt.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/otpdefs.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/pcie_core.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils_priv.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg_btcoex.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_dbg.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_ext_genl.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_linux_mon.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_roam.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.h - create mode 100755 drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c - create mode 100755 drivers/pci/controller/dwc/pcie-dw-rockchip.c - create mode 100755 drivers/pci/controller/rockchip-pcie-dma.c - create mode 100755 drivers/pci/controller/rockchip-pcie-dma.h - create mode 100755 drivers/phy/rockchip/phy-rockchip-csi2-dphy-common.h - create mode 100755 drivers/phy/rockchip/phy-rockchip-csi2-dphy-hw.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-csi2-dphy.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-inno-combphy.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-inno-hdmi-phy.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-inno-mipi-dphy.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-inno-usb3.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-inno-video-combo-phy.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-inno-video-phy.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-mipi-rx.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-naneng-combphy.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-naneng-edp.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-naneng-usb2.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-snps-pcie3.c - create mode 100755 drivers/phy/rockchip/phy-rockchip-usbdp.c - create mode 100755 drivers/pinctrl/pinctrl-rk628.c - create mode 100755 drivers/pinctrl/pinctrl-rockchip.h - create mode 100755 drivers/power/ec_battery.c - create mode 100755 drivers/power/reset/reboot-mode.h - create mode 100755 drivers/power/supply/bq25700_charger.c - create mode 100755 drivers/power/supply/rk816_battery.c - create mode 100755 drivers/power/supply/rk816_battery.h - create mode 100755 drivers/power/supply/rk817_battery.c - create mode 100755 drivers/power/supply/rk817_charger.c - create mode 100755 drivers/power/supply/rk818_battery.c - create mode 100755 drivers/power/supply/rk818_battery.h - create mode 100755 drivers/power/supply/rk818_charger.c - create mode 100755 drivers/power/sy6982c_charger.c - create mode 100755 drivers/power/universal_charger.c - create mode 100755 drivers/regulator/lp8752.c - create mode 100755 drivers/regulator/mp8865-regulator.c - create mode 100755 drivers/regulator/scmi-regulator.c - create mode 100755 drivers/regulator/syr82x.c - create mode 100755 drivers/regulator/tps549b22-regulator.c - create mode 100755 drivers/regulator/xz3216.c - create mode 100755 drivers/rk_nand/Kconfig - create mode 100755 drivers/rk_nand/Makefile - create mode 100755 drivers/rk_nand/rk_ftl_api.h - create mode 100755 drivers/rk_nand/rk_ftl_arm_v7.S - create mode 100755 drivers/rk_nand/rk_ftl_arm_v7_thumb.S - create mode 100755 drivers/rk_nand/rk_ftl_arm_v8.S - create mode 100755 drivers/rk_nand/rk_ftlv5_arm32.S - create mode 100755 drivers/rk_nand/rk_ftlv5_arm64.S - create mode 100755 drivers/rk_nand/rk_nand_base.c - create mode 100755 drivers/rk_nand/rk_nand_base.h - create mode 100755 drivers/rk_nand/rk_nand_blk.c - create mode 100755 drivers/rk_nand/rk_nand_blk.h - create mode 100755 drivers/rk_nand/rk_zftl_arm32.S - create mode 100755 drivers/rk_nand/rk_zftl_arm64.S - create mode 100755 drivers/rkflash/Kconfig - create mode 100755 drivers/rkflash/Makefile - create mode 100755 drivers/rkflash/flash.c - create mode 100755 drivers/rkflash/flash.h - create mode 100755 drivers/rkflash/flash_com.h - create mode 100755 drivers/rkflash/nand_boot.c - create mode 100755 drivers/rkflash/nandc.c - create mode 100755 drivers/rkflash/nandc.h - create mode 100755 drivers/rkflash/rk_sftl.h - create mode 100755 drivers/rkflash/rk_sftl_arm_v7.S - create mode 100755 drivers/rkflash/rk_sftl_arm_v7_thumb.S - create mode 100755 drivers/rkflash/rk_sftl_arm_v8.S - create mode 100755 drivers/rkflash/rkflash_api.h - create mode 100755 drivers/rkflash/rkflash_blk.c - create mode 100755 drivers/rkflash/rkflash_blk.h - create mode 100755 drivers/rkflash/rkflash_debug.c - create mode 100755 drivers/rkflash/rkflash_debug.h - create mode 100755 drivers/rkflash/rknandc_base.c - create mode 100755 drivers/rkflash/rksfc_base.c - create mode 100755 drivers/rkflash/sfc.c - create mode 100755 drivers/rkflash/sfc.h - create mode 100755 drivers/rkflash/sfc_nand.c - create mode 100755 drivers/rkflash/sfc_nand.h - create mode 100755 drivers/rkflash/sfc_nand_boot.c - create mode 100755 drivers/rkflash/sfc_nand_mtd.c - create mode 100755 drivers/rkflash/sfc_nand_mtd.h - create mode 100755 drivers/rkflash/sfc_nand_mtd_bbt.c - create mode 100755 drivers/rkflash/sfc_nor.c - create mode 100755 drivers/rkflash/sfc_nor.h - create mode 100755 drivers/rkflash/sfc_nor_boot.c - create mode 100755 drivers/rkflash/sfc_nor_mtd.c - create mode 100755 drivers/rkflash/typedef.h - create mode 100755 drivers/soc/rockchip/Kconfig.cpu - create mode 100755 drivers/soc/rockchip/flash_vendor_storage.c - create mode 100755 drivers/soc/rockchip/flash_vendor_storage.h - create mode 100755 drivers/soc/rockchip/mtd_vendor_storage.c - create mode 100755 drivers/soc/rockchip/rk_camera_sensor_info.h - create mode 100755 drivers/soc/rockchip/rk_fiq_debugger.c - create mode 100755 drivers/soc/rockchip/rk_vendor_storage.c - create mode 100755 drivers/soc/rockchip/rockchip-cpuinfo.c - create mode 100755 drivers/soc/rockchip/rockchip_debug.c - create mode 100755 drivers/soc/rockchip/rockchip_debug.h - create mode 100755 drivers/soc/rockchip/rockchip_decompress.c - create mode 100755 drivers/soc/rockchip/rockchip_ipa.c - create mode 100755 drivers/soc/rockchip/rockchip_opp_select.c - create mode 100755 drivers/soc/rockchip/rockchip_pm_config.c - create mode 100755 drivers/soc/rockchip/rockchip_pvtm.c - create mode 100755 drivers/soc/rockchip/rockchip_ramdisk.c - create mode 100755 drivers/soc/rockchip/rockchip_system_monitor.c - create mode 100755 drivers/soc/rockchip/rockchip_thunderboot_crypto.c - create mode 100755 drivers/soc/rockchip/rockchip_thunderboot_mmc.c - create mode 100755 drivers/soc/rockchip/rockchip_thunderboot_sfc.c - create mode 100755 drivers/soc/rockchip/sdmmc_vendor_storage.c - create mode 100755 drivers/staging/android/fiq_debugger/Kconfig - create mode 100755 drivers/staging/android/fiq_debugger/Makefile - create mode 100755 drivers/staging/android/fiq_debugger/fiq_debugger.c - create mode 100755 drivers/staging/android/fiq_debugger/fiq_debugger.h - create mode 100755 drivers/staging/android/fiq_debugger/fiq_debugger_arm.c - create mode 100755 drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c - create mode 100755 drivers/staging/android/fiq_debugger/fiq_debugger_priv.h - create mode 100755 drivers/staging/android/fiq_debugger/fiq_debugger_ringbuf.h - create mode 100755 drivers/staging/android/fiq_debugger/fiq_watchdog.c - create mode 100755 drivers/staging/android/fiq_debugger/fiq_watchdog.h - create mode 100755 drivers/staging/android/ion/heaps/Kconfig - create mode 100755 drivers/staging/android/ion/heaps/Makefile - rename drivers/staging/android/ion/{ => heaps}/ion_cma_heap.c (72%) - mode change 100644 => 100755 - rename drivers/staging/android/ion/{ => heaps}/ion_page_pool.c (87%) - mode change 100644 => 100755 - create mode 100755 drivers/staging/android/ion/heaps/ion_page_pool.h - rename drivers/staging/android/ion/{ => heaps}/ion_system_heap.c (65%) - mode change 100644 => 100755 - delete mode 100644 drivers/staging/android/ion/ion.h - create mode 100755 drivers/staging/android/ion/ion_buffer.c - create mode 100755 drivers/staging/android/ion/ion_dma_buf.c - create mode 100755 drivers/staging/android/ion/ion_private.h - create mode 100755 drivers/staging/android/ion/ion_protected_heap.c - create mode 100755 drivers/staging/android/ion/ion_trace.h - create mode 100755 drivers/staging/android/ion/rockchip/Makefile - create mode 100755 drivers/staging/android/ion/rockchip/rockchip_ion.c - create mode 100755 drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c - create mode 100644 drivers/staging/blackbox/rockchip/Makefile - create mode 100644 drivers/staging/blackbox/rockchip/system_adapter.c - create mode 100644 drivers/staging/blackbox/rockchip/system_adapter_by_memory.c - mode change 100644 => 100755 drivers/usb/core/hub.c - mode change 100644 => 100755 drivers/usb/dwc2/core.h - mode change 100644 => 100755 drivers/usb/dwc2/gadget.c - mode change 100644 => 100755 drivers/usb/dwc2/hcd.c - mode change 100644 => 100755 drivers/usb/dwc2/hcd_intr.c - mode change 100644 => 100755 drivers/usb/dwc2/hcd_queue.c - mode change 100644 => 100755 drivers/usb/dwc2/params.c - mode change 100644 => 100755 drivers/usb/dwc2/platform.c - mode change 100644 => 100755 drivers/usb/dwc3/Kconfig - mode change 100644 => 100755 drivers/usb/dwc3/Makefile - mode change 100644 => 100755 drivers/usb/dwc3/core.c - mode change 100644 => 100755 drivers/usb/dwc3/core.h - mode change 100644 => 100755 drivers/usb/dwc3/debug.h - mode change 100644 => 100755 drivers/usb/dwc3/debugfs.c - mode change 100644 => 100755 drivers/usb/dwc3/drd.c - create mode 100755 drivers/usb/dwc3/dwc3-imx8mp.c - mode change 100644 => 100755 drivers/usb/dwc3/dwc3-keystone.c - mode change 100644 => 100755 drivers/usb/dwc3/dwc3-pci.c - mode change 100644 => 100755 drivers/usb/dwc3/dwc3-qcom.c - mode change 100644 => 100755 drivers/usb/dwc3/ep0.c - mode change 100644 => 100755 drivers/usb/dwc3/gadget.c - mode change 100644 => 100755 drivers/usb/dwc3/gadget.h - mode change 100644 => 100755 drivers/usb/dwc3/trace.c - mode change 100644 => 100755 drivers/usb/gadget/configfs.c - mode change 100644 => 100755 drivers/usb/gadget/function/Makefile - create mode 100755 drivers/usb/gadget/function/f_accessory.c - create mode 100755 drivers/usb/gadget/function/f_audio_source.c - mode change 100644 => 100755 drivers/usb/gadget/function/f_fs.c - mode change 100644 => 100755 drivers/usb/gadget/function/f_mass_storage.c - mode change 100644 => 100755 drivers/usb/gadget/function/f_midi.c - mode change 100644 => 100755 drivers/usb/gadget/function/f_printer.c - mode change 100644 => 100755 drivers/usb/gadget/function/f_uac1.c - mode change 100644 => 100755 drivers/usb/gadget/function/f_uac2.c - mode change 100644 => 100755 drivers/usb/gadget/function/u_audio.c - mode change 100644 => 100755 drivers/usb/gadget/function/u_audio.h - mode change 100644 => 100755 drivers/usb/gadget/function/u_ether.c - mode change 100644 => 100755 drivers/usb/gadget/function/u_ether.h - mode change 100644 => 100755 drivers/usb/gadget/function/u_ether_configfs.h - mode change 100644 => 100755 drivers/usb/gadget/function/u_serial.c - create mode 100755 drivers/usb/gadget/function/u_uac.h - mode change 100644 => 100755 drivers/usb/gadget/function/u_uac1.h - mode change 100644 => 100755 drivers/usb/gadget/function/u_uac2.h - mode change 100644 => 100755 drivers/usb/gadget/legacy/audio.c - mode change 100644 => 100755 drivers/usb/gadget/udc/core.c - mode change 100644 => 100755 drivers/usb/gadget/udc/snps_udc_core.c - mode change 100644 => 100755 drivers/usb/gadget/udc/trace.c - mode change 100644 => 100755 drivers/usb/gadget/udc/udc-xilinx.c - mode change 100644 => 100755 drivers/usb/host/Makefile - mode change 100644 => 100755 drivers/usb/host/ehci-platform.c - mode change 100644 => 100755 drivers/usb/host/ohci-platform.c - mode change 100644 => 100755 drivers/usb/host/xhci-hub.c - mode change 100644 => 100755 drivers/usb/host/xhci-mem.c - mode change 100644 => 100755 drivers/usb/host/xhci-mtk-sch.c - mode change 100644 => 100755 drivers/usb/host/xhci-mtk.c - mode change 100644 => 100755 drivers/usb/host/xhci-mtk.h - mode change 100644 => 100755 drivers/usb/host/xhci-plat.c - mode change 100644 => 100755 drivers/usb/host/xhci-plat.h - mode change 100644 => 100755 drivers/usb/host/xhci-ring.c - mode change 100644 => 100755 drivers/usb/host/xhci-trace.c - mode change 100644 => 100755 drivers/usb/host/xhci.c - mode change 100644 => 100755 drivers/usb/host/xhci.h - mode change 100644 => 100755 drivers/usb/typec/altmodes/Kconfig - mode change 100644 => 100755 drivers/usb/typec/altmodes/displayport.c - mode change 100644 => 100755 drivers/usb/typec/class.c - mode change 100644 => 100755 drivers/usb/typec/mux/intel_pmc_mux.c - mode change 100644 => 100755 drivers/usb/typec/tcpm/Kconfig - mode change 100644 => 100755 drivers/usb/typec/tcpm/Makefile - mode change 100644 => 100755 drivers/usb/typec/tcpm/fusb302.c - mode change 100644 => 100755 drivers/usb/typec/tcpm/tcpci.c - mode change 100644 => 100755 drivers/usb/typec/tcpm/tcpci.h - create mode 100755 drivers/usb/typec/tcpm/tcpci_husb311.c - mode change 100644 => 100755 drivers/usb/typec/tcpm/tcpci_maxim.c - mode change 100644 => 100755 drivers/usb/typec/tcpm/tcpm.c - mode change 100644 => 100755 drivers/usb/typec/tcpm/wcove.c - mode change 100644 => 100755 drivers/usb/typec/ucsi/Kconfig - mode change 100644 => 100755 drivers/usb/typec/ucsi/displayport.c - mode change 100644 => 100755 drivers/usb/typec/ucsi/ucsi.c - mode change 100644 => 100755 drivers/usb/typec/ucsi/ucsi.h - create mode 100755 drivers/video/rockchip/Kconfig - create mode 100755 drivers/video/rockchip/Makefile - create mode 100755 drivers/video/rockchip/iep/Kconfig - create mode 100755 drivers/video/rockchip/iep/Makefile - create mode 100755 drivers/video/rockchip/iep/hw_iep_config_addr.h - create mode 100755 drivers/video/rockchip/iep/hw_iep_reg.c - create mode 100755 drivers/video/rockchip/iep/hw_iep_reg.h - create mode 100755 drivers/video/rockchip/iep/iep.h - create mode 100755 drivers/video/rockchip/iep/iep_drv.c - create mode 100755 drivers/video/rockchip/iep/iep_drv.h - create mode 100755 drivers/video/rockchip/iep/iep_iommu_drm.c - create mode 100755 drivers/video/rockchip/iep/iep_iommu_ops.c - create mode 100755 drivers/video/rockchip/iep/iep_iommu_ops.h - create mode 100755 drivers/video/rockchip/mpp/Kconfig - create mode 100755 drivers/video/rockchip/mpp/Makefile - create mode 100755 drivers/video/rockchip/mpp/hack/mpp_hack_px30.c - create mode 100755 drivers/video/rockchip/mpp/hack/mpp_hack_px30.h - create mode 100755 drivers/video/rockchip/mpp/hack/mpp_rkvdec2_hack_rk3568.c - create mode 100755 drivers/video/rockchip/mpp/hack/mpp_rkvdec2_link_hack_rk3568.c - create mode 100755 drivers/video/rockchip/mpp/mpp_common.c - create mode 100755 drivers/video/rockchip/mpp/mpp_common.h - create mode 100755 drivers/video/rockchip/mpp/mpp_debug.h - create mode 100755 drivers/video/rockchip/mpp/mpp_iep2.c - create mode 100755 drivers/video/rockchip/mpp/mpp_iommu.c - create mode 100755 drivers/video/rockchip/mpp/mpp_iommu.h - create mode 100755 drivers/video/rockchip/mpp/mpp_jpgdec.c - create mode 100755 drivers/video/rockchip/mpp/mpp_rkvdec.c - create mode 100755 drivers/video/rockchip/mpp/mpp_rkvdec2.c - create mode 100755 drivers/video/rockchip/mpp/mpp_rkvdec2.h - create mode 100755 drivers/video/rockchip/mpp/mpp_rkvdec2_link.c - create mode 100755 drivers/video/rockchip/mpp/mpp_rkvdec2_link.h - create mode 100755 drivers/video/rockchip/mpp/mpp_rkvenc.c - create mode 100755 drivers/video/rockchip/mpp/mpp_rkvenc2.c - create mode 100755 drivers/video/rockchip/mpp/mpp_service.c - create mode 100755 drivers/video/rockchip/mpp/mpp_vdpu1.c - create mode 100755 drivers/video/rockchip/mpp/mpp_vdpu2.c - create mode 100755 drivers/video/rockchip/mpp/mpp_vepu1.c - create mode 100755 drivers/video/rockchip/mpp/mpp_vepu2.c - create mode 100755 drivers/video/rockchip/mpp/rockchip_iep2_regs.h - create mode 100755 drivers/video/rockchip/rga/Kconfig - create mode 100755 drivers/video/rockchip/rga/Makefile - create mode 100755 drivers/video/rockchip/rga/RGA_API.c - create mode 100755 drivers/video/rockchip/rga/RGA_API.h - create mode 100755 drivers/video/rockchip/rga/rga.h - create mode 100755 drivers/video/rockchip/rga/rga_drv.c - create mode 100755 drivers/video/rockchip/rga/rga_mmu_info.c - create mode 100755 drivers/video/rockchip/rga/rga_mmu_info.h - create mode 100755 drivers/video/rockchip/rga/rga_reg_info.c - create mode 100755 drivers/video/rockchip/rga/rga_reg_info.h - create mode 100755 drivers/video/rockchip/rga/rga_rop.h - create mode 100755 drivers/video/rockchip/rga/rga_type.h - create mode 100755 drivers/video/rockchip/rga2/Kconfig - create mode 100755 drivers/video/rockchip/rga2/Makefile - create mode 100755 drivers/video/rockchip/rga2/RGA2_API.c - create mode 100755 drivers/video/rockchip/rga2/RGA2_API.h - create mode 100755 drivers/video/rockchip/rga2/rga2.h - create mode 100755 drivers/video/rockchip/rga2/rga2_debugger.c - create mode 100755 drivers/video/rockchip/rga2/rga2_debugger.h - create mode 100755 drivers/video/rockchip/rga2/rga2_drv.c - create mode 100755 drivers/video/rockchip/rga2/rga2_mmu_info.c - create mode 100755 drivers/video/rockchip/rga2/rga2_mmu_info.h - create mode 100755 drivers/video/rockchip/rga2/rga2_reg_info.c - create mode 100755 drivers/video/rockchip/rga2/rga2_reg_info.h - create mode 100755 drivers/video/rockchip/rga2/rga2_rop.h - create mode 100755 drivers/video/rockchip/rga2/rga2_type.h - create mode 100755 include/drm/drm_sync_helper.h - create mode 100755 include/dt-bindings/clock/rk1808-cru.h - create mode 100755 include/dt-bindings/clock/rk3568-cru.h - create mode 100755 include/dt-bindings/clock/rk618-cru.h - create mode 100755 include/dt-bindings/clock/rk628-cgu.h - create mode 100755 include/dt-bindings/clock/rockchip,rk3036.h - create mode 100755 include/dt-bindings/clock/rockchip,rk312x.h - create mode 100755 include/dt-bindings/clock/rockchip,rk3188.h - create mode 100755 include/dt-bindings/clock/rockchip,rk3228.h - create mode 100755 include/dt-bindings/clock/rockchip,rk3288.h - create mode 100755 include/dt-bindings/clock/rockchip,rk3368.h - create mode 100755 include/dt-bindings/clock/rockchip-ddr.h - create mode 100755 include/dt-bindings/clock/rockchip.h - create mode 100755 include/dt-bindings/clock/rv1126-cru.h - create mode 100755 include/dt-bindings/display/drm_mipi_dsi.h - create mode 100755 include/dt-bindings/display/media-bus-format.h - create mode 100755 include/dt-bindings/display/mipi_dsi.h - create mode 100644 include/dt-bindings/display/rockchip_vop.h - create mode 100755 include/dt-bindings/dram/rockchip,rk322x.h - create mode 100755 include/dt-bindings/dram/rockchip,rk3368.h - create mode 100755 include/dt-bindings/input/rk-input.h - create mode 100755 include/dt-bindings/memory/px30-dram.h - create mode 100755 include/dt-bindings/memory/rk1808-dram.h - create mode 100755 include/dt-bindings/memory/rk3128-dram.h - create mode 100755 include/dt-bindings/memory/rk3288-dram.h - create mode 100755 include/dt-bindings/memory/rk3328-dram.h - create mode 100755 include/dt-bindings/memory/rk3368-dram.h - create mode 100755 include/dt-bindings/memory/rk3399-dram.h - create mode 100755 include/dt-bindings/memory/rk3568-dram.h - create mode 100755 include/dt-bindings/memory/rockchip-dram.h - create mode 100755 include/dt-bindings/memory/rv1126-dram.h - create mode 100755 include/dt-bindings/phy/phy-snps-pcie3.h - create mode 100755 include/dt-bindings/pinctrl/rockchip-rk3036.h - create mode 100755 include/dt-bindings/pinctrl/rockchip-rk312x.h - create mode 100755 include/dt-bindings/pinctrl/rockchip-rk3188.h - create mode 100755 include/dt-bindings/pinctrl/rockchip-rk3288.h - create mode 100755 include/dt-bindings/power/rk1808-power.h - create mode 100755 include/dt-bindings/power/rk3568-power.h - create mode 100755 include/dt-bindings/power/rk3588-power.h - create mode 100755 include/dt-bindings/power/rv1126-power.h - create mode 100755 include/dt-bindings/reset/rk628-rgu.h - create mode 100755 include/dt-bindings/sensor-dev.h - create mode 100755 include/dt-bindings/soc/rockchip-system-status.h - create mode 100755 include/dt-bindings/suspend/rockchip-px30.h - create mode 100755 include/dt-bindings/suspend/rockchip-rk1808.h - create mode 100755 include/dt-bindings/suspend/rockchip-rk322x.h - create mode 100755 include/dt-bindings/suspend/rockchip-rk3288.h - create mode 100755 include/dt-bindings/suspend/rockchip-rk3308.h - create mode 100755 include/dt-bindings/suspend/rockchip-rk3328.h - create mode 100755 include/dt-bindings/suspend/rockchip-rk3368.h - create mode 100755 include/dt-bindings/suspend/rockchip-rk3399.h - create mode 100755 include/dt-bindings/suspend/rockchip-rk3568.h - create mode 100755 include/dt-bindings/suspend/rockchip-rv1126.h - create mode 100755 include/linux/android_kabi.h - create mode 100755 include/linux/clk/rockchip.h - create mode 100755 include/linux/dma-buf-cache.h - create mode 100755 include/linux/initramfs.h - create mode 100755 include/linux/memory_group_manager.h - create mode 100755 include/linux/phy/pcie.h - create mode 100755 include/linux/phy/phy-rockchip-typec.h - create mode 100755 include/linux/power/bq25700-charge.h - create mode 100755 include/linux/power/cw2015_battery.h - create mode 100755 include/linux/power/rk_usbbc.h - create mode 100755 include/linux/rfkill-bt.h - create mode 100755 include/linux/rfkill-wlan.h - create mode 100755 include/linux/rk_keys.h - create mode 100755 include/linux/rockchip-iovmm.h - create mode 100755 include/linux/rockchip/cpu.h - create mode 100755 include/linux/rockchip/grf.h - create mode 100755 include/linux/rockchip/psci.h - create mode 100755 include/linux/rockchip/rockchip_sip.h - create mode 100755 include/linux/rockchip_ion.h - create mode 100755 include/linux/sensor-dev.h - create mode 100755 include/linux/soc/rockchip/pvtm.h - create mode 100755 include/linux/soc/rockchip/rk_fiq_debugger.h - create mode 100755 include/linux/soc/rockchip/rk_vendor_storage.h - create mode 100755 include/linux/soc/rockchip/rockchip_decompress.h - create mode 100755 include/linux/soc/rockchip/rockchip_thunderboot_crypto.h - mode change 100644 => 100755 include/linux/usb/audio-v2.h - mode change 100644 => 100755 include/linux/usb/audio.h - create mode 100755 include/linux/usb/f_accessory.h - mode change 100644 => 100755 include/linux/usb/gadget.h - mode change 100644 => 100755 include/linux/usb/typec.h - create mode 100755 include/linux/wakelock.h - create mode 100755 include/linux/wakeup_reason.h - create mode 100755 include/soc/rockchip/android-version.h - create mode 100755 include/soc/rockchip/pm_domains.h - create mode 100755 include/soc/rockchip/rk3368-mailbox.h - create mode 100755 include/soc/rockchip/rkfb_dmc.h - create mode 100755 include/soc/rockchip/rockchip-system-status.h - create mode 100755 include/soc/rockchip/rockchip_dmc.h - create mode 100755 include/soc/rockchip/rockchip_iommu.h - create mode 100755 include/soc/rockchip/rockchip_ipa.h - create mode 100755 include/soc/rockchip/rockchip_opp_select.h - create mode 100755 include/soc/rockchip/rockchip_system_monitor.h - create mode 100755 include/soc/rockchip/scpi.h - create mode 100755 include/trace/events/thermal_ipa_power.h - create mode 100755 include/uapi/drm/rockchip_drm.h - create mode 100755 include/uapi/linux/fec-config.h - create mode 100755 include/uapi/linux/rk-camera-module.h - create mode 100755 include/uapi/linux/rk-led-flash.h - create mode 100755 include/uapi/linux/rk-pcie-dma.h - create mode 100755 include/uapi/linux/rk-preisp.h - create mode 100755 include/uapi/linux/rk-video-format.h - create mode 100755 include/uapi/linux/rk803.h - create mode 100755 include/uapi/linux/rk_vcm_head.h - create mode 100755 include/uapi/linux/rkcif-config.h - create mode 100755 include/uapi/linux/rkisp1-config.h - create mode 100755 include/uapi/linux/rkisp2-config.h - create mode 100755 include/uapi/linux/rkisp21-config.h - create mode 100755 include/uapi/linux/rkisp3-config.h - create mode 100755 include/uapi/linux/rkispp-config.h - create mode 100755 include/uapi/linux/usb/f_accessory.h - create mode 100755 kernel/power/wakeup_reason.c - create mode 100755 make-boot.sh - create mode 100755 make-ohos.sh - create mode 100755 net/rfkill/rfkill-bt.c - create mode 100755 net/rfkill/rfkill-wlan.c - create mode 100755 scripts/clang-wrapper.py - create mode 100755 scripts/mkimg - create mode 100755 scripts/repack-bootimg - create mode 100755 scripts/resource_tool.c - create mode 100755 sound/soc/codecs/dummy-codec.c - create mode 100755 sound/soc/codecs/es7202.c - create mode 100755 sound/soc/codecs/es7202.h - create mode 100755 sound/soc/codecs/es7210.c - create mode 100755 sound/soc/codecs/es7210.h - create mode 100755 sound/soc/codecs/es7243e.c - create mode 100755 sound/soc/codecs/es7243e_usr_cfg.h - create mode 100755 sound/soc/codecs/es8311.c - create mode 100755 sound/soc/codecs/es8311.h - create mode 100755 sound/soc/codecs/es8323.c - create mode 100755 sound/soc/codecs/es8323.h - create mode 100755 sound/soc/codecs/es8396.c - create mode 100755 sound/soc/codecs/es8396.h - create mode 100755 sound/soc/codecs/rk1000_codec.c - create mode 100755 sound/soc/codecs/rk1000_codec.h - create mode 100755 sound/soc/codecs/rk312x_codec.c - create mode 100755 sound/soc/codecs/rk312x_codec.h - create mode 100755 sound/soc/codecs/rk3228_codec.c - create mode 100755 sound/soc/codecs/rk3228_codec.h - create mode 100755 sound/soc/codecs/rk3308_codec.c - create mode 100755 sound/soc/codecs/rk3308_codec.h - create mode 100755 sound/soc/codecs/rk3308_codec_provider.h - create mode 100755 sound/soc/codecs/rk817_codec.c - create mode 100755 sound/soc/codecs/rk817_codec.h - create mode 100755 sound/soc/codecs/rk_codec_digital.c - create mode 100755 sound/soc/codecs/rk_codec_digital.h - create mode 100644 sound/soc/rockchip/rockchip_audio_pwm.c - create mode 100644 sound/soc/rockchip/rockchip_audio_pwm.h - create mode 100644 sound/soc/rockchip/rockchip_cdndp.c - create mode 100644 sound/soc/rockchip/rockchip_da7219.c - create mode 100644 sound/soc/rockchip/rockchip_hdmi.c - create mode 100644 sound/soc/rockchip/rockchip_hdmi_analog.c - create mode 100644 sound/soc/rockchip/rockchip_hdmi_dp.c - create mode 100644 sound/soc/rockchip/rockchip_i2s_tdm.c - create mode 100644 sound/soc/rockchip/rockchip_i2s_tdm.h - create mode 100644 sound/soc/rockchip/rockchip_multi_dais.c - create mode 100644 sound/soc/rockchip/rockchip_multi_dais.h - create mode 100644 sound/soc/rockchip/rockchip_multi_dais_pcm.c - create mode 100644 sound/soc/rockchip/rockchip_multicodecs.c - create mode 100644 sound/soc/rockchip/rockchip_rt5651.c - create mode 100644 sound/soc/rockchip/rockchip_spdifrx.c - create mode 100644 sound/soc/rockchip/rockchip_spdifrx.h - create mode 100644 sound/soc/rockchip/rockchip_vad.c - create mode 100644 sound/soc/rockchip/rockchip_vad.h - create mode 100644 sound/soc/rockchip/vad_preprocess.h - create mode 100644 sound/soc/rockchip/vad_preprocess_arm.S - create mode 100644 sound/soc/rockchip/vad_preprocess_arm64.S - create mode 100644 sound/soc/rockchip/vad_preprocess_thumb.S - diff --git a/Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt b/Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt -index 148191b0fc15..eee2a7f7cb92 100644 +index 148191b0f..eee2a7f7c 100644 --- a/Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt +++ b/Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt @@ -1,8 +1,22 @@ @@ -5285,7 +28,7 @@ index 148191b0fc15..eee2a7f7cb92 100644 - rockchip,pmu: phandle to the syscon managing the "pmu general register files" - clocks: phandles for clock specified in "clock-names" property diff --git a/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt b/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt -index 027d76c27a41..a548f404033c 100644 +index 027d76c27..a548f4040 100644 --- a/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt +++ b/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt @@ -21,17 +21,23 @@ Required properties for dp-controller: @@ -5313,7 +56,7 @@ index 027d76c27a41..a548f404033c 100644 [1]: Documentation/devicetree/bindings/media/video-interfaces.txt ------------------------------------------------------------------------------- diff --git a/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml b/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml -index 1bb76197787b..de8e78d56dea 100644 +index 1bb761977..de8e78d56 100644 --- a/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml +++ b/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml @@ -18,6 +18,7 @@ properties: @@ -5325,7 +68,7 @@ index 1bb76197787b..de8e78d56dea 100644 - rockchip,rk3328-saradc - rockchip,rv1108-saradc diff --git a/Documentation/devicetree/bindings/iommu/rockchip,iommu.txt b/Documentation/devicetree/bindings/iommu/rockchip,iommu.txt -index 6ecefea1c6f9..0b906fb630e2 100644 +index 6ecefea1c..0b906fb63 100644 --- a/Documentation/devicetree/bindings/iommu/rockchip,iommu.txt +++ b/Documentation/devicetree/bindings/iommu/rockchip,iommu.txt @@ -24,6 +24,10 @@ Optional properties: @@ -5341,7 +84,7 @@ index 6ecefea1c6f9..0b906fb630e2 100644 diff --git a/Documentation/devicetree/bindings/mtd/rockchip,nand-controller.yaml b/Documentation/devicetree/bindings/mtd/rockchip,nand-controller.yaml new file mode 100644 -index 000000000000..0922536b1811 +index 000000000..0922536b1 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/rockchip,nand-controller.yaml @@ -0,0 +1,161 @@ @@ -5507,7 +250,7 @@ index 000000000000..0922536b1811 + +... diff --git a/Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml b/Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml -index 104dd508565e..af1b9c31862a 100644 +index 104dd5085..af1b9c318 100644 --- a/Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml +++ b/Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml @@ -15,10 +15,13 @@ allOf: @@ -5525,7 +268,7 @@ index 104dd508565e..af1b9c31862a 100644 - rockchip,rk3368-efuse - rockchip,rk3399-efuse diff --git a/Documentation/devicetree/bindings/nvmem/rockchip-otp.txt b/Documentation/devicetree/bindings/nvmem/rockchip-otp.txt -index 40f649f7c2e5..6e61345829e7 100644 +index 40f649f7c..6e6134582 100644 --- a/Documentation/devicetree/bindings/nvmem/rockchip-otp.txt +++ b/Documentation/devicetree/bindings/nvmem/rockchip-otp.txt @@ -7,6 +7,8 @@ Required properties: @@ -5538,7 +281,7 @@ index 40f649f7c2e5..6e61345829e7 100644 See ../../reset/reset.txt for details. - reset-names: Should be "phy". diff --git a/Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt b/Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt -index 960da7fcaa9e..ac82f7b4dd58 100644 +index 960da7fca..ac82f7b4d 100644 --- a/Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt +++ b/Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt @@ -17,6 +17,11 @@ Required properties: @@ -5598,7 +341,7 @@ index 960da7fcaa9e..ac82f7b4dd58 100644 #phy-cells = <0>; }; diff --git a/Documentation/devicetree/bindings/power/rockchip-io-domain.txt b/Documentation/devicetree/bindings/power/rockchip-io-domain.txt -index e66fd4eab71c..09824bca248e 100644 +index e66fd4eab..09824bca2 100644 --- a/Documentation/devicetree/bindings/power/rockchip-io-domain.txt +++ b/Documentation/devicetree/bindings/power/rockchip-io-domain.txt @@ -41,8 +41,10 @@ Required properties: @@ -5648,7 +391,7 @@ index e66fd4eab71c..09824bca248e 100644 io-domains { diff --git a/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt b/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt -index 8304eceb62e4..e1920b15c86f 100644 +index 8304eceb6..e1920b15c 100644 --- a/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt +++ b/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt @@ -16,6 +16,7 @@ Required properties for power domain controller: @@ -5676,7 +419,7 @@ index 8304eceb62e4..e1920b15c86f 100644 Example of the node using power domain: diff --git a/Documentation/devicetree/bindings/sound/rt5651.txt b/Documentation/devicetree/bindings/sound/rt5651.txt -index 56e736a1cba9..e7cd338d2b59 100644 +index 56e736a1c..e7cd338d2 100644 --- a/Documentation/devicetree/bindings/sound/rt5651.txt +++ b/Documentation/devicetree/bindings/sound/rt5651.txt @@ -38,6 +38,8 @@ Optional properties: @@ -5689,7 +432,7 @@ index 56e736a1cba9..e7cd338d2b59 100644 * DMIC L1 diff --git a/Documentation/devicetree/bindings/spi/spi-rockchip.yaml b/Documentation/devicetree/bindings/spi/spi-rockchip.yaml -index 1e6cf29e6388..7f987e79337c 100644 +index 1e6cf29e6..7f987e793 100644 --- a/Documentation/devicetree/bindings/spi/spi-rockchip.yaml +++ b/Documentation/devicetree/bindings/spi/spi-rockchip.yaml @@ -33,6 +33,7 @@ properties: @@ -5701,7 +444,7 @@ index 1e6cf29e6388..7f987e79337c 100644 reg: diff --git a/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt b/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt -index 7f94669e9ebe..346e466c2006 100644 +index 7f94669e9..346e466c2 100644 --- a/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt +++ b/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt @@ -9,6 +9,7 @@ Required properties: @@ -5713,7 +456,7 @@ index 7f94669e9ebe..346e466c2006 100644 region. - interrupts : The interrupt number to the cpu. The interrupt specifier format diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi -index 093567022386..dc4c26a8a196 100644 +index 093567022..dc4c26a8a 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -85,6 +85,11 @@ display-subsystem { @@ -5765,7 +508,7 @@ index 093567022386..dc4c26a8a196 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts -index 309518403d86..1a9891f802f8 100644 +index 309518403..1a9891f80 100644 --- a/arch/arm/boot/dts/rk3066a-rayeager.dts +++ b/arch/arm/boot/dts/rk3066a-rayeager.dts @@ -23,6 +23,20 @@ ir: ir-receiver { @@ -5790,7 +533,7 @@ index 309518403d86..1a9891f802f8 100644 compatible = "gpio-keys"; diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi -index bbc3bff50856..49b8652da097 100644 +index bbc3bff50..49b8652da 100644 --- a/arch/arm/boot/dts/rk3066a.dtsi +++ b/arch/arm/boot/dts/rk3066a.dtsi @@ -800,22 +800,22 @@ power-domain@RK3066_PD_GPU { @@ -5821,7 +564,7 @@ index bbc3bff50856..49b8652da097 100644 }; diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi -index ddf23748ead4..e3fe43499c8a 100644 +index ddf23748e..e3fe43499 100644 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi @@ -738,22 +738,22 @@ power-domain@RK3188_PD_GPU { @@ -5852,7 +595,7 @@ index ddf23748ead4..e3fe43499c8a 100644 }; diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi -index 2f17bf35d7a6..aae403bfaff1 100644 +index 2f17bf35d..aae403bfa 100644 --- a/arch/arm/boot/dts/rk322x.dtsi +++ b/arch/arm/boot/dts/rk322x.dtsi @@ -398,7 +398,7 @@ pwm0: pwm@110b0000 { @@ -5892,7 +635,7 @@ index 2f17bf35d7a6..aae403bfaff1 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi -index aab28161b9ae..1706453385fe 100644 +index 250a03a06..8a81801bd 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -695,7 +695,7 @@ pwm0: pwm@ff680000 { @@ -5932,7 +675,7 @@ index aab28161b9ae..1706453385fe 100644 clocks = <&cru PCLK_RKPWM>; clock-names = "pwm"; diff --git a/arch/arm/boot/dts/rv1108.dtsi b/arch/arm/boot/dts/rv1108.dtsi -index a1a08cb9364e..b079c0008032 100644 +index a1a08cb93..b079c0008 100644 --- a/arch/arm/boot/dts/rv1108.dtsi +++ b/arch/arm/boot/dts/rv1108.dtsi @@ -217,7 +217,7 @@ pwm4: pwm@10280000 { @@ -6008,7 +751,7 @@ index a1a08cb9364e..b079c0008032 100644 #pwm-cells = <3>; status = "disabled"; diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c -index d4392e177484..059db0b1c1de 100644 +index d4392e177..059db0b1c 100644 --- a/arch/arm/kernel/psci_smp.c +++ b/arch/arm/kernel/psci_smp.c @@ -107,11 +107,12 @@ static int psci_cpu_kill(unsigned int cpu) @@ -6026,7 +769,7 @@ index d4392e177484..059db0b1c1de 100644 const struct smp_operations psci_smp_ops __initconst = { .smp_boot_secondary = psci_boot_secondary, diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c -index 0ce388f15422..6f874647b63b 100644 +index 0ce388f15..6f874647b 100644 --- a/arch/arm/kernel/reboot.c +++ b/arch/arm/kernel/reboot.c @@ -18,7 +18,6 @@ typedef void (*phys_reset_t)(unsigned long, bool); @@ -6051,7 +794,7 @@ index 0ce388f15422..6f874647b63b 100644 /* Give a grace period for failure to restart of 1s */ mdelay(1000); diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms -index 889e78f40a25..4a783983410a 100644 +index 889e78f40..4a7839834 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -224,11 +224,8 @@ config ARCH_RENESAS @@ -6067,7 +810,7 @@ index 889e78f40a25..4a783983410a 100644 This enables support for the ARMv8 based Rockchip chipsets, like the RK3368. diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile -index 485b7dbd4f9e..7b56d7f760a8 100644 +index 485b7dbd4..7b56d7f76 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -198,3 +198,16 @@ define archhelp @@ -6088,7 +831,7 @@ index 485b7dbd4f9e..7b56d7f760a8 100644 +CLEAN_DIRS += out +CLEAN_FILES += boot.img kernel.img resource.img zboot.img diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index 26661c7b736b..a2386c005926 100644 +index 26661c7b7..a2386c005 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -44,3 +44,43 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb @@ -6137,7 +880,7 @@ index 26661c7b736b..a2386c005926 100644 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nvr-demo-v12-linux-spi-nand.dtb diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts b/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts new file mode 100755 -index 000000000000..2f258286286a +index 000000000..2f2582862 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts @@ -0,0 +1,759 @@ @@ -6902,7 +1645,7 @@ index 000000000000..2f258286286a +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts new file mode 100755 -index 000000000000..09fc265a8d7a +index 000000000..09fc265a8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts @@ -0,0 +1,147 @@ @@ -7055,7 +1798,7 @@ index 000000000000..09fc265a8d7a +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi-lvds.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi-lvds.dts new file mode 100755 -index 000000000000..d4f202189250 +index 000000000..d4f202189 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi-lvds.dts @@ -0,0 +1,241 @@ @@ -7302,7 +2045,7 @@ index 000000000000..d4f202189250 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi.dts new file mode 100755 -index 000000000000..0ea056682e57 +index 000000000..0ea056682 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi.dts @@ -0,0 +1,105 @@ @@ -7413,7 +2156,7 @@ index 000000000000..0ea056682e57 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-lvds.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-lvds.dts new file mode 100755 -index 000000000000..8b54a9a18fcc +index 000000000..8b54a9a18 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-lvds.dts @@ -0,0 +1,146 @@ @@ -7565,7 +2308,7 @@ index 000000000000..8b54a9a18fcc +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi new file mode 100755 -index 000000000000..bbcd18959dc4 +index 000000000..bbcd18959 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi @@ -0,0 +1,823 @@ @@ -8394,7 +3137,7 @@ index 000000000000..bbcd18959dc4 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-android.dtsi b/arch/arm64/boot/dts/rockchip/px30-android.dtsi new file mode 100755 -index 000000000000..aecb6344f01f +index 000000000..aecb6344f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-android.dtsi @@ -0,0 +1,131 @@ @@ -8531,7 +3274,7 @@ index 000000000000..aecb6344f01f +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ddr4p416dd6-timing.dtsi b/arch/arm64/boot/dts/rockchip/px30-ddr4p416dd6-timing.dtsi new file mode 100755 -index 000000000000..fde5895db94a +index 000000000..fde5895db --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ddr4p416dd6-timing.dtsi @@ -0,0 +1,216 @@ @@ -8753,7 +3496,7 @@ index 000000000000..fde5895db94a +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/px30-dram-default-timing.dtsi new file mode 100755 -index 000000000000..c75c5ef4ef2a +index 000000000..c75c5ef4e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-dram-default-timing.dtsi @@ -0,0 +1,294 @@ @@ -9053,7 +3796,7 @@ index 000000000000..c75c5ef4ef2a +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts new file mode 100755 -index 000000000000..eb60e71b77f3 +index 000000000..eb60e71b7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts @@ -0,0 +1,689 @@ @@ -9748,7 +4491,7 @@ index 000000000000..eb60e71b77f3 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts new file mode 100755 -index 000000000000..fca982485b16 +index 000000000..fca982485 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts @@ -0,0 +1,109 @@ @@ -9863,7 +4606,7 @@ index 000000000000..fca982485b16 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts new file mode 100755 -index 000000000000..ff24bdd46aea +index 000000000..ff24bdd46 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts @@ -0,0 +1,939 @@ @@ -10808,7 +5551,7 @@ index 000000000000..ff24bdd46aea + diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts new file mode 100755 -index 000000000000..317b53b2a1eb +index 000000000..317b53b2a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts @@ -0,0 +1,627 @@ @@ -11441,7 +6184,7 @@ index 000000000000..317b53b2a1eb +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts new file mode 100755 -index 000000000000..81f44c36686c +index 000000000..81f44c366 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts @@ -0,0 +1,627 @@ @@ -12074,7 +6817,7 @@ index 000000000000..81f44c36686c +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts new file mode 100755 -index 000000000000..b814812edbe9 +index 000000000..b814812ed --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts @@ -0,0 +1,127 @@ @@ -12207,7 +6950,7 @@ index 000000000000..b814812edbe9 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi new file mode 100755 -index 000000000000..3d8e81009bef +index 000000000..3d8e81009 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi @@ -0,0 +1,815 @@ @@ -13028,7 +7771,7 @@ index 000000000000..3d8e81009bef +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts new file mode 100755 -index 000000000000..f2659a7f524e +index 000000000..f2659a7f5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts @@ -0,0 +1,276 @@ @@ -13310,7 +8053,7 @@ index 000000000000..f2659a7f524e +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts new file mode 100755 -index 000000000000..54a4c19d11b3 +index 000000000..54a4c19d1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts @@ -0,0 +1,296 @@ @@ -13612,7 +8355,7 @@ index 000000000000..54a4c19d11b3 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts new file mode 100755 -index 000000000000..2e59a09d3c5c +index 000000000..2e59a09d3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts @@ -0,0 +1,293 @@ @@ -13911,7 +8654,7 @@ index 000000000000..2e59a09d3c5c +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts new file mode 100755 -index 000000000000..7bfe640d32de +index 000000000..7bfe640d3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts @@ -0,0 +1,853 @@ @@ -14770,7 +9513,7 @@ index 000000000000..7bfe640d32de + diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts new file mode 100755 -index 000000000000..ea44da5066af +index 000000000..ea44da506 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts @@ -0,0 +1,11 @@ @@ -14787,7 +9530,7 @@ index 000000000000..ea44da5066af +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts new file mode 100755 -index 000000000000..69f44b4d115c +index 000000000..69f44b4d1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts @@ -0,0 +1,33 @@ @@ -14826,7 +9569,7 @@ index 000000000000..69f44b4d115c +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi new file mode 100755 -index 000000000000..0eac63181407 +index 000000000..0eac63181 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi @@ -0,0 +1,202 @@ @@ -15034,7 +9777,7 @@ index 000000000000..0eac63181407 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-robot-no-gpu.dtsi b/arch/arm64/boot/dts/rockchip/px30-robot-no-gpu.dtsi new file mode 100755 -index 000000000000..e3f4274b2309 +index 000000000..e3f4274b2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-robot-no-gpu.dtsi @@ -0,0 +1,57 @@ @@ -15097,7 +9840,7 @@ index 000000000000..e3f4274b2309 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-robot.dtsi b/arch/arm64/boot/dts/rockchip/px30-robot.dtsi new file mode 100755 -index 000000000000..f48a753e6453 +index 000000000..f48a753e6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-robot.dtsi @@ -0,0 +1,93 @@ @@ -15196,7 +9939,7 @@ index 000000000000..f48a753e6453 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts b/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts new file mode 100755 -index 000000000000..1657151c988f +index 000000000..1657151c9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts @@ -0,0 +1,875 @@ @@ -16076,7 +10819,7 @@ index 000000000000..1657151c988f + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30.dtsi b/arch/arm64/boot/dts/rockchip/px30.dtsi -index 0d6761074b11..237c0d9af325 100644 +index 0d6761074..237c0d9af 100644 --- a/arch/arm64/boot/dts/rockchip/px30.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30.dtsi @@ -25,6 +25,9 @@ aliases { @@ -16231,7 +10974,7 @@ index 0d6761074b11..237c0d9af325 100644 status = "disabled"; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi new file mode 100755 -index 000000000000..0fa79e2f05c0 +index 000000000..0fa79e2f0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi @@ -0,0 +1,302 @@ @@ -16539,7 +11282,7 @@ index 000000000000..0fa79e2f05c0 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts new file mode 100755 -index 000000000000..a09824816188 +index 000000000..a09824816 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts @@ -0,0 +1,305 @@ @@ -16850,7 +11593,7 @@ index 000000000000..a09824816188 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts new file mode 100755 -index 000000000000..413d4f6fa29d +index 000000000..413d4f6fa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts @@ -0,0 +1,272 @@ @@ -17128,7 +11871,7 @@ index 000000000000..413d4f6fa29d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts new file mode 100755 -index 000000000000..17993d1ff44a +index 000000000..17993d1ff --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts @@ -0,0 +1,271 @@ @@ -17405,7 +12148,7 @@ index 000000000000..17993d1ff44a +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi new file mode 100755 -index 000000000000..3b9c88660701 +index 000000000..3b9c88660 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi @@ -0,0 +1,717 @@ @@ -18128,7 +12871,7 @@ index 000000000000..3b9c88660701 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts b/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts new file mode 100755 -index 000000000000..d021918cacd1 +index 000000000..d021918ca --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts @@ -0,0 +1,58 @@ @@ -18192,7 +12935,7 @@ index 000000000000..d021918cacd1 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808.dtsi b/arch/arm64/boot/dts/rockchip/rk1808.dtsi new file mode 100755 -index 000000000000..3469abac4f34 +index 000000000..3469abac4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808.dtsi @@ -0,0 +1,3040 @@ @@ -21238,7 +15981,7 @@ index 000000000000..3469abac4f34 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808k.dtsi b/arch/arm64/boot/dts/rockchip/rk1808k.dtsi new file mode 100755 -index 000000000000..78bd92e4c2c6 +index 000000000..78bd92e4c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808k.dtsi @@ -0,0 +1,51 @@ @@ -21295,7 +16038,7 @@ index 000000000000..78bd92e4c2c6 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts new file mode 100755 -index 000000000000..c77d2e963266 +index 000000000..c77d2e963 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts @@ -0,0 +1,681 @@ @@ -21982,7 +16725,7 @@ index 000000000000..c77d2e963266 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts new file mode 100755 -index 000000000000..557daa856132 +index 000000000..557daa856 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts @@ -0,0 +1,55 @@ @@ -22043,7 +16786,7 @@ index 000000000000..557daa856132 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts new file mode 100755 -index 000000000000..90a29a903545 +index 000000000..90a29a903 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts @@ -0,0 +1,56 @@ @@ -22105,7 +16848,7 @@ index 000000000000..90a29a903545 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts new file mode 100755 -index 000000000000..88c1e9c6c8ac +index 000000000..88c1e9c6c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts @@ -0,0 +1,101 @@ @@ -22212,7 +16955,7 @@ index 000000000000..88c1e9c6c8ac +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts new file mode 100755 -index 000000000000..364f74a40d9d +index 000000000..364f74a40 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts @@ -0,0 +1,77 @@ @@ -22295,7 +17038,7 @@ index 000000000000..364f74a40d9d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts new file mode 100755 -index 000000000000..e2891ce1092c +index 000000000..e2891ce10 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts @@ -0,0 +1,88 @@ @@ -22389,7 +17132,7 @@ index 000000000000..e2891ce1092c +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts new file mode 100755 -index 000000000000..c4a7178f1dc8 +index 000000000..c4a7178f1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts @@ -0,0 +1,92 @@ @@ -22487,7 +17230,7 @@ index 000000000000..c4a7178f1dc8 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi new file mode 100755 -index 000000000000..1c0e66384c16 +index 000000000..1c0e66384 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi @@ -0,0 +1,235 @@ @@ -22728,7 +17471,7 @@ index 000000000000..1c0e66384c16 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi new file mode 100755 -index 000000000000..3d052d0da477 +index 000000000..3d052d0da --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi @@ -0,0 +1,780 @@ @@ -23514,7 +18257,7 @@ index 000000000000..3d052d0da477 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi new file mode 100755 -index 000000000000..7b692a810333 +index 000000000..7b692a810 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi @@ -0,0 +1,835 @@ @@ -24355,7 +19098,7 @@ index 000000000000..7b692a810333 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-fpga.dts b/arch/arm64/boot/dts/rockchip/rk3308-fpga.dts new file mode 100755 -index 000000000000..225aca323f4d +index 000000000..225aca323 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-fpga.dts @@ -0,0 +1,51 @@ @@ -24411,7 +19154,7 @@ index 000000000000..225aca323f4d + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts -index 213c0759c4b8..b89eaf1075ab 100644 +index 213c0759c..b89eaf107 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts @@ -78,8 +78,8 @@ vcc_sdmmc: vcc-sdmmc { @@ -24427,7 +19170,7 @@ index 213c0759c4b8..b89eaf1075ab 100644 diff --git a/arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts new file mode 100755 -index 000000000000..2586d9905072 +index 000000000..2586d9905 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts @@ -0,0 +1,19 @@ @@ -24451,7 +19194,7 @@ index 000000000000..2586d9905072 + console-size = <0xc0000>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi -index 2560b98771ca..cc86c0880cec 100644 +index 2560b9877..cc86c0880 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi @@ -10,6 +10,7 @@ @@ -24594,7 +19337,7 @@ index 2560b98771ca..cc86c0880cec 100644 status = "disabled"; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts new file mode 100755 -index 000000000000..d5e2d9ebd4aa +index 000000000..d5e2d9ebd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts @@ -0,0 +1,62 @@ @@ -24662,7 +19405,7 @@ index 000000000000..d5e2d9ebd4aa +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-ext-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308b-evb-ext-v10.dtsi new file mode 100755 -index 000000000000..e2414b67f0d1 +index 000000000..e2414b67f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-ext-v10.dtsi @@ -0,0 +1,124 @@ @@ -24792,7 +19535,7 @@ index 000000000000..e2414b67f0d1 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi new file mode 100755 -index 000000000000..902ae3544235 +index 000000000..902ae3544 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi @@ -0,0 +1,784 @@ @@ -25582,7 +20325,7 @@ index 000000000000..902ae3544235 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308k.dtsi b/arch/arm64/boot/dts/rockchip/rk3308k.dtsi new file mode 100755 -index 000000000000..ffd53fd158c5 +index 000000000..ffd53fd15 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308k.dtsi @@ -0,0 +1,46 @@ @@ -25634,7 +20377,7 @@ index 000000000000..ffd53fd158c5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi new file mode 100755 -index 000000000000..c01f4d014a1b +index 000000000..c01f4d014 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi @@ -0,0 +1,54 @@ @@ -25694,7 +20437,7 @@ index 000000000000..c01f4d014a1b + diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts new file mode 100755 -index 000000000000..174d05e37ccb +index 000000000..174d05e37 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts @@ -0,0 +1,112 @@ @@ -25812,7 +20555,7 @@ index 000000000000..174d05e37ccb +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts new file mode 100755 -index 000000000000..d80dad694c1d +index 000000000..d80dad694 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts @@ -0,0 +1,103 @@ @@ -25921,7 +20664,7 @@ index 000000000000..d80dad694c1d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts new file mode 100755 -index 000000000000..7a399b3356ac +index 000000000..7a399b335 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts @@ -0,0 +1,42 @@ @@ -25969,7 +20712,7 @@ index 000000000000..7a399b3356ac +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi new file mode 100755 -index 000000000000..6e6e3be2f104 +index 000000000..6e6e3be2f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi @@ -0,0 +1,833 @@ @@ -26808,7 +21551,7 @@ index 000000000000..6e6e3be2f104 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts new file mode 100755 -index 000000000000..86d048c0d731 +index 000000000..86d048c0d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts @@ -0,0 +1,840 @@ @@ -27654,7 +22397,7 @@ index 000000000000..86d048c0d731 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts new file mode 100755 -index 000000000000..02308ebae99e +index 000000000..02308ebae --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts @@ -0,0 +1,1308 @@ @@ -28968,7 +23711,7 @@ index 000000000000..02308ebae99e +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts new file mode 100755 -index 000000000000..0af03d1ec2a8 +index 000000000..0af03d1ec --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts @@ -0,0 +1,1330 @@ @@ -30304,7 +25047,7 @@ index 000000000000..0af03d1ec2a8 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts new file mode 100755 -index 000000000000..fa8b7cff619f +index 000000000..fa8b7cff6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts @@ -0,0 +1,1317 @@ @@ -31627,7 +26370,7 @@ index 000000000000..fa8b7cff619f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts new file mode 100755 -index 000000000000..9669993499e0 +index 000000000..966999349 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts @@ -0,0 +1,1317 @@ @@ -32950,7 +27693,7 @@ index 000000000000..9669993499e0 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts new file mode 100755 -index 000000000000..4c12a79f814b +index 000000000..4c12a79f8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts @@ -0,0 +1,91 @@ @@ -33047,7 +27790,7 @@ index 000000000000..4c12a79f814b +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts new file mode 100755 -index 000000000000..67c131c9618a +index 000000000..67c131c96 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts @@ -0,0 +1,1024 @@ @@ -34077,7 +28820,7 @@ index 000000000000..67c131c9618a +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts new file mode 100755 -index 000000000000..6966806150f5 +index 000000000..696680615 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts @@ -0,0 +1,748 @@ @@ -34831,7 +29574,7 @@ index 000000000000..6966806150f5 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts new file mode 100755 -index 000000000000..b3b9efec92e4 +index 000000000..b3b9efec9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts @@ -0,0 +1,728 @@ @@ -35565,7 +30308,7 @@ index 000000000000..b3b9efec92e4 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts new file mode 100755 -index 000000000000..58bbfdafb489 +index 000000000..58bbfdafb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts @@ -0,0 +1,37 @@ @@ -35608,7 +30351,7 @@ index 000000000000..58bbfdafb489 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi new file mode 100755 -index 000000000000..940c05df8304 +index 000000000..940c05df8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi @@ -0,0 +1,887 @@ @@ -36501,7 +31244,7 @@ index 000000000000..940c05df8304 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts new file mode 100755 -index 000000000000..2f0c3fc3a38d +index 000000000..2f0c3fc3a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts @@ -0,0 +1,351 @@ @@ -36858,7 +31601,7 @@ index 000000000000..2f0c3fc3a38d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts new file mode 100755 -index 000000000000..139efd9d1332 +index 000000000..139efd9d1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts @@ -0,0 +1,297 @@ @@ -37161,7 +31904,7 @@ index 000000000000..139efd9d1332 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi new file mode 100755 -index 000000000000..a386cd291cf3 +index 000000000..a386cd291 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi @@ -0,0 +1,120 @@ @@ -37287,7 +32030,7 @@ index 000000000000..a386cd291cf3 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi new file mode 100755 -index 000000000000..809b6501b78f +index 000000000..809b6501b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi @@ -0,0 +1,88 @@ @@ -37381,7 +32124,7 @@ index 000000000000..809b6501b78f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts new file mode 100755 -index 000000000000..ee04d8988fbb +index 000000000..ee04d8988 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts @@ -0,0 +1,13 @@ @@ -37400,7 +32143,7 @@ index 000000000000..ee04d8988fbb +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dts b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dts new file mode 100755 -index 000000000000..dcff87208d39 +index 000000000..dcff87208 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dts @@ -0,0 +1,34 @@ @@ -37440,7 +32183,7 @@ index 000000000000..dcff87208d39 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi new file mode 100755 -index 000000000000..ad7ef6be49fa +index 000000000..ad7ef6be4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi @@ -0,0 +1,673 @@ @@ -38119,7 +32862,7 @@ index 000000000000..ad7ef6be49fa +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi new file mode 100755 -index 000000000000..0ea270539a23 +index 000000000..0ea270539 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi @@ -0,0 +1,221 @@ @@ -38346,7 +33089,7 @@ index 000000000000..0ea270539a23 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-dram-2layer-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-dram-2layer-timing.dtsi new file mode 100755 -index 000000000000..940024920b5d +index 000000000..940024920 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-dram-2layer-timing.dtsi @@ -0,0 +1,257 @@ @@ -38609,7 +33352,7 @@ index 000000000000..940024920b5d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi new file mode 100755 -index 000000000000..a3f5ff4bdc47 +index 000000000..a3f5ff4bd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi @@ -0,0 +1,311 @@ @@ -38926,7 +33669,7 @@ index 000000000000..a3f5ff4bdc47 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts new file mode 100755 -index 000000000000..0d72e05e2d59 +index 000000000..0d72e05e2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts @@ -0,0 +1,13 @@ @@ -38945,7 +33688,7 @@ index 000000000000..0d72e05e2d59 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dts new file mode 100755 -index 000000000000..6d50444a5a1d +index 000000000..6d50444a5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dts @@ -0,0 +1,34 @@ @@ -38985,7 +33728,7 @@ index 000000000000..6d50444a5a1d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi new file mode 100755 -index 000000000000..e050047420a6 +index 000000000..e05004742 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi @@ -0,0 +1,715 @@ @@ -39705,7 +34448,7 @@ index 000000000000..e050047420a6 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts -index a48767931af6..82d2f01a8be6 100644 +index a48767931..82d2f01a8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts @@ -37,6 +37,18 @@ sdio_pwrseq: sdio-pwrseq { @@ -39752,7 +34495,7 @@ index a48767931af6..82d2f01a8be6 100644 #gpio-cells = <2>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -index 83a0bdbe00d6..1eecad724f04 100644 +index 83a0bdbe0..1eecad724 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts @@ -71,8 +71,8 @@ vcc_io_sdio: sdmmcio-regulator { @@ -39767,7 +34510,7 @@ index 83a0bdbe00d6..1eecad724f04 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts -index 22ab5e1d7319..a0c4d321cc0b 100644 +index 22ab5e1d7..a0c4d321c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts @@ -45,8 +45,8 @@ vcc_sd: sdmmc-regulator { @@ -39783,7 +34526,7 @@ index 22ab5e1d7319..a0c4d321cc0b 100644 regulator-min-microvolt = <1800000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts new file mode 100755 -index 000000000000..adc1dd7cd4da +index 000000000..adc1dd7cd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts @@ -0,0 +1,32 @@ @@ -39821,7 +34564,7 @@ index 000000000000..adc1dd7cd4da +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts new file mode 100755 -index 000000000000..66e83916c728 +index 000000000..66e83916c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts @@ -0,0 +1,34 @@ @@ -39861,7 +34604,7 @@ index 000000000000..66e83916c728 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi new file mode 100755 -index 000000000000..3dad4f4fafcb +index 000000000..3dad4f4fa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi @@ -0,0 +1,612 @@ @@ -40478,7 +35221,7 @@ index 000000000000..3dad4f4fafcb + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -index 95ab6928cfd4..4c33c21eee8d 100644 +index 95ab6928c..4c33c21ee 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts @@ -21,6 +21,13 @@ gmac_clkin: external-gmac-clock { @@ -40517,7 +35260,7 @@ index 95ab6928cfd4..4c33c21eee8d 100644 status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index 72112fe05a5c..a3fcf36f8ecc 100644 +index 72112fe05..a3fcf36f8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -318,13 +318,13 @@ power: power-controller { @@ -40622,7 +35365,7 @@ index 72112fe05a5c..a3fcf36f8ecc 100644 #interrupt-cells = <3>; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts b/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts new file mode 100755 -index 000000000000..7e803a8ed30c +index 000000000..7e803a8ed --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts @@ -0,0 +1,189 @@ @@ -40817,7 +35560,7 @@ index 000000000000..7e803a8ed30c +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi new file mode 100755 -index 000000000000..fdea0c73932e +index 000000000..fdea0c739 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi @@ -0,0 +1,982 @@ @@ -41805,7 +36548,7 @@ index 000000000000..fdea0c73932e + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi new file mode 100755 -index 000000000000..a3e0bbaaf7c5 +index 000000000..a3e0bbaaf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi @@ -0,0 +1,357 @@ @@ -42168,7 +36911,7 @@ index 000000000000..a3e0bbaaf7c5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi new file mode 100755 -index 000000000000..7d2aac22c020 +index 000000000..7d2aac22c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi @@ -0,0 +1,35 @@ @@ -42209,7 +36952,7 @@ index 000000000000..7d2aac22c020 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi new file mode 100755 -index 000000000000..10bfbebda989 +index 000000000..10bfbebda --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi @@ -0,0 +1,66 @@ @@ -42281,7 +37024,7 @@ index 000000000000..10bfbebda989 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts b/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts new file mode 100755 -index 000000000000..6a971781032a +index 000000000..6a9717810 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts @@ -0,0 +1,35 @@ @@ -42322,7 +37065,7 @@ index 000000000000..6a971781032a +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dts b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts new file mode 100755 -index 000000000000..29658be08696 +index 000000000..29658be08 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts @@ -0,0 +1,34 @@ @@ -42362,7 +37105,7 @@ index 000000000000..29658be08696 + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi new file mode 100755 -index 000000000000..7eeb9db4f13b +index 000000000..7eeb9db4f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi @@ -0,0 +1,841 @@ @@ -43209,7 +37952,7 @@ index 000000000000..7eeb9db4f13b + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts new file mode 100755 -index 000000000000..1d50d3fa549f +index 000000000..1d50d3fa5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts @@ -0,0 +1,993 @@ @@ -44208,7 +38951,7 @@ index 000000000000..1d50d3fa549f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts new file mode 100755 -index 000000000000..4a755f1207c1 +index 000000000..4a755f120 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts @@ -0,0 +1,676 @@ @@ -44890,7 +39633,7 @@ index 000000000000..4a755f1207c1 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts new file mode 100755 -index 000000000000..b7b11f895cab +index 000000000..b7b11f895 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts @@ -0,0 +1,662 @@ @@ -45558,7 +40301,7 @@ index 000000000000..b7b11f895cab +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts new file mode 100755 -index 000000000000..b9b6b24ff37b +index 000000000..b9b6b24ff --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts @@ -0,0 +1,746 @@ @@ -46310,7 +41053,7 @@ index 000000000000..b9b6b24ff37b +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts b/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts new file mode 100755 -index 000000000000..eff7c2fed990 +index 000000000..eff7c2fed --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts @@ -0,0 +1,808 @@ @@ -47124,7 +41867,7 @@ index 000000000000..eff7c2fed990 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts new file mode 100755 -index 000000000000..d7dc6d67e242 +index 000000000..d7dc6d67e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts @@ -0,0 +1,1070 @@ @@ -48200,7 +42943,7 @@ index 000000000000..d7dc6d67e242 + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts b/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts new file mode 100755 -index 000000000000..b455e32c3e29 +index 000000000..b455e32c3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts @@ -0,0 +1,139 @@ @@ -48345,7 +43088,7 @@ index 000000000000..b455e32c3e29 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts new file mode 100755 -index 000000000000..bc320ffdc3b7 +index 000000000..bc320ffdc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts @@ -0,0 +1,33 @@ @@ -48385,7 +43128,7 @@ index 000000000000..bc320ffdc3b7 \ No newline at end of file diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi new file mode 100755 -index 000000000000..aa73096aff9d +index 000000000..aa73096af --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi @@ -0,0 +1,893 @@ @@ -49283,7 +44026,7 @@ index 000000000000..aa73096aff9d +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi -index 3746f23dc3df..e962c7962789 100644 +index 3746f23dc..e962c7962 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi @@ -562,7 +562,7 @@ pwm0: pwm@ff680000 { @@ -49350,7 +44093,7 @@ index 3746f23dc3df..e962c7962789 100644 diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts new file mode 100755 -index 000000000000..0a489bf8fc84 +index 000000000..0a489bf8f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts @@ -0,0 +1,1074 @@ @@ -50430,7 +45173,7 @@ index 000000000000..0a489bf8fc84 + diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts new file mode 100755 -index 000000000000..31f25e44504d +index 000000000..31f25e445 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts @@ -0,0 +1,1333 @@ @@ -51769,7 +46512,7 @@ index 000000000000..31f25e44504d + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi new file mode 100755 -index 000000000000..ffaa92b7a89e +index 000000000..ffaa92b7a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi @@ -0,0 +1,339 @@ @@ -52114,7 +46857,7 @@ index 000000000000..ffaa92b7a89e + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts new file mode 100755 -index 000000000000..c4572da2ec87 +index 000000000..c4572da2e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts @@ -0,0 +1,134 @@ @@ -52254,7 +46997,7 @@ index 000000000000..c4572da2ec87 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts new file mode 100755 -index 000000000000..1c9b884736b1 +index 000000000..1c9b88473 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts @@ -0,0 +1,158 @@ @@ -52418,7 +47161,7 @@ index 000000000000..1c9b884736b1 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi new file mode 100755 -index 000000000000..704e0df4e122 +index 000000000..704e0df4e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi @@ -0,0 +1,891 @@ @@ -53315,7 +48058,7 @@ index 000000000000..704e0df4e122 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-dram-default-timing.dtsi new file mode 100755 -index 000000000000..981777b82329 +index 000000000..981777b82 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-dram-default-timing.dtsi @@ -0,0 +1,80 @@ @@ -53401,7 +48144,7 @@ index 000000000000..981777b82329 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi new file mode 100755 -index 000000000000..2a675ec7c342 +index 000000000..2a675ec7c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi @@ -0,0 +1,127 @@ @@ -53534,7 +48277,7 @@ index 000000000000..2a675ec7c342 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi new file mode 100755 -index 000000000000..4cac4981b267 +index 000000000..4cac4981b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi @@ -0,0 +1,181 @@ @@ -53721,7 +48464,7 @@ index 000000000000..4cac4981b267 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts new file mode 100755 -index 000000000000..343a9fc389e1 +index 000000000..343a9fc38 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts @@ -0,0 +1,389 @@ @@ -54116,7 +48859,7 @@ index 000000000000..343a9fc389e1 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts new file mode 100755 -index 000000000000..72aa97affa99 +index 000000000..72aa97aff --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts @@ -0,0 +1,157 @@ @@ -54279,7 +49022,7 @@ index 000000000000..72aa97affa99 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts new file mode 100755 -index 000000000000..5b6b7131fdd1 +index 000000000..5b6b7131f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts @@ -0,0 +1,321 @@ @@ -54606,7 +49349,7 @@ index 000000000000..5b6b7131fdd1 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts new file mode 100755 -index 000000000000..8439d91dd125 +index 000000000..8439d91dd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts @@ -0,0 +1,425 @@ @@ -55037,7 +49780,7 @@ index 000000000000..8439d91dd125 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi new file mode 100755 -index 000000000000..dc821a2d45c4 +index 000000000..dc821a2d4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi @@ -0,0 +1,1430 @@ @@ -56473,7 +51216,7 @@ index 000000000000..dc821a2d45c4 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts new file mode 100755 -index 000000000000..bb7ddac77f23 +index 000000000..bb7ddac77 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts @@ -0,0 +1,145 @@ @@ -56624,7 +51367,7 @@ index 000000000000..bb7ddac77f23 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts new file mode 100755 -index 000000000000..bf27556295ec +index 000000000..bf2755629 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts @@ -0,0 +1,51 @@ @@ -56681,7 +51424,7 @@ index 000000000000..bf27556295ec +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi new file mode 100755 -index 000000000000..f35d6ee56072 +index 000000000..f35d6ee56 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi @@ -0,0 +1,352 @@ @@ -57039,7 +51782,7 @@ index 000000000000..f35d6ee56072 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts new file mode 100755 -index 000000000000..b15fb8a9d088 +index 000000000..b15fb8a9d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts @@ -0,0 +1,156 @@ @@ -57201,7 +51944,7 @@ index 000000000000..b15fb8a9d088 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts new file mode 100755 -index 000000000000..2daf9f1235f3 +index 000000000..2daf9f123 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts @@ -0,0 +1,51 @@ @@ -57258,7 +52001,7 @@ index 000000000000..2daf9f1235f3 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi new file mode 100755 -index 000000000000..4b23c1fcadd8 +index 000000000..4b23c1fca --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi @@ -0,0 +1,366 @@ @@ -57630,7 +52373,7 @@ index 000000000000..4b23c1fcadd8 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts new file mode 100755 -index 000000000000..7f730f5633dd +index 000000000..7f730f563 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts @@ -0,0 +1,126 @@ @@ -57762,7 +52505,7 @@ index 000000000000..7f730f5633dd +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts new file mode 100755 -index 000000000000..85f4356a0030 +index 000000000..85f4356a0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts @@ -0,0 +1,233 @@ @@ -58001,7 +52744,7 @@ index 000000000000..85f4356a0030 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts new file mode 100755 -index 000000000000..fffd92f00ff4 +index 000000000..fffd92f00 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts @@ -0,0 +1,300 @@ @@ -58307,7 +53050,7 @@ index 000000000000..fffd92f00ff4 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts new file mode 100755 -index 000000000000..9ba1b0381fed +index 000000000..9ba1b0381 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts @@ -0,0 +1,176 @@ @@ -58489,7 +53232,7 @@ index 000000000000..9ba1b0381fed +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts new file mode 100755 -index 000000000000..e1bb5f129680 +index 000000000..e1bb5f129 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts @@ -0,0 +1,51 @@ @@ -58546,7 +53289,7 @@ index 000000000000..e1bb5f129680 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi new file mode 100755 -index 000000000000..e34379ded3a5 +index 000000000..e34379ded --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi @@ -0,0 +1,353 @@ @@ -58905,7 +53648,7 @@ index 000000000000..e34379ded3a5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi new file mode 100755 -index 000000000000..aa8ea436ae9b +index 000000000..aa8ea436a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi @@ -0,0 +1,646 @@ @@ -59557,7 +54300,7 @@ index 000000000000..aa8ea436ae9b + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi new file mode 100755 -index 000000000000..adbda6ba4e0d +index 000000000..adbda6ba4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi @@ -0,0 +1,324 @@ @@ -59887,7 +54630,7 @@ index 000000000000..adbda6ba4e0d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts new file mode 100755 -index 000000000000..c372ade536f2 +index 000000000..c372ade53 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts @@ -0,0 +1,1102 @@ @@ -60995,7 +55738,7 @@ index 000000000000..c372ade536f2 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts new file mode 100755 -index 000000000000..5a023389a033 +index 000000000..5a023389a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts @@ -0,0 +1,1074 @@ @@ -62075,7 +56818,7 @@ index 000000000000..5a023389a033 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-fpga.dts b/arch/arm64/boot/dts/rockchip/rk3399-fpga.dts new file mode 100755 -index 000000000000..1192dfa42940 +index 000000000..1192dfa42 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-fpga.dts @@ -0,0 +1,64 @@ @@ -62145,7 +56888,7 @@ index 000000000000..1192dfa42940 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts new file mode 100755 -index 000000000000..e8d771e2b90e +index 000000000..e8d771e2b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts @@ -0,0 +1,165 @@ @@ -62316,7 +57059,7 @@ index 000000000000..e8d771e2b90e +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts new file mode 100755 -index 000000000000..7a1c36e981d5 +index 000000000..7a1c36e98 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts @@ -0,0 +1,118 @@ @@ -62440,7 +57183,7 @@ index 000000000000..7a1c36e981d5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts new file mode 100755 -index 000000000000..44b04e1606fc +index 000000000..44b04e160 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts @@ -0,0 +1,85 @@ @@ -62530,7 +57273,7 @@ index 000000000000..44b04e1606fc + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi -index e9ecffc409c0..60cd1c18cd4e 100644 +index e9ecffc40..60cd1c18c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi @@ -245,7 +245,7 @@ &ppvar_gpu_pwm { @@ -62543,7 +57286,7 @@ index e9ecffc409c0..60cd1c18cd4e 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi -index fb0a13cad6c9..1ce91e36aa49 100644 +index fb0a13cad..1ce91e36a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -247,8 +247,8 @@ ppvar_sd_card_io: ppvar-sd-card-io { @@ -62559,7 +57302,7 @@ index fb0a13cad6c9..1ce91e36aa49 100644 regulator-max-microvolt = <3000000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi new file mode 100755 -index 000000000000..0549701d615e +index 000000000..0549701d6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi @@ -0,0 +1,306 @@ @@ -62871,7 +57614,7 @@ index 000000000000..0549701d615e +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts new file mode 100755 -index 000000000000..8610539ef284 +index 000000000..8610539ef --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts @@ -0,0 +1,1121 @@ @@ -63997,7 +58740,7 @@ index 000000000000..8610539ef284 + assigned-clock-parents = <&cru PLL_VPLL>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi -index d6f1095abb04..f9f2cc8abec7 100644 +index d6f1095ab..f9f2cc8ab 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi @@ -3,35 +3,99 @@ @@ -64395,7 +59138,7 @@ index d6f1095abb04..f9f2cc8abec7 100644 &gpu { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi -index 35b7ab3bf10c..20309076dbac 100644 +index 35b7ab3bf..20309076d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi @@ -384,7 +384,6 @@ regulator-state-mem { @@ -64417,7 +59160,7 @@ index 35b7ab3bf10c..20309076dbac 100644 regulator-state-mem { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts new file mode 100755 -index 000000000000..86e45dc0074d +index 000000000..86e45dc00 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts @@ -0,0 +1,1088 @@ @@ -65510,7 +60253,7 @@ index 000000000000..86e45dc0074d + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts -index c88295782e7b..1a23e8f3cdf6 100644 +index c88295782..1a23e8f3c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts @@ -63,6 +63,20 @@ bt_active_led: led-6 { @@ -65582,7 +60325,7 @@ index c88295782e7b..1a23e8f3cdf6 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts new file mode 100755 -index 000000000000..3106512b87cd +index 000000000..3106512b8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts @@ -0,0 +1,181 @@ @@ -65769,7 +60512,7 @@ index 000000000000..3106512b87cd +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts new file mode 100755 -index 000000000000..3e9ef7b0773b +index 000000000..3e9ef7b07 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts @@ -0,0 +1,128 @@ @@ -65903,7 +60646,7 @@ index 000000000000..3e9ef7b0773b + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts new file mode 100755 -index 000000000000..c2f8673198d5 +index 000000000..c2f867319 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts @@ -0,0 +1,82 @@ @@ -65991,7 +60734,7 @@ index 000000000000..c2f8673198d5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi new file mode 100755 -index 000000000000..8156e5f7c795 +index 000000000..8156e5f7c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi @@ -0,0 +1,488 @@ @@ -66485,7 +61228,7 @@ index 000000000000..8156e5f7c795 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts new file mode 100755 -index 000000000000..e1e482938481 +index 000000000..e1e482938 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts @@ -0,0 +1,487 @@ @@ -66978,7 +61721,7 @@ index 000000000000..e1e482938481 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts new file mode 100755 -index 000000000000..9f370a7bff1c +index 000000000..9f370a7bf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts @@ -0,0 +1,452 @@ @@ -67436,7 +62179,7 @@ index 000000000000..9f370a7bff1c +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts new file mode 100755 -index 000000000000..da471a636103 +index 000000000..da471a636 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts @@ -0,0 +1,497 @@ @@ -67938,7 +62681,7 @@ index 000000000000..da471a636103 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi -index 701a567d7638..3d9e27750139 100644 +index 701a567d7..3d9e27750 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -515,6 +515,8 @@ &pwm0 { @@ -67952,7 +62695,7 @@ index 701a567d7638..3d9e27750139 100644 &saradc { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi new file mode 100755 -index 000000000000..373a776b9207 +index 000000000..373a776b9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi @@ -0,0 +1,121 @@ @@ -68079,7 +62822,7 @@ index 000000000000..373a776b9207 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts new file mode 100755 -index 000000000000..eeca9cf54373 +index 000000000..eeca9cf54 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts @@ -0,0 +1,170 @@ @@ -68255,7 +62998,7 @@ index 000000000000..eeca9cf54373 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts new file mode 100755 -index 000000000000..28f81ee8f7f5 +index 000000000..28f81ee8f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts @@ -0,0 +1,42 @@ @@ -68303,7 +63046,7 @@ index 000000000000..28f81ee8f7f5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi new file mode 100755 -index 000000000000..fb700431e356 +index 000000000..fb700431e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi @@ -0,0 +1,1039 @@ @@ -69348,7 +64091,7 @@ index 000000000000..fb700431e356 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts new file mode 100755 -index 000000000000..ac9d28db5b76 +index 000000000..ac9d28db5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts @@ -0,0 +1,1179 @@ @@ -70533,7 +65276,7 @@ index 000000000000..ac9d28db5b76 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts new file mode 100755 -index 000000000000..10ba2048483d +index 000000000..10ba20484 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts @@ -0,0 +1,293 @@ @@ -70832,7 +65575,7 @@ index 000000000000..10ba2048483d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi new file mode 100755 -index 000000000000..5ed8dac6cf7d +index 000000000..5ed8dac6c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi @@ -0,0 +1,181 @@ @@ -71018,7 +65761,7 @@ index 000000000000..5ed8dac6cf7d +#endif + diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index c5f3d4f8f4d2..7f4a812f4337 100644 +index c5f3d4f8f..7f4a812f4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -9,8 +9,13 @@ @@ -71733,7 +66476,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi new file mode 100755 -index 000000000000..59f200e0b9cb +index 000000000..59f200e0b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi @@ -0,0 +1,24 @@ @@ -71763,7 +66506,7 @@ index 000000000000..59f200e0b9cb +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts new file mode 100755 -index 000000000000..f975f47b76d6 +index 000000000..f975f47b7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts @@ -0,0 +1,1293 @@ @@ -73062,7 +67805,7 @@ index 000000000000..f975f47b76d6 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts new file mode 100755 -index 000000000000..08ac2a477852 +index 000000000..08ac2a477 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts @@ -0,0 +1,1203 @@ @@ -74271,7 +69014,7 @@ index 000000000000..08ac2a477852 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts new file mode 100755 -index 000000000000..398f962114cf +index 000000000..398f96211 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts @@ -0,0 +1,1061 @@ @@ -75338,7 +70081,7 @@ index 000000000000..398f962114cf +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts new file mode 100755 -index 000000000000..c3faaa1ba4d3 +index 000000000..c3faaa1ba --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts @@ -0,0 +1,1223 @@ @@ -76567,7 +71310,7 @@ index 000000000000..c3faaa1ba4d3 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts new file mode 100755 -index 000000000000..7d118a783353 +index 000000000..7d118a783 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts @@ -0,0 +1,1045 @@ @@ -77618,7 +72361,7 @@ index 000000000000..7d118a783353 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts new file mode 100755 -index 000000000000..4f8546eb80bf +index 000000000..4f8546eb8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts @@ -0,0 +1,247 @@ @@ -77871,7 +72614,7 @@ index 000000000000..4f8546eb80bf +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts new file mode 100755 -index 000000000000..96a3fb56cfe5 +index 000000000..96a3fb56c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts @@ -0,0 +1,140 @@ @@ -78017,7 +72760,7 @@ index 000000000000..96a3fb56cfe5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi new file mode 100755 -index 000000000000..3f176b3bc94f +index 000000000..3f176b3bc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi @@ -0,0 +1,826 @@ @@ -78849,7 +73592,7 @@ index 000000000000..3f176b3bc94f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts new file mode 100755 -index 000000000000..1bd285bfc695 +index 000000000..1bd285bfc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts @@ -0,0 +1,15 @@ @@ -78870,7 +73613,7 @@ index 000000000000..1bd285bfc695 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi new file mode 100755 -index 000000000000..41ac0af11188 +index 000000000..41ac0af11 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi @@ -0,0 +1,528 @@ @@ -79404,7 +74147,7 @@ index 000000000000..41ac0af11188 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi new file mode 100755 -index 000000000000..f0feae6730e3 +index 000000000..f0feae673 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi @@ -0,0 +1,436 @@ @@ -79846,7 +74589,7 @@ index 000000000000..f0feae6730e3 + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi new file mode 100755 -index 000000000000..09791eb16abf +index 000000000..09791eb16 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi @@ -0,0 +1,100 @@ @@ -79952,7 +74695,7 @@ index 000000000000..09791eb16abf + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts new file mode 100755 -index 000000000000..3f215884a070 +index 000000000..3f215884a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts @@ -0,0 +1,7 @@ @@ -79965,7 +74708,7 @@ index 000000000000..3f215884a070 +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi new file mode 100755 -index 000000000000..227bc4e39d99 +index 000000000..227bc4e39 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi @@ -0,0 +1,507 @@ @@ -80478,7 +75221,7 @@ index 000000000000..227bc4e39d99 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi new file mode 100755 -index 000000000000..d1aa123cd347 +index 000000000..d1aa123cd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi @@ -0,0 +1,7 @@ @@ -80491,7 +75234,7 @@ index 000000000000..d1aa123cd347 +#include "rk3568-evb.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts new file mode 100755 -index 000000000000..a22cc8cec6af +index 000000000..a22cc8cec --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts @@ -0,0 +1,13 @@ @@ -80510,7 +75253,7 @@ index 000000000000..a22cc8cec6af +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts new file mode 100755 -index 000000000000..98a384041b8b +index 000000000..98a384041 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts @@ -0,0 +1,99 @@ @@ -80615,7 +75358,7 @@ index 000000000000..98a384041b8b +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts new file mode 100755 -index 000000000000..f602ed98d7ce +index 000000000..f602ed98d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts @@ -0,0 +1,7 @@ @@ -80628,7 +75371,7 @@ index 000000000000..f602ed98d7ce +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi new file mode 100755 -index 000000000000..385933be9f45 +index 000000000..385933be9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi @@ -0,0 +1,489 @@ @@ -81123,7 +75866,7 @@ index 000000000000..385933be9f45 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts new file mode 100755 -index 000000000000..83546eef6529 +index 000000000..83546eef6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts @@ -0,0 +1,345 @@ @@ -81474,7 +76217,7 @@ index 000000000000..83546eef6529 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-i2s-mic-array.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-i2s-mic-array.dts new file mode 100755 -index 000000000000..5ba1318bcee1 +index 000000000..5ba1318bc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-i2s-mic-array.dts @@ -0,0 +1,102 @@ @@ -81582,7 +76325,7 @@ index 000000000000..5ba1318bcee1 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-linux.dts new file mode 100755 -index 000000000000..957a99b168bb +index 000000000..957a99b16 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-linux.dts @@ -0,0 +1,8 @@ @@ -81596,7 +76339,7 @@ index 000000000000..957a99b168bb +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-pdm-mic-array.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-pdm-mic-array.dts new file mode 100755 -index 000000000000..55e9679194cb +index 000000000..55e967919 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-pdm-mic-array.dts @@ -0,0 +1,111 @@ @@ -81713,7 +76456,7 @@ index 000000000000..55e9679194cb + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts new file mode 100755 -index 000000000000..3b36bdba12b6 +index 000000000..3b36bdba1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts @@ -0,0 +1,8 @@ @@ -81727,7 +76470,7 @@ index 000000000000..3b36bdba12b6 +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi new file mode 100755 -index 000000000000..4a6bec70f33e +index 000000000..4a6bec70f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi @@ -0,0 +1,599 @@ @@ -82332,7 +77075,7 @@ index 000000000000..4a6bec70f33e +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10-linux.dts new file mode 100755 -index 000000000000..e292b0dd1846 +index 000000000..e292b0dd1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10-linux.dts @@ -0,0 +1,8 @@ @@ -82346,7 +77089,7 @@ index 000000000000..e292b0dd1846 +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts new file mode 100755 -index 000000000000..09f5260fb375 +index 000000000..09f5260fb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts @@ -0,0 +1,8 @@ @@ -82360,7 +77103,7 @@ index 000000000000..09f5260fb375 +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi new file mode 100755 -index 000000000000..f936cc186cfb +index 000000000..f936cc186 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi @@ -0,0 +1,499 @@ @@ -82865,7 +77608,7 @@ index 000000000000..f936cc186cfb +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dts new file mode 100755 -index 000000000000..600fc3c39586 +index 000000000..600fc3c39 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dts @@ -0,0 +1,7 @@ @@ -82878,7 +77621,7 @@ index 000000000000..600fc3c39586 +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi new file mode 100755 -index 000000000000..83586659530d +index 000000000..835866595 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi @@ -0,0 +1,317 @@ @@ -83201,7 +77944,7 @@ index 000000000000..83586659530d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts new file mode 100755 -index 000000000000..3f559fca27f8 +index 000000000..3f559fca2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts @@ -0,0 +1,1115 @@ @@ -84322,7 +79065,7 @@ index 000000000000..3f559fca27f8 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts new file mode 100755 -index 000000000000..2e6d3160aa16 +index 000000000..2e6d3160a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts @@ -0,0 +1,968 @@ @@ -85296,7 +80039,7 @@ index 000000000000..2e6d3160aa16 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts new file mode 100755 -index 000000000000..50412b44bb71 +index 000000000..50412b44b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts @@ -0,0 +1,957 @@ @@ -86259,7 +81002,7 @@ index 000000000000..50412b44bb71 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts new file mode 100755 -index 000000000000..f6f4534aad50 +index 000000000..f6f4534aa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts @@ -0,0 +1,1307 @@ @@ -87572,7 +82315,7 @@ index 000000000000..f6f4534aad50 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts new file mode 100755 -index 000000000000..8102da0270fa +index 000000000..8102da027 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts @@ -0,0 +1,1180 @@ @@ -88758,7 +83501,7 @@ index 000000000000..8102da0270fa +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts new file mode 100755 -index 000000000000..1d4a0484473a +index 000000000..1d4a04844 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts @@ -0,0 +1,1208 @@ @@ -89972,7 +84715,7 @@ index 000000000000..1d4a0484473a +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts new file mode 100755 -index 000000000000..40022eb6c646 +index 000000000..40022eb6c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts @@ -0,0 +1,1213 @@ @@ -91191,7 +85934,7 @@ index 000000000000..40022eb6c646 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566.dtsi b/arch/arm64/boot/dts/rockchip/rk3566.dtsi new file mode 100755 -index 000000000000..01b6499b678d +index 000000000..01b6499b6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566.dtsi @@ -0,0 +1,53 @@ @@ -91250,7 +85993,7 @@ index 000000000000..01b6499b678d +/delete-node/ &sata0; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi new file mode 100755 -index 000000000000..01cd37c04e1a +index 000000000..01cd37c04 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi @@ -0,0 +1,74 @@ @@ -91330,7 +86073,7 @@ index 000000000000..01cd37c04e1a +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi new file mode 100755 -index 000000000000..43f978809c02 +index 000000000..43f978809 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi @@ -0,0 +1,81 @@ @@ -91417,7 +86160,7 @@ index 000000000000..43f978809c02 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi new file mode 100755 -index 000000000000..2ca4a18314d2 +index 000000000..2ca4a1831 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi @@ -0,0 +1,1807 @@ @@ -93230,7 +87973,7 @@ index 000000000000..2ca4a18314d2 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts new file mode 100755 -index 000000000000..259b483af0f4 +index 000000000..259b483af --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts @@ -0,0 +1,18 @@ @@ -93254,7 +87997,7 @@ index 000000000000..259b483af0f4 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts new file mode 100755 -index 000000000000..55c255998473 +index 000000000..55c255998 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts @@ -0,0 +1,8 @@ @@ -93268,7 +88011,7 @@ index 000000000000..55c255998473 +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts new file mode 100755 -index 000000000000..00c28f39269b +index 000000000..00c28f392 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts @@ -0,0 +1,8 @@ @@ -93282,7 +88025,7 @@ index 000000000000..00c28f39269b +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi new file mode 100755 -index 000000000000..64881d20183f +index 000000000..64881d201 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi @@ -0,0 +1,490 @@ @@ -93778,7 +88521,7 @@ index 000000000000..64881d20183f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts new file mode 100755 -index 000000000000..7a5a7feb52a7 +index 000000000..7a5a7feb5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts @@ -0,0 +1,79 @@ @@ -93863,7 +88606,7 @@ index 000000000000..7a5a7feb52a7 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dts new file mode 100755 -index 000000000000..23f5f036c4b2 +index 000000000..23f5f036c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dts @@ -0,0 +1,8 @@ @@ -93877,7 +88620,7 @@ index 000000000000..23f5f036c4b2 +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi new file mode 100755 -index 000000000000..c2d0b697a9bd +index 000000000..c2d0b697a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi @@ -0,0 +1,493 @@ @@ -94376,7 +89119,7 @@ index 000000000000..c2d0b697a9bd +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb4-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb4-lp3-v10.dts new file mode 100755 -index 000000000000..5884da41f121 +index 000000000..5884da41f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb4-lp3-v10.dts @@ -0,0 +1,12 @@ @@ -94394,7 +89137,7 @@ index 000000000000..5884da41f121 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dts new file mode 100755 -index 000000000000..e9eb333079a2 +index 000000000..e9eb33307 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dts @@ -0,0 +1,8 @@ @@ -94408,7 +89151,7 @@ index 000000000000..e9eb333079a2 +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi new file mode 100755 -index 000000000000..e8a00fc85483 +index 000000000..e8a00fc85 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi @@ -0,0 +1,539 @@ @@ -94953,7 +89696,7 @@ index 000000000000..e8a00fc85483 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-linux.dts new file mode 100755 -index 000000000000..a11975fc7d53 +index 000000000..a11975fc7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-linux.dts @@ -0,0 +1,8 @@ @@ -94967,7 +89710,7 @@ index 000000000000..a11975fc7d53 +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts new file mode 100755 -index 000000000000..0c5ea5eb32ba +index 000000000..0c5ea5eb3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts @@ -0,0 +1,127 @@ @@ -95100,7 +89843,7 @@ index 000000000000..0c5ea5eb32ba +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts new file mode 100755 -index 000000000000..597fa0b0b089 +index 000000000..597fa0b0b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts @@ -0,0 +1,96 @@ @@ -95202,7 +89945,7 @@ index 000000000000..597fa0b0b089 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts new file mode 100755 -index 000000000000..24c4debec4f3 +index 000000000..24c4debec --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts @@ -0,0 +1,70 @@ @@ -95278,7 +90021,7 @@ index 000000000000..24c4debec4f3 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts new file mode 100755 -index 000000000000..6e34fa48abc4 +index 000000000..6e34fa48a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts @@ -0,0 +1,8 @@ @@ -95292,7 +90035,7 @@ index 000000000000..6e34fa48abc4 +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi new file mode 100755 -index 000000000000..2f3b5d74e1cf +index 000000000..2f3b5d74e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi @@ -0,0 +1,490 @@ @@ -95788,7 +90531,7 @@ index 000000000000..2f3b5d74e1cf +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts new file mode 100755 -index 000000000000..ecb96832c292 +index 000000000..ecb96832c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts @@ -0,0 +1,12 @@ @@ -95806,7 +90549,7 @@ index 000000000000..ecb96832c292 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10-linux.dts new file mode 100755 -index 000000000000..d832a40d37e9 +index 000000000..d832a40d3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10-linux.dts @@ -0,0 +1,69 @@ @@ -95881,7 +90624,7 @@ index 000000000000..d832a40d37e9 +/delete-node/ &display_subsystem; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts new file mode 100755 -index 000000000000..489967f1318f +index 000000000..489967f13 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts @@ -0,0 +1,47 @@ @@ -95934,7 +90677,7 @@ index 000000000000..489967f1318f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi new file mode 100755 -index 000000000000..838606964e15 +index 000000000..838606964 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi @@ -0,0 +1,60 @@ @@ -96000,7 +90743,7 @@ index 000000000000..838606964e15 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts new file mode 100755 -index 000000000000..50bd024528df +index 000000000..50bd02452 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts @@ -0,0 +1,31 @@ @@ -96037,7 +90780,7 @@ index 000000000000..50bd024528df +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts new file mode 100755 -index 000000000000..3317db6ee671 +index 000000000..3317db6ee --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts @@ -0,0 +1,27 @@ @@ -96070,7 +90813,7 @@ index 000000000000..3317db6ee671 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dts new file mode 100755 -index 000000000000..053d20259e93 +index 000000000..053d20259 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dts @@ -0,0 +1,27 @@ @@ -96103,7 +90846,7 @@ index 000000000000..053d20259e93 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi new file mode 100755 -index 000000000000..40a2096bc58b +index 000000000..40a2096bc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi @@ -0,0 +1,442 @@ @@ -96551,7 +91294,7 @@ index 000000000000..40a2096bc58b +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts new file mode 100755 -index 000000000000..de8c1a1e734f +index 000000000..de8c1a1e7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts @@ -0,0 +1,20 @@ @@ -96577,7 +91320,7 @@ index 000000000000..de8c1a1e734f + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts new file mode 100755 -index 000000000000..b605c3d57d26 +index 000000000..b605c3d57 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts @@ -0,0 +1,16 @@ @@ -96599,7 +91342,7 @@ index 000000000000..b605c3d57d26 + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi new file mode 100755 -index 000000000000..6bb50368a73b +index 000000000..6bb50368a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi @@ -0,0 +1,39 @@ @@ -96644,7 +91387,7 @@ index 000000000000..6bb50368a73b +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi new file mode 100755 -index 000000000000..f9908b61cb41 +index 000000000..f9908b61c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi @@ -0,0 +1,55 @@ @@ -96705,7 +91448,7 @@ index 000000000000..f9908b61cb41 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi new file mode 100755 -index 000000000000..e1ec294b2c82 +index 000000000..e1ec294b2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi @@ -0,0 +1,510 @@ @@ -97221,7 +91964,7 @@ index 000000000000..e1ec294b2c82 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi new file mode 100755 -index 000000000000..30d8cedfbdc7 +index 000000000..30d8cedfb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi @@ -0,0 +1,3119 @@ @@ -100346,7 +95089,7 @@ index 000000000000..30d8cedfbdc7 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts new file mode 100755 -index 000000000000..0ef442123d05 +index 000000000..0ef442123 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts @@ -0,0 +1,14 @@ @@ -100366,7 +95109,7 @@ index 000000000000..0ef442123d05 + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi new file mode 100755 -index 000000000000..459fc3b6d6a0 +index 000000000..459fc3b6d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi @@ -0,0 +1,141 @@ @@ -100513,7 +95256,7 @@ index 000000000000..459fc3b6d6a0 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi new file mode 100755 -index 000000000000..25889a206778 +index 000000000..25889a206 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi @@ -0,0 +1,395 @@ @@ -100914,7 +95657,7 @@ index 000000000000..25889a206778 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi new file mode 100755 -index 000000000000..bd32a4246df3 +index 000000000..bd32a4246 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi @@ -0,0 +1,91 @@ @@ -101011,7 +95754,7 @@ index 000000000000..bd32a4246df3 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi new file mode 100755 -index 000000000000..70fc8ffc3e41 +index 000000000..70fc8ffc3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi @@ -0,0 +1,97 @@ @@ -101114,7 +95857,7 @@ index 000000000000..70fc8ffc3e41 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts new file mode 100755 -index 000000000000..ccfd369d0cd3 +index 000000000..ccfd369d0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts @@ -0,0 +1,13 @@ @@ -101133,7 +95876,7 @@ index 000000000000..ccfd369d0cd3 + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts new file mode 100755 -index 000000000000..3107e3a9937a +index 000000000..3107e3a99 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts @@ -0,0 +1,155 @@ @@ -101294,7 +96037,7 @@ index 000000000000..3107e3a9937a + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts new file mode 100755 -index 000000000000..0fb7b0a65fe5 +index 000000000..67e95ebf4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts @@ -0,0 +1,21 @@ @@ -101321,7 +96064,7 @@ index 000000000000..0fb7b0a65fe5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi new file mode 100755 -index 000000000000..b6ec191b0107 +index 000000000..b6ec191b0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi @@ -0,0 +1,868 @@ @@ -102195,7 +96938,7 @@ index 000000000000..b6ec191b0107 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts new file mode 100755 -index 000000000000..8dd494ce3a1f +index 000000000..8dd494ce3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts @@ -0,0 +1,13 @@ @@ -102214,7 +96957,7 @@ index 000000000000..8dd494ce3a1f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi new file mode 100755 -index 000000000000..7c1919d7d258 +index 000000000..7c1919d7d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi @@ -0,0 +1,816 @@ @@ -103036,7 +97779,7 @@ index 000000000000..7c1919d7d258 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi new file mode 100755 -index 000000000000..8be2d36f38c0 +index 000000000..8be2d36f3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi @@ -0,0 +1,1891 @@ @@ -104933,7 +99676,7 @@ index 000000000000..8be2d36f38c0 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi new file mode 100755 -index 000000000000..372617fee467 +index 000000000..372617fee --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -0,0 +1,3449 @@ @@ -108388,7 +103131,7 @@ index 000000000000..372617fee467 +#include "rk3568-pinctrl.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi b/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi new file mode 100755 -index 000000000000..fc0145333257 +index 000000000..fc0145333 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi @@ -0,0 +1,382 @@ @@ -108776,7 +103519,7 @@ index 000000000000..fc0145333257 + diff --git a/arch/arm64/include/asm/system_info.h b/arch/arm64/include/asm/system_info.h new file mode 100755 -index 000000000000..a82fe791b2f6 +index 000000000..a82fe791b --- /dev/null +++ b/arch/arm64/include/asm/system_info.h @@ -0,0 +1,14 @@ @@ -108795,7 +103538,7 @@ index 000000000000..a82fe791b2f6 + +#endif /* __ASM_ARM_SYSTEM_INFO_H */ diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index 4c0e72781f31..7221da6cf9ef 100644 +index 4c0e72781..7221da6cf 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -25,6 +25,12 @@ @@ -108812,7 +103555,7 @@ index 4c0e72781f31..7221da6cf9ef 100644 * In case the boot CPU is hotpluggable, we record its initial state and * current state separately. Certain system registers may contain different diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c -index 3696dbcbfa80..ead9c33ebe91 100644 +index 3696dbcbf..ead9c33eb 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -191,6 +191,8 @@ void machine_restart(char *cmd) @@ -108825,7 +103568,7 @@ index 3696dbcbfa80..ead9c33ebe91 100644 * UpdateCapsule() depends on the system being reset via * ResetSystem(). diff --git a/drivers/Kconfig b/drivers/Kconfig -index 216c52363bd2..8fe7763236c3 100644 +index 216c52363..7abae88c8 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -246,4 +246,9 @@ source "drivers/hck/Kconfig" @@ -108839,7 +103582,7 @@ index 216c52363bd2..8fe7763236c3 100644 +source "drivers/rk_nand/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile -index d0ff4fdb0dfb..888700ee86f5 100644 +index d0ff4fdb0..a1b4ece46 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -196,3 +196,6 @@ obj-$(CONFIG_MOST) += most/ @@ -108850,7 +103593,7 @@ index d0ff4fdb0dfb..888700ee86f5 100644 +obj-$(CONFIG_TZDRIVER) += tzdriver/ +obj-$(CONFIG_RK_NAND) += rk_nand/ diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c -index ecdf16bb130e..3dd80678499c 100644 +index 9a7ea4c18..92e61f980 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -2400,12 +2400,6 @@ static int nbd_genl_status(struct sk_buff *skb, struct genl_info *info) @@ -108867,7 +103610,7 @@ index ecdf16bb130e..3dd80678499c 100644 ret = idr_for_each(&nbd_index_idr, &status_cb, reply); if (ret) { diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig -index 4ae49eae4586..b64457abdec3 100644 +index 4ae49eae4..b64457abd 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -38,6 +38,13 @@ menuconfig COMMON_CLK @@ -108885,7 +103628,7 @@ index 4ae49eae4586..b64457abdec3 100644 tristate "Clock driver for WM831x/2x PMICs" depends on MFD_WM831X diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c -index 3575afe16a57..d2f0c049b837 100644 +index 3575afe16..d2f0c049b 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1324,7 +1324,7 @@ static int __init clk_disable_unused(void) @@ -108898,7 +103641,7 @@ index 3575afe16a57..d2f0c049b837 100644 static int clk_core_determine_round_nolock(struct clk_core *core, struct clk_rate_request *req) diff --git a/drivers/clk/rockchip/Kconfig b/drivers/clk/rockchip/Kconfig -index 47cd6c5de837..02c5df791017 100644 +index 47cd6c5de..f92ce8b4c 100644 --- a/drivers/clk/rockchip/Kconfig +++ b/drivers/clk/rockchip/Kconfig @@ -2,7 +2,7 @@ @@ -108910,43 +103653,52 @@ index 47cd6c5de837..02c5df791017 100644 depends on ARCH_ROCKCHIP default ARCH_ROCKCHIP help -@@ -10,69 +10,105 @@ config COMMON_CLK_ROCKCHIP +@@ -10,69 +10,210 @@ config COMMON_CLK_ROCKCHIP if COMMON_CLK_ROCKCHIP config CLK_PX30 - bool "Rockchip PX30 clock controller support" + tristate "Rockchip PX30 clock controller support" -+ depends on ARM64 || COMPILE_TEST ++ depends on CPU_PX30 || COMPILE_TEST default y help Build the driver for PX30 Clock Driver. - config CLK_RV110X +-config CLK_RV110X - bool "Rockchip RV110x clock controller support" -+ tristate "Rockchip RV110x clock controller support" -+ depends on ARM || COMPILE_TEST ++config CLK_RV1106 ++ tristate "Rockchip RV1106 clock controller support" ++ depends on CPU_RV1106 || COMPILE_TEST default y help - Build the driver for RV110x Clock Driver. - +- Build the driver for RV110x Clock Driver. ++ Build the driver for RV1106 Clock Driver. ++ ++config CLK_RV1108 ++ tristate "Rockchip RV1108 clock controller support" ++ depends on CPU_RV1108 || COMPILE_TEST ++ default y ++ help ++ Build the driver for RV1108 Clock Driver. ++ +config CLK_RV1126 + tristate "Rockchip RV1126 clock controller support" -+ depends on ARM || COMPILE_TEST ++ depends on CPU_RV1126 || COMPILE_TEST + default y + help + Build the driver for RV1126 Clock Driver. + +config CLK_RK1808 + tristate "Rockchip RK1808 clock controller support" -+ depends on ARM64 || COMPILE_TEST ++ depends on CPU_RK1808 || COMPILE_TEST + default y + help + Build the driver for RK1808 Clock Driver. -+ + config CLK_RK3036 - bool "Rockchip RK3036 clock controller support" + tristate "Rockchip RK3036 clock controller support" -+ depends on ARM || COMPILE_TEST ++ depends on CPU_RK3036 || COMPILE_TEST default y help Build the driver for RK3036 Clock Driver. @@ -108954,7 +103706,7 @@ index 47cd6c5de837..02c5df791017 100644 config CLK_RK312X - bool "Rockchip RK312x clock controller support" + tristate "Rockchip RK312x clock controller support" -+ depends on ARM || COMPILE_TEST ++ depends on CPU_RK312X || COMPILE_TEST default y help Build the driver for RK312x Clock Driver. @@ -108962,7 +103714,7 @@ index 47cd6c5de837..02c5df791017 100644 config CLK_RK3188 - bool "Rockchip RK3188 clock controller support" + tristate "Rockchip RK3188 clock controller support" -+ depends on ARM || COMPILE_TEST ++ depends on CPU_RK3188 || COMPILE_TEST default y help Build the driver for RK3188 Clock Driver. @@ -108970,7 +103722,7 @@ index 47cd6c5de837..02c5df791017 100644 config CLK_RK322X - bool "Rockchip RK322x clock controller support" + tristate "Rockchip RK322x clock controller support" -+ depends on ARM || COMPILE_TEST ++ depends on CPU_RK322X || COMPILE_TEST default y help Build the driver for RK322x Clock Driver. @@ -108979,7 +103731,7 @@ index 47cd6c5de837..02c5df791017 100644 - bool "Rockchip RK3288 clock controller support" - depends on ARM + tristate "Rockchip RK3288 clock controller support" -+ depends on ARM || COMPILE_TEST ++ depends on CPU_RK3288 || COMPILE_TEST default y help Build the driver for RK3288 Clock Driver. @@ -108987,7 +103739,7 @@ index 47cd6c5de837..02c5df791017 100644 config CLK_RK3308 - bool "Rockchip RK3308 clock controller support" + tristate "Rockchip RK3308 clock controller support" -+ depends on ARM64 || COMPILE_TEST ++ depends on CPU_RK3308 || COMPILE_TEST default y help Build the driver for RK3308 Clock Driver. @@ -108995,7 +103747,7 @@ index 47cd6c5de837..02c5df791017 100644 config CLK_RK3328 - bool "Rockchip RK3328 clock controller support" + tristate "Rockchip RK3328 clock controller support" -+ depends on ARM64 || COMPILE_TEST ++ depends on CPU_RK3328 || COMPILE_TEST default y help Build the driver for RK3328 Clock Driver. @@ -109003,56 +103755,173 @@ index 47cd6c5de837..02c5df791017 100644 config CLK_RK3368 - bool "Rockchip RK3368 clock controller support" + tristate "Rockchip RK3368 clock controller support" -+ depends on ARM64 || COMPILE_TEST ++ depends on CPU_RK3368 || COMPILE_TEST default y help Build the driver for RK3368 Clock Driver. config CLK_RK3399 tristate "Rockchip RK3399 clock controller support" -+ depends on ARM64 || COMPILE_TEST ++ depends on CPU_RK3399 || COMPILE_TEST default y help Build the driver for RK3399 Clock Driver. + ++config CLK_RK3528 ++ tristate "Rockchip RK3528 clock controller support" ++ depends on CPU_RK3528 || COMPILE_TEST ++ default y ++ help ++ Build the driver for RK3528 Clock Driver. ++ ++config CLK_RK3562 ++ tristate "Rockchip RK3562 clock controller support" ++ depends on CPU_RK3562 || COMPILE_TEST ++ default y ++ help ++ Build the driver for RK3562 Clock Driver. ++ +config CLK_RK3568 + tristate "Rockchip RK3568 clock controller support" -+ depends on ARM64 || COMPILE_TEST ++ depends on CPU_RK3568 || COMPILE_TEST + default y + help + Build the driver for RK3568 Clock Driver. + ++config CLK_RK3588 ++ tristate "Rockchip RK3588 clock controller support" ++ depends on CPU_RK3588 || COMPILE_TEST ++ default y ++ help ++ Build the driver for RK3588 Clock Driver. ++ +config ROCKCHIP_CLK_COMPENSATION + bool "Rockchip Clk Compensation" + help + Say y here to enable clk compensation(+/- 1000 ppm). ++ ++config ROCKCHIP_CLK_LINK ++ tristate "Rockchip clock link support" ++ default CLK_RK3562 || CLK_RK3588 ++ help ++ Say y here to enable clock link for Rockchip. ++ ++config ROCKCHIP_CLK_BOOST ++ bool "Rockchip Clk Boost" ++ default y if CPU_PX30 ++ help ++ Say y here to enable clk boost. ++ ++config ROCKCHIP_CLK_INV ++ bool "Rockchip Clk Inverter" ++ default y if !CPU_RV1126 && !CPU_RV1106 ++ help ++ Say y here to enable clk Inverter. ++ ++config ROCKCHIP_CLK_OUT ++ tristate "Rockchip Clk Out / Input Switch" ++ default y if !ROCKCHIP_MINI_KERNEL ++ help ++ Say y here to enable clk out / input switch. ++ ++config ROCKCHIP_CLK_PVTM ++ bool "Rockchip Clk Pvtm" ++ default y if !CPU_RV1126 && !CPU_RV1106 ++ help ++ Say y here to enable clk pvtm. ++ ++config ROCKCHIP_DDRCLK ++ bool ++ ++config ROCKCHIP_DDRCLK_SIP ++ bool "Rockchip DDR Clk SIP" ++ default y if CPU_RK3399 ++ select ROCKCHIP_DDRCLK ++ help ++ Say y here to enable ddr clk sip. ++ ++config ROCKCHIP_DDRCLK_SIP_V2 ++ bool "Rockchip DDR Clk SIP V2" ++ default y if CPU_PX30 || CPU_RK1808 || CPU_RK312X || CPU_RK322X || \ ++ CPU_RK3288 || CPU_RK3308 || CPU_RK3328 || CPU_RV1126 ++ select ROCKCHIP_DDRCLK ++ help ++ Say y here to enable ddr clk sip v2. ++ ++config ROCKCHIP_PLL_RK3066 ++ bool "Rockchip PLL Type RK3066" ++ default y if CPU_RK30XX || CPU_RK3188 || \ ++ CPU_RK3288 || CPU_RK3368 ++ help ++ Say y here to enable pll type is rk3066. ++ ++config ROCKCHIP_PLL_RK3399 ++ bool "Rockchip PLL Type RK3399" ++ default y if CPU_RK3399 || CPU_RV1108 ++ help ++ Say y here to enable pll type is rk3399. ++ ++config ROCKCHIP_PLL_RK3588 ++ bool "Rockchip PLL Type RK3588" ++ default y if CPU_RK3588 ++ help ++ Say y here to enable pll type is rk3588. ++ ++config POCKCHIP_CLK_PASS ++ bool "Rockchip Clk Passthrough" ++ depends on VIRTIO ++ default n ++ help ++ Say y here to enable passthrough clk for hypervisor ++ ++source "drivers/clk/rockchip/regmap/Kconfig" ++ endif diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile -index a99e4d9bbae1..a4c718bf1126 100644 +index a99e4d9bb..03ddb4baa 100644 --- a/drivers/clk/rockchip/Makefile +++ b/drivers/clk/rockchip/Makefile -@@ -13,10 +13,14 @@ clk-rockchip-y += clk-inverter.o +@@ -4,19 +4,27 @@ + # + + obj-$(CONFIG_COMMON_CLK_ROCKCHIP) += clk-rockchip.o ++obj-$(CONFIG_COMMON_CLK_ROCKCHIP_REGMAP) += regmap/ + + clk-rockchip-y += clk.o + clk-rockchip-y += clk-pll.o + clk-rockchip-y += clk-cpu.o + clk-rockchip-y += clk-half-divider.o +-clk-rockchip-y += clk-inverter.o clk-rockchip-y += clk-mmc-phase.o clk-rockchip-y += clk-muxgrf.o - clk-rockchip-y += clk-ddr.o -+clk-rockchip-y += clk-dclk-divider.o -+clk-rockchip-y += clk-pvtm.o +-clk-rockchip-y += clk-ddr.o ++clk-rockchip-$(CONFIG_ROCKCHIP_DDRCLK) += clk-ddr.o ++clk-rockchip-$(CONFIG_ROCKCHIP_CLK_INV) += clk-inverter.o ++clk-rockchip-$(CONFIG_ROCKCHIP_CLK_PVTM) += clk-pvtm.o clk-rockchip-$(CONFIG_RESET_CONTROLLER) += softrst.o ++obj-$(CONFIG_ROCKCHIP_CLK_LINK) += clk-link.o ++obj-$(CONFIG_ROCKCHIP_CLK_OUT) += clk-out.o ++ obj-$(CONFIG_CLK_PX30) += clk-px30.o - obj-$(CONFIG_CLK_RV110X) += clk-rv1108.o +-obj-$(CONFIG_CLK_RV110X) += clk-rv1108.o ++obj-$(CONFIG_CLK_RV1106) += clk-rv1106.o ++obj-$(CONFIG_CLK_RV1108) += clk-rv1108.o +obj-$(CONFIG_CLK_RV1126) += clk-rv1126.o +obj-$(CONFIG_CLK_RK1808) += clk-rk1808.o obj-$(CONFIG_CLK_RK3036) += clk-rk3036.o obj-$(CONFIG_CLK_RK312X) += clk-rk3128.o obj-$(CONFIG_CLK_RK3188) += clk-rk3188.o -@@ -26,3 +30,4 @@ obj-$(CONFIG_CLK_RK3308) += clk-rk3308.o +@@ -26,3 +34,7 @@ obj-$(CONFIG_CLK_RK3308) += clk-rk3308.o obj-$(CONFIG_CLK_RK3328) += clk-rk3328.o obj-$(CONFIG_CLK_RK3368) += clk-rk3368.o obj-$(CONFIG_CLK_RK3399) += clk-rk3399.o ++obj-$(CONFIG_CLK_RK3528) += clk-rk3528.o ++obj-$(CONFIG_CLK_RK3562) += clk-rk3562.o +obj-$(CONFIG_CLK_RK3568) += clk-rk3568.o ++obj-$(CONFIG_CLK_RK3588) += clk-rk3588.o diff --git a/drivers/clk/rockchip/clk-cpu.c b/drivers/clk/rockchip/clk-cpu.c -index 0dc478a19451..55416812bed2 100644 +index 0dc478a19..365d4ec30 100644 --- a/drivers/clk/rockchip/clk-cpu.c +++ b/drivers/clk/rockchip/clk-cpu.c @@ -51,6 +51,7 @@ @@ -109077,7 +103946,50 @@ index 0dc478a19451..55416812bed2 100644 return parent_rate / (clksel0 + 1); } -@@ -124,6 +125,7 @@ static int rockchip_cpuclk_pre_rate_change(struct rockchip_cpuclk *cpuclk, +@@ -117,6 +118,42 @@ static void rockchip_cpuclk_set_dividers(struct rockchip_cpuclk *cpuclk, + } + } + ++static void rockchip_cpuclk_set_pre_muxs(struct rockchip_cpuclk *cpuclk, ++ const struct rockchip_cpuclk_rate_table *rate) ++{ ++ int i; ++ ++ /* alternate parent is active now. set the pre_muxs */ ++ for (i = 0; i < ARRAY_SIZE(rate->pre_muxs); i++) { ++ const struct rockchip_cpuclk_clksel *clksel = &rate->pre_muxs[i]; ++ ++ if (!clksel->reg) ++ break; ++ ++ pr_debug("%s: setting reg 0x%x to 0x%x\n", ++ __func__, clksel->reg, clksel->val); ++ writel(clksel->val, cpuclk->reg_base + clksel->reg); ++ } ++} ++ ++static void rockchip_cpuclk_set_post_muxs(struct rockchip_cpuclk *cpuclk, ++ const struct rockchip_cpuclk_rate_table *rate) ++{ ++ int i; ++ ++ /* alternate parent is active now. set the muxs */ ++ for (i = 0; i < ARRAY_SIZE(rate->post_muxs); i++) { ++ const struct rockchip_cpuclk_clksel *clksel = &rate->post_muxs[i]; ++ ++ if (!clksel->reg) ++ break; ++ ++ pr_debug("%s: setting reg 0x%x to 0x%x\n", ++ __func__, clksel->reg, clksel->val); ++ writel(clksel->val, cpuclk->reg_base + clksel->reg); ++ } ++} ++ + static int rockchip_cpuclk_pre_rate_change(struct rockchip_cpuclk *cpuclk, + struct clk_notifier_data *ndata) + { +@@ -124,6 +161,7 @@ static int rockchip_cpuclk_pre_rate_change(struct rockchip_cpuclk *cpuclk, const struct rockchip_cpuclk_rate_table *rate; unsigned long alt_prate, alt_div; unsigned long flags; @@ -109085,16 +103997,17 @@ index 0dc478a19451..55416812bed2 100644 /* check validity of the new rate */ rate = rockchip_get_cpuclk_settings(cpuclk, ndata->new_rate); -@@ -133,6 +135,8 @@ static int rockchip_cpuclk_pre_rate_change(struct rockchip_cpuclk *cpuclk, +@@ -133,6 +171,9 @@ static int rockchip_cpuclk_pre_rate_change(struct rockchip_cpuclk *cpuclk, return -EINVAL; } -+ rockchip_boost_enable_recovery_sw_low(cpuclk->pll_hw); ++ if (IS_ENABLED(CONFIG_ROCKCHIP_CLK_BOOST)) ++ rockchip_boost_enable_recovery_sw_low(cpuclk->pll_hw); + alt_prate = clk_get_rate(cpuclk->alt_parent); spin_lock_irqsave(cpuclk->lock, flags); -@@ -146,10 +150,10 @@ static int rockchip_cpuclk_pre_rate_change(struct rockchip_cpuclk *cpuclk, +@@ -146,10 +187,10 @@ static int rockchip_cpuclk_pre_rate_change(struct rockchip_cpuclk *cpuclk, if (alt_prate > ndata->old_rate) { /* calculate dividers */ alt_div = DIV_ROUND_UP(alt_prate, ndata->old_rate) - 1; @@ -109108,41 +104021,45 @@ index 0dc478a19451..55416812bed2 100644 } /* -@@ -162,20 +166,21 @@ static int rockchip_cpuclk_pre_rate_change(struct rockchip_cpuclk *cpuclk, +@@ -162,19 +203,29 @@ static int rockchip_cpuclk_pre_rate_change(struct rockchip_cpuclk *cpuclk, pr_debug("%s: setting div %lu as alt-rate %lu > old-rate %lu\n", __func__, alt_div, alt_prate, ndata->old_rate); - writel(HIWORD_UPDATE(alt_div, reg_data->div_core_mask, - reg_data->div_core_shift) | - HIWORD_UPDATE(reg_data->mux_core_alt, -- reg_data->mux_core_mask, -- reg_data->mux_core_shift), -- cpuclk->reg_base + reg_data->core_reg); -- } else { -- /* select alternate parent */ -- writel(HIWORD_UPDATE(reg_data->mux_core_alt, -- reg_data->mux_core_mask, -- reg_data->mux_core_shift), -- cpuclk->reg_base + reg_data->core_reg); + for (i = 0; i < reg_data->num_cores; i++) { + writel(HIWORD_UPDATE(alt_div, reg_data->div_core_mask[i], + reg_data->div_core_shift[i]), + cpuclk->reg_base + reg_data->core_reg[i]); + } - } - -+ rockchip_boost_add_core_div(cpuclk->pll_hw, alt_prate); ++ } + -+ /* select alternate parent */ -+ writel(HIWORD_UPDATE(reg_data->mux_core_alt, -+ reg_data->mux_core_mask, -+ reg_data->mux_core_shift), -+ cpuclk->reg_base + reg_data->core_reg[0]); ++ if (IS_ENABLED(CONFIG_ROCKCHIP_CLK_BOOST)) ++ rockchip_boost_add_core_div(cpuclk->pll_hw, alt_prate); ++ ++ rockchip_cpuclk_set_pre_muxs(cpuclk, rate); + ++ /* select alternate parent */ ++ if (reg_data->mux_core_reg) ++ writel(HIWORD_UPDATE(reg_data->mux_core_alt, + reg_data->mux_core_mask, + reg_data->mux_core_shift), +- cpuclk->reg_base + reg_data->core_reg); +- } else { +- /* select alternate parent */ ++ cpuclk->reg_base + reg_data->mux_core_reg); ++ else + writel(HIWORD_UPDATE(reg_data->mux_core_alt, + reg_data->mux_core_mask, + reg_data->mux_core_shift), +- cpuclk->reg_base + reg_data->core_reg); +- } ++ cpuclk->reg_base + reg_data->core_reg[0]); + spin_unlock_irqrestore(cpuclk->lock, flags); return 0; - } -@@ -186,6 +191,7 @@ static int rockchip_cpuclk_post_rate_change(struct rockchip_cpuclk *cpuclk, +@@ -186,6 +237,7 @@ static int rockchip_cpuclk_post_rate_change(struct rockchip_cpuclk *cpuclk, const struct rockchip_cpuclk_reg_data *reg_data = cpuclk->reg_data; const struct rockchip_cpuclk_rate_table *rate; unsigned long flags; @@ -109150,7 +104067,7 @@ index 0dc478a19451..55416812bed2 100644 rate = rockchip_get_cpuclk_settings(cpuclk, ndata->new_rate); if (!rate) { -@@ -206,16 +212,23 @@ static int rockchip_cpuclk_post_rate_change(struct rockchip_cpuclk *cpuclk, +@@ -206,16 +258,32 @@ static int rockchip_cpuclk_post_rate_change(struct rockchip_cpuclk *cpuclk, * primary parent by the extra dividers that were needed for the alt. */ @@ -109160,10 +104077,18 @@ index 0dc478a19451..55416812bed2 100644 - reg_data->mux_core_mask, - reg_data->mux_core_shift), - cpuclk->reg_base + reg_data->core_reg); -+ writel(HIWORD_UPDATE(reg_data->mux_core_main, -+ reg_data->mux_core_mask, -+ reg_data->mux_core_shift), -+ cpuclk->reg_base + reg_data->core_reg[0]); ++ if (reg_data->mux_core_reg) ++ writel(HIWORD_UPDATE(reg_data->mux_core_main, ++ reg_data->mux_core_mask, ++ reg_data->mux_core_shift), ++ cpuclk->reg_base + reg_data->mux_core_reg); ++ else ++ writel(HIWORD_UPDATE(reg_data->mux_core_main, ++ reg_data->mux_core_mask, ++ reg_data->mux_core_shift), ++ cpuclk->reg_base + reg_data->core_reg[0]); ++ ++ rockchip_cpuclk_set_post_muxs(cpuclk, rate); + + /* remove dividers */ + for (i = 0; i < reg_data->num_cores; i++) { @@ -109175,12 +104100,13 @@ index 0dc478a19451..55416812bed2 100644 if (ndata->old_rate > ndata->new_rate) rockchip_cpuclk_set_dividers(cpuclk, rate); -+ rockchip_boost_disable_recovery_sw(cpuclk->pll_hw); ++ if (IS_ENABLED(CONFIG_ROCKCHIP_CLK_BOOST)) ++ rockchip_boost_disable_recovery_sw(cpuclk->pll_hw); + spin_unlock_irqrestore(cpuclk->lock, flags); return 0; } -@@ -244,14 +257,16 @@ static int rockchip_cpuclk_notifier_cb(struct notifier_block *nb, +@@ -244,14 +312,16 @@ static int rockchip_cpuclk_notifier_cb(struct notifier_block *nb, } struct clk *rockchip_clk_register_cpuclk(const char *name, @@ -109199,7 +104125,7 @@ index 0dc478a19451..55416812bed2 100644 int ret; if (num_parents < 2) { -@@ -259,12 +274,18 @@ struct clk *rockchip_clk_register_cpuclk(const char *name, +@@ -259,12 +329,18 @@ struct clk *rockchip_clk_register_cpuclk(const char *name, return ERR_PTR(-EINVAL); } @@ -109219,11 +104145,11 @@ index 0dc478a19451..55416812bed2 100644 init.num_parents = 1; init.ops = &rockchip_cpuclk_ops; -@@ -281,8 +302,19 @@ struct clk *rockchip_clk_register_cpuclk(const char *name, +@@ -281,8 +357,19 @@ struct clk *rockchip_clk_register_cpuclk(const char *name, cpuclk->reg_data = reg_data; cpuclk->clk_nb.notifier_call = rockchip_cpuclk_notifier_cb; cpuclk->hw.init = &init; -+ if (reg_data->pll_name) { ++ if (IS_ENABLED(CONFIG_ROCKCHIP_CLK_BOOST) && reg_data->pll_name) { + pll_clk = clk_get_parent(parent); + if (!pll_clk) { + pr_err("%s: could not lookup pll clock: (%s)\n", @@ -109240,7 +104166,7 @@ index 0dc478a19451..55416812bed2 100644 if (!cpuclk->alt_parent) { pr_err("%s: could not lookup alternate parent: (%d)\n", __func__, reg_data->mux_core_alt); -@@ -297,11 +329,11 @@ struct clk *rockchip_clk_register_cpuclk(const char *name, +@@ -297,11 +384,11 @@ struct clk *rockchip_clk_register_cpuclk(const char *name, goto free_cpuclk; } @@ -109254,9 +104180,178 @@ index 0dc478a19451..55416812bed2 100644 ret = -EINVAL; goto free_alt_parent; } +@@ -343,3 +430,168 @@ struct clk *rockchip_clk_register_cpuclk(const char *name, + kfree(cpuclk); + return ERR_PTR(ret); + } ++ ++static int rockchip_cpuclk_v2_pre_rate_change(struct rockchip_cpuclk *cpuclk, ++ struct clk_notifier_data *ndata) ++{ ++ unsigned long new_rate = roundup(ndata->new_rate, 1000); ++ const struct rockchip_cpuclk_rate_table *rate; ++ unsigned long flags; ++ ++ rate = rockchip_get_cpuclk_settings(cpuclk, new_rate); ++ if (!rate) { ++ pr_err("%s: Invalid rate : %lu for cpuclk\n", ++ __func__, new_rate); ++ return -EINVAL; ++ } ++ ++ if (new_rate > ndata->old_rate) { ++ spin_lock_irqsave(cpuclk->lock, flags); ++ rockchip_cpuclk_set_dividers(cpuclk, rate); ++ spin_unlock_irqrestore(cpuclk->lock, flags); ++ } ++ ++ return 0; ++} ++ ++static int rockchip_cpuclk_v2_post_rate_change(struct rockchip_cpuclk *cpuclk, ++ struct clk_notifier_data *ndata) ++{ ++ unsigned long new_rate = roundup(ndata->new_rate, 1000); ++ const struct rockchip_cpuclk_rate_table *rate; ++ unsigned long flags; ++ ++ rate = rockchip_get_cpuclk_settings(cpuclk, new_rate); ++ if (!rate) { ++ pr_err("%s: Invalid rate : %lu for cpuclk\n", ++ __func__, new_rate); ++ return -EINVAL; ++ } ++ ++ if (new_rate < ndata->old_rate) { ++ spin_lock_irqsave(cpuclk->lock, flags); ++ rockchip_cpuclk_set_dividers(cpuclk, rate); ++ spin_unlock_irqrestore(cpuclk->lock, flags); ++ } ++ ++ return 0; ++} ++ ++static int rockchip_cpuclk_v2_notifier_cb(struct notifier_block *nb, ++ unsigned long event, void *data) ++{ ++ struct clk_notifier_data *ndata = data; ++ struct rockchip_cpuclk *cpuclk = to_rockchip_cpuclk_nb(nb); ++ int ret = 0; ++ ++ pr_debug("%s: event %lu, old_rate %lu, new_rate: %lu\n", ++ __func__, event, ndata->old_rate, ndata->new_rate); ++ if (event == PRE_RATE_CHANGE) ++ ret = rockchip_cpuclk_v2_pre_rate_change(cpuclk, ndata); ++ else if (event == POST_RATE_CHANGE) ++ ret = rockchip_cpuclk_v2_post_rate_change(cpuclk, ndata); ++ ++ return notifier_from_errno(ret); ++} ++ ++struct clk *rockchip_clk_register_cpuclk_v2(const char *name, ++ const char *const *parent_names, ++ u8 num_parents, void __iomem *base, ++ int muxdiv_offset, u8 mux_shift, ++ u8 mux_width, u8 mux_flags, ++ int div_offset, u8 div_shift, ++ u8 div_width, u8 div_flags, ++ unsigned long flags, spinlock_t *lock, ++ const struct rockchip_cpuclk_rate_table *rates, ++ int nrates) ++{ ++ struct rockchip_cpuclk *cpuclk; ++ struct clk_hw *hw; ++ struct clk_mux *mux = NULL; ++ struct clk_divider *div = NULL; ++ const struct clk_ops *mux_ops = NULL, *div_ops = NULL; ++ int ret; ++ ++ if (num_parents > 1) { ++ mux = kzalloc(sizeof(*mux), GFP_KERNEL); ++ if (!mux) ++ return ERR_PTR(-ENOMEM); ++ ++ mux->reg = base + muxdiv_offset; ++ mux->shift = mux_shift; ++ mux->mask = BIT(mux_width) - 1; ++ mux->flags = mux_flags; ++ mux->lock = lock; ++ mux_ops = (mux_flags & CLK_MUX_READ_ONLY) ? &clk_mux_ro_ops ++ : &clk_mux_ops; ++ } ++ ++ if (div_width > 0) { ++ div = kzalloc(sizeof(*div), GFP_KERNEL); ++ if (!div) { ++ ret = -ENOMEM; ++ goto free_mux; ++ } ++ ++ div->flags = div_flags; ++ if (div_offset) ++ div->reg = base + div_offset; ++ else ++ div->reg = base + muxdiv_offset; ++ div->shift = div_shift; ++ div->width = div_width; ++ div->lock = lock; ++ div_ops = (div_flags & CLK_DIVIDER_READ_ONLY) ++ ? &clk_divider_ro_ops ++ : &clk_divider_ops; ++ } ++ ++ hw = clk_hw_register_composite(NULL, name, parent_names, num_parents, ++ mux ? &mux->hw : NULL, mux_ops, ++ div ? &div->hw : NULL, div_ops, ++ NULL, NULL, flags); ++ if (IS_ERR(hw)) { ++ ret = PTR_ERR(hw); ++ goto free_div; ++ } ++ ++ cpuclk = kzalloc(sizeof(*cpuclk), GFP_KERNEL); ++ if (!cpuclk) { ++ ret = -ENOMEM; ++ goto unregister_clk; ++ } ++ ++ cpuclk->reg_base = base; ++ cpuclk->lock = lock; ++ cpuclk->clk_nb.notifier_call = rockchip_cpuclk_v2_notifier_cb; ++ ret = clk_notifier_register(hw->clk, &cpuclk->clk_nb); ++ if (ret) { ++ pr_err("%s: failed to register clock notifier for %s\n", ++ __func__, name); ++ goto free_cpuclk; ++ } ++ ++ if (nrates > 0) { ++ cpuclk->rate_count = nrates; ++ cpuclk->rate_table = kmemdup(rates, ++ sizeof(*rates) * nrates, ++ GFP_KERNEL); ++ if (!cpuclk->rate_table) { ++ ret = -ENOMEM; ++ goto free_cpuclk; ++ } ++ } ++ ++ return hw->clk; ++ ++free_cpuclk: ++ kfree(cpuclk); ++unregister_clk: ++ clk_hw_unregister_composite(hw); ++free_div: ++ kfree(div); ++free_mux: ++ kfree(mux); ++ ++ return ERR_PTR(ret); ++} diff --git a/drivers/clk/rockchip/clk-dclk-divider.c b/drivers/clk/rockchip/clk-dclk-divider.c new file mode 100755 -index 000000000000..77c35b42207e +index 000000000..88cf7ab82 --- /dev/null +++ b/drivers/clk/rockchip/clk-dclk-divider.c @@ -0,0 +1,168 @@ @@ -109280,7 +104375,7 @@ index 000000000000..77c35b42207e + struct clk_divider *divider = to_clk_divider(hw); + unsigned int val; + -+ val = readl(divider->reg) >> divider->shift; ++ val = clk_readl(divider->reg) >> divider->shift; + val &= div_mask(divider->width); + + return DIV_ROUND_UP_ULL(((u64)parent_rate), val + 1); @@ -109319,11 +104414,11 @@ index 000000000000..77c35b42207e + if (divider->flags & CLK_DIVIDER_HIWORD_MASK) { + val = div_mask(divider->width) << (divider->shift + 16); + } else { -+ val = readl(divider->reg); ++ val = clk_readl(divider->reg); + val &= ~(div_mask(divider->width) << divider->shift); + } + val |= value << divider->shift; -+ writel(val, divider->reg); ++ clk_writel(val, divider->reg); + + if (divider->lock) + spin_unlock_irqrestore(divider->lock, flags); @@ -109429,10 +104524,10 @@ index 000000000000..77c35b42207e + return ERR_PTR(-ENOMEM); +} diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c -index 86718c54e56b..3c8bcbee2048 100644 +index 86718c54e..46df75f1a 100644 --- a/drivers/clk/rockchip/clk-ddr.c +++ b/drivers/clk/rockchip/clk-ddr.c -@@ -8,10 +8,20 @@ +@@ -8,8 +8,14 @@ #include #include #include @@ -109440,20 +104535,14 @@ index 86718c54e56b..3c8bcbee2048 100644 +#include #include #include -+#include -+#include +#ifdef CONFIG_ARM +#include +#endif + #include "clk.h" -+#define MHZ (1000000) -+ struct rockchip_ddrclk { - struct clk_hw hw; - void __iomem *reg_base; -@@ -21,25 +31,47 @@ struct rockchip_ddrclk { +@@ -21,25 +27,47 @@ struct rockchip_ddrclk { int div_shift; int div_width; int ddr_flag; @@ -109507,61 +104596,10 @@ index 86718c54e56b..3c8bcbee2048 100644 } static unsigned long -@@ -87,18 +119,134 @@ static const struct clk_ops rockchip_ddrclk_sip_ops = { +@@ -87,18 +115,83 @@ static const struct clk_ops rockchip_ddrclk_sip_ops = { .get_parent = rockchip_ddrclk_get_parent, }; -+static u32 ddr_clk_cached; -+ -+static int rockchip_ddrclk_scpi_set_rate(struct clk_hw *hw, unsigned long drate, -+ unsigned long prate) -+{ -+ u32 ret; -+ u32 lcdc_type = 0; -+ struct share_params_ddrclk *p; -+ -+ p = (struct share_params_ddrclk *)ddr_data.params; -+ if (p) -+ lcdc_type = p->lcdc_type; -+ -+ ret = scpi_ddr_set_clk_rate(drate / MHZ, lcdc_type); -+ if (ret) { -+ ddr_clk_cached = ret; -+ ret = 0; -+ } else { -+ ddr_clk_cached = 0; -+ ret = -1; -+ } -+ -+ return ret; -+} -+ -+static unsigned long rockchip_ddrclk_scpi_recalc_rate(struct clk_hw *hw, -+ unsigned long parent_rate) -+{ -+ if (ddr_clk_cached) -+ return (MHZ * ddr_clk_cached); -+ else -+ return (MHZ * scpi_ddr_get_clk_rate()); -+} -+ -+static long rockchip_ddrclk_scpi_round_rate(struct clk_hw *hw, -+ unsigned long rate, -+ unsigned long *prate) -+{ -+ rate = rate / MHZ; -+ rate = (rate / 12) * 12; -+ -+ return (rate * MHZ); -+} -+ -+static const struct clk_ops rockchip_ddrclk_scpi_ops = { -+ .recalc_rate = rockchip_ddrclk_scpi_recalc_rate, -+ .set_rate = rockchip_ddrclk_scpi_set_rate, -+ .round_rate = rockchip_ddrclk_scpi_round_rate, -+ .get_parent = rockchip_ddrclk_get_parent, -+}; -+ +static int rockchip_ddrclk_sip_set_rate_v2(struct clk_hw *hw, + unsigned long drate, + unsigned long prate) @@ -109644,20 +104682,24 @@ index 86718c54e56b..3c8bcbee2048 100644 ddrclk = kzalloc(sizeof(*ddrclk), GFP_KERNEL); if (!ddrclk) return ERR_PTR(-ENOMEM); -@@ -114,6 +262,12 @@ struct clk *rockchip_clk_register_ddrclk(const char *name, int flags, +@@ -111,9 +204,16 @@ struct clk *rockchip_clk_register_ddrclk(const char *name, int flags, + init.flags |= CLK_SET_RATE_NO_REPARENT; + + switch (ddr_flag) { ++#ifdef CONFIG_ROCKCHIP_DDRCLK_SIP case ROCKCHIP_DDRCLK_SIP: init.ops = &rockchip_ddrclk_sip_ops; break; -+ case ROCKCHIP_DDRCLK_SCPI: -+ init.ops = &rockchip_ddrclk_scpi_ops; -+ break; ++#endif ++#ifdef CONFIG_ROCKCHIP_DDRCLK_SIP_V2 + case ROCKCHIP_DDRCLK_SIP_V2: + init.ops = &rockchip_ddrclk_sip_ops_v2; + break; ++#endif default: pr_err("%s: unsupported ddrclk type %d\n", __func__, ddr_flag); kfree(ddrclk); -@@ -121,7 +275,6 @@ struct clk *rockchip_clk_register_ddrclk(const char *name, int flags, +@@ -121,7 +221,6 @@ struct clk *rockchip_clk_register_ddrclk(const char *name, int flags, } ddrclk->reg_base = reg_base; @@ -109666,7 +104708,7 @@ index 86718c54e56b..3c8bcbee2048 100644 ddrclk->mux_offset = mux_offset; ddrclk->mux_shift = mux_shift; diff --git a/drivers/clk/rockchip/clk-half-divider.c b/drivers/clk/rockchip/clk-half-divider.c -index ccd5c270c213..b978af08d84f 100644 +index ccd5c270c..b978af08d 100644 --- a/drivers/clk/rockchip/clk-half-divider.c +++ b/drivers/clk/rockchip/clk-half-divider.c @@ -14,9 +14,9 @@ static bool _is_best_half_div(unsigned long rate, unsigned long now, @@ -109766,8 +104808,368 @@ index ccd5c270c213..b978af08d84f 100644 div->shift = div_shift; div->width = div_width; div->lock = lock; +diff --git a/drivers/clk/rockchip/clk-link.c b/drivers/clk/rockchip/clk-link.c +new file mode 100644 +index 000000000..78ff9b53c +--- /dev/null ++++ b/drivers/clk/rockchip/clk-link.c +@@ -0,0 +1,244 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (c) 2021 Rockchip Electronics Co., Ltd ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++struct rockchip_link_info { ++ u32 shift; ++ const char *name; ++ const char *pname; ++}; ++ ++struct rockchip_link { ++ int num; ++ const struct rockchip_link_info *info; ++}; ++ ++struct rockchip_link_clk { ++ void __iomem *base; ++ struct clk_gate *gate; ++ spinlock_t lock; ++ u32 shift; ++ u32 flag; ++ const char *name; ++ const char *pname; ++ const char *link_name; ++ const struct rockchip_link *link; ++}; ++ ++#define GFLAGS (CLK_GATE_HIWORD_MASK | CLK_GATE_SET_TO_DISABLE) ++ ++#define GATE_LINK(_name, _pname, _shift) \ ++{ \ ++ .name = _name, \ ++ .pname = _pname, \ ++ .shift = (_shift), \ ++} ++ ++static int register_clocks(struct rockchip_link_clk *priv, struct device *dev) ++{ ++ struct clk_gate *gate; ++ struct clk_init_data init = {}; ++ struct clk *clk; ++ ++ gate = devm_kzalloc(dev, sizeof(struct clk_gate), GFP_KERNEL); ++ if (!gate) ++ return -ENOMEM; ++ ++ init.name = priv->name; ++ init.ops = &clk_gate_ops; ++ init.flags |= CLK_SET_RATE_PARENT; ++ init.parent_names = &priv->pname; ++ init.num_parents = 1; ++ ++ /* struct clk_gate assignments */ ++ gate->reg = priv->base; ++ gate->bit_idx = priv->shift; ++ gate->flags = GFLAGS; ++ gate->lock = &priv->lock; ++ gate->hw.init = &init; ++ ++ clk = devm_clk_register(dev, &gate->hw); ++ if (IS_ERR(clk)) ++ return -EINVAL; ++ ++ return of_clk_add_provider(dev->of_node, of_clk_src_simple_get, clk); ++} ++ ++static const struct rockchip_link_info rk3562_clk_gate_link_info[] = { ++ GATE_LINK("aclk_rga_jdec", "aclk_rga_pre", 3), ++ GATE_LINK("aclk_vdpu", "aclk_vdpu_pre", 5), ++ GATE_LINK("aclk_vepu", "aclk_vepu_pre", 3), ++ GATE_LINK("aclk_vi_isp", "aclk_vi", 3), ++ GATE_LINK("aclk_vo", "aclk_vo_pre", 3), ++ GATE_LINK("hclk_vepu", "hclk_vepu_pre", 4), ++}; ++ ++static const struct rockchip_link rk3562_clk_gate_link = { ++ .num = ARRAY_SIZE(rk3562_clk_gate_link_info), ++ .info = rk3562_clk_gate_link_info, ++}; ++ ++static const struct rockchip_link_info rk3588_clk_gate_link_info[] = { ++ GATE_LINK("aclk_isp1_pre", "aclk_isp1_root", 6), ++ GATE_LINK("hclk_isp1_pre", "hclk_isp1_root", 8), ++ GATE_LINK("hclk_nvm", "hclk_nvm_root", 2), ++ GATE_LINK("aclk_usb", "aclk_usb_root", 2), ++ GATE_LINK("hclk_usb", "hclk_usb_root", 3), ++ GATE_LINK("aclk_jpeg_decoder_pre", "aclk_jpeg_decoder_root", 7), ++ GATE_LINK("aclk_vdpu_low_pre", "aclk_vdpu_low_root", 5), ++ GATE_LINK("aclk_rkvenc1_pre", "aclk_rkvenc1_root", 3), ++ GATE_LINK("hclk_rkvenc1_pre", "hclk_rkvenc1_root", 2), ++ GATE_LINK("hclk_rkvdec0_pre", "hclk_rkvdec0_root", 5), ++ GATE_LINK("aclk_rkvdec0_pre", "aclk_rkvdec0_root", 6), ++ GATE_LINK("hclk_rkvdec1_pre", "hclk_rkvdec1_root", 4), ++ GATE_LINK("aclk_rkvdec1_pre", "aclk_rkvdec1_root", 5), ++ GATE_LINK("aclk_hdcp0_pre", "aclk_vo0_root", 9), ++ GATE_LINK("hclk_vo0", "hclk_vo0_root", 5), ++ GATE_LINK("aclk_hdcp1_pre", "aclk_hdcp1_root", 6), ++ GATE_LINK("hclk_vo1", "hclk_vo1_root", 9), ++ GATE_LINK("aclk_av1_pre", "aclk_av1_root", 1), ++ GATE_LINK("pclk_av1_pre", "pclk_av1_root", 4), ++ GATE_LINK("hclk_sdio_pre", "hclk_sdio_root", 1), ++ GATE_LINK("pclk_vo0_grf", "pclk_vo0_root", 10), ++ GATE_LINK("pclk_vo1_grf", "pclk_vo1_root", 12), ++}; ++ ++static const struct rockchip_link rk3588_clk_gate_link = { ++ .num = ARRAY_SIZE(rk3588_clk_gate_link_info), ++ .info = rk3588_clk_gate_link_info, ++}; ++ ++static const struct of_device_id rockchip_clk_link_of_match[] = { ++ { ++ .compatible = "rockchip,rk3562-clock-gate-link", ++ .data = (void *)&rk3562_clk_gate_link, ++ }, ++ { ++ .compatible = "rockchip,rk3588-clock-gate-link", ++ .data = (void *)&rk3588_clk_gate_link, ++ }, ++ {} ++}; ++MODULE_DEVICE_TABLE(of, rockchip_clk_link_of_match); ++ ++static const struct rockchip_link_info * ++rockchip_get_link_infos(const struct rockchip_link *link, const char *name) ++{ ++ const struct rockchip_link_info *info = link->info; ++ int i = 0; ++ ++ for (i = 0; i < link->num; i++) { ++ if (strcmp(info->name, name) == 0) ++ break; ++ info++; ++ } ++ return info; ++} ++ ++static int rockchip_clk_link_probe(struct platform_device *pdev) ++{ ++ struct rockchip_link_clk *priv; ++ struct device_node *node = pdev->dev.of_node; ++ const struct of_device_id *match; ++ const char *clk_name; ++ const struct rockchip_link_info *link_info; ++ int ret; ++ ++ match = of_match_node(rockchip_clk_link_of_match, node); ++ if (!match) ++ return -ENXIO; ++ ++ priv = devm_kzalloc(&pdev->dev, sizeof(struct rockchip_link_clk), ++ GFP_KERNEL); ++ if (!priv) ++ return -ENOMEM; ++ ++ priv->link = match->data; ++ ++ spin_lock_init(&priv->lock); ++ platform_set_drvdata(pdev, priv); ++ ++ priv->base = of_iomap(node, 0); ++ if (IS_ERR(priv->base)) ++ return PTR_ERR(priv->base); ++ ++ if (of_property_read_string(node, "clock-output-names", &clk_name)) ++ priv->name = node->name; ++ else ++ priv->name = clk_name; ++ ++ link_info = rockchip_get_link_infos(priv->link, priv->name); ++ priv->shift = link_info->shift; ++ priv->pname = link_info->pname; ++ ++ pm_runtime_enable(&pdev->dev); ++ ret = pm_clk_create(&pdev->dev); ++ if (ret) ++ goto disable_pm_runtime; ++ ++ ret = pm_clk_add(&pdev->dev, "link"); ++ ++ if (ret) ++ goto destroy_pm_clk; ++ ++ ret = register_clocks(priv, &pdev->dev); ++ if (ret) ++ goto destroy_pm_clk; ++ ++ return 0; ++ ++destroy_pm_clk: ++ pm_clk_destroy(&pdev->dev); ++disable_pm_runtime: ++ pm_runtime_disable(&pdev->dev); ++ ++ return ret; ++} ++ ++static int rockchip_clk_link_remove(struct platform_device *pdev) ++{ ++ pm_clk_destroy(&pdev->dev); ++ pm_runtime_disable(&pdev->dev); ++ ++ return 0; ++} ++ ++static const struct dev_pm_ops rockchip_clk_link_pm_ops = { ++ SET_RUNTIME_PM_OPS(pm_clk_suspend, pm_clk_resume, NULL) ++}; ++ ++static struct platform_driver rockchip_clk_link_driver = { ++ .driver = { ++ .name = "clock-link", ++ .of_match_table = of_match_ptr(rockchip_clk_link_of_match), ++ .pm = &rockchip_clk_link_pm_ops, ++ }, ++ .probe = rockchip_clk_link_probe, ++ .remove = rockchip_clk_link_remove, ++}; ++ ++static int __init rockchip_clk_link_drv_register(void) ++{ ++ return platform_driver_register(&rockchip_clk_link_driver); ++} ++postcore_initcall_sync(rockchip_clk_link_drv_register); ++ ++static void __exit rockchip_clk_link_drv_unregister(void) ++{ ++ platform_driver_unregister(&rockchip_clk_link_driver); ++} ++module_exit(rockchip_clk_link_drv_unregister); ++ ++MODULE_AUTHOR("Elaine Zhang "); ++MODULE_DESCRIPTION("Clock driver for Niu Dependencies"); ++MODULE_LICENSE("GPL"); +diff --git a/drivers/clk/rockchip/clk-out.c b/drivers/clk/rockchip/clk-out.c +new file mode 100644 +index 000000000..97177a462 +--- /dev/null ++++ b/drivers/clk/rockchip/clk-out.c +@@ -0,0 +1,104 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later ++/* ++ * Copyright (c) 2023 Rockchip Electronics Co., Ltd ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static DEFINE_SPINLOCK(clk_out_lock); ++ ++static int rockchip_clk_out_probe(struct platform_device *pdev) ++{ ++ struct device *dev = &pdev->dev; ++ struct device_node *node = pdev->dev.of_node; ++ struct clk_hw *hw; ++ struct resource *res; ++ const char *clk_name = node->name; ++ const char *parent_name; ++ void __iomem *reg; ++ u32 shift = 0; ++ u8 clk_gate_flags = CLK_GATE_HIWORD_MASK; ++ unsigned long flags = CLK_SET_RATE_PARENT; ++ int ret; ++ ++ ret = device_property_read_string(dev, "clock-output-names", &clk_name); ++ if (ret) ++ return ret; ++ ++ ret = device_property_read_u32(dev, "rockchip,bit-shift", &shift); ++ if (ret) ++ return ret; ++ ++ if (device_property_read_bool(dev, "rockchip,bit-set-to-disable")) ++ clk_gate_flags |= CLK_GATE_SET_TO_DISABLE; ++ ++ if (device_property_read_bool(dev, "rockchip,clk-ignore-unused")) ++ flags |= CLK_IGNORE_UNUSED; ++ ++ ret = of_clk_parent_fill(node, &parent_name, 1); ++ if (ret != 1) ++ return -EINVAL; ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ if (!res) ++ return -ENOMEM; ++ ++ reg = devm_ioremap(dev, res->start, resource_size(res)); ++ if (!reg) ++ return -ENOMEM; ++ ++ pm_runtime_enable(dev); ++ ++ ++ hw = clk_hw_register_gate(dev, clk_name, parent_name, flags, ++ reg, shift, clk_gate_flags, &clk_out_lock); ++ if (IS_ERR(hw)) { ++ ret = -EINVAL; ++ goto err_disable_pm_runtime; ++ } ++ ++ of_clk_add_hw_provider(node, of_clk_hw_simple_get, hw); ++ ++ return 0; ++ ++err_disable_pm_runtime: ++ pm_runtime_disable(dev); ++ ++ return ret; ++} ++ ++static int rockchip_clk_out_remove(struct platform_device *pdev) ++{ ++ struct device_node *node = pdev->dev.of_node; ++ ++ of_clk_del_provider(node); ++ pm_runtime_disable(&pdev->dev); ++ ++ return 0; ++} ++ ++static const struct of_device_id rockchip_clk_out_match[] = { ++ { .compatible = "rockchip,clk-out", }, ++ {}, ++}; ++ ++static struct platform_driver rockchip_clk_out_driver = { ++ .driver = { ++ .name = "rockchip-clk-out", ++ .of_match_table = rockchip_clk_out_match, ++ }, ++ .probe = rockchip_clk_out_probe, ++ .remove = rockchip_clk_out_remove, ++}; ++ ++module_platform_driver(rockchip_clk_out_driver); ++ ++MODULE_DESCRIPTION("Rockchip Clock Input-Output-Switch"); ++MODULE_AUTHOR("Sugar Zhang "); ++MODULE_LICENSE("GPL"); ++MODULE_DEVICE_TABLE(of, rockchip_clk_out_match); diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c -index d0bd513ff3c3..c7e28d95f8a0 100644 +index d0bd513ff..89ecdd0f7 100644 --- a/drivers/clk/rockchip/clk-pll.c +++ b/drivers/clk/rockchip/clk-pll.c @@ -15,6 +15,9 @@ @@ -109780,7 +105182,7 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 #include "clk.h" #define PLL_MODE_MASK 0x3 -@@ -38,15 +41,291 @@ struct rockchip_clk_pll { +@@ -38,15 +41,400 @@ struct rockchip_clk_pll { u8 flags; const struct rockchip_pll_rate_table *rate_table; unsigned int rate_count; @@ -109790,12 +105192,14 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 struct rockchip_clk_provider *ctx; + ++#ifdef CONFIG_ROCKCHIP_CLK_BOOST + bool boost_enabled; + u32 boost_backup_pll_usage; + unsigned long boost_backup_pll_rate; + unsigned long boost_low_rate; + unsigned long boost_high_rate; + struct regmap *boost; ++#endif +#ifdef CONFIG_DEBUG_FS + struct hlist_node debug_node; +#endif @@ -109805,7 +105209,15 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 #define to_rockchip_clk_pll_nb(nb) \ container_of(nb, struct rockchip_clk_pll, clk_nb) ++#ifdef CONFIG_ROCKCHIP_CLK_BOOST +static void rockchip_boost_disable_low(struct rockchip_clk_pll *pll); ++#ifdef CONFIG_DEBUG_FS ++static HLIST_HEAD(clk_boost_list); ++static DEFINE_MUTEX(clk_boost_lock); ++#endif ++#else ++static inline void rockchip_boost_disable_low(struct rockchip_clk_pll *pll) {} ++#endif + +#define MHZ (1000UL * 1000UL) +#define KHZ (1000UL) @@ -109829,10 +105241,6 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 +#define MAX_FOUTVCO_FREQ (2000 * MHZ) + +static struct rockchip_pll_rate_table auto_table; -+#ifdef CONFIG_DEBUG_FS -+static HLIST_HEAD(clk_boost_list); -+static DEFINE_MUTEX(clk_boost_lock); -+#endif + +int rockchip_pll_clk_adaptive_scaling(struct clk *clk, int sel) +{ @@ -110068,11 +105476,114 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 + + return rate_table; +} ++ ++static u32 ++rockchip_rk3588_pll_frac_get(u32 m, u32 p, u32 s, u64 fin_hz, u64 fvco) ++{ ++ u64 fref, fout, ffrac; ++ u32 k = 0; ++ ++ fref = fin_hz / p; ++ ffrac = fvco - (m * fref); ++ fout = ffrac * 65536; ++ k = fout / fref; ++ if (k > 32767) { ++ fref = fin_hz / p; ++ ffrac = ((m + 1) * fref) - fvco; ++ fout = ffrac * 65536; ++ k = ((fout * 10 / fref) + 7) / 10; ++ if (k > 32767) ++ k = 0; ++ else ++ k = ~k + 1; ++ } ++ return k; ++} ++ ++static struct rockchip_pll_rate_table * ++rockchip_rk3588_pll_frac_by_auto(unsigned long fin_hz, unsigned long fout_hz) ++{ ++ struct rockchip_pll_rate_table *rate_table = rk_pll_rate_table_get(); ++ u64 fvco_min = 2250 * MHZ, fvco_max = 4500 * MHZ; ++ u32 p, m, s, k; ++ u64 fvco; ++ ++ for (s = 0; s <= 6; s++) { ++ fvco = (u64)fout_hz << s; ++ if (fvco < fvco_min || fvco > fvco_max) ++ continue; ++ for (p = 1; p <= 4; p++) { ++ for (m = 64; m <= 1023; m++) { ++ if ((fvco >= m * fin_hz / p) && (fvco < (m + 1) * fin_hz / p)) { ++ k = rockchip_rk3588_pll_frac_get(m, p, s, ++ (u64)fin_hz, ++ fvco); ++ if (!k) ++ continue; ++ rate_table->p = p; ++ rate_table->s = s; ++ rate_table->k = k; ++ if (k > 32767) ++ rate_table->m = m + 1; ++ else ++ rate_table->m = m; ++ return rate_table; ++ } ++ } ++ } ++ } ++ return NULL; ++} ++ ++static struct rockchip_pll_rate_table * ++rockchip_rk3588_pll_clk_set_by_auto(struct rockchip_clk_pll *pll, ++ unsigned long fin_hz, ++ unsigned long fout_hz) ++{ ++ struct rockchip_pll_rate_table *rate_table = rk_pll_rate_table_get(); ++ u64 fvco_min = 2250 * MHZ, fvco_max = 4500 * MHZ; ++ u64 fout_min = 37 * MHZ, fout_max = 4500 * MHZ; ++ u32 p, m, s; ++ u64 fvco; ++ ++ if (fin_hz == 0 || fout_hz == 0 || fout_hz == fin_hz) ++ return NULL; ++ ++ if (fout_hz > fout_max || fout_hz < fout_min) ++ return NULL; ++ ++ if (fin_hz / MHZ * MHZ == fin_hz && fout_hz / MHZ * MHZ == fout_hz) { ++ for (s = 0; s <= 6; s++) { ++ fvco = (u64)fout_hz << s; ++ if (fvco < fvco_min || fvco > fvco_max) ++ continue; ++ for (p = 2; p <= 4; p++) { ++ for (m = 64; m <= 1023; m++) { ++ if (fvco == m * fin_hz / p) { ++ rate_table->p = p; ++ rate_table->m = m; ++ rate_table->s = s; ++ rate_table->k = 0; ++ return rate_table; ++ } ++ } ++ } ++ } ++ pr_err("CANNOT FIND Fout by auto,fout = %lu\n", fout_hz); ++ } else { ++ rate_table = rockchip_rk3588_pll_frac_by_auto(fin_hz, fout_hz); ++ if (!rate_table) ++ pr_err("CANNOT FIND Fout by auto,fout = %lu\n", fout_hz); ++ else ++ return rate_table; ++ } ++ return NULL; ++} + static const struct rockchip_pll_rate_table *rockchip_get_pll_settings( struct rockchip_clk_pll *pll, unsigned long rate) { -@@ -54,28 +333,27 @@ static const struct rockchip_pll_rate_table *rockchip_get_pll_settings( +@@ -54,28 +442,29 @@ static const struct rockchip_pll_rate_table *rockchip_get_pll_settings( int i; for (i = 0; i < pll->rate_count; i++) { @@ -110091,6 +105602,8 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 - return NULL; + if (pll->type == pll_rk3066) + return rockchip_rk3066_pll_clk_set_by_auto(pll, 24 * MHZ, rate); ++ else if (pll->type == pll_rk3588 || pll->type == pll_rk3588_core) ++ return rockchip_rk3588_pll_clk_set_by_auto(pll, 24 * MHZ, rate); + else + return rockchip_pll_clk_set_by_auto(pll, 24 * MHZ, rate); } @@ -110114,11 +105627,19 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 } /* -@@ -136,6 +414,30 @@ static int rockchip_rk3036_pll_wait_lock(struct rockchip_clk_pll *pll) +@@ -114,6 +503,7 @@ static int rockchip_pll_wait_lock(struct rockchip_clk_pll *pll) + #define RK3036_PLLCON1_DSMPD_MASK 0x1 + #define RK3036_PLLCON1_DSMPD_SHIFT 12 + #define RK3036_PLLCON1_PWRDOWN BIT(13) ++#define RK3036_PLLCON1_PLLPDSEL BIT(15) + #define RK3036_PLLCON2_FRAC_MASK 0xffffff + #define RK3036_PLLCON2_FRAC_SHIFT 0 + +@@ -136,6 +526,30 @@ static int rockchip_rk3036_pll_wait_lock(struct rockchip_clk_pll *pll) return ret; } -+static unsigned long ++static unsigned long __maybe_unused +rockchip_rk3036_pll_con_to_rate(struct rockchip_clk_pll *pll, + u32 con0, u32 con1) +{ @@ -110145,7 +105666,7 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 static void rockchip_rk3036_pll_get_params(struct rockchip_clk_pll *pll, struct rockchip_pll_rate_table *rate) { -@@ -165,7 +467,10 @@ static unsigned long rockchip_rk3036_pll_recalc_rate(struct clk_hw *hw, +@@ -165,7 +579,10 @@ static unsigned long rockchip_rk3036_pll_recalc_rate(struct clk_hw *hw, { struct rockchip_clk_pll *pll = to_rockchip_clk_pll(hw); struct rockchip_pll_rate_table cur; @@ -110157,7 +105678,7 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 rockchip_rk3036_pll_get_params(pll, &cur); -@@ -174,7 +479,7 @@ static unsigned long rockchip_rk3036_pll_recalc_rate(struct clk_hw *hw, +@@ -174,7 +591,7 @@ static unsigned long rockchip_rk3036_pll_recalc_rate(struct clk_hw *hw, if (cur.dsmpd == 0) { /* fractional mode */ @@ -110166,16 +105687,60 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 do_div(frac_rate64, cur.refdiv); rate64 += frac_rate64 >> 24; -@@ -231,6 +536,8 @@ static int rockchip_rk3036_pll_set_params(struct rockchip_clk_pll *pll, +@@ -204,10 +621,12 @@ static int rockchip_rk3036_pll_set_params(struct rockchip_clk_pll *pll, + rockchip_rk3036_pll_get_params(pll, &cur); + cur.rate = 0; + +- cur_parent = pll_mux_ops->get_parent(&pll_mux->hw); +- if (cur_parent == PLL_MODE_NORM) { +- pll_mux_ops->set_parent(&pll_mux->hw, PLL_MODE_SLOW); +- rate_change_remuxed = 1; ++ if (!(pll->flags & ROCKCHIP_PLL_FIXED_MODE)) { ++ cur_parent = pll_mux_ops->get_parent(&pll_mux->hw); ++ if (cur_parent == PLL_MODE_NORM) { ++ pll_mux_ops->set_parent(&pll_mux->hw, PLL_MODE_SLOW); ++ rate_change_remuxed = 1; ++ } + } + + /* update pll values */ +@@ -231,6 +650,9 @@ static int rockchip_rk3036_pll_set_params(struct rockchip_clk_pll *pll, pllcon |= rate->frac << RK3036_PLLCON2_FRAC_SHIFT; writel_relaxed(pllcon, pll->reg_base + RK3036_PLLCON(2)); -+ rockchip_boost_disable_low(pll); ++ if (IS_ENABLED(CONFIG_ROCKCHIP_CLK_BOOST)) ++ rockchip_boost_disable_low(pll); + /* wait for the pll to lock */ ret = rockchip_rk3036_pll_wait_lock(pll); if (ret) { -@@ -412,6 +719,9 @@ static unsigned long rockchip_rk3066_pll_recalc_rate(struct clk_hw *hw, +@@ -268,17 +690,25 @@ static int rockchip_rk3036_pll_set_rate(struct clk_hw *hw, unsigned long drate, + static int rockchip_rk3036_pll_enable(struct clk_hw *hw) + { + struct rockchip_clk_pll *pll = to_rockchip_clk_pll(hw); ++ const struct clk_ops *pll_mux_ops = pll->pll_mux_ops; ++ struct clk_mux *pll_mux = &pll->pll_mux; + + writel(HIWORD_UPDATE(0, RK3036_PLLCON1_PWRDOWN, 0), + pll->reg_base + RK3036_PLLCON(1)); + rockchip_rk3036_pll_wait_lock(pll); + ++ pll_mux_ops->set_parent(&pll_mux->hw, PLL_MODE_NORM); ++ + return 0; + } + + static void rockchip_rk3036_pll_disable(struct clk_hw *hw) + { + struct rockchip_clk_pll *pll = to_rockchip_clk_pll(hw); ++ const struct clk_ops *pll_mux_ops = pll->pll_mux_ops; ++ struct clk_mux *pll_mux = &pll->pll_mux; ++ ++ pll_mux_ops->set_parent(&pll_mux->hw, PLL_MODE_SLOW); + + writel(HIWORD_UPDATE(RK3036_PLLCON1_PWRDOWN, + RK3036_PLLCON1_PWRDOWN, 0), +@@ -412,6 +842,9 @@ static unsigned long rockchip_rk3066_pll_recalc_rate(struct clk_hw *hw, return prate; } @@ -110185,7 +105750,7 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 rockchip_rk3066_pll_get_params(pll, &cur); rate64 *= cur.nf; -@@ -485,9 +795,18 @@ static int rockchip_rk3066_pll_set_rate(struct clk_hw *hw, unsigned long drate, +@@ -485,9 +918,18 @@ static int rockchip_rk3066_pll_set_rate(struct clk_hw *hw, unsigned long drate, { struct rockchip_clk_pll *pll = to_rockchip_clk_pll(hw); const struct rockchip_pll_rate_table *rate; @@ -110206,7 +105771,7 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 /* Get required rate settings from table */ rate = rockchip_get_pll_settings(pll, drate); -@@ -497,7 +816,11 @@ static int rockchip_rk3066_pll_set_rate(struct clk_hw *hw, unsigned long drate, +@@ -497,7 +939,11 @@ static int rockchip_rk3066_pll_set_rate(struct clk_hw *hw, unsigned long drate, return -EINVAL; } @@ -110219,7 +105784,7 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 } static int rockchip_rk3066_pll_enable(struct clk_hw *hw) -@@ -649,6 +972,9 @@ static unsigned long rockchip_rk3399_pll_recalc_rate(struct clk_hw *hw, +@@ -649,6 +1095,9 @@ static unsigned long rockchip_rk3399_pll_recalc_rate(struct clk_hw *hw, struct rockchip_pll_rate_table cur; u64 rate64 = prate; @@ -110229,7 +105794,7 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 rockchip_rk3399_pll_get_params(pll, &cur); rate64 *= cur.fbdiv; -@@ -692,6 +1018,11 @@ static int rockchip_rk3399_pll_set_params(struct rockchip_clk_pll *pll, +@@ -692,6 +1141,11 @@ static int rockchip_rk3399_pll_set_params(struct rockchip_clk_pll *pll, rate_change_remuxed = 1; } @@ -110241,7 +105806,7 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 /* update pll values */ writel_relaxed(HIWORD_UPDATE(rate->fbdiv, RK3399_PLLCON0_FBDIV_MASK, RK3399_PLLCON0_FBDIV_SHIFT), -@@ -715,6 +1046,11 @@ static int rockchip_rk3399_pll_set_params(struct rockchip_clk_pll *pll, +@@ -715,6 +1169,11 @@ static int rockchip_rk3399_pll_set_params(struct rockchip_clk_pll *pll, RK3399_PLLCON3_DSMPD_SHIFT), pll->reg_base + RK3399_PLLCON(3)); @@ -110253,7 +105818,7 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 /* wait for the pll to lock */ ret = rockchip_rk3399_pll_wait_lock(pll); if (ret) { -@@ -734,9 +1070,11 @@ static int rockchip_rk3399_pll_set_rate(struct clk_hw *hw, unsigned long drate, +@@ -734,9 +1193,11 @@ static int rockchip_rk3399_pll_set_rate(struct clk_hw *hw, unsigned long drate, { struct rockchip_clk_pll *pll = to_rockchip_clk_pll(hw); const struct rockchip_pll_rate_table *rate; @@ -110267,7 +105832,7 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 /* Get required rate settings from table */ rate = rockchip_get_pll_settings(pll, drate); -@@ -746,7 +1084,11 @@ static int rockchip_rk3399_pll_set_rate(struct clk_hw *hw, unsigned long drate, +@@ -746,7 +1207,11 @@ static int rockchip_rk3399_pll_set_rate(struct clk_hw *hw, unsigned long drate, return -EINVAL; } @@ -110280,16 +105845,273 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 } static int rockchip_rk3399_pll_enable(struct clk_hw *hw) -@@ -842,6 +1184,80 @@ static const struct clk_ops rockchip_rk3399_pll_clk_ops = { +@@ -842,6 +1307,420 @@ static const struct clk_ops rockchip_rk3399_pll_clk_ops = { .init = rockchip_rk3399_pll_init, }; ++/** ++ * PLL used in RK3588 ++ */ ++ ++#define RK3588_PLLCON(i) (i * 0x4) ++#define RK3588_PLLCON0_M_MASK 0x3ff ++#define RK3588_PLLCON0_M_SHIFT 0 ++#define RK3588_PLLCON1_P_MASK 0x3f ++#define RK3588_PLLCON1_P_SHIFT 0 ++#define RK3588_PLLCON1_S_MASK 0x7 ++#define RK3588_PLLCON1_S_SHIFT 6 ++#define RK3588_PLLCON2_K_MASK 0xffff ++#define RK3588_PLLCON2_K_SHIFT 0 ++#define RK3588_PLLCON1_PWRDOWN BIT(13) ++#define RK3588_PLLCON6_LOCK_STATUS BIT(15) ++ ++static int rockchip_rk3588_pll_wait_lock(struct rockchip_clk_pll *pll) ++{ ++ u32 pllcon; ++ int ret; ++ ++ /* ++ * Lock time typical 250, max 500 input clock cycles @24MHz ++ * So define a very safe maximum of 1000us, meaning 24000 cycles. ++ */ ++ ret = readl_relaxed_poll_timeout(pll->reg_base + RK3588_PLLCON(6), ++ pllcon, ++ pllcon & RK3588_PLLCON6_LOCK_STATUS, ++ 0, 1000); ++ if (ret) ++ pr_err("%s: timeout waiting for pll to lock\n", __func__); ++ ++ return ret; ++} ++ ++static long rockchip_rk3588_pll_round_rate(struct clk_hw *hw, ++ unsigned long drate, unsigned long *prate) ++{ ++ if ((drate < 37 * MHZ) || (drate > 4500 * MHZ)) ++ return -EINVAL; ++ else ++ return drate; ++} ++ ++static void rockchip_rk3588_pll_get_params(struct rockchip_clk_pll *pll, ++ struct rockchip_pll_rate_table *rate) ++{ ++ u32 pllcon; ++ ++ pllcon = readl_relaxed(pll->reg_base + RK3588_PLLCON(0)); ++ rate->m = ((pllcon >> RK3588_PLLCON0_M_SHIFT) ++ & RK3588_PLLCON0_M_MASK); ++ ++ pllcon = readl_relaxed(pll->reg_base + RK3588_PLLCON(1)); ++ rate->p = ((pllcon >> RK3588_PLLCON1_P_SHIFT) ++ & RK3588_PLLCON1_P_MASK); ++ rate->s = ((pllcon >> RK3588_PLLCON1_S_SHIFT) ++ & RK3588_PLLCON1_S_MASK); ++ ++ pllcon = readl_relaxed(pll->reg_base + RK3588_PLLCON(2)); ++ rate->k = ((pllcon >> RK3588_PLLCON2_K_SHIFT) ++ & RK3588_PLLCON2_K_MASK); ++} ++ ++static unsigned long rockchip_rk3588_pll_recalc_rate(struct clk_hw *hw, ++ unsigned long prate) ++{ ++ struct rockchip_clk_pll *pll = to_rockchip_clk_pll(hw); ++ struct rockchip_pll_rate_table cur; ++ u64 rate64 = prate, postdiv; ++ ++ if (pll->sel && pll->scaling) ++ return pll->scaling; ++ ++ rockchip_rk3588_pll_get_params(pll, &cur); ++ if (cur.p == 0) ++ return prate; ++ ++ rate64 *= cur.m; ++ do_div(rate64, cur.p); ++ ++ if (cur.k & BIT(15)) { ++ /* fractional mode */ ++ u64 frac_rate64; ++ ++ cur.k = (~(cur.k - 1)) & RK3588_PLLCON2_K_MASK; ++ frac_rate64 = prate * cur.k; ++ postdiv = cur.p; ++ postdiv *= 65536; ++ do_div(frac_rate64, postdiv); ++ rate64 -= frac_rate64; ++ } else { ++ /* fractional mode */ ++ u64 frac_rate64 = prate * cur.k; ++ ++ postdiv = cur.p; ++ postdiv *= 65536; ++ do_div(frac_rate64, postdiv); ++ rate64 += frac_rate64; ++ } ++ rate64 = rate64 >> cur.s; ++ ++ return (unsigned long)rate64; ++} ++ ++static int rockchip_rk3588_pll_set_params(struct rockchip_clk_pll *pll, ++ const struct rockchip_pll_rate_table *rate) ++{ ++ const struct clk_ops *pll_mux_ops = pll->pll_mux_ops; ++ struct clk_mux *pll_mux = &pll->pll_mux; ++ struct rockchip_pll_rate_table cur; ++ int rate_change_remuxed = 0; ++ int cur_parent; ++ int ret; ++ ++ pr_debug("%s: rate settings for %lu p: %d, m: %d, s: %d, k: %d\n", ++ __func__, rate->rate, rate->p, rate->m, rate->s, rate->k); ++ ++ rockchip_rk3588_pll_get_params(pll, &cur); ++ cur.rate = 0; ++ ++ if (pll->type == pll_rk3588) { ++ cur_parent = pll_mux_ops->get_parent(&pll_mux->hw); ++ if (cur_parent == PLL_MODE_NORM) { ++ pll_mux_ops->set_parent(&pll_mux->hw, PLL_MODE_SLOW); ++ rate_change_remuxed = 1; ++ } ++ } ++ ++ /* set pll power down */ ++ writel(HIWORD_UPDATE(RK3588_PLLCON1_PWRDOWN, ++ RK3588_PLLCON1_PWRDOWN, 0), ++ pll->reg_base + RK3588_PLLCON(1)); ++ ++ /* update pll values */ ++ writel_relaxed(HIWORD_UPDATE(rate->m, RK3588_PLLCON0_M_MASK, ++ RK3588_PLLCON0_M_SHIFT), ++ pll->reg_base + RK3588_PLLCON(0)); ++ ++ writel_relaxed(HIWORD_UPDATE(rate->p, RK3588_PLLCON1_P_MASK, ++ RK3588_PLLCON1_P_SHIFT) | ++ HIWORD_UPDATE(rate->s, RK3588_PLLCON1_S_MASK, ++ RK3588_PLLCON1_S_SHIFT), ++ pll->reg_base + RK3588_PLLCON(1)); ++ ++ writel_relaxed(HIWORD_UPDATE(rate->k, RK3588_PLLCON2_K_MASK, ++ RK3588_PLLCON2_K_SHIFT), ++ pll->reg_base + RK3588_PLLCON(2)); ++ ++ /* set pll power up */ ++ writel(HIWORD_UPDATE(0, ++ RK3588_PLLCON1_PWRDOWN, 0), ++ pll->reg_base + RK3588_PLLCON(1)); ++ ++ /* wait for the pll to lock */ ++ ret = rockchip_rk3588_pll_wait_lock(pll); ++ if (ret) { ++ pr_warn("%s: pll update unsuccessful, trying to restore old params\n", ++ __func__); ++ rockchip_rk3588_pll_set_params(pll, &cur); ++ } ++ ++ if ((pll->type == pll_rk3588) && rate_change_remuxed) ++ pll_mux_ops->set_parent(&pll_mux->hw, PLL_MODE_NORM); ++ ++ return ret; ++} ++ ++static int rockchip_rk3588_pll_set_rate(struct clk_hw *hw, unsigned long drate, ++ unsigned long prate) ++{ ++ struct rockchip_clk_pll *pll = to_rockchip_clk_pll(hw); ++ const struct rockchip_pll_rate_table *rate; ++ unsigned long old_rate = rockchip_rk3588_pll_recalc_rate(hw, prate); ++ int ret; ++ ++ pr_debug("%s: changing %s from %lu to %lu with a parent rate of %lu\n", ++ __func__, __clk_get_name(hw->clk), old_rate, drate, prate); ++ ++ /* Get required rate settings from table */ ++ rate = rockchip_get_pll_settings(pll, drate); ++ if (!rate) { ++ pr_err("%s: Invalid rate : %lu for pll clk %s\n", __func__, ++ drate, __clk_get_name(hw->clk)); ++ return -EINVAL; ++ } ++ ++ ret = rockchip_rk3588_pll_set_params(pll, rate); ++ if (ret) ++ pll->scaling = 0; ++ ++ return ret; ++} ++ ++static int rockchip_rk3588_pll_enable(struct clk_hw *hw) ++{ ++ struct rockchip_clk_pll *pll = to_rockchip_clk_pll(hw); ++ const struct clk_ops *pll_mux_ops = pll->pll_mux_ops; ++ struct clk_mux *pll_mux = &pll->pll_mux; ++ ++ writel(HIWORD_UPDATE(0, RK3588_PLLCON1_PWRDOWN, 0), ++ pll->reg_base + RK3588_PLLCON(1)); ++ rockchip_rk3588_pll_wait_lock(pll); ++ ++ pll_mux_ops->set_parent(&pll_mux->hw, PLL_MODE_NORM); ++ ++ return 0; ++} ++ ++static void rockchip_rk3588_pll_disable(struct clk_hw *hw) ++{ ++ struct rockchip_clk_pll *pll = to_rockchip_clk_pll(hw); ++ const struct clk_ops *pll_mux_ops = pll->pll_mux_ops; ++ struct clk_mux *pll_mux = &pll->pll_mux; ++ ++ pll_mux_ops->set_parent(&pll_mux->hw, PLL_MODE_SLOW); ++ ++ writel(HIWORD_UPDATE(RK3588_PLLCON1_PWRDOWN, ++ RK3588_PLLCON1_PWRDOWN, 0), ++ pll->reg_base + RK3588_PLLCON(1)); ++} ++ ++static int rockchip_rk3588_pll_is_enabled(struct clk_hw *hw) ++{ ++ struct rockchip_clk_pll *pll = to_rockchip_clk_pll(hw); ++ u32 pllcon = readl(pll->reg_base + RK3588_PLLCON(1)); ++ ++ return !(pllcon & RK3588_PLLCON1_PWRDOWN); ++} ++ ++static int rockchip_rk3588_pll_init(struct clk_hw *hw) ++{ ++ struct rockchip_clk_pll *pll = to_rockchip_clk_pll(hw); ++ ++ if (!(pll->flags & ROCKCHIP_PLL_SYNC_RATE)) ++ return 0; ++ ++ return 0; ++} ++ ++static const struct clk_ops rockchip_rk3588_pll_clk_norate_ops = { ++ .recalc_rate = rockchip_rk3588_pll_recalc_rate, ++ .enable = rockchip_rk3588_pll_enable, ++ .disable = rockchip_rk3588_pll_disable, ++ .is_enabled = rockchip_rk3588_pll_is_enabled, ++}; ++ ++static const struct clk_ops rockchip_rk3588_pll_clk_ops = { ++ .recalc_rate = rockchip_rk3588_pll_recalc_rate, ++ .round_rate = rockchip_rk3588_pll_round_rate, ++ .set_rate = rockchip_rk3588_pll_set_rate, ++ .enable = rockchip_rk3588_pll_enable, ++ .disable = rockchip_rk3588_pll_disable, ++ .is_enabled = rockchip_rk3588_pll_is_enabled, ++ .init = rockchip_rk3588_pll_init, ++}; ++ +#ifdef CONFIG_ROCKCHIP_CLK_COMPENSATION +int rockchip_pll_clk_compensation(struct clk *clk, int ppm) +{ + struct clk *parent = clk_get_parent(clk); + struct rockchip_clk_pll *pll; -+ static u32 frac, fbdiv; ++ static u32 frac, fbdiv, s, p; + bool negative; + u32 pllcon, pllcon0, pllcon2, fbdiv_mask, frac_mask, frac_shift; + u64 fracdiv, m, n; @@ -110312,6 +106134,10 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 + fbdiv_mask = RK3036_PLLCON0_FBDIV_MASK; + frac_mask = RK3036_PLLCON2_FRAC_MASK; + frac_shift = RK3036_PLLCON2_FRAC_SHIFT; ++ if (!frac) ++ writel(HIWORD_UPDATE(RK3036_PLLCON1_PLLPDSEL, ++ RK3036_PLLCON1_PLLPDSEL, 0), ++ pll->reg_base + RK3036_PLLCON(1)); + break; + case pll_rk3066: + return -EINVAL; @@ -110322,6 +106148,13 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 + frac_mask = RK3399_PLLCON2_FRAC_MASK; + frac_shift = RK3399_PLLCON2_FRAC_SHIFT; + break; ++ case pll_rk3588: ++ pllcon0 = RK3588_PLLCON(0); ++ pllcon2 = RK3588_PLLCON(2); ++ fbdiv_mask = RK3588_PLLCON0_M_MASK; ++ frac_mask = RK3588_PLLCON2_K_MASK; ++ frac_shift = RK3588_PLLCON2_K_SHIFT; ++ break; + default: + return -EINVAL; + } @@ -110329,29 +106162,101 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 + negative = !!(ppm & BIT(31)); + ppm = negative ? ~ppm + 1 : ppm; + -+ if (!frac) { -+ frac = readl_relaxed(pll->reg_base + pllcon2) & frac_mask; -+ fbdiv = readl_relaxed(pll->reg_base + pllcon0) & fbdiv_mask; -+ } ++ switch (pll->type) { ++ case pll_rk3036: ++ case pll_rk3328: ++ case pll_rk3066: ++ case pll_rk3399: ++ /* ++ * delta frac frac ppm ++ * -------------- = (fbdiv + ----------) * --------- ++ * 1 << 24 1 << 24 1000000 ++ * ++ */ ++ if (!frac) { ++ frac = readl_relaxed(pll->reg_base + pllcon2) & frac_mask; ++ fbdiv = readl_relaxed(pll->reg_base + pllcon0) & fbdiv_mask; ++ } ++ m = div64_u64((uint64_t)frac * ppm, 1000000); ++ n = div64_u64((uint64_t)ppm << 24, 1000000) * fbdiv; + -+ /* -+ * delta frac frac ppm -+ * -------------- = (fbdiv + ----------) * --------- -+ * 1 << 24 1 << 24 1000000 -+ * -+ */ -+ m = div64_u64((uint64_t)frac * ppm, 1000000); -+ n = div64_u64((uint64_t)ppm << 24, 1000000) * fbdiv; ++ fracdiv = negative ? frac - (m + n) : frac + (m + n); + -+ fracdiv = negative ? frac - (m + n) : frac + (m + n); ++ if (!frac || fracdiv > frac_mask) ++ return -EINVAL; + -+ if (!frac || fracdiv > frac_mask) -+ return -EINVAL; ++ pllcon = readl_relaxed(pll->reg_base + pllcon2); ++ pllcon &= ~(frac_mask << frac_shift); ++ pllcon |= fracdiv << frac_shift; ++ writel_relaxed(pllcon, pll->reg_base + pllcon2); ++ break; ++ case pll_rk3588: ++ if (!fbdiv) { ++ frac = readl_relaxed(pll->reg_base + pllcon2) & frac_mask; ++ fbdiv = readl_relaxed(pll->reg_base + pllcon0) & fbdiv_mask; ++ } ++ if (!frac) { ++ pllcon = readl_relaxed(pll->reg_base + RK3588_PLLCON(1)); ++ s = ((pllcon >> RK3588_PLLCON1_S_SHIFT) ++ & RK3588_PLLCON1_S_MASK); ++ p = ((pllcon >> RK3588_PLLCON1_P_SHIFT) ++ & RK3588_PLLCON1_P_MASK); ++ m = div64_u64((uint64_t)clk_get_rate(clk) * ppm, 24000000); ++ n = div64_u64((uint64_t)m * 65536 * p * (1 << s), 1000000); ++ ++ if (n > 32767) ++ return -EINVAL; ++ fracdiv = negative ? ~n + 1 : n; ++ } else if (frac & BIT(15)) { ++ frac = (~(frac - 1)) & RK3588_PLLCON2_K_MASK; ++ m = div64_u64((uint64_t)frac * ppm, 100000); ++ n = div64_u64((uint64_t)ppm * 65536 * fbdiv, 100000); ++ if (negative) { ++ fracdiv = frac + (div64_u64(m + n, 10)); ++ if (fracdiv > 32767) ++ return -EINVAL; ++ fracdiv = ~fracdiv + 1; ++ } else { ++ s = div64_u64(m + n, 10); ++ if (frac >= s) { ++ fracdiv = frac - s; ++ if (fracdiv > 32767) ++ return -EINVAL; ++ fracdiv = ~fracdiv + 1; ++ } else { ++ fracdiv = s - frac; ++ if (fracdiv > 32767) ++ return -EINVAL; ++ } ++ } ++ } else { ++ m = div64_u64((uint64_t)frac * ppm, 100000); ++ n = div64_u64((uint64_t)ppm * 65536 * fbdiv, 100000); ++ if (!negative) { ++ fracdiv = frac + (div64_u64(m + n, 10)); ++ if (fracdiv > 32767) ++ return -EINVAL; ++ } else { ++ s = div64_u64(m + n, 10); ++ if (frac >= s) { ++ fracdiv = frac - s; ++ if (fracdiv > 32767) ++ return -EINVAL; ++ } else { ++ fracdiv = s - frac; ++ if (fracdiv > 32767) ++ return -EINVAL; ++ fracdiv = ~fracdiv + 1; ++ } ++ } ++ } + -+ pllcon = readl_relaxed(pll->reg_base + pllcon2); -+ pllcon &= ~(frac_mask << frac_shift); -+ pllcon |= fracdiv << frac_shift; -+ writel_relaxed(pllcon, pll->reg_base + pllcon2); ++ writel_relaxed(HIWORD_UPDATE(fracdiv, frac_mask, frac_shift), ++ pll->reg_base + pllcon2); ++ break; ++ default: ++ return -EINVAL; ++ } + + return 0; +} @@ -110361,33 +106266,77 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 /* * Common registering of pll clocks */ -@@ -914,8 +1330,12 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx, +@@ -886,12 +1765,7 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx, + pll_mux->flags = 0; + pll_mux->lock = &ctx->lock; + pll_mux->hw.init = &init; +- +- if (pll_type == pll_rk3036 || +- pll_type == pll_rk3066 || +- pll_type == pll_rk3328 || +- pll_type == pll_rk3399) +- pll_mux->flags |= CLK_MUX_HIWORD_MASK; ++ pll_mux->flags |= CLK_MUX_HIWORD_MASK; + + /* the actual muxing is xin24m, pll-output, xin32k */ + pll_parents[0] = parent_names[0]; +@@ -914,8 +1788,15 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx, /* now create the actual pll */ init.name = pll_name; +- /* keep all plls untouched for now */ +- init.flags = flags | CLK_IGNORE_UNUSED; +#ifndef CONFIG_ROCKCHIP_LOW_PERFORMANCE - /* keep all plls untouched for now */ - init.flags = flags | CLK_IGNORE_UNUSED; ++ if (clk_pll_flags & ROCKCHIP_PLL_ALLOW_POWER_DOWN) ++ init.flags = flags; ++ else ++ /* keep all plls untouched for now */ ++ init.flags = flags | CLK_IGNORE_UNUSED; +#else + init.flags = flags; +#endif init.parent_names = &parent_names[0]; init.num_parents = 1; -@@ -940,7 +1360,7 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx, - switch (pll_type) { - case pll_rk3036: - case pll_rk3328: -- if (!pll->rate_table) -+ if (!pll->rate_table || IS_ERR(ctx->grf)) - init.ops = &rockchip_rk3036_pll_clk_norate_ops; +@@ -945,18 +1826,32 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx, else init.ops = &rockchip_rk3036_pll_clk_ops; -@@ -988,3 +1408,316 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx, + break; ++#ifdef CONFIG_ROCKCHIP_PLL_RK3066 + case pll_rk3066: + if (!pll->rate_table || IS_ERR(ctx->grf)) + init.ops = &rockchip_rk3066_pll_clk_norate_ops; + else + init.ops = &rockchip_rk3066_pll_clk_ops; + break; ++#endif ++#ifdef CONFIG_ROCKCHIP_PLL_RK3399 + case pll_rk3399: + if (!pll->rate_table) + init.ops = &rockchip_rk3399_pll_clk_norate_ops; + else + init.ops = &rockchip_rk3399_pll_clk_ops; + break; ++#endif ++#ifdef CONFIG_ROCKCHIP_PLL_RK3588 ++ case pll_rk3588: ++ case pll_rk3588_core: ++ if (!pll->rate_table) ++ init.ops = &rockchip_rk3588_pll_clk_norate_ops; ++ else ++ init.ops = &rockchip_rk3588_pll_clk_ops; ++ init.flags = flags; ++ break; ++#endif + default: + pr_warn("%s: Unknown pll type for pll clk %s\n", + __func__, name); +@@ -988,3 +1883,318 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx, kfree(pll); return mux_clk; } + ++#ifdef CONFIG_ROCKCHIP_CLK_BOOST +static unsigned long rockchip_pll_con_to_rate(struct rockchip_clk_pll *pll, + u32 con0, u32 con1) +{ @@ -110700,12 +106649,13 @@ index d0bd513ff3c3..c7e28d95f8a0 100644 +late_initcall(boost_debug_init); +#endif /* MODULE */ +#endif /* CONFIG_DEBUG_FS */ ++#endif /* CONFIG_ROCKCHIP_CLK_BOOST */ diff --git a/drivers/clk/rockchip/clk-pvtm.c b/drivers/clk/rockchip/clk-pvtm.c new file mode 100755 -index 000000000000..ad02b6a571d8 +index 000000000..c748589dd --- /dev/null +++ b/drivers/clk/rockchip/clk-pvtm.c -@@ -0,0 +1,310 @@ +@@ -0,0 +1,311 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd @@ -110814,11 +106764,12 @@ index 000000000000..ad02b6a571d8 + rockchip_clock_pvtm_delay(time_us); + + check_cnt = 100; -+ while (check_cnt--) { ++ while (check_cnt) { + regmap_read(pvtm->grf, info->sta, &sta); + if (sta & 0x1) + break; + udelay(4); ++ check_cnt--; + } + + if (check_cnt) { @@ -111017,10 +106968,10 @@ index 000000000000..ad02b6a571d8 +MODULE_DESCRIPTION("Rockchip Clock Pvtm Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clk/rockchip/clk-px30.c b/drivers/clk/rockchip/clk-px30.c -index 6fb9c98b7d24..89ecbd4ed0c9 100644 +index 6fb9c98b7..3294ce8ea 100644 --- a/drivers/clk/rockchip/clk-px30.c +++ b/drivers/clk/rockchip/clk-px30.c -@@ -6,13 +6,16 @@ +@@ -6,8 +6,11 @@ #include #include @@ -111028,16 +106979,11 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 #include #include +#include ++#include #include #include #include "clk.h" - - #define PX30_GRF_SOC_STATUS0 0x480 -+#define PX30_FRAC_MAX_PRATE 600000000 - - enum px30_plls { - apll, dpll, cpll, npll, apll_b_h, apll_b_l, -@@ -124,29 +127,31 @@ static struct rockchip_cpuclk_rate_table px30_cpuclk_rates[] __initdata = { +@@ -124,29 +127,32 @@ static struct rockchip_cpuclk_rate_table px30_cpuclk_rates[] __initdata = { }; static const struct rockchip_cpuclk_reg_data px30_cpuclk_data = { @@ -111072,13 +107018,14 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 -PNAME(mux_gpll_cpll_npll_p) = { "gpll", "dummy_cpll", "npll" }; -PNAME(mux_gpll_cpll_npll_xin24m_p) = { "gpll", "dummy_cpll", "npll", "xin24m" }; -PNAME(mux_gpll_xin24m_npll_p) = { "gpll", "xin24m", "npll"}; ++PNAME(mux_xin24m_gpll_p) = { "xin24m", "gpll"}; +PNAME(mux_gpll_cpll_npll_p) = { "gpll", "dummy_cpll", "dummy_npll" }; +PNAME(mux_gpll_cpll_npll_xin24m_p) = { "gpll", "dummy_cpll", "dummy_npll", "xin24m" }; +PNAME(mux_gpll_xin24m_npll_p) = { "gpll", "xin24m", "dummy_npll"}; PNAME(mux_pdm_p) = { "clk_pdm_src", "clk_pdm_frac" }; PNAME(mux_i2s0_tx_p) = { "clk_i2s0_tx_src", "clk_i2s0_tx_frac", "mclk_i2s0_tx_in", "xin12m"}; PNAME(mux_i2s0_rx_p) = { "clk_i2s0_rx_src", "clk_i2s0_rx_frac", "mclk_i2s0_rx_in", "xin12m"}; -@@ -158,13 +163,13 @@ PNAME(mux_i2s1_out_p) = { "clk_i2s1", "xin12m"}; +@@ -158,13 +164,13 @@ PNAME(mux_i2s1_out_p) = { "clk_i2s1", "xin12m"}; PNAME(mux_i2s2_out_p) = { "clk_i2s2", "xin12m"}; PNAME(mux_i2s0_tx_rx_p) = { "clk_i2s0_tx_mux", "clk_i2s0_rx_mux"}; PNAME(mux_i2s0_rx_tx_p) = { "clk_i2s0_rx_mux", "clk_i2s0_tx_mux"}; @@ -111094,7 +107041,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 PNAME(mux_dclk_vopb_p) = { "dclk_vopb_src", "dclk_vopb_frac", "xin24m" }; PNAME(mux_dclk_vopl_p) = { "dclk_vopl_src", "dclk_vopl_frac", "xin24m" }; PNAME(mux_nandc_p) = { "clk_nandc_div", "clk_nandc_div50" }; -@@ -191,7 +196,7 @@ static struct rockchip_pll_clock px30_pll_clks[] __initdata = { +@@ -191,7 +197,7 @@ static struct rockchip_pll_clock px30_pll_clks[] __initdata = { 0, PX30_PLL_CON(16), PX30_MODE_CON, 2, 2, 0, px30_pll_rates), [npll] = PLL(pll_rk3328, PLL_NPLL, "npll", mux_pll_p, @@ -111103,7 +107050,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 PX30_MODE_CON, 6, 4, 0, px30_pll_rates), }; -@@ -209,11 +214,11 @@ static struct rockchip_clk_branch px30_pdm_fracmux __initdata = +@@ -209,11 +215,11 @@ static struct rockchip_clk_branch px30_pdm_fracmux __initdata = PX30_CLKSEL_CON(26), 15, 1, MFLAGS); static struct rockchip_clk_branch px30_i2s0_tx_fracmux __initdata = @@ -111117,7 +107064,16 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 PX30_CLKSEL_CON(58), 10, 2, MFLAGS); static struct rockchip_clk_branch px30_i2s1_fracmux __initdata = -@@ -301,22 +306,12 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { +@@ -253,7 +259,7 @@ static struct rockchip_clk_branch px30_dclk_vopl_fracmux __initdata = + PX30_CLKSEL_CON(8), 14, 2, MFLAGS); + + static struct rockchip_clk_branch px30_rtc32k_pmu_fracmux __initdata = +- MUX(SCLK_RTC32K_PMU, "clk_rtc32k_pmu", mux_rtc32k_pmu_p, CLK_SET_RATE_PARENT, ++ MUX(SCLK_RTC32K_PMU, "clk_rtc32k_pmu", mux_rtc32k_pmu_p, CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, + PX30_PMU_CLKSEL_CON(0), 14, 2, MFLAGS); + + static struct rockchip_clk_branch px30_uart0_pmu_fracmux __initdata = +@@ -301,22 +307,12 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { PX30_CLKGATE_CON(17), 4, GFLAGS), /* PD_GPU */ @@ -111142,12 +107098,26 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 PX30_CLKGATE_CON(0), 11, GFLAGS), GATE(0, "aclk_gpu_prf", "aclk_gpu", CLK_IGNORE_UNUSED, PX30_CLKGATE_CON(17), 8, GFLAGS), -@@ -424,16 +419,16 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "dclk_vopb_frac", "dclk_vopb_src", CLK_SET_RATE_PARENT, - PX30_CLKSEL_CON(6), 0, - PX30_CLKGATE_CON(2), 3, GFLAGS, -- &px30_dclk_vopb_fracmux), -+ &px30_dclk_vopb_fracmux, 0), +@@ -332,14 +328,9 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { + PX30_CLKGATE_CON(0), 7, GFLAGS), + GATE(0, "gpll_ddr", "gpll", CLK_IGNORE_UNUSED, + PX30_CLKGATE_CON(0), 13, GFLAGS), +- COMPOSITE_NOGATE(SCLK_DDRCLK, "sclk_ddrc", mux_ddrphy_p, CLK_IGNORE_UNUSED, +- PX30_CLKSEL_CON(2), 7, 1, MFLAGS, 0, 3, DFLAGS | CLK_DIVIDER_POWER_OF_TWO), +- COMPOSITE_NOGATE(0, "clk_ddrphy4x", mux_ddrphy_p, CLK_IGNORE_UNUSED, +- PX30_CLKSEL_CON(2), 7, 1, MFLAGS, 0, 3, DFLAGS), +- FACTOR_GATE(0, "clk_ddrphy1x", "clk_ddrphy4x", CLK_IGNORE_UNUSED, 1, 4, +- PX30_CLKGATE_CON(0), 14, GFLAGS), +- FACTOR_GATE(0, "clk_stdby_2wrap", "clk_ddrphy4x", CLK_IGNORE_UNUSED, 1, 4, +- PX30_CLKGATE_CON(1), 0, GFLAGS), ++ COMPOSITE_DDRCLK(SCLK_DDRCLK, "sclk_ddrc", mux_ddrphy_p, ++ CLK_IGNORE_UNUSED, PX30_CLKSEL_CON(2), 7, 1, 0, 3, ++ ROCKCHIP_DDRCLK_SIP_V2), + COMPOSITE_NODIV(0, "clk_ddrstdby", mux_ddrstdby_p, CLK_IGNORE_UNUSED, + PX30_CLKSEL_CON(2), 4, 1, MFLAGS, + PX30_CLKGATE_CON(1), 13, GFLAGS), +@@ -427,7 +418,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { + &px30_dclk_vopb_fracmux), GATE(DCLK_VOPB, "dclk_vopb", "dclk_vopb_mux", CLK_SET_RATE_PARENT, PX30_CLKGATE_CON(2), 4, GFLAGS), - COMPOSITE(0, "dclk_vopl_src", mux_npll_cpll_p, 0, @@ -111155,14 +107125,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 PX30_CLKSEL_CON(8), 11, 1, MFLAGS, 0, 8, DFLAGS, PX30_CLKGATE_CON(2), 6, GFLAGS), COMPOSITE_FRACMUX(0, "dclk_vopl_frac", "dclk_vopl_src", CLK_SET_RATE_PARENT, - PX30_CLKSEL_CON(9), 0, - PX30_CLKGATE_CON(2), 7, GFLAGS, -- &px30_dclk_vopl_fracmux), -+ &px30_dclk_vopl_fracmux, 0), - GATE(DCLK_VOPL, "dclk_vopl", "dclk_vopl_mux", CLK_SET_RATE_PARENT, - PX30_CLKGATE_CON(2), 8, GFLAGS), - -@@ -452,13 +447,13 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { +@@ -452,13 +443,13 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { * Clock-Architecture Diagram 7 */ @@ -111179,7 +107142,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 PX30_CLKSEL_CON(14), 8, 5, DFLAGS), /* PD_MMC_NAND */ -@@ -535,7 +530,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { +@@ -535,7 +526,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { PX30_CLKGATE_CON(6), 15, GFLAGS), /* PD_USB */ @@ -111188,7 +107151,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 PX30_CLKGATE_CON(7), 2, GFLAGS), GATE(SCLK_OTG_ADP, "clk_otg_adp", "clk_rtc32k_pmu", 0, PX30_CLKGATE_CON(7), 3, GFLAGS), -@@ -570,19 +565,19 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { +@@ -570,19 +561,19 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { */ /* PD_BUS */ @@ -111213,21 +107176,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 PX30_CLKGATE_CON(8), 10, GFLAGS), COMPOSITE(0, "clk_pdm_src", mux_gpll_xin24m_npll_p, 0, -@@ -591,7 +586,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_pdm_frac", "clk_pdm_src", CLK_SET_RATE_PARENT, - PX30_CLKSEL_CON(27), 0, - PX30_CLKGATE_CON(9), 10, GFLAGS, -- &px30_pdm_fracmux), -+ &px30_pdm_fracmux, PX30_FRAC_MAX_PRATE), - GATE(SCLK_PDM, "clk_pdm", "clk_pdm_mux", CLK_SET_RATE_PARENT, - PX30_CLKGATE_CON(9), 11, GFLAGS), - -@@ -601,11 +596,11 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s0_tx_frac", "clk_i2s0_tx_src", CLK_SET_RATE_PARENT, - PX30_CLKSEL_CON(29), 0, - PX30_CLKGATE_CON(9), 13, GFLAGS, -- &px30_i2s0_tx_fracmux), -+ &px30_i2s0_tx_fracmux, PX30_FRAC_MAX_PRATE), +@@ -605,7 +596,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { COMPOSITE_NODIV(SCLK_I2S0_TX, "clk_i2s0_tx", mux_i2s0_tx_rx_p, CLK_SET_RATE_PARENT, PX30_CLKSEL_CON(28), 12, 1, MFLAGS, PX30_CLKGATE_CON(9), 14, GFLAGS), @@ -111236,21 +107185,8 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 PX30_CLKSEL_CON(28), 14, 2, MFLAGS, PX30_CLKGATE_CON(9), 15, GFLAGS), GATE(SCLK_I2S0_TX_OUT, "clk_i2s0_tx_out", "clk_i2s0_tx_out_pre", CLK_SET_RATE_PARENT, -@@ -617,7 +612,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s0_rx_frac", "clk_i2s0_rx_src", CLK_SET_RATE_PARENT, - PX30_CLKSEL_CON(59), 0, - PX30_CLKGATE_CON(17), 1, GFLAGS, -- &px30_i2s0_rx_fracmux), -+ &px30_i2s0_rx_fracmux, PX30_FRAC_MAX_PRATE), - COMPOSITE_NODIV(SCLK_I2S0_RX, "clk_i2s0_rx", mux_i2s0_rx_tx_p, CLK_SET_RATE_PARENT, - PX30_CLKSEL_CON(58), 12, 1, MFLAGS, - PX30_CLKGATE_CON(17), 2, GFLAGS), -@@ -633,10 +628,10 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s1_frac", "clk_i2s1_src", CLK_SET_RATE_PARENT, - PX30_CLKSEL_CON(31), 0, - PX30_CLKGATE_CON(10), 1, GFLAGS, -- &px30_i2s1_fracmux), -+ &px30_i2s1_fracmux, PX30_FRAC_MAX_PRATE), +@@ -636,7 +627,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { + &px30_i2s1_fracmux), GATE(SCLK_I2S1, "clk_i2s1", "clk_i2s1_mux", CLK_SET_RATE_PARENT, PX30_CLKGATE_CON(10), 2, GFLAGS), - COMPOSITE_NODIV(0, "clk_i2s1_out_pre", mux_i2s1_out_p, 0, @@ -111258,63 +107194,29 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 PX30_CLKSEL_CON(30), 15, 1, MFLAGS, PX30_CLKGATE_CON(10), 3, GFLAGS), GATE(SCLK_I2S1_OUT, "clk_i2s1_out", "clk_i2s1_out_pre", CLK_SET_RATE_PARENT, -@@ -648,7 +643,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s2_frac", "clk_i2s2_src", CLK_SET_RATE_PARENT, - PX30_CLKSEL_CON(33), 0, - PX30_CLKGATE_CON(10), 5, GFLAGS, -- &px30_i2s2_fracmux), -+ &px30_i2s2_fracmux, PX30_FRAC_MAX_PRATE), - GATE(SCLK_I2S2, "clk_i2s2", "clk_i2s2_mux", CLK_SET_RATE_PARENT, - PX30_CLKGATE_CON(10), 6, GFLAGS), - COMPOSITE_NODIV(0, "clk_i2s2_out_pre", mux_i2s2_out_p, 0, -@@ -666,7 +661,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_uart1_frac", "clk_uart1_src", CLK_SET_RATE_PARENT, - PX30_CLKSEL_CON(36), 0, - PX30_CLKGATE_CON(10), 14, GFLAGS, -- &px30_uart1_fracmux), -+ &px30_uart1_fracmux, PX30_FRAC_MAX_PRATE), - GATE(SCLK_UART1, "clk_uart1", "clk_uart1_mux", CLK_SET_RATE_PARENT, - PX30_CLKGATE_CON(10), 15, GFLAGS), - -@@ -679,8 +674,8 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_uart2_frac", "clk_uart2_src", CLK_SET_RATE_PARENT, +@@ -680,7 +671,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { PX30_CLKSEL_CON(39), 0, PX30_CLKGATE_CON(11), 2, GFLAGS, -- &px30_uart2_fracmux), + &px30_uart2_fracmux), - GATE(SCLK_UART2, "clk_uart2", "clk_uart2_mux", CLK_SET_RATE_PARENT, -+ &px30_uart2_fracmux, PX30_FRAC_MAX_PRATE), + GATE(SCLK_UART2, "clk_uart2", "clk_uart2_mux", CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, PX30_CLKGATE_CON(11), 3, GFLAGS), COMPOSITE(0, "clk_uart3_src", mux_uart_src_p, 0, -@@ -692,7 +687,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_uart3_frac", "clk_uart3_src", CLK_SET_RATE_PARENT, - PX30_CLKSEL_CON(42), 0, - PX30_CLKGATE_CON(11), 6, GFLAGS, -- &px30_uart3_fracmux), -+ &px30_uart3_fracmux, PX30_FRAC_MAX_PRATE), - GATE(SCLK_UART3, "clk_uart3", "clk_uart3_mux", CLK_SET_RATE_PARENT, - PX30_CLKGATE_CON(11), 7, GFLAGS), - -@@ -705,7 +700,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_uart4_frac", "clk_uart4_src", CLK_SET_RATE_PARENT, - PX30_CLKSEL_CON(45), 0, - PX30_CLKGATE_CON(11), 10, GFLAGS, -- &px30_uart4_fracmux), -+ &px30_uart4_fracmux, PX30_FRAC_MAX_PRATE), - GATE(SCLK_UART4, "clk_uart4", "clk_uart4_mux", CLK_SET_RATE_PARENT, - PX30_CLKGATE_CON(11), 11, GFLAGS), - -@@ -718,7 +713,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_uart5_frac", "clk_uart5_src", CLK_SET_RATE_PARENT, - PX30_CLKSEL_CON(48), 0, - PX30_CLKGATE_CON(11), 14, GFLAGS, -- &px30_uart5_fracmux), -+ &px30_uart5_fracmux, PX30_FRAC_MAX_PRATE), - GATE(SCLK_UART5, "clk_uart5", "clk_uart5_mux", CLK_SET_RATE_PARENT, - PX30_CLKGATE_CON(11), 15, GFLAGS), - -@@ -799,29 +794,29 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { +@@ -766,12 +757,6 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { + COMPOSITE_NOMUX(SCLK_SARADC, "clk_saradc", "xin24m", 0, + PX30_CLKSEL_CON(55), 0, 11, DFLAGS, + PX30_CLKGATE_CON(12), 10, GFLAGS), +- COMPOSITE_NOMUX(SCLK_OTP, "clk_otp", "xin24m", 0, +- PX30_CLKSEL_CON(56), 0, 3, DFLAGS, +- PX30_CLKGATE_CON(12), 11, GFLAGS), +- COMPOSITE_NOMUX(SCLK_OTP_USR, "clk_otp_usr", "clk_otp", 0, +- PX30_CLKSEL_CON(56), 4, 2, DFLAGS, +- PX30_CLKGATE_CON(13), 6, GFLAGS), + + GATE(0, "clk_cpu_boost", "xin24m", CLK_IGNORE_UNUSED, + PX30_CLKGATE_CON(12), 12, GFLAGS), +@@ -799,29 +784,29 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { GATE(0, "pclk_ddrphy", "pclk_top_pre", CLK_IGNORE_UNUSED, PX30_CLKGATE_CON(16), 3, GFLAGS), GATE(PCLK_MIPIDSIPHY, "pclk_mipidsiphy", "pclk_top_pre", 0, PX30_CLKGATE_CON(16), 4, GFLAGS), GATE(PCLK_MIPICSIPHY, "pclk_mipicsiphy", "pclk_top_pre", 0, PX30_CLKGATE_CON(16), 5, GFLAGS), @@ -111350,7 +107252,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 GATE(PCLK_MIPI_DSI, "pclk_mipi_dsi", "pclk_vo_pre", 0, PX30_CLKGATE_CON(3), 9, GFLAGS), /* PD_BUS */ -@@ -843,7 +838,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { +@@ -843,7 +828,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { GATE(0, "pclk_bus_niu", "pclk_bus_pre", CLK_IGNORE_UNUSED, PX30_CLKGATE_CON(13), 10, GFLAGS), GATE(PCLK_DCF, "pclk_dcf", "pclk_bus_pre", 0, PX30_CLKGATE_CON(14), 0, GFLAGS), GATE(PCLK_UART1, "pclk_uart1", "pclk_bus_pre", 0, PX30_CLKGATE_CON(14), 5, GFLAGS), @@ -111359,7 +107261,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 GATE(PCLK_UART3, "pclk_uart3", "pclk_bus_pre", 0, PX30_CLKGATE_CON(14), 7, GFLAGS), GATE(PCLK_UART4, "pclk_uart4", "pclk_bus_pre", 0, PX30_CLKGATE_CON(14), 8, GFLAGS), GATE(PCLK_UART5, "pclk_uart5", "pclk_bus_pre", 0, PX30_CLKGATE_CON(14), 9, GFLAGS), -@@ -884,7 +879,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { +@@ -884,7 +869,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_sdmmc_pre", 0, PX30_CLKGATE_CON(7), 1, GFLAGS), /* PD_PERI */ @@ -111368,7 +107270,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 /* PD_MMC_NAND */ GATE(HCLK_NANDC, "hclk_nandc", "hclk_mmc_nand", 0, PX30_CLKGATE_CON(5), 15, GFLAGS), -@@ -894,7 +889,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { +@@ -894,7 +879,7 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { GATE(HCLK_SFC, "hclk_sfc", "hclk_mmc_nand", 0, PX30_CLKGATE_CON(6), 11, GFLAGS), /* PD_USB */ @@ -111377,7 +107279,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 GATE(HCLK_OTG, "hclk_otg", "hclk_usb", 0, PX30_CLKGATE_CON(7), 5, GFLAGS), GATE(HCLK_HOST, "hclk_host", "hclk_usb", 0, PX30_CLKGATE_CON(7), 6, GFLAGS), GATE(HCLK_HOST_ARB, "hclk_host_arb", "hclk_usb", CLK_IGNORE_UNUSED, PX30_CLKGATE_CON(7), 8, GFLAGS), -@@ -910,6 +905,18 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { +@@ -910,6 +895,18 @@ static struct rockchip_clk_branch px30_clk_branches[] __initdata = { PX30_CLKGATE_CON(8), 3, GFLAGS), }; @@ -111396,24 +107298,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 static struct rockchip_clk_branch px30_clk_pmu_branches[] __initdata = { /* * Clock-Architecture Diagram 2 -@@ -918,7 +925,7 @@ static struct rockchip_clk_branch px30_clk_pmu_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_rtc32k_frac", "xin24m", CLK_IGNORE_UNUSED, - PX30_PMU_CLKSEL_CON(1), 0, - PX30_PMU_CLKGATE_CON(0), 13, GFLAGS, -- &px30_rtc32k_pmu_fracmux), -+ &px30_rtc32k_pmu_fracmux, 0), - - COMPOSITE_NOMUX(XIN24M_DIV, "xin24m_div", "xin24m", CLK_IGNORE_UNUSED, - PX30_PMU_CLKSEL_CON(0), 8, 5, DFLAGS, -@@ -940,14 +947,14 @@ static struct rockchip_clk_branch px30_clk_pmu_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_uart0_frac", "clk_uart0_pmu_src", CLK_SET_RATE_PARENT, - PX30_PMU_CLKSEL_CON(5), 0, - PX30_PMU_CLKGATE_CON(1), 2, GFLAGS, -- &px30_uart0_pmu_fracmux), -+ &px30_uart0_pmu_fracmux, PX30_FRAC_MAX_PRATE), - GATE(SCLK_UART0_PMU, "clk_uart0_pmu", "clk_uart0_pmu_mux", CLK_SET_RATE_PARENT, - PX30_PMU_CLKGATE_CON(1), 3, GFLAGS), - +@@ -947,7 +944,7 @@ static struct rockchip_clk_branch px30_clk_pmu_branches[] __initdata = { GATE(SCLK_PVTM_PMU, "clk_pvtm_pmu", "xin24m", 0, PX30_PMU_CLKGATE_CON(1), 4, GFLAGS), @@ -111422,7 +107307,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 PX30_PMU_CLKSEL_CON(0), 0, 5, DFLAGS, PX30_PMU_CLKGATE_CON(0), 0, GFLAGS), -@@ -976,28 +983,7 @@ static struct rockchip_clk_branch px30_clk_pmu_branches[] __initdata = { +@@ -976,28 +973,47 @@ static struct rockchip_clk_branch px30_clk_pmu_branches[] __initdata = { GATE(0, "pclk_cru_pmu", "pclk_pmu_pre", CLK_IGNORE_UNUSED, PX30_PMU_CLKGATE_CON(0), 8, GFLAGS), }; @@ -111446,64 +107331,101 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 - "clk_uart2", - "pclk_uart2", - "pclk_usb_grf", --}; -- -+static struct rockchip_clk_provider *cru_ctx; ++static struct rockchip_clk_branch px30_clk_ddrphy_otp[] __initdata = { ++ COMPOSITE_NOGATE(0, "clk_ddrphy4x", mux_ddrphy_p, CLK_IGNORE_UNUSED, ++ PX30_CLKSEL_CON(2), 7, 1, MFLAGS, 0, 3, DFLAGS), ++ FACTOR_GATE(0, "clk_ddrphy1x", "clk_ddrphy4x", CLK_IGNORE_UNUSED, 1, 4, ++ PX30_CLKGATE_CON(0), 14, GFLAGS), ++ FACTOR_GATE(0, "clk_stdby_2wrap", "clk_ddrphy4x", ++ CLK_IGNORE_UNUSED, 1, 4, ++ PX30_CLKGATE_CON(1), 0, GFLAGS), ++ ++ COMPOSITE_NOMUX(SCLK_OTP, "clk_otp", "xin24m", 0, ++ PX30_CLKSEL_CON(56), 0, 3, DFLAGS, ++ PX30_CLKGATE_CON(12), 11, GFLAGS), ++ COMPOSITE_NOMUX(SCLK_OTP_USR, "clk_otp_usr", "clk_otp", 0, ++ PX30_CLKSEL_CON(56), 4, 2, DFLAGS, ++ PX30_CLKGATE_CON(13), 6, GFLAGS), + }; + ++static struct rockchip_clk_branch px30s_clk_ddrphy_otp[] __initdata = { ++ COMPOSITE(0, "clk_ddrphy1x", mux_ddrphy_p, CLK_IGNORE_UNUSED, ++ PX30_CLKSEL_CON(2), 7, 1, MFLAGS, 0, 3, DFLAGS, ++ PX30_CLKGATE_CON(0), 14, GFLAGS), ++ FACTOR_GATE(0, "clk_stdby_2wrap", "clk_ddrphy1x", ++ CLK_IGNORE_UNUSED, 1, 4, ++ PX30_CLKGATE_CON(1), 0, GFLAGS), ++ ++ COMPOSITE(SCLK_OTP_USR, "clk_otp_usr", mux_xin24m_gpll_p, 0, ++ PX30_CLKSEL_CON(56), 8, 1, MFLAGS, 0, 8, DFLAGS, ++ PX30_CLKGATE_CON(12), 11, GFLAGS), ++}; ++ ++static __initdata struct rockchip_clk_provider *cru_ctx, *pmucru_ctx; ++static void __init px30_register_armclk(void) ++{ ++ rockchip_clk_register_armclk(cru_ctx, ARMCLK, "armclk", 2, ++ cru_ctx->clk_data.clks[PLL_APLL], ++ pmucru_ctx->clk_data.clks[PLL_GPLL], ++ &px30_cpuclk_data, ++ px30_cpuclk_rates, ++ ARRAY_SIZE(px30_cpuclk_rates)); ++} ++ static void __init px30_clk_init(struct device_node *np) { struct rockchip_clk_provider *ctx; -@@ -1021,14 +1007,12 @@ static void __init px30_clk_init(struct device_node *np) +@@ -1015,20 +1031,31 @@ static void __init px30_clk_init(struct device_node *np) + iounmap(reg_base); + return; + } ++ cru_ctx = ctx; + + rockchip_clk_register_plls(ctx, px30_pll_clks, + ARRAY_SIZE(px30_pll_clks), PX30_GRF_SOC_STATUS0); - rockchip_clk_register_branches(ctx, px30_clk_branches, - ARRAY_SIZE(px30_clk_branches)); -- +- rockchip_clk_register_branches(ctx, px30_clk_branches, +- ARRAY_SIZE(px30_clk_branches)); + - rockchip_clk_register_armclk(ctx, ARMCLK, "armclk", - mux_armclk_p, ARRAY_SIZE(mux_armclk_p), - &px30_cpuclk_data, px30_cpuclk_rates, - ARRAY_SIZE(px30_cpuclk_rates)); -- ++ if (pmucru_ctx) ++ px30_register_armclk(); + - rockchip_clk_protect_critical(px30_cru_critical_clocks, - ARRAY_SIZE(px30_cru_critical_clocks)); ++ rockchip_clk_register_branches(ctx, px30_clk_branches, ++ ARRAY_SIZE(px30_clk_branches)); + if (of_machine_is_compatible("rockchip,px30")) + rockchip_clk_register_branches(ctx, px30_gpu_src_clk, + ARRAY_SIZE(px30_gpu_src_clk)); + else + rockchip_clk_register_branches(ctx, rk3326_gpu_src_clk, + ARRAY_SIZE(rk3326_gpu_src_clk)); ++ ++ rockchip_soc_id_init(); ++ if (soc_is_px30s()) ++ rockchip_clk_register_branches(ctx, px30s_clk_ddrphy_otp, ++ ARRAY_SIZE(px30s_clk_ddrphy_otp)); ++ else ++ rockchip_clk_register_branches(ctx, px30_clk_ddrphy_otp, ++ ARRAY_SIZE(px30_clk_ddrphy_otp)); rockchip_register_softrst(np, 12, reg_base + PX30_SOFTRST_CON(0), ROCKCHIP_SOFTRST_HIWORD_MASK); -@@ -1036,6 +1020,8 @@ static void __init px30_clk_init(struct device_node *np) - rockchip_register_restart_notifier(ctx, PX30_GLB_SRST_FST, NULL); - - rockchip_clk_of_add_provider(np, ctx); -+ -+ cru_ctx = ctx; - } - CLK_OF_DECLARE(px30_cru, "rockchip,px30-cru", px30_clk_init); - -@@ -1043,6 +1029,7 @@ static void __init px30_pmu_clk_init(struct device_node *np) - { - struct rockchip_clk_provider *ctx; - void __iomem *reg_base; -+ struct clk **pmucru_clks, **cru_clks; - - reg_base = of_iomap(np, 0); - if (!reg_base) { -@@ -1055,13 +1042,72 @@ static void __init px30_pmu_clk_init(struct device_node *np) +@@ -1055,13 +1082,72 @@ static void __init px30_pmu_clk_init(struct device_node *np) pr_err("%s: rockchip pmu clk init failed\n", __func__); return; } -+ pmucru_clks = ctx->clk_data.clks; -+ cru_clks = cru_ctx->clk_data.clks; ++ pmucru_ctx = ctx; rockchip_clk_register_plls(ctx, px30_pmu_pll_clks, ARRAY_SIZE(px30_pmu_pll_clks), PX30_GRF_SOC_STATUS0); -+ rockchip_clk_register_armclk(cru_ctx, ARMCLK, "armclk", -+ 2, cru_clks[PLL_APLL], pmucru_clks[PLL_GPLL], -+ &px30_cpuclk_data, px30_cpuclk_rates, -+ ARRAY_SIZE(px30_cpuclk_rates)); ++ if (cru_ctx) ++ px30_register_armclk(); + rockchip_clk_register_branches(ctx, px30_clk_pmu_branches, ARRAY_SIZE(px30_clk_pmu_branches)); @@ -111512,6 +107434,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 } CLK_OF_DECLARE(px30_cru_pmu, "rockchip,px30-pmucru", px30_pmu_clk_init); + ++#ifdef MODULE +struct clk_px30_inits { + void (*inits)(struct device_node *np); +}; @@ -111536,7 +107459,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 +}; +MODULE_DEVICE_TABLE(of, clk_px30_match_table); + -+static int __init clk_px30_probe(struct platform_device *pdev) ++static int clk_px30_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + const struct of_device_id *match; @@ -111554,18 +107477,20 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 +} + +static struct platform_driver clk_px30_driver = { ++ .probe = clk_px30_probe, + .driver = { + .name = "clk-px30", + .of_match_table = clk_px30_match_table, + }, +}; -+builtin_platform_driver_probe(clk_px30_driver, clk_px30_probe); ++module_platform_driver(clk_px30_driver); + +MODULE_DESCRIPTION("Rockchip PX30 Clock Driver"); +MODULE_LICENSE("GPL"); ++#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk1808.c b/drivers/clk/rockchip/clk-rk1808.c new file mode 100755 -index 000000000000..cb9483623f13 +index 000000000..e177a3dd6 --- /dev/null +++ b/drivers/clk/rockchip/clk-rk1808.c @@ -0,0 +1,1249 @@ @@ -112057,7 +107982,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(0, "dclk_vopraw_frac", "dclk_vopraw_src", CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(6), 0, + RK1808_CLKGATE_CON(3), 2, GFLAGS, -+ &rk1808_dclk_vopraw_fracmux, RK1808_VOP_RAW_FRAC_MAX_PRATE), ++ &rk1808_dclk_vopraw_fracmux), + GATE(DCLK_VOPRAW, "dclk_vopraw", "dclk_vopraw_mux", 0, + RK1808_CLKGATE_CON(3), 3, GFLAGS), + @@ -112067,7 +107992,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(0, "dclk_voplite_frac", "dclk_voplite_src", CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(8), 0, + RK1808_CLKGATE_CON(3), 5, GFLAGS, -+ &rk1808_dclk_voplite_fracmux, RK1808_VOP_LITE_FRAC_MAX_PRATE), ++ &rk1808_dclk_voplite_fracmux), + GATE(DCLK_VOPLITE, "dclk_voplite", "dclk_voplite_mux", 0, + RK1808_CLKGATE_CON(3), 6, GFLAGS), + @@ -112394,7 +108319,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(0, "clk_uart1_frac", "clk_uart1_src", CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(40), 0, + RK1808_CLKGATE_CON(11), 10, GFLAGS, -+ &rk1808_uart1_fracmux, RK1808_UART_FRAC_MAX_PRATE), ++ &rk1808_uart1_fracmux), + GATE(SCLK_UART1, "clk_uart1", "clk_uart1_mux", 0, + RK1808_CLKGATE_CON(11), 11, GFLAGS), + @@ -112407,7 +108332,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(0, "clk_uart2_frac", "clk_uart2_src", CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(43), 0, + RK1808_CLKGATE_CON(11), 14, GFLAGS, -+ &rk1808_uart2_fracmux, RK1808_UART_FRAC_MAX_PRATE), ++ &rk1808_uart2_fracmux), + GATE(SCLK_UART2, "clk_uart2", "clk_uart2_mux", 0, + RK1808_CLKGATE_CON(11), 15, GFLAGS), + @@ -112420,7 +108345,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(0, "clk_uart3_frac", "clk_uart3_src", CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(46), 0, + RK1808_CLKGATE_CON(12), 2, GFLAGS, -+ &rk1808_uart3_fracmux, RK1808_UART_FRAC_MAX_PRATE), ++ &rk1808_uart3_fracmux), + GATE(SCLK_UART3, "clk_uart3", "clk_uart3_mux", 0, + RK1808_CLKGATE_CON(12), 3, GFLAGS), + @@ -112433,7 +108358,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(0, "clk_uart4_frac", "clk_uart4_src", CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(49), 0, + RK1808_CLKGATE_CON(12), 6, GFLAGS, -+ &rk1808_uart4_fracmux, RK1808_UART_FRAC_MAX_PRATE), ++ &rk1808_uart4_fracmux), + GATE(SCLK_UART4, "clk_uart4", "clk_uart4_mux", 0, + RK1808_CLKGATE_CON(12), 7, GFLAGS), + @@ -112446,7 +108371,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(0, "clk_uart5_frac", "clk_uart5_src", CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(52), 0, + RK1808_CLKGATE_CON(12), 10, GFLAGS, -+ &rk1808_uart5_fracmux, RK1808_UART_FRAC_MAX_PRATE), ++ &rk1808_uart5_fracmux), + GATE(SCLK_UART5, "clk_uart5", "clk_uart5_mux", 0, + RK1808_CLKGATE_CON(12), 11, GFLAGS), + @@ -112459,7 +108384,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(0, "clk_uart6_frac", "clk_uart6_src", CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(55), 0, + RK1808_CLKGATE_CON(12), 14, GFLAGS, -+ &rk1808_uart6_fracmux, RK1808_UART_FRAC_MAX_PRATE), ++ &rk1808_uart6_fracmux), + GATE(SCLK_UART6, "clk_uart6", "clk_uart6_mux", 0, + RK1808_CLKGATE_CON(12), 15, GFLAGS), + @@ -112472,7 +108397,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(0, "clk_uart7_frac", "clk_uart7_src", CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(58), 0, + RK1808_CLKGATE_CON(13), 2, GFLAGS, -+ &rk1808_uart7_fracmux, RK1808_UART_FRAC_MAX_PRATE), ++ &rk1808_uart7_fracmux), + GATE(SCLK_UART7, "clk_uart7", "clk_uart7_mux", 0, + RK1808_CLKGATE_CON(13), 3, GFLAGS), + @@ -112575,7 +108500,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(0, "clk_pdm_frac", "clk_pdm_src", CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(31), 0, + RK1808_CLKGATE_CON(17), 10, GFLAGS, -+ &rk1808_pdm_fracmux, RK1808_PDM_FRAC_MAX_PRATE), ++ &rk1808_pdm_fracmux), + GATE(SCLK_PDM, "clk_pdm", "clk_pdm_mux", 0, + RK1808_CLKGATE_CON(17), 11, GFLAGS), + @@ -112585,7 +108510,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(0, "clk_i2s0_8ch_tx_frac", "clk_i2s0_8ch_tx_src", CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(33), 0, + RK1808_CLKGATE_CON(17), 13, GFLAGS, -+ &rk1808_i2s0_8ch_tx_fracmux, RK1808_I2S_FRAC_MAX_PRATE), ++ &rk1808_i2s0_8ch_tx_fracmux), + COMPOSITE_NODIV(SCLK_I2S0_8CH_TX, "clk_i2s0_8ch_tx", mux_i2s0_8ch_tx_rx_p, CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(32), 12, 1, MFLAGS, + RK1808_CLKGATE_CON(17), 14, GFLAGS), @@ -112599,7 +108524,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(0, "clk_i2s0_8ch_rx_frac", "clk_i2s0_8ch_rx_src", CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(35), 0, + RK1808_CLKGATE_CON(18), 1, GFLAGS, -+ &rk1808_i2s0_8ch_rx_fracmux, RK1808_I2S_FRAC_MAX_PRATE), ++ &rk1808_i2s0_8ch_rx_fracmux), + COMPOSITE_NODIV(SCLK_I2S0_8CH_RX, "clk_i2s0_8ch_rx", mux_i2s0_8ch_rx_tx_p, CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(34), 12, 1, MFLAGS, + RK1808_CLKGATE_CON(18), 2, GFLAGS), @@ -112613,7 +108538,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(0, "clk_i2s1_2ch_frac", "clk_i2s1_2ch_src", CLK_SET_RATE_PARENT, + RK1808_CLKSEL_CON(37), 0, + RK1808_CLKGATE_CON(18), 5, GFLAGS, -+ &rk1808_i2s1_2ch_fracmux, RK1808_I2S_FRAC_MAX_PRATE), ++ &rk1808_i2s1_2ch_fracmux), + GATE(SCLK_I2S1_2CH, "clk_i2s1_2ch", "clk_i2s1_2ch_mux", 0, + RK1808_CLKGATE_CON(18), 6, GFLAGS), + COMPOSITE_NODIV(SCLK_I2S1_2CH_OUT, "clk_i2s1_2ch_out", mux_i2s1_2ch_out_p, CLK_SET_RATE_PARENT, @@ -112645,7 +108570,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(SCLK_RTC32K_FRAC, "clk_rtc32k_frac", "xin24m", CLK_IGNORE_UNUSED, + RK1808_PMU_CLKSEL_CON(1), 0, + RK1808_PMU_CLKGATE_CON(0), 13, GFLAGS, -+ &rk1808_rtc32k_pmu_fracmux, 0), ++ &rk1808_rtc32k_pmu_fracmux), + + COMPOSITE_NOMUX(XIN24M_DIV, "xin24m_div", "xin24m", CLK_IGNORE_UNUSED, + RK1808_PMU_CLKSEL_CON(0), 8, 5, DFLAGS, @@ -112667,7 +108592,7 @@ index 000000000000..cb9483623f13 + COMPOSITE_FRACMUX(0, "clk_uart0_frac", "clk_uart0_pmu_src", CLK_SET_RATE_PARENT, + RK1808_PMU_CLKSEL_CON(5), 0, + RK1808_PMU_CLKGATE_CON(1), 2, GFLAGS, -+ &rk1808_uart0_pmu_fracmux, RK1808_UART_FRAC_MAX_PRATE), ++ &rk1808_uart0_pmu_fracmux), + GATE(SCLK_UART0_PMU, "clk_uart0_pmu", "clk_uart0_pmu_mux", CLK_SET_RATE_PARENT, + RK1808_PMU_CLKGATE_CON(1), 3, GFLAGS), + @@ -112819,10 +108744,10 @@ index 000000000000..cb9483623f13 +MODULE_DESCRIPTION("Rockchip RK1808 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3036.c b/drivers/clk/rockchip/clk-rk3036.c -index 6a46f85ad837..02770ff67e14 100644 +index 6a46f85ad..ed05eb6c5 100644 --- a/drivers/clk/rockchip/clk-rk3036.c +++ b/drivers/clk/rockchip/clk-rk3036.c -@@ -9,13 +9,18 @@ +@@ -9,8 +9,10 @@ #include #include @@ -112833,15 +108758,7 @@ index 6a46f85ad837..02770ff67e14 100644 #include #include #include "clk.h" - - #define RK3036_GRF_SOC_STATUS0 0x14c -+#define RK3036_UART_FRAC_MAX_PRATE 600000000 -+#define RK3036_I2S_FRAC_MAX_PRATE 600000000 -+#define RK3036_SPDIF_FRAC_MAX_PRATE 600000000 - - enum rk3036_plls { - apll, dpll, gpll, -@@ -96,15 +101,19 @@ static struct rockchip_pll_rate_table rk3036_pll_rates[] = { +@@ -96,15 +98,19 @@ static struct rockchip_pll_rate_table rk3036_pll_rates[] = { } static struct rockchip_cpuclk_rate_table rk3036_cpuclk_rates[] __initdata = { @@ -112864,22 +108781,30 @@ index 6a46f85ad837..02770ff67e14 100644 .mux_core_alt = 1, .mux_core_main = 0, .mux_core_shift = 7, -@@ -113,13 +122,13 @@ static const struct rockchip_cpuclk_reg_data rk3036_cpuclk_data = { +@@ -113,15 +119,17 @@ static const struct rockchip_cpuclk_reg_data rk3036_cpuclk_data = { PNAME(mux_pll_p) = { "xin24m", "xin24m" }; -PNAME(mux_armclk_p) = { "apll", "gpll_armclk" }; - PNAME(mux_busclk_p) = { "apll", "dpll_cpu", "gpll_cpu" }; +-PNAME(mux_busclk_p) = { "apll", "dpll_cpu", "gpll_cpu" }; ++PNAME(mux_busclk_p) = { "dummy_apll", "dpll_cpu", "gpll_cpu" }; PNAME(mux_ddrphy_p) = { "dpll_ddr", "gpll_ddr" }; - PNAME(mux_pll_src_3plls_p) = { "apll", "dpll", "gpll" }; +-PNAME(mux_pll_src_3plls_p) = { "apll", "dpll", "gpll" }; ++PNAME(mux_pll_src_apll_dpll_gpll_p) = { "apll", "dpll", "gpll" }; ++PNAME(mux_pll_src_dmyapll_dpll_gpll_p) = { "dummy_apll", "dpll", "gpll" }; ++ PNAME(mux_timer_p) = { "xin24m", "pclk_peri_src" }; - PNAME(mux_pll_src_apll_dpll_gpll_usb480m_p) = { "apll", "dpll", "gpll", "usb480m" }; +-PNAME(mux_pll_src_apll_dpll_gpll_usb480m_p) = { "apll", "dpll", "gpll", "usb480m" }; ++PNAME(mux_pll_src_dmyapll_dpll_gpll_usb480m_p) = { "dummy_apll", "dpll", "gpll", "usb480m" }; +PNAME(mux_pll_src_dmyapll_dpll_gpll_xin24_p) = { "dummy_apll", "dpll", "gpll", "xin24m" }; - PNAME(mux_mmc_src_p) = { "apll", "dpll", "gpll", "xin24m" }; +-PNAME(mux_mmc_src_p) = { "apll", "dpll", "gpll", "xin24m" }; ++PNAME(mux_mmc_src_p) = { "dummy_apll", "dpll", "gpll", "xin24m" }; PNAME(mux_i2s_pre_p) = { "i2s_src", "i2s_frac", "ext_i2s", "xin12m" }; -@@ -157,7 +166,7 @@ static struct rockchip_clk_branch rk3036_uart2_fracmux __initdata = + PNAME(mux_i2s_clkout_p) = { "i2s_pre", "xin12m" }; + PNAME(mux_spdif_p) = { "spdif_src", "spdif_frac", "xin12m" }; +@@ -157,7 +165,7 @@ static struct rockchip_clk_branch rk3036_uart2_fracmux __initdata = RK2928_CLKSEL_CON(15), 8, 2, MFLAGS); static struct rockchip_clk_branch rk3036_i2s_fracmux __initdata = @@ -112888,7 +108813,7 @@ index 6a46f85ad837..02770ff67e14 100644 RK2928_CLKSEL_CON(3), 8, 2, MFLAGS); static struct rockchip_clk_branch rk3036_spdif_fracmux __initdata = -@@ -193,32 +202,32 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { +@@ -193,32 +201,32 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { RK2928_CLKSEL_CON(1), 4, 3, DFLAGS | CLK_DIVIDER_READ_ONLY, RK2928_CLKGATE_CON(0), 7, GFLAGS), @@ -112912,7 +108837,7 @@ index 6a46f85ad837..02770ff67e14 100644 RK2928_CLKGATE_CON(0), 4, GFLAGS), - COMPOSITE(0, "aclk_peri_src", mux_pll_src_3plls_p, 0, -+ COMPOSITE(0, "aclk_peri_src", mux_pll_src_3plls_p, CLK_IS_CRITICAL, ++ COMPOSITE(0, "aclk_peri_src", mux_pll_src_dmyapll_dpll_gpll_p, 0, RK2928_CLKSEL_CON(10), 14, 2, MFLAGS, 0, 5, DFLAGS, RK2928_CLKGATE_CON(2), 0, GFLAGS), @@ -112933,57 +108858,82 @@ index 6a46f85ad837..02770ff67e14 100644 RK2928_CLKGATE_CON(2), 2, GFLAGS), COMPOSITE_NODIV(SCLK_TIMER0, "sclk_timer0", mux_timer_p, CLK_IGNORE_UNUSED, -@@ -248,15 +257,15 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "uart0_frac", "uart0_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(17), 0, - RK2928_CLKGATE_CON(1), 9, GFLAGS, -- &rk3036_uart0_fracmux), -+ &rk3036_uart0_fracmux, RK3036_UART_FRAC_MAX_PRATE), - COMPOSITE_FRACMUX(0, "uart1_frac", "uart1_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(18), 0, - RK2928_CLKGATE_CON(1), 11, GFLAGS, -- &rk3036_uart1_fracmux), -+ &rk3036_uart1_fracmux, RK3036_UART_FRAC_MAX_PRATE), - COMPOSITE_FRACMUX(0, "uart2_frac", "uart2_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(19), 0, +@@ -234,7 +242,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { + RK2928_CLKSEL_CON(2), 7, 1, MFLAGS, + RK2928_CLKGATE_CON(2), 5, GFLAGS), + +- MUX(0, "uart_pll_clk", mux_pll_src_apll_dpll_gpll_usb480m_p, 0, ++ MUX(0, "uart_pll_clk", mux_pll_src_dmyapll_dpll_gpll_usb480m_p, 0, + RK2928_CLKSEL_CON(13), 10, 2, MFLAGS), + COMPOSITE_NOMUX(0, "uart0_src", "uart_pll_clk", 0, + RK2928_CLKSEL_CON(13), 0, 7, DFLAGS, +@@ -258,23 +266,23 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { RK2928_CLKGATE_CON(1), 13, GFLAGS, -- &rk3036_uart2_fracmux), -+ &rk3036_uart2_fracmux, RK3036_UART_FRAC_MAX_PRATE), + &rk3036_uart2_fracmux), - COMPOSITE(0, "aclk_vcodec", mux_pll_src_3plls_p, 0, +- COMPOSITE(0, "aclk_vcodec", mux_pll_src_3plls_p, 0, ++ COMPOSITE(ACLK_VCODEC, "aclk_vcodec", mux_pll_src_dmyapll_dpll_gpll_p, 0, RK2928_CLKSEL_CON(32), 14, 2, MFLAGS, 8, 5, DFLAGS, -@@ -264,7 +273,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { + RK2928_CLKGATE_CON(3), 11, GFLAGS), FACTOR_GATE(HCLK_VCODEC, "hclk_vcodec", "aclk_vcodec", 0, 1, 4, RK2928_CLKGATE_CON(3), 12, GFLAGS), - COMPOSITE(0, "aclk_hvec", mux_pll_src_3plls_p, 0, -+ COMPOSITE(ACLK_HEVC, "aclk_hevc", mux_pll_src_3plls_p, 0, ++ COMPOSITE(ACLK_HEVC, "aclk_hevc", mux_pll_src_dmyapll_dpll_gpll_p, 0, RK2928_CLKSEL_CON(20), 0, 2, MFLAGS, 2, 5, DFLAGS, RK2928_CLKGATE_CON(10), 6, GFLAGS), -@@ -306,10 +315,10 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { - COMPOSITE(0, "i2s_src", mux_pll_src_3plls_p, 0, +- COMPOSITE(0, "aclk_disp1_pre", mux_pll_src_3plls_p, 0, ++ COMPOSITE(0, "aclk_disp1_pre", mux_pll_src_dmyapll_dpll_gpll_p, 0, + RK2928_CLKSEL_CON(31), 14, 2, MFLAGS, 8, 5, DFLAGS, + RK2928_CLKGATE_CON(1), 4, GFLAGS), +- COMPOSITE(0, "hclk_disp_pre", mux_pll_src_3plls_p, 0, ++ COMPOSITE(0, "hclk_disp_pre", mux_pll_src_dmyapll_dpll_gpll_p, 0, + RK2928_CLKSEL_CON(30), 14, 2, MFLAGS, 8, 5, DFLAGS, + RK2928_CLKGATE_CON(0), 11, GFLAGS), +- COMPOSITE(SCLK_LCDC, "dclk_lcdc", mux_pll_src_3plls_p, 0, ++ COMPOSITE(SCLK_LCDC, "dclk_lcdc", mux_pll_src_apll_dpll_gpll_p, 0, + RK2928_CLKSEL_CON(28), 0, 2, MFLAGS, 8, 8, DFLAGS, + RK2928_CLKGATE_CON(3), 2, GFLAGS), + +@@ -303,10 +311,10 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { + MMC(SCLK_EMMC_DRV, "emmc_drv", "sclk_emmc", RK3036_EMMC_CON0, 1), + MMC(SCLK_EMMC_SAMPLE, "emmc_sample", "sclk_emmc", RK3036_EMMC_CON1, 0), + +- COMPOSITE(0, "i2s_src", mux_pll_src_3plls_p, 0, ++ COMPOSITE(0, "i2s_src", mux_pll_src_dmyapll_dpll_gpll_p, 0, RK2928_CLKSEL_CON(3), 14, 2, MFLAGS, 0, 7, DFLAGS, RK2928_CLKGATE_CON(0), 9, GFLAGS), - COMPOSITE_FRACMUX(0, "i2s_frac", "i2s_src", CLK_SET_RATE_PARENT, + COMPOSITE_FRACMUX(SCLK_I2S_FRAC, "i2s_frac", "i2s_src", CLK_SET_RATE_PARENT, RK2928_CLKSEL_CON(7), 0, RK2928_CLKGATE_CON(0), 10, GFLAGS, -- &rk3036_i2s_fracmux), -+ &rk3036_i2s_fracmux, RK3036_I2S_FRAC_MAX_PRATE), - COMPOSITE_NODIV(SCLK_I2S_OUT, "i2s_clkout", mux_i2s_clkout_p, 0, - RK2928_CLKSEL_CON(3), 12, 1, MFLAGS, - RK2928_CLKGATE_CON(0), 13, GFLAGS), -@@ -322,7 +331,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "spdif_frac", "spdif_src", 0, - RK2928_CLKSEL_CON(9), 0, - RK2928_CLKGATE_CON(2), 12, GFLAGS, -- &rk3036_spdif_fracmux), -+ &rk3036_spdif_fracmux, RK3036_SPDIF_FRAC_MAX_PRATE), + &rk3036_i2s_fracmux), +@@ -316,7 +324,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { + GATE(SCLK_I2S, "sclk_i2s", "i2s_pre", CLK_SET_RATE_PARENT, + RK2928_CLKGATE_CON(0), 14, GFLAGS), +- COMPOSITE(0, "spdif_src", mux_pll_src_3plls_p, 0, ++ COMPOSITE(0, "spdif_src", mux_pll_src_dmyapll_dpll_gpll_p, 0, + RK2928_CLKSEL_CON(5), 10, 2, MFLAGS, 0, 7, DFLAGS, + RK2928_CLKGATE_CON(2), 10, GFLAGS), + COMPOSITE_FRACMUX(0, "spdif_frac", "spdif_src", 0, +@@ -327,23 +335,23 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { GATE(SCLK_OTGPHY0, "sclk_otgphy0", "xin12m", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(1), 5, GFLAGS), -@@ -339,7 +348,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { + +- COMPOSITE(SCLK_GPU, "sclk_gpu", mux_pll_src_3plls_p, 0, ++ COMPOSITE(SCLK_GPU, "sclk_gpu", mux_pll_src_dmyapll_dpll_gpll_p, 0, + RK2928_CLKSEL_CON(34), 8, 2, MFLAGS, 0, 5, DFLAGS, + RK2928_CLKGATE_CON(3), 13, GFLAGS), + +- COMPOSITE(SCLK_SPI, "sclk_spi", mux_pll_src_3plls_p, 0, ++ COMPOSITE(SCLK_SPI, "sclk_spi", mux_pll_src_dmyapll_dpll_gpll_p, 0, + RK2928_CLKSEL_CON(25), 8, 2, MFLAGS, 0, 7, DFLAGS, + RK2928_CLKGATE_CON(2), 9, GFLAGS), + +- COMPOSITE(SCLK_NANDC, "sclk_nandc", mux_pll_src_3plls_p, 0, ++ COMPOSITE(SCLK_NANDC, "sclk_nandc", mux_pll_src_dmyapll_dpll_gpll_p, 0, RK2928_CLKSEL_CON(16), 8, 2, MFLAGS, 10, 5, DFLAGS, RK2928_CLKGATE_CON(10), 4, GFLAGS), @@ -112992,7 +108942,12 @@ index 6a46f85ad837..02770ff67e14 100644 RK2928_CLKSEL_CON(16), 0, 2, MFLAGS, 2, 5, DFLAGS, RK2928_CLKGATE_CON(10), 5, GFLAGS), -@@ -369,7 +378,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { +- COMPOSITE_NOGATE(SCLK_MACPLL, "mac_pll_src", mux_pll_src_3plls_p, CLK_SET_RATE_NO_REPARENT, ++ COMPOSITE_NOGATE(SCLK_MACPLL, "mac_pll_src", mux_pll_src_apll_dpll_gpll_p, CLK_SET_RATE_NO_REPARENT, + RK2928_CLKSEL_CON(21), 0, 2, MFLAGS, 9, 5, DFLAGS), + MUX(SCLK_MACREF, "mac_clk_ref", mux_mac_p, CLK_SET_RATE_PARENT, + RK2928_CLKSEL_CON(21), 3, 1, MFLAGS), +@@ -369,7 +377,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { /* pclk_cpu gates */ GATE(PCLK_GRF, "pclk_grf", "pclk_cpu", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(5), 4, GFLAGS), @@ -113001,7 +108956,7 @@ index 6a46f85ad837..02770ff67e14 100644 GATE(PCLK_ACODEC, "pclk_acodec", "pclk_cpu", 0, RK2928_CLKGATE_CON(5), 14, GFLAGS), GATE(PCLK_HDMI, "pclk_hdmi", "pclk_cpu", 0, RK2928_CLKGATE_CON(3), 8, GFLAGS), -@@ -402,7 +411,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { +@@ -402,7 +410,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { GATE(HCLK_OTG0, "hclk_otg0", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(5), 13, GFLAGS), GATE(HCLK_OTG1, "hclk_otg1", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(7), 3, GFLAGS), GATE(HCLK_I2S, "hclk_i2s", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 2, GFLAGS), @@ -113010,7 +108965,7 @@ index 6a46f85ad837..02770ff67e14 100644 GATE(HCLK_MAC, "hclk_mac", "hclk_peri", 0, RK2928_CLKGATE_CON(3), 5, GFLAGS), /* pclk_peri gates */ -@@ -423,19 +432,24 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { +@@ -423,19 +431,24 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { GATE(PCLK_GPIO2, "pclk_gpio2", "pclk_peri", 0, RK2928_CLKGATE_CON(8), 11, GFLAGS), }; @@ -113042,7 +108997,7 @@ index 6a46f85ad837..02770ff67e14 100644 reg_base = of_iomap(np, 0); if (!reg_base) { -@@ -456,6 +470,7 @@ static void __init rk3036_clk_init(struct device_node *np) +@@ -456,6 +469,7 @@ static void __init rk3036_clk_init(struct device_node *np) iounmap(reg_base); return; } @@ -113050,7 +109005,7 @@ index 6a46f85ad837..02770ff67e14 100644 clk = clk_register_fixed_factor(NULL, "usb480m", "xin24m", 0, 20, 1); if (IS_ERR(clk)) -@@ -467,11 +482,9 @@ static void __init rk3036_clk_init(struct device_node *np) +@@ -467,11 +481,9 @@ static void __init rk3036_clk_init(struct device_node *np) RK3036_GRF_SOC_STATUS0); rockchip_clk_register_branches(ctx, rk3036_clk_branches, ARRAY_SIZE(rk3036_clk_branches)); @@ -113063,7 +109018,7 @@ index 6a46f85ad837..02770ff67e14 100644 &rk3036_cpuclk_data, rk3036_cpuclk_rates, ARRAY_SIZE(rk3036_cpuclk_rates)); -@@ -481,5 +494,38 @@ static void __init rk3036_clk_init(struct device_node *np) +@@ -481,5 +493,38 @@ static void __init rk3036_clk_init(struct device_node *np) rockchip_register_restart_notifier(ctx, RK2928_GLB_SRST_FST, NULL); rockchip_clk_of_add_provider(np, ctx); @@ -113103,10 +109058,10 @@ index 6a46f85ad837..02770ff67e14 100644 +MODULE_DESCRIPTION("Rockchip RK3036 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3128.c b/drivers/clk/rockchip/clk-rk3128.c -index 4b1122e98e16..6f6f44ac7257 100644 +index 4b1122e98..1b1111e88 100644 --- a/drivers/clk/rockchip/clk-rk3128.c +++ b/drivers/clk/rockchip/clk-rk3128.c -@@ -6,13 +6,19 @@ +@@ -6,8 +6,11 @@ #include #include @@ -113118,15 +109073,7 @@ index 4b1122e98e16..6f6f44ac7257 100644 #include #include #include "clk.h" - - #define RK3128_GRF_SOC_STATUS0 0x14c -+#define RK3128_UART_FRAC_MAX_PRATE 600000000 -+#define RK3128_I2S_FRAC_MAX_PRATE 600000000 -+#define RK3128_SPDIF_FRAC_MAX_PRATE 600000000 - - enum rk3128_plls { - apll, dpll, cpll, gpll, -@@ -117,9 +123,10 @@ static struct rockchip_cpuclk_rate_table rk3128_cpuclk_rates[] __initdata = { +@@ -117,9 +120,10 @@ static struct rockchip_cpuclk_rate_table rk3128_cpuclk_rates[] __initdata = { }; static const struct rockchip_cpuclk_reg_data rk3128_cpuclk_data = { @@ -113140,7 +109087,7 @@ index 4b1122e98e16..6f6f44ac7257 100644 .mux_core_alt = 1, .mux_core_main = 0, .mux_core_shift = 7, -@@ -129,7 +136,6 @@ static const struct rockchip_cpuclk_reg_data rk3128_cpuclk_data = { +@@ -129,7 +133,6 @@ static const struct rockchip_cpuclk_reg_data rk3128_cpuclk_data = { PNAME(mux_pll_p) = { "clk_24m", "xin24m" }; PNAME(mux_ddrphy_p) = { "dpll_ddr", "gpll_div2_ddr" }; @@ -113148,7 +109095,32 @@ index 4b1122e98e16..6f6f44ac7257 100644 PNAME(mux_usb480m_p) = { "usb480m_phy", "xin24m" }; PNAME(mux_aclk_cpu_src_p) = { "cpll", "gpll", "gpll_div2", "gpll_div3" }; -@@ -231,15 +237,15 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { +@@ -137,9 +140,9 @@ PNAME(mux_pll_src_5plls_p) = { "cpll", "gpll", "gpll_div2", "gpll_div3", "usb480 + PNAME(mux_pll_src_4plls_p) = { "cpll", "gpll", "gpll_div2", "usb480m" }; + PNAME(mux_pll_src_3plls_p) = { "cpll", "gpll", "gpll_div2" }; + +-PNAME(mux_aclk_peri_src_p) = { "gpll_peri", "cpll_peri", "gpll_div2_peri", "gpll_div3_peri" }; ++PNAME(mux_aclk_peri_src_p) = { "gpll", "cpll", "gpll_div2", "gpll_div3" }; + PNAME(mux_mmc_src_p) = { "cpll", "gpll", "gpll_div2", "xin24m" }; +-PNAME(mux_clk_cif_out_src_p) = { "clk_cif_src", "xin24m" }; ++PNAME(mux_clk_cif_out_src_p) = { "sclk_cif_src", "xin24m" }; + PNAME(mux_sclk_vop_src_p) = { "cpll", "gpll", "gpll_div2", "gpll_div3" }; + + PNAME(mux_i2s0_p) = { "i2s0_src", "i2s0_frac", "ext_i2s", "xin12m" }; +@@ -209,9 +212,9 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { + RK2928_CLKGATE_CON(0), 2, GFLAGS), + GATE(0, "gpll_div2_ddr", "gpll_div2", CLK_IGNORE_UNUSED, + RK2928_CLKGATE_CON(0), 2, GFLAGS), +- COMPOSITE_NOGATE(0, "ddrphy2x", mux_ddrphy_p, CLK_IGNORE_UNUSED, +- RK2928_CLKSEL_CON(26), 8, 2, MFLAGS, 0, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO), +- FACTOR(SCLK_DDRC, "clk_ddrc", "ddrphy2x", 0, 1, 2), ++ COMPOSITE_DDRCLK(SCLK_DDRC, "clk_ddrc", mux_ddrphy_p, 0, ++ RK2928_CLKSEL_CON(26), 8, 2, 0, 2, ++ ROCKCHIP_DDRCLK_SIP_V2), + FACTOR(0, "clk_ddrphy", "ddrphy2x", 0, 1, 2), + + /* PD_CORE */ +@@ -231,15 +234,15 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { RK2928_MISC_CON, 15, 1, MFLAGS), /* PD_CPU */ @@ -113168,7 +109140,7 @@ index 4b1122e98e16..6f6f44ac7257 100644 RK2928_CLKSEL_CON(1), 12, 2, DFLAGS, RK2928_CLKGATE_CON(0), 5, GFLAGS), COMPOSITE_NOMUX(SCLK_CRYPTO, "clk_crypto", "aclk_cpu_src", 0, -@@ -263,34 +269,33 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { +@@ -263,34 +266,27 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { RK2928_CLKGATE_CON(3), 10, GFLAGS), /* PD_VIO */ @@ -113186,21 +109158,19 @@ index 4b1122e98e16..6f6f44ac7257 100644 /* PD_PERI */ - GATE(0, "gpll_peri", "gpll", CLK_IGNORE_UNUSED, -+ GATE(0, "gpll_peri", "gpll", CLK_IS_CRITICAL, ++ COMPOSITE(0, "aclk_peri_src", mux_aclk_peri_src_p, 0, ++ RK2928_CLKSEL_CON(10), 14, 2, MFLAGS, 0, 5, DFLAGS, RK2928_CLKGATE_CON(2), 0, GFLAGS), - GATE(0, "cpll_peri", "cpll", CLK_IGNORE_UNUSED, -+ GATE(0, "cpll_peri", "cpll", CLK_IS_CRITICAL, - RK2928_CLKGATE_CON(2), 0, GFLAGS), +- RK2928_CLKGATE_CON(2), 0, GFLAGS), - GATE(0, "gpll_div2_peri", "gpll_div2", CLK_IGNORE_UNUSED, -+ GATE(0, "gpll_div2_peri", "gpll_div2", CLK_IS_CRITICAL, - RK2928_CLKGATE_CON(2), 0, GFLAGS), +- RK2928_CLKGATE_CON(2), 0, GFLAGS), - GATE(0, "gpll_div3_peri", "gpll_div3", CLK_IGNORE_UNUSED, -+ GATE(0, "gpll_div3_peri", "gpll_div3", CLK_IS_CRITICAL, - RK2928_CLKGATE_CON(2), 0, GFLAGS), +- RK2928_CLKGATE_CON(2), 0, GFLAGS), - COMPOSITE_NOGATE(0, "aclk_peri_src", mux_aclk_peri_src_p, 0, -+ COMPOSITE_NOGATE(0, "aclk_peri_src", mux_aclk_peri_src_p, CLK_IS_CRITICAL, - RK2928_CLKSEL_CON(10), 14, 2, MFLAGS, 0, 5, DFLAGS), +- RK2928_CLKSEL_CON(10), 14, 2, MFLAGS, 0, 5, DFLAGS), - COMPOSITE_NOMUX(PCLK_PERI, "pclk_peri", "aclk_peri_src", 0, ++ + COMPOSITE_NOMUX(PCLK_PERI, "pclk_peri", "aclk_peri_src", CLK_IS_CRITICAL, RK2928_CLKSEL_CON(10), 12, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO, RK2928_CLKGATE_CON(2), 3, GFLAGS), @@ -113213,7 +109183,7 @@ index 4b1122e98e16..6f6f44ac7257 100644 RK2928_CLKGATE_CON(2), 1, GFLAGS), GATE(SCLK_TIMER0, "sclk_timer0", "xin24m", 0, -@@ -303,7 +308,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { +@@ -303,7 +299,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { RK2928_CLKGATE_CON(10), 6, GFLAGS), GATE(SCLK_TIMER4, "sclk_timer4", "xin24m", 0, RK2928_CLKGATE_CON(10), 7, GFLAGS), @@ -113222,7 +109192,7 @@ index 4b1122e98e16..6f6f44ac7257 100644 RK2928_CLKGATE_CON(10), 8, GFLAGS), GATE(SCLK_PVTM_CORE, "clk_pvtm_core", "xin24m", 0, -@@ -312,7 +317,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { +@@ -312,10 +308,10 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { RK2928_CLKGATE_CON(10), 1, GFLAGS), GATE(SCLK_PVTM_FUNC, "clk_pvtm_func", "xin24m", 0, RK2928_CLKGATE_CON(10), 2, GFLAGS), @@ -113230,54 +109200,28 @@ index 4b1122e98e16..6f6f44ac7257 100644 + GATE(SCLK_MIPI_24M, "clk_mipi_24m", "xin24m", 0, RK2928_CLKGATE_CON(2), 15, GFLAGS), - COMPOSITE(SCLK_SDMMC, "sclk_sdmmc0", mux_mmc_src_p, 0, -@@ -359,7 +364,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "i2s0_frac", "i2s0_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(8), 0, - RK2928_CLKGATE_CON(4), 5, GFLAGS, -- &rk3128_i2s0_fracmux), -+ &rk3128_i2s0_fracmux, RK3128_I2S_FRAC_MAX_PRATE), - GATE(SCLK_I2S0, "sclk_i2s0", "i2s0_pre", CLK_SET_RATE_PARENT, - RK2928_CLKGATE_CON(4), 6, GFLAGS), - -@@ -369,7 +374,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "i2s1_frac", "i2s1_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(7), 0, - RK2928_CLKGATE_CON(0), 10, GFLAGS, -- &rk3128_i2s1_fracmux), -+ &rk3128_i2s1_fracmux, RK3128_I2S_FRAC_MAX_PRATE), - GATE(SCLK_I2S1, "sclk_i2s1", "i2s1_pre", CLK_SET_RATE_PARENT, - RK2928_CLKGATE_CON(0), 14, GFLAGS), - COMPOSITE_NODIV(SCLK_I2S_OUT, "i2s_out", mux_i2s_out_p, 0, -@@ -382,7 +387,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "spdif_frac", "sclk_spdif_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(20), 0, - RK2928_CLKGATE_CON(2), 12, GFLAGS, -- &rk3128_spdif_fracmux), -+ &rk3128_spdif_fracmux, RK3128_SPDIF_FRAC_MAX_PRATE), - - GATE(0, "jtag", "ext_jtag", CLK_IGNORE_UNUSED, - RK2928_CLKGATE_CON(1), 3, GFLAGS), -@@ -419,15 +424,15 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "uart0_frac", "uart0_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(17), 0, - RK2928_CLKGATE_CON(1), 9, GFLAGS, -- &rk3128_uart0_fracmux), -+ &rk3128_uart0_fracmux, RK3128_UART_FRAC_MAX_PRATE), - COMPOSITE_FRACMUX(0, "uart1_frac", "uart1_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(18), 0, - RK2928_CLKGATE_CON(1), 11, GFLAGS, -- &rk3128_uart1_fracmux), -+ &rk3128_uart1_fracmux, RK3128_UART_FRAC_MAX_PRATE), - COMPOSITE_FRACMUX(0, "uart2_frac", "uart2_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(19), 0, - RK2928_CLKGATE_CON(1), 13, GFLAGS, -- &rk3128_uart2_fracmux), -+ &rk3128_uart2_fracmux, RK3128_UART_FRAC_MAX_PRATE), +- COMPOSITE(SCLK_SDMMC, "sclk_sdmmc0", mux_mmc_src_p, 0, ++ COMPOSITE(SCLK_SDMMC, "sclk_sdmmc", mux_mmc_src_p, 0, + RK2928_CLKSEL_CON(11), 6, 2, MFLAGS, 0, 6, DFLAGS, + RK2928_CLKGATE_CON(2), 11, GFLAGS), + +@@ -349,7 +345,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { + RK2928_CLKSEL_CON(29), 0, 2, MFLAGS, + RK2928_CLKGATE_CON(3), 7, GFLAGS), + MUX(SCLK_CIF_OUT_SRC, "sclk_cif_out_src", mux_clk_cif_out_src_p, 0, +- RK2928_CLKSEL_CON(13), 14, 2, MFLAGS), ++ RK2928_CLKSEL_CON(29), 7, 1, MFLAGS), + DIV(SCLK_CIF_OUT, "sclk_cif_out", "sclk_cif_out_src", 0, + RK2928_CLKSEL_CON(29), 2, 5, DFLAGS), + +@@ -446,12 +442,14 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { + COMPOSITE(SCLK_TSP, "sclk_tsp", mux_pll_src_3plls_p, 0, + RK2928_CLKSEL_CON(4), 6, 2, MFLAGS, 0, 5, DFLAGS, + RK2928_CLKGATE_CON(1), 14, GFLAGS), ++ GATE(SCLK_HSADC_TSP, "sclk_hsadc_tsp", "ext_hsadc_tsp", 0, ++ RK2928_CLKGATE_CON(10), 13, GFLAGS), - COMPOSITE(SCLK_MAC_SRC, "sclk_gmac_src", mux_pll_src_3plls_p, 0, - RK2928_CLKSEL_CON(5), 6, 2, MFLAGS, 0, 5, DFLAGS, -@@ -451,7 +456,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { + COMPOSITE(SCLK_NANDC, "sclk_nandc", mux_pll_src_3plls_p, 0, RK2928_CLKSEL_CON(2), 14, 2, MFLAGS, 8, 5, DFLAGS, RK2928_CLKGATE_CON(10), 15, GFLAGS), @@ -113286,7 +109230,13 @@ index 4b1122e98e16..6f6f44ac7257 100644 RK2928_CLKSEL_CON(29), 8, 6, DFLAGS, RK2928_CLKGATE_CON(1), 0, GFLAGS), -@@ -473,7 +478,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { +@@ -468,12 +466,12 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { + GATE(ACLK_IEP, "aclk_iep", "aclk_vio1", 0, RK2928_CLKGATE_CON(9), 8, GFLAGS), + GATE(0, "aclk_vio1_niu", "aclk_vio1", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(9), 10, GFLAGS), + +- GATE(HCLK_VIO_H2P, "hclk_vio_h2p", "hclk_vio", 0, RK2928_CLKGATE_CON(9), 5, GFLAGS), ++ GATE(HCLK_VIO_H2P, "hclk_vio_h2p", "hclk_vio", CLK_IS_CRITICAL, RK2928_CLKGATE_CON(9), 5, GFLAGS), + GATE(PCLK_MIPI, "pclk_mipi", "hclk_vio", 0, RK2928_CLKGATE_CON(9), 6, GFLAGS), GATE(HCLK_RGA, "hclk_rga", "hclk_vio", 0, RK2928_CLKGATE_CON(6), 10, GFLAGS), GATE(HCLK_LCDC0, "hclk_lcdc0", "hclk_vio", 0, RK2928_CLKGATE_CON(6), 1, GFLAGS), GATE(HCLK_IEP, "hclk_iep", "hclk_vio", 0, RK2928_CLKGATE_CON(9), 7, GFLAGS), @@ -113295,7 +109245,16 @@ index 4b1122e98e16..6f6f44ac7257 100644 GATE(HCLK_CIF, "hclk_cif", "hclk_vio", 0, RK2928_CLKGATE_CON(6), 4, GFLAGS), GATE(HCLK_EBC, "hclk_ebc", "hclk_vio", 0, RK2928_CLKGATE_CON(9), 9, GFLAGS), -@@ -499,6 +504,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { +@@ -489,7 +487,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { + GATE(HCLK_I2S_2CH, "hclk_i2s_2ch", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 2, GFLAGS), + GATE(0, "hclk_usb_peri", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(9), 13, GFLAGS), + GATE(HCLK_HOST2, "hclk_host2", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 3, GFLAGS), +- GATE(HCLK_OTG, "hclk_otg", "hclk_peri", 0, RK2928_CLKGATE_CON(3), 13, GFLAGS), ++ GATE(HCLK_OTG, "hclk_otg", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 13, GFLAGS), + GATE(0, "hclk_peri_ahb", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(9), 14, GFLAGS), + GATE(HCLK_SPDIF, "hclk_spdif", "hclk_peri", 0, RK2928_CLKGATE_CON(10), 9, GFLAGS), + GATE(HCLK_TSP, "hclk_tsp", "hclk_peri", 0, RK2928_CLKGATE_CON(10), 12, GFLAGS), +@@ -499,6 +497,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { GATE(0, "hclk_emmc_peri", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(3), 6, GFLAGS), GATE(HCLK_NANDC, "hclk_nandc", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 9, GFLAGS), GATE(HCLK_USBHOST, "hclk_usbhost", "hclk_peri", 0, RK2928_CLKGATE_CON(10), 14, GFLAGS), @@ -113303,9 +109262,12 @@ index 4b1122e98e16..6f6f44ac7257 100644 GATE(PCLK_SIM_CARD, "pclk_sim_card", "pclk_peri", 0, RK2928_CLKGATE_CON(9), 12, GFLAGS), GATE(PCLK_GMAC, "pclk_gmac", "pclk_peri", 0, RK2928_CLKGATE_CON(10), 11, GFLAGS), -@@ -533,8 +539,8 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { +@@ -531,10 +530,10 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { + GATE(PCLK_ACODEC, "pclk_acodec", "pclk_cpu", 0, RK2928_CLKGATE_CON(5), 14, GFLAGS), + GATE(0, "pclk_ddrupctl", "pclk_cpu", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(5), 7, GFLAGS), GATE(0, "pclk_grf", "pclk_cpu", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(5), 4, GFLAGS), - GATE(0, "pclk_mipiphy", "pclk_cpu", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(5), 0, GFLAGS), +- GATE(0, "pclk_mipiphy", "pclk_cpu", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(5), 0, GFLAGS), ++ GATE(PCLK_MIPIPHY, "pclk_mipiphy", "pclk_cpu", 0, RK2928_CLKGATE_CON(5), 0, GFLAGS), - GATE(0, "pclk_pmu", "pclk_pmu_pre", 0, RK2928_CLKGATE_CON(9), 2, GFLAGS), - GATE(0, "pclk_pmu_niu", "pclk_pmu_pre", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(9), 3, GFLAGS), @@ -113314,7 +109276,7 @@ index 4b1122e98e16..6f6f44ac7257 100644 /* PD_MMC */ MMC(SCLK_SDMMC_DRV, "sdmmc_drv", "sclk_sdmmc", RK3228_SDMMC_CON0, 1), -@@ -562,21 +568,30 @@ static struct rockchip_clk_branch rk3128_clk_branches[] __initdata = { +@@ -562,21 +561,30 @@ static struct rockchip_clk_branch rk3128_clk_branches[] __initdata = { GATE(PCLK_HDMI, "pclk_hdmi", "pclk_cpu", 0, RK2928_CLKGATE_CON(3), 8, GFLAGS), }; @@ -113355,7 +109317,7 @@ index 4b1122e98e16..6f6f44ac7257 100644 reg_base = of_iomap(np, 0); if (!reg_base) { -@@ -584,12 +599,14 @@ static struct rockchip_clk_provider *__init rk3128_common_clk_init(struct device +@@ -584,12 +592,14 @@ static struct rockchip_clk_provider *__init rk3128_common_clk_init(struct device return ERR_PTR(-ENOMEM); } @@ -113370,7 +109332,7 @@ index 4b1122e98e16..6f6f44ac7257 100644 rockchip_clk_register_plls(ctx, rk3128_pll_clks, ARRAY_SIZE(rk3128_pll_clks), -@@ -598,7 +615,7 @@ static struct rockchip_clk_provider *__init rk3128_common_clk_init(struct device +@@ -598,7 +608,7 @@ static struct rockchip_clk_provider *__init rk3128_common_clk_init(struct device ARRAY_SIZE(common_clk_branches)); rockchip_clk_register_armclk(ctx, ARMCLK, "armclk", @@ -113379,7 +109341,7 @@ index 4b1122e98e16..6f6f44ac7257 100644 &rk3128_cpuclk_data, rk3128_cpuclk_rates, ARRAY_SIZE(rk3128_cpuclk_rates)); -@@ -607,6 +624,9 @@ static struct rockchip_clk_provider *__init rk3128_common_clk_init(struct device +@@ -607,6 +617,9 @@ static struct rockchip_clk_provider *__init rk3128_common_clk_init(struct device rockchip_register_restart_notifier(ctx, RK2928_GLB_SRST_FST, NULL); @@ -113389,7 +109351,7 @@ index 4b1122e98e16..6f6f44ac7257 100644 return ctx; } -@@ -620,8 +640,6 @@ static void __init rk3126_clk_init(struct device_node *np) +@@ -620,8 +633,6 @@ static void __init rk3126_clk_init(struct device_node *np) rockchip_clk_register_branches(ctx, rk3126_clk_branches, ARRAY_SIZE(rk3126_clk_branches)); @@ -113398,7 +109360,7 @@ index 4b1122e98e16..6f6f44ac7257 100644 rockchip_clk_of_add_provider(np, ctx); } -@@ -638,10 +656,60 @@ static void __init rk3128_clk_init(struct device_node *np) +@@ -638,10 +649,60 @@ static void __init rk3128_clk_init(struct device_node *np) rockchip_clk_register_branches(ctx, rk3128_clk_branches, ARRAY_SIZE(rk3128_clk_branches)); @@ -113462,10 +109424,10 @@ index 4b1122e98e16..6f6f44ac7257 100644 +MODULE_DESCRIPTION("Rockchip RK3128 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c -index 730020fcc7fe..052669bf8978 100644 +index 730020fcc..510a70d4d 100644 --- a/drivers/clk/rockchip/clk-rk3188.c +++ b/drivers/clk/rockchip/clk-rk3188.c -@@ -5,15 +5,21 @@ +@@ -5,10 +5,12 @@ */ #include @@ -113478,16 +109440,7 @@ index 730020fcc7fe..052669bf8978 100644 #include #include "clk.h" - #define RK3066_GRF_SOC_STATUS 0x15c - #define RK3188_GRF_SOC_STATUS 0xac -+#define RK3188_UART_FRAC_MAX_PRATE 600000000 -+#define RK3188_I2S_FRAC_MAX_PRATE 600000000 -+#define RK3188_SPDIF_FRAC_MAX_PRATE 600000000 -+#define RK3188_HSADC_FRAC_MAX_PRATE 300000000 - - enum rk3188_plls { - apll, cpll, dpll, gpll, -@@ -145,9 +151,10 @@ static struct rockchip_cpuclk_rate_table rk3066_cpuclk_rates[] __initdata = { +@@ -145,9 +147,10 @@ static struct rockchip_cpuclk_rate_table rk3066_cpuclk_rates[] __initdata = { }; static const struct rockchip_cpuclk_reg_data rk3066_cpuclk_data = { @@ -113501,7 +109454,7 @@ index 730020fcc7fe..052669bf8978 100644 .mux_core_alt = 1, .mux_core_main = 0, .mux_core_shift = 8, -@@ -184,9 +191,10 @@ static struct rockchip_cpuclk_rate_table rk3188_cpuclk_rates[] __initdata = { +@@ -184,9 +187,10 @@ static struct rockchip_cpuclk_rate_table rk3188_cpuclk_rates[] __initdata = { }; static const struct rockchip_cpuclk_reg_data rk3188_cpuclk_data = { @@ -113515,7 +109468,7 @@ index 730020fcc7fe..052669bf8978 100644 .mux_core_alt = 1, .mux_core_main = 0, .mux_core_shift = 8, -@@ -194,7 +202,6 @@ static const struct rockchip_cpuclk_reg_data rk3188_cpuclk_data = { +@@ -194,7 +198,6 @@ static const struct rockchip_cpuclk_reg_data rk3188_cpuclk_data = { }; PNAME(mux_pll_p) = { "xin24m", "xin32k" }; @@ -113523,7 +109476,7 @@ index 730020fcc7fe..052669bf8978 100644 PNAME(mux_ddrphy_p) = { "dpll", "gpll_ddr" }; PNAME(mux_pll_src_gpll_cpll_p) = { "gpll", "cpll" }; PNAME(mux_pll_src_cpll_gpll_p) = { "cpll", "gpll" }; -@@ -299,14 +306,14 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { +@@ -299,14 +302,14 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { RK2928_CLKSEL_CON(26), 8, 1, MFLAGS, 0, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO, RK2928_CLKGATE_CON(0), 2, GFLAGS), @@ -113541,7 +109494,7 @@ index 730020fcc7fe..052669bf8978 100644 RK2928_CLKGATE_CON(0), 4, GFLAGS), COMPOSITE(0, "aclk_lcdc0_pre", mux_pll_src_cpll_gpll_p, CLK_IGNORE_UNUSED, -@@ -316,12 +323,12 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { +@@ -316,12 +319,12 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { RK2928_CLKSEL_CON(31), 15, 1, MFLAGS, 8, 5, DFLAGS, RK2928_CLKGATE_CON(1), 4, GFLAGS), @@ -113557,7 +109510,7 @@ index 730020fcc7fe..052669bf8978 100644 RK2928_CLKSEL_CON(10), 12, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO, RK2928_CLKGATE_CON(2), 3, GFLAGS), -@@ -354,7 +361,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { +@@ -354,7 +357,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { RK2928_CLKGATE_CON(2), 5, GFLAGS), MUX(SCLK_MAC, "sclk_macref", mux_sclk_macref_p, CLK_SET_RATE_PARENT, RK2928_CLKSEL_CON(21), 4, 1, MFLAGS), @@ -113566,58 +109519,7 @@ index 730020fcc7fe..052669bf8978 100644 RK2928_CLKGATE_CON(2), 12, GFLAGS), COMPOSITE(0, "hsadc_src", mux_pll_src_gpll_cpll_p, 0, -@@ -363,7 +370,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "hsadc_frac", "hsadc_src", 0, - RK2928_CLKSEL_CON(23), 0, - RK2928_CLKGATE_CON(2), 7, GFLAGS, -- &common_hsadc_out_fracmux), -+ &common_hsadc_out_fracmux, RK3188_HSADC_FRAC_MAX_PRATE), - INVERTER(SCLK_HSADC, "sclk_hsadc", "sclk_hsadc_out", - RK2928_CLKSEL_CON(22), 7, IFLAGS), - -@@ -377,7 +384,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "spdif_frac", "spdif_pre", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(9), 0, - RK2928_CLKGATE_CON(0), 14, GFLAGS, -- &common_spdif_fracmux), -+ &common_spdif_fracmux, RK3188_SPDIF_FRAC_MAX_PRATE), - - /* - * Clock-Architecture Diagram 4 -@@ -411,28 +418,28 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "uart0_frac", "uart0_pre", 0, - RK2928_CLKSEL_CON(17), 0, - RK2928_CLKGATE_CON(1), 9, GFLAGS, -- &common_uart0_fracmux), -+ &common_uart0_fracmux, RK3188_UART_FRAC_MAX_PRATE), - COMPOSITE_NOMUX(0, "uart1_pre", "uart_src", 0, - RK2928_CLKSEL_CON(14), 0, 7, DFLAGS, - RK2928_CLKGATE_CON(1), 10, GFLAGS), - COMPOSITE_FRACMUX(0, "uart1_frac", "uart1_pre", 0, - RK2928_CLKSEL_CON(18), 0, - RK2928_CLKGATE_CON(1), 11, GFLAGS, -- &common_uart1_fracmux), -+ &common_uart1_fracmux, RK3188_UART_FRAC_MAX_PRATE), - COMPOSITE_NOMUX(0, "uart2_pre", "uart_src", 0, - RK2928_CLKSEL_CON(15), 0, 7, DFLAGS, - RK2928_CLKGATE_CON(1), 12, GFLAGS), - COMPOSITE_FRACMUX(0, "uart2_frac", "uart2_pre", 0, - RK2928_CLKSEL_CON(19), 0, - RK2928_CLKGATE_CON(1), 13, GFLAGS, -- &common_uart2_fracmux), -+ &common_uart2_fracmux, RK3188_UART_FRAC_MAX_PRATE), - COMPOSITE_NOMUX(0, "uart3_pre", "uart_src", 0, - RK2928_CLKSEL_CON(16), 0, 7, DFLAGS, - RK2928_CLKGATE_CON(1), 14, GFLAGS), - COMPOSITE_FRACMUX(0, "uart3_frac", "uart3_pre", 0, - RK2928_CLKSEL_CON(20), 0, - RK2928_CLKGATE_CON(1), 15, GFLAGS, -- &common_uart3_fracmux), -+ &common_uart3_fracmux, RK3188_UART_FRAC_MAX_PRATE), - - GATE(SCLK_JTAG, "jtag", "ext_jtag", 0, RK2928_CLKGATE_CON(1), 3, GFLAGS), - -@@ -449,11 +456,11 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { +@@ -449,11 +452,11 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { /* hclk_cpu gates */ GATE(HCLK_ROM, "hclk_rom", "hclk_cpu", 0, RK2928_CLKGATE_CON(5), 6, GFLAGS), @@ -113632,7 +109534,7 @@ index 730020fcc7fe..052669bf8978 100644 GATE(HCLK_LCDC0, "hclk_lcdc0", "hclk_cpu", 0, RK2928_CLKGATE_CON(6), 1, GFLAGS), GATE(HCLK_LCDC1, "hclk_lcdc1", "hclk_cpu", 0, RK2928_CLKGATE_CON(6), 2, GFLAGS), GATE(HCLK_CIF0, "hclk_cif0", "hclk_cpu", 0, RK2928_CLKGATE_CON(6), 4, GFLAGS), -@@ -571,7 +578,7 @@ static struct rockchip_clk_branch rk3066a_clk_branches[] __initdata = { +@@ -571,7 +574,7 @@ static struct rockchip_clk_branch rk3066a_clk_branches[] __initdata = { GATE(CORE_L2C, "core_l2c", "aclk_cpu", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(9), 4, GFLAGS), @@ -113641,28 +109543,9 @@ index 730020fcc7fe..052669bf8978 100644 RK2928_CLKSEL_CON(10), 15, 1, MFLAGS, 0, 5, DFLAGS, RK2928_CLKGATE_CON(2), 0, GFLAGS), -@@ -618,24 +625,24 @@ static struct rockchip_clk_branch rk3066a_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "i2s0_frac", "i2s0_pre", 0, - RK2928_CLKSEL_CON(6), 0, - RK2928_CLKGATE_CON(0), 8, GFLAGS, -- &rk3066a_i2s0_fracmux), -+ &rk3066a_i2s0_fracmux, RK3188_I2S_FRAC_MAX_PRATE), - COMPOSITE_NOMUX(0, "i2s1_pre", "i2s_src", 0, - RK2928_CLKSEL_CON(3), 0, 7, DFLAGS, - RK2928_CLKGATE_CON(0), 9, GFLAGS), - COMPOSITE_FRACMUX(0, "i2s1_frac", "i2s1_pre", 0, - RK2928_CLKSEL_CON(7), 0, - RK2928_CLKGATE_CON(0), 10, GFLAGS, -- &rk3066a_i2s1_fracmux), -+ &rk3066a_i2s1_fracmux, RK3188_I2S_FRAC_MAX_PRATE), - COMPOSITE_NOMUX(0, "i2s2_pre", "i2s_src", 0, - RK2928_CLKSEL_CON(4), 0, 7, DFLAGS, - RK2928_CLKGATE_CON(0), 11, GFLAGS), - COMPOSITE_FRACMUX(0, "i2s2_frac", "i2s2_pre", 0, - RK2928_CLKSEL_CON(8), 0, +@@ -634,8 +637,8 @@ static struct rockchip_clk_branch rk3066a_clk_branches[] __initdata = { RK2928_CLKGATE_CON(0), 12, GFLAGS, -- &rk3066a_i2s2_fracmux), -+ &rk3066a_i2s2_fracmux, RK3188_I2S_FRAC_MAX_PRATE), + &rk3066a_i2s2_fracmux), - GATE(HCLK_I2S1, "hclk_i2s1", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 3, GFLAGS), - GATE(HCLK_I2S2, "hclk_i2s2", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 4, GFLAGS), @@ -113671,7 +109554,7 @@ index 730020fcc7fe..052669bf8978 100644 GATE(HCLK_CIF1, "hclk_cif1", "hclk_cpu", 0, RK2928_CLKGATE_CON(6), 6, GFLAGS), GATE(HCLK_HDMI, "hclk_hdmi", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 14, GFLAGS), -@@ -676,7 +683,7 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = { +@@ -676,7 +679,7 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = { div_rk3188_aclk_core_t, RK2928_CLKGATE_CON(0), 7, GFLAGS), /* do not source aclk_cpu_pre from the apll, to keep complexity down */ @@ -113680,7 +109563,7 @@ index 730020fcc7fe..052669bf8978 100644 RK2928_CLKSEL_CON(0), 5, 1, MFLAGS, 0, 5, DFLAGS), DIV(0, "pclk_cpu_pre", "aclk_cpu_pre", 0, RK2928_CLKSEL_CON(1), 12, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO), -@@ -689,7 +696,7 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = { +@@ -689,7 +692,7 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = { GATE(CORE_L2C, "core_l2c", "armclk", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(9), 4, GFLAGS), @@ -113689,16 +109572,7 @@ index 730020fcc7fe..052669bf8978 100644 RK2928_CLKSEL_CON(10), 15, 1, MFLAGS, 0, 5, DFLAGS, RK2928_CLKGATE_CON(2), 0, GFLAGS), -@@ -726,7 +733,7 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "i2s0_frac", "i2s0_pre", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(7), 0, - RK2928_CLKGATE_CON(0), 10, GFLAGS, -- &rk3188_i2s0_fracmux), -+ &rk3188_i2s0_fracmux, RK3188_I2S_FRAC_MAX_PRATE), - - GATE(0, "hclk_imem0", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 14, GFLAGS), - GATE(0, "hclk_imem1", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 15, GFLAGS), -@@ -743,17 +750,6 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = { +@@ -743,17 +746,6 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = { GATE(ACLK_GPS, "aclk_gps", "aclk_peri", 0, RK2928_CLKGATE_CON(8), 13, GFLAGS), }; @@ -113716,7 +109590,7 @@ index 730020fcc7fe..052669bf8978 100644 static struct rockchip_clk_provider *__init rk3188_common_clk_init(struct device_node *np) { struct rockchip_clk_provider *ctx; -@@ -786,10 +782,12 @@ static struct rockchip_clk_provider *__init rk3188_common_clk_init(struct device +@@ -786,10 +778,12 @@ static struct rockchip_clk_provider *__init rk3188_common_clk_init(struct device static void __init rk3066a_clk_init(struct device_node *np) { struct rockchip_clk_provider *ctx; @@ -113729,7 +109603,7 @@ index 730020fcc7fe..052669bf8978 100644 rockchip_clk_register_plls(ctx, rk3066_pll_clks, ARRAY_SIZE(rk3066_pll_clks), -@@ -797,11 +795,9 @@ static void __init rk3066a_clk_init(struct device_node *np) +@@ -797,11 +791,9 @@ static void __init rk3066a_clk_init(struct device_node *np) rockchip_clk_register_branches(ctx, rk3066a_clk_branches, ARRAY_SIZE(rk3066a_clk_branches)); rockchip_clk_register_armclk(ctx, ARMCLK, "armclk", @@ -113742,7 +109616,7 @@ index 730020fcc7fe..052669bf8978 100644 rockchip_clk_of_add_provider(np, ctx); } CLK_OF_DECLARE(rk3066a_cru, "rockchip,rk3066a-cru", rk3066a_clk_init); -@@ -809,13 +805,14 @@ CLK_OF_DECLARE(rk3066a_cru, "rockchip,rk3066a-cru", rk3066a_clk_init); +@@ -809,13 +801,14 @@ CLK_OF_DECLARE(rk3066a_cru, "rockchip,rk3066a-cru", rk3066a_clk_init); static void __init rk3188a_clk_init(struct device_node *np) { struct rockchip_clk_provider *ctx; @@ -113758,7 +109632,7 @@ index 730020fcc7fe..052669bf8978 100644 rockchip_clk_register_plls(ctx, rk3188_pll_clks, ARRAY_SIZE(rk3188_pll_clks), -@@ -823,29 +820,25 @@ static void __init rk3188a_clk_init(struct device_node *np) +@@ -823,29 +816,25 @@ static void __init rk3188a_clk_init(struct device_node *np) rockchip_clk_register_branches(ctx, rk3188_clk_branches, ARRAY_SIZE(rk3188_clk_branches)); rockchip_clk_register_armclk(ctx, ARMCLK, "armclk", @@ -113793,7 +109667,7 @@ index 730020fcc7fe..052669bf8978 100644 rockchip_clk_of_add_provider(np, ctx); } CLK_OF_DECLARE(rk3188a_cru, "rockchip,rk3188a-cru", rk3188a_clk_init); -@@ -871,3 +864,62 @@ static void __init rk3188_clk_init(struct device_node *np) +@@ -871,3 +860,62 @@ static void __init rk3188_clk_init(struct device_node *np) rk3188a_clk_init(np); } CLK_OF_DECLARE(rk3188_cru, "rockchip,rk3188-cru", rk3188_clk_init); @@ -113857,10 +109731,10 @@ index 730020fcc7fe..052669bf8978 100644 +MODULE_DESCRIPTION("Rockchip RK3188 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c -index 47d6482dda9d..01ff90c8a59f 100644 +index 47d6482dd..18c94343b 100644 --- a/drivers/clk/rockchip/clk-rk3228.c +++ b/drivers/clk/rockchip/clk-rk3228.c -@@ -7,14 +7,20 @@ +@@ -7,8 +7,10 @@ #include #include @@ -113871,17 +109745,7 @@ index 47d6482dda9d..01ff90c8a59f 100644 #include #include #include "clk.h" - - #define RK3228_GRF_SOC_STATUS0 0x480 - -+#define RK3228_UART_FRAC_MAX_PRATE 600000000 -+#define RK3228_SPDIF_FRAC_MAX_PRATE 600000000 -+#define RK3228_I2S_FRAC_MAX_PRATE 600000000 -+ - enum rk3228_plls { - apll, dpll, cpll, gpll, - }; -@@ -78,22 +84,22 @@ static struct rockchip_pll_rate_table rk3228_pll_rates[] = { +@@ -78,22 +80,22 @@ static struct rockchip_pll_rate_table rk3228_pll_rates[] = { #define RK3228_DIV_PCLK_MASK 0x7 #define RK3228_DIV_PCLK_SHIFT 12 @@ -113918,7 +109782,7 @@ index 47d6482dda9d..01ff90c8a59f 100644 static struct rockchip_cpuclk_rate_table rk3228_cpuclk_rates[] __initdata = { RK3228_CPUCLK_RATE(1800000000, 1, 7), -@@ -119,9 +125,10 @@ static struct rockchip_cpuclk_rate_table rk3228_cpuclk_rates[] __initdata = { +@@ -119,9 +121,10 @@ static struct rockchip_cpuclk_rate_table rk3228_cpuclk_rates[] __initdata = { }; static const struct rockchip_cpuclk_reg_data rk3228_cpuclk_data = { @@ -113932,7 +109796,7 @@ index 47d6482dda9d..01ff90c8a59f 100644 .mux_core_alt = 1, .mux_core_main = 0, .mux_core_shift = 6, -@@ -131,7 +138,6 @@ static const struct rockchip_cpuclk_reg_data rk3228_cpuclk_data = { +@@ -131,7 +134,6 @@ static const struct rockchip_cpuclk_reg_data rk3228_cpuclk_data = { PNAME(mux_pll_p) = { "clk_24m", "xin24m" }; PNAME(mux_ddrphy_p) = { "dpll_ddr", "gpll_ddr", "apll_ddr" }; @@ -113940,7 +109804,7 @@ index 47d6482dda9d..01ff90c8a59f 100644 PNAME(mux_usb480m_phy_p) = { "usb480m_phy0", "usb480m_phy1" }; PNAME(mux_usb480m_p) = { "usb480m_phy", "xin24m" }; PNAME(mux_hdmiphy_p) = { "hdmiphy_phy", "xin24m" }; -@@ -231,12 +237,12 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -231,12 +233,12 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { RK2928_CLKGATE_CON(7), 0, GFLAGS), /* PD_CORE */ @@ -113955,7 +109819,7 @@ index 47d6482dda9d..01ff90c8a59f 100644 COMPOSITE_NOMUX(0, "pclk_dbg", "armclk", CLK_IGNORE_UNUSED, RK2928_CLKSEL_CON(1), 0, 4, DFLAGS | CLK_DIVIDER_READ_ONLY, RK2928_CLKGATE_CON(4), 1, GFLAGS), -@@ -253,27 +259,27 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -253,27 +255,27 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { RK2928_MISC_CON, 15, 1, MFLAGS), /* PD_BUS */ @@ -113993,7 +109857,7 @@ index 47d6482dda9d..01ff90c8a59f 100644 RK2928_CLKGATE_CON(6), 13, GFLAGS), /* PD_VIDEO */ -@@ -308,9 +314,9 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -308,9 +310,9 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { RK2928_CLKSEL_CON(31), 13, 2, MFLAGS, 8, 5, DFLAGS, RK2928_CLKGATE_CON(1), 4, GFLAGS), @@ -114005,7 +109869,7 @@ index 47d6482dda9d..01ff90c8a59f 100644 RK2928_CLKSEL_CON(33), 8, 5, DFLAGS, RK2928_CLKGATE_CON(1), 2, GFLAGS), COMPOSITE(SCLK_RGA, "sclk_rga", mux_sclk_rga_p, 0, -@@ -333,21 +339,21 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -333,21 +335,21 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { RK2928_CLKGATE_CON(3), 8, GFLAGS), /* PD_PERI */ @@ -114034,62 +109898,7 @@ index 47d6482dda9d..01ff90c8a59f 100644 RK2928_CLKGATE_CON(5), 0, GFLAGS), GATE(SCLK_TIMER0, "sclk_timer0", "xin24m", 0, -@@ -419,7 +425,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "i2s0_frac", "i2s0_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(8), 0, - RK2928_CLKGATE_CON(0), 4, GFLAGS, -- &rk3228_i2s0_fracmux), -+ &rk3228_i2s0_fracmux, RK3228_I2S_FRAC_MAX_PRATE), - GATE(SCLK_I2S0, "sclk_i2s0", "i2s0_pre", CLK_SET_RATE_PARENT, - RK2928_CLKGATE_CON(0), 5, GFLAGS), - -@@ -429,7 +435,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "i2s1_frac", "i2s1_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(7), 0, - RK2928_CLKGATE_CON(0), 11, GFLAGS, -- &rk3228_i2s1_fracmux), -+ &rk3228_i2s1_fracmux, RK3228_I2S_FRAC_MAX_PRATE), - GATE(SCLK_I2S1, "sclk_i2s1", "i2s1_pre", CLK_SET_RATE_PARENT, - RK2928_CLKGATE_CON(0), 14, GFLAGS), - COMPOSITE_NODIV(SCLK_I2S_OUT, "i2s_out", mux_i2s_out_p, 0, -@@ -442,7 +448,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "i2s2_frac", "i2s2_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(30), 0, - RK2928_CLKGATE_CON(0), 8, GFLAGS, -- &rk3228_i2s2_fracmux), -+ &rk3228_i2s2_fracmux, RK3228_I2S_FRAC_MAX_PRATE), - GATE(SCLK_I2S2, "sclk_i2s2", "i2s2_pre", CLK_SET_RATE_PARENT, - RK2928_CLKGATE_CON(0), 9, GFLAGS), - -@@ -452,7 +458,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "spdif_frac", "sclk_spdif_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(20), 0, - RK2928_CLKGATE_CON(2), 12, GFLAGS, -- &rk3228_spdif_fracmux), -+ &rk3228_spdif_fracmux, RK3228_SPDIF_FRAC_MAX_PRATE), - - GATE(0, "jtag", "ext_jtag", CLK_IGNORE_UNUSED, - RK2928_CLKGATE_CON(1), 3, GFLAGS), -@@ -487,15 +493,15 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "uart0_frac", "uart0_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(17), 0, - RK2928_CLKGATE_CON(1), 9, GFLAGS, -- &rk3228_uart0_fracmux), -+ &rk3228_uart0_fracmux, RK3228_UART_FRAC_MAX_PRATE), - COMPOSITE_FRACMUX(0, "uart1_frac", "uart1_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(18), 0, - RK2928_CLKGATE_CON(1), 11, GFLAGS, -- &rk3228_uart1_fracmux), -+ &rk3228_uart1_fracmux, RK3228_UART_FRAC_MAX_PRATE), - COMPOSITE_FRACMUX(0, "uart2_frac", "uart2_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(19), 0, - RK2928_CLKGATE_CON(1), 13, GFLAGS, -- &rk3228_uart2_fracmux), -+ &rk3228_uart2_fracmux, RK3228_UART_FRAC_MAX_PRATE), - - COMPOSITE(SCLK_NANDC, "sclk_nandc", mux_pll_src_2plls_p, 0, - RK2928_CLKSEL_CON(2), 14, 1, MFLAGS, 8, 5, DFLAGS, -@@ -529,22 +535,22 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -529,22 +531,22 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { /* PD_VOP */ GATE(ACLK_RGA, "aclk_rga", "aclk_rga_pre", 0, RK2928_CLKGATE_CON(13), 0, GFLAGS), @@ -114119,7 +109928,7 @@ index 47d6482dda9d..01ff90c8a59f 100644 GATE(HCLK_VIO_H2P, "hclk_vio_h2p", "hclk_vio_pre", 0, RK2928_CLKGATE_CON(14), 7, GFLAGS), GATE(HCLK_HDCP_MMU, "hclk_hdcp_mmu", "hclk_vio_pre", 0, RK2928_CLKGATE_CON(14), 12, GFLAGS), GATE(PCLK_HDMI_CTRL, "pclk_hdmi_ctrl", "hclk_vio_pre", 0, RK2928_CLKGATE_CON(14), 6, GFLAGS), -@@ -560,29 +566,29 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -560,29 +562,29 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { GATE(HCLK_EMMC, "hclk_emmc", "hclk_peri", 0, RK2928_CLKGATE_CON(11), 2, GFLAGS), GATE(HCLK_NANDC, "hclk_nandc", "hclk_peri", 0, RK2928_CLKGATE_CON(11), 3, GFLAGS), GATE(HCLK_HOST0, "hclk_host0", "hclk_peri", 0, RK2928_CLKGATE_CON(11), 6, GFLAGS), @@ -114158,7 +109967,7 @@ index 47d6482dda9d..01ff90c8a59f 100644 GATE(HCLK_I2S0_8CH, "hclk_i2s0_8ch", "hclk_cpu", 0, RK2928_CLKGATE_CON(8), 7, GFLAGS), GATE(HCLK_I2S1_8CH, "hclk_i2s1_8ch", "hclk_cpu", 0, RK2928_CLKGATE_CON(8), 8, GFLAGS), GATE(HCLK_I2S2_2CH, "hclk_i2s2_2ch", "hclk_cpu", 0, RK2928_CLKGATE_CON(8), 9, GFLAGS), -@@ -591,9 +597,9 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -591,9 +593,9 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { GATE(HCLK_M_CRYPTO, "hclk_crypto_mst", "hclk_cpu", 0, RK2928_CLKGATE_CON(8), 11, GFLAGS), GATE(HCLK_S_CRYPTO, "hclk_crypto_slv", "hclk_cpu", 0, RK2928_CLKGATE_CON(8), 12, GFLAGS), @@ -114171,7 +109980,7 @@ index 47d6482dda9d..01ff90c8a59f 100644 GATE(PCLK_EFUSE_1024, "pclk_efuse_1024", "pclk_cpu", 0, RK2928_CLKGATE_CON(8), 13, GFLAGS), GATE(PCLK_EFUSE_256, "pclk_efuse_256", "pclk_cpu", 0, RK2928_CLKGATE_CON(8), 14, GFLAGS), -@@ -602,7 +608,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -602,7 +604,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { GATE(PCLK_I2C2, "pclk_i2c2", "pclk_cpu", 0, RK2928_CLKGATE_CON(9), 1, GFLAGS), GATE(PCLK_I2C3, "pclk_i2c3", "pclk_cpu", 0, RK2928_CLKGATE_CON(9), 2, GFLAGS), GATE(PCLK_TIMER, "pclk_timer0", "pclk_cpu", 0, RK2928_CLKGATE_CON(9), 4, GFLAGS), @@ -114180,7 +109989,7 @@ index 47d6482dda9d..01ff90c8a59f 100644 GATE(PCLK_SPI0, "pclk_spi0", "pclk_cpu", 0, RK2928_CLKGATE_CON(9), 6, GFLAGS), GATE(PCLK_PWM, "pclk_rk_pwm", "pclk_cpu", 0, RK2928_CLKGATE_CON(9), 7, GFLAGS), GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_cpu", 0, RK2928_CLKGATE_CON(9), 8, GFLAGS), -@@ -616,73 +622,51 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -616,73 +618,51 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { GATE(PCLK_GRF, "pclk_grf", "pclk_cpu", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(10), 0, GFLAGS), GATE(0, "pclk_cru", "pclk_cpu", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(10), 1, GFLAGS), GATE(0, "pclk_sgrf", "pclk_cpu", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(10), 2, GFLAGS), @@ -114278,7 +110087,7 @@ index 47d6482dda9d..01ff90c8a59f 100644 reg_base = of_iomap(np, 0); if (!reg_base) { -@@ -696,17 +680,16 @@ static void __init rk3228_clk_init(struct device_node *np) +@@ -696,17 +676,16 @@ static void __init rk3228_clk_init(struct device_node *np) iounmap(reg_base); return; } @@ -114298,7 +110107,7 @@ index 47d6482dda9d..01ff90c8a59f 100644 &rk3228_cpuclk_data, rk3228_cpuclk_rates, ARRAY_SIZE(rk3228_cpuclk_rates)); -@@ -716,5 +699,38 @@ static void __init rk3228_clk_init(struct device_node *np) +@@ -716,5 +695,38 @@ static void __init rk3228_clk_init(struct device_node *np) rockchip_register_restart_notifier(ctx, RK3228_GLB_SRST_FST, NULL); rockchip_clk_of_add_provider(np, ctx); @@ -114338,10 +110147,10 @@ index 47d6482dda9d..01ff90c8a59f 100644 +MODULE_DESCRIPTION("Rockchip RK3228 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c -index 93c794695c46..3e054ddf1931 100644 +index 93c794695..f9c4678fc 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c -@@ -6,14 +6,20 @@ +@@ -6,11 +6,14 @@ #include #include @@ -114356,13 +110165,7 @@ index 93c794695c46..3e054ddf1931 100644 #define RK3288_GRF_SOC_CON(x) (0x244 + x * 4) #define RK3288_GRF_SOC_STATUS1 0x284 -+#define RK3288_UART_FRAC_MAX_PRATE 600000000 -+#define RK3288_I2S_FRAC_MAX_PRATE 600000000 -+#define RK3288_SPDIF_FRAC_MAX_PRATE 600000000 - - enum rk3288_variant { - RK3288_CRU, -@@ -66,32 +72,32 @@ static struct rockchip_pll_rate_table rk3288_pll_rates[] = { +@@ -66,32 +69,32 @@ static struct rockchip_pll_rate_table rk3288_pll_rates[] = { RK3066_PLL_RATE(1248000000, 1, 52, 1), RK3066_PLL_RATE(1224000000, 1, 51, 1), RK3066_PLL_RATE(1200000000, 1, 50, 1), @@ -114403,7 +110206,7 @@ index 93c794695c46..3e054ddf1931 100644 RK3066_PLL_RATE( 360000000, 1, 60, 4), RK3066_PLL_RATE_NB( 356000000, 1, 178, 12, 1), RK3066_PLL_RATE_NB( 324000000, 1, 189, 14, 1), -@@ -100,6 +106,7 @@ static struct rockchip_pll_rate_table rk3288_pll_rates[] = { +@@ -100,6 +103,7 @@ static struct rockchip_pll_rate_table rk3288_pll_rates[] = { RK3066_PLL_RATE_NB( 303000000, 1, 202, 16, 1), RK3066_PLL_RATE( 300000000, 1, 75, 6), RK3066_PLL_RATE_NB( 297750000, 2, 397, 16, 1), @@ -114411,7 +110214,7 @@ index 93c794695c46..3e054ddf1931 100644 RK3066_PLL_RATE_NB( 293250000, 2, 391, 16, 1), RK3066_PLL_RATE_NB( 292500000, 1, 195, 16, 1), RK3066_PLL_RATE( 273600000, 1, 114, 10), -@@ -117,6 +124,7 @@ static struct rockchip_pll_rate_table rk3288_pll_rates[] = { +@@ -117,6 +121,7 @@ static struct rockchip_pll_rate_table rk3288_pll_rates[] = { RK3066_PLL_RATE( 195428571, 1, 114, 14), RK3066_PLL_RATE( 160000000, 1, 80, 12), RK3066_PLL_RATE( 157500000, 1, 105, 16), @@ -114419,7 +110222,7 @@ index 93c794695c46..3e054ddf1931 100644 RK3066_PLL_RATE( 126000000, 1, 84, 16), { /* sentinel */ }, }; -@@ -179,9 +187,10 @@ static struct rockchip_cpuclk_rate_table rk3288_cpuclk_rates[] __initdata = { +@@ -179,9 +184,10 @@ static struct rockchip_cpuclk_rate_table rk3288_cpuclk_rates[] __initdata = { }; static const struct rockchip_cpuclk_reg_data rk3288_cpuclk_data = { @@ -114433,7 +110236,7 @@ index 93c794695c46..3e054ddf1931 100644 .mux_core_alt = 1, .mux_core_main = 0, .mux_core_shift = 15, -@@ -189,7 +198,6 @@ static const struct rockchip_cpuclk_reg_data rk3288_cpuclk_data = { +@@ -189,7 +195,6 @@ static const struct rockchip_cpuclk_reg_data rk3288_cpuclk_data = { }; PNAME(mux_pll_p) = { "xin24m", "xin32k" }; @@ -114441,7 +110244,30 @@ index 93c794695c46..3e054ddf1931 100644 PNAME(mux_ddrphy_p) = { "dpll_ddr", "gpll_ddr" }; PNAME(mux_aclk_cpu_src_p) = { "cpll_aclk_cpu", "gpll_aclk_cpu" }; -@@ -330,20 +338,20 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { +@@ -216,6 +221,12 @@ PNAME(mux_edp_24m_p) = { "ext_edp_24m", "xin24m" }; + PNAME(mux_tspout_p) = { "cpll", "gpll", "npll", "xin27m" }; + + PNAME(mux_aclk_vcodec_pre_p) = { "aclk_vdpu", "aclk_vepu" }; ++PNAME(mux_testout_src_p) = { "aclk_peri", "armclk", "aclk_vio0", "ddrphy", ++ "aclk_vcodec", "aclk_gpu", "sclk_rga", "aclk_cpu", ++ "xin24m", "xin27m", "xin32k", "clk_wifi", ++ "dclk_vop0", "dclk_vop1", "sclk_isp_jpe", ++ "sclk_isp" }; ++ + PNAME(mux_usbphy480m_p) = { "sclk_otgphy1_480m", "sclk_otgphy2_480m", + "sclk_otgphy0_480m" }; + PNAME(mux_hsicphy480m_p) = { "cpll", "gpll", "usbphy480m_src" }; +@@ -324,26 +335,29 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { + + GATE(0, "dpll_ddr", "dpll", CLK_IGNORE_UNUSED, + RK3288_CLKGATE_CON(0), 8, GFLAGS), +- GATE(0, "gpll_ddr", "gpll", 0, ++ GATE(0, "gpll_ddr", "gpll", CLK_IGNORE_UNUSED, + RK3288_CLKGATE_CON(0), 9, GFLAGS), ++ COMPOSITE_DDRCLK(SCLK_DDRCLK, "sclk_ddrc", mux_ddrphy_p, 0, ++ RK3288_CLKSEL_CON(26), 2, 1, 0, 0, ++ ROCKCHIP_DDRCLK_SIP_V2), + COMPOSITE_NOGATE(0, "ddrphy", mux_ddrphy_p, CLK_IGNORE_UNUSED, RK3288_CLKSEL_CON(26), 2, 1, MFLAGS, 0, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO), @@ -114468,34 +110294,29 @@ index 93c794695c46..3e054ddf1931 100644 RK3288_CLKSEL_CON(1), 8, 2, DFLAGS, div_hclk_cpu_t, RK3288_CLKGATE_CON(0), 4, GFLAGS), GATE(0, "c2c_host", "aclk_cpu_src", 0, -@@ -362,7 +370,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { +@@ -356,7 +370,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { + + FACTOR(0, "xin12m", "xin24m", 0, 1, 2), + +- COMPOSITE(0, "i2s_src", mux_pll_src_cpll_gpll_p, 0, ++ COMPOSITE(SCLK_I2S_SRC, "i2s_src", mux_pll_src_cpll_gpll_p, 0, + RK3288_CLKSEL_CON(4), 15, 1, MFLAGS, 0, 7, DFLAGS, + RK3288_CLKGATE_CON(4), 1, GFLAGS), COMPOSITE_FRACMUX(0, "i2s_frac", "i2s_src", CLK_SET_RATE_PARENT, - RK3288_CLKSEL_CON(8), 0, - RK3288_CLKGATE_CON(4), 2, GFLAGS, -- &rk3288_i2s_fracmux), -+ &rk3288_i2s_fracmux, RK3288_I2S_FRAC_MAX_PRATE), - COMPOSITE_NODIV(SCLK_I2S0_OUT, "i2s0_clkout", mux_i2s_clkout_p, 0, - RK3288_CLKSEL_CON(4), 12, 1, MFLAGS, - RK3288_CLKGATE_CON(4), 0, GFLAGS), -@@ -377,7 +385,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "spdif_frac", "spdif_src", CLK_SET_RATE_PARENT, - RK3288_CLKSEL_CON(9), 0, - RK3288_CLKGATE_CON(4), 5, GFLAGS, -- &rk3288_spdif_fracmux), -+ &rk3288_spdif_fracmux, RK3288_SPDIF_FRAC_MAX_PRATE), - GATE(SCLK_SPDIF, "sclk_spdif", "spdif_mux", CLK_SET_RATE_PARENT, - RK3288_CLKGATE_CON(4), 6, GFLAGS), - COMPOSITE_NOMUX(0, "spdif_8ch_pre", "spdif_src", CLK_SET_RATE_PARENT, -@@ -386,7 +394,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "spdif_8ch_frac", "spdif_8ch_pre", CLK_SET_RATE_PARENT, - RK3288_CLKSEL_CON(41), 0, - RK3288_CLKGATE_CON(4), 8, GFLAGS, -- &rk3288_spdif_8ch_fracmux), -+ &rk3288_spdif_8ch_fracmux, RK3288_SPDIF_FRAC_MAX_PRATE), - GATE(SCLK_SPDIF8CH, "sclk_spdif_8ch", "spdif_8ch_mux", CLK_SET_RATE_PARENT, - RK3288_CLKGATE_CON(4), 9, GFLAGS), - -@@ -486,9 +494,9 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { +@@ -427,10 +441,10 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { + GATE(HCLK_VCODEC, "hclk_vcodec", "hclk_vcodec_pre", 0, + RK3288_CLKGATE_CON(9), 1, GFLAGS), + +- COMPOSITE(0, "aclk_vio0", mux_pll_src_cpll_gpll_usb480m_p, CLK_IGNORE_UNUSED, ++ COMPOSITE(ACLK_VIO0, "aclk_vio0", mux_pll_src_cpll_gpll_usb480m_p, CLK_IGNORE_UNUSED, + RK3288_CLKSEL_CON(31), 6, 2, MFLAGS, 0, 5, DFLAGS, + RK3288_CLKGATE_CON(3), 0, GFLAGS), +- COMPOSITE(0, "aclk_vio1", mux_pll_src_cpll_gpll_usb480m_p, CLK_IGNORE_UNUSED, ++ COMPOSITE(ACLK_VIO1, "aclk_vio1", mux_pll_src_cpll_gpll_usb480m_p, CLK_IGNORE_UNUSED, + RK3288_CLKSEL_CON(31), 14, 2, MFLAGS, 8, 5, DFLAGS, + RK3288_CLKGATE_CON(3), 2, GFLAGS), + +@@ -486,9 +500,9 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { COMPOSITE_NOGATE(SCLK_VIP_OUT, "sclk_vip_out", mux_vip_out_p, 0, RK3288_CLKSEL_CON(26), 15, 1, MFLAGS, 9, 5, DFLAGS), @@ -114507,7 +110328,7 @@ index 93c794695c46..3e054ddf1931 100644 RK3288_CLKSEL_CON(33), 0, 5, DFLAGS, RK3288_CLKGATE_CON(5), 8, GFLAGS), -@@ -496,16 +504,16 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { +@@ -496,16 +510,16 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { RK3288_CLKSEL_CON(34), 6, 2, MFLAGS, 0, 5, DFLAGS, RK3288_CLKGATE_CON(5), 7, GFLAGS), @@ -114528,49 +110349,42 @@ index 93c794695c46..3e054ddf1931 100644 RK3288_CLKGATE_CON(2), 1, GFLAGS), /* -@@ -587,7 +595,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "uart0_frac", "uart0_src", CLK_SET_RATE_PARENT, - RK3288_CLKSEL_CON(17), 0, - RK3288_CLKGATE_CON(1), 9, GFLAGS, -- &rk3288_uart0_fracmux), -+ &rk3288_uart0_fracmux, RK3288_UART_FRAC_MAX_PRATE), - MUX(0, "uart_src", mux_pll_src_cpll_gpll_p, 0, - RK3288_CLKSEL_CON(13), 15, 1, MFLAGS), - COMPOSITE_NOMUX(0, "uart1_src", "uart_src", 0, -@@ -596,28 +604,28 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "uart1_frac", "uart1_src", CLK_SET_RATE_PARENT, - RK3288_CLKSEL_CON(18), 0, - RK3288_CLKGATE_CON(1), 11, GFLAGS, -- &rk3288_uart1_fracmux), -+ &rk3288_uart1_fracmux, RK3288_UART_FRAC_MAX_PRATE), - COMPOSITE_NOMUX(0, "uart2_src", "uart_src", 0, - RK3288_CLKSEL_CON(15), 0, 7, DFLAGS, - RK3288_CLKGATE_CON(1), 12, GFLAGS), - COMPOSITE_FRACMUX(0, "uart2_frac", "uart2_src", CLK_SET_RATE_PARENT, - RK3288_CLKSEL_CON(19), 0, - RK3288_CLKGATE_CON(1), 13, GFLAGS, -- &rk3288_uart2_fracmux), -+ &rk3288_uart2_fracmux, RK3288_UART_FRAC_MAX_PRATE), - COMPOSITE_NOMUX(0, "uart3_src", "uart_src", 0, - RK3288_CLKSEL_CON(16), 0, 7, DFLAGS, - RK3288_CLKGATE_CON(1), 14, GFLAGS), - COMPOSITE_FRACMUX(0, "uart3_frac", "uart3_src", CLK_SET_RATE_PARENT, - RK3288_CLKSEL_CON(20), 0, - RK3288_CLKGATE_CON(1), 15, GFLAGS, -- &rk3288_uart3_fracmux), -+ &rk3288_uart3_fracmux, RK3288_UART_FRAC_MAX_PRATE), - COMPOSITE_NOMUX(0, "uart4_src", "uart_src", 0, - RK3288_CLKSEL_CON(3), 0, 7, DFLAGS, - RK3288_CLKGATE_CON(2), 12, GFLAGS), - COMPOSITE_FRACMUX(0, "uart4_frac", "uart4_src", CLK_SET_RATE_PARENT, - RK3288_CLKSEL_CON(7), 0, +@@ -547,10 +561,10 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { + MMC(SCLK_EMMC_DRV, "emmc_drv", "sclk_emmc", RK3288_EMMC_CON0, 1), + MMC(SCLK_EMMC_SAMPLE, "emmc_sample", "sclk_emmc", RK3288_EMMC_CON1, 0), + +- COMPOSITE(0, "sclk_tspout", mux_tspout_p, 0, ++ COMPOSITE(SCLK_TSPOUT, "sclk_tspout", mux_tspout_p, 0, + RK3288_CLKSEL_CON(35), 14, 2, MFLAGS, 8, 5, DFLAGS, + RK3288_CLKGATE_CON(4), 11, GFLAGS), +- COMPOSITE(0, "sclk_tsp", mux_pll_src_cpll_gpll_npll_p, 0, ++ COMPOSITE(SCLK_TSP, "sclk_tsp", mux_pll_src_cpll_gpll_npll_p, 0, + RK3288_CLKSEL_CON(35), 6, 2, MFLAGS, 0, 5, DFLAGS, + RK3288_CLKGATE_CON(4), 10, GFLAGS), + +@@ -567,6 +581,12 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { + RK3288_CLKSEL_CON(2), 0, 6, DFLAGS, + RK3288_CLKGATE_CON(2), 7, GFLAGS), + ++ MUX(SCLK_TESTOUT_SRC, "sclk_testout_src", mux_testout_src_p, 0, ++ RK3288_MISC_CON, 8, 4, MFLAGS), ++ COMPOSITE_NOMUX(SCLK_TESTOUT, "sclk_testout", "sclk_testout_src", 0, ++ RK3288_CLKSEL_CON(2), 8, 5, DFLAGS, ++ RK3288_CLKGATE_CON(4), 15, GFLAGS), ++ + COMPOSITE_NOMUX(SCLK_SARADC, "sclk_saradc", "xin24m", 0, + RK3288_CLKSEL_CON(24), 8, 8, DFLAGS, + RK3288_CLKGATE_CON(2), 8, GFLAGS), +@@ -619,7 +639,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { RK3288_CLKGATE_CON(2), 13, GFLAGS, -- &rk3288_uart4_fracmux), -+ &rk3288_uart4_fracmux, RK3288_UART_FRAC_MAX_PRATE), + &rk3288_uart4_fracmux), - COMPOSITE(0, "mac_pll_src", mux_pll_src_npll_cpll_gpll_p, 0, +- COMPOSITE(0, "mac_pll_src", mux_pll_src_npll_cpll_gpll_p, 0, ++ COMPOSITE(SCLK_MAC_PLL, "mac_pll_src", mux_pll_src_npll_cpll_gpll_p, 0, RK3288_CLKSEL_CON(21), 0, 2, MFLAGS, 8, 5, DFLAGS, -@@ -665,7 +673,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { + RK3288_CLKGATE_CON(2), 5, GFLAGS), + MUX(SCLK_MAC, "mac_clk", mux_mac_p, CLK_SET_RATE_PARENT, +@@ -665,7 +685,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { GATE(0, "sclk_intmem0", "aclk_cpu", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(10), 5, GFLAGS), GATE(0, "sclk_intmem1", "aclk_cpu", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(10), 6, GFLAGS), GATE(0, "sclk_intmem2", "aclk_cpu", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(10), 7, GFLAGS), @@ -114579,7 +110393,7 @@ index 93c794695c46..3e054ddf1931 100644 GATE(0, "aclk_strc_sys", "aclk_cpu", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(10), 13, GFLAGS), GATE(0, "aclk_intmem", "aclk_cpu", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(10), 4, GFLAGS), GATE(ACLK_CRYPTO, "aclk_crypto", "aclk_cpu", 0, RK3288_CLKGATE_CON(11), 6, GFLAGS), -@@ -691,7 +699,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { +@@ -691,7 +711,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { GATE(PCLK_TZPC, "pclk_tzpc", "pclk_cpu", 0, RK3288_CLKGATE_CON(11), 3, GFLAGS), GATE(PCLK_UART2, "pclk_uart2", "pclk_cpu", 0, RK3288_CLKGATE_CON(11), 9, GFLAGS), GATE(PCLK_EFUSE256, "pclk_efuse_256", "pclk_cpu", 0, RK3288_CLKGATE_CON(11), 10, GFLAGS), @@ -114588,7 +110402,25 @@ index 93c794695c46..3e054ddf1931 100644 /* ddrctrl [DDR Controller PHY clock] gates */ GATE(0, "nclk_ddrupctl0", "ddrphy", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(11), 4, GFLAGS), -@@ -727,7 +735,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { +@@ -704,7 +724,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { + /* aclk_peri gates */ + GATE(0, "aclk_peri_axi_matrix", "aclk_peri", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(6), 2, GFLAGS), + GATE(ACLK_DMAC2, "aclk_dmac2", "aclk_peri", 0, RK3288_CLKGATE_CON(6), 3, GFLAGS), +- GATE(0, "aclk_peri_niu", "aclk_peri", 0, RK3288_CLKGATE_CON(7), 11, GFLAGS), ++ GATE(0, "aclk_peri_niu", "aclk_peri", CLK_IS_CRITICAL, RK3288_CLKGATE_CON(7), 11, GFLAGS), + GATE(ACLK_MMU, "aclk_mmu", "aclk_peri", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(8), 12, GFLAGS), + GATE(ACLK_GMAC, "aclk_gmac", "aclk_peri", 0, RK3288_CLKGATE_CON(8), 0, GFLAGS), + GATE(HCLK_GPS, "hclk_gps", "aclk_peri", 0, RK3288_CLKGATE_CON(8), 2, GFLAGS), +@@ -715,7 +735,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { + GATE(HCLK_USBHOST0, "hclk_host0", "hclk_peri", 0, RK3288_CLKGATE_CON(7), 6, GFLAGS), + GATE(HCLK_USBHOST1, "hclk_host1", "hclk_peri", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(7), 7, GFLAGS), + GATE(HCLK_HSIC, "hclk_hsic", "hclk_peri", 0, RK3288_CLKGATE_CON(7), 8, GFLAGS), +- GATE(0, "hclk_usb_peri", "hclk_peri", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(7), 9, GFLAGS), ++ GATE(HCLK_USB_PERI, "hclk_usb_peri", "hclk_peri", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(7), 9, GFLAGS), + GATE(0, "hclk_peri_ahb_arbi", "hclk_peri", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(7), 10, GFLAGS), + GATE(0, "hclk_emem", "hclk_peri", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(7), 12, GFLAGS), + GATE(0, "hclk_mem", "hclk_peri", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(7), 13, GFLAGS), +@@ -727,7 +747,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { GATE(HCLK_SDIO1, "hclk_sdio1", "hclk_peri", 0, RK3288_CLKGATE_CON(8), 5, GFLAGS), GATE(HCLK_EMMC, "hclk_emmc", "hclk_peri", 0, RK3288_CLKGATE_CON(8), 6, GFLAGS), GATE(HCLK_HSADC, "hclk_hsadc", "hclk_peri", 0, RK3288_CLKGATE_CON(8), 7, GFLAGS), @@ -114597,7 +110429,7 @@ index 93c794695c46..3e054ddf1931 100644 /* pclk_peri gates */ GATE(0, "pclk_peri_matrix", "pclk_peri", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(6), 1, GFLAGS), -@@ -767,7 +775,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { +@@ -767,7 +787,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { GATE(PCLK_GPIO5, "pclk_gpio5", "pclk_pd_alive", 0, RK3288_CLKGATE_CON(14), 5, GFLAGS), GATE(PCLK_GPIO6, "pclk_gpio6", "pclk_pd_alive", 0, RK3288_CLKGATE_CON(14), 6, GFLAGS), GATE(PCLK_GRF, "pclk_grf", "pclk_pd_alive", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(14), 11, GFLAGS), @@ -114606,7 +110438,7 @@ index 93c794695c46..3e054ddf1931 100644 /* Watchdog pclk is controlled by RK3288_SGRF_SOC_CON0[1]. */ SGRF_GATE(PCLK_WDT, "pclk_wdt", "pclk_pd_alive"), -@@ -775,7 +783,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { +@@ -775,7 +795,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { /* pclk_pd_pmu gates */ GATE(PCLK_PMU, "pclk_pmu", "pclk_pd_pmu", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(17), 0, GFLAGS), GATE(0, "pclk_intmem1", "pclk_pd_pmu", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(17), 1, GFLAGS), @@ -114615,7 +110447,7 @@ index 93c794695c46..3e054ddf1931 100644 GATE(PCLK_SGRF, "pclk_sgrf", "pclk_pd_pmu", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(17), 3, GFLAGS), GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_pd_pmu", 0, RK3288_CLKGATE_CON(17), 4, GFLAGS), -@@ -784,7 +792,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { +@@ -784,7 +804,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { GATE(HCLK_VOP0, "hclk_vop0", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 6, GFLAGS), GATE(HCLK_VOP1, "hclk_vop1", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 8, GFLAGS), GATE(HCLK_VIO_AHB_ARBI, "hclk_vio_ahb_arbi", "hclk_vio", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(15), 9, GFLAGS), @@ -114624,7 +110456,7 @@ index 93c794695c46..3e054ddf1931 100644 GATE(HCLK_VIP, "hclk_vip", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 15, GFLAGS), GATE(HCLK_IEP, "hclk_iep", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 3, GFLAGS), GATE(HCLK_ISP, "hclk_isp", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 1, GFLAGS), -@@ -800,17 +808,17 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { +@@ -800,26 +820,30 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { /* aclk_vio0 gates */ GATE(ACLK_VOP0, "aclk_vop0", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 5, GFLAGS), GATE(ACLK_IEP, "aclk_iep", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 2, GFLAGS), @@ -114645,7 +110477,22 @@ index 93c794695c46..3e054ddf1931 100644 /* * Other ungrouped clocks. -@@ -832,23 +840,6 @@ static struct rockchip_clk_branch rk3288_hclkvio_branch[] __initdata = { + */ + +- GATE(0, "pclk_vip_in", "ext_vip", 0, RK3288_CLKGATE_CON(16), 0, GFLAGS), +- INVERTER(0, "pclk_vip", "pclk_vip_in", RK3288_CLKSEL_CON(29), 4, IFLAGS), ++ GATE(PCLK_VIP_IN, "pclk_vip_in", "ext_vip", 0, RK3288_CLKGATE_CON(16), 0, GFLAGS), ++ INVERTER(PCLK_VIP, "pclk_vip", "pclk_vip_in", RK3288_CLKSEL_CON(29), 4, IFLAGS), + GATE(PCLK_ISP_IN, "pclk_isp_in", "ext_isp", 0, RK3288_CLKGATE_CON(16), 3, GFLAGS), + INVERTER(0, "pclk_isp", "pclk_isp_in", RK3288_CLKSEL_CON(29), 3, IFLAGS), ++ ++ GATE(SCLK_HSADC0_TSP, "clk_hsadc0_tsp", "ext_hsadc0_tsp", 0, RK3288_CLKGATE_CON(8), 9, GFLAGS), ++ GATE(SCLK_HSADC1_TSP, "clk_hsadc1_tsp", "ext_hsadc0_tsp", 0, RK3288_CLKGATE_CON(8), 10, GFLAGS), ++ GATE(SCLK_27M_TSP, "clk_27m_tsp", "ext_27m_tsp", 0, RK3288_CLKGATE_CON(8), 11, GFLAGS), + }; + + static struct rockchip_clk_branch rk3288w_hclkvio_branch[] __initdata = { +@@ -832,23 +856,6 @@ static struct rockchip_clk_branch rk3288_hclkvio_branch[] __initdata = { RK3288_CLKSEL_CON(28), 8, 5, DFLAGS), }; @@ -114669,7 +110516,7 @@ index 93c794695c46..3e054ddf1931 100644 static void __iomem *rk3288_cru_base; /* -@@ -927,10 +918,21 @@ static struct syscore_ops rk3288_clk_syscore_ops = { +@@ -927,10 +934,21 @@ static struct syscore_ops rk3288_clk_syscore_ops = { .resume = rk3288_clk_resume, }; @@ -114691,7 +110538,7 @@ index 93c794695c46..3e054ddf1931 100644 rk3288_cru_base = of_iomap(np, 0); if (!rk3288_cru_base) { -@@ -944,6 +946,7 @@ static void __init rk3288_common_init(struct device_node *np, +@@ -944,6 +962,7 @@ static void __init rk3288_common_init(struct device_node *np, iounmap(rk3288_cru_base); return; } @@ -114699,7 +110546,7 @@ index 93c794695c46..3e054ddf1931 100644 rockchip_clk_register_plls(ctx, rk3288_pll_clks, ARRAY_SIZE(rk3288_pll_clks), -@@ -958,11 +961,8 @@ static void __init rk3288_common_init(struct device_node *np, +@@ -958,11 +977,8 @@ static void __init rk3288_common_init(struct device_node *np, rockchip_clk_register_branches(ctx, rk3288_hclkvio_branch, ARRAY_SIZE(rk3288_hclkvio_branch)); @@ -114712,7 +110559,7 @@ index 93c794695c46..3e054ddf1931 100644 &rk3288_cpuclk_data, rk3288_cpuclk_rates, ARRAY_SIZE(rk3288_cpuclk_rates)); -@@ -972,9 +972,14 @@ static void __init rk3288_common_init(struct device_node *np, +@@ -972,9 +988,14 @@ static void __init rk3288_common_init(struct device_node *np, rockchip_register_restart_notifier(ctx, RK3288_GLB_SRST_FST, rk3288_clk_shutdown); @@ -114728,7 +110575,7 @@ index 93c794695c46..3e054ddf1931 100644 } static void __init rk3288_clk_init(struct device_node *np) -@@ -988,3 +993,55 @@ static void __init rk3288w_clk_init(struct device_node *np) +@@ -988,3 +1009,55 @@ static void __init rk3288w_clk_init(struct device_node *np) rk3288_common_init(np, RK3288W_CRU); } CLK_OF_DECLARE(rk3288w_cru, "rockchip,rk3288w-cru", rk3288w_clk_init); @@ -114785,10 +110632,10 @@ index 93c794695c46..3e054ddf1931 100644 +MODULE_DESCRIPTION("Rockchip RK3288 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3308.c b/drivers/clk/rockchip/clk-rk3308.c -index 5bf15f2a44b7..539d37ae89c9 100644 +index 5bf15f2a4..6a8e38f11 100644 --- a/drivers/clk/rockchip/clk-rk3308.c +++ b/drivers/clk/rockchip/clk-rk3308.c -@@ -8,11 +8,20 @@ +@@ -8,6 +8,9 @@ #include #include #include @@ -114798,18 +110645,7 @@ index 5bf15f2a44b7..539d37ae89c9 100644 #include #include #include "clk.h" - - #define RK3308_GRF_SOC_STATUS0 0x380 -+#define RK3308_VOP_FRAC_MAX_PRATE 270000000 -+#define RK3308B_VOP_FRAC_MAX_PRATE 800000000 -+#define RK3308_UART_FRAC_MAX_PRATE 800000000 -+#define RK3308_PDM_FRAC_MAX_PRATE 800000000 -+#define RK3308_SPDIF_FRAC_MAX_PRATE 800000000 -+#define RK3308_I2S_FRAC_MAX_PRATE 800000000 - - enum rk3308_plls { - apll, dpll, vpll0, vpll1, -@@ -109,9 +118,10 @@ static struct rockchip_cpuclk_rate_table rk3308_cpuclk_rates[] __initdata = { +@@ -109,9 +112,10 @@ static struct rockchip_cpuclk_rate_table rk3308_cpuclk_rates[] __initdata = { }; static const struct rockchip_cpuclk_reg_data rk3308_cpuclk_data = { @@ -114823,7 +110659,7 @@ index 5bf15f2a44b7..539d37ae89c9 100644 .mux_core_alt = 1, .mux_core_main = 0, .mux_core_shift = 6, -@@ -120,7 +130,6 @@ static const struct rockchip_cpuclk_reg_data rk3308_cpuclk_data = { +@@ -120,7 +124,6 @@ static const struct rockchip_cpuclk_reg_data rk3308_cpuclk_data = { PNAME(mux_pll_p) = { "xin24m" }; PNAME(mux_usb480m_p) = { "xin24m", "usb480m_phy", "clk_rtc32k" }; @@ -114831,16 +110667,16 @@ index 5bf15f2a44b7..539d37ae89c9 100644 PNAME(mux_dpll_vpll0_p) = { "dpll", "vpll0" }; PNAME(mux_dpll_vpll0_xin24m_p) = { "dpll", "vpll0", "xin24m" }; PNAME(mux_dpll_vpll0_vpll1_p) = { "dpll", "vpll0", "vpll1" }; -@@ -174,6 +183,8 @@ PNAME(mux_spdif_tx_src_p) = { "clk_spdif_tx_div", "clk_spdif_tx_div50" }; +@@ -174,6 +177,8 @@ PNAME(mux_spdif_tx_src_p) = { "clk_spdif_tx_div", "clk_spdif_tx_div50" }; PNAME(mux_spdif_tx_p) = { "clk_spdif_tx_src", "clk_spdif_tx_frac", "mclk_i2s0_2ch_in" }; PNAME(mux_spdif_rx_src_p) = { "clk_spdif_rx_div", "clk_spdif_rx_div50" }; PNAME(mux_spdif_rx_p) = { "clk_spdif_rx_src", "clk_spdif_rx_frac" }; -+PNAME(mux_uart_src_p) = { "xin24m", "usb480m", "dpll", "vpll0", "vpll1" }; -+static u32 uart_src_mux_idx[] = { 4, 3, 0, 1, 2 }; ++PNAME(mux_uart_src_p) = { "usb480m", "xin24m", "dpll", "vpll0", "vpll1" }; ++static u32 uart_src_mux_idx[] = { 3, 4, 0, 1, 2 }; static struct rockchip_pll_clock rk3308_pll_clks[] __initdata = { [apll] = PLL(pll_rk3328, PLL_APLL, "apll", mux_pll_p, -@@ -311,68 +322,68 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { +@@ -311,66 +316,66 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { * Clock-Architecture Diagram 3 */ @@ -114869,10 +110705,10 @@ index 5bf15f2a44b7..539d37ae89c9 100644 + RK3308_CLKSEL_CON(10), 13, 3, MFLAGS, uart_src_mux_idx, 0, 5, DFLAGS, RK3308_CLKGATE_CON(1), 9, GFLAGS), COMPOSITE_FRACMUX(0, "clk_uart0_frac", "clk_uart0_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(12), 0, +- RK3308_CLKSEL_CON(12), 0, ++ RK3308_CLKSEL_CON(12), CLK_FRAC_DIVIDER_NO_LIMIT, RK3308_CLKGATE_CON(1), 11, GFLAGS, -- &rk3308_uart0_fracmux), -+ &rk3308_uart0_fracmux, RK3308_UART_FRAC_MAX_PRATE), + &rk3308_uart0_fracmux), GATE(SCLK_UART0, "clk_uart0", "clk_uart0_mux", 0, RK3308_CLKGATE_CON(1), 12, GFLAGS), @@ -114882,10 +110718,10 @@ index 5bf15f2a44b7..539d37ae89c9 100644 + RK3308_CLKSEL_CON(13), 13, 3, MFLAGS, uart_src_mux_idx, 0, 5, DFLAGS, RK3308_CLKGATE_CON(1), 13, GFLAGS), COMPOSITE_FRACMUX(0, "clk_uart1_frac", "clk_uart1_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(15), 0, +- RK3308_CLKSEL_CON(15), 0, ++ RK3308_CLKSEL_CON(15), CLK_FRAC_DIVIDER_NO_LIMIT, RK3308_CLKGATE_CON(1), 15, GFLAGS, -- &rk3308_uart1_fracmux), -+ &rk3308_uart1_fracmux, RK3308_UART_FRAC_MAX_PRATE), + &rk3308_uart1_fracmux), GATE(SCLK_UART1, "clk_uart1", "clk_uart1_mux", 0, RK3308_CLKGATE_CON(2), 0, GFLAGS), @@ -114895,10 +110731,10 @@ index 5bf15f2a44b7..539d37ae89c9 100644 + RK3308_CLKSEL_CON(16), 13, 3, MFLAGS, uart_src_mux_idx, 0, 5, DFLAGS, RK3308_CLKGATE_CON(2), 1, GFLAGS), COMPOSITE_FRACMUX(0, "clk_uart2_frac", "clk_uart2_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(18), 0, +- RK3308_CLKSEL_CON(18), 0, ++ RK3308_CLKSEL_CON(18), CLK_FRAC_DIVIDER_NO_LIMIT, RK3308_CLKGATE_CON(2), 3, GFLAGS, -- &rk3308_uart2_fracmux), -+ &rk3308_uart2_fracmux, RK3308_UART_FRAC_MAX_PRATE), + &rk3308_uart2_fracmux), GATE(SCLK_UART2, "clk_uart2", "clk_uart2_mux", CLK_SET_RATE_PARENT, RK3308_CLKGATE_CON(2), 4, GFLAGS), @@ -114908,10 +110744,10 @@ index 5bf15f2a44b7..539d37ae89c9 100644 + RK3308_CLKSEL_CON(19), 13, 3, MFLAGS, uart_src_mux_idx, 0, 5, DFLAGS, RK3308_CLKGATE_CON(2), 5, GFLAGS), COMPOSITE_FRACMUX(0, "clk_uart3_frac", "clk_uart3_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(21), 0, +- RK3308_CLKSEL_CON(21), 0, ++ RK3308_CLKSEL_CON(21), CLK_FRAC_DIVIDER_NO_LIMIT, RK3308_CLKGATE_CON(2), 7, GFLAGS, -- &rk3308_uart3_fracmux), -+ &rk3308_uart3_fracmux, RK3308_UART_FRAC_MAX_PRATE), + &rk3308_uart3_fracmux), GATE(SCLK_UART3, "clk_uart3", "clk_uart3_mux", 0, RK3308_CLKGATE_CON(2), 8, GFLAGS), @@ -114921,25 +110757,12 @@ index 5bf15f2a44b7..539d37ae89c9 100644 + RK3308_CLKSEL_CON(22), 13, 3, MFLAGS, uart_src_mux_idx, 0, 5, DFLAGS, RK3308_CLKGATE_CON(2), 9, GFLAGS), COMPOSITE_FRACMUX(0, "clk_uart4_frac", "clk_uart4_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(24), 0, +- RK3308_CLKSEL_CON(24), 0, ++ RK3308_CLKSEL_CON(24), CLK_FRAC_DIVIDER_NO_LIMIT, RK3308_CLKGATE_CON(2), 11, GFLAGS, -- &rk3308_uart4_fracmux), -+ &rk3308_uart4_fracmux, RK3308_UART_FRAC_MAX_PRATE), + &rk3308_uart4_fracmux), GATE(SCLK_UART4, "clk_uart4", "clk_uart4_mux", 0, - RK3308_CLKGATE_CON(2), 12, GFLAGS), - -@@ -449,10 +460,6 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE(0, "dclk_vop_src", mux_dpll_vpll0_vpll1_p, 0, - RK3308_CLKSEL_CON(8), 10, 2, MFLAGS, 0, 8, DFLAGS, - RK3308_CLKGATE_CON(1), 6, GFLAGS), -- COMPOSITE_FRACMUX(0, "dclk_vop_frac", "dclk_vop_src", CLK_SET_RATE_PARENT, -- RK3308_CLKSEL_CON(9), 0, -- RK3308_CLKGATE_CON(1), 7, GFLAGS, -- &rk3308_dclk_vop_fracmux), - GATE(DCLK_VOP, "dclk_vop", "dclk_vop_mux", 0, - RK3308_CLKGATE_CON(1), 8, GFLAGS), - -@@ -460,16 +467,16 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { +@@ -460,16 +465,16 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { * Clock-Architecture Diagram 4 */ @@ -114960,7 +110783,7 @@ index 5bf15f2a44b7..539d37ae89c9 100644 RK3308_CLKSEL_CON(37), 8, 5, DFLAGS, RK3308_CLKGATE_CON(8), 3, GFLAGS), -@@ -560,10 +567,10 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { +@@ -560,10 +565,10 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { GATE(0, "clk_ddr_msch_peribus", "clk_ddrphy1x_out", CLK_IGNORE_UNUSED, RK3308_CLKGATE_CON(4), 13, GFLAGS), @@ -114973,16 +110796,7 @@ index 5bf15f2a44b7..539d37ae89c9 100644 RK3308_CLKGATE_CON(0), 11, GFLAGS), FACTOR_GATE(0, "clk_ddr_stdby_div4", "clk_ddrphy4x", CLK_IGNORE_UNUSED, 1, 4, RK3308_CLKGATE_CON(0), 13, GFLAGS), -@@ -583,7 +590,7 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_rtc32k_frac", "xin24m", CLK_IGNORE_UNUSED, - RK3308_CLKSEL_CON(3), 0, - RK3308_CLKGATE_CON(4), 3, GFLAGS, -- &rk3308_rtc32k_fracmux), -+ &rk3308_rtc32k_fracmux, 0), - MUX(0, "clk_rtc32k_div_src", mux_vpll0_vpll1_p, 0, - RK3308_CLKSEL_CON(2), 10, 1, MFLAGS), - COMPOSITE_NOMUX(0, "clk_rtc32k_div", "clk_rtc32k_div_src", CLK_IGNORE_UNUSED | CLK_SET_RATE_PARENT, -@@ -617,13 +624,13 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { +@@ -617,13 +622,13 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { * Clock-Architecture Diagram 7 */ @@ -114999,124 +110813,7 @@ index 5bf15f2a44b7..539d37ae89c9 100644 RK3308_CLKSEL_CON(45), 8, 5, DFLAGS, RK3308_CLKGATE_CON(10), 2, GFLAGS), -@@ -633,7 +640,7 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_pdm_frac", "clk_pdm_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(47), 0, - RK3308_CLKGATE_CON(10), 4, GFLAGS, -- &rk3308_pdm_fracmux), -+ &rk3308_pdm_fracmux, RK3308_PDM_FRAC_MAX_PRATE), - GATE(SCLK_PDM, "clk_pdm", "clk_pdm_mux", 0, - RK3308_CLKGATE_CON(10), 5, GFLAGS), - -@@ -643,7 +650,7 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s0_8ch_tx_frac", "clk_i2s0_8ch_tx_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(53), 0, - RK3308_CLKGATE_CON(10), 13, GFLAGS, -- &rk3308_i2s0_8ch_tx_fracmux), -+ &rk3308_i2s0_8ch_tx_fracmux, RK3308_I2S_FRAC_MAX_PRATE), - COMPOSITE_NODIV(SCLK_I2S0_8CH_TX, "clk_i2s0_8ch_tx", mux_i2s0_8ch_tx_rx_p, CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(52), 12, 1, MFLAGS, - RK3308_CLKGATE_CON(10), 14, GFLAGS), -@@ -657,7 +664,7 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s0_8ch_rx_frac", "clk_i2s0_8ch_rx_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(55), 0, - RK3308_CLKGATE_CON(11), 1, GFLAGS, -- &rk3308_i2s0_8ch_rx_fracmux), -+ &rk3308_i2s0_8ch_rx_fracmux, RK3308_I2S_FRAC_MAX_PRATE), - COMPOSITE_NODIV(SCLK_I2S0_8CH_RX, "clk_i2s0_8ch_rx", mux_i2s0_8ch_rx_tx_p, CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(54), 12, 1, MFLAGS, - RK3308_CLKGATE_CON(11), 2, GFLAGS), -@@ -670,7 +677,7 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s1_8ch_tx_frac", "clk_i2s1_8ch_tx_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(57), 0, - RK3308_CLKGATE_CON(11), 5, GFLAGS, -- &rk3308_i2s1_8ch_tx_fracmux), -+ &rk3308_i2s1_8ch_tx_fracmux, RK3308_I2S_FRAC_MAX_PRATE), - COMPOSITE_NODIV(SCLK_I2S1_8CH_TX, "clk_i2s1_8ch_tx", mux_i2s1_8ch_tx_rx_p, CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(56), 12, 1, MFLAGS, - RK3308_CLKGATE_CON(11), 6, GFLAGS), -@@ -684,7 +691,7 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s1_8ch_rx_frac", "clk_i2s1_8ch_rx_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(59), 0, - RK3308_CLKGATE_CON(11), 9, GFLAGS, -- &rk3308_i2s1_8ch_rx_fracmux), -+ &rk3308_i2s1_8ch_rx_fracmux, RK3308_I2S_FRAC_MAX_PRATE), - COMPOSITE_NODIV(SCLK_I2S1_8CH_RX, "clk_i2s1_8ch_rx", mux_i2s1_8ch_rx_tx_p, CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(58), 12, 1, MFLAGS, - RK3308_CLKGATE_CON(11), 10, GFLAGS), -@@ -697,7 +704,7 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s2_8ch_tx_frac", "clk_i2s2_8ch_tx_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(61), 0, - RK3308_CLKGATE_CON(11), 13, GFLAGS, -- &rk3308_i2s2_8ch_tx_fracmux), -+ &rk3308_i2s2_8ch_tx_fracmux, RK3308_I2S_FRAC_MAX_PRATE), - COMPOSITE_NODIV(SCLK_I2S2_8CH_TX, "clk_i2s2_8ch_tx", mux_i2s2_8ch_tx_rx_p, CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(60), 12, 1, MFLAGS, - RK3308_CLKGATE_CON(11), 14, GFLAGS), -@@ -711,7 +718,7 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s2_8ch_rx_frac", "clk_i2s2_8ch_rx_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(63), 0, - RK3308_CLKGATE_CON(12), 1, GFLAGS, -- &rk3308_i2s2_8ch_rx_fracmux), -+ &rk3308_i2s2_8ch_rx_fracmux, RK3308_I2S_FRAC_MAX_PRATE), - COMPOSITE_NODIV(SCLK_I2S2_8CH_RX, "clk_i2s2_8ch_rx", mux_i2s2_8ch_rx_tx_p, CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(62), 12, 1, MFLAGS, - RK3308_CLKGATE_CON(12), 2, GFLAGS), -@@ -724,7 +731,7 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s3_8ch_tx_frac", "clk_i2s3_8ch_tx_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(65), 0, - RK3308_CLKGATE_CON(12), 5, GFLAGS, -- &rk3308_i2s3_8ch_tx_fracmux), -+ &rk3308_i2s3_8ch_tx_fracmux, RK3308_I2S_FRAC_MAX_PRATE), - COMPOSITE_NODIV(SCLK_I2S3_8CH_TX, "clk_i2s3_8ch_tx", mux_i2s3_8ch_tx_rx_p, CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(64), 12, 1, MFLAGS, - RK3308_CLKGATE_CON(12), 6, GFLAGS), -@@ -738,7 +745,7 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s3_8ch_rx_frac", "clk_i2s3_8ch_rx_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(67), 0, - RK3308_CLKGATE_CON(12), 9, GFLAGS, -- &rk3308_i2s3_8ch_rx_fracmux), -+ &rk3308_i2s3_8ch_rx_fracmux, RK3308_I2S_FRAC_MAX_PRATE), - COMPOSITE_NODIV(SCLK_I2S3_8CH_RX, "clk_i2s3_8ch_rx", mux_i2s3_8ch_rx_tx_p, CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(66), 12, 1, MFLAGS, - RK3308_CLKGATE_CON(12), 10, GFLAGS), -@@ -751,7 +758,7 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s0_2ch_frac", "clk_i2s0_2ch_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(69), 0, - RK3308_CLKGATE_CON(12), 13, GFLAGS, -- &rk3308_i2s0_2ch_fracmux), -+ &rk3308_i2s0_2ch_fracmux, RK3308_I2S_FRAC_MAX_PRATE), - GATE(SCLK_I2S0_2CH, "clk_i2s0_2ch", "clk_i2s0_2ch_mux", 0, - RK3308_CLKGATE_CON(12), 14, GFLAGS), - COMPOSITE_NODIV(SCLK_I2S0_2CH_OUT, "clk_i2s0_2ch_out", mux_i2s0_2ch_out_p, CLK_SET_RATE_PARENT, -@@ -764,7 +771,7 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s1_2ch_frac", "clk_i2s1_2ch_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(71), 0, - RK3308_CLKGATE_CON(13), 1, GFLAGS, -- &rk3308_i2s1_2ch_fracmux), -+ &rk3308_i2s1_2ch_fracmux, RK3308_I2S_FRAC_MAX_PRATE), - GATE(SCLK_I2S1_2CH, "clk_i2s1_2ch", "clk_i2s1_2ch_mux", 0, - RK3308_CLKGATE_CON(13), 2, GFLAGS), - COMPOSITE_NODIV(SCLK_I2S1_2CH_OUT, "clk_i2s1_2ch_out", mux_i2s1_2ch_out_p, CLK_SET_RATE_PARENT, -@@ -782,7 +789,7 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_spdif_tx_frac", "clk_spdif_tx_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(49), 0, - RK3308_CLKGATE_CON(10), 7, GFLAGS, -- &rk3308_spdif_tx_fracmux), -+ &rk3308_spdif_tx_fracmux, RK3308_SPDIF_FRAC_MAX_PRATE), - GATE(SCLK_SPDIF_TX, "clk_spdif_tx", "clk_spdif_tx_mux", 0, - RK3308_CLKGATE_CON(10), 8, GFLAGS), - -@@ -797,7 +804,7 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_spdif_rx_frac", "clk_spdif_rx_src", CLK_SET_RATE_PARENT, - RK3308_CLKSEL_CON(51), 0, - RK3308_CLKGATE_CON(10), 10, GFLAGS, -- &rk3308_spdif_rx_fracmux), -+ &rk3308_spdif_rx_fracmux, RK3308_SPDIF_FRAC_MAX_PRATE), - GATE(SCLK_SPDIF_RX, "clk_spdif_rx", "clk_spdif_rx_mux", 0, - RK3308_CLKGATE_CON(10), 11, GFLAGS), - -@@ -900,22 +907,37 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { +@@ -900,22 +905,37 @@ static struct rockchip_clk_branch rk3308_clk_branches[] __initdata = { GATE(PCLK_OWIRE, "pclk_owire", "pclk_bus", CLK_IGNORE_UNUSED, RK3308_CLKGATE_CON(7), 15, GFLAGS), }; @@ -115134,14 +110831,14 @@ index 5bf15f2a44b7..539d37ae89c9 100644 + COMPOSITE_FRACMUX(0, "dclk_vop_frac", "dclk_vop_src", CLK_SET_RATE_PARENT, + RK3308_CLKSEL_CON(9), 0, + RK3308_CLKGATE_CON(1), 7, GFLAGS, -+ &rk3308_dclk_vop_fracmux, RK3308_VOP_FRAC_MAX_PRATE), ++ &rk3308_dclk_vop_fracmux), +}; + +static struct rockchip_clk_branch rk3308b_dclk_vop_frac[] __initdata = { + COMPOSITE_FRACMUX(0, "dclk_vop_frac", "dclk_vop_src", CLK_SET_RATE_PARENT, + RK3308_CLKSEL_CON(9), 0, + RK3308_CLKGATE_CON(1), 7, GFLAGS, -+ &rk3308_dclk_vop_fracmux, RK3308B_VOP_FRAC_MAX_PRATE), ++ &rk3308_dclk_vop_fracmux), }; +static void __iomem *rk3308_cru_base; @@ -115164,7 +110861,7 @@ index 5bf15f2a44b7..539d37ae89c9 100644 reg_base = of_iomap(np, 0); if (!reg_base) { -@@ -929,17 +951,22 @@ static void __init rk3308_clk_init(struct device_node *np) +@@ -929,17 +949,23 @@ static void __init rk3308_clk_init(struct device_node *np) iounmap(reg_base); return; } @@ -115177,6 +110874,7 @@ index 5bf15f2a44b7..539d37ae89c9 100644 ARRAY_SIZE(rk3308_clk_branches)); - rockchip_clk_protect_critical(rk3308_critical_clocks, - ARRAY_SIZE(rk3308_critical_clocks)); ++ rockchip_soc_id_init(); + if (soc_is_rk3308b()) + rockchip_clk_register_branches(ctx, rk3308b_dclk_vop_frac, + ARRAY_SIZE(rk3308b_dclk_vop_frac)); @@ -115190,7 +110888,7 @@ index 5bf15f2a44b7..539d37ae89c9 100644 &rk3308_cpuclk_data, rk3308_cpuclk_rates, ARRAY_SIZE(rk3308_cpuclk_rates)); -@@ -949,6 +976,39 @@ static void __init rk3308_clk_init(struct device_node *np) +@@ -949,6 +975,39 @@ static void __init rk3308_clk_init(struct device_node *np) rockchip_register_restart_notifier(ctx, RK3308_GLB_SRST_FST, NULL); rockchip_clk_of_add_provider(np, ctx); @@ -115231,7 +110929,7 @@ index 5bf15f2a44b7..539d37ae89c9 100644 +MODULE_DESCRIPTION("Rockchip RK3308 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3328.c b/drivers/clk/rockchip/clk-rk3328.c -index 2429b7c2a8b3..b8064dd74bd6 100644 +index 2429b7c2a..8ec63aaae 100644 --- a/drivers/clk/rockchip/clk-rk3328.c +++ b/drivers/clk/rockchip/clk-rk3328.c @@ -6,8 +6,10 @@ @@ -115245,17 +110943,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 #include #include #include "clk.h" -@@ -16,6 +18,9 @@ - #define RK3328_GRF_SOC_STATUS0 0x480 - #define RK3328_GRF_MAC_CON1 0x904 - #define RK3328_GRF_MAC_CON2 0x908 -+#define RK3328_I2S_FRAC_MAX_PRATE 600000000 -+#define RK3328_UART_FRAC_MAX_PRATE 600000000 -+#define RK3328_SPDIF_FRAC_MAX_PRATE 600000000 - - enum rk3328_plls { - apll, dpll, cpll, gpll, npll, -@@ -130,9 +135,10 @@ static struct rockchip_cpuclk_rate_table rk3328_cpuclk_rates[] __initdata = { +@@ -130,9 +132,10 @@ static struct rockchip_cpuclk_rate_table rk3328_cpuclk_rates[] __initdata = { }; static const struct rockchip_cpuclk_reg_data rk3328_cpuclk_data = { @@ -115269,7 +110957,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 .mux_core_alt = 1, .mux_core_main = 3, .mux_core_shift = 6, -@@ -290,18 +296,18 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { +@@ -290,18 +293,18 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { RK3328_CLKGATE_CON(0), 1, GFLAGS), GATE(0, "npll_core", "npll", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(0), 12, GFLAGS), @@ -115293,7 +110981,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 RK3328_CLKGATE_CON(7), 2, GFLAGS), /* PD_GPU */ -@@ -310,34 +316,34 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { +@@ -310,34 +313,35 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { RK3328_CLKGATE_CON(6), 6, GFLAGS), GATE(ACLK_GPU, "aclk_gpu", "aclk_gpu_pre", CLK_SET_RATE_PARENT, RK3328_CLKGATE_CON(14), 0, GFLAGS), @@ -115303,16 +110991,20 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 /* PD_DDR */ - COMPOSITE(0, "clk_ddr", mux_ddrphy_p, CLK_IGNORE_UNUSED, -+ COMPOSITE(0, "clk_ddr", mux_ddrphy_p, CLK_IS_CRITICAL, - RK3328_CLKSEL_CON(3), 8, 2, MFLAGS, 0, 3, DFLAGS | CLK_DIVIDER_POWER_OF_TWO, - RK3328_CLKGATE_CON(0), 4, GFLAGS), +- RK3328_CLKSEL_CON(3), 8, 2, MFLAGS, 0, 3, DFLAGS | CLK_DIVIDER_POWER_OF_TWO, +- RK3328_CLKGATE_CON(0), 4, GFLAGS), - GATE(0, "clk_ddrmsch", "clk_ddr", CLK_IGNORE_UNUSED, -+ GATE(0, "clk_ddrmsch", "clk_ddr", CLK_IS_CRITICAL, ++ COMPOSITE_DDRCLK(SCLK_DDRCLK, "sclk_ddrc", mux_ddrphy_p, 0, ++ RK3328_CLKSEL_CON(3), 8, 2, 0, 3, ++ ROCKCHIP_DDRCLK_SIP_V2), ++ ++ GATE(0, "clk_ddrmsch", "sclk_ddrc", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(18), 6, GFLAGS), - GATE(0, "clk_ddrupctl", "clk_ddr", CLK_IGNORE_UNUSED, -+ GATE(0, "clk_ddrupctl", "clk_ddr", CLK_IS_CRITICAL, ++ GATE(0, "clk_ddrupctl", "sclk_ddrc", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(18), 5, GFLAGS), - GATE(0, "aclk_ddrupctl", "clk_ddr", CLK_IGNORE_UNUSED, +- GATE(0, "aclk_ddrupctl", "clk_ddr", CLK_IGNORE_UNUSED, ++ GATE(0, "aclk_ddrupctl", "sclk_ddrc", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(18), 4, GFLAGS), GATE(0, "clk_ddrmon", "xin24m", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(0), 6, GFLAGS), @@ -115337,7 +111029,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 RK3328_CLKGATE_CON(18), 9, GFLAGS), /* -@@ -345,18 +351,18 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { +@@ -345,18 +349,18 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { */ /* PD_BUS */ @@ -115361,62 +111053,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 RK3328_CLKGATE_CON(8), 4, GFLAGS), COMPOSITE(SCLK_TSP, "clk_tsp", mux_2plls_p, 0, -@@ -372,7 +378,7 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s0_frac", "clk_i2s0_div", CLK_SET_RATE_PARENT, - RK3328_CLKSEL_CON(7), 0, - RK3328_CLKGATE_CON(1), 2, GFLAGS, -- &rk3328_i2s0_fracmux), -+ &rk3328_i2s0_fracmux, RK3328_I2S_FRAC_MAX_PRATE), - GATE(SCLK_I2S0, "clk_i2s0", "i2s0_pre", CLK_SET_RATE_PARENT, - RK3328_CLKGATE_CON(1), 3, GFLAGS), - -@@ -382,7 +388,7 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s1_frac", "clk_i2s1_div", CLK_SET_RATE_PARENT, - RK3328_CLKSEL_CON(9), 0, - RK3328_CLKGATE_CON(1), 5, GFLAGS, -- &rk3328_i2s1_fracmux), -+ &rk3328_i2s1_fracmux, RK3328_I2S_FRAC_MAX_PRATE), - GATE(SCLK_I2S1, "clk_i2s1", "i2s1_pre", CLK_SET_RATE_PARENT, - RK3328_CLKGATE_CON(1), 6, GFLAGS), - COMPOSITE_NODIV(SCLK_I2S1_OUT, "i2s1_out", mux_i2s1out_p, 0, -@@ -395,7 +401,7 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_i2s2_frac", "clk_i2s2_div", CLK_SET_RATE_PARENT, - RK3328_CLKSEL_CON(11), 0, - RK3328_CLKGATE_CON(1), 9, GFLAGS, -- &rk3328_i2s2_fracmux), -+ &rk3328_i2s2_fracmux, RK3328_I2S_FRAC_MAX_PRATE), - GATE(SCLK_I2S2, "clk_i2s2", "i2s2_pre", CLK_SET_RATE_PARENT, - RK3328_CLKGATE_CON(1), 10, GFLAGS), - COMPOSITE_NODIV(SCLK_I2S2_OUT, "i2s2_out", mux_i2s2out_p, 0, -@@ -408,7 +414,7 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_spdif_frac", "clk_spdif_div", CLK_SET_RATE_PARENT, - RK3328_CLKSEL_CON(13), 0, - RK3328_CLKGATE_CON(1), 13, GFLAGS, -- &rk3328_spdif_fracmux), -+ &rk3328_spdif_fracmux, RK3328_SPDIF_FRAC_MAX_PRATE), - - /* PD_UART */ - COMPOSITE(0, "clk_uart0_div", mux_2plls_u480m_p, 0, -@@ -423,15 +429,15 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "clk_uart0_frac", "clk_uart0_div", CLK_SET_RATE_PARENT, - RK3328_CLKSEL_CON(15), 0, - RK3328_CLKGATE_CON(1), 15, GFLAGS, -- &rk3328_uart0_fracmux), -+ &rk3328_uart0_fracmux, RK3328_UART_FRAC_MAX_PRATE), - COMPOSITE_FRACMUX(0, "clk_uart1_frac", "clk_uart1_div", CLK_SET_RATE_PARENT, - RK3328_CLKSEL_CON(17), 0, - RK3328_CLKGATE_CON(2), 1, GFLAGS, -- &rk3328_uart1_fracmux), -+ &rk3328_uart1_fracmux, RK3328_UART_FRAC_MAX_PRATE), - COMPOSITE_FRACMUX(0, "clk_uart2_frac", "clk_uart2_div", CLK_SET_RATE_PARENT, - RK3328_CLKSEL_CON(19), 0, - RK3328_CLKGATE_CON(2), 3, GFLAGS, -- &rk3328_uart2_fracmux), -+ &rk3328_uart2_fracmux, RK3328_UART_FRAC_MAX_PRATE), - - /* - * Clock-Architecture Diagram 4 -@@ -505,9 +511,9 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { +@@ -505,9 +509,9 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { RK3328_CLKGATE_CON(24), 0, GFLAGS), GATE(HCLK_RKVDEC, "hclk_rkvdec", "hclk_rkvdec_pre", CLK_SET_RATE_PARENT, RK3328_CLKGATE_CON(24), 1, GFLAGS), @@ -115428,7 +111065,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 RK3328_CLKGATE_CON(24), 3, GFLAGS), COMPOSITE(SCLK_VDEC_CABAC, "sclk_vdec_cabac", mux_4plls_p, 0, -@@ -527,35 +533,36 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { +@@ -527,35 +531,36 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { RK3328_CLKGATE_CON(23), 0, GFLAGS), GATE(HCLK_VPU, "hclk_vpu", "hclk_vpu_pre", CLK_SET_RATE_PARENT, RK3328_CLKGATE_CON(23), 1, GFLAGS), @@ -115479,7 +111116,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 COMPOSITE(SCLK_VENC_DSP, "sclk_venc_dsp", mux_4plls_p, 0, RK3328_CLKSEL_CON(52), 14, 2, MFLAGS, 8, 5, DFLAGS, RK3328_CLKGATE_CON(6), 7, GFLAGS), -@@ -602,21 +609,21 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { +@@ -602,21 +607,21 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { */ /* PD_PERI */ @@ -115508,7 +111145,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 RK3328_CLKGATE_CON(10), 0, GFLAGS), COMPOSITE(SCLK_SDMMC, "clk_sdmmc", mux_2plls_24m_u480m_p, 0, -@@ -701,30 +708,30 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { +@@ -701,30 +706,30 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { /* PD_VOP */ GATE(ACLK_RGA, "aclk_rga", "aclk_rga_pre", 0, RK3328_CLKGATE_CON(21), 10, GFLAGS), @@ -115548,7 +111185,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 GATE(ACLK_USB3OTG, "aclk_usb3otg", "aclk_peri", 0, RK3328_CLKGATE_CON(19), 14, GFLAGS), GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_peri", 0, RK3328_CLKGATE_CON(19), 0, GFLAGS), -@@ -734,26 +741,26 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { +@@ -734,26 +739,26 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { GATE(HCLK_HOST0, "hclk_host0", "hclk_peri", 0, RK3328_CLKGATE_CON(19), 6, GFLAGS), GATE(HCLK_HOST0_ARB, "hclk_host0_arb", "hclk_peri", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(19), 7, GFLAGS), GATE(HCLK_OTG, "hclk_otg", "hclk_peri", 0, RK3328_CLKGATE_CON(19), 8, GFLAGS), @@ -115583,7 +111220,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 GATE(HCLK_I2S0_8CH, "hclk_i2s0_8ch", "hclk_bus_pre", 0, RK3328_CLKGATE_CON(15), 3, GFLAGS), GATE(HCLK_I2S1_8CH, "hclk_i2s1_8ch", "hclk_bus_pre", 0, RK3328_CLKGATE_CON(15), 4, GFLAGS), GATE(HCLK_I2S2_2CH, "hclk_i2s2_2ch", "hclk_bus_pre", 0, RK3328_CLKGATE_CON(15), 5, GFLAGS), -@@ -761,17 +768,17 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { +@@ -761,17 +766,17 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { GATE(HCLK_TSP, "hclk_tsp", "hclk_bus_pre", 0, RK3328_CLKGATE_CON(17), 11, GFLAGS), GATE(HCLK_CRYPTO_MST, "hclk_crypto_mst", "hclk_bus_pre", 0, RK3328_CLKGATE_CON(15), 7, GFLAGS), GATE(HCLK_CRYPTO_SLV, "hclk_crypto_slv", "hclk_bus_pre", 0, RK3328_CLKGATE_CON(15), 8, GFLAGS), @@ -115604,7 +111241,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 GATE(0, "pclk_stimer", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 4, GFLAGS), GATE(PCLK_SPI, "pclk_spi", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 5, GFLAGS), GATE(PCLK_PWM, "pclk_rk_pwm", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 6, GFLAGS), -@@ -784,12 +791,12 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { +@@ -784,12 +789,12 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { GATE(PCLK_UART2, "pclk_uart2", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 13, GFLAGS), GATE(PCLK_TSADC, "pclk_tsadc", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 14, GFLAGS), GATE(PCLK_DCF, "pclk_dcf", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 15, GFLAGS), @@ -115621,7 +111258,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 /* Watchdog pclk is controlled from the secure GRF */ SGRF_GATE(PCLK_WDT, "pclk_wdt", "pclk_bus"), -@@ -798,11 +805,11 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { +@@ -798,11 +803,11 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { GATE(PCLK_USB3PHY_PIPE, "pclk_usb3phy_pipe", "pclk_phy_pre", 0, RK3328_CLKGATE_CON(28), 2, GFLAGS), GATE(PCLK_USB3_GRF, "pclk_usb3_grf", "pclk_phy_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(17), 2, GFLAGS), GATE(PCLK_USB2_GRF, "pclk_usb2_grf", "pclk_phy_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(17), 14, GFLAGS), @@ -115635,7 +111272,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 /* PD_MMC */ MMC(SCLK_SDMMC_DRV, "sdmmc_drv", "clk_sdmmc", -@@ -826,61 +833,11 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { +@@ -826,61 +831,11 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { RK3328_SDMMC_EXT_CON1, 1), }; @@ -115698,7 +111335,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 reg_base = of_iomap(np, 0); if (!reg_base) { -@@ -894,17 +851,16 @@ static void __init rk3328_clk_init(struct device_node *np) +@@ -894,17 +849,16 @@ static void __init rk3328_clk_init(struct device_node *np) iounmap(reg_base); return; } @@ -115718,7 +111355,7 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 &rk3328_cpuclk_data, rk3328_cpuclk_rates, ARRAY_SIZE(rk3328_cpuclk_rates)); -@@ -916,3 +872,31 @@ static void __init rk3328_clk_init(struct device_node *np) +@@ -916,3 +870,31 @@ static void __init rk3328_clk_init(struct device_node *np) rockchip_clk_of_add_provider(np, ctx); } CLK_OF_DECLARE(rk3328_cru, "rockchip,rk3328-cru", rk3328_clk_init); @@ -115751,10 +111388,10 @@ index 2429b7c2a8b3..b8064dd74bd6 100644 +MODULE_DESCRIPTION("Rockchip RK3328 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3368.c b/drivers/clk/rockchip/clk-rk3368.c -index 55443349439b..4b4513a26740 100644 +index 554433494..c56ea321e 100644 --- a/drivers/clk/rockchip/clk-rk3368.c +++ b/drivers/clk/rockchip/clk-rk3368.c -@@ -5,13 +5,19 @@ +@@ -5,8 +5,10 @@ #include #include @@ -115765,16 +111402,7 @@ index 55443349439b..4b4513a26740 100644 #include #include #include "clk.h" - - #define RK3368_GRF_SOC_STATUS0 0x480 -+#define RK3368_I2S_FRAC_MAX_PRATE 600000000 -+#define RK3368_UART_FRAC_MAX_PRATE 600000000 -+#define RK3368_SPDIF_FRAC_MAX_PRATE 600000000 -+#define RK3368_DCLK_PARENT_MAX_PRATE 600000000 - - enum rk3368_plls { - apllb, aplll, dpll, cpll, gpll, npll, -@@ -87,23 +93,40 @@ static struct rockchip_pll_rate_table rk3368_pll_rates[] = { +@@ -87,23 +89,40 @@ static struct rockchip_pll_rate_table rk3368_pll_rates[] = { { /* sentinel */ }, }; @@ -115822,7 +111450,7 @@ index 55443349439b..4b4513a26740 100644 "usbphy_480m" }; PNAME(mux_i2s_8ch_pre_p) = { "i2s_8ch_src", "i2s_8ch_frac", -@@ -138,7 +161,7 @@ static struct rockchip_pll_clock rk3368_pll_clks[] __initdata = { +@@ -138,7 +157,7 @@ static struct rockchip_pll_clock rk3368_pll_clks[] __initdata = { [gpll] = PLL(pll_rk3066, PLL_GPLL, "gpll", mux_pll_p, 0, RK3368_PLL_CON(16), RK3368_PLL_CON(19), 8, 4, ROCKCHIP_PLL_SYNC_RATE, rk3368_pll_rates), [npll] = PLL(pll_rk3066, PLL_NPLL, "npll", mux_pll_p, 0, RK3368_PLL_CON(20), @@ -115831,7 +111459,7 @@ index 55443349439b..4b4513a26740 100644 }; static struct clk_div_table div_ddrphy_t[] = { -@@ -154,9 +177,10 @@ static struct clk_div_table div_ddrphy_t[] = { +@@ -154,9 +173,10 @@ static struct clk_div_table div_ddrphy_t[] = { #define IFLAGS ROCKCHIP_INVERTER_HIWORD_MASK static const struct rockchip_cpuclk_reg_data rk3368_cpuclkb_data = { @@ -115845,7 +111473,7 @@ index 55443349439b..4b4513a26740 100644 .mux_core_alt = 1, .mux_core_main = 0, .mux_core_shift = 7, -@@ -164,11 +188,12 @@ static const struct rockchip_cpuclk_reg_data rk3368_cpuclkb_data = { +@@ -164,11 +184,12 @@ static const struct rockchip_cpuclk_reg_data rk3368_cpuclkb_data = { }; static const struct rockchip_cpuclk_reg_data rk3368_cpuclkl_data = { @@ -115861,7 +111489,7 @@ index 55443349439b..4b4513a26740 100644 .mux_core_shift = 7, .mux_core_mask = 0x1, }; -@@ -315,8 +340,8 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { +@@ -315,8 +336,8 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { RK3368_CLKSEL_CON(4), 8, 5, DFLAGS, RK3368_CLKGATE_CON(0), 13, GFLAGS), @@ -115872,7 +111500,7 @@ index 55443349439b..4b4513a26740 100644 RK3368_CLKGATE_CON(0), 12, GFLAGS), GATE(SCLK_PVTM_CORE, "sclk_pvtm_core", "xin24m", 0, RK3368_CLKGATE_CON(7), 10, GFLAGS), -@@ -332,19 +357,19 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { +@@ -332,19 +353,19 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { GATE(0, "sclk_ddr4x", "ddrphy_src", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(6), 15, GFLAGS), @@ -115898,7 +111526,7 @@ index 55443349439b..4b4513a26740 100644 RK3368_CLKSEL_CON(8), 8, 2, DFLAGS, RK3368_CLKGATE_CON(1), 1, GFLAGS), COMPOSITE_NOMUX(0, "sclk_crypto", "aclk_bus_src", 0, -@@ -358,7 +383,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { +@@ -358,7 +379,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { * stclk_mcu is listed as child of fclk_mcu_src in diagram 5, * but stclk_mcu has an additional own divider in diagram 2 */ @@ -115907,46 +111535,16 @@ index 55443349439b..4b4513a26740 100644 RK3368_CLKSEL_CON(12), 8, 3, DFLAGS, RK3368_CLKGATE_CON(13), 13, GFLAGS), -@@ -368,7 +393,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "i2s_8ch_frac", "i2s_8ch_src", CLK_SET_RATE_PARENT, - RK3368_CLKSEL_CON(28), 0, - RK3368_CLKGATE_CON(6), 2, GFLAGS, -- &rk3368_i2s_8ch_fracmux), -+ &rk3368_i2s_8ch_fracmux, RK3368_I2S_FRAC_MAX_PRATE), - COMPOSITE_NODIV(SCLK_I2S_8CH_OUT, "i2s_8ch_clkout", mux_i2s_8ch_clkout_p, 0, - RK3368_CLKSEL_CON(27), 15, 1, MFLAGS, - RK3368_CLKGATE_CON(6), 0, GFLAGS), -@@ -380,7 +405,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "spdif_8ch_frac", "spdif_8ch_src", CLK_SET_RATE_PARENT, - RK3368_CLKSEL_CON(32), 0, - RK3368_CLKGATE_CON(6), 5, GFLAGS, -- &rk3368_spdif_8ch_fracmux), -+ &rk3368_spdif_8ch_fracmux, RK3368_SPDIF_FRAC_MAX_PRATE), - GATE(SCLK_SPDIF_8CH, "sclk_spdif_8ch", "spdif_8ch_pre", CLK_SET_RATE_PARENT, - RK3368_CLKGATE_CON(6), 6, GFLAGS), - COMPOSITE(0, "i2s_2ch_src", mux_pll_src_cpll_gpll_p, 0, -@@ -389,7 +414,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "i2s_2ch_frac", "i2s_2ch_src", CLK_SET_RATE_PARENT, - RK3368_CLKSEL_CON(54), 0, - RK3368_CLKGATE_CON(5), 14, GFLAGS, -- &rk3368_i2s_2ch_fracmux), -+ &rk3368_i2s_2ch_fracmux, RK3368_I2S_FRAC_MAX_PRATE), - GATE(SCLK_I2S_2CH, "sclk_i2s_2ch", "i2s_2ch_pre", CLK_SET_RATE_PARENT, - RK3368_CLKGATE_CON(5), 15, GFLAGS), - -@@ -445,9 +470,9 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { +@@ -445,7 +466,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { RK3368_CLKSEL_CON(18), 6, 2, MFLAGS, 0, 5, DFLAGS, RK3368_CLKGATE_CON(4), 4, GFLAGS), - COMPOSITE(DCLK_VOP, "dclk_vop", mux_pll_src_cpll_gpll_npll_p, 0, -+ COMPOSITE_DCLK(DCLK_VOP, "dclk_vop", mux_pll_src_dmycpll_dmygpll_npll_p, CLK_SET_RATE_PARENT, ++ COMPOSITE(DCLK_VOP, "dclk_vop", mux_pll_src_dmycpll_dmygpll_npll_p, CLK_SET_RATE_PARENT, RK3368_CLKSEL_CON(20), 8, 2, MFLAGS, 0, 8, DFLAGS, -- RK3368_CLKGATE_CON(4), 1, GFLAGS), -+ RK3368_CLKGATE_CON(4), 1, GFLAGS, RK3368_DCLK_PARENT_MAX_PRATE), + RK3368_CLKGATE_CON(4), 1, GFLAGS), - GATE(SCLK_VOP0_PWM, "sclk_vop0_pwm", "xin24m", 0, - RK3368_CLKGATE_CON(4), 2, GFLAGS), -@@ -488,12 +513,12 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { +@@ -488,12 +509,12 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { RK3368_CLKSEL_CON(55), 6, 2, MFLAGS, 0, 6, DFLAGS, RK3368_CLKGATE_CON(5), 5, GFLAGS), @@ -115961,7 +111559,7 @@ index 55443349439b..4b4513a26740 100644 RK3368_CLKSEL_CON(10), 0, 5, DFLAGS, RK3368_CLKGATE_CON(7), 9, GFLAGS), GATE(SCLK_PVTM_PMU, "sclk_pvtm_pmu", "xin24m", 0, -@@ -512,16 +537,16 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { +@@ -512,16 +533,16 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { GATE(SCLK_PVTM_GPU, "sclk_pvtm_gpu", "xin24m", 0, RK3368_CLKGATE_CON(7), 11, GFLAGS), @@ -115982,43 +111580,7 @@ index 55443349439b..4b4513a26740 100644 RK3368_CLKGATE_CON(3), 1, GFLAGS), GATE(0, "sclk_mipidsi_24m", "xin24m", 0, RK3368_CLKGATE_CON(4), 14, GFLAGS), -@@ -590,7 +615,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "uart0_frac", "uart0_src", CLK_SET_RATE_PARENT, - RK3368_CLKSEL_CON(34), 0, - RK3368_CLKGATE_CON(2), 1, GFLAGS, -- &rk3368_uart0_fracmux), -+ &rk3368_uart0_fracmux, RK3368_UART_FRAC_MAX_PRATE), - - COMPOSITE_NOMUX(0, "uart1_src", "uart_src", 0, - RK3368_CLKSEL_CON(35), 0, 7, DFLAGS, -@@ -598,7 +623,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "uart1_frac", "uart1_src", CLK_SET_RATE_PARENT, - RK3368_CLKSEL_CON(36), 0, - RK3368_CLKGATE_CON(2), 3, GFLAGS, -- &rk3368_uart1_fracmux), -+ &rk3368_uart1_fracmux, RK3368_UART_FRAC_MAX_PRATE), - - COMPOSITE_NOMUX(0, "uart3_src", "uart_src", 0, - RK3368_CLKSEL_CON(39), 0, 7, DFLAGS, -@@ -606,7 +631,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "uart3_frac", "uart3_src", CLK_SET_RATE_PARENT, - RK3368_CLKSEL_CON(40), 0, - RK3368_CLKGATE_CON(2), 7, GFLAGS, -- &rk3368_uart3_fracmux), -+ &rk3368_uart3_fracmux, RK3368_UART_FRAC_MAX_PRATE), - - COMPOSITE_NOMUX(0, "uart4_src", "uart_src", 0, - RK3368_CLKSEL_CON(41), 0, 7, DFLAGS, -@@ -614,7 +639,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "uart4_frac", "uart4_src", CLK_SET_RATE_PARENT, - RK3368_CLKSEL_CON(42), 0, - RK3368_CLKGATE_CON(2), 9, GFLAGS, -- &rk3368_uart4_fracmux), -+ &rk3368_uart4_fracmux, RK3368_UART_FRAC_MAX_PRATE), - - COMPOSITE(0, "mac_pll_src", mux_pll_src_npll_cpll_gpll_p, 0, - RK3368_CLKSEL_CON(43), 6, 2, MFLAGS, 0, 5, DFLAGS, -@@ -668,7 +693,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { +@@ -668,7 +689,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { /* aclk_bus gates */ GATE(0, "aclk_strc_sys", "aclk_bus", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(12), 12, GFLAGS), @@ -116027,7 +111589,7 @@ index 55443349439b..4b4513a26740 100644 GATE(0, "sclk_intmem1", "aclk_bus", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(12), 6, GFLAGS), GATE(0, "sclk_intmem0", "aclk_bus", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(12), 5, GFLAGS), GATE(0, "aclk_intmem", "aclk_bus", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(12), 4, GFLAGS), -@@ -680,9 +705,9 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { +@@ -680,9 +701,9 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { /* clk_hsadc_tsp is part of diagram2 */ /* fclk_mcu_src gates */ @@ -116040,7 +111602,7 @@ index 55443349439b..4b4513a26740 100644 /* hclk_cpu gates */ GATE(HCLK_SPDIF, "hclk_spdif", "hclk_bus", 0, RK3368_CLKGATE_CON(12), 10, GFLAGS), -@@ -694,14 +719,14 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { +@@ -694,14 +715,14 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { GATE(MCLK_CRYPTO, "mclk_crypto", "hclk_bus", 0, RK3368_CLKGATE_CON(13), 3, GFLAGS), /* pclk_cpu gates */ @@ -116058,7 +111620,7 @@ index 55443349439b..4b4513a26740 100644 GATE(PCLK_UART2, "pclk_uart2", "pclk_bus", 0, RK3368_CLKGATE_CON(13), 5, GFLAGS), GATE(PCLK_EFUSE256, "pclk_efuse_256", "pclk_bus", 0, RK3368_CLKGATE_CON(13), 1, GFLAGS), GATE(0, "pclk_efuse_1024", "pclk_bus", 0, RK3368_CLKGATE_CON(13), 0, GFLAGS), -@@ -778,7 +803,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { +@@ -778,7 +799,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { GATE(HCLK_HSIC, "hclk_hsic", "hclk_peri", 0, RK3368_CLKGATE_CON(20), 5, GFLAGS), GATE(HCLK_HOST1, "hclk_host1", "hclk_peri", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(20), 4, GFLAGS), GATE(HCLK_HOST0, "hclk_host0", "hclk_peri", 0, RK3368_CLKGATE_CON(20), 3, GFLAGS), @@ -116067,7 +111629,7 @@ index 55443349439b..4b4513a26740 100644 GATE(HCLK_OTG0, "hclk_otg0", "hclk_peri", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(20), 1, GFLAGS), GATE(HCLK_HSADC, "hclk_hsadc", "hclk_peri", 0, RK3368_CLKGATE_CON(21), 3, GFLAGS), GATE(HCLK_EMMC, "hclk_emmc", "hclk_peri", 0, RK3368_CLKGATE_CON(21), 2, GFLAGS), -@@ -805,8 +830,8 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { +@@ -805,8 +826,8 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { /* pclk_pd_alive gates */ GATE(PCLK_TIMER1, "pclk_timer1", "pclk_pd_alive", 0, RK3368_CLKGATE_CON(22), 13, GFLAGS), GATE(PCLK_TIMER0, "pclk_timer0", "pclk_pd_alive", 0, RK3368_CLKGATE_CON(22), 12, GFLAGS), @@ -116078,7 +111640,7 @@ index 55443349439b..4b4513a26740 100644 GATE(PCLK_GPIO3, "pclk_gpio3", "pclk_pd_alive", 0, RK3368_CLKGATE_CON(22), 3, GFLAGS), GATE(PCLK_GPIO2, "pclk_gpio2", "pclk_pd_alive", 0, RK3368_CLKGATE_CON(22), 2, GFLAGS), GATE(PCLK_GPIO1, "pclk_gpio1", "pclk_pd_alive", 0, RK3368_CLKGATE_CON(22), 1, GFLAGS), -@@ -844,27 +869,23 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { +@@ -844,27 +865,23 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { GATE(SCLK_TIMER00, "sclk_timer00", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 0, GFLAGS), }; @@ -116118,7 +111680,7 @@ index 55443349439b..4b4513a26740 100644 reg_base = of_iomap(np, 0); if (!reg_base) { -@@ -878,22 +899,21 @@ static void __init rk3368_clk_init(struct device_node *np) +@@ -878,22 +895,21 @@ static void __init rk3368_clk_init(struct device_node *np) iounmap(reg_base); return; } @@ -116144,7 +111706,7 @@ index 55443349439b..4b4513a26740 100644 &rk3368_cpuclkl_data, rk3368_cpuclkl_rates, ARRAY_SIZE(rk3368_cpuclkl_rates)); -@@ -903,5 +923,38 @@ static void __init rk3368_clk_init(struct device_node *np) +@@ -903,5 +919,38 @@ static void __init rk3368_clk_init(struct device_node *np) rockchip_register_restart_notifier(ctx, RK3368_GLB_SRST_FST, NULL); rockchip_clk_of_add_provider(np, ctx); @@ -116184,23 +111746,10 @@ index 55443349439b..4b4513a26740 100644 +MODULE_DESCRIPTION("Rockchip RK3368 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c -index 7df2f1e00347..d5071884b3d5 100644 +index a9cacbcc1..6c4e0d248 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c -@@ -15,6 +15,12 @@ - #include - #include "clk.h" - -+#define RK3399_I2S_FRAC_MAX_PRATE 800000000 -+#define RK3399_UART_FRAC_MAX_PRATE 800000000 -+#define RK3399_SPDIF_FRAC_MAX_PRATE 600000000 -+#define RK3399_VOP_FRAC_MAX_PRATE 600000000 -+#define RK3399_WIFI_FRAC_MAX_PRATE 600000000 -+ - enum rk3399_plls { - lpll, bpll, dpll, cpll, gpll, npll, vpll, - }; -@@ -105,25 +111,95 @@ static struct rockchip_pll_rate_table rk3399_pll_rates[] = { +@@ -105,25 +105,95 @@ static struct rockchip_pll_rate_table rk3399_pll_rates[] = { { /* sentinel */ }, }; @@ -116305,7 +111854,7 @@ index 7df2f1e00347..d5071884b3d5 100644 PNAME(mux_cci_trace_p) = { "cpll_cci_trace", "gpll_cci_trace" }; PNAME(mux_cs_p) = { "cpll_cs", "gpll_cs", -@@ -148,26 +224,17 @@ PNAME(mux_pll_src_cpll_gpll_npll_upll_24m_p) = { "cpll", "gpll", "npll", +@@ -148,26 +218,17 @@ PNAME(mux_pll_src_cpll_gpll_npll_upll_24m_p) = { "cpll", "gpll", "npll", "upll", "xin24m" }; PNAME(mux_pll_src_cpll_gpll_npll_ppll_upll_24m_p) = { "cpll", "gpll", "npll", "ppll", "upll", "xin24m" }; @@ -116340,21 +111889,21 @@ index 7df2f1e00347..d5071884b3d5 100644 PNAME(mux_aclk_emmc_p) = { "cpll_aclk_emmc_src", "gpll_aclk_emmc_src" }; -@@ -180,14 +247,26 @@ PNAME(mux_fclk_cm0s_p) = { "cpll_fclk_cm0s_src", +@@ -180,14 +241,26 @@ PNAME(mux_fclk_cm0s_p) = { "cpll_fclk_cm0s_src", PNAME(mux_hclk_perilp1_p) = { "cpll_hclk_perilp1_src", "gpll_hclk_perilp1_src" }; +PNAME(mux_aclk_gmac_p) = { "cpll_aclk_gmac_src", + "gpll_aclk_gmac_src" }; +#endif -+ + +PNAME(mux_dclk_vop0_p) = { "dclk_vop0_div", + "dummy_dclk_vop0_frac" }; +PNAME(mux_dclk_vop1_p) = { "dclk_vop1_div", + "dummy_dclk_vop1_frac" }; + +PNAME(mux_clk_cif_p) = { "clk_cifout_src", "xin24m" }; - ++ +PNAME(mux_pll_src_24m_usbphy480m_p) = { "xin24m", "clk_usbphy_480m" }; +PNAME(mux_pll_src_24m_pciephy_p) = { "xin24m", "clk_pciephy_ref100m" }; +PNAME(mux_pciecore_cru_phy_p) = { "clk_pcie_core_cru", @@ -116369,7 +111918,7 @@ index 7df2f1e00347..d5071884b3d5 100644 PNAME(mux_rmii_p) = { "clk_gmac", "clkin_gmac" }; PNAME(mux_spdif_p) = { "clk_spdif_div", "clk_spdif_frac", "clkin_i2s", "xin12m" }; -@@ -201,20 +280,22 @@ PNAME(mux_i2sch_p) = { "clk_i2s0", "clk_i2s1", +@@ -201,20 +274,22 @@ PNAME(mux_i2sch_p) = { "clk_i2s0", "clk_i2s1", "clk_i2s2" }; PNAME(mux_i2sout_p) = { "clk_i2sout_src", "xin12m" }; @@ -116398,7 +111947,7 @@ index 7df2f1e00347..d5071884b3d5 100644 static struct rockchip_pll_clock rk3399_pll_clks[] __initdata = { [lpll] = PLL(pll_rk3399, PLL_APLLL, "lpll", mux_pll_p, 0, RK3399_PLL_CON(0), RK3399_PLL_CON(3), 8, 31, 0, rk3399_pll_rates), -@@ -222,18 +303,23 @@ static struct rockchip_pll_clock rk3399_pll_clks[] __initdata = { +@@ -222,18 +297,23 @@ static struct rockchip_pll_clock rk3399_pll_clks[] __initdata = { RK3399_PLL_CON(11), 8, 31, 0, rk3399_pll_rates), [dpll] = PLL(pll_rk3399, PLL_DPLL, "dpll", mux_pll_p, 0, RK3399_PLL_CON(16), RK3399_PLL_CON(19), 8, 31, 0, NULL), @@ -116425,7 +111974,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_PMU_PLL_CON(3), 8, 31, ROCKCHIP_PLL_SYNC_RATE, rk3399_pll_rates), }; -@@ -259,24 +345,24 @@ static struct rockchip_clk_branch rk3399_i2s2_fracmux __initdata = +@@ -259,24 +339,24 @@ static struct rockchip_clk_branch rk3399_i2s2_fracmux __initdata = RK3399_CLKSEL_CON(30), 8, 2, MFLAGS); static struct rockchip_clk_branch rk3399_uart0_fracmux __initdata = @@ -116460,7 +112009,7 @@ index 7df2f1e00347..d5071884b3d5 100644 static struct rockchip_clk_branch rk3399_dclk_vop0_fracmux __initdata = MUX(DCLK_VOP0, "dclk_vop0", mux_dclk_vop0_p, CLK_SET_RATE_PARENT, -@@ -291,9 +377,10 @@ static struct rockchip_clk_branch rk3399_pmuclk_wifi_fracmux __initdata = +@@ -291,9 +371,10 @@ static struct rockchip_clk_branch rk3399_pmuclk_wifi_fracmux __initdata = RK3399_PMU_CLKSEL_CON(1), 14, 1, MFLAGS); static const struct rockchip_cpuclk_reg_data rk3399_cpuclkl_data = { @@ -116474,7 +112023,7 @@ index 7df2f1e00347..d5071884b3d5 100644 .mux_core_alt = 3, .mux_core_main = 0, .mux_core_shift = 6, -@@ -301,9 +388,10 @@ static const struct rockchip_cpuclk_reg_data rk3399_cpuclkl_data = { +@@ -301,9 +382,10 @@ static const struct rockchip_cpuclk_reg_data rk3399_cpuclkl_data = { }; static const struct rockchip_cpuclk_reg_data rk3399_cpuclkb_data = { @@ -116488,7 +112037,7 @@ index 7df2f1e00347..d5071884b3d5 100644 .mux_core_alt = 3, .mux_core_main = 1, .mux_core_shift = 6, -@@ -406,9 +494,9 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -406,9 +488,9 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { GATE(SCLK_USB2PHY1_REF, "clk_usb2phy1_ref", "xin24m", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(6), 6, GFLAGS), @@ -116500,7 +112049,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(13), 12, GFLAGS), MUX(0, "clk_usbphy_480m", mux_usbphy_480m_p, 0, RK3399_CLKSEL_CON(14), 6, 1, MFLAGS), -@@ -423,7 +511,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -423,7 +505,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { COMPOSITE(ACLK_USB3, "aclk_usb3", mux_pll_src_cpll_gpll_npll_p, 0, RK3399_CLKSEL_CON(39), 6, 2, MFLAGS, 0, 5, DFLAGS, RK3399_CLKGATE_CON(12), 0, GFLAGS), @@ -116509,7 +112058,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(30), 0, GFLAGS), GATE(ACLK_USB3OTG0, "aclk_usb3otg0", "aclk_usb3", 0, RK3399_CLKGATE_CON(30), 1, GFLAGS), -@@ -549,7 +637,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -549,7 +631,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { GATE(ACLK_GMAC, "aclk_gmac", "aclk_gmac_pre", 0, RK3399_CLKGATE_CON(32), 0, GFLAGS), @@ -116518,7 +112067,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(32), 1, GFLAGS), GATE(ACLK_PERF_GMAC, "aclk_perf_gmac", "aclk_gmac_pre", 0, RK3399_CLKGATE_CON(32), 4, GFLAGS), -@@ -559,7 +647,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -559,7 +641,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(6), 11, GFLAGS), GATE(PCLK_GMAC, "pclk_gmac", "pclk_gmac_pre", 0, RK3399_CLKGATE_CON(32), 2, GFLAGS), @@ -116527,7 +112076,18 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(32), 3, GFLAGS), COMPOSITE(SCLK_MAC, "clk_gmac", mux_pll_src_cpll_gpll_npll_p, 0, -@@ -578,13 +666,13 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -569,19 +651,19 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { + MUX(SCLK_RMII_SRC, "clk_rmii_src", mux_rmii_p, CLK_SET_RATE_PARENT, + RK3399_CLKSEL_CON(19), 4, 1, MFLAGS), + GATE(SCLK_MACREF_OUT, "clk_mac_refout", "clk_rmii_src", 0, +- RK3399_CLKGATE_CON(5), 6, GFLAGS), +- GATE(SCLK_MACREF, "clk_mac_ref", "clk_rmii_src", 0, + RK3399_CLKGATE_CON(5), 7, GFLAGS), ++ GATE(SCLK_MACREF, "clk_mac_ref", "clk_rmii_src", 0, ++ RK3399_CLKGATE_CON(5), 6, GFLAGS), + GATE(SCLK_MAC_RX, "clk_rmii_rx", "clk_rmii_src", 0, + RK3399_CLKGATE_CON(5), 8, GFLAGS), + GATE(SCLK_MAC_TX, "clk_rmii_tx", "clk_rmii_src", 0, RK3399_CLKGATE_CON(5), 9, GFLAGS), /* spdif */ @@ -116539,12 +112099,8 @@ index 7df2f1e00347..d5071884b3d5 100644 + COMPOSITE_FRACMUX(0, "clk_spdif_frac", "clk_spdif_div", CLK_SET_RATE_PARENT, RK3399_CLKSEL_CON(99), 0, RK3399_CLKGATE_CON(8), 14, GFLAGS, -- &rk3399_spdif_fracmux), -+ &rk3399_spdif_fracmux, RK3399_SPDIF_FRAC_MAX_PRATE), - GATE(SCLK_SPDIF_8CH, "clk_spdif", "clk_spdif_mux", CLK_SET_RATE_PARENT, - RK3399_CLKGATE_CON(8), 15, GFLAGS), - -@@ -592,84 +680,84 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { + &rk3399_spdif_fracmux), +@@ -592,59 +674,59 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKSEL_CON(32), 15, 1, MFLAGS, 8, 5, DFLAGS, RK3399_CLKGATE_CON(10), 6, GFLAGS), /* i2s */ @@ -116556,8 +112112,7 @@ index 7df2f1e00347..d5071884b3d5 100644 + COMPOSITE_FRACMUX(0, "clk_i2s0_frac", "clk_i2s0_div", CLK_SET_RATE_PARENT, RK3399_CLKSEL_CON(96), 0, RK3399_CLKGATE_CON(8), 4, GFLAGS, -- &rk3399_i2s0_fracmux), -+ &rk3399_i2s0_fracmux, RK3399_I2S_FRAC_MAX_PRATE), + &rk3399_i2s0_fracmux), GATE(SCLK_I2S0_8CH, "clk_i2s0", "clk_i2s0_mux", CLK_SET_RATE_PARENT, RK3399_CLKGATE_CON(8), 5, GFLAGS), @@ -116569,8 +112124,7 @@ index 7df2f1e00347..d5071884b3d5 100644 + COMPOSITE_FRACMUX(0, "clk_i2s1_frac", "clk_i2s1_div", CLK_SET_RATE_PARENT, RK3399_CLKSEL_CON(97), 0, RK3399_CLKGATE_CON(8), 7, GFLAGS, -- &rk3399_i2s1_fracmux), -+ &rk3399_i2s1_fracmux, RK3399_I2S_FRAC_MAX_PRATE), + &rk3399_i2s1_fracmux), GATE(SCLK_I2S1_8CH, "clk_i2s1", "clk_i2s1_mux", CLK_SET_RATE_PARENT, RK3399_CLKGATE_CON(8), 8, GFLAGS), @@ -116582,8 +112136,7 @@ index 7df2f1e00347..d5071884b3d5 100644 + COMPOSITE_FRACMUX(0, "clk_i2s2_frac", "clk_i2s2_div", CLK_SET_RATE_PARENT, RK3399_CLKSEL_CON(98), 0, RK3399_CLKGATE_CON(8), 10, GFLAGS, -- &rk3399_i2s2_fracmux), -+ &rk3399_i2s2_fracmux, RK3399_I2S_FRAC_MAX_PRATE), + &rk3399_i2s2_fracmux), GATE(SCLK_I2S2_8CH, "clk_i2s2", "clk_i2s2_mux", CLK_SET_RATE_PARENT, RK3399_CLKGATE_CON(8), 11, GFLAGS), @@ -116605,8 +112158,7 @@ index 7df2f1e00347..d5071884b3d5 100644 + COMPOSITE_FRACMUX(0, "clk_uart0_frac", "clk_uart0_div", CLK_SET_RATE_PARENT, RK3399_CLKSEL_CON(100), 0, RK3399_CLKGATE_CON(9), 1, GFLAGS, -- &rk3399_uart0_fracmux), -+ &rk3399_uart0_fracmux, RK3399_UART_FRAC_MAX_PRATE), + &rk3399_uart0_fracmux), - MUX(0, "clk_uart_src", mux_pll_src_cpll_gpll_p, 0, + MUX(SCLK_UART_SRC, "clk_uart_src", mux_pll_src_cpll_gpll_p, 0, @@ -116618,9 +112170,8 @@ index 7df2f1e00347..d5071884b3d5 100644 + COMPOSITE_FRACMUX(0, "clk_uart1_frac", "clk_uart1_div", CLK_SET_RATE_PARENT, RK3399_CLKSEL_CON(101), 0, RK3399_CLKGATE_CON(9), 3, GFLAGS, -- &rk3399_uart1_fracmux), -+ &rk3399_uart1_fracmux, RK3399_UART_FRAC_MAX_PRATE), - + &rk3399_uart1_fracmux), +@@ -652,7 +734,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { COMPOSITE_NOMUX(0, "clk_uart2_div", "clk_uart_src", 0, RK3399_CLKSEL_CON(35), 0, 7, DFLAGS, RK3399_CLKGATE_CON(9), 4, GFLAGS), @@ -116628,9 +112179,8 @@ index 7df2f1e00347..d5071884b3d5 100644 + COMPOSITE_FRACMUX(0, "clk_uart2_frac", "clk_uart2_div", CLK_SET_RATE_PARENT, RK3399_CLKSEL_CON(102), 0, RK3399_CLKGATE_CON(9), 5, GFLAGS, -- &rk3399_uart2_fracmux), -+ &rk3399_uart2_fracmux, RK3399_UART_FRAC_MAX_PRATE), - + &rk3399_uart2_fracmux), +@@ -660,16 +742,16 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { COMPOSITE_NOMUX(0, "clk_uart3_div", "clk_uart_src", 0, RK3399_CLKSEL_CON(36), 0, 7, DFLAGS, RK3399_CLKGATE_CON(9), 6, GFLAGS), @@ -116638,8 +112188,7 @@ index 7df2f1e00347..d5071884b3d5 100644 + COMPOSITE_FRACMUX(0, "clk_uart3_frac", "clk_uart3_div", CLK_SET_RATE_PARENT, RK3399_CLKSEL_CON(103), 0, RK3399_CLKGATE_CON(9), 7, GFLAGS, -- &rk3399_uart3_fracmux), -+ &rk3399_uart3_fracmux, RK3399_UART_FRAC_MAX_PRATE), + &rk3399_uart3_fracmux), - COMPOSITE(PCLK_DDR, "pclk_ddr", mux_pll_src_cpll_gpll_p, CLK_IGNORE_UNUSED, + COMPOSITE(PCLK_DDR, "pclk_ddr", mux_pll_src_cpll_gpll_p, CLK_IS_CRITICAL, @@ -116651,7 +112200,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(18), 10, GFLAGS), GATE(PCLK_DDR_MON, "pclk_ddr_mon", "pclk_ddr", 0, RK3399_CLKGATE_CON(18), 12, GFLAGS), -@@ -686,30 +774,30 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -686,30 +768,30 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(3), 6, GFLAGS), /* cci */ @@ -116693,7 +112242,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(15), 7, GFLAGS), GATE(0, "cpll_cci_trace", "cpll", CLK_IGNORE_UNUSED, -@@ -717,20 +805,20 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -717,20 +799,20 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { GATE(0, "gpll_cci_trace", "gpll", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(2), 6, GFLAGS), COMPOSITE(SCLK_CCI_TRACE, "clk_cci_trace", mux_cci_trace_p, CLK_IGNORE_UNUSED, @@ -116720,7 +112269,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(15), 6, GFLAGS), /* vcodec */ -@@ -742,12 +830,12 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -742,12 +824,12 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(4), 1, GFLAGS), GATE(HCLK_VCODEC, "hclk_vcodec", "hclk_vcodec_pre", 0, RK3399_CLKGATE_CON(17), 2, GFLAGS), @@ -116735,7 +112284,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(17), 1, GFLAGS), /* vdu */ -@@ -766,12 +854,12 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -766,12 +848,12 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(4), 3, GFLAGS), GATE(HCLK_VDU, "hclk_vdu", "hclk_vdu_pre", 0, RK3399_CLKGATE_CON(17), 10, GFLAGS), @@ -116750,7 +112299,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(17), 9, GFLAGS), /* iep */ -@@ -783,12 +871,12 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -783,12 +865,12 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(4), 7, GFLAGS), GATE(HCLK_IEP, "hclk_iep", "hclk_iep_pre", 0, RK3399_CLKGATE_CON(16), 2, GFLAGS), @@ -116765,7 +112314,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(16), 1, GFLAGS), /* rga */ -@@ -804,21 +892,21 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -804,21 +886,21 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(4), 9, GFLAGS), GATE(HCLK_RGA, "hclk_rga", "hclk_rga_pre", 0, RK3399_CLKGATE_CON(16), 10, GFLAGS), @@ -116792,7 +112341,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(19), 1, GFLAGS), /* gpu */ -@@ -835,25 +923,25 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -835,25 +917,25 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(13), 1, GFLAGS), /* perihp */ @@ -116825,7 +112374,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(20), 12, GFLAGS), GATE(HCLK_HOST0, "hclk_host0", "hclk_perihp", 0, -@@ -866,16 +954,16 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -866,16 +948,16 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(20), 8, GFLAGS), GATE(HCLK_HSIC, "hclk_hsic", "hclk_perihp", 0, RK3399_CLKGATE_CON(20), 9, GFLAGS), @@ -116845,7 +112394,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(20), 14, GFLAGS), GATE(PCLK_HSICPHY, "pclk_hsicphy", "pclk_perihp", 0, RK3399_CLKGATE_CON(31), 8, GFLAGS), -@@ -886,7 +974,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -886,7 +968,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(12), 13, GFLAGS), GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_sd", 0, RK3399_CLKGATE_CON(33), 8, GFLAGS), @@ -116854,7 +112403,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(33), 9, GFLAGS), COMPOSITE(SCLK_SDIO, "clk_sdio", mux_pll_src_cpll_gpll_npll_ppll_upll_24m_p, 0, -@@ -933,23 +1021,23 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -933,23 +1015,23 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKSEL_CON(21), 7, 1, MFLAGS, 0, 5, DFLAGS), GATE(ACLK_EMMC_CORE, "aclk_emmccore", "aclk_emmc", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(32), 8, GFLAGS), @@ -116884,7 +112433,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKSEL_CON(23), 12, 3, DFLAGS, RK3399_CLKGATE_CON(7), 4, GFLAGS), -@@ -964,8 +1052,8 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -964,8 +1046,8 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { GATE(SCLK_INTMEM5, "clk_intmem5", "aclk_perilp0", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(23), 7, GFLAGS), GATE(ACLK_DCF, "aclk_dcf", "aclk_perilp0", 0, RK3399_CLKGATE_CON(23), 8, GFLAGS), GATE(ACLK_DMAC0_PERILP, "aclk_dmac0_perilp", "aclk_perilp0", 0, RK3399_CLKGATE_CON(25), 5, GFLAGS), @@ -116895,7 +112444,7 @@ index 7df2f1e00347..d5071884b3d5 100644 /* hclk_perilp0 gates */ GATE(HCLK_ROM, "hclk_rom", "hclk_perilp0", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(24), 4, GFLAGS), -@@ -973,7 +1061,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -973,7 +1055,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { GATE(HCLK_S_CRYPTO0, "hclk_s_crypto0", "hclk_perilp0", 0, RK3399_CLKGATE_CON(24), 6, GFLAGS), GATE(HCLK_M_CRYPTO1, "hclk_m_crypto1", "hclk_perilp0", 0, RK3399_CLKGATE_CON(24), 14, GFLAGS), GATE(HCLK_S_CRYPTO1, "hclk_s_crypto1", "hclk_perilp0", 0, RK3399_CLKGATE_CON(24), 15, GFLAGS), @@ -116904,7 +112453,7 @@ index 7df2f1e00347..d5071884b3d5 100644 /* pclk_perilp0 gates */ GATE(PCLK_DCF, "pclk_dcf", "pclk_perilp0", 0, RK3399_CLKGATE_CON(23), 9, GFLAGS), -@@ -1001,29 +1089,29 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -1001,29 +1083,29 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { GATE(HCLK_M0_PERILP, "hclk_m0_perilp", "fclk_cm0s", 0, RK3399_CLKGATE_CON(24), 9, GFLAGS), GATE(DCLK_M0_PERILP, "dclk_m0_perilp", "fclk_cm0s", 0, RK3399_CLKGATE_CON(24), 10, GFLAGS), GATE(SCLK_M0_PERILP_DEC, "clk_m0_perilp_dec", "fclk_cm0s", 0, RK3399_CLKGATE_CON(24), 11, GFLAGS), @@ -116942,7 +112491,7 @@ index 7df2f1e00347..d5071884b3d5 100644 /* pclk_perilp1 gates */ GATE(PCLK_UART0, "pclk_uart0", "pclk_perilp1", 0, RK3399_CLKGATE_CON(22), 0, GFLAGS), -@@ -1046,7 +1134,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -1046,7 +1128,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { GATE(PCLK_SPI2, "pclk_spi2", "pclk_perilp1", 0, RK3399_CLKGATE_CON(23), 12, GFLAGS), GATE(PCLK_SPI4, "pclk_spi4", "pclk_perilp1", 0, RK3399_CLKGATE_CON(23), 13, GFLAGS), GATE(PCLK_PERIHP_GRF, "pclk_perilp_sgrf", "pclk_perilp1", 0, RK3399_CLKGATE_CON(24), 13, GFLAGS), @@ -116951,7 +112500,7 @@ index 7df2f1e00347..d5071884b3d5 100644 /* saradc */ COMPOSITE_NOMUX(SCLK_SARADC, "clk_saradc", "xin24m", 0, -@@ -1075,24 +1163,23 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -1075,24 +1157,23 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { COMPOSITE(ACLK_VIO, "aclk_vio", mux_pll_src_cpll_gpll_ppll_p, CLK_IGNORE_UNUSED, RK3399_CLKSEL_CON(42), 6, 2, MFLAGS, 0, 5, DFLAGS, RK3399_CLKGATE_CON(11), 0, GFLAGS), @@ -116981,7 +112530,7 @@ index 7df2f1e00347..d5071884b3d5 100644 COMPOSITE_NOMUX(HCLK_HDCP, "hclk_hdcp", "aclk_hdcp", 0, RK3399_CLKSEL_CON(43), 5, 5, DFLAGS, RK3399_CLKGATE_CON(11), 3, GFLAGS), -@@ -1100,17 +1187,17 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -1100,17 +1181,17 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKSEL_CON(43), 10, 5, DFLAGS, RK3399_CLKGATE_CON(11), 10, GFLAGS), @@ -117002,7 +112551,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(29), 3, GFLAGS), GATE(PCLK_HDMI_CTRL, "pclk_hdmi_ctrl", "pclk_hdcp", 0, RK3399_CLKGATE_CON(29), 6, GFLAGS), -@@ -1129,7 +1216,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -1129,7 +1210,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { COMPOSITE(PCLK_EDP, "pclk_edp", mux_pll_src_cpll_gpll_p, 0, RK3399_CLKSEL_CON(44), 15, 1, MFLAGS, 8, 6, DFLAGS, RK3399_CLKGATE_CON(11), 11, GFLAGS), @@ -117011,7 +112560,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(32), 12, GFLAGS), GATE(PCLK_EDP_CTRL, "pclk_edp_ctrl", "pclk_edp", 0, RK3399_CLKGATE_CON(32), 13, GFLAGS), -@@ -1143,7 +1230,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -1143,7 +1224,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(11), 7, GFLAGS), /* vop0 */ @@ -117020,7 +112569,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKSEL_CON(47), 6, 2, MFLAGS, 0, 5, DFLAGS, RK3399_CLKGATE_CON(10), 8, GFLAGS), COMPOSITE_NOMUX(0, "hclk_vop0_pre", "aclk_vop0_pre", 0, -@@ -1152,28 +1239,35 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -1152,28 +1233,35 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { GATE(ACLK_VOP0, "aclk_vop0", "aclk_vop0_pre", 0, RK3399_CLKGATE_CON(28), 3, GFLAGS), @@ -117049,8 +112598,7 @@ index 7df2f1e00347..d5071884b3d5 100644 + /* The VOP0 is main screen, it is able to re-set parent rate. */ + COMPOSITE_FRACMUX_NOGATE(0, "dclk_vop0_frac", "dclk_vop0_div", CLK_SET_RATE_PARENT, RK3399_CLKSEL_CON(106), 0, -- &rk3399_dclk_vop0_fracmux), -+ &rk3399_dclk_vop0_fracmux, RK3399_VOP_FRAC_MAX_PRATE), + &rk3399_dclk_vop0_fracmux), - COMPOSITE(SCLK_VOP0_PWM, "clk_vop0_pwm", mux_pll_src_vpll_cpll_gpll_24m_p, 0, + COMPOSITE(SCLK_VOP0_PWM, "clk_vop0_pwm", mux_pll_src_dmyvpll_cpll_gpll_gpll_p, 0, @@ -117063,7 +112611,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKSEL_CON(48), 6, 2, MFLAGS, 0, 5, DFLAGS, RK3399_CLKGATE_CON(10), 10, GFLAGS), COMPOSITE_NOMUX(0, "hclk_vop1_pre", "aclk_vop1_pre", 0, -@@ -1182,23 +1276,30 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -1182,23 +1270,30 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { GATE(ACLK_VOP1, "aclk_vop1", "aclk_vop1_pre", 0, RK3399_CLKGATE_CON(28), 7, GFLAGS), @@ -117081,25 +112629,24 @@ index 7df2f1e00347..d5071884b3d5 100644 + /* The VOP1 is sub screen, it is note able to re-set parent rate. */ +#ifdef RK3399_TWO_PLL_FOR_VOP + COMPOSITE(DCLK_VOP1_DIV, "dclk_vop1_div", mux_pll_src_vpll_cpll_gpll_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, - RK3399_CLKSEL_CON(50), 8, 2, MFLAGS, 0, 8, DFLAGS, - RK3399_CLKGATE_CON(10), 13, GFLAGS), -+#else -+ COMPOSITE(DCLK_VOP1_DIV, "dclk_vop1_div", mux_pll_src_dmyvpll_cpll_gpll_p, 0, + RK3399_CLKSEL_CON(50), 8, 2, MFLAGS, 0, 8, DFLAGS, + RK3399_CLKGATE_CON(10), 13, GFLAGS), ++#else ++ COMPOSITE(DCLK_VOP1_DIV, "dclk_vop1_div", mux_pll_src_dmyvpll_cpll_gpll_p, 0, + RK3399_CLKSEL_CON(50), 8, 2, MFLAGS, 0, 8, DFLAGS, + RK3399_CLKGATE_CON(10), 13, GFLAGS), +#endif COMPOSITE_FRACMUX_NOGATE(DCLK_VOP1_FRAC, "dclk_vop1_frac", "dclk_vop1_div", 0, RK3399_CLKSEL_CON(107), 0, -- &rk3399_dclk_vop1_fracmux), -+ &rk3399_dclk_vop1_fracmux, RK3399_VOP_FRAC_MAX_PRATE), + &rk3399_dclk_vop1_fracmux), - COMPOSITE(SCLK_VOP1_PWM, "clk_vop1_pwm", mux_pll_src_vpll_cpll_gpll_24m_p, CLK_IGNORE_UNUSED, + COMPOSITE(SCLK_VOP1_PWM, "clk_vop1_pwm", mux_pll_src_dmyvpll_cpll_gpll_gpll_p, 0, RK3399_CLKSEL_CON(52), 6, 2, MFLAGS, 0, 5, DFLAGS, RK3399_CLKGATE_CON(10), 15, GFLAGS), -@@ -1210,14 +1311,12 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -1210,14 +1305,12 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKSEL_CON(53), 8, 5, DFLAGS, RK3399_CLKGATE_CON(12), 9, GFLAGS), @@ -117116,7 +112663,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKGATE_CON(27), 0, GFLAGS), GATE(HCLK_ISP0_WRAPPER, "hclk_isp0_wrapper", "hclk_isp0", 0, RK3399_CLKGATE_CON(27), 4, GFLAGS), -@@ -1233,13 +1332,15 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -1233,13 +1326,15 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKSEL_CON(54), 8, 5, DFLAGS, RK3399_CLKGATE_CON(12), 11, GFLAGS), @@ -117136,7 +112683,7 @@ index 7df2f1e00347..d5071884b3d5 100644 COMPOSITE(SCLK_ISP1, "clk_isp1", mux_pll_src_cpll_gpll_npll_p, 0, RK3399_CLKSEL_CON(55), 14, 2, MFLAGS, 8, 5, DFLAGS, -@@ -1257,7 +1358,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -1257,7 +1352,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(27), 6, GFLAGS), /* cif */ @@ -117145,7 +112692,7 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_CLKSEL_CON(56), 6, 2, MFLAGS, RK3399_CLKGATE_CON(10), 7, GFLAGS), -@@ -1265,12 +1366,12 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -1265,12 +1360,12 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKSEL_CON(56), 5, 1, MFLAGS, 0, 5, DFLAGS), /* gic */ @@ -117161,7 +112708,7 @@ index 7df2f1e00347..d5071884b3d5 100644 GATE(ACLK_GIC_ADB400_CORE_L_2_GIC, "aclk_gic_adb400_core_l_2_gic", "aclk_gic_pre", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(33), 2, GFLAGS), GATE(ACLK_GIC_ADB400_CORE_B_2_GIC, "aclk_gic_adb400_core_b_2_gic", "aclk_gic_pre", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(33), 3, GFLAGS), GATE(ACLK_GIC_ADB400_GIC_2_CORE_L, "aclk_gic_adb400_gic_2_core_l", "aclk_gic_pre", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(33), 4, GFLAGS), -@@ -1301,19 +1402,19 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -1301,12 +1396,12 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { SGRF_GATE(PCLK_WDT, "pclk_wdt", "pclk_alive"), GATE(SCLK_MIPIDPHY_REF, "clk_mipidphy_ref", "xin24m", 0, RK3399_CLKGATE_CON(11), 14, GFLAGS), @@ -117178,15 +112725,7 @@ index 7df2f1e00347..d5071884b3d5 100644 /* testout */ MUX(0, "clk_test_pre", mux_pll_src_cpll_gpll_p, CLK_SET_RATE_PARENT, - RK3399_CLKSEL_CON(58), 7, 1, MFLAGS), - COMPOSITE_FRAC(0, "clk_test_frac", "clk_test_pre", 0, - RK3399_CLKSEL_CON(105), 0, -- RK3399_CLKGATE_CON(13), 9, GFLAGS), -+ RK3399_CLKGATE_CON(13), 9, GFLAGS, 0), - - DIV(0, "clk_test_24m", "xin24m", 0, - RK3399_CLKSEL_CON(57), 6, 10, DFLAGS), -@@ -1385,13 +1486,13 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -1385,13 +1480,13 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(13), 11, GFLAGS), /* ddrc */ @@ -117204,7 +112743,7 @@ index 7df2f1e00347..d5071884b3d5 100644 3, GFLAGS), COMPOSITE_DDRCLK(SCLK_DDRC, "sclk_ddrc", mux_ddrclk_p, 0, RK3399_CLKSEL_CON(6), 4, 2, 0, 0, ROCKCHIP_DDRCLK_SIP), -@@ -1402,10 +1503,10 @@ static struct rockchip_clk_branch rk3399_clk_pmu_branches[] __initdata = { +@@ -1402,10 +1497,10 @@ static struct rockchip_clk_branch rk3399_clk_pmu_branches[] __initdata = { * PMU CRU Clock-Architecture */ @@ -117217,19 +112756,16 @@ index 7df2f1e00347..d5071884b3d5 100644 RK3399_PMU_CLKSEL_CON(0), 15, 1, MFLAGS, 8, 5, DFLAGS), COMPOSITE(SCLK_SPI3_PMU, "clk_spi3_pmu", mux_24m_ppll_p, 0, -@@ -1416,9 +1517,9 @@ static struct rockchip_clk_branch rk3399_clk_pmu_branches[] __initdata = { +@@ -1416,7 +1511,7 @@ static struct rockchip_clk_branch rk3399_clk_pmu_branches[] __initdata = { RK3399_PMU_CLKSEL_CON(1), 13, 1, MFLAGS, 8, 5, DFLAGS, RK3399_PMU_CLKGATE_CON(0), 8, GFLAGS), - COMPOSITE_FRACMUX_NOGATE(0, "clk_wifi_frac", "clk_wifi_div", 0, + COMPOSITE_FRACMUX_NOGATE(0, "clk_wifi_frac", "clk_wifi_div", CLK_SET_RATE_PARENT, RK3399_PMU_CLKSEL_CON(7), 0, -- &rk3399_pmuclk_wifi_fracmux), -+ &rk3399_pmuclk_wifi_fracmux, RK3399_WIFI_FRAC_MAX_PRATE), + &rk3399_pmuclk_wifi_fracmux), - MUX(0, "clk_timer_src_pmu", mux_pll_p, CLK_IGNORE_UNUSED, - RK3399_PMU_CLKSEL_CON(1), 15, 1, MFLAGS), -@@ -1440,23 +1541,26 @@ static struct rockchip_clk_branch rk3399_clk_pmu_branches[] __initdata = { +@@ -1440,23 +1535,26 @@ static struct rockchip_clk_branch rk3399_clk_pmu_branches[] __initdata = { MUX(0, "clk_testout_2io", mux_clk_testout2_2io_p, CLK_IGNORE_UNUSED, RK3399_PMU_CLKSEL_CON(4), 15, 1, MFLAGS), @@ -117246,8 +112782,7 @@ index 7df2f1e00347..d5071884b3d5 100644 + COMPOSITE_FRACMUX(0, "clk_uart4_frac", "clk_uart4_div", CLK_SET_RATE_PARENT, RK3399_PMU_CLKSEL_CON(6), 0, RK3399_PMU_CLKGATE_CON(0), 6, GFLAGS, -- &rk3399_uart4_pmu_fracmux), -+ &rk3399_uart4_pmu_fracmux, RK3399_UART_FRAC_MAX_PRATE), + &rk3399_uart4_pmu_fracmux), - DIV(PCLK_SRC_PMU, "pclk_pmu_src", "ppll", CLK_IGNORE_UNUSED, + DIV(PCLK_SRC_PMU, "pclk_pmu_src", "ppll", CLK_IS_CRITICAL, @@ -117262,7 +112797,7 @@ index 7df2f1e00347..d5071884b3d5 100644 GATE(PCLK_PMU, "pclk_pmu", "pclk_pmu_src", CLK_IGNORE_UNUSED, RK3399_PMU_CLKGATE_CON(1), 0, GFLAGS), GATE(PCLK_PMUGRF_PMU, "pclk_pmugrf_pmu", "pclk_pmu_src", CLK_IGNORE_UNUSED, RK3399_PMU_CLKGATE_CON(1), 1, GFLAGS), -@@ -1464,69 +1568,60 @@ static struct rockchip_clk_branch rk3399_clk_pmu_branches[] __initdata = { +@@ -1464,69 +1562,60 @@ static struct rockchip_clk_branch rk3399_clk_pmu_branches[] __initdata = { GATE(PCLK_GPIO0_PMU, "pclk_gpio0_pmu", "pclk_pmu_src", 0, RK3399_PMU_CLKGATE_CON(1), 3, GFLAGS), GATE(PCLK_GPIO1_PMU, "pclk_gpio1_pmu", "pclk_pmu_src", 0, RK3399_PMU_CLKGATE_CON(1), 4, GFLAGS), GATE(PCLK_SGRF_PMU, "pclk_sgrf_pmu", "pclk_pmu_src", CLK_IGNORE_UNUSED, RK3399_PMU_CLKGATE_CON(1), 5, GFLAGS), @@ -117367,7 +112902,7 @@ index 7df2f1e00347..d5071884b3d5 100644 reg_base = of_iomap(np, 0); if (!reg_base) { -@@ -1534,12 +1629,15 @@ static void __init rk3399_clk_init(struct device_node *np) +@@ -1534,12 +1623,15 @@ static void __init rk3399_clk_init(struct device_node *np) return; } @@ -117383,7 +112918,7 @@ index 7df2f1e00347..d5071884b3d5 100644 rockchip_clk_register_plls(ctx, rk3399_pll_clks, ARRAY_SIZE(rk3399_pll_clks), -1); -@@ -1547,16 +1645,13 @@ static void __init rk3399_clk_init(struct device_node *np) +@@ -1547,16 +1639,13 @@ static void __init rk3399_clk_init(struct device_node *np) rockchip_clk_register_branches(ctx, rk3399_clk_branches, ARRAY_SIZE(rk3399_clk_branches)); @@ -117402,7 +112937,7 @@ index 7df2f1e00347..d5071884b3d5 100644 &rk3399_cpuclkb_data, rk3399_cpuclkb_rates, ARRAY_SIZE(rk3399_cpuclkb_rates)); -@@ -1580,6 +1675,8 @@ static void __init rk3399_pmu_clk_init(struct device_node *np) +@@ -1580,6 +1669,8 @@ static void __init rk3399_pmu_clk_init(struct device_node *np) return; } @@ -117411,7 +112946,7 @@ index 7df2f1e00347..d5071884b3d5 100644 ctx = rockchip_clk_init(np, reg_base, CLKPMU_NR_CLKS); if (IS_ERR(ctx)) { pr_err("%s: rockchip pmu clk init failed\n", __func__); -@@ -1593,13 +1690,13 @@ static void __init rk3399_pmu_clk_init(struct device_node *np) +@@ -1593,16 +1684,17 @@ static void __init rk3399_pmu_clk_init(struct device_node *np) rockchip_clk_register_branches(ctx, rk3399_clk_pmu_branches, ARRAY_SIZE(rk3399_clk_pmu_branches)); @@ -117428,16 +112963,47 @@ index 7df2f1e00347..d5071884b3d5 100644 } CLK_OF_DECLARE(rk3399_cru_pmu, "rockchip,rk3399-pmucru", rk3399_pmu_clk_init); -diff --git a/drivers/clk/rockchip/clk-rk3568.c b/drivers/clk/rockchip/clk-rk3568.c -new file mode 100755 -index 000000000000..44ce9cc542ce ++#ifdef MODULE + struct clk_rk3399_inits { + void (*inits)(struct device_node *np); + }; +@@ -1627,7 +1719,7 @@ static const struct of_device_id clk_rk3399_match_table[] = { + }; + MODULE_DEVICE_TABLE(of, clk_rk3399_match_table); + +-static int __init clk_rk3399_probe(struct platform_device *pdev) ++static int clk_rk3399_probe(struct platform_device *pdev) + { + struct device_node *np = pdev->dev.of_node; + const struct of_device_id *match; +@@ -1645,14 +1737,16 @@ static int __init clk_rk3399_probe(struct platform_device *pdev) + } + + static struct platform_driver clk_rk3399_driver = { ++ .probe = clk_rk3399_probe, + .driver = { + .name = "clk-rk3399", + .of_match_table = clk_rk3399_match_table, + .suppress_bind_attrs = true, + }, + }; +-builtin_platform_driver_probe(clk_rk3399_driver, clk_rk3399_probe); ++module_platform_driver(clk_rk3399_driver); + + MODULE_DESCRIPTION("Rockchip RK3399 Clock Driver"); + MODULE_LICENSE("GPL"); + MODULE_ALIAS("platform:clk-rk3399"); ++#endif /* MODULE */ +diff --git a/drivers/clk/rockchip/clk-rk3528.c b/drivers/clk/rockchip/clk-rk3528.c +new file mode 100644 +index 000000000..1b14cd57b --- /dev/null -+++ b/drivers/clk/rockchip/clk-rk3568.c -@@ -0,0 +1,1757 @@ ++++ b/drivers/clk/rockchip/clk-rk3528.c +@@ -0,0 +1,1174 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (c) 2020 Rockchip Electronics Co. Ltd. -+ * Author: Elaine Zhang ++ * Copyright (c) 2022 Rockchip Electronics Co. Ltd. ++ * Author: Joseph Chen + */ + +#include @@ -117446,28 +113012,2348 @@ index 000000000000..44ce9cc542ce +#include +#include +#include -+#include ++#include +#include "clk.h" + -+#define RK3568_GRF_SOC_CON1 0x504 -+#define RK3568_GRF_SOC_CON2 0x508 -+#define RK3568_GRF_SOC_STATUS0 0x580 -+#define RK3568_PMU_GRF_SOC_CON0 0x100 ++/* A placeholder for rk3066 pll type. We are rk3328 pll type */ ++#define RK3528_GRF_SOC_STATUS0 0x1a0 + -+#define RK3568_FRAC_MAX_PRATE 1000000000 -+#define RK3568_SPDIF_FRAC_MAX_PRATE 600000000 -+#define RK3568_UART_FRAC_MAX_PRATE 600000000 -+#define RK3568_DCLK_PARENT_MAX_PRATE 600000000 ++enum rk3528_plls { ++ apll, cpll, gpll, ppll, dpll, ++}; + -+enum rk3568_pmu_plls { -+ ppll, hpll, ++/* ++ * ## PLL attention. ++ * ++ * [FRAC PLL]: GPLL, PPLL, DPLL ++ * - frac mode: refdiv can be 1 or 2 only ++ * - int mode: refdiv has no special limit ++ * - VCO range: [950, 3800] MHZ ++ * ++ * [INT PLL]: CPLL, APLL ++ * - int mode: refdiv can be 1 or 2 only ++ * - VCO range: [475, 1900] MHZ ++ * ++ * [PPLL]: normal mode only. ++ * ++ * ++ * ## CRU access attention. ++ * ++ * pclk_cru => pclk_vo_root => aclk_vo_root ++ * pclk_cru_pcie => pclk_vpu_root => aclk_vpu_root ++ * pclk_cru_ddrphy => hclk_rkvdec_root => aclk_rkvdec_root ++ */ ++static struct rockchip_pll_rate_table rk3528_pll_rates[] = { ++ /* _mhz, _refdiv, _fbdiv, _postdiv1, _postdiv2, _dsmpd, _frac */ ++ RK3036_PLL_RATE(1896000000, 1, 79, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1800000000, 1, 75, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1704000000, 1, 71, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1608000000, 1, 67, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1512000000, 1, 63, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1416000000, 1, 59, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1296000000, 1, 54, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1200000000, 1, 50, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1188000000, 1, 99, 2, 1, 1, 0), /* GPLL */ ++ RK3036_PLL_RATE(1092000000, 2, 91, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1008000000, 1, 42, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1000000000, 1, 125, 3, 1, 1, 0), /* PPLL */ ++ RK3036_PLL_RATE(996000000, 2, 83, 1, 1, 1, 0), /* CPLL */ ++ RK3036_PLL_RATE(960000000, 1, 40, 1, 1, 1, 0), ++ RK3036_PLL_RATE(912000000, 1, 76, 2, 1, 1, 0), ++ RK3036_PLL_RATE(816000000, 1, 68, 2, 1, 1, 0), ++ RK3036_PLL_RATE(600000000, 1, 50, 2, 1, 1, 0), ++ RK3036_PLL_RATE(594000000, 2, 99, 2, 1, 1, 0), ++ RK3036_PLL_RATE(408000000, 1, 68, 2, 2, 1, 0), ++ RK3036_PLL_RATE(312000000, 1, 78, 6, 1, 1, 0), ++ RK3036_PLL_RATE(216000000, 1, 72, 4, 2, 1, 0), ++ RK3036_PLL_RATE(96000000, 1, 24, 3, 2, 1, 0), ++ { /* sentinel */ }, +}; + -+enum rk3568_plls { -+ apll, dpll, gpll, cpll, npll, vpll, ++#define RK3528_DIV_ACLK_M_CORE_MASK 0x1f ++#define RK3528_DIV_ACLK_M_CORE_SHIFT 11 ++#define RK3528_DIV_PCLK_DBG_MASK 0x1f ++#define RK3528_DIV_PCLK_DBG_SHIFT 1 ++ ++#define RK3528_CLKSEL39(_aclk_m_core) \ ++{ \ ++ .reg = RK3528_CLKSEL_CON(39), \ ++ .val = HIWORD_UPDATE(_aclk_m_core, RK3528_DIV_ACLK_M_CORE_MASK, \ ++ RK3528_DIV_ACLK_M_CORE_SHIFT), \ ++} ++ ++#define RK3528_CLKSEL40(_pclk_dbg) \ ++{ \ ++ .reg = RK3528_CLKSEL_CON(40), \ ++ .val = HIWORD_UPDATE(_pclk_dbg, RK3528_DIV_PCLK_DBG_MASK, \ ++ RK3528_DIV_PCLK_DBG_SHIFT), \ ++} ++ ++/* SIGN-OFF: _aclk_m_core: 550M, _pclk_dbg: 137.5M, */ ++#define RK3528_CPUCLK_RATE(_prate, _aclk_m_core, _pclk_dbg) \ ++{ \ ++ .prate = _prate, \ ++ .divs = { \ ++ RK3528_CLKSEL39(_aclk_m_core), \ ++ RK3528_CLKSEL40(_pclk_dbg), \ ++ }, \ ++} ++ ++static struct rockchip_cpuclk_rate_table rk3528_cpuclk_rates[] __initdata = { ++ /* APLL(CPU) rate <= 1900M, due to APLL VCO limit */ ++ RK3528_CPUCLK_RATE(1896000000, 1, 13), ++ RK3528_CPUCLK_RATE(1800000000, 1, 12), ++ RK3528_CPUCLK_RATE(1704000000, 1, 11), ++ RK3528_CPUCLK_RATE(1608000000, 1, 11), ++ RK3528_CPUCLK_RATE(1512000000, 1, 11), ++ RK3528_CPUCLK_RATE(1416000000, 1, 9), ++ RK3528_CPUCLK_RATE(1296000000, 1, 8), ++ RK3528_CPUCLK_RATE(1200000000, 1, 8), ++ RK3528_CPUCLK_RATE(1188000000, 1, 8), ++ RK3528_CPUCLK_RATE(1092000000, 1, 7), ++ RK3528_CPUCLK_RATE(1008000000, 1, 6), ++ RK3528_CPUCLK_RATE(1000000000, 1, 6), ++ RK3528_CPUCLK_RATE(996000000, 1, 6), ++ RK3528_CPUCLK_RATE(960000000, 1, 6), ++ RK3528_CPUCLK_RATE(912000000, 1, 6), ++ RK3528_CPUCLK_RATE(816000000, 1, 5), ++ RK3528_CPUCLK_RATE(600000000, 1, 3), ++ RK3528_CPUCLK_RATE(594000000, 1, 3), ++ RK3528_CPUCLK_RATE(408000000, 1, 2), ++ RK3528_CPUCLK_RATE(312000000, 1, 2), ++ RK3528_CPUCLK_RATE(216000000, 1, 1), ++ RK3528_CPUCLK_RATE(96000000, 1, 0), ++}; ++ ++static const struct rockchip_cpuclk_reg_data rk3528_cpuclk_data = { ++ .core_reg[0] = RK3528_CLKSEL_CON(39), ++ .div_core_shift[0] = 5, ++ .div_core_mask[0] = 0x1f, ++ .num_cores = 1, ++ .mux_core_alt = 1, ++ .mux_core_main = 0, ++ .mux_core_shift = 10, ++ .mux_core_mask = 0x1, +}; + -+static struct rockchip_pll_rate_table rk3568_pll_rates[] = { ++PNAME(mux_pll_p) = { "xin24m" }; ++PNAME(mux_24m_32k_p) = { "xin24m", "clk_32k" }; ++PNAME(mux_gpll_cpll_p) = { "gpll", "cpll" }; ++PNAME(mux_gpll_cpll_xin24m_p) = { "gpll", "cpll", "xin24m" }; ++PNAME(mux_100m_50m_24m_p) = { "clk_100m_src", "clk_50m_src", "xin24m" }; ++PNAME(mux_150m_100m_24m_p) = { "clk_150m_src", "clk_100m_src", "xin24m" }; ++PNAME(mux_200m_100m_24m_p) = { "clk_200m_src", "clk_100m_src", "xin24m" }; ++PNAME(mux_200m_100m_50m_24m_p) = { "clk_200m_src", "clk_100m_src", "clk_50m_src", "xin24m" }; ++PNAME(mux_300m_200m_100m_24m_p) = { "clk_300m_src", "clk_200m_src", "clk_100m_src", "xin24m" }; ++PNAME(mux_339m_200m_100m_24m_p) = { "clk_339m_src", "clk_200m_src", "clk_100m_src", "xin24m" }; ++PNAME(mux_500m_200m_100m_24m_p) = { "clk_500m_src", "clk_200m_src", "clk_100m_src", "xin24m" }; ++PNAME(mux_500m_300m_100m_24m_p) = { "clk_500m_src", "clk_300m_src", "clk_100m_src", "xin24m" }; ++PNAME(mux_600m_300m_200m_24m_p) = { "clk_600m_src", "clk_300m_src", "clk_200m_src", "xin24m" }; ++PNAME(aclk_gpu_p) = { "aclk_gpu_root", "clk_gpu_pvtpll_src" }; ++PNAME(aclk_rkvdec_pvtmux_root_p) = { "aclk_rkvdec_root", "clk_rkvdec_pvtpll_src" }; ++PNAME(clk_i2c2_p) = { "clk_200m_src", "clk_100m_src", "xin24m", "clk_32k" }; ++PNAME(clk_ref_pcie_inner_phy_p) = { "clk_ppll_100m_src", "xin24m" }; ++PNAME(dclk_vop0_p) = { "dclk_vop_src0", "clk_hdmiphy_pixel_io" }; ++PNAME(mclk_i2s0_2ch_sai_src_p) = { "clk_i2s0_2ch_src", "clk_i2s0_2ch_frac", "xin12m" }; ++PNAME(mclk_i2s1_8ch_sai_src_p) = { "clk_i2s1_8ch_src", "clk_i2s1_8ch_frac", "xin12m" }; ++PNAME(mclk_i2s2_2ch_sai_src_p) = { "clk_i2s2_2ch_src", "clk_i2s2_2ch_frac", "xin12m" }; ++PNAME(mclk_i2s3_8ch_sai_src_p) = { "clk_i2s3_8ch_src", "clk_i2s3_8ch_frac", "xin12m" }; ++PNAME(mclk_sai_i2s0_p) = { "mclk_i2s0_2ch_sai_src", "i2s0_mclkin" }; ++PNAME(mclk_sai_i2s1_p) = { "mclk_i2s1_8ch_sai_src", "i2s1_mclkin" }; ++PNAME(mclk_spdif_src_p) = { "clk_spdif_src", "clk_spdif_frac", "xin12m" }; ++PNAME(sclk_uart0_src_p) = { "clk_uart0_src", "clk_uart0_frac", "xin24m" }; ++PNAME(sclk_uart1_src_p) = { "clk_uart1_src", "clk_uart1_frac", "xin24m" }; ++PNAME(sclk_uart2_src_p) = { "clk_uart2_src", "clk_uart2_frac", "xin24m" }; ++PNAME(sclk_uart3_src_p) = { "clk_uart3_src", "clk_uart3_frac", "xin24m" }; ++PNAME(sclk_uart4_src_p) = { "clk_uart4_src", "clk_uart4_frac", "xin24m" }; ++PNAME(sclk_uart5_src_p) = { "clk_uart5_src", "clk_uart5_frac", "xin24m" }; ++PNAME(sclk_uart6_src_p) = { "clk_uart6_src", "clk_uart6_frac", "xin24m" }; ++PNAME(sclk_uart7_src_p) = { "clk_uart7_src", "clk_uart7_frac", "xin24m" }; ++PNAME(clk_32k_p) = { "xin_osc0_div", "clk_pvtm_32k" }; ++ ++/* Pass 0 to PLL() '_lshift' as a placeholder for rk3066 pll type. We are rk3328 pll type */ ++static struct rockchip_pll_clock rk3528_pll_clks[] __initdata = { ++ [apll] = PLL(pll_rk3328, PLL_APLL, "apll", mux_pll_p, ++ CLK_IS_CRITICAL, RK3528_PLL_CON(0), ++ RK3528_MODE_CON, 0, 0, 0, rk3528_pll_rates), ++ ++ [cpll] = PLL(pll_rk3328, PLL_CPLL, "cpll", mux_pll_p, ++ CLK_IS_CRITICAL, RK3528_PLL_CON(8), ++ RK3528_MODE_CON, 2, 0, 0, rk3528_pll_rates), ++ ++ [gpll] = PLL(pll_rk3328, PLL_GPLL, "gpll", mux_pll_p, ++ CLK_IS_CRITICAL, RK3528_PLL_CON(24), ++ RK3528_MODE_CON, 4, 0, 0, rk3528_pll_rates), ++ ++ [ppll] = PLL(pll_rk3328, PLL_PPLL, "ppll", mux_pll_p, ++ CLK_IS_CRITICAL, RK3528_PCIE_PLL_CON(32), ++ RK3528_MODE_CON, 6, 0, ++ ROCKCHIP_PLL_FIXED_MODE, rk3528_pll_rates), ++ ++ [dpll] = PLL(pll_rk3328, PLL_DPLL, "dpll", mux_pll_p, ++ CLK_IGNORE_UNUSED, RK3528_DDRPHY_PLL_CON(16), ++ RK3528_DDRPHY_MODE_CON, 0, 0, 0, rk3528_pll_rates), ++}; ++ ++#define MFLAGS CLK_MUX_HIWORD_MASK ++#define DFLAGS CLK_DIVIDER_HIWORD_MASK ++#define GFLAGS (CLK_GATE_HIWORD_MASK | CLK_GATE_SET_TO_DISABLE) ++ ++static struct rockchip_clk_branch rk3528_uart0_fracmux __initdata = ++ MUX(CLK_UART0, "clk_uart0", sclk_uart0_src_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(6), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3528_uart1_fracmux __initdata = ++ MUX(CLK_UART1, "clk_uart1", sclk_uart1_src_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(8), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3528_uart2_fracmux __initdata = ++ MUX(CLK_UART2, "clk_uart2", sclk_uart2_src_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(10), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3528_uart3_fracmux __initdata = ++ MUX(CLK_UART3, "clk_uart3", sclk_uart3_src_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(12), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3528_uart4_fracmux __initdata = ++ MUX(CLK_UART4, "clk_uart4", sclk_uart4_src_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(14), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3528_uart5_fracmux __initdata = ++ MUX(CLK_UART5, "clk_uart5", sclk_uart5_src_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(16), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3528_uart6_fracmux __initdata = ++ MUX(CLK_UART6, "clk_uart6", sclk_uart6_src_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(18), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3528_uart7_fracmux __initdata = ++ MUX(CLK_UART7, "clk_uart7", sclk_uart7_src_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(20), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch mclk_i2s0_2ch_sai_src_fracmux __initdata = ++ MUX(MCLK_I2S0_2CH_SAI_SRC_PRE, "mclk_i2s0_2ch_sai_src_pre", mclk_i2s0_2ch_sai_src_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(22), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch mclk_i2s1_8ch_sai_src_fracmux __initdata = ++ MUX(MCLK_I2S1_8CH_SAI_SRC_PRE, "mclk_i2s1_8ch_sai_src_pre", mclk_i2s1_8ch_sai_src_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(26), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch mclk_i2s2_2ch_sai_src_fracmux __initdata = ++ MUX(MCLK_I2S2_2CH_SAI_SRC_PRE, "mclk_i2s2_2ch_sai_src_pre", mclk_i2s2_2ch_sai_src_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(28), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch mclk_i2s3_8ch_sai_src_fracmux __initdata = ++ MUX(MCLK_I2S3_8CH_SAI_SRC_PRE, "mclk_i2s3_8ch_sai_src_pre", mclk_i2s3_8ch_sai_src_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(24), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch mclk_spdif_src_fracmux __initdata = ++ MUX(MCLK_SDPDIF_SRC_PRE, "mclk_spdif_src_pre", mclk_spdif_src_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(32), 0, 2, MFLAGS); ++ ++/* ++ * CRU Clock-Architecture ++ */ ++static struct rockchip_clk_branch rk3528_clk_branches[] __initdata = { ++ /* top */ ++ FACTOR(0, "xin12m", "xin24m", 0, 1, 2), ++ ++ COMPOSITE(CLK_MATRIX_250M_SRC, "clk_250m_src", mux_gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(1), 15, 1, MFLAGS, 10, 5, DFLAGS, ++ RK3528_CLKGATE_CON(0), 5, GFLAGS), ++ COMPOSITE(CLK_MATRIX_500M_SRC, "clk_500m_src", mux_gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(3), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RK3528_CLKGATE_CON(0), 10, GFLAGS), ++ COMPOSITE_NOMUX(CLK_MATRIX_50M_SRC, "clk_50m_src", "cpll", CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(0), 2, 5, DFLAGS, ++ RK3528_CLKGATE_CON(0), 1, GFLAGS), ++ COMPOSITE_NOMUX(CLK_MATRIX_100M_SRC, "clk_100m_src", "cpll", CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(0), 7, 5, DFLAGS, ++ RK3528_CLKGATE_CON(0), 2, GFLAGS), ++ COMPOSITE_NOMUX(CLK_MATRIX_150M_SRC, "clk_150m_src", "gpll", CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(1), 0, 5, DFLAGS, ++ RK3528_CLKGATE_CON(0), 3, GFLAGS), ++ COMPOSITE_NOMUX(CLK_MATRIX_200M_SRC, "clk_200m_src", "gpll", CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(1), 5, 5, DFLAGS, ++ RK3528_CLKGATE_CON(0), 4, GFLAGS), ++ COMPOSITE_NOMUX(CLK_MATRIX_300M_SRC, "clk_300m_src", "gpll", CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(2), 0, 5, DFLAGS, ++ RK3528_CLKGATE_CON(0), 6, GFLAGS), ++ COMPOSITE_NOMUX_HALFDIV(CLK_MATRIX_339M_SRC, "clk_339m_src", "gpll", CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(2), 5, 5, DFLAGS, ++ RK3528_CLKGATE_CON(0), 7, GFLAGS), ++ COMPOSITE_NOMUX(CLK_MATRIX_400M_SRC, "clk_400m_src", "gpll", CLK_IGNORE_UNUSED, ++ RK3528_CLKSEL_CON(2), 10, 5, DFLAGS, ++ RK3528_CLKGATE_CON(0), 8, GFLAGS), ++ COMPOSITE_NOMUX(CLK_MATRIX_600M_SRC, "clk_600m_src", "gpll", CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(4), 0, 5, DFLAGS, ++ RK3528_CLKGATE_CON(0), 11, GFLAGS), ++ COMPOSITE(DCLK_VOP_SRC0, "dclk_vop_src0", mux_gpll_cpll_p, 0, ++ RK3528_CLKSEL_CON(32), 10, 1, MFLAGS, 2, 8, DFLAGS, ++ RK3528_CLKGATE_CON(3), 7, GFLAGS), ++ COMPOSITE(DCLK_VOP_SRC1, "dclk_vop_src1", mux_gpll_cpll_p, 0, ++ RK3528_CLKSEL_CON(33), 8, 1, MFLAGS, 0, 8, DFLAGS, ++ RK3528_CLKGATE_CON(3), 8, GFLAGS), ++ COMPOSITE_NOMUX(CLK_HSM, "clk_hsm", "xin24m", 0, ++ RK3528_CLKSEL_CON(36), 5, 5, DFLAGS, ++ RK3528_CLKGATE_CON(3), 13, GFLAGS), ++ ++ COMPOSITE_NOMUX(CLK_UART0_SRC, "clk_uart0_src", "gpll", 0, ++ RK3528_CLKSEL_CON(4), 5, 5, DFLAGS, ++ RK3528_CLKGATE_CON(0), 12, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART0_FRAC, "clk_uart0_frac", "clk_uart0_src", CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(5), 0, ++ RK3528_CLKGATE_CON(0), 13, GFLAGS, &rk3528_uart0_fracmux), ++ GATE(SCLK_UART0, "sclk_uart0", "clk_uart0", 0, ++ RK3528_CLKGATE_CON(0), 14, GFLAGS), ++ ++ COMPOSITE_NOMUX(CLK_UART1_SRC, "clk_uart1_src", "gpll", 0, ++ RK3528_CLKSEL_CON(6), 2, 5, DFLAGS, ++ RK3528_CLKGATE_CON(0), 15, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART1_FRAC, "clk_uart1_frac", "clk_uart1_src", CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(7), 0, ++ RK3528_CLKGATE_CON(1), 0, GFLAGS, &rk3528_uart1_fracmux), ++ GATE(SCLK_UART1, "sclk_uart1", "clk_uart1", 0, ++ RK3528_CLKGATE_CON(1), 1, GFLAGS), ++ ++ COMPOSITE_NOMUX(CLK_UART2_SRC, "clk_uart2_src", "gpll", 0, ++ RK3528_CLKSEL_CON(8), 2, 5, DFLAGS, ++ RK3528_CLKGATE_CON(1), 2, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART2_FRAC, "clk_uart2_frac", "clk_uart2_src", CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(9), 0, ++ RK3528_CLKGATE_CON(1), 3, GFLAGS, &rk3528_uart2_fracmux), ++ GATE(SCLK_UART2, "sclk_uart2", "clk_uart2", 0, ++ RK3528_CLKGATE_CON(1), 4, GFLAGS), ++ ++ COMPOSITE_NOMUX(CLK_UART3_SRC, "clk_uart3_src", "gpll", 0, ++ RK3528_CLKSEL_CON(10), 2, 5, DFLAGS, ++ RK3528_CLKGATE_CON(1), 5, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART3_FRAC, "clk_uart3_frac", "clk_uart3_src", CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(11), 0, ++ RK3528_CLKGATE_CON(1), 6, GFLAGS, &rk3528_uart3_fracmux), ++ GATE(SCLK_UART3, "sclk_uart3", "clk_uart3", 0, ++ RK3528_CLKGATE_CON(1), 7, GFLAGS), ++ ++ COMPOSITE_NOMUX(CLK_UART4_SRC, "clk_uart4_src", "gpll", 0, ++ RK3528_CLKSEL_CON(12), 2, 5, DFLAGS, ++ RK3528_CLKGATE_CON(1), 8, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART4_FRAC, "clk_uart4_frac", "clk_uart4_src", CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(13), 0, ++ RK3528_CLKGATE_CON(1), 9, GFLAGS, &rk3528_uart4_fracmux), ++ GATE(SCLK_UART4, "sclk_uart4", "clk_uart4", 0, ++ RK3528_CLKGATE_CON(1), 10, GFLAGS), ++ ++ COMPOSITE_NOMUX(CLK_UART5_SRC, "clk_uart5_src", "gpll", 0, ++ RK3528_CLKSEL_CON(14), 2, 5, DFLAGS, ++ RK3528_CLKGATE_CON(1), 11, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART5_FRAC, "clk_uart5_frac", "clk_uart5_src", CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(15), 0, ++ RK3528_CLKGATE_CON(1), 12, GFLAGS, &rk3528_uart5_fracmux), ++ GATE(SCLK_UART5, "sclk_uart5", "clk_uart5", 0, ++ RK3528_CLKGATE_CON(1), 13, GFLAGS), ++ ++ COMPOSITE_NOMUX(CLK_UART6_SRC, "clk_uart6_src", "gpll", 0, ++ RK3528_CLKSEL_CON(16), 2, 5, DFLAGS, ++ RK3528_CLKGATE_CON(1), 14, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART6_FRAC, "clk_uart6_frac", "clk_uart6_src", CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(17), 0, ++ RK3528_CLKGATE_CON(1), 15, GFLAGS, &rk3528_uart6_fracmux), ++ GATE(SCLK_UART6, "sclk_uart6", "clk_uart6", 0, ++ RK3528_CLKGATE_CON(2), 0, GFLAGS), ++ ++ COMPOSITE_NOMUX(CLK_UART7_SRC, "clk_uart7_src", "gpll", 0, ++ RK3528_CLKSEL_CON(18), 2, 5, DFLAGS, ++ RK3528_CLKGATE_CON(2), 1, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART7_FRAC, "clk_uart7_frac", "clk_uart7_src", CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(19), 0, ++ RK3528_CLKGATE_CON(2), 2, GFLAGS, &rk3528_uart7_fracmux), ++ GATE(SCLK_UART7, "sclk_uart7", "clk_uart7", 0, ++ RK3528_CLKGATE_CON(2), 3, GFLAGS), ++ ++ COMPOSITE_NOMUX(CLK_I2S0_2CH_SRC, "clk_i2s0_2ch_src", "gpll", 0, ++ RK3528_CLKSEL_CON(20), 8, 5, DFLAGS, ++ RK3528_CLKGATE_CON(2), 5, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S0_2CH_FRAC, "clk_i2s0_2ch_frac", "clk_i2s0_2ch_src", CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(21), 0, ++ RK3528_CLKGATE_CON(2), 6, GFLAGS, &mclk_i2s0_2ch_sai_src_fracmux), ++ GATE(MCLK_I2S0_2CH_SAI_SRC, "mclk_i2s0_2ch_sai_src", "mclk_i2s0_2ch_sai_src_pre", 0, ++ RK3528_CLKGATE_CON(2), 7, GFLAGS), ++ ++ COMPOSITE_NOMUX(CLK_I2S1_8CH_SRC, "clk_i2s1_8ch_src", "gpll", 0, ++ RK3528_CLKSEL_CON(24), 3, 5, DFLAGS, ++ RK3528_CLKGATE_CON(2), 11, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S1_8CH_FRAC, "clk_i2s1_8ch_frac", "clk_i2s1_8ch_src", CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(25), 0, ++ RK3528_CLKGATE_CON(2), 12, GFLAGS, &mclk_i2s1_8ch_sai_src_fracmux), ++ GATE(MCLK_I2S1_8CH_SAI_SRC, "mclk_i2s1_8ch_sai_src", "mclk_i2s1_8ch_sai_src_pre", 0, ++ RK3528_CLKGATE_CON(2), 13, GFLAGS), ++ ++ COMPOSITE_NOMUX(CLK_I2S2_2CH_SRC, "clk_i2s2_2ch_src", "gpll", 0, ++ RK3528_CLKSEL_CON(26), 3, 5, DFLAGS, ++ RK3528_CLKGATE_CON(2), 14, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S2_2CH_FRAC, "clk_i2s2_2ch_frac", "clk_i2s2_2ch_src", CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(27), 0, ++ RK3528_CLKGATE_CON(2), 15, GFLAGS, &mclk_i2s2_2ch_sai_src_fracmux), ++ GATE(MCLK_I2S2_2CH_SAI_SRC, "mclk_i2s2_2ch_sai_src", "mclk_i2s2_2ch_sai_src_pre", 0, ++ RK3528_CLKGATE_CON(3), 0, GFLAGS), ++ ++ COMPOSITE_NOMUX(CLK_I2S3_8CH_SRC, "clk_i2s3_8ch_src", "gpll", 0, ++ RK3528_CLKSEL_CON(22), 3, 5, DFLAGS, ++ RK3528_CLKGATE_CON(2), 8, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S3_8CH_FRAC, "clk_i2s3_8ch_frac", "clk_i2s3_8ch_src", CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(23), 0, ++ RK3528_CLKGATE_CON(2), 9, GFLAGS, &mclk_i2s3_8ch_sai_src_fracmux), ++ GATE(MCLK_I2S3_8CH_SAI_SRC, "mclk_i2s3_8ch_sai_src", "mclk_i2s3_8ch_sai_src_pre", 0, ++ RK3528_CLKGATE_CON(2), 10, GFLAGS), ++ ++ COMPOSITE_NOMUX(CLK_SPDIF_SRC, "clk_spdif_src", "gpll", 0, ++ RK3528_CLKSEL_CON(30), 2, 5, DFLAGS, ++ RK3528_CLKGATE_CON(3), 4, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_SPDIF_FRAC, "clk_spdif_frac", "clk_spdif_src", CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(31), 0, ++ RK3528_CLKGATE_CON(3), 5, GFLAGS, &mclk_spdif_src_fracmux), ++ GATE(MCLK_SPDIF_SRC, "mclk_spdif_src", "mclk_spdif_src_pre", 0, ++ RK3528_CLKGATE_CON(3), 6, GFLAGS), ++ ++ /* bus */ ++ COMPOSITE_NODIV(ACLK_BUS_M_ROOT, "aclk_bus_m_root", mux_300m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(43), 12, 2, MFLAGS, ++ RK3528_CLKGATE_CON(8), 7, GFLAGS), ++ GATE(ACLK_GIC, "aclk_gic", "aclk_bus_m_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(9), 1, GFLAGS), ++ ++ COMPOSITE_NODIV(ACLK_BUS_ROOT, "aclk_bus_root", mux_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(43), 6, 2, MFLAGS, ++ RK3528_CLKGATE_CON(8), 4, GFLAGS), ++ GATE(ACLK_SPINLOCK, "aclk_spinlock", "aclk_bus_root", 0, ++ RK3528_CLKGATE_CON(9), 2, GFLAGS), ++ GATE(ACLK_DMAC, "aclk_dmac", "aclk_bus_root", 0, ++ RK3528_CLKGATE_CON(9), 4, GFLAGS), ++ GATE(ACLK_DCF, "aclk_dcf", "aclk_bus_root", 0, ++ RK3528_CLKGATE_CON(11), 11, GFLAGS), ++ COMPOSITE(ACLK_BUS_VOPGL_ROOT, "aclk_bus_vopgl_root", mux_gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(43), 3, 1, MFLAGS, 0, 3, DFLAGS, ++ RK3528_CLKGATE_CON(8), 0, GFLAGS), ++ COMPOSITE_NODIV(ACLK_BUS_H_ROOT, "aclk_bus_h_root", mux_500m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(43), 4, 2, MFLAGS, ++ RK3528_CLKGATE_CON(8), 2, GFLAGS), ++ GATE(ACLK_DMA2DDR, "aclk_dma2ddr", "aclk_bus_h_root", 0, ++ RK3528_CLKGATE_CON(10), 14, GFLAGS), ++ ++ COMPOSITE_NODIV(HCLK_BUS_ROOT, "hclk_bus_root", mux_200m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(43), 8, 2, MFLAGS, ++ RK3528_CLKGATE_CON(8), 5, GFLAGS), ++ ++ COMPOSITE_NODIV(PCLK_BUS_ROOT, "pclk_bus_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(43), 10, 2, MFLAGS, ++ RK3528_CLKGATE_CON(8), 6, GFLAGS), ++ GATE(PCLK_DFT2APB, "pclk_dft2apb", "pclk_bus_root", 0, ++ RK3528_CLKGATE_CON(8), 13, GFLAGS), ++ GATE(PCLK_BUS_GRF, "pclk_bus_grf", "pclk_bus_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(8), 15, GFLAGS), ++ GATE(PCLK_TIMER, "pclk_timer", "pclk_bus_root", 0, ++ RK3528_CLKGATE_CON(9), 5, GFLAGS), ++ GATE(PCLK_JDBCK_DAP, "pclk_jdbck_dap", "pclk_bus_root", 0, ++ RK3528_CLKGATE_CON(9), 12, GFLAGS), ++ GATE(PCLK_WDT_NS, "pclk_wdt_ns", "pclk_bus_root", 0, ++ RK3528_CLKGATE_CON(9), 15, GFLAGS), ++ GATE(PCLK_UART0, "pclk_uart0", "pclk_bus_root", 0, ++ RK3528_CLKGATE_CON(10), 7, GFLAGS), ++ GATE(PCLK_PWM0, "pclk_pwm0", "pclk_bus_root", 0, ++ RK3528_CLKGATE_CON(11), 4, GFLAGS), ++ GATE(PCLK_PWM1, "pclk_pwm1", "pclk_bus_root", 0, ++ RK3528_CLKGATE_CON(11), 7, GFLAGS), ++ GATE(PCLK_DMA2DDR, "pclk_dma2ddr", "pclk_bus_root", 0, ++ RK3528_CLKGATE_CON(10), 13, GFLAGS), ++ GATE(PCLK_SCR, "pclk_scr", "pclk_bus_root", 0, ++ RK3528_CLKGATE_CON(11), 10, GFLAGS), ++ GATE(PCLK_INTMUX, "pclk_intmux", "pclk_bus_root", CLK_IGNORE_UNUSED, ++ RK3528_CLKGATE_CON(11), 12, GFLAGS), ++ ++ COMPOSITE_NODIV(CLK_PWM0, "clk_pwm0", mux_100m_50m_24m_p, 0, ++ RK3528_CLKSEL_CON(44), 6, 2, MFLAGS, ++ RK3528_CLKGATE_CON(11), 5, GFLAGS), ++ COMPOSITE_NODIV(CLK_PWM1, "clk_pwm1", mux_100m_50m_24m_p, 0, ++ RK3528_CLKSEL_CON(44), 8, 2, MFLAGS, ++ RK3528_CLKGATE_CON(11), 8, GFLAGS), ++ ++ GATE(CLK_CAPTURE_PWM1, "clk_capture_pwm1", "xin24m", 0, ++ RK3528_CLKGATE_CON(11), 9, GFLAGS), ++ GATE(CLK_CAPTURE_PWM0, "clk_capture_pwm0", "xin24m", 0, ++ RK3528_CLKGATE_CON(11), 6, GFLAGS), ++ GATE(CLK_JDBCK_DAP, "clk_jdbck_dap", "xin24m", 0, ++ RK3528_CLKGATE_CON(9), 13, GFLAGS), ++ GATE(TCLK_WDT_NS, "tclk_wdt_ns", "xin24m", 0, ++ RK3528_CLKGATE_CON(10), 0, GFLAGS), ++ ++ GATE(CLK_TIMER_ROOT, "clk_timer_root", "xin24m", 0, ++ RK3528_CLKGATE_CON(8), 9, GFLAGS), ++ GATE(CLK_TIMER0, "clk_timer0", "clk_timer_root", 0, ++ RK3528_CLKGATE_CON(9), 6, GFLAGS), ++ GATE(CLK_TIMER1, "clk_timer1", "clk_timer_root", 0, ++ RK3528_CLKGATE_CON(9), 7, GFLAGS), ++ GATE(CLK_TIMER2, "clk_timer2", "clk_timer_root", 0, ++ RK3528_CLKGATE_CON(9), 8, GFLAGS), ++ GATE(CLK_TIMER3, "clk_timer3", "clk_timer_root", 0, ++ RK3528_CLKGATE_CON(9), 9, GFLAGS), ++ GATE(CLK_TIMER4, "clk_timer4", "clk_timer_root", 0, ++ RK3528_CLKGATE_CON(9), 10, GFLAGS), ++ GATE(CLK_TIMER5, "clk_timer5", "clk_timer_root", 0, ++ RK3528_CLKGATE_CON(9), 11, GFLAGS), ++ ++ /* pmu */ ++ GATE(HCLK_PMU_ROOT, "hclk_pmu_root", "clk_100m_src", CLK_IGNORE_UNUSED, ++ RK3528_PMU_CLKGATE_CON(0), 1, GFLAGS), ++ GATE(PCLK_PMU_ROOT, "pclk_pmu_root", "clk_100m_src", CLK_IGNORE_UNUSED, ++ RK3528_PMU_CLKGATE_CON(0), 0, GFLAGS), ++ ++ GATE(FCLK_MCU, "fclk_mcu", "hclk_pmu_root", 0, ++ RK3528_PMU_CLKGATE_CON(0), 7, GFLAGS), ++ GATE(HCLK_PMU_SRAM, "hclk_pmu_sram", "hclk_pmu_root", CLK_IS_CRITICAL, ++ RK3528_PMU_CLKGATE_CON(5), 4, GFLAGS), ++ ++ GATE(PCLK_I2C2, "pclk_i2c2", "pclk_pmu_root", 0, ++ RK3528_PMU_CLKGATE_CON(0), 2, GFLAGS), ++ GATE(PCLK_PMU_HP_TIMER, "pclk_pmu_hp_timer", "pclk_pmu_root", 0, ++ RK3528_PMU_CLKGATE_CON(1), 2, GFLAGS), ++ GATE(PCLK_PMU_IOC, "pclk_pmu_ioc", "pclk_pmu_root", CLK_IS_CRITICAL, ++ RK3528_PMU_CLKGATE_CON(1), 5, GFLAGS), ++ GATE(PCLK_PMU_CRU, "pclk_pmu_cru", "pclk_pmu_root", CLK_IS_CRITICAL, ++ RK3528_PMU_CLKGATE_CON(1), 6, GFLAGS), ++ GATE(PCLK_PMU_GRF, "pclk_pmu_grf", "pclk_pmu_root", CLK_IS_CRITICAL, ++ RK3528_PMU_CLKGATE_CON(1), 7, GFLAGS), ++ GATE(PCLK_PMU_WDT, "pclk_pmu_wdt", "pclk_pmu_root", 0, ++ RK3528_PMU_CLKGATE_CON(1), 10, GFLAGS), ++ GATE(PCLK_PMU, "pclk_pmu", "pclk_pmu_root", CLK_IS_CRITICAL, ++ RK3528_PMU_CLKGATE_CON(0), 13, GFLAGS), ++ GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_pmu_root", 0, ++ RK3528_PMU_CLKGATE_CON(0), 14, GFLAGS), ++ GATE(PCLK_OSCCHK, "pclk_oscchk", "pclk_pmu_root", 0, ++ RK3528_PMU_CLKGATE_CON(0), 9, GFLAGS), ++ GATE(PCLK_PMU_MAILBOX, "pclk_pmu_mailbox", "pclk_pmu_root", 0, ++ RK3528_PMU_CLKGATE_CON(1), 12, GFLAGS), ++ GATE(PCLK_SCRKEYGEN, "pclk_scrkeygen", "pclk_pmu_root", 0, ++ RK3528_PMU_CLKGATE_CON(1), 15, GFLAGS), ++ GATE(PCLK_PVTM_PMU, "pclk_pvtm_pmu", "pclk_pmu_root", 0, ++ RK3528_PMU_CLKGATE_CON(5), 1, GFLAGS), ++ ++ COMPOSITE_NODIV(CLK_I2C2, "clk_i2c2", clk_i2c2_p, 0, ++ RK3528_PMU_CLKSEL_CON(0), 0, 2, MFLAGS, ++ RK3528_PMU_CLKGATE_CON(0), 3, GFLAGS), ++ ++ GATE(CLK_REFOUT, "clk_refout", "xin24m", 0, ++ RK3528_PMU_CLKGATE_CON(2), 4, GFLAGS), ++ COMPOSITE_NOMUX(CLK_PVTM_PMU, "clk_pvtm_pmu", "xin24m", 0, ++ RK3528_PMU_CLKSEL_CON(5), 0, 5, DFLAGS, ++ RK3528_PMU_CLKGATE_CON(5), 0, GFLAGS), ++ ++ COMPOSITE_FRAC(XIN_OSC0_DIV, "xin_osc0_div", "xin24m", 0, ++ RK3528_PMU_CLKSEL_CON(1), 0, ++ RK3528_PMU_CLKGATE_CON(1), 0, GFLAGS), ++ /* clk_32k: internal! No path from external osc 32k */ ++ MUX(CLK_DEEPSLOW, "clk_32k", clk_32k_p, CLK_IS_CRITICAL, ++ RK3528_PMU_CLKSEL_CON(2), 0, 1, MFLAGS), ++ GATE(RTC_CLK_MCU, "rtc_clk_mcu", "clk_32k", 0, ++ RK3528_PMU_CLKGATE_CON(0), 8, GFLAGS), ++ GATE(CLK_DDR_FAIL_SAFE, "clk_ddr_fail_safe", "xin24m", CLK_IGNORE_UNUSED, ++ RK3528_PMU_CLKGATE_CON(1), 1, GFLAGS), ++ ++ COMPOSITE_NODIV(DBCLK_GPIO0, "dbclk_gpio0", mux_24m_32k_p, 0, ++ RK3528_PMU_CLKSEL_CON(0), 2, 1, MFLAGS, ++ RK3528_PMU_CLKGATE_CON(0), 15, GFLAGS), ++ COMPOSITE_NODIV(TCLK_PMU_WDT, "tclk_pmu_wdt", mux_24m_32k_p, 0, ++ RK3528_PMU_CLKSEL_CON(2), 1, 1, MFLAGS, ++ RK3528_PMU_CLKGATE_CON(1), 11, GFLAGS), ++ ++ /* core */ ++ COMPOSITE_NOMUX(ACLK_M_CORE_BIU, "aclk_m_core", "armclk", CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(39), 11, 5, DFLAGS | CLK_DIVIDER_READ_ONLY, ++ RK3528_CLKGATE_CON(5), 12, GFLAGS), ++ COMPOSITE_NOMUX(PCLK_DBG, "pclk_dbg", "armclk", CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(40), 1, 5, DFLAGS | CLK_DIVIDER_READ_ONLY, ++ RK3528_CLKGATE_CON(5), 13, GFLAGS), ++ GATE(PCLK_CPU_ROOT, "pclk_cpu_root", "pclk_dbg", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(6), 1, GFLAGS), ++ GATE(PCLK_CORE_GRF, "pclk_core_grf", "pclk_cpu_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(6), 2, GFLAGS), ++ ++ /* ddr */ ++ GATE(CLK_DDRC_SRC, "clk_ddrc_src", "dpll", CLK_IS_CRITICAL, ++ RK3528_DDRPHY_CLKGATE_CON(0), 0, GFLAGS), ++ GATE(CLK_DDR_PHY, "clk_ddr_phy", "dpll", CLK_IS_CRITICAL, ++ RK3528_DDRPHY_CLKGATE_CON(0), 1, GFLAGS), ++ ++ COMPOSITE_NODIV(PCLK_DDR_ROOT, "pclk_ddr_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(90), 0, 2, MFLAGS, ++ RK3528_CLKGATE_CON(45), 0, GFLAGS), ++ GATE(PCLK_DDRMON, "pclk_ddrmon", "pclk_ddr_root", CLK_IGNORE_UNUSED, ++ RK3528_CLKGATE_CON(45), 3, GFLAGS), ++ GATE(PCLK_DDR_HWLP, "pclk_ddr_hwlp", "pclk_ddr_root", CLK_IGNORE_UNUSED, ++ RK3528_CLKGATE_CON(45), 8, GFLAGS), ++ GATE(CLK_TIMER_DDRMON, "clk_timer_ddrmon", "xin24m", CLK_IGNORE_UNUSED, ++ RK3528_CLKGATE_CON(45), 4, GFLAGS), ++ ++ GATE(PCLK_DDRC, "pclk_ddrc", "pclk_ddr_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(45), 2, GFLAGS), ++ GATE(PCLK_DDR_GRF, "pclk_ddr_grf", "pclk_ddr_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(45), 6, GFLAGS), ++ GATE(PCLK_DDRPHY, "pclk_ddrphy", "pclk_ddr_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(45), 9, GFLAGS), ++ ++ GATE(ACLK_DDR_UPCTL, "aclk_ddr_upctl", "clk_ddrc_src", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(45), 11, GFLAGS), ++ GATE(CLK_DDR_UPCTL, "clk_ddr_upctl", "clk_ddrc_src", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(45), 12, GFLAGS), ++ GATE(CLK_DDRMON, "clk_ddrmon", "clk_ddrc_src", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(45), 13, GFLAGS), ++ GATE(ACLK_DDR_SCRAMBLE, "aclk_ddr_scramble", "clk_ddrc_src", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(45), 14, GFLAGS), ++ GATE(ACLK_SPLIT, "aclk_split", "clk_ddrc_src", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(45), 15, GFLAGS), ++ ++ /* gpu */ ++ COMPOSITE_NODIV(ACLK_GPU_ROOT, "aclk_gpu_root", mux_500m_300m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(76), 0, 2, MFLAGS, ++ RK3528_CLKGATE_CON(34), 0, GFLAGS), ++ COMPOSITE_NODIV(ACLK_GPU, "aclk_gpu", aclk_gpu_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(76), 6, 1, MFLAGS, ++ RK3528_CLKGATE_CON(34), 7, GFLAGS), ++ GATE(ACLK_GPU_MALI, "aclk_gpu_mali", "aclk_gpu", 0, ++ RK3528_CLKGATE_CON(34), 8, GFLAGS), ++ COMPOSITE_NODIV(PCLK_GPU_ROOT, "pclk_gpu_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(76), 4, 2, MFLAGS, ++ RK3528_CLKGATE_CON(34), 2, GFLAGS), ++ ++ /* rkvdec */ ++ COMPOSITE_NODIV(ACLK_RKVDEC_ROOT_NDFT, "aclk_rkvdec_root", mux_339m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(88), 6, 2, MFLAGS, ++ RK3528_CLKGATE_CON(44), 3, GFLAGS), ++ COMPOSITE_NODIV(HCLK_RKVDEC_ROOT, "hclk_rkvdec_root", mux_200m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(88), 4, 2, MFLAGS, ++ RK3528_CLKGATE_CON(44), 2, GFLAGS), ++ GATE(PCLK_DDRPHY_CRU, "pclk_ddrphy_cru", "hclk_rkvdec_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(44), 4, GFLAGS), ++ GATE(HCLK_RKVDEC, "hclk_rkvdec", "hclk_rkvdec_root", 0, ++ RK3528_CLKGATE_CON(44), 9, GFLAGS), ++ COMPOSITE_NODIV(CLK_HEVC_CA_RKVDEC, "clk_hevc_ca_rkvdec", mux_600m_300m_200m_24m_p, 0, ++ RK3528_CLKSEL_CON(88), 11, 2, MFLAGS, ++ RK3528_CLKGATE_CON(44), 11, GFLAGS), ++ MUX(ACLK_RKVDEC_PVTMUX_ROOT, "aclk_rkvdec_pvtmux_root", aclk_rkvdec_pvtmux_root_p, CLK_IS_CRITICAL | CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(88), 13, 1, MFLAGS), ++ GATE(ACLK_RKVDEC, "aclk_rkvdec", "aclk_rkvdec_pvtmux_root", 0, ++ RK3528_CLKGATE_CON(44), 8, GFLAGS), ++ ++ /* rkvenc */ ++ COMPOSITE_NODIV(ACLK_RKVENC_ROOT, "aclk_rkvenc_root", mux_300m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(79), 2, 2, MFLAGS, ++ RK3528_CLKGATE_CON(36), 1, GFLAGS), ++ GATE(ACLK_RKVENC, "aclk_rkvenc", "aclk_rkvenc_root", 0, ++ RK3528_CLKGATE_CON(36), 7, GFLAGS), ++ ++ COMPOSITE_NODIV(PCLK_RKVENC_ROOT, "pclk_rkvenc_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(79), 4, 2, MFLAGS, ++ RK3528_CLKGATE_CON(36), 2, GFLAGS), ++ GATE(PCLK_RKVENC_IOC, "pclk_rkvenc_ioc", "pclk_rkvenc_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(37), 10, GFLAGS), ++ GATE(PCLK_RKVENC_GRF, "pclk_rkvenc_grf", "pclk_rkvenc_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(38), 6, GFLAGS), ++ GATE(PCLK_I2C1, "pclk_i2c1", "pclk_rkvenc_root", 0, ++ RK3528_CLKGATE_CON(36), 11, GFLAGS), ++ GATE(PCLK_I2C0, "pclk_i2c0", "pclk_rkvenc_root", 0, ++ RK3528_CLKGATE_CON(36), 13, GFLAGS), ++ GATE(PCLK_SPI0, "pclk_spi0", "pclk_rkvenc_root", 0, ++ RK3528_CLKGATE_CON(37), 2, GFLAGS), ++ GATE(PCLK_GPIO4, "pclk_gpio4", "pclk_rkvenc_root", 0, ++ RK3528_CLKGATE_CON(37), 8, GFLAGS), ++ GATE(PCLK_UART1, "pclk_uart1", "pclk_rkvenc_root", 0, ++ RK3528_CLKGATE_CON(38), 2, GFLAGS), ++ GATE(PCLK_UART3, "pclk_uart3", "pclk_rkvenc_root", 0, ++ RK3528_CLKGATE_CON(38), 4, GFLAGS), ++ GATE(PCLK_CAN0, "pclk_can0", "pclk_rkvenc_root", 0, ++ RK3528_CLKGATE_CON(38), 7, GFLAGS), ++ GATE(PCLK_CAN1, "pclk_can1", "pclk_rkvenc_root", 0, ++ RK3528_CLKGATE_CON(38), 9, GFLAGS), ++ ++ COMPOSITE_NODIV(MCLK_PDM, "mclk_pdm", mux_150m_100m_24m_p, 0, ++ RK3528_CLKSEL_CON(80), 12, 2, MFLAGS, ++ RK3528_CLKGATE_CON(38), 1, GFLAGS), ++ COMPOSITE(CLK_CAN0, "clk_can0", mux_gpll_cpll_p, 0, ++ RK3528_CLKSEL_CON(81), 6, 1, MFLAGS, 0, 6, DFLAGS, ++ RK3528_CLKGATE_CON(38), 8, GFLAGS), ++ COMPOSITE(CLK_CAN1, "clk_can1", mux_gpll_cpll_p, 0, ++ RK3528_CLKSEL_CON(81), 13, 1, MFLAGS, 7, 6, DFLAGS, ++ RK3528_CLKGATE_CON(38), 10, GFLAGS), ++ ++ COMPOSITE_NODIV(HCLK_RKVENC_ROOT, "hclk_rkvenc_root", mux_200m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(79), 0, 2, MFLAGS, ++ RK3528_CLKGATE_CON(36), 0, GFLAGS), ++ GATE(HCLK_SAI_I2S1, "hclk_sai_i2s1", "hclk_rkvenc_root", 0, ++ RK3528_CLKGATE_CON(36), 9, GFLAGS), ++ GATE(HCLK_SPDIF, "hclk_spdif", "hclk_rkvenc_root", 0, ++ RK3528_CLKGATE_CON(37), 14, GFLAGS), ++ GATE(HCLK_PDM, "hclk_pdm", "hclk_rkvenc_root", 0, ++ RK3528_CLKGATE_CON(38), 0, GFLAGS), ++ GATE(HCLK_RKVENC, "hclk_rkvenc", "hclk_rkvenc_root", 0, ++ RK3528_CLKGATE_CON(36), 6, GFLAGS), ++ ++ COMPOSITE_NODIV(CLK_CORE_RKVENC, "clk_core_rkvenc", mux_300m_200m_100m_24m_p, 0, ++ RK3528_CLKSEL_CON(79), 6, 2, MFLAGS, ++ RK3528_CLKGATE_CON(36), 8, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C0, "clk_i2c0", mux_200m_100m_50m_24m_p, 0, ++ RK3528_CLKSEL_CON(79), 11, 2, MFLAGS, ++ RK3528_CLKGATE_CON(36), 14, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C1, "clk_i2c1", mux_200m_100m_50m_24m_p, 0, ++ RK3528_CLKSEL_CON(79), 9, 2, MFLAGS, ++ RK3528_CLKGATE_CON(36), 12, GFLAGS), ++#if 0 ++ GATE(SCLK_IN_SPI0, "sclk_in_spi0", "sclk_in_spi0_io", 0, ++ RK3528_CLKGATE_CON(37), 4, GFLAGS), ++ GATE(CLK_UART_JTAG, "clk_uart_jtag", "xin24m", 0, ++ RK3528_CLKGATE_CON(37), 0, GFLAGS), ++#endif ++ COMPOSITE_NODIV(CLK_SPI0, "clk_spi0", mux_200m_100m_50m_24m_p, 0, ++ RK3528_CLKSEL_CON(79), 13, 2, MFLAGS, ++ RK3528_CLKGATE_CON(37), 3, GFLAGS), ++ COMPOSITE_NODIV(MCLK_SAI_I2S1, "mclk_sai_i2s1", mclk_sai_i2s1_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(79), 8, 1, MFLAGS, ++ RK3528_CLKGATE_CON(36), 10, GFLAGS), ++ GATE(DBCLK_GPIO4, "dbclk_gpio4", "xin24m", 0, ++ RK3528_CLKGATE_CON(37), 9, GFLAGS), ++ ++ /* vo */ ++ COMPOSITE_NODIV(HCLK_VO_ROOT, "hclk_vo_root", mux_150m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(83), 2, 2, MFLAGS, ++ RK3528_CLKGATE_CON(39), 1, GFLAGS), ++ GATE(HCLK_VOP, "hclk_vop", "hclk_vo_root", 0, ++ RK3528_CLKGATE_CON(40), 2, GFLAGS), ++ GATE(HCLK_USBHOST, "hclk_usbhost", "hclk_vo_root", 0, ++ RK3528_CLKGATE_CON(43), 3, GFLAGS), ++ GATE(HCLK_JPEG_DECODER, "hclk_jpeg_decoder", "hclk_vo_root", 0, ++ RK3528_CLKGATE_CON(41), 7, GFLAGS), ++ GATE(HCLK_VDPP, "hclk_vdpp", "hclk_vo_root", 0, ++ RK3528_CLKGATE_CON(39), 10, GFLAGS), ++ GATE(HCLK_CVBS, "hclk_cvbs", "hclk_vo_root", 0, ++ RK3528_CLKGATE_CON(41), 3, GFLAGS), ++ GATE(HCLK_USBHOST_ARB, "hclk_usbhost_arb", "hclk_vo_root", 0, ++ RK3528_CLKGATE_CON(43), 4, GFLAGS), ++ GATE(HCLK_SAI_I2S3, "hclk_sai_i2s3", "hclk_vo_root", 0, ++ RK3528_CLKGATE_CON(42), 1, GFLAGS), ++ GATE(HCLK_HDCP, "hclk_hdcp", "hclk_vo_root", 0, ++ RK3528_CLKGATE_CON(41), 1, GFLAGS), ++ GATE(HCLK_RGA2E, "hclk_rga2e", "hclk_vo_root", 0, ++ RK3528_CLKGATE_CON(39), 7, GFLAGS), ++ GATE(HCLK_SDMMC0, "hclk_sdmmc0", "hclk_vo_root", 0, ++ RK3528_CLKGATE_CON(42), 9, GFLAGS), ++ GATE(HCLK_HDCP_KEY, "hclk_hdcp_key", "hclk_vo_root", 0, ++ RK3528_CLKGATE_CON(40), 15, GFLAGS), ++ ++ COMPOSITE_NODIV(ACLK_VO_L_ROOT, "aclk_vo_l_root", mux_150m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(84), 1, 2, MFLAGS, ++ RK3528_CLKGATE_CON(41), 8, GFLAGS), ++ GATE(ACLK_MAC_VO, "aclk_gmac0", "aclk_vo_l_root", 0, ++ RK3528_CLKGATE_CON(41), 10, GFLAGS), ++ ++ COMPOSITE_NODIV(PCLK_VO_ROOT, "pclk_vo_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(83), 4, 2, MFLAGS, ++ RK3528_CLKGATE_CON(39), 2, GFLAGS), ++ GATE(PCLK_MAC_VO, "pclk_gmac0", "pclk_vo_root", 0, ++ RK3528_CLKGATE_CON(41), 11, GFLAGS), ++ GATE(PCLK_VCDCPHY, "pclk_vcdcphy", "pclk_vo_root", 0, ++ RK3528_CLKGATE_CON(42), 4, GFLAGS), ++ GATE(PCLK_GPIO2, "pclk_gpio2", "pclk_vo_root", 0, ++ RK3528_CLKGATE_CON(42), 5, GFLAGS), ++ GATE(PCLK_VO_IOC, "pclk_vo_ioc", "pclk_vo_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(42), 7, GFLAGS), ++ GATE(PCLK_OTPC_NS, "pclk_otpc_ns", "pclk_vo_root", 0, ++ RK3528_CLKGATE_CON(42), 11, GFLAGS), ++ GATE(PCLK_UART4, "pclk_uart4", "pclk_vo_root", 0, ++ RK3528_CLKGATE_CON(43), 7, GFLAGS), ++ GATE(PCLK_I2C4, "pclk_i2c4", "pclk_vo_root", 0, ++ RK3528_CLKGATE_CON(43), 9, GFLAGS), ++ GATE(PCLK_I2C7, "pclk_i2c7", "pclk_vo_root", 0, ++ RK3528_CLKGATE_CON(43), 11, GFLAGS), ++ ++ GATE(PCLK_USBPHY, "pclk_usbphy", "pclk_vo_root", 0, ++ RK3528_CLKGATE_CON(43), 13, GFLAGS), ++ ++ GATE(PCLK_VO_GRF, "pclk_vo_grf", "pclk_vo_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(39), 13, GFLAGS), ++ GATE(PCLK_CRU, "pclk_cru", "pclk_vo_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(39), 15, GFLAGS), ++ GATE(PCLK_HDMI, "pclk_hdmi", "pclk_vo_root", 0, ++ RK3528_CLKGATE_CON(40), 6, GFLAGS), ++ GATE(PCLK_HDMIPHY, "pclk_hdmiphy", "pclk_vo_root", 0, ++ RK3528_CLKGATE_CON(40), 14, GFLAGS), ++ GATE(PCLK_HDCP, "pclk_hdcp", "pclk_vo_root", 0, ++ RK3528_CLKGATE_CON(41), 2, GFLAGS), ++ ++ COMPOSITE_NODIV(CLK_CORE_VDPP, "clk_core_vdpp", mux_339m_200m_100m_24m_p, 0, ++ RK3528_CLKSEL_CON(83), 10, 2, MFLAGS, ++ RK3528_CLKGATE_CON(39), 12, GFLAGS), ++ COMPOSITE_NODIV(CLK_CORE_RGA2E, "clk_core_rga2e", mux_339m_200m_100m_24m_p, 0, ++ RK3528_CLKSEL_CON(83), 8, 2, MFLAGS, ++ RK3528_CLKGATE_CON(39), 9, GFLAGS), ++ COMPOSITE_NODIV(ACLK_JPEG_ROOT, "aclk_jpeg_root", mux_339m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(84), 9, 2, MFLAGS, ++ RK3528_CLKGATE_CON(41), 15, GFLAGS), ++ GATE(ACLK_JPEG_DECODER, "aclk_jpeg_decoder", "aclk_jpeg_root", 0, ++ RK3528_CLKGATE_CON(41), 6, GFLAGS), ++ ++ COMPOSITE_NODIV(ACLK_VO_ROOT, "aclk_vo_root", mux_339m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(83), 0, 2, MFLAGS, ++ RK3528_CLKGATE_CON(39), 0, GFLAGS), ++ GATE_NO_SET_RATE(ACLK_RGA2E, "aclk_rga2e", "aclk_vo_root", 0, ++ RK3528_CLKGATE_CON(39), 8, GFLAGS), ++ GATE_NO_SET_RATE(ACLK_VDPP, "aclk_vdpp", "aclk_vo_root", 0, ++ RK3528_CLKGATE_CON(39), 11, GFLAGS), ++ GATE_NO_SET_RATE(ACLK_HDCP, "aclk_hdcp", "aclk_vo_root", 0, ++ RK3528_CLKGATE_CON(41), 0, GFLAGS), ++ ++ COMPOSITE(CCLK_SRC_SDMMC0, "cclk_src_sdmmc0", mux_gpll_cpll_xin24m_p, 0, ++ RK3528_CLKSEL_CON(85), 6, 2, MFLAGS, 0, 6, DFLAGS, ++ RK3528_CLKGATE_CON(42), 8, GFLAGS), ++ ++ COMPOSITE(ACLK_VOP_ROOT, "aclk_vop_root", mux_gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(83), 15, 1, MFLAGS, 12, 3, DFLAGS, ++ RK3528_CLKGATE_CON(40), 0, GFLAGS), ++ GATE(ACLK_VOP, "aclk_vop", "aclk_vop_root", 0, ++ RK3528_CLKGATE_CON(40), 5, GFLAGS), ++ ++ COMPOSITE_NODIV(CLK_I2C4, "clk_i2c4", mux_200m_100m_50m_24m_p, 0, ++ RK3528_CLKSEL_CON(85), 13, 2, MFLAGS, ++ RK3528_CLKGATE_CON(43), 10, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C7, "clk_i2c7", mux_200m_100m_50m_24m_p, 0, ++ RK3528_CLKSEL_CON(86), 0, 2, MFLAGS, ++ RK3528_CLKGATE_CON(43), 12, GFLAGS), ++ GATE(DBCLK_GPIO2, "dbclk_gpio2", "xin24m", 0, ++ RK3528_CLKGATE_CON(42), 6, GFLAGS), ++ ++ GATE(CLK_HDMIHDP0, "clk_hdmihdp0", "xin24m", 0, ++ RK3528_CLKGATE_CON(43), 2, GFLAGS), ++ GATE(CLK_MACPHY, "clk_macphy", "xin24m", 0, ++ RK3528_CLKGATE_CON(42), 3, GFLAGS), ++ GATE(CLK_REF_USBPHY, "clk_ref_usbphy", "xin24m", 0, ++ RK3528_CLKGATE_CON(43), 14, GFLAGS), ++ GATE(CLK_SBPI_OTPC_NS, "clk_sbpi_otpc_ns", "xin24m", 0, ++ RK3528_CLKGATE_CON(42), 12, GFLAGS), ++ FACTOR(CLK_USER_OTPC_NS, "clk_user_otpc_ns", "clk_sbpi_otpc_ns", 0, 1, 2), ++ ++ GATE(MCLK_SAI_I2S3, "mclk_sai_i2s3", "mclk_i2s3_8ch_sai_src", 0, ++ RK3528_CLKGATE_CON(42), 2, GFLAGS), ++ COMPOSITE_NODIV(DCLK_VOP0, "dclk_vop0", dclk_vop0_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, ++ RK3528_CLKSEL_CON(84), 0, 1, MFLAGS, ++ RK3528_CLKGATE_CON(40), 3, GFLAGS), ++ GATE(DCLK_VOP1, "dclk_vop1", "dclk_vop_src1", CLK_SET_RATE_PARENT, ++ RK3528_CLKGATE_CON(40), 4, GFLAGS), ++ FACTOR_GATE(DCLK_CVBS, "dclk_cvbs", "dclk_vop1", 0, 1, 4, ++ RK3528_CLKGATE_CON(41), 4, GFLAGS), ++ GATE(DCLK_4X_CVBS, "dclk_4x_cvbs", "dclk_vop1", 0, ++ RK3528_CLKGATE_CON(41), 5, GFLAGS), ++ ++ FACTOR_GATE(CLK_SFR_HDMI, "clk_sfr_hdmi", "dclk_vop_src1", 0, 1, 4, ++ RK3528_CLKGATE_CON(40), 7, GFLAGS), ++ ++ GATE(CLK_SPDIF_HDMI, "clk_spdif_hdmi", "mclk_spdif_src", 0, ++ RK3528_CLKGATE_CON(40), 10, GFLAGS), ++ GATE(MCLK_SPDIF, "mclk_spdif", "mclk_spdif_src", 0, ++ RK3528_CLKGATE_CON(37), 15, GFLAGS), ++ GATE(CLK_CEC_HDMI, "clk_cec_hdmi", "clk_32k", 0, ++ RK3528_CLKGATE_CON(40), 8, GFLAGS), ++#if 0 ++ GATE(CLK_USBHOST_OHCI, "clk_usbhost_ohci", "clk_usbhost_ohci_io", 0, ++ RK3528_CLKGATE_CON(43), 5, GFLAGS), ++ GATE(CLK_USBHOST_UTMI, "clk_usbhost_utmi", "clk_usbhost_utmi_io", 0, ++ RK3528_CLKGATE_CON(43), 6, GFLAGS), ++ GATE(CLK_HDMIPHY_TMDSSRC, "clk_hdmiphy_tmdssrc", "clk_hdmiphy_tmdssrc_io", 0, ++ RK3528_CLKGATE_CON(40), 11, GFLAGS), ++ GATE(CLK_HDMIPHY_PREP, "clk_hdmiphy_prep", "clk_hdmiphy_prep_io", 0, ++ RK3528_CLKGATE_CON(40), 12, GFLAGS), ++#endif ++ /* vpu */ ++ GATE(DBCLK_GPIO1, "dbclk_gpio1", "xin24m", 0, ++ RK3528_CLKGATE_CON(26), 5, GFLAGS), ++ GATE(DBCLK_GPIO3, "dbclk_gpio3", "xin24m", 0, ++ RK3528_CLKGATE_CON(27), 1, GFLAGS), ++ GATE(CLK_SUSPEND_USB3OTG, "clk_suspend_usb3otg", "xin24m", 0, ++ RK3528_CLKGATE_CON(33), 4, GFLAGS), ++ GATE(CLK_PCIE_AUX, "clk_pcie_aux", "xin24m", 0, ++ RK3528_CLKGATE_CON(30), 2, GFLAGS), ++ GATE(TCLK_EMMC, "tclk_emmc", "xin24m", 0, ++ RK3528_CLKGATE_CON(26), 3, GFLAGS), ++ GATE(CLK_REF_USB3OTG, "clk_ref_usb3otg", "xin24m", 0, ++ RK3528_CLKGATE_CON(33), 2, GFLAGS), ++ COMPOSITE(CCLK_SRC_SDIO0, "cclk_src_sdio0", mux_gpll_cpll_xin24m_p, 0, ++ RK3528_CLKSEL_CON(72), 6, 2, MFLAGS, 0, 6, DFLAGS, ++ RK3528_CLKGATE_CON(32), 1, GFLAGS), ++ ++ COMPOSITE_NODIV(PCLK_VPU_ROOT, "pclk_vpu_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(61), 4, 2, MFLAGS, ++ RK3528_CLKGATE_CON(25), 5, GFLAGS), ++ GATE(PCLK_VPU_GRF, "pclk_vpu_grf", "pclk_vpu_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(25), 12, GFLAGS), ++ GATE(PCLK_CRU_PCIE, "pclk_cru_pcie", "pclk_vpu_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(25), 11, GFLAGS), ++ GATE(PCLK_UART6, "pclk_uart6", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(27), 11, GFLAGS), ++ GATE(PCLK_CAN2, "pclk_can2", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(32), 7, GFLAGS), ++ GATE(PCLK_SPI1, "pclk_spi1", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(27), 4, GFLAGS), ++ GATE(PCLK_CAN3, "pclk_can3", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(32), 9, GFLAGS), ++ GATE(PCLK_GPIO3, "pclk_gpio3", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(27), 0, GFLAGS), ++ GATE(PCLK_GPIO1, "pclk_gpio1", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(26), 4, GFLAGS), ++ GATE(PCLK_SARADC, "pclk_saradc", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(32), 11, GFLAGS), ++ GATE(PCLK_ACODEC, "pclk_acodec", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(26), 13, GFLAGS), ++ GATE(PCLK_UART7, "pclk_uart7", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(27), 13, GFLAGS), ++ GATE(PCLK_UART5, "pclk_uart5", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(27), 9, GFLAGS), ++ GATE(PCLK_TSADC, "pclk_tsadc", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(32), 14, GFLAGS), ++ GATE(PCLK_PCIE, "pclk_pcie", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(30), 1, GFLAGS), ++ GATE(PCLK_UART2, "pclk_uart2", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(27), 7, GFLAGS), ++ GATE(PCLK_VPU_IOC, "pclk_vpu_ioc", "pclk_vpu_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(26), 8, GFLAGS), ++ GATE(PCLK_PIPE_GRF, "pclk_pipe_grf", "pclk_vpu_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(30), 7, GFLAGS), ++ GATE(PCLK_I2C5, "pclk_i2c5", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(28), 1, GFLAGS), ++ GATE(PCLK_PCIE_PHY, "pclk_pcie_phy", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(30), 6, GFLAGS), ++ GATE(PCLK_I2C3, "pclk_i2c3", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(27), 15, GFLAGS), ++ GATE(PCLK_MAC_VPU, "pclk_gmac1", "pclk_vpu_root", CLK_IS_CRITICAL, ++ RK3528_CLKGATE_CON(28), 6, GFLAGS), ++ GATE(PCLK_I2C6, "pclk_i2c6", "pclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(28), 3, GFLAGS), ++ ++ COMPOSITE_NODIV(ACLK_VPU_L_ROOT, "aclk_vpu_l_root", mux_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(60), 0, 2, MFLAGS, ++ RK3528_CLKGATE_CON(25), 0, GFLAGS), ++ GATE_NO_SET_RATE(ACLK_EMMC, "aclk_emmc", "aclk_vpu_l_root", 0, ++ RK3528_CLKGATE_CON(26), 1, GFLAGS), ++ GATE_NO_SET_RATE(ACLK_MAC_VPU, "aclk_gmac1", "aclk_vpu_l_root", 0, ++ RK3528_CLKGATE_CON(28), 5, GFLAGS), ++ GATE_NO_SET_RATE(ACLK_PCIE, "aclk_pcie", "aclk_vpu_l_root", 0, ++ RK3528_CLKGATE_CON(30), 3, GFLAGS), ++ ++ GATE_NO_SET_RATE(ACLK_USB3OTG, "aclk_usb3otg", "aclk_vpu_l_root", 0, ++ RK3528_CLKGATE_CON(33), 1, GFLAGS), ++ ++ COMPOSITE_NODIV(HCLK_VPU_ROOT, "hclk_vpu_root", mux_200m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(61), 2, 2, MFLAGS, ++ RK3528_CLKGATE_CON(25), 4, GFLAGS), ++ GATE(HCLK_VPU, "hclk_vpu", "hclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(25), 10, GFLAGS), ++ GATE(HCLK_SFC, "hclk_sfc", "hclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(25), 13, GFLAGS), ++ GATE(HCLK_EMMC, "hclk_emmc", "hclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(26), 0, GFLAGS), ++ GATE(HCLK_SAI_I2S0, "hclk_sai_i2s0", "hclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(26), 9, GFLAGS), ++ GATE(HCLK_SAI_I2S2, "hclk_sai_i2s2", "hclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(26), 11, GFLAGS), ++ ++ GATE(HCLK_PCIE_SLV, "hclk_pcie_slv", "hclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(30), 4, GFLAGS), ++ GATE(HCLK_PCIE_DBI, "hclk_pcie_dbi", "hclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(30), 5, GFLAGS), ++ GATE(HCLK_SDIO0, "hclk_sdio0", "hclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(32), 2, GFLAGS), ++ GATE(HCLK_SDIO1, "hclk_sdio1", "hclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(32), 4, GFLAGS), ++ ++ COMPOSITE_NOMUX(CLK_GMAC1_VPU_25M, "clk_gmac1_25m", "ppll", 0, ++ RK3528_CLKSEL_CON(60), 2, 8, DFLAGS, ++ RK3528_CLKGATE_CON(25), 1, GFLAGS), ++ COMPOSITE_NOMUX(CLK_PPLL_125M_MATRIX, "clk_ppll_125m_src", "ppll", 0, ++ RK3528_CLKSEL_CON(60), 10, 5, DFLAGS, ++ RK3528_CLKGATE_CON(25), 2, GFLAGS), ++ ++ COMPOSITE(CLK_CAN3, "clk_can3", mux_gpll_cpll_p, 0, ++ RK3528_CLKSEL_CON(73), 13, 1, MFLAGS, 7, 6, DFLAGS, ++ RK3528_CLKGATE_CON(32), 10, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C6, "clk_i2c6", mux_200m_100m_50m_24m_p, 0, ++ RK3528_CLKSEL_CON(64), 0, 2, MFLAGS, ++ RK3528_CLKGATE_CON(28), 4, GFLAGS), ++ ++ COMPOSITE(SCLK_SFC, "sclk_sfc", mux_gpll_cpll_xin24m_p, 0, ++ RK3528_CLKSEL_CON(61), 12, 2, MFLAGS, 6, 6, DFLAGS, ++ RK3528_CLKGATE_CON(25), 14, GFLAGS), ++ COMPOSITE(CCLK_SRC_EMMC, "cclk_src_emmc", mux_gpll_cpll_xin24m_p, 0, ++ RK3528_CLKSEL_CON(62), 6, 2, MFLAGS, 0, 6, DFLAGS, ++ RK3528_CLKGATE_CON(25), 15, GFLAGS), ++ ++ COMPOSITE_NODIV(ACLK_VPU_ROOT, "aclk_vpu_root", mux_300m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3528_CLKSEL_CON(61), 0, 2, MFLAGS, ++ RK3528_CLKGATE_CON(25), 3, GFLAGS), ++ GATE(ACLK_VPU, "aclk_vpu", "aclk_vpu_root", 0, ++ RK3528_CLKGATE_CON(25), 9, GFLAGS), ++ ++ COMPOSITE_NODIV(CLK_SPI1, "clk_spi1", mux_200m_100m_50m_24m_p, 0, ++ RK3528_CLKSEL_CON(63), 10, 2, MFLAGS, ++ RK3528_CLKGATE_CON(27), 5, GFLAGS), ++ COMPOSITE(CCLK_SRC_SDIO1, "cclk_src_sdio1", mux_gpll_cpll_xin24m_p, 0, ++ RK3528_CLKSEL_CON(72), 14, 2, MFLAGS, 8, 6, DFLAGS, ++ RK3528_CLKGATE_CON(32), 3, GFLAGS), ++ COMPOSITE(CLK_CAN2, "clk_can2", mux_gpll_cpll_p, 0, ++ RK3528_CLKSEL_CON(73), 6, 1, MFLAGS, 0, 6, DFLAGS, ++ RK3528_CLKGATE_CON(32), 8, GFLAGS), ++ COMPOSITE_NOMUX(CLK_TSADC, "clk_tsadc", "xin24m", 0, ++ RK3528_CLKSEL_CON(74), 3, 5, DFLAGS, ++ RK3528_CLKGATE_CON(32), 15, GFLAGS), ++ COMPOSITE_NOMUX(CLK_SARADC, "clk_saradc", "xin24m", 0, ++ RK3528_CLKSEL_CON(74), 0, 3, DFLAGS, ++ RK3528_CLKGATE_CON(32), 12, GFLAGS), ++ COMPOSITE_NOMUX(CLK_TSADC_TSEN, "clk_tsadc_tsen", "xin24m", 0, ++ RK3528_CLKSEL_CON(74), 8, 5, DFLAGS, ++ RK3528_CLKGATE_CON(33), 0, GFLAGS), ++ COMPOSITE_NODIV(BCLK_EMMC, "bclk_emmc", mux_200m_100m_50m_24m_p, 0, ++ RK3528_CLKSEL_CON(62), 8, 2, MFLAGS, ++ RK3528_CLKGATE_CON(26), 2, GFLAGS), ++ COMPOSITE_NOMUX(MCLK_ACODEC_TX, "mclk_acodec_tx", "mclk_i2s2_2ch_sai_src", 0, ++ RK3528_CLKSEL_CON(63), 0, 8, DFLAGS, ++ RK3528_CLKGATE_CON(26), 14, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C3, "clk_i2c3", mux_200m_100m_50m_24m_p, 0, ++ RK3528_CLKSEL_CON(63), 12, 2, MFLAGS, ++ RK3528_CLKGATE_CON(28), 0, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C5, "clk_i2c5", mux_200m_100m_50m_24m_p, 0, ++ RK3528_CLKSEL_CON(63), 14, 2, MFLAGS, ++ RK3528_CLKGATE_CON(28), 2, GFLAGS), ++ COMPOSITE_NODIV(MCLK_SAI_I2S0, "mclk_sai_i2s0", mclk_sai_i2s0_p, CLK_SET_RATE_PARENT, ++ RK3528_CLKSEL_CON(62), 10, 1, MFLAGS, ++ RK3528_CLKGATE_CON(26), 10, GFLAGS), ++ GATE(MCLK_SAI_I2S2, "mclk_sai_i2s2", "mclk_i2s2_2ch_sai_src", 0, ++ RK3528_CLKGATE_CON(26), 12, GFLAGS), ++#if 0 ++ GATE(SCLK_IN_SPI1, "sclk_in_spi1", "sclk_in_spi1_io", 0, ++ RK3528_CLKGATE_CON(27), 6, GFLAGS), ++ ++ /* vpuphy */ ++ GATE(CLK_PIPE_USB3OTG_COMBO, "clk_pipe_usb3otg_combo", "clk_pipe_usb3otg_io", 0, ++ RK3528_CLKGATE_CON(31), 0, GFLAGS), ++ GATE(CLK_UTMI_USB3OTG, "clk_utmi_usb3otg", "clk_utmi_usb3otg_io", 0, ++ RK3528_CLKGATE_CON(31), 1, GFLAGS), ++ GATE(CLK_PCIE_PIPE_PHY, "clk_pcie_pipe_phy", "clk_pipe_usb3otg_io", 0, ++ RK3528_CLKGATE_CON(31), 2, GFLAGS), ++#endif ++ /* pcie */ ++ COMPOSITE_NOMUX(CLK_PPLL_100M_MATRIX, "clk_ppll_100m_src", "ppll", CLK_IS_CRITICAL, ++ RK3528_PCIE_CLKSEL_CON(1), 2, 5, DFLAGS, ++ RK3528_PCIE_CLKGATE_CON(0), 1, GFLAGS), ++ COMPOSITE_NOMUX(CLK_PPLL_50M_MATRIX, "clk_ppll_50m_src", "ppll", CLK_IS_CRITICAL, ++ RK3528_PCIE_CLKSEL_CON(1), 7, 5, DFLAGS, ++ RK3528_PCIE_CLKGATE_CON(0), 2, GFLAGS), ++ MUX(CLK_REF_PCIE_INNER_PHY, "clk_ref_pcie_inner_phy", clk_ref_pcie_inner_phy_p, 0, ++ RK3528_PCIE_CLKSEL_CON(1), 13, 1, MFLAGS), ++ FACTOR(CLK_REF_PCIE_100M_PHY, "clk_ref_pcie_100m_phy", "clk_ppll_100m_src", 0, 1, 1), ++ ++ /* gmac */ ++ FACTOR(CLK_GMAC1_RMII_VPU, "clk_gmac1_50m", "clk_ppll_50m_src", 0, 1, 1), ++ FACTOR(CLK_GMAC1_SRC_VPU, "clk_gmac1_125m", "clk_ppll_125m_src", 0, 1, 1), ++ ++ /* they are orphans */ ++ DIV(CLK_GMAC0_SRC, "clk_gmac0_src", "clk_gmac0_io_i", 0, ++ RK3528_CLKSEL_CON(84), 3, 6, DFLAGS), ++ GATE(CLK_GMAC0_TX, "clk_gmac0_tx", "clk_gmac0_src", 0, ++ RK3528_CLKGATE_CON(41), 13, GFLAGS), ++ GATE(CLK_GMAC0_RX, "clk_gmac0_rx", "clk_gmac0_src", 0, ++ RK3528_CLKGATE_CON(41), 14, GFLAGS), ++ GATE(CLK_GMAC0_RMII_50M, "clk_gmac0_rmii_50m", "clk_gmac0_io_i", 0, ++ RK3528_CLKGATE_CON(41), 12, GFLAGS), ++ GATE(CLK_SCRKEYGEN, "clk_scrkeygen", "clk_pmupvtm_out", 0, ++ RK3528_PMU_CLKGATE_CON(2), 0, GFLAGS), ++ GATE(CLK_PVTM_OSCCHK, "clk_pvtm_oscchk", "clk_pmupvtm_out", 0, ++ RK3528_PMU_CLKGATE_CON(2), 1, GFLAGS), ++}; ++ ++static struct rockchip_clk_branch rk3528_grf_clk_branches[] __initdata = { ++ MMC(SCLK_SDMMC_DRV, "sdmmc_drv", "cclk_src_sdmmc0", RK3528_SDMMC_CON0, 1), ++ MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "cclk_src_sdmmc0", RK3528_SDMMC_CON1, 1), ++ MMC(SCLK_SDIO0_DRV, "sdio0_drv", "cclk_src_sdio0", RK3528_SDIO0_CON0, 1), ++ MMC(SCLK_SDIO0_SAMPLE, "sdio0_sample", "cclk_src_sdio0", RK3528_SDIO0_CON1, 1), ++ MMC(SCLK_SDIO1_DRV, "sdio1_drv", "cclk_src_sdio1", RK3528_SDIO1_CON0, 1), ++ MMC(SCLK_SDIO1_SAMPLE, "sdio1_sample", "cclk_src_sdio1", RK3528_SDIO1_CON1, 1), ++}; ++ ++static void __iomem *rk3528_cru_base; ++ ++static void rk3528_dump_cru(void) ++{ ++ if (rk3528_cru_base) { ++ pr_warn("CRU:\n"); ++ print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, ++ 32, 4, rk3528_cru_base, ++ 0x8b8, false); ++ pr_warn("PCIE CRU:\n"); ++ print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, ++ 32, 4, rk3528_cru_base + RK3528_PCIE_CRU_BASE, ++ 0x804, false); ++ pr_warn("DDRPHY CRU:\n"); ++ print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, ++ 32, 4, rk3528_cru_base + RK3528_DDRPHY_CRU_BASE, ++ 0x804, false); ++ } ++} ++ ++static void __init rk3528_clk_init(struct device_node *np) ++{ ++ struct rockchip_clk_provider *ctx; ++ void __iomem *reg_base; ++ struct clk **clks; ++ ++ reg_base = of_iomap(np, 0); ++ if (!reg_base) { ++ pr_err("%s: could not map cru region\n", __func__); ++ return; ++ } ++ ++ rk3528_cru_base = reg_base; ++ ++ ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS); ++ if (IS_ERR(ctx)) { ++ pr_err("%s: rockchip clk init failed\n", __func__); ++ iounmap(reg_base); ++ return; ++ } ++ clks = ctx->clk_data.clks; ++ ++ rockchip_clk_register_plls(ctx, rk3528_pll_clks, ++ ARRAY_SIZE(rk3528_pll_clks), ++ RK3528_GRF_SOC_STATUS0); ++ ++ rockchip_clk_register_armclk(ctx, ARMCLK, "armclk", ++ 2, clks[PLL_APLL], clks[PLL_GPLL], ++ &rk3528_cpuclk_data, rk3528_cpuclk_rates, ++ ARRAY_SIZE(rk3528_cpuclk_rates)); ++ rockchip_clk_register_branches(ctx, rk3528_clk_branches, ++ ARRAY_SIZE(rk3528_clk_branches)); ++ ++ rockchip_register_softrst(np, 47, reg_base + RK3528_SOFTRST_CON(0), ++ ROCKCHIP_SOFTRST_HIWORD_MASK); ++ rockchip_register_restart_notifier(ctx, RK3528_GLB_SRST_FST, NULL); ++ ++ rockchip_clk_of_add_provider(np, ctx); ++ ++ if (!rk_dump_cru) ++ rk_dump_cru = rk3528_dump_cru; ++ ++} ++ ++CLK_OF_DECLARE(rk3528_cru, "rockchip,rk3528-cru", rk3528_clk_init); ++ ++static void __init rk3528_grf_clk_init(struct device_node *np) ++{ ++ struct rockchip_clk_provider *ctx; ++ void __iomem *reg_base; ++ ++ reg_base = of_iomap(of_get_parent(np), 0); ++ if (!reg_base) { ++ pr_err("%s: could not map cru grf region\n", __func__); ++ return; ++ } ++ ++ ctx = rockchip_clk_init(np, reg_base, CLK_NR_GRF_CLKS); ++ if (IS_ERR(ctx)) { ++ pr_err("%s: rockchip grf clk init failed\n", __func__); ++ return; ++ } ++ ++ rockchip_clk_register_branches(ctx, rk3528_grf_clk_branches, ++ ARRAY_SIZE(rk3528_grf_clk_branches)); ++ ++ rockchip_clk_of_add_provider(np, ctx); ++} ++ ++CLK_OF_DECLARE(rk3528_grf_cru, "rockchip,rk3528-grf-cru", rk3528_grf_clk_init); ++ +diff --git a/drivers/clk/rockchip/clk-rk3562.c b/drivers/clk/rockchip/clk-rk3562.c +new file mode 100644 +index 000000000..3c6f78fec +--- /dev/null ++++ b/drivers/clk/rockchip/clk-rk3562.c +@@ -0,0 +1,1134 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (c) 2022 Rockchip Electronics Co. Ltd. ++ * Author: Elaine Zhang ++ * Author: Finley Xiao ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "clk.h" ++ ++#define RK3562_GRF_SOC_STATUS0 0x430 ++ ++enum rk3562_plls { ++ apll, gpll, vpll, hpll, cpll, dpll, ++}; ++ ++static struct rockchip_pll_rate_table rk3562_pll_rates[] = { ++ /* _mhz, _refdiv, _fbdiv, _postdiv1, _postdiv2, _dsmpd, _frac */ ++ RK3036_PLL_RATE(2208000000, 1, 92, 1, 1, 1, 0), ++ RK3036_PLL_RATE(2184000000, 1, 91, 1, 1, 1, 0), ++ RK3036_PLL_RATE(2160000000, 1, 90, 1, 1, 1, 0), ++ RK3036_PLL_RATE(2088000000, 1, 87, 1, 1, 1, 0), ++ RK3036_PLL_RATE(2064000000, 1, 86, 1, 1, 1, 0), ++ RK3036_PLL_RATE(2040000000, 1, 85, 1, 1, 1, 0), ++ RK3036_PLL_RATE(2016000000, 1, 84, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1992000000, 1, 83, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1920000000, 1, 80, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1896000000, 1, 79, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1800000000, 1, 75, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1704000000, 1, 71, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1608000000, 1, 67, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1600000000, 3, 200, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1584000000, 1, 132, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1560000000, 1, 130, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1536000000, 1, 128, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1512000000, 1, 126, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1488000000, 1, 124, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1464000000, 1, 122, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1440000000, 1, 120, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1416000000, 1, 118, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1400000000, 3, 350, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1392000000, 1, 116, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1368000000, 1, 114, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1344000000, 1, 112, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1320000000, 1, 110, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1296000000, 1, 108, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1272000000, 1, 106, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1248000000, 1, 104, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1200000000, 1, 100, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1188000000, 1, 99, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1104000000, 1, 92, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1100000000, 3, 275, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1008000000, 1, 84, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1000000000, 3, 250, 2, 1, 1, 0), ++ RK3036_PLL_RATE(912000000, 1, 76, 2, 1, 1, 0), ++ RK3036_PLL_RATE(816000000, 1, 68, 2, 1, 1, 0), ++ RK3036_PLL_RATE(800000000, 3, 200, 2, 1, 1, 0), ++ RK3036_PLL_RATE(700000000, 3, 350, 4, 1, 1, 0), ++ RK3036_PLL_RATE(696000000, 1, 116, 4, 1, 1, 0), ++ RK3036_PLL_RATE(600000000, 1, 100, 4, 1, 1, 0), ++ RK3036_PLL_RATE(594000000, 1, 99, 4, 1, 1, 0), ++ RK3036_PLL_RATE(500000000, 1, 125, 6, 1, 1, 0), ++ RK3036_PLL_RATE(408000000, 1, 68, 2, 2, 1, 0), ++ RK3036_PLL_RATE(312000000, 1, 78, 6, 1, 1, 0), ++ RK3036_PLL_RATE(216000000, 1, 72, 4, 2, 1, 0), ++ RK3036_PLL_RATE(200000000, 1, 100, 3, 4, 1, 0), ++ RK3036_PLL_RATE(148500000, 1, 99, 4, 4, 1, 0), ++ RK3036_PLL_RATE(100000000, 1, 150, 6, 6, 1, 0), ++ RK3036_PLL_RATE(96000000, 1, 96, 6, 4, 1, 0), ++ RK3036_PLL_RATE(74250000, 2, 99, 4, 4, 1, 0), ++ { /* sentinel */ }, ++}; ++ ++PNAME(mux_pll_p) = { "xin24m" }; ++PNAME(gpll_cpll_p) = { "gpll", "cpll" }; ++PNAME(gpll_cpll_hpll_p) = { "gpll", "cpll", "hpll" }; ++PNAME(gpll_cpll_pvtpll_dmyapll_p) = { "gpll", "cpll", "log_pvtpll", "dummy_apll" }; ++PNAME(gpll_cpll_hpll_xin24m_p) = { "gpll", "cpll", "hpll", "xin24m" }; ++PNAME(gpll_cpll_vpll_dmyhpll_p) = { "gpll", "cpll", "vpll", "dummy_hpll" }; ++PNAME(gpll_dmyhpll_vpll_apll_p) = { "gpll", "dummy_hpll", "vpll", "apll" }; ++PNAME(gpll_cpll_xin24m_p) = { "gpll", "cpll", "xin24m" }; ++PNAME(gpll_cpll_xin24m_dmyapll_p) = { "gpll", "cpll", "xin24m", "dummy_apll" }; ++PNAME(gpll_cpll_xin24m_dmyhpll_p) = { "gpll", "cpll", "xin24m", "dummy_hpll" }; ++PNAME(vpll_dmyhpll_gpll_cpll_p) = { "vpll", "dummy_hpll", "gpll", "cpll" }; ++PNAME(mux_xin24m_32k_p) = { "xin24m", "clk_rtc_32k" }; ++PNAME(mux_50m_xin24m_p) = { "clk_matrix_50m_src", "xin24m" }; ++PNAME(mux_100m_50m_xin24m_p) = { "clk_matrix_100m_src", "clk_matrix_50m_src", "xin24m" }; ++PNAME(mux_125m_xin24m_p) = { "clk_matrix_125m_src", "xin24m" }; ++PNAME(mux_200m_xin24m_32k_p) = { "clk_200m_pmu", "xin24m", "clk_rtc_32k" }; ++PNAME(mux_200m_100m_p) = { "clk_matrix_200m_src", "clk_matrix_100m_src" }; ++PNAME(mux_200m_100m_50m_xin24m_p) = { "clk_matrix_200m_src", "clk_matrix_100m_src", "clk_matrix_50m_src", "xin24m" }; ++PNAME(clk_sai0_p) = { "clk_sai0_src", "clk_sai0_frac", "xin_osc0_half", "mclk_sai0_from_io" }; ++PNAME(mclk_sai0_out2io_p) = { "mclk_sai0", "xin_osc0_half" }; ++PNAME(clk_sai1_p) = { "clk_sai1_src", "clk_sai1_frac", "xin_osc0_half", "mclk_sai1_from_io" }; ++PNAME(mclk_sai1_out2io_p) = { "mclk_sai1", "xin_osc0_half" }; ++PNAME(clk_sai2_p) = { "clk_sai2_src", "clk_sai2_frac", "xin_osc0_half", "mclk_sai2_from_io" }; ++PNAME(mclk_sai2_out2io_p) = { "mclk_sai2", "xin_osc0_half" }; ++PNAME(clk_spdif_p) = { "clk_spdif_src", "clk_spdif_frac", "xin_osc0_half" }; ++PNAME(clk_uart1_p) = { "clk_uart1_src", "clk_uart1_frac", "xin24m" }; ++PNAME(clk_uart2_p) = { "clk_uart2_src", "clk_uart2_frac", "xin24m" }; ++PNAME(clk_uart3_p) = { "clk_uart3_src", "clk_uart3_frac", "xin24m" }; ++PNAME(clk_uart4_p) = { "clk_uart4_src", "clk_uart4_frac", "xin24m" }; ++PNAME(clk_uart5_p) = { "clk_uart5_src", "clk_uart5_frac", "xin24m" }; ++PNAME(clk_uart6_p) = { "clk_uart6_src", "clk_uart6_frac", "xin24m" }; ++PNAME(clk_uart7_p) = { "clk_uart7_src", "clk_uart7_frac", "xin24m" }; ++PNAME(clk_uart8_p) = { "clk_uart8_src", "clk_uart8_frac", "xin24m" }; ++PNAME(clk_uart9_p) = { "clk_uart9_src", "clk_uart9_frac", "xin24m" }; ++PNAME(clk_rtc32k_pmu_p) = { "clk_rtc32k_frac", "xin32k", "clk_32k_pvtm" }; ++PNAME(clk_pmu1_uart0_p) = { "clk_pmu1_uart0_src", "clk_pmu1_uart0_frac", "xin24m" }; ++PNAME(clk_pipephy_ref_p) = { "clk_pipephy_div", "clk_pipephy_xin24m" }; ++PNAME(clk_usbphy_ref_p) = { "clk_usb2phy_xin24m", "clk_24m_sscsrc" }; ++PNAME(clk_mipidsi_ref_p) = { "clk_mipidsiphy_xin24m", "clk_24m_sscsrc" }; ++ ++static struct rockchip_pll_clock rk3562_pll_clks[] __initdata = { ++ [apll] = PLL(pll_rk3328, PLL_APLL, "apll", mux_pll_p, ++ 0, RK3562_PLL_CON(0), ++ RK3562_MODE_CON, 0, 0, ++ ROCKCHIP_PLL_ALLOW_POWER_DOWN, rk3562_pll_rates), ++ [gpll] = PLL(pll_rk3328, PLL_GPLL, "gpll", mux_pll_p, ++ 0, RK3562_PLL_CON(24), ++ RK3562_MODE_CON, 2, 3, 0, rk3562_pll_rates), ++ [vpll] = PLL(pll_rk3328, PLL_VPLL, "vpll", mux_pll_p, ++ 0, RK3562_PLL_CON(32), ++ RK3562_MODE_CON, 6, 4, ++ ROCKCHIP_PLL_ALLOW_POWER_DOWN, rk3562_pll_rates), ++ [hpll] = PLL(pll_rk3328, PLL_HPLL, "hpll", mux_pll_p, ++ 0, RK3562_PLL_CON(40), ++ RK3562_MODE_CON, 8, 5, ++ ROCKCHIP_PLL_ALLOW_POWER_DOWN, rk3562_pll_rates), ++ [cpll] = PLL(pll_rk3328, PLL_CPLL, "cpll", mux_pll_p, ++ 0, RK3562_PMU1_PLL_CON(0), ++ RK3562_PMU1_MODE_CON, 0, 2, 0, rk3562_pll_rates), ++ [dpll] = PLL(pll_rk3328, PLL_DPLL, "dpll", mux_pll_p, ++ CLK_IS_CRITICAL, RK3562_SUBDDR_PLL_CON(0), ++ RK3562_SUBDDR_MODE_CON, 0, 1, 0, NULL), ++}; ++ ++#define MFLAGS CLK_MUX_HIWORD_MASK ++#define DFLAGS CLK_DIVIDER_HIWORD_MASK ++#define GFLAGS (CLK_GATE_HIWORD_MASK | CLK_GATE_SET_TO_DISABLE) ++ ++static struct rockchip_clk_branch rk3562_clk_sai0_fracmux __initdata = ++ MUX(CLK_SAI0, "clk_sai0", clk_sai0_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(3), 6, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_clk_sai1_fracmux __initdata = ++ MUX(CLK_SAI1, "clk_sai1", clk_sai1_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(5), 6, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_clk_sai2_fracmux __initdata = ++ MUX(CLK_SAI2, "clk_sai2", clk_sai2_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(8), 6, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_clk_spdif_fracmux __initdata = ++ MUX(CLK_SPDIF, "clk_spdif", clk_spdif_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(15), 6, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_clk_uart1_fracmux __initdata = ++ MUX(CLK_UART1, "clk_uart1", clk_uart1_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(21), 14, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_clk_uart2_fracmux __initdata = ++ MUX(CLK_UART2, "clk_uart2", clk_uart2_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(23), 14, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_clk_uart3_fracmux __initdata = ++ MUX(CLK_UART3, "clk_uart3", clk_uart3_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(25), 14, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_clk_uart4_fracmux __initdata = ++ MUX(CLK_UART4, "clk_uart4", clk_uart4_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(27), 14, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_clk_uart5_fracmux __initdata = ++ MUX(CLK_UART5, "clk_uart5", clk_uart5_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(29), 14, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_clk_uart6_fracmux __initdata = ++ MUX(CLK_UART6, "clk_uart6", clk_uart6_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(31), 14, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_clk_uart7_fracmux __initdata = ++ MUX(CLK_UART7, "clk_uart7", clk_uart7_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(33), 14, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_clk_uart8_fracmux __initdata = ++ MUX(CLK_UART8, "clk_uart8", clk_uart8_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(35), 14, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_clk_uart9_fracmux __initdata = ++ MUX(CLK_UART9, "clk_uart9", clk_uart9_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(37), 14, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_rtc32k_pmu_fracmux __initdata = ++ MUX(CLK_RTC_32K, "clk_rtc_32k", clk_rtc32k_pmu_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, ++ RK3562_PMU0_CLKSEL_CON(1), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_clk_pmu1_uart0_fracmux __initdata = ++ MUX(CLK_PMU1_UART0, "clk_pmu1_uart0", clk_pmu1_uart0_p, CLK_SET_RATE_PARENT, ++ RK3562_PMU1_CLKSEL_CON(2), 6, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3562_clk_branches[] __initdata = { ++ /* ++ * CRU Clock-Architecture ++ */ ++ /* PD_TOP */ ++ COMPOSITE(CLK_MATRIX_50M_SRC, "clk_matrix_50m_src", gpll_cpll_p, 0, ++ RK3562_CLKSEL_CON(0), 7, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3562_CLKGATE_CON(0), 0, GFLAGS), ++ COMPOSITE(CLK_MATRIX_100M_SRC, "clk_matrix_100m_src", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3562_CLKSEL_CON(0), 15, 1, MFLAGS, 8, 4, DFLAGS, ++ RK3562_CLKGATE_CON(0), 1, GFLAGS), ++ COMPOSITE(CLK_MATRIX_125M_SRC, "clk_matrix_125m_src", gpll_cpll_p, 0, ++ RK3562_CLKSEL_CON(1), 7, 1, MFLAGS, 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(0), 2, GFLAGS), ++ COMPOSITE(CLK_MATRIX_200M_SRC, "clk_matrix_200m_src", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3562_CLKSEL_CON(2), 7, 1, MFLAGS, 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(0), 4, GFLAGS), ++ COMPOSITE(CLK_MATRIX_300M_SRC, "clk_matrix_300m_src", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3562_CLKSEL_CON(3), 7, 1, MFLAGS, 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(0), 6, GFLAGS), ++ COMPOSITE(ACLK_TOP, "aclk_top", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3562_CLKSEL_CON(5), 7, 1, MFLAGS, 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(1), 0, GFLAGS), ++ COMPOSITE(ACLK_TOP_VIO, "aclk_top_vio", gpll_cpll_p, 0, ++ RK3562_CLKSEL_CON(5), 15, 1, MFLAGS, 8, 4, DFLAGS, ++ RK3562_CLKGATE_CON(1), 1, GFLAGS), ++ COMPOSITE(CLK_24M_SSCSRC, "clk_24m_sscsrc", vpll_dmyhpll_gpll_cpll_p, 0, ++ RK3562_CLKSEL_CON(6), 6, 2, MFLAGS, 0, 6, DFLAGS, ++ RK3562_CLKGATE_CON(1), 9, GFLAGS), ++ COMPOSITE(CLK_CAM0_OUT2IO, "clk_cam0_out2io", gpll_cpll_xin24m_dmyapll_p, 0, ++ RK3562_CLKSEL_CON(8), 6, 2, MFLAGS, 0, 6, DFLAGS, ++ RK3562_CLKGATE_CON(1), 12, GFLAGS), ++ COMPOSITE(CLK_CAM1_OUT2IO, "clk_cam1_out2io", gpll_cpll_xin24m_dmyapll_p, 0, ++ RK3562_CLKSEL_CON(8), 14, 2, MFLAGS, 8, 6, DFLAGS, ++ RK3562_CLKGATE_CON(1), 13, GFLAGS), ++ COMPOSITE(CLK_CAM2_OUT2IO, "clk_cam2_out2io", gpll_cpll_xin24m_dmyapll_p, 0, ++ RK3562_CLKSEL_CON(9), 6, 2, MFLAGS, 0, 6, DFLAGS, ++ RK3562_CLKGATE_CON(1), 14, GFLAGS), ++ COMPOSITE(CLK_CAM3_OUT2IO, "clk_cam3_out2io", gpll_cpll_xin24m_dmyapll_p, 0, ++ RK3562_CLKSEL_CON(9), 14, 2, MFLAGS, 8, 6, DFLAGS, ++ RK3562_CLKGATE_CON(1), 15, GFLAGS), ++ FACTOR(0, "xin_osc0_half", "xin24m", 0, 1, 2), ++ ++ /* PD_BUS */ ++ COMPOSITE(ACLK_BUS, "aclk_bus", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3562_CLKSEL_CON(40), 7, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3562_CLKGATE_CON(18), 0, GFLAGS), ++ COMPOSITE(HCLK_BUS, "hclk_bus", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3562_CLKSEL_CON(40), 15, 1, MFLAGS, 8, 6, DFLAGS, ++ RK3562_CLKGATE_CON(18), 1, GFLAGS), ++ COMPOSITE(PCLK_BUS, "pclk_bus", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3562_CLKSEL_CON(41), 7, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3562_CLKGATE_CON(18), 2, GFLAGS), ++ GATE(PCLK_I2C1, "pclk_i2c1", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(19), 0, GFLAGS), ++ GATE(PCLK_I2C2, "pclk_i2c2", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(19), 1, GFLAGS), ++ GATE(PCLK_I2C3, "pclk_i2c3", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(19), 2, GFLAGS), ++ GATE(PCLK_I2C4, "pclk_i2c4", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(19), 3, GFLAGS), ++ GATE(PCLK_I2C5, "pclk_i2c5", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(19), 4, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C, "clk_i2c", mux_200m_100m_50m_xin24m_p, 0, ++ RK3562_CLKSEL_CON(41), 8, 2, MFLAGS, ++ RK3562_CLKGATE_CON(19), 5, GFLAGS), ++ GATE(CLK_I2C1, "clk_i2c1", "clk_i2c", 0, ++ RK3562_CLKGATE_CON(19), 6, GFLAGS), ++ GATE(CLK_I2C2, "clk_i2c2", "clk_i2c", 0, ++ RK3562_CLKGATE_CON(19), 7, GFLAGS), ++ GATE(CLK_I2C3, "clk_i2c3", "clk_i2c", 0, ++ RK3562_CLKGATE_CON(19), 8, GFLAGS), ++ GATE(CLK_I2C4, "clk_i2c4", "clk_i2c", 0, ++ RK3562_CLKGATE_CON(19), 9, GFLAGS), ++ GATE(CLK_I2C5, "clk_i2c5", "clk_i2c", 0, ++ RK3562_CLKGATE_CON(19), 10, GFLAGS), ++ COMPOSITE_NODIV(DCLK_BUS_GPIO, "dclk_bus_gpio", mux_xin24m_32k_p, 0, ++ RK3562_CLKSEL_CON(41), 15, 1, MFLAGS, ++ RK3562_CLKGATE_CON(20), 4, GFLAGS), ++ GATE(DCLK_BUS_GPIO3, "dclk_bus_gpio3", "dclk_bus_gpio", 0, ++ RK3562_CLKGATE_CON(20), 5, GFLAGS), ++ GATE(DCLK_BUS_GPIO4, "dclk_bus_gpio4", "dclk_bus_gpio", 0, ++ RK3562_CLKGATE_CON(20), 6, GFLAGS), ++ GATE(PCLK_TIMER, "pclk_timer", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(21), 0, GFLAGS), ++ GATE(CLK_TIMER0, "clk_timer0", "xin24m", 0, ++ RK3562_CLKGATE_CON(21), 1, GFLAGS), ++ GATE(CLK_TIMER1, "clk_timer1", "xin24m", 0, ++ RK3562_CLKGATE_CON(21), 2, GFLAGS), ++ GATE(CLK_TIMER2, "clk_timer2", "xin24m", 0, ++ RK3562_CLKGATE_CON(21), 3, GFLAGS), ++ GATE(CLK_TIMER3, "clk_timer3", "xin24m", 0, ++ RK3562_CLKGATE_CON(21), 4, GFLAGS), ++ GATE(CLK_TIMER4, "clk_timer4", "xin24m", 0, ++ RK3562_CLKGATE_CON(21), 5, GFLAGS), ++ GATE(CLK_TIMER5, "clk_timer5", "xin24m", 0, ++ RK3562_CLKGATE_CON(21), 6, GFLAGS), ++ GATE(PCLK_STIMER, "pclk_stimer", "pclk_bus", CLK_IGNORE_UNUSED, ++ RK3562_CLKGATE_CON(21), 7, GFLAGS), ++ GATE(CLK_STIMER0, "clk_stimer0", "xin24m", CLK_IGNORE_UNUSED, ++ RK3562_CLKGATE_CON(21), 8, GFLAGS), ++ GATE(CLK_STIMER1, "clk_stimer1", "xin24m", CLK_IGNORE_UNUSED, ++ RK3562_CLKGATE_CON(21), 9, GFLAGS), ++ GATE(PCLK_WDTNS, "pclk_wdtns", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(22), 0, GFLAGS), ++ GATE(CLK_WDTNS, "clk_wdtns", "xin24m", 0, ++ RK3562_CLKGATE_CON(22), 1, GFLAGS), ++ GATE(PCLK_GRF, "pclk_grf", "pclk_bus", CLK_IGNORE_UNUSED, ++ RK3562_CLKGATE_CON(22), 2, GFLAGS), ++ GATE(PCLK_SGRF, "pclk_sgrf", "pclk_bus", CLK_IGNORE_UNUSED, ++ RK3562_CLKGATE_CON(22), 3, GFLAGS), ++ GATE(PCLK_MAILBOX, "pclk_mailbox", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(22), 4, GFLAGS), ++ GATE(PCLK_INTC, "pclk_intc", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(22), 5, GFLAGS), ++ GATE(ACLK_BUS_GIC400, "aclk_bus_gic400", "aclk_bus", CLK_IGNORE_UNUSED, ++ RK3562_CLKGATE_CON(22), 6, GFLAGS), ++ GATE(ACLK_BUS_SPINLOCK, "aclk_bus_spinlock", "aclk_bus", 0, ++ RK3562_CLKGATE_CON(23), 0, GFLAGS), ++ GATE(ACLK_DCF, "aclk_dcf", "aclk_bus", CLK_IGNORE_UNUSED, ++ RK3562_CLKGATE_CON(23), 1, GFLAGS), ++ GATE(PCLK_DCF, "pclk_dcf", "pclk_bus", CLK_IGNORE_UNUSED, ++ RK3562_CLKGATE_CON(23), 2, GFLAGS), ++ GATE(FCLK_BUS_CM0_CORE, "fclk_bus_cm0_core", "hclk_bus", 0, ++ RK3562_CLKGATE_CON(23), 3, GFLAGS), ++ GATE(CLK_BUS_CM0_RTC, "clk_bus_cm0_rtc", "clk_rtc_32k", 0, ++ RK3562_CLKGATE_CON(23), 4, GFLAGS), ++ GATE(HCLK_ICACHE, "hclk_icache", "hclk_bus", CLK_IGNORE_UNUSED, ++ RK3562_CLKGATE_CON(23), 8, GFLAGS), ++ GATE(HCLK_DCACHE, "hclk_dcache", "hclk_bus", CLK_IGNORE_UNUSED, ++ RK3562_CLKGATE_CON(23), 9, GFLAGS), ++ GATE(PCLK_TSADC, "pclk_tsadc", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(24), 0, GFLAGS), ++ COMPOSITE_NOMUX(CLK_TSADC, "clk_tsadc", "xin24m", 0, ++ RK3562_CLKSEL_CON(43), 0, 11, DFLAGS, ++ RK3562_CLKGATE_CON(24), 1, GFLAGS), ++ COMPOSITE_NOMUX(CLK_TSADC_TSEN, "clk_tsadc_tsen", "xin24m", 0, ++ RK3562_CLKSEL_CON(43), 11, 5, DFLAGS, ++ RK3562_CLKGATE_CON(24), 3, GFLAGS), ++ GATE(PCLK_DFT2APB, "pclk_dft2apb", "pclk_bus", CLK_IGNORE_UNUSED, ++ RK3562_CLKGATE_CON(24), 4, GFLAGS), ++ COMPOSITE_NOMUX(CLK_SARADC_VCCIO156, "clk_saradc_vccio156", "xin24m", 0, ++ RK3562_CLKSEL_CON(44), 0, 12, DFLAGS, ++ RK3562_CLKGATE_CON(24), 9, GFLAGS), ++ GATE(PCLK_GMAC, "pclk_gmac", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(25), 0, GFLAGS), ++ GATE(ACLK_GMAC, "aclk_gmac", "aclk_bus", 0, ++ RK3562_CLKGATE_CON(25), 1, GFLAGS), ++ COMPOSITE_NODIV(CLK_GMAC_125M_CRU_I, "clk_gmac_125m_cru_i", mux_125m_xin24m_p, 0, ++ RK3562_CLKSEL_CON(45), 8, 1, MFLAGS, ++ RK3562_CLKGATE_CON(25), 2, GFLAGS), ++ COMPOSITE_NODIV(CLK_GMAC_50M_CRU_I, "clk_gmac_50m_cru_i", mux_50m_xin24m_p, 0, ++ RK3562_CLKSEL_CON(45), 7, 1, MFLAGS, ++ RK3562_CLKGATE_CON(25), 3, GFLAGS), ++ COMPOSITE(CLK_GMAC_ETH_OUT2IO, "clk_gmac_eth_out2io", gpll_cpll_p, 0, ++ RK3562_CLKSEL_CON(46), 7, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3562_CLKGATE_CON(25), 4, GFLAGS), ++ GATE(PCLK_APB2ASB_VCCIO156, "pclk_apb2asb_vccio156", "pclk_bus", CLK_IS_CRITICAL, ++ RK3562_CLKGATE_CON(25), 5, GFLAGS), ++ GATE(PCLK_TO_VCCIO156, "pclk_to_vccio156", "pclk_bus", CLK_IS_CRITICAL, ++ RK3562_CLKGATE_CON(25), 6, GFLAGS), ++ GATE(PCLK_DSIPHY, "pclk_dsiphy", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(25), 8, GFLAGS), ++ GATE(PCLK_DSITX, "pclk_dsitx", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(25), 9, GFLAGS), ++ GATE(PCLK_CPU_EMA_DET, "pclk_cpu_ema_det", "pclk_bus", CLK_IGNORE_UNUSED, ++ RK3562_CLKGATE_CON(25), 10, GFLAGS), ++ GATE(PCLK_HASH, "pclk_hash", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(25), 11, GFLAGS), ++ GATE(PCLK_TOPCRU, "pclk_topcru", "pclk_bus", CLK_IGNORE_UNUSED, ++ RK3562_CLKGATE_CON(25), 15, GFLAGS), ++ GATE(PCLK_ASB2APB_VCCIO156, "pclk_asb2apb_vccio156", "pclk_to_vccio156", CLK_IS_CRITICAL, ++ RK3562_CLKGATE_CON(26), 0, GFLAGS), ++ GATE(PCLK_IOC_VCCIO156, "pclk_ioc_vccio156", "pclk_to_vccio156", CLK_IS_CRITICAL, ++ RK3562_CLKGATE_CON(26), 1, GFLAGS), ++ GATE(PCLK_GPIO3_VCCIO156, "pclk_gpio3_vccio156", "pclk_to_vccio156", 0, ++ RK3562_CLKGATE_CON(26), 2, GFLAGS), ++ GATE(PCLK_GPIO4_VCCIO156, "pclk_gpio4_vccio156", "pclk_to_vccio156", 0, ++ RK3562_CLKGATE_CON(26), 3, GFLAGS), ++ GATE(PCLK_SARADC_VCCIO156, "pclk_saradc_vccio156", "pclk_to_vccio156", 0, ++ RK3562_CLKGATE_CON(26), 4, GFLAGS), ++ GATE(PCLK_MAC100, "pclk_mac100", "pclk_bus", 0, ++ RK3562_CLKGATE_CON(27), 0, GFLAGS), ++ GATE(ACLK_MAC100, "aclk_mac100", "aclk_bus", 0, ++ RK3562_CLKGATE_CON(27), 1, GFLAGS), ++ COMPOSITE_NODIV(CLK_MAC100_50M_MATRIX, "clk_mac100_50m_matrix", mux_50m_xin24m_p, 0, ++ RK3562_CLKSEL_CON(47), 7, 1, MFLAGS, ++ RK3562_CLKGATE_CON(27), 2, GFLAGS), ++ ++ /* PD_CORE */ ++ COMPOSITE_NOMUX(0, "aclk_core_pre", "scmi_clk_cpu", CLK_IGNORE_UNUSED, ++ RK3562_CLKSEL_CON(11), 0, 3, DFLAGS | CLK_DIVIDER_READ_ONLY, ++ RK3562_CLKGATE_CON(4), 3, GFLAGS), ++ COMPOSITE_NOMUX(0, "pclk_dbg_pre", "scmi_clk_cpu", CLK_IGNORE_UNUSED, ++ RK3562_CLKSEL_CON(12), 0, 4, DFLAGS | CLK_DIVIDER_READ_ONLY, ++ RK3562_CLKGATE_CON(4), 5, GFLAGS), ++ COMPOSITE_NOMUX(HCLK_CORE, "hclk_core", "gpll", CLK_IS_CRITICAL, ++ RK3562_CLKSEL_CON(13), 0, 6, DFLAGS, ++ RK3562_CLKGATE_CON(5), 2, GFLAGS), ++ GATE(0, "pclk_dbg_daplite", "pclk_dbg_pre", CLK_IGNORE_UNUSED, ++ RK3562_CLKGATE_CON(4), 10, GFLAGS), ++ ++ /* PD_DDR */ ++ FACTOR_GATE(0, "clk_gpll_mux_to_ddr", "gpll", 0, 1, 4, ++ RK3328_CLKGATE_CON(1), 6, GFLAGS), ++ COMPOSITE_NOMUX(PCLK_DDR, "pclk_ddr", "clk_gpll_mux_to_ddr", CLK_IS_CRITICAL, ++ RK3562_DDR_CLKSEL_CON(1), 8, 5, DFLAGS, ++ RK3562_DDR_CLKGATE_CON(0), 3, GFLAGS), ++ COMPOSITE_NOMUX(CLK_MSCH_BRG_BIU, "clk_msch_brg_biu", "clk_gpll_mux_to_ddr", CLK_IS_CRITICAL, ++ RK3562_DDR_CLKSEL_CON(1), 0, 4, DFLAGS, ++ RK3562_DDR_CLKGATE_CON(0), 4, GFLAGS), ++ GATE(PCLK_DDR_HWLP, "pclk_ddr_hwlp", "pclk_ddr", CLK_IGNORE_UNUSED, ++ RK3562_DDR_CLKGATE_CON(0), 6, GFLAGS), ++ GATE(PCLK_DDR_UPCTL, "pclk_ddr_upctl", "pclk_ddr", CLK_IGNORE_UNUSED, ++ RK3562_DDR_CLKGATE_CON(0), 7, GFLAGS), ++ GATE(PCLK_DDR_PHY, "pclk_ddr_phy", "pclk_ddr", CLK_IGNORE_UNUSED, ++ RK3562_DDR_CLKGATE_CON(0), 8, GFLAGS), ++ GATE(PCLK_DDR_DFICTL, "pclk_ddr_dfictl", "pclk_ddr", CLK_IGNORE_UNUSED, ++ RK3562_DDR_CLKGATE_CON(0), 9, GFLAGS), ++ GATE(PCLK_DDR_DMA2DDR, "pclk_ddr_dma2ddr", "pclk_ddr", CLK_IGNORE_UNUSED, ++ RK3562_DDR_CLKGATE_CON(0), 10, GFLAGS), ++ GATE(PCLK_DDR_MON, "pclk_ddr_mon", "pclk_ddr", CLK_IGNORE_UNUSED, ++ RK3562_DDR_CLKGATE_CON(1), 0, GFLAGS), ++ GATE(TMCLK_DDR_MON, "tmclk_ddr_mon", "xin24m", CLK_IGNORE_UNUSED, ++ RK3562_DDR_CLKGATE_CON(1), 1, GFLAGS), ++ GATE(PCLK_DDR_GRF, "pclk_ddr_grf", "pclk_ddr", CLK_IGNORE_UNUSED, ++ RK3562_DDR_CLKGATE_CON(1), 2, GFLAGS), ++ GATE(PCLK_DDR_CRU, "pclk_ddr_cru", "pclk_ddr", CLK_IGNORE_UNUSED, ++ RK3562_DDR_CLKGATE_CON(1), 3, GFLAGS), ++ GATE(PCLK_SUBDDR_CRU, "pclk_subddr_cru", "pclk_ddr", CLK_IGNORE_UNUSED, ++ RK3562_DDR_CLKGATE_CON(1), 4, GFLAGS), ++ ++ /* PD_GPU */ ++ COMPOSITE(CLK_GPU_PRE, "clk_gpu_pre", gpll_cpll_p, 0, ++ RK3562_CLKSEL_CON(18), 7, 1, MFLAGS, 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(8), 0, GFLAGS), ++ COMPOSITE_NOMUX(ACLK_GPU_PRE, "aclk_gpu_pre", "clk_gpu_pre", 0, ++ RK3562_CLKSEL_CON(19), 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(8), 2, GFLAGS), ++ GATE(CLK_GPU, "clk_gpu", "clk_gpu_pre", 0, ++ RK3562_CLKGATE_CON(8), 4, GFLAGS), ++ COMPOSITE_NODIV(CLK_GPU_BRG, "clk_gpu_brg", mux_200m_100m_p, 0, ++ RK3562_CLKSEL_CON(19), 15, 1, MFLAGS, ++ RK3562_CLKGATE_CON(8), 8, GFLAGS), ++ ++ /* PD_NPU */ ++ COMPOSITE(CLK_NPU_PRE, "clk_npu_pre", gpll_cpll_p, 0, ++ RK3562_CLKSEL_CON(15), 7, 1, MFLAGS, 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(6), 0, GFLAGS), ++ COMPOSITE_NOMUX(HCLK_NPU_PRE, "hclk_npu_pre", "clk_npu_pre", 0, ++ RK3562_CLKSEL_CON(16), 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(6), 1, GFLAGS), ++ GATE(ACLK_RKNN, "aclk_rknn", "clk_npu_pre", 0, ++ RK3562_CLKGATE_CON(6), 4, GFLAGS), ++ GATE(HCLK_RKNN, "hclk_rknn", "hclk_npu_pre", 0, ++ RK3562_CLKGATE_CON(6), 5, GFLAGS), ++ ++ /* PD_PERI */ ++ COMPOSITE(ACLK_PERI, "aclk_peri", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3562_PERI_CLKSEL_CON(0), 7, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(1), 0, GFLAGS), ++ COMPOSITE(HCLK_PERI, "hclk_peri", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3562_PERI_CLKSEL_CON(0), 15, 1, MFLAGS, 8, 6, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(1), 1, GFLAGS), ++ COMPOSITE(PCLK_PERI, "pclk_peri", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3562_PERI_CLKSEL_CON(1), 7, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(1), 2, GFLAGS), ++ GATE(PCLK_PERICRU, "pclk_pericru", "pclk_peri", CLK_IGNORE_UNUSED, ++ RK3562_PERI_CLKGATE_CON(1), 6, GFLAGS), ++ GATE(HCLK_SAI0, "hclk_sai0", "hclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(2), 0, GFLAGS), ++ COMPOSITE(CLK_SAI0_SRC, "clk_sai0_src", gpll_cpll_hpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(1), 14, 2, MFLAGS, 8, 6, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(2), 1, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_SAI0_FRAC, "clk_sai0_frac", "clk_sai0_src", CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(2), 0, ++ RK3562_PERI_CLKGATE_CON(2), 2, GFLAGS, ++ &rk3562_clk_sai0_fracmux), ++ GATE(MCLK_SAI0, "mclk_sai0", "clk_sai0", 0, ++ RK3562_PERI_CLKGATE_CON(2), 3, GFLAGS), ++ COMPOSITE_NODIV(MCLK_SAI0_OUT2IO, "mclk_sai0_out2io", mclk_sai0_out2io_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(3), 5, 1, MFLAGS, ++ RK3562_PERI_CLKGATE_CON(2), 4, GFLAGS), ++ GATE(HCLK_SAI1, "hclk_sai1", "hclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(2), 5, GFLAGS), ++ COMPOSITE(CLK_SAI1_SRC, "clk_sai1_src", gpll_cpll_hpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(3), 14, 2, MFLAGS, 8, 6, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(2), 6, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_SAI1_FRAC, "clk_sai1_frac", "clk_sai1_src", CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(4), 0, ++ RK3562_PERI_CLKGATE_CON(2), 7, GFLAGS, ++ &rk3562_clk_sai1_fracmux), ++ GATE(MCLK_SAI1, "mclk_sai1", "clk_sai1", 0, ++ RK3562_PERI_CLKGATE_CON(2), 8, GFLAGS), ++ COMPOSITE_NODIV(MCLK_SAI1_OUT2IO, "mclk_sai1_out2io", mclk_sai1_out2io_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(5), 5, 1, MFLAGS, ++ RK3562_PERI_CLKGATE_CON(2), 9, GFLAGS), ++ GATE(HCLK_SAI2, "hclk_sai2", "hclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(2), 10, GFLAGS), ++ COMPOSITE(CLK_SAI2_SRC, "clk_sai2_src", gpll_cpll_hpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(6), 14, 2, MFLAGS, 8, 6, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(2), 11, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_SAI2_FRAC, "clk_sai2_frac", "clk_sai2_src", CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(7), 0, ++ RK3562_PERI_CLKGATE_CON(2), 12, GFLAGS, ++ &rk3562_clk_sai2_fracmux), ++ GATE(MCLK_SAI2, "mclk_sai2", "clk_sai2", 0, ++ RK3562_PERI_CLKGATE_CON(2), 13, GFLAGS), ++ COMPOSITE_NODIV(MCLK_SAI2_OUT2IO, "mclk_sai2_out2io", mclk_sai2_out2io_p, CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(8), 5, 1, MFLAGS, ++ RK3562_PERI_CLKGATE_CON(2), 14, GFLAGS), ++ GATE(HCLK_DSM, "hclk_dsm", "hclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(3), 1, GFLAGS), ++ GATE(CLK_DSM, "clk_dsm", "mclk_sai1", 0, ++ RK3562_PERI_CLKGATE_CON(3), 2, GFLAGS), ++ GATE(HCLK_PDM, "hclk_pdm", "hclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(3), 4, GFLAGS), ++ COMPOSITE(MCLK_PDM, "mclk_pdm", gpll_cpll_hpll_xin24m_p, 0, ++ RK3562_PERI_CLKSEL_CON(12), 6, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(3), 5, GFLAGS), ++ GATE(HCLK_SPDIF, "hclk_spdif", "hclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(3), 8, GFLAGS), ++ COMPOSITE(CLK_SPDIF_SRC, "clk_spdif_src", gpll_cpll_hpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(13), 14, 2, MFLAGS, 8, 6, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(3), 9, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_SPDIF_FRAC, "clk_spdif_frac", "clk_spdif_src", CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(14), 0, ++ RK3562_PERI_CLKGATE_CON(3), 10, GFLAGS, ++ &rk3562_clk_spdif_fracmux), ++ GATE(MCLK_SPDIF, "mclk_spdif", "clk_spdif", 0, ++ RK3562_PERI_CLKGATE_CON(3), 11, GFLAGS), ++ GATE(HCLK_SDMMC0, "hclk_sdmmc0", "hclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(4), 0, GFLAGS), ++ COMPOSITE(CCLK_SDMMC0, "cclk_sdmmc0", gpll_cpll_xin24m_dmyhpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(16), 14, 2, MFLAGS, 0, 8, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(4), 1, GFLAGS), ++ MMC(SCLK_SDMMC0_DRV, "sdmmc0_drv", "cclk_sdmmc0", RK3562_SDMMC0_CON0, 1), ++ MMC(SCLK_SDMMC0_SAMPLE, "sdmmc0_sample", "cclk_sdmmc0", RK3562_SDMMC0_CON1, 1), ++ GATE(HCLK_SDMMC1, "hclk_sdmmc1", "hclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(4), 2, GFLAGS), ++ COMPOSITE(CCLK_SDMMC1, "cclk_sdmmc1", gpll_cpll_xin24m_dmyhpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(17), 14, 2, MFLAGS, 0, 8, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(4), 3, GFLAGS), ++ MMC(SCLK_SDMMC1_DRV, "sdmmc1_drv", "cclk_sdmmc1", RK3562_SDMMC1_CON0, 1), ++ MMC(SCLK_SDMMC1_SAMPLE, "sdmmc1_sample", "cclk_sdmmc1", RK3562_SDMMC1_CON1, 1), ++ GATE(HCLK_EMMC, "hclk_emmc", "hclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(4), 8, GFLAGS), ++ GATE(ACLK_EMMC, "aclk_emmc", "aclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(4), 9, GFLAGS), ++ COMPOSITE(CCLK_EMMC, "cclk_emmc", gpll_cpll_xin24m_dmyhpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(18), 14, 2, MFLAGS, 0, 8, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(4), 10, GFLAGS), ++ COMPOSITE(BCLK_EMMC, "bclk_emmc", gpll_cpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(19), 15, 1, MFLAGS, 8, 7, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(4), 11, GFLAGS), ++ GATE(TMCLK_EMMC, "tmclk_emmc", "xin24m", 0, ++ RK3562_PERI_CLKGATE_CON(4), 12, GFLAGS), ++ COMPOSITE(SCLK_SFC, "sclk_sfc", gpll_cpll_xin24m_p, 0, ++ RK3562_PERI_CLKSEL_CON(20), 8, 2, MFLAGS, 0, 8, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(4), 13, GFLAGS), ++ GATE(HCLK_SFC, "hclk_sfc", "hclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(4), 14, GFLAGS), ++ GATE(HCLK_USB2HOST, "hclk_usb2host", "hclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(5), 0, GFLAGS), ++ GATE(HCLK_USB2HOST_ARB, "hclk_usb2host_arb", "hclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(5), 1, GFLAGS), ++ GATE(PCLK_SPI1, "pclk_spi1", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(6), 0, GFLAGS), ++ COMPOSITE_NODIV(CLK_SPI1, "clk_spi1", mux_200m_100m_50m_xin24m_p, 0, ++ RK3562_PERI_CLKSEL_CON(20), 12, 2, MFLAGS, ++ RK3562_PERI_CLKGATE_CON(6), 1, GFLAGS), ++ GATE(SCLK_IN_SPI1, "sclk_in_spi1", "sclk_in_spi1_io", 0, ++ RK3562_PERI_CLKGATE_CON(6), 2, GFLAGS), ++ GATE(PCLK_SPI2, "pclk_spi2", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(6), 3, GFLAGS), ++ COMPOSITE_NODIV(CLK_SPI2, "clk_spi2", mux_200m_100m_50m_xin24m_p, 0, ++ RK3562_PERI_CLKSEL_CON(20), 14, 2, MFLAGS, ++ RK3562_PERI_CLKGATE_CON(6), 4, GFLAGS), ++ GATE(SCLK_IN_SPI2, "sclk_in_spi2", "sclk_in_spi2_io", 0, ++ RK3562_PERI_CLKGATE_CON(6), 5, GFLAGS), ++ GATE(PCLK_UART1, "pclk_uart1", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(7), 0, GFLAGS), ++ GATE(PCLK_UART2, "pclk_uart2", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(7), 1, GFLAGS), ++ GATE(PCLK_UART3, "pclk_uart3", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(7), 2, GFLAGS), ++ GATE(PCLK_UART4, "pclk_uart4", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(7), 3, GFLAGS), ++ GATE(PCLK_UART5, "pclk_uart5", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(7), 4, GFLAGS), ++ GATE(PCLK_UART6, "pclk_uart6", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(7), 5, GFLAGS), ++ GATE(PCLK_UART7, "pclk_uart7", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(7), 6, GFLAGS), ++ GATE(PCLK_UART8, "pclk_uart8", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(7), 7, GFLAGS), ++ GATE(PCLK_UART9, "pclk_uart9", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(7), 8, GFLAGS), ++ COMPOSITE(CLK_UART1_SRC, "clk_uart1_src", gpll_cpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(21), 8, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(7), 9, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART1_FRAC, "clk_uart1_frac", "clk_uart1_src", CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(22), 0, ++ RK3562_PERI_CLKGATE_CON(7), 10, GFLAGS, ++ &rk3562_clk_uart1_fracmux), ++ GATE(SCLK_UART1, "sclk_uart1", "clk_uart1", 0, ++ RK3562_PERI_CLKGATE_CON(7), 11, GFLAGS), ++ COMPOSITE(CLK_UART2_SRC, "clk_uart2_src", gpll_cpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(23), 8, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(7), 12, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART2_FRAC, "clk_uart2_frac", "clk_uart2_src", CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(24), 0, ++ RK3562_PERI_CLKGATE_CON(7), 13, GFLAGS, ++ &rk3562_clk_uart2_fracmux), ++ GATE(SCLK_UART2, "sclk_uart2", "clk_uart2", 0, ++ RK3562_PERI_CLKGATE_CON(7), 14, GFLAGS), ++ COMPOSITE(CLK_UART3_SRC, "clk_uart3_src", gpll_cpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(25), 8, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(7), 15, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART3_FRAC, "clk_uart3_frac", "clk_uart3_src", CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(26), 0, ++ RK3562_PERI_CLKGATE_CON(8), 0, GFLAGS, ++ &rk3562_clk_uart3_fracmux), ++ GATE(SCLK_UART3, "sclk_uart3", "clk_uart3", 0, ++ RK3562_PERI_CLKGATE_CON(8), 1, GFLAGS), ++ COMPOSITE(CLK_UART4_SRC, "clk_uart4_src", gpll_cpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(27), 8, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(8), 2, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART4_FRAC, "clk_uart4_frac", "clk_uart4_src", CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(28), 0, ++ RK3562_PERI_CLKGATE_CON(8), 3, GFLAGS, ++ &rk3562_clk_uart4_fracmux), ++ GATE(SCLK_UART4, "sclk_uart4", "clk_uart4", 0, ++ RK3562_PERI_CLKGATE_CON(8), 4, GFLAGS), ++ COMPOSITE(CLK_UART5_SRC, "clk_uart5_src", gpll_cpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(29), 8, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(8), 5, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART5_FRAC, "clk_uart5_frac", "clk_uart5_src", CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(30), 0, ++ RK3562_PERI_CLKGATE_CON(8), 6, GFLAGS, ++ &rk3562_clk_uart5_fracmux), ++ GATE(SCLK_UART5, "sclk_uart5", "clk_uart5", 0, ++ RK3562_PERI_CLKGATE_CON(8), 7, GFLAGS), ++ COMPOSITE(CLK_UART6_SRC, "clk_uart6_src", gpll_cpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(31), 8, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(8), 8, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART6_FRAC, "clk_uart6_frac", "clk_uart6_src", CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(32), 0, ++ RK3562_PERI_CLKGATE_CON(8), 9, GFLAGS, ++ &rk3562_clk_uart6_fracmux), ++ GATE(SCLK_UART6, "sclk_uart6", "clk_uart6", 0, ++ RK3562_PERI_CLKGATE_CON(8), 10, GFLAGS), ++ COMPOSITE(CLK_UART7_SRC, "clk_uart7_src", gpll_cpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(33), 8, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(8), 11, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART7_FRAC, "clk_uart7_frac", "clk_uart7_src", CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(34), 0, ++ RK3562_PERI_CLKGATE_CON(8), 12, GFLAGS, ++ &rk3562_clk_uart7_fracmux), ++ GATE(SCLK_UART7, "sclk_uart7", "clk_uart7", 0, ++ RK3562_PERI_CLKGATE_CON(8), 13, GFLAGS), ++ COMPOSITE(CLK_UART8_SRC, "clk_uart8_src", gpll_cpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(35), 8, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(8), 14, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART8_FRAC, "clk_uart8_frac", "clk_uart8_src", CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(36), 0, ++ RK3562_PERI_CLKGATE_CON(8), 15, GFLAGS, ++ &rk3562_clk_uart8_fracmux), ++ GATE(SCLK_UART8, "sclk_uart8", "clk_uart8", 0, ++ RK3562_PERI_CLKGATE_CON(9), 0, GFLAGS), ++ COMPOSITE(CLK_UART9_SRC, "clk_uart9_src", gpll_cpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(37), 8, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(9), 1, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART9_FRAC, "clk_uart9_frac", "clk_uart9_src", CLK_SET_RATE_PARENT, ++ RK3562_PERI_CLKSEL_CON(38), 0, ++ RK3562_PERI_CLKGATE_CON(9), 2, GFLAGS, ++ &rk3562_clk_uart9_fracmux), ++ GATE(SCLK_UART9, "sclk_uart9", "clk_uart9", 0, ++ RK3562_PERI_CLKGATE_CON(9), 3, GFLAGS), ++ GATE(PCLK_PWM1_PERI, "pclk_pwm1_peri", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(10), 0, GFLAGS), ++ COMPOSITE_NODIV(CLK_PWM1_PERI, "clk_pwm1_peri", mux_100m_50m_xin24m_p, 0, ++ RK3562_PERI_CLKSEL_CON(40), 0, 2, MFLAGS, ++ RK3562_PERI_CLKGATE_CON(10), 1, GFLAGS), ++ GATE(CLK_CAPTURE_PWM1_PERI, "clk_capture_pwm1_peri", "xin24m", 0, ++ RK3562_PERI_CLKGATE_CON(10), 2, GFLAGS), ++ GATE(PCLK_PWM2_PERI, "pclk_pwm2_peri", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(10), 3, GFLAGS), ++ COMPOSITE_NODIV(CLK_PWM2_PERI, "clk_pwm2_peri", mux_100m_50m_xin24m_p, 0, ++ RK3562_PERI_CLKSEL_CON(40), 6, 2, MFLAGS, ++ RK3562_PERI_CLKGATE_CON(10), 4, GFLAGS), ++ GATE(CLK_CAPTURE_PWM2_PERI, "clk_capture_pwm2_peri", "xin24m", 0, ++ RK3562_PERI_CLKGATE_CON(10), 5, GFLAGS), ++ GATE(PCLK_PWM3_PERI, "pclk_pwm3_peri", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(10), 6, GFLAGS), ++ COMPOSITE_NODIV(CLK_PWM3_PERI, "clk_pwm3_peri", mux_100m_50m_xin24m_p, 0, ++ RK3562_PERI_CLKSEL_CON(40), 8, 2, MFLAGS, ++ RK3562_PERI_CLKGATE_CON(10), 7, GFLAGS), ++ GATE(CLK_CAPTURE_PWM3_PERI, "clk_capture_pwm3_peri", "xin24m", 0, ++ RK3562_PERI_CLKGATE_CON(10), 8, GFLAGS), ++ GATE(PCLK_CAN0, "pclk_can0", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(11), 0, GFLAGS), ++ COMPOSITE(CLK_CAN0, "clk_can0", gpll_cpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(41), 7, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(11), 1, GFLAGS), ++ GATE(PCLK_CAN1, "pclk_can1", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(11), 2, GFLAGS), ++ COMPOSITE(CLK_CAN1, "clk_can1", gpll_cpll_p, 0, ++ RK3562_PERI_CLKSEL_CON(41), 15, 1, MFLAGS, 8, 5, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(11), 3, GFLAGS), ++ GATE(PCLK_PERI_WDT, "pclk_peri_wdt", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(13), 0, GFLAGS), ++ COMPOSITE_NODIV(TCLK_PERI_WDT, "tclk_peri_wdt", mux_xin24m_32k_p, 0, ++ RK3562_PERI_CLKSEL_CON(43), 15, 1, MFLAGS, ++ RK3562_PERI_CLKGATE_CON(13), 1, GFLAGS), ++ GATE(ACLK_SYSMEM, "aclk_sysmem", "aclk_peri", CLK_IGNORE_UNUSED, ++ RK3562_PERI_CLKGATE_CON(13), 2, GFLAGS), ++ GATE(HCLK_BOOTROM, "hclk_bootrom", "hclk_peri", CLK_IGNORE_UNUSED, ++ RK3562_PERI_CLKGATE_CON(13), 3, GFLAGS), ++ GATE(PCLK_PERI_GRF, "pclk_peri_grf", "pclk_peri", CLK_IGNORE_UNUSED, ++ RK3562_PERI_CLKGATE_CON(13), 4, GFLAGS), ++ GATE(ACLK_DMAC, "aclk_dmac", "aclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(13), 5, GFLAGS), ++ GATE(ACLK_RKDMAC, "aclk_rkdmac", "aclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(13), 6, GFLAGS), ++ GATE(PCLK_OTPC_NS, "pclk_otpc_ns", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(14), 0, GFLAGS), ++ GATE(CLK_SBPI_OTPC_NS, "clk_sbpi_otpc_ns", "xin24m", 0, ++ RK3562_PERI_CLKGATE_CON(14), 1, GFLAGS), ++ COMPOSITE_NOMUX(CLK_USER_OTPC_NS, "clk_user_otpc_ns", "xin24m", 0, ++ RK3562_PERI_CLKSEL_CON(44), 0, 8, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(14), 2, GFLAGS), ++ GATE(PCLK_OTPC_S, "pclk_otpc_s", "pclk_peri", CLK_IGNORE_UNUSED, ++ RK3562_PERI_CLKGATE_CON(14), 3, GFLAGS), ++ GATE(CLK_SBPI_OTPC_S, "clk_sbpi_otpc_s", "xin24m", CLK_IGNORE_UNUSED, ++ RK3562_PERI_CLKGATE_CON(14), 4, GFLAGS), ++ COMPOSITE_NOMUX(CLK_USER_OTPC_S, "clk_user_otpc_s", "xin24m", CLK_IGNORE_UNUSED, ++ RK3562_PERI_CLKSEL_CON(44), 8, 8, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(14), 5, GFLAGS), ++ GATE(CLK_OTPC_ARB, "clk_otpc_arb", "xin24m", 0, ++ RK3562_PERI_CLKGATE_CON(14), 6, GFLAGS), ++ GATE(PCLK_OTPPHY, "pclk_otpphy", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(14), 7, GFLAGS), ++ GATE(PCLK_USB2PHY, "pclk_usb2phy", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(15), 0, GFLAGS), ++ GATE(PCLK_PIPEPHY, "pclk_pipephy", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(15), 7, GFLAGS), ++ GATE(PCLK_SARADC, "pclk_saradc", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(16), 4, GFLAGS), ++ COMPOSITE_NOMUX(CLK_SARADC, "clk_saradc", "xin24m", 0, ++ RK3562_PERI_CLKSEL_CON(46), 0, 12, DFLAGS, ++ RK3562_PERI_CLKGATE_CON(16), 5, GFLAGS), ++ GATE(PCLK_IOC_VCCIO234, "pclk_ioc_vccio234", "pclk_peri", CLK_IS_CRITICAL, ++ RK3562_PERI_CLKGATE_CON(16), 12, GFLAGS), ++ GATE(PCLK_PERI_GPIO1, "pclk_peri_gpio1", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(17), 0, GFLAGS), ++ GATE(PCLK_PERI_GPIO2, "pclk_peri_gpio2", "pclk_peri", 0, ++ RK3562_PERI_CLKGATE_CON(17), 1, GFLAGS), ++ COMPOSITE_NODIV(DCLK_PERI_GPIO, "dclk_peri_gpio", mux_xin24m_32k_p, 0, ++ RK3562_PERI_CLKSEL_CON(47), 8, 1, MFLAGS, ++ RK3562_PERI_CLKGATE_CON(17), 4, GFLAGS), ++ GATE(DCLK_PERI_GPIO1, "dclk_peri_gpio1", "dclk_peri_gpio", 0, ++ RK3562_PERI_CLKGATE_CON(17), 2, GFLAGS), ++ GATE(DCLK_PERI_GPIO2, "dclk_peri_gpio2", "dclk_peri_gpio", 0, ++ RK3562_PERI_CLKGATE_CON(17), 3, GFLAGS), ++ ++ /* PD_PHP */ ++ COMPOSITE(ACLK_PHP, "aclk_php", gpll_cpll_p, 0, ++ RK3562_CLKSEL_CON(36), 7, 1, MFLAGS, 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(16), 0, GFLAGS), ++ COMPOSITE_NOMUX(PCLK_PHP, "pclk_php", "aclk_php", 0, ++ RK3562_CLKSEL_CON(36), 8, 4, DFLAGS, ++ RK3562_CLKGATE_CON(16), 1, GFLAGS), ++ GATE(ACLK_PCIE20_MST, "aclk_pcie20_mst", "aclk_php", 0, ++ RK3562_CLKGATE_CON(16), 4, GFLAGS), ++ GATE(ACLK_PCIE20_SLV, "aclk_pcie20_slv", "aclk_php", 0, ++ RK3562_CLKGATE_CON(16), 5, GFLAGS), ++ GATE(ACLK_PCIE20_DBI, "aclk_pcie20_dbi", "aclk_php", 0, ++ RK3562_CLKGATE_CON(16), 6, GFLAGS), ++ GATE(PCLK_PCIE20, "pclk_pcie20", "pclk_php", 0, ++ RK3562_CLKGATE_CON(16), 7, GFLAGS), ++ GATE(CLK_PCIE20_AUX, "clk_pcie20_aux", "xin24m", 0, ++ RK3562_CLKGATE_CON(16), 8, GFLAGS), ++ GATE(ACLK_USB3OTG, "aclk_usb3otg", "aclk_php", 0, ++ RK3562_CLKGATE_CON(16), 10, GFLAGS), ++ COMPOSITE_NODIV(CLK_USB3OTG_SUSPEND, "clk_usb3otg_suspend", mux_xin24m_32k_p, 0, ++ RK3562_CLKSEL_CON(36), 15, 1, MFLAGS, ++ RK3562_CLKGATE_CON(16), 11, GFLAGS), ++ GATE(CLK_USB3OTG_REF, "clk_usb3otg_ref", "xin24m", 0, ++ RK3562_CLKGATE_CON(16), 12, GFLAGS), ++ GATE(CLK_PIPEPHY_REF_FUNC, "clk_pipephy_ref_func", "pclk_pcie20", 0, ++ RK3562_CLKGATE_CON(17), 3, GFLAGS), ++ ++ /* PD_PMU1 */ ++ COMPOSITE_NOMUX(CLK_200M_PMU, "clk_200m_pmu", "cpll", CLK_IS_CRITICAL, ++ RK3562_PMU1_CLKSEL_CON(0), 0, 5, DFLAGS, ++ RK3562_PMU1_CLKGATE_CON(0), 1, GFLAGS), ++ /* PD_PMU0 */ ++ COMPOSITE_FRACMUX(CLK_RTC32K_FRAC, "clk_rtc32k_frac", "xin24m", CLK_IS_CRITICAL, ++ RK3562_PMU0_CLKSEL_CON(0), 0, ++ RK3562_PMU0_CLKGATE_CON(0), 15, GFLAGS, ++ &rk3562_rtc32k_pmu_fracmux), ++ COMPOSITE_NOMUX(BUSCLK_PDPMU0, "busclk_pdpmu0", "clk_200m_pmu", CLK_IS_CRITICAL, ++ RK3562_PMU0_CLKSEL_CON(1), 3, 2, DFLAGS, ++ RK3562_PMU0_CLKGATE_CON(0), 14, GFLAGS), ++ GATE(PCLK_PMU0_CRU, "pclk_pmu0_cru", "busclk_pdpmu0", CLK_IGNORE_UNUSED, ++ RK3562_PMU0_CLKGATE_CON(0), 0, GFLAGS), ++ GATE(PCLK_PMU0_PMU, "pclk_pmu0_pmu", "busclk_pdpmu0", CLK_IGNORE_UNUSED, ++ RK3562_PMU0_CLKGATE_CON(0), 1, GFLAGS), ++ GATE(CLK_PMU0_PMU, "clk_pmu0_pmu", "xin24m", CLK_IGNORE_UNUSED, ++ RK3562_PMU0_CLKGATE_CON(0), 2, GFLAGS), ++ GATE(PCLK_PMU0_HP_TIMER, "pclk_pmu0_hp_timer", "busclk_pdpmu0", CLK_IGNORE_UNUSED, ++ RK3562_PMU0_CLKGATE_CON(0), 3, GFLAGS), ++ GATE(CLK_PMU0_HP_TIMER, "clk_pmu0_hp_timer", "xin24m", CLK_IGNORE_UNUSED, ++ RK3562_PMU0_CLKGATE_CON(0), 4, GFLAGS), ++ GATE(CLK_PMU0_32K_HP_TIMER, "clk_pmu0_32k_hp_timer", "clk_rtc_32k", CLK_IGNORE_UNUSED, ++ RK3562_PMU0_CLKGATE_CON(0), 5, GFLAGS), ++ GATE(PCLK_PMU0_PVTM, "pclk_pmu0_pvtm", "busclk_pdpmu0", 0, ++ RK3562_PMU0_CLKGATE_CON(0), 6, GFLAGS), ++ GATE(CLK_PMU0_PVTM, "clk_pmu0_pvtm", "xin24m", 0, ++ RK3562_PMU0_CLKGATE_CON(0), 7, GFLAGS), ++ GATE(PCLK_IOC_PMUIO, "pclk_ioc_pmuio", "busclk_pdpmu0", CLK_IS_CRITICAL, ++ RK3562_PMU0_CLKGATE_CON(0), 8, GFLAGS), ++ GATE(PCLK_PMU0_GPIO0, "pclk_pmu0_gpio0", "busclk_pdpmu0", 0, ++ RK3562_PMU0_CLKGATE_CON(0), 9, GFLAGS), ++ GATE(DBCLK_PMU0_GPIO0, "dbclk_pmu0_gpio0", "xin24m", 0, ++ RK3562_PMU0_CLKGATE_CON(0), 10, GFLAGS), ++ GATE(PCLK_PMU0_GRF, "pclk_pmu0_grf", "busclk_pdpmu0", CLK_IGNORE_UNUSED, ++ RK3562_PMU0_CLKGATE_CON(0), 11, GFLAGS), ++ GATE(PCLK_PMU0_SGRF, "pclk_pmu0_sgrf", "busclk_pdpmu0", CLK_IGNORE_UNUSED, ++ RK3562_PMU0_CLKGATE_CON(0), 12, GFLAGS), ++ GATE(CLK_DDR_FAIL_SAFE, "clk_ddr_fail_safe", "xin24m", CLK_IGNORE_UNUSED, ++ RK3562_PMU0_CLKGATE_CON(1), 0, GFLAGS), ++ GATE(PCLK_PMU0_SCRKEYGEN, "pclk_pmu0_scrkeygen", "busclk_pdpmu0", CLK_IGNORE_UNUSED, ++ RK3562_PMU0_CLKGATE_CON(1), 1, GFLAGS), ++ COMPOSITE_NOMUX(CLK_PIPEPHY_DIV, "clk_pipephy_div", "cpll", 0, ++ RK3562_PMU0_CLKSEL_CON(2), 0, 6, DFLAGS, ++ RK3562_PMU0_CLKGATE_CON(2), 0, GFLAGS), ++ GATE(CLK_PIPEPHY_XIN24M, "clk_pipephy_xin24m", "xin24m", 0, ++ RK3562_PMU0_CLKGATE_CON(2), 1, GFLAGS), ++ COMPOSITE_NODIV(CLK_PIPEPHY_REF, "clk_pipephy_ref", clk_pipephy_ref_p, 0, ++ RK3562_PMU0_CLKSEL_CON(2), 7, 1, MFLAGS, ++ RK3562_PMU0_CLKGATE_CON(2), 2, GFLAGS), ++ GATE(CLK_USB2PHY_XIN24M, "clk_usb2phy_xin24m", "xin24m", 0, ++ RK3562_PMU0_CLKGATE_CON(2), 4, GFLAGS), ++ COMPOSITE_NODIV(CLK_USB2PHY_REF, "clk_usb2phy_ref", clk_usbphy_ref_p, 0, ++ RK3562_PMU0_CLKSEL_CON(2), 8, 1, MFLAGS, ++ RK3562_PMU0_CLKGATE_CON(2), 5, GFLAGS), ++ GATE(CLK_MIPIDSIPHY_XIN24M, "clk_mipidsiphy_xin24m", "xin24m", 0, ++ RK3562_PMU0_CLKGATE_CON(2), 6, GFLAGS), ++ COMPOSITE_NODIV(CLK_MIPIDSIPHY_REF, "clk_mipidsiphy_ref", clk_mipidsi_ref_p, 0, ++ RK3562_PMU0_CLKSEL_CON(2), 15, 1, MFLAGS, ++ RK3562_PMU0_CLKGATE_CON(2), 7, GFLAGS), ++ GATE(PCLK_PMU0_I2C0, "pclk_pmu0_i2c0", "busclk_pdpmu0", 0, ++ RK3562_PMU0_CLKGATE_CON(2), 8, GFLAGS), ++ COMPOSITE(CLK_PMU0_I2C0, "clk_pmu0_i2c0", mux_200m_xin24m_32k_p, 0, ++ RK3562_PMU0_CLKSEL_CON(3), 14, 2, MFLAGS, 8, 5, DFLAGS, ++ RK3562_PMU0_CLKGATE_CON(2), 9, GFLAGS), ++ /* PD_PMU1 */ ++ GATE(PCLK_PMU1_CRU, "pclk_pmu1_cru", "busclk_pdpmu0", CLK_IGNORE_UNUSED, ++ RK3562_PMU1_CLKGATE_CON(0), 0, GFLAGS), ++ GATE(HCLK_PMU1_MEM, "hclk_pmu1_mem", "busclk_pdpmu0", CLK_IGNORE_UNUSED, ++ RK3562_PMU1_CLKGATE_CON(0), 2, GFLAGS), ++ GATE(PCLK_PMU1_UART0, "pclk_pmu1_uart0", "busclk_pdpmu0", 0, ++ RK3562_PMU1_CLKGATE_CON(0), 7, GFLAGS), ++ COMPOSITE_NOMUX(CLK_PMU1_UART0_SRC, "clk_pmu1_uart0_src", "cpll", 0, ++ RK3562_PMU1_CLKSEL_CON(2), 0, 4, DFLAGS, ++ RK3562_PMU1_CLKGATE_CON(0), 8, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_PMU1_UART0_FRAC, "clk_pmu1_uart0_frac", "clk_pmu1_uart0_src", CLK_SET_RATE_PARENT, ++ RK3562_PMU1_CLKSEL_CON(3), 0, ++ RK3562_PMU1_CLKGATE_CON(0), 9, GFLAGS, ++ &rk3562_clk_pmu1_uart0_fracmux), ++ GATE(SCLK_PMU1_UART0, "sclk_pmu1_uart0", "clk_pmu1_uart0", 0, ++ RK3562_PMU1_CLKGATE_CON(0), 10, GFLAGS), ++ GATE(PCLK_PMU1_SPI0, "pclk_pmu1_spi0", "busclk_pdpmu0", 0, ++ RK3562_PMU1_CLKGATE_CON(1), 0, GFLAGS), ++ COMPOSITE(CLK_PMU1_SPI0, "clk_pmu1_spi0", mux_200m_xin24m_32k_p, 0, ++ RK3562_PMU1_CLKSEL_CON(4), 6, 2, MFLAGS, 0, 2, DFLAGS, ++ RK3562_PMU1_CLKGATE_CON(1), 1, GFLAGS), ++ GATE(SCLK_IN_PMU1_SPI0, "sclk_in_pmu1_spi0", "sclk_in_pmu1_spi0_io", 0, ++ RK3562_PMU1_CLKGATE_CON(1), 2, GFLAGS), ++ GATE(PCLK_PMU1_PWM0, "pclk_pmu1_pwm0", "busclk_pdpmu0", 0, ++ RK3562_PMU1_CLKGATE_CON(1), 3, GFLAGS), ++ COMPOSITE(CLK_PMU1_PWM0, "clk_pmu1_pwm0", mux_200m_xin24m_32k_p, 0, ++ RK3562_PMU1_CLKSEL_CON(4), 14, 2, MFLAGS, 8, 2, DFLAGS, ++ RK3562_PMU1_CLKGATE_CON(1), 4, GFLAGS), ++ GATE(CLK_CAPTURE_PMU1_PWM0, "clk_capture_pmu1_pwm0", "xin24m", 0, ++ RK3562_PMU1_CLKGATE_CON(1), 5, GFLAGS), ++ GATE(CLK_PMU1_WIFI, "clk_pmu1_wifi", "xin24m", 0, ++ RK3562_PMU1_CLKGATE_CON(1), 6, GFLAGS), ++ GATE(FCLK_PMU1_CM0_CORE, "fclk_pmu1_cm0_core", "busclk_pdpmu0", 0, ++ RK3562_PMU1_CLKGATE_CON(2), 0, GFLAGS), ++ GATE(CLK_PMU1_CM0_RTC, "clk_pmu1_cm0_rtc", "clk_rtc_32k", 0, ++ RK3562_PMU1_CLKGATE_CON(2), 1, GFLAGS), ++ GATE(PCLK_PMU1_WDTNS, "pclk_pmu1_wdtns", "busclk_pdpmu0", 0, ++ RK3562_PMU1_CLKGATE_CON(2), 3, GFLAGS), ++ GATE(CLK_PMU1_WDTNS, "clk_pmu1_wdtns", "xin24m", 0, ++ RK3562_PMU1_CLKGATE_CON(2), 4, GFLAGS), ++ GATE(PCLK_PMU1_MAILBOX, "pclk_pmu1_mailbox", "busclk_pdpmu0", 0, ++ RK3562_PMU1_CLKGATE_CON(3), 8, GFLAGS), ++ ++ /* PD_RGA */ ++ COMPOSITE(ACLK_RGA_PRE, "aclk_rga_pre", gpll_cpll_pvtpll_dmyapll_p, 0, ++ RK3562_CLKSEL_CON(32), 6, 2, MFLAGS, 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(14), 0, GFLAGS), ++ COMPOSITE_NOMUX(HCLK_RGA_PRE, "hclk_rga_pre", "aclk_rga_jdec", 0, ++ RK3562_CLKSEL_CON(32), 8, 3, DFLAGS, ++ RK3562_CLKGATE_CON(14), 1, GFLAGS), ++ GATE(ACLK_RGA, "aclk_rga", "aclk_rga_jdec", 0, ++ RK3562_CLKGATE_CON(14), 6, GFLAGS), ++ GATE(HCLK_RGA, "hclk_rga", "hclk_rga_pre", 0, ++ RK3562_CLKGATE_CON(14), 7, GFLAGS), ++ COMPOSITE(CLK_RGA_CORE, "clk_rga_core", gpll_cpll_pvtpll_dmyapll_p, 0, ++ RK3562_CLKSEL_CON(33), 6, 2, MFLAGS, 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(14), 8, GFLAGS), ++ GATE(ACLK_JDEC, "aclk_jdec", "aclk_rga_jdec", 0, ++ RK3562_CLKGATE_CON(14), 9, GFLAGS), ++ GATE(HCLK_JDEC, "hclk_jdec", "hclk_rga_pre", 0, ++ RK3562_CLKGATE_CON(14), 10, GFLAGS), ++ ++ /* PD_VDPU */ ++ COMPOSITE(ACLK_VDPU_PRE, "aclk_vdpu_pre", gpll_cpll_pvtpll_dmyapll_p, 0, ++ RK3562_CLKSEL_CON(22), 6, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3562_CLKGATE_CON(10), 0, GFLAGS), ++ COMPOSITE(CLK_RKVDEC_HEVC_CA, "clk_rkvdec_hevc_ca", gpll_cpll_pvtpll_dmyapll_p, 0, ++ RK3562_CLKSEL_CON(23), 14, 2, MFLAGS, 8, 5, DFLAGS, ++ RK3562_CLKGATE_CON(10), 3, GFLAGS), ++ COMPOSITE_NOMUX(HCLK_VDPU_PRE, "hclk_vdpu_pre", "aclk_vdpu", 0, ++ RK3562_CLKSEL_CON(24), 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(10), 4, GFLAGS), ++ GATE(ACLK_RKVDEC, "aclk_rkvdec", "aclk_vdpu", 0, ++ RK3562_CLKGATE_CON(10), 7, GFLAGS), ++ GATE(HCLK_RKVDEC, "hclk_rkvdec", "hclk_vdpu_pre", 0, ++ RK3562_CLKGATE_CON(10), 8, GFLAGS), ++ ++ /* PD_VEPU */ ++ COMPOSITE(CLK_RKVENC_CORE, "clk_rkvenc_core", gpll_cpll_pvtpll_dmyapll_p, 0, ++ RK3562_CLKSEL_CON(20), 6, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3562_CLKGATE_CON(9), 0, GFLAGS), ++ COMPOSITE(ACLK_VEPU_PRE, "aclk_vepu_pre", gpll_cpll_pvtpll_dmyapll_p, 0, ++ RK3562_CLKSEL_CON(20), 14, 2, MFLAGS, 8, 5, DFLAGS, ++ RK3562_CLKGATE_CON(9), 1, GFLAGS), ++ COMPOSITE_NOMUX(HCLK_VEPU_PRE, "hclk_vepu_pre", "aclk_vepu", 0, ++ RK3562_CLKSEL_CON(21), 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(9), 2, GFLAGS), ++ GATE(ACLK_RKVENC, "aclk_rkvenc", "aclk_vepu", 0, ++ RK3562_CLKGATE_CON(9), 5, GFLAGS), ++ GATE(HCLK_RKVENC, "hclk_rkvenc", "hclk_vepu", 0, ++ RK3562_CLKGATE_CON(9), 6, GFLAGS), ++ ++ /* PD_VI */ ++ COMPOSITE(ACLK_VI, "aclk_vi", gpll_cpll_pvtpll_dmyapll_p, 0, ++ RK3562_CLKSEL_CON(25), 6, 2, MFLAGS, 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(11), 0, GFLAGS), ++ COMPOSITE_NOMUX(HCLK_VI, "hclk_vi", "aclk_vi_isp", 0, ++ RK3562_CLKSEL_CON(26), 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(11), 1, GFLAGS), ++ COMPOSITE_NOMUX(PCLK_VI, "pclk_vi", "aclk_vi_isp", 0, ++ RK3562_CLKSEL_CON(26), 8, 4, DFLAGS, ++ RK3562_CLKGATE_CON(11), 2, GFLAGS), ++ GATE(ACLK_ISP, "aclk_isp", "aclk_vi_isp", 0, ++ RK3562_CLKGATE_CON(11), 6, GFLAGS), ++ GATE(HCLK_ISP, "hclk_isp", "hclk_vi", 0, ++ RK3562_CLKGATE_CON(11), 7, GFLAGS), ++ COMPOSITE(CLK_ISP, "clk_isp", gpll_cpll_pvtpll_dmyapll_p, 0, ++ RK3562_CLKSEL_CON(27), 6, 2, MFLAGS, 0, 4, DFLAGS, ++ RK3562_CLKGATE_CON(11), 8, GFLAGS), ++ GATE(ACLK_VICAP, "aclk_vicap", "aclk_vi_isp", 0, ++ RK3562_CLKGATE_CON(11), 9, GFLAGS), ++ GATE(HCLK_VICAP, "hclk_vicap", "hclk_vi", 0, ++ RK3562_CLKGATE_CON(11), 10, GFLAGS), ++ COMPOSITE(DCLK_VICAP, "dclk_vicap", gpll_cpll_pvtpll_dmyapll_p, 0, ++ RK3562_CLKSEL_CON(27), 14, 2, MFLAGS, 8, 4, DFLAGS, ++ RK3562_CLKGATE_CON(11), 11, GFLAGS), ++ GATE(CSIRX0_CLK_DATA, "csirx0_clk_data", "csirx0_clk_data_io", 0, ++ RK3562_CLKGATE_CON(11), 12, GFLAGS), ++ GATE(CSIRX1_CLK_DATA, "csirx1_clk_data", "csirx1_clk_data_io", 0, ++ RK3562_CLKGATE_CON(11), 13, GFLAGS), ++ GATE(CSIRX2_CLK_DATA, "csirx2_clk_data", "csirx2_clk_data_io", 0, ++ RK3562_CLKGATE_CON(11), 14, GFLAGS), ++ GATE(CSIRX3_CLK_DATA, "csirx3_clk_data", "csirx3_clk_data_io", 0, ++ RK3562_CLKGATE_CON(11), 15, GFLAGS), ++ GATE(PCLK_CSIHOST0, "pclk_csihost0", "pclk_vi", 0, ++ RK3562_CLKGATE_CON(12), 0, GFLAGS), ++ GATE(PCLK_CSIHOST1, "pclk_csihost1", "pclk_vi", 0, ++ RK3562_CLKGATE_CON(12), 1, GFLAGS), ++ GATE(PCLK_CSIHOST2, "pclk_csihost2", "pclk_vi", 0, ++ RK3562_CLKGATE_CON(12), 2, GFLAGS), ++ GATE(PCLK_CSIHOST3, "pclk_csihost3", "pclk_vi", 0, ++ RK3562_CLKGATE_CON(12), 3, GFLAGS), ++ GATE(PCLK_CSIPHY0, "pclk_csiphy0", "pclk_vi", 0, ++ RK3562_CLKGATE_CON(12), 4, GFLAGS), ++ GATE(PCLK_CSIPHY1, "pclk_csiphy1", "pclk_vi", 0, ++ RK3562_CLKGATE_CON(12), 5, GFLAGS), ++ ++ /* PD_VO */ ++ COMPOSITE(ACLK_VO_PRE, "aclk_vo_pre", gpll_cpll_vpll_dmyhpll_p, 0, ++ RK3562_CLKSEL_CON(28), 6, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3562_CLKGATE_CON(13), 0, GFLAGS), ++ COMPOSITE_NOMUX(HCLK_VO_PRE, "hclk_vo_pre", "aclk_vo", 0, ++ RK3562_CLKSEL_CON(29), 0, 5, DFLAGS, ++ RK3562_CLKGATE_CON(13), 1, GFLAGS), ++ GATE(ACLK_VOP, "aclk_vop", "aclk_vo", 0, ++ RK3562_CLKGATE_CON(13), 6, GFLAGS), ++ GATE(HCLK_VOP, "hclk_vop", "hclk_vo_pre", 0, ++ RK3562_CLKGATE_CON(13), 7, GFLAGS), ++ COMPOSITE(DCLK_VOP, "dclk_vop", gpll_dmyhpll_vpll_apll_p, CLK_SET_RATE_NO_REPARENT, ++ RK3562_CLKSEL_CON(30), 14, 2, MFLAGS, 0, 8, DFLAGS, ++ RK3562_CLKGATE_CON(13), 8, GFLAGS), ++ COMPOSITE(DCLK_VOP1, "dclk_vop1", gpll_dmyhpll_vpll_apll_p, CLK_SET_RATE_NO_REPARENT, ++ RK3562_CLKSEL_CON(31), 14, 2, MFLAGS, 0, 8, DFLAGS, ++ RK3562_CLKGATE_CON(13), 9, GFLAGS), ++}; ++ ++static void __iomem *rk3562_cru_base; ++ ++static void rk3562_dump_cru(void) ++{ ++ if (rk3562_cru_base) { ++ pr_warn("CRU:\n"); ++ print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, ++ 32, 4, rk3562_cru_base, ++ 0x600, false); ++ } ++} ++ ++static int protect_clocks[] = { ++ ACLK_VO_PRE, ++ HCLK_VO_PRE, ++ ACLK_VOP, ++ HCLK_VOP, ++ DCLK_VOP, ++ DCLK_VOP1, ++}; ++ ++static void __init rk3562_clk_init(struct device_node *np) ++{ ++ struct rockchip_clk_provider *ctx; ++ void __iomem *reg_base; ++ ++ reg_base = of_iomap(np, 0); ++ if (!reg_base) { ++ pr_err("%s: could not map cru region\n", __func__); ++ return; ++ } ++ ++ rk3562_cru_base = reg_base; ++ ++ ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS); ++ if (IS_ERR(ctx)) { ++ pr_err("%s: rockchip clk init failed\n", __func__); ++ iounmap(reg_base); ++ return; ++ } ++ ++ rockchip_clk_register_plls(ctx, rk3562_pll_clks, ++ ARRAY_SIZE(rk3562_pll_clks), ++ RK3562_GRF_SOC_STATUS0); ++ ++ rockchip_clk_register_branches(ctx, rk3562_clk_branches, ++ ARRAY_SIZE(rk3562_clk_branches)); ++ ++ /* (0x30444 - 0x400) / 4 + 1 = 49170 */ ++ rockchip_register_softrst(np, 49170, reg_base + RK3562_SOFTRST_CON(0), ++ ROCKCHIP_SOFTRST_HIWORD_MASK); ++ ++ rockchip_register_restart_notifier(ctx, RK3562_GLB_SRST_FST, NULL); ++ ++ rockchip_clk_of_add_provider(np, ctx); ++ ++ if (!rk_dump_cru) ++ rk_dump_cru = rk3562_dump_cru; ++ ++ rockchip_clk_protect(ctx, protect_clocks, ARRAY_SIZE(protect_clocks)); ++} ++ ++CLK_OF_DECLARE(rk3562_cru, "rockchip,rk3562-cru", rk3562_clk_init); ++ ++#ifdef MODULE ++struct clk_rk3562_inits { ++ void (*inits)(struct device_node *np); ++}; ++ ++static const struct clk_rk3562_inits clk_3562_cru_init = { ++ .inits = rk3562_clk_init, ++}; ++ ++static const struct of_device_id clk_rk3562_match_table[] = { ++ { ++ .compatible = "rockchip,rk3562-cru", ++ .data = &clk_3562_cru_init, ++ }, ++ { } ++}; ++MODULE_DEVICE_TABLE(of, clk_rk3562_match_table); ++ ++static int clk_rk3562_probe(struct platform_device *pdev) ++{ ++ struct device_node *np = pdev->dev.of_node; ++ const struct of_device_id *match; ++ const struct clk_rk3562_inits *init_data; ++ ++ match = of_match_device(clk_rk3562_match_table, &pdev->dev); ++ if (!match || !match->data) ++ return -EINVAL; ++ ++ init_data = match->data; ++ if (init_data->inits) ++ init_data->inits(np); ++ ++ return 0; ++} ++ ++static struct platform_driver clk_rk3562_driver = { ++ .probe = clk_rk3562_probe, ++ .driver = { ++ .name = "clk-rk3562", ++ .of_match_table = clk_rk3562_match_table, ++ .suppress_bind_attrs = true, ++ }, ++}; ++module_platform_driver(clk_rk3562_driver); ++ ++MODULE_DESCRIPTION("Rockchip RK3562 Clock Driver"); ++MODULE_LICENSE("GPL"); ++MODULE_ALIAS("platform:clk-rk3562"); ++#endif /* MODULE */ +diff --git a/drivers/clk/rockchip/clk-rk3568.c b/drivers/clk/rockchip/clk-rk3568.c +new file mode 100755 +index 000000000..0f5ed13a4 +--- /dev/null ++++ b/drivers/clk/rockchip/clk-rk3568.c +@@ -0,0 +1,1769 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (c) 2020 Rockchip Electronics Co. Ltd. ++ * Author: Elaine Zhang ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "clk.h" ++ ++#define RK3568_GRF_SOC_CON1 0x504 ++#define RK3568_GRF_SOC_CON2 0x508 ++#define RK3568_GRF_SOC_STATUS0 0x580 ++#define RK3568_PMU_GRF_SOC_CON0 0x100 ++ ++#define RK3568_FRAC_MAX_PRATE 1000000000 ++#define RK3568_SPDIF_FRAC_MAX_PRATE 600000000 ++#define RK3568_UART_FRAC_MAX_PRATE 600000000 ++#define RK3568_DCLK_PARENT_MAX_PRATE 600000000 ++ ++enum rk3568_pmu_plls { ++ ppll, hpll, ++}; ++ ++enum rk3568_plls { ++ apll, dpll, gpll, cpll, npll, vpll, ++}; ++ ++static struct rockchip_pll_rate_table rk3568_pll_rates[] = { + /* _mhz, _refdiv, _fbdiv, _postdiv1, _postdiv2, _dsmpd, _frac */ + RK3036_PLL_RATE(2208000000, 1, 92, 1, 1, 1, 0), + RK3036_PLL_RATE(2184000000, 1, 91, 1, 1, 1, 0), @@ -117866,11 +115752,6 @@ index 000000000000..44ce9cc542ce + MUX(CLK_RTC_32K, "clk_rtc_32k", clk_rtc32k_pmu_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, + RK3568_PMU_CLKSEL_CON(0), 6, 2, MFLAGS); + -+static struct rockchip_clk_branch rk3568_clk_npu_np5 __initdata = -+ COMPOSITE_HALFDIV(CLK_NPU_NP5, "clk_npu_np5", npll_gpll_p, 0, -+ RK3568_CLKSEL_CON(7), 7, 1, MFLAGS, 4, 2, DFLAGS, -+ RK3568_CLKGATE_CON(3), 1, GFLAGS); -+ +static struct rockchip_clk_branch rk3568_clk_branches[] __initdata = { + /* + * Clock-Architecture Diagram 1 @@ -117995,10 +115876,12 @@ index 000000000000..44ce9cc542ce + RK3568_CLKGATE_CON(2), 9, GFLAGS), + + /* PD_NPU */ -+ COMPOSITE_BROTHER(CLK_NPU_SRC, "clk_npu_src", npll_gpll_p, 0, ++ COMPOSITE(CLK_NPU_SRC, "clk_npu_src", npll_gpll_p, 0, + RK3568_CLKSEL_CON(7), 6, 1, MFLAGS, 0, 4, DFLAGS, -+ RK3568_CLKGATE_CON(3), 0, GFLAGS, -+ &rk3568_clk_npu_np5), ++ RK3568_CLKGATE_CON(3), 0, GFLAGS), ++ COMPOSITE_HALFDIV(CLK_NPU_NP5, "clk_npu_np5", npll_gpll_p, 0, ++ RK3568_CLKSEL_CON(7), 7, 1, MFLAGS, 4, 2, DFLAGS, ++ RK3568_CLKGATE_CON(3), 1, GFLAGS), + MUX(CLK_NPU_PRE_NDFT, "clk_npu_pre_ndft", clk_npu_pre_ndft_p, CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, + RK3568_CLKSEL_CON(7), 8, 1, MFLAGS), + MUX(CLK_NPU, "clk_npu", clk_npu_p, CLK_SET_RATE_PARENT, @@ -118069,7 +115952,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_I2S0_8CH_TX_FRAC, "clk_i2s0_8ch_tx_frac", "clk_i2s0_8ch_tx_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(12), 0, + RK3568_CLKGATE_CON(6), 1, GFLAGS, -+ &rk3568_i2s0_8ch_tx_fracmux, RK3568_FRAC_MAX_PRATE), ++ &rk3568_i2s0_8ch_tx_fracmux), + GATE(MCLK_I2S0_8CH_TX, "mclk_i2s0_8ch_tx", "clk_i2s0_8ch_tx", 0, + RK3568_CLKGATE_CON(6), 2, GFLAGS), + COMPOSITE_NODIV(I2S0_MCLKOUT_TX, "i2s0_mclkout_tx", i2s0_mclkout_tx_p, CLK_SET_RATE_PARENT, @@ -118082,7 +115965,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_I2S0_8CH_RX_FRAC, "clk_i2s0_8ch_rx_frac", "clk_i2s0_8ch_rx_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(14), 0, + RK3568_CLKGATE_CON(6), 5, GFLAGS, -+ &rk3568_i2s0_8ch_rx_fracmux, RK3568_FRAC_MAX_PRATE), ++ &rk3568_i2s0_8ch_rx_fracmux), + GATE(MCLK_I2S0_8CH_RX, "mclk_i2s0_8ch_rx", "clk_i2s0_8ch_rx", 0, + RK3568_CLKGATE_CON(6), 6, GFLAGS), + COMPOSITE_NODIV(I2S0_MCLKOUT_RX, "i2s0_mclkout_rx", i2s0_mclkout_rx_p, CLK_SET_RATE_PARENT, @@ -118095,7 +115978,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_I2S1_8CH_TX_FRAC, "clk_i2s1_8ch_tx_frac", "clk_i2s1_8ch_tx_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(16), 0, + RK3568_CLKGATE_CON(6), 9, GFLAGS, -+ &rk3568_i2s1_8ch_tx_fracmux, RK3568_FRAC_MAX_PRATE), ++ &rk3568_i2s1_8ch_tx_fracmux), + GATE(MCLK_I2S1_8CH_TX, "mclk_i2s1_8ch_tx", "clk_i2s1_8ch_tx", 0, + RK3568_CLKGATE_CON(6), 10, GFLAGS), + COMPOSITE_NODIV(I2S1_MCLKOUT_TX, "i2s1_mclkout_tx", i2s1_mclkout_tx_p, CLK_SET_RATE_PARENT, @@ -118108,7 +115991,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_I2S1_8CH_RX_FRAC, "clk_i2s1_8ch_rx_frac", "clk_i2s1_8ch_rx_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(18), 0, + RK3568_CLKGATE_CON(6), 13, GFLAGS, -+ &rk3568_i2s1_8ch_rx_fracmux, RK3568_FRAC_MAX_PRATE), ++ &rk3568_i2s1_8ch_rx_fracmux), + GATE(MCLK_I2S1_8CH_RX, "mclk_i2s1_8ch_rx", "clk_i2s1_8ch_rx", 0, + RK3568_CLKGATE_CON(6), 14, GFLAGS), + COMPOSITE_NODIV(I2S1_MCLKOUT_RX, "i2s1_mclkout_rx", i2s1_mclkout_rx_p, CLK_SET_RATE_PARENT, @@ -118121,7 +116004,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_I2S2_2CH_FRAC, "clk_i2s2_2ch_frac", "clk_i2s2_2ch_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(20), 0, + RK3568_CLKGATE_CON(7), 1, GFLAGS, -+ &rk3568_i2s2_2ch_fracmux, RK3568_FRAC_MAX_PRATE), ++ &rk3568_i2s2_2ch_fracmux), + GATE(MCLK_I2S2_2CH, "mclk_i2s2_2ch", "clk_i2s2_2ch", 0, + RK3568_CLKGATE_CON(7), 2, GFLAGS), + COMPOSITE_NODIV(I2S2_MCLKOUT, "i2s2_mclkout", i2s2_mclkout_p, CLK_SET_RATE_PARENT, @@ -118134,7 +116017,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_I2S3_2CH_TX_FRAC, "clk_i2s3_2ch_tx_frac", "clk_i2s3_2ch_tx_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(22), 0, + RK3568_CLKGATE_CON(7), 5, GFLAGS, -+ &rk3568_i2s3_2ch_tx_fracmux, RK3568_FRAC_MAX_PRATE), ++ &rk3568_i2s3_2ch_tx_fracmux), + GATE(MCLK_I2S3_2CH_TX, "mclk_i2s3_2ch_tx", "clk_i2s3_2ch_tx", 0, + RK3568_CLKGATE_CON(7), 6, GFLAGS), + COMPOSITE_NODIV(I2S3_MCLKOUT_TX, "i2s3_mclkout_tx", i2s3_mclkout_tx_p, CLK_SET_RATE_PARENT, @@ -118147,7 +116030,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_I2S3_2CH_RX_FRAC, "clk_i2s3_2ch_rx_frac", "clk_i2s3_2ch_rx_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(84), 0, + RK3568_CLKGATE_CON(7), 9, GFLAGS, -+ &rk3568_i2s3_2ch_rx_fracmux, RK3568_FRAC_MAX_PRATE), ++ &rk3568_i2s3_2ch_rx_fracmux), + GATE(MCLK_I2S3_2CH_RX, "mclk_i2s3_2ch_rx", "clk_i2s3_2ch_rx", 0, + RK3568_CLKGATE_CON(7), 10, GFLAGS), + COMPOSITE_NODIV(I2S3_MCLKOUT_RX, "i2s3_mclkout_rx", i2s3_mclkout_rx_p, CLK_SET_RATE_PARENT, @@ -118183,7 +116066,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(MCLK_SPDIF_8CH_FRAC, "mclk_spdif_8ch_frac", "mclk_spdif_8ch_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(24), 0, + RK3568_CLKGATE_CON(7), 15, GFLAGS, -+ &rk3568_spdif_8ch_fracmux, RK3568_SPDIF_FRAC_MAX_PRATE), ++ &rk3568_spdif_8ch_fracmux), + + GATE(HCLK_AUDPWM, "hclk_audpwm", "hclk_gic_audio", 0, + RK3568_CLKGATE_CON(8), 0, GFLAGS), @@ -118193,7 +116076,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(SCLK_AUDPWM_FRAC, "sclk_audpwm_frac", "sclk_audpwm_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(26), 0, + RK3568_CLKGATE_CON(8), 2, GFLAGS, -+ &rk3568_audpwm_fracmux, RK3568_FRAC_MAX_PRATE), ++ &rk3568_audpwm_fracmux), + + GATE(HCLK_ACDCDIG, "hclk_acdcdig", "hclk_gic_audio", 0, + RK3568_CLKGATE_CON(8), 3, GFLAGS), @@ -118397,7 +116280,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_NODIV(HCLK_USB, "hclk_usb", gpll150_gpll100_gpll75_xin24m_p, CLK_IS_CRITICAL, + RK3568_CLKSEL_CON(32), 2, 2, MFLAGS, + RK3568_CLKGATE_CON(16), 1, GFLAGS), -+ COMPOSITE_NOMUX(PCLK_USB, "pclk_usb", "aclk_usb", 0, ++ COMPOSITE_NOMUX(PCLK_USB, "pclk_usb", "aclk_usb", CLK_IS_CRITICAL, + RK3568_CLKSEL_CON(32), 4, 4, DFLAGS, + RK3568_CLKGATE_CON(16), 2, GFLAGS), + GATE(HCLK_USB2HOST0, "hclk_usb2host0", "hclk_usb", 0, @@ -118507,13 +116390,13 @@ index 000000000000..44ce9cc542ce + RK3568_CLKGATE_CON(20), 8, GFLAGS), + GATE(HCLK_VOP, "hclk_vop", "hclk_vo", 0, + RK3568_CLKGATE_CON(20), 9, GFLAGS), -+ COMPOSITE(DCLK_VOP0, "dclk_vop0", hpll_vpll_gpll_cpll_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, ++ COMPOSITE(DCLK_VOP0, "dclk_vop0", hpll_vpll_gpll_cpll_p, CLK_SET_RATE_NO_REPARENT, + RK3568_CLKSEL_CON(39), 10, 2, MFLAGS, 0, 8, DFLAGS, + RK3568_CLKGATE_CON(20), 10, GFLAGS), -+ COMPOSITE_DCLK(DCLK_VOP1, "dclk_vop1", hpll_vpll_gpll_cpll_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, ++ COMPOSITE(DCLK_VOP1, "dclk_vop1", hpll_vpll_gpll_cpll_p, CLK_SET_RATE_NO_REPARENT, + RK3568_CLKSEL_CON(40), 10, 2, MFLAGS, 0, 8, DFLAGS, -+ RK3568_CLKGATE_CON(20), 11, GFLAGS, RK3568_DCLK_PARENT_MAX_PRATE), -+ COMPOSITE(DCLK_VOP2, "dclk_vop2", hpll_vpll_gpll_cpll_p, 0, ++ RK3568_CLKGATE_CON(20), 11, GFLAGS), ++ COMPOSITE(DCLK_VOP2, "dclk_vop2", hpll_vpll_gpll_cpll_p, CLK_SET_RATE_NO_REPARENT, + RK3568_CLKSEL_CON(41), 10, 2, MFLAGS, 0, 8, DFLAGS, + RK3568_CLKGATE_CON(20), 12, GFLAGS), + GATE(CLK_VOP_PWM, "clk_vop_pwm", "xin24m", 0, @@ -118667,7 +116550,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_UART1_FRAC, "clk_uart1_frac", "clk_uart1_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(53), CLK_FRAC_DIVIDER_NO_LIMIT, + RK3568_CLKGATE_CON(27), 14, GFLAGS, -+ &rk3568_uart1_fracmux, RK3568_UART_FRAC_MAX_PRATE), ++ &rk3568_uart1_fracmux), + GATE(SCLK_UART1, "sclk_uart1", "sclk_uart1_mux", 0, + RK3568_CLKGATE_CON(27), 15, GFLAGS), + @@ -118679,7 +116562,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_UART2_FRAC, "clk_uart2_frac", "clk_uart2_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(55), CLK_FRAC_DIVIDER_NO_LIMIT, + RK3568_CLKGATE_CON(28), 2, GFLAGS, -+ &rk3568_uart2_fracmux, RK3568_UART_FRAC_MAX_PRATE), ++ &rk3568_uart2_fracmux), + GATE(SCLK_UART2, "sclk_uart2", "sclk_uart2_mux", 0, + RK3568_CLKGATE_CON(28), 3, GFLAGS), + @@ -118691,7 +116574,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_UART3_FRAC, "clk_uart3_frac", "clk_uart3_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(57), CLK_FRAC_DIVIDER_NO_LIMIT, + RK3568_CLKGATE_CON(28), 6, GFLAGS, -+ &rk3568_uart3_fracmux, RK3568_UART_FRAC_MAX_PRATE), ++ &rk3568_uart3_fracmux), + GATE(SCLK_UART3, "sclk_uart3", "sclk_uart3_mux", 0, + RK3568_CLKGATE_CON(28), 7, GFLAGS), + @@ -118703,7 +116586,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_UART4_FRAC, "clk_uart4_frac", "clk_uart4_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(59), CLK_FRAC_DIVIDER_NO_LIMIT, + RK3568_CLKGATE_CON(28), 10, GFLAGS, -+ &rk3568_uart4_fracmux, RK3568_UART_FRAC_MAX_PRATE), ++ &rk3568_uart4_fracmux), + GATE(SCLK_UART4, "sclk_uart4", "sclk_uart4_mux", 0, + RK3568_CLKGATE_CON(28), 11, GFLAGS), + @@ -118715,7 +116598,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_UART5_FRAC, "clk_uart5_frac", "clk_uart5_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(61), CLK_FRAC_DIVIDER_NO_LIMIT, + RK3568_CLKGATE_CON(28), 14, GFLAGS, -+ &rk3568_uart5_fracmux, RK3568_UART_FRAC_MAX_PRATE), ++ &rk3568_uart5_fracmux), + GATE(SCLK_UART5, "sclk_uart5", "sclk_uart5_mux", 0, + RK3568_CLKGATE_CON(28), 15, GFLAGS), + @@ -118727,7 +116610,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_UART6_FRAC, "clk_uart6_frac", "clk_uart6_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(63), CLK_FRAC_DIVIDER_NO_LIMIT, + RK3568_CLKGATE_CON(29), 2, GFLAGS, -+ &rk3568_uart6_fracmux, RK3568_UART_FRAC_MAX_PRATE), ++ &rk3568_uart6_fracmux), + GATE(SCLK_UART6, "sclk_uart6", "sclk_uart6_mux", 0, + RK3568_CLKGATE_CON(29), 3, GFLAGS), + @@ -118739,7 +116622,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_UART7_FRAC, "clk_uart7_frac", "clk_uart7_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(65), CLK_FRAC_DIVIDER_NO_LIMIT, + RK3568_CLKGATE_CON(29), 6, GFLAGS, -+ &rk3568_uart7_fracmux, RK3568_UART_FRAC_MAX_PRATE), ++ &rk3568_uart7_fracmux), + GATE(SCLK_UART7, "sclk_uart7", "sclk_uart7_mux", 0, + RK3568_CLKGATE_CON(29), 7, GFLAGS), + @@ -118751,7 +116634,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_UART8_FRAC, "clk_uart8_frac", "clk_uart8_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(67), CLK_FRAC_DIVIDER_NO_LIMIT, + RK3568_CLKGATE_CON(29), 10, GFLAGS, -+ &rk3568_uart8_fracmux, RK3568_UART_FRAC_MAX_PRATE), ++ &rk3568_uart8_fracmux), + GATE(SCLK_UART8, "sclk_uart8", "sclk_uart8_mux", 0, + RK3568_CLKGATE_CON(29), 11, GFLAGS), + @@ -118763,7 +116646,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_UART9_FRAC, "clk_uart9_frac", "clk_uart9_src", CLK_SET_RATE_PARENT, + RK3568_CLKSEL_CON(69), CLK_FRAC_DIVIDER_NO_LIMIT, + RK3568_CLKGATE_CON(29), 14, GFLAGS, -+ &rk3568_uart9_fracmux, RK3568_UART_FRAC_MAX_PRATE), ++ &rk3568_uart9_fracmux), + GATE(SCLK_UART9, "sclk_uart9", "sclk_uart9_mux", 0, + RK3568_CLKGATE_CON(29), 15, GFLAGS), + @@ -118826,21 +116709,21 @@ index 000000000000..44ce9cc542ce + RK3568_CLKSEL_CON(72), 6, 1, MFLAGS, RK3568_CLKGATE_CON(31), 1, GFLAGS), + GATE(PCLK_PWM1, "pclk_pwm1", "pclk_bus", 0, RK3568_CLKGATE_CON(31), 10, GFLAGS), + COMPOSITE_NODIV(CLK_PWM1, "clk_pwm1", gpll100_xin24m_cpll100_p, 0, -+ RK3568_CLKSEL_CON(72), 8, 1, MFLAGS, ++ RK3568_CLKSEL_CON(72), 8, 2, MFLAGS, + RK3568_CLKGATE_CON(31), 11, GFLAGS), + GATE(CLK_PWM1_CAPTURE, "clk_pwm1_capture", "xin24m", 0, + RK3568_CLKGATE_CON(31), 12, GFLAGS), + GATE(PCLK_PWM2, "pclk_pwm2", "pclk_bus", 0, + RK3568_CLKGATE_CON(31), 13, GFLAGS), + COMPOSITE_NODIV(CLK_PWM2, "clk_pwm2", gpll100_xin24m_cpll100_p, 0, -+ RK3568_CLKSEL_CON(72), 10, 1, MFLAGS, ++ RK3568_CLKSEL_CON(72), 10, 2, MFLAGS, + RK3568_CLKGATE_CON(31), 14, GFLAGS), + GATE(CLK_PWM2_CAPTURE, "clk_pwm2_capture", "xin24m", 0, + RK3568_CLKGATE_CON(31), 15, GFLAGS), + GATE(PCLK_PWM3, "pclk_pwm3", "pclk_bus", 0, + RK3568_CLKGATE_CON(32), 0, GFLAGS), + COMPOSITE_NODIV(CLK_PWM3, "clk_pwm3", gpll100_xin24m_cpll100_p, 0, -+ RK3568_CLKSEL_CON(72), 12, 1, MFLAGS, ++ RK3568_CLKSEL_CON(72), 12, 2, MFLAGS, + RK3568_CLKGATE_CON(32), 1, GFLAGS), + GATE(CLK_PWM3_CAPTURE, "clk_pwm3_capture", "xin24m", 0, + RK3568_CLKGATE_CON(32), 2, GFLAGS), @@ -118944,7 +116827,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_RTC32K_FRAC, "clk_rtc32k_frac", "xin24m", CLK_IGNORE_UNUSED, + RK3568_PMU_CLKSEL_CON(1), 0, + RK3568_PMU_CLKGATE_CON(0), 1, GFLAGS, -+ &rk3568_rtc32k_pmu_fracmux, 0), ++ &rk3568_rtc32k_pmu_fracmux), + + COMPOSITE_NOMUX(XIN_OSC0_DIV, "xin_osc0_div", "xin24m", CLK_IGNORE_UNUSED, + RK3568_PMU_CLKSEL_CON(0), 0, 5, DFLAGS, @@ -118956,7 +116839,7 @@ index 000000000000..44ce9cc542ce + COMPOSITE_FRACMUX(CLK_UART0_FRAC, "sclk_uart0_frac", "sclk_uart0_div", CLK_SET_RATE_PARENT, + RK3568_PMU_CLKSEL_CON(5), CLK_FRAC_DIVIDER_NO_LIMIT, + RK3568_PMU_CLKGATE_CON(1), 4, GFLAGS, -+ &rk3568_uart0_fracmux, RK3568_UART_FRAC_MAX_PRATE), ++ &rk3568_uart0_fracmux), + GATE(SCLK_UART0, "sclk_uart0", "sclk_uart0_mux", 0, + RK3568_PMU_CLKGATE_CON(1), 5, GFLAGS), + @@ -119057,6 +116940,16 @@ index 000000000000..44ce9cc542ce + } +} + ++static int protect_clocks[] = { ++ ACLK_VO, ++ HCLK_VO, ++ ACLK_VOP, ++ HCLK_VOP, ++ DCLK_VOP0, ++ DCLK_VOP1, ++ DCLK_VOP2, ++}; ++ +static void __init rk3568_pmu_clk_init(struct device_node *np) +{ + struct rockchip_clk_provider *ctx; @@ -119134,10 +117027,13 @@ index 000000000000..44ce9cc542ce + + if (!rk_dump_cru) + rk_dump_cru = rk3568_dump_cru; ++ ++ rockchip_clk_protect(ctx, protect_clocks, ARRAY_SIZE(protect_clocks)); +} + +CLK_OF_DECLARE(rk3568_cru, "rockchip,rk3568-cru", rk3568_clk_init); + ++#ifdef MODULE +struct clk_rk3568_inits { + void (*inits)(struct device_node *np); +}; @@ -119162,7 +117058,7 @@ index 000000000000..44ce9cc542ce +}; +MODULE_DEVICE_TABLE(of, clk_rk3568_match_table); + -+static int __init clk_rk3568_probe(struct platform_device *pdev) ++static int clk_rk3568_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + const struct of_device_id *match; @@ -119180,22 +117076,3848 @@ index 000000000000..44ce9cc542ce +} + +static struct platform_driver clk_rk3568_driver = { ++ .probe = clk_rk3568_probe, + .driver = { + .name = "clk-rk3568", + .of_match_table = clk_rk3568_match_table, + .suppress_bind_attrs = true, + }, +}; -+builtin_platform_driver_probe(clk_rk3568_driver, clk_rk3568_probe); ++module_platform_driver(clk_rk3568_driver); + +MODULE_DESCRIPTION("Rockchip RK3568 Clock Driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:clk-rk3568"); ++#endif /* MODULE */ +diff --git a/drivers/clk/rockchip/clk-rk3588.c b/drivers/clk/rockchip/clk-rk3588.c +new file mode 100644 +index 000000000..adcc1682e +--- /dev/null ++++ b/drivers/clk/rockchip/clk-rk3588.c +@@ -0,0 +1,2532 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (c) 2021 Rockchip Electronics Co. Ltd. ++ * Author: Elaine Zhang ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "clk.h" ++ ++#define RK3588_GRF_SOC_STATUS0 0x600 ++#define RK3588_PHYREF_ALT_GATE 0xc38 ++#define RK3588_FRAC_MAX_PRATE 1500000000 ++#define RK3588_DCLK_MAX_PRATE 594000000 ++ ++enum rk3588_plls { ++ b0pll, b1pll, lpll, v0pll, aupll, cpll, gpll, npll, ppll, ++}; ++ ++static struct rockchip_pll_rate_table rk3588_pll_rates[] = { ++ /* _mhz, _p, _m, _s, _k */ ++ RK3588_PLL_RATE(2520000000, 2, 210, 0, 0), ++ RK3588_PLL_RATE(2496000000, 2, 208, 0, 0), ++ RK3588_PLL_RATE(2472000000, 2, 206, 0, 0), ++ RK3588_PLL_RATE(2448000000, 2, 204, 0, 0), ++ RK3588_PLL_RATE(2424000000, 2, 202, 0, 0), ++ RK3588_PLL_RATE(2400000000, 2, 200, 0, 0), ++ RK3588_PLL_RATE(2376000000, 2, 198, 0, 0), ++ RK3588_PLL_RATE(2352000000, 2, 196, 0, 0), ++ RK3588_PLL_RATE(2328000000, 2, 194, 0, 0), ++ RK3588_PLL_RATE(2304000000, 2, 192, 0, 0), ++ RK3588_PLL_RATE(2280000000, 2, 190, 0, 0), ++ RK3588_PLL_RATE(2256000000, 2, 376, 1, 0), ++ RK3588_PLL_RATE(2232000000, 2, 372, 1, 0), ++ RK3588_PLL_RATE(2208000000, 2, 368, 1, 0), ++ RK3588_PLL_RATE(2184000000, 2, 364, 1, 0), ++ RK3588_PLL_RATE(2160000000, 2, 360, 1, 0), ++ RK3588_PLL_RATE(2136000000, 2, 356, 1, 0), ++ RK3588_PLL_RATE(2112000000, 2, 352, 1, 0), ++ RK3588_PLL_RATE(2088000000, 2, 348, 1, 0), ++ RK3588_PLL_RATE(2064000000, 2, 344, 1, 0), ++ RK3588_PLL_RATE(2040000000, 2, 340, 1, 0), ++ RK3588_PLL_RATE(2016000000, 2, 336, 1, 0), ++ RK3588_PLL_RATE(1992000000, 2, 332, 1, 0), ++ RK3588_PLL_RATE(1968000000, 2, 328, 1, 0), ++ RK3588_PLL_RATE(1944000000, 2, 324, 1, 0), ++ RK3588_PLL_RATE(1920000000, 2, 320, 1, 0), ++ RK3588_PLL_RATE(1896000000, 2, 316, 1, 0), ++ RK3588_PLL_RATE(1872000000, 2, 312, 1, 0), ++ RK3588_PLL_RATE(1848000000, 2, 308, 1, 0), ++ RK3588_PLL_RATE(1824000000, 2, 304, 1, 0), ++ RK3588_PLL_RATE(1800000000, 2, 300, 1, 0), ++ RK3588_PLL_RATE(1776000000, 2, 296, 1, 0), ++ RK3588_PLL_RATE(1752000000, 2, 292, 1, 0), ++ RK3588_PLL_RATE(1728000000, 2, 288, 1, 0), ++ RK3588_PLL_RATE(1704000000, 2, 284, 1, 0), ++ RK3588_PLL_RATE(1680000000, 2, 280, 1, 0), ++ RK3588_PLL_RATE(1656000000, 2, 276, 1, 0), ++ RK3588_PLL_RATE(1632000000, 2, 272, 1, 0), ++ RK3588_PLL_RATE(1608000000, 2, 268, 1, 0), ++ RK3588_PLL_RATE(1584000000, 2, 264, 1, 0), ++ RK3588_PLL_RATE(1560000000, 2, 260, 1, 0), ++ RK3588_PLL_RATE(1536000000, 2, 256, 1, 0), ++ RK3588_PLL_RATE(1512000000, 2, 252, 1, 0), ++ RK3588_PLL_RATE(1488000000, 2, 248, 1, 0), ++ RK3588_PLL_RATE(1464000000, 2, 244, 1, 0), ++ RK3588_PLL_RATE(1440000000, 2, 240, 1, 0), ++ RK3588_PLL_RATE(1416000000, 2, 236, 1, 0), ++ RK3588_PLL_RATE(1392000000, 2, 232, 1, 0), ++ RK3588_PLL_RATE(1320000000, 2, 220, 1, 0), ++ RK3588_PLL_RATE(1200000000, 2, 200, 1, 0), ++ RK3588_PLL_RATE(1188000000, 2, 198, 1, 0), ++ RK3588_PLL_RATE(1100000000, 3, 550, 2, 0), ++ RK3588_PLL_RATE(1008000000, 2, 336, 2, 0), ++ RK3588_PLL_RATE(1000000000, 3, 500, 2, 0), ++ RK3588_PLL_RATE(983040000, 4, 655, 2, 23592), ++ RK3588_PLL_RATE(955520000, 3, 478, 2, 49807), ++ RK3588_PLL_RATE(903168000, 6, 903, 2, 11009), ++ RK3588_PLL_RATE(900000000, 2, 300, 2, 0), ++ RK3588_PLL_RATE(816000000, 2, 272, 2, 0), ++ RK3588_PLL_RATE(786432000, 2, 262, 2, 9437), ++ RK3588_PLL_RATE(786000000, 1, 131, 2, 0), ++ RK3588_PLL_RATE(785560000, 3, 393, 2, 51119), ++ RK3588_PLL_RATE(722534400, 8, 963, 2, 24850), ++ RK3588_PLL_RATE(600000000, 2, 200, 2, 0), ++ RK3588_PLL_RATE(594000000, 1, 99, 2, 0), ++ RK3588_PLL_RATE(408000000, 2, 272, 3, 0), ++ RK3588_PLL_RATE(312000000, 2, 208, 3, 0), ++ RK3588_PLL_RATE(216000000, 2, 288, 4, 0), ++ RK3588_PLL_RATE(96000000, 2, 256, 5, 0), ++ { /* sentinel */ }, ++}; ++ ++#define RK3588_CLK_CORE_B0_SEL_CLEAN_MASK 0x3 ++#define RK3588_CLK_CORE_B0_SEL_CLEAN_SHIFT 13 ++#define RK3588_CLK_CORE_B1_SEL_CLEAN_MASK 0x3 ++#define RK3588_CLK_CORE_B1_SEL_CLEAN_SHIFT 5 ++#define RK3588_CLK_CORE_B0_GPLL_DIV_MASK 0x1f ++#define RK3588_CLK_CORE_B0_GPLL_DIV_SHIFT 1 ++#define RK3588_CLK_CORE_L_SEL_CLEAN_MASK 0x3 ++#define RK3588_CLK_CORE_L1_SEL_CLEAN_SHIFT 12 ++#define RK3588_CLK_CORE_L0_SEL_CLEAN_SHIFT 5 ++#define RK3588_CLK_DSU_SEL_DF_MASK 0x1 ++#define RK3588_CLK_DSU_SEL_DF_SHIFT 15 ++#define RK3588_CLK_DSU_DF_SRC_MASK 0x3 ++#define RK3588_CLK_DSU_DF_SRC_SHIFT 12 ++#define RK3588_CLK_DSU_DF_DIV_MASK 0x1f ++#define RK3588_CLK_DSU_DF_DIV_SHIFT 7 ++#define RK3588_ACLKM_DSU_DIV_MASK 0x1f ++#define RK3588_ACLKM_DSU_DIV_SHIFT 1 ++#define RK3588_ACLKS_DSU_DIV_MASK 0x1f ++#define RK3588_ACLKS_DSU_DIV_SHIFT 6 ++#define RK3588_ACLKMP_DSU_DIV_MASK 0x1f ++#define RK3588_ACLKMP_DSU_DIV_SHIFT 11 ++#define RK3588_PERIPH_DSU_DIV_MASK 0x1f ++#define RK3588_PERIPH_DSU_DIV_SHIFT 0 ++#define RK3588_ATCLK_DSU_DIV_MASK 0x1f ++#define RK3588_ATCLK_DSU_DIV_SHIFT 0 ++#define RK3588_GICCLK_DSU_DIV_MASK 0x1f ++#define RK3588_GICCLK_DSU_DIV_SHIFT 5 ++ ++#define RK3588_CORE_B0_SEL(_apllcore) \ ++{ \ ++ .reg = RK3588_BIGCORE0_CLKSEL_CON(0), \ ++ .val = HIWORD_UPDATE(_apllcore, RK3588_CLK_CORE_B0_SEL_CLEAN_MASK, \ ++ RK3588_CLK_CORE_B0_SEL_CLEAN_SHIFT) | \ ++ HIWORD_UPDATE(0, RK3588_CLK_CORE_B0_GPLL_DIV_MASK, \ ++ RK3588_CLK_CORE_B0_GPLL_DIV_SHIFT), \ ++} ++ ++#define RK3588_CORE_B1_SEL(_apllcore) \ ++{ \ ++ .reg = RK3588_BIGCORE0_CLKSEL_CON(1), \ ++ .val = HIWORD_UPDATE(_apllcore, RK3588_CLK_CORE_B1_SEL_CLEAN_MASK, \ ++ RK3588_CLK_CORE_B1_SEL_CLEAN_SHIFT), \ ++} ++ ++#define RK3588_CORE_B2_SEL(_apllcore) \ ++{ \ ++ .reg = RK3588_BIGCORE1_CLKSEL_CON(0), \ ++ .val = HIWORD_UPDATE(_apllcore, RK3588_CLK_CORE_B0_SEL_CLEAN_MASK, \ ++ RK3588_CLK_CORE_B0_SEL_CLEAN_SHIFT) | \ ++ HIWORD_UPDATE(0, RK3588_CLK_CORE_B0_GPLL_DIV_MASK, \ ++ RK3588_CLK_CORE_B0_GPLL_DIV_SHIFT), \ ++} ++ ++#define RK3588_CORE_B3_SEL(_apllcore) \ ++{ \ ++ .reg = RK3588_BIGCORE1_CLKSEL_CON(1), \ ++ .val = HIWORD_UPDATE(_apllcore, RK3588_CLK_CORE_B1_SEL_CLEAN_MASK, \ ++ RK3588_CLK_CORE_B1_SEL_CLEAN_SHIFT), \ ++} ++ ++#define RK3588_CORE_L_SEL0(_offs, _apllcore) \ ++{ \ ++ .reg = RK3588_DSU_CLKSEL_CON(6 + _offs), \ ++ .val = HIWORD_UPDATE(_apllcore, RK3588_CLK_CORE_L_SEL_CLEAN_MASK, \ ++ RK3588_CLK_CORE_L0_SEL_CLEAN_SHIFT) | \ ++ HIWORD_UPDATE(_apllcore, RK3588_CLK_CORE_L_SEL_CLEAN_MASK, \ ++ RK3588_CLK_CORE_L1_SEL_CLEAN_SHIFT), \ ++} ++ ++#define RK3588_CORE_L_SEL1(_seldsu, _divdsu) \ ++{ \ ++ .reg = RK3588_DSU_CLKSEL_CON(0), \ ++ .val = HIWORD_UPDATE(_seldsu, RK3588_CLK_DSU_DF_SRC_MASK, \ ++ RK3588_CLK_DSU_DF_SRC_SHIFT) | \ ++ HIWORD_UPDATE(_divdsu - 1, RK3588_CLK_DSU_DF_DIV_MASK, \ ++ RK3588_CLK_DSU_DF_DIV_SHIFT), \ ++} ++ ++#define RK3588_CORE_L_SEL2(_aclkm, _aclkmp, _aclks) \ ++{ \ ++ .reg = RK3588_DSU_CLKSEL_CON(1), \ ++ .val = HIWORD_UPDATE(_aclkm - 1, RK3588_ACLKM_DSU_DIV_MASK, \ ++ RK3588_ACLKM_DSU_DIV_SHIFT) | \ ++ HIWORD_UPDATE(_aclkmp - 1, RK3588_ACLKMP_DSU_DIV_MASK, \ ++ RK3588_ACLKMP_DSU_DIV_SHIFT) | \ ++ HIWORD_UPDATE(_aclks - 1, RK3588_ACLKS_DSU_DIV_MASK, \ ++ RK3588_ACLKS_DSU_DIV_SHIFT), \ ++} ++ ++#define RK3588_CORE_L_SEL3(_periph) \ ++{ \ ++ .reg = RK3588_DSU_CLKSEL_CON(2), \ ++ .val = HIWORD_UPDATE(_periph - 1, RK3588_PERIPH_DSU_DIV_MASK, \ ++ RK3588_PERIPH_DSU_DIV_SHIFT), \ ++} ++ ++#define RK3588_CORE_L_SEL4(_gicclk, _atclk) \ ++{ \ ++ .reg = RK3588_DSU_CLKSEL_CON(3), \ ++ .val = HIWORD_UPDATE(_gicclk - 1, RK3588_GICCLK_DSU_DIV_MASK, \ ++ RK3588_GICCLK_DSU_DIV_SHIFT) | \ ++ HIWORD_UPDATE(_atclk - 1, RK3588_ATCLK_DSU_DIV_MASK, \ ++ RK3588_ATCLK_DSU_DIV_SHIFT), \ ++} ++ ++#define RK3588_CPUB01CLK_RATE(_prate, _apllcore) \ ++{ \ ++ .prate = _prate##U, \ ++ .pre_muxs = { \ ++ RK3588_CORE_B0_SEL(0), \ ++ RK3588_CORE_B1_SEL(0), \ ++ }, \ ++ .post_muxs = { \ ++ RK3588_CORE_B0_SEL(_apllcore), \ ++ RK3588_CORE_B1_SEL(_apllcore), \ ++ }, \ ++} ++ ++#define RK3588_CPUB23CLK_RATE(_prate, _apllcore) \ ++{ \ ++ .prate = _prate##U, \ ++ .pre_muxs = { \ ++ RK3588_CORE_B2_SEL(0), \ ++ RK3588_CORE_B3_SEL(0), \ ++ }, \ ++ .post_muxs = { \ ++ RK3588_CORE_B2_SEL(_apllcore), \ ++ RK3588_CORE_B3_SEL(_apllcore), \ ++ }, \ ++} ++ ++#define RK3588_CPULCLK_RATE(_prate, _apllcore, _seldsu, _divdsu) \ ++{ \ ++ .prate = _prate##U, \ ++ .pre_muxs = { \ ++ RK3588_CORE_L_SEL0(0, 0), \ ++ RK3588_CORE_L_SEL0(1, 0), \ ++ RK3588_CORE_L_SEL1(3, 2), \ ++ RK3588_CORE_L_SEL2(2, 3, 3), \ ++ RK3588_CORE_L_SEL3(4), \ ++ RK3588_CORE_L_SEL4(4, 4), \ ++ }, \ ++ .post_muxs = { \ ++ RK3588_CORE_L_SEL0(0, _apllcore), \ ++ RK3588_CORE_L_SEL0(1, _apllcore), \ ++ RK3588_CORE_L_SEL1(_seldsu, _divdsu), \ ++ }, \ ++} ++ ++static struct rockchip_cpuclk_rate_table rk3588_cpub0clk_rates[] __initdata = { ++ RK3588_CPUB01CLK_RATE(2496000000, 1), ++ RK3588_CPUB01CLK_RATE(2400000000, 1), ++ RK3588_CPUB01CLK_RATE(2304000000, 1), ++ RK3588_CPUB01CLK_RATE(2208000000, 1), ++ RK3588_CPUB01CLK_RATE(2184000000, 1), ++ RK3588_CPUB01CLK_RATE(2088000000, 1), ++ RK3588_CPUB01CLK_RATE(2040000000, 1), ++ RK3588_CPUB01CLK_RATE(2016000000, 1), ++ RK3588_CPUB01CLK_RATE(1992000000, 1), ++ RK3588_CPUB01CLK_RATE(1896000000, 1), ++ RK3588_CPUB01CLK_RATE(1800000000, 1), ++ RK3588_CPUB01CLK_RATE(1704000000, 0), ++ RK3588_CPUB01CLK_RATE(1608000000, 0), ++ RK3588_CPUB01CLK_RATE(1584000000, 0), ++ RK3588_CPUB01CLK_RATE(1560000000, 0), ++ RK3588_CPUB01CLK_RATE(1536000000, 0), ++ RK3588_CPUB01CLK_RATE(1512000000, 0), ++ RK3588_CPUB01CLK_RATE(1488000000, 0), ++ RK3588_CPUB01CLK_RATE(1464000000, 0), ++ RK3588_CPUB01CLK_RATE(1440000000, 0), ++ RK3588_CPUB01CLK_RATE(1416000000, 0), ++ RK3588_CPUB01CLK_RATE(1392000000, 0), ++ RK3588_CPUB01CLK_RATE(1368000000, 0), ++ RK3588_CPUB01CLK_RATE(1344000000, 0), ++ RK3588_CPUB01CLK_RATE(1320000000, 0), ++ RK3588_CPUB01CLK_RATE(1296000000, 0), ++ RK3588_CPUB01CLK_RATE(1272000000, 0), ++ RK3588_CPUB01CLK_RATE(1248000000, 0), ++ RK3588_CPUB01CLK_RATE(1224000000, 0), ++ RK3588_CPUB01CLK_RATE(1200000000, 0), ++ RK3588_CPUB01CLK_RATE(1104000000, 0), ++ RK3588_CPUB01CLK_RATE(1008000000, 0), ++ RK3588_CPUB01CLK_RATE(912000000, 0), ++ RK3588_CPUB01CLK_RATE(816000000, 0), ++ RK3588_CPUB01CLK_RATE(696000000, 0), ++ RK3588_CPUB01CLK_RATE(600000000, 0), ++ RK3588_CPUB01CLK_RATE(408000000, 0), ++ RK3588_CPUB01CLK_RATE(312000000, 0), ++ RK3588_CPUB01CLK_RATE(216000000, 0), ++ RK3588_CPUB01CLK_RATE(96000000, 0), ++}; ++ ++static const struct rockchip_cpuclk_reg_data rk3588_cpub0clk_data = { ++ .core_reg[0] = RK3588_BIGCORE0_CLKSEL_CON(0), ++ .div_core_shift[0] = 8, ++ .div_core_mask[0] = 0x1f, ++ .core_reg[1] = RK3588_BIGCORE0_CLKSEL_CON(1), ++ .div_core_shift[1] = 0, ++ .div_core_mask[1] = 0x1f, ++ .num_cores = 2, ++ .mux_core_alt = 1, ++ .mux_core_main = 2, ++ .mux_core_shift = 6, ++ .mux_core_mask = 0x3, ++}; ++ ++static struct rockchip_cpuclk_rate_table rk3588_cpub1clk_rates[] __initdata = { ++ RK3588_CPUB23CLK_RATE(2496000000, 1), ++ RK3588_CPUB23CLK_RATE(2400000000, 1), ++ RK3588_CPUB23CLK_RATE(2304000000, 1), ++ RK3588_CPUB23CLK_RATE(2208000000, 1), ++ RK3588_CPUB23CLK_RATE(2184000000, 1), ++ RK3588_CPUB23CLK_RATE(2088000000, 1), ++ RK3588_CPUB23CLK_RATE(2040000000, 1), ++ RK3588_CPUB23CLK_RATE(2016000000, 1), ++ RK3588_CPUB23CLK_RATE(1992000000, 1), ++ RK3588_CPUB23CLK_RATE(1896000000, 1), ++ RK3588_CPUB23CLK_RATE(1800000000, 1), ++ RK3588_CPUB23CLK_RATE(1704000000, 0), ++ RK3588_CPUB23CLK_RATE(1608000000, 0), ++ RK3588_CPUB23CLK_RATE(1584000000, 0), ++ RK3588_CPUB23CLK_RATE(1560000000, 0), ++ RK3588_CPUB23CLK_RATE(1536000000, 0), ++ RK3588_CPUB23CLK_RATE(1512000000, 0), ++ RK3588_CPUB23CLK_RATE(1488000000, 0), ++ RK3588_CPUB23CLK_RATE(1464000000, 0), ++ RK3588_CPUB23CLK_RATE(1440000000, 0), ++ RK3588_CPUB23CLK_RATE(1416000000, 0), ++ RK3588_CPUB23CLK_RATE(1392000000, 0), ++ RK3588_CPUB23CLK_RATE(1368000000, 0), ++ RK3588_CPUB23CLK_RATE(1344000000, 0), ++ RK3588_CPUB23CLK_RATE(1320000000, 0), ++ RK3588_CPUB23CLK_RATE(1296000000, 0), ++ RK3588_CPUB23CLK_RATE(1272000000, 0), ++ RK3588_CPUB23CLK_RATE(1248000000, 0), ++ RK3588_CPUB23CLK_RATE(1224000000, 0), ++ RK3588_CPUB23CLK_RATE(1200000000, 0), ++ RK3588_CPUB23CLK_RATE(1104000000, 0), ++ RK3588_CPUB23CLK_RATE(1008000000, 0), ++ RK3588_CPUB23CLK_RATE(912000000, 0), ++ RK3588_CPUB23CLK_RATE(816000000, 0), ++ RK3588_CPUB23CLK_RATE(696000000, 0), ++ RK3588_CPUB23CLK_RATE(600000000, 0), ++ RK3588_CPUB23CLK_RATE(408000000, 0), ++ RK3588_CPUB23CLK_RATE(312000000, 0), ++ RK3588_CPUB23CLK_RATE(216000000, 0), ++ RK3588_CPUB23CLK_RATE(96000000, 0), ++}; ++ ++static const struct rockchip_cpuclk_reg_data rk3588_cpub1clk_data = { ++ .core_reg[0] = RK3588_BIGCORE1_CLKSEL_CON(0), ++ .div_core_shift[0] = 8, ++ .div_core_mask[0] = 0x1f, ++ .core_reg[1] = RK3588_BIGCORE1_CLKSEL_CON(1), ++ .div_core_shift[1] = 0, ++ .div_core_mask[1] = 0x1f, ++ .num_cores = 2, ++ .mux_core_alt = 1, ++ .mux_core_main = 2, ++ .mux_core_shift = 6, ++ .mux_core_mask = 0x3, ++}; ++ ++static struct rockchip_cpuclk_rate_table rk3588_cpulclk_rates[] __initdata = { ++ RK3588_CPULCLK_RATE(2208000000, 1, 3, 1), ++ RK3588_CPULCLK_RATE(2184000000, 1, 3, 1), ++ RK3588_CPULCLK_RATE(2088000000, 1, 3, 1), ++ RK3588_CPULCLK_RATE(2040000000, 1, 3, 1), ++ RK3588_CPULCLK_RATE(2016000000, 1, 3, 1), ++ RK3588_CPULCLK_RATE(1992000000, 1, 3, 1), ++ RK3588_CPULCLK_RATE(1896000000, 1, 3, 1), ++ RK3588_CPULCLK_RATE(1800000000, 1, 3, 1), ++ RK3588_CPULCLK_RATE(1704000000, 0, 3, 1), ++ RK3588_CPULCLK_RATE(1608000000, 0, 3, 1), ++ RK3588_CPULCLK_RATE(1584000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1560000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1536000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1512000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1488000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1464000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1440000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1416000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1392000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1368000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1344000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1320000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1296000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1272000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1248000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1224000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1200000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1104000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(1008000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(912000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(816000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(696000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(600000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(408000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(312000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(216000000, 0, 2, 1), ++ RK3588_CPULCLK_RATE(96000000, 0, 2, 1), ++}; ++ ++static const struct rockchip_cpuclk_reg_data rk3588_cpulclk_data = { ++ .core_reg[0] = RK3588_DSU_CLKSEL_CON(6), ++ .div_core_shift[0] = 0, ++ .div_core_mask[0] = 0x1f, ++ .core_reg[1] = RK3588_DSU_CLKSEL_CON(6), ++ .div_core_shift[1] = 7, ++ .div_core_mask[1] = 0x1f, ++ .core_reg[2] = RK3588_DSU_CLKSEL_CON(7), ++ .div_core_shift[2] = 0, ++ .div_core_mask[2] = 0x1f, ++ .core_reg[3] = RK3588_DSU_CLKSEL_CON(7), ++ .div_core_shift[3] = 7, ++ .div_core_mask[3] = 0x1f, ++ .num_cores = 4, ++ .mux_core_reg = RK3588_DSU_CLKSEL_CON(5), ++ .mux_core_alt = 1, ++ .mux_core_main = 2, ++ .mux_core_shift = 14, ++ .mux_core_mask = 0x3, ++}; ++ ++PNAME(mux_pll_p) = { "xin24m", "xin32k" }; ++PNAME(mux_armclkl_p) = { "xin24m", "gpll", "lpll" }; ++PNAME(mux_armclkb01_p) = { "xin24m", "gpll", "b0pll",}; ++PNAME(mux_armclkb23_p) = { "xin24m", "gpll", "b1pll",}; ++PNAME(b0pll_b1pll_lpll_gpll_p) = { "b0pll", "b1pll", "lpll", "gpll" }; ++PNAME(gpll_24m_p) = { "gpll", "xin24m" }; ++PNAME(gpll_aupll_p) = { "gpll", "aupll" }; ++PNAME(gpll_lpll_p) = { "gpll", "lpll" }; ++PNAME(gpll_cpll_p) = { "gpll", "cpll" }; ++PNAME(gpll_spll_p) = { "gpll", "spll" }; ++PNAME(gpll_cpll_24m_p) = { "gpll", "cpll", "xin24m"}; ++PNAME(gpll_cpll_aupll_p) = { "gpll", "cpll", "aupll"}; ++PNAME(gpll_cpll_npll_p) = { "gpll", "cpll", "npll"}; ++PNAME(gpll_cpll_npll_v0pll_p) = { "gpll", "cpll", "npll", "v0pll"}; ++PNAME(gpll_cpll_24m_spll_p) = { "gpll", "cpll", "xin24m", "spll" }; ++PNAME(gpll_cpll_aupll_spll_p) = { "gpll", "cpll", "aupll", "spll" }; ++PNAME(gpll_cpll_aupll_npll_p) = { "gpll", "cpll", "aupll", "npll" }; ++PNAME(gpll_cpll_v0pll_aupll_p) = { "gpll", "cpll", "v0pll", "aupll" }; ++PNAME(gpll_cpll_v0pll_spll_p) = { "gpll", "cpll", "v0pll", "spll" }; ++PNAME(gpll_cpll_aupll_npll_spll_p) = { "gpll", "cpll", "aupll", "npll", "spll" }; ++PNAME(gpll_cpll_dmyaupll_npll_spll_p) = { "gpll", "cpll", "dummy_aupll", "npll", "spll" }; ++PNAME(gpll_cpll_npll_aupll_spll_p) = { "gpll", "cpll", "npll", "aupll", "spll" }; ++PNAME(gpll_cpll_npll_1000m_p) = { "gpll", "cpll", "npll", "clk_1000m_src" }; ++PNAME(mux_24m_spll_gpll_cpll_p) = { "xin24m", "spll", "gpll", "cpll" }; ++PNAME(mux_24m_32k_p) = { "xin24m", "xin32k" }; ++PNAME(mux_24m_100m_p) = { "xin24m", "clk_100m_src" }; ++PNAME(mux_200m_100m_p) = { "clk_200m_src", "clk_100m_src" }; ++PNAME(mux_100m_50m_24m_p) = { "clk_100m_src", "clk_50m_src", "xin24m" }; ++PNAME(mux_150m_50m_24m_p) = { "clk_150m_src", "clk_50m_src", "xin24m" }; ++PNAME(mux_150m_100m_24m_p) = { "clk_150m_src", "clk_100m_src", "xin24m" }; ++PNAME(mux_200m_150m_24m_p) = { "clk_200m_src", "clk_150m_src", "xin24m" }; ++PNAME(mux_150m_100m_50m_24m_p) = { "clk_150m_src", "clk_100m_src", "clk_50m_src", "xin24m" }; ++PNAME(mux_200m_100m_50m_24m_p) = { "clk_200m_src", "clk_100m_src", "clk_50m_src", "xin24m" }; ++PNAME(mux_300m_200m_100m_24m_p) = { "clk_300m_src", "clk_200m_src", "clk_100m_src", "xin24m" }; ++PNAME(mux_700m_400m_200m_24m_p) = { "clk_700m_src", "clk_400m_src", "clk_200m_src", "xin24m" }; ++PNAME(mux_500m_250m_100m_24m_p) = { "clk_500m_src", "clk_250m_src", "clk_100m_src", "xin24m" }; ++PNAME(mux_500m_300m_100m_24m_p) = { "clk_500m_src", "clk_300m_src", "clk_100m_src", "xin24m" }; ++PNAME(mux_400m_200m_100m_24m_p) = {"clk_400m_src", "clk_200m_src", "clk_100m_src", "xin24m" }; ++PNAME(clk_i2s2_2ch_p) = { "clk_i2s2_2ch_src", "clk_i2s2_2ch_frac", "i2s2_mclkin", "xin12m" }; ++PNAME(i2s2_2ch_mclkout_p) = { "mclk_i2s2_2ch", "xin12m" }; ++PNAME(clk_i2s3_2ch_p) = { "clk_i2s3_2ch_src", "clk_i2s3_2ch_frac", "i2s3_mclkin", "xin12m" }; ++PNAME(i2s3_2ch_mclkout_p) = { "mclk_i2s3_2ch", "xin12m" }; ++PNAME(clk_i2s0_8ch_tx_p) = { "clk_i2s0_8ch_tx_src", "clk_i2s0_8ch_tx_frac", "i2s0_mclkin", "xin12m" }; ++PNAME(clk_i2s0_8ch_rx_p) = { "clk_i2s0_8ch_rx_src", "clk_i2s0_8ch_rx_frac", "i2s0_mclkin", "xin12m" }; ++PNAME(i2s0_8ch_mclkout_p) = { "mclk_i2s0_8ch_tx", "mclk_i2s0_8ch_rx", "xin12m" }; ++PNAME(clk_i2s1_8ch_tx_p) = { "clk_i2s1_8ch_tx_src", "clk_i2s1_8ch_tx_frac", "i2s1_mclkin", "xin12m" }; ++PNAME(clk_i2s1_8ch_rx_p) = { "clk_i2s1_8ch_rx_src", "clk_i2s1_8ch_rx_frac", "i2s1_mclkin", "xin12m" }; ++PNAME(i2s1_8ch_mclkout_p) = { "mclk_i2s1_8ch_tx", "mclk_i2s1_8ch_rx", "xin12m" }; ++PNAME(clk_i2s4_8ch_tx_p) = { "clk_i2s4_8ch_tx_src", "clk_i2s4_8ch_tx_frac", "i2s4_mclkin", "xin12m" }; ++PNAME(clk_i2s5_8ch_tx_p) = { "clk_i2s5_8ch_tx_src", "clk_i2s5_8ch_tx_frac", "i2s5_mclkin", "xin12m" }; ++PNAME(clk_i2s6_8ch_tx_p) = { "clk_i2s6_8ch_tx_src", "clk_i2s6_8ch_tx_frac", "i2s6_mclkin", "xin12m" }; ++PNAME(clk_i2s6_8ch_rx_p) = { "clk_i2s6_8ch_rx_src", "clk_i2s6_8ch_rx_frac", "i2s6_mclkin", "xin12m" }; ++PNAME(i2s6_8ch_mclkout_p) = { "mclk_i2s6_8ch_tx", "mclk_i2s6_8ch_rx", "xin12m" }; ++PNAME(clk_i2s7_8ch_rx_p) = { "clk_i2s7_8ch_rx_src", "clk_i2s7_8ch_rx_frac", "i2s7_mclkin", "xin12m" }; ++PNAME(clk_i2s8_8ch_tx_p) = { "clk_i2s8_8ch_tx_src", "clk_i2s8_8ch_tx_frac", "i2s8_mclkin", "xin12m" }; ++PNAME(clk_i2s9_8ch_rx_p) = { "clk_i2s9_8ch_rx_src", "clk_i2s9_8ch_rx_frac", "i2s9_mclkin", "xin12m" }; ++PNAME(clk_i2s10_8ch_rx_p) = { "clk_i2s10_8ch_rx_src", "clk_i2s10_8ch_rx_frac", "i2s10_mclkin", "xin12m" }; ++PNAME(clk_spdif0_p) = { "clk_spdif0_src", "clk_spdif0_frac", "xin12m" }; ++PNAME(clk_spdif1_p) = { "clk_spdif1_src", "clk_spdif1_frac", "xin12m" }; ++PNAME(clk_spdif2_dp0_p) = { "clk_spdif2_dp0_src", "clk_spdif2_dp0_frac", "xin12m" }; ++PNAME(clk_spdif3_p) = { "clk_spdif3_src", "clk_spdif3_frac", "xin12m" }; ++PNAME(clk_spdif4_p) = { "clk_spdif4_src", "clk_spdif4_frac", "xin12m" }; ++PNAME(clk_spdif5_dp1_p) = { "clk_spdif5_dp1_src", "clk_spdif5_dp1_frac", "xin12m" }; ++PNAME(clk_uart0_p) = { "clk_uart0_src", "clk_uart0_frac", "xin24m" }; ++PNAME(clk_uart1_p) = { "clk_uart1_src", "clk_uart1_frac", "xin24m" }; ++PNAME(clk_uart2_p) = { "clk_uart2_src", "clk_uart2_frac", "xin24m" }; ++PNAME(clk_uart3_p) = { "clk_uart3_src", "clk_uart3_frac", "xin24m" }; ++PNAME(clk_uart4_p) = { "clk_uart4_src", "clk_uart4_frac", "xin24m" }; ++PNAME(clk_uart5_p) = { "clk_uart5_src", "clk_uart5_frac", "xin24m" }; ++PNAME(clk_uart6_p) = { "clk_uart6_src", "clk_uart6_frac", "xin24m" }; ++PNAME(clk_uart7_p) = { "clk_uart7_src", "clk_uart7_frac", "xin24m" }; ++PNAME(clk_uart8_p) = { "clk_uart8_src", "clk_uart8_frac", "xin24m" }; ++PNAME(clk_uart9_p) = { "clk_uart9_src", "clk_uart9_frac", "xin24m" }; ++PNAME(clk_gmac0_ptp_ref_p) = { "cpll", "clk_gmac0_ptpref_io" }; ++PNAME(clk_gmac1_ptp_ref_p) = { "cpll", "clk_gmac1_ptpref_io" }; ++PNAME(clk_hdmirx_aud_p) = { "clk_hdmirx_aud_src", "clk_hdmirx_aud_frac" }; ++PNAME(aclk_hdcp1_root_p) = { "gpll", "cpll", "clk_hdmitrx_refsrc" }; ++PNAME(aclk_vop_sub_src_p) = { "aclk_vop_root", "aclk_vop_div2_src" }; ++PNAME(dclk_vop0_p) = { "dclk_vop0_src", "clk_hdmiphy_pixel0", "clk_hdmiphy_pixel1" }; ++PNAME(dclk_vop1_p) = { "dclk_vop1_src", "clk_hdmiphy_pixel0", "clk_hdmiphy_pixel1" }; ++PNAME(dclk_vop2_p) = { "dclk_vop2_src", "clk_hdmiphy_pixel0", "clk_hdmiphy_pixel1" }; ++PNAME(pmu_200m_100m_p) = { "clk_pmu1_200m_src", "clk_pmu1_100m_src" }; ++PNAME(pmu_300m_24m_p) = { "clk_300m_src", "xin24m" }; ++PNAME(pmu_400m_24m_p) = { "clk_400m_src", "xin24m" }; ++PNAME(pmu_100m_50m_24m_src_p) = { "clk_pmu1_100m_src", "clk_pmu1_50m_src", "xin24m" }; ++PNAME(pmu_24m_32k_100m_src_p) = { "xin24m", "32k", "clk_pmu1_100m_src" }; ++PNAME(hclk_pmu1_root_p) = { "clk_pmu1_200m_src", "clk_pmu1_100m_src", "clk_pmu1_50m_src", "xin24m" }; ++PNAME(hclk_pmu_cm0_root_p) = { "clk_pmu1_400m_src", "clk_pmu1_200m_src", "clk_pmu1_100m_src", "xin24m" }; ++PNAME(mclk_pdm0_p) = { "clk_pmu1_300m_src", "clk_pmu1_200m_src" }; ++PNAME(mux_24m_ppll_spll_p) = { "xin24m", "ppll", "spll" }; ++PNAME(mux_24m_ppll_p) = { "xin24m", "ppll" }; ++PNAME(clk_ref_pipe_phy0_p) = { "clk_ref_pipe_phy0_osc_src", "clk_ref_pipe_phy0_pll_src" }; ++PNAME(clk_ref_pipe_phy1_p) = { "clk_ref_pipe_phy1_osc_src", "clk_ref_pipe_phy1_pll_src" }; ++PNAME(clk_ref_pipe_phy2_p) = { "clk_ref_pipe_phy2_osc_src", "clk_ref_pipe_phy2_pll_src" }; ++ ++#define MFLAGS CLK_MUX_HIWORD_MASK ++#define DFLAGS CLK_DIVIDER_HIWORD_MASK ++#define GFLAGS (CLK_GATE_HIWORD_MASK | CLK_GATE_SET_TO_DISABLE) ++ ++static struct rockchip_clk_branch rk3588_i2s0_8ch_tx_fracmux __initdata = ++ MUX(CLK_I2S0_8CH_TX, "clk_i2s0_8ch_tx", clk_i2s0_8ch_tx_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(26), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_i2s0_8ch_rx_fracmux __initdata = ++ MUX(CLK_I2S0_8CH_RX, "clk_i2s0_8ch_rx", clk_i2s0_8ch_rx_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(28), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_i2s1_8ch_tx_fracmux __initdata = ++ MUX(CLK_I2S1_8CH_TX, "clk_i2s1_8ch_tx", clk_i2s1_8ch_tx_p, CLK_SET_RATE_PARENT, ++ RK3588_PMU_CLKSEL_CON(7), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_i2s1_8ch_rx_fracmux __initdata = ++ MUX(CLK_I2S1_8CH_RX, "clk_i2s1_8ch_rx", clk_i2s1_8ch_rx_p, CLK_SET_RATE_PARENT, ++ RK3588_PMU_CLKSEL_CON(9), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_i2s2_2ch_fracmux __initdata = ++ MUX(CLK_I2S2_2CH, "clk_i2s2_2ch", clk_i2s2_2ch_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(30), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_i2s3_2ch_fracmux __initdata = ++ MUX(CLK_I2S3_2CH, "clk_i2s3_2ch", clk_i2s3_2ch_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(32), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_i2s4_8ch_tx_fracmux __initdata = ++ MUX(CLK_I2S4_8CH_TX, "clk_i2s4_8ch_tx", clk_i2s4_8ch_tx_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(120), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_i2s5_8ch_tx_fracmux __initdata = ++ MUX(CLK_I2S5_8CH_TX, "clk_i2s5_8ch_tx", clk_i2s5_8ch_tx_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(142), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_i2s6_8ch_tx_fracmux __initdata = ++ MUX(CLK_I2S6_8CH_TX, "clk_i2s6_8ch_tx", clk_i2s6_8ch_tx_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(146), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_i2s6_8ch_rx_fracmux __initdata = ++ MUX(CLK_I2S6_8CH_RX, "clk_i2s6_8ch_rx", clk_i2s6_8ch_rx_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(148), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_i2s7_8ch_rx_fracmux __initdata = ++ MUX(CLK_I2S7_8CH_RX, "clk_i2s7_8ch_rx", clk_i2s7_8ch_rx_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(131), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_i2s8_8ch_tx_fracmux __initdata = ++ MUX(CLK_I2S8_8CH_TX, "clk_i2s8_8ch_tx", clk_i2s8_8ch_tx_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(122), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_i2s9_8ch_rx_fracmux __initdata = ++ MUX(CLK_I2S9_8CH_RX, "clk_i2s9_8ch_rx", clk_i2s9_8ch_rx_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(155), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_i2s10_8ch_rx_fracmux __initdata = ++ MUX(CLK_I2S10_8CH_RX, "clk_i2s10_8ch_rx", clk_i2s10_8ch_rx_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(157), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_spdif0_fracmux __initdata = ++ MUX(CLK_SPDIF0, "clk_spdif0", clk_spdif0_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(34), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_spdif1_fracmux __initdata = ++ MUX(CLK_SPDIF1, "clk_spdif1", clk_spdif1_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(36), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_spdif2_dp0_fracmux __initdata = ++ MUX(CLK_SPDIF2_DP0, "clk_spdif2_dp0", clk_spdif2_dp0_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(124), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_spdif3_fracmux __initdata = ++ MUX(CLK_SPDIF3, "clk_spdif3", clk_spdif3_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(150), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_spdif4_fracmux __initdata = ++ MUX(CLK_SPDIF4, "clk_spdif4", clk_spdif4_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(152), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_spdif5_dp1_fracmux __initdata = ++ MUX(CLK_SPDIF5_DP1, "clk_spdif5_dp1", clk_spdif5_dp1_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(126), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_uart0_fracmux __initdata = ++ MUX(CLK_UART0, "clk_uart0", clk_uart0_p, CLK_SET_RATE_PARENT, ++ RK3588_PMU_CLKSEL_CON(5), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_uart1_fracmux __initdata = ++ MUX(CLK_UART1, "clk_uart1", clk_uart1_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(43), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_uart2_fracmux __initdata = ++ MUX(CLK_UART2, "clk_uart2", clk_uart2_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(45), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_uart3_fracmux __initdata = ++ MUX(CLK_UART3, "clk_uart3", clk_uart3_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(47), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_uart4_fracmux __initdata = ++ MUX(CLK_UART4, "clk_uart4", clk_uart4_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(49), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_uart5_fracmux __initdata = ++ MUX(CLK_UART5, "clk_uart5", clk_uart5_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(51), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_uart6_fracmux __initdata = ++ MUX(CLK_UART6, "clk_uart6", clk_uart6_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(53), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_uart7_fracmux __initdata = ++ MUX(CLK_UART7, "clk_uart7", clk_uart7_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(55), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_uart8_fracmux __initdata = ++ MUX(CLK_UART8, "clk_uart8", clk_uart8_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(57), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_uart9_fracmux __initdata = ++ MUX(CLK_UART9, "clk_uart9", clk_uart9_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(59), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rk3588_hdmirx_aud_fracmux __initdata = ++ MUX(CLK_HDMIRX_AUD_P_MUX, "clk_hdmirx_aud_mux", clk_hdmirx_aud_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(140), 0, 1, MFLAGS); ++ ++static struct rockchip_pll_clock rk3588_pll_clks[] __initdata = { ++ [b0pll] = PLL(pll_rk3588_core, PLL_B0PLL, "b0pll", mux_pll_p, ++ CLK_IGNORE_UNUSED, RK3588_B0_PLL_CON(0), ++ RK3588_B0_PLL_MODE_CON0, 0, 15, 0, rk3588_pll_rates), ++ [b1pll] = PLL(pll_rk3588_core, PLL_B1PLL, "b1pll", mux_pll_p, ++ CLK_IGNORE_UNUSED, RK3588_B1_PLL_CON(8), ++ RK3588_B1_PLL_MODE_CON0, 0, 15, 0, rk3588_pll_rates), ++ [lpll] = PLL(pll_rk3588_core, PLL_LPLL, "lpll", mux_pll_p, ++ CLK_IGNORE_UNUSED, RK3588_LPLL_CON(16), ++ RK3588_LPLL_MODE_CON0, 0, 15, 0, rk3588_pll_rates), ++ [v0pll] = PLL(pll_rk3588, PLL_V0PLL, "v0pll", mux_pll_p, ++ 0, RK3588_PLL_CON(88), ++ RK3588_MODE_CON0, 4, 15, 0, rk3588_pll_rates), ++ [aupll] = PLL(pll_rk3588, PLL_AUPLL, "aupll", mux_pll_p, ++ 0, RK3588_PLL_CON(96), ++ RK3588_MODE_CON0, 6, 15, 0, rk3588_pll_rates), ++ [cpll] = PLL(pll_rk3588, PLL_CPLL, "cpll", mux_pll_p, ++ CLK_IGNORE_UNUSED, RK3588_PLL_CON(104), ++ RK3588_MODE_CON0, 8, 15, 0, rk3588_pll_rates), ++ [gpll] = PLL(pll_rk3588, PLL_GPLL, "gpll", mux_pll_p, ++ CLK_IGNORE_UNUSED, RK3588_PLL_CON(112), ++ RK3588_MODE_CON0, 2, 15, 0, rk3588_pll_rates), ++ [npll] = PLL(pll_rk3588, PLL_NPLL, "npll", mux_pll_p, ++ 0, RK3588_PLL_CON(120), ++ RK3588_MODE_CON0, 0, 15, 0, rk3588_pll_rates), ++ [ppll] = PLL(pll_rk3588_core, PLL_PPLL, "ppll", mux_pll_p, ++ CLK_IGNORE_UNUSED, RK3588_PMU_PLL_CON(128), ++ RK3588_MODE_CON0, 10, 15, 0, rk3588_pll_rates), ++}; ++ ++static struct rockchip_clk_branch rk3588_clk_branches[] __initdata = { ++ /* ++ * CRU Clock-Architecture ++ */ ++ /* fixed */ ++ FACTOR(0, "xin12m", "xin24m", 0, 1, 2), ++ ++ /* top */ ++ COMPOSITE(CLK_50M_SRC, "clk_50m_src", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(0), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 0, GFLAGS), ++ COMPOSITE(CLK_100M_SRC, "clk_100m_src", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(0), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 1, GFLAGS), ++ COMPOSITE(CLK_150M_SRC, "clk_150m_src", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(1), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 2, GFLAGS), ++ COMPOSITE(CLK_200M_SRC, "clk_200m_src", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(1), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 3, GFLAGS), ++ COMPOSITE(CLK_250M_SRC, "clk_250m_src", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(2), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 4, GFLAGS), ++ COMPOSITE(CLK_300M_SRC, "clk_300m_src", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(2), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 5, GFLAGS), ++ COMPOSITE(CLK_350M_SRC, "clk_350m_src", gpll_spll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(3), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 6, GFLAGS), ++ COMPOSITE(CLK_400M_SRC, "clk_400m_src", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(3), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 7, GFLAGS), ++ COMPOSITE_HALFDIV(CLK_450M_SRC, "clk_450m_src", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(4), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 8, GFLAGS), ++ COMPOSITE(CLK_500M_SRC, "clk_500m_src", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(4), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 9, GFLAGS), ++ COMPOSITE(CLK_600M_SRC, "clk_600m_src", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(5), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 10, GFLAGS), ++ COMPOSITE(CLK_650M_SRC, "clk_650m_src", gpll_lpll_p, 0, ++ RK3588_CLKSEL_CON(5), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 11, GFLAGS), ++ COMPOSITE(CLK_700M_SRC, "clk_700m_src", gpll_spll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(6), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 12, GFLAGS), ++ COMPOSITE(CLK_800M_SRC, "clk_800m_src", gpll_aupll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(6), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 13, GFLAGS), ++ COMPOSITE_HALFDIV(CLK_1000M_SRC, "clk_1000m_src", gpll_cpll_npll_v0pll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(7), 5, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 14, GFLAGS), ++ COMPOSITE(CLK_1200M_SRC, "clk_1200m_src", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(7), 12, 1, MFLAGS, 7, 5, DFLAGS, ++ RK3588_CLKGATE_CON(0), 15, GFLAGS), ++ COMPOSITE_NODIV(ACLK_TOP_M300_ROOT, "aclk_top_m300_root", mux_300m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(9), 0, 2, MFLAGS, ++ RK3588_CLKGATE_CON(1), 10, GFLAGS), ++ COMPOSITE_NODIV(ACLK_TOP_M500_ROOT, "aclk_top_m500_root", mux_500m_300m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(9), 2, 2, MFLAGS, ++ RK3588_CLKGATE_CON(1), 11, GFLAGS), ++ COMPOSITE_NODIV(ACLK_TOP_M400_ROOT, "aclk_top_m400_root", mux_400m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(9), 4, 2, MFLAGS, ++ RK3588_CLKGATE_CON(1), 12, GFLAGS), ++ COMPOSITE_NODIV(ACLK_TOP_S200_ROOT, "aclk_top_s200_root", mux_200m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(9), 6, 2, MFLAGS, ++ RK3588_CLKGATE_CON(1), 13, GFLAGS), ++ COMPOSITE_NODIV(ACLK_TOP_S400_ROOT, "aclk_top_s400_root", mux_400m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(9), 8, 2, MFLAGS, ++ RK3588_CLKGATE_CON(1), 14, GFLAGS), ++ COMPOSITE(ACLK_TOP_ROOT, "aclk_top_root", gpll_cpll_aupll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(8), 5, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(1), 0, GFLAGS), ++ COMPOSITE_NODIV(PCLK_TOP_ROOT, "pclk_top_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(8), 7, 2, MFLAGS, ++ RK3588_CLKGATE_CON(1), 1, GFLAGS), ++ COMPOSITE(ACLK_LOW_TOP_ROOT, "aclk_low_top_root", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(8), 14, 1, MFLAGS, 9, 5, DFLAGS, ++ RK3588_CLKGATE_CON(1), 2, GFLAGS), ++ COMPOSITE(CLK_MIPI_CAMARAOUT_M0, "clk_mipi_camaraout_m0", mux_24m_spll_gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(18), 8, 2, MFLAGS, 0, 8, DFLAGS, ++ RK3588_CLKGATE_CON(5), 9, GFLAGS), ++ COMPOSITE(CLK_MIPI_CAMARAOUT_M1, "clk_mipi_camaraout_m1", mux_24m_spll_gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(19), 8, 2, MFLAGS, 0, 8, DFLAGS, ++ RK3588_CLKGATE_CON(5), 10, GFLAGS), ++ COMPOSITE(CLK_MIPI_CAMARAOUT_M2, "clk_mipi_camaraout_m2", mux_24m_spll_gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(20), 8, 2, MFLAGS, 0, 8, DFLAGS, ++ RK3588_CLKGATE_CON(5), 11, GFLAGS), ++ COMPOSITE(CLK_MIPI_CAMARAOUT_M3, "clk_mipi_camaraout_m3", mux_24m_spll_gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(21), 8, 2, MFLAGS, 0, 8, DFLAGS, ++ RK3588_CLKGATE_CON(5), 12, GFLAGS), ++ COMPOSITE(CLK_MIPI_CAMARAOUT_M4, "clk_mipi_camaraout_m4", mux_24m_spll_gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(22), 8, 2, MFLAGS, 0, 8, DFLAGS, ++ RK3588_CLKGATE_CON(5), 13, GFLAGS), ++ COMPOSITE(MCLK_GMAC0_OUT, "mclk_gmac0_out", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(15), 7, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3588_CLKGATE_CON(5), 3, GFLAGS), ++ COMPOSITE(REFCLKO25M_ETH0_OUT, "refclko25m_eth0_out", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(15), 15, 1, MFLAGS, 8, 7, DFLAGS, ++ RK3588_CLKGATE_CON(5), 4, GFLAGS), ++ COMPOSITE(REFCLKO25M_ETH1_OUT, "refclko25m_eth1_out", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(16), 7, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3588_CLKGATE_CON(5), 5, GFLAGS), ++ COMPOSITE(CLK_CIFOUT_OUT, "clk_cifout_out", gpll_cpll_24m_spll_p, 0, ++ RK3588_CLKSEL_CON(17), 8, 2, MFLAGS, 0, 8, DFLAGS, ++ RK3588_CLKGATE_CON(5), 6, GFLAGS), ++ GATE(PCLK_MIPI_DCPHY0, "pclk_mipi_dcphy0", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(3), 14, GFLAGS), ++ GATE(PCLK_MIPI_DCPHY1, "pclk_mipi_dcphy1", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(4), 3, GFLAGS), ++ GATE(PCLK_CSIPHY0, "pclk_csiphy0", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(1), 6, GFLAGS), ++ GATE(PCLK_CSIPHY1, "pclk_csiphy1", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(1), 8, GFLAGS), ++ GATE(PCLK_CRU, "pclk_cru", "pclk_top_root", CLK_IS_CRITICAL, ++ RK3588_CLKGATE_CON(5), 0, GFLAGS), ++ ++ /* bigcore0 */ ++ COMPOSITE_NODIV(PCLK_BIGCORE0_ROOT, "pclk_bigcore0_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3588_BIGCORE0_CLKSEL_CON(2), 0, 2, MFLAGS, ++ RK3588_BIGCORE0_CLKGATE_CON(0), 14, GFLAGS), ++ GATE(PCLK_BIGCORE0_PVTM, "pclk_bigcore0_pvtm", "pclk_bigcore0_root", 0, ++ RK3588_BIGCORE0_CLKGATE_CON(1), 0, GFLAGS), ++ GATE(CLK_BIGCORE0_PVTM, "clk_bigcore0_pvtm", "xin24m", 0, ++ RK3588_BIGCORE0_CLKGATE_CON(0), 12, GFLAGS), ++ GATE(CLK_CORE_BIGCORE0_PVTM, "clk_core_bigcore0_pvtm", "armclk_b01", 0, ++ RK3588_BIGCORE0_CLKGATE_CON(0), 13, GFLAGS), ++ ++ /* bigcore1 */ ++ COMPOSITE_NODIV(PCLK_BIGCORE1_ROOT, "pclk_bigcore1_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3588_BIGCORE1_CLKSEL_CON(2), 0, 2, MFLAGS, ++ RK3588_BIGCORE1_CLKGATE_CON(0), 14, GFLAGS), ++ GATE(PCLK_BIGCORE1_PVTM, "pclk_bigcore1_pvtm", "pclk_bigcore1_root", 0, ++ RK3588_BIGCORE1_CLKGATE_CON(1), 0, GFLAGS), ++ GATE(CLK_BIGCORE1_PVTM, "clk_bigcore1_pvtm", "xin24m", 0, ++ RK3588_BIGCORE1_CLKGATE_CON(0), 12, GFLAGS), ++ GATE(CLK_CORE_BIGCORE1_PVTM, "clk_core_bigcore1_pvtm", "armclk_b23", 0, ++ RK3588_BIGCORE1_CLKGATE_CON(0), 13, GFLAGS), ++ ++ /* dsu */ ++ COMPOSITE(0, "sclk_dsu", b0pll_b1pll_lpll_gpll_p, CLK_IS_CRITICAL, ++ RK3588_DSU_CLKSEL_CON(0), 12, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_DSU_CLKGATE_CON(0), 4, GFLAGS), ++ COMPOSITE_NOMUX(0, "atclk_dsu", "sclk_dsu", CLK_IS_CRITICAL, ++ RK3588_DSU_CLKSEL_CON(3), 0, 5, DFLAGS | CLK_DIVIDER_READ_ONLY, ++ RK3588_DSU_CLKGATE_CON(1), 0, GFLAGS), ++ COMPOSITE_NOMUX(0, "gicclk_dsu", "sclk_dsu", CLK_IS_CRITICAL, ++ RK3588_DSU_CLKSEL_CON(3), 5, 5, DFLAGS | CLK_DIVIDER_READ_ONLY, ++ RK3588_DSU_CLKGATE_CON(1), 1, GFLAGS), ++ COMPOSITE_NOMUX(0, "aclkmp_dsu", "sclk_dsu", CLK_IS_CRITICAL, ++ RK3588_DSU_CLKSEL_CON(1), 11, 5, DFLAGS | CLK_DIVIDER_READ_ONLY, ++ RK3588_DSU_CLKGATE_CON(0), 12, GFLAGS), ++ COMPOSITE_NOMUX(0, "aclkm_dsu", "sclk_dsu", CLK_IS_CRITICAL, ++ RK3588_DSU_CLKSEL_CON(1), 1, 5, DFLAGS | CLK_DIVIDER_READ_ONLY, ++ RK3588_DSU_CLKGATE_CON(0), 8, GFLAGS), ++ COMPOSITE_NOMUX(0, "aclks_dsu", "sclk_dsu", CLK_IS_CRITICAL, ++ RK3588_DSU_CLKSEL_CON(1), 6, 5, DFLAGS | CLK_DIVIDER_READ_ONLY, ++ RK3588_DSU_CLKGATE_CON(0), 9, GFLAGS), ++ COMPOSITE_NOMUX(0, "periph_dsu", "sclk_dsu", CLK_IS_CRITICAL, ++ RK3588_DSU_CLKSEL_CON(2), 0, 5, DFLAGS | CLK_DIVIDER_READ_ONLY, ++ RK3588_DSU_CLKGATE_CON(0), 13, GFLAGS), ++ COMPOSITE_NOMUX(0, "cntclk_dsu", "periph_dsu", CLK_IS_CRITICAL, ++ RK3588_DSU_CLKSEL_CON(2), 5, 5, DFLAGS | CLK_DIVIDER_READ_ONLY, ++ RK3588_DSU_CLKGATE_CON(0), 14, GFLAGS), ++ COMPOSITE_NOMUX(0, "tsclk_dsu", "periph_dsu", CLK_IS_CRITICAL, ++ RK3588_DSU_CLKSEL_CON(2), 10, 5, DFLAGS | CLK_DIVIDER_READ_ONLY, ++ RK3588_DSU_CLKGATE_CON(0), 15, GFLAGS), ++ COMPOSITE_NODIV(PCLK_DSU_S_ROOT, "pclk_dsu_s_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3588_DSU_CLKSEL_CON(4), 11, 2, MFLAGS, ++ RK3588_DSU_CLKGATE_CON(2), 2, GFLAGS), ++ COMPOSITE(PCLK_DSU_ROOT, "pclk_dsu_root", b0pll_b1pll_lpll_gpll_p, CLK_IS_CRITICAL, ++ RK3588_DSU_CLKSEL_CON(4), 5, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_DSU_CLKGATE_CON(1), 3, GFLAGS), ++ COMPOSITE_NODIV(PCLK_DSU_NS_ROOT, "pclk_dsu_ns_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3588_DSU_CLKSEL_CON(4), 7, 2, MFLAGS, ++ RK3588_DSU_CLKGATE_CON(1), 4, GFLAGS), ++ GATE(PCLK_LITCORE_PVTM, "pclk_litcore_pvtm", "pclk_dsu_ns_root", 0, ++ RK3588_DSU_CLKGATE_CON(2), 6, GFLAGS), ++ GATE(PCLK_DBG, "pclk_dbg", "pclk_dsu_root", CLK_IS_CRITICAL, ++ RK3588_DSU_CLKGATE_CON(1), 7, GFLAGS), ++ GATE(PCLK_DSU, "pclk_dsu", "pclk_dsu_root", CLK_IS_CRITICAL, ++ RK3588_DSU_CLKGATE_CON(1), 6, GFLAGS), ++ GATE(PCLK_S_DAPLITE, "pclk_s_daplite", "pclk_dsu_ns_root", CLK_IGNORE_UNUSED, ++ RK3588_DSU_CLKGATE_CON(1), 8, GFLAGS), ++ GATE(PCLK_M_DAPLITE, "pclk_m_daplite", "pclk_dsu_root", CLK_IGNORE_UNUSED, ++ RK3588_DSU_CLKGATE_CON(1), 9, GFLAGS), ++ GATE(CLK_LITCORE_PVTM, "clk_litcore_pvtm", "xin24m", 0, ++ RK3588_DSU_CLKGATE_CON(2), 0, GFLAGS), ++ GATE(CLK_CORE_LITCORE_PVTM, "clk_core_litcore_pvtm", "armclk_l", 0, ++ RK3588_DSU_CLKGATE_CON(2), 1, GFLAGS), ++ ++ /* audio */ ++ COMPOSITE_NODIV(HCLK_AUDIO_ROOT, "hclk_audio_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(24), 0, 2, MFLAGS, ++ RK3588_CLKGATE_CON(7), 0, GFLAGS), ++ COMPOSITE_NODIV(PCLK_AUDIO_ROOT, "pclk_audio_root", mux_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(24), 2, 2, MFLAGS, ++ RK3588_CLKGATE_CON(7), 1, GFLAGS), ++ GATE(HCLK_I2S2_2CH, "hclk_i2s2_2ch", "hclk_audio_root", 0, ++ RK3588_CLKGATE_CON(7), 12, GFLAGS), ++ GATE(HCLK_I2S3_2CH, "hclk_i2s3_2ch", "hclk_audio_root", 0, ++ RK3588_CLKGATE_CON(7), 13, GFLAGS), ++ COMPOSITE(CLK_I2S2_2CH_SRC, "clk_i2s2_2ch_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(28), 9, 1, MFLAGS, 4, 5, DFLAGS, ++ RK3588_CLKGATE_CON(7), 14, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S2_2CH_FRAC, "clk_i2s2_2ch_frac", "clk_i2s2_2ch_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(29), 0, ++ RK3588_CLKGATE_CON(7), 15, GFLAGS, ++ &rk3588_i2s2_2ch_fracmux), ++ GATE(MCLK_I2S2_2CH, "mclk_i2s2_2ch", "clk_i2s2_2ch", 0, ++ RK3588_CLKGATE_CON(8), 0, GFLAGS), ++ MUX(I2S2_2CH_MCLKOUT, "i2s2_2ch_mclkout", i2s2_2ch_mclkout_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(30), 2, 1, MFLAGS), ++ ++ COMPOSITE(CLK_I2S3_2CH_SRC, "clk_i2s3_2ch_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(30), 8, 1, MFLAGS, 3, 5, DFLAGS, ++ RK3588_CLKGATE_CON(8), 1, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S3_2CH_FRAC, "clk_i2s3_2ch_frac", "clk_i2s3_2ch_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(31), 0, ++ RK3588_CLKGATE_CON(8), 2, GFLAGS, ++ &rk3588_i2s3_2ch_fracmux), ++ GATE(MCLK_I2S3_2CH, "mclk_i2s3_2ch", "clk_i2s3_2ch", 0, ++ RK3588_CLKGATE_CON(8), 3, GFLAGS), ++ GATE(CLK_DAC_ACDCDIG, "clk_dac_acdcdig", "mclk_i2s3_2ch", 0, ++ RK3588_CLKGATE_CON(8), 4, GFLAGS), ++ MUX(I2S3_2CH_MCLKOUT, "i2s3_2ch_mclkout", i2s3_2ch_mclkout_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(32), 2, 1, MFLAGS), ++ GATE(PCLK_ACDCDIG, "pclk_acdcdig", "pclk_audio_root", 0, ++ RK3588_CLKGATE_CON(7), 11, GFLAGS), ++ GATE(HCLK_I2S0_8CH, "hclk_i2s0_8ch", "hclk_audio_root", 0, ++ RK3588_CLKGATE_CON(7), 4, GFLAGS), ++ ++ COMPOSITE(CLK_I2S0_8CH_TX_SRC, "clk_i2s0_8ch_tx_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(24), 9, 1, MFLAGS, 4, 5, DFLAGS, ++ RK3588_CLKGATE_CON(7), 5, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S0_8CH_TX_FRAC, "clk_i2s0_8ch_tx_frac", "clk_i2s0_8ch_tx_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(25), 0, ++ RK3588_CLKGATE_CON(7), 6, GFLAGS, ++ &rk3588_i2s0_8ch_tx_fracmux), ++ GATE(MCLK_I2S0_8CH_TX, "mclk_i2s0_8ch_tx", "clk_i2s0_8ch_tx", 0, ++ RK3588_CLKGATE_CON(7), 7, GFLAGS), ++ ++ COMPOSITE(CLK_I2S0_8CH_RX_SRC, "clk_i2s0_8ch_rx_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(26), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(7), 8, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S0_8CH_RX_FRAC, "clk_i2s0_8ch_rx_frac", "clk_i2s0_8ch_rx_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(27), 0, ++ RK3588_CLKGATE_CON(7), 9, GFLAGS, ++ &rk3588_i2s0_8ch_rx_fracmux), ++ GATE(MCLK_I2S0_8CH_RX, "mclk_i2s0_8ch_rx", "clk_i2s0_8ch_rx", 0, ++ RK3588_CLKGATE_CON(7), 10, GFLAGS), ++ MUX(I2S0_8CH_MCLKOUT, "i2s0_8ch_mclkout", i2s0_8ch_mclkout_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(28), 2, 2, MFLAGS), ++ ++ GATE(HCLK_PDM1, "hclk_pdm1", "hclk_audio_root", 0, ++ RK3588_CLKGATE_CON(9), 6, GFLAGS), ++ COMPOSITE(MCLK_PDM1, "mclk_pdm1", gpll_cpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(36), 7, 2, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(9), 7, GFLAGS), ++ ++ GATE(HCLK_SPDIF0, "hclk_spdif0", "hclk_audio_root", 0, ++ RK3588_CLKGATE_CON(8), 14, GFLAGS), ++ COMPOSITE(CLK_SPDIF0_SRC, "clk_spdif0_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(32), 8, 1, MFLAGS, 3, 5, DFLAGS, ++ RK3588_CLKGATE_CON(8), 15, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_SPDIF0_FRAC, "clk_spdif0_frac", "clk_spdif0_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(33), 0, ++ RK3588_CLKGATE_CON(9), 0, GFLAGS, ++ &rk3588_spdif0_fracmux), ++ GATE(MCLK_SPDIF0, "mclk_spdif0", "clk_spdif0", 0, ++ RK3588_CLKGATE_CON(9), 1, GFLAGS), ++ ++ GATE(HCLK_SPDIF1, "hclk_spdif1", "hclk_audio_root", 0, ++ RK3588_CLKGATE_CON(9), 2, GFLAGS), ++ COMPOSITE(CLK_SPDIF1_SRC, "clk_spdif1_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(34), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(9), 3, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_SPDIF1_FRAC, "clk_spdif1_frac", "clk_spdif1_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(35), 0, ++ RK3588_CLKGATE_CON(9), 4, GFLAGS, ++ &rk3588_spdif1_fracmux), ++ GATE(MCLK_SPDIF1, "mclk_spdif1", "clk_spdif1", 0, ++ RK3588_CLKGATE_CON(9), 5, GFLAGS), ++ ++ COMPOSITE(ACLK_AV1_ROOT, "aclk_av1_root", gpll_cpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(163), 5, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(68), 0, GFLAGS), ++ COMPOSITE_NODIV(PCLK_AV1_ROOT, "pclk_av1_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(163), 7, 2, MFLAGS, ++ RK3588_CLKGATE_CON(68), 3, GFLAGS), ++ ++ /* bus */ ++ COMPOSITE(ACLK_BUS_ROOT, "aclk_bus_root", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(38), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(10), 0, GFLAGS), ++ ++ GATE(PCLK_MAILBOX0, "pclk_mailbox0", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(16), 11, GFLAGS), ++ GATE(PCLK_MAILBOX1, "pclk_mailbox1", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(16), 12, GFLAGS), ++ GATE(PCLK_MAILBOX2, "pclk_mailbox2", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(16), 13, GFLAGS), ++ GATE(PCLK_PMU2, "pclk_pmu2", "pclk_top_root", CLK_IS_CRITICAL, ++ RK3588_CLKGATE_CON(19), 3, GFLAGS), ++ GATE(PCLK_PMUCM0_INTMUX, "pclk_pmucm0_intmux", "pclk_top_root", CLK_IS_CRITICAL, ++ RK3588_CLKGATE_CON(19), 4, GFLAGS), ++ GATE(PCLK_DDRCM0_INTMUX, "pclk_ddrcm0_intmux", "pclk_top_root", CLK_IS_CRITICAL, ++ RK3588_CLKGATE_CON(19), 5, GFLAGS), ++ ++ GATE(PCLK_PWM1, "pclk_pwm1", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(15), 3, GFLAGS), ++ COMPOSITE_NODIV(CLK_PWM1, "clk_pwm1", mux_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(59), 12, 2, MFLAGS, ++ RK3588_CLKGATE_CON(15), 4, GFLAGS), ++ GATE(CLK_PWM1_CAPTURE, "clk_pwm1_capture", "xin24m", 0, ++ RK3588_CLKGATE_CON(15), 5, GFLAGS), ++ GATE(PCLK_PWM2, "pclk_pwm2", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(15), 6, GFLAGS), ++ COMPOSITE_NODIV(CLK_PWM2, "clk_pwm2", mux_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(59), 14, 2, MFLAGS, ++ RK3588_CLKGATE_CON(15), 7, GFLAGS), ++ GATE(CLK_PWM2_CAPTURE, "clk_pwm2_capture", "xin24m", 0, ++ RK3588_CLKGATE_CON(15), 8, GFLAGS), ++ GATE(PCLK_PWM3, "pclk_pwm3", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(15), 9, GFLAGS), ++ COMPOSITE_NODIV(CLK_PWM3, "clk_pwm3", mux_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(60), 0, 2, MFLAGS, ++ RK3588_CLKGATE_CON(15), 10, GFLAGS), ++ GATE(CLK_PWM3_CAPTURE, "clk_pwm3_capture", "xin24m", 0, ++ RK3588_CLKGATE_CON(15), 11, GFLAGS), ++ ++ GATE(PCLK_BUSTIMER0, "pclk_bustimer0", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(15), 12, GFLAGS), ++ GATE(PCLK_BUSTIMER1, "pclk_bustimer1", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(15), 13, GFLAGS), ++ COMPOSITE_NODIV(CLK_BUS_TIMER_ROOT, "clk_bus_timer_root", mux_24m_100m_p, 0, ++ RK3588_CLKSEL_CON(60), 2, 1, MFLAGS, ++ RK3588_CLKGATE_CON(15), 14, GFLAGS), ++ GATE(CLK_BUSTIMER0, "clk_bustimer0", "clk_bus_timer_root", 0, ++ RK3588_CLKGATE_CON(15), 15, GFLAGS), ++ GATE(CLK_BUSTIMER1, "clk_bustimer1", "clk_bus_timer_root", 0, ++ RK3588_CLKGATE_CON(16), 0, GFLAGS), ++ GATE(CLK_BUSTIMER2, "clk_bustimer2", "clk_bus_timer_root", 0, ++ RK3588_CLKGATE_CON(16), 1, GFLAGS), ++ GATE(CLK_BUSTIMER3, "clk_bustimer3", "clk_bus_timer_root", 0, ++ RK3588_CLKGATE_CON(16), 2, GFLAGS), ++ GATE(CLK_BUSTIMER4, "clk_bustimer4", "clk_bus_timer_root", 0, ++ RK3588_CLKGATE_CON(16), 3, GFLAGS), ++ GATE(CLK_BUSTIMER5, "clk_bustimer5", "clk_bus_timer_root", 0, ++ RK3588_CLKGATE_CON(16), 4, GFLAGS), ++ GATE(CLK_BUSTIMER6, "clk_bustimer6", "clk_bus_timer_root", 0, ++ RK3588_CLKGATE_CON(16), 5, GFLAGS), ++ GATE(CLK_BUSTIMER7, "clk_bustimer7", "clk_bus_timer_root", 0, ++ RK3588_CLKGATE_CON(16), 6, GFLAGS), ++ GATE(CLK_BUSTIMER8, "clk_bustimer8", "clk_bus_timer_root", 0, ++ RK3588_CLKGATE_CON(16), 7, GFLAGS), ++ GATE(CLK_BUSTIMER9, "clk_bustimer9", "clk_bus_timer_root", 0, ++ RK3588_CLKGATE_CON(16), 8, GFLAGS), ++ GATE(CLK_BUSTIMER10, "clk_bustimer10", "clk_bus_timer_root", 0, ++ RK3588_CLKGATE_CON(16), 9, GFLAGS), ++ GATE(CLK_BUSTIMER11, "clk_bustimer11", "clk_bus_timer_root", 0, ++ RK3588_CLKGATE_CON(16), 10, GFLAGS), ++ ++ GATE(PCLK_WDT0, "pclk_wdt0", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(15), 0, GFLAGS), ++ GATE(TCLK_WDT0, "tclk_wdt0", "xin24m", 0, ++ RK3588_CLKGATE_CON(15), 1, GFLAGS), ++ ++ GATE(PCLK_CAN0, "pclk_can0", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(11), 8, GFLAGS), ++ COMPOSITE(CLK_CAN0, "clk_can0", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(39), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(11), 9, GFLAGS), ++ GATE(PCLK_CAN1, "pclk_can1", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(11), 10, GFLAGS), ++ COMPOSITE(CLK_CAN1, "clk_can1", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(39), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RK3588_CLKGATE_CON(11), 11, GFLAGS), ++ GATE(PCLK_CAN2, "pclk_can2", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(11), 12, GFLAGS), ++ COMPOSITE(CLK_CAN2, "clk_can2", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(40), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(11), 13, GFLAGS), ++ ++ GATE(ACLK_DECOM, "aclk_decom", "aclk_bus_root", 0, ++ RK3588_CLKGATE_CON(17), 6, GFLAGS), ++ GATE(PCLK_DECOM, "pclk_decom", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(17), 7, GFLAGS), ++ COMPOSITE(DCLK_DECOM, "dclk_decom", gpll_spll_p, 0, ++ RK3588_CLKSEL_CON(62), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(17), 8, GFLAGS), ++ GATE(ACLK_DMAC0, "aclk_dmac0", "aclk_bus_root", 0, ++ RK3588_CLKGATE_CON(10), 5, GFLAGS), ++ GATE(ACLK_DMAC1, "aclk_dmac1", "aclk_bus_root", 0, ++ RK3588_CLKGATE_CON(10), 6, GFLAGS), ++ GATE(ACLK_DMAC2, "aclk_dmac2", "aclk_bus_root", 0, ++ RK3588_CLKGATE_CON(10), 7, GFLAGS), ++ GATE(ACLK_GIC, "aclk_gic", "aclk_bus_root", CLK_IS_CRITICAL, ++ RK3588_CLKGATE_CON(10), 3, GFLAGS), ++ ++ GATE(PCLK_GPIO1, "pclk_gpio1", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(16), 14, GFLAGS), ++ COMPOSITE(DBCLK_GPIO1, "dbclk_gpio1", mux_24m_32k_p, 0, ++ RK3588_CLKSEL_CON(60), 8, 1, MFLAGS, 3, 5, DFLAGS, ++ RK3588_CLKGATE_CON(16), 15, GFLAGS), ++ GATE(PCLK_GPIO2, "pclk_gpio2", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(17), 0, GFLAGS), ++ COMPOSITE(DBCLK_GPIO2, "dbclk_gpio2", mux_24m_32k_p, 0, ++ RK3588_CLKSEL_CON(60), 14, 1, MFLAGS, 9, 5, DFLAGS, ++ RK3588_CLKGATE_CON(17), 1, GFLAGS), ++ GATE(PCLK_GPIO3, "pclk_gpio3", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(17), 2, GFLAGS), ++ COMPOSITE(DBCLK_GPIO3, "dbclk_gpio3", mux_24m_32k_p, 0, ++ RK3588_CLKSEL_CON(61), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(17), 3, GFLAGS), ++ GATE(PCLK_GPIO4, "pclk_gpio4", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(17), 4, GFLAGS), ++ COMPOSITE(DBCLK_GPIO4, "dbclk_gpio4", mux_24m_32k_p, 0, ++ RK3588_CLKSEL_CON(61), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RK3588_CLKGATE_CON(17), 5, GFLAGS), ++ ++ GATE(PCLK_I2C1, "pclk_i2c1", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(10), 8, GFLAGS), ++ GATE(PCLK_I2C2, "pclk_i2c2", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(10), 9, GFLAGS), ++ GATE(PCLK_I2C3, "pclk_i2c3", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(10), 10, GFLAGS), ++ GATE(PCLK_I2C4, "pclk_i2c4", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(10), 11, GFLAGS), ++ GATE(PCLK_I2C5, "pclk_i2c5", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(10), 12, GFLAGS), ++ GATE(PCLK_I2C6, "pclk_i2c6", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(10), 13, GFLAGS), ++ GATE(PCLK_I2C7, "pclk_i2c7", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(10), 14, GFLAGS), ++ GATE(PCLK_I2C8, "pclk_i2c8", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(10), 15, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C1, "clk_i2c1", mux_200m_100m_p, 0, ++ RK3588_CLKSEL_CON(38), 6, 1, MFLAGS, ++ RK3588_CLKGATE_CON(11), 0, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C2, "clk_i2c2", mux_200m_100m_p, 0, ++ RK3588_CLKSEL_CON(38), 7, 1, MFLAGS, ++ RK3588_CLKGATE_CON(11), 1, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C3, "clk_i2c3", mux_200m_100m_p, 0, ++ RK3588_CLKSEL_CON(38), 8, 1, MFLAGS, ++ RK3588_CLKGATE_CON(11), 2, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C4, "clk_i2c4", mux_200m_100m_p, 0, ++ RK3588_CLKSEL_CON(38), 9, 1, MFLAGS, ++ RK3588_CLKGATE_CON(11), 3, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C5, "clk_i2c5", mux_200m_100m_p, 0, ++ RK3588_CLKSEL_CON(38), 10, 1, MFLAGS, ++ RK3588_CLKGATE_CON(11), 4, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C6, "clk_i2c6", mux_200m_100m_p, 0, ++ RK3588_CLKSEL_CON(38), 11, 1, MFLAGS, ++ RK3588_CLKGATE_CON(11), 5, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C7, "clk_i2c7", mux_200m_100m_p, 0, ++ RK3588_CLKSEL_CON(38), 12, 1, MFLAGS, ++ RK3588_CLKGATE_CON(11), 6, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C8, "clk_i2c8", mux_200m_100m_p, 0, ++ RK3588_CLKSEL_CON(38), 13, 1, MFLAGS, ++ RK3588_CLKGATE_CON(11), 7, GFLAGS), ++ ++ GATE(PCLK_OTPC_NS, "pclk_otpc_ns", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(18), 9, GFLAGS), ++ GATE(CLK_OTPC_NS, "clk_otpc_ns", "xin24m", 0, ++ RK3588_CLKGATE_CON(18), 10, GFLAGS), ++ GATE(CLK_OTPC_ARB, "clk_otpc_arb", "xin24m", 0, ++ RK3588_CLKGATE_CON(18), 11, GFLAGS), ++ GATE(CLK_OTP_PHY_G, "clk_otp_phy_g", "xin24m", 0, ++ RK3588_CLKGATE_CON(18), 13, GFLAGS), ++ GATE(CLK_OTPC_AUTO_RD_G, "clk_otpc_auto_rd_g", "xin24m", 0, ++ RK3588_CLKGATE_CON(18), 12, GFLAGS), ++ ++ GATE(PCLK_SARADC, "pclk_saradc", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(11), 14, GFLAGS), ++ COMPOSITE(CLK_SARADC, "clk_saradc", gpll_24m_p, 0, ++ RK3588_CLKSEL_CON(40), 14, 1, MFLAGS, 6, 8, DFLAGS, ++ RK3588_CLKGATE_CON(11), 15, GFLAGS), ++ ++ GATE(PCLK_SPI0, "pclk_spi0", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(14), 6, GFLAGS), ++ GATE(PCLK_SPI1, "pclk_spi1", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(14), 7, GFLAGS), ++ GATE(PCLK_SPI2, "pclk_spi2", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(14), 8, GFLAGS), ++ GATE(PCLK_SPI3, "pclk_spi3", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(14), 9, GFLAGS), ++ GATE(PCLK_SPI4, "pclk_spi4", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(14), 10, GFLAGS), ++ COMPOSITE_NODIV(CLK_SPI0, "clk_spi0", mux_200m_150m_24m_p, 0, ++ RK3588_CLKSEL_CON(59), 2, 2, MFLAGS, ++ RK3588_CLKGATE_CON(14), 11, GFLAGS), ++ COMPOSITE_NODIV(CLK_SPI1, "clk_spi1", mux_200m_150m_24m_p, 0, ++ RK3588_CLKSEL_CON(59), 4, 2, MFLAGS, ++ RK3588_CLKGATE_CON(14), 12, GFLAGS), ++ COMPOSITE_NODIV(CLK_SPI2, "clk_spi2", mux_200m_150m_24m_p, 0, ++ RK3588_CLKSEL_CON(59), 6, 2, MFLAGS, ++ RK3588_CLKGATE_CON(14), 13, GFLAGS), ++ COMPOSITE_NODIV(CLK_SPI3, "clk_spi3", mux_200m_150m_24m_p, 0, ++ RK3588_CLKSEL_CON(59), 8, 2, MFLAGS, ++ RK3588_CLKGATE_CON(14), 14, GFLAGS), ++ COMPOSITE_NODIV(CLK_SPI4, "clk_spi4", mux_200m_150m_24m_p, 0, ++ RK3588_CLKSEL_CON(59), 10, 2, MFLAGS, ++ RK3588_CLKGATE_CON(14), 15, GFLAGS), ++ ++ GATE(ACLK_SPINLOCK, "aclk_spinlock", "aclk_bus_root", CLK_IGNORE_UNUSED, ++ RK3588_CLKGATE_CON(18), 6, GFLAGS), ++ GATE(PCLK_TSADC, "pclk_tsadc", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(12), 0, GFLAGS), ++ COMPOSITE(CLK_TSADC, "clk_tsadc", gpll_24m_p, 0, ++ RK3588_CLKSEL_CON(41), 8, 1, MFLAGS, 0, 8, DFLAGS, ++ RK3588_CLKGATE_CON(12), 1, GFLAGS), ++ ++ GATE(PCLK_UART1, "pclk_uart1", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(12), 2, GFLAGS), ++ GATE(PCLK_UART2, "pclk_uart2", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(12), 3, GFLAGS), ++ GATE(PCLK_UART3, "pclk_uart3", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(12), 4, GFLAGS), ++ GATE(PCLK_UART4, "pclk_uart4", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(12), 5, GFLAGS), ++ GATE(PCLK_UART5, "pclk_uart5", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(12), 6, GFLAGS), ++ GATE(PCLK_UART6, "pclk_uart6", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(12), 7, GFLAGS), ++ GATE(PCLK_UART7, "pclk_uart7", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(12), 8, GFLAGS), ++ GATE(PCLK_UART8, "pclk_uart8", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(12), 9, GFLAGS), ++ GATE(PCLK_UART9, "pclk_uart9", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(12), 10, GFLAGS), ++ ++ COMPOSITE(CLK_UART1_SRC, "clk_uart1_src", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(41), 14, 1, MFLAGS, 9, 5, DFLAGS, ++ RK3588_CLKGATE_CON(12), 11, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART1_FRAC, "clk_uart1_frac", "clk_uart1_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(42), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RK3588_CLKGATE_CON(12), 12, GFLAGS, ++ &rk3588_uart1_fracmux), ++ GATE(SCLK_UART1, "sclk_uart1", "clk_uart1", 0, ++ RK3588_CLKGATE_CON(12), 13, GFLAGS), ++ COMPOSITE(CLK_UART2_SRC, "clk_uart2_src", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(43), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(12), 14, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART2_FRAC, "clk_uart2_frac", "clk_uart2_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(44), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RK3588_CLKGATE_CON(12), 15, GFLAGS, ++ &rk3588_uart2_fracmux), ++ GATE(SCLK_UART2, "sclk_uart2", "clk_uart2", 0, ++ RK3588_CLKGATE_CON(13), 0, GFLAGS), ++ COMPOSITE(CLK_UART3_SRC, "clk_uart3_src", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(45), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(13), 1, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART3_FRAC, "clk_uart3_frac", "clk_uart3_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(46), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RK3588_CLKGATE_CON(13), 2, GFLAGS, ++ &rk3588_uart3_fracmux), ++ GATE(SCLK_UART3, "sclk_uart3", "clk_uart3", 0, ++ RK3588_CLKGATE_CON(13), 3, GFLAGS), ++ COMPOSITE(CLK_UART4_SRC, "clk_uart4_src", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(47), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(13), 4, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART4_FRAC, "clk_uart4_frac", "clk_uart4_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(48), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RK3588_CLKGATE_CON(13), 5, GFLAGS, ++ &rk3588_uart4_fracmux), ++ GATE(SCLK_UART4, "sclk_uart4", "clk_uart4", 0, ++ RK3588_CLKGATE_CON(13), 6, GFLAGS), ++ COMPOSITE(CLK_UART5_SRC, "clk_uart5_src", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(49), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(13), 7, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART5_FRAC, "clk_uart5_frac", "clk_uart5_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(50), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RK3588_CLKGATE_CON(13), 8, GFLAGS, ++ &rk3588_uart5_fracmux), ++ GATE(SCLK_UART5, "sclk_uart5", "clk_uart5", 0, ++ RK3588_CLKGATE_CON(13), 9, GFLAGS), ++ COMPOSITE(CLK_UART6_SRC, "clk_uart6_src", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(51), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(13), 10, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART6_FRAC, "clk_uart6_frac", "clk_uart6_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(52), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RK3588_CLKGATE_CON(13), 11, GFLAGS, ++ &rk3588_uart6_fracmux), ++ GATE(SCLK_UART6, "sclk_uart6", "clk_uart6", 0, ++ RK3588_CLKGATE_CON(13), 12, GFLAGS), ++ COMPOSITE(CLK_UART7_SRC, "clk_uart7_src", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(53), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(13), 13, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART7_FRAC, "clk_uart7_frac", "clk_uart7_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(54), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RK3588_CLKGATE_CON(13), 14, GFLAGS, ++ &rk3588_uart7_fracmux), ++ GATE(SCLK_UART7, "sclk_uart7", "clk_uart7", 0, ++ RK3588_CLKGATE_CON(13), 15, GFLAGS), ++ COMPOSITE(CLK_UART8_SRC, "clk_uart8_src", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(55), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(14), 0, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART8_FRAC, "clk_uart8_frac", "clk_uart8_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(56), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RK3588_CLKGATE_CON(14), 1, GFLAGS, ++ &rk3588_uart8_fracmux), ++ GATE(SCLK_UART8, "sclk_uart8", "clk_uart8", 0, ++ RK3588_CLKGATE_CON(14), 2, GFLAGS), ++ COMPOSITE(CLK_UART9_SRC, "clk_uart9_src", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(57), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(14), 3, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART9_FRAC, "clk_uart9_frac", "clk_uart9_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(58), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RK3588_CLKGATE_CON(14), 4, GFLAGS, ++ &rk3588_uart9_fracmux), ++ GATE(SCLK_UART9, "sclk_uart9", "clk_uart9", 0, ++ RK3588_CLKGATE_CON(14), 5, GFLAGS), ++ ++ /* center */ ++ COMPOSITE_NODIV(ACLK_CENTER_ROOT, "aclk_center_root", mux_700m_400m_200m_24m_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(165), 0, 2, MFLAGS, ++ RK3588_CLKGATE_CON(69), 0, GFLAGS), ++ COMPOSITE_NODIV(ACLK_CENTER_LOW_ROOT, "aclk_center_low_root", mux_500m_250m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(165), 2, 2, MFLAGS, ++ RK3588_CLKGATE_CON(69), 1, GFLAGS), ++ COMPOSITE_NODIV(HCLK_CENTER_ROOT, "hclk_center_root", mux_400m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(165), 4, 2, MFLAGS, ++ RK3588_CLKGATE_CON(69), 2, GFLAGS), ++ COMPOSITE_NODIV(PCLK_CENTER_ROOT, "pclk_center_root", mux_200m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(165), 6, 2, MFLAGS | CLK_MUX_READ_ONLY, ++ RK3588_CLKGATE_CON(69), 3, GFLAGS), ++ GATE(ACLK_DMA2DDR, "aclk_dma2ddr", "aclk_center_root", CLK_IS_CRITICAL, ++ RK3588_CLKGATE_CON(69), 5, GFLAGS), ++ GATE(ACLK_DDR_SHAREMEM, "aclk_ddr_sharemem", "aclk_center_low_root", CLK_IS_CRITICAL, ++ RK3588_CLKGATE_CON(69), 6, GFLAGS), ++ COMPOSITE_NODIV(ACLK_CENTER_S200_ROOT, "aclk_center_s200_root", mux_200m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(165), 8, 2, MFLAGS, ++ RK3588_CLKGATE_CON(69), 8, GFLAGS), ++ COMPOSITE_NODIV(ACLK_CENTER_S400_ROOT, "aclk_center_s400_root", mux_400m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(165), 10, 2, MFLAGS, ++ RK3588_CLKGATE_CON(69), 9, GFLAGS), ++ GATE(FCLK_DDR_CM0_CORE, "fclk_ddr_cm0_core", "hclk_center_root", CLK_IS_CRITICAL, ++ RK3588_CLKGATE_CON(69), 14, GFLAGS), ++ COMPOSITE_NODIV(CLK_DDR_TIMER_ROOT, "clk_ddr_timer_root", mux_24m_100m_p, CLK_IGNORE_UNUSED, ++ RK3588_CLKSEL_CON(165), 12, 1, MFLAGS, ++ RK3588_CLKGATE_CON(69), 15, GFLAGS), ++ GATE(CLK_DDR_TIMER0, "clk_ddr_timer0", "clk_ddr_timer_root", 0, ++ RK3588_CLKGATE_CON(70), 0, GFLAGS), ++ GATE(CLK_DDR_TIMER1, "clk_ddr_timer1", "clk_ddr_timer_root", 0, ++ RK3588_CLKGATE_CON(70), 1, GFLAGS), ++ GATE(TCLK_WDT_DDR, "tclk_wdt_ddr", "xin24m", 0, ++ RK3588_CLKGATE_CON(70), 2, GFLAGS), ++ COMPOSITE(CLK_DDR_CM0_RTC, "clk_ddr_cm0_rtc", mux_24m_32k_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(166), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(70), 4, GFLAGS), ++ GATE(PCLK_WDT, "pclk_wdt", "pclk_center_root", 0, ++ RK3588_CLKGATE_CON(70), 7, GFLAGS), ++ GATE(PCLK_TIMER, "pclk_timer", "pclk_center_root", 0, ++ RK3588_CLKGATE_CON(70), 8, GFLAGS), ++ GATE(PCLK_DMA2DDR, "pclk_dma2ddr", "pclk_center_root", CLK_IS_CRITICAL, ++ RK3588_CLKGATE_CON(70), 9, GFLAGS), ++ GATE(PCLK_SHAREMEM, "pclk_sharemem", "pclk_center_root", CLK_IS_CRITICAL, ++ RK3588_CLKGATE_CON(70), 10, GFLAGS), ++ ++ /* gpu */ ++ COMPOSITE(CLK_GPU_SRC, "clk_gpu_src", gpll_cpll_aupll_npll_spll_p, 0, ++ RK3588_CLKSEL_CON(158), 5, 3, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(66), 1, GFLAGS), ++ GATE(CLK_GPU, "clk_gpu", "clk_gpu_src", 0, ++ RK3588_CLKGATE_CON(66), 4, GFLAGS), ++ GATE(CLK_GPU_COREGROUP, "clk_gpu_coregroup", "clk_gpu_src", 0, ++ RK3588_CLKGATE_CON(66), 6, GFLAGS), ++ COMPOSITE_NOMUX(CLK_GPU_STACKS, "clk_gpu_stacks", "clk_gpu_src", 0, ++ RK3588_CLKSEL_CON(159), 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(66), 7, GFLAGS), ++ GATE(CLK_GPU_PVTM, "clk_gpu_pvtm", "xin24m", 0, ++ RK3588_CLKGATE_CON(67), 0, GFLAGS), ++ GATE(CLK_CORE_GPU_PVTM, "clk_core_gpu_pvtm", "clk_gpu_src", 0, ++ RK3588_CLKGATE_CON(67), 1, GFLAGS), ++ ++ /* isp1 */ ++ COMPOSITE(ACLK_ISP1_ROOT, "aclk_isp1_root", gpll_cpll_aupll_spll_p, 0, ++ RK3588_CLKSEL_CON(67), 5, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(26), 0, GFLAGS), ++ COMPOSITE_NODIV(HCLK_ISP1_ROOT, "hclk_isp1_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(67), 7, 2, MFLAGS, ++ RK3588_CLKGATE_CON(26), 1, GFLAGS), ++ COMPOSITE(CLK_ISP1_CORE, "clk_isp1_core", gpll_cpll_aupll_spll_p, 0, ++ RK3588_CLKSEL_CON(67), 14, 2, MFLAGS, 9, 5, DFLAGS, ++ RK3588_CLKGATE_CON(26), 2, GFLAGS), ++ GATE(CLK_ISP1_CORE_MARVIN, "clk_isp1_core_marvin", "clk_isp1_core", 0, ++ RK3588_CLKGATE_CON(26), 3, GFLAGS), ++ GATE(CLK_ISP1_CORE_VICAP, "clk_isp1_core_vicap", "clk_isp1_core", 0, ++ RK3588_CLKGATE_CON(26), 4, GFLAGS), ++ ++ /* npu */ ++ COMPOSITE_NODIV(HCLK_NPU_ROOT, "hclk_npu_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(73), 0, 2, MFLAGS, ++ RK3588_CLKGATE_CON(29), 0, GFLAGS), ++ COMPOSITE(CLK_NPU_DSU0, "clk_npu_dsu0", gpll_cpll_aupll_npll_spll_p, 0, ++ RK3588_CLKSEL_CON(73), 7, 3, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(29), 1, GFLAGS), ++ COMPOSITE_NODIV(PCLK_NPU_ROOT, "pclk_npu_root", mux_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(74), 1, 2, MFLAGS, ++ RK3588_CLKGATE_CON(29), 4, GFLAGS), ++ GATE(ACLK_NPU1, "aclk_npu1", "clk_npu_dsu0", 0, ++ RK3588_CLKGATE_CON(27), 0, GFLAGS), ++ GATE(HCLK_NPU1, "hclk_npu1", "hclk_npu_root", 0, ++ RK3588_CLKGATE_CON(27), 2, GFLAGS), ++ GATE(ACLK_NPU2, "aclk_npu2", "clk_npu_dsu0", 0, ++ RK3588_CLKGATE_CON(28), 0, GFLAGS), ++ GATE(HCLK_NPU2, "hclk_npu2", "hclk_npu_root", 0, ++ RK3588_CLKGATE_CON(28), 2, GFLAGS), ++ COMPOSITE_NODIV(HCLK_NPU_CM0_ROOT, "hclk_npu_cm0_root", mux_400m_200m_100m_24m_p, 0, ++ RK3588_CLKSEL_CON(74), 5, 2, MFLAGS, ++ RK3588_CLKGATE_CON(30), 1, GFLAGS), ++ GATE(FCLK_NPU_CM0_CORE, "fclk_npu_cm0_core", "hclk_npu_cm0_root", 0, ++ RK3588_CLKGATE_CON(30), 3, GFLAGS), ++ COMPOSITE(CLK_NPU_CM0_RTC, "clk_npu_cm0_rtc", mux_24m_32k_p, 0, ++ RK3588_CLKSEL_CON(74), 12, 1, MFLAGS, 7, 5, DFLAGS, ++ RK3588_CLKGATE_CON(30), 5, GFLAGS), ++ GATE(PCLK_NPU_PVTM, "pclk_npu_pvtm", "pclk_npu_root", 0, ++ RK3588_CLKGATE_CON(29), 12, GFLAGS), ++ GATE(PCLK_NPU_GRF, "pclk_npu_grf", "pclk_npu_root", CLK_IGNORE_UNUSED, ++ RK3588_CLKGATE_CON(29), 13, GFLAGS), ++ GATE(CLK_NPU_PVTM, "clk_npu_pvtm", "xin24m", 0, ++ RK3588_CLKGATE_CON(29), 14, GFLAGS), ++ GATE(CLK_CORE_NPU_PVTM, "clk_core_npu_pvtm", "clk_npu_dsu0", 0, ++ RK3588_CLKGATE_CON(29), 15, GFLAGS), ++ GATE(ACLK_NPU0, "aclk_npu0", "clk_npu_dsu0", 0, ++ RK3588_CLKGATE_CON(30), 6, GFLAGS), ++ GATE(HCLK_NPU0, "hclk_npu0", "hclk_npu_root", 0, ++ RK3588_CLKGATE_CON(30), 8, GFLAGS), ++ GATE(PCLK_NPU_TIMER, "pclk_npu_timer", "pclk_npu_root", 0, ++ RK3588_CLKGATE_CON(29), 6, GFLAGS), ++ COMPOSITE_NODIV(CLK_NPUTIMER_ROOT, "clk_nputimer_root", mux_24m_100m_p, 0, ++ RK3588_CLKSEL_CON(74), 3, 1, MFLAGS, ++ RK3588_CLKGATE_CON(29), 7, GFLAGS), ++ GATE(CLK_NPUTIMER0, "clk_nputimer0", "clk_nputimer_root", 0, ++ RK3588_CLKGATE_CON(29), 8, GFLAGS), ++ GATE(CLK_NPUTIMER1, "clk_nputimer1", "clk_nputimer_root", 0, ++ RK3588_CLKGATE_CON(29), 9, GFLAGS), ++ GATE(PCLK_NPU_WDT, "pclk_npu_wdt", "pclk_npu_root", 0, ++ RK3588_CLKGATE_CON(29), 10, GFLAGS), ++ GATE(TCLK_NPU_WDT, "tclk_npu_wdt", "xin24m", 0, ++ RK3588_CLKGATE_CON(29), 11, GFLAGS), ++ ++ /* nvm */ ++ COMPOSITE_NODIV(HCLK_NVM_ROOT, "hclk_nvm_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(77), 0, 2, MFLAGS, ++ RK3588_CLKGATE_CON(31), 0, GFLAGS), ++ COMPOSITE(ACLK_NVM_ROOT, "aclk_nvm_root", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(77), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(31), 1, GFLAGS), ++ GATE(ACLK_EMMC, "aclk_emmc", "aclk_nvm_root", 0, ++ RK3588_CLKGATE_CON(31), 5, GFLAGS), ++ COMPOSITE(CCLK_EMMC, "cclk_emmc", gpll_cpll_24m_p, 0, ++ RK3588_CLKSEL_CON(77), 14, 2, MFLAGS, 8, 6, DFLAGS, ++ RK3588_CLKGATE_CON(31), 6, GFLAGS), ++ COMPOSITE(BCLK_EMMC, "bclk_emmc", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(78), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(31), 7, GFLAGS), ++ GATE(TMCLK_EMMC, "tmclk_emmc", "xin24m", 0, ++ RK3588_CLKGATE_CON(31), 8, GFLAGS), ++ ++ COMPOSITE(SCLK_SFC, "sclk_sfc", gpll_cpll_24m_p, 0, ++ RK3588_CLKSEL_CON(78), 12, 2, MFLAGS, 6, 6, DFLAGS, ++ RK3588_CLKGATE_CON(31), 9, GFLAGS), ++ ++ /* php */ ++ COMPOSITE(CLK_GMAC0_PTP_REF, "clk_gmac0_ptp_ref", clk_gmac0_ptp_ref_p, 0, ++ RK3588_CLKSEL_CON(81), 6, 1, MFLAGS, 0, 6, DFLAGS, ++ RK3588_CLKGATE_CON(34), 10, GFLAGS), ++ COMPOSITE(CLK_GMAC1_PTP_REF, "clk_gmac1_ptp_ref", clk_gmac1_ptp_ref_p, 0, ++ RK3588_CLKSEL_CON(81), 13, 1, MFLAGS, 7, 6, DFLAGS, ++ RK3588_CLKGATE_CON(34), 11, GFLAGS), ++ COMPOSITE(CLK_GMAC_125M, "clk_gmac_125m", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(83), 15, 1, MFLAGS, 8, 7, DFLAGS, ++ RK3588_CLKGATE_CON(35), 5, GFLAGS), ++ COMPOSITE(CLK_GMAC_50M, "clk_gmac_50m", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(84), 7, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3588_CLKGATE_CON(35), 6, GFLAGS), ++ ++ COMPOSITE(ACLK_PCIE_ROOT, "aclk_pcie_root", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(80), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(32), 6, GFLAGS), ++ COMPOSITE(ACLK_PHP_ROOT, "aclk_php_root", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(80), 13, 1, MFLAGS, 8, 5, DFLAGS, ++ RK3588_CLKGATE_CON(32), 7, GFLAGS), ++ COMPOSITE_NODIV(PCLK_PHP_ROOT, "pclk_php_root", mux_150m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(80), 0, 2, MFLAGS, ++ RK3588_CLKGATE_CON(32), 0, GFLAGS), ++ GATE(ACLK_PHP_GIC_ITS, "aclk_php_gic_its", "aclk_pcie_root", CLK_IS_CRITICAL, ++ RK3588_CLKGATE_CON(34), 6, GFLAGS), ++ GATE(ACLK_PCIE_BRIDGE, "aclk_pcie_bridge", "aclk_pcie_root", 0, ++ RK3588_CLKGATE_CON(32), 8, GFLAGS), ++ GATE(ACLK_MMU_PCIE, "aclk_mmu_pcie", "aclk_pcie_bridge", 0, ++ RK3588_CLKGATE_CON(34), 7, GFLAGS), ++ GATE(ACLK_MMU_PHP, "aclk_mmu_php", "aclk_php_root", 0, ++ RK3588_CLKGATE_CON(34), 8, GFLAGS), ++ GATE(ACLK_PCIE_4L_DBI, "aclk_pcie_4l_dbi", "aclk_php_root", 0, ++ RK3588_CLKGATE_CON(32), 13, GFLAGS), ++ GATE(ACLK_PCIE_2L_DBI, "aclk_pcie_2l_dbi", "aclk_php_root", 0, ++ RK3588_CLKGATE_CON(32), 14, GFLAGS), ++ GATE(ACLK_PCIE_1L0_DBI, "aclk_pcie_1l0_dbi", "aclk_php_root", 0, ++ RK3588_CLKGATE_CON(32), 15, GFLAGS), ++ GATE(ACLK_PCIE_1L1_DBI, "aclk_pcie_1l1_dbi", "aclk_php_root", 0, ++ RK3588_CLKGATE_CON(33), 0, GFLAGS), ++ GATE(ACLK_PCIE_1L2_DBI, "aclk_pcie_1l2_dbi", "aclk_php_root", 0, ++ RK3588_CLKGATE_CON(33), 1, GFLAGS), ++ GATE(ACLK_PCIE_4L_MSTR, "aclk_pcie_4l_mstr", "aclk_mmu_pcie", 0, ++ RK3588_CLKGATE_CON(33), 2, GFLAGS), ++ GATE(ACLK_PCIE_2L_MSTR, "aclk_pcie_2l_mstr", "aclk_mmu_pcie", 0, ++ RK3588_CLKGATE_CON(33), 3, GFLAGS), ++ GATE(ACLK_PCIE_1L0_MSTR, "aclk_pcie_1l0_mstr", "aclk_mmu_pcie", 0, ++ RK3588_CLKGATE_CON(33), 4, GFLAGS), ++ GATE(ACLK_PCIE_1L1_MSTR, "aclk_pcie_1l1_mstr", "aclk_mmu_pcie", 0, ++ RK3588_CLKGATE_CON(33), 5, GFLAGS), ++ GATE(ACLK_PCIE_1L2_MSTR, "aclk_pcie_1l2_mstr", "aclk_mmu_pcie", 0, ++ RK3588_CLKGATE_CON(33), 6, GFLAGS), ++ GATE(ACLK_PCIE_4L_SLV, "aclk_pcie_4l_slv", "aclk_php_root", 0, ++ RK3588_CLKGATE_CON(33), 7, GFLAGS), ++ GATE(ACLK_PCIE_2L_SLV, "aclk_pcie_2l_slv", "aclk_php_root", 0, ++ RK3588_CLKGATE_CON(33), 8, GFLAGS), ++ GATE(ACLK_PCIE_1L0_SLV, "aclk_pcie_1l0_slv", "aclk_php_root", 0, ++ RK3588_CLKGATE_CON(33), 9, GFLAGS), ++ GATE(ACLK_PCIE_1L1_SLV, "aclk_pcie_1l1_slv", "aclk_php_root", 0, ++ RK3588_CLKGATE_CON(33), 10, GFLAGS), ++ GATE(ACLK_PCIE_1L2_SLV, "aclk_pcie_1l2_slv", "aclk_php_root", 0, ++ RK3588_CLKGATE_CON(33), 11, GFLAGS), ++ GATE(PCLK_PCIE_4L, "pclk_pcie_4l", "pclk_php_root", 0, ++ RK3588_CLKGATE_CON(33), 12, GFLAGS), ++ GATE(PCLK_PCIE_2L, "pclk_pcie_2l", "pclk_php_root", 0, ++ RK3588_CLKGATE_CON(33), 13, GFLAGS), ++ GATE(PCLK_PCIE_1L0, "pclk_pcie_1l0", "pclk_php_root", 0, ++ RK3588_CLKGATE_CON(33), 14, GFLAGS), ++ GATE(PCLK_PCIE_1L1, "pclk_pcie_1l1", "pclk_php_root", 0, ++ RK3588_CLKGATE_CON(33), 15, GFLAGS), ++ GATE(PCLK_PCIE_1L2, "pclk_pcie_1l2", "pclk_php_root", 0, ++ RK3588_CLKGATE_CON(34), 0, GFLAGS), ++ GATE(CLK_PCIE_AUX0, "clk_pcie_aux0", "xin24m", 0, ++ RK3588_CLKGATE_CON(34), 1, GFLAGS), ++ GATE(CLK_PCIE_AUX1, "clk_pcie_aux1", "xin24m", 0, ++ RK3588_CLKGATE_CON(34), 2, GFLAGS), ++ GATE(CLK_PCIE_AUX2, "clk_pcie_aux2", "xin24m", 0, ++ RK3588_CLKGATE_CON(34), 3, GFLAGS), ++ GATE(CLK_PCIE_AUX3, "clk_pcie_aux3", "xin24m", 0, ++ RK3588_CLKGATE_CON(34), 4, GFLAGS), ++ GATE(CLK_PCIE_AUX4, "clk_pcie_aux4", "xin24m", 0, ++ RK3588_CLKGATE_CON(34), 5, GFLAGS), ++ GATE(CLK_PIPEPHY0_REF, "clk_pipephy0_ref", "xin24m", 0, ++ RK3588_CLKGATE_CON(37), 0, GFLAGS), ++ GATE(CLK_PIPEPHY1_REF, "clk_pipephy1_ref", "xin24m", 0, ++ RK3588_CLKGATE_CON(37), 1, GFLAGS), ++ GATE(CLK_PIPEPHY2_REF, "clk_pipephy2_ref", "xin24m", 0, ++ RK3588_CLKGATE_CON(37), 2, GFLAGS), ++ GATE(PCLK_GMAC0, "pclk_gmac0", "pclk_php_root", 0, ++ RK3588_CLKGATE_CON(32), 3, GFLAGS), ++ GATE(PCLK_GMAC1, "pclk_gmac1", "pclk_php_root", 0, ++ RK3588_CLKGATE_CON(32), 4, GFLAGS), ++ GATE(ACLK_GMAC0, "aclk_gmac0", "aclk_mmu_php", 0, ++ RK3588_CLKGATE_CON(32), 10, GFLAGS), ++ GATE(ACLK_GMAC1, "aclk_gmac1", "aclk_mmu_php", 0, ++ RK3588_CLKGATE_CON(32), 11, GFLAGS), ++ GATE(CLK_PMALIVE0, "clk_pmalive0", "xin24m", 0, ++ RK3588_CLKGATE_CON(37), 4, GFLAGS), ++ GATE(CLK_PMALIVE1, "clk_pmalive1", "xin24m", 0, ++ RK3588_CLKGATE_CON(37), 5, GFLAGS), ++ GATE(CLK_PMALIVE2, "clk_pmalive2", "xin24m", 0, ++ RK3588_CLKGATE_CON(37), 6, GFLAGS), ++ GATE(ACLK_SATA0, "aclk_sata0", "aclk_mmu_php", 0, ++ RK3588_CLKGATE_CON(37), 7, GFLAGS), ++ GATE(ACLK_SATA1, "aclk_sata1", "aclk_mmu_php", 0, ++ RK3588_CLKGATE_CON(37), 8, GFLAGS), ++ GATE(ACLK_SATA2, "aclk_sata2", "aclk_mmu_php", 0, ++ RK3588_CLKGATE_CON(37), 9, GFLAGS), ++ COMPOSITE(CLK_RXOOB0, "clk_rxoob0", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(82), 7, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3588_CLKGATE_CON(37), 10, GFLAGS), ++ COMPOSITE(CLK_RXOOB1, "clk_rxoob1", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(82), 15, 1, MFLAGS, 8, 7, DFLAGS, ++ RK3588_CLKGATE_CON(37), 11, GFLAGS), ++ COMPOSITE(CLK_RXOOB2, "clk_rxoob2", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(83), 7, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3588_CLKGATE_CON(37), 12, GFLAGS), ++ GATE(ACLK_USB3OTG2, "aclk_usb3otg2", "aclk_mmu_php", 0, ++ RK3588_CLKGATE_CON(35), 7, GFLAGS), ++ GATE(SUSPEND_CLK_USB3OTG2, "suspend_clk_usb3otg2", "xin24m", 0, ++ RK3588_CLKGATE_CON(35), 8, GFLAGS), ++ GATE(REF_CLK_USB3OTG2, "ref_clk_usb3otg2", "xin24m", 0, ++ RK3588_CLKGATE_CON(35), 9, GFLAGS), ++ COMPOSITE(CLK_UTMI_OTG2, "clk_utmi_otg2", mux_150m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(84), 12, 2, MFLAGS, 8, 4, DFLAGS, ++ RK3588_CLKGATE_CON(35), 10, GFLAGS), ++ GATE(PCLK_PCIE_COMBO_PIPE_PHY0, "pclk_pcie_combo_pipe_phy0", "pclk_top_root", 0, ++ RK3588_PHP_CLKGATE_CON(0), 5, GFLAGS), ++ GATE(PCLK_PCIE_COMBO_PIPE_PHY1, "pclk_pcie_combo_pipe_phy1", "pclk_top_root", 0, ++ RK3588_PHP_CLKGATE_CON(0), 6, GFLAGS), ++ GATE(PCLK_PCIE_COMBO_PIPE_PHY2, "pclk_pcie_combo_pipe_phy2", "pclk_top_root", 0, ++ RK3588_PHP_CLKGATE_CON(0), 7, GFLAGS), ++ GATE(PCLK_PCIE_COMBO_PIPE_PHY, "pclk_pcie_combo_pipe_phy", "pclk_top_root", 0, ++ RK3588_PHP_CLKGATE_CON(0), 8, GFLAGS), ++ ++ /* rga */ ++ COMPOSITE(CLK_RGA3_1_CORE, "clk_rga3_1_core", gpll_cpll_aupll_spll_p, 0, ++ RK3588_CLKSEL_CON(174), 14, 2, MFLAGS, 9, 5, DFLAGS, ++ RK3588_CLKGATE_CON(76), 6, GFLAGS), ++ COMPOSITE(ACLK_RGA3_ROOT, "aclk_rga3_root", gpll_cpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(174), 5, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(76), 0, GFLAGS), ++ COMPOSITE_NODIV(HCLK_RGA3_ROOT, "hclk_rga3_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(174), 7, 2, MFLAGS, ++ RK3588_CLKGATE_CON(76), 1, GFLAGS), ++ GATE(HCLK_RGA3_1, "hclk_rga3_1", "hclk_rga3_root", 0, ++ RK3588_CLKGATE_CON(76), 4, GFLAGS), ++ GATE(ACLK_RGA3_1, "aclk_rga3_1", "aclk_rga3_root", 0, ++ RK3588_CLKGATE_CON(76), 5, GFLAGS), ++ ++ /* vdec */ ++ COMPOSITE_NODIV(0, "hclk_rkvdec0_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(89), 0, 2, MFLAGS, ++ RK3588_CLKGATE_CON(40), 0, GFLAGS), ++ COMPOSITE(0, "aclk_rkvdec0_root", gpll_cpll_aupll_spll_p, 0, ++ RK3588_CLKSEL_CON(89), 7, 2, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(40), 1, GFLAGS), ++ COMPOSITE(ACLK_RKVDEC_CCU, "aclk_rkvdec_ccu", gpll_cpll_aupll_spll_p, 0, ++ RK3588_CLKSEL_CON(89), 14, 2, MFLAGS, 9, 5, DFLAGS, ++ RK3588_CLKGATE_CON(40), 2, GFLAGS), ++ COMPOSITE(CLK_RKVDEC0_CA, "clk_rkvdec0_ca", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(90), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(40), 7, GFLAGS), ++ COMPOSITE(CLK_RKVDEC0_HEVC_CA, "clk_rkvdec0_hevc_ca", gpll_cpll_npll_1000m_p, 0, ++ RK3588_CLKSEL_CON(90), 11, 2, MFLAGS, 6, 5, DFLAGS, ++ RK3588_CLKGATE_CON(40), 8, GFLAGS), ++ COMPOSITE(CLK_RKVDEC0_CORE, "clk_rkvdec0_core", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(91), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(40), 9, GFLAGS), ++ COMPOSITE_NODIV(0, "hclk_rkvdec1_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(93), 0, 2, MFLAGS, ++ RK3588_CLKGATE_CON(41), 0, GFLAGS), ++ COMPOSITE(0, "aclk_rkvdec1_root", gpll_cpll_aupll_npll_p, 0, ++ RK3588_CLKSEL_CON(93), 7, 2, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(41), 1, GFLAGS), ++ COMPOSITE(CLK_RKVDEC1_CA, "clk_rkvdec1_ca", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(93), 14, 1, MFLAGS, 9, 5, DFLAGS, ++ RK3588_CLKGATE_CON(41), 6, GFLAGS), ++ COMPOSITE(CLK_RKVDEC1_HEVC_CA, "clk_rkvdec1_hevc_ca", gpll_cpll_npll_1000m_p, 0, ++ RK3588_CLKSEL_CON(94), 5, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(41), 7, GFLAGS), ++ COMPOSITE(CLK_RKVDEC1_CORE, "clk_rkvdec1_core", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(94), 12, 1, MFLAGS, 7, 5, DFLAGS, ++ RK3588_CLKGATE_CON(41), 8, GFLAGS), ++ ++ /* sdio */ ++ COMPOSITE_NODIV(0, "hclk_sdio_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(172), 0, 2, MFLAGS, ++ RK3588_CLKGATE_CON(75), 0, GFLAGS), ++ COMPOSITE(CCLK_SRC_SDIO, "cclk_src_sdio", gpll_cpll_24m_p, 0, ++ RK3588_CLKSEL_CON(172), 8, 2, MFLAGS, 2, 6, DFLAGS, ++ RK3588_CLKGATE_CON(75), 3, GFLAGS), ++ MMC(SCLK_SDIO_DRV, "sdio_drv", "cclk_src_sdio", RK3588_SDIO_CON0, 1), ++ MMC(SCLK_SDIO_SAMPLE, "sdio_sample", "cclk_src_sdio", RK3588_SDIO_CON1, 1), ++ ++ /* usb */ ++ COMPOSITE(ACLK_USB_ROOT, "aclk_usb_root", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(96), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(42), 0, GFLAGS), ++ COMPOSITE_NODIV(HCLK_USB_ROOT, "hclk_usb_root", mux_150m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(96), 6, 2, MFLAGS, ++ RK3588_CLKGATE_CON(42), 1, GFLAGS), ++ GATE(SUSPEND_CLK_USB3OTG0, "suspend_clk_usb3otg0", "xin24m", 0, ++ RK3588_CLKGATE_CON(42), 5, GFLAGS), ++ GATE(REF_CLK_USB3OTG0, "ref_clk_usb3otg0", "xin24m", 0, ++ RK3588_CLKGATE_CON(42), 6, GFLAGS), ++ GATE(SUSPEND_CLK_USB3OTG1, "suspend_clk_usb3otg1", "xin24m", 0, ++ RK3588_CLKGATE_CON(42), 8, GFLAGS), ++ GATE(REF_CLK_USB3OTG1, "ref_clk_usb3otg1", "xin24m", 0, ++ RK3588_CLKGATE_CON(42), 9, GFLAGS), ++ ++ /* vdpu */ ++ COMPOSITE(ACLK_VDPU_ROOT, "aclk_vdpu_root", gpll_cpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(98), 5, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(44), 0, GFLAGS), ++ COMPOSITE_NODIV(ACLK_VDPU_LOW_ROOT, "aclk_vdpu_low_root", mux_400m_200m_100m_24m_p, 0, ++ RK3588_CLKSEL_CON(98), 7, 2, MFLAGS, ++ RK3588_CLKGATE_CON(44), 1, GFLAGS), ++ COMPOSITE_NODIV(HCLK_VDPU_ROOT, "hclk_vdpu_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(98), 9, 2, MFLAGS, ++ RK3588_CLKGATE_CON(44), 2, GFLAGS), ++ COMPOSITE(ACLK_JPEG_DECODER_ROOT, "aclk_jpeg_decoder_root", gpll_cpll_aupll_spll_p, 0, ++ RK3588_CLKSEL_CON(99), 5, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(44), 3, GFLAGS), ++ GATE(HCLK_IEP2P0, "hclk_iep2p0", "hclk_vdpu_root", 0, ++ RK3588_CLKGATE_CON(45), 4, GFLAGS), ++ COMPOSITE(CLK_IEP2P0_CORE, "clk_iep2p0_core", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(99), 12, 1, MFLAGS, 7, 5, DFLAGS, ++ RK3588_CLKGATE_CON(45), 6, GFLAGS), ++ GATE(HCLK_JPEG_ENCODER0, "hclk_jpeg_encoder0", "hclk_vdpu_root", 0, ++ RK3588_CLKGATE_CON(44), 11, GFLAGS), ++ GATE(HCLK_JPEG_ENCODER1, "hclk_jpeg_encoder1", "hclk_vdpu_root", 0, ++ RK3588_CLKGATE_CON(44), 13, GFLAGS), ++ GATE(HCLK_JPEG_ENCODER2, "hclk_jpeg_encoder2", "hclk_vdpu_root", 0, ++ RK3588_CLKGATE_CON(44), 15, GFLAGS), ++ GATE(HCLK_JPEG_ENCODER3, "hclk_jpeg_encoder3", "hclk_vdpu_root", 0, ++ RK3588_CLKGATE_CON(45), 1, GFLAGS), ++ GATE(HCLK_JPEG_DECODER, "hclk_jpeg_decoder", "hclk_vdpu_root", 0, ++ RK3588_CLKGATE_CON(45), 3, GFLAGS), ++ GATE(HCLK_RGA2, "hclk_rga2", "hclk_vdpu_root", 0, ++ RK3588_CLKGATE_CON(45), 7, GFLAGS), ++ GATE(ACLK_RGA2, "aclk_rga2", "aclk_vdpu_root", 0, ++ RK3588_CLKGATE_CON(45), 8, GFLAGS), ++ COMPOSITE(CLK_RGA2_CORE, "clk_rga2_core", gpll_cpll_npll_aupll_spll_p, 0, ++ RK3588_CLKSEL_CON(100), 5, 3, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(45), 9, GFLAGS), ++ GATE(HCLK_RGA3_0, "hclk_rga3_0", "hclk_vdpu_root", 0, ++ RK3588_CLKGATE_CON(45), 10, GFLAGS), ++ GATE(ACLK_RGA3_0, "aclk_rga3_0", "aclk_vdpu_root", 0, ++ RK3588_CLKGATE_CON(45), 11, GFLAGS), ++ COMPOSITE(CLK_RGA3_0_CORE, "clk_rga3_0_core", gpll_cpll_npll_aupll_spll_p, 0, ++ RK3588_CLKSEL_CON(100), 13, 3, MFLAGS, 8, 5, DFLAGS, ++ RK3588_CLKGATE_CON(45), 12, GFLAGS), ++ GATE(HCLK_VPU, "hclk_vpu", "hclk_vdpu_root", 0, ++ RK3588_CLKGATE_CON(44), 9, GFLAGS), ++ ++ /* venc */ ++ COMPOSITE_NODIV(HCLK_RKVENC1_ROOT, "hclk_rkvenc1_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(104), 0, 2, MFLAGS, ++ RK3588_CLKGATE_CON(48), 0, GFLAGS), ++ COMPOSITE(ACLK_RKVENC1_ROOT, "aclk_rkvenc1_root", gpll_cpll_npll_p, 0, ++ RK3588_CLKSEL_CON(104), 7, 2, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(48), 1, GFLAGS), ++ COMPOSITE_NODIV(HCLK_RKVENC0_ROOT, "hclk_rkvenc0_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(102), 0, 2, MFLAGS, ++ RK3588_CLKGATE_CON(47), 0, GFLAGS), ++ COMPOSITE(ACLK_RKVENC0_ROOT, "aclk_rkvenc0_root", gpll_cpll_npll_p, 0, ++ RK3588_CLKSEL_CON(102), 7, 2, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(47), 1, GFLAGS), ++ GATE(HCLK_RKVENC0, "hclk_rkvenc0", "hclk_rkvenc0_root", 0, ++ RK3588_CLKGATE_CON(47), 4, GFLAGS), ++ GATE(ACLK_RKVENC0, "aclk_rkvenc0", "aclk_rkvenc0_root", 0, ++ RK3588_CLKGATE_CON(47), 5, GFLAGS), ++ COMPOSITE(CLK_RKVENC0_CORE, "clk_rkvenc0_core", gpll_cpll_aupll_npll_p, 0, ++ RK3588_CLKSEL_CON(102), 14, 2, MFLAGS, 9, 5, DFLAGS, ++ RK3588_CLKGATE_CON(47), 6, GFLAGS), ++ COMPOSITE(CLK_RKVENC1_CORE, "clk_rkvenc1_core", gpll_cpll_aupll_npll_p, 0, ++ RK3588_CLKSEL_CON(104), 14, 2, MFLAGS, 9, 5, DFLAGS, ++ RK3588_CLKGATE_CON(48), 6, GFLAGS), ++ ++ /* vi */ ++ COMPOSITE(ACLK_VI_ROOT, "aclk_vi_root", gpll_cpll_npll_aupll_spll_p, 0, ++ RK3588_CLKSEL_CON(106), 5, 3, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(49), 0, GFLAGS), ++ COMPOSITE_NODIV(HCLK_VI_ROOT, "hclk_vi_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(106), 8, 2, MFLAGS, ++ RK3588_CLKGATE_CON(49), 1, GFLAGS), ++ COMPOSITE_NODIV(PCLK_VI_ROOT, "pclk_vi_root", mux_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(106), 10, 2, MFLAGS, ++ RK3588_CLKGATE_CON(49), 2, GFLAGS), ++ COMPOSITE_NODIV(ICLK_CSIHOST01, "iclk_csihost01", mux_400m_200m_100m_24m_p, 0, ++ RK3588_CLKSEL_CON(108), 14, 2, MFLAGS, ++ RK3588_CLKGATE_CON(51), 10, GFLAGS), ++ GATE(ICLK_CSIHOST0, "iclk_csihost0", "iclk_csihost01", 0, ++ RK3588_CLKGATE_CON(51), 11, GFLAGS), ++ GATE(ICLK_CSIHOST1, "iclk_csihost1", "iclk_csihost01", 0, ++ RK3588_CLKGATE_CON(51), 12, GFLAGS), ++ GATE(PCLK_CSI_HOST_0, "pclk_csi_host_0", "pclk_vi_root", 0, ++ RK3588_CLKGATE_CON(50), 4, GFLAGS), ++ GATE(PCLK_CSI_HOST_1, "pclk_csi_host_1", "pclk_vi_root", 0, ++ RK3588_CLKGATE_CON(50), 5, GFLAGS), ++ GATE(PCLK_CSI_HOST_2, "pclk_csi_host_2", "pclk_vi_root", 0, ++ RK3588_CLKGATE_CON(50), 6, GFLAGS), ++ GATE(PCLK_CSI_HOST_3, "pclk_csi_host_3", "pclk_vi_root", 0, ++ RK3588_CLKGATE_CON(50), 7, GFLAGS), ++ GATE(PCLK_CSI_HOST_4, "pclk_csi_host_4", "pclk_vi_root", 0, ++ RK3588_CLKGATE_CON(50), 8, GFLAGS), ++ GATE(PCLK_CSI_HOST_5, "pclk_csi_host_5", "pclk_vi_root", 0, ++ RK3588_CLKGATE_CON(50), 9, GFLAGS), ++ GATE(ACLK_FISHEYE0, "aclk_fisheye0", "aclk_vi_root", 0, ++ RK3588_CLKGATE_CON(49), 14, GFLAGS), ++ GATE(HCLK_FISHEYE0, "hclk_fisheye0", "hclk_vi_root", 0, ++ RK3588_CLKGATE_CON(49), 15, GFLAGS), ++ COMPOSITE(CLK_FISHEYE0_CORE, "clk_fisheye0_core", gpll_cpll_aupll_spll_p, 0, ++ RK3588_CLKSEL_CON(108), 5, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(50), 0, GFLAGS), ++ GATE(ACLK_FISHEYE1, "aclk_fisheye1", "aclk_vi_root", 0, ++ RK3588_CLKGATE_CON(50), 1, GFLAGS), ++ GATE(HCLK_FISHEYE1, "hclk_fisheye1", "hclk_vi_root", 0, ++ RK3588_CLKGATE_CON(50), 2, GFLAGS), ++ COMPOSITE(CLK_FISHEYE1_CORE, "clk_fisheye1_core", gpll_cpll_aupll_spll_p, 0, ++ RK3588_CLKSEL_CON(108), 12, 2, MFLAGS, 7, 5, DFLAGS, ++ RK3588_CLKGATE_CON(50), 3, GFLAGS), ++ COMPOSITE(CLK_ISP0_CORE, "clk_isp0_core", gpll_cpll_aupll_spll_p, 0, ++ RK3588_CLKSEL_CON(107), 11, 2, MFLAGS, 6, 5, DFLAGS, ++ RK3588_CLKGATE_CON(49), 9, GFLAGS), ++ GATE(CLK_ISP0_CORE_MARVIN, "clk_isp0_core_marvin", "clk_isp0_core", 0, ++ RK3588_CLKGATE_CON(49), 10, GFLAGS), ++ GATE(CLK_ISP0_CORE_VICAP, "clk_isp0_core_vicap", "clk_isp0_core", 0, ++ RK3588_CLKGATE_CON(49), 11, GFLAGS), ++ GATE(ACLK_ISP0, "aclk_isp0", "aclk_vi_root", 0, ++ RK3588_CLKGATE_CON(49), 12, GFLAGS), ++ GATE(HCLK_ISP0, "hclk_isp0", "hclk_vi_root", 0, ++ RK3588_CLKGATE_CON(49), 13, GFLAGS), ++ COMPOSITE(DCLK_VICAP, "dclk_vicap", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(107), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(49), 6, GFLAGS), ++ GATE(ACLK_VICAP, "aclk_vicap", "aclk_vi_root", 0, ++ RK3588_CLKGATE_CON(49), 7, GFLAGS), ++ GATE(HCLK_VICAP, "hclk_vicap", "hclk_vi_root", 0, ++ RK3588_CLKGATE_CON(49), 8, GFLAGS), ++ ++ /* vo0 */ ++ COMPOSITE(ACLK_VO0_ROOT, "aclk_vo0_root", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(116), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(55), 0, GFLAGS), ++ COMPOSITE_NODIV(HCLK_VO0_ROOT, "hclk_vo0_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(116), 6, 2, MFLAGS, ++ RK3588_CLKGATE_CON(55), 1, GFLAGS), ++ COMPOSITE_NODIV(HCLK_VO0_S_ROOT, "hclk_vo0_s_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(116), 8, 2, MFLAGS, ++ RK3588_CLKGATE_CON(55), 2, GFLAGS), ++ COMPOSITE_NODIV(PCLK_VO0_ROOT, "pclk_vo0_root", mux_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(116), 10, 2, MFLAGS, ++ RK3588_CLKGATE_CON(55), 3, GFLAGS), ++ COMPOSITE_NODIV(PCLK_VO0_S_ROOT, "pclk_vo0_s_root", mux_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(116), 12, 2, MFLAGS, ++ RK3588_CLKGATE_CON(55), 4, GFLAGS), ++ GATE(PCLK_DP0, "pclk_dp0", "pclk_vo0_root", 0, ++ RK3588_CLKGATE_CON(56), 4, GFLAGS), ++ GATE(PCLK_DP1, "pclk_dp1", "pclk_vo0_root", 0, ++ RK3588_CLKGATE_CON(56), 5, GFLAGS), ++ GATE(PCLK_S_DP0, "pclk_s_dp0", "pclk_vo0_s_root", 0, ++ RK3588_CLKGATE_CON(56), 6, GFLAGS), ++ GATE(PCLK_S_DP1, "pclk_s_dp1", "pclk_vo0_s_root", 0, ++ RK3588_CLKGATE_CON(56), 7, GFLAGS), ++ GATE(CLK_DP0, "clk_dp0", "aclk_vo0_root", 0, ++ RK3588_CLKGATE_CON(56), 8, GFLAGS), ++ GATE(CLK_DP1, "clk_dp1", "aclk_vo0_root", 0, ++ RK3588_CLKGATE_CON(56), 9, GFLAGS), ++ GATE(HCLK_HDCP_KEY0, "hclk_hdcp_key0", "hclk_vo0_s_root", 0, ++ RK3588_CLKGATE_CON(55), 11, GFLAGS), ++ GATE(PCLK_HDCP0, "pclk_hdcp0", "pclk_vo0_root", 0, ++ RK3588_CLKGATE_CON(55), 14, GFLAGS), ++ GATE(ACLK_TRNG0, "aclk_trng0", "aclk_vo0_root", 0, ++ RK3588_CLKGATE_CON(56), 0, GFLAGS), ++ GATE(PCLK_TRNG0, "pclk_trng0", "pclk_vo0_root", 0, ++ RK3588_CLKGATE_CON(56), 1, GFLAGS), ++ GATE(PCLK_VO0GRF, "pclk_vo0grf", "pclk_vo0_root", CLK_IGNORE_UNUSED, ++ RK3588_CLKGATE_CON(55), 10, GFLAGS), ++ COMPOSITE(CLK_I2S4_8CH_TX_SRC, "clk_i2s4_8ch_tx_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(118), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(56), 11, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S4_8CH_TX_FRAC, "clk_i2s4_8ch_tx_frac", "clk_i2s4_8ch_tx_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(119), 0, ++ RK3588_CLKGATE_CON(56), 12, GFLAGS, ++ &rk3588_i2s4_8ch_tx_fracmux), ++ GATE(MCLK_I2S4_8CH_TX, "mclk_i2s4_8ch_tx", "clk_i2s4_8ch_tx", 0, ++ RK3588_CLKGATE_CON(56), 13, GFLAGS), ++ COMPOSITE(CLK_I2S8_8CH_TX_SRC, "clk_i2s8_8ch_tx_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(120), 8, 1, MFLAGS, 3, 5, DFLAGS, ++ RK3588_CLKGATE_CON(56), 15, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S8_8CH_TX_FRAC, "clk_i2s8_8ch_tx_frac", "clk_i2s8_8ch_tx_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(121), 0, ++ RK3588_CLKGATE_CON(57), 0, GFLAGS, ++ &rk3588_i2s8_8ch_tx_fracmux), ++ GATE(MCLK_I2S8_8CH_TX, "mclk_i2s8_8ch_tx", "clk_i2s8_8ch_tx", 0, ++ RK3588_CLKGATE_CON(57), 1, GFLAGS), ++ COMPOSITE(CLK_SPDIF2_DP0_SRC, "clk_spdif2_dp0_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(122), 8, 1, MFLAGS, 3, 5, DFLAGS, ++ RK3588_CLKGATE_CON(57), 3, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_SPDIF2_DP0_FRAC, "clk_spdif2_dp0_frac", "clk_spdif2_dp0_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(123), 0, ++ RK3588_CLKGATE_CON(57), 4, GFLAGS, ++ &rk3588_spdif2_dp0_fracmux), ++ GATE(MCLK_SPDIF2_DP0, "mclk_spdif2_dp0", "clk_spdif2_dp0", 0, ++ RK3588_CLKGATE_CON(57), 5, GFLAGS), ++ GATE(MCLK_SPDIF2, "mclk_spdif2", "clk_spdif2_dp0", 0, ++ RK3588_CLKGATE_CON(57), 6, GFLAGS), ++ COMPOSITE(CLK_SPDIF5_DP1_SRC, "clk_spdif5_dp1_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(124), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(57), 8, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_SPDIF5_DP1_FRAC, "clk_spdif5_dp1_frac", "clk_spdif5_dp1_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(125), 0, ++ RK3588_CLKGATE_CON(57), 9, GFLAGS, ++ &rk3588_spdif5_dp1_fracmux), ++ GATE(MCLK_SPDIF5_DP1, "mclk_spdif5_dp1", "clk_spdif5_dp1", 0, ++ RK3588_CLKGATE_CON(57), 10, GFLAGS), ++ GATE(MCLK_SPDIF5, "mclk_spdif5", "clk_spdif5_dp1", 0, ++ RK3588_CLKGATE_CON(57), 11, GFLAGS), ++ COMPOSITE_NOMUX(CLK_AUX16M_0, "clk_aux16m_0", "gpll", 0, ++ RK3588_CLKSEL_CON(117), 0, 8, DFLAGS, ++ RK3588_CLKGATE_CON(56), 2, GFLAGS), ++ COMPOSITE_NOMUX(CLK_AUX16M_1, "clk_aux16m_1", "gpll", 0, ++ RK3588_CLKSEL_CON(117), 8, 8, DFLAGS, ++ RK3588_CLKGATE_CON(56), 3, GFLAGS), ++ ++ /* vo1 */ ++ COMPOSITE_HALFDIV(CLK_HDMITRX_REFSRC, "clk_hdmitrx_refsrc", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(157), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(65), 9, GFLAGS), ++ COMPOSITE(ACLK_HDCP1_ROOT, "aclk_hdcp1_root", aclk_hdcp1_root_p, 0, ++ RK3588_CLKSEL_CON(128), 5, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(59), 0, GFLAGS), ++ COMPOSITE(ACLK_HDMIRX_ROOT, "aclk_hdmirx_root", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(128), 12, 1, MFLAGS, 7, 5, DFLAGS, ++ RK3588_CLKGATE_CON(59), 1, GFLAGS), ++ COMPOSITE_NODIV(HCLK_VO1_ROOT, "hclk_vo1_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(128), 13, 2, MFLAGS, ++ RK3588_CLKGATE_CON(59), 2, GFLAGS), ++ COMPOSITE_NODIV(HCLK_VO1_S_ROOT, "hclk_vo1_s_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(129), 0, 2, MFLAGS, ++ RK3588_CLKGATE_CON(59), 3, GFLAGS), ++ COMPOSITE_NODIV(PCLK_VO1_ROOT, "pclk_vo1_root", mux_150m_100m_24m_p, 0, ++ RK3588_CLKSEL_CON(129), 2, 2, MFLAGS, ++ RK3588_CLKGATE_CON(59), 4, GFLAGS), ++ COMPOSITE_NODIV(PCLK_VO1_S_ROOT, "pclk_vo1_s_root", mux_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(129), 4, 2, MFLAGS, ++ RK3588_CLKGATE_CON(59), 5, GFLAGS), ++ COMPOSITE(ACLK_VOP_ROOT, "aclk_vop_root", gpll_cpll_dmyaupll_npll_spll_p, 0, ++ RK3588_CLKSEL_CON(110), 5, 3, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(52), 0, GFLAGS), ++ FACTOR(ACLK_VOP_DIV2_SRC, "aclk_vop_div2_src", "aclk_vop_root", 0, 1, 2), ++ COMPOSITE_NODIV(ACLK_VOP_LOW_ROOT, "aclk_vop_low_root", mux_400m_200m_100m_24m_p, 0, ++ RK3588_CLKSEL_CON(110), 8, 2, MFLAGS, ++ RK3588_CLKGATE_CON(52), 1, GFLAGS), ++ COMPOSITE_NODIV(HCLK_VOP_ROOT, "hclk_vop_root", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(110), 10, 2, MFLAGS, ++ RK3588_CLKGATE_CON(52), 2, GFLAGS), ++ COMPOSITE_NODIV(PCLK_VOP_ROOT, "pclk_vop_root", mux_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(110), 12, 2, MFLAGS, ++ RK3588_CLKGATE_CON(52), 3, GFLAGS), ++ COMPOSITE(ACLK_VO1USB_TOP_ROOT, "aclk_vo1usb_top_root", gpll_cpll_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(170), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(74), 0, GFLAGS), ++ COMPOSITE_NODIV(HCLK_VO1USB_TOP_ROOT, "hclk_vo1usb_top_root", mux_200m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RK3588_CLKSEL_CON(170), 6, 2, MFLAGS, ++ RK3588_CLKGATE_CON(74), 2, GFLAGS), ++ COMPOSITE_NODIV(ACLK_VOP, "aclk_vop", aclk_vop_sub_src_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(115), 9, 1, MFLAGS, ++ RK3588_CLKGATE_CON(52), 9, GFLAGS), ++ GATE(PCLK_EDP0, "pclk_edp0", "pclk_vo1_root", 0, ++ RK3588_CLKGATE_CON(62), 0, GFLAGS), ++ GATE(CLK_EDP0_24M, "clk_edp0_24m", "xin24m", 0, ++ RK3588_CLKGATE_CON(62), 1, GFLAGS), ++ COMPOSITE_NODIV(CLK_EDP0_200M, "clk_edp0_200m", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(140), 1, 2, MFLAGS, ++ RK3588_CLKGATE_CON(62), 2, GFLAGS), ++ GATE(PCLK_EDP1, "pclk_edp1", "pclk_vo1_root", 0, ++ RK3588_CLKGATE_CON(62), 3, GFLAGS), ++ GATE(CLK_EDP1_24M, "clk_edp1_24m", "xin24m", 0, ++ RK3588_CLKGATE_CON(62), 4, GFLAGS), ++ COMPOSITE_NODIV(CLK_EDP1_200M, "clk_edp1_200m", mux_200m_100m_50m_24m_p, 0, ++ RK3588_CLKSEL_CON(140), 3, 2, MFLAGS, ++ RK3588_CLKGATE_CON(62), 5, GFLAGS), ++ GATE(HCLK_HDCP_KEY1, "hclk_hdcp_key1", "hclk_vo1_s_root", 0, ++ RK3588_CLKGATE_CON(60), 4, GFLAGS), ++ GATE(PCLK_HDCP1, "pclk_hdcp1", "pclk_vo1_root", 0, ++ RK3588_CLKGATE_CON(60), 7, GFLAGS), ++ GATE(ACLK_HDMIRX, "aclk_hdmirx", "aclk_hdmirx_root", 0, ++ RK3588_CLKGATE_CON(61), 9, GFLAGS), ++ GATE(PCLK_HDMIRX, "pclk_hdmirx", "pclk_vo1_root", 0, ++ RK3588_CLKGATE_CON(61), 10, GFLAGS), ++ GATE(CLK_HDMIRX_REF, "clk_hdmirx_ref", "aclk_hdcp1_root", 0, ++ RK3588_CLKGATE_CON(61), 11, GFLAGS), ++ COMPOSITE(CLK_HDMIRX_AUD_SRC, "clk_hdmirx_aud_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(138), 8, 1, MFLAGS, 0, 8, DFLAGS, ++ RK3588_CLKGATE_CON(61), 12, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_HDMIRX_AUD_FRAC, "clk_hdmirx_aud_frac", "clk_hdmirx_aud_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(139), 0, ++ RK3588_CLKGATE_CON(61), 13, GFLAGS, ++ &rk3588_hdmirx_aud_fracmux), ++ GATE(CLK_HDMIRX_AUD, "clk_hdmirx_aud", "clk_hdmirx_aud_mux", 0, ++ RK3588_CLKGATE_CON(61), 14, GFLAGS), ++ GATE(PCLK_HDMITX0, "pclk_hdmitx0", "pclk_vo1_root", 0, ++ RK3588_CLKGATE_CON(60), 11, GFLAGS), ++ COMPOSITE(CLK_HDMITX0_EARC, "clk_hdmitx0_earc", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(133), 6, 1, MFLAGS, 1, 5, DFLAGS, ++ RK3588_CLKGATE_CON(60), 15, GFLAGS), ++ GATE(CLK_HDMITX0_REF, "clk_hdmitx0_ref", "aclk_hdcp1_root", 0, ++ RK3588_CLKGATE_CON(61), 0, GFLAGS), ++ GATE(PCLK_HDMITX1, "pclk_hdmitx1", "pclk_vo1_root", 0, ++ RK3588_CLKGATE_CON(61), 2, GFLAGS), ++ COMPOSITE(CLK_HDMITX1_EARC, "clk_hdmitx1_earc", gpll_cpll_p, 0, ++ RK3588_CLKSEL_CON(136), 6, 1, MFLAGS, 1, 5, DFLAGS, ++ RK3588_CLKGATE_CON(61), 6, GFLAGS), ++ GATE(CLK_HDMITX1_REF, "clk_hdmitx1_ref", "aclk_hdcp1_root", 0, ++ RK3588_CLKGATE_CON(61), 7, GFLAGS), ++ GATE(ACLK_TRNG1, "aclk_trng1", "aclk_hdcp1_root", 0, ++ RK3588_CLKGATE_CON(60), 9, GFLAGS), ++ GATE(PCLK_TRNG1, "pclk_trng1", "pclk_vo1_root", 0, ++ RK3588_CLKGATE_CON(60), 10, GFLAGS), ++ GATE(0, "pclk_vo1grf", "pclk_vo1_root", CLK_IGNORE_UNUSED, ++ RK3588_CLKGATE_CON(59), 12, GFLAGS), ++ GATE(PCLK_S_EDP0, "pclk_s_edp0", "pclk_vo1_s_root", 0, ++ RK3588_CLKGATE_CON(59), 14, GFLAGS), ++ GATE(PCLK_S_EDP1, "pclk_s_edp1", "pclk_vo1_s_root", 0, ++ RK3588_CLKGATE_CON(59), 15, GFLAGS), ++ GATE(PCLK_S_HDMIRX, "pclk_s_hdmirx", "pclk_vo1_s_root", 0, ++ RK3588_CLKGATE_CON(65), 8, GFLAGS), ++ COMPOSITE(CLK_I2S10_8CH_RX_SRC, "clk_i2s10_8ch_rx_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(155), 8, 1, MFLAGS, 3, 5, DFLAGS, ++ RK3588_CLKGATE_CON(65), 5, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S10_8CH_RX_FRAC, "clk_i2s10_8ch_rx_frac", "clk_i2s10_8ch_rx_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(156), 0, ++ RK3588_CLKGATE_CON(65), 6, GFLAGS, ++ &rk3588_i2s10_8ch_rx_fracmux), ++ GATE(MCLK_I2S10_8CH_RX, "mclk_i2s10_8ch_rx", "clk_i2s10_8ch_rx", 0, ++ RK3588_CLKGATE_CON(65), 7, GFLAGS), ++ COMPOSITE(CLK_I2S7_8CH_RX_SRC, "clk_i2s7_8ch_rx_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(129), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RK3588_CLKGATE_CON(60), 1, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S7_8CH_RX_FRAC, "clk_i2s7_8ch_rx_frac", "clk_i2s7_8ch_rx_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(130), 0, ++ RK3588_CLKGATE_CON(60), 2, GFLAGS, ++ &rk3588_i2s7_8ch_rx_fracmux), ++ GATE(MCLK_I2S7_8CH_RX, "mclk_i2s7_8ch_rx", "clk_i2s7_8ch_rx", 0, ++ RK3588_CLKGATE_CON(60), 3, GFLAGS), ++ COMPOSITE(CLK_I2S9_8CH_RX_SRC, "clk_i2s9_8ch_rx_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(153), 12, 1, MFLAGS, 7, 5, DFLAGS, ++ RK3588_CLKGATE_CON(65), 1, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S9_8CH_RX_FRAC, "clk_i2s9_8ch_rx_frac", "clk_i2s9_8ch_rx_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(154), 0, ++ RK3588_CLKGATE_CON(65), 2, GFLAGS, ++ &rk3588_i2s9_8ch_rx_fracmux), ++ GATE(MCLK_I2S9_8CH_RX, "mclk_i2s9_8ch_rx", "clk_i2s9_8ch_rx", 0, ++ RK3588_CLKGATE_CON(65), 3, GFLAGS), ++ COMPOSITE(CLK_I2S5_8CH_TX_SRC, "clk_i2s5_8ch_tx_src", gpll_aupll_p, CLK_SET_RATE_NO_REPARENT, ++ RK3588_CLKSEL_CON(140), 10, 1, MFLAGS, 5, 5, DFLAGS, ++ RK3588_CLKGATE_CON(62), 6, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S5_8CH_TX_FRAC, "clk_i2s5_8ch_tx_frac", "clk_i2s5_8ch_tx_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(141), 0, ++ RK3588_CLKGATE_CON(62), 7, GFLAGS, ++ &rk3588_i2s5_8ch_tx_fracmux), ++ GATE(MCLK_I2S5_8CH_TX, "mclk_i2s5_8ch_tx", "clk_i2s5_8ch_tx", 0, ++ RK3588_CLKGATE_CON(62), 8, GFLAGS), ++ COMPOSITE(CLK_I2S6_8CH_TX_SRC, "clk_i2s6_8ch_tx_src", gpll_aupll_p, CLK_SET_RATE_NO_REPARENT, ++ RK3588_CLKSEL_CON(144), 8, 1, MFLAGS, 3, 5, DFLAGS, ++ RK3588_CLKGATE_CON(62), 13, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S6_8CH_TX_FRAC, "clk_i2s6_8ch_tx_frac", "clk_i2s6_8ch_tx_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(145), 0, ++ RK3588_CLKGATE_CON(62), 14, GFLAGS, ++ &rk3588_i2s6_8ch_tx_fracmux), ++ GATE(MCLK_I2S6_8CH_TX, "mclk_i2s6_8ch_tx", "clk_i2s6_8ch_tx", 0, ++ RK3588_CLKGATE_CON(62), 15, GFLAGS), ++ COMPOSITE(CLK_I2S6_8CH_RX_SRC, "clk_i2s6_8ch_rx_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(146), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(63), 0, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S6_8CH_RX_FRAC, "clk_i2s6_8ch_rx_frac", "clk_i2s6_8ch_rx_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(147), 0, ++ RK3588_CLKGATE_CON(63), 1, GFLAGS, ++ &rk3588_i2s6_8ch_rx_fracmux), ++ GATE(MCLK_I2S6_8CH_RX, "mclk_i2s6_8ch_rx", "clk_i2s6_8ch_rx", 0, ++ RK3588_CLKGATE_CON(63), 2, GFLAGS), ++ MUX(I2S6_8CH_MCLKOUT, "i2s6_8ch_mclkout", i2s6_8ch_mclkout_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(148), 2, 2, MFLAGS), ++ COMPOSITE(CLK_SPDIF3_SRC, "clk_spdif3_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(148), 9, 1, MFLAGS, 4, 5, DFLAGS, ++ RK3588_CLKGATE_CON(63), 5, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_SPDIF3_FRAC, "clk_spdif3_frac", "clk_spdif3_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(149), 0, ++ RK3588_CLKGATE_CON(63), 6, GFLAGS, ++ &rk3588_spdif3_fracmux), ++ GATE(MCLK_SPDIF3, "mclk_spdif3", "clk_spdif3", 0, ++ RK3588_CLKGATE_CON(63), 7, GFLAGS), ++ COMPOSITE(CLK_SPDIF4_SRC, "clk_spdif4_src", gpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(150), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(63), 9, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_SPDIF4_FRAC, "clk_spdif4_frac", "clk_spdif4_src", CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(151), 0, ++ RK3588_CLKGATE_CON(63), 10, GFLAGS, ++ &rk3588_spdif4_fracmux), ++ GATE(MCLK_SPDIF4, "mclk_spdif4", "clk_spdif4", 0, ++ RK3588_CLKGATE_CON(63), 11, GFLAGS), ++ COMPOSITE(MCLK_SPDIFRX0, "mclk_spdifrx0", gpll_cpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(152), 7, 2, MFLAGS, 2, 5, DFLAGS, ++ RK3588_CLKGATE_CON(63), 13, GFLAGS), ++ COMPOSITE(MCLK_SPDIFRX1, "mclk_spdifrx1", gpll_cpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(152), 14, 2, MFLAGS, 9, 5, DFLAGS, ++ RK3588_CLKGATE_CON(63), 15, GFLAGS), ++ COMPOSITE(MCLK_SPDIFRX2, "mclk_spdifrx2", gpll_cpll_aupll_p, 0, ++ RK3588_CLKSEL_CON(153), 5, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(64), 1, GFLAGS), ++ GATE(CLK_HDMIHDP0, "clk_hdmihdp0", "xin24m", 0, ++ RK3588_CLKGATE_CON(73), 12, GFLAGS), ++ GATE(CLK_HDMIHDP1, "clk_hdmihdp1", "xin24m", 0, ++ RK3588_CLKGATE_CON(73), 13, GFLAGS), ++ GATE(PCLK_HDPTX0, "pclk_hdptx0", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(72), 5, GFLAGS), ++ GATE(PCLK_HDPTX1, "pclk_hdptx1", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(72), 6, GFLAGS), ++ GATE(PCLK_USBDPPHY0, "pclk_usbdpphy0", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(72), 2, GFLAGS), ++ GATE(PCLK_USBDPPHY1, "pclk_usbdpphy1", "pclk_top_root", 0, ++ RK3588_CLKGATE_CON(72), 4, GFLAGS), ++ GATE(HCLK_VOP, "hclk_vop", "hclk_vop_root", 0, ++ RK3588_CLKGATE_CON(52), 8, GFLAGS), ++ COMPOSITE(DCLK_VOP0_SRC, "dclk_vop0_src", gpll_cpll_v0pll_aupll_p, CLK_SET_RATE_NO_REPARENT, ++ RK3588_CLKSEL_CON(111), 7, 2, MFLAGS, 0, 7, DFLAGS, ++ RK3588_CLKGATE_CON(52), 10, GFLAGS), ++ COMPOSITE(DCLK_VOP1_SRC, "dclk_vop1_src", gpll_cpll_v0pll_aupll_p, CLK_SET_RATE_NO_REPARENT, ++ RK3588_CLKSEL_CON(111), 14, 2, MFLAGS, 9, 5, DFLAGS, ++ RK3588_CLKGATE_CON(52), 11, GFLAGS), ++ COMPOSITE(DCLK_VOP2_SRC, "dclk_vop2_src", gpll_cpll_v0pll_aupll_p, CLK_SET_RATE_NO_REPARENT, ++ RK3588_CLKSEL_CON(112), 5, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_CLKGATE_CON(52), 12, GFLAGS), ++ COMPOSITE_NODIV(DCLK_VOP0, "dclk_vop0", dclk_vop0_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, ++ RK3588_CLKSEL_CON(112), 7, 2, MFLAGS, ++ RK3588_CLKGATE_CON(52), 13, GFLAGS), ++ COMPOSITE_NODIV(DCLK_VOP1, "dclk_vop1", dclk_vop1_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, ++ RK3588_CLKSEL_CON(112), 9, 2, MFLAGS, ++ RK3588_CLKGATE_CON(53), 0, GFLAGS), ++ COMPOSITE_NODIV(DCLK_VOP2, "dclk_vop2", dclk_vop2_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, ++ RK3588_CLKSEL_CON(112), 11, 2, MFLAGS, ++ RK3588_CLKGATE_CON(53), 1, GFLAGS), ++ COMPOSITE(DCLK_VOP3, "dclk_vop3", gpll_cpll_v0pll_aupll_p, CLK_SET_RATE_NO_REPARENT, ++ RK3588_CLKSEL_CON(113), 7, 2, MFLAGS, 0, 7, DFLAGS, ++ RK3588_CLKGATE_CON(53), 2, GFLAGS), ++ GATE(PCLK_DSIHOST0, "pclk_dsihost0", "pclk_vop_root", 0, ++ RK3588_CLKGATE_CON(53), 4, GFLAGS), ++ GATE(PCLK_DSIHOST1, "pclk_dsihost1", "pclk_vop_root", 0, ++ RK3588_CLKGATE_CON(53), 5, GFLAGS), ++ COMPOSITE(CLK_DSIHOST0, "clk_dsihost0", gpll_cpll_v0pll_spll_p, 0, ++ RK3588_CLKSEL_CON(114), 7, 2, MFLAGS, 0, 7, DFLAGS, ++ RK3588_CLKGATE_CON(53), 6, GFLAGS), ++ COMPOSITE(CLK_DSIHOST1, "clk_dsihost1", gpll_cpll_v0pll_spll_p, 0, ++ RK3588_CLKSEL_CON(115), 7, 2, MFLAGS, 0, 7, DFLAGS, ++ RK3588_CLKGATE_CON(53), 7, GFLAGS), ++ GATE(CLK_VOP_PMU, "clk_vop_pmu", "xin24m", CLK_IGNORE_UNUSED, ++ RK3588_CLKGATE_CON(53), 8, GFLAGS), ++ GATE(ACLK_VOP_DOBY, "aclk_vop_doby", "aclk_vop_root", 0, ++ RK3588_CLKGATE_CON(53), 10, GFLAGS), ++ GATE(CLK_USBDP_PHY0_IMMORTAL, "clk_usbdp_phy0_immortal", "xin24m", CLK_IGNORE_UNUSED, ++ RK3588_CLKGATE_CON(2), 8, GFLAGS), ++ GATE(CLK_USBDP_PHY1_IMMORTAL, "clk_usbdp_phy1_immortal", "xin24m", CLK_IGNORE_UNUSED, ++ RK3588_CLKGATE_CON(2), 15, GFLAGS), ++ ++ GATE(CLK_REF_PIPE_PHY0_OSC_SRC, "clk_ref_pipe_phy0_osc_src", "xin24m", 0, ++ RK3588_CLKGATE_CON(77), 0, GFLAGS), ++ GATE(CLK_REF_PIPE_PHY1_OSC_SRC, "clk_ref_pipe_phy1_osc_src", "xin24m", 0, ++ RK3588_CLKGATE_CON(77), 1, GFLAGS), ++ GATE(CLK_REF_PIPE_PHY2_OSC_SRC, "clk_ref_pipe_phy2_osc_src", "xin24m", 0, ++ RK3588_CLKGATE_CON(77), 2, GFLAGS), ++ COMPOSITE_NOMUX(CLK_REF_PIPE_PHY0_PLL_SRC, "clk_ref_pipe_phy0_pll_src", "ppll", 0, ++ RK3588_CLKSEL_CON(176), 0, 6, DFLAGS, ++ RK3588_CLKGATE_CON(77), 3, GFLAGS), ++ COMPOSITE_NOMUX(CLK_REF_PIPE_PHY1_PLL_SRC, "clk_ref_pipe_phy1_pll_src", "ppll", 0, ++ RK3588_CLKSEL_CON(176), 6, 6, DFLAGS, ++ RK3588_CLKGATE_CON(77), 4, GFLAGS), ++ COMPOSITE_NOMUX(CLK_REF_PIPE_PHY2_PLL_SRC, "clk_ref_pipe_phy2_pll_src", "ppll", 0, ++ RK3588_CLKSEL_CON(177), 0, 6, DFLAGS, ++ RK3588_CLKGATE_CON(77), 5, GFLAGS), ++ MUX(CLK_REF_PIPE_PHY0, "clk_ref_pipe_phy0", clk_ref_pipe_phy0_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(177), 6, 1, MFLAGS), ++ MUX(CLK_REF_PIPE_PHY1, "clk_ref_pipe_phy1", clk_ref_pipe_phy1_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(177), 7, 1, MFLAGS), ++ MUX(CLK_REF_PIPE_PHY2, "clk_ref_pipe_phy2", clk_ref_pipe_phy2_p, CLK_SET_RATE_PARENT, ++ RK3588_CLKSEL_CON(177), 8, 1, MFLAGS), ++ ++ /* pmu */ ++ COMPOSITE(CLK_PMU1_300M_SRC, "clk_pmu1_300m_src", pmu_300m_24m_p, 0, ++ RK3588_PMU_CLKSEL_CON(0), 15, 1, MFLAGS, 10, 5, DFLAGS, ++ RK3588_PMU_CLKGATE_CON(0), 3, GFLAGS), ++ COMPOSITE(CLK_PMU1_400M_SRC, "clk_pmu1_400m_src", pmu_400m_24m_p, 0, ++ RK3588_PMU_CLKSEL_CON(1), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_PMU_CLKGATE_CON(0), 4, GFLAGS), ++ COMPOSITE_NOMUX(CLK_PMU1_50M_SRC, "clk_pmu1_50m_src", "clk_pmu1_400m_src", 0, ++ RK3588_PMU_CLKSEL_CON(0), 0, 4, DFLAGS, ++ RK3588_PMU_CLKGATE_CON(0), 0, GFLAGS), ++ COMPOSITE_NOMUX(CLK_PMU1_100M_SRC, "clk_pmu1_100m_src", "clk_pmu1_400m_src", 0, ++ RK3588_PMU_CLKSEL_CON(0), 4, 3, DFLAGS, ++ RK3588_PMU_CLKGATE_CON(0), 1, GFLAGS), ++ COMPOSITE_NOMUX(CLK_PMU1_200M_SRC, "clk_pmu1_200m_src", "clk_pmu1_400m_src", 0, ++ RK3588_PMU_CLKSEL_CON(0), 7, 3, DFLAGS, ++ RK3588_PMU_CLKGATE_CON(0), 2, GFLAGS), ++ COMPOSITE_NODIV(HCLK_PMU1_ROOT, "hclk_pmu1_root", hclk_pmu1_root_p, CLK_IS_CRITICAL, ++ RK3588_PMU_CLKSEL_CON(1), 6, 2, MFLAGS, ++ RK3588_PMU_CLKGATE_CON(0), 5, GFLAGS), ++ COMPOSITE_NODIV(PCLK_PMU1_ROOT, "pclk_pmu1_root", pmu_100m_50m_24m_src_p, CLK_IS_CRITICAL, ++ RK3588_PMU_CLKSEL_CON(1), 8, 2, MFLAGS, ++ RK3588_PMU_CLKGATE_CON(0), 7, GFLAGS), ++ GATE(PCLK_PMU0_ROOT, "pclk_pmu0_root", "pclk_pmu1_root", CLK_IS_CRITICAL, ++ RK3588_PMU_CLKGATE_CON(5), 0, GFLAGS), ++ COMPOSITE_NODIV(HCLK_PMU_CM0_ROOT, "hclk_pmu_cm0_root", hclk_pmu_cm0_root_p, CLK_IS_CRITICAL, ++ RK3588_PMU_CLKSEL_CON(1), 10, 2, MFLAGS, ++ RK3588_PMU_CLKGATE_CON(0), 8, GFLAGS), ++ GATE(CLK_PMU0, "clk_pmu0", "xin24m", CLK_IS_CRITICAL, ++ RK3588_PMU_CLKGATE_CON(5), 1, GFLAGS), ++ GATE(PCLK_PMU0, "pclk_pmu0", "pclk_pmu0_root", CLK_IS_CRITICAL, ++ RK3588_PMU_CLKGATE_CON(5), 2, GFLAGS), ++ GATE(PCLK_PMU0IOC, "pclk_pmu0ioc", "pclk_pmu0_root", CLK_IS_CRITICAL, ++ RK3588_PMU_CLKGATE_CON(5), 4, GFLAGS), ++ GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_pmu0_root", 0, ++ RK3588_PMU_CLKGATE_CON(5), 5, GFLAGS), ++ COMPOSITE_NODIV(DBCLK_GPIO0, "dbclk_gpio0", mux_24m_32k_p, 0, ++ RK3588_PMU_CLKSEL_CON(17), 0, 1, MFLAGS, ++ RK3588_PMU_CLKGATE_CON(5), 6, GFLAGS), ++ GATE(PCLK_I2C0, "pclk_i2c0", "pclk_pmu0_root", 0, ++ RK3588_PMU_CLKGATE_CON(2), 1, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C0, "clk_i2c0", pmu_200m_100m_p, 0, ++ RK3588_PMU_CLKSEL_CON(3), 6, 1, MFLAGS, ++ RK3588_PMU_CLKGATE_CON(2), 2, GFLAGS), ++ GATE(HCLK_I2S1_8CH, "hclk_i2s1_8ch", "hclk_pmu1_root", 0, ++ RK3588_PMU_CLKGATE_CON(2), 7, GFLAGS), ++ COMPOSITE_NOMUX(CLK_I2S1_8CH_TX_SRC, "clk_i2s1_8ch_tx_src", "cpll", 0, ++ RK3588_PMU_CLKSEL_CON(5), 2, 5, DFLAGS, ++ RK3588_PMU_CLKGATE_CON(2), 8, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S1_8CH_TX_FRAC, "clk_i2s1_8ch_tx_frac", "clk_i2s1_8ch_tx_src", CLK_SET_RATE_PARENT, ++ RK3588_PMU_CLKSEL_CON(6), 0, ++ RK3588_PMU_CLKGATE_CON(2), 9, GFLAGS, ++ &rk3588_i2s1_8ch_tx_fracmux), ++ GATE(MCLK_I2S1_8CH_TX, "mclk_i2s1_8ch_tx", "clk_i2s1_8ch_tx", 0, ++ RK3588_PMU_CLKGATE_CON(2), 10, GFLAGS), ++ COMPOSITE_NOMUX(CLK_I2S1_8CH_RX_SRC, "clk_i2s1_8ch_rx_src", "cpll", 0, ++ RK3588_PMU_CLKSEL_CON(7), 2, 5, DFLAGS, ++ RK3588_PMU_CLKGATE_CON(2), 11, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S1_8CH_RX_FRAC, "clk_i2s1_8ch_rx_frac", "clk_i2s1_8ch_rx_src", CLK_SET_RATE_PARENT, ++ RK3588_PMU_CLKSEL_CON(8), 0, ++ RK3588_PMU_CLKGATE_CON(2), 12, GFLAGS, ++ &rk3588_i2s1_8ch_rx_fracmux), ++ GATE(MCLK_I2S1_8CH_RX, "mclk_i2s1_8ch_rx", "clk_i2s1_8ch_rx", 0, ++ RK3588_PMU_CLKGATE_CON(2), 13, GFLAGS), ++ MUX(I2S1_8CH_MCLKOUT, "i2s1_8ch_mclkout", i2s1_8ch_mclkout_p, CLK_SET_RATE_PARENT, ++ RK3588_PMU_CLKSEL_CON(9), 2, 2, MFLAGS), ++ GATE(PCLK_PMU1, "pclk_pmu1", "pclk_pmu0_root", CLK_IS_CRITICAL, ++ RK3588_PMU_CLKGATE_CON(1), 0, GFLAGS), ++ GATE(CLK_DDR_FAIL_SAFE, "clk_ddr_fail_safe", "clk_pmu0", CLK_IGNORE_UNUSED, ++ RK3588_PMU_CLKGATE_CON(1), 1, GFLAGS), ++ GATE(CLK_PMU1, "clk_pmu1", "clk_pmu0", CLK_IS_CRITICAL, ++ RK3588_PMU_CLKGATE_CON(1), 3, GFLAGS), ++ GATE(HCLK_PDM0, "hclk_pdm0", "hclk_pmu1_root", 0, ++ RK3588_PMU_CLKGATE_CON(2), 14, GFLAGS), ++ COMPOSITE_NODIV(MCLK_PDM0, "mclk_pdm0", mclk_pdm0_p, 0, ++ RK3588_PMU_CLKSEL_CON(9), 4, 1, MFLAGS, ++ RK3588_PMU_CLKGATE_CON(2), 15, GFLAGS), ++ GATE(HCLK_VAD, "hclk_vad", "hclk_pmu1_root", 0, ++ RK3588_PMU_CLKGATE_CON(3), 0, GFLAGS), ++ GATE(FCLK_PMU_CM0_CORE, "fclk_pmu_cm0_core", "hclk_pmu_cm0_root", CLK_IS_CRITICAL, ++ RK3588_PMU_CLKGATE_CON(0), 13, GFLAGS), ++ COMPOSITE(CLK_PMU_CM0_RTC, "clk_pmu_cm0_rtc", mux_24m_32k_p, CLK_IS_CRITICAL, ++ RK3588_PMU_CLKSEL_CON(2), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RK3588_PMU_CLKGATE_CON(0), 15, GFLAGS), ++ GATE(PCLK_PMU1_IOC, "pclk_pmu1_ioc", "pclk_pmu0_root", CLK_IGNORE_UNUSED, ++ RK3588_PMU_CLKGATE_CON(1), 5, GFLAGS), ++ GATE(PCLK_PMU1PWM, "pclk_pmu1pwm", "pclk_pmu0_root", 0, ++ RK3588_PMU_CLKGATE_CON(1), 12, GFLAGS), ++ COMPOSITE_NODIV(CLK_PMU1PWM, "clk_pmu1pwm", pmu_100m_50m_24m_src_p, 0, ++ RK3588_PMU_CLKSEL_CON(2), 9, 2, MFLAGS, ++ RK3588_PMU_CLKGATE_CON(1), 13, GFLAGS), ++ GATE(CLK_PMU1PWM_CAPTURE, "clk_pmu1pwm_capture", "xin24m", 0, ++ RK3588_PMU_CLKGATE_CON(1), 14, GFLAGS), ++ GATE(PCLK_PMU1TIMER, "pclk_pmu1timer", "pclk_pmu0_root", 0, ++ RK3588_PMU_CLKGATE_CON(1), 8, GFLAGS), ++ COMPOSITE_NODIV(CLK_PMU1TIMER_ROOT, "clk_pmu1timer_root", pmu_24m_32k_100m_src_p, 0, ++ RK3588_PMU_CLKSEL_CON(2), 7, 2, MFLAGS, ++ RK3588_PMU_CLKGATE_CON(1), 9, GFLAGS), ++ GATE(CLK_PMU1TIMER0, "clk_pmu1timer0", "clk_pmu1timer_root", 0, ++ RK3588_PMU_CLKGATE_CON(1), 10, GFLAGS), ++ GATE(CLK_PMU1TIMER1, "clk_pmu1timer1", "clk_pmu1timer_root", 0, ++ RK3588_PMU_CLKGATE_CON(1), 11, GFLAGS), ++ COMPOSITE_NOMUX(CLK_UART0_SRC, "clk_uart0_src", "cpll", 0, ++ RK3588_PMU_CLKSEL_CON(3), 7, 5, DFLAGS, ++ RK3588_PMU_CLKGATE_CON(2), 3, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART0_FRAC, "clk_uart0_frac", "clk_uart0_src", CLK_SET_RATE_PARENT, ++ RK3588_PMU_CLKSEL_CON(4), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RK3588_PMU_CLKGATE_CON(2), 4, GFLAGS, ++ &rk3588_uart0_fracmux), ++ GATE(SCLK_UART0, "sclk_uart0", "clk_uart0", 0, ++ RK3588_PMU_CLKGATE_CON(2), 5, GFLAGS), ++ GATE(PCLK_UART0, "pclk_uart0", "pclk_pmu0_root", 0, ++ RK3588_PMU_CLKGATE_CON(2), 6, GFLAGS), ++ GATE(PCLK_PMU1WDT, "pclk_pmu1wdt", "pclk_pmu0_root", 0, ++ RK3588_PMU_CLKGATE_CON(1), 6, GFLAGS), ++ COMPOSITE_NODIV(TCLK_PMU1WDT, "tclk_pmu1wdt", mux_24m_32k_p, 0, ++ RK3588_PMU_CLKSEL_CON(2), 6, 1, MFLAGS, ++ RK3588_PMU_CLKGATE_CON(1), 7, GFLAGS), ++ COMPOSITE(CLK_CR_PARA, "clk_cr_para", mux_24m_ppll_spll_p, 0, ++ RK3588_PMU_CLKSEL_CON(15), 5, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3588_PMU_CLKGATE_CON(4), 11, GFLAGS), ++ COMPOSITE(CLK_USB2PHY_HDPTXRXPHY_REF, "clk_usb2phy_hdptxrxphy_ref", mux_24m_ppll_p, CLK_IS_CRITICAL, ++ RK3588_PMU_CLKSEL_CON(14), 14, 1, MFLAGS, 9, 5, DFLAGS, ++ RK3588_PMU_CLKGATE_CON(4), 7, GFLAGS), ++ COMPOSITE(CLK_USBDPPHY_MIPIDCPPHY_REF, "clk_usbdpphy_mipidcpphy_ref", mux_24m_ppll_spll_p, CLK_IS_CRITICAL, ++ RK3588_PMU_CLKSEL_CON(14), 7, 2, MFLAGS, 0, 7, DFLAGS, ++ RK3588_PMU_CLKGATE_CON(4), 3, GFLAGS), ++ ++ GATE(CLK_PHY0_REF_ALT_P, "clk_phy0_ref_alt_p", "ppll", 0, ++ RK3588_PHYREF_ALT_GATE, 0, GFLAGS), ++ GATE(CLK_PHY0_REF_ALT_M, "clk_phy0_ref_alt_m", "ppll", 0, ++ RK3588_PHYREF_ALT_GATE, 1, GFLAGS), ++ GATE(CLK_PHY1_REF_ALT_P, "clk_phy1_ref_alt_p", "ppll", 0, ++ RK3588_PHYREF_ALT_GATE, 2, GFLAGS), ++ GATE(CLK_PHY1_REF_ALT_M, "clk_phy1_ref_alt_m", "ppll", 0, ++ RK3588_PHYREF_ALT_GATE, 3, GFLAGS), ++ ++ GATE(HCLK_SPDIFRX0, "hclk_spdifrx0", "hclk_vo1", 0, ++ RK3588_CLKGATE_CON(63), 12, GFLAGS), ++ GATE(HCLK_SPDIFRX1, "hclk_spdifrx1", "hclk_vo1", 0, ++ RK3588_CLKGATE_CON(63), 14, GFLAGS), ++ GATE(HCLK_SPDIFRX2, "hclk_spdifrx2", "hclk_vo1", 0, ++ RK3588_CLKGATE_CON(64), 0, GFLAGS), ++ GATE(HCLK_SPDIF4, "hclk_spdif4", "hclk_vo1", 0, ++ RK3588_CLKGATE_CON(63), 8, GFLAGS), ++ GATE(HCLK_SPDIF3, "hclk_spdif3", "hclk_vo1", 0, ++ RK3588_CLKGATE_CON(63), 4, GFLAGS), ++ GATE(HCLK_I2S6_8CH, "hclk_i2s6_8ch", "hclk_vo1", 0, ++ RK3588_CLKGATE_CON(63), 3, GFLAGS), ++ GATE(HCLK_I2S5_8CH, "hclk_i2s5_8ch", "hclk_vo1", 0, ++ RK3588_CLKGATE_CON(62), 12, GFLAGS), ++ GATE(HCLK_I2S9_8CH, "hclk_i2s9_8ch", "hclk_vo1", 0, ++ RK3588_CLKGATE_CON(65), 0, GFLAGS), ++ GATE(HCLK_I2S7_8CH, "hclk_i2s7_8ch", "hclk_vo1", 0, ++ RK3588_CLKGATE_CON(60), 0, GFLAGS), ++ GATE(HCLK_I2S10_8CH, "hclk_i2s10_8ch", "hclk_vo1", 0, ++ RK3588_CLKGATE_CON(65), 4, GFLAGS), ++ GATE(ACLK_HDCP1, "aclk_hdcp1", "aclk_hdcp1_pre", 0, ++ RK3588_CLKGATE_CON(60), 5, GFLAGS), ++ GATE(HCLK_HDCP1, "hclk_hdcp1", "hclk_vo1", 0, ++ RK3588_CLKGATE_CON(60), 6, GFLAGS), ++ GATE(HCLK_SPDIF5_DP1, "hclk_spdif5_dp1", "hclk_vo0", 0, ++ RK3588_CLKGATE_CON(57), 7, GFLAGS), ++ GATE(HCLK_SPDIF2_DP0, "hclk_spdif2_dp0", "hclk_vo0", 0, ++ RK3588_CLKGATE_CON(57), 2, GFLAGS), ++ GATE(HCLK_I2S8_8CH, "hclk_i2s8_8ch", "hclk_vo0", 0, ++ RK3588_CLKGATE_CON(56), 14, GFLAGS), ++ GATE(HCLK_I2S4_8CH, "hclk_i2s4_8ch", "hclk_vo0", 0, ++ RK3588_CLKGATE_CON(56), 10, GFLAGS), ++ GATE(ACLK_HDCP0, "aclk_hdcp0", "aclk_hdcp0_pre", 0, ++ RK3588_CLKGATE_CON(55), 12, GFLAGS), ++ GATE(HCLK_HDCP0, "hclk_hdcp0", "hclk_vo0", 0, ++ RK3588_CLKGATE_CON(55), 13, GFLAGS), ++ GATE(HCLK_RKVENC1, "hclk_rkvenc1", "hclk_rkvenc1_pre", 0, ++ RK3588_CLKGATE_CON(48), 4, GFLAGS), ++ GATE(ACLK_RKVENC1, "aclk_rkvenc1", "aclk_rkvenc1_pre", 0, ++ RK3588_CLKGATE_CON(48), 5, GFLAGS), ++ GATE(ACLK_VPU, "aclk_vpu", "aclk_vdpu_low_pre", 0, ++ RK3588_CLKGATE_CON(44), 8, GFLAGS), ++ GATE(ACLK_IEP2P0, "aclk_iep2p0", "aclk_vdpu_low_pre", 0, ++ RK3588_CLKGATE_CON(45), 5, GFLAGS), ++ GATE(ACLK_JPEG_ENCODER0, "aclk_jpeg_encoder0", "aclk_vdpu_low_pre", 0, ++ RK3588_CLKGATE_CON(44), 10, GFLAGS), ++ GATE(ACLK_JPEG_ENCODER1, "aclk_jpeg_encoder1", "aclk_vdpu_low_pre", 0, ++ RK3588_CLKGATE_CON(44), 12, GFLAGS), ++ GATE(ACLK_JPEG_ENCODER2, "aclk_jpeg_encoder2", "aclk_vdpu_low_pre", 0, ++ RK3588_CLKGATE_CON(44), 14, GFLAGS), ++ GATE(ACLK_JPEG_ENCODER3, "aclk_jpeg_encoder3", "aclk_vdpu_low_pre", 0, ++ RK3588_CLKGATE_CON(45), 0, GFLAGS), ++ GATE(ACLK_JPEG_DECODER, "aclk_jpeg_decoder", "aclk_jpeg_decoder_pre", 0, ++ RK3588_CLKGATE_CON(45), 2, GFLAGS), ++ GATE(ACLK_USB3OTG1, "aclk_usb3otg1", "aclk_usb", 0, ++ RK3588_CLKGATE_CON(42), 7, GFLAGS), ++ GATE(HCLK_HOST0, "hclk_host0", "hclk_usb", 0, ++ RK3588_CLKGATE_CON(42), 10, GFLAGS), ++ GATE(HCLK_HOST_ARB0, "hclk_host_arb0", "hclk_usb", 0, ++ RK3588_CLKGATE_CON(42), 11, GFLAGS), ++ GATE(HCLK_HOST1, "hclk_host1", "hclk_usb", 0, ++ RK3588_CLKGATE_CON(42), 12, GFLAGS), ++ GATE(HCLK_HOST_ARB1, "hclk_host_arb1", "hclk_usb", 0, ++ RK3588_CLKGATE_CON(42), 13, GFLAGS), ++ GATE(ACLK_USB3OTG0, "aclk_usb3otg0", "aclk_usb", 0, ++ RK3588_CLKGATE_CON(42), 4, GFLAGS), ++ MMC(SCLK_SDMMC_DRV, "sdmmc_drv", "scmi_cclk_sd", RK3588_SDMMC_CON0, 1), ++ MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "scmi_cclk_sd", RK3588_SDMMC_CON1, 1), ++ GATE(HCLK_SDIO, "hclk_sdio", "hclk_sdio_pre", 0, ++ RK3588_CLKGATE_CON(75), 2, GFLAGS), ++ GATE(HCLK_RKVDEC1, "hclk_rkvdec1", "hclk_rkvdec1_pre", 0, ++ RK3588_CLKGATE_CON(41), 2, GFLAGS), ++ GATE(ACLK_RKVDEC1, "aclk_rkvdec1", "aclk_rkvdec1_pre", 0, ++ RK3588_CLKGATE_CON(41), 3, GFLAGS), ++ GATE(HCLK_RKVDEC0, "hclk_rkvdec0", "hclk_rkvdec0_pre", 0, ++ RK3588_CLKGATE_CON(40), 3, GFLAGS), ++ GATE(ACLK_RKVDEC0, "aclk_rkvdec0", "aclk_rkvdec0_pre", 0, ++ RK3588_CLKGATE_CON(40), 4, GFLAGS), ++ GATE(CLK_PCIE4L_PIPE, "clk_pcie4l_pipe", "clk_pipe30phy_pipe0_i", 0, ++ RK3588_CLKGATE_CON(39), 0, GFLAGS), ++ GATE(CLK_PCIE2L_PIPE, "clk_pcie2l_pipe", "clk_pipe30phy_pipe2_i", 0, ++ RK3588_CLKGATE_CON(39), 1, GFLAGS), ++ GATE(CLK_PIPEPHY0_PIPE_G, "clk_pipephy0_pipe_g", "clk_pipephy0_pipe_i", 0, ++ RK3588_CLKGATE_CON(38), 3, GFLAGS), ++ GATE(CLK_PIPEPHY1_PIPE_G, "clk_pipephy1_pipe_g", "clk_pipephy1_pipe_i", 0, ++ RK3588_CLKGATE_CON(38), 4, GFLAGS), ++ GATE(CLK_PIPEPHY2_PIPE_G, "clk_pipephy2_pipe_g", "clk_pipephy2_pipe_i", 0, ++ RK3588_CLKGATE_CON(38), 5, GFLAGS), ++ GATE(CLK_PIPEPHY0_PIPE_ASIC_G, "clk_pipephy0_pipe_asic_g", "clk_pipephy0_pipe_i", 0, ++ RK3588_CLKGATE_CON(38), 6, GFLAGS), ++ GATE(CLK_PIPEPHY1_PIPE_ASIC_G, "clk_pipephy1_pipe_asic_g", "clk_pipephy1_pipe_i", 0, ++ RK3588_CLKGATE_CON(38), 7, GFLAGS), ++ GATE(CLK_PIPEPHY2_PIPE_ASIC_G, "clk_pipephy2_pipe_asic_g", "clk_pipephy2_pipe_i", 0, ++ RK3588_CLKGATE_CON(38), 8, GFLAGS), ++ GATE(CLK_PIPEPHY2_PIPE_U3_G, "clk_pipephy2_pipe_u3_g", "clk_pipephy2_pipe_i", 0, ++ RK3588_CLKGATE_CON(38), 9, GFLAGS), ++ GATE(CLK_PCIE1L2_PIPE, "clk_pcie1l2_pipe", "clk_pipephy0_pipe_g", 0, ++ RK3588_CLKGATE_CON(38), 13, GFLAGS), ++ GATE(CLK_PCIE1L0_PIPE, "clk_pcie1l0_pipe", "clk_pipephy1_pipe_g", 0, ++ RK3588_CLKGATE_CON(38), 14, GFLAGS), ++ GATE(CLK_PCIE1L1_PIPE, "clk_pcie1l1_pipe", "clk_pipephy2_pipe_g", 0, ++ RK3588_CLKGATE_CON(38), 15, GFLAGS), ++ GATE(HCLK_SFC, "hclk_sfc", "hclk_nvm", 0, ++ RK3588_CLKGATE_CON(31), 10, GFLAGS), ++ GATE(HCLK_SFC_XIP, "hclk_sfc_xip", "hclk_nvm", 0, ++ RK3588_CLKGATE_CON(31), 11, GFLAGS), ++ GATE(HCLK_EMMC, "hclk_emmc", "hclk_nvm", 0, ++ RK3588_CLKGATE_CON(31), 4, GFLAGS), ++ GATE(ACLK_ISP1, "aclk_isp1", "aclk_isp1_pre", 0, ++ RK3588_CLKGATE_CON(26), 5, GFLAGS), ++ GATE(HCLK_ISP1, "hclk_isp1", "hclk_isp1_pre", 0, ++ RK3588_CLKGATE_CON(26), 7, GFLAGS), ++ GATE(PCLK_AV1, "pclk_av1", "pclk_av1_pre", 0, ++ RK3588_CLKGATE_CON(68), 5, GFLAGS), ++ GATE(ACLK_AV1, "aclk_av1", "aclk_av1_pre", 0, ++ RK3588_CLKGATE_CON(68), 2, GFLAGS), ++}; ++ ++static void __iomem *rk3588_cru_base; ++ ++static void dump_offset(const char *name, u32 offset, u32 len) ++{ ++ int i = 0, cnt = 0; ++ ++ if (!offset) ++ return; ++ ++ cnt = DIV_ROUND_UP(len, 32); ++ for (i = 0; i < cnt; i++) { ++ pr_warn("%-12s 0x%05x: ", name, offset + i * 32); ++ print_hex_dump(KERN_CONT, "", DUMP_PREFIX_NONE, 32, 4, ++ rk3588_cru_base + offset + i * 0x10, 32, false); ++ } ++} ++ ++static void rk3588_dump_cru(void) ++{ ++ if (rk3588_cru_base) { ++ pr_warn("CRU REGS:\n"); ++ dump_offset("LPLL", RK3588_LPLL_CON(16), 0x10); ++ dump_offset("B0PLL", RK3588_B0_PLL_CON(0), 0x10); ++ dump_offset("B1PLL", RK3588_B1_PLL_CON(8), 0x10); ++ dump_offset("GPLL", RK3588_PLL_CON(112), 0x10); ++ dump_offset("CPLL", RK3588_PLL_CON(104), 0x10); ++ dump_offset("V0PLL", RK3588_PLL_CON(88), 0x10); ++ dump_offset("AUPLL", RK3588_PLL_CON(96), 0x10); ++ dump_offset("PPLL", RK3588_PMU_PLL_CON(128), 0x10); ++ dump_offset("DSUCRU_SEL", RK3588_DSU_CLKSEL_CON(0), 0x20); ++ dump_offset("DSUCRU_GATE", RK3588_DSU_CLKGATE_CON(0), 0x10); ++ dump_offset("BIG0CRU_SEL", RK3588_BIGCORE0_CLKSEL_CON(0), 0x10); ++ dump_offset("BIG0CRU_GATE", RK3588_BIGCORE0_CLKGATE_CON(0), 0x10); ++ dump_offset("BIG1CRU_SEL", RK3588_BIGCORE1_CLKSEL_CON(0), 0x10); ++ dump_offset("BIG1CRU_GATE", RK3588_BIGCORE1_CLKGATE_CON(0), 0x10); ++ dump_offset("CRU_SEL", RK3588_CLKSEL_CON(0), 0x2d0); ++ dump_offset("CRU_GATE", RK3588_CLKGATE_CON(0), 0x140); ++ dump_offset("PMUCRU_SEL", RK3588_PMU_CLKSEL_CON(0), 0x50); ++ dump_offset("PMUCRU_GATE", RK3588_PMU_CLKGATE_CON(0), 0x20); ++ } ++} ++ ++static void __init rk3588_clk_init(struct device_node *np) ++{ ++ struct rockchip_clk_provider *ctx; ++ void __iomem *reg_base; ++ struct clk **clks; ++ ++ reg_base = of_iomap(np, 0); ++ if (!reg_base) { ++ pr_err("%s: could not map cru region\n", __func__); ++ return; ++ } ++ ++ rk3588_cru_base = reg_base; ++ ++ ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS); ++ if (IS_ERR(ctx)) { ++ pr_err("%s: rockchip clk init failed\n", __func__); ++ iounmap(reg_base); ++ return; ++ } ++ clks = ctx->clk_data.clks; ++ ++ rockchip_clk_register_plls(ctx, rk3588_pll_clks, ++ ARRAY_SIZE(rk3588_pll_clks), ++ RK3588_GRF_SOC_STATUS0); ++ ++ rockchip_clk_register_armclk(ctx, ARMCLK_L, "armclk_l", ++ 3, clks[PLL_LPLL], clks[PLL_GPLL], ++ &rk3588_cpulclk_data, rk3588_cpulclk_rates, ++ ARRAY_SIZE(rk3588_cpulclk_rates)); ++ rockchip_clk_register_armclk(ctx, ARMCLK_B01, "armclk_b01", ++ 3, clks[PLL_B0PLL], clks[PLL_GPLL], ++ &rk3588_cpub0clk_data, rk3588_cpub0clk_rates, ++ ARRAY_SIZE(rk3588_cpub0clk_rates)); ++ rockchip_clk_register_armclk(ctx, ARMCLK_B23, "armclk_b23", ++ 3, clks[PLL_B1PLL], clks[PLL_GPLL], ++ &rk3588_cpub1clk_data, rk3588_cpub1clk_rates, ++ ARRAY_SIZE(rk3588_cpub1clk_rates)); ++ ++ rockchip_clk_register_branches(ctx, rk3588_clk_branches, ++ ARRAY_SIZE(rk3588_clk_branches)); ++ ++ rockchip_register_softrst(np, 49158, reg_base + RK3588_SOFTRST_CON(0), ++ ROCKCHIP_SOFTRST_HIWORD_MASK); ++ ++ rockchip_register_restart_notifier(ctx, RK3588_GLB_SRST_FST, NULL); ++ ++ rockchip_clk_of_add_provider(np, ctx); ++ ++#ifdef CONFIG_ROCKCHIP_CLK_PASS ++ rockchip_clk_protect_init(np); ++#endif ++ ++ if (!rk_dump_cru) ++ rk_dump_cru = rk3588_dump_cru; ++} ++ ++CLK_OF_DECLARE(rk3588_cru, "rockchip,rk3588-cru", rk3588_clk_init); ++ ++#ifdef MODULE ++struct clk_rk3588_inits { ++ void (*inits)(struct device_node *np); ++}; ++ ++static const struct clk_rk3588_inits clk_3588_cru_init = { ++ .inits = rk3588_clk_init, ++}; ++ ++static const struct of_device_id clk_rk3588_match_table[] = { ++ { ++ .compatible = "rockchip,rk3588-cru", ++ .data = &clk_3588_cru_init, ++ }, ++ { } ++}; ++MODULE_DEVICE_TABLE(of, clk_rk3588_match_table); ++ ++static int clk_rk3588_probe(struct platform_device *pdev) ++{ ++ struct device_node *np = pdev->dev.of_node; ++ const struct of_device_id *match; ++ const struct clk_rk3588_inits *init_data; ++ ++ match = of_match_device(clk_rk3588_match_table, &pdev->dev); ++ if (!match || !match->data) ++ return -EINVAL; ++ ++ init_data = match->data; ++ if (init_data->inits) ++ init_data->inits(np); ++ ++ return 0; ++} ++ ++static struct platform_driver clk_rk3588_driver = { ++ .probe = clk_rk3588_probe, ++ .driver = { ++ .name = "clk-rk3588", ++ .of_match_table = clk_rk3588_match_table, ++ .suppress_bind_attrs = true, ++ }, ++}; ++module_platform_driver(clk_rk3588_driver); ++ ++MODULE_DESCRIPTION("Rockchip RK3588 Clock Driver"); ++MODULE_LICENSE("GPL"); ++#endif /* MODULE */ +diff --git a/drivers/clk/rockchip/clk-rv1106.c b/drivers/clk/rockchip/clk-rv1106.c +new file mode 100644 +index 000000000..0833bf2ad +--- /dev/null ++++ b/drivers/clk/rockchip/clk-rv1106.c +@@ -0,0 +1,1280 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (c) 2022 Rockchip Electronics Co. Ltd. ++ * Author: Elaine Zhang ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "clk.h" ++ ++#define CRU_PVTPLL0_CON0_L 0x11000 ++#define CRU_PVTPLL0_CON0_H 0x11004 ++#define CRU_PVTPLL0_CON1_L 0x11008 ++#define CRU_PVTPLL0_CON1_H 0x1100c ++#define CRU_PVTPLL0_CON2_L 0x11010 ++#define CRU_PVTPLL0_CON2_H 0x11014 ++#define CRU_PVTPLL0_CON3_L 0x11018 ++#define CRU_PVTPLL0_CON3_H 0x1101c ++#define CRU_PVTPLL0_OSC_CNT 0x11020 ++#define CRU_PVTPLL0_OSC_CNT_AVG 0x11024 ++ ++#define CRU_PVTPLL1_CON0_L 0x11030 ++#define CRU_PVTPLL1_CON0_H 0x11034 ++#define CRU_PVTPLL1_CON1_L 0x11038 ++#define CRU_PVTPLL1_CON1_H 0x1103c ++#define CRU_PVTPLL1_CON2_L 0x11040 ++#define CRU_PVTPLL1_CON2_H 0x11044 ++#define CRU_PVTPLL1_CON3_L 0x11048 ++#define CRU_PVTPLL1_CON3_H 0x1104c ++#define CRU_PVTPLL1_OSC_CNT 0x11050 ++#define CRU_PVTPLL1_OSC_CNT_AVG 0x11054 ++ ++#define RV1106_GRF_SOC_STATUS0 0x10 ++#define CPU_PVTPLL_CON0_L 0x40000 ++#define CPU_PVTPLL_CON0_H 0x40004 ++#define CPU_PVTPLL_CON1 0x40008 ++#define CPU_PVTPLL_CON2 0x4000c ++#define CPU_PVTPLL_CON3 0x40010 ++#define CPU_PVTPLL_OSC_CNT 0x40018 ++#define CPU_PVTPLL_OSC_CNT_AVG 0x4001c ++ ++#define PVTPLL_RING_SEL_MASK 0x7 ++#define PVTPLL_RING_SEL_SHIFT 8 ++#define PVTPLL_EN_MASK 0x3 ++#define PVTPLL_EN_SHIFT 0 ++#define PVTPLL_LENGTH_SEL_MASK 0x7f ++#define PVTPLL_LENGTH_SEL_SHIFT 0 ++ ++#define CPU_CLK_PATH_BASE (0x18300) ++#define CPU_PVTPLL_PATH_CORE ((1 << 12) | (1 << 28)) ++ ++#define RV1106_FRAC_MAX_PRATE 1200000000 ++ ++enum rv1106_plls { ++ apll, dpll, cpll, gpll, ++}; ++ ++static struct rockchip_pll_rate_table rv1106_pll_rates[] = { ++ /* _mhz, _refdiv, _fbdiv, _postdiv1, _postdiv2, _dsmpd, _frac */ ++ RK3036_PLL_RATE(1608000000, 1, 67, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1600000000, 3, 200, 1, 1, 1, 0), ++ RK3036_PLL_RATE(1584000000, 1, 132, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1560000000, 1, 130, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1536000000, 1, 128, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1512000000, 1, 126, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1488000000, 1, 124, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1464000000, 1, 122, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1440000000, 1, 120, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1416000000, 1, 118, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1400000000, 3, 350, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1392000000, 1, 116, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1368000000, 1, 114, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1344000000, 1, 112, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1320000000, 1, 110, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1296000000, 1, 108, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1272000000, 1, 106, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1248000000, 1, 104, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1200000000, 1, 100, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1188000000, 1, 99, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1104000000, 1, 92, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1100000000, 3, 275, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1008000000, 1, 84, 2, 1, 1, 0), ++ RK3036_PLL_RATE(1000000000, 3, 250, 2, 1, 1, 0), ++ RK3036_PLL_RATE(993484800, 1, 124, 3, 1, 0, 3113851), ++ RK3036_PLL_RATE(984000000, 1, 82, 2, 1, 1, 0), ++ RK3036_PLL_RATE(983040000, 1, 81, 2, 1, 0, 15435038), ++ RK3036_PLL_RATE(960000000, 1, 80, 2, 1, 1, 0), ++ RK3036_PLL_RATE(936000000, 1, 78, 2, 1, 1, 0), ++ RK3036_PLL_RATE(912000000, 1, 76, 2, 1, 1, 0), ++ RK3036_PLL_RATE(900000000, 1, 75, 2, 1, 1, 0), ++ RK3036_PLL_RATE(888000000, 1, 74, 2, 1, 1, 0), ++ RK3036_PLL_RATE(864000000, 1, 72, 2, 1, 1, 0), ++ RK3036_PLL_RATE(840000000, 1, 70, 2, 1, 1, 0), ++ RK3036_PLL_RATE(816000000, 1, 68, 2, 1, 1, 0), ++ RK3036_PLL_RATE(800000000, 3, 200, 2, 1, 1, 0), ++ RK3036_PLL_RATE(700000000, 3, 350, 4, 1, 1, 0), ++ RK3036_PLL_RATE(696000000, 1, 116, 4, 1, 1, 0), ++ RK3036_PLL_RATE(624000000, 1, 104, 4, 1, 1, 0), ++ RK3036_PLL_RATE(600000000, 1, 100, 4, 1, 1, 0), ++ RK3036_PLL_RATE(594000000, 1, 99, 4, 1, 1, 0), ++ RK3036_PLL_RATE(504000000, 1, 84, 4, 1, 1, 0), ++ RK3036_PLL_RATE(500000000, 1, 125, 6, 1, 1, 0), ++ RK3036_PLL_RATE(496742400, 1, 124, 6, 1, 0, 3113851), ++ RK3036_PLL_RATE(491520000, 1, 40, 2, 1, 0, 16106127), ++ RK3036_PLL_RATE(408000000, 1, 68, 2, 2, 1, 0), ++ RK3036_PLL_RATE(312000000, 1, 78, 6, 1, 1, 0), ++ RK3036_PLL_RATE(216000000, 1, 72, 4, 2, 1, 0), ++ RK3036_PLL_RATE(96000000, 1, 96, 6, 4, 1, 0), ++ { /* sentinel */ }, ++}; ++ ++#define RV1106_DIV_ACLK_CORE_MASK 0x1f ++#define RV1106_DIV_ACLK_CORE_SHIFT 7 ++#define RV1106_DIV_PCLK_DBG_MASK 0x1f ++#define RV1106_DIV_PCLK_DBG_SHIFT 0 ++#define RV1106_CORE_SEL_MASK 0x3 ++#define RV1106_CORE_SEL_SHIFT 5 ++#define RV1106_ALT_DIV_MASK 0x1f ++#define RV1106_ALT_DIV_SHIFT 0 ++ ++#define RV1106_CLKSEL0(_aclk_core) \ ++{ \ ++ .reg = RV1106_CORECLKSEL_CON(0), \ ++ .val = HIWORD_UPDATE(_aclk_core, RV1106_DIV_ACLK_CORE_MASK, \ ++ RV1106_DIV_ACLK_CORE_SHIFT), \ ++} ++ ++#define RV1106_CLKSEL1(_pclk_dbg) \ ++{ \ ++ .reg = RV1106_CORECLKSEL_CON(1), \ ++ .val = HIWORD_UPDATE(_pclk_dbg, RV1106_DIV_PCLK_DBG_MASK, \ ++ RV1106_DIV_PCLK_DBG_SHIFT), \ ++} ++ ++#define RV1106_CLKSEL2(_is_pvtpll) \ ++{ \ ++ .reg = RV1106_CORECLKSEL_CON(0), \ ++ .val = HIWORD_UPDATE(_is_pvtpll, RV1106_CORE_SEL_MASK, \ ++ RV1106_CORE_SEL_SHIFT), \ ++} ++ ++#define RV1106_CLKSEL3(_alt_div) \ ++{ \ ++ .reg = RV1106_CORECLKSEL_CON(0), \ ++ .val = HIWORD_UPDATE(_alt_div, RV1106_ALT_DIV_MASK, \ ++ RV1106_ALT_DIV_SHIFT), \ ++} ++ ++#define RV1106_CPUCLK_RATE(_prate, _aclk_core, _pclk_dbg, _is_pvtpll) \ ++{ \ ++ .prate = _prate, \ ++ .divs = { \ ++ RV1106_CLKSEL0(_aclk_core), \ ++ RV1106_CLKSEL1(_pclk_dbg), \ ++ }, \ ++ .pre_muxs = { \ ++ RV1106_CLKSEL3(1), \ ++ RV1106_CLKSEL2(2), \ ++ }, \ ++ .post_muxs = { \ ++ RV1106_CLKSEL2(_is_pvtpll), \ ++ RV1106_CLKSEL3(0), \ ++ }, \ ++} ++ ++static struct rockchip_cpuclk_rate_table rv1106_cpuclk_rates[] __initdata = { ++ RV1106_CPUCLK_RATE(1608000000, 3, 7, 1), ++ RV1106_CPUCLK_RATE(1584000000, 3, 7, 1), ++ RV1106_CPUCLK_RATE(1560000000, 3, 7, 1), ++ RV1106_CPUCLK_RATE(1536000000, 3, 7, 1), ++ RV1106_CPUCLK_RATE(1512000000, 3, 7, 1), ++ RV1106_CPUCLK_RATE(1488000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1464000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1440000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1416000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1392000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1368000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1344000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1320000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1296000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1272000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1248000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1224000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1200000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1104000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1096000000, 2, 5, 1), ++ RV1106_CPUCLK_RATE(1008000000, 1, 5, 1), ++ RV1106_CPUCLK_RATE(912000000, 1, 5, 1), ++ RV1106_CPUCLK_RATE(816000000, 1, 3, 1), ++ RV1106_CPUCLK_RATE(696000000, 1, 3, 0), ++ RV1106_CPUCLK_RATE(600000000, 1, 3, 0), ++ RV1106_CPUCLK_RATE(408000000, 1, 1, 0), ++ RV1106_CPUCLK_RATE(312000000, 1, 1, 0), ++ RV1106_CPUCLK_RATE(216000000, 1, 1, 0), ++ RV1106_CPUCLK_RATE(96000000, 1, 1, 0), ++}; ++ ++static const struct rockchip_cpuclk_reg_data rv1106_cpuclk_data = { ++ .core_reg[0] = RV1106_CORECLKSEL_CON(0), ++ .div_core_shift[0] = 0, ++ .div_core_mask[0] = 0x1f, ++ .num_cores = 1, ++ .mux_core_alt = 2, ++ .mux_core_main = 2, ++ .mux_core_shift = 5, ++ .mux_core_mask = 0x3, ++}; ++ ++PNAME(mux_pll_p) = { "xin24m" }; ++PNAME(mux_24m_32k_p) = { "xin24m", "clk_rtc_32k" }; ++PNAME(mux_gpll_cpll_p) = { "gpll", "cpll" }; ++PNAME(mux_gpll_24m_p) = { "gpll", "xin24m" }; ++PNAME(mux_100m_50m_24m_p) = { "clk_100m_src", "clk_50m_src", "xin24m" }; ++PNAME(mux_150m_100m_50m_24m_p) = { "clk_150m_src", "clk_100m_src", "clk_50m_src", "xin24m" }; ++PNAME(mux_500m_300m_100m_24m_p) = { "clk_500m_src", "clk_300m_src", "clk_100m_src", "xin24m" }; ++PNAME(mux_400m_300m_pvtpll0_pvtpll1_p) = { "clk_400m_src", "clk_300m_src", "clk_pvtpll_0", "clk_pvtpll_1" }; ++PNAME(mux_500m_300m_pvtpll0_pvtpll1_p) = { "clk_500m_src", "clk_300m_src", "clk_pvtpll_0", "clk_pvtpll_1" }; ++PNAME(mux_339m_200m_pvtpll0_pvtpll1_p) = { "clk_339m_src", "clk_200m_src", "clk_pvtpll_0", "clk_pvtpll_1" }; ++PNAME(mux_400m_200m_100m_24m_p) = { "clk_400m_src", "clk_200m_src", "clk_100m_src", "xin24m" }; ++PNAME(mux_200m_100m_50m_24m_p) = { "clk_200m_src", "clk_100m_src", "clk_50m_src", "xin24m" }; ++PNAME(mux_300m_200m_100m_24m_p) = { "clk_300m_src", "clk_200m_src", "clk_100m_src", "xin24m" }; ++PNAME(mux_500m_300m_200m_24m_p) = { "clk_500m_src", "clk_300m_src", "clk_200m_src", "xin24m" }; ++PNAME(mux_50m_24m_p) = { "clk_50m_src", "xin24m" }; ++PNAME(mux_400m_24m_p) = { "clk_400m_src", "xin24m" }; ++PNAME(clk_rtc32k_pmu_p) = { "clk_rtc32k_frac", "xin32k", "clk_pvtm_32k" }; ++PNAME(mux_200m_100m_24m_32k_p) = { "clk_200m_src", "clk_100m_src", "xin24m", "clk_rtc_32k" }; ++PNAME(mux_100m_pmu_24m_p) = { "clk_100m_pmu", "xin24m" }; ++PNAME(mux_200m_100m_24m_p) = { "clk_200m_src", "clk_100m_pmu", "xin24m" }; ++PNAME(mux_339m_200m_100m_24m_p) = { "clk_339m_src", "clk_200m_src", "clk_100m_pmu", "xin24m" }; ++PNAME(mux_dpll_300m_p) = { "dpll", "clk_300m_src" }; ++PNAME(clk_i2s0_8ch_tx_p) = { "clk_i2s0_8ch_tx_src", "clk_i2s0_8ch_tx_frac", "i2s0_mclkin", "xin_osc0_half" }; ++PNAME(clk_i2s0_8ch_rx_p) = { "clk_i2s0_8ch_rx_src", "clk_i2s0_8ch_rx_frac", "i2s0_mclkin", "xin_osc0_half" }; ++PNAME(i2s0_8ch_mclkout_p) = { "mclk_i2s0_8ch_tx", "mclk_i2s0_8ch_rx", "xin_osc0_half" }; ++PNAME(clk_ref_mipi0_p) = { "clk_ref_mipi0_src", "clk_ref_mipi0_frac", "xin24m" }; ++PNAME(clk_ref_mipi1_p) = { "clk_ref_mipi1_src", "clk_ref_mipi1_frac", "xin24m" }; ++PNAME(clk_uart0_p) = { "clk_uart0_src", "clk_uart0_frac", "xin24m" }; ++PNAME(clk_uart1_p) = { "clk_uart1_src", "clk_uart1_frac", "xin24m" }; ++PNAME(clk_uart2_p) = { "clk_uart2_src", "clk_uart2_frac", "xin24m" }; ++PNAME(clk_uart3_p) = { "clk_uart3_src", "clk_uart3_frac", "xin24m" }; ++PNAME(clk_uart4_p) = { "clk_uart4_src", "clk_uart4_frac", "xin24m" }; ++PNAME(clk_uart5_p) = { "clk_uart5_src", "clk_uart5_frac", "xin24m" }; ++PNAME(clk_vicap_m0_p) = { "clk_vicap_m0_src", "clk_vicap_m0_frac", "xin24m" }; ++PNAME(clk_vicap_m1_p) = { "clk_vicap_m1_src", "clk_vicap_m1_frac", "xin24m" }; ++ ++static struct rockchip_pll_clock rv1106_pll_clks[] __initdata = { ++ [apll] = PLL(pll_rk3328, PLL_APLL, "apll", mux_pll_p, ++ CLK_IGNORE_UNUSED, RV1106_PLL_CON(0), ++ RV1106_MODE_CON, 0, 10, 0, rv1106_pll_rates), ++ [cpll] = PLL(pll_rk3328, PLL_CPLL, "cpll", mux_pll_p, ++ 0, RV1106_PLL_CON(8), ++ RV1106_MODE_CON, 2, 10, 0, rv1106_pll_rates), ++ [dpll] = PLL(pll_rk3328, PLL_DPLL, "dpll", mux_pll_p, ++ CLK_IGNORE_UNUSED, RV1106_PLL_CON(16), ++ RV1106_SUBDDRMODE_CON, 0, 10, 0, NULL), ++ [gpll] = PLL(pll_rk3328, PLL_GPLL, "gpll", mux_pll_p, ++ 0, RV1106_PLL_CON(24), ++ RV1106_MODE_CON, 4, 10, 0, rv1106_pll_rates), ++}; ++ ++#define MFLAGS CLK_MUX_HIWORD_MASK ++#define DFLAGS CLK_DIVIDER_HIWORD_MASK ++#define GFLAGS (CLK_GATE_HIWORD_MASK | CLK_GATE_SET_TO_DISABLE) ++ ++static struct rockchip_clk_branch rv1106_rtc32k_pmu_fracmux __initdata = ++ MUX(CLK_RTC_32K, "clk_rtc_32k", clk_rtc32k_pmu_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, ++ RV1106_PMUCLKSEL_CON(0), 6, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rv1106_i2s0_8ch_tx_fracmux __initdata = ++ MUX(CLK_I2S0_8CH_TX, "clk_i2s0_8ch_tx", clk_i2s0_8ch_tx_p, CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(19), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rv1106_i2s0_8ch_rx_fracmux __initdata = ++ MUX(CLK_I2S0_8CH_RX, "clk_i2s0_8ch_rx", clk_i2s0_8ch_rx_p, CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(21), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rv1106_clk_ref_mipi0_fracmux __initdata = ++ MUX(CLK_REF_MIPI0, "clk_ref_mipi0", clk_ref_mipi0_p, CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(27), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rv1106_clk_ref_mipi1_fracmux __initdata = ++ MUX(CLK_REF_MIPI1, "clk_ref_mipi1", clk_ref_mipi1_p, CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(29), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rv1106_clk_uart0_fracmux __initdata = ++ MUX(CLK_UART0, "clk_uart0", clk_uart0_p, CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(7), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rv1106_clk_uart1_fracmux __initdata = ++ MUX(CLK_UART1, "clk_uart1", clk_uart1_p, CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(9), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rv1106_clk_uart2_fracmux __initdata = ++ MUX(CLK_UART2, "clk_uart2", clk_uart2_p, CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(11), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rv1106_clk_uart3_fracmux __initdata = ++ MUX(CLK_UART3, "clk_uart3", clk_uart3_p, CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(13), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rv1106_clk_uart4_fracmux __initdata = ++ MUX(CLK_UART4, "clk_uart4", clk_uart4_p, CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(15), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rv1106_clk_uart5_fracmux __initdata = ++ MUX(CLK_UART5, "clk_uart5", clk_uart5_p, CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(17), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rv1106_clk_vicap_m0_fracmux __initdata = ++ MUX(CLK_VICAP_M0, "clk_vicap_m0", clk_vicap_m0_p, CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(31), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rv1106_clk_vicap_m1_fracmux __initdata = ++ MUX(CLK_VICAP_M1, "clk_vicap_m1", clk_vicap_m1_p, CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(33), 0, 2, MFLAGS); ++ ++static struct rockchip_clk_branch rv1106_clk_branches[] __initdata = { ++ ++ FACTOR(0, "xin_osc0_half", "xin24m", 0, 1, 2), ++ ++ /* PD_CORE */ ++ GATE(CLK_PVTM_CORE, "clk_pvtm_core", "xin24m", 0, ++ RV1106_CORECLKGATE_CON(0), 14, GFLAGS), ++ GATE(CLK_CORE_MCU_RTC, "clk_core_mcu_rtc", "xin24m", 0, ++ RV1106_CORECLKGATE_CON(1), 6, GFLAGS), ++ COMPOSITE(HCLK_CPU, "hclk_cpu", mux_gpll_24m_p, CLK_IS_CRITICAL, ++ RV1106_CORECLKSEL_CON(2), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RV1106_CORECLKGATE_CON(0), 12, GFLAGS), ++ COMPOSITE(CLK_CORE_MCU, "clk_core_mcu", mux_gpll_24m_p, 0, ++ RV1106_CORECLKSEL_CON(3), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RV1106_CORECLKGATE_CON(1), 1, GFLAGS), ++ COMPOSITE_NOMUX(0, "pclk_dbg", "armclk", CLK_IS_CRITICAL, ++ RV1106_CORECLKSEL_CON(1), 0, 5, DFLAGS | CLK_DIVIDER_READ_ONLY, ++ RV1106_CORECLKGATE_CON(0), 6, GFLAGS), ++ GATE(0, "pclk_cpu_root", "pclk_dbg", CLK_IS_CRITICAL, ++ RV1106_CORECLKGATE_CON(0), 10, GFLAGS), ++ GATE(PCLK_MAILBOX, "pclk_mailbox", "pclk_cpu_root", 0, ++ RV1106_CORECLKGATE_CON(1), 8, GFLAGS), ++ ++ /* PD _TOP */ ++ COMPOSITE(CLK_50M_SRC, "clk_50m_src", mux_gpll_cpll_p, CLK_IS_CRITICAL, ++ RV1106_CLKSEL_CON(0), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RV1106_CLKGATE_CON(0), 1, GFLAGS), ++ COMPOSITE(CLK_100M_SRC, "clk_100m_src", mux_gpll_cpll_p, CLK_IS_CRITICAL, ++ RV1106_CLKSEL_CON(0), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RV1106_CLKGATE_CON(0), 2, GFLAGS), ++ COMPOSITE(CLK_150M_SRC, "clk_150m_src", mux_gpll_cpll_p, CLK_IS_CRITICAL, ++ RV1106_CLKSEL_CON(1), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RV1106_CLKGATE_CON(0), 3, GFLAGS), ++ COMPOSITE(CLK_200M_SRC, "clk_200m_src", mux_gpll_cpll_p, CLK_IS_CRITICAL, ++ RV1106_CLKSEL_CON(1), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RV1106_CLKGATE_CON(0), 4, GFLAGS), ++ COMPOSITE(CLK_250M_SRC, "clk_250m_src", mux_gpll_cpll_p, CLK_IS_CRITICAL, ++ RV1106_CLKSEL_CON(2), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RV1106_CLKGATE_CON(0), 5, GFLAGS), ++ COMPOSITE(CLK_300M_SRC, "clk_300m_src", mux_gpll_cpll_p, CLK_IS_CRITICAL, ++ RV1106_CLKSEL_CON(2), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RV1106_CLKGATE_CON(0), 6, GFLAGS), ++ COMPOSITE_HALFDIV(CLK_339M_SRC, "clk_339m_src", mux_gpll_cpll_p, CLK_IS_CRITICAL, ++ RV1106_CLKSEL_CON(3), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RV1106_CLKGATE_CON(0), 7, GFLAGS), ++ COMPOSITE(CLK_400M_SRC, "clk_400m_src", mux_gpll_cpll_p, CLK_IS_CRITICAL, ++ RV1106_CLKSEL_CON(3), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RV1106_CLKGATE_CON(0), 8, GFLAGS), ++ COMPOSITE_HALFDIV(CLK_450M_SRC, "clk_450m_src", mux_gpll_cpll_p, CLK_IS_CRITICAL, ++ RV1106_CLKSEL_CON(4), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RV1106_CLKGATE_CON(0), 9, GFLAGS), ++ COMPOSITE(CLK_500M_SRC, "clk_500m_src", mux_gpll_cpll_p, CLK_IS_CRITICAL, ++ RV1106_CLKSEL_CON(4), 11, 1, MFLAGS, 6, 5, DFLAGS, ++ RV1106_CLKGATE_CON(0), 10, GFLAGS), ++ ++ COMPOSITE_NODIV(PCLK_TOP_ROOT, "pclk_top_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RV1106_CLKSEL_CON(24), 5, 2, MFLAGS, ++ RV1106_CLKGATE_CON(2), 9, GFLAGS), ++ ++ COMPOSITE(CLK_I2S0_8CH_TX_SRC, "clk_i2s0_8ch_tx_src", mux_gpll_cpll_p, 0, ++ RV1106_CLKSEL_CON(17), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RV1106_CLKGATE_CON(1), 13, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S0_8CH_TX_FRAC, "clk_i2s0_8ch_tx_frac", "clk_i2s0_8ch_tx_src", CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(18), 0, ++ RV1106_CLKGATE_CON(1), 14, GFLAGS, ++ &rv1106_i2s0_8ch_tx_fracmux), ++ GATE(MCLK_I2S0_8CH_TX, "mclk_i2s0_8ch_tx", "clk_i2s0_8ch_tx", 0, ++ RV1106_CLKGATE_CON(1), 15, GFLAGS), ++ COMPOSITE(CLK_I2S0_8CH_RX_SRC, "clk_i2s0_8ch_rx_src", mux_gpll_cpll_p, 0, ++ RV1106_CLKSEL_CON(19), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RV1106_CLKGATE_CON(2), 0, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_I2S0_8CH_RX_FRAC, "clk_i2s0_8ch_rx_frac", "clk_i2s0_8ch_rx_src", CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(20), 0, ++ RV1106_CLKGATE_CON(2), 1, GFLAGS, ++ &rv1106_i2s0_8ch_rx_fracmux), ++ GATE(MCLK_I2S0_8CH_RX, "mclk_i2s0_8ch_rx", "clk_i2s0_8ch_rx", 0, ++ RV1106_CLKGATE_CON(2), 2, GFLAGS), ++ MUX(I2S0_8CH_MCLKOUT, "i2s0_8ch_mclkout", i2s0_8ch_mclkout_p, CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(21), 2, 2, MFLAGS), ++ COMPOSITE(CLK_REF_MIPI0_SRC, "clk_ref_mipi0_src", mux_gpll_cpll_p, 0, ++ RV1106_CLKSEL_CON(25), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RV1106_CLKGATE_CON(3), 4, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_REF_MIPI0_FRAC, "clk_ref_mipi0_frac", "clk_ref_mipi0_src", CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(26), 0, ++ RV1106_CLKGATE_CON(3), 5, GFLAGS, ++ &rv1106_clk_ref_mipi0_fracmux), ++ GATE(MCLK_REF_MIPI0, "mclk_ref_mipi0", "clk_ref_mipi0", 0, ++ RV1106_CLKGATE_CON(3), 6, GFLAGS), ++ COMPOSITE(CLK_REF_MIPI1_SRC, "clk_ref_mipi1_src", mux_gpll_cpll_p, 0, ++ RV1106_CLKSEL_CON(27), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RV1106_CLKGATE_CON(3), 7, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_REF_MIPI1_FRAC, "clk_ref_mipi1_frac", "clk_ref_mipi1_src", CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(28), 0, ++ RV1106_CLKGATE_CON(3), 8, GFLAGS, ++ &rv1106_clk_ref_mipi1_fracmux), ++ GATE(MCLK_REF_MIPI1, "mclk_ref_mipi1", "clk_ref_mipi1", 0, ++ RV1106_CLKGATE_CON(3), 9, GFLAGS), ++ COMPOSITE(CLK_UART0_SRC, "clk_uart0_src", mux_gpll_cpll_p, 0, ++ RV1106_CLKSEL_CON(5), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RV1106_CLKGATE_CON(0), 11, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART0_FRAC, "clk_uart0_frac", "clk_uart0_src", CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(6), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RV1106_CLKGATE_CON(0), 12, GFLAGS, ++ &rv1106_clk_uart0_fracmux), ++ GATE(SCLK_UART0, "sclk_uart0", "clk_uart0", 0, ++ RV1106_CLKGATE_CON(0), 13, GFLAGS), ++ COMPOSITE(CLK_UART1_SRC, "clk_uart1_src", mux_gpll_cpll_p, 0, ++ RV1106_CLKSEL_CON(7), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RV1106_CLKGATE_CON(0), 14, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART1_FRAC, "clk_uart1_frac", "clk_uart1_src", CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(8), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RV1106_CLKGATE_CON(0), 15, GFLAGS, ++ &rv1106_clk_uart1_fracmux), ++ GATE(SCLK_UART1, "sclk_uart1", "clk_uart1", 0, ++ RV1106_CLKGATE_CON(1), 0, GFLAGS), ++ COMPOSITE(CLK_UART2_SRC, "clk_uart2_src", mux_gpll_cpll_p, 0, ++ RV1106_CLKSEL_CON(9), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RV1106_CLKGATE_CON(1), 1, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART2_FRAC, "clk_uart2_frac", "clk_uart2_src", CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(10), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RV1106_CLKGATE_CON(1), 2, GFLAGS, ++ &rv1106_clk_uart2_fracmux), ++ GATE(SCLK_UART2, "sclk_uart2", "clk_uart2", 0, ++ RV1106_CLKGATE_CON(1), 3, GFLAGS), ++ COMPOSITE(CLK_UART3_SRC, "clk_uart3_src", mux_gpll_cpll_p, 0, ++ RV1106_CLKSEL_CON(11), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RV1106_CLKGATE_CON(1), 4, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART3_FRAC, "clk_uart3_frac", "clk_uart3_src", CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(12), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RV1106_CLKGATE_CON(1), 5, GFLAGS, ++ &rv1106_clk_uart3_fracmux), ++ GATE(SCLK_UART3, "sclk_uart3", "clk_uart3", 0, ++ RV1106_CLKGATE_CON(1), 6, GFLAGS), ++ COMPOSITE(CLK_UART4_SRC, "clk_uart4_src", mux_gpll_cpll_p, 0, ++ RV1106_CLKSEL_CON(13), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RV1106_CLKGATE_CON(1), 7, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART4_FRAC, "clk_uart4_frac", "clk_uart4_src", CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(14), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RV1106_CLKGATE_CON(1), 8, GFLAGS, ++ &rv1106_clk_uart4_fracmux), ++ GATE(SCLK_UART4, "sclk_uart4", "clk_uart4", 0, ++ RV1106_CLKGATE_CON(1), 9, GFLAGS), ++ COMPOSITE(CLK_UART5_SRC, "clk_uart5_src", mux_gpll_cpll_p, 0, ++ RV1106_CLKSEL_CON(15), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RV1106_CLKGATE_CON(1), 10, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_UART5_FRAC, "clk_uart5_frac", "clk_uart5_src", CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(16), CLK_FRAC_DIVIDER_NO_LIMIT, ++ RV1106_CLKGATE_CON(1), 11, GFLAGS, ++ &rv1106_clk_uart5_fracmux), ++ GATE(SCLK_UART5, "sclk_uart5", "clk_uart5", 0, ++ RV1106_CLKGATE_CON(1), 12, GFLAGS), ++ COMPOSITE(CLK_VICAP_M0_SRC, "clk_vicap_m0_src", mux_gpll_cpll_p, 0, ++ RV1106_CLKSEL_CON(29), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RV1106_CLKGATE_CON(3), 10, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_VICAP_M0_FRAC, "clk_vicap_m0_frac", "clk_vicap_m0_src", CLK_SET_RATE_PARENT, ++ RV1106_CLKSEL_CON(30), 0, ++ RV1106_CLKGATE_CON(3), 11, GFLAGS, ++ &rv1106_clk_vicap_m0_fracmux), ++ GATE(SCLK_VICAP_M0, "sclk_vicap_m0", "clk_vicap_m0", 0, ++ RV1106_CLKGATE_CON(3), 12, GFLAGS), ++ COMPOSITE(CLK_VICAP_M1_SRC, "clk_vicap_m1_src", mux_gpll_cpll_p, 0, ++ RV1106_CLKSEL_CON(31), 7, 1, MFLAGS, 2, 5, DFLAGS, ++ RV1106_CLKGATE_CON(3), 13, GFLAGS), ++ COMPOSITE_FRACMUX(CLK_VICAP_M1_FRAC, "clk_vicap_m1_frac", "clk_vicap_m1_src", 0, ++ RV1106_CLKSEL_CON(32), 0, ++ RV1106_CLKGATE_CON(3), 14, GFLAGS, ++ &rv1106_clk_vicap_m1_fracmux), ++ GATE(SCLK_VICAP_M1, "sclk_vicap_m1", "clk_vicap_m1", 0, ++ RV1106_CLKGATE_CON(3), 15, GFLAGS), ++ COMPOSITE(DCLK_VOP_SRC, "dclk_vop_src", mux_gpll_cpll_p, 0, ++ RV1106_CLKSEL_CON(23), 8, 1, MFLAGS, 3, 5, DFLAGS, ++ RV1106_CLKGATE_CON(2), 6, GFLAGS), ++ ++ /* PD_DDR */ ++ COMPOSITE_NODIV(PCLK_DDR_ROOT, "pclk_ddr_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RV1106_DDRCLKSEL_CON(0), 0, 2, MFLAGS, ++ RV1106_DDRCLKGATE_CON(0), 0, GFLAGS), ++ COMPOSITE_NODIV(ACLK_DDR_ROOT, "aclk_ddr_root", mux_500m_300m_100m_24m_p, CLK_IS_CRITICAL, ++ RV1106_DDRCLKSEL_CON(0), 8, 2, MFLAGS, ++ RV1106_DDRCLKGATE_CON(0), 12, GFLAGS), ++ GATE(PCLK_DDRPHY, "pclk_ddrphy", "pclk_ddr_root", CLK_IGNORE_UNUSED, ++ RV1106_DDRCLKGATE_CON(1), 3, GFLAGS), ++ GATE(PCLK_DDR_HWLP, "pclk_ddr_hwlp", "pclk_ddr_root", CLK_IGNORE_UNUSED, ++ RV1106_DDRCLKGATE_CON(1), 2, GFLAGS), ++ GATE(PCLK_DDRMON, "pclk_ddrmon", "pclk_ddr_root", 0, ++ RV1106_DDRCLKGATE_CON(0), 7, GFLAGS), ++ GATE(CLK_TIMER_DDRMON, "clk_timer_ddrmon", "xin24m", 0, ++ RV1106_DDRCLKGATE_CON(0), 8, GFLAGS), ++ GATE(PCLK_DDRC, "pclk_ddrc", "pclk_ddr_root", CLK_IGNORE_UNUSED, ++ RV1106_DDRCLKGATE_CON(0), 5, GFLAGS), ++ GATE(PCLK_DFICTRL, "pclk_dfictrl", "pclk_ddr_root", CLK_IS_CRITICAL, ++ RV1106_DDRCLKGATE_CON(0), 11, GFLAGS), ++ GATE(ACLK_SYS_SHRM, "aclk_sys_shrm", "aclk_ddr_root", CLK_IS_CRITICAL, ++ RV1106_DDRCLKGATE_CON(0), 13, GFLAGS), ++ ++ /* PD_NPU */ ++ COMPOSITE_NODIV(HCLK_NPU_ROOT, "hclk_npu_root", mux_150m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RV1106_NPUCLKSEL_CON(0), 0, 2, MFLAGS, ++ RV1106_NPUCLKGATE_CON(0), 0, GFLAGS), ++ COMPOSITE_NODIV(ACLK_NPU_ROOT, "aclk_npu_root", mux_500m_300m_pvtpll0_pvtpll1_p, CLK_IS_CRITICAL, ++ RV1106_NPUCLKSEL_CON(0), 2, 2, MFLAGS, ++ RV1106_NPUCLKGATE_CON(0), 1, GFLAGS), ++ COMPOSITE_NODIV(PCLK_NPU_ROOT, "pclk_npu_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RV1106_NPUCLKSEL_CON(0), 4, 2, MFLAGS, ++ RV1106_NPUCLKGATE_CON(0), 2, GFLAGS), ++ GATE(HCLK_RKNN, "hclk_rknn", "hclk_npu_root", 0, ++ RV1106_NPUCLKGATE_CON(0), 9, GFLAGS), ++ GATE(ACLK_RKNN, "aclk_rknn", "aclk_npu_root", 0, ++ RV1106_NPUCLKGATE_CON(0), 10, GFLAGS), ++ ++ /* PD_PERI */ ++ COMPOSITE_NODIV(PCLK_PERI_ROOT, "pclk_peri_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RV1106_PERICLKSEL_CON(1), 0, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(0), 0, GFLAGS), ++ COMPOSITE_NODIV(ACLK_PERI_ROOT, "aclk_peri_root", mux_400m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RV1106_PERICLKSEL_CON(1), 2, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(0), 1, GFLAGS), ++ COMPOSITE_NODIV(HCLK_PERI_ROOT, "hclk_peri_root", mux_200m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RV1106_PERICLKSEL_CON(1), 4, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(0), 2, GFLAGS), ++ COMPOSITE_NODIV(ACLK_BUS_ROOT, "aclk_bus_root", mux_300m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RV1106_PERICLKSEL_CON(9), 0, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(6), 8, GFLAGS), ++ GATE(PCLK_ACODEC, "pclk_acodec", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(6), 3, GFLAGS), ++ COMPOSITE_NOMUX(MCLK_ACODEC_TX, "mclk_acodec_tx", "mclk_i2s0_8ch_tx", 0, ++ RV1106_PERICLKSEL_CON(8), 0, 8, DFLAGS, ++ RV1106_PERICLKGATE_CON(6), 4, GFLAGS), ++ COMPOSITE_NODIV(CLK_CORE_CRYPTO, "clk_core_crypto", mux_300m_200m_100m_24m_p, 0, ++ RV1106_PERICLKSEL_CON(6), 5, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(3), 11, GFLAGS), ++ COMPOSITE_NODIV(CLK_PKA_CRYPTO, "clk_pka_crypto", mux_300m_200m_100m_24m_p, 0, ++ RV1106_PERICLKSEL_CON(6), 7, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(3), 12, GFLAGS), ++ GATE(ACLK_CRYPTO, "aclk_crypto", "aclk_bus_root", 0, ++ RV1106_PERICLKGATE_CON(3), 13, GFLAGS), ++ GATE(HCLK_CRYPTO, "hclk_crypto", "hclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(3), 14, GFLAGS), ++ GATE(ACLK_DECOM, "aclk_decom", "aclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(5), 9, GFLAGS), ++ GATE(PCLK_DECOM, "pclk_decom", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(5), 10, GFLAGS), ++ COMPOSITE_NODIV(DCLK_DECOM, "dclk_decom", mux_400m_200m_100m_24m_p, 0, ++ RV1106_PERICLKSEL_CON(7), 14, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(5), 11, GFLAGS), ++ GATE(ACLK_DMAC, "aclk_dmac", "aclk_bus_root", 0, ++ RV1106_PERICLKGATE_CON(5), 8, GFLAGS), ++ GATE(PCLK_DSM, "pclk_dsm", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(6), 2, GFLAGS), ++ GATE(MCLK_DSM, "mclk_dsm", "mclk_i2s0_8ch_tx", 0, ++ RV1106_PERICLKGATE_CON(6), 1, GFLAGS), ++ COMPOSITE(CCLK_SRC_EMMC, "cclk_src_emmc", mux_400m_24m_p, 0, ++ RV1106_PERICLKSEL_CON(7), 6, 1, MFLAGS, 0, 6, DFLAGS, ++ RV1106_PERICLKGATE_CON(4), 12, GFLAGS), ++ GATE(HCLK_EMMC, "hclk_emmc", "hclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(4), 13, GFLAGS), ++ GATE(PCLK_GPIO4, "pclk_gpio4", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(2), 0, GFLAGS), ++ GATE(DBCLK_GPIO4, "dbclk_gpio4", "xin24m", 0, ++ RV1106_PERICLKGATE_CON(2), 1, GFLAGS), ++ GATE(PCLK_I2C0, "pclk_i2c0", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(1), 6, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C0, "clk_i2c0", mux_200m_100m_50m_24m_p, 0, ++ RV1106_PERICLKSEL_CON(1), 8, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(1), 7, GFLAGS), ++ GATE(PCLK_I2C2, "pclk_i2c2", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(1), 10, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C2, "clk_i2c2", mux_200m_100m_50m_24m_p, 0, ++ RV1106_PERICLKSEL_CON(1), 12, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(1), 11, GFLAGS), ++ GATE(PCLK_I2C3, "pclk_i2c3", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(1), 12, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C3, "clk_i2c3", mux_200m_100m_50m_24m_p, 0, ++ RV1106_PERICLKSEL_CON(1), 14, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(1), 13, GFLAGS), ++ GATE(PCLK_I2C4, "pclk_i2c4", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(1), 14, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C4, "clk_i2c4", mux_200m_100m_50m_24m_p, 0, ++ RV1106_PERICLKSEL_CON(2), 0, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(1), 15, GFLAGS), ++ GATE(HCLK_I2S0, "hclk_i2s0", "hclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(6), 0, GFLAGS), ++ GATE(PCLK_DFT2APB, "pclk_dft2apb", "pclk_peri_root", CLK_IGNORE_UNUSED, ++ RV1106_PERICLKGATE_CON(6), 7, GFLAGS), ++ GATE(HCLK_IVE, "hclk_ive", "hclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(6), 9, GFLAGS), ++ GATE(ACLK_IVE, "aclk_ive", "aclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(6), 10, GFLAGS), ++ GATE(PCLK_PWM0_PERI, "pclk_pwm0_peri", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(7), 3, GFLAGS), ++ COMPOSITE_NODIV(CLK_PWM0_PERI, "clk_pwm0_peri", mux_100m_50m_24m_p, 0, ++ RV1106_PERICLKSEL_CON(11), 0, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(7), 4, GFLAGS), ++ GATE(CLK_CAPTURE_PWM0_PERI, "clk_capture_pwm0_peri", "xin24m", 0, ++ RV1106_PERICLKGATE_CON(7), 5, GFLAGS), ++ GATE(CLK_TIMER_ROOT, "clk_timer_root", "xin24m", 0, ++ RV1106_PERICLKGATE_CON(0), 3, GFLAGS), ++ GATE(HCLK_SFC, "hclk_sfc", "hclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(4), 14, GFLAGS), ++ COMPOSITE(SCLK_SFC, "sclk_sfc", mux_500m_300m_200m_24m_p, 0, ++ RV1106_PERICLKSEL_CON(7), 12, 2, MFLAGS, 7, 5, DFLAGS, ++ RV1106_PERICLKGATE_CON(5), 0, GFLAGS), ++ GATE(PCLK_UART0, "pclk_uart0", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(6), 11, GFLAGS), ++ GATE(PCLK_UART1, "pclk_uart1", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(6), 15, GFLAGS), ++ GATE(PCLK_PWM1_PERI, "pclk_pwm1_peri", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(3), 15, GFLAGS), ++ COMPOSITE_NODIV(CLK_PWM1_PERI, "clk_pwm1_peri", mux_100m_50m_24m_p, 0, ++ RV1106_PERICLKSEL_CON(6), 9, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(4), 0, GFLAGS), ++ GATE(CLK_CAPTURE_PWM1_PERI, "clk_capture_pwm1_peri", "xin24m", 0, ++ RV1106_PERICLKGATE_CON(4), 1, GFLAGS), ++ GATE(PCLK_PWM2_PERI, "pclk_pwm2_peri", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(4), 2, GFLAGS), ++ COMPOSITE_NODIV(CLK_PWM2_PERI, "clk_pwm2_peri", mux_100m_50m_24m_p, 0, ++ RV1106_PERICLKSEL_CON(6), 11, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(4), 3, GFLAGS), ++ GATE(CLK_CAPTURE_PWM2_PERI, "clk_capture_pwm2_peri", "xin24m", 0, ++ RV1106_PERICLKGATE_CON(4), 4, GFLAGS), ++ GATE(HCLK_BOOTROM, "hclk_bootrom", "hclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(0), 7, GFLAGS), ++ GATE(HCLK_SAI, "hclk_sai", "hclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(5), 13, GFLAGS), ++ GATE(MCLK_SAI, "mclk_sai", "mclk_i2s0_8ch_tx", 0, ++ RV1106_PERICLKGATE_CON(5), 14, GFLAGS), ++ GATE(PCLK_SARADC, "pclk_saradc", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(3), 3, GFLAGS), ++ COMPOSITE_NOMUX(CLK_SARADC, "clk_saradc", "xin24m", 0, ++ RV1106_PERICLKSEL_CON(6), 0, 3, DFLAGS, ++ RV1106_PERICLKGATE_CON(3), 4, GFLAGS), ++ GATE(PCLK_SPI1, "pclk_spi1", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(3), 6, GFLAGS), ++ COMPOSITE_NODIV(CLK_SPI1, "clk_spi1", mux_200m_100m_50m_24m_p, 0, ++ RV1106_PERICLKSEL_CON(6), 3, 2, MFLAGS, ++ RV1106_PERICLKGATE_CON(3), 7, GFLAGS), ++ GATE(PCLK_STIMER, "pclk_stimer", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(0), 15, GFLAGS), ++ GATE(CLK_STIMER0, "clk_stimer0", "clk_timer_root", 0, ++ RV1106_PERICLKGATE_CON(1), 0, GFLAGS), ++ GATE(CLK_STIMER1, "clk_stimer1", "clk_timer_root", 0, ++ RV1106_PERICLKGATE_CON(1), 1, GFLAGS), ++ GATE(PCLK_TIMER, "pclk_timer", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(0), 8, GFLAGS), ++ GATE(CLK_TIMER0, "clk_timer0", "clk_timer_root", 0, ++ RV1106_PERICLKGATE_CON(0), 9, GFLAGS), ++ GATE(CLK_TIMER1, "clk_timer1", "clk_timer_root", 0, ++ RV1106_PERICLKGATE_CON(0), 10, GFLAGS), ++ GATE(CLK_TIMER2, "clk_timer2", "clk_timer_root", 0, ++ RV1106_PERICLKGATE_CON(0), 11, GFLAGS), ++ GATE(CLK_TIMER3, "clk_timer3", "clk_timer_root", 0, ++ RV1106_PERICLKGATE_CON(0), 12, GFLAGS), ++ GATE(CLK_TIMER4, "clk_timer4", "clk_timer_root", 0, ++ RV1106_PERICLKGATE_CON(0), 13, GFLAGS), ++ GATE(CLK_TIMER5, "clk_timer5", "clk_timer_root", 0, ++ RV1106_PERICLKGATE_CON(0), 14, GFLAGS), ++ GATE(HCLK_TRNG_NS, "hclk_trng_ns", "hclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(3), 9, GFLAGS), ++ GATE(HCLK_TRNG_S, "hclk_trng_s", "hclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(3), 10, GFLAGS), ++ GATE(PCLK_UART2, "pclk_uart2", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(2), 3, GFLAGS), ++ GATE(PCLK_UART3, "pclk_uart3", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(2), 7, GFLAGS), ++ GATE(PCLK_UART4, "pclk_uart4", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(2), 11, GFLAGS), ++ GATE(PCLK_UART5, "pclk_uart5", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(2), 15, GFLAGS), ++ GATE(ACLK_USBOTG, "aclk_usbotg", "aclk_bus_root", 0, ++ RV1106_PERICLKGATE_CON(4), 7, GFLAGS), ++ GATE(CLK_REF_USBOTG, "clk_ref_usbotg", "xin24m", 0, ++ RV1106_PERICLKGATE_CON(4), 8, GFLAGS), ++ GATE(PCLK_USBPHY, "pclk_usbphy", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(5), 1, GFLAGS), ++ GATE(CLK_REF_USBPHY, "clk_ref_usbphy", "xin24m", 0, ++ RV1106_PERICLKGATE_CON(5), 2, GFLAGS), ++ GATE(PCLK_WDT_NS, "pclk_wdt_ns", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(1), 2, GFLAGS), ++ GATE(TCLK_WDT_NS, "tclk_wdt_ns", "xin24m", 0, ++ RV1106_PERICLKGATE_CON(1), 3, GFLAGS), ++ GATE(PCLK_WDT_S, "pclk_wdt_s", "pclk_peri_root", 0, ++ RV1106_PERICLKGATE_CON(1), 4, GFLAGS), ++ GATE(TCLK_WDT_S, "tclk_wdt_s", "xin24m", 0, ++ RV1106_PERICLKGATE_CON(1), 5, GFLAGS), ++ ++ /* PD_PMU */ ++ COMPOSITE_FRACMUX(0, "clk_rtc32k_frac", "xin24m", CLK_IGNORE_UNUSED, ++ RV1106_PMUCLKSEL_CON(6), 0, ++ RV1106_PMUCLKGATE_CON(1), 14, GFLAGS, ++ &rv1106_rtc32k_pmu_fracmux), ++ DIV(CLK_100M_PMU, "clk_100m_pmu", "clk_200m_src", 0, ++ RV1106_PMUCLKSEL_CON(0), 0, 3, DFLAGS), ++ COMPOSITE_NODIV(PCLK_PMU_ROOT, "pclk_pmu_root", mux_100m_pmu_24m_p, CLK_IS_CRITICAL, ++ RV1106_PMUCLKSEL_CON(0), 3, 1, MFLAGS, ++ RV1106_PMUCLKGATE_CON(0), 1, GFLAGS), ++ COMPOSITE_NODIV(HCLK_PMU_ROOT, "hclk_pmu_root", mux_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RV1106_PMUCLKSEL_CON(0), 4, 2, MFLAGS, ++ RV1106_PMUCLKGATE_CON(0), 2, GFLAGS), ++ GATE(CLK_PMU, "clk_pmu", "xin24m", CLK_IS_CRITICAL, ++ RV1106_PMUCLKGATE_CON(1), 0, GFLAGS), ++ GATE(PCLK_PMU, "pclk_pmu", "pclk_pmu_root", CLK_IS_CRITICAL, ++ RV1106_PMUCLKGATE_CON(1), 1, GFLAGS), ++ GATE(CLK_DDR_FAIL_SAFE, "clk_ddr_fail_safe", "clk_pmu", 0, ++ RV1106_PMUCLKGATE_CON(1), 15, GFLAGS), ++ GATE(PCLK_PMU_GPIO0, "pclk_pmu_gpio0", "pclk_pmu_root", 0, ++ RV1106_PMUCLKGATE_CON(1), 2, GFLAGS), ++ COMPOSITE_NODIV(DBCLK_PMU_GPIO0, "dbclk_pmu_gpio0", mux_24m_32k_p, 0, ++ RV1106_PMUCLKSEL_CON(0), 15, 1, MFLAGS, ++ RV1106_PMUCLKGATE_CON(1), 3, GFLAGS), ++ GATE(PCLK_I2C1, "pclk_i2c1", "pclk_pmu_root", 0, ++ RV1106_PMUCLKGATE_CON(0), 3, GFLAGS), ++ COMPOSITE_NODIV(CLK_I2C1, "clk_i2c1", mux_200m_100m_24m_32k_p, 0, ++ RV1106_PMUCLKSEL_CON(0), 6, 2, MFLAGS, ++ RV1106_PMUCLKGATE_CON(0), 4, GFLAGS), ++ GATE(PCLK_PMU_MAILBOX, "pclk_pmu_mailbox", "pclk_pmu_root", 0, ++ RV1106_PMUCLKGATE_CON(2), 10, GFLAGS), ++ GATE(CLK_PMU_MCU, "clk_pmu_mcu", "hclk_pmu_root", 0, ++ RV1106_PMUCLKGATE_CON(0), 9, GFLAGS), ++ GATE(CLK_PMU_MCU_RTC, "clk_pmu_mcu_rtc", "xin24m", 0, ++ RV1106_PMUCLKGATE_CON(0), 13, GFLAGS), ++ COMPOSITE_NOMUX(CLK_PVTM_PMU, "clk_pvtm_pmu", "xin24m", 0, ++ RV1106_PMUCLKSEL_CON(1), 0, 5, DFLAGS, ++ RV1106_PMUCLKGATE_CON(1), 4, GFLAGS), ++ GATE(PCLK_PVTM_PMU, "pclk_pvtm_pmu", "pclk_pmu_root", 0, ++ RV1106_PMUCLKGATE_CON(1), 5, GFLAGS), ++ GATE(CLK_REFOUT, "clk_refout", "xin24m", 0, ++ RV1106_PMUCLKGATE_CON(2), 13, GFLAGS), ++ GATE(HCLK_PMU_SRAM, "hclk_pmu_sram", "hclk_pmu_root", CLK_IGNORE_UNUSED, ++ RV1106_PMUCLKGATE_CON(0), 8, GFLAGS), ++ GATE(PCLK_PMU_WDT, "pclk_pmu_wdt", "pclk_pmu_root", 0, ++ RV1106_PMUCLKGATE_CON(2), 8, GFLAGS), ++ COMPOSITE_NODIV(TCLK_PMU_WDT, "tclk_pmu_wdt", mux_24m_32k_p, 0, ++ RV1106_PMUCLKSEL_CON(7), 2, 1, MFLAGS, ++ RV1106_PMUCLKGATE_CON(2), 9, GFLAGS), ++ ++ /* PD_SUBDDR */ ++ COMPOSITE(CLK_CORE_DDRC_SRC, "clk_core_ddrc_src", mux_dpll_300m_p, CLK_IGNORE_UNUSED, ++ RV1106_SUBDDRCLKSEL_CON(0), 5, 1, MFLAGS, 0, 5, DFLAGS, ++ RV1106_SUBDDRCLKGATE_CON(0), 2, GFLAGS), ++ GATE(CLK_DFICTRL, "clk_dfictrl", "clk_core_ddrc_src", CLK_IGNORE_UNUSED, ++ RV1106_SUBDDRCLKGATE_CON(0), 5, GFLAGS), ++ GATE(CLK_DDRMON, "clk_ddrmon", "clk_core_ddrc_src", CLK_IGNORE_UNUSED, ++ RV1106_SUBDDRCLKGATE_CON(0), 4, GFLAGS), ++ GATE(CLK_DDR_PHY, "clk_ddr_phy", "clk_core_ddrc_src", CLK_IGNORE_UNUSED, ++ RV1106_SUBDDRCLKGATE_CON(0), 6, GFLAGS), ++ GATE(ACLK_DDRC, "aclk_ddrc", "clk_core_ddrc_src", CLK_IS_CRITICAL, ++ RV1106_SUBDDRCLKGATE_CON(0), 1, GFLAGS), ++ GATE(CLK_CORE_DDRC, "clk_core_ddrc", "clk_core_ddrc_src", CLK_IS_CRITICAL, ++ RV1106_SUBDDRCLKGATE_CON(0), 3, GFLAGS), ++ ++ ++ /* PD_VEPU */ ++ COMPOSITE_NODIV(HCLK_VEPU_ROOT, "hclk_vepu_root", mux_200m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RV1106_VEPUCLKSEL_CON(0), 0, 2, MFLAGS, ++ RV1106_VEPUCLKGATE_CON(0), 0, GFLAGS), ++ COMPOSITE_NODIV(ACLK_VEPU_COM_ROOT, "aclk_vepu_com_root", mux_400m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RV1106_VEPUCLKSEL_CON(0), 2, 2, MFLAGS, ++ RV1106_VEPUCLKGATE_CON(0), 1, GFLAGS), ++ COMPOSITE_NODIV(ACLK_VEPU_ROOT, "aclk_vepu_root", mux_300m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RV1106_VEPUCLKSEL_CON(0), 4, 2, MFLAGS, ++ RV1106_VEPUCLKGATE_CON(0), 2, GFLAGS), ++ COMPOSITE_NODIV(PCLK_VEPU_ROOT, "pclk_vepu_root", mux_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RV1106_VEPUCLKSEL_CON(0), 6, 2, MFLAGS, ++ RV1106_VEPUCLKGATE_CON(0), 3, GFLAGS), ++ GATE(PCLK_SPI0, "pclk_spi0", "pclk_vepu_root", 0, ++ RV1106_VEPUCLKGATE_CON(1), 2, GFLAGS), ++ COMPOSITE_NODIV(CLK_SPI0, "clk_spi0", mux_200m_100m_50m_24m_p, 0, ++ RV1106_VEPUCLKSEL_CON(0), 12, 2, MFLAGS, ++ RV1106_VEPUCLKGATE_CON(1), 3, GFLAGS), ++ GATE(CLK_UART_DETN_FLT, "clk_uart_detn_flt", "xin24m", 0, ++ RV1106_VEPUCLKGATE_CON(1), 8, GFLAGS), ++ GATE(HCLK_VEPU, "hclk_vepu", "hclk_vepu_root", 0, ++ RV1106_VEPUCLKGATE_CON(0), 8, GFLAGS), ++ GATE(ACLK_VEPU, "aclk_vepu", "aclk_vepu_root", 0, ++ RV1106_VEPUCLKGATE_CON(0), 9, GFLAGS), ++ COMPOSITE_NODIV(CLK_CORE_VEPU, "clk_core_vepu", mux_400m_300m_pvtpll0_pvtpll1_p, 0, ++ RV1106_VEPUCLKSEL_CON(0), 8, 2, MFLAGS, ++ RV1106_VEPUCLKGATE_CON(0), 10, GFLAGS), ++ COMPOSITE_NODIV(CLK_CORE_VEPU_DVBM, "clk_core_vepu_dvbm", mux_200m_100m_50m_24m_p, 0, ++ RV1106_VEPUCLKSEL_CON(0), 10, 2, MFLAGS, ++ RV1106_VEPUCLKGATE_CON(0), 13, GFLAGS), ++ GATE(PCLK_GPIO1, "pclk_gpio1", "pclk_vepu_root", 0, ++ RV1106_VEPUCLKGATE_CON(0), 15, GFLAGS), ++ GATE(DBCLK_GPIO1, "dbclk_gpio1", "xin24m", 0, ++ RV1106_VEPUCLKGATE_CON(1), 0, GFLAGS), ++ GATE(HCLK_VEPU_PP, "hclk_vepu_pp", "hclk_vepu_root", 0, ++ RV1106_VEPUCLKGATE_CON(0), 11, GFLAGS), ++ GATE(ACLK_VEPU_PP, "aclk_vepu_pp", "aclk_vepu_root", 0, ++ RV1106_VEPUCLKGATE_CON(0), 12, GFLAGS), ++ ++ /* PD_VI */ ++ COMPOSITE_NODIV(HCLK_VI_ROOT, "hclk_vi_root", mux_150m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RV1106_VICLKSEL_CON(0), 0, 2, MFLAGS, ++ RV1106_VICLKGATE_CON(0), 0, GFLAGS), ++ COMPOSITE_NODIV(ACLK_VI_ROOT, "aclk_vi_root", mux_339m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RV1106_VICLKSEL_CON(0), 2, 2, MFLAGS, ++ RV1106_VICLKGATE_CON(0), 1, GFLAGS), ++ COMPOSITE_NODIV(PCLK_VI_ROOT, "pclk_vi_root", mux_150m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RV1106_VICLKSEL_CON(0), 4, 2, MFLAGS, ++ RV1106_VICLKGATE_CON(0), 2, GFLAGS), ++ COMPOSITE_NODIV(PCLK_VI_RTC_ROOT, "pclk_vi_rtc_root", mux_50m_24m_p, 0, ++ RV1106_VICLKSEL_CON(0), 6, 1, MFLAGS, ++ RV1106_VICLKGATE_CON(0), 3, GFLAGS), ++ ++ GATE(PCLK_CSIHOST0, "pclk_csihost0", "pclk_vi_root", 0, ++ RV1106_VICLKGATE_CON(1), 3, GFLAGS), ++ GATE(PCLK_CSIHOST1, "pclk_csihost1", "pclk_vi_root", 0, ++ RV1106_VICLKGATE_CON(1), 5, GFLAGS), ++ GATE(PCLK_GPIO3, "pclk_gpio3", "pclk_vi_root", 0, ++ RV1106_VICLKGATE_CON(1), 15, GFLAGS), ++ GATE(DBCLK_GPIO3, "dbclk_gpio3", "xin24m", 0, ++ RV1106_VICLKGATE_CON(2), 0, GFLAGS), ++ GATE(HCLK_ISP3P2, "hclk_isp3p2", "hclk_vi_root", 0, ++ RV1106_VICLKGATE_CON(0), 7, GFLAGS), ++ GATE(ACLK_ISP3P2, "aclk_isp3p2", "aclk_vi_root", 0, ++ RV1106_VICLKGATE_CON(0), 8, GFLAGS), ++ COMPOSITE_NODIV(CLK_CORE_ISP3P2, "clk_core_isp3p2", mux_339m_200m_pvtpll0_pvtpll1_p, 0, ++ RV1106_VICLKSEL_CON(0), 7, 2, MFLAGS, ++ RV1106_VICLKGATE_CON(0), 9, GFLAGS), ++ GATE(PCLK_MIPICSIPHY, "pclk_mipicsiphy", "pclk_vi_root", 0, ++ RV1106_VICLKGATE_CON(1), 14, GFLAGS), ++ COMPOSITE(CCLK_SRC_SDMMC, "cclk_src_sdmmc", mux_400m_24m_p, 0, ++ RV1106_VICLKSEL_CON(1), 14, 1, MFLAGS, 8, 6, DFLAGS, ++ RV1106_VICLKGATE_CON(1), 11, GFLAGS), ++ GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_vi_root", 0, ++ RV1106_VICLKGATE_CON(1), 12, GFLAGS), ++ GATE(CLK_SDMMC_DETN_FLT, "clk_sdmmc_detn_flt", "xin24m", 0, ++ RV1106_VICLKGATE_CON(1), 13, GFLAGS), ++ GATE(PCLK_VI_RTC_TEST, "pclk_vi_rtc_test", "pclk_vi_rtc_root", 0, ++ RV1106_VICLKGATE_CON(2), 5, GFLAGS), ++ GATE(PCLK_VI_RTC_PHY, "pclk_vi_rtc_phy", "pclk_vi_rtc_root", 0, ++ RV1106_VICLKGATE_CON(2), 6, GFLAGS), ++ COMPOSITE_NODIV(DCLK_VICAP, "dclk_vicap", mux_339m_200m_100m_24m_p, 0, ++ RV1106_VICLKSEL_CON(0), 9, 2, MFLAGS, ++ RV1106_VICLKGATE_CON(0), 10, GFLAGS), ++ GATE(ACLK_VICAP, "aclk_vicap", "aclk_vi_root", 0, ++ RV1106_VICLKGATE_CON(0), 12, GFLAGS), ++ GATE(HCLK_VICAP, "hclk_vicap", "hclk_vi_root", 0, ++ RV1106_VICLKGATE_CON(0), 13, GFLAGS), ++ ++ /* PD_VO */ ++ COMPOSITE_NODIV(ACLK_MAC_ROOT, "aclk_mac_root", mux_300m_200m_100m_24m_p, 0, ++ RV1106_VOCLKSEL_CON(1), 12, 2, MFLAGS, ++ RV1106_VOCLKGATE_CON(1), 4, GFLAGS), ++ COMPOSITE_NODIV(ACLK_VO_ROOT, "aclk_vo_root", mux_400m_200m_100m_24m_p, CLK_IS_CRITICAL, ++ RV1106_VOCLKSEL_CON(0), 0, 2, MFLAGS, ++ RV1106_VOCLKGATE_CON(0), 0, GFLAGS), ++ COMPOSITE_NODIV(HCLK_VO_ROOT, "hclk_vo_root", mux_200m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RV1106_VOCLKSEL_CON(0), 2, 2, MFLAGS, ++ RV1106_VOCLKGATE_CON(0), 1, GFLAGS), ++ COMPOSITE_NODIV(PCLK_VO_ROOT, "pclk_vo_root", mux_150m_100m_50m_24m_p, CLK_IS_CRITICAL, ++ RV1106_VOCLKSEL_CON(0), 4, 2, MFLAGS, ++ RV1106_VOCLKGATE_CON(0), 2, GFLAGS), ++ COMPOSITE_NODIV(ACLK_VOP_ROOT, "aclk_vop_root", mux_300m_200m_100m_24m_p, 0, ++ RV1106_VOCLKSEL_CON(1), 10, 2, MFLAGS, ++ RV1106_VOCLKGATE_CON(0), 11, GFLAGS), ++ ++ GATE(PCLK_GPIO2, "pclk_gpio2", "pclk_vo_root", 0, ++ RV1106_VOCLKGATE_CON(3), 0, GFLAGS), ++ GATE(DBCLK_GPIO2, "dbclk_gpio2", "xin24m", 0, ++ RV1106_VOCLKGATE_CON(3), 1, GFLAGS), ++ GATE(ACLK_MAC, "aclk_mac", "aclk_mac_root", 0, ++ RV1106_VOCLKGATE_CON(1), 8, GFLAGS), ++ GATE(PCLK_MAC, "pclk_mac", "pclk_vo_root", 0, ++ RV1106_VOCLKGATE_CON(1), 9, GFLAGS), ++ FACTOR(CLK_GMAC0_50M_O, "clk_gmac0_50m_o", "clk_50m_src", 0, 1, 1), ++ FACTOR(CLK_GMAC0_REF_50M, "clk_gmac0_ref_50m", "clk_gmac0_50m_o", 0, 1, 1), ++ DIV(CLK_GMAC0_TX_50M_O, "clk_gmac0_tx_50m_o", "clk_gmac0_50m_o", 0, ++ RV1106_VOCLKSEL_CON(2), 1, 6, DFLAGS), ++ GATE(CLK_MACPHY, "clk_macphy", "xin24m", 0, ++ RV1106_VOCLKGATE_CON(2), 13, GFLAGS), ++ GATE(CLK_OTPC_ARB, "clk_otpc_arb", "xin24m", 0, ++ RV1106_VOCLKGATE_CON(2), 11, GFLAGS), ++ GATE(PCLK_OTPC_NS, "pclk_otpc_ns", "pclk_vo_root", 0, ++ RV1106_VOCLKGATE_CON(2), 3, GFLAGS), ++ GATE(CLK_SBPI_OTPC_NS, "clk_sbpi_otpc_ns", "xin24m", 0, ++ RV1106_VOCLKGATE_CON(2), 5, GFLAGS), ++ COMPOSITE_NOMUX(CLK_USER_OTPC_NS, "clk_user_otpc_ns", "xin24m", 0, ++ RV1106_VOCLKSEL_CON(3), 10, 3, DFLAGS, ++ RV1106_VOCLKGATE_CON(2), 6, GFLAGS), ++ GATE(PCLK_OTPC_S, "pclk_otpc_s", "pclk_vo_root", 0, ++ RV1106_VOCLKGATE_CON(2), 7, GFLAGS), ++ GATE(CLK_SBPI_OTPC_S, "clk_sbpi_otpc_s", "xin24m", 0, ++ RV1106_VOCLKGATE_CON(2), 9, GFLAGS), ++ COMPOSITE_NOMUX(CLK_USER_OTPC_S, "clk_user_otpc_s", "xin24m", 0, ++ RV1106_VOCLKSEL_CON(3), 13, 3, DFLAGS, ++ RV1106_VOCLKGATE_CON(2), 10, GFLAGS), ++ GATE(PCLK_OTP_MASK, "pclk_otp_mask", "pclk_vo_root", 0, ++ RV1106_VOCLKGATE_CON(2), 14, GFLAGS), ++ GATE(CLK_PMC_OTP, "clk_pmc_otp", "clk_sbpi_otpc_s", 0, ++ RV1106_VOCLKGATE_CON(2), 15, GFLAGS), ++ GATE(HCLK_RGA2E, "hclk_rga2e", "hclk_vo_root", 0, ++ RV1106_VOCLKGATE_CON(0), 7, GFLAGS), ++ GATE(ACLK_RGA2E, "aclk_rga2e", "aclk_vo_root", 0, ++ RV1106_VOCLKGATE_CON(0), 8, GFLAGS), ++ COMPOSITE_NODIV(CLK_CORE_RGA2E, "clk_core_rga2e", mux_400m_200m_100m_24m_p, 0, ++ RV1106_VOCLKSEL_CON(1), 8, 2, MFLAGS, ++ RV1106_VOCLKGATE_CON(0), 9, GFLAGS), ++ COMPOSITE(CCLK_SRC_SDIO, "cclk_src_sdio", mux_400m_24m_p, 0, ++ RV1106_VOCLKSEL_CON(2), 13, 1, MFLAGS, 7, 6, DFLAGS, ++ RV1106_VOCLKGATE_CON(1), 14, GFLAGS), ++ GATE(HCLK_SDIO, "hclk_sdio", "hclk_vo_root", 0, ++ RV1106_VOCLKGATE_CON(1), 15, GFLAGS), ++ GATE(PCLK_TSADC, "pclk_tsadc", "pclk_vo_root", 0, ++ RV1106_VOCLKGATE_CON(2), 0, GFLAGS), ++ COMPOSITE_NOMUX(CLK_TSADC, "clk_tsadc", "xin24m", 0, ++ RV1106_VOCLKSEL_CON(3), 0, 5, DFLAGS, ++ RV1106_VOCLKGATE_CON(2), 1, GFLAGS), ++ COMPOSITE_NOMUX(CLK_TSADC_TSEN, "clk_tsadc_tsen", "xin24m", 0, ++ RV1106_VOCLKSEL_CON(3), 5, 5, DFLAGS, ++ RV1106_VOCLKGATE_CON(2), 2, GFLAGS), ++ GATE(HCLK_VOP, "hclk_vop", "hclk_vo_root", 0, ++ RV1106_VOCLKGATE_CON(0), 13, GFLAGS), ++ GATE(DCLK_VOP, "dclk_vop", "dclk_vop_src", 0, ++ RV1106_VOCLKGATE_CON(0), 14, GFLAGS), ++ GATE(ACLK_VOP, "aclk_vop", "aclk_vop_root", 0, ++ RV1106_VOCLKGATE_CON(0), 15, GFLAGS), ++ ++ /* IO CLK */ ++ GATE(RX0PCLK_VICAP, "rx0pclk_vicap", "rx0pclk_vicap_io", 0, ++ RV1106_VICLKGATE_CON(1), 0, GFLAGS), ++ GATE(RX1PCLK_VICAP, "rx1pclk_vicap", "rx1pclk_vicap_io", 0, ++ RV1106_VICLKGATE_CON(1), 1, GFLAGS), ++ GATE(ISP0CLK_VICAP, "isp0clk_vicap", "isp0clk_vicap_io", 0, ++ RV1106_VICLKGATE_CON(1), 2, GFLAGS), ++ GATE(I0CLK_VICAP, "i0clk_vicap", "i0clk_vicap_io", 0, ++ RV1106_VICLKGATE_CON(0), 14, GFLAGS), ++ GATE(I1CLK_VICAP, "i1clk_vicap", "i1clk_vicap_io", 0, ++ RV1106_VICLKGATE_CON(0), 15, GFLAGS), ++ GATE(PCLK_VICAP, "pclk_vicap", "pclk_vicap_io", 0, ++ RV1106_VICLKGATE_CON(0), 11, GFLAGS), ++ GATE(CLK_RXBYTECLKHS_0, "clk_rxbyteclkhs_0", "clk_rxbyteclkhs_0_io", 0, ++ RV1106_VICLKGATE_CON(1), 4, GFLAGS), ++ GATE(CLK_RXBYTECLKHS_1, "clk_rxbyteclkhs_1", "clk_rxbyteclkhs_1_io", 0, ++ RV1106_VICLKGATE_CON(1), 6, GFLAGS), ++ ++ GATE(PCLK_VICAP_VEPU, "pclk_vicap_vepu", "pclk_vicap_vepu_io", 0, ++ RV1106_VEPUCLKGATE_CON(0), 14, GFLAGS), ++ GATE(SCLK_IN_SPI0, "sclk_in_spi0", "sclk_in_spi0_io", 0, ++ RV1106_VEPUCLKGATE_CON(1), 4, GFLAGS), ++ ++ GATE(CLK_UTMI_USBOTG, "clk_utmi_usbotg", "clk_utmi_usbotg_io", 0, ++ RV1106_PERICLKGATE_CON(4), 9, GFLAGS), ++ ++}; ++ ++static struct rockchip_clk_branch rv1106_grf_clk_branches[] __initdata = { ++ MMC(SCLK_EMMC_DRV, "emmc_drv", "cclk_src_emmc", RV1106_EMMC_CON0, 1), ++ MMC(SCLK_EMMC_SAMPLE, "emmc_sample", "cclk_src_emmc", RV1106_EMMC_CON1, 1), ++ MMC(SCLK_SDMMC_DRV, "sdmmc_drv", "cclk_src_sdmmc", RV1106_SDMMC_CON0, 1), ++ MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "cclk_src_sdmmc", RV1106_SDMMC_CON1, 1), ++ MMC(SCLK_SDIO_DRV, "sdio_drv", "cclk_src_sdio", RV1106_SDIO_CON0, 1), ++ MMC(SCLK_SDIO_SAMPLE, "sdio_sample", "cclk_src_sdio", RV1106_SDIO_CON1, 1), ++}; ++ ++static void __iomem *rv1106_cru_base; ++static struct rockchip_clk_provider *grf_ctx, *cru_ctx; ++ ++void rv1106_dump_cru(void) ++{ ++ if (rv1106_cru_base) { ++ pr_warn("CRU:\n"); ++ print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, ++ 32, 4, rv1106_cru_base, ++ 0x588, false); ++ } ++} ++EXPORT_SYMBOL_GPL(rv1106_dump_cru); ++ ++static void _cru_pvtpll_calibrate(int count_offset, int length_offset, int target_rate) ++{ ++ unsigned int rate0, rate1, delta, length_ori, length, step, val, i = 0; ++ ++ rate0 = readl_relaxed(rv1106_cru_base + count_offset); ++ if (rate0 < target_rate) ++ return; ++ /* delta < (3.125% * target_rate) */ ++ if ((rate0 - target_rate) < (target_rate >> 5)) ++ return; ++ ++ length_ori = readl_relaxed(rv1106_cru_base + length_offset) & PVTPLL_LENGTH_SEL_MASK; ++ length = length_ori; ++ length++; ++ val = HIWORD_UPDATE(length, PVTPLL_LENGTH_SEL_MASK, PVTPLL_LENGTH_SEL_SHIFT); ++ writel_relaxed(val, rv1106_cru_base + length_offset); ++ usleep_range(2000, 2100); ++ rate1 = readl_relaxed(rv1106_cru_base + count_offset); ++ if ((rate1 < target_rate) || (rate1 >= rate0)) ++ return; ++ if (abs(rate1 - target_rate) < (target_rate >> 5)) ++ return; ++ ++ step = rate0 - rate1; ++ delta = rate1 - target_rate; ++ length += delta / step; ++ val = HIWORD_UPDATE(length, PVTPLL_LENGTH_SEL_MASK, PVTPLL_LENGTH_SEL_SHIFT); ++ writel_relaxed(val, rv1106_cru_base + length_offset); ++ usleep_range(2000, 2100); ++ rate0 = readl_relaxed(rv1106_cru_base + count_offset); ++ ++ while (abs(rate0 - target_rate) >= (target_rate >> 5)) { ++ if (i++ > 20) ++ break; ++ if (rate0 > target_rate) ++ length++; ++ else ++ length--; ++ if (length <= length_ori) ++ break; ++ val = HIWORD_UPDATE(length, PVTPLL_LENGTH_SEL_MASK, PVTPLL_LENGTH_SEL_SHIFT); ++ writel_relaxed(val, rv1106_cru_base + length_offset); ++ usleep_range(2000, 2100); ++ rate0 = readl_relaxed(rv1106_cru_base + count_offset); ++ } ++} ++ ++static void _grf_pvtpll_calibrate(int count_offset, int length_offset, int target_rate) ++{ ++ unsigned int rate0, rate1, delta, length_ori, length, step, val, i = 0; ++ ++ regmap_read(cru_ctx->grf, count_offset, &rate0); ++ if (rate0 < target_rate) ++ return; ++ /* delta < (3.125% * target_rate) */ ++ if ((rate0 - target_rate) < (target_rate >> 5)) ++ return; ++ ++ regmap_read(cru_ctx->grf, length_offset, &length_ori); ++ length = length_ori; ++ length_ori = length; ++ length &= PVTPLL_LENGTH_SEL_MASK; ++ length++; ++ val = HIWORD_UPDATE(length, PVTPLL_LENGTH_SEL_MASK, PVTPLL_LENGTH_SEL_SHIFT); ++ regmap_write(cru_ctx->grf, length_offset, val); ++ usleep_range(2000, 2100); ++ regmap_read(cru_ctx->grf, count_offset, &rate1); ++ if ((rate1 < target_rate) || (rate1 >= rate0)) ++ return; ++ if (abs(rate1 - target_rate) < (target_rate >> 5)) ++ return; ++ ++ step = rate0 - rate1; ++ delta = rate1 - target_rate; ++ length += delta / step; ++ val = HIWORD_UPDATE(length, PVTPLL_LENGTH_SEL_MASK, PVTPLL_LENGTH_SEL_SHIFT); ++ regmap_write(cru_ctx->grf, length_offset, val); ++ usleep_range(2000, 2100); ++ regmap_read(cru_ctx->grf, count_offset, &rate0); ++ ++ while (abs(rate0 - target_rate) >= (target_rate >> 5)) { ++ if (i++ > 20) ++ break; ++ if (rate0 > target_rate) ++ length++; ++ else ++ length--; ++ if (length <= length_ori) ++ break; ++ val = HIWORD_UPDATE(length, PVTPLL_LENGTH_SEL_MASK, PVTPLL_LENGTH_SEL_SHIFT); ++ regmap_write(cru_ctx->grf, length_offset, val); ++ usleep_range(2000, 2100); ++ regmap_read(cru_ctx->grf, count_offset, &rate0); ++ } ++} ++ ++static void rockchip_rv1106_pvtpll_calibrate(struct work_struct *w) ++{ ++ struct clk *clk; ++ unsigned long rate; ++ ++ clk = __clk_lookup("clk_pvtpll_0"); ++ if (clk) { ++ rate = clk_get_rate(clk); ++ _cru_pvtpll_calibrate(CRU_PVTPLL0_OSC_CNT_AVG, ++ CRU_PVTPLL0_CON0_H, rate / 1000000); ++ } ++ ++ clk = __clk_lookup("clk_pvtpll_1"); ++ if (clk) { ++ rate = clk_get_rate(clk); ++ _cru_pvtpll_calibrate(CRU_PVTPLL1_OSC_CNT_AVG, ++ CRU_PVTPLL1_CON0_H, rate / 1000000); ++ } ++ ++ clk = __clk_lookup("cpu_pvtpll"); ++ if (clk) { ++ rate = clk_get_rate(clk); ++ _grf_pvtpll_calibrate(CPU_PVTPLL_OSC_CNT_AVG, ++ CPU_PVTPLL_CON0_H, rate / 1000000); ++ } ++} ++static DECLARE_DEFERRABLE_WORK(pvtpll_calibrate_work, rockchip_rv1106_pvtpll_calibrate); ++ ++static void rockchip_rv1106_pvtpll_init(struct rockchip_clk_provider *ctx) ++{ ++ /* set pvtpll ref clk mux */ ++ writel_relaxed(CPU_PVTPLL_PATH_CORE, ctx->reg_base + CPU_CLK_PATH_BASE); ++ ++ regmap_write(ctx->grf, CPU_PVTPLL_CON0_H, HIWORD_UPDATE(0x7, PVTPLL_LENGTH_SEL_MASK, ++ PVTPLL_LENGTH_SEL_SHIFT)); ++ regmap_write(ctx->grf, CPU_PVTPLL_CON0_L, HIWORD_UPDATE(0x1, PVTPLL_RING_SEL_MASK, ++ PVTPLL_RING_SEL_SHIFT)); ++ regmap_write(ctx->grf, CPU_PVTPLL_CON0_L, HIWORD_UPDATE(0x3, PVTPLL_EN_MASK, ++ PVTPLL_EN_SHIFT)); ++ ++ writel_relaxed(0x007f0000, ctx->reg_base + CRU_PVTPLL0_CON0_H); ++ writel_relaxed(0xffff0018, ctx->reg_base + CRU_PVTPLL0_CON1_L); ++ writel_relaxed(0xffff0004, ctx->reg_base + CRU_PVTPLL0_CON2_H); ++ writel_relaxed(0x00030003, ctx->reg_base + CRU_PVTPLL0_CON0_L); ++ ++ writel_relaxed(0x007f0000, ctx->reg_base + CRU_PVTPLL1_CON0_H); ++ writel_relaxed(0xffff0018, ctx->reg_base + CRU_PVTPLL1_CON1_L); ++ writel_relaxed(0xffff0004, ctx->reg_base + CRU_PVTPLL1_CON2_H); ++ writel_relaxed(0x00030003, ctx->reg_base + CRU_PVTPLL1_CON0_L); ++ ++ schedule_delayed_work(&pvtpll_calibrate_work, msecs_to_jiffies(3000)); ++} ++ ++static int rv1106_clk_panic(struct notifier_block *this, ++ unsigned long ev, void *ptr) ++{ ++ rv1106_dump_cru(); ++ return NOTIFY_DONE; ++} ++ ++static struct notifier_block rv1106_clk_panic_block = { ++ .notifier_call = rv1106_clk_panic, ++}; ++ ++static void __init rv1106_clk_init(struct device_node *np) ++{ ++ struct rockchip_clk_provider *ctx; ++ void __iomem *reg_base; ++ struct clk **cru_clks; ++ ++ reg_base = of_iomap(np, 0); ++ if (!reg_base) { ++ pr_err("%s: could not map cru region\n", __func__); ++ return; ++ } ++ ++ rv1106_cru_base = reg_base; ++ ++ ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS); ++ if (IS_ERR(ctx)) { ++ pr_err("%s: rockchip clk init failed\n", __func__); ++ iounmap(reg_base); ++ return; ++ } ++ cru_ctx = ctx; ++ ++ rockchip_rv1106_pvtpll_init(ctx); ++ ++ cru_clks = ctx->clk_data.clks; ++ ++ rockchip_clk_register_plls(ctx, rv1106_pll_clks, ++ ARRAY_SIZE(rv1106_pll_clks), ++ RV1106_GRF_SOC_STATUS0); ++ ++ rockchip_clk_register_armclk(ctx, ARMCLK, "armclk", ++ 3, cru_clks[PLL_APLL], cru_clks[PLL_GPLL], ++ &rv1106_cpuclk_data, rv1106_cpuclk_rates, ++ ARRAY_SIZE(rv1106_cpuclk_rates)); ++ ++ rockchip_clk_register_branches(ctx, rv1106_clk_branches, ++ ARRAY_SIZE(rv1106_clk_branches)); ++ ++ rockchip_clk_register_branches(grf_ctx, rv1106_grf_clk_branches, ++ ARRAY_SIZE(rv1106_grf_clk_branches)); ++ ++ rockchip_register_softrst(np, 31745, reg_base + RV1106_PMUSOFTRST_CON(0), ++ ROCKCHIP_SOFTRST_HIWORD_MASK); ++ ++ rockchip_register_restart_notifier(ctx, RV1106_GLB_SRST_FST, NULL); ++ ++ rockchip_clk_of_add_provider(np, ctx); ++ ++ atomic_notifier_chain_register(&panic_notifier_list, ++ &rv1106_clk_panic_block); ++} ++ ++CLK_OF_DECLARE(rv1106_cru, "rockchip,rv1106-cru", rv1106_clk_init); ++ ++static void __init rv1106_grf_clk_init(struct device_node *np) ++{ ++ struct rockchip_clk_provider *ctx; ++ void __iomem *reg_base; ++ ++ reg_base = of_iomap(of_get_parent(np), 0); ++ if (!reg_base) { ++ pr_err("%s: could not map cru grf region\n", __func__); ++ return; ++ } ++ ++ ctx = rockchip_clk_init(np, reg_base, CLK_NR_GRF_CLKS); ++ if (IS_ERR(ctx)) { ++ pr_err("%s: rockchip grf clk init failed\n", __func__); ++ return; ++ } ++ grf_ctx = ctx; ++ ++ rockchip_clk_of_add_provider(np, ctx); ++} ++CLK_OF_DECLARE(rv1106_grf_cru, "rockchip,rv1106-grf-cru", rv1106_grf_clk_init); ++ ++#ifdef MODULE ++struct clk_rv1106_inits { ++ void (*inits)(struct device_node *np); ++}; ++ ++static const struct clk_rv1106_inits clk_rv1106_init = { ++ .inits = rv1106_clk_init, ++}; ++ ++static const struct clk_rv1106_inits clk_rv1106_grf_init = { ++ .inits = rv1106_grf_clk_init, ++}; ++ ++static const struct of_device_id clk_rv1106_match_table[] = { ++ { ++ .compatible = "rockchip,rv1106-cru", ++ .data = &clk_rv1106_init, ++ }, { ++ .compatible = "rockchip,rv1106-grf-cru", ++ .data = &clk_rv1106_grf_init, ++ }, ++ { } ++}; ++MODULE_DEVICE_TABLE(of, clk_rv1106_match_table); ++ ++static int __init clk_rv1106_probe(struct platform_device *pdev) ++{ ++ struct device_node *np = pdev->dev.of_node; ++ const struct of_device_id *match; ++ const struct clk_rv1106_inits *init_data; ++ ++ match = of_match_device(clk_rv1106_match_table, &pdev->dev); ++ if (!match || !match->data) ++ return -EINVAL; ++ ++ init_data = match->data; ++ if (init_data->inits) ++ init_data->inits(np); ++ ++ return 0; ++} ++ ++static struct platform_driver clk_rv1106_driver = { ++ .driver = { ++ .name = "clk-rv1106", ++ .of_match_table = clk_rv1106_match_table, ++ }, ++}; ++builtin_platform_driver_probe(clk_rv1106_driver, clk_rv1106_probe); ++ ++MODULE_DESCRIPTION("Rockchip RV1106 Clock Driver"); ++MODULE_LICENSE("GPL"); ++#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rv1108.c b/drivers/clk/rockchip/clk-rv1108.c -index 5947d3192866..53eaabb193a4 100644 +index 5947d3192..0a93b9333 100644 --- a/drivers/clk/rockchip/clk-rv1108.c +++ b/drivers/clk/rockchip/clk-rv1108.c -@@ -7,13 +7,17 @@ +@@ -7,8 +7,10 @@ #include #include @@ -119206,14 +120928,7 @@ index 5947d3192866..53eaabb193a4 100644 #include #include #include "clk.h" - - #define RV1108_GRF_SOC_STATUS0 0x480 -+#define RV1108_I2S_FRAC_MAX_RATE 600000000 -+#define RV1108_UART_FRAC_MAX_RATE 600000000 - - enum rv1108_plls { - apll, dpll, gpll, -@@ -106,9 +110,10 @@ static struct rockchip_cpuclk_rate_table rv1108_cpuclk_rates[] __initdata = { +@@ -106,9 +108,10 @@ static struct rockchip_cpuclk_rate_table rv1108_cpuclk_rates[] __initdata = { }; static const struct rockchip_cpuclk_reg_data rv1108_cpuclk_data = { @@ -119227,7 +120942,7 @@ index 5947d3192866..53eaabb193a4 100644 .mux_core_alt = 1, .mux_core_main = 0, .mux_core_shift = 8, -@@ -117,7 +122,6 @@ static const struct rockchip_cpuclk_reg_data rv1108_cpuclk_data = { +@@ -117,7 +120,6 @@ static const struct rockchip_cpuclk_reg_data rv1108_cpuclk_data = { PNAME(mux_pll_p) = { "xin24m", "xin24m"}; PNAME(mux_ddrphy_p) = { "dpll_ddr", "gpll_ddr", "apll_ddr" }; @@ -119235,7 +120950,7 @@ index 5947d3192866..53eaabb193a4 100644 PNAME(mux_usb480m_pre_p) = { "usbphy", "xin24m" }; PNAME(mux_hdmiphy_phy_p) = { "hdmiphy", "xin24m" }; PNAME(mux_dclk_hdmiphy_pre_p) = { "dclk_hdmiphy_src_gpll", "dclk_hdmiphy_src_dpll" }; -@@ -209,7 +213,7 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { +@@ -209,7 +211,7 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { COMPOSITE_NOMUX(ACLK_ENMCORE, "aclkenm_core", "armclk", CLK_IGNORE_UNUSED, RV1108_CLKSEL_CON(1), 0, 3, DFLAGS | CLK_DIVIDER_READ_ONLY, RV1108_CLKGATE_CON(0), 4, GFLAGS), @@ -119244,7 +120959,7 @@ index 5947d3192866..53eaabb193a4 100644 RV1108_CLKGATE_CON(11), 0, GFLAGS), GATE(0, "pclk_dbg", "pclken_dbg", CLK_IGNORE_UNUSED, RV1108_CLKGATE_CON(11), 1, GFLAGS), -@@ -264,10 +268,10 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { +@@ -264,10 +266,10 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { RV1108_CLKGATE_CON(19), 6, GFLAGS), /* PD_PMU_wrapper */ @@ -119257,7 +120972,7 @@ index 5947d3192866..53eaabb193a4 100644 RV1108_CLKGATE_CON(10), 0, GFLAGS), GATE(0, "pclk_intmem1", "pmu_24m_ena", CLK_IGNORE_UNUSED, RV1108_CLKGATE_CON(10), 1, GFLAGS), -@@ -305,7 +309,7 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { +@@ -305,7 +307,7 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { RV1108_CLKSEL_CON(41), 0, 5, DFLAGS, RV1108_CLKGATE_CON(9), 12, GFLAGS), @@ -119266,31 +120981,7 @@ index 5947d3192866..53eaabb193a4 100644 RV1108_CLKGATE_CON(14), 6, GFLAGS), GATE(0, "pclk_usbgrf", "pclk_top_pre", CLK_IGNORE_UNUSED, RV1108_CLKGATE_CON(14), 14, GFLAGS), -@@ -503,7 +507,7 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "i2s0_frac", "i2s0_src", CLK_SET_RATE_PARENT, - RV1108_CLKSEL_CON(8), 0, - RV1108_CLKGATE_CON(2), 1, GFLAGS, -- &rv1108_i2s0_fracmux), -+ &rv1108_i2s0_fracmux, RV1108_I2S_FRAC_MAX_RATE), - GATE(SCLK_I2S0, "sclk_i2s0", "i2s0_pre", CLK_SET_RATE_PARENT, - RV1108_CLKGATE_CON(2), 2, GFLAGS), - COMPOSITE_NODIV(0, "i2s_out", mux_i2s_out_p, 0, -@@ -516,7 +520,7 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "i2s1_frac", "i2s1_src", CLK_SET_RATE_PARENT, - RK2928_CLKSEL_CON(9), 0, - RK2928_CLKGATE_CON(2), 5, GFLAGS, -- &rv1108_i2s1_fracmux), -+ &rv1108_i2s1_fracmux, RV1108_I2S_FRAC_MAX_RATE), - GATE(SCLK_I2S1, "sclk_i2s1", "i2s1_pre", CLK_SET_RATE_PARENT, - RV1108_CLKGATE_CON(2), 6, GFLAGS), - -@@ -526,28 +530,28 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "i2s2_frac", "i2s2_src", CLK_SET_RATE_PARENT, - RV1108_CLKSEL_CON(10), 0, - RV1108_CLKGATE_CON(2), 9, GFLAGS, -- &rv1108_i2s2_fracmux), -+ &rv1108_i2s2_fracmux, RV1108_I2S_FRAC_MAX_RATE), - GATE(SCLK_I2S2, "sclk_i2s2", "i2s2_pre", CLK_SET_RATE_PARENT, +@@ -531,23 +533,23 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { RV1108_CLKGATE_CON(2), 10, GFLAGS), /* PD_BUS */ @@ -119322,26 +121013,7 @@ index 5947d3192866..53eaabb193a4 100644 RV1108_CLKGATE_CON(1), 7, GFLAGS), GATE(0, "pclk_ddr_pre", "pclk_bus_pre", CLK_IGNORE_UNUSED, RV1108_CLKGATE_CON(1), 8, GFLAGS), -@@ -592,15 +596,15 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { - COMPOSITE_FRACMUX(0, "uart0_frac", "uart0_src", CLK_SET_RATE_PARENT, - RV1108_CLKSEL_CON(16), 0, - RV1108_CLKGATE_CON(3), 2, GFLAGS, -- &rv1108_uart0_fracmux), -+ &rv1108_uart0_fracmux, RV1108_UART_FRAC_MAX_RATE), - COMPOSITE_FRACMUX(0, "uart1_frac", "uart1_src", CLK_SET_RATE_PARENT, - RV1108_CLKSEL_CON(17), 0, - RV1108_CLKGATE_CON(3), 4, GFLAGS, -- &rv1108_uart1_fracmux), -+ &rv1108_uart1_fracmux, RV1108_UART_FRAC_MAX_RATE), - COMPOSITE_FRACMUX(0, "uart2_frac", "uart2_src", CLK_SET_RATE_PARENT, - RV1108_CLKSEL_CON(18), 0, - RV1108_CLKGATE_CON(3), 6, GFLAGS, -- &rv1108_uart2_fracmux), -+ &rv1108_uart2_fracmux, RV1108_UART_FRAC_MAX_RATE), - GATE(PCLK_UART0, "pclk_uart0", "pclk_bus_pre", 0, - RV1108_CLKGATE_CON(13), 10, GFLAGS), - GATE(PCLK_UART1, "pclk_uart1", "pclk_bus_pre", 0, -@@ -668,7 +672,7 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { +@@ -668,7 +670,7 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { RV1108_CLKGATE_CON(0), 9, GFLAGS), GATE(0, "gpll_ddr", "gpll", CLK_IGNORE_UNUSED, RV1108_CLKGATE_CON(0), 10, GFLAGS), @@ -119350,7 +121022,7 @@ index 5947d3192866..53eaabb193a4 100644 RV1108_CLKSEL_CON(4), 8, 2, MFLAGS, 0, 3, DFLAGS | CLK_DIVIDER_POWER_OF_TWO), FACTOR(0, "clk_ddr", "clk_ddrphy_src", 0, 1, 2), -@@ -676,9 +680,9 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { +@@ -676,9 +678,9 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { RV1108_CLKGATE_CON(10), 9, GFLAGS), GATE(0, "pclk_ddrupctl", "pclk_ddr_pre", CLK_IGNORE_UNUSED, RV1108_CLKGATE_CON(12), 4, GFLAGS), @@ -119362,7 +121034,7 @@ index 5947d3192866..53eaabb193a4 100644 RV1108_CLKGATE_CON(12), 6, GFLAGS), GATE(0, "timer_clk", "xin24m", CLK_IGNORE_UNUSED, RV1108_CLKGATE_CON(0), 11, GFLAGS), -@@ -692,22 +696,22 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { +@@ -692,22 +694,22 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { */ /* PD_PERI */ @@ -119392,7 +121064,7 @@ index 5947d3192866..53eaabb193a4 100644 RV1108_CLKSEL_CON(23), 15, 1, MFLAGS, 0, 5, DFLAGS, RV1108_CLKGATE_CON(15), 11, GFLAGS), -@@ -767,24 +771,23 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { +@@ -767,24 +769,23 @@ static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = { MMC(SCLK_EMMC_SAMPLE, "emmc_sample", "sclk_emmc", RV1108_EMMC_CON1, 1), }; @@ -119429,7 +121101,7 @@ index 5947d3192866..53eaabb193a4 100644 reg_base = of_iomap(np, 0); if (!reg_base) { -@@ -798,17 +801,16 @@ static void __init rv1108_clk_init(struct device_node *np) +@@ -798,17 +799,16 @@ static void __init rv1108_clk_init(struct device_node *np) iounmap(reg_base); return; } @@ -119449,7 +121121,7 @@ index 5947d3192866..53eaabb193a4 100644 &rv1108_cpuclk_data, rv1108_cpuclk_rates, ARRAY_SIZE(rv1108_cpuclk_rates)); -@@ -818,5 +820,38 @@ static void __init rv1108_clk_init(struct device_node *np) +@@ -818,5 +818,38 @@ static void __init rv1108_clk_init(struct device_node *np) rockchip_register_restart_notifier(ctx, RV1108_GLB_SRST_FST, NULL); rockchip_clk_of_add_provider(np, ctx); @@ -119490,10 +121162,10 @@ index 5947d3192866..53eaabb193a4 100644 +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rv1126.c b/drivers/clk/rockchip/clk-rv1126.c new file mode 100755 -index 000000000000..09a376c51c0b +index 000000000..d3fc9380c --- /dev/null +++ b/drivers/clk/rockchip/clk-rv1126.c -@@ -0,0 +1,1586 @@ +@@ -0,0 +1,1568 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2019 Rockchip Electronics Co. Ltd. @@ -119812,40 +121484,6 @@ index 000000000000..09a376c51c0b + MUX(CLK_MIPICSI_OUT_MUX, "clk_mipicsi_out2io_mux", mux_mipicsi_out2io_p, CLK_SET_RATE_PARENT, + RV1126_CLKSEL_CON(73), 10, 2, MFLAGS); + -+static struct rockchip_clk_branch rv1126_aclk_pdvi_np5 __initdata = -+ COMPOSITE_HALFDIV_OFFSET(ACLK_PDVI_NP5, "aclk_pdvi_np5", mux_cpll_gpll_hpll_p, 0, -+ RV1126_CLKSEL_CON(49), 6, 2, MFLAGS, -+ RV1126_CLKSEL_CON(76), 0, 5, DFLAGS, -+ RV1126_CLKGATE_CON(16), 13, GFLAGS); -+ -+static struct rockchip_clk_branch rv1126_clk_isp_np5 __initdata = -+ COMPOSITE_HALFDIV_OFFSET(CLK_ISP_NP5, "clk_isp_np5", mux_gpll_cpll_hpll_p, 0, -+ RV1126_CLKSEL_CON(50), 6, 2, MFLAGS, -+ RV1126_CLKSEL_CON(76), 8, 5, DFLAGS, -+ RV1126_CLKGATE_CON(16), 14, GFLAGS); -+ -+static struct rockchip_clk_branch rv1126_aclk_pdispp_np5 __initdata = -+ COMPOSITE_HALFDIV_OFFSET(ACLK_PDISPP_NP5, "aclk_pdispp_np5", mux_cpll_gpll_hpll_p, 0, -+ RV1126_CLKSEL_CON(68), 6, 2, MFLAGS, -+ RV1126_CLKSEL_CON(77), 0, 5, DFLAGS, -+ RV1126_CLKGATE_CON(16), 8, GFLAGS); -+ -+static struct rockchip_clk_branch rv1126_clk_ispp_np5 __initdata = -+ COMPOSITE_HALFDIV_OFFSET(CLK_ISPP_NP5, "clk_ispp_np5", mux_cpll_gpll_hpll_p, 0, -+ RV1126_CLKSEL_CON(69), 6, 2, MFLAGS, -+ RV1126_CLKSEL_CON(77), 8, 5, DFLAGS, -+ RV1126_CLKGATE_CON(16), 7, GFLAGS); -+ -+static struct rockchip_clk_branch rv1126_aclk_pdnpu_npu5 __initdata = -+ COMPOSITE_HALFDIV(ACLK_PDNPU_NP5, "aclk_pdnpu_np5", mux_gpll_cpll_apll_hpll_p, 0, -+ RV1126_CLKSEL_CON(65), 8, 2, MFLAGS, 4, 4, DFLAGS, -+ RV1126_CLKGATE_CON(22), 1, GFLAGS); -+ -+static struct rockchip_clk_branch rv1126_clk_npu_np5 __initdata = -+ COMPOSITE_HALFDIV(CLK_NPU_NP5, "clk_npu_np5", mux_gpll_cpll_apll_hpll_p, 0, -+ RV1126_CLKSEL_CON(67), 8, 2, MFLAGS, 4, 4, DFLAGS, -+ RV1126_CLKGATE_CON(22), 10, GFLAGS); -+ +static struct rockchip_clk_branch rv1126_clk_pmu_branches[] __initdata = { + /* + * Clock-Architecture Diagram 2 @@ -119858,7 +121496,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(CLK_OSC0_DIV32K, "clk_osc0_div32k", "xin24m", CLK_IGNORE_UNUSED, + RV1126_PMU_CLKSEL_CON(13), 0, + RV1126_PMU_CLKGATE_CON(2), 9, GFLAGS, -+ &rv1126_rtc32k_fracmux, 0), ++ &rv1126_rtc32k_fracmux), + + MUXPMUGRF(CLK_32K_IOE, "clk_32k_ioe", mux_clk_32k_ioe_p, 0, + RV1126_PMUGRF_SOC_CON0, 0, 1, MFLAGS), @@ -119882,7 +121520,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(SCLK_UART1_FRACDIV, "sclk_uart1_fracdiv", "sclk_uart1_div", CLK_SET_RATE_PARENT, + RV1126_PMU_CLKSEL_CON(5), 0, + RV1126_PMU_CLKGATE_CON(0), 13, GFLAGS, -+ &rv1126_uart1_fracmux, RV1126_FRAC_MAX_PRATE), ++ &rv1126_uart1_fracmux), + GATE(SCLK_UART1, "sclk_uart1", "sclk_uart1_mux", 0, + RV1126_PMU_CLKGATE_CON(0), 14, GFLAGS), + @@ -120048,7 +121686,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(SCLK_UART0_FRAC, "sclk_uart0_frac", "sclk_uart0_div", CLK_SET_RATE_PARENT, + RV1126_CLKSEL_CON(11), 0, + RV1126_CLKGATE_CON(5), 2, GFLAGS, -+ &rv1126_uart0_fracmux, RV1126_FRAC_MAX_PRATE), ++ &rv1126_uart0_fracmux), + GATE(SCLK_UART0, "sclk_uart0", "sclk_uart0_mux", 0, + RV1126_CLKGATE_CON(5), 3, GFLAGS), + GATE(PCLK_UART2, "pclk_uart2", "pclk_pdbus", 0, @@ -120059,7 +121697,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(SCLK_UART2_FRAC, "sclk_uart2_frac", "sclk_uart2_div", CLK_SET_RATE_PARENT, + RV1126_CLKSEL_CON(13), 0, + RV1126_CLKGATE_CON(5), 6, GFLAGS, -+ &rv1126_uart2_fracmux, RV1126_FRAC_MAX_PRATE), ++ &rv1126_uart2_fracmux), + GATE(SCLK_UART2, "sclk_uart2", "sclk_uart2_mux", 0, + RV1126_CLKGATE_CON(5), 7, GFLAGS), + GATE(PCLK_UART3, "pclk_uart3", "pclk_pdbus", 0, @@ -120070,7 +121708,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(SCLK_UART3_FRAC, "sclk_uart3_frac", "sclk_uart3_div", CLK_SET_RATE_PARENT, + RV1126_CLKSEL_CON(15), 0, + RV1126_CLKGATE_CON(5), 10, GFLAGS, -+ &rv1126_uart3_fracmux, RV1126_FRAC_MAX_PRATE), ++ &rv1126_uart3_fracmux), + GATE(SCLK_UART3, "sclk_uart3", "sclk_uart3_mux", 0, + RV1126_CLKGATE_CON(5), 11, GFLAGS), + GATE(PCLK_UART4, "pclk_uart4", "pclk_pdbus", 0, @@ -120081,7 +121719,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(SCLK_UART4_FRAC, "sclk_uart4_frac", "sclk_uart4_div", CLK_SET_RATE_PARENT, + RV1126_CLKSEL_CON(17), 0, + RV1126_CLKGATE_CON(5), 14, GFLAGS, -+ &rv1126_uart4_fracmux, RV1126_FRAC_MAX_PRATE), ++ &rv1126_uart4_fracmux), + GATE(SCLK_UART4, "sclk_uart4", "sclk_uart4_mux", 0, + RV1126_CLKGATE_CON(5), 15, GFLAGS), + GATE(PCLK_UART5, "pclk_uart5", "pclk_pdbus", 0, @@ -120092,7 +121730,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(SCLK_UART5_FRAC, "sclk_uart5_frac", "sclk_uart5_div", CLK_SET_RATE_PARENT, + RV1126_CLKSEL_CON(19), 0, + RV1126_CLKGATE_CON(6), 2, GFLAGS, -+ &rv1126_uart5_fracmux, RV1126_FRAC_MAX_PRATE), ++ &rv1126_uart5_fracmux), + GATE(SCLK_UART5, "sclk_uart5", "sclk_uart5_mux", 0, + RV1126_CLKGATE_CON(6), 3, GFLAGS), + @@ -120245,7 +121883,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(MCLK_I2S0_TX_FRACDIV, "mclk_i2s0_tx_fracdiv", "mclk_i2s0_tx_div", CLK_SET_RATE_PARENT, + RV1126_CLKSEL_CON(28), 0, + RV1126_CLKGATE_CON(9), 6, GFLAGS, -+ &rv1126_i2s0_tx_fracmux, RV1126_FRAC_MAX_PRATE), ++ &rv1126_i2s0_tx_fracmux), + GATE(MCLK_I2S0_TX, "mclk_i2s0_tx", "mclk_i2s0_tx_mux", 0, + RV1126_CLKGATE_CON(9), 9, GFLAGS), + COMPOSITE(MCLK_I2S0_RX_DIV, "mclk_i2s0_rx_div", mux_cpll_gpll_p, 0, @@ -120254,7 +121892,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(MCLK_I2S0_RX_FRACDIV, "mclk_i2s0_rx_fracdiv", "mclk_i2s0_rx_div", CLK_SET_RATE_PARENT, + RV1126_CLKSEL_CON(29), 0, + RV1126_CLKGATE_CON(9), 8, GFLAGS, -+ &rv1126_i2s0_rx_fracmux, RV1126_FRAC_MAX_PRATE), ++ &rv1126_i2s0_rx_fracmux), + GATE(MCLK_I2S0_RX, "mclk_i2s0_rx", "mclk_i2s0_rx_mux", 0, + RV1126_CLKGATE_CON(9), 10, GFLAGS), + COMPOSITE_NODIV(MCLK_I2S0_TX_OUT2IO, "mclk_i2s0_tx_out2io", mux_i2s0_tx_out2io_p, CLK_SET_RATE_PARENT, @@ -120272,7 +121910,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(MCLK_I2S1_FRACDIV, "mclk_i2s1_fracdiv", "mclk_i2s1_div", CLK_SET_RATE_PARENT, + RV1126_CLKSEL_CON(32), 0, + RV1126_CLKGATE_CON(10), 2, GFLAGS, -+ &rv1126_i2s1_fracmux, RV1126_FRAC_MAX_PRATE), ++ &rv1126_i2s1_fracmux), + GATE(MCLK_I2S1, "mclk_i2s1", "mclk_i2s1_mux", 0, + RV1126_CLKGATE_CON(10), 3, GFLAGS), + COMPOSITE_NODIV(MCLK_I2S1_OUT2IO, "mclk_i2s1_out2io", mux_i2s1_out2io_p, CLK_SET_RATE_PARENT, @@ -120286,7 +121924,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(MCLK_I2S2_FRACDIV, "mclk_i2s2_fracdiv", "mclk_i2s2_div", CLK_SET_RATE_PARENT, + RV1126_CLKSEL_CON(34), 0, + RV1126_CLKGATE_CON(10), 7, GFLAGS, -+ &rv1126_i2s2_fracmux, RV1126_FRAC_MAX_PRATE), ++ &rv1126_i2s2_fracmux), + GATE(MCLK_I2S2, "mclk_i2s2", "mclk_i2s2_mux", 0, + RV1126_CLKGATE_CON(10), 8, GFLAGS), + COMPOSITE_NODIV(MCLK_I2S2_OUT2IO, "mclk_i2s2_out2io", mux_i2s2_out2io_p, CLK_SET_RATE_PARENT, @@ -120307,7 +121945,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(SCLK_AUDPWM_FRACDIV, "sclk_audpwm_fracdiv", "sclk_audpwm_div", CLK_SET_RATE_PARENT, + RV1126_CLKSEL_CON(37), 0, + RV1126_CLKGATE_CON(10), 14, GFLAGS, -+ &rv1126_audpwm_fracmux, RV1126_FRAC_MAX_PRATE), ++ &rv1126_audpwm_fracmux), + GATE(SCLK_AUDPWM, "sclk_audpwm", "mclk_audpwm_mux", 0, + RV1126_CLKGATE_CON(10), 15, GFLAGS), + @@ -120434,7 +122072,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(DCLK_VOP_FRACDIV, "dclk_vop_fracdiv", "dclk_vop_div", CLK_SET_RATE_PARENT, + RV1126_CLKSEL_CON(48), 0, + RV1126_CLKGATE_CON(14), 12, GFLAGS, -+ &rv1126_dclk_vop_fracmux, RV1126_FRAC_MAX_PRATE), ++ &rv1126_dclk_vop_fracmux), + GATE(DCLK_VOP, "dclk_vop", "dclk_vop_mux", 0, + RV1126_CLKGATE_CON(14), 13, GFLAGS), + GATE(PCLK_DSIHOST, "pclk_dsihost", "pclk_pdvo", 0, @@ -120451,10 +122089,13 @@ index 000000000000..09a376c51c0b + * Clock-Architecture Diagram 10 + */ + /* PD_VI */ -+ COMPOSITE_BROTHER(ACLK_PDVI_DIV, "aclk_pdvi_div", mux_cpll_gpll_hpll_p, 0, ++ COMPOSITE(ACLK_PDVI_DIV, "aclk_pdvi_div", mux_cpll_gpll_hpll_p, 0, + RV1126_CLKSEL_CON(49), 6, 2, MFLAGS, 0, 5, DFLAGS, -+ RV1126_CLKGATE_CON(15), 0, GFLAGS, -+ &rv1126_aclk_pdvi_np5), ++ RV1126_CLKGATE_CON(15), 0, GFLAGS), ++ COMPOSITE_HALFDIV_OFFSET(ACLK_PDVI_NP5, "aclk_pdvi_np5", mux_cpll_gpll_hpll_p, 0, ++ RV1126_CLKSEL_CON(49), 6, 2, MFLAGS, ++ RV1126_CLKSEL_CON(76), 0, 5, DFLAGS, ++ RV1126_CLKGATE_CON(16), 13, GFLAGS), + MUX(ACLK_PDVI, "aclk_pdvi", mux_aclk_pdvi_p, CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, + RV1126_CLKSEL_CON(76), 5, 1, MFLAGS), + COMPOSITE_NOMUX(HCLK_PDVI, "hclk_pdvi", "aclk_pdvi", 0, @@ -120467,10 +122108,13 @@ index 000000000000..09a376c51c0b + RV1126_CLKGATE_CON(15), 6, GFLAGS), + GATE(HCLK_ISP, "hclk_isp", "hclk_pdvi", 0, + RV1126_CLKGATE_CON(15), 7, GFLAGS), -+ COMPOSITE_BROTHER(CLK_ISP_DIV, "clk_isp_div", mux_gpll_cpll_hpll_p, 0, ++ COMPOSITE(CLK_ISP_DIV, "clk_isp_div", mux_gpll_cpll_hpll_p, 0, + RV1126_CLKSEL_CON(50), 6, 2, MFLAGS, 0, 5, DFLAGS, -+ RV1126_CLKGATE_CON(15), 8, GFLAGS, -+ &rv1126_clk_isp_np5), ++ RV1126_CLKGATE_CON(15), 8, GFLAGS), ++ COMPOSITE_HALFDIV_OFFSET(CLK_ISP_NP5, "clk_isp_np5", mux_gpll_cpll_hpll_p, 0, ++ RV1126_CLKSEL_CON(50), 6, 2, MFLAGS, ++ RV1126_CLKSEL_CON(76), 8, 5, DFLAGS, ++ RV1126_CLKGATE_CON(16), 14, GFLAGS), + MUX(CLK_ISP, "clk_isp", mux_clk_isp_p, CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, + RV1126_CLKSEL_CON(76), 13, 1, MFLAGS), + GATE(ACLK_CIF, "aclk_cif", "aclk_pdvi", 0, @@ -120486,7 +122130,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(CLK_CIF_OUT_FRACDIV, "clk_cif_out2io_fracdiv", "clk_cif_out2io_div", CLK_SET_RATE_PARENT, + RV1126_CLKSEL_CON(52), 0, + RV1126_CLKGATE_CON(15), 13, GFLAGS, -+ &rv1126_cif_out2io_fracmux, RV1126_FRAC_MAX_PRATE), ++ &rv1126_cif_out2io_fracmux), + GATE(CLK_CIF_OUT, "clk_cif_out2io", "clk_cif_out2io_mux", 0, + RV1126_CLKGATE_CON(15), 14, GFLAGS), + COMPOSITE(CLK_MIPICSI_OUT_DIV, "clk_mipicsi_out2io_div", mux_gpll_usb480m_p, 0, @@ -120495,7 +122139,7 @@ index 000000000000..09a376c51c0b + COMPOSITE_FRACMUX(CLK_MIPICSI_OUT_FRACDIV, "clk_mipicsi_out2io_fracdiv", "clk_mipicsi_out2io_div", CLK_SET_RATE_PARENT, + RV1126_CLKSEL_CON(74), 0, + RV1126_CLKGATE_CON(23), 6, GFLAGS, -+ &rv1126_mipicsi_out2io_fracmux, RV1126_CSIOUT_FRAC_MAX_PRATE), ++ &rv1126_mipicsi_out2io_fracmux), + GATE(CLK_MIPICSI_OUT, "clk_mipicsi_out2io", "clk_mipicsi_out2io_mux", 0, + RV1126_CLKGATE_CON(23), 7, GFLAGS), + GATE(PCLK_CSIHOST, "pclk_csihost", "pclk_pdvi", 0, @@ -120512,10 +122156,13 @@ index 000000000000..09a376c51c0b + * Clock-Architecture Diagram 11 + */ + /* PD_ISPP */ -+ COMPOSITE_BROTHER(ACLK_PDISPP_DIV, "aclk_pdispp_div", mux_cpll_gpll_hpll_p, 0, ++ COMPOSITE(ACLK_PDISPP_DIV, "aclk_pdispp_div", mux_cpll_gpll_hpll_p, 0, + RV1126_CLKSEL_CON(68), 6, 2, MFLAGS, 0, 5, DFLAGS, -+ RV1126_CLKGATE_CON(16), 0, GFLAGS, -+ &rv1126_aclk_pdispp_np5), ++ RV1126_CLKGATE_CON(16), 0, GFLAGS), ++ COMPOSITE_HALFDIV_OFFSET(ACLK_PDISPP_NP5, "aclk_pdispp_np5", mux_cpll_gpll_hpll_p, 0, ++ RV1126_CLKSEL_CON(68), 6, 2, MFLAGS, ++ RV1126_CLKSEL_CON(77), 0, 5, DFLAGS, ++ RV1126_CLKGATE_CON(16), 8, GFLAGS), + MUX(ACLK_PDISPP, "aclk_pdispp", mux_aclk_pdispp_p, CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, + RV1126_CLKSEL_CON(77), 5, 1, MFLAGS), + COMPOSITE_NOMUX(HCLK_PDISPP, "hclk_pdispp", "aclk_pdispp", 0, @@ -120525,10 +122172,13 @@ index 000000000000..09a376c51c0b + RV1126_CLKGATE_CON(16), 4, GFLAGS), + GATE(HCLK_ISPP, "hclk_ispp", "hclk_pdispp", 0, + RV1126_CLKGATE_CON(16), 5, GFLAGS), -+ COMPOSITE_BROTHER(CLK_ISPP_DIV, "clk_ispp_div", mux_cpll_gpll_hpll_p, 0, ++ COMPOSITE(CLK_ISPP_DIV, "clk_ispp_div", mux_cpll_gpll_hpll_p, 0, + RV1126_CLKSEL_CON(69), 6, 2, MFLAGS, 0, 5, DFLAGS, -+ RV1126_CLKGATE_CON(16), 6, GFLAGS, -+ &rv1126_clk_ispp_np5), ++ RV1126_CLKGATE_CON(16), 6, GFLAGS), ++ COMPOSITE_HALFDIV_OFFSET(CLK_ISPP_NP5, "clk_ispp_np5", mux_cpll_gpll_hpll_p, 0, ++ RV1126_CLKSEL_CON(69), 6, 2, MFLAGS, ++ RV1126_CLKSEL_CON(77), 8, 5, DFLAGS, ++ RV1126_CLKGATE_CON(16), 7, GFLAGS), + MUX(CLK_ISPP, "clk_ispp", mux_clk_ispp_p, CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, + RV1126_CLKSEL_CON(77), 13, 1, MFLAGS), + @@ -120663,10 +122313,12 @@ index 000000000000..09a376c51c0b + * Clock-Architecture Diagram 14 + */ + /* PD_NPU */ -+ COMPOSITE_BROTHER(ACLK_PDNPU_DIV, "aclk_pdnpu_div", mux_gpll_cpll_apll_hpll_p, 0, ++ COMPOSITE(ACLK_PDNPU_DIV, "aclk_pdnpu_div", mux_gpll_cpll_apll_hpll_p, 0, + RV1126_CLKSEL_CON(65), 8, 2, MFLAGS, 0, 4, DFLAGS, -+ RV1126_CLKGATE_CON(22), 0, GFLAGS, -+ &rv1126_aclk_pdnpu_npu5), ++ RV1126_CLKGATE_CON(22), 0, GFLAGS), ++ COMPOSITE_HALFDIV(ACLK_PDNPU_NP5, "aclk_pdnpu_np5", mux_gpll_cpll_apll_hpll_p, 0, ++ RV1126_CLKSEL_CON(65), 8, 2, MFLAGS, 4, 4, DFLAGS, ++ RV1126_CLKGATE_CON(22), 1, GFLAGS), + MUX(ACLK_PDNPU, "aclk_pdnpu", mux_aclk_pdnpu_p, CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, + RV1126_CLKSEL_CON(65), 12, 1, MFLAGS), + COMPOSITE_NOMUX(HCLK_PDNPU, "hclk_pdnpu", "gpll", 0, @@ -120679,10 +122331,12 @@ index 000000000000..09a376c51c0b + RV1126_CLKGATE_CON(22), 7, GFLAGS), + GATE(HCLK_NPU, "hclk_npu", "hclk_pdnpu", 0, + RV1126_CLKGATE_CON(22), 8, GFLAGS), -+ COMPOSITE_BROTHER(CLK_NPU_DIV, "clk_npu_div", mux_gpll_cpll_apll_hpll_p, 0, ++ COMPOSITE(CLK_NPU_DIV, "clk_npu_div", mux_gpll_cpll_apll_hpll_p, 0, + RV1126_CLKSEL_CON(67), 8, 2, MFLAGS, 0, 4, DFLAGS, -+ RV1126_CLKGATE_CON(22), 9, GFLAGS, -+ &rv1126_clk_npu_np5), ++ RV1126_CLKGATE_CON(22), 9, GFLAGS), ++ COMPOSITE_HALFDIV(CLK_NPU_NP5, "clk_npu_np5", mux_gpll_cpll_apll_hpll_p, 0, ++ RV1126_CLKSEL_CON(67), 8, 2, MFLAGS, 4, 4, DFLAGS, ++ RV1126_CLKGATE_CON(22), 10, GFLAGS), + MUX(CLK_CORE_NPU, "clk_core_npu", mux_clk_npu_p, CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, + RV1126_CLKSEL_CON(67), 12, 1, MFLAGS), + GATE(CLK_CORE_NPUPVTM, "clk_core_npupvtm", "clk_core_npu", CLK_IGNORE_UNUSED, @@ -121081,10 +122735,21 @@ index 000000000000..09a376c51c0b +MODULE_DESCRIPTION("Rockchip RV1126 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c -index b443169dd408..6c8e47067032 100644 +index b443169dd..ab6f1d865 100644 --- a/drivers/clk/rockchip/clk.c +++ b/drivers/clk/rockchip/clk.c -@@ -38,6 +38,7 @@ static struct clk *rockchip_clk_register_branch(const char *name, +@@ -24,6 +24,10 @@ + #include + #include "clk.h" + ++#ifdef MODULE ++static HLIST_HEAD(clk_ctx_list); ++#endif ++ + /** + * Register a clock branch. + * Most clock branches have a form like +@@ -38,6 +42,7 @@ static struct clk *rockchip_clk_register_branch(const char *name, const char *const *parent_names, u8 num_parents, void __iomem *base, int muxdiv_offset, u8 mux_shift, u8 mux_width, u8 mux_flags, @@ -121092,7 +122757,7 @@ index b443169dd408..6c8e47067032 100644 int div_offset, u8 div_shift, u8 div_width, u8 div_flags, struct clk_div_table *div_table, int gate_offset, u8 gate_shift, u8 gate_flags, unsigned long flags, -@@ -60,6 +61,7 @@ static struct clk *rockchip_clk_register_branch(const char *name, +@@ -60,6 +65,7 @@ static struct clk *rockchip_clk_register_branch(const char *name, mux->shift = mux_shift; mux->mask = BIT(mux_width) - 1; mux->flags = mux_flags; @@ -121100,16 +122765,20 @@ index b443169dd408..6c8e47067032 100644 mux->lock = lock; mux_ops = (mux_flags & CLK_MUX_READ_ONLY) ? &clk_mux_ro_ops : &clk_mux_ops; -@@ -182,12 +184,43 @@ static void rockchip_fractional_approximation(struct clk_hw *hw, - unsigned long p_rate, p_parent_rate; +@@ -183,11 +189,43 @@ static void rockchip_fractional_approximation(struct clk_hw *hw, struct clk_hw *p_parent; unsigned long scale; -+ u32 div; ++ if (rate == 0) { ++ pr_warn("%s p_rate(%ld), rate(%ld), maybe invalid frequency setting!\n", ++ clk_hw_get_name(hw), *parent_rate, rate); ++ *m = 0; ++ *n = 1; ++ return; ++ } ++ p_rate = clk_hw_get_rate(clk_hw_get_parent(hw)); -- if ((rate * 20 > p_rate) && (p_rate % rate != 0)) { -+ if (((rate * 20 > p_rate) && (p_rate % rate != 0)) || -+ (fd->max_prate && fd->max_prate < p_rate)) { + if ((rate * 20 > p_rate) && (p_rate % rate != 0)) { p_parent = clk_hw_get_parent(clk_hw_get_parent(hw)); - p_parent_rate = clk_hw_get_rate(p_parent); - *parent_rate = p_parent_rate; @@ -121118,11 +122787,6 @@ index b443169dd408..6c8e47067032 100644 + } else { + p_parent_rate = clk_hw_get_rate(p_parent); + *parent_rate = p_parent_rate; -+ if (fd->max_prate && p_parent_rate > fd->max_prate) { -+ div = DIV_ROUND_UP(p_parent_rate, -+ fd->max_prate); -+ *parent_rate = p_parent_rate / div; -+ } + } + + if (*parent_rate < rate * 20) { @@ -121147,24 +122811,21 @@ index b443169dd408..6c8e47067032 100644 } /* -@@ -210,7 +243,7 @@ static struct clk *rockchip_clk_register_frac_branch( - void __iomem *base, int muxdiv_offset, u8 div_flags, - int gate_offset, u8 gate_shift, u8 gate_flags, - unsigned long flags, struct rockchip_clk_branch *child, -- spinlock_t *lock) -+ unsigned long max_prate, spinlock_t *lock) - { - struct clk_hw *hw; - struct rockchip_clk_frac *frac; -@@ -251,6 +284,7 @@ static struct clk *rockchip_clk_register_frac_branch( - div->nmask = GENMASK(div->nwidth - 1, 0) << div->nshift; - div->lock = lock; - div->approximation = rockchip_fractional_approximation; -+ div->max_prate = max_prate; - div_ops = &clk_fractional_divider_ops; - - hw = clk_hw_register_composite(NULL, name, parent_names, num_parents, -@@ -278,6 +312,8 @@ static struct clk *rockchip_clk_register_frac_branch( +@@ -195,6 +233,13 @@ static void rockchip_fractional_approximation(struct clk_hw *hw, + * for m and n. In the result it will be the nearest rate left shifted + * by (scale - fd->nwidth) bits. + */ ++ if (*parent_rate == 0) { ++ pr_warn("%s p_rate(%ld), rate(%ld), maybe invalid frequency setting!\n", ++ clk_hw_get_name(hw), *parent_rate, rate); ++ *m = 0; ++ *n = 1; ++ return; ++ } + scale = fls_long(*parent_rate / rate - 1); + if (scale > fd->nwidth) + rate <<= scale - fd->nwidth; +@@ -278,6 +323,8 @@ static struct clk *rockchip_clk_register_frac_branch( frac_mux->shift = child->mux_shift; frac_mux->mask = BIT(child->mux_width) - 1; frac_mux->flags = child->mux_flags; @@ -121173,78 +122834,20 @@ index b443169dd408..6c8e47067032 100644 frac_mux->lock = lock; frac_mux->hw.init = &init; -@@ -360,6 +396,61 @@ static struct clk *rockchip_clk_register_factor_branch(const char *name, - return hw->clk; - } - -+static struct clk *rockchip_clk_register_composite_brother_branch( -+ struct rockchip_clk_provider *ctx, const char *name, -+ const char *const *parent_names, u8 num_parents, -+ void __iomem *base, int muxdiv_offset, u8 mux_shift, -+ u8 mux_width, u8 mux_flags, u32 *mux_table, -+ int div_offset, u8 div_shift, u8 div_width, u8 div_flags, -+ struct clk_div_table *div_table, int gate_offset, -+ u8 gate_shift, u8 gate_flags, unsigned long flags, -+ struct rockchip_clk_branch *brother, spinlock_t *lock) -+{ -+ struct clk *clk, *brother_clk; -+ struct clk_composite *composite, *brother_composite; -+ struct clk_hw *hw, *brother_hw; -+ -+ if (brother && brother->branch_type != branch_half_divider) { -+ pr_err("%s: composite brother for %s can only be a halfdiv\n", -+ __func__, name); -+ return ERR_PTR(-EINVAL); -+ } -+ -+ clk = rockchip_clk_register_branch(name, parent_names, num_parents, -+ base, muxdiv_offset, mux_shift, -+ mux_width, mux_flags, mux_table, -+ div_offset, div_shift, div_width, -+ div_flags, div_table, -+ gate_offset, gate_shift, gate_flags, -+ flags, lock); -+ if (IS_ERR(clk)) -+ return clk; -+ -+ brother_clk = rockchip_clk_register_halfdiv(brother->name, -+ brother->parent_names, brother->num_parents, -+ base, brother->muxdiv_offset, -+ brother->mux_shift, brother->mux_width, -+ brother->mux_flags, brother->div_offset, -+ brother->div_shift, brother->div_width, -+ brother->div_flags, brother->gate_offset, -+ brother->gate_shift, brother->gate_flags, -+ flags, lock); -+ if (IS_ERR(brother_clk)) -+ return brother_clk; -+ rockchip_clk_add_lookup(ctx, brother_clk, brother->id); -+ -+ hw = __clk_get_hw(clk); -+ brother_hw = __clk_get_hw(brother_clk); -+ if (hw && brother_hw) { -+ composite = to_clk_composite(hw); -+ brother_composite = to_clk_composite(brother_hw); -+ composite->brother_hw = brother_hw; -+ brother_composite->brother_hw = hw; -+ } -+ -+ return clk; -+} -+ - struct rockchip_clk_provider *rockchip_clk_init(struct device_node *np, - void __iomem *base, - unsigned long nr_clks) -@@ -387,6 +478,8 @@ struct rockchip_clk_provider *rockchip_clk_init(struct device_node *np, +@@ -387,6 +434,12 @@ struct rockchip_clk_provider *rockchip_clk_init(struct device_node *np, ctx->grf = syscon_regmap_lookup_by_phandle(ctx->cru_node, "rockchip,grf"); + ctx->pmugrf = syscon_regmap_lookup_by_phandle(ctx->cru_node, + "rockchip,pmugrf"); ++ ++#ifdef MODULE ++ hlist_add_head(&ctx->list_node, &clk_ctx_list); ++#endif return ctx; -@@ -452,11 +545,22 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx, +@@ -452,11 +505,22 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx, /* catch simple muxes */ switch (list->branch_type) { case branch_mux: @@ -121272,7 +122875,7 @@ index b443169dd408..6c8e47067032 100644 break; case branch_muxgrf: clk = rockchip_clk_register_muxgrf(list->name, -@@ -465,6 +569,13 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx, +@@ -465,6 +529,13 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx, list->mux_shift, list->mux_width, list->mux_flags); break; @@ -121286,15 +122889,7 @@ index b443169dd408..6c8e47067032 100644 case branch_divider: if (list->div_table) clk = clk_register_divider_table(NULL, -@@ -488,17 +599,18 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx, - list->div_flags, - list->gate_offset, list->gate_shift, - list->gate_flags, flags, list->child, -- &ctx->lock); -+ list->max_prate, &ctx->lock); - break; - case branch_half_divider: - clk = rockchip_clk_register_halfdiv(list->name, +@@ -495,14 +566,23 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx, list->parent_names, list->num_parents, ctx->reg_base, list->muxdiv_offset, list->mux_shift, list->mux_width, @@ -121310,7 +122905,19 @@ index b443169dd408..6c8e47067032 100644 break; case branch_gate: flags |= CLK_SET_RATE_PARENT; -@@ -514,11 +626,25 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx, + ++ clk = clk_register_gate(NULL, list->name, ++ list->parent_names[0], flags, ++ ctx->reg_base + list->gate_offset, ++ list->gate_shift, list->gate_flags, &ctx->lock); ++ break; ++ case branch_gate_no_set_rate: ++ flags &= ~CLK_SET_RATE_PARENT; ++ + clk = clk_register_gate(NULL, list->name, + list->parent_names[0], flags, + ctx->reg_base + list->gate_offset, +@@ -514,7 +594,8 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx, ctx->reg_base, list->muxdiv_offset, list->mux_shift, list->mux_width, list->mux_flags, @@ -121320,43 +122927,30 @@ index b443169dd408..6c8e47067032 100644 list->div_flags, list->div_table, list->gate_offset, list->gate_shift, list->gate_flags, flags, &ctx->lock); +@@ -528,11 +609,13 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx, + ); break; -+ case branch_composite_brother: -+ clk = rockchip_clk_register_composite_brother_branch( -+ ctx, list->name, list->parent_names, -+ list->num_parents, ctx->reg_base, -+ list->muxdiv_offset, list->mux_shift, -+ list->mux_width, list->mux_flags, -+ list->mux_table, list->div_offset, -+ list->div_shift, list->div_width, -+ list->div_flags, list->div_table, -+ list->gate_offset, list->gate_shift, -+ list->gate_flags, flags, list->child, -+ &ctx->lock); -+ break; - case branch_mmc: - clk = rockchip_clk_register_mmc( - list->name, -@@ -549,7 +675,17 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx, + case branch_inverter: ++#ifdef CONFIG_ROCKCHIP_CLK_INV + clk = rockchip_clk_register_inverter( + list->name, list->parent_names, + list->num_parents, + ctx->reg_base + list->muxdiv_offset, + list->div_shift, list->div_flags, &ctx->lock); ++#endif + break; + case branch_factor: + clk = rockchip_clk_register_factor_branch( +@@ -549,7 +632,7 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx, list->muxdiv_offset, list->mux_shift, list->mux_width, list->div_shift, list->div_width, list->div_flags, - ctx->reg_base, &ctx->lock); + ctx->reg_base); -+ break; -+ case branch_dclk_divider: -+ clk = rockchip_clk_register_dclk_branch(list->name, -+ list->parent_names, list->num_parents, -+ ctx->reg_base, list->muxdiv_offset, list->mux_shift, -+ list->mux_width, list->mux_flags, -+ list->div_offset, list->div_shift, list->div_width, -+ list->div_flags, list->div_table, -+ list->gate_offset, list->gate_shift, -+ list->gate_flags, flags, list->max_prate, &ctx->lock); break; } -@@ -573,15 +709,17 @@ EXPORT_SYMBOL_GPL(rockchip_clk_register_branches); +@@ -573,15 +656,17 @@ EXPORT_SYMBOL_GPL(rockchip_clk_register_branches); void rockchip_clk_register_armclk(struct rockchip_clk_provider *ctx, unsigned int lookup_id, @@ -121376,32 +122970,90 @@ index b443169dd408..6c8e47067032 100644 reg_data, rates, nrates, ctx->reg_base, &ctx->lock); if (IS_ERR(clk)) { -@@ -594,20 +732,20 @@ void rockchip_clk_register_armclk(struct rockchip_clk_provider *ctx, +@@ -594,20 +679,81 @@ void rockchip_clk_register_armclk(struct rockchip_clk_provider *ctx, } EXPORT_SYMBOL_GPL(rockchip_clk_register_armclk); -void rockchip_clk_protect_critical(const char *const clocks[], - int nclocks) --{ ++void rockchip_clk_register_armclk_v2(struct rockchip_clk_provider *ctx, ++ struct rockchip_clk_branch *list, ++ const struct rockchip_cpuclk_rate_table *rates, ++ int nrates) + { - int i; -- ++ struct clk *clk; + - /* Protect the clocks that needs to stay on */ - for (i = 0; i < nclocks; i++) { - struct clk *clk = __clk_lookup(clocks[i]); -+void (*rk_dump_cru)(void); -+EXPORT_SYMBOL(rk_dump_cru); ++ clk = rockchip_clk_register_cpuclk_v2(list->name, list->parent_names, ++ list->num_parents, ctx->reg_base, ++ list->muxdiv_offset, list->mux_shift, ++ list->mux_width, list->mux_flags, ++ list->div_offset, list->div_shift, ++ list->div_width, list->div_flags, ++ list->flags, &ctx->lock, rates, nrates); ++ if (IS_ERR(clk)) { ++ pr_err("%s: failed to register clock %s: %ld\n", ++ __func__, list->name, PTR_ERR(clk)); ++ return; ++ } - if (clk) - clk_prepare_enable(clk); -- } ++ rockchip_clk_add_lookup(ctx, clk, list->id); ++} ++EXPORT_SYMBOL_GPL(rockchip_clk_register_armclk_v2); ++ ++void (*rk_dump_cru)(void); ++EXPORT_SYMBOL(rk_dump_cru); ++ ++#ifdef CONFIG_ROCKCHIP_CLK_PASS ++void rockchip_clk_protect_init(struct device_node *np) ++{ ++ struct of_phandle_args clkspec; ++ struct clk *clk; ++ int ret, index, cnt; ++ ++ cnt = of_count_phandle_with_args(np, "rockchip,clock-protect", ++ "#clock-cells"); ++ if (cnt == -EINVAL) ++ pr_err("clk: invalid value of clock-protect property at %pOF\n", ++ np); ++ for (index = 0; index < cnt; index++) { ++ ret = of_parse_phandle_with_args(np, "rockchip,clock-protect", ++ "#clock-cells", index, &clkspec); ++ if (ret < 0) { ++ /* skip empty (null) phandles */ ++ if (ret == -ENOENT) ++ continue; ++ else ++ return; ++ } ++ clk = of_clk_get_from_provider(&clkspec); ++ if (IS_ERR(clk)) { ++ pr_err("clk: couldn't get clock %d for %pOF\n", ++ index, np); ++ continue; ++ } ++ ++ clk_prepare_enable(clk); ++ clk_rate_exclusive_get(clk); ++ clk_rate_exclusive_get(clk); + } + } +-EXPORT_SYMBOL_GPL(rockchip_clk_protect_critical); ++EXPORT_SYMBOL_GPL(rockchip_clk_protect_init); ++#endif ++ +static int rk_clk_panic(struct notifier_block *this, + unsigned long ev, void *ptr) +{ + if (rk_dump_cru) + rk_dump_cru(); + return NOTIFY_DONE; - } --EXPORT_SYMBOL_GPL(rockchip_clk_protect_critical); ++} + +static struct notifier_block rk_clk_panic_block = { + .notifier_call = rk_clk_panic, @@ -121409,7 +123061,7 @@ index b443169dd408..6c8e47067032 100644 static void __iomem *rst_base; static unsigned int reg_restart; -@@ -641,5 +779,7 @@ rockchip_register_restart_notifier(struct rockchip_clk_provider *ctx, +@@ -641,5 +787,86 @@ rockchip_register_restart_notifier(struct rockchip_clk_provider *ctx, if (ret) pr_err("%s: cannot register restart handler, %d\n", __func__, ret); @@ -121417,8 +123069,87 @@ index b443169dd408..6c8e47067032 100644 + &rk_clk_panic_block); } EXPORT_SYMBOL_GPL(rockchip_register_restart_notifier); ++ ++#ifdef MODULE ++static struct clk **protect_clocks; ++static unsigned int protect_nclocks; ++ ++int rockchip_clk_protect(struct rockchip_clk_provider *ctx, ++ unsigned int *clocks, unsigned int nclocks) ++{ ++ struct clk *clk = NULL; ++ int i = 0; ++ ++ if (protect_clocks || !ctx || !clocks || !ctx->clk_data.clks) ++ return 0; ++ ++ protect_clocks = kcalloc(nclocks, sizeof(void *), GFP_KERNEL); ++ if (!protect_clocks) ++ return -ENOMEM; ++ ++ for (i = 0; i < nclocks; i++) { ++ if (clocks[i] >= ctx->clk_data.clk_num) { ++ pr_err("%s: invalid clock id %u\n", __func__, clocks[i]); ++ continue; ++ } ++ clk = ctx->clk_data.clks[clocks[i]]; ++ if (clk) { ++ clk_prepare_enable(clk); ++ protect_clocks[i] = clk; ++ } ++ } ++ protect_nclocks = nclocks; ++ ++ return 0; ++} ++EXPORT_SYMBOL_GPL(rockchip_clk_protect); ++ ++void rockchip_clk_unprotect(void) ++{ ++ int i = 0; ++ ++ if (!protect_clocks || !protect_nclocks) ++ return; ++ ++ for (i = 0; i < protect_nclocks; i++) { ++ if (protect_clocks[i]) ++ clk_disable_unprepare(protect_clocks[i]); ++ } ++ protect_nclocks = 0; ++ kfree(protect_clocks); ++ protect_clocks = NULL; ++ ++} ++EXPORT_SYMBOL_GPL(rockchip_clk_unprotect); ++ ++void rockchip_clk_disable_unused(void) ++{ ++ struct rockchip_clk_provider *ctx; ++ struct clk *clk; ++ struct clk_hw *hw; ++ int i = 0, flag = 0; ++ ++ hlist_for_each_entry(ctx, &clk_ctx_list, list_node) { ++ for (i = 0; i < ctx->clk_data.clk_num; i++) { ++ clk = ctx->clk_data.clks[i]; ++ if (clk && !IS_ERR(clk)) { ++ hw = __clk_get_hw(clk); ++ if (hw) ++ flag = clk_hw_get_flags(hw); ++ if (flag & CLK_IGNORE_UNUSED) ++ continue; ++ if (flag & CLK_IS_CRITICAL) ++ continue; ++ clk_prepare_enable(clk); ++ clk_disable_unprepare(clk); ++ } ++ } ++ } ++} ++EXPORT_SYMBOL_GPL(rockchip_clk_disable_unused); ++#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h -index 2271a84124b0..509087750eeb 100644 +index 2271a8412..3d2b8d96a 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h @@ -37,12 +37,25 @@ struct clk; @@ -121447,7 +123178,72 @@ index 2271a84124b0..509087750eeb 100644 #define BOOST_BUSY_STATE BIT(8) #define PX30_PLL_CON(x) ((x) * 0x4) -@@ -79,6 +92,51 @@ struct clk; +@@ -65,6 +78,64 @@ struct clk; + #define PX30_PMU_CLKGATE_CON(x) ((x) * 0x4 + 0x80) + #define PX30_PMU_MODE 0x0020 + ++#define RV1106_TOPCRU_BASE 0x10000 ++#define RV1106_PERICRU_BASE 0x12000 ++#define RV1106_VICRU_BASE 0x14000 ++#define RV1106_NPUCRU_BASE 0x16000 ++#define RV1106_CORECRU_BASE 0x18000 ++#define RV1106_VEPUCRU_BASE 0x1A000 ++#define RV1106_VOCRU_BASE 0x1C000 ++#define RV1106_DDRCRU_BASE 0x1E000 ++#define RV1106_SUBDDRCRU_BASE 0x1F000 ++ ++#define RV1106_VI_GRF_BASE 0x50000 ++#define RV1106_VO_GRF_BASE 0x60000 ++ ++#define RV1106_PMUCLKSEL_CON(x) ((x) * 0x4 + 0x300) ++#define RV1106_PMUCLKGATE_CON(x) ((x) * 0x4 + 0x800) ++#define RV1106_PMUSOFTRST_CON(x) ((x) * 0x4 + 0xa00) ++#define RV1106_PLL_CON(x) ((x) * 0x4 + RV1106_TOPCRU_BASE) ++#define RV1106_MODE_CON (0x280 + RV1106_TOPCRU_BASE) ++#define RV1106_CLKSEL_CON(x) ((x) * 0x4 + 0x300 + RV1106_TOPCRU_BASE) ++#define RV1106_CLKGATE_CON(x) ((x) * 0x4 + 0x800 + RV1106_TOPCRU_BASE) ++#define RV1106_SOFTRST_CON(x) ((x) * 0x4 + 0xa00 + RV1106_TOPCRU_BASE) ++#define RV1106_GLB_SRST_FST (0xc08 + RV1106_TOPCRU_BASE) ++#define RV1106_GLB_SRST_SND (0xc0c + RV1106_TOPCRU_BASE) ++#define RV1106_SDIO_CON0 (0x1c + RV1106_VO_GRF_BASE) ++#define RV1106_SDIO_CON1 (0x20 + RV1106_VO_GRF_BASE) ++#define RV1106_SDMMC_CON0 (0x4 + RV1106_VI_GRF_BASE) ++#define RV1106_SDMMC_CON1 (0x8 + RV1106_VI_GRF_BASE) ++#define RV1106_EMMC_CON0 (0x20) ++#define RV1106_EMMC_CON1 (0x24) ++#define RV1106_PERICLKSEL_CON(x) ((x) * 0x4 + 0x300 + RV1106_PERICRU_BASE) ++#define RV1106_PERICLKGATE_CON(x) ((x) * 0x4 + 0x800 + RV1106_PERICRU_BASE) ++#define RV1106_PERISOFTRST_CON(x) ((x) * 0x4 + 0xa00 + RV1106_PERICRU_BASE) ++#define RV1106_VICLKSEL_CON(x) ((x) * 0x4 + 0x300 + RV1106_VICRU_BASE) ++#define RV1106_VICLKGATE_CON(x) ((x) * 0x4 + 0x800 + RV1106_VICRU_BASE) ++#define RV1106_VISOFTRST_CON(x) ((x) * 0x4 + 0xa00 + RV1106_VICRU_BASE) ++#define RV1106_VICLKSEL_CON(x) ((x) * 0x4 + 0x300 + RV1106_VICRU_BASE) ++#define RV1106_VICLKGATE_CON(x) ((x) * 0x4 + 0x800 + RV1106_VICRU_BASE) ++#define RV1106_VISOFTRST_CON(x) ((x) * 0x4 + 0xa00 + RV1106_VICRU_BASE) ++#define RV1106_NPUCLKSEL_CON(x) ((x) * 0x4 + 0x300 + RV1106_NPUCRU_BASE) ++#define RV1106_NPUCLKGATE_CON(x) ((x) * 0x4 + 0x800 + RV1106_NPUCRU_BASE) ++#define RV1106_NPUSOFTRST_CON(x) ((x) * 0x4 + 0xa00 + RV1106_NPUCRU_BASE) ++#define RV1106_CORECLKSEL_CON(x) ((x) * 0x4 + 0x300 + RV1106_CORECRU_BASE) ++#define RV1106_CORECLKGATE_CON(x) ((x) * 0x4 + 0x800 + RV1106_CORECRU_BASE) ++#define RV1106_CORESOFTRST_CON(x) ((x) * 0x4 + 0xa00 + RV1106_CORECRU_BASE) ++#define RV1106_VEPUCLKSEL_CON(x) ((x) * 0x4 + 0x300 + RV1106_VEPUCRU_BASE) ++#define RV1106_VEPUCLKGATE_CON(x) ((x) * 0x4 + 0x800 + RV1106_VEPUCRU_BASE) ++#define RV1106_VEPUSOFTRST_CON(x) ((x) * 0x4 + 0xa00 + RV1106_VEPUCRU_BASE) ++#define RV1106_VOCLKSEL_CON(x) ((x) * 0x4 + 0x300 + RV1106_VOCRU_BASE) ++#define RV1106_VOCLKGATE_CON(x) ((x) * 0x4 + 0x800 + RV1106_VOCRU_BASE) ++#define RV1106_VOSOFTRST_CON(x) ((x) * 0x4 + 0xa00 + RV1106_VOCRU_BASE) ++#define RV1106_DDRCLKSEL_CON(x) ((x) * 0x4 + 0x300 + RV1106_DDRCRU_BASE) ++#define RV1106_DDRCLKGATE_CON(x) ((x) * 0x4 + 0x800 + RV1106_DDRCRU_BASE) ++#define RV1106_DDRSOFTRST_CON(x) ((x) * 0x4 + 0xa00 + RV1106_DDRCRU_BASE) ++#define RV1106_SUBDDRCLKSEL_CON(x) ((x) * 0x4 + 0x300 + RV1106_SUBDDRCRU_BASE) ++#define RV1106_SUBDDRCLKGATE_CON(x) ((x) * 0x4 + 0x800 + RV1106_SUBDDRCRU_BASE) ++#define RV1106_SUBDDRSOFTRST_CON(x) ((x) * 0x4 + 0xa00 + RV1106_SUBDDRCRU_BASE) ++#define RV1106_SUBDDRMODE_CON (0x280 + RV1106_SUBDDRCRU_BASE) ++ + #define RV1108_PLL_CON(x) ((x) * 0x4) + #define RV1108_CLKSEL_CON(x) ((x) * 0x4 + 0x60) + #define RV1108_CLKGATE_CON(x) ((x) * 0x4 + 0x120) +@@ -79,6 +150,51 @@ struct clk; #define RV1108_EMMC_CON0 0x1e8 #define RV1108_EMMC_CON1 0x1ec @@ -121499,10 +123295,77 @@ index 2271a84124b0..509087750eeb 100644 #define RK2928_PLL_CON(x) ((x) * 0x4) #define RK2928_MODE_CON 0x40 #define RK2928_CLKSEL_CON(x) ((x) * 0x4 + 0x44) -@@ -188,6 +246,34 @@ struct clk; +@@ -188,11 +304,153 @@ struct clk; #define RK3399_PMU_CLKGATE_CON(x) ((x) * 0x4 + 0x100) #define RK3399_PMU_SOFTRST_CON(x) ((x) * 0x4 + 0x110) ++#define RK3528_PMU_CRU_BASE 0x10000 ++#define RK3528_PCIE_CRU_BASE 0x20000 ++#define RK3528_DDRPHY_CRU_BASE 0x28000 ++#define RK3528_VPU_GRF_BASE 0x40000 ++#define RK3528_VO_GRF_BASE 0x60000 ++#define RK3528_SDMMC_CON0 (RK3528_VO_GRF_BASE + 0x24) ++#define RK3528_SDMMC_CON1 (RK3528_VO_GRF_BASE + 0x28) ++#define RK3528_SDIO0_CON0 (RK3528_VPU_GRF_BASE + 0x4) ++#define RK3528_SDIO0_CON1 (RK3528_VPU_GRF_BASE + 0x8) ++#define RK3528_SDIO1_CON0 (RK3528_VPU_GRF_BASE + 0xc) ++#define RK3528_SDIO1_CON1 (RK3528_VPU_GRF_BASE + 0x10) ++#define RK3528_PLL_CON(x) RK2928_PLL_CON(x) ++#define RK3528_PCIE_PLL_CON(x) ((x) * 0x4 + RK3528_PCIE_CRU_BASE) ++#define RK3528_DDRPHY_PLL_CON(x) ((x) * 0x4 + RK3528_DDRPHY_CRU_BASE) ++#define RK3528_MODE_CON 0x280 ++#define RK3528_CLKSEL_CON(x) ((x) * 0x4 + 0x300) ++#define RK3528_CLKGATE_CON(x) ((x) * 0x4 + 0x800) ++#define RK3528_SOFTRST_CON(x) ((x) * 0x4 + 0xa00) ++#define RK3528_PMU_CLKSEL_CON(x) ((x) * 0x4 + 0x300 + RK3528_PMU_CRU_BASE) ++#define RK3528_PMU_CLKGATE_CON(x) ((x) * 0x4 + 0x800 + RK3528_PMU_CRU_BASE) ++#define RK3528_PCIE_CLKSEL_CON(x) ((x) * 0x4 + 0x300 + RK3528_PCIE_CRU_BASE) ++#define RK3528_PCIE_CLKGATE_CON(x) ((x) * 0x4 + 0x800 + RK3528_PCIE_CRU_BASE) ++#define RK3528_DDRPHY_CLKGATE_CON(x) ((x) * 0x4 + 0x800 + RK3528_DDRPHY_CRU_BASE) ++#define RK3528_DDRPHY_MODE_CON (0x280 + RK3528_DDRPHY_CRU_BASE) ++#define RK3528_GLB_CNT_TH 0xc00 ++#define RK3528_GLB_SRST_FST 0xc08 ++#define RK3528_GLB_SRST_SND 0xc0c ++ ++#define RK3562_PMU0_CRU_BASE 0x10000 ++#define RK3562_PMU1_CRU_BASE 0x18000 ++#define RK3562_DDR_CRU_BASE 0x20000 ++#define RK3562_SUBDDR_CRU_BASE 0x28000 ++#define RK3562_PERI_CRU_BASE 0x30000 ++ ++#define RK3562_PLL_CON(x) RK2928_PLL_CON(x) ++#define RK3562_PMU1_PLL_CON(x) ((x) * 0x4 + RK3562_PMU1_CRU_BASE + 0x40) ++#define RK3562_SUBDDR_PLL_CON(x) ((x) * 0x4 + RK3562_SUBDDR_CRU_BASE + 0x20) ++#define RK3562_MODE_CON 0x600 ++#define RK3562_PMU1_MODE_CON (RK3562_PMU1_CRU_BASE + 0x380) ++#define RK3562_SUBDDR_MODE_CON (RK3562_SUBDDR_CRU_BASE + 0x380) ++#define RK3562_CLKSEL_CON(x) ((x) * 0x4 + 0x100) ++#define RK3562_CLKGATE_CON(x) ((x) * 0x4 + 0x300) ++#define RK3562_SOFTRST_CON(x) ((x) * 0x4 + 0x400) ++#define RK3562_DDR_CLKSEL_CON(x) ((x) * 0x4 + RK3562_DDR_CRU_BASE + 0x100) ++#define RK3562_DDR_CLKGATE_CON(x) ((x) * 0x4 + RK3562_DDR_CRU_BASE + 0x180) ++#define RK3562_DDR_SOFTRST_CON(x) ((x) * 0x4 + RK3562_DDR_CRU_BASE + 0x200) ++#define RK3562_SUBDDR_CLKSEL_CON(x) ((x) * 0x4 + RK3562_SUBDDR_CRU_BASE + 0x100) ++#define RK3562_SUBDDR_CLKGATE_CON(x) ((x) * 0x4 + RK3562_SUBDDR_CRU_BASE + 0x180) ++#define RK3562_SUBDDR_SOFTRST_CON(x) ((x) * 0x4 + RK3562_SUBDDR_CRU_BASE + 0x200) ++#define RK3562_PERI_CLKSEL_CON(x) ((x) * 0x4 + RK3562_PERI_CRU_BASE + 0x100) ++#define RK3562_PERI_CLKGATE_CON(x) ((x) * 0x4 + RK3562_PERI_CRU_BASE + 0x300) ++#define RK3562_PERI_SOFTRST_CON(x) ((x) * 0x4 + RK3562_PERI_CRU_BASE + 0x400) ++#define RK3562_PMU0_CLKSEL_CON(x) ((x) * 0x4 + RK3562_PMU0_CRU_BASE + 0x100) ++#define RK3562_PMU0_CLKGATE_CON(x) ((x) * 0x4 + RK3562_PMU0_CRU_BASE + 0x180) ++#define RK3562_PMU0_SOFTRST_CON(x) ((x) * 0x4 + RK3562_PMU0_CRU_BASE + 0x200) ++#define RK3562_PMU1_CLKSEL_CON(x) ((x) * 0x4 + RK3562_PMU1_CRU_BASE + 0x100) ++#define RK3562_PMU1_CLKGATE_CON(x) ((x) * 0x4 + RK3562_PMU1_CRU_BASE + 0x180) ++#define RK3562_PMU1_SOFTRST_CON(x) ((x) * 0x4 + RK3562_PMU1_CRU_BASE + 0x200) ++#define RK3562_GLB_SRST_FST 0x614 ++#define RK3562_GLB_SRST_SND 0x618 ++#define RK3562_GLB_RST_CON 0x61c ++#define RK3562_GLB_RST_ST 0x620 ++#define RK3562_SDMMC0_CON0 0x624 ++#define RK3562_SDMMC0_CON1 0x628 ++#define RK3562_SDMMC1_CON0 0x62c ++#define RK3562_SDMMC1_CON1 0x630 ++ +#define RK3568_PLL_CON(x) RK2928_PLL_CON(x) +#define RK3568_MODE_CON0 0xc0 +#define RK3568_MISC_CON0 0xc4 @@ -121530,15 +123393,91 @@ index 2271a84124b0..509087750eeb 100644 +#define RK3568_PMU_CLKSEL_CON(x) ((x) * 0x4 + 0x100) +#define RK3568_PMU_CLKGATE_CON(x) ((x) * 0x4 + 0x180) +#define RK3568_PMU_SOFTRST_CON(x) ((x) * 0x4 + 0x200) ++ ++#define RK3588_PHP_CRU_BASE 0x8000 ++#define RK3588_PMU_CRU_BASE 0x30000 ++#define RK3588_BIGCORE0_CRU_BASE 0x50000 ++#define RK3588_BIGCORE1_CRU_BASE 0x52000 ++#define RK3588_DSU_CRU_BASE 0x58000 ++ ++#define RK3588_PLL_CON(x) RK2928_PLL_CON(x) ++#define RK3588_MODE_CON0 0x280 ++#define RK3588_B0_PLL_MODE_CON0 (RK3588_BIGCORE0_CRU_BASE + 0x280) ++#define RK3588_B1_PLL_MODE_CON0 (RK3588_BIGCORE1_CRU_BASE + 0x280) ++#define RK3588_LPLL_MODE_CON0 (RK3588_DSU_CRU_BASE + 0x280) ++#define RK3588_CLKSEL_CON(x) ((x) * 0x4 + 0x300) ++#define RK3588_CLKGATE_CON(x) ((x) * 0x4 + 0x800) ++#define RK3588_SOFTRST_CON(x) ((x) * 0x4 + 0xa00) ++#define RK3588_GLB_CNT_TH 0xc00 ++#define RK3588_GLB_SRST_FST 0xc08 ++#define RK3588_GLB_SRST_SND 0xc0c ++#define RK3588_GLB_RST_CON 0xc10 ++#define RK3588_GLB_RST_ST 0xc04 ++#define RK3588_SDIO_CON0 0xC24 ++#define RK3588_SDIO_CON1 0xC28 ++#define RK3588_SDMMC_CON0 0xC30 ++#define RK3588_SDMMC_CON1 0xC34 ++ ++#define RK3588_PHP_CLKGATE_CON(x) ((x) * 0x4 + RK3588_PHP_CRU_BASE + 0x800) ++#define RK3588_PHP_SOFTRST_CON(x) ((x) * 0x4 + RK3588_PHP_CRU_BASE + 0xa00) ++ ++#define RK3588_PMU_PLL_CON(x) ((x) * 0x4 + RK3588_PHP_CRU_BASE) ++#define RK3588_PMU_CLKSEL_CON(x) ((x) * 0x4 + RK3588_PMU_CRU_BASE + 0x300) ++#define RK3588_PMU_CLKGATE_CON(x) ((x) * 0x4 + RK3588_PMU_CRU_BASE + 0x800) ++#define RK3588_PMU_SOFTRST_CON(x) ((x) * 0x4 + RK3588_PMU_CRU_BASE + 0xa00) ++ ++#define RK3588_B0_PLL_CON(x) ((x) * 0x4 + RK3588_BIGCORE0_CRU_BASE) ++#define RK3588_BIGCORE0_CLKSEL_CON(x) ((x) * 0x4 + RK3588_BIGCORE0_CRU_BASE + 0x300) ++#define RK3588_BIGCORE0_CLKGATE_CON(x) ((x) * 0x4 + RK3588_BIGCORE0_CRU_BASE + 0x800) ++#define RK3588_BIGCORE0_SOFTRST_CON(x) ((x) * 0x4 + RK3588_BIGCORE0_CRU_BASE + 0xa00) ++#define RK3588_B1_PLL_CON(x) ((x) * 0x4 + RK3588_BIGCORE1_CRU_BASE) ++#define RK3588_BIGCORE1_CLKSEL_CON(x) ((x) * 0x4 + RK3588_BIGCORE1_CRU_BASE + 0x300) ++#define RK3588_BIGCORE1_CLKGATE_CON(x) ((x) * 0x4 + RK3588_BIGCORE1_CRU_BASE + 0x800) ++#define RK3588_BIGCORE1_SOFTRST_CON(x) ((x) * 0x4 + RK3588_BIGCORE1_CRU_BASE + 0xa00) ++#define RK3588_LPLL_CON(x) ((x) * 0x4 + RK3588_DSU_CRU_BASE) ++#define RK3588_DSU_CLKSEL_CON(x) ((x) * 0x4 + RK3588_DSU_CRU_BASE + 0x300) ++#define RK3588_DSU_CLKGATE_CON(x) ((x) * 0x4 + RK3588_DSU_CRU_BASE + 0x800) ++#define RK3588_DSU_SOFTRST_CON(x) ((x) * 0x4 + RK3588_DSU_CRU_BASE + 0xa00) + enum rockchip_pll_type { pll_rk3036, pll_rk3066, -@@ -238,22 +324,30 @@ struct rockchip_clk_provider { + pll_rk3328, + pll_rk3399, ++ pll_rk3588, ++ pll_rk3588_core, + }; + + #define RK3036_PLL_RATE(_rate, _refdiv, _fbdiv, _postdiv1, \ +@@ -225,12 +483,22 @@ enum rockchip_pll_type { + .nb = _nb, \ + } + ++#define RK3588_PLL_RATE(_rate, _p, _m, _s, _k) \ ++{ \ ++ .rate = _rate##U, \ ++ .p = _p, \ ++ .m = _m, \ ++ .s = _s, \ ++ .k = _k, \ ++} ++ + /** + * struct rockchip_clk_provider - information about clock provider + * @reg_base: virtual address for the register base. + * @clk_data: holds clock related data like clk* and number of clocks. + * @cru_node: device-node of the clock-provider + * @grf: regmap of the general-register-files syscon ++ * @list_node: node in the global ctx list + * @lock: maintains exclusion between callbacks for a given clock-provider. + */ + struct rockchip_clk_provider { +@@ -238,22 +506,38 @@ struct rockchip_clk_provider { struct clk_onecell_data clk_data; struct device_node *cru_node; struct regmap *grf; + struct regmap *pmugrf; ++ struct hlist_node list_node; spinlock_t lock; }; @@ -121572,11 +123511,32 @@ index 2271a84124b0..509087750eeb 100644 + unsigned int dsmpd; + unsigned int frac; + }; ++ struct { ++ /* for RK3588 */ ++ unsigned int m; ++ unsigned int p; ++ unsigned int s; ++ unsigned int k; ++ }; + }; }; /** -@@ -317,12 +411,21 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx, +@@ -290,7 +574,13 @@ struct rockchip_pll_clock { + struct rockchip_pll_rate_table *rate_table; + }; + ++/* ++ * PLL flags ++ */ + #define ROCKCHIP_PLL_SYNC_RATE BIT(0) ++/* normal mode only. now only for pll_rk3036, pll_rk3328 type */ ++#define ROCKCHIP_PLL_FIXED_MODE BIT(1) ++#define ROCKCHIP_PLL_ALLOW_POWER_DOWN BIT(2) + + #define PLL(_type, _id, _name, _pnames, _flags, _con, _mode, _mshift, \ + _lshift, _pflags, _rtable) \ +@@ -317,43 +607,71 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx, struct rockchip_pll_rate_table *rate_table, unsigned long flags, u8 clk_pll_flags); @@ -121594,12 +123554,14 @@ index 2271a84124b0..509087750eeb 100644 }; -#define ROCKCHIP_CPUCLK_NUM_DIVIDERS 2 -+#define ROCKCHIP_CPUCLK_NUM_DIVIDERS 5 ++#define ROCKCHIP_CPUCLK_NUM_DIVIDERS 6 +#define ROCKCHIP_CPUCLK_MAX_CORES 4 struct rockchip_cpuclk_rate_table { unsigned long prate; struct rockchip_cpuclk_clksel divs[ROCKCHIP_CPUCLK_NUM_DIVIDERS]; -@@ -330,26 +433,29 @@ struct rockchip_cpuclk_rate_table { ++ struct rockchip_cpuclk_clksel pre_muxs[ROCKCHIP_CPUCLK_NUM_DIVIDERS]; ++ struct rockchip_cpuclk_clksel post_muxs[ROCKCHIP_CPUCLK_NUM_DIVIDERS]; + }; /** * struct rockchip_cpuclk_reg_data - register offsets and masks of the cpuclock @@ -121611,6 +123573,8 @@ index 2271a84124b0..509087750eeb 100644 + * @div_core_shift[]: cores divider offset used to divide the pll value + * @div_core_mask[]: cores divider mask + * @num_cores: number of cpu cores ++ * @mux_core_reg: register offset of the cores select parent ++ * @mux_core_alt: mux value to select alternate parent * @mux_core_main: mux value to select main parent of core * @mux_core_shift: offset of the core multiplexer * @mux_core_mask: core multiplexer mask @@ -121627,6 +123591,7 @@ index 2271a84124b0..509087750eeb 100644 + u8 div_core_shift[ROCKCHIP_CPUCLK_MAX_CORES]; + u32 div_core_mask[ROCKCHIP_CPUCLK_MAX_CORES]; + int num_cores; ++ int mux_core_reg; + u8 mux_core_alt; + u8 mux_core_main; + u8 mux_core_shift; @@ -121641,16 +123606,28 @@ index 2271a84124b0..509087750eeb 100644 const struct rockchip_cpuclk_reg_data *reg_data, const struct rockchip_cpuclk_rate_table *rates, int nrates, void __iomem *reg_base, spinlock_t *lock); -@@ -361,16 +467,21 @@ struct clk *rockchip_clk_register_mmc(const char *name, - /* - * DDRCLK flags, including method of setting the rate + ++struct clk *rockchip_clk_register_cpuclk_v2(const char *name, ++ const char *const *parent_names, ++ u8 num_parents, void __iomem *base, ++ int muxdiv_offset, u8 mux_shift, ++ u8 mux_width, u8 mux_flags, ++ int div_offset, u8 div_shift, ++ u8 div_width, u8 div_flags, ++ unsigned long flags, spinlock_t *lock, ++ const struct rockchip_cpuclk_rate_table *rates, ++ int nrates); ++ + struct clk *rockchip_clk_register_mmc(const char *name, + const char *const *parent_names, u8 num_parents, + void __iomem *reg, int shift); +@@ -363,14 +681,32 @@ struct clk *rockchip_clk_register_mmc(const char *name, * ROCKCHIP_DDRCLK_SIP: use SIP call to bl31 to change ddrclk rate. -+ * ROCKCHIP_DDRCLK_SCPI: use SCPI APIs to let mcu change ddrclk rate. */ #define ROCKCHIP_DDRCLK_SIP BIT(0) -+#define ROCKCHIP_DDRCLK_SCPI 0x02 +#define ROCKCHIP_DDRCLK_SIP_V2 0x03 + ++#ifdef CONFIG_ROCKCHIP_DDRCLK +void rockchip_set_ddrclk_params(void __iomem *params); +void rockchip_set_ddrclk_dmcfreq_wait_complete(int (*func)(void)); @@ -121662,29 +123639,36 @@ index 2271a84124b0..509087750eeb 100644 - int ddr_flags, void __iomem *reg_base, - spinlock_t *lock); + int ddr_flags, void __iomem *reg_base); ++#else ++static inline void rockchip_set_ddrclk_params(void __iomem *params) {} ++static inline void rockchip_set_ddrclk_dmcfreq_wait_complete(int (*func)(void)) {} ++static inline ++struct clk *rockchip_clk_register_ddrclk(const char *name, int flags, ++ const char *const *parent_names, ++ u8 num_parents, int mux_offset, ++ int mux_shift, int mux_width, ++ int div_shift, int div_width, ++ int ddr_flags, void __iomem *reg_base) ++{ ++ return NULL; ++} ++#endif #define ROCKCHIP_INVERTER_HIWORD_MASK BIT(0) -@@ -388,8 +499,10 @@ struct clk *rockchip_clk_register_muxgrf(const char *name, - - enum rockchip_clk_branch_type { +@@ -390,9 +726,11 @@ enum rockchip_clk_branch_type { branch_composite, -+ branch_composite_brother, branch_mux, branch_muxgrf, + branch_muxpmugrf, branch_divider, branch_fraction_divider, branch_gate, -@@ -398,6 +511,7 @@ enum rockchip_clk_branch_type { ++ branch_gate_no_set_rate, + branch_mmc, + branch_inverter, branch_factor, - branch_ddrclk, - branch_half_divider, -+ branch_dclk_divider, - }; - - struct rockchip_clk_branch { -@@ -411,6 +525,7 @@ struct rockchip_clk_branch { +@@ -411,6 +749,7 @@ struct rockchip_clk_branch { u8 mux_shift; u8 mux_width; u8 mux_flags; @@ -121692,40 +123676,10 @@ index 2271a84124b0..509087750eeb 100644 int div_offset; u8 div_shift; u8 div_width; -@@ -420,6 +535,7 @@ struct rockchip_clk_branch { - u8 gate_shift; - u8 gate_flags; - struct rockchip_clk_branch *child; -+ unsigned long max_prate; - }; - - #define COMPOSITE(_id, cname, pnames, f, mo, ms, mw, mf, ds, dw,\ -@@ -443,6 +559,50 @@ struct rockchip_clk_branch { +@@ -443,6 +782,28 @@ struct rockchip_clk_branch { .gate_flags = gf, \ } -+#define COMPOSITE_BROTHER(_id, cname, pnames, f, mo, ms, mw, mf,\ -+ ds, dw, df, go, gs, gf, bro) \ -+ { \ -+ .id = _id, \ -+ .branch_type = branch_composite_brother, \ -+ .name = cname, \ -+ .parent_names = pnames, \ -+ .num_parents = ARRAY_SIZE(pnames), \ -+ .flags = f, \ -+ .muxdiv_offset = mo, \ -+ .mux_shift = ms, \ -+ .mux_width = mw, \ -+ .mux_flags = mf, \ -+ .div_shift = ds, \ -+ .div_width = dw, \ -+ .div_flags = df, \ -+ .gate_offset = go, \ -+ .gate_shift = gs, \ -+ .gate_flags = gf, \ -+ .child = bro, \ -+ } -+ +#define COMPOSITE_MUXTBL(_id, cname, pnames, f, mo, ms, mw, mf, \ + mt, ds, dw, df, go, gs, gf) \ + { \ @@ -121751,75 +123705,7 @@ index 2271a84124b0..509087750eeb 100644 #define COMPOSITE_DIV_OFFSET(_id, cname, pnames, f, mo, ms, mw, \ mf, do, ds, dw, df, go, gs, gf) \ { \ -@@ -539,6 +699,26 @@ struct rockchip_clk_branch { - .gate_offset = -1, \ - } - -+#define COMPOSITE_BROTHER_NOGATE(_id, cname, pnames, f, mo, ms, \ -+ mw, mf, ds, dw, df, bro) \ -+ { \ -+ .id = _id, \ -+ .branch_type = branch_composite_brother, \ -+ .name = cname, \ -+ .parent_names = pnames, \ -+ .num_parents = ARRAY_SIZE(pnames), \ -+ .flags = f, \ -+ .muxdiv_offset = mo, \ -+ .mux_shift = ms, \ -+ .mux_width = mw, \ -+ .mux_flags = mf, \ -+ .div_shift = ds, \ -+ .div_width = dw, \ -+ .div_flags = df, \ -+ .gate_offset = -1, \ -+ .child = bro, \ -+ } -+ - #define COMPOSITE_NOGATE_DIVTBL(_id, cname, pnames, f, mo, ms, \ - mw, mf, ds, dw, df, dt) \ - { \ -@@ -559,7 +739,7 @@ struct rockchip_clk_branch { - .gate_offset = -1, \ - } - --#define COMPOSITE_FRAC(_id, cname, pname, f, mo, df, go, gs, gf)\ -+#define COMPOSITE_FRAC(_id, cname, pname, f, mo, df, go, gs, gf, prate)\ - { \ - .id = _id, \ - .branch_type = branch_fraction_divider, \ -@@ -574,9 +754,10 @@ struct rockchip_clk_branch { - .gate_offset = go, \ - .gate_shift = gs, \ - .gate_flags = gf, \ -+ .max_prate = prate, \ - } - --#define COMPOSITE_FRACMUX(_id, cname, pname, f, mo, df, go, gs, gf, ch) \ -+#define COMPOSITE_FRACMUX(_id, cname, pname, f, mo, df, go, gs, gf, ch, prate) \ - { \ - .id = _id, \ - .branch_type = branch_fraction_divider, \ -@@ -592,9 +773,10 @@ struct rockchip_clk_branch { - .gate_shift = gs, \ - .gate_flags = gf, \ - .child = ch, \ -+ .max_prate = prate, \ - } - --#define COMPOSITE_FRACMUX_NOGATE(_id, cname, pname, f, mo, df, ch) \ -+#define COMPOSITE_FRACMUX_NOGATE(_id, cname, pname, f, mo, df, ch, prate) \ - { \ - .id = _id, \ - .branch_type = branch_fraction_divider, \ -@@ -608,6 +790,7 @@ struct rockchip_clk_branch { - .div_flags = df, \ - .gate_offset = -1, \ - .child = ch, \ -+ .max_prate = prate, \ - } - - #define COMPOSITE_DDRCLK(_id, cname, pnames, f, mo, ms, mw, \ -@@ -643,6 +826,22 @@ struct rockchip_clk_branch { +@@ -643,6 +1004,22 @@ struct rockchip_clk_branch { .gate_offset = -1, \ } @@ -121842,7 +123728,7 @@ index 2271a84124b0..509087750eeb 100644 #define MUXGRF(_id, cname, pnames, f, o, s, w, mf) \ { \ .id = _id, \ -@@ -658,6 +857,21 @@ struct rockchip_clk_branch { +@@ -658,6 +1035,21 @@ struct rockchip_clk_branch { .gate_offset = -1, \ } @@ -121864,44 +123750,35 @@ index 2271a84124b0..509087750eeb 100644 #define DIV(_id, cname, pname, f, o, s, w, df) \ { \ .id = _id, \ -@@ -772,6 +986,28 @@ struct rockchip_clk_branch { +@@ -701,6 +1093,19 @@ struct rockchip_clk_branch { .gate_flags = gf, \ } -+#define COMPOSITE_HALFDIV_OFFSET(_id, cname, pnames, f, mo, ms, mw, mf, do,\ -+ ds, dw, df, go, gs, gf) \ ++#define GATE_NO_SET_RATE(_id, cname, pname, f, o, b, gf) \ + { \ + .id = _id, \ -+ .branch_type = branch_half_divider, \ ++ .branch_type = branch_gate_no_set_rate, \ + .name = cname, \ -+ .parent_names = pnames, \ -+ .num_parents = ARRAY_SIZE(pnames), \ ++ .parent_names = (const char *[]){ pname }, \ ++ .num_parents = 1, \ + .flags = f, \ -+ .muxdiv_offset = mo, \ -+ .mux_shift = ms, \ -+ .mux_width = mw, \ -+ .mux_flags = mf, \ -+ .div_offset = do, \ -+ .div_shift = ds, \ -+ .div_width = dw, \ -+ .div_flags = df, \ -+ .gate_offset = go, \ -+ .gate_shift = gs, \ ++ .gate_offset = o, \ ++ .gate_shift = b, \ + .gate_flags = gf, \ + } + - #define COMPOSITE_NOGATE_HALFDIV(_id, cname, pnames, f, mo, ms, mw, mf, \ - ds, dw, df) \ + #define MMC(_id, cname, pname, offset, shift) \ { \ -@@ -824,6 +1060,28 @@ struct rockchip_clk_branch { - .gate_offset = -1, \ + .id = _id, \ +@@ -772,6 +1177,28 @@ struct rockchip_clk_branch { + .gate_flags = gf, \ } -+#define COMPOSITE_DCLK(_id, cname, pnames, f, mo, ms, mw, mf, ds, dw,\ -+ df, go, gs, gf, prate) \ ++#define COMPOSITE_HALFDIV_OFFSET(_id, cname, pnames, f, mo, ms, mw, mf, do,\ ++ ds, dw, df, go, gs, gf) \ + { \ + .id = _id, \ -+ .branch_type = branch_dclk_divider, \ ++ .branch_type = branch_half_divider, \ + .name = cname, \ + .parent_names = pnames, \ + .num_parents = ARRAY_SIZE(pnames), \ @@ -121910,44 +123787,46 @@ index 2271a84124b0..509087750eeb 100644 + .mux_shift = ms, \ + .mux_width = mw, \ + .mux_flags = mf, \ ++ .div_offset = do, \ + .div_shift = ds, \ + .div_width = dw, \ + .div_flags = df, \ + .gate_offset = go, \ + .gate_shift = gs, \ + .gate_flags = gf, \ -+ .max_prate = prate, \ + } + - /* SGRF clocks are only accessible from secure mode, so not controllable */ - #define SGRF_GATE(_id, cname, pname) \ - FACTOR(_id, cname, pname, 0, 1, 1) -@@ -840,13 +1098,17 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx, - void rockchip_clk_register_plls(struct rockchip_clk_provider *ctx, + #define COMPOSITE_NOGATE_HALFDIV(_id, cname, pnames, f, mo, ms, mw, mf, \ + ds, dw, df) \ + { \ +@@ -841,12 +1268,20 @@ void rockchip_clk_register_plls(struct rockchip_clk_provider *ctx, struct rockchip_pll_clock *pll_list, unsigned int nr_pll, int grf_lock_offset); --void rockchip_clk_register_armclk(struct rockchip_clk_provider *ctx, + void rockchip_clk_register_armclk(struct rockchip_clk_provider *ctx, - unsigned int lookup_id, const char *name, - const char *const *parent_names, u8 num_parents, - const struct rockchip_cpuclk_reg_data *reg_data, - const struct rockchip_cpuclk_rate_table *rates, - int nrates); -void rockchip_clk_protect_critical(const char *const clocks[], int nclocks); -+void __init rockchip_clk_register_armclk(struct rockchip_clk_provider *ctx, -+ unsigned int lookup_id, -+ const char *name, -+ u8 num_parents, -+ struct clk *parent, struct clk *alt_parent, -+ const struct rockchip_cpuclk_reg_data *reg_data, -+ const struct rockchip_cpuclk_rate_table *rates, -+ int nrates); ++ unsigned int lookup_id, ++ const char *name, ++ u8 num_parents, ++ struct clk *parent, struct clk *alt_parent, ++ const struct rockchip_cpuclk_reg_data *reg_data, ++ const struct rockchip_cpuclk_rate_table *rates, ++ int nrates); ++void rockchip_clk_register_armclk_v2(struct rockchip_clk_provider *ctx, ++ struct rockchip_clk_branch *list, ++ const struct rockchip_cpuclk_rate_table *rates, ++ int nrates); +int rockchip_pll_clk_rate_to_scale(struct clk *clk, unsigned long rate); +int rockchip_pll_clk_scale_to_rate(struct clk *clk, unsigned int scale); +int rockchip_pll_clk_adaptive_scaling(struct clk *clk, int sel); void rockchip_register_restart_notifier(struct rockchip_clk_provider *ctx, unsigned int reg, void (*cb)(void)); -@@ -857,12 +1119,27 @@ struct clk *rockchip_clk_register_halfdiv(const char *name, +@@ -857,10 +1292,10 @@ struct clk *rockchip_clk_register_halfdiv(const char *name, u8 num_parents, void __iomem *base, int muxdiv_offset, u8 mux_shift, u8 mux_width, u8 mux_flags, @@ -121961,34 +123840,42 @@ index 2271a84124b0..509087750eeb 100644 + u8 gate_flags, unsigned long flags, spinlock_t *lock); -+struct clk *rockchip_clk_register_dclk_branch(const char *name, -+ const char *const *parent_names, -+ u8 num_parents, -+ void __iomem *base, -+ int muxdiv_offset, u8 mux_shift, -+ u8 mux_width, u8 mux_flags, -+ int div_offset, u8 div_shift, -+ u8 div_width, u8 div_flags, -+ struct clk_div_table *div_table, -+ int gate_offset, -+ u8 gate_shift, u8 gate_flags, -+ unsigned long flags, -+ unsigned long max_prate, -+ spinlock_t *lock); -+ #ifdef CONFIG_RESET_CONTROLLER - void rockchip_register_softrst(struct device_node *np, - unsigned int num_regs, -@@ -874,5 +1151,6 @@ static inline void rockchip_register_softrst(struct device_node *np, +@@ -874,5 +1309,31 @@ static inline void rockchip_register_softrst(struct device_node *np, { } #endif +extern void (*rk_dump_cru)(void); ++ ++#ifdef CONFIG_ROCKCHIP_CLK_PASS ++void rockchip_clk_protect_init(struct device_node *np); ++#endif ++ ++#if IS_MODULE(CONFIG_COMMON_CLK_ROCKCHIP) ++int rockchip_clk_protect(struct rockchip_clk_provider *ctx, ++ unsigned int *clocks, unsigned int nclocks); ++void rockchip_clk_unprotect(void); ++void rockchip_clk_disable_unused(void); ++#else ++static inline int rockchip_clk_protect(struct rockchip_clk_provider *ctx, ++ unsigned int *clocks, ++ unsigned int nclocks) ++{ ++ return -EOPNOTSUPP; ++} ++ ++static inline void rockchip_clk_unprotect(void) ++{ ++} ++static inline void rockchip_clk_disable_unused(void) ++{ ++} ++#endif #endif diff --git a/drivers/clk/rockchip/regmap/Kconfig b/drivers/clk/rockchip/regmap/Kconfig new file mode 100755 -index 000000000000..65f691bc4141 +index 000000000..65f691bc4 --- /dev/null +++ b/drivers/clk/rockchip/regmap/Kconfig @@ -0,0 +1,16 @@ @@ -122010,7 +123897,7 @@ index 000000000000..65f691bc4141 + select COMMON_CLK_ROCKCHIP_REGMAP diff --git a/drivers/clk/rockchip/regmap/Makefile b/drivers/clk/rockchip/regmap/Makefile new file mode 100755 -index 000000000000..18d075d093d9 +index 000000000..18d075d09 --- /dev/null +++ b/drivers/clk/rockchip/regmap/Makefile @@ -0,0 +1,13 @@ @@ -122029,7 +123916,7 @@ index 000000000000..18d075d093d9 +obj-$(CONFIG_CLK_RK628) += clk-rk628.o diff --git a/drivers/clk/rockchip/regmap/clk-regmap-composite.c b/drivers/clk/rockchip/regmap/clk-regmap-composite.c new file mode 100755 -index 000000000000..43d2b9a45aca +index 000000000..43d2b9a45 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-composite.c @@ -0,0 +1,400 @@ @@ -122435,10 +124322,10 @@ index 000000000000..43d2b9a45aca +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_composite); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-divider.c b/drivers/clk/rockchip/regmap/clk-regmap-divider.c new file mode 100755 -index 000000000000..cb59a3d9acd2 +index 000000000..d57f2c7f8 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-divider.c -@@ -0,0 +1,104 @@ +@@ -0,0 +1,117 @@ +/* + * Copyright (c) 2017 Rockchip Electronics Co. Ltd. + * @@ -122488,6 +124375,20 @@ index 000000000000..cb59a3d9acd2 + CLK_DIVIDER_ROUND_CLOSEST); +} + ++static int div_round_closest(unsigned long parent_rate, unsigned long rate) ++{ ++ int up, down; ++ unsigned long up_rate, down_rate; ++ ++ up = DIV_ROUND_UP_ULL((u64)parent_rate, rate); ++ down = parent_rate / rate; ++ ++ up_rate = DIV_ROUND_UP_ULL((u64)parent_rate, up); ++ down_rate = DIV_ROUND_UP_ULL((u64)parent_rate, down); ++ ++ return (rate - up_rate) <= (down_rate - rate) ? up : down; ++} ++ +static int +clk_regmap_divider_set_rate(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate) @@ -122495,14 +124396,13 @@ index 000000000000..cb59a3d9acd2 + struct clk_regmap_divider *divider = to_clk_regmap_divider(hw); + u32 val, div; + -+ div = divider_get_val(rate, parent_rate, NULL, divider->width, -+ CLK_DIVIDER_ROUND_CLOSEST); ++ div = div_round_closest(parent_rate, rate); + + dev_dbg(divider->dev, "%s: parent_rate=%ld, div=%d, rate=%ld\n", + clk_hw_get_name(hw), parent_rate, div, rate); + + val = div_mask(divider->width) << (divider->shift + 16); -+ val |= div << divider->shift; ++ val |= (div - 1) << divider->shift; + + return regmap_write(divider->regmap, divider->reg, val); +} @@ -122545,10 +124445,10 @@ index 000000000000..cb59a3d9acd2 +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_divider); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c b/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c new file mode 100755 -index 000000000000..3d5f1d2691e3 +index 000000000..1acbc16e7 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c -@@ -0,0 +1,157 @@ +@@ -0,0 +1,167 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2019 Rockchip Electronics Co. Ltd. @@ -122598,6 +124498,16 @@ index 000000000000..3d5f1d2691e3 + struct clk_hw *p_parent; + unsigned long scale; + ++ if (!rate) { ++ *m = 0; ++ *n = 1; ++ ++ dev_dbg(fd->dev, "%s rate:(%ld) maybe invalid frequency setting!\n", ++ clk_hw_get_name(hw), rate); ++ ++ return; ++ } ++ + p_rate = clk_hw_get_rate(clk_hw_get_parent(hw)); + if ((rate * 20 > p_rate) && (p_rate % rate != 0)) { + p_parent = clk_hw_get_parent(clk_hw_get_parent(hw)); @@ -122708,7 +124618,7 @@ index 000000000000..3d5f1d2691e3 +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_fractional_divider); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-gate.c b/drivers/clk/rockchip/regmap/clk-regmap-gate.c new file mode 100755 -index 000000000000..36549b912fa2 +index 000000000..36549b912 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-gate.c @@ -0,0 +1,82 @@ @@ -122796,10 +124706,10 @@ index 000000000000..36549b912fa2 +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_gate); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-mux.c b/drivers/clk/rockchip/regmap/clk-regmap-mux.c new file mode 100755 -index 000000000000..49d58b9c53ab +index 000000000..eb37b5f95 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-mux.c -@@ -0,0 +1,79 @@ +@@ -0,0 +1,81 @@ +/* + * Copyright (c) 2017 Rockchip Electronics Co. Ltd. + * @@ -122879,9 +124789,11 @@ index 000000000000..49d58b9c53ab + return devm_clk_register(dev, &mux->hw); +} +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_mux); ++ ++MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-pll.c b/drivers/clk/rockchip/regmap/clk-regmap-pll.c new file mode 100755 -index 000000000000..24ad7eda9d94 +index 000000000..24ad7eda9 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-pll.c @@ -0,0 +1,363 @@ @@ -123250,10 +125162,10 @@ index 000000000000..24ad7eda9d94 +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_pll); diff --git a/drivers/clk/rockchip/regmap/clk-regmap.h b/drivers/clk/rockchip/regmap/clk-regmap.h new file mode 100755 -index 000000000000..255c0201a590 +index 000000000..4626e1982 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap.h -@@ -0,0 +1,311 @@ +@@ -0,0 +1,308 @@ +/* + * Copyright (c) 2017 Rockchip Electronics Co. Ltd. + * @@ -123309,9 +125221,6 @@ index 000000000000..255c0201a590 +#define RK618_PLL(_id, _name, _parent_name, _reg, _flags) \ + PLL(_id, _name, _parent_name, _reg, 10, 9, 15, _flags) + -+#define RK628_PLL(_id, _name, _parent_name, _reg, _flags) \ -+ PLL(_id, _name, _parent_name, _reg, 13, 12, 10, _flags) -+ +struct clk_mux_data { + unsigned int id; + const char *name; @@ -123567,7 +125476,7 @@ index 000000000000..255c0201a590 +#endif diff --git a/drivers/clk/rockchip/regmap/clk-rk618.c b/drivers/clk/rockchip/regmap/clk-rk618.c new file mode 100755 -index 000000000000..c780f502b354 +index 000000000..c780f502b --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-rk618.c @@ -0,0 +1,408 @@ @@ -123981,10 +125890,10 @@ index 000000000000..c780f502b354 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clk/rockchip/regmap/clk-rk628.c b/drivers/clk/rockchip/regmap/clk-rk628.c new file mode 100755 -index 000000000000..4c3a9eac0e0c +index 000000000..7f501db66 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-rk628.c -@@ -0,0 +1,569 @@ +@@ -0,0 +1,609 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2020 Rockchip Electronics Co. Ltd. @@ -124003,6 +125912,9 @@ index 000000000000..4c3a9eac0e0c + +#include "clk-regmap.h" + ++#define RK628_PLL(_id, _name, _parent_name, _reg, _flags) \ ++ PLL(_id, _name, _parent_name, _reg, 13, 12, 10, _flags) ++ +#define REG(x) ((x) + 0xc0000) + +#define CRU_CPLL_CON0 REG(0x0000) @@ -124063,17 +125975,27 @@ index 000000000000..4c3a9eac0e0c + +#define PNAME(x) static const char *const x[] + -+PNAME(mux_cpll_osc_p) = { "xin_osc0_func", CNAME("clk_cpll") }; -+PNAME(mux_gpll_osc_p) = { "xin_osc0_func", CNAME("clk_gpll") }; ++PNAME(mux_cpll_osc_p) = { CNAME("xin_osc0_func"), CNAME("clk_cpll") }; ++PNAME(mux_gpll_osc_p) = { CNAME("xin_osc0_func"), CNAME("clk_gpll") }; +PNAME(mux_cpll_gpll_mux_p) = { CNAME("clk_cpll_mux"), CNAME("clk_gpll_mux") }; -+PNAME(mux_mclk_i2s_8ch_p) = { CNAME("clk_i2s_8ch_src"), CNAME("clk_i2s_8ch_frac"), "i2s_mclkin", "xin_osc0_half" }; -+PNAME(mux_i2s_mclkout_p) = { CNAME("mclk_i2s_8ch"), "xin_osc0_half" }; ++PNAME(mux_mclk_i2s_8ch_p) = { CNAME("clk_i2s_8ch_src"), ++ CNAME("clk_i2s_8ch_frac"), CNAME("i2s_mclkin"), ++ CNAME("xin_osc0_half") }; ++PNAME(mux_i2s_mclkout_p) = { CNAME("mclk_i2s_8ch"), CNAME("xin_osc0_half") }; ++PNAME(mux_clk_testout_p) = { CNAME("xin_osc0_func"), CNAME("xin_osc0_half"), ++ CNAME("clk_gpll"), CNAME("clk_gpll_mux"), ++ CNAME("clk_cpll"), CNAME("clk_gpll_mux"), ++ CNAME("pclk_logic"), CNAME("sclk_vop"), ++ CNAME("mclk_i2s_8ch"), CNAME("i2s_mclkout"), ++ CNAME("dummy"), CNAME("clk_hdmirx_aud"), ++ CNAME("clk_hdmirx_cec"), CNAME("clk_imodet"), ++ CNAME("clk_txesc"), CNAME("clk_gpio_db0") }; + +static const struct clk_pll_data rk628_clk_plls[] = { -+ RK628_PLL(CGU_CLK_CPLL, CNAME("clk_cpll"), "xin_osc0_func", ++ RK628_PLL(CGU_CLK_CPLL, CNAME("clk_cpll"), CNAME("xin_osc0_func"), + CRU_CPLL_CON0, + 0), -+ RK628_PLL(CGU_CLK_GPLL, CNAME("clk_gpll"), "xin_osc0_func", ++ RK628_PLL(CGU_CLK_GPLL, CNAME("clk_gpll"), CNAME("xin_osc0_func"), + CRU_GPLL_CON0, + 0), +}; @@ -124140,13 +126062,13 @@ index 000000000000..4c3a9eac0e0c + GATE(CGU_PCLK_GVIHOST, CNAME("pclk_gvihost"), CNAME("pclk_logic"), + CRU_GATE_CON02, 5, + 0), -+ GATE(CGU_CLK_CFG_DPHY0, CNAME("clk_cfg_dphy0"), "xin_osc0_func", ++ GATE(CGU_CLK_CFG_DPHY0, CNAME("clk_cfg_dphy0"), CNAME("xin_osc0_func"), + CRU_GATE_CON02, 13, + 0), -+ GATE(CGU_CLK_CFG_DPHY1, CNAME("clk_cfg_dphy1"), "xin_osc0_func", ++ GATE(CGU_CLK_CFG_DPHY1, CNAME("clk_cfg_dphy1"), CNAME("xin_osc0_func"), + CRU_GATE_CON02, 14, + 0), -+ GATE(CGU_CLK_TXESC, CNAME("clk_txesc"), "xin_osc0_func", ++ GATE(CGU_CLK_TXESC, CNAME("clk_txesc"), CNAME("xin_osc0_func"), + CRU_GATE_CON02, 12, + 0), +}; @@ -124157,16 +126079,19 @@ index 000000000000..4c3a9eac0e0c + CRU_CLKSEL_CON05, 0, 5, + CRU_GATE_CON02, 11, + 0), -+ COMPOSITE(CGU_CLK_HDMIRX_AUD, CNAME("clk_hdmirx_aud"), mux_cpll_gpll_mux_p, ++ COMPOSITE(CGU_CLK_HDMIRX_AUD, CNAME("clk_hdmirx_aud"), ++ mux_cpll_gpll_mux_p, + CRU_CLKSEL_CON05, 15, 1, + CRU_CLKSEL_CON05, 6, 8, + CRU_GATE_CON02, 10, + CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT), -+ COMPOSITE_FRAC_NOMUX(CGU_CLK_HDMIRX_CEC, CNAME("clk_hdmirx_cec"), "xin_osc0_func", ++ COMPOSITE_FRAC_NOMUX(CGU_CLK_HDMIRX_CEC, CNAME("clk_hdmirx_cec"), ++ CNAME("xin_osc0_func"), + CRU_CLKSEL_CON12, + CRU_GATE_CON01, 15, + 0), -+ COMPOSITE_FRAC(CGU_CLK_RX_READ, CNAME("clk_rx_read"), mux_cpll_gpll_mux_p, ++ COMPOSITE_FRAC(CGU_CLK_RX_READ, CNAME("clk_rx_read"), ++ mux_cpll_gpll_mux_p, + CRU_CLKSEL_CON02, 8, 1, + CRU_CLKSEL_CON14, + CRU_GATE_CON00, 11, @@ -124181,36 +126106,44 @@ index 000000000000..4c3a9eac0e0c + CRU_CLKSEL_CON00, 0, 5, + CRU_GATE_CON00, 0, + 0), -+ COMPOSITE_NOMUX(CGU_CLK_GPIO_DB0, CNAME("clk_gpio_db0"), "xin_osc0_func", -+ CRU_CLKSEL_CON08, 0, 10, -+ CRU_GATE_CON01, 4, -+ 0), -+ COMPOSITE_NOMUX(CGU_CLK_GPIO_DB1, CNAME("clk_gpio_db1"), "xin_osc0_func", -+ CRU_CLKSEL_CON09, 0, 10, -+ CRU_GATE_CON01, 5, -+ 0), -+ COMPOSITE_NOMUX(CGU_CLK_GPIO_DB2, CNAME("clk_gpio_db2"), "xin_osc0_func", -+ CRU_CLKSEL_CON10, 0, 10, -+ CRU_GATE_CON01, 6, -+ 0), -+ COMPOSITE_NOMUX(CGU_CLK_GPIO_DB3, CNAME("clk_gpio_db3"), "xin_osc0_func", -+ CRU_CLKSEL_CON11, 0, 10, -+ CRU_GATE_CON01, 7, -+ 0), -+ COMPOSITE(CGU_CLK_I2S_8CH_SRC, CNAME("clk_i2s_8ch_src"), mux_cpll_gpll_mux_p, ++ COMPOSITE_NOMUX(CGU_CLK_GPIO_DB0, CNAME("clk_gpio_db0"), ++ CNAME("xin_osc0_func"), ++ CRU_CLKSEL_CON08, 0, 10, ++ CRU_GATE_CON01, 4, ++ 0), ++ COMPOSITE_NOMUX(CGU_CLK_GPIO_DB1, CNAME("clk_gpio_db1"), ++ CNAME("xin_osc0_func"), ++ CRU_CLKSEL_CON09, 0, 10, ++ CRU_GATE_CON01, 5, ++ 0), ++ COMPOSITE_NOMUX(CGU_CLK_GPIO_DB2, CNAME("clk_gpio_db2"), ++ CNAME("xin_osc0_func"), ++ CRU_CLKSEL_CON10, 0, 10, ++ CRU_GATE_CON01, 6, ++ 0), ++ COMPOSITE_NOMUX(CGU_CLK_GPIO_DB3, CNAME("clk_gpio_db3"), ++ CNAME("xin_osc0_func"), ++ CRU_CLKSEL_CON11, 0, 10, ++ CRU_GATE_CON01, 7, ++ 0), ++ COMPOSITE(CGU_CLK_I2S_8CH_SRC, CNAME("clk_i2s_8ch_src"), ++ mux_cpll_gpll_mux_p, + CRU_CLKSEL_CON03, 13, 1, + CRU_CLKSEL_CON03, 8, 5, + CRU_GATE_CON03, 9, + 0), -+ COMPOSITE_FRAC_NOMUX(CGU_CLK_I2S_8CH_FRAC, CNAME("clk_i2s_8ch_frac"), CNAME("clk_i2s_8ch_src"), ++ COMPOSITE_FRAC_NOMUX(CGU_CLK_I2S_8CH_FRAC, CNAME("clk_i2s_8ch_frac"), ++ CNAME("clk_i2s_8ch_src"), + CRU_CLKSEL_CON04, + CRU_GATE_CON03, 10, + 0), -+ COMPOSITE_NODIV(CGU_MCLK_I2S_8CH, CNAME("mclk_i2s_8ch"), mux_mclk_i2s_8ch_p, ++ COMPOSITE_NODIV(CGU_MCLK_I2S_8CH, CNAME("mclk_i2s_8ch"), ++ mux_mclk_i2s_8ch_p, + CRU_CLKSEL_CON03, 14, 2, + CRU_GATE_CON03, 11, + CLK_SET_RATE_PARENT), -+ COMPOSITE_NODIV(CGU_I2S_MCLKOUT, CNAME("i2s_mclkout"), mux_i2s_mclkout_p, ++ COMPOSITE_NODIV(CGU_I2S_MCLKOUT, CNAME("i2s_mclkout"), ++ mux_i2s_mclkout_p, + CRU_CLKSEL_CON03, 7, 1, + CRU_GATE_CON03, 12, + CLK_SET_RATE_PARENT), @@ -124219,6 +126152,11 @@ index 000000000000..4c3a9eac0e0c + CRU_CLKSEL_CON02, 0, 5, + CRU_GATE_CON00, 12, + 0), ++ COMPOSITE(CGU_CLK_TESTOUT, CNAME("clk_testout"), mux_clk_testout_p, ++ CRU_CLKSEL_CON06, 0, 4, ++ CRU_CLKSEL_CON06, 8, 6, ++ CRU_GATE_CON04, 7, ++ 0), +}; + +static void rk628_clk_add_lookup(struct rk628_cru *cru, struct clk *clk, @@ -124421,7 +126359,7 @@ index 000000000000..4c3a9eac0e0c + cru->rcdev.of_node = dev->of_node; + cru->rcdev.ops = &rk628_rgu_ops; + -+ return reset_controller_register(&cru->rcdev); ++ return devm_reset_controller_register(dev, &cru->rcdev); +} + +static const struct regmap_range rk628_cru_readable_ranges[] = { @@ -124449,26 +126387,15 @@ index 000000000000..4c3a9eac0e0c + .rd_table = &rk628_cru_readable_table, +}; + -+static int rk628_cru_probe(struct platform_device *pdev) ++static void rk628_cru_init(struct rk628_cru *cru) +{ -+ struct rk628 *rk628 = dev_get_drvdata(pdev->dev.parent); -+ struct device *dev = &pdev->dev; -+ struct rk628_cru *cru; -+ struct clk **clk_table; -+ unsigned int i; -+ int ret; -+ -+ cru = devm_kzalloc(dev, sizeof(*cru), GFP_KERNEL); -+ if (!cru) -+ return -ENOMEM; ++ u32 val = 0; ++ u8 mcu_mode; + -+ cru->regmap = devm_regmap_init_i2c(rk628->client, -+ &rk628_cru_regmap_config); -+ if (IS_ERR(cru->regmap)) { -+ ret = PTR_ERR(cru->regmap); -+ dev_err(dev, "failed to allocate register map: %d\n", ret); -+ return ret; -+ } ++ regmap_read(cru->parent->grf, GRF_SYSTEM_STATUS0, &val); ++ mcu_mode = (val & I2C_ONLY_FLAG) ? 0 : 1; ++ if (mcu_mode) ++ return; + + /* clock switch and first set gpll almost 99MHz */ + regmap_write(cru->regmap, CRU_GPLL_CON0, 0xffff701d); @@ -124498,6 +126425,34 @@ index 000000000000..4c3a9eac0e0c + usleep_range(1000, 1100); + /* set pclk use cpll, and set pclk 99MHz */ + regmap_write(cru->regmap, CRU_CLKSEL_CON00, 0xff000b); ++} ++ ++static int rk628_cru_probe(struct platform_device *pdev) ++{ ++ struct rk628 *rk628 = dev_get_drvdata(pdev->dev.parent); ++ struct device *dev = &pdev->dev; ++ struct rk628_cru *cru; ++ struct clk **clk_table; ++ unsigned int i; ++ int ret; ++ ++ cru = devm_kzalloc(dev, sizeof(*cru), GFP_KERNEL); ++ if (!cru) ++ return -ENOMEM; ++ ++ cru->dev = dev; ++ cru->parent = rk628; ++ platform_set_drvdata(pdev, cru); ++ ++ cru->regmap = devm_regmap_init_i2c(rk628->client, ++ &rk628_cru_regmap_config); ++ if (IS_ERR(cru->regmap)) { ++ ret = PTR_ERR(cru->regmap); ++ dev_err(dev, "failed to allocate register map: %d\n", ret); ++ return ret; ++ } ++ ++ rk628_cru_init(cru); + + clk_table = devm_kcalloc(dev, CGU_NR_CLKS, sizeof(struct clk *), + GFP_KERNEL); @@ -124507,11 +126462,8 @@ index 000000000000..4c3a9eac0e0c + for (i = 0; i < CGU_NR_CLKS; i++) + clk_table[i] = ERR_PTR(-ENOENT); + -+ cru->dev = dev; -+ cru->parent = rk628; + cru->clk_data.clks = clk_table; + cru->clk_data.clk_num = CGU_NR_CLKS; -+ platform_set_drvdata(pdev, cru); + + rk628_clk_register_plls(cru); + rk628_clk_register_muxes(cru); @@ -124527,10 +126479,7 @@ index 000000000000..4c3a9eac0e0c + +static int rk628_cru_remove(struct platform_device *pdev) +{ -+ struct rk628_cru *cru = dev_get_drvdata(&pdev->dev); -+ + of_clk_del_provider(pdev->dev.of_node); -+ reset_controller_unregister(&cru->rcdev); + + return 0; +} @@ -124555,7 +126504,7 @@ index 000000000000..4c3a9eac0e0c +MODULE_DESCRIPTION("Rockchip RK628 CRU driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig -index a0c6e88bebe0..9d9cb5757913 100644 +index a0c6e88be..9d9cb5757 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -85,7 +85,9 @@ config IXP4XX_TIMER @@ -124570,7 +126519,7 @@ index a0c6e88bebe0..9d9cb5757913 100644 select TIMER_OF select CLKSRC_MMIO diff --git a/drivers/clocksource/timer-rockchip.c b/drivers/clocksource/timer-rockchip.c -index 1f95d0aca08f..2f4e970d7433 100644 +index 1f95d0aca..2f4e970d7 100644 --- a/drivers/clocksource/timer-rockchip.c +++ b/drivers/clocksource/timer-rockchip.c @@ -8,11 +8,13 @@ @@ -124664,7 +126613,7 @@ index 1f95d0aca08f..2f4e970d7433 100644 +MODULE_LICENSE("GPL"); +#endif diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm -index 1f73fa75b1a0..0faef5fc6df3 100644 +index 1f73fa75b..0faef5fc6 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -158,6 +158,16 @@ config ARM_RASPBERRYPI_CPUFREQ @@ -124685,7 +126634,7 @@ index 1f73fa75b1a0..0faef5fc6df3 100644 bool help diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile -index f1b7e3dd6e5d..2e0e827afd21 100644 +index f1b7e3dd6..2e0e827af 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -64,6 +64,7 @@ obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o @@ -124697,7 +126646,7 @@ index f1b7e3dd6e5d..2e0e827afd21 100644 obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c -index aea285651fba..1840409d520d 100644 +index aea285651..1840409d5 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c @@ -66,21 +66,6 @@ static const struct of_device_id whitelist[] __initconst = { @@ -124752,7 +126701,7 @@ index aea285651fba..1840409d520d 100644 { .compatible = "st,stih407", }, { .compatible = "st,stih410", }, diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c -index e363ae04aac6..f1327e7fe361 100644 +index e363ae04a..f1327e7fe 100644 --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c @@ -23,6 +23,9 @@ @@ -125042,7 +126991,7 @@ index e363ae04aac6..f1327e7fe361 100644 list_del(&priv->node); } diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c -index 58342390966b..ae35ef771900 100644 +index 583423909..ae35ef771 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -688,8 +688,12 @@ static ssize_t show_##file_name \ @@ -125068,7 +127017,7 @@ index 58342390966b..ae35ef771900 100644 /** * cpufreq_update_policy - Re-evaluate an existing cpufreq policy. diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c -index 50a4d7846580..1f001d281718 100644 +index 50a4d7846..1f001d281 100644 --- a/drivers/cpufreq/cpufreq_userspace.c +++ b/drivers/cpufreq/cpufreq_userspace.c @@ -78,20 +78,18 @@ static int cpufreq_userspace_policy_start(struct cpufreq_policy *policy) @@ -125096,10 +127045,10 @@ index 50a4d7846580..1f001d281718 100644 diff --git a/drivers/cpufreq/rockchip-cpufreq.c b/drivers/cpufreq/rockchip-cpufreq.c new file mode 100755 -index 000000000000..1a0e960870c1 +index 000000000..27c6d92ed --- /dev/null +++ b/drivers/cpufreq/rockchip-cpufreq.c -@@ -0,0 +1,638 @@ +@@ -0,0 +1,1025 @@ +/* + * Rockchip CPUFreq Driver + * @@ -125118,6 +127067,7 @@ index 000000000000..1a0e960870c1 +#include +#include +#include ++#include +#include +#include +#include @@ -125128,6 +127078,7 @@ index 000000000000..1a0e960870c1 +#include +#include +#include ++#include +#include +#include +#include @@ -125142,8 +127093,15 @@ index 000000000000..1a0e960870c1 + struct list_head list_head; + struct monitor_dev_info *mdev_info; + struct rockchip_opp_info opp_info; ++ struct freq_qos_request dsu_qos_req; + cpumask_t cpus; ++ unsigned int idle_threshold_freq; + int scale; ++ bool is_idle_disabled; ++ bool is_opp_shared_dsu; ++ unsigned int regulator_count; ++ unsigned long rate; ++ unsigned long volt, mem_volt; +}; +static LIST_HEAD(cluster_info_list); + @@ -125280,37 +127238,139 @@ index 000000000000..1a0e960870c1 + return ret; +} + -+static int rk3588_cpu_set_read_margin(struct device *dev, -+ struct rockchip_opp_info *opp_info, -+ unsigned long volt) ++static int rk3588_get_soc_info(struct device *dev, struct device_node *np, ++ int *bin, int *process) +{ -+ bool is_found = false; -+ u32 rm; -+ int i; ++ int ret = 0; ++ u8 value = 0; + -+ if (!opp_info->grf || !opp_info->volt_rm_tbl) ++ if (!bin) + return 0; + -+ for (i = 0; opp_info->volt_rm_tbl[i].rm != VOLT_RM_TABLE_END; i++) { -+ if (volt >= opp_info->volt_rm_tbl[i].volt) { -+ rm = opp_info->volt_rm_tbl[i].rm; -+ is_found = true; -+ break; ++ if (of_property_match_string(np, "nvmem-cell-names", ++ "specification_serial_number") >= 0) { ++ ret = rockchip_nvmem_cell_read_u8(np, ++ "specification_serial_number", ++ &value); ++ if (ret) { ++ dev_err(dev, ++ "Failed to get specification_serial_number\n"); ++ return ret; + } ++ /* RK3588M */ ++ if (value == 0xd) ++ *bin = 1; ++ /* RK3588J */ ++ else if (value == 0xa) ++ *bin = 2; + } ++ if (*bin < 0) ++ *bin = 0; ++ dev_info(dev, "bin=%d\n", *bin); ++ ++ return ret; ++} ++ ++static int rk3588_change_length(struct device *dev, struct device_node *np, ++ int bin, int process, int volt_sel) ++{ ++ struct clk *clk; ++ unsigned long old_rate; ++ unsigned int low_len_sel; ++ u32 opp_flag = 0; ++ int ret = 0; + -+ if (!is_found) ++ clk = clk_get(dev, NULL); ++ if (IS_ERR(clk)) { ++ dev_warn(dev, "failed to get cpu clk\n"); ++ return PTR_ERR(clk); ++ } ++ ++ /* RK3588 low speed grade should change to low length */ ++ if (of_property_read_u32(np, "rockchip,pvtm-low-len-sel", ++ &low_len_sel)) ++ goto out; ++ if (volt_sel > low_len_sel) ++ goto out; ++ opp_flag = OPP_LENGTH_LOW; ++ ++ old_rate = clk_get_rate(clk); ++ ret = clk_set_rate(clk, old_rate | opp_flag); ++ if (ret) { ++ dev_err(dev, "failed to change length\n"); ++ goto out; ++ } ++ clk_set_rate(clk, old_rate); ++out: ++ clk_put(clk); ++ ++ return ret; ++} ++ ++static int rk3588_set_supported_hw(struct device *dev, struct device_node *np, ++ int bin, int process, int volt_sel) ++{ ++ struct opp_table *opp_table; ++ u32 supported_hw[2]; ++ ++ if (!of_property_read_bool(np, "rockchip,supported-hw")) + return 0; -+ if (rm == opp_info->current_rm) ++ ++ /* SoC Version */ ++ supported_hw[0] = BIT(bin); ++ /* Speed Grade */ ++ supported_hw[1] = BIT(volt_sel); ++ opp_table = dev_pm_opp_set_supported_hw(dev, supported_hw, 2); ++ if (IS_ERR(opp_table)) { ++ dev_err(dev, "failed to set supported opp\n"); ++ return PTR_ERR(opp_table); ++ } ++ ++ return 0; ++} ++ ++static int rk3588_set_soc_info(struct device *dev, struct device_node *np, ++ int bin, int process, int volt_sel) ++{ ++ if (volt_sel < 0) ++ return 0; ++ if (bin < 0) ++ bin = 0; ++ ++ rk3588_change_length(dev, np, bin, process, volt_sel); ++ rk3588_set_supported_hw(dev, np, bin, process, volt_sel); ++ ++ return 0; ++} ++ ++static int rk3588_cpu_set_read_margin(struct device *dev, ++ struct rockchip_opp_info *opp_info, ++ u32 rm) ++{ ++ if (!opp_info->volt_rm_tbl) ++ return 0; ++ if (rm == opp_info->current_rm || rm == UINT_MAX) + return 0; + + dev_dbg(dev, "set rm to %d\n", rm); -+ regmap_write(opp_info->grf, 0x20, 0x001c0000 | (rm << 2)); -+ regmap_write(opp_info->grf, 0x28, 0x003c0000 | (rm << 2)); -+ regmap_write(opp_info->grf, 0x2c, 0x003c0000 | (rm << 2)); -+ regmap_write(opp_info->grf, 0x30, 0x00200020); -+ udelay(1); -+ regmap_write(opp_info->grf, 0x30, 0x00200000); ++ if (opp_info->grf) { ++ regmap_write(opp_info->grf, 0x20, 0x001c0000 | (rm << 2)); ++ regmap_write(opp_info->grf, 0x28, 0x003c0000 | (rm << 2)); ++ regmap_write(opp_info->grf, 0x2c, 0x003c0000 | (rm << 2)); ++ regmap_write(opp_info->grf, 0x30, 0x00200020); ++ udelay(1); ++ regmap_write(opp_info->grf, 0x30, 0x00200000); ++ } ++ if (opp_info->dsu_grf) { ++ regmap_write(opp_info->dsu_grf, 0x20, 0x001c0000 | (rm << 2)); ++ regmap_write(opp_info->dsu_grf, 0x28, 0x003c0000 | (rm << 2)); ++ regmap_write(opp_info->dsu_grf, 0x2c, 0x003c0000 | (rm << 2)); ++ regmap_write(opp_info->dsu_grf, 0x30, 0x001c0000 | (rm << 2)); ++ regmap_write(opp_info->dsu_grf, 0x38, 0x001c0000 | (rm << 2)); ++ regmap_write(opp_info->dsu_grf, 0x18, 0x40004000); ++ udelay(1); ++ regmap_write(opp_info->dsu_grf, 0x18, 0x40000000); ++ } + + opp_info->current_rm = rm; + @@ -125353,6 +127413,8 @@ index 000000000000..1a0e960870c1 +}; + +static const struct rockchip_opp_data rk3588_cpu_opp_data = { ++ .get_soc_info = rk3588_get_soc_info, ++ .set_soc_info = rk3588_set_soc_info, + .set_read_margin = rk3588_cpu_set_read_margin, +}; + @@ -125442,15 +127504,29 @@ index 000000000000..1a0e960870c1 + struct rockchip_opp_info *opp_info; + unsigned long old_freq = data->old_opp.rate; + unsigned long new_freq = data->new_opp.rate; ++ u32 target_rm = UINT_MAX; + int ret = 0; + + cluster = rockchip_cluster_info_lookup(dev->id); + if (!cluster) + return -EINVAL; + opp_info = &cluster->opp_info; ++ rockchip_get_read_margin(dev, opp_info, new_supply_vdd->u_volt, ++ &target_rm); + ++ /* Change frequency */ ++ dev_dbg(dev, "%s: switching OPP: %lu Hz --> %lu Hz\n", __func__, ++ old_freq, new_freq); + /* Scaling up? Scale voltage before frequency */ + if (new_freq >= old_freq) { ++ ret = rockchip_set_intermediate_rate(dev, opp_info, clk, ++ old_freq, new_freq, ++ true, true); ++ if (ret) { ++ dev_err(dev, "%s: failed to set clk rate: %lu\n", ++ __func__, new_freq); ++ return -EINVAL; ++ } + ret = rockchip_cpufreq_set_volt(dev, mem_reg, new_supply_mem, + "mem"); + if (ret) @@ -125459,25 +127535,30 @@ index 000000000000..1a0e960870c1 + "vdd"); + if (ret) + goto restore_voltage; -+ if (opp_info->data->set_read_margin) -+ opp_info->data->set_read_margin(dev, opp_info, -+ new_supply_vdd->u_volt); -+ } -+ -+ /* Change frequency */ -+ dev_dbg(dev, "%s: switching OPP: %lu Hz --> %lu Hz\n", __func__, -+ old_freq, new_freq); -+ ret = clk_set_rate(clk, new_freq); -+ if (ret) { -+ dev_err(dev, "%s: failed to set clk rate: %d\n", __func__, ret); -+ goto restore_rm; -+ } -+ ++ rockchip_set_read_margin(dev, opp_info, target_rm, true); ++ ret = clk_set_rate(clk, new_freq); ++ if (ret) { ++ dev_err(dev, "%s: failed to set clk rate: %lu %d\n", ++ __func__, new_freq, ret); ++ goto restore_rm; ++ } + /* Scaling down? Scale voltage after frequency */ -+ if (new_freq < old_freq) { -+ if (opp_info->data->set_read_margin) -+ opp_info->data->set_read_margin(dev, opp_info, -+ new_supply_vdd->u_volt); ++ } else { ++ ret = rockchip_set_intermediate_rate(dev, opp_info, clk, ++ old_freq, new_freq, ++ false, true); ++ if (ret) { ++ dev_err(dev, "%s: failed to set clk rate: %lu\n", ++ __func__, new_freq); ++ return -EINVAL; ++ } ++ rockchip_set_read_margin(dev, opp_info, target_rm, true); ++ ret = clk_set_rate(clk, new_freq); ++ if (ret) { ++ dev_err(dev, "%s: failed to set clk rate: %lu %d\n", ++ __func__, new_freq, ret); ++ goto restore_rm; ++ } + ret = rockchip_cpufreq_set_volt(dev, vdd_reg, new_supply_vdd, + "vdd"); + if (ret) @@ -125488,6 +127569,9 @@ index 000000000000..1a0e960870c1 + goto restore_freq; + } + ++ cluster->volt = new_supply_vdd->u_volt; ++ cluster->mem_volt = new_supply_mem->u_volt; ++ + return 0; + +restore_freq: @@ -125495,9 +127579,9 @@ index 000000000000..1a0e960870c1 + dev_err(dev, "%s: failed to restore old-freq (%lu Hz)\n", + __func__, old_freq); +restore_rm: -+ if (opp_info->data->set_read_margin) -+ opp_info->data->set_read_margin(dev, opp_info, -+ old_supply_vdd->u_volt); ++ rockchip_get_read_margin(dev, opp_info, old_supply_vdd->u_volt, ++ &target_rm); ++ rockchip_set_read_margin(dev, opp_info, target_rm, true); +restore_voltage: + rockchip_cpufreq_set_volt(dev, mem_reg, old_supply_mem, "mem"); + rockchip_cpufreq_set_volt(dev, vdd_reg, old_supply_vdd, "vdd"); @@ -125519,11 +127603,14 @@ index 000000000000..1a0e960870c1 + int process = -EINVAL; + int volt_sel = -EINVAL; + int ret = 0; ++ u32 freq = 0; + + dev = get_cpu_device(cpu); + if (!dev) + return -ENODEV; + ++ opp_info->dev = dev; ++ + if (of_find_property(dev->of_node, "cpu-supply", NULL)) + reg_name = "cpu"; + else if (of_find_property(dev->of_node, "cpu0-supply", NULL)) @@ -125537,34 +127624,50 @@ index 000000000000..1a0e960870c1 + return -ENOENT; + } + ++ opp_info->grf = syscon_regmap_lookup_by_phandle(np, ++ "rockchip,grf"); ++ if (IS_ERR(opp_info->grf)) ++ opp_info->grf = NULL; ++ + ret = dev_pm_opp_of_get_sharing_cpus(dev, &cluster->cpus); + if (ret) { + dev_err(dev, "Failed to get sharing cpus\n"); + goto np_err; + } + ++ cluster->is_opp_shared_dsu = of_property_read_bool(np, "rockchip,opp-shared-dsu"); ++ if (!of_property_read_u32(np, "rockchip,idle-threshold-freq", &freq)) ++ cluster->idle_threshold_freq = freq; + rockchip_get_opp_data(rockchip_cpufreq_of_match, opp_info); + if (opp_info->data && opp_info->data->set_read_margin) { + opp_info->current_rm = UINT_MAX; -+ opp_info->grf = syscon_regmap_lookup_by_phandle(np, -+ "rockchip,grf"); -+ if (IS_ERR(opp_info->grf)) -+ opp_info->grf = NULL; ++ opp_info->target_rm = UINT_MAX; ++ opp_info->dsu_grf = ++ syscon_regmap_lookup_by_phandle(np, "rockchip,dsu-grf"); ++ if (IS_ERR(opp_info->dsu_grf)) ++ opp_info->dsu_grf = NULL; + rockchip_get_volt_rm_table(dev, np, "volt-mem-read-margin", + &opp_info->volt_rm_tbl); ++ of_property_read_u32(np, "low-volt-mem-read-margin", ++ &opp_info->low_rm); ++ if (!of_property_read_u32(np, "intermediate-threshold-freq", &freq)) ++ opp_info->intermediate_threshold_freq = freq * 1000; ++ rockchip_init_read_margin(dev, opp_info, reg_name); + } + if (opp_info->data && opp_info->data->get_soc_info) + opp_info->data->get_soc_info(dev, np, &bin, &process); ++ rockchip_get_soc_info(dev, np, &bin, &process); ++ rockchip_init_pvtpll_table(&cluster->opp_info, bin); + rockchip_get_scale_volt_sel(dev, "cpu_leakage", reg_name, bin, process, + &cluster->scale, &volt_sel); ++ if (opp_info->data && opp_info->data->set_soc_info) ++ opp_info->data->set_soc_info(dev, np, bin, process, volt_sel); + pname_table = rockchip_set_opp_prop_name(dev, process, volt_sel); -+ if (IS_ERR(pname_table)) { -+ ret = PTR_ERR(pname_table); -+ goto np_err; -+ } ++ rockchip_set_opp_supported_hw(dev, np, bin, volt_sel); + + if (of_find_property(dev->of_node, "cpu-supply", NULL) && + of_find_property(dev->of_node, "mem-supply", NULL)) { ++ cluster->regulator_count = 2; + reg_table = dev_pm_opp_set_regulators(dev, reg_names, + ARRAY_SIZE(reg_names)); + if (IS_ERR(reg_table)) { @@ -125577,6 +127680,8 @@ index 000000000000..1a0e960870c1 + ret = PTR_ERR(opp_table); + goto reg_opp_table; + } ++ } else { ++ cluster->regulator_count = 1; + } + + of_node_put(np); @@ -125587,7 +127692,7 @@ index 000000000000..1a0e960870c1 + if (reg_table) + dev_pm_opp_put_regulators(reg_table); +pname_opp_table: -+ if (pname_table) ++ if (!IS_ERR_OR_NULL(pname_table)) + dev_pm_opp_put_prop_name(pname_table); +np_err: + of_node_put(np); @@ -125603,6 +127708,8 @@ index 000000000000..1a0e960870c1 + if (!cluster) + return -EINVAL; + rockchip_adjust_power_scale(dev, cluster->scale); ++ rockchip_pvtpll_calibrate_opp(&cluster->opp_info); ++ rockchip_pvtpll_add_length(&cluster->opp_info); + + return 0; +} @@ -125611,6 +127718,8 @@ index 000000000000..1a0e960870c1 +int rockchip_cpufreq_opp_set_rate(struct device *dev, unsigned long target_freq) +{ + struct cluster_info *cluster; ++ struct dev_pm_opp *opp; ++ unsigned long freq; + int ret = 0; + + cluster = rockchip_cluster_info_lookup(dev->id); @@ -125619,6 +127728,17 @@ index 000000000000..1a0e960870c1 + + rockchip_monitor_volt_adjust_lock(cluster->mdev_info); + ret = dev_pm_opp_set_rate(dev, target_freq); ++ if (!ret) { ++ cluster->rate = target_freq; ++ if (cluster->regulator_count == 1) { ++ freq = target_freq; ++ opp = dev_pm_opp_find_freq_ceil(cluster->opp_info.dev, &freq); ++ if (!IS_ERR(opp)) { ++ cluster->volt = dev_pm_opp_get_voltage(opp); ++ dev_pm_opp_put(opp); ++ } ++ } ++ } + rockchip_monitor_volt_adjust_unlock(cluster->mdev_info); + + return ret; @@ -125636,48 +127756,113 @@ index 000000000000..1a0e960870c1 + return ret; +} + ++static int rockchip_cpufreq_add_monitor(struct cluster_info *cluster, ++ struct cpufreq_policy *policy) ++{ ++ struct device *dev = cluster->opp_info.dev; ++ struct monitor_dev_profile *mdevp = NULL; ++ struct monitor_dev_info *mdev_info = NULL; ++ ++ mdevp = kzalloc(sizeof(*mdevp), GFP_KERNEL); ++ if (!mdevp) ++ return -ENOMEM; ++ ++ mdevp->type = MONITOR_TYPE_CPU; ++ mdevp->low_temp_adjust = rockchip_monitor_cpu_low_temp_adjust; ++ mdevp->high_temp_adjust = rockchip_monitor_cpu_high_temp_adjust; ++ mdevp->update_volt = rockchip_monitor_check_rate_volt; ++ mdevp->data = (void *)policy; ++ mdevp->opp_info = &cluster->opp_info; ++ cpumask_copy(&mdevp->allowed_cpus, policy->cpus); ++ mdev_info = rockchip_system_monitor_register(dev, mdevp); ++ if (IS_ERR(mdev_info)) { ++ kfree(mdevp); ++ dev_err(dev, "failed to register system monitor\n"); ++ return -EINVAL; ++ } ++ mdev_info->devp = mdevp; ++ cluster->mdev_info = mdev_info; ++ ++ return 0; ++} ++ ++static int rockchip_cpufreq_remove_monitor(struct cluster_info *cluster) ++{ ++ if (cluster->mdev_info) { ++ kfree(cluster->mdev_info->devp); ++ rockchip_system_monitor_unregister(cluster->mdev_info); ++ cluster->mdev_info = NULL; ++ } ++ ++ return 0; ++} ++ ++static int rockchip_cpufreq_remove_dsu_qos(struct cluster_info *cluster) ++{ ++ struct cluster_info *ci; ++ ++ if (!cluster->is_opp_shared_dsu) ++ return 0; ++ ++ list_for_each_entry(ci, &cluster_info_list, list_head) { ++ if (ci->is_opp_shared_dsu) ++ continue; ++ if (freq_qos_request_active(&ci->dsu_qos_req)) ++ freq_qos_remove_request(&ci->dsu_qos_req); ++ } ++ ++ return 0; ++} ++ ++static int rockchip_cpufreq_add_dsu_qos_req(struct cluster_info *cluster, ++ struct cpufreq_policy *policy) ++{ ++ struct device *dev = cluster->opp_info.dev; ++ struct cluster_info *ci; ++ int ret; ++ ++ if (!cluster->is_opp_shared_dsu) ++ return 0; ++ ++ list_for_each_entry(ci, &cluster_info_list, list_head) { ++ if (ci->is_opp_shared_dsu) ++ continue; ++ ret = freq_qos_add_request(&policy->constraints, ++ &ci->dsu_qos_req, ++ FREQ_QOS_MIN, ++ FREQ_QOS_MIN_DEFAULT_VALUE); ++ if (ret < 0) { ++ dev_err(dev, "failed to add dsu freq constraint\n"); ++ goto error; ++ } ++ } ++ ++ return 0; ++ ++error: ++ rockchip_cpufreq_remove_dsu_qos(cluster); ++ ++ return ret; ++} ++ +static int rockchip_cpufreq_notifier(struct notifier_block *nb, + unsigned long event, void *data) +{ -+ struct device *dev; + struct cpufreq_policy *policy = data; + struct cluster_info *cluster; -+ struct monitor_dev_profile *mdevp = NULL; -+ struct monitor_dev_info *mdev_info = NULL; -+ -+ dev = get_cpu_device(policy->cpu); -+ if (!dev) -+ return NOTIFY_BAD; + + cluster = rockchip_cluster_info_lookup(policy->cpu); + if (!cluster) + return NOTIFY_BAD; + + if (event == CPUFREQ_CREATE_POLICY) { -+ mdevp = kzalloc(sizeof(*mdevp), GFP_KERNEL); -+ if (!mdevp) ++ if (rockchip_cpufreq_add_monitor(cluster, policy)) + return NOTIFY_BAD; -+ mdevp->type = MONITOR_TPYE_CPU; -+ mdevp->low_temp_adjust = rockchip_monitor_cpu_low_temp_adjust; -+ mdevp->high_temp_adjust = rockchip_monitor_cpu_high_temp_adjust; -+ mdevp->update_volt = rockchip_monitor_check_rate_volt; -+ mdevp->data = (void *)policy; -+ mdevp->opp_info = &cluster->opp_info; -+ cpumask_copy(&mdevp->allowed_cpus, policy->cpus); -+ mdev_info = rockchip_system_monitor_register(dev, mdevp); -+ if (IS_ERR(mdev_info)) { -+ kfree(mdevp); -+ dev_err(dev, "failed to register system monitor\n"); ++ if (rockchip_cpufreq_add_dsu_qos_req(cluster, policy)) + return NOTIFY_BAD; -+ } -+ mdev_info->devp = mdevp; -+ cluster->mdev_info = mdev_info; + } else if (event == CPUFREQ_REMOVE_POLICY) { -+ if (cluster->mdev_info) { -+ kfree(cluster->mdev_info->devp); -+ rockchip_system_monitor_unregister(cluster->mdev_info); -+ cluster->mdev_info = NULL; -+ } ++ rockchip_cpufreq_remove_monitor(cluster); ++ rockchip_cpufreq_remove_dsu_qos(cluster); + } + + return NOTIFY_OK; @@ -125687,6 +127872,138 @@ index 000000000000..1a0e960870c1 + .notifier_call = rockchip_cpufreq_notifier, +}; + ++#ifdef MODULE ++static struct pm_qos_request idle_pm_qos; ++static int idle_disable_refcnt; ++static DEFINE_MUTEX(idle_disable_lock); ++ ++static int rockchip_cpufreq_idle_state_disable(struct cpumask *cpumask, ++ int index, bool disable) ++{ ++ mutex_lock(&idle_disable_lock); ++ ++ if (disable) { ++ if (idle_disable_refcnt == 0) ++ cpu_latency_qos_update_request(&idle_pm_qos, 0); ++ idle_disable_refcnt++; ++ } else { ++ if (--idle_disable_refcnt == 0) ++ cpu_latency_qos_update_request(&idle_pm_qos, ++ PM_QOS_DEFAULT_VALUE); ++ } ++ ++ mutex_unlock(&idle_disable_lock); ++ ++ return 0; ++} ++#else ++static int rockchip_cpufreq_idle_state_disable(struct cpumask *cpumask, ++ int index, bool disable) ++{ ++ unsigned int cpu; ++ ++ for_each_cpu(cpu, cpumask) { ++ struct cpuidle_device *dev = per_cpu(cpuidle_devices, cpu); ++ struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev); ++ ++ if (!dev || !drv) ++ continue; ++ if (index >= drv->state_count) ++ continue; ++ cpuidle_driver_state_disabled(drv, index, disable); ++ } ++ ++ if (disable) { ++ preempt_disable(); ++ for_each_cpu(cpu, cpumask) { ++ if (cpu != smp_processor_id() && cpu_online(cpu)) ++ wake_up_if_idle(cpu); ++ } ++ preempt_enable(); ++ } ++ ++ return 0; ++} ++#endif ++ ++#define cpu_to_dsu_freq(freq) ((freq) * 4 / 5) ++ ++static int rockchip_cpufreq_update_dsu_req(struct cluster_info *cluster, ++ unsigned int freq) ++{ ++ struct device *dev = cluster->opp_info.dev; ++ unsigned int dsu_freq = rounddown(cpu_to_dsu_freq(freq), 100000); ++ ++ if (cluster->is_opp_shared_dsu || ++ !freq_qos_request_active(&cluster->dsu_qos_req)) ++ return 0; ++ ++ dev_dbg(dev, "cpu to dsu: %u -> %u\n", freq, dsu_freq); ++ ++ return freq_qos_update_request(&cluster->dsu_qos_req, dsu_freq); ++} ++ ++static int rockchip_cpufreq_transition_notifier(struct notifier_block *nb, ++ unsigned long event, void *data) ++{ ++ struct cpufreq_freqs *freqs = data; ++ struct cpufreq_policy *policy = freqs->policy; ++ struct cluster_info *cluster; ++ ++ cluster = rockchip_cluster_info_lookup(policy->cpu); ++ if (!cluster) ++ return NOTIFY_BAD; ++ ++ if (event == CPUFREQ_PRECHANGE) { ++ if (cluster->idle_threshold_freq && ++ freqs->new >= cluster->idle_threshold_freq && ++ !cluster->is_idle_disabled) { ++ rockchip_cpufreq_idle_state_disable(policy->cpus, 1, ++ true); ++ cluster->is_idle_disabled = true; ++ } ++ } else if (event == CPUFREQ_POSTCHANGE) { ++ if (cluster->idle_threshold_freq && ++ freqs->new < cluster->idle_threshold_freq && ++ cluster->is_idle_disabled) { ++ rockchip_cpufreq_idle_state_disable(policy->cpus, 1, ++ false); ++ cluster->is_idle_disabled = false; ++ } ++ rockchip_cpufreq_update_dsu_req(cluster, freqs->new); ++ } ++ ++ return NOTIFY_OK; ++} ++ ++static struct notifier_block rockchip_cpufreq_transition_notifier_block = { ++ .notifier_call = rockchip_cpufreq_transition_notifier, ++}; ++ ++static int rockchip_cpufreq_panic_notifier(struct notifier_block *nb, ++ unsigned long v, void *p) ++{ ++ struct cluster_info *ci; ++ struct device *dev; ++ ++ list_for_each_entry(ci, &cluster_info_list, list_head) { ++ dev = ci->opp_info.dev; ++ ++ if (ci->regulator_count == 1) ++ dev_info(dev, "cur_freq: %lu Hz, volt: %lu uV\n", ++ ci->rate, ci->volt); ++ else ++ dev_info(dev, "cur_freq: %lu Hz, volt_vdd: %lu uV, volt_mem: %lu uV\n", ++ ci->rate, ci->volt, ci->mem_volt); ++ } ++ ++ return 0; ++} ++ ++static struct notifier_block rockchip_cpufreq_panic_notifier_block = { ++ .notifier_call = rockchip_cpufreq_panic_notifier, ++}; ++ +static int __init rockchip_cpufreq_driver_init(void) +{ + struct cluster_info *cluster, *pos; @@ -125722,6 +128039,25 @@ index 000000000000..1a0e960870c1 + goto release_cluster_info; + } + ++ if (of_machine_is_compatible("rockchip,rk3588")) { ++ ret = cpufreq_register_notifier(&rockchip_cpufreq_transition_notifier_block, ++ CPUFREQ_TRANSITION_NOTIFIER); ++ if (ret) { ++ cpufreq_unregister_notifier(&rockchip_cpufreq_notifier_block, ++ CPUFREQ_POLICY_NOTIFIER); ++ pr_err("failed to register cpufreq notifier\n"); ++ goto release_cluster_info; ++ } ++#ifdef MODULE ++ cpu_latency_qos_add_request(&idle_pm_qos, PM_QOS_DEFAULT_VALUE); ++#endif ++ } ++ ++ ret = atomic_notifier_chain_register(&panic_notifier_list, ++ &rockchip_cpufreq_panic_notifier_block); ++ if (ret) ++ pr_err("failed to register cpufreq panic notifier\n"); ++ + return PTR_ERR_OR_ZERO(platform_device_register_data(NULL, "cpufreq-dt", + -1, (void *)&pdata, + sizeof(struct cpufreq_dt_platform_data))); @@ -125740,7 +128076,7 @@ index 000000000000..1a0e960870c1 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/cpufreq/rockchip-cpufreq.h b/drivers/cpufreq/rockchip-cpufreq.h new file mode 100755 -index 000000000000..3b3dbcf73449 +index 000000000..3b3dbcf73 --- /dev/null +++ b/drivers/cpufreq/rockchip-cpufreq.h @@ -0,0 +1,24 @@ @@ -125769,7 +128105,7 @@ index 000000000000..3b3dbcf73449 + +#endif diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c -index 4070e573bf43..557f59ac47a3 100644 +index 4070e573b..557f59ac4 100644 --- a/drivers/cpuidle/driver.c +++ b/drivers/cpuidle/driver.c @@ -381,3 +381,4 @@ void cpuidle_driver_state_disabled(struct cpuidle_driver *drv, int idx, @@ -125778,7 +128114,7 @@ index 4070e573bf43..557f59ac47a3 100644 } +EXPORT_SYMBOL_GPL(cpuidle_driver_state_disabled); diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c -index 29acaf48e575..0e51ed25665e 100644 +index 29acaf48e..0e51ed256 100644 --- a/drivers/cpuidle/governor.c +++ b/drivers/cpuidle/governor.c @@ -102,6 +102,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov) @@ -125795,7 +128131,7 @@ index 29acaf48e575..0e51ed25665e 100644 } +EXPORT_SYMBOL_GPL(cpuidle_governor_latency_req); diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig -index 37dc40d1fcfb..ab9c00a1b1c3 100644 +index 37dc40d1f..ab9c00a1b 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -131,15 +131,20 @@ config ARM_TEGRA20_DEVFREQ @@ -125824,7 +128160,7 @@ index 37dc40d1fcfb..ab9c00a1b1c3 100644 from hardware. diff --git a/drivers/devfreq/Makefile b/drivers/devfreq/Makefile -index 3ca1ad0ecb97..abea7adbc7da 100644 +index 3ca1ad0ec..abea7adbc 100644 --- a/drivers/devfreq/Makefile +++ b/drivers/devfreq/Makefile @@ -11,7 +11,8 @@ obj-$(CONFIG_DEVFREQ_GOV_PASSIVE) += governor_passive.o @@ -125838,7 +128174,7 @@ index 3ca1ad0ecb97..abea7adbc7da 100644 obj-$(CONFIG_ARM_TEGRA20_DEVFREQ) += tegra20-devfreq.o diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c -index c6f460550f5e..db0fe99c8d61 100644 +index c6f460550..db0fe99c8 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -1761,6 +1761,40 @@ static ssize_t timer_store(struct device *dev, struct device_attribute *attr, @@ -125891,7 +128227,7 @@ index c6f460550f5e..db0fe99c8d61 100644 }; ATTRIBUTE_GROUPS(devfreq); diff --git a/drivers/devfreq/event/Kconfig b/drivers/devfreq/event/Kconfig -index 878825372f6f..4526c69c602e 100644 +index 878825372..4526c69c6 100644 --- a/drivers/devfreq/event/Kconfig +++ b/drivers/devfreq/event/Kconfig @@ -39,4 +39,11 @@ config DEVFREQ_EVENT_ROCKCHIP_DFI @@ -125907,7 +128243,7 @@ index 878825372f6f..4526c69c602e 100644 + endif # PM_DEVFREQ_EVENT diff --git a/drivers/devfreq/event/Makefile b/drivers/devfreq/event/Makefile -index 3c847e5d5a35..03d67f06c22e 100644 +index 3c847e5d5..03d67f06c 100644 --- a/drivers/devfreq/event/Makefile +++ b/drivers/devfreq/event/Makefile @@ -4,3 +4,4 @@ @@ -125916,7 +128252,7 @@ index 3c847e5d5a35..03d67f06c22e 100644 obj-$(CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI) += rockchip-dfi.o +obj-$(CONFIG_DEVFREQ_EVENT_ROCKCHIP_NOCP) += rockchip-nocp.o diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c -index 9a88faaf8b27..9fd6a82f79d6 100644 +index 9a88faaf8..9fd6a82f7 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -20,23 +20,70 @@ @@ -126582,7 +128918,7 @@ index 9a88faaf8b27..9fd6a82f79d6 100644 diff --git a/drivers/devfreq/event/rockchip-nocp.c b/drivers/devfreq/event/rockchip-nocp.c new file mode 100755 -index 000000000000..957b84ee3290 +index 000000000..957b84ee3 --- /dev/null +++ b/drivers/devfreq/event/rockchip-nocp.c @@ -0,0 +1,166 @@ @@ -126754,7 +129090,7 @@ index 000000000000..957b84ee3290 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c deleted file mode 100644 -index 7e52375d9818..000000000000 +index 7e52375d9..000000000 --- a/drivers/devfreq/rk3399_dmc.c +++ /dev/null @@ -1,518 +0,0 @@ @@ -127278,7 +129614,7 @@ index 7e52375d9818..000000000000 -MODULE_DESCRIPTION("RK3399 dmcfreq driver with devfreq framework"); diff --git a/drivers/devfreq/rockchip_bus.c b/drivers/devfreq/rockchip_bus.c new file mode 100755 -index 000000000000..7032b4815c5a +index 000000000..7032b4815 --- /dev/null +++ b/drivers/devfreq/rockchip_bus.c @@ -0,0 +1,500 @@ @@ -127784,10 +130120,10 @@ index 000000000000..7032b4815c5a +MODULE_DESCRIPTION("rockchip busfreq driver with devfreq framework"); diff --git a/drivers/devfreq/rockchip_dmc.c b/drivers/devfreq/rockchip_dmc.c new file mode 100755 -index 000000000000..2df1edb1caf3 +index 000000000..e3d39bd8c --- /dev/null +++ b/drivers/devfreq/rockchip_dmc.c -@@ -0,0 +1,3283 @@ +@@ -0,0 +1,3558 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Rockchip Generic dmc support. @@ -127797,7 +130133,6 @@ index 000000000000..2df1edb1caf3 + */ + +#include -+#include +#include +#include +#include @@ -127833,13 +130168,13 @@ index 000000000000..2df1edb1caf3 +#include +#include +#include -+#include +#include + +#include "governor.h" +#include "rockchip_dmc_timing.h" +#include "../clk/rockchip/clk.h" +#include "../gpu/drm/rockchip/rockchip_drm_drv.h" ++#include "../opp/opp.h" + +#define system_status_to_dmcfreq(nb) container_of(nb, struct rockchip_dmcfreq, \ + status_nb) @@ -127851,16 +130186,13 @@ index 000000000000..2df1edb1caf3 + input_handler) + +#define VIDEO_1080P_SIZE (1920 * 1080) -+#define FIQ_INIT_HANDLER (0x1) -+#define FIQ_CPU_TGT_BOOT (0x0) /* to booting cpu */ -+#define FIQ_NUM_FOR_DCF (143) /* NA irq map to fiq for dcf */ +#define DTS_PAR_OFFSET (4096) + +#define FALLBACK_STATIC_TEMPERATURE 55000 + +struct dmc_freq_table { + unsigned long freq; -+ unsigned long volt; ++ struct dev_pm_opp_supply supplies[2]; +}; + +struct share_params { @@ -127886,7 +130218,9 @@ index 000000000000..2df1edb1caf3 + + u32 freq_count; + u32 freq_info_mhz[6]; -+ /* if need, add parameter after */ ++ u32 wait_mode; ++ u32 vop_scan_line_time_ns; ++ /* if need, add parameter after */ +}; + +static struct share_params *ddr_psci_param; @@ -127905,7 +130239,9 @@ index 000000000000..2df1edb1caf3 + struct mutex lock; /* serializes access to video_info_list */ + struct dram_timing *timing; + struct regulator *vdd_center; ++ struct regulator *mem_reg; + struct notifier_block status_nb; ++ struct notifier_block panic_nb; + struct list_head video_info_list; + struct freq_map_table *cpu_bw_tbl; + struct work_struct boost_work; @@ -127914,18 +130250,23 @@ index 000000000000..2df1edb1caf3 + struct share_params *set_rate_params; + + unsigned long *nocp_bw; -+ unsigned long rate, target_rate; -+ unsigned long volt, target_volt; ++ unsigned long rate; ++ unsigned long volt, mem_volt; ++ unsigned long sleep_volt, sleep_mem_volt; + unsigned long auto_min_rate; + unsigned long status_rate; + unsigned long normal_rate; + unsigned long video_1080p_rate; + unsigned long video_4k_rate; + unsigned long video_4k_10b_rate; ++ unsigned long video_4k_60p_rate; ++ unsigned long video_svep_rate; + unsigned long performance_rate; + unsigned long hdmi_rate; ++ unsigned long hdmirx_rate; + unsigned long idle_rate; + unsigned long suspend_rate; ++ unsigned long deep_suspend_rate; + unsigned long reboot_rate; + unsigned long boost_rate; + unsigned long fixed_rate; @@ -127944,6 +130285,7 @@ index 000000000000..2df1edb1caf3 + int edev_count; + int dfi_id; + int nocp_cpu_id; ++ int regulator_count; + + bool is_fixed; + bool is_set_rate_direct; @@ -127961,6 +130303,16 @@ index 000000000000..2df1edb1caf3 + +static struct pm_qos_request pm_qos; + ++static int rockchip_dmcfreq_opp_helper(struct dev_pm_set_opp_data *data); ++ ++static struct monitor_dev_profile dmc_mdevp = { ++ .type = MONITOR_TYPE_DEV, ++ .low_temp_adjust = rockchip_monitor_dev_low_temp_adjust, ++ .high_temp_adjust = rockchip_monitor_dev_high_temp_adjust, ++ .update_volt = rockchip_monitor_check_rate_volt, ++ .set_opp = rockchip_dmcfreq_opp_helper, ++}; ++ +static inline unsigned long is_dualview(unsigned long status) +{ + return (status & SYS_STATUS_LCDC0) && (status & SYS_STATUS_LCDC1); @@ -128123,6 +130475,7 @@ index 000000000000..2df1edb1caf3 + + ddr_psci_param->hz = target_rate; + ddr_psci_param->lcdc_type = rk_drm_get_lcdc_type(); ++ ddr_psci_param->vop_scan_line_time_ns = rockchip_drm_get_scan_line_time_ns(); + ddr_psci_param->wait_flag1 = 1; + ddr_psci_param->wait_flag0 = 1; + @@ -128135,48 +130488,47 @@ index 000000000000..2df1edb1caf3 + return res.a0; +} + -+static int rockchip_dmcfreq_target(struct device *dev, unsigned long *freq, -+ u32 flags) ++static int rockchip_dmcfreq_set_volt(struct device *dev, struct regulator *reg, ++ struct dev_pm_opp_supply *supply, ++ char *reg_name) ++{ ++ int ret; ++ ++ dev_dbg(dev, "%s: %s voltages (mV): %lu %lu %lu\n", __func__, reg_name, ++ supply->u_volt_min, supply->u_volt, supply->u_volt_max); ++ ret = regulator_set_voltage_triplet(reg, supply->u_volt_min, ++ supply->u_volt, INT_MAX); ++ if (ret) ++ dev_err(dev, "%s: failed to set voltage (%lu %lu %lu mV): %d\n", ++ __func__, supply->u_volt_min, supply->u_volt, ++ supply->u_volt_max, ret); ++ ++ return ret; ++} ++ ++static int rockchip_dmcfreq_opp_helper(struct dev_pm_set_opp_data *data) +{ ++ struct dev_pm_opp_supply *old_supply_vdd = &data->old_opp.supplies[0]; ++ struct dev_pm_opp_supply *new_supply_vdd = &data->new_opp.supplies[0]; ++ struct regulator *vdd_reg = data->regulators[0]; ++ struct dev_pm_opp_supply *old_supply_mem; ++ struct dev_pm_opp_supply *new_supply_mem; ++ struct regulator *mem_reg; ++ struct device *dev = data->dev; ++ struct clk *clk = data->clk; + struct rockchip_dmcfreq *dmcfreq = dev_get_drvdata(dev); -+ struct dev_pm_opp *opp; + struct cpufreq_policy *policy; -+ unsigned long old_clk_rate = dmcfreq->rate; -+ unsigned long target_volt, target_rate; -+ unsigned int cpu_cur, cpufreq_cur; ++ unsigned long old_freq = data->old_opp.rate; ++ unsigned long freq = data->new_opp.rate; ++ unsigned int reg_count = data->regulator_count; + bool is_cpufreq_changed = false; -+ int err = 0; -+ -+ opp = devfreq_recommended_opp(dev, freq, flags); -+ if (IS_ERR(opp)) { -+ dev_err(dev, "Failed to find opp for %lu Hz\n", *freq); -+ return PTR_ERR(opp); -+ } -+ target_volt = dev_pm_opp_get_voltage(opp); -+ dev_pm_opp_put(opp); -+ -+ if (dmcfreq->is_set_rate_direct) { -+ target_rate = *freq; -+ } else { -+ target_rate = clk_round_rate(dmcfreq->dmc_clk, *freq); -+ if ((long)target_rate <= 0) -+ target_rate = *freq; -+ } ++ unsigned int cpu_cur, cpufreq_cur; ++ int ret = 0; + -+ if (dmcfreq->rate == target_rate) { -+ if (dmcfreq->volt == target_volt) -+ return 0; -+ err = regulator_set_voltage(dmcfreq->vdd_center, target_volt, -+ INT_MAX); -+ if (err) { -+ dev_err(dev, "Cannot set voltage %lu uV\n", -+ target_volt); -+ return err; -+ } -+ dmcfreq->volt = target_volt; -+ return 0; -+ } else if (!dmcfreq->volt) { -+ dmcfreq->volt = regulator_get_voltage(dmcfreq->vdd_center); ++ if (reg_count > 1) { ++ old_supply_mem = &data->old_opp.supplies[1]; ++ new_supply_mem = &data->new_opp.supplies[1]; ++ mem_reg = data->regulators[1]; + } + + /* @@ -128186,47 +130538,54 @@ index 000000000000..2df1edb1caf3 + * Do this before taking the policy rwsem to avoid deadlocks between the + * mutex that is locked/unlocked in cpu_hotplug_disable/enable. And it + * can also avoid deadlocks between the mutex that is locked/unlocked -+ * in get/put_online_cpus (such as store_scaling_max_freq()). -+ */ -+ get_online_cpus(); -+ -+ /* -+ * Go to specified cpufreq and block other cpufreq changes since -+ * set_rate needs to complete during vblank. ++ * in cpus_read_lock/unlock (such as store_scaling_max_freq()). + */ -+ cpu_cur = raw_smp_processor_id(); -+ policy = cpufreq_cpu_get(cpu_cur); -+ if (!policy) { -+ dev_err(dev, "cpu%d policy NULL\n", cpu_cur); -+ goto cpufreq; -+ } -+ down_write(&policy->rwsem); -+ cpufreq_cur = cpufreq_quick_get(cpu_cur); ++ cpus_read_lock(); + -+ /* If we're thermally throttled; don't change; */ -+ if (dmcfreq->min_cpu_freq && cpufreq_cur < dmcfreq->min_cpu_freq) { -+ if (policy->max >= dmcfreq->min_cpu_freq) { -+ __cpufreq_driver_target(policy, dmcfreq->min_cpu_freq, -+ CPUFREQ_RELATION_L); -+ is_cpufreq_changed = true; -+ } else { -+ dev_dbg(dev, "CPU may too slow for DMC (%d MHz)\n", -+ policy->max); ++ if (dmcfreq->min_cpu_freq) { ++ /* ++ * Go to specified cpufreq and block other cpufreq changes since ++ * set_rate needs to complete during vblank. ++ */ ++ cpu_cur = raw_smp_processor_id(); ++ policy = cpufreq_cpu_get(cpu_cur); ++ if (!policy) { ++ dev_err(dev, "cpu%d policy NULL\n", cpu_cur); ++ ret = -EINVAL; ++ goto cpufreq; ++ } ++ down_write(&policy->rwsem); ++ cpufreq_cur = cpufreq_quick_get(cpu_cur); ++ ++ /* If we're thermally throttled; don't change; */ ++ if (cpufreq_cur < dmcfreq->min_cpu_freq) { ++ if (policy->max >= dmcfreq->min_cpu_freq) { ++ __cpufreq_driver_target(policy, ++ dmcfreq->min_cpu_freq, ++ CPUFREQ_RELATION_L); ++ is_cpufreq_changed = true; ++ } else { ++ dev_dbg(dev, ++ "CPU may too slow for DMC (%d MHz)\n", ++ policy->max); ++ } + } + } + -+ /* -+ * If frequency scaling from low to high, adjust voltage first. -+ * If frequency scaling from high to low, adjust frequency first. -+ */ -+ if (old_clk_rate < target_rate) { -+ err = regulator_set_voltage(dmcfreq->vdd_center, target_volt, -+ INT_MAX); -+ if (err) { -+ dev_err(dev, "Cannot set voltage %lu uV\n", -+ target_volt); -+ goto out; ++ /* Scaling up? Scale voltage before frequency */ ++ if (freq >= old_freq) { ++ if (reg_count > 1) { ++ ret = rockchip_dmcfreq_set_volt(dev, mem_reg, ++ new_supply_mem, "mem"); ++ if (ret) ++ goto restore_voltage; + } ++ ret = rockchip_dmcfreq_set_volt(dev, vdd_reg, new_supply_vdd, ++ "vdd"); ++ if (ret) ++ goto restore_voltage; ++ if (freq == old_freq) ++ goto out; + } + + /* @@ -128238,7 +130597,7 @@ index 000000000000..2df1edb1caf3 + */ + while (!rockchip_dmcfreq_write_trylock()) + cond_resched(); -+ dev_dbg(dev, "%lu-->%lu\n", old_clk_rate, target_rate); ++ dev_dbg(dev, "%lu Hz --> %lu Hz\n", old_freq, freq); + + if (dmcfreq->set_rate_params) { + dmcfreq->set_rate_params->lcdc_type = rk_drm_get_lcdc_type(); @@ -128247,59 +130606,108 @@ index 000000000000..2df1edb1caf3 + } + + if (dmcfreq->is_set_rate_direct) -+ err = rockchip_ddr_set_rate(target_rate); ++ ret = rockchip_ddr_set_rate(freq); + else -+ err = clk_set_rate(dmcfreq->dmc_clk, target_rate); ++ ret = clk_set_rate(clk, freq); + + rockchip_dmcfreq_write_unlock(); -+ if (err) { -+ dev_err(dev, "Cannot set frequency %lu (%d)\n", -+ target_rate, err); -+ regulator_set_voltage(dmcfreq->vdd_center, dmcfreq->volt, -+ INT_MAX); -+ goto out; ++ if (ret) { ++ dev_err(dev, "%s: failed to set clock rate: %d\n", __func__, ++ ret); ++ goto restore_voltage; + } + + /* + * Check the dpll rate, + * There only two result we will get, + * 1. Ddr frequency scaling fail, we still get the old rate. -+ * 2. Ddr frequency scaling sucessful, we get the rate we set. ++ * 2. Ddr frequency scaling successful, we get the rate we set. + */ -+ dmcfreq->rate = clk_get_rate(dmcfreq->dmc_clk); ++ dmcfreq->rate = clk_get_rate(clk); + + /* If get the incorrect rate, set voltage to old value. */ -+ if (dmcfreq->rate != target_rate) { ++ if (dmcfreq->rate != freq) { + dev_err(dev, "Get wrong frequency, Request %lu, Current %lu\n", -+ target_rate, dmcfreq->rate); -+ regulator_set_voltage(dmcfreq->vdd_center, dmcfreq->volt, -+ INT_MAX); -+ goto out; -+ } else if (old_clk_rate > target_rate) { -+ err = regulator_set_voltage(dmcfreq->vdd_center, target_volt, -+ INT_MAX); -+ if (err) { -+ dev_err(dev, "Cannot set vol %lu uV\n", target_volt); -+ goto out; -+ } ++ freq, dmcfreq->rate); ++ ret = -EINVAL; ++ goto restore_voltage; + } + -+ if (dmcfreq->info.devfreq) { -+ struct devfreq *devfreq = dmcfreq->info.devfreq; -+ -+ devfreq->last_status.current_frequency = *freq; ++ /* Scaling down? Scale voltage after frequency */ ++ if (freq < old_freq) { ++ ret = rockchip_dmcfreq_set_volt(dev, vdd_reg, new_supply_vdd, ++ "vdd"); ++ if (ret) ++ goto restore_freq; ++ if (reg_count > 1) { ++ ret = rockchip_dmcfreq_set_volt(dev, mem_reg, ++ new_supply_mem, "mem"); ++ if (ret) ++ goto restore_freq; ++ } + } ++ dmcfreq->volt = new_supply_vdd->u_volt; ++ if (reg_count > 1) ++ dmcfreq->mem_volt = new_supply_mem->u_volt; ++ ++ goto out; + -+ dmcfreq->volt = target_volt; ++restore_freq: ++ if (dmcfreq->is_set_rate_direct) ++ ret = rockchip_ddr_set_rate(freq); ++ else ++ ret = clk_set_rate(clk, freq); ++ if (ret) ++ dev_err(dev, "%s: failed to restore old-freq (%lu Hz)\n", ++ __func__, old_freq); ++restore_voltage: ++ if (reg_count > 1 && old_supply_mem->u_volt) ++ rockchip_dmcfreq_set_volt(dev, mem_reg, old_supply_mem, "mem"); ++ if (old_supply_vdd->u_volt) ++ rockchip_dmcfreq_set_volt(dev, vdd_reg, old_supply_vdd, "vdd"); +out: -+ if (is_cpufreq_changed) -+ __cpufreq_driver_target(policy, cpufreq_cur, -+ CPUFREQ_RELATION_L); -+ up_write(&policy->rwsem); -+ cpufreq_cpu_put(policy); ++ if (dmcfreq->min_cpu_freq) { ++ if (is_cpufreq_changed) ++ __cpufreq_driver_target(policy, cpufreq_cur, ++ CPUFREQ_RELATION_L); ++ up_write(&policy->rwsem); ++ cpufreq_cpu_put(policy); ++ } +cpufreq: -+ put_online_cpus(); -+ return err; ++ cpus_read_unlock(); ++ ++ return ret; ++} ++ ++static int rockchip_dmcfreq_target(struct device *dev, unsigned long *freq, ++ u32 flags) ++{ ++ struct rockchip_dmcfreq *dmcfreq = dev_get_drvdata(dev); ++ struct devfreq *devfreq; ++ struct dev_pm_opp *opp; ++ int ret = 0; ++ ++ if (!dmc_mdevp.is_checked) ++ return -EINVAL; ++ ++ opp = devfreq_recommended_opp(dev, freq, flags); ++ if (IS_ERR(opp)) { ++ dev_err(dev, "Failed to find opp for %lu Hz\n", *freq); ++ return PTR_ERR(opp); ++ } ++ dev_pm_opp_put(opp); ++ ++ rockchip_monitor_volt_adjust_lock(dmcfreq->mdev_info); ++ ret = dev_pm_opp_set_rate(dev, *freq); ++ if (!ret) { ++ if (dmcfreq->info.devfreq) { ++ devfreq = dmcfreq->info.devfreq; ++ devfreq->last_status.current_frequency = *freq; ++ } ++ } ++ rockchip_monitor_volt_adjust_unlock(dmcfreq->mdev_info); ++ ++ return ret; +} + +static int rockchip_dmcfreq_get_dev_status(struct device *dev, @@ -128312,12 +130720,17 @@ index 000000000000..2df1edb1caf3 + if (!dmcfreq->info.auto_freq_en) + return -EINVAL; + ++ /* ++ * RK3588 platform may crash if the CPU and MCU access the DFI/DMC ++ * registers at same time. ++ */ ++ rockchip_monitor_volt_adjust_lock(dmcfreq->mdev_info); + for (i = 0; i < dmcfreq->edev_count; i++) { + ret = devfreq_event_get_event(dmcfreq->edev[i], &edata); + if (ret < 0) { + dev_err(dev, "failed to get event %s\n", + dmcfreq->edev[i]->desc->name); -+ return ret; ++ goto out; + } + if (i == dmcfreq->dfi_id) { + stat->busy_time = edata.load_count; @@ -128327,7 +130740,10 @@ index 000000000000..2df1edb1caf3 + } + } + -+ return 0; ++out: ++ rockchip_monitor_volt_adjust_unlock(dmcfreq->mdev_info); ++ ++ return ret; +} + +static int rockchip_dmcfreq_get_cur_freq(struct device *dev, @@ -128698,70 +131114,6 @@ index 000000000000..2df1edb1caf3 + of_node_put(np_tim); +} + -+static struct rk3368_dram_timing *of_get_rk3368_timings(struct device *dev, -+ struct device_node *np) -+{ -+ struct rk3368_dram_timing *timing = NULL; -+ struct device_node *np_tim; -+ int ret = 0; -+ -+ np_tim = of_parse_phandle(np, "ddr_timing", 0); -+ if (np_tim) { -+ timing = devm_kzalloc(dev, sizeof(*timing), GFP_KERNEL); -+ if (!timing) -+ goto err; -+ -+ ret |= of_property_read_u32(np_tim, "dram_spd_bin", -+ &timing->dram_spd_bin); -+ ret |= of_property_read_u32(np_tim, "sr_idle", -+ &timing->sr_idle); -+ ret |= of_property_read_u32(np_tim, "pd_idle", -+ &timing->pd_idle); -+ ret |= of_property_read_u32(np_tim, "dram_dll_disb_freq", -+ &timing->dram_dll_dis_freq); -+ ret |= of_property_read_u32(np_tim, "phy_dll_disb_freq", -+ &timing->phy_dll_dis_freq); -+ ret |= of_property_read_u32(np_tim, "dram_odt_disb_freq", -+ &timing->dram_odt_dis_freq); -+ ret |= of_property_read_u32(np_tim, "phy_odt_disb_freq", -+ &timing->phy_odt_dis_freq); -+ ret |= of_property_read_u32(np_tim, "ddr3_drv", -+ &timing->ddr3_drv); -+ ret |= of_property_read_u32(np_tim, "ddr3_odt", -+ &timing->ddr3_odt); -+ ret |= of_property_read_u32(np_tim, "lpddr3_drv", -+ &timing->lpddr3_drv); -+ ret |= of_property_read_u32(np_tim, "lpddr3_odt", -+ &timing->lpddr3_odt); -+ ret |= of_property_read_u32(np_tim, "lpddr2_drv", -+ &timing->lpddr2_drv); -+ ret |= of_property_read_u32(np_tim, "phy_clk_drv", -+ &timing->phy_clk_drv); -+ ret |= of_property_read_u32(np_tim, "phy_cmd_drv", -+ &timing->phy_cmd_drv); -+ ret |= of_property_read_u32(np_tim, "phy_dqs_drv", -+ &timing->phy_dqs_drv); -+ ret |= of_property_read_u32(np_tim, "phy_odt", -+ &timing->phy_odt); -+ ret |= of_property_read_u32(np_tim, "ddr_2t", -+ &timing->ddr_2t); -+ if (ret) { -+ devm_kfree(dev, timing); -+ goto err; -+ } -+ of_node_put(np_tim); -+ return timing; -+ } -+ -+err: -+ if (timing) { -+ devm_kfree(dev, timing); -+ timing = NULL; -+ } -+ of_node_put(np_tim); -+ return timing; -+} -+ +static struct rk3399_dram_timing *of_get_rk3399_timings(struct device *dev, + struct device_node *np) +{ @@ -128928,6 +131280,16 @@ index 000000000000..2df1edb1caf3 + wait_event_timeout(wait_ctrl.wait_wq, (wait_ctrl.wait_flag == 0), + msecs_to_jiffies(wait_ctrl.wait_time_out_ms)); + ++ /* ++ * If waiting for wait_ctrl.complt_irq times out, clear the IRQ and stop the MCU by ++ * sip_smc_dram(DRAM_POST_SET_RATE). ++ */ ++ if (wait_ctrl.dcf_en == 2 && wait_ctrl.wait_flag != 0) { ++ res = sip_smc_dram(SHARE_PAGE_TYPE_DDR, 0, ROCKCHIP_SIP_CONFIG_DRAM_POST_SET_RATE); ++ if (res.a0) ++ pr_err("%s: dram post set rate error:%lx\n", __func__, res.a0); ++ } ++ + cpu_latency_qos_update_request(&pm_qos, PM_QOS_DEFAULT_VALUE); + disable_irq(wait_ctrl.complt_irq); + @@ -128966,7 +131328,7 @@ index 000000000000..2df1edb1caf3 + return ret; + } + -+ freq_table = kmalloc(sizeof(struct dmc_freq_table) * count, GFP_KERNEL); ++ freq_table = kzalloc(sizeof(*freq_table) * count, GFP_KERNEL); + for (i = 0, rate = 0; i < count; i++, rate++) { + /* find next rate */ + opp = dev_pm_opp_find_freq_ceil(dmcfreq->dev, &rate); @@ -128976,7 +131338,7 @@ index 000000000000..2df1edb1caf3 + goto out; + } + freq_table[i].freq = rate; -+ freq_table[i].volt = dev_pm_opp_get_voltage(opp); ++ freq_table[i].supplies[0].u_volt = dev_pm_opp_get_voltage(opp); + dev_pm_opp_put(opp); + + for (j = 0; j < dmcfreq->freq_count; j++) { @@ -128984,7 +131346,7 @@ index 000000000000..2df1edb1caf3 + break; + } + if (j == dmcfreq->freq_count) -+ dev_pm_opp_remove(dmcfreq->dev, rate); ++ dev_pm_opp_disable(dmcfreq->dev, rate); + } + + for (i = 0; i < dmcfreq->freq_count; i++) { @@ -128993,7 +131355,7 @@ index 000000000000..2df1edb1caf3 + break; + } else if (dmcfreq->freq_info_rate[i] < freq_table[j].freq) { + dev_pm_opp_add(dmcfreq->dev, dmcfreq->freq_info_rate[i], -+ freq_table[j].volt); ++ freq_table[j].supplies[0].u_volt); + break; + } + } @@ -129013,6 +131375,103 @@ index 000000000000..2df1edb1caf3 + return ret; +} + ++static __maybe_unused int ++rockchip_dmcfreq_adjust_opp_table(struct rockchip_dmcfreq *dmcfreq) ++{ ++ struct device *dev = dmcfreq->dev; ++ struct arm_smccc_res res; ++ struct dev_pm_opp *opp; ++ struct opp_table *opp_table; ++ struct dmc_freq_table *freq_table; ++ int i, j, count = 0, ret = 0; ++ ++ res = sip_smc_dram(SHARE_PAGE_TYPE_DDR, 0, ++ ROCKCHIP_SIP_CONFIG_DRAM_GET_FREQ_INFO); ++ if (res.a0) { ++ dev_err(dev, "rockchip_sip_config_dram_get_freq_info error:%lx\n", ++ res.a0); ++ return -ENOMEM; ++ } ++ ++ if (ddr_psci_param->freq_count == 0 || ddr_psci_param->freq_count > 6) { ++ dev_err(dev, "there is no available frequencies!\n"); ++ return -EPERM; ++ } ++ ++ for (i = 0; i < ddr_psci_param->freq_count; i++) ++ dmcfreq->freq_info_rate[i] = ddr_psci_param->freq_info_mhz[i] * 1000000; ++ dmcfreq->freq_count = ddr_psci_param->freq_count; ++ ++ count = dev_pm_opp_get_opp_count(dev); ++ if (count <= 0) { ++ dev_err(dev, "there is no available opp\n"); ++ ret = count ? count : -ENODATA; ++ return ret; ++ } ++ ++ freq_table = kzalloc(sizeof(*freq_table) * count, GFP_KERNEL); ++ opp_table = dev_pm_opp_get_opp_table(dev); ++ if (!opp_table) { ++ ret = -ENOMEM; ++ goto out; ++ } ++ ++ mutex_lock(&opp_table->lock); ++ i = 0; ++ list_for_each_entry(opp, &opp_table->opp_list, node) { ++ if (!opp->available) ++ continue; ++ ++ freq_table[i].freq = opp->rate; ++ freq_table[i].supplies[0] = opp->supplies[0]; ++ if (dmcfreq->regulator_count > 1) ++ freq_table[i].supplies[1] = opp->supplies[1]; ++ ++ i++; ++ } ++ ++ i = 0; ++ list_for_each_entry(opp, &opp_table->opp_list, node) { ++ if (!opp->available) ++ continue; ++ ++ if (i >= dmcfreq->freq_count) { ++ opp->available = false; ++ continue; ++ } ++ ++ for (j = 0; j < count; j++) { ++ if (dmcfreq->freq_info_rate[i] <= freq_table[j].freq) { ++ opp->rate = dmcfreq->freq_info_rate[i]; ++ opp->supplies[0] = freq_table[j].supplies[0]; ++ if (dmcfreq->regulator_count > 1) ++ opp->supplies[1] = freq_table[j].supplies[1]; ++ ++ break; ++ } ++ } ++ if (j == count) { ++ dev_err(dmcfreq->dev, "failed to match dmc_opp_table for %ld\n", ++ dmcfreq->freq_info_rate[i]); ++ if (i == 0) { ++ ret = -EPERM; ++ goto out; ++ } else { ++ opp->available = false; ++ dmcfreq->freq_count = i; ++ } ++ } ++ i++; ++ } ++ ++ mutex_unlock(&opp_table->lock); ++ dev_pm_opp_put_opp_table(opp_table); ++ ++out: ++ kfree(freq_table); ++ return ret; ++} ++ +static __maybe_unused int px30_dmc_init(struct platform_device *pdev, + struct rockchip_dmcfreq *dmcfreq) +{ @@ -129381,86 +131840,6 @@ index 000000000000..2df1edb1caf3 + return 0; +} + -+static __maybe_unused int rk3368_dmc_init(struct platform_device *pdev, -+ struct rockchip_dmcfreq *dmcfreq) -+{ -+ struct device *dev = &pdev->dev; -+ struct device_node *np = pdev->dev.of_node; -+ struct arm_smccc_res res; -+ struct rk3368_dram_timing *dram_timing; -+ struct clk *pclk_phy, *pclk_upctl; -+ int ret; -+ u32 dram_spd_bin; -+ u32 addr_mcu_el3; -+ u32 dclk_mode; -+ u32 lcdc_type; -+ -+ pclk_phy = devm_clk_get(dev, "pclk_phy"); -+ if (IS_ERR(pclk_phy)) { -+ dev_err(dev, "Cannot get the clk pclk_phy\n"); -+ return PTR_ERR(pclk_phy); -+ } -+ ret = clk_prepare_enable(pclk_phy); -+ if (ret < 0) { -+ dev_err(dev, "failed to prepare/enable pclk_phy\n"); -+ return ret; -+ } -+ pclk_upctl = devm_clk_get(dev, "pclk_upctl"); -+ if (IS_ERR(pclk_upctl)) { -+ dev_err(dev, "Cannot get the clk pclk_upctl\n"); -+ return PTR_ERR(pclk_upctl); -+ } -+ ret = clk_prepare_enable(pclk_upctl); -+ if (ret < 0) { -+ dev_err(dev, "failed to prepare/enable pclk_upctl\n"); -+ return ret; -+ } -+ -+ /* -+ * Get dram timing and pass it to arm trust firmware, -+ * the dram drvier in arm trust firmware will get these -+ * timing and to do dram initial. -+ */ -+ dram_timing = of_get_rk3368_timings(dev, np); -+ if (dram_timing) { -+ dram_spd_bin = dram_timing->dram_spd_bin; -+ if (scpi_ddr_send_timing((u32 *)dram_timing, -+ sizeof(struct rk3368_dram_timing))) -+ dev_err(dev, "send ddr timing timeout\n"); -+ } else { -+ dev_err(dev, "get ddr timing from dts error\n"); -+ dram_spd_bin = DDR3_DEFAULT; -+ } -+ -+ res = sip_smc_mcu_el3fiq(FIQ_INIT_HANDLER, -+ FIQ_NUM_FOR_DCF, -+ FIQ_CPU_TGT_BOOT); -+ if ((res.a0) || (res.a1 == 0) || (res.a1 > 0x80000)) -+ dev_err(dev, "Trust version error, pls check trust version\n"); -+ addr_mcu_el3 = res.a1; -+ -+ if (of_property_read_u32(np, "vop-dclk-mode", &dclk_mode) == 0) -+ scpi_ddr_dclk_mode(dclk_mode); -+ -+ dmcfreq->set_rate_params = -+ devm_kzalloc(dev, sizeof(struct share_params), GFP_KERNEL); -+ if (!dmcfreq->set_rate_params) -+ return -ENOMEM; -+ rockchip_set_ddrclk_params(dmcfreq->set_rate_params); -+ -+ lcdc_type = rk_drm_get_lcdc_type(); -+ -+ if (scpi_ddr_init(dram_spd_bin, 0, lcdc_type, -+ addr_mcu_el3)) -+ dev_err(dev, "ddr init error\n"); -+ else -+ dev_dbg(dev, ("%s out\n"), __func__); -+ -+ dmcfreq->set_auto_self_refresh = scpi_ddr_set_auto_self_refresh; -+ -+ return 0; -+} -+ +static int rk3399_set_msch_readlatency(unsigned int readlatency) +{ + struct arm_smccc_res res; @@ -129518,6 +131897,79 @@ index 000000000000..2df1edb1caf3 + return 0; +} + ++static __maybe_unused int rk3528_dmc_init(struct platform_device *pdev, ++ struct rockchip_dmcfreq *dmcfreq) ++{ ++ struct arm_smccc_res res; ++ int ret; ++ int complt_irq; ++ u32 complt_hwirq; ++ struct irq_data *complt_irq_data; ++ ++ res = sip_smc_dram(0, 0, ROCKCHIP_SIP_CONFIG_DRAM_GET_VERSION); ++ dev_notice(&pdev->dev, "current ATF version 0x%lx\n", res.a1); ++ if (res.a0 || res.a1 < 0x100) { ++ dev_err(&pdev->dev, "trusted firmware need update to V1.00 and above.\n"); ++ return -ENXIO; ++ } ++ ++ /* ++ * first 4KB is used for interface parameters ++ * after 4KB is dts parameters ++ * request share memory size 4KB * 2 ++ */ ++ res = sip_smc_request_share_mem(2, SHARE_PAGE_TYPE_DDR); ++ if (res.a0 != 0) { ++ dev_err(&pdev->dev, "no ATF memory for init\n"); ++ return -ENOMEM; ++ } ++ ddr_psci_param = (struct share_params *)res.a1; ++ /* Clear ddr_psci_param, size is 4KB * 2 */ ++ memset_io(ddr_psci_param, 0x0, 4096 * 2); ++ ++ wait_ctrl.dcf_en = 0; ++ ++ init_waitqueue_head(&wait_ctrl.wait_wq); ++ wait_ctrl.wait_en = 1; ++ wait_ctrl.wait_time_out_ms = 17 * 5; ++ ++ complt_irq = platform_get_irq_byname(pdev, "complete"); ++ if (complt_irq < 0) { ++ dev_err(&pdev->dev, "no IRQ for complt_irq: %d\n", complt_irq); ++ return complt_irq; ++ } ++ wait_ctrl.complt_irq = complt_irq; ++ ++ ret = devm_request_irq(&pdev->dev, complt_irq, wait_dcf_complete_irq, ++ 0, dev_name(&pdev->dev), &wait_ctrl); ++ if (ret < 0) { ++ dev_err(&pdev->dev, "cannot request complt_irq\n"); ++ return ret; ++ } ++ disable_irq(complt_irq); ++ ++ complt_irq_data = irq_get_irq_data(complt_irq); ++ complt_hwirq = irqd_to_hwirq(complt_irq_data); ++ ddr_psci_param->complt_hwirq = complt_hwirq; ++ ++ res = sip_smc_dram(SHARE_PAGE_TYPE_DDR, 0, ROCKCHIP_SIP_CONFIG_DRAM_INIT); ++ if (res.a0) { ++ dev_err(&pdev->dev, "rockchip_sip_config_dram_init error:%lx\n", res.a0); ++ return -ENOMEM; ++ } ++ ++ ret = rockchip_get_freq_info(dmcfreq); ++ if (ret < 0) { ++ dev_err(&pdev->dev, "cannot get frequency info\n"); ++ return ret; ++ } ++ dmcfreq->is_set_rate_direct = true; ++ ++ dmcfreq->set_auto_self_refresh = rockchip_ddr_set_auto_self_refresh; ++ ++ return 0; ++} ++ +static __maybe_unused int rk3568_dmc_init(struct platform_device *pdev, + struct rockchip_dmcfreq *dmcfreq) +{ @@ -129594,6 +132046,8 @@ index 000000000000..2df1edb1caf3 + struct rockchip_dmcfreq *dmcfreq) +{ + struct arm_smccc_res res; ++ struct dev_pm_opp *opp; ++ unsigned long opp_rate; + int ret; + int complt_irq; + @@ -129646,13 +132100,34 @@ index 000000000000..2df1edb1caf3 + return -ENOMEM; + } + -+ ret = rockchip_get_freq_info(dmcfreq); ++ ret = rockchip_dmcfreq_adjust_opp_table(dmcfreq); + if (ret < 0) { + dev_err(&pdev->dev, "cannot get frequency info\n"); + return ret; + } + dmcfreq->is_set_rate_direct = true; + ++ /* Config the dmcfreq->sleep_volt for deepsleep */ ++ opp_rate = dmcfreq->freq_info_rate[dmcfreq->freq_count - 1]; ++ opp = devfreq_recommended_opp(&pdev->dev, &opp_rate, 0); ++ if (IS_ERR(opp)) { ++ dev_err(&pdev->dev, "Failed to find opp for %lu Hz\n", opp_rate); ++ return PTR_ERR(opp); ++ } ++ dmcfreq->sleep_volt = opp->supplies[0].u_volt; ++ if (dmcfreq->regulator_count > 1) ++ dmcfreq->sleep_mem_volt = opp->supplies[1].u_volt; ++ dev_pm_opp_put(opp); ++ ++ if (of_property_read_u32(pdev->dev.of_node, "wait-mode", &ddr_psci_param->wait_mode)) ++ ddr_psci_param->wait_mode = 0; ++ ++ res = sip_smc_dram(SHARE_PAGE_TYPE_DDR, 0, ROCKCHIP_SIP_CONFIG_DRAM_GET_STALL_TIME); ++ if (res.a0) ++ dev_err(dmcfreq->dev, "Current ATF unsupported get_stall_time\n"); ++ else ++ dmcfreq->info.stall_time_ns = (unsigned int)res.a1; ++ + dmcfreq->set_auto_self_refresh = rockchip_ddr_set_auto_self_refresh; + + return 0; @@ -129765,12 +132240,15 @@ index 000000000000..2df1edb1caf3 +#if IS_ENABLED(CONFIG_CPU_RK3328) + { .compatible = "rockchip,rk3328-dmc", .data = rk3328_dmc_init }, +#endif -+#if IS_ENABLED(CONFIG_CPU_RK3368) -+ { .compatible = "rockchip,rk3368-dmc", .data = rk3368_dmc_init }, -+#endif +#if IS_ENABLED(CONFIG_CPU_RK3399) + { .compatible = "rockchip,rk3399-dmc", .data = rk3399_dmc_init }, +#endif ++#if IS_ENABLED(CONFIG_CPU_RK3528) ++ { .compatible = "rockchip,rk3528-dmc", .data = rk3528_dmc_init }, ++#endif ++#if IS_ENABLED(CONFIG_CPU_RK3562) ++ { .compatible = "rockchip,rk3562-dmc", .data = rk3568_dmc_init }, ++#endif +#if IS_ENABLED(CONFIG_CPU_RK3568) + { .compatible = "rockchip,rk3568-dmc", .data = rk3568_dmc_init }, +#endif @@ -129902,6 +132380,9 @@ index 000000000000..2df1edb1caf3 + case SYS_STATUS_SUSPEND: + dmcfreq->suspend_rate = freq * 1000; + break; ++ case SYS_STATUS_DEEP_SUSPEND: ++ dmcfreq->deep_suspend_rate = freq * 1000; ++ break; + case SYS_STATUS_VIDEO_1080P: + dmcfreq->video_1080p_rate = freq * 1000; + break; @@ -129911,12 +132392,18 @@ index 000000000000..2df1edb1caf3 + case SYS_STATUS_VIDEO_4K_10B: + dmcfreq->video_4k_10b_rate = freq * 1000; + break; ++ case SYS_STATUS_VIDEO_SVEP: ++ dmcfreq->video_svep_rate = freq * 1000; ++ break; + case SYS_STATUS_PERFORMANCE: + dmcfreq->performance_rate = freq * 1000; + break; + case SYS_STATUS_HDMI: + dmcfreq->hdmi_rate = freq * 1000; + break; ++ case SYS_STATUS_HDMIRX: ++ dmcfreq->hdmirx_rate = freq * 1000; ++ break; + case SYS_STATUS_IDLE: + dmcfreq->idle_rate = freq * 1000; + break; @@ -130038,6 +132525,11 @@ index 000000000000..2df1edb1caf3 + dmcfreq->suspend_rate = rockchip_freq_level_2_rate(dmcfreq, level); + dev_info(dmcfreq->dev, "suspend_rate = %ld\n", dmcfreq->suspend_rate); + break; ++ case SYS_STATUS_DEEP_SUSPEND: ++ dmcfreq->deep_suspend_rate = rockchip_freq_level_2_rate(dmcfreq, level); ++ dev_info(dmcfreq->dev, "deep_suspend_rate = %ld\n", ++ dmcfreq->deep_suspend_rate); ++ break; + case SYS_STATUS_VIDEO_1080P: + dmcfreq->video_1080p_rate = rockchip_freq_level_2_rate(dmcfreq, level); + dev_info(dmcfreq->dev, "video_1080p_rate = %ld\n", @@ -130052,6 +132544,16 @@ index 000000000000..2df1edb1caf3 + dev_info(dmcfreq->dev, "video_4k_10b_rate = %ld\n", + dmcfreq->video_4k_10b_rate); + break; ++ case SYS_STATUS_VIDEO_4K_60P: ++ dmcfreq->video_4k_60p_rate = rockchip_freq_level_2_rate(dmcfreq, level); ++ dev_info(dmcfreq->dev, "video_4k_60p_rate = %ld\n", ++ dmcfreq->video_4k_60p_rate); ++ break; ++ case SYS_STATUS_VIDEO_SVEP: ++ dmcfreq->video_svep_rate = rockchip_freq_level_2_rate(dmcfreq, level); ++ dev_info(dmcfreq->dev, "video_svep_rate = %ld\n", ++ dmcfreq->video_svep_rate); ++ break; + case SYS_STATUS_PERFORMANCE: + dmcfreq->performance_rate = rockchip_freq_level_2_rate(dmcfreq, level); + dev_info(dmcfreq->dev, "performance_rate = %ld\n", @@ -130061,6 +132563,10 @@ index 000000000000..2df1edb1caf3 + dmcfreq->hdmi_rate = rockchip_freq_level_2_rate(dmcfreq, level); + dev_info(dmcfreq->dev, "hdmi_rate = %ld\n", dmcfreq->hdmi_rate); + break; ++ case SYS_STATUS_HDMIRX: ++ dmcfreq->hdmirx_rate = rockchip_freq_level_2_rate(dmcfreq, level); ++ dev_info(dmcfreq->dev, "hdmirx_rate = %ld\n", dmcfreq->hdmirx_rate); ++ break; + case SYS_STATUS_IDLE: + dmcfreq->idle_rate = rockchip_freq_level_2_rate(dmcfreq, level); + dev_info(dmcfreq->dev, "idle_rate = %ld\n", dmcfreq->idle_rate); @@ -130151,6 +132657,11 @@ index 000000000000..2df1edb1caf3 + target_rate = dmcfreq->hdmi_rate; + } + ++ if (dmcfreq->hdmirx_rate && (status & SYS_STATUS_HDMIRX)) { ++ if (dmcfreq->hdmirx_rate > target_rate) ++ target_rate = dmcfreq->hdmirx_rate; ++ } ++ + if (dmcfreq->video_4k_rate && (status & SYS_STATUS_VIDEO_4K)) { + if (dmcfreq->video_4k_rate > target_rate) + target_rate = dmcfreq->video_4k_rate; @@ -130161,11 +132672,21 @@ index 000000000000..2df1edb1caf3 + target_rate = dmcfreq->video_4k_10b_rate; + } + ++ if (dmcfreq->video_4k_60p_rate && (status & SYS_STATUS_VIDEO_4K_60P)) { ++ if (dmcfreq->video_4k_60p_rate > target_rate) ++ target_rate = dmcfreq->video_4k_60p_rate; ++ } ++ + if (dmcfreq->video_1080p_rate && (status & SYS_STATUS_VIDEO_1080P)) { + if (dmcfreq->video_1080p_rate > target_rate) + target_rate = dmcfreq->video_1080p_rate; + } + ++ if (dmcfreq->video_svep_rate && (status & SYS_STATUS_VIDEO_SVEP)) { ++ if (dmcfreq->video_svep_rate > target_rate) ++ target_rate = dmcfreq->video_svep_rate; ++ } ++ +next: + + dev_dbg(dmcfreq->dev, "status=0x%x\n", (unsigned int)status); @@ -130181,6 +132702,23 @@ index 000000000000..2df1edb1caf3 + return NOTIFY_OK; +} + ++static int rockchip_dmcfreq_panic_notifier(struct notifier_block *nb, ++ unsigned long v, void *p) ++{ ++ struct rockchip_dmcfreq *dmcfreq = ++ container_of(nb, struct rockchip_dmcfreq, panic_nb); ++ struct device *dev = dmcfreq->dev; ++ ++ if (dmcfreq->regulator_count == 1) ++ dev_info(dev, "cur_freq: %lu Hz, volt: %lu uV\n", ++ dmcfreq->rate, dmcfreq->volt); ++ else ++ dev_info(dev, "cur_freq: %lu Hz, volt_vdd: %lu uV, volt_mem: %lu uV\n", ++ dmcfreq->rate, dmcfreq->volt, dmcfreq->mem_volt); ++ ++ return 0; ++} ++ +static ssize_t rockchip_dmcfreq_status_show(struct device *dev, + struct device_attribute *attr, + char *buf) @@ -130539,21 +133077,61 @@ index 000000000000..2df1edb1caf3 +static int rockchip_dmcfreq_power_control(struct rockchip_dmcfreq *dmcfreq) +{ + struct device *dev = dmcfreq->dev; ++ struct device_node *np = dev->of_node; ++ struct opp_table *opp_table = NULL, *reg_opp_table = NULL; ++ const char * const reg_names[] = {"center", "mem"}; ++ int ret = 0; ++ ++ if (of_find_property(np, "mem-supply", NULL)) ++ dmcfreq->regulator_count = 2; ++ else ++ dmcfreq->regulator_count = 1; ++ reg_opp_table = dev_pm_opp_set_regulators(dev, reg_names, ++ dmcfreq->regulator_count); ++ if (IS_ERR(reg_opp_table)) { ++ dev_err(dev, "failed to set regulators\n"); ++ return PTR_ERR(reg_opp_table); ++ } ++ opp_table = dev_pm_opp_register_set_opp_helper(dev, rockchip_dmcfreq_opp_helper); ++ if (IS_ERR(opp_table)) { ++ dev_err(dev, "failed to set opp helper\n"); ++ ret = PTR_ERR(opp_table); ++ goto reg_opp_table; ++ } + + dmcfreq->vdd_center = devm_regulator_get_optional(dev, "center"); + if (IS_ERR(dmcfreq->vdd_center)) { + dev_err(dev, "Cannot get the regulator \"center\"\n"); -+ return PTR_ERR(dmcfreq->vdd_center); ++ ret = PTR_ERR(dmcfreq->vdd_center); ++ goto opp_table; ++ } ++ if (dmcfreq->regulator_count > 1) { ++ dmcfreq->mem_reg = devm_regulator_get_optional(dev, "mem"); ++ if (IS_ERR(dmcfreq->mem_reg)) { ++ dev_err(dev, "Cannot get the regulator \"mem\"\n"); ++ ret = PTR_ERR(dmcfreq->mem_reg); ++ goto opp_table; ++ } + } + + dmcfreq->dmc_clk = devm_clk_get(dev, "dmc_clk"); + if (IS_ERR(dmcfreq->dmc_clk)) { + dev_err(dev, "Cannot get the clk dmc_clk. If using SCMI, trusted firmware need update to V1.01 and above.\n"); -+ return PTR_ERR(dmcfreq->dmc_clk); ++ ret = PTR_ERR(dmcfreq->dmc_clk); ++ goto opp_table; + } + dmcfreq->rate = clk_get_rate(dmcfreq->dmc_clk); + + return 0; ++ ++opp_table: ++ if (opp_table) ++ dev_pm_opp_unregister_set_opp_helper(opp_table); ++reg_opp_table: ++ if (reg_opp_table) ++ dev_pm_opp_put_regulators(reg_opp_table); ++ ++ return ret; +} + +static int rockchip_dmcfreq_dmc_init(struct platform_device *pdev, @@ -130614,6 +133192,10 @@ index 000000000000..2df1edb1caf3 + if (rockchip_get_rl_map_talbe(np, "vop-pn-msch-readlatency", + &dmcfreq->info.vop_pn_rl_tbl)) + dev_err(dev, "failed to get vop pn to msch rl\n"); ++ if (dmcfreq->video_4k_rate) ++ dmcfreq->info.vop_4k_rate = dmcfreq->video_4k_rate; ++ else if (dmcfreq->video_4k_10b_rate) ++ dmcfreq->info.vop_4k_rate = dmcfreq->video_4k_10b_rate; + + of_property_read_u32(np, "touchboost_duration", + (u32 *)&dmcfreq->touchboostpulse_duration_val); @@ -130623,30 +133205,6 @@ index 000000000000..2df1edb1caf3 + dmcfreq->touchboostpulse_duration_val = 500 * USEC_PER_MSEC; +} + -+static int rockchip_dmcfreq_set_volt_only(struct rockchip_dmcfreq *dmcfreq) -+{ -+ struct device *dev = dmcfreq->dev; -+ struct dev_pm_opp *opp; -+ unsigned long opp_volt, opp_rate = dmcfreq->rate; -+ int ret; -+ -+ opp = devfreq_recommended_opp(dev, &opp_rate, 0); -+ if (IS_ERR(opp)) { -+ dev_err(dev, "Failed to find opp for %lu Hz\n", opp_rate); -+ return PTR_ERR(opp); -+ } -+ opp_volt = dev_pm_opp_get_voltage(opp); -+ dev_pm_opp_put(opp); -+ -+ ret = regulator_set_voltage(dmcfreq->vdd_center, opp_volt, INT_MAX); -+ if (ret) { -+ dev_err(dev, "Cannot set voltage %lu uV\n", opp_volt); -+ return ret; -+ } -+ -+ return 0; -+} -+ +static int rockchip_dmcfreq_add_devfreq(struct rockchip_dmcfreq *dmcfreq) +{ + struct devfreq_dev_profile *devp = &rockchip_devfreq_dmc_profile; @@ -130673,6 +133231,7 @@ index 000000000000..2df1edb1caf3 + devm_devfreq_register_opp_notifier(dev, devfreq); + + devfreq->last_status.current_frequency = opp_rate; ++ devfreq->suspend_freq = dmcfreq->deep_suspend_rate; + + reset_last_status(devfreq); + @@ -130681,24 +133240,26 @@ index 000000000000..2df1edb1caf3 + return 0; +} + -+static struct monitor_dev_profile dmc_mdevp = { -+ .type = MONITOR_TPYE_DEV, -+ .low_temp_adjust = rockchip_monitor_dev_low_temp_adjust, -+ .high_temp_adjust = rockchip_monitor_dev_high_temp_adjust, -+}; -+ +static void rockchip_dmcfreq_register_notifier(struct rockchip_dmcfreq *dmcfreq) +{ + int ret; + -+ if (vop_register_dmc()) -+ dev_err(dmcfreq->dev, "fail to register notify to vop.\n"); ++ if (dmcfreq->system_status_en || dmcfreq->info.auto_freq_en) { ++ if (vop_register_dmc()) ++ dev_err(dmcfreq->dev, "fail to register notify to vop.\n"); ++ ++ dmcfreq->status_nb.notifier_call = ++ rockchip_dmcfreq_system_status_notifier; ++ ret = rockchip_register_system_status_notifier(&dmcfreq->status_nb); ++ if (ret) ++ dev_err(dmcfreq->dev, "failed to register system_status nb\n"); ++ } + -+ dmcfreq->status_nb.notifier_call = -+ rockchip_dmcfreq_system_status_notifier; -+ ret = rockchip_register_system_status_notifier(&dmcfreq->status_nb); ++ dmcfreq->panic_nb.notifier_call = rockchip_dmcfreq_panic_notifier; ++ ret = atomic_notifier_chain_register(&panic_notifier_list, ++ &dmcfreq->panic_nb); + if (ret) -+ dev_err(dmcfreq->dev, "failed to register system_status nb\n"); ++ dev_err(dmcfreq->dev, "failed to register panic nb\n"); + + dmc_mdevp.data = dmcfreq->info.devfreq; + dmcfreq->mdev_info = rockchip_system_monitor_register(dmcfreq->dev, @@ -130753,7 +133314,7 @@ index 000000000000..2df1edb1caf3 + return; + dmcfreq->touchboostpulse_endtime = endtime; + -+ schedule_work(&dmcfreq->boost_work); ++ queue_work(system_freezable_wq, &dmcfreq->boost_work); +} + +static int rockchip_dmcfreq_input_connect(struct input_handler *handler, @@ -130984,13 +133545,16 @@ index 000000000000..2df1edb1caf3 + return ret; + + rockchip_dmcfreq_parse_dt(data); ++ ++ platform_set_drvdata(pdev, data); ++ + if (!data->system_status_en && !data->info.auto_freq_en) { + dev_info(dev, "don't add devfreq feature\n"); -+ return rockchip_dmcfreq_set_volt_only(data); ++ rockchip_dmcfreq_register_notifier(data); ++ return 0; + } + + cpu_latency_qos_add_request(&pm_qos, PM_QOS_DEFAULT_VALUE); -+ platform_set_drvdata(pdev, data); + + ret = devfreq_add_governor(&devfreq_dmc_ondemand); + if (ret) @@ -131027,10 +133591,33 @@ index 000000000000..2df1edb1caf3 + if (ret) + return ret; + -+ ret = devfreq_suspend_device(dmcfreq->info.devfreq); -+ if (ret < 0) { -+ dev_err(dev, "failed to suspend the devfreq devices\n"); -+ return ret; ++ if (dmcfreq->info.devfreq) { ++ ret = devfreq_suspend_device(dmcfreq->info.devfreq); ++ if (ret < 0) { ++ dev_err(dev, "failed to suspend the devfreq devices\n"); ++ return ret; ++ } ++ } ++ ++ /* set voltage to sleep_volt if need */ ++ if (dmcfreq->sleep_volt && dmcfreq->sleep_volt != dmcfreq->volt) { ++ ret = regulator_set_voltage(dmcfreq->vdd_center, ++ dmcfreq->sleep_volt, INT_MAX); ++ if (ret) { ++ dev_err(dev, "Cannot set vdd voltage %lu uV\n", ++ dmcfreq->sleep_volt); ++ return ret; ++ } ++ } ++ if (dmcfreq->sleep_mem_volt && ++ dmcfreq->sleep_mem_volt != dmcfreq->mem_volt) { ++ ret = regulator_set_voltage(dmcfreq->mem_reg, ++ dmcfreq->sleep_mem_volt, INT_MAX); ++ if (ret) { ++ dev_err(dev, "Cannot set mem voltage %lu uV\n", ++ dmcfreq->sleep_mem_volt); ++ return ret; ++ } + } + + return 0; @@ -131044,15 +133631,39 @@ index 000000000000..2df1edb1caf3 + if (!dmcfreq) + return 0; + ++ /* restore voltage if it is sleep_volt */ ++ if (dmcfreq->sleep_volt && dmcfreq->sleep_volt != dmcfreq->volt) { ++ ret = regulator_set_voltage(dmcfreq->vdd_center, dmcfreq->volt, ++ INT_MAX); ++ if (ret) { ++ dev_err(dev, "Cannot set vdd voltage %lu uV\n", ++ dmcfreq->volt); ++ return ret; ++ } ++ } ++ if (dmcfreq->sleep_mem_volt && ++ dmcfreq->sleep_mem_volt != dmcfreq->mem_volt) { ++ ret = regulator_set_voltage(dmcfreq->mem_reg, dmcfreq->mem_volt, ++ INT_MAX); ++ if (ret) { ++ dev_err(dev, "Cannot set mem voltage %lu uV\n", ++ dmcfreq->mem_volt); ++ return ret; ++ } ++ } ++ + ret = rockchip_dmcfreq_enable_event(dmcfreq); + if (ret) + return ret; + -+ ret = devfreq_resume_device(dmcfreq->info.devfreq); -+ if (ret < 0) { -+ dev_err(dev, "failed to resume the devfreq devices\n"); -+ return ret; ++ if (dmcfreq->info.devfreq) { ++ ret = devfreq_resume_device(dmcfreq->info.devfreq); ++ if (ret < 0) { ++ dev_err(dev, "failed to resume the devfreq devices\n"); ++ return ret; ++ } + } ++ + return ret; +} + @@ -131073,7 +133684,7 @@ index 000000000000..2df1edb1caf3 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rockchip_dmc_common.c b/drivers/devfreq/rockchip_dmc_common.c new file mode 100755 -index 000000000000..cacc7d02f6fc +index 000000000..cacc7d02f --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_common.c @@ -0,0 +1,168 @@ @@ -131247,7 +133858,7 @@ index 000000000000..cacc7d02f6fc +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rockchip_dmc_dbg.c b/drivers/devfreq/rockchip_dmc_dbg.c new file mode 100755 -index 000000000000..80b25e9046d1 +index 000000000..80b25e904 --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_dbg.c @@ -0,0 +1,1061 @@ @@ -132314,7 +134925,7 @@ index 000000000000..80b25e9046d1 +MODULE_DESCRIPTION("rockchip dmc debug driver with devfreq framework"); diff --git a/drivers/devfreq/rockchip_dmc_timing.h b/drivers/devfreq/rockchip_dmc_timing.h new file mode 100755 -index 000000000000..8f2e2c02bb90 +index 000000000..8f2e2c02b --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_timing.h @@ -0,0 +1,1307 @@ @@ -133626,7 +136237,7 @@ index 000000000000..8f2e2c02bb90 +#endif /* __ROCKCHIP_DMC_TIMING_H__ */ + diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig -index 594b77d8923c..c5de024009a9 100644 +index 594b77d89..c5de02400 100644 --- a/drivers/dma-buf/Kconfig +++ b/drivers/dma-buf/Kconfig @@ -21,7 +21,6 @@ config SW_SYNC @@ -133638,7 +136249,7 @@ index 594b77d8923c..c5de024009a9 100644 A sync object driver that uses a 32bit counter to coordinate synchronization. Useful when there is no hardware primitive backing diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c -index 89c10136b26f..3ef87860877a 100644 +index 89c10136b..3ef878608 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -32,8 +32,6 @@ @@ -133845,7 +136456,7 @@ index 89c10136b26f..3ef87860877a 100644 static int dma_buf_debug_show(struct seq_file *s, void *unused) { diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c -index 7475e09b0680..d64fc03929be 100644 +index 7475e09b0..d64fc0392 100644 --- a/drivers/dma-buf/dma-fence.c +++ b/drivers/dma-buf/dma-fence.c @@ -312,22 +312,25 @@ void __dma_fence_might_wait(void) @@ -133958,7 +136569,7 @@ index 7475e09b0680..d64fc03929be 100644 dma_fence_end_signalling(tmp); diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c -index bbbfa28b2f6c..6c22995616a2 100644 +index bbbfa28b2..6c2299561 100644 --- a/drivers/dma-buf/dma-heap.c +++ b/drivers/dma-buf/dma-heap.c @@ -31,6 +31,7 @@ @@ -134287,7 +136898,7 @@ index bbbfa28b2f6c..6c22995616a2 100644 } subsys_initcall(dma_heap_init); diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig -index a5eef06c4226..ff52efa83f39 100644 +index a5eef06c4..ff52efa83 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -1,12 +1,22 @@ @@ -134317,7 +136928,7 @@ index a5eef06c4226..ff52efa83f39 100644 help Choose this option to enable dma-buf CMA heap. This heap is backed diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile -index 6e54cdec3da0..4d4cd94a3a4a 100644 +index 6e54cdec3..4d4cd94a3 100644 --- a/drivers/dma-buf/heaps/Makefile +++ b/drivers/dma-buf/heaps/Makefile @@ -1,4 +1,5 @@ @@ -134328,7 +136939,7 @@ index 6e54cdec3da0..4d4cd94a3a4a 100644 obj-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o obj-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c -index e55384dc115b..4931578df815 100644 +index e55384dc1..4931578df 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -2,76 +2,304 @@ @@ -134743,7 +137354,7 @@ index e55384dc115b..4931578df815 100644 static const struct dma_heap_ops cma_heap_ops = { diff --git a/drivers/dma-buf/heaps/deferred-free-helper.c b/drivers/dma-buf/heaps/deferred-free-helper.c new file mode 100755 -index 000000000000..e19c8b68dfeb +index 000000000..e19c8b68d --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.c @@ -0,0 +1,138 @@ @@ -134887,7 +137498,7 @@ index 000000000000..e19c8b68dfeb + diff --git a/drivers/dma-buf/heaps/deferred-free-helper.h b/drivers/dma-buf/heaps/deferred-free-helper.h new file mode 100755 -index 000000000000..11940328ce3f +index 000000000..11940328c --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.h @@ -0,0 +1,55 @@ @@ -134948,7 +137559,7 @@ index 000000000000..11940328ce3f +#endif diff --git a/drivers/dma-buf/heaps/heap-helpers.c b/drivers/dma-buf/heaps/heap-helpers.c deleted file mode 100644 -index 35aa65bbf0a7..000000000000 +index 35aa65bbf..000000000 --- a/drivers/dma-buf/heaps/heap-helpers.c +++ /dev/null @@ -1,271 +0,0 @@ @@ -135225,7 +137836,7 @@ index 35aa65bbf0a7..000000000000 -}; diff --git a/drivers/dma-buf/heaps/heap-helpers.h b/drivers/dma-buf/heaps/heap-helpers.h deleted file mode 100644 -index 805d2df88024..000000000000 +index 805d2df88..000000000 --- a/drivers/dma-buf/heaps/heap-helpers.h +++ /dev/null @@ -1,53 +0,0 @@ @@ -135284,7 +137895,7 @@ index 805d2df88024..000000000000 -#endif /* _HEAP_HELPERS_H */ diff --git a/drivers/dma-buf/heaps/page_pool.c b/drivers/dma-buf/heaps/page_pool.c new file mode 100755 -index 000000000000..7c34a1ba48bb +index 000000000..7c34a1ba4 --- /dev/null +++ b/drivers/dma-buf/heaps/page_pool.c @@ -0,0 +1,247 @@ @@ -135537,7 +138148,7 @@ index 000000000000..7c34a1ba48bb +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/heaps/page_pool.h b/drivers/dma-buf/heaps/page_pool.h new file mode 100755 -index 000000000000..6b083b04f195 +index 000000000..6b083b04f --- /dev/null +++ b/drivers/dma-buf/heaps/page_pool.h @@ -0,0 +1,55 @@ @@ -135597,7 +138208,7 @@ index 000000000000..6b083b04f195 + +#endif /* _DMABUF_PAGE_POOL_H */ diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c -index 0bf688e3c023..15796bc4c033 100644 +index 0bf688e3c..15796bc4c 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -3,7 +3,11 @@ @@ -136238,7 +138849,7 @@ index 0bf688e3c023..15796bc4c033 100644 module_init(system_heap_create); MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/sw_sync.c b/drivers/dma-buf/sw_sync.c -index 348b3a9170fa..3daa6c76b8dd 100644 +index 348b3a917..3daa6c76b 100644 --- a/drivers/dma-buf/sw_sync.c +++ b/drivers/dma-buf/sw_sync.c @@ -7,6 +7,8 @@ @@ -136265,7 +138876,7 @@ index 348b3a9170fa..3daa6c76b8dd 100644 + +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/sync_debug.c b/drivers/dma-buf/sync_debug.c -index 101394f16930..a2f906741ce0 100644 +index 101394f16..a2f906741 100644 --- a/drivers/dma-buf/sync_debug.c +++ b/drivers/dma-buf/sync_debug.c @@ -8,6 +8,7 @@ @@ -136282,7 +138893,7 @@ index 101394f16930..a2f906741ce0 100644 late_initcall(sync_debugfs_init); +#endif diff --git a/drivers/dma-buf/sync_debug.h b/drivers/dma-buf/sync_debug.h -index 6176e52ba2d7..ee84997da6b4 100644 +index 6176e52ba..ee84997da 100644 --- a/drivers/dma-buf/sync_debug.h +++ b/drivers/dma-buf/sync_debug.h @@ -62,11 +62,18 @@ struct sync_pt { @@ -136305,7 +138916,7 @@ index 6176e52ba2d7..ee84997da6b4 100644 #endif /* _LINUX_SYNC_H */ diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig -index c08968c5ddf8..d9dbfda3c5f2 100644 +index c08968c5d..d9dbfda3c 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -9,7 +9,7 @@ menu "Firmware Drivers" @@ -136332,7 +138943,7 @@ index c08968c5ddf8..d9dbfda3c5f2 100644 tristate "TI System Control Interface (TISCI) Message Protocol" depends on TI_MESSAGE_MANAGER diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile -index 5e013b6a3692..850970fbacbc 100644 +index 5e013b6a3..850970fba 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o @@ -136345,10 +138956,10 @@ index 5e013b6a3692..850970fbacbc 100644 obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o diff --git a/drivers/firmware/rockchip_sip.c b/drivers/firmware/rockchip_sip.c new file mode 100755 -index 000000000000..af98657bb83e +index 000000000..e483899d7 --- /dev/null +++ b/drivers/firmware/rockchip_sip.c -@@ -0,0 +1,578 @@ +@@ -0,0 +1,715 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as @@ -136615,6 +139226,83 @@ index 000000000000..af98657bb83e +} +EXPORT_SYMBOL_GPL(sip_smc_lastlog_request); + ++int sip_smc_amp_config(u32 sub_func_id, u32 arg1, u32 arg2, u32 arg3) ++{ ++ struct arm_smccc_res res; ++ ++ arm_smccc_smc(RK_SIP_AMP_CFG, sub_func_id, arg1, arg2, arg3, ++ 0, 0, 0, &res); ++ return res.a0; ++} ++EXPORT_SYMBOL_GPL(sip_smc_amp_config); ++ ++struct arm_smccc_res sip_smc_get_amp_info(u32 sub_func_id, u32 arg1) ++{ ++ struct arm_smccc_res res; ++ ++ arm_smccc_smc(RK_SIP_AMP_CFG, sub_func_id, arg1, 0, 0, 0, 0, 0, &res); ++ return res; ++} ++EXPORT_SYMBOL_GPL(sip_smc_get_amp_info); ++ ++struct arm_smccc_res sip_smc_get_pvtpll_info(u32 sub_func_id, u32 arg1) ++{ ++ struct arm_smccc_res res; ++ ++ /* ++ * res.a0: error code(0: success, !0: error). ++ * res.a1: low temp config flag(0: support, !0: don't support). ++ */ ++ arm_smccc_smc(SIP_PVTPLL_CFG, sub_func_id, arg1, 0, 0, 0, 0, 0, &res); ++ return res; ++} ++EXPORT_SYMBOL_GPL(sip_smc_get_pvtpll_info); ++ ++struct arm_smccc_res sip_smc_pvtpll_config(u32 sub_func_id, u32 arg1, u32 arg2, ++ u32 arg3, u32 arg4, u32 arg5, u32 arg6) ++{ ++ struct arm_smccc_res res; ++ ++ /* ++ * res.a0: error code(0: success, !0: error). ++ */ ++ arm_smccc_smc(SIP_PVTPLL_CFG, sub_func_id, arg1, arg2, arg3, arg4, arg5, ++ arg6, &res); ++ return res; ++} ++EXPORT_SYMBOL_GPL(sip_smc_pvtpll_config); ++ ++void __iomem *sip_hdcp_request_share_memory(int id) ++{ ++ static void __iomem *base; ++ struct arm_smccc_res res; ++ ++ if (id < 0 || id >= MAX_DEVICE) { ++ pr_err("%s: invalid device id\n", __func__); ++ return NULL; ++ } ++ ++ if (!base) { ++ /* request page share memory */ ++ res = sip_smc_request_share_mem(2, SHARE_PAGE_TYPE_HDCP); ++ if (IS_SIP_ERROR(res.a0)) ++ return NULL; ++ base = (void __iomem *)res.a1; ++ } ++ ++ return base + id * 1024; ++} ++EXPORT_SYMBOL_GPL(sip_hdcp_request_share_memory); ++ ++struct arm_smccc_res sip_hdcp_config(u32 arg0, u32 arg1, u32 arg2) ++{ ++ struct arm_smccc_res res; ++ ++ res = __invoke_sip_fn_smc(SIP_HDCP_CONFIG, arg0, arg1, arg2); ++ return res; ++} ++EXPORT_SYMBOL_GPL(sip_hdcp_config); ++ +/************************** fiq debugger **************************************/ +/* + * AArch32 is not allowed to call SMC64(ATF framework does not support), so we @@ -136633,18 +139321,18 @@ index 000000000000..af98657bb83e +static int fiq_target_cpu; +static phys_addr_t ft_fiq_mem_phy; +static void __iomem *ft_fiq_mem_base; -+static void (*sip_fiq_debugger_uart_irq_tf)(struct pt_regs _pt_regs, -+ unsigned long cpu); ++static sip_fiq_debugger_uart_irq_tf_cb_t sip_fiq_debugger_uart_irq_tf; ++static struct pt_regs fiq_pt_regs; ++ +int sip_fiq_debugger_is_enabled(void) +{ + return fiq_sip_enabled; +} +EXPORT_SYMBOL_GPL(sip_fiq_debugger_is_enabled); + -+static struct pt_regs sip_fiq_debugger_get_pt_regs(void *reg_base, -+ unsigned long sp_el1) ++static void sip_fiq_debugger_get_pt_regs(void *reg_base, ++ unsigned long sp_el1) +{ -+ struct pt_regs fiq_pt_regs; + __maybe_unused struct sm_nsec_ctx *nsec_ctx = reg_base; + __maybe_unused struct gp_regs_ctx *gp_regs = reg_base; + @@ -136716,29 +139404,26 @@ index 000000000000..af98657bb83e + fiq_pt_regs.ARM_pc = nsec_ctx->und_lr; + } +#endif -+ -+ return fiq_pt_regs; +} + +static void sip_fiq_debugger_uart_irq_tf_cb(unsigned long sp_el1, + unsigned long offset, + unsigned long cpu) +{ -+ struct pt_regs fiq_pt_regs; + char *cpu_context; + + /* calling fiq handler */ + if (ft_fiq_mem_base) { + cpu_context = (char *)ft_fiq_mem_base + offset; -+ fiq_pt_regs = sip_fiq_debugger_get_pt_regs(cpu_context, sp_el1); -+ sip_fiq_debugger_uart_irq_tf(fiq_pt_regs, cpu); ++ sip_fiq_debugger_get_pt_regs(cpu_context, sp_el1); ++ sip_fiq_debugger_uart_irq_tf(&fiq_pt_regs, cpu); + } + + /* fiq handler done, return to EL3(then EL3 return to EL1 entry) */ + __invoke_sip_fn_smc(SIP_UARTDBG_FN, 0, 0, UARTDBG_CFG_OSHDL_TO_OS); +} + -+int sip_fiq_debugger_uart_irq_tf_init(u32 irq_id, void *callback_fn) ++int sip_fiq_debugger_uart_irq_tf_init(u32 irq_id, sip_fiq_debugger_uart_irq_tf_cb_t callback_fn) +{ + struct arm_smccc_res res; + @@ -136775,16 +139460,21 @@ index 000000000000..af98657bb83e +{ +#ifdef MODULE + /* Empirically, local "cpu_logical_map()" for rockchip platforms */ -+ ulong mpidr = 0x00; -+ -+ if (cpu < 4) -+ /* 0x00, 0x01, 0x02, 0x03 */ -+ mpidr = cpu; -+ else if (cpu < 8) -+ /* 0x100, 0x101, 0x102, 0x103 */ -+ mpidr = 0x100 | (cpu - 4); -+ else -+ pr_err("Unsupported map cpu: %d\n", cpu); ++ ulong mpidr = read_cpuid_mpidr(); ++ ++ if (mpidr & MPIDR_MT_BITMASK) { ++ /* 0x100, 0x200, 0x300, 0x400 ... */ ++ mpidr = (cpu & 0xff) << 8; ++ } else { ++ if (cpu < 4) ++ /* 0x00, 0x01, 0x02, 0x03 */ ++ mpidr = cpu; ++ else if (cpu < 8) ++ /* 0x100, 0x101, 0x102, 0x103 */ ++ mpidr = 0x100 | (cpu - 4); ++ else ++ pr_err("Unsupported map cpu: %d\n", cpu); ++ } + + return mpidr; +#else @@ -136792,6 +139482,12 @@ index 000000000000..af98657bb83e +#endif +} + ++ulong sip_cpu_logical_map_mpidr(u32 cpu) ++{ ++ return cpu_logical_map_mpidr(cpu); ++} ++EXPORT_SYMBOL_GPL(sip_cpu_logical_map_mpidr); ++ +int sip_fiq_debugger_switch_cpu(u32 cpu) +{ + struct arm_smccc_res res; @@ -136878,6 +139574,58 @@ index 000000000000..af98657bb83e +} +EXPORT_SYMBOL_GPL(sip_fiq_debugger_enable_fiq); + ++int sip_fiq_control(u32 sub_func, u32 irq, unsigned long data) ++{ ++ struct arm_smccc_res res; ++ ++ res = __invoke_sip_fn_smc(RK_SIP_FIQ_CTRL, ++ sub_func, irq, data); ++ return res.a0; ++} ++EXPORT_SYMBOL_GPL(sip_fiq_control); ++ ++int sip_wdt_config(u32 sub_func, u32 arg1, u32 arg2, u32 arg3) ++{ ++ struct arm_smccc_res res; ++ ++ arm_smccc_smc(SIP_WDT_CFG, sub_func, arg1, arg2, arg3, ++ 0, 0, 0, &res); ++ ++ return res.a0; ++} ++EXPORT_SYMBOL_GPL(sip_wdt_config); ++ ++int sip_hdmirx_config(u32 sub_func, u32 arg1, u32 arg2, u32 arg3) ++{ ++ struct arm_smccc_res res; ++ ++ arm_smccc_smc(SIP_HDMIRX_CFG, sub_func, arg1, arg2, arg3, ++ 0, 0, 0, &res); ++ ++ return res.a0; ++} ++EXPORT_SYMBOL_GPL(sip_hdmirx_config); ++ ++int sip_hdcpkey_init(u32 hdcp_id) ++{ ++ struct arm_smccc_res res; ++ ++ res = __invoke_sip_fn_smc(TRUSTED_OS_HDCPKEY_INIT, hdcp_id, 0, 0); ++ ++ return res.a0; ++} ++EXPORT_SYMBOL_GPL(sip_hdcpkey_init); ++ ++int sip_smc_mcu_config(unsigned long mcu_id, ++ unsigned long func, ++ unsigned long arg2) ++{ ++ struct arm_smccc_res res; ++ ++ res = __invoke_sip_fn_smc(SIP_MCU_CFG, mcu_id, func, arg2); ++ return res.a0; ++} ++EXPORT_SYMBOL_GPL(sip_smc_mcu_config); +/******************************************************************************/ +#ifdef CONFIG_ARM +static __init int sip_firmware_init(void) @@ -136928,7 +139676,7 @@ index 000000000000..af98657bb83e +MODULE_DESCRIPTION("Rockchip SIP Call"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index 39f3e1366409..940774657951 100644 +index 39f3e1366..940774657 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -495,6 +495,14 @@ config GPIO_REG @@ -136947,7 +139695,7 @@ index 39f3e1366409..940774657951 100644 tristate "SAMA5D2 PIOBU GPIO support" depends on MFD_SYSCON diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile -index 09dada80ac34..ce6cafb6d3de 100644 +index 09dada80a..ce6cafb6d 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -125,6 +125,7 @@ obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o @@ -136960,7 +139708,7 @@ index 09dada80ac34..ce6cafb6d3de 100644 obj-$(CONFIG_GPIO_SCH311X) += gpio-sch311x.o diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c new file mode 100755 -index 000000000000..1d1e9a64cceb +index 000000000..1d1e9a64c --- /dev/null +++ b/drivers/gpio/gpio-rockchip.c @@ -0,0 +1,746 @@ @@ -137711,7 +140459,7 @@ index 000000000000..1d1e9a64cceb +MODULE_LICENSE("GPL v2"); +MODULE_DEVICE_TABLE(of, rockchip_gpio_match); diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c -index 2e63274a4c2c..ab666917b1ab 100644 +index 2e63274a4..ab666917b 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -1046,3 +1046,14 @@ void of_gpiochip_remove(struct gpio_chip *chip) @@ -137730,7 +140478,7 @@ index 2e63274a4c2c..ab666917b1ab 100644 + gdev->dev.fwnode = of_fwnode_handle(gdev->dev.of_node); +} diff --git a/drivers/gpio/gpiolib-of.h b/drivers/gpio/gpiolib-of.h -index ed26664f1537..8af2bc899aab 100644 +index ed26664f1..8af2bc899 100644 --- a/drivers/gpio/gpiolib-of.h +++ b/drivers/gpio/gpiolib-of.h @@ -15,6 +15,7 @@ int of_gpiochip_add(struct gpio_chip *gc); @@ -137753,7 +140501,7 @@ index ed26664f1537..8af2bc899aab 100644 extern struct notifier_block gpio_of_notifier; diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile -index 835c88318cec..b66e520ebbdd 100644 +index 835c88318..b66e520eb 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -3,6 +3,6 @@ @@ -137766,17 +140514,18 @@ index 835c88318cec..b66e520ebbdd 100644 obj-$(CONFIG_TRACE_GPU_MEM) += trace/ diff --git a/drivers/gpu/arm/Kbuild b/drivers/gpu/arm/Kbuild new file mode 100755 -index 000000000000..b3466f167d8e +index 000000000..f747fc889 --- /dev/null +++ b/drivers/gpu/arm/Kbuild -@@ -0,0 +1,31 @@ +@@ -0,0 +1,25 @@ ++# SPDX-License-Identifier: GPL-2.0 +# -+# (C) COPYRIGHT 2012 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2012, 2020 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -137787,33 +140536,27 @@ index 000000000000..b3466f167d8e +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+ -+# obj-$(CONFIG_MALI_MIDGARD_FOR_LINUX) += midgard_for_linux/ -+ -+obj-$(CONFIG_MALI_MIDGARD_FOR_ANDROID) += midgard/ ++obj-$(CONFIG_MALI_MIDGARD) += midgard/ + +obj-$(CONFIG_MALI400) += mali400/ + -+obj-$(CONFIG_MALI_BIFROST_FOR_ANDROID) += bifrost/ -+ -+obj-$(CONFIG_MALI_BIFROST_FOR_LINUX) += bifrost_for_linux/ ++obj-$(CONFIG_MALI_BIFROST) += bifrost/ diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig new file mode 100755 -index 000000000000..599711c18af9 +index 000000000..398a8e50a --- /dev/null +++ b/drivers/gpu/arm/Kconfig -@@ -0,0 +1,48 @@ +@@ -0,0 +1,25 @@ ++# SPDX-License-Identifier: GPL-2.0 +# +# (C) COPYRIGHT 2012 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -137824,50 +140567,27 @@ index 000000000000..599711c18af9 +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# +# +source "drivers/gpu/arm/mali400/mali/Kconfig" + -+choice -+ prompt "Mali Midgard driver" -+ -+config MALI_MIDGARD_FOR_ANDROID -+ bool "Mali Midgard for Android" -+ -+config MALI_MIDGARD_FOR_LINUX -+ bool "Mali Midgard for Linux only" -+ -+endchoice -+ +source "drivers/gpu/arm/midgard/Kconfig" + -+choice -+ prompt "Mali bifrost driver" -+ -+config MALI_BIFROST_FOR_ANDROID -+ bool "Mali Bifrost for Android" -+ -+config MALI_BIFROST_FOR_LINUX -+ bool "Mali Bifrost for Linux only" -+ -+endchoice -+ +source "drivers/gpu/arm/bifrost/Kconfig" diff --git a/drivers/gpu/arm/bifrost/Kbuild b/drivers/gpu/arm/bifrost/Kbuild new file mode 100755 -index 000000000000..c05dc8399027 +index 000000000..9cadda188 --- /dev/null +++ b/drivers/gpu/arm/bifrost/Kbuild -@@ -0,0 +1,229 @@ +@@ -0,0 +1,243 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2012-2020 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2012-2023 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -137878,231 +140598,245 @@ index 000000000000..c05dc8399027 +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+# Driver version string which is returned to userspace via an ioctl -+MALI_RELEASE_NAME ?= "g2p0-01eac0" -+ -+# Paths required for build -+ -+# make $(src) as absolute path if it isn't already, by prefixing $(srctree) ++# make $(src) as absolute path if it is not already, by prefixing $(srctree) ++# This is to prevent any build issue due to wrong path. +src:=$(if $(patsubst /%,,$(src)),$(srctree)/$(src),$(src)) -+KBASE_PATH = $(src) -+KBASE_PLATFORM_PATH = $(KBASE_PATH)/platform_dummy -+UMP_PATH = $(src)/../../../base + -+# Set up defaults if not defined by build system -+MALI_CUSTOMER_RELEASE ?= 1 -+MALI_USE_CSF ?= 0 -+MALI_UNIT_TEST ?= 0 -+MALI_KERNEL_TEST_API ?= 0 -+MALI_COVERAGE ?= 0 -+MALI_JIT_PRESSURE_LIMIT_BASE ?= 1 -+CONFIG_MALI_PLATFORM_NAME ?= "devicetree" -+# Experimental features (corresponding -D definition should be appended to -+# DEFINES below, e.g. for MALI_EXPERIMENTAL_FEATURE, -+# -DMALI_EXPERIMENTAL_FEATURE=$(MALI_EXPERIMENTAL_FEATURE) should be appended) +# -+# Experimental features must default to disabled, e.g.: -+# MALI_EXPERIMENTAL_FEATURE ?= 0 -+MALI_INCREMENTAL_RENDERING ?= 0 -+ -+# Set up our defines, which will be passed to gcc -+DEFINES = \ -+ -DMALI_CUSTOMER_RELEASE=$(MALI_CUSTOMER_RELEASE) \ -+ -DMALI_USE_CSF=$(MALI_USE_CSF) \ -+ -DMALI_KERNEL_TEST_API=$(MALI_KERNEL_TEST_API) \ -+ -DMALI_UNIT_TEST=$(MALI_UNIT_TEST) \ -+ -DMALI_COVERAGE=$(MALI_COVERAGE) \ -+ -DMALI_RELEASE_NAME=\"$(MALI_RELEASE_NAME)\" \ -+ -DMALI_JIT_PRESSURE_LIMIT_BASE=$(MALI_JIT_PRESSURE_LIMIT_BASE) \ -+ -DMALI_INCREMENTAL_RENDERING=$(MALI_INCREMENTAL_RENDERING) -+ -+ifeq ($(KBUILD_EXTMOD),) -+# in-tree -+DEFINES +=-DMALI_KBASE_PLATFORM_PATH=../../$(src)/platform/$(CONFIG_MALI_PLATFORM_NAME) -+else -+# out-of-tree -+DEFINES +=-DMALI_KBASE_PLATFORM_PATH=$(src)/platform/$(CONFIG_MALI_PLATFORM_NAME) ++# Prevent misuse when Kernel configurations are not present by default ++# in out-of-tree builds ++# ++ifneq ($(CONFIG_ANDROID),n) ++ifeq ($(CONFIG_GPU_TRACEPOINTS),n) ++ $(error CONFIG_GPU_TRACEPOINTS must be set in Kernel configuration) ++endif +endif + -+DEFINES += -I$(srctree)/drivers/staging/android -+ -+DEFINES += -DMALI_KBASE_BUILD -+ -+# Use our defines when compiling -+ccflags-y += $(DEFINES) -I$(KBASE_PATH) -I$(KBASE_PLATFORM_PATH) -I$(UMP_PATH) -I$(srctree)/include/linux -+subdir-ccflags-y += $(DEFINES) -I$(KBASE_PATH) -I$(KBASE_PLATFORM_PATH) -I$(UMP_PATH) -I$(srctree)/include/linux -+ -+SRC := \ -+ context/mali_kbase_context.c \ -+ debug/mali_kbase_debug_ktrace.c \ -+ device/mali_kbase_device.c \ -+ device/mali_kbase_device_hw.c \ -+ mali_kbase_cache_policy.c \ -+ mali_kbase_ccswe.c \ -+ mali_kbase_mem.c \ -+ mali_kbase_mem_pool_group.c \ -+ mali_kbase_native_mgm.c \ -+ mali_kbase_ctx_sched.c \ -+ mali_kbase_jm.c \ -+ mali_kbase_gpuprops.c \ -+ mali_kbase_pm.c \ -+ mali_kbase_config.c \ -+ mali_kbase_vinstr.c \ -+ mali_kbase_hwcnt.c \ -+ mali_kbase_hwcnt_backend_jm.c \ -+ mali_kbase_hwcnt_gpu.c \ -+ mali_kbase_hwcnt_legacy.c \ -+ mali_kbase_hwcnt_types.c \ -+ mali_kbase_hwcnt_virtualizer.c \ -+ mali_kbase_softjobs.c \ -+ mali_kbase_hw.c \ -+ mali_kbase_debug.c \ -+ mali_kbase_gpu_memory_debugfs.c \ -+ mali_kbase_mem_linux.c \ -+ mali_kbase_core_linux.c \ -+ mali_kbase_mem_profile_debugfs.c \ -+ mmu/mali_kbase_mmu.c \ -+ mmu/mali_kbase_mmu_hw_direct.c \ -+ mmu/mali_kbase_mmu_mode_lpae.c \ -+ mmu/mali_kbase_mmu_mode_aarch64.c \ -+ mali_kbase_disjoint_events.c \ -+ mali_kbase_debug_mem_view.c \ -+ mali_kbase_smc.c \ -+ mali_kbase_mem_pool.c \ -+ mali_kbase_mem_pool_debugfs.c \ -+ mali_kbase_debugfs_helper.c \ -+ mali_kbase_strings.c \ -+ mali_kbase_as_fault_debugfs.c \ -+ mali_kbase_regs_history_debugfs.c \ -+ mali_power_gpu_frequency_trace.c \ -+ mali_kbase_trace_gpu_mem.c \ -+ thirdparty/mali_kbase_mmap.c \ -+ tl/mali_kbase_timeline.c \ -+ tl/mali_kbase_timeline_io.c \ -+ tl/mali_kbase_tlstream.c \ -+ tl/mali_kbase_tracepoints.c \ -+ gpu/mali_kbase_gpu.c ++ifeq ($(CONFIG_DMA_SHARED_BUFFER),n) ++ $(error CONFIG_DMA_SHARED_BUFFER must be set in Kernel configuration) ++endif + -+ifeq ($(MALI_USE_CSF),1) -+ SRC += \ -+ debug/backend/mali_kbase_debug_ktrace_csf.c \ -+ device/backend/mali_kbase_device_csf.c \ -+ device/backend/mali_kbase_device_hw_csf.c \ -+ gpu/backend/mali_kbase_gpu_fault_csf.c \ -+ tl/backend/mali_kbase_timeline_csf.c \ -+ mmu/backend/mali_kbase_mmu_csf.c \ -+ context/backend/mali_kbase_context_csf.c -+else -+ SRC += \ -+ mali_kbase_dummy_job_wa.c \ -+ mali_kbase_debug_job_fault.c \ -+ mali_kbase_event.c \ -+ mali_kbase_jd.c \ -+ mali_kbase_jd_debugfs.c \ -+ mali_kbase_js.c \ -+ mali_kbase_js_ctx_attr.c \ -+ mali_kbase_kinstr_jm.c \ -+ debug/backend/mali_kbase_debug_ktrace_jm.c \ -+ device/backend/mali_kbase_device_jm.c \ -+ device/backend/mali_kbase_device_hw_jm.c \ -+ gpu/backend/mali_kbase_gpu_fault_jm.c \ -+ tl/backend/mali_kbase_timeline_jm.c \ -+ mmu/backend/mali_kbase_mmu_jm.c \ -+ context/backend/mali_kbase_context_jm.c ++ifeq ($(CONFIG_PM_DEVFREQ),n) ++ $(error CONFIG_PM_DEVFREQ must be set in Kernel configuration) +endif + -+ifeq ($(CONFIG_MALI_CINSTR_GWT),y) -+ SRC += mali_kbase_gwt.c ++ifeq ($(CONFIG_DEVFREQ_THERMAL),n) ++ $(error CONFIG_DEVFREQ_THERMAL must be set in Kernel configuration) +endif + -+ifeq ($(MALI_UNIT_TEST),1) -+ SRC += tl/mali_kbase_timeline_test.c ++ifeq ($(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND),n) ++ $(error CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND must be set in Kernel configuration) +endif + -+ifeq ($(MALI_CUSTOMER_RELEASE),0) -+ SRC += mali_kbase_regs_dump_debugfs.c ++ifeq ($(CONFIG_FW_LOADER), n) ++ $(error CONFIG_FW_LOADER must be set in Kernel configuration) +endif + ++ifeq ($(CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS), y) ++ ifneq ($(CONFIG_DEBUG_FS), y) ++ $(error CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS depends on CONFIG_DEBUG_FS to be set in Kernel configuration) ++ endif ++endif + -+ccflags-y += -I$(KBASE_PATH) -I$(KBASE_PATH)/debug \ -+ -I$(KBASE_PATH)/debug/backend ++ifeq ($(CONFIG_MALI_BIFROST_FENCE_DEBUG), y) ++ ifneq ($(CONFIG_SYNC_FILE), y) ++ $(error CONFIG_MALI_BIFROST_FENCE_DEBUG depends on CONFIG_SYNC_FILE to be set in Kernel configuration) ++ endif ++endif + -+# Tell the Linux build system from which .o file to create the kernel module -+obj-$(CONFIG_MALI_BIFROST) += bifrost_kbase.o ++# ++# Configurations ++# + -+# Tell the Linux build system to enable building of our .c files -+bifrost_kbase-y := $(SRC:.c=.o) ++# Driver version string which is returned to userspace via an ioctl ++MALI_RELEASE_NAME ?= '"g18p0-01eac0"' ++# Set up defaults if not defined by build system ++ifeq ($(CONFIG_MALI_BIFROST_DEBUG), y) ++ MALI_UNIT_TEST = 1 ++ MALI_CUSTOMER_RELEASE ?= 0 ++else ++ MALI_UNIT_TEST ?= 0 ++ MALI_CUSTOMER_RELEASE ?= 1 ++endif ++MALI_COVERAGE ?= 0 + +# Kconfig passes in the name with quotes for in-tree builds - remove them. -+platform_name := $(shell echo $(CONFIG_MALI_PLATFORM_NAME)) -+MALI_PLATFORM_DIR := platform/$(platform_name) -+ccflags-y += -I$(src)/$(MALI_PLATFORM_DIR) -+include $(src)/$(MALI_PLATFORM_DIR)/Kbuild ++MALI_PLATFORM_DIR := $(shell echo $(CONFIG_MALI_PLATFORM_NAME)) + -+ifeq ($(CONFIG_MALI_BIFROST_DEVFREQ),y) -+ ifeq ($(CONFIG_DEVFREQ_THERMAL),y) -+ include $(src)/ipa/Kbuild -+ endif ++ifeq ($(CONFIG_MALI_CSF_SUPPORT),y) ++ MALI_JIT_PRESSURE_LIMIT_BASE = 0 ++ MALI_USE_CSF = 1 ++else ++ MALI_JIT_PRESSURE_LIMIT_BASE ?= 1 ++ MALI_USE_CSF ?= 0 +endif + -+ifeq ($(MALI_USE_CSF),1) -+ include $(src)/csf/Kbuild ++ ++ifneq ($(CONFIG_MALI_KUTF), n) ++ MALI_KERNEL_TEST_API ?= 1 +else -+# empty ++ MALI_KERNEL_TEST_API ?= 0 +endif + -+ifeq ($(CONFIG_MALI_ARBITER_SUPPORT),y) -+ include $(src)/arbiter/Kbuild ++# Experimental features (corresponding -D definition should be appended to ++# ccflags-y below, e.g. for MALI_EXPERIMENTAL_FEATURE, ++# -DMALI_EXPERIMENTAL_FEATURE=$(MALI_EXPERIMENTAL_FEATURE) should be appended) ++# ++# Experimental features must default to disabled, e.g.: ++# MALI_EXPERIMENTAL_FEATURE ?= 0 ++MALI_INCREMENTAL_RENDERING_JM ?= 0 ++ ++# ++# ccflags ++# ++ccflags-y = \ ++ -DMALI_CUSTOMER_RELEASE=$(MALI_CUSTOMER_RELEASE) \ ++ -DMALI_USE_CSF=$(MALI_USE_CSF) \ ++ -DMALI_KERNEL_TEST_API=$(MALI_KERNEL_TEST_API) \ ++ -DMALI_UNIT_TEST=$(MALI_UNIT_TEST) \ ++ -DMALI_COVERAGE=$(MALI_COVERAGE) \ ++ -DMALI_RELEASE_NAME=$(MALI_RELEASE_NAME) \ ++ -DMALI_JIT_PRESSURE_LIMIT_BASE=$(MALI_JIT_PRESSURE_LIMIT_BASE) \ ++ -DMALI_INCREMENTAL_RENDERING_JM=$(MALI_INCREMENTAL_RENDERING_JM) \ ++ -DMALI_PLATFORM_DIR=$(MALI_PLATFORM_DIR) ++ ++ ++ifeq ($(KBUILD_EXTMOD),) ++# in-tree ++ ccflags-y +=-DMALI_KBASE_PLATFORM_PATH=../../$(src)/platform/$(CONFIG_MALI_PLATFORM_NAME) +else -+# empty ++# out-of-tree ++ ccflags-y +=-DMALI_KBASE_PLATFORM_PATH=$(src)/platform/$(CONFIG_MALI_PLATFORM_NAME) +endif + -+ifeq ($(MALI_USE_CSF),0) -+ bifrost_kbase-$(CONFIG_MALI_BIFROST_DMA_FENCE) += \ -+ mali_kbase_fence_ops.o \ -+ mali_kbase_dma_fence.o \ -+ mali_kbase_fence.o -+ -+ bifrost_kbase-$(CONFIG_SYNC_FILE) += \ -+ mali_kbase_fence_ops.o \ -+ mali_kbase_fence.o -+endif ++ccflags-y += \ ++ -I$(srctree)/include/linux \ ++ -I$(srctree)/drivers/staging/android \ ++ -I$(src) \ ++ -I$(src)/platform/$(MALI_PLATFORM_DIR) \ ++ -I$(src)/../../../base \ ++ -I$(src)/../../../../include + -+bifrost_kbase-$(CONFIG_SYNC) += \ -+ mali_kbase_sync_android.o \ -+ mali_kbase_sync_common.o ++subdir-ccflags-y += $(ccflags-y) ++ ++# ++# Kernel Modules ++# ++obj-$(CONFIG_MALI_BIFROST) += bifrost_kbase.o ++obj-$(CONFIG_MALI_KUTF) += tests/ ++ ++bifrost_kbase-y := \ ++ mali_kbase_cache_policy.o \ ++ mali_kbase_ccswe.o \ ++ mali_kbase_mem.o \ ++ mali_kbase_mem_migrate.o \ ++ mali_kbase_mem_pool_group.o \ ++ mali_kbase_native_mgm.o \ ++ mali_kbase_ctx_sched.o \ ++ mali_kbase_gpuprops.o \ ++ mali_kbase_pm.o \ ++ mali_kbase_config.o \ ++ mali_kbase_kinstr_prfcnt.o \ ++ mali_kbase_vinstr.o \ ++ mali_kbase_softjobs.o \ ++ mali_kbase_hw.o \ ++ mali_kbase_debug.o \ ++ mali_kbase_gpu_memory_debugfs.o \ ++ mali_kbase_mem_linux.o \ ++ mali_kbase_core_linux.o \ ++ mali_kbase_mem_profile_debugfs.o \ ++ mali_kbase_disjoint_events.o \ ++ mali_kbase_debug_mem_view.o \ ++ mali_kbase_debug_mem_zones.o \ ++ mali_kbase_debug_mem_allocs.o \ ++ mali_kbase_smc.o \ ++ mali_kbase_mem_pool.o \ ++ mali_kbase_mem_pool_debugfs.o \ ++ mali_kbase_debugfs_helper.o \ ++ mali_kbase_strings.o \ ++ mali_kbase_as_fault_debugfs.o \ ++ mali_kbase_regs_history_debugfs.o \ ++ mali_kbase_dvfs_debugfs.o \ ++ mali_power_gpu_frequency_trace.o \ ++ mali_kbase_trace_gpu_mem.o \ ++ mali_kbase_pbha.o ++ ++bifrost_kbase-$(CONFIG_DEBUG_FS) += mali_kbase_pbha_debugfs.o ++ ++bifrost_kbase-$(CONFIG_MALI_CINSTR_GWT) += mali_kbase_gwt.o + +bifrost_kbase-$(CONFIG_SYNC_FILE) += \ -+ mali_kbase_fence_ops.o \ -+ mali_kbase_sync_file.o \ -+ mali_kbase_sync_common.o ++ mali_kbase_fence_ops.o \ ++ mali_kbase_sync_file.o \ ++ mali_kbase_sync_common.o ++ ++ifneq ($(CONFIG_MALI_CSF_SUPPORT),y) ++ bifrost_kbase-y += \ ++ mali_kbase_jm.o \ ++ mali_kbase_dummy_job_wa.o \ ++ mali_kbase_debug_job_fault.o \ ++ mali_kbase_event.o \ ++ mali_kbase_jd.o \ ++ mali_kbase_jd_debugfs.o \ ++ mali_kbase_js.o \ ++ mali_kbase_js_ctx_attr.o \ ++ mali_kbase_kinstr_jm.o ++ ++ bifrost_kbase-$(CONFIG_SYNC_FILE) += \ ++ mali_kbase_fence_ops.o \ ++ mali_kbase_fence.o ++endif + -+include $(src)/backend/gpu/Kbuild -+bifrost_kbase-y += $(BACKEND:.c=.o) + ++INCLUDE_SUBDIR = \ ++ $(src)/context/Kbuild \ ++ $(src)/debug/Kbuild \ ++ $(src)/device/Kbuild \ ++ $(src)/backend/gpu/Kbuild \ ++ $(src)/mmu/Kbuild \ ++ $(src)/tl/Kbuild \ ++ $(src)/hwcnt/Kbuild \ ++ $(src)/gpu/Kbuild \ ++ $(src)/thirdparty/Kbuild \ ++ $(src)/platform/$(MALI_PLATFORM_DIR)/Kbuild ++ ++ifeq ($(CONFIG_MALI_CSF_SUPPORT),y) ++ INCLUDE_SUBDIR += $(src)/csf/Kbuild ++endif + -+ccflags-y += -I$(src)/backend/gpu -+subdir-ccflags-y += -I$(src)/backend/gpu ++ifeq ($(CONFIG_MALI_ARBITER_SUPPORT),y) ++ INCLUDE_SUBDIR += $(src)/arbiter/Kbuild ++endif + -+# For kutf and mali_kutf_irq_latency_test -+obj-$(CONFIG_MALI_KUTF) += tests/ ++ifeq ($(CONFIG_MALI_BIFROST_DEVFREQ),y) ++ ifeq ($(CONFIG_DEVFREQ_THERMAL),y) ++ INCLUDE_SUBDIR += $(src)/ipa/Kbuild ++ endif ++endif ++ ++ifeq ($(KBUILD_EXTMOD),) ++# in-tree ++ -include $(INCLUDE_SUBDIR) ++else ++# out-of-tree ++ include $(INCLUDE_SUBDIR) ++endif diff --git a/drivers/gpu/arm/bifrost/Kconfig b/drivers/gpu/arm/bifrost/Kconfig new file mode 100755 -index 000000000000..ccb16671047a +index 000000000..ca3da57cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/Kconfig -@@ -0,0 +1,308 @@ +@@ -0,0 +1,389 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2012-2020 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2012-2023 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -138113,15 +140847,13 @@ index 000000000000..ccb16671047a +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+ +menuconfig MALI_BIFROST + tristate "Mali Bifrost series support" + select GPU_TRACEPOINTS if ANDROID + select DMA_SHARED_BUFFER ++ select FW_LOADER + default n + help + Enable this option to build support for a ARM Mali Bifrost GPU. @@ -138129,49 +140861,7 @@ index 000000000000..ccb16671047a + To compile this driver as a module, choose M here: + this will generate a single module, called mali_kbase. + -+config MALI_BIFROST_GATOR_SUPPORT -+ bool "Enable Streamline tracing support" -+ depends on MALI_BIFROST -+ default n -+ help -+ Enables kbase tracing used by the Arm Streamline Performance Analyzer. -+ The tracepoints are used to derive GPU activity charts in Streamline. -+ -+config MALI_BIFROST_DVFS -+ bool "Enable legacy DVFS" -+ depends on MALI_BIFROST && !MALI_BIFROST_DEVFREQ -+ default n -+ help -+ Choose this option to enable legacy DVFS in the Mali Midgard DDK. -+ -+config MALI_BIFROST_ENABLE_TRACE -+ bool "Enable kbase tracing" -+ depends on MALI_BIFROST -+ default y if MALI_BIFROST_DEBUG -+ default n -+ help -+ Enables tracing in kbase. Trace log available through -+ the "mali_trace" debugfs file, when the CONFIG_DEBUG_FS is enabled -+ -+config MALI_BIFROST_DEVFREQ -+ bool "devfreq support for Mali" -+ depends on MALI_BIFROST && PM_DEVFREQ -+ help -+ Support devfreq for Mali. -+ -+ Using the devfreq framework and, by default, the simpleondemand -+ governor, the frequency of Mali will be dynamically selected from the -+ available OPPs. -+ -+config MALI_BIFROST_DMA_FENCE -+ bool "DMA_BUF fence support for Mali" -+ depends on MALI_BIFROST -+ default n -+ help -+ Support DMA_BUF fences for Mali. -+ -+ This option should only be enabled if the Linux Kernel has built in -+ support for DMA_BUF fences. ++if MALI_BIFROST + +config MALI_PLATFORM_NAME + depends on MALI_BIFROST @@ -138182,68 +140872,20 @@ index 000000000000..ccb16671047a + include in the build. 'platform/$(MALI_PLATFORM_NAME)/Kbuild' must + exist. + -+config MALI_ARBITER_SUPPORT -+ bool "Enable arbiter support for Mali" ++choice ++ prompt "Mali HW backend" + depends on MALI_BIFROST -+ default n -+ help -+ Enable support for the arbiter interface in the driver. -+ This allows an external arbiter to manage driver access -+ to GPU hardware in a virtualized environment -+ -+ If unsure, say N. ++ default MALI_REAL_HW + -+# MALI_BIFROST_EXPERT configuration options -+ -+menuconfig MALI_BIFROST_EXPERT ++config MALI_REAL_HW ++ bool "Enable build of Mali kernel driver for real HW" + depends on MALI_BIFROST -+ bool "Enable Expert Settings" -+ default n + help -+ Enabling this option and modifying the default settings may produce a driver with performance or -+ other limitations. -+ -+config MALI_CORESTACK -+ bool "Support controlling power to the GPU core stack" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT -+ default n -+ help -+ Enabling this feature on supported GPUs will let the driver powering -+ on/off the GPU core stack independently without involving the Power -+ Domain Controller. This should only be enabled on platforms which -+ integration of the PDC to the Mali GPU is known to be problematic. -+ This feature is currently only supported on t-Six and t-HEx GPUs. -+ -+ If unsure, say N. -+ -+config MALI_BIFROST_DEBUG -+ bool "Debug build" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT -+ default n -+ help -+ Select this option for increased checking and reporting of errors. -+ -+config MALI_BIFROST_FENCE_DEBUG -+ bool "Debug sync fence usage" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT && (SYNC || SYNC_FILE) -+ default y if MALI_BIFROST_DEBUG -+ help -+ Select this option to enable additional checking and reporting on the -+ use of sync fences in the Mali driver. -+ -+ This will add a 3s timeout to all sync fence waits in the Mali -+ driver, so that when work for Mali has been waiting on a sync fence -+ for a long time a debug message will be printed, detailing what fence -+ is causing the block, and which dependent Mali atoms are blocked as a -+ result of this. -+ -+ The timeout can be changed at runtime through the js_soft_timeout -+ device attribute, where the timeout is specified in milliseconds. ++ This is the default HW backend. + +config MALI_BIFROST_NO_MALI -+ bool "No Mali" ++ bool "Enable build of Mali kernel driver for No Mali" + depends on MALI_BIFROST && MALI_BIFROST_EXPERT -+ default n + help + This can be used to test the driver in a simulated environment + whereby the hardware is not physically present. If the hardware is physically @@ -138252,67 +140894,73 @@ index 000000000000..ccb16671047a + All calls to the simulated hardware will complete immediately as if the hardware + completed the task. + -+config MALI_REAL_HW -+ def_bool !MALI_BIFROST_NO_MALI + -+config MALI_BIFROST_ERROR_INJECT -+ bool "Error injection" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT && MALI_BIFROST_NO_MALI ++endchoice ++ ++menu "Platform specific options" ++source "drivers/gpu/arm/bifrost/platform/Kconfig" ++endmenu ++ ++config MALI_CSF_SUPPORT ++ bool "Enable Mali CSF based GPU support" + default n + help -+ Enables insertion of errors to test module failure and recovery mechanisms. ++ Enables support for CSF based GPUs. + -+config MALI_BIFROST_SYSTEM_TRACE -+ bool "Enable system event tracing support" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT -+ default y if MALI_BIFROST_DEBUG -+ default n ++config MALI_BIFROST_DEVFREQ ++ bool "Enable devfreq support for Mali" ++ depends on MALI_BIFROST && PM_DEVFREQ ++ select DEVFREQ_GOV_SIMPLE_ONDEMAND ++ default y + help -+ Choose this option to enable system trace events for each -+ kbase event. This is typically used for debugging but has -+ minimal overhead when not in use. Enable only if you know what -+ you are doing. ++ Support devfreq for Mali. + -+config MALI_2MB_ALLOC -+ bool "Attempt to allocate 2MB pages" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++ Using the devfreq framework and, by default, the simple on-demand ++ governor, the frequency of Mali will be dynamically selected from the ++ available OPPs. ++ ++config MALI_BIFROST_DVFS ++ bool "Enable legacy DVFS" ++ depends on MALI_BIFROST && !MALI_BIFROST_DEVFREQ + default n + help -+ Rather than allocating all GPU memory page-by-page, attempt to -+ allocate 2MB pages from the kernel. This reduces TLB pressure and -+ helps to prevent memory fragmentation. ++ Choose this option to enable legacy DVFS in the Mali Midgard DDK. + -+ If in doubt, say N ++config MALI_BIFROST_GATOR_SUPPORT ++ bool "Enable Streamline tracing support" ++ depends on MALI_BIFROST ++ default y ++ help ++ Enables kbase tracing used by the Arm Streamline Performance Analyzer. ++ The tracepoints are used to derive GPU activity charts in Streamline. + -+config MALI_PWRSOFT_765 -+ bool "PWRSOFT-765 ticket" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++config MALI_BIFROST_ENABLE_TRACE ++ bool "Enable kbase tracing" ++ depends on MALI_BIFROST ++ default y if MALI_BIFROST_DEBUG + default n + help -+ PWRSOFT-765 fixes devfreq cooling devices issues. The fix was merged -+ in kernel v4.10, however if backported into the kernel then this -+ option must be manually selected. -+ -+ If using kernel >= v4.10 then say N, otherwise if devfreq cooling -+ changes have been backported say Y to avoid compilation errors. ++ Enables tracing in kbase. Trace log available through ++ the "mali_trace" debugfs file, when the CONFIG_DEBUG_FS is enabled + -+config MALI_MEMORY_FULLY_BACKED -+ bool "Memory fully physically-backed" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++config MALI_ARBITER_SUPPORT ++ bool "Enable arbiter support for Mali" ++ depends on MALI_BIFROST && !MALI_CSF_SUPPORT + default n + help -+ This option enables full physical backing of all virtual -+ memory allocations in the kernel. Notice that this build -+ option only affects allocations of grow-on-GPU-page-fault -+ memory. ++ Enable support for the arbiter interface in the driver. ++ This allows an external arbiter to manage driver access ++ to GPU hardware in a virtualized environment ++ ++ If unsure, say N. + +config MALI_DMA_BUF_MAP_ON_DEMAND -+ bool "Map imported dma-bufs on demand" ++ bool "Enable map imported dma-bufs on demand" + depends on MALI_BIFROST + default n + help -+ This option caused kbase to set up the GPU mapping of imported -+ dma-buf when needed to run atoms. This is the legacy behaviour. ++ This option will cause kbase to set up the GPU mapping of imported ++ dma-buf when needed to run atoms. This is the legacy behavior. + + This is intended for testing and the option will get removed in the + future. @@ -138331,264 +140979,60 @@ index 000000000000..ccb16671047a + flushes in other drivers. This only has an effect for clients using + UK 11.18 or older. For later UK versions it is not possible. + -+config MALI_HW_ERRATA_1485982_NOT_AFFECTED -+ bool "Disable workaround for BASE_HW_ISSUE_GPU2017_1336" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++config MALI_CORESIGHT ++ depends on MALI_BIFROST && MALI_CSF_SUPPORT && !MALI_BIFROST_NO_MALI ++ bool "Enable Kbase CoreSight tracing support" + default n -+ help -+ This option disables the default workaround for GPU2017-1336. The -+ workaround keeps the L2 cache powered up except for powerdown and reset. -+ -+ The workaround introduces a limitation that will prevent the running of -+ protected mode content on fully coherent platforms, as the switch to IO -+ coherency mode requires the L2 to be turned off. + -+config MALI_HW_ERRATA_1485982_USE_CLOCK_ALTERNATIVE -+ bool "Use alternative workaround for BASE_HW_ISSUE_GPU2017_1336" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT && !MALI_HW_ERRATA_1485982_NOT_AFFECTED -+ default n -+ help -+ This option uses an alternative workaround for GPU2017-1336. Lowering -+ the GPU clock to a, platform specific, known good frequeuncy before -+ powering down the L2 cache. The clock can be specified in the device -+ tree using the property, opp-mali-errata-1485982. Otherwise the -+ slowest clock will be selected. -+ -+config MALI_GEM5_BUILD -+ bool "Enable build of Mali kernel driver for GEM5" ++menuconfig MALI_BIFROST_EXPERT + depends on MALI_BIFROST ++ bool "Enable Expert Settings" + default n + help -+ This option is to do a Mali GEM5 build. -+ If unsure, say N. -+ -+# Instrumentation options. ++ Enabling this option and modifying the default settings may produce ++ a driver with performance or other limitations. + -+config MALI_JOB_DUMP -+ bool "Enable system level support needed for job dumping" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT -+ default n -+ help -+ Choose this option to enable system level support needed for -+ job dumping. This is typically used for instrumentation but has -+ minimal overhead when not in use. Enable only if you know what -+ you are doing. ++if MALI_BIFROST_EXPERT + -+config MALI_BIFROST_PRFCNT_SET_SECONDARY -+ bool "Use secondary set of performance counters" ++config LARGE_PAGE_ALLOC_OVERRIDE ++ bool "Override default setting of 2MB pages" + depends on MALI_BIFROST && MALI_BIFROST_EXPERT + default n + help -+ Select this option to use secondary set of performance counters. Kernel -+ features that depend on an access to the primary set of counters may -+ become unavailable. Enabling this option will prevent power management -+ from working optimally and may cause instrumentation tools to return -+ bogus results. -+ -+ If unsure, say N. -+ -+config MALI_PRFCNT_SET_SECONDARY_VIA_DEBUG_FS -+ bool "Use secondary set of performance counters" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT && !MALI_BIFROST_PRFCNT_SET_SECONDARY && DEBUG_FS -+ default n -+ help -+ Select this option to make the secondary set of performance counters -+ available at runtime via debugfs. Kernel features that depend on an -+ access to the primary set of counters may become unavailable. -+ -+ This feature is unsupported and unstable, and may break at any time. -+ Enabling this option will prevent power management from working -+ optimally and may cause instrumentation tools to return bogus results. -+ -+ If unsure, say N. -+ -+source "drivers/gpu/arm/midgard/platform/Kconfig" -+# source "drivers/gpu/arm/midgard/tests/Kconfig" -diff --git a/drivers/gpu/arm/bifrost/Makefile b/drivers/gpu/arm/bifrost/Makefile -new file mode 100755 -index 000000000000..53a12094ec14 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/Makefile -@@ -0,0 +1,38 @@ -+# -+# (C) COPYRIGHT 2010-2019 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, you can access it online at -+# http://www.gnu.org/licenses/gpl-2.0.html. -+# -+# SPDX-License-Identifier: GPL-2.0 -+# -+# -+ -+ -+KDIR ?= /lib/modules/$(shell uname -r)/build -+ -+BUSLOG_PATH_RELATIVE = $(CURDIR)/../../../.. -+KBASE_PATH_RELATIVE = $(CURDIR) -+ -+ifeq ($(CONFIG_MALI_BUSLOG),y) -+#Add bus logger symbols -+EXTRA_SYMBOLS += $(BUSLOG_PATH_RELATIVE)/drivers/base/bus_logger/Module.symvers -+endif -+ -+# we get the symbols from modules using KBUILD_EXTRA_SYMBOLS to prevent warnings about unknown functions -+all: -+ $(MAKE) -C $(KDIR) M=$(CURDIR) EXTRA_CFLAGS="-I$(CURDIR)/../../../../include -I$(CURDIR)/../../../../tests/include $(SCONS_CFLAGS)" $(SCONS_CONFIGS) KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" modules -+ -+clean: -+ $(MAKE) -C $(KDIR) M=$(CURDIR) clean -diff --git a/drivers/gpu/arm/bifrost/Makefile.kbase b/drivers/gpu/arm/bifrost/Makefile.kbase -new file mode 100755 -index 000000000000..6b0f81ee76e8 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/Makefile.kbase -@@ -0,0 +1,23 @@ -+# -+# (C) COPYRIGHT 2010, 2013, 2018 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, you can access it online at -+# http://www.gnu.org/licenses/gpl-2.0.html. -+# -+# SPDX-License-Identifier: GPL-2.0 -+# -+# -+ -+EXTRA_CFLAGS += -I$(ROOT) -I$(KBASE_PATH) -I$(KBASE_PATH)/platform_$(PLATFORM) -+ -diff --git a/drivers/gpu/arm/bifrost/Mconfig b/drivers/gpu/arm/bifrost/Mconfig -new file mode 100755 -index 000000000000..99ababfc2d16 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/Mconfig -@@ -0,0 +1,277 @@ -+# -+# (C) COPYRIGHT 2012-2020 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# -+ -+ -+menuconfig MALI_BIFROST -+ bool "Mali Midgard series support" -+ default y -+ help -+ Enable this option to build support for a ARM Mali Midgard GPU. -+ -+ To compile this driver as a module, choose M here: -+ this will generate a single module, called mali_kbase. -+ -+config MALI_BIFROST_GATOR_SUPPORT -+ bool "Enable Streamline tracing support" -+ depends on MALI_BIFROST && !BACKEND_USER -+ default y -+ help -+ Enables kbase tracing used by the Arm Streamline Performance Analyzer. -+ The tracepoints are used to derive GPU activity charts in Streamline. -+ -+config MALI_BIFROST_DVFS -+ bool "Enable legacy DVFS" -+ depends on MALI_BIFROST && !MALI_BIFROST_DEVFREQ -+ default n -+ help -+ Choose this option to enable legacy DVFS in the Mali Midgard DDK. ++ An override config for LARGE_PAGE_ALLOC config. ++ When LARGE_PAGE_ALLOC_OVERRIDE is Y, 2MB page allocation will be ++ enabled by LARGE_PAGE_ALLOC. When this is N, the feature will be ++ enabled when GPU HW satisfies requirements. + -+config MALI_BIFROST_ENABLE_TRACE -+ bool "Enable kbase tracing" -+ default y if MALI_BIFROST_DEBUG -+ default n -+ help -+ Enables tracing in kbase. Trace log available through -+ the "mali_trace" debugfs file, when the CONFIG_DEBUG_FS is enabled -+ -+config MALI_BIFROST_DEVFREQ -+ bool "devfreq support for Mali" -+ depends on MALI_BIFROST -+ default y if PLATFORM_JUNO -+ default y if PLATFORM_CUSTOM -+ help -+ Support devfreq for Mali. -+ -+ Using the devfreq framework and, by default, the simpleondemand -+ governor, the frequency of Mali will be dynamically selected from the -+ available OPPs. ++ If in doubt, say N + -+config MALI_BIFROST_DMA_FENCE -+ bool "DMA_BUF fence support for Mali" -+ depends on MALI_BIFROST ++config LARGE_PAGE_ALLOC ++ bool "Attempt to allocate 2MB pages" ++ depends on MALI_BIFROST && MALI_BIFROST_EXPERT + default n + help -+ Support DMA_BUF fences for Mali. -+ -+ This option should only be enabled if the Linux Kernel has built in -+ support for DMA_BUF fences. ++ Rather than allocating all GPU memory page-by-page, attempt to ++ allocate 2MB pages from the kernel. This reduces TLB pressure and ++ helps to prevent memory fragmentation. + -+config MALI_PLATFORM_NAME -+ depends on MALI_BIFROST -+ string "Platform name" -+ default "hisilicon" if PLATFORM_HIKEY960 -+ default "hisilicon" if PLATFORM_HIKEY970 -+ default "devicetree" -+ help -+ Enter the name of the desired platform configuration directory to -+ include in the build. 'platform/$(MALI_PLATFORM_NAME)/Kbuild' must -+ exist. ++ Note this config applies only when LARGE_PAGE_ALLOC_OVERRIDE config ++ is enabled and enabling this on a GPU HW that does not satisfy ++ requirements can cause serious problem. + -+ When PLATFORM_CUSTOM is set, this needs to be set manually to -+ pick up the desired platform files. ++ If in doubt, say N + -+config MALI_ARBITER_SUPPORT -+ bool "Enable arbiter support for Mali" -+ depends on MALI_BIFROST && !GPU_HAS_CSF ++config MALI_MEMORY_FULLY_BACKED ++ bool "Enable memory fully physically-backed" ++ depends on MALI_BIFROST && MALI_BIFROST_EXPERT + default n + help -+ Enable support for the arbiter interface in the driver. -+ This allows an external arbiter to manage driver access -+ to GPU hardware in a virtualized environment -+ -+ If unsure, say N. -+ -+# MALI_BIFROST_EXPERT configuration options -+ -+menuconfig MALI_BIFROST_EXPERT -+ depends on MALI_BIFROST -+ bool "Enable Expert Settings" -+ default y -+ help -+ Enabling this option and modifying the default settings may produce a driver with performance or -+ other limitations. ++ This option enables full physical backing of all virtual ++ memory allocations in the kernel. Notice that this build ++ option only affects allocations of grow-on-GPU-page-fault ++ memory. + +config MALI_CORESTACK -+ bool "Support controlling power to the GPU core stack" ++ bool "Enable support of GPU core stack power control" + depends on MALI_BIFROST && MALI_BIFROST_EXPERT + default n + help @@ -138600,17 +141044,29 @@ index 000000000000..99ababfc2d16 + + If unsure, say N. + ++comment "Platform options" ++ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++ ++config MALI_BIFROST_ERROR_INJECT ++ bool "Enable No Mali error injection" ++ depends on MALI_BIFROST && MALI_BIFROST_EXPERT && MALI_BIFROST_NO_MALI ++ default n ++ help ++ Enables insertion of errors to test module failure and recovery mechanisms. ++ ++comment "Debug options" ++ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++ +config MALI_BIFROST_DEBUG -+ bool "Debug build" ++ bool "Enable debug build" + depends on MALI_BIFROST && MALI_BIFROST_EXPERT -+ default y if DEBUG + default n + help + Select this option for increased checking and reporting of errors. + +config MALI_BIFROST_FENCE_DEBUG -+ bool "Debug sync fence usage" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++ bool "Enable debug sync fence usage" ++ depends on MALI_BIFROST && MALI_BIFROST_EXPERT && SYNC_FILE + default y if MALI_BIFROST_DEBUG + help + Select this option to enable additional checking and reporting on the @@ -138625,41 +141081,6 @@ index 000000000000..99ababfc2d16 + The timeout can be changed at runtime through the js_soft_timeout + device attribute, where the timeout is specified in milliseconds. + -+choice -+ prompt "Error injection level" -+ default MALI_ERROR_INJECT_NONE -+ help -+ Enables insertion of errors to test module failure and recovery mechanisms. -+ -+config MALI_ERROR_INJECT_NONE -+ bool "disabled" -+ help -+ Error injection is disabled. -+ -+config MALI_ERROR_INJECT_TRACK_LIST -+ bool "error track list" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT && NO_MALI -+ help -+ Errors to inject are pre-configured by the user. -+ -+config MALI_ERROR_INJECT_RANDOM -+ bool "random error injection" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT && NO_MALI -+ help -+ Injected errors are random, rather than user-driven. -+ -+endchoice -+ -+config MALI_ERROR_INJECT_ON -+ string -+ default "0" if MALI_ERROR_INJECT_NONE -+ default "1" if MALI_ERROR_INJECT_TRACK_LIST -+ default "2" if MALI_ERROR_INJECT_RANDOM -+ -+config MALI_BIFROST_ERROR_INJECT -+ bool -+ default y if !MALI_ERROR_INJECT_NONE -+ +config MALI_BIFROST_SYSTEM_TRACE + bool "Enable system event tracing support" + depends on MALI_BIFROST && MALI_BIFROST_EXPERT @@ -138671,62 +141092,98 @@ index 000000000000..99ababfc2d16 + minimal overhead when not in use. Enable only if you know what + you are doing. + -+config MALI_2MB_ALLOC -+ bool "Attempt to allocate 2MB pages" ++comment "Instrumentation options" ++ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++ ++choice ++ prompt "Select Performance counters set" ++ default MALI_PRFCNT_SET_PRIMARY ++ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++ ++config MALI_PRFCNT_SET_PRIMARY ++ bool "Primary" + depends on MALI_BIFROST && MALI_BIFROST_EXPERT -+ default n + help -+ Rather than allocating all GPU memory page-by-page, attempt to -+ allocate 2MB pages from the kernel. This reduces TLB pressure and -+ helps to prevent memory fragmentation. ++ Select this option to use primary set of performance counters. + -+ If in doubt, say N ++config MALI_BIFROST_PRFCNT_SET_SECONDARY ++ bool "Secondary" ++ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++ help ++ Select this option to use secondary set of performance counters. Kernel ++ features that depend on an access to the primary set of counters may ++ become unavailable. Enabling this option will prevent power management ++ from working optimally and may cause instrumentation tools to return ++ bogus results. + -+config MALI_PWRSOFT_765 -+ bool "PWRSOFT-765 ticket" ++ If unsure, use MALI_PRFCNT_SET_PRIMARY. ++ ++config MALI_PRFCNT_SET_TERTIARY ++ bool "Tertiary" + depends on MALI_BIFROST && MALI_BIFROST_EXPERT -+ default n + help -+ PWRSOFT-765 fixes devfreq cooling devices issues. However, they are -+ not merged in mainline kernel yet. So this define helps to guard those -+ parts of the code. ++ Select this option to use tertiary set of performance counters. Kernel ++ features that depend on an access to the primary set of counters may ++ become unavailable. Enabling this option will prevent power management ++ from working optimally and may cause instrumentation tools to return ++ bogus results. + -+config MALI_MEMORY_FULLY_BACKED -+ bool "Memory fully physically-backed" ++ If unsure, use MALI_PRFCNT_SET_PRIMARY. ++ ++endchoice ++ ++config MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS ++ bool "Enable runtime selection of performance counters set via debugfs" ++ depends on MALI_BIFROST && MALI_BIFROST_EXPERT && DEBUG_FS + default n + help -+ This option enables full backing of all virtual memory allocations -+ for the kernel. This only affects grow-on-GPU-page-fault memory. ++ Select this option to make the secondary set of performance counters ++ available at runtime via debugfs. Kernel features that depend on an ++ access to the primary set of counters may become unavailable. + -+config MALI_DMA_BUF_MAP_ON_DEMAND -+ bool "Map imported dma-bufs on demand" -+ depends on MALI_BIFROST ++ If no runtime debugfs option is set, the build time counter set ++ choice will be used. ++ ++ This feature is unsupported and unstable, and may break at any time. ++ Enabling this option will prevent power management from working ++ optimally and may cause instrumentation tools to return bogus results. ++ ++ No validation is done on the debugfs input. Invalid input could cause ++ performance counter errors. Valid inputs are the values accepted by ++ the SET_SELECT bits of the PRFCNT_CONFIG register as defined in the ++ architecture specification. ++ ++ If unsure, say N. ++ ++config MALI_JOB_DUMP ++ bool "Enable system level support needed for job dumping" ++ depends on MALI_BIFROST && MALI_BIFROST_EXPERT + default n -+ default y if !DMA_BUF_SYNC_IOCTL_SUPPORTED + help -+ This option caused kbase to set up the GPU mapping of imported -+ dma-buf when needed to run atoms. This is the legacy behaviour. ++ Choose this option to enable system level support needed for ++ job dumping. This is typically used for instrumentation but has ++ minimal overhead when not in use. Enable only if you know what ++ you are doing. + -+config MALI_DMA_BUF_LEGACY_COMPAT -+ bool "Enable legacy compatibility cache flush on dma-buf map" -+ depends on MALI_BIFROST && !MALI_DMA_BUF_MAP_ON_DEMAND ++comment "Workarounds" ++ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++ ++config MALI_PWRSOFT_765 ++ bool "Enable workaround for PWRSOFT-765" ++ depends on MALI_BIFROST && MALI_BIFROST_EXPERT + default n + help -+ This option enables compatibility with legacy dma-buf mapping -+ behavior, then the dma-buf is mapped on import, by adding cache -+ maintenance where MALI_DMA_BUF_MAP_ON_DEMAND would do the mapping, -+ including a cache flush. ++ PWRSOFT-765 fixes devfreq cooling devices issues. The fix was merged ++ in kernel v4.10, however if backported into the kernel then this ++ option must be manually selected. + -+config MALI_REAL_HW -+ bool -+ default y -+ default n if NO_MALI ++ If using kernel >= v4.10 then say N, otherwise if devfreq cooling ++ changes have been backported say Y to avoid compilation errors. + +config MALI_HW_ERRATA_1485982_NOT_AFFECTED + bool "Disable workaround for BASE_HW_ISSUE_GPU2017_1336" + depends on MALI_BIFROST && MALI_BIFROST_EXPERT + default n -+ default y if PLATFORM_JUNO + help + This option disables the default workaround for GPU2017-1336. The + workaround keeps the L2 cache powered up except for powerdown and reset. @@ -138741,38 +141198,325 @@ index 000000000000..99ababfc2d16 + default n + help + This option uses an alternative workaround for GPU2017-1336. Lowering -+ the GPU clock to a, platform specific, known good frequeuncy before ++ the GPU clock to a, platform specific, known good frequency before + powering down the L2 cache. The clock can be specified in the device + tree using the property, opp-mali-errata-1485982. Otherwise the + slowest clock will be selected. + -+config MALI_GEM5_BUILD -+ bool "Enable build of Mali kernel driver for GEM5" ++endif ++ ++config MALI_ARBITRATION ++ tristate "Enable Virtualization reference code" + depends on MALI_BIFROST + default n + help -+ This option is to do a Mali GEM5 build. ++ Enables the build of several reference modules used in the reference ++ virtualization setup for Mali + If unsure, say N. + -+# Instrumentation options. + -+# config MALI_JOB_DUMP exists in the Kernel Kconfig but is configured using CINSTR_JOB_DUMP in Mconfig. -+# config MALI_BIFROST_PRFCNT_SET_SECONDARY exists in the Kernel Kconfig but is configured using CINSTR_SECONDARY_HWC in Mconfig. ++# source "drivers/gpu/arm/bifrost/tests/Kconfig" ++ ++endif +diff --git a/drivers/gpu/arm/bifrost/Makefile b/drivers/gpu/arm/bifrost/Makefile +new file mode 100755 +index 000000000..39df298ff +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/Makefile +@@ -0,0 +1,279 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++# ++# (C) COPYRIGHT 2010-2023 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU license. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, you can access it online at ++# http://www.gnu.org/licenses/gpl-2.0.html. ++# ++# ++ ++KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build ++KDIR ?= $(KERNEL_SRC) ++ ++ifeq ($(KDIR),) ++ $(error Must specify KDIR to point to the kernel to target)) ++endif ++ ++# ++# Default configuration values ++# ++# Dependency resolution is done through statements as Kconfig ++# is not supported for out-of-tree builds. ++# ++ ++CONFIG_MALI_BIFROST ?= m ++ifeq ($(CONFIG_MALI_BIFROST),m) ++ CONFIG_MALI_PLATFORM_NAME ?= "devicetree" ++ CONFIG_MALI_BIFROST_GATOR_SUPPORT ?= y ++ CONFIG_MALI_ARBITRATION ?= n ++ CONFIG_MALI_PARTITION_MANAGER ?= n ++ ++ ifneq ($(CONFIG_MALI_BIFROST_NO_MALI),y) ++ # Prevent misuse when CONFIG_MALI_BIFROST_NO_MALI ++ CONFIG_MALI_REAL_HW ?= y ++ CONFIG_MALI_CORESIGHT = n ++ endif ++ ++ ifeq ($(CONFIG_MALI_BIFROST_DVFS),y) ++ # Prevent misuse when CONFIG_MALI_BIFROST_DVFS=y ++ CONFIG_MALI_BIFROST_DEVFREQ ?= n ++ else ++ CONFIG_MALI_BIFROST_DEVFREQ ?= y ++ endif ++ ++ ifeq ($(CONFIG_MALI_DMA_BUF_MAP_ON_DEMAND), y) ++ # Prevent misuse when CONFIG_MALI_DMA_BUF_MAP_ON_DEMAND=y ++ CONFIG_MALI_DMA_BUF_LEGACY_COMPAT = n ++ endif ++ ++ ifeq ($(CONFIG_MALI_CSF_SUPPORT), y) ++ CONFIG_MALI_CORESIGHT ?= n ++ endif ++ ++ # ++ # Expert/Debug/Test released configurations ++ # ++ ifeq ($(CONFIG_MALI_BIFROST_EXPERT), y) ++ ifeq ($(CONFIG_MALI_BIFROST_NO_MALI), y) ++ CONFIG_MALI_REAL_HW = n ++ ++ else ++ # Prevent misuse when CONFIG_MALI_BIFROST_NO_MALI=n ++ CONFIG_MALI_REAL_HW = y ++ CONFIG_MALI_BIFROST_ERROR_INJECT = n ++ endif ++ ++ ++ ifeq ($(CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED), y) ++ # Prevent misuse when CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED=y ++ CONFIG_MALI_HW_ERRATA_1485982_USE_CLOCK_ALTERNATIVE = n ++ endif ++ ++ ifeq ($(CONFIG_MALI_BIFROST_DEBUG), y) ++ CONFIG_MALI_BIFROST_ENABLE_TRACE ?= y ++ CONFIG_MALI_BIFROST_SYSTEM_TRACE ?= y + -+source "kernel/drivers/gpu/arm/midgard/tests/Mconfig" ++ ifeq ($(CONFIG_SYNC_FILE), y) ++ CONFIG_MALI_BIFROST_FENCE_DEBUG ?= y ++ else ++ CONFIG_MALI_BIFROST_FENCE_DEBUG = n ++ endif ++ else ++ # Prevent misuse when CONFIG_MALI_BIFROST_DEBUG=n ++ CONFIG_MALI_BIFROST_ENABLE_TRACE = n ++ CONFIG_MALI_BIFROST_SYSTEM_TRACE = n ++ CONFIG_MALI_BIFROST_FENCE_DEBUG = n ++ endif ++ else ++ # Prevent misuse when CONFIG_MALI_BIFROST_EXPERT=n ++ CONFIG_MALI_CORESTACK = n ++ CONFIG_LARGE_PAGE_ALLOC_OVERRIDE = n ++ CONFIG_LARGE_PAGE_ALLOC = n ++ CONFIG_MALI_PWRSOFT_765 = n ++ CONFIG_MALI_MEMORY_FULLY_BACKED = n ++ CONFIG_MALI_JOB_DUMP = n ++ CONFIG_MALI_BIFROST_NO_MALI = n ++ CONFIG_MALI_REAL_HW = y ++ CONFIG_MALI_BIFROST_ERROR_INJECT = n ++ CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED = n ++ CONFIG_MALI_HW_ERRATA_1485982_USE_CLOCK_ALTERNATIVE = n ++ CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS = n ++ CONFIG_MALI_BIFROST_DEBUG = n ++ CONFIG_MALI_BIFROST_ENABLE_TRACE = n ++ CONFIG_MALI_BIFROST_SYSTEM_TRACE = n ++ CONFIG_MALI_BIFROST_FENCE_DEBUG = n ++ endif ++ ++ ifeq ($(CONFIG_MALI_BIFROST_DEBUG), y) ++ CONFIG_MALI_KUTF ?= y ++ ifeq ($(CONFIG_MALI_KUTF), y) ++ CONFIG_MALI_KUTF_IRQ_TEST ?= y ++ CONFIG_MALI_KUTF_CLK_RATE_TRACE ?= y ++ CONFIG_MALI_KUTF_MGM_INTEGRATION_TEST ?= y ++ else ++ # Prevent misuse when CONFIG_MALI_KUTF=n ++ CONFIG_MALI_KUTF_IRQ_TEST = n ++ CONFIG_MALI_KUTF_CLK_RATE_TRACE = n ++ CONFIG_MALI_KUTF_MGM_INTEGRATION_TEST = n ++ endif ++ else ++ # Prevent misuse when CONFIG_MALI_BIFROST_DEBUG=n ++ CONFIG_MALI_KUTF = n ++ CONFIG_MALI_KUTF_IRQ_TEST = n ++ CONFIG_MALI_KUTF_CLK_RATE_TRACE = n ++ CONFIG_MALI_KUTF_MGM_INTEGRATION_TEST = n ++ endif ++else ++ # Prevent misuse when CONFIG_MALI_BIFROST=n ++ CONFIG_MALI_ARBITRATION = n ++ CONFIG_MALI_KUTF = n ++ CONFIG_MALI_KUTF_IRQ_TEST = n ++ CONFIG_MALI_KUTF_CLK_RATE_TRACE = n ++ CONFIG_MALI_KUTF_MGM_INTEGRATION_TEST = n ++endif ++ ++# All Mali CONFIG should be listed here ++CONFIGS := \ ++ CONFIG_MALI_BIFROST \ ++ CONFIG_MALI_CSF_SUPPORT \ ++ CONFIG_MALI_BIFROST_GATOR_SUPPORT \ ++ CONFIG_MALI_ARBITER_SUPPORT \ ++ CONFIG_MALI_ARBITRATION \ ++ CONFIG_MALI_PARTITION_MANAGER \ ++ CONFIG_MALI_REAL_HW \ ++ CONFIG_MALI_BIFROST_DEVFREQ \ ++ CONFIG_MALI_BIFROST_DVFS \ ++ CONFIG_MALI_DMA_BUF_MAP_ON_DEMAND \ ++ CONFIG_MALI_DMA_BUF_LEGACY_COMPAT \ ++ CONFIG_MALI_BIFROST_EXPERT \ ++ CONFIG_MALI_CORESTACK \ ++ CONFIG_LARGE_PAGE_ALLOC_OVERRIDE \ ++ CONFIG_LARGE_PAGE_ALLOC \ ++ CONFIG_MALI_PWRSOFT_765 \ ++ CONFIG_MALI_MEMORY_FULLY_BACKED \ ++ CONFIG_MALI_JOB_DUMP \ ++ CONFIG_MALI_BIFROST_NO_MALI \ ++ CONFIG_MALI_BIFROST_ERROR_INJECT \ ++ CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED \ ++ CONFIG_MALI_HW_ERRATA_1485982_USE_CLOCK_ALTERNATIVE \ ++ CONFIG_MALI_PRFCNT_SET_PRIMARY \ ++ CONFIG_MALI_BIFROST_PRFCNT_SET_SECONDARY \ ++ CONFIG_MALI_PRFCNT_SET_TERTIARY \ ++ CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS \ ++ CONFIG_MALI_BIFROST_DEBUG \ ++ CONFIG_MALI_BIFROST_ENABLE_TRACE \ ++ CONFIG_MALI_BIFROST_SYSTEM_TRACE \ ++ CONFIG_MALI_BIFROST_FENCE_DEBUG \ ++ CONFIG_MALI_KUTF \ ++ CONFIG_MALI_KUTF_IRQ_TEST \ ++ CONFIG_MALI_KUTF_CLK_RATE_TRACE \ ++ CONFIG_MALI_KUTF_MGM_INTEGRATION_TEST \ ++ CONFIG_MALI_XEN \ ++ CONFIG_MALI_CORESIGHT ++ ++ ++THIS_DIR := $(dir $(lastword $(MAKEFILE_LIST))) ++-include $(THIS_DIR)/../arbitration/Makefile ++ ++# MAKE_ARGS to pass the custom CONFIGs on out-of-tree build ++# ++# Generate the list of CONFIGs and values. ++# $(value config) is the name of the CONFIG option. ++# $(value $(value config)) is its value (y, m). ++# When the CONFIG is not set to y or m, it defaults to n. ++MAKE_ARGS := $(foreach config,$(CONFIGS), \ ++ $(if $(filter y m,$(value $(value config))), \ ++ $(value config)=$(value $(value config)), \ ++ $(value config)=n)) ++ ++MAKE_ARGS += CONFIG_MALI_PLATFORM_NAME=$(CONFIG_MALI_PLATFORM_NAME) ++ ++# ++# EXTRA_CFLAGS to define the custom CONFIGs on out-of-tree build ++# ++# Generate the list of CONFIGs defines with values from CONFIGS. ++# $(value config) is the name of the CONFIG option. ++# When set to y or m, the CONFIG gets defined to 1. ++EXTRA_CFLAGS := $(foreach config,$(CONFIGS), \ ++ $(if $(filter y m,$(value $(value config))), \ ++ -D$(value config)=1)) ++ ++EXTRA_CFLAGS += -DCONFIG_MALI_PLATFORM_NAME=$(CONFIG_MALI_PLATFORM_NAME) ++ ++# ++# KBUILD_EXTRA_SYMBOLS to prevent warnings about unknown functions ++# ++ ++KBUILD_CFLAGS += -Wall -Werror ++ ++# The following were added to align with W=1 in scripts/Makefile.extrawarn ++# from the Linux source tree (v5.18.14) ++KBUILD_CFLAGS += -Wextra -Wunused -Wno-unused-parameter ++KBUILD_CFLAGS += -Wmissing-declarations ++KBUILD_CFLAGS += -Wmissing-format-attribute ++KBUILD_CFLAGS += -Wmissing-prototypes ++KBUILD_CFLAGS += -Wold-style-definition ++# The -Wmissing-include-dirs cannot be enabled as the path to some of the ++# included directories change depending on whether it is an in-tree or ++# out-of-tree build. ++KBUILD_CFLAGS += $(call cc-option, -Wunused-but-set-variable) ++KBUILD_CFLAGS += $(call cc-option, -Wunused-const-variable) ++KBUILD_CFLAGS += $(call cc-option, -Wpacked-not-aligned) ++KBUILD_CFLAGS += $(call cc-option, -Wstringop-truncation) ++# The following turn off the warnings enabled by -Wextra ++KBUILD_CFLAGS += -Wno-sign-compare ++KBUILD_CFLAGS += -Wno-shift-negative-value ++# This flag is needed to avoid build errors on older kernels ++KBUILD_CFLAGS += $(call cc-option, -Wno-cast-function-type) ++ ++KBUILD_CPPFLAGS += -DKBUILD_EXTRA_WARN1 ++ ++# The following were added to align with W=2 in scripts/Makefile.extrawarn ++# from the Linux source tree (v5.18.14) ++KBUILD_CFLAGS += -Wdisabled-optimization ++# The -Wshadow flag cannot be enabled unless upstream kernels are ++# patched to fix redefinitions of certain built-in functions and ++# global variables. ++KBUILD_CFLAGS += $(call cc-option, -Wlogical-op) ++KBUILD_CFLAGS += -Wmissing-field-initializers ++# -Wtype-limits must be disabled due to build failures on kernel 5.x ++KBUILD_CFLAGS += -Wno-type-limit ++KBUILD_CFLAGS += $(call cc-option, -Wmaybe-uninitialized) ++KBUILD_CFLAGS += $(call cc-option, -Wunused-macros) ++ ++KBUILD_CPPFLAGS += -DKBUILD_EXTRA_WARN2 ++ ++# This warning is disabled to avoid build failures in some kernel versions ++KBUILD_CFLAGS += -Wno-ignored-qualifiers ++ ++ifeq ($(CONFIG_GCOV_KERNEL),y) ++ KBUILD_CFLAGS += $(call cc-option, -ftest-coverage) ++ KBUILD_CFLAGS += $(call cc-option, -fprofile-arcs) ++ EXTRA_CFLAGS += -DGCOV_PROFILE=1 ++endif ++ ++ifeq ($(CONFIG_MALI_KCOV),y) ++ KBUILD_CFLAGS += $(call cc-option, -fsanitize-coverage=trace-cmp) ++ EXTRA_CFLAGS += -DKCOV=1 ++ EXTRA_CFLAGS += -DKCOV_ENABLE_COMPARISONS=1 ++endif ++ ++all: ++ $(MAKE) -C $(KDIR) M=$(CURDIR) $(MAKE_ARGS) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" modules ++ ++modules_install: ++ $(MAKE) -C $(KDIR) M=$(CURDIR) $(MAKE_ARGS) modules_install ++ ++clean: ++ $(MAKE) -C $(KDIR) M=$(CURDIR) $(MAKE_ARGS) clean diff --git a/drivers/gpu/arm/bifrost/arbiter/Kbuild b/drivers/gpu/arm/bifrost/arbiter/Kbuild new file mode 100755 -index 000000000000..98e47bed223a +index 000000000..2e6b11144 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/Kbuild -@@ -0,0 +1,24 @@ +@@ -0,0 +1,23 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -138783,29 +141527,26 @@ index 000000000000..98e47bed223a +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+mali_kbase-y += \ -+ arbiter/mali_kbase_arbif.o \ -+ arbiter/mali_kbase_arbiter_pm.o ++bifrost_kbase-y += \ ++ arbiter/mali_kbase_arbif.o \ ++ arbiter/mali_kbase_arbiter_pm.o diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c new file mode 100755 -index 000000000000..ddf1a0ce0b05 +index 000000000..b5d3cd685 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c -@@ -0,0 +1,175 @@ -+// SPDX-License-Identifier: GPL-2.0 -+ +@@ -0,0 +1,357 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -138816,13 +141557,10 @@ index 000000000000..ddf1a0ce0b05 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** -+ * @file mali_kbase_arbif.c -+ * Mali arbiter interface APIs to share GPU between Virtual Machines ++ * DOC: Mali arbiter interface APIs to share GPU between Virtual Machines + */ + +#include @@ -138830,34 +141568,157 @@ index 000000000000..ddf1a0ce0b05 +#include +#include +#include -+#include "mali_kbase_arbiter_interface.h" ++#include "linux/mali_arbiter_interface.h" ++ ++/* Arbiter interface version against which was implemented this module */ ++#define MALI_REQUIRED_KBASE_ARBITER_INTERFACE_VERSION 5 ++#if MALI_REQUIRED_KBASE_ARBITER_INTERFACE_VERSION != \ ++ MALI_ARBITER_INTERFACE_VERSION ++#error "Unsupported Mali Arbiter interface version." ++#endif ++ ++static void on_max_config(struct device *dev, uint32_t max_l2_slices, ++ uint32_t max_core_mask) ++{ ++ struct kbase_device *kbdev; ++ ++ if (!dev) { ++ pr_err("%s(): dev is NULL", __func__); ++ return; ++ } ++ ++ kbdev = dev_get_drvdata(dev); ++ if (!kbdev) { ++ dev_err(dev, "%s(): kbdev is NULL", __func__); ++ return; ++ } ++ ++ if (!max_l2_slices || !max_core_mask) { ++ dev_dbg(dev, ++ "%s(): max_config ignored as one of the fields is zero", ++ __func__); ++ return; ++ } ++ ++ /* set the max config info in the kbase device */ ++ kbase_arbiter_set_max_config(kbdev, max_l2_slices, max_core_mask); ++} ++ ++/** ++ * on_update_freq() - Updates GPU clock frequency ++ * @dev: arbiter interface device handle ++ * @freq: GPU clock frequency value reported from arbiter ++ * ++ * call back function to update GPU clock frequency with ++ * new value from arbiter ++ */ ++static void on_update_freq(struct device *dev, uint32_t freq) ++{ ++ struct kbase_device *kbdev; ++ ++ if (!dev) { ++ pr_err("%s(): dev is NULL", __func__); ++ return; ++ } ++ ++ kbdev = dev_get_drvdata(dev); ++ if (!kbdev) { ++ dev_err(dev, "%s(): kbdev is NULL", __func__); ++ return; ++ } ++ ++ kbase_arbiter_pm_update_gpu_freq(&kbdev->arb.arb_freq, freq); ++} + ++/** ++ * on_gpu_stop() - sends KBASE_VM_GPU_STOP_EVT event on VM stop ++ * @dev: arbiter interface device handle ++ * ++ * call back function to signal a GPU STOP event from arbiter interface ++ */ +static void on_gpu_stop(struct device *dev) +{ -+ struct kbase_device *kbdev = dev_get_drvdata(dev); ++ struct kbase_device *kbdev; ++ ++ if (!dev) { ++ pr_err("%s(): dev is NULL", __func__); ++ return; ++ } ++ ++ kbdev = dev_get_drvdata(dev); ++ if (!kbdev) { ++ dev_err(dev, "%s(): kbdev is NULL", __func__); ++ return; ++ } + + KBASE_TLSTREAM_TL_ARBITER_STOP_REQUESTED(kbdev, kbdev); + kbase_arbiter_pm_vm_event(kbdev, KBASE_VM_GPU_STOP_EVT); +} + ++/** ++ * on_gpu_granted() - sends KBASE_VM_GPU_GRANTED_EVT event on GPU granted ++ * @dev: arbiter interface device handle ++ * ++ * call back function to signal a GPU GRANT event from arbiter interface ++ */ +static void on_gpu_granted(struct device *dev) +{ -+ struct kbase_device *kbdev = dev_get_drvdata(dev); ++ struct kbase_device *kbdev; ++ ++ if (!dev) { ++ pr_err("%s(): dev is NULL", __func__); ++ return; ++ } ++ ++ kbdev = dev_get_drvdata(dev); ++ if (!kbdev) { ++ dev_err(dev, "%s(): kbdev is NULL", __func__); ++ return; ++ } + + KBASE_TLSTREAM_TL_ARBITER_GRANTED(kbdev, kbdev); + kbase_arbiter_pm_vm_event(kbdev, KBASE_VM_GPU_GRANTED_EVT); +} + ++/** ++ * on_gpu_lost() - sends KBASE_VM_GPU_LOST_EVT event on GPU granted ++ * @dev: arbiter interface device handle ++ * ++ * call back function to signal a GPU LOST event from arbiter interface ++ */ +static void on_gpu_lost(struct device *dev) +{ -+ struct kbase_device *kbdev = dev_get_drvdata(dev); ++ struct kbase_device *kbdev; ++ ++ if (!dev) { ++ pr_err("%s(): dev is NULL", __func__); ++ return; ++ } ++ ++ kbdev = dev_get_drvdata(dev); ++ if (!kbdev) { ++ dev_err(dev, "%s(): kbdev is NULL", __func__); ++ return; ++ } + + kbase_arbiter_pm_vm_event(kbdev, KBASE_VM_GPU_LOST_EVT); +} + ++/** ++ * kbase_arbif_init() - Kbase Arbiter interface initialisation. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Initialise Kbase Arbiter interface and assign callback functions. ++ * ++ * Return: ++ * * 0 - the interface was initialized or was not specified ++ * * in the device tree. ++ * * -EFAULT - the interface was specified but failed to initialize. ++ * * -EPROBE_DEFER - module dependencies are not yet available. ++ */ +int kbase_arbif_init(struct kbase_device *kbdev) +{ -+#ifdef CONFIG_OF ++#if IS_ENABLED(CONFIG_OF) + struct arbiter_if_arb_vm_ops ops; + struct arbiter_if_dev *arb_if; + struct device_node *arbiter_if_node; @@ -138884,6 +141745,7 @@ index 000000000000..ddf1a0ce0b05 + + if (!pdev->dev.driver || !try_module_get(pdev->dev.driver->owner)) { + dev_err(kbdev->dev, "arbiter_if driver not available\n"); ++ put_device(&pdev->dev); + return -EPROBE_DEFER; + } + kbdev->arb.arb_dev = &pdev->dev; @@ -138891,6 +141753,7 @@ index 000000000000..ddf1a0ce0b05 + if (!arb_if) { + dev_err(kbdev->dev, "arbiter_if driver not ready\n"); + module_put(pdev->dev.driver->owner); ++ put_device(&pdev->dev); + return -EPROBE_DEFER; + } + @@ -138898,6 +141761,12 @@ index 000000000000..ddf1a0ce0b05 + ops.arb_vm_gpu_stop = on_gpu_stop; + ops.arb_vm_gpu_granted = on_gpu_granted; + ops.arb_vm_gpu_lost = on_gpu_lost; ++ ops.arb_vm_max_config = on_max_config; ++ ops.arb_vm_update_freq = on_update_freq; ++ ++ kbdev->arb.arb_freq.arb_freq = 0; ++ kbdev->arb.arb_freq.freq_updated = false; ++ mutex_init(&kbdev->arb.arb_freq.arb_freq_lock); + + /* register kbase arbiter_if callbacks */ + if (arb_if->vm_ops.vm_arb_register_dev) { @@ -138906,9 +141775,13 @@ index 000000000000..ddf1a0ce0b05 + if (err) { + dev_err(&pdev->dev, "Failed to register with arbiter\n"); + module_put(pdev->dev.driver->owner); ++ put_device(&pdev->dev); ++ if (err != -EPROBE_DEFER) ++ err = -EFAULT; + return err; + } + } ++ +#else /* CONFIG_OF */ + dev_dbg(kbdev->dev, "No arbiter without Device Tree support\n"); + kbdev->arb.arb_dev = NULL; @@ -138917,6 +141790,12 @@ index 000000000000..ddf1a0ce0b05 + return 0; +} + ++/** ++ * kbase_arbif_destroy() - De-init Kbase arbiter interface ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * De-initialise Kbase arbiter interface ++ */ +void kbase_arbif_destroy(struct kbase_device *kbdev) +{ + struct arbiter_if_dev *arb_if = kbdev->arb.arb_if; @@ -138926,21 +141805,52 @@ index 000000000000..ddf1a0ce0b05 + arb_if->vm_ops.vm_arb_unregister_dev(kbdev->arb.arb_if); + } + kbdev->arb.arb_if = NULL; -+ if (kbdev->arb.arb_dev) ++ if (kbdev->arb.arb_dev) { + module_put(kbdev->arb.arb_dev->driver->owner); ++ put_device(kbdev->arb.arb_dev); ++ } + kbdev->arb.arb_dev = NULL; +} + ++/** ++ * kbase_arbif_get_max_config() - Request max config info ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * call back function from arb interface to arbiter requesting max config info ++ */ ++void kbase_arbif_get_max_config(struct kbase_device *kbdev) ++{ ++ struct arbiter_if_dev *arb_if = kbdev->arb.arb_if; ++ ++ if (arb_if && arb_if->vm_ops.vm_arb_get_max_config) { ++ dev_dbg(kbdev->dev, "%s\n", __func__); ++ arb_if->vm_ops.vm_arb_get_max_config(arb_if); ++ } ++} ++ ++/** ++ * kbase_arbif_gpu_request() - Request GPU from ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * call back function from arb interface to arbiter requesting GPU for VM ++ */ +void kbase_arbif_gpu_request(struct kbase_device *kbdev) +{ + struct arbiter_if_dev *arb_if = kbdev->arb.arb_if; + + if (arb_if && arb_if->vm_ops.vm_arb_gpu_request) { + dev_dbg(kbdev->dev, "%s\n", __func__); ++ KBASE_TLSTREAM_TL_ARBITER_REQUESTED(kbdev, kbdev); + arb_if->vm_ops.vm_arb_gpu_request(arb_if); + } +} + ++/** ++ * kbase_arbif_gpu_stopped() - send GPU stopped message to the arbiter ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @gpu_required: GPU request flag ++ * ++ */ +void kbase_arbif_gpu_stopped(struct kbase_device *kbdev, u8 gpu_required) +{ + struct arbiter_if_dev *arb_if = kbdev->arb.arb_if; @@ -138948,10 +141858,18 @@ index 000000000000..ddf1a0ce0b05 + if (arb_if && arb_if->vm_ops.vm_arb_gpu_stopped) { + dev_dbg(kbdev->dev, "%s\n", __func__); + KBASE_TLSTREAM_TL_ARBITER_STOPPED(kbdev, kbdev); ++ if (gpu_required) ++ KBASE_TLSTREAM_TL_ARBITER_REQUESTED(kbdev, kbdev); + arb_if->vm_ops.vm_arb_gpu_stopped(arb_if, gpu_required); + } +} + ++/** ++ * kbase_arbif_gpu_active() - Sends a GPU_ACTIVE message to the Arbiter ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Informs the arbiter VM is active ++ */ +void kbase_arbif_gpu_active(struct kbase_device *kbdev) +{ + struct arbiter_if_dev *arb_if = kbdev->arb.arb_if; @@ -138962,6 +141880,12 @@ index 000000000000..ddf1a0ce0b05 + } +} + ++/** ++ * kbase_arbif_gpu_idle() - Inform the arbiter that the VM has gone idle ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Informs the arbiter VM is idle ++ */ +void kbase_arbif_gpu_idle(struct kbase_device *kbdev) +{ + struct arbiter_if_dev *arb_if = kbdev->arb.arb_if; @@ -138973,35 +141897,14 @@ index 000000000000..ddf1a0ce0b05 +} diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h new file mode 100755 -index 000000000000..e7e9de76c94c +index 000000000..701ffd42f --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h -@@ -0,0 +1,133 @@ -+/* -+ * -+ * (C) COPYRIGHT ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ *//* SPDX-License-Identifier: GPL-2.0 */ -+ +@@ -0,0 +1,121 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -139017,12 +141920,10 @@ index 000000000000..e7e9de76c94c + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * + */ + +/** -+ * @file -+ * Mali arbiter interface APIs to share GPU between Virtual Machines ++ * DOC: Mali arbiter interface APIs to share GPU between Virtual Machines + */ + +#ifndef _MALI_KBASE_ARBIF_H_ @@ -139059,8 +141960,11 @@ index 000000000000..e7e9de76c94c + * Initialize the arbiter interface and also determines + * if Arbiter functionality is required. + * -+ * Return: 0 if the Arbiter interface was successfully initialized or the -+ * Arbiter was not required. ++ * Return: ++ * * 0 - the interface was initialized or was not specified ++ * * in the device tree. ++ * * -EFAULT - the interface was specified but failed to initialize. ++ * * -EPROBE_DEFER - module dependencies are not yet available. + */ +int kbase_arbif_init(struct kbase_device *kbdev); + @@ -139074,6 +141978,14 @@ index 000000000000..e7e9de76c94c +void kbase_arbif_destroy(struct kbase_device *kbdev); + +/** ++ * kbase_arbif_get_max_config() - Request max config info ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * call back function from arb interface to arbiter requesting max config info ++ */ ++void kbase_arbif_get_max_config(struct kbase_device *kbdev); ++ ++/** + * kbase_arbif_gpu_request() - Send GPU request message to the arbiter + * @kbdev: The kbase device structure for the device (must be a valid pointer) + * @@ -139112,35 +142024,14 @@ index 000000000000..e7e9de76c94c +#endif /* _MALI_KBASE_ARBIF_H_ */ diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h new file mode 100755 -index 000000000000..1f53cbf1a286 +index 000000000..1c4901b3b --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h -@@ -0,0 +1,95 @@ -+/* -+ * -+ * (C) COPYRIGHT ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ *//* SPDX-License-Identifier: GPL-2.0 */ -+ +@@ -0,0 +1,76 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -139156,12 +142047,10 @@ index 000000000000..1f53cbf1a286 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * + */ + +/** -+ * @file -+ * Mali structures define to support arbitration feature ++ * DOC: Mali structures define to support arbitration feature + */ + +#ifndef _MALI_KBASE_ARBITER_DEFS_H_ @@ -139184,7 +142073,8 @@ index 000000000000..1f53cbf1a286 + * @vm_resume_work: Work item for vm_arb_wq to resume current work on GPU + * @vm_arb_starting: Work queue resume in progress + * @vm_arb_stopping: Work queue suspend in progress -+ * @vm_arb_users_waiting: Count of users waiting for GPU ++ * @interrupts_installed: Flag set when interrupts are installed ++ * @vm_request_timer: Timer to monitor GPU request + */ +struct kbase_arbiter_vm_state { + struct kbase_device *kbdev; @@ -139196,7 +142086,8 @@ index 000000000000..1f53cbf1a286 + struct work_struct vm_resume_work; + bool vm_arb_starting; + bool vm_arb_stopping; -+ int vm_arb_users_waiting; ++ bool interrupts_installed; ++ struct hrtimer vm_request_timer; +}; + +/** @@ -139204,44 +142095,25 @@ index 000000000000..1f53cbf1a286 + * allocated from the probe method of Mali driver + * @arb_if: Pointer to the arbiter interface device + * @arb_dev: Pointer to the arbiter device ++ * @arb_freq: GPU clock frequency retrieved from arbiter. + */ +struct kbase_arbiter_device { + struct arbiter_if_dev *arb_if; + struct device *arb_dev; ++ struct kbase_arbiter_freq arb_freq; +}; + +#endif /* _MALI_KBASE_ARBITER_DEFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_interface.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_interface.h +diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c new file mode 100755 -index 000000000000..5d5d8a7d2cff +index 000000000..667552c56 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_interface.h -@@ -0,0 +1,181 @@ -+/* -+ * -+ * (C) COPYRIGHT ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ *//* SPDX-License-Identifier: GPL-2.0 */ -+ ++++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c +@@ -0,0 +1,1138 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -139257,194 +142129,46 @@ index 000000000000..5d5d8a7d2cff + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * -+ */ -+ -+/** -+ * @file -+ * Defines the Mali arbiter interface -+ */ -+ -+#ifndef _MALI_KBASE_ARBITER_INTERFACE_H_ -+#define _MALI_KBASE_ARBITER_INTERFACE_H_ -+ -+/** -+ * @brief Mali arbiter interface version -+ * -+ * This specifies the current version of the configuration interface. Whenever -+ * the arbiter interface changes, so that integration effort is required, the -+ * version number will be increased. Each configuration must make an effort -+ * to check that it implements the correct version. -+ * -+ * Version history: -+ * 1 - Added the Mali arbiter configuration interface. -+ * 2 - Strip out reference code from header -+ * 3 - Removed DVFS utilization interface (DVFS moved to arbiter side) -+ */ -+#define MALI_KBASE_ARBITER_INTERFACE_VERSION 3 -+ -+struct arbiter_if_dev; -+ -+/** -+ * struct arbiter_if_arb_vm_ops - Interface to communicate messages to VM -+ * -+ * This struct contains callbacks used to deliver messages -+ * from the arbiter to the corresponding VM. -+ * -+ * Note that calls into these callbacks may have synchronous calls back into -+ * the arbiter arbiter_if_vm_arb_ops callbacks below. -+ * For example vm_arb_gpu_stopped() may be called as a side effect of -+ * arb_vm_gpu_stop() being called here. + */ -+struct arbiter_if_arb_vm_ops { -+ /** -+ * arb_vm_gpu_stop() - Ask VM to stop using GPU -+ * @dev: The arbif kernel module device. -+ * -+ * Informs KBase to stop using the GPU as soon as possible. -+ * @Note: Once the driver is no longer using the GPU, a call to -+ * vm_arb_gpu_stopped is expected by the arbiter. -+ */ -+ void (*arb_vm_gpu_stop)(struct device *dev); -+ -+ /** -+ * arb_vm_gpu_granted() - GPU has been granted to VM -+ * @dev: The arbif kernel module device. -+ * -+ * Informs KBase that the GPU can now be used by the VM. -+ */ -+ void (*arb_vm_gpu_granted)(struct device *dev); -+ -+ /** -+ * arb_vm_gpu_lost() - VM has lost the GPU -+ * @dev: The arbif kernel module device. -+ * -+ * This is called if KBase takes too long to respond to the arbiter -+ * stop request. -+ * Once this is called, KBase will assume that access to the GPU -+ * has been lost and will fail all running jobs and reset its -+ * internal state. -+ * If successful, will respond with a vm_arb_gpu_stopped message. -+ */ -+ void (*arb_vm_gpu_lost)(struct device *dev); -+}; + +/** -+ * struct arbiter_if_vm_arb_ops - Interface to communicate messages to arbiter -+ * -+ * This struct contains callbacks used to request operations -+ * from the VM to the arbiter -+ * -+ * Note that we must not make any synchronous calls back in to the VM -+ * (via arbiter_if_arb_vm_ops above) in the context of these callbacks. ++ * DOC: Mali arbiter power manager state machine and APIs + */ -+struct arbiter_if_vm_arb_ops { -+ /** -+ * vm_arb_register_dev() - Register VM device driver callbacks. -+ * @arbif_dev: The arbiter interface we are registering device callbacks -+ * @dev: The device structure to supply in the callbacks. -+ * @ops: The callbacks that the device driver supports -+ * (none are optional). -+ */ -+ int (*vm_arb_register_dev)(struct arbiter_if_dev *arbif_dev, -+ struct device *dev, struct arbiter_if_arb_vm_ops *ops); + -+ /** -+ * vm_arb_unregister_dev() - Unregister VM device driver callbacks. -+ * @arbif_dev: The arbiter interface we are unregistering from. -+ */ -+ void (*vm_arb_unregister_dev)(struct arbiter_if_dev *arbif_dev); -+ -+ /** -+ * vm_arb_gpu_request() - Ask the arbiter interface for GPU access. -+ * @arbif_dev: The arbiter interface we want to issue the request. -+ */ -+ void (*vm_arb_gpu_request)(struct arbiter_if_dev *arbif_dev); -+ -+ /** -+ * vm_arb_gpu_active() - Inform arbiter that the driver has gone active -+ * @arbif_dev: The arbiter interface device. -+ */ -+ void (*vm_arb_gpu_active)(struct arbiter_if_dev *arbif_dev); -+ -+ /** -+ * vm_arb_gpu_idle() - Inform the arbiter that the driver has gone idle -+ * @arbif_dev: The arbiter interface device. -+ */ -+ void (*vm_arb_gpu_idle)(struct arbiter_if_dev *arbif_dev); -+ -+ /** -+ * vm_arb_gpu_stopped() - Inform the arbiter that the driver has stopped -+ * using the GPU -+ * @arbif_dev: The arbiter interface device. -+ * @gpu_required: The GPU is still needed to do more work. -+ */ -+ void (*vm_arb_gpu_stopped)(struct arbiter_if_dev *arbif_dev, -+ u8 gpu_required); -+}; ++#include ++#include ++#include ++#include ++#include ++#include + -+/** -+ * struct arbiter_if_dev - Arbiter Interface -+ * @vm_ops: Callback functions for connecting KBase with -+ * arbiter interface device. -+ * @priv_data: Internal arbif data not used by KBASE. -+ * -+ * Arbiter Interface Kernel Module State used for linking KBase -+ * with an arbiter interface platform device ++/* A dmesg warning will occur if the GPU is not granted ++ * after the following time (in milliseconds) has ellapsed. + */ -+struct arbiter_if_dev { -+ struct arbiter_if_vm_arb_ops vm_ops; -+ void *priv_data; -+}; ++#define GPU_REQUEST_TIMEOUT 1000 ++#define KHZ_TO_HZ 1000 + -+#endif /* _MALI_KBASE_ARBITER_INTERFACE_H_ */ -diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c -new file mode 100755 -index 000000000000..02b5de2436ea ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c -@@ -0,0 +1,676 @@ -+// SPDX-License-Identifier: GPL-2.0 ++#define MAX_L2_SLICES_MASK 0xFF + -+/* -+ * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * ++/* Maximum time in ms, before deferring probe incase ++ * GPU_GRANTED message is not received + */ -+ -+/** -+ * @file mali_kbase_arbiter_pm.c -+ * Mali arbiter power manager state machine and APIs -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++static int gpu_req_timeout = 1; ++module_param(gpu_req_timeout, int, 0644); ++MODULE_PARM_DESC(gpu_req_timeout, ++ "On a virtualized platform, if the GPU is not granted within this time(ms) kbase will defer the probe"); + +static void kbase_arbiter_pm_vm_wait_gpu_assignment(struct kbase_device *kbdev); +static inline bool kbase_arbiter_pm_vm_gpu_assigned_lockheld( + struct kbase_device *kbdev); + ++/** ++ * kbase_arbiter_pm_vm_state_str() - Helper function to get string ++ * for kbase VM state.(debug) ++ * @state: kbase VM state ++ * ++ * Return: string representation of Kbase_vm_state ++ */ +static inline const char *kbase_arbiter_pm_vm_state_str( + enum kbase_vm_state state) +{ @@ -139479,6 +142203,13 @@ index 000000000000..02b5de2436ea + } +} + ++/** ++ * kbase_arbiter_pm_vm_event_str() - Helper function to get string ++ * for kbase VM event.(debug) ++ * @evt: kbase VM state ++ * ++ * Return: String representation of Kbase_arbif_event ++ */ +static inline const char *kbase_arbiter_pm_vm_event_str( + enum kbase_arbif_evt evt) +{ @@ -139505,6 +142236,13 @@ index 000000000000..02b5de2436ea + } +} + ++/** ++ * kbase_arbiter_pm_vm_set_state() - Sets new kbase_arbiter_vm_state ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @new_state: kbase VM new state ++ * ++ * This function sets the new state for the VM ++ */ +static void kbase_arbiter_pm_vm_set_state(struct kbase_device *kbdev, + enum kbase_vm_state new_state) +{ @@ -139513,11 +142251,22 @@ index 000000000000..02b5de2436ea + dev_dbg(kbdev->dev, "VM set_state %s -> %s", + kbase_arbiter_pm_vm_state_str(arb_vm_state->vm_state), + kbase_arbiter_pm_vm_state_str(new_state)); ++ + lockdep_assert_held(&arb_vm_state->vm_state_lock); + arb_vm_state->vm_state = new_state; ++ if (new_state != KBASE_VM_STATE_INITIALIZING_WITH_GPU && ++ new_state != KBASE_VM_STATE_INITIALIZING) ++ KBASE_KTRACE_ADD(kbdev, ARB_VM_STATE, NULL, new_state); + wake_up(&arb_vm_state->vm_state_wait); +} + ++/** ++ * kbase_arbiter_pm_suspend_wq() - suspend work queue of the driver. ++ * @data: work queue ++ * ++ * Suspends work queue of the driver, when VM is in SUSPEND_PENDING or ++ * STOPPING_IDLE or STOPPING_ACTIVE state ++ */ +static void kbase_arbiter_pm_suspend_wq(struct work_struct *data) +{ + struct kbase_arbiter_vm_state *arb_vm_state = container_of(data, @@ -139542,6 +142291,13 @@ index 000000000000..02b5de2436ea + dev_dbg(kbdev->dev, "<%s\n", __func__); +} + ++/** ++ * kbase_arbiter_pm_resume_wq() -Kbase resume work queue. ++ * @data: work item ++ * ++ * Resume work queue of the driver when VM is in STARTING state, ++ * else if its in STOPPING_ACTIVE will request a stop event. ++ */ +static void kbase_arbiter_pm_resume_wq(struct work_struct *data) +{ + struct kbase_arbiter_vm_state *arb_vm_state = container_of(data, @@ -139563,9 +142319,74 @@ index 000000000000..02b5de2436ea + } + arb_vm_state->vm_arb_starting = false; + mutex_unlock(&arb_vm_state->vm_state_lock); ++ KBASE_TLSTREAM_TL_ARBITER_STARTED(kbdev, kbdev); + dev_dbg(kbdev->dev, "<%s\n", __func__); +} + ++/** ++ * request_timer_callback() - Issue warning on request timer expiration ++ * @timer: Request hr timer data ++ * ++ * Called when the Arbiter takes too long to grant the GPU after a ++ * request has been made. Issues a warning in dmesg. ++ * ++ * Return: Always returns HRTIMER_NORESTART ++ */ ++static enum hrtimer_restart request_timer_callback(struct hrtimer *timer) ++{ ++ struct kbase_arbiter_vm_state *arb_vm_state = container_of(timer, ++ struct kbase_arbiter_vm_state, vm_request_timer); ++ ++ KBASE_DEBUG_ASSERT(arb_vm_state); ++ KBASE_DEBUG_ASSERT(arb_vm_state->kbdev); ++ ++ dev_warn(arb_vm_state->kbdev->dev, ++ "Still waiting for GPU to be granted from Arbiter after %d ms\n", ++ GPU_REQUEST_TIMEOUT); ++ return HRTIMER_NORESTART; ++} ++ ++/** ++ * start_request_timer() - Start a timer after requesting GPU ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Start a timer to track when kbase is waiting for the GPU from the ++ * Arbiter. If the timer expires before GPU is granted, a warning in ++ * dmesg will be issued. ++ */ ++static void start_request_timer(struct kbase_device *kbdev) ++{ ++ struct kbase_arbiter_vm_state *arb_vm_state = kbdev->pm.arb_vm_state; ++ ++ hrtimer_start(&arb_vm_state->vm_request_timer, ++ HR_TIMER_DELAY_MSEC(GPU_REQUEST_TIMEOUT), ++ HRTIMER_MODE_REL); ++} ++ ++/** ++ * cancel_request_timer() - Stop the request timer ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Stops the request timer once GPU has been granted. Safe to call ++ * even if timer is no longer running. ++ */ ++static void cancel_request_timer(struct kbase_device *kbdev) ++{ ++ struct kbase_arbiter_vm_state *arb_vm_state = kbdev->pm.arb_vm_state; ++ ++ hrtimer_cancel(&arb_vm_state->vm_request_timer); ++} ++ ++/** ++ * kbase_arbiter_pm_early_init() - Initialize arbiter for VM ++ * Paravirtualized use. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Initialize the arbiter and other required resources during the runtime ++ * and request the GPU for the VM for the first time. ++ * ++ * Return: 0 if success, or a Linux error code ++ */ +int kbase_arbiter_pm_early_init(struct kbase_device *kbdev) +{ + int err; @@ -139585,12 +142406,17 @@ index 000000000000..02b5de2436ea + WQ_HIGHPRI); + if (!arb_vm_state->vm_arb_wq) { + dev_err(kbdev->dev, "Failed to allocate vm_arb workqueue\n"); ++ kfree(arb_vm_state); + return -ENOMEM; + } + INIT_WORK(&arb_vm_state->vm_suspend_work, kbase_arbiter_pm_suspend_wq); + INIT_WORK(&arb_vm_state->vm_resume_work, kbase_arbiter_pm_resume_wq); + arb_vm_state->vm_arb_starting = false; -+ arb_vm_state->vm_arb_users_waiting = 0; ++ atomic_set(&kbdev->pm.gpu_users_waiting, 0); ++ hrtimer_init(&arb_vm_state->vm_request_timer, CLOCK_MONOTONIC, ++ HRTIMER_MODE_REL); ++ arb_vm_state->vm_request_timer.function = ++ request_timer_callback; + kbdev->pm.arb_vm_state = arb_vm_state; + + err = kbase_arbif_init(kbdev); @@ -139598,17 +142424,34 @@ index 000000000000..02b5de2436ea + dev_err(kbdev->dev, "Failed to initialise arbif module\n"); + goto arbif_init_fail; + } ++ + if (kbdev->arb.arb_if) { + kbase_arbif_gpu_request(kbdev); + dev_dbg(kbdev->dev, "Waiting for initial GPU assignment...\n"); -+ wait_event(arb_vm_state->vm_state_wait, ++ ++ err = wait_event_timeout(arb_vm_state->vm_state_wait, + arb_vm_state->vm_state == -+ KBASE_VM_STATE_INITIALIZING_WITH_GPU); ++ KBASE_VM_STATE_INITIALIZING_WITH_GPU, ++ msecs_to_jiffies(gpu_req_timeout)); ++ ++ if (!err) { ++ dev_dbg(kbdev->dev, ++ "Kbase probe Deferred after waiting %d ms to receive GPU_GRANT\n", ++ gpu_req_timeout); ++ ++ err = -ENODEV; ++ goto arbif_timeout; ++ } ++ + dev_dbg(kbdev->dev, + "Waiting for initial GPU assignment - done\n"); + } + return 0; + ++arbif_timeout: ++ kbase_arbiter_pm_early_term(kbdev); ++ return err; ++ +arbif_init_fail: + destroy_workqueue(arb_vm_state->vm_arb_wq); + kfree(arb_vm_state); @@ -139616,36 +142459,74 @@ index 000000000000..02b5de2436ea + return err; +} + ++/** ++ * kbase_arbiter_pm_early_term() - Shutdown arbiter and free resources ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Clean up all the resources ++ */ +void kbase_arbiter_pm_early_term(struct kbase_device *kbdev) +{ + struct kbase_arbiter_vm_state *arb_vm_state = kbdev->pm.arb_vm_state; + ++ cancel_request_timer(kbdev); + mutex_lock(&arb_vm_state->vm_state_lock); + if (arb_vm_state->vm_state > KBASE_VM_STATE_STOPPED_GPU_REQUESTED) { + kbase_pm_set_gpu_lost(kbdev, false); + kbase_arbif_gpu_stopped(kbdev, false); + } + mutex_unlock(&arb_vm_state->vm_state_lock); -+ kbase_arbif_destroy(kbdev); + destroy_workqueue(arb_vm_state->vm_arb_wq); ++ kbase_arbif_destroy(kbdev); + arb_vm_state->vm_arb_wq = NULL; + kfree(kbdev->pm.arb_vm_state); + kbdev->pm.arb_vm_state = NULL; +} + ++/** ++ * kbase_arbiter_pm_release_interrupts() - Release the GPU interrupts ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Releases interrupts and set the interrupt flag to false ++ */ +void kbase_arbiter_pm_release_interrupts(struct kbase_device *kbdev) +{ + struct kbase_arbiter_vm_state *arb_vm_state = kbdev->pm.arb_vm_state; + + mutex_lock(&arb_vm_state->vm_state_lock); -+ if (!kbdev->arb.arb_if || -+ arb_vm_state->vm_state > -+ KBASE_VM_STATE_STOPPED_GPU_REQUESTED) ++ if (arb_vm_state->interrupts_installed == true) { ++ arb_vm_state->interrupts_installed = false; + kbase_release_interrupts(kbdev); ++ } ++ mutex_unlock(&arb_vm_state->vm_state_lock); ++} + ++/** ++ * kbase_arbiter_pm_install_interrupts() - Install the GPU interrupts ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Install interrupts and set the interrupt_install flag to true. ++ * ++ * Return: 0 if success, or a Linux error code ++ */ ++int kbase_arbiter_pm_install_interrupts(struct kbase_device *kbdev) ++{ ++ struct kbase_arbiter_vm_state *arb_vm_state = kbdev->pm.arb_vm_state; ++ int err; ++ ++ mutex_lock(&arb_vm_state->vm_state_lock); ++ arb_vm_state->interrupts_installed = true; ++ err = kbase_install_interrupts(kbdev); + mutex_unlock(&arb_vm_state->vm_state_lock); ++ return err; +} + ++/** ++ * kbase_arbiter_pm_vm_stopped() - Handle stop state for the VM ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Handles a stop state for the VM ++ */ +void kbase_arbiter_pm_vm_stopped(struct kbase_device *kbdev) +{ + bool request_gpu = false; @@ -139653,14 +142534,19 @@ index 000000000000..02b5de2436ea + + lockdep_assert_held(&arb_vm_state->vm_state_lock); + -+ if (arb_vm_state->vm_arb_users_waiting > 0 && ++ if (atomic_read(&kbdev->pm.gpu_users_waiting) > 0 && + arb_vm_state->vm_state == KBASE_VM_STATE_STOPPING_IDLE) + kbase_arbiter_pm_vm_set_state(kbdev, + KBASE_VM_STATE_STOPPING_ACTIVE); + + dev_dbg(kbdev->dev, "%s %s\n", __func__, + kbase_arbiter_pm_vm_state_str(arb_vm_state->vm_state)); -+ kbase_release_interrupts(kbdev); ++ ++ if (arb_vm_state->interrupts_installed) { ++ arb_vm_state->interrupts_installed = false; ++ kbase_release_interrupts(kbdev); ++ } ++ + switch (arb_vm_state->vm_state) { + case KBASE_VM_STATE_STOPPING_ACTIVE: + request_gpu = true; @@ -139681,13 +142567,93 @@ index 000000000000..02b5de2436ea + + kbase_pm_set_gpu_lost(kbdev, false); + kbase_arbif_gpu_stopped(kbdev, request_gpu); ++ if (request_gpu) ++ start_request_timer(kbdev); ++} ++ ++void kbase_arbiter_set_max_config(struct kbase_device *kbdev, ++ uint32_t max_l2_slices, ++ uint32_t max_core_mask) ++{ ++ struct kbase_arbiter_vm_state *arb_vm_state; ++ struct max_config_props max_config; ++ ++ if (!kbdev) ++ return; ++ ++ /* Mask the max_l2_slices as it is stored as 8 bits into kbase */ ++ max_config.l2_slices = max_l2_slices & MAX_L2_SLICES_MASK; ++ max_config.core_mask = max_core_mask; ++ arb_vm_state = kbdev->pm.arb_vm_state; ++ ++ mutex_lock(&arb_vm_state->vm_state_lock); ++ /* Just set the max_props in kbase during initialization. */ ++ if (arb_vm_state->vm_state == KBASE_VM_STATE_INITIALIZING) ++ kbase_gpuprops_set_max_config(kbdev, &max_config); ++ else ++ dev_dbg(kbdev->dev, "Unexpected max_config on VM state %s", ++ kbase_arbiter_pm_vm_state_str(arb_vm_state->vm_state)); ++ ++ mutex_unlock(&arb_vm_state->vm_state_lock); +} + ++int kbase_arbiter_pm_gpu_assigned(struct kbase_device *kbdev) ++{ ++ struct kbase_arbiter_vm_state *arb_vm_state; ++ int result = -EINVAL; ++ ++ if (!kbdev) ++ return result; ++ ++ /* First check the GPU_LOST state */ ++ kbase_pm_lock(kbdev); ++ if (kbase_pm_is_gpu_lost(kbdev)) { ++ kbase_pm_unlock(kbdev); ++ return 0; ++ } ++ kbase_pm_unlock(kbdev); ++ ++ /* Then the arbitration state machine */ ++ arb_vm_state = kbdev->pm.arb_vm_state; ++ ++ mutex_lock(&arb_vm_state->vm_state_lock); ++ switch (arb_vm_state->vm_state) { ++ case KBASE_VM_STATE_INITIALIZING: ++ case KBASE_VM_STATE_SUSPENDED: ++ case KBASE_VM_STATE_STOPPED: ++ case KBASE_VM_STATE_STOPPED_GPU_REQUESTED: ++ case KBASE_VM_STATE_SUSPEND_WAIT_FOR_GRANT: ++ result = 0; ++ break; ++ default: ++ result = 1; ++ break; ++ } ++ mutex_unlock(&arb_vm_state->vm_state_lock); ++ ++ return result; ++} ++ ++/** ++ * kbase_arbiter_pm_vm_gpu_start() - Handles the start state of the VM ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Handles the start state of the VM ++ */ +static void kbase_arbiter_pm_vm_gpu_start(struct kbase_device *kbdev) +{ + struct kbase_arbiter_vm_state *arb_vm_state = kbdev->pm.arb_vm_state; ++ bool freq_updated = false; + + lockdep_assert_held(&arb_vm_state->vm_state_lock); ++ mutex_lock(&kbdev->arb.arb_freq.arb_freq_lock); ++ if (kbdev->arb.arb_freq.freq_updated) { ++ kbdev->arb.arb_freq.freq_updated = false; ++ freq_updated = true; ++ } ++ mutex_unlock(&kbdev->arb.arb_freq.arb_freq_lock); ++ ++ cancel_request_timer(kbdev); + switch (arb_vm_state->vm_state) { + case KBASE_VM_STATE_INITIALIZING: + kbase_arbiter_pm_vm_set_state(kbdev, @@ -139695,7 +142661,14 @@ index 000000000000..02b5de2436ea + break; + case KBASE_VM_STATE_STOPPED_GPU_REQUESTED: + kbase_arbiter_pm_vm_set_state(kbdev, KBASE_VM_STATE_STARTING); ++ arb_vm_state->interrupts_installed = true; + kbase_install_interrupts(kbdev); ++ /* ++ * GPU GRANTED received while in stop can be a result of a ++ * repartitioning. ++ */ ++ kbase_gpuprops_req_curr_config_update(kbdev); ++ /* curr_config will be updated while resuming the PM. */ + queue_work(arb_vm_state->vm_arb_wq, + &arb_vm_state->vm_resume_work); + break; @@ -139705,13 +142678,26 @@ index 000000000000..02b5de2436ea + kbase_arbiter_pm_vm_set_state(kbdev, KBASE_VM_STATE_SUSPENDED); + break; + default: -+ dev_warn(kbdev->dev, -+ "GPU_GRANTED when not expected - state %s\n", -+ kbase_arbiter_pm_vm_state_str(arb_vm_state->vm_state)); ++ /* ++ * GPU_GRANTED can be received when there is a frequency update ++ * Only show a warning if received in an unexpected state ++ * without a frequency update ++ */ ++ if (!freq_updated) ++ dev_warn(kbdev->dev, ++ "GPU_GRANTED when not expected - state %s\n", ++ kbase_arbiter_pm_vm_state_str( ++ arb_vm_state->vm_state)); + break; + } +} + ++/** ++ * kbase_arbiter_pm_vm_gpu_stop() - Handles the stop state of the VM ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Handles the start state of the VM ++ */ +static void kbase_arbiter_pm_vm_gpu_stop(struct kbase_device *kbdev) +{ + struct kbase_arbiter_vm_state *arb_vm_state = kbdev->pm.arb_vm_state; @@ -139754,6 +142740,12 @@ index 000000000000..02b5de2436ea + } +} + ++/** ++ * kbase_gpu_lost() - Kbase signals GPU is lost on a lost event signal ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * On GPU lost event signals GPU_LOST to the aribiter ++ */ +static void kbase_gpu_lost(struct kbase_device *kbdev) +{ + struct kbase_arbiter_vm_state *arb_vm_state = kbdev->pm.arb_vm_state; @@ -139802,6 +142794,13 @@ index 000000000000..02b5de2436ea + } +} + ++/** ++ * kbase_arbiter_pm_vm_os_suspend_ready_state() - checks if VM is ready ++ * to be moved to suspended state. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Return: True if its ready to be suspended else False. ++ */ +static inline bool kbase_arbiter_pm_vm_os_suspend_ready_state( + struct kbase_device *kbdev) +{ @@ -139816,6 +142815,14 @@ index 000000000000..02b5de2436ea + } +} + ++/** ++ * kbase_arbiter_pm_vm_os_prepare_suspend() - Prepare OS to be in suspend state ++ * until it receives the grant message from arbiter ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Prepares OS to be in suspend state until it receives GRANT message ++ * from Arbiter asynchronously. ++ */ +static void kbase_arbiter_pm_vm_os_prepare_suspend(struct kbase_device *kbdev) +{ + struct kbase_arbiter_vm_state *arb_vm_state = kbdev->pm.arb_vm_state; @@ -139881,6 +142888,14 @@ index 000000000000..02b5de2436ea + } +} + ++/** ++ * kbase_arbiter_pm_vm_os_resume() - Resume OS function once it receives ++ * a grant message from arbiter ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Resume OS function once it receives GRANT message ++ * from Arbiter asynchronously. ++ */ +static void kbase_arbiter_pm_vm_os_resume(struct kbase_device *kbdev) +{ + struct kbase_arbiter_vm_state *arb_vm_state = kbdev->pm.arb_vm_state; @@ -139893,6 +142908,7 @@ index 000000000000..02b5de2436ea + kbase_arbiter_pm_vm_set_state(kbdev, + KBASE_VM_STATE_STOPPED_GPU_REQUESTED); + kbase_arbif_gpu_request(kbdev); ++ start_request_timer(kbdev); + + /* Release lock and block resume OS function until we have + * asynchronously received the GRANT message from the Arbiter and @@ -139904,6 +142920,14 @@ index 000000000000..02b5de2436ea + mutex_lock(&arb_vm_state->vm_state_lock); +} + ++/** ++ * kbase_arbiter_pm_vm_event() - Dispatch VM event to the state machine. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @evt: VM event ++ * ++ * The state machine function. Receives events and transitions states ++ * according the event received and the current state ++ */ +void kbase_arbiter_pm_vm_event(struct kbase_device *kbdev, + enum kbase_arbif_evt evt) +{ @@ -139915,7 +142939,9 @@ index 000000000000..02b5de2436ea + mutex_lock(&arb_vm_state->vm_state_lock); + dev_dbg(kbdev->dev, "%s %s\n", __func__, + kbase_arbiter_pm_vm_event_str(evt)); -+ ++ if (arb_vm_state->vm_state != KBASE_VM_STATE_INITIALIZING_WITH_GPU && ++ arb_vm_state->vm_state != KBASE_VM_STATE_INITIALIZING) ++ KBASE_KTRACE_ADD(kbdev, ARB_VM_EVT, NULL, evt); + switch (evt) { + case KBASE_VM_GPU_GRANTED_EVT: + kbase_arbiter_pm_vm_gpu_start(kbdev); @@ -139948,8 +142974,6 @@ index 000000000000..02b5de2436ea + case KBASE_VM_REF_EVENT: + switch (arb_vm_state->vm_state) { + case KBASE_VM_STATE_STARTING: -+ KBASE_TLSTREAM_TL_ARBITER_STARTED(kbdev, kbdev); -+ /* FALL THROUGH */ + case KBASE_VM_STATE_IDLE: + kbase_arbiter_pm_vm_set_state(kbdev, + KBASE_VM_STATE_ACTIVE); @@ -139992,6 +143016,12 @@ index 000000000000..02b5de2436ea + +KBASE_EXPORT_TEST_API(kbase_arbiter_pm_vm_event); + ++/** ++ * kbase_arbiter_pm_vm_wait_gpu_assignment() - VM wait for a GPU assignment. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * VM waits for a GPU assignment. ++ */ +static void kbase_arbiter_pm_vm_wait_gpu_assignment(struct kbase_device *kbdev) +{ + struct kbase_arbiter_vm_state *arb_vm_state = kbdev->pm.arb_vm_state; @@ -140003,6 +143033,14 @@ index 000000000000..02b5de2436ea + dev_dbg(kbdev->dev, "Waiting for GPU assignment - done\n"); +} + ++/** ++ * kbase_arbiter_pm_vm_gpu_assigned_lockheld() - Check if VM holds VM state lock ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Checks if the virtual machine holds VM state lock. ++ * ++ * Return: true if GPU is assigned, else false. ++ */ +static inline bool kbase_arbiter_pm_vm_gpu_assigned_lockheld( + struct kbase_device *kbdev) +{ @@ -140013,10 +143051,22 @@ index 000000000000..02b5de2436ea + arb_vm_state->vm_state == KBASE_VM_STATE_ACTIVE); +} + ++/** ++ * kbase_arbiter_pm_ctx_active_handle_suspend() - Handle suspend operation for ++ * arbitration mode ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @suspend_handler: The handler code for how to handle a suspend ++ * that might occur ++ * ++ * This function handles a suspend event from the driver, ++ * communicating with the arbiter and waiting synchronously for the GPU ++ * to be granted again depending on the VM state. ++ * ++ * Return: 0 on success else 1 suspend handler isn not possible. ++ */ +int kbase_arbiter_pm_ctx_active_handle_suspend(struct kbase_device *kbdev, + enum kbase_pm_suspend_handler suspend_handler) +{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; + struct kbase_arbiter_vm_state *arb_vm_state = kbdev->pm.arb_vm_state; + int res = 0; + @@ -140033,6 +143083,7 @@ index 000000000000..02b5de2436ea + kbase_arbiter_pm_vm_set_state(kbdev, + KBASE_VM_STATE_STOPPED_GPU_REQUESTED); + kbase_arbif_gpu_request(kbdev); ++ start_request_timer(kbdev); + } else if (arb_vm_state->vm_state == + KBASE_VM_STATE_INITIALIZING_WITH_GPU) + break; @@ -140066,51 +143117,147 @@ index 000000000000..02b5de2436ea + } + + /* Need to synchronously wait for GPU assignment */ -+ arb_vm_state->vm_arb_users_waiting++; ++ atomic_inc(&kbdev->pm.gpu_users_waiting); + mutex_unlock(&arb_vm_state->vm_state_lock); -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); ++ kbase_pm_unlock(kbdev); + kbase_arbiter_pm_vm_wait_gpu_assignment(kbdev); -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); ++ kbase_pm_lock(kbdev); + mutex_lock(&arb_vm_state->vm_state_lock); -+ arb_vm_state->vm_arb_users_waiting--; ++ atomic_dec(&kbdev->pm.gpu_users_waiting); + } + mutex_unlock(&arb_vm_state->vm_state_lock); + } + return res; +} -diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h -new file mode 100755 -index 000000000000..3c49eb1948c5 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h -@@ -0,0 +1,159 @@ -+/* -+ * -+ * (C) COPYRIGHT ARM Limited. All rights reserved. ++ ++/** ++ * kbase_arbiter_pm_update_gpu_freq() - Updates GPU clock frequency received ++ * from arbiter. ++ * @arb_freq: Pointer to struchture holding GPU clock frequenecy data ++ * @freq: New frequency value in KHz ++ */ ++void kbase_arbiter_pm_update_gpu_freq(struct kbase_arbiter_freq *arb_freq, ++ uint32_t freq) ++{ ++ struct kbase_gpu_clk_notifier_data ndata; ++ ++ mutex_lock(&arb_freq->arb_freq_lock); ++ if (arb_freq->arb_freq != freq) { ++ ndata.new_rate = (unsigned long)freq * KHZ_TO_HZ; ++ ndata.old_rate = (unsigned long)arb_freq->arb_freq * KHZ_TO_HZ; ++ ndata.gpu_clk_handle = arb_freq; ++ arb_freq->arb_freq = freq; ++ arb_freq->freq_updated = true; ++ if (arb_freq->nb) ++ arb_freq->nb->notifier_call(arb_freq->nb, ++ POST_RATE_CHANGE, &ndata); ++ } ++ ++ mutex_unlock(&arb_freq->arb_freq_lock); ++} ++ ++/** ++ * get_arb_gpu_clk() - Enumerate a GPU clock on the given index ++ * @kbdev: kbase_device pointer ++ * @index: GPU clock index + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * Return: Pointer to structure holding GPU clock frequency data reported from ++ * arbiter, only index 0 is valid. ++ */ ++static void *get_arb_gpu_clk(struct kbase_device *kbdev, ++ unsigned int index) ++{ ++ if (index == 0) ++ return &kbdev->arb.arb_freq; ++ return NULL; ++} ++ ++/** ++ * get_arb_gpu_clk_rate() - Get the current rate of GPU clock frequency value ++ * @kbdev: kbase_device pointer ++ * @gpu_clk_handle: Handle unique to the enumerated GPU clock + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * Return: The GPU clock frequency value saved when gpu is granted from arbiter ++ */ ++static unsigned long get_arb_gpu_clk_rate(struct kbase_device *kbdev, ++ void *gpu_clk_handle) ++{ ++ uint32_t freq; ++ struct kbase_arbiter_freq *arb_dev_freq = ++ (struct kbase_arbiter_freq *) gpu_clk_handle; ++ ++ mutex_lock(&arb_dev_freq->arb_freq_lock); ++ /* Convert from KHz to Hz */ ++ freq = arb_dev_freq->arb_freq * KHZ_TO_HZ; ++ mutex_unlock(&arb_dev_freq->arb_freq_lock); ++ return freq; ++} ++ ++/** ++ * arb_gpu_clk_notifier_register() - Register a clock rate change notifier. ++ * @kbdev: kbase_device pointer ++ * @gpu_clk_handle: Handle unique to the enumerated GPU clock ++ * @nb: notifier block containing the callback function pointer + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * This function registers a callback function that is invoked whenever the ++ * frequency of the clock corresponding to @gpu_clk_handle changes. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ * Return: 0 on success, negative error code otherwise. ++ */ ++static int arb_gpu_clk_notifier_register(struct kbase_device *kbdev, ++ void *gpu_clk_handle, struct notifier_block *nb) ++{ ++ int ret = 0; ++ struct kbase_arbiter_freq *arb_dev_freq = ++ (struct kbase_arbiter_freq *)gpu_clk_handle; ++ ++ if (!arb_dev_freq->nb) ++ arb_dev_freq->nb = nb; ++ else ++ ret = -EBUSY; ++ ++ return ret; ++} ++ ++/** ++ * arb_gpu_clk_notifier_unregister() - Unregister clock rate change notifier ++ * @kbdev: kbase_device pointer ++ * @gpu_clk_handle: Handle unique to the enumerated GPU clock ++ * @nb: notifier block containing the callback function pointer + * -+ *//* SPDX-License-Identifier: GPL-2.0 */ ++ * This function pointer is used to unregister a callback function that ++ * was previously registered to get notified of a frequency change of the ++ * clock corresponding to @gpu_clk_handle. ++ */ ++static void arb_gpu_clk_notifier_unregister(struct kbase_device *kbdev, ++ void *gpu_clk_handle, struct notifier_block *nb) ++{ ++ struct kbase_arbiter_freq *arb_dev_freq = ++ (struct kbase_arbiter_freq *)gpu_clk_handle; ++ if (arb_dev_freq->nb == nb) { ++ arb_dev_freq->nb = NULL; ++ } else { ++ dev_err(kbdev->dev, "%s - notifier did not match\n", ++ __func__); ++ } ++} + ++struct kbase_clk_rate_trace_op_conf arb_clk_rate_trace_ops = { ++ .get_gpu_clk_rate = get_arb_gpu_clk_rate, ++ .enumerate_gpu_clk = get_arb_gpu_clk, ++ .gpu_clk_notifier_register = arb_gpu_clk_notifier_register, ++ .gpu_clk_notifier_unregister = arb_gpu_clk_notifier_unregister ++}; +diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h +new file mode 100755 +index 000000000..f863f8860 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h +@@ -0,0 +1,196 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -140126,13 +143273,10 @@ index 000000000000..3c49eb1948c5 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** -+ * @file -+ * Mali arbiter power manager state machine and APIs ++ * DOC: Mali arbiter power manager state machine and APIs + */ + +#ifndef _MALI_KBASE_ARBITER_PM_H_ @@ -140204,13 +143348,24 @@ index 000000000000..3c49eb1948c5 + * kbase_arbiter_pm_release_interrupts() - Release the GPU interrupts + * @kbdev: The kbase device structure for the device (must be a valid pointer) + * -+ * Releases interrupts if needed (GPU is available) otherwise does nothing ++ * Releases interrupts and set the interrupt flag to false + */ +void kbase_arbiter_pm_release_interrupts(struct kbase_device *kbdev); + +/** ++ * kbase_arbiter_pm_install_interrupts() - Install the GPU interrupts ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Install interrupts and set the interrupt_install flag to true. ++ * ++ * Return: 0 if success, or a Linux error code ++ */ ++int kbase_arbiter_pm_install_interrupts(struct kbase_device *kbdev); ++ ++/** + * kbase_arbiter_pm_vm_event() - Dispatch VM event to the state machine + * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @event: The event to dispatch + * + * The state machine function. Receives events and transitions states + * according the event received and the current state @@ -140244,20 +143399,71 @@ index 000000000000..3c49eb1948c5 + */ +void kbase_arbiter_pm_vm_stopped(struct kbase_device *kbdev); + ++/** ++ * kbase_arbiter_set_max_config() - Set the max config data in kbase device. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer). ++ * @max_l2_slices: The maximum number of L2 slices. ++ * @max_core_mask: The largest core mask. ++ * ++ * This function handles a stop event for the VM. ++ * It will update the VM state and forward the stop event to the driver. ++ */ ++void kbase_arbiter_set_max_config(struct kbase_device *kbdev, ++ uint32_t max_l2_slices, ++ uint32_t max_core_mask); ++ ++/** ++ * kbase_arbiter_pm_gpu_assigned() - Determine if this VM has access to the GPU ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Return: 0 if the VM does not have access, 1 if it does, and a negative number ++ * if an error occurred ++ */ ++int kbase_arbiter_pm_gpu_assigned(struct kbase_device *kbdev); ++ ++extern struct kbase_clk_rate_trace_op_conf arb_clk_rate_trace_ops; ++ ++/** ++ * struct kbase_arbiter_freq - Holding the GPU clock frequency data retrieved ++ * from arbiter ++ * @arb_freq: GPU clock frequency value ++ * @arb_freq_lock: Mutex protecting access to arbfreq value ++ * @nb: Notifier block to receive rate change callbacks ++ * @freq_updated: Flag to indicate whether a frequency changed has just been ++ * communicated to avoid "GPU_GRANTED when not expected" warning ++ */ ++struct kbase_arbiter_freq { ++ uint32_t arb_freq; ++ struct mutex arb_freq_lock; ++ struct notifier_block *nb; ++ bool freq_updated; ++}; ++ ++/** ++ * kbase_arbiter_pm_update_gpu_freq() - Update GPU frequency ++ * @arb_freq: Pointer to GPU clock frequency data ++ * @freq: The new frequency ++ * ++ * Updates the GPU frequency and triggers any notifications ++ */ ++void kbase_arbiter_pm_update_gpu_freq(struct kbase_arbiter_freq *arb_freq, ++ uint32_t freq); ++ +#endif /*_MALI_KBASE_ARBITER_PM_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/Kbuild b/drivers/gpu/arm/bifrost/backend/gpu/Kbuild new file mode 100755 -index 000000000000..b48ab4c51875 +index 000000000..efebc8a54 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/Kbuild -@@ -0,0 +1,65 @@ +@@ -0,0 +1,58 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2014-2020 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2014-2022 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -140268,68 +143474,61 @@ index 000000000000..b48ab4c51875 +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+BACKEND += \ -+ backend/gpu/mali_kbase_cache_policy_backend.c \ -+ backend/gpu/mali_kbase_gpuprops_backend.c \ -+ backend/gpu/mali_kbase_irq_linux.c \ -+ backend/gpu/mali_kbase_instr_backend.c \ -+ backend/gpu/mali_kbase_js_backend.c \ -+ backend/gpu/mali_kbase_pm_backend.c \ -+ backend/gpu/mali_kbase_pm_driver.c \ -+ backend/gpu/mali_kbase_pm_metrics.c \ -+ backend/gpu/mali_kbase_pm_ca.c \ -+ backend/gpu/mali_kbase_pm_always_on.c \ -+ backend/gpu/mali_kbase_pm_coarse_demand.c \ -+ backend/gpu/mali_kbase_pm_policy.c \ -+ backend/gpu/mali_kbase_time.c \ -+ backend/gpu/mali_kbase_l2_mmu_config.c \ -+ backend/gpu/mali_kbase_clk_rate_trace_mgr.c ++bifrost_kbase-y += \ ++ backend/gpu/mali_kbase_cache_policy_backend.o \ ++ backend/gpu/mali_kbase_gpuprops_backend.o \ ++ backend/gpu/mali_kbase_irq_linux.o \ ++ backend/gpu/mali_kbase_js_backend.o \ ++ backend/gpu/mali_kbase_pm_backend.o \ ++ backend/gpu/mali_kbase_pm_driver.o \ ++ backend/gpu/mali_kbase_pm_metrics.o \ ++ backend/gpu/mali_kbase_pm_ca.o \ ++ backend/gpu/mali_kbase_pm_always_on.o \ ++ backend/gpu/mali_kbase_pm_coarse_demand.o \ ++ backend/gpu/mali_kbase_pm_policy.o \ ++ backend/gpu/mali_kbase_time.o \ ++ backend/gpu/mali_kbase_l2_mmu_config.o \ ++ backend/gpu/mali_kbase_clk_rate_trace_mgr.o + -+ifeq ($(MALI_USE_CSF),1) -+# empty -+else -+ BACKEND += \ -+ backend/gpu/mali_kbase_jm_as.c \ -+ backend/gpu/mali_kbase_debug_job_fault_backend.c \ -+ backend/gpu/mali_kbase_jm_hw.c \ -+ backend/gpu/mali_kbase_jm_rb.c ++ifeq ($(MALI_USE_CSF),0) ++ bifrost_kbase-y += \ ++ backend/gpu/mali_kbase_instr_backend.o \ ++ backend/gpu/mali_kbase_jm_as.o \ ++ backend/gpu/mali_kbase_debug_job_fault_backend.o \ ++ backend/gpu/mali_kbase_jm_hw.o \ ++ backend/gpu/mali_kbase_jm_rb.o +endif + -+ifeq ($(MALI_CUSTOMER_RELEASE),0) -+BACKEND += \ -+ backend/gpu/mali_kbase_pm_always_on_demand.c -+endif + -+ifeq ($(CONFIG_MALI_BIFROST_DEVFREQ),y) -+BACKEND += \ -+ backend/gpu/mali_kbase_devfreq.c -+endif ++bifrost_kbase-$(CONFIG_MALI_BIFROST_DEVFREQ) += \ ++ backend/gpu/mali_kbase_devfreq.o + -+ifeq ($(CONFIG_MALI_BIFROST_NO_MALI),y) -+ # Dummy model -+ BACKEND += backend/gpu/mali_kbase_model_dummy.c -+ BACKEND += backend/gpu/mali_kbase_model_linux.c -+ # HW error simulation -+ BACKEND += backend/gpu/mali_kbase_model_error_generator.c ++ifneq ($(CONFIG_MALI_REAL_HW),y) ++ bifrost_kbase-y += backend/gpu/mali_kbase_model_linux.o +endif ++ ++# NO_MALI Dummy model interface ++bifrost_kbase-$(CONFIG_MALI_BIFROST_NO_MALI) += backend/gpu/mali_kbase_model_dummy.o ++# HW error simulation ++bifrost_kbase-$(CONFIG_MALI_BIFROST_NO_MALI) += backend/gpu/mali_kbase_model_error_generator.o ++ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h new file mode 100755 -index 000000000000..4a61f96c8c7d +index 000000000..6924fdb8a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h -@@ -0,0 +1,31 @@ +@@ -0,0 +1,30 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2018, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -140340,8 +143539,6 @@ index 000000000000..4a61f96c8c7d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -140355,18 +143552,19 @@ index 000000000000..4a61f96c8c7d + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c new file mode 100755 -index 000000000000..4e07a3f9d83f +index 000000000..7c0abbaf8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c -@@ -0,0 +1,34 @@ +@@ -0,0 +1,92 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2016, 2018, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2016, 2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -140377,36 +143575,94 @@ index 000000000000..4e07a3f9d83f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include "backend/gpu/mali_kbase_cache_policy_backend.h" +#include + ++/** ++ * kbasep_amba_register_present() - Check AMBA_<> register is present ++ * in the GPU. ++ * @kbdev: Device pointer ++ * ++ * Note: Only for arch version 12.x.1 onwards. ++ * ++ * Return: true if AMBA_FEATURES/ENABLE registers are present. ++ */ ++static bool kbasep_amba_register_present(struct kbase_device *kbdev) ++{ ++ return (ARCH_MAJOR_REV_REG(kbdev->gpu_props.props.raw_props.gpu_id) >= ++ GPU_ID2_ARCH_MAJOR_REV_MAKE(12, 1)); ++} ++ +void kbase_cache_set_coherency_mode(struct kbase_device *kbdev, + u32 mode) +{ + kbdev->current_gpu_coherency_mode = mode; + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_COHERENCY_REG)) ++ if (kbasep_amba_register_present(kbdev)) { ++ u32 val = kbase_reg_read(kbdev, AMBA_ENABLE); ++ ++ val = AMBA_ENABLE_COHERENCY_PROTOCOL_SET(val, mode); ++ kbase_reg_write(kbdev, AMBA_ENABLE, val); ++ } else + kbase_reg_write(kbdev, COHERENCY_ENABLE, mode); +} + ++u32 kbase_cache_get_coherency_features(struct kbase_device *kbdev) ++{ ++ u32 coherency_features; ++ ++ if (kbasep_amba_register_present(kbdev)) ++ coherency_features = ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(AMBA_FEATURES)); ++ else ++ coherency_features = kbase_reg_read( ++ kbdev, GPU_CONTROL_REG(COHERENCY_FEATURES)); ++ ++ return coherency_features; ++} ++ ++void kbase_amba_set_memory_cache_support(struct kbase_device *kbdev, ++ bool enable) ++{ ++ if (kbasep_amba_register_present(kbdev)) { ++ u32 val = kbase_reg_read(kbdev, AMBA_ENABLE); ++ ++ val = AMBA_ENABLE_MEMORY_CACHE_SUPPORT_SET(val, enable); ++ kbase_reg_write(kbdev, AMBA_ENABLE, val); ++ ++ } else { ++ WARN(1, "memory_cache_support not supported"); ++ } ++} ++ ++void kbase_amba_set_invalidate_hint(struct kbase_device *kbdev, bool enable) ++{ ++ if (kbasep_amba_register_present(kbdev)) { ++ u32 val = kbase_reg_read(kbdev, AMBA_ENABLE); ++ ++ val = AMBA_ENABLE_INVALIDATE_HINT_SET(val, enable); ++ kbase_reg_write(kbdev, AMBA_ENABLE, val); ++ } else { ++ WARN(1, "invalidate_hint not supported"); ++ } ++} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h new file mode 100755 -index 000000000000..f78ada74f605 +index 000000000..758e3be08 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h -@@ -0,0 +1,39 @@ +@@ -0,0 +1,65 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2015-2016 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2016, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -140417,41 +143673,67 @@ index 000000000000..f78ada74f605 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ +#ifndef _KBASE_CACHE_POLICY_BACKEND_H_ +#define _KBASE_CACHE_POLICY_BACKEND_H_ + +#include "mali_kbase.h" -+#include "mali_base_kernel.h" ++#include + +/** -+ * kbase_cache_set_coherency_mode() - Sets the system coherency mode -+ * in the GPU. -+ * @kbdev: Device pointer -+ * @mode: Coherency mode. COHERENCY_ACE/ACE_LITE -+ */ ++ * kbase_cache_set_coherency_mode() - Sets the system coherency mode ++ * in the GPU. ++ * @kbdev: Device pointer ++ * @mode: Coherency mode. COHERENCY_ACE/ACE_LITE ++ */ +void kbase_cache_set_coherency_mode(struct kbase_device *kbdev, + u32 mode); + -+#endif /* _KBASE_CACHE_POLICY_H_ */ ++/** ++ * kbase_cache_get_coherency_features() - Get the coherency features ++ * in the GPU. ++ * @kbdev: Device pointer ++ * ++ * Return: Register value to be returned ++ */ ++u32 kbase_cache_get_coherency_features(struct kbase_device *kbdev); ++ ++/** ++ * kbase_amba_set_memory_cache_support() - Sets AMBA memory cache support ++ * in the GPU. ++ * @kbdev: Device pointer ++ * @enable: true for enable. ++ * ++ * Note: Only for arch version 12.x.1 onwards. ++ */ ++void kbase_amba_set_memory_cache_support(struct kbase_device *kbdev, ++ bool enable); ++/** ++ * kbase_amba_set_invalidate_hint() - Sets AMBA invalidate hint ++ * in the GPU. ++ * @kbdev: Device pointer ++ * @enable: true for enable. ++ * ++ * Note: Only for arch version 12.x.1 onwards. ++ */ ++void kbase_amba_set_invalidate_hint(struct kbase_device *kbdev, bool enable); ++#endif /* _KBASE_CACHE_POLICY_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c new file mode 100755 -index 000000000000..187d7d6f6926 +index 000000000..ddd03ca23 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c -@@ -0,0 +1,287 @@ +@@ -0,0 +1,326 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -140462,8 +143744,6 @@ index 000000000000..187d7d6f6926 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -140473,8 +143753,9 @@ index 000000000000..187d7d6f6926 +#include +#include +#include ++#include +#include -+#include "mali_kbase_clk_rate_trace_mgr.h" ++#include "backend/gpu/mali_kbase_clk_rate_trace_mgr.h" + +#ifdef CONFIG_TRACE_POWER_GPU_FREQUENCY +#include @@ -140486,6 +143767,38 @@ index 000000000000..187d7d6f6926 +#define CLK_RATE_TRACE_OPS (NULL) +#endif + ++/** ++ * get_clk_rate_trace_callbacks() - Returns pointer to clk trace ops. ++ * @kbdev: Pointer to kbase device, used to check if arbitration is enabled ++ * when compiled with arbiter support. ++ * Return: Pointer to clk trace ops if supported or NULL. ++ */ ++static struct kbase_clk_rate_trace_op_conf * ++get_clk_rate_trace_callbacks(__maybe_unused struct kbase_device *kbdev) ++{ ++ /* base case */ ++ struct kbase_clk_rate_trace_op_conf *callbacks = ++ (struct kbase_clk_rate_trace_op_conf *)CLK_RATE_TRACE_OPS; ++#if defined(CONFIG_MALI_ARBITER_SUPPORT) && defined(CONFIG_OF) ++ const void *arbiter_if_node; ++ ++ if (WARN_ON(!kbdev) || WARN_ON(!kbdev->dev)) ++ return callbacks; ++ ++ arbiter_if_node = ++ of_get_property(kbdev->dev->of_node, "arbiter_if", NULL); ++ /* Arbitration enabled, override the callback pointer.*/ ++ if (arbiter_if_node) ++ callbacks = &arb_clk_rate_trace_ops; ++ else ++ dev_dbg(kbdev->dev, ++ "Arbitration supported but disabled by platform. Leaving clk rate callbacks as default.\n"); ++ ++#endif ++ ++ return callbacks; ++} ++ +static int gpu_clk_rate_change_notifier(struct notifier_block *nb, + unsigned long event, void *data) +{ @@ -140516,12 +143829,13 @@ index 000000000000..187d7d6f6926 +static int gpu_clk_data_init(struct kbase_device *kbdev, + void *gpu_clk_handle, unsigned int index) +{ -+ struct kbase_clk_rate_trace_op_conf *callbacks = -+ (struct kbase_clk_rate_trace_op_conf *)CLK_RATE_TRACE_OPS; ++ struct kbase_clk_rate_trace_op_conf *callbacks; + struct kbase_clk_data *clk_data; + struct kbase_clk_rate_trace_manager *clk_rtm = &kbdev->pm.clk_rtm; + int ret = 0; + ++ callbacks = get_clk_rate_trace_callbacks(kbdev); ++ + if (WARN_ON(!callbacks) || + WARN_ON(!gpu_clk_handle) || + WARN_ON(index >= BASE_MAX_NR_CLOCKS_REGULATORS)) @@ -140555,8 +143869,9 @@ index 000000000000..187d7d6f6926 + clk_data->clk_rate_change_nb.notifier_call = + gpu_clk_rate_change_notifier; + -+ ret = callbacks->gpu_clk_notifier_register(kbdev, gpu_clk_handle, -+ &clk_data->clk_rate_change_nb); ++ if (callbacks->gpu_clk_notifier_register) ++ ret = callbacks->gpu_clk_notifier_register(kbdev, ++ gpu_clk_handle, &clk_data->clk_rate_change_nb); + if (ret) { + dev_err(kbdev->dev, "Failed to register notifier for clock enumerated at index %u", index); + kfree(clk_data); @@ -140567,19 +143882,22 @@ index 000000000000..187d7d6f6926 + +int kbase_clk_rate_trace_manager_init(struct kbase_device *kbdev) +{ -+ struct kbase_clk_rate_trace_op_conf *callbacks = -+ (struct kbase_clk_rate_trace_op_conf *)CLK_RATE_TRACE_OPS; ++ struct kbase_clk_rate_trace_op_conf *callbacks; + struct kbase_clk_rate_trace_manager *clk_rtm = &kbdev->pm.clk_rtm; + unsigned int i; + int ret = 0; + -+ /* Return early if no callbacks provided for clock rate tracing */ -+ if (!callbacks) -+ return 0; ++ callbacks = get_clk_rate_trace_callbacks(kbdev); + + spin_lock_init(&clk_rtm->lock); + INIT_LIST_HEAD(&clk_rtm->listeners); + ++ /* Return early if no callbacks provided for clock rate tracing */ ++ if (!callbacks) { ++ WRITE_ONCE(clk_rtm->clk_rate_trace_ops, NULL); ++ return 0; ++ } ++ + clk_rtm->gpu_idle = true; + + for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) { @@ -140597,10 +143915,12 @@ index 000000000000..187d7d6f6926 + /* Activate clock rate trace manager if at least one GPU clock was + * enumerated. + */ -+ if (i) ++ if (i) { + WRITE_ONCE(clk_rtm->clk_rate_trace_ops, callbacks); -+ else ++ } else { + dev_info(kbdev->dev, "No clock(s) available for rate tracing"); ++ WRITE_ONCE(clk_rtm->clk_rate_trace_ops, NULL); ++ } + + return 0; + @@ -140629,9 +143949,10 @@ index 000000000000..187d7d6f6926 + if (!clk_rtm->clks[i]) + break; + -+ clk_rtm->clk_rate_trace_ops->gpu_clk_notifier_unregister( -+ kbdev, clk_rtm->clks[i]->gpu_clk_handle, -+ &clk_rtm->clks[i]->clk_rate_change_nb); ++ if (clk_rtm->clk_rate_trace_ops->gpu_clk_notifier_unregister) ++ clk_rtm->clk_rate_trace_ops->gpu_clk_notifier_unregister ++ (kbdev, clk_rtm->clks[i]->gpu_clk_handle, ++ &clk_rtm->clks[i]->clk_rate_change_nb); + kfree(clk_rtm->clks[i]); + } + @@ -140706,8 +144027,8 @@ index 000000000000..187d7d6f6926 + + kbdev = container_of(clk_rtm, struct kbase_device, pm.clk_rtm); + -+ dev_dbg(kbdev->dev, "GPU clock %u rate changed to %lu", -+ clk_index, new_rate); ++ dev_dbg(kbdev->dev, "%s - GPU clock %u rate changed to %lu, pid: %d", ++ __func__, clk_index, new_rate, current->pid); + + /* Raise standard `power/gpu_frequency` ftrace event */ + { @@ -140730,21 +144051,21 @@ index 000000000000..187d7d6f6926 + } +} +KBASE_EXPORT_TEST_API(kbase_clk_rate_trace_manager_notify_all); -+ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h new file mode 100755 -index 000000000000..dcafb26ea4c0 +index 000000000..35b3b8d06 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h -@@ -0,0 +1,155 @@ +@@ -0,0 +1,154 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -140755,17 +144076,15 @@ index 000000000000..dcafb26ea4c0 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CLK_RATE_TRACE_MGR_ +#define _KBASE_CLK_RATE_TRACE_MGR_ + -+/** The index of top clock domain in kbase_clk_rate_trace_manager:clks. */ ++/* The index of top clock domain in kbase_clk_rate_trace_manager:clks. */ +#define KBASE_CLOCK_DOMAIN_TOP (0) + -+/** The index of shader-cores clock domain in ++/* The index of shader-cores clock domain in + * kbase_clk_rate_trace_manager:clks. + */ +#define KBASE_CLOCK_DOMAIN_SHADER_CORES (1) @@ -140878,7 +144197,7 @@ index 000000000000..dcafb26ea4c0 + * rate listeners. + * + * @clk_rtm: Clock rate manager instance. -+ * @clk_index: Clock index. ++ * @clock_index: Clock index. + * @new_rate: New clock frequency(Hz) + * + * kbase_clk_rate_trace_manager:lock must be locked. @@ -140894,18 +144213,19 @@ index 000000000000..dcafb26ea4c0 + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c new file mode 100755 -index 000000000000..3aadcb04160c +index 000000000..e121b417f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c -@@ -0,0 +1,164 @@ +@@ -0,0 +1,163 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2012-2015, 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2015, 2018-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -140916,15 +144236,13 @@ index 000000000000..3aadcb04160c + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include +#include +#include "mali_kbase_debug_job_fault.h" + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) + +/*GPU_CONTROL_REG(r)*/ +static int gpu_control_reg_snapshot[] = { @@ -141064,13 +144382,14 @@ index 000000000000..3aadcb04160c +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c new file mode 100755 -index 000000000000..ff561d180247 +index 000000000..02fb00da3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c -@@ -0,0 +1,847 @@ +@@ -0,0 +1,895 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -141092,30 +144411,22 @@ index 000000000000..ff561d180247 + +#include +#include ++#include +#include + +#include +#include ++#include +#include -+#ifdef CONFIG_DEVFREQ_THERMAL ++#if IS_ENABLED(CONFIG_DEVFREQ_THERMAL) +#include +#endif + +#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) +#include -+#else /* Linux >= 3.13 */ -+/* In 3.13 the OPP include header file, types, and functions were all -+ * renamed. Use the old filename for the include, and define the new names to -+ * the old, when an old kernel is detected. -+ */ -+#include -+#define dev_pm_opp opp -+#define dev_pm_opp_get_voltage opp_get_voltage -+#define dev_pm_opp_get_opp_count opp_get_opp_count -+#define dev_pm_opp_find_freq_ceil opp_find_freq_ceil -+#define dev_pm_opp_find_freq_floor opp_find_freq_floor -+#endif /* Linux >= 3.13 */ ++#include ++#include "mali_kbase_devfreq.h" ++ +#include +#include +#include @@ -141123,28 +144434,53 @@ index 000000000000..ff561d180247 +static struct devfreq_simple_ondemand_data ondemand_data; + +static struct monitor_dev_profile mali_mdevp = { -+ .type = MONITOR_TPYE_DEV, ++ .type = MONITOR_TYPE_DEV, + .low_temp_adjust = rockchip_monitor_dev_low_temp_adjust, + .high_temp_adjust = rockchip_monitor_dev_high_temp_adjust, ++ .update_volt = rockchip_monitor_check_rate_volt, +}; + +/** -+ * opp_translate - Translate nominal OPP frequency from devicetree into real -+ * frequency and core mask -+ * @kbdev: Device pointer -+ * @freq: Nominal frequency -+ * @volt: Nominal voltage -+ * @core_mask: Pointer to u64 to store core mask to -+ * @freqs: Pointer to array of frequencies -+ * @volts: Pointer to array of voltages ++ * get_voltage() - Get the voltage value corresponding to the nominal frequency ++ * used by devfreq. ++ * @kbdev: Device pointer ++ * @freq: Nominal frequency in Hz passed by devfreq. + * -+ * This function will only perform translation if an operating-points-v2-mali -+ * table is present in devicetree. If one is not present then it will return an -+ * untranslated frequency and all cores enabled. ++ * This function will be called only when the opp table which is compatible with ++ * "operating-points-v2-mali", is not present in the devicetree for GPU device. ++ * ++ * Return: Voltage value in micro volts, 0 in case of error. + */ -+static void opp_translate(struct kbase_device *kbdev, unsigned long freq, -+ unsigned long volt, u64 *core_mask, -+ unsigned long *freqs, unsigned long *volts) ++static unsigned long get_voltage(struct kbase_device *kbdev, unsigned long freq) ++{ ++ struct dev_pm_opp *opp; ++ unsigned long voltage = 0; ++ ++#if KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE ++ rcu_read_lock(); ++#endif ++ ++ opp = dev_pm_opp_find_freq_exact(kbdev->dev, freq, true); ++ ++ if (IS_ERR_OR_NULL(opp)) ++ dev_err(kbdev->dev, "Failed to get opp (%d)\n", PTR_ERR_OR_ZERO(opp)); ++ else { ++ voltage = dev_pm_opp_get_voltage(opp); ++#if KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE ++ dev_pm_opp_put(opp); ++#endif ++ } ++ ++#if KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE ++ rcu_read_unlock(); ++#endif ++ ++ /* Return the voltage in micro volts */ ++ return voltage; ++} ++ ++void kbase_devfreq_opp_translate(struct kbase_device *kbdev, unsigned long freq, ++ u64 *core_mask, unsigned long *freqs, unsigned long *volts) +{ + unsigned int i; + @@ -141165,164 +144501,164 @@ index 000000000000..ff561d180247 + } + + /* If failed to find OPP, return all cores enabled -+ * and nominal frequency ++ * and nominal frequency and the corresponding voltage. + */ + if (i == kbdev->num_opps) { ++ unsigned long voltage = get_voltage(kbdev, freq); ++ + *core_mask = kbdev->gpu_props.props.raw_props.shader_present; ++ + for (i = 0; i < kbdev->nr_clocks; i++) { + freqs[i] = freq; -+ volts[i] = volt; ++ volts[i] = voltage; + } + } +} + -+static int -+kbase_devfreq_target(struct device *dev, unsigned long *target_freq, u32 flags) ++int kbase_devfreq_opp_helper(struct dev_pm_set_opp_data *data) +{ ++ struct device *dev = data->dev; ++ struct dev_pm_opp_supply *old_supply_vdd = &data->old_opp.supplies[0]; ++ struct dev_pm_opp_supply *new_supply_vdd = &data->new_opp.supplies[0]; ++ struct regulator *vdd_reg = data->regulators[0]; ++ struct dev_pm_opp_supply *old_supply_mem; ++ struct dev_pm_opp_supply *new_supply_mem; ++ struct regulator *mem_reg; ++ struct clk *clk = data->clk; + struct kbase_device *kbdev = dev_get_drvdata(dev); -+ struct dev_pm_opp *opp; -+ unsigned long nominal_freq, nominal_volt; -+ unsigned long freqs[BASE_MAX_NR_CLOCKS_REGULATORS] = {0}; -+ unsigned long old_freqs[BASE_MAX_NR_CLOCKS_REGULATORS] = {0}; -+ unsigned long volts[BASE_MAX_NR_CLOCKS_REGULATORS] = {0}; -+ unsigned int i; -+ u64 core_mask = 0; -+ -+ nominal_freq = *target_freq; ++ struct rockchip_opp_info *opp_info = &kbdev->opp_info; ++ unsigned long old_freq = data->old_opp.rate; ++ unsigned long new_freq = data->new_opp.rate; ++ unsigned int reg_count = data->regulator_count; ++ bool is_set_rm = true; ++ bool is_set_clk = true; ++ u32 target_rm = UINT_MAX; ++ int ret = 0; + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) -+ rcu_read_lock(); -+#endif -+ opp = devfreq_recommended_opp(dev, &nominal_freq, flags); -+ if (IS_ERR_OR_NULL(opp)) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) -+ rcu_read_unlock(); -+#endif -+ dev_err(dev, "Failed to get opp (%ld)\n", PTR_ERR(opp)); -+ return PTR_ERR(opp); ++ if (reg_count > 1) { ++ old_supply_mem = &data->old_opp.supplies[1]; ++ new_supply_mem = &data->new_opp.supplies[1]; ++ mem_reg = data->regulators[1]; + } -+ nominal_volt = dev_pm_opp_get_voltage(opp); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) -+ rcu_read_unlock(); -+#endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+ dev_pm_opp_put(opp); -+#endif -+ -+ opp_translate(kbdev, nominal_freq, nominal_volt, &core_mask, freqs, -+ volts); + -+ /* -+ * Only update if there is a change of frequency -+ */ -+ if (kbdev->current_nominal_freq == nominal_freq) { -+ unsigned int i; -+ int err; -+ -+ *target_freq = nominal_freq; ++ if (!pm_runtime_active(dev)) { ++ is_set_rm = false; ++ if (opp_info->scmi_clk) ++ is_set_clk = false; ++ } + -+#ifdef CONFIG_REGULATOR -+ for (i = 0; i < kbdev->nr_regulators; i++) { -+ if (kbdev->current_voltages[i] == volts[i]) -+ continue; ++ ret = clk_bulk_prepare_enable(opp_info->num_clks, opp_info->clks); ++ if (ret) { ++ dev_err(dev, "failed to enable opp clks\n"); ++ return ret; ++ } ++ rockchip_get_read_margin(dev, opp_info, new_supply_vdd->u_volt, ++ &target_rm); + -+ err = regulator_set_voltage(kbdev->regulators[i], -+ volts[i], ++ /* Change frequency */ ++ dev_dbg(dev, "switching OPP: %lu Hz --> %lu Hz\n", old_freq, new_freq); ++ /* Scaling up? Scale voltage before frequency */ ++ if (new_freq >= old_freq) { ++ rockchip_set_intermediate_rate(dev, opp_info, clk, old_freq, ++ new_freq, true, is_set_clk); ++ if (reg_count > 1) { ++ ret = regulator_set_voltage(mem_reg, ++ new_supply_mem->u_volt, + INT_MAX); -+ if (err) { -+ dev_err(dev, "Failed to set voltage (%d)\n", err); -+ return err; ++ if (ret) { ++ dev_err(dev, "failed to set volt %lu uV for mem reg\n", ++ new_supply_mem->u_volt); ++ goto restore_voltage; + } -+ kbdev->current_voltages[i] = volts[i]; + } -+#endif -+ return 0; -+ } -+ dev_dbg(dev, "%lu-->%lu\n", kbdev->current_nominal_freq, nominal_freq); -+ -+#ifdef CONFIG_REGULATOR -+ /* Regulators and clocks work in pairs: every clock has a regulator, -+ * and we never expect to have more regulators than clocks. -+ * -+ * We always need to increase the voltage before increasing -+ * the frequency of a regulator/clock pair, otherwise the clock -+ * wouldn't have enough power to perform the transition. -+ * -+ * It's always safer to decrease the frequency before decreasing -+ * voltage of a regulator/clock pair, otherwise the clock could have -+ * problems operating if it is deprived of the necessary power -+ * to sustain its current frequency (even if that happens for a short -+ * transition interval). -+ */ -+ -+ for (i = 0; i < kbdev->nr_clocks; i++) -+ old_freqs[i] = kbdev->current_freqs[i]; -+ -+ for (i = 0; i < kbdev->nr_clocks; i++) { -+ if (kbdev->regulators[i] && -+ kbdev->current_voltages[i] != volts[i] && -+ old_freqs[i] < freqs[i]) { -+ int err; -+ -+ err = regulator_set_voltage(kbdev->regulators[i], -+ volts[i], INT_MAX); -+ if (!err) { -+ kbdev->current_voltages[i] = volts[i]; -+ } else { -+ dev_err(dev, "Failed to increase voltage (%d) (target %lu)\n", -+ err, volts[i]); -+ return err; ++ ret = regulator_set_voltage(vdd_reg, new_supply_vdd->u_volt, ++ INT_MAX); ++ if (ret) { ++ dev_err(dev, "failed to set volt %lu uV for vdd reg\n", ++ new_supply_vdd->u_volt); ++ goto restore_voltage; ++ } ++ rockchip_set_read_margin(dev, opp_info, target_rm, is_set_rm); ++ if (is_set_clk && clk_set_rate(clk, new_freq)) { ++ ret = -EINVAL; ++ dev_err(dev, "failed to set clk rate\n"); ++ goto restore_rm; ++ } ++ /* Scaling down? Scale voltage after frequency */ ++ } else { ++ rockchip_set_intermediate_rate(dev, opp_info, clk, old_freq, ++ new_freq, false, is_set_clk); ++ rockchip_set_read_margin(dev, opp_info, target_rm, is_set_rm); ++ if (is_set_clk && clk_set_rate(clk, new_freq)) { ++ ret = -EINVAL; ++ dev_err(dev, "failed to set clk rate\n"); ++ goto restore_rm; ++ } ++ ret = regulator_set_voltage(vdd_reg, new_supply_vdd->u_volt, ++ INT_MAX); ++ if (ret) { ++ dev_err(dev, "failed to set volt %lu uV for vdd reg\n", ++ new_supply_vdd->u_volt); ++ goto restore_freq; ++ } ++ if (reg_count > 1) { ++ ret = regulator_set_voltage(mem_reg, ++ new_supply_mem->u_volt, ++ INT_MAX); ++ if (ret) { ++ dev_err(dev, "failed to set volt %lu uV for mem reg\n", ++ new_supply_mem->u_volt); ++ goto restore_voltage; + } + } + } -+#endif + -+ for (i = 0; i < kbdev->nr_clocks; i++) { -+ if (kbdev->clocks[i]) { -+ int err; ++ clk_bulk_disable_unprepare(opp_info->num_clks, opp_info->clks); + -+ err = clk_set_rate(kbdev->clocks[i], freqs[i]); -+ if (!err) { -+ kbdev->current_freqs[i] = freqs[i]; -+ } else { -+ dev_err(dev, "Failed to set clock %lu (target %lu)\n", -+ freqs[i], *target_freq); -+ return err; -+ } -+ } -+ } ++ return 0; + -+#ifdef CONFIG_REGULATOR -+ for (i = 0; i < kbdev->nr_clocks; i++) { -+ if (kbdev->regulators[i] && -+ kbdev->current_voltages[i] != volts[i] && -+ old_freqs[i] > freqs[i]) { -+ int err; ++restore_freq: ++ if (is_set_clk && clk_set_rate(clk, old_freq)) ++ dev_err(dev, "failed to restore old-freq %lu Hz\n", old_freq); ++restore_rm: ++ rockchip_get_read_margin(dev, opp_info, old_supply_vdd->u_volt, ++ &target_rm); ++ rockchip_set_read_margin(dev, opp_info, opp_info->target_rm, is_set_rm); ++restore_voltage: ++ if (reg_count > 1 && old_supply_mem->u_volt) ++ regulator_set_voltage(mem_reg, old_supply_mem->u_volt, INT_MAX); ++ regulator_set_voltage(vdd_reg, old_supply_vdd->u_volt, INT_MAX); ++ clk_bulk_disable_unprepare(opp_info->num_clks, opp_info->clks); + -+ err = regulator_set_voltage(kbdev->regulators[i], -+ volts[i], INT_MAX); -+ if (!err) { -+ kbdev->current_voltages[i] = volts[i]; -+ } else { -+ dev_err(dev, "Failed to decrease voltage (%d) (target %lu)\n", -+ err, volts[i]); -+ return err; -+ } -+ } -+ } -+#endif ++ return ret; ++} ++ ++static int ++kbase_devfreq_target(struct device *dev, unsigned long *freq, u32 flags) ++{ ++ struct kbase_device *kbdev = dev_get_drvdata(dev); ++ struct dev_pm_opp *opp; ++ int ret = 0; + -+ kbase_devfreq_set_core_mask(kbdev, core_mask); ++ if (!mali_mdevp.is_checked) ++ return -EINVAL; + -+ *target_freq = nominal_freq; -+ kbdev->current_nominal_freq = nominal_freq; -+ kbdev->current_core_mask = core_mask; -+ if (kbdev->devfreq) -+ kbdev->devfreq->last_status.current_frequency = nominal_freq; ++ opp = devfreq_recommended_opp(dev, freq, flags); ++ if (IS_ERR(opp)) ++ return PTR_ERR(opp); ++ dev_pm_opp_put(opp); + -+ KBASE_TLSTREAM_AUX_DEVFREQ_TARGET(kbdev, (u64)nominal_freq); ++ if (*freq == kbdev->current_nominal_freq) ++ return 0; ++ rockchip_monitor_volt_adjust_lock(kbdev->mdev_info); ++ ret = dev_pm_opp_set_rate(dev, *freq); ++ if (!ret) { ++ kbdev->current_nominal_freq = *freq; ++ KBASE_TLSTREAM_AUX_DEVFREQ_TARGET(kbdev, (u64)*freq); ++ } ++ rockchip_monitor_volt_adjust_unlock(kbdev->mdev_info); + -+ return 0; ++ return ret; +} + +void kbase_devfreq_force_freq(struct kbase_device *kbdev, unsigned long freq) @@ -141355,6 +144691,11 @@ index 000000000000..ff561d180247 + stat->current_frequency = kbdev->current_nominal_freq; + stat->private_data = NULL; + ++#if MALI_USE_CSF && defined CONFIG_DEVFREQ_THERMAL ++ if (!kbdev->dfc_power.dyn_power_coeff) ++ kbase_ipa_reset_data(kbdev); ++#endif ++ + return 0; +} + @@ -141366,11 +144707,11 @@ index 000000000000..ff561d180247 + unsigned long freq; + struct dev_pm_opp *opp; + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) ++#if KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE + rcu_read_lock(); +#endif + count = dev_pm_opp_get_opp_count(kbdev->dev); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) ++#if KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE + rcu_read_unlock(); +#endif + if (count < 0) @@ -141381,20 +144722,20 @@ index 000000000000..ff561d180247 + if (!dp->freq_table) + return -ENOMEM; + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) ++#if KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE + rcu_read_lock(); +#endif + for (i = 0, freq = ULONG_MAX; i < count; i++, freq--) { + opp = dev_pm_opp_find_freq_floor(kbdev->dev, &freq); + if (IS_ERR(opp)) + break; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++#if KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE + dev_pm_opp_put(opp); -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) */ ++#endif /* KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE */ + + dp->freq_table[i] = freq; + } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) ++#if KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE + rcu_read_unlock(); +#endif + @@ -141404,6 +144745,7 @@ index 000000000000..ff561d180247 + + dp->max_state = i; + ++ + /* Have the lowest clock as suspend clock. + * It may be overridden by 'opp-mali-errata-1485982'. + */ @@ -141427,18 +144769,21 @@ index 000000000000..ff561d180247 + struct devfreq_dev_profile *dp = &kbdev->devfreq_profile; + + kfree(dp->freq_table); ++ dp->freq_table = NULL; +} + +static void kbase_devfreq_term_core_mask_table(struct kbase_device *kbdev) +{ + kfree(kbdev->devfreq_table); ++ kbdev->devfreq_table = NULL; +} + +static void kbase_devfreq_exit(struct device *dev) +{ + struct kbase_device *kbdev = dev_get_drvdata(dev); + -+ kbase_devfreq_term_freq_table(kbdev); ++ if (kbdev) ++ kbase_devfreq_term_freq_table(kbdev); +} + +static void kbasep_devfreq_read_suspend_clock(struct kbase_device *kbdev, @@ -141477,7 +144822,7 @@ index 000000000000..ff561d180247 + +static int kbase_devfreq_init_core_mask_table(struct kbase_device *kbdev) +{ -+#if KERNEL_VERSION(3, 18, 0) > LINUX_VERSION_CODE || !defined(CONFIG_OF) ++#ifndef CONFIG_OF + /* OPP table initialization requires at least the capability to get + * regulators and clocks from the device tree, as well as parsing + * arrays of unsigned integer values. @@ -141510,7 +144855,7 @@ index 000000000000..ff561d180247 + u64 core_mask, opp_freq, + real_freqs[BASE_MAX_NR_CLOCKS_REGULATORS]; + int err; -+#ifdef CONFIG_REGULATOR ++#if IS_ENABLED(CONFIG_REGULATOR) + u32 opp_volts[BASE_MAX_NR_CLOCKS_REGULATORS]; +#endif + @@ -141538,7 +144883,7 @@ index 000000000000..ff561d180247 + err); + continue; + } -+#ifdef CONFIG_REGULATOR ++#if IS_ENABLED(CONFIG_REGULATOR) + err = of_property_read_u32_array(node, + "opp-microvolt", opp_volts, kbdev->nr_regulators); + if (err < 0) { @@ -141592,7 +144937,7 @@ index 000000000000..ff561d180247 + kbdev->devfreq_table[i].real_freqs[j] = + real_freqs[j]; + } -+#ifdef CONFIG_REGULATOR ++#if IS_ENABLED(CONFIG_REGULATOR) + if (kbdev->nr_regulators > 0) { + int j; + @@ -141611,11 +144956,9 @@ index 000000000000..ff561d180247 + kbdev->num_opps = i; + + return 0; -+#endif /* KERNEL_VERSION(3, 18, 0) > LINUX_VERSION_CODE */ ++#endif /* CONFIG_OF */ +} + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) -+ +static const char *kbase_devfreq_req_type_name(enum kbase_devfreq_work_type type) +{ + const char *p; @@ -141672,27 +145015,26 @@ index 000000000000..ff561d180247 + } +} + -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) */ -+ +void kbase_devfreq_enqueue_work(struct kbase_device *kbdev, + enum kbase_devfreq_work_type work_type) +{ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) + unsigned long flags; + + WARN_ON(work_type == DEVFREQ_WORK_NONE); + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbdev->devfreq_queue.req_type = work_type; -+ queue_work(kbdev->devfreq_queue.workq, &kbdev->devfreq_queue.work); ++ /* Skip enqueuing a work if workqueue has already been terminated. */ ++ if (likely(kbdev->devfreq_queue.workq)) { ++ kbdev->devfreq_queue.req_type = work_type; ++ queue_work(kbdev->devfreq_queue.workq, ++ &kbdev->devfreq_queue.work); ++ } + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + dev_dbg(kbdev->dev, "Enqueuing devfreq req: %s\n", + kbase_devfreq_req_type_name(work_type)); -+#endif +} + +static int kbase_devfreq_work_init(struct kbase_device *kbdev) +{ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) + kbdev->devfreq_queue.req_type = DEVFREQ_WORK_NONE; + kbdev->devfreq_queue.acted_type = DEVFREQ_WORK_RESUME; + @@ -141702,19 +145044,24 @@ index 000000000000..ff561d180247 + + INIT_WORK(&kbdev->devfreq_queue.work, + kbase_devfreq_suspend_resume_worker); -+#endif + return 0; +} + +static void kbase_devfreq_work_term(struct kbase_device *kbdev) +{ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) -+ destroy_workqueue(kbdev->devfreq_queue.workq); -+#endif ++ unsigned long flags; ++ struct workqueue_struct *workq; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ workq = kbdev->devfreq_queue.workq; ++ kbdev->devfreq_queue.workq = NULL; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ destroy_workqueue(workq); +} + +static unsigned long kbase_devfreq_get_static_power(struct devfreq *devfreq, -+ unsigned long voltage) ++ unsigned long voltage) +{ + struct device *dev = devfreq->dev.parent; + struct kbase_device *kbdev = dev_get_drvdata(dev); @@ -141722,19 +145069,16 @@ index 000000000000..ff561d180247 + return rockchip_ipa_get_static_power(kbdev->model_data, voltage); +} + -+static struct devfreq_cooling_power kbase_cooling_power = { -+ .get_static_power = &kbase_devfreq_get_static_power, -+}; -+ +int kbase_devfreq_init(struct kbase_device *kbdev) +{ -+ struct devfreq_cooling_power *kbase_dcp = &kbase_cooling_power; ++ struct devfreq_cooling_power *kbase_dcp = &kbdev->dfc_power; + struct device_node *np = kbdev->dev->of_node; ++ struct device_node *model_node; + struct devfreq_dev_profile *dp; -+ struct dev_pm_opp *opp; -+ unsigned long opp_rate; + int err; ++ struct dev_pm_opp *opp; + unsigned int i; ++ bool free_devfreq_freq_table = true; + + if (kbdev->nr_clocks == 0) { + dev_err(kbdev->dev, "Clock not available for devfreq\n"); @@ -141748,11 +145092,18 @@ index 000000000000..ff561d180247 + else + kbdev->current_freqs[i] = 0; + } ++ if (strstr(__clk_get_name(kbdev->clocks[0]), "scmi")) ++ kbdev->opp_info.scmi_clk = kbdev->clocks[0]; + kbdev->current_nominal_freq = kbdev->current_freqs[0]; + ++ opp = devfreq_recommended_opp(kbdev->dev, &kbdev->current_nominal_freq, 0); ++ if (IS_ERR(opp)) ++ return PTR_ERR(opp); ++ dev_pm_opp_put(opp); ++ + dp = &kbdev->devfreq_profile; + -+ dp->initial_freq = kbdev->current_freqs[0]; ++ dp->initial_freq = kbdev->current_nominal_freq; + dp->polling_ms = 100; + dp->target = kbase_devfreq_target; + dp->get_dev_status = kbase_devfreq_status; @@ -141767,20 +145118,9 @@ index 000000000000..ff561d180247 + kbdev->gpu_props.props.core_props.gpu_freq_khz_max = + dp->freq_table[0] / 1000; + }; -+ + err = kbase_devfreq_init_core_mask_table(kbdev); -+ if (err) { -+ kbase_devfreq_term_freq_table(kbdev); -+ return err; -+ } -+ -+ /* Initialise devfreq suspend/resume workqueue */ -+ err = kbase_devfreq_work_init(kbdev); -+ if (err) { -+ kbase_devfreq_term_freq_table(kbdev); -+ dev_err(kbdev->dev, "Devfreq initialization failed"); -+ return err; -+ } ++ if (err) ++ goto init_core_mask_table_failed; + + of_property_read_u32(np, "upthreshold", + &ondemand_data.upthreshold); @@ -141790,70 +145130,84 @@ index 000000000000..ff561d180247 + "simple_ondemand", &ondemand_data); + if (IS_ERR(kbdev->devfreq)) { + err = PTR_ERR(kbdev->devfreq); -+ kbase_devfreq_work_term(kbdev); -+ kbase_devfreq_term_freq_table(kbdev); -+ return err; ++ kbdev->devfreq = NULL; ++ dev_err(kbdev->dev, "Fail to add devfreq device(%d)", err); ++ goto devfreq_add_dev_failed; ++ } ++ ++ /* Explicit free of freq table isn't needed after devfreq_add_device() */ ++ free_devfreq_freq_table = false; ++ ++ /* Initialize devfreq suspend/resume workqueue */ ++ err = kbase_devfreq_work_init(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, "Fail to init devfreq workqueue"); ++ goto devfreq_work_init_failed; + } + + /* devfreq_add_device only copies a few of kbdev->dev's fields, so -+ * set drvdata explicitly so IPA models can access kbdev. */ ++ * set drvdata explicitly so IPA models can access kbdev. ++ */ + dev_set_drvdata(&kbdev->devfreq->dev, kbdev); + + err = devfreq_register_opp_notifier(kbdev->dev, kbdev->devfreq); + if (err) { + dev_err(kbdev->dev, -+ "Failed to register OPP notifier (%d)\n", err); ++ "Failed to register OPP notifier (%d)", err); + goto opp_notifier_failed; + } + -+ opp_rate = kbdev->current_freqs[0]; /* Bifrost GPU has only 1 clock. */ -+ opp = devfreq_recommended_opp(kbdev->dev, &opp_rate, 0); -+ if (!IS_ERR(opp)) -+ dev_pm_opp_put(opp); -+ kbdev->devfreq->last_status.current_frequency = opp_rate; -+ + mali_mdevp.data = kbdev->devfreq; ++ mali_mdevp.opp_info = &kbdev->opp_info; + kbdev->mdev_info = rockchip_system_monitor_register(kbdev->dev, -+ &mali_mdevp); ++ &mali_mdevp); + if (IS_ERR(kbdev->mdev_info)) { + dev_dbg(kbdev->dev, "without system monitor\n"); -+ kbdev->mdev_info = NULL; ++ kbdev->mdev_info = NULL; ++ mali_mdevp.is_checked = true; + } -+#ifdef CONFIG_DEVFREQ_THERMAL -+ if (of_find_compatible_node(kbdev->dev->of_node, NULL, -+ "simple-power-model")) { -+ of_property_read_u32(kbdev->dev->of_node, -+ "dynamic-power-coefficient", -+ (u32 *)&kbase_dcp->dyn_power_coeff); -+ kbdev->model_data = rockchip_ipa_power_model_init(kbdev->dev, -+ "gpu_leakage"); ++#if IS_ENABLED(CONFIG_DEVFREQ_THERMAL) ++ of_property_read_u32(kbdev->dev->of_node, "dynamic-power-coefficient", ++ (u32 *)&kbase_dcp->dyn_power_coeff); ++ model_node = of_get_compatible_child(kbdev->dev->of_node, ++ "simple-power-model"); ++ if (model_node) { ++ of_node_put(model_node); ++ kbdev->model_data = ++ rockchip_ipa_power_model_init(kbdev->dev, ++ "gpu_leakage"); + if (IS_ERR_OR_NULL(kbdev->model_data)) { + kbdev->model_data = NULL; -+ dev_err(kbdev->dev, "failed to initialize power model\n"); -+ } else if (kbdev->model_data->dynamic_coefficient) { -+ kbase_dcp->dyn_power_coeff = -+ kbdev->model_data->dynamic_coefficient; -+ } -+ if (!kbase_dcp->dyn_power_coeff) { -+ err = -EINVAL; -+ dev_err(kbdev->dev, "failed to get dynamic-coefficient\n"); -+ goto cooling_failed; ++ if (kbase_dcp->dyn_power_coeff) ++ dev_info(kbdev->dev, ++ "only calculate dynamic power\n"); ++ else ++ dev_err(kbdev->dev, ++ "failed to initialize power model\n"); ++ } else { ++ kbase_dcp->get_static_power = ++ kbase_devfreq_get_static_power; ++ if (kbdev->model_data->dynamic_coefficient) ++ kbase_dcp->dyn_power_coeff = ++ kbdev->model_data->dynamic_coefficient; + } ++ } + ++ if (kbase_dcp->dyn_power_coeff) { + kbdev->devfreq_cooling = + of_devfreq_cooling_register_power(kbdev->dev->of_node, -+ kbdev->devfreq, -+ kbase_dcp); ++ kbdev->devfreq, ++ kbase_dcp); + if (IS_ERR(kbdev->devfreq_cooling)) { + err = PTR_ERR(kbdev->devfreq_cooling); + dev_err(kbdev->dev, "failed to register cooling device\n"); -+ goto cooling_failed; ++ goto ipa_init_failed; + } + } else { + err = kbase_ipa_init(kbdev); + if (err) { + dev_err(kbdev->dev, "IPA initialization failed\n"); -+ goto cooling_failed; ++ goto ipa_init_failed; + } + + kbdev->devfreq_cooling = of_devfreq_cooling_register_power( @@ -141863,26 +145217,37 @@ index 000000000000..ff561d180247 + if (IS_ERR(kbdev->devfreq_cooling)) { + err = PTR_ERR(kbdev->devfreq_cooling); + dev_err(kbdev->dev, -+ "Failed to register cooling device (%d)\n", -+ err); -+ goto cooling_failed; -+ } ++ "Failed to register cooling device (%d)\n", ++ err); ++ goto cooling_reg_failed; ++ } + } +#endif + + return 0; + -+#ifdef CONFIG_DEVFREQ_THERMAL -+cooling_failed: ++#if IS_ENABLED(CONFIG_DEVFREQ_THERMAL) ++cooling_reg_failed: ++ kbase_ipa_term(kbdev); ++ipa_init_failed: + devfreq_unregister_opp_notifier(kbdev->dev, kbdev->devfreq); +#endif /* CONFIG_DEVFREQ_THERMAL */ ++ +opp_notifier_failed: ++ kbase_devfreq_work_term(kbdev); ++ ++devfreq_work_init_failed: + if (devfreq_remove_device(kbdev->devfreq)) -+ dev_err(kbdev->dev, "Failed to terminate devfreq (%d)\n", err); -+ else -+ kbdev->devfreq = NULL; ++ dev_err(kbdev->dev, "Failed to terminate devfreq (%d)", err); + -+ kbase_devfreq_work_term(kbdev); ++ kbdev->devfreq = NULL; ++ ++devfreq_add_dev_failed: ++ kbase_devfreq_term_core_mask_table(kbdev); ++ ++init_core_mask_table_failed: ++ if (free_devfreq_freq_table) ++ kbase_devfreq_term_freq_table(kbdev); + + return err; +} @@ -141893,18 +145258,15 @@ index 000000000000..ff561d180247 + + dev_dbg(kbdev->dev, "Term Mali devfreq\n"); + -+ rockchip_system_monitor_unregister(kbdev->mdev_info); -+#ifdef CONFIG_DEVFREQ_THERMAL ++#if IS_ENABLED(CONFIG_DEVFREQ_THERMAL) + if (kbdev->devfreq_cooling) + devfreq_cooling_unregister(kbdev->devfreq_cooling); -+ -+ if (!kbdev->model_data) -+ kbase_ipa_term(kbdev); -+ kfree(kbdev->model_data); +#endif + + devfreq_unregister_opp_notifier(kbdev->dev, kbdev->devfreq); + ++ kbase_devfreq_work_term(kbdev); ++ + err = devfreq_remove_device(kbdev->devfreq); + if (err) + dev_err(kbdev->dev, "Failed to terminate devfreq (%d)\n", err); @@ -141913,22 +145275,27 @@ index 000000000000..ff561d180247 + + kbase_devfreq_term_core_mask_table(kbdev); + -+ kbase_devfreq_work_term(kbdev); ++#if IS_ENABLED(CONFIG_DEVFREQ_THERMAL) ++ if (!kbdev->model_data) ++ kbase_ipa_term(kbdev); ++ kfree(kbdev->model_data); ++#endif +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h new file mode 100755 -index 000000000000..7bcd47c70ef0 +index 000000000..123c58cb0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h -@@ -0,0 +1,47 @@ +@@ -0,0 +1,63 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014, 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -141939,8 +145306,6 @@ index 000000000000..7bcd47c70ef0 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _BASE_DEVFREQ_H_ @@ -141949,7 +145314,7 @@ index 000000000000..7bcd47c70ef0 +int kbase_devfreq_init(struct kbase_device *kbdev); + +void kbase_devfreq_term(struct kbase_device *kbdev); -+int kbase_platform_rk_init_opp_table(struct kbase_device *kbdev); ++int kbase_devfreq_opp_helper(struct dev_pm_set_opp_data *data); + +/** + * kbase_devfreq_force_freq - Set GPU frequency on L2 power on/off. @@ -141967,22 +145332,39 @@ index 000000000000..7bcd47c70ef0 +void kbase_devfreq_enqueue_work(struct kbase_device *kbdev, + enum kbase_devfreq_work_type work_type); + ++/** ++ * kbase_devfreq_opp_translate - Translate nominal OPP frequency from devicetree ++ * into real frequency & voltage pair, along with ++ * core mask ++ * @kbdev: Device pointer ++ * @freq: Nominal frequency ++ * @core_mask: Pointer to u64 to store core mask to ++ * @freqs: Pointer to array of frequencies ++ * @volts: Pointer to array of voltages ++ * ++ * This function will only perform translation if an operating-points-v2-mali ++ * table is present in devicetree. If one is not present then it will return an ++ * untranslated frequency (and corresponding voltage) and all cores enabled. ++ * The voltages returned are in micro Volts (uV). ++ */ ++void kbase_devfreq_opp_translate(struct kbase_device *kbdev, unsigned long freq, ++ u64 *core_mask, unsigned long *freqs, unsigned long *volts); +#endif /* _BASE_DEVFREQ_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c new file mode 100755 -index 000000000000..60ae0206d6a8 +index 000000000..10e92ec94 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c -@@ -0,0 +1,158 @@ -+// SPDX-License-Identifier: GPL-2.0 +@@ -0,0 +1,200 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -141993,8 +145375,6 @@ index 000000000000..60ae0206d6a8 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -142004,25 +145384,21 @@ index 000000000000..60ae0206d6a8 +#include +#include +#include ++#include +#include + +int kbase_backend_gpuprops_get(struct kbase_device *kbdev, + struct kbase_gpuprops_regdump *regdump) +{ + int i; -+ struct kbase_gpuprops_regdump registers; ++ struct kbase_gpuprops_regdump registers = { 0 }; + + /* Fill regdump with the content of the relevant registers */ + registers.gpu_id = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_ID)); + + registers.l2_features = kbase_reg_read(kbdev, + GPU_CONTROL_REG(L2_FEATURES)); -+#if !MALI_USE_CSF -+ registers.core_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(CORE_FEATURES)); -+#else /* !MALI_USE_CSF */ -+ registers.core_features = 0; -+#endif /* !MALI_USE_CSF */ ++ + registers.tiler_features = kbase_reg_read(kbdev, + GPU_CONTROL_REG(TILER_FEATURES)); + registers.mem_features = kbase_reg_read(kbdev, @@ -142081,6 +145457,16 @@ index 000000000000..60ae0206d6a8 + registers.stack_present_hi = kbase_reg_read(kbdev, + GPU_CONTROL_REG(STACK_PRESENT_HI)); + ++ if (registers.gpu_id >= GPU_ID2_PRODUCT_MAKE(11, 8, 5, 2)) { ++ registers.gpu_features_lo = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(GPU_FEATURES_LO)); ++ registers.gpu_features_hi = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(GPU_FEATURES_HI)); ++ } else { ++ registers.gpu_features_lo = 0; ++ registers.gpu_features_hi = 0; ++ } ++ + if (!kbase_is_gpu_removed(kbdev)) { + *regdump = registers; + return 0; @@ -142088,33 +145474,56 @@ index 000000000000..60ae0206d6a8 + return -EIO; +} + ++int kbase_backend_gpuprops_get_curr_config(struct kbase_device *kbdev, ++ struct kbase_current_config_regdump *curr_config_regdump) ++{ ++ if (WARN_ON(!kbdev) || WARN_ON(!curr_config_regdump)) ++ return -EINVAL; ++ ++ curr_config_regdump->mem_features = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(MEM_FEATURES)); ++ ++ curr_config_regdump->shader_present_lo = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(SHADER_PRESENT_LO)); ++ curr_config_regdump->shader_present_hi = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(SHADER_PRESENT_HI)); ++ ++ curr_config_regdump->l2_present_lo = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(L2_PRESENT_LO)); ++ curr_config_regdump->l2_present_hi = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(L2_PRESENT_HI)); ++ ++ if (kbase_is_gpu_removed(kbdev)) ++ return -EIO; ++ ++ return 0; ++ ++} ++ +int kbase_backend_gpuprops_get_features(struct kbase_device *kbdev, + struct kbase_gpuprops_regdump *regdump) +{ -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_COHERENCY_REG)) { -+ u32 coherency_features; ++ u32 coherency_features; ++ int error = 0; + -+ /* Ensure we can access the GPU registers */ -+ kbase_pm_register_access_enable(kbdev); ++ /* Ensure we can access the GPU registers */ ++ kbase_pm_register_access_enable(kbdev); + -+ coherency_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(COHERENCY_FEATURES)); ++ coherency_features = kbase_cache_get_coherency_features(kbdev); + -+ if (kbase_is_gpu_removed(kbdev)) -+ return -EIO; ++ if (kbase_is_gpu_removed(kbdev)) ++ error = -EIO; + -+ regdump->coherency_features = coherency_features; ++ regdump->coherency_features = coherency_features; + -+ /* We're done accessing the GPU registers for now. */ -+ kbase_pm_register_access_disable(kbdev); -+ } else { -+ /* Pre COHERENCY_FEATURES we only supported ACE_LITE */ -+ regdump->coherency_features = -+ COHERENCY_FEATURE_BIT(COHERENCY_NONE) | -+ COHERENCY_FEATURE_BIT(COHERENCY_ACE_LITE); -+ } ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_CORE_FEATURES)) ++ regdump->core_features = kbase_reg_read(kbdev, GPU_CONTROL_REG(CORE_FEATURES)); ++ else ++ regdump->core_features = 0; + -+ return 0; ++ kbase_pm_register_access_disable(kbdev); ++ ++ return error; +} + +int kbase_backend_gpuprops_get_l2_features(struct kbase_device *kbdev, @@ -142123,29 +145532,45 @@ index 000000000000..60ae0206d6a8 + if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_L2_CONFIG)) { + u32 l2_features = kbase_reg_read(kbdev, + GPU_CONTROL_REG(L2_FEATURES)); ++ u32 l2_config = ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(L2_CONFIG)); ++ u32 asn_hash[ASN_HASH_COUNT] = { ++ 0, ++ }; ++ int i; ++ ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_ASN_HASH)) { ++ for (i = 0; i < ASN_HASH_COUNT; i++) ++ asn_hash[i] = kbase_reg_read( ++ kbdev, GPU_CONTROL_REG(ASN_HASH(i))); ++ } + + if (kbase_is_gpu_removed(kbdev)) + return -EIO; + + regdump->l2_features = l2_features; ++ regdump->l2_config = l2_config; ++ for (i = 0; i < ASN_HASH_COUNT; i++) ++ regdump->l2_asn_hash[i] = asn_hash[i]; + } + + return 0; +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c new file mode 100755 -index 000000000000..54b07483dee6 +index 000000000..53578ded5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c -@@ -0,0 +1,520 @@ +@@ -0,0 +1,481 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -142156,12 +145581,8 @@ index 000000000000..54b07483dee6 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/* + * GPU backend instrumentation APIs. + */ @@ -142172,6 +145593,20 @@ index 000000000000..54b07483dee6 +#include +#include + ++static int wait_prfcnt_ready(struct kbase_device *kbdev) ++{ ++ u32 loops; ++ ++ for (loops = 0; loops < KBASE_PRFCNT_ACTIVE_MAX_LOOPS; loops++) { ++ const u32 prfcnt_active = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_STATUS)) & ++ GPU_STATUS_PRFCNT_ACTIVE; ++ if (!prfcnt_active) ++ return 0; ++ } ++ ++ dev_err(kbdev->dev, "PRFCNT_ACTIVE bit stuck\n"); ++ return -EBUSY; ++} + +int kbase_instr_hwcnt_enable_internal(struct kbase_device *kbdev, + struct kbase_context *kctx, @@ -142179,31 +145614,33 @@ index 000000000000..54b07483dee6 +{ + unsigned long flags; + int err = -EINVAL; -+#if !MALI_USE_CSF + u32 irq_mask; -+#endif + u32 prfcnt_config; + + lockdep_assert_held(&kbdev->hwaccess_lock); + + /* alignment failure */ + if ((enable->dump_buffer == 0ULL) || (enable->dump_buffer & (2048 - 1))) -+ goto out_err; ++ return err; + + spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + + if (kbdev->hwcnt.backend.state != KBASE_INSTR_STATE_DISABLED) { + /* Instrumentation is already enabled */ + spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ goto out_err; ++ return err; ++ } ++ ++ if (kbase_is_gpu_removed(kbdev)) { ++ /* GPU has been removed by Arbiter */ ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ return err; + } + -+#if !MALI_USE_CSF + /* Enable interrupt */ + irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK)); + kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), irq_mask | + PRFCNT_SAMPLE_COMPLETED); -+#endif + + /* In use, this context is the owner */ + kbdev->hwcnt.kctx = kctx; @@ -142215,39 +145652,26 @@ index 000000000000..54b07483dee6 + + /* Configure */ + prfcnt_config = kctx->as_nr << PRFCNT_CONFIG_AS_SHIFT; -+#ifdef CONFIG_MALI_PRFCNT_SET_SECONDARY_VIA_DEBUG_FS -+ if (kbdev->hwcnt.backend.use_secondary_override) ++#ifdef CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS ++ prfcnt_config |= kbdev->hwcnt.backend.override_counter_set ++ << PRFCNT_CONFIG_SETSELECT_SHIFT; +#else -+ if (enable->use_secondary) ++ prfcnt_config |= enable->counter_set << PRFCNT_CONFIG_SETSELECT_SHIFT; +#endif -+ prfcnt_config |= 1 << PRFCNT_CONFIG_SETSELECT_SHIFT; -+ -+#if MALI_USE_CSF -+ kbase_reg_write(kbdev, GPU_CONTROL_MCU_REG(PRFCNT_CONFIG), -+ prfcnt_config | PRFCNT_CONFIG_MODE_OFF); -+ -+ kbase_reg_write(kbdev, GPU_CONTROL_MCU_REG(PRFCNT_BASE_LO), -+ enable->dump_buffer & 0xFFFFFFFF); -+ kbase_reg_write(kbdev, GPU_CONTROL_MCU_REG(PRFCNT_BASE_HI), -+ enable->dump_buffer >> 32); + -+ kbase_reg_write(kbdev, GPU_CONTROL_MCU_REG(PRFCNT_CSHW_EN), -+ enable->fe_bm); -+ -+ kbase_reg_write(kbdev, GPU_CONTROL_MCU_REG(PRFCNT_SHADER_EN), -+ enable->shader_bm); -+ kbase_reg_write(kbdev, GPU_CONTROL_MCU_REG(PRFCNT_MMU_L2_EN), -+ enable->mmu_l2_bm); -+ -+ kbase_reg_write(kbdev, GPU_CONTROL_MCU_REG(PRFCNT_TILER_EN), -+ enable->tiler_bm); ++ /* Wait until prfcnt config register can be written */ ++ err = wait_prfcnt_ready(kbdev); ++ if (err) ++ return err; + -+ kbase_reg_write(kbdev, GPU_CONTROL_MCU_REG(PRFCNT_CONFIG), -+ prfcnt_config | PRFCNT_CONFIG_MODE_MANUAL); -+#else + kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_CONFIG), + prfcnt_config | PRFCNT_CONFIG_MODE_OFF); + ++ /* Wait until prfcnt is disabled before writing configuration registers */ ++ err = wait_prfcnt_ready(kbdev); ++ if (err) ++ return err; ++ + kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_LO), + enable->dump_buffer & 0xFFFFFFFF); + kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_HI), @@ -142266,7 +145690,6 @@ index 000000000000..54b07483dee6 + + kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_CONFIG), + prfcnt_config | PRFCNT_CONFIG_MODE_MANUAL); -+#endif + + spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + @@ -142276,39 +145699,68 @@ index 000000000000..54b07483dee6 + + spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); + -+ err = 0; ++ dev_dbg(kbdev->dev, "HW counters dumping set-up for context %pK", kctx); ++ return 0; ++} + -+ dev_dbg(kbdev->dev, "HW counters dumping set-up for context %p", kctx); -+ return err; -+ out_err: -+ return err; ++static void kbasep_instr_hwc_disable_hw_prfcnt(struct kbase_device *kbdev) ++{ ++ u32 irq_mask; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ lockdep_assert_held(&kbdev->hwcnt.lock); ++ ++ if (kbase_is_gpu_removed(kbdev)) ++ /* GPU has been removed by Arbiter */ ++ return; ++ ++ /* Disable interrupt */ ++ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK)); ++ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), irq_mask & ~PRFCNT_SAMPLE_COMPLETED); ++ ++ /* Wait until prfcnt config register can be written, then disable the counters. ++ * Return value is ignored as we are disabling anyway. ++ */ ++ wait_prfcnt_ready(kbdev); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_CONFIG), 0); ++ ++ kbdev->hwcnt.kctx = NULL; ++ kbdev->hwcnt.addr = 0ULL; ++ kbdev->hwcnt.addr_bytes = 0ULL; +} + +int kbase_instr_hwcnt_disable_internal(struct kbase_context *kctx) +{ + unsigned long flags, pm_flags; -+ int err = -EINVAL; -+#if !MALI_USE_CSF -+ u32 irq_mask; -+#endif + struct kbase_device *kbdev = kctx->kbdev; + + while (1) { + spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); + spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + ++ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_UNRECOVERABLE_ERROR) { ++ /* Instrumentation is in unrecoverable error state, ++ * there is nothing for us to do. ++ */ ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); ++ /* Already disabled, return no error. */ ++ return 0; ++ } ++ + if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_DISABLED) { + /* Instrumentation is not enabled */ + spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); -+ goto out; ++ return -EINVAL; + } + + if (kbdev->hwcnt.kctx != kctx) { + /* Instrumentation has been setup for another context */ + spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); -+ goto out; ++ return -EINVAL; + } + + if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_IDLE) @@ -142325,33 +145777,15 @@ index 000000000000..54b07483dee6 + kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_DISABLED; + kbdev->hwcnt.backend.triggered = 0; + -+#if MALI_USE_CSF -+ /* Disable the counters */ -+ kbase_reg_write(kbdev, GPU_CONTROL_MCU_REG(PRFCNT_CONFIG), 0); -+#else -+ /* Disable interrupt */ -+ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK)); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), -+ irq_mask & ~PRFCNT_SAMPLE_COMPLETED); -+ -+ /* Disable the counters */ -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_CONFIG), 0); -+#endif -+ -+ kbdev->hwcnt.kctx = NULL; -+ kbdev->hwcnt.addr = 0ULL; -+ kbdev->hwcnt.addr_bytes = 0ULL; ++ kbasep_instr_hwc_disable_hw_prfcnt(kbdev); + + spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); + -+ dev_dbg(kbdev->dev, "HW counters dumping disabled for context %p", ++ dev_dbg(kbdev->dev, "HW counters dumping disabled for context %pK", + kctx); + -+ err = 0; -+ -+ out: -+ return err; ++ return 0; +} + +int kbase_instr_hwcnt_request_dump(struct kbase_context *kctx) @@ -142369,7 +145803,13 @@ index 000000000000..54b07483dee6 + + if (kbdev->hwcnt.backend.state != KBASE_INSTR_STATE_IDLE) { + /* HW counters are disabled or another dump is ongoing, or we're -+ * resetting */ ++ * resetting, or we are in unrecoverable error state. ++ */ ++ goto unlock; ++ } ++ ++ if (kbase_is_gpu_removed(kbdev)) { ++ /* GPU has been removed by Arbiter */ + goto unlock; + } + @@ -142379,44 +145819,28 @@ index 000000000000..54b07483dee6 + */ + kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_DUMPING; + ++ /* Wait until prfcnt is ready to request dump */ ++ err = wait_prfcnt_ready(kbdev); ++ if (err) ++ goto unlock; + -+#if MALI_USE_CSF -+ /* Reconfigure the dump address */ -+ kbase_reg_write(kbdev, GPU_CONTROL_MCU_REG(PRFCNT_BASE_LO), -+ kbdev->hwcnt.addr & 0xFFFFFFFF); -+ kbase_reg_write(kbdev, GPU_CONTROL_MCU_REG(PRFCNT_BASE_HI), -+ kbdev->hwcnt.addr >> 32); -+#else + /* Reconfigure the dump address */ + kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_LO), + kbdev->hwcnt.addr & 0xFFFFFFFF); + kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_HI), + kbdev->hwcnt.addr >> 32); -+#endif + + /* Start dumping */ + KBASE_KTRACE_ADD(kbdev, CORE_GPU_PRFCNT_SAMPLE, NULL, + kbdev->hwcnt.addr); + -+#if MALI_USE_CSF -+ kbase_reg_write(kbdev, GPU_CONTROL_MCU_REG(GPU_COMMAND), -+ GPU_COMMAND_PRFCNT_SAMPLE); -+#else + kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), + GPU_COMMAND_PRFCNT_SAMPLE); -+#endif -+ -+ dev_dbg(kbdev->dev, "HW counters dumping done for context %p", kctx); + -+ err = 0; ++ dev_dbg(kbdev->dev, "HW counters dumping done for context %pK", kctx); + + unlock: + spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ -+#if MALI_USE_CSF -+ tasklet_schedule(&kbdev->hwcnt.backend.csf_hwc_irq_poll_tasklet); -+#endif -+ + return err; +} +KBASE_EXPORT_SYMBOL(kbase_instr_hwcnt_request_dump); @@ -142445,110 +145869,24 @@ index 000000000000..54b07483dee6 +} +KBASE_EXPORT_SYMBOL(kbase_instr_hwcnt_dump_complete); + -+void kbasep_cache_clean_worker(struct work_struct *data) -+{ -+ struct kbase_device *kbdev; -+ unsigned long flags, pm_flags; -+ -+ kbdev = container_of(data, struct kbase_device, -+ hwcnt.backend.cache_clean_work); -+ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ -+ /* Clean and invalidate the caches so we're sure the mmu tables for the -+ * dump buffer is valid. -+ */ -+ KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == -+ KBASE_INSTR_STATE_REQUEST_CLEAN); -+ kbase_gpu_start_cache_clean_nolock(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); -+ -+ kbase_gpu_wait_cache_clean(kbdev); -+ -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == -+ KBASE_INSTR_STATE_REQUEST_CLEAN); -+ /* All finished and idle */ -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; -+ kbdev->hwcnt.backend.triggered = 1; -+ wake_up(&kbdev->hwcnt.backend.wait); -+ -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+} -+ -+#if MALI_USE_CSF -+/** -+ * kbasep_hwcnt_irq_poll_tasklet - tasklet to poll MCU IRQ status register -+ * -+ * @data: tasklet parameter which pointer to kbdev -+ * -+ * This tasklet poll GPU_IRQ_STATUS register in GPU_CONTROL_MCU page to check -+ * PRFCNT_SAMPLE_COMPLETED bit. -+ * -+ * Tasklet is needed here since work_queue is too slow and cuased some test -+ * cases timeout, the poll_count variable is introduced to avoid infinite -+ * loop in unexpected cases, the poll_count is 1 or 2 in normal case, 128 -+ * should be big enough to exit the tasklet in abnormal cases. -+ * -+ * Return: void -+ */ -+static void kbasep_hwcnt_irq_poll_tasklet(unsigned long int data) -+{ -+ struct kbase_device *kbdev = (struct kbase_device *)data; -+ unsigned long flags, pm_flags; -+ u32 mcu_gpu_irq_raw_status = 0; -+ u32 poll_count = 0; -+ -+ while (1) { -+ spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ mcu_gpu_irq_raw_status = kbase_reg_read(kbdev, -+ GPU_CONTROL_MCU_REG(GPU_IRQ_RAWSTAT)); -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); -+ if (mcu_gpu_irq_raw_status & PRFCNT_SAMPLE_COMPLETED) { -+ kbase_reg_write(kbdev, -+ GPU_CONTROL_MCU_REG(GPU_IRQ_CLEAR), -+ PRFCNT_SAMPLE_COMPLETED); -+ kbase_instr_hwcnt_sample_done(kbdev); -+ break; -+ } else if (poll_count++ > 128) { -+ dev_err(kbdev->dev, -+ "Err: HWC dump timeout, count: %u", poll_count); -+ /* Still call sample_done to unblock waiting thread */ -+ kbase_instr_hwcnt_sample_done(kbdev); -+ break; -+ } -+ } -+} -+#endif -+ +void kbase_instr_hwcnt_sample_done(struct kbase_device *kbdev) +{ + unsigned long flags; + + spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + ++ /* If the state is in unrecoverable error, we already wake_up the waiter ++ * and don't need to do any action when sample is done. ++ */ ++ + if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_FAULT) { + kbdev->hwcnt.backend.triggered = 1; + wake_up(&kbdev->hwcnt.backend.wait); + } else if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_DUMPING) { -+ if (kbdev->mmu_mode->flags & KBASE_MMU_MODE_HAS_NON_CACHEABLE) { -+ /* All finished and idle */ -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; -+ kbdev->hwcnt.backend.triggered = 1; -+ wake_up(&kbdev->hwcnt.backend.wait); -+ } else { -+ int ret; -+ /* Always clean and invalidate the cache after a successful dump -+ */ -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_REQUEST_CLEAN; -+ ret = queue_work(kbdev->hwcnt.backend.cache_clean_wq, -+ &kbdev->hwcnt.backend.cache_clean_work); -+ KBASE_DEBUG_ASSERT(ret); -+ } ++ /* All finished and idle */ ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; ++ kbdev->hwcnt.backend.triggered = 1; ++ wake_up(&kbdev->hwcnt.backend.wait); + } + + spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); @@ -142569,6 +145907,8 @@ index 000000000000..54b07483dee6 + if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_FAULT) { + err = -EINVAL; + kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; ++ } else if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_UNRECOVERABLE_ERROR) { ++ err = -EIO; + } else { + /* Dump done */ + KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == @@ -142589,89 +145929,135 @@ index 000000000000..54b07483dee6 + + spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + -+ /* Check it's the context previously set up and we're not already -+ * dumping */ ++ /* Check it's the context previously set up and we're not in IDLE ++ * state. ++ */ + if (kbdev->hwcnt.kctx != kctx || kbdev->hwcnt.backend.state != + KBASE_INSTR_STATE_IDLE) -+ goto out; ++ goto unlock; ++ ++ if (kbase_is_gpu_removed(kbdev)) { ++ /* GPU has been removed by Arbiter */ ++ goto unlock; ++ } ++ ++ /* Wait until prfcnt is ready to clear */ ++ err = wait_prfcnt_ready(kbdev); ++ if (err) ++ goto unlock; + + /* Clear the counters */ + KBASE_KTRACE_ADD(kbdev, CORE_GPU_PRFCNT_CLEAR, NULL, 0); -+#if MALI_USE_CSF -+ kbase_reg_write(kbdev, GPU_CONTROL_MCU_REG(GPU_COMMAND), -+ GPU_COMMAND_PRFCNT_CLEAR); -+#else + kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), + GPU_COMMAND_PRFCNT_CLEAR); -+#endif -+ -+ err = 0; + -+out: ++unlock: + spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); + return err; +} +KBASE_EXPORT_SYMBOL(kbase_instr_hwcnt_clear); + ++void kbase_instr_hwcnt_on_unrecoverable_error(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ ++ /* If we already in unrecoverable error state, early return. */ ++ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_UNRECOVERABLE_ERROR) { ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ return; ++ } ++ ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_UNRECOVERABLE_ERROR; ++ ++ /* Need to disable HW if it's not disabled yet. */ ++ if (kbdev->hwcnt.backend.state != KBASE_INSTR_STATE_DISABLED) ++ kbasep_instr_hwc_disable_hw_prfcnt(kbdev); ++ ++ /* Wake up any waiters. */ ++ kbdev->hwcnt.backend.triggered = 1; ++ wake_up(&kbdev->hwcnt.backend.wait); ++ ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++} ++KBASE_EXPORT_SYMBOL(kbase_instr_hwcnt_on_unrecoverable_error); ++ ++void kbase_instr_hwcnt_on_before_reset(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ ++ /* A reset is the only way to exit the unrecoverable error state */ ++ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_UNRECOVERABLE_ERROR) ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_DISABLED; ++ ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++} ++KBASE_EXPORT_SYMBOL(kbase_instr_hwcnt_on_before_reset); ++ +int kbase_instr_backend_init(struct kbase_device *kbdev) +{ -+ int ret = 0; ++ spin_lock_init(&kbdev->hwcnt.lock); + + kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_DISABLED; + + init_waitqueue_head(&kbdev->hwcnt.backend.wait); -+ INIT_WORK(&kbdev->hwcnt.backend.cache_clean_work, -+ kbasep_cache_clean_worker); -+ -+#if MALI_USE_CSF -+ tasklet_init(&kbdev->hwcnt.backend.csf_hwc_irq_poll_tasklet, -+ kbasep_hwcnt_irq_poll_tasklet, (unsigned long int)kbdev); -+#endif + + kbdev->hwcnt.backend.triggered = 0; + -+#ifdef CONFIG_MALI_PRFCNT_SET_SECONDARY_VIA_DEBUG_FS -+ kbdev->hwcnt.backend.use_secondary_override = false; ++#ifdef CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS ++/* Use the build time option for the override default. */ ++#if defined(CONFIG_MALI_BIFROST_PRFCNT_SET_SECONDARY) ++ kbdev->hwcnt.backend.override_counter_set = KBASE_HWCNT_PHYSICAL_SET_SECONDARY; ++#elif defined(CONFIG_MALI_PRFCNT_SET_TERTIARY) ++ kbdev->hwcnt.backend.override_counter_set = KBASE_HWCNT_PHYSICAL_SET_TERTIARY; ++#else ++ /* Default to primary */ ++ kbdev->hwcnt.backend.override_counter_set = KBASE_HWCNT_PHYSICAL_SET_PRIMARY; +#endif -+ -+ kbdev->hwcnt.backend.cache_clean_wq = -+ alloc_workqueue("Mali cache cleaning workqueue", 0, 1); -+ if (NULL == kbdev->hwcnt.backend.cache_clean_wq) -+ ret = -EINVAL; -+ -+ return ret; ++#endif ++ return 0; +} + +void kbase_instr_backend_term(struct kbase_device *kbdev) +{ -+#if MALI_USE_CSF -+ tasklet_kill(&kbdev->hwcnt.backend.csf_hwc_irq_poll_tasklet); -+#endif -+ destroy_workqueue(kbdev->hwcnt.backend.cache_clean_wq); ++ CSTD_UNUSED(kbdev); +} + -+#ifdef CONFIG_MALI_PRFCNT_SET_SECONDARY_VIA_DEBUG_FS ++#ifdef CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS +void kbase_instr_backend_debugfs_init(struct kbase_device *kbdev) +{ -+ debugfs_create_bool("hwcnt_use_secondary", S_IRUGO | S_IWUSR, -+ kbdev->mali_debugfs_directory, -+ &kbdev->hwcnt.backend.use_secondary_override); ++ /* No validation is done on the debugfs input. Invalid input could cause ++ * performance counter errors. This is acceptable since this is a debug ++ * only feature and users should know what they are doing. ++ * ++ * Valid inputs are the values accepted bythe SET_SELECT bits of the ++ * PRFCNT_CONFIG register as defined in the architecture specification. ++ */ ++ debugfs_create_u8("hwcnt_set_select", 0644, ++ kbdev->mali_debugfs_directory, ++ (u8 *)&kbdev->hwcnt.backend.override_counter_set); +} +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h new file mode 100755 -index 000000000000..9f785ce16e17 +index 000000000..bd2eb8a12 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h -@@ -0,0 +1,63 @@ +@@ -0,0 +1,60 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014, 2016, 2018, 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2016, 2018-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -142682,8 +146068,6 @@ index 000000000000..9f785ce16e17 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -142693,6 +146077,8 @@ index 000000000000..9f785ce16e17 +#ifndef _KBASE_INSTR_DEFS_H_ +#define _KBASE_INSTR_DEFS_H_ + ++#include ++ +/* + * Instrumentation State Machine States + */ @@ -142703,44 +146089,41 @@ index 000000000000..9f785ce16e17 + KBASE_INSTR_STATE_IDLE, + /* Hardware is currently dumping a frame. */ + KBASE_INSTR_STATE_DUMPING, -+ /* We've requested a clean to occur on a workqueue */ -+ KBASE_INSTR_STATE_REQUEST_CLEAN, -+ /* An error has occured during DUMPING (page fault). */ -+ KBASE_INSTR_STATE_FAULT ++ /* An error has occurred during DUMPING (page fault). */ ++ KBASE_INSTR_STATE_FAULT, ++ /* An unrecoverable error has occurred, a reset is the only way to exit ++ * from unrecoverable error state. ++ */ ++ KBASE_INSTR_STATE_UNRECOVERABLE_ERROR, +}; + +/* Structure used for instrumentation and HW counters dumping */ +struct kbase_instr_backend { + wait_queue_head_t wait; + int triggered; -+#ifdef CONFIG_MALI_PRFCNT_SET_SECONDARY_VIA_DEBUG_FS -+ bool use_secondary_override; ++#ifdef CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS ++ enum kbase_hwcnt_physical_set override_counter_set; +#endif + + enum kbase_instr_state state; -+ struct workqueue_struct *cache_clean_wq; -+ struct work_struct cache_clean_work; -+#if MALI_USE_CSF -+ struct tasklet_struct csf_hwc_irq_poll_tasklet; -+#endif +}; + +#endif /* _KBASE_INSTR_DEFS_H_ */ -+ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h new file mode 100755 -index 000000000000..2254b9f30d02 +index 000000000..332cc6944 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h -@@ -0,0 +1,44 @@ +@@ -0,0 +1,41 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014, 2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2018, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -142751,12 +146134,8 @@ index 000000000000..2254b9f30d02 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/* + * Backend-specific HW access instrumentation APIs + */ @@ -142779,18 +146158,19 @@ index 000000000000..2254b9f30d02 +#endif /* _KBASE_INSTR_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h new file mode 100755 -index 000000000000..ca3c048b637a +index 000000000..66cda8c0b --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h -@@ -0,0 +1,44 @@ +@@ -0,0 +1,47 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2015, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -142801,8 +146181,6 @@ index 000000000000..ca3c048b637a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -142826,21 +146204,26 @@ index 000000000000..ca3c048b637a +int kbasep_common_test_interrupt_handlers( + struct kbase_device * const kbdev); + ++irqreturn_t kbase_gpu_irq_test_handler(int irq, void *data, u32 val); ++int kbase_set_custom_irq_handler(struct kbase_device *kbdev, ++ irq_handler_t custom_handler, int irq_type); ++ +#endif /* _KBASE_IRQ_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c new file mode 100755 -index 000000000000..b09db552e639 +index 000000000..eb63b2c56 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c -@@ -0,0 +1,504 @@ +@@ -0,0 +1,503 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2016,2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2016, 2018-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -142851,8 +146234,6 @@ index 000000000000..b09db552e639 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -142861,12 +146242,12 @@ index 000000000000..b09db552e639 + +#include + -+#if !defined(CONFIG_MALI_BIFROST_NO_MALI) ++#if IS_ENABLED(CONFIG_MALI_REAL_HW) + +/* GPU IRQ Tags */ -+#define JOB_IRQ_TAG 0 -+#define MMU_IRQ_TAG 1 -+#define GPU_IRQ_TAG 2 ++#define JOB_IRQ_TAG 0 ++#define MMU_IRQ_TAG 1 ++#define GPU_IRQ_TAG 2 + +static void *kbase_tag(void *ptr, u32 tag) +{ @@ -142999,7 +146380,6 @@ index 000000000000..b09db552e639 + +#ifdef CONFIG_MALI_BIFROST_DEBUG +#define JOB_IRQ_HANDLER JOB_IRQ_TAG -+#define MMU_IRQ_HANDLER MMU_IRQ_TAG +#define GPU_IRQ_HANDLER GPU_IRQ_TAG + +/** @@ -143050,24 +146430,25 @@ index 000000000000..b09db552e639 + int result = 0; + irq_handler_t requested_irq_handler = NULL; + -+ KBASE_DEBUG_ASSERT((JOB_IRQ_HANDLER <= irq_type) && -+ (GPU_IRQ_HANDLER >= irq_type)); ++ KBASE_DEBUG_ASSERT((irq_type >= JOB_IRQ_HANDLER) && ++ (irq_type <= GPU_IRQ_HANDLER)); + + /* Release previous handler */ + if (kbdev->irqs[irq_type].irq) + free_irq(kbdev->irqs[irq_type].irq, kbase_tag(kbdev, irq_type)); + -+ requested_irq_handler = (NULL != custom_handler) ? custom_handler : -+ kbase_handler_table[irq_type]; ++ requested_irq_handler = (custom_handler != NULL) ? ++ custom_handler : ++ kbase_handler_table[irq_type]; + -+ if (0 != request_irq(kbdev->irqs[irq_type].irq, -+ requested_irq_handler, ++ if (request_irq(kbdev->irqs[irq_type].irq, requested_irq_handler, + kbdev->irqs[irq_type].flags | IRQF_SHARED, -+ dev_name(kbdev->dev), kbase_tag(kbdev, irq_type))) { ++ dev_name(kbdev->dev), ++ kbase_tag(kbdev, irq_type)) != 0) { + result = -EINVAL; + dev_err(kbdev->dev, "Can't request interrupt %d (index %d)\n", + kbdev->irqs[irq_type].irq, irq_type); -+#ifdef CONFIG_SPARSE_IRQ ++#if IS_ENABLED(CONFIG_SPARSE_IRQ) + dev_err(kbdev->dev, "You have CONFIG_SPARSE_IRQ support enabled - is the interrupt number correct for this configuration?\n"); +#endif /* CONFIG_SPARSE_IRQ */ + } @@ -143296,7 +146677,7 @@ index 000000000000..b09db552e639 + if (err) { + dev_err(kbdev->dev, "Can't request interrupt %d (index %d)\n", + kbdev->irqs[i].irq, i); -+#ifdef CONFIG_SPARSE_IRQ ++#if IS_ENABLED(CONFIG_SPARSE_IRQ) + dev_err(kbdev->dev, "You have CONFIG_SPARSE_IRQ support enabled - is the interrupt number correct for this configuration?\n"); +#endif /* CONFIG_SPARSE_IRQ */ + goto release; @@ -143336,21 +146717,22 @@ index 000000000000..b09db552e639 + +KBASE_EXPORT_TEST_API(kbase_synchronize_irqs); + -+#endif /* !defined(CONFIG_MALI_BIFROST_NO_MALI) */ ++#endif /* IS_ENABLED(CONFIG_MALI_REAL_HW) */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c new file mode 100755 -index 000000000000..9b775898dac2 +index 000000000..258dc6dac --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c -@@ -0,0 +1,245 @@ +@@ -0,0 +1,241 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -143361,11 +146743,8 @@ index 000000000000..9b775898dac2 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ +/* + * Register backend context / address space management + */ @@ -143414,9 +146793,8 @@ index 000000000000..9b775898dac2 + kbase_js_runpool_inc_context_count(kbdev, kctx); +} + -+bool kbase_backend_use_ctx_sched(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js) ++bool kbase_backend_use_ctx_sched(struct kbase_device *kbdev, struct kbase_context *kctx, ++ unsigned int js) +{ + int i; + @@ -143535,8 +146913,8 @@ index 000000000000..9b775898dac2 + } + + /* Context was retained while locks were dropped, -+ * continue looking for free AS */ -+ ++ * continue looking for free AS ++ */ + mutex_unlock(&js_devdata->runpool_mutex); + mutex_unlock(&as_js_kctx_info->ctx.jsctx_mutex); + @@ -143587,21 +146965,21 @@ index 000000000000..9b775898dac2 + + return true; +} -+ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h new file mode 100755 -index 000000000000..9cccf224999e +index 000000000..136aa526d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h -@@ -0,0 +1,113 @@ +@@ -0,0 +1,135 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2016, 2018-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -143612,11 +146990,8 @@ index 000000000000..9cccf224999e + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ +/* + * Register-based HW access backend specific definitions + */ @@ -143636,10 +147011,32 @@ index 000000000000..9cccf224999e + struct kbase_jd_atom *katom; +}; + ++/* SLOT_RB_TAG_PURGED assumes a value that is different from ++ * NULL (SLOT_RB_NULL_TAG_VAL) and will not be the result of ++ * any valid pointer via macro translation: SLOT_RB_TAG_KCTX(x). ++ */ ++#define SLOT_RB_TAG_PURGED ((u64)(1 << 1)) ++#define SLOT_RB_NULL_TAG_VAL ((u64)0) ++ ++/** ++ * SLOT_RB_TAG_KCTX() - a function-like macro for converting a pointer to a ++ * u64 for serving as tagged value. ++ * @kctx: Pointer to kbase context. ++ */ ++#define SLOT_RB_TAG_KCTX(kctx) (u64)((uintptr_t)(kctx)) +/** + * struct slot_rb - Slot ringbuffer + * @entries: Ringbuffer entries -+ * @last_context: The last context to submit a job on this slot ++ * @last_kctx_tagged: The last context that submitted a job to the slot's ++ * HEAD_NEXT register. The value is a tagged variant so ++ * must not be dereferenced. It is used in operation to ++ * track when shader core L1 caches might contain a ++ * previous context's data, and so must only be set to ++ * SLOT_RB_NULL_TAG_VAL after reset/powerdown of the ++ * cores. In slot job submission, if there is a kctx ++ * change, and the relevant katom is configured with ++ * BASE_JD_REQ_SKIP_CACHE_START, a L1 read only cache ++ * maintenace operation is enforced. + * @read_idx: Current read index of buffer + * @write_idx: Current write index of buffer + * @job_chain_flag: Flag used to implement jobchain disambiguation @@ -143647,7 +147044,7 @@ index 000000000000..9cccf224999e +struct slot_rb { + struct rb_entry entries[SLOT_RB_SIZE]; + -+ struct kbase_context *last_context; ++ u64 last_kctx_tagged; + + u8 read_idx; + u8 write_idx; @@ -143674,9 +147071,8 @@ index 000000000000..9cccf224999e + * The hwaccess_lock (a spinlock) must be held when accessing this structure + */ +struct kbase_backend_data { -+ struct slot_rb slot_rb[BASE_JM_MAX_NR_SLOTS]; -+ +#if !MALI_USE_CSF ++ struct slot_rb slot_rb[BASE_JM_MAX_NR_SLOTS]; + struct hrtimer scheduling_timer; + + bool timer_running; @@ -143690,13 +147086,16 @@ index 000000000000..9cccf224999e +/* kbase_prepare_to_reset_gpu has been called */ +#define KBASE_RESET_GPU_PREPARED 1 +/* kbase_reset_gpu has been called - the reset will now definitely happen -+ * within the timeout period */ ++ * within the timeout period ++ */ +#define KBASE_RESET_GPU_COMMITTED 2 +/* The GPU reset process is currently occuring (timeout has expired or -+ * kbasep_try_reset_gpu_early was called) */ ++ * kbasep_try_reset_gpu_early was called) ++ */ +#define KBASE_RESET_GPU_HAPPENING 3 +/* Reset the GPU silently, used when resetting the GPU as part of normal -+ * behavior (e.g. when exiting protected mode). */ ++ * behavior (e.g. when exiting protected mode). ++ */ +#define KBASE_RESET_GPU_SILENT 4 + struct workqueue_struct *reset_workq; + struct work_struct reset_work; @@ -143709,18 +147108,19 @@ index 000000000000..9cccf224999e +#endif /* _KBASE_HWACCESS_GPU_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c new file mode 100755 -index 000000000000..19661c9766c6 +index 000000000..c7257117e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c -@@ -0,0 +1,1462 @@ +@@ -0,0 +1,1513 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -143731,8 +147131,6 @@ index 000000000000..19661c9766c6 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -143749,31 +147147,28 @@ index 000000000000..19661c9766c6 +#include +#include +#include -+#include ++#include ++#include +#include +#include +#include +#include + +static void kbasep_try_reset_gpu_early_locked(struct kbase_device *kbdev); ++static u64 kbasep_apply_limited_core_mask(const struct kbase_device *kbdev, ++ const u64 affinity, const u64 limited_core_mask); + -+static u64 kbase_job_write_affinity(struct kbase_device *kbdev, -+ base_jd_core_req core_req, -+ int js) ++static u64 kbase_job_write_affinity(struct kbase_device *kbdev, base_jd_core_req core_req, ++ unsigned int js, const u64 limited_core_mask) +{ + u64 affinity; ++ bool skip_affinity_check = false; + + if ((core_req & (BASE_JD_REQ_FS | BASE_JD_REQ_CS | BASE_JD_REQ_T)) == + BASE_JD_REQ_T) { -+ /* Tiler-only atom */ -+ /* If the hardware supports XAFFINITY then we'll only enable -+ * the tiler (which is the default so this is a no-op), -+ * otherwise enable shader core 0. -+ */ -+ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_XAFFINITY)) -+ affinity = 1; -+ else -+ affinity = 0; ++ /* Tiler-only atom, affinity value can be programed as 0 */ ++ affinity = 0; ++ skip_affinity_check = true; + } else if ((core_req & (BASE_JD_REQ_COHERENT_GROUP | + BASE_JD_REQ_SPECIFIC_COHERENT_GROUP))) { + unsigned int num_core_groups = kbdev->gpu_props.num_core_groups; @@ -143788,15 +147183,22 @@ index 000000000000..19661c9766c6 + */ + if (js == 2 && num_core_groups > 1) + affinity &= coherency_info->group[1].core_mask; -+ else ++ else if (num_core_groups > 1) + affinity &= coherency_info->group[0].core_mask; ++ else ++ affinity &= kbdev->gpu_props.curr_config.shader_present; + } else { + /* Use all cores */ + affinity = kbdev->pm.backend.shaders_avail & + kbdev->pm.debug_core_mask[js]; + } + -+ if (unlikely(!affinity)) { ++ if (core_req & BASE_JD_REQ_LIMITED_CORE_MASK) { ++ /* Limiting affinity due to BASE_JD_REQ_LIMITED_CORE_MASK by applying the limited core mask. */ ++ affinity = kbasep_apply_limited_core_mask(kbdev, affinity, limited_core_mask); ++ } ++ ++ if (unlikely(!affinity && !skip_affinity_check)) { +#ifdef CONFIG_MALI_BIFROST_DEBUG + u64 shaders_ready = + kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_SHADER); @@ -143805,6 +147207,16 @@ index 000000000000..19661c9766c6 +#endif + + affinity = kbdev->pm.backend.shaders_avail; ++ ++ if (core_req & BASE_JD_REQ_LIMITED_CORE_MASK) { ++ /* Limiting affinity again to make sure it only enables shader cores with backed TLS memory. */ ++ affinity = kbasep_apply_limited_core_mask(kbdev, affinity, limited_core_mask); ++ ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ /* affinity should never be 0 */ ++ WARN_ON(!affinity); ++#endif ++ } + } + + kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_AFFINITY_NEXT_LO), @@ -143885,31 +147297,51 @@ index 000000000000..19661c9766c6 + } + + dev_dbg(kctx->kbdev->dev, -+ "Selected job chain 0x%llx for end atom %p in state %d\n", ++ "Selected job chain 0x%llx for end atom %pK in state %d\n", + jc, (void *)katom, (int)rp->state); + + katom->jc = jc; + return jc; +} + -+void kbase_job_hw_submit(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, -+ int js) ++static inline bool kbasep_jm_wait_js_free(struct kbase_device *kbdev, unsigned int js, ++ struct kbase_context *kctx) ++{ ++ const ktime_t wait_loop_start = ktime_get_raw(); ++ const s64 max_timeout = (s64)kbdev->js_data.js_free_wait_time_ms; ++ s64 diff = 0; ++ ++ /* wait for the JS_COMMAND_NEXT register to reach the given status value */ ++ do { ++ if (!kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_COMMAND_NEXT))) ++ return true; ++ ++ diff = ktime_to_ms(ktime_sub(ktime_get_raw(), wait_loop_start)); ++ } while (diff < max_timeout); ++ ++ dev_err(kbdev->dev, "Timeout in waiting for job slot %u to become free for ctx %d_%u", js, ++ kctx->tgid, kctx->id); ++ ++ return false; ++} ++ ++int kbase_job_hw_submit(struct kbase_device *kbdev, struct kbase_jd_atom *katom, unsigned int js) +{ + struct kbase_context *kctx; + u32 cfg; + u64 const jc_head = select_job_chain(katom); + u64 affinity; ++ struct slot_rb *ptr_slot_rb = &kbdev->hwaccess.backend.slot_rb[js]; + -+ KBASE_DEBUG_ASSERT(kbdev); -+ KBASE_DEBUG_ASSERT(katom); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + + kctx = katom->kctx; + + /* Command register must be available */ -+ KBASE_DEBUG_ASSERT(kbasep_jm_is_js_free(kbdev, js, kctx)); ++ if (!kbasep_jm_wait_js_free(kbdev, js, kctx)) ++ return -EPERM; + -+ dev_dbg(kctx->kbdev->dev, "Write JS_HEAD_NEXT 0x%llx for atom %p\n", ++ dev_dbg(kctx->kbdev->dev, "Write JS_HEAD_NEXT 0x%llx for atom %pK\n", + jc_head, (void *)katom); + + kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_LO), @@ -143917,19 +147349,35 @@ index 000000000000..19661c9766c6 + kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_HI), + jc_head >> 32); + -+ affinity = kbase_job_write_affinity(kbdev, katom->core_req, js); ++ affinity = kbase_job_write_affinity(kbdev, katom->core_req, js, ++ kctx->limited_core_mask); + + /* start MMU, medium priority, cache clean/flush on end, clean/flush on -+ * start */ ++ * start ++ */ + cfg = kctx->as_nr; + + if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_FLUSH_REDUCTION) && + !(kbdev->serialize_jobs & KBASE_SERIALIZE_RESET)) + cfg |= JS_CONFIG_ENABLE_FLUSH_REDUCTION; + -+ if (0 != (katom->core_req & BASE_JD_REQ_SKIP_CACHE_START)) -+ cfg |= JS_CONFIG_START_FLUSH_NO_ACTION; -+ else ++ if (0 != (katom->core_req & BASE_JD_REQ_SKIP_CACHE_START)) { ++ /* Force a cache maintenance operation if the newly submitted ++ * katom to the slot is from a different kctx. For a JM GPU ++ * that has the feature BASE_HW_FEATURE_FLUSH_INV_SHADER_OTHER, ++ * applies a FLUSH_INV_SHADER_OTHER. Otherwise, do a ++ * FLUSH_CLEAN_INVALIDATE. ++ */ ++ u64 tagged_kctx = ptr_slot_rb->last_kctx_tagged; ++ ++ if (tagged_kctx != SLOT_RB_NULL_TAG_VAL && tagged_kctx != SLOT_RB_TAG_KCTX(kctx)) { ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_FLUSH_INV_SHADER_OTHER)) ++ cfg |= JS_CONFIG_START_FLUSH_INV_SHADER_OTHER; ++ else ++ cfg |= JS_CONFIG_START_FLUSH_CLEAN_INVALIDATE; ++ } else ++ cfg |= JS_CONFIG_START_FLUSH_NO_ACTION; ++ } else + cfg |= JS_CONFIG_START_FLUSH_CLEAN_INVALIDATE; + + if (0 != (katom->core_req & BASE_JD_REQ_SKIP_CACHE_END) && @@ -143946,18 +147394,13 @@ index 000000000000..19661c9766c6 + (katom->core_req & BASE_JD_REQ_END_RENDERPASS)) + cfg |= JS_CONFIG_DISABLE_DESCRIPTOR_WR_BK; + -+ if (kbase_hw_has_feature(kbdev, -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION)) { -+ if (!kbdev->hwaccess.backend.slot_rb[js].job_chain_flag) { -+ cfg |= JS_CONFIG_JOB_CHAIN_FLAG; -+ katom->atom_flags |= KBASE_KATOM_FLAGS_JOBCHAIN; -+ kbdev->hwaccess.backend.slot_rb[js].job_chain_flag = -+ true; -+ } else { -+ katom->atom_flags &= ~KBASE_KATOM_FLAGS_JOBCHAIN; -+ kbdev->hwaccess.backend.slot_rb[js].job_chain_flag = -+ false; -+ } ++ if (!ptr_slot_rb->job_chain_flag) { ++ cfg |= JS_CONFIG_JOB_CHAIN_FLAG; ++ katom->atom_flags |= KBASE_KATOM_FLAGS_JOBCHAIN; ++ ptr_slot_rb->job_chain_flag = true; ++ } else { ++ katom->atom_flags &= ~KBASE_KATOM_FLAGS_JOBCHAIN; ++ ptr_slot_rb->job_chain_flag = false; + } + + kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_CONFIG_NEXT), cfg); @@ -143969,10 +147412,10 @@ index 000000000000..19661c9766c6 + /* Write an approximate start timestamp. + * It's approximate because there might be a job in the HEAD register. + */ -+ katom->start_timestamp = ktime_get(); ++ katom->start_timestamp = ktime_get_raw(); + + /* GO ! */ -+ dev_dbg(kbdev->dev, "JS: Submitting atom %p from ctx %p to js[%d] with head=0x%llx", ++ dev_dbg(kbdev->dev, "JS: Submitting atom %pK from ctx %pK to js[%d] with head=0x%llx", + katom, kctx, js, jc_head); + + KBASE_KTRACE_ADD_JM_SLOT_INFO(kbdev, JM_SUBMIT, kctx, katom, jc_head, js, @@ -143995,7 +147438,11 @@ index 000000000000..19661c9766c6 + &kbdev->gpu_props.props.raw_props.js_features[js], + "ctx_nr,atom_nr"); + kbase_kinstr_jm_atom_hw_submit(katom); -+#ifdef CONFIG_GPU_TRACEPOINTS ++ ++ /* Update the slot's last katom submission kctx */ ++ ptr_slot_rb->last_kctx_tagged = SLOT_RB_TAG_KCTX(kctx); ++ ++#if IS_ENABLED(CONFIG_GPU_TRACEPOINTS) + if (!kbase_backend_nr_atoms_submitted(kbdev, js)) { + /* If this is the only job on the slot, trace it as starting */ + char js_string[16]; @@ -144005,7 +147452,6 @@ index 000000000000..19661c9766c6 + sizeof(js_string)), + ktime_to_ns(katom->start_timestamp), + (u32)katom->kctx->id, 0, katom->work_id); -+ kbdev->hwaccess.backend.slot_rb[js].last_context = katom->kctx; + } +#endif + @@ -144014,6 +147460,8 @@ index 000000000000..19661c9766c6 + + kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_COMMAND_NEXT), + JS_COMMAND_START); ++ ++ return 0; +} + +/** @@ -144029,10 +147477,8 @@ index 000000000000..19661c9766c6 + * work out the best estimate (which might still result in an over-estimate to + * the calculated time spent) + */ -+static void kbasep_job_slot_update_head_start_timestamp( -+ struct kbase_device *kbdev, -+ int js, -+ ktime_t end_timestamp) ++static void kbasep_job_slot_update_head_start_timestamp(struct kbase_device *kbdev, unsigned int js, ++ ktime_t end_timestamp) +{ + ktime_t timestamp_diff; + struct kbase_jd_atom *katom; @@ -144046,7 +147492,8 @@ index 000000000000..19661c9766c6 + /* Only update the timestamp if it's a better estimate + * than what's currently stored. This is because our + * estimate that accounts for the throttle time may be -+ * too much of an overestimate */ ++ * too much of an overestimate ++ */ + katom->start_timestamp = end_timestamp; + } + } @@ -144061,8 +147508,7 @@ index 000000000000..19661c9766c6 + * Make a tracepoint call to the instrumentation module informing that + * softstop happened on given lpu (job slot). + */ -+static void kbasep_trace_tl_event_lpu_softstop(struct kbase_device *kbdev, -+ int js) ++static void kbasep_trace_tl_event_lpu_softstop(struct kbase_device *kbdev, unsigned int js) +{ + KBASE_TLSTREAM_TL_EVENT_LPU_SOFTSTOP( + kbdev, @@ -144071,29 +147517,26 @@ index 000000000000..19661c9766c6 + +void kbase_job_done(struct kbase_device *kbdev, u32 done) +{ -+ int i; + u32 count = 0; + ktime_t end_timestamp; + + lockdep_assert_held(&kbdev->hwaccess_lock); + -+ KBASE_DEBUG_ASSERT(kbdev); -+ + KBASE_KTRACE_ADD_JM(kbdev, JM_IRQ, NULL, NULL, 0, done); + -+ end_timestamp = ktime_get(); ++ end_timestamp = ktime_get_raw(); + + while (done) { ++ unsigned int i; + u32 failed = done >> 16; + + /* treat failed slots as finished slots */ + u32 finished = (done & 0xFFFF) | failed; + -+ /* Note: This is inherently unfair, as we always check -+ * for lower numbered interrupts before the higher -+ * numbered ones.*/ ++ /* Note: This is inherently unfair, as we always check for lower ++ * numbered interrupts before the higher numbered ones. ++ */ + i = ffs(finished) - 1; -+ KBASE_DEBUG_ASSERT(i >= 0); + + do { + int nr_done; @@ -144103,11 +147546,14 @@ index 000000000000..19661c9766c6 + + if (failed & (1u << i)) { + /* read out the job slot status code if the job -+ * slot reported failure */ ++ * slot reported failure ++ */ + completion_code = kbase_reg_read(kbdev, + JOB_SLOT_REG(i, JS_STATUS)); + + if (completion_code == BASE_JD_EVENT_STOPPED) { ++ u64 job_head; ++ + KBASE_TLSTREAM_AUX_EVENT_JOB_SLOT( + kbdev, NULL, + i, 0, TL_JS_EVENT_SOFT_STOP); @@ -144117,30 +147563,51 @@ index 000000000000..19661c9766c6 + + /* Soft-stopped job - read the value of + * JS_TAIL so that the job chain can -+ * be resumed */ ++ * be resumed ++ */ + job_tail = (u64)kbase_reg_read(kbdev, + JOB_SLOT_REG(i, JS_TAIL_LO)) | + ((u64)kbase_reg_read(kbdev, + JOB_SLOT_REG(i, JS_TAIL_HI)) + << 32); ++ job_head = (u64)kbase_reg_read(kbdev, ++ JOB_SLOT_REG(i, JS_HEAD_LO)) | ++ ((u64)kbase_reg_read(kbdev, ++ JOB_SLOT_REG(i, JS_HEAD_HI)) ++ << 32); ++ /* For a soft-stopped job chain js_tail should ++ * same as the js_head, but if not then the ++ * job chain was incorrectly marked as ++ * soft-stopped. In such case we should not ++ * be resuming the job chain from js_tail and ++ * report the completion_code as UNKNOWN. ++ */ ++ if (job_tail != job_head) ++ completion_code = BASE_JD_EVENT_UNKNOWN; ++ + } else if (completion_code == + BASE_JD_EVENT_NOT_STARTED) { + /* PRLAM-10673 can cause a TERMINATED -+ * job to come back as NOT_STARTED, but -+ * the error interrupt helps us detect -+ * it */ ++ * job to come back as NOT_STARTED, ++ * but the error interrupt helps us ++ * detect it ++ */ + completion_code = + BASE_JD_EVENT_TERMINATED; + } + + kbase_gpu_irq_evict(kbdev, i, completion_code); + -+ /* Some jobs that encounter a BUS FAULT may result in corrupted -+ * state causing future jobs to hang. Reset GPU before -+ * allowing any other jobs on the slot to continue. */ ++ /* Some jobs that encounter a BUS FAULT may ++ * result in corrupted state causing future ++ * jobs to hang. Reset GPU before allowing ++ * any other jobs on the slot to continue. ++ */ + if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TTRX_3076)) { + if (completion_code == BASE_JD_EVENT_JOB_BUS_FAULT) { -+ if (kbase_prepare_to_reset_gpu_locked(kbdev)) ++ if (kbase_prepare_to_reset_gpu_locked( ++ kbdev, ++ RESET_FLAGS_NONE)) + kbase_reset_gpu_locked(kbdev); + } + } @@ -144198,7 +147665,8 @@ index 000000000000..19661c9766c6 + + if ((rawstat >> (i + 16)) & 1) { + /* There is a failed job that we've -+ * missed - add it back to active */ ++ * missed - add it back to active ++ */ + active |= (1u << i); + } + } @@ -144249,7 +147717,7 @@ index 000000000000..19661c9766c6 + failed = done >> 16; + finished = (done & 0xFFFF) | failed; + if (done) -+ end_timestamp = ktime_get(); ++ end_timestamp = ktime_get_raw(); + } while (finished & (1 << i)); + + kbasep_job_slot_update_head_start_timestamp(kbdev, i, @@ -144267,18 +147735,16 @@ index 000000000000..19661c9766c6 + KBASE_KTRACE_ADD_JM(kbdev, JM_IRQ_END, NULL, NULL, 0, count); +} + -+void kbasep_job_slot_soft_or_hard_stop_do_action(struct kbase_device *kbdev, -+ int js, -+ u32 action, -+ base_jd_core_req core_reqs, -+ struct kbase_jd_atom *target_katom) ++void kbasep_job_slot_soft_or_hard_stop_do_action(struct kbase_device *kbdev, unsigned int js, ++ u32 action, base_jd_core_req core_reqs, ++ struct kbase_jd_atom *target_katom) +{ +#if KBASE_KTRACE_ENABLE + u32 status_reg_before; + u64 job_in_head_before; + u32 status_reg_after; + -+ KBASE_DEBUG_ASSERT(!(action & (~JS_COMMAND_MASK))); ++ WARN_ON(action & (~JS_COMMAND_MASK)); + + /* Check the head pointer */ + job_in_head_before = ((u64) kbase_reg_read(kbdev, @@ -144300,31 +147766,24 @@ index 000000000000..19661c9766c6 + } + + /* We are about to issue a soft stop, so mark the atom as having -+ * been soft stopped */ ++ * been soft stopped ++ */ + target_katom->atom_flags |= KBASE_KATOM_FLAG_BEEN_SOFT_STOPPED; + + /* Mark the point where we issue the soft-stop command */ + KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_ISSUE(kbdev, target_katom); + -+ if (kbase_hw_has_feature( -+ kbdev, -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION)) { -+ action = (target_katom->atom_flags & -+ KBASE_KATOM_FLAGS_JOBCHAIN) ? -+ JS_COMMAND_SOFT_STOP_1 : -+ JS_COMMAND_SOFT_STOP_0; -+ } ++ action = (target_katom->atom_flags & ++ KBASE_KATOM_FLAGS_JOBCHAIN) ? ++ JS_COMMAND_SOFT_STOP_1 : ++ JS_COMMAND_SOFT_STOP_0; + } else if (action == JS_COMMAND_HARD_STOP) { + target_katom->atom_flags |= KBASE_KATOM_FLAG_BEEN_HARD_STOPPED; + -+ if (kbase_hw_has_feature( -+ kbdev, -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION)) { -+ action = (target_katom->atom_flags & -+ KBASE_KATOM_FLAGS_JOBCHAIN) ? -+ JS_COMMAND_HARD_STOP_1 : -+ JS_COMMAND_HARD_STOP_0; -+ } ++ action = (target_katom->atom_flags & ++ KBASE_KATOM_FLAGS_JOBCHAIN) ? ++ JS_COMMAND_HARD_STOP_1 : ++ JS_COMMAND_HARD_STOP_0; + } + + kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_COMMAND), action); @@ -144336,6 +147795,10 @@ index 000000000000..19661c9766c6 + struct kbase_context *head_kctx; + + head = kbase_gpu_inspect(kbdev, js, 0); ++ if (unlikely(!head)) { ++ dev_err(kbdev->dev, "Can't get a katom from js(%d)\n", js); ++ return; ++ } + head_kctx = head->kctx; + + if (status_reg_before == BASE_JD_EVENT_ACTIVE) @@ -144363,7 +147826,8 @@ index 000000000000..19661c9766c6 + KBASE_KTRACE_ADD_JM_SLOT(kbdev, JM_HARDSTOP_1, head_kctx, head, head->jc, js); + break; + default: -+ BUG(); ++ WARN(1, "Unknown action %d on atom %pK in kctx %pK\n", action, ++ (void *)target_katom, (void *)target_katom->kctx); + break; + } + } else { @@ -144392,7 +147856,8 @@ index 000000000000..19661c9766c6 + KBASE_KTRACE_ADD_JM_SLOT(kbdev, JM_HARDSTOP_1, NULL, NULL, 0, js); + break; + default: -+ BUG(); ++ WARN(1, "Unknown action %d on atom %pK in kctx %pK\n", action, ++ (void *)target_katom, (void *)target_katom->kctx); + break; + } + } @@ -144402,7 +147867,7 @@ index 000000000000..19661c9766c6 +void kbase_backend_jm_kill_running_jobs_from_kctx(struct kbase_context *kctx) +{ + struct kbase_device *kbdev = kctx->kbdev; -+ int i; ++ unsigned int i; + + lockdep_assert_held(&kbdev->hwaccess_lock); + @@ -144410,69 +147875,33 @@ index 000000000000..19661c9766c6 + kbase_job_slot_hardstop(kctx, i, NULL); +} + -+/** -+ * kbase_is_existing_atom_submitted_later_than_ready -+ * @ready: sequence number of the ready atom -+ * @existing: sequence number of the existing atom -+ * -+ * Returns true if the existing atom has been submitted later than the -+ * ready atom. It is used to understand if an atom that is ready has been -+ * submitted earlier than the currently running atom, so that the currently -+ * running atom should be preempted to allow the ready atom to run. -+ */ -+static inline bool kbase_is_existing_atom_submitted_later_than_ready(u64 ready, u64 existing) -+{ -+ /* No seq_nr set? */ -+ if (!ready || !existing) -+ return false; -+ -+ /* Efficiently handle the unlikely case of wrapping. -+ * The following code assumes that the delta between the sequence number -+ * of the two atoms is less than INT64_MAX. -+ * In the extremely unlikely case where the delta is higher, the comparison -+ * defaults for no preemption. -+ * The code also assumes that the conversion from unsigned to signed types -+ * works because the signed integers are 2's complement. -+ */ -+ return (s64)(ready - existing) < 0; -+} -+ +void kbase_job_slot_ctx_priority_check_locked(struct kbase_context *kctx, + struct kbase_jd_atom *target_katom) +{ + struct kbase_device *kbdev; -+ int js = target_katom->slot_nr; -+ int priority = target_katom->sched_priority; -+ int seq_nr = target_katom->seq_nr; ++ unsigned int target_js = target_katom->slot_nr; + int i; + bool stop_sent = false; + -+ KBASE_DEBUG_ASSERT(kctx != NULL); + kbdev = kctx->kbdev; -+ KBASE_DEBUG_ASSERT(kbdev != NULL); + + lockdep_assert_held(&kbdev->hwaccess_lock); + -+ for (i = 0; i < kbase_backend_nr_atoms_on_slot(kbdev, js); i++) { -+ struct kbase_jd_atom *katom; -+ -+ katom = kbase_gpu_inspect(kbdev, js, i); -+ if (!katom) -+ continue; ++ for (i = 0; i < kbase_backend_nr_atoms_on_slot(kbdev, target_js); i++) { ++ struct kbase_jd_atom *slot_katom; + -+ if ((kbdev->js_ctx_scheduling_mode == -+ KBASE_JS_PROCESS_LOCAL_PRIORITY_MODE) && -+ (katom->kctx != kctx)) ++ slot_katom = kbase_gpu_inspect(kbdev, target_js, i); ++ if (!slot_katom) + continue; + -+ if ((katom->sched_priority > priority) || -+ (katom->kctx == kctx && kbase_is_existing_atom_submitted_later_than_ready(seq_nr, katom->seq_nr))) { ++ if (kbase_js_atom_runs_before(kbdev, target_katom, slot_katom, ++ KBASE_ATOM_ORDERING_FLAG_SEQNR)) { + if (!stop_sent) + KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITIZED( + kbdev, + target_katom); + -+ kbase_job_slot_softstop(kbdev, js, katom); ++ kbase_job_slot_softstop(kbdev, target_js, slot_katom); + stop_sent = true; + } + } @@ -144496,7 +147925,7 @@ index 000000000000..19661c9766c6 + + if (!(katom->core_req & BASE_JD_REQ_START_RENDERPASS)) { + dev_dbg(kctx->kbdev->dev, -+ "Atom %p on job slot is not start RP\n", (void *)katom); ++ "Atom %pK on job slot is not start RP\n", (void *)katom); + return -EPERM; + } + @@ -144509,13 +147938,13 @@ index 000000000000..19661c9766c6 + rp->state != KBASE_JD_RP_RETRY)) + return -EINVAL; + -+ dev_dbg(kctx->kbdev->dev, "OOM in state %d with region %p\n", ++ dev_dbg(kctx->kbdev->dev, "OOM in state %d with region %pK\n", + (int)rp->state, (void *)reg); + + if (WARN_ON(katom != rp->start_katom)) + return -EINVAL; + -+ dev_dbg(kctx->kbdev->dev, "Adding region %p to list %p\n", ++ dev_dbg(kctx->kbdev->dev, "Adding region %pK to list %pK\n", + (void *)reg, (void *)&rp->oom_reg_list); + list_move_tail(®->link, &rp->oom_reg_list); + dev_dbg(kctx->kbdev->dev, "Added region to list\n"); @@ -144560,9 +147989,9 @@ index 000000000000..19661c9766c6 + if (timeout != 0) + goto exit; + -+ if (kbase_prepare_to_reset_gpu(kbdev)) { ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) { + dev_err(kbdev->dev, -+ "Issueing GPU soft-reset because jobs failed to be killed (within %d ms) as part of context termination (e.g. process exit)\n", ++ "Issuing GPU soft-reset because jobs failed to be killed (within %d ms) as part of context termination (e.g. process exit)\n", + ZAP_TIMEOUT); + kbase_reset_gpu(kbdev); + } @@ -144570,7 +147999,7 @@ index 000000000000..19661c9766c6 + /* Wait for the reset to complete */ + kbase_reset_gpu_wait(kbdev); +exit: -+ dev_dbg(kbdev->dev, "Zap: Finished Context %p", kctx); ++ dev_dbg(kbdev->dev, "Zap: Finished Context %pK", kctx); + + /* Ensure that the signallers of the waitqs have finished */ + mutex_lock(&kctx->jctx.lock); @@ -144628,46 +148057,29 @@ index 000000000000..19661c9766c6 + * + * Where possible any job in the next register is evicted before the soft-stop. + */ -+void kbase_job_slot_softstop_swflags(struct kbase_device *kbdev, int js, -+ struct kbase_jd_atom *target_katom, u32 sw_flags) ++void kbase_job_slot_softstop_swflags(struct kbase_device *kbdev, unsigned int js, ++ struct kbase_jd_atom *target_katom, u32 sw_flags) +{ -+ dev_dbg(kbdev->dev, "Soft-stop atom %p with flags 0x%x (s:%d)\n", ++ dev_dbg(kbdev->dev, "Soft-stop atom %pK with flags 0x%x (s:%d)\n", + target_katom, sw_flags, js); + -+ KBASE_DEBUG_ASSERT(!(sw_flags & JS_COMMAND_MASK)); ++ if (sw_flags & JS_COMMAND_MASK) { ++ WARN(true, "Atom %pK in kctx %pK received non-NOP flags %d\n", (void *)target_katom, ++ target_katom ? (void *)target_katom->kctx : NULL, sw_flags); ++ sw_flags &= ~((u32)JS_COMMAND_MASK); ++ } + kbase_backend_soft_hard_stop_slot(kbdev, NULL, js, target_katom, + JS_COMMAND_SOFT_STOP | sw_flags); +} + -+/** -+ * kbase_job_slot_softstop - Soft-stop the specified job slot -+ * @kbdev: The kbase device -+ * @js: The job slot to soft-stop -+ * @target_katom: The job that should be soft-stopped (or NULL for any job) -+ * Context: -+ * The job slot lock must be held when calling this function. -+ * The job slot must not already be in the process of being soft-stopped. -+ * -+ * Where possible any job in the next register is evicted before the soft-stop. -+ */ +void kbase_job_slot_softstop(struct kbase_device *kbdev, int js, + struct kbase_jd_atom *target_katom) +{ + kbase_job_slot_softstop_swflags(kbdev, js, target_katom, 0u); +} + -+/** -+ * kbase_job_slot_hardstop - Hard-stop the specified job slot -+ * @kctx: The kbase context that contains the job(s) that should -+ * be hard-stopped -+ * @js: The job slot to hard-stop -+ * @target_katom: The job that should be hard-stopped (or NULL for all -+ * jobs from the context) -+ * Context: -+ * The job slot lock must be held when calling this function. -+ */ -+void kbase_job_slot_hardstop(struct kbase_context *kctx, int js, -+ struct kbase_jd_atom *target_katom) ++void kbase_job_slot_hardstop(struct kbase_context *kctx, unsigned int js, ++ struct kbase_jd_atom *target_katom) +{ + struct kbase_device *kbdev = kctx->kbdev; + bool stopped; @@ -144675,28 +148087,9 @@ index 000000000000..19661c9766c6 + stopped = kbase_backend_soft_hard_stop_slot(kbdev, kctx, js, + target_katom, + JS_COMMAND_HARD_STOP); ++ CSTD_UNUSED(stopped); +} + -+/** -+ * kbase_job_check_enter_disjoint - potentiall enter disjoint mode -+ * @kbdev: kbase device -+ * @action: the event which has occurred -+ * @core_reqs: core requirements of the atom -+ * @target_katom: the atom which is being affected -+ * -+ * For a certain soft-stop action, work out whether to enter disjoint -+ * state. -+ * -+ * This does not register multiple disjoint events if the atom has already -+ * started a disjoint period -+ * -+ * @core_reqs can be supplied as 0 if the atom had not started on the hardware -+ * (and so a 'real' soft/hard-stop was not required, but it still interrupted -+ * flow, perhaps on another context) -+ * -+ * kbase_job_check_leave_disjoint() should be used to end the disjoint -+ * state when the soft/hard-stop action is complete -+ */ +void kbase_job_check_enter_disjoint(struct kbase_device *kbdev, u32 action, + base_jd_core_req core_reqs, struct kbase_jd_atom *target_katom) +{ @@ -144718,14 +148111,6 @@ index 000000000000..19661c9766c6 + kbase_disjoint_state_up(kbdev); +} + -+/** -+ * kbase_job_check_enter_disjoint - potentially leave disjoint state -+ * @kbdev: kbase device -+ * @target_katom: atom which is finishing -+ * -+ * Work out whether to leave disjoint state when finishing an atom that was -+ * originated by kbase_job_check_enter_disjoint(). -+ */ +void kbase_job_check_leave_disjoint(struct kbase_device *kbdev, + struct kbase_jd_atom *target_katom) +{ @@ -144735,6 +148120,33 @@ index 000000000000..19661c9766c6 + } +} + ++int kbase_reset_gpu_prevent_and_wait(struct kbase_device *kbdev) ++{ ++ WARN(true, "%s Not implemented for JM GPUs", __func__); ++ return -EINVAL; ++} ++ ++int kbase_reset_gpu_try_prevent(struct kbase_device *kbdev) ++{ ++ WARN(true, "%s Not implemented for JM GPUs", __func__); ++ return -EINVAL; ++} ++ ++void kbase_reset_gpu_allow(struct kbase_device *kbdev) ++{ ++ WARN(true, "%s Not implemented for JM GPUs", __func__); ++} ++ ++void kbase_reset_gpu_assert_prevented(struct kbase_device *kbdev) ++{ ++ WARN(true, "%s Not implemented for JM GPUs", __func__); ++} ++ ++void kbase_reset_gpu_assert_failed_or_prevented(struct kbase_device *kbdev) ++{ ++ WARN(true, "%s Not implemented for JM GPUs", __func__); ++} ++ +static void kbase_debug_dump_registers(struct kbase_device *kbdev) +{ + int i; @@ -144775,23 +148187,23 @@ index 000000000000..19661c9766c6 +{ + unsigned long flags; + struct kbase_device *kbdev; -+ ktime_t end_timestamp = ktime_get(); ++ ktime_t end_timestamp = ktime_get_raw(); + struct kbasep_js_device_data *js_devdata; + bool silent = false; + u32 max_loops = KBASE_CLEAN_CACHE_MAX_LOOPS; + -+ KBASE_DEBUG_ASSERT(data); -+ + kbdev = container_of(data, struct kbase_device, + hwaccess.backend.reset_work); + -+ KBASE_DEBUG_ASSERT(kbdev); + js_devdata = &kbdev->js_data; + + if (atomic_read(&kbdev->hwaccess.backend.reset_gpu) == + KBASE_RESET_GPU_SILENT) + silent = true; + ++ if (kbase_is_quick_reset_enabled(kbdev)) ++ silent = true; ++ + KBASE_KTRACE_ADD_JM(kbdev, JM_BEGIN_RESET_WORKER, NULL, NULL, 0u, 0); + + /* Disable GPU hardware counters. @@ -144801,13 +148213,15 @@ index 000000000000..19661c9766c6 + + /* Make sure the timer has completed - this cannot be done from + * interrupt context, so this cannot be done within -+ * kbasep_try_reset_gpu_early. */ ++ * kbasep_try_reset_gpu_early. ++ */ + hrtimer_cancel(&kbdev->hwaccess.backend.reset_timer); + + if (kbase_pm_context_active_handle_suspend(kbdev, + KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE)) { + /* This would re-activate the GPU. Since it's already idle, -+ * there's no need to reset it */ ++ * there's no need to reset it ++ */ + atomic_set(&kbdev->hwaccess.backend.reset_gpu, + KBASE_RESET_GPU_NOT_PENDING); + kbase_disjoint_state_down(kbdev); @@ -144818,7 +148232,7 @@ index 000000000000..19661c9766c6 + return; + } + -+ KBASE_DEBUG_ASSERT(kbdev->irq_reset_flush == false); ++ WARN(kbdev->irq_reset_flush, "%s: GPU reset already in flight\n", __func__); + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + spin_lock(&kbdev->mmu_mask_change); @@ -144828,14 +148242,16 @@ index 000000000000..19661c9766c6 + kbdev->irq_reset_flush = true; + + /* Disable IRQ to avoid IRQ handlers to kick in after releasing the -+ * spinlock; this also clears any outstanding interrupts */ ++ * spinlock; this also clears any outstanding interrupts ++ */ + kbase_pm_disable_interrupts_nolock(kbdev); + + spin_unlock(&kbdev->mmu_mask_change); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + + /* Ensure that any IRQ handlers have finished -+ * Must be done without any locks IRQ handlers will take */ ++ * Must be done without any locks IRQ handlers will take ++ */ + kbase_synchronize_irqs(kbdev); + + /* Flush out any in-flight work items */ @@ -144846,7 +148262,8 @@ index 000000000000..19661c9766c6 + + if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TMIX_8463)) { + /* Ensure that L2 is not transitioning when we send the reset -+ * command */ ++ * command ++ */ + while (--max_loops && kbase_pm_get_trans_cores(kbdev, + KBASE_PM_CORE_L2)) + ; @@ -144856,19 +148273,22 @@ index 000000000000..19661c9766c6 + + mutex_lock(&kbdev->pm.lock); + /* We hold the pm lock, so there ought to be a current policy */ -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.pm_current_policy); ++ if (unlikely(!kbdev->pm.backend.pm_current_policy)) ++ dev_warn(kbdev->dev, "No power policy set!"); + + /* All slot have been soft-stopped and we've waited + * SOFT_STOP_RESET_TIMEOUT for the slots to clear, at this point we + * assume that anything that is still left on the GPU is stuck there and -+ * we'll kill it when we reset the GPU */ ++ * we'll kill it when we reset the GPU ++ */ + + if (!silent) + dev_err(kbdev->dev, "Resetting GPU (allowing up to %d ms)", + RESET_TIMEOUT); + + /* Output the state of some interesting registers to help in the -+ * debugging of GPU resets */ ++ * debugging of GPU resets ++ */ + if (!silent) + kbase_debug_dump_registers(kbdev); + @@ -144880,6 +148300,13 @@ index 000000000000..19661c9766c6 + kbase_pm_metrics_update(kbdev, NULL); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + ++ /* Tell hardware counters a reset is about to occur. ++ * If the instr backend is in an unrecoverable error state (e.g. due to ++ * HW being unresponsive), this will transition the backend out of ++ * it, on the assumption a reset will fix whatever problem there was. ++ */ ++ kbase_instr_hwcnt_on_before_reset(kbdev); ++ + /* Reset the GPU */ + kbase_pm_init_hw(kbdev, 0); + @@ -144907,7 +148334,8 @@ index 000000000000..19661c9766c6 + kbase_pm_update_cores_state(kbdev); + + /* Synchronously request and wait for those cores, because if -+ * instrumentation is enabled it would need them immediately. */ ++ * instrumentation is enabled it would need them immediately. ++ */ + kbase_pm_wait_for_desired_state(kbdev); + + mutex_unlock(&kbdev->pm.lock); @@ -144943,8 +148371,6 @@ index 000000000000..19661c9766c6 + struct kbase_device *kbdev = container_of(timer, struct kbase_device, + hwaccess.backend.reset_timer); + -+ KBASE_DEBUG_ASSERT(kbdev); -+ + /* Reset still pending? */ + if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, + KBASE_RESET_GPU_COMMITTED, KBASE_RESET_GPU_HAPPENING) == @@ -144962,11 +148388,9 @@ index 000000000000..19661c9766c6 + +static void kbasep_try_reset_gpu_early_locked(struct kbase_device *kbdev) +{ -+ int i; ++ unsigned int i; + int pending_jobs = 0; + -+ KBASE_DEBUG_ASSERT(kbdev); -+ + /* Count the number of jobs */ + for (i = 0; i < kbdev->gpu_props.num_job_slots; i++) + pending_jobs += kbase_backend_nr_atoms_submitted(kbdev, i); @@ -144984,7 +148408,8 @@ index 000000000000..19661c9766c6 + + /* Check that the reset has been committed to (i.e. kbase_reset_gpu has + * been called), and that no other thread beat this thread to starting -+ * the reset */ ++ * the reset ++ */ + if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, + KBASE_RESET_GPU_COMMITTED, KBASE_RESET_GPU_HAPPENING) != + KBASE_RESET_GPU_COMMITTED) { @@ -145008,22 +148433,21 @@ index 000000000000..19661c9766c6 +/** + * kbase_prepare_to_reset_gpu_locked - Prepare for resetting the GPU + * @kbdev: kbase device ++ * @flags: Bitfield indicating impact of reset (see flag defines) + * -+ * This function just soft-stops all the slots to ensure that as many jobs as ++ * This function soft-stops all the slots to ensure that as many jobs as + * possible are saved. + * -+ * Return: -+ * The function returns a boolean which should be interpreted as follows: ++ * Return: boolean which should be interpreted as follows: + * true - Prepared for reset, kbase_reset_gpu_locked should be called. + * false - Another thread is performing a reset, kbase_reset_gpu should + * not be called. + */ -+bool kbase_prepare_to_reset_gpu_locked(struct kbase_device *kbdev) ++bool kbase_prepare_to_reset_gpu_locked(struct kbase_device *kbdev, ++ unsigned int flags) +{ + int i; + -+ KBASE_DEBUG_ASSERT(kbdev); -+ +#ifdef CONFIG_MALI_ARBITER_SUPPORT + if (kbase_pm_is_gpu_lost(kbdev)) { + /* GPU access has been removed, reset will be done by @@ -145033,6 +148457,9 @@ index 000000000000..19661c9766c6 + } +#endif + ++ if (flags & RESET_FLAGS_HWC_UNRECOVERABLE_ERROR) ++ kbase_instr_hwcnt_on_unrecoverable_error(kbdev); ++ + if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, + KBASE_RESET_GPU_NOT_PENDING, + KBASE_RESET_GPU_PREPARED) != @@ -145049,14 +148476,14 @@ index 000000000000..19661c9766c6 + return true; +} + -+bool kbase_prepare_to_reset_gpu(struct kbase_device *kbdev) ++bool kbase_prepare_to_reset_gpu(struct kbase_device *kbdev, unsigned int flags) +{ -+ unsigned long flags; ++ unsigned long lock_flags; + bool ret; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ ret = kbase_prepare_to_reset_gpu_locked(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, lock_flags); ++ ret = kbase_prepare_to_reset_gpu_locked(kbdev, flags); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, lock_flags); + + return ret; +} @@ -145074,17 +148501,17 @@ index 000000000000..19661c9766c6 + */ +void kbase_reset_gpu(struct kbase_device *kbdev) +{ -+ KBASE_DEBUG_ASSERT(kbdev); -+ + /* Note this is an assert/atomic_set because it is a software issue for -+ * a race to be occuring here */ -+ KBASE_DEBUG_ASSERT(atomic_read(&kbdev->hwaccess.backend.reset_gpu) == -+ KBASE_RESET_GPU_PREPARED); ++ * a race to be occurring here ++ */ ++ if (WARN_ON(atomic_read(&kbdev->hwaccess.backend.reset_gpu) != KBASE_RESET_GPU_PREPARED)) ++ return; + atomic_set(&kbdev->hwaccess.backend.reset_gpu, + KBASE_RESET_GPU_COMMITTED); + -+ dev_err(kbdev->dev, "Preparing to soft-reset GPU: Waiting (upto %d ms) for all jobs to complete soft-stop\n", -+ kbdev->reset_timeout_ms); ++ if (!kbase_is_quick_reset_enabled(kbdev)) ++ dev_err(kbdev->dev, "Preparing to soft-reset GPU: Waiting (upto %d ms) for all jobs to complete soft-stop\n", ++ kbdev->reset_timeout_ms); + + hrtimer_start(&kbdev->hwaccess.backend.reset_timer, + HR_TIMER_DELAY_MSEC(kbdev->reset_timeout_ms), @@ -145097,17 +148524,17 @@ index 000000000000..19661c9766c6 + +void kbase_reset_gpu_locked(struct kbase_device *kbdev) +{ -+ KBASE_DEBUG_ASSERT(kbdev); -+ + /* Note this is an assert/atomic_set because it is a software issue for -+ * a race to be occuring here */ -+ KBASE_DEBUG_ASSERT(atomic_read(&kbdev->hwaccess.backend.reset_gpu) == -+ KBASE_RESET_GPU_PREPARED); ++ * a race to be occurring here ++ */ ++ if (WARN_ON(atomic_read(&kbdev->hwaccess.backend.reset_gpu) != KBASE_RESET_GPU_PREPARED)) ++ return; + atomic_set(&kbdev->hwaccess.backend.reset_gpu, + KBASE_RESET_GPU_COMMITTED); + -+ dev_err(kbdev->dev, "Preparing to soft-reset GPU: Waiting (upto %d ms) for all jobs to complete soft-stop\n", -+ kbdev->reset_timeout_ms); ++ if (!kbase_is_quick_reset_enabled(kbdev)) ++ dev_err(kbdev->dev, "Preparing to soft-reset GPU: Waiting (upto %d ms) for all jobs to complete soft-stop\n", ++ kbdev->reset_timeout_ms); + hrtimer_start(&kbdev->hwaccess.backend.reset_timer, + HR_TIMER_DELAY_MSEC(kbdev->reset_timeout_ms), + HRTIMER_MODE_REL); @@ -145143,6 +148570,11 @@ index 000000000000..19661c9766c6 + return true; +} + ++bool kbase_reset_gpu_is_not_pending(struct kbase_device *kbdev) ++{ ++ return atomic_read(&kbdev->hwaccess.backend.reset_gpu) == KBASE_RESET_GPU_NOT_PENDING; ++} ++ +int kbase_reset_gpu_wait(struct kbase_device *kbdev) +{ + wait_event(kbdev->hwaccess.backend.reset_wait, @@ -145175,20 +148607,39 @@ index 000000000000..19661c9766c6 +{ + destroy_workqueue(kbdev->hwaccess.backend.reset_workq); +} ++ ++static u64 kbasep_apply_limited_core_mask(const struct kbase_device *kbdev, ++ const u64 affinity, const u64 limited_core_mask) ++{ ++ const u64 result = affinity & limited_core_mask; ++ ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ dev_dbg(kbdev->dev, ++ "Limiting affinity due to BASE_JD_REQ_LIMITED_CORE_MASK from 0x%lx to 0x%lx (mask is 0x%lx)\n", ++ (unsigned long)affinity, ++ (unsigned long)result, ++ (unsigned long)limited_core_mask); ++#else ++ CSTD_UNUSED(kbdev); ++#endif ++ ++ return result; ++} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h new file mode 100755 -index 000000000000..cd1f9794fdc4 +index 000000000..bfd55a6e2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h -@@ -0,0 +1,181 @@ +@@ -0,0 +1,148 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2011-2016, 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2016, 2018-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -145199,12 +148650,8 @@ index 000000000000..cd1f9794fdc4 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/* + * Job Manager backend-specific low-level APIs. + */ @@ -145220,21 +148667,6 @@ index 000000000000..cd1f9794fdc4 +#include + +/** -+ * kbase_job_submit_nolock() - Submit a job to a certain job-slot -+ * @kbdev: Device pointer -+ * @katom: Atom to submit -+ * @js: Job slot to submit on -+ * -+ * The caller must check kbasep_jm_is_submit_slots_free() != false before -+ * calling this. -+ * -+ * The following locking conditions are made on the caller: -+ * - it must hold the hwaccess_lock -+ */ -+void kbase_job_submit_nolock(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, int js); -+ -+/** + * kbase_job_done_slot() - Complete the head job on a particular job-slot + * @kbdev: Device pointer + * @s: Job slot @@ -145245,24 +148677,14 @@ index 000000000000..cd1f9794fdc4 +void kbase_job_done_slot(struct kbase_device *kbdev, int s, u32 completion_code, + u64 job_tail, ktime_t *end_timestamp); + -+#ifdef CONFIG_GPU_TRACEPOINTS -+static inline char *kbasep_make_job_slot_string(int js, char *js_string, -+ size_t js_size) ++#if IS_ENABLED(CONFIG_GPU_TRACEPOINTS) ++static inline char *kbasep_make_job_slot_string(unsigned int js, char *js_string, size_t js_size) +{ -+ snprintf(js_string, js_size, "job_slot_%i", js); ++ snprintf(js_string, js_size, "job_slot_%u", js); + return js_string; +} +#endif + -+#if !MALI_USE_CSF -+static inline int kbasep_jm_is_js_free(struct kbase_device *kbdev, int js, -+ struct kbase_context *kctx) -+{ -+ return !kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_COMMAND_NEXT)); -+} -+#endif -+ -+ +/** + * kbase_job_hw_submit() - Submit a job to the GPU + * @kbdev: Device pointer @@ -145274,10 +148696,10 @@ index 000000000000..cd1f9794fdc4 + * + * The following locking conditions are made on the caller: + * - it must hold the hwaccess_lock ++ * ++ * Return: 0 if the job was successfully submitted to hardware, an error otherwise. + */ -+void kbase_job_hw_submit(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, -+ int js); ++int kbase_job_hw_submit(struct kbase_device *kbdev, struct kbase_jd_atom *katom, unsigned int js); + +#if !MALI_USE_CSF +/** @@ -145293,11 +148715,9 @@ index 000000000000..cd1f9794fdc4 + * The following locking conditions are made on the caller: + * - it must hold the hwaccess_lock + */ -+void kbasep_job_slot_soft_or_hard_stop_do_action(struct kbase_device *kbdev, -+ int js, -+ u32 action, -+ base_jd_core_req core_reqs, -+ struct kbase_jd_atom *target_katom); ++void kbasep_job_slot_soft_or_hard_stop_do_action(struct kbase_device *kbdev, unsigned int js, ++ u32 action, base_jd_core_req core_reqs, ++ struct kbase_jd_atom *target_katom); +#endif /* !MALI_USE_CSF */ + +/** @@ -145321,11 +148741,8 @@ index 000000000000..cd1f9794fdc4 + * + * Return: true if an atom was stopped, false otherwise + */ -+bool kbase_backend_soft_hard_stop_slot(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js, -+ struct kbase_jd_atom *katom, -+ u32 action); ++bool kbase_backend_soft_hard_stop_slot(struct kbase_device *kbdev, struct kbase_context *kctx, ++ unsigned int js, struct kbase_jd_atom *katom, u32 action); + +/** + * kbase_job_slot_init - Initialise job slot framework @@ -145364,18 +148781,19 @@ index 000000000000..cd1f9794fdc4 +#endif /* _KBASE_JM_HWACCESS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c new file mode 100755 -index 000000000000..afaaef27883d +index 000000000..7db2b353b --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c -@@ -0,0 +1,1659 @@ +@@ -0,0 +1,1873 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -145386,11 +148804,8 @@ index 000000000000..afaaef27883d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ +/* + * Register-based HW access backend specific APIs + */ @@ -145401,7 +148816,7 @@ index 000000000000..afaaef27883d +#include +#include +#include -+#include ++#include +#include +#include +#include @@ -145409,12 +148824,23 @@ index 000000000000..afaaef27883d +#include +#include + -+/* Return whether the specified ringbuffer is empty. HW access lock must be -+ * held */ ++/** ++ * SLOT_RB_EMPTY - Return whether the specified ringbuffer is empty. ++ * ++ * @rb: ring buffer ++ * ++ * Note: HW access lock must be held ++ */ +#define SLOT_RB_EMPTY(rb) (rb->write_idx == rb->read_idx) -+/* Return number of atoms currently in the specified ringbuffer. HW access lock -+ * must be held */ -+#define SLOT_RB_ENTRIES(rb) (int)(s8)(rb->write_idx - rb->read_idx) ++ ++/** ++ * SLOT_RB_ENTRIES - Return number of atoms currently in the specified ringbuffer. ++ * ++ * @rb: ring buffer ++ * ++ * Note: HW access lock must be held ++ */ ++#define SLOT_RB_ENTRIES(rb) ((int)(s8)(rb->write_idx - rb->read_idx)) + +static void kbase_gpu_release_atom(struct kbase_device *kbdev, + struct kbase_jd_atom *katom, @@ -145454,9 +148880,8 @@ index 000000000000..afaaef27883d + * + * Return: Atom removed from ringbuffer + */ -+static struct kbase_jd_atom *kbase_gpu_dequeue_atom(struct kbase_device *kbdev, -+ int js, -+ ktime_t *end_timestamp) ++static struct kbase_jd_atom *kbase_gpu_dequeue_atom(struct kbase_device *kbdev, unsigned int js, ++ ktime_t *end_timestamp) +{ + struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[js]; + struct kbase_jd_atom *katom; @@ -145479,8 +148904,7 @@ index 000000000000..afaaef27883d + return katom; +} + -+struct kbase_jd_atom *kbase_gpu_inspect(struct kbase_device *kbdev, int js, -+ int idx) ++struct kbase_jd_atom *kbase_gpu_inspect(struct kbase_device *kbdev, unsigned int js, int idx) +{ + struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[js]; + @@ -145492,8 +148916,7 @@ index 000000000000..afaaef27883d + return rb->entries[(rb->read_idx + idx) & SLOT_RB_MASK].katom; +} + -+struct kbase_jd_atom *kbase_backend_inspect_tail(struct kbase_device *kbdev, -+ int js) ++struct kbase_jd_atom *kbase_backend_inspect_tail(struct kbase_device *kbdev, unsigned int js) +{ + struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[js]; + @@ -145505,12 +148928,13 @@ index 000000000000..afaaef27883d + +bool kbase_gpu_atoms_submitted_any(struct kbase_device *kbdev) +{ -+ int js; -+ int i; ++ unsigned int js; + + lockdep_assert_held(&kbdev->hwaccess_lock); + + for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { ++ int i; ++ + for (i = 0; i < SLOT_RB_SIZE; i++) { + struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, i); + @@ -145521,7 +148945,7 @@ index 000000000000..afaaef27883d + return false; +} + -+int kbase_backend_nr_atoms_submitted(struct kbase_device *kbdev, int js) ++int kbase_backend_nr_atoms_submitted(struct kbase_device *kbdev, unsigned int js) +{ + int nr = 0; + int i; @@ -145539,7 +148963,7 @@ index 000000000000..afaaef27883d + return nr; +} + -+int kbase_backend_nr_atoms_on_slot(struct kbase_device *kbdev, int js) ++int kbase_backend_nr_atoms_on_slot(struct kbase_device *kbdev, unsigned int js) +{ + int nr = 0; + int i; @@ -145554,8 +148978,8 @@ index 000000000000..afaaef27883d + return nr; +} + -+static int kbase_gpu_nr_atoms_on_slot_min(struct kbase_device *kbdev, int js, -+ enum kbase_atom_gpu_rb_state min_rb_state) ++static int kbase_gpu_nr_atoms_on_slot_min(struct kbase_device *kbdev, unsigned int js, ++ enum kbase_atom_gpu_rb_state min_rb_state) +{ + int nr = 0; + int i; @@ -145605,9 +149029,11 @@ index 000000000000..afaaef27883d +static bool kbase_gpu_check_secure_atoms(struct kbase_device *kbdev, + bool secure) +{ -+ int js, i; ++ unsigned int js; + + for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { ++ int i; ++ + for (i = 0; i < SLOT_RB_SIZE; i++) { + struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, + js, i); @@ -145622,7 +149048,7 @@ index 000000000000..afaaef27883d + return false; +} + -+int kbase_backend_slot_free(struct kbase_device *kbdev, int js) ++int kbase_backend_slot_free(struct kbase_device *kbdev, unsigned int js) +{ + lockdep_assert_held(&kbdev->hwaccess_lock); + @@ -145654,13 +149080,16 @@ index 000000000000..afaaef27883d + kbase_kinstr_jm_atom_hw_release(katom); + /* Inform power management at start/finish of atom so it can + * update its GPU utilisation metrics. Mark atom as not -+ * submitted beforehand. */ ++ * submitted beforehand. ++ */ + katom->gpu_rb_state = KBASE_ATOM_GPU_RB_READY; + kbase_pm_metrics_update(kbdev, end_timestamp); + ++ /* Inform platform at start/finish of atom */ ++ kbasep_platform_event_atom_complete(katom); ++ + if (katom->core_req & BASE_JD_REQ_PERMON) + kbase_pm_release_gpu_cycle_counter_nolock(kbdev); -+ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ + + KBASE_TLSTREAM_TL_NRET_ATOM_LPU(kbdev, katom, + &kbdev->gpu_props.props.raw_props.js_features @@ -145670,9 +149099,11 @@ index 000000000000..afaaef27883d + &kbdev->gpu_props.props.raw_props.js_features + [katom->slot_nr]); + ++ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ ++ fallthrough; + case KBASE_ATOM_GPU_RB_READY: + /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ -+ ++ fallthrough; + case KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE: + break; + @@ -145703,16 +149134,35 @@ index 000000000000..afaaef27883d + katom->protected_state.exit != + KBASE_ATOM_EXIT_PROTECTED_CHECK) + kbdev->protected_mode_transition = false; ++ ++ /* If the atom is at KBASE_ATOM_ENTER_PROTECTED_HWCNT state, it means ++ * one of two events prevented it from progressing to the next state and ++ * ultimately reach protected mode: ++ * - hwcnts were enabled, and the atom had to schedule a worker to ++ * disable them. ++ * - the hwcnts were already disabled, but some other error occurred. ++ * In the first case, if the worker has not yet completed ++ * (kbdev->protected_mode_hwcnt_disabled == false), we need to re-enable ++ * them and signal to the worker they have already been enabled ++ */ ++ if (kbase_jd_katom_is_protected(katom) && ++ (katom->protected_state.enter == KBASE_ATOM_ENTER_PROTECTED_HWCNT)) { ++ kbdev->protected_mode_hwcnt_desired = true; ++ if (kbdev->protected_mode_hwcnt_disabled) { ++ kbase_hwcnt_context_enable(kbdev->hwcnt_gpu_ctx); ++ kbdev->protected_mode_hwcnt_disabled = false; ++ } ++ } ++ + /* If the atom has suspended hwcnt but has not yet entered + * protected mode, then resume hwcnt now. If the GPU is now in + * protected mode then hwcnt will be resumed by GPU reset so + * don't resume it here. + */ + if (kbase_jd_katom_is_protected(katom) && -+ ((katom->protected_state.enter == -+ KBASE_ATOM_ENTER_PROTECTED_IDLE_L2) || -+ (katom->protected_state.enter == -+ KBASE_ATOM_ENTER_PROTECTED_SET_COHERENCY))) { ++ ((katom->protected_state.enter == KBASE_ATOM_ENTER_PROTECTED_IDLE_L2) || ++ (katom->protected_state.enter == KBASE_ATOM_ENTER_PROTECTED_SET_COHERENCY) || ++ (katom->protected_state.enter == KBASE_ATOM_ENTER_PROTECTED_FINISHED))) { + WARN_ON(!kbdev->protected_mode_hwcnt_disabled); + kbdev->protected_mode_hwcnt_desired = true; + if (kbdev->protected_mode_hwcnt_disabled) { @@ -145732,13 +149182,13 @@ index 000000000000..afaaef27883d + } + + /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ -+ ++ fallthrough; + case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV: + /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ -+ ++ fallthrough; + case KBASE_ATOM_GPU_RB_WAITING_BLOCKED: + /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ -+ ++ fallthrough; + case KBASE_ATOM_GPU_RB_RETURN_TO_JS: + break; + } @@ -145752,6 +149202,9 @@ index 000000000000..afaaef27883d +{ + lockdep_assert_held(&kbdev->hwaccess_lock); + ++ KBASE_KTRACE_ADD_JM_SLOT_INFO(kbdev, JM_MARK_FOR_RETURN_TO_JS, ++ katom->kctx, katom, katom->jc, ++ katom->slot_nr, katom->event_code); + kbase_gpu_release_atom(kbdev, katom, NULL); + katom->gpu_rb_state = KBASE_ATOM_GPU_RB_RETURN_TO_JS; +} @@ -145764,9 +149217,9 @@ index 000000000000..afaaef27883d + * + * Return: true if any slots other than @js are busy, false otherwise + */ -+static inline bool other_slots_busy(struct kbase_device *kbdev, int js) ++static inline bool other_slots_busy(struct kbase_device *kbdev, unsigned int js) +{ -+ int slot; ++ unsigned int slot; + + for (slot = 0; slot < kbdev->gpu_props.num_job_slots; slot++) { + if (slot == js) @@ -145860,17 +149313,14 @@ index 000000000000..afaaef27883d + KBASE_TLSTREAM_AUX_PROTECTED_ENTER_END(kbdev, kbdev); + if (err) { + /* -+ * Failed to switch into protected mode, resume -+ * GPU hwcnt and fail atom. ++ * Failed to switch into protected mode. ++ * ++ * At this point we expect: ++ * katom->gpu_rb_state = KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION && ++ * katom->protected_state.enter = KBASE_ATOM_ENTER_PROTECTED_FINISHED ++ * ==> ++ * kbdev->protected_mode_hwcnt_disabled = false + */ -+ WARN_ON(!kbdev->protected_mode_hwcnt_disabled); -+ kbdev->protected_mode_hwcnt_desired = true; -+ if (kbdev->protected_mode_hwcnt_disabled) { -+ kbase_hwcnt_context_enable( -+ kbdev->hwcnt_gpu_ctx); -+ kbdev->protected_mode_hwcnt_disabled = false; -+ } -+ + katom[idx]->event_code = BASE_JD_EVENT_JOB_INVALID; + kbase_gpu_mark_atom_for_return(kbdev, katom[idx]); + /* @@ -145890,12 +149340,9 @@ index 000000000000..afaaef27883d + /* + * Protected mode sanity checks. + */ -+ KBASE_DEBUG_ASSERT_MSG( -+ kbase_jd_katom_is_protected(katom[idx]) == -+ kbase_gpu_in_protected_mode(kbdev), -+ "Protected mode of atom (%d) doesn't match protected mode of GPU (%d)", -+ kbase_jd_katom_is_protected(katom[idx]), -+ kbase_gpu_in_protected_mode(kbdev)); ++ WARN(kbase_jd_katom_is_protected(katom[idx]) != kbase_gpu_in_protected_mode(kbdev), ++ "Protected mode of atom (%d) doesn't match protected mode of GPU (%d)", ++ kbase_jd_katom_is_protected(katom[idx]), kbase_gpu_in_protected_mode(kbdev)); + katom[idx]->gpu_rb_state = + KBASE_ATOM_GPU_RB_READY; + @@ -145914,7 +149361,8 @@ index 000000000000..afaaef27883d + KBASE_TLSTREAM_AUX_PROTECTED_ENTER_START(kbdev, kbdev); + /* The checks in KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV + * should ensure that we are not already transitiong, and that -+ * there are no atoms currently on the GPU. */ ++ * there are no atoms currently on the GPU. ++ */ + WARN_ON(kbdev->protected_mode_transition); + WARN_ON(kbase_gpu_atoms_submitted_any(kbdev)); + /* If hwcnt is disabled, it means we didn't clean up correctly @@ -145928,7 +149376,7 @@ index 000000000000..afaaef27883d + kbdev->protected_mode_transition = true; + + /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ ++ fallthrough; + case KBASE_ATOM_ENTER_PROTECTED_HWCNT: + /* See if we can get away with disabling hwcnt atomically */ + kbdev->protected_mode_hwcnt_desired = false; @@ -145940,19 +149388,15 @@ index 000000000000..afaaef27883d + + /* We couldn't disable atomically, so kick off a worker */ + if (!kbdev->protected_mode_hwcnt_disabled) { -+#if KERNEL_VERSION(3, 16, 0) > LINUX_VERSION_CODE -+ queue_work(system_wq, -+ &kbdev->protected_mode_hwcnt_disable_work); -+#else -+ queue_work(system_highpri_wq, ++ kbase_hwcnt_context_queue_work( ++ kbdev->hwcnt_gpu_ctx, + &kbdev->protected_mode_hwcnt_disable_work); -+#endif + return -EAGAIN; + } + -+ /* Once reaching this point GPU must be -+ * switched to protected mode or hwcnt -+ * re-enabled. */ ++ /* Once reaching this point GPU must be switched to protected ++ * mode or hwcnt re-enabled. ++ */ + + if (kbase_pm_protected_entry_override_enable(kbdev)) + return -EAGAIN; @@ -145975,7 +149419,7 @@ index 000000000000..afaaef27883d + kbase_pm_update_cores_state_nolock(kbdev); + + /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ ++ fallthrough; + case KBASE_ATOM_ENTER_PROTECTED_IDLE_L2: + /* Avoid unnecessary waiting on non-ACE platforms. */ + if (kbdev->system_coherency == COHERENCY_ACE) { @@ -146006,7 +149450,7 @@ index 000000000000..afaaef27883d + KBASE_ATOM_ENTER_PROTECTED_SET_COHERENCY; + + /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ ++ fallthrough; + case KBASE_ATOM_ENTER_PROTECTED_SET_COHERENCY: + /* + * When entering into protected mode, we must ensure that the @@ -146039,7 +149483,7 @@ index 000000000000..afaaef27883d + return -EAGAIN; + + /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ ++ fallthrough; + case KBASE_ATOM_ENTER_PROTECTED_FINISHED: + if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TGOX_R1_1234)) { + /* @@ -146092,7 +149536,8 @@ index 000000000000..afaaef27883d + KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_START(kbdev, kbdev); + /* The checks in KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV + * should ensure that we are not already transitiong, and that -+ * there are no atoms currently on the GPU. */ ++ * there are no atoms currently on the GPU. ++ */ + WARN_ON(kbdev->protected_mode_transition); + WARN_ON(kbase_gpu_atoms_submitted_any(kbdev)); + @@ -146109,7 +149554,7 @@ index 000000000000..afaaef27883d + kbase_pm_update_cores_state_nolock(kbdev); + + /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ ++ fallthrough; + case KBASE_ATOM_EXIT_PROTECTED_IDLE_L2: + if (kbdev->pm.backend.l2_state != KBASE_L2_OFF) { + /* @@ -146122,8 +149567,15 @@ index 000000000000..afaaef27883d + KBASE_ATOM_EXIT_PROTECTED_RESET; + + /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ ++ fallthrough; + case KBASE_ATOM_EXIT_PROTECTED_RESET: ++ /* L2 cache has been turned off (which is needed prior to the reset of GPU ++ * to exit the protected mode), so the override flag can be safely cleared. ++ * Even if L2 cache is powered up again before the actual reset, it should ++ * not be an issue (there are no jobs running on the GPU). ++ */ ++ kbase_pm_protected_override_disable(kbdev); ++ + /* Issue the reset to the GPU */ + err = kbase_gpu_protected_mode_reset(kbdev); + @@ -146132,14 +149584,13 @@ index 000000000000..afaaef27883d + + if (err) { + kbdev->protected_mode_transition = false; -+ kbase_pm_protected_override_disable(kbdev); + + /* Failed to exit protected mode, fail atom */ + katom[idx]->event_code = BASE_JD_EVENT_JOB_INVALID; + kbase_gpu_mark_atom_for_return(kbdev, katom[idx]); + /* Only return if head atom or previous atom -+ * already removed - as atoms must be returned -+ * in order */ ++ * already removed - as atoms must be returned in order ++ */ + if (idx == 0 || katom[0]->gpu_rb_state == + KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { + kbase_gpu_dequeue_atom(kbdev, js, NULL); @@ -146164,7 +149615,7 @@ index 000000000000..afaaef27883d + KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT; + + /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ ++ fallthrough; + case KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT: + /* A GPU reset is issued when exiting protected mode. Once the + * reset is done all atoms' state will also be reset. For this @@ -146180,7 +149631,7 @@ index 000000000000..afaaef27883d + +void kbase_backend_slot_update(struct kbase_device *kbdev) +{ -+ int js; ++ unsigned int js; + + lockdep_assert_held(&kbdev->hwaccess_lock); + @@ -146218,10 +149669,10 @@ index 000000000000..afaaef27883d + break; + + katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV; ++ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV; + + /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ ++ fallthrough; + case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV: + if (kbase_gpu_check_secure_atoms(kbdev, + !kbase_jd_katom_is_protected( @@ -146241,7 +149692,7 @@ index 000000000000..afaaef27883d + KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION; + + /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ ++ fallthrough; + case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION: + + /* @@ -146276,18 +149727,20 @@ index 000000000000..afaaef27883d + KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE; + + /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ ++ fallthrough; + case KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE: + if (katom[idx]->will_fail_event_code) { + kbase_gpu_mark_atom_for_return(kbdev, + katom[idx]); + /* Set EVENT_DONE so this atom will be -+ completed, not unpulled. */ ++ * completed, not unpulled. ++ */ + katom[idx]->event_code = + BASE_JD_EVENT_DONE; + /* Only return if head atom or previous + * atom already removed - as atoms must -+ * be returned in order. */ ++ * be returned in order. ++ */ + if (idx == 0 || katom[0]->gpu_rb_state == + KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { + kbase_gpu_dequeue_atom(kbdev, js, NULL); @@ -146299,13 +149752,6 @@ index 000000000000..afaaef27883d + cores_ready = kbase_pm_cores_requested(kbdev, + true); + -+ if (katom[idx]->event_code == -+ BASE_JD_EVENT_PM_EVENT) { -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_RETURN_TO_JS; -+ break; -+ } -+ + if (!cores_ready) + break; + @@ -146313,12 +149759,13 @@ index 000000000000..afaaef27883d + KBASE_ATOM_GPU_RB_READY; + + /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ ++ fallthrough; + case KBASE_ATOM_GPU_RB_READY: + + if (idx == 1) { + /* Only submit if head atom or previous -+ * atom already submitted */ ++ * atom already submitted ++ */ + if ((katom[0]->gpu_rb_state != + KBASE_ATOM_GPU_RB_SUBMITTED && + katom[0]->gpu_rb_state != @@ -146334,43 +149781,48 @@ index 000000000000..afaaef27883d + } + + /* If inter-slot serialization in use then don't -+ * submit atom if any other slots are in use */ ++ * submit atom if any other slots are in use ++ */ + if ((kbdev->serialize_jobs & + KBASE_SERIALIZE_INTER_SLOT) && + other_slots_busy(kbdev, js)) + break; + -+#ifdef CONFIG_MALI_GEM5_BUILD -+ if (!kbasep_jm_is_js_free(kbdev, js, -+ katom[idx]->kctx)) -+ break; -+#endif + /* Check if this job needs the cycle counter -+ * enabled before submission */ ++ * enabled before submission ++ */ + if (katom[idx]->core_req & BASE_JD_REQ_PERMON) -+ kbase_pm_request_gpu_cycle_counter_l2_is_on( -+ kbdev); ++ kbase_pm_request_gpu_cycle_counter_l2_is_on(kbdev); + -+ kbase_job_hw_submit(kbdev, katom[idx], js); -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_SUBMITTED; ++ if (!kbase_job_hw_submit(kbdev, katom[idx], js)) { ++ katom[idx]->gpu_rb_state = KBASE_ATOM_GPU_RB_SUBMITTED; + -+ /* Inform power management at start/finish of -+ * atom so it can update its GPU utilisation -+ * metrics. */ -+ kbase_pm_metrics_update(kbdev, -+ &katom[idx]->start_timestamp); ++ /* Inform power management at start/finish of ++ * atom so it can update its GPU utilisation ++ * metrics. ++ */ ++ kbase_pm_metrics_update(kbdev, ++ &katom[idx]->start_timestamp); ++ ++ /* Inform platform at start/finish of atom */ ++ kbasep_platform_event_atom_submit(katom[idx]); ++ } else { ++ if (katom[idx]->core_req & BASE_JD_REQ_PERMON) ++ kbase_pm_release_gpu_cycle_counter_nolock(kbdev); ++ ++ break; ++ } + + /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ ++ fallthrough; + case KBASE_ATOM_GPU_RB_SUBMITTED: -+ /* Atom submitted to HW, nothing else to do */ + break; + + case KBASE_ATOM_GPU_RB_RETURN_TO_JS: + /* Only return if head atom or previous atom + * already removed - as atoms must be returned -+ * in order */ ++ * in order ++ */ + if (idx == 0 || katom[0]->gpu_rb_state == + KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { + kbase_gpu_dequeue_atom(kbdev, js, NULL); @@ -146388,17 +149840,62 @@ index 000000000000..afaaef27883d + struct kbase_jd_atom *katom) +{ + lockdep_assert_held(&kbdev->hwaccess_lock); -+ dev_dbg(kbdev->dev, "Backend running atom %p\n", (void *)katom); ++ dev_dbg(kbdev->dev, "Backend running atom %pK\n", (void *)katom); + + kbase_gpu_enqueue_atom(kbdev, katom); + kbase_backend_slot_update(kbdev); +} + -+#define HAS_DEP(katom) (katom->pre_dep || katom->atom_flags & \ -+ (KBASE_KATOM_FLAG_X_DEP_BLOCKED | KBASE_KATOM_FLAG_FAIL_BLOCKER)) ++/** ++ * kbase_rb_atom_might_depend - determine if one atom in the slot ringbuffer ++ * might depend on another from the same kctx ++ * @katom_a: dependee atom ++ * @katom_b: atom to query ++ * ++ * This can be used on atoms that belong to different slot ringbuffers ++ * ++ * Return: true if @katom_b might depend on @katom_a, false if it cannot depend. ++ */ ++static inline bool ++kbase_rb_atom_might_depend(const struct kbase_jd_atom *katom_a, ++ const struct kbase_jd_atom *katom_b) ++{ ++ if (katom_a->kctx != katom_b->kctx) ++ return false; ++ return (katom_b->pre_dep || ++ (katom_b->atom_flags & (KBASE_KATOM_FLAG_X_DEP_BLOCKED | ++ KBASE_KATOM_FLAG_FAIL_BLOCKER))); ++} + -+bool kbase_gpu_irq_evict(struct kbase_device *kbdev, int js, -+ u32 completion_code) ++/** ++ * kbase_gpu_irq_evict - evict a slot's JSn_HEAD_NEXT atom from the HW if it is ++ * related to a failed JSn_HEAD atom ++ * @kbdev: kbase device ++ * @js: job slot to check ++ * @completion_code: completion code of the failed atom ++ * ++ * Note: 'STOPPED' atoms are considered 'failed', as they are in the HW, but ++ * unlike other failure codes we _can_ re-run them. ++ * ++ * This forms step 1 in a 2-step process of removing any related atoms from a ++ * slot's JSn_HEAD_NEXT (ringbuffer index 1), should there have ++ * been a 'failure' on an atom in JSn_HEAD (ringbuffer index 0). ++ * ++ * This step only removes the atoms from the HW, and marks them as ++ * (potentially) ready to run again. ++ * ++ * Step 2 is on marking the JSn_HEAD atom as complete ++ * (kbase_gpu_complete_hw()), to dequeue said atoms and return them to the JS ++ * as appropriate, or re-submit them. ++ * ++ * Hence, this function must evict at a minimum the atoms related to the atom ++ * in JSn_HEAD that kbase_gpu_complete_hw() will also dequeue. It is acceptable ++ * if this function evicts more atoms than kbase_gpu_complete_hw() dequeues, as ++ * the next kbase_backend_slot_update() will resubmit any remaining. ++ * ++ * Return: true if an atom was evicted, false otherwise. ++ */ ++bool kbase_gpu_irq_evict(struct kbase_device *kbdev, unsigned int js, u32 completion_code) +{ + struct kbase_jd_atom *katom; + struct kbase_jd_atom *next_katom; @@ -146406,16 +149903,18 @@ index 000000000000..afaaef27883d + lockdep_assert_held(&kbdev->hwaccess_lock); + + katom = kbase_gpu_inspect(kbdev, js, 0); ++ if (!katom) { ++ dev_err(kbdev->dev, "Can't get a katom from js(%u)\n", js); ++ return false; ++ } + next_katom = kbase_gpu_inspect(kbdev, js, 1); + -+ if (next_katom && katom->kctx == next_katom->kctx && -+ next_katom->gpu_rb_state == KBASE_ATOM_GPU_RB_SUBMITTED && -+ (HAS_DEP(next_katom) || next_katom->sched_priority == -+ katom->sched_priority) && -+ (kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_LO)) -+ != 0 || -+ kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_HI)) -+ != 0)) { ++ if (next_katom && ++ next_katom->gpu_rb_state == KBASE_ATOM_GPU_RB_SUBMITTED && ++ (kbase_rb_atom_might_depend(katom, next_katom) || ++ kbase_js_atom_runs_before(kbdev, katom, next_katom, 0u)) && ++ (kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_LO)) != 0 || ++ kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_HI)) != 0)) { + kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_COMMAND_NEXT), + JS_COMMAND_NOP); + next_katom->gpu_rb_state = KBASE_ATOM_GPU_RB_READY; @@ -146434,22 +149933,59 @@ index 000000000000..afaaef27883d + if (next_katom->core_req & BASE_JD_REQ_PERMON) + kbase_pm_release_gpu_cycle_counter_nolock(kbdev); + ++ /* On evicting the next_katom, the last submission kctx on the ++ * given job slot then reverts back to the one that owns katom. ++ * The aim is to enable the next submission that can determine ++ * if the read only shader core L1 cache should be invalidated. ++ */ ++ kbdev->hwaccess.backend.slot_rb[js].last_kctx_tagged = ++ SLOT_RB_TAG_KCTX(katom->kctx); ++ + return true; + } + + return false; +} + -+void kbase_gpu_complete_hw(struct kbase_device *kbdev, int js, -+ u32 completion_code, -+ u64 job_tail, -+ ktime_t *end_timestamp) ++/** ++ * kbase_gpu_complete_hw - complete the atom in a slot's JSn_HEAD ++ * @kbdev: kbase device ++ * @js: job slot to check ++ * @completion_code: completion code of the completed atom ++ * @job_tail: value read from JSn_TAIL, for STOPPED atoms ++ * @end_timestamp: pointer to approximate ktime value when the katom completed ++ * ++ * Among other operations, this also executes step 2 of a 2-step process of ++ * removing any related atoms from a slot's JSn_HEAD_NEXT (ringbuffer index 1), ++ * should there have been a 'failure' on an atom in JSn_HEAD (ringbuffer index ++ * 0). The first step is done in kbase_gpu_irq_evict(). ++ * ++ * Note: 'STOPPED' atoms are considered 'failed', as they are in the HW, but ++ * unlike other failure codes we _can_ re-run them. ++ * ++ * When the JSn_HEAD atom is considered to be 'failed', then this will dequeue ++ * and return to the JS some (usually all) of the atoms evicted from the HW ++ * during the kbase_gpu_irq_evict() for that JSn_HEAD atom. If it dequeues an ++ * atom, that atom must not have been running or must already be evicted, as ++ * otherwise we would be in the incorrect state of having an atom both running ++ * on the HW and returned to the JS. ++ */ ++ ++void kbase_gpu_complete_hw(struct kbase_device *kbdev, unsigned int js, u32 completion_code, ++ u64 job_tail, ktime_t *end_timestamp) +{ + struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, 0); -+ struct kbase_context *kctx = katom->kctx; ++ struct kbase_context *kctx = NULL; ++ ++ if (unlikely(!katom)) { ++ dev_err(kbdev->dev, "Can't get a katom from js(%d)\n", js); ++ return; ++ } ++ ++ kctx = katom->kctx; + + dev_dbg(kbdev->dev, -+ "Atom %p completed on hw with code 0x%x and job_tail 0x%llx (s:%d)\n", ++ "Atom %pK completed on hw with code 0x%x and job_tail 0x%llx (s:%d)\n", + (void *)katom, completion_code, job_tail, js); + + lockdep_assert_held(&kbdev->hwaccess_lock); @@ -146473,7 +150009,8 @@ index 000000000000..afaaef27883d + * BASE_JD_REQ_SKIP_CACHE_END is set, the GPU cache is not + * flushed. To prevent future evictions causing possible memory + * corruption we need to flush the cache manually before any -+ * affected memory gets reused. */ ++ * affected memory gets reused. ++ */ + katom->need_cache_flush_cores_retained = true; + } + @@ -146489,9 +150026,8 @@ index 000000000000..afaaef27883d + * registers by kbase_gpu_soft_hard_stop_slot(), to ensure that + * the atoms on this slot are returned in the correct order. + */ -+ if (next_katom && katom->kctx == next_katom->kctx && -+ next_katom->sched_priority == -+ katom->sched_priority) { ++ if (next_katom && ++ kbase_js_atom_runs_before(kbdev, katom, next_katom, 0u)) { + WARN_ON(next_katom->gpu_rb_state == + KBASE_ATOM_GPU_RB_SUBMITTED); + kbase_gpu_dequeue_atom(kbdev, js, end_timestamp); @@ -146499,14 +150035,16 @@ index 000000000000..afaaef27883d + } + } else if (completion_code != BASE_JD_EVENT_DONE) { + struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ int i; ++ unsigned int i; + -+ if (!kbase_ctx_flag(katom->kctx, KCTX_DYING)) ++ if (!kbase_ctx_flag(katom->kctx, KCTX_DYING)) { + dev_warn(kbdev->dev, "error detected from slot %d, job status 0x%08x (%s)", + js, completion_code, + kbase_gpu_exception_name( + completion_code)); + ++ } ++ +#if KBASE_KTRACE_DUMP_ON_JOB_SLOT_ERROR != 0 + KBASE_KTRACE_DUMP(kbdev); +#endif @@ -146524,18 +150062,17 @@ index 000000000000..afaaef27883d + struct kbase_jd_atom *katom_idx1 = + kbase_gpu_inspect(kbdev, i, 1); + -+ if (katom_idx0 && katom_idx0->kctx == katom->kctx && -+ HAS_DEP(katom_idx0) && -+ katom_idx0->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_SUBMITTED) { ++ if (katom_idx0 && ++ kbase_rb_atom_might_depend(katom, katom_idx0) && ++ katom_idx0->gpu_rb_state != ++ KBASE_ATOM_GPU_RB_SUBMITTED) { + /* Dequeue katom_idx0 from ringbuffer */ + kbase_gpu_dequeue_atom(kbdev, i, end_timestamp); + -+ if (katom_idx1 && -+ katom_idx1->kctx == katom->kctx -+ && HAS_DEP(katom_idx1) && -+ katom_idx0->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_SUBMITTED) { ++ if (katom_idx1 && kbase_rb_atom_might_depend( ++ katom, katom_idx1) && ++ katom_idx0->gpu_rb_state != ++ KBASE_ATOM_GPU_RB_SUBMITTED) { + /* Dequeue katom_idx1 from ringbuffer */ + kbase_gpu_dequeue_atom(kbdev, i, + end_timestamp); @@ -146548,13 +150085,13 @@ index 000000000000..afaaef27883d + katom_idx0->event_code = BASE_JD_EVENT_STOPPED; + kbase_jm_return_atom_to_js(kbdev, katom_idx0); + -+ } else if (katom_idx1 && -+ katom_idx1->kctx == katom->kctx && -+ HAS_DEP(katom_idx1) && -+ katom_idx1->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_SUBMITTED) { ++ } else if (katom_idx1 && kbase_rb_atom_might_depend( ++ katom, katom_idx1) && ++ katom_idx1->gpu_rb_state != ++ KBASE_ATOM_GPU_RB_SUBMITTED) { + /* Can not dequeue this atom yet - will be -+ * dequeued when atom at idx0 completes */ ++ * dequeued when atom at idx0 completes ++ */ + katom_idx1->event_code = BASE_JD_EVENT_STOPPED; + kbase_gpu_mark_atom_for_return(kbdev, + katom_idx1); @@ -146567,7 +150104,7 @@ index 000000000000..afaaef27883d + if (job_tail != 0 && job_tail != katom->jc) { + /* Some of the job has been executed */ + dev_dbg(kbdev->dev, -+ "Update job chain address of atom %p to resume from 0x%llx\n", ++ "Update job chain address of atom %pK to resume from 0x%llx\n", + (void *)katom, job_tail); + + katom->jc = job_tail; @@ -146587,7 +150124,7 @@ index 000000000000..afaaef27883d + * - Schedule out the parent context if necessary, and schedule a new + * one in. + */ -+#ifdef CONFIG_GPU_TRACEPOINTS ++#if IS_ENABLED(CONFIG_GPU_TRACEPOINTS) + { + /* The atom in the HEAD */ + struct kbase_jd_atom *next_katom = kbase_gpu_inspect(kbdev, js, @@ -146603,17 +150140,12 @@ index 000000000000..afaaef27883d + ktime_to_ns(*end_timestamp), + (u32)next_katom->kctx->id, 0, + next_katom->work_id); -+ kbdev->hwaccess.backend.slot_rb[js].last_context = -+ next_katom->kctx; + } else { + char js_string[16]; + -+ trace_gpu_sched_switch(kbasep_make_job_slot_string(js, -+ js_string, -+ sizeof(js_string)), -+ ktime_to_ns(ktime_get()), 0, 0, -+ 0); -+ kbdev->hwaccess.backend.slot_rb[js].last_context = 0; ++ trace_gpu_sched_switch(kbasep_make_job_slot_string(js, js_string, ++ sizeof(js_string)), ++ ktime_to_ns(ktime_get_raw()), 0, 0, 0); + } + } +#endif @@ -146628,7 +150160,7 @@ index 000000000000..afaaef27883d + + if (katom) { + dev_dbg(kbdev->dev, -+ "Cross-slot dependency %p has become runnable.\n", ++ "Cross-slot dependency %pK has become runnable.\n", + (void *)katom); + + /* Check if there are lower priority jobs to soft stop */ @@ -146641,13 +150173,14 @@ index 000000000000..afaaef27883d + kbase_pm_update_state(kbdev); + + /* Job completion may have unblocked other atoms. Try to update all job -+ * slots */ ++ * slots ++ */ + kbase_backend_slot_update(kbdev); +} + +void kbase_backend_reset(struct kbase_device *kbdev, ktime_t *end_timestamp) +{ -+ int js; ++ unsigned int js; + + lockdep_assert_held(&kbdev->hwaccess_lock); + @@ -146668,14 +150201,14 @@ index 000000000000..afaaef27883d + if (katom->protected_state.exit == + KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT) { + /* protected mode sanity checks */ -+ KBASE_DEBUG_ASSERT_MSG( -+ kbase_jd_katom_is_protected(katom) == kbase_gpu_in_protected_mode(kbdev), -+ "Protected mode of atom (%d) doesn't match protected mode of GPU (%d)", -+ kbase_jd_katom_is_protected(katom), kbase_gpu_in_protected_mode(kbdev)); -+ KBASE_DEBUG_ASSERT_MSG( -+ (kbase_jd_katom_is_protected(katom) && js == 0) || -+ !kbase_jd_katom_is_protected(katom), -+ "Protected atom on JS%d not supported", js); ++ WARN(kbase_jd_katom_is_protected(katom) != ++ kbase_gpu_in_protected_mode(kbdev), ++ "Protected mode of atom (%d) doesn't match protected mode of GPU (%d)", ++ kbase_jd_katom_is_protected(katom), ++ kbase_gpu_in_protected_mode(kbdev)); ++ WARN(!(kbase_jd_katom_is_protected(katom) && js == 0) && ++ kbase_jd_katom_is_protected(katom), ++ "Protected atom on JS%u not supported", js); + } + if ((katom->gpu_rb_state < KBASE_ATOM_GPU_RB_SUBMITTED) && + !kbase_ctx_flag(katom->kctx, KCTX_DYING)) @@ -146692,7 +150225,8 @@ index 000000000000..afaaef27883d + katom->protected_state.exit = KBASE_ATOM_EXIT_PROTECTED_CHECK; + /* As the atom was not removed, increment the + * index so that we read the correct atom in the -+ * next iteration. */ ++ * next iteration. ++ */ + atom_idx++; + continue; + } @@ -146705,6 +150239,9 @@ index 000000000000..afaaef27883d + katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; + kbase_jm_complete(kbdev, katom, end_timestamp); + } ++ ++ /* Clear the slot's last katom submission kctx on reset */ ++ kbdev->hwaccess.backend.slot_rb[js].last_kctx_tagged = SLOT_RB_NULL_TAG_VAL; + } + + /* Re-enable GPU hardware counters if we're resetting from protected @@ -146722,17 +150259,61 @@ index 000000000000..afaaef27883d + kbase_pm_protected_override_disable(kbdev); +} + -+static inline void kbase_gpu_stop_atom(struct kbase_device *kbdev, -+ int js, -+ struct kbase_jd_atom *katom, -+ u32 action) ++/** ++ * should_stop_next_atom - given a soft/hard stop action, determine if the next ++ * atom on a slot should be stopped ++ * @kbdev: kbase devices ++ * @head_katom: atom currently in the JSn_HEAD ++ * @next_katom: atom currently in the JSn_HEAD_NEXT ++ * @action: JS_COMMAND_<...> action for soft/hard-stop ++ * ++ * This is used in cases where @head_katom is the target of the soft/hard-stop. ++ * It only makes sense to call this when @head_katom and @next_katom are from ++ * the same slot. ++ * ++ * Return: true if @next_katom should also be stopped with the given action, ++ * false otherwise ++ */ ++static bool should_stop_next_atom(struct kbase_device *kbdev, ++ const struct kbase_jd_atom *head_katom, ++ const struct kbase_jd_atom *next_katom, ++ u32 action) ++{ ++ bool ret = false; ++ u32 hw_action = action & JS_COMMAND_MASK; ++ ++ switch (hw_action) { ++ case JS_COMMAND_SOFT_STOP: ++ ret = kbase_js_atom_runs_before(kbdev, head_katom, next_katom, ++ 0u); ++ break; ++ case JS_COMMAND_HARD_STOP: ++ /* Unlike soft-stop, a hard-stop targeting a particular atom ++ * should not cause atoms from unrelated contexts to be ++ * removed ++ */ ++ ret = (head_katom->kctx == next_katom->kctx); ++ break; ++ default: ++ /* Other stop actions are possible, but the driver should not ++ * be generating them at this point in the call chain ++ */ ++ WARN(1, "Unexpected stop action: 0x%.8x", hw_action); ++ break; ++ } ++ return ret; ++} ++ ++static inline void kbase_gpu_stop_atom(struct kbase_device *kbdev, unsigned int js, ++ struct kbase_jd_atom *katom, u32 action) +{ ++ struct kbase_context *kctx = katom->kctx; + u32 hw_action = action & JS_COMMAND_MASK; + + kbase_job_check_enter_disjoint(kbdev, action, katom->core_req, katom); + kbasep_job_slot_soft_or_hard_stop_do_action(kbdev, js, hw_action, + katom->core_req, katom); -+ katom->kctx->blocked_js[js][katom->sched_priority] = true; ++ kbase_jsctx_slot_prio_blocked_set(kctx, js, katom->sched_priority); +} + +static inline void kbase_gpu_remove_atom(struct kbase_device *kbdev, @@ -146740,11 +150321,14 @@ index 000000000000..afaaef27883d + u32 action, + bool disjoint) +{ ++ struct kbase_context *kctx = katom->kctx; ++ + lockdep_assert_held(&kbdev->hwaccess_lock); + + katom->event_code = BASE_JD_EVENT_REMOVED_FROM_NEXT; + kbase_gpu_mark_atom_for_return(kbdev, katom); -+ katom->kctx->blocked_js[katom->slot_nr][katom->sched_priority] = true; ++ kbase_jsctx_slot_prio_blocked_set(kctx, katom->slot_nr, ++ katom->sched_priority); + + if (disjoint) + kbase_job_check_enter_disjoint(kbdev, action, katom->core_req, @@ -146765,14 +150349,13 @@ index 000000000000..afaaef27883d + return -1; +} + -+bool kbase_backend_soft_hard_stop_slot(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js, -+ struct kbase_jd_atom *katom, -+ u32 action) ++bool kbase_backend_soft_hard_stop_slot(struct kbase_device *kbdev, struct kbase_context *kctx, ++ unsigned int js, struct kbase_jd_atom *katom, u32 action) +{ + struct kbase_jd_atom *katom_idx0; ++ struct kbase_context *kctx_idx0 = NULL; + struct kbase_jd_atom *katom_idx1; ++ struct kbase_context *kctx_idx1 = NULL; + + bool katom_idx0_valid, katom_idx1_valid; + @@ -146786,30 +150369,32 @@ index 000000000000..afaaef27883d + katom_idx0 = kbase_gpu_inspect(kbdev, js, 0); + katom_idx1 = kbase_gpu_inspect(kbdev, js, 1); + -+ if (katom_idx0) ++ if (katom_idx0) { ++ kctx_idx0 = katom_idx0->kctx; + prio_idx0 = katom_idx0->sched_priority; -+ if (katom_idx1) ++ } ++ if (katom_idx1) { ++ kctx_idx1 = katom_idx1->kctx; + prio_idx1 = katom_idx1->sched_priority; ++ } + + if (katom) { + katom_idx0_valid = (katom_idx0 == katom); -+ /* If idx0 is to be removed and idx1 is on the same context, -+ * then idx1 must also be removed otherwise the atoms might be -+ * returned out of order */ + if (katom_idx1) -+ katom_idx1_valid = (katom_idx1 == katom) || -+ (katom_idx0_valid && -+ (katom_idx0->kctx == -+ katom_idx1->kctx)); ++ katom_idx1_valid = (katom_idx1 == katom); + else + katom_idx1_valid = false; + } else { -+ katom_idx0_valid = (katom_idx0 && -+ (!kctx || katom_idx0->kctx == kctx)); -+ katom_idx1_valid = (katom_idx1 && -+ (!kctx || katom_idx1->kctx == kctx) && -+ prio_idx0 == prio_idx1); ++ katom_idx0_valid = (katom_idx0 && (!kctx || kctx_idx0 == kctx)); ++ katom_idx1_valid = (katom_idx1 && (!kctx || kctx_idx1 == kctx)); + } ++ /* If there's an atom in JSn_HEAD_NEXT that we haven't already decided ++ * to stop, but we're stopping the JSn_HEAD atom, see if they are ++ * related/ordered in some way that would require the same stop action ++ */ ++ if (!katom_idx1_valid && katom_idx0_valid && katom_idx1) ++ katom_idx1_valid = should_stop_next_atom(kbdev, katom_idx0, ++ katom_idx1, action); + + if (katom_idx0_valid) + stop_x_dep_idx0 = should_stop_x_dep_slot(katom_idx0); @@ -146825,14 +150410,15 @@ index 000000000000..afaaef27883d + katom_idx1->event_code = + BASE_JD_EVENT_REMOVED_FROM_NEXT; + kbase_jm_return_atom_to_js(kbdev, katom_idx1); -+ katom_idx1->kctx->blocked_js[js][prio_idx1] = -+ true; ++ kbase_jsctx_slot_prio_blocked_set(kctx_idx1, js, ++ prio_idx1); + } + + katom_idx0->event_code = + BASE_JD_EVENT_REMOVED_FROM_NEXT; + kbase_jm_return_atom_to_js(kbdev, katom_idx0); -+ katom_idx0->kctx->blocked_js[js][prio_idx0] = true; ++ kbase_jsctx_slot_prio_blocked_set(kctx_idx0, js, ++ prio_idx0); + } else { + /* katom_idx0 is on GPU */ + if (katom_idx1_valid && katom_idx1->gpu_rb_state == @@ -146842,7 +150428,8 @@ index 000000000000..afaaef27883d + if (kbase_reg_read(kbdev, JOB_SLOT_REG(js, + JS_COMMAND_NEXT)) == 0) { + /* idx0 has already completed - stop -+ * idx1 if needed*/ ++ * idx1 if needed ++ */ + if (katom_idx1_valid) { + kbase_gpu_stop_atom(kbdev, js, + katom_idx1, @@ -146851,7 +150438,8 @@ index 000000000000..afaaef27883d + } + } else { + /* idx1 is in NEXT registers - attempt -+ * to remove */ ++ * to remove ++ */ + kbase_reg_write(kbdev, + JOB_SLOT_REG(js, + JS_COMMAND_NEXT), @@ -146866,10 +150454,16 @@ index 000000000000..afaaef27883d + JS_HEAD_NEXT_HI)) + != 0) { + /* idx1 removed successfully, -+ * will be handled in IRQ */ ++ * will be handled in IRQ ++ */ + kbase_gpu_remove_atom(kbdev, + katom_idx1, + action, true); ++ /* Revert the last_context. */ ++ kbdev->hwaccess.backend.slot_rb[js] ++ .last_kctx_tagged = ++ SLOT_RB_TAG_KCTX(katom_idx0->kctx); ++ + stop_x_dep_idx1 = + should_stop_x_dep_slot(katom_idx1); + @@ -146880,7 +150474,8 @@ index 000000000000..afaaef27883d + ret = true; + } else if (katom_idx1_valid) { + /* idx0 has already completed, -+ * stop idx1 if needed */ ++ * stop idx1 if needed ++ */ + kbase_gpu_stop_atom(kbdev, js, + katom_idx1, + action); @@ -146899,7 +150494,8 @@ index 000000000000..afaaef27883d + * flow was also interrupted, and this function + * might not enter disjoint state e.g. if we + * don't actually do a hard stop on the head -+ * atom */ ++ * atom ++ */ + kbase_gpu_stop_atom(kbdev, js, katom_idx0, + action); + ret = true; @@ -146927,7 +150523,8 @@ index 000000000000..afaaef27883d + ret = true; + } else { + /* idx1 is in NEXT registers - attempt to -+ * remove */ ++ * remove ++ */ + kbase_reg_write(kbdev, JOB_SLOT_REG(js, + JS_COMMAND_NEXT), + JS_COMMAND_NOP); @@ -146937,13 +150534,19 @@ index 000000000000..afaaef27883d + kbase_reg_read(kbdev, JOB_SLOT_REG(js, + JS_HEAD_NEXT_HI)) != 0) { + /* idx1 removed successfully, will be -+ * handled in IRQ once idx0 completes */ ++ * handled in IRQ once idx0 completes ++ */ + kbase_gpu_remove_atom(kbdev, katom_idx1, + action, + false); ++ /* Revert the last_context, or mark as purged */ ++ kbdev->hwaccess.backend.slot_rb[js].last_kctx_tagged = ++ kctx_idx0 ? SLOT_RB_TAG_KCTX(katom_idx0->kctx) : ++ SLOT_RB_TAG_PURGED; + } else { + /* idx0 has already completed - stop -+ * idx1 */ ++ * idx1 ++ */ + kbase_gpu_stop_atom(kbdev, js, + katom_idx1, + action); @@ -146969,7 +150572,8 @@ index 000000000000..afaaef27883d + struct kbase_jd_atom *katom) +{ + if (katom->need_cache_flush_cores_retained) { -+ kbase_gpu_start_cache_clean(kbdev); ++ kbase_gpu_start_cache_clean(kbdev, ++ GPU_COMMAND_CACHE_CLN_INV_FULL); + kbase_gpu_wait_cache_clean(kbdev); + + katom->need_cache_flush_cores_retained = false; @@ -146990,22 +150594,20 @@ index 000000000000..afaaef27883d + base_jd_core_req core_req) +{ + if (!kbdev->pm.active_count) { -+ mutex_lock(&kbdev->js_data.runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); ++ kbase_pm_lock(kbdev); + kbase_pm_update_active(kbdev); -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&kbdev->js_data.runpool_mutex); ++ kbase_pm_unlock(kbdev); + } +} + +void kbase_gpu_dump_slots(struct kbase_device *kbdev) +{ + unsigned long flags; -+ int js; ++ unsigned int js; + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ dev_info(kbdev->dev, "kbase_gpu_dump_slots:\n"); ++ dev_info(kbdev->dev, "%s:\n", __func__); + + for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { + int idx; @@ -147016,31 +150618,61 @@ index 000000000000..afaaef27883d + idx); + + if (katom) -+ dev_info(kbdev->dev, -+ " js%d idx%d : katom=%p gpu_rb_state=%d\n", -+ js, idx, katom, katom->gpu_rb_state); ++ dev_info(kbdev->dev, " js%u idx%d : katom=%pK gpu_rb_state=%d\n", ++ js, idx, katom, katom->gpu_rb_state); + else -+ dev_info(kbdev->dev, " js%d idx%d : empty\n", -+ js, idx); ++ dev_info(kbdev->dev, " js%u idx%d : empty\n", js, idx); + } + } + + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} ++ ++void kbase_backend_slot_kctx_purge_locked(struct kbase_device *kbdev, struct kbase_context *kctx) ++{ ++ unsigned int js; ++ bool tracked = false; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { ++ u64 tagged_kctx = kbdev->hwaccess.backend.slot_rb[js].last_kctx_tagged; ++ ++ if (tagged_kctx == SLOT_RB_TAG_KCTX(kctx)) { ++ /* Marking the slot kctx tracking field is purged */ ++ kbdev->hwaccess.backend.slot_rb[js].last_kctx_tagged = SLOT_RB_TAG_PURGED; ++ tracked = true; ++ } ++ } ++ ++ if (tracked) { ++ /* The context had run some jobs before the purge, other slots ++ * in SLOT_RB_NULL_TAG_VAL condition needs to be marked as ++ * purged as well. ++ */ ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { ++ if (kbdev->hwaccess.backend.slot_rb[js].last_kctx_tagged == ++ SLOT_RB_NULL_TAG_VAL) ++ kbdev->hwaccess.backend.slot_rb[js].last_kctx_tagged = ++ SLOT_RB_TAG_PURGED; ++ } ++ } ++} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h new file mode 100755 -index 000000000000..c3b9f2d85536 +index 000000000..32be0bf44 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h -@@ -0,0 +1,83 @@ +@@ -0,0 +1,77 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -147051,11 +150683,8 @@ index 000000000000..c3b9f2d85536 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ +/* + * Register-based HW access backend specific APIs + */ @@ -147077,8 +150706,7 @@ index 000000000000..c3b9f2d85536 + * + * Return: true if job evicted from NEXT registers, false otherwise + */ -+bool kbase_gpu_irq_evict(struct kbase_device *kbdev, int js, -+ u32 completion_code); ++bool kbase_gpu_irq_evict(struct kbase_device *kbdev, unsigned int js, u32 completion_code); + +/** + * kbase_gpu_complete_hw - Complete an atom on job slot js @@ -147090,10 +150718,8 @@ index 000000000000..c3b9f2d85536 + * completed + * @end_timestamp: Time of completion + */ -+void kbase_gpu_complete_hw(struct kbase_device *kbdev, int js, -+ u32 completion_code, -+ u64 job_tail, -+ ktime_t *end_timestamp); ++void kbase_gpu_complete_hw(struct kbase_device *kbdev, unsigned int js, u32 completion_code, ++ u64 job_tail, ktime_t *end_timestamp); + +/** + * kbase_gpu_inspect - Inspect the contents of the HW access ringbuffer @@ -147105,8 +150731,7 @@ index 000000000000..c3b9f2d85536 + * Return: The atom at that position in the ringbuffer + * or NULL if no atom present + */ -+struct kbase_jd_atom *kbase_gpu_inspect(struct kbase_device *kbdev, int js, -+ int idx); ++struct kbase_jd_atom *kbase_gpu_inspect(struct kbase_device *kbdev, unsigned int js, int idx); + +/** + * kbase_gpu_dump_slots - Print the contents of the slot ringbuffers @@ -147118,18 +150743,19 @@ index 000000000000..c3b9f2d85536 +#endif /* _KBASE_HWACCESS_GPU_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c new file mode 100755 -index 000000000000..8187e73767be +index 000000000..cbc88f91a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c -@@ -0,0 +1,365 @@ +@@ -0,0 +1,377 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -147140,11 +150766,8 @@ index 000000000000..8187e73767be + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ +/* + * Register-based HW access backend specific job scheduler APIs + */ @@ -147172,7 +150795,8 @@ index 000000000000..8187e73767be + + /* nr_contexts_pullable is updated with the runpool_mutex. However, the + * locking in the caller gives us a barrier that ensures -+ * nr_contexts_pullable is up-to-date for reading */ ++ * nr_contexts_pullable is up-to-date for reading ++ */ + nr_running_ctxs = atomic_read(&kbdev->js_data.nr_contexts_runnable); + +#ifdef CONFIG_MALI_BIFROST_DEBUG @@ -147216,7 +150840,7 @@ index 000000000000..8187e73767be + struct kbase_device *kbdev; + struct kbasep_js_device_data *js_devdata; + struct kbase_backend_data *backend; -+ int s; ++ unsigned int s; + bool reset_needed = false; + + KBASE_DEBUG_ASSERT(timer != NULL); @@ -147238,7 +150862,8 @@ index 000000000000..8187e73767be + + if (atom != NULL) { + /* The current version of the model doesn't support -+ * Soft-Stop */ ++ * Soft-Stop ++ */ + if (!kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_5736)) { + u32 ticks = atom->ticks++; + @@ -147255,10 +150880,15 @@ index 000000000000..8187e73767be + } else { + soft_stop_ticks = + js_devdata->soft_stop_ticks; ++ if (kbase_is_quick_reset_enabled(kbdev)) { ++ hard_stop_ticks = 2; ++ gpu_reset_ticks = 3; ++ } else { + hard_stop_ticks = + js_devdata->hard_stop_ticks_ss; + gpu_reset_ticks = + js_devdata->gpu_reset_ticks_ss; ++ } + } + + /* If timeouts have been changed then ensure @@ -147266,7 +150896,8 @@ index 000000000000..8187e73767be + * new soft_stop timeout. This ensures that + * atoms do not miss any of the timeouts due to + * races between this worker and the thread -+ * changing the timeouts. */ ++ * changing the timeouts. ++ */ + if (backend->timeouts_updated && + ticks > soft_stop_ticks) + ticks = atom->ticks = soft_stop_ticks; @@ -147296,10 +150927,11 @@ index 000000000000..8187e73767be + * + * Similarly, if it's about to be + * decreased, the last job from another -+ * context has already finished, so it's -+ * not too bad that we observe the older -+ * value and register a disjoint event -+ * when we try soft-stopping */ ++ * context has already finished, so ++ * it's not too bad that we observe the ++ * older value and register a disjoint ++ * event when we try soft-stopping ++ */ + if (js_devdata->nr_user_contexts_running + >= disjoint_threshold) + softstop_flags |= @@ -147318,9 +150950,10 @@ index 000000000000..8187e73767be + int ms = + js_devdata->scheduling_period_ns + / 1000000u; -+ dev_warn(kbdev->dev, "JS: Job Hard-Stopped (took more than %lu ticks at %lu ms/tick)", -+ (unsigned long)ticks, -+ (unsigned long)ms); ++ if (!kbase_is_quick_reset_enabled(kbdev)) ++ dev_warn(kbdev->dev, "JS: Job Hard-Stopped (took more than %lu ticks at %lu ms/tick)", ++ (unsigned long)ticks, ++ (unsigned long)ms); + kbase_job_slot_hardstop(atom->kctx, s, + atom); +#endif @@ -147377,9 +151010,13 @@ index 000000000000..8187e73767be + } + } + if (reset_needed) { -+ dev_err(kbdev->dev, "JS: Job has been on the GPU for too long (JS_RESET_TICKS_SS/DUMPING timeout hit). Issueing GPU soft-reset to resolve."); ++ if (kbase_is_quick_reset_enabled(kbdev)) ++ dev_err(kbdev->dev, "quick reset"); ++ else { ++ dev_err(kbdev->dev, "JS: Job has been on the GPU for too long (JS_RESET_TICKS_SS/DUMPING timeout hit). Issuing GPU soft-reset to resolve."); ++ } + -+ if (kbase_prepare_to_reset_gpu_locked(kbdev)) ++ if (kbase_prepare_to_reset_gpu_locked(kbdev, RESET_FLAGS_NONE)) + kbase_reset_gpu_locked(kbdev); + } + /* the timer is re-issued if there is contexts in the run-pool */ @@ -147411,11 +151048,12 @@ index 000000000000..8187e73767be + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + backend->timer_running = false; + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ /* From now on, return value of timer_callback_should_run() will -+ * also cause the timer to not requeue itself. Its return value -+ * cannot change, because it depends on variables updated with -+ * the runpool_mutex held, which the caller of this must also -+ * hold */ ++ /* From now on, return value of timer_callback_should_run() ++ * will also cause the timer to not requeue itself. Its return ++ * value cannot change, because it depends on variables updated ++ * with the runpool_mutex held, which the caller of this must ++ * also hold ++ */ + hrtimer_cancel(&backend->scheduling_timer); + } + @@ -147486,21 +151124,21 @@ index 000000000000..8187e73767be + + backend->timeouts_updated = true; +} -+ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h new file mode 100755 -index 000000000000..6576e55d2e39 +index 000000000..4f7c371a1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h -@@ -0,0 +1,74 @@ +@@ -0,0 +1,72 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2015, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -147511,11 +151149,8 @@ index 000000000000..6576e55d2e39 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ +/* + * Register-based HW access backend specific job scheduler APIs + */ @@ -147559,7 +151194,7 @@ index 000000000000..6576e55d2e39 + * scheduling timer + * @kbdev: Device pointer + * -+ * This function should be called on resume. Note that is is not guaranteed to ++ * This function should be called on resume. Note that is not guaranteed to + * re-start the timer, only evalute whether it should be re-started. + * + * Caller must hold runpool_mutex. @@ -147569,19 +151204,19 @@ index 000000000000..6576e55d2e39 +#endif /* _KBASE_JS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c new file mode 100755 -index 000000000000..d5526caa5899 +index 000000000..9ce50758c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c -@@ -0,0 +1,133 @@ -+// SPDX-License-Identifier: GPL-2.0 +@@ -0,0 +1,131 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -147592,8 +151227,6 @@ index 000000000000..d5526caa5899 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -147603,7 +151236,7 @@ index 000000000000..d5526caa5899 +#include "mali_kbase_l2_mmu_config.h" + +/** -+ * struct l2_mmu_config_limit_region ++ * struct l2_mmu_config_limit_region - L2 MMU limit field + * + * @value: The default value to load into the L2_MMU_CONFIG register + * @mask: The shifted mask of the field in the L2_MMU_CONFIG register @@ -147616,7 +151249,7 @@ index 000000000000..d5526caa5899 +}; + +/** -+ * struct l2_mmu_config_limit ++ * struct l2_mmu_config_limit - L2 MMU read and write limit + * + * @product_model: The GPU for which this entry applies + * @read: Values for the read limit field @@ -147698,9 +151331,9 @@ index 000000000000..d5526caa5899 + + if (kbdev->system_coherency == COHERENCY_ACE) { + /* Allow memory configuration disparity to be ignored, -+ * we optimize the use of shared memory and thus we -+ * expect some disparity in the memory configuration. -+ */ ++ * we optimize the use of shared memory and thus we ++ * expect some disparity in the memory configuration. ++ */ + kbdev->hw_quirks_mmu |= L2_MMU_CONFIG_ALLOW_SNOOP_DISPARITY; + } + @@ -147708,18 +151341,19 @@ index 000000000000..d5526caa5899 +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h new file mode 100755 -index 000000000000..0c779ac80d27 +index 000000000..07014ad36 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h -@@ -0,0 +1,55 @@ +@@ -0,0 +1,36 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -147730,16 +151364,38 @@ index 000000000000..0c779ac80d27 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ */ ++ ++#ifndef _KBASE_L2_MMU_CONFIG_H_ ++#define _KBASE_L2_MMU_CONFIG_H_ ++/** ++ * kbase_set_mmu_quirks - Set the hw_quirks_mmu field of kbdev ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * -+ *//* SPDX-License-Identifier: GPL-2.0 */ ++ * Use this function to initialise the hw_quirks_mmu field, for instance to set ++ * the MAX_READS and MAX_WRITES to sane defaults for each GPU. ++ * ++ * Return: Zero for succeess or a Linux error code ++ */ ++int kbase_set_mmu_quirks(struct kbase_device *kbdev); ++ ++#endif /* _KBASE_L2_MMU_CONFIG_H */ +diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.c +new file mode 100644 +index 000000000..6db703176 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.c +@@ -0,0 +1,2229 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * ++ * (C) COPYRIGHT 2014-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -147752,35 +151408,2229 @@ index 000000000000..0c779ac80d27 + * + */ + -+#ifndef _KBASE_L2_MMU_CONFIG_H_ -+#define _KBASE_L2_MMU_CONFIG_H_ ++/* NOTES: ++ * - A default GPU can be compiled in during the build, by defining ++ * CONFIG_MALI_NO_MALI_DEFAULT_GPU. SCons sets this, which means that ++ * insmod'ing mali_kbase.ko with no arguments after a build with "scons ++ * gpu=tXYZ" will yield the expected GPU ID for tXYZ. This can always be ++ * overridden by passing the 'no_mali_gpu' argument to insmod. ++ * ++ * - if CONFIG_MALI_BIFROST_ERROR_INJECT is defined the error injection system is ++ * activated. ++ */ ++ ++/* Implementation of failure injection system: ++ * ++ * Error conditions are generated by gpu_generate_error(). ++ * According to CONFIG_MALI_BIFROST_ERROR_INJECT definition gpu_generate_error() either ++ * generates an error HW condition randomly (CONFIG_MALI_ERROR_INJECT_RANDOM) or ++ * checks if there is (in error_track_list) an error configuration to be set for ++ * the current job chain (CONFIG_MALI_ERROR_INJECT_RANDOM not defined). ++ * Each error condition will trigger a specific "state" for a certain set of ++ * registers as per Midgard Architecture Specifications doc. ++ * ++ * According to Midgard Architecture Specifications doc the following registers ++ * are always affected by error conditions: ++ * ++ * JOB Exception: ++ * JOB_IRQ_RAWSTAT ++ * JOB STATUS AREA ++ * ++ * MMU Exception: ++ * MMU_IRQ_RAWSTAT ++ * AS_FAULTSTATUS ++ * AS_FAULTADDRESS ++ * ++ * GPU Exception: ++ * GPU_IRQ_RAWSTAT ++ * GPU_FAULTSTATUS ++ * GPU_FAULTADDRESS ++ * ++ * For further clarification on the model behaviour upon specific error ++ * conditions the user may refer to the Midgard Architecture Specification ++ * document ++ */ ++#include ++#include ++#include ++#include ++#include ++ ++#if MALI_USE_CSF ++#include ++ ++/* Index of the last value register for each type of core, with the 1st value ++ * register being at index 0. ++ */ ++#define IPA_CTL_MAX_VAL_CNT_IDX (KBASE_IPA_CONTROL_NUM_BLOCK_COUNTERS - 1) ++ ++/* Array for storing the value of SELECT register for each type of core */ ++static u64 ipa_ctl_select_config[KBASE_IPA_CORE_TYPE_NUM]; ++static bool ipa_control_timer_enabled; ++#endif ++ ++#define LO_MASK(M) ((M) & 0xFFFFFFFF) ++#if !MALI_USE_CSF ++#define HI_MASK(M) ((M) & 0xFFFFFFFF00000000) ++#endif ++ ++/* Construct a value for the THREAD_FEATURES register, *except* the two most ++ * significant bits, which are set to IMPLEMENTATION_MODEL in ++ * midgard_model_read_reg(). ++ */ ++#if MALI_USE_CSF ++#define THREAD_FEATURES_PARTIAL(MAX_REGISTERS, MAX_TASK_QUEUE, MAX_TG_SPLIT) \ ++ ((MAX_REGISTERS) | ((MAX_TASK_QUEUE) << 24)) ++#else ++#define THREAD_FEATURES_PARTIAL(MAX_REGISTERS, MAX_TASK_QUEUE, MAX_TG_SPLIT) \ ++ ((MAX_REGISTERS) | ((MAX_TASK_QUEUE) << 16) | ((MAX_TG_SPLIT) << 24)) ++#endif ++ ++struct error_status_t hw_error_status; ++ +/** -+ * kbase_set_mmu_quirks - Set the hw_quirks_mmu field of kbdev ++ * struct control_reg_values_t - control register values specific to the GPU being 'emulated' ++ * @name: GPU name ++ * @gpu_id: GPU ID to report ++ * @as_present: Bitmap of address spaces present ++ * @thread_max_threads: Maximum number of threads per core ++ * @thread_max_workgroup_size: Maximum number of threads per workgroup ++ * @thread_max_barrier_size: Maximum number of threads per barrier ++ * @thread_features: Thread features, NOT INCLUDING the 2 ++ * most-significant bits, which are always set to ++ * IMPLEMENTATION_MODEL. ++ * @core_features: Core features ++ * @tiler_features: Tiler features ++ * @mmu_features: MMU features ++ * @gpu_features_lo: GPU features (low) ++ * @gpu_features_hi: GPU features (high) ++ * @shader_present: Available shader bitmap ++ * @stack_present: Core stack present bitmap + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ */ ++struct control_reg_values_t { ++ const char *name; ++ u32 gpu_id; ++ u32 as_present; ++ u32 thread_max_threads; ++ u32 thread_max_workgroup_size; ++ u32 thread_max_barrier_size; ++ u32 thread_features; ++ u32 core_features; ++ u32 tiler_features; ++ u32 mmu_features; ++ u32 gpu_features_lo; ++ u32 gpu_features_hi; ++ u32 shader_present; ++ u32 stack_present; ++}; ++ ++struct job_slot { ++ int job_active; ++ int job_queued; ++ int job_complete_irq_asserted; ++ int job_irq_mask; ++ int job_disabled; ++}; ++ ++struct dummy_model_t { ++ int reset_completed; ++ int reset_completed_mask; ++#if !MALI_USE_CSF ++ int prfcnt_sample_completed; ++#endif /* !MALI_USE_CSF */ ++ int power_changed_mask; /* 2bits: _ALL,_SINGLE */ ++ int power_changed; /* 1bit */ ++ bool clean_caches_completed; ++ bool clean_caches_completed_irq_enabled; ++#if MALI_USE_CSF ++ bool flush_pa_range_completed; ++ bool flush_pa_range_completed_irq_enabled; ++#endif ++ int power_on; /* 6bits: SHADER[4],TILER,L2 */ ++ u32 stack_power_on_lo; ++ u32 coherency_enable; ++ unsigned int job_irq_js_state; ++ struct job_slot slots[NUM_SLOTS]; ++ const struct control_reg_values_t *control_reg_values; ++ u32 l2_config; ++ void *data; ++}; ++ ++/* Array associating GPU names with control register values. The first ++ * one is used in the case of no match. ++ */ ++static const struct control_reg_values_t all_control_reg_values[] = { ++ { ++ .name = "tMIx", ++ .gpu_id = GPU_ID2_MAKE(6, 0, 10, 0, 0, 1, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x180, ++ .thread_max_workgroup_size = 0x180, ++ .thread_max_barrier_size = 0x180, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x6000, 4, 10), ++ .tiler_features = 0x809, ++ .mmu_features = 0x2830, ++ .gpu_features_lo = 0, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT, ++ .stack_present = DUMMY_IMPLEMENTATION_STACK_PRESENT, ++ }, ++ { ++ .name = "tHEx", ++ .gpu_id = GPU_ID2_MAKE(6, 2, 0, 1, 0, 3, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x180, ++ .thread_max_workgroup_size = 0x180, ++ .thread_max_barrier_size = 0x180, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x6000, 4, 10), ++ .tiler_features = 0x809, ++ .mmu_features = 0x2830, ++ .gpu_features_lo = 0, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT, ++ .stack_present = DUMMY_IMPLEMENTATION_STACK_PRESENT, ++ }, ++ { ++ .name = "tSIx", ++ .gpu_id = GPU_ID2_MAKE(7, 0, 0, 0, 1, 1, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x300, ++ .thread_max_workgroup_size = 0x180, ++ .thread_max_barrier_size = 0x180, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x6000, 4, 10), ++ .tiler_features = 0x209, ++ .mmu_features = 0x2821, ++ .gpu_features_lo = 0, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT, ++ .stack_present = DUMMY_IMPLEMENTATION_STACK_PRESENT, ++ }, ++ { ++ .name = "tDVx", ++ .gpu_id = GPU_ID2_MAKE(7, 0, 0, 3, 0, 0, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x300, ++ .thread_max_workgroup_size = 0x180, ++ .thread_max_barrier_size = 0x180, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x6000, 4, 10), ++ .tiler_features = 0x209, ++ .mmu_features = 0x2821, ++ .gpu_features_lo = 0, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT, ++ .stack_present = DUMMY_IMPLEMENTATION_STACK_PRESENT, ++ }, ++ { ++ .name = "tNOx", ++ .gpu_id = GPU_ID2_MAKE(7, 2, 1, 1, 0, 0, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x180, ++ .thread_max_workgroup_size = 0x180, ++ .thread_max_barrier_size = 0x180, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x6000, 4, 10), ++ .tiler_features = 0x809, ++ .mmu_features = 0x2830, ++ .gpu_features_lo = 0, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT, ++ .stack_present = DUMMY_IMPLEMENTATION_STACK_PRESENT, ++ }, ++ { ++ .name = "tGOx_r0p0", ++ .gpu_id = GPU_ID2_MAKE(7, 2, 2, 2, 0, 0, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x180, ++ .thread_max_workgroup_size = 0x180, ++ .thread_max_barrier_size = 0x180, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x6000, 4, 10), ++ .tiler_features = 0x809, ++ .mmu_features = 0x2830, ++ .gpu_features_lo = 0, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT, ++ .stack_present = DUMMY_IMPLEMENTATION_STACK_PRESENT, ++ }, ++ { ++ .name = "tGOx_r1p0", ++ .gpu_id = GPU_ID2_MAKE(7, 4, 0, 2, 1, 0, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x180, ++ .thread_max_workgroup_size = 0x180, ++ .thread_max_barrier_size = 0x180, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x6000, 4, 10), ++ .core_features = 0x2, ++ .tiler_features = 0x209, ++ .mmu_features = 0x2823, ++ .gpu_features_lo = 0, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT, ++ .stack_present = DUMMY_IMPLEMENTATION_STACK_PRESENT, ++ }, ++ { ++ .name = "tTRx", ++ .gpu_id = GPU_ID2_MAKE(9, 0, 8, 0, 0, 0, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x180, ++ .thread_max_workgroup_size = 0x180, ++ .thread_max_barrier_size = 0x180, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x6000, 4, 0), ++ .tiler_features = 0x809, ++ .mmu_features = 0x2830, ++ .gpu_features_lo = 0, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT, ++ .stack_present = DUMMY_IMPLEMENTATION_STACK_PRESENT, ++ }, ++ { ++ .name = "tNAx", ++ .gpu_id = GPU_ID2_MAKE(9, 0, 8, 1, 0, 0, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x180, ++ .thread_max_workgroup_size = 0x180, ++ .thread_max_barrier_size = 0x180, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x6000, 4, 0), ++ .tiler_features = 0x809, ++ .mmu_features = 0x2830, ++ .gpu_features_lo = 0, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT, ++ .stack_present = DUMMY_IMPLEMENTATION_STACK_PRESENT, ++ }, ++ { ++ .name = "tBEx", ++ .gpu_id = GPU_ID2_MAKE(9, 2, 0, 2, 0, 0, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x180, ++ .thread_max_workgroup_size = 0x180, ++ .thread_max_barrier_size = 0x180, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x6000, 4, 0), ++ .tiler_features = 0x809, ++ .mmu_features = 0x2830, ++ .gpu_features_lo = 0, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT_TBEX, ++ .stack_present = DUMMY_IMPLEMENTATION_STACK_PRESENT, ++ }, ++ { ++ .name = "tBAx", ++ .gpu_id = GPU_ID2_MAKE(9, 14, 4, 5, 0, 0, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x180, ++ .thread_max_workgroup_size = 0x180, ++ .thread_max_barrier_size = 0x180, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x6000, 4, 0), ++ .tiler_features = 0x809, ++ .mmu_features = 0x2830, ++ .gpu_features_lo = 0, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT, ++ .stack_present = DUMMY_IMPLEMENTATION_STACK_PRESENT, ++ }, ++ { ++ .name = "tODx", ++ .gpu_id = GPU_ID2_MAKE(10, 8, 0, 2, 0, 0, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x180, ++ .thread_max_workgroup_size = 0x180, ++ .thread_max_barrier_size = 0x180, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x6000, 4, 0), ++ .tiler_features = 0x809, ++ .mmu_features = 0x2830, ++ .gpu_features_lo = 0, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT_TODX, ++ .stack_present = DUMMY_IMPLEMENTATION_STACK_PRESENT, ++ }, ++ { ++ .name = "tGRx", ++ .gpu_id = GPU_ID2_MAKE(10, 10, 0, 3, 0, 0, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x180, ++ .thread_max_workgroup_size = 0x180, ++ .thread_max_barrier_size = 0x180, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x6000, 4, 0), ++ .core_features = 0x0, /* core_1e16fma2tex */ ++ .tiler_features = 0x809, ++ .mmu_features = 0x2830, ++ .gpu_features_lo = 0, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT, ++ .stack_present = DUMMY_IMPLEMENTATION_STACK_PRESENT, ++ }, ++ { ++ .name = "tVAx", ++ .gpu_id = GPU_ID2_MAKE(10, 12, 0, 4, 0, 0, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x180, ++ .thread_max_workgroup_size = 0x180, ++ .thread_max_barrier_size = 0x180, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x6000, 4, 0), ++ .core_features = 0x0, /* core_1e16fma2tex */ ++ .tiler_features = 0x809, ++ .mmu_features = 0x2830, ++ .gpu_features_lo = 0, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT, ++ .stack_present = DUMMY_IMPLEMENTATION_STACK_PRESENT, ++ }, ++ { ++ .name = "tTUx", ++ .gpu_id = GPU_ID2_MAKE(11, 8, 5, 2, 0, 0, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x800, ++ .thread_max_workgroup_size = 0x400, ++ .thread_max_barrier_size = 0x400, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x10000, 4, 0), ++ .core_features = 0x0, /* core_1e32fma2tex */ ++ .tiler_features = 0x809, ++ .mmu_features = 0x2830, ++ .gpu_features_lo = 0xf, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT_TTUX, ++ .stack_present = 0xF, ++ }, ++ { ++ .name = "tTIx", ++ .gpu_id = GPU_ID2_MAKE(12, 8, 1, 0, 0, 0, 0), ++ .as_present = 0xFF, ++ .thread_max_threads = 0x800, ++ .thread_max_workgroup_size = 0x400, ++ .thread_max_barrier_size = 0x400, ++ .thread_features = THREAD_FEATURES_PARTIAL(0x10000, 16, 0), ++ .core_features = 0x1, /* core_1e64fma4tex */ ++ .tiler_features = 0x809, ++ .mmu_features = 0x2830, ++ .gpu_features_lo = 0xf, ++ .gpu_features_hi = 0, ++ .shader_present = DUMMY_IMPLEMENTATION_SHADER_PRESENT_TTIX, ++ .stack_present = 0xF, ++ }, ++}; ++ ++static struct { ++ spinlock_t access_lock; ++#if !MALI_USE_CSF ++ unsigned long prfcnt_base; ++#endif /* !MALI_USE_CSF */ ++ u32 *prfcnt_base_cpu; ++ ++ u32 time; ++ ++ struct gpu_model_prfcnt_en prfcnt_en; ++ ++ u64 l2_present; ++ u64 shader_present; ++ ++#if !MALI_USE_CSF ++ u64 jm_counters[KBASE_DUMMY_MODEL_COUNTER_PER_CORE]; ++#else ++ u64 cshw_counters[KBASE_DUMMY_MODEL_COUNTER_PER_CORE]; ++#endif /* !MALI_USE_CSF */ ++ u64 tiler_counters[KBASE_DUMMY_MODEL_COUNTER_PER_CORE]; ++ u64 l2_counters[KBASE_DUMMY_MODEL_MAX_MEMSYS_BLOCKS * ++ KBASE_DUMMY_MODEL_COUNTER_PER_CORE]; ++ u64 shader_counters[KBASE_DUMMY_MODEL_MAX_SHADER_CORES * ++ KBASE_DUMMY_MODEL_COUNTER_PER_CORE]; ++} performance_counters; ++ ++static u32 get_implementation_register(u32 reg, ++ const struct control_reg_values_t *const control_reg_values) ++{ ++ switch (reg) { ++ case GPU_CONTROL_REG(SHADER_PRESENT_LO): ++ return LO_MASK(control_reg_values->shader_present); ++ case GPU_CONTROL_REG(TILER_PRESENT_LO): ++ return LO_MASK(DUMMY_IMPLEMENTATION_TILER_PRESENT); ++ case GPU_CONTROL_REG(L2_PRESENT_LO): ++ return LO_MASK(DUMMY_IMPLEMENTATION_L2_PRESENT); ++ case GPU_CONTROL_REG(STACK_PRESENT_LO): ++ return LO_MASK(control_reg_values->stack_present); ++ ++ case GPU_CONTROL_REG(SHADER_PRESENT_HI): ++ case GPU_CONTROL_REG(TILER_PRESENT_HI): ++ case GPU_CONTROL_REG(L2_PRESENT_HI): ++ case GPU_CONTROL_REG(STACK_PRESENT_HI): ++ /* *** FALLTHROUGH *** */ ++ default: ++ return 0; ++ } ++} ++ ++void gpu_device_set_data(void *model, void *data) ++{ ++ struct dummy_model_t *dummy = (struct dummy_model_t *)model; ++ ++ dummy->data = data; ++} ++ ++void *gpu_device_get_data(void *model) ++{ ++ struct dummy_model_t *dummy = (struct dummy_model_t *)model; ++ ++ return dummy->data; ++} ++ ++#define signal_int(m, s) m->slots[(s)].job_complete_irq_asserted = 1 ++ ++/* SCons should pass in a default GPU, but other ways of building (e.g. ++ * in-tree) won't, so define one here in case. ++ */ ++#ifndef CONFIG_MALI_NO_MALI_DEFAULT_GPU ++#define CONFIG_MALI_NO_MALI_DEFAULT_GPU "tMIx" ++#endif ++ ++static char *no_mali_gpu = CONFIG_MALI_NO_MALI_DEFAULT_GPU; ++module_param(no_mali_gpu, charp, 0000); ++MODULE_PARM_DESC(no_mali_gpu, "GPU to identify as"); ++ ++#if MALI_USE_CSF ++static u32 gpu_model_get_prfcnt_value(enum kbase_ipa_core_type core_type, ++ u32 cnt_idx, bool is_low_word) ++{ ++ u64 *counters_data; ++ u32 core_count = 0; ++ u32 event_index; ++ u64 value = 0; ++ u32 core; ++ unsigned long flags; ++ ++ if (WARN_ON(core_type >= KBASE_IPA_CORE_TYPE_NUM)) ++ return 0; ++ ++ if (WARN_ON(cnt_idx >= KBASE_IPA_CONTROL_NUM_BLOCK_COUNTERS)) ++ return 0; ++ ++ event_index = ++ (ipa_ctl_select_config[core_type] >> (cnt_idx * 8)) & 0xFF; ++ ++ /* Currently only primary counter blocks are supported */ ++ if (WARN_ON(event_index >= ++ (KBASE_DUMMY_MODEL_COUNTER_HEADER_DWORDS + KBASE_DUMMY_MODEL_COUNTER_PER_CORE))) ++ return 0; ++ ++ /* The actual events start index 4 onwards. Spec also says PRFCNT_EN, ++ * TIMESTAMP_LO or TIMESTAMP_HI pseudo-counters do not make sense for ++ * IPA counters. If selected, the value returned for them will be zero. ++ */ ++ if (WARN_ON(event_index < KBASE_DUMMY_MODEL_COUNTER_HEADER_DWORDS)) ++ return 0; ++ ++ event_index -= KBASE_DUMMY_MODEL_COUNTER_HEADER_DWORDS; ++ ++ spin_lock_irqsave(&performance_counters.access_lock, flags); ++ ++ switch (core_type) { ++ case KBASE_IPA_CORE_TYPE_CSHW: ++ core_count = 1; ++ counters_data = performance_counters.cshw_counters; ++ break; ++ case KBASE_IPA_CORE_TYPE_MEMSYS: ++ core_count = hweight64(performance_counters.l2_present); ++ counters_data = performance_counters.l2_counters; ++ break; ++ case KBASE_IPA_CORE_TYPE_TILER: ++ core_count = 1; ++ counters_data = performance_counters.tiler_counters; ++ break; ++ case KBASE_IPA_CORE_TYPE_SHADER: ++ core_count = hweight64(performance_counters.shader_present); ++ counters_data = performance_counters.shader_counters; ++ break; ++ default: ++ WARN(1, "Invalid core_type %d\n", core_type); ++ break; ++ } ++ ++ for (core = 0; core < core_count; core++) { ++ value += counters_data[event_index]; ++ event_index += KBASE_DUMMY_MODEL_COUNTER_PER_CORE; ++ } ++ ++ spin_unlock_irqrestore(&performance_counters.access_lock, flags); ++ ++ if (is_low_word) ++ return (value & U32_MAX); ++ else ++ return (value >> 32); ++} ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * gpu_model_clear_prfcnt_values_nolock - Clear performance counter values + * -+ * Use this function to initialise the hw_quirks_mmu field, for instance to set -+ * the MAX_READS and MAX_WRITES to sane defaults for each GPU. ++ * Sets all performance counter values to zero. The performance counter access ++ * lock must be held when calling this function. ++ */ ++static void gpu_model_clear_prfcnt_values_nolock(void) ++{ ++ lockdep_assert_held(&performance_counters.access_lock); ++#if !MALI_USE_CSF ++ memset(performance_counters.jm_counters, 0, sizeof(performance_counters.jm_counters)); ++#else ++ memset(performance_counters.cshw_counters, 0, sizeof(performance_counters.cshw_counters)); ++#endif /* !MALI_USE_CSF */ ++ memset(performance_counters.tiler_counters, 0, sizeof(performance_counters.tiler_counters)); ++ memset(performance_counters.l2_counters, 0, sizeof(performance_counters.l2_counters)); ++ memset(performance_counters.shader_counters, 0, ++ sizeof(performance_counters.shader_counters)); ++} ++ ++#if MALI_USE_CSF ++void gpu_model_clear_prfcnt_values(void) ++{ ++ unsigned long flags; ++ ++ spin_lock_irqsave(&performance_counters.access_lock, flags); ++ gpu_model_clear_prfcnt_values_nolock(); ++ spin_unlock_irqrestore(&performance_counters.access_lock, flags); ++} ++KBASE_EXPORT_TEST_API(gpu_model_clear_prfcnt_values); ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * gpu_model_dump_prfcnt_blocks() - Dump performance counter values to buffer + * -+ * Return: Zero for succeess or a Linux error code ++ * @values: Array of values to be written out ++ * @out_index: Index into performance counter buffer ++ * @block_count: Number of blocks to dump ++ * @prfcnt_enable_mask: Counter enable mask ++ * @blocks_present: Available blocks bit mask ++ * ++ * The performance counter access lock must be held before calling this ++ * function. + */ -+int kbase_set_mmu_quirks(struct kbase_device *kbdev); ++static void gpu_model_dump_prfcnt_blocks(u64 *values, u32 *out_index, u32 block_count, ++ u32 prfcnt_enable_mask, u64 blocks_present) ++{ ++ u32 block_idx, counter; ++ u32 counter_value = 0; ++ u32 *prfcnt_base; ++ u32 index = 0; + -+#endif /* _KBASE_L2_MMU_CONFIG_H */ -diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c -new file mode 100755 -index 000000000000..e33fe0b8e415 ++ lockdep_assert_held(&performance_counters.access_lock); ++ ++ prfcnt_base = performance_counters.prfcnt_base_cpu; ++ ++ for (block_idx = 0; block_idx < block_count; block_idx++) { ++ /* only dump values if core is present */ ++ if (!(blocks_present & (1 << block_idx))) { ++#if MALI_USE_CSF ++ /* if CSF dump zeroed out block */ ++ memset(&prfcnt_base[*out_index], 0, ++ KBASE_DUMMY_MODEL_BLOCK_SIZE); ++ *out_index += KBASE_DUMMY_MODEL_VALUES_PER_BLOCK; ++#endif /* MALI_USE_CSF */ ++ continue; ++ } ++ ++ /* write the header */ ++ prfcnt_base[*out_index] = performance_counters.time++; ++ prfcnt_base[*out_index+2] = prfcnt_enable_mask; ++ *out_index += KBASE_DUMMY_MODEL_COUNTER_HEADER_DWORDS; ++ ++ /* write the counters */ ++ for (counter = 0; ++ counter < KBASE_DUMMY_MODEL_COUNTER_PER_CORE; ++ counter++) { ++ /* HW counter values retrieved through ++ * PRFCNT_SAMPLE request are of 32 bits only. ++ */ ++ counter_value = (u32)values[index++]; ++ if (KBASE_DUMMY_MODEL_COUNTER_ENABLED( ++ prfcnt_enable_mask, (counter + ++ KBASE_DUMMY_MODEL_COUNTER_HEADER_DWORDS))) { ++ prfcnt_base[*out_index + counter] = ++ counter_value; ++ } ++ } ++ *out_index += KBASE_DUMMY_MODEL_COUNTER_PER_CORE; ++ } ++} ++ ++static void gpu_model_dump_nolock(void) ++{ ++ u32 index = 0; ++ ++ lockdep_assert_held(&performance_counters.access_lock); ++ ++#if !MALI_USE_CSF ++ gpu_model_dump_prfcnt_blocks(performance_counters.jm_counters, &index, 1, ++ performance_counters.prfcnt_en.fe, 0x1); ++#else ++ gpu_model_dump_prfcnt_blocks(performance_counters.cshw_counters, &index, 1, ++ performance_counters.prfcnt_en.fe, 0x1); ++#endif /* !MALI_USE_CSF */ ++ gpu_model_dump_prfcnt_blocks(performance_counters.tiler_counters, ++ &index, 1, ++ performance_counters.prfcnt_en.tiler, ++ DUMMY_IMPLEMENTATION_TILER_PRESENT); ++ gpu_model_dump_prfcnt_blocks(performance_counters.l2_counters, &index, ++ KBASE_DUMMY_MODEL_MAX_MEMSYS_BLOCKS, ++ performance_counters.prfcnt_en.l2, ++ performance_counters.l2_present); ++ gpu_model_dump_prfcnt_blocks(performance_counters.shader_counters, ++ &index, KBASE_DUMMY_MODEL_MAX_SHADER_CORES, ++ performance_counters.prfcnt_en.shader, ++ performance_counters.shader_present); ++ ++ /* Counter values are cleared after each dump */ ++ gpu_model_clear_prfcnt_values_nolock(); ++ ++ /* simulate a 'long' time between samples */ ++ performance_counters.time += 10; ++} ++ ++#if !MALI_USE_CSF ++static void midgard_model_dump_prfcnt(void) ++{ ++ unsigned long flags; ++ ++ spin_lock_irqsave(&performance_counters.access_lock, flags); ++ gpu_model_dump_nolock(); ++ spin_unlock_irqrestore(&performance_counters.access_lock, flags); ++} ++#else ++void gpu_model_prfcnt_dump_request(u32 *sample_buf, struct gpu_model_prfcnt_en enable_maps) ++{ ++ unsigned long flags; ++ ++ if (WARN_ON(!sample_buf)) ++ return; ++ ++ spin_lock_irqsave(&performance_counters.access_lock, flags); ++ performance_counters.prfcnt_base_cpu = sample_buf; ++ performance_counters.prfcnt_en = enable_maps; ++ gpu_model_dump_nolock(); ++ spin_unlock_irqrestore(&performance_counters.access_lock, flags); ++} ++ ++void gpu_model_glb_request_job_irq(void *model) ++{ ++ unsigned long flags; ++ ++ spin_lock_irqsave(&hw_error_status.access_lock, flags); ++ hw_error_status.job_irq_status |= JOB_IRQ_GLOBAL_IF; ++ spin_unlock_irqrestore(&hw_error_status.access_lock, flags); ++ gpu_device_raise_irq(model, MODEL_LINUX_JOB_IRQ); ++} ++#endif /* !MALI_USE_CSF */ ++ ++static void init_register_statuses(struct dummy_model_t *dummy) ++{ ++ int i; ++ ++ hw_error_status.errors_mask = 0; ++ hw_error_status.gpu_error_irq = 0; ++ hw_error_status.gpu_fault_status = 0; ++ hw_error_status.job_irq_rawstat = 0; ++ hw_error_status.job_irq_status = 0; ++ hw_error_status.mmu_irq_rawstat = 0; ++ hw_error_status.mmu_irq_mask = 0; ++ ++ for (i = 0; i < NUM_SLOTS; i++) { ++ hw_error_status.js_status[i] = 0; ++ hw_error_status.job_irq_rawstat |= ++ (dummy->slots[i].job_complete_irq_asserted) << i; ++ hw_error_status.job_irq_status |= ++ (dummy->slots[i].job_complete_irq_asserted) << i; ++ } ++ for (i = 0; i < NUM_MMU_AS; i++) { ++ hw_error_status.as_command[i] = 0; ++ hw_error_status.as_faultstatus[i] = 0; ++ hw_error_status.mmu_irq_mask |= 1 << i; ++ } ++ ++ performance_counters.time = 0; ++} ++ ++static void update_register_statuses(struct dummy_model_t *dummy, unsigned int job_slot) ++{ ++ lockdep_assert_held(&hw_error_status.access_lock); ++ ++ if (hw_error_status.errors_mask & IS_A_JOB_ERROR) { ++ if (job_slot == hw_error_status.current_job_slot) { ++#if !MALI_USE_CSF ++ if (hw_error_status.js_status[job_slot] == 0) { ++ /* status reg is clean; it can be written */ ++ ++ switch (hw_error_status.errors_mask & ++ IS_A_JOB_ERROR) { ++ case KBASE_JOB_INTERRUPTED: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_INTERRUPTED; ++ break; ++ ++ case KBASE_JOB_STOPPED: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_STOPPED; ++ break; ++ ++ case KBASE_JOB_TERMINATED: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_TERMINATED; ++ break; ++ ++ case KBASE_JOB_CONFIG_FAULT: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_CONFIG_FAULT; ++ break; ++ ++ case KBASE_JOB_POWER_FAULT: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_POWER_FAULT; ++ break; ++ ++ case KBASE_JOB_READ_FAULT: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_READ_FAULT; ++ break; ++ ++ case KBASE_JOB_WRITE_FAULT: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_WRITE_FAULT; ++ break; ++ ++ case KBASE_JOB_AFFINITY_FAULT: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_AFFINITY_FAULT; ++ break; ++ ++ case KBASE_JOB_BUS_FAULT: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_BUS_FAULT; ++ break; ++ ++ case KBASE_INSTR_INVALID_PC: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_INSTR_INVALID_PC; ++ break; ++ ++ case KBASE_INSTR_INVALID_ENC: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_INSTR_INVALID_ENC; ++ break; ++ ++ case KBASE_INSTR_TYPE_MISMATCH: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_INSTR_TYPE_MISMATCH; ++ break; ++ ++ case KBASE_INSTR_OPERAND_FAULT: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_INSTR_OPERAND_FAULT; ++ break; ++ ++ case KBASE_INSTR_TLS_FAULT: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_INSTR_TLS_FAULT; ++ break; ++ ++ case KBASE_INSTR_BARRIER_FAULT: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_INSTR_BARRIER_FAULT; ++ break; ++ ++ case KBASE_INSTR_ALIGN_FAULT: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_INSTR_ALIGN_FAULT; ++ break; ++ ++ case KBASE_DATA_INVALID_FAULT: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_DATA_INVALID_FAULT; ++ break; ++ ++ case KBASE_TILE_RANGE_FAULT: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_TILE_RANGE_FAULT; ++ break; ++ ++ case KBASE_ADDR_RANGE_FAULT: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_ADDRESS_RANGE_FAULT; ++ break; ++ ++ case KBASE_OUT_OF_MEMORY: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_OUT_OF_MEMORY; ++ break; ++ ++ case KBASE_UNKNOWN: ++ hw_error_status.js_status[job_slot] = ++ JS_STATUS_UNKNOWN; ++ break; ++ ++ default: ++ model_error_log(KBASE_CORE, ++ "\nAtom Chain 0x%llx: Invalid Error Mask!", ++ hw_error_status.current_jc); ++ break; ++ } ++ } ++#endif /* !MALI_USE_CSF */ ++ ++ /* we set JOB_FAIL_ */ ++ hw_error_status.job_irq_rawstat |= ++ (dummy->slots[job_slot].job_complete_irq_asserted) << ++ (job_slot + 16); ++ hw_error_status.job_irq_status |= ++ (((dummy->slots[job_slot].job_complete_irq_asserted) << ++ (job_slot)) & ++ (dummy->slots[job_slot].job_irq_mask << ++ job_slot)) << 16; ++ } else { ++ hw_error_status.job_irq_rawstat |= ++ (dummy->slots[job_slot].job_complete_irq_asserted) << ++ job_slot; ++ hw_error_status.job_irq_status |= ++ ((dummy->slots[job_slot].job_complete_irq_asserted) << ++ (job_slot)) & ++ (dummy->slots[job_slot].job_irq_mask << ++ job_slot); ++ } ++ } else { ++ hw_error_status.job_irq_rawstat |= ++ (dummy->slots[job_slot].job_complete_irq_asserted) << ++ job_slot; ++ hw_error_status.job_irq_status |= ++ ((dummy->slots[job_slot].job_complete_irq_asserted) << ++ (job_slot)) & ++ (dummy->slots[job_slot].job_irq_mask << job_slot); ++ } /* end of job register statuses */ ++ ++ if (hw_error_status.errors_mask & IS_A_MMU_ERROR) { ++ int i; ++ ++ for (i = 0; i < NUM_MMU_AS; i++) { ++ if (i == hw_error_status.faulty_mmu_as) { ++ if (hw_error_status.as_faultstatus[i] == 0) { ++ u32 status = ++ hw_error_status.as_faultstatus[i]; ++ /* status reg is clean; it can be ++ * written ++ */ ++ switch (hw_error_status.errors_mask & ++ IS_A_MMU_ERROR) { ++ case KBASE_TRANSLATION_FAULT: ++ /* 0xCm means TRANSLATION FAULT ++ * (m is mmu_table_level) ++ */ ++ status = ++ ((1 << 7) | (1 << 6) | ++ hw_error_status.mmu_table_level ++ ); ++ break; ++ ++ case KBASE_PERMISSION_FAULT: ++ /*0xC8 means PERMISSION FAULT */ ++ status = ((1 << 7) | (1 << 6) | ++ (1 << 3)); ++ break; ++ ++ case KBASE_TRANSTAB_BUS_FAULT: ++ /* 0xDm means TRANSITION TABLE ++ * BUS FAULT (m is ++ * mmu_table_level) ++ */ ++ status = ((1 << 7) | (1 << 6) | ++ (1 << 4) | ++ hw_error_status.mmu_table_level ++ ); ++ break; ++ ++ case KBASE_ACCESS_FLAG: ++ /* 0xD8 means ACCESS FLAG */ ++ status = ((1 << 7) | (1 << 6) | ++ (1 << 4) | (1 << 3)); ++ break; ++ ++ default: ++ model_error_log(KBASE_CORE, ++ "\nAtom Chain 0x%llx: Invalid Error Mask!", ++ hw_error_status.current_jc); ++ break; ++ } ++ hw_error_status.as_faultstatus[i] = ++ status; ++ } ++ ++ if (hw_error_status.errors_mask & ++ KBASE_TRANSTAB_BUS_FAULT) ++ hw_error_status.mmu_irq_rawstat |= ++ 1 << (16 + i); /* bus error */ ++ else ++ hw_error_status.mmu_irq_rawstat |= ++ 1 << i; /* page fault */ ++ } ++ } ++ } /*end of mmu register statuses */ ++ if (hw_error_status.errors_mask & IS_A_GPU_ERROR) { ++ if (hw_error_status.gpu_fault_status) { ++ /* not the first GPU error reported */ ++ hw_error_status.gpu_error_irq |= (1 << 7); ++ } else { ++ hw_error_status.gpu_error_irq |= 1; ++ switch (hw_error_status.errors_mask & IS_A_GPU_ERROR) { ++ case KBASE_DELAYED_BUS_FAULT: ++ hw_error_status.gpu_fault_status = (1 << 7); ++ break; ++ ++ case KBASE_SHAREABILITY_FAULT: ++ hw_error_status.gpu_fault_status = (1 << 7) | ++ (1 << 3); ++ break; ++ ++ default: ++ model_error_log(KBASE_CORE, ++ "\nAtom Chain 0x%llx: Invalid Error Mask!", ++ hw_error_status.current_jc); ++ break; ++ } ++ } ++ } ++ hw_error_status.errors_mask = 0; /*clear error mask */ ++} ++ ++#if !MALI_USE_CSF ++static void update_job_irq_js_state(struct dummy_model_t *dummy, int mask) ++{ ++ int i; ++ ++ lockdep_assert_held(&hw_error_status.access_lock); ++ pr_debug("%s", "Updating the JS_ACTIVE register"); ++ ++ for (i = 0; i < NUM_SLOTS; i++) { ++ int slot_active = dummy->slots[i].job_active; ++ int next_busy = dummy->slots[i].job_queued; ++ ++ if ((mask & (1 << i)) || (mask & (1 << (i + 16)))) { ++ /* clear the bits we're updating */ ++ dummy->job_irq_js_state &= ~((1 << (16 + i)) | ++ (1 << i)); ++ if (hw_error_status.js_status[i]) { ++ dummy->job_irq_js_state |= next_busy << ++ (i + 16); ++ if (mask & (1 << (i + 16))) { ++ /* clear job slot status */ ++ hw_error_status.js_status[i] = 0; ++ /* continue execution of jobchain */ ++ dummy->slots[i].job_active = ++ dummy->slots[i].job_queued; ++ } ++ } else { ++ /* set bits if needed */ ++ dummy->job_irq_js_state |= ((slot_active << i) | ++ (next_busy << (i + 16))); ++ } ++ } ++ } ++ pr_debug("The new snapshot is 0x%08X\n", dummy->job_irq_js_state); ++} ++#endif /* !MALI_USE_CSF */ ++ ++/** ++ * find_control_reg_values() - Look up constant control register values. ++ * @gpu: GPU name ++ * ++ * Look up the GPU name to find the correct set of control register values for ++ * that GPU. If not found, warn and use the first values in the array. ++ * ++ * Return: Pointer to control register values for that GPU. ++ */ ++static const struct control_reg_values_t *find_control_reg_values(const char *gpu) ++{ ++ size_t i; ++ const struct control_reg_values_t *ret = NULL; ++ ++ /* Edge case for tGOx, as it has 2 entries in the table for its R0 and R1 ++ * revisions respectively. As none of them are named "tGOx" the name comparison ++ * needs to be fixed in these cases. CONFIG_GPU_HWVER should be one of "r0p0" ++ * or "r1p0" and is derived from the DDK's build configuration. In cases ++ * where it is unavailable, it defaults to tGOx r1p0. ++ */ ++ if (!strcmp(gpu, "tGOx")) { ++#ifdef CONFIG_GPU_HWVER ++ if (!strcmp(CONFIG_GPU_HWVER, "r0p0")) ++ gpu = "tGOx_r0p0"; ++ else if (!strcmp(CONFIG_GPU_HWVER, "r1p0")) ++#endif /* CONFIG_GPU_HWVER defined */ ++ gpu = "tGOx_r1p0"; ++ } ++ ++ for (i = 0; i < ARRAY_SIZE(all_control_reg_values); ++i) { ++ const struct control_reg_values_t * const fcrv = &all_control_reg_values[i]; ++ ++ if (!strcmp(fcrv->name, gpu)) { ++ ret = fcrv; ++ pr_debug("Found control register values for %s\n", gpu); ++ break; ++ } ++ } ++ ++ if (!ret) { ++ ret = &all_control_reg_values[0]; ++ pr_warn("Couldn't find control register values for GPU %s; using default %s\n", ++ gpu, ret->name); ++ } ++ ++ return ret; ++} ++ ++void *midgard_model_create(struct kbase_device *kbdev) ++{ ++ struct dummy_model_t *dummy = NULL; ++ ++ spin_lock_init(&hw_error_status.access_lock); ++ spin_lock_init(&performance_counters.access_lock); ++ ++ dummy = kzalloc(sizeof(*dummy), GFP_KERNEL); ++ ++ if (dummy) { ++ dummy->job_irq_js_state = 0; ++ init_register_statuses(dummy); ++ dummy->control_reg_values = find_control_reg_values(no_mali_gpu); ++ performance_counters.l2_present = get_implementation_register( ++ GPU_CONTROL_REG(L2_PRESENT_LO), dummy->control_reg_values); ++ performance_counters.shader_present = get_implementation_register( ++ GPU_CONTROL_REG(SHADER_PRESENT_LO), dummy->control_reg_values); ++ ++ gpu_device_set_data(dummy, kbdev); ++ ++ dev_info(kbdev->dev, "Using Dummy Model"); ++ } ++ ++ return dummy; ++} ++ ++void midgard_model_destroy(void *h) ++{ ++ kfree((void *)h); ++} ++ ++static void midgard_model_get_outputs(void *h) ++{ ++ struct dummy_model_t *dummy = (struct dummy_model_t *)h; ++ ++ lockdep_assert_held(&hw_error_status.access_lock); ++ ++ if (hw_error_status.job_irq_status) ++ gpu_device_raise_irq(dummy, MODEL_LINUX_JOB_IRQ); ++ ++ if ((dummy->power_changed && dummy->power_changed_mask) || ++ (dummy->reset_completed & dummy->reset_completed_mask) || ++ hw_error_status.gpu_error_irq || ++#if !MALI_USE_CSF ++ dummy->prfcnt_sample_completed || ++#else ++ (dummy->flush_pa_range_completed && dummy->flush_pa_range_completed_irq_enabled) || ++#endif ++ (dummy->clean_caches_completed && dummy->clean_caches_completed_irq_enabled)) ++ gpu_device_raise_irq(dummy, MODEL_LINUX_GPU_IRQ); ++ ++ if (hw_error_status.mmu_irq_rawstat & hw_error_status.mmu_irq_mask) ++ gpu_device_raise_irq(dummy, MODEL_LINUX_MMU_IRQ); ++} ++ ++static void midgard_model_update(void *h) ++{ ++ struct dummy_model_t *dummy = (struct dummy_model_t *)h; ++ int i; ++ ++ lockdep_assert_held(&hw_error_status.access_lock); ++ ++ for (i = 0; i < NUM_SLOTS; i++) { ++ if (!dummy->slots[i].job_active) ++ continue; ++ ++ if (dummy->slots[i].job_disabled) { ++ update_register_statuses(dummy, i); ++ continue; ++ } ++ ++ /* If there are any pending interrupts that have not ++ * been cleared we cannot run the job in the next register ++ * as we will overwrite the register status of the job in ++ * the head registers - which has not yet been read ++ */ ++ if ((hw_error_status.job_irq_rawstat & (1 << (i + 16))) || ++ (hw_error_status.job_irq_rawstat & (1 << i))) { ++ continue; ++ } ++ ++ /*this job is done assert IRQ lines */ ++ signal_int(dummy, i); ++#ifdef CONFIG_MALI_BIFROST_ERROR_INJECT ++ midgard_set_error(i); ++#endif /* CONFIG_MALI_BIFROST_ERROR_INJECT */ ++ update_register_statuses(dummy, i); ++ /*if this job slot returned failures we cannot use it */ ++ if (hw_error_status.job_irq_rawstat & (1 << (i + 16))) { ++ dummy->slots[i].job_active = 0; ++ continue; ++ } ++ /*process next job */ ++ dummy->slots[i].job_active = dummy->slots[i].job_queued; ++ dummy->slots[i].job_queued = 0; ++ if (dummy->slots[i].job_active) { ++ if (hw_error_status.job_irq_rawstat & (1 << (i + 16))) ++ model_error_log(KBASE_CORE, ++ "\natom %lld running a job on a dirty slot", ++ hw_error_status.current_jc); ++ } ++ } ++} ++ ++static void invalidate_active_jobs(struct dummy_model_t *dummy) ++{ ++ int i; ++ ++ lockdep_assert_held(&hw_error_status.access_lock); ++ ++ for (i = 0; i < NUM_SLOTS; i++) { ++ if (dummy->slots[i].job_active) { ++ hw_error_status.job_irq_rawstat |= (1 << (16 + i)); ++ ++ hw_error_status.js_status[i] = 0x7f; /*UNKNOWN*/ ++ } ++ } ++} ++ ++void midgard_model_write_reg(void *h, u32 addr, u32 value) ++{ ++ unsigned long flags; ++ struct dummy_model_t *dummy = (struct dummy_model_t *)h; ++ ++ spin_lock_irqsave(&hw_error_status.access_lock, flags); ++ ++#if !MALI_USE_CSF ++ if ((addr >= JOB_CONTROL_REG(JOB_SLOT0)) && ++ (addr < (JOB_CONTROL_REG(JOB_SLOT15) + 0x80))) { ++ unsigned int slot_idx = (addr >> 7) & 0xf; ++ ++ KBASE_DEBUG_ASSERT(slot_idx < NUM_SLOTS); ++ if (addr == JOB_SLOT_REG(slot_idx, JS_HEAD_NEXT_LO)) { ++ hw_error_status.current_jc &= ++ ~((u64) (0xFFFFFFFF)); ++ hw_error_status.current_jc |= (u64) value; ++ } ++ if (addr == JOB_SLOT_REG(slot_idx, JS_HEAD_NEXT_HI)) { ++ hw_error_status.current_jc &= (u64) 0xFFFFFFFF; ++ hw_error_status.current_jc |= ++ ((u64) value) << 32; ++ } ++ if (addr == JOB_SLOT_REG(slot_idx, JS_COMMAND_NEXT) && ++ value == 1) { ++ pr_debug("%s", "start detected"); ++ KBASE_DEBUG_ASSERT(!dummy->slots[slot_idx].job_active || ++ !dummy->slots[slot_idx].job_queued); ++ if ((dummy->slots[slot_idx].job_active) || ++ (hw_error_status.job_irq_rawstat & ++ (1 << (slot_idx + 16)))) { ++ pr_debug("~~~~~~~~~~~ Start: job slot is already active or there are IRQ pending ~~~~~~~~~" ++ ); ++ dummy->slots[slot_idx].job_queued = 1; ++ } else { ++ dummy->slots[slot_idx].job_active = 1; ++ } ++ } ++ ++ if (addr == JOB_SLOT_REG(slot_idx, JS_COMMAND_NEXT) && value == ++ 0) ++ dummy->slots[slot_idx].job_queued = 0; ++ ++ if ((addr == JOB_SLOT_REG(slot_idx, JS_COMMAND)) && ++ (value == JS_COMMAND_SOFT_STOP || ++ value == JS_COMMAND_HARD_STOP)) { ++ /*dummy->slots[slot_idx].job_active = 0; */ ++ hw_error_status.current_job_slot = slot_idx; ++ if (value == JS_COMMAND_SOFT_STOP) { ++ hw_error_status.errors_mask = KBASE_JOB_STOPPED; ++ } else { /*value == 3 */ ++ ++ if (dummy->slots[slot_idx].job_disabled != 0) { ++ pr_debug("enabling slot after HARD_STOP" ++ ); ++ dummy->slots[slot_idx].job_disabled = 0; ++ } ++ hw_error_status.errors_mask = ++ KBASE_JOB_TERMINATED; ++ } ++ } ++ } else if (addr == JOB_CONTROL_REG(JOB_IRQ_CLEAR)) { ++ int i; ++ ++ for (i = 0; i < NUM_SLOTS; i++) { ++ if (value & ((1 << i) | (1 << (i + 16)))) ++ dummy->slots[i].job_complete_irq_asserted = 0; ++ /* hw_error_status.js_status[i] is cleared in ++ * update_job_irq_js_state ++ */ ++ } ++ pr_debug("%s", "job irq cleared"); ++ update_job_irq_js_state(dummy, value); ++ /*remove error condition for JOB */ ++ hw_error_status.job_irq_rawstat &= ~(value); ++ hw_error_status.job_irq_status &= ~(value); ++ } else if (addr == JOB_CONTROL_REG(JOB_IRQ_MASK)) { ++ int i; ++ ++ for (i = 0; i < NUM_SLOTS; i++) ++ dummy->slots[i].job_irq_mask = (value >> i) & 0x01; ++ pr_debug("job irq mask to value %x", value); ++ } else if (addr == GPU_CONTROL_REG(GPU_IRQ_MASK)) { ++#else /* !MALI_USE_CSF */ ++ if (addr == JOB_CONTROL_REG(JOB_IRQ_CLEAR)) { ++ pr_debug("%s", "job irq cleared"); ++ ++ hw_error_status.job_irq_rawstat &= ~(value); ++ hw_error_status.job_irq_status &= ~(value); ++ } else if (addr == JOB_CONTROL_REG(JOB_IRQ_MASK)) { ++ /* ignore JOB_IRQ_MASK as it is handled by CSFFW */ ++ } else if (addr == GPU_CONTROL_REG(GPU_IRQ_MASK)) { ++#endif /* !MALI_USE_CSF */ ++ pr_debug("GPU_IRQ_MASK set to 0x%x", value); ++ dummy->reset_completed_mask = (value >> 8) & 0x01; ++ dummy->power_changed_mask = (value >> 9) & 0x03; ++ dummy->clean_caches_completed_irq_enabled = (value & (1u << 17)) != 0u; ++#if MALI_USE_CSF ++ dummy->flush_pa_range_completed_irq_enabled = (value & (1u << 20)) != 0u; ++#endif ++ } else if (addr == GPU_CONTROL_REG(COHERENCY_ENABLE)) { ++ dummy->coherency_enable = value; ++ } else if (addr == GPU_CONTROL_REG(GPU_IRQ_CLEAR)) { ++ if (value & (1 << 8)) { ++ pr_debug("%s", "gpu RESET_COMPLETED irq cleared"); ++ dummy->reset_completed = 0; ++ } ++ if (value & (3 << 9)) ++ dummy->power_changed = 0; ++ ++ if (value & (1 << 17)) ++ dummy->clean_caches_completed = false; ++ ++#if MALI_USE_CSF ++ if (value & (1u << 20)) ++ dummy->flush_pa_range_completed = false; ++#endif /* MALI_USE_CSF */ ++ ++#if !MALI_USE_CSF ++ if (value & PRFCNT_SAMPLE_COMPLETED) /* (1 << 16) */ ++ dummy->prfcnt_sample_completed = 0; ++#endif /* !MALI_USE_CSF */ ++ ++ /*update error status */ ++ hw_error_status.gpu_error_irq &= ~(value); ++ } else if (addr == GPU_CONTROL_REG(GPU_COMMAND)) { ++ switch (value) { ++ case GPU_COMMAND_SOFT_RESET: ++ case GPU_COMMAND_HARD_RESET: ++ pr_debug("gpu reset (%d) requested", value); ++ /* no more fault status */ ++ hw_error_status.gpu_fault_status = 0; ++ /* completed reset instantly */ ++ dummy->reset_completed = 1; ++ break; ++#if MALI_USE_CSF ++ case GPU_COMMAND_CACHE_CLN_INV_L2: ++ case GPU_COMMAND_CACHE_CLN_INV_L2_LSC: ++ case GPU_COMMAND_CACHE_CLN_INV_FULL: ++#else ++ case GPU_COMMAND_CLEAN_CACHES: ++ case GPU_COMMAND_CLEAN_INV_CACHES: ++#endif ++ pr_debug("clean caches requested"); ++ dummy->clean_caches_completed = true; ++ break; ++#if MALI_USE_CSF ++ case GPU_COMMAND_FLUSH_PA_RANGE_CLN_INV_L2: ++ case GPU_COMMAND_FLUSH_PA_RANGE_CLN_INV_L2_LSC: ++ case GPU_COMMAND_FLUSH_PA_RANGE_CLN_INV_FULL: ++ pr_debug("pa range flush requested"); ++ dummy->flush_pa_range_completed = true; ++ break; ++#endif /* MALI_USE_CSF */ ++#if !MALI_USE_CSF ++ case GPU_COMMAND_PRFCNT_SAMPLE: ++ midgard_model_dump_prfcnt(); ++ dummy->prfcnt_sample_completed = 1; ++#endif /* !MALI_USE_CSF */ ++ default: ++ break; ++ } ++#if MALI_USE_CSF ++ } else if (addr >= GPU_CONTROL_REG(GPU_COMMAND_ARG0_LO) && ++ addr <= GPU_CONTROL_REG(GPU_COMMAND_ARG1_HI)) { ++ /* Writes ignored */ ++#endif ++ } else if (addr == GPU_CONTROL_REG(L2_CONFIG)) { ++ dummy->l2_config = value; ++ } ++#if MALI_USE_CSF ++ else if (addr >= GPU_CONTROL_REG(CSF_HW_DOORBELL_PAGE_OFFSET) && ++ addr < GPU_CONTROL_REG(CSF_HW_DOORBELL_PAGE_OFFSET + ++ (CSF_NUM_DOORBELL * CSF_HW_DOORBELL_PAGE_SIZE))) { ++ if (addr == GPU_CONTROL_REG(CSF_HW_DOORBELL_PAGE_OFFSET)) ++ hw_error_status.job_irq_status = JOB_IRQ_GLOBAL_IF; ++ } else if ((addr >= GPU_CONTROL_REG(SYSC_ALLOC0)) && ++ (addr < GPU_CONTROL_REG(SYSC_ALLOC(SYSC_ALLOC_COUNT)))) { ++ /* Do nothing */ ++ } else if ((addr >= GPU_CONTROL_REG(ASN_HASH_0)) && ++ (addr < GPU_CONTROL_REG(ASN_HASH(ASN_HASH_COUNT)))) { ++ /* Do nothing */ ++ } else if (addr == IPA_CONTROL_REG(COMMAND)) { ++ pr_debug("Received IPA_CONTROL command"); ++ } else if (addr == IPA_CONTROL_REG(TIMER)) { ++ ipa_control_timer_enabled = value ? true : false; ++ } else if ((addr >= IPA_CONTROL_REG(SELECT_CSHW_LO)) && ++ (addr <= IPA_CONTROL_REG(SELECT_SHADER_HI))) { ++ enum kbase_ipa_core_type core_type = (enum kbase_ipa_core_type)( ++ (addr - IPA_CONTROL_REG(SELECT_CSHW_LO)) >> 3); ++ bool is_low_word = ++ !((addr - IPA_CONTROL_REG(SELECT_CSHW_LO)) & 7); ++ ++ if (is_low_word) { ++ ipa_ctl_select_config[core_type] &= ~(u64)U32_MAX; ++ ipa_ctl_select_config[core_type] |= value; ++ } else { ++ ipa_ctl_select_config[core_type] &= U32_MAX; ++ ipa_ctl_select_config[core_type] |= ((u64)value << 32); ++ } ++ } ++#endif ++ else if (addr == MMU_REG(MMU_IRQ_MASK)) { ++ hw_error_status.mmu_irq_mask = value; ++ } else if (addr == MMU_REG(MMU_IRQ_CLEAR)) { ++ hw_error_status.mmu_irq_rawstat &= (~value); ++ } else if ((addr >= MMU_AS_REG(0, AS_TRANSTAB_LO)) && (addr <= MMU_AS_REG(15, AS_STATUS))) { ++ int mem_addr_space = (addr - MMU_AS_REG(0, AS_TRANSTAB_LO)) ++ >> 6; ++ ++ switch (addr & 0x3F) { ++ case AS_COMMAND: ++ switch (value) { ++ case AS_COMMAND_NOP: ++ hw_error_status.as_command[mem_addr_space] = ++ value; ++ break; ++ ++ case AS_COMMAND_UPDATE: ++ hw_error_status.as_command[mem_addr_space] = ++ value; ++ if ((hw_error_status.as_faultstatus[ ++ mem_addr_space]) ++ && ((hw_error_status.as_transtab[ ++ mem_addr_space] & 0x3) != 0)) { ++ model_error_log(KBASE_CORE, ++ "\n ERROR: AS_COMMAND issued UPDATE on error condition before AS_TRANSTAB been set to unmapped\n" ++ ); ++ } else if ((hw_error_status.as_faultstatus[ ++ mem_addr_space]) ++ && ((hw_error_status.as_transtab[ ++ mem_addr_space] & 0x3) == 0)) { ++ ++ /*invalidate all active jobs */ ++ invalidate_active_jobs(dummy); ++ /* error handled */ ++ hw_error_status.as_faultstatus[ ++ mem_addr_space] = 0; ++ } ++ break; ++ ++ case AS_COMMAND_LOCK: ++ case AS_COMMAND_UNLOCK: ++ hw_error_status.as_command[mem_addr_space] = ++ value; ++ break; ++ ++ case AS_COMMAND_FLUSH_PT: ++ case AS_COMMAND_FLUSH_MEM: ++ if (hw_error_status.as_command[mem_addr_space] ++ != AS_COMMAND_LOCK) ++ model_error_log(KBASE_CORE, ++ "\n ERROR: AS_COMMAND issued FLUSH without LOCKING before\n" ++ ); ++ else /* error handled if any */ ++ hw_error_status.as_faultstatus[ ++ mem_addr_space] = 0; ++ hw_error_status.as_command[mem_addr_space] = ++ value; ++ break; ++ ++ default: ++ model_error_log(KBASE_CORE, ++ "\n WARNING: UNRECOGNIZED AS_COMMAND 0x%x\n", ++ value); ++ break; ++ } ++ break; ++ ++ case AS_TRANSTAB_LO: ++ hw_error_status.as_transtab[mem_addr_space] &= ++ ~((u64) (0xffffffff)); ++ hw_error_status.as_transtab[mem_addr_space] |= ++ (u64) value; ++ break; ++ ++ case AS_TRANSTAB_HI: ++ hw_error_status.as_transtab[mem_addr_space] &= ++ (u64) 0xffffffff; ++ hw_error_status.as_transtab[mem_addr_space] |= ++ ((u64) value) << 32; ++ break; ++ ++ case AS_LOCKADDR_LO: ++ case AS_LOCKADDR_HI: ++ case AS_MEMATTR_LO: ++ case AS_MEMATTR_HI: ++ case AS_TRANSCFG_LO: ++ case AS_TRANSCFG_HI: ++ /* Writes ignored */ ++ break; ++ ++ default: ++ model_error_log(KBASE_CORE, ++ "Dummy model register access: Writing unsupported MMU #%d register 0x%x value 0x%x\n", ++ mem_addr_space, addr, value); ++ break; ++ } ++ } else { ++ switch (addr) { ++#if !MALI_USE_CSF ++ case PRFCNT_BASE_LO: ++ performance_counters.prfcnt_base = ++ HI_MASK(performance_counters.prfcnt_base) | value; ++ performance_counters.prfcnt_base_cpu = ++ (u32 *)(uintptr_t)performance_counters.prfcnt_base; ++ break; ++ case PRFCNT_BASE_HI: ++ performance_counters.prfcnt_base = ++ LO_MASK(performance_counters.prfcnt_base) | (((u64)value) << 32); ++ performance_counters.prfcnt_base_cpu = ++ (u32 *)(uintptr_t)performance_counters.prfcnt_base; ++ break; ++ case PRFCNT_JM_EN: ++ performance_counters.prfcnt_en.fe = value; ++ break; ++ case PRFCNT_SHADER_EN: ++ performance_counters.prfcnt_en.shader = value; ++ break; ++ case PRFCNT_TILER_EN: ++ performance_counters.prfcnt_en.tiler = value; ++ break; ++ case PRFCNT_MMU_L2_EN: ++ performance_counters.prfcnt_en.l2 = value; ++ break; ++#endif /* !MALI_USE_CSF */ ++ case TILER_PWRON_LO: ++ dummy->power_on |= (value & 1) << 1; ++ /* Also ensure L2 is powered on */ ++ dummy->power_on |= value & 1; ++ dummy->power_changed = 1; ++ break; ++ case SHADER_PWRON_LO: ++ dummy->power_on |= ++ (value & dummy->control_reg_values->shader_present) << 2; ++ dummy->power_changed = 1; ++ break; ++ case L2_PWRON_LO: ++ dummy->power_on |= value & 1; ++ dummy->power_changed = 1; ++ break; ++ case STACK_PWRON_LO: ++ dummy->stack_power_on_lo |= value; ++ dummy->power_changed = 1; ++ break; ++ case TILER_PWROFF_LO: ++ dummy->power_on &= ~((value & 1) << 1); ++ dummy->power_changed = 1; ++ break; ++ case SHADER_PWROFF_LO: ++ dummy->power_on &= ++ ~((value & dummy->control_reg_values->shader_present) << 2); ++ dummy->power_changed = 1; ++ break; ++ case L2_PWROFF_LO: ++ dummy->power_on &= ~(value & 1); ++ /* Also ensure tiler is powered off */ ++ dummy->power_on &= ~((value & 1) << 1); ++ dummy->power_changed = 1; ++ break; ++ case STACK_PWROFF_LO: ++ dummy->stack_power_on_lo &= ~value; ++ dummy->power_changed = 1; ++ break; ++ ++ case TILER_PWROFF_HI: ++ case SHADER_PWROFF_HI: ++ case L2_PWROFF_HI: ++ case PWR_KEY: ++ case PWR_OVERRIDE0: ++#if !MALI_USE_CSF ++ case JM_CONFIG: ++ case PRFCNT_CONFIG: ++#else /* !MALI_USE_CSF */ ++ case CSF_CONFIG: ++#endif /* !MALI_USE_CSF */ ++ case SHADER_CONFIG: ++ case TILER_CONFIG: ++ case L2_MMU_CONFIG: ++ /* Writes ignored */ ++ break; ++ default: ++ model_error_log(KBASE_CORE, ++ "Dummy model register access: Writing unsupported register 0x%x value 0x%x\n", ++ addr, value); ++ break; ++ } ++ } ++ ++ midgard_model_update(dummy); ++ midgard_model_get_outputs(dummy); ++ spin_unlock_irqrestore(&hw_error_status.access_lock, flags); ++} ++ ++void midgard_model_read_reg(void *h, u32 addr, u32 *const value) ++{ ++ unsigned long flags; ++ struct dummy_model_t *dummy = (struct dummy_model_t *)h; ++ ++ spin_lock_irqsave(&hw_error_status.access_lock, flags); ++ ++ *value = 0; /* 0 by default */ ++#if !MALI_USE_CSF ++ if (addr == JOB_CONTROL_REG(JOB_IRQ_JS_STATE)) { ++ pr_debug("%s", "JS_ACTIVE being read"); ++ ++ *value = dummy->job_irq_js_state; ++ } else if (addr == GPU_CONTROL_REG(GPU_ID)) { ++#else /* !MALI_USE_CSF */ ++ if (addr == GPU_CONTROL_REG(GPU_ID)) { ++#endif /* !MALI_USE_CSF */ ++ ++ *value = dummy->control_reg_values->gpu_id; ++ } else if (addr == JOB_CONTROL_REG(JOB_IRQ_RAWSTAT)) { ++ *value = hw_error_status.job_irq_rawstat; ++ pr_debug("%s", "JS_IRQ_RAWSTAT being read"); ++ } else if (addr == JOB_CONTROL_REG(JOB_IRQ_STATUS)) { ++ *value = hw_error_status.job_irq_status; ++ pr_debug("JS_IRQ_STATUS being read %x", *value); ++ } ++#if !MALI_USE_CSF ++ else if (addr == JOB_CONTROL_REG(JOB_IRQ_MASK)) { ++ int i; ++ ++ *value = 0; ++ for (i = 0; i < NUM_SLOTS; i++) ++ *value |= dummy->slots[i].job_irq_mask << i; ++ pr_debug("JS_IRQ_MASK being read %x", *value); ++ } ++#else /* !MALI_USE_CSF */ ++ else if (addr == JOB_CONTROL_REG(JOB_IRQ_MASK)) ++ ; /* ignore JOB_IRQ_MASK as it is handled by CSFFW */ ++#endif /* !MALI_USE_CSF */ ++ else if (addr == GPU_CONTROL_REG(GPU_IRQ_MASK)) { ++ *value = (dummy->reset_completed_mask << 8) | ++ ((dummy->clean_caches_completed_irq_enabled ? 1u : 0u) << 17) | ++#if MALI_USE_CSF ++ ((dummy->flush_pa_range_completed_irq_enabled ? 1u : 0u) << 20) | ++#endif ++ (dummy->power_changed_mask << 9) | (1 << 7) | 1; ++ pr_debug("GPU_IRQ_MASK read %x", *value); ++ } else if (addr == GPU_CONTROL_REG(GPU_IRQ_RAWSTAT)) { ++ *value = (dummy->power_changed << 9) | (dummy->power_changed << 10) | ++ (dummy->reset_completed << 8) | ++#if !MALI_USE_CSF ++ (dummy->prfcnt_sample_completed ? PRFCNT_SAMPLE_COMPLETED : 0) | ++#endif /* !MALI_USE_CSF */ ++ ((dummy->clean_caches_completed ? 1u : 0u) << 17) | ++#if MALI_USE_CSF ++ ((dummy->flush_pa_range_completed ? 1u : 0u) << 20) | ++#endif ++ hw_error_status.gpu_error_irq; ++ pr_debug("GPU_IRQ_RAWSTAT read %x", *value); ++ } else if (addr == GPU_CONTROL_REG(GPU_IRQ_STATUS)) { ++ *value = ((dummy->power_changed && (dummy->power_changed_mask & 0x1)) << 9) | ++ ((dummy->power_changed && (dummy->power_changed_mask & 0x2)) << 10) | ++ ((dummy->reset_completed & dummy->reset_completed_mask) << 8) | ++#if !MALI_USE_CSF ++ (dummy->prfcnt_sample_completed ? PRFCNT_SAMPLE_COMPLETED : 0) | ++#endif /* !MALI_USE_CSF */ ++ (((dummy->clean_caches_completed && ++ dummy->clean_caches_completed_irq_enabled) ? ++ 1u : ++ 0u) ++ << 17) | ++#if MALI_USE_CSF ++ (((dummy->flush_pa_range_completed && ++ dummy->flush_pa_range_completed_irq_enabled) ? ++ 1u : ++ 0u) ++ << 20) | ++#endif ++ hw_error_status.gpu_error_irq; ++ pr_debug("GPU_IRQ_STAT read %x", *value); ++ } else if (addr == GPU_CONTROL_REG(GPU_STATUS)) { ++ *value = 0; ++#if !MALI_USE_CSF ++ } else if (addr == GPU_CONTROL_REG(LATEST_FLUSH)) { ++ *value = 0; ++#endif ++ } else if (addr == GPU_CONTROL_REG(GPU_FAULTSTATUS)) { ++ *value = hw_error_status.gpu_fault_status; ++ } else if (addr == GPU_CONTROL_REG(L2_CONFIG)) { ++ *value = dummy->l2_config; ++ } ++#if MALI_USE_CSF ++ else if ((addr >= GPU_CONTROL_REG(SYSC_ALLOC0)) && ++ (addr < GPU_CONTROL_REG(SYSC_ALLOC(SYSC_ALLOC_COUNT)))) { ++ *value = 0; ++ } else if ((addr >= GPU_CONTROL_REG(ASN_HASH_0)) && ++ (addr < GPU_CONTROL_REG(ASN_HASH(ASN_HASH_COUNT)))) { ++ *value = 0; ++ } ++#endif ++ else if ((addr >= GPU_CONTROL_REG(SHADER_PRESENT_LO)) && ++ (addr <= GPU_CONTROL_REG(L2_MMU_CONFIG))) { ++ switch (addr) { ++ case GPU_CONTROL_REG(SHADER_PRESENT_LO): ++ case GPU_CONTROL_REG(SHADER_PRESENT_HI): ++ case GPU_CONTROL_REG(TILER_PRESENT_LO): ++ case GPU_CONTROL_REG(TILER_PRESENT_HI): ++ case GPU_CONTROL_REG(L2_PRESENT_LO): ++ case GPU_CONTROL_REG(L2_PRESENT_HI): ++ case GPU_CONTROL_REG(STACK_PRESENT_LO): ++ case GPU_CONTROL_REG(STACK_PRESENT_HI): ++ *value = get_implementation_register(addr, dummy->control_reg_values); ++ break; ++ case GPU_CONTROL_REG(SHADER_READY_LO): ++ *value = (dummy->power_on >> 0x02) & ++ get_implementation_register(GPU_CONTROL_REG(SHADER_PRESENT_LO), ++ dummy->control_reg_values); ++ break; ++ case GPU_CONTROL_REG(TILER_READY_LO): ++ *value = (dummy->power_on >> 0x01) & ++ get_implementation_register(GPU_CONTROL_REG(TILER_PRESENT_LO), ++ dummy->control_reg_values); ++ break; ++ case GPU_CONTROL_REG(L2_READY_LO): ++ *value = dummy->power_on & ++ get_implementation_register(GPU_CONTROL_REG(L2_PRESENT_LO), ++ dummy->control_reg_values); ++ break; ++ case GPU_CONTROL_REG(STACK_READY_LO): ++ *value = dummy->stack_power_on_lo & ++ get_implementation_register(GPU_CONTROL_REG(STACK_PRESENT_LO), ++ dummy->control_reg_values); ++ break; ++ ++ case GPU_CONTROL_REG(SHADER_READY_HI): ++ case GPU_CONTROL_REG(TILER_READY_HI): ++ case GPU_CONTROL_REG(L2_READY_HI): ++ case GPU_CONTROL_REG(STACK_READY_HI): ++ *value = 0; ++ break; ++ ++ case GPU_CONTROL_REG(SHADER_PWRTRANS_LO): ++ case GPU_CONTROL_REG(SHADER_PWRTRANS_HI): ++ case GPU_CONTROL_REG(TILER_PWRTRANS_LO): ++ case GPU_CONTROL_REG(TILER_PWRTRANS_HI): ++ case GPU_CONTROL_REG(L2_PWRTRANS_LO): ++ case GPU_CONTROL_REG(L2_PWRTRANS_HI): ++ case GPU_CONTROL_REG(STACK_PWRTRANS_LO): ++ case GPU_CONTROL_REG(STACK_PWRTRANS_HI): ++ *value = 0; ++ break; ++ ++ case GPU_CONTROL_REG(SHADER_PWRACTIVE_LO): ++ case GPU_CONTROL_REG(SHADER_PWRACTIVE_HI): ++ case GPU_CONTROL_REG(TILER_PWRACTIVE_LO): ++ case GPU_CONTROL_REG(TILER_PWRACTIVE_HI): ++ case GPU_CONTROL_REG(L2_PWRACTIVE_LO): ++ case GPU_CONTROL_REG(L2_PWRACTIVE_HI): ++ *value = 0; ++ break; ++ ++#if !MALI_USE_CSF ++ case GPU_CONTROL_REG(JM_CONFIG): ++#else /* !MALI_USE_CSF */ ++ case GPU_CONTROL_REG(CSF_CONFIG): ++#endif /* !MALI_USE_CSF */ ++ ++ case GPU_CONTROL_REG(SHADER_CONFIG): ++ case GPU_CONTROL_REG(TILER_CONFIG): ++ case GPU_CONTROL_REG(L2_MMU_CONFIG): ++ *value = 0; ++ break; ++ ++ case GPU_CONTROL_REG(COHERENCY_FEATURES): ++ *value = BIT(0) | BIT(1); /* ace_lite and ace, respectively. */ ++ break; ++ case GPU_CONTROL_REG(COHERENCY_ENABLE): ++ *value = dummy->coherency_enable; ++ break; ++ ++ case GPU_CONTROL_REG(THREAD_TLS_ALLOC): ++ *value = 0; ++ break; ++ ++ default: ++ model_error_log(KBASE_CORE, ++ "Dummy model register access: Reading unknown control reg 0x%x\n", ++ addr); ++ break; ++ } ++#if !MALI_USE_CSF ++ } else if ((addr >= JOB_CONTROL_REG(JOB_SLOT0)) && ++ (addr < (JOB_CONTROL_REG(JOB_SLOT15) + 0x80))) { ++ int slot_idx = (addr >> 7) & 0xf; ++ int sub_reg = addr & 0x7F; ++ ++ KBASE_DEBUG_ASSERT(slot_idx < NUM_SLOTS); ++ switch (sub_reg) { ++ case JS_HEAD_NEXT_LO: ++ *value = (u32) ((hw_error_status.current_jc) & ++ 0xFFFFFFFF); ++ break; ++ case JS_HEAD_NEXT_HI: ++ *value = (u32) (hw_error_status.current_jc >> 32); ++ break; ++ case JS_STATUS: ++ if (hw_error_status.js_status[slot_idx]) ++ *value = hw_error_status.js_status[slot_idx]; ++ else /* 0x08 means active, 0x00 idle */ ++ *value = (dummy->slots[slot_idx].job_active) ++ << 3; ++ break; ++ case JS_COMMAND_NEXT: ++ *value = dummy->slots[slot_idx].job_queued; ++ break; ++ ++ /* The dummy model does not implement these registers ++ * avoid printing error messages ++ */ ++ case JS_HEAD_HI: ++ case JS_HEAD_LO: ++ case JS_TAIL_HI: ++ case JS_TAIL_LO: ++ case JS_FLUSH_ID_NEXT: ++ break; ++ ++ default: ++ model_error_log(KBASE_CORE, ++ "Dummy model register access: unknown job slot reg 0x%02X being read\n", ++ sub_reg); ++ break; ++ } ++#endif /* !MALI_USE_CSF */ ++ } else if (addr == GPU_CONTROL_REG(AS_PRESENT)) { ++ *value = dummy->control_reg_values->as_present; ++#if !MALI_USE_CSF ++ } else if (addr == GPU_CONTROL_REG(JS_PRESENT)) { ++ *value = 0x7; ++#endif /* !MALI_USE_CSF */ ++ } else if (addr >= GPU_CONTROL_REG(TEXTURE_FEATURES_0) && ++ addr <= GPU_CONTROL_REG(TEXTURE_FEATURES_3)) { ++ switch (addr) { ++ case GPU_CONTROL_REG(TEXTURE_FEATURES_0): ++ *value = 0xfffff; ++ break; ++ ++ case GPU_CONTROL_REG(TEXTURE_FEATURES_1): ++ *value = 0xffff; ++ break; ++ ++ case GPU_CONTROL_REG(TEXTURE_FEATURES_2): ++ *value = 0x9f81ffff; ++ break; ++ ++ case GPU_CONTROL_REG(TEXTURE_FEATURES_3): ++ *value = 0; ++ break; ++ } ++#if !MALI_USE_CSF ++ } else if (addr >= GPU_CONTROL_REG(JS0_FEATURES) && ++ addr <= GPU_CONTROL_REG(JS15_FEATURES)) { ++ switch (addr) { ++ case GPU_CONTROL_REG(JS0_FEATURES): ++ *value = 0x20e; ++ break; ++ ++ case GPU_CONTROL_REG(JS1_FEATURES): ++ *value = 0x1fe; ++ break; ++ ++ case GPU_CONTROL_REG(JS2_FEATURES): ++ *value = 0x7e; ++ break; ++ ++ default: ++ *value = 0; ++ break; ++ } ++#endif /* !MALI_USE_CSF */ ++ } else if (addr >= GPU_CONTROL_REG(L2_FEATURES) ++ && addr <= GPU_CONTROL_REG(MMU_FEATURES)) { ++ switch (addr) { ++ case GPU_CONTROL_REG(L2_FEATURES): ++ *value = 0x6100206; ++ break; ++ ++ case GPU_CONTROL_REG(CORE_FEATURES): ++ *value = dummy->control_reg_values->core_features; ++ break; ++ ++ case GPU_CONTROL_REG(TILER_FEATURES): ++ *value = dummy->control_reg_values->tiler_features; ++ break; ++ ++ case GPU_CONTROL_REG(MEM_FEATURES): ++ /* Bit 0: Core group is coherent */ ++ *value = 0x01; ++ /* Bits 11:8: L2 slice count - 1 */ ++ *value |= (hweight64(DUMMY_IMPLEMENTATION_L2_PRESENT) - 1) << 8; ++ break; ++ ++ case GPU_CONTROL_REG(MMU_FEATURES): ++ *value = dummy->control_reg_values->mmu_features; ++ break; ++ } ++ } else if (addr >= GPU_CONTROL_REG(THREAD_MAX_THREADS) ++ && addr <= GPU_CONTROL_REG(THREAD_FEATURES)) { ++ switch (addr) { ++ case GPU_CONTROL_REG(THREAD_FEATURES): ++ *value = dummy->control_reg_values->thread_features ++ | (IMPLEMENTATION_MODEL << 30); ++ break; ++ case GPU_CONTROL_REG(THREAD_MAX_BARRIER_SIZE): ++ *value = dummy->control_reg_values->thread_max_barrier_size; ++ break; ++ case GPU_CONTROL_REG(THREAD_MAX_WORKGROUP_SIZE): ++ *value = dummy->control_reg_values->thread_max_workgroup_size; ++ break; ++ case GPU_CONTROL_REG(THREAD_MAX_THREADS): ++ *value = dummy->control_reg_values->thread_max_threads; ++ break; ++ } ++ } else if (addr >= GPU_CONTROL_REG(CYCLE_COUNT_LO) ++ && addr <= GPU_CONTROL_REG(TIMESTAMP_HI)) { ++ *value = 0; ++ } else if (addr >= MMU_AS_REG(0, AS_TRANSTAB_LO) ++ && addr <= MMU_AS_REG(15, AS_STATUS)) { ++ int mem_addr_space = (addr - MMU_AS_REG(0, AS_TRANSTAB_LO)) ++ >> 6; ++ ++ switch (addr & 0x3F) { ++ case AS_TRANSTAB_LO: ++ *value = (u32) ++ (hw_error_status.as_transtab[mem_addr_space] & ++ 0xffffffff); ++ break; ++ ++ case AS_TRANSTAB_HI: ++ *value = (u32) ++ (hw_error_status.as_transtab[mem_addr_space] >> ++ 32); ++ break; ++ ++ case AS_STATUS: ++ *value = 0; ++ break; ++ ++ case AS_FAULTSTATUS: ++ if (mem_addr_space == hw_error_status.faulty_mmu_as) ++ *value = hw_error_status.as_faultstatus[ ++ hw_error_status.faulty_mmu_as]; ++ else ++ *value = 0; ++ break; ++ ++ case AS_LOCKADDR_LO: ++ case AS_LOCKADDR_HI: ++ case AS_MEMATTR_LO: ++ case AS_MEMATTR_HI: ++ case AS_TRANSCFG_LO: ++ case AS_TRANSCFG_HI: ++ /* Read ignored */ ++ *value = 0; ++ break; ++ ++ default: ++ model_error_log(KBASE_CORE, ++ "Dummy model register access: Reading unsupported MMU #%d register 0x%x. Returning 0\n", ++ mem_addr_space, addr); ++ *value = 0; ++ break; ++ } ++ } else if (addr == MMU_REG(MMU_IRQ_MASK)) { ++ *value = hw_error_status.mmu_irq_mask; ++ } else if (addr == MMU_REG(MMU_IRQ_RAWSTAT)) { ++ *value = hw_error_status.mmu_irq_rawstat; ++ } else if (addr == MMU_REG(MMU_IRQ_STATUS)) { ++ *value = hw_error_status.mmu_irq_mask & ++ hw_error_status.mmu_irq_rawstat; ++ } ++#if MALI_USE_CSF ++ else if (addr == IPA_CONTROL_REG(STATUS)) { ++ *value = (ipa_control_timer_enabled << 31); ++ } else if ((addr >= IPA_CONTROL_REG(VALUE_CSHW_REG_LO(0))) && ++ (addr <= IPA_CONTROL_REG(VALUE_CSHW_REG_HI( ++ IPA_CTL_MAX_VAL_CNT_IDX)))) { ++ u32 counter_index = ++ (addr - IPA_CONTROL_REG(VALUE_CSHW_REG_LO(0))) >> 3; ++ bool is_low_word = ++ !((addr - IPA_CONTROL_REG(VALUE_CSHW_REG_LO(0))) & 7); ++ ++ *value = gpu_model_get_prfcnt_value(KBASE_IPA_CORE_TYPE_CSHW, ++ counter_index, is_low_word); ++ } else if ((addr >= IPA_CONTROL_REG(VALUE_MEMSYS_REG_LO(0))) && ++ (addr <= IPA_CONTROL_REG(VALUE_MEMSYS_REG_HI( ++ IPA_CTL_MAX_VAL_CNT_IDX)))) { ++ u32 counter_index = ++ (addr - IPA_CONTROL_REG(VALUE_MEMSYS_REG_LO(0))) >> 3; ++ bool is_low_word = ++ !((addr - IPA_CONTROL_REG(VALUE_MEMSYS_REG_LO(0))) & 7); ++ ++ *value = gpu_model_get_prfcnt_value(KBASE_IPA_CORE_TYPE_MEMSYS, ++ counter_index, is_low_word); ++ } else if ((addr >= IPA_CONTROL_REG(VALUE_TILER_REG_LO(0))) && ++ (addr <= IPA_CONTROL_REG(VALUE_TILER_REG_HI( ++ IPA_CTL_MAX_VAL_CNT_IDX)))) { ++ u32 counter_index = ++ (addr - IPA_CONTROL_REG(VALUE_TILER_REG_LO(0))) >> 3; ++ bool is_low_word = ++ !((addr - IPA_CONTROL_REG(VALUE_TILER_REG_LO(0))) & 7); ++ ++ *value = gpu_model_get_prfcnt_value(KBASE_IPA_CORE_TYPE_TILER, ++ counter_index, is_low_word); ++ } else if ((addr >= IPA_CONTROL_REG(VALUE_SHADER_REG_LO(0))) && ++ (addr <= IPA_CONTROL_REG(VALUE_SHADER_REG_HI( ++ IPA_CTL_MAX_VAL_CNT_IDX)))) { ++ u32 counter_index = ++ (addr - IPA_CONTROL_REG(VALUE_SHADER_REG_LO(0))) >> 3; ++ bool is_low_word = ++ !((addr - IPA_CONTROL_REG(VALUE_SHADER_REG_LO(0))) & 7); ++ ++ *value = gpu_model_get_prfcnt_value(KBASE_IPA_CORE_TYPE_SHADER, ++ counter_index, is_low_word); ++ } ++#endif ++ else if (addr == GPU_CONTROL_REG(GPU_FEATURES_LO)) { ++ *value = dummy->control_reg_values->gpu_features_lo; ++ } else if (addr == GPU_CONTROL_REG(GPU_FEATURES_HI)) { ++ *value = dummy->control_reg_values->gpu_features_hi; ++ } else { ++ model_error_log(KBASE_CORE, ++ "Dummy model register access: Reading unsupported register 0x%x. Returning 0\n", ++ addr); ++ *value = 0; ++ } ++ ++ spin_unlock_irqrestore(&hw_error_status.access_lock, flags); ++ CSTD_UNUSED(dummy); ++} ++ ++static u32 set_user_sample_core_type(u64 *counters, u32 *usr_data_start, u32 usr_data_offset, ++ u32 usr_data_size, u32 core_count) ++{ ++ u32 sample_size; ++ u32 *usr_data = NULL; ++ ++ lockdep_assert_held(&performance_counters.access_lock); ++ ++ sample_size = ++ core_count * KBASE_DUMMY_MODEL_COUNTER_PER_CORE * sizeof(u32); ++ ++ if ((usr_data_size >= usr_data_offset) && ++ (sample_size <= usr_data_size - usr_data_offset)) ++ usr_data = usr_data_start + (usr_data_offset / sizeof(u32)); ++ ++ if (!usr_data) ++ model_error_log(KBASE_CORE, "Unable to set counter sample 1"); ++ else { ++ u32 loop_cnt = core_count * KBASE_DUMMY_MODEL_COUNTER_PER_CORE; ++ u32 i; ++ ++ for (i = 0; i < loop_cnt; i++) { ++ counters[i] = usr_data[i]; ++ } ++ } ++ ++ return usr_data_offset + sample_size; ++} ++ ++static u32 set_kernel_sample_core_type(u64 *counters, ++ u64 *usr_data_start, u32 usr_data_offset, ++ u32 usr_data_size, u32 core_count) ++{ ++ u32 sample_size; ++ u64 *usr_data = NULL; ++ ++ lockdep_assert_held(&performance_counters.access_lock); ++ ++ sample_size = ++ core_count * KBASE_DUMMY_MODEL_COUNTER_PER_CORE * sizeof(u64); ++ ++ if ((usr_data_size >= usr_data_offset) && ++ (sample_size <= usr_data_size - usr_data_offset)) ++ usr_data = usr_data_start + (usr_data_offset / sizeof(u64)); ++ ++ if (!usr_data) ++ model_error_log(KBASE_CORE, "Unable to set kernel counter sample 1"); ++ else ++ memcpy(counters, usr_data, sample_size); ++ ++ return usr_data_offset + sample_size; ++} ++ ++/* Counter values injected through ioctl are of 32 bits */ ++int gpu_model_set_dummy_prfcnt_user_sample(u32 __user *data, u32 size) ++{ ++ unsigned long flags; ++ u32 *user_data; ++ u32 offset = 0; ++ ++ if (data == NULL || size == 0 || size > KBASE_DUMMY_MODEL_COUNTER_TOTAL * sizeof(u32)) ++ return -EINVAL; ++ ++ /* copy_from_user might sleep so can't be called from inside a spinlock ++ * allocate a temporary buffer for user data and copy to that before taking ++ * the lock ++ */ ++ user_data = kmalloc(size, GFP_KERNEL); ++ if (!user_data) ++ return -ENOMEM; ++ ++ if (copy_from_user(user_data, data, size)) { ++ model_error_log(KBASE_CORE, "Unable to copy prfcnt data from userspace"); ++ kfree(user_data); ++ return -EINVAL; ++ } ++ ++ spin_lock_irqsave(&performance_counters.access_lock, flags); ++#if !MALI_USE_CSF ++ offset = set_user_sample_core_type(performance_counters.jm_counters, user_data, offset, ++ size, 1); ++#else ++ offset = set_user_sample_core_type(performance_counters.cshw_counters, user_data, offset, ++ size, 1); ++#endif /* !MALI_USE_CSF */ ++ offset = set_user_sample_core_type(performance_counters.tiler_counters, user_data, offset, ++ size, hweight64(DUMMY_IMPLEMENTATION_TILER_PRESENT)); ++ offset = set_user_sample_core_type(performance_counters.l2_counters, user_data, offset, ++ size, KBASE_DUMMY_MODEL_MAX_MEMSYS_BLOCKS); ++ offset = set_user_sample_core_type(performance_counters.shader_counters, user_data, offset, ++ size, KBASE_DUMMY_MODEL_MAX_SHADER_CORES); ++ spin_unlock_irqrestore(&performance_counters.access_lock, flags); ++ ++ kfree(user_data); ++ return 0; ++} ++ ++/* Counter values injected through kutf are of 64 bits */ ++void gpu_model_set_dummy_prfcnt_kernel_sample(u64 *data, u32 size) ++{ ++ unsigned long flags; ++ u32 offset = 0; ++ ++ spin_lock_irqsave(&performance_counters.access_lock, flags); ++#if !MALI_USE_CSF ++ offset = set_kernel_sample_core_type(performance_counters.jm_counters, data, offset, size, ++ 1); ++#else ++ offset = set_kernel_sample_core_type(performance_counters.cshw_counters, data, offset, size, ++ 1); ++#endif /* !MALI_USE_CSF */ ++ offset = set_kernel_sample_core_type(performance_counters.tiler_counters, data, offset, ++ size, hweight64(DUMMY_IMPLEMENTATION_TILER_PRESENT)); ++ offset = set_kernel_sample_core_type(performance_counters.l2_counters, data, offset, size, ++ hweight64(performance_counters.l2_present)); ++ offset = set_kernel_sample_core_type(performance_counters.shader_counters, data, offset, ++ size, hweight64(performance_counters.shader_present)); ++ spin_unlock_irqrestore(&performance_counters.access_lock, flags); ++} ++KBASE_EXPORT_TEST_API(gpu_model_set_dummy_prfcnt_kernel_sample); ++ ++void gpu_model_get_dummy_prfcnt_cores(struct kbase_device *kbdev, ++ u64 *l2_present, u64 *shader_present) ++{ ++ if (shader_present) ++ *shader_present = performance_counters.shader_present; ++ if (l2_present) ++ *l2_present = performance_counters.l2_present; ++} ++KBASE_EXPORT_TEST_API(gpu_model_get_dummy_prfcnt_cores); ++ ++void gpu_model_set_dummy_prfcnt_cores(struct kbase_device *kbdev, ++ u64 l2_present, u64 shader_present) ++{ ++ if (WARN_ON(!l2_present || !shader_present ++ || hweight64(l2_present) > KBASE_DUMMY_MODEL_MAX_MEMSYS_BLOCKS ++ || hweight64(shader_present) > KBASE_DUMMY_MODEL_MAX_SHADER_CORES)) ++ return; ++ ++ performance_counters.l2_present = l2_present; ++ performance_counters.shader_present = shader_present; ++ ++ /* Update the GPU properties used by vinstr to calculate the counter ++ * dump buffer size. ++ */ ++ kbdev->gpu_props.props.l2_props.num_l2_slices = hweight64(l2_present); ++ kbdev->gpu_props.props.coherency_info.group[0].core_mask = shader_present; ++ kbdev->gpu_props.curr_config.l2_slices = hweight64(l2_present); ++ kbdev->gpu_props.curr_config.shader_present = shader_present; ++} ++KBASE_EXPORT_TEST_API(gpu_model_set_dummy_prfcnt_cores); ++ ++int gpu_model_control(void *model, ++ struct kbase_model_control_params *params) ++{ ++ struct dummy_model_t *dummy = (struct dummy_model_t *)model; ++ int i; ++ unsigned long flags; ++ ++ if (params->command == KBASE_MC_DISABLE_JOBS) { ++ for (i = 0; i < NUM_SLOTS; i++) ++ dummy->slots[i].job_disabled = params->value; ++ } else { ++ return -EINVAL; ++ } ++ ++ spin_lock_irqsave(&hw_error_status.access_lock, flags); ++ midgard_model_update(dummy); ++ midgard_model_get_outputs(dummy); ++ spin_unlock_irqrestore(&hw_error_status.access_lock, flags); ++ ++ return 0; ++} ++ ++/** ++ * kbase_is_gpu_removed - Has the GPU been removed. ++ * @kbdev: Kbase device pointer ++ * ++ * This function would return true if the GPU has been removed. ++ * It is stubbed here ++ * Return: Always false ++ */ ++bool kbase_is_gpu_removed(struct kbase_device *kbdev) ++{ ++ return false; ++} +diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h +new file mode 100644 +index 000000000..84842291c --- /dev/null -+++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c -@@ -0,0 +1,67 @@ ++++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h +@@ -0,0 +1,224 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2010-2015, 2018-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2015, 2017-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -147791,11 +153641,833 @@ index 000000000000..e33fe0b8e415 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ */ ++ ++/* ++ * Dummy Model interface ++ * ++ * Support for NO_MALI dummy Model interface. ++ * ++ * +-----------------------------------+ ++ * | Kbase read/write/IRQ | ++ * +-----------------------------------+ ++ * | Model Linux Framework | ++ * +-----------------------------------+ ++ * | Model Dummy interface definitions | ++ * +-----------------+-----------------+ ++ * | Fake R/W | Fake IRQ | ++ * +-----------------+-----------------+ ++ */ ++ ++#ifndef _KBASE_MODEL_DUMMY_H_ ++#define _KBASE_MODEL_DUMMY_H_ ++ ++#include ++#include ++ ++#define model_error_log(module, ...) pr_err(__VA_ARGS__) ++ ++#define NUM_SLOTS 4 /*number of job slots */ ++ ++/*Errors Mask Codes*/ ++/* each bit of errors_mask is associated to a specific error: ++ * NON FAULT STATUS CODES: only the following are implemented since the others ++ * represent normal working statuses ++ */ ++#define KBASE_JOB_INTERRUPTED (1<<0) ++#define KBASE_JOB_STOPPED (1<<1) ++#define KBASE_JOB_TERMINATED (1<<2) ++ ++/* JOB EXCEPTIONS: */ ++#define KBASE_JOB_CONFIG_FAULT (1<<3) ++#define KBASE_JOB_POWER_FAULT (1<<4) ++#define KBASE_JOB_READ_FAULT (1<<5) ++#define KBASE_JOB_WRITE_FAULT (1<<6) ++#define KBASE_JOB_AFFINITY_FAULT (1<<7) ++#define KBASE_JOB_BUS_FAULT (1<<8) ++#define KBASE_INSTR_INVALID_PC (1<<9) ++#define KBASE_INSTR_INVALID_ENC (1<<10) ++#define KBASE_INSTR_TYPE_MISMATCH (1<<11) ++#define KBASE_INSTR_OPERAND_FAULT (1<<12) ++#define KBASE_INSTR_TLS_FAULT (1<<13) ++#define KBASE_INSTR_BARRIER_FAULT (1<<14) ++#define KBASE_INSTR_ALIGN_FAULT (1<<15) ++#define KBASE_DATA_INVALID_FAULT (1<<16) ++#define KBASE_TILE_RANGE_FAULT (1<<17) ++#define KBASE_ADDR_RANGE_FAULT (1<<18) ++#define KBASE_OUT_OF_MEMORY (1<<19) ++#define KBASE_UNKNOWN (1<<20) ++ ++/* GPU EXCEPTIONS:*/ ++#define KBASE_DELAYED_BUS_FAULT (1<<21) ++#define KBASE_SHAREABILITY_FAULT (1<<22) ++ ++/* MMU EXCEPTIONS:*/ ++#define KBASE_TRANSLATION_FAULT (1<<23) ++#define KBASE_PERMISSION_FAULT (1<<24) ++#define KBASE_TRANSTAB_BUS_FAULT (1<<25) ++#define KBASE_ACCESS_FLAG (1<<26) ++ ++/* generic useful bitmasks */ ++#define IS_A_JOB_ERROR ((KBASE_UNKNOWN << 1) - KBASE_JOB_INTERRUPTED) ++#define IS_A_MMU_ERROR ((KBASE_ACCESS_FLAG << 1) - KBASE_TRANSLATION_FAULT) ++#define IS_A_GPU_ERROR (KBASE_DELAYED_BUS_FAULT|KBASE_SHAREABILITY_FAULT) ++ ++/* number of possible MMU address spaces */ ++#define NUM_MMU_AS 16 /* total number of MMU address spaces as in ++ * MMU_IRQ_RAWSTAT register ++ */ ++ ++/* Forward declaration */ ++struct kbase_device; ++ ++/* ++ * the function below is used to trigger the simulation of a faulty ++ * HW condition for a specific job chain atom ++ */ ++ ++struct kbase_error_params { ++ u64 jc; ++ u32 errors_mask; ++ u32 mmu_table_level; ++ u16 faulty_mmu_as; ++ u16 padding[3]; ++}; ++ ++enum kbase_model_control_command { ++ /* Disable/Enable job completion in the dummy model */ ++ KBASE_MC_DISABLE_JOBS ++}; ++ ++/* struct to control dummy model behavior */ ++struct kbase_model_control_params { ++ s32 command; ++ s32 value; ++}; ++ ++/* struct to track faulty atoms */ ++struct kbase_error_atom { ++ struct kbase_error_params params; ++ struct kbase_error_atom *next; ++}; ++ ++/*struct to track the system error state*/ ++struct error_status_t { ++ spinlock_t access_lock; ++ ++ u32 errors_mask; ++ u32 mmu_table_level; ++ int faulty_mmu_as; ++ ++ u64 current_jc; ++ int current_job_slot; ++ ++ u32 job_irq_rawstat; ++ u32 job_irq_status; ++ u32 js_status[NUM_SLOTS]; ++ ++ u32 mmu_irq_mask; ++ u32 mmu_irq_rawstat; ++ ++ u32 gpu_error_irq; ++ u32 gpu_fault_status; ++ ++ u32 as_faultstatus[NUM_MMU_AS]; ++ u32 as_command[NUM_MMU_AS]; ++ u64 as_transtab[NUM_MMU_AS]; ++}; ++ ++/** ++ * struct gpu_model_prfcnt_en - Performance counter enable masks ++ * @fe: Enable mask for front-end block ++ * @tiler: Enable mask for tiler block ++ * @l2: Enable mask for L2/Memory system blocks ++ * @shader: Enable mask for shader core blocks ++ */ ++struct gpu_model_prfcnt_en { ++ u32 fe; ++ u32 tiler; ++ u32 l2; ++ u32 shader; ++}; ++ ++void midgard_set_error(int job_slot); ++int job_atom_inject_error(struct kbase_error_params *params); ++int gpu_model_control(void *h, ++ struct kbase_model_control_params *params); ++ ++/** ++ * gpu_model_set_dummy_prfcnt_user_sample() - Set performance counter values ++ * @data: Userspace pointer to array of counter values ++ * @size: Size of counter value array ++ * ++ * Counter values set by this function will be used for one sample dump only ++ * after which counters will be cleared back to zero. ++ * ++ * Return: 0 on success, else error code. ++ */ ++int gpu_model_set_dummy_prfcnt_user_sample(u32 __user *data, u32 size); ++ ++/** ++ * gpu_model_set_dummy_prfcnt_kernel_sample() - Set performance counter values ++ * @data: Pointer to array of counter values ++ * @size: Size of counter value array ++ * ++ * Counter values set by this function will be used for one sample dump only ++ * after which counters will be cleared back to zero. ++ */ ++void gpu_model_set_dummy_prfcnt_kernel_sample(u64 *data, u32 size); ++ ++void gpu_model_get_dummy_prfcnt_cores(struct kbase_device *kbdev, ++ u64 *l2_present, u64 *shader_present); ++void gpu_model_set_dummy_prfcnt_cores(struct kbase_device *kbdev, ++ u64 l2_present, u64 shader_present); ++ ++/* Clear the counter values array maintained by the dummy model */ ++void gpu_model_clear_prfcnt_values(void); ++ ++#if MALI_USE_CSF ++/** ++ * gpu_model_prfcnt_dump_request() - Request performance counter sample dump. ++ * @sample_buf: Pointer to KBASE_DUMMY_MODEL_MAX_VALUES_PER_SAMPLE sized array ++ * in which to store dumped performance counter values. ++ * @enable_maps: Physical enable maps for performance counter blocks. ++ */ ++void gpu_model_prfcnt_dump_request(uint32_t *sample_buf, struct gpu_model_prfcnt_en enable_maps); ++ ++/** ++ * gpu_model_glb_request_job_irq() - Trigger job interrupt with global request ++ * flag set. ++ * @model: Model pointer returned by midgard_model_create(). ++ */ ++void gpu_model_glb_request_job_irq(void *model); ++#endif /* MALI_USE_CSF */ ++ ++extern struct error_status_t hw_error_status; ++ ++#endif +diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_error_generator.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_error_generator.c +new file mode 100644 +index 000000000..f310cc74c +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_error_generator.c +@@ -0,0 +1,183 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2014-2015, 2018-2023 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#include ++#include ++#include "backend/gpu/mali_kbase_model_linux.h" ++ ++static struct kbase_error_atom *error_track_list; ++ ++#ifdef CONFIG_MALI_ERROR_INJECT_RANDOM ++ ++/** Kernel 6.1.0 has dropped prandom_u32(), use get_random_u32() */ ++#if (KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE) ++#define prandom_u32 get_random_u32 ++#endif ++ ++/*following error probability are set quite high in order to stress the driver*/ ++static unsigned int error_probability = 50; /* to be set between 0 and 100 */ ++/* probability to have multiple error give that there is an error */ ++static unsigned int multiple_error_probability = 50; ++ ++/* all the error conditions supported by the model */ ++#define TOTAL_FAULTS 27 ++/* maximum number of levels in the MMU translation table tree */ ++#define MAX_MMU_TABLE_LEVEL 4 ++/* worst case scenario is <1 MMU fault + 1 job fault + 2 GPU faults> */ ++#define MAX_CONCURRENT_FAULTS 3 ++ ++/** ++ * gpu_generate_error - Generate GPU error ++ */ ++static void gpu_generate_error(void) ++{ ++ unsigned int errors_num = 0; ++ ++ /*is there at least one error? */ ++ if ((prandom_u32() % 100) < error_probability) { ++ /* pick up a faulty mmu address space */ ++ hw_error_status.faulty_mmu_as = prandom_u32() % NUM_MMU_AS; ++ /* pick up an mmu table level */ ++ hw_error_status.mmu_table_level = ++ 1 + (prandom_u32() % MAX_MMU_TABLE_LEVEL); ++ hw_error_status.errors_mask = ++ (u32)(1 << (prandom_u32() % TOTAL_FAULTS)); ++ ++ /*is there also one or more errors? */ ++ if ((prandom_u32() % 100) < multiple_error_probability) { ++ errors_num = 1 + (prandom_u32() % ++ (MAX_CONCURRENT_FAULTS - 1)); ++ while (errors_num-- > 0) { ++ u32 temp_mask; ++ ++ temp_mask = (u32)( ++ 1 << (prandom_u32() % TOTAL_FAULTS)); ++ /* below we check that no bit of the same error ++ * type is set again in the error mask ++ */ ++ if ((temp_mask & IS_A_JOB_ERROR) && ++ (hw_error_status.errors_mask & ++ IS_A_JOB_ERROR)) { ++ errors_num++; ++ continue; ++ } ++ if ((temp_mask & IS_A_MMU_ERROR) && ++ (hw_error_status.errors_mask & ++ IS_A_MMU_ERROR)) { ++ errors_num++; ++ continue; ++ } ++ if ((temp_mask & IS_A_GPU_ERROR) && ++ (hw_error_status.errors_mask & ++ IS_A_GPU_ERROR)) { ++ errors_num++; ++ continue; ++ } ++ /* this error mask is already set */ ++ if ((hw_error_status.errors_mask | temp_mask) == ++ hw_error_status.errors_mask) { ++ errors_num++; ++ continue; ++ } ++ hw_error_status.errors_mask |= temp_mask; ++ } ++ } ++ } ++} ++#endif ++ ++int job_atom_inject_error(struct kbase_error_params *params) ++{ ++ struct kbase_error_atom *new_elem; ++ ++ KBASE_DEBUG_ASSERT(params); ++ ++ new_elem = kzalloc(sizeof(*new_elem), GFP_KERNEL); ++ ++ if (!new_elem) { ++ model_error_log(KBASE_CORE, ++ "\njob_atom_inject_error: kzalloc failed for new_elem\n" ++ ); ++ return -ENOMEM; ++ } ++ new_elem->params.jc = params->jc; ++ new_elem->params.errors_mask = params->errors_mask; ++ new_elem->params.mmu_table_level = params->mmu_table_level; ++ new_elem->params.faulty_mmu_as = params->faulty_mmu_as; ++ ++ /*circular list below */ ++ if (error_track_list == NULL) { /*no elements */ ++ error_track_list = new_elem; ++ new_elem->next = error_track_list; ++ } else { ++ struct kbase_error_atom *walker = error_track_list; ++ ++ while (walker->next != error_track_list) ++ walker = walker->next; ++ ++ new_elem->next = error_track_list; ++ walker->next = new_elem; ++ } ++ return 0; ++} ++ ++void midgard_set_error(int job_slot) ++{ ++#ifdef CONFIG_MALI_ERROR_INJECT_RANDOM ++ gpu_generate_error(); ++#else ++ struct kbase_error_atom *walker, *auxiliar; ++ ++ if (error_track_list != NULL) { ++ walker = error_track_list->next; ++ auxiliar = error_track_list; ++ do { ++ if (walker->params.jc == hw_error_status.current_jc) { ++ /* found a faulty atom matching with the ++ * current one ++ */ ++ hw_error_status.errors_mask = ++ walker->params.errors_mask; ++ hw_error_status.mmu_table_level = ++ walker->params.mmu_table_level; ++ hw_error_status.faulty_mmu_as = ++ walker->params.faulty_mmu_as; ++ hw_error_status.current_job_slot = job_slot; ++ ++ if (walker->next == walker) { ++ /* only one element */ ++ kfree(error_track_list); ++ error_track_list = NULL; ++ } else { ++ auxiliar->next = walker->next; ++ if (walker == error_track_list) ++ error_track_list = walker->next; ++ ++ kfree(walker); ++ } ++ break; ++ } ++ auxiliar = walker; ++ walker = walker->next; ++ } while (auxiliar->next != error_track_list); ++ } ++#endif /* CONFIG_MALI_ERROR_INJECT_RANDOM */ ++} +diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.c +new file mode 100644 +index 000000000..e90e4df2f +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.c +@@ -0,0 +1,244 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2010, 2012-2015, 2017-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++/* ++ * Model Linux Framework interfaces. ++ */ ++ ++#include ++#include ++ ++#include "backend/gpu/mali_kbase_model_linux.h" ++#include "device/mali_kbase_device.h" ++#include "mali_kbase_irq_internal.h" ++ ++#include ++ ++struct model_irq_data { ++ struct kbase_device *kbdev; ++ struct work_struct work; ++}; ++ ++static void serve_job_irq(struct work_struct *work) ++{ ++ struct model_irq_data *data = container_of(work, struct model_irq_data, ++ work); ++ struct kbase_device *kbdev = data->kbdev; ++ ++ /* Make sure no worker is already serving this IRQ */ ++ while (atomic_cmpxchg(&kbdev->serving_job_irq, 1, 0) == 1) { ++ u32 val; ++ ++ while ((val = kbase_reg_read(kbdev, ++ JOB_CONTROL_REG(JOB_IRQ_STATUS)))) { ++ unsigned long flags; ++ ++ /* Handle the IRQ */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++#if MALI_USE_CSF ++ kbase_csf_interrupt(kbdev, val); ++#else ++ kbase_job_done(kbdev, val); ++#endif ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } ++ } ++ ++ kmem_cache_free(kbdev->irq_slab, data); ++} ++ ++static void serve_gpu_irq(struct work_struct *work) ++{ ++ struct model_irq_data *data = container_of(work, struct model_irq_data, ++ work); ++ struct kbase_device *kbdev = data->kbdev; ++ ++ /* Make sure no worker is already serving this IRQ */ ++ while (atomic_cmpxchg(&kbdev->serving_gpu_irq, 1, 0) == 1) { ++ u32 val; ++ ++ while ((val = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(GPU_IRQ_STATUS)))) { ++ /* Handle the IRQ */ ++ kbase_gpu_interrupt(kbdev, val); ++ } ++ } ++ ++ kmem_cache_free(kbdev->irq_slab, data); ++} ++ ++static void serve_mmu_irq(struct work_struct *work) ++{ ++ struct model_irq_data *data = container_of(work, struct model_irq_data, ++ work); ++ struct kbase_device *kbdev = data->kbdev; ++ ++ /* Make sure no worker is already serving this IRQ */ ++ if (atomic_cmpxchg(&kbdev->serving_mmu_irq, 1, 0) == 1) { ++ u32 val; ++ ++ while ((val = kbase_reg_read(kbdev, ++ MMU_REG(MMU_IRQ_STATUS)))) { ++ /* Handle the IRQ */ ++ kbase_mmu_interrupt(kbdev, val); ++ } ++ } ++ ++ kmem_cache_free(kbdev->irq_slab, data); ++} ++ ++void gpu_device_raise_irq(void *model, u32 irq) ++{ ++ struct model_irq_data *data; ++ struct kbase_device *kbdev = gpu_device_get_data(model); ++ ++ KBASE_DEBUG_ASSERT(kbdev); ++ ++ data = kmem_cache_alloc(kbdev->irq_slab, GFP_ATOMIC); ++ if (data == NULL) ++ return; ++ ++ data->kbdev = kbdev; ++ ++ switch (irq) { ++ case MODEL_LINUX_JOB_IRQ: ++ INIT_WORK(&data->work, serve_job_irq); ++ atomic_set(&kbdev->serving_job_irq, 1); ++ break; ++ case MODEL_LINUX_GPU_IRQ: ++ INIT_WORK(&data->work, serve_gpu_irq); ++ atomic_set(&kbdev->serving_gpu_irq, 1); ++ break; ++ case MODEL_LINUX_MMU_IRQ: ++ INIT_WORK(&data->work, serve_mmu_irq); ++ atomic_set(&kbdev->serving_mmu_irq, 1); ++ break; ++ default: ++ dev_warn(kbdev->dev, "Unknown IRQ"); ++ kmem_cache_free(kbdev->irq_slab, data); ++ data = NULL; ++ break; ++ } ++ ++ if (data != NULL) ++ queue_work(kbdev->irq_workq, &data->work); ++} ++ ++void kbase_reg_write(struct kbase_device *kbdev, u32 offset, u32 value) ++{ ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->reg_op_lock, flags); ++ midgard_model_write_reg(kbdev->model, offset, value); ++ spin_unlock_irqrestore(&kbdev->reg_op_lock, flags); ++} ++ ++KBASE_EXPORT_TEST_API(kbase_reg_write); ++ ++u32 kbase_reg_read(struct kbase_device *kbdev, u32 offset) ++{ ++ unsigned long flags; ++ u32 val; ++ ++ spin_lock_irqsave(&kbdev->reg_op_lock, flags); ++ midgard_model_read_reg(kbdev->model, offset, &val); ++ spin_unlock_irqrestore(&kbdev->reg_op_lock, flags); ++ ++ return val; ++} ++KBASE_EXPORT_TEST_API(kbase_reg_read); ++ ++int kbase_install_interrupts(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev); ++ ++ atomic_set(&kbdev->serving_job_irq, 0); ++ atomic_set(&kbdev->serving_gpu_irq, 0); ++ atomic_set(&kbdev->serving_mmu_irq, 0); ++ ++ kbdev->irq_workq = alloc_ordered_workqueue("dummy irq queue", 0); ++ if (kbdev->irq_workq == NULL) ++ return -ENOMEM; ++ ++ kbdev->irq_slab = kmem_cache_create("dummy_irq_slab", ++ sizeof(struct model_irq_data), 0, 0, NULL); ++ if (kbdev->irq_slab == NULL) { ++ destroy_workqueue(kbdev->irq_workq); ++ return -ENOMEM; ++ } ++ ++ return 0; ++} ++ ++void kbase_release_interrupts(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev); ++ destroy_workqueue(kbdev->irq_workq); ++ kmem_cache_destroy(kbdev->irq_slab); ++} ++ ++void kbase_synchronize_irqs(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev); ++ flush_workqueue(kbdev->irq_workq); ++} ++ ++KBASE_EXPORT_TEST_API(kbase_synchronize_irqs); ++ ++int kbase_set_custom_irq_handler(struct kbase_device *kbdev, ++ irq_handler_t custom_handler, ++ int irq_type) ++{ ++ return 0; ++} ++ ++KBASE_EXPORT_TEST_API(kbase_set_custom_irq_handler); ++ ++irqreturn_t kbase_gpu_irq_test_handler(int irq, void *data, u32 val) ++{ ++ if (!val) ++ return IRQ_NONE; ++ ++ return IRQ_HANDLED; ++} ++ ++KBASE_EXPORT_TEST_API(kbase_gpu_irq_test_handler); ++ ++int kbase_gpu_device_create(struct kbase_device *kbdev) ++{ ++ kbdev->model = midgard_model_create(kbdev); ++ if (kbdev->model == NULL) ++ return -ENOMEM; ++ ++ spin_lock_init(&kbdev->reg_op_lock); ++ ++ return 0; ++} ++ ++/** ++ * kbase_gpu_device_destroy - Destroy GPU device ++ * ++ * @kbdev: kbase device ++ */ ++void kbase_gpu_device_destroy(struct kbase_device *kbdev) ++{ ++ midgard_model_destroy(kbdev->model); ++} +diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h +new file mode 100644 +index 000000000..8f09afe3d +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h +@@ -0,0 +1,151 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++/* ++ * Model Linux Framework interfaces. ++ * ++ * This framework is used to provide generic Kbase Models interfaces. ++ * Note: Backends cannot be used together; the selection is done at build time. ++ * ++ * - Without Model Linux Framework: ++ * +-----------------------------+ ++ * | Kbase read/write/IRQ | ++ * +-----------------------------+ ++ * | HW interface definitions | ++ * +-----------------------------+ ++ * ++ * - With Model Linux Framework: ++ * +-----------------------------+ ++ * | Kbase read/write/IRQ | ++ * +-----------------------------+ ++ * | Model Linux Framework | ++ * +-----------------------------+ ++ * | Model interface definitions | ++ * +-----------------------------+ ++ */ ++ ++#ifndef _KBASE_MODEL_LINUX_H_ ++#define _KBASE_MODEL_LINUX_H_ ++ ++/* ++ * Include Model definitions ++ */ ++ ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++#include ++#endif /* IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ ++ ++#if !IS_ENABLED(CONFIG_MALI_REAL_HW) ++/** ++ * kbase_gpu_device_create() - Generic create function. ++ * ++ * @kbdev: Kbase device. ++ * ++ * Specific model hook is implemented by midgard_model_create() ++ * ++ * Return: 0 on success, error code otherwise. ++ */ ++int kbase_gpu_device_create(struct kbase_device *kbdev); ++ ++/** ++ * kbase_gpu_device_destroy() - Generic create function. ++ * ++ * @kbdev: Kbase device. ++ * ++ * Specific model hook is implemented by midgard_model_destroy() ++ */ ++void kbase_gpu_device_destroy(struct kbase_device *kbdev); ++ ++/** ++ * midgard_model_create() - Private create function. ++ * ++ * @kbdev: Kbase device. ++ * ++ * This hook is specific to the model built in Kbase. ++ * ++ * Return: Model handle. ++ */ ++void *midgard_model_create(struct kbase_device *kbdev); ++ ++/** ++ * midgard_model_destroy() - Private destroy function. ++ * ++ * @h: Model handle. ++ * ++ * This hook is specific to the model built in Kbase. ++ */ ++void midgard_model_destroy(void *h); ++ ++/** ++ * midgard_model_write_reg() - Private model write function. ++ * ++ * @h: Model handle. ++ * @addr: Address at which to write. ++ * @value: value to write. ++ * ++ * This hook is specific to the model built in Kbase. ++ */ ++void midgard_model_write_reg(void *h, u32 addr, u32 value); ++ ++/** ++ * midgard_model_read_reg() - Private model read function. ++ * ++ * @h: Model handle. ++ * @addr: Address from which to read. ++ * @value: Pointer where to store the read value. ++ * ++ * This hook is specific to the model built in Kbase. ++ */ ++void midgard_model_read_reg(void *h, u32 addr, u32 *const value); ++ ++/** ++ * gpu_device_raise_irq() - Private IRQ raise function. ++ * ++ * @model: Model handle. ++ * @irq: IRQ type to raise. ++ * ++ * This hook is global to the model Linux framework. ++ */ ++void gpu_device_raise_irq(void *model, u32 irq); ++ ++/** ++ * gpu_device_set_data() - Private model set data function. ++ * ++ * @model: Model handle. ++ * @data: Data carried by model. + * ++ * This hook is global to the model Linux framework. + */ ++void gpu_device_set_data(void *model, void *data); + ++/** ++ * gpu_device_get_data() - Private model get data function. ++ * ++ * @model: Model handle. ++ * ++ * This hook is global to the model Linux framework. ++ * ++ * Return: Pointer to the data carried by model. ++ */ ++void *gpu_device_get_data(void *model); ++#endif /* !IS_ENABLED(CONFIG_MALI_REAL_HW) */ + ++#endif /* _KBASE_MODEL_LINUX_H_ */ +diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c +new file mode 100755 +index 000000000..bbf629065 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c +@@ -0,0 +1,73 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2010-2015, 2018-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + +/* + * "Always on" power management policy @@ -147819,6 +154491,11 @@ index 000000000000..e33fe0b8e415 + CSTD_UNUSED(kbdev); +} + ++/** ++ * always_on_term - Term callback function for always-on power policy ++ * ++ * @kbdev: kbase device ++ */ +static void always_on_term(struct kbase_device *kbdev) +{ + CSTD_UNUSED(kbdev); @@ -147836,24 +154513,29 @@ index 000000000000..e33fe0b8e415 + always_on_term, /* term */ + always_on_shaders_needed, /* shaders_needed */ + always_on_get_core_active, /* get_core_active */ ++ NULL, /* handle_event */ + KBASE_PM_POLICY_ID_ALWAYS_ON, /* id */ ++#if MALI_USE_CSF ++ ALWAYS_ON_PM_SCHED_FLAGS, /* pm_sched_flags */ ++#endif +}; + +KBASE_EXPORT_TEST_API(kbase_pm_always_on_policy_ops); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h new file mode 100755 -index 000000000000..e7927cf82e5a +index 000000000..98d35dabe --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h -@@ -0,0 +1,81 @@ +@@ -0,0 +1,78 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2011-2015,2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2015, 2018, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -147864,12 +154546,8 @@ index 000000000000..e7927cf82e5a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/* + * "Always on" power management policy + */ @@ -147929,18 +154607,19 @@ index 000000000000..e7927cf82e5a + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c new file mode 100755 -index 000000000000..7b10d06c5fdb +index 000000000..5c71fdf15 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c -@@ -0,0 +1,788 @@ -+ /* +@@ -0,0 +1,1238 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -147951,11 +154630,8 @@ index 000000000000..7b10d06c5fdb + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ +/* + * GPU backend implementation of base kernel power management APIs + */ @@ -147969,12 +154645,15 @@ index 000000000000..7b10d06c5fdb +#include +#include +#include ++#else ++#include ++#include +#endif /* !MALI_USE_CSF */ -+#include ++#include +#include +#include +#include -+#include ++#include + +static void kbase_pm_gpu_poweroff_wait_wq(struct work_struct *data); +static void kbase_pm_hwcnt_disable_worker(struct work_struct *data); @@ -148006,6 +154685,10 @@ index 000000000000..7b10d06c5fdb + callbacks->power_runtime_idle_callback; + kbdev->pm.backend.callback_soft_reset = + callbacks->soft_reset_callback; ++ kbdev->pm.backend.callback_power_runtime_gpu_idle = ++ callbacks->power_runtime_gpu_idle_callback; ++ kbdev->pm.backend.callback_power_runtime_gpu_active = ++ callbacks->power_runtime_gpu_active_callback; + + if (callbacks->power_runtime_init_callback) + return callbacks->power_runtime_init_callback(kbdev); @@ -148023,15 +154706,16 @@ index 000000000000..7b10d06c5fdb + kbdev->pm.backend.callback_power_runtime_off = NULL; + kbdev->pm.backend.callback_power_runtime_idle = NULL; + kbdev->pm.backend.callback_soft_reset = NULL; ++ kbdev->pm.backend.callback_power_runtime_gpu_idle = NULL; ++ kbdev->pm.backend.callback_power_runtime_gpu_active = NULL; + + return 0; +} + +void kbase_pm_runtime_term(struct kbase_device *kbdev) +{ -+ if (kbdev->pm.callback_power_runtime_term) { ++ if (kbdev->pm.callback_power_runtime_term) + kbdev->pm.callback_power_runtime_term(kbdev); -+ } +} + +void kbase_pm_register_access_enable(struct kbase_device *kbdev) @@ -148057,10 +154741,10 @@ index 000000000000..7b10d06c5fdb + + callbacks = (struct kbase_pm_callback_conf *)POWER_MANAGEMENT_CALLBACKS; + ++ kbdev->pm.backend.gpu_powered = false; ++ + if (callbacks) + callbacks->power_off_callback(kbdev); -+ -+ kbdev->pm.backend.gpu_powered = false; +} + +int kbase_hwaccess_pm_init(struct kbase_device *kbdev) @@ -148091,15 +154775,25 @@ index 000000000000..7b10d06c5fdb +#endif /* CONFIG_MALI_BIFROST_DEBUG */ + init_waitqueue_head(&kbdev->pm.backend.gpu_in_desired_state_wait); + ++#if !MALI_USE_CSF + /* Initialise the metrics subsystem */ + ret = kbasep_pm_metrics_init(kbdev); + if (ret) + return ret; ++#else ++ mutex_init(&kbdev->pm.backend.policy_change_lock); ++ kbdev->pm.backend.policy_change_clamp_state_to_off = false; ++ /* Due to dependency on kbase_ipa_control, the metrics subsystem can't ++ * be initialized here. ++ */ ++ CSTD_UNUSED(ret); ++#endif + + init_waitqueue_head(&kbdev->pm.backend.reset_done_wait); + kbdev->pm.backend.reset_done = false; + + init_waitqueue_head(&kbdev->pm.zero_active_count_wait); ++ init_waitqueue_head(&kbdev->pm.resume_wait); + kbdev->pm.active_count = 0; + + spin_lock_init(&kbdev->pm.backend.gpu_cycle_counter_requests_lock); @@ -148120,6 +154814,14 @@ index 000000000000..7b10d06c5fdb + kbase_pm_hwcnt_disable_worker); + kbase_hwcnt_context_disable(kbdev->hwcnt_gpu_ctx); + ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++ kbdev->pm.backend.gpu_sleep_supported = ++ kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_GPU_SLEEP) && ++ !kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TURSEHW_1997) && ++ kbdev->pm.backend.callback_power_runtime_gpu_active && ++ kbdev->pm.backend.callback_power_runtime_gpu_idle; ++#endif ++ + if (IS_ENABLED(CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED)) { + kbdev->pm.backend.l2_always_on = false; + kbdev->pm.backend.gpu_clock_slow_down_wa = false; @@ -148156,7 +154858,9 @@ index 000000000000..7b10d06c5fdb + kbase_pm_policy_term(kbdev); + kbase_pm_ca_term(kbdev); +workq_fail: ++#if !MALI_USE_CSF + kbasep_pm_metrics_term(kbdev); ++#endif + return -EINVAL; +} + @@ -148165,7 +154869,8 @@ index 000000000000..7b10d06c5fdb + lockdep_assert_held(&kbdev->pm.lock); + + /* Turn clocks and interrupts on - no-op if we haven't done a previous -+ * kbase_pm_clock_off() */ ++ * kbase_pm_clock_off() ++ */ + kbase_pm_clock_on(kbdev, is_resume); + + if (!is_resume) { @@ -148183,7 +154888,78 @@ index 000000000000..7b10d06c5fdb + kbase_pm_update_cores_state(kbdev); + + /* NOTE: We don't wait to reach the desired state, since running atoms -+ * will wait for that state to be reached anyway */ ++ * will wait for that state to be reached anyway ++ */ ++} ++ ++static void pm_handle_power_off(struct kbase_device *kbdev) ++{ ++ struct kbase_pm_backend_data *backend = &kbdev->pm.backend; ++#if MALI_USE_CSF ++ enum kbase_mcu_state mcu_state; ++#endif ++ unsigned long flags; ++ ++ lockdep_assert_held(&kbdev->pm.lock); ++ ++ if (backend->poweron_required) ++ return; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++ if (kbdev->pm.backend.gpu_wakeup_override) { ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ return; ++ } ++#endif ++ WARN_ON(backend->shaders_state != ++ KBASE_SHADERS_OFF_CORESTACK_OFF || ++ backend->l2_state != KBASE_L2_OFF); ++#if MALI_USE_CSF ++ mcu_state = backend->mcu_state; ++ WARN_ON(!kbase_pm_is_mcu_inactive(kbdev, mcu_state)); ++#endif ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++ if (backend->callback_power_runtime_gpu_idle) { ++ WARN_ON(backend->gpu_idled); ++ backend->callback_power_runtime_gpu_idle(kbdev); ++ backend->gpu_idled = true; ++ return; ++ } ++#endif ++ ++ /* Disable interrupts and turn the clock off */ ++ if (!kbase_pm_clock_off(kbdev)) { ++ /* ++ * Page/bus faults are pending, must drop locks to ++ * process. Interrupts are disabled so no more faults ++ * should be generated at this point. ++ */ ++ kbase_pm_unlock(kbdev); ++ kbase_flush_mmu_wqs(kbdev); ++ kbase_pm_lock(kbdev); ++ ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ /* poweron_required may have changed while pm lock ++ * was released. ++ */ ++ if (kbase_pm_is_gpu_lost(kbdev)) ++ backend->poweron_required = false; ++#endif ++ ++ /* Turn off clock now that fault have been handled. We ++ * dropped locks so poweron_required may have changed - ++ * power back on if this is the case (effectively only ++ * re-enabling of the interrupts would be done in this ++ * case, as the clocks to GPU were not withdrawn yet). ++ */ ++ if (backend->poweron_required) ++ kbase_pm_clock_on(kbdev, false); ++ else ++ WARN_ON(!kbase_pm_clock_off(kbdev)); ++ } +} + +static void kbase_pm_gpu_poweroff_wait_wq(struct work_struct *data) @@ -148194,6 +154970,8 @@ index 000000000000..7b10d06c5fdb + struct kbase_pm_backend_data *backend = &pm->backend; + unsigned long flags; + ++ KBASE_KTRACE_ADD(kbdev, PM_POWEROFF_WAIT_WQ, NULL, 0); ++ +#if !MALI_USE_CSF + /* Wait for power transitions to complete. We do this with no locks held + * so that we don't deadlock with any pending workqueues. @@ -148203,51 +154981,7 @@ index 000000000000..7b10d06c5fdb + + kbase_pm_lock(kbdev); + -+#ifdef CONFIG_MALI_ARBITER_SUPPORT -+ if (kbase_pm_is_gpu_lost(kbdev)) -+ backend->poweron_required = false; -+#endif -+ -+ if (!backend->poweron_required) { -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ WARN_ON(backend->shaders_state != -+ KBASE_SHADERS_OFF_CORESTACK_OFF || -+ backend->l2_state != KBASE_L2_OFF); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ -+ /* Disable interrupts and turn the clock off */ -+ if (!kbase_pm_clock_off(kbdev)) { -+ /* -+ * Page/bus faults are pending, must drop locks to -+ * process. Interrupts are disabled so no more faults -+ * should be generated at this point. -+ */ -+ kbase_pm_unlock(kbdev); -+ kbase_flush_mmu_wqs(kbdev); -+ kbase_pm_lock(kbdev); -+ -+#ifdef CONFIG_MALI_ARBITER_SUPPORT -+ /* poweron_required may have changed while pm lock -+ * was released. -+ */ -+ if (kbase_pm_is_gpu_lost(kbdev)) -+ backend->poweron_required = false; -+#endif -+ -+ /* Turn off clock now that fault have been handled. We -+ * dropped locks so poweron_required may have changed - -+ * power back on if this is the case (effectively only -+ * re-enabling of the interrupts would be done in this -+ * case, as the clocks to GPU were not withdrawn yet). -+ */ -+ if (backend->poweron_required) -+ kbase_pm_clock_on(kbdev, false); -+ else -+ WARN_ON(!kbase_pm_clock_off(kbdev)); -+ } -+ } ++ pm_handle_power_off(kbdev); + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + backend->poweroff_wait_in_progress = false; @@ -148301,8 +155035,7 @@ index 000000000000..7b10d06c5fdb + return; + + /* Stop the metrics gathering framework */ -+ if (kbase_pm_metrics_is_active(kbdev)) -+ kbase_pm_metrics_stop(kbdev); ++ kbase_pm_metrics_stop(kbdev); + + /* Keep the current freq to restore it upon resume */ + kbdev->previous_frequency = clk_get_rate(clk); @@ -148421,12 +155154,92 @@ index 000000000000..7b10d06c5fdb + /* PM state was updated while we were doing the disable, + * so we need to undo the disable we just performed. + */ ++#if MALI_USE_CSF ++ unsigned long lock_flags; ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &lock_flags); ++#endif + kbase_hwcnt_context_enable(kbdev->hwcnt_gpu_ctx); ++#if MALI_USE_CSF ++ kbase_csf_scheduler_spin_unlock(kbdev, lock_flags); ++#endif + } + + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} + ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++/** ++ * kbase_pm_do_poweroff_sync - Do the synchronous power down of GPU ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * This function is called at the time of system suspend or device unload ++ * to power down the GPU synchronously. This is needed as the power down of GPU ++ * would usually happen from the runtime suspend callback function (if gpu_active ++ * and gpu_idle callbacks are used) and runtime suspend operation is disabled ++ * when system suspend takes place. ++ * The function first waits for the @gpu_poweroff_wait_work to complete, which ++ * could have been enqueued after the last PM reference was released. ++ * ++ * Return: 0 on success, negative value otherwise. ++ */ ++static int kbase_pm_do_poweroff_sync(struct kbase_device *kbdev) ++{ ++ struct kbase_pm_backend_data *backend = &kbdev->pm.backend; ++ unsigned long flags; ++ int ret = 0; ++ ++ WARN_ON(kbdev->pm.active_count); ++ ++ kbase_pm_wait_for_poweroff_work_complete(kbdev); ++ ++ kbase_pm_lock(kbdev); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ WARN_ON(backend->poweroff_wait_in_progress); ++ WARN_ON(backend->gpu_sleep_mode_active); ++ if (backend->gpu_powered) { ++ ++ backend->mcu_desired = false; ++ backend->l2_desired = false; ++ kbase_pm_update_state(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ ret = kbase_pm_wait_for_desired_state(kbdev); ++ if (ret) { ++ dev_warn( ++ kbdev->dev, ++ "Wait for pm state change failed on synchronous power off"); ++ ret = -EBUSY; ++ goto out; ++ } ++ ++ /* Due to the power policy, GPU could have been kept active ++ * throughout and so need to invoke the idle callback before ++ * the power down. ++ */ ++ if (backend->callback_power_runtime_gpu_idle && ++ !backend->gpu_idled) { ++ backend->callback_power_runtime_gpu_idle(kbdev); ++ backend->gpu_idled = true; ++ } ++ ++ if (!kbase_pm_clock_off(kbdev)) { ++ dev_warn( ++ kbdev->dev, ++ "Failed to turn off GPU clocks on synchronous power off, MMU faults pending"); ++ ret = -EBUSY; ++ } ++ } else { ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } ++ ++out: ++ kbase_pm_unlock(kbdev); ++ return ret; ++} ++#endif ++ +void kbase_pm_do_poweroff(struct kbase_device *kbdev) +{ + unsigned long flags; @@ -148476,12 +155289,38 @@ index 000000000000..7b10d06c5fdb + return ret; +} + -+void kbase_pm_wait_for_poweroff_complete(struct kbase_device *kbdev) ++void kbase_pm_wait_for_poweroff_work_complete(struct kbase_device *kbdev) +{ + wait_event_killable(kbdev->pm.backend.poweroff_wait, + is_poweroff_in_progress(kbdev)); +} -+KBASE_EXPORT_TEST_API(kbase_pm_wait_for_poweroff_complete); ++KBASE_EXPORT_TEST_API(kbase_pm_wait_for_poweroff_work_complete); ++ ++/** ++ * is_gpu_powered_down - Check whether GPU is powered down ++ * ++ * @kbdev: kbase device ++ * ++ * Return: true if GPU is powered down, false otherwise ++ */ ++static bool is_gpu_powered_down(struct kbase_device *kbdev) ++{ ++ bool ret; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ret = !kbdev->pm.backend.gpu_powered; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ return ret; ++} ++ ++void kbase_pm_wait_for_gpu_power_down(struct kbase_device *kbdev) ++{ ++ wait_event_killable(kbdev->pm.backend.poweroff_wait, ++ is_gpu_powered_down(kbdev)); ++} ++KBASE_EXPORT_TEST_API(kbase_pm_wait_for_gpu_power_down); + +int kbase_hwaccess_pm_powerup(struct kbase_device *kbdev, + unsigned int flags) @@ -148497,21 +155336,45 @@ index 000000000000..7b10d06c5fdb + KBASE_DEBUG_ASSERT(!kbase_pm_is_suspending(kbdev)); + + /* Power up the GPU, don't enable IRQs as we are not ready to receive -+ * them. */ ++ * them ++ */ + ret = kbase_pm_init_hw(kbdev, flags); + if (ret) { + kbase_pm_unlock(kbdev); + return ret; + } -+ ++#if MALI_USE_CSF ++ kbdev->pm.debug_core_mask = ++ kbdev->gpu_props.props.raw_props.shader_present; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, irq_flags); ++ /* Set the initial value for 'shaders_avail'. It would be later ++ * modified only from the MCU state machine, when the shader core ++ * allocation enable mask request has completed. So its value would ++ * indicate the mask of cores that are currently being used by FW for ++ * the allocation of endpoints requested by CSGs. ++ */ ++ kbdev->pm.backend.shaders_avail = kbase_pm_ca_get_core_mask(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, irq_flags); ++#else + kbdev->pm.debug_core_mask_all = kbdev->pm.debug_core_mask[0] = + kbdev->pm.debug_core_mask[1] = + kbdev->pm.debug_core_mask[2] = + kbdev->gpu_props.props.raw_props.shader_present; ++#endif + + /* Pretend the GPU is active to prevent a power policy turning the GPU -+ * cores off */ ++ * cores off ++ */ + kbdev->pm.active_count = 1; ++#if MALI_USE_CSF && KBASE_PM_RUNTIME ++ if (kbdev->pm.backend.callback_power_runtime_gpu_active) { ++ /* Take the RPM reference count to match with the internal ++ * PM reference count ++ */ ++ kbdev->pm.backend.callback_power_runtime_gpu_active(kbdev); ++ WARN_ON(kbdev->pm.backend.gpu_idled); ++ } ++#endif + + spin_lock_irqsave(&kbdev->pm.backend.gpu_cycle_counter_requests_lock, + irq_flags); @@ -148522,7 +155385,8 @@ index 000000000000..7b10d06c5fdb + irq_flags); + + /* We are ready to receive IRQ's now as power policy is set up, so -+ * enable them now. */ ++ * enable them now. ++ */ +#ifdef CONFIG_MALI_BIFROST_DEBUG + kbdev->pm.backend.driver_ready_for_irqs = true; +#endif @@ -148552,9 +155416,15 @@ index 000000000000..7b10d06c5fdb +{ + KBASE_DEBUG_ASSERT(kbdev != NULL); + ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++ WARN_ON(kbase_pm_do_poweroff_sync(kbdev)); ++#else + mutex_lock(&kbdev->pm.lock); + kbase_pm_do_poweroff(kbdev); + mutex_unlock(&kbdev->pm.lock); ++ ++ kbase_pm_wait_for_poweroff_work_complete(kbdev); ++#endif +} + +KBASE_EXPORT_TEST_API(kbase_hwaccess_pm_halt); @@ -148569,10 +155439,15 @@ index 000000000000..7b10d06c5fdb + + if (kbdev->pm.backend.hwcnt_disabled) { + unsigned long flags; -+ ++#if MALI_USE_CSF ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ kbase_hwcnt_context_enable(kbdev->hwcnt_gpu_ctx); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++#else + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + kbase_hwcnt_context_enable(kbdev->hwcnt_gpu_ctx); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++#endif + } + + /* Free any resources the policy allocated */ @@ -148580,8 +155455,16 @@ index 000000000000..7b10d06c5fdb + kbase_pm_policy_term(kbdev); + kbase_pm_ca_term(kbdev); + ++#if !MALI_USE_CSF + /* Shut down the metrics subsystem */ + kbasep_pm_metrics_term(kbdev); ++#else ++ if (WARN_ON(mutex_is_locked(&kbdev->pm.backend.policy_change_lock))) { ++ mutex_lock(&kbdev->pm.backend.policy_change_lock); ++ mutex_unlock(&kbdev->pm.backend.policy_change_lock); ++ } ++ mutex_destroy(&kbdev->pm.backend.policy_change_lock); ++#endif + + destroy_workqueue(kbdev->pm.backend.gpu_poweroff_wait_wq); +} @@ -148594,12 +155477,23 @@ index 000000000000..7b10d06c5fdb + kbase_pm_update_state(kbdev); + +#if !MALI_USE_CSF -+ kbase_backend_slot_update(kbdev); ++ kbase_backend_slot_update(kbdev); +#endif /* !MALI_USE_CSF */ + + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} + ++#if MALI_USE_CSF ++void kbase_pm_set_debug_core_mask(struct kbase_device *kbdev, u64 new_core_mask) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ lockdep_assert_held(&kbdev->pm.lock); ++ ++ kbdev->pm.debug_core_mask = new_core_mask; ++ kbase_pm_update_dynamic_cores_onoff(kbdev); ++} ++KBASE_EXPORT_TEST_API(kbase_pm_set_debug_core_mask); ++#else +void kbase_pm_set_debug_core_mask(struct kbase_device *kbdev, + u64 new_core_mask_js0, u64 new_core_mask_js1, + u64 new_core_mask_js2) @@ -148608,7 +155502,7 @@ index 000000000000..7b10d06c5fdb + lockdep_assert_held(&kbdev->pm.lock); + + if (kbase_dummy_job_wa_enabled(kbdev)) { -+ dev_warn(kbdev->dev, "Change of core mask not supported for slot 0 as dummy job WA is enabled"); ++ dev_warn_once(kbdev->dev, "Change of core mask not supported for slot 0 as dummy job WA is enabled"); + new_core_mask_js0 = kbdev->pm.debug_core_mask[0]; + } + @@ -148620,6 +155514,7 @@ index 000000000000..7b10d06c5fdb + + kbase_pm_update_dynamic_cores_onoff(kbdev); +} ++#endif /* MALI_USE_CSF */ + +void kbase_hwaccess_pm_gpu_active(struct kbase_device *kbdev) +{ @@ -148631,11 +155526,19 @@ index 000000000000..7b10d06c5fdb + kbase_pm_update_active(kbdev); +} + -+void kbase_hwaccess_pm_suspend(struct kbase_device *kbdev) ++int kbase_hwaccess_pm_suspend(struct kbase_device *kbdev) +{ ++ int ret = 0; ++ ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++ ret = kbase_pm_do_poweroff_sync(kbdev); ++ if (ret) ++ return ret; ++#else + /* Force power off the GPU and all cores (regardless of policy), only + * after the PM active count reaches zero (otherwise, we risk turning it -+ * off prematurely) */ ++ * off prematurely) ++ */ + kbase_pm_lock(kbdev); + + kbase_pm_do_poweroff(kbdev); @@ -148646,10 +155549,16 @@ index 000000000000..7b10d06c5fdb + + kbase_pm_unlock(kbdev); + -+ kbase_pm_wait_for_poweroff_complete(kbdev); ++ kbase_pm_wait_for_poweroff_work_complete(kbdev); ++#endif ++ ++ WARN_ON(kbdev->pm.backend.gpu_powered); ++ WARN_ON(atomic_read(&kbdev->faults_pending)); + + if (kbdev->pm.backend.callback_power_suspend) + kbdev->pm.backend.callback_power_suspend(kbdev); ++ ++ return ret; +} + +void kbase_hwaccess_pm_resume(struct kbase_device *kbdev) @@ -148670,6 +155579,7 @@ index 000000000000..7b10d06c5fdb + kbase_backend_timer_resume(kbdev); +#endif /* !MALI_USE_CSF */ + ++ wake_up_all(&kbdev->pm.resume_wait); + kbase_pm_unlock(kbdev); +} + @@ -148677,9 +155587,12 @@ index 000000000000..7b10d06c5fdb +void kbase_pm_handle_gpu_lost(struct kbase_device *kbdev) +{ + unsigned long flags; -+ ktime_t end_timestamp = ktime_get(); ++ ktime_t end_timestamp = ktime_get_raw(); + struct kbase_arbiter_vm_state *arb_vm_state = kbdev->pm.arb_vm_state; + ++ if (!kbdev->arb.arb_if) ++ return; ++ + mutex_lock(&kbdev->pm.lock); + mutex_lock(&arb_vm_state->vm_state_lock); + if (kbdev->pm.backend.gpu_powered && @@ -148711,9 +155624,12 @@ index 000000000000..7b10d06c5fdb + + /* Cancel any pending HWC dumps */ + spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; -+ kbdev->hwcnt.backend.triggered = 1; -+ wake_up(&kbdev->hwcnt.backend.wait); ++ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_DUMPING || ++ kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_FAULT) { ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_FAULT; ++ kbdev->hwcnt.backend.triggered = 1; ++ wake_up(&kbdev->hwcnt.backend.wait); ++ } + spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); + } + mutex_unlock(&arb_vm_state->vm_state_lock); @@ -148721,20 +155637,233 @@ index 000000000000..7b10d06c5fdb +} + +#endif /* CONFIG_MALI_ARBITER_SUPPORT */ ++ ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++int kbase_pm_force_mcu_wakeup_after_sleep(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ ++ lockdep_assert_held(&kbdev->pm.lock); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ /* Set the override flag to force the power up of L2 cache */ ++ kbdev->pm.backend.gpu_wakeup_override = true; ++ kbase_pm_update_state(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ return kbase_pm_wait_for_desired_state(kbdev); ++} ++ ++static int pm_handle_mcu_sleep_on_runtime_suspend(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ int ret; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ lockdep_assert_held(&kbdev->pm.lock); ++ ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ /* In case of no active CSG on slot, powering up L2 could be skipped and ++ * proceed directly to suspend GPU. ++ * ToDo: firmware has to be reloaded after wake-up as no halt command ++ * has been sent when GPU was put to sleep mode. ++ */ ++ if (!kbase_csf_scheduler_get_nr_active_csgs(kbdev)) ++ dev_info( ++ kbdev->dev, ++ "No active CSGs. Can skip the power up of L2 and go for suspension directly"); ++#endif ++ ++ ret = kbase_pm_force_mcu_wakeup_after_sleep(kbdev); ++ if (ret) { ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ dev_warn( ++ kbdev->dev, ++ "Waiting for MCU to wake up failed on runtime suspend"); ++ kbdev->pm.backend.gpu_wakeup_override = false; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ return ret; ++ } ++ ++ /* Check if a Doorbell mirror interrupt occurred meanwhile */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ if (kbdev->pm.backend.gpu_sleep_mode_active && ++ kbdev->pm.backend.exit_gpu_sleep_mode) { ++ dev_dbg(kbdev->dev, "DB mirror interrupt occurred during runtime suspend after L2 power up"); ++ kbdev->pm.backend.gpu_wakeup_override = false; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ return -EBUSY; ++ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ /* Need to release the kbdev->pm.lock to avoid lock ordering issue ++ * with kctx->reg.lock, which is taken if the sync wait condition is ++ * evaluated after the CSG suspend operation. ++ */ ++ kbase_pm_unlock(kbdev); ++ ret = kbase_csf_scheduler_handle_runtime_suspend(kbdev); ++ kbase_pm_lock(kbdev); ++ ++ /* Power down L2 cache */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbdev->pm.backend.gpu_wakeup_override = false; ++ kbase_pm_update_state(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ /* After re-acquiring the kbdev->pm.lock, check if the device ++ * became active (or active then idle) meanwhile. ++ */ ++ if (kbdev->pm.active_count || ++ kbdev->pm.backend.poweroff_wait_in_progress) { ++ dev_dbg(kbdev->dev, ++ "Device became active on runtime suspend after suspending Scheduler"); ++ ret = -EBUSY; ++ } ++ ++ if (ret) ++ return ret; ++ ++ ret = kbase_pm_wait_for_desired_state(kbdev); ++ if (ret) ++ dev_warn(kbdev->dev, "Wait for power down failed on runtime suspend"); ++ ++ return ret; ++} ++ ++int kbase_pm_handle_runtime_suspend(struct kbase_device *kbdev) ++{ ++ enum kbase_mcu_state mcu_state; ++ bool exit_early = false; ++ unsigned long flags; ++ int ret = 0; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ /* This check is needed for the case where Kbase had invoked the ++ * @power_off_callback directly. ++ */ ++ if (!kbdev->pm.backend.gpu_powered) { ++ dev_dbg(kbdev->dev, "GPU already powered down on runtime suspend"); ++ exit_early = true; ++ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ if (exit_early) ++ goto out; ++ ++ ret = kbase_reset_gpu_try_prevent(kbdev); ++ if (ret == -ENOMEM) { ++ dev_dbg(kbdev->dev, "Quit runtime suspend as GPU is in bad state"); ++ /* Finish the runtime suspend, no point in trying again as GPU is ++ * in irrecoverable bad state. ++ */ ++ goto out; ++ } else if (ret) { ++ dev_dbg(kbdev->dev, "Quit runtime suspend for failing to prevent gpu reset"); ++ ret = -EBUSY; ++ goto out; ++ } ++ ++ kbase_csf_scheduler_lock(kbdev); ++ kbase_pm_lock(kbdev); ++ ++ /* ++ * This is to handle the case where GPU device becomes active and idle ++ * very quickly whilst the runtime suspend callback is executing. ++ * This is useful for the following scenario :- ++ * - GPU goes idle and pm_callback_runtime_gpu_idle() is called. ++ * - Auto-suspend timer expires and kbase_device_runtime_suspend() ++ * is called. ++ * - GPU becomes active and pm_callback_runtime_gpu_active() calls ++ * pm_runtime_get(). ++ * - Shortly after that GPU becomes idle again. ++ * - kbase_pm_handle_runtime_suspend() gets called. ++ * - pm_callback_runtime_gpu_idle() is called. ++ * ++ * We do not want to power down the GPU immediately after it goes idle. ++ * So if we notice that GPU had become active when the runtime suspend ++ * had already kicked in, we abort the runtime suspend. ++ * By aborting the runtime suspend, we defer the power down of GPU. ++ * ++ * This check also helps prevent warnings regarding L2 and MCU states ++ * inside the pm_handle_power_off() function. The warning stems from ++ * the fact that pm.lock is released before invoking Scheduler function ++ * to suspend the CSGs. ++ */ ++ if (kbdev->pm.active_count || ++ kbdev->pm.backend.poweroff_wait_in_progress) { ++ dev_dbg(kbdev->dev, "Device became active on runtime suspend"); ++ ret = -EBUSY; ++ goto unlock; ++ } ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ if (kbdev->pm.backend.gpu_sleep_mode_active && ++ kbdev->pm.backend.exit_gpu_sleep_mode) { ++ dev_dbg(kbdev->dev, "DB mirror interrupt occurred during runtime suspend before L2 power up"); ++ ret = -EBUSY; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ goto unlock; ++ } ++ ++ mcu_state = kbdev->pm.backend.mcu_state; ++ WARN_ON(!kbase_pm_is_mcu_inactive(kbdev, mcu_state)); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ if (mcu_state == KBASE_MCU_IN_SLEEP) { ++ ret = pm_handle_mcu_sleep_on_runtime_suspend(kbdev); ++ if (ret) ++ goto unlock; ++ } ++ ++ /* Disable interrupts and turn off the GPU clocks */ ++ if (!kbase_pm_clock_off(kbdev)) { ++ dev_warn(kbdev->dev, "Failed to turn off GPU clocks on runtime suspend, MMU faults pending"); ++ ++ WARN_ON(!kbdev->poweroff_pending); ++ /* Previous call to kbase_pm_clock_off() would have disabled ++ * the interrupts and also synchronized with the interrupt ++ * handlers, so more fault work items can't be enqueued. ++ * ++ * Can't wait for the completion of MMU fault work items as ++ * there is a possibility of a deadlock since the fault work ++ * items would do the group termination which requires the ++ * Scheduler lock. ++ */ ++ ret = -EBUSY; ++ goto unlock; ++ } ++ ++ wake_up(&kbdev->pm.backend.poweroff_wait); ++ WARN_ON(kbdev->pm.backend.gpu_powered); ++ dev_dbg(kbdev->dev, "GPU power down complete"); ++ ++unlock: ++ kbase_pm_unlock(kbdev); ++ kbase_csf_scheduler_unlock(kbdev); ++ kbase_reset_gpu_allow(kbdev); ++out: ++ if (ret) { ++ ret = -EBUSY; ++ pm_runtime_mark_last_busy(kbdev->dev); ++ } ++ ++ return ret; ++} ++#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c new file mode 100755 -index 000000000000..984e12503009 +index 000000000..e2b0a9192 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c -@@ -0,0 +1,114 @@ +@@ -0,0 +1,150 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2013-2018, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2013-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -148745,8 +155874,6 @@ index 000000000000..984e12503009 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -148756,9 +155883,7 @@ index 000000000000..984e12503009 +#include +#include +#include -+#ifdef MALI_BIFROST_NO_MALI -+#include -+#endif ++#include +#include + +int kbase_pm_ca_init(struct kbase_device *kbdev) @@ -148785,9 +155910,22 @@ index 000000000000..984e12503009 +{ + struct kbase_pm_backend_data *pm_backend = &kbdev->pm.backend; + unsigned long flags; ++#if MALI_USE_CSF ++ u64 old_core_mask = 0; ++#endif + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + ++#if MALI_USE_CSF ++ if (!(core_mask & kbdev->pm.debug_core_mask)) { ++ dev_err(kbdev->dev, ++ "OPP core mask 0x%llX does not intersect with debug mask 0x%llX\n", ++ core_mask, kbdev->pm.debug_core_mask); ++ goto unlock; ++ } ++ ++ old_core_mask = pm_backend->ca_cores_enabled; ++#else + if (!(core_mask & kbdev->pm.debug_core_mask_all)) { + dev_err(kbdev->dev, "OPP core mask 0x%llX does not intersect with debug mask 0x%llX\n", + core_mask, kbdev->pm.debug_core_mask_all); @@ -148795,35 +155933,61 @@ index 000000000000..984e12503009 + } + + if (kbase_dummy_job_wa_enabled(kbdev)) { -+ dev_err(kbdev->dev, "Dynamic core scaling not supported as dummy job WA is enabled"); ++ dev_err_once(kbdev->dev, "Dynamic core scaling not supported as dummy job WA is enabled"); + goto unlock; + } -+ ++#endif /* MALI_USE_CSF */ + pm_backend->ca_cores_enabled = core_mask; + + kbase_pm_update_state(kbdev); -+ -+unlock: + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + ++#if MALI_USE_CSF ++ /* Check if old_core_mask contained the undesired cores and wait ++ * for those cores to get powered down ++ */ ++ if ((core_mask & old_core_mask) != old_core_mask) { ++ if (kbase_pm_wait_for_cores_down_scale(kbdev)) { ++ dev_warn(kbdev->dev, ++ "Wait for update of core_mask from %llx to %llx failed", ++ old_core_mask, core_mask); ++ } ++ } ++#endif ++ + dev_dbg(kbdev->dev, "Devfreq policy : new core mask=%llX\n", + pm_backend->ca_cores_enabled); ++ ++ return; ++unlock: ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} ++KBASE_EXPORT_TEST_API(kbase_devfreq_set_core_mask); +#endif + +u64 kbase_pm_ca_get_core_mask(struct kbase_device *kbdev) +{ -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+ struct kbase_pm_backend_data *pm_backend = &kbdev->pm.backend; ++#if MALI_USE_CSF ++ u64 debug_core_mask = kbdev->pm.debug_core_mask; ++#else ++ u64 debug_core_mask = kbdev->pm.debug_core_mask_all; +#endif + + lockdep_assert_held(&kbdev->hwaccess_lock); + +#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+ return pm_backend->ca_cores_enabled & kbdev->pm.debug_core_mask_all; ++ /* ++ * Although in the init we let the pm_backend->ca_cores_enabled to be ++ * the max config (it uses the base_gpu_props), at this function we need ++ * to limit it to be a subgroup of the curr config, otherwise the ++ * shaders state machine on the PM does not evolve. ++ */ ++ return kbdev->gpu_props.curr_config.shader_present & ++ kbdev->pm.backend.ca_cores_enabled & ++ debug_core_mask; +#else -+ return kbdev->gpu_props.props.raw_props.shader_present & -+ kbdev->pm.debug_core_mask_all; ++ return kbdev->gpu_props.curr_config.shader_present & ++ debug_core_mask; +#endif +} + @@ -148833,7 +155997,7 @@ index 000000000000..984e12503009 +{ + lockdep_assert_held(&kbdev->hwaccess_lock); + -+#ifdef CONFIG_MALI_BIFROST_NO_MALI ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) + return (((1ull) << KBASE_DUMMY_MODEL_MAX_SHADER_CORES) - 1); +#elif MALI_USE_CSF + return kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_SHADER); @@ -148843,18 +156007,19 @@ index 000000000000..984e12503009 +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h new file mode 100755 -index 000000000000..5423e96725b9 +index 000000000..90dcaf5b6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h -@@ -0,0 +1,89 @@ +@@ -0,0 +1,88 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2011-2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2018, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -148865,8 +156030,6 @@ index 000000000000..5423e96725b9 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -148879,10 +156042,10 @@ index 000000000000..5423e96725b9 +/** + * kbase_pm_ca_init - Initialize core availability framework + * -+ * Must be called before calling any other core availability function -+ * + * @kbdev: The kbase device structure for the device (must be a valid pointer) + * ++ * Must be called before calling any other core availability function ++ * + * Return: 0 if the core availability framework was successfully initialized, + * -errno otherwise + */ @@ -148938,18 +156101,19 @@ index 000000000000..5423e96725b9 +#endif /* _KBASE_PM_CA_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h new file mode 100755 -index 000000000000..f67ec650c981 +index 000000000..d1e4b5327 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h -@@ -0,0 +1,60 @@ +@@ -0,0 +1,59 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2017, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -148960,8 +156124,6 @@ index 000000000000..f67ec650c981 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -148975,12 +156137,12 @@ index 000000000000..f67ec650c981 +/** + * struct kbasep_pm_ca_policy_devfreq - Private structure for devfreq ca policy + * -+ * This contains data that is private to the devfreq core availability -+ * policy. -+ * + * @cores_desired: Cores that the policy wants to be available + * @cores_enabled: Cores that the policy is currently returning as available + * @cores_used: Cores currently powered or transitioning ++ * ++ * This contains data that is private to the devfreq core availability ++ * policy. + */ +struct kbasep_pm_ca_policy_devfreq { + u64 cores_desired; @@ -149004,18 +156166,19 @@ index 000000000000..f67ec650c981 + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c new file mode 100755 -index 000000000000..9eef44ad877f +index 000000000..f40b75385 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c -@@ -0,0 +1,66 @@ +@@ -0,0 +1,67 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2012-2016, 2018-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2016, 2018-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -149026,12 +156189,8 @@ index 000000000000..9eef44ad877f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/* + * "Coarse Demand" power management policy + */ @@ -149070,24 +156229,29 @@ index 000000000000..9eef44ad877f + coarse_demand_term, /* term */ + coarse_demand_shaders_needed, /* shaders_needed */ + coarse_demand_get_core_active, /* get_core_active */ ++ NULL, /* handle_event */ + KBASE_PM_POLICY_ID_COARSE_DEMAND, /* id */ ++#if MALI_USE_CSF ++ COARSE_ON_DEMAND_PM_SCHED_FLAGS, /* pm_sched_flags */ ++#endif +}; + +KBASE_EXPORT_TEST_API(kbase_pm_coarse_demand_policy_ops); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h new file mode 100755 -index 000000000000..304e5d7fa32d +index 000000000..a947e8f55 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h -@@ -0,0 +1,69 @@ +@@ -0,0 +1,64 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2012-2015,2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2015, 2018, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -149098,12 +156262,8 @@ index 000000000000..304e5d7fa32d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/* + * "Coarse Demand" power management policy + */ @@ -149137,10 +156297,8 @@ index 000000000000..304e5d7fa32d +/** + * struct kbasep_pm_policy_coarse_demand - Private structure for coarse demand + * policy -+ * -+ * This contains data that is private to the coarse demand power policy. -+ * + * @dummy: Dummy member - no state needed ++ * This contains data that is private to the coarse demand power policy. + */ +struct kbasep_pm_policy_coarse_demand { + int dummy; @@ -149151,18 +156309,19 @@ index 000000000000..304e5d7fa32d +#endif /* MALI_KBASE_PM_COARSE_DEMAND_H */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h new file mode 100755 -index 000000000000..7322c093c7b6 +index 000000000..75d99a30e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h -@@ -0,0 +1,560 @@ +@@ -0,0 +1,649 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -149173,8 +156332,6 @@ index 000000000000..7322c093c7b6 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -149186,8 +156343,9 @@ index 000000000000..7322c093c7b6 + +#include "mali_kbase_pm_always_on.h" +#include "mali_kbase_pm_coarse_demand.h" -+#if !MALI_CUSTOMER_RELEASE -+#include "mali_kbase_pm_always_on_demand.h" ++ ++#if defined(CONFIG_PM_RUNTIME) || defined(CONFIG_PM) ++#define KBASE_PM_RUNTIME 1 +#endif + +/* Forward definition - see mali_kbase.h */ @@ -149197,6 +156355,11 @@ index 000000000000..7322c093c7b6 +/** + * enum kbase_pm_core_type - The types of core in a GPU. + * ++ * @KBASE_PM_CORE_L2: The L2 cache ++ * @KBASE_PM_CORE_SHADER: Shader cores ++ * @KBASE_PM_CORE_TILER: Tiler cores ++ * @KBASE_PM_CORE_STACK: Core stacks ++ * + * These enumerated values are used in calls to + * - kbase_pm_get_present_cores() + * - kbase_pm_get_active_cores() @@ -149206,11 +156369,6 @@ index 000000000000..7322c093c7b6 + * They specify which type of core should be acted on. These values are set in + * a manner that allows core_type_to_reg() function to be simpler and more + * efficient. -+ * -+ * @KBASE_PM_CORE_L2: The L2 cache -+ * @KBASE_PM_CORE_SHADER: Shader cores -+ * @KBASE_PM_CORE_TILER: Tiler cores -+ * @KBASE_PM_CORE_STACK: Core stacks + */ +enum kbase_pm_core_type { + KBASE_PM_CORE_L2 = L2_PRESENT_LO, @@ -149219,24 +156377,9 @@ index 000000000000..7322c093c7b6 + KBASE_PM_CORE_STACK = STACK_PRESENT_LO +}; + -+/** ++/* + * enum kbase_l2_core_state - The states used for the L2 cache & tiler power + * state machine. -+ * -+ * @KBASE_L2_OFF: The L2 cache and tiler are off -+ * @KBASE_L2_PEND_ON: The L2 cache and tiler are powering on -+ * @KBASE_L2_RESTORE_CLOCKS: The GPU clock is restored. Conditionally used. -+ * @KBASE_L2_ON_HWCNT_ENABLE: The L2 cache and tiler are on, and hwcnt is being -+ * enabled -+ * @KBASE_L2_ON: The L2 cache and tiler are on, and hwcnt is enabled -+ * @KBASE_L2_ON_HWCNT_DISABLE: The L2 cache and tiler are on, and hwcnt is being -+ * disabled -+ * @KBASE_L2_SLOW_DOWN_CLOCKS: The GPU clock is set to appropriate or lowest -+ * clock. Conditionally used. -+ * @KBASE_L2_POWER_DOWN: The L2 cache and tiler are about to be powered off -+ * @KBASE_L2_PEND_OFF: The L2 cache and tiler are powering off -+ * @KBASE_L2_RESET_WAIT: The GPU is resetting, L2 cache and tiler power state -+ * are unknown + */ +enum kbase_l2_core_state { +#define KBASEP_L2_STATE(n) KBASE_L2_ ## n, @@ -149245,24 +156388,8 @@ index 000000000000..7322c093c7b6 +}; + +#if MALI_USE_CSF -+/** ++/* + * enum kbase_mcu_state - The states used for the MCU state machine. -+ * -+ * @KBASE_MCU_OFF: The MCU is powered off. -+ * @KBASE_MCU_PEND_ON_RELOAD: The warm boot of MCU or cold boot of MCU (with -+ * firmware reloading) is in progress. -+ * @KBASE_MCU_ON_GLB_REINIT_PEND: The MCU is enabled and Global configuration -+ * requests have been sent to the firmware. -+ * @KBASE_MCU_ON_HWCNT_ENABLE: The Global requests have completed and MCU is -+ * now ready for use and hwcnt is being enabled. -+ * @KBASE_MCU_ON: The MCU is active and hwcnt has been enabled. -+ * @KBASE_MCU_ON_HWCNT_DISABLE: The MCU is on and hwcnt is being disabled. -+ * @KBASE_MCU_ON_HALT: The MCU is on and hwcnt has been disabled, -+ * MCU halt would be triggered. -+ * @KBASE_MCU_ON_PEND_HALT: MCU halt in progress, confirmation pending. -+ * @KBASE_MCU_POWER_DOWN: MCU halted operations, pending being disabled. -+ * @KBASE_MCU_PEND_OFF: MCU is being disabled, pending on powering off. -+ * @KBASE_MCU_RESET_WAIT: The GPU is resetting, MCU state is unknown. + */ +enum kbase_mcu_state { +#define KBASEP_MCU_STATE(n) KBASE_MCU_ ## n, @@ -149271,45 +156398,8 @@ index 000000000000..7322c093c7b6 +}; +#endif + -+/** ++/* + * enum kbase_shader_core_state - The states used for the shaders' state machine. -+ * -+ * @KBASE_SHADERS_OFF_CORESTACK_OFF: The shaders and core stacks are off -+ * @KBASE_SHADERS_OFF_CORESTACK_PEND_ON: The shaders are off, core stacks have -+ * been requested to power on and hwcnt -+ * is being disabled -+ * @KBASE_SHADERS_PEND_ON_CORESTACK_ON: Core stacks are on, shaders have been -+ * requested to power on. Or after doing -+ * partial shader on/off, checking whether -+ * it's the desired state. -+ * @KBASE_SHADERS_ON_CORESTACK_ON: The shaders and core stacks are on, and hwcnt -+ * already enabled. -+ * @KBASE_SHADERS_ON_CORESTACK_ON_RECHECK: The shaders and core stacks -+ * are on, hwcnt disabled, and checks -+ * to powering down or re-enabling -+ * hwcnt. -+ * @KBASE_SHADERS_WAIT_OFF_CORESTACK_ON: The shaders have been requested to -+ * power off, but they remain on for the -+ * duration of the hysteresis timer -+ * @KBASE_SHADERS_WAIT_GPU_IDLE: The shaders partial poweroff needs to reach -+ * a state where jobs on the GPU are finished -+ * including jobs currently running and in the -+ * GPU queue because of GPU2017-861 -+ * @KBASE_SHADERS_WAIT_FINISHED_CORESTACK_ON: The hysteresis timer has expired -+ * @KBASE_SHADERS_L2_FLUSHING_CORESTACK_ON: The core stacks are on and the -+ * level 2 cache is being flushed. -+ * @KBASE_SHADERS_READY_OFF_CORESTACK_ON: The core stacks are on and the shaders -+ * are ready to be powered off. -+ * @KBASE_SHADERS_PEND_OFF_CORESTACK_ON: The core stacks are on, and the shaders -+ * have been requested to power off -+ * @KBASE_SHADERS_OFF_CORESTACK_PEND_OFF: The shaders are off, and the core stacks -+ * have been requested to power off -+ * @KBASE_SHADERS_OFF_CORESTACK_OFF_TIMER_PEND_OFF: Shaders and corestacks are -+ * off, but the tick timer -+ * cancellation is still -+ * pending. -+ * @KBASE_SHADERS_RESET_WAIT: The GPU is resetting, shader and core stack power -+ * states are unknown + */ +enum kbase_shader_core_state { +#define KBASEP_SHADER_STATE(n) KBASE_SHADERS_ ## n, @@ -149321,50 +156411,68 @@ index 000000000000..7322c093c7b6 + * struct kbasep_pm_metrics - Metrics data collected for use by the power + * management framework. + * -+ * @time_busy: number of ns the GPU was busy executing jobs since the -+ * @time_period_start timestamp. -+ * @time_idle: number of ns since time_period_start the GPU was not executing -+ * jobs since the @time_period_start timestamp. -+ * @busy_cl: number of ns the GPU was busy executing CL jobs. Note that -+ * if two CL jobs were active for 400ns, this value would be updated -+ * with 800. -+ * @busy_gl: number of ns the GPU was busy executing GL jobs. Note that -+ * if two GL jobs were active for 400ns, this value would be updated -+ * with 800. ++ * @time_busy: the amount of time the GPU was busy executing jobs since the ++ * @time_period_start timestamp, in units of 256ns. This also includes ++ * time_in_protm, the time spent in protected mode, since it's assumed ++ * the GPU was busy 100% during this period. ++ * @time_idle: the amount of time the GPU was not executing jobs since the ++ * time_period_start timestamp, measured in units of 256ns. ++ * @time_in_protm: The amount of time the GPU has spent in protected mode since ++ * the time_period_start timestamp, measured in units of 256ns. ++ * @busy_cl: the amount of time the GPU was busy executing CL jobs. Note that ++ * if two CL jobs were active for 256ns, this value would be updated ++ * with 2 (2x256ns). ++ * @busy_gl: the amount of time the GPU was busy executing GL jobs. Note that ++ * if two GL jobs were active for 256ns, this value would be updated ++ * with 2 (2x256ns). + */ +struct kbasep_pm_metrics { + u32 time_busy; + u32 time_idle; ++#if MALI_USE_CSF ++ u32 time_in_protm; ++#else + u32 busy_cl[2]; + u32 busy_gl; ++#endif +}; + +/** + * struct kbasep_pm_metrics_state - State required to collect the metrics in + * struct kbasep_pm_metrics + * @time_period_start: time at which busy/idle measurements started ++ * @ipa_control_client: Handle returned on registering DVFS as a ++ * kbase_ipa_control client ++ * @skip_gpu_active_sanity_check: Decide whether to skip GPU_ACTIVE sanity ++ * check in DVFS utilisation calculation + * @gpu_active: true when the GPU is executing jobs. false when + * not. Updated when the job scheduler informs us a job in submitted + * or removed from a GPU slot. + * @active_cl_ctx: number of CL jobs active on the GPU. Array is per-device. + * @active_gl_ctx: number of GL jobs active on the GPU. Array is per-slot. -+ * @lock: spinlock protecting the kbasep_pm_metrics_data structure ++ * @lock: spinlock protecting the kbasep_pm_metrics_state structure + * @platform_data: pointer to data controlled by platform specific code + * @kbdev: pointer to kbase device for which metrics are collected + * @values: The current values of the power management metrics. The + * kbase_pm_get_dvfs_metrics() function is used to compare these + * current values with the saved values from a previous invocation. ++ * @initialized: tracks whether metrics_state has been initialized or not. + * @timer: timer to regularly make DVFS decisions based on the power + * management metrics. -+ * @timer_active: boolean indicating @timer is running ++ * @timer_state: atomic indicating current @timer state, on, off, or stopped. + * @dvfs_last: values of the PM metrics from the last DVFS tick + * @dvfs_diff: different between the current and previous PM metrics. + */ +struct kbasep_pm_metrics_state { + ktime_t time_period_start; ++#if MALI_USE_CSF ++ void *ipa_control_client; ++ bool skip_gpu_active_sanity_check; ++#else + bool gpu_active; + u32 active_cl_ctx[2]; + u32 active_gl_ctx[3]; ++#endif + spinlock_t lock; + + void *platform_data; @@ -149373,8 +156481,9 @@ index 000000000000..7322c093c7b6 + struct kbasep_pm_metrics values; + +#ifdef CONFIG_MALI_BIFROST_DVFS ++ bool initialized; + struct hrtimer timer; -+ bool timer_active; ++ atomic_t timer_state; + struct kbasep_pm_metrics dvfs_last; + struct kbasep_pm_metrics dvfs_diff; +#endif @@ -149386,8 +156495,12 @@ index 000000000000..7322c093c7b6 + * @work: Work item which cancels the timer + * @timer: Timer for powering off the shader cores + * @configured_interval: Period of GPU poweroff timer -+ * @configured_ticks: User-configured number of ticks to wait after the shader -+ * power down request is received before turning off the cores ++ * @default_ticks: User-configured number of ticks to wait after the shader ++ * power down request is received before turning off the cores ++ * @configured_ticks: Power-policy configured number of ticks to wait after the ++ * shader power down request is received before turning off ++ * the cores. For simple power policies, this is equivalent ++ * to @default_ticks. + * @remaining_ticks: Number of remaining timer ticks until shaders are powered off + * @cancel_queued: True if the cancellation work item has been queued. This is + * required to ensure that it is not queued twice, e.g. after @@ -149401,6 +156514,7 @@ index 000000000000..7322c093c7b6 + struct hrtimer timer; + + ktime_t configured_interval; ++ unsigned int default_ticks; + unsigned int configured_ticks; + unsigned int remaining_ticks; + @@ -149411,20 +156525,15 @@ index 000000000000..7322c093c7b6 +union kbase_pm_policy_data { + struct kbasep_pm_policy_always_on always_on; + struct kbasep_pm_policy_coarse_demand coarse_demand; -+#if !MALI_CUSTOMER_RELEASE -+ struct kbasep_pm_policy_always_on_demand always_on_demand; -+#endif +}; + +/** + * struct kbase_pm_backend_data - Data stored per device for power management. + * -+ * This structure contains data for the power management framework. There is one -+ * instance of this structure per device in the system. -+ * + * @pm_current_policy: The policy that is currently actively controlling the + * power state. -+ * @pm_policy_data: Private data for current PM policy ++ * @pm_policy_data: Private data for current PM policy. This is automatically ++ * zeroed when a policy change occurs. + * @reset_done: Flag when a reset is complete + * @reset_done_wait: Wait queue to wait for changes to @reset_done + * @gpu_cycle_counter_requests: The reference count of active gpu cycle counter @@ -149478,11 +156587,21 @@ index 000000000000..7322c093c7b6 + * &struct kbase_pm_callback_conf + * @callback_power_runtime_off: Callback when the GPU may be turned off. See + * &struct kbase_pm_callback_conf -+ * @callback_power_runtime_idle: Optional callback when the GPU may be idle. See -+ * &struct kbase_pm_callback_conf ++ * @callback_power_runtime_idle: Optional callback invoked by runtime PM core ++ * when the GPU may be idle. See ++ * &struct kbase_pm_callback_conf + * @callback_soft_reset: Optional callback to software reset the GPU. See + * &struct kbase_pm_callback_conf ++ * @callback_power_runtime_gpu_idle: Callback invoked by Kbase when GPU has ++ * become idle. ++ * See &struct kbase_pm_callback_conf. ++ * @callback_power_runtime_gpu_active: Callback when GPU has become active and ++ * @callback_power_runtime_gpu_idle was ++ * called previously. ++ * See &struct kbase_pm_callback_conf. + * @ca_cores_enabled: Cores that are currently available ++ * @mcu_state: The current state of the micro-control unit, only applicable ++ * to GPUs that have such a component + * @l2_state: The current state of the L2 cache state machine. See + * &enum kbase_l2_core_state + * @l2_desired: True if the L2 cache should be powered on by the L2 cache state @@ -149492,10 +156611,10 @@ index 000000000000..7322c093c7b6 + * @shaders_avail: This is updated by the state machine when it is in a state + * where it can write to the SHADER_PWRON or PWROFF registers + * to have the same set of available cores as specified by -+ * @shaders_desired_mask. So it would eventually have the same -+ * value as @shaders_desired_mask and would precisely indicate -+ * the cores that are currently available. This is internal to -+ * shader state machine and should *not* be modified elsewhere. ++ * @shaders_desired_mask. So would precisely indicate the cores ++ * that are currently available. This is internal to shader ++ * state machine of JM GPUs and should *not* be modified ++ * elsewhere. + * @shaders_desired_mask: This is updated by the state machine when it is in + * a state where it can handle changes to the core + * availability (either by DVFS or sysfs). This is @@ -149507,6 +156626,48 @@ index 000000000000..7322c093c7b6 + * cores may be different, but there should be transitions in + * progress that will eventually achieve this state (assuming + * that the policy doesn't change its mind in the mean time). ++ * @mcu_desired: True if the micro-control unit should be powered on ++ * @policy_change_clamp_state_to_off: Signaling the backend is in PM policy ++ * change transition, needs the mcu/L2 to be brought back to the ++ * off state and remain in that state until the flag is cleared. ++ * @csf_pm_sched_flags: CSF Dynamic PM control flags in accordance to the ++ * current active PM policy. This field is updated whenever a ++ * new policy is activated. ++ * @policy_change_lock: Used to serialize the policy change calls. In CSF case, ++ * the change of policy may involve the scheduler to ++ * suspend running CSGs and then reconfigure the MCU. ++ * @core_idle_wq: Workqueue for executing the @core_idle_work. ++ * @core_idle_work: Work item used to wait for undesired cores to become inactive. ++ * The work item is enqueued when Host controls the power for ++ * shader cores and down scaling of cores is performed. ++ * @gpu_sleep_supported: Flag to indicate that if GPU sleep feature can be ++ * supported by the kernel driver or not. If this ++ * flag is not set, then HW state is directly saved ++ * when GPU idle notification is received. ++ * @gpu_sleep_mode_active: Flag to indicate that the GPU needs to be in sleep ++ * mode. It is set when the GPU idle notification is ++ * received and is cleared when HW state has been ++ * saved in the runtime suspend callback function or ++ * when the GPU power down is aborted if GPU became ++ * active whilst it was in sleep mode. The flag is ++ * guarded with hwaccess_lock spinlock. ++ * @exit_gpu_sleep_mode: Flag to indicate the GPU can now exit the sleep ++ * mode due to the submission of work from Userspace. ++ * The flag is guarded with hwaccess_lock spinlock. ++ * The @gpu_sleep_mode_active flag is not immediately ++ * reset when this flag is set, this is to ensure that ++ * MCU doesn't gets disabled undesirably without the ++ * suspend of CSGs. That could happen when ++ * scheduler_pm_active() and scheduler_pm_idle() gets ++ * called before the Scheduler gets reactivated. ++ * @gpu_idled: Flag to ensure that the gpu_idle & gpu_active callbacks are ++ * always called in pair. The flag is guarded with pm.lock mutex. ++ * @gpu_wakeup_override: Flag to force the power up of L2 cache & reactivation ++ * of MCU. This is set during the runtime suspend ++ * callback function, when GPU needs to exit the sleep ++ * mode for the saving the HW state before power down. ++ * @db_mirror_interrupt_enabled: Flag tracking if the Doorbell mirror interrupt ++ * is enabled or not. + * @in_reset: True if a GPU is resetting and normal power manager operation is + * suspended + * @partial_shaderoff: True if we want to partial power off shader cores, @@ -149544,6 +156705,9 @@ index 000000000000..7322c093c7b6 + * @gpu_clock_control_work: work item to set GPU clock during L2 power cycle + * using gpu_clock_control + * ++ * This structure contains data for the power management framework. There is one ++ * instance of this structure per device in the system. ++ * + * Note: + * During an IRQ, @pm_current_policy can be NULL when the policy is being + * changed with kbase_pm_set_policy(). The change is protected under @@ -149593,13 +156757,12 @@ index 000000000000..7322c093c7b6 + void (*callback_power_runtime_off)(struct kbase_device *kbdev); + int (*callback_power_runtime_idle)(struct kbase_device *kbdev); + int (*callback_soft_reset)(struct kbase_device *kbdev); ++ void (*callback_power_runtime_gpu_idle)(struct kbase_device *kbdev); ++ void (*callback_power_runtime_gpu_active)(struct kbase_device *kbdev); + + u64 ca_cores_enabled; + +#if MALI_USE_CSF -+ /* The current state of the micro-control unit, only applicable -+ * to GPUs that has such a component -+ */ + enum kbase_mcu_state mcu_state; +#endif + enum kbase_l2_core_state l2_state; @@ -149607,8 +156770,21 @@ index 000000000000..7322c093c7b6 + u64 shaders_avail; + u64 shaders_desired_mask; +#if MALI_USE_CSF -+ /* True if the micro-control unit should be powered on */ + bool mcu_desired; ++ bool policy_change_clamp_state_to_off; ++ unsigned int csf_pm_sched_flags; ++ struct mutex policy_change_lock; ++ struct workqueue_struct *core_idle_wq; ++ struct work_struct core_idle_work; ++ ++#ifdef KBASE_PM_RUNTIME ++ bool gpu_sleep_supported; ++ bool gpu_sleep_mode_active; ++ bool exit_gpu_sleep_mode; ++ bool gpu_idled; ++ bool gpu_wakeup_override; ++ bool db_mirror_interrupt_enabled; ++#endif +#endif + bool l2_desired; + bool l2_always_on; @@ -149616,11 +156792,13 @@ index 000000000000..7322c093c7b6 + + bool in_reset; + ++#if !MALI_USE_CSF + bool partial_shaderoff; + + bool protected_entry_transition_override; + bool protected_transition_override; + int protected_l2_override; ++#endif + + bool hwcnt_desired; + bool hwcnt_disabled; @@ -149633,6 +156811,23 @@ index 000000000000..7322c093c7b6 + struct work_struct gpu_clock_control_work; +}; + ++#if MALI_USE_CSF ++/* CSF PM flag, signaling that the MCU shader Core should be kept on */ ++#define CSF_DYNAMIC_PM_CORE_KEEP_ON (1 << 0) ++/* CSF PM flag, signaling no scheduler suspension on idle groups */ ++#define CSF_DYNAMIC_PM_SCHED_IGNORE_IDLE (1 << 1) ++/* CSF PM flag, signaling no scheduler suspension on no runnable groups */ ++#define CSF_DYNAMIC_PM_SCHED_NO_SUSPEND (1 << 2) ++ ++/* The following flags corresponds to existing defined PM policies */ ++#define ALWAYS_ON_PM_SCHED_FLAGS (CSF_DYNAMIC_PM_CORE_KEEP_ON | \ ++ CSF_DYNAMIC_PM_SCHED_IGNORE_IDLE | \ ++ CSF_DYNAMIC_PM_SCHED_NO_SUSPEND) ++#define COARSE_ON_DEMAND_PM_SCHED_FLAGS (0) ++#if !MALI_CUSTOMER_RELEASE ++#define ALWAYS_ON_DEMAND_PM_SCHED_FLAGS (CSF_DYNAMIC_PM_SCHED_IGNORE_IDLE) ++#endif ++#endif + +/* List of policy IDs */ +enum kbase_pm_policy_id { @@ -149644,26 +156839,59 @@ index 000000000000..7322c093c7b6 +}; + +/** ++ * enum kbase_pm_policy_event - PM Policy event ID ++ */ ++enum kbase_pm_policy_event { ++ /** ++ * @KBASE_PM_POLICY_EVENT_IDLE: Indicates that the GPU power state ++ * model has determined that the GPU has gone idle. ++ */ ++ KBASE_PM_POLICY_EVENT_IDLE, ++ /** ++ * @KBASE_PM_POLICY_EVENT_POWER_ON: Indicates that the GPU state model ++ * is preparing to power on the GPU. ++ */ ++ KBASE_PM_POLICY_EVENT_POWER_ON, ++ /** ++ * @KBASE_PM_POLICY_EVENT_TIMER_HIT: Indicates that the GPU became ++ * active while the Shader Tick Timer was holding the GPU in a powered ++ * on state. ++ */ ++ KBASE_PM_POLICY_EVENT_TIMER_HIT, ++ /** ++ * @KBASE_PM_POLICY_EVENT_TIMER_MISS: Indicates that the GPU did not ++ * become active before the Shader Tick Timer timeout occurred. ++ */ ++ KBASE_PM_POLICY_EVENT_TIMER_MISS, ++}; ++ ++/** + * struct kbase_pm_policy - Power policy structure. + * -+ * Each power policy exposes a (static) instance of this structure which -+ * contains function pointers to the policy's methods. -+ * + * @name: The name of this policy + * @init: Function called when the policy is selected + * @term: Function called when the policy is unselected + * @shaders_needed: Function called to find out if shader cores are needed + * @get_core_active: Function called to get the current overall GPU power + * state ++ * @handle_event: Function called when a PM policy event occurs. Should be ++ * set to NULL if the power policy doesn't require any ++ * event notifications. + * @id: Field indicating an ID for this policy. This is not + * necessarily the same as its index in the list returned + * by kbase_pm_list_policies(). + * It is used purely for debugging. ++ * @pm_sched_flags: Policy associated with CSF PM scheduling operational flags. ++ * Pre-defined required flags exist for each of the ++ * ARM released policies, such as 'always_on', 'coarse_demand' ++ * and etc. ++ * Each power policy exposes a (static) instance of this structure which ++ * contains function pointers to the policy's methods. + */ +struct kbase_pm_policy { + char *name; + -+ /** ++ /* + * Function called when the policy is selected + * + * This should initialize the kbdev->pm.pm_policy_data structure. It @@ -149677,7 +156905,7 @@ index 000000000000..7322c093c7b6 + */ + void (*init)(struct kbase_device *kbdev); + -+ /** ++ /* + * Function called when the policy is unselected. + * + * @kbdev: The kbase device structure for the device (must be a @@ -149685,7 +156913,7 @@ index 000000000000..7322c093c7b6 + */ + void (*term)(struct kbase_device *kbdev); + -+ /** ++ /* + * Function called to find out if shader cores are needed + * + * This needs to at least satisfy kbdev->pm.backend.shaders_desired, @@ -149698,7 +156926,7 @@ index 000000000000..7322c093c7b6 + */ + bool (*shaders_needed)(struct kbase_device *kbdev); + -+ /** ++ /* + * Function called to get the current overall GPU power state + * + * This function must meet or exceed the requirements for power @@ -149711,25 +156939,44 @@ index 000000000000..7322c093c7b6 + */ + bool (*get_core_active)(struct kbase_device *kbdev); + ++ /* ++ * Function called when a power event occurs ++ * ++ * @kbdev: The kbase device structure for the device (must be a ++ * valid pointer) ++ * @event: The id of the power event that has occurred ++ */ ++ void (*handle_event)(struct kbase_device *kbdev, ++ enum kbase_pm_policy_event event); ++ + enum kbase_pm_policy_id id; ++ ++#if MALI_USE_CSF ++ /* Policy associated with CSF PM scheduling operational flags. ++ * There are pre-defined required flags exist for each of the ++ * ARM released policies, such as 'always_on', 'coarse_demand' ++ * and etc. ++ */ ++ unsigned int pm_sched_flags; ++#endif +}; + +#endif /* _KBASE_PM_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c new file mode 100755 -index 000000000000..e9e30ebadc2d +index 000000000..5be8acd75 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c -@@ -0,0 +1,2545 @@ -+// SPDX-License-Identifier: GPL-2.0 +@@ -0,0 +1,3417 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -149740,8 +156987,6 @@ index 000000000000..e9e30ebadc2d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -149755,12 +157000,17 @@ index 000000000000..e9e30ebadc2d +#include +#include +#include -+#if !MALI_USE_CSF ++ ++#if MALI_USE_CSF ++#include ++#else +#include +#endif /* !MALI_USE_CSF */ ++ +#include +#include -+#include ++#include ++#include +#include +#include +#include @@ -149770,6 +157020,13 @@ index 000000000000..e9e30ebadc2d +#ifdef CONFIG_MALI_ARBITER_SUPPORT +#include +#endif /* CONFIG_MALI_ARBITER_SUPPORT */ ++#if MALI_USE_CSF ++#include ++#endif ++ ++#if MALI_USE_CSF ++#include ++#endif + +#include + @@ -149789,16 +157046,16 @@ index 000000000000..e9e30ebadc2d +/** + * enum kbasep_pm_action - Actions that can be performed on a core. + * -+ * This enumeration is private to the file. Its values are set to allow -+ * core_type_to_reg() function, which decodes this enumeration, to be simpler -+ * and more efficient. -+ * + * @ACTION_PRESENT: The cores that are present + * @ACTION_READY: The cores that are ready + * @ACTION_PWRON: Power on the cores specified + * @ACTION_PWROFF: Power off the cores specified + * @ACTION_PWRTRANS: The cores that are transitioning + * @ACTION_PWRACTIVE: The cores that are active ++ * ++ * This enumeration is private to the file. Its values are set to allow ++ * core_type_to_reg() function, which decodes this enumeration, to be simpler ++ * and more efficient. + */ +enum kbasep_pm_action { + ACTION_PRESENT = 0, @@ -149814,6 +157071,8 @@ index 000000000000..e9e30ebadc2d + enum kbase_pm_core_type core_type, + enum kbasep_pm_action action); + ++static void kbase_pm_hw_issues_apply(struct kbase_device *kbdev); ++ +#if MALI_USE_CSF +bool kbase_pm_is_mcu_desired(struct kbase_device *kbdev) +{ @@ -149822,22 +157081,29 @@ index 000000000000..e9e30ebadc2d + if (unlikely(!kbdev->csf.firmware_inited)) + return false; + -+ if (kbdev->csf.scheduler.pm_active_count) ++ if (kbdev->csf.scheduler.pm_active_count && ++ kbdev->pm.backend.mcu_desired) ++ return true; ++ ++#ifdef KBASE_PM_RUNTIME ++ if (kbdev->pm.backend.gpu_wakeup_override) + return true; ++#endif + + /* MCU is supposed to be ON, only when scheduler.pm_active_count is -+ * non zero. But for always_on policy also MCU needs to be ON. -+ * GPUCORE-24926 will add the proper handling for always_on -+ * power policy. ++ * non zero. But for always_on policy, the MCU needs to be kept on, ++ * unless policy changing transition needs it off. + */ ++ + return (kbdev->pm.backend.mcu_desired && -+ (kbdev->pm.backend.pm_current_policy == -+ &kbase_pm_always_on_policy_ops)); ++ kbase_pm_no_mcu_core_pwroff(kbdev) && ++ !kbdev->pm.backend.policy_change_clamp_state_to_off); +} +#endif + +bool kbase_pm_is_l2_desired(struct kbase_device *kbdev) +{ ++#if !MALI_USE_CSF + if (kbdev->pm.backend.protected_entry_transition_override) + return false; + @@ -149848,10 +157114,19 @@ index 000000000000..e9e30ebadc2d + if (kbdev->pm.backend.protected_transition_override && + !kbdev->pm.backend.shaders_desired) + return false; ++#else ++ if (unlikely(kbdev->pm.backend.policy_change_clamp_state_to_off)) ++ return false; ++ ++ /* Power up the L2 cache only when MCU is desired */ ++ if (likely(kbdev->csf.firmware_inited)) ++ return kbase_pm_is_mcu_desired(kbdev); ++#endif + + return kbdev->pm.backend.l2_desired; +} + ++#if !MALI_USE_CSF +void kbase_pm_protected_override_enable(struct kbase_device *kbdev) +{ + lockdep_assert_held(&kbdev->hwaccess_lock); @@ -149917,18 +157192,19 @@ index 000000000000..e9e30ebadc2d + + kbase_pm_update_state(kbdev); +} ++#endif + +/** + * core_type_to_reg - Decode a core type and action to a register. + * ++ * @core_type: The type of core ++ * @action: The type of action ++ * + * Given a core type (defined by kbase_pm_core_type) and an action (defined + * by kbasep_pm_action) this function will return the register offset that + * will perform the action on the core type. The register returned is the _LO + * register and an offset must be applied to use the _HI register. + * -+ * @core_type: The type of core -+ * @action: The type of action -+ * + * Return: The register offset of the _LO register that performs an action of + * type @action on a core of type @core_type. + */ @@ -149957,7 +157233,7 @@ index 000000000000..e9e30ebadc2d + return (u32)core_type + (u32)action; +} + -+#ifdef CONFIG_ARM64 ++#if IS_ENABLED(CONFIG_ARM64) +static void mali_cci_flush_l2(struct kbase_device *kbdev) +{ + const u32 mask = CLEAN_CACHES_COMPLETED | RESET_COMPLETED; @@ -149972,15 +157248,15 @@ index 000000000000..e9e30ebadc2d + * to be called from. + */ + -+ kbase_reg_write(kbdev, -+ GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_CLEAN_INV_CACHES); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), ++ GPU_COMMAND_CACHE_CLN_INV_L2); + + raw = kbase_reg_read(kbdev, + GPU_CONTROL_REG(GPU_IRQ_RAWSTAT)); + + /* Wait for cache flush to complete before continuing, exit on -+ * gpu resets or loop expiry. */ ++ * gpu resets or loop expiry. ++ */ + while (((raw & mask) == 0) && --loops) { + raw = kbase_reg_read(kbdev, + GPU_CONTROL_REG(GPU_IRQ_RAWSTAT)); @@ -149991,14 +157267,14 @@ index 000000000000..e9e30ebadc2d +/** + * kbase_pm_invoke - Invokes an action on a core set + * -+ * This function performs the action given by @action on a set of cores of a -+ * type given by @core_type. It is a static function used by -+ * kbase_pm_transition_core_type() -+ * + * @kbdev: The kbase device structure of the device + * @core_type: The type of core that the action should be performed on + * @cores: A bit mask of cores to perform the action on (low 32 bits) + * @action: The action to perform on the cores ++ * ++ * This function performs the action given by @action on a set of cores of a ++ * type given by @core_type. It is a static function used by ++ * kbase_pm_transition_core_type() + */ +static void kbase_pm_invoke(struct kbase_device *kbdev, + enum kbase_pm_core_type core_type, @@ -150076,15 +157352,15 @@ index 000000000000..e9e30ebadc2d +/** + * kbase_pm_get_state - Get information about a core set + * ++ * @kbdev: The kbase device structure of the device ++ * @core_type: The type of core that the should be queried ++ * @action: The property of the cores to query ++ * + * This function gets information (chosen by @action) about a set of cores of + * a type given by @core_type. It is a static function used by + * kbase_pm_get_active_cores(), kbase_pm_get_trans_cores() and + * kbase_pm_get_ready_cores(). + * -+ * @kbdev: The kbase device structure of the device -+ * @core_type: The type of core that the should be queried -+ * @action: The property of the cores to query -+ * + * Return: A bit mask specifying the state of the cores + */ +static u64 kbase_pm_get_state(struct kbase_device *kbdev, @@ -150119,9 +157395,9 @@ index 000000000000..e9e30ebadc2d + + switch (type) { + case KBASE_PM_CORE_L2: -+ return kbdev->gpu_props.props.raw_props.l2_present; ++ return kbdev->gpu_props.curr_config.l2_present; + case KBASE_PM_CORE_SHADER: -+ return kbdev->gpu_props.props.raw_props.shader_present; ++ return kbdev->gpu_props.curr_config.shader_present; + case KBASE_PM_CORE_TILER: + return kbdev->gpu_props.props.raw_props.tiler_present; + case KBASE_PM_CORE_STACK: @@ -150215,14 +157491,10 @@ index 000000000000..e9e30ebadc2d + */ + if (kbase_hwcnt_context_disable_atomic(kbdev->hwcnt_gpu_ctx)) { + backend->hwcnt_disabled = true; ++ + } else { -+#if KERNEL_VERSION(3, 16, 0) > LINUX_VERSION_CODE -+ queue_work(system_wq, -+ &backend->hwcnt_disable_work); -+#else -+ queue_work(system_highpri_wq, -+ &backend->hwcnt_disable_work); -+#endif ++ kbase_hwcnt_context_queue_work(kbdev->hwcnt_gpu_ctx, ++ &backend->hwcnt_disable_work); + } +} + @@ -150236,11 +157508,20 @@ index 000000000000..e9e30ebadc2d + if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_L2_CONFIG)) + return; + ++#if MALI_USE_CSF ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PBHA_HWU)) { ++ val = kbase_reg_read(kbdev, GPU_CONTROL_REG(L2_CONFIG)); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(L2_CONFIG), ++ L2_CONFIG_PBHA_HWU_SET(val, kbdev->pbha_propagate_bits)); ++ } ++#endif /* MALI_USE_CSF */ ++ + /* + * Skip if size and hash are not given explicitly, + * which means default values are used. + */ -+ if ((kbdev->l2_size_override == 0) && (kbdev->l2_hash_override == 0)) ++ if ((kbdev->l2_size_override == 0) && (kbdev->l2_hash_override == 0) && ++ (!kbdev->l2_hash_values_override)) + return; + + val = kbase_reg_read(kbdev, GPU_CONTROL_REG(L2_CONFIG)); @@ -150251,13 +157532,25 @@ index 000000000000..e9e30ebadc2d + } + + if (kbdev->l2_hash_override) { ++ WARN_ON(kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_ASN_HASH)); + val &= ~L2_CONFIG_HASH_MASK; + val |= (kbdev->l2_hash_override << L2_CONFIG_HASH_SHIFT); ++ } else if (kbdev->l2_hash_values_override) { ++ int i; ++ ++ WARN_ON(!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_ASN_HASH)); ++ val &= ~L2_CONFIG_ASN_HASH_ENABLE_MASK; ++ val |= (0x1 << L2_CONFIG_ASN_HASH_ENABLE_SHIFT); ++ ++ for (i = 0; i < ASN_HASH_COUNT; i++) { ++ dev_dbg(kbdev->dev, "Program 0x%x to ASN_HASH[%d]\n", ++ kbdev->l2_hash_values[i], i); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(ASN_HASH(i)), ++ kbdev->l2_hash_values[i]); ++ } + } + + dev_dbg(kbdev->dev, "Program 0x%x to L2_CONFIG\n", val); -+ -+ /* Write L2_CONFIG to override */ + kbase_reg_write(kbdev, GPU_CONTROL_REG(L2_CONFIG), val); +} + @@ -150284,6 +157577,141 @@ index 000000000000..e9e30ebadc2d + return strings[state]; +} + ++static ++void kbase_ktrace_log_mcu_state(struct kbase_device *kbdev, enum kbase_mcu_state state) ++{ ++#if KBASE_KTRACE_ENABLE ++ switch (state) { ++#define KBASEP_MCU_STATE(n) \ ++ case KBASE_MCU_ ## n: \ ++ KBASE_KTRACE_ADD(kbdev, PM_MCU_ ## n, NULL, state); \ ++ break; ++#include "mali_kbase_pm_mcu_states.h" ++#undef KBASEP_MCU_STATE ++ } ++#endif ++} ++ ++static inline bool kbase_pm_handle_mcu_core_attr_update(struct kbase_device *kbdev) ++{ ++ struct kbase_pm_backend_data *backend = &kbdev->pm.backend; ++ bool timer_update; ++ bool core_mask_update; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ WARN_ON(backend->mcu_state != KBASE_MCU_ON); ++ ++ /* This function is only for cases where the MCU managing Cores, if ++ * the firmware mode is with host control, do nothing here. ++ */ ++ if (unlikely(kbdev->csf.firmware_hctl_core_pwr)) ++ return false; ++ ++ core_mask_update = ++ backend->shaders_avail != backend->shaders_desired_mask; ++ ++ timer_update = kbdev->csf.mcu_core_pwroff_dur_count != ++ kbdev->csf.mcu_core_pwroff_reg_shadow; ++ ++ if (core_mask_update || timer_update) ++ kbase_csf_firmware_update_core_attr(kbdev, timer_update, ++ core_mask_update, backend->shaders_desired_mask); ++ ++ return (core_mask_update || timer_update); ++} ++ ++bool kbase_pm_is_mcu_inactive(struct kbase_device *kbdev, ++ enum kbase_mcu_state state) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ return ((state == KBASE_MCU_OFF) || (state == KBASE_MCU_IN_SLEEP)); ++} ++ ++#ifdef KBASE_PM_RUNTIME ++/** ++ * kbase_pm_enable_mcu_db_notification - Enable the Doorbell notification on ++ * MCU side ++ * ++ * @kbdev: Pointer to the device. ++ * ++ * This function is called to re-enable the Doorbell notification on MCU side ++ * when MCU needs to beome active again. ++ */ ++static void kbase_pm_enable_mcu_db_notification(struct kbase_device *kbdev) ++{ ++ u32 val = kbase_reg_read(kbdev, GPU_CONTROL_REG(MCU_CONTROL)); ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ val &= ~MCU_CNTRL_DOORBELL_DISABLE_MASK; ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(MCU_CONTROL), val); ++} ++ ++/** ++ * wait_mcu_as_inactive - Wait for AS used by MCU FW to get configured ++ * ++ * @kbdev: Pointer to the device. ++ * ++ * This function is called to wait for the AS used by MCU FW to get configured ++ * before DB notification on MCU is enabled, as a workaround for HW issue. ++ */ ++static void wait_mcu_as_inactive(struct kbase_device *kbdev) ++{ ++ unsigned int max_loops = KBASE_AS_INACTIVE_MAX_LOOPS; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ if (!kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TURSEHW_2716)) ++ return; ++ ++ /* Wait for the AS_ACTIVE_INT bit to become 0 for the AS used by MCU FW */ ++ while (--max_loops && ++ kbase_reg_read(kbdev, MMU_AS_REG(MCU_AS_NR, AS_STATUS)) & ++ AS_STATUS_AS_ACTIVE_INT) ++ ; ++ ++ if (!WARN_ON_ONCE(max_loops == 0)) ++ return; ++ ++ dev_err(kbdev->dev, "AS_ACTIVE_INT bit stuck for AS %d used by MCU FW", MCU_AS_NR); ++ ++ if (kbase_prepare_to_reset_gpu(kbdev, 0)) ++ kbase_reset_gpu(kbdev); ++} ++#endif ++ ++/** ++ * kbasep_pm_toggle_power_interrupt - Toggles the IRQ mask for power interrupts ++ * from the firmware ++ * ++ * @kbdev: Pointer to the device ++ * @enable: boolean indicating to enable interrupts or not ++ * ++ * The POWER_CHANGED_ALL interrupt can be disabled after L2 has been turned on ++ * when FW is controlling the power for the shader cores. Correspondingly, the ++ * interrupts can be re-enabled after the MCU has been disabled before the ++ * power down of L2. ++ */ ++static void kbasep_pm_toggle_power_interrupt(struct kbase_device *kbdev, bool enable) ++{ ++ u32 irq_mask; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK)); ++ ++ if (enable) { ++ irq_mask |= POWER_CHANGED_ALL; ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), POWER_CHANGED_ALL); ++ } else { ++ irq_mask &= ~POWER_CHANGED_ALL; ++ } ++ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), irq_mask); ++} ++ +static int kbase_pm_mcu_update_state(struct kbase_device *kbdev) +{ + struct kbase_pm_backend_data *backend = &kbdev->pm.backend; @@ -150292,20 +157720,29 @@ index 000000000000..e9e30ebadc2d + lockdep_assert_held(&kbdev->hwaccess_lock); + + /* -+ * Initial load of firmare should have been done to ++ * Initial load of firmware should have been done to + * exercise the MCU state machine. + */ + if (unlikely(!kbdev->csf.firmware_inited)) { + WARN_ON(backend->mcu_state != KBASE_MCU_OFF); -+ return -EIO; ++ return 0; + } + + do { ++ u64 shaders_trans = kbase_pm_get_trans_cores(kbdev, KBASE_PM_CORE_SHADER); ++ u64 shaders_ready = kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_SHADER); ++ ++ /* mask off ready from trans in case transitions finished ++ * between the register reads ++ */ ++ shaders_trans &= ~shaders_ready; ++ + prev_state = backend->mcu_state; + + switch (backend->mcu_state) { + case KBASE_MCU_OFF: + if (kbase_pm_is_mcu_desired(kbdev) && ++ !backend->policy_change_clamp_state_to_off && + backend->l2_state == KBASE_L2_ON) { + kbase_csf_firmware_trigger_reload(kbdev); + backend->mcu_state = KBASE_MCU_PEND_ON_RELOAD; @@ -150314,35 +157751,176 @@ index 000000000000..e9e30ebadc2d + + case KBASE_MCU_PEND_ON_RELOAD: + if (kbdev->csf.firmware_reloaded) { -+ kbase_csf_firmware_global_reinit(kbdev); ++ backend->shaders_desired_mask = ++ kbase_pm_ca_get_core_mask(kbdev); ++ kbase_csf_firmware_global_reinit(kbdev, ++ backend->shaders_desired_mask); ++ if (!kbdev->csf.firmware_hctl_core_pwr) ++ kbasep_pm_toggle_power_interrupt(kbdev, false); + backend->mcu_state = + KBASE_MCU_ON_GLB_REINIT_PEND; + } + break; + + case KBASE_MCU_ON_GLB_REINIT_PEND: -+ if (kbase_csf_firmware_global_reinit_complete(kbdev)) ++ if (kbase_csf_firmware_global_reinit_complete(kbdev)) { ++ backend->shaders_avail = ++ backend->shaders_desired_mask; ++ backend->pm_shaders_core_mask = 0; ++ if (kbdev->csf.firmware_hctl_core_pwr) { ++ kbase_pm_invoke(kbdev, KBASE_PM_CORE_SHADER, ++ backend->shaders_avail, ACTION_PWRON); ++ backend->mcu_state = ++ KBASE_MCU_HCTL_SHADERS_PEND_ON; ++ } else ++ backend->mcu_state = KBASE_MCU_ON_HWCNT_ENABLE; ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++ if (kbase_debug_coresight_csf_state_check( ++ kbdev, KBASE_DEBUG_CORESIGHT_CSF_DISABLED)) { ++ kbase_debug_coresight_csf_state_request( ++ kbdev, KBASE_DEBUG_CORESIGHT_CSF_ENABLED); ++ backend->mcu_state = KBASE_MCU_CORESIGHT_ENABLE; ++ } else if (kbase_debug_coresight_csf_state_check( ++ kbdev, KBASE_DEBUG_CORESIGHT_CSF_ENABLED)) { ++ backend->mcu_state = KBASE_MCU_CORESIGHT_ENABLE; ++ } ++#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ ++ } ++ break; ++ ++ case KBASE_MCU_HCTL_SHADERS_PEND_ON: ++ if (!shaders_trans && ++ shaders_ready == backend->shaders_avail) { ++ /* Cores now stable, notify MCU the stable mask */ ++ kbase_csf_firmware_update_core_attr(kbdev, ++ false, true, shaders_ready); ++ ++ backend->pm_shaders_core_mask = shaders_ready; ++ backend->mcu_state = ++ KBASE_MCU_HCTL_CORES_NOTIFY_PEND; ++ } ++ break; ++ ++ case KBASE_MCU_HCTL_CORES_NOTIFY_PEND: ++ /* Wait for the acknowledgement */ ++ if (kbase_csf_firmware_core_attr_updated(kbdev)) + backend->mcu_state = KBASE_MCU_ON_HWCNT_ENABLE; + break; + + case KBASE_MCU_ON_HWCNT_ENABLE: + backend->hwcnt_desired = true; + if (backend->hwcnt_disabled) { -+ kbase_hwcnt_context_enable( -+ kbdev->hwcnt_gpu_ctx); ++ unsigned long flags; ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ kbase_hwcnt_context_enable(kbdev->hwcnt_gpu_ctx); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); + backend->hwcnt_disabled = false; + } + backend->mcu_state = KBASE_MCU_ON; + break; + + case KBASE_MCU_ON: ++ backend->shaders_desired_mask = kbase_pm_ca_get_core_mask(kbdev); ++ + if (!kbase_pm_is_mcu_desired(kbdev)) + backend->mcu_state = KBASE_MCU_ON_HWCNT_DISABLE; ++ else if (kbdev->csf.firmware_hctl_core_pwr) { ++ /* Host control scale up/down cores as needed */ ++ if (backend->shaders_desired_mask != shaders_ready) { ++ backend->hwcnt_desired = false; ++ if (!backend->hwcnt_disabled) ++ kbase_pm_trigger_hwcnt_disable(kbdev); ++ backend->mcu_state = ++ KBASE_MCU_HCTL_MCU_ON_RECHECK; ++ } ++ } else if (kbase_pm_handle_mcu_core_attr_update(kbdev)) ++ backend->mcu_state = KBASE_MCU_ON_CORE_ATTR_UPDATE_PEND; ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++ else if (kbdev->csf.coresight.disable_on_pmode_enter) { ++ kbase_debug_coresight_csf_state_request( ++ kbdev, KBASE_DEBUG_CORESIGHT_CSF_DISABLED); ++ backend->mcu_state = KBASE_MCU_ON_PMODE_ENTER_CORESIGHT_DISABLE; ++ } else if (kbdev->csf.coresight.enable_on_pmode_exit) { ++ kbase_debug_coresight_csf_state_request( ++ kbdev, KBASE_DEBUG_CORESIGHT_CSF_ENABLED); ++ backend->mcu_state = KBASE_MCU_ON_PMODE_EXIT_CORESIGHT_ENABLE; ++ } ++#endif + break; + -+ /* ToDo. Add new state(s) if shader cores mask change for DVFS -+ * has to be accommodated in the MCU state machine. -+ */ ++ case KBASE_MCU_HCTL_MCU_ON_RECHECK: ++ backend->shaders_desired_mask = kbase_pm_ca_get_core_mask(kbdev); ++ ++ if (!backend->hwcnt_disabled) { ++ /* Wait for being disabled */ ++ ; ++ } else if (!kbase_pm_is_mcu_desired(kbdev)) { ++ /* Converging to MCU powering down flow */ ++ backend->mcu_state = KBASE_MCU_ON_HWCNT_DISABLE; ++ } else if (backend->shaders_desired_mask & ~shaders_ready) { ++ /* set cores ready but not available to ++ * meet SHADERS_PEND_ON check pass ++ */ ++ backend->shaders_avail = ++ (backend->shaders_desired_mask | shaders_ready); ++ ++ kbase_pm_invoke(kbdev, KBASE_PM_CORE_SHADER, ++ backend->shaders_avail & ~shaders_ready, ++ ACTION_PWRON); ++ backend->mcu_state = ++ KBASE_MCU_HCTL_SHADERS_PEND_ON; ++ ++ } else if (~backend->shaders_desired_mask & shaders_ready) { ++ kbase_csf_firmware_update_core_attr(kbdev, false, true, ++ backend->shaders_desired_mask); ++ backend->mcu_state = KBASE_MCU_HCTL_CORES_DOWN_SCALE_NOTIFY_PEND; ++ } else { ++ backend->mcu_state = ++ KBASE_MCU_HCTL_SHADERS_PEND_ON; ++ } ++ break; ++ ++ case KBASE_MCU_HCTL_CORES_DOWN_SCALE_NOTIFY_PEND: ++ if (kbase_csf_firmware_core_attr_updated(kbdev)) { ++ /* wait in queue until cores idle */ ++ queue_work(backend->core_idle_wq, &backend->core_idle_work); ++ backend->mcu_state = KBASE_MCU_HCTL_CORE_INACTIVE_PEND; ++ } ++ break; ++ ++ case KBASE_MCU_HCTL_CORE_INACTIVE_PEND: ++ { ++ u64 active_cores = kbase_pm_get_active_cores( ++ kbdev, ++ KBASE_PM_CORE_SHADER); ++ u64 cores_to_disable = shaders_ready & ++ ~backend->shaders_desired_mask; ++ ++ if (!(cores_to_disable & active_cores)) { ++ kbase_pm_invoke(kbdev, KBASE_PM_CORE_SHADER, ++ cores_to_disable, ++ ACTION_PWROFF); ++ backend->shaders_avail = backend->shaders_desired_mask; ++ backend->mcu_state = KBASE_MCU_HCTL_SHADERS_CORE_OFF_PEND; ++ } ++ } ++ break; ++ ++ case KBASE_MCU_HCTL_SHADERS_CORE_OFF_PEND: ++ if (!shaders_trans && shaders_ready == backend->shaders_avail) { ++ /* Cores now stable */ ++ backend->pm_shaders_core_mask = shaders_ready; ++ backend->mcu_state = KBASE_MCU_ON_HWCNT_ENABLE; ++ } ++ break; ++ ++ case KBASE_MCU_ON_CORE_ATTR_UPDATE_PEND: ++ if (kbase_csf_firmware_core_attr_updated(kbdev)) { ++ backend->shaders_avail = backend->shaders_desired_mask; ++ backend->mcu_state = KBASE_MCU_ON; ++ } ++ break; + + case KBASE_MCU_ON_HWCNT_DISABLE: + if (kbase_pm_is_mcu_desired(kbdev)) { @@ -150354,22 +157932,83 @@ index 000000000000..e9e30ebadc2d + if (!backend->hwcnt_disabled) + kbase_pm_trigger_hwcnt_disable(kbdev); + -+ if (backend->hwcnt_disabled) ++ ++ if (backend->hwcnt_disabled) { ++#ifdef KBASE_PM_RUNTIME ++ if (backend->gpu_sleep_mode_active) ++ backend->mcu_state = KBASE_MCU_ON_SLEEP_INITIATE; ++ else { ++#endif ++ backend->mcu_state = KBASE_MCU_ON_HALT; ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++ kbase_debug_coresight_csf_state_request( ++ kbdev, KBASE_DEBUG_CORESIGHT_CSF_DISABLED); ++ backend->mcu_state = KBASE_MCU_CORESIGHT_DISABLE; ++#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ ++ } ++ } ++ break; ++ ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++ case KBASE_MCU_ON_PMODE_ENTER_CORESIGHT_DISABLE: ++ if (kbase_debug_coresight_csf_state_check( ++ kbdev, KBASE_DEBUG_CORESIGHT_CSF_DISABLED)) { ++ backend->mcu_state = KBASE_MCU_ON; ++ kbdev->csf.coresight.disable_on_pmode_enter = false; ++ } ++ break; ++ case KBASE_MCU_ON_PMODE_EXIT_CORESIGHT_ENABLE: ++ if (kbase_debug_coresight_csf_state_check( ++ kbdev, KBASE_DEBUG_CORESIGHT_CSF_ENABLED)) { ++ backend->mcu_state = KBASE_MCU_ON; ++ kbdev->csf.coresight.enable_on_pmode_exit = false; ++ } ++ break; ++ case KBASE_MCU_CORESIGHT_DISABLE: ++ if (kbase_debug_coresight_csf_state_check( ++ kbdev, KBASE_DEBUG_CORESIGHT_CSF_DISABLED)) + backend->mcu_state = KBASE_MCU_ON_HALT; + break; + ++ case KBASE_MCU_CORESIGHT_ENABLE: ++ if (kbase_debug_coresight_csf_state_check( ++ kbdev, KBASE_DEBUG_CORESIGHT_CSF_ENABLED)) ++ backend->mcu_state = KBASE_MCU_ON_HWCNT_ENABLE; ++ break; ++#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ ++ + case KBASE_MCU_ON_HALT: + if (!kbase_pm_is_mcu_desired(kbdev)) { + kbase_csf_firmware_trigger_mcu_halt(kbdev); + backend->mcu_state = KBASE_MCU_ON_PEND_HALT; -+ } else if (kbase_pm_is_mcu_desired(kbdev)) { ++ } else + backend->mcu_state = KBASE_MCU_ON_HWCNT_ENABLE; -+ } + break; + + case KBASE_MCU_ON_PEND_HALT: -+ if (kbase_csf_firmware_mcu_halted(kbdev)) ++ if (kbase_csf_firmware_mcu_halted(kbdev)) { ++ KBASE_KTRACE_ADD(kbdev, CSF_FIRMWARE_MCU_HALTED, NULL, ++ kbase_csf_ktrace_gpu_cycle_cnt(kbdev)); ++ if (kbdev->csf.firmware_hctl_core_pwr) ++ backend->mcu_state = ++ KBASE_MCU_HCTL_SHADERS_READY_OFF; ++ else ++ backend->mcu_state = KBASE_MCU_POWER_DOWN; ++ } ++ break; ++ ++ case KBASE_MCU_HCTL_SHADERS_READY_OFF: ++ kbase_pm_invoke(kbdev, KBASE_PM_CORE_SHADER, ++ shaders_ready, ACTION_PWROFF); ++ backend->mcu_state = ++ KBASE_MCU_HCTL_SHADERS_PEND_OFF; ++ break; ++ ++ case KBASE_MCU_HCTL_SHADERS_PEND_OFF: ++ if (!shaders_trans && !shaders_ready) { ++ backend->pm_shaders_core_mask = 0; + backend->mcu_state = KBASE_MCU_POWER_DOWN; ++ } + break; + + case KBASE_MCU_POWER_DOWN: @@ -150380,13 +158019,61 @@ index 000000000000..e9e30ebadc2d + case KBASE_MCU_PEND_OFF: + /* wait synchronously for the MCU to get disabled */ + kbase_csf_firmware_disable_mcu_wait(kbdev); ++ if (!kbdev->csf.firmware_hctl_core_pwr) ++ kbasep_pm_toggle_power_interrupt(kbdev, true); + backend->mcu_state = KBASE_MCU_OFF; + break; ++#ifdef KBASE_PM_RUNTIME ++ case KBASE_MCU_ON_SLEEP_INITIATE: ++ if (!kbase_pm_is_mcu_desired(kbdev)) { ++ kbase_csf_firmware_trigger_mcu_sleep(kbdev); ++ backend->mcu_state = KBASE_MCU_ON_PEND_SLEEP; ++ } else ++ backend->mcu_state = KBASE_MCU_ON_HWCNT_ENABLE; ++ break; ++ ++ case KBASE_MCU_ON_PEND_SLEEP: ++ if (kbase_csf_firmware_is_mcu_in_sleep(kbdev)) { ++ KBASE_KTRACE_ADD(kbdev, CSF_FIRMWARE_MCU_SLEEP, NULL, ++ kbase_csf_ktrace_gpu_cycle_cnt(kbdev)); ++ backend->mcu_state = KBASE_MCU_IN_SLEEP; ++ kbase_pm_enable_db_mirror_interrupt(kbdev); ++ kbase_csf_scheduler_reval_idleness_post_sleep(kbdev); ++ /* Enable PM interrupt, after MCU has been put ++ * to sleep, for the power down of L2. ++ */ ++ if (!kbdev->csf.firmware_hctl_core_pwr) ++ kbasep_pm_toggle_power_interrupt(kbdev, true); ++ } ++ break; + ++ case KBASE_MCU_IN_SLEEP: ++ if (kbase_pm_is_mcu_desired(kbdev) && ++ backend->l2_state == KBASE_L2_ON) { ++ wait_mcu_as_inactive(kbdev); ++ KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_REQUEST_WAKEUP( ++ kbdev, kbase_backend_get_cycle_cnt(kbdev)); ++ kbase_pm_enable_mcu_db_notification(kbdev); ++ kbase_pm_disable_db_mirror_interrupt(kbdev); ++ /* Disable PM interrupt after L2 has been ++ * powered up for the wakeup of MCU. ++ */ ++ if (!kbdev->csf.firmware_hctl_core_pwr) ++ kbasep_pm_toggle_power_interrupt(kbdev, false); ++ backend->mcu_state = KBASE_MCU_ON_HWCNT_ENABLE; ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++ } ++ break; ++#endif + case KBASE_MCU_RESET_WAIT: + /* Reset complete */ + if (!backend->in_reset) + backend->mcu_state = KBASE_MCU_OFF; ++ ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++ kbdev->csf.coresight.disable_on_pmode_enter = false; ++ kbdev->csf.coresight.enable_on_pmode_exit = false; ++#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ + break; + + default: @@ -150394,15 +158081,44 @@ index 000000000000..e9e30ebadc2d + backend->mcu_state); + } + -+ if (backend->mcu_state != prev_state) ++ if (backend->mcu_state != prev_state) { + dev_dbg(kbdev->dev, "MCU state transition: %s to %s\n", + kbase_mcu_state_to_string(prev_state), + kbase_mcu_state_to_string(backend->mcu_state)); ++ kbase_ktrace_log_mcu_state(kbdev, backend->mcu_state); ++ } + + } while (backend->mcu_state != prev_state); + + return 0; +} ++ ++static void core_idle_worker(struct work_struct *work) ++{ ++ struct kbase_device *kbdev = ++ container_of(work, struct kbase_device, pm.backend.core_idle_work); ++ struct kbase_pm_backend_data *backend = &kbdev->pm.backend; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ while (backend->gpu_powered && (backend->mcu_state == KBASE_MCU_HCTL_CORE_INACTIVE_PEND)) { ++ const unsigned int core_inactive_wait_ms = 1; ++ u64 active_cores = kbase_pm_get_active_cores(kbdev, KBASE_PM_CORE_SHADER); ++ u64 shaders_ready = kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_SHADER); ++ u64 cores_to_disable = shaders_ready & ~backend->shaders_desired_mask; ++ ++ if (!(cores_to_disable & active_cores)) { ++ kbase_pm_update_state(kbdev); ++ break; ++ } ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ msleep(core_inactive_wait_ms); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ } ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++} +#endif + +static const char *kbase_l2_core_state_to_string(enum kbase_l2_core_state state) @@ -150418,66 +158134,158 @@ index 000000000000..e9e30ebadc2d + return strings[state]; +} + -+static int kbase_pm_l2_update_state(struct kbase_device *kbdev) ++static ++void kbase_ktrace_log_l2_core_state(struct kbase_device *kbdev, enum kbase_l2_core_state state) +{ -+ struct kbase_pm_backend_data *backend = &kbdev->pm.backend; -+ u64 l2_present = kbdev->gpu_props.props.raw_props.l2_present; -+ u64 tiler_present = kbdev->gpu_props.props.raw_props.tiler_present; -+ enum kbase_l2_core_state prev_state; -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ do { -+ /* Get current state */ -+ u64 l2_trans = kbase_pm_get_trans_cores(kbdev, ++#if KBASE_KTRACE_ENABLE ++ switch (state) { ++#define KBASEP_L2_STATE(n) \ ++ case KBASE_L2_ ## n: \ ++ KBASE_KTRACE_ADD(kbdev, PM_L2_ ## n, NULL, state); \ ++ break; ++#include "mali_kbase_pm_l2_states.h" ++#undef KBASEP_L2_STATE ++ } ++#endif ++} ++ ++#if !MALI_USE_CSF ++/* On powering on the L2, the tracked kctx becomes stale and can be cleared. ++ * This enables the backend to spare the START_FLUSH.INV_SHADER_OTHER ++ * operation on the first submitted katom after the L2 powering on. ++ */ ++static void kbase_pm_l2_clear_backend_slot_submit_kctx(struct kbase_device *kbdev) ++{ ++ int js; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ /* Clear the slots' last katom submission kctx */ ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) ++ kbdev->hwaccess.backend.slot_rb[js].last_kctx_tagged = SLOT_RB_NULL_TAG_VAL; ++} ++#endif ++ ++static bool can_power_down_l2(struct kbase_device *kbdev) ++{ ++#if MALI_USE_CSF ++ /* Due to the HW issue GPU2019-3878, need to prevent L2 power off ++ * whilst MMU command is in progress. ++ * Also defer the power-down if MMU is in process of page migration. ++ */ ++ return !kbdev->mmu_hw_operation_in_progress && !kbdev->mmu_page_migrate_in_progress; ++#else ++ return !kbdev->mmu_page_migrate_in_progress; ++#endif ++} ++ ++static bool can_power_up_l2(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ /* Avoiding l2 transition if MMU is undergoing page migration */ ++ return !kbdev->mmu_page_migrate_in_progress; ++} ++ ++static bool need_tiler_control(struct kbase_device *kbdev) ++{ ++#if MALI_USE_CSF ++ if (kbase_pm_no_mcu_core_pwroff(kbdev)) ++ return true; ++ else ++ return false; ++#else ++ return true; ++#endif ++} ++ ++static int kbase_pm_l2_update_state(struct kbase_device *kbdev) ++{ ++ struct kbase_pm_backend_data *backend = &kbdev->pm.backend; ++ u64 l2_present = kbdev->gpu_props.curr_config.l2_present; ++ u64 tiler_present = kbdev->gpu_props.props.raw_props.tiler_present; ++ bool l2_power_up_done; ++ enum kbase_l2_core_state prev_state; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ do { ++ /* Get current state */ ++ u64 l2_trans = kbase_pm_get_trans_cores(kbdev, + KBASE_PM_CORE_L2); + u64 l2_ready = kbase_pm_get_ready_cores(kbdev, + KBASE_PM_CORE_L2); -+ u64 tiler_trans = kbase_pm_get_trans_cores(kbdev, -+ KBASE_PM_CORE_TILER); -+ u64 tiler_ready = kbase_pm_get_ready_cores(kbdev, -+ KBASE_PM_CORE_TILER); + ++#ifdef CONFIG_MALI_ARBITER_SUPPORT + /* + * kbase_pm_get_ready_cores and kbase_pm_get_trans_cores + * are vulnerable to corruption if gpu is lost + */ -+ if (kbase_is_gpu_removed(kbdev) -+#ifdef CONFIG_MALI_ARBITER_SUPPORT -+ || kbase_pm_is_gpu_lost(kbdev)) { -+#else -+ ) { -+#endif ++ if (kbase_is_gpu_removed(kbdev) || kbase_pm_is_gpu_lost(kbdev)) { + backend->shaders_state = + KBASE_SHADERS_OFF_CORESTACK_OFF; -+ backend->l2_state = KBASE_L2_OFF; -+ dev_dbg(kbdev->dev, "GPU lost has occurred - L2 off\n"); ++ backend->hwcnt_desired = false; ++ if (!backend->hwcnt_disabled) { ++ /* Don't progress until hw counters are disabled ++ * This may involve waiting for a worker to complete. ++ * The HW counters backend disable code checks for the ++ * GPU removed case and will error out without touching ++ * the hardware. This step is needed to keep the HW ++ * counters in a consistent state after a GPU lost. ++ */ ++ backend->l2_state = ++ KBASE_L2_ON_HWCNT_DISABLE; ++ KBASE_KTRACE_ADD(kbdev, PM_L2_ON_HWCNT_DISABLE, NULL, ++ backend->l2_state); ++ kbase_pm_trigger_hwcnt_disable(kbdev); ++ } ++ ++ if (backend->hwcnt_disabled) { ++ backend->l2_state = KBASE_L2_OFF; ++ KBASE_KTRACE_ADD(kbdev, PM_L2_OFF, NULL, backend->l2_state); ++ dev_dbg(kbdev->dev, "GPU lost has occurred - L2 off\n"); ++ } + break; + } ++#endif + + /* mask off ready from trans in case transitions finished + * between the register reads + */ + l2_trans &= ~l2_ready; -+ tiler_trans &= ~tiler_ready; + + prev_state = backend->l2_state; + + switch (backend->l2_state) { + case KBASE_L2_OFF: -+ if (kbase_pm_is_l2_desired(kbdev)) { ++ if (kbase_pm_is_l2_desired(kbdev) && can_power_up_l2(kbdev)) { ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++ /* Enable HW timer of IPA control before ++ * L2 cache is powered-up. ++ */ ++ kbase_ipa_control_handle_gpu_sleep_exit(kbdev); ++#endif + /* + * Set the desired config for L2 before + * powering it on + */ + kbase_pm_l2_config_override(kbdev); ++ kbase_pbha_write_settings(kbdev); + -+ /* L2 is required, power on. Powering on the -+ * tiler will also power the first L2 cache. ++ /* If Host is controlling the power for shader ++ * cores, then it also needs to control the ++ * power for Tiler. ++ * Powering on the tiler will also power the ++ * L2 cache. + */ -+ kbase_pm_invoke(kbdev, KBASE_PM_CORE_TILER, -+ tiler_present, ACTION_PWRON); -+ ++ if (need_tiler_control(kbdev)) { ++ kbase_pm_invoke(kbdev, KBASE_PM_CORE_TILER, tiler_present, ++ ACTION_PWRON); ++ } else { ++ kbase_pm_invoke(kbdev, KBASE_PM_CORE_L2, l2_present, ++ ACTION_PWRON); ++ } ++#if !MALI_USE_CSF + /* If we have more than one L2 cache then we + * must power them on explicitly. + */ @@ -150485,14 +158293,36 @@ index 000000000000..e9e30ebadc2d + kbase_pm_invoke(kbdev, KBASE_PM_CORE_L2, + l2_present & ~1, + ACTION_PWRON); ++ /* Clear backend slot submission kctx */ ++ kbase_pm_l2_clear_backend_slot_submit_kctx(kbdev); ++#endif + backend->l2_state = KBASE_L2_PEND_ON; + } + break; + + case KBASE_L2_PEND_ON: -+ if (!l2_trans && l2_ready == l2_present && !tiler_trans -+ && tiler_ready == tiler_present) { -+ KBASE_KTRACE_ADD(kbdev, PM_CORES_CHANGE_AVAILABLE_TILER, NULL, tiler_ready); ++ l2_power_up_done = false; ++ if (!l2_trans && l2_ready == l2_present) { ++ if (need_tiler_control(kbdev)) { ++ u64 tiler_trans = kbase_pm_get_trans_cores( ++ kbdev, KBASE_PM_CORE_TILER); ++ u64 tiler_ready = kbase_pm_get_ready_cores( ++ kbdev, KBASE_PM_CORE_TILER); ++ tiler_trans &= ~tiler_ready; ++ ++ if (!tiler_trans && tiler_ready == tiler_present) { ++ KBASE_KTRACE_ADD(kbdev, ++ PM_CORES_CHANGE_AVAILABLE_TILER, ++ NULL, tiler_ready); ++ l2_power_up_done = true; ++ } ++ } else { ++ KBASE_KTRACE_ADD(kbdev, PM_CORES_CHANGE_AVAILABLE_L2, NULL, ++ l2_ready); ++ l2_power_up_done = true; ++ } ++ } ++ if (l2_power_up_done) { + /* + * Ensure snoops are enabled after L2 is powered + * up. Note that kbase keeps track of the snoop @@ -150571,7 +158401,8 @@ index 000000000000..e9e30ebadc2d + break; +#else + /* Do not power off L2 until the MCU has been stopped */ -+ if (backend->mcu_state != KBASE_MCU_OFF) ++ if ((backend->mcu_state != KBASE_MCU_OFF) && ++ (backend->mcu_state != KBASE_MCU_IN_SLEEP)) + break; +#endif + @@ -150617,9 +158448,8 @@ index 000000000000..e9e30ebadc2d + } + + backend->hwcnt_desired = false; -+ if (!backend->hwcnt_disabled) { ++ if (!backend->hwcnt_disabled) + kbase_pm_trigger_hwcnt_disable(kbdev); -+ } +#endif + + if (backend->hwcnt_disabled) { @@ -150656,25 +158486,31 @@ index 000000000000..e9e30ebadc2d + break; + + case KBASE_L2_POWER_DOWN: -+ if (!backend->l2_always_on) -+ /* Powering off the L2 will also power off the -+ * tiler. -+ */ -+ kbase_pm_invoke(kbdev, KBASE_PM_CORE_L2, -+ l2_present, -+ ACTION_PWROFF); -+ else -+ /* If L2 cache is powered then we must flush it -+ * before we power off the GPU. Normally this -+ * would have been handled when the L2 was -+ * powered off. -+ */ -+ kbase_gpu_start_cache_clean_nolock( -+ kbdev); -+ -+ KBASE_KTRACE_ADD(kbdev, PM_CORES_CHANGE_AVAILABLE_TILER, NULL, 0u); -+ -+ backend->l2_state = KBASE_L2_PEND_OFF; ++ if (kbase_pm_is_l2_desired(kbdev)) ++ backend->l2_state = KBASE_L2_PEND_ON; ++ else if (can_power_down_l2(kbdev)) { ++ if (!backend->l2_always_on) ++ /* Powering off the L2 will also power off the ++ * tiler. ++ */ ++ kbase_pm_invoke(kbdev, KBASE_PM_CORE_L2, ++ l2_present, ++ ACTION_PWROFF); ++ else ++ /* If L2 cache is powered then we must flush it ++ * before we power off the GPU. Normally this ++ * would have been handled when the L2 was ++ * powered off. ++ */ ++ kbase_gpu_start_cache_clean_nolock( ++ kbdev, GPU_COMMAND_CACHE_CLN_INV_L2); ++#if !MALI_USE_CSF ++ KBASE_KTRACE_ADD(kbdev, PM_CORES_CHANGE_AVAILABLE_TILER, NULL, 0u); ++#else ++ KBASE_KTRACE_ADD(kbdev, PM_CORES_CHANGE_AVAILABLE_L2, NULL, 0u); ++#endif ++ backend->l2_state = KBASE_L2_PEND_OFF; ++ } + break; + + case KBASE_L2_PEND_OFF: @@ -150682,12 +158518,26 @@ index 000000000000..e9e30ebadc2d + /* We only need to check the L2 here - if the L2 + * is off then the tiler is definitely also off. + */ -+ if (!l2_trans && !l2_ready) ++ if (!l2_trans && !l2_ready) { ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++ /* Allow clock gating within the GPU and prevent it ++ * from being seen as active during sleep. ++ */ ++ kbase_ipa_control_handle_gpu_sleep_enter(kbdev); ++#endif + /* L2 is now powered off */ + backend->l2_state = KBASE_L2_OFF; ++ } + } else { -+ if (!kbdev->cache_clean_in_progress) ++ if (!kbdev->cache_clean_in_progress) { ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++ /* Allow clock gating within the GPU and prevent it ++ * from being seen as active during sleep. ++ */ ++ kbase_ipa_control_handle_gpu_sleep_enter(kbdev); ++#endif + backend->l2_state = KBASE_L2_OFF; ++ } + } + break; + @@ -150702,11 +158552,13 @@ index 000000000000..e9e30ebadc2d + backend->l2_state); + } + -+ if (backend->l2_state != prev_state) ++ if (backend->l2_state != prev_state) { + dev_dbg(kbdev->dev, "L2 state transition: %s to %s\n", + kbase_l2_core_state_to_string(prev_state), + kbase_l2_core_state_to_string( + backend->l2_state)); ++ kbase_ktrace_log_l2_core_state(kbdev, backend->l2_state); ++ } + + } while (backend->l2_state != prev_state); + @@ -150801,7 +158653,6 @@ index 000000000000..e9e30ebadc2d + &kbdev->pm.backend.shader_tick_timer; + enum kbase_shader_core_state prev_state; + u64 stacks_avail = 0; -+ int err = 0; + + lockdep_assert_held(&kbdev->hwaccess_lock); + @@ -150886,6 +158737,12 @@ index 000000000000..e9e30ebadc2d + kbase_pm_invoke(kbdev, KBASE_PM_CORE_SHADER, + backend->shaders_avail, ACTION_PWRON); + ++ if (backend->pm_current_policy && ++ backend->pm_current_policy->handle_event) ++ backend->pm_current_policy->handle_event( ++ kbdev, ++ KBASE_PM_POLICY_EVENT_POWER_ON); ++ + backend->shaders_state = KBASE_SHADERS_PEND_ON_CORESTACK_ON; + } + break; @@ -150896,8 +158753,18 @@ index 000000000000..e9e30ebadc2d + backend->pm_shaders_core_mask = shaders_ready; + backend->hwcnt_desired = true; + if (backend->hwcnt_disabled) { ++#if MALI_USE_CSF ++ unsigned long flags; ++ ++ kbase_csf_scheduler_spin_lock(kbdev, ++ &flags); ++#endif + kbase_hwcnt_context_enable( + kbdev->hwcnt_gpu_ctx); ++#if MALI_USE_CSF ++ kbase_csf_scheduler_spin_unlock(kbdev, ++ flags); ++#endif + backend->hwcnt_disabled = false; + } + @@ -150928,6 +158795,12 @@ index 000000000000..e9e30ebadc2d + /* Wait for being disabled */ + ; + } else if (!backend->shaders_desired) { ++ if (backend->pm_current_policy && ++ backend->pm_current_policy->handle_event) ++ backend->pm_current_policy->handle_event( ++ kbdev, ++ KBASE_PM_POLICY_EVENT_IDLE); ++ + if (kbdev->pm.backend.protected_transition_override || +#ifdef CONFIG_MALI_ARBITER_SUPPORT + kbase_pm_is_suspending(kbdev) || @@ -150988,9 +158861,21 @@ index 000000000000..e9e30ebadc2d + } + + if (backend->shaders_desired) { ++ if (backend->pm_current_policy && ++ backend->pm_current_policy->handle_event) ++ backend->pm_current_policy->handle_event( ++ kbdev, ++ KBASE_PM_POLICY_EVENT_TIMER_HIT); ++ + stt->remaining_ticks = 0; + backend->shaders_state = KBASE_SHADERS_ON_CORESTACK_ON_RECHECK; + } else if (stt->remaining_ticks == 0) { ++ if (backend->pm_current_policy && ++ backend->pm_current_policy->handle_event) ++ backend->pm_current_policy->handle_event( ++ kbdev, ++ KBASE_PM_POLICY_EVENT_TIMER_MISS); ++ + backend->shaders_state = KBASE_SHADERS_WAIT_FINISHED_CORESTACK_ON; +#ifdef CONFIG_MALI_ARBITER_SUPPORT + } else if (kbase_pm_is_suspending(kbdev) || @@ -151012,10 +158897,12 @@ index 000000000000..e9e30ebadc2d + break; + + case KBASE_SHADERS_WAIT_FINISHED_CORESTACK_ON: -+ shader_poweroff_timer_queue_cancel(kbdev); ++ if (!backend->partial_shaderoff) ++ shader_poweroff_timer_queue_cancel(kbdev); + + if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TTRX_921)) { -+ kbase_gpu_start_cache_clean_nolock(kbdev); ++ kbase_gpu_start_cache_clean_nolock( ++ kbdev, GPU_COMMAND_CACHE_CLN_INV_L2); + backend->shaders_state = + KBASE_SHADERS_L2_FLUSHING_CORESTACK_ON; + } else { @@ -151077,8 +158964,18 @@ index 000000000000..e9e30ebadc2d + backend->pm_shaders_core_mask = 0; + backend->hwcnt_desired = true; + if (backend->hwcnt_disabled) { ++#if MALI_USE_CSF ++ unsigned long flags; ++ ++ kbase_csf_scheduler_spin_lock(kbdev, ++ &flags); ++#endif + kbase_hwcnt_context_enable( + kbdev->hwcnt_gpu_ctx); ++#if MALI_USE_CSF ++ kbase_csf_scheduler_spin_unlock(kbdev, ++ flags); ++#endif + backend->hwcnt_disabled = false; + } + backend->shaders_state = KBASE_SHADERS_OFF_CORESTACK_OFF_TIMER_PEND_OFF; @@ -151105,9 +159002,9 @@ index 000000000000..e9e30ebadc2d + + } while (backend->shaders_state != prev_state); + -+ return err; ++ return 0; +} -+#endif ++#endif /* !MALI_USE_CSF */ + +static bool kbase_pm_is_in_desired_state_nolock(struct kbase_device *kbdev) +{ @@ -151115,12 +159012,7 @@ index 000000000000..e9e30ebadc2d + + lockdep_assert_held(&kbdev->hwaccess_lock); + -+ if (kbase_pm_is_l2_desired(kbdev) && -+ kbdev->pm.backend.l2_state != KBASE_L2_ON) -+ in_desired_state = false; -+ else if (!kbase_pm_is_l2_desired(kbdev) && -+ kbdev->pm.backend.l2_state != KBASE_L2_OFF) -+ in_desired_state = false; ++ in_desired_state = kbase_pm_l2_is_in_desired_state(kbdev); + +#if !MALI_USE_CSF + if (kbdev->pm.backend.shaders_desired && @@ -151130,12 +159022,7 @@ index 000000000000..e9e30ebadc2d + kbdev->pm.backend.shaders_state != KBASE_SHADERS_OFF_CORESTACK_OFF) + in_desired_state = false; +#else -+ if (kbase_pm_is_mcu_desired(kbdev) && -+ kbdev->pm.backend.mcu_state != KBASE_MCU_ON) -+ in_desired_state = false; -+ else if (!kbase_pm_is_mcu_desired(kbdev) && -+ kbdev->pm.backend.mcu_state != KBASE_MCU_OFF) -+ in_desired_state = false; ++ in_desired_state &= kbase_pm_mcu_is_in_desired_state(kbdev); +#endif + + return in_desired_state; @@ -151233,8 +159120,8 @@ index 000000000000..e9e30ebadc2d + if (kbase_pm_mcu_update_state(kbdev)) + return; + -+ if (prev_mcu_state != KBASE_MCU_OFF && -+ kbdev->pm.backend.mcu_state == KBASE_MCU_OFF) { ++ if (!kbase_pm_is_mcu_inactive(kbdev, prev_mcu_state) && ++ kbase_pm_is_mcu_inactive(kbdev, kbdev->pm.backend.mcu_state)) { + if (kbase_pm_l2_update_state(kbdev)) + return; + } @@ -151299,13 +159186,27 @@ index 000000000000..e9e30ebadc2d + hrtimer_init(&stt->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + stt->timer.function = shader_tick_timer_callback; + stt->configured_interval = HR_TIMER_DELAY_NSEC(DEFAULT_PM_GPU_POWEROFF_TICK_NS); -+ stt->configured_ticks = DEFAULT_PM_POWEROFF_TICK_SHADER; ++ stt->default_ticks = DEFAULT_PM_POWEROFF_TICK_SHADER; ++ stt->configured_ticks = stt->default_ticks; ++ ++#if MALI_USE_CSF ++ kbdev->pm.backend.core_idle_wq = alloc_workqueue("coreoff_wq", WQ_HIGHPRI | WQ_UNBOUND, 1); ++ if (!kbdev->pm.backend.core_idle_wq) { ++ destroy_workqueue(stt->wq); ++ return -ENOMEM; ++ } ++ ++ INIT_WORK(&kbdev->pm.backend.core_idle_work, core_idle_worker); ++#endif + + return 0; +} + +void kbase_pm_state_machine_term(struct kbase_device *kbdev) +{ ++#if MALI_USE_CSF ++ destroy_workqueue(kbdev->pm.backend.core_idle_wq); ++#endif + hrtimer_cancel(&kbdev->pm.backend.shader_tick_timer.timer); + destroy_workqueue(kbdev->pm.backend.shader_tick_timer.wq); +} @@ -151318,6 +159219,7 @@ index 000000000000..e9e30ebadc2d + + backend->in_reset = true; + backend->l2_state = KBASE_L2_RESET_WAIT; ++ KBASE_KTRACE_ADD(kbdev, PM_L2_RESET_WAIT, NULL, backend->l2_state); +#if !MALI_USE_CSF + backend->shaders_state = KBASE_SHADERS_RESET_WAIT; +#else @@ -151326,6 +159228,10 @@ index 000000000000..e9e30ebadc2d + */ + if (likely(kbdev->csf.firmware_inited)) { + backend->mcu_state = KBASE_MCU_RESET_WAIT; ++ KBASE_KTRACE_ADD(kbdev, PM_MCU_RESET_WAIT, NULL, backend->mcu_state); ++#ifdef KBASE_PM_RUNTIME ++ backend->exit_gpu_sleep_mode = true; ++#endif + kbdev->csf.firmware_reload_needed = true; + } else { + WARN_ON(backend->mcu_state != KBASE_MCU_OFF); @@ -151363,15 +159269,21 @@ index 000000000000..e9e30ebadc2d + */ + kbase_gpu_cache_clean_wait_complete(kbdev); + backend->in_reset = false; ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++ backend->gpu_wakeup_override = false; ++#endif + kbase_pm_update_state(kbdev); + + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} + -+/* Timeout for kbase_pm_wait_for_desired_state when wait_event_killable has -+ * aborted due to a fatal signal. If the time spent waiting has exceeded this -+ * threshold then there is most likely a hardware issue. */ ++#if !MALI_USE_CSF ++/* Timeout in milliseconds for GPU Power Management to reach the desired ++ * Shader and L2 state. If the time spent waiting has exceeded this threshold ++ * then there is most likely a hardware issue. ++ */ +#define PM_TIMEOUT_MS (5000) /* 5s */ ++#endif + +static void kbase_pm_timed_out(struct kbase_device *kbdev) +{ @@ -151429,28 +159341,50 @@ index 000000000000..e9e30ebadc2d + L2_PWRTRANS_LO))); + + dev_err(kbdev->dev, "Sending reset to GPU - all running jobs will be lost\n"); -+ if (kbase_prepare_to_reset_gpu(kbdev)) ++ if (kbase_prepare_to_reset_gpu(kbdev, ++ RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) + kbase_reset_gpu(kbdev); +} + -+void kbase_pm_wait_for_l2_powered(struct kbase_device *kbdev) ++int kbase_pm_wait_for_l2_powered(struct kbase_device *kbdev) +{ + unsigned long flags; + unsigned long timeout; -+ int err; ++ long remaining; ++ int err = 0; + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + kbase_pm_update_state(kbdev); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ timeout = jiffies + msecs_to_jiffies(PM_TIMEOUT_MS); ++#if MALI_USE_CSF ++ timeout = kbase_csf_timeout_in_jiffies(kbase_get_timeout_ms(kbdev, CSF_PM_TIMEOUT)); ++#else ++ timeout = msecs_to_jiffies(PM_TIMEOUT_MS); ++#endif + + /* Wait for cores */ -+ err = wait_event_killable(kbdev->pm.backend.gpu_in_desired_state_wait, -+ kbase_pm_is_in_desired_state_with_l2_powered(kbdev)); ++#if KERNEL_VERSION(4, 13, 1) <= LINUX_VERSION_CODE ++ remaining = wait_event_killable_timeout(kbdev->pm.backend.gpu_in_desired_state_wait, ++ kbase_pm_is_in_desired_state_with_l2_powered(kbdev), ++ timeout); ++#else ++ remaining = wait_event_timeout( ++ kbdev->pm.backend.gpu_in_desired_state_wait, ++ kbase_pm_is_in_desired_state_with_l2_powered(kbdev), timeout); ++#endif + -+ if (err < 0 && time_after(jiffies, timeout)) ++ if (!remaining) { + kbase_pm_timed_out(kbdev); ++ err = -ETIMEDOUT; ++ } else if (remaining < 0) { ++ dev_info( ++ kbdev->dev, ++ "Wait for desired PM state with L2 powered got interrupted"); ++ err = (int)remaining; ++ } ++ ++ return err; +} + +int kbase_pm_wait_for_desired_state(struct kbase_device *kbdev) @@ -151458,7 +159392,7 @@ index 000000000000..e9e30ebadc2d + unsigned long flags; + long remaining; +#if MALI_USE_CSF -+ long timeout = kbase_csf_timeout_in_jiffies(PM_TIMEOUT_MS); ++ long timeout = kbase_csf_timeout_in_jiffies(kbase_get_timeout_ms(kbdev, CSF_PM_TIMEOUT)); +#else + long timeout = msecs_to_jiffies(PM_TIMEOUT_MS); +#endif @@ -151493,11 +159427,71 @@ index 000000000000..e9e30ebadc2d +} +KBASE_EXPORT_TEST_API(kbase_pm_wait_for_desired_state); + ++#if MALI_USE_CSF ++/** ++ * core_mask_update_done - Check if downscaling of shader cores is done ++ * ++ * @kbdev: The kbase device structure for the device. ++ * ++ * This function checks if the downscaling of cores is effectively complete. ++ * ++ * Return: true if the downscale is done. ++ */ ++static bool core_mask_update_done(struct kbase_device *kbdev) ++{ ++ bool update_done = false; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ /* If MCU is in stable ON state then it implies that the downscale ++ * request had completed. ++ * If MCU is not active then it implies all cores are off, so can ++ * consider the downscale request as complete. ++ */ ++ if ((kbdev->pm.backend.mcu_state == KBASE_MCU_ON) || ++ kbase_pm_is_mcu_inactive(kbdev, kbdev->pm.backend.mcu_state)) ++ update_done = true; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ return update_done; ++} ++ ++int kbase_pm_wait_for_cores_down_scale(struct kbase_device *kbdev) ++{ ++ long timeout = kbase_csf_timeout_in_jiffies(kbase_get_timeout_ms(kbdev, CSF_PM_TIMEOUT)); ++ long remaining; ++ int err = 0; ++ ++ /* Wait for core mask update to complete */ ++#if KERNEL_VERSION(4, 13, 1) <= LINUX_VERSION_CODE ++ remaining = wait_event_killable_timeout( ++ kbdev->pm.backend.gpu_in_desired_state_wait, ++ core_mask_update_done(kbdev), timeout); ++#else ++ remaining = wait_event_timeout( ++ kbdev->pm.backend.gpu_in_desired_state_wait, ++ core_mask_update_done(kbdev), timeout); ++#endif ++ ++ if (!remaining) { ++ kbase_pm_timed_out(kbdev); ++ err = -ETIMEDOUT; ++ } else if (remaining < 0) { ++ dev_info( ++ kbdev->dev, ++ "Wait for cores down scaling got interrupted"); ++ err = (int)remaining; ++ } ++ ++ return err; ++} ++#endif ++ +void kbase_pm_enable_interrupts(struct kbase_device *kbdev) +{ + unsigned long flags; + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + /* + * Clear all interrupts, + * and unmask them all. @@ -151523,7 +159517,7 @@ index 000000000000..e9e30ebadc2d + +void kbase_pm_disable_interrupts_nolock(struct kbase_device *kbdev) +{ -+ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + /* + * Mask all interrupts, + * and clear them all. @@ -151550,6 +159544,38 @@ index 000000000000..e9e30ebadc2d + +KBASE_EXPORT_TEST_API(kbase_pm_disable_interrupts); + ++#if MALI_USE_CSF ++/** ++ * update_user_reg_page_mapping - Update the mapping for USER Register page ++ * ++ * @kbdev: The kbase device structure for the device. ++ * ++ * This function must be called to unmap the dummy or real page from USER Register page ++ * mapping whenever GPU is powered up or down. The dummy or real page would get ++ * appropriately mapped in when Userspace reads the LATEST_FLUSH value. ++ */ ++static void update_user_reg_page_mapping(struct kbase_device *kbdev) ++{ ++ struct kbase_context *kctx, *n; ++ ++ lockdep_assert_held(&kbdev->pm.lock); ++ ++ mutex_lock(&kbdev->csf.reg_lock); ++ list_for_each_entry_safe(kctx, n, &kbdev->csf.user_reg.list, csf.user_reg.link) { ++ /* This would zap the PTE corresponding to the mapping of User ++ * Register page of the kbase context. The mapping will be reestablished ++ * when the context (user process) needs to access to the page. ++ */ ++ unmap_mapping_range(kbdev->csf.user_reg.filp->f_inode->i_mapping, ++ kctx->csf.user_reg.file_offset << PAGE_SHIFT, PAGE_SIZE, 1); ++ list_del_init(&kctx->csf.user_reg.link); ++ dev_dbg(kbdev->dev, "Updated USER Reg page mapping of ctx %d_%d", kctx->tgid, ++ kctx->id); ++ } ++ mutex_unlock(&kbdev->csf.reg_lock); ++} ++#endif ++ +/* + * pmu layout: + * 0x0000: PMU TAG (RO) (0xCAFECAFE) @@ -151558,10 +159584,11 @@ index 000000000000..e9e30ebadc2d + */ +void kbase_pm_clock_on(struct kbase_device *kbdev, bool is_resume) +{ ++ struct kbase_pm_backend_data *backend = &kbdev->pm.backend; + bool reset_required = is_resume; + unsigned long flags; + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); +#if !MALI_USE_CSF + lockdep_assert_held(&kbdev->js_data.runpool_mutex); +#endif /* !MALI_USE_CSF */ @@ -151575,7 +159602,13 @@ index 000000000000..e9e30ebadc2d + } +#endif + -+ if (kbdev->pm.backend.gpu_powered) { ++ if (backend->gpu_powered) { ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++ if (backend->gpu_idled) { ++ backend->callback_power_runtime_gpu_active(kbdev); ++ backend->gpu_idled = false; ++ } ++#endif + /* Already turned on */ + if (kbdev->poweroff_pending) + kbase_pm_enable_interrupts(kbdev); @@ -151588,35 +159621,51 @@ index 000000000000..e9e30ebadc2d + + KBASE_KTRACE_ADD(kbdev, PM_GPU_ON, NULL, 0u); + -+ if (is_resume && kbdev->pm.backend.callback_power_resume) { -+ kbdev->pm.backend.callback_power_resume(kbdev); ++ if (is_resume && backend->callback_power_resume) { ++ backend->callback_power_resume(kbdev); + return; -+ } else if (kbdev->pm.backend.callback_power_on) { -+ reset_required = kbdev->pm.backend.callback_power_on(kbdev); ++ } else if (backend->callback_power_on) { ++ reset_required = backend->callback_power_on(kbdev); + } + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbdev->pm.backend.gpu_powered = true; ++ backend->gpu_powered = true; + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + ++#if MALI_USE_CSF ++ /* GPU has been turned on, can switch to actual register page */ ++ update_user_reg_page_mapping(kbdev); ++#endif ++ ++ + if (reset_required) { + /* GPU state was lost, reset GPU to ensure it is in a -+ * consistent state */ ++ * consistent state ++ */ + kbase_pm_init_hw(kbdev, PM_ENABLE_IRQS); + } +#ifdef CONFIG_MALI_ARBITER_SUPPORT + else { -+ struct kbase_arbiter_vm_state *arb_vm_state = ++ if (kbdev->arb.arb_if) { ++ struct kbase_arbiter_vm_state *arb_vm_state = + kbdev->pm.arb_vm_state; + -+ /* In the case that the GPU has just been granted by -+ * the Arbiter, a reset will have already been done. -+ * However, it is still necessary to initialize the GPU. -+ */ -+ if (arb_vm_state->vm_arb_starting) -+ kbase_pm_init_hw(kbdev, PM_ENABLE_IRQS | -+ PM_NO_RESET); ++ /* In the case that the GPU has just been granted by ++ * the Arbiter, a reset will have already been done. ++ * However, it is still necessary to initialize the GPU. ++ */ ++ if (arb_vm_state->vm_arb_starting) ++ kbase_pm_init_hw(kbdev, PM_ENABLE_IRQS | ++ PM_NO_RESET); ++ } + } ++ /* ++ * This point means that the GPU trasitioned to ON. So there is a chance ++ * that a repartitioning occurred. In this case the current config ++ * should be read again. ++ */ ++ kbase_gpuprops_get_curr_config_props(kbdev, ++ &kbdev->gpu_props.curr_config); +#endif /* CONFIG_MALI_ARBITER_SUPPORT */ + + mutex_lock(&kbdev->mmu_hw_mutex); @@ -151639,10 +159688,31 @@ index 000000000000..e9e30ebadc2d + + /* Turn on the L2 caches */ + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbdev->pm.backend.gpu_ready = true; -+ kbdev->pm.backend.l2_desired = true; ++ backend->gpu_ready = true; ++ backend->l2_desired = true; ++#if MALI_USE_CSF ++ if (reset_required) { ++ /* GPU reset was done after the power on, so send the post ++ * reset event instead. This is okay as GPU power off event ++ * is same as pre GPU reset event. ++ */ ++ kbase_ipa_control_handle_gpu_reset_post(kbdev); ++ } else { ++ kbase_ipa_control_handle_gpu_power_on(kbdev); ++ } ++#endif + kbase_pm_update_state(kbdev); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++ /* GPU is now powered up. Invoke the GPU active callback as GPU idle ++ * callback would have been invoked before the power down. ++ */ ++ if (backend->gpu_idled) { ++ backend->callback_power_runtime_gpu_active(kbdev); ++ backend->gpu_idled = false; ++ } ++#endif +} + +KBASE_EXPORT_TEST_API(kbase_pm_clock_on); @@ -151651,7 +159721,7 @@ index 000000000000..e9e30ebadc2d +{ + unsigned long flags; + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + lockdep_assert_held(&kbdev->pm.lock); + + /* ASSERT that the cores should now be unavailable. No lock needed. */ @@ -151675,28 +159745,41 @@ index 000000000000..e9e30ebadc2d + + if (atomic_read(&kbdev->faults_pending)) { + /* Page/bus faults are still being processed. The GPU can not -+ * be powered off until they have completed */ ++ * be powered off until they have completed ++ */ + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + return false; + } + + kbase_pm_cache_snoop_disable(kbdev); ++#if MALI_USE_CSF ++ kbase_ipa_control_handle_gpu_power_off(kbdev); ++#endif + -+ kbdev->pm.backend.gpu_ready = false; -+ -+ /* The GPU power may be turned off from this point */ -+ kbdev->pm.backend.gpu_powered = false; -+ ++ if (kbase_is_gpu_removed(kbdev) +#ifdef CONFIG_MALI_ARBITER_SUPPORT -+ if (kbase_pm_is_gpu_lost(kbdev)) { ++ || kbase_pm_is_gpu_lost(kbdev)) { ++#else ++ ) { ++#endif + /* Ensure we unblock any threads that are stuck waiting + * for the GPU + */ + kbase_gpu_cache_clean_wait_complete(kbdev); + } -+#endif ++ ++ kbdev->pm.backend.gpu_ready = false; ++ ++ /* The GPU power may be turned off from this point */ ++ kbdev->pm.backend.gpu_powered = false; + + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++#if MALI_USE_CSF ++ /* GPU is about to be turned off, switch to dummy page */ ++ update_user_reg_page_mapping(kbdev); ++#endif ++ +#ifdef CONFIG_MALI_ARBITER_SUPPORT + kbase_arbiter_pm_vm_event(kbdev, KBASE_VM_GPU_IDLE_EVENT); +#endif /* CONFIG_MALI_ARBITER_SUPPORT */ @@ -151724,9 +159807,9 @@ index 000000000000..e9e30ebadc2d +/** + * kbase_pm_wait_for_reset - Wait for a reset to happen + * -+ * Wait for the %RESET_COMPLETED IRQ to occur, then reset the waiting state. -+ * + * @kbdev: Kbase device ++ * ++ * Wait for the %RESET_COMPLETED IRQ to occur, then reset the waiting state. + */ +static void kbase_pm_wait_for_reset(struct kbase_device *kbdev) +{ @@ -151744,23 +159827,23 @@ index 000000000000..e9e30ebadc2d + struct kbasep_reset_timeout_data *rtdata = + container_of(timer, struct kbasep_reset_timeout_data, timer); + -+ rtdata->timed_out = 1; ++ rtdata->timed_out = true; + + /* Set the wait queue to wake up kbase_pm_init_hw even though the reset -+ * hasn't completed */ ++ * hasn't completed ++ */ + kbase_pm_reset_done(rtdata->kbdev); + + return HRTIMER_NORESTART; +} + -+static int kbase_set_jm_quirks(struct kbase_device *kbdev, const u32 prod_id) ++static int kbase_set_gpu_quirks(struct kbase_device *kbdev, const u32 prod_id) +{ +#if MALI_USE_CSF -+ kbdev->hw_quirks_jm = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(CSF_CONFIG)); ++ kbdev->hw_quirks_gpu = ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(CSF_CONFIG)); +#else -+ u32 hw_quirks_jm = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(JM_CONFIG)); ++ u32 hw_quirks_gpu = kbase_reg_read(kbdev, GPU_CONTROL_REG(JM_CONFIG)); + + if (GPU_ID2_MODEL_MATCH_VALUE(prod_id) == GPU_ID2_PRODUCT_TMIX) { + /* Only for tMIx */ @@ -151774,39 +159857,38 @@ index 000000000000..e9e30ebadc2d + */ + if (coherency_features == + COHERENCY_FEATURE_BIT(COHERENCY_ACE)) { -+ hw_quirks_jm |= (COHERENCY_ACE_LITE | -+ COHERENCY_ACE) << -+ JM_FORCE_COHERENCY_FEATURES_SHIFT; ++ hw_quirks_gpu |= (COHERENCY_ACE_LITE | COHERENCY_ACE) ++ << JM_FORCE_COHERENCY_FEATURES_SHIFT; + } + } + + if (kbase_is_gpu_removed(kbdev)) + return -EIO; + -+ kbdev->hw_quirks_jm = hw_quirks_jm; ++ kbdev->hw_quirks_gpu = hw_quirks_gpu; + +#endif /* !MALI_USE_CSF */ + if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_IDVS_GROUP_SIZE)) { + int default_idvs_group_size = 0xF; -+ u32 tmp; ++ u32 group_size = 0; + -+ if (of_property_read_u32(kbdev->dev->of_node, -+ "idvs-group-size", &tmp)) -+ tmp = default_idvs_group_size; ++ if (of_property_read_u32(kbdev->dev->of_node, "idvs-group-size", ++ &group_size)) ++ group_size = default_idvs_group_size; + -+ if (tmp > IDVS_GROUP_MAX_SIZE) { ++ if (group_size > IDVS_GROUP_MAX_SIZE) { + dev_err(kbdev->dev, + "idvs-group-size of %d is too large. Maximum value is %d", -+ tmp, IDVS_GROUP_MAX_SIZE); -+ tmp = default_idvs_group_size; ++ group_size, IDVS_GROUP_MAX_SIZE); ++ group_size = default_idvs_group_size; + } + -+ kbdev->hw_quirks_jm |= tmp << IDVS_GROUP_SIZE_SHIFT; ++ kbdev->hw_quirks_gpu |= group_size << IDVS_GROUP_SIZE_SHIFT; + } + +#define MANUAL_POWER_CONTROL ((u32)(1 << 8)) + if (corestack_driver_control) -+ kbdev->hw_quirks_jm |= MANUAL_POWER_CONTROL; ++ kbdev->hw_quirks_gpu |= MANUAL_POWER_CONTROL; + + return 0; +} @@ -151856,22 +159938,21 @@ index 000000000000..e9e30ebadc2d +{ + struct device_node *np = kbdev->dev->of_node; + const u32 gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ const u32 prod_id = (gpu_id & GPU_ID_VERSION_PRODUCT_ID) >> -+ GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++ const u32 prod_id = ++ (gpu_id & GPU_ID_VERSION_PRODUCT_ID) >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT; + int error = 0; + -+ kbdev->hw_quirks_jm = 0; ++ kbdev->hw_quirks_gpu = 0; + kbdev->hw_quirks_sc = 0; + kbdev->hw_quirks_tiler = 0; + kbdev->hw_quirks_mmu = 0; + -+ if (!of_property_read_u32(np, "quirks_jm", -+ &kbdev->hw_quirks_jm)) { ++ if (!of_property_read_u32(np, "quirks_gpu", &kbdev->hw_quirks_gpu)) { + dev_info(kbdev->dev, -+ "Found quirks_jm = [0x%x] in Devicetree\n", -+ kbdev->hw_quirks_jm); ++ "Found quirks_gpu = [0x%x] in Devicetree\n", ++ kbdev->hw_quirks_gpu); + } else { -+ error = kbase_set_jm_quirks(kbdev, prod_id); ++ error = kbase_set_gpu_quirks(kbdev, prod_id); + if (error) + return error; + } @@ -151922,10 +160003,10 @@ index 000000000000..e9e30ebadc2d + kbdev->hw_quirks_mmu); +#if MALI_USE_CSF + kbase_reg_write(kbdev, GPU_CONTROL_REG(CSF_CONFIG), -+ kbdev->hw_quirks_jm); ++ kbdev->hw_quirks_gpu); +#else + kbase_reg_write(kbdev, GPU_CONTROL_REG(JM_CONFIG), -+ kbdev->hw_quirks_jm); ++ kbdev->hw_quirks_gpu); +#endif +} + @@ -151933,7 +160014,7 @@ index 000000000000..e9e30ebadc2d +{ + if ((kbdev->current_gpu_coherency_mode == COHERENCY_ACE) && + !kbdev->cci_snoop_enabled) { -+#ifdef CONFIG_ARM64 ++#if IS_ENABLED(CONFIG_ARM64) + if (kbdev->snoop_enable_smc != 0) + kbase_invoke_smc_fid(kbdev->snoop_enable_smc, 0, 0, 0); +#endif /* CONFIG_ARM64 */ @@ -151945,7 +160026,7 @@ index 000000000000..e9e30ebadc2d +void kbase_pm_cache_snoop_disable(struct kbase_device *kbdev) +{ + if (kbdev->cci_snoop_enabled) { -+#ifdef CONFIG_ARM64 ++#if IS_ENABLED(CONFIG_ARM64) + if (kbdev->snoop_disable_smc != 0) { + mali_cci_flush_l2(kbdev); + kbase_invoke_smc_fid(kbdev->snoop_disable_smc, 0, 0, 0); @@ -151956,6 +160037,7 @@ index 000000000000..e9e30ebadc2d + } +} + ++#if !MALI_USE_CSF +static void reenable_protected_mode_hwcnt(struct kbase_device *kbdev) +{ + unsigned long irq_flags; @@ -151968,6 +160050,7 @@ index 000000000000..e9e30ebadc2d + } + spin_unlock_irqrestore(&kbdev->hwaccess_lock, irq_flags); +} ++#endif + +static int kbase_pm_do_reset(struct kbase_device *kbdev) +{ @@ -151994,7 +160077,7 @@ index 000000000000..e9e30ebadc2d + + /* Initialize a structure for tracking the status of the reset */ + rtdata.kbdev = kbdev; -+ rtdata.timed_out = 0; ++ rtdata.timed_out = false; + + /* Create a timer to use as a timeout on the reset */ + hrtimer_init_on_stack(&rtdata.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); @@ -152006,7 +160089,7 @@ index 000000000000..e9e30ebadc2d + /* Wait for the RESET_COMPLETED interrupt to be raised */ + kbase_pm_wait_for_reset(kbdev); + -+ if (rtdata.timed_out == 0) { ++ if (!rtdata.timed_out) { + /* GPU has been reset */ + hrtimer_cancel(&rtdata.timer); + destroy_hrtimer_on_stack(&rtdata.timer); @@ -152014,11 +160097,13 @@ index 000000000000..e9e30ebadc2d + } + + /* No interrupt has been received - check if the RAWSTAT register says -+ * the reset has completed */ ++ * the reset has completed ++ */ + if ((kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_RAWSTAT)) & + RESET_COMPLETED)) { + /* The interrupt is set in the RAWSTAT; this suggests that the -+ * interrupts are not getting to the CPU */ ++ * interrupts are not getting to the CPU ++ */ + dev_err(kbdev->dev, "Reset interrupt didn't reach CPU. Check interrupt assignments.\n"); + /* If interrupts aren't working we can't continue. */ + destroy_hrtimer_on_stack(&rtdata.timer); @@ -152032,33 +160117,40 @@ index 000000000000..e9e30ebadc2d + } + + /* The GPU doesn't seem to be responding to the reset so try a hard -+ * reset */ -+ dev_err(kbdev->dev, "Failed to soft-reset GPU (timed out after %d ms), now attempting a hard reset\n", -+ RESET_TIMEOUT); -+ KBASE_KTRACE_ADD(kbdev, CORE_GPU_HARD_RESET, NULL, 0); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_HARD_RESET); ++ * reset, but only when NOT in arbitration mode. ++ */ ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ if (!kbdev->arb.arb_if) { ++#endif /* CONFIG_MALI_ARBITER_SUPPORT */ ++ dev_err(kbdev->dev, "Failed to soft-reset GPU (timed out after %d ms), now attempting a hard reset\n", ++ RESET_TIMEOUT); ++ KBASE_KTRACE_ADD(kbdev, CORE_GPU_HARD_RESET, NULL, 0); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), ++ GPU_COMMAND_HARD_RESET); + -+ /* Restart the timer to wait for the hard reset to complete */ -+ rtdata.timed_out = 0; ++ /* Restart the timer to wait for the hard reset to complete */ ++ rtdata.timed_out = false; + -+ hrtimer_start(&rtdata.timer, HR_TIMER_DELAY_MSEC(RESET_TIMEOUT), -+ HRTIMER_MODE_REL); ++ hrtimer_start(&rtdata.timer, HR_TIMER_DELAY_MSEC(RESET_TIMEOUT), ++ HRTIMER_MODE_REL); + -+ /* Wait for the RESET_COMPLETED interrupt to be raised */ -+ kbase_pm_wait_for_reset(kbdev); ++ /* Wait for the RESET_COMPLETED interrupt to be raised */ ++ kbase_pm_wait_for_reset(kbdev); + -+ if (rtdata.timed_out == 0) { -+ /* GPU has been reset */ -+ hrtimer_cancel(&rtdata.timer); -+ destroy_hrtimer_on_stack(&rtdata.timer); -+ return 0; -+ } ++ if (!rtdata.timed_out) { ++ /* GPU has been reset */ ++ hrtimer_cancel(&rtdata.timer); ++ destroy_hrtimer_on_stack(&rtdata.timer); ++ return 0; ++ } + -+ destroy_hrtimer_on_stack(&rtdata.timer); ++ destroy_hrtimer_on_stack(&rtdata.timer); + -+ dev_err(kbdev->dev, "Failed to hard-reset the GPU (timed out after %d ms)\n", -+ RESET_TIMEOUT); ++ dev_err(kbdev->dev, "Failed to hard-reset the GPU (timed out after %d ms)\n", ++ RESET_TIMEOUT); ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ } ++#endif /* CONFIG_MALI_ARBITER_SUPPORT */ + + return -EINVAL; +} @@ -152082,7 +160174,7 @@ index 000000000000..e9e30ebadc2d + unsigned long irq_flags; + int err = 0; + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + lockdep_assert_held(&kbdev->pm.lock); + + /* Ensure the clock is on before attempting to access the hardware */ @@ -152094,7 +160186,8 @@ index 000000000000..e9e30ebadc2d + } + + /* Ensure interrupts are off to begin with, this also clears any -+ * outstanding interrupts */ ++ * outstanding interrupts ++ */ + kbase_pm_disable_interrupts(kbdev); + /* Ensure cache snoops are disabled before reset. */ + kbase_pm_cache_snoop_disable(kbdev); @@ -152115,6 +160208,17 @@ index 000000000000..e9e30ebadc2d + kbdev->protected_dev); + + spin_lock_irqsave(&kbdev->hwaccess_lock, irq_flags); ++#if MALI_USE_CSF ++ if (kbdev->protected_mode) { ++ unsigned long flags; ++ ++ kbase_ipa_control_protm_exited(kbdev); ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ kbase_hwcnt_backend_csf_protm_exited(&kbdev->hwcnt_gpu_iface); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ } ++#endif + kbdev->protected_mode = false; + spin_unlock_irqrestore(&kbdev->hwaccess_lock, irq_flags); + @@ -152135,7 +160239,8 @@ index 000000000000..e9e30ebadc2d + GPU_STATUS_PROTECTED_MODE_ACTIVE); + + /* If cycle counter was in use re-enable it, enable_irqs will only be -+ * false when called from kbase_pm_powerup */ ++ * false when called from kbase_pm_powerup ++ */ + if (kbdev->pm.backend.gpu_cycle_counter_requests && + (flags & PM_ENABLE_IRQS)) { + kbase_pm_enable_interrupts(kbdev); @@ -152158,18 +160263,21 @@ index 000000000000..e9e30ebadc2d + kbase_pm_enable_interrupts(kbdev); + +exit: ++#if !MALI_USE_CSF + if (!kbdev->pm.backend.protected_entry_transition_override) { + /* Re-enable GPU hardware counters if we're resetting from + * protected mode. + */ + reenable_protected_mode_hwcnt(kbdev); + } ++#endif + + return err; +} + +/** + * kbase_pm_request_gpu_cycle_counter_do_request - Request cycle counters ++ * @kbdev: The kbase device structure of the device + * + * Increase the count of cycle counter users and turn the cycle counters on if + * they were previously off @@ -152180,8 +160288,6 @@ index 000000000000..e9e30ebadc2d + * + * When this function is called the l2 cache must be on - i.e., the GPU must be + * on. -+ * -+ * @kbdev: The kbase device structure of the device + */ +static void +kbase_pm_request_gpu_cycle_counter_do_request(struct kbase_device *kbdev) @@ -152190,12 +160296,23 @@ index 000000000000..e9e30ebadc2d + + spin_lock_irqsave(&kbdev->pm.backend.gpu_cycle_counter_requests_lock, + flags); -+ + ++kbdev->pm.backend.gpu_cycle_counter_requests; + -+ if (1 == kbdev->pm.backend.gpu_cycle_counter_requests) ++ if (kbdev->pm.backend.gpu_cycle_counter_requests == 1) + kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), + GPU_COMMAND_CYCLE_COUNT_START); ++ else { ++ /* This might happen after GPU reset. ++ * Then counter needs to be kicked. ++ */ ++#if !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ if (!(kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_STATUS)) & ++ GPU_STATUS_CYCLE_COUNT_ACTIVE)) { ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), ++ GPU_COMMAND_CYCLE_COUNT_START); ++ } ++#endif ++ } + + spin_unlock_irqrestore( + &kbdev->pm.backend.gpu_cycle_counter_requests_lock, @@ -152211,6 +160328,8 @@ index 000000000000..e9e30ebadc2d + KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_cycle_counter_requests < + INT_MAX); + ++ kbase_pm_wait_for_l2_powered(kbdev); ++ + kbase_pm_request_gpu_cycle_counter_do_request(kbdev); +} + @@ -152245,7 +160364,7 @@ index 000000000000..e9e30ebadc2d + + --kbdev->pm.backend.gpu_cycle_counter_requests; + -+ if (0 == kbdev->pm.backend.gpu_cycle_counter_requests) ++ if (kbdev->pm.backend.gpu_cycle_counter_requests == 0) + kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), + GPU_COMMAND_CYCLE_COUNT_STOP); + @@ -152268,18 +160387,19 @@ index 000000000000..e9e30ebadc2d +KBASE_EXPORT_TEST_API(kbase_pm_release_gpu_cycle_counter); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h new file mode 100755 -index 000000000000..50ca016bbd6d +index 000000000..e66ce57d3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h -@@ -0,0 +1,739 @@ +@@ -0,0 +1,1021 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -152290,12 +160410,8 @@ index 000000000000..50ca016bbd6d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/* + * Power management API definitions used internally by GPU backend + */ @@ -152305,25 +160421,25 @@ index 000000000000..50ca016bbd6d + +#include + -+#include "mali_kbase_pm_ca.h" ++#include "backend/gpu/mali_kbase_pm_ca.h" +#include "mali_kbase_pm_policy.h" + + +/** + * kbase_pm_dev_idle - The GPU is idle. + * -+ * The OS may choose to turn off idle devices -+ * + * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * The OS may choose to turn off idle devices + */ +void kbase_pm_dev_idle(struct kbase_device *kbdev); + +/** + * kbase_pm_dev_activate - The GPU is active. + * -+ * The OS should avoid opportunistically turning off the GPU while it is active -+ * + * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * The OS should avoid opportunistically turning off the GPU while it is active + */ +void kbase_pm_dev_activate(struct kbase_device *kbdev); + @@ -152331,14 +160447,14 @@ index 000000000000..50ca016bbd6d + * kbase_pm_get_present_cores - Get details of the cores that are present in + * the device. + * -+ * This function can be called by the active power policy to return a bitmask of -+ * the cores (of a specified type) present in the GPU device and also a count of -+ * the number of cores. -+ * + * @kbdev: The kbase device structure for the device (must be a valid + * pointer) + * @type: The type of core (see the enum kbase_pm_core_type enumeration) + * ++ * This function can be called by the active power policy to return a bitmask of ++ * the cores (of a specified type) present in the GPU device and also a count of ++ * the number of cores. ++ * + * Return: The bit mask of cores present + */ +u64 kbase_pm_get_present_cores(struct kbase_device *kbdev, @@ -152348,13 +160464,13 @@ index 000000000000..50ca016bbd6d + * kbase_pm_get_active_cores - Get details of the cores that are currently + * active in the device. + * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @type: The type of core (see the enum kbase_pm_core_type enumeration) ++ * + * This function can be called by the active power policy to return a bitmask of + * the cores (of a specified type) that are actively processing work (i.e. + * turned on *and* busy). + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * @type: The type of core (see the enum kbase_pm_core_type enumeration) -+ * + * Return: The bit mask of active cores + */ +u64 kbase_pm_get_active_cores(struct kbase_device *kbdev, @@ -152364,13 +160480,13 @@ index 000000000000..50ca016bbd6d + * kbase_pm_get_trans_cores - Get details of the cores that are currently + * transitioning between power states. + * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @type: The type of core (see the enum kbase_pm_core_type enumeration) ++ * + * This function can be called by the active power policy to return a bitmask of + * the cores (of a specified type) that are currently transitioning between + * power states. + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * @type: The type of core (see the enum kbase_pm_core_type enumeration) -+ * + * Return: The bit mask of transitioning cores + */ +u64 kbase_pm_get_trans_cores(struct kbase_device *kbdev, @@ -152380,13 +160496,13 @@ index 000000000000..50ca016bbd6d + * kbase_pm_get_ready_cores - Get details of the cores that are currently + * powered and ready for jobs. + * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @type: The type of core (see the enum kbase_pm_core_type enumeration) ++ * + * This function can be called by the active power policy to return a bitmask of + * the cores (of a specified type) that are powered and ready for jobs (they may + * or may not be currently executing jobs). + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * @type: The type of core (see the enum kbase_pm_core_type enumeration) -+ * + * Return: The bit mask of ready cores + */ +u64 kbase_pm_get_ready_cores(struct kbase_device *kbdev, @@ -152396,13 +160512,13 @@ index 000000000000..50ca016bbd6d + * kbase_pm_clock_on - Turn the clock for the device on, and enable device + * interrupts. + * -+ * This function can be used by a power policy to turn the clock for the GPU on. -+ * It should be modified during integration to perform the necessary actions to -+ * ensure that the GPU is fully powered and clocked. -+ * + * @kbdev: The kbase device structure for the device (must be a valid + * pointer) + * @is_resume: true if clock on due to resume after suspend, false otherwise ++ * ++ * This function can be used by a power policy to turn the clock for the GPU on. ++ * It should be modified during integration to perform the necessary actions to ++ * ensure that the GPU is fully powered and clocked. + */ +void kbase_pm_clock_on(struct kbase_device *kbdev, bool is_resume); + @@ -152410,12 +160526,16 @@ index 000000000000..50ca016bbd6d + * kbase_pm_clock_off - Disable device interrupts, and turn the clock for the + * device off. + * ++ * @kbdev: The kbase device structure for the device (must be a valid ++ * pointer) ++ * + * This function can be used by a power policy to turn the clock for the GPU + * off. It should be modified during integration to perform the necessary + * actions to turn the clock off (if this is possible in the integration). + * -+ * @kbdev: The kbase device structure for the device (must be a valid -+ * pointer) ++ * If runtime PM is enabled and @power_runtime_gpu_idle_callback is used ++ * then this function would usually be invoked from the runtime suspend ++ * callback function. + * + * Return: true if clock was turned off, or + * false if clock can not be turned off due to pending page/bus fault @@ -152426,22 +160546,22 @@ index 000000000000..50ca016bbd6d +/** + * kbase_pm_enable_interrupts - Enable interrupts on the device. + * -+ * Interrupts are also enabled after a call to kbase_pm_clock_on(). -+ * + * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Interrupts are also enabled after a call to kbase_pm_clock_on(). + */ +void kbase_pm_enable_interrupts(struct kbase_device *kbdev); + +/** + * kbase_pm_disable_interrupts - Disable interrupts on the device. + * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * + * This prevents delivery of Power Management interrupts to the CPU so that + * kbase_pm_update_state() will not be called from the IRQ handler + * until kbase_pm_enable_interrupts() or kbase_pm_clock_on() is called. + * + * Interrupts are also disabled after a call to kbase_pm_clock_off(). -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ +void kbase_pm_disable_interrupts(struct kbase_device *kbdev); + @@ -152449,9 +160569,9 @@ index 000000000000..50ca016bbd6d + * kbase_pm_disable_interrupts_nolock - Version of kbase_pm_disable_interrupts() + * that does not take the hwaccess_lock + * -+ * Caller must hold the hwaccess_lock. -+ * + * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Caller must hold the hwaccess_lock. + */ +void kbase_pm_disable_interrupts_nolock(struct kbase_device *kbdev); + @@ -152470,12 +160590,11 @@ index 000000000000..50ca016bbd6d + +/** + * kbase_pm_reset_done - The GPU has been reset successfully. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * This function must be called by the GPU interrupt handler when the + * RESET_COMPLETED bit is set. It signals to the power management initialization + * code that the GPU has been successfully reset. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ +void kbase_pm_reset_done(struct kbase_device *kbdev); + @@ -152483,6 +160602,7 @@ index 000000000000..50ca016bbd6d +/** + * kbase_pm_wait_for_desired_state - Wait for the desired power state to be + * reached ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * Wait for the L2 and MCU state machines to reach the states corresponding + * to the values of 'kbase_pm_is_l2_desired' and 'kbase_pm_is_mcu_desired'. @@ -152497,14 +160617,14 @@ index 000000000000..50ca016bbd6d + * power off in progress and kbase_pm_context_active() was called instead of + * kbase_csf_scheduler_pm_active(). + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * + * Return: 0 on success, error code on error + */ ++int kbase_pm_wait_for_desired_state(struct kbase_device *kbdev); +#else +/** + * kbase_pm_wait_for_desired_state - Wait for the desired power state to be + * reached ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * Wait for the L2 and shader power state machines to reach the states + * corresponding to the values of 'l2_desired' and 'shaders_desired'. @@ -152518,18 +160638,18 @@ index 000000000000..50ca016bbd6d + * NOTE: This may not wait until the correct state is reached if there is a + * power off in progress. To correctly wait for the desired state the caller + * must ensure that this is not the case by, for example, calling -+ * kbase_pm_wait_for_poweroff_complete() -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * kbase_pm_wait_for_poweroff_work_complete() + * + * Return: 0 on success, error code on error + */ -+#endif +int kbase_pm_wait_for_desired_state(struct kbase_device *kbdev); ++#endif + +/** + * kbase_pm_wait_for_l2_powered - Wait for the L2 cache to be powered on + * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * + * Wait for the L2 to be powered on, and for the L2 and the state machines of + * its dependent stack components to stabilise. + * @@ -152538,21 +160658,51 @@ index 000000000000..50ca016bbd6d + * Unlike kbase_pm_update_state(), the caller must not hold hwaccess_lock, + * because this function will take that lock itself. + * ++ * Return: 0 on success, error code on error ++ */ ++int kbase_pm_wait_for_l2_powered(struct kbase_device *kbdev); ++ ++#if MALI_USE_CSF ++/** ++ * kbase_pm_wait_for_cores_down_scale - Wait for the downscaling of shader cores ++ * + * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * This function can be called to ensure that the downscaling of cores is ++ * effectively complete and it would be safe to lower the voltage. ++ * The function assumes that caller had exercised the MCU state machine for the ++ * downscale request through the kbase_pm_update_state() function. ++ * ++ * This function needs to be used by the caller to safely wait for the completion ++ * of downscale request, instead of kbase_pm_wait_for_desired_state(). ++ * The downscale request would trigger a state change in MCU state machine ++ * and so when MCU reaches the stable ON state, it can be inferred that ++ * downscaling is complete. But it has been observed that the wake up of the ++ * waiting thread can get delayed by few milli seconds and by the time the ++ * thread wakes up the power down transition could have started (after the ++ * completion of downscale request). ++ * On the completion of power down transition another wake up signal would be ++ * sent, but again by the time thread wakes up the power up transition can begin. ++ * And the power up transition could then get blocked inside the platform specific ++ * callback_power_on() function due to the thread that called into Kbase (from the ++ * platform specific code) to perform the downscaling and then ended up waiting ++ * for the completion of downscale request. ++ * ++ * Return: 0 on success, error code on error or remaining jiffies on timeout. + */ -+void kbase_pm_wait_for_l2_powered(struct kbase_device *kbdev); ++int kbase_pm_wait_for_cores_down_scale(struct kbase_device *kbdev); ++#endif + +/** + * kbase_pm_update_dynamic_cores_onoff - Update the L2 and shader power state + * machines after changing shader core + * availability ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * It can be called in any status, so need to check the l2 and shader core + * power status in this function or it will break shader/l2 state machine + * + * Caller must hold hwaccess_lock -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ +void kbase_pm_update_dynamic_cores_onoff(struct kbase_device *kbdev); + @@ -152575,6 +160725,8 @@ index 000000000000..50ca016bbd6d + * kbase_pm_state_machine_init - Initialize the state machines, primarily the + * shader poweroff timer + * @kbdev: Device pointer ++ * ++ * Return: 0 on success, error code on error + */ +int kbase_pm_state_machine_init(struct kbase_device *kbdev); + @@ -152588,22 +160740,21 @@ index 000000000000..50ca016bbd6d + * kbase_pm_update_cores_state - Update the desired state of shader cores from + * the Power Policy, and begin any power + * transitions. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * This function will update the desired_xx_state members of + * struct kbase_pm_device_data by calling into the current Power Policy. It will + * then begin power transitions to make the hardware acheive the desired shader + * core state. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ +void kbase_pm_update_cores_state(struct kbase_device *kbdev); + +/** + * kbasep_pm_metrics_init - Initialize the metrics gathering framework. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * This must be called before other metric gathering APIs are called. + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * Return: 0 on success, error code on error + */ @@ -152611,29 +160762,27 @@ index 000000000000..50ca016bbd6d + +/** + * kbasep_pm_metrics_term - Terminate the metrics gathering framework. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * This must be called when metric gathering is no longer required. It is an + * error to call any metrics gathering function (other than + * kbasep_pm_metrics_init()) after calling this function. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ +void kbasep_pm_metrics_term(struct kbase_device *kbdev); + +/** + * kbase_pm_report_vsync - Function to be called by the frame buffer driver to + * update the vsync metric. ++ * @kbdev: The kbase device structure for the device (must be a ++ * valid pointer) ++ * @buffer_updated: True if the buffer has been updated on this VSync, ++ * false otherwise + * + * This function should be called by the frame buffer driver to update whether + * the system is hitting the vsync target or not. buffer_updated should be true + * if the vsync corresponded with a new frame being displayed, otherwise it + * should be false. This function does not need to be called every vsync, but + * only when the value of @buffer_updated differs from a previous call. -+ * -+ * @kbdev: The kbase device structure for the device (must be a -+ * valid pointer) -+ * @buffer_updated: True if the buffer has been updated on this VSync, -+ * false otherwise + */ +void kbase_pm_report_vsync(struct kbase_device *kbdev, int buffer_updated); + @@ -152651,6 +160800,7 @@ index 000000000000..50ca016bbd6d +/** + * kbase_pm_request_gpu_cycle_counter - Mark that the GPU cycle counter is + * needed ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * If the caller is the first caller then the GPU cycle counters will be enabled + * along with the l2 cache @@ -152658,13 +160808,13 @@ index 000000000000..50ca016bbd6d + * The GPU must be powered when calling this function (i.e. + * kbase_pm_context_active() must have been called). + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ +void kbase_pm_request_gpu_cycle_counter(struct kbase_device *kbdev); + +/** + * kbase_pm_request_gpu_cycle_counter_l2_is_on - Mark GPU cycle counter is + * needed (l2 cache already on) ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * This is a version of the above function + * (kbase_pm_request_gpu_cycle_counter()) suitable for being called when the @@ -152675,14 +160825,13 @@ index 000000000000..50ca016bbd6d + * The GPU must be powered when calling this function (i.e. + * kbase_pm_context_active() must have been called) and the l2 cache must be + * powered on. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ +void kbase_pm_request_gpu_cycle_counter_l2_is_on(struct kbase_device *kbdev); + +/** + * kbase_pm_release_gpu_cycle_counter - Mark that the GPU cycle counter is no + * longer in use ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * If the caller is the last caller then the GPU cycle counters will be + * disabled. A request must have been made before a call to this. @@ -152690,37 +160839,48 @@ index 000000000000..50ca016bbd6d + * Caller must not hold the hwaccess_lock, as it will be taken in this function. + * If the caller is already holding this lock then + * kbase_pm_release_gpu_cycle_counter_nolock() must be used instead. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ +void kbase_pm_release_gpu_cycle_counter(struct kbase_device *kbdev); + +/** + * kbase_pm_release_gpu_cycle_counter_nolock - Version of kbase_pm_release_gpu_cycle_counter() + * that does not take hwaccess_lock ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * Caller must hold the hwaccess_lock. ++ */ ++void kbase_pm_release_gpu_cycle_counter_nolock(struct kbase_device *kbdev); ++ ++/** ++ * kbase_pm_wait_for_poweroff_work_complete - Wait for the poweroff workqueue to ++ * complete + * + * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * This function effectively just waits for the @gpu_poweroff_wait_work work ++ * item to complete, if it was enqueued. GPU may not have been powered down ++ * before this function returns. + */ -+void kbase_pm_release_gpu_cycle_counter_nolock(struct kbase_device *kbdev); ++void kbase_pm_wait_for_poweroff_work_complete(struct kbase_device *kbdev); + +/** -+ * kbase_pm_wait_for_poweroff_complete - Wait for the poweroff workqueue to -+ * complete ++ * kbase_pm_wait_for_gpu_power_down - Wait for the GPU power down to complete + * + * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * This function waits for the actual gpu power down to complete. + */ -+void kbase_pm_wait_for_poweroff_complete(struct kbase_device *kbdev); ++void kbase_pm_wait_for_gpu_power_down(struct kbase_device *kbdev); + +/** + * kbase_pm_runtime_init - Initialize runtime-pm for Mali GPU platform device ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * Setup the power management callbacks and initialize/enable the runtime-pm + * for the Mali GPU platform device, using the callback function. This must be + * called before the kbase_pm_register_access_enable() function. + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * Return: 0 on success, error code on error + */ +int kbase_pm_runtime_init(struct kbase_device *kbdev); + @@ -152733,6 +160893,7 @@ index 000000000000..50ca016bbd6d + +/** + * kbase_pm_register_access_enable - Enable access to GPU registers ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * Enables access to the GPU registers before power management has powered up + * the GPU with kbase_pm_powerup(). @@ -152743,13 +160904,12 @@ index 000000000000..50ca016bbd6d + * + * This should only be used before power management is powered up with + * kbase_pm_powerup() -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ +void kbase_pm_register_access_enable(struct kbase_device *kbdev); + +/** + * kbase_pm_register_access_disable - Disable early register access ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * Disables access to the GPU registers enabled earlier by a call to + * kbase_pm_register_access_enable(). @@ -152760,17 +160920,17 @@ index 000000000000..50ca016bbd6d + * + * This should only be used before power management is powered up with + * kbase_pm_powerup() -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ +void kbase_pm_register_access_disable(struct kbase_device *kbdev); + +/* NOTE: kbase_pm_is_suspending is in mali_kbase.h, because it is an inline -+ * function */ ++ * function ++ */ + +/** + * kbase_pm_metrics_is_active - Check if the power management metrics + * collection is active. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * Note that this returns if the power management metrics collection was + * active at the time of calling, it is possible that after the call the metrics @@ -152778,7 +160938,6 @@ index 000000000000..50ca016bbd6d + * + * The caller must handle the consequence that the state may have changed. + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * Return: true if metrics collection was active else false. + */ +bool kbase_pm_metrics_is_active(struct kbase_device *kbdev); @@ -152810,25 +160969,41 @@ index 000000000000..50ca016bbd6d + +#ifdef CONFIG_MALI_BIFROST_DVFS + ++#if MALI_USE_CSF +/** -+ * kbase_platform_dvfs_event - Report utilisation to DVFS code ++ * kbase_platform_dvfs_event - Report utilisation to DVFS code for CSF GPU ++ * ++ * @kbdev: The kbase device structure for the device (must be a ++ * valid pointer) ++ * @utilisation: The current calculated utilisation by the metrics system. + * + * Function provided by platform specific code when DVFS is enabled to allow + * the power management metrics system to report utilisation. + * ++ * Return: Returns 0 on failure and non zero on success. ++ */ ++int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation); ++#else ++/** ++ * kbase_platform_dvfs_event - Report utilisation to DVFS code for JM GPU ++ * + * @kbdev: The kbase device structure for the device (must be a + * valid pointer) + * @utilisation: The current calculated utilisation by the metrics system. + * @util_gl_share: The current calculated gl share of utilisation. + * @util_cl_share: The current calculated cl share of utilisation per core + * group. ++ * Function provided by platform specific code when DVFS is enabled to allow ++ * the power management metrics system to report utilisation. ++ * + * Return: Returns 0 on failure and non zero on success. + */ -+ +int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, -+ u32 util_gl_share, u32 util_cl_share[2]); ++ u32 util_gl_share, u32 util_cl_share[2]); +#endif + ++#endif /* CONFIG_MALI_BIFROST_DVFS */ ++ +void kbase_pm_power_changed(struct kbase_device *kbdev); + +/** @@ -152893,6 +161068,7 @@ index 000000000000..50ca016bbd6d + */ +void kbase_pm_reset_complete(struct kbase_device *kbdev); + ++#if !MALI_USE_CSF +/** + * kbase_pm_protected_override_enable - Enable the protected mode override + * @kbdev: Device pointer @@ -152965,6 +161141,7 @@ index 000000000000..50ca016bbd6d + * to enter protected mode. + */ +void kbase_pm_protected_entry_override_disable(struct kbase_device *kbdev); ++#endif + +/* If true, the driver should explicitly control corestack power management, + * instead of relying on the Power Domain Controller. @@ -152982,6 +161159,128 @@ index 000000000000..50ca016bbd6d + */ +bool kbase_pm_is_l2_desired(struct kbase_device *kbdev); + ++#if MALI_USE_CSF ++/** ++ * kbase_pm_is_mcu_desired - Check whether MCU is desired ++ * ++ * @kbdev: Device pointer ++ * ++ * This shall be called to check whether MCU needs to be enabled. ++ * ++ * Return: true if MCU needs to be enabled. ++ */ ++bool kbase_pm_is_mcu_desired(struct kbase_device *kbdev); ++ ++/** ++ * kbase_pm_is_mcu_inactive - Check if the MCU is inactive (i.e. either ++ * it is disabled or it is in sleep) ++ * ++ * @kbdev: kbase device ++ * @state: state of the MCU state machine. ++ * ++ * This function must be called with hwaccess_lock held. ++ * L2 cache can be turned off if this function returns true. ++ * ++ * Return: true if MCU is inactive ++ */ ++bool kbase_pm_is_mcu_inactive(struct kbase_device *kbdev, ++ enum kbase_mcu_state state); ++ ++/** ++ * kbase_pm_idle_groups_sched_suspendable - Check whether the scheduler can be ++ * suspended to low power state when all ++ * the CSGs are idle ++ * ++ * @kbdev: Device pointer ++ * ++ * Return: true if allowed to enter the suspended state. ++ */ ++static inline ++bool kbase_pm_idle_groups_sched_suspendable(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ return !(kbdev->pm.backend.csf_pm_sched_flags & ++ CSF_DYNAMIC_PM_SCHED_IGNORE_IDLE); ++} ++ ++/** ++ * kbase_pm_no_runnables_sched_suspendable - Check whether the scheduler can be ++ * suspended to low power state when ++ * there are no runnable CSGs. ++ * ++ * @kbdev: Device pointer ++ * ++ * Return: true if allowed to enter the suspended state. ++ */ ++static inline ++bool kbase_pm_no_runnables_sched_suspendable(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ return !(kbdev->pm.backend.csf_pm_sched_flags & ++ CSF_DYNAMIC_PM_SCHED_NO_SUSPEND); ++} ++ ++/** ++ * kbase_pm_no_mcu_core_pwroff - Check whether the PM is required to keep the ++ * MCU shader Core powered in accordance to the active ++ * power management policy ++ * ++ * @kbdev: Device pointer ++ * ++ * Return: true if the MCU is to retain powered. ++ */ ++static inline bool kbase_pm_no_mcu_core_pwroff(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ return kbdev->pm.backend.csf_pm_sched_flags & ++ CSF_DYNAMIC_PM_CORE_KEEP_ON; ++} ++ ++/** ++ * kbase_pm_mcu_is_in_desired_state - Check if MCU is in stable ON/OFF state. ++ * ++ * @kbdev: Device pointer ++ * ++ * Return: true if MCU is in stable ON/OFF state. ++ */ ++static inline bool kbase_pm_mcu_is_in_desired_state(struct kbase_device *kbdev) ++{ ++ bool in_desired_state = true; ++ ++ if (kbase_pm_is_mcu_desired(kbdev) && kbdev->pm.backend.mcu_state != KBASE_MCU_ON) ++ in_desired_state = false; ++ else if (!kbase_pm_is_mcu_desired(kbdev) && ++ (kbdev->pm.backend.mcu_state != KBASE_MCU_OFF) && ++ (kbdev->pm.backend.mcu_state != KBASE_MCU_IN_SLEEP)) ++ in_desired_state = false; ++ ++ return in_desired_state; ++} ++ ++#endif ++ ++/** ++ * kbase_pm_l2_is_in_desired_state - Check if L2 is in stable ON/OFF state. ++ * ++ * @kbdev: Device pointer ++ * ++ * Return: true if L2 is in stable ON/OFF state. ++ */ ++static inline bool kbase_pm_l2_is_in_desired_state(struct kbase_device *kbdev) ++{ ++ bool in_desired_state = true; ++ ++ if (kbase_pm_is_l2_desired(kbdev) && kbdev->pm.backend.l2_state != KBASE_L2_ON) ++ in_desired_state = false; ++ else if (!kbase_pm_is_l2_desired(kbdev) && kbdev->pm.backend.l2_state != KBASE_L2_OFF) ++ in_desired_state = false; ++ ++ return in_desired_state; ++} ++ +/** + * kbase_pm_lock - Lock all necessary mutexes to perform PM actions + * @@ -153010,21 +161309,124 @@ index 000000000000..50ca016bbd6d +#endif /* !MALI_USE_CSF */ +} + ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++/** ++ * kbase_pm_gpu_sleep_allowed - Check if the GPU is allowed to be put in sleep ++ * ++ * @kbdev: Device pointer ++ * ++ * This function is called on GPU idle notification and if it returns false then ++ * GPU power down will be triggered by suspending the CSGs and halting the MCU. ++ * ++ * Return: true if the GPU is allowed to be in the sleep state. ++ */ ++static inline bool kbase_pm_gpu_sleep_allowed(struct kbase_device *kbdev) ++{ ++ /* If the autosuspend_delay has been set to 0 then it doesn't make ++ * sense to first put GPU to sleep state and then power it down, ++ * instead would be better to power it down right away. ++ * Also need to do the same when autosuspend_delay is set to a negative ++ * value, which implies that runtime pm is effectively disabled by the ++ * kernel. ++ * A high positive value of autosuspend_delay can be used to keep the ++ * GPU in sleep state for a long time. ++ */ ++ if (unlikely(!kbdev->dev->power.autosuspend_delay || ++ (kbdev->dev->power.autosuspend_delay < 0))) ++ return false; ++ ++ return kbdev->pm.backend.gpu_sleep_supported; ++} ++ ++/** ++ * kbase_pm_enable_db_mirror_interrupt - Enable the doorbell mirror interrupt to ++ * detect the User doorbell rings. ++ * ++ * @kbdev: Device pointer ++ * ++ * This function is called just before sending the sleep request to MCU firmware ++ * so that User doorbell rings can be detected whilst GPU remains in the sleep ++ * state. ++ * ++ */ ++static inline void kbase_pm_enable_db_mirror_interrupt(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ if (!kbdev->pm.backend.db_mirror_interrupt_enabled) { ++ u32 irq_mask = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(GPU_IRQ_MASK)); ++ ++ WARN_ON(irq_mask & DOORBELL_MIRROR); ++ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), ++ irq_mask | DOORBELL_MIRROR); ++ kbdev->pm.backend.db_mirror_interrupt_enabled = true; ++ } ++} ++ ++/** ++ * kbase_pm_disable_db_mirror_interrupt - Disable the doorbell mirror interrupt. ++ * ++ * @kbdev: Device pointer ++ * ++ * This function is called when doorbell mirror interrupt is received or MCU ++ * needs to be reactivated by enabling the doorbell notification. ++ */ ++static inline void kbase_pm_disable_db_mirror_interrupt(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ if (kbdev->pm.backend.db_mirror_interrupt_enabled) { ++ u32 irq_mask = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(GPU_IRQ_MASK)); ++ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), ++ irq_mask & ~DOORBELL_MIRROR); ++ kbdev->pm.backend.db_mirror_interrupt_enabled = false; ++ } ++} ++#endif ++ ++/** ++ * kbase_pm_l2_allow_mmu_page_migration - L2 state allows MMU page migration or not ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Check whether the L2 state is in power transition phase or not. If it is, the MMU ++ * page migration should be deferred. The caller must hold hwaccess_lock, and, if MMU ++ * page migration is intended, immediately start the MMU migration action without ++ * dropping the lock. When page migration begins, a flag is set in kbdev that would ++ * prevent the L2 state machine traversing into power transition phases, until ++ * the MMU migration action ends. ++ * ++ * Return: true if MMU page migration is allowed ++ */ ++static inline bool kbase_pm_l2_allow_mmu_page_migration(struct kbase_device *kbdev) ++{ ++ struct kbase_pm_backend_data *backend = &kbdev->pm.backend; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ return (backend->l2_state != KBASE_L2_PEND_ON && backend->l2_state != KBASE_L2_PEND_OFF); ++} ++ +#endif /* _KBASE_BACKEND_PM_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h new file mode 100755 -index 000000000000..12cb051db42a +index 000000000..ef72f6083 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h -@@ -0,0 +1,38 @@ +@@ -0,0 +1,50 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -153035,8 +161437,6 @@ index 000000000000..12cb051db42a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -153044,6 +161444,19 @@ index 000000000000..12cb051db42a + * The function-like macro KBASEP_L2_STATE() must be defined before including + * this header file. This header file can be included multiple times in the + * same compilation unit with different definitions of KBASEP_L2_STATE(). ++ * ++ * @OFF: The L2 cache and tiler are off ++ * @PEND_ON: The L2 cache and tiler are powering on ++ * @RESTORE_CLOCKS: The GPU clock is restored. Conditionally used. ++ * @ON_HWCNT_ENABLE: The L2 cache and tiler are on, and hwcnt is being enabled ++ * @ON: The L2 cache and tiler are on, and hwcnt is enabled ++ * @ON_HWCNT_DISABLE: The L2 cache and tiler are on, and hwcnt is being disabled ++ * @SLOW_DOWN_CLOCKS: The GPU clock is set to appropriate or lowest clock. ++ * Conditionally used. ++ * @POWER_DOWN: The L2 cache and tiler are about to be powered off ++ * @PEND_OFF: The L2 cache and tiler are powering off ++ * @RESET_WAIT: The GPU is resetting, L2 cache and tiler power state are ++ * unknown + */ +KBASEP_L2_STATE(OFF) +KBASEP_L2_STATE(PEND_ON) @@ -153057,18 +161470,19 @@ index 000000000000..12cb051db42a +KBASEP_L2_STATE(RESET_WAIT) diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h new file mode 100755 -index 000000000000..e163bd4f4094 +index 000000000..3b448e397 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h -@@ -0,0 +1,39 @@ +@@ -0,0 +1,108 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -153079,8 +161493,6 @@ index 000000000000..e163bd4f4094 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -153088,32 +161500,103 @@ index 000000000000..e163bd4f4094 + * The function-like macro KBASEP_MCU_STATE() must be defined before including + * this header file. This header file can be included multiple times in the + * same compilation unit with different definitions of KBASEP_MCU_STATE(). ++ * ++ * @OFF: The MCU is powered off. ++ * @PEND_ON_RELOAD: The warm boot of MCU or cold boot of MCU (with ++ * firmware reloading) is in progress. ++ * @ON_GLB_REINIT_PEND: The MCU is enabled and Global configuration ++ * requests have been sent to the firmware. ++ * @ON_HWCNT_ENABLE: The Global requests have completed and MCU is now ++ * ready for use and hwcnt is being enabled. ++ * @ON: The MCU is active and hwcnt has been enabled. ++ * @ON_CORE_ATTR_UPDATE_PEND: The MCU is active and mask of enabled shader cores ++ * is being updated. ++ * @ON_HWCNT_DISABLE: The MCU is on and hwcnt is being disabled. ++ * @ON_HALT: The MCU is on and hwcnt has been disabled, MCU ++ * halt would be triggered. ++ * @ON_PEND_HALT: MCU halt in progress, confirmation pending. ++ * @POWER_DOWN: MCU halted operations, pending being disabled. ++ * @PEND_OFF: MCU is being disabled, pending on powering off. ++ * @RESET_WAIT: The GPU is resetting, MCU state is unknown. ++ * @HCTL_SHADERS_PEND_ON: Global configuration requests sent to the firmware ++ * have completed and shaders have been requested to ++ * power on. ++ * @HCTL_CORES_NOTIFY_PEND: Shader cores have powered up and firmware is being ++ * notified of the mask of enabled shader cores. ++ * @HCTL_MCU_ON_RECHECK: MCU is on and hwcnt disabling is triggered ++ * and checks are done to update the number of ++ * enabled cores. ++ * @HCTL_SHADERS_READY_OFF: MCU has halted and cores need to be powered down ++ * @HCTL_SHADERS_PEND_OFF: Cores are transitioning to power down. ++ * @HCTL_CORES_DOWN_SCALE_NOTIFY_PEND: Firmware has been informed to stop using ++ * specific cores, due to core_mask change request. ++ * After the ACK from FW, the wait will be done for ++ * undesired cores to become inactive. ++ * @HCTL_CORE_INACTIVE_PEND: Waiting for specific cores to become inactive. ++ * Once the cores become inactive their power down ++ * will be initiated. ++ * @HCTL_SHADERS_CORE_OFF_PEND: Waiting for specific cores to complete the ++ * transition to power down. Once powered down, ++ * HW counters will be re-enabled. ++ * @ON_SLEEP_INITIATE: MCU is on and hwcnt has been disabled and MCU ++ * is being put to sleep. ++ * @ON_PEND_SLEEP: MCU sleep is in progress. ++ * @IN_SLEEP: Sleep request is completed and MCU has halted. ++ * @ON_PMODE_ENTER_CORESIGHT_DISABLE: The MCU is on, protected mode enter is about to ++ * be requested, Coresight is being disabled. ++ * @ON_PMODE_EXIT_CORESIGHT_ENABLE : The MCU is on, protected mode exit has happened ++ * Coresight is being enabled. ++ * @CORESIGHT_DISABLE: The MCU is on and Coresight is being disabled. ++ * @CORESIGHT_ENABLE: The MCU is on, host does not have control and ++ * Coresight is being enabled. + */ +KBASEP_MCU_STATE(OFF) +KBASEP_MCU_STATE(PEND_ON_RELOAD) +KBASEP_MCU_STATE(ON_GLB_REINIT_PEND) +KBASEP_MCU_STATE(ON_HWCNT_ENABLE) +KBASEP_MCU_STATE(ON) ++KBASEP_MCU_STATE(ON_CORE_ATTR_UPDATE_PEND) +KBASEP_MCU_STATE(ON_HWCNT_DISABLE) +KBASEP_MCU_STATE(ON_HALT) +KBASEP_MCU_STATE(ON_PEND_HALT) +KBASEP_MCU_STATE(POWER_DOWN) +KBASEP_MCU_STATE(PEND_OFF) +KBASEP_MCU_STATE(RESET_WAIT) ++/* Additional MCU states with HOST_CONTROL_SHADERS */ ++KBASEP_MCU_STATE(HCTL_SHADERS_PEND_ON) ++KBASEP_MCU_STATE(HCTL_CORES_NOTIFY_PEND) ++KBASEP_MCU_STATE(HCTL_MCU_ON_RECHECK) ++KBASEP_MCU_STATE(HCTL_SHADERS_READY_OFF) ++KBASEP_MCU_STATE(HCTL_SHADERS_PEND_OFF) ++KBASEP_MCU_STATE(HCTL_CORES_DOWN_SCALE_NOTIFY_PEND) ++KBASEP_MCU_STATE(HCTL_CORE_INACTIVE_PEND) ++KBASEP_MCU_STATE(HCTL_SHADERS_CORE_OFF_PEND) ++/* Additional MCU states to support GPU sleep feature */ ++KBASEP_MCU_STATE(ON_SLEEP_INITIATE) ++KBASEP_MCU_STATE(ON_PEND_SLEEP) ++KBASEP_MCU_STATE(IN_SLEEP) ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++/* Additional MCU states for Coresight */ ++KBASEP_MCU_STATE(ON_PMODE_ENTER_CORESIGHT_DISABLE) ++KBASEP_MCU_STATE(ON_PMODE_EXIT_CORESIGHT_ENABLE) ++KBASEP_MCU_STATE(CORESIGHT_DISABLE) ++KBASEP_MCU_STATE(CORESIGHT_ENABLE) ++#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c new file mode 100755 -index 000000000000..b714971ba17c +index 000000000..865f526f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c -@@ -0,0 +1,324 @@ +@@ -0,0 +1,529 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2011-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -153124,68 +161607,129 @@ index 000000000000..b714971ba17c + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/* + * Metrics for power management + */ + +#include ++#include +#include +#include -+#if !MALI_USE_CSF ++ ++#if MALI_USE_CSF ++#include "backend/gpu/mali_kbase_clk_rate_trace_mgr.h" ++#include ++#else +#include +#endif /* !MALI_USE_CSF */ ++ +#include +#include + -+/* When VSync is being hit aim for utilisation between 70-90% */ -+#define KBASE_PM_VSYNC_MIN_UTILISATION 70 -+#define KBASE_PM_VSYNC_MAX_UTILISATION 90 -+/* Otherwise aim for 10-40% */ -+#define KBASE_PM_NO_VSYNC_MIN_UTILISATION 10 -+#define KBASE_PM_NO_VSYNC_MAX_UTILISATION 40 -+ ++#if defined(CONFIG_MALI_BIFROST_DEVFREQ) || defined(CONFIG_MALI_BIFROST_DVFS) || !MALI_USE_CSF +/* Shift used for kbasep_pm_metrics_data.time_busy/idle - units of (1 << 8) ns + * This gives a maximum period between samples of 2^(32+8)/100 ns = slightly -+ * under 11s. Exceeding this will cause overflow */ ++ * under 11s. Exceeding this will cause overflow ++ */ +#define KBASE_PM_TIME_SHIFT 8 ++#endif ++ ++#if MALI_USE_CSF ++/* To get the GPU_ACTIVE value in nano seconds unit */ ++#define GPU_ACTIVE_SCALING_FACTOR ((u64)1E9) ++#endif ++ ++/* ++ * Possible state transitions ++ * ON -> ON | OFF | STOPPED ++ * STOPPED -> ON | OFF ++ * OFF -> ON ++ * ++ * ++ * ┌─e─â”┌────────────f─────────────┠++ * │ v│ v ++ * └───ON ──a──> STOPPED ──b──> OFF ++ * ^^ │ │ ++ * │└──────c─────┘ │ ++ * │ │ ++ * └─────────────d─────────────┘ ++ * ++ * Transition effects: ++ * a. None ++ * b. Timer expires without restart ++ * c. Timer is not stopped, timer period is unaffected ++ * d. Timer must be restarted ++ * e. Callback is executed and the timer is restarted ++ * f. Timer is cancelled, or the callback is waited on if currently executing. This is called during ++ * tear-down and should not be subject to a race from an OFF->ON transition ++ */ ++enum dvfs_metric_timer_state { TIMER_OFF, TIMER_STOPPED, TIMER_ON }; + +#ifdef CONFIG_MALI_BIFROST_DVFS +static enum hrtimer_restart dvfs_callback(struct hrtimer *timer) +{ -+ unsigned long flags; + struct kbasep_pm_metrics_state *metrics; + -+ KBASE_DEBUG_ASSERT(timer != NULL); ++ if (WARN_ON(!timer)) ++ return HRTIMER_NORESTART; + + metrics = container_of(timer, struct kbasep_pm_metrics_state, timer); -+ kbase_pm_get_dvfs_action(metrics->kbdev); -+ -+ spin_lock_irqsave(&metrics->lock, flags); + -+ if (metrics->timer_active) -+ hrtimer_start(timer, -+ HR_TIMER_DELAY_MSEC(metrics->kbdev->pm.dvfs_period), -+ HRTIMER_MODE_REL); ++ /* Transition (b) to fully off if timer was stopped, don't restart the timer in this case */ ++ if (atomic_cmpxchg(&metrics->timer_state, TIMER_STOPPED, TIMER_OFF) != TIMER_ON) ++ return HRTIMER_NORESTART; + -+ spin_unlock_irqrestore(&metrics->lock, flags); ++ kbase_pm_get_dvfs_action(metrics->kbdev); + -+ return HRTIMER_NORESTART; ++ /* Set the new expiration time and restart (transition e) */ ++ hrtimer_forward_now(timer, HR_TIMER_DELAY_MSEC(metrics->kbdev->pm.dvfs_period)); ++ return HRTIMER_RESTART; +} +#endif /* CONFIG_MALI_BIFROST_DVFS */ + +int kbasep_pm_metrics_init(struct kbase_device *kbdev) +{ ++#if MALI_USE_CSF ++ struct kbase_ipa_control_perf_counter perf_counter; ++ int err; ++ ++ /* One counter group */ ++ const size_t NUM_PERF_COUNTERS = 1; ++ + KBASE_DEBUG_ASSERT(kbdev != NULL); ++ kbdev->pm.backend.metrics.kbdev = kbdev; ++ kbdev->pm.backend.metrics.time_period_start = ktime_get_raw(); ++ kbdev->pm.backend.metrics.values.time_busy = 0; ++ kbdev->pm.backend.metrics.values.time_idle = 0; ++ kbdev->pm.backend.metrics.values.time_in_protm = 0; ++ ++ perf_counter.scaling_factor = GPU_ACTIVE_SCALING_FACTOR; + ++ /* Normalize values by GPU frequency */ ++ perf_counter.gpu_norm = true; ++ ++ /* We need the GPU_ACTIVE counter, which is in the CSHW group */ ++ perf_counter.type = KBASE_IPA_CORE_TYPE_CSHW; ++ ++ /* We need the GPU_ACTIVE counter */ ++ perf_counter.idx = GPU_ACTIVE_CNT_IDX; ++ ++ err = kbase_ipa_control_register( ++ kbdev, &perf_counter, NUM_PERF_COUNTERS, ++ &kbdev->pm.backend.metrics.ipa_control_client); ++ if (err) { ++ dev_err(kbdev->dev, ++ "Failed to register IPA with kbase_ipa_control: err=%d", ++ err); ++ return -1; ++ } ++#else ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + kbdev->pm.backend.metrics.kbdev = kbdev; ++ kbdev->pm.backend.metrics.time_period_start = ktime_get_raw(); + -+ kbdev->pm.backend.metrics.time_period_start = ktime_get(); + kbdev->pm.backend.metrics.gpu_active = false; + kbdev->pm.backend.metrics.active_cl_ctx[0] = 0; + kbdev->pm.backend.metrics.active_cl_ctx[1] = 0; @@ -153199,16 +161743,26 @@ index 000000000000..b714971ba17c + kbdev->pm.backend.metrics.values.busy_cl[1] = 0; + kbdev->pm.backend.metrics.values.busy_gl = 0; + ++#endif + spin_lock_init(&kbdev->pm.backend.metrics.lock); + +#ifdef CONFIG_MALI_BIFROST_DVFS + hrtimer_init(&kbdev->pm.backend.metrics.timer, CLOCK_MONOTONIC, + HRTIMER_MODE_REL); + kbdev->pm.backend.metrics.timer.function = dvfs_callback; -+ ++ kbdev->pm.backend.metrics.initialized = true; ++ atomic_set(&kbdev->pm.backend.metrics.timer_state, TIMER_OFF); + kbase_pm_metrics_start(kbdev); +#endif /* CONFIG_MALI_BIFROST_DVFS */ + ++#if MALI_USE_CSF ++ /* The sanity check on the GPU_ACTIVE performance counter ++ * is skipped for Juno platforms that have timing problems. ++ */ ++ kbdev->pm.backend.metrics.skip_gpu_active_sanity_check = ++ of_machine_is_compatible("arm,juno"); ++#endif ++ + return 0; +} +KBASE_EXPORT_TEST_API(kbasep_pm_metrics_init); @@ -153216,16 +161770,18 @@ index 000000000000..b714971ba17c +void kbasep_pm_metrics_term(struct kbase_device *kbdev) +{ +#ifdef CONFIG_MALI_BIFROST_DVFS -+ unsigned long flags; -+ + KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); -+ kbdev->pm.backend.metrics.timer_active = false; -+ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); -+ ++ /* Cancel the timer, and block if the callback is currently executing (transition f) */ ++ kbdev->pm.backend.metrics.initialized = false; ++ atomic_set(&kbdev->pm.backend.metrics.timer_state, TIMER_OFF); + hrtimer_cancel(&kbdev->pm.backend.metrics.timer); +#endif /* CONFIG_MALI_BIFROST_DVFS */ ++ ++#if MALI_USE_CSF ++ kbase_ipa_control_unregister( ++ kbdev, kbdev->pm.backend.metrics.ipa_control_client); ++#endif +} + +KBASE_EXPORT_TEST_API(kbasep_pm_metrics_term); @@ -153233,8 +161789,120 @@ index 000000000000..b714971ba17c +/* caller needs to hold kbdev->pm.backend.metrics.lock before calling this + * function + */ ++#if MALI_USE_CSF ++#if defined(CONFIG_MALI_BIFROST_DEVFREQ) || defined(CONFIG_MALI_BIFROST_DVFS) ++static void kbase_pm_get_dvfs_utilisation_calc(struct kbase_device *kbdev) ++{ ++ int err; ++ u64 gpu_active_counter; ++ u64 protected_time; ++ ktime_t now; ++ ++ lockdep_assert_held(&kbdev->pm.backend.metrics.lock); ++ ++ /* Query IPA_CONTROL for the latest GPU-active and protected-time ++ * info. ++ */ ++ err = kbase_ipa_control_query( ++ kbdev, kbdev->pm.backend.metrics.ipa_control_client, ++ &gpu_active_counter, 1, &protected_time); ++ ++ /* Read the timestamp after reading the GPU_ACTIVE counter value. ++ * This ensures the time gap between the 2 reads is consistent for ++ * a meaningful comparison between the increment of GPU_ACTIVE and ++ * elapsed time. The lock taken inside kbase_ipa_control_query() ++ * function can cause lot of variation. ++ */ ++ now = ktime_get_raw(); ++ ++ if (err) { ++ dev_err(kbdev->dev, ++ "Failed to query the increment of GPU_ACTIVE counter: err=%d", ++ err); ++ } else { ++ u64 diff_ns; ++ s64 diff_ns_signed; ++ u32 ns_time; ++ ktime_t diff = ktime_sub( ++ now, kbdev->pm.backend.metrics.time_period_start); ++ ++ diff_ns_signed = ktime_to_ns(diff); ++ ++ if (diff_ns_signed < 0) ++ return; ++ ++ diff_ns = (u64)diff_ns_signed; ++ ++#if !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ /* The GPU_ACTIVE counter shouldn't clock-up more time than has ++ * actually elapsed - but still some margin needs to be given ++ * when doing the comparison. There could be some drift between ++ * the CPU and GPU clock. ++ * ++ * Can do the check only in a real driver build, as an arbitrary ++ * value for GPU_ACTIVE can be fed into dummy model in no_mali ++ * configuration which may not correspond to the real elapsed ++ * time. ++ */ ++ if (!kbdev->pm.backend.metrics.skip_gpu_active_sanity_check) { ++ /* The margin is scaled to allow for the worst-case ++ * scenario where the samples are maximally separated, ++ * plus a small offset for sampling errors. ++ */ ++ u64 const MARGIN_NS = ++ IPA_CONTROL_TIMER_DEFAULT_VALUE_MS * NSEC_PER_MSEC * 3 / 2; ++ ++ if (gpu_active_counter > (diff_ns + MARGIN_NS)) { ++ dev_info( ++ kbdev->dev, ++ "GPU activity takes longer than time interval: %llu ns > %llu ns", ++ (unsigned long long)gpu_active_counter, ++ (unsigned long long)diff_ns); ++ } ++ } ++#endif ++ /* Calculate time difference in units of 256ns */ ++ ns_time = (u32)(diff_ns >> KBASE_PM_TIME_SHIFT); ++ ++ /* Add protected_time to gpu_active_counter so that time in ++ * protected mode is included in the apparent GPU active time, ++ * then convert it from units of 1ns to units of 256ns, to ++ * match what JM GPUs use. The assumption is made here that the ++ * GPU is 100% busy while in protected mode, so we should add ++ * this since the GPU can't (and thus won't) update these ++ * counters while it's actually in protected mode. ++ * ++ * Perform the add after dividing each value down, to reduce ++ * the chances of overflows. ++ */ ++ protected_time >>= KBASE_PM_TIME_SHIFT; ++ gpu_active_counter >>= KBASE_PM_TIME_SHIFT; ++ gpu_active_counter += protected_time; ++ ++ /* Ensure the following equations don't go wrong if ns_time is ++ * slightly larger than gpu_active_counter somehow ++ */ ++ gpu_active_counter = MIN(gpu_active_counter, ns_time); ++ ++ kbdev->pm.backend.metrics.values.time_busy += ++ gpu_active_counter; ++ ++ kbdev->pm.backend.metrics.values.time_idle += ++ ns_time - gpu_active_counter; ++ ++ /* Also make time in protected mode available explicitly, ++ * so users of this data have this info, too. ++ */ ++ kbdev->pm.backend.metrics.values.time_in_protm += ++ protected_time; ++ } ++ ++ kbdev->pm.backend.metrics.time_period_start = now; ++} ++#endif /* defined(CONFIG_MALI_BIFROST_DEVFREQ) || defined(CONFIG_MALI_BIFROST_DVFS) */ ++#else +static void kbase_pm_get_dvfs_utilisation_calc(struct kbase_device *kbdev, -+ ktime_t now) ++ ktime_t now) +{ + ktime_t diff; + @@ -153259,12 +161927,13 @@ index 000000000000..b714971ba17c + if (kbdev->pm.backend.metrics.active_gl_ctx[2]) + kbdev->pm.backend.metrics.values.busy_gl += ns_time; + } else { -+ kbdev->pm.backend.metrics.values.time_idle += (u32) (ktime_to_ns(diff) -+ >> KBASE_PM_TIME_SHIFT); ++ kbdev->pm.backend.metrics.values.time_idle += ++ (u32)(ktime_to_ns(diff) >> KBASE_PM_TIME_SHIFT); + } + + kbdev->pm.backend.metrics.time_period_start = now; +} ++#endif /* MALI_USE_CSF */ + +#if defined(CONFIG_MALI_BIFROST_DEVFREQ) || defined(CONFIG_MALI_BIFROST_DVFS) +void kbase_pm_get_dvfs_metrics(struct kbase_device *kbdev, @@ -153275,14 +161944,23 @@ index 000000000000..b714971ba17c + unsigned long flags; + + spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); -+ kbase_pm_get_dvfs_utilisation_calc(kbdev, ktime_get()); ++#if MALI_USE_CSF ++ kbase_pm_get_dvfs_utilisation_calc(kbdev); ++#else ++ kbase_pm_get_dvfs_utilisation_calc(kbdev, ktime_get_raw()); ++#endif + + memset(diff, 0, sizeof(*diff)); + diff->time_busy = cur->time_busy - last->time_busy; + diff->time_idle = cur->time_idle - last->time_idle; ++ ++#if MALI_USE_CSF ++ diff->time_in_protm = cur->time_in_protm - last->time_in_protm; ++#else + diff->busy_cl[0] = cur->busy_cl[0] - last->busy_cl[0]; + diff->busy_cl[1] = cur->busy_cl[1] - last->busy_cl[1]; + diff->busy_gl = cur->busy_gl - last->busy_gl; ++#endif + + *last = *cur; + @@ -153294,63 +161972,73 @@ index 000000000000..b714971ba17c +#ifdef CONFIG_MALI_BIFROST_DVFS +void kbase_pm_get_dvfs_action(struct kbase_device *kbdev) +{ -+ int utilisation, util_gl_share; -+ int util_cl_share[2]; -+ int busy; ++ int utilisation; + struct kbasep_pm_metrics *diff; ++#if !MALI_USE_CSF ++ int busy; ++ int util_gl_share; ++ int util_cl_share[2]; ++#endif + + KBASE_DEBUG_ASSERT(kbdev != NULL); + + diff = &kbdev->pm.backend.metrics.dvfs_diff; + -+ kbase_pm_get_dvfs_metrics(kbdev, &kbdev->pm.backend.metrics.dvfs_last, diff); ++ kbase_pm_get_dvfs_metrics(kbdev, &kbdev->pm.backend.metrics.dvfs_last, ++ diff); + + utilisation = (100 * diff->time_busy) / + max(diff->time_busy + diff->time_idle, 1u); + ++#if !MALI_USE_CSF + busy = max(diff->busy_gl + diff->busy_cl[0] + diff->busy_cl[1], 1u); ++ + util_gl_share = (100 * diff->busy_gl) / busy; + util_cl_share[0] = (100 * diff->busy_cl[0]) / busy; + util_cl_share[1] = (100 * diff->busy_cl[1]) / busy; + -+ kbase_platform_dvfs_event(kbdev, utilisation, util_gl_share, util_cl_share); ++ kbase_platform_dvfs_event(kbdev, utilisation, util_gl_share, ++ util_cl_share); ++#else ++ /* Note that, at present, we don't pass protected-mode time to the ++ * platform here. It's unlikely to be useful, however, as the platform ++ * probably just cares whether the GPU is busy or not; time in ++ * protected mode is already added to busy-time at this point, though, ++ * so we should be good. ++ */ ++ kbase_platform_dvfs_event(kbdev, utilisation); ++#endif +} + +bool kbase_pm_metrics_is_active(struct kbase_device *kbdev) +{ -+ bool isactive; -+ unsigned long flags; -+ + KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); -+ isactive = kbdev->pm.backend.metrics.timer_active; -+ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); -+ -+ return isactive; ++ return atomic_read(&kbdev->pm.backend.metrics.timer_state) == TIMER_ON; +} +KBASE_EXPORT_TEST_API(kbase_pm_metrics_is_active); + +void kbase_pm_metrics_start(struct kbase_device *kbdev) +{ -+ unsigned long flags; ++ struct kbasep_pm_metrics_state *metrics = &kbdev->pm.backend.metrics; + -+ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); -+ kbdev->pm.backend.metrics.timer_active = true; -+ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); -+ hrtimer_start(&kbdev->pm.backend.metrics.timer, -+ HR_TIMER_DELAY_MSEC(kbdev->pm.dvfs_period), -+ HRTIMER_MODE_REL); ++ if (unlikely(!metrics->initialized)) ++ return; ++ ++ /* Transition to ON, from a stopped state (transition c) */ ++ if (atomic_xchg(&metrics->timer_state, TIMER_ON) == TIMER_OFF) ++ /* Start the timer only if it's been fully stopped (transition d)*/ ++ hrtimer_start(&metrics->timer, HR_TIMER_DELAY_MSEC(kbdev->pm.dvfs_period), ++ HRTIMER_MODE_REL); +} + +void kbase_pm_metrics_stop(struct kbase_device *kbdev) +{ -+ unsigned long flags; ++ if (unlikely(!kbdev->pm.backend.metrics.initialized)) ++ return; + -+ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); -+ kbdev->pm.backend.metrics.timer_active = false; -+ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); -+ hrtimer_cancel(&kbdev->pm.backend.metrics.timer); ++ /* Timer is Stopped if its currently on (transition a) */ ++ atomic_cmpxchg(&kbdev->pm.backend.metrics.timer_state, TIMER_ON, TIMER_STOPPED); +} + + @@ -153366,7 +162054,7 @@ index 000000000000..b714971ba17c + */ +static void kbase_pm_metrics_active_calc(struct kbase_device *kbdev) +{ -+ int js; ++ unsigned int js; + + lockdep_assert_held(&kbdev->pm.backend.metrics.lock); + @@ -153381,7 +162069,8 @@ index 000000000000..b714971ba17c + struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, 0); + + /* Head atom may have just completed, so if it isn't running -+ * then try the next atom */ ++ * then try the next atom ++ */ + if (katom && katom->gpu_rb_state != KBASE_ATOM_GPU_RB_SUBMITTED) + katom = kbase_gpu_inspect(kbdev, js, 1); + @@ -153392,8 +162081,7 @@ index 000000000000..b714971ba17c + BASE_JD_REQ_SPECIFIC_COHERENT_GROUP) + ? katom->device_nr : 0; + if (!WARN_ON(device_nr >= 2)) -+ kbdev->pm.backend.metrics. -+ active_cl_ctx[device_nr] = 1; ++ kbdev->pm.backend.metrics.active_cl_ctx[device_nr] = 1; + } else { + kbdev->pm.backend.metrics.active_gl_ctx[js] = 1; + trace_sysgraph(SGR_ACTIVE, 0, js); @@ -153404,7 +162092,6 @@ index 000000000000..b714971ba17c + } + } +} -+#endif /* !MALI_USE_CSF */ + +/* called when job is submitted to or removed from a GPU slot */ +void kbase_pm_metrics_update(struct kbase_device *kbdev, ktime_t *timestamp) @@ -153417,33 +162104,34 @@ index 000000000000..b714971ba17c + spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); + + if (!timestamp) { -+ now = ktime_get(); ++ now = ktime_get_raw(); + timestamp = &now; + } + -+ /* Track how long CL and/or GL jobs have been busy for */ ++ /* Track how much of time has been spent busy or idle. For JM GPUs, ++ * this also evaluates how long CL and/or GL jobs have been busy for. ++ */ + kbase_pm_get_dvfs_utilisation_calc(kbdev, *timestamp); + -+#if !MALI_USE_CSF + kbase_pm_metrics_active_calc(kbdev); -+#endif /* !MALI_USE_CSF */ -+ + spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); +} ++#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c new file mode 100755 -index 000000000000..48b24b1c866e +index 000000000..4788f0413 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c -@@ -0,0 +1,268 @@ +@@ -0,0 +1,426 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -153454,8 +162142,6 @@ index 000000000000..48b24b1c866e + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -153466,27 +162152,59 @@ index 000000000000..48b24b1c866e +#include +#include +#include ++#include ++ ++#if MALI_USE_CSF && defined CONFIG_MALI_BIFROST_DEBUG ++#include ++#endif ++ ++#include + +static const struct kbase_pm_policy *const all_policy_list[] = { -+#ifdef CONFIG_MALI_BIFROST_NO_MALI ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) + &kbase_pm_always_on_policy_ops, + &kbase_pm_coarse_demand_policy_ops, -+#if !MALI_CUSTOMER_RELEASE -+ &kbase_pm_always_on_demand_policy_ops, -+#endif -+#else /* CONFIG_MALI_BIFROST_NO_MALI */ ++#else /* CONFIG_MALI_BIFROST_NO_MALI */ + &kbase_pm_coarse_demand_policy_ops, -+#if !MALI_CUSTOMER_RELEASE -+ &kbase_pm_always_on_demand_policy_ops, -+#endif -+ &kbase_pm_always_on_policy_ops ++ &kbase_pm_always_on_policy_ops, +#endif /* CONFIG_MALI_BIFROST_NO_MALI */ +}; + +void kbase_pm_policy_init(struct kbase_device *kbdev) +{ -+ kbdev->pm.backend.pm_current_policy = all_policy_list[0]; -+ kbdev->pm.backend.pm_current_policy->init(kbdev); ++ const struct kbase_pm_policy *default_policy = all_policy_list[0]; ++ struct device_node *np = kbdev->dev->of_node; ++ const char *power_policy_name; ++ unsigned long flags; ++ int i; ++ ++ if (of_property_read_string(np, "power_policy", &power_policy_name) == 0) { ++ for (i = 0; i < ARRAY_SIZE(all_policy_list); i++) ++ if (sysfs_streq(all_policy_list[i]->name, power_policy_name)) { ++ default_policy = all_policy_list[i]; ++ break; ++ } ++ } ++ ++#if MALI_USE_CSF && defined(CONFIG_MALI_BIFROST_DEBUG) ++ /* Use always_on policy if module param fw_debug=1 is ++ * passed, to aid firmware debugging. ++ */ ++ if (fw_debug) ++ default_policy = &kbase_pm_always_on_policy_ops; ++#endif ++ ++ default_policy->init(kbdev); ++ ++#if MALI_USE_CSF ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbdev->pm.backend.pm_current_policy = default_policy; ++ kbdev->pm.backend.csf_pm_sched_flags = default_policy->pm_sched_flags; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++#else ++ CSTD_UNUSED(flags); ++ kbdev->pm.backend.pm_current_policy = default_policy; ++#endif +} + +void kbase_pm_policy_term(struct kbase_device *kbdev) @@ -153540,7 +162258,8 @@ index 000000000000..48b24b1c866e + } + } else { + /* It is an error for the power policy to power off the GPU -+ * when there are contexts active */ ++ * when there are contexts active ++ */ + KBASE_DEBUG_ASSERT(pm->active_count == 0); + + pm->backend.poweron_required = false; @@ -153564,18 +162283,20 @@ index 000000000000..48b24b1c866e + lockdep_assert_held(&kbdev->hwaccess_lock); + lockdep_assert_held(&kbdev->pm.lock); + -+#if MALI_USE_CSF -+ /* On CSF GPUs, Host driver isn't supposed to do the power management -+ * for shader cores. CSF firmware will power up the cores appropriately -+ * and so from Driver's standpoint 'shaders_desired' flag shall always -+ * remain 0. -+ */ -+ return; -+#endif + if (kbdev->pm.backend.pm_current_policy == NULL) + return; + if (kbdev->pm.backend.poweroff_wait_in_progress) + return; ++ ++#if MALI_USE_CSF ++ CSTD_UNUSED(shaders_desired); ++ /* Invoke the MCU state machine to send a request to FW for updating ++ * the mask of shader cores that can be used for allocation of ++ * endpoints requested by CSGs. ++ */ ++ if (kbase_pm_is_mcu_desired(kbdev)) ++ kbase_pm_update_state(kbdev); ++#else + /* In protected transition, don't allow outside shader core request + * affect transition, return directly + */ @@ -153584,14 +162305,14 @@ index 000000000000..48b24b1c866e + + shaders_desired = kbdev->pm.backend.pm_current_policy->shaders_needed(kbdev); + -+ if (shaders_desired && kbase_pm_is_l2_desired(kbdev)) { ++ if (shaders_desired && kbase_pm_is_l2_desired(kbdev)) + kbase_pm_update_state(kbdev); -+ } ++#endif +} + +void kbase_pm_update_cores_state_nolock(struct kbase_device *kbdev) +{ -+ bool shaders_desired; ++ bool shaders_desired = false; + + lockdep_assert_held(&kbdev->hwaccess_lock); + @@ -153600,21 +162321,16 @@ index 000000000000..48b24b1c866e + if (kbdev->pm.backend.poweroff_wait_in_progress) + return; + ++#if !MALI_USE_CSF + if (kbdev->pm.backend.protected_transition_override) + /* We are trying to change in/out of protected mode - force all -+ * cores off so that the L2 powers down */ ++ * cores off so that the L2 powers down ++ */ + shaders_desired = false; + else + shaders_desired = kbdev->pm.backend.pm_current_policy->shaders_needed(kbdev); -+ -+#if MALI_USE_CSF -+ /* On CSF GPUs, Host driver isn't supposed to do the power management -+ * for shader cores. CSF firmware will power up the cores appropriately -+ * and so from Driver's standpoint 'shaders_desired' flag shall always -+ * remain 0. -+ */ -+ shaders_desired = false; +#endif ++ + if (kbdev->pm.backend.shaders_desired != shaders_desired) { + KBASE_KTRACE_ADD(kbdev, PM_CORES_CHANGE_DESIRED, NULL, kbdev->pm.backend.shaders_desired); + @@ -153654,20 +162370,119 @@ index 000000000000..48b24b1c866e + +KBASE_EXPORT_TEST_API(kbase_pm_get_policy); + ++#if MALI_USE_CSF ++static int policy_change_wait_for_L2_off(struct kbase_device *kbdev) ++{ ++ long remaining; ++ long timeout = kbase_csf_timeout_in_jiffies(kbase_get_timeout_ms(kbdev, CSF_PM_TIMEOUT)); ++ int err = 0; ++ ++ /* Wait for L2 becoming off, by which the MCU is also implicitly off ++ * since the L2 state machine would only start its power-down ++ * sequence when the MCU is in off state. The L2 off is required ++ * as the tiler may need to be power cycled for MCU reconfiguration ++ * for host control of shader cores. ++ */ ++#if KERNEL_VERSION(4, 13, 1) <= LINUX_VERSION_CODE ++ remaining = wait_event_killable_timeout( ++ kbdev->pm.backend.gpu_in_desired_state_wait, ++ kbdev->pm.backend.l2_state == KBASE_L2_OFF, timeout); ++#else ++ remaining = wait_event_timeout( ++ kbdev->pm.backend.gpu_in_desired_state_wait, ++ kbdev->pm.backend.l2_state == KBASE_L2_OFF, timeout); ++#endif ++ ++ if (!remaining) { ++ err = -ETIMEDOUT; ++ } else if (remaining < 0) { ++ dev_info(kbdev->dev, ++ "Wait for L2_off got interrupted"); ++ err = (int)remaining; ++ } ++ ++ dev_dbg(kbdev->dev, "%s: err=%d mcu_state=%d, L2_state=%d\n", __func__, ++ err, kbdev->pm.backend.mcu_state, kbdev->pm.backend.l2_state); ++ ++ return err; ++} ++#endif ++ +void kbase_pm_set_policy(struct kbase_device *kbdev, + const struct kbase_pm_policy *new_policy) +{ + const struct kbase_pm_policy *old_policy; + unsigned long flags; ++#if MALI_USE_CSF ++ unsigned int new_policy_csf_pm_sched_flags; ++ bool sched_suspend; ++ bool reset_gpu = false; ++ bool reset_op_prevented = true; ++ struct kbase_csf_scheduler *scheduler = NULL; ++#endif + + KBASE_DEBUG_ASSERT(kbdev != NULL); + KBASE_DEBUG_ASSERT(new_policy != NULL); + + KBASE_KTRACE_ADD(kbdev, PM_SET_POLICY, NULL, new_policy->id); + ++#if MALI_USE_CSF ++ scheduler = &kbdev->csf.scheduler; ++ KBASE_DEBUG_ASSERT(scheduler != NULL); ++ ++ /* Serialize calls on kbase_pm_set_policy() */ ++ mutex_lock(&kbdev->pm.backend.policy_change_lock); ++ ++ if (kbase_reset_gpu_prevent_and_wait(kbdev)) { ++ dev_warn(kbdev->dev, "Set PM policy failing to prevent gpu reset"); ++ reset_op_prevented = false; ++ } ++ ++ /* In case of CSF, the scheduler may be invoked to suspend. In that ++ * case, there is a risk that the L2 may be turned on by the time we ++ * check it here. So we hold the scheduler lock to avoid other operations ++ * interfering with the policy change and vice versa. ++ */ ++ mutex_lock(&scheduler->lock); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ /* policy_change_clamp_state_to_off, when needed, is set/cleared in ++ * this function, a very limited temporal scope for covering the ++ * change transition. ++ */ ++ WARN_ON(kbdev->pm.backend.policy_change_clamp_state_to_off); ++ new_policy_csf_pm_sched_flags = new_policy->pm_sched_flags; ++ ++ /* Requiring the scheduler PM suspend operation when changes involving ++ * the always_on policy, reflected by the CSF_DYNAMIC_PM_CORE_KEEP_ON ++ * flag bit. ++ */ ++ sched_suspend = reset_op_prevented && ++ (CSF_DYNAMIC_PM_CORE_KEEP_ON & ++ (new_policy_csf_pm_sched_flags | kbdev->pm.backend.csf_pm_sched_flags)); ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ if (sched_suspend) { ++ /* Update the suspend flag to reflect actually suspend being done ! */ ++ sched_suspend = !kbase_csf_scheduler_pm_suspend_no_lock(kbdev); ++ /* Set the reset recovery flag if the required suspend failed */ ++ reset_gpu = !sched_suspend; ++ } ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ++ kbdev->pm.backend.policy_change_clamp_state_to_off = sched_suspend; ++ kbase_pm_update_state(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ if (sched_suspend) ++ reset_gpu = policy_change_wait_for_L2_off(kbdev); ++#endif ++ + /* During a policy change we pretend the GPU is active */ + /* A suspend won't happen here, because we're in a syscall from a -+ * userspace thread */ ++ * userspace thread ++ */ + kbase_pm_context_active(kbdev); + + kbase_pm_lock(kbdev); @@ -153682,42 +162497,73 @@ index 000000000000..48b24b1c866e + if (old_policy->term) + old_policy->term(kbdev); + ++ memset(&kbdev->pm.backend.pm_policy_data, 0, ++ sizeof(union kbase_pm_policy_data)); ++ + KBASE_KTRACE_ADD(kbdev, PM_CURRENT_POLICY_INIT, NULL, new_policy->id); + if (new_policy->init) + new_policy->init(kbdev); + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + kbdev->pm.backend.pm_current_policy = new_policy; ++#if MALI_USE_CSF ++ kbdev->pm.backend.csf_pm_sched_flags = new_policy_csf_pm_sched_flags; ++ /* New policy in place, release the clamping on mcu/L2 off state */ ++ kbdev->pm.backend.policy_change_clamp_state_to_off = false; ++ kbase_pm_update_state(kbdev); ++#endif + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + + /* If any core power state changes were previously attempted, but + * couldn't be made because the policy was changing (current_policy was -+ * NULL), then re-try them here. */ ++ * NULL), then re-try them here. ++ */ + kbase_pm_update_active(kbdev); + kbase_pm_update_cores_state(kbdev); + + kbase_pm_unlock(kbdev); + + /* Now the policy change is finished, we release our fake context active -+ * reference */ ++ * reference ++ */ + kbase_pm_context_idle(kbdev); ++ ++#if MALI_USE_CSF ++ /* Reverse the suspension done */ ++ if (sched_suspend) ++ kbase_csf_scheduler_pm_resume_no_lock(kbdev); ++ mutex_unlock(&scheduler->lock); ++ ++ if (reset_op_prevented) ++ kbase_reset_gpu_allow(kbdev); ++ ++ if (reset_gpu) { ++ dev_warn(kbdev->dev, "Resorting to GPU reset for policy change\n"); ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_NONE)) ++ kbase_reset_gpu(kbdev); ++ kbase_reset_gpu_wait(kbdev); ++ } ++ ++ mutex_unlock(&kbdev->pm.backend.policy_change_lock); ++#endif +} + +KBASE_EXPORT_TEST_API(kbase_pm_set_policy); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h new file mode 100755 -index 000000000000..f103ef0c01e4 +index 000000000..e8113659b --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h -@@ -0,0 +1,106 @@ +@@ -0,0 +1,105 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2010-2015, 2018-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2015, 2018-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -153728,8 +162574,6 @@ index 000000000000..f103ef0c01e4 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -153818,18 +162662,19 @@ index 000000000000..f103ef0c01e4 +#endif /* _KBASE_PM_POLICY_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h new file mode 100755 -index 000000000000..6cafaa171962 +index 000000000..8622ef78d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h -@@ -0,0 +1,45 @@ +@@ -0,0 +1,79 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -153840,8 +162685,6 @@ index 000000000000..6cafaa171962 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -153850,6 +162693,41 @@ index 000000000000..6cafaa171962 + * including this header file. This header file can be included multiple + * times in the same compilation unit with different definitions of + * KBASEP_SHADER_STATE(). ++ * ++ * @OFF_CORESTACK_OFF: The shaders and core stacks are off ++ * @OFF_CORESTACK_PEND_ON: The shaders are off, core stacks have been ++ * requested to power on and hwcnt is being ++ * disabled ++ * @PEND_ON_CORESTACK_ON: Core stacks are on, shaders have been ++ * requested to power on. Or after doing ++ * partial shader on/off, checking whether ++ * it's the desired state. ++ * @ON_CORESTACK_ON: The shaders and core stacks are on, and ++ * hwcnt already enabled. ++ * @ON_CORESTACK_ON_RECHECK: The shaders and core stacks are on, hwcnt ++ * disabled, and checks to powering down or ++ * re-enabling hwcnt. ++ * @WAIT_OFF_CORESTACK_ON: The shaders have been requested to power ++ * off, but they remain on for the duration ++ * of the hysteresis timer ++ * @WAIT_GPU_IDLE: The shaders partial poweroff needs to ++ * reach a state where jobs on the GPU are ++ * finished including jobs currently running ++ * and in the GPU queue because of ++ * GPU2017-861 ++ * @WAIT_FINISHED_CORESTACK_ON: The hysteresis timer has expired ++ * @L2_FLUSHING_CORESTACK_ON: The core stacks are on and the level 2 ++ * cache is being flushed. ++ * @READY_OFF_CORESTACK_ON: The core stacks are on and the shaders are ++ * ready to be powered off. ++ * @PEND_OFF_CORESTACK_ON: The core stacks are on, and the shaders ++ * have been requested to power off ++ * @OFF_CORESTACK_PEND_OFF: The shaders are off, and the core stacks ++ * have been requested to power off ++ * @OFF_CORESTACK_OFF_TIMER_PEND_OFF: Shaders and corestacks are off, but the ++ * tick timer cancellation is still pending. ++ * @RESET_WAIT: The GPU is resetting, shader and core ++ * stack power states are unknown + */ +KBASEP_SHADER_STATE(OFF_CORESTACK_OFF) +KBASEP_SHADER_STATE(OFF_CORESTACK_PEND_ON) @@ -153869,18 +162747,19 @@ index 000000000000..6cafaa171962 +KBASEP_SHADER_STATE(RESET_WAIT) diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c new file mode 100755 -index 000000000000..e19f53b2cbe8 +index 000000000..1b3346179 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c -@@ -0,0 +1,81 @@ +@@ -0,0 +1,279 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2016,2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -153891,14 +162770,18 @@ index 000000000000..e19f53b2cbe8 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include +#include ++#if MALI_USE_CSF ++#include ++#include ++#include ++#endif +#include +#include ++#include + +void kbase_backend_get_gpu_time_norequest(struct kbase_device *kbdev, + u64 *cycle_counter, @@ -153907,18 +162790,8 @@ index 000000000000..e19f53b2cbe8 +{ + u32 hi1, hi2; + -+ if (cycle_counter) { -+ /* Read hi, lo, hi to ensure a coherent u64 */ -+ do { -+ hi1 = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(CYCLE_COUNT_HI)); -+ *cycle_counter = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(CYCLE_COUNT_LO)); -+ hi2 = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(CYCLE_COUNT_HI)); -+ } while (hi1 != hi2); -+ *cycle_counter |= (((u64) hi1) << 32); -+ } ++ if (cycle_counter) ++ *cycle_counter = kbase_backend_get_cycle_cnt(kbdev); + + if (system_time) { + /* Read hi, lo, hi to ensure a coherent u64 */ @@ -153942,36 +162815,245 @@ index 000000000000..e19f53b2cbe8 +#endif +} + ++#if !MALI_USE_CSF ++/** ++ * timedwait_cycle_count_active() - Timed wait till CYCLE_COUNT_ACTIVE is active ++ * ++ * @kbdev: Kbase device ++ * ++ * Return: true if CYCLE_COUNT_ACTIVE is active within the timeout. ++ */ ++static bool timedwait_cycle_count_active(struct kbase_device *kbdev) ++{ ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ return true; ++#else ++ bool success = false; ++ const unsigned int timeout = 100; ++ const unsigned long remaining = jiffies + msecs_to_jiffies(timeout); ++ ++ while (time_is_after_jiffies(remaining)) { ++ if ((kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_STATUS)) & ++ GPU_STATUS_CYCLE_COUNT_ACTIVE)) { ++ success = true; ++ break; ++ } ++ } ++ return success; ++#endif ++} ++#endif ++ +void kbase_backend_get_gpu_time(struct kbase_device *kbdev, u64 *cycle_counter, + u64 *system_time, struct timespec64 *ts) +{ +#if !MALI_USE_CSF + kbase_pm_request_gpu_cycle_counter(kbdev); ++ WARN_ONCE(kbdev->pm.backend.l2_state != KBASE_L2_ON, ++ "L2 not powered up"); ++ WARN_ONCE((!timedwait_cycle_count_active(kbdev)), ++ "Timed out on CYCLE_COUNT_ACTIVE"); +#endif -+ kbase_backend_get_gpu_time_norequest( -+ kbdev, cycle_counter, system_time, ts); ++ kbase_backend_get_gpu_time_norequest(kbdev, cycle_counter, system_time, ++ ts); +#if !MALI_USE_CSF + kbase_pm_release_gpu_cycle_counter(kbdev); +#endif +} ++ ++unsigned int kbase_get_timeout_ms(struct kbase_device *kbdev, ++ enum kbase_timeout_selector selector) ++{ ++ /* Timeout calculation: ++ * dividing number of cycles by freq in KHz automatically gives value ++ * in milliseconds. nr_cycles will have to be multiplied by 1e3 to ++ * get result in microseconds, and 1e6 to get result in nanoseconds. ++ */ ++ ++ u64 timeout, nr_cycles = 0; ++ u64 freq_khz; ++ ++ /* Only for debug messages, safe default in case it's mis-maintained */ ++ const char *selector_str = "(unknown)"; ++ ++ if (!kbdev->lowest_gpu_freq_khz) { ++ dev_dbg(kbdev->dev, ++ "Lowest frequency uninitialized! Using reference frequency for scaling"); ++ freq_khz = DEFAULT_REF_TIMEOUT_FREQ_KHZ; ++ } else { ++ freq_khz = kbdev->lowest_gpu_freq_khz; ++ } ++ ++ switch (selector) { ++ case MMU_AS_INACTIVE_WAIT_TIMEOUT: ++ selector_str = "MMU_AS_INACTIVE_WAIT_TIMEOUT"; ++ nr_cycles = MMU_AS_INACTIVE_WAIT_TIMEOUT_CYCLES; ++ break; ++ case KBASE_TIMEOUT_SELECTOR_COUNT: ++ default: ++#if !MALI_USE_CSF ++ WARN(1, "Invalid timeout selector used! Using default value"); ++ nr_cycles = JM_DEFAULT_TIMEOUT_CYCLES; ++ break; ++ case JM_DEFAULT_JS_FREE_TIMEOUT: ++ selector_str = "JM_DEFAULT_JS_FREE_TIMEOUT"; ++ nr_cycles = JM_DEFAULT_JS_FREE_TIMEOUT_CYCLES; ++ break; ++#else ++ /* Use Firmware timeout if invalid selection */ ++ WARN(1, ++ "Invalid timeout selector used! Using CSF Firmware timeout"); ++ fallthrough; ++ case CSF_FIRMWARE_TIMEOUT: ++ selector_str = "CSF_FIRMWARE_TIMEOUT"; ++ /* Any FW timeout cannot be longer than the FW ping interval, after which ++ * the firmware_aliveness_monitor will be triggered and may restart ++ * the GPU if the FW is unresponsive. ++ */ ++ nr_cycles = min(CSF_FIRMWARE_PING_TIMEOUT_CYCLES, CSF_FIRMWARE_TIMEOUT_CYCLES); ++ ++ if (nr_cycles == CSF_FIRMWARE_PING_TIMEOUT_CYCLES) ++ dev_warn(kbdev->dev, "Capping %s to CSF_FIRMWARE_PING_TIMEOUT\n", ++ selector_str); ++ break; ++ case CSF_PM_TIMEOUT: ++ selector_str = "CSF_PM_TIMEOUT"; ++ nr_cycles = CSF_PM_TIMEOUT_CYCLES; ++ break; ++ case CSF_GPU_RESET_TIMEOUT: ++ selector_str = "CSF_GPU_RESET_TIMEOUT"; ++ nr_cycles = CSF_GPU_RESET_TIMEOUT_CYCLES; ++ break; ++ case CSF_CSG_SUSPEND_TIMEOUT: ++ selector_str = "CSF_CSG_SUSPEND_TIMEOUT"; ++ nr_cycles = CSF_CSG_SUSPEND_TIMEOUT_CYCLES; ++ break; ++ case CSF_FIRMWARE_BOOT_TIMEOUT: ++ selector_str = "CSF_FIRMWARE_BOOT_TIMEOUT"; ++ nr_cycles = CSF_FIRMWARE_BOOT_TIMEOUT_CYCLES; ++ break; ++ case CSF_FIRMWARE_PING_TIMEOUT: ++ selector_str = "CSF_FIRMWARE_PING_TIMEOUT"; ++ nr_cycles = CSF_FIRMWARE_PING_TIMEOUT_CYCLES; ++ break; ++ case CSF_SCHED_PROTM_PROGRESS_TIMEOUT: ++ selector_str = "CSF_SCHED_PROTM_PROGRESS_TIMEOUT"; ++ nr_cycles = kbase_csf_timeout_get(kbdev); ++ break; ++#endif ++ } ++ ++ timeout = div_u64(nr_cycles, freq_khz); ++ if (WARN(timeout > UINT_MAX, ++ "Capping excessive timeout %llums for %s at freq %llukHz to UINT_MAX ms", ++ (unsigned long long)timeout, selector_str, (unsigned long long)freq_khz)) ++ timeout = UINT_MAX; ++ return (unsigned int)timeout; ++} ++KBASE_EXPORT_TEST_API(kbase_get_timeout_ms); ++ ++u64 kbase_backend_get_cycle_cnt(struct kbase_device *kbdev) ++{ ++ u32 hi1, hi2, lo; ++ ++ /* Read hi, lo, hi to ensure a coherent u64 */ ++ do { ++ hi1 = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(CYCLE_COUNT_HI)); ++ lo = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(CYCLE_COUNT_LO)); ++ hi2 = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(CYCLE_COUNT_HI)); ++ } while (hi1 != hi2); ++ ++ return lo | (((u64) hi1) << 32); ++} ++ ++#if MALI_USE_CSF ++u64 __maybe_unused kbase_backend_time_convert_gpu_to_cpu(struct kbase_device *kbdev, u64 gpu_ts) ++{ ++ if (WARN_ON(!kbdev)) ++ return 0; ++ ++ return div64_u64(gpu_ts * kbdev->backend_time.multiplier, kbdev->backend_time.divisor) + ++ kbdev->backend_time.offset; ++} ++ ++/** ++ * get_cpu_gpu_time() - Get current CPU and GPU timestamps. ++ * ++ * @kbdev: Kbase device. ++ * @cpu_ts: Output CPU timestamp. ++ * @gpu_ts: Output GPU timestamp. ++ * @gpu_cycle: Output GPU cycle counts. ++ */ ++static void get_cpu_gpu_time(struct kbase_device *kbdev, u64 *cpu_ts, u64 *gpu_ts, u64 *gpu_cycle) ++{ ++ struct timespec64 ts; ++ ++ kbase_backend_get_gpu_time(kbdev, gpu_cycle, gpu_ts, &ts); ++ ++ if (cpu_ts) ++ *cpu_ts = ts.tv_sec * NSEC_PER_SEC + ts.tv_nsec; ++} ++#endif ++ ++int kbase_backend_time_init(struct kbase_device *kbdev) ++{ ++#if MALI_USE_CSF ++ u64 cpu_ts = 0; ++ u64 gpu_ts = 0; ++ u64 freq; ++ u64 common_factor; ++ ++ get_cpu_gpu_time(kbdev, &cpu_ts, &gpu_ts, NULL); ++ freq = arch_timer_get_cntfrq(); ++ ++ if (!freq) { ++ dev_warn(kbdev->dev, "arch_timer_get_rate() is zero!"); ++ return -EINVAL; ++ } ++ ++ common_factor = gcd(NSEC_PER_SEC, freq); ++ ++ kbdev->backend_time.multiplier = div64_u64(NSEC_PER_SEC, common_factor); ++ kbdev->backend_time.divisor = div64_u64(freq, common_factor); ++ ++ if (!kbdev->backend_time.divisor) { ++ dev_warn(kbdev->dev, "CPU to GPU divisor is zero!"); ++ return -EINVAL; ++ } ++ ++ kbdev->backend_time.offset = cpu_ts - div64_u64(gpu_ts * kbdev->backend_time.multiplier, ++ kbdev->backend_time.divisor); ++#endif ++ ++ return 0; ++} diff --git a/drivers/gpu/arm/bifrost/build.bp b/drivers/gpu/arm/bifrost/build.bp new file mode 100755 -index 000000000000..b9b86184f3be +index 000000000..0a61a12d9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/build.bp -@@ -0,0 +1,186 @@ +@@ -0,0 +1,280 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2017-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2017-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * + */ + @@ -153981,14 +163063,21 @@ index 000000000000..b9b86184f3be + * both mali_kbase and the test modules. */ +bob_defaults { + name: "mali_kbase_shared_config_defaults", -+ no_mali: { -+ kbuild_options: ["CONFIG_MALI_BIFROST_NO_MALI=y"], ++ defaults: [ ++ "kernel_defaults", ++ ], ++ mali_no_mali: { ++ kbuild_options: [ ++ "CONFIG_MALI_BIFROST_NO_MALI=y", ++ "CONFIG_MALI_NO_MALI_DEFAULT_GPU={{.gpu}}", ++ "CONFIG_GPU_HWVER={{.hwver}}", ++ ], + }, -+ mali_real_hw: { -+ kbuild_options: ["CONFIG_MALI_REAL_HW=y"], ++ mali_platform_dt_pin_rst: { ++ kbuild_options: ["CONFIG_MALI_PLATFORM_DT_PIN_RST=y"], + }, -+ mali_dma_fence: { -+ kbuild_options: ["CONFIG_MALI_BIFROST_DMA_FENCE=y"], ++ gpu_has_csf: { ++ kbuild_options: ["CONFIG_MALI_CSF_SUPPORT=y"], + }, + mali_devfreq: { + kbuild_options: ["CONFIG_MALI_BIFROST_DEVFREQ=y"], @@ -153996,8 +163085,59 @@ index 000000000000..b9b86184f3be + mali_midgard_dvfs: { + kbuild_options: ["CONFIG_MALI_BIFROST_DVFS=y"], + }, ++ mali_gator_support: { ++ kbuild_options: ["CONFIG_MALI_BIFROST_GATOR_SUPPORT=y"], ++ }, ++ mali_midgard_enable_trace: { ++ kbuild_options: ["CONFIG_MALI_BIFROST_ENABLE_TRACE=y"], ++ }, ++ mali_arbiter_support: { ++ kbuild_options: ["CONFIG_MALI_ARBITER_SUPPORT=y"], ++ }, ++ mali_dma_buf_map_on_demand: { ++ kbuild_options: ["CONFIG_MALI_DMA_BUF_MAP_ON_DEMAND=y"], ++ }, ++ mali_dma_buf_legacy_compat: { ++ kbuild_options: ["CONFIG_MALI_DMA_BUF_LEGACY_COMPAT=y"], ++ }, ++ large_page_alloc_override: { ++ kbuild_options: ["CONFIG_LARGE_PAGE_ALLOC_OVERRIDE=y"], ++ }, ++ large_page_alloc: { ++ kbuild_options: ["CONFIG_LARGE_PAGE_ALLOC=y"], ++ }, ++ mali_memory_fully_backed: { ++ kbuild_options: ["CONFIG_MALI_MEMORY_FULLY_BACKED=y"], ++ }, ++ mali_corestack: { ++ kbuild_options: ["CONFIG_MALI_CORESTACK=y"], ++ }, ++ mali_real_hw: { ++ kbuild_options: ["CONFIG_MALI_REAL_HW=y"], ++ }, ++ mali_error_inject_none: { ++ kbuild_options: ["CONFIG_MALI_ERROR_INJECT_NONE=y"], ++ }, ++ mali_error_inject_track_list: { ++ kbuild_options: ["CONFIG_MALI_ERROR_INJECT_TRACK_LIST=y"], ++ }, ++ mali_error_inject_random: { ++ kbuild_options: ["CONFIG_MALI_ERROR_INJECT_RANDOM=y"], ++ }, ++ mali_error_inject: { ++ kbuild_options: ["CONFIG_MALI_BIFROST_ERROR_INJECT=y"], ++ }, + mali_debug: { -+ kbuild_options: ["CONFIG_MALI_BIFROST_DEBUG=y"], ++ kbuild_options: [ ++ "CONFIG_MALI_BIFROST_DEBUG=y", ++ "MALI_KERNEL_TEST_API={{.debug}}", ++ ], ++ }, ++ mali_fence_debug: { ++ kbuild_options: ["CONFIG_MALI_BIFROST_FENCE_DEBUG=y"], ++ }, ++ mali_system_trace: { ++ kbuild_options: ["CONFIG_MALI_BIFROST_SYSTEM_TRACE=y"], + }, + buslog: { + kbuild_options: ["CONFIG_MALI_BUSLOG=y"], @@ -154008,44 +163148,66 @@ index 000000000000..b9b86184f3be + cinstr_gwt: { + kbuild_options: ["CONFIG_MALI_CINSTR_GWT=y"], + }, -+ mali_gator_support: { -+ kbuild_options: ["CONFIG_MALI_BIFROST_GATOR_SUPPORT=y"], ++ cinstr_primary_hwc: { ++ kbuild_options: ["CONFIG_MALI_PRFCNT_SET_PRIMARY=y"], + }, -+ mali_midgard_enable_trace: { -+ kbuild_options: ["CONFIG_MALI_BIFROST_ENABLE_TRACE=y"], ++ cinstr_secondary_hwc: { ++ kbuild_options: ["CONFIG_MALI_BIFROST_PRFCNT_SET_SECONDARY=y"], + }, -+ mali_system_trace: { -+ kbuild_options: ["CONFIG_MALI_BIFROST_SYSTEM_TRACE=y"], ++ cinstr_tertiary_hwc: { ++ kbuild_options: ["CONFIG_MALI_PRFCNT_SET_TERTIARY=y"], ++ }, ++ cinstr_hwc_set_select_via_debug_fs: { ++ kbuild_options: ["CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS=y"], ++ }, ++ mali_job_dump: { ++ kbuild_options: ["CONFIG_MALI_JOB_DUMP"], + }, + mali_pwrsoft_765: { + kbuild_options: ["CONFIG_MALI_PWRSOFT_765=y"], + }, -+ mali_memory_fully_backed: { -+ kbuild_options: ["CONFIG_MALI_MEMORY_FULLY_BACKED=y"], -+ }, -+ mali_dma_buf_map_on_demand: { -+ kbuild_options: ["CONFIG_MALI_DMA_BUF_MAP_ON_DEMAND=y"], ++ mali_hw_errata_1485982_not_affected: { ++ kbuild_options: ["CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED=y"], + }, -+ mali_dma_buf_legacy_compat: { -+ kbuild_options: ["CONFIG_MALI_DMA_BUF_LEGACY_COMPAT=y"], ++ mali_hw_errata_1485982_use_clock_alternative: { ++ kbuild_options: ["CONFIG_MALI_HW_ERRATA_1485982_USE_CLOCK_ALTERNATIVE=y"], + }, -+ mali_arbiter_support: { -+ kbuild_options: ["CONFIG_MALI_ARBITER_SUPPORT=y"], ++ platform_is_fpga: { ++ kbuild_options: ["CONFIG_MALI_IS_FPGA=y"], + }, -+ mali_gem5_build: { -+ kbuild_options: ["CONFIG_MALI_GEM5_BUILD=y"], ++ mali_coresight: { ++ kbuild_options: ["CONFIG_MALI_CORESIGHT=y"], + }, + kbuild_options: [ -+ "MALI_UNIT_TEST={{.unit_test_code}}", ++ "CONFIG_MALI_PLATFORM_NAME={{.mali_platform_name}}", + "MALI_CUSTOMER_RELEASE={{.release}}", ++ "MALI_UNIT_TEST={{.unit_test_code}}", + "MALI_USE_CSF={{.gpu_has_csf}}", -+ "MALI_KERNEL_TEST_API={{.debug}}", ++ "MALI_JIT_PRESSURE_LIMIT_BASE={{.jit_pressure_limit_base}}", ++ ++ // Start of CS experimental features definitions. ++ // If there is nothing below, definition should be added as follows: ++ // "MALI_EXPERIMENTAL_FEATURE={{.experimental_feature}}" ++ // experimental_feature above comes from Mconfig in ++ // /product/base/ ++ // However, in Mconfig, experimental_feature should be looked up (for ++ // similar explanation to this one) as ALLCAPS, i.e. ++ // EXPERIMENTAL_FEATURE. ++ // ++ // IMPORTANT: MALI_CS_EXPERIMENTAL should NEVER be defined below as it ++ // is an umbrella feature that would be open for inappropriate use ++ // (catch-all for experimental CS code without separating it into ++ // different features). ++ "MALI_INCREMENTAL_RENDERING_JM={{.incremental_rendering_jm}}", ++ "MALI_BASE_CSF_PERFORMANCE_TESTS={{.base_csf_performance_tests}}", + ], -+ defaults: ["kernel_defaults"], +} + +bob_kernel_module { + name: "mali_kbase", ++ defaults: [ ++ "mali_kbase_shared_config_defaults", ++ ], + srcs: [ + "*.c", + "*.h", @@ -154055,6 +163217,11 @@ index 000000000000..b9b86184f3be + "backend/gpu/Kbuild", + "context/*.c", + "context/*.h", ++ "context/Kbuild", ++ "hwcnt/*.c", ++ "hwcnt/*.h", ++ "hwcnt/backend/*.h", ++ "hwcnt/Kbuild", + "ipa/*.c", + "ipa/*.h", + "ipa/Kbuild", @@ -154062,53 +163229,33 @@ index 000000000000..b9b86184f3be + "platform/*/*.c", + "platform/*/*.h", + "platform/*/Kbuild", ++ "platform/*/*/*.c", ++ "platform/*/*/*.h", ++ "platform/*/*/Kbuild", ++ "platform/*/*/*.c", ++ "platform/*/*/*.h", ++ "platform/*/*/Kbuild", ++ "platform/*/*/*/*.c", ++ "platform/*/*/*/*.h", ++ "platform/*/*/*/Kbuild", + "thirdparty/*.c", ++ "thirdparty/Kbuild", + "debug/*.c", + "debug/*.h", ++ "debug/Kbuild", + "device/*.c", + "device/*.h", ++ "device/Kbuild", + "gpu/*.c", + "gpu/*.h", ++ "gpu/Kbuild", + "tl/*.c", + "tl/*.h", ++ "tl/Kbuild", + "mmu/*.c", + "mmu/*.h", ++ "mmu/Kbuild", + ], -+ kbuild_options: [ -+ "CONFIG_MALI_KUTF=n", -+ "CONFIG_MALI_MIDGARD=m", -+ "CONFIG_MALI_NO_MALI_DEFAULT_GPU={{.gpu}}", -+ "CONFIG_MALI_PLATFORM_NAME={{.mali_platform_name}}", -+ ], -+ buslog: { -+ extra_symbols: [ -+ "bus_logger", -+ ], -+ }, -+ mali_corestack: { -+ kbuild_options: ["CONFIG_MALI_CORESTACK=y"], -+ }, -+ mali_error_inject: { -+ kbuild_options: ["CONFIG_MALI_BIFROST_ERROR_INJECT=y"], -+ }, -+ mali_error_inject_random: { -+ kbuild_options: ["CONFIG_MALI_ERROR_INJECT_RANDOM=y"], -+ }, -+ cinstr_secondary_hwc: { -+ kbuild_options: ["CONFIG_MALI_BIFROST_PRFCNT_SET_SECONDARY=y"], -+ }, -+ cinstr_secondary_hwc_via_debug_fs: { -+ kbuild_options: ["CONFIG_MALI_PRFCNT_SET_SECONDARY_VIA_DEBUG_FS=y"], -+ }, -+ mali_2mb_alloc: { -+ kbuild_options: ["CONFIG_MALI_2MB_ALLOC=y"], -+ }, -+ mali_hw_errata_1485982_not_affected: { -+ kbuild_options: ["CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED=y"], -+ }, -+ mali_hw_errata_1485982_use_clock_alternative: { -+ kbuild_options: ["CONFIG_MALI_HW_ERRATA_1485982_USE_CLOCK_ALTERNATIVE=y"], -+ }, + gpu_has_job_manager: { + srcs: [ + "context/backend/*_jm.c", @@ -154117,9 +163264,15 @@ index 000000000000..b9b86184f3be + "device/backend/*_jm.c", + "gpu/backend/*_jm.c", + "gpu/backend/*_jm.h", ++ "hwcnt/backend/*_jm.c", ++ "hwcnt/backend/*_jm.h", ++ "hwcnt/backend/*_jm_*.c", ++ "hwcnt/backend/*_jm_*.h", + "jm/*.h", + "tl/backend/*_jm.c", + "mmu/backend/*_jm.c", ++ "ipa/backend/*_jm.c", ++ "ipa/backend/*_jm.h", + ], + }, + gpu_has_csf: { @@ -154128,13 +163281,22 @@ index 000000000000..b9b86184f3be + "csf/*.c", + "csf/*.h", + "csf/Kbuild", ++ "csf/ipa_control/*.c", ++ "csf/ipa_control/*.h", ++ "csf/ipa_control/Kbuild", + "debug/backend/*_csf.c", + "debug/backend/*_csf.h", + "device/backend/*_csf.c", + "gpu/backend/*_csf.c", + "gpu/backend/*_csf.h", ++ "hwcnt/backend/*_csf.c", ++ "hwcnt/backend/*_csf.h", ++ "hwcnt/backend/*_csf_*.c", ++ "hwcnt/backend/*_csf_*.h", + "tl/backend/*_csf.c", + "mmu/backend/*_csf.c", ++ "ipa/backend/*_csf.c", ++ "ipa/backend/*_csf.h", + ], + }, + mali_arbiter_support: { @@ -154144,23 +163306,64 @@ index 000000000000..b9b86184f3be + "arbiter/Kbuild", + ], + }, -+ defaults: ["mali_kbase_shared_config_defaults"], ++ kbuild_options: [ ++ "CONFIG_MALI_BIFROST=m", ++ "CONFIG_MALI_KUTF=n", ++ ], ++ buslog: { ++ extra_symbols: [ ++ "bus_logger", ++ ], ++ }, +} +diff --git a/drivers/gpu/arm/bifrost/context/Kbuild b/drivers/gpu/arm/bifrost/context/Kbuild +new file mode 100644 +index 000000000..156b46a12 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/context/Kbuild +@@ -0,0 +1,27 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++# ++# (C) COPYRIGHT 2012-2013, 2016-2017, 2020-2021 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU license. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, you can access it online at ++# http://www.gnu.org/licenses/gpl-2.0.html. ++# ++# ++ ++bifrost_kbase-y += context/mali_kbase_context.o ++ ++ifeq ($(CONFIG_MALI_CSF_SUPPORT),y) ++ bifrost_kbase-y += context/backend/mali_kbase_context_csf.o ++else ++ bifrost_kbase-y += context/backend/mali_kbase_context_jm.o ++endif diff --git a/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c new file mode 100755 -index 000000000000..7c68eb2f860a +index 000000000..07d277b94 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c -@@ -0,0 +1,177 @@ -+// SPDX-License-Identifier: GPL-2.0 +@@ -0,0 +1,207 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -154171,8 +163374,6 @@ index 000000000000..7c68eb2f860a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -154182,29 +163383,35 @@ index 000000000000..7c68eb2f860a +#include +#include +#include -+#include -+#include +#include +#include +#include +#include -+#include + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) +#include +#include ++#include +#include ++#include +#include ++#include ++#include +#include + +void kbase_context_debugfs_init(struct kbase_context *const kctx) +{ + kbase_debug_mem_view_init(kctx); ++ kbase_debug_mem_zones_init(kctx); ++ kbase_debug_mem_allocs_init(kctx); + kbase_mem_pool_debugfs_init(kctx->kctx_dentry, kctx); + kbase_jit_debugfs_init(kctx); + kbase_csf_queue_group_debugfs_init(kctx); + kbase_csf_kcpu_debugfs_init(kctx); ++ kbase_csf_sync_debugfs_init(kctx); + kbase_csf_tiler_heap_debugfs_init(kctx); ++ kbase_csf_tiler_heap_total_debugfs_init(kctx); ++ kbase_csf_cpu_queue_debugfs_init(kctx); +} +KBASE_EXPORT_SYMBOL(kbase_context_debugfs_init); + @@ -154227,24 +163434,34 @@ index 000000000000..7c68eb2f860a +KBASE_EXPORT_SYMBOL(kbase_context_debugfs_term); +#endif /* CONFIG_DEBUG_FS */ + ++static void kbase_context_free(struct kbase_context *kctx) ++{ ++ kbase_timeline_post_kbase_context_destroy(kctx); ++ ++ vfree(kctx); ++} ++ +static const struct kbase_context_init context_init[] = { -+ {kbase_context_common_init, kbase_context_common_term, NULL}, -+ {kbase_context_mem_pool_group_init, kbase_context_mem_pool_group_term, -+ "Memory pool goup initialization failed"}, -+ {kbase_mem_evictable_init, kbase_mem_evictable_deinit, -+ "Memory evictable initialization failed"}, -+ {kbase_context_mmu_init, kbase_context_mmu_term, -+ "MMU initialization failed"}, -+ {kbase_context_mem_alloc_page, kbase_context_mem_pool_free, -+ "Memory alloc page failed"}, -+ {kbase_region_tracker_init, kbase_region_tracker_term, -+ "Region tracker initialization failed"}, -+ {kbase_sticky_resource_init, kbase_context_sticky_resource_term, -+ "Sticky resource initialization failed"}, -+ {kbase_jit_init, kbase_jit_term, -+ "JIT initialization failed"}, -+ {kbase_csf_ctx_init, kbase_csf_ctx_term, -+ "CSF context initialization failed"}, ++ { NULL, kbase_context_free, NULL }, ++ { kbase_context_common_init, kbase_context_common_term, ++ "Common context initialization failed" }, ++ { kbase_context_mem_pool_group_init, kbase_context_mem_pool_group_term, ++ "Memory pool group initialization failed" }, ++ { kbase_mem_evictable_init, kbase_mem_evictable_deinit, ++ "Memory evictable initialization failed" }, ++ { kbase_context_mmu_init, kbase_context_mmu_term, ++ "MMU initialization failed" }, ++ { kbase_context_mem_alloc_page, kbase_context_mem_pool_free, ++ "Memory alloc page failed" }, ++ { kbase_region_tracker_init, kbase_region_tracker_term, ++ "Region tracker initialization failed" }, ++ { kbase_sticky_resource_init, kbase_context_sticky_resource_term, ++ "Sticky resource initialization failed" }, ++ { kbase_jit_init, kbase_jit_term, "JIT initialization failed" }, ++ { kbase_csf_ctx_init, kbase_csf_ctx_term, ++ "CSF context initialization failed" }, ++ { kbase_context_add_to_dev_list, kbase_context_remove_from_dev_list, ++ "Adding kctx to device failed" }, +}; + +static void kbase_context_term_partial( @@ -154288,14 +163505,23 @@ index 000000000000..7c68eb2f860a +#if defined(CONFIG_64BIT) + else + kbase_ctx_flag_set(kctx, KCTX_FORCE_SAME_VA); -+#endif /* !defined(CONFIG_64BIT) */ ++#endif /* defined(CONFIG_64BIT) */ + + for (i = 0; i < ARRAY_SIZE(context_init); i++) { -+ int err = context_init[i].init(kctx); ++ int err = 0; ++ ++ if (context_init[i].init) ++ err = context_init[i].init(kctx); + + if (err) { + dev_err(kbdev->dev, "%s error = %d\n", + context_init[i].err_mes, err); ++ ++ /* kctx should be freed by kbase_context_free(). ++ * Otherwise it will result in memory leak. ++ */ ++ WARN_ON(i == 0); ++ + kbase_context_term_partial(kctx, i); + return NULL; + } @@ -154316,11 +163542,18 @@ index 000000000000..7c68eb2f860a + if (WARN_ON(!kbdev)) + return; + -+ /* Ensure the core is powered up for the destroy process -+ * A suspend won't happen here, because we're in a syscall -+ * from a userspace thread. ++ /* Context termination could happen whilst the system suspend of ++ * the GPU device is ongoing or has completed. It has been seen on ++ * Customer side that a hang could occur if context termination is ++ * not blocked until the resume of GPU device. + */ -+ kbase_pm_context_active(kbdev); ++ while (kbase_pm_context_active_handle_suspend( ++ kbdev, KBASE_PM_SUSPEND_HANDLER_DONT_INCREASE)) { ++ dev_info(kbdev->dev, ++ "Suspend in progress when destroying context"); ++ wait_event(kbdev->pm.resume_wait, ++ !kbase_pm_is_suspending(kbdev)); ++ } + + kbase_mem_pool_group_mark_dying(&kctx->mem_pools); + @@ -154331,19 +163564,19 @@ index 000000000000..7c68eb2f860a +KBASE_EXPORT_SYMBOL(kbase_destroy_context); diff --git a/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c new file mode 100755 -index 000000000000..0eb42589fe46 +index 000000000..995a08e36 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c -@@ -0,0 +1,230 @@ -+// SPDX-License-Identifier: GPL-2.0 +@@ -0,0 +1,271 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -154354,8 +163587,6 @@ index 000000000000..0eb42589fe46 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -154366,32 +163597,32 @@ index 000000000000..0eb42589fe46 +#include +#include +#include -+#include +#include +#include +#include +#include +#include -+#include + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) +#include ++#include ++#include +#include + +void kbase_context_debugfs_init(struct kbase_context *const kctx) +{ + kbase_debug_mem_view_init(kctx); ++ kbase_debug_mem_zones_init(kctx); ++ kbase_debug_mem_allocs_init(kctx); + kbase_mem_pool_debugfs_init(kctx->kctx_dentry, kctx); + kbase_jit_debugfs_init(kctx); + kbasep_jd_debugfs_ctx_init(kctx); -+ kbase_debug_job_fault_context_init(kctx); +} +KBASE_EXPORT_SYMBOL(kbase_context_debugfs_init); + +void kbase_context_debugfs_term(struct kbase_context *const kctx) +{ + debugfs_remove_recursive(kctx->kctx_dentry); -+ kbase_debug_job_fault_context_term(kctx); +} +KBASE_EXPORT_SYMBOL(kbase_context_debugfs_term); +#else @@ -154410,12 +163641,7 @@ index 000000000000..0eb42589fe46 + +static int kbase_context_kbase_kinstr_jm_init(struct kbase_context *kctx) +{ -+ int ret = kbase_kinstr_jm_init(&kctx->kinstr_jm); -+ -+ if (!ret) -+ return ret; -+ -+ return 0; ++ return kbase_kinstr_jm_init(&kctx->kinstr_jm); +} + +static void kbase_context_kbase_kinstr_jm_term(struct kbase_context *kctx) @@ -154451,12 +163677,30 @@ index 000000000000..0eb42589fe46 + return 0; +} + ++static void kbase_context_flush_jobs(struct kbase_context *kctx) ++{ ++ kbase_jd_zap_context(kctx); ++ flush_workqueue(kctx->jctx.job_done_wq); ++} ++ ++/** ++ * kbase_context_free - Free kcontext at its destruction ++ * ++ * @kctx: kcontext to be freed ++ */ ++static void kbase_context_free(struct kbase_context *kctx) ++{ ++ kbase_timeline_post_kbase_context_destroy(kctx); ++ ++ vfree(kctx); ++} ++ +static const struct kbase_context_init context_init[] = { -+ { kbase_context_common_init, kbase_context_common_term, NULL }, -+ { kbase_dma_fence_init, kbase_dma_fence_term, -+ "DMA fence initialization failed" }, ++ { NULL, kbase_context_free, NULL }, ++ { kbase_context_common_init, kbase_context_common_term, ++ "Common context initialization failed" }, + { kbase_context_mem_pool_group_init, kbase_context_mem_pool_group_term, -+ "Memory pool goup initialization failed" }, ++ "Memory pool group initialization failed" }, + { kbase_mem_evictable_init, kbase_mem_evictable_deinit, + "Memory evictable initialization failed" }, + { kbase_context_mmu_init, kbase_context_mmu_term, @@ -154471,13 +163715,24 @@ index 000000000000..0eb42589fe46 + { kbase_context_kbase_kinstr_jm_init, + kbase_context_kbase_kinstr_jm_term, + "JM instrumentation initialization failed" }, -+ { kbase_context_kbase_timer_setup, NULL, NULL }, ++ { kbase_context_kbase_timer_setup, NULL, ++ "Timers initialization failed" }, + { kbase_event_init, kbase_event_cleanup, + "Event initialization failed" }, + { kbasep_js_kctx_init, kbasep_js_kctx_term, + "JS kctx initialization failed" }, + { kbase_jd_init, kbase_jd_exit, "JD initialization failed" }, -+ { kbase_context_submit_check, NULL, NULL }, ++ { kbase_context_submit_check, NULL, "Enabling job submission failed" }, ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ { kbase_debug_job_fault_context_init, ++ kbase_debug_job_fault_context_term, ++ "Job fault context initialization failed" }, ++#endif ++ { NULL, kbase_context_flush_jobs, NULL }, ++ { kbase_context_add_to_dev_list, kbase_context_remove_from_dev_list, ++ "Adding kctx to device failed" }, ++ { kbasep_platform_context_init, kbasep_platform_context_term, ++ "Platform callback for kctx initialization failed" }, +}; + +static void kbase_context_term_partial( @@ -154521,14 +163776,23 @@ index 000000000000..0eb42589fe46 +#if defined(CONFIG_64BIT) + else + kbase_ctx_flag_set(kctx, KCTX_FORCE_SAME_VA); -+#endif /* !defined(CONFIG_64BIT) */ ++#endif /* defined(CONFIG_64BIT) */ + + for (i = 0; i < ARRAY_SIZE(context_init); i++) { -+ int err = context_init[i].init(kctx); ++ int err = 0; ++ ++ if (context_init[i].init) ++ err = context_init[i].init(kctx); + + if (err) { + dev_err(kbdev->dev, "%s error = %d\n", + context_init[i].err_mes, err); ++ ++ /* kctx should be freed by kbase_context_free(). ++ * Otherwise it will result in memory leak. ++ */ ++ WARN_ON(i == 0); ++ + kbase_context_term_partial(kctx, i); + return NULL; + } @@ -154549,17 +163813,27 @@ index 000000000000..0eb42589fe46 + if (WARN_ON(!kbdev)) + return; + -+ /* Ensure the core is powered up for the destroy process -+ * A suspend won't happen here, because we're in a syscall -+ * from a userspace thread. ++ /* Context termination could happen whilst the system suspend of ++ * the GPU device is ongoing or has completed. It has been seen on ++ * Customer side that a hang could occur if context termination is ++ * not blocked until the resume of GPU device. + */ -+ kbase_pm_context_active(kbdev); ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ atomic_inc(&kbdev->pm.gpu_users_waiting); ++#endif /* CONFIG_MALI_ARBITER_SUPPORT */ ++ while (kbase_pm_context_active_handle_suspend( ++ kbdev, KBASE_PM_SUSPEND_HANDLER_DONT_INCREASE)) { ++ dev_dbg(kbdev->dev, ++ "Suspend in progress when destroying context"); ++ wait_event(kbdev->pm.resume_wait, ++ !kbase_pm_is_suspending(kbdev)); ++ } ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ atomic_dec(&kbdev->pm.gpu_users_waiting); ++#endif /* CONFIG_MALI_ARBITER_SUPPORT */ + + kbase_mem_pool_group_mark_dying(&kctx->mem_pools); + -+ kbase_jd_zap_context(kctx); -+ flush_workqueue(kctx->jctx.job_done_wq); -+ + kbase_context_term_partial(kctx, ARRAY_SIZE(context_init)); + + kbase_pm_context_idle(kbdev); @@ -154567,19 +163841,19 @@ index 000000000000..0eb42589fe46 +KBASE_EXPORT_SYMBOL(kbase_destroy_context); diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context.c b/drivers/gpu/arm/bifrost/context/mali_kbase_context.c new file mode 100755 -index 000000000000..83182f983467 +index 000000000..88be6c2e7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context.c -@@ -0,0 +1,339 @@ -+// SPDX-License-Identifier: GPL-2.0 +@@ -0,0 +1,392 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -154590,21 +163864,23 @@ index 000000000000..83182f983467 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* + * Base kernel context APIs + */ ++#include ++#if KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE ++#include ++#else ++#include ++#endif + +#include +#include +#include -+#include +#include +#include -+#include +#include +#include +#include @@ -154706,16 +163982,50 @@ index 000000000000..83182f983467 + /* creating a context is considered a disjoint event */ + kbase_disjoint_event(kctx->kbdev); + -+ kctx->as_nr = KBASEP_AS_NR_INVALID; -+ -+ atomic_set(&kctx->refcount, 0); -+ -+ spin_lock_init(&kctx->mm_update_lock); + kctx->process_mm = NULL; ++ kctx->task = NULL; + atomic_set(&kctx->nonmapped_pages, 0); + atomic_set(&kctx->permanent_mapped_pages, 0); -+ kctx->tgid = current->tgid; -+ kctx->pid = current->pid; ++ kctx->tgid = task_tgid_vnr(current); ++ kctx->pid = task_pid_vnr(current); ++ ++ /* Check if this is a Userspace created context */ ++ if (likely(kctx->filp)) { ++ struct pid *pid_struct; ++ ++ rcu_read_lock(); ++ pid_struct = find_get_pid(kctx->tgid); ++ if (likely(pid_struct)) { ++ struct task_struct *task = pid_task(pid_struct, PIDTYPE_PID); ++ ++ if (likely(task)) { ++ /* Take a reference on the task to avoid slow lookup ++ * later on from the page allocation loop. ++ */ ++ get_task_struct(task); ++ kctx->task = task; ++ } else { ++ dev_err(kctx->kbdev->dev, ++ "Failed to get task pointer for %s/%d", ++ current->comm, kctx->pid); ++ err = -ESRCH; ++ } ++ ++ put_pid(pid_struct); ++ } else { ++ dev_err(kctx->kbdev->dev, ++ "Failed to get pid pointer for %s/%d", ++ current->comm, kctx->pid); ++ err = -ESRCH; ++ } ++ rcu_read_unlock(); ++ ++ if (unlikely(err)) ++ return err; ++ ++ kbase_mem_mmgrab(); ++ kctx->process_mm = current->mm; ++ } + + atomic_set(&kctx->used_pages, 0); + @@ -154729,34 +164039,70 @@ index 000000000000..83182f983467 + + init_waitqueue_head(&kctx->event_queue); + atomic_set(&kctx->event_count, 0); ++ +#if !MALI_USE_CSF + atomic_set(&kctx->event_closed, false); -+#ifdef CONFIG_GPU_TRACEPOINTS ++#if IS_ENABLED(CONFIG_GPU_TRACEPOINTS) + atomic_set(&kctx->jctx.work_id, 0); +#endif +#endif + ++#if MALI_USE_CSF ++ atomic64_set(&kctx->num_fixable_allocs, 0); ++ atomic64_set(&kctx->num_fixed_allocs, 0); ++#endif ++ ++ kbase_gpu_vm_lock(kctx); + bitmap_copy(kctx->cookies, &cookies_mask, BITS_PER_LONG); ++ kbase_gpu_vm_unlock(kctx); + + kctx->id = atomic_add_return(1, &(kctx->kbdev->ctx_num)) - 1; + -+ mutex_init(&kctx->legacy_hwcnt_lock); -+ + mutex_lock(&kctx->kbdev->kctx_list_lock); -+ list_add(&kctx->kctx_list_link, &kctx->kbdev->kctx_list); -+ + err = kbase_insert_kctx_to_process(kctx); -+ if (err) ++ mutex_unlock(&kctx->kbdev->kctx_list_lock); ++ if (err) { + dev_err(kctx->kbdev->dev, -+ "(err:%d) failed to insert kctx to kbase_process\n", err); ++ "(err:%d) failed to insert kctx to kbase_process", err); ++ if (likely(kctx->filp)) { ++ mmdrop(kctx->process_mm); ++ put_task_struct(kctx->task); ++ } ++ } ++ ++ return err; ++} ++ ++int kbase_context_add_to_dev_list(struct kbase_context *kctx) ++{ ++ if (WARN_ON(!kctx)) ++ return -EINVAL; ++ ++ if (WARN_ON(!kctx->kbdev)) ++ return -EINVAL; + -+ KBASE_TLSTREAM_TL_KBASE_NEW_CTX(kctx->kbdev, kctx->id, -+ kctx->kbdev->gpu_props.props.raw_props.gpu_id); -+ KBASE_TLSTREAM_TL_NEW_CTX(kctx->kbdev, kctx, kctx->id, -+ (u32)(kctx->tgid)); ++ mutex_lock(&kctx->kbdev->kctx_list_lock); ++ list_add(&kctx->kctx_list_link, &kctx->kbdev->kctx_list); + mutex_unlock(&kctx->kbdev->kctx_list_lock); + -+ return err; ++ kbase_timeline_post_kbase_context_create(kctx); ++ ++ return 0; ++} ++ ++void kbase_context_remove_from_dev_list(struct kbase_context *kctx) ++{ ++ if (WARN_ON(!kctx)) ++ return; ++ ++ if (WARN_ON(!kctx->kbdev)) ++ return; ++ ++ kbase_timeline_pre_kbase_context_destroy(kctx); ++ ++ mutex_lock(&kctx->kbdev->kctx_list_lock); ++ list_del_init(&kctx->kctx_list_link); ++ mutex_unlock(&kctx->kbdev->kctx_list_lock); +} + +/** @@ -154785,7 +164131,9 @@ index 000000000000..83182f983467 + /* Add checks, so that the terminating process Should not + * hold any gpu_memory. + */ ++ spin_lock(&kctx->kbdev->gpu_mem_usage_lock); + WARN_ON(kprcs->total_gpu_pages); ++ spin_unlock(&kctx->kbdev->gpu_mem_usage_lock); + WARN_ON(!RB_EMPTY_ROOT(&kprcs->dma_buf_root)); + kfree(kprcs); + } @@ -154793,15 +164141,8 @@ index 000000000000..83182f983467 + +void kbase_context_common_term(struct kbase_context *kctx) +{ -+ unsigned long flags; + int pages; + -+ mutex_lock(&kctx->kbdev->mmu_hw_mutex); -+ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, flags); -+ kbase_ctx_sched_remove_ctx(kctx); -+ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kctx->kbdev->mmu_hw_mutex); -+ + pages = atomic_read(&kctx->used_pages); + if (pages != 0) + dev_warn(kctx->kbdev->dev, @@ -154811,32 +164152,20 @@ index 000000000000..83182f983467 + + mutex_lock(&kctx->kbdev->kctx_list_lock); + kbase_remove_kctx_from_process(kctx); -+ -+ KBASE_TLSTREAM_TL_KBASE_DEL_CTX(kctx->kbdev, kctx->id); -+ -+ KBASE_TLSTREAM_TL_DEL_CTX(kctx->kbdev, kctx); -+ list_del(&kctx->kctx_list_link); + mutex_unlock(&kctx->kbdev->kctx_list_lock); + -+ KBASE_KTRACE_ADD(kctx->kbdev, CORE_CTX_DESTROY, kctx, 0u); -+ -+ /* Flush the timeline stream, so the user can see the termination -+ * tracepoints being fired. -+ * The "if" statement below is for optimization. It is safe to call -+ * kbase_timeline_streams_flush when timeline is disabled. -+ */ -+ if (atomic_read(&kctx->kbdev->timeline_flags) != 0) -+ kbase_timeline_streams_flush(kctx->kbdev->timeline); ++ if (likely(kctx->filp)) { ++ mmdrop(kctx->process_mm); ++ put_task_struct(kctx->task); ++ } + -+ vfree(kctx); ++ KBASE_KTRACE_ADD(kctx->kbdev, CORE_CTX_DESTROY, kctx, 0u); +} + +int kbase_context_mem_pool_group_init(struct kbase_context *kctx) +{ -+ return kbase_mem_pool_group_init(&kctx->mem_pools, -+ kctx->kbdev, -+ &kctx->kbdev->mem_pool_defaults, -+ &kctx->kbdev->mem_pools); ++ return kbase_mem_pool_group_init(&kctx->mem_pools, kctx->kbdev, ++ &kctx->kbdev->mem_pool_defaults, &kctx->kbdev->mem_pools); +} + +void kbase_context_mem_pool_group_term(struct kbase_context *kctx) @@ -154846,11 +164175,9 @@ index 000000000000..83182f983467 + +int kbase_context_mmu_init(struct kbase_context *kctx) +{ -+ kbase_mmu_init(kctx->kbdev, -+ &kctx->mmu, kctx, -+ base_context_mmu_group_id_get(kctx->create_flags)); -+ -+ return 0; ++ return kbase_mmu_init( ++ kctx->kbdev, &kctx->mmu, kctx, ++ kbase_context_mmu_group_id_get(kctx->create_flags)); +} + +void kbase_context_mmu_term(struct kbase_context *kctx) @@ -154912,18 +164239,19 @@ index 000000000000..83182f983467 +} diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context.h b/drivers/gpu/arm/bifrost/context/mali_kbase_context.h new file mode 100755 -index 000000000000..e4ed8944bdd2 +index 000000000..7c90e2708 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context.h -@@ -0,0 +1,157 @@ +@@ -0,0 +1,141 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -154934,18 +164262,6 @@ index 000000000000..e4ed8944bdd2 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ *//* SPDX-License-Identifier: GPL-2.0 */ -+/* -+ * -+ * (C) COPYRIGHT 2011-2017, 2019 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * + */ + +#ifndef _KBASE_CONTEXT_H_ @@ -155022,6 +164338,19 @@ index 000000000000..e4ed8944bdd2 +} + +/** ++ * kbase_ctx_compat_mode - Indicate whether a kbase context needs to operate ++ * in compatibility mode for 32-bit userspace. ++ * @kctx: kbase context ++ * ++ * Return: True if needs to maintain compatibility, False otherwise. ++ */ ++static inline bool kbase_ctx_compat_mode(struct kbase_context *kctx) ++{ ++ return !IS_ENABLED(CONFIG_64BIT) || ++ (IS_ENABLED(CONFIG_64BIT) && kbase_ctx_flag(kctx, KCTX_COMPAT)); ++} ++ ++/** + * kbase_ctx_flag_clear - Clear @flag on @kctx + * @kctx: Pointer to kbase context + * @flag: Flag to clear @@ -155035,25 +164364,7 @@ index 000000000000..e4ed8944bdd2 +static inline void kbase_ctx_flag_clear(struct kbase_context *kctx, + enum kbase_context_flags flag) +{ -+#if KERNEL_VERSION(4, 3, 0) > LINUX_VERSION_CODE -+ /* -+ * Earlier kernel versions doesn't have atomic_andnot() or -+ * atomic_and(). atomic_clear_mask() was only available on some -+ * architectures and removed on arm in v3.13 on arm and arm64. -+ * -+ * Use a compare-exchange loop to clear the flag on pre 4.3 kernels, -+ * when atomic_andnot() becomes available. -+ */ -+ int old, new; -+ -+ do { -+ old = atomic_read(&kctx->flags); -+ new = old & ~flag; -+ -+ } while (atomic_cmpxchg(&kctx->flags, old, new) != old); -+#else + atomic_andnot(flag, &kctx->flags); -+#endif +} + +/** @@ -155075,18 +164386,19 @@ index 000000000000..e4ed8944bdd2 +#endif /* _KBASE_CONTEXT_H_ */ diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h b/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h new file mode 100755 -index 000000000000..818cdbea960d +index 000000000..1cde7394c --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h -@@ -0,0 +1,60 @@ +@@ -0,0 +1,54 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -155097,16 +164409,6 @@ index 000000000000..818cdbea960d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ *//* SPDX-License-Identifier: GPL-2.0 */ -+/* -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. + */ + +#include @@ -155139,19 +164441,23 @@ index 000000000000..818cdbea960d +void kbase_context_mem_pool_free(struct kbase_context *kctx); + +void kbase_context_sticky_resource_term(struct kbase_context *kctx); ++ ++int kbase_context_add_to_dev_list(struct kbase_context *kctx); ++void kbase_context_remove_from_dev_list(struct kbase_context *kctx); diff --git a/drivers/gpu/arm/bifrost/csf/Kbuild b/drivers/gpu/arm/bifrost/csf/Kbuild new file mode 100755 -index 000000000000..bb61811e6c85 +index 000000000..44217dba1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/Kbuild -@@ -0,0 +1,40 @@ +@@ -0,0 +1,58 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2018-2022 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -155162,43 +164468,89 @@ index 000000000000..bb61811e6c85 +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+mali_kbase-y += \ -+ csf/mali_kbase_csf_firmware_cfg.o \ -+ csf/mali_kbase_csf_trace_buffer.o \ -+ csf/mali_kbase_csf.o \ -+ csf/mali_kbase_csf_scheduler.o \ -+ csf/mali_kbase_csf_kcpu.o \ -+ csf/mali_kbase_csf_tiler_heap.o \ -+ csf/mali_kbase_csf_timeout.o \ -+ csf/mali_kbase_csf_tl_reader.o \ -+ csf/mali_kbase_csf_heap_context_alloc.o \ -+ csf/mali_kbase_csf_reset_gpu.o \ -+ csf/mali_kbase_csf_csg_debugfs.o \ -+ csf/mali_kbase_csf_kcpu_debugfs.o \ -+ csf/mali_kbase_csf_protected_memory.o \ -+ csf/mali_kbase_csf_tiler_heap_debugfs.o ++bifrost_kbase-y += \ ++ csf/mali_kbase_csf_firmware_cfg.o \ ++ csf/mali_kbase_csf_trace_buffer.o \ ++ csf/mali_kbase_csf.o \ ++ csf/mali_kbase_csf_scheduler.o \ ++ csf/mali_kbase_csf_kcpu.o \ ++ csf/mali_kbase_csf_tiler_heap.o \ ++ csf/mali_kbase_csf_timeout.o \ ++ csf/mali_kbase_csf_tl_reader.o \ ++ csf/mali_kbase_csf_heap_context_alloc.o \ ++ csf/mali_kbase_csf_reset_gpu.o \ ++ csf/mali_kbase_csf_csg_debugfs.o \ ++ csf/mali_kbase_csf_kcpu_debugfs.o \ ++ csf/mali_kbase_csf_sync_debugfs.o \ ++ csf/mali_kbase_csf_protected_memory.o \ ++ csf/mali_kbase_csf_tiler_heap_debugfs.o \ ++ csf/mali_kbase_csf_cpu_queue_debugfs.o \ ++ csf/mali_kbase_csf_event.o \ ++ csf/mali_kbase_csf_firmware_log.o \ ++ csf/mali_kbase_csf_firmware_core_dump.o \ ++ csf/mali_kbase_csf_tiler_heap_reclaim.o \ ++ csf/mali_kbase_csf_mcu_shared_reg.o ++ ++ifeq ($(CONFIG_MALI_BIFROST_NO_MALI),y) ++bifrost_kbase-y += csf/mali_kbase_csf_firmware_no_mali.o ++else ++bifrost_kbase-y += csf/mali_kbase_csf_firmware.o ++endif + -+mali_kbase-$(CONFIG_MALI_REAL_HW) += csf/mali_kbase_csf_firmware.o ++bifrost_kbase-$(CONFIG_DEBUG_FS) += csf/mali_kbase_debug_csf_fault.o + -+mali_kbase-$(CONFIG_MALI_BIFROST_NO_MALI) += csf/mali_kbase_csf_firmware_no_mali.o -diff --git a/drivers/gpu/arm/bifrost/csf/mali_base_csf_kernel.h b/drivers/gpu/arm/bifrost/csf/mali_base_csf_kernel.h -new file mode 100755 -index 000000000000..301146cbedd3 ++ifeq ($(KBUILD_EXTMOD),) ++# in-tree ++ -include $(src)/csf/ipa_control/Kbuild ++else ++# out-of-tree ++ include $(src)/csf/ipa_control/Kbuild ++endif +diff --git a/drivers/gpu/arm/bifrost/csf/ipa_control/Kbuild b/drivers/gpu/arm/bifrost/csf/ipa_control/Kbuild +new file mode 100644 +index 000000000..dc30281e4 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/ipa_control/Kbuild +@@ -0,0 +1,22 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++# ++# (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU license. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, you can access it online at ++# http://www.gnu.org/licenses/gpl-2.0.html. ++# ++# ++ ++bifrost_kbase-y += \ ++ csf/ipa_control/mali_kbase_csf_ipa_control.o +diff --git a/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.c b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.c +new file mode 100644 +index 000000000..c81d0a5a7 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/csf/mali_base_csf_kernel.h -@@ -0,0 +1,598 @@ ++++ b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.c +@@ -0,0 +1,1063 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -155209,600 +164561,1342 @@ index 000000000000..301146cbedd3 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#ifndef _BASE_CSF_KERNEL_H_ -+#define _BASE_CSF_KERNEL_H_ ++#include ++#include ++#include "backend/gpu/mali_kbase_clk_rate_trace_mgr.h" ++#include "mali_kbase_csf_ipa_control.h" + -+/* Memory allocation, access/hint flags. -+ * -+ * See base_mem_alloc_flags. ++/* ++ * Status flags from the STATUS register of the IPA Control interface. + */ ++#define STATUS_COMMAND_ACTIVE ((u32)1 << 0) ++#define STATUS_PROTECTED_MODE ((u32)1 << 8) ++#define STATUS_RESET ((u32)1 << 9) ++#define STATUS_TIMER_ENABLED ((u32)1 << 31) + -+/* IN */ -+/* Read access CPU side ++/* ++ * Commands for the COMMAND register of the IPA Control interface. + */ -+#define BASE_MEM_PROT_CPU_RD ((base_mem_alloc_flags)1 << 0) ++#define COMMAND_APPLY ((u32)1) ++#define COMMAND_SAMPLE ((u32)3) ++#define COMMAND_PROTECTED_ACK ((u32)4) ++#define COMMAND_RESET_ACK ((u32)5) + -+/* Write access CPU side ++/* ++ * Number of timer events per second. + */ -+#define BASE_MEM_PROT_CPU_WR ((base_mem_alloc_flags)1 << 1) ++#define TIMER_EVENTS_PER_SECOND ((u32)1000 / IPA_CONTROL_TIMER_DEFAULT_VALUE_MS) + -+/* Read access GPU side ++/* ++ * Maximum number of loops polling the GPU before we assume the GPU has hung. + */ -+#define BASE_MEM_PROT_GPU_RD ((base_mem_alloc_flags)1 << 2) ++#define IPA_INACTIVE_MAX_LOOPS (8000000U) + -+/* Write access GPU side ++/* ++ * Number of bits used to configure a performance counter in SELECT registers. + */ -+#define BASE_MEM_PROT_GPU_WR ((base_mem_alloc_flags)1 << 3) ++#define IPA_CONTROL_SELECT_BITS_PER_CNT ((u64)8) + -+/* Execute allowed on the GPU side ++/* ++ * Maximum value of a performance counter. + */ -+#define BASE_MEM_PROT_GPU_EX ((base_mem_alloc_flags)1 << 4) ++#define MAX_PRFCNT_VALUE (((u64)1 << 48) - 1) + -+/* Will be permanently mapped in kernel space. -+ * Flag is only allowed on allocations originating from kbase. ++/** ++ * struct kbase_ipa_control_listener_data - Data for the GPU clock frequency ++ * listener ++ * ++ * @listener: GPU clock frequency listener. ++ * @kbdev: Pointer to kbase device. + */ -+#define BASEP_MEM_PERMANENT_KERNEL_MAPPING ((base_mem_alloc_flags)1 << 5) ++struct kbase_ipa_control_listener_data { ++ struct kbase_clk_rate_listener listener; ++ struct kbase_device *kbdev; ++}; + -+/* The allocation will completely reside within the same 4GB chunk in the GPU -+ * virtual space. -+ * Since this flag is primarily required only for the TLS memory which will -+ * not be used to contain executable code and also not used for Tiler heap, -+ * it can't be used along with BASE_MEM_PROT_GPU_EX and TILER_ALIGN_TOP flags. -+ */ -+#define BASE_MEM_GPU_VA_SAME_4GB_PAGE ((base_mem_alloc_flags)1 << 6) ++static u32 timer_value(u32 gpu_rate) ++{ ++ return gpu_rate / TIMER_EVENTS_PER_SECOND; ++} + -+/* Userspace is not allowed to free this memory. -+ * Flag is only allowed on allocations originating from kbase. -+ */ -+#define BASEP_MEM_NO_USER_FREE ((base_mem_alloc_flags)1 << 7) ++static int wait_status(struct kbase_device *kbdev, u32 flags) ++{ ++ unsigned int max_loops = IPA_INACTIVE_MAX_LOOPS; ++ u32 status = kbase_reg_read(kbdev, IPA_CONTROL_REG(STATUS)); + -+#define BASE_MEM_RESERVED_BIT_8 ((base_mem_alloc_flags)1 << 8) ++ /* ++ * Wait for the STATUS register to indicate that flags have been ++ * cleared, in case a transition is pending. ++ */ ++ while (--max_loops && (status & flags)) ++ status = kbase_reg_read(kbdev, IPA_CONTROL_REG(STATUS)); ++ if (max_loops == 0) { ++ dev_err(kbdev->dev, "IPA_CONTROL STATUS register stuck"); ++ return -EBUSY; ++ } + -+/* Grow backing store on GPU Page Fault -+ */ -+#define BASE_MEM_GROW_ON_GPF ((base_mem_alloc_flags)1 << 9) ++ return 0; ++} + -+/* Page coherence Outer shareable, if available -+ */ -+#define BASE_MEM_COHERENT_SYSTEM ((base_mem_alloc_flags)1 << 10) ++static int apply_select_config(struct kbase_device *kbdev, u64 *select) ++{ ++ int ret; + -+/* Page coherence Inner shareable -+ */ -+#define BASE_MEM_COHERENT_LOCAL ((base_mem_alloc_flags)1 << 11) ++ u32 select_cshw_lo = (u32)(select[KBASE_IPA_CORE_TYPE_CSHW] & U32_MAX); ++ u32 select_cshw_hi = ++ (u32)((select[KBASE_IPA_CORE_TYPE_CSHW] >> 32) & U32_MAX); ++ u32 select_memsys_lo = ++ (u32)(select[KBASE_IPA_CORE_TYPE_MEMSYS] & U32_MAX); ++ u32 select_memsys_hi = ++ (u32)((select[KBASE_IPA_CORE_TYPE_MEMSYS] >> 32) & U32_MAX); ++ u32 select_tiler_lo = ++ (u32)(select[KBASE_IPA_CORE_TYPE_TILER] & U32_MAX); ++ u32 select_tiler_hi = ++ (u32)((select[KBASE_IPA_CORE_TYPE_TILER] >> 32) & U32_MAX); ++ u32 select_shader_lo = ++ (u32)(select[KBASE_IPA_CORE_TYPE_SHADER] & U32_MAX); ++ u32 select_shader_hi = ++ (u32)((select[KBASE_IPA_CORE_TYPE_SHADER] >> 32) & U32_MAX); + -+/* IN/OUT */ -+/* Should be cached on the CPU, returned if actually cached -+ */ -+#define BASE_MEM_CACHED_CPU ((base_mem_alloc_flags)1 << 12) ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(SELECT_CSHW_LO), select_cshw_lo); ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(SELECT_CSHW_HI), select_cshw_hi); ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(SELECT_MEMSYS_LO), ++ select_memsys_lo); ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(SELECT_MEMSYS_HI), ++ select_memsys_hi); ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(SELECT_TILER_LO), ++ select_tiler_lo); ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(SELECT_TILER_HI), ++ select_tiler_hi); ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(SELECT_SHADER_LO), ++ select_shader_lo); ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(SELECT_SHADER_HI), ++ select_shader_hi); + -+/* IN/OUT */ -+/* Must have same VA on both the GPU and the CPU -+ */ -+#define BASE_MEM_SAME_VA ((base_mem_alloc_flags)1 << 13) ++ ret = wait_status(kbdev, STATUS_COMMAND_ACTIVE); + -+/* OUT */ -+/* Must call mmap to acquire a GPU address for the alloc -+ */ -+#define BASE_MEM_NEED_MMAP ((base_mem_alloc_flags)1 << 14) ++ if (!ret) { ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(COMMAND), COMMAND_APPLY); ++ ret = wait_status(kbdev, STATUS_COMMAND_ACTIVE); ++ } else { ++ dev_err(kbdev->dev, "Wait for the pending command failed"); ++ } + -+/* IN */ -+/* Page coherence Outer shareable, required. -+ */ -+#define BASE_MEM_COHERENT_SYSTEM_REQUIRED ((base_mem_alloc_flags)1 << 15) ++ return ret; ++} + -+/* Protected memory -+ */ -+#define BASE_MEM_PROTECTED ((base_mem_alloc_flags)1 << 16) ++static u64 read_value_cnt(struct kbase_device *kbdev, u8 type, int select_idx) ++{ ++ u32 value_lo, value_hi; + -+/* Not needed physical memory -+ */ -+#define BASE_MEM_DONT_NEED ((base_mem_alloc_flags)1 << 17) ++ switch (type) { ++ case KBASE_IPA_CORE_TYPE_CSHW: ++ value_lo = kbase_reg_read( ++ kbdev, IPA_CONTROL_REG(VALUE_CSHW_REG_LO(select_idx))); ++ value_hi = kbase_reg_read( ++ kbdev, IPA_CONTROL_REG(VALUE_CSHW_REG_HI(select_idx))); ++ break; ++ case KBASE_IPA_CORE_TYPE_MEMSYS: ++ value_lo = kbase_reg_read( ++ kbdev, ++ IPA_CONTROL_REG(VALUE_MEMSYS_REG_LO(select_idx))); ++ value_hi = kbase_reg_read( ++ kbdev, ++ IPA_CONTROL_REG(VALUE_MEMSYS_REG_HI(select_idx))); ++ break; ++ case KBASE_IPA_CORE_TYPE_TILER: ++ value_lo = kbase_reg_read( ++ kbdev, IPA_CONTROL_REG(VALUE_TILER_REG_LO(select_idx))); ++ value_hi = kbase_reg_read( ++ kbdev, IPA_CONTROL_REG(VALUE_TILER_REG_HI(select_idx))); ++ break; ++ case KBASE_IPA_CORE_TYPE_SHADER: ++ value_lo = kbase_reg_read( ++ kbdev, ++ IPA_CONTROL_REG(VALUE_SHADER_REG_LO(select_idx))); ++ value_hi = kbase_reg_read( ++ kbdev, ++ IPA_CONTROL_REG(VALUE_SHADER_REG_HI(select_idx))); ++ break; ++ default: ++ WARN(1, "Unknown core type: %u\n", type); ++ value_lo = value_hi = 0; ++ break; ++ } + -+/* Must use shared CPU/GPU zone (SAME_VA zone) but doesn't require the -+ * addresses to be the same -+ */ -+#define BASE_MEM_IMPORT_SHARED ((base_mem_alloc_flags)1 << 18) ++ return (((u64)value_hi << 32) | value_lo); ++} + -+/* CSF event memory -+ * -+ * If Outer shareable coherence is not specified or not available, then on -+ * allocation kbase will automatically use the uncached GPU mapping. -+ * There is no need for the client to specify BASE_MEM_UNCACHED_GPU -+ * themselves when allocating memory with the BASE_MEM_CSF_EVENT flag. ++static void build_select_config(struct kbase_ipa_control *ipa_ctrl, ++ u64 *select_config) ++{ ++ size_t i; ++ ++ for (i = 0; i < KBASE_IPA_CORE_TYPE_NUM; i++) { ++ size_t j; ++ ++ select_config[i] = 0ULL; ++ ++ for (j = 0; j < KBASE_IPA_CONTROL_NUM_BLOCK_COUNTERS; j++) { ++ struct kbase_ipa_control_prfcnt_config *prfcnt_config = ++ &ipa_ctrl->blocks[i].select[j]; ++ ++ select_config[i] |= ++ ((u64)prfcnt_config->idx ++ << (IPA_CONTROL_SELECT_BITS_PER_CNT * j)); ++ } ++ } ++} ++ ++static int update_select_registers(struct kbase_device *kbdev) ++{ ++ u64 select_config[KBASE_IPA_CORE_TYPE_NUM]; ++ ++ lockdep_assert_held(&kbdev->csf.ipa_control.lock); ++ ++ build_select_config(&kbdev->csf.ipa_control, select_config); ++ ++ return apply_select_config(kbdev, select_config); ++} ++ ++static inline void calc_prfcnt_delta(struct kbase_device *kbdev, ++ struct kbase_ipa_control_prfcnt *prfcnt, ++ bool gpu_ready) ++{ ++ u64 delta_value, raw_value; ++ ++ if (gpu_ready) ++ raw_value = read_value_cnt(kbdev, (u8)prfcnt->type, ++ prfcnt->select_idx); ++ else ++ raw_value = prfcnt->latest_raw_value; ++ ++ if (raw_value < prfcnt->latest_raw_value) { ++ delta_value = (MAX_PRFCNT_VALUE - prfcnt->latest_raw_value) + ++ raw_value; ++ } else { ++ delta_value = raw_value - prfcnt->latest_raw_value; ++ } ++ ++ delta_value *= prfcnt->scaling_factor; ++ ++ if (kbdev->csf.ipa_control.cur_gpu_rate == 0) { ++ static bool warned; ++ ++ if (!warned) { ++ dev_warn(kbdev->dev, "%s: GPU freq is unexpectedly 0", __func__); ++ warned = true; ++ } ++ } else if (prfcnt->gpu_norm) ++ delta_value = div_u64(delta_value, kbdev->csf.ipa_control.cur_gpu_rate); ++ ++ prfcnt->latest_raw_value = raw_value; ++ ++ /* Accumulate the difference */ ++ prfcnt->accumulated_diff += delta_value; ++} ++ ++/** ++ * kbase_ipa_control_rate_change_notify - GPU frequency change callback + * -+ * This memory requires a permanent mapping ++ * @listener: Clock frequency change listener. ++ * @clk_index: Index of the clock for which the change has occurred. ++ * @clk_rate_hz: Clock frequency(Hz). + * -+ * See also kbase_reg_needs_kernel_mapping() ++ * This callback notifies kbase_ipa_control about GPU frequency changes. ++ * Only top-level clock changes are meaningful. GPU frequency updates ++ * affect all performance counters which require GPU normalization ++ * in every session. + */ -+#define BASE_MEM_CSF_EVENT ((base_mem_alloc_flags)1 << 19) ++static void ++kbase_ipa_control_rate_change_notify(struct kbase_clk_rate_listener *listener, ++ u32 clk_index, u32 clk_rate_hz) ++{ ++ if ((clk_index == KBASE_CLOCK_DOMAIN_TOP) && (clk_rate_hz != 0)) { ++ size_t i; ++ unsigned long flags; ++ struct kbase_ipa_control_listener_data *listener_data = ++ container_of(listener, ++ struct kbase_ipa_control_listener_data, ++ listener); ++ struct kbase_device *kbdev = listener_data->kbdev; ++ struct kbase_ipa_control *ipa_ctrl = &kbdev->csf.ipa_control; + -+#define BASE_MEM_RESERVED_BIT_20 ((base_mem_alloc_flags)1 << 20) ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+/* Should be uncached on the GPU, will work only for GPUs using AARCH64 mmu -+ * mode. Some components within the GPU might only be able to access memory -+ * that is GPU cacheable. Refer to the specific GPU implementation for more -+ * details. The 3 shareability flags will be ignored for GPU uncached memory. -+ * If used while importing USER_BUFFER type memory, then the import will fail -+ * if the memory is not aligned to GPU and CPU cache line width. -+ */ -+#define BASE_MEM_UNCACHED_GPU ((base_mem_alloc_flags)1 << 21) ++ if (!kbdev->pm.backend.gpu_ready) { ++ dev_err(kbdev->dev, ++ "%s: GPU frequency cannot change while GPU is off", ++ __func__); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ return; ++ } + -+/* -+ * Bits [22:25] for group_id (0~15). -+ * -+ * base_mem_group_id_set() should be used to pack a memory group ID into a -+ * base_mem_alloc_flags value instead of accessing the bits directly. -+ * base_mem_group_id_get() should be used to extract the memory group ID from -+ * a base_mem_alloc_flags value. -+ */ -+#define BASEP_MEM_GROUP_ID_SHIFT 22 -+#define BASE_MEM_GROUP_ID_MASK \ -+ ((base_mem_alloc_flags)0xF << BASEP_MEM_GROUP_ID_SHIFT) ++ /* Interrupts are already disabled and interrupt state is also saved */ ++ spin_lock(&ipa_ctrl->lock); + -+/* Must do CPU cache maintenance when imported memory is mapped/unmapped -+ * on GPU. Currently applicable to dma-buf type only. -+ */ -+#define BASE_MEM_IMPORT_SYNC_ON_MAP_UNMAP ((base_mem_alloc_flags)1 << 26) ++ for (i = 0; i < KBASE_IPA_CONTROL_MAX_SESSIONS; i++) { ++ struct kbase_ipa_control_session *session = &ipa_ctrl->sessions[i]; + -+/* OUT */ -+/* Kernel side cache sync ops required */ -+#define BASE_MEM_KERNEL_SYNC ((base_mem_alloc_flags)1 << 28) ++ if (session->active) { ++ size_t j; + -+/* Number of bits used as flags for base memory management -+ * -+ * Must be kept in sync with the base_mem_alloc_flags flags -+ */ -+#define BASE_MEM_FLAGS_NR_BITS 29 ++ for (j = 0; j < session->num_prfcnts; j++) { ++ struct kbase_ipa_control_prfcnt *prfcnt = ++ &session->prfcnts[j]; + -+/* A mask of all the flags which are only valid for allocations within kbase, -+ * and may not be passed from user space. -+ */ -+#define BASEP_MEM_FLAGS_KERNEL_ONLY \ -+ (BASEP_MEM_PERMANENT_KERNEL_MAPPING | BASEP_MEM_NO_USER_FREE) ++ if (prfcnt->gpu_norm) ++ calc_prfcnt_delta(kbdev, prfcnt, true); ++ } ++ } ++ } + -+/* A mask for all output bits, excluding IN/OUT bits. -+ */ -+#define BASE_MEM_FLAGS_OUTPUT_MASK BASE_MEM_NEED_MMAP ++ ipa_ctrl->cur_gpu_rate = clk_rate_hz; + -+/* A mask for all input bits, including IN/OUT bits. -+ */ -+#define BASE_MEM_FLAGS_INPUT_MASK \ -+ (((1 << BASE_MEM_FLAGS_NR_BITS) - 1) & ~BASE_MEM_FLAGS_OUTPUT_MASK) ++ /* Update the timer for automatic sampling if active sessions ++ * are present. Counters have already been manually sampled. ++ */ ++ if (ipa_ctrl->num_active_sessions > 0) { ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(TIMER), ++ timer_value(ipa_ctrl->cur_gpu_rate)); ++ } + -+/* A mask of all currently reserved flags -+ */ -+#define BASE_MEM_FLAGS_RESERVED \ -+ BASE_MEM_RESERVED_BIT_8 | BASE_MEM_RESERVED_BIT_20 ++ spin_unlock(&ipa_ctrl->lock); + -+#define BASEP_MEM_INVALID_HANDLE (0ull << 12) -+#define BASE_MEM_MMU_DUMP_HANDLE (1ull << 12) -+#define BASE_MEM_TRACE_BUFFER_HANDLE (2ull << 12) -+#define BASE_MEM_MAP_TRACKING_HANDLE (3ull << 12) -+#define BASEP_MEM_WRITE_ALLOC_PAGES_HANDLE (4ull << 12) -+/* reserved handles ..-47< for future special handles */ -+#define BASEP_MEM_CSF_USER_REG_PAGE_HANDLE (47ul << 12) -+#define BASEP_MEM_CSF_USER_IO_PAGES_HANDLE (48ul << 12) -+#define BASE_MEM_COOKIE_BASE (64ul << 12) -+#define BASE_MEM_FIRST_FREE_ADDRESS ((BITS_PER_LONG << 12) + \ -+ BASE_MEM_COOKIE_BASE) ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } ++} + -+#define KBASE_CSF_NUM_USER_IO_PAGES_HANDLE \ -+ ((BASE_MEM_COOKIE_BASE - BASEP_MEM_CSF_USER_IO_PAGES_HANDLE) >> \ -+ LOCAL_PAGE_SHIFT) ++void kbase_ipa_control_init(struct kbase_device *kbdev) ++{ ++ struct kbase_ipa_control *ipa_ctrl = &kbdev->csf.ipa_control; ++ struct kbase_clk_rate_trace_manager *clk_rtm = &kbdev->pm.clk_rtm; ++ struct kbase_ipa_control_listener_data *listener_data; ++ size_t i, j; + -+/** -+ * Valid set of just-in-time memory allocation flags -+ */ -+#define BASE_JIT_ALLOC_VALID_FLAGS ((u8)0) ++ for (i = 0; i < KBASE_IPA_CORE_TYPE_NUM; i++) { ++ for (j = 0; j < KBASE_IPA_CONTROL_NUM_BLOCK_COUNTERS; j++) { ++ ipa_ctrl->blocks[i].select[j].idx = 0; ++ ipa_ctrl->blocks[i].select[j].refcount = 0; ++ } ++ ipa_ctrl->blocks[i].num_available_counters = ++ KBASE_IPA_CONTROL_NUM_BLOCK_COUNTERS; ++ } + -+/* Flags to pass to ::base_context_init. -+ * Flags can be ORed together to enable multiple things. -+ * -+ * These share the same space as BASEP_CONTEXT_FLAG_*, and so must -+ * not collide with them. -+ */ -+typedef u32 base_context_create_flags; ++ spin_lock_init(&ipa_ctrl->lock); ++ ipa_ctrl->num_active_sessions = 0; ++ for (i = 0; i < KBASE_IPA_CONTROL_MAX_SESSIONS; i++) ++ ipa_ctrl->sessions[i].active = false; + -+/* No flags set */ -+#define BASE_CONTEXT_CREATE_FLAG_NONE ((base_context_create_flags)0) ++ listener_data = kmalloc(sizeof(struct kbase_ipa_control_listener_data), ++ GFP_KERNEL); ++ if (listener_data) { ++ listener_data->listener.notify = ++ kbase_ipa_control_rate_change_notify; ++ listener_data->kbdev = kbdev; ++ ipa_ctrl->rtm_listener_data = listener_data; ++ } + -+/* Base context is embedded in a cctx object (flag used for CINSTR -+ * software counter macros) -+ */ -+#define BASE_CONTEXT_CCTX_EMBEDDED ((base_context_create_flags)1 << 0) ++ spin_lock(&clk_rtm->lock); ++ if (clk_rtm->clks[KBASE_CLOCK_DOMAIN_TOP]) ++ ipa_ctrl->cur_gpu_rate = ++ clk_rtm->clks[KBASE_CLOCK_DOMAIN_TOP]->clock_val; ++ if (listener_data) ++ kbase_clk_rate_trace_manager_subscribe_no_lock( ++ clk_rtm, &listener_data->listener); ++ spin_unlock(&clk_rtm->lock); ++} ++KBASE_EXPORT_TEST_API(kbase_ipa_control_init); + -+/* Base context is a 'System Monitor' context for Hardware counters. ++void kbase_ipa_control_term(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ struct kbase_clk_rate_trace_manager *clk_rtm = &kbdev->pm.clk_rtm; ++ struct kbase_ipa_control *ipa_ctrl = &kbdev->csf.ipa_control; ++ struct kbase_ipa_control_listener_data *listener_data = ++ ipa_ctrl->rtm_listener_data; ++ ++ WARN_ON(ipa_ctrl->num_active_sessions); ++ ++ if (listener_data) ++ kbase_clk_rate_trace_manager_unsubscribe(clk_rtm, &listener_data->listener); ++ kfree(ipa_ctrl->rtm_listener_data); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ if (kbdev->pm.backend.gpu_powered) ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(TIMER), 0); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++} ++KBASE_EXPORT_TEST_API(kbase_ipa_control_term); ++ ++/** session_read_raw_values - Read latest raw values for a sessions ++ * @kbdev: Pointer to kbase device. ++ * @session: Pointer to the session whose performance counters shall be read. + * -+ * One important side effect of this is that job submission is disabled. ++ * Read and update the latest raw values of all the performance counters ++ * belonging to a given session. + */ -+#define BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED \ -+ ((base_context_create_flags)1 << 1) ++static void session_read_raw_values(struct kbase_device *kbdev, ++ struct kbase_ipa_control_session *session) ++{ ++ size_t i; + -+/* Create CSF event thread. ++ lockdep_assert_held(&kbdev->csf.ipa_control.lock); ++ ++ for (i = 0; i < session->num_prfcnts; i++) { ++ struct kbase_ipa_control_prfcnt *prfcnt = &session->prfcnts[i]; ++ u64 raw_value = read_value_cnt(kbdev, (u8)prfcnt->type, ++ prfcnt->select_idx); ++ ++ prfcnt->latest_raw_value = raw_value; ++ } ++} ++ ++/** session_gpu_start - Start one or all sessions ++ * @kbdev: Pointer to kbase device. ++ * @ipa_ctrl: Pointer to IPA_CONTROL descriptor. ++ * @session: Pointer to the session to initialize, or NULL to initialize ++ * all sessions. ++ * ++ * This function starts one or all sessions by capturing a manual sample, ++ * reading the latest raw value of performance counters and possibly enabling ++ * the timer for automatic sampling if necessary. ++ * ++ * If a single session is given, it is assumed to be active, regardless of ++ * the number of active sessions. The number of performance counters belonging ++ * to the session shall be set in advance. ++ * ++ * If no session is given, the function shall start all sessions. ++ * The function does nothing if there are no active sessions. + * -+ * The creation of a CSF event thread is conditional and only allowed in -+ * unit tests for the moment, in order to avoid clashes with the existing -+ * Base unit tests. ++ * Return: 0 on success, or error code on failure. + */ -+#define BASE_CONTEXT_CSF_EVENT_THREAD ((base_context_create_flags)1 << 2) ++static int session_gpu_start(struct kbase_device *kbdev, ++ struct kbase_ipa_control *ipa_ctrl, ++ struct kbase_ipa_control_session *session) ++{ ++ bool first_start = ++ (session != NULL) && (ipa_ctrl->num_active_sessions == 0); ++ int ret = 0; + -+/* Bit-shift used to encode a memory group ID in base_context_create_flags -+ */ -+#define BASEP_CONTEXT_MMU_GROUP_ID_SHIFT (3) ++ lockdep_assert_held(&kbdev->csf.ipa_control.lock); + -+/* Bitmask used to encode a memory group ID in base_context_create_flags -+ */ -+#define BASEP_CONTEXT_MMU_GROUP_ID_MASK \ -+ ((base_context_create_flags)0xF << BASEP_CONTEXT_MMU_GROUP_ID_SHIFT) ++ /* ++ * Exit immediately if the caller intends to start all sessions ++ * but there are no active sessions. It's important that no operation ++ * is done on the IPA_CONTROL interface in that case. ++ */ ++ if (!session && ipa_ctrl->num_active_sessions == 0) ++ return ret; + -+/* Bitpattern describing the base_context_create_flags that can be -+ * passed to the kernel -+ */ -+#define BASEP_CONTEXT_CREATE_KERNEL_FLAGS \ -+ (BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED | \ -+ BASEP_CONTEXT_MMU_GROUP_ID_MASK) ++ /* ++ * Take a manual sample unconditionally if the caller intends ++ * to start all sessions. Otherwise, only take a manual sample ++ * if this is the first session to be initialized, for accumulator ++ * registers are empty and no timer has been configured for automatic ++ * sampling. ++ */ ++ if (!session || first_start) { ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(COMMAND), ++ COMMAND_SAMPLE); ++ ret = wait_status(kbdev, STATUS_COMMAND_ACTIVE); ++ if (ret) ++ dev_err(kbdev->dev, "%s: failed to sample new counters", ++ __func__); ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(TIMER), ++ timer_value(ipa_ctrl->cur_gpu_rate)); ++ } + -+/* Bitpattern describing the ::base_context_create_flags that can be -+ * passed to base_context_init() -+ */ -+#define BASEP_CONTEXT_CREATE_ALLOWED_FLAGS \ -+ (BASE_CONTEXT_CCTX_EMBEDDED | \ -+ BASE_CONTEXT_CSF_EVENT_THREAD | \ -+ BASEP_CONTEXT_CREATE_KERNEL_FLAGS) ++ /* ++ * Read current raw value to start the session. ++ * This is necessary to put the first query in condition ++ * to generate a correct value by calculating the difference ++ * from the beginning of the session. This consideration ++ * is true regardless of the number of sessions the caller ++ * intends to start. ++ */ ++ if (!ret) { ++ if (session) { ++ /* On starting a session, value read is required for ++ * IPA power model's calculation initialization. ++ */ ++ session_read_raw_values(kbdev, session); ++ } else { ++ size_t session_idx; + -+/* Enable additional tracepoints for latency measurements (TL_ATOM_READY, -+ * TL_ATOM_DONE, TL_ATOM_PRIO_CHANGE, TL_ATOM_EVENT_POST) -+ */ -+#define BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS (1 << 0) ++ for (session_idx = 0; ++ session_idx < KBASE_IPA_CONTROL_MAX_SESSIONS; ++ session_idx++) { ++ struct kbase_ipa_control_session *session_to_check = &ipa_ctrl->sessions[session_idx]; + -+/* Indicate that job dumping is enabled. This could affect certain timers -+ * to account for the performance impact. -+ */ -+#define BASE_TLSTREAM_JOB_DUMPING_ENABLED (1 << 1) ++ if (session_to_check->active) ++ session_read_raw_values(kbdev, session_to_check); ++ } ++ } ++ } + -+/* Enable KBase tracepoints for CSF builds */ -+#define BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS (1 << 2) ++ return ret; ++} + -+/* Enable additional CSF Firmware side tracepoints */ -+#define BASE_TLSTREAM_ENABLE_CSFFW_TRACEPOINTS (1 << 3) ++int kbase_ipa_control_register( ++ struct kbase_device *kbdev, ++ const struct kbase_ipa_control_perf_counter *perf_counters, ++ size_t num_counters, void **client) ++{ ++ int ret = 0; ++ size_t i, session_idx, req_counters[KBASE_IPA_CORE_TYPE_NUM]; ++ bool already_configured[KBASE_IPA_CONTROL_MAX_COUNTERS]; ++ bool new_config = false; ++ struct kbase_ipa_control *ipa_ctrl; ++ struct kbase_ipa_control_session *session = NULL; ++ unsigned long flags; + -+#define BASE_TLSTREAM_FLAGS_MASK (BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS | \ -+ BASE_TLSTREAM_JOB_DUMPING_ENABLED | \ -+ BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS | \ -+ BASE_TLSTREAM_ENABLE_CSFFW_TRACEPOINTS) ++ if (WARN_ON(unlikely(kbdev == NULL))) ++ return -ENODEV; + -+/* Number of pages mapped into the process address space for a bound GPU -+ * command queue. A pair of input/output pages and a Hw doorbell page -+ * are mapped to enable direct submission of commands to Hw. -+ */ -+#define BASEP_QUEUE_NR_MMAP_USER_PAGES ((size_t)3) ++ if (WARN_ON(perf_counters == NULL) || WARN_ON(client == NULL) || ++ WARN_ON(num_counters > KBASE_IPA_CONTROL_MAX_COUNTERS)) { ++ dev_err(kbdev->dev, "%s: wrong input arguments", __func__); ++ return -EINVAL; ++ } + -+#define BASE_QUEUE_MAX_PRIORITY (15U) ++ kbase_pm_context_active(kbdev); + -+/* CQS Sync object is an array of u32 event_mem[2], error field index is 1 */ -+#define BASEP_EVENT_VAL_INDEX (0U) -+#define BASEP_EVENT_ERR_INDEX (1U) ++ ipa_ctrl = &kbdev->csf.ipa_control; ++ spin_lock_irqsave(&ipa_ctrl->lock, flags); + -+/* The upper limit for number of objects that could be waited/set per command. -+ * This limit is now enforced as internally the error inherit inputs are -+ * converted to 32-bit flags in a u32 variable occupying a previously padding -+ * field. -+ */ -+#define BASEP_KCPU_CQS_MAX_NUM_OBJS ((size_t)32) ++ if (ipa_ctrl->num_active_sessions == KBASE_IPA_CONTROL_MAX_SESSIONS) { ++ dev_err(kbdev->dev, "%s: too many sessions", __func__); ++ ret = -EBUSY; ++ goto exit; ++ } + -+/** -+ * enum base_kcpu_command_type - Kernel CPU queue command type. -+ */ -+enum base_kcpu_command_type { -+ BASE_KCPU_COMMAND_TYPE_FENCE_SIGNAL, -+ BASE_KCPU_COMMAND_TYPE_FENCE_WAIT, -+ BASE_KCPU_COMMAND_TYPE_CQS_WAIT, -+ BASE_KCPU_COMMAND_TYPE_CQS_SET, -+ BASE_KCPU_COMMAND_TYPE_MAP_IMPORT, -+ BASE_KCPU_COMMAND_TYPE_UNMAP_IMPORT, -+ BASE_KCPU_COMMAND_TYPE_UNMAP_IMPORT_FORCE, -+ BASE_KCPU_COMMAND_TYPE_JIT_ALLOC, -+ BASE_KCPU_COMMAND_TYPE_JIT_FREE, -+ BASE_KCPU_COMMAND_TYPE_GROUP_SUSPEND, -+ BASE_KCPU_COMMAND_TYPE_ERROR_BARRIER, -+}; ++ for (i = 0; i < KBASE_IPA_CORE_TYPE_NUM; i++) ++ req_counters[i] = 0; + -+/** -+ * enum base_queue_group_priority - Priority of a GPU Command Queue Group. -+ * @BASE_QUEUE_GROUP_PRIORITY_HIGH: GPU Command Queue Group is of high -+ * priority. -+ * @BASE_QUEUE_GROUP_PRIORITY_MEDIUM: GPU Command Queue Group is of medium -+ * priority. -+ * @BASE_QUEUE_GROUP_PRIORITY_LOW: GPU Command Queue Group is of low -+ * priority. -+ * @BASE_QUEUE_GROUP_PRIORITY_COUNT: Number of GPU Command Queue Group -+ * priority levels. ++ /* ++ * Count how many counters would need to be configured in order to ++ * satisfy the request. Requested counters which happen to be already ++ * configured can be skipped. ++ */ ++ for (i = 0; i < num_counters; i++) { ++ size_t j; ++ enum kbase_ipa_core_type type = perf_counters[i].type; ++ u8 idx = perf_counters[i].idx; ++ ++ if ((type >= KBASE_IPA_CORE_TYPE_NUM) || ++ (idx >= KBASE_IPA_CONTROL_CNT_MAX_IDX)) { ++ dev_err(kbdev->dev, ++ "%s: invalid requested type %u and/or index %u", ++ __func__, type, idx); ++ ret = -EINVAL; ++ goto exit; ++ } ++ ++ for (j = 0; j < KBASE_IPA_CONTROL_NUM_BLOCK_COUNTERS; j++) { ++ struct kbase_ipa_control_prfcnt_config *prfcnt_config = ++ &ipa_ctrl->blocks[type].select[j]; ++ ++ if (prfcnt_config->refcount > 0) { ++ if (prfcnt_config->idx == idx) { ++ already_configured[i] = true; ++ break; ++ } ++ } ++ } ++ ++ if (j == KBASE_IPA_CONTROL_NUM_BLOCK_COUNTERS) { ++ already_configured[i] = false; ++ req_counters[type]++; ++ new_config = true; ++ } ++ } ++ ++ for (i = 0; i < KBASE_IPA_CORE_TYPE_NUM; i++) ++ if (req_counters[i] > ++ ipa_ctrl->blocks[i].num_available_counters) { ++ dev_err(kbdev->dev, ++ "%s: more counters (%zu) than available (%zu) have been requested for type %zu", ++ __func__, req_counters[i], ++ ipa_ctrl->blocks[i].num_available_counters, i); ++ ret = -EINVAL; ++ goto exit; ++ } ++ ++ /* ++ * The request has been validated. ++ * Firstly, find an available session and then set up the initial state ++ * of the session and update the configuration of performance counters ++ * in the internal state of kbase_ipa_control. ++ */ ++ for (session_idx = 0; session_idx < KBASE_IPA_CONTROL_MAX_SESSIONS; ++ session_idx++) { ++ if (!ipa_ctrl->sessions[session_idx].active) { ++ session = &ipa_ctrl->sessions[session_idx]; ++ break; ++ } ++ } ++ ++ if (!session) { ++ dev_err(kbdev->dev, "%s: wrong or corrupt session state", ++ __func__); ++ ret = -EBUSY; ++ goto exit; ++ } ++ ++ for (i = 0; i < num_counters; i++) { ++ struct kbase_ipa_control_prfcnt_config *prfcnt_config; ++ size_t j; ++ u8 type = perf_counters[i].type; ++ u8 idx = perf_counters[i].idx; ++ ++ for (j = 0; j < KBASE_IPA_CONTROL_NUM_BLOCK_COUNTERS; j++) { ++ prfcnt_config = &ipa_ctrl->blocks[type].select[j]; ++ ++ if (already_configured[i]) { ++ if ((prfcnt_config->refcount > 0) && ++ (prfcnt_config->idx == idx)) { ++ break; ++ } ++ } else { ++ if (prfcnt_config->refcount == 0) ++ break; ++ } ++ } ++ ++ if (WARN_ON((prfcnt_config->refcount > 0 && ++ prfcnt_config->idx != idx) || ++ (j == KBASE_IPA_CONTROL_NUM_BLOCK_COUNTERS))) { ++ dev_err(kbdev->dev, ++ "%s: invalid internal state: counter already configured or no counter available to configure", ++ __func__); ++ ret = -EBUSY; ++ goto exit; ++ } ++ ++ if (prfcnt_config->refcount == 0) { ++ prfcnt_config->idx = idx; ++ ipa_ctrl->blocks[type].num_available_counters--; ++ } ++ ++ session->prfcnts[i].accumulated_diff = 0; ++ session->prfcnts[i].type = type; ++ session->prfcnts[i].select_idx = j; ++ session->prfcnts[i].scaling_factor = ++ perf_counters[i].scaling_factor; ++ session->prfcnts[i].gpu_norm = perf_counters[i].gpu_norm; ++ ++ /* Reports to this client for GPU time spent in protected mode ++ * should begin from the point of registration. ++ */ ++ session->last_query_time = ktime_get_raw_ns(); ++ ++ /* Initially, no time has been spent in protected mode */ ++ session->protm_time = 0; ++ ++ prfcnt_config->refcount++; ++ } ++ ++ /* ++ * Apply new configuration, if necessary. ++ * As a temporary solution, make sure that the GPU is on ++ * before applying the new configuration. ++ */ ++ if (new_config) { ++ ret = update_select_registers(kbdev); ++ if (ret) ++ dev_err(kbdev->dev, ++ "%s: failed to apply new SELECT configuration", ++ __func__); ++ } ++ ++ if (!ret) { ++ session->num_prfcnts = num_counters; ++ ret = session_gpu_start(kbdev, ipa_ctrl, session); ++ } ++ ++ if (!ret) { ++ session->active = true; ++ ipa_ctrl->num_active_sessions++; ++ *client = session; ++ } ++ ++exit: ++ spin_unlock_irqrestore(&ipa_ctrl->lock, flags); ++ kbase_pm_context_idle(kbdev); ++ return ret; ++} ++KBASE_EXPORT_TEST_API(kbase_ipa_control_register); ++ ++int kbase_ipa_control_unregister(struct kbase_device *kbdev, const void *client) ++{ ++ struct kbase_ipa_control *ipa_ctrl; ++ struct kbase_ipa_control_session *session; ++ int ret = 0; ++ size_t i; ++ unsigned long flags; ++ bool new_config = false, valid_session = false; ++ ++ if (WARN_ON(unlikely(kbdev == NULL))) ++ return -ENODEV; ++ ++ if (WARN_ON(client == NULL)) { ++ dev_err(kbdev->dev, "%s: wrong input arguments", __func__); ++ return -EINVAL; ++ } ++ ++ kbase_pm_context_active(kbdev); ++ ++ ipa_ctrl = &kbdev->csf.ipa_control; ++ session = (struct kbase_ipa_control_session *)client; ++ ++ spin_lock_irqsave(&ipa_ctrl->lock, flags); ++ ++ for (i = 0; i < KBASE_IPA_CONTROL_MAX_SESSIONS; i++) { ++ if (session == &ipa_ctrl->sessions[i]) { ++ valid_session = true; ++ break; ++ } ++ } ++ ++ if (!valid_session) { ++ dev_err(kbdev->dev, "%s: invalid session handle", __func__); ++ ret = -EINVAL; ++ goto exit; ++ } ++ ++ if (ipa_ctrl->num_active_sessions == 0) { ++ dev_err(kbdev->dev, "%s: no active sessions found", __func__); ++ ret = -EINVAL; ++ goto exit; ++ } ++ ++ if (!session->active) { ++ dev_err(kbdev->dev, "%s: session is already inactive", ++ __func__); ++ ret = -EINVAL; ++ goto exit; ++ } ++ ++ for (i = 0; i < session->num_prfcnts; i++) { ++ struct kbase_ipa_control_prfcnt_config *prfcnt_config; ++ u8 type = session->prfcnts[i].type; ++ u8 idx = session->prfcnts[i].select_idx; ++ ++ prfcnt_config = &ipa_ctrl->blocks[type].select[idx]; ++ ++ if (!WARN_ON(prfcnt_config->refcount == 0)) { ++ prfcnt_config->refcount--; ++ if (prfcnt_config->refcount == 0) { ++ new_config = true; ++ ipa_ctrl->blocks[type].num_available_counters++; ++ } ++ } ++ } ++ ++ if (new_config) { ++ ret = update_select_registers(kbdev); ++ if (ret) ++ dev_err(kbdev->dev, ++ "%s: failed to apply SELECT configuration", ++ __func__); ++ } ++ ++ session->num_prfcnts = 0; ++ session->active = false; ++ ipa_ctrl->num_active_sessions--; ++ ++exit: ++ spin_unlock_irqrestore(&ipa_ctrl->lock, flags); ++ kbase_pm_context_idle(kbdev); ++ return ret; ++} ++KBASE_EXPORT_TEST_API(kbase_ipa_control_unregister); ++ ++int kbase_ipa_control_query(struct kbase_device *kbdev, const void *client, ++ u64 *values, size_t num_values, u64 *protected_time) ++{ ++ struct kbase_ipa_control *ipa_ctrl; ++ struct kbase_ipa_control_session *session; ++ size_t i; ++ unsigned long flags; ++ bool gpu_ready; ++ ++ if (WARN_ON(unlikely(kbdev == NULL))) ++ return -ENODEV; ++ ++ if (WARN_ON(client == NULL) || WARN_ON(values == NULL)) { ++ dev_err(kbdev->dev, "%s: wrong input arguments", __func__); ++ return -EINVAL; ++ } ++ ++ ipa_ctrl = &kbdev->csf.ipa_control; ++ session = (struct kbase_ipa_control_session *)client; ++ ++ if (!session->active) { ++ dev_err(kbdev->dev, ++ "%s: attempt to query inactive session", __func__); ++ return -EINVAL; ++ } ++ ++ if (WARN_ON(num_values < session->num_prfcnts)) { ++ dev_err(kbdev->dev, ++ "%s: not enough space (%zu) to return all counter values (%zu)", ++ __func__, num_values, session->num_prfcnts); ++ return -EINVAL; ++ } ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ gpu_ready = kbdev->pm.backend.gpu_ready; ++ ++ for (i = 0; i < session->num_prfcnts; i++) { ++ struct kbase_ipa_control_prfcnt *prfcnt = &session->prfcnts[i]; ++ ++ calc_prfcnt_delta(kbdev, prfcnt, gpu_ready); ++ /* Return all the accumulated difference */ ++ values[i] = prfcnt->accumulated_diff; ++ prfcnt->accumulated_diff = 0; ++ } ++ ++ if (protected_time) { ++ u64 time_now = ktime_get_raw_ns(); ++ ++ /* This is the amount of protected-mode time spent prior to ++ * the current protm period. ++ */ ++ *protected_time = session->protm_time; ++ ++ if (kbdev->protected_mode) { ++ *protected_time += ++ time_now - MAX(session->last_query_time, ++ ipa_ctrl->protm_start); ++ } ++ session->last_query_time = time_now; ++ session->protm_time = 0; ++ } ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ for (i = session->num_prfcnts; i < num_values; i++) ++ values[i] = 0; ++ ++ return 0; ++} ++KBASE_EXPORT_TEST_API(kbase_ipa_control_query); ++ ++void kbase_ipa_control_handle_gpu_power_off(struct kbase_device *kbdev) ++{ ++ struct kbase_ipa_control *ipa_ctrl = &kbdev->csf.ipa_control; ++ size_t session_idx; ++ int ret; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ /* GPU should still be ready for use when this function gets called */ ++ WARN_ON(!kbdev->pm.backend.gpu_ready); ++ ++ /* Interrupts are already disabled and interrupt state is also saved */ ++ spin_lock(&ipa_ctrl->lock); ++ ++ /* First disable the automatic sampling through TIMER */ ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(TIMER), 0); ++ ret = wait_status(kbdev, STATUS_TIMER_ENABLED); ++ if (ret) { ++ dev_err(kbdev->dev, ++ "Wait for disabling of IPA control timer failed: %d", ++ ret); ++ } ++ ++ /* Now issue the manual SAMPLE command */ ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(COMMAND), COMMAND_SAMPLE); ++ ret = wait_status(kbdev, STATUS_COMMAND_ACTIVE); ++ if (ret) { ++ dev_err(kbdev->dev, ++ "Wait for the completion of manual sample failed: %d", ++ ret); ++ } ++ ++ for (session_idx = 0; session_idx < KBASE_IPA_CONTROL_MAX_SESSIONS; ++ session_idx++) { ++ ++ struct kbase_ipa_control_session *session = ++ &ipa_ctrl->sessions[session_idx]; ++ ++ if (session->active) { ++ size_t i; ++ ++ for (i = 0; i < session->num_prfcnts; i++) { ++ struct kbase_ipa_control_prfcnt *prfcnt = ++ &session->prfcnts[i]; ++ ++ calc_prfcnt_delta(kbdev, prfcnt, true); ++ } ++ } ++ } ++ spin_unlock(&ipa_ctrl->lock); ++} ++ ++void kbase_ipa_control_handle_gpu_power_on(struct kbase_device *kbdev) ++{ ++ struct kbase_ipa_control *ipa_ctrl = &kbdev->csf.ipa_control; ++ int ret; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ /* GPU should have become ready for use when this function gets called */ ++ WARN_ON(!kbdev->pm.backend.gpu_ready); ++ ++ /* Interrupts are already disabled and interrupt state is also saved */ ++ spin_lock(&ipa_ctrl->lock); ++ ++ ret = update_select_registers(kbdev); ++ if (ret) { ++ dev_err(kbdev->dev, ++ "Failed to reconfigure the select registers: %d", ret); ++ } ++ ++ /* Accumulator registers would not contain any sample after GPU power ++ * cycle if the timer has not been enabled first. Initialize all sessions. ++ */ ++ ret = session_gpu_start(kbdev, ipa_ctrl, NULL); ++ ++ spin_unlock(&ipa_ctrl->lock); ++} ++ ++void kbase_ipa_control_handle_gpu_reset_pre(struct kbase_device *kbdev) ++{ ++ /* A soft reset is treated as a power down */ ++ kbase_ipa_control_handle_gpu_power_off(kbdev); ++} ++KBASE_EXPORT_TEST_API(kbase_ipa_control_handle_gpu_reset_pre); ++ ++void kbase_ipa_control_handle_gpu_reset_post(struct kbase_device *kbdev) ++{ ++ struct kbase_ipa_control *ipa_ctrl = &kbdev->csf.ipa_control; ++ int ret; ++ u32 status; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ /* GPU should have become ready for use when this function gets called */ ++ WARN_ON(!kbdev->pm.backend.gpu_ready); ++ ++ /* Interrupts are already disabled and interrupt state is also saved */ ++ spin_lock(&ipa_ctrl->lock); ++ ++ /* Check the status reset bit is set before acknowledging it */ ++ status = kbase_reg_read(kbdev, IPA_CONTROL_REG(STATUS)); ++ if (status & STATUS_RESET) { ++ /* Acknowledge the reset command */ ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(COMMAND), COMMAND_RESET_ACK); ++ ret = wait_status(kbdev, STATUS_RESET); ++ if (ret) { ++ dev_err(kbdev->dev, ++ "Wait for the reset ack command failed: %d", ++ ret); ++ } ++ } ++ ++ spin_unlock(&ipa_ctrl->lock); ++ ++ kbase_ipa_control_handle_gpu_power_on(kbdev); ++} ++KBASE_EXPORT_TEST_API(kbase_ipa_control_handle_gpu_reset_post); ++ ++#ifdef KBASE_PM_RUNTIME ++void kbase_ipa_control_handle_gpu_sleep_enter(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ if (kbdev->pm.backend.mcu_state == KBASE_MCU_IN_SLEEP) { ++ /* GPU Sleep is treated as a power down */ ++ kbase_ipa_control_handle_gpu_power_off(kbdev); ++ ++ /* SELECT_CSHW register needs to be cleared to prevent any ++ * IPA control message to be sent to the top level GPU HWCNT. ++ */ ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(SELECT_CSHW_LO), 0); ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(SELECT_CSHW_HI), 0); ++ ++ /* No need to issue the APPLY command here */ ++ } ++} ++KBASE_EXPORT_TEST_API(kbase_ipa_control_handle_gpu_sleep_enter); ++ ++void kbase_ipa_control_handle_gpu_sleep_exit(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ if (kbdev->pm.backend.mcu_state == KBASE_MCU_IN_SLEEP) { ++ /* To keep things simple, currently exit from ++ * GPU Sleep is treated as a power on event where ++ * all 4 SELECT registers are reconfigured. ++ * On exit from sleep, reconfiguration is needed ++ * only for the SELECT_CSHW register. ++ */ ++ kbase_ipa_control_handle_gpu_power_on(kbdev); ++ } ++} ++KBASE_EXPORT_TEST_API(kbase_ipa_control_handle_gpu_sleep_exit); ++#endif ++ ++#if MALI_UNIT_TEST ++void kbase_ipa_control_rate_change_notify_test(struct kbase_device *kbdev, ++ u32 clk_index, u32 clk_rate_hz) ++{ ++ struct kbase_ipa_control *ipa_ctrl = &kbdev->csf.ipa_control; ++ struct kbase_ipa_control_listener_data *listener_data = ++ ipa_ctrl->rtm_listener_data; ++ ++ kbase_ipa_control_rate_change_notify(&listener_data->listener, ++ clk_index, clk_rate_hz); ++} ++KBASE_EXPORT_TEST_API(kbase_ipa_control_rate_change_notify_test); ++#endif ++ ++void kbase_ipa_control_protm_entered(struct kbase_device *kbdev) ++{ ++ struct kbase_ipa_control *ipa_ctrl = &kbdev->csf.ipa_control; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ipa_ctrl->protm_start = ktime_get_raw_ns(); ++} ++ ++void kbase_ipa_control_protm_exited(struct kbase_device *kbdev) ++{ ++ struct kbase_ipa_control *ipa_ctrl = &kbdev->csf.ipa_control; ++ size_t i; ++ u64 time_now = ktime_get_raw_ns(); ++ u32 status; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ for (i = 0; i < KBASE_IPA_CONTROL_MAX_SESSIONS; i++) { ++ ++ struct kbase_ipa_control_session *session = ++ &ipa_ctrl->sessions[i]; ++ ++ if (session->active) { ++ u64 protm_time = time_now - MAX(session->last_query_time, ++ ipa_ctrl->protm_start); ++ ++ session->protm_time += protm_time; ++ } ++ } ++ ++ /* Acknowledge the protected_mode bit in the IPA_CONTROL STATUS ++ * register ++ */ ++ status = kbase_reg_read(kbdev, IPA_CONTROL_REG(STATUS)); ++ if (status & STATUS_PROTECTED_MODE) { ++ int ret; ++ ++ /* Acknowledge the protm command */ ++ kbase_reg_write(kbdev, IPA_CONTROL_REG(COMMAND), ++ COMMAND_PROTECTED_ACK); ++ ret = wait_status(kbdev, STATUS_PROTECTED_MODE); ++ if (ret) { ++ dev_err(kbdev->dev, ++ "Wait for the protm ack command failed: %d", ++ ret); ++ } ++ } ++} ++ +diff --git a/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.h b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.h +new file mode 100644 +index 000000000..69ff8973b +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.h +@@ -0,0 +1,271 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* + * -+ * Currently this is in order of highest to lowest, but if new levels are added -+ * then those new levels may be out of order to preserve the ABI compatibility -+ * with previous releases. At that point, ensure assignment to -+ * the 'priority' member in &kbase_queue_group is updated to ensure it remains -+ * a linear ordering. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * There should be no gaps in the enum, otherwise use of -+ * BASE_QUEUE_GROUP_PRIORITY_COUNT in kbase must be updated. + */ -+enum base_queue_group_priority { -+ BASE_QUEUE_GROUP_PRIORITY_HIGH = 0, -+ BASE_QUEUE_GROUP_PRIORITY_MEDIUM, -+ BASE_QUEUE_GROUP_PRIORITY_LOW, -+ BASE_QUEUE_GROUP_PRIORITY_COUNT -+}; -+ -+struct base_kcpu_command_fence_info { -+ u64 fence; -+}; + -+struct base_cqs_wait { -+ u64 addr; -+ u32 val; -+ u32 padding; -+}; ++#ifndef _KBASE_CSF_IPA_CONTROL_H_ ++#define _KBASE_CSF_IPA_CONTROL_H_ + -+struct base_kcpu_command_cqs_wait_info { -+ u64 objs; -+ u32 nr_objs; -+ u32 inherit_err_flags; -+}; ++#include + -+struct base_cqs_set { -+ u64 addr; -+}; ++/* ++ * Maximum index accepted to configure an IPA Control performance counter. ++ */ ++#define KBASE_IPA_CONTROL_CNT_MAX_IDX ((u8)64 * 3) + -+struct base_kcpu_command_cqs_set_info { -+ u64 objs; -+ u32 nr_objs; -+ u32 propagate_flags; ++/** ++ * struct kbase_ipa_control_perf_counter - Performance counter description ++ * ++ * @scaling_factor: Scaling factor by which the counter's value shall be ++ * multiplied. A scaling factor of 1 corresponds to units ++ * of 1 second if values are normalised by GPU frequency. ++ * @gpu_norm: Indicating whether counter values shall be normalized by ++ * GPU frequency. If true, returned values represent ++ * an interval of time expressed in seconds (when the scaling ++ * factor is set to 1). ++ * @type: Type of counter block for performance counter. ++ * @idx: Index of the performance counter inside the block. ++ * It may be dependent on GPU architecture. ++ * It cannot be greater than KBASE_IPA_CONTROL_CNT_MAX_IDX. ++ * ++ * This structure is used by clients of the IPA Control component to describe ++ * a performance counter that they intend to read. The counter is identified ++ * by block and index. In addition to that, the client also specifies how ++ * values shall be represented. Raw values are a number of GPU cycles; ++ * if normalized, they are divided by GPU frequency and become an interval ++ * of time expressed in seconds, since the GPU frequency is given in Hz. ++ * The client may specify a scaling factor to multiply counter values before ++ * they are divided by frequency, in case the unit of time of 1 second is ++ * too low in resolution. For instance: a scaling factor of 1000 implies ++ * that the returned value is a time expressed in milliseconds; a scaling ++ * factor of 1000 * 1000 implies that the returned value is a time expressed ++ * in microseconds. ++ */ ++struct kbase_ipa_control_perf_counter { ++ u64 scaling_factor; ++ bool gpu_norm; ++ enum kbase_ipa_core_type type; ++ u8 idx; +}; + +/** -+ * struct base_kcpu_command_import_info - structure which contains information -+ * about the imported buffer. ++ * kbase_ipa_control_init - Initialize the IPA Control component + * -+ * @handle: Address of imported user buffer. ++ * @kbdev: Pointer to Kbase device. + */ -+struct base_kcpu_command_import_info { -+ u64 handle; -+}; ++void kbase_ipa_control_init(struct kbase_device *kbdev); + +/** -+ * struct base_kcpu_command_jit_alloc_info - structure which contains -+ * information about jit memory allocation. ++ * kbase_ipa_control_term - Terminate the IPA Control component + * -+ * @info: An array of elements of the -+ * struct base_jit_alloc_info type. -+ * @count: The number of elements in the info array. -+ * @padding: Padding to a multiple of 64 bits. ++ * @kbdev: Pointer to Kbase device. + */ -+struct base_kcpu_command_jit_alloc_info { -+ u64 info; -+ u8 count; -+ u8 padding[7]; -+}; ++void kbase_ipa_control_term(struct kbase_device *kbdev); + +/** -+ * struct base_kcpu_command_jit_free_info - structure which contains -+ * information about jit memory which is to be freed. ++ * kbase_ipa_control_register - Register a client to the IPA Control component + * -+ * @ids: An array containing the JIT IDs to free. -+ * @count: The number of elements in the ids array. -+ * @padding: Padding to a multiple of 64 bits. ++ * @kbdev: Pointer to Kbase device. ++ * @perf_counters: Array of performance counters the client intends to read. ++ * For each counter the client specifies block, index, ++ * scaling factor and whether it must be normalized by GPU ++ * frequency. ++ * @num_counters: Number of performance counters. It cannot exceed the total ++ * number of counters that exist on the IPA Control interface. ++ * @client: Handle to an opaque structure set by IPA Control if ++ * the registration is successful. This handle identifies ++ * a client's session and shall be provided in its future ++ * queries. ++ * ++ * A client needs to subscribe to the IPA Control component by declaring which ++ * performance counters it intends to read, and specifying a scaling factor ++ * and whether normalization is requested for each performance counter. ++ * The function shall configure the IPA Control interface accordingly and start ++ * a session for the client that made the request. A unique handle is returned ++ * if registration is successful in order to identify the client's session ++ * and be used for future queries. ++ * ++ * Return: 0 on success, negative -errno on error + */ -+struct base_kcpu_command_jit_free_info { -+ u64 ids; -+ u8 count; -+ u8 padding[7]; -+}; ++int kbase_ipa_control_register( ++ struct kbase_device *kbdev, ++ const struct kbase_ipa_control_perf_counter *perf_counters, ++ size_t num_counters, void **client); + +/** -+ * struct base_kcpu_command_group_suspend_info - structure which contains -+ * suspend buffer data captured for a suspended queue group. ++ * kbase_ipa_control_unregister - Unregister a client from IPA Control + * -+ * @buffer: Pointer to an array of elements of the type char. -+ * @size: Number of elements in the @buffer array. -+ * @group_handle: Handle to the mapping of command stream group. -+ * @padding: padding to a multiple of 64 bits. ++ * @kbdev: Pointer to kbase device. ++ * @client: Handle to an opaque structure that identifies the client session ++ * to terminate, as returned by kbase_ipa_control_register. ++ * ++ * Return: 0 on success, negative -errno on error + */ -+struct base_kcpu_command_group_suspend_info { -+ u64 buffer; -+ u32 size; -+ u8 group_handle; -+ u8 padding[3]; -+}; ++int kbase_ipa_control_unregister(struct kbase_device *kbdev, ++ const void *client); ++ ++/** ++ * kbase_ipa_control_query - Query performance counters ++ * ++ * @kbdev: Pointer to kbase device. ++ * @client: Handle to an opaque structure that identifies the client ++ * session, as returned by kbase_ipa_control_register. ++ * @values: Array of values queried from performance counters, whose ++ * length depends on the number of counters requested at ++ * the time of registration. Values are scaled and normalized ++ * and represent the difference since the last query. ++ * @num_values: Number of entries in the array of values that has been ++ * passed by the caller. It must be at least equal to the ++ * number of performance counters the client registered itself ++ * to read. ++ * @protected_time: Time spent in protected mode since last query, ++ * expressed in nanoseconds. This pointer may be NULL if the ++ * client doesn't want to know about this. ++ * ++ * A client that has already opened a session by registering itself to read ++ * some performance counters may use this function to query the values of ++ * those counters. The values returned are normalized by GPU frequency if ++ * requested and then multiplied by the scaling factor provided at the time ++ * of registration. Values always represent a difference since the last query. ++ * ++ * Performance counters are not updated while the GPU operates in protected ++ * mode. For this reason, returned values may be unreliable if the GPU has ++ * been in protected mode since the last query. The function returns success ++ * in that case, but it also gives a measure of how much time has been spent ++ * in protected mode. ++ * ++ * Return: 0 on success, negative -errno on error ++ */ ++int kbase_ipa_control_query(struct kbase_device *kbdev, const void *client, ++ u64 *values, size_t num_values, ++ u64 *protected_time); + +/** -+ * struct base_kcpu_command - kcpu command. ++ * kbase_ipa_control_handle_gpu_power_on - Handle the GPU power on event + * -+ * @type: type of the kcpu command, one enum base_kcpu_command_type -+ * @info: structure which contains information about the kcpu command; -+ * actual type is determined by @p type -+ * @padding: padding to a multiple of 64 bits ++ * @kbdev: Pointer to kbase device. ++ * ++ * This function is called after GPU has been powered and is ready for use. ++ * After the GPU power on, IPA Control component needs to ensure that the ++ * counters start incrementing again. + */ -+struct base_kcpu_command { -+ u8 type; -+ u8 padding[sizeof(u64) - sizeof(u8)]; -+ union { -+ struct base_kcpu_command_fence_info fence; -+ struct base_kcpu_command_cqs_wait_info cqs_wait; -+ struct base_kcpu_command_cqs_set_info cqs_set; -+ struct base_kcpu_command_import_info import; -+ struct base_kcpu_command_jit_alloc_info jit_alloc; -+ struct base_kcpu_command_jit_free_info jit_free; -+ struct base_kcpu_command_group_suspend_info suspend_buf_copy; -+ u64 padding[2]; /* No sub-struct should be larger */ -+ } info; -+}; ++void kbase_ipa_control_handle_gpu_power_on(struct kbase_device *kbdev); + +/** -+ * struct basep_cs_stream_control - Command Stream interface capabilities. ++ * kbase_ipa_control_handle_gpu_power_off - Handle the GPU power off event + * -+ * @features: Features of this stream -+ * @padding: Padding to a multiple of 64 bits. ++ * @kbdev: Pointer to kbase device. ++ * ++ * This function is called just before the GPU is powered off when it is still ++ * ready for use. ++ * IPA Control component needs to be aware of the GPU power off so that it can ++ * handle the query from Clients appropriately and return meaningful values ++ * to them. + */ -+struct basep_cs_stream_control { -+ u32 features; -+ u32 padding; -+}; ++void kbase_ipa_control_handle_gpu_power_off(struct kbase_device *kbdev); + +/** -+ * struct basep_cs_group_control - Command Stream Group interface capabilities. ++ * kbase_ipa_control_handle_gpu_reset_pre - Handle the pre GPU reset event + * -+ * @features: Features of this group -+ * @stream_num: Number of streams in this group -+ * @suspend_size: Size in bytes of the suspend buffer for this group -+ * @padding: Padding to a multiple of 64 bits. ++ * @kbdev: Pointer to kbase device. ++ * ++ * This function is called when the GPU is about to be reset. + */ -+struct basep_cs_group_control { -+ u32 features; -+ u32 stream_num; -+ u32 suspend_size; -+ u32 padding; -+}; ++void kbase_ipa_control_handle_gpu_reset_pre(struct kbase_device *kbdev); + +/** -+ * struct base_gpu_queue_group_error_fatal_payload - Unrecoverable fault -+ * error information associated with GPU command queue group. ++ * kbase_ipa_control_handle_gpu_reset_post - Handle the post GPU reset event + * -+ * @sideband: Additional information of the unrecoverable fault. -+ * @status: Unrecoverable fault information. -+ * This consists of exception type (least significant byte) and -+ * data (remaining bytes). One example of exception type is -+ * CS_INVALID_INSTRUCTION (0x49). -+ * @padding: Padding to make multiple of 64bits ++ * @kbdev: Pointer to kbase device. ++ * ++ * This function is called after the GPU has been reset. + */ -+struct base_gpu_queue_group_error_fatal_payload { -+ u64 sideband; -+ u32 status; -+ u32 padding; -+}; ++void kbase_ipa_control_handle_gpu_reset_post(struct kbase_device *kbdev); + ++#ifdef KBASE_PM_RUNTIME +/** -+ * struct base_gpu_queue_error_fatal_payload - Unrecoverable fault -+ * error information related to GPU command queue. ++ * kbase_ipa_control_handle_gpu_sleep_enter - Handle the pre GPU Sleep event + * -+ * @sideband: Additional information about this unrecoverable fault. -+ * @status: Unrecoverable fault information. -+ * This consists of exception type (least significant byte) and -+ * data (remaining bytes). One example of exception type is -+ * CS_INVALID_INSTRUCTION (0x49). -+ * @csi_index: Index of the CSF interface the queue is bound to. -+ * @padding: Padding to make multiple of 64bits ++ * @kbdev: Pointer to kbase device. ++ * ++ * This function is called after MCU has been put to sleep state & L2 cache has ++ * been powered down. The top level part of GPU is still powered up when this ++ * function is called. + */ -+struct base_gpu_queue_error_fatal_payload { -+ u64 sideband; -+ u32 status; -+ u8 csi_index; -+ u8 padding[3]; -+}; ++void kbase_ipa_control_handle_gpu_sleep_enter(struct kbase_device *kbdev); + +/** -+ * enum base_gpu_queue_group_error_type - GPU Fatal error type. ++ * kbase_ipa_control_handle_gpu_sleep_exit - Handle the post GPU Sleep event + * -+ * @BASE_GPU_QUEUE_GROUP_ERROR_FATAL: Fatal error associated with GPU -+ * command queue group. -+ * @BASE_GPU_QUEUE_GROUP_QUEUE_ERROR_FATAL: Fatal error associated with GPU -+ * command queue. -+ * @BASE_GPU_QUEUE_GROUP_ERROR_TIMEOUT: Fatal error associated with -+ * progress timeout. -+ * @BASE_GPU_QUEUE_GROUP_ERROR_TILER_HEAP_OOM: Fatal error due to running out -+ * of tiler heap memory. -+ * @BASE_GPU_QUEUE_GROUP_ERROR_FATAL_COUNT: The number of fatal error types ++ * @kbdev: Pointer to kbase device. + * -+ * This type is used for &struct_base_gpu_queue_group_error.error_type. ++ * This function is called when L2 needs to be powered up and MCU can exit the ++ * sleep state. The top level part of GPU is powered up when this function is ++ * called. ++ * ++ * This function must be called only if kbase_ipa_control_handle_gpu_sleep_enter() ++ * was called previously. + */ -+enum base_gpu_queue_group_error_type { -+ BASE_GPU_QUEUE_GROUP_ERROR_FATAL = 0, -+ BASE_GPU_QUEUE_GROUP_QUEUE_ERROR_FATAL, -+ BASE_GPU_QUEUE_GROUP_ERROR_TIMEOUT, -+ BASE_GPU_QUEUE_GROUP_ERROR_TILER_HEAP_OOM, -+ BASE_GPU_QUEUE_GROUP_ERROR_FATAL_COUNT -+}; ++void kbase_ipa_control_handle_gpu_sleep_exit(struct kbase_device *kbdev); ++#endif + ++#if MALI_UNIT_TEST +/** -+ * struct base_gpu_queue_group_error - Unrecoverable fault information ++ * kbase_ipa_control_rate_change_notify_test - Notify GPU rate change ++ * (only for testing) + * -+ * @error_type: Error type of @base_gpu_queue_group_error_type -+ * indicating which field in union payload is filled -+ * @padding: Unused bytes for 64bit boundary -+ * @fatal_group: Unrecoverable fault error associated with -+ * GPU command queue group -+ * @fatal_queue: Unrecoverable fault error associated with command queue ++ * @kbdev: Pointer to kbase device. ++ * @clk_index: Index of the clock for which the change has occurred. ++ * @clk_rate_hz: Clock frequency(Hz). + * -+ * @payload: Input Payload ++ * Notify the IPA Control component about a GPU rate change. + */ -+struct base_gpu_queue_group_error { -+ u8 error_type; -+ u8 padding[7]; -+ union { -+ struct base_gpu_queue_group_error_fatal_payload fatal_group; -+ struct base_gpu_queue_error_fatal_payload fatal_queue; -+ } payload; -+}; ++void kbase_ipa_control_rate_change_notify_test(struct kbase_device *kbdev, ++ u32 clk_index, u32 clk_rate_hz); ++#endif /* MALI_UNIT_TEST */ + +/** -+ * enum base_csf_notification_type - Notification type ++ * kbase_ipa_control_protm_entered - Tell IPA_CONTROL that protected mode ++ * has been entered. + * -+ * @BASE_CSF_NOTIFICATION_EVENT: Notification with kernel event -+ * @BASE_CSF_NOTIFICATION_GPU_QUEUE_GROUP_ERROR: Notification with GPU fatal -+ * error -+ * @BASE_CSF_NOTIFICATION_COUNT: The number of notification type ++ * @kbdev: Pointer to kbase device. + * -+ * This type is used for &struct_base_csf_notification.type. ++ * This function provides a means through which IPA_CONTROL can be informed ++ * that the GPU has entered protected mode. Since the GPU cannot access ++ * performance counters while in this mode, this information is useful as ++ * it implies (a) the values of these registers cannot change, so theres no ++ * point trying to read them, and (b) IPA_CONTROL has a means through which ++ * to record the duration of time the GPU is in protected mode, which can ++ * then be forwarded on to clients, who may wish, for example, to assume ++ * that the GPU was busy 100% of the time while in this mode. + */ -+enum base_csf_notification_type { -+ BASE_CSF_NOTIFICATION_EVENT = 0, -+ BASE_CSF_NOTIFICATION_GPU_QUEUE_GROUP_ERROR, -+ BASE_CSF_NOTIFICATION_COUNT -+}; ++void kbase_ipa_control_protm_entered(struct kbase_device *kbdev); + +/** -+ * struct base_csf_notification - Event or error notification ++ * kbase_ipa_control_protm_exited - Tell IPA_CONTROL that protected mode ++ * has been exited. + * -+ * @type: Notification type of @base_csf_notification_type -+ * @padding: Padding for 64bit boundary -+ * @handle: Handle of GPU command queue group associated with fatal error -+ * @error: Unrecoverable fault error -+ * @align: To fit the struct into a 64-byte cache line ++ * @kbdev: Pointer to kbase device + * -+ * @payload: Input Payload ++ * This function provides a means through which IPA_CONTROL can be informed ++ * that the GPU has exited from protected mode. + */ -+struct base_csf_notification { -+ u8 type; -+ u8 padding[7]; -+ union { -+ struct { -+ u8 handle; -+ u8 padding[7]; -+ struct base_gpu_queue_group_error error; -+ } csg_error; -+ u8 align[56]; -+ } payload; -+}; ++void kbase_ipa_control_protm_exited(struct kbase_device *kbdev); + -+#endif /* _BASE_CSF_KERNEL_H_ */ -diff --git a/drivers/gpu/arm/bifrost/csf/mali_gpu_csf_control_registers.h b/drivers/gpu/arm/bifrost/csf/mali_gpu_csf_control_registers.h ++#endif /* _KBASE_CSF_IPA_CONTROL_H_ */ +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c new file mode 100755 -index 000000000000..4fff80ca4023 +index 000000000..7a939fc33 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/csf/mali_gpu_csf_control_registers.h -@@ -0,0 +1,33 @@ ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c +@@ -0,0 +1,3289 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -155813,1763 +165907,507 @@ index 000000000000..4fff80ca4023 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+/* -+ * This header was autogenerated, it should not be edited. -+ */ ++#include ++#include ++#include ++#include "mali_kbase_csf.h" ++#include "backend/gpu/mali_kbase_pm_internal.h" ++#include ++#include ++#include ++#include ++#include "mali_kbase_csf_tiler_heap.h" ++#include ++#include "mali_kbase_csf_timeout.h" ++#include ++#include ++#include "mali_kbase_csf_event.h" ++#include ++#include "mali_kbase_csf_mcu_shared_reg.h" + -+#ifndef _GPU_CSF_CONTROL_REGISTERS_H_ -+#define _GPU_CSF_CONTROL_REGISTERS_H_ ++#define CS_REQ_EXCEPTION_MASK (CS_REQ_FAULT_MASK | CS_REQ_FATAL_MASK) ++#define CS_ACK_EXCEPTION_MASK (CS_ACK_FAULT_MASK | CS_ACK_FATAL_MASK) + -+/* GPU_REGISTERS register offsets */ -+#define GPU_CONTROL_MCU 0x3000 /* () MCU control registers */ ++#define CS_RING_BUFFER_MAX_SIZE ((uint32_t)(1 << 31)) /* 2GiB */ ++#define CS_RING_BUFFER_MIN_SIZE ((uint32_t)4096) ++ ++#define PROTM_ALLOC_MAX_RETRIES ((u8)5) ++ ++const u8 kbasep_csf_queue_group_priority_to_relative[BASE_QUEUE_GROUP_PRIORITY_COUNT] = { ++ KBASE_QUEUE_GROUP_PRIORITY_HIGH, ++ KBASE_QUEUE_GROUP_PRIORITY_MEDIUM, ++ KBASE_QUEUE_GROUP_PRIORITY_LOW, ++ KBASE_QUEUE_GROUP_PRIORITY_REALTIME ++}; ++const u8 kbasep_csf_relative_to_queue_group_priority[KBASE_QUEUE_GROUP_PRIORITY_COUNT] = { ++ BASE_QUEUE_GROUP_PRIORITY_REALTIME, ++ BASE_QUEUE_GROUP_PRIORITY_HIGH, ++ BASE_QUEUE_GROUP_PRIORITY_MEDIUM, ++ BASE_QUEUE_GROUP_PRIORITY_LOW ++}; + -+#endif /* _GPU_CSF_CONTROL_REGISTERS_H_ */ -diff --git a/drivers/gpu/arm/bifrost/csf/mali_gpu_csf_registers.h b/drivers/gpu/arm/bifrost/csf/mali_gpu_csf_registers.h -new file mode 100755 -index 000000000000..5c03445f3c79 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/csf/mali_gpu_csf_registers.h -@@ -0,0 +1,1252 @@ +/* ++ * struct irq_idle_and_protm_track - Object that tracks the idle and protected mode ++ * request information in an interrupt case across ++ * groups. + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * @protm_grp: Possibly schedulable group that requested protected mode in the interrupt. ++ * If NULL, no such case observed in the tracked interrupt case. ++ * @idle_seq: The highest priority group that notified idle. If no such instance in the ++ * interrupt case, marked with the largest field value: U32_MAX. ++ * @idle_slot: The slot number if @p idle_seq is valid in the given tracking case. ++ */ ++struct irq_idle_and_protm_track { ++ struct kbase_queue_group *protm_grp; ++ u32 idle_seq; ++ s8 idle_slot; ++}; ++ ++/** ++ * kbasep_ctx_user_reg_page_mapping_term() - Terminate resources for USER Register Page. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * @kctx: Pointer to the kbase context ++ */ ++static void kbasep_ctx_user_reg_page_mapping_term(struct kbase_context *kctx) ++{ ++ struct kbase_device *kbdev = kctx->kbdev; ++ ++ if (unlikely(kctx->csf.user_reg.vma)) ++ dev_err(kbdev->dev, "VMA for USER Register page exist on termination of ctx %d_%d", ++ kctx->tgid, kctx->id); ++ if (WARN_ON_ONCE(!list_empty(&kctx->csf.user_reg.link))) ++ list_del_init(&kctx->csf.user_reg.link); ++} ++ ++/** ++ * kbasep_ctx_user_reg_page_mapping_init() - Initialize resources for USER Register Page. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ * @kctx: Pointer to the kbase context + * ++ * @return: 0 on success. + */ ++static int kbasep_ctx_user_reg_page_mapping_init(struct kbase_context *kctx) ++{ ++ INIT_LIST_HEAD(&kctx->csf.user_reg.link); ++ kctx->csf.user_reg.vma = NULL; ++ kctx->csf.user_reg.file_offset = 0; + -+/* -+ * This header was autogenerated, it should not be edited. -+ */ ++ return 0; ++} + -+#ifndef _GPU_CSF_REGISTERS_H_ -+#define _GPU_CSF_REGISTERS_H_ ++static void put_user_pages_mmap_handle(struct kbase_context *kctx, ++ struct kbase_queue *queue) ++{ ++ unsigned long cookie_nr; + -+/* -+ * Begin register sets ++ lockdep_assert_held(&kctx->csf.lock); ++ ++ if (queue->handle == BASEP_MEM_INVALID_HANDLE) ++ return; ++ ++ cookie_nr = ++ PFN_DOWN(queue->handle - BASEP_MEM_CSF_USER_IO_PAGES_HANDLE); ++ ++ if (!WARN_ON(kctx->csf.user_pages_info[cookie_nr] != queue)) { ++ /* free up cookie */ ++ kctx->csf.user_pages_info[cookie_nr] = NULL; ++ bitmap_set(kctx->csf.cookies, cookie_nr, 1); ++ } ++ ++ queue->handle = BASEP_MEM_INVALID_HANDLE; ++} ++ ++/* Reserve a cookie, to be returned as a handle to userspace for creating ++ * the CPU mapping of the pair of input/output pages and Hw doorbell page. ++ * Will return 0 in case of success otherwise negative on failure. + */ ++static int get_user_pages_mmap_handle(struct kbase_context *kctx, ++ struct kbase_queue *queue) ++{ ++ unsigned long cookie, cookie_nr; + -+/* DOORBELLS base address */ -+#define DOORBELLS_BASE 0x0080000 -+#define DOORBELLS_REG(r) (DOORBELLS_BASE + (r)) ++ lockdep_assert_held(&kctx->csf.lock); + -+/* CS_KERNEL_INPUT_BLOCK base address */ -+#define CS_KERNEL_INPUT_BLOCK_BASE 0x0000 -+#define CS_KERNEL_INPUT_BLOCK_REG(r) (CS_KERNEL_INPUT_BLOCK_BASE + (r)) ++ if (bitmap_empty(kctx->csf.cookies, ++ KBASE_CSF_NUM_USER_IO_PAGES_HANDLE)) { ++ dev_err(kctx->kbdev->dev, ++ "No csf cookies available for allocation!"); ++ return -ENOMEM; ++ } + -+/* CS_KERNEL_OUTPUT_BLOCK base address */ -+#define CS_KERNEL_OUTPUT_BLOCK_BASE 0x0000 -+#define CS_KERNEL_OUTPUT_BLOCK_REG(r) (CS_KERNEL_OUTPUT_BLOCK_BASE + (r)) ++ /* allocate a cookie */ ++ cookie_nr = find_first_bit(kctx->csf.cookies, ++ KBASE_CSF_NUM_USER_IO_PAGES_HANDLE); ++ if (kctx->csf.user_pages_info[cookie_nr]) { ++ dev_err(kctx->kbdev->dev, ++ "Inconsistent state of csf cookies!"); ++ return -EINVAL; ++ } ++ kctx->csf.user_pages_info[cookie_nr] = queue; ++ bitmap_clear(kctx->csf.cookies, cookie_nr, 1); + -+/* CS_USER_INPUT_BLOCK base address */ -+#define CS_USER_INPUT_BLOCK_BASE 0x0000 -+#define CS_USER_INPUT_BLOCK_REG(r) (CS_USER_INPUT_BLOCK_BASE + (r)) ++ /* relocate to correct base */ ++ cookie = cookie_nr + PFN_DOWN(BASEP_MEM_CSF_USER_IO_PAGES_HANDLE); ++ cookie <<= PAGE_SHIFT; + -+/* CS_USER_OUTPUT_BLOCK base address */ -+#define CS_USER_OUTPUT_BLOCK_BASE 0x0000 -+#define CS_USER_OUTPUT_BLOCK_REG(r) (CS_USER_OUTPUT_BLOCK_BASE + (r)) ++ queue->handle = (u64)cookie; + -+/* CSG_INPUT_BLOCK base address */ -+#define CSG_INPUT_BLOCK_BASE 0x0000 -+#define CSG_INPUT_BLOCK_REG(r) (CSG_INPUT_BLOCK_BASE + (r)) ++ return 0; ++} + -+/* CSG_OUTPUT_BLOCK base address */ -+#define CSG_OUTPUT_BLOCK_BASE 0x0000 -+#define CSG_OUTPUT_BLOCK_REG(r) (CSG_OUTPUT_BLOCK_BASE + (r)) ++static void init_user_io_pages(struct kbase_queue *queue) ++{ ++ u32 *input_addr = (u32 *)(queue->user_io_addr); ++ u32 *output_addr = (u32 *)(queue->user_io_addr + PAGE_SIZE); + -+/* GLB_CONTROL_BLOCK base address */ -+#define GLB_CONTROL_BLOCK_BASE 0x04000000 -+#define GLB_CONTROL_BLOCK_REG(r) (GLB_CONTROL_BLOCK_BASE + (r)) ++ input_addr[CS_INSERT_LO/4] = 0; ++ input_addr[CS_INSERT_HI/4] = 0; + -+/* GLB_INPUT_BLOCK base address */ -+#define GLB_INPUT_BLOCK_BASE 0x0000 -+#define GLB_INPUT_BLOCK_REG(r) (GLB_INPUT_BLOCK_BASE + (r)) ++ input_addr[CS_EXTRACT_INIT_LO/4] = 0; ++ input_addr[CS_EXTRACT_INIT_HI/4] = 0; + -+/* GLB_OUTPUT_BLOCK base address */ -+#define GLB_OUTPUT_BLOCK_BASE 0x0000 -+#define GLB_OUTPUT_BLOCK_REG(r) (GLB_OUTPUT_BLOCK_BASE + (r)) ++ output_addr[CS_EXTRACT_LO/4] = 0; ++ output_addr[CS_EXTRACT_HI/4] = 0; + -+/* USER base address */ -+#define USER_BASE 0x0010000 -+#define USER_REG(r) (USER_BASE + (r)) ++ output_addr[CS_ACTIVE/4] = 0; ++} + -+/* End register sets */ ++static void kernel_unmap_user_io_pages(struct kbase_context *kctx, ++ struct kbase_queue *queue) ++{ ++ kbase_gpu_vm_lock(kctx); + -+/* -+ * Begin register offsets -+ */ ++ vunmap(queue->user_io_addr); + -+/* DOORBELLS register offsets */ -+#define DOORBELL_0 0x0000 /* () Doorbell 0 register */ -+#define DOORBELL(n) (DOORBELL_0 + (n)*65536) -+#define DOORBELL_REG(n, r) (DOORBELL(n) + DOORBELL_BLOCK_REG(r)) -+#define DOORBELL_COUNT 1024 ++ WARN_ON(atomic_read(&kctx->permanent_mapped_pages) < KBASEP_NUM_CS_USER_IO_PAGES); ++ atomic_sub(KBASEP_NUM_CS_USER_IO_PAGES, &kctx->permanent_mapped_pages); + -+/* DOORBELL_BLOCK register offsets */ -+#define DB_BLK_DOORBELL 0x0000 /* (WO) Doorbell request */ ++ kbase_gpu_vm_unlock(kctx); ++} + -+/* CS_KERNEL_INPUT_BLOCK register offsets */ -+#define CS_REQ 0x0000 /* () Command stream request flags */ -+#define CS_CONFIG 0x0004 /* () Command stream configuration */ -+#define CS_ACK_IRQ_MASK 0x000C /* () Command steam interrupt mask */ -+#define CS_BASE_LO 0x0010 /* () Base pointer for the ring buffer, low word */ -+#define CS_BASE_HI 0x0014 /* () Base pointer for the ring buffer, high word */ -+#define CS_SIZE 0x0018 /* () Size of the ring buffer */ -+#define CS_TILER_HEAP_START_LO 0x0020 /* () Pointer to heap start, low word */ -+#define CS_TILER_HEAP_START_HI 0x0024 /* () Pointer to heap start, high word */ -+#define CS_TILER_HEAP_END_LO 0x0028 /* () Tiler heap descriptor address, low word */ -+#define CS_TILER_HEAP_END_HI 0x002C /* () Tiler heap descriptor address, high word */ -+#define CS_USER_INPUT_LO 0x0030 /* () CS user mode input page address, low word */ -+#define CS_USER_INPUT_HI 0x0034 /* () CS user mode input page address, high word */ -+#define CS_USER_OUTPUT_LO 0x0038 /* () CS user mode input page address, low word */ -+#define CS_USER_OUTPUT_HI 0x003C /* () CS user mode input page address, high word */ ++static int kernel_map_user_io_pages(struct kbase_context *kctx, ++ struct kbase_queue *queue) ++{ ++ struct page *page_list[2]; ++ pgprot_t cpu_map_prot; ++ unsigned long flags; ++ char *user_io_addr; ++ int ret = 0; ++ size_t i; + -+/* CS_KERNEL_OUTPUT_BLOCK register offsets */ -+#define CS_ACK 0x0000 /* () Command stream acknowledge flags */ -+#define CS_STATUS_CMD_PTR_LO 0x0040 /* () Program pointer current value, low word */ -+#define CS_STATUS_CMD_PTR_HI 0x0044 /* () Program pointer current value, high word */ -+#define CS_STATUS_WAIT 0x0048 /* () Wait condition status register */ -+#define CS_STATUS_REQ_RESOURCE 0x004C /* () Indicates the resources requested by the command stream */ -+#define CS_STATUS_WAIT_SYNC_POINTER_LO 0x0050 /* () Sync object pointer, low word */ -+#define CS_STATUS_WAIT_SYNC_POINTER_HI 0x0054 /* () Sync object pointer, high word */ -+#define CS_STATUS_WAIT_SYNC_VALUE 0x0058 /* () Sync object test value */ -+#define CS_FAULT 0x0080 /* () Recoverable fault information */ -+#define CS_FATAL 0x0084 /* () Unrecoverable fault information */ -+#define CS_FAULT_INFO_LO 0x0088 /* () Additional information about a recoverable fault, low word */ -+#define CS_FAULT_INFO_HI 0x008C /* () Additional information about a recoverable fault, high word */ -+#define CS_FATAL_INFO_LO 0x0090 /* () Additional information about a non-recoverable fault, low word */ -+#define CS_FATAL_INFO_HI 0x0094 /* () Additional information about a non-recoverable fault, high word */ -+#define CS_HEAP_VT_START 0x00C0 /* () Number of vertex/tiling operations started */ -+#define CS_HEAP_VT_END 0x00C4 /* () Number of vertex/tiling operations completed */ -+#define CS_HEAP_FRAG_END 0x00CC /* () Number of fragment completed */ -+#define CS_HEAP_ADDRESS_LO 0x00D0 /* () Heap address, low word */ -+#define CS_HEAP_ADDRESS_HI 0x00D4 /* () Heap address, high word */ ++ kbase_gpu_vm_lock(kctx); + -+/* CS_USER_INPUT_BLOCK register offsets */ -+#define CS_INSERT_LO 0x0000 /* () Current insert offset for ring buffer, low word */ -+#define CS_INSERT_HI 0x0004 /* () Current insert offset for ring buffer, high word */ -+#define CS_EXTRACT_INIT_LO 0x0008 /* () Initial extract offset for ring buffer, low word */ -+#define CS_EXTRACT_INIT_HI 0x000C /* () Initial extract offset for ring buffer, high word */ ++ if (ARRAY_SIZE(page_list) > (KBASE_PERMANENTLY_MAPPED_MEM_LIMIT_PAGES - ++ atomic_read(&kctx->permanent_mapped_pages))) { ++ ret = -ENOMEM; ++ goto unlock; ++ } + -+/* CS_USER_OUTPUT_BLOCK register offsets */ -+#define CS_EXTRACT_LO 0x0000 /* () Current extract offset for ring buffer, low word */ -+#define CS_EXTRACT_HI 0x0004 /* () Current extract offset for ring buffer, high word */ -+#define CS_ACTIVE 0x0008 /* () Initial extract offset when the command stream is started */ ++ /* The pages are mapped to Userspace also, so use the same mapping ++ * attributes as used inside the CPU page fault handler. ++ */ ++ if (kctx->kbdev->system_coherency == COHERENCY_NONE) ++ cpu_map_prot = pgprot_writecombine(PAGE_KERNEL); ++ else ++ cpu_map_prot = PAGE_KERNEL; + -+/* CSG_INPUT_BLOCK register offsets */ -+#define CSG_REQ 0x0000 /* () CSG request */ -+#define CSG_ACK_IRQ_MASK 0x0004 /* () Global acknowledge interrupt mask */ -+#define CSG_DB_REQ 0x0008 /* () Global doorbell request */ -+#define CSG_IRQ_ACK 0x000C /* () Command stream IRQ acknowledge */ -+#define CSG_ALLOW_COMPUTE_LO 0x0020 /* () Allowed compute endpoints, low word */ -+#define CSG_ALLOW_COMPUTE_HI 0x0024 /* () Allowed compute endpoints, high word */ -+#define CSG_ALLOW_FRAGMENT_LO 0x0028 /* () Allowed fragment endpoints, low word */ -+#define CSG_ALLOW_FRAGMENT_HI 0x002C /* () Allowed fragment endpoints, high word */ -+#define CSG_ALLOW_OTHER 0x0030 /* () Allowed other endpoints */ -+#define CSG_EP_REQ 0x0034 /* () Maximum number of endpoints allowed */ -+#define CSG_SUSPEND_BUF_LO 0x0040 /* () Normal mode suspend buffer, low word */ -+#define CSG_SUSPEND_BUF_HI 0x0044 /* () Normal mode suspend buffer, high word */ -+#define CSG_PROTM_SUSPEND_BUF_LO 0x0048 /* () Protected mode suspend buffer, low word */ -+#define CSG_PROTM_SUSPEND_BUF_HI 0x004C /* () Protected mode suspend buffer, high word */ -+#define CSG_CONFIG 0x0050 /* () CSG configuration options */ ++ for (i = 0; i < ARRAY_SIZE(page_list); i++) ++ page_list[i] = as_page(queue->phys[i]); + -+/* CSG_OUTPUT_BLOCK register offsets */ -+#define CSG_ACK 0x0000 /* () Command stream group acknowledge flags */ -+#define CSG_DB_ACK 0x0008 /* () Command stream kernel doorbell acknowledge flags */ -+#define CSG_IRQ_REQ 0x000C /* () Command stream interrupt request flags */ -+#define CSG_STATUS_EP_CURRENT 0x0010 /* () Endpoint allocation status register */ -+#define CSG_STATUS_EP_REQ 0x0014 /* () Endpoint request status register */ -+#define CSG_RESOURCE_DEP 0x001C /* () Current resource dependencies */ ++ user_io_addr = vmap(page_list, ARRAY_SIZE(page_list), VM_MAP, cpu_map_prot); + -+/* GLB_CONTROL_BLOCK register offsets */ -+#define GLB_VERSION 0x0000 /* () Global interface version */ -+#define GLB_FEATURES 0x0004 /* () Global interface features */ -+#define GLB_INPUT_VA 0x0008 /* () Address of GLB_INPUT_BLOCK */ -+#define GLB_OUTPUT_VA 0x000C /* () Address of GLB_OUTPUT_BLOCK */ -+#define GLB_GROUP_NUM 0x0010 /* () Number of CSG interfaces */ -+#define GLB_GROUP_STRIDE 0x0014 /* () Stride between CSG interfaces */ -+#define GLB_PRFCNT_SIZE 0x0018 /* () Size of CSF performance counters */ -+#define GROUP_CONTROL_0 0x1000 /* () CSG control and capabilities */ -+#define GROUP_CONTROL(n) (GROUP_CONTROL_0 + (n)*256) -+#define GROUP_CONTROL_REG(n, r) (GROUP_CONTROL(n) + GROUP_CONTROL_BLOCK_REG(r)) -+#define GROUP_CONTROL_COUNT 16 ++ if (!user_io_addr) { ++ dev_err(kctx->kbdev->dev, ++ "%s(): user_io_addr is NULL, queue: %p", ++ __func__, ++ queue); ++ ret = -ENOMEM; ++ } else { ++ atomic_add(ARRAY_SIZE(page_list), &kctx->permanent_mapped_pages); ++ } + -+/* STREAM_CONTROL_BLOCK register offsets */ -+#define STREAM_FEATURES 0x0000 /* () Command Stream interface features */ -+#define STREAM_INPUT_VA 0x0004 /* () Address of CS_KERNEL_INPUT_BLOCK */ -+#define STREAM_OUTPUT_VA 0x0008 /* () Address of CS_KERNEL_OUTPUT_BLOCK */ ++ kbase_csf_scheduler_spin_lock(kctx->kbdev, &flags); ++ queue->user_io_addr = user_io_addr; ++ kbase_csf_scheduler_spin_unlock(kctx->kbdev, flags); + -+/* GROUP_CONTROL_BLOCK register offsets */ -+#define GROUP_FEATURES 0x0000 /* () Command Stream Group interface features */ -+#define GROUP_INPUT_VA 0x0004 /* () Address of CSG_INPUT_BLOCK */ -+#define GROUP_OUTPUT_VA 0x0008 /* () Address of CSG_OUTPUT_BLOCK */ -+#define GROUP_SUSPEND_SIZE 0x000C /* () Size of CSG suspend buffer */ -+#define GROUP_PROTM_SUSPEND_SIZE 0x0010 /* () Size of CSG protected-mode suspend buffer */ -+#define GROUP_STREAM_NUM 0x0014 /* () Number of CS interfaces */ -+#define GROUP_STREAM_STRIDE 0x0018 /* () Stride between CS interfaces */ -+#define STREAM_CONTROL_0 0x0040 /* () CS control and capabilities */ -+#define STREAM_CONTROL(n) (STREAM_CONTROL_0 + (n)*12) -+#define STREAM_CONTROL_REG(n, r) (STREAM_CONTROL(n) + STREAM_CONTROL_BLOCK_REG(r)) -+#define STREAM_CONTROL_COUNT 16 ++unlock: ++ kbase_gpu_vm_unlock(kctx); ++ return ret; ++} + -+/* GLB_INPUT_BLOCK register offsets */ -+#define GLB_REQ 0x0000 /* () Global request */ -+#define GLB_ACK_IRQ_MASK 0x0004 /* () Global acknowledge interrupt mask */ -+#define GLB_DB_REQ 0x0008 /* () Global doorbell request */ -+#define GLB_PROGRESS_TIMER 0x0010 /* () Global progress timeout */ -+#define GLB_PWROFF_TIMER 0x0014 /* () Global shader core power off timer */ -+#define GLB_ALLOC_EN_LO 0x0018 /* () Global shader core allocation enable mask, low word */ -+#define GLB_ALLOC_EN_HI 0x001C /* () Global shader core allocation enable mask, high word */ -+#define GLB_PROTM_COHERENCY 0x0020 /* () Configure COHERENCY_ENABLE register value to use in protected mode execution */ ++static void term_queue_group(struct kbase_queue_group *group); ++static void get_queue(struct kbase_queue *queue); ++static void release_queue(struct kbase_queue *queue); + -+#define GLB_PRFCNT_JASID 0x0024 /* () Performance counter address space */ -+#define GLB_PRFCNT_BASE_LO 0x0028 /* () Performance counter buffer address, low word */ -+#define GLB_PRFCNT_BASE_HI 0x002C /* () Performance counter buffer address, high word */ -+#define GLB_PRFCNT_CONFIG 0x0040 /* () Performance counter configuration */ -+#define GLB_PRFCNT_CSG_SELECT 0x0044 /* () CSG performance counting enable */ -+#define GLB_PRFCNT_FW_EN 0x0048 /* () Performance counter enable for firmware */ -+#define GLB_PRFCNT_CSG_EN 0x004C /* () Performance counter enable for CSG */ -+#define GLB_PRFCNT_CSF_EN 0x0050 /* () Performance counter enable for CSF */ -+#define GLB_PRFCNT_SHADER_EN 0x0054 /* () Performance counter enable for shader cores */ -+#define GLB_PRFCNT_TILER_EN 0x0058 /* () Performance counter enable for tiler */ -+#define GLB_PRFCNT_MMU_L2_EN 0x005C /* () Performance counter enable for MMU/L2 cache */ ++/** ++ * kbase_csf_free_command_stream_user_pages() - Free the resources allocated ++ * for a queue at the time of bind. ++ * ++ * @kctx: Address of the kbase context within which the queue was created. ++ * @queue: Pointer to the queue to be unlinked. ++ * ++ * This function will free the pair of physical pages allocated for a GPU ++ * command queue, and also release the hardware doorbell page, that were mapped ++ * into the process address space to enable direct submission of commands to ++ * the hardware. Also releases the reference taken on the queue when the mapping ++ * was created. ++ * ++ * This function will be called only when the mapping is being removed and ++ * so the resources for queue will not get freed up until the mapping is ++ * removed even though userspace could have terminated the queue. ++ * Kernel will ensure that the termination of Kbase context would only be ++ * triggered after the mapping is removed. ++ * ++ * If an explicit or implicit unbind was missed by the userspace then the ++ * mapping will persist. On process exit kernel itself will remove the mapping. ++ */ ++void kbase_csf_free_command_stream_user_pages(struct kbase_context *kctx, struct kbase_queue *queue) ++{ ++ kernel_unmap_user_io_pages(kctx, queue); + -+#define GLB_DEBUG_FWUTF_DESTROY 0x0FE0 /* () Test fixture destroy function address */ -+#define GLB_DEBUG_FWUTF_TEST 0x0FE4 /* () Test index */ -+#define GLB_DEBUG_FWUTF_FIXTURE 0x0FE8 /* () Test fixture index */ -+#define GLB_DEBUG_FWUTF_CREATE 0x0FEC /* () Test fixture create function address */ -+#define GLB_DEBUG_ACK_IRQ_MASK 0x0FF8 /* () Global debug acknowledge interrupt mask */ -+#define GLB_DEBUG_REQ 0x0FFC /* () Global debug request */ ++ kbase_mem_pool_free_pages( ++ &kctx->mem_pools.small[KBASE_MEM_GROUP_CSF_IO], ++ KBASEP_NUM_CS_USER_IO_PAGES, queue->phys, true, false); ++ kbase_process_page_usage_dec(kctx, KBASEP_NUM_CS_USER_IO_PAGES); + -+/* GLB_OUTPUT_BLOCK register offsets */ -+#define GLB_ACK 0x0000 /* () Global acknowledge */ -+#define GLB_DB_ACK 0x0008 /* () Global doorbell acknowledge */ -+#define GLB_HALT_STATUS 0x0010 /* () Global halt status */ -+#define GLB_PRFCNT_STATUS 0x0014 /* () Performance counter status */ -+#define GLB_DEBUG_FWUTF_RESULT 0x0FE0 /* () Firmware debug test result */ -+#define GLB_DEBUG_ACK 0x0FFC /* () Global debug acknowledge */ ++ /* The user_io_gpu_va should have been unmapped inside the scheduler */ ++ WARN_ONCE(queue->user_io_gpu_va, "Userio pages appears still have mapping"); + -+/* End register offsets */ ++ /* If the queue has already been terminated by userspace ++ * then the ref count for queue object will drop to 0 here. ++ */ ++ release_queue(queue); ++} ++KBASE_EXPORT_TEST_API(kbase_csf_free_command_stream_user_pages); + -+/* CS_KERNEL_INPUT_BLOCK register set definitions */ ++int kbase_csf_alloc_command_stream_user_pages(struct kbase_context *kctx, struct kbase_queue *queue) ++{ ++ struct kbase_device *kbdev = kctx->kbdev; ++ int ret; + -+/* CS_REQ register */ -+#define CS_REQ_STATE_SHIFT 0 -+#define CS_REQ_STATE_MASK (0x7 << CS_REQ_STATE_SHIFT) -+#define CS_REQ_STATE_GET(reg_val) (((reg_val)&CS_REQ_STATE_MASK) >> CS_REQ_STATE_SHIFT) -+#define CS_REQ_STATE_SET(reg_val, value) \ -+ (((reg_val) & ~CS_REQ_STATE_MASK) | (((value) << CS_REQ_STATE_SHIFT) & CS_REQ_STATE_MASK)) -+/* CS_REQ_STATE values */ -+#define CS_REQ_STATE_STOP 0x0 -+#define CS_REQ_STATE_START 0x1 -+/* End of CS_REQ_STATE values */ -+#define CS_REQ_EXTRACT_EVENT_SHIFT 4 -+#define CS_REQ_EXTRACT_EVENT_MASK (0x1 << CS_REQ_EXTRACT_EVENT_SHIFT) -+#define CS_REQ_EXTRACT_EVENT_GET(reg_val) (((reg_val)&CS_REQ_EXTRACT_EVENT_MASK) >> CS_REQ_EXTRACT_EVENT_SHIFT) -+#define CS_REQ_EXTRACT_EVENT_SET(reg_val, value) \ -+ (((reg_val) & ~CS_REQ_EXTRACT_EVENT_MASK) | (((value) << CS_REQ_EXTRACT_EVENT_SHIFT) & CS_REQ_EXTRACT_EVENT_MASK)) ++ lockdep_assert_held(&kctx->csf.lock); + -+/* From 10.x.5, CS_REQ_ERROR_MODE is removed but TI2 bitfile upload not finished. -+ * Need to remove on GPUCORE-23972 -+ */ -+#define CS_REQ_ERROR_MODE_SHIFT 5 -+#define CS_REQ_ERROR_MODE_MASK (0x1 << CS_REQ_ERROR_MODE_SHIFT) -+#define CS_REQ_ERROR_MODE_GET(reg_val) ((reg_val & CS_REQ_ERROR_MODE_MASK) >> CS_REQ_ERROR_MODE_SHIFT) -+#define CS_REQ_ERROR_MODE_SET(reg_val, value) \ -+ ((reg_val & ~CS_REQ_ERROR_MODE_MASK) | ((value << CS_REQ_ERROR_MODE_SHIFT) & CS_REQ_ERROR_MODE_MASK)) ++ ret = kbase_mem_pool_alloc_pages(&kctx->mem_pools.small[KBASE_MEM_GROUP_CSF_IO], ++ KBASEP_NUM_CS_USER_IO_PAGES, ++ queue->phys, false, kctx->task); ++ if (ret != KBASEP_NUM_CS_USER_IO_PAGES) { ++ /* Marking both the phys to zero for indicating there is no phys allocated */ ++ queue->phys[0].tagged_addr = 0; ++ queue->phys[1].tagged_addr = 0; ++ return -ENOMEM; ++ } + -+#define CS_REQ_IDLE_SYNC_WAIT_SHIFT 8 -+#define CS_REQ_IDLE_SYNC_WAIT_MASK (0x1 << CS_REQ_IDLE_SYNC_WAIT_SHIFT) -+#define CS_REQ_IDLE_SYNC_WAIT_GET(reg_val) (((reg_val)&CS_REQ_IDLE_SYNC_WAIT_MASK) >> CS_REQ_IDLE_SYNC_WAIT_SHIFT) -+#define CS_REQ_IDLE_SYNC_WAIT_SET(reg_val, value) \ -+ (((reg_val) & ~CS_REQ_IDLE_SYNC_WAIT_MASK) | \ -+ (((value) << CS_REQ_IDLE_SYNC_WAIT_SHIFT) & CS_REQ_IDLE_SYNC_WAIT_MASK)) -+#define CS_REQ_IDLE_PROTM_PEND_SHIFT 9 -+#define CS_REQ_IDLE_PROTM_PEND_MASK (0x1 << CS_REQ_IDLE_PROTM_PEND_SHIFT) -+#define CS_REQ_IDLE_PROTM_PEND_GET(reg_val) (((reg_val)&CS_REQ_IDLE_PROTM_PEND_MASK) >> CS_REQ_IDLE_PROTM_PEND_SHIFT) -+#define CS_REQ_IDLE_PROTM_PEND_SET(reg_val, value) \ -+ (((reg_val) & ~CS_REQ_IDLE_PROTM_PEND_MASK) | \ -+ (((value) << CS_REQ_IDLE_PROTM_PEND_SHIFT) & CS_REQ_IDLE_PROTM_PEND_MASK)) -+#define CS_REQ_IDLE_EMPTY_SHIFT 10 -+#define CS_REQ_IDLE_EMPTY_MASK (0x1 << CS_REQ_IDLE_EMPTY_SHIFT) -+#define CS_REQ_IDLE_EMPTY_GET(reg_val) (((reg_val)&CS_REQ_IDLE_EMPTY_MASK) >> CS_REQ_IDLE_EMPTY_SHIFT) -+#define CS_REQ_IDLE_EMPTY_SET(reg_val, value) \ -+ (((reg_val) & ~CS_REQ_IDLE_EMPTY_MASK) | (((value) << CS_REQ_IDLE_EMPTY_SHIFT) & CS_REQ_IDLE_EMPTY_MASK)) -+#define CS_REQ_IDLE_RESOURCE_REQ_SHIFT 11 -+#define CS_REQ_IDLE_RESOURCE_REQ_MASK (0x1 << CS_REQ_IDLE_RESOURCE_REQ_SHIFT) -+#define CS_REQ_IDLE_RESOURCE_REQ_GET(reg_val) \ -+ (((reg_val)&CS_REQ_IDLE_RESOURCE_REQ_MASK) >> CS_REQ_IDLE_RESOURCE_REQ_SHIFT) -+#define CS_REQ_IDLE_RESOURCE_REQ_SET(reg_val, value) \ -+ (((reg_val) & ~CS_REQ_IDLE_RESOURCE_REQ_MASK) | \ -+ (((value) << CS_REQ_IDLE_RESOURCE_REQ_SHIFT) & CS_REQ_IDLE_RESOURCE_REQ_MASK)) -+#define CS_REQ_TILER_OOM_SHIFT 26 -+#define CS_REQ_TILER_OOM_MASK (0x1 << CS_REQ_TILER_OOM_SHIFT) -+#define CS_REQ_TILER_OOM_GET(reg_val) (((reg_val)&CS_REQ_TILER_OOM_MASK) >> CS_REQ_TILER_OOM_SHIFT) -+#define CS_REQ_TILER_OOM_SET(reg_val, value) \ -+ (((reg_val) & ~CS_REQ_TILER_OOM_MASK) | (((value) << CS_REQ_TILER_OOM_SHIFT) & CS_REQ_TILER_OOM_MASK)) -+#define CS_REQ_PROTM_PEND_SHIFT 27 -+#define CS_REQ_PROTM_PEND_MASK (0x1 << CS_REQ_PROTM_PEND_SHIFT) -+#define CS_REQ_PROTM_PEND_GET(reg_val) (((reg_val)&CS_REQ_PROTM_PEND_MASK) >> CS_REQ_PROTM_PEND_SHIFT) -+#define CS_REQ_PROTM_PEND_SET(reg_val, value) \ -+ (((reg_val) & ~CS_REQ_PROTM_PEND_MASK) | (((value) << CS_REQ_PROTM_PEND_SHIFT) & CS_REQ_PROTM_PEND_MASK)) -+#define CS_REQ_FATAL_SHIFT 30 -+#define CS_REQ_FATAL_MASK (0x1 << CS_REQ_FATAL_SHIFT) -+#define CS_REQ_FATAL_GET(reg_val) (((reg_val)&CS_REQ_FATAL_MASK) >> CS_REQ_FATAL_SHIFT) -+#define CS_REQ_FATAL_SET(reg_val, value) \ -+ (((reg_val) & ~CS_REQ_FATAL_MASK) | (((value) << CS_REQ_FATAL_SHIFT) & CS_REQ_FATAL_MASK)) -+#define CS_REQ_FAULT_SHIFT 31 -+#define CS_REQ_FAULT_MASK (0x1 << CS_REQ_FAULT_SHIFT) -+#define CS_REQ_FAULT_GET(reg_val) (((reg_val)&CS_REQ_FAULT_MASK) >> CS_REQ_FAULT_SHIFT) -+#define CS_REQ_FAULT_SET(reg_val, value) \ -+ (((reg_val) & ~CS_REQ_FAULT_MASK) | (((value) << CS_REQ_FAULT_SHIFT) & CS_REQ_FAULT_MASK)) ++ ret = kernel_map_user_io_pages(kctx, queue); ++ if (ret) ++ goto kernel_map_failed; + -+/* CS_CONFIG register */ -+#define CS_CONFIG_PRIORITY_SHIFT 0 -+#define CS_CONFIG_PRIORITY_MASK (0xF << CS_CONFIG_PRIORITY_SHIFT) -+#define CS_CONFIG_PRIORITY_GET(reg_val) (((reg_val)&CS_CONFIG_PRIORITY_MASK) >> CS_CONFIG_PRIORITY_SHIFT) -+#define CS_CONFIG_PRIORITY_SET(reg_val, value) \ -+ (((reg_val) & ~CS_CONFIG_PRIORITY_MASK) | (((value) << CS_CONFIG_PRIORITY_SHIFT) & CS_CONFIG_PRIORITY_MASK)) -+#define CS_CONFIG_USER_DOORBELL_SHIFT 8 -+#define CS_CONFIG_USER_DOORBELL_MASK (0xFF << CS_CONFIG_USER_DOORBELL_SHIFT) -+#define CS_CONFIG_USER_DOORBELL_GET(reg_val) (((reg_val)&CS_CONFIG_USER_DOORBELL_MASK) >> CS_CONFIG_USER_DOORBELL_SHIFT) -+#define CS_CONFIG_USER_DOORBELL_SET(reg_val, value) \ -+ (((reg_val) & ~CS_CONFIG_USER_DOORBELL_MASK) | \ -+ (((value) << CS_CONFIG_USER_DOORBELL_SHIFT) & CS_CONFIG_USER_DOORBELL_MASK)) ++ kbase_process_page_usage_inc(kctx, KBASEP_NUM_CS_USER_IO_PAGES); ++ init_user_io_pages(queue); + -+/* CS_ACK_IRQ_MASK register */ -+#define CS_ACK_IRQ_MASK_STATE_SHIFT 0 -+#define CS_ACK_IRQ_MASK_STATE_MASK (0x7 << CS_ACK_IRQ_MASK_STATE_SHIFT) -+#define CS_ACK_IRQ_MASK_STATE_GET(reg_val) (((reg_val)&CS_ACK_IRQ_MASK_STATE_MASK) >> CS_ACK_IRQ_MASK_STATE_SHIFT) -+#define CS_ACK_IRQ_MASK_STATE_SET(reg_val, value) \ -+ (((reg_val) & ~CS_ACK_IRQ_MASK_STATE_MASK) | \ -+ (((value) << CS_ACK_IRQ_MASK_STATE_SHIFT) & CS_ACK_IRQ_MASK_STATE_MASK)) -+/* CS_ACK_IRQ_MASK_STATE values */ -+#define CS_ACK_IRQ_MASK_STATE_DISABLED 0x0 -+#define CS_ACK_IRQ_MASK_STATE_ENABLED 0x7 -+/* End of CS_ACK_IRQ_MASK_STATE values */ -+#define CS_ACK_IRQ_MASK_EXTRACT_EVENT_SHIFT 4 -+#define CS_ACK_IRQ_MASK_EXTRACT_EVENT_MASK (0x1 << CS_ACK_IRQ_MASK_EXTRACT_EVENT_SHIFT) -+#define CS_ACK_IRQ_MASK_EXTRACT_EVENT_GET(reg_val) \ -+ (((reg_val)&CS_ACK_IRQ_MASK_EXTRACT_EVENT_MASK) >> CS_ACK_IRQ_MASK_EXTRACT_EVENT_SHIFT) -+#define CS_ACK_IRQ_MASK_EXTRACT_EVENT_SET(reg_val, value) \ -+ (((reg_val) & ~CS_ACK_IRQ_MASK_EXTRACT_EVENT_MASK) | \ -+ (((value) << CS_ACK_IRQ_MASK_EXTRACT_EVENT_SHIFT) & CS_ACK_IRQ_MASK_EXTRACT_EVENT_MASK)) -+#define CS_ACK_IRQ_MASK_TILER_OOM_SHIFT 26 -+#define CS_ACK_IRQ_MASK_TILER_OOM_MASK (0x1 << CS_ACK_IRQ_MASK_TILER_OOM_SHIFT) -+#define CS_ACK_IRQ_MASK_TILER_OOM_GET(reg_val) \ -+ (((reg_val)&CS_ACK_IRQ_MASK_TILER_OOM_MASK) >> CS_ACK_IRQ_MASK_TILER_OOM_SHIFT) -+#define CS_ACK_IRQ_MASK_TILER_OOM_SET(reg_val, value) \ -+ (((reg_val) & ~CS_ACK_IRQ_MASK_TILER_OOM_MASK) | \ -+ (((value) << CS_ACK_IRQ_MASK_TILER_OOM_SHIFT) & CS_ACK_IRQ_MASK_TILER_OOM_MASK)) -+#define CS_ACK_IRQ_MASK_PROTM_PEND_SHIFT 27 -+#define CS_ACK_IRQ_MASK_PROTM_PEND_MASK (0x1 << CS_ACK_IRQ_MASK_PROTM_PEND_SHIFT) -+#define CS_ACK_IRQ_MASK_PROTM_PEND_GET(reg_val) \ -+ (((reg_val)&CS_ACK_IRQ_MASK_PROTM_PEND_MASK) >> CS_ACK_IRQ_MASK_PROTM_PEND_SHIFT) -+#define CS_ACK_IRQ_MASK_PROTM_PEND_SET(reg_val, value) \ -+ (((reg_val) & ~CS_ACK_IRQ_MASK_PROTM_PEND_MASK) | \ -+ (((value) << CS_ACK_IRQ_MASK_PROTM_PEND_SHIFT) & CS_ACK_IRQ_MASK_PROTM_PEND_MASK)) -+#define CS_ACK_IRQ_MASK_FATAL_SHIFT 30 -+#define CS_ACK_IRQ_MASK_FATAL_MASK (0x1 << CS_ACK_IRQ_MASK_FATAL_SHIFT) -+#define CS_ACK_IRQ_MASK_FATAL_GET(reg_val) (((reg_val)&CS_ACK_IRQ_MASK_FATAL_MASK) >> CS_ACK_IRQ_MASK_FATAL_SHIFT) -+#define CS_ACK_IRQ_MASK_FATAL_SET(reg_val, value) \ -+ (((reg_val) & ~CS_ACK_IRQ_MASK_FATAL_MASK) | \ -+ (((value) << CS_ACK_IRQ_MASK_FATAL_SHIFT) & CS_ACK_IRQ_MASK_FATAL_MASK)) -+#define CS_ACK_IRQ_MASK_FAULT_SHIFT 31 -+#define CS_ACK_IRQ_MASK_FAULT_MASK (0x1 << CS_ACK_IRQ_MASK_FAULT_SHIFT) -+#define CS_ACK_IRQ_MASK_FAULT_GET(reg_val) (((reg_val)&CS_ACK_IRQ_MASK_FAULT_MASK) >> CS_ACK_IRQ_MASK_FAULT_SHIFT) -+#define CS_ACK_IRQ_MASK_FAULT_SET(reg_val, value) \ -+ (((reg_val) & ~CS_ACK_IRQ_MASK_FAULT_MASK) | \ -+ (((value) << CS_ACK_IRQ_MASK_FAULT_SHIFT) & CS_ACK_IRQ_MASK_FAULT_MASK)) ++ /* user_io_gpu_va is only mapped when scheduler decides to put the queue ++ * on slot at runtime. Initialize it to 0, signalling no mapping. ++ */ ++ queue->user_io_gpu_va = 0; + -+/* CS_BASE register */ -+#define CS_BASE_POINTER_SHIFT 0 -+#define CS_BASE_POINTER_MASK (0xFFFFFFFFFFFFFFFF << CS_BASE_POINTER_SHIFT) -+#define CS_BASE_POINTER_GET(reg_val) (((reg_val)&CS_BASE_POINTER_MASK) >> CS_BASE_POINTER_SHIFT) -+#define CS_BASE_POINTER_SET(reg_val, value) \ -+ (((reg_val) & ~CS_BASE_POINTER_MASK) | (((value) << CS_BASE_POINTER_SHIFT) & CS_BASE_POINTER_MASK)) ++ mutex_lock(&kbdev->csf.reg_lock); ++ if (kbdev->csf.db_file_offsets > (U32_MAX - BASEP_QUEUE_NR_MMAP_USER_PAGES + 1)) ++ kbdev->csf.db_file_offsets = 0; + -+/* CS_SIZE register */ -+#define CS_SIZE_SIZE_SHIFT 0 -+#define CS_SIZE_SIZE_MASK (0xFFFFFFFF << CS_SIZE_SIZE_SHIFT) -+#define CS_SIZE_SIZE_GET(reg_val) (((reg_val)&CS_SIZE_SIZE_MASK) >> CS_SIZE_SIZE_SHIFT) -+#define CS_SIZE_SIZE_SET(reg_val, value) \ -+ (((reg_val) & ~CS_SIZE_SIZE_MASK) | (((value) << CS_SIZE_SIZE_SHIFT) & CS_SIZE_SIZE_MASK)) ++ queue->db_file_offset = kbdev->csf.db_file_offsets; ++ kbdev->csf.db_file_offsets += BASEP_QUEUE_NR_MMAP_USER_PAGES; ++ WARN(kbase_refcount_read(&queue->refcount) != 1, ++ "Incorrect refcounting for queue object\n"); ++ /* This is the second reference taken on the queue object and ++ * would be dropped only when the IO mapping is removed either ++ * explicitly by userspace or implicitly by kernel on process exit. ++ */ ++ get_queue(queue); ++ queue->bind_state = KBASE_CSF_QUEUE_BOUND; ++ mutex_unlock(&kbdev->csf.reg_lock); + -+/* CS_TILER_HEAP_START register */ -+#define CS_TILER_HEAP_START_POINTER_SHIFT 0 -+#define CS_TILER_HEAP_START_POINTER_MASK (0xFFFFFFFFFFFFFFFF << CS_TILER_HEAP_START_POINTER_SHIFT) -+#define CS_TILER_HEAP_START_POINTER_GET(reg_val) \ -+ (((reg_val)&CS_TILER_HEAP_START_POINTER_MASK) >> CS_TILER_HEAP_START_POINTER_SHIFT) -+#define CS_TILER_HEAP_START_POINTER_SET(reg_val, value) \ -+ (((reg_val) & ~CS_TILER_HEAP_START_POINTER_MASK) | \ -+ (((value) << CS_TILER_HEAP_START_POINTER_SHIFT) & CS_TILER_HEAP_START_POINTER_MASK)) -+/* HeapChunkPointer nested in CS_TILER_HEAP_START_POINTER */ -+/* End of HeapChunkPointer nested in CS_TILER_HEAP_START_POINTER */ ++ return 0; + -+/* CS_TILER_HEAP_END register */ -+#define CS_TILER_HEAP_END_POINTER_SHIFT 0 -+#define CS_TILER_HEAP_END_POINTER_MASK (0xFFFFFFFFFFFFFFFF << CS_TILER_HEAP_END_POINTER_SHIFT) -+#define CS_TILER_HEAP_END_POINTER_GET(reg_val) \ -+ (((reg_val)&CS_TILER_HEAP_END_POINTER_MASK) >> CS_TILER_HEAP_END_POINTER_SHIFT) -+#define CS_TILER_HEAP_END_POINTER_SET(reg_val, value) \ -+ (((reg_val) & ~CS_TILER_HEAP_END_POINTER_MASK) | \ -+ (((value) << CS_TILER_HEAP_END_POINTER_SHIFT) & CS_TILER_HEAP_END_POINTER_MASK)) -+/* HeapChunkPointer nested in CS_TILER_HEAP_END_POINTER */ -+/* End of HeapChunkPointer nested in CS_TILER_HEAP_END_POINTER */ ++kernel_map_failed: ++ kbase_mem_pool_free_pages(&kctx->mem_pools.small[KBASE_MEM_GROUP_CSF_IO], ++ KBASEP_NUM_CS_USER_IO_PAGES, queue->phys, false, false); ++ /* Marking both the phys to zero for indicating there is no phys allocated */ ++ queue->phys[0].tagged_addr = 0; ++ queue->phys[1].tagged_addr = 0; + -+/* CS_USER_INPUT register */ -+#define CS_USER_INPUT_POINTER_SHIFT 0 -+#define CS_USER_INPUT_POINTER_MASK (0xFFFFFFFFFFFFFFFF << CS_USER_INPUT_POINTER_SHIFT) -+#define CS_USER_INPUT_POINTER_GET(reg_val) (((reg_val)&CS_USER_INPUT_POINTER_MASK) >> CS_USER_INPUT_POINTER_SHIFT) -+#define CS_USER_INPUT_POINTER_SET(reg_val, value) \ -+ (((reg_val) & ~CS_USER_INPUT_POINTER_MASK) | \ -+ (((value) << CS_USER_INPUT_POINTER_SHIFT) & CS_USER_INPUT_POINTER_MASK)) ++ return ret; ++} ++KBASE_EXPORT_TEST_API(kbase_csf_alloc_command_stream_user_pages); + -+/* CS_USER_OUTPUT register */ -+#define CS_USER_OUTPUT_POINTER_SHIFT 0 -+#define CS_USER_OUTPUT_POINTER_MASK (0xFFFFFFFFFFFFFFFF << CS_USER_OUTPUT_POINTER_SHIFT) -+#define CS_USER_OUTPUT_POINTER_GET(reg_val) (((reg_val)&CS_USER_OUTPUT_POINTER_MASK) >> CS_USER_OUTPUT_POINTER_SHIFT) -+#define CS_USER_OUTPUT_POINTER_SET(reg_val, value) \ -+ (((reg_val) & ~CS_USER_OUTPUT_POINTER_MASK) | \ -+ (((value) << CS_USER_OUTPUT_POINTER_SHIFT) & CS_USER_OUTPUT_POINTER_MASK)) -+/* End of CS_KERNEL_INPUT_BLOCK register set definitions */ ++static struct kbase_queue_group *find_queue_group(struct kbase_context *kctx, ++ u8 group_handle) ++{ ++ uint index = group_handle; + -+/* CS_KERNEL_OUTPUT_BLOCK register set definitions */ ++ lockdep_assert_held(&kctx->csf.lock); + -+/* CS_ACK register */ -+#define CS_ACK_STATE_SHIFT 0 -+#define CS_ACK_STATE_MASK (0x7 << CS_ACK_STATE_SHIFT) -+#define CS_ACK_STATE_GET(reg_val) (((reg_val)&CS_ACK_STATE_MASK) >> CS_ACK_STATE_SHIFT) -+#define CS_ACK_STATE_SET(reg_val, value) \ -+ (((reg_val) & ~CS_ACK_STATE_MASK) | (((value) << CS_ACK_STATE_SHIFT) & CS_ACK_STATE_MASK)) -+/* CS_ACK_STATE values */ -+#define CS_ACK_STATE_STOP 0x0 -+#define CS_ACK_STATE_START 0x1 -+/* End of CS_ACK_STATE values */ -+#define CS_ACK_EXTRACT_EVENT_SHIFT 4 -+#define CS_ACK_EXTRACT_EVENT_MASK (0x1 << CS_ACK_EXTRACT_EVENT_SHIFT) -+#define CS_ACK_EXTRACT_EVENT_GET(reg_val) (((reg_val)&CS_ACK_EXTRACT_EVENT_MASK) >> CS_ACK_EXTRACT_EVENT_SHIFT) -+#define CS_ACK_EXTRACT_EVENT_SET(reg_val, value) \ -+ (((reg_val) & ~CS_ACK_EXTRACT_EVENT_MASK) | (((value) << CS_ACK_EXTRACT_EVENT_SHIFT) & CS_ACK_EXTRACT_EVENT_MASK)) -+#define CS_ACK_TILER_OOM_SHIFT 26 -+#define CS_ACK_TILER_OOM_MASK (0x1 << CS_ACK_TILER_OOM_SHIFT) -+#define CS_ACK_TILER_OOM_GET(reg_val) (((reg_val)&CS_ACK_TILER_OOM_MASK) >> CS_ACK_TILER_OOM_SHIFT) -+#define CS_ACK_TILER_OOM_SET(reg_val, value) \ -+ (((reg_val) & ~CS_ACK_TILER_OOM_MASK) | (((value) << CS_ACK_TILER_OOM_SHIFT) & CS_ACK_TILER_OOM_MASK)) -+#define CS_ACK_PROTM_PEND_SHIFT 27 -+#define CS_ACK_PROTM_PEND_MASK (0x1 << CS_ACK_PROTM_PEND_SHIFT) -+#define CS_ACK_PROTM_PEND_GET(reg_val) (((reg_val)&CS_ACK_PROTM_PEND_MASK) >> CS_ACK_PROTM_PEND_SHIFT) -+#define CS_ACK_PROTM_PEND_SET(reg_val, value) \ -+ (((reg_val) & ~CS_ACK_PROTM_PEND_MASK) | (((value) << CS_ACK_PROTM_PEND_SHIFT) & CS_ACK_PROTM_PEND_MASK)) -+#define CS_ACK_FATAL_SHIFT 30 -+#define CS_ACK_FATAL_MASK (0x1 << CS_ACK_FATAL_SHIFT) -+#define CS_ACK_FATAL_GET(reg_val) (((reg_val)&CS_ACK_FATAL_MASK) >> CS_ACK_FATAL_SHIFT) -+#define CS_ACK_FATAL_SET(reg_val, value) \ -+ (((reg_val) & ~CS_ACK_FATAL_MASK) | (((value) << CS_ACK_FATAL_SHIFT) & CS_ACK_FATAL_MASK)) -+#define CS_ACK_FAULT_SHIFT 31 -+#define CS_ACK_FAULT_MASK (0x1 << CS_ACK_FAULT_SHIFT) -+#define CS_ACK_FAULT_GET(reg_val) (((reg_val)&CS_ACK_FAULT_MASK) >> CS_ACK_FAULT_SHIFT) -+#define CS_ACK_FAULT_SET(reg_val, value) \ -+ (((reg_val) & ~CS_ACK_FAULT_MASK) | (((value) << CS_ACK_FAULT_SHIFT) & CS_ACK_FAULT_MASK)) ++ if (index < MAX_QUEUE_GROUP_NUM && kctx->csf.queue_groups[index]) { ++ if (WARN_ON(kctx->csf.queue_groups[index]->handle != index)) ++ return NULL; ++ return kctx->csf.queue_groups[index]; ++ } + -+/* CS_STATUS_CMD_PTR register */ -+#define CS_STATUS_CMD_PTR_POINTER_SHIFT 0 -+#define CS_STATUS_CMD_PTR_POINTER_MASK (0xFFFFFFFFFFFFFFFF << CS_STATUS_CMD_PTR_POINTER_SHIFT) -+#define CS_STATUS_CMD_PTR_POINTER_GET(reg_val) \ -+ (((reg_val)&CS_STATUS_CMD_PTR_POINTER_MASK) >> CS_STATUS_CMD_PTR_POINTER_SHIFT) -+#define CS_STATUS_CMD_PTR_POINTER_SET(reg_val, value) \ -+ (((reg_val) & ~CS_STATUS_CMD_PTR_POINTER_MASK) | \ -+ (((value) << CS_STATUS_CMD_PTR_POINTER_SHIFT) & CS_STATUS_CMD_PTR_POINTER_MASK)) ++ return NULL; ++} + -+/* CS_STATUS_WAIT register */ -+#define CS_STATUS_WAIT_SB_MASK_SHIFT 0 -+#define CS_STATUS_WAIT_SB_MASK_MASK (0xFFFF << CS_STATUS_WAIT_SB_MASK_SHIFT) -+#define CS_STATUS_WAIT_SB_MASK_GET(reg_val) (((reg_val)&CS_STATUS_WAIT_SB_MASK_MASK) >> CS_STATUS_WAIT_SB_MASK_SHIFT) -+#define CS_STATUS_WAIT_SB_MASK_SET(reg_val, value) \ -+ (((reg_val) & ~CS_STATUS_WAIT_SB_MASK_MASK) | \ -+ (((value) << CS_STATUS_WAIT_SB_MASK_SHIFT) & CS_STATUS_WAIT_SB_MASK_MASK)) -+#define CS_STATUS_WAIT_SYNC_WAIT_CONDITION_SHIFT 24 -+#define CS_STATUS_WAIT_SYNC_WAIT_CONDITION_MASK (0xF << CS_STATUS_WAIT_SYNC_WAIT_CONDITION_SHIFT) -+#define CS_STATUS_WAIT_SYNC_WAIT_CONDITION_GET(reg_val) \ -+ (((reg_val)&CS_STATUS_WAIT_SYNC_WAIT_CONDITION_MASK) >> CS_STATUS_WAIT_SYNC_WAIT_CONDITION_SHIFT) -+#define CS_STATUS_WAIT_SYNC_WAIT_CONDITION_SET(reg_val, value) \ -+ (((reg_val) & ~CS_STATUS_WAIT_SYNC_WAIT_CONDITION_MASK) | \ -+ (((value) << CS_STATUS_WAIT_SYNC_WAIT_CONDITION_SHIFT) & CS_STATUS_WAIT_SYNC_WAIT_CONDITION_MASK)) -+/* CS_STATUS_WAIT_SYNC_WAIT_CONDITION values */ -+#define CS_STATUS_WAIT_SYNC_WAIT_CONDITION_LE 0x0 -+#define CS_STATUS_WAIT_SYNC_WAIT_CONDITION_GT 0x1 -+/* End of CS_STATUS_WAIT_SYNC_WAIT_CONDITION values */ -+#define CS_STATUS_WAIT_PROGRESS_WAIT_SHIFT 28 -+#define CS_STATUS_WAIT_PROGRESS_WAIT_MASK (0x1 << CS_STATUS_WAIT_PROGRESS_WAIT_SHIFT) -+#define CS_STATUS_WAIT_PROGRESS_WAIT_GET(reg_val) \ -+ (((reg_val)&CS_STATUS_WAIT_PROGRESS_WAIT_MASK) >> CS_STATUS_WAIT_PROGRESS_WAIT_SHIFT) -+#define CS_STATUS_WAIT_PROGRESS_WAIT_SET(reg_val, value) \ -+ (((reg_val) & ~CS_STATUS_WAIT_PROGRESS_WAIT_MASK) | \ -+ (((value) << CS_STATUS_WAIT_PROGRESS_WAIT_SHIFT) & CS_STATUS_WAIT_PROGRESS_WAIT_MASK)) -+#define CS_STATUS_WAIT_PROTM_PEND_SHIFT 29 -+#define CS_STATUS_WAIT_PROTM_PEND_MASK (0x1 << CS_STATUS_WAIT_PROTM_PEND_SHIFT) -+#define CS_STATUS_WAIT_PROTM_PEND_GET(reg_val) \ -+ (((reg_val)&CS_STATUS_WAIT_PROTM_PEND_MASK) >> CS_STATUS_WAIT_PROTM_PEND_SHIFT) -+#define CS_STATUS_WAIT_PROTM_PEND_SET(reg_val, value) \ -+ (((reg_val) & ~CS_STATUS_WAIT_PROTM_PEND_MASK) | \ -+ (((value) << CS_STATUS_WAIT_PROTM_PEND_SHIFT) & CS_STATUS_WAIT_PROTM_PEND_MASK)) -+#define CS_STATUS_WAIT_SYNC_WAIT_SHIFT 31 -+#define CS_STATUS_WAIT_SYNC_WAIT_MASK (0x1 << CS_STATUS_WAIT_SYNC_WAIT_SHIFT) -+#define CS_STATUS_WAIT_SYNC_WAIT_GET(reg_val) \ -+ (((reg_val)&CS_STATUS_WAIT_SYNC_WAIT_MASK) >> CS_STATUS_WAIT_SYNC_WAIT_SHIFT) -+#define CS_STATUS_WAIT_SYNC_WAIT_SET(reg_val, value) \ -+ (((reg_val) & ~CS_STATUS_WAIT_SYNC_WAIT_MASK) | \ -+ (((value) << CS_STATUS_WAIT_SYNC_WAIT_SHIFT) & CS_STATUS_WAIT_SYNC_WAIT_MASK)) ++struct kbase_queue_group *kbase_csf_find_queue_group(struct kbase_context *kctx, u8 group_handle) ++{ ++ return find_queue_group(kctx, group_handle); ++} ++KBASE_EXPORT_TEST_API(kbase_csf_find_queue_group); + -+/* CS_STATUS_REQ_RESOURCE register */ -+#define CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_SHIFT 0 -+#define CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_MASK (0x1 << CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_SHIFT) -+#define CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_GET(reg_val) \ -+ (((reg_val)&CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_MASK) >> CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_SHIFT) -+#define CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_SET(reg_val, value) \ -+ (((reg_val) & ~CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_MASK) | \ -+ (((value) << CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_SHIFT) & CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_MASK)) -+#define CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_SHIFT 1 -+#define CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_MASK (0x1 << CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_SHIFT) -+#define CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_GET(reg_val) \ -+ (((reg_val)&CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_MASK) >> CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_SHIFT) -+#define CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_SET(reg_val, value) \ -+ (((reg_val) & ~CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_MASK) | \ -+ (((value) << CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_SHIFT) & CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_MASK)) -+#define CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_SHIFT 2 -+#define CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_MASK (0x1 << CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_SHIFT) -+#define CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_GET(reg_val) \ -+ (((reg_val)&CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_MASK) >> CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_SHIFT) -+#define CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_SET(reg_val, value) \ -+ (((reg_val) & ~CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_MASK) | \ -+ (((value) << CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_SHIFT) & CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_MASK)) -+#define CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_SHIFT 3 -+#define CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_MASK (0x1 << CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_SHIFT) -+#define CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_GET(reg_val) \ -+ (((reg_val)&CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_MASK) >> CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_SHIFT) -+#define CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_SET(reg_val, value) \ -+ (((reg_val) & ~CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_MASK) | \ -+ (((value) << CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_SHIFT) & CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_MASK)) ++int kbase_csf_queue_group_handle_is_valid(struct kbase_context *kctx, ++ u8 group_handle) ++{ ++ struct kbase_queue_group *group; + -+/* CS_STATUS_WAIT_SYNC_POINTER register */ -+#define CS_STATUS_WAIT_SYNC_POINTER_POINTER_SHIFT 0 -+#define CS_STATUS_WAIT_SYNC_POINTER_POINTER_MASK (0xFFFFFFFFFFFFFFFF << CS_STATUS_WAIT_SYNC_POINTER_POINTER_SHIFT) -+#define CS_STATUS_WAIT_SYNC_POINTER_POINTER_GET(reg_val) \ -+ (((reg_val)&CS_STATUS_WAIT_SYNC_POINTER_POINTER_MASK) >> CS_STATUS_WAIT_SYNC_POINTER_POINTER_SHIFT) -+#define CS_STATUS_WAIT_SYNC_POINTER_POINTER_SET(reg_val, value) \ -+ (((reg_val) & ~CS_STATUS_WAIT_SYNC_POINTER_POINTER_MASK) | \ -+ (((value) << CS_STATUS_WAIT_SYNC_POINTER_POINTER_SHIFT) & CS_STATUS_WAIT_SYNC_POINTER_POINTER_MASK)) ++ mutex_lock(&kctx->csf.lock); ++ group = find_queue_group(kctx, group_handle); ++ mutex_unlock(&kctx->csf.lock); + -+/* CS_STATUS_WAIT_SYNC_VALUE register */ -+#define CS_STATUS_WAIT_SYNC_VALUE_VALUE_SHIFT 0 -+#define CS_STATUS_WAIT_SYNC_VALUE_VALUE_MASK (0xFFFFFFFF << CS_STATUS_WAIT_SYNC_VALUE_VALUE_SHIFT) -+#define CS_STATUS_WAIT_SYNC_VALUE_VALUE_GET(reg_val) \ -+ (((reg_val)&CS_STATUS_WAIT_SYNC_VALUE_VALUE_MASK) >> CS_STATUS_WAIT_SYNC_VALUE_VALUE_SHIFT) -+#define CS_STATUS_WAIT_SYNC_VALUE_VALUE_SET(reg_val, value) \ -+ (((reg_val) & ~CS_STATUS_WAIT_SYNC_VALUE_VALUE_MASK) | \ -+ (((value) << CS_STATUS_WAIT_SYNC_VALUE_VALUE_SHIFT) & CS_STATUS_WAIT_SYNC_VALUE_VALUE_MASK)) ++ return group ? 0 : -EINVAL; ++} + -+/* CS_FAULT register */ -+#define CS_FAULT_EXCEPTION_TYPE_SHIFT 0 -+#define CS_FAULT_EXCEPTION_TYPE_MASK (0xFF << CS_FAULT_EXCEPTION_TYPE_SHIFT) -+#define CS_FAULT_EXCEPTION_TYPE_GET(reg_val) (((reg_val)&CS_FAULT_EXCEPTION_TYPE_MASK) >> CS_FAULT_EXCEPTION_TYPE_SHIFT) -+#define CS_FAULT_EXCEPTION_TYPE_SET(reg_val, value) \ -+ (((reg_val) & ~CS_FAULT_EXCEPTION_TYPE_MASK) | \ -+ (((value) << CS_FAULT_EXCEPTION_TYPE_SHIFT) & CS_FAULT_EXCEPTION_TYPE_MASK)) -+/* CS_FAULT_EXCEPTION_TYPE values */ -+#define CS_FAULT_EXCEPTION_TYPE_CS_RESOURCE_TERMINATED 0x0F -+#define CS_FAULT_EXCEPTION_TYPE_CS_INHERIT_FAULT 0x4B -+#define CS_FAULT_EXCEPTION_TYPE_INSTR_INVALID_PC 0x50 -+#define CS_FAULT_EXCEPTION_TYPE_INSTR_INVALID_ENC 0x51 -+#define CS_FAULT_EXCEPTION_TYPE_INSTR_BARRIER_FAULT 0x55 -+#define CS_FAULT_EXCEPTION_TYPE_DATA_INVALID_FAULT 0x58 -+#define CS_FAULT_EXCEPTION_TYPE_TILE_RANGE_FAULT 0x59 -+#define CS_FAULT_EXCEPTION_TYPE_ADDR_RANGE_FAULT 0x5A -+#define CS_FAULT_EXCEPTION_TYPE_IMPRECISE_FAULT 0x5B -+#define CS_FAULT_EXCEPTION_TYPE_RESOURCE_EVICTION_TIMEOUT 0x69 -+/* End of CS_FAULT_EXCEPTION_TYPE values */ -+#define CS_FAULT_EXCEPTION_DATA_SHIFT 8 -+#define CS_FAULT_EXCEPTION_DATA_MASK (0xFFFFFF << CS_FAULT_EXCEPTION_DATA_SHIFT) -+#define CS_FAULT_EXCEPTION_DATA_GET(reg_val) (((reg_val)&CS_FAULT_EXCEPTION_DATA_MASK) >> CS_FAULT_EXCEPTION_DATA_SHIFT) -+#define CS_FAULT_EXCEPTION_DATA_SET(reg_val, value) \ -+ (((reg_val) & ~CS_FAULT_EXCEPTION_DATA_MASK) | \ -+ (((value) << CS_FAULT_EXCEPTION_DATA_SHIFT) & CS_FAULT_EXCEPTION_DATA_MASK)) ++static struct kbase_queue *find_queue(struct kbase_context *kctx, u64 base_addr) ++{ ++ struct kbase_queue *queue; + -+/* CS_FATAL register */ -+#define CS_FATAL_EXCEPTION_TYPE_SHIFT 0 -+#define CS_FATAL_EXCEPTION_TYPE_MASK (0xFF << CS_FATAL_EXCEPTION_TYPE_SHIFT) -+#define CS_FATAL_EXCEPTION_TYPE_GET(reg_val) (((reg_val)&CS_FATAL_EXCEPTION_TYPE_MASK) >> CS_FATAL_EXCEPTION_TYPE_SHIFT) -+#define CS_FATAL_EXCEPTION_TYPE_SET(reg_val, value) \ -+ (((reg_val) & ~CS_FATAL_EXCEPTION_TYPE_MASK) | \ -+ (((value) << CS_FATAL_EXCEPTION_TYPE_SHIFT) & CS_FATAL_EXCEPTION_TYPE_MASK)) -+/* CS_FATAL_EXCEPTION_TYPE values */ -+#define CS_FATAL_EXCEPTION_TYPE_CS_CONFIG_FAULT 0x40 -+#define CS_FATAL_EXCEPTION_TYPE_CS_ENDPOINT_FAULT 0x44 -+#define CS_FATAL_EXCEPTION_TYPE_CS_BUS_FAULT 0x48 -+#define CS_FATAL_EXCEPTION_TYPE_CS_INVALID_INSTRUCTION 0x49 -+#define CS_FATAL_EXCEPTION_TYPE_CS_CALL_STACK_OVERFLOW 0x4A -+#define CS_FATAL_EXCEPTION_TYPE_FIRMWARE_INTERNAL_ERROR 0x68 -+/* End of CS_FATAL_EXCEPTION_TYPE values */ -+#define CS_FATAL_EXCEPTION_DATA_SHIFT 8 -+#define CS_FATAL_EXCEPTION_DATA_MASK (0xFFFFFF << CS_FATAL_EXCEPTION_DATA_SHIFT) -+#define CS_FATAL_EXCEPTION_DATA_GET(reg_val) (((reg_val)&CS_FATAL_EXCEPTION_DATA_MASK) >> CS_FATAL_EXCEPTION_DATA_SHIFT) -+#define CS_FATAL_EXCEPTION_DATA_SET(reg_val, value) \ -+ (((reg_val) & ~CS_FATAL_EXCEPTION_DATA_MASK) | \ -+ (((value) << CS_FATAL_EXCEPTION_DATA_SHIFT) & CS_FATAL_EXCEPTION_DATA_MASK)) ++ lockdep_assert_held(&kctx->csf.lock); + -+/* CS_FAULT_INFO register */ -+#define CS_FAULT_INFO_EXCEPTION_DATA_SHIFT 0 -+#define CS_FAULT_INFO_EXCEPTION_DATA_MASK (0xFFFFFFFFFFFFFFFF << CS_FAULT_INFO_EXCEPTION_DATA_SHIFT) -+#define CS_FAULT_INFO_EXCEPTION_DATA_GET(reg_val) \ -+ (((reg_val)&CS_FAULT_INFO_EXCEPTION_DATA_MASK) >> CS_FAULT_INFO_EXCEPTION_DATA_SHIFT) -+#define CS_FAULT_INFO_EXCEPTION_DATA_SET(reg_val, value) \ -+ (((reg_val) & ~CS_FAULT_INFO_EXCEPTION_DATA_MASK) | \ -+ (((value) << CS_FAULT_INFO_EXCEPTION_DATA_SHIFT) & CS_FAULT_INFO_EXCEPTION_DATA_MASK)) ++ list_for_each_entry(queue, &kctx->csf.queue_list, link) { ++ if (base_addr == queue->base_addr) ++ return queue; ++ } + -+/* CS_FATAL_INFO register */ -+#define CS_FATAL_INFO_EXCEPTION_DATA_SHIFT 0 -+#define CS_FATAL_INFO_EXCEPTION_DATA_MASK (0xFFFFFFFFFFFFFFFF << CS_FATAL_INFO_EXCEPTION_DATA_SHIFT) -+#define CS_FATAL_INFO_EXCEPTION_DATA_GET(reg_val) \ -+ (((reg_val)&CS_FATAL_INFO_EXCEPTION_DATA_MASK) >> CS_FATAL_INFO_EXCEPTION_DATA_SHIFT) -+#define CS_FATAL_INFO_EXCEPTION_DATA_SET(reg_val, value) \ -+ (((reg_val) & ~CS_FATAL_INFO_EXCEPTION_DATA_MASK) | \ -+ (((value) << CS_FATAL_INFO_EXCEPTION_DATA_SHIFT) & CS_FATAL_INFO_EXCEPTION_DATA_MASK)) ++ return NULL; ++} + -+/* CS_HEAP_VT_START register */ -+#define CS_HEAP_VT_START_VALUE_SHIFT 0 -+#define CS_HEAP_VT_START_VALUE_MASK (0xFFFFFFFF << CS_HEAP_VT_START_VALUE_SHIFT) -+#define CS_HEAP_VT_START_VALUE_GET(reg_val) (((reg_val)&CS_HEAP_VT_START_VALUE_MASK) >> CS_HEAP_VT_START_VALUE_SHIFT) -+#define CS_HEAP_VT_START_VALUE_SET(reg_val, value) \ -+ (((reg_val) & ~CS_HEAP_VT_START_VALUE_MASK) | \ -+ (((value) << CS_HEAP_VT_START_VALUE_SHIFT) & CS_HEAP_VT_START_VALUE_MASK)) ++static void get_queue(struct kbase_queue *queue) ++{ ++ WARN_ON(!kbase_refcount_inc_not_zero(&queue->refcount)); ++} + -+/* CS_HEAP_VT_END register */ -+#define CS_HEAP_VT_END_VALUE_SHIFT 0 -+#define CS_HEAP_VT_END_VALUE_MASK (0xFFFFFFFF << CS_HEAP_VT_END_VALUE_SHIFT) -+#define CS_HEAP_VT_END_VALUE_GET(reg_val) (((reg_val)&CS_HEAP_VT_END_VALUE_MASK) >> CS_HEAP_VT_END_VALUE_SHIFT) -+#define CS_HEAP_VT_END_VALUE_SET(reg_val, value) \ -+ (((reg_val) & ~CS_HEAP_VT_END_VALUE_MASK) | (((value) << CS_HEAP_VT_END_VALUE_SHIFT) & CS_HEAP_VT_END_VALUE_MASK)) ++static void release_queue(struct kbase_queue *queue) ++{ ++ lockdep_assert_held(&queue->kctx->csf.lock); ++ if (kbase_refcount_dec_and_test(&queue->refcount)) { ++ /* The queue can't still be on the per context list. */ ++ WARN_ON(!list_empty(&queue->link)); ++ WARN_ON(queue->group); ++ dev_dbg(queue->kctx->kbdev->dev, ++ "Remove any pending command queue fatal from ctx %d_%d", ++ queue->kctx->tgid, queue->kctx->id); ++ kbase_csf_event_remove_error(queue->kctx, &queue->error); ++ ++ /* After this the Userspace would be able to free the ++ * memory for GPU queue. In case the Userspace missed ++ * terminating the queue, the cleanup will happen on ++ * context termination where tear down of region tracker ++ * would free up the GPU queue memory. ++ */ ++ kbase_gpu_vm_lock(queue->kctx); ++ kbase_va_region_no_user_free_dec(queue->queue_reg); ++ kbase_gpu_vm_unlock(queue->kctx); + -+/* CS_HEAP_FRAG_END register */ -+#define CS_HEAP_FRAG_END_VALUE_SHIFT 0 -+#define CS_HEAP_FRAG_END_VALUE_MASK (0xFFFFFFFF << CS_HEAP_FRAG_END_VALUE_SHIFT) -+#define CS_HEAP_FRAG_END_VALUE_GET(reg_val) (((reg_val)&CS_HEAP_FRAG_END_VALUE_MASK) >> CS_HEAP_FRAG_END_VALUE_SHIFT) -+#define CS_HEAP_FRAG_END_VALUE_SET(reg_val, value) \ -+ (((reg_val) & ~CS_HEAP_FRAG_END_VALUE_MASK) | \ -+ (((value) << CS_HEAP_FRAG_END_VALUE_SHIFT) & CS_HEAP_FRAG_END_VALUE_MASK)) ++ kfree(queue); ++ } ++} + -+/* CS_HEAP_ADDRESS register */ -+#define CS_HEAP_ADDRESS_POINTER_SHIFT 0 -+#define CS_HEAP_ADDRESS_POINTER_MASK (0xFFFFFFFFFFFFFFFF << CS_HEAP_ADDRESS_POINTER_SHIFT) -+#define CS_HEAP_ADDRESS_POINTER_GET(reg_val) (((reg_val)&CS_HEAP_ADDRESS_POINTER_MASK) >> CS_HEAP_ADDRESS_POINTER_SHIFT) -+#define CS_HEAP_ADDRESS_POINTER_SET(reg_val, value) \ -+ (((reg_val) & ~CS_HEAP_ADDRESS_POINTER_MASK) | \ -+ (((value) << CS_HEAP_ADDRESS_POINTER_SHIFT) & CS_HEAP_ADDRESS_POINTER_MASK)) -+/* End of CS_KERNEL_OUTPUT_BLOCK register set definitions */ ++static void oom_event_worker(struct work_struct *data); ++static void cs_error_worker(struct work_struct *data); + -+/* CS_USER_INPUT_BLOCK register set definitions */ ++/* Between reg and reg_ex, one and only one must be null */ ++static int csf_queue_register_internal(struct kbase_context *kctx, ++ struct kbase_ioctl_cs_queue_register *reg, ++ struct kbase_ioctl_cs_queue_register_ex *reg_ex) ++{ ++ struct kbase_queue *queue; ++ int ret = 0; ++ struct kbase_va_region *region; ++ u64 queue_addr; ++ size_t queue_size; + -+/* CS_INSERT register */ -+#define CS_INSERT_VALUE_SHIFT 0 -+#define CS_INSERT_VALUE_MASK (0xFFFFFFFFFFFFFFFF << CS_INSERT_VALUE_SHIFT) -+#define CS_INSERT_VALUE_GET(reg_val) (((reg_val)&CS_INSERT_VALUE_MASK) >> CS_INSERT_VALUE_SHIFT) -+#define CS_INSERT_VALUE_SET(reg_val, value) \ -+ (((reg_val) & ~CS_INSERT_VALUE_MASK) | (((value) << CS_INSERT_VALUE_SHIFT) & CS_INSERT_VALUE_MASK)) ++ /* Only one pointer expected, otherwise coding error */ ++ if ((reg == NULL && reg_ex == NULL) || (reg && reg_ex)) { ++ dev_dbg(kctx->kbdev->dev, ++ "Error, one and only one param-ptr expected!"); ++ return -EINVAL; ++ } + -+/* CS_EXTRACT_INIT register */ -+#define CS_EXTRACT_INIT_VALUE_SHIFT 0 -+#define CS_EXTRACT_INIT_VALUE_MASK (0xFFFFFFFFFFFFFFFF << CS_EXTRACT_INIT_VALUE_SHIFT) -+#define CS_EXTRACT_INIT_VALUE_GET(reg_val) (((reg_val)&CS_EXTRACT_INIT_VALUE_MASK) >> CS_EXTRACT_INIT_VALUE_SHIFT) -+#define CS_EXTRACT_INIT_VALUE_SET(reg_val, value) \ -+ (((reg_val) & ~CS_EXTRACT_INIT_VALUE_MASK) | \ -+ (((value) << CS_EXTRACT_INIT_VALUE_SHIFT) & CS_EXTRACT_INIT_VALUE_MASK)) -+/* End of CS_USER_INPUT_BLOCK register set definitions */ ++ /* struct kbase_ioctl_cs_queue_register_ex contains a full ++ * struct kbase_ioctl_cs_queue_register at the start address. So ++ * the pointer can be safely cast to pointing to a ++ * kbase_ioctl_cs_queue_register object. ++ */ ++ if (reg_ex) ++ reg = (struct kbase_ioctl_cs_queue_register *)reg_ex; + -+/* CS_USER_OUTPUT_BLOCK register set definitions */ ++ /* Validate the queue priority */ ++ if (reg->priority > BASE_QUEUE_MAX_PRIORITY) ++ return -EINVAL; + -+/* CS_EXTRACT register */ -+#define CS_EXTRACT_VALUE_SHIFT 0 -+#define CS_EXTRACT_VALUE_MASK (0xFFFFFFFFFFFFFFFF << CS_EXTRACT_VALUE_SHIFT) -+#define CS_EXTRACT_VALUE_GET(reg_val) (((reg_val)&CS_EXTRACT_VALUE_MASK) >> CS_EXTRACT_VALUE_SHIFT) -+#define CS_EXTRACT_VALUE_SET(reg_val, value) \ -+ (((reg_val) & ~CS_EXTRACT_VALUE_MASK) | (((value) << CS_EXTRACT_VALUE_SHIFT) & CS_EXTRACT_VALUE_MASK)) ++ queue_addr = reg->buffer_gpu_addr; ++ queue_size = reg->buffer_size >> PAGE_SHIFT; + -+/* CS_ACTIVE register */ -+#define CS_ACTIVE_HW_ACTIVE_SHIFT 0 -+#define CS_ACTIVE_HW_ACTIVE_MASK (0x1 << CS_ACTIVE_HW_ACTIVE_SHIFT) -+#define CS_ACTIVE_HW_ACTIVE_GET(reg_val) (((reg_val)&CS_ACTIVE_HW_ACTIVE_MASK) >> CS_ACTIVE_HW_ACTIVE_SHIFT) -+#define CS_ACTIVE_HW_ACTIVE_SET(reg_val, value) \ -+ (((reg_val) & ~CS_ACTIVE_HW_ACTIVE_MASK) | (((value) << CS_ACTIVE_HW_ACTIVE_SHIFT) & CS_ACTIVE_HW_ACTIVE_MASK)) -+/* End of CS_USER_OUTPUT_BLOCK register set definitions */ ++ mutex_lock(&kctx->csf.lock); + -+/* CSG_INPUT_BLOCK register set definitions */ ++ /* Check if queue is already registered */ ++ if (find_queue(kctx, queue_addr) != NULL) { ++ ret = -EINVAL; ++ goto out; ++ } + -+/* CSG_REQ register */ -+#define CSG_REQ_STATE_SHIFT 0 -+#define CSG_REQ_STATE_MASK (0x7 << CSG_REQ_STATE_SHIFT) -+#define CSG_REQ_STATE_GET(reg_val) (((reg_val)&CSG_REQ_STATE_MASK) >> CSG_REQ_STATE_SHIFT) -+#define CSG_REQ_STATE_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_REQ_STATE_MASK) | (((value) << CSG_REQ_STATE_SHIFT) & CSG_REQ_STATE_MASK)) -+/* CSG_REQ_STATE values */ -+#define CSG_REQ_STATE_TERMINATE 0x0 -+#define CSG_REQ_STATE_START 0x1 -+#define CSG_REQ_STATE_SUSPEND 0x2 -+#define CSG_REQ_STATE_RESUME 0x3 -+/* End of CSG_REQ_STATE values */ -+#define CSG_REQ_EP_CFG_SHIFT 4 -+#define CSG_REQ_EP_CFG_MASK (0x1 << CSG_REQ_EP_CFG_SHIFT) -+#define CSG_REQ_EP_CFG_GET(reg_val) (((reg_val)&CSG_REQ_EP_CFG_MASK) >> CSG_REQ_EP_CFG_SHIFT) -+#define CSG_REQ_EP_CFG_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_REQ_EP_CFG_MASK) | (((value) << CSG_REQ_EP_CFG_SHIFT) & CSG_REQ_EP_CFG_MASK)) -+#define CSG_REQ_STATUS_UPDATE_SHIFT 5 -+#define CSG_REQ_STATUS_UPDATE_MASK (0x1 << CSG_REQ_STATUS_UPDATE_SHIFT) -+#define CSG_REQ_STATUS_UPDATE_GET(reg_val) (((reg_val)&CSG_REQ_STATUS_UPDATE_MASK) >> CSG_REQ_STATUS_UPDATE_SHIFT) -+#define CSG_REQ_STATUS_UPDATE_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_REQ_STATUS_UPDATE_MASK) | \ -+ (((value) << CSG_REQ_STATUS_UPDATE_SHIFT) & CSG_REQ_STATUS_UPDATE_MASK)) -+#define CSG_REQ_SYNC_UPDATE_SHIFT 28 -+#define CSG_REQ_SYNC_UPDATE_MASK (0x1 << CSG_REQ_SYNC_UPDATE_SHIFT) -+#define CSG_REQ_SYNC_UPDATE_GET(reg_val) (((reg_val)&CSG_REQ_SYNC_UPDATE_MASK) >> CSG_REQ_SYNC_UPDATE_SHIFT) -+#define CSG_REQ_SYNC_UPDATE_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_REQ_SYNC_UPDATE_MASK) | (((value) << CSG_REQ_SYNC_UPDATE_SHIFT) & CSG_REQ_SYNC_UPDATE_MASK)) -+#define CSG_REQ_IDLE_SHIFT 29 -+#define CSG_REQ_IDLE_MASK (0x1 << CSG_REQ_IDLE_SHIFT) -+#define CSG_REQ_IDLE_GET(reg_val) (((reg_val)&CSG_REQ_IDLE_MASK) >> CSG_REQ_IDLE_SHIFT) -+#define CSG_REQ_IDLE_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_REQ_IDLE_MASK) | (((value) << CSG_REQ_IDLE_SHIFT) & CSG_REQ_IDLE_MASK)) -+#define CSG_REQ_DOORBELL_SHIFT 30 -+#define CSG_REQ_DOORBELL_MASK (0x1 << CSG_REQ_DOORBELL_SHIFT) -+#define CSG_REQ_DOORBELL_GET(reg_val) (((reg_val)&CSG_REQ_DOORBELL_MASK) >> CSG_REQ_DOORBELL_SHIFT) -+#define CSG_REQ_DOORBELL_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_REQ_DOORBELL_MASK) | (((value) << CSG_REQ_DOORBELL_SHIFT) & CSG_REQ_DOORBELL_MASK)) -+#define CSG_REQ_PROGRESS_TIMER_EVENT_SHIFT 31 -+#define CSG_REQ_PROGRESS_TIMER_EVENT_MASK (0x1 << CSG_REQ_PROGRESS_TIMER_EVENT_SHIFT) -+#define CSG_REQ_PROGRESS_TIMER_EVENT_GET(reg_val) \ -+ (((reg_val)&CSG_REQ_PROGRESS_TIMER_EVENT_MASK) >> CSG_REQ_PROGRESS_TIMER_EVENT_SHIFT) -+#define CSG_REQ_PROGRESS_TIMER_EVENT_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_REQ_PROGRESS_TIMER_EVENT_MASK) | \ -+ (((value) << CSG_REQ_PROGRESS_TIMER_EVENT_SHIFT) & CSG_REQ_PROGRESS_TIMER_EVENT_MASK)) ++ /* Check if the queue address is valid */ ++ kbase_gpu_vm_lock(kctx); ++ region = kbase_region_tracker_find_region_enclosing_address(kctx, ++ queue_addr); + -+/* CSG_ACK_IRQ_MASK register */ -+#define CSG_ACK_IRQ_MASK_STATE_SHIFT 0 -+#define CSG_ACK_IRQ_MASK_STATE_MASK (0x7 << CSG_ACK_IRQ_MASK_STATE_SHIFT) -+#define CSG_ACK_IRQ_MASK_STATE_GET(reg_val) (((reg_val)&CSG_ACK_IRQ_MASK_STATE_MASK) >> CSG_ACK_IRQ_MASK_STATE_SHIFT) -+#define CSG_ACK_IRQ_MASK_STATE_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_ACK_IRQ_MASK_STATE_MASK) | \ -+ (((value) << CSG_ACK_IRQ_MASK_STATE_SHIFT) & CSG_ACK_IRQ_MASK_STATE_MASK)) -+/* CSG_ACK_IRQ_MASK_STATE values */ -+#define CSG_ACK_IRQ_MASK_STATE_DISABLED 0x0 -+#define CSG_ACK_IRQ_MASK_STATE_ENABLED 0x7 -+/* End of CSG_ACK_IRQ_MASK_STATE values */ -+#define CSG_ACK_IRQ_MASK_EP_CFG_SHIFT 4 -+#define CSG_ACK_IRQ_MASK_EP_CFG_MASK (0x1 << CSG_ACK_IRQ_MASK_EP_CFG_SHIFT) -+#define CSG_ACK_IRQ_MASK_EP_CFG_GET(reg_val) (((reg_val)&CSG_ACK_IRQ_MASK_EP_CFG_MASK) >> CSG_ACK_IRQ_MASK_EP_CFG_SHIFT) -+#define CSG_ACK_IRQ_MASK_EP_CFG_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_ACK_IRQ_MASK_EP_CFG_MASK) | \ -+ (((value) << CSG_ACK_IRQ_MASK_EP_CFG_SHIFT) & CSG_ACK_IRQ_MASK_EP_CFG_MASK)) -+#define CSG_ACK_IRQ_MASK_STATUS_UPDATE_SHIFT 5 -+#define CSG_ACK_IRQ_MASK_STATUS_UPDATE_MASK (0x1 << CSG_ACK_IRQ_MASK_STATUS_UPDATE_SHIFT) -+#define CSG_ACK_IRQ_MASK_STATUS_UPDATE_GET(reg_val) \ -+ (((reg_val)&CSG_ACK_IRQ_MASK_STATUS_UPDATE_MASK) >> CSG_ACK_IRQ_MASK_STATUS_UPDATE_SHIFT) -+#define CSG_ACK_IRQ_MASK_STATUS_UPDATE_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_ACK_IRQ_MASK_STATUS_UPDATE_MASK) | \ -+ (((value) << CSG_ACK_IRQ_MASK_STATUS_UPDATE_SHIFT) & CSG_ACK_IRQ_MASK_STATUS_UPDATE_MASK)) -+#define CSG_ACK_IRQ_MASK_SYNC_UPDATE_SHIFT 28 -+#define CSG_ACK_IRQ_MASK_SYNC_UPDATE_MASK (0x1 << CSG_ACK_IRQ_MASK_SYNC_UPDATE_SHIFT) -+#define CSG_ACK_IRQ_MASK_SYNC_UPDATE_GET(reg_val) \ -+ (((reg_val)&CSG_ACK_IRQ_MASK_SYNC_UPDATE_MASK) >> CSG_ACK_IRQ_MASK_SYNC_UPDATE_SHIFT) -+#define CSG_ACK_IRQ_MASK_SYNC_UPDATE_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_ACK_IRQ_MASK_SYNC_UPDATE_MASK) | \ -+ (((value) << CSG_ACK_IRQ_MASK_SYNC_UPDATE_SHIFT) & CSG_ACK_IRQ_MASK_SYNC_UPDATE_MASK)) -+#define CSG_ACK_IRQ_MASK_IDLE_SHIFT 29 -+#define CSG_ACK_IRQ_MASK_IDLE_MASK (0x1 << CSG_ACK_IRQ_MASK_IDLE_SHIFT) -+#define CSG_ACK_IRQ_MASK_IDLE_GET(reg_val) (((reg_val)&CSG_ACK_IRQ_MASK_IDLE_MASK) >> CSG_ACK_IRQ_MASK_IDLE_SHIFT) -+#define CSG_ACK_IRQ_MASK_IDLE_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_ACK_IRQ_MASK_IDLE_MASK) | \ -+ (((value) << CSG_ACK_IRQ_MASK_IDLE_SHIFT) & CSG_ACK_IRQ_MASK_IDLE_MASK)) -+#define CSG_ACK_IRQ_MASK_DOORBELL_SHIFT 30 -+#define CSG_ACK_IRQ_MASK_DOORBELL_MASK (0x1 << CSG_ACK_IRQ_MASK_DOORBELL_SHIFT) -+#define CSG_ACK_IRQ_MASK_DOORBELL_GET(reg_val) \ -+ (((reg_val)&CSG_ACK_IRQ_MASK_DOORBELL_MASK) >> CSG_ACK_IRQ_MASK_DOORBELL_SHIFT) -+#define CSG_ACK_IRQ_MASK_DOORBELL_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_ACK_IRQ_MASK_DOORBELL_MASK) | \ -+ (((value) << CSG_ACK_IRQ_MASK_DOORBELL_SHIFT) & CSG_ACK_IRQ_MASK_DOORBELL_MASK)) -+#define CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_SHIFT 31 -+#define CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_MASK (0x1 << CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_SHIFT) -+#define CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_GET(reg_val) \ -+ (((reg_val)&CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_MASK) >> CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_SHIFT) -+#define CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_MASK) | \ -+ (((value) << CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_SHIFT) & CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_MASK)) ++ if (kbase_is_region_invalid_or_free(region) || kbase_is_region_shrinkable(region) || ++ region->gpu_alloc->type != KBASE_MEM_TYPE_NATIVE) { ++ ret = -ENOENT; ++ goto out_unlock_vm; ++ } + -+/* CSG_EP_REQ register */ -+#define CSG_EP_REQ_COMPUTE_EP_SHIFT 0 -+#define CSG_EP_REQ_COMPUTE_EP_MASK (0xFF << CSG_EP_REQ_COMPUTE_EP_SHIFT) -+#define CSG_EP_REQ_COMPUTE_EP_GET(reg_val) (((reg_val)&CSG_EP_REQ_COMPUTE_EP_MASK) >> CSG_EP_REQ_COMPUTE_EP_SHIFT) -+#define CSG_EP_REQ_COMPUTE_EP_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_EP_REQ_COMPUTE_EP_MASK) | \ -+ (((value) << CSG_EP_REQ_COMPUTE_EP_SHIFT) & CSG_EP_REQ_COMPUTE_EP_MASK)) -+#define CSG_EP_REQ_FRAGMENT_EP_SHIFT 8 -+#define CSG_EP_REQ_FRAGMENT_EP_MASK (0xFF << CSG_EP_REQ_FRAGMENT_EP_SHIFT) -+#define CSG_EP_REQ_FRAGMENT_EP_GET(reg_val) (((reg_val)&CSG_EP_REQ_FRAGMENT_EP_MASK) >> CSG_EP_REQ_FRAGMENT_EP_SHIFT) -+#define CSG_EP_REQ_FRAGMENT_EP_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_EP_REQ_FRAGMENT_EP_MASK) | \ -+ (((value) << CSG_EP_REQ_FRAGMENT_EP_SHIFT) & CSG_EP_REQ_FRAGMENT_EP_MASK)) -+#define CSG_EP_REQ_TILER_EP_SHIFT 16 -+#define CSG_EP_REQ_TILER_EP_MASK (0xF << CSG_EP_REQ_TILER_EP_SHIFT) -+#define CSG_EP_REQ_TILER_EP_GET(reg_val) (((reg_val)&CSG_EP_REQ_TILER_EP_MASK) >> CSG_EP_REQ_TILER_EP_SHIFT) -+#define CSG_EP_REQ_TILER_EP_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_EP_REQ_TILER_EP_MASK) | (((value) << CSG_EP_REQ_TILER_EP_SHIFT) & CSG_EP_REQ_TILER_EP_MASK)) -+#define CSG_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT 20 -+#define CSG_EP_REQ_EXCLUSIVE_COMPUTE_MASK (0x1 << CSG_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT) -+#define CSG_EP_REQ_EXCLUSIVE_COMPUTE_GET(reg_val) \ -+ (((reg_val)&CSG_EP_REQ_EXCLUSIVE_COMPUTE_MASK) >> CSG_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT) -+#define CSG_EP_REQ_EXCLUSIVE_COMPUTE_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_EP_REQ_EXCLUSIVE_COMPUTE_MASK) | \ -+ (((value) << CSG_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT) & CSG_EP_REQ_EXCLUSIVE_COMPUTE_MASK)) -+#define CSG_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT 21 -+#define CSG_EP_REQ_EXCLUSIVE_FRAGMENT_MASK (0x1 << CSG_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT) -+#define CSG_EP_REQ_EXCLUSIVE_FRAGMENT_GET(reg_val) \ -+ (((reg_val)&CSG_EP_REQ_EXCLUSIVE_FRAGMENT_MASK) >> CSG_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT) -+#define CSG_EP_REQ_EXCLUSIVE_FRAGMENT_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_EP_REQ_EXCLUSIVE_FRAGMENT_MASK) | \ -+ (((value) << CSG_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT) & CSG_EP_REQ_EXCLUSIVE_FRAGMENT_MASK)) -+#define CSG_EP_REQ_PRIORITY_SHIFT 28 -+#define CSG_EP_REQ_PRIORITY_MASK (0xF << CSG_EP_REQ_PRIORITY_SHIFT) -+#define CSG_EP_REQ_PRIORITY_GET(reg_val) (((reg_val)&CSG_EP_REQ_PRIORITY_MASK) >> CSG_EP_REQ_PRIORITY_SHIFT) -+#define CSG_EP_REQ_PRIORITY_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_EP_REQ_PRIORITY_MASK) | (((value) << CSG_EP_REQ_PRIORITY_SHIFT) & CSG_EP_REQ_PRIORITY_MASK)) ++ if (queue_size > (region->nr_pages - ++ ((queue_addr >> PAGE_SHIFT) - region->start_pfn))) { ++ ret = -EINVAL; ++ goto out_unlock_vm; ++ } + -+/* CSG_SUSPEND_BUF register */ -+#define CSG_SUSPEND_BUF_POINTER_SHIFT 0 -+#define CSG_SUSPEND_BUF_POINTER_MASK (0xFFFFFFFFFFFFFFFF << CSG_SUSPEND_BUF_POINTER_SHIFT) -+#define CSG_SUSPEND_BUF_POINTER_GET(reg_val) (((reg_val)&CSG_SUSPEND_BUF_POINTER_MASK) >> CSG_SUSPEND_BUF_POINTER_SHIFT) -+#define CSG_SUSPEND_BUF_POINTER_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_SUSPEND_BUF_POINTER_MASK) | \ -+ (((value) << CSG_SUSPEND_BUF_POINTER_SHIFT) & CSG_SUSPEND_BUF_POINTER_MASK)) ++ /* Check address validity on cs_trace buffer etc. Don't care ++ * if not enabled (i.e. when size is 0). ++ */ ++ if (reg_ex && reg_ex->ex_buffer_size) { ++ int buf_pages = (reg_ex->ex_buffer_size + ++ (1 << PAGE_SHIFT) - 1) >> PAGE_SHIFT; ++ struct kbase_va_region *region_ex = ++ kbase_region_tracker_find_region_enclosing_address(kctx, ++ reg_ex->ex_buffer_base); + -+/* CSG_PROTM_SUSPEND_BUF register */ -+#define CSG_PROTM_SUSPEND_BUF_POINTER_SHIFT 0 -+#define CSG_PROTM_SUSPEND_BUF_POINTER_MASK (0xFFFFFFFFFFFFFFFF << CSG_PROTM_SUSPEND_BUF_POINTER_SHIFT) -+#define CSG_PROTM_SUSPEND_BUF_POINTER_GET(reg_val) \ -+ (((reg_val)&CSG_PROTM_SUSPEND_BUF_POINTER_MASK) >> CSG_PROTM_SUSPEND_BUF_POINTER_SHIFT) -+#define CSG_PROTM_SUSPEND_BUF_POINTER_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_PROTM_SUSPEND_BUF_POINTER_MASK) | \ -+ (((value) << CSG_PROTM_SUSPEND_BUF_POINTER_SHIFT) & CSG_PROTM_SUSPEND_BUF_POINTER_MASK)) ++ if (kbase_is_region_invalid_or_free(region_ex)) { ++ ret = -ENOENT; ++ goto out_unlock_vm; ++ } + -+/* End of CSG_INPUT_BLOCK register set definitions */ ++ if (buf_pages > (region_ex->nr_pages - ++ ((reg_ex->ex_buffer_base >> PAGE_SHIFT) - region_ex->start_pfn))) { ++ ret = -EINVAL; ++ goto out_unlock_vm; ++ } + -+/* CSG_OUTPUT_BLOCK register set definitions */ -+ -+/* CSG_ACK register */ -+#define CSG_ACK_STATE_SHIFT 0 -+#define CSG_ACK_STATE_MASK (0x7 << CSG_ACK_STATE_SHIFT) -+#define CSG_ACK_STATE_GET(reg_val) (((reg_val)&CSG_ACK_STATE_MASK) >> CSG_ACK_STATE_SHIFT) -+#define CSG_ACK_STATE_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_ACK_STATE_MASK) | (((value) << CSG_ACK_STATE_SHIFT) & CSG_ACK_STATE_MASK)) -+/* CSG_ACK_STATE values */ -+#define CSG_ACK_STATE_TERMINATE 0x0 -+#define CSG_ACK_STATE_START 0x1 -+#define CSG_ACK_STATE_SUSPEND 0x2 -+#define CSG_ACK_STATE_RESUME 0x3 -+/* End of CSG_ACK_STATE values */ -+#define CSG_ACK_EP_CFG_SHIFT 4 -+#define CSG_ACK_EP_CFG_MASK (0x1 << CSG_ACK_EP_CFG_SHIFT) -+#define CSG_ACK_EP_CFG_GET(reg_val) (((reg_val)&CSG_ACK_EP_CFG_MASK) >> CSG_ACK_EP_CFG_SHIFT) -+#define CSG_ACK_EP_CFG_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_ACK_EP_CFG_MASK) | (((value) << CSG_ACK_EP_CFG_SHIFT) & CSG_ACK_EP_CFG_MASK)) -+#define CSG_ACK_STATUS_UPDATE_SHIFT 5 -+#define CSG_ACK_STATUS_UPDATE_MASK (0x1 << CSG_ACK_STATUS_UPDATE_SHIFT) -+#define CSG_ACK_STATUS_UPDATE_GET(reg_val) (((reg_val)&CSG_ACK_STATUS_UPDATE_MASK) >> CSG_ACK_STATUS_UPDATE_SHIFT) -+#define CSG_ACK_STATUS_UPDATE_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_ACK_STATUS_UPDATE_MASK) | \ -+ (((value) << CSG_ACK_STATUS_UPDATE_SHIFT) & CSG_ACK_STATUS_UPDATE_MASK)) -+#define CSG_ACK_SYNC_UPDATE_SHIFT 28 -+#define CSG_ACK_SYNC_UPDATE_MASK (0x1 << CSG_ACK_SYNC_UPDATE_SHIFT) -+#define CSG_ACK_SYNC_UPDATE_GET(reg_val) (((reg_val)&CSG_ACK_SYNC_UPDATE_MASK) >> CSG_ACK_SYNC_UPDATE_SHIFT) -+#define CSG_ACK_SYNC_UPDATE_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_ACK_SYNC_UPDATE_MASK) | (((value) << CSG_ACK_SYNC_UPDATE_SHIFT) & CSG_ACK_SYNC_UPDATE_MASK)) -+#define CSG_ACK_IDLE_SHIFT 29 -+#define CSG_ACK_IDLE_MASK (0x1 << CSG_ACK_IDLE_SHIFT) -+#define CSG_ACK_IDLE_GET(reg_val) (((reg_val)&CSG_ACK_IDLE_MASK) >> CSG_ACK_IDLE_SHIFT) -+#define CSG_ACK_IDLE_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_ACK_IDLE_MASK) | (((value) << CSG_ACK_IDLE_SHIFT) & CSG_ACK_IDLE_MASK)) -+#define CSG_ACK_DOORBELL_SHIFT 30 -+#define CSG_ACK_DOORBELL_MASK (0x1 << CSG_ACK_DOORBELL_SHIFT) -+#define CSG_ACK_DOORBELL_GET(reg_val) (((reg_val)&CSG_ACK_DOORBELL_MASK) >> CSG_ACK_DOORBELL_SHIFT) -+#define CSG_ACK_DOORBELL_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_ACK_DOORBELL_MASK) | (((value) << CSG_ACK_DOORBELL_SHIFT) & CSG_ACK_DOORBELL_MASK)) -+#define CSG_ACK_PROGRESS_TIMER_EVENT_SHIFT 31 -+#define CSG_ACK_PROGRESS_TIMER_EVENT_MASK (0x1 << CSG_ACK_PROGRESS_TIMER_EVENT_SHIFT) -+#define CSG_ACK_PROGRESS_TIMER_EVENT_GET(reg_val) \ -+ (((reg_val)&CSG_ACK_PROGRESS_TIMER_EVENT_MASK) >> CSG_ACK_PROGRESS_TIMER_EVENT_SHIFT) -+#define CSG_ACK_PROGRESS_TIMER_EVENT_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_ACK_PROGRESS_TIMER_EVENT_MASK) | \ -+ (((value) << CSG_ACK_PROGRESS_TIMER_EVENT_SHIFT) & CSG_ACK_PROGRESS_TIMER_EVENT_MASK)) -+ -+/* CSG_STATUS_EP_CURRENT register */ -+#define CSG_STATUS_EP_CURRENT_COMPUTE_EP_SHIFT 0 -+#define CSG_STATUS_EP_CURRENT_COMPUTE_EP_MASK (0xFF << CSG_STATUS_EP_CURRENT_COMPUTE_EP_SHIFT) -+#define CSG_STATUS_EP_CURRENT_COMPUTE_EP_GET(reg_val) \ -+ (((reg_val)&CSG_STATUS_EP_CURRENT_COMPUTE_EP_MASK) >> CSG_STATUS_EP_CURRENT_COMPUTE_EP_SHIFT) -+#define CSG_STATUS_EP_CURRENT_COMPUTE_EP_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_STATUS_EP_CURRENT_COMPUTE_EP_MASK) | \ -+ (((value) << CSG_STATUS_EP_CURRENT_COMPUTE_EP_SHIFT) & CSG_STATUS_EP_CURRENT_COMPUTE_EP_MASK)) -+#define CSG_STATUS_EP_CURRENT_FRAGMENT_EP_SHIFT 8 -+#define CSG_STATUS_EP_CURRENT_FRAGMENT_EP_MASK (0xFF << CSG_STATUS_EP_CURRENT_FRAGMENT_EP_SHIFT) -+#define CSG_STATUS_EP_CURRENT_FRAGMENT_EP_GET(reg_val) \ -+ (((reg_val)&CSG_STATUS_EP_CURRENT_FRAGMENT_EP_MASK) >> CSG_STATUS_EP_CURRENT_FRAGMENT_EP_SHIFT) -+#define CSG_STATUS_EP_CURRENT_FRAGMENT_EP_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_STATUS_EP_CURRENT_FRAGMENT_EP_MASK) | \ -+ (((value) << CSG_STATUS_EP_CURRENT_FRAGMENT_EP_SHIFT) & CSG_STATUS_EP_CURRENT_FRAGMENT_EP_MASK)) -+#define CSG_STATUS_EP_CURRENT_TILER_EP_SHIFT 16 -+#define CSG_STATUS_EP_CURRENT_TILER_EP_MASK (0xF << CSG_STATUS_EP_CURRENT_TILER_EP_SHIFT) -+#define CSG_STATUS_EP_CURRENT_TILER_EP_GET(reg_val) \ -+ (((reg_val)&CSG_STATUS_EP_CURRENT_TILER_EP_MASK) >> CSG_STATUS_EP_CURRENT_TILER_EP_SHIFT) -+#define CSG_STATUS_EP_CURRENT_TILER_EP_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_STATUS_EP_CURRENT_TILER_EP_MASK) | \ -+ (((value) << CSG_STATUS_EP_CURRENT_TILER_EP_SHIFT) & CSG_STATUS_EP_CURRENT_TILER_EP_MASK)) -+ -+/* CSG_STATUS_EP_REQ register */ -+#define CSG_STATUS_EP_REQ_COMPUTE_EP_SHIFT 0 -+#define CSG_STATUS_EP_REQ_COMPUTE_EP_MASK (0xFF << CSG_STATUS_EP_REQ_COMPUTE_EP_SHIFT) -+#define CSG_STATUS_EP_REQ_COMPUTE_EP_GET(reg_val) \ -+ (((reg_val)&CSG_STATUS_EP_REQ_COMPUTE_EP_MASK) >> CSG_STATUS_EP_REQ_COMPUTE_EP_SHIFT) -+#define CSG_STATUS_EP_REQ_COMPUTE_EP_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_STATUS_EP_REQ_COMPUTE_EP_MASK) | \ -+ (((value) << CSG_STATUS_EP_REQ_COMPUTE_EP_SHIFT) & CSG_STATUS_EP_REQ_COMPUTE_EP_MASK)) -+#define CSG_STATUS_EP_REQ_FRAGMENT_EP_SHIFT 8 -+#define CSG_STATUS_EP_REQ_FRAGMENT_EP_MASK (0xFF << CSG_STATUS_EP_REQ_FRAGMENT_EP_SHIFT) -+#define CSG_STATUS_EP_REQ_FRAGMENT_EP_GET(reg_val) \ -+ (((reg_val)&CSG_STATUS_EP_REQ_FRAGMENT_EP_MASK) >> CSG_STATUS_EP_REQ_FRAGMENT_EP_SHIFT) -+#define CSG_STATUS_EP_REQ_FRAGMENT_EP_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_STATUS_EP_REQ_FRAGMENT_EP_MASK) | \ -+ (((value) << CSG_STATUS_EP_REQ_FRAGMENT_EP_SHIFT) & CSG_STATUS_EP_REQ_FRAGMENT_EP_MASK)) -+#define CSG_STATUS_EP_REQ_TILER_EP_SHIFT 16 -+#define CSG_STATUS_EP_REQ_TILER_EP_MASK (0xF << CSG_STATUS_EP_REQ_TILER_EP_SHIFT) -+#define CSG_STATUS_EP_REQ_TILER_EP_GET(reg_val) \ -+ (((reg_val)&CSG_STATUS_EP_REQ_TILER_EP_MASK) >> CSG_STATUS_EP_REQ_TILER_EP_SHIFT) -+#define CSG_STATUS_EP_REQ_TILER_EP_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_STATUS_EP_REQ_TILER_EP_MASK) | \ -+ (((value) << CSG_STATUS_EP_REQ_TILER_EP_SHIFT) & CSG_STATUS_EP_REQ_TILER_EP_MASK)) -+#define CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT 20 -+#define CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_MASK (0x1 << CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT) -+#define CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_GET(reg_val) \ -+ (((reg_val)&CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_MASK) >> CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT) -+#define CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_MASK) | \ -+ (((value) << CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT) & CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_MASK)) -+#define CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT 21 -+#define CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_MASK (0x1 << CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT) -+#define CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_GET(reg_val) \ -+ (((reg_val)&CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_MASK) >> CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT) -+#define CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_SET(reg_val, value) \ -+ (((reg_val) & ~CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_MASK) | \ -+ (((value) << CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT) & CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_MASK)) -+ -+/* End of CSG_OUTPUT_BLOCK register set definitions */ -+ -+/* STREAM_CONTROL_BLOCK register set definitions */ -+ -+/* STREAM_FEATURES register */ -+#define STREAM_FEATURES_WORK_REGISTERS_SHIFT 0 -+#define STREAM_FEATURES_WORK_REGISTERS_MASK (0xFF << STREAM_FEATURES_WORK_REGISTERS_SHIFT) -+#define STREAM_FEATURES_WORK_REGISTERS_GET(reg_val) \ -+ (((reg_val)&STREAM_FEATURES_WORK_REGISTERS_MASK) >> STREAM_FEATURES_WORK_REGISTERS_SHIFT) -+#define STREAM_FEATURES_WORK_REGISTERS_SET(reg_val, value) \ -+ (((reg_val) & ~STREAM_FEATURES_WORK_REGISTERS_MASK) | \ -+ (((value) << STREAM_FEATURES_WORK_REGISTERS_SHIFT) & STREAM_FEATURES_WORK_REGISTERS_MASK)) -+#define STREAM_FEATURES_SCOREBOARDS_SHIFT 8 -+#define STREAM_FEATURES_SCOREBOARDS_MASK (0xFF << STREAM_FEATURES_SCOREBOARDS_SHIFT) -+#define STREAM_FEATURES_SCOREBOARDS_GET(reg_val) \ -+ (((reg_val)&STREAM_FEATURES_SCOREBOARDS_MASK) >> STREAM_FEATURES_SCOREBOARDS_SHIFT) -+#define STREAM_FEATURES_SCOREBOARDS_SET(reg_val, value) \ -+ (((reg_val) & ~STREAM_FEATURES_SCOREBOARDS_MASK) | \ -+ (((value) << STREAM_FEATURES_SCOREBOARDS_SHIFT) & STREAM_FEATURES_SCOREBOARDS_MASK)) -+#define STREAM_FEATURES_COMPUTE_SHIFT 16 -+#define STREAM_FEATURES_COMPUTE_MASK (0x1 << STREAM_FEATURES_COMPUTE_SHIFT) -+#define STREAM_FEATURES_COMPUTE_GET(reg_val) (((reg_val)&STREAM_FEATURES_COMPUTE_MASK) >> STREAM_FEATURES_COMPUTE_SHIFT) -+#define STREAM_FEATURES_COMPUTE_SET(reg_val, value) \ -+ (((reg_val) & ~STREAM_FEATURES_COMPUTE_MASK) | \ -+ (((value) << STREAM_FEATURES_COMPUTE_SHIFT) & STREAM_FEATURES_COMPUTE_MASK)) -+#define STREAM_FEATURES_FRAGMENT_SHIFT 17 -+#define STREAM_FEATURES_FRAGMENT_MASK (0x1 << STREAM_FEATURES_FRAGMENT_SHIFT) -+#define STREAM_FEATURES_FRAGMENT_GET(reg_val) \ -+ (((reg_val)&STREAM_FEATURES_FRAGMENT_MASK) >> STREAM_FEATURES_FRAGMENT_SHIFT) -+#define STREAM_FEATURES_FRAGMENT_SET(reg_val, value) \ -+ (((reg_val) & ~STREAM_FEATURES_FRAGMENT_MASK) | \ -+ (((value) << STREAM_FEATURES_FRAGMENT_SHIFT) & STREAM_FEATURES_FRAGMENT_MASK)) -+#define STREAM_FEATURES_TILER_SHIFT 18 -+#define STREAM_FEATURES_TILER_MASK (0x1 << STREAM_FEATURES_TILER_SHIFT) -+#define STREAM_FEATURES_TILER_GET(reg_val) (((reg_val)&STREAM_FEATURES_TILER_MASK) >> STREAM_FEATURES_TILER_SHIFT) -+#define STREAM_FEATURES_TILER_SET(reg_val, value) \ -+ (((reg_val) & ~STREAM_FEATURES_TILER_MASK) | \ -+ (((value) << STREAM_FEATURES_TILER_SHIFT) & STREAM_FEATURES_TILER_MASK)) -+ -+/* STREAM_INPUT_VA register */ -+#define STREAM_INPUT_VA_VALUE_SHIFT 0 -+#define STREAM_INPUT_VA_VALUE_MASK (0xFFFFFFFF << STREAM_INPUT_VA_VALUE_SHIFT) -+#define STREAM_INPUT_VA_VALUE_GET(reg_val) (((reg_val)&STREAM_INPUT_VA_VALUE_MASK) >> STREAM_INPUT_VA_VALUE_SHIFT) -+#define STREAM_INPUT_VA_VALUE_SET(reg_val, value) \ -+ (((reg_val) & ~STREAM_INPUT_VA_VALUE_MASK) | \ -+ (((value) << STREAM_INPUT_VA_VALUE_SHIFT) & STREAM_INPUT_VA_VALUE_MASK)) -+ -+/* STREAM_OUTPUT_VA register */ -+#define STREAM_OUTPUT_VA_VALUE_SHIFT 0 -+#define STREAM_OUTPUT_VA_VALUE_MASK (0xFFFFFFFF << STREAM_OUTPUT_VA_VALUE_SHIFT) -+#define STREAM_OUTPUT_VA_VALUE_GET(reg_val) (((reg_val)&STREAM_OUTPUT_VA_VALUE_MASK) >> STREAM_OUTPUT_VA_VALUE_SHIFT) -+#define STREAM_OUTPUT_VA_VALUE_SET(reg_val, value) \ -+ (((reg_val) & ~STREAM_OUTPUT_VA_VALUE_MASK) | \ -+ (((value) << STREAM_OUTPUT_VA_VALUE_SHIFT) & STREAM_OUTPUT_VA_VALUE_MASK)) -+/* End of STREAM_CONTROL_BLOCK register set definitions */ -+ -+/* GLB_INPUT_BLOCK register set definitions */ -+ -+/* GLB_REQ register */ -+#define GLB_REQ_HALT_SHIFT 0 -+#define GLB_REQ_HALT_MASK (0x1 << GLB_REQ_HALT_SHIFT) -+#define GLB_REQ_HALT_GET(reg_val) (((reg_val)&GLB_REQ_HALT_MASK) >> GLB_REQ_HALT_SHIFT) -+#define GLB_REQ_HALT_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_HALT_MASK) | (((value) << GLB_REQ_HALT_SHIFT) & GLB_REQ_HALT_MASK)) -+#define GLB_REQ_CFG_PROGRESS_TIMER_SHIFT 1 -+#define GLB_REQ_CFG_PROGRESS_TIMER_MASK (0x1 << GLB_REQ_CFG_PROGRESS_TIMER_SHIFT) -+#define GLB_REQ_CFG_PROGRESS_TIMER_GET(reg_val) \ -+ (((reg_val)&GLB_REQ_CFG_PROGRESS_TIMER_MASK) >> GLB_REQ_CFG_PROGRESS_TIMER_SHIFT) -+#define GLB_REQ_CFG_PROGRESS_TIMER_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_CFG_PROGRESS_TIMER_MASK) | \ -+ (((value) << GLB_REQ_CFG_PROGRESS_TIMER_SHIFT) & GLB_REQ_CFG_PROGRESS_TIMER_MASK)) -+#define GLB_REQ_CFG_ALLOC_EN_SHIFT 2 -+#define GLB_REQ_CFG_ALLOC_EN_MASK (0x1 << GLB_REQ_CFG_ALLOC_EN_SHIFT) -+#define GLB_REQ_CFG_ALLOC_EN_GET(reg_val) (((reg_val)&GLB_REQ_CFG_ALLOC_EN_MASK) >> GLB_REQ_CFG_ALLOC_EN_SHIFT) -+#define GLB_REQ_CFG_ALLOC_EN_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_CFG_ALLOC_EN_MASK) | (((value) << GLB_REQ_CFG_ALLOC_EN_SHIFT) & GLB_REQ_CFG_ALLOC_EN_MASK)) -+#define GLB_REQ_CFG_PWROFF_TIMER_SHIFT 3 -+#define GLB_REQ_CFG_PWROFF_TIMER_MASK (0x1 << GLB_REQ_CFG_PWROFF_TIMER_SHIFT) -+#define GLB_REQ_CFG_PWROFF_TIMER_GET(reg_val) \ -+ (((reg_val)&GLB_REQ_CFG_PWROFF_TIMER_MASK) >> GLB_REQ_CFG_PWROFF_TIMER_SHIFT) -+#define GLB_REQ_CFG_PWROFF_TIMER_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_CFG_PWROFF_TIMER_MASK) | \ -+ (((value) << GLB_REQ_CFG_PWROFF_TIMER_SHIFT) & GLB_REQ_CFG_PWROFF_TIMER_MASK)) -+#define GLB_REQ_PROTM_ENTER_SHIFT 4 -+#define GLB_REQ_PROTM_ENTER_MASK (0x1 << GLB_REQ_PROTM_ENTER_SHIFT) -+#define GLB_REQ_PROTM_ENTER_GET(reg_val) (((reg_val)&GLB_REQ_PROTM_ENTER_MASK) >> GLB_REQ_PROTM_ENTER_SHIFT) -+#define GLB_REQ_PROTM_ENTER_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_PROTM_ENTER_MASK) | (((value) << GLB_REQ_PROTM_ENTER_SHIFT) & GLB_REQ_PROTM_ENTER_MASK)) -+#define GLB_REQ_PRFCNT_ENABLE_SHIFT 5 -+#define GLB_REQ_PRFCNT_ENABLE_MASK (0x1 << GLB_REQ_PRFCNT_ENABLE_SHIFT) -+#define GLB_REQ_PRFCNT_ENABLE_GET(reg_val) (((reg_val)&GLB_REQ_PRFCNT_ENABLE_MASK) >> GLB_REQ_PRFCNT_ENABLE_SHIFT) -+#define GLB_REQ_PRFCNT_ENABLE_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_PRFCNT_ENABLE_MASK) | \ -+ (((value) << GLB_REQ_PRFCNT_ENABLE_SHIFT) & GLB_REQ_PRFCNT_ENABLE_MASK)) -+#define GLB_REQ_PRFCNT_SAMPLE_SHIFT 6 -+#define GLB_REQ_PRFCNT_SAMPLE_MASK (0x1 << GLB_REQ_PRFCNT_SAMPLE_SHIFT) -+#define GLB_REQ_PRFCNT_SAMPLE_GET(reg_val) (((reg_val)&GLB_REQ_PRFCNT_SAMPLE_MASK) >> GLB_REQ_PRFCNT_SAMPLE_SHIFT) -+#define GLB_REQ_PRFCNT_SAMPLE_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_PRFCNT_SAMPLE_MASK) | \ -+ (((value) << GLB_REQ_PRFCNT_SAMPLE_SHIFT) & GLB_REQ_PRFCNT_SAMPLE_MASK)) -+#define GLB_REQ_COUNTER_ENABLE_SHIFT 7 -+#define GLB_REQ_COUNTER_ENABLE_MASK (0x1 << GLB_REQ_COUNTER_ENABLE_SHIFT) -+#define GLB_REQ_COUNTER_ENABLE_GET(reg_val) (((reg_val)&GLB_REQ_COUNTER_ENABLE_MASK) >> GLB_REQ_COUNTER_ENABLE_SHIFT) -+#define GLB_REQ_COUNTER_ENABLE_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_COUNTER_ENABLE_MASK) | \ -+ (((value) << GLB_REQ_COUNTER_ENABLE_SHIFT) & GLB_REQ_COUNTER_ENABLE_MASK)) -+#define GLB_REQ_PING_SHIFT 8 -+#define GLB_REQ_PING_MASK (0x1 << GLB_REQ_PING_SHIFT) -+#define GLB_REQ_PING_GET(reg_val) (((reg_val)&GLB_REQ_PING_MASK) >> GLB_REQ_PING_SHIFT) -+#define GLB_REQ_PING_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_PING_MASK) | (((value) << GLB_REQ_PING_SHIFT) & GLB_REQ_PING_MASK)) -+#define GLB_REQ_INACTIVE_COMPUTE_SHIFT 20 -+#define GLB_REQ_INACTIVE_COMPUTE_MASK (0x1 << GLB_REQ_INACTIVE_COMPUTE_SHIFT) -+#define GLB_REQ_INACTIVE_COMPUTE_GET(reg_val) \ -+ (((reg_val)&GLB_REQ_INACTIVE_COMPUTE_MASK) >> GLB_REQ_INACTIVE_COMPUTE_SHIFT) -+#define GLB_REQ_INACTIVE_COMPUTE_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_INACTIVE_COMPUTE_MASK) | \ -+ (((value) << GLB_REQ_INACTIVE_COMPUTE_SHIFT) & GLB_REQ_INACTIVE_COMPUTE_MASK)) -+#define GLB_REQ_INACTIVE_FRAGMENT_SHIFT 21 -+#define GLB_REQ_INACTIVE_FRAGMENT_MASK (0x1 << GLB_REQ_INACTIVE_FRAGMENT_SHIFT) -+#define GLB_REQ_INACTIVE_FRAGMENT_GET(reg_val) \ -+ (((reg_val)&GLB_REQ_INACTIVE_FRAGMENT_MASK) >> GLB_REQ_INACTIVE_FRAGMENT_SHIFT) -+#define GLB_REQ_INACTIVE_FRAGMENT_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_INACTIVE_FRAGMENT_MASK) | \ -+ (((value) << GLB_REQ_INACTIVE_FRAGMENT_SHIFT) & GLB_REQ_INACTIVE_FRAGMENT_MASK)) -+#define GLB_REQ_INACTIVE_TILER_SHIFT 22 -+#define GLB_REQ_INACTIVE_TILER_MASK (0x1 << GLB_REQ_INACTIVE_TILER_SHIFT) -+#define GLB_REQ_INACTIVE_TILER_GET(reg_val) (((reg_val)&GLB_REQ_INACTIVE_TILER_MASK) >> GLB_REQ_INACTIVE_TILER_SHIFT) -+#define GLB_REQ_INACTIVE_TILER_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_INACTIVE_TILER_MASK) | \ -+ (((value) << GLB_REQ_INACTIVE_TILER_SHIFT) & GLB_REQ_INACTIVE_TILER_MASK)) -+#define GLB_REQ_PROTM_EXIT_SHIFT 23 -+#define GLB_REQ_PROTM_EXIT_MASK (0x1 << GLB_REQ_PROTM_EXIT_SHIFT) -+#define GLB_REQ_PROTM_EXIT_GET(reg_val) (((reg_val)&GLB_REQ_PROTM_EXIT_MASK) >> GLB_REQ_PROTM_EXIT_SHIFT) -+#define GLB_REQ_PROTM_EXIT_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_PROTM_EXIT_MASK) | (((value) << GLB_REQ_PROTM_EXIT_SHIFT) & GLB_REQ_PROTM_EXIT_MASK)) -+#define GLB_REQ_DEBUG_CSF_REQ_SHIFT 30 -+#define GLB_REQ_DEBUG_CSF_REQ_MASK (0x1 << GLB_REQ_DEBUG_CSF_REQ_SHIFT) -+#define GLB_REQ_DEBUG_CSF_REQ_GET(reg_val) (((reg_val)&GLB_REQ_DEBUG_CSF_REQ_MASK) >> GLB_REQ_DEBUG_CSF_REQ_SHIFT) -+#define GLB_REQ_DEBUG_CSF_REQ_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_DEBUG_CSF_REQ_MASK) | \ -+ (((value) << GLB_REQ_DEBUG_CSF_REQ_SHIFT) & GLB_REQ_DEBUG_CSF_REQ_MASK)) -+#define GLB_REQ_DEBUG_HOST_REQ_SHIFT 31 -+#define GLB_REQ_DEBUG_HOST_REQ_MASK (0x1 << GLB_REQ_DEBUG_HOST_REQ_SHIFT) -+#define GLB_REQ_DEBUG_HOST_REQ_GET(reg_val) (((reg_val)&GLB_REQ_DEBUG_HOST_REQ_MASK) >> GLB_REQ_DEBUG_HOST_REQ_SHIFT) -+#define GLB_REQ_DEBUG_HOST_REQ_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_REQ_DEBUG_HOST_REQ_MASK) | \ -+ (((value) << GLB_REQ_DEBUG_HOST_REQ_SHIFT) & GLB_REQ_DEBUG_HOST_REQ_MASK)) -+ -+/* GLB_ACK_IRQ_MASK register */ -+#define GLB_ACK_IRQ_MASK_HALT_SHIFT 0 -+#define GLB_ACK_IRQ_MASK_HALT_MASK (0x1 << GLB_ACK_IRQ_MASK_HALT_SHIFT) -+#define GLB_ACK_IRQ_MASK_HALT_GET(reg_val) (((reg_val)&GLB_ACK_IRQ_MASK_HALT_MASK) >> GLB_ACK_IRQ_MASK_HALT_SHIFT) -+#define GLB_ACK_IRQ_MASK_HALT_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_HALT_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_HALT_SHIFT) & GLB_ACK_IRQ_MASK_HALT_MASK)) -+#define GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_SHIFT 1 -+#define GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_MASK (0x1 << GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_SHIFT) -+#define GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_GET(reg_val) \ -+ (((reg_val)&GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_MASK) >> GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_SHIFT) -+#define GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_SHIFT) & GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_MASK)) -+#define GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_SHIFT 2 -+#define GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_MASK (0x1 << GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_SHIFT) -+#define GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_GET(reg_val) \ -+ (((reg_val)&GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_MASK) >> GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_SHIFT) -+#define GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_SHIFT) & GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_MASK)) -+#define GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_SHIFT 3 -+#define GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_MASK (0x1 << GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_SHIFT) -+#define GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_GET(reg_val) \ -+ (((reg_val)&GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_MASK) >> GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_SHIFT) -+#define GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_SHIFT) & GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_MASK)) -+#define GLB_ACK_IRQ_MASK_PROTM_ENTER_SHIFT 4 -+#define GLB_ACK_IRQ_MASK_PROTM_ENTER_MASK (0x1 << GLB_ACK_IRQ_MASK_PROTM_ENTER_SHIFT) -+#define GLB_ACK_IRQ_MASK_PROTM_ENTER_GET(reg_val) \ -+ (((reg_val)&GLB_ACK_IRQ_MASK_PROTM_ENTER_MASK) >> GLB_ACK_IRQ_MASK_PROTM_ENTER_SHIFT) -+#define GLB_ACK_IRQ_MASK_PROTM_ENTER_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_PROTM_ENTER_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_PROTM_ENTER_SHIFT) & GLB_ACK_IRQ_MASK_PROTM_ENTER_MASK)) -+#define GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_SHIFT 5 -+#define GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_MASK (0x1 << GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_SHIFT) -+#define GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_GET(reg_val) \ -+ (((reg_val)&GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_MASK) >> GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_SHIFT) -+#define GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_SHIFT) & GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_MASK)) -+#define GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_SHIFT 6 -+#define GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_MASK (0x1 << GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_SHIFT) -+#define GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_GET(reg_val) \ -+ (((reg_val)&GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_MASK) >> GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_SHIFT) -+#define GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_SHIFT) & GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_MASK)) -+#define GLB_ACK_IRQ_MASK_COUNTER_ENABLE_SHIFT 7 -+#define GLB_ACK_IRQ_MASK_COUNTER_ENABLE_MASK (0x1 << GLB_ACK_IRQ_MASK_COUNTER_ENABLE_SHIFT) -+#define GLB_ACK_IRQ_MASK_COUNTER_ENABLE_GET(reg_val) \ -+ (((reg_val)&GLB_ACK_IRQ_MASK_COUNTER_ENABLE_MASK) >> GLB_ACK_IRQ_MASK_COUNTER_ENABLE_SHIFT) -+#define GLB_ACK_IRQ_MASK_COUNTER_ENABLE_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_COUNTER_ENABLE_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_COUNTER_ENABLE_SHIFT) & GLB_ACK_IRQ_MASK_COUNTER_ENABLE_MASK)) -+#define GLB_ACK_IRQ_MASK_PING_SHIFT 8 -+#define GLB_ACK_IRQ_MASK_PING_MASK (0x1 << GLB_ACK_IRQ_MASK_PING_SHIFT) -+#define GLB_ACK_IRQ_MASK_PING_GET(reg_val) (((reg_val)&GLB_ACK_IRQ_MASK_PING_MASK) >> GLB_ACK_IRQ_MASK_PING_SHIFT) -+#define GLB_ACK_IRQ_MASK_PING_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_PING_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_PING_SHIFT) & GLB_ACK_IRQ_MASK_PING_MASK)) -+#define GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_SHIFT 20 -+#define GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_MASK (0x1 << GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_SHIFT) -+#define GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_GET(reg_val) \ -+ (((reg_val)&GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_MASK) >> GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_SHIFT) -+#define GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_SHIFT) & GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_MASK)) -+#define GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_SHIFT 21 -+#define GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_MASK (0x1 << GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_SHIFT) -+#define GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_GET(reg_val) \ -+ (((reg_val)&GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_MASK) >> GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_SHIFT) -+#define GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_SHIFT) & GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_MASK)) -+#define GLB_ACK_IRQ_MASK_INACTIVE_TILER_SHIFT 22 -+#define GLB_ACK_IRQ_MASK_INACTIVE_TILER_MASK (0x1 << GLB_ACK_IRQ_MASK_INACTIVE_TILER_SHIFT) -+#define GLB_ACK_IRQ_MASK_INACTIVE_TILER_GET(reg_val) \ -+ (((reg_val)&GLB_ACK_IRQ_MASK_INACTIVE_TILER_MASK) >> GLB_ACK_IRQ_MASK_INACTIVE_TILER_SHIFT) -+#define GLB_ACK_IRQ_MASK_INACTIVE_TILER_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_INACTIVE_TILER_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_INACTIVE_TILER_SHIFT) & GLB_ACK_IRQ_MASK_INACTIVE_TILER_MASK)) -+#define GLB_ACK_IRQ_MASK_PROTM_EXIT_SHIFT 23 -+#define GLB_ACK_IRQ_MASK_PROTM_EXIT_MASK (0x1 << GLB_ACK_IRQ_MASK_PROTM_EXIT_SHIFT) -+#define GLB_ACK_IRQ_MASK_PROTM_EXIT_GET(reg_val) \ -+ (((reg_val)&GLB_ACK_IRQ_MASK_PROTM_EXIT_MASK) >> GLB_ACK_IRQ_MASK_PROTM_EXIT_SHIFT) -+#define GLB_ACK_IRQ_MASK_PROTM_EXIT_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_PROTM_EXIT_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_PROTM_EXIT_SHIFT) & GLB_ACK_IRQ_MASK_PROTM_EXIT_MASK)) -+#define GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_SHIFT 30 -+#define GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_MASK (0x1 << GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_SHIFT) -+#define GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_GET(reg_val) \ -+ (((reg_val)&GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_MASK) >> GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_SHIFT) -+#define GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_SHIFT) & GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_MASK)) -+#define GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_SHIFT 31 -+#define GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_MASK (0x1 << GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_SHIFT) -+#define GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_GET(reg_val) \ -+ (((reg_val)&GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_MASK) >> GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_SHIFT) -+#define GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_MASK) | \ -+ (((value) << GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_SHIFT) & GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_MASK)) -+ -+/* GLB_PROGRESS_TIMER register */ -+#define GLB_PROGRESS_TIMER_TIMEOUT_SHIFT 0 -+#define GLB_PROGRESS_TIMER_TIMEOUT_MASK (0xFFFFFFFF << GLB_PROGRESS_TIMER_TIMEOUT_SHIFT) -+#define GLB_PROGRESS_TIMER_TIMEOUT_GET(reg_val) \ -+ (((reg_val)&GLB_PROGRESS_TIMER_TIMEOUT_MASK) >> GLB_PROGRESS_TIMER_TIMEOUT_SHIFT) -+#define GLB_PROGRESS_TIMER_TIMEOUT_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_PROGRESS_TIMER_TIMEOUT_MASK) | \ -+ (((value) << GLB_PROGRESS_TIMER_TIMEOUT_SHIFT) & GLB_PROGRESS_TIMER_TIMEOUT_MASK)) -+ -+/* GLB_ALLOC_EN register */ -+#define GLB_ALLOC_EN_MASK_SHIFT 0 -+#define GLB_ALLOC_EN_MASK_MASK (0xFFFFFFFFFFFFFFFF << GLB_ALLOC_EN_MASK_SHIFT) -+#define GLB_ALLOC_EN_MASK_GET(reg_val) (((reg_val)&GLB_ALLOC_EN_MASK_MASK) >> GLB_ALLOC_EN_MASK_SHIFT) -+#define GLB_ALLOC_EN_MASK_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ALLOC_EN_MASK_MASK) | (((value) << GLB_ALLOC_EN_MASK_SHIFT) & GLB_ALLOC_EN_MASK_MASK)) -+ -+/* GLB_PROTM_COHERENCY register */ -+#define GLB_PROTM_COHERENCY_L2_CACHE_PROTOCOL_SELECT_SHIFT 0 -+#define GLB_PROTM_COHERENCY_L2_CACHE_PROTOCOL_SELECT_MASK \ -+ (0xFFFFFFFF << GLB_PROTM_COHERENCY_L2_CACHE_PROTOCOL_SELECT_SHIFT) -+#define GLB_PROTM_COHERENCY_L2_CACHE_PROTOCOL_SELECT_GET(reg_val) \ -+ (((reg_val)&GLB_PROTM_COHERENCY_L2_CACHE_PROTOCOL_SELECT_MASK) >> \ -+ GLB_PROTM_COHERENCY_L2_CACHE_PROTOCOL_SELECT_SHIFT) -+#define GLB_PROTM_COHERENCY_L2_CACHE_PROTOCOL_SELECT_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_PROTM_COHERENCY_L2_CACHE_PROTOCOL_SELECT_MASK) | \ -+ (((value) << GLB_PROTM_COHERENCY_L2_CACHE_PROTOCOL_SELECT_SHIFT) & \ -+ GLB_PROTM_COHERENCY_L2_CACHE_PROTOCOL_SELECT_MASK)) -+/* End of GLB_INPUT_BLOCK register set definitions */ -+ -+/* GLB_OUTPUT_BLOCK register set definitions */ -+ -+/* GLB_ACK register */ -+#define GLB_ACK_CFG_PROGRESS_TIMER_SHIFT 1 -+#define GLB_ACK_CFG_PROGRESS_TIMER_MASK (0x1 << GLB_ACK_CFG_PROGRESS_TIMER_SHIFT) -+#define GLB_ACK_CFG_PROGRESS_TIMER_GET(reg_val) \ -+ (((reg_val)&GLB_ACK_CFG_PROGRESS_TIMER_MASK) >> GLB_ACK_CFG_PROGRESS_TIMER_SHIFT) -+#define GLB_ACK_CFG_PROGRESS_TIMER_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_CFG_PROGRESS_TIMER_MASK) | \ -+ (((value) << GLB_ACK_CFG_PROGRESS_TIMER_SHIFT) & GLB_ACK_CFG_PROGRESS_TIMER_MASK)) -+#define GLB_ACK_CFG_ALLOC_EN_SHIFT 2 -+#define GLB_ACK_CFG_ALLOC_EN_MASK (0x1 << GLB_ACK_CFG_ALLOC_EN_SHIFT) -+#define GLB_ACK_CFG_ALLOC_EN_GET(reg_val) (((reg_val)&GLB_ACK_CFG_ALLOC_EN_MASK) >> GLB_ACK_CFG_ALLOC_EN_SHIFT) -+#define GLB_ACK_CFG_ALLOC_EN_SET(reg_val, value) \ -+ (((reg_val) & ~GLB_ACK_CFG_ALLOC_EN_MASK) | (((value) << GLB_ACK_CFG_ALLOC_EN_SHIFT) & GLB_ACK_CFG_ALLOC_EN_MASK)) -+/* End of GLB_OUTPUT_BLOCK register set definitions */ -+ -+#endif /* _GPU_CSF_REGISTERS_H_ */ -diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c -new file mode 100755 -index 000000000000..83d7513e78d9 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c -@@ -0,0 +1,2547 @@ -+/* -+ * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include "mali_kbase_csf.h" -+#include "backend/gpu/mali_kbase_pm_internal.h" -+#include -+#include -+#include "mali_gpu_csf_registers.h" -+#include "mali_kbase_csf_tiler_heap.h" -+#include -+#include -+ -+#define CS_REQ_EXCEPTION_MASK (CS_REQ_FAULT_MASK | CS_REQ_FATAL_MASK) -+#define CS_ACK_EXCEPTION_MASK (CS_ACK_FAULT_MASK | CS_ACK_FATAL_MASK) -+ -+/** -+ * struct kbase_csf_event - CSF event callback. -+ * -+ * This structure belongs to the list of events which is part of a Kbase -+ * context, and describes a callback function with a custom parameter to pass -+ * to it when a CSF event is signalled. -+ * -+ * @link: Link to the rest of the list. -+ * @kctx: Pointer to the Kbase context this event belongs to. -+ * @callback: Callback function to call when a CSF event is signalled. -+ * @param: Parameter to pass to the callback function. -+ */ -+struct kbase_csf_event { -+ struct list_head link; -+ struct kbase_context *kctx; -+ kbase_csf_event_callback *callback; -+ void *param; -+}; -+ -+static void put_user_pages_mmap_handle(struct kbase_context *kctx, -+ struct kbase_queue *queue) -+{ -+ unsigned long cookie_nr; -+ -+ lockdep_assert_held(&kctx->csf.lock); -+ -+ if (queue->handle == BASEP_MEM_INVALID_HANDLE) -+ return; -+ -+ cookie_nr = -+ PFN_DOWN(queue->handle - BASEP_MEM_CSF_USER_IO_PAGES_HANDLE); -+ -+ if (!WARN_ON(kctx->csf.user_pages_info[cookie_nr] != queue)) { -+ /* free up cookie */ -+ kctx->csf.user_pages_info[cookie_nr] = NULL; -+ bitmap_set(kctx->csf.cookies, cookie_nr, 1); -+ } -+ -+ queue->handle = BASEP_MEM_INVALID_HANDLE; -+} -+ -+/* Reserve a cookie, to be returned as a handle to userspace for creating -+ * the CPU mapping of the pair of input/output pages and Hw doorbell page. -+ * Will return 0 in case of success otherwise negative on failure. -+ */ -+static int get_user_pages_mmap_handle(struct kbase_context *kctx, -+ struct kbase_queue *queue) -+{ -+ unsigned long cookie, cookie_nr; -+ -+ lockdep_assert_held(&kctx->csf.lock); -+ -+ if (bitmap_empty(kctx->csf.cookies, -+ KBASE_CSF_NUM_USER_IO_PAGES_HANDLE)) { -+ dev_err(kctx->kbdev->dev, -+ "No csf cookies available for allocation!"); -+ return -ENOMEM; -+ } -+ -+ /* allocate a cookie */ -+ cookie_nr = find_first_bit(kctx->csf.cookies, -+ KBASE_CSF_NUM_USER_IO_PAGES_HANDLE); -+ if (kctx->csf.user_pages_info[cookie_nr]) { -+ dev_err(kctx->kbdev->dev, -+ "Inconsistent state of csf cookies!"); -+ return -EINVAL; -+ } -+ kctx->csf.user_pages_info[cookie_nr] = queue; -+ bitmap_clear(kctx->csf.cookies, cookie_nr, 1); -+ -+ /* relocate to correct base */ -+ cookie = cookie_nr + PFN_DOWN(BASEP_MEM_CSF_USER_IO_PAGES_HANDLE); -+ cookie <<= PAGE_SHIFT; -+ -+ queue->handle = (u64)cookie; -+ -+ return 0; -+} -+ -+static void gpu_munmap_user_io_pages(struct kbase_context *kctx, -+ struct kbase_va_region *reg) -+{ -+ size_t num_pages = 2; -+ -+ kbase_mmu_teardown_pages(kctx->kbdev, &kctx->kbdev->csf.mcu_mmu, -+ reg->start_pfn, num_pages, MCU_AS_NR); -+ -+ WARN_ON(reg->flags & KBASE_REG_FREE); -+ -+ mutex_lock(&kctx->kbdev->csf.reg_lock); -+ kbase_remove_va_region(reg); -+ mutex_unlock(&kctx->kbdev->csf.reg_lock); -+} -+ -+static void init_user_output_page(struct kbase_queue *queue) -+{ -+ u32 *addr = (u32 *)(queue->user_io_addr + PAGE_SIZE); -+ -+ addr[CS_EXTRACT_LO/4] = 0; -+ addr[CS_EXTRACT_HI/4] = 0; -+ -+ addr[CS_ACTIVE/4] = 0; -+} -+ -+/* Map the input/output pages in the shared interface segment of MCU firmware -+ * address space. -+ */ -+static int gpu_mmap_user_io_pages(struct kbase_device *kbdev, -+ struct tagged_addr *phys, struct kbase_va_region *reg) -+{ -+ unsigned long mem_flags = KBASE_REG_GPU_RD; -+ const size_t num_pages = 2; -+ int ret; -+ -+#if ((KERNEL_VERSION(4, 4, 147) >= LINUX_VERSION_CODE) || \ -+ ((KERNEL_VERSION(4, 6, 0) > LINUX_VERSION_CODE) && \ -+ (KERNEL_VERSION(4, 5, 0) <= LINUX_VERSION_CODE))) -+ mem_flags |= -+ KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_NON_CACHEABLE); -+#else -+ if (kbdev->system_coherency == COHERENCY_NONE) { -+ mem_flags |= -+ KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_NON_CACHEABLE); -+ } else { -+ mem_flags |= KBASE_REG_SHARE_BOTH | -+ KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_SHARED); -+ } -+#endif -+ -+ mutex_lock(&kbdev->csf.reg_lock); -+ ret = kbase_add_va_region_rbtree(kbdev, reg, 0, num_pages, 1); -+ reg->flags &= ~KBASE_REG_FREE; -+ mutex_unlock(&kbdev->csf.reg_lock); -+ -+ if (ret) -+ return ret; -+ -+ /* Map input page */ -+ ret = kbase_mmu_insert_pages(kbdev, &kbdev->csf.mcu_mmu, -+ reg->start_pfn, &phys[0], -+ 1, mem_flags, MCU_AS_NR, -+ KBASE_MEM_GROUP_CSF_IO); -+ if (ret) -+ goto bad_insert; -+ -+ /* Map output page, it needs rw access */ -+ mem_flags |= KBASE_REG_GPU_WR; -+ ret = kbase_mmu_insert_pages(kbdev, &kbdev->csf.mcu_mmu, -+ reg->start_pfn + 1, &phys[1], -+ 1, mem_flags, MCU_AS_NR, -+ KBASE_MEM_GROUP_CSF_IO); -+ if (ret) -+ goto bad_insert_output_page; -+ -+ return 0; -+ -+bad_insert_output_page: -+ kbase_mmu_teardown_pages(kbdev, &kbdev->csf.mcu_mmu, -+ reg->start_pfn, 1, MCU_AS_NR); -+bad_insert: -+ mutex_lock(&kbdev->csf.reg_lock); -+ kbase_remove_va_region(reg); -+ mutex_unlock(&kbdev->csf.reg_lock); -+ -+ return ret; -+} -+ -+static void kernel_unmap_user_io_pages(struct kbase_context *kctx, -+ struct kbase_queue *queue) -+{ -+ const size_t num_pages = 2; -+ -+ kbase_gpu_vm_lock(kctx); -+ -+ vunmap(queue->user_io_addr); -+ -+ WARN_ON(num_pages > atomic_read(&kctx->permanent_mapped_pages)); -+ atomic_sub(num_pages, &kctx->permanent_mapped_pages); -+ -+ kbase_gpu_vm_unlock(kctx); -+} -+ -+static int kernel_map_user_io_pages(struct kbase_context *kctx, -+ struct kbase_queue *queue) -+{ -+ struct page *page_list[2]; -+ pgprot_t cpu_map_prot; -+ int ret = 0; -+ size_t i; -+ -+ kbase_gpu_vm_lock(kctx); -+ -+ if (ARRAY_SIZE(page_list) > (KBASE_PERMANENTLY_MAPPED_MEM_LIMIT_PAGES - -+ atomic_read(&kctx->permanent_mapped_pages))) { -+ ret = -ENOMEM; -+ goto unlock; -+ } -+ -+ /* The pages are mapped to Userspace also, so use the same mapping -+ * attributes as used inside the CPU page fault handler. -+ */ -+#if ((KERNEL_VERSION(4, 4, 147) >= LINUX_VERSION_CODE) || \ -+ ((KERNEL_VERSION(4, 6, 0) > LINUX_VERSION_CODE) && \ -+ (KERNEL_VERSION(4, 5, 0) <= LINUX_VERSION_CODE))) -+ cpu_map_prot = pgprot_device(PAGE_KERNEL); -+#else -+ if (kctx->kbdev->system_coherency == COHERENCY_NONE) -+ cpu_map_prot = pgprot_writecombine(PAGE_KERNEL); -+ else -+ cpu_map_prot = PAGE_KERNEL; -+#endif -+ -+ for (i = 0; i < ARRAY_SIZE(page_list); i++) -+ page_list[i] = as_page(queue->phys[i]); -+ -+ queue->user_io_addr = vmap(page_list, ARRAY_SIZE(page_list), VM_MAP, cpu_map_prot); -+ -+ if (!queue->user_io_addr) -+ ret = -ENOMEM; -+ else -+ atomic_add(ARRAY_SIZE(page_list), &kctx->permanent_mapped_pages); -+ -+unlock: -+ kbase_gpu_vm_unlock(kctx); -+ return ret; -+} -+ -+static void get_queue(struct kbase_queue *queue); -+static void release_queue(struct kbase_queue *queue); -+ -+/** -+ * kbase_csf_free_command_stream_user_pages() - Free the resources allocated -+ * for a queue at the time of bind. -+ * -+ * @kctx: Address of the kbase context within which the queue was created. -+ * @queue: Pointer to the queue to be unlinked. -+ * -+ * This function will free the pair of physical pages allocated for a GPU -+ * command queue, and also release the hardware doorbell page, that were mapped -+ * into the process address space to enable direct submission of commands to -+ * the hardware. Also releases the reference taken on the queue when the mapping -+ * was created. -+ * -+ * This function will be called only when the mapping is being removed and -+ * so the resources for queue will not get freed up until the mapping is -+ * removed even though userspace could have terminated the queue. -+ * Kernel will ensure that the termination of Kbase context would only be -+ * triggered after the mapping is removed. -+ * -+ * If an explicit or implicit unbind was missed by the userspace then the -+ * mapping will persist. On process exit kernel itself will remove the mapping. -+ */ -+static void kbase_csf_free_command_stream_user_pages(struct kbase_context *kctx, -+ struct kbase_queue *queue) -+{ -+ const size_t num_pages = 2; -+ -+ gpu_munmap_user_io_pages(kctx, queue->reg); -+ kernel_unmap_user_io_pages(kctx, queue); -+ -+ kbase_mem_pool_free_pages( -+ &kctx->mem_pools.small[KBASE_MEM_GROUP_CSF_IO], -+ num_pages, queue->phys, true, false); -+ -+ kfree(queue->reg); -+ queue->reg = NULL; -+ -+ /* If the queue has already been terminated by userspace -+ * then the ref count for queue object will drop to 0 here. -+ */ -+ release_queue(queue); -+} -+ -+int kbase_csf_alloc_command_stream_user_pages(struct kbase_context *kctx, -+ struct kbase_queue *queue) -+{ -+ struct kbase_device *kbdev = kctx->kbdev; -+ struct kbase_va_region *reg; -+ const size_t num_pages = 2; -+ int ret; -+ -+ lockdep_assert_held(&kctx->csf.lock); -+ -+ reg = kbase_alloc_free_region(&kctx->kbdev->csf.shared_reg_rbtree, 0, -+ num_pages, KBASE_REG_ZONE_MCU_SHARED); -+ if (!reg) -+ return -ENOMEM; -+ -+ ret = kbase_mem_pool_alloc_pages( -+ &kctx->mem_pools.small[KBASE_MEM_GROUP_CSF_IO], -+ num_pages, queue->phys, false); -+ -+ if (ret != num_pages) -+ goto phys_alloc_failed; -+ -+ ret = kernel_map_user_io_pages(kctx, queue); -+ if (ret) -+ goto kernel_map_failed; -+ -+ init_user_output_page(queue); -+ -+ ret = gpu_mmap_user_io_pages(kctx->kbdev, queue->phys, reg); -+ if (ret) -+ goto gpu_mmap_failed; -+ -+ queue->reg = reg; -+ -+ mutex_lock(&kbdev->csf.reg_lock); -+ if (kbdev->csf.db_file_offsets > -+ (U32_MAX - BASEP_QUEUE_NR_MMAP_USER_PAGES + 1)) -+ kbdev->csf.db_file_offsets = 0; -+ -+ queue->db_file_offset = kbdev->csf.db_file_offsets; -+ kbdev->csf.db_file_offsets += BASEP_QUEUE_NR_MMAP_USER_PAGES; -+ -+ WARN(atomic_read(&queue->refcount) != 1, "Incorrect refcounting for queue object\n"); -+ /* This is the second reference taken on the queue object and -+ * would be dropped only when the IO mapping is removed either -+ * explicitly by userspace or implicitly by kernel on process exit. -+ */ -+ get_queue(queue); -+ queue->bind_state = KBASE_CSF_QUEUE_BOUND; -+ mutex_unlock(&kbdev->csf.reg_lock); -+ -+ return 0; -+ -+gpu_mmap_failed: -+ kernel_unmap_user_io_pages(kctx, queue); -+ -+kernel_map_failed: -+ kbase_mem_pool_free_pages( -+ &kctx->mem_pools.small[KBASE_MEM_GROUP_CSF_IO], -+ num_pages, queue->phys, false, false); -+ -+phys_alloc_failed: -+ kfree(reg); -+ -+ return -ENOMEM; -+} -+ -+static struct kbase_queue_group *find_queue_group(struct kbase_context *kctx, -+ u8 group_handle) -+{ -+ uint index = group_handle; -+ -+ lockdep_assert_held(&kctx->csf.lock); -+ -+ if (index < MAX_QUEUE_GROUP_NUM && kctx->csf.queue_groups[index]) { -+ if (WARN_ON(kctx->csf.queue_groups[index]->handle != index)) -+ return NULL; -+ return kctx->csf.queue_groups[index]; -+ } -+ -+ return NULL; -+} -+ -+int kbase_csf_queue_group_handle_is_valid(struct kbase_context *kctx, -+ u8 group_handle) -+{ -+ struct kbase_queue_group *group; -+ -+ mutex_lock(&kctx->csf.lock); -+ group = find_queue_group(kctx, group_handle); -+ mutex_unlock(&kctx->csf.lock); -+ -+ return group ? 0 : -EINVAL; -+} -+ -+static struct kbase_queue *find_queue(struct kbase_context *kctx, u64 base_addr) -+{ -+ struct kbase_queue *queue; -+ -+ lockdep_assert_held(&kctx->csf.lock); -+ -+ list_for_each_entry(queue, &kctx->csf.queue_list, link) { -+ if (base_addr == queue->base_addr) -+ return queue; -+ } -+ -+ return NULL; -+} -+ -+static void get_queue(struct kbase_queue *queue) -+{ -+ WARN_ON(!atomic_inc_not_zero(&queue->refcount)); -+} -+ -+static void release_queue(struct kbase_queue *queue) -+{ -+ lockdep_assert_held(&queue->kctx->csf.lock); -+ -+ WARN_ON(atomic_read(&queue->refcount) <= 0); -+ -+ if (atomic_dec_and_test(&queue->refcount)) { -+ /* The queue can't still be on the per context list. */ -+ WARN_ON(!list_empty(&queue->link)); -+ WARN_ON(queue->group); -+ kfree(queue); -+ } -+} -+ -+static void oom_event_worker(struct work_struct *data); -+static void fault_event_worker(struct work_struct *data); -+ -+int kbase_csf_queue_register(struct kbase_context *kctx, -+ struct kbase_ioctl_cs_queue_register *reg) -+{ -+ struct kbase_queue *queue; -+ int ret = 0; -+ struct kbase_va_region *region; -+ u64 queue_addr = reg->buffer_gpu_addr; -+ size_t queue_size = reg->buffer_size >> PAGE_SHIFT; -+ -+ /* Validate the queue priority */ -+ if (reg->priority > BASE_QUEUE_MAX_PRIORITY) -+ return -EINVAL; -+ -+ mutex_lock(&kctx->csf.lock); -+ -+ /* Check if queue is already registered */ -+ if (find_queue(kctx, queue_addr) != NULL) { -+ ret = -EINVAL; -+ goto out; -+ } -+ -+ /* Check if the queue address is valid */ -+ kbase_gpu_vm_lock(kctx); -+ region = kbase_region_tracker_find_region_enclosing_address(kctx, -+ queue_addr); -+ -+ if (kbase_is_region_invalid_or_free(region)) { -+ ret = -ENOENT; -+ goto out_unlock_vm; -+ } -+ -+ if (queue_size > (region->nr_pages - -+ ((queue_addr >> PAGE_SHIFT) - region->start_pfn))) { -+ ret = -EINVAL; -+ goto out_unlock_vm; -+ } ++ region_ex = kbase_region_tracker_find_region_enclosing_address( ++ kctx, reg_ex->ex_offset_var_addr); ++ if (kbase_is_region_invalid_or_free(region_ex)) { ++ ret = -ENOENT; ++ goto out_unlock_vm; ++ } ++ } + + queue = kzalloc(sizeof(struct kbase_queue), GFP_KERNEL); + @@ -157580,13 +166418,16 @@ index 000000000000..83d7513e78d9 + + queue->kctx = kctx; + queue->base_addr = queue_addr; ++ + queue->queue_reg = region; ++ kbase_va_region_no_user_free_inc(region); ++ + queue->size = (queue_size << PAGE_SHIFT); + queue->csi_index = KBASEP_IF_NR_INVALID; + queue->enabled = false; + + queue->priority = reg->priority; -+ atomic_set(&queue->refcount, 1); ++ kbase_refcount_set(&queue->refcount, 1); + + queue->group = NULL; + queue->bind_state = KBASE_CSF_QUEUE_UNBOUND; @@ -157597,13 +166438,40 @@ index 000000000000..83d7513e78d9 + queue->sync_ptr = 0; + queue->sync_value = 0; + ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ queue->saved_cmd_ptr = 0; ++#endif ++ ++ queue->sb_status = 0; ++ queue->blocked_reason = CS_STATUS_BLOCKED_REASON_REASON_UNBLOCKED; ++ ++ atomic_set(&queue->pending, 0); ++ + INIT_LIST_HEAD(&queue->link); + INIT_LIST_HEAD(&queue->error.link); + INIT_WORK(&queue->oom_event_work, oom_event_worker); -+ INIT_WORK(&queue->fault_event_work, fault_event_worker); ++ INIT_WORK(&queue->cs_error_work, cs_error_worker); + list_add(&queue->link, &kctx->csf.queue_list); + -+ region->flags |= KBASE_REG_NO_USER_FREE; ++ queue->extract_ofs = 0; ++ ++ region->user_data = queue; ++ ++ /* Initialize the cs_trace configuration parameters, When buffer_size ++ * is 0, trace is disabled. Here we only update the fields when ++ * enabled, otherwise leave them as default zeros. ++ */ ++ if (reg_ex && reg_ex->ex_buffer_size) { ++ u32 cfg = CS_INSTR_CONFIG_EVENT_SIZE_SET( ++ 0, reg_ex->ex_event_size); ++ cfg = CS_INSTR_CONFIG_EVENT_STATE_SET( ++ cfg, reg_ex->ex_event_state); ++ ++ queue->trace_cfg = cfg; ++ queue->trace_buffer_size = reg_ex->ex_buffer_size; ++ queue->trace_buffer_base = reg_ex->ex_buffer_base; ++ queue->trace_offset_ptr = reg_ex->ex_offset_var_addr; ++ } + +out_unlock_vm: + kbase_gpu_vm_unlock(kctx); @@ -157613,16 +166481,72 @@ index 000000000000..83d7513e78d9 + return ret; +} + ++int kbase_csf_queue_register(struct kbase_context *kctx, ++ struct kbase_ioctl_cs_queue_register *reg) ++{ ++ /* Validate the ring buffer configuration parameters */ ++ if (reg->buffer_size < CS_RING_BUFFER_MIN_SIZE || ++ reg->buffer_size > CS_RING_BUFFER_MAX_SIZE || ++ reg->buffer_size & (reg->buffer_size - 1) || !reg->buffer_gpu_addr || ++ reg->buffer_gpu_addr & ~PAGE_MASK) ++ return -EINVAL; ++ ++ return csf_queue_register_internal(kctx, reg, NULL); ++} ++ ++int kbase_csf_queue_register_ex(struct kbase_context *kctx, ++ struct kbase_ioctl_cs_queue_register_ex *reg) ++{ ++ struct kbase_csf_global_iface const *const iface = ++ &kctx->kbdev->csf.global_iface; ++ u32 const glb_version = iface->version; ++ u32 instr = iface->instr_features; ++ u8 max_size = GLB_INSTR_FEATURES_EVENT_SIZE_MAX_GET(instr); ++ u32 min_buf_size = (1u << reg->ex_event_size) * ++ GLB_INSTR_FEATURES_OFFSET_UPDATE_RATE_GET(instr); ++ ++ /* If cs_trace_command not supported, the call fails */ ++ if (glb_version < kbase_csf_interface_version(1, 1, 0)) ++ return -EINVAL; ++ ++ /* Validate the ring buffer configuration parameters */ ++ if (reg->buffer_size < CS_RING_BUFFER_MIN_SIZE || ++ reg->buffer_size > CS_RING_BUFFER_MAX_SIZE || ++ reg->buffer_size & (reg->buffer_size - 1) || !reg->buffer_gpu_addr || ++ reg->buffer_gpu_addr & ~PAGE_MASK) ++ return -EINVAL; ++ ++ /* Validate the cs_trace configuration parameters */ ++ if (reg->ex_buffer_size && ++ ((reg->ex_event_size > max_size) || ++ (reg->ex_buffer_size & (reg->ex_buffer_size - 1)) || ++ (reg->ex_buffer_size < min_buf_size))) ++ return -EINVAL; ++ ++ return csf_queue_register_internal(kctx, NULL, reg); ++} ++ +static void unbind_queue(struct kbase_context *kctx, + struct kbase_queue *queue); + +void kbase_csf_queue_terminate(struct kbase_context *kctx, + struct kbase_ioctl_cs_queue_terminate *term) +{ ++ struct kbase_device *kbdev = kctx->kbdev; + struct kbase_queue *queue; ++ int err; ++ bool reset_prevented = false; + -+ mutex_lock(&kctx->csf.lock); ++ err = kbase_reset_gpu_prevent_and_wait(kbdev); ++ if (err) ++ dev_warn( ++ kbdev->dev, ++ "Unsuccessful GPU reset detected when terminating queue (buffer_addr=0x%.16llx), attempting to terminate regardless", ++ term->buffer_gpu_addr); ++ else ++ reset_prevented = true; + ++ mutex_lock(&kctx->csf.lock); + queue = find_queue(kctx, term->buffer_gpu_addr); + + if (queue) { @@ -157638,26 +166562,16 @@ index 000000000000..83d7513e78d9 + unbind_queue(kctx, queue); + + kbase_gpu_vm_lock(kctx); -+ if (!WARN_ON(!queue->queue_reg)) { -+ /* After this the Userspace would be able to free the -+ * memory for GPU queue. In case the Userspace missed -+ * terminating the queue, the cleanup will happen on -+ * context termination where teardown of region tracker -+ * would free up the GPU queue memory. -+ */ -+ queue->queue_reg->flags &= ~KBASE_REG_NO_USER_FREE; -+ } ++ if (!WARN_ON(!queue->queue_reg)) ++ queue->queue_reg->user_data = NULL; + kbase_gpu_vm_unlock(kctx); + -+ /* Remove any pending command queue fatal from -+ * the per-context list. -+ */ -+ list_del_init(&queue->error.link); -+ + release_queue(queue); + } + + mutex_unlock(&kctx->csf.lock); ++ if (reset_prevented) ++ kbase_reset_gpu_allow(kbdev); +} + +int kbase_csf_queue_bind(struct kbase_context *kctx, union kbase_ioctl_cs_queue_bind *bind) @@ -157732,11 +166646,70 @@ index 000000000000..83d7513e78d9 + return group; +} + ++static void enqueue_gpu_submission_work(struct kbase_context *const kctx) ++{ ++ queue_work(system_highpri_wq, &kctx->csf.pending_submission_work); ++} ++ ++/** ++ * pending_submission_worker() - Work item to process pending kicked GPU command queues. ++ * ++ * @work: Pointer to pending_submission_work. ++ * ++ * This function starts all pending queues, for which the work ++ * was previously submitted via ioctl call from application thread. ++ * If the queue is already scheduled and resident, it will be started ++ * right away, otherwise once the group is made resident. ++ */ ++static void pending_submission_worker(struct work_struct *work) ++{ ++ struct kbase_context *kctx = ++ container_of(work, struct kbase_context, csf.pending_submission_work); ++ struct kbase_device *kbdev = kctx->kbdev; ++ struct kbase_queue *queue; ++ int err = kbase_reset_gpu_prevent_and_wait(kbdev); ++ ++ if (err) { ++ dev_err(kbdev->dev, "Unsuccessful GPU reset detected when kicking queue "); ++ return; ++ } ++ ++ mutex_lock(&kctx->csf.lock); ++ ++ /* Iterate through the queue list and schedule the pending ones for submission. */ ++ list_for_each_entry(queue, &kctx->csf.queue_list, link) { ++ if (atomic_cmpxchg(&queue->pending, 1, 0) == 1) { ++ struct kbase_queue_group *group = get_bound_queue_group(queue); ++ int ret; ++ ++ if (!group || queue->bind_state != KBASE_CSF_QUEUE_BOUND) { ++ dev_dbg(kbdev->dev, "queue is not bound to a group"); ++ continue; ++ } ++ ++ ret = kbase_csf_scheduler_queue_start(queue); ++ if (unlikely(ret)) { ++ dev_dbg(kbdev->dev, "Failed to start queue"); ++ if (ret == -EBUSY) { ++ atomic_cmpxchg(&queue->pending, 0, 1); ++ enqueue_gpu_submission_work(kctx); ++ } ++ } ++ } ++ } ++ ++ mutex_unlock(&kctx->csf.lock); ++ ++ kbase_reset_gpu_allow(kbdev); ++} ++ +void kbase_csf_ring_csg_doorbell(struct kbase_device *kbdev, int slot) +{ + if (WARN_ON(slot < 0)) + return; + ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ + kbase_csf_ring_csg_slots_doorbell(kbdev, (u32) (1 << slot)); +} + @@ -157749,9 +166722,20 @@ index 000000000000..83d7513e78d9 + (u32) ((1U << kbdev->csf.global_iface.group_num) - 1); + u32 value; + ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ + if (WARN_ON(slot_bitmap > allowed_bitmap)) + return; + ++ /* The access to GLB_DB_REQ/ACK needs to be ordered with respect to CSG_REQ/ACK and ++ * CSG_DB_REQ/ACK to avoid a scenario where a CSI request overlaps with a CSG request ++ * or 2 CSI requests overlap and FW ends up missing the 2nd request. ++ * Memory barrier is required, both on Host and FW side, to guarantee the ordering. ++ * ++ * 'osh' is used as CPU and GPU would be in the same Outer shareable domain. ++ */ ++ dmb(osh); ++ + value = kbase_csf_firmware_global_output(global_iface, GLB_DB_ACK); + value ^= slot_bitmap; + kbase_csf_firmware_global_input_mask(global_iface, GLB_DB_REQ, value, @@ -157772,57 +166756,77 @@ index 000000000000..83d7513e78d9 +} + +void kbase_csf_ring_cs_kernel_doorbell(struct kbase_device *kbdev, -+ struct kbase_queue *queue) ++ int csi_index, int csg_nr, ++ bool ring_csg_doorbell) +{ -+ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; -+ struct kbase_queue_group *group = get_bound_queue_group(queue); + struct kbase_csf_cmd_stream_group_info *ginfo; + u32 value; -+ int slot; + -+ if (WARN_ON(!group)) ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ ++ if (WARN_ON(csg_nr < 0) || ++ WARN_ON(csg_nr >= kbdev->csf.global_iface.group_num)) + return; + -+ slot = kbase_csf_scheduler_group_get_slot(group); ++ ginfo = &kbdev->csf.global_iface.groups[csg_nr]; + -+ if (WARN_ON(slot < 0)) ++ if (WARN_ON(csi_index < 0) || ++ WARN_ON(csi_index >= ginfo->stream_num)) + return; + -+ ginfo = &global_iface->groups[slot]; ++ /* The access to CSG_DB_REQ/ACK needs to be ordered with respect to ++ * CS_REQ/ACK to avoid a scenario where CSG_DB_REQ/ACK becomes visibile to ++ * FW before CS_REQ/ACK is set. ++ * ++ * 'osh' is used as CPU and GPU would be in the same outer shareable domain. ++ */ ++ dmb(osh); + + value = kbase_csf_firmware_csg_output(ginfo, CSG_DB_ACK); -+ value ^= (1 << queue->csi_index); ++ value ^= (1 << csi_index); + kbase_csf_firmware_csg_input_mask(ginfo, CSG_DB_REQ, value, -+ 1 << queue->csi_index); ++ 1 << csi_index); + -+ kbase_csf_ring_csg_doorbell(kbdev, slot); ++ if (likely(ring_csg_doorbell)) ++ kbase_csf_ring_csg_doorbell(kbdev, csg_nr); +} + +int kbase_csf_queue_kick(struct kbase_context *kctx, + struct kbase_ioctl_cs_queue_kick *kick) +{ -+ struct kbase_queue_group *group; -+ struct kbase_queue *queue; ++ struct kbase_device *kbdev = kctx->kbdev; ++ bool trigger_submission = false; ++ struct kbase_va_region *region; + int err = 0; + -+ mutex_lock(&kctx->csf.lock); ++ KBASE_TLSTREAM_TL_KBASE_GPUCMDQUEUE_KICK(kbdev, kctx->id, kick->buffer_gpu_addr); + -+ queue = find_queue(kctx, kick->buffer_gpu_addr); -+ if (!queue) -+ err = -EINVAL; ++ /* GPU work submission happening asynchronously to prevent the contention with ++ * scheduler lock and as the result blocking application thread. For this reason, ++ * the vm_lock is used here to get the reference to the queue based on its buffer_gpu_addr ++ * from the context list of active va_regions. ++ * Once the target queue is found the pending flag is set to one atomically avoiding ++ * a race between submission ioctl thread and the work item. ++ */ ++ kbase_gpu_vm_lock(kctx); ++ region = kbase_region_tracker_find_region_enclosing_address(kctx, kick->buffer_gpu_addr); ++ if (!kbase_is_region_invalid_or_free(region)) { ++ struct kbase_queue *queue = region->user_data; + -+ if (!err) { -+ group = get_bound_queue_group(queue); -+ if (!group) { -+ dev_err(kctx->kbdev->dev, "queue not bound\n"); -+ err = -EINVAL; ++ if (queue) { ++ atomic_cmpxchg(&queue->pending, 0, 1); ++ trigger_submission = true; + } ++ } else { ++ dev_dbg(kbdev->dev, ++ "Attempt to kick GPU queue without a valid command buffer region"); ++ err = -EFAULT; + } ++ kbase_gpu_vm_unlock(kctx); + -+ if (!err) -+ err = kbase_csf_scheduler_queue_start(queue); ++ if (likely(trigger_submission)) ++ enqueue_gpu_submission_work(kctx); + -+ mutex_unlock(&kctx->csf.lock); + return err; +} + @@ -157831,17 +166835,23 @@ index 000000000000..83d7513e78d9 +{ + lockdep_assert_held(&kctx->csf.lock); + ++ if (WARN_ON(queue->csi_index < 0)) ++ return; ++ + if (queue->bind_state != KBASE_CSF_QUEUE_UNBOUND) { + unsigned long flags; + + kbase_csf_scheduler_spin_lock(kctx->kbdev, &flags); + bitmap_clear(queue->group->protm_pending_bitmap, + queue->csi_index, 1); ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kctx->kbdev, CSI_PROTM_PEND_CLEAR, ++ queue->group, queue, queue->group->protm_pending_bitmap[0]); + queue->group->bound_queues[queue->csi_index] = NULL; + queue->group = NULL; + kbase_csf_scheduler_spin_unlock(kctx->kbdev, flags); + + put_user_pages_mmap_handle(kctx, queue); ++ WARN_ON_ONCE(queue->doorbell_nr != KBASEP_USER_DB_NR_INVALID); + queue->bind_state = KBASE_CSF_QUEUE_UNBOUND; + } +} @@ -157852,8 +166862,8 @@ index 000000000000..83d7513e78d9 + * @kctx: Address of the kbase context within which the queue was created. + * @queue: Pointer to the queue to be unlinked. + * -+ * This function will also send the stop request to firmware for the command -+ * stream if the group to which the GPU command queue was bound is scheduled. ++ * This function will also send the stop request to firmware for the CS ++ * if the group to which the GPU command queue was bound is scheduled. + * + * This function would be called when :- + * - queue is being unbound. This would happen when the IO mapping @@ -157872,6 +166882,7 @@ index 000000000000..83d7513e78d9 + +static void unbind_queue(struct kbase_context *kctx, struct kbase_queue *queue) +{ ++ kbase_reset_gpu_assert_failed_or_prevented(kctx->kbdev); + lockdep_assert_held(&kctx->csf.lock); + + if (queue->bind_state != KBASE_CSF_QUEUE_UNBOUND) { @@ -157882,16 +166893,56 @@ index 000000000000..83d7513e78d9 + } +} + -+void kbase_csf_queue_unbind(struct kbase_queue *queue) ++static bool kbase_csf_queue_phys_allocated(struct kbase_queue *queue) ++{ ++ /* The queue's phys are zeroed when allocation fails. Both of them being ++ * zero is an impossible condition for a successful allocated set of phy pages. ++ */ ++ ++ return (queue->phys[0].tagged_addr | queue->phys[1].tagged_addr); ++} ++ ++void kbase_csf_queue_unbind(struct kbase_queue *queue, bool process_exit) ++{ ++ struct kbase_context *kctx = queue->kctx; ++ ++ lockdep_assert_held(&kctx->csf.lock); ++ ++ /* As the process itself is exiting, the termination of queue group can ++ * be done which would be much faster than stopping of individual ++ * queues. This would ensure a faster exit for the process especially ++ * in the case where CSI gets stuck. ++ * The CSI STOP request will wait for the in flight work to drain ++ * whereas CSG TERM request would result in an immediate abort or ++ * cancellation of the pending work. ++ */ ++ if (process_exit) { ++ struct kbase_queue_group *group = get_bound_queue_group(queue); ++ ++ if (group) ++ term_queue_group(group); ++ ++ WARN_ON(queue->bind_state != KBASE_CSF_QUEUE_UNBOUND); ++ } else { ++ unbind_queue(kctx, queue); ++ } ++ ++ /* Free the resources, if allocated phys for this queue */ ++ if (kbase_csf_queue_phys_allocated(queue)) ++ kbase_csf_free_command_stream_user_pages(kctx, queue); ++} ++ ++void kbase_csf_queue_unbind_stopped(struct kbase_queue *queue) +{ + struct kbase_context *kctx = queue->kctx; + + lockdep_assert_held(&kctx->csf.lock); + -+ unbind_queue(kctx, queue); ++ WARN_ON(queue->bind_state == KBASE_CSF_QUEUE_BOUND); ++ unbind_stopped_queue(kctx, queue); + -+ /* Free the resources, if allocated for this queue. */ -+ if (queue->reg) ++ /* Free the resources, if allocated phys for this queue */ ++ if (kbase_csf_queue_phys_allocated(queue)) + kbase_csf_free_command_stream_user_pages(kctx, queue); +} + @@ -157921,15 +166972,14 @@ index 000000000000..83d7513e78d9 +} + +/** -+ * iface_has_enough_streams() - Check that at least one command stream -+ * group supports a given number of streams ++ * iface_has_enough_streams() - Check that at least one CSG supports ++ * a given number of CS + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. -+ * @cs_min: Minimum number of command streams required. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @cs_min: Minimum number of CSs required. + * -+ * Return: true if at least one command stream group supports the given number -+ * of command streams (or more); otherwise false. ++ * Return: true if at least one CSG supports the given number ++ * of CSs (or more); otherwise false. + */ +static bool iface_has_enough_streams(struct kbase_device *const kbdev, + u32 const cs_min) @@ -157955,160 +167005,39 @@ index 000000000000..83d7513e78d9 + * @kctx: Pointer to kbase context where the queue group is created at + * @s_buf: Pointer to suspend buffer that is attached to queue group + * -+ * Return: 0 if suspend buffer is successfully allocated and reflected to GPU -+ * MMU page table. Otherwise -ENOMEM. ++ * Return: 0 if phy-pages for the suspend buffer is successfully allocated. ++ * Otherwise -ENOMEM or error code. + */ +static int create_normal_suspend_buffer(struct kbase_context *const kctx, + struct kbase_normal_suspend_buffer *s_buf) +{ -+ struct kbase_va_region *reg = NULL; -+ const unsigned long mem_flags = KBASE_REG_GPU_RD | KBASE_REG_GPU_WR; + const size_t nr_pages = + PFN_UP(kctx->kbdev->csf.global_iface.groups[0].suspend_size); -+ int err = 0; ++ int err; + + lockdep_assert_held(&kctx->csf.lock); + -+ /* Allocate and initialize Region Object */ -+ reg = kbase_alloc_free_region(&kctx->kbdev->csf.shared_reg_rbtree, 0, -+ nr_pages, KBASE_REG_ZONE_MCU_SHARED); -+ -+ if (!reg) -+ return -ENOMEM; -+ -+ s_buf->phy = kcalloc(nr_pages, sizeof(*s_buf->phy), GFP_KERNEL); -+ -+ if (!s_buf->phy) { -+ err = -ENOMEM; -+ goto phy_alloc_failed; -+ } -+ -+ /* Get physical page for a normal suspend buffer */ -+ err = kbase_mem_pool_alloc_pages( -+ &kctx->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], -+ nr_pages, &s_buf->phy[0], false); -+ -+ if (err < 0) -+ goto phy_pages_alloc_failed; -+ -+ /* Insert Region Object into rbtree and make virtual address available -+ * to map it to physical page ++ /* The suspend buffer's mapping address is valid only when the CSG is to ++ * run on slot, initializing it 0, signalling the buffer is not mapped. + */ -+ mutex_lock(&kctx->kbdev->csf.reg_lock); -+ err = kbase_add_va_region_rbtree(kctx->kbdev, reg, 0, nr_pages, 1); -+ reg->flags &= ~KBASE_REG_FREE; -+ mutex_unlock(&kctx->kbdev->csf.reg_lock); -+ -+ if (err) -+ goto add_va_region_failed; -+ -+ /* Update MMU table */ -+ err = kbase_mmu_insert_pages(kctx->kbdev, &kctx->kbdev->csf.mcu_mmu, -+ reg->start_pfn, &s_buf->phy[0], -+ nr_pages, mem_flags, -+ MCU_AS_NR, KBASE_MEM_GROUP_CSF_FW); -+ if (err) -+ goto mmu_insert_failed; -+ -+ s_buf->reg = reg; -+ -+ return 0; -+ -+mmu_insert_failed: -+ mutex_lock(&kctx->kbdev->csf.reg_lock); -+ WARN_ON(kbase_remove_va_region(reg)); -+ mutex_unlock(&kctx->kbdev->csf.reg_lock); -+ -+add_va_region_failed: -+ kbase_mem_pool_free_pages( -+ &kctx->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], nr_pages, -+ &s_buf->phy[0], false, false); -+ -+phy_pages_alloc_failed: -+ kfree(s_buf->phy); -+phy_alloc_failed: -+ kfree(reg); -+ -+ return err; -+} -+ -+/** -+ * create_protected_suspend_buffer() - Create protected-mode suspend buffer -+ * per queue group -+ * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. -+ * @s_buf: Pointer to suspend buffer that is attached to queue group -+ * -+ * Return: 0 if suspend buffer is successfully allocated and reflected to GPU -+ * MMU page table. Otherwise -ENOMEM. -+ */ -+static int create_protected_suspend_buffer(struct kbase_device *const kbdev, -+ struct kbase_protected_suspend_buffer *s_buf) -+{ -+ struct kbase_va_region *reg = NULL; -+ struct tagged_addr *phys = NULL; -+ const unsigned long mem_flags = KBASE_REG_GPU_RD | KBASE_REG_GPU_WR; -+ const size_t nr_pages = -+ PFN_UP(kbdev->csf.global_iface.groups[0].suspend_size); -+ int err = 0; ++ s_buf->gpu_va = 0; + -+ /* Allocate and initialize Region Object */ -+ reg = kbase_alloc_free_region(&kbdev->csf.shared_reg_rbtree, 0, -+ nr_pages, KBASE_REG_ZONE_MCU_SHARED); ++ s_buf->phy = kcalloc(nr_pages, sizeof(*s_buf->phy), GFP_KERNEL); + -+ if (!reg) ++ if (!s_buf->phy) + return -ENOMEM; + -+ phys = kcalloc(nr_pages, sizeof(*phys), GFP_KERNEL); -+ if (!phys) { -+ err = -ENOMEM; -+ goto phy_alloc_failed; -+ } ++ /* Get physical page for a normal suspend buffer */ ++ err = kbase_mem_pool_alloc_pages(&kctx->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], nr_pages, ++ &s_buf->phy[0], false, kctx->task); + -+ s_buf->pma = kbase_csf_protected_memory_alloc(kbdev, phys, -+ nr_pages); -+ if (s_buf->pma == NULL) { -+ err = -ENOMEM; -+ goto pma_alloc_failed; ++ if (err < 0) { ++ kfree(s_buf->phy); ++ return err; + } + -+ /* Insert Region Object into rbtree and make virtual address available -+ * to map it to physical page -+ */ -+ mutex_lock(&kbdev->csf.reg_lock); -+ err = kbase_add_va_region_rbtree(kbdev, reg, 0, nr_pages, 1); -+ reg->flags &= ~KBASE_REG_FREE; -+ mutex_unlock(&kbdev->csf.reg_lock); -+ -+ if (err) -+ goto add_va_region_failed; -+ -+ /* Update MMU table */ -+ err = kbase_mmu_insert_pages(kbdev, &kbdev->csf.mcu_mmu, -+ reg->start_pfn, phys, -+ nr_pages, mem_flags, MCU_AS_NR, -+ KBASE_MEM_GROUP_CSF_FW); -+ if (err) -+ goto mmu_insert_failed; -+ -+ s_buf->reg = reg; -+ kfree(phys); ++ kbase_process_page_usage_inc(kctx, nr_pages); + return 0; -+ -+mmu_insert_failed: -+ mutex_lock(&kbdev->csf.reg_lock); -+ WARN_ON(kbase_remove_va_region(reg)); -+ mutex_unlock(&kbdev->csf.reg_lock); -+ -+add_va_region_failed: -+ kbase_csf_protected_memory_free(kbdev, s_buf->pma, nr_pages); -+pma_alloc_failed: -+ kfree(phys); -+phy_alloc_failed: -+ kfree(reg); -+ -+ return err; +} + +static void timer_event_worker(struct work_struct *data); @@ -158129,26 +167058,30 @@ index 000000000000..83d7513e78d9 +static int create_suspend_buffers(struct kbase_context *const kctx, + struct kbase_queue_group * const group) +{ -+ int err = 0; -+ + if (create_normal_suspend_buffer(kctx, &group->normal_suspend_buf)) { + dev_err(kctx->kbdev->dev, "Failed to create normal suspend buffer\n"); + return -ENOMEM; + } + -+ if (kctx->kbdev->csf.pma_dev) { -+ err = create_protected_suspend_buffer(kctx->kbdev, -+ &group->protected_suspend_buf); -+ if (err) { -+ term_normal_suspend_buffer(kctx, -+ &group->normal_suspend_buf); -+ dev_err(kctx->kbdev->dev, "Failed to create protected suspend buffer\n"); -+ } -+ } else { -+ group->protected_suspend_buf.reg = NULL; -+ } ++ /* Protected suspend buffer, runtime binding so just initialize it */ ++ group->protected_suspend_buf.gpu_va = 0; ++ group->protected_suspend_buf.pma = NULL; ++ group->protected_suspend_buf.alloc_retries = 0; + -+ return err; ++ return 0; ++} ++ ++/** ++ * generate_group_uid() - Makes an ID unique to all kernel base devices ++ * and contexts, for a queue group and CSG. ++ * ++ * Return: A unique ID in the form of an unsigned 32-bit integer ++ */ ++static u32 generate_group_uid(void) ++{ ++ static atomic_t global_csg_uid = ATOMIC_INIT(0); ++ ++ return (u32)atomic_inc_return(&global_csg_uid); +} + +/** @@ -158162,13 +167095,13 @@ index 000000000000..83d7513e78d9 + * Return: a queue group handle on success, or a negative error code on failure. + */ +static int create_queue_group(struct kbase_context *const kctx, -+ const union kbase_ioctl_cs_queue_group_create *const create) ++ union kbase_ioctl_cs_queue_group_create *const create) +{ + int group_handle = find_free_group_handle(kctx); + + if (group_handle < 0) { -+ dev_err(kctx->kbdev->dev, -+ "All queue group handles are already in use\n"); ++ dev_dbg(kctx->kbdev->dev, ++ "All queue group handles are already in use"); + } else { + struct kbase_queue_group * const group = + kmalloc(sizeof(struct kbase_queue_group), @@ -158193,9 +167126,25 @@ index 000000000000..83d7513e78d9 + group->tiler_max = create->in.tiler_max; + group->fragment_max = create->in.fragment_max; + group->compute_max = create->in.compute_max; -+ group->priority = create->in.priority; ++ group->csi_handlers = create->in.csi_handlers; ++ group->priority = kbase_csf_priority_queue_group_priority_to_relative( ++ kbase_csf_priority_check(kctx->kbdev, create->in.priority)); + group->doorbell_nr = KBASEP_USER_DB_NR_INVALID; + group->faulted = false; ++ group->cs_unrecoverable = false; ++ group->reevaluate_idle_status = false; ++ ++ group->csg_reg = NULL; ++ group->csg_reg_bind_retries = 0; ++ ++ group->dvs_buf = create->in.dvs_buf; ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ group->deschedule_deferred_cnt = 0; ++#endif ++ ++ group->group_uid = generate_group_uid(); ++ create->out.group_uid = group->group_uid; + + INIT_LIST_HEAD(&group->link); + INIT_LIST_HEAD(&group->link_to_schedule); @@ -158208,6 +167157,9 @@ index 000000000000..83d7513e78d9 + MAX_SUPPORTED_STREAMS_PER_GROUP); + + group->run_state = KBASE_CSF_GROUP_INACTIVE; ++ KBASE_KTRACE_ADD_CSF_GRP(group->kctx->kbdev, CSF_GROUP_INACTIVE, group, ++ group->run_state); ++ + err = create_suspend_buffers(kctx, group); + + if (err < 0) { @@ -158227,6 +167179,18 @@ index 000000000000..83d7513e78d9 + return group_handle; +} + ++static bool dvs_supported(u32 csf_version) ++{ ++ if (GLB_VERSION_MAJOR_GET(csf_version) < 3) ++ return false; ++ ++ if (GLB_VERSION_MAJOR_GET(csf_version) == 3) ++ if (GLB_VERSION_MINOR_GET(csf_version) < 2) ++ return false; ++ ++ return true; ++} ++ +int kbase_csf_queue_group_create(struct kbase_context *const kctx, + union kbase_ioctl_cs_queue_group_create *const create) +{ @@ -158234,24 +167198,48 @@ index 000000000000..83d7513e78d9 + const u32 tiler_count = hweight64(create->in.tiler_mask); + const u32 fragment_count = hweight64(create->in.fragment_mask); + const u32 compute_count = hweight64(create->in.compute_mask); ++ size_t i; ++ ++ for (i = 0; i < sizeof(create->in.padding); i++) { ++ if (create->in.padding[i] != 0) { ++ dev_warn(kctx->kbdev->dev, "Invalid padding not 0 in queue group create\n"); ++ return -EINVAL; ++ } ++ } + + mutex_lock(&kctx->csf.lock); + + if ((create->in.tiler_max > tiler_count) || + (create->in.fragment_max > fragment_count) || + (create->in.compute_max > compute_count)) { -+ dev_err(kctx->kbdev->dev, -+ "Invalid maximum number of endpoints for a queue group\n"); ++ dev_dbg(kctx->kbdev->dev, ++ "Invalid maximum number of endpoints for a queue group"); + err = -EINVAL; + } else if (create->in.priority >= BASE_QUEUE_GROUP_PRIORITY_COUNT) { -+ dev_err(kctx->kbdev->dev, "Invalid queue group priority %u\n", ++ dev_dbg(kctx->kbdev->dev, "Invalid queue group priority %u", + (unsigned int)create->in.priority); + err = -EINVAL; + } else if (!iface_has_enough_streams(kctx->kbdev, create->in.cs_min)) { -+ dev_err(kctx->kbdev->dev, -+ "No CSG has at least %d streams\n", ++ dev_dbg(kctx->kbdev->dev, ++ "No CSG has at least %d CSs", + create->in.cs_min); + err = -EINVAL; ++ } else if (create->in.csi_handlers & ~BASE_CSF_EXCEPTION_HANDLER_FLAGS_MASK) { ++ dev_warn(kctx->kbdev->dev, "Unknown exception handler flags set: %u", ++ create->in.csi_handlers & ~BASE_CSF_EXCEPTION_HANDLER_FLAGS_MASK); ++ err = -EINVAL; ++ } else if (!dvs_supported(kctx->kbdev->csf.global_iface.version) && ++ create->in.dvs_buf) { ++ dev_warn( ++ kctx->kbdev->dev, ++ "GPU does not support DVS but userspace is trying to use it"); ++ err = -EINVAL; ++ } else if (dvs_supported(kctx->kbdev->csf.global_iface.version) && ++ !CSG_DVS_BUF_BUFFER_POINTER_GET(create->in.dvs_buf) && ++ CSG_DVS_BUF_BUFFER_SIZE_GET(create->in.dvs_buf)) { ++ dev_warn(kctx->kbdev->dev, ++ "DVS buffer pointer is null but size is not 0"); ++ err = -EINVAL; + } else { + /* For the CSG which satisfies the condition for having + * the needed number of CSs, check whether it also conforms @@ -158280,68 +167268,46 @@ index 000000000000..83d7513e78d9 + * @s_buf: Pointer to queue group suspend buffer to be freed + */ +static void term_normal_suspend_buffer(struct kbase_context *const kctx, -+ struct kbase_normal_suspend_buffer *s_buf) ++ struct kbase_normal_suspend_buffer *s_buf) +{ -+ const size_t nr_pages = -+ PFN_UP(kctx->kbdev->csf.global_iface.groups[0].suspend_size); ++ const size_t nr_pages = PFN_UP(kctx->kbdev->csf.global_iface.groups[0].suspend_size); + + lockdep_assert_held(&kctx->csf.lock); + -+ WARN_ON(kbase_mmu_teardown_pages( -+ kctx->kbdev, &kctx->kbdev->csf.mcu_mmu, -+ s_buf->reg->start_pfn, nr_pages, MCU_AS_NR)); -+ -+ WARN_ON(s_buf->reg->flags & KBASE_REG_FREE); -+ -+ mutex_lock(&kctx->kbdev->csf.reg_lock); -+ WARN_ON(kbase_remove_va_region(s_buf->reg)); -+ mutex_unlock(&kctx->kbdev->csf.reg_lock); ++ /* The group should not have a bind remaining on any suspend buf region */ ++ WARN_ONCE(s_buf->gpu_va, "Suspend buffer address should be 0 at termination"); + -+ kbase_mem_pool_free_pages( -+ &kctx->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], -+ nr_pages, &s_buf->phy[0], false, false); ++ kbase_mem_pool_free_pages(&kctx->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], nr_pages, ++ &s_buf->phy[0], false, false); ++ kbase_process_page_usage_dec(kctx, nr_pages); + + kfree(s_buf->phy); + s_buf->phy = NULL; -+ kfree(s_buf->reg); -+ s_buf->reg = NULL; +} + +/** -+ * term_protected_suspend_buffer() - Free normal-mode suspend buffer of ++ * term_protected_suspend_buffer() - Free protected-mode suspend buffer of + * queue group + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. -+ * @s_buf: Pointer to queue group suspend buffer to be freed ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @sbuf: Pointer to queue group suspend buffer to be freed + */ +static void term_protected_suspend_buffer(struct kbase_device *const kbdev, -+ struct kbase_protected_suspend_buffer *s_buf) ++ struct kbase_protected_suspend_buffer *sbuf) +{ -+ const size_t nr_pages = -+ PFN_UP(kbdev->csf.global_iface.groups[0].suspend_size); -+ -+ WARN_ON(kbase_mmu_teardown_pages( -+ kbdev, &kbdev->csf.mcu_mmu, -+ s_buf->reg->start_pfn, nr_pages, MCU_AS_NR)); -+ -+ WARN_ON(s_buf->reg->flags & KBASE_REG_FREE); -+ -+ mutex_lock(&kbdev->csf.reg_lock); -+ WARN_ON(kbase_remove_va_region(s_buf->reg)); -+ mutex_unlock(&kbdev->csf.reg_lock); -+ -+ kbase_csf_protected_memory_free(kbdev, s_buf->pma, nr_pages); -+ s_buf->pma = NULL; -+ kfree(s_buf->reg); -+ s_buf->reg = NULL; ++ WARN_ONCE(sbuf->gpu_va, "Suspend buf should have been unmapped inside scheduler!"); ++ if (sbuf->pma) { ++ const size_t nr_pages = PFN_UP(kbdev->csf.global_iface.groups[0].suspend_size); ++ kbase_csf_protected_memory_free(kbdev, sbuf->pma, nr_pages, true); ++ sbuf->pma = NULL; ++ } +} + +void kbase_csf_term_descheduled_queue_group(struct kbase_queue_group *group) +{ + struct kbase_context *kctx = group->kctx; + -+ /* Currently each group supports the same number of streams */ ++ /* Currently each group supports the same number of CS */ + u32 max_streams = + kctx->kbdev->csf.global_iface.groups[0].stream_num; + u32 i; @@ -158366,6 +167332,7 @@ index 000000000000..83d7513e78d9 + &group->protected_suspend_buf); + + group->run_state = KBASE_CSF_GROUP_TERMINATED; ++ KBASE_KTRACE_ADD_CSF_GRP(group->kctx->kbdev, CSF_GROUP_TERMINATED, group, group->run_state); +} + +/** @@ -158382,6 +167349,7 @@ index 000000000000..83d7513e78d9 +{ + struct kbase_context *kctx = group->kctx; + ++ kbase_reset_gpu_assert_failed_or_prevented(kctx->kbdev); + lockdep_assert_held(&kctx->csf.lock); + + /* Stop the group and evict it from the scheduler */ @@ -158395,72 +167363,148 @@ index 000000000000..83d7513e78d9 + kbase_csf_term_descheduled_queue_group(group); +} + ++/** ++ * wait_group_deferred_deschedule_completion - Wait for refcount of the group to ++ * become 0 that was taken when the group deschedule had to be deferred. ++ * ++ * @group: Pointer to GPU command queue group that is being deleted. ++ * ++ * This function is called when Userspace deletes the group and after the group ++ * has been descheduled. The function synchronizes with the other threads that were ++ * also trying to deschedule the group whilst the dumping was going on for a fault. ++ * Please refer the documentation of wait_for_dump_complete_on_group_deschedule() ++ * for more details. ++ */ ++static void wait_group_deferred_deschedule_completion(struct kbase_queue_group *group) ++{ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ struct kbase_context *kctx = group->kctx; ++ ++ lockdep_assert_held(&kctx->csf.lock); ++ ++ if (likely(!group->deschedule_deferred_cnt)) ++ return; ++ ++ mutex_unlock(&kctx->csf.lock); ++ wait_event(kctx->kbdev->csf.event_wait, !group->deschedule_deferred_cnt); ++ mutex_lock(&kctx->csf.lock); ++#endif ++} ++ +static void cancel_queue_group_events(struct kbase_queue_group *group) +{ + cancel_work_sync(&group->timer_event_work); + cancel_work_sync(&group->protm_event_work); +} + ++static void remove_pending_group_fatal_error(struct kbase_queue_group *group) ++{ ++ struct kbase_context *kctx = group->kctx; ++ ++ dev_dbg(kctx->kbdev->dev, ++ "Remove any pending group fatal error from context %pK\n", ++ (void *)group->kctx); ++ ++ kbase_csf_event_remove_error(kctx, &group->error_tiler_oom); ++ kbase_csf_event_remove_error(kctx, &group->error_timeout); ++ kbase_csf_event_remove_error(kctx, &group->error_fatal); ++} ++ +void kbase_csf_queue_group_terminate(struct kbase_context *kctx, + u8 group_handle) +{ + struct kbase_queue_group *group; ++ int err; ++ bool reset_prevented = false; ++ struct kbase_device *const kbdev = kctx->kbdev; ++ ++ err = kbase_reset_gpu_prevent_and_wait(kbdev); ++ if (err) ++ dev_warn( ++ kbdev->dev, ++ "Unsuccessful GPU reset detected when terminating group %d, attempting to terminate regardless", ++ group_handle); ++ else ++ reset_prevented = true; + + mutex_lock(&kctx->csf.lock); + + group = find_queue_group(kctx, group_handle); + + if (group) { -+ /* Remove any pending group fatal error from the per-context list. */ -+ list_del_init(&group->error_tiler_oom.link); -+ list_del_init(&group->error_timeout.link); -+ list_del_init(&group->error_fatal.link); -+ -+ term_queue_group(group); + kctx->csf.queue_groups[group_handle] = NULL; ++ /* Stop the running of the given group */ ++ term_queue_group(group); ++ mutex_unlock(&kctx->csf.lock); ++ ++ if (reset_prevented) { ++ /* Allow GPU reset before cancelling the group specific ++ * work item to avoid potential deadlock. ++ * Reset prevention isn't needed after group termination. ++ */ ++ kbase_reset_gpu_allow(kbdev); ++ reset_prevented = false; ++ } ++ ++ /* Cancel any pending event callbacks. If one is in progress ++ * then this thread waits synchronously for it to complete (which ++ * is why we must unlock the context first). We already ensured ++ * that no more callbacks can be enqueued by terminating the group. ++ */ ++ cancel_queue_group_events(group); ++ ++ mutex_lock(&kctx->csf.lock); ++ ++ /* Clean up after the termination */ ++ remove_pending_group_fatal_error(group); ++ ++ wait_group_deferred_deschedule_completion(group); + } + + mutex_unlock(&kctx->csf.lock); ++ if (reset_prevented) ++ kbase_reset_gpu_allow(kbdev); + -+ if (!group) -+ return; -+ -+ /* Cancel any pending event callbacks. If one is in progress -+ * then this thread waits synchronously for it to complete (which -+ * is why we must unlock the context first). We already ensured -+ * that no more callbacks can be enqueued by terminating the group. -+ */ -+ cancel_queue_group_events(group); + kfree(group); +} ++KBASE_EXPORT_TEST_API(kbase_csf_queue_group_terminate); + ++#if IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST +int kbase_csf_queue_group_suspend(struct kbase_context *kctx, + struct kbase_suspend_copy_buffer *sus_buf, + u8 group_handle) +{ -+ int err = -EINVAL; ++ struct kbase_device *const kbdev = kctx->kbdev; ++ int err; + struct kbase_queue_group *group; + ++ err = kbase_reset_gpu_prevent_and_wait(kbdev); ++ if (err) { ++ dev_warn( ++ kbdev->dev, ++ "Unsuccessful GPU reset detected when suspending group %d", ++ group_handle); ++ return err; ++ } + mutex_lock(&kctx->csf.lock); + + group = find_queue_group(kctx, group_handle); + if (group) + err = kbase_csf_scheduler_group_copy_suspend_buf(group, + sus_buf); ++ else ++ err = -EINVAL; + + mutex_unlock(&kctx->csf.lock); ++ kbase_reset_gpu_allow(kbdev); ++ + return err; +} ++#endif + -+/** -+ * kbase_csf_add_fatal_error_to_kctx - Add a fatal error to per-ctx error list. -+ * -+ * @group: GPU command queue group. -+ * @err_payload: Error payload to report. -+ */ -+static void kbase_csf_add_fatal_error_to_kctx( -+ struct kbase_queue_group *const group, -+ const struct base_gpu_queue_group_error *const err_payload) ++void kbase_csf_add_group_fatal_error( ++ struct kbase_queue_group *const group, ++ struct base_gpu_queue_group_error const *const err_payload) +{ + struct base_csf_notification error; + @@ -158480,16 +167524,7 @@ index 000000000000..83d7513e78d9 + } + }; + -+ lockdep_assert_held(&group->kctx->csf.lock); -+ -+ /* If this group has already been in fatal error status, -+ * subsequent fatal error on this group should never take place. -+ */ -+ if (!WARN_ON(!list_empty(&group->error_fatal.link))) { -+ group->error_fatal.data = error; -+ list_add_tail(&group->error_fatal.link, -+ &group->kctx->csf.error_list); -+ } ++ kbase_csf_event_add_error(group->kctx, &group->error_fatal, &error); +} + +void kbase_csf_active_queue_groups_reset(struct kbase_device *kbdev, @@ -158498,7 +167533,6 @@ index 000000000000..83d7513e78d9 + struct list_head evicted_groups; + struct kbase_queue_group *group; + int i; -+ bool fatal_error_built = false; + + INIT_LIST_HEAD(&evicted_groups); + @@ -158506,10 +167540,6 @@ index 000000000000..83d7513e78d9 + + kbase_csf_scheduler_evict_ctx_slots(kbdev, kctx, &evicted_groups); + while (!list_empty(&evicted_groups)) { -+ struct kbase_csf_scheduler *scheduler = -+ &kbdev->csf.scheduler; -+ unsigned long flags; -+ + group = list_first_entry(&evicted_groups, + struct kbase_queue_group, link); + @@ -158517,28 +167547,8 @@ index 000000000000..83d7513e78d9 + kctx->tgid, kctx->id, group->handle); + kbase_csf_term_descheduled_queue_group(group); + list_del_init(&group->link); -+ -+ kbase_csf_scheduler_spin_lock(kbdev, &flags); -+ if ((group == scheduler->active_protm_grp) && -+ group->faulted) { -+ const struct base_gpu_queue_group_error err_payload = { -+ .error_type = BASE_GPU_QUEUE_GROUP_ERROR_FATAL, -+ .payload = { -+ .fatal_group = { -+ .status = GPU_EXCEPTION_TYPE_SW_FAULT_0, -+ } -+ } -+ }; -+ -+ kbase_csf_add_fatal_error_to_kctx(group, &err_payload); -+ fatal_error_built = true; -+ } -+ kbase_csf_scheduler_spin_unlock(kbdev, flags); + } + -+ if (fatal_error_built) -+ kbase_event_wakeup(kctx); -+ + /* Acting on the queue groups that are pending to be terminated. */ + for (i = 0; i < MAX_QUEUE_GROUP_NUM; i++) { + group = kctx->csf.queue_groups[i]; @@ -158554,13 +167564,10 @@ index 000000000000..83d7513e78d9 +{ + int err = -ENOMEM; + -+ INIT_LIST_HEAD(&kctx->csf.event_callback_list); + INIT_LIST_HEAD(&kctx->csf.queue_list); + INIT_LIST_HEAD(&kctx->csf.link); -+ INIT_LIST_HEAD(&kctx->csf.error_list); + -+ spin_lock_init(&kctx->csf.event_lock); -+ kctx->csf.user_reg_vma = NULL; ++ kbase_csf_event_init(kctx); + + /* Mark all the cookies as 'free' */ + bitmap_fill(kctx->csf.cookies, KBASE_CSF_NUM_USER_IO_PAGES_HANDLE); @@ -158577,9 +167584,18 @@ index 000000000000..83d7513e78d9 + if (likely(!err)) { + err = kbase_csf_tiler_heap_context_init(kctx); + -+ if (likely(!err)) ++ if (likely(!err)) { + mutex_init(&kctx->csf.lock); -+ else ++ INIT_WORK(&kctx->csf.pending_submission_work, ++ pending_submission_worker); ++ ++ err = kbasep_ctx_user_reg_page_mapping_init(kctx); ++ ++ if (unlikely(err)) ++ kbase_csf_tiler_heap_context_term(kctx); ++ } ++ ++ if (unlikely(err)) + kbase_csf_kcpu_queue_context_term(kctx); + } + @@ -158600,6 +167616,8 @@ index 000000000000..83d7513e78d9 + int gr; + bool reported = false; + struct base_gpu_queue_group_error err_payload; ++ int err; ++ struct kbase_device *kbdev; + + if (WARN_ON(!kctx)) + return; @@ -158607,6 +167625,14 @@ index 000000000000..83d7513e78d9 + if (WARN_ON(!fault)) + return; + ++ kbdev = kctx->kbdev; ++ err = kbase_reset_gpu_try_prevent(kbdev); ++ /* Regardless of whether reset failed or is currently happening, exit ++ * early ++ */ ++ if (err) ++ return; ++ + err_payload = (struct base_gpu_queue_group_error) { + .error_type = BASE_GPU_QUEUE_GROUP_ERROR_FATAL, + .payload = { @@ -158625,7 +167651,7 @@ index 000000000000..83d7513e78d9 + + if (group && group->run_state != KBASE_CSF_GROUP_TERMINATED) { + term_queue_group(group); -+ kbase_csf_add_fatal_error_to_kctx(group, &err_payload); ++ kbase_csf_add_group_fatal_error(group, &err_payload); + reported = true; + } + } @@ -158634,18 +167660,34 @@ index 000000000000..83d7513e78d9 + + if (reported) + kbase_event_wakeup(kctx); ++ ++ kbase_reset_gpu_allow(kbdev); +} + +void kbase_csf_ctx_term(struct kbase_context *kctx) +{ ++ struct kbase_device *kbdev = kctx->kbdev; ++ struct kbase_as *as = NULL; ++ unsigned long flags; + u32 i; ++ int err; ++ bool reset_prevented = false; + + /* As the kbase context is terminating, its debugfs sub-directory would + * have been removed already and so would be the debugfs file created + * for queue groups & kcpu queues, hence no need to explicitly remove + * those debugfs files. + */ -+ kbase_csf_event_wait_remove_all(kctx); ++ ++ /* Wait for a GPU reset if it is happening, prevent it if not happening */ ++ err = kbase_reset_gpu_prevent_and_wait(kbdev); ++ if (err) ++ dev_warn( ++ kbdev->dev, ++ "Unsuccessful GPU reset detected when terminating csf context (%d_%d), attempting to terminate regardless", ++ kctx->tgid, kctx->id); ++ else ++ reset_prevented = true; + + mutex_lock(&kctx->csf.lock); + @@ -158653,22 +167695,48 @@ index 000000000000..83d7513e78d9 + * userspace and issue the term request to firmware for them. + */ + for (i = 0; i < MAX_QUEUE_GROUP_NUM; i++) { -+ if (kctx->csf.queue_groups[i]) -+ term_queue_group(kctx->csf.queue_groups[i]); -+ } ++ struct kbase_queue_group *group = kctx->csf.queue_groups[i]; + ++ if (group) { ++ remove_pending_group_fatal_error(group); ++ term_queue_group(group); ++ } ++ } + mutex_unlock(&kctx->csf.lock); + ++ if (reset_prevented) ++ kbase_reset_gpu_allow(kbdev); ++ ++ cancel_work_sync(&kctx->csf.pending_submission_work); ++ + /* Now that all queue groups have been terminated, there can be no + * more OoM or timer event interrupts but there can be inflight work + * items. Destroying the wq will implicitly flush those work items. + */ + destroy_workqueue(kctx->csf.wq); + ++ /* Wait for the firmware error work item to also finish as it could ++ * be affecting this outgoing context also. ++ */ ++ flush_work(&kctx->kbdev->csf.fw_error_work); ++ ++ /* A work item to handle page_fault/bus_fault/gpu_fault could be ++ * pending for the outgoing context. Flush the workqueue that will ++ * execute that work item. ++ */ ++ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, flags); ++ if (kctx->as_nr != KBASEP_AS_NR_INVALID) ++ as = &kctx->kbdev->as[kctx->as_nr]; ++ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, flags); ++ if (as) ++ flush_workqueue(as->pf_wq); ++ + mutex_lock(&kctx->csf.lock); + -+ for (i = 0; i < MAX_QUEUE_GROUP_NUM; i++) ++ for (i = 0; i < MAX_QUEUE_GROUP_NUM; i++) { + kfree(kctx->csf.queue_groups[i]); ++ kctx->csf.queue_groups[i] = NULL; ++ } + + /* Iterate through the queues that were not terminated by + * userspace and do the required cleanup for them. @@ -158685,177 +167753,45 @@ index 000000000000..83d7513e78d9 + * only one reference left that was taken when queue was + * registered. + */ -+ if (atomic_read(&queue->refcount) != 1) -+ dev_warn(kctx->kbdev->dev, -+ "Releasing queue with incorrect refcounting!\n"); ++ WARN_ON(kbase_refcount_read(&queue->refcount) != 1); + list_del_init(&queue->link); + release_queue(queue); + } + + mutex_unlock(&kctx->csf.lock); + ++ kbasep_ctx_user_reg_page_mapping_term(kctx); + kbase_csf_tiler_heap_context_term(kctx); + kbase_csf_kcpu_queue_context_term(kctx); + kbase_csf_scheduler_context_term(kctx); ++ kbase_csf_event_term(kctx); + + mutex_destroy(&kctx->csf.lock); +} + -+int kbase_csf_event_wait_add(struct kbase_context *kctx, -+ kbase_csf_event_callback *callback, void *param) -+{ -+ int err = -ENOMEM; -+ struct kbase_csf_event *event = -+ kzalloc(sizeof(struct kbase_csf_event), GFP_KERNEL); -+ -+ if (event) { -+ unsigned long flags; -+ -+ event->kctx = kctx; -+ event->callback = callback; -+ event->param = param; -+ -+ spin_lock_irqsave(&kctx->csf.event_lock, flags); -+ list_add_tail(&event->link, &kctx->csf.event_callback_list); -+ spin_unlock_irqrestore(&kctx->csf.event_lock, flags); -+ -+ err = 0; -+ } -+ -+ return err; -+} -+ -+void kbase_csf_event_wait_remove(struct kbase_context *kctx, -+ kbase_csf_event_callback *callback, void *param) -+{ -+ struct kbase_csf_event *event; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kctx->csf.event_lock, flags); -+ -+ list_for_each_entry(event, &kctx->csf.event_callback_list, link) { -+ if ((event->callback == callback) && (event->param == param)) { -+ list_del(&event->link); -+ kfree(event); -+ break; -+ } -+ } -+ spin_unlock_irqrestore(&kctx->csf.event_lock, flags); -+} -+ -+bool kbase_csf_read_error(struct kbase_context *kctx, -+ struct base_csf_notification *event_data) -+{ -+ bool got_event = true; -+ struct kbase_csf_notification *error_data = NULL; -+ -+ mutex_lock(&kctx->csf.lock); -+ -+ if (likely(!list_empty(&kctx->csf.error_list))) { -+ error_data = list_first_entry(&kctx->csf.error_list, -+ struct kbase_csf_notification, link); -+ list_del_init(&error_data->link); -+ *event_data = error_data->data; -+ } else { -+ got_event = false; -+ } -+ -+ mutex_unlock(&kctx->csf.lock); -+ -+ return got_event; -+} -+ -+bool kbase_csf_error_pending(struct kbase_context *kctx) -+{ -+ bool event_pended = false; -+ -+ mutex_lock(&kctx->csf.lock); -+ event_pended = !list_empty(&kctx->csf.error_list); -+ mutex_unlock(&kctx->csf.lock); -+ -+ return event_pended; -+} -+ -+void kbase_csf_event_signal(struct kbase_context *kctx, bool notify_gpu) -+{ -+ struct kbase_csf_event *event, *next_event; -+ unsigned long flags; -+ -+ /* First increment the signal count and wake up event thread. -+ */ -+ atomic_set(&kctx->event_count, 1); -+ kbase_event_wakeup(kctx); -+ -+ /* Signal the CSF firmware. This is to ensure that pending command -+ * stream synch object wait operations are re-evaluated. -+ * Write to GLB_DOORBELL would suffice as spec says that all pending -+ * synch object wait operations are re-evaluated on a write to any -+ * CS_DOORBELL/GLB_DOORBELL register. -+ */ -+ if (notify_gpu) { -+ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, flags); -+ if (kctx->kbdev->pm.backend.gpu_powered) -+ kbase_csf_ring_doorbell(kctx->kbdev, CSF_KERNEL_DOORBELL_NR); -+ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, flags); -+ } -+ -+ /* Now invoke the callbacks registered on backend side. -+ * Allow item removal inside the loop, if requested by the callback. -+ */ -+ spin_lock_irqsave(&kctx->csf.event_lock, flags); -+ -+ list_for_each_entry_safe( -+ event, next_event, &kctx->csf.event_callback_list, link) { -+ enum kbase_csf_event_callback_action action = -+ event->callback(event->param); -+ -+ if (action == KBASE_CSF_EVENT_CALLBACK_REMOVE) { -+ list_del(&event->link); -+ kfree(event); -+ } -+ } -+ -+ spin_unlock_irqrestore(&kctx->csf.event_lock, flags); -+} -+ -+void kbase_csf_event_wait_remove_all(struct kbase_context *kctx) -+{ -+ struct kbase_csf_event *event, *next_event; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kctx->csf.event_lock, flags); -+ -+ list_for_each_entry_safe( -+ event, next_event, &kctx->csf.event_callback_list, link) { -+ list_del(&event->link); -+ kfree(event); -+ } -+ -+ spin_unlock_irqrestore(&kctx->csf.event_lock, flags); -+} -+ +/** + * handle_oom_event - Handle the OoM event generated by the firmware for the -+ * command stream interface. ++ * CSI. ++ * ++ * @group: Pointer to the CSG group the oom-event belongs to. ++ * @stream: Pointer to the structure containing info provided by the firmware ++ * about the CSI. + * + * This function will handle the OoM event request from the firmware for the -+ * command stream. It will retrieve the address of heap context and heap's -+ * statistics (like number of render passes in-flight) from the command -+ * stream's kernel output page and pass them to the tiler heap function -+ * to allocate a new chunk. -+ * It will also update the command stream's kernel input page with the address ++ * CS. It will retrieve the address of heap context and heap's ++ * statistics (like number of render passes in-flight) from the CS's kernel ++ * output page and pass them to the tiler heap function to allocate a ++ * new chunk. ++ * It will also update the CS's kernel input page with the address + * of a new chunk that was allocated. + * -+ * @kctx: Pointer to the kbase context in which the tiler heap was initialized. -+ * @stream: Pointer to the structure containing info provided by the firmware -+ * about the command stream interface. -+ * + * Return: 0 if successfully handled the request, otherwise a negative error + * code on failure. + */ -+static int handle_oom_event(struct kbase_context *const kctx, -+ struct kbase_csf_cmd_stream_info const *const stream) ++static int handle_oom_event(struct kbase_queue_group *const group, ++ struct kbase_csf_cmd_stream_info const *const stream) +{ ++ struct kbase_context *const kctx = group->kctx; + u64 gpu_heap_va = + kbase_csf_firmware_cs_output(stream, CS_HEAP_ADDRESS_LO) | + ((u64)kbase_csf_firmware_cs_output(stream, CS_HEAP_ADDRESS_HI) << 32); @@ -158866,26 +167802,39 @@ index 000000000000..83d7513e78d9 + const u32 frag_end = + kbase_csf_firmware_cs_output(stream, CS_HEAP_FRAG_END); + u32 renderpasses_in_flight; ++ u32 pending_frag_count; + u64 new_chunk_ptr; + int err; ++ bool frag_end_err = false; + + if ((frag_end > vt_end) || (vt_end >= vt_start)) { -+ dev_warn(kctx->kbdev->dev, "Invalid Heap statistics provided by firmware: vt_start %d, vt_end %d, frag_end %d\n", ++ frag_end_err = true; ++ dev_dbg(kctx->kbdev->dev, "Invalid Heap statistics provided by firmware: vt_start %d, vt_end %d, frag_end %d\n", + vt_start, vt_end, frag_end); -+ return -EINVAL; + } -+ -+ renderpasses_in_flight = vt_start - frag_end; ++ if (frag_end_err) { ++ renderpasses_in_flight = 1; ++ pending_frag_count = 1; ++ } else { ++ renderpasses_in_flight = vt_start - frag_end; ++ pending_frag_count = vt_end - frag_end; ++ } + + err = kbase_csf_tiler_heap_alloc_new_chunk(kctx, -+ gpu_heap_va, renderpasses_in_flight, &new_chunk_ptr); ++ gpu_heap_va, renderpasses_in_flight, pending_frag_count, &new_chunk_ptr); + -+ /* It is okay to acknowledge with a NULL chunk (firmware will then wait -+ * for the fragment jobs to complete and release chunks) -+ */ -+ if (err == -EBUSY) ++ if ((group->csi_handlers & BASE_CSF_TILER_OOM_EXCEPTION_FLAG) && ++ (pending_frag_count == 0) && (err == -ENOMEM || err == -EBUSY)) { ++ /* The group allows incremental rendering, trigger it */ + new_chunk_ptr = 0; -+ else if (err) ++ dev_dbg(kctx->kbdev->dev, "Group-%d (slot-%d) enter incremental render\n", ++ group->handle, group->csg_nr); ++ } else if (err == -EBUSY) { ++ /* Acknowledge with a NULL chunk (firmware will then wait for ++ * the fragment jobs to complete and release chunks) ++ */ ++ new_chunk_ptr = 0; ++ } else if (err) + return err; + + kbase_csf_firmware_cs_input(stream, CS_TILER_HEAP_START_LO, @@ -158917,17 +167866,41 @@ index 000000000000..83d7513e78d9 + .error_type = + BASE_GPU_QUEUE_GROUP_ERROR_TILER_HEAP_OOM, + } } } }; -+ struct kbase_context *kctx = group->kctx; + -+ lockdep_assert_held(&kctx->csf.lock); ++ kbase_csf_event_add_error(group->kctx, ++ &group->error_tiler_oom, ++ &error); ++ kbase_event_wakeup(group->kctx); ++} + -+ /* Ignore this error if the previous one hasn't been reported */ -+ if (!WARN_ON(!list_empty(&group->error_tiler_oom.link))) { -+ group->error_tiler_oom.data = error; -+ list_add_tail(&group->error_tiler_oom.link, -+ &kctx->csf.error_list); -+ kbase_event_wakeup(kctx); ++static void flush_gpu_cache_on_fatal_error(struct kbase_device *kbdev) ++{ ++ int err; ++ const unsigned int cache_flush_wait_timeout_ms = 2000; ++ ++ kbase_pm_lock(kbdev); ++ /* With the advent of partial cache flush, dirty cache lines could ++ * be left in the GPU L2 caches by terminating the queue group here ++ * without waiting for proper cache maintenance. A full cache flush ++ * here will prevent these dirty cache lines from being arbitrarily ++ * evicted later and possible causing memory corruption. ++ */ ++ if (kbdev->pm.backend.gpu_powered) { ++ kbase_gpu_start_cache_clean(kbdev, GPU_COMMAND_CACHE_CLN_INV_L2_LSC); ++ err = kbase_gpu_wait_cache_clean_timeout(kbdev, cache_flush_wait_timeout_ms); ++ ++ if (err) { ++ dev_warn( ++ kbdev->dev, ++ "[%llu] Timeout waiting for cache clean to complete after fatal error", ++ kbase_backend_get_cycle_cnt(kbdev)); ++ ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) ++ kbase_reset_gpu(kbdev); ++ } + } ++ ++ kbase_pm_unlock(kbdev); +} + +/** @@ -158935,15 +167908,15 @@ index 000000000000..83d7513e78d9 + * + * @queue: Pointer to queue for which out-of-memory event was received. + * -+ * Called with the command-stream front-end locked for the affected GPU -+ * virtual address space. Do not call in interrupt context. ++ * Called with the CSF locked for the affected GPU virtual address space. ++ * Do not call in interrupt context. + * + * Handles tiler out-of-memory for a GPU command queue and then clears the + * notification to allow the firmware to report out-of-memory again in future. + * If the out-of-memory condition was successfully handled then this function + * rings the relevant doorbell to notify the firmware; otherwise, it terminates -+ * the GPU command queue group to which the queue is bound. See -+ * term_queue_group() for details. ++ * the GPU command queue group to which the queue is bound and notify a waiting ++ * user space client of the failure. + */ +static void kbase_queue_oom_event(struct kbase_queue *const queue) +{ @@ -158953,7 +167926,9 @@ index 000000000000..83d7513e78d9 + int slot_num, err; + struct kbase_csf_cmd_stream_group_info const *ginfo; + struct kbase_csf_cmd_stream_info const *stream; ++ int csi_index = queue->csi_index; + u32 cs_oom_ack, cs_oom_req; ++ unsigned long flags; + + lockdep_assert_held(&kctx->csf.lock); + @@ -158981,7 +167956,7 @@ index 000000000000..83d7513e78d9 + goto unlock; + + ginfo = &kbdev->csf.global_iface.groups[slot_num]; -+ stream = &ginfo->streams[queue->csi_index]; ++ stream = &ginfo->streams[csi_index]; + cs_oom_ack = kbase_csf_firmware_cs_output(stream, CS_ACK) & + CS_ACK_TILER_OOM_MASK; + cs_oom_req = kbase_csf_firmware_cs_input_read(stream, CS_REQ) & @@ -158997,22 +167972,25 @@ index 000000000000..83d7513e78d9 + if (cs_oom_ack == cs_oom_req) + goto unlock; + -+ err = handle_oom_event(kctx, stream); ++ err = handle_oom_event(group, stream); + ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); + kbase_csf_firmware_cs_input_mask(stream, CS_REQ, cs_oom_ack, + CS_REQ_TILER_OOM_MASK); ++ kbase_csf_ring_cs_kernel_doorbell(kbdev, csi_index, slot_num, true); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); + -+ if (err) { ++ if (unlikely(err)) { + dev_warn( + kbdev->dev, + "Queue group to be terminated, couldn't handle the OoM event\n"); ++ kbase_debug_csf_fault_notify(kbdev, kctx, DF_TILER_OOM); + kbase_csf_scheduler_unlock(kbdev); + term_queue_group(group); ++ flush_gpu_cache_on_fatal_error(kbdev); + report_tiler_oom_error(group); + return; + } -+ -+ kbase_csf_ring_cs_kernel_doorbell(kbdev, queue); +unlock: + kbase_csf_scheduler_unlock(kbdev); +} @@ -159031,6 +168009,15 @@ index 000000000000..83d7513e78d9 + struct kbase_queue *queue = + container_of(data, struct kbase_queue, oom_event_work); + struct kbase_context *kctx = queue->kctx; ++ struct kbase_device *const kbdev = kctx->kbdev; ++ ++ int err = kbase_reset_gpu_try_prevent(kbdev); ++ ++ /* Regardless of whether reset failed or is currently happening, exit ++ * early ++ */ ++ if (err) ++ return; + + mutex_lock(&kctx->csf.lock); + @@ -159038,20 +168025,16 @@ index 000000000000..83d7513e78d9 + release_queue(queue); + + mutex_unlock(&kctx->csf.lock); ++ kbase_reset_gpu_allow(kbdev); +} + +/** -+ * timer_event_worker - Timer event handler called from a workqueue. -+ * -+ * @data: Pointer to a work_struct embedded in GPU command queue group data. ++ * report_group_timeout_error - Report the timeout error for the group to userspace. + * -+ * Notify the event notification thread of progress timeout fault -+ * for the GPU command queue group. ++ * @group: Pointer to the group for which timeout error occurred + */ -+static void timer_event_worker(struct work_struct *data) ++static void report_group_timeout_error(struct kbase_queue_group *const group) +{ -+ struct kbase_queue_group *const group = -+ container_of(data, struct kbase_queue_group, timer_event_work); + struct base_csf_notification const + error = { .type = BASE_CSF_NOTIFICATION_GPU_QUEUE_GROUP_ERROR, + .payload = { @@ -159061,19 +168044,140 @@ index 000000000000..83d7513e78d9 + .error_type = + BASE_GPU_QUEUE_GROUP_ERROR_TIMEOUT, + } } } }; ++ ++ dev_warn(group->kctx->kbdev->dev, ++ "Notify the event notification thread, forward progress timeout (%llu cycles)\n", ++ kbase_csf_timeout_get(group->kctx->kbdev)); ++ ++ kbase_csf_event_add_error(group->kctx, &group->error_timeout, &error); ++ kbase_event_wakeup(group->kctx); ++} ++ ++/** ++ * timer_event_worker - Handle the progress timeout error for the group ++ * ++ * @data: Pointer to a work_struct embedded in GPU command queue group data. ++ * ++ * Terminate the CSG and report the error to userspace ++ */ ++static void timer_event_worker(struct work_struct *data) ++{ ++ struct kbase_queue_group *const group = ++ container_of(data, struct kbase_queue_group, timer_event_work); + struct kbase_context *const kctx = group->kctx; ++ struct kbase_device *const kbdev = kctx->kbdev; ++ bool reset_prevented = false; ++ int err = kbase_reset_gpu_prevent_and_wait(kbdev); ++ ++ if (err) ++ dev_warn( ++ kbdev->dev, ++ "Unsuccessful GPU reset detected when terminating group %d on progress timeout, attempting to terminate regardless", ++ group->handle); ++ else ++ reset_prevented = true; + + mutex_lock(&kctx->csf.lock); + -+ /* Ignore this error if the previous one hasn't been reported */ -+ if (!WARN_ON(!list_empty(&group->error_timeout.link))) { -+ group->error_timeout.data = error; -+ list_add_tail(&group->error_timeout.link, -+ &kctx->csf.error_list); -+ kbase_event_wakeup(kctx); ++ term_queue_group(group); ++ flush_gpu_cache_on_fatal_error(kbdev); ++ report_group_timeout_error(group); ++ ++ mutex_unlock(&kctx->csf.lock); ++ if (reset_prevented) ++ kbase_reset_gpu_allow(kbdev); ++} ++ ++/** ++ * handle_progress_timer_event - Progress timer timeout event handler. ++ * ++ * @group: Pointer to GPU queue group for which the timeout event is received. ++ * ++ * Notify a waiting user space client of the timeout. ++ * Enqueue a work item to terminate the group and notify the event notification ++ * thread of progress timeout fault for the GPU command queue group. ++ */ ++static void handle_progress_timer_event(struct kbase_queue_group *const group) ++{ ++ kbase_debug_csf_fault_notify(group->kctx->kbdev, group->kctx, ++ DF_PROGRESS_TIMER_TIMEOUT); ++ ++ queue_work(group->kctx->csf.wq, &group->timer_event_work); ++} ++ ++/** ++ * alloc_grp_protected_suspend_buffer_pages() - Allocate physical pages from the protected ++ * memory for the protected mode suspend buffer. ++ * @group: Pointer to the GPU queue group. ++ * ++ * Return: 0 if suspend buffer allocation is successful or if its already allocated, otherwise ++ * negative error value. ++ */ ++static int alloc_grp_protected_suspend_buffer_pages(struct kbase_queue_group *const group) ++{ ++ struct kbase_device *const kbdev = group->kctx->kbdev; ++ struct kbase_context *kctx = group->kctx; ++ struct tagged_addr *phys = NULL; ++ struct kbase_protected_suspend_buffer *sbuf = &group->protected_suspend_buf; ++ size_t nr_pages; ++ int err = 0; ++ ++ if (likely(sbuf->pma)) ++ return 0; ++ ++ nr_pages = PFN_UP(kbdev->csf.global_iface.groups[0].suspend_size); ++ phys = kcalloc(nr_pages, sizeof(*phys), GFP_KERNEL); ++ if (unlikely(!phys)) { ++ err = -ENOMEM; ++ goto phys_free; ++ } ++ ++ mutex_lock(&kctx->csf.lock); ++ kbase_csf_scheduler_lock(kbdev); ++ ++ if (unlikely(!group->csg_reg)) { ++ /* The only chance of the bound csg_reg is removed from the group is ++ * that it has been put off slot by the scheduler and the csg_reg resource ++ * is contended by other groups. In this case, it needs another occasion for ++ * mapping the pma, which needs a bound csg_reg. Since the group is already ++ * off-slot, returning no error is harmless as the scheduler, when place the ++ * group back on-slot again would do the required MMU map operation on the ++ * allocated and retained pma. ++ */ ++ WARN_ON(group->csg_nr >= 0); ++ dev_dbg(kbdev->dev, "No bound csg_reg for group_%d_%d_%d to enter protected mode", ++ group->kctx->tgid, group->kctx->id, group->handle); ++ goto unlock; + } + ++ /* Allocate the protected mode pages */ ++ sbuf->pma = kbase_csf_protected_memory_alloc(kbdev, phys, nr_pages, true); ++ if (unlikely(!sbuf->pma)) { ++ err = -ENOMEM; ++ goto unlock; ++ } ++ ++ /* Map the bound susp_reg to the just allocated pma pages */ ++ err = kbase_csf_mcu_shared_group_update_pmode_map(kbdev, group); ++ ++unlock: ++ kbase_csf_scheduler_unlock(kbdev); + mutex_unlock(&kctx->csf.lock); ++phys_free: ++ kfree(phys); ++ return err; ++} ++ ++static void report_group_fatal_error(struct kbase_queue_group *const group) ++{ ++ struct base_gpu_queue_group_error const ++ err_payload = { .error_type = BASE_GPU_QUEUE_GROUP_ERROR_FATAL, ++ .payload = { .fatal_group = { ++ .status = GPU_EXCEPTION_TYPE_SW_FAULT_0, ++ } } }; ++ ++ kbase_csf_add_group_fatal_error(group, &err_payload); ++ kbase_event_wakeup(group->kctx); +} + +/** @@ -159088,24 +168192,48 @@ index 000000000000..83d7513e78d9 +{ + struct kbase_queue_group *const group = + container_of(data, struct kbase_queue_group, protm_event_work); ++ struct kbase_protected_suspend_buffer *sbuf = &group->protected_suspend_buf; ++ int err = 0; ++ ++ KBASE_KTRACE_ADD_CSF_GRP(group->kctx->kbdev, PROTM_EVENT_WORKER_START, ++ group, 0u); ++ ++ err = alloc_grp_protected_suspend_buffer_pages(group); ++ if (!err) { ++ kbase_csf_scheduler_group_protm_enter(group); ++ } else if (err == -ENOMEM && sbuf->alloc_retries <= PROTM_ALLOC_MAX_RETRIES) { ++ sbuf->alloc_retries++; ++ /* try again to allocate pages */ ++ queue_work(group->kctx->csf.wq, &group->protm_event_work); ++ } else if (sbuf->alloc_retries >= PROTM_ALLOC_MAX_RETRIES || err != -ENOMEM) { ++ dev_err(group->kctx->kbdev->dev, ++ "Failed to allocate physical pages for Protected mode suspend buffer for the group %d of context %d_%d", ++ group->handle, group->kctx->tgid, group->kctx->id); ++ report_group_fatal_error(group); ++ } + -+ kbase_csf_scheduler_group_protm_enter(group); ++ KBASE_KTRACE_ADD_CSF_GRP(group->kctx->kbdev, PROTM_EVENT_WORKER_END, ++ group, 0u); +} + +/** + * handle_fault_event - Handler for CS fault. + * + * @queue: Pointer to queue for which fault event was received. -+ * @stream: Pointer to the structure containing info provided by the -+ * firmware about the command stream interface. -+ * -+ * Prints meaningful CS fault information. ++ * @cs_ack: Value of the CS_ACK register in the CS kernel input page used for ++ * the queue. + * -+ * Return: 0 on success, otherwise a negative system code. ++ * Print required information about the CS fault and notify the user space client ++ * about the fault. + */ -+static int handle_fault_event(struct kbase_queue const *const queue, -+ struct kbase_csf_cmd_stream_info const *const stream) ++static void ++handle_fault_event(struct kbase_queue *const queue, const u32 cs_ack) +{ ++ struct kbase_device *const kbdev = queue->kctx->kbdev; ++ struct kbase_csf_cmd_stream_group_info const *ginfo = ++ &kbdev->csf.global_iface.groups[queue->group->csg_nr]; ++ struct kbase_csf_cmd_stream_info const *stream = ++ &ginfo->streams[queue->csi_index]; + const u32 cs_fault = kbase_csf_firmware_cs_output(stream, CS_FAULT); + const u64 cs_fault_info = + kbase_csf_firmware_cs_output(stream, CS_FAULT_INFO_LO) | @@ -159117,37 +168245,61 @@ index 000000000000..83d7513e78d9 + CS_FAULT_EXCEPTION_DATA_GET(cs_fault); + const u64 cs_fault_info_exception_data = + CS_FAULT_INFO_EXCEPTION_DATA_GET(cs_fault_info); -+ struct kbase_device *const kbdev = queue->kctx->kbdev; + -+ dev_warn(kbdev->dev, "CSI: %d\n" -+ "CS_FAULT.EXCEPTION_TYPE: 0x%x (%s)\n" -+ "CS_FAULT.EXCEPTION_DATA: 0x%x\n" -+ "CS_FAULT_INFO.EXCEPTION_DATA: 0x%llx\n", -+ queue->csi_index, cs_fault_exception_type, -+ kbase_gpu_exception_name(cs_fault_exception_type), -+ cs_fault_exception_data, cs_fault_info_exception_data); ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); + -+ return -EFAULT; ++ dev_warn(kbdev->dev, ++ "Ctx %d_%d Group %d CSG %d CSI: %d\n" ++ "CS_FAULT.EXCEPTION_TYPE: 0x%x (%s)\n" ++ "CS_FAULT.EXCEPTION_DATA: 0x%x\n" ++ "CS_FAULT_INFO.EXCEPTION_DATA: 0x%llx\n", ++ queue->kctx->tgid, queue->kctx->id, queue->group->handle, ++ queue->group->csg_nr, queue->csi_index, ++ cs_fault_exception_type, ++ kbase_gpu_exception_name(cs_fault_exception_type), ++ cs_fault_exception_data, cs_fault_info_exception_data); ++ ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ /* CS_RESOURCE_TERMINATED type fault event can be ignored from the ++ * standpoint of dump on error. It is used to report fault for the CSIs ++ * that are associated with the same CSG as the CSI for which the actual ++ * fault was reported by the Iterator. ++ * Dumping would be triggered when the actual fault is reported. ++ * ++ * CS_INHERIT_FAULT can also be ignored. It could happen due to the error ++ * in other types of queues (cpu/kcpu). If a fault had occurred in some ++ * other GPU queue then the dump would have been performed anyways when ++ * that fault was reported. ++ */ ++ if ((cs_fault_exception_type != CS_FAULT_EXCEPTION_TYPE_CS_INHERIT_FAULT) && ++ (cs_fault_exception_type != CS_FAULT_EXCEPTION_TYPE_CS_RESOURCE_TERMINATED)) { ++ if (unlikely(kbase_debug_csf_fault_notify(kbdev, queue->kctx, DF_CS_FAULT))) { ++ get_queue(queue); ++ queue->cs_error = cs_fault; ++ queue->cs_error_info = cs_fault_info; ++ queue->cs_error_fatal = false; ++ if (!queue_work(queue->kctx->csf.wq, &queue->cs_error_work)) ++ release_queue(queue); ++ return; ++ } ++ } ++#endif ++ ++ kbase_csf_firmware_cs_input_mask(stream, CS_REQ, cs_ack, ++ CS_REQ_FAULT_MASK); ++ kbase_csf_ring_cs_kernel_doorbell(kbdev, queue->csi_index, queue->group->csg_nr, true); +} + -+/** -+ * report_queue_fatal_error - Report queue fatal error to user space -+ * -+ * @queue: Pointer to queue for which fatal event was received. -+ * @cs_fatal: Fault information -+ * @cs_fatal_info: Additional fault information -+ * -+ * If a queue has already been in fatal error status, -+ * subsequent fatal error on the queue should never take place. -+ */ +static void report_queue_fatal_error(struct kbase_queue *const queue, -+ u32 cs_fatal, u64 cs_fatal_info) ++ u32 cs_fatal, u64 cs_fatal_info, ++ u8 group_handle) +{ + struct base_csf_notification error = { + .type = BASE_CSF_NOTIFICATION_GPU_QUEUE_GROUP_ERROR, + .payload = { + .csg_error = { -+ .handle = queue->group->handle, ++ .handle = group_handle, + .error = { + .error_type = + BASE_GPU_QUEUE_GROUP_QUEUE_ERROR_FATAL, @@ -159163,16 +168315,82 @@ index 000000000000..83d7513e78d9 + } + }; + -+ lockdep_assert_held(&queue->kctx->csf.lock); ++ kbase_csf_event_add_error(queue->kctx, &queue->error, &error); ++ kbase_event_wakeup(queue->kctx); ++} + -+ /* If a queue has already been in fatal error status, -+ * subsequent fatal error on the queue should never take place. -+ */ -+ if (!WARN_ON(!list_empty(&queue->error.link))) { -+ queue->error.data = error; -+ list_add_tail(&queue->error.link, &queue->kctx->csf.error_list); -+ kbase_event_wakeup(queue->kctx); ++/** ++ * fatal_event_worker - Handle the CS_FATAL/CS_FAULT error for the GPU queue ++ * ++ * @data: Pointer to a work_struct embedded in GPU command queue. ++ * ++ * Terminate the CSG and report the error to userspace. ++ */ ++static void cs_error_worker(struct work_struct *const data) ++{ ++ struct kbase_queue *const queue = ++ container_of(data, struct kbase_queue, cs_error_work); ++ struct kbase_context *const kctx = queue->kctx; ++ struct kbase_device *const kbdev = kctx->kbdev; ++ struct kbase_queue_group *group; ++ u8 group_handle; ++ bool reset_prevented = false; ++ int err; ++ ++ kbase_debug_csf_fault_wait_completion(kbdev); ++ err = kbase_reset_gpu_prevent_and_wait(kbdev); ++ ++ if (err) ++ dev_warn( ++ kbdev->dev, ++ "Unsuccessful GPU reset detected when terminating group to handle fatal event, attempting to terminate regardless"); ++ else ++ reset_prevented = true; ++ ++ mutex_lock(&kctx->csf.lock); ++ ++ group = get_bound_queue_group(queue); ++ if (!group) { ++ dev_warn(kbdev->dev, "queue not bound when handling fatal event"); ++ goto unlock; ++ } ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ if (!queue->cs_error_fatal) { ++ unsigned long flags; ++ int slot_num; ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ slot_num = kbase_csf_scheduler_group_get_slot_locked(group); ++ if (slot_num >= 0) { ++ struct kbase_csf_cmd_stream_group_info const *ginfo = ++ &kbdev->csf.global_iface.groups[slot_num]; ++ struct kbase_csf_cmd_stream_info const *stream = ++ &ginfo->streams[queue->csi_index]; ++ u32 const cs_ack = ++ kbase_csf_firmware_cs_output(stream, CS_ACK); ++ ++ kbase_csf_firmware_cs_input_mask(stream, CS_REQ, cs_ack, ++ CS_REQ_FAULT_MASK); ++ kbase_csf_ring_cs_kernel_doorbell(kbdev, queue->csi_index, ++ slot_num, true); ++ } ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ goto unlock; + } ++#endif ++ ++ group_handle = group->handle; ++ term_queue_group(group); ++ flush_gpu_cache_on_fatal_error(kbdev); ++ report_queue_fatal_error(queue, queue->cs_error, queue->cs_error_info, ++ group_handle); ++ ++unlock: ++ release_queue(queue); ++ mutex_unlock(&kctx->csf.lock); ++ if (reset_prevented) ++ kbase_reset_gpu_allow(kbdev); +} + +/** @@ -159180,17 +168398,19 @@ index 000000000000..83d7513e78d9 + * + * @queue: Pointer to queue for which fatal event was received. + * @stream: Pointer to the structure containing info provided by the -+ * firmware about the command stream interface. -+ * @fw_error: Return true if internal firmware fatal is handled ++ * firmware about the CSI. ++ * @cs_ack: Value of the CS_ACK register in the CS kernel input page used for ++ * the queue. + * -+ * Prints meaningful CS fatal information. -+ * Report queue fatal error to user space. -+ * -+ * Return: 0 on success otherwise a negative system error. ++ * Notify a waiting user space client of the CS fatal and prints meaningful ++ * information. ++ * Enqueue a work item to terminate the group and report the fatal error ++ * to user space. + */ -+static int handle_fatal_event(struct kbase_queue *const queue, -+ struct kbase_csf_cmd_stream_info const *const stream, -+ bool *fw_error) ++static void ++handle_fatal_event(struct kbase_queue *const queue, ++ struct kbase_csf_cmd_stream_info const *const stream, ++ u32 cs_ack) +{ + const u32 cs_fatal = kbase_csf_firmware_cs_output(stream, CS_FATAL); + const u64 cs_fatal_info = @@ -159205,177 +168425,70 @@ index 000000000000..83d7513e78d9 + CS_FATAL_INFO_EXCEPTION_DATA_GET(cs_fatal_info); + struct kbase_device *const kbdev = queue->kctx->kbdev; + -+ lockdep_assert_held(&queue->kctx->csf.lock); ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); + + dev_warn(kbdev->dev, -+ "CSG: %d, CSI: %d\n" ++ "Ctx %d_%d Group %d CSG %d CSI: %d\n" + "CS_FATAL.EXCEPTION_TYPE: 0x%x (%s)\n" + "CS_FATAL.EXCEPTION_DATA: 0x%x\n" + "CS_FATAL_INFO.EXCEPTION_DATA: 0x%llx\n", -+ queue->group->handle, queue->csi_index, ++ queue->kctx->tgid, queue->kctx->id, queue->group->handle, ++ queue->group->csg_nr, queue->csi_index, + cs_fatal_exception_type, + kbase_gpu_exception_name(cs_fatal_exception_type), + cs_fatal_exception_data, cs_fatal_info_exception_data); + + if (cs_fatal_exception_type == -+ CS_FATAL_EXCEPTION_TYPE_FIRMWARE_INTERNAL_ERROR) -+ *fw_error = true; -+ else -+ report_queue_fatal_error(queue, cs_fatal, cs_fatal_info); -+ -+ return -EFAULT; -+} -+ -+/** -+ * handle_internal_firmware_fatal - Handler for CS internal firmware fault. -+ * -+ * @kbdev: Pointer to kbase device -+ * -+ * Report group fatal error to user space for all GPU command queue groups -+ * in the device, terminate them and reset GPU. -+ */ -+static void handle_internal_firmware_fatal(struct kbase_device *const kbdev) -+{ -+ int as; -+ -+ for (as = 0; as < kbdev->nr_hw_address_spaces; as++) { -+ struct kbase_context *kctx; -+ struct kbase_fault fault = { -+ .status = GPU_EXCEPTION_TYPE_SW_FAULT_1, -+ }; -+ -+ if (as == MCU_AS_NR) -+ continue; -+ -+ kctx = kbase_ctx_sched_as_to_ctx_refcount(kbdev, as); -+ if (!kctx) -+ continue; -+ -+ kbase_csf_ctx_handle_fault(kctx, &fault); -+ kbase_ctx_sched_release_ctx_lock(kctx); -+ } -+ -+ if (kbase_prepare_to_reset_gpu(kbdev)) -+ kbase_reset_gpu(kbdev); -+} -+ -+/** -+ * fault_event_worker - Worker function for CS fault/fatal. -+ * -+ * @data: Pointer to a work_struct embedded in GPU command queue data. -+ * -+ * Handle the fault and fatal exception for a GPU command queue and then -+ * releases a reference that was added to prevent the queue being destroyed -+ * while this work item was pending on a workqueue. -+ * -+ * Report the fault and fatal exception for a GPU command queue and then -+ * clears the corresponding notification fields to allow the firmware to -+ * report other faults in future. -+ * -+ * It may also terminate the GPU command queue group(s) and reset GPU -+ * in case internal firmware CS fatal exception occurred. -+ */ -+static void fault_event_worker(struct work_struct *const data) -+{ -+ struct kbase_queue *const queue = -+ container_of(data, struct kbase_queue, fault_event_work); -+ -+ struct kbase_context *const kctx = queue->kctx; -+ struct kbase_device *const kbdev = kctx->kbdev; -+ struct kbase_queue_group *group; -+ int slot_num; -+ struct kbase_csf_cmd_stream_group_info const *ginfo; -+ struct kbase_csf_cmd_stream_info const *stream; -+ u32 cs_ack, cs_req; -+ int err = 0; -+ bool internal_fw_error = false; -+ -+ mutex_lock(&kctx->csf.lock); -+ kbase_csf_scheduler_lock(kbdev); -+ -+ group = get_bound_queue_group(queue); -+ if (!group) { -+ dev_warn(kbdev->dev, "queue not bound\n"); -+ goto unlock; -+ } -+ -+ slot_num = kbase_csf_scheduler_group_get_slot(group); -+ -+ /* The group could have gone off slot before this work item got -+ * a chance to execute. -+ */ -+ if (slot_num < 0) { -+ dev_warn(kbdev->dev, "invalid slot_num\n"); -+ goto unlock; -+ } -+ -+ /* If the bound group is on slot yet the kctx is marked with disabled -+ * on address-space fault, the group is pending to be killed. So skip -+ * the inflight queue exception event operation. -+ */ -+ if (kbase_ctx_flag(kctx, KCTX_AS_DISABLED_ON_FAULT)) { -+ dev_warn(kbdev->dev, "kctx is already disabled on fault\n"); -+ goto unlock; -+ } -+ -+ ginfo = &kbdev->csf.global_iface.groups[slot_num]; -+ stream = &ginfo->streams[queue->csi_index]; -+ cs_ack = kbase_csf_firmware_cs_output(stream, CS_ACK); -+ cs_req = kbase_csf_firmware_cs_input_read(stream, CS_REQ); -+ -+ if ((cs_ack & CS_ACK_FATAL_MASK) != (cs_req & CS_REQ_FATAL_MASK)) { -+ err = handle_fatal_event(queue, stream, &internal_fw_error); -+ kbase_csf_firmware_cs_input_mask(stream, CS_REQ, cs_ack, -+ CS_REQ_FATAL_MASK); -+ } -+ -+ if ((cs_ack & CS_ACK_FAULT_MASK) != (cs_req & CS_REQ_FAULT_MASK)) { -+ err |= handle_fault_event(queue, stream); -+ kbase_csf_firmware_cs_input_mask(stream, CS_REQ, cs_ack, -+ CS_REQ_FAULT_MASK); -+ kbase_csf_ring_cs_kernel_doorbell(kbdev, queue); -+ } -+ -+ if (err) { -+ /* From 10.x.5, CS_REQ_ERROR_MODE is removed but TI2 bitfile -+ * upload not finished. Need to remove on GPUCORE-23972 -+ */ -+ kbase_csf_firmware_cs_input_mask(stream, CS_REQ, ~cs_ack, -+ CS_REQ_ERROR_MODE_MASK); -+ dev_dbg(kbdev->dev, "Slot-%d CSI-%d entering error mode\n", -+ slot_num, queue->csi_index); ++ CS_FATAL_EXCEPTION_TYPE_FIRMWARE_INTERNAL_ERROR) { ++ kbase_debug_csf_fault_notify(kbdev, queue->kctx, DF_FW_INTERNAL_ERROR); ++ queue_work(system_wq, &kbdev->csf.fw_error_work); ++ } else { ++ kbase_debug_csf_fault_notify(kbdev, queue->kctx, DF_CS_FATAL); ++ if (cs_fatal_exception_type == CS_FATAL_EXCEPTION_TYPE_CS_UNRECOVERABLE) { ++ queue->group->cs_unrecoverable = true; ++ if (kbase_prepare_to_reset_gpu(queue->kctx->kbdev, RESET_FLAGS_NONE)) ++ kbase_reset_gpu(queue->kctx->kbdev); ++ } ++ get_queue(queue); ++ queue->cs_error = cs_fatal; ++ queue->cs_error_info = cs_fatal_info; ++ queue->cs_error_fatal = true; ++ if (!queue_work(queue->kctx->csf.wq, &queue->cs_error_work)) ++ release_queue(queue); + } + -+unlock: -+ release_queue(queue); -+ kbase_csf_scheduler_unlock(kbdev); -+ mutex_unlock(&kctx->csf.lock); ++ kbase_csf_firmware_cs_input_mask(stream, CS_REQ, cs_ack, ++ CS_REQ_FATAL_MASK); + -+ if (internal_fw_error) -+ handle_internal_firmware_fatal(kbdev); +} + +/** -+ * process_cs_interrupts - Process interrupts for a command stream. ++ * process_cs_interrupts - Process interrupts for a CS. + * + * @group: Pointer to GPU command queue group data. -+ * @ginfo: The command stream group interface provided by the firmware. -+ * @irqreq: CSG's IRQ request bitmask (one bit per stream). -+ * @irqack: CSG's IRQ acknowledge bitmask (one bit per stream). ++ * @ginfo: The CSG interface provided by the firmware. ++ * @irqreq: CSG's IRQ request bitmask (one bit per CS). ++ * @irqack: CSG's IRQ acknowledge bitmask (one bit per CS). ++ * @track: Pointer that tracks the highest scanout priority idle CSG ++ * and any newly potentially viable protected mode requesting ++ * CSG in current IRQ context. + * + * If the interrupt request bitmask differs from the acknowledge bitmask + * then the firmware is notifying the host of an event concerning those -+ * streams indicated by bits whose value differs. The actions required ++ * CSs indicated by bits whose value differs. The actions required + * are then determined by examining which notification flags differ between -+ * the request and acknowledge registers for the individual stream(s). ++ * the request and acknowledge registers for the individual CS(s). + */ +static void process_cs_interrupts(struct kbase_queue_group *const group, -+ struct kbase_csf_cmd_stream_group_info const *const ginfo, -+ u32 const irqreq, u32 const irqack) ++ struct kbase_csf_cmd_stream_group_info const *const ginfo, ++ u32 const irqreq, u32 const irqack, ++ struct irq_idle_and_protm_track *track) +{ + struct kbase_device *const kbdev = group->kctx->kbdev; + u32 remaining = irqreq ^ irqack; + bool protm_pend = false; ++ const bool group_suspending = ++ !kbase_csf_scheduler_group_events_enabled(kbdev, group); + + kbase_csf_scheduler_spin_lock_assert_held(kbdev); + @@ -159383,6 +168496,8 @@ index 000000000000..83d7513e78d9 + int const i = ffs(remaining) - 1; + struct kbase_queue *const queue = group->bound_queues[i]; + ++ remaining &= ~(1 << i); ++ + /* The queue pointer can be NULL, but if it isn't NULL then it + * cannot disappear since scheduler spinlock is held and before + * freeing a bound queue it has to be first unbound which @@ -159397,56 +168512,103 @@ index 000000000000..83d7513e78d9 + kbase_csf_firmware_cs_output(stream, CS_ACK); + struct workqueue_struct *wq = group->kctx->csf.wq; + -+ if ((cs_req & CS_REQ_EXCEPTION_MASK) ^ -+ (cs_ack & CS_ACK_EXCEPTION_MASK)) { -+ get_queue(queue); -+ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, CSI_FAULT_INTERRUPT, group, queue, cs_req ^ cs_ack); -+ if (!queue_work(wq, &queue->fault_event_work)) -+ release_queue(queue); ++ if ((cs_ack & CS_ACK_FATAL_MASK) != (cs_req & CS_REQ_FATAL_MASK)) { ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, CSI_INTERRUPT_FAULT, ++ group, queue, cs_req ^ cs_ack); ++ handle_fatal_event(queue, stream, cs_ack); ++ } ++ ++ if ((cs_ack & CS_ACK_FAULT_MASK) != (cs_req & CS_REQ_FAULT_MASK)) { ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, CSI_INTERRUPT_FAULT, ++ group, queue, cs_req ^ cs_ack); ++ handle_fault_event(queue, cs_ack); ++ } ++ ++ /* PROTM_PEND and TILER_OOM can be safely ignored ++ * because they will be raised again if the group ++ * is assigned a CSG slot in future. ++ */ ++ if (group_suspending) { ++ u32 const cs_req_remain = cs_req & ~CS_REQ_EXCEPTION_MASK; ++ u32 const cs_ack_remain = cs_ack & ~CS_ACK_EXCEPTION_MASK; ++ ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, ++ CSI_INTERRUPT_GROUP_SUSPENDS_IGNORED, ++ group, queue, ++ cs_req_remain ^ cs_ack_remain); ++ continue; + } + + if (((cs_req & CS_REQ_TILER_OOM_MASK) ^ + (cs_ack & CS_ACK_TILER_OOM_MASK))) { + get_queue(queue); -+ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, CSI_TILER_OOM_INTERRUPT, group, queue, cs_req ^ cs_ack); -+ if (WARN_ON(!queue_work( -+ wq, &queue->oom_event_work))) { ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, CSI_INTERRUPT_TILER_OOM, ++ group, queue, cs_req ^ cs_ack); ++ if (!queue_work(wq, &queue->oom_event_work)) { + /* The work item shall not have been + * already queued, there can be only + * one pending OoM event for a + * queue. + */ ++ dev_warn( ++ kbdev->dev, ++ "Tiler OOM work pending: queue %d group %d (ctx %d_%d)", ++ queue->csi_index, group->handle, queue->kctx->tgid, ++ queue->kctx->id); + release_queue(queue); + } + } + + if ((cs_req & CS_REQ_PROTM_PEND_MASK) ^ + (cs_ack & CS_ACK_PROTM_PEND_MASK)) { ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, CSI_INTERRUPT_PROTM_PEND, ++ group, queue, cs_req ^ cs_ack); ++ + dev_dbg(kbdev->dev, + "Protected mode entry request for queue on csi %d bound to group-%d on slot %d", + queue->csi_index, group->handle, + group->csg_nr); + + bitmap_set(group->protm_pending_bitmap, i, 1); ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, CSI_PROTM_PEND_SET, group, queue, ++ group->protm_pending_bitmap[0]); + protm_pend = true; + } + } -+ -+ remaining &= ~(1 << i); + } + -+ if (protm_pend) -+ queue_work(group->kctx->csf.wq, &group->protm_event_work); ++ if (protm_pend) { ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ ++ if (scheduler->tick_protm_pending_seq > group->scan_seq_num) { ++ scheduler->tick_protm_pending_seq = group->scan_seq_num; ++ track->protm_grp = group; ++ } ++ ++ if (!group->protected_suspend_buf.pma) ++ queue_work(group->kctx->csf.wq, &group->protm_event_work); ++ ++ if (test_bit(group->csg_nr, scheduler->csg_slots_idle_mask)) { ++ clear_bit(group->csg_nr, ++ scheduler->csg_slots_idle_mask); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_SLOT_IDLE_CLEAR, group, ++ scheduler->csg_slots_idle_mask[0]); ++ dev_dbg(kbdev->dev, ++ "Group-%d on slot %d de-idled by protm request", ++ group->handle, group->csg_nr); ++ } ++ } +} + +/** -+ * process_csg_interrupts - Process interrupts for a command stream group. ++ * process_csg_interrupts - Process interrupts for a CSG. + * -+ * @kbdev: Instance of a GPU platform device that implements a command stream -+ * front-end interface. -+ * @csg_nr: Command stream group number. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @csg_nr: CSG number. ++ * @track: Pointer that tracks the highest idle CSG and the newly possible viable ++ * protected mode requesting group, in current IRQ context. + * -+ * Handles interrupts for a command stream group and for streams within it. ++ * Handles interrupts for a CSG and for CSs within it. + * + * If the CSG's request register value differs from its acknowledge register + * then the firmware is notifying the host of an event concerning the whole @@ -159455,11 +168617,11 @@ index 000000000000..83d7513e78d9 + * + * See process_cs_interrupts() for details of per-stream interrupt handling. + */ -+static void process_csg_interrupts(struct kbase_device *const kbdev, -+ int const csg_nr) ++static void process_csg_interrupts(struct kbase_device *const kbdev, int const csg_nr, ++ struct irq_idle_and_protm_track *track) +{ + struct kbase_csf_cmd_stream_group_info *ginfo; -+ struct kbase_queue_group *group; ++ struct kbase_queue_group *group = NULL; + u32 req, ack, irqreq, irqack; + + kbase_csf_scheduler_spin_lock_assert_held(kbdev); @@ -159501,104 +168663,418 @@ index 000000000000..83d7513e78d9 + if (WARN_ON(kbase_csf_scheduler_group_get_slot_locked(group) != csg_nr)) + return; + -+ if ((req ^ ack) & CSG_REQ_SYNC_UPDATE) { ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_INTERRUPT_PROCESS_START, group, csg_nr); ++ ++ if ((req ^ ack) & CSG_REQ_SYNC_UPDATE_MASK) { + kbase_csf_firmware_csg_input_mask(ginfo, -+ CSG_REQ, ack, CSG_REQ_SYNC_UPDATE); ++ CSG_REQ, ack, CSG_REQ_SYNC_UPDATE_MASK); ++ ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_INTERRUPT_SYNC_UPDATE, group, req ^ ack); ++ ++ /* SYNC_UPDATE events shall invalidate GPU idle event */ ++ atomic_set(&kbdev->csf.scheduler.gpu_no_longer_idle, true); + -+ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_SYNC_UPDATE_INTERRUPT, group, req ^ ack); + kbase_csf_event_signal_cpu_only(group->kctx); + } + -+ /* IDLE and TILER_OOM can be safely ignored because they will be -+ * raised again if the group is assigned a CSG slot in future. -+ * TILER_OOM and PROGRESS_TIMER_EVENT may terminate the group. -+ */ -+ if (!kbase_csf_scheduler_group_events_enabled(kbdev, group)) -+ return; -+ + if ((req ^ ack) & CSG_REQ_IDLE_MASK) { ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ ++ KBASE_TLSTREAM_TL_KBASE_DEVICE_CSG_IDLE( ++ kbdev, kbdev->gpu_props.props.raw_props.gpu_id, csg_nr); ++ + kbase_csf_firmware_csg_input_mask(ginfo, CSG_REQ, ack, + CSG_REQ_IDLE_MASK); + -+ set_bit(csg_nr, kbdev->csf.scheduler.csg_slots_idle_mask); -+ -+ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_IDLE_INTERRUPT, group, req ^ ack); ++ set_bit(csg_nr, scheduler->csg_slots_idle_mask); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_SLOT_IDLE_SET, group, ++ scheduler->csg_slots_idle_mask[0]); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_INTERRUPT_IDLE, group, req ^ ack); + dev_dbg(kbdev->dev, "Idle notification received for Group %u on slot %d\n", + group->handle, csg_nr); ++ ++ if (atomic_read(&scheduler->non_idle_offslot_grps)) { ++ /* If there are non-idle CSGs waiting for a slot, fire ++ * a tock for a replacement. ++ */ ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_INTERRUPT_NON_IDLE_GROUPS, ++ group, req ^ ack); ++ kbase_csf_scheduler_invoke_tock(kbdev); ++ } else { ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_INTERRUPT_NO_NON_IDLE_GROUPS, ++ group, req ^ ack); ++ } ++ ++ if (group->scan_seq_num < track->idle_seq) { ++ track->idle_seq = group->scan_seq_num; ++ track->idle_slot = csg_nr; ++ } + } + + if ((req ^ ack) & CSG_REQ_PROGRESS_TIMER_EVENT_MASK) { + kbase_csf_firmware_csg_input_mask(ginfo, CSG_REQ, ack, -+ CSG_REQ_PROGRESS_TIMER_EVENT_MASK); ++ CSG_REQ_PROGRESS_TIMER_EVENT_MASK); + -+ dev_dbg(kbdev->dev, "Timeout notification received for Group %u on slot %d\n", -+ group->handle, csg_nr); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_INTERRUPT_PROGRESS_TIMER_EVENT, group, ++ req ^ ack); ++ dev_info( ++ kbdev->dev, ++ "[%llu] Iterator PROGRESS_TIMER timeout notification received for group %u of ctx %d_%d on slot %d\n", ++ kbase_backend_get_cycle_cnt(kbdev), group->handle, group->kctx->tgid, ++ group->kctx->id, csg_nr); + -+ queue_work(group->kctx->csf.wq, &group->timer_event_work); ++ handle_progress_timer_event(group); + } + -+ process_cs_interrupts(group, ginfo, irqreq, irqack); ++ process_cs_interrupts(group, ginfo, irqreq, irqack, track); ++ ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_INTERRUPT_PROCESS_END, group, ++ ((u64)req ^ ack) | (((u64)irqreq ^ irqack) << 32)); +} + -+void kbase_csf_interrupt(struct kbase_device *kbdev, u32 val) ++/** ++ * process_prfcnt_interrupts - Process performance counter interrupts. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @glb_req: Global request register value. ++ * @glb_ack: Global acknowledge register value. ++ * ++ * Handles interrupts issued by the firmware that relate to the performance ++ * counters. For example, on completion of a performance counter sample. It is ++ * expected that the scheduler spinlock is already held on calling this ++ * function. ++ */ ++static void process_prfcnt_interrupts(struct kbase_device *kbdev, u32 glb_req, ++ u32 glb_ack) +{ -+ unsigned long flags; -+ u32 remaining = val; ++ const struct kbase_csf_global_iface *const global_iface = ++ &kbdev->csf.global_iface; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.interrupt_lock); ++ ++ /* Process PRFCNT_SAMPLE interrupt. */ ++ if (kbdev->csf.hwcnt.request_pending && ++ ((glb_req & GLB_REQ_PRFCNT_SAMPLE_MASK) == ++ (glb_ack & GLB_REQ_PRFCNT_SAMPLE_MASK))) { ++ kbdev->csf.hwcnt.request_pending = false; ++ ++ dev_dbg(kbdev->dev, "PRFCNT_SAMPLE done interrupt received."); ++ ++ kbase_hwcnt_backend_csf_on_prfcnt_sample( ++ &kbdev->hwcnt_gpu_iface); ++ } ++ ++ /* Process PRFCNT_ENABLE interrupt. */ ++ if (kbdev->csf.hwcnt.enable_pending && ++ ((glb_req & GLB_REQ_PRFCNT_ENABLE_MASK) == ++ (glb_ack & GLB_REQ_PRFCNT_ENABLE_MASK))) { ++ kbdev->csf.hwcnt.enable_pending = false; ++ ++ dev_dbg(kbdev->dev, ++ "PRFCNT_ENABLE status changed interrupt received."); ++ ++ if (glb_ack & GLB_REQ_PRFCNT_ENABLE_MASK) ++ kbase_hwcnt_backend_csf_on_prfcnt_enable( ++ &kbdev->hwcnt_gpu_iface); ++ else ++ kbase_hwcnt_backend_csf_on_prfcnt_disable( ++ &kbdev->hwcnt_gpu_iface); ++ } ++ ++ /* Process PRFCNT_THRESHOLD interrupt. */ ++ if ((glb_req ^ glb_ack) & GLB_REQ_PRFCNT_THRESHOLD_MASK) { ++ dev_dbg(kbdev->dev, "PRFCNT_THRESHOLD interrupt received."); ++ ++ kbase_hwcnt_backend_csf_on_prfcnt_threshold( ++ &kbdev->hwcnt_gpu_iface); ++ ++ /* Set the GLB_REQ.PRFCNT_THRESHOLD flag back to ++ * the same value as GLB_ACK.PRFCNT_THRESHOLD ++ * flag in order to enable reporting of another ++ * PRFCNT_THRESHOLD event. ++ */ ++ kbase_csf_firmware_global_input_mask( ++ global_iface, GLB_REQ, glb_ack, ++ GLB_REQ_PRFCNT_THRESHOLD_MASK); ++ } ++ ++ /* Process PRFCNT_OVERFLOW interrupt. */ ++ if ((glb_req ^ glb_ack) & GLB_REQ_PRFCNT_OVERFLOW_MASK) { ++ dev_dbg(kbdev->dev, "PRFCNT_OVERFLOW interrupt received."); ++ ++ kbase_hwcnt_backend_csf_on_prfcnt_overflow( ++ &kbdev->hwcnt_gpu_iface); ++ ++ /* Set the GLB_REQ.PRFCNT_OVERFLOW flag back to ++ * the same value as GLB_ACK.PRFCNT_OVERFLOW ++ * flag in order to enable reporting of another ++ * PRFCNT_OVERFLOW event. ++ */ ++ kbase_csf_firmware_global_input_mask( ++ global_iface, GLB_REQ, glb_ack, ++ GLB_REQ_PRFCNT_OVERFLOW_MASK); ++ } ++} + ++/** ++ * check_protm_enter_req_complete - Check if PROTM_ENTER request completed ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @glb_req: Global request register value. ++ * @glb_ack: Global acknowledge register value. ++ * ++ * This function checks if the PROTM_ENTER Global request had completed and ++ * appropriately sends notification about the protected mode entry to components ++ * like IPA, HWC, IPA_CONTROL. ++ */ ++static inline void check_protm_enter_req_complete(struct kbase_device *kbdev, ++ u32 glb_req, u32 glb_ack) ++{ + lockdep_assert_held(&kbdev->hwaccess_lock); ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); + -+ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_CLEAR), val); ++ if (likely(!kbdev->csf.scheduler.active_protm_grp)) ++ return; + -+ if (val & JOB_IRQ_GLOBAL_IF) { -+ const struct kbase_csf_global_iface *const global_iface = -+ &kbdev->csf.global_iface; -+ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ if (kbdev->protected_mode) ++ return; + -+ kbdev->csf.interrupt_received = true; -+ remaining &= ~JOB_IRQ_GLOBAL_IF; ++ if ((glb_req & GLB_REQ_PROTM_ENTER_MASK) != ++ (glb_ack & GLB_REQ_PROTM_ENTER_MASK)) ++ return; + -+ if (!kbdev->csf.firmware_reloaded) -+ kbase_csf_firmware_reload_completed(kbdev); -+ else if (kbdev->csf.glb_init_request_pending) -+ kbase_pm_update_state(kbdev); ++ dev_dbg(kbdev->dev, "Protected mode entry interrupt received"); ++ ++ kbdev->protected_mode = true; ++ kbase_ipa_protection_mode_switch_event(kbdev); ++ kbase_ipa_control_protm_entered(kbdev); ++ kbase_hwcnt_backend_csf_protm_entered(&kbdev->hwcnt_gpu_iface); ++} ++ ++/** ++ * process_protm_exit - Handle the protected mode exit interrupt ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @glb_ack: Global acknowledge register value. ++ * ++ * This function handles the PROTM_EXIT interrupt and sends notification ++ * about the protected mode exit to components like HWC, IPA_CONTROL. ++ */ ++static inline void process_protm_exit(struct kbase_device *kbdev, u32 glb_ack) ++{ ++ const struct kbase_csf_global_iface *const global_iface = ++ &kbdev->csf.global_iface; ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ ++ dev_dbg(kbdev->dev, "Protected mode exit interrupt received"); ++ ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_REQ, glb_ack, ++ GLB_REQ_PROTM_EXIT_MASK); ++ ++ if (likely(scheduler->active_protm_grp)) { ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_PROTM_EXIT, ++ scheduler->active_protm_grp, 0u); ++ scheduler->active_protm_grp = NULL; ++ } else { ++ dev_warn(kbdev->dev, "PROTM_EXIT interrupt after no pmode group"); ++ } ++ ++ if (!WARN_ON(!kbdev->protected_mode)) { ++ kbdev->protected_mode = false; ++ kbase_ipa_control_protm_exited(kbdev); ++ kbase_hwcnt_backend_csf_protm_exited(&kbdev->hwcnt_gpu_iface); ++ } ++ ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++ kbase_debug_coresight_csf_enable_pmode_exit(kbdev); ++#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ ++} ++ ++static inline void process_tracked_info_for_protm(struct kbase_device *kbdev, ++ struct irq_idle_and_protm_track *track) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ struct kbase_queue_group *group = track->protm_grp; ++ u32 current_protm_pending_seq = scheduler->tick_protm_pending_seq; ++ ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ ++ if (likely(current_protm_pending_seq == KBASEP_TICK_PROTM_PEND_SCAN_SEQ_NR_INVALID)) ++ return; ++ ++ /* Handle protm from the tracked information */ ++ if (track->idle_seq < current_protm_pending_seq) { ++ /* If the protm enter was prevented due to groups priority, then fire a tock ++ * for the scheduler to re-examine the case. ++ */ ++ dev_dbg(kbdev->dev, "Attempt pending protm from idle slot %d\n", track->idle_slot); ++ kbase_csf_scheduler_invoke_tock(kbdev); ++ } else if (group) { ++ u32 i, num_groups = kbdev->csf.global_iface.group_num; ++ struct kbase_queue_group *grp; ++ bool tock_triggered = false; ++ ++ /* A new protm request, and track->idle_seq is not sufficient, check across ++ * previously notified idle CSGs in the current tick/tock cycle. ++ */ ++ for_each_set_bit(i, scheduler->csg_slots_idle_mask, num_groups) { ++ if (i == track->idle_slot) ++ continue; ++ grp = kbase_csf_scheduler_get_group_on_slot(kbdev, i); ++ /* If not NULL then the group pointer cannot disappear as the ++ * scheduler spinlock is held. ++ */ ++ if (grp == NULL) ++ continue; + -+ if (global_iface->output) { -+ u32 glb_req, glb_ack; ++ if (grp->scan_seq_num < current_protm_pending_seq) { ++ tock_triggered = true; ++ dev_dbg(kbdev->dev, ++ "Attempt new protm from tick/tock idle slot %d\n", i); ++ kbase_csf_scheduler_invoke_tock(kbdev); ++ break; ++ } ++ } ++ ++ if (!tock_triggered) { ++ dev_dbg(kbdev->dev, "Group-%d on slot-%d start protm work\n", ++ group->handle, group->csg_nr); ++ queue_work(group->kctx->csf.wq, &group->protm_event_work); ++ } ++ } ++} ++ ++static void order_job_irq_clear_with_iface_mem_read(void) ++{ ++ /* Ensure that write to the JOB_IRQ_CLEAR is ordered with regards to the ++ * read from interface memory. The ordering is needed considering the way ++ * FW & Kbase writes to the JOB_IRQ_RAWSTAT and JOB_IRQ_CLEAR registers ++ * without any synchronization. Without the barrier there is no guarantee ++ * about the ordering, the write to IRQ_CLEAR can take effect after the read ++ * from interface memory and that could cause a problem for the scenario where ++ * FW sends back to back notifications for the same CSG for events like ++ * SYNC_UPDATE and IDLE, but Kbase gets a single IRQ and observes only the ++ * first event. Similar thing can happen with glb events like CFG_ALLOC_EN ++ * acknowledgment and GPU idle notification. ++ * ++ * MCU CPU ++ * --------------- ---------------- ++ * Update interface memory Write to IRQ_CLEAR to clear current IRQ ++ * ++ * Write to IRQ_RAWSTAT to raise new IRQ Read interface memory ++ */ ++ ++ /* CPU and GPU would be in the same Outer shareable domain */ ++ dmb(osh); ++} ++ ++void kbase_csf_interrupt(struct kbase_device *kbdev, u32 val) ++{ ++ bool deferred_handling_glb_idle_irq = false; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ KBASE_KTRACE_ADD(kbdev, CSF_INTERRUPT_START, NULL, val); ++ ++ do { ++ unsigned long flags; ++ u32 csg_interrupts = val & ~JOB_IRQ_GLOBAL_IF; ++ struct irq_idle_and_protm_track track = { .protm_grp = NULL, .idle_seq = U32_MAX }; ++ bool glb_idle_irq_received = false; + ++ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_CLEAR), val); ++ order_job_irq_clear_with_iface_mem_read(); ++ ++ if (csg_interrupts != 0) { + kbase_csf_scheduler_spin_lock(kbdev, &flags); -+ glb_req = kbase_csf_firmware_global_input_read( -+ global_iface, GLB_REQ); -+ glb_ack = kbase_csf_firmware_global_output( -+ global_iface, GLB_ACK); ++ /* Looping through and track the highest idle and protm groups */ ++ while (csg_interrupts != 0) { ++ int const csg_nr = ffs(csg_interrupts) - 1; + -+ if ((glb_req ^ glb_ack) & GLB_REQ_PROTM_EXIT_MASK) { -+ dev_dbg(kbdev->dev, "Protected mode exit interrupt received"); -+ kbase_csf_firmware_global_input_mask( -+ global_iface, GLB_REQ, glb_ack, -+ GLB_REQ_PROTM_EXIT_MASK); -+ WARN_ON(!kbase_csf_scheduler_protected_mode_in_use(kbdev)); -+ scheduler->active_protm_grp = NULL; -+ KBASE_KTRACE_ADD(kbdev, SCHEDULER_EXIT_PROTM, NULL, 0u); ++ process_csg_interrupts(kbdev, csg_nr, &track); ++ csg_interrupts &= ~(1 << csg_nr); + } ++ ++ /* Handle protm from the tracked information */ ++ process_tracked_info_for_protm(kbdev, &track); + kbase_csf_scheduler_spin_unlock(kbdev, flags); + } + -+ if (!remaining) { -+ wake_up_all(&kbdev->csf.event_wait); -+ return; ++ if (val & JOB_IRQ_GLOBAL_IF) { ++ const struct kbase_csf_global_iface *const global_iface = ++ &kbdev->csf.global_iface; ++ ++ kbdev->csf.interrupt_received = true; ++ ++ if (!kbdev->csf.firmware_reloaded) ++ kbase_csf_firmware_reload_completed(kbdev); ++ else if (global_iface->output) { ++ u32 glb_req, glb_ack; ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ glb_req = ++ kbase_csf_firmware_global_input_read(global_iface, GLB_REQ); ++ glb_ack = kbase_csf_firmware_global_output(global_iface, GLB_ACK); ++ KBASE_KTRACE_ADD(kbdev, CSF_INTERRUPT_GLB_REQ_ACK, NULL, ++ glb_req ^ glb_ack); ++ ++ check_protm_enter_req_complete(kbdev, glb_req, glb_ack); ++ ++ if ((glb_req ^ glb_ack) & GLB_REQ_PROTM_EXIT_MASK) ++ process_protm_exit(kbdev, glb_ack); ++ ++ /* Handle IDLE Hysteresis notification event */ ++ if ((glb_req ^ glb_ack) & GLB_REQ_IDLE_EVENT_MASK) { ++ dev_dbg(kbdev->dev, "Idle-hysteresis event flagged"); ++ kbase_csf_firmware_global_input_mask( ++ global_iface, GLB_REQ, glb_ack, ++ GLB_REQ_IDLE_EVENT_MASK); ++ ++ glb_idle_irq_received = true; ++ /* Defer handling this IRQ to account for a race condition ++ * where the idle worker could be executed before we have ++ * finished handling all pending IRQs (including CSG IDLE ++ * IRQs). ++ */ ++ deferred_handling_glb_idle_irq = true; ++ } ++ ++ process_prfcnt_interrupts(kbdev, glb_req, glb_ack); ++ ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ ++ /* Invoke the MCU state machine as a state transition ++ * might have completed. ++ */ ++ kbase_pm_update_state(kbdev); ++ } + } -+ } + -+ kbase_csf_scheduler_spin_lock(kbdev, &flags); -+ while (remaining != 0) { -+ int const csg_nr = ffs(remaining) - 1; ++ if (!glb_idle_irq_received) ++ break; ++ /* Attempt to serve potential IRQs that might have occurred ++ * whilst handling the previous IRQ. In case we have observed ++ * the GLB IDLE IRQ without all CSGs having been marked as ++ * idle, the GPU would be treated as no longer idle and left ++ * powered on. ++ */ ++ val = kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_STATUS)); ++ } while (val); ++ ++ if (deferred_handling_glb_idle_irq) { ++ unsigned long flags; + -+ process_csg_interrupts(kbdev, csg_nr); -+ remaining &= ~(1 << csg_nr); ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ kbase_csf_scheduler_process_gpu_idle_event(kbdev); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); + } -+ kbase_csf_scheduler_spin_unlock(kbdev, flags); + + wake_up_all(&kbdev->csf.event_wait); ++ ++ KBASE_KTRACE_ADD(kbdev, CSF_INTERRUPT_END, NULL, val); +} + +void kbase_csf_doorbell_mapping_term(struct kbase_device *kbdev) @@ -159620,13 +169096,12 @@ index 000000000000..83d7513e78d9 + struct file *filp; + int ret; + -+ filp = shmem_file_setup("mali csf", MAX_LFS_FILESIZE, VM_NORESERVE); ++ filp = shmem_file_setup("mali csf db", MAX_LFS_FILESIZE, VM_NORESERVE); + if (IS_ERR(filp)) + return PTR_ERR(filp); + -+ ret = kbase_mem_pool_alloc_pages( -+ &kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], -+ 1, &phys, false); ++ ret = kbase_mem_pool_alloc_pages(&kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], 1, &phys, ++ false, NULL); + + if (ret <= 0) { + fput(filp); @@ -159639,20 +169114,84 @@ index 000000000000..83d7513e78d9 + + return 0; +} ++ ++void kbase_csf_free_dummy_user_reg_page(struct kbase_device *kbdev) ++{ ++ if (kbdev->csf.user_reg.filp) { ++ struct page *page = as_page(kbdev->csf.user_reg.dummy_page); ++ ++ kbase_mem_pool_free(&kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], page, false); ++ fput(kbdev->csf.user_reg.filp); ++ } ++} ++ ++int kbase_csf_setup_dummy_user_reg_page(struct kbase_device *kbdev) ++{ ++ struct tagged_addr phys; ++ struct file *filp; ++ struct page *page; ++ u32 *addr; ++ ++ kbdev->csf.user_reg.filp = NULL; ++ ++ filp = shmem_file_setup("mali csf user_reg", MAX_LFS_FILESIZE, VM_NORESERVE); ++ if (IS_ERR(filp)) { ++ dev_err(kbdev->dev, "failed to get an unlinked file for user_reg"); ++ return PTR_ERR(filp); ++ } ++ ++ if (kbase_mem_pool_alloc_pages(&kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], 1, &phys, ++ false, NULL) <= 0) { ++ fput(filp); ++ return -ENOMEM; ++ } ++ ++ page = as_page(phys); ++ addr = kmap_atomic(page); ++ ++ /* Write a special value for the latest flush register inside the ++ * dummy page ++ */ ++ addr[LATEST_FLUSH / sizeof(u32)] = POWER_DOWN_LATEST_FLUSH_VALUE; ++ ++ kbase_sync_single_for_device(kbdev, kbase_dma_addr(page) + LATEST_FLUSH, sizeof(u32), ++ DMA_BIDIRECTIONAL); ++ kunmap_atomic(addr); ++ ++ kbdev->csf.user_reg.filp = filp; ++ kbdev->csf.user_reg.dummy_page = phys; ++ kbdev->csf.user_reg.file_offset = 0; ++ return 0; ++} ++ ++u8 kbase_csf_priority_check(struct kbase_device *kbdev, u8 req_priority) ++{ ++ struct priority_control_manager_device *pcm_device = kbdev->pcm_dev; ++ u8 out_priority = req_priority; ++ ++ if (pcm_device) { ++ req_priority = kbase_csf_priority_queue_group_priority_to_relative(req_priority); ++ out_priority = pcm_device->ops.pcm_scheduler_priority_check(pcm_device, current, req_priority); ++ out_priority = kbase_csf_priority_relative_to_queue_group_priority(out_priority); ++ } ++ ++ return out_priority; ++} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h new file mode 100755 -index 000000000000..c183d0a32302 +index 000000000..dd947dcba --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h -@@ -0,0 +1,444 @@ +@@ -0,0 +1,506 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -159663,8 +169202,6 @@ index 000000000000..c183d0a32302 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CSF_H_ @@ -159674,12 +169211,13 @@ index 000000000000..c183d0a32302 +#include "mali_kbase_csf_scheduler.h" +#include "mali_kbase_csf_firmware.h" +#include "mali_kbase_csf_protected_memory.h" ++#include "mali_kbase_hwaccess_time.h" + -+/* Indicate invalid command stream h/w interface ++/* Indicate invalid CS h/w interface + */ +#define KBASEP_IF_NR_INVALID ((s8)-1) + -+/* Indicate invalid command stream group number for a GPU command queue group ++/* Indicate invalid CSG number for a GPU command queue group + */ +#define KBASEP_CSG_NR_INVALID ((s8)-1) + @@ -159687,139 +169225,21 @@ index 000000000000..c183d0a32302 + */ +#define KBASEP_USER_DB_NR_INVALID ((s8)-1) + -+/* Waiting timeout for global request completion acknowledgment */ -+#define GLB_REQ_WAIT_TIMEOUT_MS (300) /* 300 milliseconds */ -+ -+#define CSG_REQ_EP_CFG (0x1 << CSG_REQ_EP_CFG_SHIFT) -+#define CSG_REQ_SYNC_UPDATE (0x1 << CSG_REQ_SYNC_UPDATE_SHIFT) -+#define FIRMWARE_PING_INTERVAL_MS (2000) /* 2 seconds */ -+ -+/** -+ * enum kbase_csf_event_callback_action - return type for CSF event callbacks. -+ * -+ * @KBASE_CSF_EVENT_CALLBACK_FIRST: Never set explicitly. -+ * It doesn't correspond to any action or type of event callback. -+ * -+ * @KBASE_CSF_EVENT_CALLBACK_KEEP: The callback will remain registered. -+ * -+ * @KBASE_CSF_EVENT_CALLBACK_REMOVE: The callback will be removed -+ * immediately upon return. -+ * -+ * @KBASE_CSF_EVENT_CALLBACK_LAST: Never set explicitly. -+ * It doesn't correspond to any action or type of event callback. -+ */ -+enum kbase_csf_event_callback_action { -+ KBASE_CSF_EVENT_CALLBACK_FIRST = 0, -+ KBASE_CSF_EVENT_CALLBACK_KEEP, -+ KBASE_CSF_EVENT_CALLBACK_REMOVE, -+ KBASE_CSF_EVENT_CALLBACK_LAST, -+}; -+ -+/** -+ * kbase_csf_event_callback_action - type for callback functions to be -+ * called upon CSF events. -+ * -+ * This is the type of callback functions that can be registered -+ * for CSF events. These function calls shall be triggered by any call -+ * to kbase_csf_event_signal. -+ * -+ * @param: Generic parameter to pass to the callback function. -+ * -+ * Return: KBASE_CSF_EVENT_CALLBACK_KEEP if the callback should remain -+ * registered, or KBASE_CSF_EVENT_CALLBACK_REMOVE if it should be removed. -+ */ -+typedef enum kbase_csf_event_callback_action kbase_csf_event_callback(void *param); -+ -+/** -+ * kbase_csf_event_wait_add - Add a CSF event callback -+ * -+ * This function adds an event callback to the list of CSF event callbacks -+ * belonging to a given Kbase context, to be triggered when a CSF event is -+ * signalled by kbase_csf_event_signal. -+ * -+ * @kctx: The Kbase context the @callback should be registered to. -+ * @callback: The callback function to register. -+ * @param: Custom parameter to be passed to the @callback function. -+ * -+ * Return: 0 on success, or negative on failure. -+ */ -+int kbase_csf_event_wait_add(struct kbase_context *kctx, -+ kbase_csf_event_callback *callback, void *param); -+ -+/** -+ * kbase_csf_event_wait_remove - Remove a CSF event callback -+ * -+ * This function removes an event callback from the list of CSF event callbacks -+ * belonging to a given Kbase context. -+ * -+ * @kctx: The kbase context the @callback should be removed from. -+ * @callback: The callback function to remove. -+ * @param: Custom parameter that would have been passed to the @p callback -+ * function. -+ */ -+void kbase_csf_event_wait_remove(struct kbase_context *kctx, -+ kbase_csf_event_callback *callback, void *param); -+ -+/** -+ * kbase_csf_event_wait_remove_all - Removes all CSF event callbacks -+ * -+ * This function empties the list of CSF event callbacks belonging to a given -+ * Kbase context. -+ * -+ * @kctx: The kbase context for which CSF event callbacks have to be removed. -+ */ -+void kbase_csf_event_wait_remove_all(struct kbase_context *kctx); -+ -+/** -+ * kbase_csf_read_error - Read command stream fatal error -+ * -+ * This function takes the command stream fatal error from context's ordered -+ * error_list, copies its contents to @event_data. -+ * -+ * @kctx: The kbase context to read fatal error from -+ * @event_data: Caller-provided buffer to copy the fatal error to -+ * -+ * Return: true if fatal error is read successfully. -+ */ -+bool kbase_csf_read_error(struct kbase_context *kctx, -+ struct base_csf_notification *event_data); -+ -+/** -+ * kbase_csf_error_pending - Check whether fatal error is pending -+ * -+ * @kctx: The kbase context to check fatal error upon. -+ * -+ * Return: true if fatal error is pending. -+ */ -+bool kbase_csf_error_pending(struct kbase_context *kctx); ++/* Number of pages used for GPU command queue's User input & output data */ ++#define KBASEP_NUM_CS_USER_IO_PAGES (2) + -+/** -+ * kbase_csf_event_signal - Signal a CSF event -+ * -+ * This function triggers all the CSF event callbacks that are registered to -+ * a given Kbase context, and also signals the thread of userspace driver -+ * (front-end), waiting for the CSF event. -+ * -+ * @kctx: The kbase context whose CSF event callbacks shall be triggered. -+ * @notify_gpu: Flag to indicate if CSF firmware should be notified of the -+ * signaling of event that happened on the Driver side, either -+ * the signal came from userspace or from kcpu queues. ++/* Indicates an invalid value for the scan out sequence number, used to ++ * signify there is no group that has protected mode execution pending. + */ -+void kbase_csf_event_signal(struct kbase_context *kctx, bool notify_gpu); ++#define KBASEP_TICK_PROTM_PEND_SCAN_SEQ_NR_INVALID (U32_MAX) + -+static inline void kbase_csf_event_signal_notify_gpu(struct kbase_context *kctx) -+{ -+ kbase_csf_event_signal(kctx, true); -+} ++#define FIRMWARE_IDLE_HYSTERESIS_TIME_USEC (10000) /* Default 10 milliseconds */ + -+static inline void kbase_csf_event_signal_cpu_only(struct kbase_context *kctx) -+{ -+ kbase_csf_event_signal(kctx, false); -+} ++/* Idle hysteresis time can be scaled down when GPU sleep feature is used */ ++#define FIRMWARE_IDLE_HYSTERESIS_GPU_SLEEP_SCALER (5) + +/** -+ * kbase_csf_ctx_init - Initialize the command-stream front-end for a GPU -+ * address space. ++ * kbase_csf_ctx_init - Initialize the CSF interface for a GPU address space. + * + * @kctx: Pointer to the kbase context which is being initialized. + * @@ -159831,23 +169251,22 @@ index 000000000000..c183d0a32302 + * kbase_csf_ctx_handle_fault - Terminate queue groups & notify fault upon + * GPU bus fault, MMU page fault or similar. + * -+ * This function terminates all GPU command queue groups in the context and -+ * notifies the event notification thread of the fault. -+ * + * @kctx: Pointer to faulty kbase context. + * @fault: Pointer to the fault. ++ * ++ * This function terminates all GPU command queue groups in the context and ++ * notifies the event notification thread of the fault. + */ +void kbase_csf_ctx_handle_fault(struct kbase_context *kctx, + struct kbase_fault *fault); + +/** -+ * kbase_csf_ctx_term - Terminate the command-stream front-end for a GPU -+ * address space. ++ * kbase_csf_ctx_term - Terminate the CSF interface for a GPU address space. ++ * ++ * @kctx: Pointer to the kbase context which is being terminated. + * + * This function terminates any remaining CSGs and CSs which weren't destroyed + * before context termination. -+ * -+ * @kctx: Pointer to the kbase context which is being terminated. + */ +void kbase_csf_ctx_term(struct kbase_context *kctx); + @@ -159866,6 +169285,22 @@ index 000000000000..c183d0a32302 + struct kbase_ioctl_cs_queue_register *reg); + +/** ++ * kbase_csf_queue_register_ex - Register a GPU command queue with ++ * extended format. ++ * ++ * @kctx: Pointer to the kbase context within which the ++ * queue is to be registered. ++ * @reg: Pointer to the structure which contains details of the ++ * queue to be registered within the provided ++ * context, together with the extended parameter fields ++ * for supporting cs trace command. ++ * ++ * Return: 0 on success, or negative on failure. ++ */ ++int kbase_csf_queue_register_ex(struct kbase_context *kctx, ++ struct kbase_ioctl_cs_queue_register_ex *reg); ++ ++/** + * kbase_csf_queue_terminate - Terminate a GPU command queue. + * + * @kctx: Pointer to the kbase context within which the @@ -159877,17 +169312,36 @@ index 000000000000..c183d0a32302 + struct kbase_ioctl_cs_queue_terminate *term); + +/** ++ * kbase_csf_free_command_stream_user_pages() - Free the resources allocated ++ * for a queue at the time of bind. ++ * ++ * @kctx: Address of the kbase context within which the queue was created. ++ * @queue: Pointer to the queue to be unlinked. ++ * ++ * This function will free the pair of physical pages allocated for a GPU ++ * command queue, and also release the hardware doorbell page, that were mapped ++ * into the process address space to enable direct submission of commands to ++ * the hardware. Also releases the reference taken on the queue when the mapping ++ * was created. ++ * ++ * If an explicit or implicit unbind was missed by the userspace then the ++ * mapping will persist. On process exit kernel itself will remove the mapping. ++ */ ++void kbase_csf_free_command_stream_user_pages(struct kbase_context *kctx, ++ struct kbase_queue *queue); ++ ++/** + * kbase_csf_alloc_command_stream_user_pages - Allocate resources for a + * GPU command queue. + * -+ * This function allocates a pair of User mode input/output pages for a -+ * GPU command queue and maps them in the shared interface segment of MCU -+ * firmware address space. Also reserves a hardware doorbell page for the queue. -+ * + * @kctx: Pointer to the kbase context within which the resources + * for the queue are being allocated. + * @queue: Pointer to the queue for which to allocate resources. + * ++ * This function allocates a pair of User mode input/output pages for a ++ * GPU command queue and maps them in the shared interface segment of MCU ++ * firmware address space. Also reserves a hardware doorbell page for the queue. ++ * + * Return: 0 on success, or negative on failure. + */ +int kbase_csf_alloc_command_stream_user_pages(struct kbase_context *kctx, @@ -159912,29 +169366,56 @@ index 000000000000..c183d0a32302 + * are any. + * + * @queue: Pointer to queue to be unbound. ++ * @process_exit: Flag to indicate if process exit is happening. ++ */ ++void kbase_csf_queue_unbind(struct kbase_queue *queue, bool process_exit); ++ ++/** ++ * kbase_csf_queue_unbind_stopped - Unbind a GPU command queue in the case ++ * where it was never started. ++ * @queue: Pointer to queue to be unbound. ++ * ++ * Variant of kbase_csf_queue_unbind() for use on error paths for cleaning up ++ * queues that failed to fully bind. + */ -+void kbase_csf_queue_unbind(struct kbase_queue *queue); ++void kbase_csf_queue_unbind_stopped(struct kbase_queue *queue); + +/** + * kbase_csf_queue_kick - Schedule a GPU command queue on the firmware + * -+ * @kctx: The kbase context. -+ * @kick: Pointer to the struct which specifies the queue -+ * that needs to be scheduled. ++ * @kctx: The kbase context. ++ * @kick: Pointer to the struct which specifies the queue ++ * that needs to be scheduled. + * + * Return: 0 on success, or negative on failure. + */ +int kbase_csf_queue_kick(struct kbase_context *kctx, + struct kbase_ioctl_cs_queue_kick *kick); + -+/** Find if given the queue group handle is valid. ++/** ++ * kbase_csf_queue_group_handle_is_valid - Find the queue group corresponding ++ * to the indicated handle. + * -+ * This function is used to determine if the queue group handle is valid. ++ * @kctx: The kbase context under which the queue group exists. ++ * @group_handle: Handle for the group which uniquely identifies it within ++ * the context with which it was created. ++ * ++ * This function is used to find the queue group when passed a handle. ++ * ++ * Return: Pointer to a queue group on success, NULL on failure ++ */ ++struct kbase_queue_group *kbase_csf_find_queue_group(struct kbase_context *kctx, u8 group_handle); ++ ++/** ++ * kbase_csf_queue_group_handle_is_valid - Find if the given queue group handle ++ * is valid. + * + * @kctx: The kbase context under which the queue group exists. + * @group_handle: Handle for the group which uniquely identifies it within + * the context with which it was created. + * ++ * This function is used to determine if the queue group handle is valid. ++ * + * Return: 0 on success, or negative on failure. + */ +int kbase_csf_queue_group_handle_is_valid(struct kbase_context *kctx, @@ -159978,24 +169459,35 @@ index 000000000000..c183d0a32302 + */ +void kbase_csf_term_descheduled_queue_group(struct kbase_queue_group *group); + ++#if IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST +/** + * kbase_csf_queue_group_suspend - Suspend a GPU command queue group + * -+ * This function is used to suspend a queue group and copy the suspend buffer. -+ * + * @kctx: The kbase context for which the queue group is to be + * suspended. + * @sus_buf: Pointer to the structure which contains details of the + * user buffer and its kernel pinned pages. -+ * @size: The size in bytes for the user provided buffer. + * @group_handle: Handle for the group which uniquely identifies it within + * the context within which it was created. + * ++ * This function is used to suspend a queue group and copy the suspend buffer. ++ * + * Return: 0 on success or negative value if failed to suspend + * queue group and copy suspend buffer contents. + */ +int kbase_csf_queue_group_suspend(struct kbase_context *kctx, + struct kbase_suspend_copy_buffer *sus_buf, u8 group_handle); ++#endif ++ ++/** ++ * kbase_csf_add_group_fatal_error - Report a fatal group error to userspace ++ * ++ * @group: GPU command queue group. ++ * @err_payload: Error payload to report. ++ */ ++void kbase_csf_add_group_fatal_error( ++ struct kbase_queue_group *const group, ++ struct base_gpu_queue_group_error const *const err_payload); + +/** + * kbase_csf_interrupt - Handle interrupts issued by CSF firmware. @@ -160006,66 +169498,106 @@ index 000000000000..c183d0a32302 +void kbase_csf_interrupt(struct kbase_device *kbdev, u32 val); + +/** -+ * kbase_csf_doorbell_mapping_init - Initialize the bitmap of Hw doorbell pages -+ * used to track their availability. ++ * kbase_csf_doorbell_mapping_init - Initialize the fields that facilitates ++ * the update of userspace mapping of HW ++ * doorbell page. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * The function creates a file and allocates a dummy page to facilitate the ++ * update of userspace mapping to point to the dummy page instead of the real ++ * HW doorbell page after the suspend of queue group. ++ * ++ * Return: 0 on success, or negative on failure. + */ +int kbase_csf_doorbell_mapping_init(struct kbase_device *kbdev); + ++/** ++ * kbase_csf_doorbell_mapping_term - Free the dummy page & close the file used ++ * to update the userspace mapping of HW doorbell page ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ */ +void kbase_csf_doorbell_mapping_term(struct kbase_device *kbdev); + +/** -+ * kbase_csf_ring_csg_doorbell - ring the doorbell for a command stream group -+ * interface. ++ * kbase_csf_setup_dummy_user_reg_page - Setup the dummy page that is accessed ++ * instead of the User register page after ++ * the GPU power down. + * -+ * The function kicks a notification on the command stream group interface to -+ * firmware. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * The function allocates a dummy page which is used to replace the User ++ * register page in the userspace mapping after the power down of GPU. ++ * On the power up of GPU, the mapping is updated to point to the real ++ * User register page. The mapping is used to allow access to LATEST_FLUSH ++ * register from userspace. ++ * ++ * Return: 0 on success, or negative on failure. ++ */ ++int kbase_csf_setup_dummy_user_reg_page(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_free_dummy_user_reg_page - Free the dummy page that was used ++ * to replace the User register page + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. -+ * @slot: Index of command stream group interface for ringing the door-bell. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + */ -+void kbase_csf_ring_csg_doorbell(struct kbase_device *kbdev, int slot); ++void kbase_csf_free_dummy_user_reg_page(struct kbase_device *kbdev); + +/** -+ * kbase_csf_ring_csg_slots_doorbell - ring the doorbell for a set of command -+ * stream group interfaces. ++ * kbase_csf_ring_csg_doorbell - ring the doorbell for a CSG interface. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @slot: Index of CSG interface for ringing the door-bell. + * -+ * The function kicks a notification on a set of command stream group -+ * interfaces to firmware. ++ * The function kicks a notification on the CSG interface to firmware. ++ */ ++void kbase_csf_ring_csg_doorbell(struct kbase_device *kbdev, int slot); ++ ++/** ++ * kbase_csf_ring_csg_slots_doorbell - ring the doorbell for a set of CSG ++ * interfaces. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * @slot_bitmap: bitmap for the given slots, slot-0 on bit-0, etc. ++ * ++ * The function kicks a notification on a set of CSG interfaces to firmware. + */ +void kbase_csf_ring_csg_slots_doorbell(struct kbase_device *kbdev, + u32 slot_bitmap); + +/** -+ * kbase_csf_ring_cs_kernel_doorbell - ring the kernel doorbell for a queue ++ * kbase_csf_ring_cs_kernel_doorbell - ring the kernel doorbell for a CSI ++ * assigned to a GPU queue + * -+ * The function kicks a notification to the firmware for the command stream -+ * interface to which the queue is bound. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @csi_index: ID of the CSI assigned to the GPU queue. ++ * @csg_nr: Index of the CSG slot assigned to the queue ++ * group to which the GPU queue is bound. ++ * @ring_csg_doorbell: Flag to indicate if the CSG doorbell needs to be rung ++ * after updating the CSG_DB_REQ. So if this flag is false ++ * the doorbell interrupt will not be sent to FW. ++ * The flag is supposed be false only when the input page ++ * for bound GPU queues is programmed at the time of ++ * starting/resuming the group on a CSG slot. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. -+ * @queue: Pointer to the queue for ringing the door-bell. ++ * The function sends a doorbell interrupt notification to the firmware for ++ * a CSI assigned to a GPU queue. + */ +void kbase_csf_ring_cs_kernel_doorbell(struct kbase_device *kbdev, -+ struct kbase_queue *queue); ++ int csi_index, int csg_nr, ++ bool ring_csg_doorbell); + +/** + * kbase_csf_ring_cs_user_doorbell - ring the user doorbell allocated for a + * queue. + * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @queue: Pointer to the queue for ringing the door-bell. ++ * + * The function kicks a notification to the firmware on the doorbell assigned + * to the queue. -+ * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. -+ * @queue: Pointer to the queue for ringing the door-bell. + */ +void kbase_csf_ring_cs_user_doorbell(struct kbase_device *kbdev, + struct kbase_queue *queue); @@ -160074,9 +169606,8 @@ index 000000000000..c183d0a32302 + * kbase_csf_active_queue_groups_reset - Reset the state of all active GPU + * command queue groups associated with the context. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. -+ * @kctx: The kbase context. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @kctx: The kbase context. + * + * This function will iterate through all the active/scheduled GPU command + * queue groups associated with the context, deschedule and mark them as @@ -160088,21 +169619,91 @@ index 000000000000..c183d0a32302 +void kbase_csf_active_queue_groups_reset(struct kbase_device *kbdev, + struct kbase_context *kctx); + ++/** ++ * kbase_csf_priority_check - Check the priority requested ++ * ++ * @kbdev: Device pointer ++ * @req_priority: Requested priority ++ * ++ * This will determine whether the requested priority can be satisfied. ++ * ++ * Return: The same or lower priority than requested. ++ */ ++u8 kbase_csf_priority_check(struct kbase_device *kbdev, u8 req_priority); ++ ++extern const u8 kbasep_csf_queue_group_priority_to_relative[BASE_QUEUE_GROUP_PRIORITY_COUNT]; ++extern const u8 kbasep_csf_relative_to_queue_group_priority[KBASE_QUEUE_GROUP_PRIORITY_COUNT]; ++ ++/** ++ * kbase_csf_priority_relative_to_queue_group_priority - Convert relative to base priority ++ * ++ * @priority: kbase relative priority ++ * ++ * This will convert the monotonically increasing realtive priority to the ++ * fixed base priority list. ++ * ++ * Return: base_queue_group_priority priority. ++ */ ++static inline u8 kbase_csf_priority_relative_to_queue_group_priority(u8 priority) ++{ ++ if (priority >= KBASE_QUEUE_GROUP_PRIORITY_COUNT) ++ priority = KBASE_QUEUE_GROUP_PRIORITY_LOW; ++ return kbasep_csf_relative_to_queue_group_priority[priority]; ++} ++ ++/** ++ * kbase_csf_priority_queue_group_priority_to_relative - Convert base priority to relative ++ * ++ * @priority: base_queue_group_priority priority ++ * ++ * This will convert the fixed base priority list to monotonically increasing realtive priority. ++ * ++ * Return: kbase relative priority. ++ */ ++static inline u8 kbase_csf_priority_queue_group_priority_to_relative(u8 priority) ++{ ++ /* Apply low priority in case of invalid priority */ ++ if (priority >= BASE_QUEUE_GROUP_PRIORITY_COUNT) ++ priority = BASE_QUEUE_GROUP_PRIORITY_LOW; ++ return kbasep_csf_queue_group_priority_to_relative[priority]; ++} ++ ++/** ++ * kbase_csf_ktrace_gpu_cycle_cnt - Wrapper to retreive the GPU cycle counter ++ * value for Ktrace purpose. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * This function is just a wrapper to retreive the GPU cycle counter value, to ++ * avoid any overhead on Release builds where Ktrace is disabled by default. ++ * ++ * Return: Snapshot of the GPU cycle count register. ++ */ ++static inline u64 kbase_csf_ktrace_gpu_cycle_cnt(struct kbase_device *kbdev) ++{ ++#if KBASE_KTRACE_ENABLE ++ return kbase_backend_get_cycle_cnt(kbdev); ++#else ++ return 0; ++#endif ++} ++ +#endif /* _KBASE_CSF_H_ */ -diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c -new file mode 100755 -index 000000000000..fd8329ba9422 +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.c +new file mode 100644 +index 000000000..516a33ff7 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c -@@ -0,0 +1,460 @@ ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.c +@@ -0,0 +1,191 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -160113,79 +169714,590 @@ index 000000000000..fd8329ba9422 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include "mali_kbase_csf_csg_debugfs.h" ++#include "mali_kbase_csf_cpu_queue_debugfs.h" +#include +#include -+#include -+#include + -+#ifdef CONFIG_DEBUG_FS -+#include "mali_kbase_csf_tl_reader.h" ++#if IS_ENABLED(CONFIG_DEBUG_FS) + -+static void kbasep_csf_scheduler_dump_active_queue_cs_status_wait( -+ struct seq_file *file, -+ u32 wait_status, -+ u32 wait_sync_value, -+ u64 wait_sync_live_value, -+ u64 wait_sync_pointer) ++bool kbase_csf_cpu_queue_read_dump_req(struct kbase_context *kctx, ++ struct base_csf_notification *req) +{ -+#define WAITING "Waiting" -+#define NOT_WAITING "Not waiting" ++ if (atomic_cmpxchg(&kctx->csf.cpu_queue.dump_req_status, ++ BASE_CSF_CPU_QUEUE_DUMP_ISSUED, ++ BASE_CSF_CPU_QUEUE_DUMP_PENDING) != ++ BASE_CSF_CPU_QUEUE_DUMP_ISSUED) { ++ return false; ++ } + -+ seq_printf(file, "SB_MASK: %d\n", -+ CS_STATUS_WAIT_SB_MASK_GET(wait_status)); -+ seq_printf(file, "PROGRESS_WAIT: %s\n", -+ CS_STATUS_WAIT_PROGRESS_WAIT_GET(wait_status) ? -+ WAITING : NOT_WAITING); -+ seq_printf(file, "PROTM_PEND: %s\n", -+ CS_STATUS_WAIT_PROTM_PEND_GET(wait_status) ? -+ WAITING : NOT_WAITING); -+ seq_printf(file, "SYNC_WAIT: %s\n", -+ CS_STATUS_WAIT_SYNC_WAIT_GET(wait_status) ? -+ WAITING : NOT_WAITING); -+ seq_printf(file, "WAIT_CONDITION: %s\n", -+ CS_STATUS_WAIT_SYNC_WAIT_CONDITION_GET(wait_status) ? -+ "greater than" : "less or equal"); -+ seq_printf(file, "SYNC_POINTER: 0x%llx\n", wait_sync_pointer); -+ seq_printf(file, "SYNC_VALUE: %d\n", wait_sync_value); -+ seq_printf(file, "SYNC_LIVE_VALUE: 0x%016llx\n", wait_sync_live_value); ++ req->type = BASE_CSF_NOTIFICATION_CPU_QUEUE_DUMP; ++ return true; +} + +/** -+ * kbasep_csf_scheduler_dump_active_queue() - Print GPU command queue -+ * debug information ++ * kbasep_csf_cpu_queue_debugfs_show() - Print cpu queue information for per context + * -+ * @file: seq_file for printing to -+ * @queue: Address of a GPU command queue to examine ++ * @file: The seq_file for printing to ++ * @data: The debugfs dentry private data, a pointer to kbase_context ++ * ++ * Return: Negative error code or 0 on success. + */ -+static void kbasep_csf_scheduler_dump_active_queue(struct seq_file *file, -+ struct kbase_queue *queue) ++static int kbasep_csf_cpu_queue_debugfs_show(struct seq_file *file, void *data) +{ -+ u32 *addr; -+ u64 cs_extract; -+ u64 cs_insert; -+ u32 cs_active; ++ struct kbase_context *kctx = file->private; ++ ++ mutex_lock(&kctx->csf.lock); ++ if (atomic_read(&kctx->csf.cpu_queue.dump_req_status) != ++ BASE_CSF_CPU_QUEUE_DUMP_COMPLETE) { ++ seq_puts(file, "Dump request already started! (try again)\n"); ++ mutex_unlock(&kctx->csf.lock); ++ return -EBUSY; ++ } ++ ++ atomic_set(&kctx->csf.cpu_queue.dump_req_status, BASE_CSF_CPU_QUEUE_DUMP_ISSUED); ++ init_completion(&kctx->csf.cpu_queue.dump_cmp); ++ kbase_event_wakeup(kctx); ++ mutex_unlock(&kctx->csf.lock); ++ ++ seq_puts(file, ++ "CPU Queues table (version:v" __stringify(MALI_CSF_CPU_QUEUE_DEBUGFS_VERSION) "):\n"); ++ ++ wait_for_completion_timeout(&kctx->csf.cpu_queue.dump_cmp, ++ msecs_to_jiffies(3000)); ++ ++ mutex_lock(&kctx->csf.lock); ++ if (kctx->csf.cpu_queue.buffer) { ++ WARN_ON(atomic_read(&kctx->csf.cpu_queue.dump_req_status) != ++ BASE_CSF_CPU_QUEUE_DUMP_PENDING); ++ ++ seq_printf(file, "%s\n", kctx->csf.cpu_queue.buffer); ++ ++ kfree(kctx->csf.cpu_queue.buffer); ++ kctx->csf.cpu_queue.buffer = NULL; ++ kctx->csf.cpu_queue.buffer_size = 0; ++ } else ++ seq_puts(file, "Dump error! (time out)\n"); ++ ++ atomic_set(&kctx->csf.cpu_queue.dump_req_status, ++ BASE_CSF_CPU_QUEUE_DUMP_COMPLETE); ++ ++ mutex_unlock(&kctx->csf.lock); ++ return 0; ++} ++ ++static int kbasep_csf_cpu_queue_debugfs_open(struct inode *in, struct file *file) ++{ ++ return single_open(file, kbasep_csf_cpu_queue_debugfs_show, in->i_private); ++} ++ ++static const struct file_operations kbasep_csf_cpu_queue_debugfs_fops = { ++ .open = kbasep_csf_cpu_queue_debugfs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++ ++void kbase_csf_cpu_queue_debugfs_init(struct kbase_context *kctx) ++{ ++ struct dentry *file; ++ ++ if (WARN_ON(!kctx || IS_ERR_OR_NULL(kctx->kctx_dentry))) ++ return; ++ ++ file = debugfs_create_file("cpu_queue", 0444, kctx->kctx_dentry, ++ kctx, &kbasep_csf_cpu_queue_debugfs_fops); ++ ++ if (IS_ERR_OR_NULL(file)) { ++ dev_warn(kctx->kbdev->dev, ++ "Unable to create cpu queue debugfs entry"); ++ } ++ ++ kctx->csf.cpu_queue.buffer = NULL; ++ kctx->csf.cpu_queue.buffer_size = 0; ++ atomic_set(&kctx->csf.cpu_queue.dump_req_status, ++ BASE_CSF_CPU_QUEUE_DUMP_COMPLETE); ++} ++ ++int kbase_csf_cpu_queue_dump(struct kbase_context *kctx, ++ u64 buffer, size_t buf_size) ++{ ++ int err = 0; ++ ++ size_t alloc_size = buf_size; ++ char *dump_buffer; ++ ++ if (!buffer || !alloc_size) ++ goto done; ++ ++ alloc_size = (alloc_size + PAGE_SIZE) & ~(PAGE_SIZE - 1); ++ dump_buffer = kzalloc(alloc_size, GFP_KERNEL); ++ if (ZERO_OR_NULL_PTR(dump_buffer)) { ++ err = -ENOMEM; ++ goto done; ++ } ++ ++ WARN_ON(kctx->csf.cpu_queue.buffer != NULL); ++ ++ err = copy_from_user(dump_buffer, ++ u64_to_user_ptr(buffer), ++ buf_size); ++ if (err) { ++ kfree(dump_buffer); ++ err = -EFAULT; ++ goto done; ++ } ++ ++ mutex_lock(&kctx->csf.lock); ++ ++ kfree(kctx->csf.cpu_queue.buffer); ++ ++ if (atomic_read(&kctx->csf.cpu_queue.dump_req_status) == ++ BASE_CSF_CPU_QUEUE_DUMP_PENDING) { ++ kctx->csf.cpu_queue.buffer = dump_buffer; ++ kctx->csf.cpu_queue.buffer_size = buf_size; ++ complete_all(&kctx->csf.cpu_queue.dump_cmp); ++ } else { ++ kfree(dump_buffer); ++ } ++ ++ mutex_unlock(&kctx->csf.lock); ++done: ++ return err; ++} ++#else ++/* ++ * Stub functions for when debugfs is disabled ++ */ ++void kbase_csf_cpu_queue_debugfs_init(struct kbase_context *kctx) ++{ ++} ++ ++bool kbase_csf_cpu_queue_read_dump_req(struct kbase_context *kctx, ++ struct base_csf_notification *req) ++{ ++ return false; ++} ++ ++int kbase_csf_cpu_queue_dump(struct kbase_context *kctx, ++ u64 buffer, size_t buf_size) ++{ ++ return 0; ++} ++#endif /* CONFIG_DEBUG_FS */ +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.h +new file mode 100644 +index 000000000..435a99395 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.h +@@ -0,0 +1,90 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#ifndef _KBASE_CSF_CPU_QUEUE_DEBUGFS_H_ ++#define _KBASE_CSF_CPU_QUEUE_DEBUGFS_H_ ++ ++#include ++#include ++ ++#include "mali_kbase.h" ++ ++/* Forward declaration */ ++struct base_csf_notification; ++ ++#define MALI_CSF_CPU_QUEUE_DEBUGFS_VERSION 0 ++ ++/* CPU queue dump status */ ++/* Dumping is done or no dumping is in progress. */ ++#define BASE_CSF_CPU_QUEUE_DUMP_COMPLETE 0 ++/* Dumping request is pending. */ ++#define BASE_CSF_CPU_QUEUE_DUMP_PENDING 1 ++/* Dumping request is issued to Userspace */ ++#define BASE_CSF_CPU_QUEUE_DUMP_ISSUED 2 ++ ++ ++/** ++ * kbase_csf_cpu_queue_debugfs_init() - Create a debugfs entry for per context cpu queue(s) ++ * ++ * @kctx: The kbase_context for which to create the debugfs entry ++ */ ++void kbase_csf_cpu_queue_debugfs_init(struct kbase_context *kctx); ++ ++/** ++ * kbase_csf_cpu_queue_read_dump_req - Read cpu queue dump request event ++ * ++ * @kctx: The kbase_context which cpu queue dumpped belongs to ++ * @req: Notification with cpu queue dump request. ++ * ++ * Return: true if needs CPU queue dump, or false otherwise. ++ */ ++bool kbase_csf_cpu_queue_read_dump_req(struct kbase_context *kctx, ++ struct base_csf_notification *req); ++ ++/** ++ * kbase_csf_cpu_queue_dump_needed - Check the requirement for cpu queue dump ++ * ++ * @kctx: The kbase_context which cpu queue dumpped belongs to ++ * ++ * Return: true if it needs cpu queue dump, or false otherwise. ++ */ ++static inline bool kbase_csf_cpu_queue_dump_needed(struct kbase_context *kctx) ++{ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ return (atomic_read(&kctx->csf.cpu_queue.dump_req_status) == ++ BASE_CSF_CPU_QUEUE_DUMP_ISSUED); ++#else ++ return false; ++#endif ++} ++ ++/** ++ * kbase_csf_cpu_queue_dump - dump buffer containing cpu queue information to debugfs ++ * ++ * @kctx: The kbase_context which cpu queue dumpped belongs to ++ * @buffer: Buffer containing the cpu queue information. ++ * @buf_size: Buffer size. ++ * ++ * Return: Return 0 for dump successfully, or error code. ++ */ ++int kbase_csf_cpu_queue_dump(struct kbase_context *kctx, ++ u64 buffer, size_t buf_size); ++#endif /* _KBASE_CSF_CPU_QUEUE_DEBUGFS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c +new file mode 100755 +index 000000000..e96044ae6 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c +@@ -0,0 +1,767 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#include "mali_kbase_csf_csg_debugfs.h" ++#include ++#include ++#include ++#include ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++#include "mali_kbase_csf_tl_reader.h" ++ ++/* Wait time to be used cumulatively for all the CSG slots. ++ * Since scheduler lock is held when STATUS_UPDATE request is sent, there won't be ++ * any other Host request pending on the FW side and usually FW would be responsive ++ * to the Doorbell IRQs as it won't do any polling for a long time and also it won't ++ * have to wait for any HW state transition to complete for publishing the status. ++ * So it is reasonable to expect that handling of STATUS_UPDATE request would be ++ * relatively very quick. ++ */ ++#define STATUS_UPDATE_WAIT_TIMEOUT 500 ++ ++/* The bitmask of CSG slots for which the STATUS_UPDATE request completed. ++ * The access to it is serialized with scheduler lock, so at a time it would ++ * get used either for "active_groups" or per context "groups" debugfs file. ++ */ ++static DECLARE_BITMAP(csg_slots_status_updated, MAX_SUPPORTED_CSGS); ++ ++static ++bool csg_slot_status_update_finish(struct kbase_device *kbdev, u32 csg_nr) ++{ ++ struct kbase_csf_cmd_stream_group_info const *const ginfo = ++ &kbdev->csf.global_iface.groups[csg_nr]; ++ ++ return !((kbase_csf_firmware_csg_input_read(ginfo, CSG_REQ) ^ ++ kbase_csf_firmware_csg_output(ginfo, CSG_ACK)) & ++ CSG_REQ_STATUS_UPDATE_MASK); ++} ++ ++static ++bool csg_slots_status_update_finish(struct kbase_device *kbdev, ++ const unsigned long *slots_mask) ++{ ++ const u32 max_csg_slots = kbdev->csf.global_iface.group_num; ++ bool changed = false; ++ u32 csg_nr; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ for_each_set_bit(csg_nr, slots_mask, max_csg_slots) { ++ if (csg_slot_status_update_finish(kbdev, csg_nr)) { ++ set_bit(csg_nr, csg_slots_status_updated); ++ changed = true; ++ } ++ } ++ ++ return changed; ++} ++ ++static void wait_csg_slots_status_update_finish(struct kbase_device *kbdev, ++ unsigned long *slots_mask) ++{ ++ const u32 max_csg_slots = kbdev->csf.global_iface.group_num; ++ long remaining = kbase_csf_timeout_in_jiffies(STATUS_UPDATE_WAIT_TIMEOUT); ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ bitmap_zero(csg_slots_status_updated, max_csg_slots); ++ ++ while (!bitmap_empty(slots_mask, max_csg_slots) && remaining) { ++ remaining = wait_event_timeout(kbdev->csf.event_wait, ++ csg_slots_status_update_finish(kbdev, slots_mask), ++ remaining); ++ if (likely(remaining)) { ++ bitmap_andnot(slots_mask, slots_mask, ++ csg_slots_status_updated, max_csg_slots); ++ } else { ++ dev_warn(kbdev->dev, ++ "STATUS_UPDATE request timed out for slots 0x%lx", ++ slots_mask[0]); ++ } ++ } ++} ++ ++void kbase_csf_debugfs_update_active_groups_status(struct kbase_device *kbdev) ++{ ++ u32 max_csg_slots = kbdev->csf.global_iface.group_num; ++ DECLARE_BITMAP(used_csgs, MAX_SUPPORTED_CSGS) = { 0 }; ++ u32 csg_nr; ++ unsigned long flags; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ /* Global doorbell ring for CSG STATUS_UPDATE request or User doorbell ++ * ring for Extract offset update, shall not be made when MCU has been ++ * put to sleep otherwise it will undesirably make MCU exit the sleep ++ * state. Also it isn't really needed as FW will implicitly update the ++ * status of all on-slot groups when MCU sleep request is sent to it. ++ */ ++ if (kbdev->csf.scheduler.state == SCHED_SLEEPING) { ++ /* Wait for the MCU sleep request to complete. */ ++ kbase_pm_wait_for_desired_state(kbdev); ++ bitmap_copy(csg_slots_status_updated, ++ kbdev->csf.scheduler.csg_inuse_bitmap, max_csg_slots); ++ return; ++ } ++ ++ for (csg_nr = 0; csg_nr < max_csg_slots; csg_nr++) { ++ struct kbase_queue_group *const group = ++ kbdev->csf.scheduler.csg_slots[csg_nr].resident_group; ++ if (!group) ++ continue; ++ /* Ring the User doorbell for FW to update the Extract offset */ ++ kbase_csf_ring_doorbell(kbdev, group->doorbell_nr); ++ set_bit(csg_nr, used_csgs); ++ } ++ ++ /* Return early if there are no on-slot groups */ ++ if (bitmap_empty(used_csgs, max_csg_slots)) ++ return; ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ for_each_set_bit(csg_nr, used_csgs, max_csg_slots) { ++ struct kbase_csf_cmd_stream_group_info const *const ginfo = ++ &kbdev->csf.global_iface.groups[csg_nr]; ++ kbase_csf_firmware_csg_input_mask(ginfo, CSG_REQ, ++ ~kbase_csf_firmware_csg_output(ginfo, CSG_ACK), ++ CSG_REQ_STATUS_UPDATE_MASK); ++ } ++ ++ BUILD_BUG_ON(MAX_SUPPORTED_CSGS > (sizeof(used_csgs[0]) * BITS_PER_BYTE)); ++ kbase_csf_ring_csg_slots_doorbell(kbdev, used_csgs[0]); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ wait_csg_slots_status_update_finish(kbdev, used_csgs); ++ /* Wait for the User doobell ring to take effect */ ++ msleep(100); ++} ++ ++#define MAX_SCHED_STATE_STRING_LEN (16) ++static const char *scheduler_state_to_string(struct kbase_device *kbdev, ++ enum kbase_csf_scheduler_state sched_state) ++{ ++ switch (sched_state) { ++ case SCHED_BUSY: ++ return "BUSY"; ++ case SCHED_INACTIVE: ++ return "INACTIVE"; ++ case SCHED_SUSPENDED: ++ return "SUSPENDED"; ++#ifdef KBASE_PM_RUNTIME ++ case SCHED_SLEEPING: ++ return "SLEEPING"; ++#endif ++ default: ++ dev_warn(kbdev->dev, "Unknown Scheduler state %d", sched_state); ++ return NULL; ++ } ++} ++ ++/** ++ * blocked_reason_to_string() - Convert blocking reason id to a string ++ * ++ * @reason_id: blocked_reason ++ * ++ * Return: Suitable string ++ */ ++static const char *blocked_reason_to_string(u32 reason_id) ++{ ++ /* possible blocking reasons of a cs */ ++ static const char *const cs_blocked_reason[] = { ++ [CS_STATUS_BLOCKED_REASON_REASON_UNBLOCKED] = "UNBLOCKED", ++ [CS_STATUS_BLOCKED_REASON_REASON_WAIT] = "WAIT", ++ [CS_STATUS_BLOCKED_REASON_REASON_PROGRESS_WAIT] = ++ "PROGRESS_WAIT", ++ [CS_STATUS_BLOCKED_REASON_REASON_SYNC_WAIT] = "SYNC_WAIT", ++ [CS_STATUS_BLOCKED_REASON_REASON_DEFERRED] = "DEFERRED", ++ [CS_STATUS_BLOCKED_REASON_REASON_RESOURCE] = "RESOURCE", ++ [CS_STATUS_BLOCKED_REASON_REASON_FLUSH] = "FLUSH" ++ }; ++ ++ if (WARN_ON(reason_id >= ARRAY_SIZE(cs_blocked_reason))) ++ return "UNKNOWN_BLOCKED_REASON_ID"; ++ ++ return cs_blocked_reason[reason_id]; ++} ++ ++static bool sb_source_supported(u32 glb_version) ++{ ++ bool supported = false; ++ ++ if (((GLB_VERSION_MAJOR_GET(glb_version) == 3) && ++ (GLB_VERSION_MINOR_GET(glb_version) >= 5)) || ++ ((GLB_VERSION_MAJOR_GET(glb_version) == 2) && ++ (GLB_VERSION_MINOR_GET(glb_version) >= 6)) || ++ ((GLB_VERSION_MAJOR_GET(glb_version) == 1) && ++ (GLB_VERSION_MINOR_GET(glb_version) >= 3))) ++ supported = true; ++ ++ return supported; ++} ++ ++static void kbasep_csf_scheduler_dump_active_queue_cs_status_wait( ++ struct seq_file *file, u32 glb_version, u32 wait_status, u32 wait_sync_value, ++ u64 wait_sync_live_value, u64 wait_sync_pointer, u32 sb_status, u32 blocked_reason) ++{ ++#define WAITING "Waiting" ++#define NOT_WAITING "Not waiting" ++ ++ seq_printf(file, "SB_MASK: %d\n", ++ CS_STATUS_WAIT_SB_MASK_GET(wait_status)); ++ if (sb_source_supported(glb_version)) ++ seq_printf(file, "SB_SOURCE: %d\n", CS_STATUS_WAIT_SB_SOURCE_GET(wait_status)); ++ seq_printf(file, "PROGRESS_WAIT: %s\n", ++ CS_STATUS_WAIT_PROGRESS_WAIT_GET(wait_status) ? ++ WAITING : NOT_WAITING); ++ seq_printf(file, "PROTM_PEND: %s\n", ++ CS_STATUS_WAIT_PROTM_PEND_GET(wait_status) ? ++ WAITING : NOT_WAITING); ++ seq_printf(file, "SYNC_WAIT: %s\n", ++ CS_STATUS_WAIT_SYNC_WAIT_GET(wait_status) ? ++ WAITING : NOT_WAITING); ++ seq_printf(file, "WAIT_CONDITION: %s\n", ++ CS_STATUS_WAIT_SYNC_WAIT_CONDITION_GET(wait_status) ? ++ "greater than" : "less or equal"); ++ seq_printf(file, "SYNC_POINTER: 0x%llx\n", wait_sync_pointer); ++ seq_printf(file, "SYNC_VALUE: %d\n", wait_sync_value); ++ seq_printf(file, "SYNC_LIVE_VALUE: 0x%016llx\n", wait_sync_live_value); ++ seq_printf(file, "SB_STATUS: %u\n", ++ CS_STATUS_SCOREBOARDS_NONZERO_GET(sb_status)); ++ seq_printf(file, "BLOCKED_REASON: %s\n", ++ blocked_reason_to_string(CS_STATUS_BLOCKED_REASON_REASON_GET( ++ blocked_reason))); ++} ++ ++static void kbasep_csf_scheduler_dump_active_cs_trace(struct seq_file *file, ++ struct kbase_csf_cmd_stream_info const *const stream) ++{ ++ u32 val = kbase_csf_firmware_cs_input_read(stream, ++ CS_INSTR_BUFFER_BASE_LO); ++ u64 addr = ((u64)kbase_csf_firmware_cs_input_read(stream, ++ CS_INSTR_BUFFER_BASE_HI) << 32) | val; ++ val = kbase_csf_firmware_cs_input_read(stream, ++ CS_INSTR_BUFFER_SIZE); ++ ++ seq_printf(file, "CS_TRACE_BUF_ADDR: 0x%16llx, SIZE: %u\n", addr, val); ++ ++ /* Write offset variable address (pointer) */ ++ val = kbase_csf_firmware_cs_input_read(stream, ++ CS_INSTR_BUFFER_OFFSET_POINTER_LO); ++ addr = ((u64)kbase_csf_firmware_cs_input_read(stream, ++ CS_INSTR_BUFFER_OFFSET_POINTER_HI) << 32) | val; ++ seq_printf(file, "CS_TRACE_BUF_OFFSET_PTR: 0x%16llx\n", addr); ++ ++ /* EVENT_SIZE and EVENT_STATEs */ ++ val = kbase_csf_firmware_cs_input_read(stream, CS_INSTR_CONFIG); ++ seq_printf(file, "TRACE_EVENT_SIZE: 0x%x, TRACE_EVENT_STAES 0x%x\n", ++ CS_INSTR_CONFIG_EVENT_SIZE_GET(val), ++ CS_INSTR_CONFIG_EVENT_STATE_GET(val)); ++} ++ ++/** ++ * kbasep_csf_scheduler_dump_active_queue() - Print GPU command queue ++ * debug information ++ * ++ * @file: seq_file for printing to ++ * @queue: Address of a GPU command queue to examine ++ */ ++static void kbasep_csf_scheduler_dump_active_queue(struct seq_file *file, ++ struct kbase_queue *queue) ++{ ++ u32 *addr; ++ u64 cs_extract; ++ u64 cs_insert; ++ u32 cs_active; + u64 wait_sync_pointer; + u32 wait_status, wait_sync_value; ++ u32 sb_status; ++ u32 blocked_reason; + struct kbase_vmap_struct *mapping; + u64 *evt; + u64 wait_sync_live_value; ++ u32 glb_version; + + if (!queue) + return; + ++ glb_version = queue->kctx->kbdev->csf.global_iface.version; ++ + if (WARN_ON(queue->csi_index == KBASEP_IF_NR_INVALID || + !queue->group)) + return; + -+ /* Ring the doorbell to have firmware update CS_EXTRACT */ -+ kbase_csf_ring_cs_user_doorbell(queue->kctx->kbdev, queue); -+ msleep(100); -+ + addr = (u32 *)queue->user_io_addr; + cs_insert = addr[CS_INSERT_LO/4] | ((u64)addr[CS_INSERT_HI/4] << 32); + @@ -160194,18 +170306,24 @@ index 000000000000..fd8329ba9422 + cs_active = addr[CS_ACTIVE/4]; + +#define KBASEP_CSF_DEBUGFS_CS_HEADER_USER_IO \ -+ "Bind Idx, Ringbuf addr, Prio, Insert offset, Extract offset, Active, Doorbell\n" ++ "Bind Idx, Ringbuf addr, Size, Prio, Insert offset, Extract offset, Active, Doorbell\n" + -+ seq_printf(file, KBASEP_CSF_DEBUGFS_CS_HEADER_USER_IO "%8d, %16llx, %4u, %16llx, %16llx, %6u, %8d\n", -+ queue->csi_index, queue->base_addr, queue->priority, -+ cs_insert, cs_extract, cs_active, queue->doorbell_nr); ++ seq_printf(file, KBASEP_CSF_DEBUGFS_CS_HEADER_USER_IO "%8d, %16llx, %8x, %4u, %16llx, %16llx, %6u, %8d\n", ++ queue->csi_index, queue->base_addr, ++ queue->size, ++ queue->priority, cs_insert, cs_extract, cs_active, queue->doorbell_nr); + -+ /* Print status information for blocked group waiting for sync object */ ++ /* Print status information for blocked group waiting for sync object. For on-slot queues, ++ * if cs_trace is enabled, dump the interface's cs_trace configuration. ++ */ + if (kbase_csf_scheduler_group_get_slot(queue->group) < 0) { ++ seq_printf(file, "SAVED_CMD_PTR: 0x%llx\n", queue->saved_cmd_ptr); + if (CS_STATUS_WAIT_SYNC_WAIT_GET(queue->status_wait)) { + wait_status = queue->status_wait; + wait_sync_value = queue->sync_value; + wait_sync_pointer = queue->sync_ptr; ++ sb_status = queue->sb_status; ++ blocked_reason = queue->blocked_reason; + + evt = (u64 *)kbase_phy_alloc_mapping_get(queue->kctx, wait_sync_pointer, &mapping); + if (evt) { @@ -160216,8 +170334,8 @@ index 000000000000..fd8329ba9422 + } + + kbasep_csf_scheduler_dump_active_queue_cs_status_wait( -+ file, wait_status, wait_sync_value, -+ wait_sync_live_value, wait_sync_pointer); ++ file, glb_version, wait_status, wait_sync_value, ++ wait_sync_live_value, wait_sync_pointer, sb_status, blocked_reason); + } + } else { + struct kbase_device const *const kbdev = @@ -160258,6 +170376,11 @@ index 000000000000..fd8329ba9422 + wait_sync_pointer |= (u64)kbase_csf_firmware_cs_output(stream, + CS_STATUS_WAIT_SYNC_POINTER_HI) << 32; + ++ sb_status = kbase_csf_firmware_cs_output(stream, ++ CS_STATUS_SCOREBOARDS); ++ blocked_reason = kbase_csf_firmware_cs_output( ++ stream, CS_STATUS_BLOCKED_REASON); ++ + evt = (u64 *)kbase_phy_alloc_mapping_get(queue->kctx, wait_sync_pointer, &mapping); + if (evt) { + wait_sync_live_value = evt[0]; @@ -160267,43 +170390,31 @@ index 000000000000..fd8329ba9422 + } + + kbasep_csf_scheduler_dump_active_queue_cs_status_wait( -+ file, wait_status, wait_sync_value, -+ wait_sync_live_value, wait_sync_pointer); ++ file, glb_version, wait_status, wait_sync_value, wait_sync_live_value, ++ wait_sync_pointer, sb_status, blocked_reason); ++ /* Dealing with cs_trace */ ++ if (kbase_csf_scheduler_queue_has_trace(queue)) ++ kbasep_csf_scheduler_dump_active_cs_trace(file, stream); ++ else ++ seq_puts(file, "NO CS_TRACE\n"); + } + + seq_puts(file, "\n"); +} + -+/* Waiting timeout for STATUS_UPDATE acknowledgment, in milliseconds */ -+#define CSF_STATUS_UPDATE_TO_MS (100) -+ +static void kbasep_csf_scheduler_dump_active_group(struct seq_file *file, + struct kbase_queue_group *const group) +{ + if (kbase_csf_scheduler_group_get_slot(group) >= 0) { + struct kbase_device *const kbdev = group->kctx->kbdev; -+ unsigned long flags; + u32 ep_c, ep_r; + char exclusive; ++ char idle = 'N'; + struct kbase_csf_cmd_stream_group_info const *const ginfo = + &kbdev->csf.global_iface.groups[group->csg_nr]; -+ long remaining = -+ kbase_csf_timeout_in_jiffies(CSF_STATUS_UPDATE_TO_MS); + u8 slot_priority = + kbdev->csf.scheduler.csg_slots[group->csg_nr].priority; + -+ kbase_csf_scheduler_spin_lock(kbdev, &flags); -+ kbase_csf_firmware_csg_input_mask(ginfo, CSG_REQ, -+ ~kbase_csf_firmware_csg_output(ginfo, CSG_ACK), -+ CSG_REQ_STATUS_UPDATE_MASK); -+ kbase_csf_scheduler_spin_unlock(kbdev, flags); -+ kbase_csf_ring_csg_doorbell(kbdev, group->csg_nr); -+ -+ remaining = wait_event_timeout(kbdev->csf.event_wait, -+ !((kbase_csf_firmware_csg_input_read(ginfo, CSG_REQ) ^ -+ kbase_csf_firmware_csg_output(ginfo, CSG_ACK)) & -+ CSG_REQ_STATUS_UPDATE_MASK), remaining); -+ + ep_c = kbase_csf_firmware_csg_output(ginfo, + CSG_STATUS_EP_CURRENT); + ep_r = kbase_csf_firmware_csg_output(ginfo, CSG_STATUS_EP_REQ); @@ -160315,18 +170426,18 @@ index 000000000000..fd8329ba9422 + else + exclusive = '0'; + -+ if (!remaining) { -+ dev_err(kbdev->dev, -+ "Timed out for STATUS_UPDATE on group %d on slot %d", -+ group->handle, group->csg_nr); ++ if (kbase_csf_firmware_csg_output(ginfo, CSG_STATUS_STATE) & ++ CSG_STATUS_STATE_IDLE_MASK) ++ idle = 'Y'; + ++ if (!test_bit(group->csg_nr, csg_slots_status_updated)) { + seq_printf(file, "*** Warn: Timed out for STATUS_UPDATE on slot %d\n", + group->csg_nr); -+ seq_printf(file, "*** The following group-record is likely stale\n"); ++ seq_puts(file, "*** The following group-record is likely stale\n"); + } + -+ seq_puts(file, "GroupID, CSG NR, CSG Prio, Run State, Priority, C_EP(Alloc/Req), F_EP(Alloc/Req), T_EP(Alloc/Req), Exclusive\n"); -+ seq_printf(file, "%7d, %6d, %8d, %9d, %8d, %11d/%3d, %11d/%3d, %11d/%3d, %9c\n", ++ seq_puts(file, "GroupID, CSG NR, CSG Prio, Run State, Priority, C_EP(Alloc/Req), F_EP(Alloc/Req), T_EP(Alloc/Req), Exclusive, Idle\n"); ++ seq_printf(file, "%7d, %6d, %8d, %9d, %8d, %11d/%3d, %11d/%3d, %11d/%3d, %9c, %4c\n", + group->handle, + group->csg_nr, + slot_priority, @@ -160338,7 +170449,8 @@ index 000000000000..fd8329ba9422 + CSG_STATUS_EP_REQ_FRAGMENT_EP_GET(ep_r), + CSG_STATUS_EP_CURRENT_TILER_EP_GET(ep_c), + CSG_STATUS_EP_REQ_TILER_EP_GET(ep_r), -+ exclusive); ++ exclusive, ++ idle); + } else { + seq_puts(file, "GroupID, CSG NR, Run State, Priority\n"); + seq_printf(file, "%7d, %6d, %9d, %8d\n", @@ -160376,16 +170488,19 @@ index 000000000000..fd8329ba9422 +{ + u32 gr; + struct kbase_context *const kctx = file->private; -+ struct kbase_device *const kbdev = kctx->kbdev; ++ struct kbase_device *kbdev; + + if (WARN_ON(!kctx)) + return -EINVAL; + ++ kbdev = kctx->kbdev; ++ + seq_printf(file, "MALI_CSF_CSG_DEBUGFS_VERSION: v%u\n", + MALI_CSF_CSG_DEBUGFS_VERSION); + + mutex_lock(&kctx->csf.lock); + kbase_csf_scheduler_lock(kbdev); ++ kbase_csf_debugfs_update_active_groups_status(kbdev); + for (gr = 0; gr < MAX_QUEUE_GROUP_NUM; gr++) { + struct kbase_queue_group *const group = + kctx->csf.queue_groups[gr]; @@ -160419,6 +170534,7 @@ index 000000000000..fd8329ba9422 + MALI_CSF_CSG_DEBUGFS_VERSION); + + kbase_csf_scheduler_lock(kbdev); ++ kbase_csf_debugfs_update_active_groups_status(kbdev); + for (csg_nr = 0; csg_nr < num_groups; csg_nr++) { + struct kbase_queue_group *const group = + kbdev->csf.scheduler.csg_slots[csg_nr].resident_group; @@ -160460,11 +170576,7 @@ index 000000000000..fd8329ba9422 +void kbase_csf_queue_group_debugfs_init(struct kbase_context *kctx) +{ + struct dentry *file; -+#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE) + const mode_t mode = 0444; -+#else -+ const mode_t mode = 0400; -+#endif + + if (WARN_ON(!kctx || IS_ERR_OR_NULL(kctx->kctx_dentry))) + return; @@ -160516,14 +170628,100 @@ index 000000000000..fd8329ba9422 + return 0; +} + -+DEFINE_SIMPLE_ATTRIBUTE(kbasep_csf_debugfs_scheduling_timer_enabled_fops, -+ &kbasep_csf_debugfs_scheduling_timer_enabled_get, -+ &kbasep_csf_debugfs_scheduling_timer_enabled_set, -+ "%llu\n"); -+DEFINE_SIMPLE_ATTRIBUTE(kbasep_csf_debugfs_scheduling_timer_kick_fops, -+ NULL, -+ &kbasep_csf_debugfs_scheduling_timer_kick_set, -+ "%llu\n"); ++DEFINE_DEBUGFS_ATTRIBUTE(kbasep_csf_debugfs_scheduling_timer_enabled_fops, ++ &kbasep_csf_debugfs_scheduling_timer_enabled_get, ++ &kbasep_csf_debugfs_scheduling_timer_enabled_set, "%llu\n"); ++DEFINE_DEBUGFS_ATTRIBUTE(kbasep_csf_debugfs_scheduling_timer_kick_fops, NULL, ++ &kbasep_csf_debugfs_scheduling_timer_kick_set, "%llu\n"); ++ ++/** ++ * kbase_csf_debugfs_scheduler_state_get() - Get the state of scheduler. ++ * ++ * @file: Object of the file that is being read. ++ * @user_buf: User buffer that contains the string. ++ * @count: Length of user buffer ++ * @ppos: Offset within file object ++ * ++ * This function will return the current Scheduler state to Userspace ++ * Scheduler may exit that state by the time the state string is received ++ * by the Userspace. ++ * ++ * Return: 0 if Scheduler was found in an unexpected state, or the ++ * size of the state string if it was copied successfully to the ++ * User buffer or a negative value in case of an error. ++ */ ++static ssize_t kbase_csf_debugfs_scheduler_state_get(struct file *file, ++ char __user *user_buf, size_t count, loff_t *ppos) ++{ ++ struct kbase_device *kbdev = file->private_data; ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ const char *state_string; ++ ++ kbase_csf_scheduler_lock(kbdev); ++ state_string = scheduler_state_to_string(kbdev, scheduler->state); ++ kbase_csf_scheduler_unlock(kbdev); ++ ++ if (!state_string) ++ count = 0; ++ ++ return simple_read_from_buffer(user_buf, count, ppos, ++ state_string, strlen(state_string)); ++} ++ ++/** ++ * kbase_csf_debugfs_scheduler_state_set() - Set the state of scheduler. ++ * ++ * @file: Object of the file that is being written to. ++ * @ubuf: User buffer that contains the string. ++ * @count: Length of user buffer ++ * @ppos: Offset within file object ++ * ++ * This function will update the Scheduler state as per the state string ++ * passed by the Userspace. Scheduler may or may not remain in new state ++ * for long. ++ * ++ * Return: Negative value if the string doesn't correspond to a valid Scheduler ++ * state or if copy from user buffer failed, otherwise the length of ++ * the User buffer. ++ */ ++static ssize_t kbase_csf_debugfs_scheduler_state_set(struct file *file, ++ const char __user *ubuf, size_t count, loff_t *ppos) ++{ ++ struct kbase_device *kbdev = file->private_data; ++ char buf[MAX_SCHED_STATE_STRING_LEN]; ++ ssize_t ret = count; ++ ++ CSTD_UNUSED(ppos); ++ ++ count = min_t(size_t, sizeof(buf) - 1, count); ++ if (copy_from_user(buf, ubuf, count)) ++ return -EFAULT; ++ ++ buf[count] = 0; ++ ++ if (sysfs_streq(buf, "SUSPENDED")) ++ kbase_csf_scheduler_pm_suspend(kbdev); ++#ifdef KBASE_PM_RUNTIME ++ else if (sysfs_streq(buf, "SLEEPING")) ++ kbase_csf_scheduler_force_sleep(kbdev); ++#endif ++ else if (sysfs_streq(buf, "INACTIVE")) ++ kbase_csf_scheduler_force_wakeup(kbdev); ++ else { ++ dev_dbg(kbdev->dev, "Bad scheduler state %s", buf); ++ ret = -EINVAL; ++ } ++ ++ return ret; ++} ++ ++static const struct file_operations kbasep_csf_debugfs_scheduler_state_fops = { ++ .owner = THIS_MODULE, ++ .read = kbase_csf_debugfs_scheduler_state_get, ++ .write = kbase_csf_debugfs_scheduler_state_set, ++ .open = simple_open, ++ .llseek = default_llseek, ++}; + +void kbase_csf_debugfs_init(struct kbase_device *kbdev) +{ @@ -160537,9 +170735,11 @@ index 000000000000..fd8329ba9422 + debugfs_create_file("scheduling_timer_kick", 0200, + kbdev->mali_debugfs_directory, kbdev, + &kbasep_csf_debugfs_scheduling_timer_kick_fops); ++ debugfs_create_file("scheduler_state", 0644, ++ kbdev->mali_debugfs_directory, kbdev, ++ &kbasep_csf_debugfs_scheduler_state_fops); + + kbase_csf_tl_reader_debugfs_init(kbdev); -+ kbase_csf_firmware_trace_buffer_debugfs_init(kbdev); +} + +#else @@ -160557,18 +170757,19 @@ index 000000000000..fd8329ba9422 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h new file mode 100755 -index 000000000000..c2e99d386f8c +index 000000000..16a548bf8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h -@@ -0,0 +1,48 @@ +@@ -0,0 +1,54 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -160579,8 +170780,6 @@ index 000000000000..c2e99d386f8c + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CSF_CSG_DEBUGFS_H_ @@ -160608,21 +170807,29 @@ index 000000000000..c2e99d386f8c + */ +void kbase_csf_debugfs_init(struct kbase_device *kbdev); + ++/** ++ * kbase_csf_debugfs_update_active_groups_status() - Update on-slot group statuses ++ * ++ * @kbdev: Pointer to the device ++ */ ++void kbase_csf_debugfs_update_active_groups_status(struct kbase_device *kbdev); ++ +#endif /* _KBASE_CSF_CSG_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h new file mode 100755 -index 000000000000..3829572a1aeb +index 000000000..6fa0e27d6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h -@@ -0,0 +1,883 @@ +@@ -0,0 +1,1666 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -160633,11 +170840,9 @@ index 000000000000..3829572a1aeb + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+/* Definitions (types, defines, etcs) common to the command stream frontend. ++/* Definitions (types, defines, etcs) common to the CSF. + * They are placed here to allow the hierarchy of header files to work. + */ + @@ -160648,6 +170853,13 @@ index 000000000000..3829572a1aeb +#include + +#include "mali_kbase_csf_firmware.h" ++#include "mali_kbase_refcount_defs.h" ++#include "mali_kbase_csf_event.h" ++#include ++ ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++#include ++#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ + +/* Maximum number of KCPU command queues to be created per GPU address space. + */ @@ -160663,8 +170875,16 @@ index 000000000000..3829572a1aeb + */ +#define MAX_TILER_HEAPS (128) + ++#define CSF_FIRMWARE_ENTRY_READ (1ul << 0) ++#define CSF_FIRMWARE_ENTRY_WRITE (1ul << 1) ++#define CSF_FIRMWARE_ENTRY_EXECUTE (1ul << 2) ++#define CSF_FIRMWARE_ENTRY_CACHE_MODE (3ul << 3) ++#define CSF_FIRMWARE_ENTRY_PROTECTED (1ul << 5) ++#define CSF_FIRMWARE_ENTRY_SHARED (1ul << 30) ++#define CSF_FIRMWARE_ENTRY_ZERO (1ul << 31) ++ +/** -+ * enum kbase_csf_bind_state - bind state of the queue ++ * enum kbase_csf_queue_bind_state - bind state of the queue + * + * @KBASE_CSF_QUEUE_UNBOUND: Set when the queue is registered or when the link + * between queue and the group to which it was bound or being bound is removed. @@ -160683,18 +170903,36 @@ index 000000000000..3829572a1aeb + * enum kbase_csf_reset_gpu_state - state of the gpu reset + * + * @KBASE_CSF_RESET_GPU_NOT_PENDING: Set when the GPU reset isn't pending ++ * ++ * @KBASE_CSF_RESET_GPU_PREPARED: Set when kbase_prepare_to_reset_gpu() has ++ * been called. This is just for debugging checks to encourage callers to call ++ * kbase_prepare_to_reset_gpu() before kbase_reset_gpu(). ++ * ++ * @KBASE_CSF_RESET_GPU_COMMITTED: Set when the GPU reset process has been ++ * committed and so will definitely happen, but the procedure to reset the GPU ++ * has not yet begun. Other threads must finish accessing the HW before we ++ * reach %KBASE_CSF_RESET_GPU_HAPPENING. ++ * + * @KBASE_CSF_RESET_GPU_HAPPENING: Set when the GPU reset process is occurring -+ * @KBASE_CSF_RESET_GPU_SILENT: Set when the GPU reset process is occurring, -+ * used when resetting the GPU as part of normal behavior (e.g. when exiting -+ * protected mode). ++ * (silent or otherwise), and is actively accessing the HW. Any changes to the ++ * HW in other threads might get lost, overridden, or corrupted. ++ * ++ * @KBASE_CSF_RESET_GPU_COMMITTED_SILENT: Set when the GPU reset process has ++ * been committed but has not started happening. This is used when resetting ++ * the GPU as part of normal behavior (e.g. when exiting protected mode). ++ * Other threads must finish accessing the HW before we reach ++ * %KBASE_CSF_RESET_GPU_HAPPENING. ++ * + * @KBASE_CSF_RESET_GPU_FAILED: Set when an error is encountered during the + * GPU reset process. No more work could then be executed on GPU, unloading + * the Driver module is the only option. + */ +enum kbase_csf_reset_gpu_state { + KBASE_CSF_RESET_GPU_NOT_PENDING, ++ KBASE_CSF_RESET_GPU_PREPARED, ++ KBASE_CSF_RESET_GPU_COMMITTED, + KBASE_CSF_RESET_GPU_HAPPENING, -+ KBASE_CSF_RESET_GPU_SILENT, ++ KBASE_CSF_RESET_GPU_COMMITTED_SILENT, + KBASE_CSF_RESET_GPU_FAILED, +}; + @@ -160703,17 +170941,17 @@ index 000000000000..3829572a1aeb + * + * @KBASE_CSF_GROUP_INACTIVE: Group is inactive and won't be + * considered by scheduler for running on -+ * command stream group slot. ++ * CSG slot. + * @KBASE_CSF_GROUP_RUNNABLE: Group is in the list of runnable groups + * and is subjected to time-slice based + * scheduling. A start request would be + * sent (or already has been sent) if the -+ * group is assigned the command stream ++ * group is assigned the CS + * group slot for the fist time. -+ * @KBASE_CSF_GROUP_IDLE: Group is currently on a command stream -+ * group slot but all the command streams -+ * bound to the group have become either -+ * idle or waiting on sync object. ++ * @KBASE_CSF_GROUP_IDLE: Group is currently on a CSG slot ++ * but all the CSs bound to the group have ++ * become either idle or waiting on sync ++ * object. + * Group could be evicted from the slot on + * the next tick if there are no spare + * slots left after scheduling non-idle @@ -160727,12 +170965,11 @@ index 000000000000..3829572a1aeb + * KBASE_CSF_GROUP_SUSPENDED_ON_IDLE or + * KBASE_CSF_GROUP_SUSPENDED_ON_WAIT_SYNC + * state. -+ * @KBASE_CSF_GROUP_SUSPENDED: Group was evicted from the command -+ * stream group slot and is not running but -+ * is still in the list of runnable groups -+ * and subjected to time-slice based -+ * scheduling. A resume request would be -+ * sent when a command stream group slot is ++ * @KBASE_CSF_GROUP_SUSPENDED: Group was evicted from the CSG slot ++ * and is not running but is still in the ++ * list of runnable groups and subjected ++ * to time-slice based scheduling. A resume ++ * request would be sent when a CSG slot is + * re-assigned to the group and once the + * resume is complete group would be moved + * back to the RUNNABLE state. @@ -160745,8 +170982,8 @@ index 000000000000..3829572a1aeb + * bound to the group is kicked it would be + * moved to the SUSPENDED state. + * @KBASE_CSF_GROUP_SUSPENDED_ON_WAIT_SYNC: Same as GROUP_SUSPENDED_ON_IDLE -+ * except that at least one command -+ * stream bound to this group was ++ * except that at least one CS ++ * bound to this group was + * waiting for synchronization object + * before the suspension. + * @KBASE_CSF_GROUP_FAULT_EVICTED: Group is evicted from the scheduler due @@ -160802,21 +171039,77 @@ index 000000000000..3829572a1aeb + * enum kbase_csf_scheduler_state - state of the scheduler operational phases. + * + * @SCHED_BUSY: The scheduler is busy performing on tick schedule -+ * operations, the state of command stream group slots ++ * operations, the state of CSG slots + * can't be changed. + * @SCHED_INACTIVE: The scheduler is inactive, it is allowed to modify the -+ * state of command stream group slots by in-cycle ++ * state of CSG slots by in-cycle + * priority scheduling. + * @SCHED_SUSPENDED: The scheduler is in low-power mode with scheduling + * operations suspended and is not holding the power + * management reference. This can happen if the GPU + * becomes idle for a duration exceeding a threshold, + * or due to a system triggered suspend action. ++ * @SCHED_SLEEPING: The scheduler is in low-power mode with scheduling ++ * operations suspended and is not holding the power ++ * management reference. This state is set, only for the ++ * GPUs that supports the sleep feature, when GPU idle ++ * notification is received. The state is changed to ++ * @SCHED_SUSPENDED from the runtime suspend callback ++ * function after the suspend of CSGs. + */ +enum kbase_csf_scheduler_state { + SCHED_BUSY, + SCHED_INACTIVE, + SCHED_SUSPENDED, ++ SCHED_SLEEPING, ++}; ++ ++/** ++ * enum kbase_queue_group_priority - Kbase internal relative priority list. ++ * ++ * @KBASE_QUEUE_GROUP_PRIORITY_REALTIME: The realtime queue group priority. ++ * @KBASE_QUEUE_GROUP_PRIORITY_HIGH: The high queue group priority. ++ * @KBASE_QUEUE_GROUP_PRIORITY_MEDIUM: The medium queue group priority. ++ * @KBASE_QUEUE_GROUP_PRIORITY_LOW: The low queue group priority. ++ * @KBASE_QUEUE_GROUP_PRIORITY_COUNT: The number of priority levels. ++ */ ++enum kbase_queue_group_priority { ++ KBASE_QUEUE_GROUP_PRIORITY_REALTIME = 0, ++ KBASE_QUEUE_GROUP_PRIORITY_HIGH, ++ KBASE_QUEUE_GROUP_PRIORITY_MEDIUM, ++ KBASE_QUEUE_GROUP_PRIORITY_LOW, ++ KBASE_QUEUE_GROUP_PRIORITY_COUNT ++}; ++ ++/** ++ * enum kbase_timeout_selector - The choice of which timeout to get scaled ++ * using the lowest GPU frequency. ++ * @CSF_FIRMWARE_TIMEOUT: Response timeout from CSF firmware. ++ * @CSF_PM_TIMEOUT: Timeout for GPU Power Management to reach the desired ++ * Shader, L2 and MCU state. ++ * @CSF_GPU_RESET_TIMEOUT: Waiting timeout for GPU reset to complete. ++ * @CSF_CSG_SUSPEND_TIMEOUT: Timeout given for all active CSGs to be suspended. ++ * @CSF_FIRMWARE_BOOT_TIMEOUT: Maximum time to wait for firmware to boot. ++ * @CSF_FIRMWARE_PING_TIMEOUT: Maximum time to wait for firmware to respond ++ * to a ping from KBase. ++ * @CSF_SCHED_PROTM_PROGRESS_TIMEOUT: Timeout used to prevent protected mode execution hang. ++ * @MMU_AS_INACTIVE_WAIT_TIMEOUT: Maximum waiting time in ms for the completion ++ * of a MMU operation ++ * @KBASE_TIMEOUT_SELECTOR_COUNT: Number of timeout selectors. Must be last in ++ * the enum. ++ */ ++enum kbase_timeout_selector { ++ CSF_FIRMWARE_TIMEOUT, ++ CSF_PM_TIMEOUT, ++ CSF_GPU_RESET_TIMEOUT, ++ CSF_CSG_SUSPEND_TIMEOUT, ++ CSF_FIRMWARE_BOOT_TIMEOUT, ++ CSF_FIRMWARE_PING_TIMEOUT, ++ CSF_SCHED_PROTM_PROGRESS_TIMEOUT, ++ MMU_AS_INACTIVE_WAIT_TIMEOUT, ++ ++ /* Must be the last in the enum */ ++ KBASE_TIMEOUT_SELECTOR_COUNT +}; + +/** @@ -160836,9 +171129,9 @@ index 000000000000..3829572a1aeb + * + * @kctx: Pointer to the base context with which this GPU command queue + * is associated. -+ * @reg: Pointer to the region allocated from the shared -+ * interface segment for mapping the User mode -+ * input/output pages in MCU firmware address space. ++ * @user_io_gpu_va: The start GPU VA address of this queue's userio pages. Only ++ * valid (i.e. not 0 ) when the queue is enabled and its owner ++ * group has a runtime bound csg_reg (group region). + * @phys: Pointer to the physical pages allocated for the + * pair or User mode input/output page + * @user_io_addr: Pointer to the permanent kernel mapping of User mode @@ -160857,87 +171150,131 @@ index 000000000000..3829572a1aeb + * @refcount: Reference count, stands for the number of times the queue + * has been referenced. The reference is taken when it is + * created, when it is bound to the group and also when the -+ * @oom_event_work or @fault_event_work work item is queued ++ * @oom_event_work work item is queued + * for it. + * @group: Pointer to the group to which this queue is bound. -+ * @queue_reg: Pointer to the VA region allocated for command -+ * stream buffer. ++ * @queue_reg: Pointer to the VA region allocated for CS buffer. + * @oom_event_work: Work item corresponding to the out of memory event for + * chunked tiler heap being used for this queue. -+ * @fault_event_work: Work item corresponding to the firmware fault event. -+ * @base_addr: Base address of the command stream buffer. -+ * @size: Size of the command stream buffer. ++ * @base_addr: Base address of the CS buffer. ++ * @size: Size of the CS buffer. + * @priority: Priority of this queue within the group. -+ * @bind_state: Bind state of the queue. -+ * @csi_index: The ID of the assigned command stream hardware interface. -+ * @enabled: Indicating whether the command stream is running, or not. -+ * @status_wait: Value of CS_STATUS_WAIT register of the command stream will -+ * be kept when the command stream gets blocked by sync wait. ++ * @bind_state: Bind state of the queue as enum @kbase_csf_queue_bind_state ++ * @csi_index: The ID of the assigned CS hardware interface. ++ * @enabled: Indicating whether the CS is running, or not. ++ * @status_wait: Value of CS_STATUS_WAIT register of the CS will ++ * be kept when the CS gets blocked by sync wait. + * CS_STATUS_WAIT provides information on conditions queue is + * blocking on. This is set when the group, to which queue is + * bound, is suspended after getting blocked, i.e. in + * KBASE_CSF_GROUP_SUSPENDED_ON_WAIT_SYNC state. -+ * @sync_ptr: Value of CS_STATUS_WAIT_SYNC_POINTER register of the command -+ * stream will be kept when the command stream gets blocked by ++ * @sync_ptr: Value of CS_STATUS_WAIT_SYNC_POINTER register of the CS ++ * will be kept when the CS gets blocked by + * sync wait. CS_STATUS_WAIT_SYNC_POINTER contains the address + * of synchronization object being waited on. + * Valid only when @status_wait is set. -+ * @sync_value: Value of CS_STATUS_WAIT_SYNC_VALUE register of the command -+ * stream will be kept when the command stream gets blocked by ++ * @sync_value: Value of CS_STATUS_WAIT_SYNC_VALUE register of the CS ++ * will be kept when the CS gets blocked by + * sync wait. CS_STATUS_WAIT_SYNC_VALUE contains the value + * tested against the synchronization object. + * Valid only when @status_wait is set. ++ * @sb_status: Value indicates which of the scoreboard entries in the queue ++ * are non-zero ++ * @blocked_reason: Value shows if the queue is blocked, and if so, ++ * the reason why it is blocked ++ * @trace_buffer_base: CS trace buffer base address. ++ * @trace_offset_ptr: Pointer to the CS trace buffer offset variable. ++ * @trace_buffer_size: CS trace buffer size for the queue. ++ * @trace_cfg: CS trace configuration parameters. + * @error: GPU command queue fatal information to pass to user space. ++ * @cs_error_work: Work item to handle the CS fatal event reported for this ++ * queue or the CS fault event if dump on fault is enabled ++ * and acknowledgment for CS fault event needs to be done ++ * after dumping is complete. ++ * @cs_error_info: Records additional information about the CS fatal event or ++ * about CS fault event if dump on fault is enabled. ++ * @cs_error: Records information about the CS fatal event or ++ * about CS fault event if dump on fault is enabled. ++ * @cs_error_fatal: Flag to track if the CS fault or CS fatal event occurred. ++ * @pending: Indicating whether the queue has new submitted work. ++ * @extract_ofs: The current EXTRACT offset, this is only updated when handling ++ * the GLB IDLE IRQ if the idle timeout value is non-0 in order ++ * to help detect a queue's true idle status. ++ * @saved_cmd_ptr: The command pointer value for the GPU queue, saved when the ++ * group to which queue is bound is suspended. ++ * This can be useful in certain cases to know that till which ++ * point the execution reached in the Linear command buffer. + */ +struct kbase_queue { + struct kbase_context *kctx; -+ struct kbase_va_region *reg; ++ u64 user_io_gpu_va; + struct tagged_addr phys[2]; + char *user_io_addr; + u64 handle; + int doorbell_nr; + unsigned long db_file_offset; + struct list_head link; -+ atomic_t refcount; ++ kbase_refcount_t refcount; + struct kbase_queue_group *group; + struct kbase_va_region *queue_reg; + struct work_struct oom_event_work; -+ struct work_struct fault_event_work; + u64 base_addr; + u32 size; + u8 priority; -+ u8 bind_state; + s8 csi_index; ++ enum kbase_csf_queue_bind_state bind_state; + bool enabled; + u32 status_wait; + u64 sync_ptr; + u32 sync_value; ++ u32 sb_status; ++ u32 blocked_reason; ++ u64 trace_buffer_base; ++ u64 trace_offset_ptr; ++ u32 trace_buffer_size; ++ u32 trace_cfg; + struct kbase_csf_notification error; ++ struct work_struct cs_error_work; ++ u64 cs_error_info; ++ u32 cs_error; ++ bool cs_error_fatal; ++ atomic_t pending; ++ u64 extract_ofs; ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ u64 saved_cmd_ptr; ++#endif /* CONFIG_DEBUG_FS */ +}; + +/** + * struct kbase_normal_suspend_buffer - Object representing a normal + * suspend buffer for queue group. -+ * @reg: Memory region allocated for the normal-mode suspend buffer. ++ * @gpu_va: The start GPU VA address of the bound suspend buffer. Note, this ++ * field is only valid when the owner group has a region bound at ++ * runtime. + * @phy: Array of physical memory pages allocated for the normal- + * mode suspend buffer. + */ +struct kbase_normal_suspend_buffer { -+ struct kbase_va_region *reg; ++ u64 gpu_va; + struct tagged_addr *phy; +}; + +/** + * struct kbase_protected_suspend_buffer - Object representing a protected + * suspend buffer for queue group. -+ * @reg: Memory region allocated for the protected-mode suspend buffer. ++ * @gpu_va: The start GPU VA address of the bound protected mode suspend buffer. ++ * Note, this field is only valid when the owner group has a region ++ * bound at runtime. + * @pma: Array of pointer to protected mode allocations containing + * information about memory pages allocated for protected mode + * suspend buffer. ++ * @alloc_retries: Number of times we retried allocing physical pages ++ * for protected suspend buffers. + */ +struct kbase_protected_suspend_buffer { -+ struct kbase_va_region *reg; ++ u64 gpu_va; + struct protected_memory_allocation **pma; ++ u8 alloc_retries; +}; + +/** @@ -160952,9 +171289,9 @@ index 000000000000..3829572a1aeb + * buffer. Protected-mode suspend buffer that is + * used for group context switch. + * @handle: Handle which identifies this queue group. -+ * @csg_nr: Number/index of the command stream group to -+ * which this queue group is mapped; KBASEP_CSG_NR_INVALID -+ * indicates that the queue group is not scheduled. ++ * @csg_nr: Number/index of the CSG to which this queue group is ++ * mapped; KBASEP_CSG_NR_INVALID indicates that the queue ++ * group is not scheduled. + * @priority: Priority of the queue group, 0 being the highest, + * BASE_QUEUE_GROUP_PRIORITY_COUNT - 1 being the lowest. + * @tiler_max: Maximum number of tiler endpoints the group is allowed @@ -160963,30 +171300,40 @@ index 000000000000..3829572a1aeb + * allowed to use. + * @compute_max: Maximum number of compute endpoints the group is + * allowed to use. ++ * @csi_handlers: Requested CSI exception handler flags for the group. + * @tiler_mask: Mask of tiler endpoints the group is allowed to use. + * @fragment_mask: Mask of fragment endpoints the group is allowed to use. + * @compute_mask: Mask of compute endpoints the group is allowed to use. ++ * @group_uid: 32-bit wide unsigned identifier for the group, unique ++ * across all kbase devices and contexts. + * @link: Link to this queue group in the 'runnable_groups' list of + * the corresponding kctx. + * @link_to_schedule: Link to this queue group in the list of prepared groups + * to be scheduled, if the group is runnable/suspended. + * If the group is idle or waiting for CQS, it would be a + * link to the list of idle/blocked groups list. -+ * @timer_event_work: Work item corresponding to the event generated when a task -+ * started by a queue in this group takes too long to execute -+ * on an endpoint. + * @run_state: Current state of the queue group. + * @prepared_seq_num: Indicates the position of queue group in the list of + * prepared groups to be scheduled. ++ * @scan_seq_num: Scan out sequence number before adjusting for dynamic ++ * idle conditions. It is used for setting a group's ++ * onslot priority. It could differ from prepared_seq_number ++ * when there are idle groups. + * @faulted: Indicates that a GPU fault occurred for the queue group. + * This flag persists until the fault has been queued to be + * reported to userspace. ++ * @cs_unrecoverable: Flag to unblock the thread waiting for CSG termination in ++ * case of CS_FATAL_EXCEPTION_TYPE_CS_UNRECOVERABLE ++ * @reevaluate_idle_status : Flag set when work is submitted for the normal group ++ * or it becomes unblocked during protected mode. The ++ * flag helps Scheduler confirm if the group actually ++ * became non idle or not. + * @bound_queues: Array of registered queues bound to this queue group. + * @doorbell_nr: Index of the hardware doorbell page assigned to the + * group. + * @protm_event_work: Work item corresponding to the protected mode entry + * event for this queue. -+ * @protm_pending_bitmap: Bit array to keep a track of command streams that ++ * @protm_pending_bitmap: Bit array to keep a track of CSs that + * have pending protected mode entry requests. + * @error_fatal: An error of type BASE_GPU_QUEUE_GROUP_ERROR_FATAL to be + * returned to userspace if such an error has occurred. @@ -160994,6 +171341,18 @@ index 000000000000..3829572a1aeb + * to be returned to userspace if such an error has occurred. + * @error_tiler_oom: An error of type BASE_GPU_QUEUE_GROUP_ERROR_TILER_HEAP_OOM + * to be returned to userspace if such an error has occurred. ++ * @timer_event_work: Work item to handle the progress timeout fatal event ++ * for the group. ++ * @deschedule_deferred_cnt: Counter keeping a track of the number of threads ++ * that tried to deschedule the group and had to defer ++ * the descheduling due to the dump on fault. ++ * @csg_reg: An opaque pointer to the runtime bound shared regions. It is ++ * dynamically managed by the scheduler and can be NULL if the ++ * group is off-slot. ++ * @csg_reg_bind_retries: Runtime MCU shared region map operation attempted counts. ++ * It is accumulated on consecutive mapping attempt failures. On ++ * reaching a preset limit, the group is regarded as suffered ++ * a fatal error and triggers a fatal error notification. + */ +struct kbase_queue_group { + struct kbase_context *kctx; @@ -161006,17 +171365,22 @@ index 000000000000..3829572a1aeb + u8 tiler_max; + u8 fragment_max; + u8 compute_max; ++ u8 csi_handlers; + + u64 tiler_mask; + u64 fragment_mask; + u64 compute_mask; + ++ u32 group_uid; ++ + struct list_head link; + struct list_head link_to_schedule; -+ struct work_struct timer_event_work; + enum kbase_csf_group_state run_state; + u32 prepared_seq_num; ++ u32 scan_seq_num; + bool faulted; ++ bool cs_unrecoverable; ++ bool reevaluate_idle_status; + + struct kbase_queue *bound_queues[MAX_SUPPORTED_STREAMS_PER_GROUP]; + @@ -161027,6 +171391,20 @@ index 000000000000..3829572a1aeb + struct kbase_csf_notification error_fatal; + struct kbase_csf_notification error_timeout; + struct kbase_csf_notification error_tiler_oom; ++ ++ struct work_struct timer_event_work; ++ ++ /** ++ * @dvs_buf: Address and size of scratch memory. ++ * ++ * Used to store intermediate DVS data by the GPU. ++ */ ++ u64 dvs_buf; ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ u32 deschedule_deferred_cnt; ++#endif ++ void *csg_reg; ++ u8 csg_reg_bind_retries; +}; + +/** @@ -161036,10 +171414,10 @@ index 000000000000..3829572a1aeb + * @lock: Lock preventing concurrent access to @array and the @in_use bitmap. + * @array: Array of pointers to kernel CPU command queues. + * @in_use: Bitmap which indicates which kernel CPU command queues are in use. -+ * @wq: Dedicated workqueue for processing kernel CPU command queues. -+ * @num_cmds: The number of commands that have been enqueued across -+ * all the KCPU command queues. This could be used as a -+ * timestamp to determine the command's enqueueing time. ++ * @cmd_seq_num: The sequence number assigned to an enqueued command, ++ * in incrementing order (older commands shall have a ++ * smaller number). ++ * @jit_lock: Lock to serialise JIT operations. + * @jit_cmds_head: A list of the just-in-time memory commands, both + * allocate & free, in submission order, protected + * by kbase_csf_kcpu_queue_context.lock. @@ -161052,19 +171430,31 @@ index 000000000000..3829572a1aeb + struct mutex lock; + struct kbase_kcpu_command_queue *array[KBASEP_MAX_KCPU_QUEUES]; + DECLARE_BITMAP(in_use, KBASEP_MAX_KCPU_QUEUES); -+ struct workqueue_struct *wq; -+ u64 num_cmds; ++ atomic64_t cmd_seq_num; + ++ struct mutex jit_lock; + struct list_head jit_cmds_head; + struct list_head jit_blocked_queues; +}; + +/** -+ * struct kbase_csf_heap_context_allocator - Allocator of heap contexts ++ * struct kbase_csf_cpu_queue_context - Object representing the cpu queue ++ * information. + * -+ * Heap context structures are allocated by the kernel for use by the firmware. -+ * The current implementation subdivides a single GPU memory region for use as -+ * a sparse array. ++ * @buffer: Buffer containing CPU queue information provided by Userspace. ++ * @buffer_size: The size of @buffer. ++ * @dump_req_status: Indicates the current status for CPU queues dump request. ++ * @dump_cmp: Dumping cpu queue completion event. ++ */ ++struct kbase_csf_cpu_queue_context { ++ char *buffer; ++ size_t buffer_size; ++ atomic_t dump_req_status; ++ struct completion dump_cmp; ++}; ++ ++/** ++ * struct kbase_csf_heap_context_allocator - Allocator of heap contexts + * + * @kctx: Pointer to the kbase context with which this allocator is + * associated. @@ -161076,6 +171466,12 @@ index 000000000000..3829572a1aeb + * @lock: Lock preventing concurrent access to the @in_use bitmap. + * @in_use: Bitmap that indicates which heap context structures are currently + * allocated (in @region). ++ * @heap_context_size_aligned: Size of a heap context structure, in bytes, ++ * aligned to GPU cacheline size. ++ * ++ * Heap context structures are allocated by the kernel for use by the firmware. ++ * The current implementation subdivides a single GPU memory region for use as ++ * a sparse array. + */ +struct kbase_csf_heap_context_allocator { + struct kbase_context *kctx; @@ -161083,24 +171479,52 @@ index 000000000000..3829572a1aeb + u64 gpu_va; + struct mutex lock; + DECLARE_BITMAP(in_use, MAX_TILER_HEAPS); ++ u32 heap_context_size_aligned; +}; + +/** + * struct kbase_csf_tiler_heap_context - Object representing the tiler heaps + * context for a GPU address space. + * -+ * This contains all of the command-stream front-end state relating to chunked -+ * tiler heaps for one @kbase_context. It is not the same as a heap context -+ * structure allocated by the kernel for use by the firmware. ++ * @lock: Lock to prevent the concurrent access to tiler heaps (after the ++ * initialization), a tiler heap can be terminated whilst an OoM ++ * event is being handled for it. ++ * @list: List of tiler heaps. ++ * @ctx_alloc: Allocator for heap context structures. ++ * @nr_of_heaps: Total number of tiler heaps that were added during the ++ * life time of the context. + * -+ * @lock: Lock preventing concurrent access to the tiler heaps. -+ * @list: List of tiler heaps. -+ * @ctx_alloc: Allocator for heap context structures. ++ * This contains all of the CSF state relating to chunked tiler heaps for one ++ * @kbase_context. It is not the same as a heap context structure allocated by ++ * the kernel for use by the firmware. + */ +struct kbase_csf_tiler_heap_context { + struct mutex lock; + struct list_head list; + struct kbase_csf_heap_context_allocator ctx_alloc; ++ u64 nr_of_heaps; ++}; ++ ++/** ++ * struct kbase_csf_ctx_heap_reclaim_info - Object representing the data section of ++ * a kctx for tiler heap reclaim manger ++ * @mgr_link: Link for hooking up to the heap reclaim manger's kctx lists ++ * @nr_freed_pages: Number of freed pages from the the kctx, after its attachment ++ * to the reclaim manager. This is used for tracking reclaim's ++ * free operation progress. ++ * @nr_est_unused_pages: Estimated number of pages that could be freed for the kctx ++ * when all its CSGs are off-slot, on attaching to the reclaim ++ * manager. ++ * @on_slot_grps: Number of on-slot groups from this kctx. In principle, if a ++ * kctx has groups on-slot, the scheduler will detach it from ++ * the tiler heap reclaim manager, i.e. no tiler heap memory ++ * reclaiming operations on the kctx. ++ */ ++struct kbase_csf_ctx_heap_reclaim_info { ++ struct list_head mgr_link; ++ u32 nr_freed_pages; ++ u32 nr_est_unused_pages; ++ u8 on_slot_grps; +}; + +/** @@ -161108,7 +171532,7 @@ index 000000000000..3829572a1aeb + * context for a GPU address space. + * + * @runnable_groups: Lists of runnable GPU command queue groups in the kctx, -+ * one per queue group priority level. ++ * one per queue group relative-priority level. + * @num_runnable_grps: Total number of runnable groups across all priority + * levels in @runnable_groups. + * @idle_wait_groups: A list of GPU command queue groups in which all enabled @@ -161117,27 +171541,85 @@ index 000000000000..3829572a1aeb + * @num_idle_wait_grps: Length of the @idle_wait_groups list. + * @sync_update_wq: Dedicated workqueue to process work items corresponding + * to the sync_update events by sync_set/sync_add -+ * instruction execution on command streams bound to groups ++ * instruction execution on CSs bound to groups + * of @idle_wait_groups list. + * @sync_update_work: work item to process the sync_update events by + * sync_set / sync_add instruction execution on command + * streams bound to groups of @idle_wait_groups list. + * @ngrp_to_schedule: Number of groups added for the context to the + * 'groups_to_schedule' list of scheduler instance. ++ * @heap_info: Heap reclaim information data of the kctx. As the ++ * reclaim action needs to be coordinated with the scheduler ++ * operations, any manipulations on the data needs holding ++ * the scheduler's mutex lock. + */ +struct kbase_csf_scheduler_context { -+ struct list_head runnable_groups[BASE_QUEUE_GROUP_PRIORITY_COUNT]; ++ struct list_head runnable_groups[KBASE_QUEUE_GROUP_PRIORITY_COUNT]; + u32 num_runnable_grps; + struct list_head idle_wait_groups; + u32 num_idle_wait_grps; + struct workqueue_struct *sync_update_wq; + struct work_struct sync_update_work; + u32 ngrp_to_schedule; ++ struct kbase_csf_ctx_heap_reclaim_info heap_info; ++}; ++ ++/** ++ * enum kbase_csf_event_callback_action - return type for CSF event callbacks. ++ * ++ * @KBASE_CSF_EVENT_CALLBACK_FIRST: Never set explicitly. ++ * It doesn't correspond to any action or type of event callback. ++ * ++ * @KBASE_CSF_EVENT_CALLBACK_KEEP: The callback will remain registered. ++ * ++ * @KBASE_CSF_EVENT_CALLBACK_REMOVE: The callback will be removed ++ * immediately upon return. ++ * ++ * @KBASE_CSF_EVENT_CALLBACK_LAST: Never set explicitly. ++ * It doesn't correspond to any action or type of event callback. ++ */ ++enum kbase_csf_event_callback_action { ++ KBASE_CSF_EVENT_CALLBACK_FIRST = 0, ++ KBASE_CSF_EVENT_CALLBACK_KEEP, ++ KBASE_CSF_EVENT_CALLBACK_REMOVE, ++ KBASE_CSF_EVENT_CALLBACK_LAST, ++}; ++ ++/** ++ * struct kbase_csf_event - Object representing CSF event and error ++ * ++ * @callback_list: List of callbacks which are registered to serve CSF ++ * events. ++ * @error_list: List for CS fatal errors in CSF context. ++ * Link of fatal error is &struct_kbase_csf_notification.link. ++ * @lock: Lock protecting access to @callback_list and ++ * @error_list. ++ */ ++struct kbase_csf_event { ++ struct list_head callback_list; ++ struct list_head error_list; ++ spinlock_t lock; +}; + +/** -+ * struct kbase_csf_context - Object representing command-stream front-end -+ * for a GPU address space. ++ * struct kbase_csf_user_reg_context - Object containing members to manage the mapping ++ * of USER Register page for a context. ++ * ++ * @vma: Pointer to the VMA corresponding to the virtual mapping ++ * of the USER register page. ++ * @file_offset: File offset value that is assigned to userspace mapping ++ * of the USER Register page. It is in page units. ++ * @link: Links the context to the device list when mapping is pointing to ++ * either the dummy or the real Register page. ++ */ ++struct kbase_csf_user_reg_context { ++ struct vm_area_struct *vma; ++ u32 file_offset; ++ struct list_head link; ++}; ++ ++/** ++ * struct kbase_csf_context - Object representing CSF for a GPU address space. + * + * @event_pages_head: A list of pages allocated for the event memory used by + * the synchronization objects. A separate list would help @@ -161151,7 +171633,7 @@ index 000000000000..3829572a1aeb + * deferred manner of a pair of User mode input/output pages + * & a hardware doorbell page. + * The pages are allocated when a GPU command queue is -+ * bound to a command stream group in kbase_csf_queue_bind. ++ * bound to a CSG in kbase_csf_queue_bind. + * This helps returning unique handles to Userspace from + * kbase_csf_queue_bind and later retrieving the pointer to + * queue in the mmap handler. @@ -161167,23 +171649,18 @@ index 000000000000..3829572a1aeb + * userspace mapping created for them on bind operation + * hasn't been removed. + * @kcpu_queues: Kernel CPU command queues. -+ * @event_lock: Lock protecting access to @event_callback_list -+ * @event_callback_list: List of callbacks which are registered to serve CSF -+ * events. ++ * @event: CSF event object. + * @tiler_heaps: Chunked tiler memory heaps. + * @wq: Dedicated workqueue to process work items corresponding + * to the OoM events raised for chunked tiler heaps being + * used by GPU command queues, and progress timeout events. + * @link: Link to this csf context in the 'runnable_kctxs' list of + * the scheduler instance -+ * @user_reg_vma: Pointer to the vma corresponding to the virtual mapping -+ * of the USER register page. Currently used only for sanity -+ * checking. + * @sched: Object representing the scheduler's context -+ * @error_list: List for command stream fatal errors in this context. -+ * Link of fatal error is -+ * &struct_kbase_csf_notification.link. -+ * @lock needs to be held to access to this list. ++ * @pending_submission_work: Work item to process pending kicked GPU command queues. ++ * @cpu_queue: CPU queue information. Only be available when DEBUG_FS ++ * is enabled. ++ * @user_reg: Collective information to support mapping to USER Register page. + */ +struct kbase_csf_context { + struct list_head event_pages_head; @@ -161194,14 +171671,16 @@ index 000000000000..3829572a1aeb + struct kbase_queue_group *queue_groups[MAX_QUEUE_GROUP_NUM]; + struct list_head queue_list; + struct kbase_csf_kcpu_queue_context kcpu_queues; -+ spinlock_t event_lock; -+ struct list_head event_callback_list; ++ struct kbase_csf_event event; + struct kbase_csf_tiler_heap_context tiler_heaps; + struct workqueue_struct *wq; + struct list_head link; -+ struct vm_area_struct *user_reg_vma; + struct kbase_csf_scheduler_context sched; -+ struct list_head error_list; ++ struct work_struct pending_submission_work; ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ struct kbase_csf_cpu_queue_context cpu_queue; ++#endif ++ struct kbase_csf_user_reg_context user_reg; +}; + +/** @@ -161210,23 +171689,28 @@ index 000000000000..3829572a1aeb + * @workq: Workqueue to execute the GPU reset work item @work. + * @work: Work item for performing the GPU reset. + * @wait: Wait queue used to wait for the GPU reset completion. ++ * @sem: RW Semaphore to ensure no other thread attempts to use the ++ * GPU whilst a reset is in process. Unlike traditional ++ * semaphores and wait queues, this allows Linux's lockdep ++ * mechanism to check for deadlocks involving reset waits. + * @state: Tracks if the GPU reset is in progress or not. ++ * The state is represented by enum @kbase_csf_reset_gpu_state. + */ +struct kbase_csf_reset_gpu { + struct workqueue_struct *workq; + struct work_struct work; + wait_queue_head_t wait; ++ struct rw_semaphore sem; + atomic_t state; +}; + +/** + * struct kbase_csf_csg_slot - Object containing members for tracking the state -+ * of command stream group slots. -+ * @resident_group: pointer to the queue group that is resident on the -+ * command stream group slot. -+ * @state: state of the slot as per enum kbase_csf_csg_slot_state. ++ * of CSG slots. ++ * @resident_group: pointer to the queue group that is resident on the CSG slot. ++ * @state: state of the slot as per enum @kbase_csf_csg_slot_state. + * @trigger_jiffies: value of jiffies when change in slot state is recorded. -+ * @priority: dynamic priority assigned to command stream group slot. ++ * @priority: dynamic priority assigned to CSG slot. + */ +struct kbase_csf_csg_slot { + struct kbase_queue_group *resident_group; @@ -161236,9 +171720,51 @@ index 000000000000..3829572a1aeb +}; + +/** ++ * struct kbase_csf_sched_heap_reclaim_mgr - Object for managing tiler heap reclaim ++ * kctx lists inside the CSF device's scheduler. ++ * ++ * @heap_reclaim: Tiler heap reclaim shrinker object. ++ * @ctx_lists: Array of kctx lists, size matching CSG defined priorities. The ++ * lists track the kctxs attached to the reclaim manager. ++ * @unused_pages: Estimated number of unused pages from the @ctxlist array. The ++ * number is indicative for use with reclaim shrinker's count method. ++ */ ++struct kbase_csf_sched_heap_reclaim_mgr { ++ struct shrinker heap_reclaim; ++ struct list_head ctx_lists[KBASE_QUEUE_GROUP_PRIORITY_COUNT]; ++ atomic_t unused_pages; ++}; ++ ++/** ++ * struct kbase_csf_mcu_shared_regions - Control data for managing the MCU shared ++ * interface segment regions for scheduler ++ * operations ++ * ++ * @array_csg_regs: Base pointer of an internally created array_csg_regs[]. ++ * @unused_csg_regs: List contains unused csg_regs items. When an item is bound to a ++ * group that is placed onto on-slot by the scheduler, it is dropped ++ * from the list (i.e busy active). The Scheduler will put an active ++ * item back when it's becoming off-slot (not in use). ++ * @dummy_phys: An array of dummy phys[nr_susp_pages] pages for use with normal ++ * and pmode suspend buffers, as a default replacement of a CSG's pages ++ * for the MMU mapping when the csg_reg is not bound to a group. ++ * @pma_phys: Pre-allocated array phy[nr_susp_pages] for transitional use with ++ * protected suspend buffer MMU map operations. ++ * @userio_mem_rd_flags: Userio input page's read access mapping configuration flags. ++ * @dummy_phys_allocated: Indicating the @p dummy_phy page is allocated when true. ++ */ ++struct kbase_csf_mcu_shared_regions { ++ void *array_csg_regs; ++ struct list_head unused_csg_regs; ++ struct tagged_addr *dummy_phys; ++ struct tagged_addr *pma_phys; ++ unsigned long userio_mem_rd_flags; ++ bool dummy_phys_allocated; ++}; ++ ++/** + * struct kbase_csf_scheduler - Object representing the scheduler used for -+ * command-stream front-end for an instance of -+ * GPU platform device. ++ * CSF for an instance of GPU platform device. + * @lock: Lock to serialize the scheduler operations and + * access to the data members. + * @interrupt_lock: Lock to protect members accessed by interrupt @@ -161249,26 +171775,29 @@ index 000000000000..3829572a1aeb + * @doorbell_inuse_bitmap: Bitmap of hardware doorbell pages keeping track of + * which pages are currently available for assignment + * to clients. -+ * @csg_inuse_bitmap: Bitmap to keep a track of command stream group slots ++ * @csg_inuse_bitmap: Bitmap to keep a track of CSG slots + * that are currently in use. -+ * @csg_slots: The array for tracking the state of command stream ++ * @csg_slots: The array for tracking the state of CS + * group slots. + * @runnable_kctxs: List of Kbase contexts that have runnable command + * queue groups. + * @groups_to_schedule: List of runnable queue groups prepared on every -+ * scheduler tick. The dynamic priority of the command -+ * stream group slot assigned to a group will depend -+ * upon the position of group in the list. ++ * scheduler tick. The dynamic priority of the CSG ++ * slot assigned to a group will depend upon the ++ * position of group in the list. + * @ngrp_to_schedule: Number of groups in the @groups_to_schedule list, + * incremented when a group is added to the list, used + * to record the position of group in the list. + * @num_active_address_spaces: Number of GPU address space slots that would get + * used to program the groups in @groups_to_schedule -+ * list on all the available command stream group ++ * list on all the available CSG + * slots. -+ * @num_csg_slots_for_tick: Number of command stream group slots that can be ++ * @num_csg_slots_for_tick: Number of CSG slots that can be + * active in the given tick/tock. This depends on the + * value of @num_active_address_spaces. ++ * @remaining_tick_slots: Tracking the number of remaining available slots ++ * for @num_csg_slots_for_tick during the scheduling ++ * operation in a tick/tock. + * @idle_groups_to_schedule: List of runnable queue groups, in which all GPU + * command queues became idle or are waiting for + * synchronization object, prepared on every @@ -161276,11 +171805,14 @@ index 000000000000..3829572a1aeb + * appended to the tail of @groups_to_schedule list + * after the scan out so that the idle groups aren't + * preferred for scheduling over the non-idle ones. ++ * @csg_scan_count_for_tick: CSG scanout count for assign the scan_seq_num for ++ * each scanned out group during scheduling operation ++ * in a tick/tock. + * @total_runnable_grps: Total number of runnable groups across all KCTXs. + * @csgs_events_enable_mask: Use for temporary masking off asynchronous events + * from firmware (such as OoM events) before a group + * is suspended. -+ * @csg_slots_idle_mask: Bit array for storing the mask of command stream ++ * @csg_slots_idle_mask: Bit array for storing the mask of CS + * group slots for which idle notification was + * received. + * @csg_slots_prio_update: Bit array for tracking slots that have an on-slot @@ -161294,39 +171826,79 @@ index 000000000000..3829572a1aeb + * then it will only perform scheduling under the + * influence of external factors e.g., IRQs, IOCTLs. + * @wq: Dedicated workqueue to execute the @tick_work. -+ * @tick_work: Work item that would perform the schedule on tick -+ * operation to implement the time slice based -+ * scheduling. ++ * @tick_timer: High-resolution timer employed to schedule tick ++ * workqueue items (kernel-provided delayed_work ++ * items do not use hrtimer and for some reason do ++ * not provide sufficiently reliable periodicity). ++ * @tick_work: Work item that performs the "schedule on tick" ++ * operation to implement timeslice-based scheduling. + * @tock_work: Work item that would perform the schedule on tock + * operation to implement the asynchronous scheduling. ++ * @pending_tock_work: Indicates that the tock work item should re-execute ++ * once it's finished instead of going back to sleep. + * @ping_work: Work item that would ping the firmware at regular -+ * intervals, only if there is a single active command -+ * stream group slot, to check if firmware is alive -+ * and would initiate a reset if the ping request -+ * isn't acknowledged. ++ * intervals, only if there is a single active CSG ++ * slot, to check if firmware is alive and would ++ * initiate a reset if the ping request isn't ++ * acknowledged. + * @top_ctx: Pointer to the Kbase context corresponding to the + * @top_grp. + * @top_grp: Pointer to queue group inside @groups_to_schedule + * list that was assigned the highest slot priority. -+ * @head_slot_priority: The dynamic slot priority to be used for the -+ * queue group at the head of @groups_to_schedule -+ * list. Once the queue group is assigned a command -+ * stream group slot, it is removed from the list and -+ * priority is decremented. -+ * @tock_pending_request: A "tock" request is pending: a group that is not -+ * currently on the GPU demands to be scheduled. + * @active_protm_grp: Indicates if firmware has been permitted to let GPU + * enter protected mode with the given group. On exit + * from protected mode the pointer is reset to NULL. ++ * This pointer is set and PROTM_ENTER request is sent ++ * atomically with @interrupt_lock held. ++ * This pointer being set doesn't necessarily indicates ++ * that GPU is in protected mode, kbdev->protected_mode ++ * needs to be checked for that. ++ * @idle_wq: Workqueue for executing GPU idle notification ++ * handler. + * @gpu_idle_work: Work item for facilitating the scheduler to bring + * the GPU to a low-power mode on becoming idle. -+ * @non_idle_suspended_grps: Count of suspended queue groups not idle. ++ * @fast_gpu_idle_handling: Indicates whether to relax many of the checks ++ * normally done in the GPU idle worker. This is ++ * set to true when handling the GLB IDLE IRQ if the ++ * idle hysteresis timeout is 0, since it makes it ++ * possible to receive this IRQ before the extract ++ * offset is published (which would cause more ++ * extensive GPU idle checks to fail). ++ * @gpu_no_longer_idle: Effective only when the GPU idle worker has been ++ * queued for execution, this indicates whether the ++ * GPU has become non-idle since the last time the ++ * idle notification was received. ++ * @non_idle_offslot_grps: Count of off-slot non-idle groups. Reset during ++ * the scheduler active phase in a tick. It then ++ * tracks the count of non-idle groups across all the ++ * other phases. ++ * @non_idle_scanout_grps: Count on the non-idle groups in the scan-out ++ * list at the scheduling prepare stage. + * @pm_active_count: Count indicating if the scheduler is owning a power + * management reference count. Reference is taken when + * the count becomes 1 and is dropped when the count + * becomes 0. It is used to enable the power up of MCU + * after GPU and L2 cache have been powered up. So when + * this count is zero, MCU will not be powered up. ++ * @csg_scheduling_period_ms: Duration of Scheduling tick in milliseconds. ++ * @tick_timer_active: Indicates whether the @tick_timer is effectively ++ * active or not, as the callback function of ++ * @tick_timer will enqueue @tick_work only if this ++ * flag is true. This is mainly useful for the case ++ * when scheduling tick needs to be advanced from ++ * interrupt context, without actually deactivating ++ * the @tick_timer first and then enqueing @tick_work. ++ * @tick_protm_pending_seq: Scan out sequence number of the group that has ++ * protected mode execution pending for the queue(s) ++ * bound to it and will be considered first for the ++ * protected mode execution compared to other such ++ * groups. It is updated on every tick/tock. ++ * @interrupt_lock is used to serialize the access. ++ * @protm_enter_time: GPU protected mode enter time. ++ * @reclaim_mgr: CSGs tiler heap manager object. ++ * @mcu_regs_data: Scheduler MCU shared regions data for managing the ++ * shared interface mappings for on-slot queues and ++ * CSG suspend buffers. + */ +struct kbase_csf_scheduler { + struct mutex lock; @@ -161340,7 +171912,9 @@ index 000000000000..3829572a1aeb + u32 ngrp_to_schedule; + u32 num_active_address_spaces; + u32 num_csg_slots_for_tick; ++ u32 remaining_tick_slots; + struct list_head idle_groups_to_schedule; ++ u32 csg_scan_count_for_tick; + u32 total_runnable_grps; + DECLARE_BITMAP(csgs_events_enable_mask, MAX_SUPPORTED_CSGS); + DECLARE_BITMAP(csg_slots_idle_mask, MAX_SUPPORTED_CSGS); @@ -161348,25 +171922,35 @@ index 000000000000..3829572a1aeb + unsigned long last_schedule; + bool timer_enabled; + struct workqueue_struct *wq; -+ struct delayed_work tick_work; ++ struct hrtimer tick_timer; ++ struct work_struct tick_work; + struct delayed_work tock_work; ++ atomic_t pending_tock_work; + struct delayed_work ping_work; + struct kbase_context *top_ctx; + struct kbase_queue_group *top_grp; -+ u8 head_slot_priority; -+ bool tock_pending_request; + struct kbase_queue_group *active_protm_grp; -+ struct delayed_work gpu_idle_work; -+ atomic_t non_idle_suspended_grps; ++ struct workqueue_struct *idle_wq; ++ struct work_struct gpu_idle_work; ++ bool fast_gpu_idle_handling; ++ atomic_t gpu_no_longer_idle; ++ atomic_t non_idle_offslot_grps; ++ u32 non_idle_scanout_grps; + u32 pm_active_count; ++ unsigned int csg_scheduling_period_ms; ++ bool tick_timer_active; ++ u32 tick_protm_pending_seq; ++ ktime_t protm_enter_time; ++ struct kbase_csf_sched_heap_reclaim_mgr reclaim_mgr; ++ struct kbase_csf_mcu_shared_regions mcu_regs_data; +}; + -+/** ++/* + * Number of GPU cycles per unit of the global progress timeout. + */ +#define GLB_PROGRESS_TIMER_TIMEOUT_SCALE ((u64)1024) + -+/** ++/* + * Maximum value of the global progress timeout. + */ +#define GLB_PROGRESS_TIMER_TIMEOUT_MAX \ @@ -161374,9 +171958,346 @@ index 000000000000..3829572a1aeb + GLB_PROGRESS_TIMER_TIMEOUT_SHIFT) * \ + GLB_PROGRESS_TIMER_TIMEOUT_SCALE) + ++/* ++ * Default GLB_PWROFF_TIMER_TIMEOUT value in unit of micro-seconds. ++ */ ++#define DEFAULT_GLB_PWROFF_TIMEOUT_US (800) ++ ++/* ++ * In typical operations, the management of the shader core power transitions ++ * is delegated to the MCU/firmware. However, if the host driver is configured ++ * to take direct control, one needs to disable the MCU firmware GLB_PWROFF ++ * timer. ++ */ ++#define DISABLE_GLB_PWROFF_TIMER (0) ++ ++/* Index of the GPU_ACTIVE counter within the CSHW counter block */ ++#define GPU_ACTIVE_CNT_IDX (4) ++ ++/* ++ * Maximum number of sessions that can be managed by the IPA Control component. ++ */ ++#if MALI_UNIT_TEST ++#define KBASE_IPA_CONTROL_MAX_SESSIONS ((size_t)8) ++#else ++#define KBASE_IPA_CONTROL_MAX_SESSIONS ((size_t)2) ++#endif ++ ++/** ++ * enum kbase_ipa_core_type - Type of counter block for performance counters ++ * ++ * @KBASE_IPA_CORE_TYPE_CSHW: CS Hardware counters. ++ * @KBASE_IPA_CORE_TYPE_MEMSYS: Memory System counters. ++ * @KBASE_IPA_CORE_TYPE_TILER: Tiler counters. ++ * @KBASE_IPA_CORE_TYPE_SHADER: Shader Core counters. ++ * @KBASE_IPA_CORE_TYPE_NUM: Number of core types. ++ */ ++enum kbase_ipa_core_type { ++ KBASE_IPA_CORE_TYPE_CSHW = 0, ++ KBASE_IPA_CORE_TYPE_MEMSYS, ++ KBASE_IPA_CORE_TYPE_TILER, ++ KBASE_IPA_CORE_TYPE_SHADER, ++ KBASE_IPA_CORE_TYPE_NUM ++}; ++ ++/* ++ * Number of configurable counters per type of block on the IPA Control ++ * interface. ++ */ ++#define KBASE_IPA_CONTROL_NUM_BLOCK_COUNTERS ((size_t)8) ++ ++/* ++ * Total number of configurable counters existing on the IPA Control interface. ++ */ ++#define KBASE_IPA_CONTROL_MAX_COUNTERS \ ++ ((size_t)KBASE_IPA_CORE_TYPE_NUM * KBASE_IPA_CONTROL_NUM_BLOCK_COUNTERS) ++ ++/** ++ * struct kbase_ipa_control_prfcnt - Session for a single performance counter ++ * ++ * @latest_raw_value: Latest raw value read from the counter. ++ * @scaling_factor: Factor raw value shall be multiplied by. ++ * @accumulated_diff: Partial sum of scaled and normalized values from ++ * previous samples. This represent all the values ++ * that were read before the latest raw value. ++ * @type: Type of counter block for performance counter. ++ * @select_idx: Index of the performance counter as configured on ++ * the IPA Control interface. ++ * @gpu_norm: Indicating whether values shall be normalized by ++ * GPU frequency. If true, returned values represent ++ * an interval of time expressed in seconds (when the ++ * scaling factor is set to 1). ++ */ ++struct kbase_ipa_control_prfcnt { ++ u64 latest_raw_value; ++ u64 scaling_factor; ++ u64 accumulated_diff; ++ enum kbase_ipa_core_type type; ++ u8 select_idx; ++ bool gpu_norm; ++}; ++ ++/** ++ * struct kbase_ipa_control_session - Session for an IPA Control client ++ * ++ * @prfcnts: Sessions for individual performance counters. ++ * @num_prfcnts: Number of performance counters. ++ * @active: Indicates whether this slot is in use or not ++ * @last_query_time: Time of last query, in ns ++ * @protm_time: Amount of time (in ns) that GPU has been in protected ++ */ ++struct kbase_ipa_control_session { ++ struct kbase_ipa_control_prfcnt prfcnts[KBASE_IPA_CONTROL_MAX_COUNTERS]; ++ size_t num_prfcnts; ++ bool active; ++ u64 last_query_time; ++ u64 protm_time; ++}; ++ ++/** ++ * struct kbase_ipa_control_prfcnt_config - Performance counter configuration ++ * ++ * @idx: Index of the performance counter inside the block, as specified ++ * in the GPU architecture. ++ * @refcount: Number of client sessions bound to this counter. ++ * ++ * This structure represents one configurable performance counter of ++ * the IPA Control interface. The entry may be mapped to a specific counter ++ * by one or more client sessions. The counter is considered to be unused ++ * if it isn't part of any client session. ++ */ ++struct kbase_ipa_control_prfcnt_config { ++ u8 idx; ++ u8 refcount; ++}; ++ ++/** ++ * struct kbase_ipa_control_prfcnt_block - Block of performance counters ++ * ++ * @select: Current performance counter configuration. ++ * @num_available_counters: Number of counters that are not already configured. ++ * ++ */ ++struct kbase_ipa_control_prfcnt_block { ++ struct kbase_ipa_control_prfcnt_config select[KBASE_IPA_CONTROL_NUM_BLOCK_COUNTERS]; ++ size_t num_available_counters; ++}; ++ ++/** ++ * struct kbase_ipa_control - Manager of the IPA Control interface. ++ * ++ * @blocks: Current configuration of performance counters ++ * for the IPA Control interface. ++ * @sessions: State of client sessions, storing information ++ * like performance counters the client subscribed to ++ * and latest value read from each counter. ++ * @lock: Spinlock to serialize access by concurrent clients. ++ * @rtm_listener_data: Private data for allocating a GPU frequency change ++ * listener. ++ * @num_active_sessions: Number of sessions opened by clients. ++ * @cur_gpu_rate: Current GPU top-level operating frequency, in Hz. ++ * @rtm_listener_data: Private data for allocating a GPU frequency change ++ * listener. ++ * @protm_start: Time (in ns) at which the GPU entered protected mode ++ */ ++struct kbase_ipa_control { ++ struct kbase_ipa_control_prfcnt_block blocks[KBASE_IPA_CORE_TYPE_NUM]; ++ struct kbase_ipa_control_session sessions[KBASE_IPA_CONTROL_MAX_SESSIONS]; ++ spinlock_t lock; ++ void *rtm_listener_data; ++ size_t num_active_sessions; ++ u32 cur_gpu_rate; ++ u64 protm_start; ++}; ++ ++/** ++ * struct kbase_csf_firmware_interface - Interface in the MCU firmware ++ * ++ * @node: Interface objects are on the kbase_device:csf.firmware_interfaces ++ * list using this list_head to link them ++ * @phys: Array of the physical (tagged) addresses making up this interface ++ * @reuse_pages: Flag used to identify if the FW interface entry reuses ++ * physical pages allocated for another FW interface entry. ++ * @is_small_page: Flag used to identify if small pages are used for ++ * the FW interface entry. ++ * @name: NULL-terminated string naming the interface ++ * @num_pages: Number of entries in @phys and @pma (and length of the interface) ++ * @num_pages_aligned: Same as @num_pages except for the case when @is_small_page ++ * is false and @reuse_pages is false and therefore will be ++ * aligned to NUM_4K_PAGES_IN_2MB_PAGE. ++ * @virtual: Starting GPU virtual address this interface is mapped at ++ * @flags: bitmask of CSF_FIRMWARE_ENTRY_* conveying the interface attributes ++ * @data_start: Offset into firmware image at which the interface data starts ++ * @data_end: Offset into firmware image at which the interface data ends ++ * @virtual_exe_start: Starting GPU execution virtual address of this interface ++ * @kernel_map: A kernel mapping of the memory or NULL if not required to be ++ * mapped in the kernel ++ * @pma: Array of pointers to protected memory allocations. ++ */ ++struct kbase_csf_firmware_interface { ++ struct list_head node; ++ struct tagged_addr *phys; ++ bool reuse_pages; ++ bool is_small_page; ++ char *name; ++ u32 num_pages; ++ u32 num_pages_aligned; ++ u32 virtual; ++ u32 flags; ++ u32 data_start; ++ u32 data_end; ++ u32 virtual_exe_start; ++ void *kernel_map; ++ struct protected_memory_allocation **pma; ++}; ++ ++/* ++ * struct kbase_csf_hwcnt - Object containing members for handling the dump of ++ * HW counters. ++ * ++ * @request_pending: Flag set when HWC requested and used for HWC sample ++ * done interrupt. ++ * @enable_pending: Flag set when HWC enable status change and used for ++ * enable done interrupt. ++ */ ++struct kbase_csf_hwcnt { ++ bool request_pending; ++ bool enable_pending; ++}; ++ ++/* ++ * struct kbase_csf_mcu_fw - Object containing device loaded MCU firmware data. ++ * ++ * @size: Loaded firmware data size. Meaningful only when the ++ * other field @p data is not NULL. ++ * @data: Pointer to the device retained firmware data. If NULL ++ * means not loaded yet or error in loading stage. ++ */ ++struct kbase_csf_mcu_fw { ++ size_t size; ++ u8 *data; ++}; ++ ++/* ++ * Firmware log polling period. ++ */ ++#define KBASE_CSF_FIRMWARE_LOG_POLL_PERIOD_MS 25 ++ ++/** ++ * enum kbase_csf_firmware_log_mode - Firmware log operating mode ++ * ++ * @KBASE_CSF_FIRMWARE_LOG_MODE_MANUAL: Manual mode, firmware log can be read ++ * manually by the userspace (and it will also be dumped automatically into ++ * dmesg on GPU reset). ++ * ++ * @KBASE_CSF_FIRMWARE_LOG_MODE_AUTO_PRINT: Automatic printing mode, firmware log ++ * will be periodically emptied into dmesg, manual reading through debugfs is ++ * disabled. ++ */ ++enum kbase_csf_firmware_log_mode { ++ KBASE_CSF_FIRMWARE_LOG_MODE_MANUAL, ++ KBASE_CSF_FIRMWARE_LOG_MODE_AUTO_PRINT ++}; ++ ++/** ++ * struct kbase_csf_firmware_log - Object containing members for handling firmware log. ++ * ++ * @mode: Firmware log operating mode. ++ * @busy: Indicating whether a firmware log operation is in progress. ++ * @poll_work: Work item that would poll firmware log buffer ++ * at regular intervals to perform any periodic ++ * activities required by current log mode. ++ * @dump_buf: Buffer used for dumping the log. ++ * @func_call_list_va_start: Virtual address of the start of the call list of FW log functions. ++ * @func_call_list_va_end: Virtual address of the end of the call list of FW log functions. ++ */ ++struct kbase_csf_firmware_log { ++ enum kbase_csf_firmware_log_mode mode; ++ atomic_t busy; ++ struct delayed_work poll_work; ++ u8 *dump_buf; ++ u32 func_call_list_va_start; ++ u32 func_call_list_va_end; ++}; ++ ++/** ++ * struct kbase_csf_firmware_core_dump - Object containing members for handling ++ * firmware core dump. ++ * ++ * @mcu_regs_addr: GPU virtual address of the start of the MCU registers buffer ++ * in Firmware. ++ * @version: Version of the FW image header core dump data format. Bits ++ * 7:0 specify version minor and 15:8 specify version major. ++ * @available: Flag to identify if the FW core dump buffer is available. ++ * True if entry is available in the FW image header and version ++ * is supported, False otherwise. ++ */ ++struct kbase_csf_firmware_core_dump { ++ u32 mcu_regs_addr; ++ u16 version; ++ bool available; ++}; ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++/** ++ * struct kbase_csf_dump_on_fault - Faulty information to deliver to the daemon ++ * ++ * @error_code: Error code. ++ * @kctx_tgid: tgid value of the Kbase context for which the fault happened. ++ * @kctx_id: id of the Kbase context for which the fault happened. ++ * @enabled: Flag to indicate that 'csf_fault' debugfs has been opened ++ * so dump on fault is enabled. ++ * @fault_wait_wq: Waitqueue on which user space client is blocked till kbase ++ * reports a fault. ++ * @dump_wait_wq: Waitqueue on which kbase threads are blocked till user space client ++ * completes the dump on fault. ++ * @lock: Lock to protect this struct members from concurrent access. ++ */ ++struct kbase_csf_dump_on_fault { ++ enum dumpfault_error_type error_code; ++ u32 kctx_tgid; ++ u32 kctx_id; ++ atomic_t enabled; ++ wait_queue_head_t fault_wait_wq; ++ wait_queue_head_t dump_wait_wq; ++ spinlock_t lock; ++}; ++#endif /* CONFIG_DEBUG_FS*/ ++ ++/** ++ * struct kbase_csf_user_reg - Object containing members to manage the mapping ++ * of USER Register page for all contexts ++ * ++ * @dummy_page: Address of a dummy page that is mapped in place ++ * of the real USER Register page just before the GPU ++ * is powered down. The USER Register page is mapped ++ * in the address space of every process, that created ++ * a Base context, to enable the access to LATEST_FLUSH ++ * register from userspace. ++ * @filp: Pointer to a dummy file, that along with @file_offset, ++ * facilitates the use of unique file offset for the userspace mapping ++ * created for USER Register page. ++ * The userspace mapping is made to point to this file ++ * inside the mmap handler. ++ * @file_offset: Counter that is incremented every time Userspace creates a mapping of ++ * USER Register page, to provide a unique file offset range for ++ * @filp file, so that the CPU PTE of the Userspace mapping can be zapped ++ * through the kernel function unmap_mapping_range(). ++ * It is incremented in page units. ++ * @list: Linked list to maintain user processes(contexts) ++ * having the mapping to USER Register page. ++ * It's protected by &kbase_csf_device.reg_lock. ++ */ ++struct kbase_csf_user_reg { ++ struct tagged_addr dummy_page; ++ struct file *filp; ++ u32 file_offset; ++ struct list_head list; ++}; ++ +/** -+ * struct kbase_csf - Object representing command-stream front-end for an -+ * instance of GPU platform device. ++ * struct kbase_csf_device - Object representing CSF for an instance of GPU ++ * platform device. + * + * @mcu_mmu: MMU page tables for the MCU firmware + * @firmware_interfaces: List of interfaces defined in the firmware image @@ -161414,7 +172335,7 @@ index 000000000000..3829572a1aeb + * @reg_lock: Lock to serialize the MCU firmware related actions + * that affect all contexts such as allocation of + * regions from shared interface area, assignment of -+ * of hardware doorbell pages, assignment of CSGs, ++ * hardware doorbell pages, assignment of CSGs, + * sending global requests. + * @event_wait: Wait queue to wait for receiving csf events, i.e. + * the interrupt from CSF firmware, or scheduler state @@ -161423,7 +172344,7 @@ index 000000000000..3829572a1aeb + * @global_iface: The result of parsing the global interface + * structure set up by the firmware, including the + * CSGs, CSs, and their properties -+ * @scheduler: The command stream scheduler instance. ++ * @scheduler: The CS scheduler instance. + * @reset: Contain members required for GPU reset handling. + * @progress_timeout: Maximum number of GPU clock cycles without forward + * progress to allow, for all tasks running on @@ -161437,11 +172358,50 @@ index 000000000000..3829572a1aeb + * in GPU reset has completed. + * @firmware_reload_needed: Flag for indicating that the firmware needs to be + * reloaded as part of the GPU reset action. ++ * @firmware_full_reload_needed: Flag for indicating that the firmware needs to ++ * be fully re-loaded. This may be set when the ++ * boot or re-init of MCU fails after a successful ++ * soft reset. ++ * @firmware_hctl_core_pwr: Flag for indicating that the host diver is in ++ * charge of the shader core's power transitions, and ++ * the mcu_core_pwroff timeout feature is disabled ++ * (i.e. configured 0 in the register field). If ++ * false, the control is delegated to the MCU. + * @firmware_reload_work: Work item for facilitating the procedural actions + * on reloading the firmware. + * @glb_init_request_pending: Flag to indicate that Global requests have been + * sent to the FW after MCU was re-enabled and their + * acknowledgement is pending. ++ * @fw_error_work: Work item for handling the firmware internal error ++ * fatal event. ++ * @ipa_control: IPA Control component manager. ++ * @mcu_core_pwroff_dur_us: Sysfs attribute for the glb_pwroff timeout input ++ * in unit of micro-seconds. The firmware does not use ++ * it directly. ++ * @mcu_core_pwroff_dur_count: The counterpart of the glb_pwroff timeout input ++ * in interface required format, ready to be used ++ * directly in the firmware. ++ * @mcu_core_pwroff_reg_shadow: The actual value that has been programed into ++ * the glb_pwoff register. This is separated from ++ * the @p mcu_core_pwroff_dur_count as an update ++ * to the latter is asynchronous. ++ * @gpu_idle_hysteresis_us: Sysfs attribute for the idle hysteresis time ++ * window in unit of microseconds. The firmware does not ++ * use it directly. ++ * @gpu_idle_dur_count: The counterpart of the hysteresis time window in ++ * interface required format, ready to be used ++ * directly in the firmware. ++ * @fw_timeout_ms: Timeout value (in milliseconds) used when waiting ++ * for any request sent to the firmware. ++ * @hwcnt: Contain members required for handling the dump of ++ * HW counters. ++ * @fw: Copy of the loaded MCU firmware image. ++ * @fw_log: Contain members required for handling firmware log. ++ * @fw_core_dump: Contain members required for handling the firmware ++ * core dump. ++ * @dof: Structure for dump on fault. ++ * @user_reg: Collective information to support the mapping to ++ * USER Register page for user processes. + */ +struct kbase_csf_device { + struct kbase_mmu_table mcu_mmu; @@ -161466,8 +172426,32 @@ index 000000000000..3829572a1aeb + bool firmware_inited; + bool firmware_reloaded; + bool firmware_reload_needed; ++ bool firmware_full_reload_needed; ++ bool firmware_hctl_core_pwr; + struct work_struct firmware_reload_work; + bool glb_init_request_pending; ++ struct work_struct fw_error_work; ++ struct kbase_ipa_control ipa_control; ++ u32 mcu_core_pwroff_dur_us; ++ u32 mcu_core_pwroff_dur_count; ++ u32 mcu_core_pwroff_reg_shadow; ++ u32 gpu_idle_hysteresis_us; ++ u32 gpu_idle_dur_count; ++ unsigned int fw_timeout_ms; ++ struct kbase_csf_hwcnt hwcnt; ++ struct kbase_csf_mcu_fw fw; ++ struct kbase_csf_firmware_log fw_log; ++ struct kbase_csf_firmware_core_dump fw_core_dump; ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ struct kbase_csf_dump_on_fault dof; ++#endif /* CONFIG_DEBUG_FS */ ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++ /** ++ * @coresight: Coresight device structure. ++ */ ++ struct kbase_debug_coresight_device coresight; ++#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ ++ struct kbase_csf_user_reg user_reg; +}; + +/** @@ -161484,6 +172468,10 @@ index 000000000000..3829572a1aeb + * @bf_data: Data relating to Bus fault. + * @gf_data: Data relating to GPU fault. + * @current_setup: Stores the MMU configuration for this address space. ++ * @is_unresponsive: Flag to indicate MMU is not responding. ++ * Set if a MMU command isn't completed within ++ * &kbase_device:mmu_as_inactive_wait_time_ms. ++ * Clear by kbase_ctx_sched_restore_all_as() after GPU reset completes. + */ +struct kbase_as { + int number; @@ -161495,23 +172483,473 @@ index 000000000000..3829572a1aeb + struct kbase_fault bf_data; + struct kbase_fault gf_data; + struct kbase_mmu_setup current_setup; ++ bool is_unresponsive; +}; + +#endif /* _KBASE_CSF_DEFS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.c +new file mode 100644 +index 000000000..49e529384 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.c +@@ -0,0 +1,265 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++#include ++#include "mali_kbase_csf_event.h" ++ ++/** ++ * struct kbase_csf_event_cb - CSF event callback. ++ * ++ * @link: Link to the rest of the list. ++ * @kctx: Pointer to the Kbase context this event belongs to. ++ * @callback: Callback function to call when a CSF event is signalled. ++ * @param: Parameter to pass to the callback function. ++ * ++ * This structure belongs to the list of events which is part of a Kbase ++ * context, and describes a callback function with a custom parameter to pass ++ * to it when a CSF event is signalled. ++ */ ++struct kbase_csf_event_cb { ++ struct list_head link; ++ struct kbase_context *kctx; ++ kbase_csf_event_callback *callback; ++ void *param; ++}; ++ ++int kbase_csf_event_wait_add(struct kbase_context *kctx, ++ kbase_csf_event_callback *callback, void *param) ++{ ++ int err = -ENOMEM; ++ struct kbase_csf_event_cb *event_cb = ++ kzalloc(sizeof(struct kbase_csf_event_cb), GFP_KERNEL); ++ ++ if (event_cb) { ++ unsigned long flags; ++ ++ event_cb->kctx = kctx; ++ event_cb->callback = callback; ++ event_cb->param = param; ++ ++ spin_lock_irqsave(&kctx->csf.event.lock, flags); ++ list_add_tail(&event_cb->link, &kctx->csf.event.callback_list); ++ dev_dbg(kctx->kbdev->dev, ++ "Added event handler %pK with param %pK\n", event_cb, ++ event_cb->param); ++ spin_unlock_irqrestore(&kctx->csf.event.lock, flags); ++ ++ err = 0; ++ } ++ ++ return err; ++} ++ ++void kbase_csf_event_wait_remove(struct kbase_context *kctx, ++ kbase_csf_event_callback *callback, void *param) ++{ ++ struct kbase_csf_event_cb *event_cb; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kctx->csf.event.lock, flags); ++ ++ list_for_each_entry(event_cb, &kctx->csf.event.callback_list, link) { ++ if ((event_cb->callback == callback) && (event_cb->param == param)) { ++ list_del(&event_cb->link); ++ dev_dbg(kctx->kbdev->dev, ++ "Removed event handler %pK with param %pK\n", ++ event_cb, event_cb->param); ++ kfree(event_cb); ++ break; ++ } ++ } ++ spin_unlock_irqrestore(&kctx->csf.event.lock, flags); ++} ++ ++static void sync_update_notify_gpu(struct kbase_context *kctx) ++{ ++ bool can_notify_gpu; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, flags); ++ can_notify_gpu = kctx->kbdev->pm.backend.gpu_powered; ++#ifdef KBASE_PM_RUNTIME ++ if (kctx->kbdev->pm.backend.gpu_sleep_mode_active) ++ can_notify_gpu = false; ++#endif ++ ++ if (can_notify_gpu) { ++ kbase_csf_ring_doorbell(kctx->kbdev, CSF_KERNEL_DOORBELL_NR); ++ KBASE_KTRACE_ADD(kctx->kbdev, CSF_SYNC_UPDATE_NOTIFY_GPU_EVENT, kctx, 0u); ++ } ++ ++ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, flags); ++} ++ ++void kbase_csf_event_signal(struct kbase_context *kctx, bool notify_gpu) ++{ ++ struct kbase_csf_event_cb *event_cb, *next_event_cb; ++ unsigned long flags; ++ ++ dev_dbg(kctx->kbdev->dev, ++ "Signal event (%s GPU notify) for context %pK\n", ++ notify_gpu ? "with" : "without", (void *)kctx); ++ ++ /* First increment the signal count and wake up event thread. ++ */ ++ atomic_set(&kctx->event_count, 1); ++ kbase_event_wakeup(kctx); ++ ++ /* Signal the CSF firmware. This is to ensure that pending command ++ * stream synch object wait operations are re-evaluated. ++ * Write to GLB_DOORBELL would suffice as spec says that all pending ++ * synch object wait operations are re-evaluated on a write to any ++ * CS_DOORBELL/GLB_DOORBELL register. ++ */ ++ if (notify_gpu) ++ sync_update_notify_gpu(kctx); ++ ++ /* Now invoke the callbacks registered on backend side. ++ * Allow item removal inside the loop, if requested by the callback. ++ */ ++ spin_lock_irqsave(&kctx->csf.event.lock, flags); ++ ++ list_for_each_entry_safe( ++ event_cb, next_event_cb, &kctx->csf.event.callback_list, link) { ++ enum kbase_csf_event_callback_action action; ++ ++ dev_dbg(kctx->kbdev->dev, ++ "Calling event handler %pK with param %pK\n", ++ (void *)event_cb, event_cb->param); ++ action = event_cb->callback(event_cb->param); ++ if (action == KBASE_CSF_EVENT_CALLBACK_REMOVE) { ++ list_del(&event_cb->link); ++ kfree(event_cb); ++ } ++ } ++ ++ spin_unlock_irqrestore(&kctx->csf.event.lock, flags); ++} ++ ++void kbase_csf_event_term(struct kbase_context *kctx) ++{ ++ struct kbase_csf_event_cb *event_cb, *next_event_cb; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kctx->csf.event.lock, flags); ++ ++ list_for_each_entry_safe( ++ event_cb, next_event_cb, &kctx->csf.event.callback_list, link) { ++ list_del(&event_cb->link); ++ dev_warn(kctx->kbdev->dev, ++ "Removed event handler %pK with param %pK\n", ++ (void *)event_cb, event_cb->param); ++ kfree(event_cb); ++ } ++ ++ WARN(!list_empty(&kctx->csf.event.error_list), ++ "Error list not empty for ctx %d_%d\n", kctx->tgid, kctx->id); ++ ++ spin_unlock_irqrestore(&kctx->csf.event.lock, flags); ++} ++ ++void kbase_csf_event_init(struct kbase_context *const kctx) ++{ ++ INIT_LIST_HEAD(&kctx->csf.event.callback_list); ++ INIT_LIST_HEAD(&kctx->csf.event.error_list); ++ spin_lock_init(&kctx->csf.event.lock); ++} ++ ++void kbase_csf_event_remove_error(struct kbase_context *kctx, ++ struct kbase_csf_notification *error) ++{ ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kctx->csf.event.lock, flags); ++ list_del_init(&error->link); ++ spin_unlock_irqrestore(&kctx->csf.event.lock, flags); ++} ++ ++bool kbase_csf_event_read_error(struct kbase_context *kctx, ++ struct base_csf_notification *event_data) ++{ ++ struct kbase_csf_notification *error_data = NULL; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kctx->csf.event.lock, flags); ++ if (likely(!list_empty(&kctx->csf.event.error_list))) { ++ error_data = list_first_entry(&kctx->csf.event.error_list, ++ struct kbase_csf_notification, link); ++ list_del_init(&error_data->link); ++ *event_data = error_data->data; ++ dev_dbg(kctx->kbdev->dev, "Dequeued error %pK in context %pK\n", ++ (void *)error_data, (void *)kctx); ++ } ++ spin_unlock_irqrestore(&kctx->csf.event.lock, flags); ++ return !!error_data; ++} ++ ++void kbase_csf_event_add_error(struct kbase_context *const kctx, ++ struct kbase_csf_notification *const error, ++ struct base_csf_notification const *const data) ++{ ++ unsigned long flags; ++ ++ if (WARN_ON(!kctx)) ++ return; ++ ++ if (WARN_ON(!error)) ++ return; ++ ++ if (WARN_ON(!data)) ++ return; ++ ++ spin_lock_irqsave(&kctx->csf.event.lock, flags); ++ if (list_empty(&error->link)) { ++ error->data = *data; ++ list_add_tail(&error->link, &kctx->csf.event.error_list); ++ dev_dbg(kctx->kbdev->dev, ++ "Added error %pK of type %d in context %pK\n", ++ (void *)error, data->type, (void *)kctx); ++ } else { ++ dev_dbg(kctx->kbdev->dev, "Error %pK of type %d already pending in context %pK", ++ (void *)error, error->data.type, (void *)kctx); ++ } ++ spin_unlock_irqrestore(&kctx->csf.event.lock, flags); ++} ++ ++bool kbase_csf_event_error_pending(struct kbase_context *kctx) ++{ ++ bool error_pending = false; ++ unsigned long flags; ++ ++ /* Withhold the error event if the dump on fault is ongoing. ++ * This would prevent the Userspace from taking error recovery actions ++ * (which can potentially affect the state that is being dumped). ++ * Event handling thread would eventually notice the error event. ++ */ ++ if (unlikely(!kbase_debug_csf_fault_dump_complete(kctx->kbdev))) ++ return false; ++ ++ spin_lock_irqsave(&kctx->csf.event.lock, flags); ++ error_pending = !list_empty(&kctx->csf.event.error_list); ++ ++ dev_dbg(kctx->kbdev->dev, "%s error is pending in context %pK\n", ++ error_pending ? "An" : "No", (void *)kctx); ++ ++ spin_unlock_irqrestore(&kctx->csf.event.lock, flags); ++ ++ return error_pending; ++} +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.h +new file mode 100644 +index 000000000..52122a9ef +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.h +@@ -0,0 +1,171 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#ifndef _KBASE_CSF_EVENT_H_ ++#define _KBASE_CSF_EVENT_H_ ++ ++#include ++#include ++ ++struct kbase_context; ++struct kbase_csf_event; ++enum kbase_csf_event_callback_action; ++ ++/** ++ * kbase_csf_event_callback - type for callback functions to be ++ * called upon CSF events. ++ * @param: Generic parameter to pass to the callback function. ++ * ++ * This is the type of callback functions that can be registered ++ * for CSF events. These function calls shall be triggered by any call ++ * to kbase_csf_event_signal. ++ * ++ * Return: KBASE_CSF_EVENT_CALLBACK_KEEP if the callback should remain ++ * registered, or KBASE_CSF_EVENT_CALLBACK_REMOVE if it should be removed. ++ */ ++typedef enum kbase_csf_event_callback_action kbase_csf_event_callback(void *param); ++ ++/** ++ * kbase_csf_event_wait_add - Add a CSF event callback ++ * ++ * @kctx: The Kbase context the @callback should be registered to. ++ * @callback: The callback function to register. ++ * @param: Custom parameter to be passed to the @callback function. ++ * ++ * This function adds an event callback to the list of CSF event callbacks ++ * belonging to a given Kbase context, to be triggered when a CSF event is ++ * signalled by kbase_csf_event_signal. ++ * ++ * Return: 0 on success, or negative on failure. ++ */ ++int kbase_csf_event_wait_add(struct kbase_context *kctx, ++ kbase_csf_event_callback *callback, void *param); ++ ++/** ++ * kbase_csf_event_wait_remove - Remove a CSF event callback ++ * ++ * @kctx: The kbase context the @callback should be removed from. ++ * @callback: The callback function to remove. ++ * @param: Custom parameter that would have been passed to the @p callback ++ * function. ++ * ++ * This function removes an event callback from the list of CSF event callbacks ++ * belonging to a given Kbase context. ++ */ ++void kbase_csf_event_wait_remove(struct kbase_context *kctx, ++ kbase_csf_event_callback *callback, void *param); ++ ++/** ++ * kbase_csf_event_term - Removes all CSF event callbacks ++ * ++ * @kctx: The kbase context for which CSF event callbacks have to be removed. ++ * ++ * This function empties the list of CSF event callbacks belonging to a given ++ * Kbase context. ++ */ ++void kbase_csf_event_term(struct kbase_context *kctx); ++ ++/** ++ * kbase_csf_event_signal - Signal a CSF event ++ * ++ * @kctx: The kbase context whose CSF event callbacks shall be triggered. ++ * @notify_gpu: Flag to indicate if CSF firmware should be notified of the ++ * signaling of event that happened on the Driver side, either ++ * the signal came from userspace or from kcpu queues. ++ * ++ * This function triggers all the CSF event callbacks that are registered to ++ * a given Kbase context, and also signals the event handling thread of ++ * userspace driver waiting for the CSF event. ++ */ ++void kbase_csf_event_signal(struct kbase_context *kctx, bool notify_gpu); ++ ++static inline void kbase_csf_event_signal_notify_gpu(struct kbase_context *kctx) ++{ ++ kbase_csf_event_signal(kctx, true); ++} ++ ++static inline void kbase_csf_event_signal_cpu_only(struct kbase_context *kctx) ++{ ++ kbase_csf_event_signal(kctx, false); ++} ++ ++/** ++ * kbase_csf_event_init - Initialize event object ++ * ++ * @kctx: The kbase context whose event object will be initialized. ++ * ++ * This function initializes the event object. ++ */ ++void kbase_csf_event_init(struct kbase_context *const kctx); ++ ++struct kbase_csf_notification; ++struct base_csf_notification; ++/** ++ * kbase_csf_event_read_error - Read and remove an error from error list in event ++ * ++ * @kctx: The kbase context. ++ * @event_data: Caller-provided buffer to copy the fatal error to ++ * ++ * This function takes the CS fatal error from context's ordered ++ * error_list, copies its contents to @event_data. ++ * ++ * Return: true if error is read out or false if there is no error in error list. ++ */ ++bool kbase_csf_event_read_error(struct kbase_context *kctx, ++ struct base_csf_notification *event_data); ++ ++/** ++ * kbase_csf_event_add_error - Add an error into event error list ++ * ++ * @kctx: Address of a base context associated with a GPU address space. ++ * @error: Address of the item to be added to the context's pending error list. ++ * @data: Error data to be returned to userspace. ++ * ++ * Does not wake up the event queue blocking a user thread in kbase_poll. This ++ * is to make it more efficient to add multiple errors. ++ * ++ * The added error must not already be on the context's list of errors waiting ++ * to be reported (e.g. because a previous error concerning the same object has ++ * not yet been reported). ++ * ++ */ ++void kbase_csf_event_add_error(struct kbase_context *const kctx, ++ struct kbase_csf_notification *const error, ++ struct base_csf_notification const *const data); ++ ++/** ++ * kbase_csf_event_remove_error - Remove an error from event error list ++ * ++ * @kctx: Address of a base context associated with a GPU address space. ++ * @error: Address of the item to be removed from the context's event error list. ++ */ ++void kbase_csf_event_remove_error(struct kbase_context *kctx, ++ struct kbase_csf_notification *error); ++ ++/** ++ * kbase_csf_event_error_pending - Check the error pending status ++ * ++ * @kctx: The kbase context to check fatal error upon. ++ * ++ * Return: true if there is error in the list. ++ */ ++bool kbase_csf_event_error_pending(struct kbase_context *kctx); ++#endif /* _KBASE_CSF_EVENT_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c new file mode 100755 -index 000000000000..4a924f346685 +index 000000000..42bff1e91 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c -@@ -0,0 +1,1993 @@ +@@ -0,0 +1,3144 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -161522,31 +172960,41 @@ index 000000000000..4a924f346685 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include "mali_kbase.h" +#include "mali_kbase_csf_firmware_cfg.h" ++#include "mali_kbase_csf_firmware_log.h" ++#include "mali_kbase_csf_firmware_core_dump.h" +#include "mali_kbase_csf_trace_buffer.h" +#include "mali_kbase_csf_timeout.h" +#include "mali_kbase_mem.h" -+#include ++#include "mali_kbase_mem_pool_group.h" ++#include "mali_kbase_reset_gpu.h" ++#include "mali_kbase_ctx_sched.h" +#include "mali_kbase_csf_scheduler.h" ++#include +#include "device/mali_kbase_device.h" +#include "backend/gpu/mali_kbase_pm_internal.h" +#include "tl/mali_kbase_timeline_priv.h" ++#include "tl/mali_kbase_tracepoints.h" +#include "mali_kbase_csf_tl_reader.h" -+ ++#include "backend/gpu/mali_kbase_clk_rate_trace_mgr.h" ++#include ++#include +#include +#include +#include +#include +#include ++#include ++#include +#if (KERNEL_VERSION(4, 13, 0) <= LINUX_VERSION_CODE) +#include +#endif +#include ++#include ++#include + +#define MALI_MAX_FIRMWARE_NAME_LEN ((size_t)20) + @@ -161554,6 +173002,12 @@ index 000000000000..4a924f346685 +module_param_string(fw_name, fw_name, sizeof(fw_name), 0644); +MODULE_PARM_DESC(fw_name, "firmware image"); + ++/* The waiting time for firmware to boot */ ++static unsigned int csf_firmware_boot_timeout_ms; ++module_param(csf_firmware_boot_timeout_ms, uint, 0444); ++MODULE_PARM_DESC(csf_firmware_boot_timeout_ms, ++ "Maximum time to wait for firmware to boot."); ++ +#ifdef CONFIG_MALI_BIFROST_DEBUG +/* Makes Driver wait indefinitely for an acknowledgment for the different + * requests it sends to firmware. Otherwise the timeouts interfere with the @@ -161567,17 +173021,11 @@ index 000000000000..4a924f346685 + "Enables effective use of a debugger for debugging firmware code."); +#endif + -+#define FIRMWARE_HEADER_MAGIC (0xC3F13A6Eul) -+#define FIRMWARE_HEADER_VERSION (0ul) -+#define FIRMWARE_HEADER_LENGTH (0x14ul) + -+#define CSF_FIRMWARE_ENTRY_READ (1ul << 0) -+#define CSF_FIRMWARE_ENTRY_WRITE (1ul << 1) -+#define CSF_FIRMWARE_ENTRY_EXECUTE (1ul << 2) -+#define CSF_FIRMWARE_ENTRY_CACHE_MODE (3ul << 3) -+#define CSF_FIRMWARE_ENTRY_PROTECTED (1ul << 5) -+#define CSF_FIRMWARE_ENTRY_SHARED (1ul << 30) -+#define CSF_FIRMWARE_ENTRY_ZERO (1ul << 31) ++#define FIRMWARE_HEADER_MAGIC (0xC3F13A6Eul) ++#define FIRMWARE_HEADER_VERSION_MAJOR (0ul) ++#define FIRMWARE_HEADER_VERSION_MINOR (3ul) ++#define FIRMWARE_HEADER_LENGTH (0x14ul) + +#define CSF_FIRMWARE_ENTRY_SUPPORTED_FLAGS \ + (CSF_FIRMWARE_ENTRY_READ | \ @@ -161588,11 +173036,13 @@ index 000000000000..4a924f346685 + CSF_FIRMWARE_ENTRY_ZERO | \ + CSF_FIRMWARE_ENTRY_CACHE_MODE) + -+#define CSF_FIRMWARE_ENTRY_TYPE_INTERFACE (0) -+#define CSF_FIRMWARE_ENTRY_TYPE_CONFIGURATION (1) -+#define CSF_FIRMWARE_ENTRY_TYPE_FUTF_TEST (2) -+#define CSF_FIRMWARE_ENTRY_TYPE_TRACE_BUFFER (3) -+#define CSF_FIRMWARE_ENTRY_TYPE_TIMELINE_METADATA (4) ++#define CSF_FIRMWARE_ENTRY_TYPE_INTERFACE (0) ++#define CSF_FIRMWARE_ENTRY_TYPE_CONFIGURATION (1) ++#define CSF_FIRMWARE_ENTRY_TYPE_TRACE_BUFFER (3) ++#define CSF_FIRMWARE_ENTRY_TYPE_TIMELINE_METADATA (4) ++#define CSF_FIRMWARE_ENTRY_TYPE_BUILD_INFO_METADATA (6) ++#define CSF_FIRMWARE_ENTRY_TYPE_FUNC_CALL_LIST (7) ++#define CSF_FIRMWARE_ENTRY_TYPE_CORE_DUMP (9) + +#define CSF_FIRMWARE_CACHE_MODE_NONE (0ul << 3) +#define CSF_FIRMWARE_CACHE_MODE_CACHED (1ul << 3) @@ -161603,11 +173053,16 @@ index 000000000000..4a924f346685 + +#define TL_METADATA_ENTRY_NAME_OFFSET (0x8) + -+#define CSF_FIRMWARE_BOOT_TIMEOUT_MS (500) ++#define BUILD_INFO_METADATA_SIZE_OFFSET (0x4) ++#define BUILD_INFO_GIT_SHA_LEN (40U) ++#define BUILD_INFO_GIT_DIRTY_LEN (1U) ++#define BUILD_INFO_GIT_SHA_PATTERN "git_sha: " ++ +#define CSF_MAX_FW_STOP_LOOPS (100000) + -+#define CSF_GLB_REQ_CFG_MASK \ -+ (GLB_REQ_CFG_ALLOC_EN_MASK | GLB_REQ_CFG_PROGRESS_TIMER_MASK) ++#define CSF_GLB_REQ_CFG_MASK \ ++ (GLB_REQ_CFG_ALLOC_EN_MASK | GLB_REQ_CFG_PROGRESS_TIMER_MASK | \ ++ GLB_REQ_CFG_PWROFF_TIMER_MASK | GLB_REQ_IDLE_ENABLE_MASK) + +static inline u32 input_page_read(const u32 *const input, const u32 offset) +{ @@ -161648,42 +173103,17 @@ index 000000000000..4a924f346685 +{ + return (header >> 8) & 0xFF; +} ++static bool entry_update(u32 header) ++{ ++ return (header >> 30) & 0x1; ++} +static bool entry_optional(u32 header) +{ + return (header >> 31) & 0x1; +} + +/** -+ * struct firmware_interface - Represents an interface in the MCU firmware -+ * -+ * @node: Interface objects are on the kbase_device:csf.firmware_interfaces -+ * list using this list_head to link them -+ * @phys: Array of the physical (tagged) addresses making up this interface -+ * @name: NUL-terminated string naming the interface -+ * @num_pages: Number of entries in @phys (and length of the interface) -+ * @virtual: Virtual address that this interface is mapped at for the GPU -+ * @flags: bitmask of CSF_FIRMWARE_ENTRY_* conveying the interface attributes -+ * @data_start: Offset into firmware image at which the interface data starts -+ * @data_end: Offset into firmware image at which the interface data ends -+ * @kernel_map: A kernel mapping of the memory or NULL if not required to be -+ * mapped in the kernel -+ * @pma: Array of pointers to protected memory allocations. -+ */ -+struct firmware_interface { -+ struct list_head node; -+ struct tagged_addr *phys; -+ char *name; -+ u32 num_pages; -+ u32 virtual; -+ u32 flags; -+ u32 data_start; -+ u32 data_end; -+ void *kernel_map; -+ struct protected_memory_allocation **pma; -+}; -+ -+/** -+ * Timeline metadata item within the MCU firmware ++ * struct firmware_timeline_metadata - Timeline metadata item within the MCU firmware + * + * @node: List head linking all timeline metadata to + * kbase_device:csf.firmware_timeline_metadata. @@ -161706,18 +173136,21 @@ index 000000000000..4a924f346685 + */ +static int setup_shared_iface_static_region(struct kbase_device *kbdev) +{ -+ struct firmware_interface *interface = kbdev->csf.shared_interface; ++ struct kbase_csf_firmware_interface *interface = ++ kbdev->csf.shared_interface; + struct kbase_va_region *reg; + int ret = -ENOMEM; + + if (!interface) + return -EINVAL; + -+ reg = kbase_alloc_free_region(&kbdev->csf.shared_reg_rbtree, 0, -+ interface->num_pages, KBASE_REG_ZONE_MCU_SHARED); ++ reg = kbase_alloc_free_region(kbdev, &kbdev->csf.shared_reg_rbtree, 0, ++ interface->num_pages_aligned, KBASE_REG_ZONE_MCU_SHARED); + if (reg) { ++ mutex_lock(&kbdev->csf.reg_lock); + ret = kbase_add_va_region_rbtree(kbdev, reg, -+ interface->virtual, interface->num_pages, 1); ++ interface->virtual, interface->num_pages_aligned, 1); ++ mutex_unlock(&kbdev->csf.reg_lock); + if (ret) + kfree(reg); + else @@ -161739,10 +173172,11 @@ index 000000000000..4a924f346685 + return (max_loops == 0) ? -1 : 0; +} + -+void kbase_csf_firmware_disable_mcu_wait(struct kbase_device *kbdev) ++void kbase_csf_firmware_disable_mcu(struct kbase_device *kbdev) +{ -+ if (wait_mcu_status_value(kbdev, MCU_CNTRL_DISABLE) < 0) -+ dev_err(kbdev->dev, "MCU failed to get disabled"); ++ KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_DISABLING(kbdev, kbase_backend_get_cycle_cnt(kbdev)); ++ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(MCU_CONTROL), MCU_CNTRL_DISABLE); +} + +static void wait_for_firmware_stop(struct kbase_device *kbdev) @@ -161751,6 +173185,13 @@ index 000000000000..4a924f346685 + /* This error shall go away once MIDJM-2371 is closed */ + dev_err(kbdev->dev, "Firmware failed to stop"); + } ++ ++ KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_OFF(kbdev, kbase_backend_get_cycle_cnt(kbdev)); ++} ++ ++void kbase_csf_firmware_disable_mcu_wait(struct kbase_device *kbdev) ++{ ++ wait_for_firmware_stop(kbdev); +} + +static void stop_csf_firmware(struct kbase_device *kbdev) @@ -161763,10 +173204,15 @@ index 000000000000..4a924f346685 + +static void wait_for_firmware_boot(struct kbase_device *kbdev) +{ -+ const long wait_timeout = -+ kbase_csf_timeout_in_jiffies(CSF_FIRMWARE_BOOT_TIMEOUT_MS); ++ long wait_timeout; + long remaining; + ++ if (!csf_firmware_boot_timeout_ms) ++ csf_firmware_boot_timeout_ms = ++ kbase_get_timeout_ms(kbdev, CSF_FIRMWARE_BOOT_TIMEOUT); ++ ++ wait_timeout = kbase_csf_timeout_in_jiffies(csf_firmware_boot_timeout_ms); ++ + /* Firmware will generate a global interface interrupt once booting + * is complete + */ @@ -161783,22 +173229,51 @@ index 000000000000..4a924f346685 +{ + kbase_csf_firmware_enable_mcu(kbdev); + ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++ kbase_debug_coresight_csf_state_request(kbdev, KBASE_DEBUG_CORESIGHT_CSF_ENABLED); ++ ++ if (!kbase_debug_coresight_csf_state_wait(kbdev, KBASE_DEBUG_CORESIGHT_CSF_ENABLED)) ++ dev_err(kbdev->dev, "Timeout waiting for CoreSight to be enabled"); ++#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ ++ + wait_for_firmware_boot(kbdev); +} + -+static void wait_ready(struct kbase_device *kbdev) ++/** ++ * wait_ready() - Wait for previously issued MMU command to complete. ++ * ++ * @kbdev: Kbase device to wait for a MMU command to complete. ++ * ++ * Reset GPU if the wait for previously issued command times out. ++ * ++ * Return: 0 on success, error code otherwise. ++ */ ++static int wait_ready(struct kbase_device *kbdev) +{ -+ u32 max_loops = KBASE_AS_INACTIVE_MAX_LOOPS; -+ u32 val; ++ const ktime_t wait_loop_start = ktime_get_raw(); ++ const u32 mmu_as_inactive_wait_time_ms = kbdev->mmu_as_inactive_wait_time_ms; ++ s64 diff; + -+ val = kbase_reg_read(kbdev, MMU_AS_REG(MCU_AS_NR, AS_STATUS)); ++ do { ++ unsigned int i; + -+ /* Wait for a while for the update command to take effect */ -+ while (--max_loops && (val & AS_STATUS_AS_ACTIVE)) -+ val = kbase_reg_read(kbdev, MMU_AS_REG(MCU_AS_NR, AS_STATUS)); ++ for (i = 0; i < 1000; i++) { ++ /* Wait for the MMU status to indicate there is no active command */ ++ if (!(kbase_reg_read(kbdev, MMU_AS_REG(MCU_AS_NR, AS_STATUS)) & ++ AS_STATUS_AS_ACTIVE)) ++ return 0; ++ } ++ ++ diff = ktime_to_ms(ktime_sub(ktime_get_raw(), wait_loop_start)); ++ } while (diff < mmu_as_inactive_wait_time_ms); ++ ++ dev_err(kbdev->dev, ++ "AS_ACTIVE bit stuck for MCU AS. Might be caused by unstable GPU clk/pwr or faulty system"); ++ ++ if (kbase_prepare_to_reset_gpu_locked(kbdev, RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) ++ kbase_reset_gpu_locked(kbdev); + -+ if (max_loops == 0) -+ dev_err(kbdev->dev, "AS_ACTIVE bit stuck, might be caused by slow/unstable GPU clock or possible faulty FPGA connector\n"); ++ return -ETIMEDOUT; +} + +static void unload_mmu_tables(struct kbase_device *kbdev) @@ -161813,7 +173288,7 @@ index 000000000000..4a924f346685 + mutex_unlock(&kbdev->mmu_hw_mutex); +} + -+static void load_mmu_tables(struct kbase_device *kbdev) ++static int load_mmu_tables(struct kbase_device *kbdev) +{ + unsigned long irq_flags; + @@ -161824,7 +173299,7 @@ index 000000000000..4a924f346685 + mutex_unlock(&kbdev->mmu_hw_mutex); + + /* Wait for a while for the update command to take effect */ -+ wait_ready(kbdev); ++ return wait_ready(kbdev); +} + +/** @@ -161931,74 +173406,175 @@ index 000000000000..4a924f346685 + memset(p + copy_len, 0, zi_len); + } + -+ kbase_sync_single_for_device(kbdev, kbase_dma_addr(page), -+ PAGE_SIZE, DMA_TO_DEVICE); ++ kbase_sync_single_for_device(kbdev, kbase_dma_addr_from_tagged(phys[page_num]), ++ PAGE_SIZE, DMA_TO_DEVICE); + kunmap_atomic(p); + } +} + -+static int reload_fw_data_sections(struct kbase_device *kbdev) ++static int reload_fw_image(struct kbase_device *kbdev) +{ + const u32 magic = FIRMWARE_HEADER_MAGIC; -+ struct firmware_interface *interface; -+ const struct firmware *firmware; ++ struct kbase_csf_firmware_interface *interface; ++ struct kbase_csf_mcu_fw *const mcu_fw = &kbdev->csf.fw; + int ret = 0; + -+ if (request_firmware(&firmware, fw_name, kbdev->dev) != 0) { -+ dev_err(kbdev->dev, -+ "Failed to reload firmware image '%s'\n", -+ fw_name); -+ return -ENOENT; -+ } -+ -+ /* Do couple of basic sanity checks */ -+ if (firmware->size < FIRMWARE_HEADER_LENGTH) { -+ dev_err(kbdev->dev, "Firmware image unexpectedly too small\n"); ++ if (WARN_ON(mcu_fw->data == NULL)) { ++ dev_err(kbdev->dev, "Firmware image copy not loaded\n"); + ret = -EINVAL; + goto out; + } + -+ if (memcmp(firmware->data, &magic, sizeof(magic)) != 0) { ++ /* Do a basic sanity check on MAGIC signature */ ++ if (memcmp(mcu_fw->data, &magic, sizeof(magic)) != 0) { + dev_err(kbdev->dev, "Incorrect magic value, firmware image could have been corrupted\n"); + ret = -EINVAL; + goto out; + } + + list_for_each_entry(interface, &kbdev->csf.firmware_interfaces, node) { -+ /* Skip reload of text & read only data sections */ -+ if ((interface->flags & CSF_FIRMWARE_ENTRY_EXECUTE) || -+ !(interface->flags & CSF_FIRMWARE_ENTRY_WRITE)) -+ continue; ++ /* Dont skip re-loading any section if full reload was requested */ ++ if (!kbdev->csf.firmware_full_reload_needed) { ++ /* Skip reload of text & read only data sections */ ++ if ((interface->flags & CSF_FIRMWARE_ENTRY_EXECUTE) || ++ !(interface->flags & CSF_FIRMWARE_ENTRY_WRITE)) ++ continue; ++ } + -+ load_fw_image_section(kbdev, firmware->data, interface->phys, -+ interface->num_pages, interface->flags, -+ interface->data_start, interface->data_end); ++ load_fw_image_section(kbdev, mcu_fw->data, interface->phys, interface->num_pages, ++ interface->flags, interface->data_start, interface->data_end); + } + -+ kbase_csf_firmware_reload_trace_buffers_data(kbdev); ++ kbdev->csf.firmware_full_reload_needed = false; + ++ kbase_csf_firmware_reload_trace_buffers_data(kbdev); +out: -+ release_firmware(firmware); + return ret; +} + +/** ++ * entry_find_large_page_to_reuse() - Find if the large page of previously parsed ++ * FW interface entry can be reused to store ++ * the contents of new FW interface entry. ++ * ++ * @kbdev: Kbase device structure ++ * @virtual_start: Start of the virtual address range required for an entry allocation ++ * @virtual_end: End of the virtual address range required for an entry allocation ++ * @flags: Firmware entry flags for comparison with the reusable pages found ++ * @phys: Pointer to the array of physical (tagged) addresses making up the new ++ * FW interface entry. It is an output parameter which would be made to ++ * point to an already existing array allocated for the previously parsed ++ * FW interface entry using large page(s). If no appropriate entry is ++ * found it is set to NULL. ++ * @pma: Pointer to a protected memory allocation. It is an output parameter ++ * which would be made to the protected memory allocation of a previously ++ * parsed FW interface entry using large page(s) from protected memory. ++ * If no appropriate entry is found it is set to NULL. ++ * @num_pages: Number of pages requested. ++ * @num_pages_aligned: This is an output parameter used to carry the number of 4KB pages ++ * within the 2MB pages aligned allocation. ++ * @is_small_page: This is an output flag used to select between the small and large page ++ * to be used for the FW entry allocation. ++ * ++ * Go through all the already initialized interfaces and find if a previously ++ * allocated large page can be used to store contents of new FW interface entry. ++ * ++ * Return: true if a large page can be reused, false otherwise. ++ */ ++static inline bool entry_find_large_page_to_reuse(struct kbase_device *kbdev, ++ const u32 virtual_start, const u32 virtual_end, ++ const u32 flags, struct tagged_addr **phys, ++ struct protected_memory_allocation ***pma, ++ u32 num_pages, u32 *num_pages_aligned, ++ bool *is_small_page) ++{ ++ struct kbase_csf_firmware_interface *interface = NULL; ++ struct kbase_csf_firmware_interface *target_interface = NULL; ++ u32 virtual_diff_min = U32_MAX; ++ bool reuse_large_page = false; ++ ++ CSTD_UNUSED(interface); ++ CSTD_UNUSED(target_interface); ++ CSTD_UNUSED(virtual_diff_min); ++ ++ *num_pages_aligned = num_pages; ++ *is_small_page = true; ++ *phys = NULL; ++ *pma = NULL; ++ ++ ++ /* If the section starts at 2MB aligned boundary, ++ * then use 2MB page(s) for it. ++ */ ++ if (!(virtual_start & (SZ_2M - 1))) { ++ *num_pages_aligned = ++ round_up(*num_pages_aligned, NUM_4K_PAGES_IN_2MB_PAGE); ++ *is_small_page = false; ++ goto out; ++ } ++ ++ /* If the section doesn't lie within the same 2MB aligned boundary, ++ * then use 4KB pages as it would be complicated to use a 2MB page ++ * for such section. ++ */ ++ if ((virtual_start & ~(SZ_2M - 1)) != (virtual_end & ~(SZ_2M - 1))) ++ goto out; ++ ++ /* Find the nearest 2MB aligned section which comes before the current ++ * section. ++ */ ++ list_for_each_entry(interface, &kbdev->csf.firmware_interfaces, node) { ++ const u32 virtual_diff = virtual_start - interface->virtual; ++ ++ if (interface->virtual > virtual_end) ++ continue; ++ ++ if (interface->virtual & (SZ_2M - 1)) ++ continue; ++ ++ if ((virtual_diff < virtual_diff_min) && (interface->flags == flags)) { ++ target_interface = interface; ++ virtual_diff_min = virtual_diff; ++ } ++ } ++ ++ if (target_interface) { ++ const u32 page_index = virtual_diff_min >> PAGE_SHIFT; ++ ++ if (page_index >= target_interface->num_pages_aligned) ++ goto out; ++ ++ if (target_interface->phys) ++ *phys = &target_interface->phys[page_index]; ++ ++ if (target_interface->pma) ++ *pma = &target_interface->pma[page_index / NUM_4K_PAGES_IN_2MB_PAGE]; ++ ++ *is_small_page = false; ++ reuse_large_page = true; ++ } ++ ++out: ++ return reuse_large_page; ++} ++ ++/** + * parse_memory_setup_entry() - Process an "interface memory setup" section + * ++ * @kbdev: Kbase device structure ++ * @fw: The firmware image containing the section ++ * @entry: Pointer to the start of the section ++ * @size: Size (in bytes) of the section ++ * + * Read an "interface memory setup" section from the firmware image and create + * the necessary memory region including the MMU page tables. If successful + * the interface will be added to the kbase_device:csf.firmware_interfaces list. + * + * Return: 0 if successful, negative error code on failure -+ * -+ * @kbdev: Kbase device structure -+ * @fw: The firmware image containing the section -+ * @entry: Pointer to the start of the section -+ * @size: Size (in bytes) of the section + */ +static int parse_memory_setup_entry(struct kbase_device *kbdev, -+ const struct firmware *fw, -+ const u32 *entry, unsigned int size) ++ const struct kbase_csf_mcu_fw *const fw, const u32 *entry, ++ unsigned int size) +{ + int ret = 0; + const u32 flags = entry[0]; @@ -162007,13 +173583,19 @@ index 000000000000..4a924f346685 + const u32 data_start = entry[3]; + const u32 data_end = entry[4]; + u32 num_pages; ++ u32 num_pages_aligned; + char *name; ++ void *name_entry; ++ unsigned int name_len; + struct tagged_addr *phys = NULL; -+ struct firmware_interface *interface = NULL; ++ struct kbase_csf_firmware_interface *interface = NULL; + bool allocated_pages = false, protected_mode = false; + unsigned long mem_flags = 0; + u32 cache_mode = 0; + struct protected_memory_allocation **pma = NULL; ++ bool reuse_pages = false; ++ bool is_small_page = true; ++ bool ignore_page_migration = true; + + if (data_end < data_start) { + dev_err(kbdev->dev, "Firmware corrupt, data_end < data_start (0x%x<0x%x)\n", @@ -162048,7 +173630,7 @@ index 000000000000..4a924f346685 + protected_mode = true; + + if (protected_mode && kbdev->csf.pma_dev == NULL) { -+ dev_err(kbdev->dev, ++ dev_dbg(kbdev->dev, + "Protected memory allocator not found, Firmware protected mode entry will not be supported"); + return 0; + } @@ -162056,49 +173638,70 @@ index 000000000000..4a924f346685 + num_pages = (virtual_end - virtual_start) + >> PAGE_SHIFT; + -+ phys = kmalloc_array(num_pages, sizeof(*phys), GFP_KERNEL); ++ reuse_pages = ++ entry_find_large_page_to_reuse(kbdev, virtual_start, virtual_end, flags, &phys, ++ &pma, num_pages, &num_pages_aligned, &is_small_page); ++ if (!reuse_pages) ++ phys = kmalloc_array(num_pages_aligned, sizeof(*phys), GFP_KERNEL); ++ + if (!phys) + return -ENOMEM; + + if (protected_mode) { -+ pma = kbase_csf_protected_memory_alloc(kbdev, phys, num_pages); ++ if (!reuse_pages) { ++ pma = kbase_csf_protected_memory_alloc( ++ kbdev, phys, num_pages_aligned, is_small_page); ++ } + -+ if (pma == NULL) { ++ if (!pma) + ret = -ENOMEM; -+ goto out; -+ } + } else { -+ ret = kbase_mem_pool_alloc_pages( -+ &kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], -+ num_pages, phys, false); -+ if (ret < 0) -+ goto out; ++ if (!reuse_pages) { ++ ret = kbase_mem_pool_alloc_pages( ++ kbase_mem_pool_group_select(kbdev, KBASE_MEM_GROUP_CSF_FW, ++ is_small_page), ++ num_pages_aligned, phys, false, NULL); ++ ignore_page_migration = false; ++ } ++ } ++ ++ if (ret < 0) { ++ dev_err(kbdev->dev, ++ "Failed to allocate %u physical pages for the firmware interface entry at VA 0x%x\n", ++ num_pages_aligned, virtual_start); ++ goto out; + } + + allocated_pages = true; + load_fw_image_section(kbdev, fw->data, phys, num_pages, flags, + data_start, data_end); + -+ /* Allocate enough memory for the struct firmware_interface and -+ * the name of the interface. An extra byte is allocated to place a -+ * NUL-terminator in. This should already be included according to the -+ * specification but here we add it anyway to be robust against a -+ * corrupt firmware image. ++ /* Allocate enough memory for the struct kbase_csf_firmware_interface and ++ * the name of the interface. + */ -+ interface = kmalloc(sizeof(*interface) + -+ size - INTERFACE_ENTRY_NAME_OFFSET + 1, GFP_KERNEL); ++ name_entry = (void *)entry + INTERFACE_ENTRY_NAME_OFFSET; ++ name_len = strnlen(name_entry, size - INTERFACE_ENTRY_NAME_OFFSET); ++ if (size < (INTERFACE_ENTRY_NAME_OFFSET + name_len + 1 + sizeof(u32))) { ++ dev_err(kbdev->dev, "Memory setup entry too short to contain virtual_exe_start"); ++ ret = -EINVAL; ++ goto out; ++ } ++ ++ interface = kmalloc(sizeof(*interface) + name_len + 1, GFP_KERNEL); + if (!interface) { + ret = -ENOMEM; + goto out; + } + name = (void *)(interface + 1); -+ memcpy(name, entry + (INTERFACE_ENTRY_NAME_OFFSET / sizeof(*entry)), -+ size - INTERFACE_ENTRY_NAME_OFFSET); -+ name[size - INTERFACE_ENTRY_NAME_OFFSET] = 0; ++ memcpy(name, name_entry, name_len); ++ name[name_len] = 0; + + interface->name = name; + interface->phys = phys; ++ interface->reuse_pages = reuse_pages; ++ interface->is_small_page = is_small_page; + interface->num_pages = num_pages; ++ interface->num_pages_aligned = num_pages_aligned; + interface->virtual = virtual_start; + interface->kernel_map = NULL; + interface->flags = flags; @@ -162106,6 +173709,11 @@ index 000000000000..4a924f346685 + interface->data_end = data_end; + interface->pma = pma; + ++ /* Discover the virtual execution address field after the end of the name ++ * field taking into account the NULL-termination character. ++ */ ++ interface->virtual_exe_start = *((u32 *)(name_entry + name_len + 1)); ++ + mem_flags = convert_mem_flags(kbdev, flags, &cache_mode); + + if (flags & CSF_FIRMWARE_ENTRY_SHARED) { @@ -162159,15 +173767,19 @@ index 000000000000..4a924f346685 + + list_add(&interface->node, &kbdev->csf.firmware_interfaces); + -+ ret = kbase_mmu_insert_pages_no_flush(kbdev, &kbdev->csf.mcu_mmu, -+ virtual_start >> PAGE_SHIFT, phys, num_pages, mem_flags, -+ KBASE_MEM_GROUP_CSF_FW); ++ if (!reuse_pages) { ++ ret = kbase_mmu_insert_pages_no_flush(kbdev, &kbdev->csf.mcu_mmu, ++ virtual_start >> PAGE_SHIFT, phys, ++ num_pages_aligned, mem_flags, ++ KBASE_MEM_GROUP_CSF_FW, NULL, NULL, ++ ignore_page_migration); + -+ if (ret != 0) { -+ dev_err(kbdev->dev, "Failed to insert firmware pages\n"); -+ /* The interface has been added to the list, so cleanup will -+ * be handled by firmware unloading -+ */ ++ if (ret != 0) { ++ dev_err(kbdev->dev, "Failed to insert firmware pages\n"); ++ /* The interface has been added to the list, so cleanup will ++ * be handled by firmware unloading ++ */ ++ } + } + + dev_dbg(kbdev->dev, "Processed section '%s'", name); @@ -162176,19 +173788,22 @@ index 000000000000..4a924f346685 + +out: + if (allocated_pages) { -+ if (protected_mode) { -+ if (interface) { -+ kbase_csf_protected_memory_free(kbdev, -+ interface->pma, num_pages); ++ if (!reuse_pages) { ++ if (protected_mode) { ++ kbase_csf_protected_memory_free( ++ kbdev, pma, num_pages_aligned, is_small_page); ++ } else { ++ kbase_mem_pool_free_pages( ++ kbase_mem_pool_group_select( ++ kbdev, KBASE_MEM_GROUP_CSF_FW, is_small_page), ++ num_pages_aligned, phys, false, false); + } -+ } else { -+ kbase_mem_pool_free_pages( -+ &kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], -+ num_pages, phys, false, false); + } + } + -+ kfree(phys); ++ if (!reuse_pages) ++ kfree(phys); ++ + kfree(interface); + return ret; +} @@ -162204,7 +173819,8 @@ index 000000000000..4a924f346685 + * @size: Size (in bytes) of the section + */ +static int parse_timeline_metadata_entry(struct kbase_device *kbdev, -+ const struct firmware *fw, const u32 *entry, unsigned int size) ++ const struct kbase_csf_mcu_fw *const fw, const u32 *entry, ++ unsigned int size) +{ + const u32 data_start = entry[0]; + const u32 data_size = entry[1]; @@ -162247,8 +173863,64 @@ index 000000000000..4a924f346685 +} + +/** ++ * parse_build_info_metadata_entry() - Process a "build info metadata" section ++ * @kbdev: Kbase device structure ++ * @fw: Firmware image containing the section ++ * @entry: Pointer to the section ++ * @size: Size (in bytes) of the section ++ * ++ * This prints the git SHA of the firmware on frimware load. ++ * ++ * Return: 0 if successful, negative error code on failure ++ */ ++static int parse_build_info_metadata_entry(struct kbase_device *kbdev, ++ const struct kbase_csf_mcu_fw *const fw, ++ const u32 *entry, unsigned int size) ++{ ++ const u32 meta_start_addr = entry[0]; ++ char *ptr = NULL; ++ size_t sha_pattern_len = strlen(BUILD_INFO_GIT_SHA_PATTERN); ++ ++ /* Only print git SHA to avoid releasing sensitive information */ ++ ptr = strstr(fw->data + meta_start_addr, BUILD_INFO_GIT_SHA_PATTERN); ++ /* Check that we won't overrun the found string */ ++ if (ptr && ++ strlen(ptr) >= BUILD_INFO_GIT_SHA_LEN + BUILD_INFO_GIT_DIRTY_LEN + sha_pattern_len) { ++ char git_sha[BUILD_INFO_GIT_SHA_LEN + BUILD_INFO_GIT_DIRTY_LEN + 1]; ++ int i = 0; ++ ++ /* Move ptr to start of SHA */ ++ ptr += sha_pattern_len; ++ for (i = 0; i < BUILD_INFO_GIT_SHA_LEN; i++) { ++ /* Ensure that the SHA is made up of hex digits */ ++ if (!isxdigit(ptr[i])) ++ break; ++ ++ git_sha[i] = ptr[i]; ++ } ++ ++ /* Check if the next char indicates git SHA is dirty */ ++ if (ptr[i] == ' ' || ptr[i] == '+') { ++ git_sha[i] = ptr[i]; ++ i++; ++ } ++ git_sha[i] = '\0'; ++ ++ dev_info(kbdev->dev, "Mali firmware git_sha: %s\n", git_sha); ++ } else ++ dev_info(kbdev->dev, "Mali firmware git_sha not found or invalid\n"); ++ ++ return 0; ++} ++ ++/** + * load_firmware_entry() - Process an entry from a firmware image + * ++ * @kbdev: Kbase device ++ * @fw: Firmware image containing the entry ++ * @offset: Byte offset within the image of the entry to load ++ * @header: Header word of the entry ++ * + * Read an entry from a firmware image and do any necessary work (e.g. loading + * the data into page accessible to the MCU). + * @@ -162256,19 +173928,18 @@ index 000000000000..4a924f346685 + * otherwise the function will fail with -EINVAL + * + * Return: 0 if successful, negative error code on failure -+ * -+ * @kbdev: Kbase device -+ * @fw: Firmware image containing the entry -+ * @offset: Byte offset within the image of the entry to load -+ * @header: Header word of the entry + */ -+static int load_firmware_entry(struct kbase_device *kbdev, -+ const struct firmware *fw, -+ u32 offset, u32 header) ++static int load_firmware_entry(struct kbase_device *kbdev, const struct kbase_csf_mcu_fw *const fw, ++ u32 offset, u32 header) +{ + const unsigned int type = entry_type(header); + unsigned int size = entry_size(header); + const bool optional = entry_optional(header); ++ /* Update is used with configuration and tracebuffer entries to ++ * initiate a FIRMWARE_CONFIG_UPDATE, instead of triggering a ++ * silent reset. ++ */ ++ const bool updatable = entry_update(header); + const u32 *entry = (void *)(fw->data + offset); + + if ((offset % sizeof(*entry)) || (size % sizeof(*entry))) { @@ -162303,19 +173974,7 @@ index 000000000000..4a924f346685 + return -EINVAL; + } + return kbase_csf_firmware_cfg_option_entry_parse( -+ kbdev, fw, entry, size); -+ case CSF_FIRMWARE_ENTRY_TYPE_FUTF_TEST: -+#ifndef MALI_KBASE_BUILD -+ /* FW UTF option */ -+ if (size < 2*sizeof(*entry)) { -+ dev_err(kbdev->dev, "FW UTF entry too short (size=%u)\n", -+ size); -+ return -EINVAL; -+ } -+ return mali_kutf_process_fw_utf_entry(kbdev, fw->data, -+ fw->size, entry); -+#endif -+ break; ++ kbdev, fw, entry, size, updatable); + case CSF_FIRMWARE_ENTRY_TYPE_TRACE_BUFFER: + /* Trace buffer */ + if (size < TRACE_BUFFER_ENTRY_NAME_OFFSET + sizeof(*entry)) { @@ -162324,7 +173983,7 @@ index 000000000000..4a924f346685 + return -EINVAL; + } + return kbase_csf_firmware_parse_trace_buffer_entry( -+ kbdev, entry, size); ++ kbdev, entry, size, updatable); + case CSF_FIRMWARE_ENTRY_TYPE_TIMELINE_METADATA: + /* Meta data section */ + if (size < TL_METADATA_ENTRY_NAME_OFFSET + sizeof(*entry)) { @@ -162333,13 +173992,35 @@ index 000000000000..4a924f346685 + return -EINVAL; + } + return parse_timeline_metadata_entry(kbdev, fw, entry, size); -+ } -+ -+ if (!optional) { -+ dev_err(kbdev->dev, -+ "Unsupported non-optional entry type %u in firmware\n", -+ type); -+ return -EINVAL; ++ case CSF_FIRMWARE_ENTRY_TYPE_BUILD_INFO_METADATA: ++ if (size < BUILD_INFO_METADATA_SIZE_OFFSET + sizeof(*entry)) { ++ dev_err(kbdev->dev, "Build info metadata entry too short (size=%u)\n", ++ size); ++ return -EINVAL; ++ } ++ return parse_build_info_metadata_entry(kbdev, fw, entry, size); ++ case CSF_FIRMWARE_ENTRY_TYPE_FUNC_CALL_LIST: ++ /* Function call list section */ ++ if (size < FUNC_CALL_LIST_ENTRY_NAME_OFFSET + sizeof(*entry)) { ++ dev_err(kbdev->dev, "Function call list entry too short (size=%u)\n", ++ size); ++ return -EINVAL; ++ } ++ kbase_csf_firmware_log_parse_logging_call_list_entry(kbdev, entry); ++ return 0; ++ case CSF_FIRMWARE_ENTRY_TYPE_CORE_DUMP: ++ /* Core Dump section */ ++ if (size < CORE_DUMP_ENTRY_START_ADDR_OFFSET + sizeof(*entry)) { ++ dev_err(kbdev->dev, "FW Core dump entry too short (size=%u)\n", size); ++ return -EINVAL; ++ } ++ return kbase_csf_firmware_core_dump_entry_parse(kbdev, entry); ++ default: ++ if (!optional) { ++ dev_err(kbdev->dev, "Unsupported non-optional entry type %u in firmware\n", ++ type); ++ return -EINVAL; ++ } + } + + return 0; @@ -162371,7 +174052,8 @@ index 000000000000..4a924f346685 + */ +static inline void *iface_gpu_va_to_cpu(struct kbase_device *kbdev, u32 gpu_va) +{ -+ struct firmware_interface *interface = kbdev->csf.shared_interface; ++ struct kbase_csf_firmware_interface *interface = ++ kbdev->csf.shared_interface; + u8 *kernel_base = interface->kernel_map; + + if (gpu_va < interface->virtual || @@ -162425,7 +174107,7 @@ index 000000000000..4a924f346685 + + if (ginfo->stream_num < MIN_SUPPORTED_STREAMS_PER_GROUP || + ginfo->stream_num > MAX_SUPPORTED_STREAMS_PER_GROUP) { -+ dev_err(kbdev->dev, "CSG with %u streams out of range %u-%u", ++ dev_err(kbdev->dev, "CSG with %u CSs out of range %u-%u", + ginfo->stream_num, + MIN_SUPPORTED_STREAMS_PER_GROUP, + MAX_SUPPORTED_STREAMS_PER_GROUP); @@ -162436,7 +174118,7 @@ index 000000000000..4a924f346685 + + if (ginfo->stream_num * ginfo->stream_stride > group_stride) { + dev_err(kbdev->dev, -+ "group stride of 0x%x exceeded by %u streams with stride 0x%x", ++ "group stride of 0x%x exceeded by %u CSs with stride 0x%x", + group_stride, ginfo->stream_num, + ginfo->stream_stride); + return -EINVAL; @@ -162456,7 +174138,7 @@ index 000000000000..4a924f346685 + err = parse_cmd_stream_info(kbdev, &ginfo->streams[sid], + stream_base); + if (err < 0) { -+ /* caller will free the memory for streams array */ ++ /* caller will free the memory for CSs array */ + return err; + } + } @@ -162466,7 +174148,8 @@ index 000000000000..4a924f346685 + +static u32 get_firmware_version(struct kbase_device *kbdev) +{ -+ struct firmware_interface *interface = kbdev->csf.shared_interface; ++ struct kbase_csf_firmware_interface *interface = ++ kbdev->csf.shared_interface; + u32 *shared_info = interface->kernel_map; + + return shared_info[GLB_VERSION/4]; @@ -162474,7 +174157,8 @@ index 000000000000..4a924f346685 + +static int parse_capabilities(struct kbase_device *kbdev) +{ -+ struct firmware_interface *interface = kbdev->csf.shared_interface; ++ struct kbase_csf_firmware_interface *interface = ++ kbdev->csf.shared_interface; + u32 *shared_info = interface->kernel_map; + struct kbase_csf_global_iface *iface = &kbdev->csf.global_iface; + unsigned int gid; @@ -162515,6 +174199,11 @@ index 000000000000..4a924f346685 + iface->group_stride = shared_info[GLB_GROUP_STRIDE/4]; + iface->prfcnt_size = shared_info[GLB_PRFCNT_SIZE/4]; + ++ if (iface->version >= kbase_csf_interface_version(1, 1, 0)) ++ iface->instr_features = shared_info[GLB_INSTR_FEATURES / 4]; ++ else ++ iface->instr_features = 0; ++ + if ((GROUP_CONTROL_0 + + (unsigned long)iface->group_num * iface->group_stride) > + (interface->num_pages * PAGE_SIZE)) { @@ -162548,40 +174237,80 @@ index 000000000000..4a924f346685 + return 0; +} + ++static inline void access_firmware_memory_common(struct kbase_device *kbdev, ++ struct kbase_csf_firmware_interface *interface, u32 offset_bytes, ++ u32 *value, const bool read) ++{ ++ u32 page_num = offset_bytes >> PAGE_SHIFT; ++ u32 offset_in_page = offset_bytes & ~PAGE_MASK; ++ struct page *target_page = as_page(interface->phys[page_num]); ++ uintptr_t cpu_addr = (uintptr_t)kmap_atomic(target_page); ++ u32 *addr = (u32 *)(cpu_addr + offset_in_page); ++ ++ if (read) { ++ kbase_sync_single_for_device(kbdev, ++ kbase_dma_addr_from_tagged(interface->phys[page_num]) + offset_in_page, ++ sizeof(u32), DMA_BIDIRECTIONAL); ++ *value = *addr; ++ } else { ++ *addr = *value; ++ kbase_sync_single_for_device(kbdev, ++ kbase_dma_addr_from_tagged(interface->phys[page_num]) + offset_in_page, ++ sizeof(u32), DMA_BIDIRECTIONAL); ++ } ++ ++ kunmap_atomic((u32 *)cpu_addr); ++} ++ +static inline void access_firmware_memory(struct kbase_device *kbdev, + u32 gpu_addr, u32 *value, const bool read) +{ -+ struct firmware_interface *interface; ++ struct kbase_csf_firmware_interface *interface, *access_interface = NULL; ++ u32 offset_bytes = 0; + + list_for_each_entry(interface, &kbdev->csf.firmware_interfaces, node) { + if ((gpu_addr >= interface->virtual) && + (gpu_addr < interface->virtual + (interface->num_pages << PAGE_SHIFT))) { -+ u32 offset_bytes = gpu_addr - interface->virtual; -+ u32 page_num = offset_bytes >> PAGE_SHIFT; -+ u32 offset_in_page = offset_bytes & ~PAGE_MASK; -+ struct page *target_page = as_page( -+ interface->phys[page_num]); -+ u32 *cpu_addr = kmap_atomic(target_page); -+ -+ if (read) { -+ kbase_sync_single_for_device(kbdev, -+ kbase_dma_addr(target_page) + offset_in_page, -+ sizeof(u32), DMA_BIDIRECTIONAL); -+ -+ *value = cpu_addr[offset_in_page >> 2]; -+ } else { -+ cpu_addr[offset_in_page >> 2] = *value; ++ offset_bytes = gpu_addr - interface->virtual; ++ access_interface = interface; ++ break; ++ } ++ } + -+ kbase_sync_single_for_device(kbdev, -+ kbase_dma_addr(target_page) + offset_in_page, -+ sizeof(u32), DMA_BIDIRECTIONAL); -+ } ++ if (access_interface) ++ access_firmware_memory_common(kbdev, access_interface, offset_bytes, value, read); ++ else ++ dev_warn(kbdev->dev, "Invalid GPU VA %x passed", gpu_addr); ++} + -+ kunmap_atomic(cpu_addr); -+ return; ++static inline void access_firmware_memory_exe(struct kbase_device *kbdev, ++ u32 gpu_addr, u32 *value, const bool read) ++{ ++ struct kbase_csf_firmware_interface *interface, *access_interface = NULL; ++ u32 offset_bytes = 0; ++ ++ list_for_each_entry(interface, &kbdev->csf.firmware_interfaces, node) { ++ if ((gpu_addr >= interface->virtual_exe_start) && ++ (gpu_addr < interface->virtual_exe_start + ++ (interface->num_pages << PAGE_SHIFT))) { ++ offset_bytes = gpu_addr - interface->virtual_exe_start; ++ access_interface = interface; ++ ++ /* If there's an overlap in execution address range between a moved and a ++ * non-moved areas, always prefer the moved one. The idea is that FW may ++ * move sections around during init time, but after the layout is settled, ++ * any moved sections are going to override non-moved areas at the same ++ * location. ++ */ ++ if (interface->virtual_exe_start != interface->virtual) ++ break; + } + } -+ dev_warn(kbdev->dev, "Invalid GPU VA %x passed\n", gpu_addr); ++ ++ if (access_interface) ++ access_firmware_memory_common(kbdev, access_interface, offset_bytes, value, read); ++ else ++ dev_warn(kbdev->dev, "Invalid GPU VA %x passed", gpu_addr); +} + +void kbase_csf_read_firmware_memory(struct kbase_device *kbdev, @@ -162596,6 +174325,18 @@ index 000000000000..4a924f346685 + access_firmware_memory(kbdev, gpu_addr, &value, false); +} + ++void kbase_csf_read_firmware_memory_exe(struct kbase_device *kbdev, ++ u32 gpu_addr, u32 *value) ++{ ++ access_firmware_memory_exe(kbdev, gpu_addr, value, true); ++} ++ ++void kbase_csf_update_firmware_memory_exe(struct kbase_device *kbdev, ++ u32 gpu_addr, u32 value) ++{ ++ access_firmware_memory_exe(kbdev, gpu_addr, &value, false); ++} ++ +void kbase_csf_firmware_cs_input( + const struct kbase_csf_cmd_stream_info *const info, const u32 offset, + const u32 value) @@ -162681,6 +174422,7 @@ index 000000000000..4a924f346685 + dev_dbg(kbdev->dev, "csg output r: reg %08x val %08x\n", offset, val); + return val; +} ++KBASE_EXPORT_TEST_API(kbase_csf_firmware_csg_output); + +void kbase_csf_firmware_global_input( + const struct kbase_csf_global_iface *const iface, const u32 offset, @@ -162691,6 +174433,7 @@ index 000000000000..4a924f346685 + dev_dbg(kbdev->dev, "glob input w: reg %08x val %08x\n", offset, value); + input_page_write(iface->input, offset, value); +} ++KBASE_EXPORT_TEST_API(kbase_csf_firmware_global_input); + +void kbase_csf_firmware_global_input_mask( + const struct kbase_csf_global_iface *const iface, const u32 offset, @@ -162702,6 +174445,7 @@ index 000000000000..4a924f346685 + offset, value, mask); + input_page_partial_write(iface->input, offset, value, mask); +} ++KBASE_EXPORT_TEST_API(kbase_csf_firmware_global_input_mask); + +u32 kbase_csf_firmware_global_input_read( + const struct kbase_csf_global_iface *const iface, const u32 offset) @@ -162722,6 +174466,90 @@ index 000000000000..4a924f346685 + dev_dbg(kbdev->dev, "glob output r: reg %08x val %08x\n", offset, val); + return val; +} ++KBASE_EXPORT_TEST_API(kbase_csf_firmware_global_output); ++ ++/** ++ * csf_doorbell_offset() - Calculate the offset to the CSF host doorbell ++ * @doorbell_nr: Doorbell number ++ * ++ * Return: CSF host register offset for the specified doorbell number. ++ */ ++static u32 csf_doorbell_offset(int doorbell_nr) ++{ ++ WARN_ON(doorbell_nr < 0); ++ WARN_ON(doorbell_nr >= CSF_NUM_DOORBELL); ++ ++ return CSF_HW_DOORBELL_PAGE_OFFSET + (doorbell_nr * CSF_HW_DOORBELL_PAGE_SIZE); ++} ++ ++void kbase_csf_ring_doorbell(struct kbase_device *kbdev, int doorbell_nr) ++{ ++ kbase_reg_write(kbdev, csf_doorbell_offset(doorbell_nr), (u32)1); ++} ++EXPORT_SYMBOL(kbase_csf_ring_doorbell); ++ ++/** ++ * handle_internal_firmware_fatal - Handler for CS internal firmware fault. ++ * ++ * @kbdev: Pointer to kbase device ++ * ++ * Report group fatal error to user space for all GPU command queue groups ++ * in the device, terminate them and reset GPU. ++ */ ++static void handle_internal_firmware_fatal(struct kbase_device *const kbdev) ++{ ++ int as; ++ ++ for (as = 0; as < kbdev->nr_hw_address_spaces; as++) { ++ unsigned long flags; ++ struct kbase_context *kctx; ++ struct kbase_fault fault; ++ ++ if (as == MCU_AS_NR) ++ continue; ++ ++ /* Only handle the fault for an active address space. Lock is ++ * taken here to atomically get reference to context in an ++ * active address space and retain its refcount. ++ */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kctx = kbase_ctx_sched_as_to_ctx_nolock(kbdev, as); ++ ++ if (kctx) { ++ kbase_ctx_sched_retain_ctx_refcount(kctx); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } else { ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ continue; ++ } ++ ++ fault = (struct kbase_fault) { ++ .status = GPU_EXCEPTION_TYPE_SW_FAULT_1, ++ }; ++ ++ kbase_csf_ctx_handle_fault(kctx, &fault); ++ kbase_ctx_sched_release_ctx_lock(kctx); ++ } ++ ++ if (kbase_prepare_to_reset_gpu(kbdev, ++ RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) ++ kbase_reset_gpu(kbdev); ++} ++ ++/** ++ * firmware_error_worker - Worker function for handling firmware internal error ++ * ++ * @data: Pointer to a work_struct embedded in kbase device. ++ * ++ * Handle the CS internal firmware error ++ */ ++static void firmware_error_worker(struct work_struct *const data) ++{ ++ struct kbase_device *const kbdev = ++ container_of(data, struct kbase_device, csf.fw_error_work); ++ ++ handle_internal_firmware_fatal(kbdev); ++} + +static bool global_request_complete(struct kbase_device *const kbdev, + u32 const req_mask) @@ -162744,11 +174572,10 @@ index 000000000000..4a924f346685 + return complete; +} + -+static int wait_for_global_request(struct kbase_device *const kbdev, -+ u32 const req_mask) ++static int wait_for_global_request_with_timeout(struct kbase_device *const kbdev, ++ u32 const req_mask, unsigned int timeout_ms) +{ -+ const long wait_timeout = -+ kbase_csf_timeout_in_jiffies(GLB_REQ_WAIT_TIMEOUT_MS); ++ const long wait_timeout = kbase_csf_timeout_in_jiffies(timeout_ms); + long remaining; + int err = 0; + @@ -162757,14 +174584,21 @@ index 000000000000..4a924f346685 + wait_timeout); + + if (!remaining) { -+ dev_warn(kbdev->dev, "Timed out waiting for global request %x to complete", -+ req_mask); ++ dev_warn(kbdev->dev, ++ "[%llu] Timeout (%d ms) waiting for global request %x to complete", ++ kbase_backend_get_cycle_cnt(kbdev), timeout_ms, req_mask); + err = -ETIMEDOUT; ++ + } + + return err; +} + ++static int wait_for_global_request(struct kbase_device *const kbdev, u32 const req_mask) ++{ ++ return wait_for_global_request_with_timeout(kbdev, req_mask, kbdev->csf.fw_timeout_ms); ++} ++ +static void set_global_request( + const struct kbase_csf_global_iface *const global_iface, + u32 const req_mask) @@ -162791,6 +174625,28 @@ index 000000000000..4a924f346685 + set_global_request(global_iface, GLB_REQ_CFG_ALLOC_EN_MASK); +} + ++static void enable_shader_poweroff_timer(struct kbase_device *const kbdev, ++ const struct kbase_csf_global_iface *const global_iface) ++{ ++ u32 pwroff_reg; ++ ++ if (kbdev->csf.firmware_hctl_core_pwr) ++ pwroff_reg = ++ GLB_PWROFF_TIMER_TIMER_SOURCE_SET(DISABLE_GLB_PWROFF_TIMER, ++ GLB_PWROFF_TIMER_TIMER_SOURCE_SYSTEM_TIMESTAMP); ++ else ++ pwroff_reg = kbdev->csf.mcu_core_pwroff_dur_count; ++ ++ kbase_csf_firmware_global_input(global_iface, GLB_PWROFF_TIMER, ++ pwroff_reg); ++ set_global_request(global_iface, GLB_REQ_CFG_PWROFF_TIMER_MASK); ++ ++ /* Save the programed reg value in its shadow field */ ++ kbdev->csf.mcu_core_pwroff_reg_shadow = pwroff_reg; ++ ++ dev_dbg(kbdev->dev, "GLB_PWROFF_TIMER set to 0x%.8x\n", pwroff_reg); ++} ++ +static void set_timeout_global( + const struct kbase_csf_global_iface *const global_iface, + u64 const timeout) @@ -162801,29 +174657,113 @@ index 000000000000..4a924f346685 + set_global_request(global_iface, GLB_REQ_CFG_PROGRESS_TIMER_MASK); +} + -+static void set_coherency_mode(struct kbase_device *const kbdev) ++static void enable_gpu_idle_timer(struct kbase_device *const kbdev) ++{ ++ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; ++ ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ ++ kbase_csf_firmware_global_input(global_iface, GLB_IDLE_TIMER, ++ kbdev->csf.gpu_idle_dur_count); ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_REQ, GLB_REQ_REQ_IDLE_ENABLE, ++ GLB_REQ_IDLE_ENABLE_MASK); ++ dev_dbg(kbdev->dev, "Enabling GPU idle timer with count-value: 0x%.8x", ++ kbdev->csf.gpu_idle_dur_count); ++} ++ ++static bool global_debug_request_complete(struct kbase_device *const kbdev, u32 const req_mask) ++{ ++ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; ++ bool complete = false; ++ unsigned long flags; ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ ++ if ((kbase_csf_firmware_global_output(global_iface, GLB_DEBUG_ACK) & req_mask) == ++ (kbase_csf_firmware_global_input_read(global_iface, GLB_DEBUG_REQ) & req_mask)) ++ complete = true; ++ ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ ++ return complete; ++} ++ ++static void set_global_debug_request(const struct kbase_csf_global_iface *const global_iface, ++ u32 const req_mask) ++{ ++ u32 glb_debug_req; ++ ++ kbase_csf_scheduler_spin_lock_assert_held(global_iface->kbdev); ++ ++ glb_debug_req = kbase_csf_firmware_global_output(global_iface, GLB_DEBUG_ACK); ++ glb_debug_req ^= req_mask; ++ ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_DEBUG_REQ, glb_debug_req, req_mask); ++} ++ ++static void request_fw_core_dump( ++ const struct kbase_csf_global_iface *const global_iface) ++{ ++ uint32_t run_mode = GLB_DEBUG_REQ_RUN_MODE_SET(0, GLB_DEBUG_RUN_MODE_TYPE_CORE_DUMP); ++ ++ set_global_debug_request(global_iface, GLB_DEBUG_REQ_DEBUG_RUN_MASK | run_mode); ++ ++ set_global_request(global_iface, GLB_REQ_DEBUG_CSF_REQ_MASK); ++} ++ ++int kbase_csf_firmware_req_core_dump(struct kbase_device *const kbdev) +{ + const struct kbase_csf_global_iface *const global_iface = + &kbdev->csf.global_iface; -+ u32 protected_mode_coherency = kbdev->system_coherency; ++ unsigned long flags; ++ int ret; + -+ /* GPU is supposed to use ACE-Lite coherency mode on a fully coherent -+ * system during protected mode execution. -+ */ -+ if (kbdev->system_coherency == COHERENCY_ACE) -+ protected_mode_coherency = COHERENCY_ACE_LITE; ++ /* Serialize CORE_DUMP requests. */ ++ mutex_lock(&kbdev->csf.reg_lock); ++ ++ /* Update GLB_REQ with CORE_DUMP request and make firmware act on it. */ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ request_fw_core_dump(global_iface); ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ ++ /* Wait for firmware to acknowledge completion of the CORE_DUMP request. */ ++ ret = wait_for_global_request(kbdev, GLB_REQ_DEBUG_CSF_REQ_MASK); ++ if (!ret) ++ WARN_ON(!global_debug_request_complete(kbdev, GLB_DEBUG_REQ_DEBUG_RUN_MASK)); ++ ++ mutex_unlock(&kbdev->csf.reg_lock); ++ ++ return ret; ++} ++ ++/** ++ * kbasep_enable_rtu - Enable Ray Tracing Unit on powering up shader core ++ * ++ * @kbdev: The kbase device structure of the device ++ * ++ * This function needs to be called to enable the Ray Tracing Unit ++ * by writing SHADER_PWRFEATURES only when host controls shader cores power. ++ */ ++static void kbasep_enable_rtu(struct kbase_device *kbdev) ++{ ++ const u32 gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++ ++ if (gpu_id < GPU_ID2_PRODUCT_MAKE(12, 8, 3, 0)) ++ return; + -+ kbase_csf_firmware_global_input(global_iface, GLB_PROTM_COHERENCY, -+ protected_mode_coherency); ++ if (kbdev->csf.firmware_hctl_core_pwr) ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(SHADER_PWRFEATURES), 1); +} + -+static void global_init(struct kbase_device *const kbdev, u32 req_mask) ++static void global_init(struct kbase_device *const kbdev, u64 core_mask) +{ -+ u32 const ack_irq_mask = GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_MASK | -+ GLB_ACK_IRQ_MASK_PING_MASK | -+ GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_MASK | -+ GLB_ACK_IRQ_MASK_PROTM_ENTER_MASK | -+ GLB_ACK_IRQ_MASK_PROTM_EXIT_MASK; ++ u32 const ack_irq_mask = ++ GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_MASK | GLB_ACK_IRQ_MASK_PING_MASK | ++ GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_MASK | GLB_ACK_IRQ_MASK_PROTM_ENTER_MASK | ++ GLB_ACK_IRQ_MASK_PROTM_EXIT_MASK | GLB_ACK_IRQ_MASK_FIRMWARE_CONFIG_UPDATE_MASK | ++ GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_MASK | GLB_ACK_IRQ_MASK_IDLE_EVENT_MASK | ++ GLB_REQ_DEBUG_CSF_REQ_MASK | GLB_ACK_IRQ_MASK_IDLE_ENABLE_MASK; + + const struct kbase_csf_global_iface *const global_iface = + &kbdev->csf.global_iface; @@ -162831,19 +174771,32 @@ index 000000000000..4a924f346685 + + kbase_csf_scheduler_spin_lock(kbdev, &flags); + -+ /* Set the cohereny mode for protected mode execution */ -+ set_coherency_mode(kbdev); ++ kbasep_enable_rtu(kbdev); + -+ /* Enable endpoints on all present shader cores */ -+ enable_endpoints_global(global_iface, -+ kbase_pm_get_present_cores(kbdev, KBASE_PM_CORE_SHADER)); ++ /* Update shader core allocation enable mask */ ++ enable_endpoints_global(global_iface, core_mask); ++ enable_shader_poweroff_timer(kbdev, global_iface); + + set_timeout_global(global_iface, kbase_csf_timeout_get(kbdev)); + ++ /* The GPU idle timer is always enabled for simplicity. Checks will be ++ * done before scheduling the GPU idle worker to see if it is ++ * appropriate for the current power policy. ++ */ ++ enable_gpu_idle_timer(kbdev); ++ + /* Unmask the interrupts */ + kbase_csf_firmware_global_input(global_iface, + GLB_ACK_IRQ_MASK, ack_irq_mask); + ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++ /* Enable FW MCU read/write debug interfaces */ ++ kbase_csf_firmware_global_input_mask( ++ global_iface, GLB_DEBUG_ACK_IRQ_MASK, ++ GLB_DEBUG_REQ_FW_AS_READ_MASK | GLB_DEBUG_REQ_FW_AS_WRITE_MASK, ++ GLB_DEBUG_REQ_FW_AS_READ_MASK | GLB_DEBUG_REQ_FW_AS_WRITE_MASK); ++#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ ++ + kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); + + kbase_csf_scheduler_spin_unlock(kbdev, flags); @@ -162852,8 +174805,7 @@ index 000000000000..4a924f346685 +/** + * global_init_on_boot - Sends a global request to control various features. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface + * + * Currently only the request to enable endpoints and timeout for GPU progress + * timer is sent. @@ -162862,19 +174814,29 @@ index 000000000000..4a924f346685 + */ +static int global_init_on_boot(struct kbase_device *const kbdev) +{ -+ u32 const req_mask = CSF_GLB_REQ_CFG_MASK; ++ unsigned long flags; ++ u64 core_mask; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ core_mask = kbase_pm_ca_get_core_mask(kbdev); ++ kbdev->csf.firmware_hctl_core_pwr = ++ kbase_pm_no_mcu_core_pwroff(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ global_init(kbdev, req_mask); ++ global_init(kbdev, core_mask); + -+ return wait_for_global_request(kbdev, req_mask); ++ return wait_for_global_request(kbdev, CSF_GLB_REQ_CFG_MASK); +} + -+void kbase_csf_firmware_global_reinit(struct kbase_device *kbdev) ++void kbase_csf_firmware_global_reinit(struct kbase_device *kbdev, ++ u64 core_mask) +{ + lockdep_assert_held(&kbdev->hwaccess_lock); + + kbdev->csf.glb_init_request_pending = true; -+ global_init(kbdev, CSF_GLB_REQ_CFG_MASK); ++ kbdev->csf.firmware_hctl_core_pwr = ++ kbase_pm_no_mcu_core_pwroff(kbdev); ++ global_init(kbdev, core_mask); +} + +bool kbase_csf_firmware_global_reinit_complete(struct kbase_device *kbdev) @@ -162888,7 +174850,35 @@ index 000000000000..4a924f346685 + return !kbdev->csf.glb_init_request_pending; +} + ++void kbase_csf_firmware_update_core_attr(struct kbase_device *kbdev, ++ bool update_core_pwroff_timer, bool update_core_mask, u64 core_mask) ++{ ++ unsigned long flags; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ if (update_core_mask) ++ enable_endpoints_global(&kbdev->csf.global_iface, core_mask); ++ if (update_core_pwroff_timer) ++ enable_shader_poweroff_timer(kbdev, &kbdev->csf.global_iface); ++ ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++} ++ ++bool kbase_csf_firmware_core_attr_updated(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ return global_request_complete(kbdev, GLB_REQ_CFG_ALLOC_EN_MASK | ++ GLB_REQ_CFG_PWROFF_TIMER_MASK); ++} ++ +/** ++ * kbase_csf_firmware_reload_worker() - reload the fw image and re-enable the MCU ++ * @work: CSF Work item for reloading the firmware. ++ * + * This helper function will reload the firmware image and re-enable the MCU. + * It is supposed to be called after MCU(GPU) has been reset. + * Unlike the initial boot the firmware binary image is not parsed completely. @@ -162906,8 +174896,10 @@ index 000000000000..4a924f346685 + + dev_info(kbdev->dev, "reloading firmware"); + ++ KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_RELOADING(kbdev, kbase_backend_get_cycle_cnt(kbdev)); ++ + /* Reload just the data sections from firmware binary image */ -+ err = reload_fw_data_sections(kbdev); ++ err = reload_fw_image(kbdev); + if (err) + return; + @@ -162948,16 +174940,306 @@ index 000000000000..4a924f346685 + if (version != kbdev->csf.global_iface.version) + dev_err(kbdev->dev, "Version check failed in firmware reboot."); + -+ KBASE_KTRACE_ADD(kbdev, FIRMWARE_REBOOT, NULL, 0u); ++ KBASE_KTRACE_ADD(kbdev, CSF_FIRMWARE_REBOOT, NULL, 0u); + + /* Tell MCU state machine to transit to next state */ + kbdev->csf.firmware_reloaded = true; + kbase_pm_update_state(kbdev); +} + -+int kbase_csf_firmware_init(struct kbase_device *kbdev) ++static u32 convert_dur_to_idle_count(struct kbase_device *kbdev, const u32 dur_us) +{ -+ const struct firmware *firmware; ++#define HYSTERESIS_VAL_UNIT_SHIFT (10) ++ /* Get the cntfreq_el0 value, which drives the SYSTEM_TIMESTAMP */ ++ u64 freq = arch_timer_get_cntfrq(); ++ u64 dur_val = dur_us; ++ u32 cnt_val_u32, reg_val_u32; ++ bool src_system_timestamp = freq > 0; ++ ++ if (!src_system_timestamp) { ++ /* Get the cycle_counter source alternative */ ++ spin_lock(&kbdev->pm.clk_rtm.lock); ++ if (kbdev->pm.clk_rtm.clks[0]) ++ freq = kbdev->pm.clk_rtm.clks[0]->clock_val; ++ else ++ dev_warn(kbdev->dev, "No GPU clock, unexpected intregration issue!"); ++ spin_unlock(&kbdev->pm.clk_rtm.lock); ++ ++ dev_info( ++ kbdev->dev, ++ "Can't get the timestamp frequency, use cycle counter format with firmware idle hysteresis!"); ++ } ++ ++ /* Formula for dur_val = ((dur_us/1000000) * freq_HZ) >> 10) */ ++ dur_val = (dur_val * freq) >> HYSTERESIS_VAL_UNIT_SHIFT; ++ dur_val = div_u64(dur_val, 1000000); ++ ++ /* Interface limits the value field to S32_MAX */ ++ cnt_val_u32 = (dur_val > S32_MAX) ? S32_MAX : (u32)dur_val; ++ ++ reg_val_u32 = GLB_IDLE_TIMER_TIMEOUT_SET(0, cnt_val_u32); ++ /* add the source flag */ ++ if (src_system_timestamp) ++ reg_val_u32 = GLB_IDLE_TIMER_TIMER_SOURCE_SET(reg_val_u32, ++ GLB_IDLE_TIMER_TIMER_SOURCE_SYSTEM_TIMESTAMP); ++ else ++ reg_val_u32 = GLB_IDLE_TIMER_TIMER_SOURCE_SET(reg_val_u32, ++ GLB_IDLE_TIMER_TIMER_SOURCE_GPU_COUNTER); ++ ++ return reg_val_u32; ++} ++ ++u32 kbase_csf_firmware_get_gpu_idle_hysteresis_time(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ u32 dur; ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ dur = kbdev->csf.gpu_idle_hysteresis_us; ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ ++ return dur; ++} ++ ++u32 kbase_csf_firmware_set_gpu_idle_hysteresis_time(struct kbase_device *kbdev, u32 dur) ++{ ++ unsigned long flags; ++ const u32 hysteresis_val = convert_dur_to_idle_count(kbdev, dur); ++ ++ /* The 'fw_load_lock' is taken to synchronize against the deferred ++ * loading of FW, where the idle timer will be enabled. ++ */ ++ mutex_lock(&kbdev->fw_load_lock); ++ if (unlikely(!kbdev->csf.firmware_inited)) { ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ kbdev->csf.gpu_idle_hysteresis_us = dur; ++ kbdev->csf.gpu_idle_dur_count = hysteresis_val; ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ mutex_unlock(&kbdev->fw_load_lock); ++ goto end; ++ } ++ mutex_unlock(&kbdev->fw_load_lock); ++ ++ kbase_csf_scheduler_pm_active(kbdev); ++ if (kbase_csf_scheduler_wait_mcu_active(kbdev)) { ++ dev_err(kbdev->dev, ++ "Unable to activate the MCU, the idle hysteresis value shall remain unchanged"); ++ kbase_csf_scheduler_pm_idle(kbdev); ++ return kbdev->csf.gpu_idle_dur_count; ++ } ++ ++ /* The 'reg_lock' is also taken and is held till the update is not ++ * complete, to ensure the update of idle timer value by multiple Users ++ * gets serialized. ++ */ ++ mutex_lock(&kbdev->csf.reg_lock); ++ /* The firmware only reads the new idle timer value when the timer is ++ * disabled. ++ */ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ kbase_csf_firmware_disable_gpu_idle_timer(kbdev); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ /* Ensure that the request has taken effect */ ++ wait_for_global_request(kbdev, GLB_REQ_IDLE_DISABLE_MASK); ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ kbdev->csf.gpu_idle_hysteresis_us = dur; ++ kbdev->csf.gpu_idle_dur_count = hysteresis_val; ++ kbase_csf_firmware_enable_gpu_idle_timer(kbdev); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ wait_for_global_request(kbdev, GLB_REQ_IDLE_ENABLE_MASK); ++ mutex_unlock(&kbdev->csf.reg_lock); ++ ++ kbase_csf_scheduler_pm_idle(kbdev); ++ ++end: ++ dev_dbg(kbdev->dev, "CSF set firmware idle hysteresis count-value: 0x%.8x", ++ hysteresis_val); ++ ++ return hysteresis_val; ++} ++ ++static u32 convert_dur_to_core_pwroff_count(struct kbase_device *kbdev, const u32 dur_us) ++{ ++ /* Get the cntfreq_el0 value, which drives the SYSTEM_TIMESTAMP */ ++ u64 freq = arch_timer_get_cntfrq(); ++ u64 dur_val = dur_us; ++ u32 cnt_val_u32, reg_val_u32; ++ bool src_system_timestamp = freq > 0; ++ ++ if (!src_system_timestamp) { ++ /* Get the cycle_counter source alternative */ ++ spin_lock(&kbdev->pm.clk_rtm.lock); ++ if (kbdev->pm.clk_rtm.clks[0]) ++ freq = kbdev->pm.clk_rtm.clks[0]->clock_val; ++ else ++ dev_warn(kbdev->dev, "No GPU clock, unexpected integration issue!"); ++ spin_unlock(&kbdev->pm.clk_rtm.lock); ++ ++ dev_info( ++ kbdev->dev, ++ "Can't get the timestamp frequency, use cycle counter with MCU shader Core Poweroff timer!"); ++ } ++ ++ /* Formula for dur_val = ((dur_us/1e6) * freq_HZ) >> 10) */ ++ dur_val = (dur_val * freq) >> HYSTERESIS_VAL_UNIT_SHIFT; ++ dur_val = div_u64(dur_val, 1000000); ++ ++ /* Interface limits the value field to S32_MAX */ ++ cnt_val_u32 = (dur_val > S32_MAX) ? S32_MAX : (u32)dur_val; ++ ++ reg_val_u32 = GLB_PWROFF_TIMER_TIMEOUT_SET(0, cnt_val_u32); ++ /* add the source flag */ ++ if (src_system_timestamp) ++ reg_val_u32 = GLB_PWROFF_TIMER_TIMER_SOURCE_SET(reg_val_u32, ++ GLB_PWROFF_TIMER_TIMER_SOURCE_SYSTEM_TIMESTAMP); ++ else ++ reg_val_u32 = GLB_PWROFF_TIMER_TIMER_SOURCE_SET(reg_val_u32, ++ GLB_PWROFF_TIMER_TIMER_SOURCE_GPU_COUNTER); ++ ++ return reg_val_u32; ++} ++ ++u32 kbase_csf_firmware_get_mcu_core_pwroff_time(struct kbase_device *kbdev) ++{ ++ u32 pwroff; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ pwroff = kbdev->csf.mcu_core_pwroff_dur_us; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ return pwroff; ++} ++ ++u32 kbase_csf_firmware_set_mcu_core_pwroff_time(struct kbase_device *kbdev, u32 dur) ++{ ++ unsigned long flags; ++ const u32 pwroff = convert_dur_to_core_pwroff_count(kbdev, dur); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbdev->csf.mcu_core_pwroff_dur_us = dur; ++ kbdev->csf.mcu_core_pwroff_dur_count = pwroff; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ dev_dbg(kbdev->dev, "MCU shader Core Poweroff input update: 0x%.8x", pwroff); ++ ++ return pwroff; ++} ++ ++/** ++ * kbase_device_csf_iterator_trace_init - Send request to enable iterator ++ * trace port. ++ * @kbdev: Kernel base device pointer ++ * ++ * Return: 0 on success (or if enable request is not sent), or error ++ * code -EINVAL on failure of GPU to acknowledge enable request. ++ */ ++static int kbase_device_csf_iterator_trace_init(struct kbase_device *kbdev) ++{ ++ /* Enable the iterator trace port if supported by the GPU. ++ * It requires the GPU to have a nonzero "iter_trace_enable" ++ * property in the device tree, and the FW must advertise ++ * this feature in GLB_FEATURES. ++ */ ++ if (kbdev->pm.backend.gpu_powered) { ++ /* check device tree for iterator trace enable property */ ++ const void *iter_trace_param = of_get_property( ++ kbdev->dev->of_node, ++ "iter_trace_enable", NULL); ++ ++ const struct kbase_csf_global_iface *iface = ++ &kbdev->csf.global_iface; ++ ++ if (iter_trace_param) { ++ u32 iter_trace_value = be32_to_cpup(iter_trace_param); ++ ++ if ((iface->features & ++ GLB_FEATURES_ITER_TRACE_SUPPORTED_MASK) && ++ iter_trace_value) { ++ long ack_timeout; ++ ++ ack_timeout = kbase_csf_timeout_in_jiffies( ++ kbase_get_timeout_ms(kbdev, CSF_FIRMWARE_TIMEOUT)); ++ ++ /* write enable request to global input */ ++ kbase_csf_firmware_global_input_mask( ++ iface, GLB_REQ, ++ GLB_REQ_ITER_TRACE_ENABLE_MASK, ++ GLB_REQ_ITER_TRACE_ENABLE_MASK); ++ /* Ring global doorbell */ ++ kbase_csf_ring_doorbell(kbdev, ++ CSF_KERNEL_DOORBELL_NR); ++ ++ ack_timeout = wait_event_timeout( ++ kbdev->csf.event_wait, ++ !((kbase_csf_firmware_global_input_read( ++ iface, GLB_REQ) ^ ++ kbase_csf_firmware_global_output( ++ iface, GLB_ACK)) & ++ GLB_REQ_ITER_TRACE_ENABLE_MASK), ++ ack_timeout); ++ ++ return ack_timeout ? 0 : -EINVAL; ++ ++ } ++ } ++ ++ } ++ return 0; ++} ++ ++int kbase_csf_firmware_early_init(struct kbase_device *kbdev) ++{ ++ init_waitqueue_head(&kbdev->csf.event_wait); ++ kbdev->csf.interrupt_received = false; ++ ++ kbdev->csf.fw_timeout_ms = ++ kbase_get_timeout_ms(kbdev, CSF_FIRMWARE_TIMEOUT); ++ ++ kbdev->csf.mcu_core_pwroff_dur_us = DEFAULT_GLB_PWROFF_TIMEOUT_US; ++ kbdev->csf.mcu_core_pwroff_dur_count = convert_dur_to_core_pwroff_count( ++ kbdev, DEFAULT_GLB_PWROFF_TIMEOUT_US); ++ ++ INIT_LIST_HEAD(&kbdev->csf.firmware_interfaces); ++ INIT_LIST_HEAD(&kbdev->csf.firmware_config); ++ INIT_LIST_HEAD(&kbdev->csf.firmware_timeline_metadata); ++ INIT_LIST_HEAD(&kbdev->csf.firmware_trace_buffers.list); ++ INIT_LIST_HEAD(&kbdev->csf.user_reg.list); ++ INIT_WORK(&kbdev->csf.firmware_reload_work, ++ kbase_csf_firmware_reload_worker); ++ INIT_WORK(&kbdev->csf.fw_error_work, firmware_error_worker); ++ ++ mutex_init(&kbdev->csf.reg_lock); ++ ++ kbdev->csf.fw = (struct kbase_csf_mcu_fw){ .data = NULL }; ++ ++ return 0; ++} ++ ++void kbase_csf_firmware_early_term(struct kbase_device *kbdev) ++{ ++ mutex_destroy(&kbdev->csf.reg_lock); ++} ++ ++int kbase_csf_firmware_late_init(struct kbase_device *kbdev) ++{ ++ kbdev->csf.gpu_idle_hysteresis_us = FIRMWARE_IDLE_HYSTERESIS_TIME_USEC; ++#ifdef KBASE_PM_RUNTIME ++ if (kbase_pm_gpu_sleep_allowed(kbdev)) ++ kbdev->csf.gpu_idle_hysteresis_us /= FIRMWARE_IDLE_HYSTERESIS_GPU_SLEEP_SCALER; ++#endif ++ WARN_ON(!kbdev->csf.gpu_idle_hysteresis_us); ++ kbdev->csf.gpu_idle_dur_count = ++ convert_dur_to_idle_count(kbdev, kbdev->csf.gpu_idle_hysteresis_us); ++ ++ return 0; ++} ++ ++int kbase_csf_firmware_load_init(struct kbase_device *kbdev) ++{ ++ const struct firmware *firmware = NULL; ++ struct kbase_csf_mcu_fw *const mcu_fw = &kbdev->csf.fw; + const u32 magic = FIRMWARE_HEADER_MAGIC; + u8 version_major, version_minor; + u32 version_hash; @@ -162965,6 +175247,8 @@ index 000000000000..4a924f346685 + u32 entry_offset; + int ret; + ++ lockdep_assert_held(&kbdev->fw_load_lock); ++ + if (WARN_ON((kbdev->as_free & MCU_AS_BITMASK) == 0)) + return -EINVAL; + kbdev->as_free &= ~MCU_AS_BITMASK; @@ -162978,22 +175262,11 @@ index 000000000000..4a924f346685 + return ret; + } + -+ init_waitqueue_head(&kbdev->csf.event_wait); -+ kbdev->csf.interrupt_received = false; -+ -+ INIT_LIST_HEAD(&kbdev->csf.firmware_interfaces); -+ INIT_LIST_HEAD(&kbdev->csf.firmware_config); -+ INIT_LIST_HEAD(&kbdev->csf.firmware_timeline_metadata); -+ INIT_LIST_HEAD(&kbdev->csf.firmware_trace_buffers.list); -+ INIT_WORK(&kbdev->csf.firmware_reload_work, -+ kbase_csf_firmware_reload_worker); -+ -+ mutex_init(&kbdev->csf.reg_lock); -+ + ret = kbase_mcu_shared_interface_region_tracker_init(kbdev); + if (ret != 0) { -+ dev_err(kbdev->dev, "Failed to setup the rb tree for managing shared interface segment\n"); -+ goto error; ++ dev_err(kbdev->dev, ++ "Failed to setup the rb tree for managing shared interface segment\n"); ++ goto err_out; + } + + if (request_firmware(&firmware, fw_name, kbdev->dev) != 0) { @@ -163001,43 +175274,60 @@ index 000000000000..4a924f346685 + "Failed to load firmware image '%s'\n", + fw_name); + ret = -ENOENT; -+ goto error; ++ } else { ++ /* Try to save a copy and then release the loaded firmware image */ ++ mcu_fw->size = firmware->size; ++ mcu_fw->data = vmalloc((unsigned long)mcu_fw->size); ++ ++ if (mcu_fw->data == NULL) { ++ ret = -ENOMEM; ++ } else { ++ memcpy(mcu_fw->data, firmware->data, mcu_fw->size); ++ dev_dbg(kbdev->dev, "Firmware image (%zu-bytes) retained in csf.fw\n", ++ mcu_fw->size); ++ } ++ ++ release_firmware(firmware); + } + -+ if (firmware->size < FIRMWARE_HEADER_LENGTH) { ++ /* If error in loading or saving the image, branches to error out */ ++ if (ret) ++ goto err_out; ++ ++ if (mcu_fw->size < FIRMWARE_HEADER_LENGTH) { + dev_err(kbdev->dev, "Firmware too small\n"); + ret = -EINVAL; -+ goto error; ++ goto err_out; + } + -+ if (memcmp(firmware->data, &magic, sizeof(magic)) != 0) { ++ if (memcmp(mcu_fw->data, &magic, sizeof(magic)) != 0) { + dev_err(kbdev->dev, "Incorrect firmware magic\n"); + ret = -EINVAL; -+ goto error; ++ goto err_out; + } + -+ version_major = firmware->data[4]; -+ version_minor = firmware->data[5]; ++ version_minor = mcu_fw->data[4]; ++ version_major = mcu_fw->data[5]; + -+ if (version_major != FIRMWARE_HEADER_VERSION) { ++ if (version_major != FIRMWARE_HEADER_VERSION_MAJOR || ++ version_minor != FIRMWARE_HEADER_VERSION_MINOR) { + dev_err(kbdev->dev, + "Firmware header version %d.%d not understood\n", + version_major, version_minor); + ret = -EINVAL; -+ goto error; ++ goto err_out; + } + -+ memcpy(&version_hash, &firmware->data[8], sizeof(version_hash)); ++ memcpy(&version_hash, &mcu_fw->data[8], sizeof(version_hash)); + + dev_notice(kbdev->dev, "Loading Mali firmware 0x%x", version_hash); + -+ memcpy(&entry_end_offset, &firmware->data[0x10], -+ sizeof(entry_end_offset)); ++ memcpy(&entry_end_offset, &mcu_fw->data[0x10], sizeof(entry_end_offset)); + -+ if (entry_end_offset > firmware->size) { ++ if (entry_end_offset > mcu_fw->size) { + dev_err(kbdev->dev, "Firmware image is truncated\n"); + ret = -EINVAL; -+ goto error; ++ goto err_out; + } + + entry_offset = FIRMWARE_HEADER_LENGTH; @@ -163045,15 +175335,14 @@ index 000000000000..4a924f346685 + u32 header; + unsigned int size; + -+ memcpy(&header, &firmware->data[entry_offset], sizeof(header)); ++ memcpy(&header, &mcu_fw->data[entry_offset], sizeof(header)); + + size = entry_size(header); + -+ ret = load_firmware_entry(kbdev, firmware, entry_offset, -+ header); ++ ret = load_firmware_entry(kbdev, mcu_fw, entry_offset, header); + if (ret != 0) { + dev_err(kbdev->dev, "Failed to load firmware image\n"); -+ goto error; ++ goto err_out; + } + entry_offset += size; + } @@ -163061,86 +175350,118 @@ index 000000000000..4a924f346685 + if (!kbdev->csf.shared_interface) { + dev_err(kbdev->dev, "Shared interface region not found\n"); + ret = -EINVAL; -+ goto error; ++ goto err_out; + } else { + ret = setup_shared_iface_static_region(kbdev); + if (ret != 0) { + dev_err(kbdev->dev, "Failed to insert a region for shared iface entry parsed from fw image\n"); -+ goto error; ++ goto err_out; + } + } + + ret = kbase_csf_firmware_trace_buffers_init(kbdev); + if (ret != 0) { + dev_err(kbdev->dev, "Failed to initialize trace buffers\n"); -+ goto error; ++ goto err_out; + } + + /* Make sure L2 cache is powered up */ + kbase_pm_wait_for_l2_powered(kbdev); + + /* Load the MMU tables into the selected address space */ -+ load_mmu_tables(kbdev); ++ ret = load_mmu_tables(kbdev); ++ if (ret != 0) ++ goto err_out; + + boot_csf_firmware(kbdev); + + ret = parse_capabilities(kbdev); + if (ret != 0) -+ goto error; ++ goto err_out; + + ret = kbase_csf_doorbell_mapping_init(kbdev); + if (ret != 0) -+ goto error; ++ goto err_out; + + ret = kbase_csf_scheduler_init(kbdev); + if (ret != 0) -+ goto error; ++ goto err_out; ++ ++ ret = kbase_csf_setup_dummy_user_reg_page(kbdev); ++ if (ret != 0) ++ goto err_out; + + ret = kbase_csf_timeout_init(kbdev); + if (ret != 0) -+ goto error; ++ goto err_out; + + ret = global_init_on_boot(kbdev); + if (ret != 0) -+ goto error; ++ goto err_out; + + ret = kbase_csf_firmware_cfg_init(kbdev); + if (ret != 0) -+ goto error; ++ goto err_out; + -+ /* Firmware loaded successfully */ -+ release_firmware(firmware); -+ KBASE_KTRACE_ADD(kbdev, FIRMWARE_BOOT, NULL, ++ ret = kbase_device_csf_iterator_trace_init(kbdev); ++ if (ret != 0) ++ goto err_out; ++ ++ ret = kbase_csf_firmware_log_init(kbdev); ++ if (ret != 0) { ++ dev_err(kbdev->dev, "Failed to initialize FW trace (err %d)", ret); ++ goto err_out; ++ } ++ ++ if (kbdev->csf.fw_core_dump.available) ++ kbase_csf_firmware_core_dump_init(kbdev); ++ ++ /* Firmware loaded successfully, ret = 0 */ ++ KBASE_KTRACE_ADD(kbdev, CSF_FIRMWARE_BOOT, NULL, + (((u64)version_hash) << 32) | + (((u64)version_major) << 8) | version_minor); + return 0; + -+error: -+ kbase_csf_firmware_term(kbdev); -+ release_firmware(firmware); ++err_out: ++ kbase_csf_firmware_unload_term(kbdev); + return ret; +} + -+void kbase_csf_firmware_term(struct kbase_device *kbdev) ++void kbase_csf_firmware_unload_term(struct kbase_device *kbdev) +{ + unsigned long flags; + int ret = 0; + -+ while (kbase_reset_gpu_is_active(kbdev) && !ret) -+ ret = kbase_reset_gpu_wait(kbdev); ++ cancel_work_sync(&kbdev->csf.fw_error_work); ++ ++ ret = kbase_reset_gpu_wait(kbdev); + + WARN(ret, "failed to wait for GPU reset"); + -+ /* Make sure ongoing transitions have completed */ -+ kbase_pm_wait_for_desired_state(kbdev); ++ kbase_csf_firmware_log_term(kbdev); + + kbase_csf_firmware_cfg_term(kbdev); + + kbase_csf_timeout_term(kbdev); + ++ kbase_csf_free_dummy_user_reg_page(kbdev); ++ ++ kbase_csf_scheduler_term(kbdev); ++ ++ kbase_csf_doorbell_mapping_term(kbdev); ++ ++ /* Explicitly trigger the disabling of MCU through the state machine and ++ * wait for its completion. It may not have been disabled yet due to the ++ * power policy. ++ */ ++ kbdev->pm.backend.mcu_desired = false; ++ kbase_pm_wait_for_desired_state(kbdev); ++ ++ free_global_iface(kbdev); ++ + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + kbdev->csf.firmware_inited = false; -+ if (kbdev->pm.backend.mcu_state != KBASE_MCU_OFF) { ++ if (WARN_ON(kbdev->pm.backend.mcu_state != KBASE_MCU_OFF)) { + kbdev->pm.backend.mcu_state = KBASE_MCU_OFF; + stop_csf_firmware(kbdev); + } @@ -163148,36 +175469,37 @@ index 000000000000..4a924f346685 + + unload_mmu_tables(kbdev); + -+ kbase_mmu_term(kbdev, &kbdev->csf.mcu_mmu); -+ -+ kbase_csf_scheduler_term(kbdev); -+ -+ kbase_csf_doorbell_mapping_term(kbdev); -+ -+ free_global_iface(kbdev); -+ -+ /* Release the address space */ -+ kbdev->as_free |= MCU_AS_BITMASK; ++ kbase_csf_firmware_trace_buffers_term(kbdev); + + while (!list_empty(&kbdev->csf.firmware_interfaces)) { -+ struct firmware_interface *interface; ++ struct kbase_csf_firmware_interface *interface; + -+ interface = list_first_entry(&kbdev->csf.firmware_interfaces, -+ struct firmware_interface, node); ++ interface = ++ list_first_entry(&kbdev->csf.firmware_interfaces, ++ struct kbase_csf_firmware_interface, ++ node); + list_del(&interface->node); + + vunmap(interface->kernel_map); -+ if (interface->flags & CSF_FIRMWARE_ENTRY_PROTECTED) { -+ kbase_csf_protected_memory_free(kbdev, interface->pma, -+ interface->num_pages); -+ } else { -+ kbase_mem_pool_free_pages( -+ &kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], -+ interface->num_pages, interface->phys, -+ true, false); ++ ++ if (!interface->reuse_pages) { ++ if (interface->flags & CSF_FIRMWARE_ENTRY_PROTECTED) { ++ kbase_csf_protected_memory_free( ++ kbdev, interface->pma, interface->num_pages_aligned, ++ interface->is_small_page); ++ } else { ++ kbase_mem_pool_free_pages( ++ kbase_mem_pool_group_select( ++ kbdev, KBASE_MEM_GROUP_CSF_FW, ++ interface->is_small_page), ++ interface->num_pages_aligned, ++ interface->phys, ++ true, false); ++ } ++ ++ kfree(interface->phys); + } + -+ kfree(interface->phys); + kfree(interface); + } + @@ -163193,21 +175515,171 @@ index 000000000000..4a924f346685 + kfree(metadata); + } + -+ kbase_csf_firmware_trace_buffers_term(kbdev); -+ -+#ifndef MALI_KBASE_BUILD -+ mali_kutf_fw_utf_entry_cleanup(kbdev); -+#endif -+ -+ mutex_destroy(&kbdev->csf.reg_lock); ++ if (kbdev->csf.fw.data) { ++ /* Free the copy of the firmware image */ ++ vfree(kbdev->csf.fw.data); ++ kbdev->csf.fw.data = NULL; ++ dev_dbg(kbdev->dev, "Free retained image csf.fw (%zu-bytes)\n", kbdev->csf.fw.size); ++ } + + /* This will also free up the region allocated for the shared interface + * entry parsed from the firmware image. + */ + kbase_mcu_shared_interface_region_tracker_term(kbdev); ++ ++ kbase_mmu_term(kbdev, &kbdev->csf.mcu_mmu); ++ ++ /* Release the address space */ ++ kbdev->as_free |= MCU_AS_BITMASK; ++} ++ ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++int kbase_csf_firmware_mcu_register_write(struct kbase_device *const kbdev, u32 const reg_addr, ++ u32 const reg_val) ++{ ++ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; ++ unsigned long flags; ++ int err; ++ u32 glb_req; ++ ++ mutex_lock(&kbdev->csf.reg_lock); ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ ++ /* Set the address and value to write */ ++ kbase_csf_firmware_global_input(global_iface, GLB_DEBUG_ARG_IN0, reg_addr); ++ kbase_csf_firmware_global_input(global_iface, GLB_DEBUG_ARG_IN1, reg_val); ++ ++ /* Set the Global Debug request for FW MCU write */ ++ glb_req = kbase_csf_firmware_global_output(global_iface, GLB_DEBUG_ACK); ++ glb_req ^= GLB_DEBUG_REQ_FW_AS_WRITE_MASK; ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_DEBUG_REQ, glb_req, ++ GLB_DEBUG_REQ_FW_AS_WRITE_MASK); ++ ++ set_global_request(global_iface, GLB_REQ_DEBUG_CSF_REQ_MASK); ++ ++ /* Notify FW about the Global Debug request */ ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++ ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ ++ err = wait_for_global_request(kbdev, GLB_REQ_DEBUG_CSF_REQ_MASK); ++ ++ mutex_unlock(&kbdev->csf.reg_lock); ++ ++ dev_dbg(kbdev->dev, "w: reg %08x val %08x", reg_addr, reg_val); ++ ++ return err; ++} ++ ++int kbase_csf_firmware_mcu_register_read(struct kbase_device *const kbdev, u32 const reg_addr, ++ u32 *reg_val) ++{ ++ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; ++ unsigned long flags; ++ int err; ++ u32 glb_req; ++ ++ if (WARN_ON(reg_val == NULL)) ++ return -EINVAL; ++ ++ mutex_lock(&kbdev->csf.reg_lock); ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ ++ /* Set the address to read */ ++ kbase_csf_firmware_global_input(global_iface, GLB_DEBUG_ARG_IN0, reg_addr); ++ ++ /* Set the Global Debug request for FW MCU read */ ++ glb_req = kbase_csf_firmware_global_output(global_iface, GLB_DEBUG_ACK); ++ glb_req ^= GLB_DEBUG_REQ_FW_AS_READ_MASK; ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_DEBUG_REQ, glb_req, ++ GLB_DEBUG_REQ_FW_AS_READ_MASK); ++ ++ set_global_request(global_iface, GLB_REQ_DEBUG_CSF_REQ_MASK); ++ ++ /* Notify FW about the Global Debug request */ ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++ ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ ++ err = wait_for_global_request(kbdev, GLB_REQ_DEBUG_CSF_REQ_MASK); ++ ++ if (!err) { ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ *reg_val = kbase_csf_firmware_global_output(global_iface, GLB_DEBUG_ARG_OUT0); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ } ++ ++ mutex_unlock(&kbdev->csf.reg_lock); ++ ++ dev_dbg(kbdev->dev, "r: reg %08x val %08x", reg_addr, *reg_val); ++ ++ return err; ++} ++ ++int kbase_csf_firmware_mcu_register_poll(struct kbase_device *const kbdev, u32 const reg_addr, ++ u32 const val_mask, u32 const reg_val) ++{ ++ unsigned long remaining = kbase_csf_timeout_in_jiffies(kbdev->csf.fw_timeout_ms) + jiffies; ++ u32 read_val; ++ ++ dev_dbg(kbdev->dev, "p: reg %08x val %08x mask %08x", reg_addr, reg_val, val_mask); ++ ++ while (time_before(jiffies, remaining)) { ++ int err = kbase_csf_firmware_mcu_register_read(kbdev, reg_addr, &read_val); ++ ++ if (err) { ++ dev_err(kbdev->dev, ++ "Error reading MCU register value (read_val = %u, expect = %u)\n", ++ read_val, reg_val); ++ return err; ++ } ++ ++ if ((read_val & val_mask) == reg_val) ++ return 0; ++ } ++ ++ dev_err(kbdev->dev, ++ "Timeout waiting for MCU register value to be set (read_val = %u, expect = %u)\n", ++ read_val, reg_val); ++ ++ return -ETIMEDOUT; ++} ++#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ ++ ++void kbase_csf_firmware_enable_gpu_idle_timer(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; ++ const u32 glb_req = kbase_csf_firmware_global_input_read(global_iface, GLB_REQ); ++ ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ /* The scheduler is assumed to only call the enable when its internal ++ * state indicates that the idle timer has previously been disabled. So ++ * on entry the expected field values are: ++ * 1. GLOBAL_INPUT_BLOCK.GLB_REQ.IDLE_ENABLE: 0 ++ * 2. GLOBAL_OUTPUT_BLOCK.GLB_ACK.IDLE_ENABLE: 0, or, on 1 -> 0 ++ */ ++ if (glb_req & GLB_REQ_IDLE_ENABLE_MASK) ++ dev_err(kbdev->dev, "Incoherent scheduler state on REQ_IDLE_ENABLE!"); ++ ++ enable_gpu_idle_timer(kbdev); ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++} ++ ++void kbase_csf_firmware_disable_gpu_idle_timer(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; ++ ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_REQ, ++ GLB_REQ_REQ_IDLE_DISABLE, ++ GLB_REQ_IDLE_DISABLE_MASK); ++ dev_dbg(kbdev->dev, "Sending request to disable gpu idle timer"); ++ ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); +} + -+int kbase_csf_firmware_ping(struct kbase_device *const kbdev) ++void kbase_csf_firmware_ping(struct kbase_device *const kbdev) +{ + const struct kbase_csf_global_iface *const global_iface = + &kbdev->csf.global_iface; @@ -163217,8 +175689,13 @@ index 000000000000..4a924f346685 + set_global_request(global_iface, GLB_REQ_PING_MASK); + kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); + kbase_csf_scheduler_spin_unlock(kbdev, flags); ++} + -+ return wait_for_global_request(kbdev, GLB_REQ_PING_MASK); ++int kbase_csf_firmware_ping_wait(struct kbase_device *const kbdev, unsigned int wait_timeout_ms) ++{ ++ kbase_csf_firmware_ping(kbdev); ++ ++ return wait_for_global_request_with_timeout(kbdev, GLB_REQ_PING_MASK, wait_timeout_ms); +} + +int kbase_csf_firmware_set_timeout(struct kbase_device *const kbdev, @@ -163248,52 +175725,161 @@ index 000000000000..4a924f346685 +void kbase_csf_enter_protected_mode(struct kbase_device *kbdev) +{ + struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; -+ unsigned long flags; -+ unsigned int value; + -+ kbase_csf_scheduler_spin_lock(kbdev, &flags); -+ value = kbase_csf_firmware_global_output(global_iface, GLB_ACK); -+ value ^= GLB_REQ_PROTM_ENTER_MASK; -+ kbase_csf_firmware_global_input_mask(global_iface, GLB_REQ, value, -+ GLB_REQ_PROTM_ENTER_MASK); ++ KBASE_TLSTREAM_AUX_PROTECTED_ENTER_START(kbdev, kbdev); ++ ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ set_global_request(global_iface, GLB_REQ_PROTM_ENTER_MASK); + dev_dbg(kbdev->dev, "Sending request to enter protected mode"); + kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); -+ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++} ++ ++int kbase_csf_wait_protected_mode_enter(struct kbase_device *kbdev) ++{ ++ int err; ++ ++ lockdep_assert_held(&kbdev->mmu_hw_mutex); ++ ++ err = wait_for_global_request(kbdev, GLB_REQ_PROTM_ENTER_MASK); ++ ++ if (!err) { ++#define WAIT_TIMEOUT 5000 /* 50ms timeout */ ++#define DELAY_TIME_IN_US 10 ++ const int max_iterations = WAIT_TIMEOUT; ++ int loop; ++ ++ /* Wait for the GPU to actually enter protected mode */ ++ for (loop = 0; loop < max_iterations; loop++) { ++ unsigned long flags; ++ bool pmode_exited; ++ ++ if (kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_STATUS)) & ++ GPU_STATUS_PROTECTED_MODE_ACTIVE) ++ break; ++ ++ /* Check if GPU already exited the protected mode */ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ pmode_exited = ++ !kbase_csf_scheduler_protected_mode_in_use(kbdev); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ if (pmode_exited) ++ break; ++ ++ udelay(DELAY_TIME_IN_US); ++ } ++ ++ if (loop == max_iterations) { ++ dev_err(kbdev->dev, "Timeout for actual pmode entry after PROTM_ENTER ack"); ++ err = -ETIMEDOUT; ++ } ++ } ++ ++ if (unlikely(err)) { ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) ++ kbase_reset_gpu(kbdev); ++ } ++ ++ KBASE_TLSTREAM_AUX_PROTECTED_ENTER_END(kbdev, kbdev); + -+ wait_for_global_request(kbdev, GLB_REQ_PROTM_ENTER_MASK); ++ return err; +} + +void kbase_csf_firmware_trigger_mcu_halt(struct kbase_device *kbdev) +{ + struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; + unsigned long flags; -+ unsigned int value; ++ ++ KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_REQUEST_HALT(kbdev, kbase_backend_get_cycle_cnt(kbdev)); + + kbase_csf_scheduler_spin_lock(kbdev, &flags); -+ value = kbase_csf_firmware_global_output(global_iface, GLB_ACK); -+ value ^= GLB_REQ_HALT_MASK; -+ kbase_csf_firmware_global_input_mask(global_iface, GLB_REQ, value, -+ GLB_REQ_HALT_MASK); ++ /* Validate there are no on-slot groups when sending the ++ * halt request to firmware. ++ */ ++ WARN_ON(kbase_csf_scheduler_get_nr_active_csgs_locked(kbdev)); ++ set_global_request(global_iface, GLB_REQ_HALT_MASK); + dev_dbg(kbdev->dev, "Sending request to HALT MCU"); + kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); + kbase_csf_scheduler_spin_unlock(kbdev, flags); +} + ++void kbase_csf_firmware_enable_mcu(struct kbase_device *kbdev) ++{ ++ KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_ENABLING(kbdev, kbase_backend_get_cycle_cnt(kbdev)); ++ ++ /* Trigger the boot of MCU firmware, Use the AUTO mode as ++ * otherwise on fast reset, to exit protected mode, MCU will ++ * not reboot by itself to enter normal mode. ++ */ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(MCU_CONTROL), MCU_CNTRL_AUTO); ++} ++ ++#ifdef KBASE_PM_RUNTIME ++void kbase_csf_firmware_trigger_mcu_sleep(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; ++ unsigned long flags; ++ ++ KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_REQUEST_SLEEP(kbdev, kbase_backend_get_cycle_cnt(kbdev)); ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ set_global_request(global_iface, GLB_REQ_SLEEP_MASK); ++ dev_dbg(kbdev->dev, "Sending sleep request to MCU"); ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++} ++ ++bool kbase_csf_firmware_is_mcu_in_sleep(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ return (global_request_complete(kbdev, GLB_REQ_SLEEP_MASK) && ++ kbase_csf_firmware_mcu_halted(kbdev)); ++} ++#endif ++ ++int kbase_csf_trigger_firmware_config_update(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; ++ unsigned long flags; ++ int err = 0; ++ ++ /* Ensure GPU is powered-up until we complete config update.*/ ++ kbase_csf_scheduler_pm_active(kbdev); ++ kbase_csf_scheduler_wait_mcu_active(kbdev); ++ ++ /* The 'reg_lock' is also taken and is held till the update is ++ * complete, to ensure the config update gets serialized. ++ */ ++ mutex_lock(&kbdev->csf.reg_lock); ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ ++ set_global_request(global_iface, GLB_REQ_FIRMWARE_CONFIG_UPDATE_MASK); ++ dev_dbg(kbdev->dev, "Sending request for FIRMWARE_CONFIG_UPDATE"); ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ ++ err = wait_for_global_request(kbdev, ++ GLB_REQ_FIRMWARE_CONFIG_UPDATE_MASK); ++ mutex_unlock(&kbdev->csf.reg_lock); ++ ++ kbase_csf_scheduler_pm_idle(kbdev); ++ return err; ++} ++ +/** -+ * copy_grp_and_stm - Copy command stream and/or group data ++ * copy_grp_and_stm - Copy CS and/or group data + * -+ * @iface: Global command stream front-end interface provided by -+ * the firmware. ++ * @iface: Global CSF interface provided by the firmware. + * @group_data: Pointer where to store all the group data + * (sequentially). + * @max_group_num: The maximum number of groups to be read. Can be 0, in + * which case group_data is unused. -+ * @stream_data: Pointer where to store all the stream data ++ * @stream_data: Pointer where to store all the CS data + * (sequentially). -+ * @max_total_stream_num: The maximum number of streams to be read. ++ * @max_total_stream_num: The maximum number of CSs to be read. + * Can be 0, in which case stream_data is unused. + * -+ * Return: Total number of command streams, summed across all groups. ++ * Return: Total number of CSs, summed across all groups. + */ +static u32 copy_grp_and_stm( + const struct kbase_csf_global_iface * const iface, @@ -163330,26 +175916,28 @@ index 000000000000..4a924f346685 + return total_stream_num; +} + -+u32 kbase_csf_firmware_get_glb_iface(struct kbase_device *kbdev, ++u32 kbase_csf_firmware_get_glb_iface( ++ struct kbase_device *kbdev, + struct basep_cs_group_control *const group_data, + u32 const max_group_num, + struct basep_cs_stream_control *const stream_data, + u32 const max_total_stream_num, u32 *const glb_version, -+ u32 *const features, u32 *const group_num, u32 *const prfcnt_size) ++ u32 *const features, u32 *const group_num, u32 *const prfcnt_size, ++ u32 *instr_features) +{ + const struct kbase_csf_global_iface * const iface = + &kbdev->csf.global_iface; + -+ if (WARN_ON(!glb_version) || -+ WARN_ON(!features) || -+ WARN_ON(!group_num) || -+ WARN_ON(!prfcnt_size)) ++ if (WARN_ON(!glb_version) || WARN_ON(!features) || ++ WARN_ON(!group_num) || WARN_ON(!prfcnt_size) || ++ WARN_ON(!instr_features)) + return 0; + + *glb_version = iface->version; + *features = iface->features; + *group_num = iface->group_num; + *prfcnt_size = iface->prfcnt_size; ++ *instr_features = iface->instr_features; + + return copy_grp_and_stm(iface, group_data, max_group_num, + stream_data, max_total_stream_num); @@ -163397,7 +175985,7 @@ index 000000000000..4a924f346685 + gpu_map_prot = + KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_NON_CACHEABLE); + cpu_map_prot = pgprot_writecombine(cpu_map_prot); -+ }; ++ } + + phys = kmalloc_array(num_pages, sizeof(*phys), GFP_KERNEL); + if (!phys) @@ -163407,9 +175995,8 @@ index 000000000000..4a924f346685 + if (!page_list) + goto page_list_alloc_error; + -+ ret = kbase_mem_pool_alloc_pages( -+ &kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], -+ num_pages, phys, false); ++ ret = kbase_mem_pool_alloc_pages(&kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], num_pages, ++ phys, false, NULL); + if (ret <= 0) + goto phys_mem_pool_alloc_error; + @@ -163420,24 +176007,24 @@ index 000000000000..4a924f346685 + if (!cpu_addr) + goto vmap_error; + -+ va_reg = kbase_alloc_free_region(&kbdev->csf.shared_reg_rbtree, 0, -+ num_pages, KBASE_REG_ZONE_MCU_SHARED); ++ va_reg = kbase_alloc_free_region(kbdev, &kbdev->csf.shared_reg_rbtree, 0, num_pages, ++ KBASE_REG_ZONE_MCU_SHARED); + if (!va_reg) + goto va_region_alloc_error; + + mutex_lock(&kbdev->csf.reg_lock); + ret = kbase_add_va_region_rbtree(kbdev, va_reg, 0, num_pages, 1); + va_reg->flags &= ~KBASE_REG_FREE; -+ mutex_unlock(&kbdev->csf.reg_lock); + if (ret) + goto va_region_add_error; ++ mutex_unlock(&kbdev->csf.reg_lock); + + gpu_map_properties &= (KBASE_REG_GPU_RD | KBASE_REG_GPU_WR); + gpu_map_properties |= gpu_map_prot; + -+ ret = kbase_mmu_insert_pages_no_flush(kbdev, &kbdev->csf.mcu_mmu, -+ va_reg->start_pfn, &phys[0], num_pages, -+ gpu_map_properties, KBASE_MEM_GROUP_CSF_FW); ++ ret = kbase_mmu_insert_pages_no_flush(kbdev, &kbdev->csf.mcu_mmu, va_reg->start_pfn, ++ &phys[0], num_pages, gpu_map_properties, ++ KBASE_MEM_GROUP_CSF_FW, NULL, NULL, false); + if (ret) + goto mmu_insert_pages_error; + @@ -163451,10 +176038,10 @@ index 000000000000..4a924f346685 + +mmu_insert_pages_error: + mutex_lock(&kbdev->csf.reg_lock); -+ kbase_remove_va_region(va_reg); -+ mutex_unlock(&kbdev->csf.reg_lock); ++ kbase_remove_va_region(kbdev, va_reg); +va_region_add_error: + kbase_free_alloced_region(va_reg); ++ mutex_unlock(&kbdev->csf.reg_lock); +va_region_alloc_error: + vunmap(cpu_addr); +vmap_error: @@ -163468,7 +176055,8 @@ index 000000000000..4a924f346685 + kfree(phys); +out: + /* Zero-initialize the mapping to make sure that the termination -+ * function doesn't try to unmap or free random addresses. */ ++ * function doesn't try to unmap or free random addresses. ++ */ + csf_mapping->phys = NULL; + csf_mapping->cpu_addr = NULL; + csf_mapping->va_reg = NULL; @@ -163482,9 +176070,9 @@ index 000000000000..4a924f346685 +{ + if (csf_mapping->va_reg) { + mutex_lock(&kbdev->csf.reg_lock); -+ kbase_remove_va_region(csf_mapping->va_reg); -+ mutex_unlock(&kbdev->csf.reg_lock); ++ kbase_remove_va_region(kbdev, csf_mapping->va_reg); + kbase_free_alloced_region(csf_mapping->va_reg); ++ mutex_unlock(&kbdev->csf.reg_lock); + } + + if (csf_mapping->phys) { @@ -163499,18 +176087,19 @@ index 000000000000..4a924f346685 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h new file mode 100755 -index 000000000000..03a5217cffb0 +index 000000000..714a14001 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h -@@ -0,0 +1,663 @@ +@@ -0,0 +1,916 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -163521,15 +176110,13 @@ index 000000000000..03a5217cffb0 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CSF_FIRMWARE_H_ +#define _KBASE_CSF_FIRMWARE_H_ + +#include "device/mali_kbase_device.h" -+#include "mali_gpu_csf_registers.h" ++#include + +/* + * PAGE_KERNEL_RO was only defined on 32bit ARM in 4.19 in: @@ -163576,12 +176163,12 @@ index 000000000000..03a5217cffb0 +/* All implementations of the host interface with major version 0 must comply + * with these restrictions: + */ -+/* GLB_GROUP_NUM: At least 3 command stream groups, but no more than 31 */ ++/* GLB_GROUP_NUM: At least 3 CSGs, but no more than 31 */ +#define MIN_SUPPORTED_CSGS 3 +#define MAX_SUPPORTED_CSGS 31 -+/* GROUP_STREAM_NUM: At least 8 command streams per CSG, but no more than 32 */ ++/* GROUP_STREAM_NUM: At least 8 CSs per CSG, but no more than 32 */ +#define MIN_SUPPORTED_STREAMS_PER_GROUP 8 -+/* Maximum command streams per csg. */ ++/* MAX_SUPPORTED_STREAMS_PER_GROUP: Maximum CSs per csg. */ +#define MAX_SUPPORTED_STREAMS_PER_GROUP 32 + +struct kbase_device; @@ -163616,16 +176203,15 @@ index 000000000000..03a5217cffb0 +}; + +/** -+ * struct kbase_csf_cmd_stream_info - Command stream interface provided by the -+ * firmware. ++ * struct kbase_csf_cmd_stream_info - CSI provided by the firmware. + * + * @kbdev: Address of the instance of a GPU platform device that implements + * this interface. -+ * @features: Bit field of command stream features (e.g. which types of jobs ++ * @features: Bit field of CS features (e.g. which types of jobs + * are supported). Bits 7:0 specify the number of work registers(-1). + * Bits 11:8 specify the number of scoreboard entries(-1). -+ * @input: Address of command stream interface input page. -+ * @output: Address of command stream interface output page. ++ * @input: Address of CSI input page. ++ * @output: Address of CSI output page. + */ +struct kbase_csf_cmd_stream_info { + struct kbase_device *kbdev; @@ -163635,9 +176221,9 @@ index 000000000000..03a5217cffb0 +}; + +/** -+ * kbase_csf_firmware_cs_input() - Set a word in a command stream's input page ++ * kbase_csf_firmware_cs_input() - Set a word in a CS's input page + * -+ * @info: Command stream interface provided by the firmware. ++ * @info: CSI provided by the firmware. + * @offset: Offset of the word to be written, in bytes. + * @value: Value to be written. + */ @@ -163645,22 +176231,20 @@ index 000000000000..03a5217cffb0 + const struct kbase_csf_cmd_stream_info *info, u32 offset, u32 value); + +/** -+ * kbase_csf_firmware_cs_input_read() - Read a word in a command stream's input -+ * page ++ * kbase_csf_firmware_cs_input_read() - Read a word in a CS's input page + * -+ * Return: Value of the word read from the command stream's input page. ++ * Return: Value of the word read from the CS's input page. + * -+ * @info: Command stream interface provided by the firmware. ++ * @info: CSI provided by the firmware. + * @offset: Offset of the word to be read, in bytes. + */ +u32 kbase_csf_firmware_cs_input_read( + const struct kbase_csf_cmd_stream_info *const info, const u32 offset); + +/** -+ * kbase_csf_firmware_cs_input_mask() - Set part of a word in a command stream's -+ * input page ++ * kbase_csf_firmware_cs_input_mask() - Set part of a word in a CS's input page + * -+ * @info: Command stream interface provided by the firmware. ++ * @info: CSI provided by the firmware. + * @offset: Offset of the word to be modified, in bytes. + * @value: Value to be written. + * @mask: Bitmask with the bits to be modified set. @@ -163670,19 +176254,18 @@ index 000000000000..03a5217cffb0 + u32 value, u32 mask); + +/** -+ * kbase_csf_firmware_cs_output() - Read a word in a command stream's output -+ * page ++ * kbase_csf_firmware_cs_output() - Read a word in a CS's output page + * -+ * Return: Value of the word read from the command stream's output page. ++ * Return: Value of the word read from the CS's output page. + * -+ * @info: Command stream interface provided by the firmware. ++ * @info: CSI provided by the firmware. + * @offset: Offset of the word to be read, in bytes. + */ +u32 kbase_csf_firmware_cs_output( + const struct kbase_csf_cmd_stream_info *info, u32 offset); +/** -+ * struct kbase_csf_cmd_stream_group_info - Command stream group interface -+ * provided by the firmware. ++ * struct kbase_csf_cmd_stream_group_info - CSG interface provided by the ++ * firmware. + * + * @kbdev: Address of the instance of a GPU platform device that implements + * this interface. @@ -163690,14 +176273,13 @@ index 000000000000..03a5217cffb0 + * be ignored. + * @input: Address of global interface input page. + * @output: Address of global interface output page. -+ * @suspend_size: Size in bytes for normal suspend buffer for the command -+ * stream group. ++ * @suspend_size: Size in bytes for normal suspend buffer for the CSG + * @protm_suspend_size: Size in bytes for protected mode suspend buffer -+ * for the command stream group. -+ * @stream_num: Number of command streams in the command stream group. ++ * for the CSG. ++ * @stream_num: Number of CSs in the CSG. + * @stream_stride: Stride in bytes in JASID0 virtual address between -+ * command stream capability structures. -+ * @streams: Address of an array of command stream capability structures. ++ * CS capability structures. ++ * @streams: Address of an array of CS capability structures. + */ +struct kbase_csf_cmd_stream_group_info { + struct kbase_device *kbdev; @@ -163712,10 +176294,9 @@ index 000000000000..03a5217cffb0 +}; + +/** -+ * kbase_csf_firmware_csg_input() - Set a word in a command stream group's -+ * input page ++ * kbase_csf_firmware_csg_input() - Set a word in a CSG's input page + * -+ * @info: Command stream group interface provided by the firmware. ++ * @info: CSG interface provided by the firmware. + * @offset: Offset of the word to be written, in bytes. + * @value: Value to be written. + */ @@ -163724,22 +176305,21 @@ index 000000000000..03a5217cffb0 + u32 value); + +/** -+ * kbase_csf_firmware_csg_input_read() - Read a word in a command stream group's -+ * input page ++ * kbase_csf_firmware_csg_input_read() - Read a word in a CSG's input page + * -+ * Return: Value of the word read from the command stream group's input page. ++ * Return: Value of the word read from the CSG's input page. + * -+ * @info: Command stream group interface provided by the firmware. ++ * @info: CSG interface provided by the firmware. + * @offset: Offset of the word to be read, in bytes. + */ +u32 kbase_csf_firmware_csg_input_read( + const struct kbase_csf_cmd_stream_group_info *info, u32 offset); + +/** -+ * kbase_csf_firmware_csg_input_mask() - Set part of a word in a command stream -+ * group's input page ++ * kbase_csf_firmware_csg_input_mask() - Set part of a word in a CSG's ++ * input page + * -+ * @info: Command stream group interface provided by the firmware. ++ * @info: CSG interface provided by the firmware. + * @offset: Offset of the word to be modified, in bytes. + * @value: Value to be written. + * @mask: Bitmask with the bits to be modified set. @@ -163749,19 +176329,18 @@ index 000000000000..03a5217cffb0 + u32 value, u32 mask); + +/** -+ * kbase_csf_firmware_csg_output()- Read a word in a command stream group's -+ * output page ++ * kbase_csf_firmware_csg_output()- Read a word in a CSG's output page + * -+ * Return: Value of the word read from the command stream group's output page. ++ * Return: Value of the word read from the CSG's output page. + * -+ * @info: Command stream group interface provided by the firmware. ++ * @info: CSG interface provided by the firmware. + * @offset: Offset of the word to be read, in bytes. + */ +u32 kbase_csf_firmware_csg_output( + const struct kbase_csf_cmd_stream_group_info *info, u32 offset); + +/** -+ * struct kbase_csf_global_iface - Global command stream front-end interface ++ * struct kbase_csf_global_iface - Global CSF interface + * provided by the firmware. + * + * @kbdev: Address of the instance of a GPU platform device that implements @@ -163773,11 +176352,12 @@ index 000000000000..03a5217cffb0 + * be suspended). Reserved bits should be 0, and should be ignored. + * @input: Address of global interface input page. + * @output: Address of global interface output page. -+ * @group_num: Number of command stream groups supported. ++ * @group_num: Number of CSGs supported. + * @group_stride: Stride in bytes in JASID0 virtual address between -+ * command stream group capability structures. ++ * CSG capability structures. + * @prfcnt_size: Performance counters size. -+ * @groups: Address of an array of command stream group capability structures. ++ * @instr_features: Instrumentation features. (csf >= 1.1.0) ++ * @groups: Address of an array of CSG capability structures. + */ +struct kbase_csf_global_iface { + struct kbase_device *kbdev; @@ -163788,13 +176368,14 @@ index 000000000000..03a5217cffb0 + u32 group_num; + u32 group_stride; + u32 prfcnt_size; ++ u32 instr_features; + struct kbase_csf_cmd_stream_group_info *groups; +}; + +/** + * kbase_csf_firmware_global_input() - Set a word in the global input page + * -+ * @iface: Command stream front-end interface provided by the firmware. ++ * @iface: CSF interface provided by the firmware. + * @offset: Offset of the word to be written, in bytes. + * @value: Value to be written. + */ @@ -163805,7 +176386,7 @@ index 000000000000..03a5217cffb0 + * kbase_csf_firmware_global_input_mask() - Set part of a word in the global + * input page + * -+ * @iface: Command stream front-end interface provided by the firmware. ++ * @iface: CSF interface provided by the firmware. + * @offset: Offset of the word to be modified, in bytes. + * @value: Value to be written. + * @mask: Bitmask with the bits to be modified set. @@ -163819,7 +176400,7 @@ index 000000000000..03a5217cffb0 + * + * Return: Value of the word read from the global input page. + * -+ * @info: Command stream group interface provided by the firmware. ++ * @info: CSG interface provided by the firmware. + * @offset: Offset of the word to be read, in bytes. + */ +u32 kbase_csf_firmware_global_input_read( @@ -163830,42 +176411,31 @@ index 000000000000..03a5217cffb0 + * + * Return: Value of the word read from the global output page. + * -+ * @iface: Command stream front-end interface provided by the firmware. ++ * @iface: CSF interface provided by the firmware. + * @offset: Offset of the word to be read, in bytes. + */ +u32 kbase_csf_firmware_global_output( + const struct kbase_csf_global_iface *iface, u32 offset); + -+/* Calculate the offset to the Hw doorbell page corresponding to the -+ * doorbell number. ++/** ++ * kbase_csf_ring_doorbell() - Ring the doorbell ++ * ++ * @kbdev: An instance of the GPU platform device ++ * @doorbell_nr: Index of the HW doorbell page + */ -+static u32 csf_doorbell_offset(int doorbell_nr) -+{ -+ WARN_ON(doorbell_nr >= CSF_NUM_DOORBELL); -+ -+ return CSF_HW_DOORBELL_PAGE_OFFSET + -+ (doorbell_nr * CSF_HW_DOORBELL_PAGE_SIZE); -+} -+ -+static inline void kbase_csf_ring_doorbell(struct kbase_device *kbdev, -+ int doorbell_nr) -+{ -+ WARN_ON(doorbell_nr >= CSF_NUM_DOORBELL); -+ -+ kbase_reg_write(kbdev, csf_doorbell_offset(doorbell_nr), (u32)1); -+} ++void kbase_csf_ring_doorbell(struct kbase_device *kbdev, int doorbell_nr); + +/** + * kbase_csf_read_firmware_memory - Read a value in a GPU address + * ++ * @kbdev: Device pointer ++ * @gpu_addr: GPU address to read ++ * @value: output pointer to which the read value will be written. ++ * + * This function read a value in a GPU address that belongs to + * a private firmware memory region. The function assumes that the location + * is not permanently mapped on the CPU address space, therefore it maps it + * and then unmaps it to access it independently. -+ * -+ * @kbdev: Device pointer -+ * @gpu_addr: GPU address to read -+ * @value: output pointer to which the read value will be written. + */ +void kbase_csf_read_firmware_memory(struct kbase_device *kbdev, + u32 gpu_addr, u32 *value); @@ -163873,55 +176443,175 @@ index 000000000000..03a5217cffb0 +/** + * kbase_csf_update_firmware_memory - Write a value in a GPU address + * ++ * @kbdev: Device pointer ++ * @gpu_addr: GPU address to write ++ * @value: Value to write ++ * + * This function writes a given value in a GPU address that belongs to + * a private firmware memory region. The function assumes that the destination + * is not permanently mapped on the CPU address space, therefore it maps it + * and then unmaps it to access it independently. ++ */ ++void kbase_csf_update_firmware_memory(struct kbase_device *kbdev, ++ u32 gpu_addr, u32 value); ++ ++/** ++ * kbase_csf_read_firmware_memory_exe - Read a value in a GPU address in the ++ * region of its final execution location. ++ * ++ * @kbdev: Device pointer ++ * @gpu_addr: GPU address to read ++ * @value: Output pointer to which the read value will be written ++ * ++ * This function read a value in a GPU address that belongs to a private loaded ++ * firmware memory region based on its final execution location. The function ++ * assumes that the location is not permanently mapped on the CPU address space, ++ * therefore it maps it and then unmaps it to access it independently. This function ++ * needs to be used when accessing firmware memory regions which will be moved to ++ * their final execution location during firmware boot using an address based on the ++ * final execution location. ++ */ ++void kbase_csf_read_firmware_memory_exe(struct kbase_device *kbdev, ++ u32 gpu_addr, u32 *value); ++ ++/** ++ * kbase_csf_update_firmware_memory_exe - Write a value in a GPU address in the ++ * region of its final execution location. + * + * @kbdev: Device pointer + * @gpu_addr: GPU address to write + * @value: Value to write ++ * ++ * This function writes a value in a GPU address that belongs to a private loaded ++ * firmware memory region based on its final execution location. The function ++ * assumes that the location is not permanently mapped on the CPU address space, ++ * therefore it maps it and then unmaps it to access it independently. This function ++ * needs to be used when accessing firmware memory regions which will be moved to ++ * their final execution location during firmware boot using an address based on the ++ * final execution location. + */ -+void kbase_csf_update_firmware_memory(struct kbase_device *kbdev, ++void kbase_csf_update_firmware_memory_exe(struct kbase_device *kbdev, + u32 gpu_addr, u32 value); + +/** -+ * kbase_csf_firmware_init() - Load the firmware for the CSF MCU ++ * kbase_csf_firmware_early_init() - Early initialization for the firmware. ++ * @kbdev: Kbase device + * -+ * Request the firmware from user space and load it into memory. ++ * Initialize resources related to the firmware. Must be called at kbase probe. + * + * Return: 0 if successful, negative error code on failure ++ */ ++int kbase_csf_firmware_early_init(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_firmware_early_term() - Terminate resources related to the firmware ++ * after the firmware unload has been done. ++ * ++ * @kbdev: Device pointer + * ++ * This should be called only when kbase probe fails or gets rmmoded. ++ */ ++void kbase_csf_firmware_early_term(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_firmware_late_init() - Late initialization for the firmware. + * @kbdev: Kbase device ++ * ++ * Initialize resources related to the firmware. But must be called after ++ * backend late init is done. Must be used at probe time only. ++ * ++ * Return: 0 if successful, negative error code on failure + */ -+int kbase_csf_firmware_init(struct kbase_device *kbdev); ++int kbase_csf_firmware_late_init(struct kbase_device *kbdev); + +/** -+ * kbase_csf_firmware_term() - Unload the firmware ++ * kbase_csf_firmware_load_init() - Load the firmware for the CSF MCU ++ * @kbdev: Kbase device + * -+ * Frees the memory allocated by kbase_csf_firmware_init() ++ * Request the firmware from user space and load it into memory. + * ++ * Return: 0 if successful, negative error code on failure ++ */ ++int kbase_csf_firmware_load_init(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_firmware_unload_term() - Unload the firmware + * @kbdev: Kbase device ++ * ++ * Frees the memory allocated by kbase_csf_firmware_load_init() ++ */ ++void kbase_csf_firmware_unload_term(struct kbase_device *kbdev); ++ ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++/** ++ * kbase_csf_firmware_mcu_register_write - Write to MCU register ++ * ++ * @kbdev: Instance of a gpu platform device that implements a csf interface. ++ * @reg_addr: Register address to write into ++ * @reg_val: Value to be written ++ * ++ * Write a desired value to a register in MCU address space. ++ * ++ * return: 0 on success, or negative on failure. ++ */ ++int kbase_csf_firmware_mcu_register_write(struct kbase_device *const kbdev, u32 const reg_addr, ++ u32 const reg_val); ++/** ++ * kbase_csf_firmware_mcu_register_read - Read from MCU register ++ * ++ * @kbdev: Instance of a gpu platform device that implements a csf interface. ++ * @reg_addr: Register address to read from ++ * @reg_val: Value as present in reg_addr register ++ * ++ * Read a value from MCU address space. ++ * ++ * return: 0 on success, or negative on failure. ++ */ ++int kbase_csf_firmware_mcu_register_read(struct kbase_device *const kbdev, u32 const reg_addr, ++ u32 *reg_val); ++ ++/** ++ * kbase_csf_firmware_mcu_register_poll - Poll MCU register ++ * ++ * @kbdev: Instance of a gpu platform device that implements a csf interface. ++ * @reg_addr: Register address to read from ++ * @val_mask: Value to mask the read value for comparison ++ * @reg_val: Value to be compared against ++ * ++ * Continue to read a value from MCU address space until it matches given mask and value. ++ * ++ * return: 0 on success, or negative on failure. + */ -+void kbase_csf_firmware_term(struct kbase_device *kbdev); ++int kbase_csf_firmware_mcu_register_poll(struct kbase_device *const kbdev, u32 const reg_addr, ++ u32 const val_mask, u32 const reg_val); ++#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ + +/** + * kbase_csf_firmware_ping - Send the ping request to firmware. + * -+ * The function sends the ping request to firmware to confirm it is alive. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * The function sends the ping request to firmware. ++ */ ++void kbase_csf_firmware_ping(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_firmware_ping_wait - Send the ping request to firmware and waits. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @wait_timeout_ms: Timeout to get the acknowledgment for PING request from FW. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * The function sends the ping request to firmware and waits to confirm it is ++ * alive. + * + * Return: 0 on success, or negative on failure. + */ -+int kbase_csf_firmware_ping(struct kbase_device *kbdev); ++int kbase_csf_firmware_ping_wait(struct kbase_device *kbdev, unsigned int wait_timeout_ms); + +/** + * kbase_csf_firmware_set_timeout - Set a hardware endpoint progress timeout. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * @timeout: The maximum number of GPU cycles that is allowed to elapse + * without forward progress before the driver terminates a GPU + * command queue group. @@ -163935,22 +176625,37 @@ index 000000000000..03a5217cffb0 + +/** + * kbase_csf_enter_protected_mode - Send the Global request to firmware to -+ * enter protected mode and wait for its -+ * completion. ++ * enter protected mode. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * The function must be called with kbdev->csf.scheduler.interrupt_lock held ++ * and it does not wait for the protected mode entry to complete. + */ +void kbase_csf_enter_protected_mode(struct kbase_device *kbdev); + ++/** ++ * kbase_csf_wait_protected_mode_enter - Wait for the completion of PROTM_ENTER ++ * Global request sent to firmware. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * This function needs to be called after kbase_csf_enter_protected_mode() to ++ * wait for the GPU to actually enter protected mode. GPU reset is triggered if ++ * the wait is unsuccessful. ++ * ++ * Return: 0 on success, or negative on failure. ++ */ ++int kbase_csf_wait_protected_mode_enter(struct kbase_device *kbdev); ++ +static inline bool kbase_csf_firmware_mcu_halted(struct kbase_device *kbdev) +{ -+#ifndef CONFIG_MALI_BIFROST_NO_MALI ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ return true; ++#else + return (kbase_reg_read(kbdev, GPU_CONTROL_REG(MCU_STATUS)) == + MCU_STATUS_HALTED); -+#else -+ return true; -+#endif ++#endif /* CONFIG_MALI_BIFROST_NO_MALI */ +} + +/** @@ -163959,53 +176664,58 @@ index 000000000000..03a5217cffb0 + * into a known internal state for warm + * boot later. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + */ +void kbase_csf_firmware_trigger_mcu_halt(struct kbase_device *kbdev); + +/** + * kbase_csf_firmware_enable_mcu - Send the command to enable MCU + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + */ -+static inline void kbase_csf_firmware_enable_mcu(struct kbase_device *kbdev) -+{ -+ /* Trigger the boot of MCU firmware, Use the AUTO mode as -+ * otherwise on fast reset, to exit protected mode, MCU will -+ * not reboot by itself to enter normal mode. -+ */ -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(MCU_CONTROL), MCU_CNTRL_AUTO); -+} ++void kbase_csf_firmware_enable_mcu(struct kbase_device *kbdev); + +/** + * kbase_csf_firmware_disable_mcu - Send the command to disable MCU + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + */ -+static inline void kbase_csf_firmware_disable_mcu(struct kbase_device *kbdev) -+{ -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(MCU_CONTROL), MCU_CNTRL_DISABLE); -+} ++void kbase_csf_firmware_disable_mcu(struct kbase_device *kbdev); + +/** + * kbase_csf_firmware_disable_mcu_wait - Wait for the MCU to reach disabled + * status. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + */ +void kbase_csf_firmware_disable_mcu_wait(struct kbase_device *kbdev); + ++#ifdef KBASE_PM_RUNTIME ++/** ++ * kbase_csf_firmware_trigger_mcu_sleep - Send the command to put MCU in sleep ++ * state. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ */ ++void kbase_csf_firmware_trigger_mcu_sleep(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_firmware_is_mcu_in_sleep - Check if sleep request has completed ++ * and MCU has halted. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * Return: true if sleep request has completed, otherwise false. ++ */ ++bool kbase_csf_firmware_is_mcu_in_sleep(struct kbase_device *kbdev); ++#endif ++ +/** -+ * kbase_trigger_firmware_reload - Trigger the reboot of MCU firmware, for the -+ * cold boot case firmware image would be -+ * reloaded from filesystem into memory. ++ * kbase_csf_firmware_trigger_reload() - Trigger the reboot of MCU firmware, for ++ * the cold boot case firmware image would ++ * be reloaded from filesystem into memory. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + */ +void kbase_csf_firmware_trigger_reload(struct kbase_device *kbdev); + @@ -164013,8 +176723,7 @@ index 000000000000..03a5217cffb0 + * kbase_csf_firmware_reload_completed - The reboot of MCU firmware has + * completed. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + */ +void kbase_csf_firmware_reload_completed(struct kbase_device *kbdev); + @@ -164022,73 +176731,106 @@ index 000000000000..03a5217cffb0 + * kbase_csf_firmware_global_reinit - Send the Global configuration requests + * after the reboot of MCU firmware. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @core_mask: Mask of the enabled shader cores. + */ -+void kbase_csf_firmware_global_reinit(struct kbase_device *kbdev); ++void kbase_csf_firmware_global_reinit(struct kbase_device *kbdev, ++ u64 core_mask); + +/** + * kbase_csf_firmware_global_reinit_complete - Check the Global configuration + * requests, sent after the reboot of MCU firmware, have + * completed or not. + * -+ * Return: true if the Global configuration requests completed otherwise false. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * Return: true if the Global configuration requests completed otherwise false. + */ +bool kbase_csf_firmware_global_reinit_complete(struct kbase_device *kbdev); + +/** -+ * Request the global control block of CSF interface capabilities ++ * kbase_csf_firmware_update_core_attr - Send the Global configuration request ++ * to update the requested core attribute ++ * changes. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @update_core_pwroff_timer: If true, signal the firmware needs to update ++ * the MCU power-off timer value. ++ * @update_core_mask: If true, need to do the core_mask update with ++ * the supplied core_mask value. ++ * @core_mask: New core mask value if update_core_mask is true, ++ * otherwise unused. ++ */ ++void kbase_csf_firmware_update_core_attr(struct kbase_device *kbdev, ++ bool update_core_pwroff_timer, bool update_core_mask, u64 core_mask); ++ ++/** ++ * kbase_csf_firmware_core_attr_updated - Check the Global configuration ++ * request has completed or not, that was sent to update ++ * the core attributes. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * -+ * Return: Total number of command streams, summed across all groups. ++ * Return: true if the Global configuration request to update the core ++ * attributes has completed, otherwise false. ++ */ ++bool kbase_csf_firmware_core_attr_updated(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_firmware_get_glb_iface - Request the global control block of CSF ++ * interface capabilities + * + * @kbdev: Kbase device. + * @group_data: Pointer where to store all the group data + * (sequentially). + * @max_group_num: The maximum number of groups to be read. + * Can be 0, in which case group_data is unused. -+ * @stream_data: Pointer where to store all the stream data ++ * @stream_data: Pointer where to store all the CS data + * (sequentially). -+ * @max_total_stream_num: The maximum number of streams to be read. ++ * @max_total_stream_num: The maximum number of CSs to be read. + * Can be 0, in which case stream_data is unused. + * @glb_version: Where to store the global interface version. -+ * Bits 31:16 hold the major version number and -+ * 15:0 hold the minor version number. -+ * A higher minor version is backwards-compatible -+ * with a lower minor version for the same major -+ * version. + * @features: Where to store a bit mask of features (e.g. + * whether certain types of job can be suspended). -+ * @group_num: Where to store the number of command stream groups ++ * @group_num: Where to store the number of CSGs + * supported. + * @prfcnt_size: Where to store the size of CSF performance counters, + * in bytes. Bits 31:16 hold the size of firmware + * performance counter data and 15:0 hold the size of + * hardware performance counter data. ++ * @instr_features: Instrumentation features. Bits 7:4 hold the max size ++ * of events. Bits 3:0 hold the offset update rate. ++ * (csf >= 1,1,0) ++ * ++ * Return: Total number of CSs, summed across all groups. + */ -+u32 kbase_csf_firmware_get_glb_iface(struct kbase_device *kbdev, -+ struct basep_cs_group_control *group_data, u32 max_group_num, -+ struct basep_cs_stream_control *stream_data, u32 max_total_stream_num, -+ u32 *glb_version, u32 *features, u32 *group_num, u32 *prfcnt_size); -+ ++u32 kbase_csf_firmware_get_glb_iface( ++ struct kbase_device *kbdev, struct basep_cs_group_control *group_data, ++ u32 max_group_num, struct basep_cs_stream_control *stream_data, ++ u32 max_total_stream_num, u32 *glb_version, u32 *features, ++ u32 *group_num, u32 *prfcnt_size, u32 *instr_features); + +/** -+ * Get CSF firmware header timeline metadata content -+ * -+ * Return: The firmware timeline metadata content which match @p name. ++ * kbase_csf_firmware_get_timeline_metadata - Get CSF firmware header timeline ++ * metadata content + * + * @kbdev: Kbase device. + * @name: Name of the metadata which metadata content to be returned. + * @size: Metadata size if specified metadata found. ++ * ++ * Return: The firmware timeline metadata content which match @p name. + */ +const char *kbase_csf_firmware_get_timeline_metadata(struct kbase_device *kbdev, + const char *name, size_t *size); + +/** -+ * kbase_csf_firmware_mcu_shared_mapping_init - -+ * Allocate and map MCU shared memory. ++ * kbase_csf_firmware_mcu_shared_mapping_init - Allocate and map MCU shared memory. ++ * ++ * @kbdev: Kbase device the memory mapping shall belong to. ++ * @num_pages: Number of memory pages to map. ++ * @cpu_map_properties: Either PROT_READ or PROT_WRITE. ++ * @gpu_map_properties: Either KBASE_REG_GPU_RD or KBASE_REG_GPU_WR. ++ * @csf_mapping: Object where to write metadata for the memory mapping. + * + * This helper function allocates memory and maps it on both the CPU + * and the GPU address spaces. Most of the properties of the mapping @@ -164100,12 +176842,6 @@ index 000000000000..03a5217cffb0 + * will be ignored by the function. + * + * Return: 0 if success, or an error code on failure. -+ * -+ * @kbdev: Kbase device the memory mapping shall belong to. -+ * @num_pages: Number of memory pages to map. -+ * @cpu_map_properties: Either PROT_READ or PROT_WRITE. -+ * @gpu_map_properties: Either KBASE_REG_GPU_RD or KBASE_REG_GPU_WR. -+ * @csf_mapping: Object where to write metadata for the memory mapping. + */ +int kbase_csf_firmware_mcu_shared_mapping_init( + struct kbase_device *kbdev, @@ -164123,63 +176859,169 @@ index 000000000000..03a5217cffb0 +void kbase_csf_firmware_mcu_shared_mapping_term( + struct kbase_device *kbdev, struct kbase_csf_mapping *csf_mapping); + -+#ifndef MALI_KBASE_BUILD ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++extern bool fw_debug; ++#endif ++ ++static inline long kbase_csf_timeout_in_jiffies(const unsigned int msecs) ++{ ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ return (fw_debug ? MAX_SCHEDULE_TIMEOUT : msecs_to_jiffies(msecs)); ++#else ++ return msecs_to_jiffies(msecs); ++#endif ++} ++ +/** -+ * mali_kutf_process_fw_utf_entry() - Process the "Firmware UTF tests" section ++ * kbase_csf_firmware_enable_gpu_idle_timer() - Activate the idle hysteresis ++ * monitoring operation + * -+ * Read "Firmware UTF tests" section from the firmware image and create -+ * necessary kutf app+suite+tests. ++ * @kbdev: Kbase device structure + * -+ * Return: 0 if successful, negative error code on failure. In both cases -+ * caller will have to invoke mali_kutf_fw_utf_entry_cleanup for the cleanup ++ * Program the firmware interface with its configured hysteresis count value ++ * and enable the firmware to act on it. The Caller is ++ * assumed to hold the kbdev->csf.scheduler.interrupt_lock. ++ */ ++void kbase_csf_firmware_enable_gpu_idle_timer(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_firmware_disable_gpu_idle_timer() - Disable the idle time ++ * hysteresis monitoring operation + * + * @kbdev: Kbase device structure -+ * @fw_data: Pointer to the start of firmware binary image loaded from disk -+ * @fw_size: Size (in bytes) of the firmware image -+ * @entry: Pointer to the start of the section ++ * ++ * Program the firmware interface to disable the idle hysteresis timer. The ++ * Caller is assumed to hold the kbdev->csf.scheduler.interrupt_lock. + */ -+int mali_kutf_process_fw_utf_entry(struct kbase_device *kbdev, -+ const void *fw_data, size_t fw_size, const u32 *entry); ++void kbase_csf_firmware_disable_gpu_idle_timer(struct kbase_device *kbdev); + +/** -+ * mali_kutf_fw_utf_entry_cleanup() - Remove the Fw UTF tests debugfs entries ++ * kbase_csf_firmware_get_gpu_idle_hysteresis_time - Get the firmware GPU idle ++ * detection hysteresis duration + * -+ * Destroy the kutf apps+suites+tests created on parsing "Firmware UTF tests" -+ * section from the firmware image. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * -+ * @kbdev: Kbase device structure ++ * Return: the internally recorded hysteresis (nominal) value. + */ -+void mali_kutf_fw_utf_entry_cleanup(struct kbase_device *kbdev); -+#endif ++u32 kbase_csf_firmware_get_gpu_idle_hysteresis_time(struct kbase_device *kbdev); + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+extern bool fw_debug; -+#endif ++/** ++ * kbase_csf_firmware_set_gpu_idle_hysteresis_time - Set the firmware GPU idle ++ * detection hysteresis duration ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @dur: The duration value (unit: milliseconds) for the configuring ++ * hysteresis field for GPU idle detection ++ * ++ * The supplied value will be recorded internally without any change. But the ++ * actual field value will be subject to hysteresis source frequency scaling ++ * and maximum value limiting. The default source will be SYSTEM_TIMESTAMP ++ * counter. But in case the platform is not able to supply it, the GPU ++ * CYCLE_COUNTER source will be used as an alternative. Bit-31 on the ++ * returned value is the source configuration flag, and it is set to '1' ++ * when CYCLE_COUNTER alternative source is used. ++ * ++ * Return: the actual internally configured hysteresis field value. ++ */ ++u32 kbase_csf_firmware_set_gpu_idle_hysteresis_time(struct kbase_device *kbdev, u32 dur); + -+static inline long kbase_csf_timeout_in_jiffies(const unsigned int msecs) ++/** ++ * kbase_csf_firmware_get_mcu_core_pwroff_time - Get the MCU shader Core power-off ++ * time value ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * Return: the internally recorded MCU shader Core power-off (nominal) timeout value. The unit ++ * of the value is in micro-seconds. ++ */ ++u32 kbase_csf_firmware_get_mcu_core_pwroff_time(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_firmware_set_mcu_core_pwroff_time - Set the MCU shader Core power-off ++ * time value ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @dur: The duration value (unit: micro-seconds) for configuring MCU ++ * core power-off timer, when the shader cores' power ++ * transitions are delegated to the MCU (normal operational ++ * mode) ++ * ++ * The supplied value will be recorded internally without any change. But the ++ * actual field value will be subject to core power-off timer source frequency ++ * scaling and maximum value limiting. The default source will be ++ * SYSTEM_TIMESTAMP counter. But in case the platform is not able to supply it, ++ * the GPU CYCLE_COUNTER source will be used as an alternative. Bit-31 on the ++ * returned value is the source configuration flag, and it is set to '1' ++ * when CYCLE_COUNTER alternative source is used. ++ * ++ * The configured MCU shader Core power-off timer will only have effect when the host ++ * driver has delegated the shader cores' power management to MCU. ++ * ++ * Return: the actual internal core power-off timer value in register defined ++ * format. ++ */ ++u32 kbase_csf_firmware_set_mcu_core_pwroff_time(struct kbase_device *kbdev, u32 dur); ++ ++/** ++ * kbase_csf_interface_version - Helper function to build the full firmware ++ * interface version in a format compatible with ++ * GLB_VERSION register ++ * ++ * @major: major version of csf interface ++ * @minor: minor version of csf interface ++ * @patch: patch version of csf interface ++ * ++ * Return: firmware interface version ++ */ ++static inline u32 kbase_csf_interface_version(u32 major, u32 minor, u32 patch) +{ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ return (fw_debug ? MAX_SCHEDULE_TIMEOUT : msecs_to_jiffies(msecs)); -+#else -+ return msecs_to_jiffies(msecs); -+#endif ++ return ((major << GLB_VERSION_MAJOR_SHIFT) | ++ (minor << GLB_VERSION_MINOR_SHIFT) | ++ (patch << GLB_VERSION_PATCH_SHIFT)); +} + ++/** ++ * kbase_csf_trigger_firmware_config_update - Send a firmware config update. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * Any changes done to firmware configuration entry or tracebuffer entry ++ * requires a GPU silent reset to reflect the configuration changes ++ * requested, but if Firmware.header.entry.bit(30) is set then we can request a ++ * FIRMWARE_CONFIG_UPDATE rather than doing a silent reset. ++ * ++ * Return: 0 if success, or negative error code on failure. ++ */ ++int kbase_csf_trigger_firmware_config_update(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_firmware_req_core_dump - Request a firmware core dump ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * Request a firmware core dump and wait for for firmware to acknowledge. ++ * Firmware will enter infinite loop after the firmware core dump is created. ++ * ++ * Return: 0 if success, or negative error code on failure. ++ */ ++int kbase_csf_firmware_req_core_dump(struct kbase_device *const kbdev); ++ +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c new file mode 100755 -index 000000000000..d282d5ca7fc2 +index 000000000..c895b0801 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c -@@ -0,0 +1,306 @@ +@@ -0,0 +1,354 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -164190,24 +177032,23 @@ index 000000000000..d282d5ca7fc2 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include -+#include "mali_kbase_csf_firmware_cfg.h" +#include ++#include ++ ++#include "mali_kbase_csf_firmware_cfg.h" ++#include "mali_kbase_csf_firmware_log.h" + +#if CONFIG_SYSFS +#define CSF_FIRMWARE_CFG_SYSFS_DIR_NAME "firmware_config" + ++#define CSF_FIRMWARE_CFG_LOG_VERBOSITY_ENTRY_NAME "Log verbosity" ++ +/** + * struct firmware_config - Configuration item within the MCU firmware + * -+ * The firmware may expose configuration options. Each option has a name, the -+ * address where the option is controlled and the minimum and maximum values -+ * that the option can take. -+ * + * @node: List head linking all options to + * kbase_device:csf.firmware_config + * @kbdev: Pointer to the Kbase device @@ -164215,17 +177056,24 @@ index 000000000000..d282d5ca7fc2 + * inside CSF_FIRMWARE_CFG_SYSFS_DIR_NAME directory, + * representing the configuration option @name. + * @kobj_inited: kobject initialization state ++ * @updatable: Indicates whether config items can be updated with ++ * FIRMWARE_CONFIG_UPDATE + * @name: NUL-terminated string naming the option + * @address: The address in the firmware image of the configuration option + * @min: The lowest legal value of the configuration option + * @max: The maximum legal value of the configuration option + * @cur_val: The current value of the configuration option ++ * ++ * The firmware may expose configuration options. Each option has a name, the ++ * address where the option is controlled and the minimum and maximum values ++ * that the option can take. + */ +struct firmware_config { + struct list_head node; + struct kbase_device *kbdev; + struct kobject kobj; + bool kobj_inited; ++ bool updatable; + char *name; + u32 address; + u32 min; @@ -164239,9 +177087,9 @@ index 000000000000..d282d5ca7fc2 + .mode = VERIFY_OCTAL_PERMISSIONS(_mode), \ + } + -+static FW_CFG_ATTR(min, S_IRUGO); -+static FW_CFG_ATTR(max, S_IRUGO); -+static FW_CFG_ATTR(cur, S_IRUGO | S_IWUSR); ++static FW_CFG_ATTR(min, 0444); ++static FW_CFG_ATTR(max, 0444); ++static FW_CFG_ATTR(cur, 0644); + +static void fw_cfg_kobj_release(struct kobject *kobj) +{ @@ -164296,7 +177144,7 @@ index 000000000000..d282d5ca7fc2 + + if (attr == &fw_cfg_attr_cur) { + unsigned long flags; -+ u32 val; ++ u32 val, cur_val; + int ret = kstrtouint(buf, 0, &val); + + if (ret) { @@ -164311,19 +177159,27 @@ index 000000000000..d282d5ca7fc2 + return -EINVAL; + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ if (config->cur_val == val) { ++ ++ cur_val = config->cur_val; ++ if (cur_val == val) { + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + return count; + } + -+ /* -+ * If there is already a GPU reset pending then inform -+ * the User to retry the write. ++ /* If configuration update cannot be performed with ++ * FIRMWARE_CONFIG_UPDATE then we need to do a ++ * silent reset before we update the memory. + */ -+ if (kbase_reset_gpu_silent(kbdev)) { -+ spin_unlock_irqrestore( -+ &kbdev->hwaccess_lock, flags); -+ return -EAGAIN; ++ if (!config->updatable) { ++ /* ++ * If there is already a GPU reset pending then inform ++ * the User to retry the write. ++ */ ++ if (kbase_reset_gpu_silent(kbdev)) { ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, ++ flags); ++ return -EAGAIN; ++ } + } + + /* @@ -164339,10 +177195,35 @@ index 000000000000..d282d5ca7fc2 + kbdev, config->address, val); + + config->cur_val = val; ++ + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + ++ /* Enable FW logging only if Log verbosity is non-zero */ ++ if (!strcmp(config->name, CSF_FIRMWARE_CFG_LOG_VERBOSITY_ENTRY_NAME) && ++ (!cur_val || !val)) { ++ ret = kbase_csf_firmware_log_toggle_logging_calls(kbdev, val); ++ if (ret) { ++ /* Undo FW configuration changes */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ config->cur_val = cur_val; ++ kbase_csf_update_firmware_memory(kbdev, config->address, cur_val); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ return ret; ++ } ++ } ++ ++ /* If we can update the config without firmware reset then ++ * we need to just trigger FIRMWARE_CONFIG_UPDATE. ++ */ ++ if (config->updatable) { ++ ret = kbase_csf_trigger_firmware_config_update(kbdev); ++ if (ret) ++ return ret; ++ } ++ + /* Wait for the config update to take effect */ -+ kbase_reset_gpu_wait(kbdev); ++ if (!config->updatable) ++ kbase_reset_gpu_wait(kbdev); + } else { + dev_warn(kbdev->dev, + "Unexpected write to entry %s/%s", @@ -164364,11 +177245,18 @@ index 000000000000..d282d5ca7fc2 + &fw_cfg_attr_cur, + NULL, +}; ++#if (KERNEL_VERSION(5, 2, 0) <= LINUX_VERSION_CODE) ++ATTRIBUTE_GROUPS(fw_cfg); ++#endif + +static struct kobj_type fw_cfg_kobj_type = { + .release = &fw_cfg_kobj_release, + .sysfs_ops = &fw_cfg_ops, ++#if (KERNEL_VERSION(5, 2, 0) <= LINUX_VERSION_CODE) ++ .default_groups = fw_cfg_groups, ++#else + .default_attrs = fw_cfg_attrs, ++#endif +}; + +int kbase_csf_firmware_cfg_init(struct kbase_device *kbdev) @@ -164428,8 +177316,8 @@ index 000000000000..d282d5ca7fc2 +} + +int kbase_csf_firmware_cfg_option_entry_parse(struct kbase_device *kbdev, -+ const struct firmware *fw, -+ const u32 *entry, unsigned int size) ++ const struct kbase_csf_mcu_fw *const fw, ++ const u32 *entry, unsigned int size, bool updatable) +{ + const char *name = (char *)&entry[3]; + struct firmware_config *config; @@ -164444,6 +177332,7 @@ index 000000000000..d282d5ca7fc2 + return -ENOMEM; + + config->kbdev = kbdev; ++ config->updatable = updatable; + config->name = (char *)(config+1); + config->address = entry[0]; + config->min = entry[1]; @@ -164472,26 +177361,27 @@ index 000000000000..d282d5ca7fc2 +} + +int kbase_csf_firmware_cfg_option_entry_parse(struct kbase_device *kbdev, -+ const struct firmware *fw, -+ const u32 *entry, unsigned int size) ++ const struct kbase_csf_mcu_fw *const fw, ++ const u32 *entry, unsigned int size) +{ + return 0; +} +#endif /* CONFIG_SYSFS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h new file mode 100755 -index 000000000000..ab4b6ebc5296 +index 000000000..b227cf158 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h @@ -0,0 +1,72 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -164502,8 +177392,6 @@ index 000000000000..ab4b6ebc5296 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CSF_FIRMWARE_CFG_H_ @@ -164519,12 +177407,12 @@ index 000000000000..ab4b6ebc5296 + * kbase_csf_firmware_cfg_init - Create the sysfs directory for configuration + * options present in firmware image. + * ++ * @kbdev: Pointer to the Kbase device ++ * + * This function would create a sysfs directory and populate it with a + * sub-directory, that would contain a file per attribute, for every + * configuration option parsed from firmware image. + * -+ * @kbdev: Pointer to the Kbase device -+ * + * Return: The initialization error code. + */ +int kbase_csf_firmware_cfg_init(struct kbase_device *kbdev); @@ -164542,34 +177430,36 @@ index 000000000000..ab4b6ebc5296 + * kbase_csf_firmware_cfg_option_entry_parse() - Process a + * "configuration option" section. + * ++ * @kbdev: Kbase device structure ++ * @fw: Firmware image containing the section ++ * @entry: Pointer to the section ++ * @size: Size (in bytes) of the section ++ * @updatable: Indicates if entry can be updated with FIRMWARE_CONFIG_UPDATE ++ * + * Read a "configuration option" section adding it to the + * kbase_device:csf.firmware_config list. + * + * Return: 0 if successful, negative error code on failure -+ * -+ * @kbdev: Kbase device structure -+ * @fw: Firmware image containing the section -+ * @entry: Pointer to the section -+ * @size: Size (in bytes) of the section + */ +int kbase_csf_firmware_cfg_option_entry_parse(struct kbase_device *kbdev, -+ const struct firmware *fw, -+ const u32 *entry, unsigned int size); ++ const struct kbase_csf_mcu_fw *const fw, ++ const u32 *entry, unsigned int size, bool updatable); +#endif /* _KBASE_CSF_FIRMWARE_CFG_H_ */ -diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c -new file mode 100755 -index 000000000000..7401113c5d6a +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.c +new file mode 100644 +index 000000000..f0a10d197 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c -@@ -0,0 +1,1012 @@ ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.c +@@ -0,0 +1,807 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -164580,443 +177470,2054 @@ index 000000000000..7401113c5d6a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + ++#include ++#include ++#include ++#include ++#include ++#include ++ +#include "mali_kbase.h" -+#include "mali_kbase_csf_firmware.h" -+#include "mali_kbase_csf_trace_buffer.h" -+#include "mali_kbase_csf_timeout.h" -+#include "mali_kbase_mem.h" -+#include "mali_kbase_reset_gpu.h" -+#include "device/mali_kbase_device.h" ++#include "mali_kbase_csf_firmware_core_dump.h" +#include "backend/gpu/mali_kbase_pm_internal.h" -+#include "mali_kbase_csf_scheduler.h" -+#include "mmu/mali_kbase_mmu.h" + -+#include -+#include -+#include -+#include -+#include -+#if (KERNEL_VERSION(4, 13, 0) <= LINUX_VERSION_CODE) -+#include -+#endif ++/* Page size in bytes in use by MCU. */ ++#define FW_PAGE_SIZE 4096 + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+/* Makes Driver wait indefinitely for an acknowledgment for the different -+ * requests it sends to firmware. Otherwise the timeouts interfere with the -+ * use of debugger for source-level debugging of firmware as Driver initiates -+ * a GPU reset when a request times out, which always happen when a debugger -+ * is connected. ++/* ++ * FW image header core dump data format supported. ++ * Currently only version 0.1 is supported. + */ -+bool fw_debug; /* Default value of 0/false */ -+module_param(fw_debug, bool, 0444); -+MODULE_PARM_DESC(fw_debug, -+ "Enables effective use of a debugger for debugging firmware code."); -+#endif ++#define FW_CORE_DUMP_DATA_VERSION_MAJOR 0 ++#define FW_CORE_DUMP_DATA_VERSION_MINOR 1 + -+#define DUMMY_FW_PAGE_SIZE SZ_4K ++/* Full version of the image header core dump data format */ ++#define FW_CORE_DUMP_DATA_VERSION \ ++ ((FW_CORE_DUMP_DATA_VERSION_MAJOR << 8) | FW_CORE_DUMP_DATA_VERSION_MINOR) + -+/** -+ * struct dummy_firmware_csi - Represents a dummy interface for MCU firmware streams -+ * -+ * @cs_kernel_input: CS kernel input memory region -+ * @cs_kernel_output: CS kernel output memory region ++/* Validity flag to indicate if the MCU registers in the buffer are valid */ ++#define FW_MCU_STATUS_MASK 0x1 ++#define FW_MCU_STATUS_VALID (1 << 0) ++ ++/* Core dump entry fields */ ++#define FW_CORE_DUMP_VERSION_INDEX 0 ++#define FW_CORE_DUMP_START_ADDR_INDEX 1 ++ ++/* MCU registers stored by a firmware core dump */ ++struct fw_core_dump_mcu { ++ u32 r0; ++ u32 r1; ++ u32 r2; ++ u32 r3; ++ u32 r4; ++ u32 r5; ++ u32 r6; ++ u32 r7; ++ u32 r8; ++ u32 r9; ++ u32 r10; ++ u32 r11; ++ u32 r12; ++ u32 sp; ++ u32 lr; ++ u32 pc; ++}; ++ ++/* Any ELF definitions used in this file are from elf.h/elfcore.h except ++ * when specific 32-bit versions are required (mainly for the ++ * ELF_PRSTATUS32 note that is used to contain the MCU registers). + */ -+struct dummy_firmware_csi { -+ u8 cs_kernel_input[DUMMY_FW_PAGE_SIZE]; -+ u8 cs_kernel_output[DUMMY_FW_PAGE_SIZE]; ++ ++/* - 32-bit version of timeval structures used in ELF32 PRSTATUS note. */ ++struct prstatus32_timeval { ++ int tv_sec; ++ int tv_usec; ++}; ++ ++/* - Structure defining ELF32 PRSTATUS note contents, as defined by the ++ * GNU binutils BFD library used by GDB, in bfd/hosts/x86-64linux.h. ++ * Note: GDB checks for the size of this structure to be 0x94. ++ * Modified pr_reg (array containing the Arm 32-bit MCU registers) to ++ * use u32[18] instead of elf_gregset32_t to prevent introducing new typedefs. ++ */ ++struct elf_prstatus32 { ++ struct elf_siginfo pr_info; /* Info associated with signal. */ ++ short int pr_cursig; /* Current signal. */ ++ unsigned int pr_sigpend; /* Set of pending signals. */ ++ unsigned int pr_sighold; /* Set of held signals. */ ++ pid_t pr_pid; ++ pid_t pr_ppid; ++ pid_t pr_pgrp; ++ pid_t pr_sid; ++ struct prstatus32_timeval pr_utime; /* User time. */ ++ struct prstatus32_timeval pr_stime; /* System time. */ ++ struct prstatus32_timeval pr_cutime; /* Cumulative user time. */ ++ struct prstatus32_timeval pr_cstime; /* Cumulative system time. */ ++ u32 pr_reg[18]; /* GP registers. */ ++ int pr_fpvalid; /* True if math copro being used. */ +}; + +/** -+ * struct dummy_firmware_csg - Represents a dummy interface for MCU firmware stream groups -+ * -+ * @csg_input: CSG kernel input memory region -+ * @csg_output: CSG kernel output memory region -+ * @csi: Dummy firmware CSIs ++ * struct fw_core_dump_data - Context for seq_file operations used on 'fw_core_dump' ++ * debugfs file. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + */ -+struct dummy_firmware_csg { -+ u8 csg_input[DUMMY_FW_PAGE_SIZE]; -+ u8 csg_output[DUMMY_FW_PAGE_SIZE]; -+ struct dummy_firmware_csi csi[8]; -+} dummy_firmware_csg; ++struct fw_core_dump_data { ++ struct kbase_device *kbdev; ++}; ++ ++/* ++ * struct fw_core_dump_seq_off - Iterator for seq_file operations used on 'fw_core_dump' ++ * debugfs file. ++ * @interface: current firmware memory interface ++ * @page_num: current page number (0..) within @interface ++ */ ++struct fw_core_dump_seq_off { ++ struct kbase_csf_firmware_interface *interface; ++ u32 page_num; ++}; + +/** -+ * struct dummy_firmware_interface - Represents a dummy interface in the MCU firmware ++ * fw_get_core_dump_mcu - Get the MCU registers saved by a firmware core dump + * -+ * @global_input: Global input memory region -+ * @global_output: Global output memory region -+ * @csg: Dummy firmware CSGs -+ * @node: Interface objects are on the kbase_device:csf.firmware_interfaces -+ * list using this list_head to link them ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @regs: Pointer to a core dump mcu struct where the MCU registers are copied ++ * to. Should be allocated by the called. ++ * ++ * Return: 0 if successfully copied the MCU registers, negative error code otherwise. + */ -+struct dummy_firmware_interface { -+ u8 global_input[DUMMY_FW_PAGE_SIZE]; -+ u8 global_output[DUMMY_FW_PAGE_SIZE]; -+ struct dummy_firmware_csg csg[8]; -+ struct list_head node; -+} dummy_firmware_interface; ++static int fw_get_core_dump_mcu(struct kbase_device *kbdev, struct fw_core_dump_mcu *regs) ++{ ++ unsigned int i; ++ u32 status = 0; ++ u32 data_addr = kbdev->csf.fw_core_dump.mcu_regs_addr; ++ u32 *data = (u32 *)regs; + -+#define CSF_GLB_REQ_CFG_MASK \ -+ (GLB_REQ_CFG_ALLOC_EN_MASK | GLB_REQ_CFG_PROGRESS_TIMER_MASK) ++ /* Check if the core dump entry exposed the buffer */ ++ if (!regs || !kbdev->csf.fw_core_dump.available) ++ return -EPERM; + -+static inline u32 input_page_read(const u32 *const input, const u32 offset) -+{ -+ WARN_ON(offset % sizeof(u32)); ++ /* Check if the data in the buffer is valid, if not, return error */ ++ kbase_csf_read_firmware_memory(kbdev, data_addr, &status); ++ if ((status & FW_MCU_STATUS_MASK) != FW_MCU_STATUS_VALID) ++ return -EPERM; + -+ return input[offset / sizeof(u32)]; ++ /* According to image header documentation, the MCU registers core dump ++ * buffer is 32-bit aligned. ++ */ ++ for (i = 1; i <= sizeof(struct fw_core_dump_mcu) / sizeof(u32); ++i) ++ kbase_csf_read_firmware_memory(kbdev, data_addr + i * sizeof(u32), &data[i - 1]); ++ ++ return 0; +} + -+static inline void input_page_write(u32 *const input, const u32 offset, -+ const u32 value) ++/** ++ * fw_core_dump_fill_elf_header - Initializes an ELF32 header ++ * @hdr: ELF32 header to initialize ++ * @sections: Number of entries in the ELF program header table ++ * ++ * Initializes an ELF32 header for an ARM 32-bit little-endian ++ * 'Core file' object file. ++ */ ++static void fw_core_dump_fill_elf_header(struct elf32_hdr *hdr, unsigned int sections) +{ -+ WARN_ON(offset % sizeof(u32)); ++ /* Reset all members in header. */ ++ memset(hdr, 0, sizeof(*hdr)); + -+ input[offset / sizeof(u32)] = value; -+} ++ /* Magic number identifying file as an ELF object. */ ++ memcpy(hdr->e_ident, ELFMAG, SELFMAG); + -+static inline void input_page_partial_write(u32 *const input, const u32 offset, -+ u32 value, u32 mask) -+{ -+ WARN_ON(offset % sizeof(u32)); ++ /* Identify file as 32-bit, little-endian, using current ++ * ELF header version, with no OS or ABI specific ELF ++ * extensions used. ++ */ ++ hdr->e_ident[EI_CLASS] = ELFCLASS32; ++ hdr->e_ident[EI_DATA] = ELFDATA2LSB; ++ hdr->e_ident[EI_VERSION] = EV_CURRENT; ++ hdr->e_ident[EI_OSABI] = ELFOSABI_NONE; + -+ input[offset / sizeof(u32)] = -+ (input_page_read(input, offset) & ~mask) | (value & mask); -+} ++ /* 'Core file' type of object file. */ ++ hdr->e_type = ET_CORE; + -+static inline u32 output_page_read(const u32 *const output, const u32 offset) -+{ -+ WARN_ON(offset % sizeof(u32)); ++ /* ARM 32-bit architecture (AARCH32) */ ++ hdr->e_machine = EM_ARM; + -+ return output[offset / sizeof(u32)]; -+} ++ /* Object file version: the original format. */ ++ hdr->e_version = EV_CURRENT; + -+static inline void output_page_write(u32 *const output, const u32 offset, -+ const u32 value) -+{ -+ WARN_ON(offset % sizeof(u32)); ++ /* Offset of program header table in file. */ ++ hdr->e_phoff = sizeof(struct elf32_hdr); + -+ output[offset / sizeof(u32)] = value; ++ /* No processor specific flags. */ ++ hdr->e_flags = 0; ++ ++ /* Size of the ELF header in bytes. */ ++ hdr->e_ehsize = sizeof(struct elf32_hdr); ++ ++ /* Size of the ELF program header entry in bytes. */ ++ hdr->e_phentsize = sizeof(struct elf32_phdr); ++ ++ /* Number of entries in the program header table. */ ++ hdr->e_phnum = sections; +} + +/** -+ * invent_memory_setup_entry() - Invent an "interface memory setup" section -+ * -+ * Invent an "interface memory setup" section similar to one from a firmware -+ * image. If successful the interface will be added to the -+ * kbase_device:csf.firmware_interfaces list. ++ * fw_core_dump_fill_elf_program_header_note - Initializes an ELF32 program header ++ * for holding auxiliary information ++ * @phdr: ELF32 program header ++ * @file_offset: Location of the note in the file in bytes ++ * @size: Size of the note in bytes. + * -+ * Return: 0 if successful, negative error code on failure -+ * -+ * @kbdev: Kbase device structure ++ * Initializes an ELF32 program header describing auxiliary information (containing ++ * one or more notes) of @size bytes alltogether located in the file at offset ++ * @file_offset. + */ -+static int invent_memory_setup_entry(struct kbase_device *kbdev) ++static void fw_core_dump_fill_elf_program_header_note(struct elf32_phdr *phdr, u32 file_offset, ++ u32 size) +{ -+ struct dummy_firmware_interface *interface = NULL; ++ /* Auxiliary information (note) in program header. */ ++ phdr->p_type = PT_NOTE; + -+ /* Allocate enough memory for the struct dummy_firmware_interface. -+ */ -+ interface = kmalloc(sizeof(*interface), GFP_KERNEL); -+ if (!interface) -+ return -ENOMEM; ++ /* Location of first note in file in bytes. */ ++ phdr->p_offset = file_offset; + -+ kbdev->csf.shared_interface = interface; -+ list_add(&interface->node, &kbdev->csf.firmware_interfaces); ++ /* Size of all notes combined in bytes. */ ++ phdr->p_filesz = size; + -+ /* NO_MALI: Don't insert any firmware pages */ -+ return 0; ++ /* Other members not relevant for a note. */ ++ phdr->p_vaddr = 0; ++ phdr->p_paddr = 0; ++ phdr->p_memsz = 0; ++ phdr->p_align = 0; ++ phdr->p_flags = 0; +} + -+static void free_global_iface(struct kbase_device *kbdev) ++/** ++ * fw_core_dump_fill_elf_program_header - Initializes an ELF32 program header for a loadable segment ++ * @phdr: ELF32 program header to initialize. ++ * @file_offset: Location of loadable segment in file in bytes ++ * (aligned to FW_PAGE_SIZE bytes) ++ * @vaddr: 32-bit virtual address where to write the segment ++ * (aligned to FW_PAGE_SIZE bytes) ++ * @size: Size of the segment in bytes. ++ * @flags: CSF_FIRMWARE_ENTRY_* flags describing access permissions. ++ * ++ * Initializes an ELF32 program header describing a loadable segment of ++ * @size bytes located in the file at offset @file_offset to be loaded ++ * at virtual address @vaddr with access permissions as described by ++ * CSF_FIRMWARE_ENTRY_* flags in @flags. ++ */ ++static void fw_core_dump_fill_elf_program_header(struct elf32_phdr *phdr, u32 file_offset, ++ u32 vaddr, u32 size, u32 flags) +{ -+ struct kbase_csf_global_iface *iface = &kbdev->csf.global_iface; ++ /* Loadable segment in program header. */ ++ phdr->p_type = PT_LOAD; + -+ if (iface->groups) { -+ unsigned int gid; ++ /* Location of segment in file in bytes. Aligned to p_align bytes. */ ++ phdr->p_offset = file_offset; + -+ for (gid = 0; gid < iface->group_num; ++gid) -+ kfree(iface->groups[gid].streams); ++ /* Virtual address of segment. Aligned to p_align bytes. */ ++ phdr->p_vaddr = vaddr; + -+ kfree(iface->groups); -+ iface->groups = NULL; -+ } ++ /* Physical address of segment. Not relevant. */ ++ phdr->p_paddr = 0; ++ ++ /* Size of segment in file and memory. */ ++ phdr->p_filesz = size; ++ phdr->p_memsz = size; ++ ++ /* Alignment of segment in the file and memory in bytes (integral power of 2). */ ++ phdr->p_align = FW_PAGE_SIZE; ++ ++ /* Set segment access permissions. */ ++ phdr->p_flags = 0; ++ if (flags & CSF_FIRMWARE_ENTRY_READ) ++ phdr->p_flags |= PF_R; ++ if (flags & CSF_FIRMWARE_ENTRY_WRITE) ++ phdr->p_flags |= PF_W; ++ if (flags & CSF_FIRMWARE_ENTRY_EXECUTE) ++ phdr->p_flags |= PF_X; +} + -+static int invent_cmd_stream_group_info(struct kbase_device *kbdev, -+ struct kbase_csf_cmd_stream_group_info *ginfo, -+ struct dummy_firmware_csg *csg) ++/** ++ * fw_core_dump_get_prstatus_note_size - Calculates size of a ELF32 PRSTATUS note ++ * @name: Name given to the PRSTATUS note. ++ * ++ * Calculates the size of a 32-bit PRSTATUS note (which contains information ++ * about a process like the current MCU registers) taking into account ++ * @name must be padded to a 4-byte multiple. ++ * ++ * Return: size of 32-bit PRSTATUS note in bytes. ++ */ ++static unsigned int fw_core_dump_get_prstatus_note_size(char *name) +{ -+ unsigned int sid; ++ return sizeof(struct elf32_note) + roundup(strlen(name) + 1, 4) + ++ sizeof(struct elf_prstatus32); ++} + -+ ginfo->input = csg->csg_input; -+ ginfo->output = csg->csg_output; ++/** ++ * fw_core_dump_fill_elf_prstatus - Initializes an ELF32 PRSTATUS structure ++ * @prs: ELF32 PRSTATUS note to initialize ++ * @regs: MCU registers to copy into the PRSTATUS note ++ * ++ * Initializes an ELF32 PRSTATUS structure with MCU registers @regs. ++ * Other process information is N/A for CSF Firmware. ++ */ ++static void fw_core_dump_fill_elf_prstatus(struct elf_prstatus32 *prs, ++ struct fw_core_dump_mcu *regs) ++{ ++ /* Only fill in registers (32-bit) of PRSTATUS note. */ ++ memset(prs, 0, sizeof(*prs)); ++ prs->pr_reg[0] = regs->r0; ++ prs->pr_reg[1] = regs->r1; ++ prs->pr_reg[2] = regs->r2; ++ prs->pr_reg[3] = regs->r3; ++ prs->pr_reg[4] = regs->r4; ++ prs->pr_reg[5] = regs->r5; ++ prs->pr_reg[6] = regs->r0; ++ prs->pr_reg[7] = regs->r7; ++ prs->pr_reg[8] = regs->r8; ++ prs->pr_reg[9] = regs->r9; ++ prs->pr_reg[10] = regs->r10; ++ prs->pr_reg[11] = regs->r11; ++ prs->pr_reg[12] = regs->r12; ++ prs->pr_reg[13] = regs->sp; ++ prs->pr_reg[14] = regs->lr; ++ prs->pr_reg[15] = regs->pc; ++} + -+ ginfo->kbdev = kbdev; -+ ginfo->features = 0; -+ ginfo->suspend_size = 64; -+ ginfo->protm_suspend_size = 64; -+ ginfo->stream_num = ARRAY_SIZE(csg->csi); -+ ginfo->stream_stride = 0; ++/** ++ * fw_core_dump_create_prstatus_note - Creates an ELF32 PRSTATUS note ++ * @name: Name for the PRSTATUS note ++ * @prs: ELF32 PRSTATUS structure to put in the PRSTATUS note ++ * @created_prstatus_note: ++ * Pointer to the allocated ELF32 PRSTATUS note ++ * ++ * Creates an ELF32 note with one PRSTATUS entry containing the ++ * ELF32 PRSTATUS structure @prs. Caller needs to free the created note in ++ * @created_prstatus_note. ++ * ++ * Return: 0 on failure, otherwise size of ELF32 PRSTATUS note in bytes. ++ */ ++static unsigned int fw_core_dump_create_prstatus_note(char *name, struct elf_prstatus32 *prs, ++ struct elf32_note **created_prstatus_note) ++{ ++ struct elf32_note *note; ++ unsigned int note_name_sz; ++ unsigned int note_sz; + -+ ginfo->streams = kcalloc(ginfo->stream_num, sizeof(*ginfo->streams), GFP_KERNEL); -+ if (ginfo->streams == NULL) { -+ return -ENOMEM; -+ } ++ /* Allocate memory for ELF32 note containing a PRSTATUS note. */ ++ note_name_sz = strlen(name) + 1; ++ note_sz = sizeof(struct elf32_note) + roundup(note_name_sz, 4) + ++ sizeof(struct elf_prstatus32); ++ note = kmalloc(note_sz, GFP_KERNEL); ++ if (!note) ++ return 0; + -+ for (sid = 0; sid < ginfo->stream_num; ++sid) { -+ struct kbase_csf_cmd_stream_info *stream = &ginfo->streams[sid]; -+ struct dummy_firmware_csi *csi = &csg->csi[sid]; ++ /* Fill in ELF32 note with one entry for a PRSTATUS note. */ ++ note->n_namesz = note_name_sz; ++ note->n_descsz = sizeof(struct elf_prstatus32); ++ note->n_type = NT_PRSTATUS; ++ memcpy(note + 1, name, note_name_sz); ++ memcpy((char *)(note + 1) + roundup(note_name_sz, 4), prs, sizeof(*prs)); + -+ stream->input = csi->cs_kernel_input; -+ stream->output = csi->cs_kernel_output; ++ /* Return pointer and size of the created ELF32 note. */ ++ *created_prstatus_note = note; ++ return note_sz; ++} + -+ stream->kbdev = kbdev; -+ stream->features = -+ STREAM_FEATURES_WORK_REGISTERS_SET(0, 80) | -+ STREAM_FEATURES_SCOREBOARDS_SET(0, 8) | -+ STREAM_FEATURES_COMPUTE_SET(0, 1) | -+ STREAM_FEATURES_FRAGMENT_SET(0, 1) | -+ STREAM_FEATURES_TILER_SET(0, 1); ++/** ++ * fw_core_dump_write_elf_header - Writes ELF header for the FW core dump ++ * @m: the seq_file handle ++ * ++ * Writes the ELF header of the core dump including program headers for ++ * memory sections and a note containing the current MCU register ++ * values. ++ * ++ * Excludes memory sections without read access permissions or ++ * are for protected memory. ++ * ++ * The data written is as follows: ++ * - ELF header ++ * - ELF PHDRs for memory sections ++ * - ELF PHDR for program header NOTE ++ * - ELF PRSTATUS note ++ * - 0-bytes padding to multiple of ELF_EXEC_PAGESIZE ++ * ++ * The actual memory section dumps should follow this (not written ++ * by this function). ++ * ++ * Retrieves the necessary information via the struct ++ * fw_core_dump_data stored in the private member of the seq_file ++ * handle. ++ * ++ * Return: ++ * * 0 - success ++ * * -ENOMEM - not enough memory for allocating ELF32 note ++ */ ++static int fw_core_dump_write_elf_header(struct seq_file *m) ++{ ++ struct elf32_hdr hdr; ++ struct elf32_phdr phdr; ++ struct fw_core_dump_data *dump_data = m->private; ++ struct kbase_device *const kbdev = dump_data->kbdev; ++ struct kbase_csf_firmware_interface *interface; ++ struct elf_prstatus32 elf_prs; ++ struct elf32_note *elf_prstatus_note; ++ unsigned int sections = 0; ++ unsigned int elf_prstatus_note_size; ++ u32 elf_prstatus_offset; ++ u32 elf_phdr_note_offset; ++ u32 elf_memory_sections_data_offset; ++ u32 total_pages = 0; ++ u32 padding_size, *padding; ++ struct fw_core_dump_mcu regs = { 0 }; ++ ++ /* Count number of memory sections. */ ++ list_for_each_entry(interface, &kbdev->csf.firmware_interfaces, node) { ++ /* Skip memory sections that cannot be read or are protected. */ ++ if ((interface->flags & CSF_FIRMWARE_ENTRY_PROTECTED) || ++ (interface->flags & CSF_FIRMWARE_ENTRY_READ) == 0) ++ continue; ++ sections++; + } + -+ return 0; -+} ++ /* Prepare ELF header. */ ++ fw_core_dump_fill_elf_header(&hdr, sections + 1); ++ seq_write(m, &hdr, sizeof(struct elf32_hdr)); + -+static int invent_capabilities(struct kbase_device *kbdev) -+{ -+ struct dummy_firmware_interface *interface = kbdev->csf.shared_interface; -+ struct kbase_csf_global_iface *iface = &kbdev->csf.global_iface; -+ unsigned int gid; ++ elf_prstatus_note_size = fw_core_dump_get_prstatus_note_size("CORE"); ++ /* PHDRs of PT_LOAD type. */ ++ elf_phdr_note_offset = sizeof(struct elf32_hdr) + sections * sizeof(struct elf32_phdr); ++ /* PHDR of PT_NOTE type. */ ++ elf_prstatus_offset = elf_phdr_note_offset + sizeof(struct elf32_phdr); ++ elf_memory_sections_data_offset = elf_prstatus_offset + elf_prstatus_note_size; + -+ iface->input = interface->global_input; -+ iface->output = interface->global_output; ++ /* Calculate padding size to page offset. */ ++ padding_size = roundup(elf_memory_sections_data_offset, ELF_EXEC_PAGESIZE) - ++ elf_memory_sections_data_offset; ++ elf_memory_sections_data_offset += padding_size; + -+ iface->version = 1; -+ iface->kbdev = kbdev; -+ iface->features = 0; -+ iface->prfcnt_size = 64; -+ iface->group_num = ARRAY_SIZE(interface->csg); -+ iface->group_stride = 0; ++ /* Prepare ELF program header table. */ ++ list_for_each_entry(interface, &kbdev->csf.firmware_interfaces, node) { ++ /* Skip memory sections that cannot be read or are protected. */ ++ if ((interface->flags & CSF_FIRMWARE_ENTRY_PROTECTED) || ++ (interface->flags & CSF_FIRMWARE_ENTRY_READ) == 0) ++ continue; + -+ iface->groups = kcalloc(iface->group_num, sizeof(*iface->groups), GFP_KERNEL); -+ if (iface->groups == NULL) { -+ return -ENOMEM; -+ } ++ fw_core_dump_fill_elf_program_header(&phdr, elf_memory_sections_data_offset, ++ interface->virtual, ++ interface->num_pages * FW_PAGE_SIZE, ++ interface->flags); + -+ for (gid = 0; gid < iface->group_num; ++gid) { -+ int err; ++ seq_write(m, &phdr, sizeof(struct elf32_phdr)); + -+ err = invent_cmd_stream_group_info(kbdev, &iface->groups[gid], -+ &interface->csg[gid]); -+ if (err < 0) { -+ free_global_iface(kbdev); -+ return err; -+ } ++ elf_memory_sections_data_offset += interface->num_pages * FW_PAGE_SIZE; ++ total_pages += interface->num_pages; + } + -+ return 0; -+} ++ /* Prepare PHDR of PT_NOTE type. */ ++ fw_core_dump_fill_elf_program_header_note(&phdr, elf_prstatus_offset, ++ elf_prstatus_note_size); ++ seq_write(m, &phdr, sizeof(struct elf32_phdr)); + -+void kbase_csf_read_firmware_memory(struct kbase_device *kbdev, -+ u32 gpu_addr, u32 *value) -+{ -+ /* NO_MALI: Nothing to do here */ -+} ++ /* Prepare ELF note of PRSTATUS type. */ ++ if (fw_get_core_dump_mcu(kbdev, ®s)) ++ dev_dbg(kbdev->dev, "MCU Registers not available, all registers set to zero"); ++ /* Even if MCU Registers are not available the ELF prstatus is still ++ * filled with the registers equal to zero. ++ */ ++ fw_core_dump_fill_elf_prstatus(&elf_prs, ®s); ++ elf_prstatus_note_size = ++ fw_core_dump_create_prstatus_note("CORE", &elf_prs, &elf_prstatus_note); ++ if (elf_prstatus_note_size == 0) ++ return -ENOMEM; + ++ seq_write(m, elf_prstatus_note, elf_prstatus_note_size); ++ kfree(elf_prstatus_note); + -+void kbase_csf_update_firmware_memory(struct kbase_device *kbdev, -+ u32 gpu_addr, u32 value) -+{ -+ /* NO_MALI: Nothing to do here */ ++ /* Pad file to page size. */ ++ padding = kzalloc(padding_size, GFP_KERNEL); ++ seq_write(m, padding, padding_size); ++ kfree(padding); ++ ++ return 0; +} + -+void kbase_csf_firmware_cs_input( -+ const struct kbase_csf_cmd_stream_info *const info, const u32 offset, -+ const u32 value) ++/** ++ * fw_core_dump_create - Requests firmware to save state for a firmware core dump ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * Return: 0 on success, error code otherwise. ++ */ ++static int fw_core_dump_create(struct kbase_device *kbdev) +{ -+ const struct kbase_device * const kbdev = info->kbdev; ++ int err; + -+ dev_dbg(kbdev->dev, "cs input w: reg %08x val %08x\n", offset, value); -+ input_page_write(info->input, offset, value); ++ /* Ensure MCU is active before requesting the core dump. */ ++ kbase_csf_scheduler_pm_active(kbdev); ++ err = kbase_csf_scheduler_wait_mcu_active(kbdev); ++ if (!err) ++ err = kbase_csf_firmware_req_core_dump(kbdev); + -+ if (offset == CS_REQ) { -+ /* NO_MALI: Immediately acknowledge requests */ -+ output_page_write(info->output, CS_ACK, value); -+ } ++ kbase_csf_scheduler_pm_idle(kbdev); ++ ++ return err; +} + -+u32 kbase_csf_firmware_cs_input_read( -+ const struct kbase_csf_cmd_stream_info *const info, -+ const u32 offset) ++/** ++ * fw_core_dump_seq_start - seq_file start operation for firmware core dump file ++ * @m: the seq_file handle ++ * @_pos: holds the current position in pages ++ * (0 or most recent position used in previous session) ++ * ++ * Starts a seq_file session, positioning the iterator for the session to page @_pos - 1 ++ * within the firmware interface memory sections. @_pos value 0 is used to indicate the ++ * position of the ELF header at the start of the file. ++ * ++ * Retrieves the necessary information via the struct fw_core_dump_data stored in ++ * the private member of the seq_file handle. ++ * ++ * Return: ++ * * iterator pointer - pointer to iterator struct fw_core_dump_seq_off ++ * * SEQ_START_TOKEN - special iterator pointer indicating its is the start of the file ++ * * NULL - iterator could not be allocated ++ */ ++static void *fw_core_dump_seq_start(struct seq_file *m, loff_t *_pos) +{ -+ const struct kbase_device * const kbdev = info->kbdev; -+ u32 const val = input_page_read(info->input, offset); ++ struct fw_core_dump_data *dump_data = m->private; ++ struct fw_core_dump_seq_off *data; ++ struct kbase_csf_firmware_interface *interface; ++ loff_t pos = *_pos; + -+ dev_dbg(kbdev->dev, "cs input r: reg %08x val %08x\n", offset, val); -+ return val; -+} ++ if (pos == 0) ++ return SEQ_START_TOKEN; + -+void kbase_csf_firmware_cs_input_mask( -+ const struct kbase_csf_cmd_stream_info *const info, const u32 offset, -+ const u32 value, const u32 mask) -+{ -+ const struct kbase_device * const kbdev = info->kbdev; ++ /* Move iterator in the right position based on page number within ++ * available pages of firmware interface memory sections. ++ */ ++ pos--; /* ignore start token */ ++ list_for_each_entry(interface, &dump_data->kbdev->csf.firmware_interfaces, node) { ++ /* Skip memory sections that cannot be read or are protected. */ ++ if ((interface->flags & CSF_FIRMWARE_ENTRY_PROTECTED) || ++ (interface->flags & CSF_FIRMWARE_ENTRY_READ) == 0) ++ continue; + -+ dev_dbg(kbdev->dev, "cs input w: reg %08x val %08x mask %08x\n", -+ offset, value, mask); ++ if (pos >= interface->num_pages) { ++ pos -= interface->num_pages; ++ } else { ++ data = kmalloc(sizeof(*data), GFP_KERNEL); ++ if (!data) ++ return NULL; ++ data->interface = interface; ++ data->page_num = pos; ++ return data; ++ } ++ } + -+ /* NO_MALI: Go through kbase_csf_firmware_cs_input to capture writes */ -+ kbase_csf_firmware_cs_input(info, offset, (input_page_read(info->input, offset) & ~mask) | (value & mask)); ++ return NULL; +} + -+u32 kbase_csf_firmware_cs_output( -+ const struct kbase_csf_cmd_stream_info *const info, const u32 offset) ++/** ++ * fw_core_dump_seq_stop - seq_file stop operation for firmware core dump file ++ * @m: the seq_file handle ++ * @v: the current iterator (pointer to struct fw_core_dump_seq_off) ++ * ++ * Closes the current session and frees any memory related. ++ */ ++static void fw_core_dump_seq_stop(struct seq_file *m, void *v) +{ -+ const struct kbase_device * const kbdev = info->kbdev; -+ u32 const val = output_page_read(info->output, offset); -+ -+ dev_dbg(kbdev->dev, "cs output r: reg %08x val %08x\n", offset, val); -+ return val; ++ kfree(v); +} + -+void kbase_csf_firmware_csg_input( -+ const struct kbase_csf_cmd_stream_group_info *const info, -+ const u32 offset, const u32 value) ++/** ++ * fw_core_dump_seq_next - seq_file next operation for firmware core dump file ++ * @m: the seq_file handle ++ * @v: the current iterator (pointer to struct fw_core_dump_seq_off) ++ * @pos: holds the current position in pages ++ * (0 or most recent position used in previous session) ++ * ++ * Moves the iterator @v forward to the next page within the firmware interface ++ * memory sections and returns the updated position in @pos. ++ * @v value SEQ_START_TOKEN indicates the ELF header position. ++ * ++ * Return: ++ * * iterator pointer - pointer to iterator struct fw_core_dump_seq_off ++ * * NULL - iterator could not be allocated ++ */ ++static void *fw_core_dump_seq_next(struct seq_file *m, void *v, loff_t *pos) +{ -+ const struct kbase_device * const kbdev = info->kbdev; ++ struct fw_core_dump_data *dump_data = m->private; ++ struct fw_core_dump_seq_off *data = v; ++ struct kbase_csf_firmware_interface *interface; ++ struct list_head *interfaces = &dump_data->kbdev->csf.firmware_interfaces; + -+ dev_dbg(kbdev->dev, "csg input w: reg %08x val %08x\n", -+ offset, value); -+ input_page_write(info->input, offset, value); ++ /* Is current position at the ELF header ? */ ++ if (v == SEQ_START_TOKEN) { ++ if (list_empty(interfaces)) ++ return NULL; + -+ if (offset == CSG_REQ) { -+ /* NO_MALI: Immediately acknowledge requests */ -+ output_page_write(info->output, CSG_ACK, value); ++ /* Prepare iterator for starting at first page in firmware interface ++ * memory sections. ++ */ ++ data = kmalloc(sizeof(*data), GFP_KERNEL); ++ if (!data) ++ return NULL; ++ data->interface = ++ list_first_entry(interfaces, struct kbase_csf_firmware_interface, node); ++ data->page_num = 0; ++ ++*pos; ++ return data; + } -+} -+ -+u32 kbase_csf_firmware_csg_input_read( -+ const struct kbase_csf_cmd_stream_group_info *const info, -+ const u32 offset) -+{ -+ const struct kbase_device * const kbdev = info->kbdev; -+ u32 const val = input_page_read(info->input, offset); + -+ dev_dbg(kbdev->dev, "csg input r: reg %08x val %08x\n", offset, val); -+ return val; -+} ++ /* First attempt to satisfy from current firmware interface memory section. */ ++ interface = data->interface; ++ if (data->page_num + 1 < interface->num_pages) { ++ data->page_num++; ++ ++*pos; ++ return data; ++ } + -+void kbase_csf_firmware_csg_input_mask( -+ const struct kbase_csf_cmd_stream_group_info *const info, -+ const u32 offset, const u32 value, const u32 mask) -+{ -+ const struct kbase_device * const kbdev = info->kbdev; ++ /* Need next firmware interface memory section. This could be the last one. */ ++ if (list_is_last(&interface->node, interfaces)) { ++ kfree(data); ++ return NULL; ++ } + -+ dev_dbg(kbdev->dev, "csg input w: reg %08x val %08x mask %08x\n", -+ offset, value, mask); ++ /* Move to first page in next firmware interface memory section. */ ++ data->interface = list_next_entry(interface, node); ++ data->page_num = 0; ++ ++*pos; + -+ /* NO_MALI: Go through kbase_csf_firmware_csg_input to capture writes */ -+ kbase_csf_firmware_csg_input(info, offset, (input_page_read(info->input, offset) & ~mask) | (value & mask)); ++ return data; +} + -+u32 kbase_csf_firmware_csg_output( -+ const struct kbase_csf_cmd_stream_group_info *const info, -+ const u32 offset) ++/** ++ * fw_core_dump_seq_show - seq_file show operation for firmware core dump file ++ * @m: the seq_file handle ++ * @v: the current iterator (pointer to struct fw_core_dump_seq_off) ++ * ++ * Writes the current page in a firmware interface memory section indicated ++ * by the iterator @v to the file. If @v is SEQ_START_TOKEN the ELF ++ * header is written. ++ * ++ * Return: 0 on success, error code otherwise. ++ */ ++static int fw_core_dump_seq_show(struct seq_file *m, void *v) +{ -+ const struct kbase_device * const kbdev = info->kbdev; -+ u32 const val = output_page_read(info->output, offset); ++ struct fw_core_dump_seq_off *data = v; ++ struct page *page; ++ u32 *p; + -+ dev_dbg(kbdev->dev, "csg output r: reg %08x val %08x\n", offset, val); -+ return val; ++ /* Either write the ELF header or current page. */ ++ if (v == SEQ_START_TOKEN) ++ return fw_core_dump_write_elf_header(m); ++ ++ /* Write the current page. */ ++ page = as_page(data->interface->phys[data->page_num]); ++ p = kmap_atomic(page); ++ seq_write(m, p, FW_PAGE_SIZE); ++ kunmap_atomic(p); ++ ++ return 0; +} + -+void kbase_csf_firmware_global_input( -+ const struct kbase_csf_global_iface *const iface, const u32 offset, -+ const u32 value) ++/* Sequence file operations for firmware core dump file. */ ++static const struct seq_operations fw_core_dump_seq_ops = { ++ .start = fw_core_dump_seq_start, ++ .next = fw_core_dump_seq_next, ++ .stop = fw_core_dump_seq_stop, ++ .show = fw_core_dump_seq_show, ++}; ++ ++/** ++ * fw_core_dump_debugfs_open - callback for opening the 'fw_core_dump' debugfs file ++ * @inode: inode of the file ++ * @file: file pointer ++ * ++ * Prepares for servicing a write request to request a core dump from firmware and ++ * a read request to retrieve the core dump. ++ * ++ * Returns an error if the firmware is not initialized yet. ++ * ++ * Return: 0 on success, error code otherwise. ++ */ ++static int fw_core_dump_debugfs_open(struct inode *inode, struct file *file) +{ -+ const struct kbase_device * const kbdev = iface->kbdev; ++ struct kbase_device *const kbdev = inode->i_private; ++ struct fw_core_dump_data *dump_data; ++ int ret; + -+ dev_dbg(kbdev->dev, "glob input w: reg %08x val %08x\n", offset, value); -+ input_page_write(iface->input, offset, value); ++ /* Fail if firmware is not initialized yet. */ ++ if (!kbdev->csf.firmware_inited) { ++ ret = -ENODEV; ++ goto open_fail; ++ } + -+ if (offset == GLB_REQ) { -+ /* NO_MALI: Immediately acknowledge requests */ -+ output_page_write(iface->output, GLB_ACK, value); ++ /* Open a sequence file for iterating through the pages in the ++ * firmware interface memory pages. seq_open stores a ++ * struct seq_file * in the private_data field of @file. ++ */ ++ ret = seq_open(file, &fw_core_dump_seq_ops); ++ if (ret) ++ goto open_fail; ++ ++ /* Allocate a context for sequence file operations. */ ++ dump_data = kmalloc(sizeof(*dump_data), GFP_KERNEL); ++ if (!dump_data) { ++ ret = -ENOMEM; ++ goto out; + } -+} + -+void kbase_csf_firmware_global_input_mask( -+ const struct kbase_csf_global_iface *const iface, const u32 offset, -+ const u32 value, const u32 mask) -+{ -+ const struct kbase_device * const kbdev = iface->kbdev; ++ /* Kbase device will be shared with sequence file operations. */ ++ dump_data->kbdev = kbdev; + -+ dev_dbg(kbdev->dev, "glob input w: reg %08x val %08x mask %08x\n", -+ offset, value, mask); ++ /* Link our sequence file context. */ ++ ((struct seq_file *)file->private_data)->private = dump_data; + -+ /* NO_MALI: Go through kbase_csf_firmware_global_input to capture writes */ -+ kbase_csf_firmware_global_input(iface, offset, (input_page_read(iface->input, offset) & ~mask) | (value & mask)); ++ return 0; ++out: ++ seq_release(inode, file); ++open_fail: ++ return ret; +} + -+u32 kbase_csf_firmware_global_input_read( -+ const struct kbase_csf_global_iface *const iface, const u32 offset) ++/** ++ * fw_core_dump_debugfs_write - callback for a write to the 'fw_core_dump' debugfs file ++ * @file: file pointer ++ * @ubuf: user buffer containing data to store ++ * @count: number of bytes in user buffer ++ * @ppos: file position ++ * ++ * Any data written to the file triggers a firmware core dump request which ++ * subsequently can be retrieved by reading from the file. ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t fw_core_dump_debugfs_write(struct file *file, const char __user *ubuf, size_t count, ++ loff_t *ppos) +{ -+ const struct kbase_device * const kbdev = iface->kbdev; -+ u32 const val = input_page_read(iface->input, offset); ++ int err; ++ struct fw_core_dump_data *dump_data = ((struct seq_file *)file->private_data)->private; ++ struct kbase_device *const kbdev = dump_data->kbdev; + -+ dev_dbg(kbdev->dev, "glob input r: reg %08x val %08x\n", offset, val); -+ return val; -+} ++ CSTD_UNUSED(ppos); + -+u32 kbase_csf_firmware_global_output( -+ const struct kbase_csf_global_iface *const iface, const u32 offset) -+{ -+ const struct kbase_device * const kbdev = iface->kbdev; -+ u32 const val = output_page_read(iface->output, offset); ++ err = fw_core_dump_create(kbdev); + -+ dev_dbg(kbdev->dev, "glob output r: reg %08x val %08x\n", offset, val); -+ return val; ++ return err ? err : count; +} + -+static bool global_request_complete(struct kbase_device *const kbdev, -+ u32 const req_mask) ++/** ++ * fw_core_dump_debugfs_release - callback for releasing the 'fw_core_dump' debugfs file ++ * @inode: inode of the file ++ * @file: file pointer ++ * ++ * Return: 0 on success, error code otherwise. ++ */ ++static int fw_core_dump_debugfs_release(struct inode *inode, struct file *file) +{ -+ struct kbase_csf_global_iface *global_iface = -+ &kbdev->csf.global_iface; -+ bool complete = false; -+ unsigned long flags; ++ struct fw_core_dump_data *dump_data = ((struct seq_file *)file->private_data)->private; + -+ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ seq_release(inode, file); + -+ if ((kbase_csf_firmware_global_output(global_iface, GLB_ACK) & -+ req_mask) == -+ (kbase_csf_firmware_global_input_read(global_iface, GLB_REQ) & -+ req_mask)) -+ complete = true; ++ kfree(dump_data); + -+ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ return 0; ++} ++/* Debugfs file operations for firmware core dump file. */ ++static const struct file_operations kbase_csf_fw_core_dump_fops = { ++ .owner = THIS_MODULE, ++ .open = fw_core_dump_debugfs_open, ++ .read = seq_read, ++ .write = fw_core_dump_debugfs_write, ++ .llseek = seq_lseek, ++ .release = fw_core_dump_debugfs_release, ++}; + -+ return complete; ++void kbase_csf_firmware_core_dump_init(struct kbase_device *const kbdev) ++{ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ debugfs_create_file("fw_core_dump", 0600, kbdev->mali_debugfs_directory, kbdev, ++ &kbase_csf_fw_core_dump_fops); ++#endif /* CONFIG_DEBUG_FS */ +} + -+static int wait_for_global_request(struct kbase_device *const kbdev, -+ u32 const req_mask) ++int kbase_csf_firmware_core_dump_entry_parse(struct kbase_device *kbdev, const u32 *entry) +{ -+ const long wait_timeout = -+ kbase_csf_timeout_in_jiffies(GLB_REQ_WAIT_TIMEOUT_MS); -+ long remaining; -+ int err = 0; ++ /* Casting to u16 as version is defined by bits 15:0 */ ++ kbdev->csf.fw_core_dump.version = (u16)entry[FW_CORE_DUMP_VERSION_INDEX]; + -+ remaining = wait_event_timeout(kbdev->csf.event_wait, -+ global_request_complete(kbdev, req_mask), -+ wait_timeout); ++ if (kbdev->csf.fw_core_dump.version != FW_CORE_DUMP_DATA_VERSION) ++ return -EPERM; + -+ if (!remaining) { ++ kbdev->csf.fw_core_dump.mcu_regs_addr = entry[FW_CORE_DUMP_START_ADDR_INDEX]; ++ kbdev->csf.fw_core_dump.available = true; ++ ++ return 0; ++} +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.h +new file mode 100644 +index 000000000..0537dca4f +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.h +@@ -0,0 +1,65 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#ifndef _KBASE_CSF_FIRMWARE_CORE_DUMP_H_ ++#define _KBASE_CSF_FIRMWARE_CORE_DUMP_H_ ++ ++struct kbase_device; ++ ++/** Offset of the last field of core dump entry from the image header */ ++#define CORE_DUMP_ENTRY_START_ADDR_OFFSET (0x4) ++ ++/** ++ * kbase_csf_firmware_core_dump_entry_parse() - Parse a "core dump" entry from ++ * the image header. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @entry: Pointer to section. ++ * ++ * Read a "core dump" entry from the image header, check the version for ++ * compatibility and store the address pointer. ++ * ++ * Return: 0 if successfully parse entry, negative error code otherwise. ++ */ ++int kbase_csf_firmware_core_dump_entry_parse(struct kbase_device *kbdev, const u32 *entry); ++ ++/** ++ * kbase_csf_firmware_core_dump_init() - Initialize firmware core dump support ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * Must be zero-initialized. ++ * ++ * Creates the fw_core_dump debugfs file through which to request a firmware ++ * core dump. The created debugfs file is cleaned up as part of kbdev debugfs ++ * cleanup. ++ * ++ * The fw_core_dump debugs file that case be used in the following way: ++ * ++ * To explicitly request core dump: ++ * echo 1 >/sys/kernel/debug/mali0/fw_core_dump ++ * ++ * To output current core dump (after explicitly requesting a core dump, or ++ * kernel driver reported an internal firmware error): ++ * cat /sys/kernel/debug/mali0/fw_core_dump ++ */ ++void kbase_csf_firmware_core_dump_init(struct kbase_device *const kbdev); ++ ++#endif /* _KBASE_CSF_FIRMWARE_CORE_DUMP_H_ */ +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.c +new file mode 100644 +index 000000000..6e0d3c2f5 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.c +@@ -0,0 +1,451 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#include ++#include "backend/gpu/mali_kbase_pm_internal.h" ++#include ++#include ++#include ++#include ++#include ++ ++/* ++ * ARMv7 instruction: Branch with Link calls a subroutine at a PC-relative address. ++ */ ++#define ARMV7_T1_BL_IMM_INSTR 0xd800f000 ++ ++/* ++ * ARMv7 instruction: Branch with Link calls a subroutine at a PC-relative address, maximum ++ * negative jump offset. ++ */ ++#define ARMV7_T1_BL_IMM_RANGE_MIN -16777216 ++ ++/* ++ * ARMv7 instruction: Branch with Link calls a subroutine at a PC-relative address, maximum ++ * positive jump offset. ++ */ ++#define ARMV7_T1_BL_IMM_RANGE_MAX 16777214 ++ ++/* ++ * ARMv7 instruction: Double NOP instructions. ++ */ ++#define ARMV7_DOUBLE_NOP_INSTR 0xbf00bf00 ++ ++#if defined(CONFIG_DEBUG_FS) ++ ++static int kbase_csf_firmware_log_enable_mask_read(void *data, u64 *val) ++{ ++ struct kbase_device *kbdev = (struct kbase_device *)data; ++ struct firmware_trace_buffer *tb = ++ kbase_csf_firmware_get_trace_buffer(kbdev, FIRMWARE_LOG_BUF_NAME); ++ ++ if (tb == NULL) { ++ dev_err(kbdev->dev, "Couldn't get the firmware trace buffer"); ++ return -EIO; ++ } ++ /* The enabled traces limited to u64 here, regarded practical */ ++ *val = kbase_csf_firmware_trace_buffer_get_active_mask64(tb); ++ return 0; ++} ++ ++static int kbase_csf_firmware_log_enable_mask_write(void *data, u64 val) ++{ ++ struct kbase_device *kbdev = (struct kbase_device *)data; ++ struct firmware_trace_buffer *tb = ++ kbase_csf_firmware_get_trace_buffer(kbdev, FIRMWARE_LOG_BUF_NAME); ++ u64 new_mask; ++ unsigned int enable_bits_count; ++ ++ if (tb == NULL) { ++ dev_err(kbdev->dev, "Couldn't get the firmware trace buffer"); ++ return -EIO; ++ } ++ ++ /* Ignore unsupported types */ ++ enable_bits_count = kbase_csf_firmware_trace_buffer_get_trace_enable_bits_count(tb); ++ if (enable_bits_count > 64) { ++ dev_dbg(kbdev->dev, "Limit enabled bits count from %u to 64", enable_bits_count); ++ enable_bits_count = 64; ++ } ++ new_mask = val & (UINT64_MAX >> (64 - enable_bits_count)); ++ ++ if (new_mask != kbase_csf_firmware_trace_buffer_get_active_mask64(tb)) ++ return kbase_csf_firmware_trace_buffer_set_active_mask64(tb, new_mask); ++ else ++ return 0; ++} ++ ++static int kbasep_csf_firmware_log_debugfs_open(struct inode *in, struct file *file) ++{ ++ struct kbase_device *kbdev = in->i_private; ++ ++ file->private_data = kbdev; ++ dev_dbg(kbdev->dev, "Opened firmware trace buffer dump debugfs file"); ++ ++ return 0; ++} ++ ++static ssize_t kbasep_csf_firmware_log_debugfs_read(struct file *file, char __user *buf, ++ size_t size, loff_t *ppos) ++{ ++ struct kbase_device *kbdev = file->private_data; ++ struct kbase_csf_firmware_log *fw_log = &kbdev->csf.fw_log; ++ unsigned int n_read; ++ unsigned long not_copied; ++ /* Limit reads to the kernel dump buffer size */ ++ size_t mem = MIN(size, FIRMWARE_LOG_DUMP_BUF_SIZE); ++ int ret; ++ ++ struct firmware_trace_buffer *tb = ++ kbase_csf_firmware_get_trace_buffer(kbdev, FIRMWARE_LOG_BUF_NAME); ++ ++ if (tb == NULL) { ++ dev_err(kbdev->dev, "Couldn't get the firmware trace buffer"); ++ return -EIO; ++ } ++ ++ if (atomic_cmpxchg(&fw_log->busy, 0, 1) != 0) ++ return -EBUSY; ++ ++ /* Reading from userspace is only allowed in manual mode */ ++ if (fw_log->mode != KBASE_CSF_FIRMWARE_LOG_MODE_MANUAL) { ++ ret = -EINVAL; ++ goto out; ++ } ++ ++ n_read = kbase_csf_firmware_trace_buffer_read_data(tb, fw_log->dump_buf, mem); ++ ++ /* Do the copy, if we have obtained some trace data */ ++ not_copied = (n_read) ? copy_to_user(buf, fw_log->dump_buf, n_read) : 0; ++ ++ if (not_copied) { ++ dev_err(kbdev->dev, "Couldn't copy trace buffer data to user space buffer"); ++ ret = -EFAULT; ++ goto out; ++ } ++ ++ *ppos += n_read; ++ ret = n_read; ++ ++out: ++ atomic_set(&fw_log->busy, 0); ++ return ret; ++} ++ ++static int kbase_csf_firmware_log_mode_read(void *data, u64 *val) ++{ ++ struct kbase_device *kbdev = (struct kbase_device *)data; ++ struct kbase_csf_firmware_log *fw_log = &kbdev->csf.fw_log; ++ ++ *val = fw_log->mode; ++ return 0; ++} ++ ++static int kbase_csf_firmware_log_mode_write(void *data, u64 val) ++{ ++ struct kbase_device *kbdev = (struct kbase_device *)data; ++ struct kbase_csf_firmware_log *fw_log = &kbdev->csf.fw_log; ++ int ret = 0; ++ ++ if (atomic_cmpxchg(&fw_log->busy, 0, 1) != 0) ++ return -EBUSY; ++ ++ if (val == fw_log->mode) ++ goto out; ++ ++ switch (val) { ++ case KBASE_CSF_FIRMWARE_LOG_MODE_MANUAL: ++ cancel_delayed_work_sync(&fw_log->poll_work); ++ break; ++ case KBASE_CSF_FIRMWARE_LOG_MODE_AUTO_PRINT: ++ schedule_delayed_work(&fw_log->poll_work, ++ msecs_to_jiffies(KBASE_CSF_FIRMWARE_LOG_POLL_PERIOD_MS)); ++ break; ++ default: ++ ret = -EINVAL; ++ goto out; ++ } ++ ++ fw_log->mode = val; ++ ++out: ++ atomic_set(&fw_log->busy, 0); ++ return ret; ++} ++ ++DEFINE_DEBUGFS_ATTRIBUTE(kbase_csf_firmware_log_enable_mask_fops, ++ kbase_csf_firmware_log_enable_mask_read, ++ kbase_csf_firmware_log_enable_mask_write, "%llx\n"); ++ ++static const struct file_operations kbasep_csf_firmware_log_debugfs_fops = { ++ .owner = THIS_MODULE, ++ .open = kbasep_csf_firmware_log_debugfs_open, ++ .read = kbasep_csf_firmware_log_debugfs_read, ++ .llseek = no_llseek, ++}; ++ ++DEFINE_DEBUGFS_ATTRIBUTE(kbase_csf_firmware_log_mode_fops, kbase_csf_firmware_log_mode_read, ++ kbase_csf_firmware_log_mode_write, "%llu\n"); ++ ++#endif /* CONFIG_DEBUG_FS */ ++ ++static void kbase_csf_firmware_log_poll(struct work_struct *work) ++{ ++ struct kbase_device *kbdev = ++ container_of(work, struct kbase_device, csf.fw_log.poll_work.work); ++ struct kbase_csf_firmware_log *fw_log = &kbdev->csf.fw_log; ++ ++ schedule_delayed_work(&fw_log->poll_work, ++ msecs_to_jiffies(KBASE_CSF_FIRMWARE_LOG_POLL_PERIOD_MS)); ++ ++ kbase_csf_firmware_log_dump_buffer(kbdev); ++} ++ ++int kbase_csf_firmware_log_init(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_firmware_log *fw_log = &kbdev->csf.fw_log; ++ ++ /* Add one byte for null-termination */ ++ fw_log->dump_buf = kmalloc(FIRMWARE_LOG_DUMP_BUF_SIZE + 1, GFP_KERNEL); ++ if (fw_log->dump_buf == NULL) ++ return -ENOMEM; ++ ++ /* Ensure null-termination for all strings */ ++ fw_log->dump_buf[FIRMWARE_LOG_DUMP_BUF_SIZE] = 0; ++ ++ fw_log->mode = KBASE_CSF_FIRMWARE_LOG_MODE_MANUAL; ++ ++ atomic_set(&fw_log->busy, 0); ++ INIT_DEFERRABLE_WORK(&fw_log->poll_work, kbase_csf_firmware_log_poll); ++ ++#if defined(CONFIG_DEBUG_FS) ++ debugfs_create_file("fw_trace_enable_mask", 0644, kbdev->mali_debugfs_directory, kbdev, ++ &kbase_csf_firmware_log_enable_mask_fops); ++ debugfs_create_file("fw_traces", 0444, kbdev->mali_debugfs_directory, kbdev, ++ &kbasep_csf_firmware_log_debugfs_fops); ++ debugfs_create_file("fw_trace_mode", 0644, kbdev->mali_debugfs_directory, kbdev, ++ &kbase_csf_firmware_log_mode_fops); ++#endif /* CONFIG_DEBUG_FS */ ++ ++ return 0; ++} ++ ++void kbase_csf_firmware_log_term(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_firmware_log *fw_log = &kbdev->csf.fw_log; ++ ++ if (fw_log->dump_buf) { ++ cancel_delayed_work_sync(&fw_log->poll_work); ++ kfree(fw_log->dump_buf); ++ fw_log->dump_buf = NULL; ++ } ++} ++ ++void kbase_csf_firmware_log_dump_buffer(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_firmware_log *fw_log = &kbdev->csf.fw_log; ++ u8 *buf = fw_log->dump_buf, *p, *pnewline, *pend, *pendbuf; ++ unsigned int read_size, remaining_size; ++ struct firmware_trace_buffer *tb = ++ kbase_csf_firmware_get_trace_buffer(kbdev, FIRMWARE_LOG_BUF_NAME); ++ ++ if (tb == NULL) { ++ dev_dbg(kbdev->dev, "Can't get the trace buffer, firmware trace dump skipped"); ++ return; ++ } ++ ++ if (atomic_cmpxchg(&fw_log->busy, 0, 1) != 0) ++ return; ++ ++ /* FW should only print complete messages, so there's no need to handle ++ * partial messages over multiple invocations of this function ++ */ ++ ++ p = buf; ++ pendbuf = &buf[FIRMWARE_LOG_DUMP_BUF_SIZE]; ++ ++ while ((read_size = kbase_csf_firmware_trace_buffer_read_data(tb, p, pendbuf - p))) { ++ pend = p + read_size; ++ p = buf; ++ ++ while (p < pend && (pnewline = memchr(p, '\n', pend - p))) { ++ /* Null-terminate the string */ ++ *pnewline = 0; ++ ++ dev_err(kbdev->dev, "FW> %s", p); ++ ++ p = pnewline + 1; ++ } ++ ++ remaining_size = pend - p; ++ ++ if (!remaining_size) { ++ p = buf; ++ } else if (remaining_size < FIRMWARE_LOG_DUMP_BUF_SIZE) { ++ /* Copy unfinished string to the start of the buffer */ ++ memmove(buf, p, remaining_size); ++ p = &buf[remaining_size]; ++ } else { ++ /* Print abnormally long string without newlines */ ++ dev_err(kbdev->dev, "FW> %s", buf); ++ p = buf; ++ } ++ } ++ ++ if (p != buf) { ++ /* Null-terminate and print last unfinished string */ ++ *p = 0; ++ dev_err(kbdev->dev, "FW> %s", buf); ++ } ++ ++ atomic_set(&fw_log->busy, 0); ++} ++ ++void kbase_csf_firmware_log_parse_logging_call_list_entry(struct kbase_device *kbdev, ++ const uint32_t *entry) ++{ ++ kbdev->csf.fw_log.func_call_list_va_start = entry[0]; ++ kbdev->csf.fw_log.func_call_list_va_end = entry[1]; ++} ++ ++/** ++ * toggle_logging_calls_in_loaded_image - Toggles FW log func calls in loaded FW image. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @enable: Whether to enable or disable the function calls. ++ */ ++static void toggle_logging_calls_in_loaded_image(struct kbase_device *kbdev, bool enable) ++{ ++ uint32_t bl_instruction, diff; ++ uint32_t imm11, imm10, i1, i2, j1, j2, sign; ++ uint32_t calling_address = 0, callee_address = 0; ++ uint32_t list_entry = kbdev->csf.fw_log.func_call_list_va_start; ++ const uint32_t list_va_end = kbdev->csf.fw_log.func_call_list_va_end; ++ ++ if (list_entry == 0 || list_va_end == 0) ++ return; ++ ++ if (enable) { ++ for (; list_entry < list_va_end; list_entry += 2 * sizeof(uint32_t)) { ++ /* Read calling address */ ++ kbase_csf_read_firmware_memory(kbdev, list_entry, &calling_address); ++ /* Read callee address */ ++ kbase_csf_read_firmware_memory(kbdev, list_entry + sizeof(uint32_t), ++ &callee_address); ++ ++ diff = callee_address - calling_address - 4; ++ sign = !!(diff & 0x80000000); ++ if (ARMV7_T1_BL_IMM_RANGE_MIN > (int32_t)diff || ++ ARMV7_T1_BL_IMM_RANGE_MAX < (int32_t)diff) { ++ dev_warn(kbdev->dev, "FW log patch 0x%x out of range, skipping", ++ calling_address); ++ continue; ++ } ++ ++ i1 = (diff & 0x00800000) >> 23; ++ j1 = !i1 ^ sign; ++ i2 = (diff & 0x00400000) >> 22; ++ j2 = !i2 ^ sign; ++ imm11 = (diff & 0xffe) >> 1; ++ imm10 = (diff & 0x3ff000) >> 12; ++ ++ /* Compose BL instruction */ ++ bl_instruction = ARMV7_T1_BL_IMM_INSTR; ++ bl_instruction |= j1 << 29; ++ bl_instruction |= j2 << 27; ++ bl_instruction |= imm11 << 16; ++ bl_instruction |= sign << 10; ++ bl_instruction |= imm10; ++ ++ /* Patch logging func calls in their load location */ ++ dev_dbg(kbdev->dev, "FW log patch 0x%x: 0x%x\n", calling_address, ++ bl_instruction); ++ kbase_csf_update_firmware_memory_exe(kbdev, calling_address, ++ bl_instruction); ++ } ++ } else { ++ for (; list_entry < list_va_end; list_entry += 2 * sizeof(uint32_t)) { ++ /* Read calling address */ ++ kbase_csf_read_firmware_memory(kbdev, list_entry, &calling_address); ++ ++ /* Overwrite logging func calls with 2 NOP instructions */ ++ kbase_csf_update_firmware_memory_exe(kbdev, calling_address, ++ ARMV7_DOUBLE_NOP_INSTR); ++ } ++ } ++} ++ ++int kbase_csf_firmware_log_toggle_logging_calls(struct kbase_device *kbdev, u32 val) ++{ ++ unsigned long flags; ++ struct kbase_csf_firmware_log *fw_log = &kbdev->csf.fw_log; ++ bool mcu_inactive; ++ bool resume_needed = false; ++ int ret = 0; ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ ++ if (atomic_cmpxchg(&fw_log->busy, 0, 1) != 0) ++ return -EBUSY; ++ ++ /* Suspend all the active CS groups */ ++ dev_dbg(kbdev->dev, "Suspend all the active CS groups"); ++ ++ kbase_csf_scheduler_lock(kbdev); ++ while (scheduler->state != SCHED_SUSPENDED) { ++ kbase_csf_scheduler_unlock(kbdev); ++ kbase_csf_scheduler_pm_suspend(kbdev); ++ kbase_csf_scheduler_lock(kbdev); ++ resume_needed = true; ++ } ++ ++ /* Wait for the MCU to get disabled */ ++ dev_info(kbdev->dev, "Wait for the MCU to get disabled"); ++ ret = kbase_pm_wait_for_desired_state(kbdev); ++ if (ret) { ++ dev_err(kbdev->dev, ++ "wait for PM state failed when toggling FW logging calls"); ++ ret = -EAGAIN; ++ goto out; ++ } ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ mcu_inactive = ++ kbase_pm_is_mcu_inactive(kbdev, kbdev->pm.backend.mcu_state); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ if (!mcu_inactive) { ++ dev_err(kbdev->dev, ++ "MCU not inactive after PM state wait when toggling FW logging calls"); ++ ret = -EAGAIN; ++ goto out; ++ } ++ ++ /* Toggle FW logging call in the loaded FW image */ ++ toggle_logging_calls_in_loaded_image(kbdev, val); ++ dev_dbg(kbdev->dev, "FW logging: %s", val ? "enabled" : "disabled"); ++ ++out: ++ kbase_csf_scheduler_unlock(kbdev); ++ if (resume_needed) ++ /* Resume queue groups and start mcu */ ++ kbase_csf_scheduler_pm_resume(kbdev); ++ atomic_set(&fw_log->busy, 0); ++ return ret; ++} +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.h +new file mode 100644 +index 000000000..100832046 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.h +@@ -0,0 +1,77 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#ifndef _KBASE_CSF_FIRMWARE_LOG_H_ ++#define _KBASE_CSF_FIRMWARE_LOG_H_ ++ ++#include ++ ++/** Offset of the last field of functions call list entry from the image header */ ++#define FUNC_CALL_LIST_ENTRY_NAME_OFFSET (0x8) ++ ++/* ++ * Firmware log dumping buffer size. ++ */ ++#define FIRMWARE_LOG_DUMP_BUF_SIZE PAGE_SIZE ++ ++/** ++ * kbase_csf_firmware_log_init - Initialize firmware log handling. ++ * ++ * @kbdev: Pointer to the Kbase device ++ * ++ * Return: The initialization error code. ++ */ ++int kbase_csf_firmware_log_init(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_firmware_log_term - Terminate firmware log handling. ++ * ++ * @kbdev: Pointer to the Kbase device ++ */ ++void kbase_csf_firmware_log_term(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_firmware_log_dump_buffer - Read remaining data in the firmware log ++ * buffer and print it to dmesg. ++ * ++ * @kbdev: Pointer to the Kbase device ++ */ ++void kbase_csf_firmware_log_dump_buffer(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_firmware_log_parse_logging_call_list_entry - Parse FW logging function call list entry. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @entry: Pointer to section. ++ */ ++void kbase_csf_firmware_log_parse_logging_call_list_entry(struct kbase_device *kbdev, ++ const uint32_t *entry); ++/** ++ * kbase_csf_firmware_log_toggle_logging_calls - Enables/Disables FW logging function calls. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @val: Configuration option value. ++ * ++ * Return: 0 if successful, negative error code on failure ++ */ ++int kbase_csf_firmware_log_toggle_logging_calls(struct kbase_device *kbdev, u32 val); ++ ++#endif /* _KBASE_CSF_FIRMWARE_LOG_H_ */ +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c +new file mode 100755 +index 000000000..833947fac +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c +@@ -0,0 +1,1661 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2018-2023 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#include "mali_kbase.h" ++#include "mali_kbase_csf_firmware.h" ++#include "mali_kbase_csf_trace_buffer.h" ++#include "mali_kbase_csf_timeout.h" ++#include "mali_kbase_mem.h" ++#include "mali_kbase_reset_gpu.h" ++#include "mali_kbase_ctx_sched.h" ++#include "device/mali_kbase_device.h" ++#include ++#include "backend/gpu/mali_kbase_pm_internal.h" ++#include "mali_kbase_csf_scheduler.h" ++#include "mmu/mali_kbase_mmu.h" ++#include "backend/gpu/mali_kbase_clk_rate_trace_mgr.h" ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#if (KERNEL_VERSION(4, 13, 0) <= LINUX_VERSION_CODE) ++#include ++#endif ++#include ++ ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++/* Makes Driver wait indefinitely for an acknowledgment for the different ++ * requests it sends to firmware. Otherwise the timeouts interfere with the ++ * use of debugger for source-level debugging of firmware as Driver initiates ++ * a GPU reset when a request times out, which always happen when a debugger ++ * is connected. ++ */ ++bool fw_debug; /* Default value of 0/false */ ++module_param(fw_debug, bool, 0444); ++MODULE_PARM_DESC(fw_debug, ++ "Enables effective use of a debugger for debugging firmware code."); ++#endif ++ ++#define DUMMY_FW_PAGE_SIZE SZ_4K ++ ++/** ++ * struct dummy_firmware_csi - Represents a dummy interface for MCU firmware CSs ++ * ++ * @cs_kernel_input: CS kernel input memory region ++ * @cs_kernel_output: CS kernel output memory region ++ */ ++struct dummy_firmware_csi { ++ u8 cs_kernel_input[DUMMY_FW_PAGE_SIZE]; ++ u8 cs_kernel_output[DUMMY_FW_PAGE_SIZE]; ++}; ++ ++/** ++ * struct dummy_firmware_csg - Represents a dummy interface for MCU firmware CSGs ++ * ++ * @csg_input: CSG kernel input memory region ++ * @csg_output: CSG kernel output memory region ++ * @csi: Dummy firmware CSIs ++ */ ++struct dummy_firmware_csg { ++ u8 csg_input[DUMMY_FW_PAGE_SIZE]; ++ u8 csg_output[DUMMY_FW_PAGE_SIZE]; ++ struct dummy_firmware_csi csi[8]; ++} dummy_firmware_csg; ++ ++/** ++ * struct dummy_firmware_interface - Represents a dummy interface in the MCU firmware ++ * ++ * @global_input: Global input memory region ++ * @global_output: Global output memory region ++ * @csg: Dummy firmware CSGs ++ * @node: Interface objects are on the kbase_device:csf.firmware_interfaces ++ * list using this list_head to link them ++ */ ++struct dummy_firmware_interface { ++ u8 global_input[DUMMY_FW_PAGE_SIZE]; ++ u8 global_output[DUMMY_FW_PAGE_SIZE]; ++ struct dummy_firmware_csg csg[8]; ++ struct list_head node; ++} dummy_firmware_interface; ++ ++#define CSF_GLB_REQ_CFG_MASK \ ++ (GLB_REQ_CFG_ALLOC_EN_MASK | GLB_REQ_CFG_PROGRESS_TIMER_MASK | \ ++ GLB_REQ_CFG_PWROFF_TIMER_MASK | GLB_REQ_IDLE_ENABLE_MASK) ++ ++static inline u32 input_page_read(const u32 *const input, const u32 offset) ++{ ++ WARN_ON(offset % sizeof(u32)); ++ ++ return input[offset / sizeof(u32)]; ++} ++ ++static inline void input_page_write(u32 *const input, const u32 offset, ++ const u32 value) ++{ ++ WARN_ON(offset % sizeof(u32)); ++ ++ input[offset / sizeof(u32)] = value; ++} ++ ++static inline u32 output_page_read(const u32 *const output, const u32 offset) ++{ ++ WARN_ON(offset % sizeof(u32)); ++ ++ return output[offset / sizeof(u32)]; ++} ++ ++static inline void output_page_write(u32 *const output, const u32 offset, ++ const u32 value) ++{ ++ WARN_ON(offset % sizeof(u32)); ++ ++ output[offset / sizeof(u32)] = value; ++} ++ ++/** ++ * invent_memory_setup_entry() - Invent an "interface memory setup" section ++ * ++ * @kbdev: Kbase device structure ++ * ++ * Invent an "interface memory setup" section similar to one from a firmware ++ * image. If successful the interface will be added to the ++ * kbase_device:csf.firmware_interfaces list. ++ * ++ * Return: 0 if successful, negative error code on failure ++ */ ++static int invent_memory_setup_entry(struct kbase_device *kbdev) ++{ ++ struct dummy_firmware_interface *interface = NULL; ++ ++ /* Allocate enough memory for the struct dummy_firmware_interface. ++ */ ++ interface = kzalloc(sizeof(*interface), GFP_KERNEL); ++ if (!interface) ++ return -ENOMEM; ++ ++ kbdev->csf.shared_interface = interface; ++ list_add(&interface->node, &kbdev->csf.firmware_interfaces); ++ ++ /* NO_MALI: Don't insert any firmware pages */ ++ return 0; ++} ++ ++static void free_global_iface(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_global_iface *iface = &kbdev->csf.global_iface; ++ ++ if (iface->groups) { ++ unsigned int gid; ++ ++ for (gid = 0; gid < iface->group_num; ++gid) ++ kfree(iface->groups[gid].streams); ++ ++ kfree(iface->groups); ++ iface->groups = NULL; ++ } ++} ++ ++static int invent_cmd_stream_group_info(struct kbase_device *kbdev, ++ struct kbase_csf_cmd_stream_group_info *ginfo, ++ struct dummy_firmware_csg *csg) ++{ ++ unsigned int sid; ++ ++ ginfo->input = csg->csg_input; ++ ginfo->output = csg->csg_output; ++ ++ ginfo->kbdev = kbdev; ++ ginfo->features = 0; ++ ginfo->suspend_size = 64; ++ ginfo->protm_suspend_size = 64; ++ ginfo->stream_num = ARRAY_SIZE(csg->csi); ++ ginfo->stream_stride = 0; ++ ++ ginfo->streams = kcalloc(ginfo->stream_num, sizeof(*ginfo->streams), GFP_KERNEL); ++ if (ginfo->streams == NULL) ++ return -ENOMEM; ++ ++ for (sid = 0; sid < ginfo->stream_num; ++sid) { ++ struct kbase_csf_cmd_stream_info *stream = &ginfo->streams[sid]; ++ struct dummy_firmware_csi *csi = &csg->csi[sid]; ++ ++ stream->input = csi->cs_kernel_input; ++ stream->output = csi->cs_kernel_output; ++ ++ stream->kbdev = kbdev; ++ stream->features = ++ STREAM_FEATURES_WORK_REGISTERS_SET(0, 80) | ++ STREAM_FEATURES_SCOREBOARDS_SET(0, 8) | ++ STREAM_FEATURES_COMPUTE_SET(0, 1) | ++ STREAM_FEATURES_FRAGMENT_SET(0, 1) | ++ STREAM_FEATURES_TILER_SET(0, 1); ++ } ++ ++ return 0; ++} ++ ++static int invent_capabilities(struct kbase_device *kbdev) ++{ ++ struct dummy_firmware_interface *interface = kbdev->csf.shared_interface; ++ struct kbase_csf_global_iface *iface = &kbdev->csf.global_iface; ++ unsigned int gid; ++ ++ iface->input = interface->global_input; ++ iface->output = interface->global_output; ++ ++ iface->version = 1; ++ iface->kbdev = kbdev; ++ iface->features = 0; ++ iface->prfcnt_size = ++ GLB_PRFCNT_SIZE_HARDWARE_SIZE_SET(0, KBASE_DUMMY_MODEL_MAX_SAMPLE_SIZE); ++ ++ if (iface->version >= kbase_csf_interface_version(1, 1, 0)) { ++ /* update rate=1, max event size = 1<<8 = 256 */ ++ iface->instr_features = 0x81; ++ } else { ++ iface->instr_features = 0; ++ } ++ ++ iface->group_num = ARRAY_SIZE(interface->csg); ++ iface->group_stride = 0; ++ ++ iface->groups = kcalloc(iface->group_num, sizeof(*iface->groups), GFP_KERNEL); ++ if (iface->groups == NULL) ++ return -ENOMEM; ++ ++ for (gid = 0; gid < iface->group_num; ++gid) { ++ int err; ++ ++ err = invent_cmd_stream_group_info(kbdev, &iface->groups[gid], ++ &interface->csg[gid]); ++ if (err < 0) { ++ free_global_iface(kbdev); ++ return err; ++ } ++ } ++ ++ return 0; ++} ++ ++void kbase_csf_read_firmware_memory(struct kbase_device *kbdev, ++ u32 gpu_addr, u32 *value) ++{ ++ /* NO_MALI: Nothing to do here */ ++} ++ ++ ++void kbase_csf_update_firmware_memory(struct kbase_device *kbdev, ++ u32 gpu_addr, u32 value) ++{ ++ /* NO_MALI: Nothing to do here */ ++} ++ ++void kbase_csf_read_firmware_memory_exe(struct kbase_device *kbdev, ++ u32 gpu_addr, u32 *value) ++{ ++ /* NO_MALI: Nothing to do here */ ++} ++ ++void kbase_csf_update_firmware_memory_exe(struct kbase_device *kbdev, ++ u32 gpu_addr, u32 value) ++{ ++ /* NO_MALI: Nothing to do here */ ++} ++ ++void kbase_csf_firmware_cs_input( ++ const struct kbase_csf_cmd_stream_info *const info, const u32 offset, ++ const u32 value) ++{ ++ const struct kbase_device * const kbdev = info->kbdev; ++ ++ dev_dbg(kbdev->dev, "cs input w: reg %08x val %08x\n", offset, value); ++ input_page_write(info->input, offset, value); ++ ++ if (offset == CS_REQ) { ++ /* NO_MALI: Immediately acknowledge requests */ ++ output_page_write(info->output, CS_ACK, value); ++ } ++} ++ ++u32 kbase_csf_firmware_cs_input_read( ++ const struct kbase_csf_cmd_stream_info *const info, ++ const u32 offset) ++{ ++ const struct kbase_device * const kbdev = info->kbdev; ++ u32 const val = input_page_read(info->input, offset); ++ ++ dev_dbg(kbdev->dev, "cs input r: reg %08x val %08x\n", offset, val); ++ return val; ++} ++ ++void kbase_csf_firmware_cs_input_mask( ++ const struct kbase_csf_cmd_stream_info *const info, const u32 offset, ++ const u32 value, const u32 mask) ++{ ++ const struct kbase_device * const kbdev = info->kbdev; ++ ++ dev_dbg(kbdev->dev, "cs input w: reg %08x val %08x mask %08x\n", ++ offset, value, mask); ++ ++ /* NO_MALI: Go through kbase_csf_firmware_cs_input to capture writes */ ++ kbase_csf_firmware_cs_input(info, offset, (input_page_read(info->input, offset) & ~mask) | (value & mask)); ++} ++ ++u32 kbase_csf_firmware_cs_output( ++ const struct kbase_csf_cmd_stream_info *const info, const u32 offset) ++{ ++ const struct kbase_device * const kbdev = info->kbdev; ++ u32 const val = output_page_read(info->output, offset); ++ ++ dev_dbg(kbdev->dev, "cs output r: reg %08x val %08x\n", offset, val); ++ return val; ++} ++ ++void kbase_csf_firmware_csg_input( ++ const struct kbase_csf_cmd_stream_group_info *const info, ++ const u32 offset, const u32 value) ++{ ++ const struct kbase_device * const kbdev = info->kbdev; ++ ++ dev_dbg(kbdev->dev, "csg input w: reg %08x val %08x\n", ++ offset, value); ++ input_page_write(info->input, offset, value); ++ ++ if (offset == CSG_REQ) { ++ /* NO_MALI: Immediately acknowledge requests */ ++ output_page_write(info->output, CSG_ACK, value); ++ } ++} ++ ++u32 kbase_csf_firmware_csg_input_read( ++ const struct kbase_csf_cmd_stream_group_info *const info, ++ const u32 offset) ++{ ++ const struct kbase_device * const kbdev = info->kbdev; ++ u32 const val = input_page_read(info->input, offset); ++ ++ dev_dbg(kbdev->dev, "csg input r: reg %08x val %08x\n", offset, val); ++ return val; ++} ++ ++void kbase_csf_firmware_csg_input_mask( ++ const struct kbase_csf_cmd_stream_group_info *const info, ++ const u32 offset, const u32 value, const u32 mask) ++{ ++ const struct kbase_device * const kbdev = info->kbdev; ++ ++ dev_dbg(kbdev->dev, "csg input w: reg %08x val %08x mask %08x\n", ++ offset, value, mask); ++ ++ /* NO_MALI: Go through kbase_csf_firmware_csg_input to capture writes */ ++ kbase_csf_firmware_csg_input(info, offset, (input_page_read(info->input, offset) & ~mask) | (value & mask)); ++} ++ ++u32 kbase_csf_firmware_csg_output( ++ const struct kbase_csf_cmd_stream_group_info *const info, ++ const u32 offset) ++{ ++ const struct kbase_device * const kbdev = info->kbdev; ++ u32 const val = output_page_read(info->output, offset); ++ ++ dev_dbg(kbdev->dev, "csg output r: reg %08x val %08x\n", offset, val); ++ return val; ++} ++KBASE_EXPORT_TEST_API(kbase_csf_firmware_csg_output); ++ ++void kbase_csf_firmware_global_input( ++ const struct kbase_csf_global_iface *const iface, const u32 offset, ++ const u32 value) ++{ ++ const struct kbase_device * const kbdev = iface->kbdev; ++ ++ dev_dbg(kbdev->dev, "glob input w: reg %08x val %08x\n", offset, value); ++ input_page_write(iface->input, offset, value); ++ ++ if (offset == GLB_REQ) { ++ /* NO_MALI: Immediately acknowledge requests - except for PRFCNT_ENABLE ++ * and PRFCNT_SAMPLE. These will be processed along with the ++ * corresponding performance counter registers when the global doorbell ++ * is rung in order to emulate the performance counter sampling behavior ++ * of the real firmware. ++ */ ++ const u32 ack = output_page_read(iface->output, GLB_ACK); ++ const u32 req_mask = ~(GLB_REQ_PRFCNT_ENABLE_MASK | GLB_REQ_PRFCNT_SAMPLE_MASK); ++ const u32 toggled = (value ^ ack) & req_mask; ++ ++ output_page_write(iface->output, GLB_ACK, ack ^ toggled); ++ } ++} ++KBASE_EXPORT_TEST_API(kbase_csf_firmware_global_input); ++ ++void kbase_csf_firmware_global_input_mask( ++ const struct kbase_csf_global_iface *const iface, const u32 offset, ++ const u32 value, const u32 mask) ++{ ++ const struct kbase_device * const kbdev = iface->kbdev; ++ ++ dev_dbg(kbdev->dev, "glob input w: reg %08x val %08x mask %08x\n", ++ offset, value, mask); ++ ++ /* NO_MALI: Go through kbase_csf_firmware_global_input to capture writes */ ++ kbase_csf_firmware_global_input(iface, offset, (input_page_read(iface->input, offset) & ~mask) | (value & mask)); ++} ++KBASE_EXPORT_TEST_API(kbase_csf_firmware_global_input_mask); ++ ++u32 kbase_csf_firmware_global_input_read( ++ const struct kbase_csf_global_iface *const iface, const u32 offset) ++{ ++ const struct kbase_device * const kbdev = iface->kbdev; ++ u32 const val = input_page_read(iface->input, offset); ++ ++ dev_dbg(kbdev->dev, "glob input r: reg %08x val %08x\n", offset, val); ++ return val; ++} ++ ++u32 kbase_csf_firmware_global_output( ++ const struct kbase_csf_global_iface *const iface, const u32 offset) ++{ ++ const struct kbase_device * const kbdev = iface->kbdev; ++ u32 const val = output_page_read(iface->output, offset); ++ ++ dev_dbg(kbdev->dev, "glob output r: reg %08x val %08x\n", offset, val); ++ return val; ++} ++KBASE_EXPORT_TEST_API(kbase_csf_firmware_global_output); ++ ++/** ++ * csf_doorbell_prfcnt() - Process CSF performance counter doorbell request ++ * ++ * @kbdev: An instance of the GPU platform device ++ */ ++static void csf_doorbell_prfcnt(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_global_iface *iface; ++ u32 req; ++ u32 ack; ++ u32 extract_index; ++ ++ if (WARN_ON(!kbdev)) ++ return; ++ ++ iface = &kbdev->csf.global_iface; ++ ++ req = input_page_read(iface->input, GLB_REQ); ++ ack = output_page_read(iface->output, GLB_ACK); ++ extract_index = input_page_read(iface->input, GLB_PRFCNT_EXTRACT); ++ ++ /* Process enable bit toggle */ ++ if ((req ^ ack) & GLB_REQ_PRFCNT_ENABLE_MASK) { ++ if (req & GLB_REQ_PRFCNT_ENABLE_MASK) { ++ /* Reset insert index to zero on enable bit set */ ++ output_page_write(iface->output, GLB_PRFCNT_INSERT, 0); ++ WARN_ON(extract_index != 0); ++ } ++ ack ^= GLB_REQ_PRFCNT_ENABLE_MASK; ++ } ++ ++ /* Process sample request */ ++ if ((req ^ ack) & GLB_REQ_PRFCNT_SAMPLE_MASK) { ++ const u32 ring_size = GLB_PRFCNT_CONFIG_SIZE_GET( ++ input_page_read(iface->input, GLB_PRFCNT_CONFIG)); ++ u32 insert_index = output_page_read(iface->output, GLB_PRFCNT_INSERT); ++ ++ const bool prev_overflow = (req ^ ack) & GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_MASK; ++ const bool prev_threshold = (req ^ ack) & GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_MASK; ++ ++ /* If ringbuffer is full toggle PRFCNT_OVERFLOW and skip sample */ ++ if (insert_index - extract_index >= ring_size) { ++ WARN_ON(insert_index - extract_index > ring_size); ++ if (!prev_overflow) ++ ack ^= GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_MASK; ++ } else { ++ struct gpu_model_prfcnt_en enable_maps = { ++ .fe = input_page_read(iface->input, GLB_PRFCNT_CSF_EN), ++ .tiler = input_page_read(iface->input, GLB_PRFCNT_TILER_EN), ++ .l2 = input_page_read(iface->input, GLB_PRFCNT_MMU_L2_EN), ++ .shader = input_page_read(iface->input, GLB_PRFCNT_SHADER_EN), ++ }; ++ ++ const u64 prfcnt_base = ++ input_page_read(iface->input, GLB_PRFCNT_BASE_LO) + ++ ((u64)input_page_read(iface->input, GLB_PRFCNT_BASE_HI) << 32); ++ ++ u32 *sample_base = (u32 *)(uintptr_t)prfcnt_base + ++ (KBASE_DUMMY_MODEL_MAX_VALUES_PER_SAMPLE * ++ (insert_index % ring_size)); ++ ++ /* trigger sample dump in the dummy model */ ++ gpu_model_prfcnt_dump_request(sample_base, enable_maps); ++ ++ /* increment insert index and toggle PRFCNT_SAMPLE bit in ACK */ ++ output_page_write(iface->output, GLB_PRFCNT_INSERT, ++insert_index); ++ ack ^= GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_MASK; ++ } ++ ++ /* When the ringbuffer reaches 50% capacity toggle PRFCNT_THRESHOLD */ ++ if (!prev_threshold && (insert_index - extract_index >= (ring_size / 2))) ++ ack ^= GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_MASK; ++ } ++ ++ /* Update GLB_ACK */ ++ output_page_write(iface->output, GLB_ACK, ack); ++} ++ ++void kbase_csf_ring_doorbell(struct kbase_device *kbdev, int doorbell_nr) ++{ ++ WARN_ON(doorbell_nr < 0); ++ WARN_ON(doorbell_nr >= CSF_NUM_DOORBELL); ++ ++ if (WARN_ON(!kbdev)) ++ return; ++ ++ if (doorbell_nr == CSF_KERNEL_DOORBELL_NR) { ++ csf_doorbell_prfcnt(kbdev); ++ gpu_model_glb_request_job_irq(kbdev->model); ++ } ++} ++EXPORT_SYMBOL(kbase_csf_ring_doorbell); ++ ++/** ++ * handle_internal_firmware_fatal - Handler for CS internal firmware fault. ++ * ++ * @kbdev: Pointer to kbase device ++ * ++ * Report group fatal error to user space for all GPU command queue groups ++ * in the device, terminate them and reset GPU. ++ */ ++static void handle_internal_firmware_fatal(struct kbase_device *const kbdev) ++{ ++ int as; ++ ++ for (as = 0; as < kbdev->nr_hw_address_spaces; as++) { ++ unsigned long flags; ++ struct kbase_context *kctx; ++ struct kbase_fault fault; ++ ++ if (as == MCU_AS_NR) ++ continue; ++ ++ /* Only handle the fault for an active address space. Lock is ++ * taken here to atomically get reference to context in an ++ * active address space and retain its refcount. ++ */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kctx = kbase_ctx_sched_as_to_ctx_nolock(kbdev, as); ++ ++ if (kctx) { ++ kbase_ctx_sched_retain_ctx_refcount(kctx); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } else { ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ continue; ++ } ++ ++ fault = (struct kbase_fault) { ++ .status = GPU_EXCEPTION_TYPE_SW_FAULT_1, ++ }; ++ ++ kbase_csf_ctx_handle_fault(kctx, &fault); ++ kbase_ctx_sched_release_ctx_lock(kctx); ++ } ++ ++ if (kbase_prepare_to_reset_gpu(kbdev, ++ RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) ++ kbase_reset_gpu(kbdev); ++} ++ ++/** ++ * firmware_error_worker - Worker function for handling firmware internal error ++ * ++ * @data: Pointer to a work_struct embedded in kbase device. ++ * ++ * Handle the CS internal firmware error ++ */ ++static void firmware_error_worker(struct work_struct *const data) ++{ ++ struct kbase_device *const kbdev = ++ container_of(data, struct kbase_device, csf.fw_error_work); ++ ++ handle_internal_firmware_fatal(kbdev); ++} ++ ++static bool global_request_complete(struct kbase_device *const kbdev, ++ u32 const req_mask) ++{ ++ struct kbase_csf_global_iface *global_iface = ++ &kbdev->csf.global_iface; ++ bool complete = false; ++ unsigned long flags; ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ ++ if ((kbase_csf_firmware_global_output(global_iface, GLB_ACK) & ++ req_mask) == ++ (kbase_csf_firmware_global_input_read(global_iface, GLB_REQ) & ++ req_mask)) ++ complete = true; ++ ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ ++ return complete; ++} ++ ++static int wait_for_global_request(struct kbase_device *const kbdev, ++ u32 const req_mask) ++{ ++ const long wait_timeout = ++ kbase_csf_timeout_in_jiffies(kbdev->csf.fw_timeout_ms); ++ long remaining; ++ int err = 0; ++ ++ remaining = wait_event_timeout(kbdev->csf.event_wait, ++ global_request_complete(kbdev, req_mask), ++ wait_timeout); ++ ++ if (!remaining) { + dev_warn(kbdev->dev, "Timed out waiting for global request %x to complete", + req_mask); + err = -ETIMEDOUT; ++ ++ + } + + return err; @@ -165028,7 +179529,7 @@ index 000000000000..7401113c5d6a +{ + u32 glb_req; + -+ lockdep_assert_held(&global_iface->kbdev->csf.reg_lock); ++ kbase_csf_scheduler_spin_lock_assert_held(global_iface->kbdev); + + glb_req = kbase_csf_firmware_global_output(global_iface, GLB_ACK); + glb_req ^= req_mask; @@ -165048,6 +179549,26 @@ index 000000000000..7401113c5d6a + set_global_request(global_iface, GLB_REQ_CFG_ALLOC_EN_MASK); +} + ++static void enable_shader_poweroff_timer(struct kbase_device *const kbdev, ++ const struct kbase_csf_global_iface *const global_iface) ++{ ++ u32 pwroff_reg; ++ ++ if (kbdev->csf.firmware_hctl_core_pwr) ++ pwroff_reg = ++ GLB_PWROFF_TIMER_TIMER_SOURCE_SET(DISABLE_GLB_PWROFF_TIMER, ++ GLB_PWROFF_TIMER_TIMER_SOURCE_SYSTEM_TIMESTAMP); ++ else ++ pwroff_reg = kbdev->csf.mcu_core_pwroff_dur_count; ++ ++ kbase_csf_firmware_global_input(global_iface, GLB_PWROFF_TIMER, ++ pwroff_reg); ++ set_global_request(global_iface, GLB_REQ_CFG_PWROFF_TIMER_MASK); ++ ++ /* Save the programed reg value in its shadow field */ ++ kbdev->csf.mcu_core_pwroff_reg_shadow = pwroff_reg; ++} ++ +static void set_timeout_global( + const struct kbase_csf_global_iface *const global_iface, + u64 const timeout) @@ -165058,26 +179579,113 @@ index 000000000000..7401113c5d6a + set_global_request(global_iface, GLB_REQ_CFG_PROGRESS_TIMER_MASK); +} + -+static void global_init(struct kbase_device *const kbdev, u32 req_mask) ++static void enable_gpu_idle_timer(struct kbase_device *const kbdev) ++{ ++ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; ++ ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ ++ kbase_csf_firmware_global_input(global_iface, GLB_IDLE_TIMER, ++ kbdev->csf.gpu_idle_dur_count); ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_REQ, GLB_REQ_REQ_IDLE_ENABLE, ++ GLB_REQ_IDLE_ENABLE_MASK); ++ dev_dbg(kbdev->dev, "Enabling GPU idle timer with count-value: 0x%.8x", ++ kbdev->csf.gpu_idle_dur_count); ++} ++ ++static bool global_debug_request_complete(struct kbase_device *const kbdev, u32 const req_mask) ++{ ++ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; ++ bool complete = false; ++ unsigned long flags; ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ ++ if ((kbase_csf_firmware_global_output(global_iface, GLB_DEBUG_ACK) & req_mask) == ++ (kbase_csf_firmware_global_input_read(global_iface, GLB_DEBUG_REQ) & req_mask)) ++ complete = true; ++ ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ ++ return complete; ++} ++ ++static void set_global_debug_request(const struct kbase_csf_global_iface *const global_iface, ++ u32 const req_mask) ++{ ++ u32 glb_debug_req; ++ ++ kbase_csf_scheduler_spin_lock_assert_held(global_iface->kbdev); ++ ++ glb_debug_req = kbase_csf_firmware_global_output(global_iface, GLB_DEBUG_ACK); ++ glb_debug_req ^= req_mask; ++ ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_DEBUG_REQ, glb_debug_req, req_mask); ++} ++ ++static void request_fw_core_dump( ++ const struct kbase_csf_global_iface *const global_iface) +{ -+ u32 const ack_irq_mask = GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_MASK | -+ GLB_ACK_IRQ_MASK_PING_MASK | -+ GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_MASK | -+ GLB_ACK_IRQ_MASK_PROTM_ENTER_MASK | -+ GLB_ACK_IRQ_MASK_PROTM_EXIT_MASK; ++ uint32_t run_mode = GLB_DEBUG_REQ_RUN_MODE_SET(0, GLB_DEBUG_RUN_MODE_TYPE_CORE_DUMP); + ++ set_global_debug_request(global_iface, GLB_DEBUG_REQ_DEBUG_RUN_MASK | run_mode); ++ ++ set_global_request(global_iface, GLB_REQ_DEBUG_CSF_REQ_MASK); ++} ++ ++int kbase_csf_firmware_req_core_dump(struct kbase_device *const kbdev) ++{ + const struct kbase_csf_global_iface *const global_iface = + &kbdev->csf.global_iface; + unsigned long flags; ++ int ret; ++ ++ /* Serialize CORE_DUMP requests. */ ++ mutex_lock(&kbdev->csf.reg_lock); + ++ /* Update GLB_REQ with CORE_DUMP request and make firmware act on it. */ + kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ request_fw_core_dump(global_iface); ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); + -+ /* Enable endpoints on all present shader cores */ -+ enable_endpoints_global(global_iface, -+ kbase_pm_get_present_cores(kbdev, KBASE_PM_CORE_SHADER)); ++ /* Wait for firmware to acknowledge completion of the CORE_DUMP request. */ ++ ret = wait_for_global_request(kbdev, GLB_REQ_DEBUG_CSF_REQ_MASK); ++ if (!ret) ++ WARN_ON(!global_debug_request_complete(kbdev, GLB_DEBUG_REQ_DEBUG_RUN_MASK)); ++ ++ mutex_unlock(&kbdev->csf.reg_lock); ++ ++ return ret; ++} ++ ++static void global_init(struct kbase_device *const kbdev, u64 core_mask) ++{ ++ u32 const ack_irq_mask = ++ GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_MASK | GLB_ACK_IRQ_MASK_PING_MASK | ++ GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_MASK | GLB_ACK_IRQ_MASK_PROTM_ENTER_MASK | ++ GLB_ACK_IRQ_MASK_PROTM_EXIT_MASK | GLB_ACK_IRQ_MASK_FIRMWARE_CONFIG_UPDATE_MASK | ++ GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_MASK | GLB_ACK_IRQ_MASK_IDLE_EVENT_MASK | ++ GLB_ACK_IRQ_MASK_IDLE_ENABLE_MASK | GLB_REQ_DEBUG_CSF_REQ_MASK; ++ ++ const struct kbase_csf_global_iface *const global_iface = ++ &kbdev->csf.global_iface; ++ unsigned long flags; ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ ++ /* Update shader core allocation enable mask */ ++ enable_endpoints_global(global_iface, core_mask); ++ enable_shader_poweroff_timer(kbdev, global_iface); + + set_timeout_global(global_iface, kbase_csf_timeout_get(kbdev)); + ++ /* The GPU idle timer is always enabled for simplicity. Checks will be ++ * done before scheduling the GPU idle worker to see if it is ++ * appropriate for the current power policy. ++ */ ++ enable_gpu_idle_timer(kbdev); ++ + /* Unmask the interrupts */ + kbase_csf_firmware_global_input(global_iface, + GLB_ACK_IRQ_MASK, ack_irq_mask); @@ -165090,8 +179698,7 @@ index 000000000000..7401113c5d6a +/** + * global_init_on_boot - Sends a global request to control various features. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * + * Currently only the request to enable endpoints and cycle counter is sent. + * @@ -165099,19 +179706,29 @@ index 000000000000..7401113c5d6a + */ +static int global_init_on_boot(struct kbase_device *const kbdev) +{ -+ u32 const req_mask = CSF_GLB_REQ_CFG_MASK; ++ unsigned long flags; ++ u64 core_mask; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ core_mask = kbase_pm_ca_get_core_mask(kbdev); ++ kbdev->csf.firmware_hctl_core_pwr = ++ kbase_pm_no_mcu_core_pwroff(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ global_init(kbdev, req_mask); ++ global_init(kbdev, core_mask); + -+ return wait_for_global_request(kbdev, req_mask); ++ return wait_for_global_request(kbdev, CSF_GLB_REQ_CFG_MASK); +} + -+void kbase_csf_firmware_global_reinit(struct kbase_device *kbdev) ++void kbase_csf_firmware_global_reinit(struct kbase_device *kbdev, ++ u64 core_mask) +{ + lockdep_assert_held(&kbdev->hwaccess_lock); + + kbdev->csf.glb_init_request_pending = true; -+ global_init(kbdev, CSF_GLB_REQ_CFG_MASK); ++ kbdev->csf.firmware_hctl_core_pwr = ++ kbase_pm_no_mcu_core_pwroff(kbdev); ++ global_init(kbdev, core_mask); +} + +bool kbase_csf_firmware_global_reinit_complete(struct kbase_device *kbdev) @@ -165125,6 +179742,31 @@ index 000000000000..7401113c5d6a + return !kbdev->csf.glb_init_request_pending; +} + ++void kbase_csf_firmware_update_core_attr(struct kbase_device *kbdev, ++ bool update_core_pwroff_timer, bool update_core_mask, u64 core_mask) ++{ ++ unsigned long flags; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ if (update_core_mask) ++ enable_endpoints_global(&kbdev->csf.global_iface, core_mask); ++ if (update_core_pwroff_timer) ++ enable_shader_poweroff_timer(kbdev, &kbdev->csf.global_iface); ++ ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++} ++ ++bool kbase_csf_firmware_core_attr_updated(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ return global_request_complete(kbdev, GLB_REQ_CFG_ALLOC_EN_MASK | ++ GLB_REQ_CFG_PWROFF_TIMER_MASK); ++} ++ +static void kbase_csf_firmware_reload_worker(struct work_struct *work) +{ + struct kbase_device *kbdev = container_of(work, struct kbase_device, @@ -165168,37 +179810,249 @@ index 000000000000..7401113c5d6a + kbase_pm_update_state(kbdev); +} + -+int kbase_csf_firmware_init(struct kbase_device *kbdev) ++static u32 convert_dur_to_idle_count(struct kbase_device *kbdev, const u32 dur_ms) +{ -+ int ret; ++#define HYSTERESIS_VAL_UNIT_SHIFT (10) ++ /* Get the cntfreq_el0 value, which drives the SYSTEM_TIMESTAMP */ ++ u64 freq = arch_timer_get_cntfrq(); ++ u64 dur_val = dur_ms; ++ u32 cnt_val_u32, reg_val_u32; ++ bool src_system_timestamp = freq > 0; + -+ if (WARN_ON((kbdev->as_free & MCU_AS_BITMASK) == 0)) -+ return -EINVAL; -+ kbdev->as_free &= ~MCU_AS_BITMASK; ++ if (!src_system_timestamp) { ++ /* Get the cycle_counter source alternative */ ++ spin_lock(&kbdev->pm.clk_rtm.lock); ++ if (kbdev->pm.clk_rtm.clks[0]) ++ freq = kbdev->pm.clk_rtm.clks[0]->clock_val; ++ else ++ dev_warn(kbdev->dev, "No GPU clock, unexpected intregration issue!"); ++ spin_unlock(&kbdev->pm.clk_rtm.lock); + -+ ret = kbase_mmu_init(kbdev, &kbdev->csf.mcu_mmu, NULL, -+ BASE_MEM_GROUP_DEFAULT); ++ dev_info( ++ kbdev->dev, ++ "Can't get the timestamp frequency, use cycle counter format with firmware idle hysteresis!"); ++ } + -+ if (ret != 0) { -+ /* Release the address space */ -+ kbdev->as_free |= MCU_AS_BITMASK; -+ return ret; ++ /* Formula for dur_val = ((dur_ms/1000) * freq_HZ) >> 10) */ ++ dur_val = (dur_val * freq) >> HYSTERESIS_VAL_UNIT_SHIFT; ++ dur_val = div_u64(dur_val, 1000); ++ ++ /* Interface limits the value field to S32_MAX */ ++ cnt_val_u32 = (dur_val > S32_MAX) ? S32_MAX : (u32)dur_val; ++ ++ reg_val_u32 = GLB_IDLE_TIMER_TIMEOUT_SET(0, cnt_val_u32); ++ /* add the source flag */ ++ if (src_system_timestamp) ++ reg_val_u32 = GLB_IDLE_TIMER_TIMER_SOURCE_SET(reg_val_u32, ++ GLB_IDLE_TIMER_TIMER_SOURCE_SYSTEM_TIMESTAMP); ++ else ++ reg_val_u32 = GLB_IDLE_TIMER_TIMER_SOURCE_SET(reg_val_u32, ++ GLB_IDLE_TIMER_TIMER_SOURCE_GPU_COUNTER); ++ ++ return reg_val_u32; ++} ++ ++u32 kbase_csf_firmware_get_gpu_idle_hysteresis_time(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ u32 dur; ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ dur = kbdev->csf.gpu_idle_hysteresis_us; ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ ++ return dur; ++} ++ ++u32 kbase_csf_firmware_set_gpu_idle_hysteresis_time(struct kbase_device *kbdev, u32 dur) ++{ ++ unsigned long flags; ++ const u32 hysteresis_val = convert_dur_to_idle_count(kbdev, dur); ++ ++ /* The 'fw_load_lock' is taken to synchronize against the deferred ++ * loading of FW, where the idle timer will be enabled. ++ */ ++ mutex_lock(&kbdev->fw_load_lock); ++ if (unlikely(!kbdev->csf.firmware_inited)) { ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ kbdev->csf.gpu_idle_hysteresis_us = dur; ++ kbdev->csf.gpu_idle_dur_count = hysteresis_val; ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ mutex_unlock(&kbdev->fw_load_lock); ++ goto end; ++ } ++ mutex_unlock(&kbdev->fw_load_lock); ++ ++ kbase_csf_scheduler_pm_active(kbdev); ++ if (kbase_csf_scheduler_wait_mcu_active(kbdev)) { ++ dev_err(kbdev->dev, ++ "Unable to activate the MCU, the idle hysteresis value shall remain unchanged"); ++ kbase_csf_scheduler_pm_idle(kbdev); ++ return kbdev->csf.gpu_idle_dur_count; ++ } ++ ++ /* The 'reg_lock' is also taken and is held till the update is not ++ * complete, to ensure the update of idle timer value by multiple Users ++ * gets serialized. ++ */ ++ mutex_lock(&kbdev->csf.reg_lock); ++ /* The firmware only reads the new idle timer value when the timer is ++ * disabled. ++ */ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ kbase_csf_firmware_disable_gpu_idle_timer(kbdev); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ /* Ensure that the request has taken effect */ ++ wait_for_global_request(kbdev, GLB_REQ_IDLE_DISABLE_MASK); ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ kbdev->csf.gpu_idle_hysteresis_us = dur; ++ kbdev->csf.gpu_idle_dur_count = hysteresis_val; ++ kbase_csf_firmware_enable_gpu_idle_timer(kbdev); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ wait_for_global_request(kbdev, GLB_REQ_IDLE_ENABLE_MASK); ++ mutex_unlock(&kbdev->csf.reg_lock); ++ ++ kbase_csf_scheduler_pm_idle(kbdev); ++ ++end: ++ dev_dbg(kbdev->dev, "CSF set firmware idle hysteresis count-value: 0x%.8x", ++ hysteresis_val); ++ ++ return hysteresis_val; ++} ++ ++static u32 convert_dur_to_core_pwroff_count(struct kbase_device *kbdev, const u32 dur_us) ++{ ++ /* Get the cntfreq_el0 value, which drives the SYSTEM_TIMESTAMP */ ++ u64 freq = arch_timer_get_cntfrq(); ++ u64 dur_val = dur_us; ++ u32 cnt_val_u32, reg_val_u32; ++ bool src_system_timestamp = freq > 0; ++ ++ if (!src_system_timestamp) { ++ /* Get the cycle_counter source alternative */ ++ spin_lock(&kbdev->pm.clk_rtm.lock); ++ if (kbdev->pm.clk_rtm.clks[0]) ++ freq = kbdev->pm.clk_rtm.clks[0]->clock_val; ++ else ++ dev_warn(kbdev->dev, "No GPU clock, unexpected integration issue!"); ++ spin_unlock(&kbdev->pm.clk_rtm.lock); ++ ++ dev_info( ++ kbdev->dev, ++ "Can't get the timestamp frequency, use cycle counter with MCU shader Core Poweroff timer!"); + } + ++ /* Formula for dur_val = ((dur_us/1e6) * freq_HZ) >> 10) */ ++ dur_val = (dur_val * freq) >> HYSTERESIS_VAL_UNIT_SHIFT; ++ dur_val = div_u64(dur_val, 1000000); ++ ++ /* Interface limits the value field to S32_MAX */ ++ cnt_val_u32 = (dur_val > S32_MAX) ? S32_MAX : (u32)dur_val; ++ ++ reg_val_u32 = GLB_PWROFF_TIMER_TIMEOUT_SET(0, cnt_val_u32); ++ /* add the source flag */ ++ if (src_system_timestamp) ++ reg_val_u32 = GLB_PWROFF_TIMER_TIMER_SOURCE_SET(reg_val_u32, ++ GLB_PWROFF_TIMER_TIMER_SOURCE_SYSTEM_TIMESTAMP); ++ else ++ reg_val_u32 = GLB_PWROFF_TIMER_TIMER_SOURCE_SET(reg_val_u32, ++ GLB_PWROFF_TIMER_TIMER_SOURCE_GPU_COUNTER); ++ ++ return reg_val_u32; ++} ++ ++u32 kbase_csf_firmware_get_mcu_core_pwroff_time(struct kbase_device *kbdev) ++{ ++ u32 pwroff; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ pwroff = kbdev->csf.mcu_core_pwroff_dur_us; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ return pwroff; ++} ++ ++u32 kbase_csf_firmware_set_mcu_core_pwroff_time(struct kbase_device *kbdev, u32 dur) ++{ ++ unsigned long flags; ++ const u32 pwroff = convert_dur_to_core_pwroff_count(kbdev, dur); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbdev->csf.mcu_core_pwroff_dur_us = dur; ++ kbdev->csf.mcu_core_pwroff_dur_count = pwroff; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ dev_dbg(kbdev->dev, "MCU shader Core Poweroff input update: 0x%.8x", pwroff); ++ ++ return pwroff; ++} ++ ++int kbase_csf_firmware_early_init(struct kbase_device *kbdev) ++{ + init_waitqueue_head(&kbdev->csf.event_wait); + kbdev->csf.interrupt_received = false; + ++ kbdev->csf.fw_timeout_ms = ++ kbase_get_timeout_ms(kbdev, CSF_FIRMWARE_TIMEOUT); ++ + INIT_LIST_HEAD(&kbdev->csf.firmware_interfaces); + INIT_LIST_HEAD(&kbdev->csf.firmware_config); + INIT_LIST_HEAD(&kbdev->csf.firmware_trace_buffers.list); ++ INIT_LIST_HEAD(&kbdev->csf.user_reg.list); + INIT_WORK(&kbdev->csf.firmware_reload_work, + kbase_csf_firmware_reload_worker); ++ INIT_WORK(&kbdev->csf.fw_error_work, firmware_error_worker); + + mutex_init(&kbdev->csf.reg_lock); + ++ return 0; ++} ++ ++void kbase_csf_firmware_early_term(struct kbase_device *kbdev) ++{ ++ mutex_destroy(&kbdev->csf.reg_lock); ++} ++ ++int kbase_csf_firmware_late_init(struct kbase_device *kbdev) ++{ ++ kbdev->csf.gpu_idle_hysteresis_us = FIRMWARE_IDLE_HYSTERESIS_TIME_USEC; ++#ifdef KBASE_PM_RUNTIME ++ if (kbase_pm_gpu_sleep_allowed(kbdev)) ++ kbdev->csf.gpu_idle_hysteresis_us /= FIRMWARE_IDLE_HYSTERESIS_GPU_SLEEP_SCALER; ++#endif ++ WARN_ON(!kbdev->csf.gpu_idle_hysteresis_us); ++ kbdev->csf.gpu_idle_dur_count = ++ convert_dur_to_idle_count(kbdev, kbdev->csf.gpu_idle_hysteresis_us); ++ ++ return 0; ++} ++ ++int kbase_csf_firmware_load_init(struct kbase_device *kbdev) ++{ ++ int ret; ++ ++ lockdep_assert_held(&kbdev->fw_load_lock); ++ ++ if (WARN_ON((kbdev->as_free & MCU_AS_BITMASK) == 0)) ++ return -EINVAL; ++ kbdev->as_free &= ~MCU_AS_BITMASK; ++ ++ ret = kbase_mmu_init(kbdev, &kbdev->csf.mcu_mmu, NULL, ++ BASE_MEM_GROUP_DEFAULT); ++ ++ if (ret != 0) { ++ /* Release the address space */ ++ kbdev->as_free |= MCU_AS_BITMASK; ++ return ret; ++ } ++ + ret = kbase_mcu_shared_interface_region_tracker_init(kbdev); + if (ret != 0) { -+ dev_err(kbdev->dev, "Failed to setup the rb tree for managing shared interface segment\n"); ++ dev_err(kbdev->dev, ++ "Failed to setup the rb tree for managing shared interface segment\n"); + goto error; + } + @@ -165223,6 +180077,10 @@ index 000000000000..7401113c5d6a + if (ret != 0) + goto error; + ++ ret = kbase_csf_setup_dummy_user_reg_page(kbdev); ++ if (ret != 0) ++ goto error; ++ + ret = kbase_csf_scheduler_init(kbdev); + if (ret != 0) + goto error; @@ -165238,20 +180096,22 @@ index 000000000000..7401113c5d6a + return 0; + +error: -+ kbase_csf_firmware_term(kbdev); ++ kbase_csf_firmware_unload_term(kbdev); + return ret; +} + -+void kbase_csf_firmware_term(struct kbase_device *kbdev) ++void kbase_csf_firmware_unload_term(struct kbase_device *kbdev) +{ ++ cancel_work_sync(&kbdev->csf.fw_error_work); ++ + kbase_csf_timeout_term(kbdev); + + /* NO_MALI: Don't stop firmware or unload MMU tables */ + -+ kbase_mmu_term(kbdev, &kbdev->csf.mcu_mmu); -+ + kbase_csf_scheduler_term(kbdev); + ++ kbase_csf_free_dummy_user_reg_page(kbdev); ++ + kbase_csf_doorbell_mapping_term(kbdev); + + free_global_iface(kbdev); @@ -165273,19 +180133,49 @@ index 000000000000..7401113c5d6a + + /* NO_MALI: No trace buffers to terminate */ + -+#ifndef MALI_KBASE_BUILD -+ mali_kutf_fw_utf_entry_cleanup(kbdev); -+#endif -+ -+ mutex_destroy(&kbdev->csf.reg_lock); -+ + /* This will also free up the region allocated for the shared interface + * entry parsed from the firmware image. + */ + kbase_mcu_shared_interface_region_tracker_term(kbdev); ++ ++ kbase_mmu_term(kbdev, &kbdev->csf.mcu_mmu); ++} ++ ++void kbase_csf_firmware_enable_gpu_idle_timer(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; ++ const u32 glb_req = kbase_csf_firmware_global_input_read(global_iface, GLB_REQ); ++ ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ /* The scheduler is assumed to only call the enable when its internal ++ * state indicates that the idle timer has previously been disabled. So ++ * on entry the expected field values are: ++ * 1. GLOBAL_INPUT_BLOCK.GLB_REQ.IDLE_ENABLE: 0 ++ * 2. GLOBAL_OUTPUT_BLOCK.GLB_ACK.IDLE_ENABLE: 0, or, on 1 -> 0 ++ */ ++ if (glb_req & GLB_REQ_IDLE_ENABLE_MASK) ++ dev_err(kbdev->dev, "Incoherent scheduler state on REQ_IDLE_ENABLE!"); ++ ++ enable_gpu_idle_timer(kbdev); ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++} ++ ++void kbase_csf_firmware_disable_gpu_idle_timer(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; ++ ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_REQ, ++ GLB_REQ_REQ_IDLE_DISABLE, ++ GLB_REQ_IDLE_DISABLE_MASK); ++ ++ dev_dbg(kbdev->dev, "Sending request to disable gpu idle timer"); ++ ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); +} + -+int kbase_csf_firmware_ping(struct kbase_device *const kbdev) ++void kbase_csf_firmware_ping(struct kbase_device *const kbdev) +{ + const struct kbase_csf_global_iface *const global_iface = + &kbdev->csf.global_iface; @@ -165295,7 +180185,12 @@ index 000000000000..7401113c5d6a + set_global_request(global_iface, GLB_REQ_PING_MASK); + kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); + kbase_csf_scheduler_spin_unlock(kbdev, flags); ++} + ++int kbase_csf_firmware_ping_wait(struct kbase_device *const kbdev, unsigned int wait_timeout_ms) ++{ ++ CSTD_UNUSED(wait_timeout_ms); ++ kbase_csf_firmware_ping(kbdev); + return wait_for_global_request(kbdev, GLB_REQ_PING_MASK); +} + @@ -165326,41 +180221,99 @@ index 000000000000..7401113c5d6a +void kbase_csf_enter_protected_mode(struct kbase_device *kbdev) +{ + struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; -+ unsigned long flags; -+ unsigned int value; + -+ kbase_csf_scheduler_spin_lock(kbdev, &flags); -+ value = kbase_csf_firmware_global_output(global_iface, GLB_ACK); -+ value ^= GLB_REQ_PROTM_ENTER_MASK; -+ kbase_csf_firmware_global_input_mask(global_iface, GLB_REQ, value, -+ GLB_REQ_PROTM_ENTER_MASK); ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ set_global_request(global_iface, GLB_REQ_PROTM_ENTER_MASK); + dev_dbg(kbdev->dev, "Sending request to enter protected mode"); + kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); -+ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++} ++ ++int kbase_csf_wait_protected_mode_enter(struct kbase_device *kbdev) ++{ ++ int err = wait_for_global_request(kbdev, GLB_REQ_PROTM_ENTER_MASK); ++ ++ if (err) { ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_NONE)) ++ kbase_reset_gpu(kbdev); ++ } + -+ wait_for_global_request(kbdev, GLB_REQ_PROTM_ENTER_MASK); ++ return err; +} + +void kbase_csf_firmware_trigger_mcu_halt(struct kbase_device *kbdev) +{ + struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; + unsigned long flags; -+ unsigned int value; + + kbase_csf_scheduler_spin_lock(kbdev, &flags); -+ value = kbase_csf_firmware_global_output(global_iface, GLB_ACK); -+ value ^= GLB_REQ_HALT_MASK; -+ kbase_csf_firmware_global_input_mask(global_iface, GLB_REQ, value, -+ GLB_REQ_HALT_MASK); ++ /* Validate there are no on-slot groups when sending the ++ * halt request to firmware. ++ */ ++ WARN_ON(kbase_csf_scheduler_get_nr_active_csgs_locked(kbdev)); ++ set_global_request(global_iface, GLB_REQ_HALT_MASK); + dev_dbg(kbdev->dev, "Sending request to HALT MCU"); + kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); + kbase_csf_scheduler_spin_unlock(kbdev, flags); +} + ++void kbase_csf_firmware_enable_mcu(struct kbase_device *kbdev) ++{ ++ /* Trigger the boot of MCU firmware, Use the AUTO mode as ++ * otherwise on fast reset, to exit protected mode, MCU will ++ * not reboot by itself to enter normal mode. ++ */ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(MCU_CONTROL), MCU_CNTRL_AUTO); ++} ++ ++#ifdef KBASE_PM_RUNTIME ++void kbase_csf_firmware_trigger_mcu_sleep(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; ++ unsigned long flags; ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ set_global_request(global_iface, GLB_REQ_SLEEP_MASK); ++ dev_dbg(kbdev->dev, "Sending sleep request to MCU"); ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++} ++ ++bool kbase_csf_firmware_is_mcu_in_sleep(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ return (global_request_complete(kbdev, GLB_REQ_SLEEP_MASK) && ++ kbase_csf_firmware_mcu_halted(kbdev)); ++} ++#endif ++ ++int kbase_csf_trigger_firmware_config_update(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; ++ unsigned long flags; ++ int err = 0; ++ ++ /* The 'reg_lock' is also taken and is held till the update is ++ * complete, to ensure the config update gets serialized. ++ */ ++ mutex_lock(&kbdev->csf.reg_lock); ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ ++ set_global_request(global_iface, GLB_REQ_FIRMWARE_CONFIG_UPDATE_MASK); ++ dev_dbg(kbdev->dev, "Sending request for FIRMWARE_CONFIG_UPDATE"); ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ ++ err = wait_for_global_request(kbdev, ++ GLB_REQ_FIRMWARE_CONFIG_UPDATE_MASK); ++ mutex_unlock(&kbdev->csf.reg_lock); ++ return err; ++} ++ +/** -+ * copy_grp_and_stm - Copy command stream and/or group data ++ * copy_grp_and_stm - Copy CS and/or group data + * -+ * @iface: Global command stream front-end interface provided by ++ * @iface: Global CSF interface provided by + * the firmware. + * @group_data: Pointer where to store all the group data + * (sequentially). @@ -165371,7 +180324,7 @@ index 000000000000..7401113c5d6a + * @max_total_stream_num: The maximum number of streams to be read. + * Can be 0, in which case stream_data is unused. + * -+ * Return: Total number of command streams, summed across all groups. ++ * Return: Total number of CSs, summed across all groups. + */ +static u32 copy_grp_and_stm( + const struct kbase_csf_global_iface * const iface, @@ -165394,6 +180347,8 @@ index 000000000000..7401113c5d6a + if (i < max_group_num) { + group_data[i].features = iface->groups[i].features; + group_data[i].stream_num = iface->groups[i].stream_num; ++ group_data[i].suspend_size = ++ iface->groups[i].suspend_size; + } + for (j = 0; j < iface->groups[i].stream_num; j++) { + if (total_stream_num < max_total_stream_num) @@ -165406,26 +180361,28 @@ index 000000000000..7401113c5d6a + return total_stream_num; +} + -+u32 kbase_csf_firmware_get_glb_iface(struct kbase_device *kbdev, ++u32 kbase_csf_firmware_get_glb_iface( ++ struct kbase_device *kbdev, + struct basep_cs_group_control *const group_data, + u32 const max_group_num, + struct basep_cs_stream_control *const stream_data, + u32 const max_total_stream_num, u32 *const glb_version, -+ u32 *const features, u32 *const group_num, u32 *const prfcnt_size) ++ u32 *const features, u32 *const group_num, u32 *const prfcnt_size, ++ u32 *const instr_features) +{ + const struct kbase_csf_global_iface * const iface = + &kbdev->csf.global_iface; + -+ if (WARN_ON(!glb_version) || -+ WARN_ON(!features) || -+ WARN_ON(!group_num) || -+ WARN_ON(!prfcnt_size)) ++ if (WARN_ON(!glb_version) || WARN_ON(!features) || ++ WARN_ON(!group_num) || WARN_ON(!prfcnt_size) || ++ WARN_ON(!instr_features)) + return 0; + + *glb_version = iface->version; + *features = iface->features; + *group_num = iface->group_num; + *prfcnt_size = iface->prfcnt_size; ++ *instr_features = iface->instr_features; + + return copy_grp_and_stm(iface, group_data, max_group_num, + stream_data, max_total_stream_num); @@ -165444,6 +180401,11 @@ index 000000000000..7401113c5d6a + return NULL; +} + ++void kbase_csf_firmware_disable_mcu(struct kbase_device *kbdev) ++{ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(MCU_CONTROL), MCU_CNTRL_DISABLE); ++} ++ +void kbase_csf_firmware_disable_mcu_wait(struct kbase_device *kbdev) +{ + /* NO_MALI: Nothing to do here */ @@ -165474,7 +180436,7 @@ index 000000000000..7401113c5d6a + gpu_map_prot = + KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_NON_CACHEABLE); + cpu_map_prot = pgprot_writecombine(cpu_map_prot); -+ }; ++ } + + phys = kmalloc_array(num_pages, sizeof(*phys), GFP_KERNEL); + if (!phys) @@ -165484,9 +180446,8 @@ index 000000000000..7401113c5d6a + if (!page_list) + goto page_list_alloc_error; + -+ ret = kbase_mem_pool_alloc_pages( -+ &kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], -+ num_pages, phys, false); ++ ret = kbase_mem_pool_alloc_pages(&kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], num_pages, ++ phys, false, NULL); + if (ret <= 0) + goto phys_mem_pool_alloc_error; + @@ -165497,24 +180458,24 @@ index 000000000000..7401113c5d6a + if (!cpu_addr) + goto vmap_error; + -+ va_reg = kbase_alloc_free_region(&kbdev->csf.shared_reg_rbtree, 0, -+ num_pages, KBASE_REG_ZONE_MCU_SHARED); ++ va_reg = kbase_alloc_free_region(kbdev, &kbdev->csf.shared_reg_rbtree, 0, num_pages, ++ KBASE_REG_ZONE_MCU_SHARED); + if (!va_reg) + goto va_region_alloc_error; + + mutex_lock(&kbdev->csf.reg_lock); + ret = kbase_add_va_region_rbtree(kbdev, va_reg, 0, num_pages, 1); + va_reg->flags &= ~KBASE_REG_FREE; -+ mutex_unlock(&kbdev->csf.reg_lock); + if (ret) + goto va_region_add_error; ++ mutex_unlock(&kbdev->csf.reg_lock); + + gpu_map_properties &= (KBASE_REG_GPU_RD | KBASE_REG_GPU_WR); + gpu_map_properties |= gpu_map_prot; + -+ ret = kbase_mmu_insert_pages_no_flush(kbdev, &kbdev->csf.mcu_mmu, -+ va_reg->start_pfn, &phys[0], num_pages, -+ gpu_map_properties, KBASE_MEM_GROUP_CSF_FW); ++ ret = kbase_mmu_insert_pages_no_flush(kbdev, &kbdev->csf.mcu_mmu, va_reg->start_pfn, ++ &phys[0], num_pages, gpu_map_properties, ++ KBASE_MEM_GROUP_CSF_FW, NULL, NULL, false); + if (ret) + goto mmu_insert_pages_error; + @@ -165528,10 +180489,10 @@ index 000000000000..7401113c5d6a + +mmu_insert_pages_error: + mutex_lock(&kbdev->csf.reg_lock); -+ kbase_remove_va_region(va_reg); -+ mutex_unlock(&kbdev->csf.reg_lock); ++ kbase_remove_va_region(kbdev, va_reg); +va_region_add_error: + kbase_free_alloced_region(va_reg); ++ mutex_unlock(&kbdev->csf.reg_lock); +va_region_alloc_error: + vunmap(cpu_addr); +vmap_error: @@ -165545,7 +180506,8 @@ index 000000000000..7401113c5d6a + kfree(phys); +out: + /* Zero-initialize the mapping to make sure that the termination -+ * function doesn't try to unmap or free random addresses. */ ++ * function doesn't try to unmap or free random addresses. ++ */ + csf_mapping->phys = NULL; + csf_mapping->cpu_addr = NULL; + csf_mapping->va_reg = NULL; @@ -165559,9 +180521,9 @@ index 000000000000..7401113c5d6a +{ + if (csf_mapping->va_reg) { + mutex_lock(&kbdev->csf.reg_lock); -+ kbase_remove_va_region(csf_mapping->va_reg); -+ mutex_unlock(&kbdev->csf.reg_lock); ++ kbase_remove_va_region(kbdev, csf_mapping->va_reg); + kbase_free_alloced_region(csf_mapping->va_reg); ++ mutex_unlock(&kbdev->csf.reg_lock); + } + + if (csf_mapping->phys) { @@ -165576,18 +180538,19 @@ index 000000000000..7401113c5d6a +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c new file mode 100755 -index 000000000000..087cc858c2b8 +index 000000000..7c14b8eb5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c -@@ -0,0 +1,196 @@ +@@ -0,0 +1,236 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -165598,18 +180561,13 @@ index 000000000000..087cc858c2b8 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include +#include "mali_kbase_csf_heap_context_alloc.h" + +/* Size of one heap context structure, in bytes. */ -+#define HEAP_CTX_SIZE ((size_t)32) -+ -+/* Total size of the GPU memory region allocated for heap contexts, in bytes. */ -+#define HEAP_CTX_REGION_SIZE (MAX_TILER_HEAPS * HEAP_CTX_SIZE) ++#define HEAP_CTX_SIZE ((u32)32) + +/** + * sub_alloc - Sub-allocate a heap context from a GPU memory region @@ -165621,8 +180579,8 @@ index 000000000000..087cc858c2b8 +static u64 sub_alloc(struct kbase_csf_heap_context_allocator *const ctx_alloc) +{ + struct kbase_context *const kctx = ctx_alloc->kctx; -+ int heap_nr = 0; -+ size_t ctx_offset = 0; ++ unsigned long heap_nr = 0; ++ u32 ctx_offset = 0; + u64 heap_gpu_va = 0; + struct kbase_vmap_struct mapping; + void *ctx_ptr = NULL; @@ -165633,35 +180591,70 @@ index 000000000000..087cc858c2b8 + MAX_TILER_HEAPS); + + if (unlikely(heap_nr >= MAX_TILER_HEAPS)) { -+ dev_err(kctx->kbdev->dev, -+ "No free tiler heap contexts in the pool\n"); ++ dev_dbg(kctx->kbdev->dev, ++ "No free tiler heap contexts in the pool"); + return 0; + } + -+ ctx_offset = heap_nr * HEAP_CTX_SIZE; ++ ctx_offset = heap_nr * ctx_alloc->heap_context_size_aligned; + heap_gpu_va = ctx_alloc->gpu_va + ctx_offset; + ctx_ptr = kbase_vmap_prot(kctx, heap_gpu_va, -+ HEAP_CTX_SIZE, KBASE_REG_CPU_WR, &mapping); ++ ctx_alloc->heap_context_size_aligned, KBASE_REG_CPU_WR, &mapping); + + if (unlikely(!ctx_ptr)) { + dev_err(kctx->kbdev->dev, -+ "Failed to map tiler heap context %d (0x%llX)\n", ++ "Failed to map tiler heap context %lu (0x%llX)\n", + heap_nr, heap_gpu_va); + return 0; + } + -+ memset(ctx_ptr, 0, HEAP_CTX_SIZE); ++ memset(ctx_ptr, 0, ctx_alloc->heap_context_size_aligned); + kbase_vunmap(ctx_ptr, &mapping); + + bitmap_set(ctx_alloc->in_use, heap_nr, 1); + -+ dev_dbg(kctx->kbdev->dev, "Allocated tiler heap context %d (0x%llX)\n", ++ dev_dbg(kctx->kbdev->dev, "Allocated tiler heap context %lu (0x%llX)\n", + heap_nr, heap_gpu_va); + + return heap_gpu_va; +} + +/** ++ * evict_heap_context - Evict the data of heap context from GPU's L2 cache. ++ * ++ * @ctx_alloc: Pointer to the heap context allocator. ++ * @heap_gpu_va: The GPU virtual address of a heap context structure to free. ++ * ++ * This function is called when memory for the heap context is freed. It uses the ++ * FLUSH_PA_RANGE command to evict the data of heap context, so on older CSF GPUs ++ * there is nothing done. The whole GPU cache is anyways expected to be flushed ++ * on older GPUs when initial chunks of the heap are freed just before the memory ++ * for heap context is freed. ++ */ ++static void evict_heap_context(struct kbase_csf_heap_context_allocator *const ctx_alloc, ++ u64 const heap_gpu_va) ++{ ++ struct kbase_context *const kctx = ctx_alloc->kctx; ++ u32 offset_in_bytes = (u32)(heap_gpu_va - ctx_alloc->gpu_va); ++ u32 offset_within_page = offset_in_bytes & ~PAGE_MASK; ++ u32 page_index = offset_in_bytes >> PAGE_SHIFT; ++ struct tagged_addr page = ++ kbase_get_gpu_phy_pages(ctx_alloc->region)[page_index]; ++ phys_addr_t heap_context_pa = as_phys_addr_t(page) + offset_within_page; ++ ++ lockdep_assert_held(&ctx_alloc->lock); ++ ++ /* There is no need to take vm_lock here as the ctx_alloc region is protected ++ * via a nonzero no_user_free_count. The region and the backing page can't ++ * disappear whilst this function is executing. Flush type is passed as FLUSH_PT ++ * to CLN+INV L2 only. ++ */ ++ kbase_mmu_flush_pa_range(kctx->kbdev, kctx, ++ heap_context_pa, ctx_alloc->heap_context_size_aligned, ++ KBASE_MMU_OP_FLUSH_PT); ++} ++ ++/** + * sub_free - Free a heap context sub-allocated from a GPU memory region + * + * @ctx_alloc: Pointer to the heap context allocator. @@ -165671,7 +180664,7 @@ index 000000000000..087cc858c2b8 + u64 const heap_gpu_va) +{ + struct kbase_context *const kctx = ctx_alloc->kctx; -+ u64 ctx_offset = 0; ++ u32 ctx_offset = 0; + unsigned int heap_nr = 0; + + lockdep_assert_held(&ctx_alloc->lock); @@ -165682,13 +180675,15 @@ index 000000000000..087cc858c2b8 + if (WARN_ON(heap_gpu_va < ctx_alloc->gpu_va)) + return; + -+ ctx_offset = heap_gpu_va - ctx_alloc->gpu_va; ++ ctx_offset = (u32)(heap_gpu_va - ctx_alloc->gpu_va); + -+ if (WARN_ON(ctx_offset >= HEAP_CTX_REGION_SIZE) || -+ WARN_ON(ctx_offset % HEAP_CTX_SIZE)) ++ if (WARN_ON(ctx_offset >= (ctx_alloc->region->nr_pages << PAGE_SHIFT)) || ++ WARN_ON(ctx_offset % ctx_alloc->heap_context_size_aligned)) + return; + -+ heap_nr = ctx_offset / HEAP_CTX_SIZE; ++ evict_heap_context(ctx_alloc, heap_gpu_va); ++ ++ heap_nr = ctx_offset / ctx_alloc->heap_context_size_aligned; + dev_dbg(kctx->kbdev->dev, + "Freed tiler heap context %d (0x%llX)\n", heap_nr, heap_gpu_va); + @@ -165699,12 +180694,17 @@ index 000000000000..087cc858c2b8 + struct kbase_csf_heap_context_allocator *const ctx_alloc, + struct kbase_context *const kctx) +{ ++ const u32 gpu_cache_line_size = ++ (1U << kctx->kbdev->gpu_props.props.l2_props.log2_line_size); ++ + /* We cannot pre-allocate GPU memory here because the + * custom VA zone may not have been created yet. + */ + ctx_alloc->kctx = kctx; + ctx_alloc->region = NULL; + ctx_alloc->gpu_va = 0; ++ ctx_alloc->heap_context_size_aligned = ++ (HEAP_CTX_SIZE + gpu_cache_line_size - 1) & ~(gpu_cache_line_size - 1); + + mutex_init(&ctx_alloc->lock); + bitmap_zero(ctx_alloc->in_use, MAX_TILER_HEAPS); @@ -165725,7 +180725,9 @@ index 000000000000..087cc858c2b8 + + if (ctx_alloc->region) { + kbase_gpu_vm_lock(kctx); -+ ctx_alloc->region->flags &= ~KBASE_REG_NO_USER_FREE; ++ WARN_ON(!kbase_va_region_is_no_user_free(ctx_alloc->region)); ++ ++ kbase_va_region_no_user_free_dec(ctx_alloc->region); + kbase_mem_free_region(kctx, ctx_alloc->region); + kbase_gpu_vm_unlock(kctx); + } @@ -165737,14 +180739,15 @@ index 000000000000..087cc858c2b8 + struct kbase_csf_heap_context_allocator *const ctx_alloc) +{ + struct kbase_context *const kctx = ctx_alloc->kctx; -+ u64 flags = BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR | -+ BASE_MEM_PROT_CPU_WR | BASEP_MEM_NO_USER_FREE; -+ u64 nr_pages = PFN_UP(HEAP_CTX_REGION_SIZE); ++ u64 flags = BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR | BASE_MEM_PROT_CPU_WR | ++ BASEP_MEM_NO_USER_FREE | BASE_MEM_PROT_CPU_RD; ++ u64 nr_pages = PFN_UP(MAX_TILER_HEAPS * ctx_alloc->heap_context_size_aligned); + u64 heap_gpu_va = 0; + -+#ifdef CONFIG_MALI_VECTOR_DUMP -+ flags |= BASE_MEM_PROT_CPU_RD; -+#endif ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; + + mutex_lock(&ctx_alloc->lock); + @@ -165752,16 +180755,15 @@ index 000000000000..087cc858c2b8 + * allocate it. + */ + if (!ctx_alloc->region) { -+ ctx_alloc->region = kbase_mem_alloc(kctx, nr_pages, nr_pages, -+ 0, &flags, &ctx_alloc->gpu_va); ++ ctx_alloc->region = kbase_mem_alloc(kctx, nr_pages, nr_pages, 0, &flags, ++ &ctx_alloc->gpu_va, mmu_sync_info); + } + + /* If the pool still isn't allocated then an error occurred. */ -+ if (unlikely(!ctx_alloc->region)) { -+ dev_err(kctx->kbdev->dev, "Failed to allocate a pool of tiler heap contexts\n"); -+ } else { ++ if (unlikely(!ctx_alloc->region)) ++ dev_dbg(kctx->kbdev->dev, "Failed to allocate a pool of tiler heap contexts"); ++ else + heap_gpu_va = sub_alloc(ctx_alloc); -+ } + + mutex_unlock(&ctx_alloc->lock); + @@ -165778,18 +180780,19 @@ index 000000000000..087cc858c2b8 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h new file mode 100755 -index 000000000000..f71ea01ed8c0 +index 000000000..9aab7abfb --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h -@@ -0,0 +1,76 @@ +@@ -0,0 +1,75 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -165800,8 +180803,6 @@ index 000000000000..f71ea01ed8c0 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -165832,11 +180833,11 @@ index 000000000000..f71ea01ed8c0 +/** + * kbase_csf_heap_context_allocator_alloc - Allocate a heap context structure + * ++ * @ctx_alloc: Pointer to the heap context allocator. ++ * + * If this function is successful then it returns the address of a + * zero-initialized heap context structure for use by the firmware. + * -+ * @ctx_alloc: Pointer to the heap context allocator. -+ * + * Return: GPU virtual address of the allocated heap context or 0 on failure. + */ +u64 kbase_csf_heap_context_allocator_alloc( @@ -165845,418 +180846,34 @@ index 000000000000..f71ea01ed8c0 +/** + * kbase_csf_heap_context_allocator_free - Free a heap context structure + * -+ * This function returns a heap context structure to the free pool of unused -+ * contexts for possible reuse by a future call to -+ * @kbase_csf_heap_context_allocator_alloc. -+ * + * @ctx_alloc: Pointer to the heap context allocator. + * @heap_gpu_va: The GPU virtual address of a heap context structure that + * was allocated for the firmware. ++ * ++ * This function returns a heap context structure to the free pool of unused ++ * contexts for possible reuse by a future call to ++ * @kbase_csf_heap_context_allocator_alloc. + */ +void kbase_csf_heap_context_allocator_free( + struct kbase_csf_heap_context_allocator *const ctx_alloc, + u64 const heap_gpu_va); + +#endif /* _KBASE_CSF_HEAP_CONTEXT_ALLOC_H_ */ -diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h -new file mode 100755 -index 000000000000..e9bb8d299754 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h -@@ -0,0 +1,379 @@ -+/* -+ * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+#ifndef _KBASE_CSF_IOCTL_H_ -+#define _KBASE_CSF_IOCTL_H_ -+ -+#include -+#include -+ -+/* -+ * 1.0: -+ * - CSF IOCTL header separated from JM -+ */ -+ -+#define BASE_UK_VERSION_MAJOR 1 -+#define BASE_UK_VERSION_MINOR 0 -+ -+/** -+ * struct kbase_ioctl_version_check - Check version compatibility between -+ * kernel and userspace -+ * -+ * @major: Major version number -+ * @minor: Minor version number -+ */ -+struct kbase_ioctl_version_check { -+ __u16 major; -+ __u16 minor; -+}; -+ -+#define KBASE_IOCTL_VERSION_CHECK \ -+ _IOWR(KBASE_IOCTL_TYPE, 52, struct kbase_ioctl_version_check) -+ -+#define KBASE_IOCTL_VERSION_CHECK_RESERVED \ -+ _IOWR(KBASE_IOCTL_TYPE, 0, struct kbase_ioctl_version_check) -+ -+ -+/** -+ * struct kbase_ioctl_cs_queue_register - Register a GPU command queue with the -+ * base back-end -+ * -+ * @buffer_gpu_addr: GPU address of the buffer backing the queue -+ * @buffer_size: Size of the buffer in bytes -+ * @priority: Priority of the queue within a group when run within a process -+ * @padding: Currently unused, must be zero -+ */ -+struct kbase_ioctl_cs_queue_register { -+ __u64 buffer_gpu_addr; -+ __u32 buffer_size; -+ __u8 priority; -+ __u8 padding[3]; -+}; -+ -+#define KBASE_IOCTL_CS_QUEUE_REGISTER \ -+ _IOW(KBASE_IOCTL_TYPE, 36, struct kbase_ioctl_cs_queue_register) -+ -+/** -+ * struct kbase_ioctl_cs_queue_kick - Kick the GPU command queue group scheduler -+ * to notify that a queue has been updated -+ * -+ * @buffer_gpu_addr: GPU address of the buffer backing the queue -+ */ -+struct kbase_ioctl_cs_queue_kick { -+ __u64 buffer_gpu_addr; -+}; -+ -+#define KBASE_IOCTL_CS_QUEUE_KICK \ -+ _IOW(KBASE_IOCTL_TYPE, 37, struct kbase_ioctl_cs_queue_kick) -+ -+/** -+ * union kbase_ioctl_cs_queue_bind - Bind a GPU command queue to a group -+ * -+ * @buffer_gpu_addr: GPU address of the buffer backing the queue -+ * @group_handle: Handle of the group to which the queue should be bound -+ * @csi_index: Index of the CSF interface the queue should be bound to -+ * @padding: Currently unused, must be zero -+ * @mmap_handle: Handle to be used for creating the mapping of command stream -+ * input/output pages -+ * -+ * @in: Input parameters -+ * @out: Output parameters -+ * -+ */ -+union kbase_ioctl_cs_queue_bind { -+ struct { -+ __u64 buffer_gpu_addr; -+ __u8 group_handle; -+ __u8 csi_index; -+ __u8 padding[6]; -+ } in; -+ struct { -+ __u64 mmap_handle; -+ } out; -+}; -+ -+#define KBASE_IOCTL_CS_QUEUE_BIND \ -+ _IOWR(KBASE_IOCTL_TYPE, 39, union kbase_ioctl_cs_queue_bind) -+ -+/* ioctl 40 is free to use */ -+ -+/** -+ * struct kbase_ioctl_cs_queue_terminate - Terminate a GPU command queue -+ * -+ * @buffer_gpu_addr: GPU address of the buffer backing the queue -+ */ -+struct kbase_ioctl_cs_queue_terminate { -+ __u64 buffer_gpu_addr; -+}; -+ -+#define KBASE_IOCTL_CS_QUEUE_TERMINATE \ -+ _IOW(KBASE_IOCTL_TYPE, 41, struct kbase_ioctl_cs_queue_terminate) -+ -+/** -+ * union kbase_ioctl_cs_queue_group_create - Create a GPU command queue group -+ * -+ * @tiler_mask: Mask of tiler endpoints the group is allowed to use. -+ * @fragment_mask: Mask of fragment endpoints the group is allowed to use. -+ * @compute_mask: Mask of compute endpoints the group is allowed to use. -+ * @cs_min: Minimum number of command streams required. -+ * @priority: Queue group's priority within a process. -+ * @tiler_max: Maximum number of tiler endpoints the group is allowed -+ * to use. -+ * @fragment_max: Maximum number of fragment endpoints the group is -+ * allowed to use. -+ * @compute_max: Maximum number of compute endpoints the group is allowed -+ * to use. -+ * @padding: Currently unused, must be zero -+ * @group_handle: Handle of a newly created queue group. -+ * -+ * @in: Input parameters -+ * @out: Output parameters -+ * -+ */ -+union kbase_ioctl_cs_queue_group_create { -+ struct { -+ __u64 tiler_mask; -+ __u64 fragment_mask; -+ __u64 compute_mask; -+ __u8 cs_min; -+ __u8 priority; -+ __u8 tiler_max; -+ __u8 fragment_max; -+ __u8 compute_max; -+ __u8 padding[3]; -+ -+ } in; -+ struct { -+ __u8 group_handle; -+ __u8 padding[7]; -+ } out; -+}; -+ -+#define KBASE_IOCTL_CS_QUEUE_GROUP_CREATE \ -+ _IOWR(KBASE_IOCTL_TYPE, 42, union kbase_ioctl_cs_queue_group_create) -+ -+/** -+ * struct kbase_ioctl_cs_queue_group_term - Terminate a GPU command queue group -+ * -+ * @group_handle: Handle of the queue group to be terminated -+ * @padding: Padding to round up to a multiple of 8 bytes, must be zero -+ */ -+struct kbase_ioctl_cs_queue_group_term { -+ __u8 group_handle; -+ __u8 padding[7]; -+}; -+ -+#define KBASE_IOCTL_CS_QUEUE_GROUP_TERMINATE \ -+ _IOW(KBASE_IOCTL_TYPE, 43, struct kbase_ioctl_cs_queue_group_term) -+ -+#define KBASE_IOCTL_CS_EVENT_SIGNAL \ -+ _IO(KBASE_IOCTL_TYPE, 44) -+ -+typedef __u8 base_kcpu_queue_id; /* We support up to 256 active KCPU queues */ -+ -+/** -+ * struct kbase_ioctl_kcpu_queue_new - Create a KCPU command queue -+ * -+ * @id: ID of the new command queue returned by the kernel -+ * @padding: Padding to round up to a multiple of 8 bytes, must be zero -+ */ -+struct kbase_ioctl_kcpu_queue_new { -+ base_kcpu_queue_id id; -+ __u8 padding[7]; -+}; -+ -+#define KBASE_IOCTL_KCPU_QUEUE_CREATE \ -+ _IOR(KBASE_IOCTL_TYPE, 45, struct kbase_ioctl_kcpu_queue_new) -+ -+/** -+ * struct kbase_ioctl_kcpu_queue_delete - Destroy a KCPU command queue -+ * -+ * @id: ID of the command queue to be destroyed -+ * @padding: Padding to round up to a multiple of 8 bytes, must be zero -+ */ -+struct kbase_ioctl_kcpu_queue_delete { -+ base_kcpu_queue_id id; -+ __u8 padding[7]; -+}; -+ -+#define KBASE_IOCTL_KCPU_QUEUE_DELETE \ -+ _IOW(KBASE_IOCTL_TYPE, 46, struct kbase_ioctl_kcpu_queue_delete) -+ -+/** -+ * struct kbase_ioctl_kcpu_queue_enqueue - Enqueue commands into the KCPU queue -+ * -+ * @addr: Memory address of an array of struct base_kcpu_queue_command -+ * @nr_commands: Number of commands in the array -+ * @id: kcpu queue identifier, returned by KBASE_IOCTL_KCPU_QUEUE_CREATE ioctl -+ * @padding: Padding to round up to a multiple of 8 bytes, must be zero -+ */ -+struct kbase_ioctl_kcpu_queue_enqueue { -+ __u64 addr; -+ __u32 nr_commands; -+ base_kcpu_queue_id id; -+ __u8 padding[3]; -+}; -+ -+#define KBASE_IOCTL_KCPU_QUEUE_ENQUEUE \ -+ _IOW(KBASE_IOCTL_TYPE, 47, struct kbase_ioctl_kcpu_queue_enqueue) -+ -+/** -+ * union kbase_ioctl_cs_tiler_heap_init - Initialize chunked tiler memory heap -+ * -+ * @chunk_size: Size of each chunk. -+ * @initial_chunks: Initial number of chunks that heap will be created with. -+ * @max_chunks: Maximum number of chunks that the heap is allowed to use. -+ * @target_in_flight: Number of render-passes that the driver should attempt to -+ * keep in flight for which allocation of new chunks is -+ * allowed. -+ * @group_id: Group ID to be used for physical allocations. -+ * @gpu_heap_va: GPU VA (virtual address) of Heap context that was set up for -+ * the heap. -+ * @first_chunk_va: GPU VA of the first chunk allocated for the heap, actually -+ * points to the header of heap chunk and not to the low -+ * address of free memory in the chunk. -+ * -+ * @in: Input parameters -+ * @out: Output parameters -+ * -+ */ -+union kbase_ioctl_cs_tiler_heap_init { -+ struct { -+ __u32 chunk_size; -+ __u32 initial_chunks; -+ __u32 max_chunks; -+ __u16 target_in_flight; -+ __u8 group_id; -+ __u8 padding; -+ } in; -+ struct { -+ __u64 gpu_heap_va; -+ __u64 first_chunk_va; -+ } out; -+}; -+ -+#define KBASE_IOCTL_CS_TILER_HEAP_INIT \ -+ _IOWR(KBASE_IOCTL_TYPE, 48, union kbase_ioctl_cs_tiler_heap_init) -+ -+/** -+ * struct kbase_ioctl_cs_tiler_heap_term - Terminate a chunked tiler heap -+ * instance -+ * -+ * @gpu_heap_va: GPU VA of Heap context that was set up for the heap. -+ */ -+struct kbase_ioctl_cs_tiler_heap_term { -+ __u64 gpu_heap_va; -+}; -+ -+#define KBASE_IOCTL_CS_TILER_HEAP_TERM \ -+ _IOW(KBASE_IOCTL_TYPE, 49, struct kbase_ioctl_cs_tiler_heap_term) -+ -+/** -+ * union kbase_ioctl_cs_get_glb_iface - Request the global control block -+ * of CSF interface capabilities -+ * -+ * @max_group_num: The maximum number of groups to be read. Can be 0, in -+ * which case groups_ptr is unused. -+ * @max_total_stream_num: The maximum number of streams to be read. Can be 0, in -+ * which case streams_ptr is unused. -+ * @groups_ptr: Pointer where to store all the group data (sequentially). -+ * @streams_ptr: Pointer where to store all the stream data (sequentially). -+ * @glb_version: Global interface version. Bits 31:16 hold the major -+ * version number and 15:0 hold the minor version number. -+ * A higher minor version is backwards-compatible with a -+ * lower minor version for the same major version. -+ * @features: Bit mask of features (e.g. whether certain types of job -+ * can be suspended). -+ * @group_num: Number of command stream groups supported. -+ * @prfcnt_size: Size of CSF performance counters, in bytes. Bits 31:16 -+ * hold the size of firmware performance counter data -+ * and 15:0 hold the size of hardware performance counter -+ * data. -+ * @total_stream_num: Total number of command streams, summed across all groups. -+ * @padding: Will be zeroed. -+ * -+ * @in: Input parameters -+ * @out: Output parameters -+ * -+ */ -+union kbase_ioctl_cs_get_glb_iface { -+ struct { -+ __u32 max_group_num; -+ __u32 max_total_stream_num; -+ __u64 groups_ptr; -+ __u64 streams_ptr; -+ } in; -+ struct { -+ __u32 glb_version; -+ __u32 features; -+ __u32 group_num; -+ __u32 prfcnt_size; -+ __u32 total_stream_num; -+ __u32 padding; -+ } out; -+}; -+ -+#define KBASE_IOCTL_CS_GET_GLB_IFACE \ -+ _IOWR(KBASE_IOCTL_TYPE, 51, union kbase_ioctl_cs_get_glb_iface) -+ -+/*************** -+ * test ioctls * -+ ***************/ -+#if MALI_UNIT_TEST -+/* These ioctls are purely for test purposes and are not used in the production -+ * driver, they therefore may change without notice -+ */ -+ -+/** -+ * struct kbase_ioctl_cs_event_memory_write - Write an event memory address -+ * @cpu_addr: Memory address to write -+ * @value: Value to write -+ * @padding: Currently unused, must be zero -+ */ -+struct kbase_ioctl_cs_event_memory_write { -+ __u64 cpu_addr; -+ __u8 value; -+ __u8 padding[7]; -+}; -+ -+/** -+ * union kbase_ioctl_cs_event_memory_read - Read an event memory address -+ * @cpu_addr: Memory address to read -+ * @value: Value read -+ * @padding: Currently unused, must be zero -+ * -+ * @in: Input parameters -+ * @out: Output parameters -+ */ -+union kbase_ioctl_cs_event_memory_read { -+ struct { -+ __u64 cpu_addr; -+ } in; -+ struct { -+ __u8 value; -+ __u8 padding[7]; -+ } out; -+}; -+ -+#endif /* MALI_UNIT_TEST */ -+ -+#endif /* _KBASE_CSF_IOCTL_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c new file mode 100755 -index 000000000000..e1263d535918 +index 000000000..da8dde239 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c -@@ -0,0 +1,1737 @@ +@@ -0,0 +1,2595 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -166267,8 +180884,6 @@ index 000000000000..e1263d535918 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -166278,15 +180893,19 @@ index 000000000000..e1263d535918 +#include "mali_kbase_csf.h" +#include + -+#ifdef CONFIG_SYNC_FILE ++#if IS_ENABLED(CONFIG_SYNC_FILE) +#include "mali_kbase_fence.h" +#include "mali_kbase_sync.h" + +static DEFINE_SPINLOCK(kbase_csf_fence_lock); +#endif + ++#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG ++#define FENCE_WAIT_TIMEOUT_MS 3000 ++#endif ++ +static void kcpu_queue_process(struct kbase_kcpu_command_queue *kcpu_queue, -+ bool ignore_waits); ++ bool drain_queue); + +static void kcpu_queue_process_worker(struct work_struct *data); + @@ -166297,9 +180916,13 @@ index 000000000000..e1263d535918 +{ + struct kbase_context *const kctx = kcpu_queue->kctx; + struct kbase_va_region *reg; ++ struct kbase_mem_phy_alloc *alloc; ++ struct page **pages; ++ struct tagged_addr *pa; ++ long i; + int ret = 0; + -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&kcpu_queue->lock); + + /* Take the processes mmap lock */ + down_read(kbase_mem_get_process_mmap_lock()); @@ -166324,10 +180947,24 @@ index 000000000000..e1263d535918 + * on the physical pages tracking object. When the last + * reference to the tracking object is dropped the pages + * would be unpinned if they weren't unpinned before. ++ * ++ * Region should be CPU cached: abort if it isn't. + */ ++ if (WARN_ON(!(reg->flags & KBASE_REG_CPU_CACHED))) { ++ ret = -EINVAL; ++ goto out; ++ } ++ + ret = kbase_jd_user_buf_pin_pages(kctx, reg); + if (ret) + goto out; ++ ++ alloc = reg->gpu_alloc; ++ pa = kbase_get_gpu_phy_pages(reg); ++ pages = alloc->imported.user_buf.pages; ++ ++ for (i = 0; i < alloc->nents; i++) ++ pa[i] = as_tagged(page_to_phys(pages[i])); + } + + current_command->type = BASE_KCPU_COMMAND_TYPE_MAP_IMPORT; @@ -166351,7 +180988,7 @@ index 000000000000..e1263d535918 + struct kbase_va_region *reg; + int ret = 0; + -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&kcpu_queue->lock); + + kbase_gpu_vm_lock(kctx); + @@ -166419,13 +181056,14 @@ index 000000000000..e1263d535918 + &kctx->csf.kcpu_queues.jit_blocked_queues; + struct kbase_kcpu_command_queue *blocked_queue; + -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&queue->lock); ++ lockdep_assert_held(&kctx->csf.kcpu_queues.jit_lock); + + list_for_each_entry(blocked_queue, + &kctx->csf.kcpu_queues.jit_blocked_queues, + jit_blocked) { -+ struct kbase_kcpu_command const*const jit_alloc_cmd = -+ &blocked_queue->commands[blocked_queue->start_offset]; ++ struct kbase_kcpu_command const *const jit_alloc_cmd = ++ &blocked_queue->commands[blocked_queue->start_offset]; + + WARN_ON(jit_alloc_cmd->type != BASE_KCPU_COMMAND_TYPE_JIT_ALLOC); + if (cmd->enqueue_ts < jit_alloc_cmd->enqueue_ts) { @@ -166442,6 +181080,12 @@ index 000000000000..e1263d535918 + * + * @queue: The queue containing this JIT allocation + * @cmd: The JIT allocation command ++ * ++ * Return: ++ * * 0 - allocation OK ++ * * -EINVAL - missing info or JIT ID still in use ++ * * -EAGAIN - Retry ++ * * -ENOMEM - no memory. unable to allocate + */ +static int kbase_kcpu_jit_allocate_process( + struct kbase_kcpu_command_queue *queue, @@ -166458,36 +181102,30 @@ index 000000000000..e1263d535918 + u32 i; + int ret; + -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); -+ -+ if (alloc_info->blocked) { -+ list_del(&queue->jit_blocked); -+ alloc_info->blocked = false; -+ } ++ lockdep_assert_held(&queue->lock); + + if (WARN_ON(!info)) + return -EINVAL; + ++ mutex_lock(&kctx->csf.kcpu_queues.jit_lock); ++ + /* Check if all JIT IDs are not in use */ + for (i = 0; i < count; i++, info++) { + /* The JIT ID is still in use so fail the allocation */ + if (kctx->jit_alloc[info->id]) { -+ dev_warn(kctx->kbdev->dev, "JIT ID still in use\n"); -+ return -EINVAL; ++ dev_dbg(kctx->kbdev->dev, "JIT ID still in use"); ++ ret = -EINVAL; ++ goto fail; + } + } + ++ if (alloc_info->blocked) { ++ list_del(&queue->jit_blocked); ++ alloc_info->blocked = false; ++ } ++ + /* Now start the allocation loop */ + for (i = 0, info = alloc_info->info; i < count; i++, info++) { -+ if (kctx->jit_alloc[info->id]) { -+ /* The JIT ID is duplicated in this command. Roll back -+ * previous allocations and fail. -+ */ -+ dev_warn(kctx->kbdev->dev, "JIT ID is duplicated\n"); -+ ret = -EINVAL; -+ goto fail; -+ } -+ + /* Create a JIT allocation */ + reg = kbase_jit_allocate(kctx, info, true); + if (!reg) { @@ -166499,10 +181137,10 @@ index 000000000000..e1263d535918 + break; + + if (jit_cmd->type == BASE_KCPU_COMMAND_TYPE_JIT_FREE) { -+ u8 const*const free_ids = jit_cmd->info.jit_free.ids; ++ u8 const *const free_ids = jit_cmd->info.jit_free.ids; + + if (free_ids && *free_ids && kctx->jit_alloc[*free_ids]) { -+ /** ++ /* + * A JIT free which is active + * and submitted before this + * command. @@ -166514,13 +181152,13 @@ index 000000000000..e1263d535918 + } + + if (!can_block) { -+ /** ++ /* + * No prior JIT_FREE command is active. Roll + * back previous allocations and fail. + */ -+ dev_warn_ratelimited(kctx->kbdev->dev, "JIT alloc command failed: %p\n", cmd); ++ dev_warn_ratelimited(kctx->kbdev->dev, "JIT alloc command failed: %pK\n", cmd); + ret = -ENOMEM; -+ goto fail; ++ goto fail_rollback; + } + + /* There are pending frees for an active allocation @@ -166538,7 +181176,8 @@ index 000000000000..e1263d535918 + kctx->jit_alloc[info->id] = NULL; + } + -+ return -EAGAIN; ++ ret = -EAGAIN; ++ goto fail; + } + + /* Bind it to the user provided ID. */ @@ -166550,11 +181189,11 @@ index 000000000000..e1263d535918 + * Write the address of the JIT allocation to the user provided + * GPU allocation. + */ -+ ptr = kbase_vmap(kctx, info->gpu_alloc_addr, sizeof(*ptr), -+ &mapping); ++ ptr = kbase_vmap_prot(kctx, info->gpu_alloc_addr, sizeof(*ptr), ++ KBASE_REG_CPU_WR, &mapping); + if (!ptr) { + ret = -ENOMEM; -+ goto fail; ++ goto fail_rollback; + } + + reg = kctx->jit_alloc[info->id]; @@ -166563,9 +181202,11 @@ index 000000000000..e1263d535918 + kbase_vunmap(kctx, &mapping); + } + ++ mutex_unlock(&kctx->csf.kcpu_queues.jit_lock); ++ + return 0; + -+fail: ++fail_rollback: + /* Roll back completely */ + for (i = 0, info = alloc_info->info; i < count; i++, info++) { + /* Free the allocations that were successful. @@ -166578,6 +181219,8 @@ index 000000000000..e1263d535918 + + kctx->jit_alloc[info->id] = KBASE_RESERVED_REG_JIT_ALLOC; + } ++fail: ++ mutex_unlock(&kctx->csf.kcpu_queues.jit_lock); + + return ret; +} @@ -166589,15 +181232,16 @@ index 000000000000..e1263d535918 +{ + struct kbase_context *const kctx = kcpu_queue->kctx; + void __user *data = u64_to_user_ptr(alloc_info->info); -+ struct base_jit_alloc_info *info; ++ struct base_jit_alloc_info *info = NULL; + u32 count = alloc_info->count; + int ret = 0; + u32 i; + -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&kcpu_queue->lock); + -+ if (!data || count > kcpu_queue->kctx->jit_max_allocations || -+ count > ARRAY_SIZE(kctx->jit_alloc)) { ++ if ((count == 0) || (count > ARRAY_SIZE(kctx->jit_alloc)) || ++ (count > kcpu_queue->kctx->jit_max_allocations) || (!data) || ++ !kbase_mem_allow_alloc(kctx)) { + ret = -EINVAL; + goto out; + } @@ -166619,12 +181263,26 @@ index 000000000000..e1263d535918 + goto out_free; + } + ++ /* Search for duplicate JIT ids */ ++ for (i = 0; i < (count - 1); i++) { ++ u32 j; ++ ++ for (j = (i + 1); j < count; j++) { ++ if (info[i].id == info[j].id) { ++ ret = -EINVAL; ++ goto out_free; ++ } ++ } ++ } ++ + current_command->type = BASE_KCPU_COMMAND_TYPE_JIT_ALLOC; -+ list_add_tail(¤t_command->info.jit_alloc.node, -+ &kctx->csf.kcpu_queues.jit_cmds_head); + current_command->info.jit_alloc.info = info; + current_command->info.jit_alloc.count = count; + current_command->info.jit_alloc.blocked = false; ++ mutex_lock(&kctx->csf.kcpu_queues.jit_lock); ++ list_add_tail(¤t_command->info.jit_alloc.node, ++ &kctx->csf.kcpu_queues.jit_cmds_head); ++ mutex_unlock(&kctx->csf.kcpu_queues.jit_lock); + + return 0; +out_free: @@ -166643,12 +181301,14 @@ index 000000000000..e1263d535918 + struct kbase_kcpu_command_queue *queue, + struct kbase_kcpu_command *cmd) +{ -+ lockdep_assert_held(&queue->kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&queue->lock); ++ ++ mutex_lock(&queue->kctx->csf.kcpu_queues.jit_lock); + + /* Remove this command from the jit_cmds_head list */ + list_del(&cmd->info.jit_alloc.node); + -+ /** ++ /* + * If we get to this point we must have already cleared the blocked + * flag, otherwise it'd be a bug. + */ @@ -166657,6 +181317,8 @@ index 000000000000..e1263d535918 + cmd->info.jit_alloc.blocked = false; + } + ++ mutex_unlock(&queue->kctx->csf.kcpu_queues.jit_lock); ++ + kfree(cmd->info.jit_alloc.info); +} + @@ -166669,61 +181331,79 @@ index 000000000000..e1263d535918 +{ + struct kbase_kcpu_command_queue *blocked_queue; + -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&kctx->csf.kcpu_queues.jit_lock); + -+ /** ++ /* + * Reschedule all queues blocked by JIT_ALLOC commands. + * NOTE: This code traverses the list of blocked queues directly. It + * only works as long as the queued works are not executed at the same + * time. This precondition is true since we're holding the -+ * kbase_csf_kcpu_queue_context.lock . ++ * kbase_csf_kcpu_queue_context.jit_lock . + */ -+ list_for_each_entry(blocked_queue, -+ &kctx->csf.kcpu_queues.jit_blocked_queues, jit_blocked) -+ queue_work(kctx->csf.kcpu_queues.wq, &blocked_queue->work); ++ list_for_each_entry(blocked_queue, &kctx->csf.kcpu_queues.jit_blocked_queues, jit_blocked) ++ queue_work(blocked_queue->wq, &blocked_queue->work); +} + -+static int kbase_kcpu_jit_free_process(struct kbase_context *kctx, -+ struct kbase_kcpu_command *const cmd) ++static int kbase_kcpu_jit_free_process(struct kbase_kcpu_command_queue *queue, ++ struct kbase_kcpu_command *const cmd) +{ -+ struct kbase_kcpu_command_jit_free_info *const free_info = -+ &cmd->info.jit_free; -+ u8 *ids = free_info->ids; -+ u32 count = free_info->count; ++ struct kbase_kcpu_command_jit_free_info const *const free_info = ++ &cmd->info.jit_free; ++ u8 const *const ids = free_info->ids; ++ u32 const count = free_info->count; + u32 i; ++ int rc = 0; ++ struct kbase_context *kctx = queue->kctx; + + if (WARN_ON(!ids)) + return -EINVAL; + -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&queue->lock); ++ mutex_lock(&kctx->csf.kcpu_queues.jit_lock); + -+ for (i = 0; i < count; i++, ids++) { -+ if ((*ids == 0) || (kctx->jit_alloc[*ids] == NULL)) { -+ dev_warn(kctx->kbdev->dev, "invalid JIT free ID\n"); ++ KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_EXECUTE_JIT_FREE_END(queue->kctx->kbdev, ++ queue); ++ ++ for (i = 0; i < count; i++) { ++ u64 pages_used = 0; ++ int item_err = 0; ++ ++ if (!kctx->jit_alloc[ids[i]]) { ++ dev_dbg(kctx->kbdev->dev, "invalid JIT free ID"); ++ rc = -EINVAL; ++ item_err = rc; + } else { -+ /* If the ID is valid but the allocation request -+ * failed, still succeed this command but don't -+ * try and free the allocation. ++ struct kbase_va_region *const reg = kctx->jit_alloc[ids[i]]; ++ ++ /* ++ * If the ID is valid but the allocation request failed, still ++ * succeed this command but don't try and free the allocation. + */ -+ if (kctx->jit_alloc[*ids] != -+ KBASE_RESERVED_REG_JIT_ALLOC) -+ kbase_jit_free(kctx, kctx->jit_alloc[*ids]); ++ if (reg != KBASE_RESERVED_REG_JIT_ALLOC) { ++ pages_used = reg->gpu_alloc->nents; ++ kbase_jit_free(kctx, reg); ++ } + -+ kctx->jit_alloc[*ids] = NULL; ++ kctx->jit_alloc[ids[i]] = NULL; + } -+ } + -+ /* Free the list of ids */ -+ kfree(free_info->ids); ++ KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_FREE_END( ++ queue->kctx->kbdev, queue, item_err, pages_used); ++ } + -+ /** ++ /* + * Remove this command from the jit_cmds_head list and retry pending + * allocations. + */ + list_del(&cmd->info.jit_free.node); + kbase_kcpu_jit_retry_pending_allocs(kctx); + -+ return 0; ++ mutex_unlock(&kctx->csf.kcpu_queues.jit_lock); ++ ++ /* Free the list of ids */ ++ kfree(ids); ++ ++ return rc; +} + +static int kbase_kcpu_jit_free_prepare( @@ -166738,7 +181418,7 @@ index 000000000000..e1263d535918 + int ret; + u32 i; + -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&kcpu_queue->lock); + + /* Sanity checks */ + if (!count || count > ARRAY_SIZE(kctx->jit_alloc)) { @@ -166771,11 +181451,25 @@ index 000000000000..e1263d535918 + } + } + ++ /* Search for duplicate JIT ids */ ++ for (i = 0; i < (count - 1); i++) { ++ u32 j; ++ ++ for (j = (i + 1); j < count; j++) { ++ if (ids[i] == ids[j]) { ++ ret = -EINVAL; ++ goto out_free; ++ } ++ } ++ } ++ + current_command->type = BASE_KCPU_COMMAND_TYPE_JIT_FREE; -+ list_add_tail(¤t_command->info.jit_free.node, -+ &kctx->csf.kcpu_queues.jit_cmds_head); + current_command->info.jit_free.ids = ids; + current_command->info.jit_free.count = count; ++ mutex_lock(&kctx->csf.kcpu_queues.jit_lock); ++ list_add_tail(¤t_command->info.jit_free.node, ++ &kctx->csf.kcpu_queues.jit_cmds_head); ++ mutex_unlock(&kctx->csf.kcpu_queues.jit_lock); + + return 0; +out_free: @@ -166784,6 +181478,7 @@ index 000000000000..e1263d535918 + return ret; +} + ++#if IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST +static int kbase_csf_queue_group_suspend_prepare( + struct kbase_kcpu_command_queue *kcpu_queue, + struct base_kcpu_command_group_suspend_info *suspend_buf, @@ -166791,18 +181486,19 @@ index 000000000000..e1263d535918 +{ + struct kbase_context *const kctx = kcpu_queue->kctx; + struct kbase_suspend_copy_buffer *sus_buf = NULL; ++ const u32 csg_suspend_buf_size = ++ kctx->kbdev->csf.global_iface.groups[0].suspend_size; + u64 addr = suspend_buf->buffer; + u64 page_addr = addr & PAGE_MASK; -+ u64 end_addr = addr + suspend_buf->size - 1; ++ u64 end_addr = addr + csg_suspend_buf_size - 1; + u64 last_page_addr = end_addr & PAGE_MASK; + int nr_pages = (last_page_addr - page_addr) / PAGE_SIZE + 1; -+ int pinned_pages; -+ int ret = 0; ++ int pinned_pages = 0, ret = 0; ++ struct kbase_va_region *reg; + -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&kcpu_queue->lock); + -+ if (suspend_buf->size < -+ kctx->kbdev->csf.global_iface.groups[0].suspend_size) ++ if (suspend_buf->size < csg_suspend_buf_size) + return -EINVAL; + + ret = kbase_csf_queue_group_handle_is_valid(kctx, @@ -166814,7 +181510,7 @@ index 000000000000..e1263d535918 + if (!sus_buf) + return -ENOMEM; + -+ sus_buf->size = suspend_buf->size; ++ sus_buf->size = csg_suspend_buf_size; + sus_buf->nr_pages = nr_pages; + sus_buf->offset = addr & ~PAGE_MASK; + @@ -166824,17 +181520,59 @@ index 000000000000..e1263d535918 + goto out_clean_sus_buf; + } + -+ pinned_pages = get_user_pages_fast(page_addr, nr_pages, 1, -+ sus_buf->pages); -+ if (pinned_pages < 0) { -+ ret = pinned_pages; -+ goto out_clean_pages; -+ } -+ if (pinned_pages != nr_pages) { -+ ret = -EINVAL; -+ goto out_clean_pages; ++ /* Check if the page_addr is a valid GPU VA from SAME_VA zone, ++ * otherwise consider it is a CPU VA corresponding to the Host ++ * memory allocated by userspace. ++ */ ++ kbase_gpu_vm_lock(kctx); ++ reg = kbase_region_tracker_find_region_enclosing_address(kctx, ++ page_addr); ++ ++ if (kbase_is_region_invalid_or_free(reg)) { ++ kbase_gpu_vm_unlock(kctx); ++ pinned_pages = get_user_pages_fast(page_addr, nr_pages, 1, ++ sus_buf->pages); ++ kbase_gpu_vm_lock(kctx); ++ ++ if (pinned_pages < 0) { ++ ret = pinned_pages; ++ goto out_clean_pages; ++ } ++ if (pinned_pages != nr_pages) { ++ ret = -EINVAL; ++ goto out_clean_pages; ++ } ++ } else { ++ struct tagged_addr *page_array; ++ u64 start, end, i; ++ ++ if (((reg->flags & KBASE_REG_ZONE_MASK) != KBASE_REG_ZONE_SAME_VA) || ++ (kbase_reg_current_backed_size(reg) < nr_pages) || ++ !(reg->flags & KBASE_REG_CPU_WR) || ++ (reg->gpu_alloc->type != KBASE_MEM_TYPE_NATIVE) || ++ (kbase_is_region_shrinkable(reg)) || (kbase_va_region_is_no_user_free(reg))) { ++ ret = -EINVAL; ++ goto out_clean_pages; ++ } ++ ++ start = PFN_DOWN(page_addr) - reg->start_pfn; ++ end = start + nr_pages; ++ ++ if (end > reg->nr_pages) { ++ ret = -EINVAL; ++ goto out_clean_pages; ++ } ++ ++ sus_buf->cpu_alloc = kbase_mem_phy_alloc_get(reg->cpu_alloc); ++ kbase_mem_phy_alloc_kernel_mapped(reg->cpu_alloc); ++ page_array = kbase_get_cpu_phy_pages(reg); ++ page_array += start; ++ ++ for (i = 0; i < nr_pages; i++, page_array++) ++ sus_buf->pages[i] = as_page(*page_array); + } + ++ kbase_gpu_vm_unlock(kctx); + current_command->type = BASE_KCPU_COMMAND_TYPE_GROUP_SUSPEND; + current_command->info.suspend_buf_copy.sus_buf = sus_buf; + current_command->info.suspend_buf_copy.group_handle = @@ -166842,9 +181580,11 @@ index 000000000000..e1263d535918 + return ret; + +out_clean_pages: ++ kbase_gpu_vm_unlock(kctx); + kfree(sus_buf->pages); +out_clean_sus_buf: + kfree(sus_buf); ++ + return ret; +} + @@ -166854,14 +181594,14 @@ index 000000000000..e1263d535918 +{ + return kbase_csf_queue_group_suspend(kctx, sus_buf, group_handle); +} ++#endif + +static enum kbase_csf_event_callback_action event_cqs_callback(void *param) +{ + struct kbase_kcpu_command_queue *kcpu_queue = + (struct kbase_kcpu_command_queue *)param; -+ struct kbase_context *const kctx = kcpu_queue->kctx; + -+ queue_work(kctx->csf.kcpu_queues.wq, &kcpu_queue->work); ++ queue_work(kcpu_queue->wq, &kcpu_queue->work); + + return KBASE_CSF_EVENT_CALLBACK_KEEP; +} @@ -166891,15 +181631,11 @@ index 000000000000..e1263d535918 +{ + u32 i; + -+ lockdep_assert_held(&queue->kctx->csf.kcpu_queues.lock); -+ -+ if (WARN_ON(!cqs_wait->nr_objs)) -+ return -EINVAL; ++ lockdep_assert_held(&queue->lock); + + if (WARN_ON(!cqs_wait->objs)) + return -EINVAL; + -+ + /* Skip the CQS waits that have already been signaled when processing */ + for (i = find_first_zero_bit(cqs_wait->signaled, cqs_wait->nr_objs); i < cqs_wait->nr_objs; i++) { + if (!test_bit(i, cqs_wait->signaled)) { @@ -166909,25 +181645,38 @@ index 000000000000..e1263d535918 + cqs_wait->objs[i].addr, &mapping); + + if (!queue->command_started) { -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_START( -+ kbdev, queue); ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_START(kbdev, ++ queue); + queue->command_started = true; ++ KBASE_KTRACE_ADD_CSF_KCPU(kbdev, KCPU_CQS_WAIT_START, ++ queue, cqs_wait->nr_objs, 0); + } + -+ if (WARN_ON(!evt)) { ++ if (!evt) { ++ dev_warn(kbdev->dev, ++ "Sync memory %llx already freed", cqs_wait->objs[i].addr); + queue->has_error = true; + return -EINVAL; + } + -+ sig_set = evt[BASEP_EVENT_VAL_INDEX] > cqs_wait->objs[i].val; ++ sig_set = ++ evt[BASEP_EVENT32_VAL_OFFSET / sizeof(u32)] > cqs_wait->objs[i].val; + if (sig_set) { ++ bool error = false; ++ + bitmap_set(cqs_wait->signaled, i, 1); + if ((cqs_wait->inherit_err_flags & (1U << i)) && -+ evt[BASEP_EVENT_ERR_INDEX] > 0) ++ evt[BASEP_EVENT32_ERR_OFFSET / sizeof(u32)] > 0) { + queue->has_error = true; ++ error = true; ++ } ++ ++ KBASE_KTRACE_ADD_CSF_KCPU(kbdev, KCPU_CQS_WAIT_END, ++ queue, cqs_wait->objs[i].addr, ++ error); + + KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_END( -+ kbdev, queue); ++ kbdev, queue, evt[BASEP_EVENT32_ERR_OFFSET / sizeof(u32)]); + queue->command_started = false; + } + @@ -166944,16 +181693,41 @@ index 000000000000..e1263d535918 + return bitmap_full(cqs_wait->signaled, cqs_wait->nr_objs); +} + ++static inline bool kbase_kcpu_cqs_is_data_type_valid(u8 data_type) ++{ ++ return data_type == BASEP_CQS_DATA_TYPE_U32 || data_type == BASEP_CQS_DATA_TYPE_U64; ++} ++ ++static inline bool kbase_kcpu_cqs_is_aligned(u64 addr, u8 data_type) ++{ ++ BUILD_BUG_ON(BASEP_EVENT32_ALIGN_BYTES != BASEP_EVENT32_SIZE_BYTES); ++ BUILD_BUG_ON(BASEP_EVENT64_ALIGN_BYTES != BASEP_EVENT64_SIZE_BYTES); ++ WARN_ON(!kbase_kcpu_cqs_is_data_type_valid(data_type)); ++ ++ switch (data_type) { ++ default: ++ return false; ++ case BASEP_CQS_DATA_TYPE_U32: ++ return (addr & (BASEP_EVENT32_ALIGN_BYTES - 1)) == 0; ++ case BASEP_CQS_DATA_TYPE_U64: ++ return (addr & (BASEP_EVENT64_ALIGN_BYTES - 1)) == 0; ++ } ++} ++ +static int kbase_kcpu_cqs_wait_prepare(struct kbase_kcpu_command_queue *queue, + struct base_kcpu_command_cqs_wait_info *cqs_wait_info, + struct kbase_kcpu_command *current_command) +{ -+ struct base_cqs_wait *objs; ++ struct base_cqs_wait_info *objs; + unsigned int nr_objs = cqs_wait_info->nr_objs; ++ unsigned int i; ++ ++ lockdep_assert_held(&queue->lock); + -+ lockdep_assert_held(&queue->kctx->csf.kcpu_queues.lock); ++ if (nr_objs > BASEP_KCPU_CQS_MAX_NUM_OBJS) ++ return -EINVAL; + -+ if (cqs_wait_info->nr_objs > BASEP_KCPU_CQS_MAX_NUM_OBJS) ++ if (!nr_objs) + return -EINVAL; + + objs = kcalloc(nr_objs, sizeof(*objs), GFP_KERNEL); @@ -166966,10 +181740,22 @@ index 000000000000..e1263d535918 + return -ENOMEM; + } + ++ /* Check the CQS objects as early as possible. By checking their alignment ++ * (required alignment equals to size for Sync32 and Sync64 objects), we can ++ * prevent overrunning the supplied event page. ++ */ ++ for (i = 0; i < nr_objs; i++) { ++ if (!kbase_kcpu_cqs_is_aligned(objs[i].addr, BASEP_CQS_DATA_TYPE_U32)) { ++ kfree(objs); ++ return -EINVAL; ++ } ++ } ++ + if (++queue->cqs_wait_count == 1) { + if (kbase_csf_event_wait_add(queue->kctx, + event_cqs_callback, queue)) { + kfree(objs); ++ queue->cqs_wait_count--; + return -ENOMEM; + } + } @@ -166982,8 +181768,15 @@ index 000000000000..e1263d535918 + + current_command->info.cqs_wait.signaled = kcalloc(BITS_TO_LONGS(nr_objs), + sizeof(*current_command->info.cqs_wait.signaled), GFP_KERNEL); -+ if (!current_command->info.cqs_wait.signaled) ++ if (!current_command->info.cqs_wait.signaled) { ++ if (--queue->cqs_wait_count == 0) { ++ kbase_csf_event_wait_remove(queue->kctx, ++ event_cqs_callback, queue); ++ } ++ ++ kfree(objs); + return -ENOMEM; ++ } + + return 0; +} @@ -166994,26 +181787,32 @@ index 000000000000..e1263d535918 +{ + unsigned int i; + -+ lockdep_assert_held(&queue->kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&queue->lock); + -+ WARN_ON(!cqs_set->nr_objs); -+ WARN_ON(!cqs_set->objs); ++ if (WARN_ON(!cqs_set->objs)) ++ return; + + for (i = 0; i < cqs_set->nr_objs; i++) { + struct kbase_vmap_struct *mapping; -+ u32 *evt = (u32 *)kbase_phy_alloc_mapping_get(queue->kctx, -+ cqs_set->objs[i].addr, &mapping); -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET(kbdev, queue); -+ if (WARN_ON(!evt)) ++ u32 *evt; ++ ++ evt = (u32 *)kbase_phy_alloc_mapping_get( ++ queue->kctx, cqs_set->objs[i].addr, &mapping); ++ ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET(kbdev, queue, evt ? 0 : 1); ++ ++ if (!evt) { ++ dev_warn(kbdev->dev, ++ "Sync memory %llx already freed", cqs_set->objs[i].addr); + queue->has_error = true; -+ else { -+ if (cqs_set->propagate_flags & (1 << i)) -+ evt[BASEP_EVENT_ERR_INDEX] = queue->has_error; -+ else -+ evt[BASEP_EVENT_ERR_INDEX] = false; ++ } else { ++ evt[BASEP_EVENT32_ERR_OFFSET / sizeof(u32)] = queue->has_error; + /* Set to signaled */ -+ evt[BASEP_EVENT_VAL_INDEX]++; ++ evt[BASEP_EVENT32_VAL_OFFSET / sizeof(u32)]++; + kbase_phy_alloc_mapping_put(queue->kctx, mapping); ++ ++ KBASE_KTRACE_ADD_CSF_KCPU(kbdev, KCPU_CQS_SET, queue, cqs_set->objs[i].addr, ++ evt[BASEP_EVENT32_ERR_OFFSET / sizeof(u32)]); + } + } + @@ -167028,13 +181827,16 @@ index 000000000000..e1263d535918 + struct base_kcpu_command_cqs_set_info *cqs_set_info, + struct kbase_kcpu_command *current_command) +{ -+ struct kbase_context *const kctx = kcpu_queue->kctx; + struct base_cqs_set *objs; + unsigned int nr_objs = cqs_set_info->nr_objs; ++ unsigned int i; + -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&kcpu_queue->lock); ++ ++ if (nr_objs > BASEP_KCPU_CQS_MAX_NUM_OBJS) ++ return -EINVAL; + -+ if (cqs_set_info->nr_objs > BASEP_KCPU_CQS_MAX_NUM_OBJS) ++ if (!nr_objs) + return -EINVAL; + + objs = kcalloc(nr_objs, sizeof(*objs), GFP_KERNEL); @@ -167047,16 +181849,350 @@ index 000000000000..e1263d535918 + return -ENOMEM; + } + ++ /* Check the CQS objects as early as possible. By checking their alignment ++ * (required alignment equals to size for Sync32 and Sync64 objects), we can ++ * prevent overrunning the supplied event page. ++ */ ++ for (i = 0; i < nr_objs; i++) { ++ if (!kbase_kcpu_cqs_is_aligned(objs[i].addr, BASEP_CQS_DATA_TYPE_U32)) { ++ kfree(objs); ++ return -EINVAL; ++ } ++ } ++ + current_command->type = BASE_KCPU_COMMAND_TYPE_CQS_SET; + current_command->info.cqs_set.nr_objs = nr_objs; + current_command->info.cqs_set.objs = objs; -+ current_command->info.cqs_set.propagate_flags = -+ cqs_set_info->propagate_flags; + + return 0; +} + -+#ifdef CONFIG_SYNC_FILE ++static void cleanup_cqs_wait_operation(struct kbase_kcpu_command_queue *queue, ++ struct kbase_kcpu_command_cqs_wait_operation_info *cqs_wait_operation) ++{ ++ WARN_ON(!cqs_wait_operation->nr_objs); ++ WARN_ON(!cqs_wait_operation->objs); ++ WARN_ON(!cqs_wait_operation->signaled); ++ WARN_ON(!queue->cqs_wait_count); ++ ++ if (--queue->cqs_wait_count == 0) { ++ kbase_csf_event_wait_remove(queue->kctx, ++ event_cqs_callback, queue); ++ } ++ ++ kfree(cqs_wait_operation->signaled); ++ kfree(cqs_wait_operation->objs); ++ cqs_wait_operation->signaled = NULL; ++ cqs_wait_operation->objs = NULL; ++} ++ ++static int kbase_kcpu_cqs_wait_operation_process(struct kbase_device *kbdev, ++ struct kbase_kcpu_command_queue *queue, ++ struct kbase_kcpu_command_cqs_wait_operation_info *cqs_wait_operation) ++{ ++ u32 i; ++ ++ lockdep_assert_held(&queue->lock); ++ ++ if (WARN_ON(!cqs_wait_operation->objs)) ++ return -EINVAL; ++ ++ /* Skip the CQS waits that have already been signaled when processing */ ++ for (i = find_first_zero_bit(cqs_wait_operation->signaled, cqs_wait_operation->nr_objs); i < cqs_wait_operation->nr_objs; i++) { ++ if (!test_bit(i, cqs_wait_operation->signaled)) { ++ struct kbase_vmap_struct *mapping; ++ bool sig_set; ++ uintptr_t evt = (uintptr_t)kbase_phy_alloc_mapping_get( ++ queue->kctx, cqs_wait_operation->objs[i].addr, &mapping); ++ u64 val = 0; ++ ++ if (!queue->command_started) { ++ queue->command_started = true; ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_OPERATION_START( ++ kbdev, queue); ++ } ++ ++ ++ if (!evt) { ++ dev_warn(kbdev->dev, ++ "Sync memory %llx already freed", cqs_wait_operation->objs[i].addr); ++ queue->has_error = true; ++ return -EINVAL; ++ } ++ ++ switch (cqs_wait_operation->objs[i].data_type) { ++ default: ++ WARN_ON(!kbase_kcpu_cqs_is_data_type_valid( ++ cqs_wait_operation->objs[i].data_type)); ++ kbase_phy_alloc_mapping_put(queue->kctx, mapping); ++ queue->has_error = true; ++ return -EINVAL; ++ case BASEP_CQS_DATA_TYPE_U32: ++ val = *(u32 *)evt; ++ evt += BASEP_EVENT32_ERR_OFFSET - BASEP_EVENT32_VAL_OFFSET; ++ break; ++ case BASEP_CQS_DATA_TYPE_U64: ++ val = *(u64 *)evt; ++ evt += BASEP_EVENT64_ERR_OFFSET - BASEP_EVENT64_VAL_OFFSET; ++ break; ++ } ++ ++ switch (cqs_wait_operation->objs[i].operation) { ++ case BASEP_CQS_WAIT_OPERATION_LE: ++ sig_set = val <= cqs_wait_operation->objs[i].val; ++ break; ++ case BASEP_CQS_WAIT_OPERATION_GT: ++ sig_set = val > cqs_wait_operation->objs[i].val; ++ break; ++ default: ++ dev_dbg(kbdev->dev, ++ "Unsupported CQS wait operation %d", cqs_wait_operation->objs[i].operation); ++ ++ kbase_phy_alloc_mapping_put(queue->kctx, mapping); ++ queue->has_error = true; ++ ++ return -EINVAL; ++ } ++ ++ if (sig_set) { ++ bitmap_set(cqs_wait_operation->signaled, i, 1); ++ if ((cqs_wait_operation->inherit_err_flags & (1U << i)) && ++ *(u32 *)evt > 0) { ++ queue->has_error = true; ++ } ++ ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_OPERATION_END( ++ kbdev, queue, *(u32 *)evt); ++ ++ queue->command_started = false; ++ } ++ ++ kbase_phy_alloc_mapping_put(queue->kctx, mapping); ++ ++ if (!sig_set) ++ break; ++ } ++ } ++ ++ /* For the queue to progress further, all cqs objects should get ++ * signaled. ++ */ ++ return bitmap_full(cqs_wait_operation->signaled, cqs_wait_operation->nr_objs); ++} ++ ++static int kbase_kcpu_cqs_wait_operation_prepare(struct kbase_kcpu_command_queue *queue, ++ struct base_kcpu_command_cqs_wait_operation_info *cqs_wait_operation_info, ++ struct kbase_kcpu_command *current_command) ++{ ++ struct base_cqs_wait_operation_info *objs; ++ unsigned int nr_objs = cqs_wait_operation_info->nr_objs; ++ unsigned int i; ++ ++ lockdep_assert_held(&queue->lock); ++ ++ if (nr_objs > BASEP_KCPU_CQS_MAX_NUM_OBJS) ++ return -EINVAL; ++ ++ if (!nr_objs) ++ return -EINVAL; ++ ++ objs = kcalloc(nr_objs, sizeof(*objs), GFP_KERNEL); ++ if (!objs) ++ return -ENOMEM; ++ ++ if (copy_from_user(objs, u64_to_user_ptr(cqs_wait_operation_info->objs), ++ nr_objs * sizeof(*objs))) { ++ kfree(objs); ++ return -ENOMEM; ++ } ++ ++ /* Check the CQS objects as early as possible. By checking their alignment ++ * (required alignment equals to size for Sync32 and Sync64 objects), we can ++ * prevent overrunning the supplied event page. ++ */ ++ for (i = 0; i < nr_objs; i++) { ++ if (!kbase_kcpu_cqs_is_data_type_valid(objs[i].data_type) || ++ !kbase_kcpu_cqs_is_aligned(objs[i].addr, objs[i].data_type)) { ++ kfree(objs); ++ return -EINVAL; ++ } ++ } ++ ++ if (++queue->cqs_wait_count == 1) { ++ if (kbase_csf_event_wait_add(queue->kctx, ++ event_cqs_callback, queue)) { ++ kfree(objs); ++ queue->cqs_wait_count--; ++ return -ENOMEM; ++ } ++ } ++ ++ current_command->type = BASE_KCPU_COMMAND_TYPE_CQS_WAIT_OPERATION; ++ current_command->info.cqs_wait_operation.nr_objs = nr_objs; ++ current_command->info.cqs_wait_operation.objs = objs; ++ current_command->info.cqs_wait_operation.inherit_err_flags = ++ cqs_wait_operation_info->inherit_err_flags; ++ ++ current_command->info.cqs_wait_operation.signaled = kcalloc(BITS_TO_LONGS(nr_objs), ++ sizeof(*current_command->info.cqs_wait_operation.signaled), GFP_KERNEL); ++ if (!current_command->info.cqs_wait_operation.signaled) { ++ if (--queue->cqs_wait_count == 0) { ++ kbase_csf_event_wait_remove(queue->kctx, ++ event_cqs_callback, queue); ++ } ++ ++ kfree(objs); ++ return -ENOMEM; ++ } ++ ++ return 0; ++} ++ ++static void kbasep_kcpu_cqs_do_set_operation_32(struct kbase_kcpu_command_queue *queue, ++ uintptr_t evt, u8 operation, u64 val) ++{ ++ struct kbase_device *kbdev = queue->kctx->kbdev; ++ ++ switch (operation) { ++ case BASEP_CQS_SET_OPERATION_ADD: ++ *(u32 *)evt += (u32)val; ++ break; ++ case BASEP_CQS_SET_OPERATION_SET: ++ *(u32 *)evt = val; ++ break; ++ default: ++ dev_dbg(kbdev->dev, "Unsupported CQS set operation %d", operation); ++ queue->has_error = true; ++ break; ++ } ++} ++ ++static void kbasep_kcpu_cqs_do_set_operation_64(struct kbase_kcpu_command_queue *queue, ++ uintptr_t evt, u8 operation, u64 val) ++{ ++ struct kbase_device *kbdev = queue->kctx->kbdev; ++ ++ switch (operation) { ++ case BASEP_CQS_SET_OPERATION_ADD: ++ *(u64 *)evt += val; ++ break; ++ case BASEP_CQS_SET_OPERATION_SET: ++ *(u64 *)evt = val; ++ break; ++ default: ++ dev_dbg(kbdev->dev, "Unsupported CQS set operation %d", operation); ++ queue->has_error = true; ++ break; ++ } ++} ++ ++static void kbase_kcpu_cqs_set_operation_process( ++ struct kbase_device *kbdev, ++ struct kbase_kcpu_command_queue *queue, ++ struct kbase_kcpu_command_cqs_set_operation_info *cqs_set_operation) ++{ ++ unsigned int i; ++ ++ lockdep_assert_held(&queue->lock); ++ ++ if (WARN_ON(!cqs_set_operation->objs)) ++ return; ++ ++ for (i = 0; i < cqs_set_operation->nr_objs; i++) { ++ struct kbase_vmap_struct *mapping; ++ uintptr_t evt; ++ ++ evt = (uintptr_t)kbase_phy_alloc_mapping_get( ++ queue->kctx, cqs_set_operation->objs[i].addr, &mapping); ++ ++ if (!evt) { ++ dev_warn(kbdev->dev, ++ "Sync memory %llx already freed", cqs_set_operation->objs[i].addr); ++ queue->has_error = true; ++ } else { ++ struct base_cqs_set_operation_info *obj = &cqs_set_operation->objs[i]; ++ ++ switch (obj->data_type) { ++ default: ++ WARN_ON(!kbase_kcpu_cqs_is_data_type_valid(obj->data_type)); ++ queue->has_error = true; ++ goto skip_err_propagation; ++ case BASEP_CQS_DATA_TYPE_U32: ++ kbasep_kcpu_cqs_do_set_operation_32(queue, evt, obj->operation, ++ obj->val); ++ evt += BASEP_EVENT32_ERR_OFFSET - BASEP_EVENT32_VAL_OFFSET; ++ break; ++ case BASEP_CQS_DATA_TYPE_U64: ++ kbasep_kcpu_cqs_do_set_operation_64(queue, evt, obj->operation, ++ obj->val); ++ evt += BASEP_EVENT64_ERR_OFFSET - BASEP_EVENT64_VAL_OFFSET; ++ break; ++ } ++ ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET_OPERATION( ++ kbdev, queue, *(u32 *)evt ? 1 : 0); ++ ++ /* Always propagate errors */ ++ *(u32 *)evt = queue->has_error; ++ ++skip_err_propagation: ++ kbase_phy_alloc_mapping_put(queue->kctx, mapping); ++ } ++ } ++ ++ kbase_csf_event_signal_notify_gpu(queue->kctx); ++ ++ kfree(cqs_set_operation->objs); ++ cqs_set_operation->objs = NULL; ++} ++ ++static int kbase_kcpu_cqs_set_operation_prepare( ++ struct kbase_kcpu_command_queue *kcpu_queue, ++ struct base_kcpu_command_cqs_set_operation_info *cqs_set_operation_info, ++ struct kbase_kcpu_command *current_command) ++{ ++ struct base_cqs_set_operation_info *objs; ++ unsigned int nr_objs = cqs_set_operation_info->nr_objs; ++ unsigned int i; ++ ++ lockdep_assert_held(&kcpu_queue->lock); ++ ++ if (nr_objs > BASEP_KCPU_CQS_MAX_NUM_OBJS) ++ return -EINVAL; ++ ++ if (!nr_objs) ++ return -EINVAL; ++ ++ objs = kcalloc(nr_objs, sizeof(*objs), GFP_KERNEL); ++ if (!objs) ++ return -ENOMEM; ++ ++ if (copy_from_user(objs, u64_to_user_ptr(cqs_set_operation_info->objs), ++ nr_objs * sizeof(*objs))) { ++ kfree(objs); ++ return -ENOMEM; ++ } ++ ++ /* Check the CQS objects as early as possible. By checking their alignment ++ * (required alignment equals to size for Sync32 and Sync64 objects), we can ++ * prevent overrunning the supplied event page. ++ */ ++ for (i = 0; i < nr_objs; i++) { ++ if (!kbase_kcpu_cqs_is_data_type_valid(objs[i].data_type) || ++ !kbase_kcpu_cqs_is_aligned(objs[i].addr, objs[i].data_type)) { ++ kfree(objs); ++ return -EINVAL; ++ } ++ } ++ ++ current_command->type = BASE_KCPU_COMMAND_TYPE_CQS_SET_OPERATION; ++ current_command->info.cqs_set_operation.nr_objs = nr_objs; ++ current_command->info.cqs_set_operation.objs = objs; ++ ++ return 0; ++} ++ ++#if IS_ENABLED(CONFIG_SYNC_FILE) +#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) +static void kbase_csf_fence_wait_callback(struct fence *fence, + struct fence_cb *cb) @@ -167070,24 +182206,42 @@ index 000000000000..e1263d535918 + struct kbase_kcpu_command_queue *kcpu_queue = fence_info->kcpu_queue; + struct kbase_context *const kctx = kcpu_queue->kctx; + ++#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG ++ /* Fence gets signaled. Deactivate the timer for fence-wait timeout */ ++ del_timer(&kcpu_queue->fence_timeout); ++#endif ++ KBASE_KTRACE_ADD_CSF_KCPU(kctx->kbdev, KCPU_FENCE_WAIT_END, kcpu_queue, ++ fence->context, fence->seqno); ++ + /* Resume kcpu command queue processing. */ -+ queue_work(kctx->csf.kcpu_queues.wq, &kcpu_queue->work); ++ queue_work(kcpu_queue->wq, &kcpu_queue->work); +} + -+static void kbase_kcpu_fence_wait_cancel( -+ struct kbase_kcpu_command_queue *kcpu_queue, -+ struct kbase_kcpu_command_fence_info *fence_info) ++static void kbasep_kcpu_fence_wait_cancel(struct kbase_kcpu_command_queue *kcpu_queue, ++ struct kbase_kcpu_command_fence_info *fence_info) +{ + struct kbase_context *const kctx = kcpu_queue->kctx; + -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&kcpu_queue->lock); + + if (WARN_ON(!fence_info->fence)) + return; + + if (kcpu_queue->fence_wait_processed) { -+ dma_fence_remove_callback(fence_info->fence, ++ bool removed = dma_fence_remove_callback(fence_info->fence, + &fence_info->fence_cb); ++ ++#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG ++ /* Fence-wait cancelled or fence signaled. In the latter case ++ * the timer would already have been deactivated inside ++ * kbase_csf_fence_wait_callback(). ++ */ ++ del_timer_sync(&kcpu_queue->fence_timeout); ++#endif ++ if (removed) ++ KBASE_KTRACE_ADD_CSF_KCPU(kctx->kbdev, KCPU_FENCE_WAIT_END, ++ kcpu_queue, fence_info->fence->context, ++ fence_info->fence->seqno); + } + + /* Release the reference which is kept by the kcpu_queue */ @@ -167097,6 +182251,80 @@ index 000000000000..e1263d535918 + fence_info->fence = NULL; +} + ++#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG ++/** ++ * fence_timeout_callback() - Timeout callback function for fence-wait ++ * ++ * @timer: Timer struct ++ * ++ * Context and seqno of the timed-out fence will be displayed in dmesg. ++ * If the fence has been signalled a work will be enqueued to process ++ * the fence-wait without displaying debugging information. ++ */ ++static void fence_timeout_callback(struct timer_list *timer) ++{ ++ struct kbase_kcpu_command_queue *kcpu_queue = ++ container_of(timer, struct kbase_kcpu_command_queue, fence_timeout); ++ struct kbase_context *const kctx = kcpu_queue->kctx; ++ struct kbase_kcpu_command *cmd = &kcpu_queue->commands[kcpu_queue->start_offset]; ++ struct kbase_kcpu_command_fence_info *fence_info; ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++ struct fence *fence; ++#else ++ struct dma_fence *fence; ++#endif ++ struct kbase_sync_fence_info info; ++ ++ if (cmd->type != BASE_KCPU_COMMAND_TYPE_FENCE_WAIT) { ++ dev_err(kctx->kbdev->dev, ++ "%s: Unexpected command type %d in ctx:%d_%d kcpu queue:%u", __func__, ++ cmd->type, kctx->tgid, kctx->id, kcpu_queue->id); ++ return; ++ } ++ ++ fence_info = &cmd->info.fence; ++ ++ fence = kbase_fence_get(fence_info); ++ if (!fence) { ++ dev_err(kctx->kbdev->dev, "no fence found in ctx:%d_%d kcpu queue:%u", kctx->tgid, ++ kctx->id, kcpu_queue->id); ++ return; ++ } ++ ++ kbase_sync_fence_info_get(fence, &info); ++ ++ if (info.status == 1) { ++ queue_work(kcpu_queue->wq, &kcpu_queue->work); ++ } else if (info.status == 0) { ++ dev_warn(kctx->kbdev->dev, "fence has not yet signalled in %ums", ++ FENCE_WAIT_TIMEOUT_MS); ++ dev_warn(kctx->kbdev->dev, ++ "ctx:%d_%d kcpu queue:%u still waiting for fence[%pK] context#seqno:%s", ++ kctx->tgid, kctx->id, kcpu_queue->id, fence, info.name); ++ } else { ++ dev_warn(kctx->kbdev->dev, "fence has got error"); ++ dev_warn(kctx->kbdev->dev, ++ "ctx:%d_%d kcpu queue:%u faulty fence[%pK] context#seqno:%s error(%d)", ++ kctx->tgid, kctx->id, kcpu_queue->id, fence, info.name, info.status); ++ } ++ ++ kbase_fence_put(fence); ++} ++ ++/** ++ * fence_timeout_start() - Start a timer to check fence-wait timeout ++ * ++ * @cmd: KCPU command queue ++ * ++ * Activate a timer to check whether a fence-wait command in the queue ++ * gets completed within FENCE_WAIT_TIMEOUT_MS ++ */ ++static void fence_timeout_start(struct kbase_kcpu_command_queue *cmd) ++{ ++ mod_timer(&cmd->fence_timeout, jiffies + msecs_to_jiffies(FENCE_WAIT_TIMEOUT_MS)); ++} ++#endif ++ +/** + * kbase_kcpu_fence_wait_process() - Process the kcpu fence wait command + * @@ -167116,8 +182344,9 @@ index 000000000000..e1263d535918 +#else + struct dma_fence *fence; +#endif ++ struct kbase_context *const kctx = kcpu_queue->kctx; + -+ lockdep_assert_held(&kcpu_queue->kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&kcpu_queue->lock); + + if (WARN_ON(!fence_info->fence)) + return -EINVAL; @@ -167131,11 +182360,26 @@ index 000000000000..e1263d535918 + &fence_info->fence_cb, + kbase_csf_fence_wait_callback); + ++ KBASE_KTRACE_ADD_CSF_KCPU(kctx->kbdev, ++ KCPU_FENCE_WAIT_START, kcpu_queue, ++ fence->context, fence->seqno); + fence_status = cb_err; -+ if (cb_err == 0) ++ if (cb_err == 0) { + kcpu_queue->fence_wait_processed = true; -+ else if (cb_err == -ENOENT) ++#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG ++ fence_timeout_start(kcpu_queue); ++#endif ++ } else if (cb_err == -ENOENT) { + fence_status = dma_fence_get_status(fence); ++ if (!fence_status) { ++ struct kbase_sync_fence_info info; ++ ++ kbase_sync_fence_info_get(fence, &info); ++ dev_warn(kctx->kbdev->dev, ++ "Unexpected status for fence %s of ctx:%d_%d kcpu queue:%u", ++ info.name, kctx->tgid, kctx->id, kcpu_queue->id); ++ } ++ } + } + + /* @@ -167148,17 +182392,15 @@ index 000000000000..e1263d535918 + */ + + if (fence_status) -+ kbase_kcpu_fence_wait_cancel(kcpu_queue, fence_info); ++ kbasep_kcpu_fence_wait_cancel(kcpu_queue, fence_info); + + return fence_status; +} + -+static int kbase_kcpu_fence_wait_prepare( -+ struct kbase_kcpu_command_queue *kcpu_queue, -+ struct base_kcpu_command_fence_info *fence_info, -+ struct kbase_kcpu_command *current_command) ++static int kbase_kcpu_fence_wait_prepare(struct kbase_kcpu_command_queue *kcpu_queue, ++ struct base_kcpu_command_fence_info *fence_info, ++ struct kbase_kcpu_command *current_command) +{ -+ struct kbase_context *const kctx = kcpu_queue->kctx; +#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) + struct fence *fence_in; +#else @@ -167166,10 +182408,9 @@ index 000000000000..e1263d535918 +#endif + struct base_fence fence; + -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&kcpu_queue->lock); + -+ if (copy_from_user(&fence, u64_to_user_ptr(fence_info->fence), -+ sizeof(fence))) ++ if (copy_from_user(&fence, u64_to_user_ptr(fence_info->fence), sizeof(fence))) + return -ENOMEM; + + fence_in = sync_file_get_fence(fence.basep.fd); @@ -167180,13 +182421,11 @@ index 000000000000..e1263d535918 + current_command->type = BASE_KCPU_COMMAND_TYPE_FENCE_WAIT; + current_command->info.fence.fence = fence_in; + current_command->info.fence.kcpu_queue = kcpu_queue; -+ + return 0; +} + -+static int kbase_kcpu_fence_signal_process( -+ struct kbase_kcpu_command_queue *kcpu_queue, -+ struct kbase_kcpu_command_fence_info *fence_info) ++static int kbasep_kcpu_fence_signal_process(struct kbase_kcpu_command_queue *kcpu_queue, ++ struct kbase_kcpu_command_fence_info *fence_info) +{ + struct kbase_context *const kctx = kcpu_queue->kctx; + int ret; @@ -167197,42 +182436,51 @@ index 000000000000..e1263d535918 + ret = dma_fence_signal(fence_info->fence); + + if (unlikely(ret < 0)) { -+ dev_warn(kctx->kbdev->dev, -+ "fence_signal() failed with %d\n", ret); ++ dev_warn(kctx->kbdev->dev, "dma_fence(%d) has been signalled already\n", ret); ++ /* Treated as a success */ ++ ret = 0; + } + -+ dma_fence_put(fence_info->fence); ++ KBASE_KTRACE_ADD_CSF_KCPU(kctx->kbdev, KCPU_FENCE_SIGNAL, kcpu_queue, ++ fence_info->fence->context, ++ fence_info->fence->seqno); ++ ++ /* dma_fence refcount needs to be decreased to release it. */ ++ kbase_fence_put(fence_info->fence); + fence_info->fence = NULL; + + return ret; +} + -+static int kbase_kcpu_fence_signal_prepare( -+ struct kbase_kcpu_command_queue *kcpu_queue, -+ struct base_kcpu_command_fence_info *fence_info, -+ struct kbase_kcpu_command *current_command) ++static int kbasep_kcpu_fence_signal_init(struct kbase_kcpu_command_queue *kcpu_queue, ++ struct kbase_kcpu_command *current_command, ++ struct base_fence *fence, struct sync_file **sync_file, ++ int *fd) +{ -+ struct kbase_context *const kctx = kcpu_queue->kctx; +#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) + struct fence *fence_out; +#else + struct dma_fence *fence_out; +#endif -+ struct base_fence fence; -+ struct sync_file *sync_file; ++ struct kbase_kcpu_dma_fence *kcpu_fence; + int ret = 0; -+ int fd; + -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&kcpu_queue->lock); + -+ if (copy_from_user(&fence, u64_to_user_ptr(fence_info->fence), -+ sizeof(fence))) -+ return -EFAULT; -+ -+ fence_out = kzalloc(sizeof(*fence_out), GFP_KERNEL); -+ if (!fence_out) ++ kcpu_fence = kzalloc(sizeof(*kcpu_fence), GFP_KERNEL); ++ if (!kcpu_fence) + return -ENOMEM; + ++ /* Set reference to KCPU metadata and increment refcount */ ++ kcpu_fence->metadata = kcpu_queue->metadata; ++ WARN_ON(!kbase_refcount_inc_not_zero(&kcpu_fence->metadata->refcount)); ++ ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++ fence_out = (struct fence *)kcpu_fence; ++#else ++ fence_out = (struct dma_fence *)kcpu_fence; ++#endif ++ + dma_fence_init(fence_out, + &kbase_fence_ops, + &kbase_csf_fence_lock, @@ -167249,43 +182497,98 @@ index 000000000000..e1263d535918 +#endif + + /* create a sync_file fd representing the fence */ -+ sync_file = sync_file_create(fence_out); -+ if (!sync_file) { -+#if (KERNEL_VERSION(4, 9, 67) >= LINUX_VERSION_CODE) -+ dma_fence_put(fence_out); -+#endif ++ *sync_file = sync_file_create(fence_out); ++ if (!(*sync_file)) { + ret = -ENOMEM; + goto file_create_fail; + } + -+ fd = get_unused_fd_flags(O_CLOEXEC); -+ if (fd < 0) { -+ ret = fd; ++ *fd = get_unused_fd_flags(O_CLOEXEC); ++ if (*fd < 0) { ++ ret = *fd; + goto fd_flags_fail; + } + -+ fd_install(fd, sync_file->file); -+ -+ fence.basep.fd = fd; ++ fence->basep.fd = *fd; + + current_command->type = BASE_KCPU_COMMAND_TYPE_FENCE_SIGNAL; + current_command->info.fence.fence = fence_out; + ++ return 0; ++ ++fd_flags_fail: ++ fput((*sync_file)->file); ++file_create_fail: ++ /* ++ * Upon failure, dma_fence refcount that was increased by ++ * dma_fence_get() or sync_file_create() needs to be decreased ++ * to release it. ++ */ ++ kbase_fence_put(fence_out); ++ current_command->info.fence.fence = NULL; ++ ++ return ret; ++} ++ ++static int kbase_kcpu_fence_signal_prepare(struct kbase_kcpu_command_queue *kcpu_queue, ++ struct base_kcpu_command_fence_info *fence_info, ++ struct kbase_kcpu_command *current_command) ++{ ++ struct base_fence fence; ++ struct sync_file *sync_file = NULL; ++ int fd; ++ int ret = 0; ++ ++ lockdep_assert_held(&kcpu_queue->lock); ++ ++ if (copy_from_user(&fence, u64_to_user_ptr(fence_info->fence), sizeof(fence))) ++ return -EFAULT; ++ ++ ret = kbasep_kcpu_fence_signal_init(kcpu_queue, current_command, &fence, &sync_file, &fd); ++ if (ret) ++ return ret; ++ + if (copy_to_user(u64_to_user_ptr(fence_info->fence), &fence, + sizeof(fence))) { + ret = -EFAULT; -+ goto fd_flags_fail; ++ goto fail; + } + ++ /* 'sync_file' pointer can't be safely dereferenced once 'fd' is ++ * installed, so the install step needs to be done at the last ++ * before returning success. ++ */ ++ fd_install(fd, sync_file->file); + return 0; + -+fd_flags_fail: ++fail: + fput(sync_file->file); -+file_create_fail: -+ dma_fence_put(fence_out); ++ kbase_fence_put(current_command->info.fence.fence); ++ current_command->info.fence.fence = NULL; + + return ret; +} ++ ++int kbase_kcpu_fence_signal_process(struct kbase_kcpu_command_queue *kcpu_queue, ++ struct kbase_kcpu_command_fence_info *fence_info) ++{ ++ if (!kcpu_queue || !fence_info) ++ return -EINVAL; ++ ++ return kbasep_kcpu_fence_signal_process(kcpu_queue, fence_info); ++} ++KBASE_EXPORT_TEST_API(kbase_kcpu_fence_signal_process); ++ ++int kbase_kcpu_fence_signal_init(struct kbase_kcpu_command_queue *kcpu_queue, ++ struct kbase_kcpu_command *current_command, ++ struct base_fence *fence, struct sync_file **sync_file, int *fd) ++{ ++ if (!kcpu_queue || !current_command || !fence || !sync_file || !fd) ++ return -EINVAL; ++ ++ return kbasep_kcpu_fence_signal_init(kcpu_queue, current_command, fence, sync_file, fd); ++} ++KBASE_EXPORT_TEST_API(kbase_kcpu_fence_signal_init); +#endif /* CONFIG_SYNC_FILE */ + +static void kcpu_queue_process_worker(struct work_struct *data) @@ -167293,11 +182596,9 @@ index 000000000000..e1263d535918 + struct kbase_kcpu_command_queue *queue = container_of(data, + struct kbase_kcpu_command_queue, work); + -+ mutex_lock(&queue->kctx->csf.kcpu_queues.lock); -+ ++ mutex_lock(&queue->lock); + kcpu_queue_process(queue, false); -+ -+ mutex_unlock(&queue->kctx->csf.kcpu_queues.lock); ++ mutex_unlock(&queue->lock); +} + +static int delete_queue(struct kbase_context *kctx, u32 id) @@ -167310,6 +182611,23 @@ index 000000000000..e1263d535918 + struct kbase_kcpu_command_queue *queue = + kctx->csf.kcpu_queues.array[id]; + ++ KBASE_KTRACE_ADD_CSF_KCPU(kctx->kbdev, KCPU_QUEUE_DELETE, ++ queue, queue->num_pending_cmds, queue->cqs_wait_count); ++ ++ /* Disassociate the queue from the system to prevent further ++ * submissions. Draining pending commands would be acceptable ++ * even if a new queue is created using the same ID. ++ */ ++ kctx->csf.kcpu_queues.array[id] = NULL; ++ bitmap_clear(kctx->csf.kcpu_queues.in_use, id, 1); ++ ++ mutex_unlock(&kctx->csf.kcpu_queues.lock); ++ ++ mutex_lock(&queue->lock); ++ ++ /* Metadata struct may outlive KCPU queue. */ ++ kbase_kcpu_dma_fence_meta_put(queue->metadata); ++ + /* Drain the remaining work for this queue first and go past + * all the waits. + */ @@ -167321,22 +182639,22 @@ index 000000000000..e1263d535918 + /* All CQS wait commands should have been cleaned up */ + WARN_ON(queue->cqs_wait_count); + -+ kctx->csf.kcpu_queues.array[id] = NULL; -+ bitmap_clear(kctx->csf.kcpu_queues.in_use, id, 1); -+ + /* Fire the tracepoint with the mutex held to enforce correct + * ordering with the summary stream. + */ + KBASE_TLSTREAM_TL_KBASE_DEL_KCPUQUEUE(kctx->kbdev, queue); + -+ mutex_unlock(&kctx->csf.kcpu_queues.lock); ++ mutex_unlock(&queue->lock); + + cancel_work_sync(&queue->work); ++ destroy_workqueue(queue->wq); ++ ++ mutex_destroy(&queue->lock); + + kfree(queue); + } else { -+ dev_warn(kctx->kbdev->dev, -+ "Attempt to delete a non-existent KCPU queue\n"); ++ dev_dbg(kctx->kbdev->dev, ++ "Attempt to delete a non-existent KCPU queue"); + mutex_unlock(&kctx->csf.kcpu_queues.lock); + err = -EINVAL; + } @@ -167347,20 +182665,19 @@ index 000000000000..e1263d535918 + struct kbase_device *kbdev, + const struct kbase_kcpu_command_queue *queue, + const struct kbase_kcpu_command_jit_alloc_info *jit_alloc, -+ bool alloc_success) ++ int alloc_status) +{ + u8 i; + -+ KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_EXECUTE_JIT_ALLOC_END( -+ kbdev, queue); ++ KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_EXECUTE_JIT_ALLOC_END(kbdev, queue); + for (i = 0; i < jit_alloc->count; i++) { + const u8 id = jit_alloc->info[i].id; + const struct kbase_va_region *reg = queue->kctx->jit_alloc[id]; + u64 gpu_alloc_addr = 0; + u64 mmu_flags = 0; + -+ if (alloc_success && !WARN_ON(!reg) && -+ !WARN_ON(reg == KBASE_RESERVED_REG_JIT_ALLOC)) { ++ if ((alloc_status == 0) && !WARN_ON(!reg) && ++ !WARN_ON(reg == KBASE_RESERVED_REG_JIT_ALLOC)) { +#ifdef CONFIG_MALI_VECTOR_DUMP + struct tagged_addr phy = {0}; +#endif /* CONFIG_MALI_VECTOR_DUMP */ @@ -167374,7 +182691,7 @@ index 000000000000..e1263d535918 +#endif /* CONFIG_MALI_VECTOR_DUMP */ + } + KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_ALLOC_END( -+ kbdev, queue, gpu_alloc_addr, mmu_flags); ++ kbdev, queue, alloc_status, gpu_alloc_addr, mmu_flags); + } +} + @@ -167382,50 +182699,24 @@ index 000000000000..e1263d535918 + struct kbase_device *kbdev, + const struct kbase_kcpu_command_queue *queue) +{ -+ KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_ALLOC_END( -+ kbdev, queue); -+} -+ -+static void KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_FREE_INFO( -+ struct kbase_device *kbdev, -+ const struct kbase_kcpu_command_queue *queue, -+ const struct kbase_kcpu_command_jit_free_info *jit_free) -+{ -+ u8 i; -+ -+ KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_EXECUTE_JIT_FREE_END( -+ kbdev, queue); -+ for (i = 0; i < jit_free->count; i++) { -+ const u8 id = jit_free->ids[i]; -+ u64 pages_used = 0; -+ -+ if (id != 0) { -+ const struct kbase_va_region *reg = -+ queue->kctx->jit_alloc[id]; -+ if (reg && (reg != KBASE_RESERVED_REG_JIT_ALLOC)) -+ pages_used = reg->gpu_alloc->nents; -+ } -+ KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_FREE_END( -+ kbdev, queue, pages_used); -+ } ++ KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_ALLOC_END(kbdev, queue); +} + +static void KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_FREE_END( + struct kbase_device *kbdev, + const struct kbase_kcpu_command_queue *queue) +{ -+ KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_FREE_END( -+ kbdev, queue); ++ KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_FREE_END(kbdev, queue); +} + +static void kcpu_queue_process(struct kbase_kcpu_command_queue *queue, -+ bool ignore_waits) ++ bool drain_queue) +{ + struct kbase_device *kbdev = queue->kctx->kbdev; + bool process_next = true; + size_t i; + -+ lockdep_assert_held(&queue->kctx->csf.kcpu_queues.lock); ++ lockdep_assert_held(&queue->lock); + + for (i = 0; i != queue->num_pending_cmds; ++i) { + struct kbase_kcpu_command *cmd = @@ -167435,18 +182726,15 @@ index 000000000000..e1263d535918 + switch (cmd->type) { + case BASE_KCPU_COMMAND_TYPE_FENCE_WAIT: + if (!queue->command_started) { -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_START( -+ kbdev, queue); ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_START(kbdev, ++ queue); + queue->command_started = true; + } + -+#ifdef CONFIG_SYNC_FILE + status = 0; -+ -+ -+ if (ignore_waits) { -+ kbase_kcpu_fence_wait_cancel(queue, -+ &cmd->info.fence); ++#if IS_ENABLED(CONFIG_SYNC_FILE) ++ if (drain_queue) { ++ kbasep_kcpu_fence_wait_cancel(queue, &cmd->info.fence); + } else { + status = kbase_kcpu_fence_wait_process(queue, + &cmd->info.fence); @@ -167459,34 +182747,43 @@ index 000000000000..e1263d535918 +#else + dev_warn(kbdev->dev, + "unexpected fence wait command found\n"); ++ ++ status = -EINVAL; ++ queue->has_error = true; +#endif + + if (process_next) { + KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_END( -+ kbdev, queue); ++ kbdev, queue, status < 0 ? status : 0); + queue->command_started = false; + } + break; + case BASE_KCPU_COMMAND_TYPE_FENCE_SIGNAL: -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_START( -+ kbdev, queue); ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_START(kbdev, queue); + -+#ifdef CONFIG_SYNC_FILE -+ kbase_kcpu_fence_signal_process(queue, -+ &cmd->info.fence); ++ status = 0; ++ ++#if IS_ENABLED(CONFIG_SYNC_FILE) ++ status = kbasep_kcpu_fence_signal_process(queue, &cmd->info.fence); ++ ++ if (status < 0) ++ queue->has_error = true; +#else + dev_warn(kbdev->dev, + "unexpected fence signal command found\n"); ++ ++ status = -EINVAL; ++ queue->has_error = true; +#endif + -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_END( -+ kbdev, queue); ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_END(kbdev, queue, ++ status); + break; + case BASE_KCPU_COMMAND_TYPE_CQS_WAIT: + status = kbase_kcpu_cqs_wait_process(kbdev, queue, + &cmd->info.cqs_wait); + -+ if (!status && !ignore_waits) { ++ if (!status && !drain_queue) { + process_next = false; + } else { + /* Either all CQS objects were signaled or @@ -167503,97 +182800,180 @@ index 000000000000..e1263d535918 + kbase_kcpu_cqs_set_process(kbdev, queue, + &cmd->info.cqs_set); + -+ /* CQS sets are only traced before execution */ ++ break; ++ case BASE_KCPU_COMMAND_TYPE_CQS_WAIT_OPERATION: ++ status = kbase_kcpu_cqs_wait_operation_process(kbdev, queue, ++ &cmd->info.cqs_wait_operation); ++ ++ if (!status && !drain_queue) { ++ process_next = false; ++ } else { ++ /* Either all CQS objects were signaled or ++ * there was an error or the queue itself is ++ * being deleted. ++ * In all cases can move to the next command. ++ * TBD: handle the error ++ */ ++ cleanup_cqs_wait_operation(queue, &cmd->info.cqs_wait_operation); ++ } ++ ++ break; ++ case BASE_KCPU_COMMAND_TYPE_CQS_SET_OPERATION: ++ kbase_kcpu_cqs_set_operation_process(kbdev, queue, ++ &cmd->info.cqs_set_operation); ++ + break; + case BASE_KCPU_COMMAND_TYPE_ERROR_BARRIER: + /* Clear the queue's error state */ + queue->has_error = false; ++ ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_ERROR_BARRIER(kbdev, queue); + break; -+ case BASE_KCPU_COMMAND_TYPE_MAP_IMPORT: -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_START( -+ kbdev, queue); ++ case BASE_KCPU_COMMAND_TYPE_MAP_IMPORT: { ++ struct kbase_ctx_ext_res_meta *meta = NULL; + -+ kbase_gpu_vm_lock(queue->kctx); -+ kbase_sticky_resource_acquire(queue->kctx, -+ cmd->info.import.gpu_va); -+ kbase_gpu_vm_unlock(queue->kctx); ++ if (!drain_queue) { ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_START(kbdev, ++ queue); + -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_END( -+ kbdev, queue); ++ kbase_gpu_vm_lock(queue->kctx); ++ meta = kbase_sticky_resource_acquire( ++ queue->kctx, cmd->info.import.gpu_va); ++ kbase_gpu_vm_unlock(queue->kctx); ++ ++ if (meta == NULL) { ++ queue->has_error = true; ++ dev_dbg( ++ kbdev->dev, ++ "failed to map an external resource"); ++ } ++ ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_END( ++ kbdev, queue, meta ? 0 : 1); ++ } + break; -+ case BASE_KCPU_COMMAND_TYPE_UNMAP_IMPORT: -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_START( -+ kbdev, queue); ++ } ++ case BASE_KCPU_COMMAND_TYPE_UNMAP_IMPORT: { ++ bool ret; ++ ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_START(kbdev, queue); + + kbase_gpu_vm_lock(queue->kctx); -+ kbase_sticky_resource_release(queue->kctx, NULL, -+ cmd->info.import.gpu_va); ++ ret = kbase_sticky_resource_release( ++ queue->kctx, NULL, cmd->info.import.gpu_va); + kbase_gpu_vm_unlock(queue->kctx); + -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_END( -+ kbdev, queue); ++ if (!ret) { ++ queue->has_error = true; ++ dev_dbg(kbdev->dev, ++ "failed to release the reference. resource not found"); ++ } ++ ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_END(kbdev, queue, ++ ret ? 0 : 1); + break; -+ case BASE_KCPU_COMMAND_TYPE_UNMAP_IMPORT_FORCE: -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_FORCE_START( -+ kbdev, queue); ++ } ++ case BASE_KCPU_COMMAND_TYPE_UNMAP_IMPORT_FORCE: { ++ bool ret; ++ ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_FORCE_START(kbdev, ++ queue); + + kbase_gpu_vm_lock(queue->kctx); -+ kbase_sticky_resource_release_force(queue->kctx, NULL, -+ cmd->info.import.gpu_va); ++ ret = kbase_sticky_resource_release_force( ++ queue->kctx, NULL, cmd->info.import.gpu_va); + kbase_gpu_vm_unlock(queue->kctx); + ++ if (!ret) { ++ queue->has_error = true; ++ dev_dbg(kbdev->dev, ++ "failed to release the reference. resource not found"); ++ } ++ + KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_FORCE_END( -+ kbdev, queue); ++ kbdev, queue, ret ? 0 : 1); + break; ++ } + case BASE_KCPU_COMMAND_TYPE_JIT_ALLOC: + { -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_ALLOC_START( -+ kbdev, queue); -+ -+ status = kbase_kcpu_jit_allocate_process(queue, cmd); -+ if (status == -EAGAIN) { -+ process_next = false; ++ if (drain_queue) { ++ /* We still need to call this function to clean the JIT alloc info up */ ++ kbase_kcpu_jit_allocate_finish(queue, cmd); + } else { -+ if (status != 0) -+ queue->has_error = true; ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_ALLOC_START(kbdev, ++ queue); ++ ++ status = kbase_kcpu_jit_allocate_process(queue, ++ cmd); ++ if (status == -EAGAIN) { ++ process_next = false; ++ } else { ++ if (status != 0) ++ queue->has_error = true; + -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_ALLOC_INFO( -+ kbdev, queue, &cmd->info.jit_alloc, (status == 0)); ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_ALLOC_INFO( ++ kbdev, queue, ++ &cmd->info.jit_alloc, status); + -+ kbase_kcpu_jit_allocate_finish(queue, cmd); -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_ALLOC_END( ++ kbase_kcpu_jit_allocate_finish(queue, ++ cmd); ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_ALLOC_END( + kbdev, queue); ++ } + } ++ + break; + } -+ case BASE_KCPU_COMMAND_TYPE_JIT_FREE: -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_FREE_START( -+ kbdev, queue); ++ case BASE_KCPU_COMMAND_TYPE_JIT_FREE: { ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_FREE_START(kbdev, queue); + -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_FREE_INFO( -+ kbdev, queue, &cmd->info.jit_free); -+ -+ status = kbase_kcpu_jit_free_process(queue->kctx, cmd); ++ status = kbase_kcpu_jit_free_process(queue, cmd); + if (status) + queue->has_error = true; + + KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_FREE_END( + kbdev, queue); + break; -+ case BASE_KCPU_COMMAND_TYPE_GROUP_SUSPEND: -+ status = kbase_csf_queue_group_suspend_process( -+ queue->kctx, -+ cmd->info.suspend_buf_copy.sus_buf, ++ } ++#if IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST ++ case BASE_KCPU_COMMAND_TYPE_GROUP_SUSPEND: { ++ struct kbase_suspend_copy_buffer *sus_buf = ++ cmd->info.suspend_buf_copy.sus_buf; ++ ++ if (!drain_queue) { ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_GROUP_SUSPEND_START( ++ kbdev, queue); ++ ++ status = kbase_csf_queue_group_suspend_process( ++ queue->kctx, sus_buf, + cmd->info.suspend_buf_copy.group_handle); -+ if (status) -+ queue->has_error = true; ++ if (status) ++ queue->has_error = true; ++ ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_GROUP_SUSPEND_END( ++ kbdev, queue, status); ++ } ++ ++ if (!sus_buf->cpu_alloc) { ++ int i; ++ ++ for (i = 0; i < sus_buf->nr_pages; i++) ++ put_page(sus_buf->pages[i]); ++ } else { ++ kbase_mem_phy_alloc_kernel_unmapped( ++ sus_buf->cpu_alloc); ++ kbase_mem_phy_alloc_put( ++ sus_buf->cpu_alloc); ++ } + -+ kfree(cmd->info.suspend_buf_copy.sus_buf->pages); -+ kfree(cmd->info.suspend_buf_copy.sus_buf); ++ kfree(sus_buf->pages); ++ kfree(sus_buf); + break; ++ } ++#endif + default: -+ dev_warn(kbdev->dev, -+ "Unrecognized command type\n"); ++ dev_dbg(kbdev->dev, ++ "Unrecognized command type"); + break; + } /* switch */ + @@ -167631,21 +183011,24 @@ index 000000000000..e1263d535918 + + switch (cmd->type) { + case BASE_KCPU_COMMAND_TYPE_FENCE_WAIT: -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_FENCE_WAIT( -+ kbdev, queue, cmd->info.fence.fence); ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_FENCE_WAIT(kbdev, queue, ++ cmd->info.fence.fence); + break; + case BASE_KCPU_COMMAND_TYPE_FENCE_SIGNAL: -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_FENCE_SIGNAL( -+ kbdev, queue, cmd->info.fence.fence); ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_FENCE_SIGNAL(kbdev, queue, ++ cmd->info.fence.fence); + break; + case BASE_KCPU_COMMAND_TYPE_CQS_WAIT: + { -+ const struct base_cqs_wait *waits = cmd->info.cqs_wait.objs; ++ const struct base_cqs_wait_info *waits = ++ cmd->info.cqs_wait.objs; ++ u32 inherit_err_flags = cmd->info.cqs_wait.inherit_err_flags; + unsigned int i; + + for (i = 0; i < cmd->info.cqs_wait.nr_objs; i++) { + KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT( -+ kbdev, queue, waits[i].addr, waits[i].val); ++ kbdev, queue, waits[i].addr, waits[i].val, ++ (inherit_err_flags & ((u32)1 << i)) ? 1 : 0); + } + break; + } @@ -167655,21 +183038,48 @@ index 000000000000..e1263d535918 + unsigned int i; + + for (i = 0; i < cmd->info.cqs_set.nr_objs; i++) { -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET( -+ kbdev, queue, sets[i].addr); ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET(kbdev, queue, ++ sets[i].addr); ++ } ++ break; ++ } ++ case BASE_KCPU_COMMAND_TYPE_CQS_WAIT_OPERATION: ++ { ++ const struct base_cqs_wait_operation_info *waits = ++ cmd->info.cqs_wait_operation.objs; ++ u32 inherit_err_flags = cmd->info.cqs_wait_operation.inherit_err_flags; ++ unsigned int i; ++ ++ for (i = 0; i < cmd->info.cqs_wait_operation.nr_objs; i++) { ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT_OPERATION( ++ kbdev, queue, waits[i].addr, waits[i].val, ++ waits[i].operation, waits[i].data_type, ++ (inherit_err_flags & ((uint32_t)1 << i)) ? 1 : 0); ++ } ++ break; ++ } ++ case BASE_KCPU_COMMAND_TYPE_CQS_SET_OPERATION: ++ { ++ const struct base_cqs_set_operation_info *sets = cmd->info.cqs_set_operation.objs; ++ unsigned int i; ++ ++ for (i = 0; i < cmd->info.cqs_set_operation.nr_objs; i++) { ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET_OPERATION( ++ kbdev, queue, sets[i].addr, sets[i].val, ++ sets[i].operation, sets[i].data_type); + } + break; + } + case BASE_KCPU_COMMAND_TYPE_ERROR_BARRIER: -+ /* No implemented tracepoint */ ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_ERROR_BARRIER(kbdev, queue); + break; + case BASE_KCPU_COMMAND_TYPE_MAP_IMPORT: -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_MAP_IMPORT( -+ kbdev, queue, cmd->info.import.gpu_va); ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_MAP_IMPORT(kbdev, queue, ++ cmd->info.import.gpu_va); + break; + case BASE_KCPU_COMMAND_TYPE_UNMAP_IMPORT: -+ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT( -+ kbdev, queue, cmd->info.import.gpu_va); ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT(kbdev, queue, ++ cmd->info.import.gpu_va); + break; + case BASE_KCPU_COMMAND_TYPE_UNMAP_IMPORT_FORCE: + KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT_FORCE( @@ -167679,39 +183089,40 @@ index 000000000000..e1263d535918 + { + u8 i; + -+ KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_ENQUEUE_JIT_ALLOC( -+ kbdev, queue); ++ KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_ENQUEUE_JIT_ALLOC(kbdev, queue); + for (i = 0; i < cmd->info.jit_alloc.count; i++) { + const struct base_jit_alloc_info *info = + &cmd->info.jit_alloc.info[i]; + + KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_ENQUEUE_JIT_ALLOC( -+ kbdev, queue, -+ info->gpu_alloc_addr, info->va_pages, -+ info->commit_pages, info->extent, info->id, -+ info->bin_id, info->max_allocations, -+ info->flags, info->usage_id); ++ kbdev, queue, info->gpu_alloc_addr, info->va_pages, ++ info->commit_pages, info->extension, info->id, info->bin_id, ++ info->max_allocations, info->flags, info->usage_id); + } -+ KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_ENQUEUE_JIT_ALLOC( -+ kbdev, queue); ++ KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_ENQUEUE_JIT_ALLOC(kbdev, queue); + break; + } + case BASE_KCPU_COMMAND_TYPE_JIT_FREE: + { + u8 i; + -+ KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_ENQUEUE_JIT_FREE( -+ kbdev, queue); ++ KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_ENQUEUE_JIT_FREE(kbdev, queue); + for (i = 0; i < cmd->info.jit_free.count; i++) { + KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_ENQUEUE_JIT_FREE( + kbdev, queue, cmd->info.jit_free.ids[i]); + } -+ KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_ENQUEUE_JIT_FREE( -+ kbdev, queue); ++ KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_ENQUEUE_JIT_FREE(kbdev, queue); + break; + } ++#if IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST + case BASE_KCPU_COMMAND_TYPE_GROUP_SUSPEND: -+ /* No implemented tracepoint */ ++ KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_GROUP_SUSPEND( ++ kbdev, queue, cmd->info.suspend_buf_copy.sus_buf, ++ cmd->info.suspend_buf_copy.group_handle); ++ break; ++#endif ++ default: ++ dev_dbg(kbdev->dev, "Unknown command type %u", cmd->type); + break; + } +} @@ -167726,9 +183137,11 @@ index 000000000000..e1263d535918 + + /* The offset to the first command that is being processed or yet to + * be processed is of u8 type, so the number of commands inside the -+ * queue cannot be more than 256. ++ * queue cannot be more than 256. The current implementation expects ++ * exactly 256, any other size will require the addition of wrapping ++ * logic. + */ -+ BUILD_BUG_ON(KBASEP_KCPU_QUEUE_SIZE > 256); ++ BUILD_BUG_ON(KBASEP_KCPU_QUEUE_SIZE != 256); + + /* Whilst the backend interface allows enqueueing multiple commands in + * a single operation, the Base interface does not expose any mechanism @@ -167738,19 +183151,35 @@ index 000000000000..e1263d535918 + * in the set. + */ + if (enq->nr_commands != 1) { -+ dev_err(kctx->kbdev->dev, -+ "More than one commands enqueued\n"); ++ dev_dbg(kctx->kbdev->dev, ++ "More than one commands enqueued"); + return -EINVAL; + } + ++ /* There might be a race between one thread trying to enqueue commands to the queue ++ * and other thread trying to delete the same queue. ++ * This racing could lead to use-after-free problem by enqueuing thread if ++ * resources for the queue has already been freed by deleting thread. ++ * ++ * To prevent the issue, two mutexes are acquired/release asymmetrically as follows. ++ * ++ * Lock A (kctx mutex) ++ * Lock B (queue mutex) ++ * Unlock A ++ * Unlock B ++ * ++ * With the kctx mutex being held, enqueuing thread will check the queue ++ * and will return error code if the queue had already been deleted. ++ */ + mutex_lock(&kctx->csf.kcpu_queues.lock); -+ -+ if (!kctx->csf.kcpu_queues.array[enq->id]) { -+ ret = -EINVAL; -+ goto out; -+ } -+ + queue = kctx->csf.kcpu_queues.array[enq->id]; ++ if (queue == NULL) { ++ dev_dbg(kctx->kbdev->dev, "Invalid KCPU queue (id:%u)", enq->id); ++ mutex_unlock(&kctx->csf.kcpu_queues.lock); ++ return -EINVAL; ++ } ++ mutex_lock(&queue->lock); ++ mutex_unlock(&kctx->csf.kcpu_queues.lock); + + if (kcpu_queue_get_space(queue) < enq->nr_commands) { + ret = -EBUSY; @@ -167765,7 +183194,7 @@ index 000000000000..e1263d535918 + * for the possibility to roll back. + */ + -+ for (i = 0; (i != enq->nr_commands) && !ret; ++i, ++kctx->csf.kcpu_queues.num_cmds) { ++ for (i = 0; (i != enq->nr_commands) && !ret; ++i) { + struct kbase_kcpu_command *kcpu_cmd = + &queue->commands[(u8)(queue->start_offset + queue->num_pending_cmds + i)]; + struct base_kcpu_command command; @@ -167788,10 +183217,10 @@ index 000000000000..e1263d535918 + } + } + -+ kcpu_cmd->enqueue_ts = kctx->csf.kcpu_queues.num_cmds; ++ kcpu_cmd->enqueue_ts = atomic64_inc_return(&kctx->csf.kcpu_queues.cmd_seq_num); + switch (command.type) { + case BASE_KCPU_COMMAND_TYPE_FENCE_WAIT: -+#ifdef CONFIG_SYNC_FILE ++#if IS_ENABLED(CONFIG_SYNC_FILE) + ret = kbase_kcpu_fence_wait_prepare(queue, + &command.info.fence, kcpu_cmd); +#else @@ -167800,7 +183229,7 @@ index 000000000000..e1263d535918 +#endif + break; + case BASE_KCPU_COMMAND_TYPE_FENCE_SIGNAL: -+#ifdef CONFIG_SYNC_FILE ++#if IS_ENABLED(CONFIG_SYNC_FILE) + ret = kbase_kcpu_fence_signal_prepare(queue, + &command.info.fence, kcpu_cmd); +#else @@ -167816,6 +183245,14 @@ index 000000000000..e1263d535918 + ret = kbase_kcpu_cqs_set_prepare(queue, + &command.info.cqs_set, kcpu_cmd); + break; ++ case BASE_KCPU_COMMAND_TYPE_CQS_WAIT_OPERATION: ++ ret = kbase_kcpu_cqs_wait_operation_prepare(queue, ++ &command.info.cqs_wait_operation, kcpu_cmd); ++ break; ++ case BASE_KCPU_COMMAND_TYPE_CQS_SET_OPERATION: ++ ret = kbase_kcpu_cqs_set_operation_prepare(queue, ++ &command.info.cqs_set_operation, kcpu_cmd); ++ break; + case BASE_KCPU_COMMAND_TYPE_ERROR_BARRIER: + kcpu_cmd->type = BASE_KCPU_COMMAND_TYPE_ERROR_BARRIER; + ret = 0; @@ -167840,15 +183277,16 @@ index 000000000000..e1263d535918 + ret = kbase_kcpu_jit_free_prepare(queue, + &command.info.jit_free, kcpu_cmd); + break; ++#if IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST + case BASE_KCPU_COMMAND_TYPE_GROUP_SUSPEND: + ret = kbase_csf_queue_group_suspend_prepare(queue, + &command.info.suspend_buf_copy, + kcpu_cmd); + break; -+ ++#endif + default: -+ dev_warn(queue->kctx->kbdev->dev, -+ "Unknown command type %u\n", command.type); ++ dev_dbg(queue->kctx->kbdev->dev, ++ "Unknown command type %u", command.type); + ret = -EINVAL; + break; + } @@ -167869,13 +183307,10 @@ index 000000000000..e1263d535918 + + queue->num_pending_cmds += enq->nr_commands; + kcpu_queue_process(queue, false); -+ } else { -+ /* Roll back the number of enqueued commands */ -+ kctx->csf.kcpu_queues.num_cmds -= i; + } + +out: -+ mutex_unlock(&kctx->csf.kcpu_queues.lock); ++ mutex_unlock(&queue->lock); + + return ret; +} @@ -167889,14 +183324,9 @@ index 000000000000..e1263d535918 + for (idx = 0; idx < KBASEP_MAX_KCPU_QUEUES; ++idx) + kctx->csf.kcpu_queues.array[idx] = NULL; + -+ kctx->csf.kcpu_queues.wq = alloc_workqueue("mali_kbase_csf_kcpu", -+ WQ_UNBOUND | WQ_HIGHPRI, 0); -+ if (!kctx->csf.kcpu_queues.wq) -+ return -ENOMEM; -+ + mutex_init(&kctx->csf.kcpu_queues.lock); + -+ kctx->csf.kcpu_queues.num_cmds = 0; ++ atomic64_set(&kctx->csf.kcpu_queues.cmd_seq_num, 0); + + return 0; +} @@ -167914,9 +183344,9 @@ index 000000000000..e1263d535918 + (void)delete_queue(kctx, id); + } + -+ destroy_workqueue(kctx->csf.kcpu_queues.wq); + mutex_destroy(&kctx->csf.kcpu_queues.lock); +} ++KBASE_EXPORT_TEST_API(kbase_csf_kcpu_queue_context_term); + +int kbase_csf_kcpu_queue_delete(struct kbase_context *kctx, + struct kbase_ioctl_kcpu_queue_delete *del) @@ -167929,8 +183359,11 @@ index 000000000000..e1263d535918 +{ + struct kbase_kcpu_command_queue *queue; + int idx; ++ int n; + int ret = 0; -+ ++#if IS_ENABLED(CONFIG_SYNC_FILE) ++ struct kbase_kcpu_dma_fence_meta *metadata; ++#endif + /* The queue id is of u8 type and we use the index of the kcpu_queues + * array as an id, so the number of elements in the array can't be + * more than 256. @@ -167958,48 +183391,90 @@ index 000000000000..e1263d535918 + goto out; + } + ++ queue->wq = alloc_workqueue("mali_kbase_csf_kcpu_wq_%i", WQ_UNBOUND | WQ_HIGHPRI, 0, idx); ++ if (queue->wq == NULL) { ++ kfree(queue); ++ ret = -ENOMEM; ++ ++ goto out; ++ } ++ + bitmap_set(kctx->csf.kcpu_queues.in_use, idx, 1); + kctx->csf.kcpu_queues.array[idx] = queue; ++ mutex_init(&queue->lock); + queue->kctx = kctx; + queue->start_offset = 0; + queue->num_pending_cmds = 0; -+#ifdef CONFIG_SYNC_FILE ++#if IS_ENABLED(CONFIG_SYNC_FILE) + queue->fence_context = dma_fence_context_alloc(1); + queue->fence_seqno = 0; + queue->fence_wait_processed = false; -+#endif ++ ++ metadata = kzalloc(sizeof(*metadata), GFP_KERNEL); ++ if (!metadata) { ++ destroy_workqueue(queue->wq); ++ kfree(queue); ++ ret = -ENOMEM; ++ goto out; ++ } ++ ++ metadata->kbdev = kctx->kbdev; ++ metadata->kctx_id = kctx->id; ++ n = snprintf(metadata->timeline_name, MAX_TIMELINE_NAME, "%d-%d_%d-%lld-kcpu", ++ kctx->kbdev->id, kctx->tgid, kctx->id, queue->fence_context); ++ if (WARN_ON(n >= MAX_TIMELINE_NAME)) { ++ destroy_workqueue(queue->wq); ++ kfree(queue); ++ kfree(metadata); ++ ret = -EINVAL; ++ goto out; ++ } ++ ++ kbase_refcount_set(&metadata->refcount, 1); ++ queue->metadata = metadata; ++ atomic_inc(&kctx->kbdev->live_fence_metadata); ++#endif /* CONFIG_SYNC_FILE */ + queue->enqueue_failed = false; + queue->command_started = false; + INIT_LIST_HEAD(&queue->jit_blocked); + queue->has_error = false; + INIT_WORK(&queue->work, kcpu_queue_process_worker); ++ queue->id = idx; + + newq->id = idx; + + /* Fire the tracepoint with the mutex held to enforce correct ordering + * with the summary stream. + */ -+ KBASE_TLSTREAM_TL_KBASE_NEW_KCPUQUEUE( -+ kctx->kbdev, queue, kctx->id, queue->num_pending_cmds); ++ KBASE_TLSTREAM_TL_KBASE_NEW_KCPUQUEUE(kctx->kbdev, queue, queue->id, kctx->id, ++ queue->num_pending_cmds); ++ ++ KBASE_KTRACE_ADD_CSF_KCPU(kctx->kbdev, KCPU_QUEUE_CREATE, queue, ++ queue->fence_context, 0); ++#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG ++ kbase_timer_setup(&queue->fence_timeout, fence_timeout_callback); ++#endif +out: + mutex_unlock(&kctx->csf.kcpu_queues.lock); + + return ret; +} ++KBASE_EXPORT_TEST_API(kbase_csf_kcpu_queue_new); diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h new file mode 100755 -index 000000000000..45c76af04c0f +index 000000000..5cad8b200 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h -@@ -0,0 +1,305 @@ +@@ -0,0 +1,384 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -168010,13 +183485,14 @@ index 000000000000..45c76af04c0f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CSF_KCPU_H_ +#define _KBASE_CSF_KCPU_H_ + ++#include ++#include ++ +#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) +#include +#else @@ -168039,12 +183515,12 @@ index 000000000000..45c76af04c0f +}; + +/** -+ * struct kbase_kcpu_command_fence_info - Structure which holds information -+ * about the fence object enqueued in the kcpu command queue ++ * struct kbase_kcpu_command_fence_info - Structure which holds information about the ++ * fence object enqueued in the kcpu command queue + * -+ * @fence_cb: -+ * @fence: -+ * @kcpu_queue: ++ * @fence_cb: Fence callback ++ * @fence: Fence ++ * @kcpu_queue: kcpu command queue + */ +struct kbase_kcpu_command_fence_info { +#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) @@ -168064,13 +183540,10 @@ index 000000000000..45c76af04c0f + * @objs: Array of structures which define CQS objects to be used by + * the kcpu command. + * @nr_objs: Number of CQS objects in the array. -+ * @propagate_flags: Bit-pattern for the CQSs in the array that are set -+ * to propagate queue error-state to the flagged CQSs. + */ +struct kbase_kcpu_command_cqs_set_info { + struct base_cqs_set *objs; + unsigned int nr_objs; -+ u32 propagate_flags; +}; + +/** @@ -168087,7 +183560,39 @@ index 000000000000..45c76af04c0f + * queue's error-state. + */ +struct kbase_kcpu_command_cqs_wait_info { -+ struct base_cqs_wait *objs; ++ struct base_cqs_wait_info *objs; ++ unsigned long *signaled; ++ unsigned int nr_objs; ++ u32 inherit_err_flags; ++}; ++ ++/** ++ * struct kbase_kcpu_command_cqs_set_operation_info - Structure which holds information ++ * about CQS objects for the kcpu CQS timeline set command ++ * ++ * @objs: Array of structures which define CQS timeline objects to be used by ++ * the kcpu command. ++ * @nr_objs: Number of CQS objects in the array. ++ */ ++struct kbase_kcpu_command_cqs_set_operation_info { ++ struct base_cqs_set_operation_info *objs; ++ unsigned int nr_objs; ++}; ++ ++/** ++ * struct kbase_kcpu_command_cqs_wait_operation_info - Structure which holds information ++ * about CQS objects for the kcpu CQS timeline wait command ++ * ++ * @objs: Array of structures which define CQS timeline objects to be used by ++ * the kcpu command. ++ * @signaled: Bit array used to report the status of the CQS wait objects. ++ * 1 is signaled, 0 otherwise. ++ * @nr_objs: Number of CQS objects in the array. ++ * @inherit_err_flags: Bit-pattern for CQSs in the array who's error field is to ++ * be used as the source to import into the queue's error-state ++ */ ++struct kbase_kcpu_command_cqs_wait_operation_info { ++ struct base_cqs_wait_operation_info *objs; + unsigned long *signaled; + unsigned int nr_objs; + u32 inherit_err_flags; @@ -168097,7 +183602,7 @@ index 000000000000..45c76af04c0f + * struct kbase_kcpu_command_jit_alloc_info - Structure which holds information + * needed for the kcpu command for jit allocations + * -+ * @node Used to keep track of all JIT free/alloc commands in submission ++ * @node: Used to keep track of all JIT free/alloc commands in submission + * order. This must be located in the front of this struct to + * match that of kbase_kcpu_command_jit_free_info. + * @info: Array of objects of the struct base_jit_alloc_info type which @@ -168139,29 +183644,34 @@ index 000000000000..45c76af04c0f + * the user buffer. + * @nr_pages: number of pages. + * @offset: offset into the pages ++ * @cpu_alloc: Reference to physical pages of suspend buffer allocation. + */ +struct kbase_suspend_copy_buffer { + size_t size; + struct page **pages; + int nr_pages; + size_t offset; ++ struct kbase_mem_phy_alloc *cpu_alloc; +}; + ++#if IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST +/** -+ * struct base_kcpu_command_group_suspend - structure which contains ++ * struct kbase_kcpu_command_group_suspend_info - structure which contains + * suspend buffer data captured for a suspended queue group. + * + * @sus_buf: Pointer to the structure which contains details of the + * user buffer and its kernel pinned pages. -+ * @group_handle: Handle to the mapping of command stream group. ++ * @group_handle: Handle to the mapping of CSG. + */ +struct kbase_kcpu_command_group_suspend_info { + struct kbase_suspend_copy_buffer *sus_buf; + u8 group_handle; +}; ++#endif ++ + +/** -+ * struct kbase_cpu_command - Command which is to be part of the kernel ++ * struct kbase_kcpu_command - Command which is to be part of the kernel + * command queue + * + * @type: Type of the command. @@ -168169,6 +183679,16 @@ index 000000000000..45c76af04c0f + * indicates that it has been enqueued earlier. + * @info: Structure which holds information about the command + * dependent on the command type. ++ * @info.fence: Fence ++ * @info.cqs_wait: CQS wait ++ * @info.cqs_set: CQS set ++ * @info.cqs_wait_operation: CQS wait operation ++ * @info.cqs_set_operation: CQS set operation ++ * @info.import: import ++ * @info.jit_alloc: JIT allocation ++ * @info.jit_free: JIT deallocation ++ * @info.suspend_buf_copy: suspend buffer copy ++ * @info.sample_time: sample time + */ +struct kbase_kcpu_command { + enum base_kcpu_command_type type; @@ -168177,24 +183697,31 @@ index 000000000000..45c76af04c0f + struct kbase_kcpu_command_fence_info fence; + struct kbase_kcpu_command_cqs_wait_info cqs_wait; + struct kbase_kcpu_command_cqs_set_info cqs_set; ++ struct kbase_kcpu_command_cqs_wait_operation_info cqs_wait_operation; ++ struct kbase_kcpu_command_cqs_set_operation_info cqs_set_operation; + struct kbase_kcpu_command_import_info import; + struct kbase_kcpu_command_jit_alloc_info jit_alloc; + struct kbase_kcpu_command_jit_free_info jit_free; ++#if IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST + struct kbase_kcpu_command_group_suspend_info suspend_buf_copy; ++#endif + } info; +}; + +/** + * struct kbase_kcpu_command_queue - a command queue executed by the kernel + * ++ * @lock: Lock to protect accesses to this queue. + * @kctx: The context to which this command queue belongs. + * @commands: Array of commands which have been successfully + * enqueued to this command queue. ++ * @wq: Dedicated workqueue for processing commands. + * @work: struct work_struct which contains a pointer to + * the function which handles processing of kcpu + * commands enqueued into a kcpu command queue; + * part of kernel API for processing workqueues + * @start_offset: Index of the command to be executed next ++ * @id: KCPU command queue ID. + * @num_pending_cmds: The number of commands enqueued but not yet + * executed or pending + * @cqs_wait_count: Tracks the number of CQS wait commands enqueued @@ -168221,12 +183748,18 @@ index 000000000000..45c76af04c0f + * or without errors since last cleaned. + * @jit_blocked: Used to keep track of command queues blocked + * by a pending JIT allocation command. ++ * @fence_timeout: Timer used to detect the fence wait timeout. ++ * @metadata: Metadata structure containing basic information about ++ * this queue for any fence objects associated with this queue. + */ +struct kbase_kcpu_command_queue { ++ struct mutex lock; + struct kbase_context *kctx; + struct kbase_kcpu_command commands[KBASEP_KCPU_QUEUE_SIZE]; ++ struct workqueue_struct *wq; + struct work_struct work; + u8 start_offset; ++ u8 id; + u16 num_pending_cmds; + u32 cqs_wait_count; + u64 fence_context; @@ -168236,6 +183769,12 @@ index 000000000000..45c76af04c0f + bool command_started; + struct list_head jit_blocked; + bool has_error; ++#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG ++ struct timer_list fence_timeout; ++#endif /* CONFIG_MALI_BIFROST_FENCE_DEBUG */ ++#if IS_ENABLED(CONFIG_SYNC_FILE) ++ struct kbase_kcpu_dma_fence_meta *metadata; ++#endif /* CONFIG_SYNC_FILE */ +}; + +/** @@ -168245,6 +183784,8 @@ index 000000000000..45c76af04c0f + * queue will be created. + * @newq: Pointer to the structure which contains information about + * the new KCPU command queue to be created. ++ * ++ * Return: 0 if successful or a negative error code on failure. + */ +int kbase_csf_kcpu_queue_new(struct kbase_context *kctx, + struct kbase_ioctl_kcpu_queue_new *newq); @@ -168252,12 +183793,12 @@ index 000000000000..45c76af04c0f +/** + * kbase_csf_kcpu_queue_delete - Delete KCPU command queue. + * -+ * Return: 0 if successful, -EINVAL if the queue ID is invalid. -+ * + * @kctx: Pointer to the kbase context from which the KCPU command + * queue is to be deleted. + * @del: Pointer to the structure which specifies the KCPU command + * queue to be deleted. ++ * ++ * Return: 0 if successful or a negative error code on failure. + */ +int kbase_csf_kcpu_queue_delete(struct kbase_context *kctx, + struct kbase_ioctl_kcpu_queue_delete *del); @@ -168271,6 +183812,8 @@ index 000000000000..45c76af04c0f + * @enq: Pointer to the structure which specifies the KCPU command + * as well as the KCPU command queue into which the command + * is to be enqueued. ++ * ++ * Return: 0 if successful or a negative error code on failure. + */ +int kbase_csf_kcpu_queue_enqueue(struct kbase_context *kctx, + struct kbase_ioctl_kcpu_queue_enqueue *enq); @@ -168288,29 +183831,40 @@ index 000000000000..45c76af04c0f +/** + * kbase_csf_kcpu_queue_context_term - Terminate the kernel CPU queues context + * for a GPU address space ++ * @kctx: Pointer to the kbase context being terminated. + * + * This function deletes any kernel CPU queues that weren't deleted before + * context termination. + * -+ * @kctx: Pointer to the kbase context being terminated. + */ +void kbase_csf_kcpu_queue_context_term(struct kbase_context *kctx); + ++#if IS_ENABLED(CONFIG_SYNC_FILE) ++/* Test wrappers for dma fence operations. */ ++int kbase_kcpu_fence_signal_process(struct kbase_kcpu_command_queue *kcpu_queue, ++ struct kbase_kcpu_command_fence_info *fence_info); ++ ++int kbase_kcpu_fence_signal_init(struct kbase_kcpu_command_queue *kcpu_queue, ++ struct kbase_kcpu_command *current_command, ++ struct base_fence *fence, struct sync_file **sync_file, int *fd); ++#endif /* CONFIG_SYNC_FILE */ ++ +#endif /* _KBASE_CSF_KCPU_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c new file mode 100755 -index 000000000000..55e3b64cbe71 +index 000000000..fa877778c --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c -@@ -0,0 +1,199 @@ +@@ -0,0 +1,193 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -168321,22 +183875,20 @@ index 000000000000..55e3b64cbe71 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include "mali_kbase_csf_kcpu_debugfs.h" +#include +#include + -+#ifdef CONFIG_SYNC_FILE ++#if IS_ENABLED(CONFIG_SYNC_FILE) +#include "mali_kbase_sync.h" +#endif + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) + +/** -+ * kbasep_csf_kcpu_debugfs_print_queue() - Print additional info for KCPU ++ * kbasep_csf_kcpu_debugfs_print_cqs_waits() - Print additional info for KCPU + * queues blocked on CQS wait commands. + * + * @file: The seq_file to print to @@ -168395,13 +183947,13 @@ index 000000000000..55e3b64cbe71 + struct kbase_kcpu_command *cmd = + &queue->commands[queue->start_offset]; + switch (cmd->type) { -+#ifdef CONFIG_SYNC_FILE ++#if IS_ENABLED(CONFIG_SYNC_FILE) + case BASE_KCPU_COMMAND_TYPE_FENCE_WAIT: + { + struct kbase_sync_fence_info info; + + kbase_sync_fence_info_get(cmd->info.fence.fence, &info); -+ seq_printf(file, ", Fence %p %s %s", ++ seq_printf(file, ", Fence %pK %s %s", + info.fence, info.name, + kbase_sync_status_string(info.status)); + break; @@ -168473,11 +184025,7 @@ index 000000000000..55e3b64cbe71 +void kbase_csf_kcpu_debugfs_init(struct kbase_context *kctx) +{ + struct dentry *file; -+#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE) + const mode_t mode = 0444; -+#else -+ const mode_t mode = 0400; -+#endif + + if (WARN_ON(!kctx || IS_ERR_OR_NULL(kctx->kctx_dentry))) + return; @@ -168501,21 +184049,21 @@ index 000000000000..55e3b64cbe71 +} + +#endif /* CONFIG_DEBUG_FS */ -+ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h new file mode 100755 -index 000000000000..359fe2cb0168 +index 000000000..08f2fda03 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h -@@ -0,0 +1,38 @@ +@@ -0,0 +1,37 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -168526,8 +184074,6 @@ index 000000000000..359fe2cb0168 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CSF_KCPU_DEBUGFS_H_ @@ -168546,20 +184092,989 @@ index 000000000000..359fe2cb0168 +void kbase_csf_kcpu_debugfs_init(struct kbase_context *kctx); + +#endif /* _KBASE_CSF_KCPU_DEBUGFS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.c +new file mode 100644 +index 000000000..4056a9d93 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.c +@@ -0,0 +1,817 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2022-2023 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#include ++#include ++#include "mali_kbase_csf.h" ++#include "mali_kbase_csf_mcu_shared_reg.h" ++#include ++ ++/* Scaling factor in pre-allocating shared regions for suspend bufs and userios */ ++#define MCU_SHARED_REGS_PREALLOCATE_SCALE (8) ++ ++/* MCU shared region map attempt limit */ ++#define MCU_SHARED_REGS_BIND_ATTEMPT_LIMIT (4) ++ ++/* Convert a VPFN to its start addr */ ++#define GET_VPFN_VA(vpfn) ((vpfn) << PAGE_SHIFT) ++ ++/* Macros for extract the corresponding VPFNs from a CSG_REG */ ++#define CSG_REG_SUSP_BUF_VPFN(reg, nr_susp_pages) (reg->start_pfn) ++#define CSG_REG_PMOD_BUF_VPFN(reg, nr_susp_pages) (reg->start_pfn + nr_susp_pages) ++#define CSG_REG_USERIO_VPFN(reg, csi, nr_susp_pages) (reg->start_pfn + 2 * (nr_susp_pages + csi)) ++ ++/* MCU shared segment dummy page mapping flags */ ++#define DUMMY_PAGE_MAP_FLAGS (KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_DEFAULT) | KBASE_REG_GPU_NX) ++ ++/* MCU shared segment suspend buffer mapping flags */ ++#define SUSP_PAGE_MAP_FLAGS \ ++ (KBASE_REG_GPU_RD | KBASE_REG_GPU_WR | KBASE_REG_GPU_NX | \ ++ KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_DEFAULT)) ++ ++/** ++ * struct kbase_csg_shared_region - Wrapper object for use with a CSG on runtime ++ * resources for suspend buffer pages, userio pages ++ * and their corresponding mapping GPU VA addresses ++ * from the MCU shared interface segment ++ * ++ * @link: Link to the managing list for the wrapper object. ++ * @reg: pointer to the region allocated from the shared interface segment, which ++ * covers the normal/P-mode suspend buffers, userio pages of the queues ++ * @grp: Pointer to the bound kbase_queue_group, or NULL if no binding (free). ++ * @pmode_mapped: Boolean for indicating the region has MMU mapped with the bound group's ++ * protected mode suspend buffer pages. ++ */ ++struct kbase_csg_shared_region { ++ struct list_head link; ++ struct kbase_va_region *reg; ++ struct kbase_queue_group *grp; ++ bool pmode_mapped; ++}; ++ ++static unsigned long get_userio_mmu_flags(struct kbase_device *kbdev) ++{ ++ unsigned long userio_map_flags; ++ ++ if (kbdev->system_coherency == COHERENCY_NONE) ++ userio_map_flags = ++ KBASE_REG_GPU_RD | KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_NON_CACHEABLE); ++ else ++ userio_map_flags = KBASE_REG_GPU_RD | KBASE_REG_SHARE_BOTH | ++ KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_SHARED); ++ ++ return (userio_map_flags | KBASE_REG_GPU_NX); ++} ++ ++static void set_page_meta_status_not_movable(struct tagged_addr phy) ++{ ++ if (kbase_page_migration_enabled) { ++ struct kbase_page_metadata *page_md = kbase_page_private(as_page(phy)); ++ ++ if (page_md) { ++ spin_lock(&page_md->migrate_lock); ++ page_md->status = PAGE_STATUS_SET(page_md->status, (u8)NOT_MOVABLE); ++ spin_unlock(&page_md->migrate_lock); ++ } ++ } ++} ++ ++static struct kbase_csg_shared_region *get_group_bound_csg_reg(struct kbase_queue_group *group) ++{ ++ return (struct kbase_csg_shared_region *)group->csg_reg; ++} ++ ++static inline int update_mapping_with_dummy_pages(struct kbase_device *kbdev, u64 vpfn, ++ u32 nr_pages) ++{ ++ struct kbase_csf_mcu_shared_regions *shared_regs = &kbdev->csf.scheduler.mcu_regs_data; ++ const unsigned long mem_flags = DUMMY_PAGE_MAP_FLAGS; ++ ++ return kbase_mmu_update_csf_mcu_pages(kbdev, vpfn, shared_regs->dummy_phys, nr_pages, ++ mem_flags, KBASE_MEM_GROUP_CSF_FW); ++} ++ ++static inline int insert_dummy_pages(struct kbase_device *kbdev, u64 vpfn, u32 nr_pages) ++{ ++ struct kbase_csf_mcu_shared_regions *shared_regs = &kbdev->csf.scheduler.mcu_regs_data; ++ const unsigned long mem_flags = DUMMY_PAGE_MAP_FLAGS; ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; ++ ++ return kbase_mmu_insert_pages(kbdev, &kbdev->csf.mcu_mmu, vpfn, shared_regs->dummy_phys, ++ nr_pages, mem_flags, MCU_AS_NR, KBASE_MEM_GROUP_CSF_FW, ++ mmu_sync_info, NULL, false); ++} ++ ++/* Reset consecutive retry count to zero */ ++static void notify_group_csg_reg_map_done(struct kbase_queue_group *group) ++{ ++ lockdep_assert_held(&group->kctx->kbdev->csf.scheduler.lock); ++ ++ /* Just clear the internal map retry count */ ++ group->csg_reg_bind_retries = 0; ++} ++ ++/* Return true if a fatal group error has already been triggered */ ++static bool notify_group_csg_reg_map_error(struct kbase_queue_group *group) ++{ ++ struct kbase_device *kbdev = group->kctx->kbdev; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ if (group->csg_reg_bind_retries < U8_MAX) ++ group->csg_reg_bind_retries++; ++ ++ /* Allow only one fatal error notification */ ++ if (group->csg_reg_bind_retries == MCU_SHARED_REGS_BIND_ATTEMPT_LIMIT) { ++ struct base_gpu_queue_group_error const err_payload = { ++ .error_type = BASE_GPU_QUEUE_GROUP_ERROR_FATAL, ++ .payload = { .fatal_group = { .status = GPU_EXCEPTION_TYPE_SW_FAULT_0 } } ++ }; ++ ++ dev_err(kbdev->dev, "Fatal: group_%d_%d_%d exceeded shared region map retry limit", ++ group->kctx->tgid, group->kctx->id, group->handle); ++ kbase_csf_add_group_fatal_error(group, &err_payload); ++ kbase_event_wakeup(group->kctx); ++ } ++ ++ return group->csg_reg_bind_retries >= MCU_SHARED_REGS_BIND_ATTEMPT_LIMIT; ++} ++ ++/* Replace the given phys at vpfn (reflecting a queue's userio_pages) mapping. ++ * If phys is NULL, the internal dummy_phys is used, which effectively ++ * restores back to the initialized state for the given queue's userio_pages ++ * (i.e. mapped to the default dummy page). ++ * In case of CSF mmu update error on a queue, the dummy phy is used to restore ++ * back the default 'unbound' (i.e. mapped to dummy) condition. ++ * ++ * It's the caller's responsibility to ensure that the given vpfn is extracted ++ * correctly from a CSG_REG object, for example, using CSG_REG_USERIO_VPFN(). ++ */ ++static int userio_pages_replace_phys(struct kbase_device *kbdev, u64 vpfn, struct tagged_addr *phys) ++{ ++ struct kbase_csf_mcu_shared_regions *shared_regs = &kbdev->csf.scheduler.mcu_regs_data; ++ int err = 0, err1; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ if (phys) { ++ unsigned long mem_flags_input = shared_regs->userio_mem_rd_flags; ++ unsigned long mem_flags_output = mem_flags_input | KBASE_REG_GPU_WR; ++ ++ /* Dealing with a queue's INPUT page */ ++ err = kbase_mmu_update_csf_mcu_pages(kbdev, vpfn, &phys[0], 1, mem_flags_input, ++ KBASE_MEM_GROUP_CSF_IO); ++ /* Dealing with a queue's OUTPUT page */ ++ err1 = kbase_mmu_update_csf_mcu_pages(kbdev, vpfn + 1, &phys[1], 1, ++ mem_flags_output, KBASE_MEM_GROUP_CSF_IO); ++ if (unlikely(err1)) ++ err = err1; ++ } ++ ++ if (unlikely(err) || !phys) { ++ /* Restore back to dummy_userio_phy */ ++ update_mapping_with_dummy_pages(kbdev, vpfn, KBASEP_NUM_CS_USER_IO_PAGES); ++ } ++ ++ return err; ++} ++ ++/* Update a group's queues' mappings for a group with its runtime bound group region */ ++static int csg_reg_update_on_csis(struct kbase_device *kbdev, struct kbase_queue_group *group, ++ struct kbase_queue_group *prev_grp) ++{ ++ struct kbase_csg_shared_region *csg_reg = get_group_bound_csg_reg(group); ++ const u32 nr_susp_pages = PFN_UP(kbdev->csf.global_iface.groups[0].suspend_size); ++ const u32 nr_csis = kbdev->csf.global_iface.groups[0].stream_num; ++ struct tagged_addr *phy; ++ int err = 0, err1; ++ u32 i; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ if (WARN_ONCE(!csg_reg, "Update_userio pages: group has no bound csg_reg")) ++ return -EINVAL; ++ ++ for (i = 0; i < nr_csis; i++) { ++ struct kbase_queue *queue = group->bound_queues[i]; ++ struct kbase_queue *prev_queue = prev_grp ? prev_grp->bound_queues[i] : NULL; ++ ++ /* Set the phy if the group's queue[i] needs mapping, otherwise NULL */ ++ phy = (queue && queue->enabled && !queue->user_io_gpu_va) ? queue->phys : NULL; ++ ++ /* Either phy is valid, or this update is for a transition change from ++ * prev_group, and the prev_queue was mapped, so an update is required. ++ */ ++ if (phy || (prev_queue && prev_queue->user_io_gpu_va)) { ++ u64 vpfn = CSG_REG_USERIO_VPFN(csg_reg->reg, i, nr_susp_pages); ++ ++ err1 = userio_pages_replace_phys(kbdev, vpfn, phy); ++ ++ if (unlikely(err1)) { ++ dev_warn(kbdev->dev, ++ "%s: Error in update queue-%d mapping for csg_%d_%d_%d", ++ __func__, i, group->kctx->tgid, group->kctx->id, ++ group->handle); ++ err = err1; ++ } else if (phy) ++ queue->user_io_gpu_va = GET_VPFN_VA(vpfn); ++ ++ /* Mark prev_group's queue has lost its mapping */ ++ if (prev_queue) ++ prev_queue->user_io_gpu_va = 0; ++ } ++ } ++ ++ return err; ++} ++ ++/* Bind a group to a given csg_reg, any previous mappings with the csg_reg are replaced ++ * with the given group's phy pages, or, if no replacement, the default dummy pages. ++ * Note, the csg_reg's fields are in transition step-by-step from the prev_grp to its ++ * new binding owner in this function. At the end, the prev_grp would be completely ++ * detached away from the previously bound csg_reg. ++ */ ++static int group_bind_csg_reg(struct kbase_device *kbdev, struct kbase_queue_group *group, ++ struct kbase_csg_shared_region *csg_reg) ++{ ++ const unsigned long mem_flags = SUSP_PAGE_MAP_FLAGS; ++ const u32 nr_susp_pages = PFN_UP(kbdev->csf.global_iface.groups[0].suspend_size); ++ struct kbase_queue_group *prev_grp = csg_reg->grp; ++ struct kbase_va_region *reg = csg_reg->reg; ++ struct tagged_addr *phy; ++ int err = 0, err1; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ /* The csg_reg is expected still on the unused list so its link is not empty */ ++ if (WARN_ON_ONCE(list_empty(&csg_reg->link))) { ++ dev_dbg(kbdev->dev, "csg_reg is marked in active use"); ++ return -EINVAL; ++ } ++ ++ if (WARN_ON_ONCE(prev_grp && prev_grp->csg_reg != csg_reg)) { ++ dev_dbg(kbdev->dev, "Unexpected bound lost on prev_group"); ++ prev_grp->csg_reg = NULL; ++ return -EINVAL; ++ } ++ ++ /* Replacing the csg_reg bound group to the newly given one */ ++ csg_reg->grp = group; ++ group->csg_reg = csg_reg; ++ ++ /* Resolving mappings, deal with protected mode first */ ++ if (group->protected_suspend_buf.pma) { ++ /* We are binding a new group with P-mode ready, the prev_grp's P-mode mapping ++ * status is now stale during this transition of ownership. For the new owner, ++ * its mapping would have been updated away when it lost its binding previously. ++ * So it needs an update to this pma map. By clearing here the mapped flag ++ * ensures it reflects the new owner's condition. ++ */ ++ csg_reg->pmode_mapped = false; ++ err = kbase_csf_mcu_shared_group_update_pmode_map(kbdev, group); ++ } else if (csg_reg->pmode_mapped) { ++ /* Need to unmap the previous one, use the dummy pages */ ++ err = update_mapping_with_dummy_pages( ++ kbdev, CSG_REG_PMOD_BUF_VPFN(reg, nr_susp_pages), nr_susp_pages); ++ ++ if (unlikely(err)) ++ dev_warn(kbdev->dev, "%s: Failed to update P-mode dummy for csg_%d_%d_%d", ++ __func__, group->kctx->tgid, group->kctx->id, group->handle); ++ ++ csg_reg->pmode_mapped = false; ++ } ++ ++ /* Unlike the normal suspend buf, the mapping of the protected mode suspend buffer is ++ * actually reflected by a specific mapped flag (due to phys[] is only allocated on ++ * in-need basis). So the GPU_VA is always updated to the bound region's corresponding ++ * VA, as a reflection of the binding to the csg_reg. ++ */ ++ group->protected_suspend_buf.gpu_va = ++ GET_VPFN_VA(CSG_REG_PMOD_BUF_VPFN(reg, nr_susp_pages)); ++ ++ /* Deal with normal mode suspend buffer */ ++ phy = group->normal_suspend_buf.phy; ++ err1 = kbase_mmu_update_csf_mcu_pages(kbdev, CSG_REG_SUSP_BUF_VPFN(reg, nr_susp_pages), phy, ++ nr_susp_pages, mem_flags, KBASE_MEM_GROUP_CSF_FW); ++ ++ if (unlikely(err1)) { ++ dev_warn(kbdev->dev, "%s: Failed to update suspend buffer for csg_%d_%d_%d", ++ __func__, group->kctx->tgid, group->kctx->id, group->handle); ++ ++ /* Attempt a restore to default dummy for removing previous mapping */ ++ if (prev_grp) ++ update_mapping_with_dummy_pages( ++ kbdev, CSG_REG_SUSP_BUF_VPFN(reg, nr_susp_pages), nr_susp_pages); ++ err = err1; ++ /* Marking the normal suspend buffer is not mapped (due to error) */ ++ group->normal_suspend_buf.gpu_va = 0; ++ } else { ++ /* Marking the normal suspend buffer is actually mapped */ ++ group->normal_suspend_buf.gpu_va = ++ GET_VPFN_VA(CSG_REG_SUSP_BUF_VPFN(reg, nr_susp_pages)); ++ } ++ ++ /* Deal with queue uerio_pages */ ++ err1 = csg_reg_update_on_csis(kbdev, group, prev_grp); ++ if (likely(!err1)) ++ err = err1; ++ ++ /* Reset the previous group's suspend buffers' GPU_VAs as it has lost its bound */ ++ if (prev_grp) { ++ prev_grp->normal_suspend_buf.gpu_va = 0; ++ prev_grp->protected_suspend_buf.gpu_va = 0; ++ prev_grp->csg_reg = NULL; ++ } ++ ++ return err; ++} ++ ++/* Notify the group is placed on-slot, hence the bound csg_reg is active in use */ ++void kbase_csf_mcu_shared_set_group_csg_reg_active(struct kbase_device *kbdev, ++ struct kbase_queue_group *group) ++{ ++ struct kbase_csg_shared_region *csg_reg = get_group_bound_csg_reg(group); ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ if (WARN_ONCE(!csg_reg || csg_reg->grp != group, "Group_%d_%d_%d has no csg_reg bounding", ++ group->kctx->tgid, group->kctx->id, group->handle)) ++ return; ++ ++ /* By dropping out the csg_reg from the unused list, it becomes active and is tracked ++ * by its bound group that is on-slot. The design is that, when this on-slot group is ++ * moved to off-slot, the scheduler slot-clean up will add it back to the tail of the ++ * unused list. ++ */ ++ if (!WARN_ON_ONCE(list_empty(&csg_reg->link))) ++ list_del_init(&csg_reg->link); ++} ++ ++/* Notify the group is placed off-slot, hence the bound csg_reg is not in active use ++ * anymore. Existing bounding/mappings are left untouched. These would only be dealt with ++ * if the bound csg_reg is to be reused with another group. ++ */ ++void kbase_csf_mcu_shared_set_group_csg_reg_unused(struct kbase_device *kbdev, ++ struct kbase_queue_group *group) ++{ ++ struct kbase_csg_shared_region *csg_reg = get_group_bound_csg_reg(group); ++ struct kbase_csf_mcu_shared_regions *shared_regs = &kbdev->csf.scheduler.mcu_regs_data; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ if (WARN_ONCE(!csg_reg || csg_reg->grp != group, "Group_%d_%d_%d has no csg_reg bound", ++ group->kctx->tgid, group->kctx->id, group->handle)) ++ return; ++ ++ /* By adding back the csg_reg to the unused list, it becomes available for another ++ * group to break its existing binding and set up a new one. ++ */ ++ if (!list_empty(&csg_reg->link)) { ++ WARN_ONCE(group->csg_nr >= 0, "Group is assumed vacated from slot"); ++ list_move_tail(&csg_reg->link, &shared_regs->unused_csg_regs); ++ } else ++ list_add_tail(&csg_reg->link, &shared_regs->unused_csg_regs); ++} ++ ++/* Adding a new queue to an existing on-slot group */ ++int kbase_csf_mcu_shared_add_queue(struct kbase_device *kbdev, struct kbase_queue *queue) ++{ ++ struct kbase_queue_group *group = queue->group; ++ struct kbase_csg_shared_region *csg_reg; ++ const u32 nr_susp_pages = PFN_UP(kbdev->csf.global_iface.groups[0].suspend_size); ++ u64 vpfn; ++ int err; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ if (WARN_ONCE(!group || group->csg_nr < 0, "No bound group, or group is not on-slot")) ++ return -EIO; ++ ++ csg_reg = get_group_bound_csg_reg(group); ++ if (WARN_ONCE(!csg_reg || !list_empty(&csg_reg->link), ++ "No bound csg_reg, or in wrong state")) ++ return -EIO; ++ ++ vpfn = CSG_REG_USERIO_VPFN(csg_reg->reg, queue->csi_index, nr_susp_pages); ++ err = userio_pages_replace_phys(kbdev, vpfn, queue->phys); ++ if (likely(!err)) { ++ /* Mark the queue has been successfully mapped */ ++ queue->user_io_gpu_va = GET_VPFN_VA(vpfn); ++ } else { ++ /* Mark the queue has no mapping on its phys[] */ ++ queue->user_io_gpu_va = 0; ++ dev_dbg(kbdev->dev, ++ "%s: Error in mapping userio pages for queue-%d of csg_%d_%d_%d", __func__, ++ queue->csi_index, group->kctx->tgid, group->kctx->id, group->handle); ++ ++ /* notify the error for the bound group */ ++ if (notify_group_csg_reg_map_error(group)) ++ err = -EIO; ++ } ++ ++ return err; ++} ++ ++/* Unmap a given queue's userio pages, when the queue is deleted */ ++void kbase_csf_mcu_shared_drop_stopped_queue(struct kbase_device *kbdev, struct kbase_queue *queue) ++{ ++ struct kbase_queue_group *group; ++ struct kbase_csg_shared_region *csg_reg; ++ const u32 nr_susp_pages = PFN_UP(kbdev->csf.global_iface.groups[0].suspend_size); ++ u64 vpfn; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ /* The queue has no existing mapping, nothing to do */ ++ if (!queue || !queue->user_io_gpu_va) ++ return; ++ ++ group = queue->group; ++ if (WARN_ONCE(!group || !group->csg_reg, "Queue/Group has no bound region")) ++ return; ++ ++ csg_reg = get_group_bound_csg_reg(group); ++ ++ vpfn = CSG_REG_USERIO_VPFN(csg_reg->reg, queue->csi_index, nr_susp_pages); ++ ++ WARN_ONCE(userio_pages_replace_phys(kbdev, vpfn, NULL), ++ "Unexpected restoring to dummy map update error"); ++ queue->user_io_gpu_va = 0; ++} ++ ++int kbase_csf_mcu_shared_group_update_pmode_map(struct kbase_device *kbdev, ++ struct kbase_queue_group *group) ++{ ++ struct kbase_csf_mcu_shared_regions *shared_regs = &kbdev->csf.scheduler.mcu_regs_data; ++ struct kbase_csg_shared_region *csg_reg = get_group_bound_csg_reg(group); ++ const u32 nr_susp_pages = PFN_UP(kbdev->csf.global_iface.groups[0].suspend_size); ++ int err = 0, err1; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ if (WARN_ONCE(!csg_reg, "Update_pmode_map: the bound csg_reg can't be NULL")) ++ return -EINVAL; ++ ++ /* If the pmode already mapped, nothing to do */ ++ if (csg_reg->pmode_mapped) ++ return 0; ++ ++ /* P-mode map not in place and the group has allocated P-mode pages, map it */ ++ if (group->protected_suspend_buf.pma) { ++ unsigned long mem_flags = SUSP_PAGE_MAP_FLAGS; ++ struct tagged_addr *phy = shared_regs->pma_phys; ++ struct kbase_va_region *reg = csg_reg->reg; ++ u64 vpfn = CSG_REG_PMOD_BUF_VPFN(reg, nr_susp_pages); ++ u32 i; ++ ++ /* Populate the protected phys from pma to phy[] */ ++ for (i = 0; i < nr_susp_pages; i++) ++ phy[i] = as_tagged(group->protected_suspend_buf.pma[i]->pa); ++ ++ /* Add the P-mode suspend buffer mapping */ ++ err = kbase_mmu_update_csf_mcu_pages(kbdev, vpfn, phy, nr_susp_pages, mem_flags, ++ KBASE_MEM_GROUP_CSF_FW); ++ ++ /* If error, restore to default dummpy */ ++ if (unlikely(err)) { ++ err1 = update_mapping_with_dummy_pages(kbdev, vpfn, nr_susp_pages); ++ if (unlikely(err1)) ++ dev_warn( ++ kbdev->dev, ++ "%s: Failed in recovering to P-mode dummy for csg_%d_%d_%d", ++ __func__, group->kctx->tgid, group->kctx->id, ++ group->handle); ++ ++ csg_reg->pmode_mapped = false; ++ } else ++ csg_reg->pmode_mapped = true; ++ } ++ ++ return err; ++} ++ ++void kbase_csf_mcu_shared_clear_evicted_group_csg_reg(struct kbase_device *kbdev, ++ struct kbase_queue_group *group) ++{ ++ struct kbase_csf_mcu_shared_regions *shared_regs = &kbdev->csf.scheduler.mcu_regs_data; ++ struct kbase_csg_shared_region *csg_reg = get_group_bound_csg_reg(group); ++ struct kbase_va_region *reg; ++ const u32 nr_susp_pages = PFN_UP(kbdev->csf.global_iface.groups[0].suspend_size); ++ u32 nr_csis = kbdev->csf.global_iface.groups[0].stream_num; ++ int err = 0; ++ u32 i; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ /* Nothing to do for clearing up if no bound csg_reg */ ++ if (!csg_reg) ++ return; ++ ++ reg = csg_reg->reg; ++ /* Restore mappings default dummy pages for any mapped pages */ ++ if (csg_reg->pmode_mapped) { ++ err = update_mapping_with_dummy_pages( ++ kbdev, CSG_REG_PMOD_BUF_VPFN(reg, nr_susp_pages), nr_susp_pages); ++ WARN_ONCE(unlikely(err), "Restore dummy failed for clearing pmod buffer mapping"); ++ ++ csg_reg->pmode_mapped = false; ++ } ++ ++ if (group->normal_suspend_buf.gpu_va) { ++ err = update_mapping_with_dummy_pages( ++ kbdev, CSG_REG_SUSP_BUF_VPFN(reg, nr_susp_pages), nr_susp_pages); ++ WARN_ONCE(err, "Restore dummy failed for clearing suspend buffer mapping"); ++ } ++ ++ /* Deal with queue uerio pages */ ++ for (i = 0; i < nr_csis; i++) ++ kbase_csf_mcu_shared_drop_stopped_queue(kbdev, group->bound_queues[i]); ++ ++ group->normal_suspend_buf.gpu_va = 0; ++ group->protected_suspend_buf.gpu_va = 0; ++ ++ /* Break the binding */ ++ group->csg_reg = NULL; ++ csg_reg->grp = NULL; ++ ++ /* Put the csg_reg to the front of the unused list */ ++ if (WARN_ON_ONCE(list_empty(&csg_reg->link))) ++ list_add(&csg_reg->link, &shared_regs->unused_csg_regs); ++ else ++ list_move(&csg_reg->link, &shared_regs->unused_csg_regs); ++} ++ ++int kbase_csf_mcu_shared_group_bind_csg_reg(struct kbase_device *kbdev, ++ struct kbase_queue_group *group) ++{ ++ struct kbase_csf_mcu_shared_regions *shared_regs = &kbdev->csf.scheduler.mcu_regs_data; ++ struct kbase_csg_shared_region *csg_reg; ++ int err; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ csg_reg = get_group_bound_csg_reg(group); ++ if (!csg_reg) ++ csg_reg = list_first_entry_or_null(&shared_regs->unused_csg_regs, ++ struct kbase_csg_shared_region, link); ++ ++ if (!WARN_ON_ONCE(!csg_reg)) { ++ struct kbase_queue_group *prev_grp = csg_reg->grp; ++ ++ /* Deal with the previous binding and lazy unmap, i.e if the previous mapping not ++ * the required one, unmap it. ++ */ ++ if (prev_grp == group) { ++ /* Update existing bindings, if there have been some changes */ ++ err = kbase_csf_mcu_shared_group_update_pmode_map(kbdev, group); ++ if (likely(!err)) ++ err = csg_reg_update_on_csis(kbdev, group, NULL); ++ } else ++ err = group_bind_csg_reg(kbdev, group, csg_reg); ++ } else { ++ /* This should not have been possible if the code operates rightly */ ++ dev_err(kbdev->dev, "%s: Unexpected NULL csg_reg for group %d of context %d_%d", ++ __func__, group->handle, group->kctx->tgid, group->kctx->id); ++ return -EIO; ++ } ++ ++ if (likely(!err)) ++ notify_group_csg_reg_map_done(group); ++ else ++ notify_group_csg_reg_map_error(group); ++ ++ return err; ++} ++ ++static int shared_mcu_csg_reg_init(struct kbase_device *kbdev, ++ struct kbase_csg_shared_region *csg_reg) ++{ ++ struct kbase_csf_mcu_shared_regions *shared_regs = &kbdev->csf.scheduler.mcu_regs_data; ++ const u32 nr_susp_pages = PFN_UP(kbdev->csf.global_iface.groups[0].suspend_size); ++ u32 nr_csis = kbdev->csf.global_iface.groups[0].stream_num; ++ const size_t nr_csg_reg_pages = 2 * (nr_susp_pages + nr_csis); ++ struct kbase_va_region *reg; ++ u64 vpfn; ++ int err, i; ++ ++ INIT_LIST_HEAD(&csg_reg->link); ++ reg = kbase_alloc_free_region(kbdev, &kbdev->csf.shared_reg_rbtree, 0, nr_csg_reg_pages, ++ KBASE_REG_ZONE_MCU_SHARED); ++ ++ if (!reg) { ++ dev_err(kbdev->dev, "%s: Failed to allocate a MCU shared region for %zu pages\n", ++ __func__, nr_csg_reg_pages); ++ return -ENOMEM; ++ } ++ ++ /* Insert the region into rbtree, so it becomes ready to use */ ++ mutex_lock(&kbdev->csf.reg_lock); ++ err = kbase_add_va_region_rbtree(kbdev, reg, 0, nr_csg_reg_pages, 1); ++ reg->flags &= ~KBASE_REG_FREE; ++ mutex_unlock(&kbdev->csf.reg_lock); ++ if (err) { ++ kfree(reg); ++ dev_err(kbdev->dev, "%s: Failed to add a region of %zu pages into rbtree", __func__, ++ nr_csg_reg_pages); ++ return err; ++ } ++ ++ /* Initialize the mappings so MMU only need to update the the corresponding ++ * mapped phy-pages at runtime. ++ * Map the normal suspend buffer pages to the prepared dummy phys[]. ++ */ ++ vpfn = CSG_REG_SUSP_BUF_VPFN(reg, nr_susp_pages); ++ err = insert_dummy_pages(kbdev, vpfn, nr_susp_pages); ++ ++ if (unlikely(err)) ++ goto fail_susp_map_fail; ++ ++ /* Map the protected suspend buffer pages to the prepared dummy phys[] */ ++ vpfn = CSG_REG_PMOD_BUF_VPFN(reg, nr_susp_pages); ++ err = insert_dummy_pages(kbdev, vpfn, nr_susp_pages); ++ ++ if (unlikely(err)) ++ goto fail_pmod_map_fail; ++ ++ for (i = 0; i < nr_csis; i++) { ++ vpfn = CSG_REG_USERIO_VPFN(reg, i, nr_susp_pages); ++ err = insert_dummy_pages(kbdev, vpfn, KBASEP_NUM_CS_USER_IO_PAGES); ++ ++ if (unlikely(err)) ++ goto fail_userio_pages_map_fail; ++ } ++ ++ /* Replace the previous NULL-valued field with the successully initialized reg */ ++ csg_reg->reg = reg; ++ ++ return 0; ++ ++fail_userio_pages_map_fail: ++ while (i-- > 0) { ++ vpfn = CSG_REG_USERIO_VPFN(reg, i, nr_susp_pages); ++ kbase_mmu_teardown_pages(kbdev, &kbdev->csf.mcu_mmu, vpfn, shared_regs->dummy_phys, ++ KBASEP_NUM_CS_USER_IO_PAGES, KBASEP_NUM_CS_USER_IO_PAGES, ++ MCU_AS_NR, true); ++ } ++ ++ vpfn = CSG_REG_PMOD_BUF_VPFN(reg, nr_susp_pages); ++ kbase_mmu_teardown_pages(kbdev, &kbdev->csf.mcu_mmu, vpfn, shared_regs->dummy_phys, ++ nr_susp_pages, nr_susp_pages, MCU_AS_NR, true); ++fail_pmod_map_fail: ++ vpfn = CSG_REG_SUSP_BUF_VPFN(reg, nr_susp_pages); ++ kbase_mmu_teardown_pages(kbdev, &kbdev->csf.mcu_mmu, vpfn, shared_regs->dummy_phys, ++ nr_susp_pages, nr_susp_pages, MCU_AS_NR, true); ++fail_susp_map_fail: ++ mutex_lock(&kbdev->csf.reg_lock); ++ kbase_remove_va_region(kbdev, reg); ++ mutex_unlock(&kbdev->csf.reg_lock); ++ kfree(reg); ++ ++ return err; ++} ++ ++/* Note, this helper can only be called on scheduler shutdown */ ++static void shared_mcu_csg_reg_term(struct kbase_device *kbdev, ++ struct kbase_csg_shared_region *csg_reg) ++{ ++ struct kbase_csf_mcu_shared_regions *shared_regs = &kbdev->csf.scheduler.mcu_regs_data; ++ struct kbase_va_region *reg = csg_reg->reg; ++ const u32 nr_susp_pages = PFN_UP(kbdev->csf.global_iface.groups[0].suspend_size); ++ const u32 nr_csis = kbdev->csf.global_iface.groups[0].stream_num; ++ u64 vpfn; ++ int i; ++ ++ for (i = 0; i < nr_csis; i++) { ++ vpfn = CSG_REG_USERIO_VPFN(reg, i, nr_susp_pages); ++ kbase_mmu_teardown_pages(kbdev, &kbdev->csf.mcu_mmu, vpfn, shared_regs->dummy_phys, ++ KBASEP_NUM_CS_USER_IO_PAGES, KBASEP_NUM_CS_USER_IO_PAGES, ++ MCU_AS_NR, true); ++ } ++ ++ vpfn = CSG_REG_PMOD_BUF_VPFN(reg, nr_susp_pages); ++ kbase_mmu_teardown_pages(kbdev, &kbdev->csf.mcu_mmu, vpfn, shared_regs->dummy_phys, ++ nr_susp_pages, nr_susp_pages, MCU_AS_NR, true); ++ vpfn = CSG_REG_SUSP_BUF_VPFN(reg, nr_susp_pages); ++ kbase_mmu_teardown_pages(kbdev, &kbdev->csf.mcu_mmu, vpfn, shared_regs->dummy_phys, ++ nr_susp_pages, nr_susp_pages, MCU_AS_NR, true); ++ ++ mutex_lock(&kbdev->csf.reg_lock); ++ kbase_remove_va_region(kbdev, reg); ++ mutex_unlock(&kbdev->csf.reg_lock); ++ kfree(reg); ++} ++ ++int kbase_csf_mcu_shared_regs_data_init(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ struct kbase_csf_mcu_shared_regions *shared_regs = &scheduler->mcu_regs_data; ++ struct kbase_csg_shared_region *array_csg_regs; ++ const size_t nr_susp_pages = PFN_UP(kbdev->csf.global_iface.groups[0].suspend_size); ++ const u32 nr_groups = kbdev->csf.global_iface.group_num; ++ const u32 nr_csg_regs = MCU_SHARED_REGS_PREALLOCATE_SCALE * nr_groups; ++ const u32 nr_dummy_phys = MAX(nr_susp_pages, KBASEP_NUM_CS_USER_IO_PAGES); ++ u32 i; ++ int err; ++ ++ shared_regs->userio_mem_rd_flags = get_userio_mmu_flags(kbdev); ++ INIT_LIST_HEAD(&shared_regs->unused_csg_regs); ++ ++ shared_regs->dummy_phys = ++ kcalloc(nr_dummy_phys, sizeof(*shared_regs->dummy_phys), GFP_KERNEL); ++ if (!shared_regs->dummy_phys) ++ return -ENOMEM; ++ ++ if (kbase_mem_pool_alloc_pages(&kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], 1, ++ &shared_regs->dummy_phys[0], false, NULL) <= 0) ++ return -ENOMEM; ++ ++ shared_regs->dummy_phys_allocated = true; ++ set_page_meta_status_not_movable(shared_regs->dummy_phys[0]); ++ ++ /* Replicate the allocated single shared_regs->dummy_phys[0] to the full array */ ++ for (i = 1; i < nr_dummy_phys; i++) ++ shared_regs->dummy_phys[i] = shared_regs->dummy_phys[0]; ++ ++ shared_regs->pma_phys = kcalloc(nr_susp_pages, sizeof(*shared_regs->pma_phys), GFP_KERNEL); ++ if (!shared_regs->pma_phys) ++ return -ENOMEM; ++ ++ array_csg_regs = kcalloc(nr_csg_regs, sizeof(*array_csg_regs), GFP_KERNEL); ++ if (!array_csg_regs) ++ return -ENOMEM; ++ shared_regs->array_csg_regs = array_csg_regs; ++ ++ /* All fields in scheduler->mcu_regs_data except the shared_regs->array_csg_regs ++ * are properly populated and ready to use. Now initialize the items in ++ * shared_regs->array_csg_regs[] ++ */ ++ for (i = 0; i < nr_csg_regs; i++) { ++ err = shared_mcu_csg_reg_init(kbdev, &array_csg_regs[i]); ++ if (err) ++ return err; ++ ++ list_add_tail(&array_csg_regs[i].link, &shared_regs->unused_csg_regs); ++ } ++ ++ return 0; ++} ++ ++void kbase_csf_mcu_shared_regs_data_term(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ struct kbase_csf_mcu_shared_regions *shared_regs = &scheduler->mcu_regs_data; ++ struct kbase_csg_shared_region *array_csg_regs = ++ (struct kbase_csg_shared_region *)shared_regs->array_csg_regs; ++ const u32 nr_groups = kbdev->csf.global_iface.group_num; ++ const u32 nr_csg_regs = MCU_SHARED_REGS_PREALLOCATE_SCALE * nr_groups; ++ ++ if (array_csg_regs) { ++ struct kbase_csg_shared_region *csg_reg; ++ u32 i, cnt_csg_regs = 0; ++ ++ for (i = 0; i < nr_csg_regs; i++) { ++ csg_reg = &array_csg_regs[i]; ++ /* There should not be any group mapping bindings */ ++ WARN_ONCE(csg_reg->grp, "csg_reg has a bound group"); ++ ++ if (csg_reg->reg) { ++ shared_mcu_csg_reg_term(kbdev, csg_reg); ++ cnt_csg_regs++; ++ } ++ } ++ ++ /* The nr_susp_regs counts should match the array_csg_regs' length */ ++ list_for_each_entry(csg_reg, &shared_regs->unused_csg_regs, link) ++ cnt_csg_regs--; ++ ++ WARN_ONCE(cnt_csg_regs, "Unmatched counts of susp_regs"); ++ kfree(shared_regs->array_csg_regs); ++ } ++ ++ if (shared_regs->dummy_phys_allocated) { ++ struct page *page = as_page(shared_regs->dummy_phys[0]); ++ ++ kbase_mem_pool_free(&kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], page, false); ++ } ++ ++ kfree(shared_regs->dummy_phys); ++ kfree(shared_regs->pma_phys); ++} +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.h +new file mode 100644 +index 000000000..61943cbbf +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.h +@@ -0,0 +1,139 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#ifndef _KBASE_CSF_MCU_SHARED_REG_H_ ++#define _KBASE_CSF_MCU_SHARED_REG_H_ ++ ++/** ++ * kbase_csf_mcu_shared_set_group_csg_reg_active - Notify that the group is active on-slot with ++ * scheduling action. Essential runtime resources ++ * are bound with the group for it to run ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @group: Pointer to the group that is placed into active on-slot running by the scheduler. ++ * ++ */ ++void kbase_csf_mcu_shared_set_group_csg_reg_active(struct kbase_device *kbdev, ++ struct kbase_queue_group *group); ++ ++/** ++ * kbase_csf_mcu_shared_set_group_csg_reg_unused - Notify that the group is placed off-slot with ++ * scheduling action. Some of bound runtime ++ * resources can be reallocated for others to use ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @group: Pointer to the group that is placed off-slot by the scheduler. ++ * ++ */ ++void kbase_csf_mcu_shared_set_group_csg_reg_unused(struct kbase_device *kbdev, ++ struct kbase_queue_group *group); ++ ++/** ++ * kbase_csf_mcu_shared_group_update_pmode_map - Request to update the given group's protected ++ * suspend buffer pages to be mapped for supporting ++ * protected mode operations. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @group: Pointer to the group for attempting a protected mode suspend buffer binding/mapping. ++ * ++ * Return: 0 for success, the group has a protected suspend buffer region mapped. Otherwise an ++ * error code is returned. ++ */ ++int kbase_csf_mcu_shared_group_update_pmode_map(struct kbase_device *kbdev, ++ struct kbase_queue_group *group); ++ ++/** ++ * kbase_csf_mcu_shared_clear_evicted_group_csg_reg - Clear any bound regions/mappings as the ++ * given group is evicted out of the runtime ++ * operations. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @group: Pointer to the group that has been evicted out of set of operational groups. ++ * ++ * This function will taken away any of the bindings/mappings immediately so the resources ++ * are not tied up to the given group, which has been evicted out of scheduling action for ++ * termination. ++ */ ++void kbase_csf_mcu_shared_clear_evicted_group_csg_reg(struct kbase_device *kbdev, ++ struct kbase_queue_group *group); ++ ++/** ++ * kbase_csf_mcu_shared_add_queue - Request to add a newly activated queue for a group to be ++ * run on slot. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @queue: Pointer to the queue that requires some runtime resource to be bound for joining ++ * others that are already running on-slot with their bound group. ++ * ++ * Return: 0 on success, or negative on failure. ++ */ ++int kbase_csf_mcu_shared_add_queue(struct kbase_device *kbdev, struct kbase_queue *queue); ++ ++/** ++ * kbase_csf_mcu_shared_drop_stopped_queue - Request to drop a queue after it has been stopped ++ * from its operational state from a group. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @queue: Pointer to the queue that has been stopped from operational state. ++ * ++ */ ++void kbase_csf_mcu_shared_drop_stopped_queue(struct kbase_device *kbdev, struct kbase_queue *queue); ++ ++/** ++ * kbase_csf_mcu_shared_group_bind_csg_reg - Bind some required runtime resources to the given ++ * group for ready to run on-slot. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @group: Pointer to the queue group that requires the runtime resources. ++ * ++ * This function binds/maps the required suspend buffer pages and userio pages for the given ++ * group, readying it to run on-slot. ++ * ++ * Return: 0 on success, or negative on failure. ++ */ ++int kbase_csf_mcu_shared_group_bind_csg_reg(struct kbase_device *kbdev, ++ struct kbase_queue_group *group); ++ ++/** ++ * kbase_csf_mcu_shared_regs_data_init - Allocate and initialize the MCU shared regions data for ++ * the given device. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * This function allocate and initialize the MCU shared VA regions for runtime operations ++ * of the CSF scheduler. ++ * ++ * Return: 0 on success, or an error code. ++ */ ++int kbase_csf_mcu_shared_regs_data_init(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_mcu_shared_regs_data_term - Terminate the allocated MCU shared regions data for ++ * the given device. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * This function terminates the MCU shared VA regions allocated for runtime operations ++ * of the CSF scheduler. ++ */ ++void kbase_csf_mcu_shared_regs_data_term(struct kbase_device *kbdev); ++ ++#endif /* _KBASE_CSF_MCU_SHARED_REG_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c new file mode 100755 -index 000000000000..987cbc2fc201 +index 000000000..bf1835b5b --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c -@@ -0,0 +1,120 @@ +@@ -0,0 +1,163 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -168570,14 +185085,12 @@ index 000000000000..987cbc2fc201 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include "mali_kbase_csf_protected_memory.h" +#include + -+#ifdef CONFIG_OF ++#if IS_ENABLED(CONFIG_OF) +#include +#endif + @@ -168585,7 +185098,7 @@ index 000000000000..987cbc2fc201 +{ + int err = 0; + -+#if CONFIG_OF ++#if IS_ENABLED(CONFIG_OF) + struct device_node *pma_node = of_parse_phandle(kbdev->dev->of_node, + "protected-memory-allocator", 0); + if (!pma_node) { @@ -168626,29 +185139,60 @@ index 000000000000..987cbc2fc201 + kbase_csf_protected_memory_alloc( + struct kbase_device *const kbdev, + struct tagged_addr *phys, -+ size_t num_pages) ++ size_t num_pages, ++ bool is_small_page) +{ + size_t i; + struct protected_memory_allocator_device *pma_dev = + kbdev->csf.pma_dev; -+ struct protected_memory_allocation **pma = -+ kmalloc_array(num_pages, sizeof(*pma), GFP_KERNEL); ++ struct protected_memory_allocation **pma = NULL; ++ unsigned int order = KBASE_MEM_POOL_2MB_PAGE_TABLE_ORDER; ++ unsigned int num_pages_order; ++ ++ if (is_small_page) ++ order = KBASE_MEM_POOL_4KB_PAGE_TABLE_ORDER; ++ ++ num_pages_order = (1u << order); ++ ++ /* Ensure the requested num_pages is aligned with ++ * the order type passed as argument. ++ * ++ * pma_alloc_page() will then handle the granularity ++ * of the allocation based on order. ++ */ ++ num_pages = div64_u64(num_pages + num_pages_order - 1, num_pages_order); ++ ++ pma = kmalloc_array(num_pages, sizeof(*pma), GFP_KERNEL); + + if (WARN_ON(!pma_dev) || WARN_ON(!phys) || !pma) + return NULL; + + for (i = 0; i < num_pages; i++) { -+ pma[i] = pma_dev->ops.pma_alloc_page(pma_dev, -+ KBASE_MEM_POOL_4KB_PAGE_TABLE_ORDER); ++ phys_addr_t phys_addr; ++ ++ pma[i] = pma_dev->ops.pma_alloc_page(pma_dev, order); + if (!pma[i]) + break; + -+ phys[i] = as_tagged(pma_dev->ops.pma_get_phys_addr(pma_dev, -+ pma[i])); ++ phys_addr = pma_dev->ops.pma_get_phys_addr(pma_dev, pma[i]); ++ ++ if (order) { ++ size_t j; ++ ++ *phys++ = as_tagged_tag(phys_addr, HUGE_HEAD | HUGE_PAGE); ++ ++ for (j = 1; j < num_pages_order; j++) { ++ *phys++ = as_tagged_tag(phys_addr + ++ PAGE_SIZE * j, ++ HUGE_PAGE); ++ } ++ } else { ++ phys[i] = as_tagged(phys_addr); ++ } + } + + if (i != num_pages) { -+ kbase_csf_protected_memory_free(kbdev, pma, i); ++ kbase_csf_protected_memory_free(kbdev, pma, i * num_pages_order, is_small_page); + return NULL; + } + @@ -168658,15 +185202,28 @@ index 000000000000..987cbc2fc201 +void kbase_csf_protected_memory_free( + struct kbase_device *const kbdev, + struct protected_memory_allocation **pma, -+ size_t num_pages) ++ size_t num_pages, ++ bool is_small_page) +{ + size_t i; + struct protected_memory_allocator_device *pma_dev = + kbdev->csf.pma_dev; ++ unsigned int num_pages_order = (1u << KBASE_MEM_POOL_2MB_PAGE_TABLE_ORDER); ++ ++ if (is_small_page) ++ num_pages_order = (1u << KBASE_MEM_POOL_4KB_PAGE_TABLE_ORDER); + + if (WARN_ON(!pma_dev) || WARN_ON(!pma)) + return; + ++ /* Ensure the requested num_pages is aligned with ++ * the order type passed as argument. ++ * ++ * pma_alloc_page() will then handle the granularity ++ * of the allocation based on order. ++ */ ++ num_pages = div64_u64(num_pages + num_pages_order - 1, num_pages_order); ++ + for (i = 0; i < num_pages; i++) + pma_dev->ops.pma_free_page(pma_dev, pma[i]); + @@ -168674,18 +185231,19 @@ index 000000000000..987cbc2fc201 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h new file mode 100755 -index 000000000000..2b459911d834 +index 000000000..8c1aa919f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h -@@ -0,0 +1,72 @@ +@@ -0,0 +1,75 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -168696,8 +185254,6 @@ index 000000000000..2b459911d834 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CSF_PROTECTED_MEMORY_H_ @@ -168727,6 +185283,7 @@ index 000000000000..2b459911d834 + * @phys: Array of physical addresses to be filled in by the protected + * memory allocator. + * @num_pages: Number of pages requested to be allocated. ++ * @is_small_page: Flag used to select the order of protected memory page. + * + * Return: Pointer to an array of protected memory allocations on success, + * or NULL on failure. @@ -168735,7 +185292,8 @@ index 000000000000..2b459911d834 + kbase_csf_protected_memory_alloc( + struct kbase_device *const kbdev, + struct tagged_addr *phys, -+ size_t num_pages); ++ size_t num_pages, ++ bool is_small_page); + +/** + * kbase_csf_protected_memory_free - Free the allocated @@ -168744,26 +185302,1713 @@ index 000000000000..2b459911d834 + * @kbdev: Device pointer. + * @pma: Array of pointer to protected memory allocations. + * @num_pages: Number of pages to be freed. ++ * @is_small_page: Flag used to select the order of protected memory page. + */ +void kbase_csf_protected_memory_free( + struct kbase_device *const kbdev, + struct protected_memory_allocation **pma, -+ size_t num_pages); ++ size_t num_pages, ++ bool is_small_page); +#endif +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_registers.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_registers.h +new file mode 100644 +index 000000000..b5bf7bbbc +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_registers.h +@@ -0,0 +1,1678 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2018-2023 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++/* ++ * This header was originally autogenerated, but it is now ok (and ++ * expected) to have to add to it. ++ */ ++ ++#ifndef _KBASE_CSF_REGISTERS_H_ ++#define _KBASE_CSF_REGISTERS_H_ ++ ++/* ++ * Begin register sets ++ */ ++ ++/* CS_KERNEL_INPUT_BLOCK base address */ ++#define CS_KERNEL_INPUT_BLOCK_BASE 0x0000 ++#define CS_KERNEL_INPUT_BLOCK_REG(r) (CS_KERNEL_INPUT_BLOCK_BASE + (r)) ++ ++/* CS_KERNEL_OUTPUT_BLOCK base address */ ++#define CS_KERNEL_OUTPUT_BLOCK_BASE 0x0000 ++#define CS_KERNEL_OUTPUT_BLOCK_REG(r) (CS_KERNEL_OUTPUT_BLOCK_BASE + (r)) ++ ++/* CS_USER_INPUT_BLOCK base address */ ++#define CS_USER_INPUT_BLOCK_BASE 0x0000 ++#define CS_USER_INPUT_BLOCK_REG(r) (CS_USER_INPUT_BLOCK_BASE + (r)) ++ ++/* CS_USER_OUTPUT_BLOCK base address */ ++#define CS_USER_OUTPUT_BLOCK_BASE 0x0000 ++#define CS_USER_OUTPUT_BLOCK_REG(r) (CS_USER_OUTPUT_BLOCK_BASE + (r)) ++ ++/* CSG_INPUT_BLOCK base address */ ++#define CSG_INPUT_BLOCK_BASE 0x0000 ++#define CSG_INPUT_BLOCK_REG(r) (CSG_INPUT_BLOCK_BASE + (r)) ++ ++/* CSG_OUTPUT_BLOCK base address */ ++#define CSG_OUTPUT_BLOCK_BASE 0x0000 ++#define CSG_OUTPUT_BLOCK_REG(r) (CSG_OUTPUT_BLOCK_BASE + (r)) ++ ++/* GLB_CONTROL_BLOCK base address */ ++#define GLB_CONTROL_BLOCK_BASE 0x04000000 ++#define GLB_CONTROL_BLOCK_REG(r) (GLB_CONTROL_BLOCK_BASE + (r)) ++ ++/* GLB_INPUT_BLOCK base address */ ++#define GLB_INPUT_BLOCK_BASE 0x0000 ++#define GLB_INPUT_BLOCK_REG(r) (GLB_INPUT_BLOCK_BASE + (r)) ++ ++/* GLB_OUTPUT_BLOCK base address */ ++#define GLB_OUTPUT_BLOCK_BASE 0x0000 ++#define GLB_OUTPUT_BLOCK_REG(r) (GLB_OUTPUT_BLOCK_BASE + (r)) ++ ++/* End register sets */ ++ ++/* ++ * Begin register offsets ++ */ ++ ++/* DOORBELLS register offsets */ ++#define DOORBELL_0 0x0000 /* () Doorbell 0 register */ ++#define DOORBELL(n) (DOORBELL_0 + (n)*65536) ++#define DOORBELL_REG(n, r) (DOORBELL(n) + DOORBELL_BLOCK_REG(r)) ++#define DOORBELL_COUNT 1024 ++ ++/* DOORBELL_BLOCK register offsets */ ++#define DB_BLK_DOORBELL 0x0000 /* (WO) Doorbell request */ ++ ++/* CS_KERNEL_INPUT_BLOCK register offsets */ ++#define CS_REQ 0x0000 /* () CS request flags */ ++#define CS_CONFIG 0x0004 /* () CS configuration */ ++#define CS_ACK_IRQ_MASK 0x000C /* () Command steam interrupt mask */ ++#define CS_BASE_LO 0x0010 /* () Base pointer for the ring buffer, low word */ ++#define CS_BASE_HI 0x0014 /* () Base pointer for the ring buffer, high word */ ++#define CS_SIZE 0x0018 /* () Size of the ring buffer */ ++#define CS_TILER_HEAP_START_LO 0x0020 /* () Pointer to heap start, low word */ ++#define CS_TILER_HEAP_START_HI 0x0024 /* () Pointer to heap start, high word */ ++#define CS_TILER_HEAP_END_LO 0x0028 /* () Tiler heap descriptor address, low word */ ++#define CS_TILER_HEAP_END_HI 0x002C /* () Tiler heap descriptor address, high word */ ++#define CS_USER_INPUT_LO 0x0030 /* () CS user mode input page address, low word */ ++#define CS_USER_INPUT_HI 0x0034 /* () CS user mode input page address, high word */ ++#define CS_USER_OUTPUT_LO 0x0038 /* () CS user mode input page address, low word */ ++#define CS_USER_OUTPUT_HI 0x003C /* () CS user mode input page address, high word */ ++#define CS_INSTR_CONFIG 0x0040 /* () Instrumentation buffer configuration */ ++#define CS_INSTR_BUFFER_SIZE 0x0044 /* () Instrumentation buffer size */ ++#define CS_INSTR_BUFFER_BASE_LO 0x0048 /* () Instrumentation buffer base pointer, low word */ ++#define CS_INSTR_BUFFER_BASE_HI 0x004C /* () Instrumentation buffer base pointer, high word */ ++#define CS_INSTR_BUFFER_OFFSET_POINTER_LO 0x0050 /* () Instrumentation buffer pointer to insert offset, low word */ ++#define CS_INSTR_BUFFER_OFFSET_POINTER_HI 0x0054 /* () Instrumentation buffer pointer to insert offset, high word */ ++ ++/* CS_KERNEL_OUTPUT_BLOCK register offsets */ ++#define CS_ACK 0x0000 /* () CS acknowledge flags */ ++#define CS_STATUS_CMD_PTR_LO 0x0040 /* () Program pointer current value, low word */ ++#define CS_STATUS_CMD_PTR_HI 0x0044 /* () Program pointer current value, high word */ ++#define CS_STATUS_WAIT 0x0048 /* () Wait condition status register */ ++#define CS_STATUS_REQ_RESOURCE 0x004C /* () Indicates the resources requested by the CS */ ++#define CS_STATUS_WAIT_SYNC_POINTER_LO 0x0050 /* () Sync object pointer, low word */ ++#define CS_STATUS_WAIT_SYNC_POINTER_HI 0x0054 /* () Sync object pointer, high word */ ++#define CS_STATUS_WAIT_SYNC_VALUE 0x0058 /* () Sync object test value */ ++#define CS_STATUS_SCOREBOARDS 0x005C /* () Scoreboard status */ ++#define CS_STATUS_BLOCKED_REASON 0x0060 /* () Blocked reason */ ++#define CS_FAULT 0x0080 /* () Recoverable fault information */ ++#define CS_FATAL 0x0084 /* () Unrecoverable fault information */ ++#define CS_FAULT_INFO_LO 0x0088 /* () Additional information about a recoverable fault, low word */ ++#define CS_FAULT_INFO_HI 0x008C /* () Additional information about a recoverable fault, high word */ ++#define CS_FATAL_INFO_LO 0x0090 /* () Additional information about a non-recoverable fault, low word */ ++#define CS_FATAL_INFO_HI 0x0094 /* () Additional information about a non-recoverable fault, high word */ ++#define CS_HEAP_VT_START 0x00C0 /* () Number of vertex/tiling operations started */ ++#define CS_HEAP_VT_END 0x00C4 /* () Number of vertex/tiling operations completed */ ++#define CS_HEAP_FRAG_END 0x00CC /* () Number of fragment completed */ ++#define CS_HEAP_ADDRESS_LO 0x00D0 /* () Heap address, low word */ ++#define CS_HEAP_ADDRESS_HI 0x00D4 /* () Heap address, high word */ ++ ++/* CS_USER_INPUT_BLOCK register offsets */ ++#define CS_INSERT_LO 0x0000 /* () Current insert offset for ring buffer, low word */ ++#define CS_INSERT_HI 0x0004 /* () Current insert offset for ring buffer, high word */ ++#define CS_EXTRACT_INIT_LO 0x0008 /* () Initial extract offset for ring buffer, low word */ ++#define CS_EXTRACT_INIT_HI 0x000C /* () Initial extract offset for ring buffer, high word */ ++ ++/* CS_USER_OUTPUT_BLOCK register offsets */ ++#define CS_EXTRACT_LO 0x0000 /* () Current extract offset for ring buffer, low word */ ++#define CS_EXTRACT_HI 0x0004 /* () Current extract offset for ring buffer, high word */ ++#define CS_ACTIVE 0x0008 /* () Initial extract offset when the CS is started */ ++ ++/* CSG_INPUT_BLOCK register offsets */ ++#define CSG_REQ 0x0000 /* () CSG request */ ++#define CSG_ACK_IRQ_MASK 0x0004 /* () Global acknowledge interrupt mask */ ++#define CSG_DB_REQ 0x0008 /* () Global doorbell request */ ++#define CSG_IRQ_ACK 0x000C /* () CS IRQ acknowledge */ ++#define CSG_ALLOW_COMPUTE_LO 0x0020 /* () Allowed compute endpoints, low word */ ++#define CSG_ALLOW_COMPUTE_HI 0x0024 /* () Allowed compute endpoints, high word */ ++#define CSG_ALLOW_FRAGMENT_LO 0x0028 /* () Allowed fragment endpoints, low word */ ++#define CSG_ALLOW_FRAGMENT_HI 0x002C /* () Allowed fragment endpoints, high word */ ++#define CSG_ALLOW_OTHER 0x0030 /* () Allowed other endpoints */ ++#define CSG_EP_REQ 0x0034 /* () Maximum number of endpoints allowed */ ++#define CSG_SUSPEND_BUF_LO 0x0040 /* () Normal mode suspend buffer, low word */ ++#define CSG_SUSPEND_BUF_HI 0x0044 /* () Normal mode suspend buffer, high word */ ++#define CSG_PROTM_SUSPEND_BUF_LO 0x0048 /* () Protected mode suspend buffer, low word */ ++#define CSG_PROTM_SUSPEND_BUF_HI 0x004C /* () Protected mode suspend buffer, high word */ ++#define CSG_CONFIG 0x0050 /* () CSG configuration options */ ++#define CSG_ITER_TRACE_CONFIG 0x0054 /* () CSG trace configuration */ ++#define CSG_DVS_BUF_LO 0x0060 /* () Normal mode deferred vertex shading work buffer, low word */ ++#define CSG_DVS_BUF_HI 0x0064 /* () Normal mode deferred vertex shading work buffer, high word */ ++ ++/* CSG_OUTPUT_BLOCK register offsets */ ++#define CSG_ACK 0x0000 /* () CSG acknowledge flags */ ++#define CSG_DB_ACK 0x0008 /* () CS kernel doorbell acknowledge flags */ ++#define CSG_IRQ_REQ 0x000C /* () CS interrupt request flags */ ++#define CSG_STATUS_EP_CURRENT 0x0010 /* () Endpoint allocation status register */ ++#define CSG_STATUS_EP_REQ 0x0014 /* () Endpoint request status register */ ++#define CSG_RESOURCE_DEP 0x001C /* () Current resource dependencies */ ++ ++/* GLB_CONTROL_BLOCK register offsets */ ++#define GLB_VERSION 0x0000 /* () Global interface version */ ++#define GLB_FEATURES 0x0004 /* () Global interface features */ ++#define GLB_INPUT_VA 0x0008 /* () Address of GLB_INPUT_BLOCK */ ++#define GLB_OUTPUT_VA 0x000C /* () Address of GLB_OUTPUT_BLOCK */ ++#define GLB_GROUP_NUM 0x0010 /* () Number of CSG interfaces */ ++#define GLB_GROUP_STRIDE 0x0014 /* () Stride between CSG interfaces */ ++#define GLB_PRFCNT_SIZE 0x0018 /* () Size of CSF performance counters */ ++#define GLB_INSTR_FEATURES \ ++ 0x001C /* () TRACE_POINT instrumentation. (csf >= 1.1.0) */ ++#define GROUP_CONTROL_0 0x1000 /* () CSG control and capabilities */ ++#define GROUP_CONTROL(n) (GROUP_CONTROL_0 + (n)*256) ++#define GROUP_CONTROL_REG(n, r) (GROUP_CONTROL(n) + GROUP_CONTROL_BLOCK_REG(r)) ++#define GROUP_CONTROL_COUNT 16 ++ ++/* STREAM_CONTROL_BLOCK register offsets */ ++#define STREAM_FEATURES 0x0000 /* () CSI features */ ++#define STREAM_INPUT_VA 0x0004 /* () Address of CS_KERNEL_INPUT_BLOCK */ ++#define STREAM_OUTPUT_VA 0x0008 /* () Address of CS_KERNEL_OUTPUT_BLOCK */ ++ ++/* GROUP_CONTROL_BLOCK register offsets */ ++#define GROUP_FEATURES 0x0000 /* () CSG interface features */ ++#define GROUP_INPUT_VA 0x0004 /* () Address of CSG_INPUT_BLOCK */ ++#define GROUP_OUTPUT_VA 0x0008 /* () Address of CSG_OUTPUT_BLOCK */ ++#define GROUP_SUSPEND_SIZE 0x000C /* () Size of CSG suspend buffer */ ++#define GROUP_PROTM_SUSPEND_SIZE 0x0010 /* () Size of CSG protected-mode suspend buffer */ ++#define GROUP_STREAM_NUM 0x0014 /* () Number of CS interfaces */ ++#define GROUP_STREAM_STRIDE 0x0018 /* () Stride between CS interfaces */ ++#define STREAM_CONTROL_0 0x0040 /* () CS control and capabilities */ ++#define STREAM_CONTROL(n) (STREAM_CONTROL_0 + (n)*12) ++#define STREAM_CONTROL_REG(n, r) (STREAM_CONTROL(n) + STREAM_CONTROL_BLOCK_REG(r)) ++#define STREAM_CONTROL_COUNT 16 ++ ++/* GLB_INPUT_BLOCK register offsets */ ++#define GLB_REQ 0x0000 /* () Global request */ ++#define GLB_ACK_IRQ_MASK 0x0004 /* () Global acknowledge interrupt mask */ ++#define GLB_DB_REQ 0x0008 /* () Global doorbell request */ ++#define GLB_PROGRESS_TIMER 0x0010 /* () Global progress timeout */ ++#define GLB_PWROFF_TIMER 0x0014 /* () Global shader core power off timer */ ++#define GLB_ALLOC_EN_LO 0x0018 /* () Global shader core allocation enable mask, low word */ ++#define GLB_ALLOC_EN_HI 0x001C /* () Global shader core allocation enable mask, high word */ ++ ++#define GLB_PRFCNT_JASID 0x0024 /* () Performance counter address space */ ++#define GLB_PRFCNT_BASE_LO 0x0028 /* () Performance counter buffer address, low word */ ++#define GLB_PRFCNT_BASE_HI 0x002C /* () Performance counter buffer address, high word */ ++#define GLB_PRFCNT_EXTRACT 0x0030 /* () Performance counter buffer extract index */ ++#define GLB_PRFCNT_CONFIG 0x0040 /* () Performance counter configuration */ ++#define GLB_PRFCNT_CSG_SELECT 0x0044 /* () CSG performance counting enable */ ++#define GLB_PRFCNT_FW_EN 0x0048 /* () Performance counter enable for firmware */ ++#define GLB_PRFCNT_CSG_EN 0x004C /* () Performance counter enable for CSG */ ++#define GLB_PRFCNT_CSF_EN 0x0050 /* () Performance counter enable for CSF */ ++#define GLB_PRFCNT_SHADER_EN 0x0054 /* () Performance counter enable for shader cores */ ++#define GLB_PRFCNT_TILER_EN 0x0058 /* () Performance counter enable for tiler */ ++#define GLB_PRFCNT_MMU_L2_EN 0x005C /* () Performance counter enable for MMU/L2 cache */ ++ ++#define GLB_DEBUG_ARG_IN0 0x0FE0 /* Firmware Debug argument array element 0 */ ++#define GLB_DEBUG_ARG_IN1 0x0FE4 /* Firmware Debug argument array element 1 */ ++#define GLB_DEBUG_ARG_IN2 0x0FE8 /* Firmware Debug argument array element 2 */ ++#define GLB_DEBUG_ARG_IN3 0x0FEC /* Firmware Debug argument array element 3 */ ++ ++/* Mappings based on GLB_DEBUG_REQ.FWUTF_RUN bit being different from GLB_DEBUG_ACK.FWUTF_RUN */ ++#define GLB_DEBUG_FWUTF_DESTROY GLB_DEBUG_ARG_IN0 /* () Test fixture destroy function address */ ++#define GLB_DEBUG_FWUTF_TEST GLB_DEBUG_ARG_IN1 /* () Test index */ ++#define GLB_DEBUG_FWUTF_FIXTURE GLB_DEBUG_ARG_IN2 /* () Test fixture index */ ++#define GLB_DEBUG_FWUTF_CREATE GLB_DEBUG_ARG_IN3 /* () Test fixture create function address */ ++ ++#define GLB_DEBUG_ACK_IRQ_MASK 0x0FF8 /* () Global debug acknowledge interrupt mask */ ++#define GLB_DEBUG_REQ 0x0FFC /* () Global debug request */ ++ ++/* GLB_OUTPUT_BLOCK register offsets */ ++#define GLB_DEBUG_ARG_OUT0 0x0FE0 /* Firmware debug result element 0 */ ++#define GLB_DEBUG_ARG_OUT1 0x0FE4 /* Firmware debug result element 1 */ ++#define GLB_DEBUG_ARG_OUT2 0x0FE8 /* Firmware debug result element 2 */ ++#define GLB_DEBUG_ARG_OUT3 0x0FEC /* Firmware debug result element 3 */ ++ ++#define GLB_ACK 0x0000 /* () Global acknowledge */ ++#define GLB_DB_ACK 0x0008 /* () Global doorbell acknowledge */ ++#define GLB_HALT_STATUS 0x0010 /* () Global halt status */ ++#define GLB_PRFCNT_STATUS 0x0014 /* () Performance counter status */ ++#define GLB_PRFCNT_INSERT 0x0018 /* () Performance counter buffer insert index */ ++#define GLB_DEBUG_FWUTF_RESULT GLB_DEBUG_ARG_OUT0 /* () Firmware debug test result */ ++#define GLB_DEBUG_ACK 0x0FFC /* () Global debug acknowledge */ ++ ++#ifdef CONFIG_MALI_CORESIGHT ++#define GLB_DEBUG_REQ_FW_AS_WRITE_SHIFT 4 ++#define GLB_DEBUG_REQ_FW_AS_WRITE_MASK (0x1 << GLB_DEBUG_REQ_FW_AS_WRITE_SHIFT) ++#define GLB_DEBUG_REQ_FW_AS_READ_SHIFT 5 ++#define GLB_DEBUG_REQ_FW_AS_READ_MASK (0x1 << GLB_DEBUG_REQ_FW_AS_READ_SHIFT) ++#define GLB_DEBUG_ARG_IN0 0x0FE0 ++#define GLB_DEBUG_ARG_IN1 0x0FE4 ++#define GLB_DEBUG_ARG_OUT0 0x0FE0 ++#endif /* CONFIG_MALI_CORESIGHT */ ++ ++/* End register offsets */ ++ ++/* CS_KERNEL_INPUT_BLOCK register set definitions */ ++/* GLB_VERSION register */ ++#define GLB_VERSION_PATCH_SHIFT (0) ++#define GLB_VERSION_PATCH_MASK ((0xFFFF) << GLB_VERSION_PATCH_SHIFT) ++#define GLB_VERSION_PATCH_GET(reg_val) (((reg_val)&GLB_VERSION_PATCH_MASK) >> GLB_VERSION_PATCH_SHIFT) ++#define GLB_VERSION_PATCH_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_VERSION_PATCH_MASK) | (((value) << GLB_VERSION_PATCH_SHIFT) & GLB_VERSION_PATCH_MASK)) ++#define GLB_VERSION_MINOR_SHIFT (16) ++#define GLB_VERSION_MINOR_MASK ((0xFF) << GLB_VERSION_MINOR_SHIFT) ++#define GLB_VERSION_MINOR_GET(reg_val) (((reg_val)&GLB_VERSION_MINOR_MASK) >> GLB_VERSION_MINOR_SHIFT) ++#define GLB_VERSION_MINOR_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_VERSION_MINOR_MASK) | (((value) << GLB_VERSION_MINOR_SHIFT) & GLB_VERSION_MINOR_MASK)) ++#define GLB_VERSION_MAJOR_SHIFT (24) ++#define GLB_VERSION_MAJOR_MASK ((0xFF) << GLB_VERSION_MAJOR_SHIFT) ++#define GLB_VERSION_MAJOR_GET(reg_val) (((reg_val)&GLB_VERSION_MAJOR_MASK) >> GLB_VERSION_MAJOR_SHIFT) ++#define GLB_VERSION_MAJOR_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_VERSION_MAJOR_MASK) | (((value) << GLB_VERSION_MAJOR_SHIFT) & GLB_VERSION_MAJOR_MASK)) ++ ++/* CS_REQ register */ ++#define CS_REQ_STATE_SHIFT 0 ++#define CS_REQ_STATE_MASK (0x7 << CS_REQ_STATE_SHIFT) ++#define CS_REQ_STATE_GET(reg_val) (((reg_val)&CS_REQ_STATE_MASK) >> CS_REQ_STATE_SHIFT) ++#define CS_REQ_STATE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_REQ_STATE_MASK) | (((value) << CS_REQ_STATE_SHIFT) & CS_REQ_STATE_MASK)) ++/* CS_REQ_STATE values */ ++#define CS_REQ_STATE_STOP 0x0 ++#define CS_REQ_STATE_START 0x1 ++/* End of CS_REQ_STATE values */ ++#define CS_REQ_EXTRACT_EVENT_SHIFT 4 ++#define CS_REQ_EXTRACT_EVENT_MASK (0x1 << CS_REQ_EXTRACT_EVENT_SHIFT) ++#define CS_REQ_EXTRACT_EVENT_GET(reg_val) (((reg_val)&CS_REQ_EXTRACT_EVENT_MASK) >> CS_REQ_EXTRACT_EVENT_SHIFT) ++#define CS_REQ_EXTRACT_EVENT_SET(reg_val, value) \ ++ (((reg_val) & ~CS_REQ_EXTRACT_EVENT_MASK) | (((value) << CS_REQ_EXTRACT_EVENT_SHIFT) & CS_REQ_EXTRACT_EVENT_MASK)) ++ ++#define CS_REQ_IDLE_SYNC_WAIT_SHIFT 8 ++#define CS_REQ_IDLE_SYNC_WAIT_MASK (0x1 << CS_REQ_IDLE_SYNC_WAIT_SHIFT) ++#define CS_REQ_IDLE_SYNC_WAIT_GET(reg_val) (((reg_val)&CS_REQ_IDLE_SYNC_WAIT_MASK) >> CS_REQ_IDLE_SYNC_WAIT_SHIFT) ++#define CS_REQ_IDLE_SYNC_WAIT_SET(reg_val, value) \ ++ (((reg_val) & ~CS_REQ_IDLE_SYNC_WAIT_MASK) | \ ++ (((value) << CS_REQ_IDLE_SYNC_WAIT_SHIFT) & CS_REQ_IDLE_SYNC_WAIT_MASK)) ++#define CS_REQ_IDLE_PROTM_PEND_SHIFT 9 ++#define CS_REQ_IDLE_PROTM_PEND_MASK (0x1 << CS_REQ_IDLE_PROTM_PEND_SHIFT) ++#define CS_REQ_IDLE_PROTM_PEND_GET(reg_val) (((reg_val)&CS_REQ_IDLE_PROTM_PEND_MASK) >> CS_REQ_IDLE_PROTM_PEND_SHIFT) ++#define CS_REQ_IDLE_PROTM_PEND_SET(reg_val, value) \ ++ (((reg_val) & ~CS_REQ_IDLE_PROTM_PEND_MASK) | \ ++ (((value) << CS_REQ_IDLE_PROTM_PEND_SHIFT) & CS_REQ_IDLE_PROTM_PEND_MASK)) ++#define CS_REQ_IDLE_EMPTY_SHIFT 10 ++#define CS_REQ_IDLE_EMPTY_MASK (0x1 << CS_REQ_IDLE_EMPTY_SHIFT) ++#define CS_REQ_IDLE_EMPTY_GET(reg_val) (((reg_val)&CS_REQ_IDLE_EMPTY_MASK) >> CS_REQ_IDLE_EMPTY_SHIFT) ++#define CS_REQ_IDLE_EMPTY_SET(reg_val, value) \ ++ (((reg_val) & ~CS_REQ_IDLE_EMPTY_MASK) | (((value) << CS_REQ_IDLE_EMPTY_SHIFT) & CS_REQ_IDLE_EMPTY_MASK)) ++#define CS_REQ_IDLE_RESOURCE_REQ_SHIFT 11 ++#define CS_REQ_IDLE_RESOURCE_REQ_MASK (0x1 << CS_REQ_IDLE_RESOURCE_REQ_SHIFT) ++#define CS_REQ_IDLE_RESOURCE_REQ_GET(reg_val) \ ++ (((reg_val) & CS_REQ_IDLE_RESOURCE_REQ_MASK) >> CS_REQ_IDLE_RESOURCE_REQ_SHIFT) ++#define CS_REQ_IDLE_RESOURCE_REQ_SET(reg_val, value) \ ++ (((reg_val) & ~CS_REQ_IDLE_RESOURCE_REQ_MASK) | \ ++ (((value) << CS_REQ_IDLE_RESOURCE_REQ_SHIFT) & CS_REQ_IDLE_RESOURCE_REQ_MASK)) ++#define CS_REQ_IDLE_SHARED_SB_DEC_SHIFT 12 ++#define CS_REQ_IDLE_SHARED_SB_DEC_MASK (0x1 << CS_REQ_IDLE_SHARED_SB_DEC_SHIFT) ++#define CS_REQ_IDLE_SHARED_SB_DEC_GET(reg_val) \ ++ (((reg_val) & CS_REQ_IDLE_SHARED_SB_DEC_MASK) >> CS_REQ_IDLE_SHARED_SB_DEC_SHIFT) ++#define CS_REQ_IDLE_SHARED_SB_DEC_REQ_SET(reg_val, value) \ ++ (((reg_val) & ~CS_REQ_IDLE_SHARED_SB_DEC_MASK) | \ ++ (((value) << CS_REQ_IDLE_SHARED_SB_DEC_SHIFT) & CS_REQ_IDLE_SHARED_SB_DEC_MASK)) ++#define CS_REQ_TILER_OOM_SHIFT 26 ++#define CS_REQ_TILER_OOM_MASK (0x1 << CS_REQ_TILER_OOM_SHIFT) ++#define CS_REQ_TILER_OOM_GET(reg_val) (((reg_val)&CS_REQ_TILER_OOM_MASK) >> CS_REQ_TILER_OOM_SHIFT) ++#define CS_REQ_TILER_OOM_SET(reg_val, value) \ ++ (((reg_val) & ~CS_REQ_TILER_OOM_MASK) | (((value) << CS_REQ_TILER_OOM_SHIFT) & CS_REQ_TILER_OOM_MASK)) ++#define CS_REQ_PROTM_PEND_SHIFT 27 ++#define CS_REQ_PROTM_PEND_MASK (0x1 << CS_REQ_PROTM_PEND_SHIFT) ++#define CS_REQ_PROTM_PEND_GET(reg_val) (((reg_val)&CS_REQ_PROTM_PEND_MASK) >> CS_REQ_PROTM_PEND_SHIFT) ++#define CS_REQ_PROTM_PEND_SET(reg_val, value) \ ++ (((reg_val) & ~CS_REQ_PROTM_PEND_MASK) | (((value) << CS_REQ_PROTM_PEND_SHIFT) & CS_REQ_PROTM_PEND_MASK)) ++#define CS_REQ_FATAL_SHIFT 30 ++#define CS_REQ_FATAL_MASK (0x1 << CS_REQ_FATAL_SHIFT) ++#define CS_REQ_FATAL_GET(reg_val) (((reg_val)&CS_REQ_FATAL_MASK) >> CS_REQ_FATAL_SHIFT) ++#define CS_REQ_FATAL_SET(reg_val, value) \ ++ (((reg_val) & ~CS_REQ_FATAL_MASK) | (((value) << CS_REQ_FATAL_SHIFT) & CS_REQ_FATAL_MASK)) ++#define CS_REQ_FAULT_SHIFT 31 ++#define CS_REQ_FAULT_MASK (0x1 << CS_REQ_FAULT_SHIFT) ++#define CS_REQ_FAULT_GET(reg_val) (((reg_val)&CS_REQ_FAULT_MASK) >> CS_REQ_FAULT_SHIFT) ++#define CS_REQ_FAULT_SET(reg_val, value) \ ++ (((reg_val) & ~CS_REQ_FAULT_MASK) | (((value) << CS_REQ_FAULT_SHIFT) & CS_REQ_FAULT_MASK)) ++ ++/* CS_CONFIG register */ ++#define CS_CONFIG_PRIORITY_SHIFT 0 ++#define CS_CONFIG_PRIORITY_MASK (0xF << CS_CONFIG_PRIORITY_SHIFT) ++#define CS_CONFIG_PRIORITY_GET(reg_val) (((reg_val)&CS_CONFIG_PRIORITY_MASK) >> CS_CONFIG_PRIORITY_SHIFT) ++#define CS_CONFIG_PRIORITY_SET(reg_val, value) \ ++ (((reg_val) & ~CS_CONFIG_PRIORITY_MASK) | (((value) << CS_CONFIG_PRIORITY_SHIFT) & CS_CONFIG_PRIORITY_MASK)) ++#define CS_CONFIG_USER_DOORBELL_SHIFT 8 ++#define CS_CONFIG_USER_DOORBELL_MASK (0xFF << CS_CONFIG_USER_DOORBELL_SHIFT) ++#define CS_CONFIG_USER_DOORBELL_GET(reg_val) (((reg_val)&CS_CONFIG_USER_DOORBELL_MASK) >> CS_CONFIG_USER_DOORBELL_SHIFT) ++#define CS_CONFIG_USER_DOORBELL_SET(reg_val, value) \ ++ (((reg_val) & ~CS_CONFIG_USER_DOORBELL_MASK) | \ ++ (((value) << CS_CONFIG_USER_DOORBELL_SHIFT) & CS_CONFIG_USER_DOORBELL_MASK)) ++ ++/* CS_ACK_IRQ_MASK register */ ++#define CS_ACK_IRQ_MASK_STATE_SHIFT 0 ++#define CS_ACK_IRQ_MASK_STATE_MASK (0x7 << CS_ACK_IRQ_MASK_STATE_SHIFT) ++#define CS_ACK_IRQ_MASK_STATE_GET(reg_val) (((reg_val)&CS_ACK_IRQ_MASK_STATE_MASK) >> CS_ACK_IRQ_MASK_STATE_SHIFT) ++#define CS_ACK_IRQ_MASK_STATE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_ACK_IRQ_MASK_STATE_MASK) | \ ++ (((value) << CS_ACK_IRQ_MASK_STATE_SHIFT) & CS_ACK_IRQ_MASK_STATE_MASK)) ++/* CS_ACK_IRQ_MASK_STATE values */ ++#define CS_ACK_IRQ_MASK_STATE_DISABLED 0x0 ++#define CS_ACK_IRQ_MASK_STATE_ENABLED 0x7 ++/* End of CS_ACK_IRQ_MASK_STATE values */ ++#define CS_ACK_IRQ_MASK_EXTRACT_EVENT_SHIFT 4 ++#define CS_ACK_IRQ_MASK_EXTRACT_EVENT_MASK (0x1 << CS_ACK_IRQ_MASK_EXTRACT_EVENT_SHIFT) ++#define CS_ACK_IRQ_MASK_EXTRACT_EVENT_GET(reg_val) \ ++ (((reg_val)&CS_ACK_IRQ_MASK_EXTRACT_EVENT_MASK) >> CS_ACK_IRQ_MASK_EXTRACT_EVENT_SHIFT) ++#define CS_ACK_IRQ_MASK_EXTRACT_EVENT_SET(reg_val, value) \ ++ (((reg_val) & ~CS_ACK_IRQ_MASK_EXTRACT_EVENT_MASK) | \ ++ (((value) << CS_ACK_IRQ_MASK_EXTRACT_EVENT_SHIFT) & CS_ACK_IRQ_MASK_EXTRACT_EVENT_MASK)) ++#define CS_ACK_IRQ_MASK_TILER_OOM_SHIFT 26 ++#define CS_ACK_IRQ_MASK_TILER_OOM_MASK (0x1 << CS_ACK_IRQ_MASK_TILER_OOM_SHIFT) ++#define CS_ACK_IRQ_MASK_TILER_OOM_GET(reg_val) \ ++ (((reg_val)&CS_ACK_IRQ_MASK_TILER_OOM_MASK) >> CS_ACK_IRQ_MASK_TILER_OOM_SHIFT) ++#define CS_ACK_IRQ_MASK_TILER_OOM_SET(reg_val, value) \ ++ (((reg_val) & ~CS_ACK_IRQ_MASK_TILER_OOM_MASK) | \ ++ (((value) << CS_ACK_IRQ_MASK_TILER_OOM_SHIFT) & CS_ACK_IRQ_MASK_TILER_OOM_MASK)) ++#define CS_ACK_IRQ_MASK_PROTM_PEND_SHIFT 27 ++#define CS_ACK_IRQ_MASK_PROTM_PEND_MASK (0x1 << CS_ACK_IRQ_MASK_PROTM_PEND_SHIFT) ++#define CS_ACK_IRQ_MASK_PROTM_PEND_GET(reg_val) \ ++ (((reg_val)&CS_ACK_IRQ_MASK_PROTM_PEND_MASK) >> CS_ACK_IRQ_MASK_PROTM_PEND_SHIFT) ++#define CS_ACK_IRQ_MASK_PROTM_PEND_SET(reg_val, value) \ ++ (((reg_val) & ~CS_ACK_IRQ_MASK_PROTM_PEND_MASK) | \ ++ (((value) << CS_ACK_IRQ_MASK_PROTM_PEND_SHIFT) & CS_ACK_IRQ_MASK_PROTM_PEND_MASK)) ++#define CS_ACK_IRQ_MASK_FATAL_SHIFT 30 ++#define CS_ACK_IRQ_MASK_FATAL_MASK (0x1 << CS_ACK_IRQ_MASK_FATAL_SHIFT) ++#define CS_ACK_IRQ_MASK_FATAL_GET(reg_val) (((reg_val)&CS_ACK_IRQ_MASK_FATAL_MASK) >> CS_ACK_IRQ_MASK_FATAL_SHIFT) ++#define CS_ACK_IRQ_MASK_FATAL_SET(reg_val, value) \ ++ (((reg_val) & ~CS_ACK_IRQ_MASK_FATAL_MASK) | \ ++ (((value) << CS_ACK_IRQ_MASK_FATAL_SHIFT) & CS_ACK_IRQ_MASK_FATAL_MASK)) ++#define CS_ACK_IRQ_MASK_FAULT_SHIFT 31 ++#define CS_ACK_IRQ_MASK_FAULT_MASK (0x1 << CS_ACK_IRQ_MASK_FAULT_SHIFT) ++#define CS_ACK_IRQ_MASK_FAULT_GET(reg_val) (((reg_val)&CS_ACK_IRQ_MASK_FAULT_MASK) >> CS_ACK_IRQ_MASK_FAULT_SHIFT) ++#define CS_ACK_IRQ_MASK_FAULT_SET(reg_val, value) \ ++ (((reg_val) & ~CS_ACK_IRQ_MASK_FAULT_MASK) | \ ++ (((value) << CS_ACK_IRQ_MASK_FAULT_SHIFT) & CS_ACK_IRQ_MASK_FAULT_MASK)) ++ ++/* CS_BASE register */ ++#define CS_BASE_POINTER_SHIFT 0 ++#define CS_BASE_POINTER_MASK (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CS_BASE_POINTER_SHIFT) ++#define CS_BASE_POINTER_GET(reg_val) (((reg_val)&CS_BASE_POINTER_MASK) >> CS_BASE_POINTER_SHIFT) ++#define CS_BASE_POINTER_SET(reg_val, value) \ ++ (((reg_val) & ~CS_BASE_POINTER_MASK) | (((value) << CS_BASE_POINTER_SHIFT) & CS_BASE_POINTER_MASK)) ++ ++/* CS_SIZE register */ ++#define CS_SIZE_SIZE_SHIFT 0 ++#define CS_SIZE_SIZE_MASK (0xFFFFFFFF << CS_SIZE_SIZE_SHIFT) ++#define CS_SIZE_SIZE_GET(reg_val) (((reg_val)&CS_SIZE_SIZE_MASK) >> CS_SIZE_SIZE_SHIFT) ++#define CS_SIZE_SIZE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_SIZE_SIZE_MASK) | (((value) << CS_SIZE_SIZE_SHIFT) & CS_SIZE_SIZE_MASK)) ++ ++/* CS_TILER_HEAP_START register */ ++#define CS_TILER_HEAP_START_POINTER_SHIFT 0 ++#define CS_TILER_HEAP_START_POINTER_MASK \ ++ (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CS_TILER_HEAP_START_POINTER_SHIFT) ++#define CS_TILER_HEAP_START_POINTER_GET(reg_val) \ ++ (((reg_val)&CS_TILER_HEAP_START_POINTER_MASK) >> CS_TILER_HEAP_START_POINTER_SHIFT) ++#define CS_TILER_HEAP_START_POINTER_SET(reg_val, value) \ ++ (((reg_val) & ~CS_TILER_HEAP_START_POINTER_MASK) | \ ++ (((value) << CS_TILER_HEAP_START_POINTER_SHIFT) & CS_TILER_HEAP_START_POINTER_MASK)) ++/* HeapChunkPointer nested in CS_TILER_HEAP_START_POINTER */ ++/* End of HeapChunkPointer nested in CS_TILER_HEAP_START_POINTER */ ++ ++/* CS_TILER_HEAP_END register */ ++#define CS_TILER_HEAP_END_POINTER_SHIFT 0 ++#define CS_TILER_HEAP_END_POINTER_MASK \ ++ (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CS_TILER_HEAP_END_POINTER_SHIFT) ++#define CS_TILER_HEAP_END_POINTER_GET(reg_val) \ ++ (((reg_val)&CS_TILER_HEAP_END_POINTER_MASK) >> CS_TILER_HEAP_END_POINTER_SHIFT) ++#define CS_TILER_HEAP_END_POINTER_SET(reg_val, value) \ ++ (((reg_val) & ~CS_TILER_HEAP_END_POINTER_MASK) | \ ++ (((value) << CS_TILER_HEAP_END_POINTER_SHIFT) & CS_TILER_HEAP_END_POINTER_MASK)) ++/* HeapChunkPointer nested in CS_TILER_HEAP_END_POINTER */ ++/* End of HeapChunkPointer nested in CS_TILER_HEAP_END_POINTER */ ++ ++/* CS_USER_INPUT register */ ++#define CS_USER_INPUT_POINTER_SHIFT 0 ++#define CS_USER_INPUT_POINTER_MASK (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CS_USER_INPUT_POINTER_SHIFT) ++#define CS_USER_INPUT_POINTER_GET(reg_val) (((reg_val)&CS_USER_INPUT_POINTER_MASK) >> CS_USER_INPUT_POINTER_SHIFT) ++#define CS_USER_INPUT_POINTER_SET(reg_val, value) \ ++ (((reg_val) & ~CS_USER_INPUT_POINTER_MASK) | \ ++ (((value) << CS_USER_INPUT_POINTER_SHIFT) & CS_USER_INPUT_POINTER_MASK)) ++ ++/* CS_USER_OUTPUT register */ ++#define CS_USER_OUTPUT_POINTER_SHIFT 0 ++#define CS_USER_OUTPUT_POINTER_MASK (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CS_USER_OUTPUT_POINTER_SHIFT) ++#define CS_USER_OUTPUT_POINTER_GET(reg_val) (((reg_val)&CS_USER_OUTPUT_POINTER_MASK) >> CS_USER_OUTPUT_POINTER_SHIFT) ++#define CS_USER_OUTPUT_POINTER_SET(reg_val, value) \ ++ (((reg_val) & ~CS_USER_OUTPUT_POINTER_MASK) | \ ++ (((value) << CS_USER_OUTPUT_POINTER_SHIFT) & CS_USER_OUTPUT_POINTER_MASK)) ++ ++/* CS_INSTR_CONFIG register */ ++#define CS_INSTR_CONFIG_JASID_SHIFT (0) ++#define CS_INSTR_CONFIG_JASID_MASK ((u32)0xF << CS_INSTR_CONFIG_JASID_SHIFT) ++#define CS_INSTR_CONFIG_JASID_GET(reg_val) (((reg_val)&CS_INSTR_CONFIG_JASID_MASK) >> CS_INSTR_CONFIG_JASID_SHIFT) ++#define CS_INSTR_CONFIG_JASID_SET(reg_val, value) \ ++ (((reg_val) & ~CS_INSTR_CONFIG_JASID_MASK) | \ ++ (((value) << CS_INSTR_CONFIG_JASID_SHIFT) & CS_INSTR_CONFIG_JASID_MASK)) ++#define CS_INSTR_CONFIG_EVENT_SIZE_SHIFT (4) ++#define CS_INSTR_CONFIG_EVENT_SIZE_MASK ((u32)0xF << CS_INSTR_CONFIG_EVENT_SIZE_SHIFT) ++#define CS_INSTR_CONFIG_EVENT_SIZE_GET(reg_val) \ ++ (((reg_val)&CS_INSTR_CONFIG_EVENT_SIZE_MASK) >> CS_INSTR_CONFIG_EVENT_SIZE_SHIFT) ++#define CS_INSTR_CONFIG_EVENT_SIZE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_INSTR_CONFIG_EVENT_SIZE_MASK) | \ ++ (((value) << CS_INSTR_CONFIG_EVENT_SIZE_SHIFT) & CS_INSTR_CONFIG_EVENT_SIZE_MASK)) ++#define CS_INSTR_CONFIG_EVENT_STATE_SHIFT (16) ++#define CS_INSTR_CONFIG_EVENT_STATE_MASK ((u32)0xFF << CS_INSTR_CONFIG_EVENT_STATE_SHIFT) ++#define CS_INSTR_CONFIG_EVENT_STATE_GET(reg_val) \ ++ (((reg_val)&CS_INSTR_CONFIG_EVENT_STATE_MASK) >> CS_INSTR_CONFIG_EVENT_STATE_SHIFT) ++#define CS_INSTR_CONFIG_EVENT_STATE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_INSTR_CONFIG_EVENT_STATE_MASK) | \ ++ (((value) << CS_INSTR_CONFIG_EVENT_STATE_SHIFT) & CS_INSTR_CONFIG_EVENT_STATE_MASK)) ++ ++/* CS_INSTR_BUFFER_SIZE register */ ++#define CS_INSTR_BUFFER_SIZE_SIZE_SHIFT (0) ++#define CS_INSTR_BUFFER_SIZE_SIZE_MASK ((u32)0xFFFFFFFF << CS_INSTR_BUFFER_SIZE_SIZE_SHIFT) ++#define CS_INSTR_BUFFER_SIZE_SIZE_GET(reg_val) \ ++ (((reg_val)&CS_INSTR_BUFFER_SIZE_SIZE_MASK) >> CS_INSTR_BUFFER_SIZE_SIZE_SHIFT) ++#define CS_INSTR_BUFFER_SIZE_SIZE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_INSTR_BUFFER_SIZE_SIZE_MASK) | \ ++ (((value) << CS_INSTR_BUFFER_SIZE_SIZE_SHIFT) & CS_INSTR_BUFFER_SIZE_SIZE_MASK)) ++ ++/* CS_INSTR_BUFFER_BASE register */ ++#define CS_INSTR_BUFFER_BASE_POINTER_SHIFT (0) ++#define CS_INSTR_BUFFER_BASE_POINTER_MASK \ ++ (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CS_INSTR_BUFFER_BASE_POINTER_SHIFT) ++#define CS_INSTR_BUFFER_BASE_POINTER_GET(reg_val) \ ++ (((reg_val)&CS_INSTR_BUFFER_BASE_POINTER_MASK) >> CS_INSTR_BUFFER_BASE_POINTER_SHIFT) ++#define CS_INSTR_BUFFER_BASE_POINTER_SET(reg_val, value) \ ++ (((reg_val) & ~CS_INSTR_BUFFER_BASE_POINTER_MASK) | \ ++ (((value) << CS_INSTR_BUFFER_BASE_POINTER_SHIFT) & CS_INSTR_BUFFER_BASE_POINTER_MASK)) ++ ++/* CS_INSTR_BUFFER_OFFSET_POINTER register */ ++#define CS_INSTR_BUFFER_OFFSET_POINTER_POINTER_SHIFT (0) ++#define CS_INSTR_BUFFER_OFFSET_POINTER_POINTER_MASK \ ++ ((GPU_ULL(0xFFFFFFFFFFFFFFFF)) << CS_INSTR_BUFFER_OFFSET_POINTER_POINTER_SHIFT) ++#define CS_INSTR_BUFFER_OFFSET_POINTER_POINTER_GET(reg_val) \ ++ (((reg_val)&CS_INSTR_BUFFER_OFFSET_POINTER_POINTER_MASK) >> CS_INSTR_BUFFER_OFFSET_POINTER_POINTER_SHIFT) ++#define CS_INSTR_BUFFER_OFFSET_POINTER_POINTER_SET(reg_val, value) \ ++ (((reg_val) & ~CS_INSTR_BUFFER_OFFSET_POINTER_POINTER_MASK) | \ ++ (((value) << CS_INSTR_BUFFER_OFFSET_POINTER_POINTER_SHIFT) & CS_INSTR_BUFFER_OFFSET_POINTER_POINTER_MASK)) ++ ++/* End of CS_KERNEL_INPUT_BLOCK register set definitions */ ++ ++/* CS_KERNEL_OUTPUT_BLOCK register set definitions */ ++ ++/* CS_ACK register */ ++#define CS_ACK_STATE_SHIFT 0 ++#define CS_ACK_STATE_MASK (0x7 << CS_ACK_STATE_SHIFT) ++#define CS_ACK_STATE_GET(reg_val) (((reg_val)&CS_ACK_STATE_MASK) >> CS_ACK_STATE_SHIFT) ++#define CS_ACK_STATE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_ACK_STATE_MASK) | (((value) << CS_ACK_STATE_SHIFT) & CS_ACK_STATE_MASK)) ++/* CS_ACK_STATE values */ ++#define CS_ACK_STATE_STOP 0x0 ++#define CS_ACK_STATE_START 0x1 ++/* End of CS_ACK_STATE values */ ++#define CS_ACK_EXTRACT_EVENT_SHIFT 4 ++#define CS_ACK_EXTRACT_EVENT_MASK (0x1 << CS_ACK_EXTRACT_EVENT_SHIFT) ++#define CS_ACK_EXTRACT_EVENT_GET(reg_val) (((reg_val)&CS_ACK_EXTRACT_EVENT_MASK) >> CS_ACK_EXTRACT_EVENT_SHIFT) ++#define CS_ACK_EXTRACT_EVENT_SET(reg_val, value) \ ++ (((reg_val) & ~CS_ACK_EXTRACT_EVENT_MASK) | (((value) << CS_ACK_EXTRACT_EVENT_SHIFT) & CS_ACK_EXTRACT_EVENT_MASK)) ++#define CS_ACK_TILER_OOM_SHIFT 26 ++#define CS_ACK_TILER_OOM_MASK (0x1 << CS_ACK_TILER_OOM_SHIFT) ++#define CS_ACK_TILER_OOM_GET(reg_val) (((reg_val)&CS_ACK_TILER_OOM_MASK) >> CS_ACK_TILER_OOM_SHIFT) ++#define CS_ACK_TILER_OOM_SET(reg_val, value) \ ++ (((reg_val) & ~CS_ACK_TILER_OOM_MASK) | (((value) << CS_ACK_TILER_OOM_SHIFT) & CS_ACK_TILER_OOM_MASK)) ++#define CS_ACK_PROTM_PEND_SHIFT 27 ++#define CS_ACK_PROTM_PEND_MASK (0x1 << CS_ACK_PROTM_PEND_SHIFT) ++#define CS_ACK_PROTM_PEND_GET(reg_val) (((reg_val)&CS_ACK_PROTM_PEND_MASK) >> CS_ACK_PROTM_PEND_SHIFT) ++#define CS_ACK_PROTM_PEND_SET(reg_val, value) \ ++ (((reg_val) & ~CS_ACK_PROTM_PEND_MASK) | (((value) << CS_ACK_PROTM_PEND_SHIFT) & CS_ACK_PROTM_PEND_MASK)) ++#define CS_ACK_FATAL_SHIFT 30 ++#define CS_ACK_FATAL_MASK (0x1 << CS_ACK_FATAL_SHIFT) ++#define CS_ACK_FATAL_GET(reg_val) (((reg_val)&CS_ACK_FATAL_MASK) >> CS_ACK_FATAL_SHIFT) ++#define CS_ACK_FATAL_SET(reg_val, value) \ ++ (((reg_val) & ~CS_ACK_FATAL_MASK) | (((value) << CS_ACK_FATAL_SHIFT) & CS_ACK_FATAL_MASK)) ++#define CS_ACK_FAULT_SHIFT 31 ++#define CS_ACK_FAULT_MASK (0x1 << CS_ACK_FAULT_SHIFT) ++#define CS_ACK_FAULT_GET(reg_val) (((reg_val)&CS_ACK_FAULT_MASK) >> CS_ACK_FAULT_SHIFT) ++#define CS_ACK_FAULT_SET(reg_val, value) \ ++ (((reg_val) & ~CS_ACK_FAULT_MASK) | (((value) << CS_ACK_FAULT_SHIFT) & CS_ACK_FAULT_MASK)) ++ ++/* CS_STATUS_CMD_PTR register */ ++#define CS_STATUS_CMD_PTR_POINTER_SHIFT 0 ++#define CS_STATUS_CMD_PTR_POINTER_MASK \ ++ (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CS_STATUS_CMD_PTR_POINTER_SHIFT) ++#define CS_STATUS_CMD_PTR_POINTER_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_CMD_PTR_POINTER_MASK) >> CS_STATUS_CMD_PTR_POINTER_SHIFT) ++#define CS_STATUS_CMD_PTR_POINTER_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_CMD_PTR_POINTER_MASK) | \ ++ (((value) << CS_STATUS_CMD_PTR_POINTER_SHIFT) & CS_STATUS_CMD_PTR_POINTER_MASK)) ++ ++/* CS_STATUS_WAIT register */ ++#define CS_STATUS_WAIT_SB_MASK_SHIFT 0 ++#define CS_STATUS_WAIT_SB_MASK_MASK (0xFFFF << CS_STATUS_WAIT_SB_MASK_SHIFT) ++#define CS_STATUS_WAIT_SB_MASK_GET(reg_val) (((reg_val)&CS_STATUS_WAIT_SB_MASK_MASK) >> CS_STATUS_WAIT_SB_MASK_SHIFT) ++#define CS_STATUS_WAIT_SB_MASK_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_WAIT_SB_MASK_MASK) | \ ++ (((value) << CS_STATUS_WAIT_SB_MASK_SHIFT) & CS_STATUS_WAIT_SB_MASK_MASK)) ++#define CS_STATUS_WAIT_SB_SOURCE_SHIFT 16 ++#define CS_STATUS_WAIT_SB_SOURCE_MASK (0xF << CS_STATUS_WAIT_SB_SOURCE_SHIFT) ++#define CS_STATUS_WAIT_SB_SOURCE_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_WAIT_SB_SOURCE_MASK) >> CS_STATUS_WAIT_SB_SOURCE_SHIFT) ++#define CS_STATUS_WAIT_SB_SOURCE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_WAIT_SB_SOURCE_MASK) | \ ++ (((value) << CS_STATUS_WAIT_SB_SOURCE_SHIFT) & CS_STATUS_WAIT_SB_SOURCE_MASK)) ++#define CS_STATUS_WAIT_SYNC_WAIT_CONDITION_SHIFT 24 ++#define CS_STATUS_WAIT_SYNC_WAIT_CONDITION_MASK (0xF << CS_STATUS_WAIT_SYNC_WAIT_CONDITION_SHIFT) ++#define CS_STATUS_WAIT_SYNC_WAIT_CONDITION_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_WAIT_SYNC_WAIT_CONDITION_MASK) >> CS_STATUS_WAIT_SYNC_WAIT_CONDITION_SHIFT) ++#define CS_STATUS_WAIT_SYNC_WAIT_CONDITION_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_WAIT_SYNC_WAIT_CONDITION_MASK) | \ ++ (((value) << CS_STATUS_WAIT_SYNC_WAIT_CONDITION_SHIFT) & CS_STATUS_WAIT_SYNC_WAIT_CONDITION_MASK)) ++/* CS_STATUS_WAIT_SYNC_WAIT_CONDITION values */ ++#define CS_STATUS_WAIT_SYNC_WAIT_CONDITION_LE 0x0 ++#define CS_STATUS_WAIT_SYNC_WAIT_CONDITION_GT 0x1 ++#define CS_STATUS_WAIT_SYNC_WAIT_CONDITION_GE 0x5 ++/* End of CS_STATUS_WAIT_SYNC_WAIT_CONDITION values */ ++#define CS_STATUS_WAIT_PROGRESS_WAIT_SHIFT 28 ++#define CS_STATUS_WAIT_PROGRESS_WAIT_MASK (0x1 << CS_STATUS_WAIT_PROGRESS_WAIT_SHIFT) ++#define CS_STATUS_WAIT_PROGRESS_WAIT_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_WAIT_PROGRESS_WAIT_MASK) >> CS_STATUS_WAIT_PROGRESS_WAIT_SHIFT) ++#define CS_STATUS_WAIT_PROGRESS_WAIT_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_WAIT_PROGRESS_WAIT_MASK) | \ ++ (((value) << CS_STATUS_WAIT_PROGRESS_WAIT_SHIFT) & CS_STATUS_WAIT_PROGRESS_WAIT_MASK)) ++#define CS_STATUS_WAIT_PROTM_PEND_SHIFT 29 ++#define CS_STATUS_WAIT_PROTM_PEND_MASK (0x1 << CS_STATUS_WAIT_PROTM_PEND_SHIFT) ++#define CS_STATUS_WAIT_PROTM_PEND_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_WAIT_PROTM_PEND_MASK) >> CS_STATUS_WAIT_PROTM_PEND_SHIFT) ++#define CS_STATUS_WAIT_PROTM_PEND_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_WAIT_PROTM_PEND_MASK) | \ ++ (((value) << CS_STATUS_WAIT_PROTM_PEND_SHIFT) & CS_STATUS_WAIT_PROTM_PEND_MASK)) ++#define CS_STATUS_WAIT_SYNC_WAIT_SIZE_SHIFT 30 ++#define CS_STATUS_WAIT_SYNC_WAIT_SIZE_MASK (0x1 << CS_STATUS_WAIT_SYNC_WAIT_SIZE_SHIFT) ++#define CS_STATUS_WAIT_SYNC_WAIT_SIZE_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_WAIT_SYNC_WAIT_SIZE_MASK) >> CS_STATUS_WAIT_SYNC_WAIT_SIZE_SHIFT) ++#define CS_STATUS_WAIT_SYNC_WAIT_SIZE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_WAIT_SYNC_WAIT_SIZE_MASK) | \ ++ (((value) << CS_STATUS_WAIT_SYNC_WAIT_SIZE_SHIFT) & CS_STATUS_WAIT_SYNC_WAIT_SIZE_MASK)) ++#define CS_STATUS_WAIT_SYNC_WAIT_SHIFT 31 ++#define CS_STATUS_WAIT_SYNC_WAIT_MASK (0x1 << CS_STATUS_WAIT_SYNC_WAIT_SHIFT) ++#define CS_STATUS_WAIT_SYNC_WAIT_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_WAIT_SYNC_WAIT_MASK) >> CS_STATUS_WAIT_SYNC_WAIT_SHIFT) ++#define CS_STATUS_WAIT_SYNC_WAIT_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_WAIT_SYNC_WAIT_MASK) | \ ++ (((value) << CS_STATUS_WAIT_SYNC_WAIT_SHIFT) & CS_STATUS_WAIT_SYNC_WAIT_MASK)) ++ ++/* CS_STATUS_REQ_RESOURCE register */ ++#define CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_SHIFT 0 ++#define CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_MASK (0x1 << CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_SHIFT) ++#define CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_MASK) >> CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_SHIFT) ++#define CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_MASK) | \ ++ (((value) << CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_SHIFT) & CS_STATUS_REQ_RESOURCE_COMPUTE_RESOURCES_MASK)) ++#define CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_SHIFT 1 ++#define CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_MASK (0x1 << CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_SHIFT) ++#define CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_MASK) >> CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_SHIFT) ++#define CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_MASK) | \ ++ (((value) << CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_SHIFT) & CS_STATUS_REQ_RESOURCE_FRAGMENT_RESOURCES_MASK)) ++#define CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_SHIFT 2 ++#define CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_MASK (0x1 << CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_SHIFT) ++#define CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_MASK) >> CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_SHIFT) ++#define CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_MASK) | \ ++ (((value) << CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_SHIFT) & CS_STATUS_REQ_RESOURCE_TILER_RESOURCES_MASK)) ++#define CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_SHIFT 3 ++#define CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_MASK (0x1 << CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_SHIFT) ++#define CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_MASK) >> CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_SHIFT) ++#define CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_MASK) | \ ++ (((value) << CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_SHIFT) & CS_STATUS_REQ_RESOURCE_IDVS_RESOURCES_MASK)) ++ ++/* CS_STATUS_WAIT_SYNC_POINTER register */ ++#define CS_STATUS_WAIT_SYNC_POINTER_POINTER_SHIFT 0 ++#define CS_STATUS_WAIT_SYNC_POINTER_POINTER_MASK \ ++ (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CS_STATUS_WAIT_SYNC_POINTER_POINTER_SHIFT) ++#define CS_STATUS_WAIT_SYNC_POINTER_POINTER_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_WAIT_SYNC_POINTER_POINTER_MASK) >> CS_STATUS_WAIT_SYNC_POINTER_POINTER_SHIFT) ++#define CS_STATUS_WAIT_SYNC_POINTER_POINTER_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_WAIT_SYNC_POINTER_POINTER_MASK) | \ ++ (((value) << CS_STATUS_WAIT_SYNC_POINTER_POINTER_SHIFT) & CS_STATUS_WAIT_SYNC_POINTER_POINTER_MASK)) ++ ++/* CS_STATUS_WAIT_SYNC_VALUE register */ ++#define CS_STATUS_WAIT_SYNC_VALUE_VALUE_SHIFT 0 ++#define CS_STATUS_WAIT_SYNC_VALUE_VALUE_MASK (0xFFFFFFFF << CS_STATUS_WAIT_SYNC_VALUE_VALUE_SHIFT) ++#define CS_STATUS_WAIT_SYNC_VALUE_VALUE_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_WAIT_SYNC_VALUE_VALUE_MASK) >> CS_STATUS_WAIT_SYNC_VALUE_VALUE_SHIFT) ++#define CS_STATUS_WAIT_SYNC_VALUE_VALUE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_WAIT_SYNC_VALUE_VALUE_MASK) | \ ++ (((value) << CS_STATUS_WAIT_SYNC_VALUE_VALUE_SHIFT) & CS_STATUS_WAIT_SYNC_VALUE_VALUE_MASK)) ++ ++/* CS_STATUS_SCOREBOARDS register */ ++#define CS_STATUS_SCOREBOARDS_NONZERO_SHIFT (0) ++#define CS_STATUS_SCOREBOARDS_NONZERO_MASK \ ++ ((0xFFFF) << CS_STATUS_SCOREBOARDS_NONZERO_SHIFT) ++#define CS_STATUS_SCOREBOARDS_NONZERO_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_SCOREBOARDS_NONZERO_MASK) >> \ ++ CS_STATUS_SCOREBOARDS_NONZERO_SHIFT) ++#define CS_STATUS_SCOREBOARDS_NONZERO_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_SCOREBOARDS_NONZERO_MASK) | \ ++ (((value) << CS_STATUS_SCOREBOARDS_NONZERO_SHIFT) & \ ++ CS_STATUS_SCOREBOARDS_NONZERO_MASK)) ++ ++/* CS_STATUS_BLOCKED_REASON register */ ++#define CS_STATUS_BLOCKED_REASON_REASON_SHIFT (0) ++#define CS_STATUS_BLOCKED_REASON_REASON_MASK \ ++ ((0xF) << CS_STATUS_BLOCKED_REASON_REASON_SHIFT) ++#define CS_STATUS_BLOCKED_REASON_REASON_GET(reg_val) \ ++ (((reg_val)&CS_STATUS_BLOCKED_REASON_REASON_MASK) >> \ ++ CS_STATUS_BLOCKED_REASON_REASON_SHIFT) ++#define CS_STATUS_BLOCKED_REASON_REASON_SET(reg_val, value) \ ++ (((reg_val) & ~CS_STATUS_BLOCKED_REASON_REASON_MASK) | \ ++ (((value) << CS_STATUS_BLOCKED_REASON_REASON_SHIFT) & \ ++ CS_STATUS_BLOCKED_REASON_REASON_MASK)) ++/* CS_STATUS_BLOCKED_REASON_reason values */ ++#define CS_STATUS_BLOCKED_REASON_REASON_UNBLOCKED 0x0 ++#define CS_STATUS_BLOCKED_REASON_REASON_WAIT 0x1 ++#define CS_STATUS_BLOCKED_REASON_REASON_PROGRESS_WAIT 0x2 ++#define CS_STATUS_BLOCKED_REASON_REASON_SYNC_WAIT 0x3 ++#define CS_STATUS_BLOCKED_REASON_REASON_DEFERRED 0x4 ++#define CS_STATUS_BLOCKED_REASON_REASON_RESOURCE 0x5 ++#define CS_STATUS_BLOCKED_REASON_REASON_FLUSH 0x6 ++/* End of CS_STATUS_BLOCKED_REASON_reason values */ ++ ++/* CS_FAULT register */ ++#define CS_FAULT_EXCEPTION_TYPE_SHIFT 0 ++#define CS_FAULT_EXCEPTION_TYPE_MASK (0xFF << CS_FAULT_EXCEPTION_TYPE_SHIFT) ++#define CS_FAULT_EXCEPTION_TYPE_GET(reg_val) (((reg_val)&CS_FAULT_EXCEPTION_TYPE_MASK) >> CS_FAULT_EXCEPTION_TYPE_SHIFT) ++#define CS_FAULT_EXCEPTION_TYPE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_FAULT_EXCEPTION_TYPE_MASK) | \ ++ (((value) << CS_FAULT_EXCEPTION_TYPE_SHIFT) & CS_FAULT_EXCEPTION_TYPE_MASK)) ++/* CS_FAULT_EXCEPTION_TYPE values */ ++#define CS_FAULT_EXCEPTION_TYPE_KABOOM 0x05 ++#define CS_FAULT_EXCEPTION_TYPE_CS_RESOURCE_TERMINATED 0x0F ++#define CS_FAULT_EXCEPTION_TYPE_CS_BUS_FAULT 0x48 ++#define CS_FAULT_EXCEPTION_TYPE_CS_INHERIT_FAULT 0x4B ++#define CS_FAULT_EXCEPTION_TYPE_INSTR_INVALID_PC 0x50 ++#define CS_FAULT_EXCEPTION_TYPE_INSTR_INVALID_ENC 0x51 ++#define CS_FAULT_EXCEPTION_TYPE_INSTR_BARRIER_FAULT 0x55 ++#define CS_FAULT_EXCEPTION_TYPE_DATA_INVALID_FAULT 0x58 ++#define CS_FAULT_EXCEPTION_TYPE_TILE_RANGE_FAULT 0x59 ++#define CS_FAULT_EXCEPTION_TYPE_ADDR_RANGE_FAULT 0x5A ++#define CS_FAULT_EXCEPTION_TYPE_IMPRECISE_FAULT 0x5B ++#define CS_FAULT_EXCEPTION_TYPE_RESOURCE_EVICTION_TIMEOUT 0x69 ++#define CS_FAULT_EXCEPTION_TYPE_TRANSLATION_FAULT_L0 0xC0 ++#define CS_FAULT_EXCEPTION_TYPE_TRANSLATION_FAULT_L1 0xC1 ++#define CS_FAULT_EXCEPTION_TYPE_TRANSLATION_FAULT_L2 0xC2 ++#define CS_FAULT_EXCEPTION_TYPE_TRANSLATION_FAULT_L3 0xC3 ++#define CS_FAULT_EXCEPTION_TYPE_TRANSLATION_FAULT_L4 0xC4 ++#define CS_FAULT_EXCEPTION_TYPE_PERMISSION_FAULT_0 0xC8 ++#define CS_FAULT_EXCEPTION_TYPE_PERMISSION_FAULT_1 0xC9 ++#define CS_FAULT_EXCEPTION_TYPE_PERMISSION_FAULT_2 0xCA ++#define CS_FAULT_EXCEPTION_TYPE_PERMISSION_FAULT_3 0xCB ++#define CS_FAULT_EXCEPTION_TYPE_ACCESS_FLAG_1 0xD9 ++#define CS_FAULT_EXCEPTION_TYPE_ACCESS_FLAG_2 0xDA ++#define CS_FAULT_EXCEPTION_TYPE_ACCESS_FLAG_3 0xDB ++#define CS_FAULT_EXCEPTION_TYPE_ADDRESS_SIZE_FAULT_IN 0xE0 ++#define CS_FAULT_EXCEPTION_TYPE_ADDRESS_SIZE_FAULT_OUT_0 0xE4 ++#define CS_FAULT_EXCEPTION_TYPE_ADDRESS_SIZE_FAULT_OUT_1 0xE5 ++#define CS_FAULT_EXCEPTION_TYPE_ADDRESS_SIZE_FAULT_OUT_2 0xE6 ++#define CS_FAULT_EXCEPTION_TYPE_ADDRESS_SIZE_FAULT_OUT_3 0xE7 ++#define CS_FAULT_EXCEPTION_TYPE_MEMORY_ATTRIBUTE_FAULT_0 0xE8 ++#define CS_FAULT_EXCEPTION_TYPE_MEMORY_ATTRIBUTE_FAULT_1 0xE9 ++#define CS_FAULT_EXCEPTION_TYPE_MEMORY_ATTRIBUTE_FAULT_2 0xEA ++#define CS_FAULT_EXCEPTION_TYPE_MEMORY_ATTRIBUTE_FAULT_3 0xEB ++/* End of CS_FAULT_EXCEPTION_TYPE values */ ++#define CS_FAULT_EXCEPTION_DATA_SHIFT 8 ++#define CS_FAULT_EXCEPTION_DATA_MASK (0xFFFFFF << CS_FAULT_EXCEPTION_DATA_SHIFT) ++#define CS_FAULT_EXCEPTION_DATA_GET(reg_val) (((reg_val)&CS_FAULT_EXCEPTION_DATA_MASK) >> CS_FAULT_EXCEPTION_DATA_SHIFT) ++#define CS_FAULT_EXCEPTION_DATA_SET(reg_val, value) \ ++ (((reg_val) & ~CS_FAULT_EXCEPTION_DATA_MASK) | \ ++ (((value) << CS_FAULT_EXCEPTION_DATA_SHIFT) & CS_FAULT_EXCEPTION_DATA_MASK)) ++ ++/* CS_FATAL register */ ++#define CS_FATAL_EXCEPTION_TYPE_SHIFT 0 ++#define CS_FATAL_EXCEPTION_TYPE_MASK (0xFF << CS_FATAL_EXCEPTION_TYPE_SHIFT) ++#define CS_FATAL_EXCEPTION_TYPE_GET(reg_val) (((reg_val)&CS_FATAL_EXCEPTION_TYPE_MASK) >> CS_FATAL_EXCEPTION_TYPE_SHIFT) ++#define CS_FATAL_EXCEPTION_TYPE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_FATAL_EXCEPTION_TYPE_MASK) | \ ++ (((value) << CS_FATAL_EXCEPTION_TYPE_SHIFT) & CS_FATAL_EXCEPTION_TYPE_MASK)) ++/* CS_FATAL_EXCEPTION_TYPE values */ ++#define CS_FATAL_EXCEPTION_TYPE_CS_CONFIG_FAULT 0x40 ++#define CS_FATAL_EXCEPTION_TYPE_CS_UNRECOVERABLE 0x41 ++#define CS_FATAL_EXCEPTION_TYPE_CS_ENDPOINT_FAULT 0x44 ++#define CS_FATAL_EXCEPTION_TYPE_CS_BUS_FAULT 0x48 ++#define CS_FATAL_EXCEPTION_TYPE_CS_INVALID_INSTRUCTION 0x49 ++#define CS_FATAL_EXCEPTION_TYPE_CS_CALL_STACK_OVERFLOW 0x4A ++#define CS_FATAL_EXCEPTION_TYPE_FIRMWARE_INTERNAL_ERROR 0x68 ++/* End of CS_FATAL_EXCEPTION_TYPE values */ ++#define CS_FATAL_EXCEPTION_DATA_SHIFT 8 ++#define CS_FATAL_EXCEPTION_DATA_MASK (0xFFFFFF << CS_FATAL_EXCEPTION_DATA_SHIFT) ++#define CS_FATAL_EXCEPTION_DATA_GET(reg_val) (((reg_val)&CS_FATAL_EXCEPTION_DATA_MASK) >> CS_FATAL_EXCEPTION_DATA_SHIFT) ++#define CS_FATAL_EXCEPTION_DATA_SET(reg_val, value) \ ++ (((reg_val) & ~CS_FATAL_EXCEPTION_DATA_MASK) | \ ++ (((value) << CS_FATAL_EXCEPTION_DATA_SHIFT) & CS_FATAL_EXCEPTION_DATA_MASK)) ++ ++/* CS_FAULT_INFO register */ ++#define CS_FAULT_INFO_EXCEPTION_DATA_SHIFT 0 ++#define CS_FAULT_INFO_EXCEPTION_DATA_MASK \ ++ (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CS_FAULT_INFO_EXCEPTION_DATA_SHIFT) ++#define CS_FAULT_INFO_EXCEPTION_DATA_GET(reg_val) \ ++ (((reg_val)&CS_FAULT_INFO_EXCEPTION_DATA_MASK) >> CS_FAULT_INFO_EXCEPTION_DATA_SHIFT) ++#define CS_FAULT_INFO_EXCEPTION_DATA_SET(reg_val, value) \ ++ (((reg_val) & ~CS_FAULT_INFO_EXCEPTION_DATA_MASK) | \ ++ (((value) << CS_FAULT_INFO_EXCEPTION_DATA_SHIFT) & CS_FAULT_INFO_EXCEPTION_DATA_MASK)) ++ ++/* CS_FATAL_INFO register */ ++#define CS_FATAL_INFO_EXCEPTION_DATA_SHIFT 0 ++#define CS_FATAL_INFO_EXCEPTION_DATA_MASK \ ++ (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CS_FATAL_INFO_EXCEPTION_DATA_SHIFT) ++#define CS_FATAL_INFO_EXCEPTION_DATA_GET(reg_val) \ ++ (((reg_val)&CS_FATAL_INFO_EXCEPTION_DATA_MASK) >> CS_FATAL_INFO_EXCEPTION_DATA_SHIFT) ++#define CS_FATAL_INFO_EXCEPTION_DATA_SET(reg_val, value) \ ++ (((reg_val) & ~CS_FATAL_INFO_EXCEPTION_DATA_MASK) | \ ++ (((value) << CS_FATAL_INFO_EXCEPTION_DATA_SHIFT) & CS_FATAL_INFO_EXCEPTION_DATA_MASK)) ++ ++/* CS_HEAP_VT_START register */ ++#define CS_HEAP_VT_START_VALUE_SHIFT 0 ++#define CS_HEAP_VT_START_VALUE_MASK (0xFFFFFFFF << CS_HEAP_VT_START_VALUE_SHIFT) ++#define CS_HEAP_VT_START_VALUE_GET(reg_val) (((reg_val)&CS_HEAP_VT_START_VALUE_MASK) >> CS_HEAP_VT_START_VALUE_SHIFT) ++#define CS_HEAP_VT_START_VALUE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_HEAP_VT_START_VALUE_MASK) | \ ++ (((value) << CS_HEAP_VT_START_VALUE_SHIFT) & CS_HEAP_VT_START_VALUE_MASK)) ++ ++/* CS_HEAP_VT_END register */ ++#define CS_HEAP_VT_END_VALUE_SHIFT 0 ++#define CS_HEAP_VT_END_VALUE_MASK (0xFFFFFFFF << CS_HEAP_VT_END_VALUE_SHIFT) ++#define CS_HEAP_VT_END_VALUE_GET(reg_val) (((reg_val)&CS_HEAP_VT_END_VALUE_MASK) >> CS_HEAP_VT_END_VALUE_SHIFT) ++#define CS_HEAP_VT_END_VALUE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_HEAP_VT_END_VALUE_MASK) | (((value) << CS_HEAP_VT_END_VALUE_SHIFT) & CS_HEAP_VT_END_VALUE_MASK)) ++ ++/* CS_HEAP_FRAG_END register */ ++#define CS_HEAP_FRAG_END_VALUE_SHIFT 0 ++#define CS_HEAP_FRAG_END_VALUE_MASK (0xFFFFFFFF << CS_HEAP_FRAG_END_VALUE_SHIFT) ++#define CS_HEAP_FRAG_END_VALUE_GET(reg_val) (((reg_val)&CS_HEAP_FRAG_END_VALUE_MASK) >> CS_HEAP_FRAG_END_VALUE_SHIFT) ++#define CS_HEAP_FRAG_END_VALUE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_HEAP_FRAG_END_VALUE_MASK) | \ ++ (((value) << CS_HEAP_FRAG_END_VALUE_SHIFT) & CS_HEAP_FRAG_END_VALUE_MASK)) ++ ++/* CS_HEAP_ADDRESS register */ ++#define CS_HEAP_ADDRESS_POINTER_SHIFT 0 ++#define CS_HEAP_ADDRESS_POINTER_MASK (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CS_HEAP_ADDRESS_POINTER_SHIFT) ++#define CS_HEAP_ADDRESS_POINTER_GET(reg_val) (((reg_val)&CS_HEAP_ADDRESS_POINTER_MASK) >> CS_HEAP_ADDRESS_POINTER_SHIFT) ++#define CS_HEAP_ADDRESS_POINTER_SET(reg_val, value) \ ++ (((reg_val) & ~CS_HEAP_ADDRESS_POINTER_MASK) | \ ++ (((value) << CS_HEAP_ADDRESS_POINTER_SHIFT) & CS_HEAP_ADDRESS_POINTER_MASK)) ++/* End of CS_KERNEL_OUTPUT_BLOCK register set definitions */ ++ ++/* CS_USER_INPUT_BLOCK register set definitions */ ++ ++/* CS_INSERT register */ ++#define CS_INSERT_VALUE_SHIFT 0 ++#define CS_INSERT_VALUE_MASK (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CS_INSERT_VALUE_SHIFT) ++#define CS_INSERT_VALUE_GET(reg_val) (((reg_val)&CS_INSERT_VALUE_MASK) >> CS_INSERT_VALUE_SHIFT) ++#define CS_INSERT_VALUE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_INSERT_VALUE_MASK) | (((value) << CS_INSERT_VALUE_SHIFT) & CS_INSERT_VALUE_MASK)) ++ ++/* CS_EXTRACT_INIT register */ ++#define CS_EXTRACT_INIT_VALUE_SHIFT 0 ++#define CS_EXTRACT_INIT_VALUE_MASK (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CS_EXTRACT_INIT_VALUE_SHIFT) ++#define CS_EXTRACT_INIT_VALUE_GET(reg_val) (((reg_val)&CS_EXTRACT_INIT_VALUE_MASK) >> CS_EXTRACT_INIT_VALUE_SHIFT) ++#define CS_EXTRACT_INIT_VALUE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_EXTRACT_INIT_VALUE_MASK) | \ ++ (((value) << CS_EXTRACT_INIT_VALUE_SHIFT) & CS_EXTRACT_INIT_VALUE_MASK)) ++/* End of CS_USER_INPUT_BLOCK register set definitions */ ++ ++/* CS_USER_OUTPUT_BLOCK register set definitions */ ++ ++/* CS_EXTRACT register */ ++#define CS_EXTRACT_VALUE_SHIFT 0 ++#define CS_EXTRACT_VALUE_MASK (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CS_EXTRACT_VALUE_SHIFT) ++#define CS_EXTRACT_VALUE_GET(reg_val) (((reg_val)&CS_EXTRACT_VALUE_MASK) >> CS_EXTRACT_VALUE_SHIFT) ++#define CS_EXTRACT_VALUE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_EXTRACT_VALUE_MASK) | (((value) << CS_EXTRACT_VALUE_SHIFT) & CS_EXTRACT_VALUE_MASK)) ++ ++/* CS_ACTIVE register */ ++#define CS_ACTIVE_HW_ACTIVE_SHIFT 0 ++#define CS_ACTIVE_HW_ACTIVE_MASK (0x1 << CS_ACTIVE_HW_ACTIVE_SHIFT) ++#define CS_ACTIVE_HW_ACTIVE_GET(reg_val) (((reg_val)&CS_ACTIVE_HW_ACTIVE_MASK) >> CS_ACTIVE_HW_ACTIVE_SHIFT) ++#define CS_ACTIVE_HW_ACTIVE_SET(reg_val, value) \ ++ (((reg_val) & ~CS_ACTIVE_HW_ACTIVE_MASK) | (((value) << CS_ACTIVE_HW_ACTIVE_SHIFT) & CS_ACTIVE_HW_ACTIVE_MASK)) ++/* End of CS_USER_OUTPUT_BLOCK register set definitions */ ++ ++/* CSG_INPUT_BLOCK register set definitions */ ++ ++/* CSG_REQ register */ ++#define CSG_REQ_STATE_SHIFT 0 ++#define CSG_REQ_STATE_MASK (0x7 << CSG_REQ_STATE_SHIFT) ++#define CSG_REQ_STATE_GET(reg_val) (((reg_val)&CSG_REQ_STATE_MASK) >> CSG_REQ_STATE_SHIFT) ++#define CSG_REQ_STATE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_REQ_STATE_MASK) | (((value) << CSG_REQ_STATE_SHIFT) & CSG_REQ_STATE_MASK)) ++/* CSG_REQ_STATE values */ ++#define CSG_REQ_STATE_TERMINATE 0x0 ++#define CSG_REQ_STATE_START 0x1 ++#define CSG_REQ_STATE_SUSPEND 0x2 ++#define CSG_REQ_STATE_RESUME 0x3 ++/* End of CSG_REQ_STATE values */ ++#define CSG_REQ_EP_CFG_SHIFT 4 ++#define CSG_REQ_EP_CFG_MASK (0x1 << CSG_REQ_EP_CFG_SHIFT) ++#define CSG_REQ_EP_CFG_GET(reg_val) (((reg_val)&CSG_REQ_EP_CFG_MASK) >> CSG_REQ_EP_CFG_SHIFT) ++#define CSG_REQ_EP_CFG_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_REQ_EP_CFG_MASK) | (((value) << CSG_REQ_EP_CFG_SHIFT) & CSG_REQ_EP_CFG_MASK)) ++#define CSG_REQ_STATUS_UPDATE_SHIFT 5 ++#define CSG_REQ_STATUS_UPDATE_MASK (0x1 << CSG_REQ_STATUS_UPDATE_SHIFT) ++#define CSG_REQ_STATUS_UPDATE_GET(reg_val) (((reg_val)&CSG_REQ_STATUS_UPDATE_MASK) >> CSG_REQ_STATUS_UPDATE_SHIFT) ++#define CSG_REQ_STATUS_UPDATE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_REQ_STATUS_UPDATE_MASK) | \ ++ (((value) << CSG_REQ_STATUS_UPDATE_SHIFT) & CSG_REQ_STATUS_UPDATE_MASK)) ++#define CSG_REQ_SYNC_UPDATE_SHIFT 28 ++#define CSG_REQ_SYNC_UPDATE_MASK (0x1 << CSG_REQ_SYNC_UPDATE_SHIFT) ++#define CSG_REQ_SYNC_UPDATE_GET(reg_val) (((reg_val)&CSG_REQ_SYNC_UPDATE_MASK) >> CSG_REQ_SYNC_UPDATE_SHIFT) ++#define CSG_REQ_SYNC_UPDATE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_REQ_SYNC_UPDATE_MASK) | (((value) << CSG_REQ_SYNC_UPDATE_SHIFT) & CSG_REQ_SYNC_UPDATE_MASK)) ++#define CSG_REQ_IDLE_SHIFT 29 ++#define CSG_REQ_IDLE_MASK (0x1 << CSG_REQ_IDLE_SHIFT) ++#define CSG_REQ_IDLE_GET(reg_val) (((reg_val)&CSG_REQ_IDLE_MASK) >> CSG_REQ_IDLE_SHIFT) ++#define CSG_REQ_IDLE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_REQ_IDLE_MASK) | (((value) << CSG_REQ_IDLE_SHIFT) & CSG_REQ_IDLE_MASK)) ++#define CSG_REQ_PROGRESS_TIMER_EVENT_SHIFT 31 ++#define CSG_REQ_PROGRESS_TIMER_EVENT_MASK (0x1 << CSG_REQ_PROGRESS_TIMER_EVENT_SHIFT) ++#define CSG_REQ_PROGRESS_TIMER_EVENT_GET(reg_val) \ ++ (((reg_val)&CSG_REQ_PROGRESS_TIMER_EVENT_MASK) >> CSG_REQ_PROGRESS_TIMER_EVENT_SHIFT) ++#define CSG_REQ_PROGRESS_TIMER_EVENT_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_REQ_PROGRESS_TIMER_EVENT_MASK) | \ ++ (((value) << CSG_REQ_PROGRESS_TIMER_EVENT_SHIFT) & CSG_REQ_PROGRESS_TIMER_EVENT_MASK)) ++ ++/* CSG_ACK_IRQ_MASK register */ ++#define CSG_ACK_IRQ_MASK_STATE_SHIFT 0 ++#define CSG_ACK_IRQ_MASK_STATE_MASK (0x7 << CSG_ACK_IRQ_MASK_STATE_SHIFT) ++#define CSG_ACK_IRQ_MASK_STATE_GET(reg_val) (((reg_val)&CSG_ACK_IRQ_MASK_STATE_MASK) >> CSG_ACK_IRQ_MASK_STATE_SHIFT) ++#define CSG_ACK_IRQ_MASK_STATE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_ACK_IRQ_MASK_STATE_MASK) | \ ++ (((value) << CSG_ACK_IRQ_MASK_STATE_SHIFT) & CSG_ACK_IRQ_MASK_STATE_MASK)) ++/* CSG_ACK_IRQ_MASK_STATE values */ ++#define CSG_ACK_IRQ_MASK_STATE_DISABLED 0x0 ++#define CSG_ACK_IRQ_MASK_STATE_ENABLED 0x7 ++/* End of CSG_ACK_IRQ_MASK_STATE values */ ++#define CSG_ACK_IRQ_MASK_EP_CFG_SHIFT 4 ++#define CSG_ACK_IRQ_MASK_EP_CFG_MASK (0x1 << CSG_ACK_IRQ_MASK_EP_CFG_SHIFT) ++#define CSG_ACK_IRQ_MASK_EP_CFG_GET(reg_val) (((reg_val)&CSG_ACK_IRQ_MASK_EP_CFG_MASK) >> CSG_ACK_IRQ_MASK_EP_CFG_SHIFT) ++#define CSG_ACK_IRQ_MASK_EP_CFG_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_ACK_IRQ_MASK_EP_CFG_MASK) | \ ++ (((value) << CSG_ACK_IRQ_MASK_EP_CFG_SHIFT) & CSG_ACK_IRQ_MASK_EP_CFG_MASK)) ++#define CSG_ACK_IRQ_MASK_STATUS_UPDATE_SHIFT 5 ++#define CSG_ACK_IRQ_MASK_STATUS_UPDATE_MASK (0x1 << CSG_ACK_IRQ_MASK_STATUS_UPDATE_SHIFT) ++#define CSG_ACK_IRQ_MASK_STATUS_UPDATE_GET(reg_val) \ ++ (((reg_val)&CSG_ACK_IRQ_MASK_STATUS_UPDATE_MASK) >> CSG_ACK_IRQ_MASK_STATUS_UPDATE_SHIFT) ++#define CSG_ACK_IRQ_MASK_STATUS_UPDATE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_ACK_IRQ_MASK_STATUS_UPDATE_MASK) | \ ++ (((value) << CSG_ACK_IRQ_MASK_STATUS_UPDATE_SHIFT) & CSG_ACK_IRQ_MASK_STATUS_UPDATE_MASK)) ++#define CSG_ACK_IRQ_MASK_SYNC_UPDATE_SHIFT 28 ++#define CSG_ACK_IRQ_MASK_SYNC_UPDATE_MASK (0x1 << CSG_ACK_IRQ_MASK_SYNC_UPDATE_SHIFT) ++#define CSG_ACK_IRQ_MASK_SYNC_UPDATE_GET(reg_val) \ ++ (((reg_val)&CSG_ACK_IRQ_MASK_SYNC_UPDATE_MASK) >> CSG_ACK_IRQ_MASK_SYNC_UPDATE_SHIFT) ++#define CSG_ACK_IRQ_MASK_SYNC_UPDATE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_ACK_IRQ_MASK_SYNC_UPDATE_MASK) | \ ++ (((value) << CSG_ACK_IRQ_MASK_SYNC_UPDATE_SHIFT) & CSG_ACK_IRQ_MASK_SYNC_UPDATE_MASK)) ++#define CSG_ACK_IRQ_MASK_IDLE_SHIFT 29 ++#define CSG_ACK_IRQ_MASK_IDLE_MASK (0x1 << CSG_ACK_IRQ_MASK_IDLE_SHIFT) ++#define CSG_ACK_IRQ_MASK_IDLE_GET(reg_val) (((reg_val)&CSG_ACK_IRQ_MASK_IDLE_MASK) >> CSG_ACK_IRQ_MASK_IDLE_SHIFT) ++#define CSG_ACK_IRQ_MASK_IDLE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_ACK_IRQ_MASK_IDLE_MASK) | \ ++ (((value) << CSG_ACK_IRQ_MASK_IDLE_SHIFT) & CSG_ACK_IRQ_MASK_IDLE_MASK)) ++#define CSG_ACK_IRQ_MASK_DOORBELL_SHIFT 30 ++#define CSG_ACK_IRQ_MASK_DOORBELL_MASK (0x1 << CSG_ACK_IRQ_MASK_DOORBELL_SHIFT) ++#define CSG_ACK_IRQ_MASK_DOORBELL_GET(reg_val) \ ++ (((reg_val)&CSG_ACK_IRQ_MASK_DOORBELL_MASK) >> CSG_ACK_IRQ_MASK_DOORBELL_SHIFT) ++#define CSG_ACK_IRQ_MASK_DOORBELL_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_ACK_IRQ_MASK_DOORBELL_MASK) | \ ++ (((value) << CSG_ACK_IRQ_MASK_DOORBELL_SHIFT) & CSG_ACK_IRQ_MASK_DOORBELL_MASK)) ++#define CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_SHIFT 31 ++#define CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_MASK (0x1 << CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_SHIFT) ++#define CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_GET(reg_val) \ ++ (((reg_val)&CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_MASK) >> CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_SHIFT) ++#define CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_MASK) | \ ++ (((value) << CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_SHIFT) & CSG_ACK_IRQ_MASK_PROGRESS_TIMER_EVENT_MASK)) ++ ++/* CSG_EP_REQ register */ ++#define CSG_EP_REQ_COMPUTE_EP_SHIFT 0 ++#define CSG_EP_REQ_COMPUTE_EP_MASK (0xFF << CSG_EP_REQ_COMPUTE_EP_SHIFT) ++#define CSG_EP_REQ_COMPUTE_EP_GET(reg_val) (((reg_val)&CSG_EP_REQ_COMPUTE_EP_MASK) >> CSG_EP_REQ_COMPUTE_EP_SHIFT) ++#define CSG_EP_REQ_COMPUTE_EP_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_EP_REQ_COMPUTE_EP_MASK) | \ ++ (((value) << CSG_EP_REQ_COMPUTE_EP_SHIFT) & CSG_EP_REQ_COMPUTE_EP_MASK)) ++#define CSG_EP_REQ_FRAGMENT_EP_SHIFT 8 ++#define CSG_EP_REQ_FRAGMENT_EP_MASK (0xFF << CSG_EP_REQ_FRAGMENT_EP_SHIFT) ++#define CSG_EP_REQ_FRAGMENT_EP_GET(reg_val) (((reg_val)&CSG_EP_REQ_FRAGMENT_EP_MASK) >> CSG_EP_REQ_FRAGMENT_EP_SHIFT) ++#define CSG_EP_REQ_FRAGMENT_EP_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_EP_REQ_FRAGMENT_EP_MASK) | \ ++ (((value) << CSG_EP_REQ_FRAGMENT_EP_SHIFT) & CSG_EP_REQ_FRAGMENT_EP_MASK)) ++#define CSG_EP_REQ_TILER_EP_SHIFT 16 ++#define CSG_EP_REQ_TILER_EP_MASK (0xF << CSG_EP_REQ_TILER_EP_SHIFT) ++#define CSG_EP_REQ_TILER_EP_GET(reg_val) (((reg_val)&CSG_EP_REQ_TILER_EP_MASK) >> CSG_EP_REQ_TILER_EP_SHIFT) ++#define CSG_EP_REQ_TILER_EP_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_EP_REQ_TILER_EP_MASK) | (((value) << CSG_EP_REQ_TILER_EP_SHIFT) & CSG_EP_REQ_TILER_EP_MASK)) ++#define CSG_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT 20 ++#define CSG_EP_REQ_EXCLUSIVE_COMPUTE_MASK (0x1 << CSG_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT) ++#define CSG_EP_REQ_EXCLUSIVE_COMPUTE_GET(reg_val) \ ++ (((reg_val)&CSG_EP_REQ_EXCLUSIVE_COMPUTE_MASK) >> CSG_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT) ++#define CSG_EP_REQ_EXCLUSIVE_COMPUTE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_EP_REQ_EXCLUSIVE_COMPUTE_MASK) | \ ++ (((value) << CSG_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT) & CSG_EP_REQ_EXCLUSIVE_COMPUTE_MASK)) ++#define CSG_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT 21 ++#define CSG_EP_REQ_EXCLUSIVE_FRAGMENT_MASK (0x1 << CSG_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT) ++#define CSG_EP_REQ_EXCLUSIVE_FRAGMENT_GET(reg_val) \ ++ (((reg_val)&CSG_EP_REQ_EXCLUSIVE_FRAGMENT_MASK) >> CSG_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT) ++#define CSG_EP_REQ_EXCLUSIVE_FRAGMENT_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_EP_REQ_EXCLUSIVE_FRAGMENT_MASK) | \ ++ (((value) << CSG_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT) & CSG_EP_REQ_EXCLUSIVE_FRAGMENT_MASK)) ++#define CSG_EP_REQ_PRIORITY_SHIFT 28 ++#define CSG_EP_REQ_PRIORITY_MASK (0xF << CSG_EP_REQ_PRIORITY_SHIFT) ++#define CSG_EP_REQ_PRIORITY_GET(reg_val) (((reg_val)&CSG_EP_REQ_PRIORITY_MASK) >> CSG_EP_REQ_PRIORITY_SHIFT) ++#define CSG_EP_REQ_PRIORITY_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_EP_REQ_PRIORITY_MASK) | (((value) << CSG_EP_REQ_PRIORITY_SHIFT) & CSG_EP_REQ_PRIORITY_MASK)) ++ ++/* CSG_SUSPEND_BUF register */ ++#define CSG_SUSPEND_BUF_POINTER_SHIFT 0 ++#define CSG_SUSPEND_BUF_POINTER_MASK (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CSG_SUSPEND_BUF_POINTER_SHIFT) ++#define CSG_SUSPEND_BUF_POINTER_GET(reg_val) (((reg_val)&CSG_SUSPEND_BUF_POINTER_MASK) >> CSG_SUSPEND_BUF_POINTER_SHIFT) ++#define CSG_SUSPEND_BUF_POINTER_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_SUSPEND_BUF_POINTER_MASK) | \ ++ (((value) << CSG_SUSPEND_BUF_POINTER_SHIFT) & CSG_SUSPEND_BUF_POINTER_MASK)) ++ ++/* CSG_PROTM_SUSPEND_BUF register */ ++#define CSG_PROTM_SUSPEND_BUF_POINTER_SHIFT 0 ++#define CSG_PROTM_SUSPEND_BUF_POINTER_MASK \ ++ (GPU_ULL(0xFFFFFFFFFFFFFFFF) << CSG_PROTM_SUSPEND_BUF_POINTER_SHIFT) ++#define CSG_PROTM_SUSPEND_BUF_POINTER_GET(reg_val) \ ++ (((reg_val)&CSG_PROTM_SUSPEND_BUF_POINTER_MASK) >> CSG_PROTM_SUSPEND_BUF_POINTER_SHIFT) ++#define CSG_PROTM_SUSPEND_BUF_POINTER_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_PROTM_SUSPEND_BUF_POINTER_MASK) | \ ++ (((value) << CSG_PROTM_SUSPEND_BUF_POINTER_SHIFT) & CSG_PROTM_SUSPEND_BUF_POINTER_MASK)) ++ ++/* CSG_DVS_BUF_BUFFER register */ ++#define CSG_DVS_BUF_BUFFER_SIZE_SHIFT GPU_U(0) ++#define CSG_DVS_BUF_BUFFER_SIZE_MASK (GPU_U(0xFFF) << CSG_DVS_BUF_BUFFER_SIZE_SHIFT) ++#define CSG_DVS_BUF_BUFFER_SIZE_GET(reg_val) (((reg_val)&CSG_DVS_BUF_BUFFER_SIZE_MASK) >> CSG_DVS_BUF_BUFFER_SIZE_SHIFT) ++#define CSG_DVS_BUF_BUFFER_SIZE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_DVS_BUF_BUFFER_SIZE_MASK) | \ ++ (((value) << CSG_DVS_BUF_BUFFER_SIZE_SHIFT) & CSG_DVS_BUF_BUFFER_SIZE_MASK)) ++#define CSG_DVS_BUF_BUFFER_POINTER_SHIFT GPU_U(12) ++#define CSG_DVS_BUF_BUFFER_POINTER_MASK \ ++ (GPU_ULL(0xFFFFFFFFFFFFF) << CSG_DVS_BUF_BUFFER_POINTER_SHIFT) ++#define CSG_DVS_BUF_BUFFER_POINTER_GET(reg_val) \ ++ (((reg_val)&CSG_DVS_BUF_BUFFER_POINTER_MASK) >> CSG_DVS_BUF_BUFFER_POINTER_SHIFT) ++#define CSG_DVS_BUF_BUFFER_POINTER_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_DVS_BUF_BUFFER_POINTER_MASK) | \ ++ (((value) << CSG_DVS_BUF_BUFFER_POINTER_SHIFT) & CSG_DVS_BUF_BUFFER_POINTER_MASK)) ++ ++/* End of CSG_INPUT_BLOCK register set definitions */ ++ ++/* CSG_OUTPUT_BLOCK register set definitions */ ++ ++/* CSG_ACK register */ ++#define CSG_ACK_STATE_SHIFT 0 ++#define CSG_ACK_STATE_MASK (0x7 << CSG_ACK_STATE_SHIFT) ++#define CSG_ACK_STATE_GET(reg_val) (((reg_val)&CSG_ACK_STATE_MASK) >> CSG_ACK_STATE_SHIFT) ++#define CSG_ACK_STATE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_ACK_STATE_MASK) | (((value) << CSG_ACK_STATE_SHIFT) & CSG_ACK_STATE_MASK)) ++/* CSG_ACK_STATE values */ ++#define CSG_ACK_STATE_TERMINATE 0x0 ++#define CSG_ACK_STATE_START 0x1 ++#define CSG_ACK_STATE_SUSPEND 0x2 ++#define CSG_ACK_STATE_RESUME 0x3 ++/* End of CSG_ACK_STATE values */ ++#define CSG_ACK_EP_CFG_SHIFT 4 ++#define CSG_ACK_EP_CFG_MASK (0x1 << CSG_ACK_EP_CFG_SHIFT) ++#define CSG_ACK_EP_CFG_GET(reg_val) (((reg_val)&CSG_ACK_EP_CFG_MASK) >> CSG_ACK_EP_CFG_SHIFT) ++#define CSG_ACK_EP_CFG_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_ACK_EP_CFG_MASK) | (((value) << CSG_ACK_EP_CFG_SHIFT) & CSG_ACK_EP_CFG_MASK)) ++#define CSG_ACK_STATUS_UPDATE_SHIFT 5 ++#define CSG_ACK_STATUS_UPDATE_MASK (0x1 << CSG_ACK_STATUS_UPDATE_SHIFT) ++#define CSG_ACK_STATUS_UPDATE_GET(reg_val) (((reg_val)&CSG_ACK_STATUS_UPDATE_MASK) >> CSG_ACK_STATUS_UPDATE_SHIFT) ++#define CSG_ACK_STATUS_UPDATE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_ACK_STATUS_UPDATE_MASK) | \ ++ (((value) << CSG_ACK_STATUS_UPDATE_SHIFT) & CSG_ACK_STATUS_UPDATE_MASK)) ++#define CSG_ACK_SYNC_UPDATE_SHIFT 28 ++#define CSG_ACK_SYNC_UPDATE_MASK (0x1 << CSG_ACK_SYNC_UPDATE_SHIFT) ++#define CSG_ACK_SYNC_UPDATE_GET(reg_val) (((reg_val)&CSG_ACK_SYNC_UPDATE_MASK) >> CSG_ACK_SYNC_UPDATE_SHIFT) ++#define CSG_ACK_SYNC_UPDATE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_ACK_SYNC_UPDATE_MASK) | (((value) << CSG_ACK_SYNC_UPDATE_SHIFT) & CSG_ACK_SYNC_UPDATE_MASK)) ++#define CSG_ACK_IDLE_SHIFT 29 ++#define CSG_ACK_IDLE_MASK (0x1 << CSG_ACK_IDLE_SHIFT) ++#define CSG_ACK_IDLE_GET(reg_val) (((reg_val)&CSG_ACK_IDLE_MASK) >> CSG_ACK_IDLE_SHIFT) ++#define CSG_ACK_IDLE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_ACK_IDLE_MASK) | (((value) << CSG_ACK_IDLE_SHIFT) & CSG_ACK_IDLE_MASK)) ++#define CSG_ACK_DOORBELL_SHIFT 30 ++#define CSG_ACK_DOORBELL_MASK (0x1 << CSG_ACK_DOORBELL_SHIFT) ++#define CSG_ACK_DOORBELL_GET(reg_val) (((reg_val)&CSG_ACK_DOORBELL_MASK) >> CSG_ACK_DOORBELL_SHIFT) ++#define CSG_ACK_DOORBELL_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_ACK_DOORBELL_MASK) | (((value) << CSG_ACK_DOORBELL_SHIFT) & CSG_ACK_DOORBELL_MASK)) ++#define CSG_ACK_PROGRESS_TIMER_EVENT_SHIFT 31 ++#define CSG_ACK_PROGRESS_TIMER_EVENT_MASK (0x1 << CSG_ACK_PROGRESS_TIMER_EVENT_SHIFT) ++#define CSG_ACK_PROGRESS_TIMER_EVENT_GET(reg_val) \ ++ (((reg_val)&CSG_ACK_PROGRESS_TIMER_EVENT_MASK) >> CSG_ACK_PROGRESS_TIMER_EVENT_SHIFT) ++#define CSG_ACK_PROGRESS_TIMER_EVENT_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_ACK_PROGRESS_TIMER_EVENT_MASK) | \ ++ (((value) << CSG_ACK_PROGRESS_TIMER_EVENT_SHIFT) & CSG_ACK_PROGRESS_TIMER_EVENT_MASK)) ++ ++/* CSG_STATUS_EP_CURRENT register */ ++#define CSG_STATUS_EP_CURRENT_COMPUTE_EP_SHIFT 0 ++#define CSG_STATUS_EP_CURRENT_COMPUTE_EP_MASK (0xFF << CSG_STATUS_EP_CURRENT_COMPUTE_EP_SHIFT) ++#define CSG_STATUS_EP_CURRENT_COMPUTE_EP_GET(reg_val) \ ++ (((reg_val)&CSG_STATUS_EP_CURRENT_COMPUTE_EP_MASK) >> CSG_STATUS_EP_CURRENT_COMPUTE_EP_SHIFT) ++#define CSG_STATUS_EP_CURRENT_COMPUTE_EP_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_STATUS_EP_CURRENT_COMPUTE_EP_MASK) | \ ++ (((value) << CSG_STATUS_EP_CURRENT_COMPUTE_EP_SHIFT) & CSG_STATUS_EP_CURRENT_COMPUTE_EP_MASK)) ++#define CSG_STATUS_EP_CURRENT_FRAGMENT_EP_SHIFT 8 ++#define CSG_STATUS_EP_CURRENT_FRAGMENT_EP_MASK (0xFF << CSG_STATUS_EP_CURRENT_FRAGMENT_EP_SHIFT) ++#define CSG_STATUS_EP_CURRENT_FRAGMENT_EP_GET(reg_val) \ ++ (((reg_val)&CSG_STATUS_EP_CURRENT_FRAGMENT_EP_MASK) >> CSG_STATUS_EP_CURRENT_FRAGMENT_EP_SHIFT) ++#define CSG_STATUS_EP_CURRENT_FRAGMENT_EP_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_STATUS_EP_CURRENT_FRAGMENT_EP_MASK) | \ ++ (((value) << CSG_STATUS_EP_CURRENT_FRAGMENT_EP_SHIFT) & CSG_STATUS_EP_CURRENT_FRAGMENT_EP_MASK)) ++#define CSG_STATUS_EP_CURRENT_TILER_EP_SHIFT 16 ++#define CSG_STATUS_EP_CURRENT_TILER_EP_MASK (0xF << CSG_STATUS_EP_CURRENT_TILER_EP_SHIFT) ++#define CSG_STATUS_EP_CURRENT_TILER_EP_GET(reg_val) \ ++ (((reg_val)&CSG_STATUS_EP_CURRENT_TILER_EP_MASK) >> CSG_STATUS_EP_CURRENT_TILER_EP_SHIFT) ++#define CSG_STATUS_EP_CURRENT_TILER_EP_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_STATUS_EP_CURRENT_TILER_EP_MASK) | \ ++ (((value) << CSG_STATUS_EP_CURRENT_TILER_EP_SHIFT) & CSG_STATUS_EP_CURRENT_TILER_EP_MASK)) ++ ++/* CSG_STATUS_EP_REQ register */ ++#define CSG_STATUS_EP_REQ_COMPUTE_EP_SHIFT 0 ++#define CSG_STATUS_EP_REQ_COMPUTE_EP_MASK (0xFF << CSG_STATUS_EP_REQ_COMPUTE_EP_SHIFT) ++#define CSG_STATUS_EP_REQ_COMPUTE_EP_GET(reg_val) \ ++ (((reg_val)&CSG_STATUS_EP_REQ_COMPUTE_EP_MASK) >> CSG_STATUS_EP_REQ_COMPUTE_EP_SHIFT) ++#define CSG_STATUS_EP_REQ_COMPUTE_EP_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_STATUS_EP_REQ_COMPUTE_EP_MASK) | \ ++ (((value) << CSG_STATUS_EP_REQ_COMPUTE_EP_SHIFT) & CSG_STATUS_EP_REQ_COMPUTE_EP_MASK)) ++#define CSG_STATUS_EP_REQ_FRAGMENT_EP_SHIFT 8 ++#define CSG_STATUS_EP_REQ_FRAGMENT_EP_MASK (0xFF << CSG_STATUS_EP_REQ_FRAGMENT_EP_SHIFT) ++#define CSG_STATUS_EP_REQ_FRAGMENT_EP_GET(reg_val) \ ++ (((reg_val)&CSG_STATUS_EP_REQ_FRAGMENT_EP_MASK) >> CSG_STATUS_EP_REQ_FRAGMENT_EP_SHIFT) ++#define CSG_STATUS_EP_REQ_FRAGMENT_EP_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_STATUS_EP_REQ_FRAGMENT_EP_MASK) | \ ++ (((value) << CSG_STATUS_EP_REQ_FRAGMENT_EP_SHIFT) & CSG_STATUS_EP_REQ_FRAGMENT_EP_MASK)) ++#define CSG_STATUS_EP_REQ_TILER_EP_SHIFT 16 ++#define CSG_STATUS_EP_REQ_TILER_EP_MASK (0xF << CSG_STATUS_EP_REQ_TILER_EP_SHIFT) ++#define CSG_STATUS_EP_REQ_TILER_EP_GET(reg_val) \ ++ (((reg_val)&CSG_STATUS_EP_REQ_TILER_EP_MASK) >> CSG_STATUS_EP_REQ_TILER_EP_SHIFT) ++#define CSG_STATUS_EP_REQ_TILER_EP_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_STATUS_EP_REQ_TILER_EP_MASK) | \ ++ (((value) << CSG_STATUS_EP_REQ_TILER_EP_SHIFT) & CSG_STATUS_EP_REQ_TILER_EP_MASK)) ++#define CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT 20 ++#define CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_MASK (0x1 << CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT) ++#define CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_GET(reg_val) \ ++ (((reg_val)&CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_MASK) >> CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT) ++#define CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_MASK) | \ ++ (((value) << CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_SHIFT) & CSG_STATUS_EP_REQ_EXCLUSIVE_COMPUTE_MASK)) ++#define CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT 21 ++#define CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_MASK (0x1 << CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT) ++#define CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_GET(reg_val) \ ++ (((reg_val)&CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_MASK) >> CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT) ++#define CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_MASK) | \ ++ (((value) << CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_SHIFT) & CSG_STATUS_EP_REQ_EXCLUSIVE_FRAGMENT_MASK)) ++ ++/* End of CSG_OUTPUT_BLOCK register set definitions */ ++ ++/* STREAM_CONTROL_BLOCK register set definitions */ ++ ++/* STREAM_FEATURES register */ ++#define STREAM_FEATURES_WORK_REGISTERS_SHIFT 0 ++#define STREAM_FEATURES_WORK_REGISTERS_MASK (0xFF << STREAM_FEATURES_WORK_REGISTERS_SHIFT) ++#define STREAM_FEATURES_WORK_REGISTERS_GET(reg_val) \ ++ (((reg_val)&STREAM_FEATURES_WORK_REGISTERS_MASK) >> STREAM_FEATURES_WORK_REGISTERS_SHIFT) ++#define STREAM_FEATURES_WORK_REGISTERS_SET(reg_val, value) \ ++ (((reg_val) & ~STREAM_FEATURES_WORK_REGISTERS_MASK) | \ ++ (((value) << STREAM_FEATURES_WORK_REGISTERS_SHIFT) & STREAM_FEATURES_WORK_REGISTERS_MASK)) ++#define STREAM_FEATURES_SCOREBOARDS_SHIFT 8 ++#define STREAM_FEATURES_SCOREBOARDS_MASK (0xFF << STREAM_FEATURES_SCOREBOARDS_SHIFT) ++#define STREAM_FEATURES_SCOREBOARDS_GET(reg_val) \ ++ (((reg_val)&STREAM_FEATURES_SCOREBOARDS_MASK) >> STREAM_FEATURES_SCOREBOARDS_SHIFT) ++#define STREAM_FEATURES_SCOREBOARDS_SET(reg_val, value) \ ++ (((reg_val) & ~STREAM_FEATURES_SCOREBOARDS_MASK) | \ ++ (((value) << STREAM_FEATURES_SCOREBOARDS_SHIFT) & STREAM_FEATURES_SCOREBOARDS_MASK)) ++#define STREAM_FEATURES_COMPUTE_SHIFT 16 ++#define STREAM_FEATURES_COMPUTE_MASK (0x1 << STREAM_FEATURES_COMPUTE_SHIFT) ++#define STREAM_FEATURES_COMPUTE_GET(reg_val) (((reg_val)&STREAM_FEATURES_COMPUTE_MASK) >> STREAM_FEATURES_COMPUTE_SHIFT) ++#define STREAM_FEATURES_COMPUTE_SET(reg_val, value) \ ++ (((reg_val) & ~STREAM_FEATURES_COMPUTE_MASK) | \ ++ (((value) << STREAM_FEATURES_COMPUTE_SHIFT) & STREAM_FEATURES_COMPUTE_MASK)) ++#define STREAM_FEATURES_FRAGMENT_SHIFT 17 ++#define STREAM_FEATURES_FRAGMENT_MASK (0x1 << STREAM_FEATURES_FRAGMENT_SHIFT) ++#define STREAM_FEATURES_FRAGMENT_GET(reg_val) \ ++ (((reg_val)&STREAM_FEATURES_FRAGMENT_MASK) >> STREAM_FEATURES_FRAGMENT_SHIFT) ++#define STREAM_FEATURES_FRAGMENT_SET(reg_val, value) \ ++ (((reg_val) & ~STREAM_FEATURES_FRAGMENT_MASK) | \ ++ (((value) << STREAM_FEATURES_FRAGMENT_SHIFT) & STREAM_FEATURES_FRAGMENT_MASK)) ++#define STREAM_FEATURES_TILER_SHIFT 18 ++#define STREAM_FEATURES_TILER_MASK (0x1 << STREAM_FEATURES_TILER_SHIFT) ++#define STREAM_FEATURES_TILER_GET(reg_val) (((reg_val)&STREAM_FEATURES_TILER_MASK) >> STREAM_FEATURES_TILER_SHIFT) ++#define STREAM_FEATURES_TILER_SET(reg_val, value) \ ++ (((reg_val) & ~STREAM_FEATURES_TILER_MASK) | \ ++ (((value) << STREAM_FEATURES_TILER_SHIFT) & STREAM_FEATURES_TILER_MASK)) ++ ++/* STREAM_INPUT_VA register */ ++#define STREAM_INPUT_VA_VALUE_SHIFT 0 ++#define STREAM_INPUT_VA_VALUE_MASK (0xFFFFFFFF << STREAM_INPUT_VA_VALUE_SHIFT) ++#define STREAM_INPUT_VA_VALUE_GET(reg_val) (((reg_val)&STREAM_INPUT_VA_VALUE_MASK) >> STREAM_INPUT_VA_VALUE_SHIFT) ++#define STREAM_INPUT_VA_VALUE_SET(reg_val, value) \ ++ (((reg_val) & ~STREAM_INPUT_VA_VALUE_MASK) | \ ++ (((value) << STREAM_INPUT_VA_VALUE_SHIFT) & STREAM_INPUT_VA_VALUE_MASK)) ++ ++/* STREAM_OUTPUT_VA register */ ++#define STREAM_OUTPUT_VA_VALUE_SHIFT 0 ++#define STREAM_OUTPUT_VA_VALUE_MASK (0xFFFFFFFF << STREAM_OUTPUT_VA_VALUE_SHIFT) ++#define STREAM_OUTPUT_VA_VALUE_GET(reg_val) (((reg_val)&STREAM_OUTPUT_VA_VALUE_MASK) >> STREAM_OUTPUT_VA_VALUE_SHIFT) ++#define STREAM_OUTPUT_VA_VALUE_SET(reg_val, value) \ ++ (((reg_val) & ~STREAM_OUTPUT_VA_VALUE_MASK) | \ ++ (((value) << STREAM_OUTPUT_VA_VALUE_SHIFT) & STREAM_OUTPUT_VA_VALUE_MASK)) ++/* End of STREAM_CONTROL_BLOCK register set definitions */ ++ ++/* GLB_INPUT_BLOCK register set definitions */ ++ ++/* GLB_REQ register */ ++#define GLB_REQ_HALT_SHIFT 0 ++#define GLB_REQ_HALT_MASK (0x1 << GLB_REQ_HALT_SHIFT) ++#define GLB_REQ_HALT_GET(reg_val) (((reg_val)&GLB_REQ_HALT_MASK) >> GLB_REQ_HALT_SHIFT) ++#define GLB_REQ_HALT_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_HALT_MASK) | (((value) << GLB_REQ_HALT_SHIFT) & GLB_REQ_HALT_MASK)) ++#define GLB_REQ_CFG_PROGRESS_TIMER_SHIFT 1 ++#define GLB_REQ_CFG_PROGRESS_TIMER_MASK (0x1 << GLB_REQ_CFG_PROGRESS_TIMER_SHIFT) ++#define GLB_REQ_CFG_PROGRESS_TIMER_GET(reg_val) \ ++ (((reg_val)&GLB_REQ_CFG_PROGRESS_TIMER_MASK) >> GLB_REQ_CFG_PROGRESS_TIMER_SHIFT) ++#define GLB_REQ_CFG_PROGRESS_TIMER_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_CFG_PROGRESS_TIMER_MASK) | \ ++ (((value) << GLB_REQ_CFG_PROGRESS_TIMER_SHIFT) & GLB_REQ_CFG_PROGRESS_TIMER_MASK)) ++#define GLB_REQ_CFG_ALLOC_EN_SHIFT 2 ++#define GLB_REQ_CFG_ALLOC_EN_MASK (0x1 << GLB_REQ_CFG_ALLOC_EN_SHIFT) ++#define GLB_REQ_CFG_ALLOC_EN_GET(reg_val) (((reg_val)&GLB_REQ_CFG_ALLOC_EN_MASK) >> GLB_REQ_CFG_ALLOC_EN_SHIFT) ++#define GLB_REQ_CFG_ALLOC_EN_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_CFG_ALLOC_EN_MASK) | (((value) << GLB_REQ_CFG_ALLOC_EN_SHIFT) & GLB_REQ_CFG_ALLOC_EN_MASK)) ++#define GLB_REQ_CFG_PWROFF_TIMER_SHIFT 3 ++#define GLB_REQ_CFG_PWROFF_TIMER_MASK (0x1 << GLB_REQ_CFG_PWROFF_TIMER_SHIFT) ++#define GLB_REQ_CFG_PWROFF_TIMER_GET(reg_val) \ ++ (((reg_val)&GLB_REQ_CFG_PWROFF_TIMER_MASK) >> GLB_REQ_CFG_PWROFF_TIMER_SHIFT) ++#define GLB_REQ_CFG_PWROFF_TIMER_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_CFG_PWROFF_TIMER_MASK) | \ ++ (((value) << GLB_REQ_CFG_PWROFF_TIMER_SHIFT) & GLB_REQ_CFG_PWROFF_TIMER_MASK)) ++#define GLB_REQ_PROTM_ENTER_SHIFT 4 ++#define GLB_REQ_PROTM_ENTER_MASK (0x1 << GLB_REQ_PROTM_ENTER_SHIFT) ++#define GLB_REQ_PROTM_ENTER_GET(reg_val) (((reg_val)&GLB_REQ_PROTM_ENTER_MASK) >> GLB_REQ_PROTM_ENTER_SHIFT) ++#define GLB_REQ_PROTM_ENTER_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_PROTM_ENTER_MASK) | (((value) << GLB_REQ_PROTM_ENTER_SHIFT) & GLB_REQ_PROTM_ENTER_MASK)) ++#define GLB_REQ_PRFCNT_ENABLE_SHIFT 5 ++#define GLB_REQ_PRFCNT_ENABLE_MASK (0x1 << GLB_REQ_PRFCNT_ENABLE_SHIFT) ++#define GLB_REQ_PRFCNT_ENABLE_GET(reg_val) (((reg_val)&GLB_REQ_PRFCNT_ENABLE_MASK) >> GLB_REQ_PRFCNT_ENABLE_SHIFT) ++#define GLB_REQ_PRFCNT_ENABLE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_PRFCNT_ENABLE_MASK) | \ ++ (((value) << GLB_REQ_PRFCNT_ENABLE_SHIFT) & GLB_REQ_PRFCNT_ENABLE_MASK)) ++#define GLB_REQ_PRFCNT_SAMPLE_SHIFT 6 ++#define GLB_REQ_PRFCNT_SAMPLE_MASK (0x1 << GLB_REQ_PRFCNT_SAMPLE_SHIFT) ++#define GLB_REQ_PRFCNT_SAMPLE_GET(reg_val) (((reg_val)&GLB_REQ_PRFCNT_SAMPLE_MASK) >> GLB_REQ_PRFCNT_SAMPLE_SHIFT) ++#define GLB_REQ_PRFCNT_SAMPLE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_PRFCNT_SAMPLE_MASK) | \ ++ (((value) << GLB_REQ_PRFCNT_SAMPLE_SHIFT) & GLB_REQ_PRFCNT_SAMPLE_MASK)) ++#define GLB_REQ_COUNTER_ENABLE_SHIFT 7 ++#define GLB_REQ_COUNTER_ENABLE_MASK (0x1 << GLB_REQ_COUNTER_ENABLE_SHIFT) ++#define GLB_REQ_COUNTER_ENABLE_GET(reg_val) (((reg_val)&GLB_REQ_COUNTER_ENABLE_MASK) >> GLB_REQ_COUNTER_ENABLE_SHIFT) ++#define GLB_REQ_COUNTER_ENABLE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_COUNTER_ENABLE_MASK) | \ ++ (((value) << GLB_REQ_COUNTER_ENABLE_SHIFT) & GLB_REQ_COUNTER_ENABLE_MASK)) ++#define GLB_REQ_PING_SHIFT 8 ++#define GLB_REQ_PING_MASK (0x1 << GLB_REQ_PING_SHIFT) ++#define GLB_REQ_PING_GET(reg_val) (((reg_val)&GLB_REQ_PING_MASK) >> GLB_REQ_PING_SHIFT) ++#define GLB_REQ_PING_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_PING_MASK) | (((value) << GLB_REQ_PING_SHIFT) & GLB_REQ_PING_MASK)) ++#define GLB_REQ_FIRMWARE_CONFIG_UPDATE_SHIFT 9 ++#define GLB_REQ_FIRMWARE_CONFIG_UPDATE_MASK \ ++ (0x1 << GLB_REQ_FIRMWARE_CONFIG_UPDATE_SHIFT) ++#define GLB_REQ_FIRMWARE_CONFIG_UPDATE_GET(reg_val) \ ++ (((reg_val)&GLB_REQ_FIRMWARE_CONFIG_UPDATE_MASK) >> \ ++ GLB_REQ_FIRMWARE_CONFIG_UPDATE_SHIFT) ++#define GLB_REQ_FIRMWARE_CONFIG_UPDATE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_FIRMWARE_CONFIG_UPDATE_MASK) | \ ++ (((value) << GLB_REQ_FIRMWARE_CONFIG_UPDATE_SHIFT) & \ ++ GLB_REQ_FIRMWARE_CONFIG_UPDATE_MASK)) ++#define GLB_REQ_SLEEP_SHIFT 12 ++#define GLB_REQ_SLEEP_MASK (0x1 << GLB_REQ_SLEEP_SHIFT) ++#define GLB_REQ_SLEEP_GET(reg_val) \ ++ (((reg_val) & GLB_REQ_SLEEP_MASK) >> GLB_REQ_SLEEP_SHIFT) ++#define GLB_REQ_SLEEP_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_SLEEP_MASK) | \ ++ (((value) << GLB_REQ_SLEEP_SHIFT) & GLB_REQ_SLEEP_MASK)) ++#define GLB_REQ_INACTIVE_COMPUTE_SHIFT 20 ++#define GLB_REQ_INACTIVE_COMPUTE_MASK (0x1 << GLB_REQ_INACTIVE_COMPUTE_SHIFT) ++#define GLB_REQ_INACTIVE_COMPUTE_GET(reg_val) \ ++ (((reg_val)&GLB_REQ_INACTIVE_COMPUTE_MASK) >> GLB_REQ_INACTIVE_COMPUTE_SHIFT) ++#define GLB_REQ_INACTIVE_COMPUTE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_INACTIVE_COMPUTE_MASK) | \ ++ (((value) << GLB_REQ_INACTIVE_COMPUTE_SHIFT) & GLB_REQ_INACTIVE_COMPUTE_MASK)) ++#define GLB_REQ_INACTIVE_FRAGMENT_SHIFT 21 ++#define GLB_REQ_INACTIVE_FRAGMENT_MASK (0x1 << GLB_REQ_INACTIVE_FRAGMENT_SHIFT) ++#define GLB_REQ_INACTIVE_FRAGMENT_GET(reg_val) \ ++ (((reg_val)&GLB_REQ_INACTIVE_FRAGMENT_MASK) >> GLB_REQ_INACTIVE_FRAGMENT_SHIFT) ++#define GLB_REQ_INACTIVE_FRAGMENT_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_INACTIVE_FRAGMENT_MASK) | \ ++ (((value) << GLB_REQ_INACTIVE_FRAGMENT_SHIFT) & GLB_REQ_INACTIVE_FRAGMENT_MASK)) ++#define GLB_REQ_INACTIVE_TILER_SHIFT 22 ++#define GLB_REQ_INACTIVE_TILER_MASK (0x1 << GLB_REQ_INACTIVE_TILER_SHIFT) ++#define GLB_REQ_INACTIVE_TILER_GET(reg_val) (((reg_val)&GLB_REQ_INACTIVE_TILER_MASK) >> GLB_REQ_INACTIVE_TILER_SHIFT) ++#define GLB_REQ_INACTIVE_TILER_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_INACTIVE_TILER_MASK) | \ ++ (((value) << GLB_REQ_INACTIVE_TILER_SHIFT) & GLB_REQ_INACTIVE_TILER_MASK)) ++#define GLB_REQ_PROTM_EXIT_SHIFT 23 ++#define GLB_REQ_PROTM_EXIT_MASK (0x1 << GLB_REQ_PROTM_EXIT_SHIFT) ++#define GLB_REQ_PROTM_EXIT_GET(reg_val) (((reg_val)&GLB_REQ_PROTM_EXIT_MASK) >> GLB_REQ_PROTM_EXIT_SHIFT) ++#define GLB_REQ_PROTM_EXIT_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_PROTM_EXIT_MASK) | (((value) << GLB_REQ_PROTM_EXIT_SHIFT) & GLB_REQ_PROTM_EXIT_MASK)) ++#define GLB_REQ_PRFCNT_THRESHOLD_SHIFT 24 ++#define GLB_REQ_PRFCNT_THRESHOLD_MASK (0x1 << GLB_REQ_PRFCNT_THRESHOLD_SHIFT) ++#define GLB_REQ_PRFCNT_THRESHOLD_GET(reg_val) \ ++ (((reg_val)&GLB_REQ_PRFCNT_THRESHOLD_MASK) >> \ ++ GLB_REQ_PRFCNT_THRESHOLD_SHIFT) ++#define GLB_REQ_PRFCNT_THRESHOLD_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_PRFCNT_THRESHOLD_MASK) | \ ++ (((value) << GLB_REQ_PRFCNT_THRESHOLD_SHIFT) & \ ++ GLB_REQ_PRFCNT_THRESHOLD_MASK)) ++#define GLB_REQ_PRFCNT_OVERFLOW_SHIFT 25 ++#define GLB_REQ_PRFCNT_OVERFLOW_MASK (0x1 << GLB_REQ_PRFCNT_OVERFLOW_SHIFT) ++#define GLB_REQ_PRFCNT_OVERFLOW_GET(reg_val) \ ++ (((reg_val)&GLB_REQ_PRFCNT_OVERFLOW_MASK) >> \ ++ GLB_REQ_PRFCNT_OVERFLOW_SHIFT) ++#define GLB_REQ_PRFCNT_OVERFLOW_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_PRFCNT_OVERFLOW_MASK) | \ ++ (((value) << GLB_REQ_PRFCNT_OVERFLOW_SHIFT) & \ ++ GLB_REQ_PRFCNT_OVERFLOW_MASK)) ++#define GLB_REQ_DEBUG_CSF_REQ_SHIFT 30 ++#define GLB_REQ_DEBUG_CSF_REQ_MASK (0x1 << GLB_REQ_DEBUG_CSF_REQ_SHIFT) ++#define GLB_REQ_DEBUG_CSF_REQ_GET(reg_val) (((reg_val)&GLB_REQ_DEBUG_CSF_REQ_MASK) >> GLB_REQ_DEBUG_CSF_REQ_SHIFT) ++#define GLB_REQ_DEBUG_CSF_REQ_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_DEBUG_CSF_REQ_MASK) | \ ++ (((value) << GLB_REQ_DEBUG_CSF_REQ_SHIFT) & GLB_REQ_DEBUG_CSF_REQ_MASK)) ++#define GLB_REQ_DEBUG_HOST_REQ_SHIFT 31 ++#define GLB_REQ_DEBUG_HOST_REQ_MASK (0x1 << GLB_REQ_DEBUG_HOST_REQ_SHIFT) ++#define GLB_REQ_DEBUG_HOST_REQ_GET(reg_val) (((reg_val)&GLB_REQ_DEBUG_HOST_REQ_MASK) >> GLB_REQ_DEBUG_HOST_REQ_SHIFT) ++#define GLB_REQ_DEBUG_HOST_REQ_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_DEBUG_HOST_REQ_MASK) | \ ++ (((value) << GLB_REQ_DEBUG_HOST_REQ_SHIFT) & GLB_REQ_DEBUG_HOST_REQ_MASK)) ++ ++/* GLB_ACK_IRQ_MASK register */ ++#define GLB_ACK_IRQ_MASK_HALT_SHIFT 0 ++#define GLB_ACK_IRQ_MASK_HALT_MASK (0x1 << GLB_ACK_IRQ_MASK_HALT_SHIFT) ++#define GLB_ACK_IRQ_MASK_HALT_GET(reg_val) (((reg_val)&GLB_ACK_IRQ_MASK_HALT_MASK) >> GLB_ACK_IRQ_MASK_HALT_SHIFT) ++#define GLB_ACK_IRQ_MASK_HALT_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_HALT_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_HALT_SHIFT) & GLB_ACK_IRQ_MASK_HALT_MASK)) ++#define GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_SHIFT 1 ++#define GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_MASK (0x1 << GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_SHIFT) ++#define GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_MASK) >> GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_SHIFT) ++#define GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_SHIFT) & GLB_ACK_IRQ_MASK_CFG_PROGRESS_TIMER_MASK)) ++#define GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_SHIFT 2 ++#define GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_MASK (0x1 << GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_SHIFT) ++#define GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_MASK) >> GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_SHIFT) ++#define GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_SHIFT) & GLB_ACK_IRQ_MASK_CFG_ALLOC_EN_MASK)) ++#define GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_SHIFT 3 ++#define GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_MASK (0x1 << GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_SHIFT) ++#define GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_MASK) >> GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_SHIFT) ++#define GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_SHIFT) & GLB_ACK_IRQ_MASK_CFG_PWROFF_TIMER_MASK)) ++#define GLB_ACK_IRQ_MASK_PROTM_ENTER_SHIFT 4 ++#define GLB_ACK_IRQ_MASK_PROTM_ENTER_MASK (0x1 << GLB_ACK_IRQ_MASK_PROTM_ENTER_SHIFT) ++#define GLB_ACK_IRQ_MASK_PROTM_ENTER_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_PROTM_ENTER_MASK) >> GLB_ACK_IRQ_MASK_PROTM_ENTER_SHIFT) ++#define GLB_ACK_IRQ_MASK_PROTM_ENTER_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_PROTM_ENTER_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_PROTM_ENTER_SHIFT) & GLB_ACK_IRQ_MASK_PROTM_ENTER_MASK)) ++#define GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_SHIFT 5 ++#define GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_MASK (0x1 << GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_SHIFT) ++#define GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_MASK) >> GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_SHIFT) ++#define GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_SHIFT) & GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_MASK)) ++#define GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_SHIFT 6 ++#define GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_MASK (0x1 << GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_SHIFT) ++#define GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_MASK) >> GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_SHIFT) ++#define GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_SHIFT) & GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_MASK)) ++#define GLB_ACK_IRQ_MASK_COUNTER_ENABLE_SHIFT 7 ++#define GLB_ACK_IRQ_MASK_COUNTER_ENABLE_MASK (0x1 << GLB_ACK_IRQ_MASK_COUNTER_ENABLE_SHIFT) ++#define GLB_ACK_IRQ_MASK_COUNTER_ENABLE_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_COUNTER_ENABLE_MASK) >> GLB_ACK_IRQ_MASK_COUNTER_ENABLE_SHIFT) ++#define GLB_ACK_IRQ_MASK_COUNTER_ENABLE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_COUNTER_ENABLE_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_COUNTER_ENABLE_SHIFT) & GLB_ACK_IRQ_MASK_COUNTER_ENABLE_MASK)) ++#define GLB_ACK_IRQ_MASK_PING_SHIFT 8 ++#define GLB_ACK_IRQ_MASK_PING_MASK (0x1 << GLB_ACK_IRQ_MASK_PING_SHIFT) ++#define GLB_ACK_IRQ_MASK_PING_GET(reg_val) (((reg_val)&GLB_ACK_IRQ_MASK_PING_MASK) >> GLB_ACK_IRQ_MASK_PING_SHIFT) ++#define GLB_ACK_IRQ_MASK_PING_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_PING_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_PING_SHIFT) & GLB_ACK_IRQ_MASK_PING_MASK)) ++#define GLB_ACK_IRQ_MASK_FIRMWARE_CONFIG_UPDATE_SHIFT 9 ++#define GLB_ACK_IRQ_MASK_FIRMWARE_CONFIG_UPDATE_MASK \ ++ (0x1 << GLB_ACK_IRQ_MASK_FIRMWARE_CONFIG_UPDATE_SHIFT) ++#define GLB_ACK_IRQ_MASK_FIRMWARE_CONFIG_UPDATE_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_FIRMWARE_CONFIG_UPDATE_MASK) >> \ ++ GLB_ACK_IRQ_MASK_FIRMWARE_CONFIG_UPDATE_SHIFT) ++#define GLB_ACK_IRQ_MASK_FIRMWARE_CONFIG_UPDATE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_FIRMWARE_CONFIG_UPDATE_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_FIRMWARE_CONFIG_UPDATE_SHIFT) & \ ++ GLB_ACK_IRQ_MASK_FIRMWARE_CONFIG_UPDATE_MASK)) ++#define GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_SHIFT 20 ++#define GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_MASK (0x1 << GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_SHIFT) ++#define GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_MASK) >> GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_SHIFT) ++#define GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_SHIFT) & GLB_ACK_IRQ_MASK_INACTIVE_COMPUTE_MASK)) ++#define GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_SHIFT 21 ++#define GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_MASK (0x1 << GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_SHIFT) ++#define GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_MASK) >> GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_SHIFT) ++#define GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_SHIFT) & GLB_ACK_IRQ_MASK_INACTIVE_FRAGMENT_MASK)) ++#define GLB_ACK_IRQ_MASK_INACTIVE_TILER_SHIFT 22 ++#define GLB_ACK_IRQ_MASK_INACTIVE_TILER_MASK (0x1 << GLB_ACK_IRQ_MASK_INACTIVE_TILER_SHIFT) ++#define GLB_ACK_IRQ_MASK_INACTIVE_TILER_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_INACTIVE_TILER_MASK) >> GLB_ACK_IRQ_MASK_INACTIVE_TILER_SHIFT) ++#define GLB_ACK_IRQ_MASK_INACTIVE_TILER_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_INACTIVE_TILER_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_INACTIVE_TILER_SHIFT) & GLB_ACK_IRQ_MASK_INACTIVE_TILER_MASK)) ++#define GLB_ACK_IRQ_MASK_PROTM_EXIT_SHIFT 23 ++#define GLB_ACK_IRQ_MASK_PROTM_EXIT_MASK (0x1 << GLB_ACK_IRQ_MASK_PROTM_EXIT_SHIFT) ++#define GLB_ACK_IRQ_MASK_PROTM_EXIT_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_PROTM_EXIT_MASK) >> GLB_ACK_IRQ_MASK_PROTM_EXIT_SHIFT) ++#define GLB_ACK_IRQ_MASK_PROTM_EXIT_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_PROTM_EXIT_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_PROTM_EXIT_SHIFT) & GLB_ACK_IRQ_MASK_PROTM_EXIT_MASK)) ++#define GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_SHIFT 24 ++#define GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_MASK \ ++ (0x1 << GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_SHIFT) ++#define GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_MASK) >> \ ++ GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_SHIFT) ++#define GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_SHIFT) & \ ++ GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_MASK)) ++#define GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_SHIFT 25 ++#define GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_MASK \ ++ (0x1 << GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_SHIFT) ++#define GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_MASK) >> \ ++ GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_SHIFT) ++#define GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_SHIFT) & \ ++ GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_MASK)) ++#define GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_SHIFT 30 ++#define GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_MASK (0x1 << GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_SHIFT) ++#define GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_MASK) >> GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_SHIFT) ++#define GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_SHIFT) & GLB_ACK_IRQ_MASK_DEBUG_CSF_REQ_MASK)) ++#define GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_SHIFT 31 ++#define GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_MASK (0x1 << GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_SHIFT) ++#define GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_MASK) >> GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_SHIFT) ++#define GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_MASK) | \ ++ (((value) << GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_SHIFT) & GLB_ACK_IRQ_MASK_DEBUG_HOST_REQ_MASK)) ++ ++/* GLB_PROGRESS_TIMER register */ ++#define GLB_PROGRESS_TIMER_TIMEOUT_SHIFT 0 ++#define GLB_PROGRESS_TIMER_TIMEOUT_MASK (0xFFFFFFFF << GLB_PROGRESS_TIMER_TIMEOUT_SHIFT) ++#define GLB_PROGRESS_TIMER_TIMEOUT_GET(reg_val) \ ++ (((reg_val)&GLB_PROGRESS_TIMER_TIMEOUT_MASK) >> GLB_PROGRESS_TIMER_TIMEOUT_SHIFT) ++#define GLB_PROGRESS_TIMER_TIMEOUT_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_PROGRESS_TIMER_TIMEOUT_MASK) | \ ++ (((value) << GLB_PROGRESS_TIMER_TIMEOUT_SHIFT) & GLB_PROGRESS_TIMER_TIMEOUT_MASK)) ++ ++/* GLB_PWROFF_TIMER register */ ++#define GLB_PWROFF_TIMER_TIMEOUT_SHIFT 0 ++#define GLB_PWROFF_TIMER_TIMEOUT_MASK (0x7FFFFFFF << GLB_PWROFF_TIMER_TIMEOUT_SHIFT) ++#define GLB_PWROFF_TIMER_TIMEOUT_GET(reg_val) \ ++ (((reg_val)&GLB_PWROFF_TIMER_TIMEOUT_MASK) >> GLB_PWROFF_TIMER_TIMEOUT_SHIFT) ++#define GLB_PWROFF_TIMER_TIMEOUT_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_PWROFF_TIMER_TIMEOUT_MASK) | \ ++ (((value) << GLB_PWROFF_TIMER_TIMEOUT_SHIFT) & GLB_PWROFF_TIMER_TIMEOUT_MASK)) ++#define GLB_PWROFF_TIMER_TIMER_SOURCE_SHIFT 31 ++#define GLB_PWROFF_TIMER_TIMER_SOURCE_MASK (0x1 << GLB_PWROFF_TIMER_TIMER_SOURCE_SHIFT) ++#define GLB_PWROFF_TIMER_TIMER_SOURCE_GET(reg_val) \ ++ (((reg_val)&GLB_PWROFF_TIMER_TIMER_SOURCE_MASK) >> GLB_PWROFF_TIMER_TIMER_SOURCE_SHIFT) ++#define GLB_PWROFF_TIMER_TIMER_SOURCE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_PWROFF_TIMER_TIMER_SOURCE_MASK) | \ ++ (((value) << GLB_PWROFF_TIMER_TIMER_SOURCE_SHIFT) & GLB_PWROFF_TIMER_TIMER_SOURCE_MASK)) ++/* GLB_PWROFF_TIMER_TIMER_SOURCE values */ ++#define GLB_PWROFF_TIMER_TIMER_SOURCE_SYSTEM_TIMESTAMP 0x0 ++#define GLB_PWROFF_TIMER_TIMER_SOURCE_GPU_COUNTER 0x1 ++/* End of GLB_PWROFF_TIMER_TIMER_SOURCE values */ ++ ++/* GLB_ALLOC_EN register */ ++#define GLB_ALLOC_EN_MASK_SHIFT 0 ++#define GLB_ALLOC_EN_MASK_MASK (GPU_ULL(0xFFFFFFFFFFFFFFFF) << GLB_ALLOC_EN_MASK_SHIFT) ++#define GLB_ALLOC_EN_MASK_GET(reg_val) (((reg_val)&GLB_ALLOC_EN_MASK_MASK) >> GLB_ALLOC_EN_MASK_SHIFT) ++#define GLB_ALLOC_EN_MASK_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ALLOC_EN_MASK_MASK) | (((value) << GLB_ALLOC_EN_MASK_SHIFT) & GLB_ALLOC_EN_MASK_MASK)) ++ ++/* GLB_OUTPUT_BLOCK register set definitions */ ++ ++/* GLB_ACK register */ ++#define GLB_ACK_CFG_PROGRESS_TIMER_SHIFT 1 ++#define GLB_ACK_CFG_PROGRESS_TIMER_MASK (0x1 << GLB_ACK_CFG_PROGRESS_TIMER_SHIFT) ++#define GLB_ACK_CFG_PROGRESS_TIMER_GET(reg_val) \ ++ (((reg_val)&GLB_ACK_CFG_PROGRESS_TIMER_MASK) >> GLB_ACK_CFG_PROGRESS_TIMER_SHIFT) ++#define GLB_ACK_CFG_PROGRESS_TIMER_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_CFG_PROGRESS_TIMER_MASK) | \ ++ (((value) << GLB_ACK_CFG_PROGRESS_TIMER_SHIFT) & GLB_ACK_CFG_PROGRESS_TIMER_MASK)) ++#define GLB_ACK_CFG_ALLOC_EN_SHIFT 2 ++#define GLB_ACK_CFG_ALLOC_EN_MASK (0x1 << GLB_ACK_CFG_ALLOC_EN_SHIFT) ++#define GLB_ACK_CFG_ALLOC_EN_GET(reg_val) (((reg_val)&GLB_ACK_CFG_ALLOC_EN_MASK) >> GLB_ACK_CFG_ALLOC_EN_SHIFT) ++#define GLB_ACK_CFG_ALLOC_EN_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_ACK_CFG_ALLOC_EN_MASK) | (((value) << GLB_ACK_CFG_ALLOC_EN_SHIFT) & GLB_ACK_CFG_ALLOC_EN_MASK)) ++/* End of GLB_OUTPUT_BLOCK register set definitions */ ++ ++/* The following register and fields are for headers before 10.x.7/11.x.4 */ ++#define GLB_REQ_IDLE_ENABLE_SHIFT (10) ++#define GLB_REQ_REQ_IDLE_ENABLE (1 << GLB_REQ_IDLE_ENABLE_SHIFT) ++#define GLB_REQ_REQ_IDLE_DISABLE (0 << GLB_REQ_IDLE_ENABLE_SHIFT) ++#define GLB_REQ_IDLE_ENABLE_MASK (0x1 << GLB_REQ_IDLE_ENABLE_SHIFT) ++#define GLB_REQ_IDLE_DISABLE_MASK (0x1 << GLB_REQ_IDLE_ENABLE_SHIFT) ++#define GLB_REQ_IDLE_EVENT_SHIFT (26) ++#define GLB_REQ_IDLE_EVENT_MASK (0x1 << GLB_REQ_IDLE_EVENT_SHIFT) ++#define GLB_ACK_IDLE_ENABLE_SHIFT (10) ++#define GLB_ACK_ACK_IDLE_ENABLE (1 << GLB_ACK_IDLE_ENABLE_SHIFT) ++#define GLB_ACK_ACK_IDLE_DISABLE (0 << GLB_ACK_IDLE_ENABLE_SHIFT) ++#define GLB_ACK_IDLE_ENABLE_MASK (0x1 << GLB_ACK_IDLE_ENABLE_SHIFT) ++#define GLB_ACK_IDLE_EVENT_SHIFT (26) ++#define GLB_ACK_IDLE_EVENT_MASK (0x1 << GLB_REQ_IDLE_EVENT_SHIFT) ++ ++#define GLB_ACK_IRQ_MASK_IDLE_EVENT_SHIFT (26) ++#define GLB_ACK_IRQ_MASK_IDLE_EVENT_MASK (0x1 << GLB_ACK_IRQ_MASK_IDLE_EVENT_SHIFT) ++ ++#define GLB_ACK_IRQ_MASK_IDLE_ENABLE_SHIFT GPU_U(10) ++#define GLB_ACK_IRQ_MASK_IDLE_ENABLE_MASK (GPU_U(0x1) << GLB_ACK_IRQ_MASK_IDLE_ENABLE_SHIFT) ++ ++#define GLB_IDLE_TIMER (0x0080) ++/* GLB_IDLE_TIMER register */ ++#define GLB_IDLE_TIMER_TIMEOUT_SHIFT (0) ++#define GLB_IDLE_TIMER_TIMEOUT_MASK ((0x7FFFFFFF) << GLB_IDLE_TIMER_TIMEOUT_SHIFT) ++#define GLB_IDLE_TIMER_TIMEOUT_GET(reg_val) (((reg_val)&GLB_IDLE_TIMER_TIMEOUT_MASK) >> GLB_IDLE_TIMER_TIMEOUT_SHIFT) ++#define GLB_IDLE_TIMER_TIMEOUT_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_IDLE_TIMER_TIMEOUT_MASK) | \ ++ (((value) << GLB_IDLE_TIMER_TIMEOUT_SHIFT) & GLB_IDLE_TIMER_TIMEOUT_MASK)) ++#define GLB_IDLE_TIMER_TIMER_SOURCE_SHIFT (31) ++#define GLB_IDLE_TIMER_TIMER_SOURCE_MASK ((0x1) << GLB_IDLE_TIMER_TIMER_SOURCE_SHIFT) ++#define GLB_IDLE_TIMER_TIMER_SOURCE_GET(reg_val) \ ++ (((reg_val)&GLB_IDLE_TIMER_TIMER_SOURCE_MASK) >> GLB_IDLE_TIMER_TIMER_SOURCE_SHIFT) ++#define GLB_IDLE_TIMER_TIMER_SOURCE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_IDLE_TIMER_TIMER_SOURCE_MASK) | \ ++ (((value) << GLB_IDLE_TIMER_TIMER_SOURCE_SHIFT) & GLB_IDLE_TIMER_TIMER_SOURCE_MASK)) ++/* GLB_IDLE_TIMER_TIMER_SOURCE values */ ++#define GLB_IDLE_TIMER_TIMER_SOURCE_SYSTEM_TIMESTAMP 0x0 ++#define GLB_IDLE_TIMER_TIMER_SOURCE_GPU_COUNTER 0x1 ++/* End of GLB_IDLE_TIMER_TIMER_SOURCE values */ ++ ++/* GLB_INSTR_FEATURES register */ ++#define GLB_INSTR_FEATURES_OFFSET_UPDATE_RATE_SHIFT (0) ++#define GLB_INSTR_FEATURES_OFFSET_UPDATE_RATE_MASK ((u32)0xF << GLB_INSTR_FEATURES_OFFSET_UPDATE_RATE_SHIFT) ++#define GLB_INSTR_FEATURES_OFFSET_UPDATE_RATE_GET(reg_val) \ ++ (((reg_val)&GLB_INSTR_FEATURES_OFFSET_UPDATE_RATE_MASK) >> GLB_INSTR_FEATURES_OFFSET_UPDATE_RATE_SHIFT) ++#define GLB_INSTR_FEATURES_OFFSET_UPDATE_RATE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_INSTR_FEATURES_OFFSET_UPDATE_RATE_MASK) | \ ++ (((value) << GLB_INSTR_FEATURES_OFFSET_UPDATE_RATE_SHIFT) & GLB_INSTR_FEATURES_OFFSET_UPDATE_RATE_MASK)) ++#define GLB_INSTR_FEATURES_EVENT_SIZE_MAX_SHIFT (4) ++#define GLB_INSTR_FEATURES_EVENT_SIZE_MAX_MASK ((u32)0xF << GLB_INSTR_FEATURES_EVENT_SIZE_MAX_SHIFT) ++#define GLB_INSTR_FEATURES_EVENT_SIZE_MAX_GET(reg_val) \ ++ (((reg_val)&GLB_INSTR_FEATURES_EVENT_SIZE_MAX_MASK) >> GLB_INSTR_FEATURES_EVENT_SIZE_MAX_SHIFT) ++#define GLB_INSTR_FEATURES_EVENT_SIZE_MAX_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_INSTR_FEATURES_EVENT_SIZE_MAX_MASK) | \ ++ (((value) << GLB_INSTR_FEATURES_EVENT_SIZE_MAX_SHIFT) & GLB_INSTR_FEATURES_EVENT_SIZE_MAX_MASK)) ++ ++#define CSG_STATUS_STATE (0x0018) /* CSG state status register */ ++/* CSG_STATUS_STATE register */ ++#define CSG_STATUS_STATE_IDLE_SHIFT (0) ++#define CSG_STATUS_STATE_IDLE_MASK ((0x1) << CSG_STATUS_STATE_IDLE_SHIFT) ++#define CSG_STATUS_STATE_IDLE_GET(reg_val) \ ++ (((reg_val)&CSG_STATUS_STATE_IDLE_MASK) >> CSG_STATUS_STATE_IDLE_SHIFT) ++#define CSG_STATUS_STATE_IDLE_SET(reg_val, value) \ ++ (((reg_val) & ~CSG_STATUS_STATE_IDLE_MASK) | \ ++ (((value) << CSG_STATUS_STATE_IDLE_SHIFT) & CSG_STATUS_STATE_IDLE_MASK)) ++ ++/* GLB_FEATURES_ITER_TRACE_SUPPORTED register */ ++#define GLB_FEATURES_ITER_TRACE_SUPPORTED_SHIFT GPU_U(4) ++#define GLB_FEATURES_ITER_TRACE_SUPPORTED_MASK \ ++ (GPU_U(0x1) << GLB_FEATURES_ITER_TRACE_SUPPORTED_SHIFT) ++#define GLB_FEATURES_ITER_TRACE_SUPPORTED_GET(reg_val) \ ++ (((reg_val)&GLB_FEATURES_ITER_TRACE_SUPPORTED_MASK) >> \ ++ GLB_FEATURES_ITER_TRACE_SUPPORTED_SHIFT) ++#define GLB_FEATURES_ITER_TRACE_SUPPORTED_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_FEATURES_ITER_TRACE_SUPPORTED_MASK) | \ ++ (((value) << GLB_FEATURES_ITER_TRACE_SUPPORTED_SHIFT) & \ ++ GLB_FEATURES_ITER_TRACE_SUPPORTED_MASK)) ++ ++/* GLB_REQ_ITER_TRACE_ENABLE register */ ++#define GLB_REQ_ITER_TRACE_ENABLE_SHIFT GPU_U(11) ++#define GLB_REQ_ITER_TRACE_ENABLE_MASK \ ++ (GPU_U(0x1) << GLB_REQ_ITER_TRACE_ENABLE_SHIFT) ++#define GLB_REQ_ITER_TRACE_ENABLE_GET(reg_val) \ ++ (((reg_val)&GLB_REQ_ITER_TRACE_ENABLE_MASK) >> \ ++ GLB_REQ_ITER_TRACE_ENABLE_SHIFT) ++#define GLB_REQ_ITER_TRACE_ENABLE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_REQ_ITER_TRACE_ENABLE_MASK) | \ ++ (((value) << GLB_REQ_ITER_TRACE_ENABLE_SHIFT) & \ ++ GLB_REQ_ITER_TRACE_ENABLE_MASK)) ++ ++/* GLB_PRFCNT_CONFIG register */ ++#define GLB_PRFCNT_CONFIG_SIZE_SHIFT (0) ++#define GLB_PRFCNT_CONFIG_SIZE_MASK (0xFF << GLB_PRFCNT_CONFIG_SIZE_SHIFT) ++#define GLB_PRFCNT_CONFIG_SIZE_GET(reg_val) \ ++ (((reg_val)&GLB_PRFCNT_CONFIG_SIZE_MASK) >> GLB_PRFCNT_CONFIG_SIZE_SHIFT) ++#define GLB_PRFCNT_CONFIG_SIZE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_PRFCNT_CONFIG_SIZE_MASK) | \ ++ (((value) << GLB_PRFCNT_CONFIG_SIZE_SHIFT) & GLB_PRFCNT_CONFIG_SIZE_MASK)) ++#define GLB_PRFCNT_CONFIG_SET_SELECT_SHIFT GPU_U(8) ++#define GLB_PRFCNT_CONFIG_SET_SELECT_MASK (GPU_U(0x3) << GLB_PRFCNT_CONFIG_SET_SELECT_SHIFT) ++#define GLB_PRFCNT_CONFIG_SET_SELECT_GET(reg_val) \ ++ (((reg_val)&GLB_PRFCNT_CONFIG_SET_SELECT_MASK) >> GLB_PRFCNT_CONFIG_SET_SELECT_SHIFT) ++#define GLB_PRFCNT_CONFIG_SET_SELECT_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_PRFCNT_CONFIG_SET_SELECT_MASK) | \ ++ (((value) << GLB_PRFCNT_CONFIG_SET_SELECT_SHIFT) & GLB_PRFCNT_CONFIG_SET_SELECT_MASK)) ++ ++/* GLB_PRFCNT_SIZE register */ ++#define GLB_PRFCNT_SIZE_HARDWARE_SIZE_SET_MOD(value) ((value) >> 8) ++#define GLB_PRFCNT_SIZE_HARDWARE_SIZE_GET_MOD(value) ((value) << 8) ++#define GLB_PRFCNT_SIZE_HARDWARE_SIZE_SHIFT GPU_U(0) ++#define GLB_PRFCNT_SIZE_HARDWARE_SIZE_MASK (GPU_U(0xFFFF) << GLB_PRFCNT_SIZE_HARDWARE_SIZE_SHIFT) ++#define GLB_PRFCNT_SIZE_HARDWARE_SIZE_GET(reg_val) \ ++ (GLB_PRFCNT_SIZE_HARDWARE_SIZE_GET_MOD(((reg_val)&GLB_PRFCNT_SIZE_HARDWARE_SIZE_MASK) >> \ ++ GLB_PRFCNT_SIZE_HARDWARE_SIZE_SHIFT)) ++#define GLB_PRFCNT_SIZE_HARDWARE_SIZE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_PRFCNT_SIZE_HARDWARE_SIZE_MASK) | \ ++ ((GLB_PRFCNT_SIZE_HARDWARE_SIZE_SET_MOD(value) << GLB_PRFCNT_SIZE_HARDWARE_SIZE_SHIFT) & \ ++ GLB_PRFCNT_SIZE_HARDWARE_SIZE_MASK)) ++#define GLB_PRFCNT_SIZE_FIRMWARE_SIZE_SET_MOD(value) ((value) >> 8) ++#define GLB_PRFCNT_SIZE_FIRMWARE_SIZE_GET_MOD(value) ((value) << 8) ++#define GLB_PRFCNT_SIZE_FIRMWARE_SIZE_SHIFT GPU_U(16) ++#define GLB_PRFCNT_SIZE_FIRMWARE_SIZE_MASK (GPU_U(0xFFFF) << GLB_PRFCNT_SIZE_FIRMWARE_SIZE_SHIFT) ++#define GLB_PRFCNT_SIZE_FIRMWARE_SIZE_GET(reg_val) \ ++ (GLB_PRFCNT_SIZE_FIRMWARE_SIZE_GET_MOD(((reg_val)&GLB_PRFCNT_SIZE_FIRMWARE_SIZE_MASK) >> \ ++ GLB_PRFCNT_SIZE_FIRMWARE_SIZE_SHIFT)) ++#define GLB_PRFCNT_SIZE_FIRMWARE_SIZE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_PRFCNT_SIZE_FIRMWARE_SIZE_MASK) | \ ++ ((GLB_PRFCNT_SIZE_FIRMWARE_SIZE_SET_MOD(value) << GLB_PRFCNT_SIZE_FIRMWARE_SIZE_SHIFT) & \ ++ GLB_PRFCNT_SIZE_FIRMWARE_SIZE_MASK)) ++ ++/* GLB_DEBUG_REQ register */ ++#define GLB_DEBUG_REQ_DEBUG_RUN_SHIFT GPU_U(23) ++#define GLB_DEBUG_REQ_DEBUG_RUN_MASK (GPU_U(0x1) << GLB_DEBUG_REQ_DEBUG_RUN_SHIFT) ++#define GLB_DEBUG_REQ_DEBUG_RUN_GET(reg_val) \ ++ (((reg_val)&GLB_DEBUG_REQ_DEBUG_RUN_MASK) >> GLB_DEBUG_REQ_DEBUG_RUN_SHIFT) ++#define GLB_DEBUG_REQ_DEBUG_RUN_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_DEBUG_REQ_DEBUG_RUN_MASK) | \ ++ (((value) << GLB_DEBUG_REQ_DEBUG_RUN_SHIFT) & GLB_DEBUG_REQ_DEBUG_RUN_MASK)) ++ ++#define GLB_DEBUG_REQ_RUN_MODE_SHIFT GPU_U(24) ++#define GLB_DEBUG_REQ_RUN_MODE_MASK (GPU_U(0xFF) << GLB_DEBUG_REQ_RUN_MODE_SHIFT) ++#define GLB_DEBUG_REQ_RUN_MODE_GET(reg_val) \ ++ (((reg_val)&GLB_DEBUG_REQ_RUN_MODE_MASK) >> GLB_DEBUG_REQ_RUN_MODE_SHIFT) ++#define GLB_DEBUG_REQ_RUN_MODE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_DEBUG_REQ_RUN_MODE_MASK) | \ ++ (((value) << GLB_DEBUG_REQ_RUN_MODE_SHIFT) & GLB_DEBUG_REQ_RUN_MODE_MASK)) ++ ++/* GLB_DEBUG_ACK register */ ++#define GLB_DEBUG_ACK_DEBUG_RUN_SHIFT GPU_U(23) ++#define GLB_DEBUG_ACK_DEBUG_RUN_MASK (GPU_U(0x1) << GLB_DEBUG_ACK_DEBUG_RUN_SHIFT) ++#define GLB_DEBUG_ACK_DEBUG_RUN_GET(reg_val) \ ++ (((reg_val)&GLB_DEBUG_ACK_DEBUG_RUN_MASK) >> GLB_DEBUG_ACK_DEBUG_RUN_SHIFT) ++#define GLB_DEBUG_ACK_DEBUG_RUN_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_DEBUG_ACK_DEBUG_RUN_MASK) | \ ++ (((value) << GLB_DEBUG_ACK_DEBUG_RUN_SHIFT) & GLB_DEBUG_ACK_DEBUG_RUN_MASK)) ++ ++#define GLB_DEBUG_ACK_RUN_MODE_SHIFT GPU_U(24) ++#define GLB_DEBUG_ACK_RUN_MODE_MASK (GPU_U(0xFF) << GLB_DEBUG_ACK_RUN_MODE_SHIFT) ++#define GLB_DEBUG_ACK_RUN_MODE_GET(reg_val) \ ++ (((reg_val)&GLB_DEBUG_ACK_RUN_MODE_MASK) >> GLB_DEBUG_ACK_RUN_MODE_SHIFT) ++#define GLB_DEBUG_ACK_RUN_MODE_SET(reg_val, value) \ ++ (((reg_val) & ~GLB_DEBUG_ACK_RUN_MODE_MASK) | \ ++ (((value) << GLB_DEBUG_ACK_RUN_MODE_SHIFT) & GLB_DEBUG_ACK_RUN_MODE_MASK)) ++ ++/* RUN_MODE values */ ++#define GLB_DEBUG_RUN_MODE_TYPE_NOP 0x0 ++#define GLB_DEBUG_RUN_MODE_TYPE_CORE_DUMP 0x1 ++/* End of RUN_MODE values */ ++ ++#endif /* _KBASE_CSF_REGISTERS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c new file mode 100755 -index 000000000000..f1a318d26f43 +index 000000000..fe3b91a48 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c -@@ -0,0 +1,355 @@ +@@ -0,0 +1,637 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -168774,26 +187019,219 @@ index 000000000000..f1a318d26f43 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include +#include -+#include ++#include +#include +#include +#include +#include +#include ++#include ++#include ++#include ++ ++enum kbasep_soft_reset_status { ++ RESET_SUCCESS = 0, ++ SOFT_RESET_FAILED, ++ L2_ON_FAILED, ++ MCU_REINIT_FAILED ++}; ++ ++static inline bool ++kbase_csf_reset_state_is_silent(enum kbase_csf_reset_gpu_state state) ++{ ++ return (state == KBASE_CSF_RESET_GPU_COMMITTED_SILENT); ++} ++ ++static inline bool ++kbase_csf_reset_state_is_committed(enum kbase_csf_reset_gpu_state state) ++{ ++ return (state == KBASE_CSF_RESET_GPU_COMMITTED || ++ state == KBASE_CSF_RESET_GPU_COMMITTED_SILENT); ++} ++ ++static inline bool ++kbase_csf_reset_state_is_active(enum kbase_csf_reset_gpu_state state) ++{ ++ return (state == KBASE_CSF_RESET_GPU_HAPPENING); ++} ++ ++/** ++ * DOC: Mechanism for coherent access to the HW with respect to GPU reset ++ * ++ * Access to the HW from non-atomic context outside of the reset thread must ++ * use kbase_reset_gpu_prevent_and_wait() / kbase_reset_gpu_try_prevent(). ++ * ++ * This currently works by taking the &kbase_device's csf.reset.sem, for ++ * 'write' access by the GPU reset thread and 'read' access by every other ++ * thread. The use of this rw_semaphore means: ++ * ++ * - there will be mutual exclusion (and thus waiting) between the thread doing ++ * reset ('writer') and threads trying to access the GPU for 'normal' ++ * operations ('readers') ++ * ++ * - multiple threads may prevent reset from happening without serializing each ++ * other prematurely. Note that at present the wait for reset to finish has ++ * to be done higher up in the driver than actual GPU access, at a point ++ * where it won't cause lock ordering issues. At such a point, some paths may ++ * actually lead to no GPU access, but we would prefer to avoid serializing ++ * at that level ++ * ++ * - lockdep (if enabled in the kernel) will check such uses for deadlock ++ * ++ * If instead &kbase_device's csf.reset.wait &wait_queue_head_t were used on ++ * its own, we'd also need to add a &lockdep_map and appropriate lockdep calls ++ * to make use of lockdep checking in all places where the &wait_queue_head_t ++ * is waited upon or signaled. ++ * ++ * Indeed places where we wait on &kbase_device's csf.reset.wait (such as ++ * kbase_reset_gpu_wait()) are the only places where we need extra call(s) to ++ * lockdep, and they are made on the existing rw_semaphore. ++ * ++ * For non-atomic access, the &kbase_device's csf.reset.state member should be ++ * checked instead, such as by using kbase_reset_gpu_is_active(). ++ * ++ * Ideally the &rw_semaphore should be replaced in future with a single mutex ++ * that protects any access to the GPU, via reset or otherwise. ++ */ ++ ++int kbase_reset_gpu_prevent_and_wait(struct kbase_device *kbdev) ++{ ++ down_read(&kbdev->csf.reset.sem); ++ ++ if (atomic_read(&kbdev->csf.reset.state) == ++ KBASE_CSF_RESET_GPU_FAILED) { ++ up_read(&kbdev->csf.reset.sem); ++ return -ENOMEM; ++ } ++ ++ if (WARN_ON(kbase_reset_gpu_is_active(kbdev))) { ++ up_read(&kbdev->csf.reset.sem); ++ return -EFAULT; ++ } ++ ++ return 0; ++} ++KBASE_EXPORT_TEST_API(kbase_reset_gpu_prevent_and_wait); ++ ++int kbase_reset_gpu_try_prevent(struct kbase_device *kbdev) ++{ ++ if (!down_read_trylock(&kbdev->csf.reset.sem)) ++ return -EAGAIN; ++ ++ if (atomic_read(&kbdev->csf.reset.state) == ++ KBASE_CSF_RESET_GPU_FAILED) { ++ up_read(&kbdev->csf.reset.sem); ++ return -ENOMEM; ++ } ++ ++ if (WARN_ON(kbase_reset_gpu_is_active(kbdev))) { ++ up_read(&kbdev->csf.reset.sem); ++ return -EFAULT; ++ } ++ ++ return 0; ++} ++ ++void kbase_reset_gpu_allow(struct kbase_device *kbdev) ++{ ++ up_read(&kbdev->csf.reset.sem); ++} ++KBASE_EXPORT_TEST_API(kbase_reset_gpu_allow); ++ ++void kbase_reset_gpu_assert_prevented(struct kbase_device *kbdev) ++{ ++#if KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE ++ lockdep_assert_held_read(&kbdev->csf.reset.sem); ++#else ++ lockdep_assert_held(&kbdev->csf.reset.sem); ++#endif ++ WARN_ON(kbase_reset_gpu_is_active(kbdev)); ++} ++ ++void kbase_reset_gpu_assert_failed_or_prevented(struct kbase_device *kbdev) ++{ ++ if (atomic_read(&kbdev->csf.reset.state) == KBASE_CSF_RESET_GPU_FAILED) ++ return; ++ ++#if KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE ++ lockdep_assert_held_read(&kbdev->csf.reset.sem); ++#else ++ lockdep_assert_held(&kbdev->csf.reset.sem); ++#endif ++ WARN_ON(kbase_reset_gpu_is_active(kbdev)); ++} ++ ++/* Mark the reset as now happening, and synchronize with other threads that ++ * might be trying to access the GPU ++ */ ++static void kbase_csf_reset_begin_hw_access_sync( ++ struct kbase_device *kbdev, ++ enum kbase_csf_reset_gpu_state initial_reset_state) ++{ ++ unsigned long hwaccess_lock_flags; ++ unsigned long scheduler_spin_lock_flags; ++ ++ /* Note this is a WARN/atomic_set because it is a software issue for a ++ * race to be occurring here ++ */ ++ WARN_ON(!kbase_csf_reset_state_is_committed(initial_reset_state)); ++ ++ down_write(&kbdev->csf.reset.sem); ++ ++ /* Threads in atomic context accessing the HW will hold one of these ++ * locks, so synchronize with them too. ++ */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, hwaccess_lock_flags); ++ kbase_csf_scheduler_spin_lock(kbdev, &scheduler_spin_lock_flags); ++ atomic_set(&kbdev->csf.reset.state, KBASE_RESET_GPU_HAPPENING); ++ kbase_csf_scheduler_spin_unlock(kbdev, scheduler_spin_lock_flags); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, hwaccess_lock_flags); ++} + -+/* Waiting timeout for GPU reset to complete */ -+#define GPU_RESET_TIMEOUT_MS (5000) /* 5 seconds */ -+#define DUMP_DWORDS_PER_LINE (4) -+/* 16 characters needed for a 8 byte value in hex & 1 character for space */ -+#define DUMP_HEX_CHARS_PER_DWORD ((2 * 8) + 1) -+#define DUMP_HEX_CHARS_PER_LINE \ -+ (DUMP_DWORDS_PER_LINE * DUMP_HEX_CHARS_PER_DWORD) ++/* Mark the reset as finished and allow others threads to once more access the ++ * GPU ++ */ ++static void kbase_csf_reset_end_hw_access(struct kbase_device *kbdev, ++ int err_during_reset, ++ bool firmware_inited) ++{ ++ unsigned long hwaccess_lock_flags; ++ unsigned long scheduler_spin_lock_flags; ++ ++ WARN_ON(!kbase_csf_reset_state_is_active( ++ atomic_read(&kbdev->csf.reset.state))); ++ ++ /* Once again, we synchronize with atomic context threads accessing the ++ * HW, as otherwise any actions they defer could get lost ++ */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, hwaccess_lock_flags); ++ kbase_csf_scheduler_spin_lock(kbdev, &scheduler_spin_lock_flags); ++ ++ if (!err_during_reset) { ++ atomic_set(&kbdev->csf.reset.state, ++ KBASE_CSF_RESET_GPU_NOT_PENDING); ++ } else { ++ dev_err(kbdev->dev, "Reset failed to complete"); ++ atomic_set(&kbdev->csf.reset.state, KBASE_CSF_RESET_GPU_FAILED); ++ } ++ ++ kbase_csf_scheduler_spin_unlock(kbdev, scheduler_spin_lock_flags); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, hwaccess_lock_flags); ++ ++ /* Invoke the scheduling tick after formally finishing the reset, ++ * otherwise the tick might start too soon and notice that reset ++ * is still in progress. ++ */ ++ up_write(&kbdev->csf.reset.sem); ++ wake_up(&kbdev->csf.reset.wait); ++ ++ if (!err_during_reset && likely(firmware_inited)) ++ kbase_csf_scheduler_enable_tick_timer(kbdev); ++} + +static void kbase_csf_debug_dump_registers(struct kbase_device *kbdev) +{ @@ -168821,85 +187259,44 @@ index 000000000000..f1a318d26f43 + kbase_reg_read(kbdev, GPU_CONTROL_REG(TILER_CONFIG))); +} + -+static void kbase_csf_dump_firmware_trace_buffer(struct kbase_device *kbdev) ++/** ++ * kbase_csf_hwcnt_on_reset_error() - Sets HWCNT to appropriate state in the ++ * event of an error during GPU reset. ++ * @kbdev: Pointer to KBase device ++ */ ++static void kbase_csf_hwcnt_on_reset_error(struct kbase_device *kbdev) +{ -+ u8 *buf, *line_str; -+ unsigned int read_size; -+ struct firmware_trace_buffer *tb = -+ kbase_csf_firmware_get_trace_buffer(kbdev, FW_TRACE_BUF_NAME); -+ -+ if (tb == NULL) { -+ dev_dbg(kbdev->dev, "Can't get the trace buffer, firmware trace dump skipped"); -+ return; -+ } -+ -+ buf = kmalloc(PAGE_SIZE + DUMP_HEX_CHARS_PER_LINE + 1, GFP_KERNEL); -+ if (buf == NULL) { -+ dev_err(kbdev->dev, "Short of memory, firmware trace dump skipped"); -+ return; -+ } -+ line_str = &buf[PAGE_SIZE]; -+ -+ dev_err(kbdev->dev, "Firmware trace buffer dump:"); -+ while ((read_size = kbase_csf_firmware_trace_buffer_read_data(tb, buf, -+ PAGE_SIZE))) { -+ u64 *ptr = (u64 *)buf; -+ u32 num_dwords; -+ -+ for (num_dwords = read_size / sizeof(u64); -+ num_dwords >= DUMP_DWORDS_PER_LINE; -+ num_dwords -= DUMP_DWORDS_PER_LINE) { -+ dev_err(kbdev->dev, "%016llx %016llx %016llx %016llx", -+ ptr[0], ptr[1], ptr[2], ptr[3]); -+ ptr += DUMP_DWORDS_PER_LINE; -+ } -+ -+ if (num_dwords) { -+ int pos = 0; -+ -+ while (num_dwords--) { -+ pos += snprintf(line_str + pos, -+ DUMP_HEX_CHARS_PER_DWORD + 1, -+ "%016llx ", ptr[0]); -+ ptr++; -+ } ++ unsigned long flags; + -+ dev_err(kbdev->dev, "%s", line_str); -+ } -+ } ++ /* Treat this as an unrecoverable error for HWCNT */ ++ kbase_hwcnt_backend_csf_on_unrecoverable_error(&kbdev->hwcnt_gpu_iface); + -+ kfree(buf); ++ /* Re-enable counters to ensure matching enable/disable pair. ++ * This might reduce the hwcnt disable count to 0, and therefore ++ * trigger actual re-enabling of hwcnt. ++ * However, as the backend is now in the unrecoverable error state, ++ * re-enabling will immediately fail and put the context into the error ++ * state, preventing the hardware from being touched (which could have ++ * risked a hang). ++ */ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ kbase_hwcnt_context_enable(kbdev->hwcnt_gpu_ctx); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); +} + -+static int kbase_csf_reset_gpu_now(struct kbase_device *kbdev, -+ bool firmware_inited) ++static enum kbasep_soft_reset_status kbase_csf_reset_gpu_once(struct kbase_device *kbdev, ++ bool firmware_inited, bool silent) +{ + unsigned long flags; -+ bool silent = false; + int err; -+ -+ if (atomic_read(&kbdev->csf.reset.state) == KBASE_CSF_RESET_GPU_SILENT) -+ silent = true; -+ -+ WARN_ON(kbdev->irq_reset_flush); -+ -+ /* Reset the scheduler state before disabling the interrupts as suspend of active -+ * CSG slots would also be done as a part of reset. -+ */ -+ if (likely(firmware_inited)) -+ kbase_csf_scheduler_reset(kbdev); -+ cancel_work_sync(&kbdev->csf.firmware_reload_work); -+ -+ /* Disable GPU hardware counters. -+ * This call will block until counters are disabled. -+ */ -+ kbase_hwcnt_context_disable(kbdev->hwcnt_gpu_ctx); ++ enum kbasep_soft_reset_status ret = RESET_SUCCESS; + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + spin_lock(&kbdev->mmu_mask_change); + kbase_pm_reset_start_locked(kbdev); + -+ /* We're about to flush out the IRQs and their bottom halves */ ++ dev_dbg(kbdev->dev, ++ "We're about to flush out the IRQs and their bottom halves\n"); + kbdev->irq_reset_flush = true; + + /* Disable IRQ to avoid IRQ handlers to kick in after releasing the @@ -168910,18 +187307,17 @@ index 000000000000..f1a318d26f43 + spin_unlock(&kbdev->mmu_mask_change); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ /* Ensure that any IRQ handlers have finished -+ * Must be done without any locks IRQ handlers will take. -+ */ ++ dev_dbg(kbdev->dev, "Ensure that any IRQ handlers have finished\n"); ++ /* Must be done without any locks IRQ handlers will take. */ + kbase_synchronize_irqs(kbdev); + -+ /* Flush out any in-flight work items */ ++ dev_dbg(kbdev->dev, "Flush out any in-flight work items\n"); + kbase_flush_mmu_wqs(kbdev); + -+ /* The flush has completed so reset the active indicator */ ++ dev_dbg(kbdev->dev, ++ "The flush has completed so reset the active indicator\n"); + kbdev->irq_reset_flush = false; + -+ mutex_lock(&kbdev->pm.lock); + if (!silent) + dev_err(kbdev->dev, "Resetting GPU (allowing up to %d ms)", + RESET_TIMEOUT); @@ -168932,20 +187328,33 @@ index 000000000000..f1a318d26f43 + if (!silent) { + kbase_csf_debug_dump_registers(kbdev); + if (likely(firmware_inited)) -+ kbase_csf_dump_firmware_trace_buffer(kbdev); ++ kbase_csf_firmware_log_dump_buffer(kbdev); + } + ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_ipa_control_handle_gpu_reset_pre(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ /* Tell hardware counters a reset is about to occur. ++ * If the backend is in an unrecoverable error state (e.g. due to ++ * firmware being unresponsive) this will transition the backend out of ++ * it, on the assumption a reset will fix whatever problem there was. ++ */ ++ kbase_hwcnt_backend_csf_on_before_reset(&kbdev->hwcnt_gpu_iface); ++ ++ mutex_lock(&kbdev->pm.lock); + /* Reset the GPU */ + err = kbase_pm_init_hw(kbdev, 0); + + mutex_unlock(&kbdev->pm.lock); + + if (WARN_ON(err)) -+ return err; ++ return SOFT_RESET_FAILED; + + mutex_lock(&kbdev->mmu_hw_mutex); + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + kbase_ctx_sched_restore_all_as(kbdev); ++ kbase_ipa_control_handle_gpu_reset_post(kbdev); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + mutex_unlock(&kbdev->mmu_hw_mutex); + @@ -168957,84 +187366,173 @@ index 000000000000..f1a318d26f43 + err = kbase_pm_wait_for_desired_state(kbdev); + mutex_unlock(&kbdev->pm.lock); + -+ if (err) -+ return err; ++ if (err) { ++ if (!kbase_pm_l2_is_in_desired_state(kbdev)) ++ ret = L2_ON_FAILED; ++ else if (!kbase_pm_mcu_is_in_desired_state(kbdev)) ++ ret = MCU_REINIT_FAILED; ++ } ++ ++ return ret; ++} ++ ++static int kbase_csf_reset_gpu_now(struct kbase_device *kbdev, bool firmware_inited, bool silent) ++{ ++ unsigned long flags; ++ enum kbasep_soft_reset_status ret; ++ ++ WARN_ON(kbdev->irq_reset_flush); ++ /* The reset must now be happening otherwise other threads will not ++ * have been synchronized with to stop their access to the HW ++ */ ++#if KERNEL_VERSION(5, 3, 0) <= LINUX_VERSION_CODE ++ lockdep_assert_held_write(&kbdev->csf.reset.sem); ++#elif KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE ++ lockdep_assert_held_exclusive(&kbdev->csf.reset.sem); ++#else ++ lockdep_assert_held(&kbdev->csf.reset.sem); ++#endif ++ WARN_ON(!kbase_reset_gpu_is_active(kbdev)); ++ ++ /* Reset the scheduler state before disabling the interrupts as suspend ++ * of active CSG slots would also be done as a part of reset. ++ */ ++ if (likely(firmware_inited)) ++ kbase_csf_scheduler_reset(kbdev); ++ cancel_work_sync(&kbdev->csf.firmware_reload_work); ++ ++ dev_dbg(kbdev->dev, "Disable GPU hardware counters.\n"); ++ /* This call will block until counters are disabled. */ ++ kbase_hwcnt_context_disable(kbdev->hwcnt_gpu_ctx); ++ ++ ret = kbase_csf_reset_gpu_once(kbdev, firmware_inited, silent); ++ if (ret == SOFT_RESET_FAILED) { ++ dev_err(kbdev->dev, "Soft-reset failed"); ++ goto err; ++ } else if (ret == L2_ON_FAILED) { ++ dev_err(kbdev->dev, "L2 power up failed after the soft-reset"); ++ goto err; ++ } else if (ret == MCU_REINIT_FAILED) { ++ dev_err(kbdev->dev, "MCU re-init failed trying full firmware reload"); ++ /* Since MCU reinit failed despite successful soft reset, we can try ++ * the firmware full reload. ++ */ ++ kbdev->csf.firmware_full_reload_needed = true; ++ ret = kbase_csf_reset_gpu_once(kbdev, firmware_inited, true); ++ if (ret != RESET_SUCCESS) { ++ dev_err(kbdev->dev, ++ "MCU Re-init failed even after trying full firmware reload, ret = [%d]", ++ ret); ++ goto err; ++ } ++ } + + /* Re-enable GPU hardware counters */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); + kbase_hwcnt_context_enable(kbdev->hwcnt_gpu_ctx); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); + if (!silent) + dev_err(kbdev->dev, "Reset complete"); -+ + return 0; ++err: ++ ++ kbase_csf_hwcnt_on_reset_error(kbdev); ++ return -1; +} + +static void kbase_csf_reset_gpu_worker(struct work_struct *data) +{ + struct kbase_device *kbdev = container_of(data, struct kbase_device, + csf.reset.work); ++ bool gpu_sleep_mode_active = false; + bool firmware_inited; + unsigned long flags; + int err = 0; ++ const enum kbase_csf_reset_gpu_state initial_reset_state = ++ atomic_read(&kbdev->csf.reset.state); ++ const bool silent = ++ kbase_csf_reset_state_is_silent(initial_reset_state); ++ ++ /* Ensure any threads (e.g. executing the CSF scheduler) have finished ++ * using the HW ++ */ ++ kbase_csf_reset_begin_hw_access_sync(kbdev, initial_reset_state); + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + firmware_inited = kbdev->csf.firmware_inited; ++#ifdef KBASE_PM_RUNTIME ++ gpu_sleep_mode_active = kbdev->pm.backend.gpu_sleep_mode_active; ++#endif + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ if (!kbase_pm_context_active_handle_suspend(kbdev, ++ if (unlikely(gpu_sleep_mode_active)) { ++#ifdef KBASE_PM_RUNTIME ++ /* As prior to GPU reset all on-slot groups are suspended, ++ * need to wake up the MCU from sleep. ++ * No pm active reference is taken here since GPU is in sleep ++ * state and both runtime & system suspend synchronize with the ++ * GPU reset before they wake up the GPU to suspend on-slot ++ * groups. GPUCORE-29850 would add the proper handling. ++ */ ++ kbase_pm_lock(kbdev); ++ if (kbase_pm_force_mcu_wakeup_after_sleep(kbdev)) ++ dev_warn(kbdev->dev, "Wait for MCU wake up failed on GPU reset"); ++ kbase_pm_unlock(kbdev); ++ ++ err = kbase_csf_reset_gpu_now(kbdev, firmware_inited, silent); ++#endif ++ } else if (!kbase_pm_context_active_handle_suspend(kbdev, + KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE)) { -+ err = kbase_csf_reset_gpu_now(kbdev, firmware_inited); ++ err = kbase_csf_reset_gpu_now(kbdev, firmware_inited, silent); + kbase_pm_context_idle(kbdev); + } + + kbase_disjoint_state_down(kbdev); + -+ if (!err) { -+ atomic_set(&kbdev->csf.reset.state, -+ KBASE_CSF_RESET_GPU_NOT_PENDING); -+ if (likely(firmware_inited)) -+ kbase_csf_scheduler_enable_tick_timer(kbdev); -+ } else { -+ dev_err(kbdev->dev, "Reset failed to complete"); -+ atomic_set(&kbdev->csf.reset.state, -+ KBASE_CSF_RESET_GPU_FAILED); -+ } -+ -+ wake_up(&kbdev->csf.reset.wait); ++ /* Allow other threads to once again use the GPU */ ++ kbase_csf_reset_end_hw_access(kbdev, err, firmware_inited); +} + -+bool kbase_prepare_to_reset_gpu(struct kbase_device *kbdev) ++bool kbase_prepare_to_reset_gpu(struct kbase_device *kbdev, unsigned int flags) +{ ++ if (flags & RESET_FLAGS_HWC_UNRECOVERABLE_ERROR) ++ kbase_hwcnt_backend_csf_on_unrecoverable_error( ++ &kbdev->hwcnt_gpu_iface); ++ + if (atomic_cmpxchg(&kbdev->csf.reset.state, + KBASE_CSF_RESET_GPU_NOT_PENDING, -+ KBASE_CSF_RESET_GPU_HAPPENING) != -+ KBASE_CSF_RESET_GPU_NOT_PENDING) { ++ KBASE_CSF_RESET_GPU_PREPARED) != ++ KBASE_CSF_RESET_GPU_NOT_PENDING) + /* Some other thread is already resetting the GPU */ + return false; -+ } + + return true; +} +KBASE_EXPORT_TEST_API(kbase_prepare_to_reset_gpu); + -+bool kbase_prepare_to_reset_gpu_locked(struct kbase_device *kbdev) ++bool kbase_prepare_to_reset_gpu_locked(struct kbase_device *kbdev, ++ unsigned int flags) +{ + lockdep_assert_held(&kbdev->hwaccess_lock); + -+ return kbase_prepare_to_reset_gpu(kbdev); ++ return kbase_prepare_to_reset_gpu(kbdev, flags); +} + -+int kbase_reset_gpu(struct kbase_device *kbdev) ++void kbase_reset_gpu(struct kbase_device *kbdev) +{ ++ /* Note this is a WARN/atomic_set because it is a software issue for ++ * a race to be occurring here ++ */ ++ if (WARN_ON(atomic_read(&kbdev->csf.reset.state) != ++ KBASE_RESET_GPU_PREPARED)) ++ return; ++ ++ atomic_set(&kbdev->csf.reset.state, KBASE_CSF_RESET_GPU_COMMITTED); + dev_err(kbdev->dev, "Preparing to soft-reset GPU\n"); + + kbase_disjoint_state_up(kbdev); + + queue_work(kbdev->csf.reset.workq, &kbdev->csf.reset.work); -+ -+ return 0; +} +KBASE_EXPORT_TEST_API(kbase_reset_gpu); + @@ -169049,7 +187547,7 @@ index 000000000000..f1a318d26f43 +{ + if (atomic_cmpxchg(&kbdev->csf.reset.state, + KBASE_CSF_RESET_GPU_NOT_PENDING, -+ KBASE_CSF_RESET_GPU_SILENT) != ++ KBASE_CSF_RESET_GPU_COMMITTED_SILENT) != + KBASE_CSF_RESET_GPU_NOT_PENDING) { + /* Some other thread is already resetting the GPU */ + return -EAGAIN; @@ -169061,29 +187559,56 @@ index 000000000000..f1a318d26f43 + + return 0; +} ++KBASE_EXPORT_TEST_API(kbase_reset_gpu_silent); + +bool kbase_reset_gpu_is_active(struct kbase_device *kbdev) +{ -+ if (atomic_read(&kbdev->csf.reset.state) == -+ KBASE_CSF_RESET_GPU_NOT_PENDING) -+ return false; ++ enum kbase_csf_reset_gpu_state reset_state = ++ atomic_read(&kbdev->csf.reset.state); + -+ return true; ++ /* For CSF, the reset is considered active only when the reset worker ++ * is actually executing and other threads would have to wait for it to ++ * complete ++ */ ++ return kbase_csf_reset_state_is_active(reset_state); ++} ++ ++bool kbase_reset_gpu_is_not_pending(struct kbase_device *kbdev) ++{ ++ return atomic_read(&kbdev->csf.reset.state) == KBASE_CSF_RESET_GPU_NOT_PENDING; +} + +int kbase_reset_gpu_wait(struct kbase_device *kbdev) +{ + const long wait_timeout = -+ kbase_csf_timeout_in_jiffies(GPU_RESET_TIMEOUT_MS); -+ long remaining = wait_event_timeout(kbdev->csf.reset.wait, -+ (atomic_read(&kbdev->csf.reset.state) == -+ KBASE_CSF_RESET_GPU_NOT_PENDING) || -+ (atomic_read(&kbdev->csf.reset.state) == -+ KBASE_CSF_RESET_GPU_FAILED), -+ wait_timeout); ++ kbase_csf_timeout_in_jiffies(kbase_get_timeout_ms(kbdev, CSF_GPU_RESET_TIMEOUT)); ++ long remaining; ++ ++ /* Inform lockdep we might be trying to wait on a reset (as ++ * would've been done with down_read() - which has no 'timeout' ++ * variant), then use wait_event_timeout() to implement the timed ++ * wait. ++ * ++ * in CONFIG_PROVE_LOCKING builds, this should catch potential 'time ++ * bound' deadlocks such as: ++ * - incorrect lock order with respect to others locks ++ * - current thread has prevented reset ++ * - current thread is executing the reset worker ++ */ ++ might_lock_read(&kbdev->csf.reset.sem); ++ ++ remaining = wait_event_timeout( ++ kbdev->csf.reset.wait, ++ (atomic_read(&kbdev->csf.reset.state) == ++ KBASE_CSF_RESET_GPU_NOT_PENDING) || ++ (atomic_read(&kbdev->csf.reset.state) == ++ KBASE_CSF_RESET_GPU_FAILED), ++ wait_timeout); + + if (!remaining) { + dev_warn(kbdev->dev, "Timed out waiting for the GPU reset to complete"); ++ ++ + return -ETIMEDOUT; + } else if (atomic_read(&kbdev->csf.reset.state) == + KBASE_CSF_RESET_GPU_FAILED) { @@ -169103,6 +187628,7 @@ index 000000000000..f1a318d26f43 + INIT_WORK(&kbdev->csf.reset.work, kbase_csf_reset_gpu_worker); + + init_waitqueue_head(&kbdev->csf.reset.wait); ++ init_rwsem(&kbdev->csf.reset.sem); + + return 0; +} @@ -169113,18 +187639,19 @@ index 000000000000..f1a318d26f43 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c new file mode 100755 -index 000000000000..a3017a7f25ba +index 000000000..edaa6d17e --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c -@@ -0,0 +1,4135 @@ +@@ -0,0 +1,6889 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -169135,8 +187662,6 @@ index 000000000000..a3017a7f25ba + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -169144,24 +187669,24 @@ index 000000000000..a3017a7f25ba +#include +#include +#include -+#include +#include "mali_kbase_csf.h" -+#include "../tl/mali_kbase_tracepoints.h" -+#include "backend/gpu/mali_kbase_pm_internal.h" ++#include ++#include +#include -+#include "mali_gpu_csf_registers.h" -+#include ++#include ++#include ++#include ++#include "mali_kbase_csf_tiler_heap_reclaim.h" ++#include "mali_kbase_csf_mcu_shared_reg.h" + +/* Value to indicate that a queue group is not groups_to_schedule list */ +#define KBASEP_GROUP_PREPARED_SEQ_NUM_INVALID (U32_MAX) + -+/* Waiting timeout for status change acknowledgment, in milliseconds */ -+#define CSF_STATE_WAIT_TIMEOUT_MS (800) /* Relaxed to 800ms from 100ms */ -+ -+/* Waiting timeout for scheduler state change for descheduling a CSG */ -+#define CSG_SCHED_STOP_TIMEOUT_MS (50) -+ -+#define CSG_SUSPEND_ON_RESET_WAIT_TIMEOUT_MS DEFAULT_RESET_TIMEOUT_MS ++/* This decides the upper limit on the waiting time for the Scheduler ++ * to exit the sleep state. Usually the value of autosuspend_delay is ++ * expected to be around 100 milli seconds. ++ */ ++#define MAX_AUTO_SUSPEND_DELAY_MS (5000) + +/* Maximum number of endpoints which may run tiler jobs. */ +#define CSG_TILER_MAX ((u8)1) @@ -169171,41 +187696,15 @@ index 000000000000..a3017a7f25ba + +/* CSF scheduler time slice value */ +#define CSF_SCHEDULER_TIME_TICK_MS (100) /* 100 milliseconds */ -+#define CSF_SCHEDULER_TIME_TICK_JIFFIES \ -+ msecs_to_jiffies(CSF_SCHEDULER_TIME_TICK_MS) -+ -+/* -+ * CSF scheduler time threshold for converting "tock" requests into "tick" if -+ * they come too close to the end of a tick interval. This avoids scheduling -+ * twice in a row. -+ */ -+#define CSF_SCHEDULER_TIME_TICK_THRESHOLD_MS \ -+ CSF_SCHEDULER_TIME_TICK_MS -+ -+#define CSF_SCHEDULER_TIME_TICK_THRESHOLD_JIFFIES \ -+ msecs_to_jiffies(CSF_SCHEDULER_TIME_TICK_THRESHOLD_MS) + -+/* Nanoseconds per millisecond */ -+#define NS_PER_MS ((u64)1000 * 1000) ++/* A GPU address space slot is reserved for MCU. */ ++#define NUM_RESERVED_AS_SLOTS (1) + -+/* -+ * CSF minimum time to reschedule for a new "tock" request. Bursts of "tock" -+ * requests are not serviced immediately, but shall wait for a minimum time in -+ * order to reduce load on the CSF scheduler thread. -+ */ -+#define CSF_SCHEDULER_TIME_TOCK_JIFFIES 1 /* 1 jiffies-time */ -+ -+/* Command stream suspended and is idle (empty ring buffer) */ -+#define CS_IDLE_FLAG (1 << 0) -+ -+/* Command stream suspended and is wait for a CQS condition */ -+#define CS_WAIT_SYNC_FLAG (1 << 1) ++/* Time to wait for completion of PING req before considering MCU as hung */ ++#define FW_PING_AFTER_ERROR_TIMEOUT_MS (10) + -+/* This is to avoid the immediate power down of GPU when then are no groups -+ * left for scheduling. GPUCORE-24250 would add the proper GPU idle detection -+ * logic. -+ */ -+#define GPU_IDLE_POWEROFF_HYSTERESIS_DELAY msecs_to_jiffies((u32)10) ++/* Explicitly defining this blocked_reason code as SB_WAIT for clarity */ ++#define CS_STATUS_BLOCKED_ON_SB_WAIT CS_STATUS_BLOCKED_REASON_REASON_WAIT + +static int scheduler_group_schedule(struct kbase_queue_group *group); +static void remove_group_from_idle_wait(struct kbase_queue_group *const group); @@ -169221,57 +187720,359 @@ index 000000000000..a3017a7f25ba +static void scheduler_enable_tick_timer_nolock(struct kbase_device *kbdev); +static int suspend_active_queue_groups(struct kbase_device *kbdev, + unsigned long *slot_mask); ++static int suspend_active_groups_on_powerdown(struct kbase_device *kbdev, ++ bool system_suspend); ++static void schedule_in_cycle(struct kbase_queue_group *group, bool force); ++static bool queue_group_scheduled_locked(struct kbase_queue_group *group); + +#define kctx_as_enabled(kctx) (!kbase_ctx_flag(kctx, KCTX_AS_DISABLED_ON_FAULT)) + -+static void release_doorbell(struct kbase_device *kbdev, int doorbell_nr) ++/** ++ * wait_for_dump_complete_on_group_deschedule() - Wait for dump on fault and ++ * scheduling tick/tock to complete before the group deschedule. ++ * ++ * @group: Pointer to the group that is being descheduled. ++ * ++ * This function blocks the descheduling of the group until the dump on fault is ++ * completed and scheduling tick/tock has completed. ++ * To deschedule an on slot group CSG termination request would be sent and that ++ * might time out if the fault had occurred and also potentially affect the state ++ * being dumped. Moreover the scheduler lock would be held, so the access to debugfs ++ * files would get blocked. ++ * Scheduler lock and 'kctx->csf.lock' are released before this function starts ++ * to wait. When a request sent by the Scheduler to the FW times out, Scheduler ++ * would also wait for the dumping to complete and release the Scheduler lock ++ * before the wait. Meanwhile Userspace can try to delete the group, this function ++ * would ensure that the group doesn't exit the Scheduler until scheduling ++ * tick/tock has completed. Though very unlikely, group deschedule can be triggered ++ * from multiple threads around the same time and after the wait Userspace thread ++ * can win the race and get the group descheduled and free the memory for group ++ * pointer before the other threads wake up and notice that group has already been ++ * descheduled. To avoid the freeing in such a case, a sort of refcount is used ++ * for the group which is incremented & decremented across the wait. ++ */ ++static ++void wait_for_dump_complete_on_group_deschedule(struct kbase_queue_group *group) +{ -+ WARN_ON(doorbell_nr >= CSF_NUM_DOORBELL); ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ struct kbase_device *kbdev = group->kctx->kbdev; ++ struct kbase_context *kctx = group->kctx; ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; + -+ lockdep_assert_held(&kbdev->csf.scheduler.lock); -+ clear_bit(doorbell_nr, kbdev->csf.scheduler.doorbell_inuse_bitmap); -+} ++ lockdep_assert_held(&kctx->csf.lock); ++ lockdep_assert_held(&scheduler->lock); + -+static int acquire_doorbell(struct kbase_device *kbdev) -+{ -+ int doorbell_nr; ++ if (likely(!kbase_debug_csf_fault_dump_enabled(kbdev))) ++ return; + -+ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ while ((!kbase_debug_csf_fault_dump_complete(kbdev) || ++ (scheduler->state == SCHED_BUSY)) && ++ queue_group_scheduled_locked(group)) { ++ group->deschedule_deferred_cnt++; ++ mutex_unlock(&scheduler->lock); ++ mutex_unlock(&kctx->csf.lock); ++ kbase_debug_csf_fault_wait_completion(kbdev); ++ mutex_lock(&kctx->csf.lock); ++ mutex_lock(&scheduler->lock); ++ group->deschedule_deferred_cnt--; ++ } ++#endif ++} + -+ doorbell_nr = find_first_zero_bit( -+ kbdev->csf.scheduler.doorbell_inuse_bitmap, -+ CSF_NUM_DOORBELL); ++/** ++ * schedule_actions_trigger_df() - Notify the client about the fault and ++ * wait for the dumping to complete. ++ * ++ * @kbdev: Pointer to the device ++ * @kctx: Pointer to the context associated with the CSG slot for which ++ * the timeout was seen. ++ * @error: Error code indicating the type of timeout that occurred. ++ * ++ * This function notifies the Userspace client waiting for the faults and wait ++ * for the Client to complete the dumping. ++ * The function is called only from Scheduling tick/tock when a request sent by ++ * the Scheduler to FW times out or from the protm event work item of the group ++ * when the protected mode entry request times out. ++ * In the latter case there is no wait done as scheduler lock would be released ++ * immediately. In the former case the function waits and releases the scheduler ++ * lock before the wait. It has been ensured that the Scheduler view of the groups ++ * won't change meanwhile, so no group can enter/exit the Scheduler, become ++ * runnable or go off slot. ++ */ ++static void schedule_actions_trigger_df(struct kbase_device *kbdev, ++ struct kbase_context *kctx, enum dumpfault_error_type error) ++{ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; + -+ if (doorbell_nr >= CSF_NUM_DOORBELL) -+ return KBASEP_USER_DB_NR_INVALID; ++ lockdep_assert_held(&scheduler->lock); + -+ set_bit(doorbell_nr, kbdev->csf.scheduler.doorbell_inuse_bitmap); ++ if (!kbase_debug_csf_fault_notify(kbdev, kctx, error)) ++ return; + -+ return doorbell_nr; ++ if (unlikely(scheduler->state != SCHED_BUSY)) { ++ WARN_ON(error != DF_PROTECTED_MODE_ENTRY_FAILURE); ++ return; ++ } ++ ++ mutex_unlock(&scheduler->lock); ++ kbase_debug_csf_fault_wait_completion(kbdev); ++ mutex_lock(&scheduler->lock); ++ WARN_ON(scheduler->state != SCHED_BUSY); ++#endif +} + -+static void unassign_user_doorbell_from_group(struct kbase_device *kbdev, -+ struct kbase_queue_group *group) ++#ifdef KBASE_PM_RUNTIME ++/** ++ * wait_for_scheduler_to_exit_sleep() - Wait for Scheduler to exit the ++ * sleeping state. ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function waits until the Scheduler has exited the sleep state and ++ * it is called when an on-slot group is terminated or when the suspend ++ * buffer of an on-slot group needs to be captured. ++ * ++ * Return: 0 when the wait is successful, otherwise an error code. ++ */ ++static int wait_for_scheduler_to_exit_sleep(struct kbase_device *kbdev) +{ -+ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ int autosuspend_delay = kbdev->dev->power.autosuspend_delay; ++ unsigned int sleep_exit_wait_time; ++ long remaining; ++ int ret = 0; + -+ if (group->doorbell_nr != KBASEP_USER_DB_NR_INVALID) { -+ release_doorbell(kbdev, group->doorbell_nr); -+ group->doorbell_nr = KBASEP_USER_DB_NR_INVALID; -+ } -+} ++ lockdep_assert_held(&scheduler->lock); ++ WARN_ON(scheduler->state != SCHED_SLEEPING); + -+static void unassign_user_doorbell_from_queue(struct kbase_device *kbdev, -+ struct kbase_queue *queue) -+{ -+ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ /* No point in waiting if autosuspend_delay value is negative. ++ * For the negative value of autosuspend_delay Driver will directly ++ * go for the suspend of Scheduler, but the autosuspend_delay value ++ * could have been changed after the sleep was initiated. ++ */ ++ if (autosuspend_delay < 0) ++ return -EINVAL; + -+ mutex_lock(&kbdev->csf.reg_lock); ++ if (autosuspend_delay > MAX_AUTO_SUSPEND_DELAY_MS) ++ autosuspend_delay = MAX_AUTO_SUSPEND_DELAY_MS; + -+ if (queue->doorbell_nr != KBASEP_USER_DB_NR_INVALID) { -+ queue->doorbell_nr = KBASEP_USER_DB_NR_INVALID; -+ /* After this the dummy page would be mapped in */ -+ unmap_mapping_range(kbdev->csf.db_filp->f_inode->i_mapping, ++ /* Usually Scheduler would remain in sleeping state until the ++ * auto-suspend timer expires and all active CSGs are suspended. ++ */ ++ sleep_exit_wait_time = autosuspend_delay + kbdev->reset_timeout_ms; ++ ++ remaining = kbase_csf_timeout_in_jiffies(sleep_exit_wait_time); ++ ++ while ((scheduler->state == SCHED_SLEEPING) && !ret) { ++ mutex_unlock(&scheduler->lock); ++ remaining = wait_event_timeout( ++ kbdev->csf.event_wait, ++ (scheduler->state != SCHED_SLEEPING), ++ remaining); ++ mutex_lock(&scheduler->lock); ++ if (!remaining && (scheduler->state == SCHED_SLEEPING)) ++ ret = -ETIMEDOUT; ++ } ++ ++ return ret; ++} ++ ++/** ++ * force_scheduler_to_exit_sleep() - Force scheduler to exit sleep state ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function will force the Scheduler to exit the sleep state by doing the ++ * wake up of MCU and suspension of on-slot groups. It is called at the time of ++ * system suspend. ++ * ++ * Return: 0 on success. ++ */ ++static int force_scheduler_to_exit_sleep(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ unsigned long flags; ++ int ret = 0; ++ ++ lockdep_assert_held(&scheduler->lock); ++ WARN_ON(scheduler->state != SCHED_SLEEPING); ++ WARN_ON(!kbdev->pm.backend.gpu_sleep_mode_active); ++ ++ kbase_pm_lock(kbdev); ++ ret = kbase_pm_force_mcu_wakeup_after_sleep(kbdev); ++ kbase_pm_unlock(kbdev); ++ if (ret) { ++ dev_warn(kbdev->dev, ++ "[%llu] Wait for MCU wake up failed on forced scheduler suspend", ++ kbase_backend_get_cycle_cnt(kbdev)); ++ goto out; ++ } ++ ++ ret = suspend_active_groups_on_powerdown(kbdev, true); ++ if (ret) ++ goto out; ++ ++ kbase_pm_lock(kbdev); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbdev->pm.backend.gpu_sleep_mode_active = false; ++ kbdev->pm.backend.gpu_wakeup_override = false; ++ kbase_pm_update_state(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ret = kbase_pm_wait_for_desired_state(kbdev); ++ kbase_pm_unlock(kbdev); ++ if (ret) { ++ dev_warn(kbdev->dev, ++ "[%llu] Wait for pm state change failed on forced scheduler suspend", ++ kbase_backend_get_cycle_cnt(kbdev)); ++ goto out; ++ } ++ ++ scheduler->state = SCHED_SUSPENDED; ++ KBASE_KTRACE_ADD(kbdev, SCHED_SUSPENDED, NULL, scheduler->state); ++ ++ return 0; ++ ++out: ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbdev->pm.backend.exit_gpu_sleep_mode = true; ++ kbdev->pm.backend.gpu_wakeup_override = false; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ kbase_csf_scheduler_invoke_tick(kbdev); ++ ++ return ret; ++} ++#endif ++ ++/** ++ * tick_timer_callback() - Callback function for the scheduling tick hrtimer ++ * ++ * @timer: Pointer to the scheduling tick hrtimer ++ * ++ * This function will enqueue the scheduling tick work item for immediate ++ * execution, if it has not been queued already. ++ * ++ * Return: enum value to indicate that timer should not be restarted. ++ */ ++static enum hrtimer_restart tick_timer_callback(struct hrtimer *timer) ++{ ++ struct kbase_device *kbdev = container_of(timer, struct kbase_device, ++ csf.scheduler.tick_timer); ++ ++ kbase_csf_scheduler_tick_advance(kbdev); ++ return HRTIMER_NORESTART; ++} ++ ++/** ++ * start_tick_timer() - Start the scheduling tick hrtimer. ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function will start the scheduling tick hrtimer and is supposed to ++ * be called only from the tick work item function. The tick hrtimer should ++ * not be active already. ++ */ ++static void start_tick_timer(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ unsigned long flags; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++ WARN_ON(scheduler->tick_timer_active); ++ if (likely(!work_pending(&scheduler->tick_work))) { ++ scheduler->tick_timer_active = true; ++ ++ hrtimer_start(&scheduler->tick_timer, ++ HR_TIMER_DELAY_MSEC(scheduler->csg_scheduling_period_ms), ++ HRTIMER_MODE_REL); ++ } ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++} ++ ++/** ++ * cancel_tick_timer() - Cancel the scheduling tick hrtimer ++ * ++ * @kbdev: Pointer to the device ++ */ ++static void cancel_tick_timer(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++ scheduler->tick_timer_active = false; ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++ hrtimer_cancel(&scheduler->tick_timer); ++} ++ ++/** ++ * enqueue_tick_work() - Enqueue the scheduling tick work item ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function will queue the scheduling tick work item for immediate ++ * execution. This shall only be called when both the tick hrtimer and tick ++ * work item are not active/pending. ++ */ ++static void enqueue_tick_work(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ kbase_csf_scheduler_invoke_tick(kbdev); ++} ++ ++static void release_doorbell(struct kbase_device *kbdev, int doorbell_nr) ++{ ++ WARN_ON(doorbell_nr >= CSF_NUM_DOORBELL); ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ clear_bit(doorbell_nr, kbdev->csf.scheduler.doorbell_inuse_bitmap); ++} ++ ++static int acquire_doorbell(struct kbase_device *kbdev) ++{ ++ int doorbell_nr; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ doorbell_nr = find_first_zero_bit( ++ kbdev->csf.scheduler.doorbell_inuse_bitmap, ++ CSF_NUM_DOORBELL); ++ ++ if (doorbell_nr >= CSF_NUM_DOORBELL) ++ return KBASEP_USER_DB_NR_INVALID; ++ ++ set_bit(doorbell_nr, kbdev->csf.scheduler.doorbell_inuse_bitmap); ++ ++ return doorbell_nr; ++} ++ ++static void unassign_user_doorbell_from_group(struct kbase_device *kbdev, ++ struct kbase_queue_group *group) ++{ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ if (group->doorbell_nr != KBASEP_USER_DB_NR_INVALID) { ++ release_doorbell(kbdev, group->doorbell_nr); ++ group->doorbell_nr = KBASEP_USER_DB_NR_INVALID; ++ } ++} ++ ++static void unassign_user_doorbell_from_queue(struct kbase_device *kbdev, ++ struct kbase_queue *queue) ++{ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ mutex_lock(&kbdev->csf.reg_lock); ++ ++ if (queue->doorbell_nr != KBASEP_USER_DB_NR_INVALID) { ++ queue->doorbell_nr = KBASEP_USER_DB_NR_INVALID; ++ /* After this the dummy page would be mapped in */ ++ unmap_mapping_range(kbdev->csf.db_filp->f_inode->i_mapping, + queue->db_file_offset << PAGE_SHIFT, PAGE_SIZE, 1); + } + @@ -169295,7 +188096,7 @@ index 000000000000..a3017a7f25ba + mutex_lock(&kbdev->csf.reg_lock); + + /* If bind operation for the queue hasn't completed yet, then the -+ * the command stream interface can't be programmed for the queue ++ * CSI can't be programmed for the queue + * (even in stopped state) and so the doorbell also can't be assigned + * to it. + */ @@ -169329,11 +188130,110 @@ index 000000000000..a3017a7f25ba + WARN_ON(doorbell_nr != CSF_KERNEL_DOORBELL_NR); +} + -+static u32 get_nr_active_csgs(struct kbase_device *kbdev) ++/** ++ * update_on_slot_queues_offsets - Update active queues' INSERT & EXTRACT ofs ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * This function updates the EXTRACT offset for all queues which groups have ++ * been assigned a physical slot. These values could be used to detect a ++ * queue's true idleness status. This is intended to be an additional check ++ * on top of the GPU idle notification to account for race conditions. ++ * This function is supposed to be called only when GPU idle notification ++ * interrupt is received. ++ */ ++static void update_on_slot_queues_offsets(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ /* All CSGs have the same number of CSs */ ++ size_t const max_streams = kbdev->csf.global_iface.groups[0].stream_num; ++ size_t i; ++ ++ lockdep_assert_held(&scheduler->interrupt_lock); ++ ++ /* csg_slots_idle_mask is not used here for the looping, as it could get ++ * updated concurrently when Scheduler re-evaluates the idle status of ++ * the CSGs for which idle notification was received previously. ++ */ ++ for_each_set_bit(i, scheduler->csg_inuse_bitmap, kbdev->csf.global_iface.group_num) { ++ struct kbase_queue_group *const group = scheduler->csg_slots[i].resident_group; ++ size_t j; ++ ++ if (WARN_ON(!group)) ++ continue; ++ ++ for (j = 0; j < max_streams; ++j) { ++ struct kbase_queue *const queue = group->bound_queues[j]; ++ ++ if (queue) { ++ if (queue->user_io_addr) { ++ u64 const *const output_addr = ++ (u64 const *)(queue->user_io_addr + PAGE_SIZE); ++ ++ queue->extract_ofs = ++ output_addr[CS_EXTRACT_LO / sizeof(u64)]; ++ } else { ++ dev_warn(kbdev->dev, ++ "%s(): queue->user_io_addr is NULL, queue: %p", ++ __func__, ++ queue); ++ } ++ } ++ } ++ } ++} ++ ++static void enqueue_gpu_idle_work(struct kbase_csf_scheduler *const scheduler) ++{ ++ atomic_set(&scheduler->gpu_no_longer_idle, false); ++ queue_work(scheduler->idle_wq, &scheduler->gpu_idle_work); ++} ++ ++void kbase_csf_scheduler_process_gpu_idle_event(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ int non_idle_offslot_grps; ++ bool can_suspend_on_idle; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ lockdep_assert_held(&scheduler->interrupt_lock); ++ ++ non_idle_offslot_grps = atomic_read(&scheduler->non_idle_offslot_grps); ++ can_suspend_on_idle = kbase_pm_idle_groups_sched_suspendable(kbdev); ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_GPU_IDLE_EVENT_CAN_SUSPEND, NULL, ++ ((u64)(u32)non_idle_offslot_grps) | (((u64)can_suspend_on_idle) << 32)); ++ ++ if (!non_idle_offslot_grps) { ++ if (can_suspend_on_idle) { ++ /* fast_gpu_idle_handling is protected by the ++ * interrupt_lock, which would prevent this from being ++ * updated whilst gpu_idle_worker() is executing. ++ */ ++ scheduler->fast_gpu_idle_handling = ++ (kbdev->csf.gpu_idle_hysteresis_us == 0) || ++ !kbase_csf_scheduler_all_csgs_idle(kbdev); ++ ++ /* The GPU idle worker relies on update_on_slot_queues_offsets() to have ++ * finished. It's queued before to reduce the time it takes till execution ++ * but it'll eventually be blocked by the scheduler->interrupt_lock. ++ */ ++ enqueue_gpu_idle_work(scheduler); ++ ++ /* The extract offsets are unused in fast GPU idle handling */ ++ if (!scheduler->fast_gpu_idle_handling) ++ update_on_slot_queues_offsets(kbdev); ++ } ++ } else { ++ /* Advance the scheduling tick to get the non-idle suspended groups loaded soon */ ++ kbase_csf_scheduler_tick_advance_nolock(kbdev); ++ } ++} ++ ++u32 kbase_csf_scheduler_get_nr_active_csgs_locked(struct kbase_device *kbdev) +{ + u32 nr_active_csgs; + -+ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ lockdep_assert_held(&kbdev->csf.scheduler.interrupt_lock); + + nr_active_csgs = bitmap_weight(kbdev->csf.scheduler.csg_inuse_bitmap, + kbdev->csf.global_iface.group_num); @@ -169341,36 +188241,23 @@ index 000000000000..a3017a7f25ba + return nr_active_csgs; +} + -+/** -+ * csgs_active - returns true if any of CSG slots are in use -+ * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. -+ * -+ * Return: the interface is actively engaged flag. -+ */ -+bool csgs_active(struct kbase_device *kbdev) ++u32 kbase_csf_scheduler_get_nr_active_csgs(struct kbase_device *kbdev) +{ + u32 nr_active_csgs; ++ unsigned long flags; + -+ mutex_lock(&kbdev->csf.scheduler.lock); -+ nr_active_csgs = get_nr_active_csgs(kbdev); -+ mutex_unlock(&kbdev->csf.scheduler.lock); ++ spin_lock_irqsave(&kbdev->csf.scheduler.interrupt_lock, flags); ++ nr_active_csgs = kbase_csf_scheduler_get_nr_active_csgs_locked(kbdev); ++ spin_unlock_irqrestore(&kbdev->csf.scheduler.interrupt_lock, flags); + -+ /* Right now if any of the command stream group interfaces are in use -+ * then we need to assume that there is some work pending. -+ * In future when we have IDLE notifications from firmware implemented -+ * then we would have a better idea of the pending work. -+ */ -+ return (nr_active_csgs != 0); ++ return nr_active_csgs; +} + +/** + * csg_slot_in_use - returns true if a queue group has been programmed on a + * given CSG slot. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * @slot: Index/number of the CSG slot in question. + * + * Return: the interface is actively engaged flag. @@ -169401,6 +188288,19 @@ index 000000000000..a3017a7f25ba + group->run_state == KBASE_CSF_GROUP_SUSPENDED_ON_IDLE); +} + ++static bool on_slot_group_idle_locked(struct kbase_queue_group *group) ++{ ++ lockdep_assert_held(&group->kctx->kbdev->csf.scheduler.lock); ++ ++ return (group->run_state == KBASE_CSF_GROUP_IDLE); ++} ++ ++static bool can_schedule_idle_group(struct kbase_queue_group *group) ++{ ++ return (on_slot_group_idle_locked(group) || ++ (group->priority == KBASE_QUEUE_GROUP_PRIORITY_REALTIME)); ++} ++ +static bool queue_group_scheduled(struct kbase_queue_group *group) +{ + return (group->run_state != KBASE_CSF_GROUP_INACTIVE && @@ -169416,6 +188316,88 @@ index 000000000000..a3017a7f25ba +} + +/** ++ * scheduler_protm_wait_quit() - Wait for GPU to exit protected mode. ++ * ++ * @kbdev: Pointer to the GPU device ++ * ++ * This function waits for the GPU to exit protected mode which is confirmed ++ * when active_protm_grp is set to NULL. ++ * ++ * Return: true on success, false otherwise. ++ */ ++static bool scheduler_protm_wait_quit(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ long wt = kbase_csf_timeout_in_jiffies(kbdev->csf.fw_timeout_ms); ++ long remaining; ++ bool success = true; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_PROTM_WAIT_QUIT_START, NULL, jiffies_to_msecs(wt)); ++ ++ remaining = wait_event_timeout(kbdev->csf.event_wait, ++ !kbase_csf_scheduler_protected_mode_in_use(kbdev), wt); ++ ++ if (unlikely(!remaining)) { ++ struct kbase_queue_group *group = kbdev->csf.scheduler.active_protm_grp; ++ struct kbase_context *kctx = group ? group->kctx : NULL; ++ ++ dev_warn(kbdev->dev, "[%llu] Timeout (%d ms), protm_quit wait skipped", ++ kbase_backend_get_cycle_cnt(kbdev), ++ kbdev->csf.fw_timeout_ms); ++ schedule_actions_trigger_df(kbdev, kctx, DF_PROTECTED_MODE_EXIT_TIMEOUT); ++ success = false; ++ } ++ ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_PROTM_WAIT_QUIT_END, NULL, jiffies_to_msecs(remaining)); ++ ++ return success; ++} ++ ++/** ++ * scheduler_force_protm_exit() - Force GPU to exit protected mode. ++ * ++ * @kbdev: Pointer to the GPU device ++ * ++ * This function sends a ping request to the firmware and waits for the GPU ++ * to exit protected mode. ++ * ++ * If the GPU does not exit protected mode, it is considered as hang. ++ * A GPU reset would then be triggered. ++ */ ++static void scheduler_force_protm_exit(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ kbase_csf_firmware_ping(kbdev); ++ ++ if (scheduler_protm_wait_quit(kbdev)) ++ return; ++ ++ dev_err(kbdev->dev, "Possible GPU hang in Protected mode"); ++ ++ spin_lock_irqsave(&kbdev->csf.scheduler.interrupt_lock, flags); ++ if (kbdev->csf.scheduler.active_protm_grp) { ++ dev_err(kbdev->dev, ++ "Group-%d of context %d_%d ran in protected mode for too long on slot %d", ++ kbdev->csf.scheduler.active_protm_grp->handle, ++ kbdev->csf.scheduler.active_protm_grp->kctx->tgid, ++ kbdev->csf.scheduler.active_protm_grp->kctx->id, ++ kbdev->csf.scheduler.active_protm_grp->csg_nr); ++ } ++ spin_unlock_irqrestore(&kbdev->csf.scheduler.interrupt_lock, flags); ++ ++ /* The GPU could be stuck in Protected mode. To prevent a hang, ++ * a GPU reset is performed. ++ */ ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_NONE)) ++ kbase_reset_gpu(kbdev); ++} ++ ++/** + * scheduler_timer_is_enabled_nolock() - Check if the scheduler wakes up + * automatically for periodic tasks. + * @@ -169433,20 +188415,221 @@ index 000000000000..a3017a7f25ba + return kbdev->csf.scheduler.timer_enabled; +} + ++/** ++ * scheduler_pm_active_handle_suspend() - Acquire the PM reference count for ++ * Scheduler ++ * ++ * @kbdev: Pointer to the device ++ * @suspend_handler: Handler code for how to handle a suspend that might occur. ++ * ++ * This function is usually called when Scheduler needs to be activated. ++ * The PM reference count is acquired for the Scheduler and the power on ++ * of GPU is initiated. ++ * ++ * Return: 0 if successful or a negative error code on failure. ++ */ ++static int scheduler_pm_active_handle_suspend(struct kbase_device *kbdev, ++ enum kbase_pm_suspend_handler suspend_handler) ++{ ++ unsigned long flags; ++ u32 prev_count; ++ int ret = 0; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ prev_count = kbdev->csf.scheduler.pm_active_count; ++ if (!WARN_ON(prev_count == U32_MAX)) ++ kbdev->csf.scheduler.pm_active_count++; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ /* On 0 => 1, make a pm_ctx_active request */ ++ if (!prev_count) { ++ ret = kbase_pm_context_active_handle_suspend(kbdev, ++ suspend_handler); ++ /* Invoke the PM state machines again as the change in MCU ++ * desired status, due to the update of scheduler.pm_active_count, ++ * may be missed by the thread that called pm_wait_for_desired_state() ++ */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ if (ret) ++ kbdev->csf.scheduler.pm_active_count--; ++ kbase_pm_update_state(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } ++ ++ return ret; ++} ++ ++#ifdef KBASE_PM_RUNTIME ++/** ++ * scheduler_pm_active_after_sleep() - Acquire the PM reference count for ++ * Scheduler ++ * ++ * @kbdev: Pointer to the device ++ * @flags: Pointer to the flags variable containing the interrupt state ++ * when hwaccess lock was acquired. ++ * ++ * This function is called when Scheduler needs to be activated from the ++ * sleeping state. ++ * The PM reference count is acquired for the Scheduler and the wake up of ++ * MCU is initiated. It resets the flag that indicates to the MCU state ++ * machine that MCU needs to be put in sleep state. ++ * ++ * Note: This function shall be called with hwaccess lock held and it may ++ * release that lock and reacquire it. ++ * ++ * Return: zero when the PM reference was taken and non-zero when the ++ * system is being suspending/suspended. ++ */ ++static int scheduler_pm_active_after_sleep(struct kbase_device *kbdev, ++ unsigned long *flags) ++{ ++ u32 prev_count; ++ int ret = 0; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ prev_count = kbdev->csf.scheduler.pm_active_count; ++ if (!WARN_ON(prev_count == U32_MAX)) ++ kbdev->csf.scheduler.pm_active_count++; ++ ++ /* On 0 => 1, make a pm_ctx_active request */ ++ if (!prev_count) { ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, *flags); ++ ++ ret = kbase_pm_context_active_handle_suspend(kbdev, ++ KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, *flags); ++ if (ret) ++ kbdev->csf.scheduler.pm_active_count--; ++ else ++ kbdev->pm.backend.gpu_sleep_mode_active = false; ++ kbase_pm_update_state(kbdev); ++ } ++ ++ return ret; ++} ++#endif ++ ++/** ++ * scheduler_pm_idle() - Release the PM reference count held by Scheduler ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function is usually called after Scheduler is suspended. ++ * The PM reference count held by the Scheduler is released to trigger the ++ * power down of GPU. ++ */ ++static void scheduler_pm_idle(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ u32 prev_count; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ prev_count = kbdev->csf.scheduler.pm_active_count; ++ if (!WARN_ON(prev_count == 0)) ++ kbdev->csf.scheduler.pm_active_count--; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ if (prev_count == 1) { ++ kbase_pm_context_idle(kbdev); ++ /* Invoke the PM state machines again as the change in MCU ++ * desired status, due to the update of scheduler.pm_active_count, ++ * may be missed by the thread that called pm_wait_for_desired_state() ++ */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_pm_update_state(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } ++} ++ ++#ifdef KBASE_PM_RUNTIME ++/** ++ * scheduler_pm_idle_before_sleep() - Release the PM reference count and ++ * trigger the tranistion to sleep state. ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function is called on the GPU idle notification. It releases the ++ * Scheduler's PM reference count and sets the flag to indicate to the ++ * MCU state machine that MCU needs to be put in sleep state. ++ */ ++static void scheduler_pm_idle_before_sleep(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ u32 prev_count; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ prev_count = kbdev->csf.scheduler.pm_active_count; ++ if (!WARN_ON(prev_count == 0)) ++ kbdev->csf.scheduler.pm_active_count--; ++ kbdev->pm.backend.gpu_sleep_mode_active = true; ++ kbdev->pm.backend.exit_gpu_sleep_mode = false; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ if (prev_count == 1) { ++ kbase_pm_context_idle(kbdev); ++ /* Invoke the PM state machines again as the change in MCU ++ * desired status, due to the update of scheduler.pm_active_count, ++ * may be missed by the thread that called pm_wait_for_desired_state() ++ */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_pm_update_state(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } ++} ++#endif ++ +static void scheduler_wakeup(struct kbase_device *kbdev, bool kick) +{ + struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ int ret; + + lockdep_assert_held(&scheduler->lock); + ++ if ((scheduler->state != SCHED_SUSPENDED) && ++ (scheduler->state != SCHED_SLEEPING)) ++ return; ++ + if (scheduler->state == SCHED_SUSPENDED) { -+ dev_info(kbdev->dev, "Re-activating the Scheduler"); -+ kbase_csf_scheduler_pm_active(kbdev); -+ scheduler->state = SCHED_INACTIVE; ++ dev_dbg(kbdev->dev, ++ "Re-activating the Scheduler after suspend"); ++ ret = scheduler_pm_active_handle_suspend(kbdev, ++ KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE); ++ } else { ++#ifdef KBASE_PM_RUNTIME ++ unsigned long flags; + -+ if (kick) -+ scheduler_enable_tick_timer_nolock(kbdev); ++ dev_dbg(kbdev->dev, ++ "Re-activating the Scheduler out of sleep"); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ret = scheduler_pm_active_after_sleep(kbdev, &flags); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++#endif + } ++ ++ if (ret) { ++ /* GPUCORE-29850 would add the handling for the case where ++ * Scheduler could not be activated due to system suspend. ++ */ ++ dev_info(kbdev->dev, ++ "Couldn't wakeup Scheduler due to system suspend"); ++ return; ++ } ++ ++ scheduler->state = SCHED_INACTIVE; ++ KBASE_KTRACE_ADD(kbdev, SCHED_INACTIVE, NULL, scheduler->state); ++ ++ if (kick) ++ scheduler_enable_tick_timer_nolock(kbdev); +} + +static void scheduler_suspend(struct kbase_device *kbdev) @@ -169457,8 +188640,9 @@ index 000000000000..a3017a7f25ba + + if (!WARN_ON(scheduler->state == SCHED_SUSPENDED)) { + dev_dbg(kbdev->dev, "Suspending the Scheduler"); -+ kbase_csf_scheduler_pm_idle(kbdev); ++ scheduler_pm_idle(kbdev); + scheduler->state = SCHED_SUSPENDED; ++ KBASE_KTRACE_ADD(kbdev, SCHED_SUSPENDED, NULL, scheduler->state); + } +} + @@ -169470,7 +188654,7 @@ index 000000000000..a3017a7f25ba + * This function is called to change the state of queue group to non-idle + * suspended state, if the group was suspended when all the queues bound to it + * became empty or when some queues got blocked on a sync wait & others became -+ * empty. The group is also moved to the runnbale list from idle wait list in ++ * empty. The group is also moved to the runnable list from idle wait list in + * the latter case. + * So the function gets called when a queue is kicked or sync wait condition + * gets satisfied. @@ -169479,6 +188663,7 @@ index 000000000000..a3017a7f25ba +{ + struct kbase_csf_scheduler *scheduler = + &group->kctx->kbdev->csf.scheduler; ++ int new_val; + + lockdep_assert_held(&scheduler->lock); + @@ -169486,14 +188671,43 @@ index 000000000000..a3017a7f25ba + remove_group_from_idle_wait(group); + insert_group_to_runnable(scheduler, group, + KBASE_CSF_GROUP_SUSPENDED); -+ } else { -+ if (group->run_state == KBASE_CSF_GROUP_SUSPENDED_ON_IDLE) -+ group->run_state = KBASE_CSF_GROUP_SUSPENDED; -+ else -+ return; -+ } ++ } else if (group->run_state == KBASE_CSF_GROUP_SUSPENDED_ON_IDLE) { ++ group->run_state = KBASE_CSF_GROUP_SUSPENDED; ++ KBASE_KTRACE_ADD_CSF_GRP(group->kctx->kbdev, CSF_GROUP_SUSPENDED, group, ++ group->run_state); ++ ++ /* If scheduler is not suspended and the given group's ++ * static priority (reflected by the scan_seq_num) is inside ++ * the current tick slot-range, or there are some on_slot ++ * idle groups, schedule an async tock. ++ */ ++ if (scheduler->state != SCHED_SUSPENDED) { ++ unsigned long flags; ++ int n_idle; ++ int n_used; ++ int n_slots = ++ group->kctx->kbdev->csf.global_iface.group_num; ++ ++ spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++ n_idle = bitmap_weight(scheduler->csg_slots_idle_mask, ++ n_slots); ++ n_used = bitmap_weight(scheduler->csg_inuse_bitmap, ++ n_slots); ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, ++ flags); + -+ atomic_inc(&scheduler->non_idle_suspended_grps); ++ if (n_idle || ++ n_used < scheduler->num_csg_slots_for_tick || ++ group->scan_seq_num < ++ scheduler->num_csg_slots_for_tick) ++ schedule_in_cycle(group, true); ++ } ++ } else ++ return; ++ ++ new_val = atomic_inc_return(&scheduler->non_idle_offslot_grps); ++ KBASE_KTRACE_ADD_CSF_GRP(group->kctx->kbdev, SCHEDULER_NONIDLE_OFFSLOT_GRP_INC, group, ++ new_val); +} + +int kbase_csf_scheduler_group_get_slot_locked(struct kbase_queue_group *group) @@ -169527,6 +188741,14 @@ index 000000000000..a3017a7f25ba + return slot_num; +} + ++/* kbasep_csf_scheduler_group_is_on_slot_locked() - Check if CSG is on slot. ++ * ++ * @group: GPU queue group to be checked ++ * ++ * This function needs to be called with scheduler's lock held ++ * ++ * Return: true if @group is on slot. ++ */ +static bool kbasep_csf_scheduler_group_is_on_slot_locked( + struct kbase_queue_group *group) +{ @@ -169575,8 +188797,9 @@ index 000000000000..a3017a7f25ba + struct kbase_csf_global_iface *global_iface = &kbdev->csf.global_iface; + struct kbase_csf_cmd_stream_group_info *ginfo; + struct kbase_csf_cmd_stream_info *stream; -+ long remaining = -+ kbase_csf_timeout_in_jiffies(CSF_STATE_WAIT_TIMEOUT_MS); ++ int csi_index = queue->csi_index; ++ long remaining = kbase_csf_timeout_in_jiffies(kbdev->csf.fw_timeout_ms); ++ unsigned long flags; + + if (WARN_ON(!group) || + WARN_ON(!kbasep_csf_scheduler_group_is_on_slot_locked(group))) @@ -169584,7 +188807,7 @@ index 000000000000..a3017a7f25ba + + lockdep_assert_held(&kbdev->csf.scheduler.lock); + ginfo = &global_iface->groups[group->csg_nr]; -+ stream = &ginfo->streams[queue->csi_index]; ++ stream = &ginfo->streams[csi_index]; + + if (CS_REQ_STATE_GET(kbase_csf_firmware_cs_input_read(stream, CS_REQ)) == + CS_REQ_STATE_START) { @@ -169594,24 +188817,29 @@ index 000000000000..a3017a7f25ba + == CS_ACK_STATE_START), remaining); + + if (!remaining) { -+ dev_warn(kbdev->dev, "Timed out waiting for queue to start on csi %d bound to group %d on slot %d", -+ queue->csi_index, group->handle, group->csg_nr); -+ if (kbase_prepare_to_reset_gpu(kbdev)) ++ dev_warn(kbdev->dev, "[%llu] Timeout (%d ms) waiting for queue to start on csi %d bound to group %d on slot %d", ++ kbase_backend_get_cycle_cnt(kbdev), kbdev->csf.fw_timeout_ms, ++ csi_index, group->handle, group->csg_nr); ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_NONE)) + kbase_reset_gpu(kbdev); + ++ + return -ETIMEDOUT; + } + + remaining = -+ kbase_csf_timeout_in_jiffies(CSF_STATE_WAIT_TIMEOUT_MS); ++ kbase_csf_timeout_in_jiffies(kbdev->csf.fw_timeout_ms); + } + ++ spin_lock_irqsave(&kbdev->csf.scheduler.interrupt_lock, flags); + /* Set state to STOP */ + kbase_csf_firmware_cs_input_mask(stream, CS_REQ, CS_REQ_STATE_STOP, + CS_REQ_STATE_MASK); + -+ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, CSI_STOP_REQUESTED, group, queue, 0u); -+ kbase_csf_ring_cs_kernel_doorbell(kbdev, queue); ++ kbase_csf_ring_cs_kernel_doorbell(kbdev, csi_index, group->csg_nr, true); ++ spin_unlock_irqrestore(&kbdev->csf.scheduler.interrupt_lock, flags); ++ ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, CSI_STOP_REQ, group, queue, 0u); + + /* Timed wait */ + remaining = wait_event_timeout(kbdev->csf.event_wait, @@ -169619,10 +188847,17 @@ index 000000000000..a3017a7f25ba + == CS_ACK_STATE_STOP), remaining); + + if (!remaining) { -+ dev_warn(kbdev->dev, "Timed out waiting for queue to stop on csi %d bound to group %d on slot %d", ++ dev_warn(kbdev->dev, "[%llu] Timeout (%d ms) waiting for queue to stop on csi %d bound to group %d on slot %d", ++ kbase_backend_get_cycle_cnt(kbdev), kbdev->csf.fw_timeout_ms, + queue->csi_index, group->handle, group->csg_nr); -+ if (kbase_prepare_to_reset_gpu(kbdev)) ++ ++ /* TODO GPUCORE-25328: The CSG can't be terminated, the GPU ++ * will be reset as a work-around. ++ */ ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_NONE)) + kbase_reset_gpu(kbdev); ++ ++ + } + return (remaining) ? 0 : -ETIMEDOUT; +} @@ -169655,7 +188890,7 @@ index 000000000000..a3017a7f25ba + * @queue: Pointer to the GPU queue to stop. + * + * This function handles stopping gpu queues for groups that are either not on -+ * a command stream group slot or are on the slot but undergoing transition to ++ * a CSG slot or are on the slot but undergoing transition to + * resume or suspend states. + * It waits until the queue group is scheduled on a slot and starts running, + * which is needed as groups that were suspended may need to resume all queues @@ -169676,6 +188911,7 @@ index 000000000000..a3017a7f25ba + long remaining; + int slot; + int err = 0; ++ const u32 group_schedule_timeout = kbase_get_timeout_ms(kbdev, CSF_CSG_SUSPEND_TIMEOUT); + + if (WARN_ON(!group)) + return -EINVAL; @@ -169695,26 +188931,6 @@ index 000000000000..a3017a7f25ba + } + } +retry: -+ /* First wait for the group to reach a stable state. IDLE state is -+ * an intermediate state that is only set by Scheduler at the start -+ * of a tick (prior to scanout) for groups that received idle -+ * notification, then later the idle group is moved to one of the -+ * suspended states or the runnable state. -+ */ -+ while (group->run_state == KBASE_CSF_GROUP_IDLE) { -+ mutex_unlock(&scheduler->lock); -+ remaining = wait_event_timeout(kbdev->csf.event_wait, -+ group->run_state != KBASE_CSF_GROUP_IDLE, -+ CSF_STATE_WAIT_TIMEOUT_MS); -+ mutex_lock(&scheduler->lock); -+ if (!remaining) { -+ dev_warn(kbdev->dev, -+ "Timed out waiting for state change of Group-%d when stopping a queue on csi %d", -+ group->handle, queue->csi_index); -+ } -+ } -+ -+ WARN_ON(group->run_state == KBASE_CSF_GROUP_IDLE); + /* Update the group state so that it can get scheduled soon */ + update_idle_suspended_group_state(group); + @@ -169737,9 +188953,9 @@ index 000000000000..a3017a7f25ba + * CSF context is locked. Therefore, the scheduler would be + * the only one to update the run_state of the group. + */ -+ remaining = wait_event_timeout(kbdev->csf.event_wait, -+ can_halt_stream(kbdev, group), -+ kbase_csf_timeout_in_jiffies(20 * CSF_SCHEDULER_TIME_TICK_MS)); ++ remaining = wait_event_timeout( ++ kbdev->csf.event_wait, can_halt_stream(kbdev, group), ++ kbase_csf_timeout_in_jiffies(group_schedule_timeout)); + + mutex_lock(&scheduler->lock); + @@ -169747,14 +188963,14 @@ index 000000000000..a3017a7f25ba + slot = kbase_csf_scheduler_group_get_slot(group); + + /* If the group is still on slot and slot is in running state -+ * then explicitly stop the command stream interface of the ++ * then explicitly stop the CSI of the + * queue. Otherwise there are different cases to consider + * + * - If the queue group was already undergoing transition to + * resume/start state when this function was entered then it -+ * would not have disabled the command stream interface of the ++ * would not have disabled the CSI of the + * queue being stopped and the previous wait would have ended -+ * once the slot was in a running state with command stream ++ * once the slot was in a running state with CS + * interface still enabled. + * Now the group is going through another transition either + * to a suspend state or to a resume state (it could have @@ -169762,17 +188978,17 @@ index 000000000000..a3017a7f25ba + * In both scenarios need to wait again for the group to + * come on a slot and that slot to reach the running state, + * as that would guarantee that firmware will observe the -+ * command stream interface as disabled. ++ * CSI as disabled. + * + * - If the queue group was either off the slot or was + * undergoing transition to suspend state on entering this + * function, then the group would have been resumed with the -+ * queue's command stream interface in disabled state. ++ * queue's CSI in disabled state. + * So now if the group is undergoing another transition + * (after the resume) then just need to wait for the state -+ * bits in the ACK register of command stream interface to be ++ * bits in the ACK register of CSI to be + * set to STOP value. It is expected that firmware will -+ * process the stop/disable request of the command stream ++ * process the stop/disable request of the CS + * interface after resuming the group before it processes + * another state change request of the group. + */ @@ -169797,41 +189013,64 @@ index 000000000000..a3017a7f25ba + /* Timed wait */ + remaining = wait_event_timeout( + kbdev->csf.event_wait, -+ (CS_ACK_STATE_GET(kbase_csf_firmware_cs_output(stream, CS_ACK)) -+ == CS_ACK_STATE_STOP), -+ CSF_STATE_WAIT_TIMEOUT_MS); ++ (CS_ACK_STATE_GET( ++ kbase_csf_firmware_cs_output( ++ stream, CS_ACK)) == ++ CS_ACK_STATE_STOP), ++ kbase_csf_timeout_in_jiffies(kbdev->csf.fw_timeout_ms)); + + if (!remaining) { + dev_warn(kbdev->dev, -+ "Timed out waiting for queue stop ack on csi %d bound to group %d on slot %d", ++ "[%llu] Timeout (%d ms) waiting for queue stop ack on csi %d bound to group %d on slot %d", ++ kbase_backend_get_cycle_cnt(kbdev), kbdev->csf.fw_timeout_ms, + queue->csi_index, + group->handle, group->csg_nr); ++ ++ + err = -ETIMEDOUT; + } + } + } + } else if (!remaining) { -+ dev_warn(kbdev->dev, "Group-%d failed to get a slot for stopping the queue on csi %d", -+ group->handle, queue->csi_index); ++ dev_warn(kbdev->dev, "[%llu] Group-%d failed to get a slot for stopping the queue on csi %d (timeout %d ms)", ++ kbase_backend_get_cycle_cnt(kbdev), ++ group->handle, queue->csi_index, ++ group_schedule_timeout); ++ ++ + err = -ETIMEDOUT; + } + + return err; +} + -+static int wait_gpu_reset(struct kbase_device *kbdev) ++/** ++ * scheduler_activate_on_queue_stop() - Activate the Scheduler when the GPU ++ * queue needs to be stopped. ++ * ++ * @queue: Pointer the GPU command queue ++ * ++ * This function is called when the CSI to which GPU queue is bound needs to ++ * be stopped. For that the corresponding queue group needs to be resident on ++ * the CSG slot and MCU firmware should be running. So this function makes the ++ * Scheduler exit the sleeping or suspended state. ++ */ ++static void scheduler_activate_on_queue_stop(struct kbase_queue *queue) +{ -+ int ret = 0; ++ struct kbase_device *kbdev = queue->kctx->kbdev; + -+ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ scheduler_wakeup(kbdev, true); + -+ while (kbase_reset_gpu_is_active(kbdev) && !ret) { -+ mutex_unlock(&kbdev->csf.scheduler.lock); -+ ret = kbase_reset_gpu_wait(kbdev); -+ mutex_lock(&kbdev->csf.scheduler.lock); ++ /* Wait for MCU firmware to start running */ ++ if (kbase_csf_scheduler_wait_mcu_active(kbdev)) { ++ dev_warn( ++ kbdev->dev, ++ "[%llu] Wait for MCU active failed for stopping queue on csi %d bound to group %d of context %d_%d on slot %d", ++ kbase_backend_get_cycle_cnt(kbdev), ++ queue->csi_index, queue->group->handle, ++ queue->kctx->tgid, queue->kctx->id, ++ queue->group->csg_nr); + } -+ -+ return ret; +} + +int kbase_csf_scheduler_queue_stop(struct kbase_queue *queue) @@ -169844,14 +189083,13 @@ index 000000000000..a3017a7f25ba + if (WARN_ON(!group)) + return -EINVAL; + ++ kbase_reset_gpu_assert_failed_or_prevented(kbdev); + lockdep_assert_held(&queue->kctx->csf.lock); + mutex_lock(&kbdev->csf.scheduler.lock); + + queue->enabled = false; + KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, CSI_STOP, group, queue, cs_enabled); + -+ wait_gpu_reset(kbdev); -+ + if (cs_enabled && queue_group_scheduled_locked(group)) { + struct kbase_csf_csg_slot *const csg_slot = + kbdev->csf.scheduler.csg_slots; @@ -169860,7 +189098,7 @@ index 000000000000..a3017a7f25ba + /* Since the group needs to be resumed in order to stop the queue, + * check if GPU needs to be powered up. + */ -+ scheduler_wakeup(kbdev, true); ++ scheduler_activate_on_queue_stop(queue); + + if ((slot >= 0) && + (atomic_read(&csg_slot[slot].state) == CSG_SLOT_RUNNING)) @@ -169869,15 +189107,17 @@ index 000000000000..a3017a7f25ba + err = sched_halt_stream(queue); + + unassign_user_doorbell_from_queue(kbdev, queue); ++ kbase_csf_mcu_shared_drop_stopped_queue(kbdev, queue); + } + + mutex_unlock(&kbdev->csf.scheduler.lock); ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, QUEUE_STOP, group, queue, group->run_state); + return err; +} + +static void update_hw_active(struct kbase_queue *queue, bool active) +{ -+#ifdef CONFIG_MALI_BIFROST_NO_MALI ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) + if (queue && queue->enabled) { + u32 *output_addr = (u32 *)(queue->user_io_addr + PAGE_SIZE); + @@ -169898,12 +189138,58 @@ index 000000000000..a3017a7f25ba + output_addr[CS_EXTRACT_LO / sizeof(u64)]; +} + ++static void program_cs_trace_cfg(struct kbase_csf_cmd_stream_info *stream, ++ struct kbase_queue *queue) ++{ ++ struct kbase_device *kbdev = queue->kctx->kbdev; ++ u32 const glb_version = kbdev->csf.global_iface.version; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ /* If cs_trace_command not supported, nothing to program */ ++ if (glb_version < kbase_csf_interface_version(1, 1, 0)) ++ return; ++ ++ /* Program for cs_trace if enabled. In the current arrangement, it is ++ * possible for the context to enable the cs_trace after some queues ++ * has been registered in cs_trace in disabled state. This is tracked by ++ * the queue's trace buffer base address, which had been validated at the ++ * queue's register_ex call. ++ */ ++ if (kbase_csf_scheduler_queue_has_trace(queue)) { ++ u32 cs_cfg = CS_INSTR_CONFIG_JASID_SET( ++ queue->trace_cfg, queue->kctx->as_nr); ++ ++ kbase_csf_firmware_cs_input(stream, CS_INSTR_CONFIG, cs_cfg); ++ kbase_csf_firmware_cs_input(stream, CS_INSTR_BUFFER_SIZE, ++ queue->trace_buffer_size); ++ ++ kbase_csf_firmware_cs_input(stream, CS_INSTR_BUFFER_BASE_LO, ++ queue->trace_buffer_base & U32_MAX); ++ kbase_csf_firmware_cs_input(stream, CS_INSTR_BUFFER_BASE_HI, ++ queue->trace_buffer_base >> 32); ++ ++ kbase_csf_firmware_cs_input( ++ stream, CS_INSTR_BUFFER_OFFSET_POINTER_LO, ++ queue->trace_offset_ptr & U32_MAX); ++ kbase_csf_firmware_cs_input( ++ stream, CS_INSTR_BUFFER_OFFSET_POINTER_HI, ++ queue->trace_offset_ptr >> 32); ++ } else { ++ /* Place the configuration to the disabled condition */ ++ kbase_csf_firmware_cs_input(stream, CS_INSTR_CONFIG, 0); ++ kbase_csf_firmware_cs_input(stream, CS_INSTR_BUFFER_SIZE, 0); ++ } ++} ++ +static void program_cs(struct kbase_device *kbdev, -+ struct kbase_queue *queue) ++ struct kbase_queue *queue, bool ring_csg_doorbell) +{ + struct kbase_queue_group *group = queue->group; + struct kbase_csf_cmd_stream_group_info *ginfo; + struct kbase_csf_cmd_stream_info *stream; ++ int csi_index = queue->csi_index; ++ unsigned long flags; + u64 user_input; + u64 user_output; + @@ -169917,20 +189203,22 @@ index 000000000000..a3017a7f25ba + + ginfo = &kbdev->csf.global_iface.groups[group->csg_nr]; + -+ if (WARN_ON(queue->csi_index < 0) || -+ WARN_ON(queue->csi_index >= ginfo->stream_num)) ++ if (WARN_ON(csi_index < 0) || ++ WARN_ON(csi_index >= ginfo->stream_num)) + return; + -+ assign_user_doorbell_to_queue(kbdev, queue); -+ if (queue->doorbell_nr == KBASEP_USER_DB_NR_INVALID) -+ return; ++ if (queue->enabled) { ++ assign_user_doorbell_to_queue(kbdev, queue); ++ if (queue->doorbell_nr == KBASEP_USER_DB_NR_INVALID) ++ return; + -+ WARN_ON(queue->doorbell_nr != queue->group->doorbell_nr); ++ WARN_ON(queue->doorbell_nr != queue->group->doorbell_nr); ++ } + + if (queue->enabled && queue_group_suspended_locked(group)) + program_cs_extract_init(queue); + -+ stream = &ginfo->streams[queue->csi_index]; ++ stream = &ginfo->streams[csi_index]; + + kbase_csf_firmware_cs_input(stream, CS_BASE_LO, + queue->base_addr & 0xFFFFFFFF); @@ -169939,44 +189227,77 @@ index 000000000000..a3017a7f25ba + kbase_csf_firmware_cs_input(stream, CS_SIZE, + queue->size); + -+ user_input = (queue->reg->start_pfn << PAGE_SHIFT); -+ kbase_csf_firmware_cs_input(stream, CS_USER_INPUT_LO, -+ user_input & 0xFFFFFFFF); -+ kbase_csf_firmware_cs_input(stream, CS_USER_INPUT_HI, -+ user_input >> 32); ++ user_input = queue->user_io_gpu_va; ++ WARN_ONCE(!user_input && queue->enabled, "Enabled queue should have a valid gpu_va"); ++ ++ kbase_csf_firmware_cs_input(stream, CS_USER_INPUT_LO, user_input & 0xFFFFFFFF); ++ kbase_csf_firmware_cs_input(stream, CS_USER_INPUT_HI, user_input >> 32); + -+ user_output = ((queue->reg->start_pfn + 1) << PAGE_SHIFT); -+ kbase_csf_firmware_cs_input(stream, CS_USER_OUTPUT_LO, -+ user_output & 0xFFFFFFFF); -+ kbase_csf_firmware_cs_input(stream, CS_USER_OUTPUT_HI, -+ user_output >> 32); ++ user_output = user_input + PAGE_SIZE; ++ kbase_csf_firmware_cs_input(stream, CS_USER_OUTPUT_LO, user_output & 0xFFFFFFFF); ++ kbase_csf_firmware_cs_input(stream, CS_USER_OUTPUT_HI, user_output >> 32); + + kbase_csf_firmware_cs_input(stream, CS_CONFIG, + (queue->doorbell_nr << 8) | (queue->priority & 0xF)); + ++ /* Program the queue's cs_trace configuration */ ++ program_cs_trace_cfg(stream, queue); ++ + /* Enable all interrupts for now */ + kbase_csf_firmware_cs_input(stream, CS_ACK_IRQ_MASK, ~((u32)0)); + ++ spin_lock_irqsave(&kbdev->csf.scheduler.interrupt_lock, flags); ++ ++ /* The fault bit could be misaligned between CS_REQ and CS_ACK if the ++ * acknowledgment was deferred due to dump on fault and the group was ++ * removed from the CSG slot before the fault could be acknowledged. ++ */ ++ if (queue->enabled) { ++ u32 const cs_ack = ++ kbase_csf_firmware_cs_output(stream, CS_ACK); ++ ++ kbase_csf_firmware_cs_input_mask(stream, CS_REQ, cs_ack, ++ CS_REQ_FAULT_MASK); ++ } ++ + /* -+ * Enable the CSG idle notification once the stream's ringbuffer -+ * becomes empty or the stream becomes sync_idle, waiting sync update ++ * Enable the CSG idle notification once the CS's ringbuffer ++ * becomes empty or the CS becomes sync_idle, waiting sync update + * or protected mode switch. + */ + kbase_csf_firmware_cs_input_mask(stream, CS_REQ, -+ CS_REQ_IDLE_EMPTY_MASK | CS_REQ_IDLE_SYNC_WAIT_MASK, -+ CS_REQ_IDLE_EMPTY_MASK | CS_REQ_IDLE_SYNC_WAIT_MASK); ++ CS_REQ_IDLE_EMPTY_MASK | CS_REQ_IDLE_SYNC_WAIT_MASK | ++ CS_REQ_IDLE_SHARED_SB_DEC_MASK, ++ CS_REQ_IDLE_EMPTY_MASK | CS_REQ_IDLE_SYNC_WAIT_MASK | ++ CS_REQ_IDLE_SHARED_SB_DEC_MASK); + + /* Set state to START/STOP */ + kbase_csf_firmware_cs_input_mask(stream, CS_REQ, + queue->enabled ? CS_REQ_STATE_START : CS_REQ_STATE_STOP, + CS_REQ_STATE_MASK); ++ kbase_csf_ring_cs_kernel_doorbell(kbdev, csi_index, group->csg_nr, ++ ring_csg_doorbell); ++ spin_unlock_irqrestore(&kbdev->csf.scheduler.interrupt_lock, flags); + + KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, CSI_START, group, queue, queue->enabled); + -+ kbase_csf_ring_cs_kernel_doorbell(kbdev, queue); + update_hw_active(queue, true); +} + ++static int onslot_csg_add_new_queue(struct kbase_queue *queue) ++{ ++ struct kbase_device *kbdev = queue->kctx->kbdev; ++ int err; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ err = kbase_csf_mcu_shared_add_queue(kbdev, queue); ++ if (!err) ++ program_cs(kbdev, queue, true); ++ ++ return err; ++} ++ +int kbase_csf_scheduler_queue_start(struct kbase_queue *queue) +{ + struct kbase_queue_group *group = queue->group; @@ -169985,6 +189306,7 @@ index 000000000000..a3017a7f25ba + int err = 0; + bool evicted = false; + ++ kbase_reset_gpu_assert_prevented(kbdev); + lockdep_assert_held(&queue->kctx->csf.lock); + + if (WARN_ON(!group || queue->bind_state != KBASE_CSF_QUEUE_BOUND)) @@ -169992,13 +189314,19 @@ index 000000000000..a3017a7f25ba + + mutex_lock(&kbdev->csf.scheduler.lock); + -+ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, QUEUE_START, group, queue, group->run_state); -+ err = wait_gpu_reset(kbdev); ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ if (unlikely(kbdev->csf.scheduler.state == SCHED_BUSY)) { ++ mutex_unlock(&kbdev->csf.scheduler.lock); ++ return -EBUSY; ++ } ++#endif ++ ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, QUEUE_START, group, queue, ++ group->run_state); ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, QUEUE_SYNC_UPDATE_WAIT_STATUS, queue->group, queue, ++ queue->status_wait); + -+ if (err) { -+ dev_warn(kbdev->dev, "Unsuccessful GPU reset detected when kicking queue (csi_index=%d) of group %d", -+ queue->csi_index, group->handle); -+ } else if (group->run_state == KBASE_CSF_GROUP_FAULT_EVICTED) { ++ if (group->run_state == KBASE_CSF_GROUP_FAULT_EVICTED) { + err = -EIO; + evicted = true; + } else if ((group->run_state == KBASE_CSF_GROUP_SUSPENDED_ON_WAIT_SYNC) @@ -170025,12 +189353,32 @@ index 000000000000..a3017a7f25ba + * user door-bell on such a case. + */ + kbase_csf_ring_cs_user_doorbell(kbdev, queue); -+ } else -+ program_cs(kbdev, queue); ++ } else { ++ err = onslot_csg_add_new_queue(queue); ++ /* For an on slot CSG, the only error in adding a new ++ * queue to run is that the scheduler could not map ++ * the required userio pages due to likely some resource ++ * issues. In such a case, and if the group is yet ++ * to enter its fatal error state, we return a -EBUSY ++ * to the submitter for another kick. The queue itself ++ * has yet to be programmed hence needs to remain its ++ * previous (disabled) state. If the error persists, ++ * the group will eventually reports a fatal error by ++ * the group's error reporting mechanism, when the MCU ++ * shared region map retry limit of the group is ++ * exceeded. For such a case, the expected error value ++ * is -EIO. ++ */ ++ if (unlikely(err)) { ++ queue->enabled = cs_enabled; ++ mutex_unlock(&kbdev->csf.scheduler.lock); ++ return (err != -EIO) ? -EBUSY : err; ++ } ++ } + } -+ queue_delayed_work(system_long_wq, -+ &kbdev->csf.scheduler.ping_work, -+ msecs_to_jiffies(FIRMWARE_PING_INTERVAL_MS)); ++ queue_delayed_work(system_long_wq, &kbdev->csf.scheduler.ping_work, ++ msecs_to_jiffies(kbase_get_timeout_ms( ++ kbdev, CSF_FIRMWARE_PING_TIMEOUT))); + } + } + @@ -170065,7 +189413,8 @@ index 000000000000..a3017a7f25ba + slot_state = CSG_SLOT_RUNNING; + atomic_set(&csg_slot->state, slot_state); + csg_slot->trigger_jiffies = jiffies; -+ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_SLOT_STARTED, csg_slot->resident_group, state); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_SLOT_RUNNING, csg_slot->resident_group, ++ state); + dev_dbg(kbdev->dev, "Group %u running on slot %d\n", + csg_slot->resident_group->handle, slot); + } @@ -170150,20 +189499,23 @@ index 000000000000..a3017a7f25ba + /* When in transition, wait for it to complete */ + if (atomic_read(&csg_slot[slot].state) == CSG_SLOT_READY2RUN) { + long remaining = -+ kbase_csf_timeout_in_jiffies(CSF_STATE_WAIT_TIMEOUT_MS); ++ kbase_csf_timeout_in_jiffies(kbdev->csf.fw_timeout_ms); + + dev_dbg(kbdev->dev, "slot %d wait for up-running\n", slot); + remaining = wait_event_timeout(kbdev->csf.event_wait, + csg_slot_running(kbdev, slot), remaining); + if (!remaining) + dev_warn(kbdev->dev, -+ "slot %d timed out on up-running\n", slot); ++ "[%llu] slot %d timeout (%d ms) on up-running\n", ++ kbase_backend_get_cycle_cnt(kbdev), ++ slot, kbdev->csf.fw_timeout_ms); + } + + if (csg_slot_running(kbdev, slot)) { + unsigned long flags; + struct kbase_csf_cmd_stream_group_info *ginfo = + &global_iface->groups[slot]; ++ + u32 halt_cmd = suspend ? CSG_REQ_STATE_SUSPEND : + CSG_REQ_STATE_TERMINATE; + @@ -170174,13 +189526,15 @@ index 000000000000..a3017a7f25ba + /* Set state to SUSPEND/TERMINATE */ + kbase_csf_firmware_csg_input_mask(ginfo, CSG_REQ, halt_cmd, + CSG_REQ_STATE_MASK); ++ kbase_csf_ring_csg_doorbell(kbdev, slot); + spin_unlock_irqrestore(&kbdev->csf.scheduler.interrupt_lock, + flags); + atomic_set(&csg_slot[slot].state, CSG_SLOT_DOWN2STOP); + csg_slot[slot].trigger_jiffies = jiffies; -+ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_SLOT_STOP, group, halt_cmd); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_SLOT_STOP_REQ, group, halt_cmd); + -+ kbase_csf_ring_csg_doorbell(kbdev, slot); ++ KBASE_TLSTREAM_TL_KBASE_DEVICE_HALTING_CSG( ++ kbdev, kbdev->gpu_props.props.raw_props.gpu_id, slot, suspend); + } +} + @@ -170194,6 +189548,31 @@ index 000000000000..a3017a7f25ba + halt_csg_slot(group, true); +} + ++static bool csf_wait_ge_condition_supported(struct kbase_device *kbdev) ++{ ++ const uint32_t glb_major = GLB_VERSION_MAJOR_GET(kbdev->csf.global_iface.version); ++ const uint32_t glb_minor = GLB_VERSION_MINOR_GET(kbdev->csf.global_iface.version); ++ ++ switch (glb_major) { ++ case 0: ++ break; ++ case 1: ++ if (glb_minor >= 4) ++ return true; ++ break; ++ case 2: ++ if (glb_minor >= 6) ++ return true; ++ break; ++ case 3: ++ if (glb_minor >= 6) ++ return true; ++ break; ++ default: ++ return true; ++ } ++ return false; ++} +/** + * evaluate_sync_update() - Evaluate the sync wait condition the GPU command + * queue has been blocked on. @@ -170204,60 +189583,89 @@ index 000000000000..a3017a7f25ba + */ +static bool evaluate_sync_update(struct kbase_queue *queue) +{ -+ enum kbase_csf_group_state run_state; + struct kbase_vmap_struct *mapping; + bool updated = false; + u32 *sync_ptr; ++ u32 sync_wait_size; ++ u32 sync_wait_align_mask; + u32 sync_wait_cond; ++ u32 sync_current_val; ++ struct kbase_device *kbdev; ++ bool sync_wait_align_valid = false; ++ bool sync_wait_cond_valid = false; + + if (WARN_ON(!queue)) + return false; + -+ run_state = queue->group->run_state; ++ kbdev = queue->kctx->kbdev; + -+ if (WARN_ON((run_state != KBASE_CSF_GROUP_IDLE) && -+ (run_state != KBASE_CSF_GROUP_SUSPENDED_ON_WAIT_SYNC))) -+ return false; ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); + -+ lockdep_assert_held(&queue->kctx->kbdev->csf.scheduler.lock); ++ sync_wait_size = CS_STATUS_WAIT_SYNC_WAIT_SIZE_GET(queue->status_wait); ++ sync_wait_align_mask = ++ (sync_wait_size == 0 ? BASEP_EVENT32_ALIGN_BYTES : BASEP_EVENT64_ALIGN_BYTES) - 1; ++ sync_wait_align_valid = ((uintptr_t)queue->sync_ptr & sync_wait_align_mask) == 0; ++ if (!sync_wait_align_valid) { ++ dev_dbg(queue->kctx->kbdev->dev, "sync memory VA 0x%016llX is misaligned", ++ queue->sync_ptr); ++ goto out; ++ } + + sync_ptr = kbase_phy_alloc_mapping_get(queue->kctx, queue->sync_ptr, + &mapping); + ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, QUEUE_SYNC_UPDATE_EVAL_START, queue->group, queue, ++ queue->sync_ptr); ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, QUEUE_SYNC_UPDATE_BLOCKED_REASON, queue->group, queue, ++ queue->blocked_reason); ++ + if (!sync_ptr) { + dev_dbg(queue->kctx->kbdev->dev, "sync memory VA 0x%016llX already freed", + queue->sync_ptr); -+ return false; ++ goto out; + } + + sync_wait_cond = + CS_STATUS_WAIT_SYNC_WAIT_CONDITION_GET(queue->status_wait); ++ sync_wait_cond_valid = (sync_wait_cond == CS_STATUS_WAIT_SYNC_WAIT_CONDITION_GT) || ++ (sync_wait_cond == CS_STATUS_WAIT_SYNC_WAIT_CONDITION_LE) || ++ ((sync_wait_cond == CS_STATUS_WAIT_SYNC_WAIT_CONDITION_GE) && ++ csf_wait_ge_condition_supported(kbdev)); ++ ++ WARN_ON(!sync_wait_cond_valid); + -+ WARN_ON((sync_wait_cond != CS_STATUS_WAIT_SYNC_WAIT_CONDITION_GT) && -+ (sync_wait_cond != CS_STATUS_WAIT_SYNC_WAIT_CONDITION_LE)); ++ sync_current_val = READ_ONCE(*sync_ptr); ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, QUEUE_SYNC_UPDATE_CUR_VAL, queue->group, queue, ++ sync_current_val); ++ ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, QUEUE_SYNC_UPDATE_TEST_VAL, queue->group, queue, ++ queue->sync_value); + + if (((sync_wait_cond == CS_STATUS_WAIT_SYNC_WAIT_CONDITION_GT) && -+ (*sync_ptr > queue->sync_value)) || ++ (sync_current_val > queue->sync_value)) || ++ ((sync_wait_cond == CS_STATUS_WAIT_SYNC_WAIT_CONDITION_GE) && ++ (sync_current_val >= queue->sync_value) && csf_wait_ge_condition_supported(kbdev)) || + ((sync_wait_cond == CS_STATUS_WAIT_SYNC_WAIT_CONDITION_LE) && -+ (*sync_ptr <= queue->sync_value))) { ++ (sync_current_val <= queue->sync_value))) { + /* The sync wait condition is satisfied so the group to which + * queue is bound can be re-scheduled. + */ + updated = true; + } else { -+ dev_dbg(queue->kctx->kbdev->dev, "sync memory not updated yet(%u)", -+ *sync_ptr); ++ dev_dbg(queue->kctx->kbdev->dev, ++ "sync memory not updated yet(%u)", sync_current_val); + } + + kbase_phy_alloc_mapping_put(queue->kctx, mapping); -+ ++out: ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, QUEUE_SYNC_UPDATE_EVAL_END, queue->group, queue, updated); + return updated; +} + +/** + * save_slot_cs() - Save the state for blocked GPU command queue. + * -+ * @ginfo: Pointer to the command stream group interface used by the group ++ * @ginfo: Pointer to the CSG interface used by the group + * the queue is bound to. + * @queue: Pointer to the GPU command queue. + * @@ -170277,9 +189685,17 @@ index 000000000000..a3017a7f25ba + u32 status = kbase_csf_firmware_cs_output(stream, CS_STATUS_WAIT); + bool is_waiting = false; + -+ WARN_ON(queue->group->run_state != KBASE_CSF_GROUP_IDLE); ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ u64 cmd_ptr = kbase_csf_firmware_cs_output(stream, CS_STATUS_CMD_PTR_LO); + -+ if (CS_STATUS_WAIT_SYNC_WAIT_GET(status)) { ++ cmd_ptr |= (u64)kbase_csf_firmware_cs_output(stream, CS_STATUS_CMD_PTR_HI) << 32; ++ queue->saved_cmd_ptr = cmd_ptr; ++#endif ++ ++ KBASE_KTRACE_ADD_CSF_GRP_Q(stream->kbdev, QUEUE_SYNC_UPDATE_WAIT_STATUS, queue->group, ++ queue, status); ++ ++ if (CS_STATUS_WAIT_SYNC_WAIT_GET(status) || CS_STATUS_WAIT_SB_MASK_GET(status)) { + queue->status_wait = status; + queue->sync_ptr = kbase_csf_firmware_cs_output(stream, + CS_STATUS_WAIT_SYNC_POINTER_LO); @@ -170288,7 +189704,15 @@ index 000000000000..a3017a7f25ba + queue->sync_value = kbase_csf_firmware_cs_output(stream, + CS_STATUS_WAIT_SYNC_VALUE); + -+ if (!evaluate_sync_update(queue)) { ++ queue->sb_status = CS_STATUS_SCOREBOARDS_NONZERO_GET( ++ kbase_csf_firmware_cs_output(stream, ++ CS_STATUS_SCOREBOARDS)); ++ queue->blocked_reason = CS_STATUS_BLOCKED_REASON_REASON_GET( ++ kbase_csf_firmware_cs_output(stream, ++ CS_STATUS_BLOCKED_REASON)); ++ ++ if ((queue->blocked_reason == CS_STATUS_BLOCKED_ON_SB_WAIT) || ++ !evaluate_sync_update(queue)) { + is_waiting = true; + } else { + /* Sync object already got updated & met the condition @@ -170310,37 +189734,6 @@ index 000000000000..a3017a7f25ba + return is_waiting; +} + -+/** -+ * Calculate how far in the future an event should be scheduled. -+ * -+ * The objective of this function is making sure that a minimum period of -+ * time is guaranteed between handling two consecutive events. -+ * -+ * This function guarantees a minimum period of time between two consecutive -+ * events: given the minimum period and the distance between the current time -+ * and the last event, the function returns the difference between the two. -+ * However, if more time than the minimum period has already elapsed -+ * since the last event, the function will return 0 to schedule work to handle -+ * the event with the lowest latency possible. -+ * -+ * @last_event: Timestamp of the last event, in jiffies. -+ * @time_now: Timestamp of the new event to handle, in jiffies. -+ * Must be successive to last_event. -+ * @period: Minimum period between two events, in jiffies. -+ * -+ * Return: Time to delay work to handle the current event, in jiffies -+ */ -+static unsigned long get_schedule_delay(unsigned long last_event, -+ unsigned long time_now, -+ unsigned long period) -+{ -+ const unsigned long t_distance = time_now - last_event; -+ const unsigned long delay_t = (t_distance < period) ? -+ (period - t_distance) : 0; -+ -+ return delay_t; -+} -+ +static void schedule_in_cycle(struct kbase_queue_group *group, bool force) +{ + struct kbase_context *kctx = group->kctx; @@ -170355,15 +189748,48 @@ index 000000000000..a3017a7f25ba + * of work needs to be enforced in situation such as entering into + * protected mode). + */ -+ if ((likely(scheduler_timer_is_enabled_nolock(kbdev)) || force) && -+ !scheduler->tock_pending_request) { -+ const unsigned long delay = -+ get_schedule_delay(scheduler->last_schedule, jiffies, -+ CSF_SCHEDULER_TIME_TOCK_JIFFIES); -+ scheduler->tock_pending_request = true; ++ if (likely(scheduler_timer_is_enabled_nolock(kbdev)) || force) { + dev_dbg(kbdev->dev, "Kicking async for group %d\n", + group->handle); -+ mod_delayed_work(scheduler->wq, &scheduler->tock_work, delay); ++ kbase_csf_scheduler_invoke_tock(kbdev); ++ } ++} ++ ++static void ktrace_log_group_state(struct kbase_queue_group *const group) ++{ ++ switch (group->run_state) { ++ case KBASE_CSF_GROUP_INACTIVE: ++ KBASE_KTRACE_ADD_CSF_GRP(group->kctx->kbdev, CSF_GROUP_INACTIVE, group, ++ group->run_state); ++ break; ++ case KBASE_CSF_GROUP_RUNNABLE: ++ KBASE_KTRACE_ADD_CSF_GRP(group->kctx->kbdev, CSF_GROUP_RUNNABLE, group, ++ group->run_state); ++ break; ++ case KBASE_CSF_GROUP_IDLE: ++ KBASE_KTRACE_ADD_CSF_GRP(group->kctx->kbdev, CSF_GROUP_IDLE, group, ++ group->run_state); ++ break; ++ case KBASE_CSF_GROUP_SUSPENDED: ++ KBASE_KTRACE_ADD_CSF_GRP(group->kctx->kbdev, CSF_GROUP_SUSPENDED, group, ++ group->run_state); ++ break; ++ case KBASE_CSF_GROUP_SUSPENDED_ON_IDLE: ++ KBASE_KTRACE_ADD_CSF_GRP(group->kctx->kbdev, CSF_GROUP_SUSPENDED_ON_IDLE, group, ++ group->run_state); ++ break; ++ case KBASE_CSF_GROUP_SUSPENDED_ON_WAIT_SYNC: ++ KBASE_KTRACE_ADD_CSF_GRP(group->kctx->kbdev, CSF_GROUP_SUSPENDED_ON_WAIT_SYNC, ++ group, group->run_state); ++ break; ++ case KBASE_CSF_GROUP_FAULT_EVICTED: ++ KBASE_KTRACE_ADD_CSF_GRP(group->kctx->kbdev, CSF_GROUP_FAULT_EVICTED, group, ++ group->run_state); ++ break; ++ case KBASE_CSF_GROUP_TERMINATED: ++ KBASE_KTRACE_ADD_CSF_GRP(group->kctx->kbdev, CSF_GROUP_TERMINATED, group, ++ group->run_state); ++ break; + } +} + @@ -170379,33 +189805,39 @@ index 000000000000..a3017a7f25ba + + WARN_ON(group->run_state != KBASE_CSF_GROUP_INACTIVE); + -+ if (WARN_ON(group->priority >= BASE_QUEUE_GROUP_PRIORITY_COUNT)) ++ if (WARN_ON(group->priority >= KBASE_QUEUE_GROUP_PRIORITY_COUNT)) + return; + + group->run_state = run_state; + ++ ktrace_log_group_state(group); ++ + if (run_state == KBASE_CSF_GROUP_RUNNABLE) + group->prepared_seq_num = KBASEP_GROUP_PREPARED_SEQ_NUM_INVALID; + + list_add_tail(&group->link, + &kctx->csf.sched.runnable_groups[group->priority]); + kctx->csf.sched.num_runnable_grps++; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, GROUP_RUNNABLE_INSERT, group, ++ kctx->csf.sched.num_runnable_grps); ++ + /* Add the kctx if not yet in runnable kctxs */ + if (kctx->csf.sched.num_runnable_grps == 1) { + /* First runnable csg, adds to the runnable_kctxs */ + INIT_LIST_HEAD(&kctx->csf.link); + list_add_tail(&kctx->csf.link, &scheduler->runnable_kctxs); ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_RUNNABLE_KCTX_INSERT, kctx, 0u); + } + + scheduler->total_runnable_grps++; + + if (likely(scheduler_timer_is_enabled_nolock(kbdev)) && + (scheduler->total_runnable_grps == 1 || -+ scheduler->state == SCHED_SUSPENDED)) { ++ scheduler->state == SCHED_SUSPENDED || ++ scheduler->state == SCHED_SLEEPING)) { + dev_dbg(kbdev->dev, "Kicking scheduler on first runnable group\n"); + /* Fire a scheduling to start the time-slice */ -+ mod_delayed_work(kbdev->csf.scheduler.wq, -+ &kbdev->csf.scheduler.tick_work, 0); ++ enqueue_tick_work(kbdev); + } else + schedule_in_cycle(group, false); + @@ -170421,14 +189853,45 @@ index 000000000000..a3017a7f25ba + enum kbase_csf_group_state run_state) +{ + struct kbase_context *kctx = group->kctx; ++ struct kbase_queue_group *new_head_grp; ++ struct list_head *list = ++ &kctx->csf.sched.runnable_groups[group->priority]; ++ unsigned long flags; + + lockdep_assert_held(&scheduler->lock); + + WARN_ON(!queue_group_scheduled_locked(group)); + + group->run_state = run_state; ++ ++ ktrace_log_group_state(group); ++ + list_del_init(&group->link); + ++ spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++ /* The below condition will be true when the group running in protected ++ * mode is being terminated but the protected mode exit interrupt was't ++ * received. This can happen if the FW got stuck during protected mode ++ * for some reason (like GPU page fault or some internal error). ++ * In normal cases FW is expected to send the protected mode exit ++ * interrupt before it handles the CSG termination request. ++ */ ++ if (unlikely(scheduler->active_protm_grp == group)) { ++ /* CSG slot cleanup should have happened for the pmode group */ ++ WARN_ON(kbasep_csf_scheduler_group_is_on_slot_locked(group)); ++ WARN_ON(group->run_state != KBASE_CSF_GROUP_INACTIVE); ++ /* Initiate a GPU reset, in case it wasn't initiated yet, ++ * in order to rectify the anomaly. ++ */ ++ if (kbase_prepare_to_reset_gpu(kctx->kbdev, RESET_FLAGS_NONE)) ++ kbase_reset_gpu(kctx->kbdev); ++ ++ KBASE_KTRACE_ADD_CSF_GRP(kctx->kbdev, SCHEDULER_PROTM_EXIT, ++ scheduler->active_protm_grp, 0u); ++ scheduler->active_protm_grp = NULL; ++ } ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++ + if (scheduler->top_grp == group) { + /* + * Note: this disables explicit rotation in the next scheduling @@ -170453,20 +189916,35 @@ index 000000000000..a3017a7f25ba + } + + kctx->csf.sched.num_runnable_grps--; ++ KBASE_KTRACE_ADD_CSF_GRP(kctx->kbdev, GROUP_RUNNABLE_REMOVE, group, ++ kctx->csf.sched.num_runnable_grps); ++ new_head_grp = (!list_empty(list)) ? ++ list_first_entry(list, struct kbase_queue_group, link) : ++ NULL; ++ KBASE_KTRACE_ADD_CSF_GRP(kctx->kbdev, GROUP_RUNNABLE_HEAD, new_head_grp, 0u); ++ + if (kctx->csf.sched.num_runnable_grps == 0) { ++ struct kbase_context *new_head_kctx; ++ struct list_head *kctx_list = &scheduler->runnable_kctxs; + /* drop the kctx */ + list_del_init(&kctx->csf.link); + if (scheduler->top_ctx == kctx) + scheduler->top_ctx = NULL; ++ KBASE_KTRACE_ADD(kctx->kbdev, SCHEDULER_RUNNABLE_KCTX_REMOVE, kctx, 0u); ++ new_head_kctx = (!list_empty(kctx_list)) ? ++ list_first_entry(kctx_list, struct kbase_context, csf.link) : ++ NULL; ++ KBASE_KTRACE_ADD(kctx->kbdev, SCHEDULER_RUNNABLE_KCTX_HEAD, new_head_kctx, 0u); + } + + WARN_ON(scheduler->total_runnable_grps == 0); + scheduler->total_runnable_grps--; -+ if (!scheduler->total_runnable_grps && -+ scheduler->state != SCHED_SUSPENDED) { -+ dev_dbg(kctx->kbdev->dev, "Scheduler idle as no runnable groups"); -+ mod_delayed_work(system_wq, &scheduler->gpu_idle_work, -+ GPU_IDLE_POWEROFF_HYSTERESIS_DELAY); ++ if (!scheduler->total_runnable_grps) { ++ dev_dbg(kctx->kbdev->dev, "Scheduler idle has no runnable groups"); ++ cancel_tick_timer(kctx->kbdev); ++ WARN_ON(atomic_read(&scheduler->non_idle_offslot_grps)); ++ if (scheduler->state != SCHED_SUSPENDED) ++ enqueue_gpu_idle_work(scheduler); + } + KBASE_KTRACE_ADD_CSF_GRP(kctx->kbdev, SCHEDULER_TOP_GRP, scheduler->top_grp, + scheduler->num_active_address_spaces | @@ -170483,7 +189961,11 @@ index 000000000000..a3017a7f25ba + + list_add_tail(&group->link, &kctx->csf.sched.idle_wait_groups); + kctx->csf.sched.num_idle_wait_grps++; ++ KBASE_KTRACE_ADD_CSF_GRP(kctx->kbdev, GROUP_IDLE_WAIT_INSERT, group, ++ kctx->csf.sched.num_idle_wait_grps); + group->run_state = KBASE_CSF_GROUP_SUSPENDED_ON_WAIT_SYNC; ++ KBASE_KTRACE_ADD_CSF_GRP(kctx->kbdev, CSF_GROUP_SUSPENDED_ON_WAIT_SYNC, group, ++ group->run_state); + dev_dbg(kctx->kbdev->dev, + "Group-%d suspended on sync_wait, total wait_groups: %u\n", + group->handle, kctx->csf.sched.num_idle_wait_grps); @@ -170492,6 +189974,8 @@ index 000000000000..a3017a7f25ba +static void remove_group_from_idle_wait(struct kbase_queue_group *const group) +{ + struct kbase_context *kctx = group->kctx; ++ struct list_head *list = &kctx->csf.sched.idle_wait_groups; ++ struct kbase_queue_group *new_head_grp; + + lockdep_assert_held(&kctx->kbdev->csf.scheduler.lock); + @@ -170500,7 +189984,14 @@ index 000000000000..a3017a7f25ba + list_del_init(&group->link); + WARN_ON(kctx->csf.sched.num_idle_wait_grps == 0); + kctx->csf.sched.num_idle_wait_grps--; ++ KBASE_KTRACE_ADD_CSF_GRP(kctx->kbdev, GROUP_IDLE_WAIT_REMOVE, group, ++ kctx->csf.sched.num_idle_wait_grps); ++ new_head_grp = (!list_empty(list)) ? ++ list_first_entry(list, struct kbase_queue_group, link) : ++ NULL; ++ KBASE_KTRACE_ADD_CSF_GRP(kctx->kbdev, GROUP_IDLE_WAIT_HEAD, new_head_grp, 0u); + group->run_state = KBASE_CSF_GROUP_INACTIVE; ++ KBASE_KTRACE_ADD_CSF_GRP(kctx->kbdev, CSF_GROUP_INACTIVE, group, group->run_state); +} + +static void deschedule_idle_wait_group(struct kbase_csf_scheduler *scheduler, @@ -170515,13 +190006,106 @@ index 000000000000..a3017a7f25ba + insert_group_to_idle_wait(group); +} + -+static bool confirm_cs_idle(struct kbase_queue *queue) ++static void update_offslot_non_idle_cnt(struct kbase_queue_group *group) +{ -+ u64 *input_addr = (u64 *)queue->user_io_addr; -+ u64 *output_addr = (u64 *)(queue->user_io_addr + PAGE_SIZE); ++ struct kbase_device *kbdev = group->kctx->kbdev; ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ if (group->prepared_seq_num < scheduler->non_idle_scanout_grps) { ++ int new_val = ++ atomic_dec_return(&scheduler->non_idle_offslot_grps); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_NONIDLE_OFFSLOT_GRP_DEC, group, new_val); ++ } ++} ++ ++static void update_offslot_non_idle_cnt_for_onslot_grp(struct kbase_queue_group *group) ++{ ++ struct kbase_device *kbdev = group->kctx->kbdev; ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ WARN_ON(group->csg_nr < 0); + -+ return (input_addr[CS_INSERT_LO / sizeof(u64)] == -+ output_addr[CS_EXTRACT_LO / sizeof(u64)]); ++ if (group->prepared_seq_num < scheduler->non_idle_scanout_grps) { ++ int new_val = ++ atomic_dec_return(&scheduler->non_idle_offslot_grps); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_NONIDLE_OFFSLOT_GRP_DEC, group, new_val); ++ } ++} ++ ++static void update_offslot_non_idle_cnt_on_grp_suspend( ++ struct kbase_queue_group *group) ++{ ++ struct kbase_device *kbdev = group->kctx->kbdev; ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ if (scheduler->state == SCHED_BUSY) { ++ /* active phase or, async entering the protected mode */ ++ if (group->prepared_seq_num >= ++ scheduler->non_idle_scanout_grps) { ++ /* At scanout, it was tagged as on-slot idle */ ++ if (group->run_state == KBASE_CSF_GROUP_SUSPENDED) { ++ int new_val = atomic_inc_return( ++ &scheduler->non_idle_offslot_grps); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_NONIDLE_OFFSLOT_GRP_INC, ++ group, new_val); ++ } ++ } else { ++ if (group->run_state != KBASE_CSF_GROUP_SUSPENDED) { ++ int new_val = atomic_dec_return( ++ &scheduler->non_idle_offslot_grps); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_NONIDLE_OFFSLOT_GRP_DEC, ++ group, new_val); ++ } ++ } ++ } else { ++ /* async phases */ ++ if (group->run_state == KBASE_CSF_GROUP_SUSPENDED) { ++ int new_val = atomic_inc_return( ++ &scheduler->non_idle_offslot_grps); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_NONIDLE_OFFSLOT_GRP_INC, group, ++ new_val); ++ } ++ } ++} ++ ++static bool confirm_cmd_buf_empty(struct kbase_queue const *queue) ++{ ++ bool cs_empty; ++ bool cs_idle; ++ u32 sb_status = 0; ++ ++ struct kbase_device const *const kbdev = queue->group->kctx->kbdev; ++ struct kbase_csf_global_iface const *const iface = ++ &kbdev->csf.global_iface; ++ ++ u32 glb_version = iface->version; ++ ++ u64 const *input_addr = (u64 const *)queue->user_io_addr; ++ u64 const *output_addr = (u64 const *)(queue->user_io_addr + PAGE_SIZE); ++ ++ if (glb_version >= kbase_csf_interface_version(1, 0, 0)) { ++ /* CS_STATUS_SCOREBOARD supported from CSF 1.0 */ ++ struct kbase_csf_cmd_stream_group_info const *const ginfo = ++ &kbdev->csf.global_iface.groups[queue->group->csg_nr]; ++ struct kbase_csf_cmd_stream_info const *const stream = ++ &ginfo->streams[queue->csi_index]; ++ ++ sb_status = CS_STATUS_SCOREBOARDS_NONZERO_GET( ++ kbase_csf_firmware_cs_output(stream, ++ CS_STATUS_SCOREBOARDS)); ++ } ++ ++ cs_empty = (input_addr[CS_INSERT_LO / sizeof(u64)] == ++ output_addr[CS_EXTRACT_LO / sizeof(u64)]); ++ cs_idle = cs_empty && (!sb_status); ++ ++ return cs_idle; +} + +static void save_csg_slot(struct kbase_queue_group *group) @@ -170543,48 +190127,67 @@ index 000000000000..a3017a7f25ba + + if (!WARN_ON((state != CSG_ACK_STATE_SUSPEND) && + (state != CSG_ACK_STATE_TERMINATE))) { -+ int i; -+ -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+ for (i = 0; i < MAX_SUPPORTED_STREAMS_PER_GROUP; i++) ++ u32 max_streams = ginfo->stream_num; ++ u32 i; ++ bool sync_wait = false; ++ bool idle = kbase_csf_firmware_csg_output(ginfo, CSG_STATUS_STATE) & ++ CSG_STATUS_STATE_IDLE_MASK; ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ for (i = 0; i < max_streams; i++) + update_hw_active(group->bound_queues[i], false); -+#endif -+ if (group->run_state == KBASE_CSF_GROUP_IDLE) { -+ bool sync_wait = false; -+ bool idle = true; -+ -+ /* Loop through all bound CSs & save their context */ -+ for (i = 0; i < MAX_SUPPORTED_STREAMS_PER_GROUP; i++) { -+ struct kbase_queue *const queue = ++#endif /* CONFIG_MALI_BIFROST_NO_MALI */ ++ for (i = 0; idle && i < max_streams; i++) { ++ struct kbase_queue *const queue = + group->bound_queues[i]; + -+ if (queue && queue->enabled) { -+ if (save_slot_cs(ginfo, queue)) -+ sync_wait = true; -+ else if (idle) -+ idle = confirm_cs_idle(queue); -+ } ++ if (!queue || !queue->enabled) ++ continue; ++ ++ if (save_slot_cs(ginfo, queue)) { ++ /* sync_wait is only true if the queue is blocked on ++ * a CQS and not a scoreboard. ++ */ ++ if (queue->blocked_reason != ++ CS_STATUS_BLOCKED_ON_SB_WAIT) ++ sync_wait = true; ++ } else { ++ /* Need to confirm if ringbuffer of the GPU ++ * queue is empty or not. A race can arise ++ * between the flush of GPU queue and suspend ++ * of CSG. If a queue is flushed after FW has ++ * set the IDLE bit in CSG_STATUS_STATE, then ++ * Scheduler will incorrectly consider CSG ++ * as idle. And there may not be any further ++ * flush call for the GPU queue, which would ++ * have de-idled the CSG. ++ */ ++ idle = confirm_cmd_buf_empty(queue); + } ++ } + ++ if (idle) { + /* Take the suspended group out of the runnable_groups + * list of the context and move it to the + * idle_wait_groups list. + */ -+ if (sync_wait && idle) ++ if (sync_wait) + deschedule_idle_wait_group(scheduler, group); -+ else if (idle) { ++ else { + group->run_state = + KBASE_CSF_GROUP_SUSPENDED_ON_IDLE; -+ dev_dbg(kbdev->dev, "Group-%d suspended: idle\n", ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSF_GROUP_SUSPENDED_ON_IDLE, group, ++ group->run_state); ++ dev_dbg(kbdev->dev, "Group-%d suspended: idle", + group->handle); -+ } else { -+ group->run_state = KBASE_CSF_GROUP_SUSPENDED; -+ atomic_inc(&scheduler->non_idle_suspended_grps); + } + } else { + group->run_state = KBASE_CSF_GROUP_SUSPENDED; -+ atomic_inc(&scheduler->non_idle_suspended_grps); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSF_GROUP_SUSPENDED, group, ++ group->run_state); + } ++ ++ update_offslot_non_idle_cnt_on_grp_suspend(group); ++ kbase_csf_tiler_heap_reclaim_sched_notify_grp_suspend(group); + } +} + @@ -170642,8 +190245,11 @@ index 000000000000..a3017a7f25ba + /* now marking the slot is vacant */ + spin_lock_irqsave(&kbdev->csf.scheduler.interrupt_lock, flags); + kbdev->csf.scheduler.csg_slots[slot].resident_group = NULL; -+ group->csg_nr = KBASEP_CSG_NR_INVALID; + clear_bit(slot, kbdev->csf.scheduler.csg_slots_idle_mask); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_SLOT_IDLE_CLEAR, group, ++ kbdev->csf.scheduler.csg_slots_idle_mask[0]); ++ ++ group->csg_nr = KBASEP_CSG_NR_INVALID; + set_bit(slot, kbdev->csf.scheduler.csgs_events_enable_mask); + clear_bit(slot, kbdev->csf.scheduler.csg_inuse_bitmap); + spin_unlock_irqrestore(&kbdev->csf.scheduler.interrupt_lock, flags); @@ -170658,6 +190264,11 @@ index 000000000000..a3017a7f25ba + KBASE_TLSTREAM_TL_KBASE_DEVICE_DEPROGRAM_CSG(kbdev, + kbdev->gpu_props.props.raw_props.gpu_id, slot); + ++ /* Notify the group is off-slot and the csg_reg might be available for ++ * resue with other groups in a 'lazy unbinding' style. ++ */ ++ kbase_csf_mcu_shared_set_group_csg_reg_unused(kbdev, group); ++ + return as_fault; +} + @@ -170681,10 +190292,14 @@ index 000000000000..a3017a7f25ba + csg_slot = &kbdev->csf.scheduler.csg_slots[slot]; + ginfo = &kbdev->csf.global_iface.groups[slot]; + ++ /* CSGs remaining on-slot can be either idle or runnable. ++ * This also applies in protected mode. ++ */ + WARN_ON(!((group->run_state == KBASE_CSF_GROUP_RUNNABLE) || + (group->run_state == KBASE_CSF_GROUP_IDLE))); + -+ group->run_state = KBASE_CSF_GROUP_RUNNABLE; ++ /* Update consumes a group from scanout */ ++ update_offslot_non_idle_cnt_for_onslot_grp(group); + + if (csg_slot->priority == prio) + return; @@ -170697,9 +190312,10 @@ index 000000000000..a3017a7f25ba + + spin_lock_irqsave(&kbdev->csf.scheduler.interrupt_lock, flags); + csg_req = kbase_csf_firmware_csg_output(ginfo, CSG_ACK); -+ csg_req ^= CSG_REQ_EP_CFG; ++ csg_req ^= CSG_REQ_EP_CFG_MASK; + kbase_csf_firmware_csg_input_mask(ginfo, CSG_REQ, csg_req, -+ CSG_REQ_EP_CFG); ++ CSG_REQ_EP_CFG_MASK); ++ kbase_csf_ring_csg_doorbell(kbdev, slot); + spin_unlock_irqrestore(&kbdev->csf.scheduler.interrupt_lock, flags); + + csg_slot->priority = prio; @@ -170708,9 +190324,8 @@ index 000000000000..a3017a7f25ba + group->handle, group->kctx->tgid, group->kctx->id, slot, + prev_prio, prio); + -+ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_PRIO_UPDATE, group, prev_prio); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_SLOT_PRIO_UPDATE, group, prev_prio); + -+ kbase_csf_ring_csg_doorbell(kbdev, slot); + set_bit(slot, kbdev->csf.scheduler.csg_slots_prio_update); +} + @@ -170737,8 +190352,8 @@ index 000000000000..a3017a7f25ba + u32 state; + int i; + unsigned long flags; -+ const u64 normal_suspend_buf = -+ group->normal_suspend_buf.reg->start_pfn << PAGE_SHIFT; ++ u64 normal_suspend_buf; ++ u64 protm_suspend_buf; + struct kbase_csf_csg_slot *csg_slot = + &kbdev->csf.scheduler.csg_slots[slot]; + @@ -170750,6 +190365,19 @@ index 000000000000..a3017a7f25ba + + WARN_ON(atomic_read(&csg_slot->state) != CSG_SLOT_READY); + ++ if (unlikely(kbase_csf_mcu_shared_group_bind_csg_reg(kbdev, group))) { ++ dev_warn(kbdev->dev, ++ "Couldn't bind MCU shared csg_reg for group %d of context %d_%d, slot=%u", ++ group->handle, group->kctx->tgid, kctx->id, slot); ++ kbase_csf_mcu_shared_set_group_csg_reg_unused(kbdev, group); ++ return; ++ } ++ ++ /* The suspend buf has already been mapped through binding to csg_reg */ ++ normal_suspend_buf = group->normal_suspend_buf.gpu_va; ++ protm_suspend_buf = group->protected_suspend_buf.gpu_va; ++ WARN_ONCE(!normal_suspend_buf, "Normal suspend buffer not mapped"); ++ + ginfo = &global_iface->groups[slot]; + + /* Pick an available address space for this context */ @@ -170761,7 +190389,8 @@ index 000000000000..a3017a7f25ba + + if (kctx->as_nr == KBASEP_AS_NR_INVALID) { + dev_dbg(kbdev->dev, "Could not get a valid AS for group %d of context %d_%d on slot %d\n", -+ group->handle, kctx->tgid, kctx->id, slot); ++ group->handle, kctx->tgid, kctx->id, slot); ++ kbase_csf_mcu_shared_set_group_csg_reg_unused(kbdev, group); + return; + } + @@ -170778,7 +190407,7 @@ index 000000000000..a3017a7f25ba + struct kbase_queue *queue = group->bound_queues[i]; + + if (queue) -+ program_cs(kbdev, queue); ++ program_cs(kbdev, queue, false); + } + + @@ -170794,6 +190423,10 @@ index 000000000000..a3017a7f25ba + kbase_csf_firmware_csg_input(ginfo, CSG_ALLOW_OTHER, + tiler_mask & U32_MAX); + ++ /* Register group UID with firmware */ ++ kbase_csf_firmware_csg_input(ginfo, CSG_ITER_TRACE_CONFIG, ++ group->group_uid); ++ + ep_cfg = CSG_EP_REQ_COMPUTE_EP_SET(ep_cfg, compute_max); + ep_cfg = CSG_EP_REQ_FRAGMENT_EP_SET(ep_cfg, fragment_max); + ep_cfg = CSG_EP_REQ_TILER_EP_SET(ep_cfg, tiler_max); @@ -170808,14 +190441,21 @@ index 000000000000..a3017a7f25ba + kbase_csf_firmware_csg_input(ginfo, CSG_SUSPEND_BUF_HI, + normal_suspend_buf >> 32); + -+ if (group->protected_suspend_buf.reg) { -+ const u64 protm_suspend_buf = -+ group->protected_suspend_buf.reg->start_pfn << -+ PAGE_SHIFT; -+ kbase_csf_firmware_csg_input(ginfo, CSG_PROTM_SUSPEND_BUF_LO, -+ protm_suspend_buf & U32_MAX); -+ kbase_csf_firmware_csg_input(ginfo, CSG_PROTM_SUSPEND_BUF_HI, -+ protm_suspend_buf >> 32); ++ /* Note, we program the P-mode buffer pointer here, but actual runtime ++ * enter into pmode execution is controlled by the P-mode phy pages are ++ * allocated and mapped with the bound csg_reg, which has a specific flag ++ * for indicating this P-mode runnable condition before a group is ++ * granted its p-mode section entry. Without a P-mode entry, the buffer ++ * pointed is not going to be accessed at all. ++ */ ++ kbase_csf_firmware_csg_input(ginfo, CSG_PROTM_SUSPEND_BUF_LO, protm_suspend_buf & U32_MAX); ++ kbase_csf_firmware_csg_input(ginfo, CSG_PROTM_SUSPEND_BUF_HI, protm_suspend_buf >> 32); ++ ++ if (group->dvs_buf) { ++ kbase_csf_firmware_csg_input(ginfo, CSG_DVS_BUF_LO, ++ group->dvs_buf & U32_MAX); ++ kbase_csf_firmware_csg_input(ginfo, CSG_DVS_BUF_HI, ++ group->dvs_buf >> 32); + } + + /* Enable all interrupts for now */ @@ -170823,16 +190463,13 @@ index 000000000000..a3017a7f25ba + + spin_lock_irqsave(&kbdev->csf.scheduler.interrupt_lock, flags); + csg_req = kbase_csf_firmware_csg_output(ginfo, CSG_ACK); -+ csg_req ^= CSG_REQ_EP_CFG; ++ csg_req ^= CSG_REQ_EP_CFG_MASK; + kbase_csf_firmware_csg_input_mask(ginfo, CSG_REQ, csg_req, -+ CSG_REQ_EP_CFG); ++ CSG_REQ_EP_CFG_MASK); + + /* Set state to START/RESUME */ + if (queue_group_suspended_locked(group)) { + state = CSG_REQ_STATE_RESUME; -+ if (group->run_state == KBASE_CSF_GROUP_SUSPENDED) -+ atomic_dec( -+ &kbdev->csf.scheduler.non_idle_suspended_grps); + } else { + WARN_ON(group->run_state != KBASE_CSF_GROUP_RUNNABLE); + state = CSG_REQ_STATE_START; @@ -170840,6 +190477,7 @@ index 000000000000..a3017a7f25ba + + kbase_csf_firmware_csg_input_mask(ginfo, CSG_REQ, + state, CSG_REQ_STATE_MASK); ++ kbase_csf_ring_csg_doorbell(kbdev, slot); + spin_unlock_irqrestore(&kbdev->csf.scheduler.interrupt_lock, flags); + + /* Update status before rings the door-bell, marking ready => run */ @@ -170848,18 +190486,25 @@ index 000000000000..a3017a7f25ba + csg_slot->priority = prio; + + /* Trace the programming of the CSG on the slot */ -+ KBASE_TLSTREAM_TL_KBASE_DEVICE_PROGRAM_CSG(kbdev, -+ kbdev->gpu_props.props.raw_props.gpu_id, group->handle, slot); ++ KBASE_TLSTREAM_TL_KBASE_DEVICE_PROGRAM_CSG( ++ kbdev, kbdev->gpu_props.props.raw_props.gpu_id, group->kctx->id, ++ group->handle, slot, (state == CSG_REQ_STATE_RESUME) ? 1 : 0); + + dev_dbg(kbdev->dev, "Starting group %d of context %d_%d on slot %d with priority %u\n", + group->handle, kctx->tgid, kctx->id, slot, prio); + -+ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_SLOT_START, group, -+ (((u64)ep_cfg) << 32) | -+ ((((u32)kctx->as_nr) & 0xF) << 16) | -+ (state & (CSG_REQ_STATE_MASK >> CS_REQ_STATE_SHIFT))); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_SLOT_START_REQ, group, ++ (((u64)ep_cfg) << 32) | ((((u32)kctx->as_nr) & 0xF) << 16) | ++ (state & (CSG_REQ_STATE_MASK >> CS_REQ_STATE_SHIFT))); + -+ kbase_csf_ring_csg_doorbell(kbdev, slot); ++ /* Update the heap reclaim manager */ ++ kbase_csf_tiler_heap_reclaim_sched_notify_grp_active(group); ++ ++ /* Programming a slot consumes a group from scanout */ ++ update_offslot_non_idle_cnt_for_onslot_grp(group); ++ ++ /* Notify the group's bound csg_reg is now in active use */ ++ kbase_csf_mcu_shared_set_group_csg_reg_active(kbdev, group); +} + +static void remove_scheduled_group(struct kbase_device *kbdev, @@ -170879,7 +190524,8 @@ index 000000000000..a3017a7f25ba + group->kctx->csf.sched.ngrp_to_schedule--; +} + -+static void sched_evict_group(struct kbase_queue_group *group, bool fault) ++static void sched_evict_group(struct kbase_queue_group *group, bool fault, ++ bool update_non_idle_offslot_grps_cnt_from_run_state) +{ + struct kbase_context *kctx = group->kctx; + struct kbase_device *kbdev = kctx->kbdev; @@ -170890,8 +190536,14 @@ index 000000000000..a3017a7f25ba + if (queue_group_scheduled_locked(group)) { + u32 i; + -+ if (group->run_state == KBASE_CSF_GROUP_SUSPENDED) -+ atomic_dec(&scheduler->non_idle_suspended_grps); ++ if (update_non_idle_offslot_grps_cnt_from_run_state && ++ (group->run_state == KBASE_CSF_GROUP_SUSPENDED || ++ group->run_state == KBASE_CSF_GROUP_RUNNABLE)) { ++ int new_val = atomic_dec_return( ++ &scheduler->non_idle_offslot_grps); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_NONIDLE_OFFSLOT_GRP_DEC, group, ++ new_val); ++ } + + for (i = 0; i < MAX_SUPPORTED_STREAMS_PER_GROUP; i++) { + if (group->bound_queues[i]) @@ -170899,8 +190551,11 @@ index 000000000000..a3017a7f25ba + } + + if (group->prepared_seq_num != -+ KBASEP_GROUP_PREPARED_SEQ_NUM_INVALID) ++ KBASEP_GROUP_PREPARED_SEQ_NUM_INVALID) { ++ if (!update_non_idle_offslot_grps_cnt_from_run_state) ++ update_offslot_non_idle_cnt(group); + remove_scheduled_group(kbdev, group); ++ } + + if (group->run_state == KBASE_CSF_GROUP_SUSPENDED_ON_WAIT_SYNC) + remove_group_from_idle_wait(group); @@ -170911,36 +190566,53 @@ index 000000000000..a3017a7f25ba + + WARN_ON(group->run_state != KBASE_CSF_GROUP_INACTIVE); + -+ if (fault) ++ if (fault) { + group->run_state = KBASE_CSF_GROUP_FAULT_EVICTED; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSF_GROUP_FAULT_EVICTED, group, ++ scheduler->total_runnable_grps); ++ } + -+ KBASE_KTRACE_ADD_CSF_GRP(kbdev, GROUP_EVICT_SCHED, group, -+ (((u64)scheduler->total_runnable_grps) << 32) | -+ ((u32)group->run_state)); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, GROUP_EVICT, group, ++ (((u64)scheduler->total_runnable_grps) << 32) | ++ ((u32)group->run_state)); + dev_dbg(kbdev->dev, "group %d exited scheduler, num_runnable_grps %d\n", + group->handle, scheduler->total_runnable_grps); + /* Notify a group has been evicted */ + wake_up_all(&kbdev->csf.event_wait); + } ++ ++ kbase_csf_tiler_heap_reclaim_sched_notify_grp_evict(group); ++ ++ /* Clear all the bound shared regions and unmap any in-place MMU maps */ ++ kbase_csf_mcu_shared_clear_evicted_group_csg_reg(kbdev, group); +} + +static int term_group_sync(struct kbase_queue_group *group) +{ + struct kbase_device *kbdev = group->kctx->kbdev; -+ long remaining = -+ kbase_csf_timeout_in_jiffies(CSF_STATE_WAIT_TIMEOUT_MS); ++ long remaining = kbase_csf_timeout_in_jiffies(kbdev->csf.fw_timeout_ms); + int err = 0; + + term_csg_slot(group); + + remaining = wait_event_timeout(kbdev->csf.event_wait, -+ csg_slot_stopped_locked(kbdev, group->csg_nr), remaining); -+ -+ if (!remaining) { -+ dev_warn(kbdev->dev, "term request timed out for group %d on slot %d", -+ group->handle, group->csg_nr); -+ if (kbase_prepare_to_reset_gpu(kbdev)) ++ group->cs_unrecoverable || csg_slot_stopped_locked(kbdev, group->csg_nr), ++ remaining); ++ ++ if (unlikely(!remaining)) { ++ enum dumpfault_error_type error_type = DF_CSG_TERMINATE_TIMEOUT; ++ ++ dev_warn(kbdev->dev, "[%llu] term request timeout (%d ms) for group %d of context %d_%d on slot %d", ++ kbase_backend_get_cycle_cnt(kbdev), kbdev->csf.fw_timeout_ms, ++ group->handle, group->kctx->tgid, ++ group->kctx->id, group->csg_nr); ++ if (kbase_csf_firmware_ping_wait(kbdev, FW_PING_AFTER_ERROR_TIMEOUT_MS)) ++ error_type = DF_PING_REQUEST_TIMEOUT; ++ kbase_debug_csf_fault_notify(kbdev, group->kctx, error_type); ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_NONE)) + kbase_reset_gpu(kbdev); ++ ++ + err = -ETIMEDOUT; + } + @@ -170951,47 +190623,65 @@ index 000000000000..a3017a7f25ba +{ + struct kbase_device *kbdev = group->kctx->kbdev; + struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; -+ long remaining = -+ kbase_csf_timeout_in_jiffies(CSG_SCHED_STOP_TIMEOUT_MS); -+ bool force = false; ++ bool wait_for_termination = true; ++ bool on_slot; + ++ kbase_reset_gpu_assert_failed_or_prevented(kbdev); + lockdep_assert_held(&group->kctx->csf.lock); + mutex_lock(&scheduler->lock); + + KBASE_KTRACE_ADD_CSF_GRP(kbdev, GROUP_DESCHEDULE, group, group->run_state); -+ while (queue_group_scheduled_locked(group)) { -+ u32 saved_state = scheduler->state; -+ bool reset = kbase_reset_gpu_is_active(kbdev); -+ -+ if (!kbasep_csf_scheduler_group_is_on_slot_locked(group)) { -+ sched_evict_group(group, false); -+ } else if (reset || saved_state == SCHED_INACTIVE || force) { -+ bool as_faulty; -+ -+ if (!reset) -+ term_group_sync(group); -+ /* Treat the csg been terminated */ -+ as_faulty = cleanup_csg_slot(group); -+ /* remove from the scheduler list */ -+ sched_evict_group(group, as_faulty); -+ } -+ -+ /* waiting scheduler state to change */ -+ if (queue_group_scheduled_locked(group)) { -+ mutex_unlock(&scheduler->lock); -+ remaining = wait_event_timeout( -+ kbdev->csf.event_wait, -+ saved_state != scheduler->state, -+ remaining); -+ if (!remaining) { -+ dev_warn(kbdev->dev, "Scheduler state change wait timed out for group %d on slot %d", -+ group->handle, group->csg_nr); -+ force = true; -+ } -+ mutex_lock(&scheduler->lock); ++ wait_for_dump_complete_on_group_deschedule(group); ++ if (!queue_group_scheduled_locked(group)) ++ goto unlock; ++ ++ on_slot = kbasep_csf_scheduler_group_is_on_slot_locked(group); ++ ++#ifdef KBASE_PM_RUNTIME ++ /* If the queue group is on slot and Scheduler is in SLEEPING state, ++ * then we need to wake up the Scheduler to exit the sleep state rather ++ * than waiting for the runtime suspend or power down of GPU. ++ * The group termination is usually triggered in the context of Application ++ * thread and it has been seen that certain Apps can destroy groups at ++ * random points and not necessarily when the App is exiting. ++ */ ++ if (on_slot && (scheduler->state == SCHED_SLEEPING)) { ++ scheduler_wakeup(kbdev, true); ++ ++ /* Wait for MCU firmware to start running */ ++ if (kbase_csf_scheduler_wait_mcu_active(kbdev)) { ++ dev_warn( ++ kbdev->dev, ++ "[%llu] Wait for MCU active failed when terminating group %d of context %d_%d on slot %d", ++ kbase_backend_get_cycle_cnt(kbdev), ++ group->handle, group->kctx->tgid, ++ group->kctx->id, group->csg_nr); ++ /* No point in waiting for CSG termination if MCU didn't ++ * become active. ++ */ ++ wait_for_termination = false; + } + } ++#endif ++ if (!on_slot) { ++ sched_evict_group(group, false, true); ++ } else { ++ bool as_faulty; ++ ++ if (likely(wait_for_termination)) ++ term_group_sync(group); ++ else ++ term_csg_slot(group); ++ ++ /* Treat the csg been terminated */ ++ as_faulty = cleanup_csg_slot(group); ++ /* remove from the scheduler list */ ++ sched_evict_group(group, as_faulty, false); ++ } + ++ WARN_ON(queue_group_scheduled_locked(group)); ++ ++unlock: + mutex_unlock(&scheduler->lock); +} + @@ -171009,9 +190699,10 @@ index 000000000000..a3017a7f25ba +{ + struct kbase_context *kctx = group->kctx; + struct kbase_device *kbdev = kctx->kbdev; ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; + + lockdep_assert_held(&kctx->csf.lock); -+ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ lockdep_assert_held(&scheduler->lock); + + KBASE_KTRACE_ADD_CSF_GRP(kbdev, GROUP_SCHEDULE, group, group->run_state); + if (group->run_state == KBASE_CSF_GROUP_SUSPENDED_ON_WAIT_SYNC) @@ -171022,11 +190713,55 @@ index 000000000000..a3017a7f25ba + + if (group->run_state == KBASE_CSF_GROUP_SUSPENDED_ON_IDLE) + update_idle_suspended_group_state(group); -+ else ++ else { ++ struct kbase_queue_group *protm_grp; ++ unsigned long flags; ++ ++ WARN_ON(!kbasep_csf_scheduler_group_is_on_slot_locked( ++ group)); ++ + group->run_state = KBASE_CSF_GROUP_RUNNABLE; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSF_GROUP_RUNNABLE, group, ++ group->run_state); ++ ++ /* A normal mode CSG could be idle onslot during ++ * protected mode. In this case clear the ++ * appropriate bit in csg_slots_idle_mask. ++ */ ++ spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++ protm_grp = scheduler->active_protm_grp; ++ if (protm_grp && protm_grp != group) { ++ clear_bit((unsigned int)group->csg_nr, ++ scheduler->csg_slots_idle_mask); ++ /* Request the update to confirm the condition inferred. */ ++ group->reevaluate_idle_status = true; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_SLOT_IDLE_CLEAR, group, ++ scheduler->csg_slots_idle_mask[0]); ++ } ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, ++ flags); ++ ++ /* If GPU is in protected mode then any doorbells rang ++ * would have no effect. Check if GPU is in protected ++ * mode and if this group has higher priority than the ++ * active protected mode group. If so prompt the FW ++ * to exit protected mode. ++ */ ++ if (protm_grp && ++ group->scan_seq_num < protm_grp->scan_seq_num) { ++ /* Prompt the FW to exit protected mode */ ++ scheduler_force_protm_exit(kbdev); ++ } ++ } + } else if (!queue_group_scheduled_locked(group)) { ++ int new_val; ++ + insert_group_to_runnable(&kbdev->csf.scheduler, group, + KBASE_CSF_GROUP_RUNNABLE); ++ /* A new group into the scheduler */ ++ new_val = atomic_inc_return( ++ &kbdev->csf.scheduler.non_idle_offslot_grps); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_NONIDLE_OFFSLOT_GRP_INC, group, new_val); + } + + /* Since a group has become active now, check if GPU needs to be @@ -171038,21 +190773,22 @@ index 000000000000..a3017a7f25ba +} + +/** -+ * set_max_csg_slots() - Set the number of available command stream group slots ++ * set_max_csg_slots() - Set the number of available CSG slots + * + * @kbdev: Pointer of the GPU device. + * -+ * This function would set/limit the number of command stream group slots that -+ * can be used in the given tick/tock. It would be less than the total command -+ * stream group slots supported by firmware if the number of GPU address space -+ * slots required to utilize all the CSG slots is more than the available ++ * This function would set/limit the number of CSG slots that ++ * can be used in the given tick/tock. It would be less than the total CSG ++ * slots supported by firmware if the number of GPU address space slots ++ * required to utilize all the CSG slots is more than the available + * address space slots. + */ +static inline void set_max_csg_slots(struct kbase_device *kbdev) +{ + struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; + unsigned int total_csg_slots = kbdev->csf.global_iface.group_num; -+ unsigned int max_address_space_slots = kbdev->nr_hw_address_spaces - 1; ++ unsigned int max_address_space_slots = ++ kbdev->nr_hw_address_spaces - NUM_RESERVED_AS_SLOTS; + + WARN_ON(scheduler->num_active_address_spaces > total_csg_slots); + @@ -171068,7 +190804,7 @@ index 000000000000..a3017a7f25ba + * @kctx: Pointer of the Kbase context. + * + * This function would update the counter that is tracking the number of GPU -+ * address space slots that would be required to program the command stream ++ * address space slots that would be required to program the CS + * group slots from the groups at the head of groups_to_schedule list. + */ +static inline void count_active_address_space(struct kbase_device *kbdev, @@ -171076,17 +190812,78 @@ index 000000000000..a3017a7f25ba +{ + struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; + unsigned int total_csg_slots = kbdev->csf.global_iface.group_num; -+ unsigned int max_address_space_slots = kbdev->nr_hw_address_spaces - 1; ++ unsigned int max_address_space_slots = ++ kbdev->nr_hw_address_spaces - NUM_RESERVED_AS_SLOTS; + + if (scheduler->ngrp_to_schedule <= total_csg_slots) { -+ if (kctx->csf.sched.ngrp_to_schedule == 1) { ++ if (kctx->csf.sched.ngrp_to_schedule == 1) + scheduler->num_active_address_spaces++; + -+ if (scheduler->num_active_address_spaces <= -+ max_address_space_slots) -+ scheduler->num_csg_slots_for_tick++; -+ } ++ if (scheduler->num_active_address_spaces <= ++ max_address_space_slots) ++ scheduler->num_csg_slots_for_tick++; ++ } ++} ++ ++/* Two schemes are used in assigning the priority to CSG slots for a given ++ * CSG from the 'groups_to_schedule' list. ++ * This is needed as an idle on-slot group is deprioritized by moving it to ++ * the tail of 'groups_to_schedule' list. As a result it can either get ++ * evicted from the CSG slot in current tick/tock dealing, or its position ++ * can be after the lower priority non-idle groups in the 'groups_to_schedule' ++ * list. The latter case can result in the on-slot subset containing both ++ * non-idle and idle CSGs, and is handled through the 2nd scheme described ++ * below. ++ * ++ * First scheme :- If all the slots are going to be occupied by the non-idle or ++ * idle groups, then a simple assignment of the priority is done as per the ++ * position of a group in the 'groups_to_schedule' list. So maximum priority ++ * gets assigned to the slot of a group which is at the head of the list. ++ * Here the 'groups_to_schedule' list would effectively be ordered as per the ++ * static priority of groups. ++ * ++ * Second scheme :- If the slots are going to be occupied by a mix of idle and ++ * non-idle groups then the priority assignment needs to ensure that the ++ * priority of a slot belonging to a higher priority idle group will always be ++ * greater than the priority of a slot belonging to a lower priority non-idle ++ * group, reflecting the original position of a group in the scan order (i.e ++ * static priority) 'scan_seq_num', which is set during the prepare phase of a ++ * tick/tock before the group is moved to 'idle_groups_to_schedule' list if it ++ * is idle. ++ * The priority range [MAX_CSG_SLOT_PRIORITY, 0] is partitioned with the first ++ * 'slots_for_tick' groups in the original scan order are assigned a priority in ++ * the subrange [MAX_CSG_SLOT_PRIORITY, MAX_CSG_SLOT_PRIORITY - slots_for_tick), ++ * whereas rest of the groups are assigned the priority in the subrange ++ * [MAX_CSG_SLOT_PRIORITY - slots_for_tick, 0]. This way even if an idle higher ++ * priority group ends up after the non-idle lower priority groups in the ++ * 'groups_to_schedule' list, it will get a higher slot priority. And this will ++ * enable the FW to quickly start the execution of higher priority group when it ++ * gets de-idled. ++ */ ++static u8 get_slot_priority(struct kbase_queue_group *group) ++{ ++ struct kbase_csf_scheduler *scheduler = ++ &group->kctx->kbdev->csf.scheduler; ++ u8 slot_prio; ++ u32 slots_for_tick = scheduler->num_csg_slots_for_tick; ++ u32 used_slots = slots_for_tick - scheduler->remaining_tick_slots; ++ /* Check if all the slots are going to be occupied by the non-idle or ++ * idle groups. ++ */ ++ if (scheduler->non_idle_scanout_grps >= slots_for_tick || ++ !scheduler->non_idle_scanout_grps) { ++ slot_prio = (u8)(MAX_CSG_SLOT_PRIORITY - used_slots); ++ } else { ++ /* There will be a mix of idle and non-idle groups. */ ++ if (group->scan_seq_num < slots_for_tick) ++ slot_prio = (u8)(MAX_CSG_SLOT_PRIORITY - ++ group->scan_seq_num); ++ else if (MAX_CSG_SLOT_PRIORITY > (slots_for_tick + used_slots)) ++ slot_prio = (u8)(MAX_CSG_SLOT_PRIORITY - (slots_for_tick + used_slots)); ++ else ++ slot_prio = 0; + } ++ return slot_prio; +} + +/** @@ -171098,7 +190895,7 @@ index 000000000000..a3017a7f25ba + * that are at the head of groups_to_schedule list, preceding the first + * non-resident group. + * -+ * This function will also adjust kbase_csf_scheduler.head_slot_priority on ++ * This function will also adjust kbase_csf_scheduler.remaining_tick_slots on + * the priority update. + */ +static void update_resident_groups_priority(struct kbase_device *kbdev) @@ -171119,11 +190916,11 @@ index 000000000000..a3017a7f25ba + break; + + update_csg_slot_priority(group, -+ scheduler->head_slot_priority); ++ get_slot_priority(group)); + + /* Drop the head group from the list */ + remove_scheduled_group(kbdev, group); -+ scheduler->head_slot_priority--; ++ scheduler->remaining_tick_slots--; + } +} + @@ -171131,14 +190928,14 @@ index 000000000000..a3017a7f25ba + * program_group_on_vacant_csg_slot() - Program a non-resident group on the + * given vacant CSG slot. + * @kbdev: Pointer to the GPU device. -+ * @slot: Vacant command stream group slot number. ++ * @slot: Vacant CSG slot number. + * + * This function will program a non-resident group at the head of -+ * kbase_csf_scheduler.groups_to_schedule list on the given vacant command -+ * stream group slot, provided the initial position of the non-resident ++ * kbase_csf_scheduler.groups_to_schedule list on the given vacant ++ * CSG slot, provided the initial position of the non-resident + * group in the list is less than the number of CSG slots and there is + * an available GPU address space slot. -+ * kbase_csf_scheduler.head_slot_priority would also be adjusted after ++ * kbase_csf_scheduler.remaining_tick_slots would also be adjusted after + * programming the slot. + */ +static void program_group_on_vacant_csg_slot(struct kbase_device *kbdev, @@ -171158,17 +190955,18 @@ index 000000000000..a3017a7f25ba + + if (!WARN_ON(ret)) { + if (kctx_as_enabled(group->kctx) && !group->faulted) { -+ program_csg_slot(group, -+ slot, -+ scheduler->head_slot_priority); ++ program_csg_slot(group, slot, ++ get_slot_priority(group)); + + if (likely(csg_slot_in_use(kbdev, slot))) { + /* Drop the head group from the list */ + remove_scheduled_group(kbdev, group); -+ scheduler->head_slot_priority--; ++ scheduler->remaining_tick_slots--; + } -+ } else ++ } else { ++ update_offslot_non_idle_cnt(group); + remove_scheduled_group(kbdev, group); ++ } + } + } +} @@ -171178,15 +190976,15 @@ index 000000000000..a3017a7f25ba + * group and update the priority of resident groups. + * + * @kbdev: Pointer to the GPU device. -+ * @slot: Vacant command stream group slot number. ++ * @slot: Vacant CSG slot number. + * + * This function will first update the priority of all resident queue groups + * that are at the head of groups_to_schedule list, preceding the first -+ * non-resident group, it will then try to program the given command stream ++ * non-resident group, it will then try to program the given CS + * group slot with the non-resident group. Finally update the priority of all + * resident queue groups following the non-resident group. + * -+ * kbase_csf_scheduler.head_slot_priority would also be adjusted. ++ * kbase_csf_scheduler.remaining_tick_slots would also be adjusted. + */ +static void program_vacant_csg_slot(struct kbase_device *kbdev, s8 slot) +{ @@ -171240,12 +191038,12 @@ index 000000000000..a3017a7f25ba + * @kbdev: Pointer to the GPU device. + * + * This function will first wait for the ongoing suspension to complete on a -+ * command stream group slot and will then program the vacant slot with the ++ * CSG slot and will then program the vacant slot with the + * non-resident queue group inside the groups_to_schedule list. + * The programming of the non-resident queue group on the vacant slot could + * fail due to unavailability of free GPU address space slot and so the + * programming is re-attempted after the ongoing suspension has completed -+ * for all the command stream group slots. ++ * for all the CSG slots. + * The priority of resident groups before and after the non-resident group + * in the groups_to_schedule list would also be updated. + * This would be repeated for all the slots undergoing suspension. @@ -171258,11 +191056,13 @@ index 000000000000..a3017a7f25ba + DECLARE_BITMAP(slot_mask, MAX_SUPPORTED_CSGS); + DECLARE_BITMAP(evicted_mask, MAX_SUPPORTED_CSGS) = {0}; + bool suspend_wait_failed = false; -+ long remaining = -+ kbase_csf_timeout_in_jiffies(CSF_STATE_WAIT_TIMEOUT_MS); ++ long remaining = kbase_csf_timeout_in_jiffies(kbdev->csf.fw_timeout_ms); + + lockdep_assert_held(&kbdev->csf.scheduler.lock); + ++ /* In the current implementation, csgs_events_enable_mask would be used ++ * only to indicate suspending CSGs. ++ */ + bitmap_complement(slot_mask, scheduler->csgs_events_enable_mask, + MAX_SUPPORTED_CSGS); + @@ -171276,19 +191076,22 @@ index 000000000000..a3017a7f25ba + csg_slot_stopped_raw), + remaining); + -+ if (remaining) { ++ if (likely(remaining)) { + u32 i; + + for_each_set_bit(i, changed, num_groups) { + struct kbase_queue_group *group = + scheduler->csg_slots[i].resident_group; + -+ if (WARN_ON(!csg_slot_stopped_locked(kbdev, (s8)i))) { ++ if (WARN_ON(!csg_slot_stopped_locked(kbdev, (s8)i))) + continue; -+ } ++ + /* The on slot csg is now stopped */ + clear_bit(i, slot_mask); + ++ KBASE_TLSTREAM_TL_KBASE_DEVICE_SUSPEND_CSG( ++ kbdev, kbdev->gpu_props.props.raw_props.gpu_id, i); ++ + if (likely(group)) { + bool as_fault; + /* Only do save/cleanup if the @@ -171299,7 +191102,7 @@ index 000000000000..a3017a7f25ba + as_fault = cleanup_csg_slot(group); + /* If AS fault detected, evict it */ + if (as_fault) { -+ sched_evict_group(group, true); ++ sched_evict_group(group, true, true); + set_bit(i, evicted_mask); + } + } @@ -171307,13 +191110,56 @@ index 000000000000..a3017a7f25ba + program_vacant_csg_slot(kbdev, (s8)i); + } + } else { -+ dev_warn(kbdev->dev, "Timed out waiting for CSG slots to suspend, slot_mask: 0x%*pb\n", -+ num_groups, slot_mask); ++ u32 i; ++ ++ /* Groups that have failed to suspend in time shall ++ * raise a fatal error as they could no longer be ++ * safely resumed. ++ */ ++ for_each_set_bit(i, slot_mask, num_groups) { ++ struct kbase_queue_group *const group = ++ scheduler->csg_slots[i].resident_group; ++ enum dumpfault_error_type error_type = DF_CSG_SUSPEND_TIMEOUT; ++ ++ struct base_gpu_queue_group_error const ++ err_payload = { .error_type = ++ BASE_GPU_QUEUE_GROUP_ERROR_FATAL, ++ .payload = { ++ .fatal_group = { ++ .status = ++ GPU_EXCEPTION_TYPE_SW_FAULT_2, ++ } } }; ++ ++ if (unlikely(group == NULL)) ++ continue; ++ ++ /* TODO GPUCORE-25328: The CSG can't be ++ * terminated, the GPU will be reset as a ++ * work-around. ++ */ ++ dev_warn( ++ kbdev->dev, ++ "[%llu] Group %d of context %d_%d on slot %u failed to suspend (timeout %d ms)", ++ kbase_backend_get_cycle_cnt(kbdev), ++ group->handle, group->kctx->tgid, ++ group->kctx->id, i, ++ kbdev->csf.fw_timeout_ms); ++ if (kbase_csf_firmware_ping_wait(kbdev, ++ FW_PING_AFTER_ERROR_TIMEOUT_MS)) ++ error_type = DF_PING_REQUEST_TIMEOUT; ++ schedule_actions_trigger_df(kbdev, group->kctx, error_type); ++ ++ kbase_csf_add_group_fatal_error(group, &err_payload); ++ kbase_event_wakeup(group->kctx); ++ ++ /* The group has failed suspension, stop ++ * further examination. ++ */ ++ clear_bit(i, slot_mask); ++ set_bit(i, scheduler->csgs_events_enable_mask); ++ } + -+ if (kbase_prepare_to_reset_gpu(kbdev)) -+ kbase_reset_gpu(kbdev); + suspend_wait_failed = true; -+ break; + } + } + @@ -171321,20 +191167,24 @@ index 000000000000..a3017a7f25ba + dev_info(kbdev->dev, "Scheduler evicting slots: 0x%*pb\n", + num_groups, evicted_mask); + -+ if (unlikely(!suspend_wait_failed)) { ++ if (likely(!suspend_wait_failed)) { + u32 i; + + while (scheduler->ngrp_to_schedule && -+ (scheduler->head_slot_priority > (MAX_CSG_SLOT_PRIORITY -+ - scheduler->num_csg_slots_for_tick))) { ++ scheduler->remaining_tick_slots) { + i = find_first_zero_bit(scheduler->csg_inuse_bitmap, + num_groups); + if (WARN_ON(i == num_groups)) + break; + program_vacant_csg_slot(kbdev, (s8)i); -+ if (WARN_ON(!csg_slot_in_use(kbdev, (int)i))) ++ if (!csg_slot_in_use(kbdev, (int)i)) { ++ dev_warn(kbdev->dev, "Couldn't use CSG slot %d despite being vacant", i); + break; ++ } + } ++ } else { ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_NONE)) ++ kbase_reset_gpu(kbdev); + } +} + @@ -171345,6 +191195,11 @@ index 000000000000..a3017a7f25ba + &group->kctx->kbdev->csf.scheduler; + + spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++ /* This shall be used in program_suspending_csg_slots() where we ++ * assume that whilst CSGs are being suspended, this bitmask is not ++ * used by anything else i.e., it indicates only the CSGs going ++ * through suspension. ++ */ + clear_bit(group->csg_nr, scheduler->csgs_events_enable_mask); + spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); + @@ -171359,8 +191214,7 @@ index 000000000000..a3017a7f25ba +{ + u32 num_groups = kbdev->csf.global_iface.group_num; + struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; -+ long remaining = -+ kbase_csf_timeout_in_jiffies(CSF_STATE_WAIT_TIMEOUT_MS); ++ long remaining = kbase_csf_timeout_in_jiffies(kbdev->csf.fw_timeout_ms); + DECLARE_BITMAP(slot_mask, MAX_SUPPORTED_CSGS) = {0}; + u32 i; + @@ -171382,7 +191236,7 @@ index 000000000000..a3017a7f25ba + slots_state_changed(kbdev, changed, csg_slot_running), + remaining); + -+ if (remaining) { ++ if (likely(remaining)) { + for_each_set_bit(i, changed, num_groups) { + struct kbase_queue_group *group = + scheduler->csg_slots[i].resident_group; @@ -171390,12 +191244,24 @@ index 000000000000..a3017a7f25ba + /* The on slot csg is now running */ + clear_bit(i, slot_mask); + group->run_state = KBASE_CSF_GROUP_RUNNABLE; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSF_GROUP_RUNNABLE, group, ++ group->run_state); + } + } else { -+ dev_warn(kbdev->dev, "Timed out waiting for CSG slots to start, slots: 0x%*pb\n", -+ num_groups, slot_mask); ++ const int csg_nr = ffs(slot_mask[0]) - 1; ++ struct kbase_queue_group *group = ++ scheduler->csg_slots[csg_nr].resident_group; ++ enum dumpfault_error_type error_type = DF_CSG_START_TIMEOUT; + -+ if (kbase_prepare_to_reset_gpu(kbdev)) ++ dev_err(kbdev->dev, ++ "[%llu] Timeout (%d ms) waiting for CSG slots to start, slots: 0x%*pb\n", ++ kbase_backend_get_cycle_cnt(kbdev), kbdev->csf.fw_timeout_ms, ++ num_groups, slot_mask); ++ if (kbase_csf_firmware_ping_wait(kbdev, FW_PING_AFTER_ERROR_TIMEOUT_MS)) ++ error_type = DF_PING_REQUEST_TIMEOUT; ++ schedule_actions_trigger_df(kbdev, group->kctx, error_type); ++ ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_NONE)) + kbase_reset_gpu(kbdev); + break; + } @@ -171403,64 +191269,48 @@ index 000000000000..a3017a7f25ba +} + +/** -+ * group_on_slot_is_idle() - Check if the queue group resident on a command -+ * stream group slot is idle. -+ * -+ * This function is called at the start of scheduling tick to check the -+ * idle status of a queue group resident on a command sream group slot. -+ * The group's idleness is determined by looping over all the bound command -+ * queues and checking their respective CS_STATUS_WAIT register as well as -+ * the insert and extract offsets. -+ -+ * This function would be simplified in future after the changes under -+ * consideration with MIDHARC-3065 are introduced. ++ * group_on_slot_is_idle() - Check if the given slot has a CSG-idle state ++ * flagged after the completion of a CSG status ++ * update command + * + * @kbdev: Pointer to the GPU device. -+ * @group: Pointer to the resident group on the given slot. -+ * @slot: The slot that the given group is resident on. ++ * @slot: The given slot for checking an occupying resident group's idle ++ * state. ++ * ++ * This function is called at the start of scheduling tick to check the ++ * idle status of a queue group resident on a CSG slot. ++ * The caller must make sure the corresponding status update command has ++ * been called and completed before checking this status. + * + * Return: true if the group resident on slot is idle, otherwise false. + */ +static bool group_on_slot_is_idle(struct kbase_device *kbdev, -+ struct kbase_queue_group *group, unsigned long slot) ++ unsigned long slot) +{ + struct kbase_csf_cmd_stream_group_info *ginfo = + &kbdev->csf.global_iface.groups[slot]; -+ u32 i; ++ bool idle = kbase_csf_firmware_csg_output(ginfo, CSG_STATUS_STATE) & ++ CSG_STATUS_STATE_IDLE_MASK; + + lockdep_assert_held(&kbdev->csf.scheduler.lock); -+ for (i = 0; i < MAX_SUPPORTED_STREAMS_PER_GROUP; i++) { -+ struct kbase_queue *queue = group->bound_queues[i]; -+ -+ if (queue && queue->enabled) { -+ struct kbase_csf_cmd_stream_info *stream = -+ &ginfo->streams[queue->csi_index]; -+ u32 status = kbase_csf_firmware_cs_output(stream, -+ CS_STATUS_WAIT); -+ -+ if (!CS_STATUS_WAIT_SYNC_WAIT_GET(status) && -+ !confirm_cs_idle(group->bound_queues[i])) -+ return false; -+ } -+ } + -+ return true; ++ return idle; +} + +/** + * slots_update_state_changed() - Check the handshake state of a subset of + * command group slots. + * -+ * Checks the state of a subset of slots selected through the slots_mask -+ * bit_map. Records which slots' handshake completed and send it back in the -+ * slots_done bit_map. -+ * + * @kbdev: The GPU device. + * @field_mask: The field mask for checking the state in the csg_req/ack. + * @slots_mask: A bit_map specifying the slots to check. + * @slots_done: A cleared bit_map for returning the slots that + * have finished update. + * ++ * Checks the state of a subset of slots selected through the slots_mask ++ * bit_map. Records which slots' handshake completed and send it back in the ++ * slots_done bit_map. ++ * + * Return: true if the slots_done is set for at least one slot. + * Otherwise false. + */ @@ -171494,10 +191344,6 @@ index 000000000000..a3017a7f25ba + * wait_csg_slots_handshake_ack - Wait the req/ack handshakes to complete on + * the specified groups. + * -+ * This function waits for the acknowledgement of the request that have -+ * already been placed for the CSG slots by the caller. Currently used for -+ * the CSG priority update and status update requests. -+ * + * @kbdev: Pointer to the GPU device. + * @field_mask: The field mask for checking the state in the csg_req/ack. + * @slot_mask: Bitmap reflecting the slots, the function will modify @@ -171505,6 +191351,10 @@ index 000000000000..a3017a7f25ba + * bits. + * @wait_in_jiffies: Wait duration in jiffies, controlling the time-out. + * ++ * This function waits for the acknowledgment of the request that have ++ * already been placed for the CSG slots by the caller. Currently used for ++ * the CSG priority update and status update requests. ++ * + * Return: 0 on all specified slots acknowledged; otherwise -ETIMEDOUT. For + * timed out condition with unacknowledged slots, their bits remain + * set in the slot_mask. @@ -171526,11 +191376,13 @@ index 000000000000..a3017a7f25ba + slot_mask, dones), + remaining); + -+ if (remaining) ++ if (likely(remaining)) + bitmap_andnot(slot_mask, slot_mask, dones, num_groups); -+ else ++ else { ++ + /* Timed-out on the wait */ + return -ETIMEDOUT; ++ } + } + + return 0; @@ -171540,23 +191392,45 @@ index 000000000000..a3017a7f25ba +{ + unsigned long *slot_mask = + kbdev->csf.scheduler.csg_slots_prio_update; -+ long wait_time = -+ kbase_csf_timeout_in_jiffies(CSF_STATE_WAIT_TIMEOUT_MS); ++ long wait_time = kbase_csf_timeout_in_jiffies(kbdev->csf.fw_timeout_ms); + int ret = wait_csg_slots_handshake_ack(kbdev, CSG_REQ_EP_CFG_MASK, + slot_mask, wait_time); + + lockdep_assert_held(&kbdev->csf.scheduler.lock); + -+ if (ret != 0) { -+ /* The update timeout is not regarded as a serious -+ * issue, no major consequences are expected as a -+ * result, so just warn the case. -+ */ -+ dev_warn(kbdev->dev, "Timeout, skipping the update wait: slot mask=0x%lx", -+ slot_mask[0]); ++ if (unlikely(ret != 0)) { ++ const int csg_nr = ffs(slot_mask[0]) - 1; ++ struct kbase_queue_group *group = ++ kbdev->csf.scheduler.csg_slots[csg_nr].resident_group; ++ enum dumpfault_error_type error_type = DF_CSG_EP_CFG_TIMEOUT; ++ ++ dev_warn( ++ kbdev->dev, ++ "[%llu] Timeout (%d ms) on CSG_REQ:EP_CFG, skipping the update wait: slot mask=0x%lx", ++ kbase_backend_get_cycle_cnt(kbdev), ++ kbdev->csf.fw_timeout_ms, ++ slot_mask[0]); ++ if (kbase_csf_firmware_ping_wait(kbdev, FW_PING_AFTER_ERROR_TIMEOUT_MS)) ++ error_type = DF_PING_REQUEST_TIMEOUT; ++ schedule_actions_trigger_df(kbdev, group->kctx, error_type); ++ ++ /* Timeout could indicate firmware is unresponsive so trigger a GPU reset. */ ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) ++ kbase_reset_gpu(kbdev); + } +} + ++static void report_csg_termination(struct kbase_queue_group *const group) ++{ ++ struct base_gpu_queue_group_error ++ err = { .error_type = BASE_GPU_QUEUE_GROUP_ERROR_FATAL, ++ .payload = { .fatal_group = { ++ .status = GPU_EXCEPTION_TYPE_SW_FAULT_2, ++ } } }; ++ ++ kbase_csf_add_group_fatal_error(group, &err); ++} ++ +void kbase_csf_scheduler_evict_ctx_slots(struct kbase_device *kbdev, + struct kbase_context *kctx, struct list_head *evicted_groups) +{ @@ -171565,18 +191439,32 @@ index 000000000000..a3017a7f25ba + u32 num_groups = kbdev->csf.global_iface.group_num; + u32 slot; + DECLARE_BITMAP(slot_mask, MAX_SUPPORTED_CSGS) = {0}; -+ DECLARE_BITMAP(terminated_slot_mask, MAX_SUPPORTED_CSGS); -+ long remaining = -+ kbase_csf_timeout_in_jiffies(DEFAULT_RESET_TIMEOUT_MS); + + lockdep_assert_held(&kctx->csf.lock); + mutex_lock(&scheduler->lock); + -+ KBASE_KTRACE_ADD(kbdev, EVICT_CTX_SLOTS, kctx, 0u); ++ /* This code is only called during reset, so we don't wait for the CSG ++ * slots to be stopped ++ */ ++ WARN_ON(!kbase_reset_gpu_is_active(kbdev)); ++ ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_EVICT_CTX_SLOTS_START, kctx, 0u); + for (slot = 0; slot < num_groups; slot++) { + group = kbdev->csf.scheduler.csg_slots[slot].resident_group; + if (group && group->kctx == kctx) { ++ bool as_fault; ++ ++ dev_dbg(kbdev->dev, "Evicting group [%d] running on slot [%d] due to reset", ++ group->handle, group->csg_nr); ++ + term_csg_slot(group); ++ as_fault = cleanup_csg_slot(group); ++ /* remove the group from the scheduler list */ ++ sched_evict_group(group, as_fault, false); ++ /* signal Userspace that CSG is being terminated */ ++ report_csg_termination(group); ++ /* return the evicted group to the caller */ ++ list_add_tail(&group->link, evicted_groups); + set_bit(slot, slot_mask); + } + } @@ -171584,63 +191472,31 @@ index 000000000000..a3017a7f25ba + dev_info(kbdev->dev, "Evicting context %d_%d slots: 0x%*pb\n", + kctx->tgid, kctx->id, num_groups, slot_mask); + -+ bitmap_copy(terminated_slot_mask, slot_mask, MAX_SUPPORTED_CSGS); -+ /* Only check for GPU reset once - this thread has the scheduler lock, -+ * so even if the return value of kbase_reset_gpu_is_active changes, -+ * no reset work would be done anyway until the scheduler lock was -+ * released. ++ /* Fatal errors may have been the cause of the GPU reset ++ * taking place, in which case we want to make sure that ++ * we wake up the fatal event queue to notify userspace ++ * only once. Otherwise, we may have duplicate event ++ * notifications between the time the first notification ++ * occurs and the time the GPU is reset. + */ -+ if (!kbase_reset_gpu_is_active(kbdev)) { -+ while (remaining -+ && !bitmap_empty(slot_mask, MAX_SUPPORTED_CSGS)) { -+ DECLARE_BITMAP(changed, MAX_SUPPORTED_CSGS); -+ -+ bitmap_copy(changed, slot_mask, MAX_SUPPORTED_CSGS); -+ -+ remaining = wait_event_timeout(kbdev->csf.event_wait, -+ slots_state_changed(kbdev, changed, -+ csg_slot_stopped_raw), -+ remaining); -+ -+ if (remaining) -+ bitmap_andnot(slot_mask, slot_mask, changed, -+ MAX_SUPPORTED_CSGS); -+ } -+ } -+ -+ for_each_set_bit(slot, terminated_slot_mask, num_groups) { -+ bool as_fault; -+ -+ group = scheduler->csg_slots[slot].resident_group; -+ as_fault = cleanup_csg_slot(group); -+ /* remove the group from the scheduler list */ -+ sched_evict_group(group, as_fault); -+ /* return the evicted group to the caller */ -+ list_add_tail(&group->link, evicted_groups); -+ } -+ -+ if (!remaining) { -+ dev_warn(kbdev->dev, "Timeout on evicting ctx slots: 0x%*pb\n", -+ num_groups, slot_mask); -+ if (kbase_prepare_to_reset_gpu(kbdev)) -+ kbase_reset_gpu(kbdev); -+ } ++ kbase_event_wakeup(kctx); + + mutex_unlock(&scheduler->lock); ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_EVICT_CTX_SLOTS_END, kctx, num_groups); +} + +/** + * scheduler_slot_protm_ack - Acknowledging the protected region requests + * from the resident group on a given slot. + * -+ * The function assumes that the given slot is in stable running state and -+ * has already been judged by the caller on that any pending protected region -+ * requests of the resident group should be acknowledged. -+ * + * @kbdev: Pointer to the GPU device. + * @group: Pointer to the resident group on the given slot. + * @slot: The slot that the given group is actively operating on. + * ++ * The function assumes that the given slot is in stable running state and ++ * has already been judged by the caller on that any pending protected region ++ * requests of the resident group should be acknowledged. ++ * + * Return: true if the group has pending protm request(s) and is acknowledged. + * The caller should arrange to enter the protected mode for servicing + * it. Otherwise return false, indicating the group has no pending protm @@ -171670,6 +191526,8 @@ index 000000000000..a3017a7f25ba + struct kbase_queue *queue = group->bound_queues[i]; + + clear_bit(i, group->protm_pending_bitmap); ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, CSI_PROTM_PEND_CLEAR, group, queue, ++ group->protm_pending_bitmap[0]); + + if (!WARN_ON(!queue) && queue->enabled) { + struct kbase_csf_cmd_stream_info *stream = @@ -171681,6 +191539,9 @@ index 000000000000..a3017a7f25ba + stream, CS_REQ) & + CS_REQ_PROTM_PEND_MASK; + ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, CSI_PROTM_ACK, group, ++ queue, cs_protm_ack ^ cs_protm_req); ++ + if (cs_protm_ack == cs_protm_req) { + dev_dbg(kbdev->dev, + "PROTM-ack already done for queue-%d group-%d slot-%d", @@ -171702,40 +191563,95 @@ index 000000000000..a3017a7f25ba +} + +/** ++ * protm_enter_set_next_pending_seq - Update the scheduler's field of ++ * tick_protm_pending_seq to that from the next available on-slot protm ++ * pending CSG. ++ * ++ * @kbdev: Pointer to the GPU device. ++ * ++ * If applicable, the function updates the scheduler's tick_protm_pending_seq ++ * field from the next available on-slot protm pending CSG. If not, the field ++ * is set to KBASEP_TICK_PROTM_PEND_SCAN_SEQ_NR_INVALID. ++ */ ++static void protm_enter_set_next_pending_seq(struct kbase_device *const kbdev) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ u32 num_groups = kbdev->csf.global_iface.group_num; ++ u32 num_csis = kbdev->csf.global_iface.groups[0].stream_num; ++ DECLARE_BITMAP(active_csgs, MAX_SUPPORTED_CSGS) = { 0 }; ++ u32 i; ++ ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ ++ bitmap_xor(active_csgs, scheduler->csg_slots_idle_mask, scheduler->csg_inuse_bitmap, ++ num_groups); ++ /* Reset the tick's pending protm seq number to invalid initially */ ++ scheduler->tick_protm_pending_seq = KBASEP_TICK_PROTM_PEND_SCAN_SEQ_NR_INVALID; ++ for_each_set_bit(i, active_csgs, num_groups) { ++ struct kbase_queue_group *group = scheduler->csg_slots[i].resident_group; ++ ++ /* Set to the next pending protm group's scan_seq_number */ ++ if ((group != scheduler->active_protm_grp) && ++ (!bitmap_empty(group->protm_pending_bitmap, num_csis)) && ++ (group->scan_seq_num < scheduler->tick_protm_pending_seq)) ++ scheduler->tick_protm_pending_seq = group->scan_seq_num; ++ } ++} ++ ++/** + * scheduler_group_check_protm_enter - Request the given group to be evaluated + * for triggering the protected mode. + * ++ * @kbdev: Pointer to the GPU device. ++ * @input_grp: Pointer to the GPU queue group. ++ * + * The function assumes the given group is either an active running group or + * the scheduler internally maintained field scheduler->top_grp. + * + * If the GPU is not already running in protected mode and the input group + * has protected region requests from its bound queues, the requests are + * acknowledged and the GPU is instructed to enter the protected mode. -+ * -+ * @kbdev: Pointer to the GPU device. -+ * @input_grp: Pointer to the GPU queue group. + */ +static void scheduler_group_check_protm_enter(struct kbase_device *const kbdev, + struct kbase_queue_group *const input_grp) +{ + struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ struct kbase_protected_suspend_buffer *sbuf = &input_grp->protected_suspend_buf; + unsigned long flags; ++ bool protm_in_use; + + lockdep_assert_held(&scheduler->lock); + ++ /* Return early if the physical pages have not been allocated yet */ ++ if (unlikely(!sbuf->pma)) ++ return; ++ ++ /* This lock is taken to prevent the issuing of MMU command during the ++ * transition to protected mode. This helps avoid the scenario where the ++ * entry to protected mode happens with a memory region being locked and ++ * the same region is then accessed by the GPU in protected mode. ++ */ ++ mutex_lock(&kbdev->mmu_hw_mutex); + spin_lock_irqsave(&scheduler->interrupt_lock, flags); + -+ /* Firmware samples the PROTM_PEND ACK bit for command streams when ++ /* Check if the previous transition to enter & exit the protected ++ * mode has completed or not. ++ */ ++ protm_in_use = kbase_csf_scheduler_protected_mode_in_use(kbdev) || ++ kbdev->protected_mode; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_PROTM_ENTER_CHECK, input_grp, protm_in_use); ++ ++ /* Firmware samples the PROTM_PEND ACK bit for CSs when + * Host sends PROTM_ENTER global request. So if PROTM_PEND ACK bit -+ * is set for a command stream after Host has sent the PROTM_ENTER ++ * is set for a CS after Host has sent the PROTM_ENTER + * Global request, then there is no guarantee that firmware will + * notice that prior to switching to protected mode. And firmware -+ * may not again raise the PROTM_PEND interrupt for that command -+ * stream later on. To avoid that uncertainty PROTM_PEND ACK bit -+ * is not set for a command stream if the request to enter protected ++ * may not again raise the PROTM_PEND interrupt for that CS ++ * later on. To avoid that uncertainty PROTM_PEND ACK bit ++ * is not set for a CS if the request to enter protected + * mode has already been sent. It will be set later (after the exit + * from protected mode has taken place) when the group to which -+ * command stream is bound becomes the top group. ++ * CS is bound becomes the top group. + * + * The actual decision of entering protected mode is hinging on the + * input group is the top priority group, or, in case the previous @@ -171743,41 +191659,97 @@ index 000000000000..a3017a7f25ba + * be replacement, and that it is currently in a stable state (i.e. the + * slot state is running). + */ -+ if (!kbase_csf_scheduler_protected_mode_in_use(kbdev)) { -+ if (!WARN_ON(!input_grp)) { -+ const int slot = -+ kbase_csf_scheduler_group_get_slot_locked( -+ input_grp); ++ if (!protm_in_use && !WARN_ON(!input_grp)) { ++ const int slot = ++ kbase_csf_scheduler_group_get_slot_locked(input_grp); + -+ /* check the input_grp is running and requesting -+ * protected mode -+ */ -+ if (slot >= 0 && -+ atomic_read( -+ &scheduler->csg_slots[slot].state) == -+ CSG_SLOT_RUNNING) { -+ if (kctx_as_enabled(input_grp->kctx) && -+ scheduler_slot_protm_ack(kbdev, -+ input_grp, slot)) { -+ /* Option of acknowledging to multiple -+ * CSGs from the same kctx is dropped, -+ * after consulting with the -+ * architecture team. See the comment in -+ * GPUCORE-21394. -+ */ ++ /* check the input_grp is running and requesting protected mode ++ */ ++ if (slot >= 0 && ++ atomic_read(&scheduler->csg_slots[slot].state) == ++ CSG_SLOT_RUNNING) { ++ if (kctx_as_enabled(input_grp->kctx) && ++ scheduler_slot_protm_ack(kbdev, input_grp, slot)) { ++ int err; + -+ /* Switch to protected mode */ -+ scheduler->active_protm_grp = input_grp; -+ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_ENTER_PROTM, input_grp, 0u); -+ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); -+ kbase_csf_enter_protected_mode(kbdev); -+ return; -+ } ++ /* Option of acknowledging to multiple ++ * CSGs from the same kctx is dropped, ++ * after consulting with the ++ * architecture team. See the comment in ++ * GPUCORE-21394. ++ */ ++ ++ /* Switch to protected mode */ ++ scheduler->active_protm_grp = input_grp; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_PROTM_ENTER, input_grp, ++ 0u); ++ ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++ ++ /* Coresight must be disabled before entering protected mode. */ ++ kbase_debug_coresight_csf_disable_pmode_enter(kbdev); ++ ++ spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ ++ ++ kbase_csf_enter_protected_mode(kbdev); ++ /* Set the pending protm seq number to the next one */ ++ protm_enter_set_next_pending_seq(kbdev); ++ ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++ ++ err = kbase_csf_wait_protected_mode_enter(kbdev); ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++ ++ if (err) ++ schedule_actions_trigger_df(kbdev, input_grp->kctx, ++ DF_PROTECTED_MODE_ENTRY_FAILURE); ++ ++ scheduler->protm_enter_time = ktime_get_raw(); ++ ++ return; + } + } + } + + spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++} ++ ++/** ++ * scheduler_check_pmode_progress - Check if protected mode execution is progressing ++ * ++ * @kbdev: Pointer to the GPU device. ++ * ++ * This function is called when the GPU is in protected mode. ++ * ++ * It will check if the time spent in protected mode is less ++ * than CSF_SCHED_PROTM_PROGRESS_TIMEOUT. If not, a PROTM_EXIT ++ * request is sent to the FW. ++ */ ++static void scheduler_check_pmode_progress(struct kbase_device *kbdev) ++{ ++ u64 protm_spent_time_ms; ++ u64 protm_progress_timeout = ++ kbase_get_timeout_ms(kbdev, CSF_SCHED_PROTM_PROGRESS_TIMEOUT); ++ s64 diff_ms_signed = ++ ktime_ms_delta(ktime_get_raw(), kbdev->csf.scheduler.protm_enter_time); ++ ++ if (diff_ms_signed < 0) ++ return; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ protm_spent_time_ms = (u64)diff_ms_signed; ++ if (protm_spent_time_ms < protm_progress_timeout) ++ return; ++ ++ dev_dbg(kbdev->dev, "Protected mode progress timeout: %llu >= %llu", ++ protm_spent_time_ms, protm_progress_timeout); ++ ++ /* Prompt the FW to exit protected mode */ ++ scheduler_force_protm_exit(kbdev); +} + +static void scheduler_apply(struct kbase_device *kbdev) @@ -171807,6 +191779,9 @@ index 000000000000..a3017a7f25ba + } + } + ++ /* Initialize the remaining available csg slots for the tick/tock */ ++ scheduler->remaining_tick_slots = available_csg_slots; ++ + /* If there are spare slots, apply heads in the list */ + spare = (available_csg_slots > resident_cnt) ? + (available_csg_slots - resident_cnt) : 0; @@ -171819,7 +191794,7 @@ index 000000000000..a3017a7f25ba + group->prepared_seq_num < available_csg_slots) { + /* One of the resident remainders */ + update_csg_slot_priority(group, -+ scheduler->head_slot_priority); ++ get_slot_priority(group)); + } else if (spare != 0) { + s8 slot = (s8)find_first_zero_bit( + kbdev->csf.scheduler.csg_inuse_bitmap, @@ -171830,11 +191805,12 @@ index 000000000000..a3017a7f25ba + + if (!kctx_as_enabled(group->kctx) || group->faulted) { + /* Drop the head group and continue */ ++ update_offslot_non_idle_cnt(group); + remove_scheduled_group(kbdev, group); + continue; + } + program_csg_slot(group, slot, -+ scheduler->head_slot_priority); ++ get_slot_priority(group)); + if (unlikely(!csg_slot_in_use(kbdev, slot))) + break; + @@ -171844,8 +191820,8 @@ index 000000000000..a3017a7f25ba + + /* Drop the head csg from the list */ + remove_scheduled_group(kbdev, group); -+ if (scheduler->head_slot_priority) -+ scheduler->head_slot_priority--; ++ if (!WARN_ON(!scheduler->remaining_tick_slots)) ++ scheduler->remaining_tick_slots--; + } + + /* Dealing with groups currently going through suspend */ @@ -171859,8 +191835,9 @@ index 000000000000..a3017a7f25ba + struct kbase_queue_group *group; + + lockdep_assert_held(&scheduler->lock); ++ lockdep_assert_held(&scheduler->interrupt_lock); + if (WARN_ON(priority < 0) || -+ WARN_ON(priority >= BASE_QUEUE_GROUP_PRIORITY_COUNT)) ++ WARN_ON(priority >= KBASE_QUEUE_GROUP_PRIORITY_COUNT)) + return; + + if (!kctx_as_enabled(kctx)) @@ -171875,9 +191852,21 @@ index 000000000000..a3017a7f25ba + if (unlikely(group->faulted)) + continue; + ++ /* Set the scanout sequence number, starting from 0 */ ++ group->scan_seq_num = scheduler->csg_scan_count_for_tick++; ++ ++ if (scheduler->tick_protm_pending_seq == ++ KBASEP_TICK_PROTM_PEND_SCAN_SEQ_NR_INVALID) { ++ if (!bitmap_empty(group->protm_pending_bitmap, ++ kbdev->csf.global_iface.groups[0].stream_num)) ++ scheduler->tick_protm_pending_seq = ++ group->scan_seq_num; ++ } ++ + if (queue_group_idle_locked(group)) { -+ list_add_tail(&group->link_to_schedule, -+ &scheduler->idle_groups_to_schedule); ++ if (can_schedule_idle_group(group)) ++ list_add_tail(&group->link_to_schedule, ++ &scheduler->idle_groups_to_schedule); + continue; + } + @@ -171901,6 +191890,8 @@ index 000000000000..a3017a7f25ba + * fairness of scheduling within a single + * kbase_context. + * ++ * @kbdev: Pointer to the GPU device. ++ * + * Since only kbase_csf_scheduler's top_grp (i.e. the queue group assigned + * the highest slot priority) is guaranteed to get the resources that it + * needs we only rotate the kbase_context corresponding to it - @@ -171939,8 +191930,6 @@ index 000000000000..a3017a7f25ba + * the kbase_csf_scheduler's groups_to_schedule list. In this example, it will + * be for a group in the next lowest priority level or in absence of those the + * next kbase_context's queue groups. -+ * -+ * @kbdev: Pointer to the GPU device. + */ +static void scheduler_rotate_groups(struct kbase_device *kbdev) +{ @@ -171955,7 +191944,15 @@ index 000000000000..a3017a7f25ba + + WARN_ON(top_grp->kctx != top_ctx); + if (!WARN_ON(list_empty(list))) { ++ struct kbase_queue_group *new_head_grp; ++ + list_move_tail(&top_grp->link, list); ++ new_head_grp = (!list_empty(list)) ? ++ list_first_entry(list, struct kbase_queue_group, link) : ++ NULL; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, GROUP_RUNNABLE_ROTATE, top_grp, ++ top_ctx->csf.sched.num_runnable_grps); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, GROUP_RUNNABLE_HEAD, new_head_grp, 0u); + dev_dbg(kbdev->dev, + "groups rotated for a context, num_runnable_groups: %u\n", + scheduler->top_ctx->csf.sched.num_runnable_grps); @@ -171983,7 +191980,15 @@ index 000000000000..a3017a7f25ba + } + + if (!WARN_ON(!found)) { ++ struct kbase_context *new_head_kctx; ++ + list_move_tail(&pos->csf.link, list); ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_RUNNABLE_KCTX_ROTATE, pos, 0u); ++ new_head_kctx = (!list_empty(list)) ? ++ list_first_entry(list, struct kbase_context, csf.link) : ++ NULL; ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_RUNNABLE_KCTX_HEAD, new_head_kctx, ++ 0u); + dev_dbg(kbdev->dev, "contexts rotated\n"); + } + } @@ -171991,21 +191996,26 @@ index 000000000000..a3017a7f25ba +} + +/** -+ * scheduler_update_idle_slots_status() - Get the status update for the command -+ * stream group slots for which the IDLE notification was -+ * received previously. -+ * -+ * This function sends a CSG status update request for all the command stream -+ * group slots present in the bitmap scheduler->csg_slots_idle_mask and wait -+ * for the request to complete. -+ * The bits set in the scheduler->csg_slots_idle_mask bitmap are cleared by -+ * this function. ++ * scheduler_update_idle_slots_status() - Get the status update for the CSG ++ * slots for which the IDLE notification was received ++ * previously. + * + * @kbdev: Pointer to the GPU device. -+ * @csg_bitmap: Bitmap of the command stream group slots for which ++ * @csg_bitmap: Bitmap of the CSG slots for which + * the status update request completed successfully. -+ * @failed_csg_bitmap: Bitmap of the command stream group slots for which ++ * @failed_csg_bitmap: Bitmap of the idle CSG slots for which + * the status update request timedout. ++ * ++ * This function sends a CSG status update request for all the CSG slots ++ * present in the bitmap scheduler->csg_slots_idle_mask. Additionally, if ++ * the group's 'reevaluate_idle_status' field is set, the nominally non-idle ++ * slots are also included in the status update for a confirmation of their ++ * status. The function wait for the status update request to complete and ++ * returns the update completed slots bitmap and any timed out idle-flagged ++ * slots bitmap. ++ * ++ * The bits set in the scheduler->csg_slots_idle_mask bitmap are cleared by ++ * this function. + */ +static void scheduler_update_idle_slots_status(struct kbase_device *kbdev, + unsigned long *csg_bitmap, unsigned long *failed_csg_bitmap) @@ -172015,73 +192025,138 @@ index 000000000000..a3017a7f25ba + struct kbase_csf_global_iface *const global_iface = + &kbdev->csf.global_iface; + unsigned long flags, i; ++ u32 active_chk = 0; + + lockdep_assert_held(&scheduler->lock); + + spin_lock_irqsave(&scheduler->interrupt_lock, flags); -+ for_each_set_bit(i, scheduler->csg_slots_idle_mask, num_groups) { ++ ++ for_each_set_bit(i, scheduler->csg_inuse_bitmap, num_groups) { + struct kbase_csf_csg_slot *csg_slot = &scheduler->csg_slots[i]; + struct kbase_queue_group *group = csg_slot->resident_group; + struct kbase_csf_cmd_stream_group_info *const ginfo = + &global_iface->groups[i]; + u32 csg_req; ++ bool idle_flag; + -+ clear_bit(i, scheduler->csg_slots_idle_mask); -+ -+ if (WARN_ON(!group)) ++ if (WARN_ON(!group)) { ++ clear_bit(i, scheduler->csg_inuse_bitmap); ++ clear_bit(i, scheduler->csg_slots_idle_mask); + continue; ++ } + -+ csg_req = kbase_csf_firmware_csg_output(ginfo, CSG_ACK); -+ csg_req ^= CSG_REQ_STATUS_UPDATE_MASK; -+ kbase_csf_firmware_csg_input_mask(ginfo, CSG_REQ, csg_req, -+ CSG_REQ_STATUS_UPDATE_MASK); ++ idle_flag = test_bit(i, scheduler->csg_slots_idle_mask); ++ if (idle_flag || group->reevaluate_idle_status) { ++ if (idle_flag) { ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ if (!bitmap_empty(group->protm_pending_bitmap, ++ ginfo->stream_num)) { ++ dev_warn(kbdev->dev, ++ "Idle bit set for group %d of ctx %d_%d on slot %d with pending protm execution", ++ group->handle, group->kctx->tgid, ++ group->kctx->id, (int)i); ++ } ++#endif ++ clear_bit(i, scheduler->csg_slots_idle_mask); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_SLOT_IDLE_CLEAR, group, ++ scheduler->csg_slots_idle_mask[0]); ++ } else { ++ /* Updates include slots for which reevaluation is needed. ++ * Here one tracks the extra included slots in active_chk. ++ * For protm pending slots, their status of activeness are ++ * assured so no need to request an update. ++ */ ++ active_chk |= BIT(i); ++ group->reevaluate_idle_status = false; ++ } + -+ set_bit(i, csg_bitmap); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_UPDATE_IDLE_SLOT_REQ, group, i); ++ csg_req = kbase_csf_firmware_csg_output(ginfo, CSG_ACK); ++ csg_req ^= CSG_REQ_STATUS_UPDATE_MASK; ++ kbase_csf_firmware_csg_input_mask(ginfo, CSG_REQ, csg_req, ++ CSG_REQ_STATUS_UPDATE_MASK); ++ ++ /* Track the slot update requests in csg_bitmap. ++ * Note, if the scheduler requested extended update, the resulting ++ * csg_bitmap would be the idle_flags + active_chk. Otherwise it's ++ * identical to the idle_flags. ++ */ ++ set_bit(i, csg_bitmap); ++ } else { ++ group->run_state = KBASE_CSF_GROUP_RUNNABLE; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSF_GROUP_RUNNABLE, group, ++ group->run_state); ++ } + } -+ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++ + + /* The groups are aggregated into a single kernel doorbell request */ + if (!bitmap_empty(csg_bitmap, num_groups)) { + long wt = -+ kbase_csf_timeout_in_jiffies(CSF_STATE_WAIT_TIMEOUT_MS); ++ kbase_csf_timeout_in_jiffies(kbdev->csf.fw_timeout_ms); + u32 db_slots = (u32)csg_bitmap[0]; + + kbase_csf_ring_csg_slots_doorbell(kbdev, db_slots); ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); + + if (wait_csg_slots_handshake_ack(kbdev, + CSG_REQ_STATUS_UPDATE_MASK, csg_bitmap, wt)) { -+ dev_warn(kbdev->dev, "Timeout, treat groups as not idle: slot mask=0x%lx", -+ csg_bitmap[0]); ++ const int csg_nr = ffs(csg_bitmap[0]) - 1; ++ struct kbase_queue_group *group = ++ scheduler->csg_slots[csg_nr].resident_group; ++ ++ dev_warn( ++ kbdev->dev, ++ "[%llu] Timeout (%d ms) on CSG_REQ:STATUS_UPDATE, treat groups as not idle: slot mask=0x%lx", ++ kbase_backend_get_cycle_cnt(kbdev), ++ kbdev->csf.fw_timeout_ms, ++ csg_bitmap[0]); ++ schedule_actions_trigger_df(kbdev, group->kctx, ++ DF_CSG_STATUS_UPDATE_TIMEOUT); + + /* Store the bitmap of timed out slots */ + bitmap_copy(failed_csg_bitmap, csg_bitmap, num_groups); + csg_bitmap[0] = ~csg_bitmap[0] & db_slots; ++ ++ /* Mask off any failed bit position contributed from active ones, as the ++ * intention is to retain the failed bit pattern contains only those from ++ * idle flags reporting back to the caller. This way, any failed to update ++ * original idle flag would be kept as 'idle' (an informed guess, as the ++ * update did not come to a conclusive result). So will be the failed ++ * active ones be treated as still 'non-idle'. This is for a graceful ++ * handling to the unexpected timeout condition. ++ */ ++ failed_csg_bitmap[0] &= ~active_chk; ++ + } else { -+ csg_bitmap[0] = db_slots; ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_UPDATE_IDLE_SLOTS_ACK, NULL, db_slots); ++ csg_bitmap[0] = db_slots; + } ++ } else { ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); + } +} + +/** + * scheduler_handle_idle_slots() - Update the idle status of queue groups -+ * resident on command stream group slots for which the ++ * resident on CSG slots for which the + * IDLE notification was received previously. + * ++ * @kbdev: Pointer to the GPU device. ++ * + * This function is called at the start of scheduling tick/tock to reconfirm -+ * the idle status of queue groups resident on command sream group slots for ++ * the idle status of queue groups resident on CSG slots for + * which idle notification was received previously, i.e. all the CSG slots + * present in the bitmap scheduler->csg_slots_idle_mask. + * The confirmation is done by sending the CSG status update request to the -+ * firmware. The idleness of a CSG is determined by looping over all the -+ * bound command streams and checking their respective CS_STATUS_WAIT register -+ * as well as the insert and extract offset. ++ * firmware. On completion, the firmware will mark the idleness at the ++ * slot's interface CSG_STATUS_STATE register accordingly. ++ * + * The run state of the groups resident on still idle CSG slots is changed to + * KBASE_CSF_GROUP_IDLE and the bitmap scheduler->csg_slots_idle_mask is + * updated accordingly. + * The bits corresponding to slots for which the status update request timedout + * remain set in scheduler->csg_slots_idle_mask. -+ * -+ * @kbdev: Pointer to the GPU device. + */ +static void scheduler_handle_idle_slots(struct kbase_device *kbdev) +{ @@ -172105,20 +192180,30 @@ index 000000000000..a3017a7f25ba + continue; + if (WARN_ON(!group)) + continue; -+ if (WARN_ON(group->run_state != KBASE_CSF_GROUP_RUNNABLE)) ++ if (WARN_ON(group->run_state != KBASE_CSF_GROUP_RUNNABLE && ++ group->run_state != KBASE_CSF_GROUP_IDLE)) + continue; -+ if (WARN_ON(group->priority >= BASE_QUEUE_GROUP_PRIORITY_COUNT)) ++ if (WARN_ON(group->priority >= KBASE_QUEUE_GROUP_PRIORITY_COUNT)) + continue; + -+ if (group_on_slot_is_idle(kbdev, group, i)) { ++ if (group_on_slot_is_idle(kbdev, i)) { + group->run_state = KBASE_CSF_GROUP_IDLE; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSF_GROUP_IDLE, group, group->run_state); + set_bit(i, scheduler->csg_slots_idle_mask); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSG_SLOT_IDLE_SET, ++ group, scheduler->csg_slots_idle_mask[0]); ++ } else { ++ group->run_state = KBASE_CSF_GROUP_RUNNABLE; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSF_GROUP_RUNNABLE, group, ++ group->run_state); + } + } + + bitmap_or(scheduler->csg_slots_idle_mask, + scheduler->csg_slots_idle_mask, + failed_csg_bitmap, num_groups); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_HANDLE_IDLE_SLOTS, NULL, ++ scheduler->csg_slots_idle_mask[0]); + spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); +} + @@ -172129,8 +192214,7 @@ index 000000000000..a3017a7f25ba + + list_for_each_entry_safe(group, n, &scheduler->idle_groups_to_schedule, + link_to_schedule) { -+ -+ WARN_ON(!queue_group_idle_locked(group)); ++ WARN_ON(!can_schedule_idle_group(group)); + + if (!scheduler->ngrp_to_schedule) { + /* keep the top csg's origin */ @@ -172165,7 +192249,7 @@ index 000000000000..a3017a7f25ba + int i; + + lockdep_assert_held(&scheduler->lock); -+ for (i = 0; i < BASE_QUEUE_GROUP_PRIORITY_COUNT; ++i) { ++ for (i = 0; i < KBASE_QUEUE_GROUP_PRIORITY_COUNT; ++i) { + list_for_each_entry(kctx, + &scheduler->runnable_kctxs, csf.link) { + struct kbase_queue_group *group; @@ -172184,64 +192268,278 @@ index 000000000000..a3017a7f25ba + return NULL; +} + ++/** ++ * suspend_active_groups_on_powerdown() - Suspend active CSG groups upon ++ * suspend or GPU IDLE. ++ * ++ * @kbdev: Pointer to the device ++ * @system_suspend: Flag to indicate it's for system suspend. ++ * ++ * This function will suspend all active CSG groups upon either ++ * system suspend, runtime suspend or GPU IDLE. ++ * ++ * Return: 0 on success, -1 otherwise. ++ */ +static int suspend_active_groups_on_powerdown(struct kbase_device *kbdev, -+ bool is_suspend) ++ bool system_suspend) +{ + struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; + DECLARE_BITMAP(slot_mask, MAX_SUPPORTED_CSGS) = { 0 }; + + int ret = suspend_active_queue_groups(kbdev, slot_mask); + -+ if (ret) { -+ /* The suspend of CSGs failed, trigger the GPU reset and wait -+ * for it to complete to be in a deterministic state. ++ if (unlikely(ret)) { ++ const int csg_nr = ffs(slot_mask[0]) - 1; ++ struct kbase_queue_group *group = ++ scheduler->csg_slots[csg_nr].resident_group; ++ enum dumpfault_error_type error_type = DF_CSG_SUSPEND_TIMEOUT; ++ ++ /* The suspend of CSGs failed, ++ * trigger the GPU reset to be in a deterministic state. + */ -+ dev_warn(kbdev->dev, "Timed out waiting for CSG slots to suspend on power down, slot_mask: 0x%*pb\n", ++ dev_warn(kbdev->dev, "[%llu] Timeout (%d ms) waiting for CSG slots to suspend on power down, slot_mask: 0x%*pb\n", ++ kbase_backend_get_cycle_cnt(kbdev), ++ kbdev->csf.fw_timeout_ms, + kbdev->csf.global_iface.group_num, slot_mask); ++ if (kbase_csf_firmware_ping_wait(kbdev, FW_PING_AFTER_ERROR_TIMEOUT_MS)) ++ error_type = DF_PING_REQUEST_TIMEOUT; ++ schedule_actions_trigger_df(kbdev, group->kctx, error_type); + -+ if (kbase_prepare_to_reset_gpu(kbdev)) ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_NONE)) + kbase_reset_gpu(kbdev); + -+ if (is_suspend) { -+ mutex_unlock(&scheduler->lock); -+ kbase_reset_gpu_wait(kbdev); -+ mutex_lock(&scheduler->lock); -+ } + return -1; + } + + /* Check if the groups became active whilst the suspend was ongoing, + * but only for the case where the system suspend is not in progress + */ -+ if (!is_suspend && atomic_read(&scheduler->non_idle_suspended_grps)) ++ if (!system_suspend && atomic_read(&scheduler->non_idle_offslot_grps)) + return -1; + + return 0; +} + ++/** ++ * all_on_slot_groups_remained_idle - Live check for all groups' idleness ++ * ++ * @kbdev: Pointer to the device. ++ * ++ * Returns false if any of the queues inside any of the groups that have been ++ * assigned a physical CSG slot have work to execute, or have executed work ++ * since having received a GPU idle notification. This function is used to ++ * handle a rance condition between firmware reporting GPU idle and userspace ++ * submitting more work by directly ringing a doorbell. ++ * ++ * Return: false if any queue inside any resident group has work to be processed ++ * or has processed work since GPU idle event, true otherwise. ++ */ ++static bool all_on_slot_groups_remained_idle(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ /* All CSGs have the same number of CSs */ ++ size_t const max_streams = kbdev->csf.global_iface.groups[0].stream_num; ++ size_t i; ++ ++ lockdep_assert_held(&scheduler->lock); ++ lockdep_assert_held(&scheduler->interrupt_lock); ++ ++ for_each_set_bit(i, scheduler->csg_slots_idle_mask, ++ kbdev->csf.global_iface.group_num) { ++ struct kbase_queue_group *const group = ++ scheduler->csg_slots[i].resident_group; ++ size_t j; ++ ++ for (j = 0; j < max_streams; ++j) { ++ struct kbase_queue const *const queue = ++ group->bound_queues[j]; ++ u64 const *output_addr; ++ u64 cur_extract_ofs; ++ ++ if (!queue || !queue->user_io_addr) ++ continue; ++ ++ output_addr = (u64 const *)(queue->user_io_addr + PAGE_SIZE); ++ cur_extract_ofs = output_addr[CS_EXTRACT_LO / sizeof(u64)]; ++ if (cur_extract_ofs != queue->extract_ofs) { ++ /* More work has been executed since the idle ++ * notification. ++ */ ++ return false; ++ } ++ } ++ } ++ ++ return true; ++} ++ ++static bool scheduler_idle_suspendable(struct kbase_device *kbdev) ++{ ++ bool suspend; ++ unsigned long flags; ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ if ((scheduler->state == SCHED_SUSPENDED) || ++ (scheduler->state == SCHED_SLEEPING)) ++ return false; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ spin_lock(&scheduler->interrupt_lock); ++ ++ if (scheduler->fast_gpu_idle_handling) { ++ scheduler->fast_gpu_idle_handling = false; ++ ++ if (scheduler->total_runnable_grps) { ++ suspend = !atomic_read(&scheduler->non_idle_offslot_grps) && ++ kbase_pm_idle_groups_sched_suspendable(kbdev); ++ } else ++ suspend = kbase_pm_no_runnables_sched_suspendable(kbdev); ++ spin_unlock(&scheduler->interrupt_lock); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ return suspend; ++ } ++ ++ if (scheduler->total_runnable_grps) { ++ ++ /* Check both on-slots and off-slots groups idle status */ ++ suspend = kbase_csf_scheduler_all_csgs_idle(kbdev) && ++ !atomic_read(&scheduler->non_idle_offslot_grps) && ++ kbase_pm_idle_groups_sched_suspendable(kbdev); ++ } else ++ suspend = kbase_pm_no_runnables_sched_suspendable(kbdev); ++ ++ /* Confirm that all groups are actually idle before proceeding with ++ * suspension as groups might potentially become active again without ++ * informing the scheduler in case userspace rings a doorbell directly. ++ */ ++ if (suspend && (unlikely(atomic_read(&scheduler->gpu_no_longer_idle)) || ++ unlikely(!all_on_slot_groups_remained_idle(kbdev)))) ++ suspend = false; ++ ++ spin_unlock(&scheduler->interrupt_lock); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ return suspend; ++} ++ ++#ifdef KBASE_PM_RUNTIME ++/** ++ * scheduler_sleep_on_idle - Put the Scheduler in sleeping state on GPU ++ * becoming idle. ++ * ++ * @kbdev: Pointer to the device. ++ * ++ * This function is called on GPU idle notification to trigger the transition of ++ * GPU to sleep state, where MCU firmware pauses execution and L2 cache is ++ * turned off. Scheduler's state is changed to sleeping and all the active queue ++ * groups remain on the CSG slots. ++ */ ++static void scheduler_sleep_on_idle(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ dev_dbg(kbdev->dev, ++ "Scheduler to be put to sleep on GPU becoming idle"); ++ cancel_tick_timer(kbdev); ++ scheduler_pm_idle_before_sleep(kbdev); ++ scheduler->state = SCHED_SLEEPING; ++ KBASE_KTRACE_ADD(kbdev, SCHED_SLEEPING, NULL, scheduler->state); ++} ++#endif ++ ++/** ++ * scheduler_suspend_on_idle - Put the Scheduler in suspended state on GPU ++ * becoming idle. ++ * ++ * @kbdev: Pointer to the device. ++ * ++ * This function is called on GPU idle notification to trigger the power down of ++ * GPU. Scheduler's state is changed to suspended and all the active queue ++ * groups are suspended before halting the MCU firmware. ++ * ++ * Return: true if scheduler will be suspended or false if suspend is aborted. ++ */ ++static bool scheduler_suspend_on_idle(struct kbase_device *kbdev) ++{ ++ int ret = suspend_active_groups_on_powerdown(kbdev, false); ++ ++ if (ret) { ++ dev_dbg(kbdev->dev, "Aborting suspend scheduler (grps: %d)", ++ atomic_read( ++ &kbdev->csf.scheduler.non_idle_offslot_grps)); ++ /* Bring forward the next tick */ ++ kbase_csf_scheduler_tick_advance(kbdev); ++ return false; ++ } ++ ++ dev_dbg(kbdev->dev, "Scheduler to be suspended on GPU becoming idle"); ++ scheduler_suspend(kbdev); ++ cancel_tick_timer(kbdev); ++ return true; ++} ++ +static void gpu_idle_worker(struct work_struct *work) +{ + struct kbase_device *kbdev = container_of( -+ work, struct kbase_device, csf.scheduler.gpu_idle_work.work); ++ work, struct kbase_device, csf.scheduler.gpu_idle_work); + struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ bool scheduler_is_idle_suspendable = false; ++ bool all_groups_suspended = false; ++ ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_GPU_IDLE_WORKER_START, NULL, 0u); ++ ++#define __ENCODE_KTRACE_INFO(reset, idle, all_suspend) \ ++ (((u32)reset) | (((u32)idle) << 4) | (((u32)all_suspend) << 8)) + ++ if (kbase_reset_gpu_try_prevent(kbdev)) { ++ dev_warn(kbdev->dev, "Quit idle for failing to prevent gpu reset.\n"); ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_GPU_IDLE_WORKER_END, NULL, ++ __ENCODE_KTRACE_INFO(true, false, false)); ++ return; ++ } ++ kbase_debug_csf_fault_wait_completion(kbdev); + mutex_lock(&scheduler->lock); + -+ if (!scheduler->total_runnable_grps) { -+ if (scheduler->state != SCHED_SUSPENDED) { -+ scheduler_suspend(kbdev); -+ dev_info(kbdev->dev, "Scheduler now suspended"); -+ } -+ } else { -+ dev_dbg(kbdev->dev, "Scheduler couldn't be suspended"); ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ if (unlikely(scheduler->state == SCHED_BUSY)) { ++ mutex_unlock(&scheduler->lock); ++ kbase_reset_gpu_allow(kbdev); ++ return; ++ } ++#endif ++ ++ scheduler_is_idle_suspendable = scheduler_idle_suspendable(kbdev); ++ if (scheduler_is_idle_suspendable) { ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_GPU_IDLE_WORKER_HANDLING_START, NULL, ++ kbase_csf_ktrace_gpu_cycle_cnt(kbdev)); ++#ifdef KBASE_PM_RUNTIME ++ if (kbase_pm_gpu_sleep_allowed(kbdev) && ++ kbase_csf_scheduler_get_nr_active_csgs(kbdev)) ++ scheduler_sleep_on_idle(kbdev); ++ else ++#endif ++ all_groups_suspended = scheduler_suspend_on_idle(kbdev); ++ ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_GPU_IDLE_WORKER_HANDLING_END, NULL, 0u); + } + + mutex_unlock(&scheduler->lock); ++ kbase_reset_gpu_allow(kbdev); ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_GPU_IDLE_WORKER_END, NULL, ++ __ENCODE_KTRACE_INFO(false, scheduler_is_idle_suspendable, ++ all_groups_suspended)); ++#undef __ENCODE_KTRACE_INFO +} + +static int scheduler_prepare(struct kbase_device *kbdev) +{ + struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ unsigned long flags; + int i; + + lockdep_assert_held(&scheduler->lock); @@ -172261,21 +192559,42 @@ index 000000000000..a3017a7f25ba + scheduler->ngrp_to_schedule = 0; + scheduler->top_ctx = NULL; + scheduler->top_grp = NULL; -+ scheduler->head_slot_priority = MAX_CSG_SLOT_PRIORITY; ++ scheduler->csg_scan_count_for_tick = 0; + WARN_ON(!list_empty(&scheduler->idle_groups_to_schedule)); + scheduler->num_active_address_spaces = 0; + scheduler->num_csg_slots_for_tick = 0; + bitmap_zero(scheduler->csg_slots_prio_update, MAX_SUPPORTED_CSGS); + ++ spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++ scheduler->tick_protm_pending_seq = ++ KBASEP_TICK_PROTM_PEND_SCAN_SEQ_NR_INVALID; + /* Scan out to run groups */ -+ for (i = 0; i < BASE_QUEUE_GROUP_PRIORITY_COUNT; ++i) { ++ for (i = 0; i < KBASE_QUEUE_GROUP_PRIORITY_COUNT; ++i) { + struct kbase_context *kctx; + + list_for_each_entry(kctx, &scheduler->runnable_kctxs, csf.link) + scheduler_ctx_scan_groups(kbdev, kctx, i); + } ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++ ++ /* Update this tick's non-idle groups */ ++ scheduler->non_idle_scanout_grps = scheduler->ngrp_to_schedule; + ++ /* Initial number of non-idle off-slot groups, before the scheduler's ++ * scheduler_apply() operation. This gives a sensible start point view ++ * of the tick. It will be subject to up/downs during the scheduler ++ * active phase. ++ */ ++ atomic_set(&scheduler->non_idle_offslot_grps, ++ scheduler->non_idle_scanout_grps); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_NONIDLE_OFFSLOT_GRP_INC, NULL, ++ scheduler->non_idle_scanout_grps); ++ ++ /* Adds those idle but runnable groups to the scanout list */ + scheduler_scan_idle_groups(kbdev); ++ ++ WARN_ON(scheduler->csg_scan_count_for_tick < scheduler->ngrp_to_schedule); ++ + KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_TOP_GRP, scheduler->top_grp, + scheduler->num_active_address_spaces | + (((u64)scheduler->ngrp_to_schedule) << 32)); @@ -172285,38 +192604,318 @@ index 000000000000..a3017a7f25ba + return 0; +} + -+static void scheduler_wait_protm_quit(struct kbase_device *kbdev) ++/** ++ * keep_lru_on_slots() - Check the condition for LRU is met. ++ * ++ * @kbdev: Pointer to the device. ++ * ++ * This function tries to maintain the Last-Recent-Use case on slots, when ++ * the scheduler has no non-idle off-slot CSGs for a replacement ++ * consideration. This effectively extends the previous scheduling results ++ * for the new one. That is, the last recent used CSGs are retained on slots ++ * for the new tick/tock action. ++ * ++ * Return: true for avoiding on-slot CSGs changes (i.e. keep existing LRU), ++ * otherwise false. ++ */ ++static bool keep_lru_on_slots(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ bool keep_lru = false; ++ int on_slots = bitmap_weight(scheduler->csg_inuse_bitmap, ++ kbdev->csf.global_iface.group_num); ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ if (on_slots && !atomic_read(&scheduler->non_idle_offslot_grps)) { ++ unsigned long flags; ++ ++ spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++ /* All on-slots are idle, no non-idle off-slot CSGs available ++ * for considering a meaningful change. Set keep_lru. ++ */ ++ keep_lru = kbase_csf_scheduler_all_csgs_idle(kbdev); ++ ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++ ++ dev_dbg(kbdev->dev, "Keep_LRU: %d, CSGs on-slots: %d\n", ++ keep_lru, on_slots); ++ } ++ ++ return keep_lru; ++} ++ ++/** ++ * prepare_fast_local_tock() - making preparation arrangement for exercizing ++ * a fast local tock inside scheduling-actions. ++ * ++ * @kbdev: Pointer to the GPU device. ++ * ++ * The function assumes that a scheduling action of firing a fast local tock ++ * call (i.e. an equivalent tock action without dropping the lock) is desired ++ * if there are idle onslot CSGs. The function updates those affected CSGs' ++ * run-state as a preparation. This should only be called from inside the ++ * schedule_actions(), where the previous idle-flags are still considered to ++ * be reflective, following its earlier idle confirmation operational call, ++ * plus some potential newly idle CSGs in the scheduling action committing ++ * steps. ++ * ++ * Return: number of on-slots CSGs that can be considered for replacing. ++ */ ++static int prepare_fast_local_tock(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ u32 num_groups = kbdev->csf.global_iface.group_num; ++ unsigned long flags, i; ++ DECLARE_BITMAP(csg_bitmap, MAX_SUPPORTED_CSGS) = { 0 }; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++ bitmap_copy(csg_bitmap, scheduler->csg_slots_idle_mask, num_groups); ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++ ++ /* Marking the flagged idle CSGs' run state to IDLE, so ++ * the intended fast local tock can replacing them with off-slots ++ * non-idle CSGs. ++ */ ++ for_each_set_bit(i, csg_bitmap, num_groups) { ++ struct kbase_csf_csg_slot *csg_slot = &scheduler->csg_slots[i]; ++ struct kbase_queue_group *group = csg_slot->resident_group; ++ ++ if (!queue_group_idle_locked(group)) { ++ group->run_state = KBASE_CSF_GROUP_IDLE; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSF_GROUP_IDLE, group, group->run_state); ++ } ++ } ++ ++ /* Return the number of idle slots for potential replacement */ ++ return bitmap_weight(csg_bitmap, num_groups); ++} ++ ++static int wait_csg_slots_suspend(struct kbase_device *kbdev, unsigned long *slot_mask, ++ unsigned int timeout_ms) +{ + struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; -+ long wt = kbase_csf_timeout_in_jiffies(CSF_STATE_WAIT_TIMEOUT_MS); -+ long remaining; ++ long remaining = kbase_csf_timeout_in_jiffies(timeout_ms); ++ u32 num_groups = kbdev->csf.global_iface.group_num; ++ int err = 0; ++ DECLARE_BITMAP(slot_mask_local, MAX_SUPPORTED_CSGS); + + lockdep_assert_held(&scheduler->lock); + -+ remaining = wait_event_timeout(kbdev->csf.event_wait, -+ !kbase_csf_scheduler_protected_mode_in_use(kbdev), wt); ++ bitmap_copy(slot_mask_local, slot_mask, MAX_SUPPORTED_CSGS); + -+ if (!remaining) -+ dev_warn(kbdev->dev, "Timeout, protm_quit wait skipped"); ++ while (!bitmap_empty(slot_mask_local, MAX_SUPPORTED_CSGS) && remaining) { ++ DECLARE_BITMAP(changed, MAX_SUPPORTED_CSGS); ++ ++ bitmap_copy(changed, slot_mask_local, MAX_SUPPORTED_CSGS); ++ ++ remaining = wait_event_timeout( ++ kbdev->csf.event_wait, ++ slots_state_changed(kbdev, changed, csg_slot_stopped_locked), remaining); ++ ++ if (likely(remaining)) { ++ u32 i; ++ ++ for_each_set_bit(i, changed, num_groups) { ++ struct kbase_queue_group *group; ++ ++ if (WARN_ON(!csg_slot_stopped_locked(kbdev, (s8)i))) ++ continue; ++ ++ /* The on slot csg is now stopped */ ++ clear_bit(i, slot_mask_local); ++ ++ KBASE_TLSTREAM_TL_KBASE_DEVICE_SUSPEND_CSG( ++ kbdev, kbdev->gpu_props.props.raw_props.gpu_id, i); ++ ++ group = scheduler->csg_slots[i].resident_group; ++ if (likely(group)) { ++ /* Only do save/cleanup if the ++ * group is not terminated during ++ * the sleep. ++ */ ++ save_csg_slot(group); ++ if (cleanup_csg_slot(group)) ++ sched_evict_group(group, true, true); ++ } ++ } ++ } else { ++ dev_warn( ++ kbdev->dev, ++ "[%llu] Suspend request sent on CSG slots 0x%lx timed out for slots 0x%lx", ++ kbase_backend_get_cycle_cnt(kbdev), slot_mask[0], ++ slot_mask_local[0]); ++ /* Return the bitmask of the timed out slots to the caller */ ++ bitmap_copy(slot_mask, slot_mask_local, MAX_SUPPORTED_CSGS); ++ ++ err = -ETIMEDOUT; ++ } ++ } ++ ++ return err; ++} ++ ++/** ++ * evict_lru_or_blocked_csg() - Evict the least-recently-used idle or blocked CSG ++ * ++ * @kbdev: Pointer to the device ++ * ++ * Used to allow for speedier starting/resumption of another CSG. The worst-case ++ * scenario of the evicted CSG being scheduled next is expected to be rare. ++ * Also, the eviction will not be applied if the GPU is running in protected mode. ++ * Otherwise the the eviction attempt would force the MCU to quit the execution of ++ * the protected mode, and likely re-request to enter it again. ++ */ ++static void evict_lru_or_blocked_csg(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ size_t i; ++ struct kbase_queue_group *lru_idle_group = NULL; ++ const u32 total_csg_slots = kbdev->csf.global_iface.group_num; ++ const bool all_addr_spaces_used = (scheduler->num_active_address_spaces >= ++ (kbdev->nr_hw_address_spaces - NUM_RESERVED_AS_SLOTS)); ++ u8 as_usage[BASE_MAX_NR_AS] = { 0 }; ++ ++ lockdep_assert_held(&scheduler->lock); ++ if (kbase_csf_scheduler_protected_mode_in_use(kbdev)) ++ return; ++ ++ BUILD_BUG_ON(MAX_SUPPORTED_CSGS > (sizeof(int) * BITS_PER_BYTE)); ++ if (fls(scheduler->csg_inuse_bitmap[0]) != total_csg_slots) ++ return; /* Some CSG slots remain unused */ ++ ++ if (all_addr_spaces_used) { ++ for (i = 0; i != total_csg_slots; ++i) { ++ if (scheduler->csg_slots[i].resident_group != NULL) { ++ if (WARN_ON(scheduler->csg_slots[i].resident_group->kctx->as_nr < ++ 0)) ++ continue; ++ ++ as_usage[scheduler->csg_slots[i].resident_group->kctx->as_nr]++; ++ } ++ } ++ } ++ ++ for (i = 0; i != total_csg_slots; ++i) { ++ struct kbase_queue_group *const group = scheduler->csg_slots[i].resident_group; ++ ++ /* We expect that by this point all groups would normally be ++ * assigned a physical CSG slot, but if circumstances have ++ * changed then bail out of this optimisation. ++ */ ++ if (group == NULL) ++ return; ++ ++ /* Real-time priority CSGs must be kept on-slot even when ++ * idle. ++ */ ++ if ((group->run_state == KBASE_CSF_GROUP_IDLE) && ++ (group->priority != BASE_QUEUE_GROUP_PRIORITY_REALTIME) && ++ ((lru_idle_group == NULL) || ++ (lru_idle_group->prepared_seq_num < group->prepared_seq_num))) { ++ if (WARN_ON(group->kctx->as_nr < 0)) ++ continue; ++ ++ /* If all address spaces are used, we need to ensure the group does not ++ * share the AS with other active CSGs. Or CSG would be freed without AS ++ * and this optimization would not work. ++ */ ++ if ((!all_addr_spaces_used) || (as_usage[group->kctx->as_nr] == 1)) ++ lru_idle_group = group; ++ } ++ } ++ ++ if (lru_idle_group != NULL) { ++ unsigned long slot_mask = 1 << lru_idle_group->csg_nr; ++ ++ dev_dbg(kbdev->dev, "Suspending LRU idle group %d of context %d_%d on slot %d", ++ lru_idle_group->handle, lru_idle_group->kctx->tgid, ++ lru_idle_group->kctx->id, lru_idle_group->csg_nr); ++ suspend_queue_group(lru_idle_group); ++ if (wait_csg_slots_suspend(kbdev, &slot_mask, kbdev->csf.fw_timeout_ms)) { ++ enum dumpfault_error_type error_type = DF_CSG_SUSPEND_TIMEOUT; ++ ++ dev_warn( ++ kbdev->dev, ++ "[%llu] LRU idle group %d of context %d_%d failed to suspend on slot %d (timeout %d ms)", ++ kbase_backend_get_cycle_cnt(kbdev), lru_idle_group->handle, ++ lru_idle_group->kctx->tgid, lru_idle_group->kctx->id, ++ lru_idle_group->csg_nr, kbdev->csf.fw_timeout_ms); ++ if (kbase_csf_firmware_ping_wait(kbdev, FW_PING_AFTER_ERROR_TIMEOUT_MS)) ++ error_type = DF_PING_REQUEST_TIMEOUT; ++ schedule_actions_trigger_df(kbdev, lru_idle_group->kctx, error_type); ++ } ++ } +} + -+static void schedule_actions(struct kbase_device *kbdev) ++static void schedule_actions(struct kbase_device *kbdev, bool is_tick) +{ + struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; + unsigned long flags; + struct kbase_queue_group *protm_grp; + int ret; ++ bool skip_scheduling_actions; ++ bool skip_idle_slots_update; ++ bool new_protm_top_grp = false; ++ int local_tock_slots = 0; + ++ kbase_reset_gpu_assert_prevented(kbdev); + lockdep_assert_held(&scheduler->lock); + -+ ret = kbase_pm_wait_for_desired_state(kbdev); ++ ret = kbase_csf_scheduler_wait_mcu_active(kbdev); + if (ret) { -+ dev_err(kbdev->dev, "Wait for MCU power on failed"); ++ dev_err(kbdev->dev, ++ "Wait for MCU power on failed on scheduling tick/tock"); + return; + } + -+ scheduler_handle_idle_slots(kbdev); ++ spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++ skip_idle_slots_update = kbase_csf_scheduler_protected_mode_in_use(kbdev); ++ skip_scheduling_actions = ++ !skip_idle_slots_update && kbdev->protected_mode; ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++ ++ /* Skip scheduling actions as GPU reset hasn't been performed yet to ++ * rectify the anomaly that happened when pmode exit interrupt wasn't ++ * received before the termination of group running in pmode. ++ */ ++ if (unlikely(skip_scheduling_actions)) { ++ dev_info(kbdev->dev, ++ "Scheduling actions skipped due to anomaly in pmode"); ++ return; ++ } ++ ++ if (!skip_idle_slots_update) { ++ /* Updating on-slot idle CSGs when not in protected mode. */ ++ scheduler_handle_idle_slots(kbdev); ++ ++ /* Determine whether the condition is met for keeping the ++ * Last-Recent-Use. If true, skipping the remaining action ++ * steps and thus extending the previous tick's arrangement, ++ * in particular, no alterations to on-slot CSGs. ++ */ ++ if (keep_lru_on_slots(kbdev)) ++ return; ++ } ++ ++ if (is_tick) ++ scheduler_rotate(kbdev); ++ ++redo_local_tock: + scheduler_prepare(kbdev); ++ /* Need to specifically enqueue the GPU idle work if there are no groups ++ * to schedule despite the runnable groups. This scenario will happen ++ * if System suspend is done when all groups are idle and and no work ++ * is submitted for the groups after the System resume. ++ */ ++ if (unlikely(!scheduler->ngrp_to_schedule && ++ scheduler->total_runnable_grps)) { ++ dev_dbg(kbdev->dev, "No groups to schedule in the tick"); ++ enqueue_gpu_idle_work(scheduler); ++ return; ++ } + spin_lock_irqsave(&scheduler->interrupt_lock, flags); + protm_grp = scheduler->active_protm_grp; + @@ -172333,6 +192932,11 @@ index 000000000000..a3017a7f25ba + if (protm_grp && scheduler->top_grp == protm_grp) { + dev_dbg(kbdev->dev, "Scheduler keep protm exec: group-%d", + protm_grp->handle); ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++ ++ update_offslot_non_idle_cnt_for_onslot_grp(protm_grp); ++ remove_scheduled_group(kbdev, protm_grp); ++ scheduler_check_pmode_progress(kbdev); + } else if (scheduler->top_grp) { + if (protm_grp) + dev_dbg(kbdev->dev, "Scheduler drop protm exec: group-%d", @@ -172345,96 +192949,184 @@ index 000000000000..a3017a7f25ba + scheduler->top_grp->kctx->tgid, + scheduler->top_grp->kctx->id); + -+ /* Due to GPUCORE-24491 only the top-group is allowed -+ * to be on slot and all other on slot groups have to -+ * be suspended before entering protected mode. -+ * This would change in GPUCORE-24492. ++ /* When entering protected mode all CSG slots can be occupied ++ * but only the protected mode CSG will be running. Any event ++ * that would trigger the execution of an on-slot idle CSG will ++ * need to be handled by the host during protected mode. + */ -+ scheduler->num_csg_slots_for_tick = 1; ++ new_protm_top_grp = true; + } + + spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); + + scheduler_apply(kbdev); ++ + /* Scheduler is dropping the exec of the previous protm_grp, + * Until the protm quit completes, the GPU is effectively + * locked in the secure mode. + */ + if (protm_grp) -+ scheduler_wait_protm_quit(kbdev); ++ scheduler_force_protm_exit(kbdev); + + wait_csg_slots_start(kbdev); + wait_csg_slots_finish_prio_update(kbdev); + -+ if (scheduler->num_csg_slots_for_tick == 1) { ++ if (new_protm_top_grp) { + scheduler_group_check_protm_enter(kbdev, + scheduler->top_grp); ++ } else if (!local_tock_slots && ++ atomic_read(&scheduler->non_idle_offslot_grps)) { ++ /* If during the scheduling action, we have off-slot ++ * non-idle CSGs in waiting, if it happens to have ++ * some new idle slots emerging during the committed ++ * action steps, trigger a one-off fast local tock. ++ */ ++ local_tock_slots = prepare_fast_local_tock(kbdev); ++ ++ if (local_tock_slots) { ++ dev_dbg(kbdev->dev, ++ "In-cycle %d idle slots available\n", ++ local_tock_slots); ++ goto redo_local_tock; ++ } + } ++ } else { ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++ } + -+ return; ++ evict_lru_or_blocked_csg(kbdev); ++} ++ ++/** ++ * can_skip_scheduling() - Check if the scheduling actions can be skipped. ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function is called on a scheduling tick or tock to determine if the ++ * scheduling actions can be skipped. ++ * If Scheduler is in sleeping state and exit from the sleep state is allowed ++ * then activation of MCU will be triggered. The tick or tock work item could ++ * have been in flight when the state of Scheduler was changed to sleeping. ++ * ++ * Return: true if the scheduling actions can be skipped. ++ */ ++static bool can_skip_scheduling(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ if (unlikely(!kbase_reset_gpu_is_not_pending(kbdev))) ++ return true; ++ ++ if (scheduler->state == SCHED_SUSPENDED) ++ return true; ++ ++#ifdef KBASE_PM_RUNTIME ++ if (scheduler->state == SCHED_SLEEPING) { ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ if (kbdev->pm.backend.exit_gpu_sleep_mode) { ++ int ret = scheduler_pm_active_after_sleep(kbdev, &flags); ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ if (!ret) { ++ scheduler->state = SCHED_INACTIVE; ++ KBASE_KTRACE_ADD(kbdev, SCHED_INACTIVE, NULL, scheduler->state); ++ return false; ++ } ++ ++ dev_info(kbdev->dev, ++ "Skip scheduling due to system suspend"); ++ return true; ++ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ return true; + } ++#endif + -+ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); -+ return; ++ return false; +} + +static void schedule_on_tock(struct work_struct *work) +{ -+ struct kbase_device *kbdev = container_of(work, struct kbase_device, -+ csf.scheduler.tock_work.work); ++ struct kbase_device *kbdev = ++ container_of(work, struct kbase_device, csf.scheduler.tock_work.work); + struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ int err; + -+ mutex_lock(&scheduler->lock); -+ -+ if (kbase_reset_gpu_is_active(kbdev) || -+ (scheduler->state == SCHED_SUSPENDED)) { -+ mutex_unlock(&scheduler->lock); ++ err = kbase_reset_gpu_try_prevent(kbdev); ++ /* Regardless of whether reset failed or is currently happening, exit ++ * early ++ */ ++ if (err) + return; ++ ++ kbase_debug_csf_fault_wait_completion(kbdev); ++ mutex_lock(&scheduler->lock); ++ if (can_skip_scheduling(kbdev)) ++ { ++ atomic_set(&scheduler->pending_tock_work, false); ++ goto exit_no_schedule_unlock; + } + + WARN_ON(!(scheduler->state == SCHED_INACTIVE)); + scheduler->state = SCHED_BUSY; ++ KBASE_KTRACE_ADD(kbdev, SCHED_BUSY, NULL, scheduler->state); + + /* Undertaking schedule action steps */ -+ KBASE_KTRACE_ADD(kbdev, SCHEDULER_TOCK, NULL, 0u); -+ schedule_actions(kbdev); ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_TOCK_START, NULL, 0u); ++ while (atomic_cmpxchg(&scheduler->pending_tock_work, true, false) == true) ++ schedule_actions(kbdev, false); + -+ /* Record time information */ ++ /* Record time information on a non-skipped tock */ + scheduler->last_schedule = jiffies; + -+ /* Tock is serviced */ -+ scheduler->tock_pending_request = false; -+ + scheduler->state = SCHED_INACTIVE; ++ KBASE_KTRACE_ADD(kbdev, SCHED_INACTIVE, NULL, scheduler->state); ++ if (!scheduler->total_runnable_grps) ++ enqueue_gpu_idle_work(scheduler); + mutex_unlock(&scheduler->lock); ++ kbase_reset_gpu_allow(kbdev); + + dev_dbg(kbdev->dev, + "Waking up for event after schedule-on-tock completes."); + wake_up_all(&kbdev->csf.event_wait); ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_TOCK_END, NULL, 0u); ++ return; ++ ++exit_no_schedule_unlock: ++ mutex_unlock(&scheduler->lock); ++ kbase_reset_gpu_allow(kbdev); +} + +static void schedule_on_tick(struct work_struct *work) +{ -+ struct kbase_device *kbdev = container_of(work, struct kbase_device, -+ csf.scheduler.tick_work.work); ++ struct kbase_device *kbdev = ++ container_of(work, struct kbase_device, csf.scheduler.tick_work); + struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; + ++ int err = kbase_reset_gpu_try_prevent(kbdev); ++ /* Regardless of whether reset failed or is currently happening, exit ++ * early ++ */ ++ if (err) ++ return; ++ ++ kbase_debug_csf_fault_wait_completion(kbdev); + mutex_lock(&scheduler->lock); + -+ if (kbase_reset_gpu_is_active(kbdev) || -+ (scheduler->state == SCHED_SUSPENDED)) { -+ mutex_unlock(&scheduler->lock); -+ return; -+ } ++ WARN_ON(scheduler->tick_timer_active); ++ if (can_skip_scheduling(kbdev)) ++ goto exit_no_schedule_unlock; + + scheduler->state = SCHED_BUSY; -+ -+ /* Do scheduling stuff */ -+ scheduler_rotate(kbdev); ++ KBASE_KTRACE_ADD(kbdev, SCHED_BUSY, NULL, scheduler->state); + + /* Undertaking schedule action steps */ -+ KBASE_KTRACE_ADD(kbdev, SCHEDULER_TICK, NULL, 0u); -+ schedule_actions(kbdev); ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_TICK_START, NULL, scheduler->total_runnable_grps); ++ schedule_actions(kbdev, true); + + /* Record time information */ + scheduler->last_schedule = jiffies; @@ -172442,75 +193134,28 @@ index 000000000000..a3017a7f25ba + /* Kicking next scheduling if needed */ + if (likely(scheduler_timer_is_enabled_nolock(kbdev)) && + (scheduler->total_runnable_grps > 0)) { -+ mod_delayed_work(scheduler->wq, &scheduler->tick_work, -+ CSF_SCHEDULER_TIME_TICK_JIFFIES); -+ dev_dbg(kbdev->dev, "scheduling for next tick, num_runnable_groups:%u\n", ++ start_tick_timer(kbdev); ++ dev_dbg(kbdev->dev, ++ "scheduling for next tick, num_runnable_groups:%u\n", + scheduler->total_runnable_grps); ++ } else if (!scheduler->total_runnable_grps) { ++ enqueue_gpu_idle_work(scheduler); + } + + scheduler->state = SCHED_INACTIVE; + mutex_unlock(&scheduler->lock); ++ KBASE_KTRACE_ADD(kbdev, SCHED_INACTIVE, NULL, scheduler->state); ++ kbase_reset_gpu_allow(kbdev); + + dev_dbg(kbdev->dev, "Waking up for event after schedule-on-tick completes."); + wake_up_all(&kbdev->csf.event_wait); -+} -+ -+int wait_csg_slots_suspend(struct kbase_device *kbdev, -+ const unsigned long *slot_mask, -+ unsigned int timeout_ms) -+{ -+ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; -+ long remaining = kbase_csf_timeout_in_jiffies(timeout_ms); -+ u32 num_groups = kbdev->csf.global_iface.group_num; -+ int err = 0; -+ DECLARE_BITMAP(slot_mask_local, MAX_SUPPORTED_CSGS); -+ -+ lockdep_assert_held(&scheduler->lock); -+ -+ bitmap_copy(slot_mask_local, slot_mask, MAX_SUPPORTED_CSGS); -+ -+ while (!bitmap_empty(slot_mask_local, MAX_SUPPORTED_CSGS) -+ && remaining) { -+ DECLARE_BITMAP(changed, MAX_SUPPORTED_CSGS); -+ -+ bitmap_copy(changed, slot_mask_local, MAX_SUPPORTED_CSGS); -+ -+ remaining = wait_event_timeout(kbdev->csf.event_wait, -+ slots_state_changed(kbdev, changed, -+ csg_slot_stopped_locked), -+ remaining); -+ -+ if (remaining) { -+ u32 i; -+ -+ for_each_set_bit(i, changed, num_groups) { -+ struct kbase_queue_group *group; -+ -+ if (WARN_ON(!csg_slot_stopped_locked(kbdev, (s8)i))) -+ continue; -+ -+ /* The on slot csg is now stopped */ -+ clear_bit(i, slot_mask_local); -+ -+ group = scheduler->csg_slots[i].resident_group; -+ if (likely(group)) { -+ /* Only do save/cleanup if the -+ * group is not terminated during -+ * the sleep. -+ */ -+ save_csg_slot(group); -+ if (cleanup_csg_slot(group)) -+ sched_evict_group(group, true); -+ } -+ } -+ } else { -+ dev_warn(kbdev->dev, "Timed out waiting for CSG slots to suspend, slot_mask: 0x%*pb\n", -+ num_groups, slot_mask_local); -+ err = -ETIMEDOUT; -+ } -+ } ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_TICK_END, NULL, ++ scheduler->total_runnable_grps); ++ return; + -+ return err; ++exit_no_schedule_unlock: ++ mutex_unlock(&scheduler->lock); ++ kbase_reset_gpu_allow(kbdev); +} + +static int suspend_active_queue_groups(struct kbase_device *kbdev, @@ -172533,8 +193178,7 @@ index 000000000000..a3017a7f25ba + } + } + -+ ret = wait_csg_slots_suspend(kbdev, slot_mask, -+ CSG_SUSPEND_ON_RESET_WAIT_TIMEOUT_MS); ++ ret = wait_csg_slots_suspend(kbdev, slot_mask, kbdev->reset_timeout_ms); + return ret; +} + @@ -172543,36 +193187,163 @@ index 000000000000..a3017a7f25ba + struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; + DECLARE_BITMAP(slot_mask, MAX_SUPPORTED_CSGS) = { 0 }; + int ret; ++ int ret2; + + mutex_lock(&scheduler->lock); + + ret = suspend_active_queue_groups(kbdev, slot_mask); ++ + if (ret) { -+ dev_warn(kbdev->dev, "Timed out waiting for CSG slots to suspend before reset, slot_mask: 0x%*pb\n", ++ dev_warn(kbdev->dev, "Timeout waiting for CSG slots to suspend before reset, slot_mask: 0x%*pb\n", + kbdev->csf.global_iface.group_num, slot_mask); + } + -+ if (!bitmap_empty(slot_mask, MAX_SUPPORTED_CSGS)) { -+ int ret2; ++ /* Need to flush the GPU cache to ensure suspend buffer ++ * contents are not lost on reset of GPU. ++ * Do this even if suspend operation had timed out for some of ++ * the CSG slots. ++ * In case the scheduler already in suspended state, the ++ * cache clean is required as the async reset request from ++ * the debugfs may race against the scheduler suspend operation ++ * due to the extra context ref-count, which prevents the ++ * L2 powering down cache clean operation in the non racing ++ * case. ++ * LSC is being flushed together to cover buslogging usecase, ++ * where GPU reset is done regularly to avoid the log buffer ++ * overflow. ++ */ ++ kbase_gpu_start_cache_clean(kbdev, GPU_COMMAND_CACHE_CLN_INV_L2_LSC); ++ ret2 = kbase_gpu_wait_cache_clean_timeout(kbdev, ++ kbdev->reset_timeout_ms); ++ if (ret2) { ++ dev_warn(kbdev->dev, "[%llu] Timeout waiting for cache clean to complete before reset", ++ kbase_backend_get_cycle_cnt(kbdev)); ++ if (!ret) ++ ret = ret2; ++ } ++ ++ mutex_unlock(&scheduler->lock); ++ ++ return ret; ++} ++ ++/** ++ * scheduler_handle_reset_in_protected_mode() - Update the state of normal mode ++ * groups when reset is done during ++ * protected mode execution. ++ * ++ * @kbdev: Pointer to the device. ++ * ++ * This function is called at the time of GPU reset, before the suspension of ++ * queue groups, to handle the case when the reset is getting performed whilst ++ * GPU is in protected mode. ++ * On entry to protected mode all the groups, except the top group that executes ++ * in protected mode, are implicitly suspended by the FW. Thus this function ++ * simply marks the normal mode groups as suspended (and cleans up the ++ * corresponding CSG slots) to prevent their potential forceful eviction from ++ * the Scheduler. So if GPU was in protected mode and there was no fault, then ++ * only the protected mode group would be suspended in the regular way post exit ++ * from this function. And if GPU was in normal mode, then all on-slot groups ++ * will get suspended in the regular way. ++ * ++ * Return: true if the groups remaining on the CSG slots need to be suspended in ++ * the regular way by sending CSG SUSPEND reqs to FW, otherwise false. ++ */ ++static bool scheduler_handle_reset_in_protected_mode(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ u32 const num_groups = kbdev->csf.global_iface.group_num; ++ struct kbase_queue_group *protm_grp; ++ bool suspend_on_slot_groups = true; ++ bool pmode_active; ++ unsigned long flags; ++ u32 csg_nr; ++ ++ mutex_lock(&scheduler->lock); ++ ++ spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++ protm_grp = scheduler->active_protm_grp; ++ pmode_active = kbdev->protected_mode; ++ ++ if (likely(!protm_grp && !pmode_active)) { ++ /* Case 1: GPU is not in protected mode or it successfully ++ * exited protected mode. All on-slot groups can be suspended in ++ * the regular way before reset. ++ */ ++ suspend_on_slot_groups = true; ++ } else if (protm_grp && pmode_active) { ++ /* Case 2: GPU went successfully into protected mode and hasn't ++ * exited from it yet and the protected mode group is still ++ * active. If there was no fault for the protected mode group ++ * then it can be suspended in the regular way before reset. ++ * The other normal mode on-slot groups were already implicitly ++ * suspended on entry to protected mode so they can be marked as ++ * suspended right away. ++ */ ++ suspend_on_slot_groups = !protm_grp->faulted; ++ } else if (!protm_grp && pmode_active) { ++ /* Case 3: GPU went successfully into protected mode and hasn't ++ * exited from it yet but the protected mode group got deleted. ++ * This would have happened if the FW got stuck during protected ++ * mode for some reason (like GPU page fault or some internal ++ * error). In normal cases FW is expected to send the pmode exit ++ * interrupt before it handles the CSG termination request. ++ * The other normal mode on-slot groups would already have been ++ * implicitly suspended on entry to protected mode so they can be ++ * marked as suspended right away. ++ */ ++ suspend_on_slot_groups = false; ++ } else if (protm_grp && !pmode_active) { ++ /* Case 4: GPU couldn't successfully enter protected mode, i.e. ++ * PROTM_ENTER request had timed out. ++ * All the on-slot groups need to be suspended in the regular ++ * way before reset. ++ */ ++ suspend_on_slot_groups = true; ++ } ++ ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++ ++ if (likely(!pmode_active)) ++ goto unlock; ++ ++ /* GPU hasn't exited protected mode, so all the on-slot groups barring ++ * the protected mode group can be marked as suspended right away. ++ */ ++ for (csg_nr = 0; csg_nr < num_groups; csg_nr++) { ++ struct kbase_queue_group *const group = ++ kbdev->csf.scheduler.csg_slots[csg_nr].resident_group; ++ int new_val; + -+ /* Need to flush the GPU cache to ensure suspend buffer -+ * contents are not lost on reset of GPU. -+ * Do this even if suspend operation had timedout for some of -+ * the CSG slots. ++ if (!group || (group == protm_grp)) ++ continue; ++ ++ cleanup_csg_slot(group); ++ group->run_state = KBASE_CSF_GROUP_SUSPENDED; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSF_GROUP_SUSPENDED, group, group->run_state); ++ ++ /* Simply treat the normal mode groups as non-idle. The tick ++ * scheduled after the reset will re-initialize the counter ++ * anyways. + */ -+ kbase_gpu_start_cache_clean(kbdev); -+ ret2 = kbase_gpu_wait_cache_clean_timeout(kbdev, -+ DEFAULT_RESET_TIMEOUT_MS); -+ if (ret2) { -+ dev_warn(kbdev->dev, "Timed out waiting for cache clean to complete before reset"); -+ if (!ret) -+ ret = ret2; -+ } ++ new_val = atomic_inc_return(&scheduler->non_idle_offslot_grps); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_NONIDLE_OFFSLOT_GRP_INC, group, new_val); + } + ++unlock: + mutex_unlock(&scheduler->lock); ++ return suspend_on_slot_groups; ++} + -+ return ret; ++static void cancel_tick_work(struct kbase_csf_scheduler *const scheduler) ++{ ++ cancel_work_sync(&scheduler->tick_work); ++} ++ ++static void cancel_tock_work(struct kbase_csf_scheduler *const scheduler) ++{ ++ atomic_set(&scheduler->pending_tock_work, false); ++ cancel_delayed_work_sync(&scheduler->tock_work); +} + +static void scheduler_inner_reset(struct kbase_device *kbdev) @@ -172581,17 +193352,22 @@ index 000000000000..a3017a7f25ba + struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; + unsigned long flags; + -+ WARN_ON(csgs_active(kbdev)); ++ WARN_ON(kbase_csf_scheduler_get_nr_active_csgs(kbdev)); + + /* Cancel any potential queued delayed work(s) */ -+ cancel_delayed_work_sync(&scheduler->tick_work); -+ cancel_delayed_work_sync(&scheduler->tock_work); ++ cancel_work_sync(&kbdev->csf.scheduler.gpu_idle_work); ++ cancel_tick_timer(kbdev); ++ cancel_tick_work(scheduler); ++ cancel_tock_work(scheduler); + cancel_delayed_work_sync(&scheduler->ping_work); + + mutex_lock(&scheduler->lock); + + spin_lock_irqsave(&scheduler->interrupt_lock, flags); + bitmap_fill(scheduler->csgs_events_enable_mask, MAX_SUPPORTED_CSGS); ++ if (scheduler->active_protm_grp) ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, SCHEDULER_PROTM_EXIT, scheduler->active_protm_grp, ++ 0u); + scheduler->active_protm_grp = NULL; + memset(kbdev->csf.scheduler.csg_slots, 0, + num_groups * sizeof(struct kbase_csf_csg_slot)); @@ -172614,8 +193390,11 @@ index 000000000000..a3017a7f25ba + + WARN_ON(!kbase_reset_gpu_is_active(kbdev)); + -+ KBASE_KTRACE_ADD(kbdev, SCHEDULER_RESET, NULL, 0u); -+ if (!kbase_csf_scheduler_protected_mode_in_use(kbdev) && ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_RESET_START, NULL, 0u); ++ ++ kbase_debug_csf_fault_wait_completion(kbdev); ++ ++ if (scheduler_handle_reset_in_protected_mode(kbdev) && + !suspend_active_queue_groups_on_reset(kbdev)) { + /* As all groups have been successfully evicted from the CSG + * slots, clear out thee scheduler data fields and return @@ -172651,6 +193430,8 @@ index 000000000000..a3017a7f25ba + + mutex_unlock(&kbdev->kctx_list_lock); + ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_RESET_END, NULL, 0u); ++ + /* After queue groups reset, the scheduler data fields clear out */ + scheduler_inner_reset(kbdev); +} @@ -172661,10 +193442,23 @@ index 000000000000..a3017a7f25ba + csf.scheduler.ping_work.work); + int err; + -+ /* Get the scheduler mutex to ensure that reset will not change while -+ * this function is being executed as otherwise calling kbase_reset_gpu -+ * when reset is already occurring is a programming error. ++ /* Ensure that reset will not be occurring while this function is being ++ * executed as otherwise calling kbase_reset_gpu when reset is already ++ * occurring is a programming error. ++ * ++ * We must use the 'try' variant as the Reset worker can try to flush ++ * this workqueue, which would otherwise deadlock here if we tried to ++ * wait for the reset (and thus ourselves) to complete. + */ ++ err = kbase_reset_gpu_try_prevent(kbdev); ++ if (err) { ++ /* It doesn't matter whether the value was -EAGAIN or a fatal ++ * error, just stop processing. In case of -EAGAIN, the Reset ++ * worker will restart the scheduler later to resume ping ++ */ ++ return; ++ } ++ + mutex_lock(&kbdev->csf.scheduler.lock); + +#ifdef CONFIG_MALI_BIFROST_DEBUG @@ -172674,13 +193468,11 @@ index 000000000000..a3017a7f25ba + } +#endif + -+ if (kbdev->csf.scheduler.state == SCHED_SUSPENDED) -+ goto exit; -+ -+ if (kbase_reset_gpu_is_active(kbdev)) ++ if (kbdev->csf.scheduler.state == SCHED_SUSPENDED || ++ kbdev->csf.scheduler.state == SCHED_SLEEPING) + goto exit; + -+ if (get_nr_active_csgs(kbdev) != 1) ++ if (kbase_csf_scheduler_get_nr_active_csgs(kbdev) != 1) + goto exit; + + if (kbase_csf_scheduler_protected_mode_in_use(kbdev)) @@ -172692,22 +193484,27 @@ index 000000000000..a3017a7f25ba + goto exit; + } + -+ kbase_pm_wait_for_desired_state(kbdev); ++ kbase_csf_scheduler_wait_mcu_active(kbdev); + -+ err = kbase_csf_firmware_ping(kbdev); ++ err = kbase_csf_firmware_ping_wait(kbdev, kbdev->csf.fw_timeout_ms); + + if (err) { -+ if (kbase_prepare_to_reset_gpu(kbdev)) ++ /* It is acceptable to enqueue a reset whilst we've prevented ++ * them, it will happen after we've allowed them again ++ */ ++ if (kbase_prepare_to_reset_gpu( ++ kbdev, RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) + kbase_reset_gpu(kbdev); -+ } else if (get_nr_active_csgs(kbdev) == 1) { -+ queue_delayed_work(system_long_wq, -+ &kbdev->csf.scheduler.ping_work, -+ msecs_to_jiffies(FIRMWARE_PING_INTERVAL_MS)); ++ } else if (kbase_csf_scheduler_get_nr_active_csgs(kbdev) == 1) { ++ queue_delayed_work( ++ system_long_wq, &kbdev->csf.scheduler.ping_work, ++ msecs_to_jiffies(kbase_get_timeout_ms(kbdev, CSF_FIRMWARE_PING_TIMEOUT))); + } + + kbase_pm_context_idle(kbdev); +exit: + mutex_unlock(&kbdev->csf.scheduler.lock); ++ kbase_reset_gpu_allow(kbdev); +} + +int kbase_csf_scheduler_group_copy_suspend_buf(struct kbase_queue_group *group, @@ -172716,19 +193513,42 @@ index 000000000000..a3017a7f25ba + struct kbase_context *const kctx = group->kctx; + struct kbase_device *const kbdev = kctx->kbdev; + struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; -+ int err; ++ bool on_slot; ++ int err = 0; + ++ kbase_reset_gpu_assert_prevented(kbdev); + lockdep_assert_held(&kctx->csf.lock); + mutex_lock(&scheduler->lock); + -+ err = wait_gpu_reset(kbdev); -+ if (err) { -+ dev_warn(kbdev->dev, "Error while waiting for the GPU reset to complete when suspending group %d on slot %d", -+ group->handle, group->csg_nr); -+ goto exit; -+ } ++ on_slot = kbasep_csf_scheduler_group_is_on_slot_locked(group); ++ ++#ifdef KBASE_PM_RUNTIME ++ if (on_slot && (scheduler->state == SCHED_SLEEPING)) { ++ if (wait_for_scheduler_to_exit_sleep(kbdev)) { ++ dev_warn( ++ kbdev->dev, ++ "Wait for scheduler to exit sleep state timedout when copying suspend buffer for group %d of ctx %d_%d on slot %d", ++ group->handle, group->kctx->tgid, ++ group->kctx->id, group->csg_nr); ++ ++ scheduler_wakeup(kbdev, true); ++ ++ /* Wait for MCU firmware to start running */ ++ if (kbase_csf_scheduler_wait_mcu_active(kbdev)) ++ dev_warn( ++ kbdev->dev, ++ "Wait for MCU active failed when copying suspend buffer for group %d of ctx %d_%d on slot %d", ++ group->handle, group->kctx->tgid, ++ group->kctx->id, group->csg_nr); ++ } + -+ if (kbasep_csf_scheduler_group_is_on_slot_locked(group)) { ++ /* Check the group state again as scheduler lock would have been ++ * released when waiting for the exit from SLEEPING state. ++ */ ++ on_slot = kbasep_csf_scheduler_group_is_on_slot_locked(group); ++ } ++#endif ++ if (on_slot) { + DECLARE_BITMAP(slot_mask, MAX_SUPPORTED_CSGS) = {0}; + + set_bit(kbase_csf_scheduler_group_get_slot(group), slot_mask); @@ -172736,10 +193556,11 @@ index 000000000000..a3017a7f25ba + if (!WARN_ON(scheduler->state == SCHED_SUSPENDED)) + suspend_queue_group(group); + err = wait_csg_slots_suspend(kbdev, slot_mask, -+ CSF_STATE_WAIT_TIMEOUT_MS); ++ kbdev->csf.fw_timeout_ms); + if (err) { -+ dev_warn(kbdev->dev, "Timed out waiting for the group %d to suspend on slot %d", -+ group->handle, group->csg_nr); ++ dev_warn(kbdev->dev, "[%llu] Timeout waiting for the group %d to suspend on slot %d", ++ kbase_backend_get_cycle_cnt(kbdev), ++ group->handle, group->csg_nr); + goto exit; + } + } @@ -172748,13 +193569,18 @@ index 000000000000..a3017a7f25ba + unsigned int target_page_nr = 0, i = 0; + u64 offset = sus_buf->offset; + size_t to_copy = sus_buf->size; ++ const u32 csg_suspend_buf_nr_pages = ++ PFN_UP(kbdev->csf.global_iface.groups[0].suspend_size); + + if (scheduler->state != SCHED_SUSPENDED) { + /* Similar to the case of HW counters, need to flush -+ * the GPU cache before reading from the suspend buffer ++ * the GPU L2 cache before reading from the suspend buffer + * pages as they are mapped and cached on GPU side. ++ * Flushing LSC is not done here, since only the flush of ++ * CSG suspend buffer contents is needed from the L2 cache. + */ -+ kbase_gpu_start_cache_clean(kbdev); ++ kbase_gpu_start_cache_clean( ++ kbdev, GPU_COMMAND_CACHE_CLN_INV_L2); + kbase_gpu_wait_cache_clean(kbdev); + } else { + /* Make sure power down transitions have completed, @@ -172766,7 +193592,7 @@ index 000000000000..a3017a7f25ba + kbase_pm_wait_for_desired_state(kbdev); + } + -+ for (i = 0; i < PFN_UP(sus_buf->size) && ++ for (i = 0; i < csg_suspend_buf_nr_pages && + target_page_nr < sus_buf->nr_pages; i++) { + struct page *pg = + as_page(group->normal_suspend_buf.phy[i]); @@ -172817,7 +193643,9 @@ index 000000000000..a3017a7f25ba + bool updated = false; + int stream; + -+ WARN_ON(group->run_state != KBASE_CSF_GROUP_SUSPENDED_ON_WAIT_SYNC); ++ /* Groups can also be blocked on-slot during protected mode. */ ++ WARN_ON(group->run_state != KBASE_CSF_GROUP_SUSPENDED_ON_WAIT_SYNC && ++ group->run_state != KBASE_CSF_GROUP_IDLE); + + for (stream = 0; stream < MAX_SUPPORTED_STREAMS_PER_GROUP; ++stream) { + struct kbase_queue *const queue = group->bound_queues[stream]; @@ -172849,20 +193677,24 @@ index 000000000000..a3017a7f25ba + * This function is called outside the scheduling tick/tock to determine + * if the given GPU queue group can now execute in protected mode or not. + * If the group pointer passed is NULL then the evaluation is done for the -+ * scheduler->top_grp (or the second top-group). ++ * highest priority group on the scheduler maintained group lists without ++ * tick associated rotation actions. This is referred as the 'top-group' ++ * in a tock action sense. + * + * It returns the same group pointer, that was passed as an argument, if that -+ * group matches the scheduler->top_grp and has pending protected region ++ * group matches the highest priority group and has pending protected region + * requests otherwise NULL is returned. + * -+ * If the group pointer passed is NULL then the pointer to scheduler->top_grp -+ * is returned if that has pending protected region requests otherwise NULL is -+ * returned. ++ * If the group pointer passed is NULL then the internal evaluated highest ++ * priority group is returned if that has pending protected region requests ++ * otherwise NULL is returned. + * -+ * If the scheduler->top_grp is NULL, which may happen when the top-group is -+ * evicted during the tick, the second top-group (as a replacement of the -+ * top-group) is used for the match check and also for the evaluation of -+ * pending protected region requests if the group pointer passed is NULL. ++ * The evaluated highest priority group may not necessarily be the same as the ++ * scheduler->top_grp. This can happen if there is dynamic de-idle update ++ * during the tick interval for some on-slots groups that were idle during the ++ * scheduler normal scheduling action, where the scheduler->top_grp was set. ++ * The recorded scheduler->top_grp is untouched by this evualuation, so will not ++ * affect the scheduler context/priority list rotation arrangement. + * + * Return: the pointer to queue group that can currently execute in protected + * mode or NULL. @@ -172879,8 +193711,7 @@ index 000000000000..a3017a7f25ba + if (scheduler->state != SCHED_INACTIVE) + return NULL; + -+ match_grp = scheduler->top_grp ? scheduler->top_grp : -+ get_tock_top_group(scheduler); ++ match_grp = get_tock_top_group(scheduler); + input_grp = group ? group : match_grp; + + if (input_grp && (input_grp == match_grp)) { @@ -172909,17 +193740,198 @@ index 000000000000..a3017a7f25ba + struct kbase_device *const kbdev = group->kctx->kbdev; + struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; + ++ int err = kbase_reset_gpu_try_prevent(kbdev); ++ /* Regardless of whether reset failed or is currently happening, exit ++ * early ++ */ ++ if (err) ++ return; ++ + mutex_lock(&scheduler->lock); + -+ /* Check if the group is now eligible for execution in protected mode -+ * and accordingly undertake full scheduling actions as due to -+ * GPUCORE-24491 the on slot groups other than the top group have to -+ * be suspended first before entering protected mode. -+ */ ++ if (group->run_state == KBASE_CSF_GROUP_IDLE) { ++ group->run_state = KBASE_CSF_GROUP_RUNNABLE; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSF_GROUP_RUNNABLE, group, ++ group->run_state); ++ } ++ /* Check if the group is now eligible for execution in protected mode. */ + if (scheduler_get_protm_enter_async_group(kbdev, group)) -+ schedule_actions(kbdev); ++ scheduler_group_check_protm_enter(kbdev, group); + + mutex_unlock(&scheduler->lock); ++ kbase_reset_gpu_allow(kbdev); ++} ++ ++/** ++ * check_sync_update_for_on_slot_group() - Check the sync wait condition ++ * for all the queues bound to ++ * the given on-slot group. ++ * ++ * @group: Pointer to the on-slot group that requires evaluation. ++ * ++ * This function is called if the GPU is in protected mode and there are on ++ * slot idle groups with higher priority than the active protected mode group ++ * or this function is called when CQS object is signaled whilst GPU is in ++ * sleep state. ++ * This function will evaluate the sync condition, if any, of all the queues ++ * bound to the given group. ++ * ++ * Return: true if the sync condition of at least one queue has been satisfied. ++ */ ++static bool check_sync_update_for_on_slot_group( ++ struct kbase_queue_group *group) ++{ ++ struct kbase_device *const kbdev = group->kctx->kbdev; ++ struct kbase_csf_scheduler *const scheduler = ++ &kbdev->csf.scheduler; ++ bool sync_update_done = false; ++ int i; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ for (i = 0; i < MAX_SUPPORTED_STREAMS_PER_GROUP; i++) { ++ struct kbase_queue *queue = group->bound_queues[i]; ++ ++ if (queue && queue->enabled && !sync_update_done) { ++ struct kbase_csf_cmd_stream_group_info *const ginfo = ++ &kbdev->csf.global_iface.groups[group->csg_nr]; ++ struct kbase_csf_cmd_stream_info *const stream = ++ &ginfo->streams[queue->csi_index]; ++ u32 status = kbase_csf_firmware_cs_output( ++ stream, CS_STATUS_WAIT); ++ unsigned long flags; ++ ++ KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, QUEUE_SYNC_UPDATE_WAIT_STATUS, ++ queue->group, queue, status); ++ ++ if (!CS_STATUS_WAIT_SYNC_WAIT_GET(status)) ++ continue; ++ ++ /* Save the information of sync object of the command ++ * queue so the callback function, 'group_sync_updated' ++ * can evaluate the sync object when it gets updated ++ * later. ++ */ ++ queue->status_wait = status; ++ queue->sync_ptr = kbase_csf_firmware_cs_output( ++ stream, CS_STATUS_WAIT_SYNC_POINTER_LO); ++ queue->sync_ptr |= (u64)kbase_csf_firmware_cs_output( ++ stream, CS_STATUS_WAIT_SYNC_POINTER_HI) << 32; ++ queue->sync_value = kbase_csf_firmware_cs_output( ++ stream, CS_STATUS_WAIT_SYNC_VALUE); ++ queue->blocked_reason = ++ CS_STATUS_BLOCKED_REASON_REASON_GET( ++ kbase_csf_firmware_cs_output( ++ stream, ++ CS_STATUS_BLOCKED_REASON)); ++ ++ if (!evaluate_sync_update(queue)) ++ continue; ++ ++ /* Update csg_slots_idle_mask and group's run_state */ ++ if (group->run_state != KBASE_CSF_GROUP_RUNNABLE) { ++ /* Only clear the group's idle flag if it has been dealt ++ * with by the scheduler's tick/tock action, otherwise ++ * leave it untouched. ++ */ ++ spin_lock_irqsave(&scheduler->interrupt_lock, ++ flags); ++ clear_bit((unsigned int)group->csg_nr, ++ scheduler->csg_slots_idle_mask); ++ KBASE_KTRACE_ADD_CSF_GRP( ++ kbdev, CSG_SLOT_IDLE_CLEAR, group, ++ scheduler->csg_slots_idle_mask[0]); ++ spin_unlock_irqrestore( ++ &scheduler->interrupt_lock, flags); ++ /* Request the scheduler to confirm the condition inferred ++ * here inside the protected mode. ++ */ ++ group->reevaluate_idle_status = true; ++ group->run_state = KBASE_CSF_GROUP_RUNNABLE; ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSF_GROUP_RUNNABLE, group, ++ group->run_state); ++ } ++ ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, GROUP_SYNC_UPDATE_DONE, group, 0u); ++ sync_update_done = true; ++ } ++ } ++ ++ return sync_update_done; ++} ++ ++/** ++ * check_sync_update_for_idle_groups_protm() - Check the sync wait condition ++ * for the idle groups on slot ++ * during protected mode. ++ * ++ * @kbdev: Pointer to the GPU device ++ * ++ * This function checks the gpu queues of all the idle groups on slot during ++ * protected mode that has a higher priority than the active protected mode ++ * group. ++ * ++ * Return: true if the sync condition of at least one queue in a group has been ++ * satisfied. ++ */ ++static bool check_sync_update_for_idle_groups_protm(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ struct kbase_queue_group *protm_grp; ++ bool exit_protm = false; ++ unsigned long flags; ++ u32 num_groups; ++ u32 i; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++ protm_grp = scheduler->active_protm_grp; ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++ ++ if (!protm_grp) ++ return exit_protm; ++ ++ num_groups = kbdev->csf.global_iface.group_num; ++ ++ for_each_set_bit(i, scheduler->csg_slots_idle_mask, num_groups) { ++ struct kbase_csf_csg_slot *csg_slot = ++ &scheduler->csg_slots[i]; ++ struct kbase_queue_group *group = csg_slot->resident_group; ++ ++ if (group->scan_seq_num < protm_grp->scan_seq_num) { ++ /* If sync update has been performed for the group that ++ * has a higher priority than the protm group, then we ++ * need to exit protected mode. ++ */ ++ if (check_sync_update_for_on_slot_group(group)) ++ exit_protm = true; ++ } ++ } ++ ++ return exit_protm; ++} ++ ++static void check_sync_update_in_sleep_mode(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ u32 const num_groups = kbdev->csf.global_iface.group_num; ++ u32 csg_nr; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ for (csg_nr = 0; csg_nr < num_groups; csg_nr++) { ++ struct kbase_queue_group *const group = ++ kbdev->csf.scheduler.csg_slots[csg_nr].resident_group; ++ ++ if (!group) ++ continue; ++ ++ if (check_sync_update_for_on_slot_group(group)) { ++ scheduler_wakeup(kbdev, true); ++ return; ++ } ++ } +} + +/** @@ -172929,38 +193941,65 @@ index 000000000000..a3017a7f25ba + * @work: Pointer to the context-specific work item for evaluating the wait + * condition for all the queue groups in idle_wait_groups list. + * -+ * This function checks the gpu queues of all the groups present in -+ * idle_wait_groups list of a context. If the sync wait condition -+ * for at least one queue bound to the group has been satisfied then -+ * the group is moved to the per context list of runnable groups so -+ * that Scheduler can consider scheduling the group in next tick. ++ * This function checks the gpu queues of all the groups present in both ++ * idle_wait_groups list of a context and all on slot idle groups (if GPU ++ * is in protected mode). ++ * If the sync wait condition for at least one queue bound to the group has ++ * been satisfied then the group is moved to the per context list of ++ * runnable groups so that Scheduler can consider scheduling the group ++ * in next tick or exit protected mode. + */ +static void check_group_sync_update_worker(struct work_struct *work) +{ + struct kbase_context *const kctx = container_of(work, + struct kbase_context, csf.sched.sync_update_work); -+ struct kbase_csf_scheduler *const scheduler = -+ &kctx->kbdev->csf.scheduler; ++ struct kbase_device *const kbdev = kctx->kbdev; ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ bool sync_updated = false; + + mutex_lock(&scheduler->lock); + ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ if (unlikely(scheduler->state == SCHED_BUSY)) { ++ queue_work(kctx->csf.sched.sync_update_wq, ++ &kctx->csf.sched.sync_update_work); ++ mutex_unlock(&scheduler->lock); ++ return; ++ } ++#endif ++ ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_GROUP_SYNC_UPDATE_WORKER_START, kctx, 0u); + if (kctx->csf.sched.num_idle_wait_grps != 0) { + struct kbase_queue_group *group, *temp; + + list_for_each_entry_safe(group, temp, + &kctx->csf.sched.idle_wait_groups, link) { + if (group_sync_updated(group)) { ++ sync_updated = true; + /* Move this group back in to the runnable + * groups list of the context. + */ + update_idle_suspended_group_state(group); -+ KBASE_KTRACE_ADD_CSF_GRP(kctx->kbdev, GROUP_SYNC_UPDATE_DONE, group, 0u); ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, GROUP_SYNC_UPDATE_DONE, group, 0u); + } + } + } else { + WARN_ON(!list_empty(&kctx->csf.sched.idle_wait_groups)); + } + ++ if (check_sync_update_for_idle_groups_protm(kbdev)) { ++ scheduler_force_protm_exit(kbdev); ++ sync_updated = true; ++ } ++ ++ /* If scheduler is in sleep or suspended state, re-activate it ++ * to serve on-slot CSGs blocked on CQS which has been signaled. ++ */ ++ if (!sync_updated && (scheduler->state == SCHED_SLEEPING)) ++ check_sync_update_in_sleep_mode(kbdev); ++ ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_GROUP_SYNC_UPDATE_WORKER_END, kctx, 0u); ++ + mutex_unlock(&scheduler->lock); +} + @@ -172969,7 +194008,8 @@ index 000000000000..a3017a7f25ba +{ + struct kbase_context *const kctx = param; + -+ KBASE_KTRACE_ADD(kctx->kbdev, SYNC_UPDATE_EVENT, kctx, 0u); ++ KBASE_KTRACE_ADD(kctx->kbdev, SCHEDULER_GROUP_SYNC_UPDATE_EVENT, kctx, 0u); ++ + queue_work(kctx->csf.sched.sync_update_wq, + &kctx->csf.sched.sync_update_work); + @@ -172981,7 +194021,9 @@ index 000000000000..a3017a7f25ba + int priority; + int err; + -+ for (priority = 0; priority < BASE_QUEUE_GROUP_PRIORITY_COUNT; ++ kbase_ctx_sched_init_ctx(kctx); ++ ++ for (priority = 0; priority < KBASE_QUEUE_GROUP_PRIORITY_COUNT; + ++priority) { + INIT_LIST_HEAD(&kctx->csf.sched.runnable_groups[priority]); + } @@ -172997,21 +194039,30 @@ index 000000000000..a3017a7f25ba + if (!kctx->csf.sched.sync_update_wq) { + dev_err(kctx->kbdev->dev, + "Failed to initialize scheduler context workqueue"); -+ return -ENOMEM; ++ err = -ENOMEM; ++ goto alloc_wq_failed; + } + + INIT_WORK(&kctx->csf.sched.sync_update_work, + check_group_sync_update_worker); + ++ kbase_csf_tiler_heap_reclaim_ctx_init(kctx); ++ + err = kbase_csf_event_wait_add(kctx, check_group_sync_update_cb, kctx); + + if (err) { + dev_err(kctx->kbdev->dev, + "Failed to register a sync update callback"); -+ destroy_workqueue(kctx->csf.sched.sync_update_wq); ++ goto event_wait_add_failed; + } + + return err; ++ ++event_wait_add_failed: ++ destroy_workqueue(kctx->csf.sched.sync_update_wq); ++alloc_wq_failed: ++ kbase_ctx_sched_remove_ctx(kctx); ++ return err; +} + +void kbase_csf_scheduler_context_term(struct kbase_context *kctx) @@ -173019,6 +194070,8 @@ index 000000000000..a3017a7f25ba + kbase_csf_event_wait_remove(kctx, check_group_sync_update_cb, kctx); + cancel_work_sync(&kctx->csf.sched.sync_update_work); + destroy_workqueue(kctx->csf.sched.sync_update_wq); ++ ++ kbase_ctx_sched_remove_ctx(kctx); +} + +int kbase_csf_scheduler_init(struct kbase_device *kbdev) @@ -173037,23 +194090,34 @@ index 000000000000..a3017a7f25ba + return -ENOMEM; + } + ++ return kbase_csf_mcu_shared_regs_data_init(kbdev); ++} ++ ++int kbase_csf_scheduler_early_init(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ + scheduler->timer_enabled = true; + + scheduler->wq = alloc_ordered_workqueue("csf_scheduler_wq", WQ_HIGHPRI); + if (!scheduler->wq) { + dev_err(kbdev->dev, "Failed to allocate scheduler workqueue\n"); -+ -+ kfree(scheduler->csg_slots); -+ scheduler->csg_slots = NULL; -+ ++ return -ENOMEM; ++ } ++ scheduler->idle_wq = alloc_ordered_workqueue( ++ "csf_scheduler_gpu_idle_wq", WQ_HIGHPRI); ++ if (!scheduler->idle_wq) { ++ dev_err(kbdev->dev, ++ "Failed to allocate GPU idle scheduler workqueue\n"); ++ destroy_workqueue(kbdev->csf.scheduler.wq); + return -ENOMEM; + } + -+ INIT_DEFERRABLE_WORK(&scheduler->tick_work, schedule_on_tick); ++ INIT_WORK(&scheduler->tick_work, schedule_on_tick); + INIT_DEFERRABLE_WORK(&scheduler->tock_work, schedule_on_tock); ++ atomic_set(&scheduler->pending_tock_work, false); + + INIT_DEFERRABLE_WORK(&scheduler->ping_work, firmware_aliveness_monitor); -+ BUILD_BUG_ON(GLB_REQ_WAIT_TIMEOUT_MS >= FIRMWARE_PING_INTERVAL_MS); + + mutex_init(&scheduler->lock); + spin_lock_init(&scheduler->interrupt_lock); @@ -173067,18 +194131,27 @@ index 000000000000..a3017a7f25ba + (sizeof(scheduler->csgs_events_enable_mask) * BITS_PER_BYTE)); + bitmap_fill(scheduler->csgs_events_enable_mask, MAX_SUPPORTED_CSGS); + scheduler->state = SCHED_SUSPENDED; ++ KBASE_KTRACE_ADD(kbdev, SCHED_SUSPENDED, NULL, scheduler->state); + scheduler->pm_active_count = 0; + scheduler->ngrp_to_schedule = 0; + scheduler->total_runnable_grps = 0; + scheduler->top_ctx = NULL; + scheduler->top_grp = NULL; + scheduler->last_schedule = 0; -+ scheduler->tock_pending_request = false; + scheduler->active_protm_grp = NULL; ++ scheduler->csg_scheduling_period_ms = CSF_SCHEDULER_TIME_TICK_MS; + scheduler_doorbell_init(kbdev); + -+ INIT_DEFERRABLE_WORK(&scheduler->gpu_idle_work, gpu_idle_worker); -+ atomic_set(&scheduler->non_idle_suspended_grps, 0); ++ INIT_WORK(&scheduler->gpu_idle_work, gpu_idle_worker); ++ scheduler->fast_gpu_idle_handling = false; ++ atomic_set(&scheduler->gpu_no_longer_idle, false); ++ atomic_set(&scheduler->non_idle_offslot_grps, 0); ++ ++ hrtimer_init(&scheduler->tick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); ++ scheduler->tick_timer.function = tick_timer_callback; ++ scheduler->tick_timer_active = false; ++ ++ kbase_csf_tiler_heap_reclaim_mgr_init(kbdev); + + return 0; +} @@ -173086,21 +194159,56 @@ index 000000000000..a3017a7f25ba +void kbase_csf_scheduler_term(struct kbase_device *kbdev) +{ + if (kbdev->csf.scheduler.csg_slots) { -+ WARN_ON(csgs_active(kbdev)); -+ cancel_delayed_work_sync(&kbdev->csf.scheduler.gpu_idle_work); ++ WARN_ON(atomic_read(&kbdev->csf.scheduler.non_idle_offslot_grps)); ++ /* The unload of Driver can take place only when all contexts have ++ * been terminated. The groups that were not terminated by the User ++ * are terminated on context termination. So no CSGs are expected ++ * to be active at the time of Driver unload. ++ */ ++ WARN_ON(kbase_csf_scheduler_get_nr_active_csgs(kbdev)); ++ flush_work(&kbdev->csf.scheduler.gpu_idle_work); ++ mutex_lock(&kbdev->csf.scheduler.lock); ++ ++ if (kbdev->csf.scheduler.state != SCHED_SUSPENDED) { ++ unsigned long flags; ++ /* The power policy could prevent the Scheduler from ++ * getting suspended when GPU becomes idle. ++ */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ WARN_ON(kbase_pm_idle_groups_sched_suspendable(kbdev)); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ scheduler_suspend(kbdev); ++ } ++ ++ mutex_unlock(&kbdev->csf.scheduler.lock); + cancel_delayed_work_sync(&kbdev->csf.scheduler.ping_work); -+ destroy_workqueue(kbdev->csf.scheduler.wq); -+ mutex_destroy(&kbdev->csf.scheduler.lock); ++ cancel_tick_timer(kbdev); ++ cancel_tick_work(&kbdev->csf.scheduler); ++ cancel_tock_work(&kbdev->csf.scheduler); + kfree(kbdev->csf.scheduler.csg_slots); + kbdev->csf.scheduler.csg_slots = NULL; + } ++ KBASE_KTRACE_ADD_CSF_GRP(kbdev, CSF_GROUP_TERMINATED, NULL, ++ kbase_csf_scheduler_get_nr_active_csgs(kbdev)); ++ /* Terminating the MCU shared regions, following the release of slots */ ++ kbase_csf_mcu_shared_regs_data_term(kbdev); ++} ++ ++void kbase_csf_scheduler_early_term(struct kbase_device *kbdev) ++{ ++ if (kbdev->csf.scheduler.idle_wq) ++ destroy_workqueue(kbdev->csf.scheduler.idle_wq); ++ if (kbdev->csf.scheduler.wq) ++ destroy_workqueue(kbdev->csf.scheduler.wq); ++ ++ kbase_csf_tiler_heap_reclaim_mgr_term(kbdev); ++ mutex_destroy(&kbdev->csf.scheduler.lock); +} + +/** + * scheduler_enable_tick_timer_nolock - Enable the scheduler tick timer. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * + * This function will restart the scheduler tick so that regular scheduling can + * be resumed without any explicit trigger (like kicking of GPU queues). This @@ -173117,12 +194225,14 @@ index 000000000000..a3017a7f25ba + return; + + WARN_ON((scheduler->state != SCHED_INACTIVE) && -+ (scheduler->state != SCHED_SUSPENDED)); -+ WARN_ON(delayed_work_pending(&scheduler->tick_work)); ++ (scheduler->state != SCHED_SUSPENDED) && ++ (scheduler->state != SCHED_SLEEPING)); + + if (scheduler->total_runnable_grps > 0) { -+ mod_delayed_work(scheduler->wq, &scheduler->tick_work, 0); ++ enqueue_tick_work(kbdev); + dev_dbg(kbdev->dev, "Re-enabling the scheduler timer\n"); ++ } else if (scheduler->state != SCHED_SUSPENDED) { ++ enqueue_gpu_idle_work(scheduler); + } +} + @@ -173156,10 +194266,17 @@ index 000000000000..a3017a7f25ba + currently_enabled = scheduler_timer_is_enabled_nolock(kbdev); + if (currently_enabled && !enable) { + scheduler->timer_enabled = false; ++ cancel_tick_timer(kbdev); ++ mutex_unlock(&scheduler->lock); ++ /* The non-sync version to cancel the normal work item is not ++ * available, so need to drop the lock before cancellation. ++ */ ++ cancel_tick_work(scheduler); ++ cancel_tock_work(scheduler); ++ return; ++ } + -+ cancel_delayed_work(&scheduler->tick_work); -+ cancel_delayed_work(&scheduler->tock_work); -+ } else if (!currently_enabled && enable) { ++ if (!currently_enabled && enable) { + scheduler->timer_enabled = true; + + scheduler_enable_tick_timer_nolock(kbdev); @@ -173178,7 +194295,7 @@ index 000000000000..a3017a7f25ba + goto out; + + if (scheduler->total_runnable_grps > 0) { -+ mod_delayed_work(scheduler->wq, &scheduler->tick_work, 0); ++ enqueue_tick_work(kbdev); + dev_dbg(kbdev->dev, "Kicking the scheduler manually\n"); + } + @@ -173186,86 +194303,250 @@ index 000000000000..a3017a7f25ba + mutex_unlock(&scheduler->lock); +} + -+void kbase_csf_scheduler_pm_suspend(struct kbase_device *kbdev) ++int kbase_csf_scheduler_pm_suspend_no_lock(struct kbase_device *kbdev) +{ + struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ int result = 0; + -+ /* Cancel any potential queued delayed work(s) */ -+ cancel_delayed_work_sync(&scheduler->tick_work); -+ cancel_delayed_work_sync(&scheduler->tock_work); -+ -+ mutex_lock(&scheduler->lock); ++ lockdep_assert_held(&scheduler->lock); + -+ WARN_ON(!kbase_pm_is_suspending(kbdev)); ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ if (unlikely(scheduler->state == SCHED_BUSY)) ++ return -EBUSY; ++#endif + ++#ifdef KBASE_PM_RUNTIME ++ /* If scheduler is in sleeping state, then MCU needs to be activated ++ * to suspend CSGs. ++ */ ++ if (scheduler->state == SCHED_SLEEPING) { ++ dev_info(kbdev->dev, "Activating MCU out of sleep on system suspend"); ++ result = force_scheduler_to_exit_sleep(kbdev); ++ if (result) { ++ dev_warn(kbdev->dev, "Scheduler failed to exit from sleep"); ++ goto exit; ++ } ++ } ++#endif + if (scheduler->state != SCHED_SUSPENDED) { -+ suspend_active_groups_on_powerdown(kbdev, true); -+ dev_info(kbdev->dev, "Scheduler PM suspend"); -+ scheduler_suspend(kbdev); ++ result = suspend_active_groups_on_powerdown(kbdev, true); ++ if (result) { ++ dev_warn(kbdev->dev, "failed to suspend active groups"); ++ goto exit; ++ } else { ++ dev_info(kbdev->dev, "Scheduler PM suspend"); ++ scheduler_suspend(kbdev); ++ cancel_tick_timer(kbdev); ++ } + } -+ mutex_unlock(&scheduler->lock); ++ ++exit: ++ return result; +} + -+void kbase_csf_scheduler_pm_resume(struct kbase_device *kbdev) ++int kbase_csf_scheduler_pm_suspend(struct kbase_device *kbdev) +{ ++ int result = 0; + struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; + ++ /* Cancel any potential queued delayed work(s) */ ++ cancel_tick_work(scheduler); ++ cancel_tock_work(scheduler); ++ ++ result = kbase_reset_gpu_prevent_and_wait(kbdev); ++ if (result) { ++ dev_warn(kbdev->dev, "Stop PM suspending for failing to prevent gpu reset.\n"); ++ return result; ++ } ++ + mutex_lock(&scheduler->lock); + -+ WARN_ON(kbase_pm_is_suspending(kbdev)); ++ result = kbase_csf_scheduler_pm_suspend_no_lock(kbdev); ++ mutex_unlock(&scheduler->lock); ++ ++ kbase_reset_gpu_allow(kbdev); + -+ if (scheduler->total_runnable_grps > 0) { -+ WARN_ON(scheduler->state != SCHED_SUSPENDED); ++ return result; ++} ++KBASE_EXPORT_TEST_API(kbase_csf_scheduler_pm_suspend); ++ ++void kbase_csf_scheduler_pm_resume_no_lock(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ ++ lockdep_assert_held(&scheduler->lock); ++ if ((scheduler->total_runnable_grps > 0) && ++ (scheduler->state == SCHED_SUSPENDED)) { + dev_info(kbdev->dev, "Scheduler PM resume"); + scheduler_wakeup(kbdev, true); + } -+ mutex_unlock(&scheduler->lock); +} + ++void kbase_csf_scheduler_pm_resume(struct kbase_device *kbdev) ++{ ++ mutex_lock(&kbdev->csf.scheduler.lock); ++ ++ kbase_csf_scheduler_pm_resume_no_lock(kbdev); ++ mutex_unlock(&kbdev->csf.scheduler.lock); ++} ++KBASE_EXPORT_TEST_API(kbase_csf_scheduler_pm_resume); ++ +void kbase_csf_scheduler_pm_active(struct kbase_device *kbdev) +{ ++ /* Here the lock is taken to synchronize against the runtime suspend ++ * callback function, which may need to wake up the MCU for suspending ++ * the CSGs before powering down the GPU. ++ */ ++ mutex_lock(&kbdev->csf.scheduler.lock); ++ scheduler_pm_active_handle_suspend(kbdev, ++ KBASE_PM_SUSPEND_HANDLER_NOT_POSSIBLE); ++ mutex_unlock(&kbdev->csf.scheduler.lock); ++} ++KBASE_EXPORT_TEST_API(kbase_csf_scheduler_pm_active); ++ ++void kbase_csf_scheduler_pm_idle(struct kbase_device *kbdev) ++{ ++ /* Here the lock is taken just to maintain symmetry with ++ * kbase_csf_scheduler_pm_active(). ++ */ ++ mutex_lock(&kbdev->csf.scheduler.lock); ++ scheduler_pm_idle(kbdev); ++ mutex_unlock(&kbdev->csf.scheduler.lock); ++} ++KBASE_EXPORT_TEST_API(kbase_csf_scheduler_pm_idle); ++ ++int kbase_csf_scheduler_wait_mcu_active(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; + unsigned long flags; -+ u32 prev_count; ++ int err; + ++ kbase_pm_lock(kbdev); ++ WARN_ON(!kbdev->pm.active_count); + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ prev_count = kbdev->csf.scheduler.pm_active_count++; ++ WARN_ON(!scheduler->pm_active_count); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ kbase_pm_unlock(kbdev); + -+ /* On 0 => 1, make a pm_ctx_active request */ -+ if (!prev_count) -+ kbase_pm_context_active(kbdev); -+ else -+ WARN_ON(prev_count == U32_MAX); ++ kbase_pm_wait_for_poweroff_work_complete(kbdev); ++ ++ err = kbase_pm_wait_for_desired_state(kbdev); ++ if (!err) { ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ WARN_ON(kbdev->pm.backend.mcu_state != KBASE_MCU_ON); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } ++ ++ return err; +} ++KBASE_EXPORT_TEST_API(kbase_csf_scheduler_wait_mcu_active); + -+void kbase_csf_scheduler_pm_idle(struct kbase_device *kbdev) ++#ifdef KBASE_PM_RUNTIME ++int kbase_csf_scheduler_handle_runtime_suspend(struct kbase_device *kbdev) +{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; + unsigned long flags; -+ u32 prev_count; ++ int ret; ++ ++ dev_dbg(kbdev->dev, "Handling runtime suspend"); ++ ++ kbase_reset_gpu_assert_prevented(kbdev); ++ lockdep_assert_held(&scheduler->lock); ++ WARN_ON(scheduler->pm_active_count); ++ ++ if (scheduler->state == SCHED_SUSPENDED) { ++ WARN_ON(kbdev->pm.backend.gpu_sleep_mode_active); ++ return 0; ++ } ++ ++ ret = suspend_active_groups_on_powerdown(kbdev, false); ++ ++ if (ret) { ++ dev_dbg(kbdev->dev, "Aborting runtime suspend (grps: %d)", ++ atomic_read(&scheduler->non_idle_offslot_grps)); + ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbdev->pm.backend.exit_gpu_sleep_mode = true; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ kbase_csf_scheduler_invoke_tick(kbdev); ++ return ret; ++ } ++ ++ scheduler->state = SCHED_SUSPENDED; ++ KBASE_KTRACE_ADD(kbdev, SCHED_SUSPENDED, NULL, scheduler->state); + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ prev_count = kbdev->csf.scheduler.pm_active_count--; ++ kbdev->pm.backend.gpu_sleep_mode_active = false; + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ if (prev_count == 1) -+ kbase_pm_context_idle(kbdev); -+ else -+ WARN_ON(prev_count == 0); ++ wake_up_all(&kbdev->csf.event_wait); ++ return 0; ++} ++ ++void kbase_csf_scheduler_reval_idleness_post_sleep(struct kbase_device *kbdev) ++{ ++ u32 csg_nr; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ WARN_ON(kbdev->pm.backend.mcu_state != KBASE_MCU_IN_SLEEP); ++ ++ for (csg_nr = 0; csg_nr < kbdev->csf.global_iface.group_num; csg_nr++) { ++ struct kbase_csf_cmd_stream_group_info *ginfo = ++ &kbdev->csf.global_iface.groups[csg_nr]; ++ bool csg_idle; ++ ++ if (!kbdev->csf.scheduler.csg_slots[csg_nr].resident_group) ++ continue; ++ ++ csg_idle = ++ kbase_csf_firmware_csg_output(ginfo, CSG_STATUS_STATE) & ++ CSG_STATUS_STATE_IDLE_MASK; ++ if (!csg_idle) { ++ dev_dbg(kbdev->dev, ++ "Re-activate Scheduler after MCU sleep"); ++ kbdev->pm.backend.exit_gpu_sleep_mode = true; ++ kbase_csf_scheduler_invoke_tick(kbdev); ++ break; ++ } ++ } ++} ++ ++void kbase_csf_scheduler_force_sleep(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ ++ mutex_lock(&scheduler->lock); ++ if (kbase_pm_gpu_sleep_allowed(kbdev) && ++ (scheduler->state == SCHED_INACTIVE)) ++ scheduler_sleep_on_idle(kbdev); ++ mutex_unlock(&scheduler->lock); ++} ++#endif ++ ++void kbase_csf_scheduler_force_wakeup(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ ++ mutex_lock(&scheduler->lock); ++ scheduler_wakeup(kbdev, true); ++ mutex_unlock(&scheduler->lock); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h new file mode 100755 -index 000000000000..1b1c0681f64d +index 000000000..d22d7c8b9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h -@@ -0,0 +1,408 @@ +@@ -0,0 +1,681 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -173276,14 +194557,13 @@ index 000000000000..1b1c0681f64d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CSF_SCHEDULER_H_ +#define _KBASE_CSF_SCHEDULER_H_ + +#include "mali_kbase_csf.h" ++#include "mali_kbase_csf_event.h" + +/** + * kbase_csf_scheduler_queue_start() - Enable the running of GPU command queue @@ -173291,13 +194571,14 @@ index 000000000000..1b1c0681f64d + * + * @queue: Pointer to the GPU command queue to be started. + * -+ * This function would enable the start of a command stream interface, within a -+ * command stream group, to which the @queue was bound. -+ * If the command stream group is already scheduled and resident, the command -+ * stream interface will be started right away, otherwise once the group is -+ * made resident. ++ * This function would enable the start of a CSI, within a ++ * CSG, to which the @queue was bound. ++ * If the CSG is already scheduled and resident, the CSI will be started ++ * right away, otherwise once the group is made resident. + * -+ * Return: 0 on success, or negative on failure. ++ * Return: 0 on success, or negative on failure. -EBUSY is returned to ++ * indicate to the caller that queue could not be enabled due to Scheduler ++ * state and the caller can try to enable the queue after sometime. + */ +int kbase_csf_scheduler_queue_start(struct kbase_queue *queue); + @@ -173307,8 +194588,7 @@ index 000000000000..1b1c0681f64d + * + * @queue: Pointer to the GPU command queue to be stopped. + * -+ * This function would stop the command stream interface, within a command -+ * stream group, to which the @queue was bound. ++ * This function would stop the CSI, within a CSG, to which @queue was bound. + * + * Return: 0 on success, or negative on failure. + */ @@ -173329,7 +194609,7 @@ index 000000000000..1b1c0681f64d + +/** + * kbase_csf_scheduler_group_get_slot() - Checks if a queue group is -+ * programmed on a firmware Command Stream Group slot ++ * programmed on a firmware CSG slot + * and returns the slot number. + * + * @group: The command queue group. @@ -173344,7 +194624,7 @@ index 000000000000..1b1c0681f64d + +/** + * kbase_csf_scheduler_group_get_slot_locked() - Checks if a queue group is -+ * programmed on a firmware Command Stream Group slot ++ * programmed on a firmware CSG slot + * and returns the slot number. + * + * @group: The command queue group. @@ -173372,7 +194652,7 @@ index 000000000000..1b1c0681f64d + +/** + * kbase_csf_scheduler_get_group_on_slot()- Gets the queue group that has been -+ * programmed to a firmware Command Stream Group slot. ++ * programmed to a firmware CSG slot. + * + * @kbdev: The GPU device. + * @slot: The slot for which to get the queue group. @@ -173388,7 +194668,7 @@ index 000000000000..1b1c0681f64d + * kbase_csf_scheduler_group_deschedule() - Deschedule a GPU command queue + * group from the firmware. + * -+ * @group: Pointer to the queue group to be scheduled. ++ * @group: Pointer to the queue group to be descheduled. + * + * This function would disable the scheduling of GPU command queue group on + * firmware. @@ -173426,19 +194706,31 @@ index 000000000000..1b1c0681f64d +/** + * kbase_csf_scheduler_init - Initialize the CSF scheduler + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * -+ * The scheduler does the arbitration for the command stream group slots ++ * The scheduler does the arbitration for the CSG slots + * provided by the firmware between the GPU command queue groups created + * by the Clients. ++ * This function must be called after loading firmware and parsing its capabilities. + * + * Return: 0 on success, or negative on failure. + */ +int kbase_csf_scheduler_init(struct kbase_device *kbdev); + +/** -+ * kbase_csf_scheduler_context_init() - Terminate the context-specific part ++ * kbase_csf_scheduler_early_init - Early initialization for the CSF scheduler ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * Initialize necessary resources such as locks, workqueue for CSF scheduler. ++ * This must be called at kbase probe. ++ * ++ * Return: 0 on success, or negative on failure. ++ */ ++int kbase_csf_scheduler_early_init(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_scheduler_context_term() - Terminate the context-specific part + * for CSF scheduler. + * + * @kctx: Pointer to kbase context that is being terminated. @@ -173450,8 +194742,7 @@ index 000000000000..1b1c0681f64d +/** + * kbase_csf_scheduler_term - Terminate the CSF scheduler. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * + * This should be called when unload of firmware is done on device + * termination. @@ -173459,11 +194750,19 @@ index 000000000000..1b1c0681f64d +void kbase_csf_scheduler_term(struct kbase_device *kbdev); + +/** ++ * kbase_csf_scheduler_early_term - Early termination of the CSF scheduler. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * This should be called only when kbase probe fails or gets rmmoded. ++ */ ++void kbase_csf_scheduler_early_term(struct kbase_device *kbdev); ++ ++/** + * kbase_csf_scheduler_reset - Reset the state of all active GPU command + * queue groups. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * + * This function will first iterate through all the active/scheduled GPU + * command queue groups and suspend them (to avoid losing work for groups @@ -173483,8 +194782,7 @@ index 000000000000..1b1c0681f64d +/** + * kbase_csf_scheduler_enable_tick_timer - Enable the scheduler tick timer. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * + * This function will restart the scheduler tick so that regular scheduling can + * be resumed without any explicit trigger (like kicking of GPU queues). @@ -173495,14 +194793,14 @@ index 000000000000..1b1c0681f64d + * kbase_csf_scheduler_group_copy_suspend_buf - Suspend a queue + * group and copy suspend buffer. + * -+ * This function is called to suspend a queue group and copy the suspend_buffer -+ * contents to the input buffer provided. -+ * + * @group: Pointer to the queue group to be suspended. + * @sus_buf: Pointer to the structure which contains details of the + * user buffer and its kernel pinned pages to which we need to copy + * the group suspend buffer. + * ++ * This function is called to suspend a queue group and copy the suspend_buffer ++ * contents to the input buffer provided. ++ * + * Return: 0 on success, or negative on failure. + */ +int kbase_csf_scheduler_group_copy_suspend_buf(struct kbase_queue_group *group, @@ -173511,8 +194809,7 @@ index 000000000000..1b1c0681f64d +/** + * kbase_csf_scheduler_lock - Acquire the global Scheduler lock. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * + * This function will take the global scheduler lock, in order to serialize + * against the Scheduler actions, for access to CS IO pages. @@ -173525,8 +194822,7 @@ index 000000000000..1b1c0681f64d +/** + * kbase_csf_scheduler_unlock - Release the global Scheduler lock. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + */ +static inline void kbase_csf_scheduler_unlock(struct kbase_device *kbdev) +{ @@ -173536,8 +194832,7 @@ index 000000000000..1b1c0681f64d +/** + * kbase_csf_scheduler_spin_lock - Acquire Scheduler interrupt spinlock. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * @flags: Pointer to the memory location that would store the previous + * interrupt state. + * @@ -173553,8 +194848,7 @@ index 000000000000..1b1c0681f64d +/** + * kbase_csf_scheduler_spin_unlock - Release Scheduler interrupt spinlock. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * @flags: Previously stored interrupt state when Scheduler interrupt + * spinlock was acquired. + */ @@ -173568,8 +194862,7 @@ index 000000000000..1b1c0681f64d + * kbase_csf_scheduler_spin_lock_assert_held - Assert if the Scheduler + * interrupt spinlock is held. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + */ +static inline void +kbase_csf_scheduler_spin_lock_assert_held(struct kbase_device *kbdev) @@ -173602,8 +194895,7 @@ index 000000000000..1b1c0681f64d + * + * Note: This function is only effective if the scheduling timer is disabled. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + */ +void kbase_csf_scheduler_kick(struct kbase_device *kbdev); + @@ -173625,10 +194917,13 @@ index 000000000000..1b1c0681f64d + * kbase_csf_scheduler_pm_active - Perform scheduler power active operation + * + * Note: This function will increase the scheduler's internal pm_active_count -+ * value, ensuring that both GPU and MCU are powered for access. ++ * value, ensuring that both GPU and MCU are powered for access. The MCU may ++ * not have actually become active when this function returns, so need to ++ * call kbase_csf_scheduler_wait_mcu_active() for that. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * This function should not be called with global scheduler lock held. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + */ +void kbase_csf_scheduler_pm_active(struct kbase_device *kbdev); + @@ -173636,18 +194931,41 @@ index 000000000000..1b1c0681f64d + * kbase_csf_scheduler_pm_idle - Perform the scheduler power idle operation + * + * Note: This function will decrease the scheduler's internal pm_active_count -+ * value. On reaching 0, the MCU and GPU could be powered off. ++ * value. On reaching 0, the MCU and GPU could be powered off. This function ++ * should not be called with global scheduler lock held. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + */ +void kbase_csf_scheduler_pm_idle(struct kbase_device *kbdev); + +/** ++ * kbase_csf_scheduler_wait_mcu_active - Wait for the MCU to actually become active ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * This function will wait for the MCU to actually become active. It is supposed ++ * to be called after calling kbase_csf_scheduler_pm_active(). It is needed as ++ * kbase_csf_scheduler_pm_active() may not make the MCU active right away. ++ * ++ * Return: 0 if the MCU was successfully activated otherwise an error code. ++ */ ++int kbase_csf_scheduler_wait_mcu_active(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_scheduler_pm_resume_no_lock - Reactivate the scheduler on system resume ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * This function will make the scheduler resume the scheduling of queue groups ++ * and take the power managemenet reference, if there are any runnable groups. ++ * The caller must have acquired the global Scheduler lock. ++ */ ++void kbase_csf_scheduler_pm_resume_no_lock(struct kbase_device *kbdev); ++ ++/** + * kbase_csf_scheduler_pm_resume - Reactivate the scheduler on system resume + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * + * This function will make the scheduler resume the scheduling of queue groups + * and take the power managemenet reference, if there are any runnable groups. @@ -173655,31 +194973,1104 @@ index 000000000000..1b1c0681f64d +void kbase_csf_scheduler_pm_resume(struct kbase_device *kbdev); + +/** ++ * kbase_csf_scheduler_pm_suspend_no_lock - Idle the scheduler on system suspend ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * This function will make the scheduler suspend all the running queue groups ++ * and drop its power managemenet reference. ++ * The caller must have acquired the global Scheduler lock. ++ * ++ * Return: 0 on success. ++ */ ++int kbase_csf_scheduler_pm_suspend_no_lock(struct kbase_device *kbdev); ++ ++/** + * kbase_csf_scheduler_pm_suspend - Idle the scheduler on system suspend + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * + * This function will make the scheduler suspend all the running queue groups + * and drop its power managemenet reference. ++ * ++ * Return: 0 on success. ++ */ ++int kbase_csf_scheduler_pm_suspend(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_scheduler_all_csgs_idle() - Check if the scheduler internal ++ * runtime used slots are all tagged as idle command queue groups. ++ * ++ * @kbdev: Pointer to the device ++ * ++ * Return: true if all the used slots are tagged as idle CSGs. ++ */ ++static inline bool kbase_csf_scheduler_all_csgs_idle(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->csf.scheduler.interrupt_lock); ++ return bitmap_equal(kbdev->csf.scheduler.csg_slots_idle_mask, ++ kbdev->csf.scheduler.csg_inuse_bitmap, ++ kbdev->csf.global_iface.group_num); ++} ++ ++/** ++ * kbase_csf_scheduler_tick_advance_nolock() - Advance the scheduling tick ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function advances the scheduling tick by enqueing the tick work item for ++ * immediate execution, but only if the tick hrtimer is active. If the timer ++ * is inactive then the tick work item is already in flight. ++ * The caller must hold the interrupt lock. ++ */ ++static inline void ++kbase_csf_scheduler_tick_advance_nolock(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ ++ lockdep_assert_held(&scheduler->interrupt_lock); ++ ++ if (scheduler->tick_timer_active) { ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_TICK_ADVANCE, NULL, 0u); ++ scheduler->tick_timer_active = false; ++ queue_work(scheduler->wq, &scheduler->tick_work); ++ } else { ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_TICK_NOADVANCE, NULL, 0u); ++ } ++} ++ ++/** ++ * kbase_csf_scheduler_tick_advance() - Advance the scheduling tick ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function advances the scheduling tick by enqueing the tick work item for ++ * immediate execution, but only if the tick hrtimer is active. If the timer ++ * is inactive then the tick work item is already in flight. ++ */ ++static inline void kbase_csf_scheduler_tick_advance(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++ kbase_csf_scheduler_tick_advance_nolock(kbdev); ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++} ++ ++/** ++ * kbase_csf_scheduler_invoke_tick() - Invoke the scheduling tick ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function will queue the scheduling tick work item for immediate ++ * execution if tick timer is not active. This can be called from interrupt ++ * context to resume the scheduling after GPU was put to sleep. ++ */ ++static inline void kbase_csf_scheduler_invoke_tick(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ unsigned long flags; ++ ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_TICK_INVOKE, NULL, 0u); ++ spin_lock_irqsave(&scheduler->interrupt_lock, flags); ++ if (!scheduler->tick_timer_active) ++ queue_work(scheduler->wq, &scheduler->tick_work); ++ spin_unlock_irqrestore(&scheduler->interrupt_lock, flags); ++} ++ ++/** ++ * kbase_csf_scheduler_invoke_tock() - Invoke the scheduling tock ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function will queue the scheduling tock work item for immediate ++ * execution. ++ */ ++static inline void kbase_csf_scheduler_invoke_tock(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ ++ KBASE_KTRACE_ADD(kbdev, SCHEDULER_TOCK_INVOKE, NULL, 0u); ++ if (atomic_cmpxchg(&scheduler->pending_tock_work, false, true) == false) ++ mod_delayed_work(scheduler->wq, &scheduler->tock_work, 0); ++} ++ ++/** ++ * kbase_csf_scheduler_queue_has_trace() - report whether the queue has been ++ * configured to operate with the ++ * cs_trace feature. ++ * ++ * @queue: Pointer to the queue. ++ * ++ * Return: True if the gpu queue is configured to operate with the cs_trace ++ * feature, otherwise false. ++ */ ++static inline bool kbase_csf_scheduler_queue_has_trace(struct kbase_queue *queue) ++{ ++ lockdep_assert_held(&queue->kctx->kbdev->csf.scheduler.lock); ++ /* In the current arrangement, it is possible for the context to enable ++ * the cs_trace after some queues have been registered with cs_trace in ++ * disabled state. So each queue has its own enabled/disabled condition. ++ */ ++ return (queue->trace_buffer_size && queue->trace_buffer_base); ++} ++ ++#ifdef KBASE_PM_RUNTIME ++/** ++ * kbase_csf_scheduler_reval_idleness_post_sleep() - Check GPU's idleness after ++ * putting MCU to sleep state ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function re-evaluates the idleness of on-slot queue groups after MCU ++ * was put to the sleep state and invokes the scheduling tick if any of the ++ * on-slot queue group became non-idle. ++ * CSG_OUTPUT_BLOCK.CSG_STATUS_STATE.IDLE bit is checked to determine the ++ * idleness which is updated by MCU firmware on handling of the sleep request. ++ * ++ * This function is needed to detect if more work was flushed in the window ++ * between the GPU idle notification and the enabling of Doorbell mirror ++ * interrupt (from MCU state machine). Once Doorbell mirror interrupt is ++ * enabled, Host can receive the notification on User doorbell rings. ++ */ ++void kbase_csf_scheduler_reval_idleness_post_sleep(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_scheduler_handle_runtime_suspend() - Handle runtime suspend by ++ * suspending CSGs. ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function is called from the runtime suspend callback function for ++ * suspending all the on-slot queue groups. If any of the group is found to ++ * be non-idle after the completion of CSG suspend operation or the CSG ++ * suspend operation times out, then the scheduling tick is invoked and an ++ * error is returned so that the GPU power down can be aborted. ++ * ++ * Return: 0 if all the CSGs were suspended, otherwise an error code. ++ */ ++int kbase_csf_scheduler_handle_runtime_suspend(struct kbase_device *kbdev); ++#endif ++ ++/** ++ * kbase_csf_scheduler_process_gpu_idle_event() - Process GPU idle IRQ ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function is called when a GPU idle IRQ has been raised. ++ */ ++void kbase_csf_scheduler_process_gpu_idle_event(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_scheduler_get_nr_active_csgs() - Get the number of active CSGs ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function calculates the number of CSG slots that have a queue group ++ * resident on them. ++ * ++ * Note: This function should not be used if the interrupt_lock is held. Use ++ * kbase_csf_scheduler_get_nr_active_csgs_locked() instead. ++ * ++ * Return: number of active CSGs. ++ */ ++u32 kbase_csf_scheduler_get_nr_active_csgs(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_scheduler_get_nr_active_csgs_locked() - Get the number of active ++ * CSGs ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function calculates the number of CSG slots that have a queue group ++ * resident on them. ++ * ++ * Note: This function should be called with interrupt_lock held. ++ * ++ * Return: number of active CSGs. ++ */ ++u32 kbase_csf_scheduler_get_nr_active_csgs_locked(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_scheduler_force_wakeup() - Forcefully resume the scheduling of CSGs ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function is called to forcefully resume the scheduling of CSGs, even ++ * when there wasn't any work submitted for them. ++ * This function is only used for testing purpose. ++ */ ++void kbase_csf_scheduler_force_wakeup(struct kbase_device *kbdev); ++ ++#ifdef KBASE_PM_RUNTIME ++/** ++ * kbase_csf_scheduler_force_sleep() - Forcefully put the Scheduler to sleeping ++ * state. ++ * ++ * @kbdev: Pointer to the device ++ * ++ * This function is called to forcefully put the Scheduler to sleeping state ++ * and trigger the sleep of MCU. If the CSGs are not idle, then the Scheduler ++ * would get reactivated again immediately. ++ * This function is only used for testing purpose. + */ -+void kbase_csf_scheduler_pm_suspend(struct kbase_device *kbdev); ++void kbase_csf_scheduler_force_sleep(struct kbase_device *kbdev); ++#endif + +#endif /* _KBASE_CSF_SCHEDULER_H_ */ +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.c +new file mode 100644 +index 000000000..a5e0ab5ea +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.c +@@ -0,0 +1,788 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#include "mali_kbase_csf_sync_debugfs.h" ++#include "mali_kbase_csf_csg_debugfs.h" ++#include ++#include ++ ++#if IS_ENABLED(CONFIG_SYNC_FILE) ++#include "mali_kbase_sync.h" ++#endif ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ ++#define CQS_UNREADABLE_LIVE_VALUE "(unavailable)" ++ ++/* GPU queue related values */ ++#define GPU_CSF_MOVE_OPCODE ((u64)0x1) ++#define GPU_CSF_MOVE32_OPCODE ((u64)0x2) ++#define GPU_CSF_SYNC_ADD_OPCODE ((u64)0x25) ++#define GPU_CSF_SYNC_SET_OPCODE ((u64)0x26) ++#define GPU_CSF_SYNC_WAIT_OPCODE ((u64)0x27) ++#define GPU_CSF_SYNC_ADD64_OPCODE ((u64)0x33) ++#define GPU_CSF_SYNC_SET64_OPCODE ((u64)0x34) ++#define GPU_CSF_SYNC_WAIT64_OPCODE ((u64)0x35) ++#define GPU_CSF_CALL_OPCODE ((u64)0x20) ++ ++#define MAX_NR_GPU_CALLS (5) ++#define INSTR_OPCODE_MASK ((u64)0xFF << 56) ++#define INSTR_OPCODE_GET(value) ((value & INSTR_OPCODE_MASK) >> 56) ++#define MOVE32_IMM_MASK ((u64)0xFFFFFFFFFUL) ++#define MOVE_DEST_MASK ((u64)0xFF << 48) ++#define MOVE_DEST_GET(value) ((value & MOVE_DEST_MASK) >> 48) ++#define MOVE_IMM_MASK ((u64)0xFFFFFFFFFFFFUL) ++#define SYNC_SRC0_MASK ((u64)0xFF << 40) ++#define SYNC_SRC1_MASK ((u64)0xFF << 32) ++#define SYNC_SRC0_GET(value) (u8)((value & SYNC_SRC0_MASK) >> 40) ++#define SYNC_SRC1_GET(value) (u8)((value & SYNC_SRC1_MASK) >> 32) ++#define SYNC_WAIT_CONDITION_MASK ((u64)0xF << 28) ++#define SYNC_WAIT_CONDITION_GET(value) (u8)((value & SYNC_WAIT_CONDITION_MASK) >> 28) ++ ++/* Enumeration for types of GPU queue sync events for ++ * the purpose of dumping them through debugfs. ++ */ ++enum debugfs_gpu_sync_type { ++ DEBUGFS_GPU_SYNC_WAIT, ++ DEBUGFS_GPU_SYNC_SET, ++ DEBUGFS_GPU_SYNC_ADD, ++ NUM_DEBUGFS_GPU_SYNC_TYPES ++}; ++ ++/** ++ * kbasep_csf_debugfs_get_cqs_live_u32() - Obtain live (u32) value for a CQS object. ++ * ++ * @kctx: The context of the queue. ++ * @obj_addr: Pointer to the CQS live 32-bit value. ++ * @live_val: Pointer to the u32 that will be set to the CQS object's current, live ++ * value. ++ * ++ * Return: 0 if successful or a negative error code on failure. ++ */ ++static int kbasep_csf_debugfs_get_cqs_live_u32(struct kbase_context *kctx, u64 obj_addr, ++ u32 *live_val) ++{ ++ struct kbase_vmap_struct *mapping; ++ u32 *const cpu_ptr = (u32 *)kbase_phy_alloc_mapping_get(kctx, obj_addr, &mapping); ++ ++ if (!cpu_ptr) ++ return -1; ++ ++ *live_val = *cpu_ptr; ++ kbase_phy_alloc_mapping_put(kctx, mapping); ++ return 0; ++} ++ ++/** ++ * kbasep_csf_debugfs_get_cqs_live_u64() - Obtain live (u64) value for a CQS object. ++ * ++ * @kctx: The context of the queue. ++ * @obj_addr: Pointer to the CQS live value (32 or 64-bit). ++ * @live_val: Pointer to the u64 that will be set to the CQS object's current, live ++ * value. ++ * ++ * Return: 0 if successful or a negative error code on failure. ++ */ ++static int kbasep_csf_debugfs_get_cqs_live_u64(struct kbase_context *kctx, u64 obj_addr, ++ u64 *live_val) ++{ ++ struct kbase_vmap_struct *mapping; ++ u64 *cpu_ptr = (u64 *)kbase_phy_alloc_mapping_get(kctx, obj_addr, &mapping); ++ ++ if (!cpu_ptr) ++ return -1; ++ ++ *live_val = *cpu_ptr; ++ kbase_phy_alloc_mapping_put(kctx, mapping); ++ return 0; ++} ++ ++/** ++ * kbasep_csf_sync_print_kcpu_fence_wait_or_signal() - Print details of a CSF SYNC Fence Wait ++ * or Fence Signal command, contained in a ++ * KCPU queue. ++ * ++ * @file: The seq_file for printing to. ++ * @cmd: The KCPU Command to be printed. ++ * @cmd_name: The name of the command: indicates either a fence SIGNAL or WAIT. ++ */ ++static void kbasep_csf_sync_print_kcpu_fence_wait_or_signal(struct seq_file *file, ++ struct kbase_kcpu_command *cmd, ++ const char *cmd_name) ++{ ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++ struct fence *fence = NULL; ++#else ++ struct dma_fence *fence = NULL; ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) */ ++ ++ struct kbase_sync_fence_info info; ++ const char *timeline_name = NULL; ++ bool is_signaled = false; ++ ++ fence = cmd->info.fence.fence; ++ if (WARN_ON(!fence)) ++ return; ++ ++ kbase_sync_fence_info_get(cmd->info.fence.fence, &info); ++ timeline_name = fence->ops->get_timeline_name(fence); ++ is_signaled = info.status > 0; ++ ++ seq_printf(file, "cmd:%s obj:0x%pK live_value:0x%.8x | ", cmd_name, cmd->info.fence.fence, ++ is_signaled); ++ ++ /* Note: fence->seqno was u32 until 5.1 kernel, then u64 */ ++ seq_printf(file, "timeline_name:%s timeline_context:0x%.16llx fence_seqno:0x%.16llx", ++ timeline_name, fence->context, (u64)fence->seqno); ++} ++ ++/** ++ * kbasep_csf_sync_print_kcpu_cqs_wait() - Print details of a CSF SYNC CQS Wait command, ++ * contained in a KCPU queue. ++ * ++ * @file: The seq_file for printing to. ++ * @cmd: The KCPU Command to be printed. ++ */ ++static void kbasep_csf_sync_print_kcpu_cqs_wait(struct seq_file *file, ++ struct kbase_kcpu_command *cmd) ++{ ++ struct kbase_context *kctx = file->private; ++ size_t i; ++ ++ for (i = 0; i < cmd->info.cqs_wait.nr_objs; i++) { ++ struct base_cqs_wait_info *cqs_obj = &cmd->info.cqs_wait.objs[i]; ++ ++ u32 live_val; ++ int ret = kbasep_csf_debugfs_get_cqs_live_u32(kctx, cqs_obj->addr, &live_val); ++ bool live_val_valid = (ret >= 0); ++ ++ seq_printf(file, "cmd:CQS_WAIT_OPERATION obj:0x%.16llx live_value:", cqs_obj->addr); ++ ++ if (live_val_valid) ++ seq_printf(file, "0x%.16llx", (u64)live_val); ++ else ++ seq_puts(file, CQS_UNREADABLE_LIVE_VALUE); ++ ++ seq_printf(file, " | op:gt arg_value:0x%.8x", cqs_obj->val); ++ } ++} ++ ++/** ++ * kbasep_csf_sync_print_kcpu_cqs_set() - Print details of a CSF SYNC CQS ++ * Set command, contained in a KCPU queue. ++ * ++ * @file: The seq_file for printing to. ++ * @cmd: The KCPU Command to be printed. ++ */ ++static void kbasep_csf_sync_print_kcpu_cqs_set(struct seq_file *file, ++ struct kbase_kcpu_command *cmd) ++{ ++ struct kbase_context *kctx = file->private; ++ size_t i; ++ ++ for (i = 0; i < cmd->info.cqs_set.nr_objs; i++) { ++ struct base_cqs_set *cqs_obj = &cmd->info.cqs_set.objs[i]; ++ ++ u32 live_val; ++ int ret = kbasep_csf_debugfs_get_cqs_live_u32(kctx, cqs_obj->addr, &live_val); ++ bool live_val_valid = (ret >= 0); ++ ++ seq_printf(file, "cmd:CQS_SET_OPERATION obj:0x%.16llx live_value:", cqs_obj->addr); ++ ++ if (live_val_valid) ++ seq_printf(file, "0x%.16llx", (u64)live_val); ++ else ++ seq_puts(file, CQS_UNREADABLE_LIVE_VALUE); ++ ++ seq_printf(file, " | op:add arg_value:0x%.8x", 1); ++ } ++} ++ ++/** ++ * kbasep_csf_sync_get_wait_op_name() - Print the name of a CQS Wait Operation. ++ * ++ * @op: The numerical value of operation. ++ * ++ * Return: const static pointer to the command name, or '??' if unknown. ++ */ ++static const char *kbasep_csf_sync_get_wait_op_name(basep_cqs_wait_operation_op op) ++{ ++ const char *string; ++ ++ switch (op) { ++ case BASEP_CQS_WAIT_OPERATION_LE: ++ string = "le"; ++ break; ++ case BASEP_CQS_WAIT_OPERATION_GT: ++ string = "gt"; ++ break; ++ default: ++ string = "??"; ++ break; ++ } ++ return string; ++} ++ ++/** ++ * kbasep_csf_sync_get_set_op_name() - Print the name of a CQS Set Operation. ++ * ++ * @op: The numerical value of operation. ++ * ++ * Return: const static pointer to the command name, or '??' if unknown. ++ */ ++static const char *kbasep_csf_sync_get_set_op_name(basep_cqs_set_operation_op op) ++{ ++ const char *string; ++ ++ switch (op) { ++ case BASEP_CQS_SET_OPERATION_ADD: ++ string = "add"; ++ break; ++ case BASEP_CQS_SET_OPERATION_SET: ++ string = "set"; ++ break; ++ default: ++ string = "???"; ++ break; ++ } ++ return string; ++} ++ ++/** ++ * kbasep_csf_sync_print_kcpu_cqs_wait_op() - Print details of a CSF SYNC CQS ++ * Wait Operation command, contained ++ * in a KCPU queue. ++ * ++ * @file: The seq_file for printing to. ++ * @cmd: The KCPU Command to be printed. ++ */ ++static void kbasep_csf_sync_print_kcpu_cqs_wait_op(struct seq_file *file, ++ struct kbase_kcpu_command *cmd) ++{ ++ size_t i; ++ struct kbase_context *kctx = file->private; ++ ++ for (i = 0; i < cmd->info.cqs_wait.nr_objs; i++) { ++ struct base_cqs_wait_operation_info *wait_op = ++ &cmd->info.cqs_wait_operation.objs[i]; ++ const char *op_name = kbasep_csf_sync_get_wait_op_name(wait_op->operation); ++ ++ u64 live_val; ++ int ret = kbasep_csf_debugfs_get_cqs_live_u64(kctx, wait_op->addr, &live_val); ++ ++ bool live_val_valid = (ret >= 0); ++ ++ seq_printf(file, "cmd:CQS_WAIT_OPERATION obj:0x%.16llx live_value:", wait_op->addr); ++ ++ if (live_val_valid) ++ seq_printf(file, "0x%.16llx", live_val); ++ else ++ seq_puts(file, CQS_UNREADABLE_LIVE_VALUE); ++ ++ seq_printf(file, " | op:%s arg_value:0x%.16llx", op_name, wait_op->val); ++ } ++} ++ ++/** ++ * kbasep_csf_sync_print_kcpu_cqs_set_op() - Print details of a CSF SYNC CQS ++ * Set Operation command, contained ++ * in a KCPU queue. ++ * ++ * @file: The seq_file for printing to. ++ * @cmd: The KCPU Command to be printed. ++ */ ++static void kbasep_csf_sync_print_kcpu_cqs_set_op(struct seq_file *file, ++ struct kbase_kcpu_command *cmd) ++{ ++ size_t i; ++ struct kbase_context *kctx = file->private; ++ ++ for (i = 0; i < cmd->info.cqs_set_operation.nr_objs; i++) { ++ struct base_cqs_set_operation_info *set_op = &cmd->info.cqs_set_operation.objs[i]; ++ const char *op_name = kbasep_csf_sync_get_set_op_name( ++ (basep_cqs_set_operation_op)set_op->operation); ++ ++ u64 live_val; ++ int ret = kbasep_csf_debugfs_get_cqs_live_u64(kctx, set_op->addr, &live_val); ++ ++ bool live_val_valid = (ret >= 0); ++ ++ seq_printf(file, "cmd:CQS_SET_OPERATION obj:0x%.16llx live_value:", set_op->addr); ++ ++ if (live_val_valid) ++ seq_printf(file, "0x%.16llx", live_val); ++ else ++ seq_puts(file, CQS_UNREADABLE_LIVE_VALUE); ++ ++ seq_printf(file, " | op:%s arg_value:0x%.16llx", op_name, set_op->val); ++ } ++} ++ ++/** ++ * kbasep_csf_kcpu_debugfs_print_queue() - Print debug data for a KCPU queue ++ * ++ * @file: The seq_file to print to. ++ * @queue: Pointer to the KCPU queue. ++ */ ++static void kbasep_csf_sync_kcpu_debugfs_print_queue(struct seq_file *file, ++ struct kbase_kcpu_command_queue *queue) ++{ ++ char started_or_pending; ++ struct kbase_kcpu_command *cmd; ++ struct kbase_context *kctx = file->private; ++ size_t i; ++ ++ if (WARN_ON(!queue)) ++ return; ++ ++ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); ++ mutex_lock(&queue->lock); ++ ++ for (i = 0; i != queue->num_pending_cmds; ++i) { ++ started_or_pending = ((i == 0) && queue->command_started) ? 'S' : 'P'; ++ seq_printf(file, "queue:KCPU-%u-%u exec:%c ", kctx->id, queue->id, ++ started_or_pending); ++ ++ cmd = &queue->commands[queue->start_offset + i]; ++ switch (cmd->type) { ++#if IS_ENABLED(CONFIG_SYNC_FILE) ++ case BASE_KCPU_COMMAND_TYPE_FENCE_SIGNAL: ++ kbasep_csf_sync_print_kcpu_fence_wait_or_signal(file, cmd, "FENCE_SIGNAL"); ++ break; ++ case BASE_KCPU_COMMAND_TYPE_FENCE_WAIT: ++ kbasep_csf_sync_print_kcpu_fence_wait_or_signal(file, cmd, "FENCE_WAIT"); ++ break; ++#endif ++ case BASE_KCPU_COMMAND_TYPE_CQS_WAIT: ++ kbasep_csf_sync_print_kcpu_cqs_wait(file, cmd); ++ break; ++ case BASE_KCPU_COMMAND_TYPE_CQS_SET: ++ kbasep_csf_sync_print_kcpu_cqs_set(file, cmd); ++ break; ++ case BASE_KCPU_COMMAND_TYPE_CQS_WAIT_OPERATION: ++ kbasep_csf_sync_print_kcpu_cqs_wait_op(file, cmd); ++ break; ++ case BASE_KCPU_COMMAND_TYPE_CQS_SET_OPERATION: ++ kbasep_csf_sync_print_kcpu_cqs_set_op(file, cmd); ++ break; ++ default: ++ seq_puts(file, ", U, Unknown blocking command"); ++ break; ++ } ++ ++ seq_puts(file, "\n"); ++ } ++ ++ mutex_unlock(&queue->lock); ++} ++ ++/** ++ * kbasep_csf_sync_kcpu_debugfs_show() - Print CSF KCPU queue sync info ++ * ++ * @file: The seq_file for printing to. ++ * ++ * Return: Negative error code or 0 on success. ++ */ ++static int kbasep_csf_sync_kcpu_debugfs_show(struct seq_file *file) ++{ ++ struct kbase_context *kctx = file->private; ++ unsigned long queue_idx; ++ ++ mutex_lock(&kctx->csf.kcpu_queues.lock); ++ seq_printf(file, "KCPU queues for ctx %u:\n", kctx->id); ++ ++ queue_idx = find_first_bit(kctx->csf.kcpu_queues.in_use, KBASEP_MAX_KCPU_QUEUES); ++ ++ while (queue_idx < KBASEP_MAX_KCPU_QUEUES) { ++ kbasep_csf_sync_kcpu_debugfs_print_queue(file, ++ kctx->csf.kcpu_queues.array[queue_idx]); ++ ++ queue_idx = find_next_bit(kctx->csf.kcpu_queues.in_use, KBASEP_MAX_KCPU_QUEUES, ++ queue_idx + 1); ++ } ++ ++ mutex_unlock(&kctx->csf.kcpu_queues.lock); ++ return 0; ++} ++ ++/** ++ * kbasep_csf_get_move_immediate_value() - Get the immediate values for sync operations ++ * from a MOVE instruction. ++ * ++ * @move_cmd: Raw MOVE instruction. ++ * @sync_addr_reg: Register identifier from SYNC_* instruction. ++ * @compare_val_reg: Register identifier from SYNC_* instruction. ++ * @sync_val: Pointer to store CQS object address for sync operation. ++ * @compare_val: Pointer to store compare value for sync operation. ++ * ++ * Return: True if value is obtained by checking for correct register identifier, ++ * or false otherwise. ++ */ ++static bool kbasep_csf_get_move_immediate_value(u64 move_cmd, u64 sync_addr_reg, ++ u64 compare_val_reg, u64 *sync_val, ++ u64 *compare_val) ++{ ++ u64 imm_mask; ++ ++ /* Verify MOVE instruction and get immediate mask */ ++ if (INSTR_OPCODE_GET(move_cmd) == GPU_CSF_MOVE32_OPCODE) ++ imm_mask = MOVE32_IMM_MASK; ++ else if (INSTR_OPCODE_GET(move_cmd) == GPU_CSF_MOVE_OPCODE) ++ imm_mask = MOVE_IMM_MASK; ++ else ++ /* Error return */ ++ return false; ++ ++ /* Verify value from MOVE instruction and assign to variable */ ++ if (sync_addr_reg == MOVE_DEST_GET(move_cmd)) ++ *sync_val = move_cmd & imm_mask; ++ else if (compare_val_reg == MOVE_DEST_GET(move_cmd)) ++ *compare_val = move_cmd & imm_mask; ++ else ++ /* Error return */ ++ return false; ++ ++ return true; ++} ++ ++/** kbasep_csf_read_ringbuffer_value() - Reads a u64 from the ringbuffer at a provided ++ * offset. ++ * ++ * @queue: Pointer to the queue. ++ * @ringbuff_offset: Ringbuffer offset. ++ * ++ * Return: the u64 in the ringbuffer at the desired offset. ++ */ ++static u64 kbasep_csf_read_ringbuffer_value(struct kbase_queue *queue, u32 ringbuff_offset) ++{ ++ u64 page_off = ringbuff_offset >> PAGE_SHIFT; ++ u64 offset_within_page = ringbuff_offset & ~PAGE_MASK; ++ struct page *page = as_page(queue->queue_reg->gpu_alloc->pages[page_off]); ++ u64 *ringbuffer = kmap_atomic(page); ++ u64 value = ringbuffer[offset_within_page / sizeof(u64)]; ++ ++ kunmap_atomic(ringbuffer); ++ return value; ++} ++ ++/** ++ * kbasep_csf_print_gpu_sync_op() - Print sync operation info for given sync command. ++ * ++ * @file: Pointer to debugfs seq_file file struct for writing output. ++ * @kctx: Pointer to kbase context. ++ * @queue: Pointer to the GPU command queue. ++ * @ringbuff_offset: Offset to index the ring buffer with, for the given sync command. ++ * (Useful for finding preceding MOVE commands) ++ * @sync_cmd: Entire u64 of the sync command, which has both sync address and ++ * comparison-value encoded in it. ++ * @type: Type of GPU sync command (e.g. SYNC_SET, SYNC_ADD, SYNC_WAIT). ++ * @is_64bit: Bool to indicate if operation is 64 bit (true) or 32 bit (false). ++ * @follows_wait: Bool to indicate if the operation follows at least one wait ++ * operation. Used to determine whether it's pending or started. ++ */ ++static void kbasep_csf_print_gpu_sync_op(struct seq_file *file, struct kbase_context *kctx, ++ struct kbase_queue *queue, u32 ringbuff_offset, ++ u64 sync_cmd, enum debugfs_gpu_sync_type type, ++ bool is_64bit, bool follows_wait) ++{ ++ u64 sync_addr = 0, compare_val = 0, live_val = 0; ++ u64 move_cmd; ++ u8 sync_addr_reg, compare_val_reg, wait_condition = 0; ++ int err; ++ ++ static const char *const gpu_sync_type_name[] = { "SYNC_WAIT", "SYNC_SET", "SYNC_ADD" }; ++ static const char *const gpu_sync_type_op[] = { ++ "wait", /* This should never be printed, only included to simplify indexing */ ++ "set", "add" ++ }; ++ ++ if (type >= NUM_DEBUGFS_GPU_SYNC_TYPES) { ++ dev_warn(kctx->kbdev->dev, "Expected GPU queue sync type is unknown!"); ++ return; ++ } ++ ++ /* We expect there to be at least 2 preceding MOVE instructions, and ++ * Base will always arrange for the 2 MOVE + SYNC instructions to be ++ * contiguously located, and is therefore never expected to be wrapped ++ * around the ringbuffer boundary. ++ */ ++ if (unlikely(ringbuff_offset < (2 * sizeof(u64)))) { ++ dev_warn(kctx->kbdev->dev, ++ "Unexpected wraparound detected between %s & MOVE instruction", ++ gpu_sync_type_name[type]); ++ return; ++ } ++ ++ /* 1. Get Register identifiers from SYNC_* instruction */ ++ sync_addr_reg = SYNC_SRC0_GET(sync_cmd); ++ compare_val_reg = SYNC_SRC1_GET(sync_cmd); ++ ++ /* 2. Get values from first MOVE command */ ++ ringbuff_offset -= sizeof(u64); ++ move_cmd = kbasep_csf_read_ringbuffer_value(queue, ringbuff_offset); ++ if (!kbasep_csf_get_move_immediate_value(move_cmd, sync_addr_reg, compare_val_reg, ++ &sync_addr, &compare_val)) ++ return; ++ ++ /* 3. Get values from next MOVE command */ ++ ringbuff_offset -= sizeof(u64); ++ move_cmd = kbasep_csf_read_ringbuffer_value(queue, ringbuff_offset); ++ if (!kbasep_csf_get_move_immediate_value(move_cmd, sync_addr_reg, compare_val_reg, ++ &sync_addr, &compare_val)) ++ return; ++ ++ /* 4. Get CQS object value */ ++ if (is_64bit) ++ err = kbasep_csf_debugfs_get_cqs_live_u64(kctx, sync_addr, &live_val); ++ else ++ err = kbasep_csf_debugfs_get_cqs_live_u32(kctx, sync_addr, (u32 *)(&live_val)); ++ ++ if (err) ++ return; ++ ++ /* 5. Print info */ ++ seq_printf(file, "queue:GPU-%u-%u-%u exec:%c cmd:%s ", kctx->id, queue->group->handle, ++ queue->csi_index, queue->enabled && !follows_wait ? 'S' : 'P', ++ gpu_sync_type_name[type]); ++ ++ if (queue->group->csg_nr == KBASEP_CSG_NR_INVALID) ++ seq_puts(file, "slot:-"); ++ else ++ seq_printf(file, "slot:%d", (int)queue->group->csg_nr); ++ ++ seq_printf(file, " obj:0x%.16llx live_value:0x%.16llx | ", sync_addr, live_val); ++ ++ if (type == DEBUGFS_GPU_SYNC_WAIT) { ++ wait_condition = SYNC_WAIT_CONDITION_GET(sync_cmd); ++ seq_printf(file, "op:%s ", kbasep_csf_sync_get_wait_op_name(wait_condition)); ++ } else ++ seq_printf(file, "op:%s ", gpu_sync_type_op[type]); ++ ++ seq_printf(file, "arg_value:0x%.16llx\n", compare_val); ++} ++ ++/** ++ * kbasep_csf_dump_active_queue_sync_info() - Print GPU command queue sync information. ++ * ++ * @file: seq_file for printing to. ++ * @queue: Address of a GPU command queue to examine. ++ * ++ * This function will iterate through each command in the ring buffer of the given GPU queue from ++ * CS_EXTRACT, and if is a SYNC_* instruction it will attempt to decode the sync operation and ++ * print relevant information to the debugfs file. ++ * This function will stop iterating once the CS_INSERT address is reached by the cursor (i.e. ++ * when there are no more commands to view) or a number of consumed GPU CALL commands have ++ * been observed. ++ */ ++static void kbasep_csf_dump_active_queue_sync_info(struct seq_file *file, struct kbase_queue *queue) ++{ ++ struct kbase_context *kctx; ++ u32 *addr; ++ u64 cs_extract, cs_insert, instr, cursor; ++ bool follows_wait = false; ++ int nr_calls = 0; ++ ++ if (!queue) ++ return; ++ ++ kctx = queue->kctx; ++ ++ addr = (u32 *)queue->user_io_addr; ++ cs_insert = addr[CS_INSERT_LO / 4] | ((u64)addr[CS_INSERT_HI / 4] << 32); ++ ++ addr = (u32 *)(queue->user_io_addr + PAGE_SIZE); ++ cs_extract = addr[CS_EXTRACT_LO / 4] | ((u64)addr[CS_EXTRACT_HI / 4] << 32); ++ ++ cursor = cs_extract; ++ ++ if (!is_power_of_2(queue->size)) { ++ dev_warn(kctx->kbdev->dev, "GPU queue %u size of %u not a power of 2", ++ queue->csi_index, queue->size); ++ return; ++ } ++ ++ while ((cursor < cs_insert) && (nr_calls < MAX_NR_GPU_CALLS)) { ++ bool instr_is_64_bit = false; ++ /* Calculate offset into ringbuffer from the absolute cursor, ++ * by finding the remainder of the cursor divided by the ++ * ringbuffer size. The ringbuffer size is guaranteed to be ++ * a power of 2, so the remainder can be calculated without an ++ * explicit modulo. queue->size - 1 is the ringbuffer mask. ++ */ ++ u32 cursor_ringbuff_offset = (u32)(cursor & (queue->size - 1)); ++ ++ /* Find instruction that cursor is currently on */ ++ instr = kbasep_csf_read_ringbuffer_value(queue, cursor_ringbuff_offset); ++ ++ switch (INSTR_OPCODE_GET(instr)) { ++ case GPU_CSF_SYNC_ADD64_OPCODE: ++ case GPU_CSF_SYNC_SET64_OPCODE: ++ case GPU_CSF_SYNC_WAIT64_OPCODE: ++ instr_is_64_bit = true; ++ default: ++ break; ++ } ++ ++ switch (INSTR_OPCODE_GET(instr)) { ++ case GPU_CSF_SYNC_ADD_OPCODE: ++ case GPU_CSF_SYNC_ADD64_OPCODE: ++ kbasep_csf_print_gpu_sync_op(file, kctx, queue, cursor_ringbuff_offset, ++ instr, DEBUGFS_GPU_SYNC_ADD, instr_is_64_bit, ++ follows_wait); ++ break; ++ case GPU_CSF_SYNC_SET_OPCODE: ++ case GPU_CSF_SYNC_SET64_OPCODE: ++ kbasep_csf_print_gpu_sync_op(file, kctx, queue, cursor_ringbuff_offset, ++ instr, DEBUGFS_GPU_SYNC_SET, instr_is_64_bit, ++ follows_wait); ++ break; ++ case GPU_CSF_SYNC_WAIT_OPCODE: ++ case GPU_CSF_SYNC_WAIT64_OPCODE: ++ kbasep_csf_print_gpu_sync_op(file, kctx, queue, cursor_ringbuff_offset, ++ instr, DEBUGFS_GPU_SYNC_WAIT, instr_is_64_bit, ++ follows_wait); ++ follows_wait = true; /* Future commands will follow at least one wait */ ++ break; ++ case GPU_CSF_CALL_OPCODE: ++ nr_calls++; ++ /* Fallthrough */ ++ default: ++ /* Unrecognized command, skip past it */ ++ break; ++ } ++ ++ cursor += sizeof(u64); ++ } ++} ++ ++/** ++ * kbasep_csf_dump_active_group_sync_state() - Prints SYNC commands in all GPU queues of ++ * the provided queue group. ++ * ++ * @file: seq_file for printing to. ++ * @group: Address of a GPU command group to iterate through. ++ * ++ * This function will iterate through each queue in the provided GPU queue group and ++ * print its SYNC related commands. ++ */ ++static void kbasep_csf_dump_active_group_sync_state(struct seq_file *file, ++ struct kbase_queue_group *const group) ++{ ++ struct kbase_context *kctx = file->private; ++ unsigned int i; ++ ++ seq_printf(file, "GPU queues for group %u (slot %d) of ctx %d_%d\n", group->handle, ++ group->csg_nr, kctx->tgid, kctx->id); ++ ++ for (i = 0; i < MAX_SUPPORTED_STREAMS_PER_GROUP; i++) ++ kbasep_csf_dump_active_queue_sync_info(file, group->bound_queues[i]); ++} ++ ++/** ++ * kbasep_csf_sync_gpu_debugfs_show() - Print CSF GPU queue sync info ++ * ++ * @file: The seq_file for printing to. ++ * ++ * Return: Negative error code or 0 on success. ++ */ ++static int kbasep_csf_sync_gpu_debugfs_show(struct seq_file *file) ++{ ++ u32 gr; ++ struct kbase_context *kctx = file->private; ++ struct kbase_device *kbdev; ++ ++ if (WARN_ON(!kctx)) ++ return -EINVAL; ++ ++ kbdev = kctx->kbdev; ++ kbase_csf_scheduler_lock(kbdev); ++ kbase_csf_debugfs_update_active_groups_status(kbdev); ++ ++ for (gr = 0; gr < kbdev->csf.global_iface.group_num; gr++) { ++ struct kbase_queue_group *const group = ++ kbdev->csf.scheduler.csg_slots[gr].resident_group; ++ if (!group || group->kctx != kctx) ++ continue; ++ kbasep_csf_dump_active_group_sync_state(file, group); ++ } ++ ++ kbase_csf_scheduler_unlock(kbdev); ++ return 0; ++} ++ ++/** ++ * kbasep_csf_sync_debugfs_show() - Print CSF queue sync information ++ * ++ * @file: The seq_file for printing to. ++ * @data: The debugfs dentry private data, a pointer to kbase_context. ++ * ++ * Return: Negative error code or 0 on success. ++ */ ++static int kbasep_csf_sync_debugfs_show(struct seq_file *file, void *data) ++{ ++ seq_printf(file, "MALI_CSF_SYNC_DEBUGFS_VERSION: v%u\n", MALI_CSF_SYNC_DEBUGFS_VERSION); ++ ++ kbasep_csf_sync_kcpu_debugfs_show(file); ++ kbasep_csf_sync_gpu_debugfs_show(file); ++ return 0; ++} ++ ++static int kbasep_csf_sync_debugfs_open(struct inode *in, struct file *file) ++{ ++ return single_open(file, kbasep_csf_sync_debugfs_show, in->i_private); ++} ++ ++static const struct file_operations kbasep_csf_sync_debugfs_fops = { ++ .open = kbasep_csf_sync_debugfs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++ ++/** ++ * kbase_csf_sync_debugfs_init() - Initialise debugfs file. ++ * ++ * @kctx: Kernel context pointer. ++ */ ++void kbase_csf_sync_debugfs_init(struct kbase_context *kctx) ++{ ++ struct dentry *file; ++ const mode_t mode = 0444; ++ ++ if (WARN_ON(!kctx || IS_ERR_OR_NULL(kctx->kctx_dentry))) ++ return; ++ ++ file = debugfs_create_file("csf_sync", mode, kctx->kctx_dentry, kctx, ++ &kbasep_csf_sync_debugfs_fops); ++ ++ if (IS_ERR_OR_NULL(file)) ++ dev_warn(kctx->kbdev->dev, "Unable to create CSF Sync debugfs entry"); ++} ++ ++#else ++/* ++ * Stub functions for when debugfs is disabled ++ */ ++void kbase_csf_sync_debugfs_init(struct kbase_context *kctx) ++{ ++} ++ ++#endif /* CONFIG_DEBUG_FS */ +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.h +new file mode 100644 +index 000000000..177e15d85 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.h +@@ -0,0 +1,37 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#ifndef _KBASE_CSF_SYNC_DEBUGFS_H_ ++#define _KBASE_CSF_SYNC_DEBUGFS_H_ ++ ++/* Forward declaration */ ++struct kbase_context; ++ ++#define MALI_CSF_SYNC_DEBUGFS_VERSION 0 ++ ++/** ++ * kbase_csf_sync_debugfs_init() - Create a debugfs entry for CSF queue sync info ++ * ++ * @kctx: The kbase_context for which to create the debugfs entry ++ */ ++void kbase_csf_sync_debugfs_init(struct kbase_context *kctx); ++ ++#endif /* _KBASE_CSF_SYNC_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c new file mode 100755 -index 000000000000..60cae15bc8ef +index 000000000..8072a8bd2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c -@@ -0,0 +1,584 @@ +@@ -0,0 +1,1372 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -173690,24 +196081,44 @@ index 000000000000..60cae15bc8ef + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + ++#include ++ +#include "mali_kbase_csf_tiler_heap.h" +#include "mali_kbase_csf_tiler_heap_def.h" +#include "mali_kbase_csf_heap_context_alloc.h" + ++/* Tiler heap shrink stop limit for maintaining a minimum number of chunks */ ++#define HEAP_SHRINK_STOP_LIMIT (1) ++ ++/** ++ * struct kbase_csf_gpu_buffer_heap - A gpu buffer object specific to tiler heap ++ * ++ * @cdsbp_0: Descriptor_type and buffer_type ++ * @size: The size of the current heap chunk ++ * @pointer: Pointer to the current heap chunk ++ * @low_pointer: Pointer to low end of current heap chunk ++ * @high_pointer: Pointer to high end of current heap chunk ++ */ ++struct kbase_csf_gpu_buffer_heap { ++ u32 cdsbp_0; ++ u32 size; ++ u64 pointer; ++ u64 low_pointer; ++ u64 high_pointer; ++} __packed; ++ +/** + * encode_chunk_ptr - Encode the address and size of a chunk as an integer. + * ++ * @chunk_size: Size of a tiler heap chunk, in bytes. ++ * @chunk_addr: GPU virtual address of the same tiler heap chunk. ++ * + * The size and address of the next chunk in a list are packed into a single + * 64-bit value for storage in a chunk's header. This function returns that + * value. + * -+ * @chunk_size: Size of a tiler heap chunk, in bytes. -+ * @chunk_addr: GPU virtual address of the same tiler heap chunk. -+ * + * Return: Next chunk pointer suitable for writing into a chunk header. + */ +static u64 encode_chunk_ptr(u32 const chunk_size, u64 const chunk_addr) @@ -173739,8 +196150,6 @@ index 000000000000..60cae15bc8ef +static struct kbase_csf_tiler_heap_chunk *get_last_chunk( + struct kbase_csf_tiler_heap *const heap) +{ -+ lockdep_assert_held(&heap->kctx->csf.tiler_heaps.lock); -+ + if (list_empty(&heap->chunks_list)) + return NULL; + @@ -173749,15 +196158,44 @@ index 000000000000..60cae15bc8ef +} + +/** ++ * remove_external_chunk_mappings - Remove external mappings from a chunk that ++ * is being transitioned to the tiler heap ++ * memory system. ++ * ++ * @kctx: kbase context the chunk belongs to. ++ * @chunk: The chunk whose external mappings are going to be removed. ++ * ++ * This function marks the region as DONT NEED. Along with NO_USER_FREE, this indicates ++ * that the VA region is owned by the tiler heap and could potentially be shrunk at any time. Other ++ * parts of kbase outside of tiler heap management should not take references on its physical ++ * pages, and should not modify them. ++ */ ++static void remove_external_chunk_mappings(struct kbase_context *const kctx, ++ struct kbase_csf_tiler_heap_chunk *chunk) ++{ ++ lockdep_assert_held(&kctx->reg_lock); ++ ++ if (chunk->region->cpu_alloc != NULL) { ++ kbase_mem_shrink_cpu_mapping(kctx, chunk->region, 0, ++ chunk->region->cpu_alloc->nents); ++ } ++#if !defined(CONFIG_MALI_VECTOR_DUMP) ++ chunk->region->flags |= KBASE_REG_DONT_NEED; ++#endif ++ ++ dev_dbg(kctx->kbdev->dev, "Removed external mappings from chunk 0x%llX", chunk->gpu_va); ++} ++ ++/** + * link_chunk - Link a chunk into a tiler heap + * ++ * @heap: Pointer to the tiler heap. ++ * @chunk: Pointer to the heap chunk to be linked. ++ * + * Unless the @chunk is the first in the kernel's list of chunks belonging to + * a given tiler heap, this function stores the size and address of the @chunk + * in the header of the preceding chunk. This requires the GPU memory region -+ * containing the header to be be mapped temporarily, which can fail. -+ * -+ * @heap: Pointer to the tiler heap. -+ * @chunk: Pointer to the heap chunk to be linked. ++ * containing the header to be mapped temporarily, which can fail. + * + * Return: 0 if successful or a negative error code on failure. + */ @@ -173768,19 +196206,12 @@ index 000000000000..60cae15bc8ef + + if (prev) { + struct kbase_context *const kctx = heap->kctx; -+ struct kbase_vmap_struct map; -+ u64 *const prev_hdr = kbase_vmap_prot(kctx, prev->gpu_va, -+ sizeof(*prev_hdr), KBASE_REG_CPU_WR, &map); ++ u64 *prev_hdr = prev->map.addr; + -+ if (unlikely(!prev_hdr)) { -+ dev_err(kctx->kbdev->dev, -+ "Failed to map tiler heap chunk 0x%llX\n", -+ prev->gpu_va); -+ return -ENOMEM; -+ } ++ WARN((prev->region->flags & KBASE_REG_CPU_CACHED), ++ "Cannot support CPU cached chunks without sync operations"); + + *prev_hdr = encode_chunk_ptr(heap->chunk_size, chunk->gpu_va); -+ kbase_vunmap(kctx, &map); + + dev_dbg(kctx->kbdev->dev, + "Linked tiler heap chunks, 0x%llX -> 0x%llX\n", @@ -173793,180 +196224,310 @@ index 000000000000..60cae15bc8ef +/** + * init_chunk - Initialize and link a tiler heap chunk + * -+ * Zero-initialize a new chunk's header (including its pointer to the next -+ * chunk, which doesn't exist yet) and then update the previous chunk's -+ * header to link the new chunk into the chunk list. -+ * + * @heap: Pointer to the tiler heap. + * @chunk: Pointer to the heap chunk to be initialized and linked. + * @link_with_prev: Flag to indicate if the new chunk needs to be linked with + * the previously allocated chunk. + * ++ * Zero-initialize a new chunk's header (including its pointer to the next ++ * chunk, which doesn't exist yet) and then update the previous chunk's ++ * header to link the new chunk into the chunk list. ++ * + * Return: 0 if successful or a negative error code on failure. + */ +static int init_chunk(struct kbase_csf_tiler_heap *const heap, + struct kbase_csf_tiler_heap_chunk *const chunk, bool link_with_prev) +{ -+ struct kbase_vmap_struct map; -+ struct u64 *chunk_hdr = NULL; ++ int err = 0; ++ u64 *chunk_hdr; + struct kbase_context *const kctx = heap->kctx; + ++ lockdep_assert_held(&kctx->csf.tiler_heaps.lock); ++ + if (unlikely(chunk->gpu_va & ~CHUNK_ADDR_MASK)) { + dev_err(kctx->kbdev->dev, + "Tiler heap chunk address is unusable\n"); + return -EINVAL; + } + -+ chunk_hdr = kbase_vmap_prot(kctx, -+ chunk->gpu_va, CHUNK_HDR_SIZE, KBASE_REG_CPU_WR, &map); -+ -+ if (unlikely(!chunk_hdr)) { -+ dev_err(kctx->kbdev->dev, -+ "Failed to map a tiler heap chunk header\n"); -+ return -ENOMEM; ++ WARN((chunk->region->flags & KBASE_REG_CPU_CACHED), ++ "Cannot support CPU cached chunks without sync operations"); ++ chunk_hdr = chunk->map.addr; ++ if (WARN(chunk->map.size < CHUNK_HDR_SIZE, ++ "Tiler chunk kernel mapping was not large enough for zero-init")) { ++ return -EINVAL; + } + + memset(chunk_hdr, 0, CHUNK_HDR_SIZE); -+ kbase_vunmap(kctx, &map); ++ INIT_LIST_HEAD(&chunk->link); + + if (link_with_prev) -+ return link_chunk(heap, chunk); -+ else -+ return 0; ++ err = link_chunk(heap, chunk); ++ ++ if (unlikely(err)) { ++ dev_err(kctx->kbdev->dev, "Failed to link a chunk to a tiler heap\n"); ++ return -EINVAL; ++ } ++ ++ list_add_tail(&chunk->link, &heap->chunks_list); ++ heap->chunk_count++; ++ ++ return err; +} + +/** -+ * create_chunk - Create a tiler heap chunk ++ * remove_unlinked_chunk - Remove a chunk that is not currently linked into a ++ * heap. ++ * ++ * @kctx: Kbase context that was used to allocate the memory. ++ * @chunk: Chunk that has been allocated, but not linked into a heap. ++ */ ++static void remove_unlinked_chunk(struct kbase_context *kctx, ++ struct kbase_csf_tiler_heap_chunk *chunk) ++{ ++ if (WARN_ON(!list_empty(&chunk->link))) ++ return; ++ ++ kbase_gpu_vm_lock(kctx); ++ kbase_vunmap(kctx, &chunk->map); ++ /* KBASE_REG_DONT_NEED regions will be confused with ephemeral regions (inc freed JIT ++ * regions), and so we must clear that flag too before freeing. ++ * For "no user free count", we check that the count is 1 as it is a shrinkable region; ++ * no other code part within kbase can take a reference to it. ++ */ ++ WARN_ON(atomic_read(&chunk->region->no_user_free_count) > 1); ++ kbase_va_region_no_user_free_dec(chunk->region); ++#if !defined(CONFIG_MALI_VECTOR_DUMP) ++ chunk->region->flags &= ~KBASE_REG_DONT_NEED; ++#endif ++ kbase_mem_free_region(kctx, chunk->region); ++ kbase_gpu_vm_unlock(kctx); ++ ++ kfree(chunk); ++} ++ ++/** ++ * alloc_new_chunk - Allocate new chunk metadata for the tiler heap, reserve a fully backed VA ++ * region for the chunk, and provide a kernel mapping. ++ * @kctx: kbase context with which the chunk will be linked ++ * @chunk_size: the size of the chunk from the corresponding heap + * -+ * This function allocates a chunk of memory for a tiler heap and adds it to -+ * the end of the list of chunks associated with that heap. The size of the -+ * chunk is not a parameter because it is configured per-heap not per-chunk. ++ * Allocate the chunk tracking metadata and a corresponding fully backed VA region for the ++ * chunk. The kernel may need to invoke the reclaim path while trying to fulfill the allocation, so ++ * we cannot hold any lock that would be held in the shrinker paths (JIT evict lock or tiler heap ++ * lock). + * -+ * @heap: Pointer to the tiler heap for which to allocate memory. -+ * @link_with_prev: Flag to indicate if the chunk to be allocated needs to be -+ * linked with the previously allocated chunk. ++ * Since the chunk may have its physical backing removed, to prevent use-after-free scenarios we ++ * ensure that it is protected from being mapped by other parts of kbase. + * -+ * Return: 0 if successful or a negative error code on failure. ++ * The chunk's GPU memory can be accessed via its 'map' member, but should only be done so by the ++ * shrinker path, as it may be otherwise shrunk at any time. ++ * ++ * Return: pointer to kbase_csf_tiler_heap_chunk on success or a NULL pointer ++ * on failure + */ -+static int create_chunk(struct kbase_csf_tiler_heap *const heap, -+ bool link_with_prev) ++static struct kbase_csf_tiler_heap_chunk *alloc_new_chunk(struct kbase_context *kctx, ++ u64 chunk_size) +{ -+ int err = 0; -+ struct kbase_context *const kctx = heap->kctx; -+ u64 nr_pages = PFN_UP(heap->chunk_size); -+ u64 flags = BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR | -+ BASE_MEM_PROT_CPU_WR | BASEP_MEM_NO_USER_FREE | -+ BASE_MEM_COHERENT_LOCAL; ++ u64 nr_pages = PFN_UP(chunk_size); ++ u64 flags = BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR | BASE_MEM_PROT_CPU_WR | ++ BASEP_MEM_NO_USER_FREE | BASE_MEM_COHERENT_LOCAL | BASE_MEM_PROT_CPU_RD; + struct kbase_csf_tiler_heap_chunk *chunk = NULL; ++ /* The chunk kernel mapping needs to be large enough to: ++ * - initially zero the CHUNK_HDR_SIZE area ++ * - on shrinking, access the NEXT_CHUNK_ADDR_SIZE area ++ */ ++ const size_t chunk_kernel_map_size = max(CHUNK_HDR_SIZE, NEXT_CHUNK_ADDR_SIZE); + -+ flags |= base_mem_group_id_set(kctx->jit_group_id); -+ -+#if defined(CONFIG_MALI_BIFROST_DEBUG) || defined(CONFIG_MALI_VECTOR_DUMP) -+ flags |= BASE_MEM_PROT_CPU_RD; -+#endif -+ -+ lockdep_assert_held(&kctx->csf.tiler_heaps.lock); ++ /* Calls to this function are inherently synchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_SYNC; ++ flags |= kbase_mem_group_id_set(kctx->jit_group_id); + + chunk = kzalloc(sizeof(*chunk), GFP_KERNEL); + if (unlikely(!chunk)) { + dev_err(kctx->kbdev->dev, + "No kernel memory for a new tiler heap chunk\n"); -+ return -ENOMEM; ++ return NULL; + } + + /* Allocate GPU memory for the new chunk. */ -+ INIT_LIST_HEAD(&chunk->link); -+ chunk->region = kbase_mem_alloc(kctx, nr_pages, nr_pages, 0, -+ &flags, &chunk->gpu_va); ++ chunk->region = ++ kbase_mem_alloc(kctx, nr_pages, nr_pages, 0, &flags, &chunk->gpu_va, mmu_sync_info); + + if (unlikely(!chunk->region)) { -+ dev_err(kctx->kbdev->dev, -+ "Failed to allocate a tiler heap chunk\n"); -+ err = -ENOMEM; -+ } else { -+ err = init_chunk(heap, chunk, link_with_prev); -+ if (unlikely(err)) { -+ kbase_gpu_vm_lock(kctx); -+ chunk->region->flags &= ~KBASE_REG_NO_USER_FREE; -+ kbase_mem_free_region(kctx, chunk->region); -+ kbase_gpu_vm_unlock(kctx); -+ } ++ dev_err(kctx->kbdev->dev, "Failed to allocate a tiler heap chunk!\n"); ++ goto unroll_chunk; + } + -+ if (unlikely(err)) { -+ kfree(chunk); -+ } else { -+ list_add_tail(&chunk->link, &heap->chunks_list); -+ heap->chunk_count++; ++ kbase_gpu_vm_lock(kctx); + -+ dev_dbg(kctx->kbdev->dev, "Created tiler heap chunk 0x%llX\n", -+ chunk->gpu_va); ++ /* Some checks done here as NO_USER_FREE still allows such things to be made ++ * whilst we had dropped the region lock ++ */ ++ if (unlikely(atomic_read(&chunk->region->gpu_alloc->kernel_mappings) > 0)) { ++ dev_err(kctx->kbdev->dev, "Chunk region has active kernel mappings!\n"); ++ goto unroll_region; + } + -+ return err; ++ /* There is a race condition with regard to KBASE_REG_DONT_NEED, where another ++ * thread can have the "no user free" refcount increased between kbase_mem_alloc ++ * and kbase_gpu_vm_lock (above) and before KBASE_REG_DONT_NEED is set by ++ * remove_external_chunk_mappings (below). ++ * ++ * It should be fine and not a security risk if we let the region leak till ++ * region tracker termination in such a case. ++ */ ++ if (unlikely(atomic_read(&chunk->region->no_user_free_count) > 1)) { ++ dev_err(kctx->kbdev->dev, "Chunk region has no_user_free_count > 1!\n"); ++ goto unroll_region; ++ } ++ ++ /* Whilst we can be sure of a number of other restrictions due to BASEP_MEM_NO_USER_FREE ++ * being requested, it's useful to document in code what those restrictions are, and ensure ++ * they remain in place in future. ++ */ ++ if (WARN(!chunk->region->gpu_alloc, ++ "NO_USER_FREE chunks should not have had their alloc freed")) { ++ goto unroll_region; ++ } ++ ++ if (WARN(chunk->region->gpu_alloc->type != KBASE_MEM_TYPE_NATIVE, ++ "NO_USER_FREE chunks should not have been freed and then reallocated as imported/non-native regions")) { ++ goto unroll_region; ++ } ++ ++ if (WARN((chunk->region->flags & KBASE_REG_ACTIVE_JIT_ALLOC), ++ "NO_USER_FREE chunks should not have been freed and then reallocated as JIT regions")) { ++ goto unroll_region; ++ } ++ ++ if (WARN((chunk->region->flags & KBASE_REG_DONT_NEED), ++ "NO_USER_FREE chunks should not have been made ephemeral")) { ++ goto unroll_region; ++ } ++ ++ if (WARN(atomic_read(&chunk->region->cpu_alloc->gpu_mappings) > 1, ++ "NO_USER_FREE chunks should not have been aliased")) { ++ goto unroll_region; ++ } ++ ++ if (unlikely(!kbase_vmap_reg(kctx, chunk->region, chunk->gpu_va, chunk_kernel_map_size, ++ (KBASE_REG_CPU_RD | KBASE_REG_CPU_WR), &chunk->map, ++ KBASE_VMAP_FLAG_PERMANENT_MAP_ACCOUNTING))) { ++ dev_err(kctx->kbdev->dev, "Failed to map chunk header for shrinking!\n"); ++ goto unroll_region; ++ } ++ ++ remove_external_chunk_mappings(kctx, chunk); ++ kbase_gpu_vm_unlock(kctx); ++ ++ /* If page migration is enabled, we don't want to migrate tiler heap pages. ++ * This does not change if the constituent pages are already marked as isolated. ++ */ ++ if (kbase_page_migration_enabled) ++ kbase_set_phy_alloc_page_status(chunk->region->gpu_alloc, NOT_MOVABLE); ++ ++ return chunk; ++ ++unroll_region: ++ /* KBASE_REG_DONT_NEED regions will be confused with ephemeral regions (inc freed JIT ++ * regions), and so we must clear that flag too before freeing. ++ */ ++ kbase_va_region_no_user_free_dec(chunk->region); ++#if !defined(CONFIG_MALI_VECTOR_DUMP) ++ chunk->region->flags &= ~KBASE_REG_DONT_NEED; ++#endif ++ kbase_mem_free_region(kctx, chunk->region); ++ kbase_gpu_vm_unlock(kctx); ++unroll_chunk: ++ kfree(chunk); ++ return NULL; +} + +/** -+ * delete_chunk - Delete a tiler heap chunk ++ * create_chunk - Create a tiler heap chunk + * -+ * This function frees a tiler heap chunk previously allocated by @create_chunk -+ * and removes it from the list of chunks associated with the heap. ++ * @heap: Pointer to the tiler heap for which to allocate memory. + * -+ * WARNING: The deleted chunk is not unlinked from the list of chunks used by -+ * the GPU, therefore it is only safe to use this function when -+ * deleting a heap. ++ * This function allocates a chunk of memory for a tiler heap, adds it to the ++ * the list of chunks associated with that heap both on the host side and in GPU ++ * memory. + * -+ * @heap: Pointer to the tiler heap for which @chunk was allocated. -+ * @chunk: Pointer to a chunk to be deleted. ++ * Return: 0 if successful or a negative error code on failure. + */ -+static void delete_chunk(struct kbase_csf_tiler_heap *const heap, -+ struct kbase_csf_tiler_heap_chunk *const chunk) ++static int create_chunk(struct kbase_csf_tiler_heap *const heap) +{ -+ struct kbase_context *const kctx = heap->kctx; ++ int err = 0; ++ struct kbase_csf_tiler_heap_chunk *chunk = NULL; + -+ lockdep_assert_held(&kctx->csf.tiler_heaps.lock); ++ chunk = alloc_new_chunk(heap->kctx, heap->chunk_size); ++ if (unlikely(!chunk)) { ++ err = -ENOMEM; ++ goto allocation_failure; ++ } + -+ kbase_gpu_vm_lock(kctx); -+ chunk->region->flags &= ~KBASE_REG_NO_USER_FREE; -+ kbase_mem_free_region(kctx, chunk->region); -+ kbase_gpu_vm_unlock(kctx); -+ list_del(&chunk->link); -+ heap->chunk_count--; -+ kfree(chunk); ++ mutex_lock(&heap->kctx->csf.tiler_heaps.lock); ++ err = init_chunk(heap, chunk, true); ++ mutex_unlock(&heap->kctx->csf.tiler_heaps.lock); ++ ++ if (unlikely(err)) ++ goto initialization_failure; ++ ++ dev_dbg(heap->kctx->kbdev->dev, "Created tiler heap chunk 0x%llX\n", chunk->gpu_va); ++ ++ return 0; ++initialization_failure: ++ remove_unlinked_chunk(heap->kctx, chunk); ++allocation_failure: ++ return err; +} + +/** -+ * delete_all_chunks - Delete all chunks belonging to a tiler heap -+ * -+ * This function empties the list of chunks associated with a tiler heap by -+ * freeing all chunks previously allocated by @create_chunk. ++ * delete_all_chunks - Delete all chunks belonging to an unlinked tiler heap + * + * @heap: Pointer to a tiler heap. ++ * ++ * This function empties the list of chunks associated with a tiler heap by freeing all chunks ++ * previously allocated by @create_chunk. ++ * ++ * The heap must not be reachable from a &struct kbase_context.csf.tiler_heaps.list, as the ++ * tiler_heaps lock cannot be held whilst deleting its chunks due to also needing the &struct ++ * kbase_context.region_lock. ++ * ++ * WARNING: Whilst the deleted chunks are unlinked from host memory, they are not unlinked from the ++ * list of chunks used by the GPU, therefore it is only safe to use this function when ++ * deleting a heap. + */ +static void delete_all_chunks(struct kbase_csf_tiler_heap *heap) +{ -+ struct list_head *entry = NULL, *tmp = NULL; + struct kbase_context *const kctx = heap->kctx; ++ struct list_head *entry = NULL, *tmp = NULL; + -+ lockdep_assert_held(&kctx->csf.tiler_heaps.lock); ++ WARN(!list_empty(&heap->link), ++ "Deleting a heap's chunks when that heap is still linked requires the tiler_heaps lock, which cannot be held by the caller"); + + list_for_each_safe(entry, tmp, &heap->chunks_list) { + struct kbase_csf_tiler_heap_chunk *chunk = list_entry( + entry, struct kbase_csf_tiler_heap_chunk, link); + -+ delete_chunk(heap, chunk); ++ list_del_init(&chunk->link); ++ heap->chunk_count--; ++ ++ remove_unlinked_chunk(kctx, chunk); + } +} + +/** + * create_initial_chunks - Create the initial list of chunks for a tiler heap + * -+ * This function allocates a given number of chunks for a tiler heap and -+ * adds them to the list of chunks associated with that heap. -+ * + * @heap: Pointer to the tiler heap for which to allocate memory. + * @nchunks: Number of chunks to create. + * ++ * This function allocates a given number of chunks for a tiler heap and ++ * adds them to the list of chunks associated with that heap. ++ * + * Return: 0 if successful or a negative error code on failure. + */ +static int create_initial_chunks(struct kbase_csf_tiler_heap *const heap, @@ -173976,7 +196537,7 @@ index 000000000000..60cae15bc8ef + u32 i; + + for (i = 0; (i < nchunks) && likely(!err); i++) -+ err = create_chunk(heap, true); ++ err = create_chunk(heap); + + if (unlikely(err)) + delete_all_chunks(heap); @@ -173985,14 +196546,17 @@ index 000000000000..60cae15bc8ef +} + +/** -+ * delete_heap - Delete a tiler heap ++ * delete_heap - Delete an unlinked tiler heap ++ * ++ * @heap: Pointer to a tiler heap to be deleted. + * + * This function frees any chunks allocated for a tiler heap previously -+ * initialized by @kbase_csf_tiler_heap_init and removes it from the list of -+ * heaps associated with the kbase context. The heap context structure used by ++ * initialized by @kbase_csf_tiler_heap_init. The heap context structure used by + * the firmware is also freed. + * -+ * @heap: Pointer to a tiler heap to be deleted. ++ * The heap must not be reachable from a &struct kbase_context.csf.tiler_heaps.list, as the ++ * tiler_heaps lock cannot be held whilst deleting it due to also needing the &struct ++ * kbase_context.region_lock. + */ +static void delete_heap(struct kbase_csf_tiler_heap *heap) +{ @@ -174000,32 +196564,56 @@ index 000000000000..60cae15bc8ef + + dev_dbg(kctx->kbdev->dev, "Deleting tiler heap 0x%llX\n", heap->gpu_va); + -+ lockdep_assert_held(&kctx->csf.tiler_heaps.lock); ++ WARN(!list_empty(&heap->link), ++ "Deleting a heap that is still linked requires the tiler_heaps lock, which cannot be held by the caller"); + ++ /* Make sure that all of the VA regions corresponding to the chunks are ++ * freed at this time and that the work queue is not trying to access freed ++ * memory. ++ * ++ * Note: since the heap is unlinked, and that no references are made to chunks other ++ * than from their heap, there is no need to separately move the chunks out of the ++ * heap->chunks_list to delete them. ++ */ + delete_all_chunks(heap); + ++ kbase_vunmap(kctx, &heap->gpu_va_map); + /* We could optimize context destruction by not freeing leaked heap -+ * contexts but it doesn't seem worth the extra complexity. ++ * contexts but it doesn't seem worth the extra complexity. After this ++ * point, the suballocation is returned to the heap context allocator and ++ * may be overwritten with new data, meaning heap->gpu_va should not ++ * be used past this point. + */ + kbase_csf_heap_context_allocator_free(&kctx->csf.tiler_heaps.ctx_alloc, + heap->gpu_va); + -+ list_del(&heap->link); ++ WARN_ON(heap->chunk_count); ++ KBASE_TLSTREAM_AUX_TILER_HEAP_STATS(kctx->kbdev, kctx->id, ++ heap->heap_id, 0, 0, heap->max_chunks, heap->chunk_size, 0, ++ heap->target_in_flight, 0); ++ ++ if (heap->buf_desc_reg) { ++ kbase_vunmap(kctx, &heap->buf_desc_map); ++ kbase_gpu_vm_lock(kctx); ++ kbase_va_region_no_user_free_dec(heap->buf_desc_reg); ++ kbase_gpu_vm_unlock(kctx); ++ } ++ + kfree(heap); +} + +/** + * find_tiler_heap - Find a tiler heap from the address of its heap context + * ++ * @kctx: Pointer to the kbase context to search for a tiler heap. ++ * @heap_gpu_va: GPU virtual address of a heap context structure. ++ * + * Each tiler heap managed by the kernel has an associated heap context + * structure used by the firmware. This function finds a tiler heap object from + * the GPU virtual address of its associated heap context. The heap context + * should have been allocated by @kbase_csf_heap_context_allocator_alloc in the + * same @kctx. + * -+ * @kctx: Pointer to the kbase context to search for a tiler heap. -+ * @heap_gpu_va: GPU virtual address of a heap context structure. -+ * + * Return: pointer to the tiler heap object, or NULL if not found. + */ +static struct kbase_csf_tiler_heap *find_tiler_heap( @@ -174046,6 +196634,23 @@ index 000000000000..60cae15bc8ef + return NULL; +} + ++static struct kbase_csf_tiler_heap_chunk *find_chunk(struct kbase_csf_tiler_heap *heap, ++ u64 const chunk_gpu_va) ++{ ++ struct kbase_csf_tiler_heap_chunk *chunk = NULL; ++ ++ lockdep_assert_held(&heap->kctx->csf.tiler_heaps.lock); ++ ++ list_for_each_entry(chunk, &heap->chunks_list, link) { ++ if (chunk->gpu_va == chunk_gpu_va) ++ return chunk; ++ } ++ ++ dev_dbg(heap->kctx->kbdev->dev, "Tiler heap chunk 0x%llX was not found\n", chunk_gpu_va); ++ ++ return NULL; ++} ++ +int kbase_csf_tiler_heap_context_init(struct kbase_context *const kctx) +{ + int err = kbase_csf_heap_context_allocator_init( @@ -174064,37 +196669,91 @@ index 000000000000..60cae15bc8ef + +void kbase_csf_tiler_heap_context_term(struct kbase_context *const kctx) +{ ++ LIST_HEAD(local_heaps_list); + struct list_head *entry = NULL, *tmp = NULL; + + dev_dbg(kctx->kbdev->dev, "Terminating a context for tiler heaps\n"); + + mutex_lock(&kctx->csf.tiler_heaps.lock); ++ list_splice_init(&kctx->csf.tiler_heaps.list, &local_heaps_list); ++ mutex_unlock(&kctx->csf.tiler_heaps.lock); + -+ list_for_each_safe(entry, tmp, &kctx->csf.tiler_heaps.list) { ++ list_for_each_safe(entry, tmp, &local_heaps_list) { + struct kbase_csf_tiler_heap *heap = list_entry( + entry, struct kbase_csf_tiler_heap, link); ++ ++ list_del_init(&heap->link); + delete_heap(heap); + } + -+ mutex_unlock(&kctx->csf.tiler_heaps.lock); + mutex_destroy(&kctx->csf.tiler_heaps.lock); + + kbase_csf_heap_context_allocator_term(&kctx->csf.tiler_heaps.ctx_alloc); +} + -+int kbase_csf_tiler_heap_init(struct kbase_context *const kctx, -+ u32 const chunk_size, u32 const initial_chunks, u32 const max_chunks, -+ u16 const target_in_flight, u64 *const heap_gpu_va, -+ u64 *const first_chunk_va) ++/** ++ * kbasep_is_buffer_descriptor_region_suitable - Check if a VA region chosen to house ++ * the tiler heap buffer descriptor ++ * is suitable for the purpose. ++ * @kctx: kbase context of the tiler heap ++ * @reg: VA region being checked for suitability ++ * ++ * The tiler heap buffer descriptor memory does not admit page faults according ++ * to its design, so it must have the entirety of the backing upon allocation, ++ * and it has to remain alive as long as the tiler heap is alive, meaning it ++ * cannot be allocated from JIT/Ephemeral, or user freeable memory. ++ * ++ * Return: true on suitability, false otherwise. ++ */ ++static bool kbasep_is_buffer_descriptor_region_suitable(struct kbase_context *const kctx, ++ struct kbase_va_region *const reg) ++{ ++ if (kbase_is_region_invalid_or_free(reg)) { ++ dev_err(kctx->kbdev->dev, "Region is either invalid or free!\n"); ++ return false; ++ } ++ ++ if (!(reg->flags & KBASE_REG_CPU_RD) || kbase_is_region_shrinkable(reg) || ++ (reg->flags & KBASE_REG_PF_GROW)) { ++ dev_err(kctx->kbdev->dev, "Region has invalid flags: 0x%lX!\n", reg->flags); ++ return false; ++ } ++ ++ if (reg->gpu_alloc->type != KBASE_MEM_TYPE_NATIVE) { ++ dev_err(kctx->kbdev->dev, "Region has invalid type!\n"); ++ return false; ++ } ++ ++ if ((reg->nr_pages != kbase_reg_current_backed_size(reg)) || ++ (reg->nr_pages < PFN_UP(sizeof(struct kbase_csf_gpu_buffer_heap)))) { ++ dev_err(kctx->kbdev->dev, "Region has invalid backing!\n"); ++ return false; ++ } ++ ++ return true; ++} ++ ++#define TILER_BUF_DESC_SIZE (sizeof(struct kbase_csf_gpu_buffer_heap)) ++ ++int kbase_csf_tiler_heap_init(struct kbase_context *const kctx, u32 const chunk_size, ++ u32 const initial_chunks, u32 const max_chunks, ++ u16 const target_in_flight, u64 const buf_desc_va, ++ u64 *const heap_gpu_va, u64 *const first_chunk_va) +{ + int err = 0; + struct kbase_csf_tiler_heap *heap = NULL; + struct kbase_csf_heap_context_allocator *const ctx_alloc = + &kctx->csf.tiler_heaps.ctx_alloc; ++ struct kbase_csf_tiler_heap_chunk *chunk = NULL; ++ struct kbase_va_region *gpu_va_reg = NULL; ++ void *vmap_ptr = NULL; + + dev_dbg(kctx->kbdev->dev, -+ "Creating a tiler heap with %u chunks (limit: %u) of size %u\n", -+ initial_chunks, max_chunks, chunk_size); ++ "Creating a tiler heap with %u chunks (limit: %u) of size %u, buf_desc_va: 0x%llx\n", ++ initial_chunks, max_chunks, chunk_size, buf_desc_va); ++ ++ if (!kbase_mem_allow_alloc(kctx)) ++ return -EINVAL; + + if (chunk_size == 0) + return -EINVAL; @@ -174113,8 +196772,7 @@ index 000000000000..60cae15bc8ef + + heap = kzalloc(sizeof(*heap), GFP_KERNEL); + if (unlikely(!heap)) { -+ dev_err(kctx->kbdev->dev, -+ "No kernel memory for a new tiler heap\n"); ++ dev_err(kctx->kbdev->dev, "No kernel memory for a new tiler heap"); + return -ENOMEM; + } + @@ -174122,42 +196780,130 @@ index 000000000000..60cae15bc8ef + heap->chunk_size = chunk_size; + heap->max_chunks = max_chunks; + heap->target_in_flight = target_in_flight; ++ heap->buf_desc_checked = false; + INIT_LIST_HEAD(&heap->chunks_list); ++ INIT_LIST_HEAD(&heap->link); + -+ heap->gpu_va = kbase_csf_heap_context_allocator_alloc(ctx_alloc); ++ /* Check on the buffer descriptor virtual Address */ ++ if (buf_desc_va) { ++ struct kbase_va_region *buf_desc_reg; + -+ mutex_lock(&kctx->csf.tiler_heaps.lock); ++ kbase_gpu_vm_lock(kctx); ++ buf_desc_reg = ++ kbase_region_tracker_find_region_enclosing_address(kctx, buf_desc_va); ++ ++ if (!kbasep_is_buffer_descriptor_region_suitable(kctx, buf_desc_reg)) { ++ kbase_gpu_vm_unlock(kctx); ++ dev_err(kctx->kbdev->dev, ++ "Could not find a suitable VA region for the tiler heap buf desc!\n"); ++ err = -EINVAL; ++ goto buf_desc_not_suitable; ++ } ++ ++ /* If we don't prevent userspace from unmapping this, we may run into ++ * use-after-free, as we don't check for the existence of the region throughout. ++ */ ++ ++ heap->buf_desc_va = buf_desc_va; ++ heap->buf_desc_reg = buf_desc_reg; ++ kbase_va_region_no_user_free_inc(buf_desc_reg); ++ ++ vmap_ptr = kbase_vmap_reg(kctx, buf_desc_reg, buf_desc_va, TILER_BUF_DESC_SIZE, ++ KBASE_REG_CPU_RD, &heap->buf_desc_map, ++ KBASE_VMAP_FLAG_PERMANENT_MAP_ACCOUNTING); ++ ++ if (kbase_page_migration_enabled) ++ kbase_set_phy_alloc_page_status(buf_desc_reg->gpu_alloc, NOT_MOVABLE); ++ ++ kbase_gpu_vm_unlock(kctx); ++ ++ if (unlikely(!vmap_ptr)) { ++ dev_err(kctx->kbdev->dev, ++ "Could not vmap buffer descriptor into kernel memory (err %d)\n", ++ err); ++ err = -ENOMEM; ++ goto buf_desc_vmap_failed; ++ } ++ } + ++ heap->gpu_va = kbase_csf_heap_context_allocator_alloc(ctx_alloc); + if (unlikely(!heap->gpu_va)) { -+ dev_err(kctx->kbdev->dev, -+ "Failed to allocate a tiler heap context\n"); ++ dev_dbg(kctx->kbdev->dev, "Failed to allocate a tiler heap context\n"); + err = -ENOMEM; -+ } else { -+ err = create_initial_chunks(heap, initial_chunks); -+ if (unlikely(err)) { -+ kbase_csf_heap_context_allocator_free(ctx_alloc, -+ heap->gpu_va); -+ } ++ goto heap_context_alloc_failed; ++ } ++ ++ gpu_va_reg = ctx_alloc->region; ++ ++ kbase_gpu_vm_lock(kctx); ++ /* gpu_va_reg was created with BASEP_MEM_NO_USER_FREE, the code to unset this only happens ++ * on kctx termination (after all syscalls on kctx have finished), and so it is safe to ++ * assume that gpu_va_reg is still present. ++ */ ++ vmap_ptr = kbase_vmap_reg(kctx, gpu_va_reg, heap->gpu_va, NEXT_CHUNK_ADDR_SIZE, ++ (KBASE_REG_CPU_RD | KBASE_REG_CPU_WR), &heap->gpu_va_map, ++ KBASE_VMAP_FLAG_PERMANENT_MAP_ACCOUNTING); ++ kbase_gpu_vm_unlock(kctx); ++ if (unlikely(!vmap_ptr)) { ++ dev_dbg(kctx->kbdev->dev, "Failed to vmap the correct heap GPU VA address\n"); ++ err = -ENOMEM; ++ goto heap_context_vmap_failed; + } + ++ err = create_initial_chunks(heap, initial_chunks); + if (unlikely(err)) { -+ kfree(heap); -+ } else { -+ struct kbase_csf_tiler_heap_chunk const *first_chunk = -+ list_first_entry(&heap->chunks_list, -+ struct kbase_csf_tiler_heap_chunk, link); ++ dev_dbg(kctx->kbdev->dev, "Failed to create the initial tiler heap chunks\n"); ++ goto create_chunks_failed; ++ } ++ chunk = list_first_entry(&heap->chunks_list, struct kbase_csf_tiler_heap_chunk, link); + -+ list_add(&heap->link, &kctx->csf.tiler_heaps.list); ++ *heap_gpu_va = heap->gpu_va; ++ *first_chunk_va = chunk->gpu_va; ++ ++ mutex_lock(&kctx->csf.tiler_heaps.lock); ++ kctx->csf.tiler_heaps.nr_of_heaps++; ++ heap->heap_id = kctx->csf.tiler_heaps.nr_of_heaps; ++ list_add(&heap->link, &kctx->csf.tiler_heaps.list); + -+ *heap_gpu_va = heap->gpu_va; -+ *first_chunk_va = first_chunk->gpu_va; ++ KBASE_TLSTREAM_AUX_TILER_HEAP_STATS(kctx->kbdev, kctx->id, heap->heap_id, ++ PFN_UP(heap->chunk_size * heap->max_chunks), ++ PFN_UP(heap->chunk_size * heap->chunk_count), ++ heap->max_chunks, heap->chunk_size, heap->chunk_count, ++ heap->target_in_flight, 0); + -+ dev_dbg(kctx->kbdev->dev, "Created tiler heap 0x%llX\n", -+ heap->gpu_va); ++#if defined(CONFIG_MALI_VECTOR_DUMP) ++ list_for_each_entry(chunk, &heap->chunks_list, link) { ++ KBASE_TLSTREAM_JD_TILER_HEAP_CHUNK_ALLOC(kctx->kbdev, kctx->id, heap->heap_id, ++ chunk->gpu_va); + } ++#endif ++ kctx->running_total_tiler_heap_nr_chunks += heap->chunk_count; ++ kctx->running_total_tiler_heap_memory += (u64)heap->chunk_size * heap->chunk_count; ++ if (kctx->running_total_tiler_heap_memory > kctx->peak_total_tiler_heap_memory) ++ kctx->peak_total_tiler_heap_memory = kctx->running_total_tiler_heap_memory; + ++ dev_dbg(kctx->kbdev->dev, ++ "Created tiler heap 0x%llX, buffer descriptor 0x%llX, ctx_%d_%d\n", heap->gpu_va, ++ buf_desc_va, kctx->tgid, kctx->id); + mutex_unlock(&kctx->csf.tiler_heaps.lock); + ++ return 0; ++ ++create_chunks_failed: ++ kbase_vunmap(kctx, &heap->gpu_va_map); ++heap_context_vmap_failed: ++ kbase_csf_heap_context_allocator_free(ctx_alloc, heap->gpu_va); ++heap_context_alloc_failed: ++ if (heap->buf_desc_reg) ++ kbase_vunmap(kctx, &heap->buf_desc_map); ++buf_desc_vmap_failed: ++ if (heap->buf_desc_reg) { ++ kbase_gpu_vm_lock(kctx); ++ kbase_va_region_no_user_free_dec(heap->buf_desc_reg); ++ kbase_gpu_vm_unlock(kctx); ++ } ++buf_desc_not_suitable: ++ kfree(heap); + return err; +} + @@ -174166,110 +196912,543 @@ index 000000000000..60cae15bc8ef +{ + int err = 0; + struct kbase_csf_tiler_heap *heap = NULL; ++ u32 chunk_count = 0; ++ u64 heap_size = 0; + + mutex_lock(&kctx->csf.tiler_heaps.lock); -+ + heap = find_tiler_heap(kctx, heap_gpu_va); -+ if (likely(heap)) -+ delete_heap(heap); -+ else ++ if (likely(heap)) { ++ chunk_count = heap->chunk_count; ++ heap_size = heap->chunk_size * chunk_count; ++ ++ list_del_init(&heap->link); ++ } else { + err = -EINVAL; ++ } + ++ /* Update stats whilst still holding the lock so they are in sync with the tiler_heaps.list ++ * at all times ++ */ ++ if (likely(kctx->running_total_tiler_heap_memory >= heap_size)) ++ kctx->running_total_tiler_heap_memory -= heap_size; ++ else ++ dev_warn(kctx->kbdev->dev, ++ "Running total tiler heap memory lower than expected!"); ++ if (likely(kctx->running_total_tiler_heap_nr_chunks >= chunk_count)) ++ kctx->running_total_tiler_heap_nr_chunks -= chunk_count; ++ else ++ dev_warn(kctx->kbdev->dev, ++ "Running total tiler chunk count lower than expected!"); ++ if (!err) ++ dev_dbg(kctx->kbdev->dev, ++ "Terminated tiler heap 0x%llX, buffer descriptor 0x%llX, ctx_%d_%d\n", ++ heap->gpu_va, heap->buf_desc_va, kctx->tgid, kctx->id); + mutex_unlock(&kctx->csf.tiler_heaps.lock); + ++ /* Deletion requires the kctx->reg_lock, so must only operate on it whilst unlinked from ++ * the kctx's csf.tiler_heaps.list, and without holding the csf.tiler_heaps.lock ++ */ ++ if (likely(heap)) ++ delete_heap(heap); ++ + return err; +} + +/** -+ * alloc_new_chunk - Allocate a new chunk for the tiler heap. ++ * validate_allocation_request - Check whether the chunk allocation request ++ * received on tiler OOM should be handled at ++ * current time. + * -+ * This function will allocate a new chunk for the chunked tiler heap depending -+ * on the settings provided by userspace when the heap was created and the -+ * heap's statistics (like number of render passes in-flight). ++ * @heap: The tiler heap the OOM is associated with ++ * @nr_in_flight: Number of fragment jobs in flight ++ * @pending_frag_count: Number of pending fragment jobs + * -+ * @heap: Pointer to the tiler heap. -+ * @nr_in_flight: Number of render passes that are in-flight, must not be zero. -+ * @new_chunk_ptr: Where to store the GPU virtual address & size of the new -+ * chunk allocated for the heap. ++ * Context: must hold the tiler heap lock to guarantee its lifetime + * -+ * Return: 0 if a new chunk was allocated otherwise an appropriate negative -+ * error code. ++ * Return: ++ * * 0 - allowed to allocate an additional chunk ++ * * -EINVAL - invalid ++ * * -EBUSY - there are fragment jobs still in flight, which may free chunks ++ * after completing ++ * * -ENOMEM - the targeted number of in-flight chunks has been reached and ++ * no new ones will be allocated + */ -+static int alloc_new_chunk(struct kbase_csf_tiler_heap *heap, -+ u32 nr_in_flight, u64 *new_chunk_ptr) ++static int validate_allocation_request(struct kbase_csf_tiler_heap *heap, u32 nr_in_flight, ++ u32 pending_frag_count) +{ -+ int err = -ENOMEM; -+ + lockdep_assert_held(&heap->kctx->csf.tiler_heaps.lock); + -+ if (!nr_in_flight) ++ if (WARN_ON(!nr_in_flight) || WARN_ON(pending_frag_count > nr_in_flight)) + return -EINVAL; + -+ if ((nr_in_flight <= heap->target_in_flight) && -+ (heap->chunk_count < heap->max_chunks)) { -+ /* Not exceeded the target number of render passes yet so be -+ * generous with memory. -+ */ -+ err = create_chunk(heap, false); -+ -+ if (likely(!err)) { -+ struct kbase_csf_tiler_heap_chunk *new_chunk = -+ get_last_chunk(heap); -+ if (!WARN_ON(!new_chunk)) { -+ *new_chunk_ptr = -+ encode_chunk_ptr(heap->chunk_size, -+ new_chunk->gpu_va); -+ return 0; -+ } ++ if (nr_in_flight <= heap->target_in_flight) { ++ if (heap->chunk_count < heap->max_chunks) { ++ /* Not exceeded the target number of render passes yet so be ++ * generous with memory. ++ */ ++ return 0; ++ } else if (pending_frag_count > 0) { ++ return -EBUSY; ++ } else { ++ return -ENOMEM; + } ++ } else { ++ /* Reached target number of render passes in flight. ++ * Wait for some of them to finish ++ */ ++ return -EBUSY; + } ++ return -ENOMEM; ++} ++ ++int kbase_csf_tiler_heap_alloc_new_chunk(struct kbase_context *kctx, ++ u64 gpu_heap_va, u32 nr_in_flight, u32 pending_frag_count, u64 *new_chunk_ptr) ++{ ++ struct kbase_csf_tiler_heap *heap; ++ struct kbase_csf_tiler_heap_chunk *chunk; ++ int err = -EINVAL; ++ u64 chunk_size = 0; ++ u64 heap_id = 0; + -+ /* A new chunk wasn't allocated this time, check if the allocation can -+ * be retried later. ++ /* To avoid potential locking issues during allocation, this is handled ++ * in three phases: ++ * 1. Take the lock, find the corresponding heap, and find its chunk size ++ * (this is always 2 MB, but may change down the line). ++ * 2. Allocate memory for the chunk and its region. ++ * 3. If the heap still exists, link it to the end of the list. If it ++ * doesn't, roll back the allocation. + */ -+ if (nr_in_flight > 1) { -+ /* Can retry as there are some ongoing fragment -+ * jobs which are expected to free up chunks. ++ ++ mutex_lock(&kctx->csf.tiler_heaps.lock); ++ heap = find_tiler_heap(kctx, gpu_heap_va); ++ if (likely(heap)) { ++ chunk_size = heap->chunk_size; ++ heap_id = heap->heap_id; ++ } else { ++ dev_err(kctx->kbdev->dev, "Heap 0x%llX does not exist", gpu_heap_va); ++ mutex_unlock(&kctx->csf.tiler_heaps.lock); ++ goto prelink_failure; ++ } ++ ++ err = validate_allocation_request(heap, nr_in_flight, pending_frag_count); ++ if (unlikely(err)) { ++ /* The allocation request can be legitimate, but be invoked on a heap ++ * that has already reached the maximum pre-configured capacity. This ++ * is useful debug information, but should not be treated as an error, ++ * since the request will be re-sent at a later point. + */ -+ err = -EBUSY; ++ dev_dbg(kctx->kbdev->dev, ++ "Not allocating new chunk for heap 0x%llX due to current heap state (err %d)", ++ gpu_heap_va, err); ++ mutex_unlock(&kctx->csf.tiler_heaps.lock); ++ goto prelink_failure; ++ } ++ mutex_unlock(&kctx->csf.tiler_heaps.lock); ++ /* this heap must not be used whilst we have dropped the lock */ ++ heap = NULL; ++ ++ chunk = alloc_new_chunk(kctx, chunk_size); ++ if (unlikely(!chunk)) { ++ dev_err(kctx->kbdev->dev, "Could not allocate chunk of size %lld for ctx %d_%d", ++ chunk_size, kctx->tgid, kctx->id); ++ goto prelink_failure; ++ } ++ ++ /* After this point, the heap that we were targeting could already have had the needed ++ * chunks allocated, if we were handling multiple OoM events on multiple threads, so ++ * we need to revalidate the need for the allocation. ++ */ ++ mutex_lock(&kctx->csf.tiler_heaps.lock); ++ heap = find_tiler_heap(kctx, gpu_heap_va); ++ ++ if (unlikely(!heap)) { ++ dev_err(kctx->kbdev->dev, "Tiler heap 0x%llX no longer exists!\n", gpu_heap_va); ++ mutex_unlock(&kctx->csf.tiler_heaps.lock); ++ goto unroll_chunk; ++ } ++ ++ if (heap_id != heap->heap_id) { ++ dev_err(kctx->kbdev->dev, ++ "Tiler heap 0x%llX was removed from ctx %d_%d while allocating chunk of size %lld!", ++ gpu_heap_va, kctx->tgid, kctx->id, chunk_size); ++ mutex_unlock(&kctx->csf.tiler_heaps.lock); ++ goto unroll_chunk; + } + ++ if (WARN_ON(chunk_size != heap->chunk_size)) { ++ mutex_unlock(&kctx->csf.tiler_heaps.lock); ++ goto unroll_chunk; ++ } ++ ++ err = validate_allocation_request(heap, nr_in_flight, pending_frag_count); ++ if (unlikely(err)) { ++ dev_warn( ++ kctx->kbdev->dev, ++ "Aborting linking chunk to heap 0x%llX: heap state changed during allocation (err %d)", ++ gpu_heap_va, err); ++ mutex_unlock(&kctx->csf.tiler_heaps.lock); ++ goto unroll_chunk; ++ } ++ ++ err = init_chunk(heap, chunk, false); ++ ++ /* On error, the chunk would not be linked, so we can still treat it as an unlinked ++ * chunk for error handling. ++ */ ++ if (unlikely(err)) { ++ dev_err(kctx->kbdev->dev, ++ "Could not link chunk(0x%llX) with tiler heap 0%llX in ctx %d_%d due to error %d", ++ chunk->gpu_va, gpu_heap_va, kctx->tgid, kctx->id, err); ++ mutex_unlock(&kctx->csf.tiler_heaps.lock); ++ goto unroll_chunk; ++ } ++ ++ *new_chunk_ptr = encode_chunk_ptr(heap->chunk_size, chunk->gpu_va); ++ ++ /* update total and peak tiler heap memory record */ ++ kctx->running_total_tiler_heap_nr_chunks++; ++ kctx->running_total_tiler_heap_memory += heap->chunk_size; ++ ++ if (kctx->running_total_tiler_heap_memory > kctx->peak_total_tiler_heap_memory) ++ kctx->peak_total_tiler_heap_memory = kctx->running_total_tiler_heap_memory; ++ ++ KBASE_TLSTREAM_AUX_TILER_HEAP_STATS(kctx->kbdev, kctx->id, heap->heap_id, ++ PFN_UP(heap->chunk_size * heap->max_chunks), ++ PFN_UP(heap->chunk_size * heap->chunk_count), ++ heap->max_chunks, heap->chunk_size, heap->chunk_count, ++ heap->target_in_flight, nr_in_flight); ++ ++ mutex_unlock(&kctx->csf.tiler_heaps.lock); ++ ++ return err; ++unroll_chunk: ++ remove_unlinked_chunk(kctx, chunk); ++prelink_failure: + return err; +} + -+int kbase_csf_tiler_heap_alloc_new_chunk(struct kbase_context *kctx, -+ u64 gpu_heap_va, u32 nr_in_flight, u64 *new_chunk_ptr) ++static bool delete_chunk_physical_pages(struct kbase_csf_tiler_heap *heap, u64 chunk_gpu_va, ++ u64 *hdr_val) ++{ ++ int err; ++ u64 *chunk_hdr; ++ struct kbase_context *kctx = heap->kctx; ++ struct kbase_csf_tiler_heap_chunk *chunk = NULL; ++ ++ lockdep_assert_held(&heap->kctx->csf.tiler_heaps.lock); ++ ++ chunk = find_chunk(heap, chunk_gpu_va); ++ if (unlikely(!chunk)) { ++ dev_warn(kctx->kbdev->dev, ++ "Failed to find tiler heap(0x%llX) chunk(0x%llX) for reclaim-delete\n", ++ heap->gpu_va, chunk_gpu_va); ++ return false; ++ } ++ ++ WARN((chunk->region->flags & KBASE_REG_CPU_CACHED), ++ "Cannot support CPU cached chunks without sync operations"); ++ chunk_hdr = chunk->map.addr; ++ *hdr_val = *chunk_hdr; ++ ++ dev_dbg(kctx->kbdev->dev, ++ "Reclaim: delete chunk(0x%llx) in heap(0x%llx), header value(0x%llX)\n", ++ chunk_gpu_va, heap->gpu_va, *hdr_val); ++ ++ err = kbase_mem_shrink_gpu_mapping(kctx, chunk->region, 0, chunk->region->gpu_alloc->nents); ++ if (unlikely(err)) { ++ dev_warn( ++ kctx->kbdev->dev, ++ "Reclaim: shrinking GPU mapping failed on chunk(0x%llx) in heap(0x%llx) (err %d)\n", ++ chunk_gpu_va, heap->gpu_va, err); ++ ++ /* Cannot free the pages whilst references on the GPU remain, so keep the chunk on ++ * the heap's chunk list and try a different heap. ++ */ ++ ++ return false; ++ } ++ /* Destroy the mapping before the physical pages which are mapped are destroyed. */ ++ kbase_vunmap(kctx, &chunk->map); ++ ++ err = kbase_free_phy_pages_helper(chunk->region->gpu_alloc, ++ chunk->region->gpu_alloc->nents); ++ if (unlikely(err)) { ++ dev_warn( ++ kctx->kbdev->dev, ++ "Reclaim: remove physical backing failed on chunk(0x%llx) in heap(0x%llx) (err %d), continuing with deferred removal\n", ++ chunk_gpu_va, heap->gpu_va, err); ++ ++ /* kbase_free_phy_pages_helper() should only fail on invalid input, and WARNs ++ * anyway, so continue instead of returning early. ++ * ++ * Indeed, we don't want to leave the chunk on the heap's chunk list whilst it has ++ * its mapping removed, as that could lead to problems. It's safest to instead ++ * continue with deferred destruction of the chunk. ++ */ ++ } ++ ++ dev_dbg(kctx->kbdev->dev, ++ "Reclaim: delete chunk(0x%llx) in heap(0x%llx), header value(0x%llX)\n", ++ chunk_gpu_va, heap->gpu_va, *hdr_val); ++ ++ mutex_lock(&heap->kctx->jit_evict_lock); ++ list_move(&chunk->region->jit_node, &kctx->jit_destroy_head); ++ mutex_unlock(&heap->kctx->jit_evict_lock); ++ ++ list_del(&chunk->link); ++ heap->chunk_count--; ++ kfree(chunk); ++ ++ return true; ++} ++ ++static void sanity_check_gpu_buffer_heap(struct kbase_csf_tiler_heap *heap, ++ struct kbase_csf_gpu_buffer_heap *desc) ++{ ++ u64 first_hoarded_chunk_gpu_va = desc->pointer & CHUNK_ADDR_MASK; ++ ++ lockdep_assert_held(&heap->kctx->csf.tiler_heaps.lock); ++ ++ if (first_hoarded_chunk_gpu_va) { ++ struct kbase_csf_tiler_heap_chunk *chunk = ++ find_chunk(heap, first_hoarded_chunk_gpu_va); ++ ++ if (likely(chunk)) { ++ dev_dbg(heap->kctx->kbdev->dev, ++ "Buffer descriptor 0x%llX sanity check ok, HW reclaim allowed\n", ++ heap->buf_desc_va); ++ ++ heap->buf_desc_checked = true; ++ return; ++ } ++ } ++ /* If there is no match, defer the check to next time */ ++ dev_dbg(heap->kctx->kbdev->dev, "Buffer descriptor 0x%llX runtime sanity check deferred\n", ++ heap->buf_desc_va); ++} ++ ++static bool can_read_hw_gpu_buffer_heap(struct kbase_csf_tiler_heap *heap, u64 *chunk_gpu_va_ptr) ++{ ++ struct kbase_context *kctx = heap->kctx; ++ ++ lockdep_assert_held(&kctx->csf.tiler_heaps.lock); ++ ++ /* Initialize the descriptor pointer value to 0 */ ++ *chunk_gpu_va_ptr = 0; ++ ++ /* The BufferDescriptor on heap is a hint on creation, do a sanity check at runtime */ ++ if (heap->buf_desc_reg && !heap->buf_desc_checked) { ++ struct kbase_csf_gpu_buffer_heap *desc = heap->buf_desc_map.addr; ++ ++ /* BufferDescriptor is supplied by userspace, so could be CPU-cached */ ++ if (heap->buf_desc_map.flags & KBASE_VMAP_FLAG_SYNC_NEEDED) ++ kbase_sync_mem_regions(kctx, &heap->buf_desc_map, KBASE_SYNC_TO_CPU); ++ ++ sanity_check_gpu_buffer_heap(heap, desc); ++ if (heap->buf_desc_checked) ++ *chunk_gpu_va_ptr = desc->pointer & CHUNK_ADDR_MASK; ++ } ++ ++ return heap->buf_desc_checked; ++} ++ ++static u32 delete_hoarded_chunks(struct kbase_csf_tiler_heap *heap) ++{ ++ u32 freed = 0; ++ u64 chunk_gpu_va = 0; ++ struct kbase_context *kctx = heap->kctx; ++ struct kbase_csf_tiler_heap_chunk *chunk = NULL; ++ ++ lockdep_assert_held(&kctx->csf.tiler_heaps.lock); ++ ++ if (can_read_hw_gpu_buffer_heap(heap, &chunk_gpu_va)) { ++ u64 chunk_hdr_val; ++ u64 *hw_hdr; ++ ++ if (!chunk_gpu_va) { ++ struct kbase_csf_gpu_buffer_heap *desc = heap->buf_desc_map.addr; ++ ++ /* BufferDescriptor is supplied by userspace, so could be CPU-cached */ ++ if (heap->buf_desc_map.flags & KBASE_VMAP_FLAG_SYNC_NEEDED) ++ kbase_sync_mem_regions(kctx, &heap->buf_desc_map, ++ KBASE_SYNC_TO_CPU); ++ chunk_gpu_va = desc->pointer & CHUNK_ADDR_MASK; ++ ++ if (!chunk_gpu_va) { ++ dev_dbg(kctx->kbdev->dev, ++ "Buffer descriptor 0x%llX has no chunks (NULL) for reclaim scan\n", ++ heap->buf_desc_va); ++ goto out; ++ } ++ } ++ ++ chunk = find_chunk(heap, chunk_gpu_va); ++ if (unlikely(!chunk)) ++ goto out; ++ ++ WARN((chunk->region->flags & KBASE_REG_CPU_CACHED), ++ "Cannot support CPU cached chunks without sync operations"); ++ hw_hdr = chunk->map.addr; ++ ++ /* Move onto the next chunk relevant information */ ++ chunk_hdr_val = *hw_hdr; ++ chunk_gpu_va = chunk_hdr_val & CHUNK_ADDR_MASK; ++ ++ while (chunk_gpu_va && heap->chunk_count > HEAP_SHRINK_STOP_LIMIT) { ++ bool success = ++ delete_chunk_physical_pages(heap, chunk_gpu_va, &chunk_hdr_val); ++ ++ if (!success) ++ break; ++ ++ freed++; ++ /* On success, chunk_hdr_val is updated, extract the next chunk address */ ++ chunk_gpu_va = chunk_hdr_val & CHUNK_ADDR_MASK; ++ } ++ ++ /* Update the existing hardware chunk header, after reclaim deletion of chunks */ ++ *hw_hdr = chunk_hdr_val; ++ ++ dev_dbg(heap->kctx->kbdev->dev, ++ "HW reclaim scan freed chunks: %u, set hw_hdr[0]: 0x%llX\n", freed, ++ chunk_hdr_val); ++ } else { ++ dev_dbg(kctx->kbdev->dev, ++ "Skip HW reclaim scan, (disabled: buffer descriptor 0x%llX)\n", ++ heap->buf_desc_va); ++ } ++out: ++ return freed; ++} ++ ++static u64 delete_unused_chunk_pages(struct kbase_csf_tiler_heap *heap) ++{ ++ u32 freed_chunks = 0; ++ u64 freed_pages = 0; ++ u64 chunk_gpu_va; ++ u64 chunk_hdr_val; ++ struct kbase_context *kctx = heap->kctx; ++ u64 *ctx_ptr; ++ ++ lockdep_assert_held(&kctx->csf.tiler_heaps.lock); ++ ++ WARN(heap->gpu_va_map.flags & KBASE_VMAP_FLAG_SYNC_NEEDED, ++ "Cannot support CPU cached heap context without sync operations"); ++ ++ ctx_ptr = heap->gpu_va_map.addr; ++ ++ /* Extract the first chunk address from the context's free_list_head */ ++ chunk_hdr_val = *ctx_ptr; ++ chunk_gpu_va = chunk_hdr_val & CHUNK_ADDR_MASK; ++ ++ while (chunk_gpu_va) { ++ u64 hdr_val; ++ bool success = delete_chunk_physical_pages(heap, chunk_gpu_va, &hdr_val); ++ ++ if (!success) ++ break; ++ ++ freed_chunks++; ++ chunk_hdr_val = hdr_val; ++ /* extract the next chunk address */ ++ chunk_gpu_va = chunk_hdr_val & CHUNK_ADDR_MASK; ++ } ++ ++ /* Update the post-scan deletion to context header */ ++ *ctx_ptr = chunk_hdr_val; ++ ++ /* Try to scan the HW hoarded list of unused chunks */ ++ freed_chunks += delete_hoarded_chunks(heap); ++ freed_pages = freed_chunks * PFN_UP(heap->chunk_size); ++ dev_dbg(heap->kctx->kbdev->dev, ++ "Scan reclaim freed chunks/pages %u/%llu, set heap-ctx_u64[0]: 0x%llX\n", ++ freed_chunks, freed_pages, chunk_hdr_val); ++ ++ /* Update context tiler heaps memory usage */ ++ kctx->running_total_tiler_heap_memory -= freed_pages << PAGE_SHIFT; ++ kctx->running_total_tiler_heap_nr_chunks -= freed_chunks; ++ return freed_pages; ++} ++ ++u32 kbase_csf_tiler_heap_scan_kctx_unused_pages(struct kbase_context *kctx, u32 to_free) +{ ++ u64 freed = 0; + struct kbase_csf_tiler_heap *heap; -+ int err = -EINVAL; + + mutex_lock(&kctx->csf.tiler_heaps.lock); + -+ heap = find_tiler_heap(kctx, gpu_heap_va); ++ list_for_each_entry(heap, &kctx->csf.tiler_heaps.list, link) { ++ freed += delete_unused_chunk_pages(heap); + -+ if (likely(heap)) { -+ err = alloc_new_chunk(heap, nr_in_flight, -+ new_chunk_ptr); ++ /* If freed enough, then stop here */ ++ if (freed >= to_free) ++ break; + } + + mutex_unlock(&kctx->csf.tiler_heaps.lock); ++ /* The scan is surely not more than 4-G pages, but for logic flow limit it */ ++ if (WARN_ON(unlikely(freed > U32_MAX))) ++ return U32_MAX; ++ else ++ return (u32)freed; ++} + -+ return err; ++static u64 count_unused_heap_pages(struct kbase_csf_tiler_heap *heap) ++{ ++ u32 chunk_cnt = 0; ++ u64 page_cnt = 0; ++ ++ lockdep_assert_held(&heap->kctx->csf.tiler_heaps.lock); ++ ++ /* Here the count is basically an informed estimate, avoiding the costly mapping/unmaping ++ * in the chunk list walk. The downside is that the number is a less reliable guide for ++ * later on scan (free) calls on this heap for what actually is freeable. ++ */ ++ if (heap->chunk_count > HEAP_SHRINK_STOP_LIMIT) { ++ chunk_cnt = heap->chunk_count - HEAP_SHRINK_STOP_LIMIT; ++ page_cnt = chunk_cnt * PFN_UP(heap->chunk_size); ++ } ++ ++ dev_dbg(heap->kctx->kbdev->dev, ++ "Reclaim count chunks/pages %u/%llu (estimated), heap_va: 0x%llX\n", chunk_cnt, ++ page_cnt, heap->gpu_va); ++ ++ return page_cnt; ++} ++ ++u32 kbase_csf_tiler_heap_count_kctx_unused_pages(struct kbase_context *kctx) ++{ ++ u64 page_cnt = 0; ++ struct kbase_csf_tiler_heap *heap; ++ ++ mutex_lock(&kctx->csf.tiler_heaps.lock); ++ ++ list_for_each_entry(heap, &kctx->csf.tiler_heaps.list, link) ++ page_cnt += count_unused_heap_pages(heap); ++ ++ mutex_unlock(&kctx->csf.tiler_heaps.lock); ++ ++ /* The count is surely not more than 4-G pages, but for logic flow limit it */ ++ if (WARN_ON(unlikely(page_cnt > U32_MAX))) ++ return U32_MAX; ++ else ++ return (u32)page_cnt; +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h new file mode 100755 -index 000000000000..1a4729df6ca3 +index 000000000..1b5cb5608 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h -@@ -0,0 +1,113 @@ +@@ -0,0 +1,142 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -174280,15 +197459,12 @@ index 000000000000..1a4729df6ca3 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CSF_TILER_HEAP_H_ +#define _KBASE_CSF_TILER_HEAP_H_ + +#include -+ +/** + * kbase_csf_tiler_heap_context_init - Initialize the tiler heaps context for a + * GPU address space @@ -174303,10 +197479,10 @@ index 000000000000..1a4729df6ca3 + * kbase_csf_tiler_heap_context_term - Terminate the tiler heaps context for a + * GPU address space + * ++ * @kctx: Pointer to the kbase context being terminated. ++ * + * This function deletes any chunked tiler heaps that weren't deleted before + * context termination. -+ * -+ * @kctx: Pointer to the kbase context being terminated. + */ +void kbase_csf_tiler_heap_context_term(struct kbase_context *kctx); + @@ -174323,6 +197499,12 @@ index 000000000000..1a4729df6ca3 + * @target_in_flight: Number of render-passes that the driver should attempt to + * keep in flight for which allocation of new chunks is + * allowed. Must not be zero. ++ * @buf_desc_va: Buffer descriptor GPU virtual address. This is a hint for ++ * indicating that the caller is intending to perform tiler heap ++ * chunks reclaim for those that are hoarded with hardware while ++ * the associated shader activites are suspended and the CSGs are ++ * off slots. If the referred reclaiming is not desired, can ++ * set it to 0. + * @gpu_heap_va: Where to store the GPU virtual address of the context that was + * set up for the tiler heap. + * @first_chunk_va: Where to store the GPU virtual address of the first chunk @@ -174331,23 +197513,22 @@ index 000000000000..1a4729df6ca3 + * + * Return: 0 if successful or a negative error code on failure. + */ -+int kbase_csf_tiler_heap_init(struct kbase_context *kctx, -+ u32 chunk_size, u32 initial_chunks, u32 max_chunks, -+ u16 target_in_flight, u64 *gpu_heap_va, -+ u64 *first_chunk_va); ++int kbase_csf_tiler_heap_init(struct kbase_context *kctx, u32 chunk_size, u32 initial_chunks, ++ u32 max_chunks, u16 target_in_flight, u64 const buf_desc_va, ++ u64 *gpu_heap_va, u64 *first_chunk_va); + +/** -+ * kbasep_cs_tiler_heap_term - Terminate a chunked tiler memory heap. ++ * kbase_csf_tiler_heap_term - Terminate a chunked tiler memory heap. ++ * ++ * @kctx: Pointer to the kbase context in which the tiler heap was initialized. ++ * @gpu_heap_va: The GPU virtual address of the context that was set up for the ++ * tiler heap. + * + * This function will terminate a chunked tiler heap and cause all the chunks + * (initial and those added during out-of-memory processing) to be freed. + * It is the caller's responsibility to ensure no further operations on this + * heap will happen before calling this function. + * -+ * @kctx: Pointer to the kbase context in which the tiler heap was initialized. -+ * @gpu_heap_va: The GPU virtual address of the context that was set up for the -+ * tiler heap. -+ * + * Return: 0 if successful or a negative error code on failure. + */ +int kbase_csf_tiler_heap_term(struct kbase_context *kctx, u64 gpu_heap_va); @@ -174355,40 +197536,67 @@ index 000000000000..1a4729df6ca3 +/** + * kbase_csf_tiler_heap_alloc_new_chunk - Allocate a new chunk for tiler heap. + * ++ * @kctx: Pointer to the kbase context in which the tiler heap was initialized. ++ * @gpu_heap_va: GPU virtual address of the heap context. ++ * @nr_in_flight: Number of render passes that are in-flight, must not be zero. ++ * @pending_frag_count: Number of render passes in-flight with completed vertex/tiler stage. ++ * The minimum value is zero but it must be less or equal to ++ * the total number of render passes in flight ++ * @new_chunk_ptr: Where to store the GPU virtual address & size of the new ++ * chunk allocated for the heap. ++ * + * This function will allocate a new chunk for the chunked tiler heap depending + * on the settings provided by userspace when the heap was created and the + * heap's statistics (like number of render passes in-flight). + * It would return an appropriate error code if a new chunk couldn't be + * allocated. + * -+ * @kctx: Pointer to the kbase context in which the tiler heap was initialized. -+ * @gpu_heap_va: GPU virtual address of the heap context. -+ * @nr_in_flight: Number of render passes that are in-flight, must not be zero. -+ * @new_chunk_ptr: Where to store the GPU virtual address & size of the new -+ * chunk allocated for the heap. -+ * + * Return: 0 if a new chunk was allocated otherwise an appropriate negative + * error code (like -EBUSY when a free chunk is expected to be + * available upon completion of a render pass and -EINVAL when + * invalid value was passed for one of the argument). + */ +int kbase_csf_tiler_heap_alloc_new_chunk(struct kbase_context *kctx, -+ u64 gpu_heap_va, u32 nr_in_flight, u64 *new_chunk_ptr); ++ u64 gpu_heap_va, u32 nr_in_flight, u32 pending_frag_count, u64 *new_chunk_ptr); ++ ++/** ++ * kbase_csf_tiler_heap_scan_kctx_unused_pages - Performs the tiler heap shrinker calim's scan ++ * functionality. ++ * ++ * @kctx: Pointer to the kbase context for which the tiler heap recalim is to be ++ * operated with. ++ * @to_free: Number of pages suggested for the reclaim scan (free) method to reach. ++ * ++ * Return: the actual number of pages the scan method has freed from the call. ++ */ ++u32 kbase_csf_tiler_heap_scan_kctx_unused_pages(struct kbase_context *kctx, u32 to_free); ++ ++/** ++ * kbase_csf_tiler_heap_count_kctx_unused_pages - Performs the tiler heap shrinker calim's count ++ * functionality. ++ * ++ * @kctx: Pointer to the kbase context for which the tiler heap recalim is to be ++ * operated with. ++ * ++ * Return: a number of pages that could likely be freed on the subsequent scan method call. ++ */ ++u32 kbase_csf_tiler_heap_count_kctx_unused_pages(struct kbase_context *kctx); +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c new file mode 100755 -index 000000000000..5d744b81fe4a +index 000000000..96e0f2829 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c -@@ -0,0 +1,107 @@ +@@ -0,0 +1,162 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -174399,8 +197607,6 @@ index 000000000000..5d744b81fe4a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include "mali_kbase_csf_tiler_heap_debugfs.h" @@ -174408,7 +197614,7 @@ index 000000000000..5d744b81fe4a +#include +#include + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) + +/** + * kbasep_csf_tiler_heap_debugfs_show() - Print tiler heap information for per context @@ -174416,7 +197622,7 @@ index 000000000000..5d744b81fe4a + * @file: The seq_file for printing to + * @data: The debugfs dentry private data, a pointer to kbase_context + * -+ * Return: Negative error code or 0 on success. ++ * Return: 0 in any case. + */ +static int kbasep_csf_tiler_heap_debugfs_show(struct seq_file *file, void *data) +{ @@ -174449,11 +197655,41 @@ index 000000000000..5d744b81fe4a + return 0; +} + ++/** ++ * kbasep_csf_tiler_heap_total_debugfs_show() - Print the total memory allocated ++ * for all tiler heaps in a context. ++ * ++ * @file: The seq_file for printing to ++ * @data: The debugfs dentry private data, a pointer to kbase_context ++ * ++ * Return: 0 in any case. ++ */ ++static int kbasep_csf_tiler_heap_total_debugfs_show(struct seq_file *file, void *data) ++{ ++ struct kbase_context *kctx = file->private; ++ ++ seq_printf(file, "MALI_CSF_TILER_HEAP_DEBUGFS_VERSION: v%u\n", ++ MALI_CSF_TILER_HEAP_DEBUGFS_VERSION); ++ seq_printf(file, "Total number of chunks of all heaps in the context: %lu\n", ++ (unsigned long)kctx->running_total_tiler_heap_nr_chunks); ++ seq_printf(file, "Total allocated memory of all heaps in the context: %llu\n", ++ (unsigned long long)kctx->running_total_tiler_heap_memory); ++ seq_printf(file, "Peak allocated tiler heap memory in the context: %llu\n", ++ (unsigned long long)kctx->peak_total_tiler_heap_memory); ++ ++ return 0; ++} ++ +static int kbasep_csf_tiler_heap_debugfs_open(struct inode *in, struct file *file) +{ + return single_open(file, kbasep_csf_tiler_heap_debugfs_show, in->i_private); +} + ++static int kbasep_csf_tiler_heap_total_debugfs_open(struct inode *in, struct file *file) ++{ ++ return single_open(file, kbasep_csf_tiler_heap_total_debugfs_show, in->i_private); ++} ++ +static const struct file_operations kbasep_csf_tiler_heap_debugfs_fops = { + .open = kbasep_csf_tiler_heap_debugfs_open, + .read = seq_read, @@ -174461,6 +197697,13 @@ index 000000000000..5d744b81fe4a + .release = single_release, +}; + ++static const struct file_operations kbasep_csf_tiler_heap_total_debugfs_fops = { ++ .open = kbasep_csf_tiler_heap_total_debugfs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++ +void kbase_csf_tiler_heap_debugfs_init(struct kbase_context *kctx) +{ + struct dentry *file; @@ -174477,6 +197720,21 @@ index 000000000000..5d744b81fe4a + } +} + ++void kbase_csf_tiler_heap_total_debugfs_init(struct kbase_context *kctx) ++{ ++ struct dentry *file; ++ ++ if (WARN_ON(!kctx || IS_ERR_OR_NULL(kctx->kctx_dentry))) ++ return; ++ ++ file = debugfs_create_file("tiler_heaps_total", 0444, kctx->kctx_dentry, ++ kctx, &kbasep_csf_tiler_heap_total_debugfs_fops); ++ ++ if (IS_ERR_OR_NULL(file)) { ++ dev_warn(kctx->kbdev->dev, ++ "Unable to create total tiler heap allocated memory debugfs entry"); ++ } ++} + +#else +/* @@ -174486,22 +197744,27 @@ index 000000000000..5d744b81fe4a +{ +} + ++void kbase_csf_tiler_heap_total_debugfs_init(struct kbase_context *kctx) ++{ ++} ++ +#endif /* CONFIG_DEBUG_FS */ + diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h new file mode 100755 -index 000000000000..44c580d82068 +index 000000000..4a1b413ef --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h -@@ -0,0 +1,38 @@ +@@ -0,0 +1,44 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -174512,8 +197775,6 @@ index 000000000000..44c580d82068 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CSF_TILER_HEAP_DEBUGFS_H_ @@ -174525,27 +197786,35 @@ index 000000000000..44c580d82068 +#define MALI_CSF_TILER_HEAP_DEBUGFS_VERSION 0 + +/** -+ * kbase_csf_tiler_heap_debugfs_init() - Create a debugfs entry for per context tiler heap ++ * kbase_csf_tiler_heap_debugfs_init - Create a debugfs entry for per context tiler heap + * + * @kctx: The kbase_context for which to create the debugfs entry + */ +void kbase_csf_tiler_heap_debugfs_init(struct kbase_context *kctx); + ++/** ++ * kbase_csf_tiler_heap_total_debugfs_init - Create a debugfs entry for per context tiler heap ++ * ++ * @kctx: The kbase_context for which to create the debugfs entry ++ */ ++void kbase_csf_tiler_heap_total_debugfs_init(struct kbase_context *kctx); ++ +#endif /* _KBASE_CSF_TILER_HEAP_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h new file mode 100755 -index 000000000000..1f9e208904a9 +index 000000000..96f2b03d2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h -@@ -0,0 +1,112 @@ +@@ -0,0 +1,140 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -174556,8 +197825,6 @@ index 000000000000..1f9e208904a9 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CSF_TILER_HEAP_DEF_H_ @@ -174597,28 +197864,39 @@ index 000000000000..1f9e208904a9 + ((CHUNK_HDR_NEXT_ADDR_MASK >> CHUNK_HDR_NEXT_ADDR_POS) << \ + CHUNK_HDR_NEXT_ADDR_ENCODE_SHIFT) + ++/* The size of the area needed to be vmapped prior to handing the tiler heap ++ * over to the tiler, so that the shrinker could be invoked. ++ */ ++#define NEXT_CHUNK_ADDR_SIZE (sizeof(u64)) ++ +/** + * struct kbase_csf_tiler_heap_chunk - A tiler heap chunk managed by the kernel + * -+ * Chunks are allocated upon initialization of a tiler heap or in response to -+ * out-of-memory events from the firmware. Chunks are always fully backed by -+ * physical memory to avoid the overhead of processing GPU page faults. The -+ * allocated GPU memory regions are linked together independent of the list of -+ * kernel objects of this type. -+ * + * @link: Link to this chunk in a list of chunks belonging to a + * @kbase_csf_tiler_heap. + * @region: Pointer to the GPU memory region allocated for the chunk. ++ * @map: Kernel VA mapping so that we would not need to use vmap in the ++ * shrinker callback, which can allocate. This maps only the header ++ * of the chunk, so it could be traversed. + * @gpu_va: GPU virtual address of the start of the memory region. + * This points to the header of the chunk and not to the low address + * of free memory within it. ++ * ++ * Chunks are allocated upon initialization of a tiler heap or in response to ++ * out-of-memory events from the firmware. Chunks are always fully backed by ++ * physical memory to avoid the overhead of processing GPU page faults. The ++ * allocated GPU memory regions are linked together independent of the list of ++ * kernel objects of this type. + */ +struct kbase_csf_tiler_heap_chunk { + struct list_head link; + struct kbase_va_region *region; ++ struct kbase_vmap_struct map; + u64 gpu_va; +}; + ++#define HEAP_BUF_DESCRIPTOR_CHECKED (1 << 0) ++ +/** + * struct kbase_csf_tiler_heap - A tiler heap managed by the kernel + * @@ -174626,6 +197904,20 @@ index 000000000000..1f9e208904a9 + * associated. + * @link: Link to this heap in a list of tiler heaps belonging to + * the @kbase_csf_tiler_heap_context. ++ * @chunks_list: Linked list of allocated chunks. ++ * @gpu_va: The GPU virtual address of the heap context structure that ++ * was allocated for the firmware. This is also used to ++ * uniquely identify the heap. ++ * @heap_id: Unique id representing the heap, assigned during heap ++ * initialization. ++ * @buf_desc_va: Buffer descriptor GPU VA. Can be 0 for backward compatible ++ * to earlier version base interfaces. ++ * @buf_desc_reg: Pointer to the VA region that covers the provided buffer ++ * descriptor memory object pointed to by buf_desc_va. ++ * @gpu_va_map: Kernel VA mapping of the GPU VA region. ++ * @buf_desc_map: Kernel VA mapping of the buffer descriptor, read from ++ * during the tiler heap shrinker. Sync operations may need ++ * to be done before each read. + * @chunk_size: Size of each chunk, in bytes. Must be page-aligned. + * @chunk_count: The number of chunks currently allocated. Must not be + * zero or greater than @max_chunks. @@ -174634,36 +197926,41 @@ index 000000000000..1f9e208904a9 + * @target_in_flight: Number of render-passes that the driver should attempt + * to keep in flight for which allocation of new chunks is + * allowed. Must not be zero. -+ * @gpu_va: The GPU virtual address of the heap context structure that -+ * was allocated for the firmware. This is also used to -+ * uniquely identify the heap. -+ * @chunks_list: Linked list of allocated chunks. ++ * @buf_desc_checked: Indicates if runtime check on buffer descriptor has been done. + */ +struct kbase_csf_tiler_heap { + struct kbase_context *kctx; + struct list_head link; ++ struct list_head chunks_list; ++ u64 gpu_va; ++ u64 heap_id; ++ u64 buf_desc_va; ++ struct kbase_va_region *buf_desc_reg; ++ struct kbase_vmap_struct buf_desc_map; ++ struct kbase_vmap_struct gpu_va_map; + u32 chunk_size; + u32 chunk_count; + u32 max_chunks; + u16 target_in_flight; -+ u64 gpu_va; -+ struct list_head chunks_list; ++ bool buf_desc_checked; +}; ++ +#endif /* !_KBASE_CSF_TILER_HEAP_DEF_H_ */ -diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c -new file mode 100755 -index 000000000000..495ff2850500 +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c +new file mode 100644 +index 000000000..6357e3518 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c -@@ -0,0 +1,169 @@ ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c +@@ -0,0 +1,359 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -174674,43 +197971,492 @@ index 000000000000..495ff2850500 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include -+#include -+#include -+#include -+#include ++#include ++#include "mali_kbase_csf.h" ++#include "mali_kbase_csf_tiler_heap.h" ++#include "mali_kbase_csf_tiler_heap_reclaim.h" + -+#include "mali_kbase.h" -+#include "mali_kbase_config_defaults.h" -+#include "mali_kbase_csf_firmware.h" -+#include "mali_kbase_csf_timeout.h" -+#include "backend/gpu/mali_kbase_pm_internal.h" ++/* Tiler heap shrinker seek value, needs to be higher than jit and memory pools */ ++#define HEAP_SHRINKER_SEEKS (DEFAULT_SEEKS + 2) + -+/** -+ * set_timeout - set a new global progress timeout. -+ * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. -+ * @timeout: the maximum number of GPU cycles without forward progress to allow -+ * to elapse before terminating a GPU command queue group. -+ * -+ * Return: 0 on success, or negative on failure -+ * (e.g. -ERANGE if the requested timeout is too large). -+ */ -+static int set_timeout(struct kbase_device *const kbdev, u64 const timeout) -+{ -+ if (timeout > GLB_PROGRESS_TIMER_TIMEOUT_MAX) { -+ dev_err(kbdev->dev, "Timeout %llu is too large.\n", timeout); -+ return -ERANGE; -+ } ++/* Tiler heap shrinker batch value */ ++#define HEAP_SHRINKER_BATCH (512) + -+ dev_dbg(kbdev->dev, "New progress timeout: %llu cycles\n", timeout); ++/* Tiler heap reclaim scan (free) method size for limiting a scan run length */ ++#define HEAP_RECLAIM_SCAN_BATCH_SIZE (HEAP_SHRINKER_BATCH << 7) + -+ atomic64_set(&kbdev->csf.progress_timeout, timeout); ++static u8 get_kctx_highest_csg_priority(struct kbase_context *kctx) ++{ ++ u8 prio; ++ ++ for (prio = KBASE_QUEUE_GROUP_PRIORITY_REALTIME; prio < KBASE_QUEUE_GROUP_PRIORITY_LOW; ++ prio++) ++ if (!list_empty(&kctx->csf.sched.runnable_groups[prio])) ++ break; ++ ++ if (prio != KBASE_QUEUE_GROUP_PRIORITY_REALTIME && kctx->csf.sched.num_idle_wait_grps) { ++ struct kbase_queue_group *group; ++ ++ list_for_each_entry(group, &kctx->csf.sched.idle_wait_groups, link) { ++ if (group->priority < prio) ++ prio = group->priority; ++ } ++ } ++ ++ return prio; ++} ++ ++static void detach_ctx_from_heap_reclaim_mgr(struct kbase_context *kctx) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kctx->kbdev->csf.scheduler; ++ struct kbase_csf_ctx_heap_reclaim_info *info = &kctx->csf.sched.heap_info; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ if (!list_empty(&info->mgr_link)) { ++ u32 remaining = (info->nr_est_unused_pages > info->nr_freed_pages) ? ++ info->nr_est_unused_pages - info->nr_freed_pages : ++ 0; ++ ++ list_del_init(&info->mgr_link); ++ if (remaining) ++ WARN_ON(atomic_sub_return(remaining, &scheduler->reclaim_mgr.unused_pages) < ++ 0); ++ ++ dev_dbg(kctx->kbdev->dev, ++ "Reclaim_mgr_detach: ctx_%d_%d, est_pages=0%u, freed_pages=%u", kctx->tgid, ++ kctx->id, info->nr_est_unused_pages, info->nr_freed_pages); ++ } ++} ++ ++static void attach_ctx_to_heap_reclaim_mgr(struct kbase_context *kctx) ++{ ++ struct kbase_csf_ctx_heap_reclaim_info *const info = &kctx->csf.sched.heap_info; ++ struct kbase_csf_scheduler *const scheduler = &kctx->kbdev->csf.scheduler; ++ u8 const prio = get_kctx_highest_csg_priority(kctx); ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ if (WARN_ON(!list_empty(&info->mgr_link))) ++ list_del_init(&info->mgr_link); ++ ++ /* Count the pages that could be freed */ ++ info->nr_est_unused_pages = kbase_csf_tiler_heap_count_kctx_unused_pages(kctx); ++ /* Initialize the scan operation tracking pages */ ++ info->nr_freed_pages = 0; ++ ++ list_add_tail(&info->mgr_link, &scheduler->reclaim_mgr.ctx_lists[prio]); ++ /* Accumulate the estimated pages to the manager total field */ ++ atomic_add(info->nr_est_unused_pages, &scheduler->reclaim_mgr.unused_pages); ++ ++ dev_dbg(kctx->kbdev->dev, "Reclaim_mgr_attach: ctx_%d_%d, est_count_pages=%u", kctx->tgid, ++ kctx->id, info->nr_est_unused_pages); ++} ++ ++void kbase_csf_tiler_heap_reclaim_sched_notify_grp_active(struct kbase_queue_group *group) ++{ ++ struct kbase_context *kctx = group->kctx; ++ struct kbase_csf_ctx_heap_reclaim_info *info = &kctx->csf.sched.heap_info; ++ ++ lockdep_assert_held(&kctx->kbdev->csf.scheduler.lock); ++ ++ info->on_slot_grps++; ++ /* If the kctx has an on-slot change from 0 => 1, detach it from reclaim_mgr */ ++ if (info->on_slot_grps == 1) { ++ dev_dbg(kctx->kbdev->dev, "CSG_%d_%d_%d on-slot, remove kctx from reclaim manager", ++ group->kctx->tgid, group->kctx->id, group->handle); ++ ++ detach_ctx_from_heap_reclaim_mgr(kctx); ++ } ++} ++ ++void kbase_csf_tiler_heap_reclaim_sched_notify_grp_evict(struct kbase_queue_group *group) ++{ ++ struct kbase_context *kctx = group->kctx; ++ struct kbase_csf_ctx_heap_reclaim_info *const info = &kctx->csf.sched.heap_info; ++ struct kbase_csf_scheduler *const scheduler = &kctx->kbdev->csf.scheduler; ++ const u32 num_groups = kctx->kbdev->csf.global_iface.group_num; ++ u32 on_slot_grps = 0; ++ u32 i; ++ ++ lockdep_assert_held(&scheduler->lock); ++ ++ /* Group eviction from the scheduler is a bit more complex, but fairly less ++ * frequent in operations. Taking the opportunity to actually count the ++ * on-slot CSGs from the given kctx, for robustness and clearer code logic. ++ */ ++ for_each_set_bit(i, scheduler->csg_inuse_bitmap, num_groups) { ++ struct kbase_csf_csg_slot *csg_slot = &scheduler->csg_slots[i]; ++ struct kbase_queue_group *grp = csg_slot->resident_group; ++ ++ if (unlikely(!grp)) ++ continue; ++ ++ if (grp->kctx == kctx) ++ on_slot_grps++; ++ } ++ ++ info->on_slot_grps = on_slot_grps; ++ ++ /* If the kctx has no other CSGs on-slot, handle the heap reclaim related actions */ ++ if (!info->on_slot_grps) { ++ if (kctx->csf.sched.num_runnable_grps || kctx->csf.sched.num_idle_wait_grps) { ++ /* The kctx has other operational CSGs, attach it if not yet done */ ++ if (list_empty(&info->mgr_link)) { ++ dev_dbg(kctx->kbdev->dev, ++ "CSG_%d_%d_%d evict, add kctx to reclaim manager", ++ group->kctx->tgid, group->kctx->id, group->handle); ++ ++ attach_ctx_to_heap_reclaim_mgr(kctx); ++ } ++ } else { ++ /* The kctx is a zombie after the group eviction, drop it out */ ++ dev_dbg(kctx->kbdev->dev, ++ "CSG_%d_%d_%d evict leading to zombie kctx, dettach from reclaim manager", ++ group->kctx->tgid, group->kctx->id, group->handle); ++ ++ detach_ctx_from_heap_reclaim_mgr(kctx); ++ } ++ } ++} ++ ++void kbase_csf_tiler_heap_reclaim_sched_notify_grp_suspend(struct kbase_queue_group *group) ++{ ++ struct kbase_context *kctx = group->kctx; ++ struct kbase_csf_ctx_heap_reclaim_info *info = &kctx->csf.sched.heap_info; ++ ++ lockdep_assert_held(&kctx->kbdev->csf.scheduler.lock); ++ ++ if (!WARN_ON(info->on_slot_grps == 0)) ++ info->on_slot_grps--; ++ /* If the kctx has no CSGs on-slot, attach it to scheduler's reclaim manager */ ++ if (info->on_slot_grps == 0) { ++ dev_dbg(kctx->kbdev->dev, "CSG_%d_%d_%d off-slot, add kctx to reclaim manager", ++ group->kctx->tgid, group->kctx->id, group->handle); ++ ++ attach_ctx_to_heap_reclaim_mgr(kctx); ++ } ++} ++ ++static unsigned long reclaim_unused_heap_pages(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ struct kbase_csf_sched_heap_reclaim_mgr *const mgr = &scheduler->reclaim_mgr; ++ unsigned long total_freed_pages = 0; ++ int prio; ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ for (prio = KBASE_QUEUE_GROUP_PRIORITY_LOW; ++ total_freed_pages < HEAP_RECLAIM_SCAN_BATCH_SIZE && ++ prio >= KBASE_QUEUE_GROUP_PRIORITY_REALTIME; ++ prio--) { ++ struct kbase_csf_ctx_heap_reclaim_info *info, *tmp; ++ u32 cnt_ctxs = 0; ++ ++ list_for_each_entry_safe(info, tmp, &scheduler->reclaim_mgr.ctx_lists[prio], ++ mgr_link) { ++ struct kbase_context *kctx = ++ container_of(info, struct kbase_context, csf.sched.heap_info); ++ u32 freed_pages = kbase_csf_tiler_heap_scan_kctx_unused_pages( ++ kctx, info->nr_est_unused_pages); ++ ++ if (freed_pages) { ++ /* Remove the freed pages from the manager retained estimate. The ++ * accumulated removals from the kctx should not exceed the kctx ++ * initially notified contribution amount: ++ * info->nr_est_unused_pages. ++ */ ++ u32 rm_cnt = MIN(info->nr_est_unused_pages - info->nr_freed_pages, ++ freed_pages); ++ ++ WARN_ON(atomic_sub_return(rm_cnt, &mgr->unused_pages) < 0); ++ ++ /* tracking the freed pages, before a potential detach call */ ++ info->nr_freed_pages += freed_pages; ++ total_freed_pages += freed_pages; ++ ++ schedule_work(&kctx->jit_work); ++ } ++ ++ /* If the kctx can't offer anymore, drop it from the reclaim manger, ++ * otherwise leave it remaining in. If the kctx changes its state (i.e. ++ * some CSGs becoming on-slot), the scheduler will pull it out. ++ */ ++ if (info->nr_freed_pages >= info->nr_est_unused_pages || freed_pages == 0) ++ detach_ctx_from_heap_reclaim_mgr(kctx); ++ ++ cnt_ctxs++; ++ ++ /* Enough has been freed, break to avoid holding the lock too long */ ++ if (total_freed_pages >= HEAP_RECLAIM_SCAN_BATCH_SIZE) ++ break; ++ } ++ ++ dev_dbg(kbdev->dev, "Reclaim free heap pages: %lu (cnt_ctxs: %u, prio: %d)", ++ total_freed_pages, cnt_ctxs, prio); ++ } ++ ++ dev_dbg(kbdev->dev, "Reclaim free total heap pages: %lu (across all CSG priority)", ++ total_freed_pages); ++ ++ return total_freed_pages; ++} ++ ++static unsigned long kbase_csf_tiler_heap_reclaim_count_free_pages(struct kbase_device *kbdev, ++ struct shrink_control *sc) ++{ ++ struct kbase_csf_sched_heap_reclaim_mgr *mgr = &kbdev->csf.scheduler.reclaim_mgr; ++ unsigned long page_cnt = atomic_read(&mgr->unused_pages); ++ ++ dev_dbg(kbdev->dev, "Reclaim count unused pages (estimate): %lu", page_cnt); ++ ++ return page_cnt; ++} ++ ++static unsigned long kbase_csf_tiler_heap_reclaim_scan_free_pages(struct kbase_device *kbdev, ++ struct shrink_control *sc) ++{ ++ struct kbase_csf_sched_heap_reclaim_mgr *mgr = &kbdev->csf.scheduler.reclaim_mgr; ++ unsigned long freed = 0; ++ unsigned long avail = 0; ++ ++ /* If Scheduler is busy in action, return 0 */ ++ if (!mutex_trylock(&kbdev->csf.scheduler.lock)) { ++ struct kbase_csf_scheduler *const scheduler = &kbdev->csf.scheduler; ++ ++ /* Wait for roughly 2-ms */ ++ wait_event_timeout(kbdev->csf.event_wait, (scheduler->state != SCHED_BUSY), ++ msecs_to_jiffies(2)); ++ if (!mutex_trylock(&kbdev->csf.scheduler.lock)) { ++ dev_dbg(kbdev->dev, "Tiler heap reclaim scan see device busy (freed: 0)"); ++ return 0; ++ } ++ } ++ ++ avail = atomic_read(&mgr->unused_pages); ++ if (avail) ++ freed = reclaim_unused_heap_pages(kbdev); ++ ++ mutex_unlock(&kbdev->csf.scheduler.lock); ++ ++#if (KERNEL_VERSION(4, 14, 0) <= LINUX_VERSION_CODE) ++ if (freed > sc->nr_to_scan) ++ sc->nr_scanned = freed; ++#endif /* (KERNEL_VERSION(4, 14, 0) <= LINUX_VERSION_CODE) */ ++ ++ dev_info(kbdev->dev, "Tiler heap reclaim scan freed pages: %lu (unused: %lu)", freed, ++ avail); ++ ++ /* On estimate suggesting available, yet actual free failed, return STOP */ ++ if (avail && !freed) ++ return SHRINK_STOP; ++ else ++ return freed; ++} ++ ++static unsigned long kbase_csf_tiler_heap_reclaim_count_objects(struct shrinker *s, ++ struct shrink_control *sc) ++{ ++ struct kbase_device *kbdev = ++ container_of(s, struct kbase_device, csf.scheduler.reclaim_mgr.heap_reclaim); ++ ++ return kbase_csf_tiler_heap_reclaim_count_free_pages(kbdev, sc); ++} ++ ++static unsigned long kbase_csf_tiler_heap_reclaim_scan_objects(struct shrinker *s, ++ struct shrink_control *sc) ++{ ++ struct kbase_device *kbdev = ++ container_of(s, struct kbase_device, csf.scheduler.reclaim_mgr.heap_reclaim); ++ ++ return kbase_csf_tiler_heap_reclaim_scan_free_pages(kbdev, sc); ++} ++ ++void kbase_csf_tiler_heap_reclaim_ctx_init(struct kbase_context *kctx) ++{ ++ /* Per-kctx heap_info object initialization */ ++ memset(&kctx->csf.sched.heap_info, 0, sizeof(struct kbase_csf_ctx_heap_reclaim_info)); ++ INIT_LIST_HEAD(&kctx->csf.sched.heap_info.mgr_link); ++} ++ ++void kbase_csf_tiler_heap_reclaim_mgr_init(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ struct shrinker *reclaim = &scheduler->reclaim_mgr.heap_reclaim; ++ u8 prio; ++ ++ for (prio = KBASE_QUEUE_GROUP_PRIORITY_REALTIME; prio < KBASE_QUEUE_GROUP_PRIORITY_COUNT; ++ prio++) ++ INIT_LIST_HEAD(&scheduler->reclaim_mgr.ctx_lists[prio]); ++ ++ atomic_set(&scheduler->reclaim_mgr.unused_pages, 0); ++ ++ reclaim->count_objects = kbase_csf_tiler_heap_reclaim_count_objects; ++ reclaim->scan_objects = kbase_csf_tiler_heap_reclaim_scan_objects; ++ reclaim->seeks = HEAP_SHRINKER_SEEKS; ++ reclaim->batch = HEAP_SHRINKER_BATCH; ++} ++ ++void kbase_csf_tiler_heap_reclaim_mgr_term(struct kbase_device *kbdev) ++{ ++ struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; ++ u8 prio; ++ ++ for (prio = KBASE_QUEUE_GROUP_PRIORITY_REALTIME; prio < KBASE_QUEUE_GROUP_PRIORITY_COUNT; ++ prio++) ++ WARN_ON(!list_empty(&scheduler->reclaim_mgr.ctx_lists[prio])); ++ ++ WARN_ON(atomic_read(&scheduler->reclaim_mgr.unused_pages)); ++} +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.h +new file mode 100644 +index 000000000..b6e580e48 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.h +@@ -0,0 +1,80 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#ifndef _KBASE_CSF_TILER_HEAP_RECLAIM_H_ ++#define _KBASE_CSF_TILER_HEAP_RECLAIM_H_ ++ ++#include ++ ++/** ++ * kbase_csf_tiler_heap_reclaim_sched_notify_grp_active - Notifier function for the scheduler ++ * to use when a group is put on-slot. ++ * ++ * @group: Pointer to the group object that has been placed on-slot for running. ++ * ++ */ ++void kbase_csf_tiler_heap_reclaim_sched_notify_grp_active(struct kbase_queue_group *group); ++ ++/** ++ * kbase_csf_tiler_heap_reclaim_sched_notify_grp_evict - Notifier function for the scheduler ++ * to use when a group is evicted out of the schedulder's scope, i.e no run of ++ * the group is possible afterwards. ++ * ++ * @group: Pointer to the group object that has been evicted. ++ * ++ */ ++void kbase_csf_tiler_heap_reclaim_sched_notify_grp_evict(struct kbase_queue_group *group); ++ ++/** ++ * kbase_csf_tiler_heap_reclaim_sched_notify_grp_suspend - Notifier function for the scheduler ++ * to use when a group is suspended from running, but could resume in future. ++ * ++ * @group: Pointer to the group object that is in suspended state. ++ * ++ */ ++void kbase_csf_tiler_heap_reclaim_sched_notify_grp_suspend(struct kbase_queue_group *group); ++ ++/** ++ * kbase_csf_tiler_heap_reclaim_ctx_init - Initializer on per context data fields for use ++ * with the tiler heap reclaim manager. ++ * ++ * @kctx: Pointer to the kbase_context. ++ * ++ */ ++void kbase_csf_tiler_heap_reclaim_ctx_init(struct kbase_context *kctx); ++ ++/** ++ * kbase_csf_tiler_heap_reclaim_mgr_init - Initializer for the tiler heap reclaim manger. ++ * ++ * @kbdev: Pointer to the device. ++ * ++ */ ++void kbase_csf_tiler_heap_reclaim_mgr_init(struct kbase_device *kbdev); ++ ++/** ++ * kbase_csf_tiler_heap_reclaim_mgr_term - Termination call for the tiler heap reclaim manger. ++ * ++ * @kbdev: Pointer to the device. ++ * ++ */ ++void kbase_csf_tiler_heap_reclaim_mgr_term(struct kbase_device *kbdev); ++ ++#endif +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c +new file mode 100755 +index 000000000..ea6c11624 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c +@@ -0,0 +1,177 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "mali_kbase.h" ++#include "mali_kbase_config_defaults.h" ++#include "mali_kbase_csf_firmware.h" ++#include "mali_kbase_csf_timeout.h" ++#include "mali_kbase_reset_gpu.h" ++#include "backend/gpu/mali_kbase_pm_internal.h" ++ ++/** ++ * set_timeout - set a new global progress timeout. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @timeout: the maximum number of GPU cycles without forward progress to allow ++ * to elapse before terminating a GPU command queue group. ++ * ++ * Return: 0 on success, or negative on failure ++ * (e.g. -ERANGE if the requested timeout is too large). ++ */ ++static int set_timeout(struct kbase_device *const kbdev, u64 const timeout) ++{ ++ if (timeout > GLB_PROGRESS_TIMER_TIMEOUT_MAX) { ++ dev_err(kbdev->dev, "Timeout %llu is too large.\n", timeout); ++ return -ERANGE; ++ } ++ ++ dev_dbg(kbdev->dev, "New progress timeout: %llu cycles\n", timeout); ++ ++ atomic64_set(&kbdev->csf.progress_timeout, timeout); + + return 0; +} @@ -174724,6 +198470,9 @@ index 000000000000..495ff2850500 + * + * This function is called when the progress_timeout sysfs file is written to. + * It checks the data written, and if valid updates the progress timeout value. ++ * The function also checks gpu reset status, if the gpu is in reset process, ++ * the function will return an error code (-EBUSY), and no change for timeout ++ * value. + * + * Return: @count if the function succeeded. An error code on failure. + */ @@ -174738,25 +198487,32 @@ index 000000000000..495ff2850500 + if (!kbdev) + return -ENODEV; + -+ err = kstrtou64(buf, 0, &timeout); ++ err = kbase_reset_gpu_try_prevent(kbdev); + if (err) { ++ dev_warn(kbdev->dev, ++ "Couldn't process progress_timeout write operation for GPU reset.\n"); ++ return -EBUSY; ++ } ++ ++ err = kstrtou64(buf, 0, &timeout); ++ if (err) + dev_err(kbdev->dev, + "Couldn't process progress_timeout write operation.\n" + "Use format \n"); -+ return err; -+ } ++ else ++ err = set_timeout(kbdev, timeout); + -+ err = set_timeout(kbdev, timeout); + if (!err) { + kbase_csf_scheduler_pm_active(kbdev); + -+ err = kbase_pm_wait_for_desired_state(kbdev); ++ err = kbase_csf_scheduler_wait_mcu_active(kbdev); + if (!err) + err = kbase_csf_firmware_set_timeout(kbdev, timeout); + + kbase_csf_scheduler_pm_idle(kbdev); + } + ++ kbase_reset_gpu_allow(kbdev); + if (err) + return err; + @@ -174788,15 +198544,14 @@ index 000000000000..495ff2850500 + +} + -+static DEVICE_ATTR(progress_timeout, 0644, progress_timeout_show, -+ progress_timeout_store); ++static DEVICE_ATTR_RW(progress_timeout); + +int kbase_csf_timeout_init(struct kbase_device *const kbdev) +{ + u64 timeout = DEFAULT_PROGRESS_TIMEOUT; + int err; + -+#ifdef CONFIG_OF ++#if IS_ENABLED(CONFIG_OF) + err = of_property_read_u64(kbdev->dev->of_node, + "progress_timeout", &timeout); + if (!err) @@ -174827,18 +198582,19 @@ index 000000000000..495ff2850500 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h new file mode 100755 -index 000000000000..d0156c09a60f +index 000000000..b406eaad2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h -@@ -0,0 +1,69 @@ +@@ -0,0 +1,66 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -174849,8 +198605,6 @@ index 000000000000..d0156c09a60f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CSF_TIMEOUT_H_ @@ -174861,8 +198615,8 @@ index 000000000000..d0156c09a60f +/** + * kbase_csf_timeout_init - Initialize the progress timeout. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. Must be zero-initialized. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * Must be zero-initialized. + * + * The progress timeout is the number of GPU clock cycles allowed to elapse + * before the driver terminates a GPU command queue group in which a task is @@ -174879,8 +198633,7 @@ index 000000000000..d0156c09a60f +/** + * kbase_csf_timeout_term - Terminate the progress timeout. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * + * Removes the sysfs file which allowed the timeout to be reconfigured. + * Does nothing if called on a zero-initialized object. @@ -174890,8 +198643,7 @@ index 000000000000..d0156c09a60f +/** + * kbase_csf_timeout_get - get the current global progress timeout. + * -+ * @kbdev: Instance of a GPU platform device that implements a command -+ * stream front-end interface. ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. + * + * Return: the maximum number of GPU cycles that is allowed to elapse without + * forward progress before the driver terminates a GPU command queue @@ -174902,18 +198654,19 @@ index 000000000000..d0156c09a60f +#endif /* _KBASE_CSF_TIMEOUT_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c new file mode 100755 -index 000000000000..5079a8e5af8c +index 000000000..6859d6529 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c -@@ -0,0 +1,555 @@ +@@ -0,0 +1,441 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -174924,8 +198677,6 @@ index 000000000000..5079a8e5af8c + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include "mali_kbase_csf_tl_reader.h" @@ -174940,26 +198691,20 @@ index 000000000000..5079a8e5af8c +#include "mali_kbase_pm.h" +#include "mali_kbase_hwaccess_time.h" + -+#include +#include -+#include + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) +#include "tl/mali_kbase_timeline_priv.h" +#include -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)) -+#define DEFINE_DEBUGFS_ATTRIBUTE DEFINE_SIMPLE_ATTRIBUTE -+#endif +#endif + -+/** Name of the CSFFW timeline tracebuffer. */ ++/* Name of the CSFFW timeline tracebuffer. */ +#define KBASE_CSFFW_TRACEBUFFER_NAME "timeline" -+/** Name of the timeline header metatadata */ ++/* Name of the timeline header metatadata */ +#define KBASE_CSFFW_TIMELINE_HEADER_NAME "timeline_header" + +/** -+ * CSFFW timeline message. ++ * struct kbase_csffw_tl_message - CSFFW timeline message. + * + * @msg_id: Message ID. + * @timestamp: Timestamp of the event. @@ -174973,7 +198718,7 @@ index 000000000000..5079a8e5af8c + u64 cycle_counter; +} __packed __aligned(4); + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) +static int kbase_csf_tl_debugfs_poll_interval_read(void *data, u64 *val) +{ + struct kbase_device *kbdev = (struct kbase_device *)data; @@ -174989,9 +198734,8 @@ index 000000000000..5079a8e5af8c + struct kbase_device *kbdev = (struct kbase_device *)data; + struct kbase_csf_tl_reader *self = &kbdev->timeline->csf_tl_reader; + -+ if (val > KBASE_CSF_TL_READ_INTERVAL_MAX || val < KBASE_CSF_TL_READ_INTERVAL_MIN) { ++ if (val > KBASE_CSF_TL_READ_INTERVAL_MAX || val < KBASE_CSF_TL_READ_INTERVAL_MIN) + return -EINVAL; -+ } + + self->timer_interval = (u32)val; + @@ -175004,88 +198748,13 @@ index 000000000000..5079a8e5af8c + +void kbase_csf_tl_reader_debugfs_init(struct kbase_device *kbdev) +{ -+ debugfs_create_file("csf_tl_poll_interval_in_ms", S_IRUGO | S_IWUSR, ++ debugfs_create_file("csf_tl_poll_interval_in_ms", 0644, + kbdev->debugfs_instr_directory, kbdev, + &kbase_csf_tl_poll_interval_fops); +} +#endif + +/** -+ * get_cpu_gpu_time() - Get current CPU and GPU timestamps. -+ * -+ * @kbdev: Kbase device. -+ * @cpu_ts: Output CPU timestamp. -+ * @gpu_ts: Output GPU timestamp. -+ * @gpu_cycle: Output GPU cycle counts. -+ */ -+static void get_cpu_gpu_time( -+ struct kbase_device *kbdev, -+ u64 *cpu_ts, -+ u64 *gpu_ts, -+ u64 *gpu_cycle) -+{ -+ struct timespec64 ts; -+ -+ kbase_pm_context_active(kbdev); -+ kbase_backend_get_gpu_time(kbdev, gpu_cycle, gpu_ts, &ts); -+ kbase_pm_context_idle(kbdev); -+ -+ if (cpu_ts) -+ *cpu_ts = ts.tv_sec * NSEC_PER_SEC + ts.tv_nsec; -+} -+ -+/** -+ * kbase_ts_converter_init() - Initialize system timestamp converter. -+ * -+ * @self: System Timestamp Converter instance. -+ * -+ * Return: Zero on success, -1 otherwise. -+ */ -+static int kbase_ts_converter_init( -+ struct kbase_ts_converter *self, -+ struct kbase_device *kbdev) -+{ -+ u64 cpu_ts = 0; -+ u64 gpu_ts = 0; -+ u64 freq; -+ u64 common_factor; -+ -+ get_cpu_gpu_time(kbdev, &cpu_ts, &gpu_ts, NULL); -+ freq = arch_timer_get_cntfrq(); -+ -+ if (!freq) { -+ dev_warn(kbdev->dev, "arch_timer_get_rate() is zero!"); -+ return -1; -+ } -+ -+ common_factor = gcd(NSEC_PER_SEC, freq); -+ -+ self->multiplier = div64_u64(NSEC_PER_SEC, common_factor); -+ self->divisor = div64_u64(freq, common_factor); -+ self->offset = -+ cpu_ts - div64_u64(gpu_ts * self->multiplier, self->divisor); -+ -+ return 0; -+} -+ -+/** -+ * kbase_ts_converter_convert() - Convert GPU timestamp to CPU timestamp. -+ * -+ * @self: System Timestamp Converter instance. -+ * @gpu_ts: System timestamp value to converter. -+ * -+ * Return: The CPU timestamp. -+ */ -+void kbase_ts_converter_convert( -+ const struct kbase_ts_converter *self, -+ u64 *gpu_ts) -+{ -+ u64 old_gpu_ts = *gpu_ts; -+ *gpu_ts = div64_u64(old_gpu_ts * self->multiplier, -+ self->divisor) + self->offset; -+} -+ -+/** + * tl_reader_overflow_notify() - Emit stream overflow tracepoint. + * + * @self: CSFFW TL Reader instance. @@ -175161,8 +198830,9 @@ index 000000000000..5079a8e5af8c + self->tl_header.btc = 0; +} + -+void kbase_csf_tl_reader_flush_buffer(struct kbase_csf_tl_reader *self) ++int kbase_csf_tl_reader_flush_buffer(struct kbase_csf_tl_reader *self) +{ ++ int ret = 0; + struct kbase_device *kbdev = self->kbdev; + struct kbase_tlstream *stream = self->stream; + @@ -175181,7 +198851,7 @@ index 000000000000..5079a8e5af8c + /* If not running, early exit. */ + if (!self->is_active) { + spin_unlock_irqrestore(&self->read_lock, flags); -+ return; ++ return -EBUSY; + } + + /* Copying the whole buffer in a single shot. We assume @@ -175205,6 +198875,7 @@ index 000000000000..5079a8e5af8c + dev_warn( + kbdev->dev, + "Unable to parse CSFFW tracebuffer event header."); ++ ret = -EBUSY; + break; + } + @@ -175225,6 +198896,7 @@ index 000000000000..5079a8e5af8c + dev_warn(kbdev->dev, + "event_id: %u, can't read with event_size: %u.", + event_id, event_size); ++ ret = -EBUSY; + break; + } + @@ -175232,9 +198904,8 @@ index 000000000000..5079a8e5af8c + { + struct kbase_csffw_tl_message *msg = + (struct kbase_csffw_tl_message *) csffw_data_it; -+ kbase_ts_converter_convert( -+ &self->ts_converter, -+ &msg->timestamp); ++ msg->timestamp = ++ kbase_backend_time_convert_gpu_to_cpu(kbdev, msg->timestamp); + } + + /* Copy the message out to the tl_stream. */ @@ -175246,6 +198917,7 @@ index 000000000000..5079a8e5af8c + } + + spin_unlock_irqrestore(&self->read_lock, flags); ++ return ret; +} + +static void kbasep_csf_tl_reader_read_callback(struct timer_list *timer) @@ -175307,10 +198979,6 @@ index 000000000000..5079a8e5af8c + return -1; + } + -+ if (kbase_ts_converter_init(&self->ts_converter, kbdev)) { -+ return -1; -+ } -+ + self->kbdev = kbdev; + self->trace_buffer = tb; + self->tl_header.data = hdr; @@ -175328,39 +198996,18 @@ index 000000000000..5079a8e5af8c + * Update the first bit of a CSFFW tracebufer and then reset the GPU. + * This is to make these changes visible to the MCU. + * -+ * Return: 0 on success, -EAGAIN if a GPU reset was in progress. ++ * Return: 0 on success, or negative error code for failure. + */ +static int tl_reader_update_enable_bit( + struct kbase_csf_tl_reader *self, + bool value) +{ -+ struct kbase_device *kbdev = self->kbdev; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ -+ /* If there is already a GPU reset pending then inform -+ * the User to retry the update. -+ */ -+ if (kbase_reset_gpu_silent(kbdev)) { -+ spin_unlock_irqrestore( -+ &kbdev->hwaccess_lock, flags); -+ dev_warn( -+ kbdev->dev, -+ "GPU reset already in progress when enabling firmware timeline."); -+ return -EAGAIN; -+ } ++ int err = 0; + -+ /* GPU reset request has been placed, now update the -+ * firmware image. GPU reset will take place only after -+ * hwaccess_lock is released. -+ */ -+ kbase_csf_firmware_trace_buffer_update_trace_enable_bit( ++ err = kbase_csf_firmware_trace_buffer_update_trace_enable_bit( + self->trace_buffer, 0, value); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ -+ return 0; ++ return err; +} + +void kbase_csf_tl_reader_init(struct kbase_csf_tl_reader *self, @@ -175399,7 +199046,7 @@ index 000000000000..5079a8e5af8c + return 0; + + if (tl_reader_init_late(self, kbdev)) { -+#if defined(CONFIG_MALI_BIFROST_NO_MALI) ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) + dev_warn( + kbdev->dev, + "CSFFW timeline is not available for MALI_BIFROST_NO_MALI builds!"); @@ -175450,31 +199097,23 @@ index 000000000000..5079a8e5af8c + +void kbase_csf_tl_reader_reset(struct kbase_csf_tl_reader *self) +{ -+ u64 gpu_cycle = 0; -+ struct kbase_device *kbdev = self->kbdev; -+ -+ if (!kbdev) -+ return; -+ + kbase_csf_tl_reader_flush_buffer(self); -+ -+ get_cpu_gpu_time(kbdev, NULL, NULL, &gpu_cycle); -+ KBASE_TLSTREAM_TL_KBASE_CSFFW_RESET(kbdev, gpu_cycle); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h new file mode 100755 -index 000000000000..f5ce9d629f55 +index 000000000..12b285fd2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h -@@ -0,0 +1,181 @@ +@@ -0,0 +1,146 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -175485,8 +199124,6 @@ index 000000000000..f5ce9d629f55 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CSFFW_TL_READER_H_ @@ -175496,13 +199133,13 @@ index 000000000000..f5ce9d629f55 +#include +#include + -+/** The number of pages used for CSFFW trace buffer. Can be tweaked. */ -+#define KBASE_CSF_TL_BUFFER_NR_PAGES 4 -+/** CSFFW Timeline read polling minimum period in milliseconds. */ ++/* The number of pages used for CSFFW trace buffer. Can be tweaked. */ ++#define KBASE_CSF_TL_BUFFER_NR_PAGES 128 ++/* CSFFW Timeline read polling minimum period in milliseconds. */ +#define KBASE_CSF_TL_READ_INTERVAL_MIN 20 -+/** CSFFW Timeline read polling default period in milliseconds. */ ++/* CSFFW Timeline read polling default period in milliseconds. */ +#define KBASE_CSF_TL_READ_INTERVAL_DEFAULT 200 -+/** CSFFW Timeline read polling maximum period in milliseconds. */ ++/* CSFFW Timeline read polling maximum period in milliseconds. */ +#define KBASE_CSF_TL_READ_INTERVAL_MAX (60*1000) + +struct firmware_trace_buffer; @@ -175510,37 +199147,6 @@ index 000000000000..f5ce9d629f55 +struct kbase_device; + +/** -+ * System timestamp to CPU timestamp converter state. -+ * -+ * @multiplier: Numerator of the converter's fraction. -+ * @divisor: Denominator of the converter's fraction. -+ * @offset: Converter's offset term. -+ * -+ * According to Generic timer spec, system timer: -+ * - Increments at a fixed frequency -+ * - Starts operating from zero -+ * -+ * Hence CPU time is a linear function of System Time. -+ * -+ * CPU_ts = alpha * SYS_ts + beta -+ * -+ * Where -+ * - alpha = 10^9/SYS_ts_freq -+ * - beta is calculated by two timer samples taken at the same time: -+ * beta = CPU_ts_s - SYS_ts_s * alpha -+ * -+ * Since alpha is a rational number, we minimizing possible -+ * rounding error by simplifying the ratio. Thus alpha is stored -+ * as a simple `multiplier / divisor` ratio. -+ * -+ */ -+struct kbase_ts_converter { -+ u64 multiplier; -+ u64 divisor; -+ s64 offset; -+}; -+ -+/** + * struct kbase_csf_tl_reader - CSFFW timeline reader state. + * + * @read_timer: Timer used for periodical tracebufer reading. @@ -175549,6 +199155,7 @@ index 000000000000..f5ce9d629f55 + * is copied. + * @kbdev: KBase device. + * @trace_buffer: CSF Firmware timeline tracebuffer. ++ * @tl_header: CSFFW Timeline header + * @tl_header.data: CSFFW Timeline header content. + * @tl_header.size: CSFFW Timeline header size. + * @tl_header.btc: CSFFW Timeline header remaining bytes to copy to @@ -175561,6 +199168,7 @@ index 000000000000..f5ce9d629f55 + * is only valid when got_first_event is true. + * @read_buffer: Temporary buffer used for CSFFW timeline data + * reading from the tracebufer. ++ * @read_lock: CSFFW timeline reader lock. + */ +struct kbase_csf_tl_reader { + struct timer_list read_timer; @@ -175574,7 +199182,6 @@ index 000000000000..f5ce9d629f55 + size_t size; + size_t btc; + } tl_header; -+ struct kbase_ts_converter ts_converter; + + bool got_first_event; + bool is_active; @@ -175601,17 +199208,16 @@ index 000000000000..f5ce9d629f55 +void kbase_csf_tl_reader_term(struct kbase_csf_tl_reader *self); + +/** -+ * kbase_csf_tl_reader_flush_buffer() - -+ * Flush trace from buffer into CSFFW timeline stream. ++ * kbase_csf_tl_reader_flush_buffer() - Flush trace from buffer into CSFFW timeline stream. + * + * @self: CSFFW TL Reader instance. ++ * ++ * Return: Zero on success, negative error code (EBUSY) otherwise + */ -+ -+void kbase_csf_tl_reader_flush_buffer(struct kbase_csf_tl_reader *self); ++int kbase_csf_tl_reader_flush_buffer(struct kbase_csf_tl_reader *self); + +/** -+ * kbase_csf_tl_reader_start() - -+ * Start asynchronous copying of CSFFW timeline stream. ++ * kbase_csf_tl_reader_start() - Start asynchronous copying of CSFFW timeline stream. + * + * @self: CSFFW TL Reader instance. + * @kbdev: Kbase device. @@ -175622,17 +199228,15 @@ index 000000000000..f5ce9d629f55 + struct kbase_device *kbdev); + +/** -+ * kbase_csf_tl_reader_stop() - -+ * Stop asynchronous copying of CSFFW timeline stream. ++ * kbase_csf_tl_reader_stop() - Stop asynchronous copying of CSFFW timeline stream. + * + * @self: CSFFW TL Reader instance. + */ +void kbase_csf_tl_reader_stop(struct kbase_csf_tl_reader *self); + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) +/** -+ * kbase_csf_tl_reader_debugfs_init() - -+ * Initialize debugfs for CSFFW Timelime Stream Reader. ++ * kbase_csf_tl_reader_debugfs_init() - Initialize debugfs for CSFFW Timelime Stream Reader. + * + * @kbdev: Kbase device. + */ @@ -175640,8 +199244,7 @@ index 000000000000..f5ce9d629f55 +#endif + +/** -+ * kbase_csf_tl_reader_reset() - -+ * Reset CSFFW timeline reader, it should be called before reset CSFFW. ++ * kbase_csf_tl_reader_reset() - Reset CSFFW timeline reader, it should be called before reset CSFFW. + * + * @self: CSFFW TL Reader instance. + */ @@ -175650,18 +199253,19 @@ index 000000000000..f5ce9d629f55 +#endif /* _KBASE_CSFFW_TL_READER_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c new file mode 100755 -index 000000000000..4d68766b8b9a +index 000000000..46872f937 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c -@@ -0,0 +1,623 @@ +@@ -0,0 +1,555 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -175672,8 +199276,6 @@ index 000000000000..4d68766b8b9a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include "mali_kbase.h" @@ -175689,43 +199291,47 @@ index 000000000000..4d68766b8b9a +/** + * struct firmware_trace_buffer - Trace Buffer within the MCU firmware + * -+ * The firmware relays information to the host by writing on memory buffers -+ * which are allocated and partially configured by the host. These buffers -+ * are called Trace Buffers: each of them has a specific purpose and is -+ * identified by a name and a set of memory addresses where the host can -+ * set pointers to host-allocated structures. -+ * + * @kbdev: Pointer to the Kbase device. + * @node: List head linking all trace buffers to + * kbase_device:csf.firmware_trace_buffers + * @data_mapping: MCU shared memory mapping used for the data buffer. ++ * @updatable: Indicates whether config items can be updated with ++ * FIRMWARE_CONFIG_UPDATE + * @type: The type of the trace buffer. + * @trace_enable_entry_count: Number of Trace Enable bits. -+ * @gpu_va: Structure containing all the Firmware addresses -+ * that are accessed by the MCU. -+ * @size_address: The address where the MCU shall read the size of -+ * the data buffer. -+ * @insert_address: The address that shall be dereferenced by the MCU -+ * to write the Insert offset. -+ * @extract_address: The address that shall be dereferenced by the MCU -+ * to read the Extract offset. -+ * @data_address: The address that shall be dereferenced by the MCU -+ * to write the Trace Buffer. -+ * @trace_enable: The address where the MCU shall read the array of -+ * Trace Enable bits describing which trace points -+ * and features shall be enabled. -+ * @cpu_va: Structure containing CPU addresses of variables which -+ * are permanently mapped on the CPU address space. -+ * @insert_cpu_va: CPU virtual address of the Insert variable. -+ * @extract_cpu_va: CPU virtual address of the Extract variable. ++ * @gpu_va: Structure containing all the Firmware addresses ++ * that are accessed by the MCU. ++ * @gpu_va.size_address: The address where the MCU shall read the size of ++ * the data buffer. ++ * @gpu_va.insert_address: The address that shall be dereferenced by the MCU ++ * to write the Insert offset. ++ * @gpu_va.extract_address: The address that shall be dereferenced by the MCU ++ * to read the Extract offset. ++ * @gpu_va.data_address: The address that shall be dereferenced by the MCU ++ * to write the Trace Buffer. ++ * @gpu_va.trace_enable: The address where the MCU shall read the array of ++ * Trace Enable bits describing which trace points ++ * and features shall be enabled. ++ * @cpu_va: Structure containing CPU addresses of variables ++ * which are permanently mapped on the CPU address ++ * space. ++ * @cpu_va.insert_cpu_va: CPU virtual address of the Insert variable. ++ * @cpu_va.extract_cpu_va: CPU virtual address of the Extract variable. + * @num_pages: Size of the data buffer, in pages. + * @trace_enable_init_mask: Initial value for the trace enable bit mask. + * @name: NULL terminated string which contains the name of the trace buffer. ++ * ++ * The firmware relays information to the host by writing on memory buffers ++ * which are allocated and partially configured by the host. These buffers ++ * are called Trace Buffers: each of them has a specific purpose and is ++ * identified by a name and a set of memory addresses where the host can ++ * set pointers to host-allocated structures. + */ +struct firmware_trace_buffer { + struct kbase_device *kbdev; + struct list_head node; + struct kbase_csf_mapping data_mapping; ++ bool updatable; + u32 type; + u32 trace_enable_entry_count; + struct gpu_va { @@ -175747,14 +199353,14 @@ index 000000000000..4d68766b8b9a +/** + * struct firmware_trace_buffer_data - Configuration data for trace buffers + * -+ * Describe how to set up a trace buffer interface. -+ * Trace buffers are identified by name and they require a data buffer and -+ * an initial mask of values for the trace enable bits. -+ * + * @name: Name identifier of the trace buffer + * @trace_enable_init_mask: Initial value to assign to the trace enable bits + * @size: Size of the data buffer to allocate for the trace buffer, in pages. + * The size of a data buffer must always be a power of 2. ++ * ++ * Describe how to set up a trace buffer interface. ++ * Trace buffers are identified by name and they require a data buffer and ++ * an initial mask of values for the trace enable bits. + */ +struct firmware_trace_buffer_data { + char name[64]; @@ -175762,20 +199368,19 @@ index 000000000000..4d68766b8b9a + size_t size; +}; + -+/** ++/* + * Table of configuration data for trace buffers. + * + * This table contains the configuration data for the trace buffers that are + * expected to be parsed from the firmware. + */ -+static const struct firmware_trace_buffer_data -+trace_buffer_data[] = { -+#ifndef MALI_KBASE_BUILD -+ { "fwutf", {0}, 1 }, ++static const struct firmware_trace_buffer_data trace_buffer_data[] = { ++#if MALI_UNIT_TEST ++ { "fwutf", { 0 }, 1 }, +#endif -+ { FW_TRACE_BUF_NAME, {0}, 4 }, -+ { "benchmark", {0}, 2 }, -+ { "timeline", {0}, KBASE_CSF_TL_BUFFER_NR_PAGES }, ++ { FIRMWARE_LOG_BUF_NAME, { 0 }, 4 }, ++ { "benchmark", { 0 }, 2 }, ++ { "timeline", { 0 }, KBASE_CSF_TL_BUFFER_NR_PAGES }, +}; + +int kbase_csf_firmware_trace_buffers_init(struct kbase_device *kbdev) @@ -175827,13 +199432,13 @@ index 000000000000..4d68766b8b9a + extract_gpu_va = + (kbdev->csf.firmware_trace_buffers.mcu_rw.va_reg->start_pfn << PAGE_SHIFT) + + mcu_rw_offset; -+ extract_cpu_va = (u32*)( ++ extract_cpu_va = (u32 *)( + kbdev->csf.firmware_trace_buffers.mcu_rw.cpu_addr + + mcu_rw_offset); + insert_gpu_va = + (kbdev->csf.firmware_trace_buffers.mcu_write.va_reg->start_pfn << PAGE_SHIFT) + + mcu_write_offset; -+ insert_cpu_va = (u32*)( ++ insert_cpu_va = (u32 *)( + kbdev->csf.firmware_trace_buffers.mcu_write.cpu_addr + + mcu_write_offset); + data_buffer_gpu_va = @@ -175900,7 +199505,9 @@ index 000000000000..4d68766b8b9a +} + +int kbase_csf_firmware_parse_trace_buffer_entry(struct kbase_device *kbdev, -+ const u32 *entry, unsigned int size) ++ const u32 *entry, ++ unsigned int size, ++ bool updatable) +{ + const char *name = (char *)&entry[7]; + const unsigned int name_len = size - TRACE_BUFFER_ENTRY_NAME_OFFSET; @@ -175924,6 +199531,7 @@ index 000000000000..4d68766b8b9a + unsigned int j; + + trace_buffer->kbdev = kbdev; ++ trace_buffer->updatable = updatable; + trace_buffer->type = entry[0]; + trace_buffer->gpu_va.size_address = entry[1]; + trace_buffer->gpu_va.insert_address = entry[2]; @@ -175968,13 +199576,13 @@ index 000000000000..4d68766b8b9a + extract_gpu_va = + (kbdev->csf.firmware_trace_buffers.mcu_rw.va_reg->start_pfn << PAGE_SHIFT) + + mcu_rw_offset; -+ extract_cpu_va = (u32*)( ++ extract_cpu_va = (u32 *)( + kbdev->csf.firmware_trace_buffers.mcu_rw.cpu_addr + + mcu_rw_offset); + insert_gpu_va = + (kbdev->csf.firmware_trace_buffers.mcu_write.va_reg->start_pfn << PAGE_SHIFT) + + mcu_write_offset; -+ insert_cpu_va = (u32*)( ++ insert_cpu_va = (u32 *)( + kbdev->csf.firmware_trace_buffers.mcu_write.cpu_addr + + mcu_write_offset); + data_buffer_gpu_va = @@ -176042,9 +199650,13 @@ index 000000000000..4d68766b8b9a +} +EXPORT_SYMBOL(kbase_csf_firmware_trace_buffer_get_trace_enable_bits_count); + -+void kbase_csf_firmware_trace_buffer_update_trace_enable_bit( ++static void kbasep_csf_firmware_trace_buffer_update_trace_enable_bit( + struct firmware_trace_buffer *tb, unsigned int bit, bool value) +{ ++ struct kbase_device *kbdev = tb->kbdev; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ + if (bit < tb->trace_enable_entry_count) { + unsigned int trace_enable_reg_offset = bit >> 5; + u32 trace_enable_bit_mask = 1u << (bit & 0x1F); @@ -176064,11 +199676,48 @@ index 000000000000..4d68766b8b9a + * trace buffers, since firmware could continue to use the + * value of bitmask it cached after the boot. + */ -+ kbase_csf_update_firmware_memory(tb->kbdev, -+ tb->gpu_va.trace_enable + trace_enable_reg_offset*4, ++ kbase_csf_update_firmware_memory( ++ kbdev, ++ tb->gpu_va.trace_enable + trace_enable_reg_offset * 4, + tb->trace_enable_init_mask[trace_enable_reg_offset]); + } +} ++ ++int kbase_csf_firmware_trace_buffer_update_trace_enable_bit( ++ struct firmware_trace_buffer *tb, unsigned int bit, bool value) ++{ ++ struct kbase_device *kbdev = tb->kbdev; ++ int err = 0; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ++ /* If trace buffer update cannot be performed with ++ * FIRMWARE_CONFIG_UPDATE then we need to do a ++ * silent reset before we update the memory. ++ */ ++ if (!tb->updatable) { ++ /* If there is already a GPU reset pending then inform ++ * the User to retry the update. ++ */ ++ if (kbase_reset_gpu_silent(kbdev)) { ++ dev_warn( ++ kbdev->dev, ++ "GPU reset already in progress when enabling firmware timeline."); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ return -EAGAIN; ++ } ++ } ++ ++ kbasep_csf_firmware_trace_buffer_update_trace_enable_bit(tb, bit, ++ value); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ if (tb->updatable) ++ err = kbase_csf_trigger_firmware_config_update(kbdev); ++ ++ return err; ++} +EXPORT_SYMBOL(kbase_csf_firmware_trace_buffer_update_trace_enable_bit); + +bool kbase_csf_firmware_trace_buffer_is_empty( @@ -176116,10 +199765,16 @@ index 000000000000..4d68766b8b9a +} +EXPORT_SYMBOL(kbase_csf_firmware_trace_buffer_read_data); + -+#ifdef CONFIG_DEBUG_FS ++static void update_trace_buffer_active_mask64(struct firmware_trace_buffer *tb, u64 mask) ++{ ++ unsigned int i; ++ ++ for (i = 0; i < tb->trace_enable_entry_count; i++) ++ kbasep_csf_firmware_trace_buffer_update_trace_enable_bit(tb, i, (mask >> i) & 1); ++} + +#define U32_BITS 32 -+static u64 get_trace_buffer_active_mask64(struct firmware_trace_buffer *tb) ++u64 kbase_csf_firmware_trace_buffer_get_active_mask64(struct firmware_trace_buffer *tb) +{ + u64 active_mask = tb->trace_enable_init_mask[0]; + @@ -176129,168 +199784,49 @@ index 000000000000..4d68766b8b9a + return active_mask; +} + -+static void update_trace_buffer_active_mask64(struct firmware_trace_buffer *tb, -+ u64 mask) -+{ -+ unsigned int i; -+ -+ for (i = 0; i < tb->trace_enable_entry_count; i++) -+ kbase_csf_firmware_trace_buffer_update_trace_enable_bit(tb, i, -+ (mask >> i) & 1); -+} -+ -+static int set_trace_buffer_active_mask64(struct firmware_trace_buffer *tb, -+ u64 mask) ++int kbase_csf_firmware_trace_buffer_set_active_mask64(struct firmware_trace_buffer *tb, u64 mask) +{ + struct kbase_device *kbdev = tb->kbdev; + unsigned long flags; + int err = 0; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ /* If there is already a GPU reset pending, need a retry */ -+ if (kbase_reset_gpu_silent(kbdev)) -+ err = -EAGAIN; -+ else -+ update_trace_buffer_active_mask64(tb, mask); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ -+ return err; -+} -+ -+static int kbase_csf_firmware_trace_enable_mask_read(void *data, u64 *val) -+{ -+ struct kbase_device *kbdev = (struct kbase_device *)data; -+ struct firmware_trace_buffer *tb = -+ kbase_csf_firmware_get_trace_buffer(kbdev, FW_TRACE_BUF_NAME); -+ -+ if (tb == NULL) { -+ dev_err(kbdev->dev, "Couldn't get the firmware trace buffer"); -+ return -EIO; -+ } -+ /* The enabled traces limited to u64 here, regarded practical */ -+ *val = get_trace_buffer_active_mask64(tb); -+ return 0; -+} -+ -+static int kbase_csf_firmware_trace_enable_mask_write(void *data, u64 val) -+{ -+ struct kbase_device *kbdev = (struct kbase_device *)data; -+ struct firmware_trace_buffer *tb = -+ kbase_csf_firmware_get_trace_buffer(kbdev, FW_TRACE_BUF_NAME); -+ u64 new_mask; -+ unsigned int enable_bits_count; -+ -+ if (tb == NULL) { -+ dev_err(kbdev->dev, "Couldn't get the firmware trace buffer"); -+ return -EIO; -+ } -+ -+ /* Ignore unsupported types */ -+ enable_bits_count = -+ kbase_csf_firmware_trace_buffer_get_trace_enable_bits_count(tb); -+ if (enable_bits_count > 64) { -+ dev_dbg(kbdev->dev, "Limit enabled bits count from %u to 64", -+ enable_bits_count); -+ enable_bits_count = 64; -+ } -+ new_mask = val & ((1 << enable_bits_count) - 1); -+ -+ if (new_mask != get_trace_buffer_active_mask64(tb)) -+ return set_trace_buffer_active_mask64(tb, new_mask); -+ else -+ return 0; -+} -+ -+static int kbasep_csf_firmware_trace_debugfs_open(struct inode *in, -+ struct file *file) -+{ -+ struct kbase_device *kbdev = in->i_private; -+ -+ file->private_data = kbdev; -+ dev_dbg(kbdev->dev, "Opened firmware trace buffer dump debugfs file"); -+ -+ return 0; -+} -+ -+static ssize_t kbasep_csf_firmware_trace_debugfs_read(struct file *file, -+ char __user *buf, size_t size, loff_t *ppos) -+{ -+ struct kbase_device *kbdev = file->private_data; -+ u8 *pbyte; -+ unsigned int n_read; -+ unsigned long not_copied; -+ /* Limit the kernel buffer to no more than two pages */ -+ size_t mem = MIN(size, 2 * PAGE_SIZE); -+ unsigned long flags; -+ -+ struct firmware_trace_buffer *tb = -+ kbase_csf_firmware_get_trace_buffer(kbdev, FW_TRACE_BUF_NAME); -+ -+ if (tb == NULL) { -+ dev_err(kbdev->dev, "Couldn't get the firmware trace buffer"); -+ return -EIO; -+ } -+ -+ pbyte = kmalloc(mem, GFP_KERNEL); -+ if (pbyte == NULL) { -+ dev_err(kbdev->dev, "Couldn't allocate memory for trace buffer dump"); -+ return -ENOMEM; ++ if (!tb->updatable) { ++ /* If there is already a GPU reset pending, need a retry */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ if (kbase_reset_gpu_silent(kbdev)) ++ err = -EAGAIN; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + } + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ n_read = kbase_csf_firmware_trace_buffer_read_data(tb, pbyte, mem); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ -+ /* Do the copy, if we have obtained some trace data */ -+ not_copied = (n_read) ? copy_to_user(buf, pbyte, n_read) : 0; -+ kfree(pbyte); ++ if (!err) { ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ update_trace_buffer_active_mask64(tb, mask); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ if (!not_copied) { -+ *ppos += n_read; -+ return n_read; ++ /* if we can update the config we need to just trigger ++ * FIRMWARE_CONFIG_UPDATE. ++ */ ++ if (tb->updatable) ++ err = kbase_csf_trigger_firmware_config_update(kbdev); + } + -+ dev_err(kbdev->dev, "Couldn't copy trace buffer data to user space buffer"); -+ return -EFAULT; -+} -+ -+ -+DEFINE_SIMPLE_ATTRIBUTE(kbase_csf_firmware_trace_enable_mask_fops, -+ kbase_csf_firmware_trace_enable_mask_read, -+ kbase_csf_firmware_trace_enable_mask_write, "%llx\n"); -+ -+static const struct file_operations kbasep_csf_firmware_trace_debugfs_fops = { -+ .owner = THIS_MODULE, -+ .open = kbasep_csf_firmware_trace_debugfs_open, -+ .read = kbasep_csf_firmware_trace_debugfs_read, -+ .llseek = no_llseek, -+}; -+ -+void kbase_csf_firmware_trace_buffer_debugfs_init(struct kbase_device *kbdev) -+{ -+ debugfs_create_file("fw_trace_enable_mask", 0644, -+ kbdev->mali_debugfs_directory, kbdev, -+ &kbase_csf_firmware_trace_enable_mask_fops); -+ -+ debugfs_create_file("fw_traces", 0444, -+ kbdev->mali_debugfs_directory, kbdev, -+ &kbasep_csf_firmware_trace_debugfs_fops); ++ return err; +} -+#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h new file mode 100755 -index 000000000000..2cac55e0664d +index 000000000..0389d093a --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h -@@ -0,0 +1,177 @@ +@@ -0,0 +1,187 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -176301,8 +199837,6 @@ index 000000000000..2cac55e0664d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_CSF_TRACE_BUFFER_H_ @@ -176311,7 +199845,7 @@ index 000000000000..2cac55e0664d +#include + +#define CSF_FIRMWARE_TRACE_ENABLE_INIT_MASK_MAX (4) -+#define FW_TRACE_BUF_NAME "fwlog" ++#define FIRMWARE_LOG_BUF_NAME "fwlog" + +/* Forward declarations */ +struct firmware_trace_buffer; @@ -176320,6 +199854,8 @@ index 000000000000..2cac55e0664d +/** + * kbase_csf_firmware_trace_buffers_init - Initialize trace buffers + * ++ * @kbdev: Device pointer ++ * + * Allocate resources for trace buffers. In particular: + * - One memory page of GPU-readable, CPU-writable memory is used for + * the Extract variables of all trace buffers. @@ -176338,13 +199874,11 @@ index 000000000000..2cac55e0664d + * populated with data from the firmware image parsing. + * + * Return: 0 if success, or an error code on failure. -+ * -+ * @kbdev: Device pointer + */ +int kbase_csf_firmware_trace_buffers_init(struct kbase_device *kbdev); + +/** -+ * kbase_csf_firmware_trace_buffer_term - Terminate trace buffers ++ * kbase_csf_firmware_trace_buffers_term - Terminate trace buffers + * + * @kbdev: Device pointer + */ @@ -176353,6 +199887,11 @@ index 000000000000..2cac55e0664d +/** + * kbase_csf_firmware_parse_trace_buffer_entry - Process a "trace buffer" section + * ++ * @kbdev: Kbase device structure ++ * @entry: Pointer to the section ++ * @size: Size (in bytes) of the section ++ * @updatable: Indicates whether config items can be updated with FIRMWARE_CONFIG_UPDATE ++ * + * Read a "trace buffer" section adding metadata for the related trace buffer + * to the kbase_device:csf.firmware_trace_buffers list. + * @@ -176360,17 +199899,16 @@ index 000000000000..2cac55e0664d + * will not be initialized. + * + * Return: 0 if successful, negative error code on failure. -+ * -+ * @kbdev: Kbase device structure -+ * @entry: Pointer to the section -+ * @size: Size (in bytes) of the section + */ +int kbase_csf_firmware_parse_trace_buffer_entry(struct kbase_device *kbdev, -+ const u32 *entry, unsigned int size); ++ const u32 *entry, ++ unsigned int size, ++ bool updatable); + +/** -+ * kbase_csf_firmware_reload_trace_buffers_data - -+ * Reload trace buffers data for firmware reboot ++ * kbase_csf_firmware_reload_trace_buffers_data - Reload trace buffers data for firmware reboot ++ * ++ * @kbdev: Device pointer + * + * Helper function used when rebooting the firmware to reload the initial setup + * for all the trace buffers which have been previously parsed and initialized. @@ -176382,53 +199920,52 @@ index 000000000000..2cac55e0664d + * + * In other words, the re-initialization done by this function will be + * equivalent but not necessarily identical to the original initialization. -+ * -+ * @kbdev: Device pointer + */ +void kbase_csf_firmware_reload_trace_buffers_data(struct kbase_device *kbdev); + +/** + * kbase_csf_firmware_get_trace_buffer - Get a trace buffer + * -+ * Return: handle to a trace buffer, given the name, or NULL if a trace buffer -+ * with that name couldn't be found. -+ * + * @kbdev: Device pointer + * @name: Name of the trace buffer to find ++ * ++ * Return: handle to a trace buffer, given the name, or NULL if a trace buffer ++ * with that name couldn't be found. + */ +struct firmware_trace_buffer *kbase_csf_firmware_get_trace_buffer( + struct kbase_device *kbdev, const char *name); + +/** -+ * kbase_csf_firmware_trace_buffer_get_trace_enable_bits_count - -+ * Get number of trace enable bits for a trace buffer -+ * -+ * Return: Number of trace enable bits in a trace buffer. ++ * kbase_csf_firmware_trace_buffer_get_trace_enable_bits_count - Get number of trace enable bits for a trace buffer + * + * @trace_buffer: Trace buffer handle ++ * ++ * Return: Number of trace enable bits in a trace buffer. + */ +unsigned int kbase_csf_firmware_trace_buffer_get_trace_enable_bits_count( + const struct firmware_trace_buffer *trace_buffer); + +/** -+ * kbase_csf_firmware_trace_buffer_update_trace_enable_bit - -+ * Update a trace enable bit -+ * -+ * Update the value of a given trace enable bit. ++ * kbase_csf_firmware_trace_buffer_update_trace_enable_bit - Update a trace enable bit + * + * @trace_buffer: Trace buffer handle + * @bit: Bit to update + * @value: New value for the given bit ++ * ++ * Update the value of a given trace enable bit. ++ * ++ * Return: 0 if successful, negative error code on failure. + */ -+void kbase_csf_firmware_trace_buffer_update_trace_enable_bit( -+ struct firmware_trace_buffer *trace_buffer, unsigned int bit, bool value); ++int kbase_csf_firmware_trace_buffer_update_trace_enable_bit( ++ struct firmware_trace_buffer *trace_buffer, unsigned int bit, ++ bool value); + +/** + * kbase_csf_firmware_trace_buffer_is_empty - Empty trace buffer predicate + * -+ * Return: True if the trace buffer is empty, or false otherwise. -+ * + * @trace_buffer: Trace buffer handle ++ * ++ * Return: True if the trace buffer is empty, or false otherwise. + */ +bool kbase_csf_firmware_trace_buffer_is_empty( + const struct firmware_trace_buffer *trace_buffer); @@ -176436,44 +199973,1552 @@ index 000000000000..2cac55e0664d +/** + * kbase_csf_firmware_trace_buffer_read_data - Read data from a trace buffer + * ++ * @trace_buffer: Trace buffer handle ++ * @data: Pointer to a client-allocated where data shall be written. ++ * @num_bytes: Maximum number of bytes to read from the trace buffer. ++ * + * Read available data from a trace buffer. The client provides a data buffer + * of a given size and the maximum number of bytes to read. + * + * Return: Number of bytes read from the trace buffer. -+ * -+ * @trace_buffer: Trace buffer handle -+ * @data: Pointer to a client-allocated where data shall be written. -+ * @num_bytes: Maximum number of bytes to read from the trace buffer. + */ +unsigned int kbase_csf_firmware_trace_buffer_read_data( + struct firmware_trace_buffer *trace_buffer, u8 *data, unsigned int num_bytes); + -+#ifdef CONFIG_DEBUG_FS +/** -+ * kbase_csf_fw_trace_buffer_debugfs_init() - Add debugfs entries for setting -+ * enable mask and dumping the binary -+ * firmware trace buffer ++ * kbase_csf_firmware_trace_buffer_get_active_mask64 - Get trace buffer active mask + * -+ * @kbdev: Pointer to the device ++ * @tb: Trace buffer handle ++ * ++ * Return: Trace buffer active mask. + */ -+void kbase_csf_firmware_trace_buffer_debugfs_init(struct kbase_device *kbdev); -+#endif /* CONFIG_DEBUG_FS */ ++u64 kbase_csf_firmware_trace_buffer_get_active_mask64(struct firmware_trace_buffer *tb); ++ ++/** ++ * kbase_csf_firmware_trace_buffer_set_active_mask64 - Set trace buffer active mask ++ * ++ * @tb: Trace buffer handle ++ * @mask: New active mask ++ * ++ * Return: 0 if successful, negative error code on failure. ++ */ ++int kbase_csf_firmware_trace_buffer_set_active_mask64(struct firmware_trace_buffer *tb, u64 mask); + +#endif /* _KBASE_CSF_TRACE_BUFFER_H_ */ +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.c +new file mode 100644 +index 000000000..185779c16 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.c +@@ -0,0 +1,271 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#include ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ ++/** ++ * kbasep_fault_occurred - Check if fault occurred. ++ * ++ * @kbdev: Device pointer ++ * ++ * Return: true if a fault occurred. ++ */ ++static bool kbasep_fault_occurred(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ bool ret; ++ ++ spin_lock_irqsave(&kbdev->csf.dof.lock, flags); ++ ret = (kbdev->csf.dof.error_code != DF_NO_ERROR); ++ spin_unlock_irqrestore(&kbdev->csf.dof.lock, flags); ++ ++ return ret; ++} ++ ++void kbase_debug_csf_fault_wait_completion(struct kbase_device *kbdev) ++{ ++ if (likely(!kbase_debug_csf_fault_dump_enabled(kbdev))) { ++ dev_dbg(kbdev->dev, "No userspace client for dumping exists"); ++ return; ++ } ++ ++ wait_event(kbdev->csf.dof.dump_wait_wq, kbase_debug_csf_fault_dump_complete(kbdev)); ++} ++KBASE_EXPORT_TEST_API(kbase_debug_csf_fault_wait_completion); ++ ++/** ++ * kbase_debug_csf_fault_wakeup - Wake up a waiting user space client. ++ * ++ * @kbdev: Kbase device ++ */ ++static void kbase_debug_csf_fault_wakeup(struct kbase_device *kbdev) ++{ ++ wake_up_interruptible(&kbdev->csf.dof.fault_wait_wq); ++} ++ ++bool kbase_debug_csf_fault_notify(struct kbase_device *kbdev, ++ struct kbase_context *kctx, enum dumpfault_error_type error) ++{ ++ unsigned long flags; ++ ++ if (likely(!kbase_debug_csf_fault_dump_enabled(kbdev))) ++ return false; ++ ++ if (WARN_ON(error == DF_NO_ERROR)) ++ return false; ++ ++ if (kctx && kbase_ctx_flag(kctx, KCTX_DYING)) { ++ dev_info(kbdev->dev, "kctx %d_%d is dying when error %d is reported", ++ kctx->tgid, kctx->id, error); ++ kctx = NULL; ++ } ++ ++ spin_lock_irqsave(&kbdev->csf.dof.lock, flags); ++ ++ /* Only one fault at a time can be processed */ ++ if (kbdev->csf.dof.error_code) { ++ dev_info(kbdev->dev, "skip this fault as there's a pending fault"); ++ goto unlock; ++ } ++ ++ kbdev->csf.dof.kctx_tgid = kctx ? kctx->tgid : 0; ++ kbdev->csf.dof.kctx_id = kctx ? kctx->id : 0; ++ kbdev->csf.dof.error_code = error; ++ kbase_debug_csf_fault_wakeup(kbdev); ++ ++unlock: ++ spin_unlock_irqrestore(&kbdev->csf.dof.lock, flags); ++ return true; ++} ++ ++static ssize_t debug_csf_fault_read(struct file *file, char __user *buffer, size_t size, ++ loff_t *f_pos) ++{ ++#define BUF_SIZE 64 ++ struct kbase_device *kbdev; ++ unsigned long flags; ++ int count; ++ char buf[BUF_SIZE]; ++ u32 tgid, ctx_id; ++ enum dumpfault_error_type error_code; ++ ++ if (unlikely(!file)) { ++ pr_warn("%s: file is NULL", __func__); ++ return -EINVAL; ++ } ++ ++ kbdev = file->private_data; ++ if (unlikely(!buffer)) { ++ dev_warn(kbdev->dev, "%s: buffer is NULL", __func__); ++ return -EINVAL; ++ } ++ ++ if (unlikely(*f_pos < 0)) { ++ dev_warn(kbdev->dev, "%s: f_pos is negative", __func__); ++ return -EINVAL; ++ } ++ ++ if (size < sizeof(buf)) { ++ dev_warn(kbdev->dev, "%s: buffer is too small", __func__); ++ return -EINVAL; ++ } ++ ++ if (wait_event_interruptible(kbdev->csf.dof.fault_wait_wq, kbasep_fault_occurred(kbdev))) ++ return -ERESTARTSYS; ++ ++ spin_lock_irqsave(&kbdev->csf.dof.lock, flags); ++ tgid = kbdev->csf.dof.kctx_tgid; ++ ctx_id = kbdev->csf.dof.kctx_id; ++ error_code = kbdev->csf.dof.error_code; ++ BUILD_BUG_ON(sizeof(buf) < (sizeof(tgid) + sizeof(ctx_id) + sizeof(error_code))); ++ count = scnprintf(buf, sizeof(buf), "%u_%u_%u\n", tgid, ctx_id, error_code); ++ spin_unlock_irqrestore(&kbdev->csf.dof.lock, flags); ++ ++ dev_info(kbdev->dev, "debug csf fault info read"); ++ return simple_read_from_buffer(buffer, size, f_pos, buf, count); ++} ++ ++static int debug_csf_fault_open(struct inode *in, struct file *file) ++{ ++ struct kbase_device *kbdev; ++ ++ if (unlikely(!in)) { ++ pr_warn("%s: inode is NULL", __func__); ++ return -EINVAL; ++ } ++ ++ kbdev = in->i_private; ++ if (unlikely(!file)) { ++ dev_warn(kbdev->dev, "%s: file is NULL", __func__); ++ return -EINVAL; ++ } ++ ++ if (atomic_cmpxchg(&kbdev->csf.dof.enabled, 0, 1) == 1) { ++ dev_warn(kbdev->dev, "Only one client is allowed for dump on fault"); ++ return -EBUSY; ++ } ++ ++ dev_info(kbdev->dev, "debug csf fault file open"); ++ ++ return simple_open(in, file); ++} ++ ++static ssize_t debug_csf_fault_write(struct file *file, const char __user *ubuf, size_t count, ++ loff_t *ppos) ++{ ++ struct kbase_device *kbdev; ++ unsigned long flags; ++ ++ if (unlikely(!file)) { ++ pr_warn("%s: file is NULL", __func__); ++ return -EINVAL; ++ } ++ ++ kbdev = file->private_data; ++ spin_lock_irqsave(&kbdev->csf.dof.lock, flags); ++ kbdev->csf.dof.error_code = DF_NO_ERROR; ++ kbdev->csf.dof.kctx_tgid = 0; ++ kbdev->csf.dof.kctx_id = 0; ++ dev_info(kbdev->dev, "debug csf fault dump complete"); ++ spin_unlock_irqrestore(&kbdev->csf.dof.lock, flags); ++ ++ /* User space finished the dump. ++ * Wake up blocked kernel threads to proceed. ++ */ ++ wake_up(&kbdev->csf.dof.dump_wait_wq); ++ ++ return count; ++} ++ ++static int debug_csf_fault_release(struct inode *in, struct file *file) ++{ ++ struct kbase_device *kbdev; ++ unsigned long flags; ++ ++ if (unlikely(!in)) { ++ pr_warn("%s: inode is NULL", __func__); ++ return -EINVAL; ++ } ++ ++ kbdev = in->i_private; ++ spin_lock_irqsave(&kbdev->csf.dof.lock, flags); ++ kbdev->csf.dof.kctx_tgid = 0; ++ kbdev->csf.dof.kctx_id = 0; ++ kbdev->csf.dof.error_code = DF_NO_ERROR; ++ spin_unlock_irqrestore(&kbdev->csf.dof.lock, flags); ++ ++ atomic_set(&kbdev->csf.dof.enabled, 0); ++ dev_info(kbdev->dev, "debug csf fault file close"); ++ ++ /* User space closed the debugfs file. ++ * Wake up blocked kernel threads to resume. ++ */ ++ wake_up(&kbdev->csf.dof.dump_wait_wq); ++ ++ return 0; ++} ++ ++static const struct file_operations kbasep_debug_csf_fault_fops = { ++ .owner = THIS_MODULE, ++ .open = debug_csf_fault_open, ++ .read = debug_csf_fault_read, ++ .write = debug_csf_fault_write, ++ .llseek = default_llseek, ++ .release = debug_csf_fault_release, ++}; ++ ++void kbase_debug_csf_fault_debugfs_init(struct kbase_device *kbdev) ++{ ++ const char *fname = "csf_fault"; ++ ++ if (unlikely(!kbdev)) { ++ pr_warn("%s: kbdev is NULL", __func__); ++ return; ++ } ++ ++ debugfs_create_file(fname, 0600, kbdev->mali_debugfs_directory, kbdev, ++ &kbasep_debug_csf_fault_fops); ++} ++ ++int kbase_debug_csf_fault_init(struct kbase_device *kbdev) ++{ ++ if (unlikely(!kbdev)) { ++ pr_warn("%s: kbdev is NULL", __func__); ++ return -EINVAL; ++ } ++ ++ init_waitqueue_head(&(kbdev->csf.dof.fault_wait_wq)); ++ init_waitqueue_head(&(kbdev->csf.dof.dump_wait_wq)); ++ spin_lock_init(&kbdev->csf.dof.lock); ++ kbdev->csf.dof.kctx_tgid = 0; ++ kbdev->csf.dof.kctx_id = 0; ++ kbdev->csf.dof.error_code = DF_NO_ERROR; ++ atomic_set(&kbdev->csf.dof.enabled, 0); ++ ++ return 0; ++} ++ ++void kbase_debug_csf_fault_term(struct kbase_device *kbdev) ++{ ++} ++#endif /* CONFIG_DEBUG_FS */ +diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.h +new file mode 100644 +index 000000000..6e9b1a9d5 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.h +@@ -0,0 +1,137 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#ifndef _KBASE_DEBUG_CSF_FAULT_H ++#define _KBASE_DEBUG_CSF_FAULT_H ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++/** ++ * kbase_debug_csf_fault_debugfs_init - Initialize CSF fault debugfs ++ * @kbdev: Device pointer ++ */ ++void kbase_debug_csf_fault_debugfs_init(struct kbase_device *kbdev); ++ ++/** ++ * kbase_debug_csf_fault_init - Create the fault event wait queue per device ++ * and initialize the required resources. ++ * @kbdev: Device pointer ++ * ++ * Return: Zero on success or a negative error code. ++ */ ++int kbase_debug_csf_fault_init(struct kbase_device *kbdev); ++ ++/** ++ * kbase_debug_csf_fault_term - Clean up resources created by ++ * @kbase_debug_csf_fault_init. ++ * @kbdev: Device pointer ++ */ ++void kbase_debug_csf_fault_term(struct kbase_device *kbdev); ++ ++/** ++ * kbase_debug_csf_fault_wait_completion - Wait for the client to complete. ++ * ++ * @kbdev: Device Pointer ++ * ++ * Wait for the user space client to finish reading the fault information. ++ * This function must be called in thread context. ++ */ ++void kbase_debug_csf_fault_wait_completion(struct kbase_device *kbdev); ++ ++/** ++ * kbase_debug_csf_fault_notify - Notify client of a fault. ++ * ++ * @kbdev: Device pointer ++ * @kctx: Faulty context (can be NULL) ++ * @error: Error code. ++ * ++ * Store fault information and wake up the user space client. ++ * ++ * Return: true if a dump on fault was initiated or was is in progress and ++ * so caller can opt to wait for the dumping to complete. ++ */ ++bool kbase_debug_csf_fault_notify(struct kbase_device *kbdev, ++ struct kbase_context *kctx, enum dumpfault_error_type error); ++ ++/** ++ * kbase_debug_csf_fault_dump_enabled - Check if dump on fault is enabled. ++ * ++ * @kbdev: Device pointer ++ * ++ * Return: true if debugfs file is opened so dump on fault is enabled. ++ */ ++static inline bool kbase_debug_csf_fault_dump_enabled(struct kbase_device *kbdev) ++{ ++ return atomic_read(&kbdev->csf.dof.enabled); ++} ++ ++/** ++ * kbase_debug_csf_fault_dump_complete - Check if dump on fault is completed. ++ * ++ * @kbdev: Device pointer ++ * ++ * Return: true if dump on fault completes or file is closed. ++ */ ++static inline bool kbase_debug_csf_fault_dump_complete(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ bool ret; ++ ++ if (likely(!kbase_debug_csf_fault_dump_enabled(kbdev))) ++ return true; ++ ++ spin_lock_irqsave(&kbdev->csf.dof.lock, flags); ++ ret = (kbdev->csf.dof.error_code == DF_NO_ERROR); ++ spin_unlock_irqrestore(&kbdev->csf.dof.lock, flags); ++ ++ return ret; ++} ++#else /* CONFIG_DEBUG_FS */ ++static inline int kbase_debug_csf_fault_init(struct kbase_device *kbdev) ++{ ++ return 0; ++} ++ ++static inline void kbase_debug_csf_fault_term(struct kbase_device *kbdev) ++{ ++} ++ ++static inline void kbase_debug_csf_fault_wait_completion(struct kbase_device *kbdev) ++{ ++} ++ ++static inline bool kbase_debug_csf_fault_notify(struct kbase_device *kbdev, ++ struct kbase_context *kctx, enum dumpfault_error_type error) ++{ ++ return false; ++} ++ ++static inline bool kbase_debug_csf_fault_dump_enabled(struct kbase_device *kbdev) ++{ ++ return false; ++} ++ ++static inline bool kbase_debug_csf_fault_dump_complete(struct kbase_device *kbdev) ++{ ++ return true; ++} ++#endif /* CONFIG_DEBUG_FS */ ++ ++#endif /*_KBASE_DEBUG_CSF_FAULT_H*/ +diff --git a/drivers/gpu/arm/bifrost/debug/Kbuild b/drivers/gpu/arm/bifrost/debug/Kbuild +new file mode 100644 +index 000000000..ebf3ddb76 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/debug/Kbuild +@@ -0,0 +1,28 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++# ++# (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU license. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, you can access it online at ++# http://www.gnu.org/licenses/gpl-2.0.html. ++# ++# ++ ++bifrost_kbase-y += debug/mali_kbase_debug_ktrace.o ++ ++ifeq ($(CONFIG_MALI_CSF_SUPPORT),y) ++ bifrost_kbase-y += debug/backend/mali_kbase_debug_ktrace_csf.o ++ bifrost_kbase-$(CONFIG_MALI_CORESIGHT) += debug/backend/mali_kbase_debug_coresight_csf.o ++else ++ bifrost_kbase-y += debug/backend/mali_kbase_debug_ktrace_jm.o ++endif +diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_csf.c b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_csf.c +new file mode 100644 +index 000000000..ff5f947e2 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_csf.c +@@ -0,0 +1,851 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static const char *coresight_state_to_string(enum kbase_debug_coresight_csf_state state) ++{ ++ switch (state) { ++ case KBASE_DEBUG_CORESIGHT_CSF_DISABLED: ++ return "DISABLED"; ++ case KBASE_DEBUG_CORESIGHT_CSF_ENABLED: ++ return "ENABLED"; ++ default: ++ break; ++ } ++ ++ return "UNKNOWN"; ++} ++ ++static bool validate_reg_addr(struct kbase_debug_coresight_csf_client *client, ++ struct kbase_device *kbdev, u32 reg_addr, u8 op_type) ++{ ++ int i; ++ ++ if (reg_addr & 0x3) { ++ dev_err(kbdev->dev, "Invalid operation %d: reg_addr (0x%x) not 32bit aligned", ++ op_type, reg_addr); ++ return false; ++ } ++ ++ for (i = 0; i < client->nr_ranges; i++) { ++ struct kbase_debug_coresight_csf_address_range *range = &client->addr_ranges[i]; ++ ++ if ((range->start <= reg_addr) && (reg_addr <= range->end)) ++ return true; ++ } ++ ++ dev_err(kbdev->dev, "Invalid operation %d: reg_addr (0x%x) not in client range", op_type, ++ reg_addr); ++ ++ return false; ++} ++ ++static bool validate_op(struct kbase_debug_coresight_csf_client *client, ++ struct kbase_debug_coresight_csf_op *op) ++{ ++ struct kbase_device *kbdev; ++ u32 reg; ++ ++ if (!op) ++ return false; ++ ++ if (!client) ++ return false; ++ ++ kbdev = (struct kbase_device *)client->drv_data; ++ ++ switch (op->type) { ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_NOP: ++ return true; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_WRITE_IMM: ++ if (validate_reg_addr(client, kbdev, op->op.write_imm.reg_addr, op->type)) ++ return true; ++ ++ break; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_WRITE_IMM_RANGE: ++ for (reg = op->op.write_imm_range.reg_start; reg <= op->op.write_imm_range.reg_end; ++ reg += sizeof(u32)) { ++ if (!validate_reg_addr(client, kbdev, reg, op->type)) ++ return false; ++ } ++ ++ return true; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_WRITE: ++ if (!op->op.write.ptr) { ++ dev_err(kbdev->dev, "Invalid operation %d: ptr not set", op->type); ++ break; ++ } ++ ++ if (validate_reg_addr(client, kbdev, op->op.write.reg_addr, op->type)) ++ return true; ++ ++ break; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_READ: ++ if (!op->op.read.ptr) { ++ dev_err(kbdev->dev, "Invalid operation %d: ptr not set", op->type); ++ break; ++ } ++ ++ if (validate_reg_addr(client, kbdev, op->op.read.reg_addr, op->type)) ++ return true; ++ ++ break; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_POLL: ++ if (validate_reg_addr(client, kbdev, op->op.poll.reg_addr, op->type)) ++ return true; ++ ++ break; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_BIT_AND: ++ fallthrough; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_BIT_OR: ++ fallthrough; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_BIT_XOR: ++ fallthrough; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_BIT_NOT: ++ if (op->op.bitw.ptr != NULL) ++ return true; ++ ++ dev_err(kbdev->dev, "Invalid bitwise operation pointer"); ++ ++ break; ++ default: ++ dev_err(kbdev->dev, "Invalid operation %d", op->type); ++ break; ++ } ++ ++ return false; ++} ++ ++static bool validate_seq(struct kbase_debug_coresight_csf_client *client, ++ struct kbase_debug_coresight_csf_sequence *seq) ++{ ++ struct kbase_debug_coresight_csf_op *ops = seq->ops; ++ int nr_ops = seq->nr_ops; ++ int i; ++ ++ for (i = 0; i < nr_ops; i++) { ++ if (!validate_op(client, &ops[i])) ++ return false; ++ } ++ ++ return true; ++} ++ ++static int execute_op(struct kbase_device *kbdev, struct kbase_debug_coresight_csf_op *op) ++{ ++ int result = -EINVAL; ++ u32 reg; ++ ++ dev_dbg(kbdev->dev, "Execute operation %d", op->type); ++ ++ switch (op->type) { ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_NOP: ++ result = 0; ++ break; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_WRITE_IMM: ++ result = kbase_csf_firmware_mcu_register_write(kbdev, op->op.write.reg_addr, ++ op->op.write_imm.val); ++ break; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_WRITE_IMM_RANGE: ++ for (reg = op->op.write_imm_range.reg_start; reg <= op->op.write_imm_range.reg_end; ++ reg += sizeof(u32)) { ++ result = kbase_csf_firmware_mcu_register_write(kbdev, reg, ++ op->op.write_imm_range.val); ++ if (!result) ++ break; ++ } ++ break; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_WRITE: ++ result = kbase_csf_firmware_mcu_register_write(kbdev, op->op.write.reg_addr, ++ *op->op.write.ptr); ++ break; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_READ: ++ result = kbase_csf_firmware_mcu_register_read(kbdev, op->op.read.reg_addr, ++ op->op.read.ptr); ++ break; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_POLL: ++ result = kbase_csf_firmware_mcu_register_poll(kbdev, op->op.poll.reg_addr, ++ op->op.poll.mask, op->op.poll.val); ++ break; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_BIT_AND: ++ *op->op.bitw.ptr &= op->op.bitw.val; ++ result = 0; ++ break; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_BIT_OR: ++ *op->op.bitw.ptr |= op->op.bitw.val; ++ result = 0; ++ break; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_BIT_XOR: ++ *op->op.bitw.ptr ^= op->op.bitw.val; ++ result = 0; ++ break; ++ case KBASE_DEBUG_CORESIGHT_CSF_OP_TYPE_BIT_NOT: ++ *op->op.bitw.ptr = ~(*op->op.bitw.ptr); ++ result = 0; ++ break; ++ default: ++ dev_err(kbdev->dev, "Invalid operation %d", op->type); ++ break; ++ } ++ ++ return result; ++} ++ ++static int coresight_config_enable(struct kbase_device *kbdev, ++ struct kbase_debug_coresight_csf_config *config) ++{ ++ int ret = 0; ++ int i; ++ ++ if (!config) ++ return -EINVAL; ++ ++ if (config->state == KBASE_DEBUG_CORESIGHT_CSF_ENABLED) ++ return ret; ++ ++ for (i = 0; config->enable_seq && !ret && i < config->enable_seq->nr_ops; i++) ++ ret = execute_op(kbdev, &config->enable_seq->ops[i]); ++ ++ if (!ret) { ++ dev_dbg(kbdev->dev, "Coresight config (0x%pK) state transition: %s to %s", config, ++ coresight_state_to_string(config->state), ++ coresight_state_to_string(KBASE_DEBUG_CORESIGHT_CSF_ENABLED)); ++ config->state = KBASE_DEBUG_CORESIGHT_CSF_ENABLED; ++ } ++ ++ /* Always assign the return code during config enable. ++ * It gets propagated when calling config disable. ++ */ ++ config->error = ret; ++ ++ return ret; ++} ++ ++static int coresight_config_disable(struct kbase_device *kbdev, ++ struct kbase_debug_coresight_csf_config *config) ++{ ++ int ret = 0; ++ int i; ++ ++ if (!config) ++ return -EINVAL; ++ ++ if (config->state == KBASE_DEBUG_CORESIGHT_CSF_DISABLED) ++ return ret; ++ ++ for (i = 0; config->disable_seq && !ret && i < config->disable_seq->nr_ops; i++) ++ ret = execute_op(kbdev, &config->disable_seq->ops[i]); ++ ++ if (!ret) { ++ dev_dbg(kbdev->dev, "Coresight config (0x%pK) state transition: %s to %s", config, ++ coresight_state_to_string(config->state), ++ coresight_state_to_string(KBASE_DEBUG_CORESIGHT_CSF_DISABLED)); ++ config->state = KBASE_DEBUG_CORESIGHT_CSF_DISABLED; ++ } else { ++ /* Only assign the error if ret is not 0. ++ * As we don't want to overwrite an error from config enable ++ */ ++ if (!config->error) ++ config->error = ret; ++ } ++ ++ return ret; ++} ++ ++void *kbase_debug_coresight_csf_register(void *drv_data, ++ struct kbase_debug_coresight_csf_address_range *ranges, ++ int nr_ranges) ++{ ++ struct kbase_debug_coresight_csf_client *client, *client_entry; ++ struct kbase_device *kbdev; ++ unsigned long flags; ++ int k; ++ ++ if (unlikely(!drv_data)) { ++ pr_err("NULL drv_data"); ++ return NULL; ++ } ++ ++ kbdev = (struct kbase_device *)drv_data; ++ ++ if (unlikely(!ranges)) { ++ dev_err(kbdev->dev, "NULL ranges"); ++ return NULL; ++ } ++ ++ if (unlikely(!nr_ranges)) { ++ dev_err(kbdev->dev, "nr_ranges is 0"); ++ return NULL; ++ } ++ ++ for (k = 0; k < nr_ranges; k++) { ++ if (ranges[k].end < ranges[k].start) { ++ dev_err(kbdev->dev, "Invalid address ranges 0x%08x - 0x%08x", ++ ranges[k].start, ranges[k].end); ++ return NULL; ++ } ++ } ++ ++ client = kzalloc(sizeof(struct kbase_debug_coresight_csf_client), GFP_KERNEL); ++ ++ if (!client) ++ return NULL; ++ ++ spin_lock_irqsave(&kbdev->csf.coresight.lock, flags); ++ list_for_each_entry(client_entry, &kbdev->csf.coresight.clients, link) { ++ struct kbase_debug_coresight_csf_address_range *client_ranges = ++ client_entry->addr_ranges; ++ int i; ++ ++ for (i = 0; i < client_entry->nr_ranges; i++) { ++ int j; ++ ++ for (j = 0; j < nr_ranges; j++) { ++ if ((ranges[j].start < client_ranges[i].end) && ++ (client_ranges[i].start < ranges[j].end)) { ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++ kfree(client); ++ dev_err(kbdev->dev, ++ "Client with range 0x%08x - 0x%08x already present at address range 0x%08x - 0x%08x", ++ client_ranges[i].start, client_ranges[i].end, ++ ranges[j].start, ranges[j].end); ++ ++ return NULL; ++ } ++ } ++ } ++ } ++ ++ client->drv_data = drv_data; ++ client->addr_ranges = ranges; ++ client->nr_ranges = nr_ranges; ++ list_add(&client->link, &kbdev->csf.coresight.clients); ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++ ++ return client; ++} ++EXPORT_SYMBOL(kbase_debug_coresight_csf_register); ++ ++void kbase_debug_coresight_csf_unregister(void *client_data) ++{ ++ struct kbase_debug_coresight_csf_client *client; ++ struct kbase_debug_coresight_csf_config *config_entry; ++ struct kbase_device *kbdev; ++ unsigned long flags; ++ bool retry = true; ++ ++ if (unlikely(!client_data)) { ++ pr_err("NULL client"); ++ return; ++ } ++ ++ client = (struct kbase_debug_coresight_csf_client *)client_data; ++ ++ kbdev = (struct kbase_device *)client->drv_data; ++ if (unlikely(!kbdev)) { ++ pr_err("NULL drv_data in client"); ++ return; ++ } ++ ++ /* check for active config from client */ ++ spin_lock_irqsave(&kbdev->csf.coresight.lock, flags); ++ list_del_init(&client->link); ++ ++ while (retry && !list_empty(&kbdev->csf.coresight.configs)) { ++ retry = false; ++ list_for_each_entry(config_entry, &kbdev->csf.coresight.configs, link) { ++ if (config_entry->client == client) { ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++ kbase_debug_coresight_csf_config_free(config_entry); ++ spin_lock_irqsave(&kbdev->csf.coresight.lock, flags); ++ retry = true; ++ break; ++ } ++ } ++ } ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++ ++ kfree(client); ++} ++EXPORT_SYMBOL(kbase_debug_coresight_csf_unregister); ++ ++void * ++kbase_debug_coresight_csf_config_create(void *client_data, ++ struct kbase_debug_coresight_csf_sequence *enable_seq, ++ struct kbase_debug_coresight_csf_sequence *disable_seq) ++{ ++ struct kbase_debug_coresight_csf_client *client; ++ struct kbase_debug_coresight_csf_config *config; ++ struct kbase_device *kbdev; ++ ++ if (unlikely(!client_data)) { ++ pr_err("NULL client"); ++ return NULL; ++ } ++ ++ client = (struct kbase_debug_coresight_csf_client *)client_data; ++ ++ kbdev = (struct kbase_device *)client->drv_data; ++ if (unlikely(!kbdev)) { ++ pr_err("NULL drv_data in client"); ++ return NULL; ++ } ++ ++ if (enable_seq) { ++ if (!validate_seq(client, enable_seq)) { ++ dev_err(kbdev->dev, "Invalid enable_seq"); ++ return NULL; ++ } ++ } ++ ++ if (disable_seq) { ++ if (!validate_seq(client, disable_seq)) { ++ dev_err(kbdev->dev, "Invalid disable_seq"); ++ return NULL; ++ } ++ } ++ ++ config = kzalloc(sizeof(struct kbase_debug_coresight_csf_config), GFP_KERNEL); ++ if (WARN_ON(!client)) ++ return NULL; ++ ++ config->client = client; ++ config->enable_seq = enable_seq; ++ config->disable_seq = disable_seq; ++ config->error = 0; ++ config->state = KBASE_DEBUG_CORESIGHT_CSF_DISABLED; ++ ++ INIT_LIST_HEAD(&config->link); ++ ++ return config; ++} ++EXPORT_SYMBOL(kbase_debug_coresight_csf_config_create); ++ ++void kbase_debug_coresight_csf_config_free(void *config_data) ++{ ++ struct kbase_debug_coresight_csf_config *config; ++ ++ if (unlikely(!config_data)) { ++ pr_err("NULL config"); ++ return; ++ } ++ ++ config = (struct kbase_debug_coresight_csf_config *)config_data; ++ ++ kbase_debug_coresight_csf_config_disable(config); ++ ++ kfree(config); ++} ++EXPORT_SYMBOL(kbase_debug_coresight_csf_config_free); ++ ++int kbase_debug_coresight_csf_config_enable(void *config_data) ++{ ++ struct kbase_debug_coresight_csf_config *config; ++ struct kbase_debug_coresight_csf_client *client; ++ struct kbase_device *kbdev; ++ struct kbase_debug_coresight_csf_config *config_entry; ++ unsigned long flags; ++ int ret = 0; ++ ++ if (unlikely(!config_data)) { ++ pr_err("NULL config"); ++ return -EINVAL; ++ } ++ ++ config = (struct kbase_debug_coresight_csf_config *)config_data; ++ client = (struct kbase_debug_coresight_csf_client *)config->client; ++ ++ if (unlikely(!client)) { ++ pr_err("NULL client in config"); ++ return -EINVAL; ++ } ++ ++ kbdev = (struct kbase_device *)client->drv_data; ++ if (unlikely(!kbdev)) { ++ pr_err("NULL drv_data in client"); ++ return -EINVAL; ++ } ++ ++ /* Check to prevent double entry of config */ ++ spin_lock_irqsave(&kbdev->csf.coresight.lock, flags); ++ list_for_each_entry(config_entry, &kbdev->csf.coresight.configs, link) { ++ if (config_entry == config) { ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++ dev_err(kbdev->dev, "Config already enabled"); ++ return -EINVAL; ++ } ++ } ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++ ++ kbase_csf_scheduler_lock(kbdev); ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ ++ /* Check the state of Scheduler to confirm the desired state of MCU */ ++ if (((kbdev->csf.scheduler.state != SCHED_SUSPENDED) && ++ (kbdev->csf.scheduler.state != SCHED_SLEEPING) && ++ !kbase_csf_scheduler_protected_mode_in_use(kbdev)) || ++ kbase_pm_get_policy(kbdev) == &kbase_pm_always_on_policy_ops) { ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ /* Wait for MCU to reach the stable ON state */ ++ ret = kbase_pm_wait_for_desired_state(kbdev); ++ ++ if (ret) ++ dev_err(kbdev->dev, ++ "Wait for PM state failed when enabling coresight config"); ++ else ++ ret = coresight_config_enable(kbdev, config); ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ } ++ ++ /* Add config to next enable sequence */ ++ if (!ret) { ++ spin_lock(&kbdev->csf.coresight.lock); ++ list_add(&config->link, &kbdev->csf.coresight.configs); ++ spin_unlock(&kbdev->csf.coresight.lock); ++ } ++ ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ kbase_csf_scheduler_unlock(kbdev); ++ ++ return ret; ++} ++EXPORT_SYMBOL(kbase_debug_coresight_csf_config_enable); ++ ++int kbase_debug_coresight_csf_config_disable(void *config_data) ++{ ++ struct kbase_debug_coresight_csf_config *config; ++ struct kbase_debug_coresight_csf_client *client; ++ struct kbase_device *kbdev; ++ struct kbase_debug_coresight_csf_config *config_entry; ++ bool found_in_list = false; ++ unsigned long flags; ++ int ret = 0; ++ ++ if (unlikely(!config_data)) { ++ pr_err("NULL config"); ++ return -EINVAL; ++ } ++ ++ config = (struct kbase_debug_coresight_csf_config *)config_data; ++ ++ /* Exit early if not enabled prior */ ++ if (list_empty(&config->link)) ++ return ret; ++ ++ client = (struct kbase_debug_coresight_csf_client *)config->client; ++ ++ if (unlikely(!client)) { ++ pr_err("NULL client in config"); ++ return -EINVAL; ++ } ++ ++ kbdev = (struct kbase_device *)client->drv_data; ++ if (unlikely(!kbdev)) { ++ pr_err("NULL drv_data in client"); ++ return -EINVAL; ++ } ++ ++ /* Check if the config is in the correct list */ ++ spin_lock_irqsave(&kbdev->csf.coresight.lock, flags); ++ list_for_each_entry(config_entry, &kbdev->csf.coresight.configs, link) { ++ if (config_entry == config) { ++ found_in_list = true; ++ break; ++ } ++ } ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++ ++ if (!found_in_list) { ++ dev_err(kbdev->dev, "Config looks corrupted"); ++ return -EINVAL; ++ } ++ ++ kbase_csf_scheduler_lock(kbdev); ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ ++ /* Check the state of Scheduler to confirm the desired state of MCU */ ++ if (((kbdev->csf.scheduler.state != SCHED_SUSPENDED) && ++ (kbdev->csf.scheduler.state != SCHED_SLEEPING) && ++ !kbase_csf_scheduler_protected_mode_in_use(kbdev)) || ++ kbase_pm_get_policy(kbdev) == &kbase_pm_always_on_policy_ops) { ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ /* Wait for MCU to reach the stable ON state */ ++ ret = kbase_pm_wait_for_desired_state(kbdev); ++ ++ if (ret) ++ dev_err(kbdev->dev, ++ "Wait for PM state failed when disabling coresight config"); ++ else ++ ret = coresight_config_disable(kbdev, config); ++ ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ } else if (kbdev->pm.backend.mcu_state == KBASE_MCU_OFF) { ++ /* MCU is OFF, so the disable sequence was already executed. ++ * ++ * Propagate any error that would have occurred during the enable ++ * or disable sequence. ++ * ++ * This is done as part of the disable sequence, since the call from ++ * client is synchronous. ++ */ ++ ret = config->error; ++ } ++ ++ /* Remove config from next disable sequence */ ++ spin_lock(&kbdev->csf.coresight.lock); ++ list_del_init(&config->link); ++ spin_unlock(&kbdev->csf.coresight.lock); ++ ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++ kbase_csf_scheduler_unlock(kbdev); ++ ++ return ret; ++} ++EXPORT_SYMBOL(kbase_debug_coresight_csf_config_disable); ++ ++static void coresight_config_enable_all(struct work_struct *data) ++{ ++ struct kbase_device *kbdev = ++ container_of(data, struct kbase_device, csf.coresight.enable_work); ++ struct kbase_debug_coresight_csf_config *config_entry; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->csf.coresight.lock, flags); ++ ++ list_for_each_entry(config_entry, &kbdev->csf.coresight.configs, link) { ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++ if (coresight_config_enable(kbdev, config_entry)) ++ dev_err(kbdev->dev, "enable config (0x%pK) failed", config_entry); ++ spin_lock_irqsave(&kbdev->csf.coresight.lock, flags); ++ } ++ ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_pm_update_state(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ wake_up_all(&kbdev->csf.coresight.event_wait); ++} ++ ++static void coresight_config_disable_all(struct work_struct *data) ++{ ++ struct kbase_device *kbdev = ++ container_of(data, struct kbase_device, csf.coresight.disable_work); ++ struct kbase_debug_coresight_csf_config *config_entry; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->csf.coresight.lock, flags); ++ ++ list_for_each_entry(config_entry, &kbdev->csf.coresight.configs, link) { ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++ if (coresight_config_disable(kbdev, config_entry)) ++ dev_err(kbdev->dev, "disable config (0x%pK) failed", config_entry); ++ spin_lock_irqsave(&kbdev->csf.coresight.lock, flags); ++ } ++ ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_pm_update_state(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ wake_up_all(&kbdev->csf.coresight.event_wait); ++} ++ ++void kbase_debug_coresight_csf_disable_pmode_enter(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ ++ dev_dbg(kbdev->dev, "Coresight state %s before protected mode enter", ++ coresight_state_to_string(KBASE_DEBUG_CORESIGHT_CSF_ENABLED)); ++ ++ lockdep_assert_held(&kbdev->csf.scheduler.lock); ++ ++ kbase_pm_lock(kbdev); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ++ kbdev->csf.coresight.disable_on_pmode_enter = true; ++ kbdev->csf.coresight.enable_on_pmode_exit = false; ++ kbase_pm_update_state(kbdev); ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ kbase_pm_wait_for_desired_state(kbdev); ++ ++ kbase_pm_unlock(kbdev); ++} ++ ++void kbase_debug_coresight_csf_enable_pmode_exit(struct kbase_device *kbdev) ++{ ++ dev_dbg(kbdev->dev, "Coresight state %s after protected mode exit", ++ coresight_state_to_string(KBASE_DEBUG_CORESIGHT_CSF_DISABLED)); ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ WARN_ON(kbdev->csf.coresight.disable_on_pmode_enter); ++ ++ kbdev->csf.coresight.enable_on_pmode_exit = true; ++ kbase_pm_update_state(kbdev); ++} ++ ++void kbase_debug_coresight_csf_state_request(struct kbase_device *kbdev, ++ enum kbase_debug_coresight_csf_state state) ++{ ++ if (unlikely(!kbdev)) ++ return; ++ ++ if (unlikely(!kbdev->csf.coresight.workq)) ++ return; ++ ++ dev_dbg(kbdev->dev, "Coresight state %s requested", coresight_state_to_string(state)); ++ ++ switch (state) { ++ case KBASE_DEBUG_CORESIGHT_CSF_DISABLED: ++ queue_work(kbdev->csf.coresight.workq, &kbdev->csf.coresight.disable_work); ++ break; ++ case KBASE_DEBUG_CORESIGHT_CSF_ENABLED: ++ queue_work(kbdev->csf.coresight.workq, &kbdev->csf.coresight.enable_work); ++ break; ++ default: ++ dev_err(kbdev->dev, "Invalid Coresight state %d", state); ++ break; ++ } ++} ++ ++bool kbase_debug_coresight_csf_state_check(struct kbase_device *kbdev, ++ enum kbase_debug_coresight_csf_state state) ++{ ++ struct kbase_debug_coresight_csf_config *config_entry; ++ unsigned long flags; ++ bool success = true; ++ ++ dev_dbg(kbdev->dev, "Coresight check for state: %s", coresight_state_to_string(state)); ++ ++ spin_lock_irqsave(&kbdev->csf.coresight.lock, flags); ++ ++ list_for_each_entry(config_entry, &kbdev->csf.coresight.configs, link) { ++ if (state != config_entry->state) { ++ success = false; ++ break; ++ } ++ } ++ ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++ ++ return success; ++} ++KBASE_EXPORT_TEST_API(kbase_debug_coresight_csf_state_check); ++ ++bool kbase_debug_coresight_csf_state_wait(struct kbase_device *kbdev, ++ enum kbase_debug_coresight_csf_state state) ++{ ++ const long wait_timeout = kbase_csf_timeout_in_jiffies(kbdev->csf.fw_timeout_ms); ++ struct kbase_debug_coresight_csf_config *config_entry, *next_config_entry; ++ unsigned long flags; ++ bool success = true; ++ ++ dev_dbg(kbdev->dev, "Coresight wait for state: %s", coresight_state_to_string(state)); ++ ++ spin_lock_irqsave(&kbdev->csf.coresight.lock, flags); ++ ++ list_for_each_entry_safe(config_entry, next_config_entry, &kbdev->csf.coresight.configs, ++ link) { ++ const enum kbase_debug_coresight_csf_state prev_state = config_entry->state; ++ long remaining; ++ ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++ remaining = wait_event_timeout(kbdev->csf.coresight.event_wait, ++ state == config_entry->state, wait_timeout); ++ spin_lock_irqsave(&kbdev->csf.coresight.lock, flags); ++ ++ if (!remaining) { ++ success = false; ++ dev_err(kbdev->dev, ++ "Timeout waiting for Coresight state transition %s to %s", ++ coresight_state_to_string(prev_state), ++ coresight_state_to_string(state)); ++ } ++ } ++ ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++ ++ return success; ++} ++KBASE_EXPORT_TEST_API(kbase_debug_coresight_csf_state_wait); ++ ++int kbase_debug_coresight_csf_init(struct kbase_device *kbdev) ++{ ++ kbdev->csf.coresight.workq = alloc_ordered_workqueue("Mali CoreSight workqueue", 0); ++ if (kbdev->csf.coresight.workq == NULL) ++ return -ENOMEM; ++ ++ INIT_LIST_HEAD(&kbdev->csf.coresight.clients); ++ INIT_LIST_HEAD(&kbdev->csf.coresight.configs); ++ INIT_WORK(&kbdev->csf.coresight.enable_work, coresight_config_enable_all); ++ INIT_WORK(&kbdev->csf.coresight.disable_work, coresight_config_disable_all); ++ init_waitqueue_head(&kbdev->csf.coresight.event_wait); ++ spin_lock_init(&kbdev->csf.coresight.lock); ++ ++ kbdev->csf.coresight.disable_on_pmode_enter = false; ++ kbdev->csf.coresight.enable_on_pmode_exit = false; ++ ++ return 0; ++} ++ ++void kbase_debug_coresight_csf_term(struct kbase_device *kbdev) ++{ ++ struct kbase_debug_coresight_csf_client *client_entry, *next_client_entry; ++ struct kbase_debug_coresight_csf_config *config_entry, *next_config_entry; ++ unsigned long flags; ++ ++ kbdev->csf.coresight.disable_on_pmode_enter = false; ++ kbdev->csf.coresight.enable_on_pmode_exit = false; ++ ++ cancel_work_sync(&kbdev->csf.coresight.enable_work); ++ cancel_work_sync(&kbdev->csf.coresight.disable_work); ++ destroy_workqueue(kbdev->csf.coresight.workq); ++ kbdev->csf.coresight.workq = NULL; ++ ++ spin_lock_irqsave(&kbdev->csf.coresight.lock, flags); ++ ++ list_for_each_entry_safe(config_entry, next_config_entry, &kbdev->csf.coresight.configs, ++ link) { ++ list_del_init(&config_entry->link); ++ kfree(config_entry); ++ } ++ ++ list_for_each_entry_safe(client_entry, next_client_entry, &kbdev->csf.coresight.clients, ++ link) { ++ list_del_init(&client_entry->link); ++ kfree(client_entry); ++ } ++ ++ spin_unlock_irqrestore(&kbdev->csf.coresight.lock, flags); ++} +diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_internal_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_internal_csf.h +new file mode 100644 +index 000000000..06d62dc70 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_internal_csf.h +@@ -0,0 +1,182 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#ifndef _KBASE_DEBUG_CORESIGHT_INTERNAL_CSF_H_ ++#define _KBASE_DEBUG_CORESIGHT_INTERNAL_CSF_H_ ++ ++#include ++#include ++ ++/** ++ * struct kbase_debug_coresight_csf_client - Coresight client definition ++ * ++ * @drv_data: Pointer to driver device data. ++ * @addr_ranges: Arrays of address ranges used by the registered client. ++ * @nr_ranges: Size of @addr_ranges array. ++ * @link: Link item of a Coresight client. ++ * Linked to &struct_kbase_device.csf.coresight.clients. ++ */ ++struct kbase_debug_coresight_csf_client { ++ void *drv_data; ++ struct kbase_debug_coresight_csf_address_range *addr_ranges; ++ u32 nr_ranges; ++ struct list_head link; ++}; ++ ++/** ++ * enum kbase_debug_coresight_csf_state - Coresight configuration states ++ * ++ * @KBASE_DEBUG_CORESIGHT_CSF_DISABLED: Coresight configuration is disabled. ++ * @KBASE_DEBUG_CORESIGHT_CSF_ENABLED: Coresight configuration is enabled. ++ */ ++enum kbase_debug_coresight_csf_state { ++ KBASE_DEBUG_CORESIGHT_CSF_DISABLED = 0, ++ KBASE_DEBUG_CORESIGHT_CSF_ENABLED, ++}; ++ ++/** ++ * struct kbase_debug_coresight_csf_config - Coresight configuration definition ++ * ++ * @client: Pointer to the client for which the configuration is created. ++ * @enable_seq: Array of operations for Coresight client enable sequence. Can be NULL. ++ * @disable_seq: Array of operations for Coresight client disable sequence. Can be NULL. ++ * @state: Current Coresight configuration state. ++ * @error: Error code used to know if an error occurred during the execution ++ * of the enable or disable sequences. ++ * @link: Link item of a Coresight configuration. ++ * Linked to &struct_kbase_device.csf.coresight.configs. ++ */ ++struct kbase_debug_coresight_csf_config { ++ void *client; ++ struct kbase_debug_coresight_csf_sequence *enable_seq; ++ struct kbase_debug_coresight_csf_sequence *disable_seq; ++ enum kbase_debug_coresight_csf_state state; ++ int error; ++ struct list_head link; ++}; ++ ++/** ++ * struct kbase_debug_coresight_device - Object representing the Coresight device ++ * ++ * @clients: List head to maintain Coresight clients. ++ * @configs: List head to maintain Coresight configs. ++ * @lock: A lock to protect client/config lists. ++ * Lists can be accessed concurrently by ++ * Coresight kernel modules and kernel threads. ++ * @workq: Work queue for Coresight enable/disable execution. ++ * @enable_work: Work item used to enable Coresight. ++ * @disable_work: Work item used to disable Coresight. ++ * @event_wait: Wait queue for Coresight events. ++ * @enable_on_pmode_exit: Flag used by the PM state machine to ++ * identify if Coresight enable is needed. ++ * @disable_on_pmode_enter: Flag used by the PM state machine to ++ * identify if Coresight disable is needed. ++ */ ++struct kbase_debug_coresight_device { ++ struct list_head clients; ++ struct list_head configs; ++ spinlock_t lock; ++ struct workqueue_struct *workq; ++ struct work_struct enable_work; ++ struct work_struct disable_work; ++ wait_queue_head_t event_wait; ++ bool enable_on_pmode_exit; ++ bool disable_on_pmode_enter; ++}; ++ ++/** ++ * kbase_debug_coresight_csf_init - Initialize Coresight resources. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * This function should be called once at device initialization. ++ * ++ * Return: 0 on success. ++ */ ++int kbase_debug_coresight_csf_init(struct kbase_device *kbdev); ++ ++/** ++ * kbase_debug_coresight_csf_term - Terminate Coresight resources. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * This function should be called at device termination to prevent any ++ * memory leaks if Coresight module would have been removed without calling ++ * kbasep_debug_coresight_csf_trace_disable(). ++ */ ++void kbase_debug_coresight_csf_term(struct kbase_device *kbdev); ++ ++/** ++ * kbase_debug_coresight_csf_disable_pmode_enter - Disable Coresight on Protected ++ * mode enter. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * This function should be called just before requesting to enter protected mode. ++ * It will trigger a PM state machine transition from MCU_ON ++ * to ON_PMODE_ENTER_CORESIGHT_DISABLE. ++ */ ++void kbase_debug_coresight_csf_disable_pmode_enter(struct kbase_device *kbdev); ++ ++/** ++ * kbase_debug_coresight_csf_enable_pmode_exit - Enable Coresight on Protected ++ * mode enter. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * This function should be called after protected mode exit is acknowledged. ++ * It will trigger a PM state machine transition from MCU_ON ++ * to ON_PMODE_EXIT_CORESIGHT_ENABLE. ++ */ ++void kbase_debug_coresight_csf_enable_pmode_exit(struct kbase_device *kbdev); ++ ++/** ++ * kbase_debug_coresight_csf_state_request - Request Coresight state transition. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @state: Coresight state to check for. ++ */ ++void kbase_debug_coresight_csf_state_request(struct kbase_device *kbdev, ++ enum kbase_debug_coresight_csf_state state); ++ ++/** ++ * kbase_debug_coresight_csf_state_check - Check Coresight state. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @state: Coresight state to check for. ++ * ++ * Return: true if all states of configs are @state. ++ */ ++bool kbase_debug_coresight_csf_state_check(struct kbase_device *kbdev, ++ enum kbase_debug_coresight_csf_state state); ++ ++/** ++ * kbase_debug_coresight_csf_state_wait - Wait for Coresight state transition to complete. ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * @state: Coresight state to wait for. ++ * ++ * Return: true if all configs become @state in pre-defined time period. ++ */ ++bool kbase_debug_coresight_csf_state_wait(struct kbase_device *kbdev, ++ enum kbase_debug_coresight_csf_state state); ++ ++#endif /* _KBASE_DEBUG_CORESIGHT_INTERNAL_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h new file mode 100755 -index 000000000000..32181d711193 +index 000000000..41b2b00f1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h -@@ -0,0 +1,116 @@ +@@ -0,0 +1,322 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -176484,8 +201529,6 @@ index 000000000000..32181d711193 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -176511,18 +201554,75 @@ index 000000000000..32181d711193 + /* + * Generic CSF events + */ -+ KBASE_KTRACE_CODE_MAKE_CODE(EVICT_CTX_SLOTS), ++ /* info_val = 0 */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_EVICT_CTX_SLOTS_START), ++ /* info_val == number of CSGs supported */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_EVICT_CTX_SLOTS_END), + /* info_val[0:7] == fw version_minor + * info_val[15:8] == fw version_major + * info_val[63:32] == fw version_hash + */ -+ KBASE_KTRACE_CODE_MAKE_CODE(FIRMWARE_BOOT), -+ KBASE_KTRACE_CODE_MAKE_CODE(FIRMWARE_REBOOT), -+ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TOCK), -+ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TICK), -+ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_RESET), -+ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_EXIT_PROTM), -+ KBASE_KTRACE_CODE_MAKE_CODE(SYNC_UPDATE_EVENT), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_FIRMWARE_BOOT), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_FIRMWARE_REBOOT), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TOCK_INVOKE), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TICK_INVOKE), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TOCK_START), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TOCK_END), ++ /* info_val == total number of runnable groups across all kctxs */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TICK_START), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TICK_END), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_RESET_START), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_RESET_END), ++ /* info_val = timeout in ms */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_PROTM_WAIT_QUIT_START), ++ /* info_val = remaining ms timeout, or 0 if timedout */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_PROTM_WAIT_QUIT_END), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GROUP_SYNC_UPDATE_EVENT), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_SYNC_UPDATE_NOTIFY_GPU_EVENT), ++ ++ /* info_val = JOB_IRQ_STATUS */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_INTERRUPT_START), ++ /* info_val = JOB_IRQ_STATUS */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_INTERRUPT_END), ++ /* info_val = JOB_IRQ_STATUS */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSG_INTERRUPT_PROCESS_START), ++ /* info_val = GLB_REQ ^ GLB_ACQ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_INTERRUPT_GLB_REQ_ACK), ++ /* info_val[31:0] = num non idle offslot groups ++ * info_val[32] = scheduler can suspend on idle ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GPU_IDLE_EVENT_CAN_SUSPEND), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TICK_ADVANCE), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TICK_NOADVANCE), ++ /* kctx is added to the back of the list */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_RUNNABLE_KCTX_INSERT), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_RUNNABLE_KCTX_REMOVE), ++ /* kctx is moved to the back of the list */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_RUNNABLE_KCTX_ROTATE), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_RUNNABLE_KCTX_HEAD), ++ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GPU_IDLE_WORKER_START), ++ /* 4-bit encoding of boolean values (ease of reading as hex values) ++ * ++ * info_val[3:0] = was reset active/failed to be prevented ++ * info_val[7:4] = whether scheduler was both idle and suspendable ++ * info_val[11:8] = whether all groups were suspended ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GPU_IDLE_WORKER_END), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GROUP_SYNC_UPDATE_WORKER_START), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GROUP_SYNC_UPDATE_WORKER_END), ++ ++ /* info_val = bitmask of slots that gave an ACK for STATUS_UPDATE */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_UPDATE_IDLE_SLOTS_ACK), ++ ++ /* info_val[63:0] = GPU cycle counter, used mainly for benchmarking ++ * purpose. ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GPU_IDLE_WORKER_HANDLING_START), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GPU_IDLE_WORKER_HANDLING_END), ++ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_FIRMWARE_MCU_HALTED), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_FIRMWARE_MCU_SLEEP), + + /* + * Group events @@ -176531,21 +201631,41 @@ index 000000000000..32181d711193 + * info_val[19:16] == as_nr + * info_val[63:32] == endpoint config (max number of endpoints allowed) + */ -+ KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_START), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_START_REQ), + /* info_val == CSG_REQ state issued */ -+ KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_STOP), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_STOP_REQ), + /* info_val == CSG_ACK state */ -+ KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_STARTED), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_RUNNING), + /* info_val == CSG_ACK state */ + KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_STOPPED), + /* info_val == slot cleaned */ + KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_CLEANED), ++ /* info_val = slot requesting STATUS_UPDATE */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSG_UPDATE_IDLE_SLOT_REQ), ++ /* info_val = scheduler's new csg_slots_idle_mask[0] ++ * group->csg_nr indicates which bit was set ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_IDLE_SET), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSG_INTERRUPT_NO_NON_IDLE_GROUPS), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSG_INTERRUPT_NON_IDLE_GROUPS), ++ /* info_val = scheduler's new csg_slots_idle_mask[0] ++ * group->csg_nr indicates which bit was cleared ++ * ++ * in case of no group, multiple bits may have been updated ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_IDLE_CLEAR), + /* info_val == previous priority */ -+ KBASE_KTRACE_CODE_MAKE_CODE(CSG_PRIO_UPDATE), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_PRIO_UPDATE), + /* info_val == CSG_REQ ^ CSG_ACK */ -+ KBASE_KTRACE_CODE_MAKE_CODE(CSG_SYNC_UPDATE_INTERRUPT), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSG_INTERRUPT_SYNC_UPDATE), + /* info_val == CSG_REQ ^ CSG_ACK */ -+ KBASE_KTRACE_CODE_MAKE_CODE(CSG_IDLE_INTERRUPT), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSG_INTERRUPT_IDLE), ++ /* info_val == CSG_REQ ^ CSG_ACK */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSG_INTERRUPT_PROGRESS_TIMER_EVENT), ++ /* info_val[31:0] == CSG_REQ ^ CSG_ACQ ++ * info_val[63:32] == CSG_IRQ_REQ ^ CSG_IRQ_ACK ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSG_INTERRUPT_PROCESS_END), + KBASE_KTRACE_CODE_MAKE_CODE(GROUP_SYNC_UPDATE_DONE), + /* info_val == run state of the group */ + KBASE_KTRACE_CODE_MAKE_CODE(GROUP_DESCHEDULE), @@ -176554,12 +201674,74 @@ index 000000000000..32181d711193 + /* info_val[31:0] == new run state of the evicted group + * info_val[63:32] == number of runnable groups + */ -+ KBASE_KTRACE_CODE_MAKE_CODE(GROUP_EVICT_SCHED), -+ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_ENTER_PROTM), ++ KBASE_KTRACE_CODE_MAKE_CODE(GROUP_EVICT), ++ ++ /* info_val == new num_runnable_grps ++ * group is added to the back of the list for its priority level ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(GROUP_RUNNABLE_INSERT), ++ /* info_val == new num_runnable_grps ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(GROUP_RUNNABLE_REMOVE), ++ /* info_val == num_runnable_grps ++ * group is moved to the back of the list for its priority level ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(GROUP_RUNNABLE_ROTATE), ++ KBASE_KTRACE_CODE_MAKE_CODE(GROUP_RUNNABLE_HEAD), ++ /* info_val == new num_idle_wait_grps ++ * group is added to the back of the list ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(GROUP_IDLE_WAIT_INSERT), ++ /* info_val == new num_idle_wait_grps ++ * group is added to the back of the list ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(GROUP_IDLE_WAIT_REMOVE), ++ KBASE_KTRACE_CODE_MAKE_CODE(GROUP_IDLE_WAIT_HEAD), ++ ++ /* info_val == is scheduler running with protected mode tasks */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_PROTM_ENTER_CHECK), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_PROTM_ENTER), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_PROTM_EXIT), + /* info_val[31:0] == number of GPU address space slots in use + * info_val[63:32] == number of runnable groups + */ + KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TOP_GRP), ++ /* info_val == new count of off-slot non-idle groups ++ * no group indicates it was set rather than incremented ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_NONIDLE_OFFSLOT_GRP_INC), ++ /* info_val == new count of off-slot non-idle groups */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_NONIDLE_OFFSLOT_GRP_DEC), ++ /* info_val = scheduler's new csg_slots_idle_mask[0] ++ * group->csg_nr indicates which bit was set ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_HANDLE_IDLE_SLOTS), ++ ++ KBASE_KTRACE_CODE_MAKE_CODE(PROTM_EVENT_WORKER_START), ++ KBASE_KTRACE_CODE_MAKE_CODE(PROTM_EVENT_WORKER_END), ++ ++ /* info_val = scheduler state */ ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHED_BUSY), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHED_INACTIVE), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHED_SUSPENDED), ++ KBASE_KTRACE_CODE_MAKE_CODE(SCHED_SLEEPING), ++ ++ /* info_val = mcu state */ ++#define KBASEP_MCU_STATE(n) KBASE_KTRACE_CODE_MAKE_CODE(PM_MCU_ ## n), ++#include "backend/gpu/mali_kbase_pm_mcu_states.h" ++#undef KBASEP_MCU_STATE ++ ++ /* info_val = number of runnable groups */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_INACTIVE), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_RUNNABLE), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_IDLE), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_SUSPENDED), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_SUSPENDED_ON_IDLE), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_SUSPENDED_ON_WAIT_SYNC), ++ /* info_val = new run state of the evicted group */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_FAULT_EVICTED), ++ /* info_val = get the number of active CSGs */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_TERMINATED), + + /* + * Group + Queue events @@ -176568,34 +201750,103 @@ index 000000000000..32181d711193 + KBASE_KTRACE_CODE_MAKE_CODE(CSI_START), + /* info_val == queue->enabled before stop */ + KBASE_KTRACE_CODE_MAKE_CODE(CSI_STOP), -+ KBASE_KTRACE_CODE_MAKE_CODE(CSI_STOP_REQUESTED), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSI_STOP_REQ), ++ /* info_val == CS_REQ ^ CS_ACK that were not processed due to the group ++ * being suspended ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSI_INTERRUPT_GROUP_SUSPENDS_IGNORED), + /* info_val == CS_REQ ^ CS_ACK */ -+ KBASE_KTRACE_CODE_MAKE_CODE(CSI_FAULT_INTERRUPT), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSI_INTERRUPT_FAULT), + /* info_val == CS_REQ ^ CS_ACK */ -+ KBASE_KTRACE_CODE_MAKE_CODE(CSI_TILER_OOM_INTERRUPT), ++ KBASE_KTRACE_CODE_MAKE_CODE(CSI_INTERRUPT_TILER_OOM), ++ /* info_val == CS_REQ ^ CS_ACK */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSI_INTERRUPT_PROTM_PEND), ++ /* info_val == CS_ACK_PROTM_PEND ^ CS_REQ_PROTM_PEND */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSI_PROTM_ACK), + /* info_val == group->run_State (for group the queue is bound to) */ + KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_START), + KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_STOP), ++ /* info_val == contents of CS_STATUS_WAIT_SYNC_POINTER */ ++ KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_UPDATE_EVAL_START), ++ /* info_val == bool for result of the evaluation */ ++ KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_UPDATE_EVAL_END), ++ /* info_val == contents of CS_STATUS_WAIT */ ++ KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_UPDATE_WAIT_STATUS), ++ /* info_val == current sync value pointed to by queue->sync_ptr */ ++ KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_UPDATE_CUR_VAL), ++ /* info_val == current value of CS_STATUS_WAIT_SYNC_VALUE */ ++ KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_UPDATE_TEST_VAL), ++ /* info_val == current value of CS_STATUS_BLOCKED_REASON */ ++ KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_UPDATE_BLOCKED_REASON), ++ /* info_val = group's new protm_pending_bitmap[0] ++ * queue->csi_index indicates which bit was set ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSI_PROTM_PEND_SET), ++ /* info_val = group's new protm_pending_bitmap[0] ++ * queue->csi_index indicates which bit was cleared ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(CSI_PROTM_PEND_CLEAR), ++ ++ /* ++ * KCPU queue events ++ */ ++ /* KTrace info_val == KCPU queue fence context ++ * KCPU extra_info_val == N/A. ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(KCPU_QUEUE_CREATE), ++ /* KTrace info_val == Number of pending commands in KCPU queue when ++ * it is destroyed. ++ * KCPU extra_info_val == Number of CQS wait operations present in ++ * the KCPU queue when it is destroyed. ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(KCPU_QUEUE_DELETE), ++ /* KTrace info_val == CQS event memory address ++ * KCPU extra_info_val == Upper 32 bits of event memory, i.e. contents ++ * of error field. ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(KCPU_CQS_SET), ++ /* KTrace info_val == Number of CQS objects to be waited upon ++ * KCPU extra_info_val == N/A. ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(KCPU_CQS_WAIT_START), ++ /* KTrace info_val == CQS event memory address ++ * KCPU extra_info_val == 1 if CQS was signaled with an error and queue ++ * inherited the error, otherwise 0. ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(KCPU_CQS_WAIT_END), ++ /* KTrace info_val == Fence context ++ * KCPU extra_info_val == Fence seqno. ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(KCPU_FENCE_SIGNAL), ++ /* KTrace info_val == Fence context ++ * KCPU extra_info_val == Fence seqno. ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(KCPU_FENCE_WAIT_START), ++ /* KTrace info_val == Fence context ++ * KCPU extra_info_val == Fence seqno. ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(KCPU_FENCE_WAIT_END), + +#if 0 /* Dummy section to avoid breaking formatting */ +}; +#endif + -+/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ ++ /* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h new file mode 100755 -index 000000000000..b201e49bd0f2 +index 000000000..6ba98b7c4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h -@@ -0,0 +1,173 @@ +@@ -0,0 +1,206 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2011-2015,2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2015, 2018-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -176606,8 +201857,6 @@ index 000000000000..b201e49bd0f2 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -176647,6 +201896,14 @@ index 000000000000..b201e49bd0f2 + */ + /* info_val==exit code; gpu_addr==chain gpuaddr */ + KBASE_KTRACE_CODE_MAKE_CODE(JM_JOB_DONE), ++ /* gpu_addr==JS_HEAD read ++ * info_val==event code ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(JM_RETURN_ATOM_TO_JS), ++ /* gpu_addr==JS_HEAD read ++ * info_val==event code ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(JM_MARK_FOR_RETURN_TO_JS), + /* gpu_addr==JS_HEAD_NEXT written, info_val==lower 32 bits of + * affinity + */ @@ -176711,6 +201968,13 @@ index 000000000000..b201e49bd0f2 + KBASE_KTRACE_CODE_MAKE_CODE(JS_ADD_JOB), + /* gpu_addr==last value written/would be written to JS_HEAD */ + KBASE_KTRACE_CODE_MAKE_CODE(JS_REMOVE_JOB), ++ /* gpu_addr==value to write into JS_HEAD ++ * info_val==priority of atom as a KBASE_JS_ATOM_SCHED_PRIO_<...> value ++ * (0 highest) ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(JS_PULL_JOB), ++ /* gpu_addr==value that would be written to JS_HEAD if run again */ ++ KBASE_KTRACE_CODE_MAKE_CODE(JS_UNPULL_JOB), + KBASE_KTRACE_CODE_MAKE_CODE(JS_TRY_SCHEDULE_HEAD_CTX), + /* gpu_addr==value to write into JS_HEAD */ + KBASE_KTRACE_CODE_MAKE_CODE(JS_JOB_DONE_TRY_RUN_NEXT_JOB), @@ -176737,6 +202001,25 @@ index 000000000000..b201e49bd0f2 + KBASE_KTRACE_CODE_MAKE_CODE(JS_CTX_ATTR_NOW_OFF_CTX), + /* info_val == the ctx attribute now off runpool */ + KBASE_KTRACE_CODE_MAKE_CODE(JS_CTX_ATTR_NOW_OFF_RUNPOOL), ++ /* gpu_addr==value to write into JS_HEAD */ ++ KBASE_KTRACE_CODE_MAKE_CODE(JS_RETURN_WORKER), ++ /* gpu_addr==value to write into JS_HEAD */ ++ KBASE_KTRACE_CODE_MAKE_CODE(JS_RETURN_WORKER_END), ++ /* info_val==priority level blocked (0 highest) */ ++ KBASE_KTRACE_CODE_MAKE_CODE(JS_SLOT_PRIO_BLOCKED), ++ /* info_val==priority level unblocked (0 highest) ++ * note that the priority level may still be blocked on higher levels ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(JS_SLOT_PRIO_UNBLOCKED), ++ /* gpu_addr==value to write into JS_HEAD ++ * info_val==priority level unblocked - priorities at this and higher ++ * are unblocked (0 highest) ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(JS_SLOT_PRIO_AND_HIGHER_UNBLOCKED), ++ /* gpu_addr==value to write into JS_HEAD ++ * info_val==priority level blocked (0 highest) ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(JS_SLOT_PRIO_IS_BLOCKED), + /* + * Scheduler Policy events + */ @@ -176763,18 +202046,19 @@ index 000000000000..b201e49bd0f2 +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c new file mode 100755 -index 000000000000..2ea901b666c2 +index 000000000..cff6f8959 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c -@@ -0,0 +1,143 @@ +@@ -0,0 +1,199 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -176785,9 +202069,8 @@ index 000000000000..2ea901b666c2 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ ++ +#include +#include "debug/mali_kbase_debug_ktrace_internal.h" +#include "debug/backend/mali_kbase_debug_ktrace_csf.h" @@ -176797,30 +202080,30 @@ index 000000000000..2ea901b666c2 +void kbasep_ktrace_backend_format_header(char *buffer, int sz, s32 *written) +{ + *written += MAX(snprintf(buffer + *written, MAX(sz - *written, 0), -+ "group,slot,prio,csi"), 0); ++ "group,slot,prio,csi,kcpu"), 0); +} + +void kbasep_ktrace_backend_format_msg(struct kbase_ktrace_msg *trace_msg, + char *buffer, int sz, s32 *written) +{ -+ const struct kbase_ktrace_backend * const be_msg = &trace_msg->backend; ++ const union kbase_ktrace_backend * const be_msg = &trace_msg->backend; + /* At present, no need to check for KBASE_KTRACE_FLAG_BACKEND, as the + * other backend-specific flags currently imply this anyway + */ + + /* group parts */ -+ if (be_msg->flags & KBASE_KTRACE_FLAG_CSF_GROUP) { -+ const s8 slot = be_msg->csg_nr; ++ if (be_msg->gpu.flags & KBASE_KTRACE_FLAG_CSF_GROUP) { ++ const s8 slot = be_msg->gpu.csg_nr; + /* group,slot, */ + *written += MAX(snprintf(buffer + *written, + MAX(sz - *written, 0), -+ "%u,%d,", be_msg->group_handle, slot), 0); ++ "%u,%d,", be_msg->gpu.group_handle, slot), 0); + + /* prio */ + if (slot >= 0) + *written += MAX(snprintf(buffer + *written, + MAX(sz - *written, 0), -+ "%u", be_msg->slot_prio), 0); ++ "%u", be_msg->gpu.slot_prio), 0); + + /* , */ + *written += MAX(snprintf(buffer + *written, @@ -176834,10 +202117,24 @@ index 000000000000..2ea901b666c2 + } + + /* queue parts: csi */ -+ if (trace_msg->backend.flags & KBASE_KTRACE_FLAG_CSF_QUEUE) ++ if (trace_msg->backend.gpu.flags & KBASE_KTRACE_FLAG_CSF_QUEUE) + *written += MAX(snprintf(buffer + *written, + MAX(sz - *written, 0), -+ "%d", be_msg->csi_index), 0); ++ "%d", be_msg->gpu.csi_index), 0); ++ ++ /* , */ ++ *written += MAX(snprintf(buffer + *written, ++ MAX(sz - *written, 0), ++ ","), 0); ++ ++ if (be_msg->gpu.flags & KBASE_KTRACE_FLAG_CSF_KCPU) { ++ /* kcpu data */ ++ *written += MAX(snprintf(buffer + *written, ++ MAX(sz - *written, 0), ++ "kcpu %d (0x%llx)", ++ be_msg->kcpu.id, ++ be_msg->kcpu.extra_info_val), 0); ++ } + + /* Don't end with a trailing "," - this is a 'standalone' formatted + * msg, caller will handle the delimiters @@ -176853,6 +202150,9 @@ index 000000000000..2ea901b666c2 + struct kbase_ktrace_msg *trace_msg; + struct kbase_context *kctx = NULL; + ++ if (unlikely(!kbasep_ktrace_initialized(&kbdev->ktrace))) ++ return; ++ + spin_lock_irqsave(&kbdev->ktrace.lock, irqflags); + + /* Reserve and update indices */ @@ -176864,14 +202164,14 @@ index 000000000000..2ea901b666c2 + else if (queue) + kctx = queue->kctx; + -+ /* Fill the common part of the message (including backend.flags) */ ++ /* Fill the common part of the message (including backend.gpu.flags) */ + kbasep_ktrace_msg_init(&kbdev->ktrace, trace_msg, code, kctx, flags, + info_val); + + /* Indicate to the common code that backend-specific parts will be + * valid + */ -+ trace_msg->backend.flags |= KBASE_KTRACE_FLAG_BACKEND; ++ trace_msg->backend.gpu.flags |= KBASE_KTRACE_FLAG_BACKEND; + + /* Fill the CSF-specific parts of the message + * @@ -176880,30 +202180,69 @@ index 000000000000..2ea901b666c2 + */ + + if (queue) { -+ trace_msg->backend.flags |= KBASE_KTRACE_FLAG_CSF_QUEUE; -+ trace_msg->backend.csi_index = queue->csi_index; ++ trace_msg->backend.gpu.flags |= KBASE_KTRACE_FLAG_CSF_QUEUE; ++ trace_msg->backend.gpu.csi_index = queue->csi_index; + } + + if (group) { + const s8 slot = group->csg_nr; + -+ trace_msg->backend.flags |= KBASE_KTRACE_FLAG_CSF_GROUP; ++ trace_msg->backend.gpu.flags |= KBASE_KTRACE_FLAG_CSF_GROUP; + -+ trace_msg->backend.csg_nr = slot; ++ trace_msg->backend.gpu.csg_nr = slot; + + if (slot >= 0) { -+ struct kbase_csf_csg_slot *csg_slot = &kbdev->csf.scheduler.csg_slots[slot]; ++ struct kbase_csf_csg_slot *csg_slot = ++ &kbdev->csf.scheduler.csg_slots[slot]; + -+ trace_msg->backend.slot_prio = csg_slot->priority; ++ trace_msg->backend.gpu.slot_prio = ++ csg_slot->priority; + } + /* slot >=0 indicates whether slot_prio valid, so no need to + * initialize in the case where it's invalid + */ + -+ trace_msg->backend.group_handle = group->handle; ++ trace_msg->backend.gpu.group_handle = group->handle; + } + -+ WARN_ON((trace_msg->backend.flags & ~KBASE_KTRACE_FLAG_ALL)); ++ WARN_ON((trace_msg->backend.gpu.flags & ~KBASE_KTRACE_FLAG_ALL)); ++ ++ /* Done */ ++ spin_unlock_irqrestore(&kbdev->ktrace.lock, irqflags); ++} ++ ++void kbasep_ktrace_add_csf_kcpu(struct kbase_device *kbdev, ++ enum kbase_ktrace_code code, ++ struct kbase_kcpu_command_queue *queue, ++ u64 info_val1, u64 info_val2) ++{ ++ unsigned long irqflags; ++ struct kbase_ktrace_msg *trace_msg; ++ struct kbase_context *kctx = queue->kctx; ++ ++ if (unlikely(!kbasep_ktrace_initialized(&kbdev->ktrace))) ++ return; ++ ++ spin_lock_irqsave(&kbdev->ktrace.lock, irqflags); ++ ++ /* Reserve and update indices */ ++ trace_msg = kbasep_ktrace_reserve(&kbdev->ktrace); ++ ++ /* Fill the common part of the message */ ++ kbasep_ktrace_msg_init(&kbdev->ktrace, trace_msg, code, kctx, 0, ++ info_val1); ++ ++ /* Indicate to the common code that backend-specific parts will be ++ * valid ++ */ ++ trace_msg->backend.gpu.flags |= KBASE_KTRACE_FLAG_BACKEND; ++ ++ /* Fill the KCPU-specific parts of the message */ ++ trace_msg->backend.kcpu.id = queue->id; ++ trace_msg->backend.kcpu.extra_info_val = info_val2; ++ trace_msg->backend.gpu.flags |= KBASE_KTRACE_FLAG_CSF_KCPU; ++ ++ WARN_ON((trace_msg->backend.gpu.flags & ~KBASE_KTRACE_FLAG_ALL)); + + /* Done */ + spin_unlock_irqrestore(&kbdev->ktrace.lock, irqflags); @@ -176912,18 +202251,19 @@ index 000000000000..2ea901b666c2 +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h new file mode 100755 -index 000000000000..b055ff82a116 +index 000000000..e3d037307 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h -@@ -0,0 +1,148 @@ +@@ -0,0 +1,203 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -176934,8 +202274,6 @@ index 000000000000..b055ff82a116 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_DEBUG_KTRACE_CSF_H_ @@ -176946,8 +202284,7 @@ index 000000000000..b055ff82a116 + */ +#if KBASE_KTRACE_TARGET_RBUF +/** -+ * kbasep_ktrace_add_csf - internal function to add trace about Command Stream -+ * Frontend ++ * kbasep_ktrace_add_csf - internal function to add trace about CSF + * @kbdev: kbase device + * @code: trace code + * @group: queue group, or NULL if no queue group @@ -176963,9 +202300,33 @@ index 000000000000..b055ff82a116 + struct kbase_queue *queue, kbase_ktrace_flag_t flags, + u64 info_val); + ++/** ++ * kbasep_ktrace_add_csf_kcpu - internal function to add trace about the CSF ++ * KCPU queues. ++ * @kbdev: kbase device ++ * @code: trace code ++ * @queue: queue, or NULL if no queue ++ * @info_val1: Main infoval variable with information based on the KCPU ++ * ktrace call. Refer to mali_kbase_debug_ktrace_codes_csf.h ++ * for information on the infoval values. ++ * @info_val2: Extra infoval variable with information based on the KCPU ++ * ktrace call. Refer to mali_kbase_debug_ktrace_codes_csf.h ++ * for information on the infoval values. ++ * ++ * PRIVATE: do not use directly. Use KBASE_KTRACE_ADD_CSF_KCPU() instead. ++ */ ++void kbasep_ktrace_add_csf_kcpu(struct kbase_device *kbdev, ++ enum kbase_ktrace_code code, ++ struct kbase_kcpu_command_queue *queue, ++ u64 info_val1, u64 info_val2); ++ +#define KBASE_KTRACE_RBUF_ADD_CSF(kbdev, code, group, queue, flags, info_val) \ + kbasep_ktrace_add_csf(kbdev, KBASE_KTRACE_CODE(code), group, queue, \ -+ flags, info_val) ++ flags, info_val) ++ ++#define KBASE_KTRACE_RBUF_ADD_CSF_KCPU(kbdev, code, queue, info_val1, \ ++ info_val2) kbasep_ktrace_add_csf_kcpu(kbdev, KBASE_KTRACE_CODE(code), \ ++ queue, info_val1, info_val2) + +#else /* KBASE_KTRACE_TARGET_RBUF */ + @@ -176974,12 +202335,21 @@ index 000000000000..b055ff82a116 + CSTD_UNUSED(kbdev);\ + CSTD_NOP(code);\ + CSTD_UNUSED(group);\ -+ CSTD_UNUSED(queue); \ ++ CSTD_UNUSED(queue);\ + CSTD_UNUSED(flags);\ + CSTD_UNUSED(info_val);\ + CSTD_NOP(0);\ + } while (0) + ++#define KBASE_KTRACE_RBUF_ADD_CSF_KCPU(kbdev, code, queue, info_val1, info_val2) \ ++ do {\ ++ CSTD_UNUSED(kbdev);\ ++ CSTD_NOP(code);\ ++ CSTD_UNUSED(queue);\ ++ CSTD_UNUSED(info_val1);\ ++ CSTD_UNUSED(info_val2);\ ++ } while (0) ++ +#endif /* KBASE_KTRACE_TARGET_RBUF */ + +/* @@ -176993,6 +202363,9 @@ index 000000000000..b055ff82a116 +#define KBASE_KTRACE_FTRACE_ADD_CSF(kbdev, code, group, queue, info_val) \ + trace_mali_##code(kbdev, group, queue, info_val) + ++#define KBASE_KTRACE_FTRACE_ADD_KCPU(code, queue, info_val1, info_val2) \ ++ trace_mali_##code(queue, info_val1, info_val2) ++ +#else /* KBASE_KTRACE_TARGET_FTRACE */ + +#define KBASE_KTRACE_FTRACE_ADD_CSF(kbdev, code, group, queue, info_val) \ @@ -177005,6 +202378,14 @@ index 000000000000..b055ff82a116 + CSTD_NOP(0);\ + } while (0) + ++#define KBASE_KTRACE_FTRACE_ADD_KCPU(code, queue, info_val1, info_val2) \ ++ do {\ ++ CSTD_NOP(code);\ ++ CSTD_UNUSED(queue);\ ++ CSTD_UNUSED(info_val1);\ ++ CSTD_UNUSED(info_val2);\ ++ } while (0) ++ +#endif /* KBASE_KTRACE_TARGET_FTRACE */ + +/* @@ -177027,7 +202408,7 @@ index 000000000000..b055ff82a116 + */ +#define KBASE_KTRACE_ADD_CSF_GRP(kbdev, code, group, info_val) \ + do { \ -+ /* capture values that could come from non-pure function calls */ \ ++ /* capture values that could come from non-pure fn calls */ \ + struct kbase_queue_group *__group = group; \ + u64 __info_val = info_val; \ + KBASE_KTRACE_RBUF_ADD_CSF(kbdev, code, __group, NULL, 0u, \ @@ -177053,7 +202434,7 @@ index 000000000000..b055ff82a116 + */ +#define KBASE_KTRACE_ADD_CSF_GRP_Q(kbdev, code, group, queue, info_val) \ + do { \ -+ /* capture values that could come from non-pure function calls */ \ ++ /* capture values that could come from non-pure fn calls */ \ + struct kbase_queue_group *__group = group; \ + struct kbase_queue *__queue = queue; \ + u64 __info_val = info_val; \ @@ -177063,21 +202444,35 @@ index 000000000000..b055ff82a116 + __queue, __info_val); \ + } while (0) + ++ ++#define KBASE_KTRACE_ADD_CSF_KCPU(kbdev, code, queue, info_val1, info_val2) \ ++ do { \ ++ /* capture values that could come from non-pure fn calls */ \ ++ struct kbase_kcpu_command_queue *__queue = queue; \ ++ u64 __info_val1 = info_val1; \ ++ u64 __info_val2 = info_val2; \ ++ KBASE_KTRACE_RBUF_ADD_CSF_KCPU(kbdev, code, __queue, \ ++ __info_val1, __info_val2); \ ++ KBASE_KTRACE_FTRACE_ADD_KCPU(code, __queue, \ ++ __info_val1, __info_val2); \ ++ } while (0) ++ +#endif /* _KBASE_DEBUG_KTRACE_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h new file mode 100755 -index 000000000000..f265fe9a9753 +index 000000000..1896e10ed --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h -@@ -0,0 +1,85 @@ +@@ -0,0 +1,116 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -177088,8 +202483,6 @@ index 000000000000..f265fe9a9753 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_DEBUG_KTRACE_DEFS_CSF_H_ @@ -177110,9 +202503,20 @@ index 000000000000..f265fe9a9753 + * ftrace backend now outputs kctx field (as %d_%u format). + * + * Add fields group, slot, prio, csi into backend-specific part. ++ * ++ * 1.2: ++ * There is a new class of KCPU traces; with this, a new KCPU column in the ++ * ringbuffer RBUF (mali_trace) between csi and info_val, which is empty ++ * for non-kcpu related traces, and usually displays the KCPU Queue ID and ++ * an extra information value. ftrace also displays these KCPU traces. ++ * ++ * 1.3: ++ * Add a lot of extra new traces. Tweak some existing scheduler related traces ++ * to contain extra information information/happen at slightly different times. ++ * SCHEDULER_PROTM_EXIT now has group information + */ +#define KBASE_KTRACE_VERSION_MAJOR 1 -+#define KBASE_KTRACE_VERSION_MINOR 1 ++#define KBASE_KTRACE_VERSION_MINOR 3 + +/* indicates if the trace message has valid queue-group related info. */ +#define KBASE_KTRACE_FLAG_CSF_GROUP (((kbase_ktrace_flag_t)1) << 0) @@ -177120,55 +202524,77 @@ index 000000000000..f265fe9a9753 +/* indicates if the trace message has valid queue related info. */ +#define KBASE_KTRACE_FLAG_CSF_QUEUE (((kbase_ktrace_flag_t)1) << 1) + ++/* indicates if the trace message has valid KCPU-queue related info. */ ++#define KBASE_KTRACE_FLAG_CSF_KCPU (((kbase_ktrace_flag_t)1) << 2) ++ +/* Collect all the flags together for debug checking */ +#define KBASE_KTRACE_FLAG_BACKEND_ALL \ -+ (KBASE_KTRACE_FLAG_CSF_GROUP | KBASE_KTRACE_FLAG_CSF_QUEUE) -+ -+ -+/** -+ * struct kbase_ktrace_backend - backend specific part of a trace message -+ * -+ * @code: Identifies the event, refer to enum kbase_ktrace_code. -+ * @flags: indicates information about the trace message itself. Used -+ * during dumping of the message. -+ * @group_handle: Handle identifying the associated queue group. Only valid -+ * when @flags contains KBASE_KTRACE_FLAG_CSF_GROUP. -+ * @csg_nr: Number/index of the associated queue group's command stream -+ * group to which it is mapped, or negative if none associated. -+ * Only valid when @flags contains KBASE_KTRACE_FLAG_CSF_GROUP. -+ * @slot_prio: The priority of the slot for the associated group, if it was -+ * scheduled. Hence, only valid when @csg_nr >=0 and @flags -+ * contains KBASE_KTRACE_FLAG_CSF_GROUP. -+ * @csi_index: ID of the associated queue's Command Stream HW interface. -+ * Only valid when @flags contains KBASE_KTRACE_FLAG_CSF_QUEUE. -+ */ -+struct kbase_ktrace_backend { ++ (KBASE_KTRACE_FLAG_CSF_GROUP | KBASE_KTRACE_FLAG_CSF_QUEUE | \ ++ KBASE_KTRACE_FLAG_CSF_KCPU) ++ ++/** ++ * union kbase_ktrace_backend - backend specific part of a trace message ++ * @kcpu: kcpu union member ++ * @kcpu.code: Identifies the event, refer to enum kbase_ktrace_code. ++ * @kcpu.flags: indicates information about the trace message itself. Used ++ * during dumping of the message. ++ * @kcpu.id: ID of the KCPU queue. ++ * @kcpu.extra_info_val: value specific to the type of KCPU event being traced. ++ * Refer to the KPU specific code in enum kbase_ktrace_code in ++ * mali_kbase_debug_ktrace_codes_csf.h ++ * @gpu: gpu union member ++ * @gpu.code: Identifies the event, refer to enum kbase_ktrace_code. ++ * @gpu.flags: indicates information about the trace message itself. Used ++ * during dumping of the message. ++ * @gpu.group_handle: Handle identifying the associated queue group. Only valid ++ * when @flags contains KBASE_KTRACE_FLAG_CSF_GROUP. ++ * @gpu.csg_nr: Number/index of the associated queue group's CS group to ++ * which it is mapped, or negative if none associated. Only ++ * valid when @flags contains KBASE_KTRACE_FLAG_CSF_GROUP. ++ * @gpu.slot_prio: The priority of the slot for the associated group, if it ++ * was scheduled. Hence, only valid when @csg_nr >=0 and ++ * @flags contains KBASE_KTRACE_FLAG_CSF_GROUP. ++ * @gpu.csi_index: ID of the associated queue's CS HW interface. ++ * Only valid when @flags contains KBASE_KTRACE_FLAG_CSF_QUEUE. ++ */ ++ ++union kbase_ktrace_backend { + /* Place 64 and 32-bit members together */ + /* Pack smaller members together */ -+ kbase_ktrace_code_t code; -+ kbase_ktrace_flag_t flags; -+ u8 group_handle; -+ s8 csg_nr; -+ u8 slot_prio; -+ s8 csi_index; ++ struct { ++ kbase_ktrace_code_t code; ++ kbase_ktrace_flag_t flags; ++ u8 id; ++ u64 extra_info_val; ++ } kcpu; ++ ++ struct { ++ kbase_ktrace_code_t code; ++ kbase_ktrace_flag_t flags; ++ u8 group_handle; ++ s8 csg_nr; ++ u8 slot_prio; ++ s8 csi_index; ++ } gpu; +}; + +#endif /* KBASE_KTRACE_TARGET_RBUF */ +#endif /* _KBASE_DEBUG_KTRACE_DEFS_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h new file mode 100755 -index 000000000000..ea8e01a87f3f +index 000000000..efa8ab05b --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h -@@ -0,0 +1,102 @@ +@@ -0,0 +1,112 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -177179,8 +202605,6 @@ index 000000000000..ea8e01a87f3f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_DEBUG_KTRACE_DEFS_JM_H_ @@ -177209,9 +202633,12 @@ index 000000000000..ea8e01a87f3f + * + * ftrace backend now outputs kctx field (as %d_%u format). + * ++ * 2.2: ++ * Add tracing codes for pulling, unpulling, and returns atoms to JS for ++ * diagnosing soft-stop path and preemption problems + */ +#define KBASE_KTRACE_VERSION_MAJOR 2 -+#define KBASE_KTRACE_VERSION_MINOR 1 ++#define KBASE_KTRACE_VERSION_MINOR 2 +#endif /* KBASE_KTRACE_TARGET_RBUF */ + +/* @@ -177234,49 +202661,58 @@ index 000000000000..ea8e01a87f3f + | KBASE_KTRACE_FLAG_JM_ATOM) + +/** -+ * struct kbase_ktrace_backend - backend specific part of a trace message -+ * -+ * @atom_udata: Copy of the user data sent for the atom in base_jd_submit. -+ * Only valid if KBASE_KTRACE_FLAG_JM_ATOM is set in @flags -+ * @gpu_addr: GPU address, usually of the job-chain represented by an atom. -+ * @atom_number: id of the atom for which trace message was added. Only valid -+ * if KBASE_KTRACE_FLAG_JM_ATOM is set in @flags -+ * @code: Identifies the event, refer to enum kbase_ktrace_code. -+ * @flags: indicates information about the trace message itself. Used -+ * during dumping of the message. -+ * @jobslot: job-slot for which trace message was added, valid only for -+ * job-slot management events. -+ * @refcount: reference count for the context, valid for certain events -+ * related to scheduler core and policy. -+ */ -+struct kbase_ktrace_backend { -+ /* Place 64 and 32-bit members together */ -+ u64 atom_udata[2]; /* Only valid for KBASE_KTRACE_FLAG_JM_ATOM */ -+ u64 gpu_addr; -+ int atom_number; /* Only valid for KBASE_KTRACE_FLAG_JM_ATOM */ -+ /* Pack smaller members together */ -+ kbase_ktrace_code_t code; -+ kbase_ktrace_flag_t flags; -+ u8 jobslot; -+ u8 refcount; ++ * union kbase_ktrace_backend - backend specific part of a trace message ++ * Contains only a struct but is a union such that it is compatible with ++ * generic JM and CSF KTrace calls. ++ * ++ * @gpu: gpu union member ++ * @gpu.atom_udata: Copy of the user data sent for the atom in base_jd_submit. ++ * Only valid if KBASE_KTRACE_FLAG_JM_ATOM is set in @flags ++ * @gpu.gpu_addr: GPU address, usually of the job-chain represented by an ++ * atom. ++ * @gpu.atom_number: id of the atom for which trace message was added. Only ++ * valid if KBASE_KTRACE_FLAG_JM_ATOM is set in @flags ++ * @gpu.code: Identifies the event, refer to enum kbase_ktrace_code. ++ * @gpu.flags: indicates information about the trace message itself. Used ++ * during dumping of the message. ++ * @gpu.jobslot: job-slot for which trace message was added, valid only for ++ * job-slot management events. ++ * @gpu.refcount: reference count for the context, valid for certain events ++ * related to scheduler core and policy. ++ */ ++union kbase_ktrace_backend { ++ struct { ++ /* Place 64 and 32-bit members together */ ++ u64 atom_udata[2]; /* Only valid for ++ * KBASE_KTRACE_FLAG_JM_ATOM ++ */ ++ u64 gpu_addr; ++ int atom_number; /* Only valid for KBASE_KTRACE_FLAG_JM_ATOM */ ++ /* Pack smaller members together */ ++ kbase_ktrace_code_t code; ++ kbase_ktrace_flag_t flags; ++ u8 jobslot; ++ u8 refcount; ++ } gpu; +}; +#endif /* KBASE_KTRACE_TARGET_RBUF */ + +#endif /* _KBASE_DEBUG_KTRACE_DEFS_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c new file mode 100755 -index 000000000000..1b821281f09f +index 000000000..6597a15e5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c -@@ -0,0 +1,115 @@ +@@ -0,0 +1,121 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -177287,9 +202723,8 @@ index 000000000000..1b821281f09f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ ++ +#include +#include "debug/mali_kbase_debug_ktrace_internal.h" +#include "debug/backend/mali_kbase_debug_ktrace_jm.h" @@ -177306,78 +202741,84 @@ index 000000000000..1b821281f09f + char *buffer, int sz, s32 *written) +{ + /* katom */ -+ if (trace_msg->backend.flags & KBASE_KTRACE_FLAG_JM_ATOM) ++ if (trace_msg->backend.gpu.flags & KBASE_KTRACE_FLAG_JM_ATOM) + *written += MAX(snprintf(buffer + *written, + MAX(sz - *written, 0), + "atom %d (ud: 0x%llx 0x%llx)", -+ trace_msg->backend.atom_number, -+ trace_msg->backend.atom_udata[0], -+ trace_msg->backend.atom_udata[1]), 0); ++ trace_msg->backend.gpu.atom_number, ++ trace_msg->backend.gpu.atom_udata[0], ++ trace_msg->backend.gpu.atom_udata[1]), 0); + + /* gpu_addr */ -+ if (trace_msg->backend.flags & KBASE_KTRACE_FLAG_BACKEND) ++ if (trace_msg->backend.gpu.flags & KBASE_KTRACE_FLAG_BACKEND) + *written += MAX(snprintf(buffer + *written, + MAX(sz - *written, 0), -+ ",%.8llx,", trace_msg->backend.gpu_addr), 0); ++ ",%.8llx,", trace_msg->backend.gpu.gpu_addr), ++ 0); + else + *written += MAX(snprintf(buffer + *written, + MAX(sz - *written, 0), + ",,"), 0); + + /* jobslot */ -+ if (trace_msg->backend.flags & KBASE_KTRACE_FLAG_JM_JOBSLOT) ++ if (trace_msg->backend.gpu.flags & KBASE_KTRACE_FLAG_JM_JOBSLOT) + *written += MAX(snprintf(buffer + *written, + MAX(sz - *written, 0), -+ "%d", trace_msg->backend.jobslot), 0); ++ "%d", trace_msg->backend.gpu.jobslot), 0); + + *written += MAX(snprintf(buffer + *written, MAX(sz - *written, 0), + ","), 0); + + /* refcount */ -+ if (trace_msg->backend.flags & KBASE_KTRACE_FLAG_JM_REFCOUNT) ++ if (trace_msg->backend.gpu.flags & KBASE_KTRACE_FLAG_JM_REFCOUNT) + *written += MAX(snprintf(buffer + *written, + MAX(sz - *written, 0), -+ "%d", trace_msg->backend.refcount), 0); ++ "%d", trace_msg->backend.gpu.refcount), 0); +} + +void kbasep_ktrace_add_jm(struct kbase_device *kbdev, -+ enum kbase_ktrace_code code, struct kbase_context *kctx, -+ struct kbase_jd_atom *katom, u64 gpu_addr, -+ kbase_ktrace_flag_t flags, int refcount, int jobslot, -+ u64 info_val) ++ enum kbase_ktrace_code code, ++ struct kbase_context *kctx, ++ const struct kbase_jd_atom *katom, u64 gpu_addr, ++ kbase_ktrace_flag_t flags, int refcount, int jobslot, ++ u64 info_val) +{ + unsigned long irqflags; + struct kbase_ktrace_msg *trace_msg; + ++ if (unlikely(!kbasep_ktrace_initialized(&kbdev->ktrace))) ++ return; ++ + spin_lock_irqsave(&kbdev->ktrace.lock, irqflags); + + /* Reserve and update indices */ + trace_msg = kbasep_ktrace_reserve(&kbdev->ktrace); + -+ /* Fill the common part of the message (including backend.flags) */ ++ /* Fill the common part of the message (including backend.gpu.flags) */ + kbasep_ktrace_msg_init(&kbdev->ktrace, trace_msg, code, kctx, flags, + info_val); + + /* Indicate to the common code that backend-specific parts will be + * valid + */ -+ trace_msg->backend.flags |= KBASE_KTRACE_FLAG_BACKEND; ++ trace_msg->backend.gpu.flags |= KBASE_KTRACE_FLAG_BACKEND; + + /* Fill the JM-specific parts of the message */ + if (katom) { -+ trace_msg->backend.flags |= KBASE_KTRACE_FLAG_JM_ATOM; ++ trace_msg->backend.gpu.flags |= KBASE_KTRACE_FLAG_JM_ATOM; + -+ trace_msg->backend.atom_number = kbase_jd_atom_id(katom->kctx, katom); -+ trace_msg->backend.atom_udata[0] = katom->udata.blob[0]; -+ trace_msg->backend.atom_udata[1] = katom->udata.blob[1]; ++ trace_msg->backend.gpu.atom_number = ++ kbase_jd_atom_id(katom->kctx, katom); ++ trace_msg->backend.gpu.atom_udata[0] = katom->udata.blob[0]; ++ trace_msg->backend.gpu.atom_udata[1] = katom->udata.blob[1]; + } + -+ trace_msg->backend.gpu_addr = gpu_addr; -+ trace_msg->backend.jobslot = jobslot; ++ trace_msg->backend.gpu.gpu_addr = gpu_addr; ++ trace_msg->backend.gpu.jobslot = jobslot; + /* Clamp refcount */ -+ trace_msg->backend.refcount = MIN((unsigned int)refcount, 0xFF); ++ trace_msg->backend.gpu.refcount = MIN((unsigned int)refcount, 0xFF); + -+ WARN_ON((trace_msg->backend.flags & ~KBASE_KTRACE_FLAG_ALL)); ++ WARN_ON((trace_msg->backend.gpu.flags & ~KBASE_KTRACE_FLAG_ALL)); + + /* Done */ + spin_unlock_irqrestore(&kbdev->ktrace.lock, irqflags); @@ -177386,18 +202827,19 @@ index 000000000000..1b821281f09f +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h new file mode 100755 -index 000000000000..adfcb1aa556e +index 000000000..41be7a120 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h @@ -0,0 +1,309 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -177408,8 +202850,6 @@ index 000000000000..adfcb1aa556e + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_DEBUG_KTRACE_JM_H_ @@ -177434,10 +202874,11 @@ index 000000000000..adfcb1aa556e + * PRIVATE: do not use directly. Use KBASE_KTRACE_ADD_JM() instead. + */ +void kbasep_ktrace_add_jm(struct kbase_device *kbdev, -+ enum kbase_ktrace_code code, struct kbase_context *kctx, -+ struct kbase_jd_atom *katom, u64 gpu_addr, -+ kbase_ktrace_flag_t flags, int refcount, int jobslot, -+ u64 info_val); ++ enum kbase_ktrace_code code, ++ struct kbase_context *kctx, ++ const struct kbase_jd_atom *katom, u64 gpu_addr, ++ kbase_ktrace_flag_t flags, int refcount, int jobslot, ++ u64 info_val); + +#define KBASE_KTRACE_RBUF_ADD_JM(kbdev, code, kctx, katom, gpu_addr, flags, \ + refcount, jobslot, info_val) \ @@ -177701,18 +203142,19 @@ index 000000000000..adfcb1aa556e +#endif /* _KBASE_DEBUG_KTRACE_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h new file mode 100755 -index 000000000000..d103e5766456 +index 000000000..ddcac906c --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h -@@ -0,0 +1,147 @@ +@@ -0,0 +1,267 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -177723,8 +203165,6 @@ index 000000000000..d103e5766456 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -177738,14 +203178,48 @@ index 000000000000..d103e5766456 +/* + * Generic CSF events - using the common DEFINE_MALI_ADD_EVENT + */ -+DEFINE_MALI_ADD_EVENT(EVICT_CTX_SLOTS); -+DEFINE_MALI_ADD_EVENT(FIRMWARE_BOOT); -+DEFINE_MALI_ADD_EVENT(FIRMWARE_REBOOT); -+DEFINE_MALI_ADD_EVENT(SCHEDULER_TOCK); -+DEFINE_MALI_ADD_EVENT(SCHEDULER_TICK); -+DEFINE_MALI_ADD_EVENT(SCHEDULER_RESET); -+DEFINE_MALI_ADD_EVENT(SCHEDULER_EXIT_PROTM); -+DEFINE_MALI_ADD_EVENT(SYNC_UPDATE_EVENT); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_EVICT_CTX_SLOTS_START); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_EVICT_CTX_SLOTS_END); ++DEFINE_MALI_ADD_EVENT(CSF_FIRMWARE_BOOT); ++DEFINE_MALI_ADD_EVENT(CSF_FIRMWARE_REBOOT); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_TOCK_INVOKE); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_TICK_INVOKE); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_TOCK_START); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_TOCK_END); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_TICK_START); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_TICK_END); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_RESET_START); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_RESET_END); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_PROTM_WAIT_QUIT_START); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_PROTM_WAIT_QUIT_END); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_GROUP_SYNC_UPDATE_EVENT); ++DEFINE_MALI_ADD_EVENT(CSF_SYNC_UPDATE_NOTIFY_GPU_EVENT); ++DEFINE_MALI_ADD_EVENT(CSF_INTERRUPT_START); ++DEFINE_MALI_ADD_EVENT(CSF_INTERRUPT_END); ++DEFINE_MALI_ADD_EVENT(CSF_INTERRUPT_GLB_REQ_ACK); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_GPU_IDLE_EVENT_CAN_SUSPEND); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_TICK_ADVANCE); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_TICK_NOADVANCE); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_RUNNABLE_KCTX_INSERT); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_RUNNABLE_KCTX_REMOVE); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_RUNNABLE_KCTX_ROTATE); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_RUNNABLE_KCTX_HEAD); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_GPU_IDLE_WORKER_START); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_GPU_IDLE_WORKER_END); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_GROUP_SYNC_UPDATE_WORKER_START); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_GROUP_SYNC_UPDATE_WORKER_END); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_UPDATE_IDLE_SLOTS_ACK); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_GPU_IDLE_WORKER_HANDLING_START); ++DEFINE_MALI_ADD_EVENT(SCHEDULER_GPU_IDLE_WORKER_HANDLING_END); ++DEFINE_MALI_ADD_EVENT(CSF_FIRMWARE_MCU_HALTED); ++DEFINE_MALI_ADD_EVENT(CSF_FIRMWARE_MCU_SLEEP); ++DEFINE_MALI_ADD_EVENT(SCHED_BUSY); ++DEFINE_MALI_ADD_EVENT(SCHED_INACTIVE); ++DEFINE_MALI_ADD_EVENT(SCHED_SUSPENDED); ++DEFINE_MALI_ADD_EVENT(SCHED_SLEEPING); ++#define KBASEP_MCU_STATE(n) DEFINE_MALI_ADD_EVENT(PM_MCU_ ## n); ++#include "backend/gpu/mali_kbase_pm_mcu_states.h" ++#undef KBASEP_MCU_STATE + +DECLARE_EVENT_CLASS(mali_csf_grp_q_template, + TP_PROTO(struct kbase_device *kbdev, struct kbase_queue_group *group, @@ -177815,20 +203289,50 @@ index 000000000000..d103e5766456 + __entry->kctx_tgid, __entry->kctx_id, __entry->group_handle, \ + __entry->csg_nr, __entry->slot_prio, __entry->info_val)) + -+DEFINE_MALI_CSF_GRP_EVENT(CSG_SLOT_START); -+DEFINE_MALI_CSF_GRP_EVENT(CSG_SLOT_STOP); -+DEFINE_MALI_CSF_GRP_EVENT(CSG_SLOT_STARTED); ++DEFINE_MALI_CSF_GRP_EVENT(CSG_SLOT_START_REQ); ++DEFINE_MALI_CSF_GRP_EVENT(CSG_SLOT_STOP_REQ); ++DEFINE_MALI_CSF_GRP_EVENT(CSG_SLOT_RUNNING); +DEFINE_MALI_CSF_GRP_EVENT(CSG_SLOT_STOPPED); +DEFINE_MALI_CSF_GRP_EVENT(CSG_SLOT_CLEANED); -+DEFINE_MALI_CSF_GRP_EVENT(CSG_PRIO_UPDATE); -+DEFINE_MALI_CSF_GRP_EVENT(CSG_SYNC_UPDATE_INTERRUPT); -+DEFINE_MALI_CSF_GRP_EVENT(CSG_IDLE_INTERRUPT); ++DEFINE_MALI_CSF_GRP_EVENT(CSG_UPDATE_IDLE_SLOT_REQ); ++DEFINE_MALI_CSF_GRP_EVENT(CSG_SLOT_IDLE_SET); ++DEFINE_MALI_CSF_GRP_EVENT(CSG_INTERRUPT_NO_NON_IDLE_GROUPS); ++DEFINE_MALI_CSF_GRP_EVENT(CSG_INTERRUPT_NON_IDLE_GROUPS); ++DEFINE_MALI_CSF_GRP_EVENT(CSG_SLOT_IDLE_CLEAR); ++DEFINE_MALI_CSF_GRP_EVENT(CSG_SLOT_PRIO_UPDATE); ++DEFINE_MALI_CSF_GRP_EVENT(CSG_INTERRUPT_SYNC_UPDATE); ++DEFINE_MALI_CSF_GRP_EVENT(CSG_INTERRUPT_IDLE); ++DEFINE_MALI_CSF_GRP_EVENT(CSG_INTERRUPT_PROGRESS_TIMER_EVENT); ++DEFINE_MALI_CSF_GRP_EVENT(CSG_INTERRUPT_PROCESS_START); ++DEFINE_MALI_CSF_GRP_EVENT(CSG_INTERRUPT_PROCESS_END); +DEFINE_MALI_CSF_GRP_EVENT(GROUP_SYNC_UPDATE_DONE); +DEFINE_MALI_CSF_GRP_EVENT(GROUP_DESCHEDULE); +DEFINE_MALI_CSF_GRP_EVENT(GROUP_SCHEDULE); -+DEFINE_MALI_CSF_GRP_EVENT(GROUP_EVICT_SCHED); -+DEFINE_MALI_CSF_GRP_EVENT(SCHEDULER_ENTER_PROTM); ++DEFINE_MALI_CSF_GRP_EVENT(GROUP_EVICT); ++DEFINE_MALI_CSF_GRP_EVENT(GROUP_RUNNABLE_INSERT); ++DEFINE_MALI_CSF_GRP_EVENT(GROUP_RUNNABLE_REMOVE); ++DEFINE_MALI_CSF_GRP_EVENT(GROUP_RUNNABLE_ROTATE); ++DEFINE_MALI_CSF_GRP_EVENT(GROUP_RUNNABLE_HEAD); ++DEFINE_MALI_CSF_GRP_EVENT(GROUP_IDLE_WAIT_INSERT); ++DEFINE_MALI_CSF_GRP_EVENT(GROUP_IDLE_WAIT_REMOVE); ++DEFINE_MALI_CSF_GRP_EVENT(GROUP_IDLE_WAIT_HEAD); ++DEFINE_MALI_CSF_GRP_EVENT(SCHEDULER_PROTM_ENTER_CHECK); ++DEFINE_MALI_CSF_GRP_EVENT(SCHEDULER_PROTM_ENTER); ++DEFINE_MALI_CSF_GRP_EVENT(SCHEDULER_PROTM_EXIT); +DEFINE_MALI_CSF_GRP_EVENT(SCHEDULER_TOP_GRP); ++DEFINE_MALI_CSF_GRP_EVENT(SCHEDULER_NONIDLE_OFFSLOT_GRP_INC); ++DEFINE_MALI_CSF_GRP_EVENT(SCHEDULER_NONIDLE_OFFSLOT_GRP_DEC); ++DEFINE_MALI_CSF_GRP_EVENT(SCHEDULER_HANDLE_IDLE_SLOTS); ++DEFINE_MALI_CSF_GRP_EVENT(PROTM_EVENT_WORKER_START); ++DEFINE_MALI_CSF_GRP_EVENT(PROTM_EVENT_WORKER_END); ++DEFINE_MALI_CSF_GRP_EVENT(CSF_GROUP_INACTIVE); ++DEFINE_MALI_CSF_GRP_EVENT(CSF_GROUP_RUNNABLE); ++DEFINE_MALI_CSF_GRP_EVENT(CSF_GROUP_IDLE); ++DEFINE_MALI_CSF_GRP_EVENT(CSF_GROUP_SUSPENDED); ++DEFINE_MALI_CSF_GRP_EVENT(CSF_GROUP_SUSPENDED_ON_IDLE); ++DEFINE_MALI_CSF_GRP_EVENT(CSF_GROUP_SUSPENDED_ON_WAIT_SYNC); ++DEFINE_MALI_CSF_GRP_EVENT(CSF_GROUP_FAULT_EVICTED); ++DEFINE_MALI_CSF_GRP_EVENT(CSF_GROUP_TERMINATED); + +#undef DEFINE_MALI_CSF_GRP_EVENT + @@ -177843,29 +203347,87 @@ index 000000000000..d103e5766456 + +DEFINE_MALI_CSF_GRP_Q_EVENT(CSI_START); +DEFINE_MALI_CSF_GRP_Q_EVENT(CSI_STOP); -+DEFINE_MALI_CSF_GRP_Q_EVENT(CSI_STOP_REQUESTED); -+DEFINE_MALI_CSF_GRP_Q_EVENT(CSI_FAULT_INTERRUPT); -+DEFINE_MALI_CSF_GRP_Q_EVENT(CSI_TILER_OOM_INTERRUPT); ++DEFINE_MALI_CSF_GRP_Q_EVENT(CSI_STOP_REQ); ++DEFINE_MALI_CSF_GRP_Q_EVENT(CSI_INTERRUPT_GROUP_SUSPENDS_IGNORED); ++DEFINE_MALI_CSF_GRP_Q_EVENT(CSI_INTERRUPT_FAULT); ++DEFINE_MALI_CSF_GRP_Q_EVENT(CSI_INTERRUPT_TILER_OOM); ++DEFINE_MALI_CSF_GRP_Q_EVENT(CSI_INTERRUPT_PROTM_PEND); ++DEFINE_MALI_CSF_GRP_Q_EVENT(CSI_PROTM_ACK); +DEFINE_MALI_CSF_GRP_Q_EVENT(QUEUE_START); +DEFINE_MALI_CSF_GRP_Q_EVENT(QUEUE_STOP); ++DEFINE_MALI_CSF_GRP_Q_EVENT(QUEUE_SYNC_UPDATE_EVAL_START); ++DEFINE_MALI_CSF_GRP_Q_EVENT(QUEUE_SYNC_UPDATE_EVAL_END); ++DEFINE_MALI_CSF_GRP_Q_EVENT(QUEUE_SYNC_UPDATE_WAIT_STATUS); ++DEFINE_MALI_CSF_GRP_Q_EVENT(QUEUE_SYNC_UPDATE_CUR_VAL); ++DEFINE_MALI_CSF_GRP_Q_EVENT(QUEUE_SYNC_UPDATE_TEST_VAL); ++DEFINE_MALI_CSF_GRP_Q_EVENT(QUEUE_SYNC_UPDATE_BLOCKED_REASON); ++DEFINE_MALI_CSF_GRP_Q_EVENT(CSI_PROTM_PEND_SET); ++DEFINE_MALI_CSF_GRP_Q_EVENT(CSI_PROTM_PEND_CLEAR); + +#undef DEFINE_MALI_CSF_GRP_Q_EVENT + ++/* ++ * KCPU queue events ++ */ ++DECLARE_EVENT_CLASS(mali_csf_kcpu_queue_template, ++ TP_PROTO(struct kbase_kcpu_command_queue *queue, ++ u64 info_val1, u64 info_val2), ++ TP_ARGS(queue, info_val1, info_val2), ++ TP_STRUCT__entry( ++ __field(u64, info_val1) ++ __field(u64, info_val2) ++ __field(pid_t, kctx_tgid) ++ __field(u32, kctx_id) ++ __field(u8, id) ++ ), ++ TP_fast_assign( ++ { ++ __entry->info_val1 = info_val1; ++ __entry->info_val2 = info_val2; ++ __entry->kctx_id = queue->kctx->id; ++ __entry->kctx_tgid = queue->kctx->tgid; ++ __entry->id = queue->id; ++ } ++ ++ ), ++ TP_printk("kctx=%d_%u id=%u info_val1=0x%llx info_val2=0x%llx", ++ __entry->kctx_tgid, __entry->kctx_id, __entry->id, ++ __entry->info_val1, __entry->info_val2) ++); ++ ++#define DEFINE_MALI_CSF_KCPU_EVENT(name) \ ++ DEFINE_EVENT(mali_csf_kcpu_queue_template, mali_##name, \ ++ TP_PROTO(struct kbase_kcpu_command_queue *queue, \ ++ u64 info_val1, u64 info_val2), \ ++ TP_ARGS(queue, info_val1, info_val2)) ++ ++DEFINE_MALI_CSF_KCPU_EVENT(KCPU_QUEUE_CREATE); ++DEFINE_MALI_CSF_KCPU_EVENT(KCPU_QUEUE_DELETE); ++DEFINE_MALI_CSF_KCPU_EVENT(KCPU_CQS_SET); ++DEFINE_MALI_CSF_KCPU_EVENT(KCPU_CQS_WAIT_START); ++DEFINE_MALI_CSF_KCPU_EVENT(KCPU_CQS_WAIT_END); ++DEFINE_MALI_CSF_KCPU_EVENT(KCPU_FENCE_SIGNAL); ++DEFINE_MALI_CSF_KCPU_EVENT(KCPU_FENCE_WAIT_START); ++DEFINE_MALI_CSF_KCPU_EVENT(KCPU_FENCE_WAIT_END); ++ ++#undef DEFINE_MALI_CSF_KCPU_EVENT ++ +#endif /* !defined(_KBASE_DEBUG_LINUX_KTRACE_CSF_H_) || defined(TRACE_HEADER_MULTI_READ) */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h new file mode 100755 -index 000000000000..037b1edecd8e +index 000000000..8fa4e2a7c --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h -@@ -0,0 +1,165 @@ +@@ -0,0 +1,174 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014,2018,2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2018, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -177876,8 +203438,6 @@ index 000000000000..037b1edecd8e + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -177911,6 +203471,8 @@ index 000000000000..037b1edecd8e +DEFINE_EVENT(mali_jm_slot_template, mali_##name, \ + TP_PROTO(struct kbase_context *kctx, int jobslot, u64 info_val), \ + TP_ARGS(kctx, jobslot, info_val)) ++DEFINE_MALI_JM_SLOT_EVENT(JM_RETURN_ATOM_TO_JS); ++DEFINE_MALI_JM_SLOT_EVENT(JM_MARK_FOR_RETURN_TO_JS); +DEFINE_MALI_JM_SLOT_EVENT(JM_SUBMIT); +DEFINE_MALI_JM_SLOT_EVENT(JM_JOB_DONE); +DEFINE_MALI_JM_SLOT_EVENT(JM_UPDATE_HEAD); @@ -177929,6 +203491,7 @@ index 000000000000..037b1edecd8e +DEFINE_MALI_JM_SLOT_EVENT(JS_AFFINITY_SUBMIT_TO_BLOCKED); +DEFINE_MALI_JM_SLOT_EVENT(JS_AFFINITY_CURRENT); +DEFINE_MALI_JM_SLOT_EVENT(JD_DONE_TRY_RUN_NEXT_JOB); ++DEFINE_MALI_JM_SLOT_EVENT(JS_PULL_JOB); +DEFINE_MALI_JM_SLOT_EVENT(JS_CORE_REF_REQUEST_CORES_FAILED); +DEFINE_MALI_JM_SLOT_EVENT(JS_CORE_REF_REGISTER_INUSE_FAILED); +DEFINE_MALI_JM_SLOT_EVENT(JS_CORE_REF_REQUEST_ON_RECHECK_FAILED); @@ -177937,6 +203500,10 @@ index 000000000000..037b1edecd8e +DEFINE_MALI_JM_SLOT_EVENT(JS_JOB_DONE_RETRY_NEEDED); +DEFINE_MALI_JM_SLOT_EVENT(JS_POLICY_DEQUEUE_JOB); +DEFINE_MALI_JM_SLOT_EVENT(JS_POLICY_DEQUEUE_JOB_IRQ); ++DEFINE_MALI_JM_SLOT_EVENT(JS_SLOT_PRIO_BLOCKED); ++DEFINE_MALI_JM_SLOT_EVENT(JS_SLOT_PRIO_UNBLOCKED); ++DEFINE_MALI_JM_SLOT_EVENT(JS_SLOT_PRIO_AND_HIGHER_UNBLOCKED); ++DEFINE_MALI_JM_SLOT_EVENT(JS_SLOT_PRIO_IS_BLOCKED); +#undef DEFINE_MALI_JM_SLOT_EVENT + +DECLARE_EVENT_CLASS(mali_jm_refcount_template, @@ -178013,10 +203580,13 @@ index 000000000000..037b1edecd8e +DEFINE_MALI_JM_ADD_EVENT(JM_ZAP_DONE); +DEFINE_MALI_JM_ADD_EVENT(JM_SUBMIT_AFTER_RESET); +DEFINE_MALI_JM_ADD_EVENT(JM_JOB_COMPLETE); ++DEFINE_MALI_JM_ADD_EVENT(JS_UNPULL_JOB); +DEFINE_MALI_JM_ADD_EVENT(JS_CTX_ATTR_NOW_ON_RUNPOOL); +DEFINE_MALI_JM_ADD_EVENT(JS_CTX_ATTR_NOW_OFF_RUNPOOL); +DEFINE_MALI_JM_ADD_EVENT(JS_CTX_ATTR_NOW_ON_CTX); +DEFINE_MALI_JM_ADD_EVENT(JS_CTX_ATTR_NOW_OFF_CTX); ++DEFINE_MALI_JM_ADD_EVENT(JS_RETURN_WORKER); ++DEFINE_MALI_JM_ADD_EVENT(JS_RETURN_WORKER_END); +DEFINE_MALI_JM_ADD_EVENT(JS_POLICY_TIMER_END); +DEFINE_MALI_JM_ADD_EVENT(JS_POLICY_TIMER_START); +DEFINE_MALI_JM_ADD_EVENT(JS_POLICY_ENQUEUE_JOB); @@ -178025,18 +203595,19 @@ index 000000000000..037b1edecd8e +#endif /* !defined(_KBASE_DEBUG_LINUX_KTRACE_JM_H_) || defined(TRACE_HEADER_MULTI_READ)*/ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c new file mode 100755 -index 000000000000..a13c0ba20c94 +index 000000000..f521b4712 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c -@@ -0,0 +1,356 @@ +@@ -0,0 +1,361 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -178047,9 +203618,8 @@ index 000000000000..a13c0ba20c94 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ ++ +#include +#include "debug/mali_kbase_debug_ktrace_internal.h" + @@ -178058,13 +203628,13 @@ index 000000000000..a13c0ba20c94 +#if KBASE_KTRACE_TARGET_RBUF + struct kbase_ktrace_msg *rbuf; + ++ spin_lock_init(&kbdev->ktrace.lock); + rbuf = kmalloc_array(KBASE_KTRACE_SIZE, sizeof(*rbuf), GFP_KERNEL); + + if (!rbuf) + return -EINVAL; + + kbdev->ktrace.rbuf = rbuf; -+ spin_lock_init(&kbdev->ktrace.lock); +#endif /* KBASE_KTRACE_TARGET_RBUF */ + return 0; +} @@ -178073,6 +203643,7 @@ index 000000000000..a13c0ba20c94 +{ +#if KBASE_KTRACE_TARGET_RBUF + kfree(kbdev->ktrace.rbuf); ++ kbdev->ktrace.rbuf = NULL; +#endif /* KBASE_KTRACE_TARGET_RBUF */ +} + @@ -178124,7 +203695,8 @@ index 000000000000..a13c0ba20c94 + (int)trace_msg->timestamp.tv_sec, + (int)(trace_msg->timestamp.tv_nsec / 1000), + trace_msg->thread_id, trace_msg->cpu, -+ kbasep_ktrace_code_string[trace_msg->backend.code]), 0); ++ kbasep_ktrace_code_string[trace_msg->backend.gpu.code]), ++ 0); + + /* kctx part: */ + if (trace_msg->kctx_tgid) { @@ -178202,8 +203774,8 @@ index 000000000000..a13c0ba20c94 + trace_msg->kctx_id = 0; + } + trace_msg->info_val = info_val; -+ trace_msg->backend.code = code; -+ trace_msg->backend.flags = flags; ++ trace_msg->backend.gpu.code = code; ++ trace_msg->backend.gpu.flags = flags; +} + +void kbasep_ktrace_add(struct kbase_device *kbdev, enum kbase_ktrace_code code, @@ -178213,6 +203785,9 @@ index 000000000000..a13c0ba20c94 + unsigned long irqflags; + struct kbase_ktrace_msg *trace_msg; + ++ if (unlikely(!kbasep_ktrace_initialized(&kbdev->ktrace))) ++ return; ++ + WARN_ON((flags & ~KBASE_KTRACE_FLAG_COMMON_ALL)); + + spin_lock_irqsave(&kbdev->ktrace.lock, irqflags); @@ -178220,7 +203795,7 @@ index 000000000000..a13c0ba20c94 + /* Reserve and update indices */ + trace_msg = kbasep_ktrace_reserve(&kbdev->ktrace); + -+ /* Fill the common part of the message (including backend.flags) */ ++ /* Fill the common part of the message (including backend.gpu.flags) */ + kbasep_ktrace_msg_init(&kbdev->ktrace, trace_msg, code, kctx, flags, + info_val); + @@ -178270,7 +203845,7 @@ index 000000000000..a13c0ba20c94 + spin_unlock_irqrestore(&kbdev->ktrace.lock, flags); +} + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) +struct trace_seq_state { + struct kbase_ktrace_msg trace_buf[KBASE_KTRACE_SIZE]; + u32 start; @@ -178378,7 +203953,7 @@ index 000000000000..a13c0ba20c94 + +#else /* KBASE_KTRACE_TARGET_RBUF */ + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) +void kbase_ktrace_debugfs_init(struct kbase_device *kbdev) +{ + CSTD_UNUSED(kbdev); @@ -178387,18 +203962,19 @@ index 000000000000..a13c0ba20c94 +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h new file mode 100755 -index 000000000000..e4e2e8c35001 +index 000000000..11f0b5c42 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h -@@ -0,0 +1,226 @@ +@@ -0,0 +1,238 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -178409,8 +203985,6 @@ index 000000000000..e4e2e8c35001 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -178443,6 +204017,7 @@ index 000000000000..e4e2e8c35001 +/** + * kbase_ktrace_init - initialize kbase ktrace. + * @kbdev: kbase device ++ * Return: 0 if successful or a negative error code on failure. + */ +int kbase_ktrace_init(struct kbase_device *kbdev); + @@ -178459,7 +204034,7 @@ index 000000000000..e4e2e8c35001 + */ +void kbase_ktrace_hook_wrapper(void *param); + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) +/** + * kbase_ktrace_debugfs_init - initialize kbase ktrace for debugfs usage, if + * the selected targets support it. @@ -178475,6 +204050,18 @@ index 000000000000..e4e2e8c35001 + */ +#if KBASE_KTRACE_TARGET_RBUF +/** ++ * kbasep_ktrace_initialized - Check whether kbase ktrace is initialized ++ * ++ * @ktrace: ktrace of kbase device. ++ * ++ * Return: true if ktrace has been initialized. ++ */ ++static inline bool kbasep_ktrace_initialized(struct kbase_ktrace *ktrace) ++{ ++ return ktrace->rbuf != NULL; ++} ++ ++/** + * kbasep_ktrace_add - internal function to add trace to the ringbuffer. + * @kbdev: kbase device + * @code: ktrace code @@ -178619,18 +204206,19 @@ index 000000000000..e4e2e8c35001 +#endif /* _KBASE_DEBUG_KTRACE_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h new file mode 100755 -index 000000000000..b50bceee4244 +index 000000000..6103c3ee0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h -@@ -0,0 +1,165 @@ +@@ -0,0 +1,181 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2011-2015,2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2015, 2018-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -178641,8 +204229,6 @@ index 000000000000..b50bceee4244 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -178740,6 +204326,7 @@ index 000000000000..b50bceee4244 + KBASE_KTRACE_CODE_MAKE_CODE(PM_CORES_CHANGE_DESIRED_TILER), + KBASE_KTRACE_CODE_MAKE_CODE(PM_CORES_CHANGE_AVAILABLE), + KBASE_KTRACE_CODE_MAKE_CODE(PM_CORES_CHANGE_AVAILABLE_TILER), ++ KBASE_KTRACE_CODE_MAKE_CODE(PM_CORES_CHANGE_AVAILABLE_L2), + KBASE_KTRACE_CODE_MAKE_CODE(PM_CORES_AVAILABLE), + KBASE_KTRACE_CODE_MAKE_CODE(PM_CORES_AVAILABLE_TILER), + KBASE_KTRACE_CODE_MAKE_CODE(PM_DESIRED_REACHED), @@ -178763,6 +204350,15 @@ index 000000000000..b50bceee4244 + /* info_val == policy number */ + KBASE_KTRACE_CODE_MAKE_CODE(PM_CURRENT_POLICY_TERM), + ++ KBASE_KTRACE_CODE_MAKE_CODE(PM_POWEROFF_WAIT_WQ), ++ KBASE_KTRACE_CODE_MAKE_CODE(PM_RUNTIME_SUSPEND_CALLBACK), ++ KBASE_KTRACE_CODE_MAKE_CODE(PM_RUNTIME_RESUME_CALLBACK), ++ ++ /* info_val = l2 state */ ++#define KBASEP_L2_STATE(n) KBASE_KTRACE_CODE_MAKE_CODE(PM_L2_ ## n), ++#include "backend/gpu/mali_kbase_pm_l2_states.h" ++#undef KBASEP_L2_STATE ++ + /* + * Context Scheduler events + */ @@ -178770,7 +204366,14 @@ index 000000000000..b50bceee4244 + KBASE_KTRACE_CODE_MAKE_CODE(SCHED_RETAIN_CTX_NOLOCK), + /* info_val == kctx->refcount */ + KBASE_KTRACE_CODE_MAKE_CODE(SCHED_RELEASE_CTX), -+ ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ /* ++ * Arbitration events ++ */ ++ KBASE_KTRACE_CODE_MAKE_CODE(ARB_GPU_LOST), ++ KBASE_KTRACE_CODE_MAKE_CODE(ARB_VM_STATE), ++ KBASE_KTRACE_CODE_MAKE_CODE(ARB_VM_EVT), ++#endif + +#if MALI_USE_CSF +#include "debug/backend/mali_kbase_debug_ktrace_codes_csf.h" @@ -178790,18 +204393,19 @@ index 000000000000..b50bceee4244 +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h new file mode 100755 -index 000000000000..c680feb86387 +index 000000000..a0fc9e51d --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h -@@ -0,0 +1,183 @@ +@@ -0,0 +1,187 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -178812,8 +204416,6 @@ index 000000000000..c680feb86387 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_DEBUG_KTRACE_DEFS_H_ @@ -178874,12 +204476,18 @@ index 000000000000..c680feb86387 + */ + +/* -+ * struct kbase_ktrace_backend - backend specific part of a trace message -+ * -+ * At the very least, this must contain a kbase_ktrace_code_t 'code' member and -+ * a kbase_ktrace_flag_t 'flags' member ++ * union kbase_ktrace_backend - backend specific part of a trace message. ++ * At the very least, this must contain a kbase_ktrace_code_t 'code' member ++ * and a kbase_ktrace_flag_t 'flags' inside a "gpu" sub-struct. Should a ++ * backend need several sub structs in its union to optimize the data storage ++ * for different message types, then it can use a "common initial sequence" to ++ * allow 'flags' and 'code' to pack optimally without corrupting them. ++ * Different backends need not share common initial sequences between them, they ++ * only need to ensure they have gpu.flags and gpu.code members, it ++ * is up to the backend then how to order these. + */ -+struct kbase_ktrace_backend; ++union kbase_ktrace_backend; ++ +#endif /* KBASE_KTRACE_TARGET_RBUF */ + +#if MALI_USE_CSF @@ -178905,7 +204513,7 @@ index 000000000000..c680feb86387 +#define KBASE_KTRACE_FLAG_ALL \ + (KBASE_KTRACE_FLAG_COMMON_ALL | KBASE_KTRACE_FLAG_BACKEND_ALL) + -+#define KBASE_KTRACE_SHIFT 8 /* 256 entries */ ++#define KBASE_KTRACE_SHIFT (9) /* 512 entries */ +#define KBASE_KTRACE_SIZE (1 << KBASE_KTRACE_SHIFT) +#define KBASE_KTRACE_MASK ((1 << KBASE_KTRACE_SHIFT)-1) + @@ -178929,8 +204537,8 @@ index 000000000000..c680feb86387 +}; + +/** -+ * struct kbase_ktrace - object representing a trace message added to trace -+ * buffer trace_rbuf in &kbase_device ++ * struct kbase_ktrace_msg - object representing a trace message added to trace ++ * buffer trace_rbuf in &kbase_device + * @timestamp: CPU timestamp at which the trace message was added. + * @thread_id: id of the thread in the context of which trace message was + * added. @@ -178941,9 +204549,9 @@ index 000000000000..c680feb86387 + * @kctx_id: Unique identifier of the &kbase_context associated with the + * message. Only valid if @kctx_tgid != 0. + * @info_val: value specific to the type of event being traced. Refer to the -+ * specific code in enum kbase_ktrace_code ++ * specific code in enum kbase_ktrace_code. + * @backend: backend-specific trace information. All backends must implement -+ * a minimum common set of members ++ * a minimum common set of members. + */ +struct kbase_ktrace_msg { + struct timespec64 timestamp; @@ -178952,8 +204560,7 @@ index 000000000000..c680feb86387 + pid_t kctx_tgid; + u32 kctx_id; + u64 info_val; -+ -+ struct kbase_ktrace_backend backend; ++ union kbase_ktrace_backend backend; +}; + +struct kbase_ktrace { @@ -178979,18 +204586,19 @@ index 000000000000..c680feb86387 +#endif /* _KBASE_DEBUG_KTRACE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h new file mode 100755 -index 000000000000..e450760e3426 +index 000000000..ba93f29fe --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h -@@ -0,0 +1,89 @@ +@@ -0,0 +1,90 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -179001,8 +204609,6 @@ index 000000000000..e450760e3426 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_DEBUG_KTRACE_INTERNAL_H_ @@ -179049,6 +204655,8 @@ index 000000000000..e450760e3426 + * @ktrace: kbase device's ktrace + * + * This may also empty the oldest entry in the ringbuffer to make space. ++ * ++ * Return: ktrace message + */ +struct kbase_ktrace_msg *kbasep_ktrace_reserve(struct kbase_ktrace *ktrace); + @@ -179074,18 +204682,19 @@ index 000000000000..e450760e3426 +#endif /* _KBASE_DEBUG_KTRACE_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h new file mode 100755 -index 000000000000..27f687faf072 +index 000000000..6d9664716 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h -@@ -0,0 +1,111 @@ +@@ -0,0 +1,123 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014,2018,2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -179096,8 +204705,6 @@ index 000000000000..27f687faf072 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -179166,6 +204773,7 @@ index 000000000000..27f687faf072 +DEFINE_MALI_ADD_EVENT(PM_CORES_AVAILABLE_TILER); +DEFINE_MALI_ADD_EVENT(PM_CORES_CHANGE_AVAILABLE); +DEFINE_MALI_ADD_EVENT(PM_CORES_CHANGE_AVAILABLE_TILER); ++DEFINE_MALI_ADD_EVENT(PM_CORES_CHANGE_AVAILABLE_L2); +DEFINE_MALI_ADD_EVENT(PM_GPU_ON); +DEFINE_MALI_ADD_EVENT(PM_GPU_OFF); +DEFINE_MALI_ADD_EVENT(PM_SET_POLICY); @@ -179175,13 +204783,25 @@ index 000000000000..27f687faf072 +DEFINE_MALI_ADD_EVENT(PM_CONTEXT_ACTIVE); +DEFINE_MALI_ADD_EVENT(PM_CONTEXT_IDLE); +DEFINE_MALI_ADD_EVENT(PM_WAKE_WAITERS); ++DEFINE_MALI_ADD_EVENT(PM_POWEROFF_WAIT_WQ); ++DEFINE_MALI_ADD_EVENT(PM_RUNTIME_SUSPEND_CALLBACK); ++DEFINE_MALI_ADD_EVENT(PM_RUNTIME_RESUME_CALLBACK); ++#define KBASEP_L2_STATE(n) DEFINE_MALI_ADD_EVENT(PM_L2_ ## n); ++#include "backend/gpu/mali_kbase_pm_l2_states.h" ++#undef KBASEP_L2_STATE +DEFINE_MALI_ADD_EVENT(SCHED_RETAIN_CTX_NOLOCK); +DEFINE_MALI_ADD_EVENT(SCHED_RELEASE_CTX); ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ ++DEFINE_MALI_ADD_EVENT(ARB_GPU_LOST); ++DEFINE_MALI_ADD_EVENT(ARB_VM_STATE); ++DEFINE_MALI_ADD_EVENT(ARB_VM_EVT); + ++#endif +#if MALI_USE_CSF -+#include "mali_kbase_debug_linux_ktrace_csf.h" ++#include "backend/mali_kbase_debug_linux_ktrace_csf.h" +#else -+#include "mali_kbase_debug_linux_ktrace_jm.h" ++#include "backend/mali_kbase_debug_linux_ktrace_jm.h" +#endif + +#undef DEFINE_MALI_ADD_EVENT @@ -179189,21 +204809,60 @@ index 000000000000..27f687faf072 +#endif /* KBASE_KTRACE_TARGET_FTRACE */ + +#endif /* !defined(_KBASE_DEBUG_LINUX_KTRACE_H_) || defined(TRACE_HEADER_MULTI_READ) */ +diff --git a/drivers/gpu/arm/bifrost/device/Kbuild b/drivers/gpu/arm/bifrost/device/Kbuild +new file mode 100644 +index 000000000..723ffd215 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/device/Kbuild +@@ -0,0 +1,33 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++# ++# (C) COPYRIGHT 2021 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU license. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, you can access it online at ++# http://www.gnu.org/licenses/gpl-2.0.html. ++# ++# ++ ++bifrost_kbase-y += \ ++ device/mali_kbase_device.o \ ++ device/mali_kbase_device_hw.o ++ ++ifeq ($(CONFIG_MALI_CSF_SUPPORT),y) ++ bifrost_kbase-y += \ ++ device/backend/mali_kbase_device_csf.o \ ++ device/backend/mali_kbase_device_hw_csf.o ++else ++ bifrost_kbase-y += \ ++ device/backend/mali_kbase_device_jm.o \ ++ device/backend/mali_kbase_device_hw_jm.o ++endif diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c new file mode 100755 -index 000000000000..d8b3fff6a214 +index 000000000..f7054f5b0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c -@@ -0,0 +1,274 @@ -+// SPDX-License-Identifier: GPL-2.0 +@@ -0,0 +1,525 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -179214,57 +204873,49 @@ index 000000000000..d8b3fff6a214 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include "../mali_kbase_device_internal.h" -+#include "../mali_kbase_device.h" ++#include ++#include + -+#include +#include ++#include ++#include +#include +#include +#include -+ -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+#include -+#endif ++#include ++#include + +#include +#include -+#include +#include ++#include +#include ++#include ++#include ++#include ++#include ++#include + -+static void kbase_device_csf_firmware_term(struct kbase_device *kbdev) -+{ -+ kbase_clk_rate_trace_manager_term(kbdev); -+ kbase_csf_firmware_term(kbdev); -+} -+ -+static int kbase_device_csf_firmware_init(struct kbase_device *kbdev) ++/** ++ * kbase_device_firmware_hwcnt_term - Terminate CSF firmware and HWC ++ * ++ * @kbdev: An instance of the GPU platform device, allocated from the probe ++ * method of the driver. ++ * ++ * When a kbase driver is removed, terminate CSF firmware and hardware counter ++ * components. ++ */ ++static void kbase_device_firmware_hwcnt_term(struct kbase_device *kbdev) +{ -+ int err = kbase_csf_firmware_init(kbdev); -+ -+ if (!err) { -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbdev->pm.backend.mcu_state = KBASE_MCU_ON; -+ kbdev->csf.firmware_inited = true; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ if (kbdev->csf.firmware_inited) { ++ kbase_kinstr_prfcnt_term(kbdev->kinstr_prfcnt_ctx); ++ kbase_vinstr_term(kbdev->vinstr_ctx); ++ kbase_hwcnt_virtualizer_term(kbdev->hwcnt_gpu_virt); ++ kbase_hwcnt_backend_csf_metadata_term(&kbdev->hwcnt_gpu_iface); ++ kbase_csf_firmware_unload_term(kbdev); + } -+ -+ /* Post firmware init, idle condition is restored. Note this is -+ * a deferral action step from the late init stage for CSF. -+ */ -+ kbase_pm_context_idle(kbdev); -+ -+ if (!err) -+ kbase_clk_rate_trace_manager_init(kbdev); -+ -+ return err; +} + +/** @@ -179294,15 +204945,24 @@ index 000000000000..d8b3fff6a214 + goto fail_timer; + +#ifdef CONFIG_MALI_BIFROST_DEBUG -+#ifndef CONFIG_MALI_BIFROST_NO_MALI ++#if IS_ENABLED(CONFIG_MALI_REAL_HW) + if (kbasep_common_test_interrupt_handlers(kbdev) != 0) { + dev_err(kbdev->dev, "Interrupt assignment check failed.\n"); + err = -EINVAL; + goto fail_interrupt_test; + } -+#endif /* !CONFIG_MALI_BIFROST_NO_MALI */ ++#endif /* IS_ENABLED(CONFIG_MALI_REAL_HW) */ +#endif /* CONFIG_MALI_BIFROST_DEBUG */ + ++ kbase_ipa_control_init(kbdev); ++ ++ /* Initialise the metrics subsystem, it couldn't be initialized earlier ++ * due to dependency on kbase_ipa_control. ++ */ ++ err = kbasep_pm_metrics_init(kbdev); ++ if (err) ++ goto fail_pm_metrics_init; ++ + /* Do the initialisation of devfreq. + * Devfreq needs backend_timer_init() for completion of its + * initialisation and it also needs to catch the first callback @@ -179319,21 +204979,34 @@ index 000000000000..d8b3fff6a214 + if (err) + goto fail_update_l2_features; + ++ err = kbase_backend_time_init(kbdev); ++ if (err) ++ goto fail_update_l2_features; ++ + init_waitqueue_head(&kbdev->hwaccess.backend.reset_wait); + ++ kbase_pm_context_idle(kbdev); ++ ++ mutex_init(&kbdev->fw_load_lock); ++ + return 0; + +fail_update_l2_features: ++ kbase_backend_devfreq_term(kbdev); +fail_devfreq_init: ++ kbasep_pm_metrics_term(kbdev); ++fail_pm_metrics_init: ++ kbase_ipa_control_term(kbdev); + +#ifdef CONFIG_MALI_BIFROST_DEBUG -+#ifndef CONFIG_MALI_BIFROST_NO_MALI ++#if IS_ENABLED(CONFIG_MALI_REAL_HW) +fail_interrupt_test: -+#endif /* !CONFIG_MALI_BIFROST_NO_MALI */ ++#endif /* IS_ENABLED(CONFIG_MALI_REAL_HW) */ +#endif /* CONFIG_MALI_BIFROST_DEBUG */ + + kbase_backend_timer_term(kbdev); +fail_timer: ++ kbase_pm_context_idle(kbdev); + kbase_hwaccess_pm_halt(kbdev); +fail_pm_powerup: + kbase_reset_gpu_term(kbdev); @@ -179350,65 +205023,169 @@ index 000000000000..d8b3fff6a214 +static void kbase_backend_late_term(struct kbase_device *kbdev) +{ + kbase_backend_devfreq_term(kbdev); ++ kbasep_pm_metrics_term(kbdev); ++ kbase_ipa_control_term(kbdev); + kbase_hwaccess_pm_halt(kbdev); + kbase_reset_gpu_term(kbdev); + kbase_hwaccess_pm_term(kbdev); +} + ++/** ++ * kbase_csf_early_init - Early initialization for firmware & scheduler. ++ * @kbdev: Device pointer ++ * ++ * Return: 0 on success, error code otherwise. ++ */ ++static int kbase_csf_early_init(struct kbase_device *kbdev) ++{ ++ int err = kbase_csf_firmware_early_init(kbdev); ++ ++ if (err) ++ return err; ++ ++ err = kbase_csf_scheduler_early_init(kbdev); ++ ++ return err; ++} ++ ++/** ++ * kbase_csf_early_term() - Early termination for firmware & scheduler. ++ * @kbdev: Device pointer ++ */ ++static void kbase_csf_early_term(struct kbase_device *kbdev) ++{ ++ kbase_csf_scheduler_early_term(kbdev); ++ kbase_csf_firmware_early_term(kbdev); ++} ++ ++/** ++ * kbase_csf_late_init - late initialization for firmware. ++ * @kbdev: Device pointer ++ * ++ * Return: 0 on success, error code otherwise. ++ */ ++static int kbase_csf_late_init(struct kbase_device *kbdev) ++{ ++ int err = kbase_csf_firmware_late_init(kbdev); ++ ++ return err; ++} ++ ++/** ++ * kbase_device_hwcnt_watchdog_if_init - Create hardware counter watchdog ++ * interface. ++ * @kbdev: Device pointer ++ * ++ * Return: 0 if successful or a negative error code on failure. ++ */ ++static int kbase_device_hwcnt_watchdog_if_init(struct kbase_device *kbdev) ++{ ++ return kbase_hwcnt_watchdog_if_timer_create( ++ &kbdev->hwcnt_watchdog_timer); ++} ++ ++/** ++ * kbase_device_hwcnt_watchdog_if_term - Terminate hardware counter watchdog ++ * interface. ++ * @kbdev: Device pointer ++ */ ++static void kbase_device_hwcnt_watchdog_if_term(struct kbase_device *kbdev) ++{ ++ kbase_hwcnt_watchdog_if_timer_destroy(&kbdev->hwcnt_watchdog_timer); ++} ++ ++/** ++ * kbase_device_hwcnt_backend_csf_if_init - Create hardware counter backend ++ * firmware interface. ++ * @kbdev: Device pointer ++ * Return: 0 if successful or a negative error code on failure. ++ */ ++static int kbase_device_hwcnt_backend_csf_if_init(struct kbase_device *kbdev) ++{ ++ return kbase_hwcnt_backend_csf_if_fw_create( ++ kbdev, &kbdev->hwcnt_backend_csf_if_fw); ++} ++ ++/** ++ * kbase_device_hwcnt_backend_csf_if_term - Terminate hardware counter backend ++ * firmware interface. ++ * @kbdev: Device pointer ++ */ ++static void kbase_device_hwcnt_backend_csf_if_term(struct kbase_device *kbdev) ++{ ++ kbase_hwcnt_backend_csf_if_fw_destroy(&kbdev->hwcnt_backend_csf_if_fw); ++} ++ ++/** ++ * kbase_device_hwcnt_backend_csf_init - Create hardware counter backend. ++ * @kbdev: Device pointer ++ * ++ * Return: 0 if successful or a negative error code on failure. ++ */ ++static int kbase_device_hwcnt_backend_csf_init(struct kbase_device *kbdev) ++{ ++ return kbase_hwcnt_backend_csf_create( ++ &kbdev->hwcnt_backend_csf_if_fw, ++ KBASE_HWCNT_BACKEND_CSF_RING_BUFFER_COUNT, ++ &kbdev->hwcnt_watchdog_timer, &kbdev->hwcnt_gpu_iface); ++} ++ ++/** ++ * kbase_device_hwcnt_backend_csf_term - Terminate hardware counter backend. ++ * @kbdev: Device pointer ++ */ ++static void kbase_device_hwcnt_backend_csf_term(struct kbase_device *kbdev) ++{ ++ kbase_hwcnt_backend_csf_destroy(&kbdev->hwcnt_gpu_iface); ++} ++ +static const struct kbase_device_init dev_init[] = { -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+ {kbase_gpu_device_create, kbase_gpu_device_destroy, -+ "Dummy model initialization failed"}, -+#else -+ {assign_irqs, NULL, -+ "IRQ search failed"}, -+ {registers_map, registers_unmap, -+ "Register map failed"}, -+#endif -+ {power_control_init, power_control_term, -+ "Power control initialization failed"}, -+ {kbase_device_io_history_init, kbase_device_io_history_term, -+ "Register access history initialization failed"}, -+ {kbase_device_early_init, kbase_device_early_term, -+ "Early device initialization failed"}, -+ {kbase_device_populate_max_freq, NULL, -+ "Populating max frequency failed"}, -+ {kbase_device_misc_init, kbase_device_misc_term, -+ "Miscellaneous device initialization failed"}, -+ {kbase_ctx_sched_init, kbase_ctx_sched_term, -+ "Context scheduler initialization failed"}, -+ {kbase_mem_init, kbase_mem_term, -+ "Memory subsystem initialization failed"}, -+ {kbase_csf_protected_memory_init, kbase_csf_protected_memory_term, -+ "Protected memory allocator initialization failed"}, -+ {kbase_device_coherency_init, NULL, -+ "Device coherency init failed"}, -+ {kbase_protected_mode_init, kbase_protected_mode_term, -+ "Protected mode subsystem initialization failed"}, -+ {kbase_device_list_init, kbase_device_list_term, -+ "Device list setup failed"}, -+ {kbase_device_timeline_init, kbase_device_timeline_term, -+ "Timeline stream initialization failed"}, -+ {kbase_clk_rate_trace_manager_init, -+ kbase_clk_rate_trace_manager_term, -+ "Clock rate trace manager initialization failed"}, -+ {kbase_device_hwcnt_backend_jm_init, -+ kbase_device_hwcnt_backend_jm_term, -+ "GPU hwcnt backend creation failed"}, -+ {kbase_device_hwcnt_context_init, kbase_device_hwcnt_context_term, -+ "GPU hwcnt context initialization failed"}, -+ {kbase_device_hwcnt_virtualizer_init, -+ kbase_device_hwcnt_virtualizer_term, -+ "GPU hwcnt virtualizer initialization failed"}, -+ {kbase_device_vinstr_init, kbase_device_vinstr_term, -+ "Virtual instrumentation initialization failed"}, -+ {kbase_backend_late_init, kbase_backend_late_term, -+ "Late backend initialization failed"}, -+ {kbase_device_csf_firmware_init, kbase_device_csf_firmware_term, -+ "Firmware initialization failed"}, -+#ifdef MALI_KBASE_BUILD -+ {kbase_device_debugfs_init, kbase_device_debugfs_term, -+ "DebugFS initialization failed"}, ++#if !IS_ENABLED(CONFIG_MALI_REAL_HW) ++ { kbase_gpu_device_create, kbase_gpu_device_destroy, ++ "Dummy model initialization failed" }, ++#else /* !IS_ENABLED(CONFIG_MALI_REAL_HW) */ ++ { assign_irqs, NULL, "IRQ search failed" }, ++#endif /* !IS_ENABLED(CONFIG_MALI_REAL_HW) */ ++#if !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ { registers_map, registers_unmap, "Register map failed" }, ++#endif /* !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ ++ { power_control_init, power_control_term, "Power control initialization failed" }, ++ { kbase_device_io_history_init, kbase_device_io_history_term, ++ "Register access history initialization failed" }, ++ { kbase_device_early_init, kbase_device_early_term, "Early device initialization failed" }, ++ { kbase_device_populate_max_freq, NULL, "Populating max frequency failed" }, ++ { kbase_pm_lowest_gpu_freq_init, NULL, "Lowest freq initialization failed" }, ++ { kbase_device_misc_init, kbase_device_misc_term, ++ "Miscellaneous device initialization failed" }, ++ { kbase_device_pcm_dev_init, kbase_device_pcm_dev_term, ++ "Priority control manager initialization failed" }, ++ { kbase_ctx_sched_init, kbase_ctx_sched_term, "Context scheduler initialization failed" }, ++ { kbase_mem_init, kbase_mem_term, "Memory subsystem initialization failed" }, ++ { kbase_csf_protected_memory_init, kbase_csf_protected_memory_term, ++ "Protected memory allocator initialization failed" }, ++ { kbase_device_coherency_init, NULL, "Device coherency init failed" }, ++ { kbase_protected_mode_init, kbase_protected_mode_term, ++ "Protected mode subsystem initialization failed" }, ++ { kbase_device_list_init, kbase_device_list_term, "Device list setup failed" }, ++ { kbase_device_timeline_init, kbase_device_timeline_term, ++ "Timeline stream initialization failed" }, ++ { kbase_clk_rate_trace_manager_init, kbase_clk_rate_trace_manager_term, ++ "Clock rate trace manager initialization failed" }, ++ { kbase_device_hwcnt_watchdog_if_init, kbase_device_hwcnt_watchdog_if_term, ++ "GPU hwcnt backend watchdog interface creation failed" }, ++ { kbase_device_hwcnt_backend_csf_if_init, kbase_device_hwcnt_backend_csf_if_term, ++ "GPU hwcnt backend CSF interface creation failed" }, ++ { kbase_device_hwcnt_backend_csf_init, kbase_device_hwcnt_backend_csf_term, ++ "GPU hwcnt backend creation failed" }, ++ { kbase_device_hwcnt_context_init, kbase_device_hwcnt_context_term, ++ "GPU hwcnt context initialization failed" }, ++ { kbase_csf_early_init, kbase_csf_early_term, "Early CSF initialization failed" }, ++ { kbase_backend_late_init, kbase_backend_late_term, "Late backend initialization failed" }, ++ { kbase_csf_late_init, NULL, "Late CSF initialization failed" }, ++ { NULL, kbase_device_firmware_hwcnt_term, NULL }, ++ { kbase_debug_csf_fault_init, kbase_debug_csf_fault_term, ++ "CSF fault debug initialization failed" }, ++ { kbase_device_debugfs_init, kbase_device_debugfs_term, "DebugFS initialization failed" }, + /* Sysfs init needs to happen before registering the device with + * misc_register(), otherwise it causes a race condition between + * registering the device and a uevent event being generated for @@ -179421,15 +205198,16 @@ index 000000000000..d8b3fff6a214 + * paragraph that starts with "Word of warning", currently the + * second-last paragraph. + */ -+ {kbase_sysfs_init, kbase_sysfs_term, "SysFS group creation failed"}, -+ {kbase_device_misc_register, kbase_device_misc_deregister, -+ "Misc device registration failed"}, -+#ifdef CONFIG_MALI_BUSLOG -+ {buslog_init, buslog_term, "Bus log client registration failed"}, -+#endif -+ {kbase_gpuprops_populate_user_buffer, kbase_gpuprops_free_user_buffer, -+ "GPU property population failed"}, -+#endif ++ { kbase_sysfs_init, kbase_sysfs_term, "SysFS group creation failed" }, ++ { kbase_device_misc_register, kbase_device_misc_deregister, ++ "Misc device registration failed" }, ++ { kbase_gpuprops_populate_user_buffer, kbase_gpuprops_free_user_buffer, ++ "GPU property population failed" }, ++ { kbase_device_late_init, kbase_device_late_term, "Late device initialization failed" }, ++#if IS_ENABLED(CONFIG_MALI_CORESIGHT) ++ { kbase_debug_coresight_csf_init, kbase_debug_coresight_csf_term, ++ "Coresight initialization failed" }, ++#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ +}; + +static void kbase_device_term_partial(struct kbase_device *kbdev, @@ -179458,32 +205236,164 @@ index 000000000000..d8b3fff6a214 + kbase_disjoint_init(kbdev); + + for (i = 0; i < ARRAY_SIZE(dev_init); i++) { -+ err = dev_init[i].init(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "%s error = %d\n", -+ dev_init[i].err_mes, err); -+ kbase_device_term_partial(kbdev, i); -+ break; ++ if (dev_init[i].init) { ++ err = dev_init[i].init(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, "%s error = %d\n", ++ dev_init[i].err_mes, err); ++ kbase_device_term_partial(kbdev, i); ++ break; ++ } + } + } + + return err; +} ++ ++/** ++ * kbase_device_hwcnt_csf_deferred_init - Initialize CSF deferred HWC components ++ * ++ * @kbdev: An instance of the GPU platform device, allocated from the probe ++ * method of the driver. ++ * ++ * Hardware counter components depending on firmware are initialized after CSF ++ * firmware is loaded. ++ * ++ * Return: 0 on success. An error code on failure. ++ */ ++static int kbase_device_hwcnt_csf_deferred_init(struct kbase_device *kbdev) ++{ ++ int ret = 0; ++ ++ /* For CSF GPUs, HWC metadata needs to query information from CSF ++ * firmware, so the initialization of HWC metadata only can be called ++ * after firmware initialized, but firmware initialization depends on ++ * HWC backend initialization, so we need to separate HWC backend ++ * metadata initialization from HWC backend initialization. ++ */ ++ ret = kbase_hwcnt_backend_csf_metadata_init(&kbdev->hwcnt_gpu_iface); ++ if (ret) { ++ dev_err(kbdev->dev, ++ "GPU hwcnt backend metadata creation failed"); ++ return ret; ++ } ++ ++ ret = kbase_hwcnt_virtualizer_init( ++ kbdev->hwcnt_gpu_ctx, ++ KBASE_HWCNT_GPU_VIRTUALIZER_DUMP_THRESHOLD_NS, ++ &kbdev->hwcnt_gpu_virt); ++ if (ret) { ++ dev_err(kbdev->dev, ++ "GPU hwcnt virtualizer initialization failed"); ++ goto virt_fail; ++ } ++ ++ ret = kbase_vinstr_init(kbdev->hwcnt_gpu_virt, &kbdev->vinstr_ctx); ++ if (ret) { ++ dev_err(kbdev->dev, ++ "Virtual instrumentation initialization failed"); ++ goto vinstr_fail; ++ } ++ ++ ret = kbase_kinstr_prfcnt_init(kbdev->hwcnt_gpu_virt, ++ &kbdev->kinstr_prfcnt_ctx); ++ if (ret) { ++ dev_err(kbdev->dev, ++ "Performance counter instrumentation initialization failed"); ++ goto kinstr_prfcnt_fail; ++ } ++ ++ return ret; ++ ++kinstr_prfcnt_fail: ++ kbase_vinstr_term(kbdev->vinstr_ctx); ++ ++vinstr_fail: ++ kbase_hwcnt_virtualizer_term(kbdev->hwcnt_gpu_virt); ++ ++virt_fail: ++ kbase_hwcnt_backend_csf_metadata_term(&kbdev->hwcnt_gpu_iface); ++ return ret; ++} ++ ++/** ++ * kbase_csf_firmware_deferred_init - Load and initialize CSF firmware ++ * ++ * @kbdev: An instance of the GPU platform device, allocated from the probe ++ * method of the driver. ++ * ++ * Called when a device file is opened for the first time. ++ * To meet Android GKI vendor guideline, firmware load is deferred at ++ * the time when @ref kbase_open is called for the first time. ++ * ++ * Return: 0 on success. An error code on failure. ++ */ ++static int kbase_csf_firmware_deferred_init(struct kbase_device *kbdev) ++{ ++ int err = 0; ++ ++ lockdep_assert_held(&kbdev->fw_load_lock); ++ ++ err = kbase_csf_firmware_load_init(kbdev); ++ if (!err) { ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbdev->pm.backend.mcu_state = KBASE_MCU_ON; ++ kbdev->csf.firmware_inited = true; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } else { ++ dev_err(kbdev->dev, "Firmware initialization failed"); ++ } ++ ++ return err; ++} ++ ++int kbase_device_firmware_init_once(struct kbase_device *kbdev) ++{ ++ int ret = 0; ++ ++ mutex_lock(&kbdev->fw_load_lock); ++ ++ if (!kbdev->csf.firmware_inited) { ++ kbase_pm_context_active(kbdev); ++ ++ ret = kbase_csf_firmware_deferred_init(kbdev); ++ if (ret) ++ goto out; ++ ++ ret = kbase_device_hwcnt_csf_deferred_init(kbdev); ++ if (ret) { ++ kbase_csf_firmware_unload_term(kbdev); ++ goto out; ++ } ++ ++ kbase_csf_debugfs_init(kbdev); ++ kbase_timeline_io_debugfs_init(kbdev); ++out: ++ kbase_pm_context_idle(kbdev); ++ } ++ ++ mutex_unlock(&kbdev->fw_load_lock); ++ ++ return ret; ++} ++KBASE_EXPORT_TEST_API(kbase_device_firmware_init_once); diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c new file mode 100755 -index 000000000000..97bcc1d23aa3 +index 000000000..2abd62aaa --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c -@@ -0,0 +1,161 @@ -+// SPDX-License-Identifier: GPL-2.0 +@@ -0,0 +1,252 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -179494,8 +205404,6 @@ index 000000000000..97bcc1d23aa3 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -179503,6 +205411,7 @@ index 000000000000..97bcc1d23aa3 +#include +#include +#include ++#include +#include +#include +#include @@ -179532,7 +205441,7 @@ index 000000000000..97bcc1d23aa3 + kbase_mmu_gpu_fault_interrupt(kbdev, status, as_nr, address, as_valid); +} + -+static bool kbase_gpu_fault_interrupt(struct kbase_device *kbdev) ++static void kbase_gpu_fault_interrupt(struct kbase_device *kbdev) +{ + const u32 status = kbase_reg_read(kbdev, + GPU_CONTROL_REG(GPU_FAULTSTATUS)); @@ -179541,7 +205450,6 @@ index 000000000000..97bcc1d23aa3 + GPU_FAULTSTATUS_JASID_SHIFT; + bool bus_fault = (status & GPU_FAULTSTATUS_EXCEPTION_TYPE_MASK) == + GPU_FAULTSTATUS_EXCEPTION_TYPE_GPU_BUS_FAULT; -+ bool clear_gpu_fault = true; + + if (bus_fault) { + /* If as_valid, reset gpu when ASID is for MCU. */ @@ -179549,26 +205457,25 @@ index 000000000000..97bcc1d23aa3 + kbase_report_gpu_fault(kbdev, status, as_nr, as_valid); + + dev_err(kbdev->dev, "GPU bus fault triggering gpu-reset ...\n"); -+ if (kbase_prepare_to_reset_gpu(kbdev)) ++ if (kbase_prepare_to_reset_gpu( ++ kbdev, RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) + kbase_reset_gpu(kbdev); + } else { + /* Handle Bus fault */ + if (kbase_mmu_bus_fault_interrupt(kbdev, status, as_nr)) -+ clear_gpu_fault = false; ++ dev_warn(kbdev->dev, ++ "fail to handle GPU bus fault ...\n"); + } + } else + kbase_report_gpu_fault(kbdev, status, as_nr, as_valid); + -+ return clear_gpu_fault; +} + +void kbase_gpu_interrupt(struct kbase_device *kbdev, u32 val) +{ -+ bool clear_gpu_fault = false; -+ + KBASE_KTRACE_ADD(kbdev, CORE_GPU_IRQ, NULL, val); + if (val & GPU_FAULT) -+ clear_gpu_fault = kbase_gpu_fault_interrupt(kbdev); ++ kbase_gpu_fault_interrupt(kbdev); + + if (val & GPU_PROTECTED_FAULT) { + struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; @@ -179585,19 +205492,57 @@ index 000000000000..97bcc1d23aa3 + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + + kbase_csf_scheduler_spin_lock(kbdev, &flags); -+ if (!WARN_ON(!kbase_csf_scheduler_protected_mode_in_use(kbdev))) ++ if (!WARN_ON(!kbase_csf_scheduler_protected_mode_in_use( ++ kbdev))) { ++ struct base_gpu_queue_group_error const ++ err_payload = { .error_type = ++ BASE_GPU_QUEUE_GROUP_ERROR_FATAL, ++ .payload = { ++ .fatal_group = { ++ .status = ++ GPU_EXCEPTION_TYPE_SW_FAULT_0, ++ } } }; ++ ++ kbase_debug_csf_fault_notify(kbdev, scheduler->active_protm_grp->kctx, ++ DF_GPU_PROTECTED_FAULT); ++ + scheduler->active_protm_grp->faulted = true; ++ kbase_csf_add_group_fatal_error( ++ scheduler->active_protm_grp, &err_payload); ++ kbase_event_wakeup(scheduler->active_protm_grp->kctx); ++ } + kbase_csf_scheduler_spin_unlock(kbdev, flags); + -+ if (kbase_prepare_to_reset_gpu(kbdev)) ++ if (kbase_prepare_to_reset_gpu( ++ kbdev, RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) + kbase_reset_gpu(kbdev); ++ ++ /* Defer the clearing to the GPU reset sequence */ ++ val &= ~GPU_PROTECTED_FAULT; + } + + if (val & RESET_COMPLETED) + kbase_pm_reset_done(kbdev); + -+ KBASE_KTRACE_ADD(kbdev, CORE_GPU_IRQ_CLEAR, NULL, val); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), val); ++ /* Defer clearing CLEAN_CACHES_COMPLETED to kbase_clean_caches_done. ++ * We need to acquire hwaccess_lock to avoid a race condition with ++ * kbase_gpu_cache_flush_and_busy_wait ++ */ ++ KBASE_KTRACE_ADD(kbdev, CORE_GPU_IRQ_CLEAR, NULL, val & ~CLEAN_CACHES_COMPLETED); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), val & ~CLEAN_CACHES_COMPLETED); ++ ++#ifdef KBASE_PM_RUNTIME ++ if (val & DOORBELL_MIRROR) { ++ unsigned long flags; ++ ++ dev_dbg(kbdev->dev, "Doorbell mirror interrupt received"); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_pm_disable_db_mirror_interrupt(kbdev); ++ kbdev->pm.backend.exit_gpu_sleep_mode = true; ++ kbase_csf_scheduler_invoke_tick(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } ++#endif + + /* kbase_pm_check_transitions (called by kbase_pm_power_changed) must + * be called after the IRQ has been cleared. This is because it might @@ -179625,32 +205570,88 @@ index 000000000000..97bcc1d23aa3 + kbase_pm_power_changed(kbdev); + } + -+ if (clear_gpu_fault) { -+ unsigned long flags; ++ KBASE_KTRACE_ADD(kbdev, CORE_GPU_IRQ_DONE, NULL, val); ++} + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_CLEAR_FAULT); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++#if !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++bool kbase_is_register_accessible(u32 offset) ++{ ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ if (((offset >= MCU_SUBSYSTEM_BASE) && (offset < IPA_CONTROL_BASE)) || ++ ((offset >= GPU_CONTROL_MCU_BASE) && (offset < USER_BASE))) { ++ WARN(1, "Invalid register offset 0x%x", offset); ++ return false; + } ++#endif + -+ KBASE_KTRACE_ADD(kbdev, CORE_GPU_IRQ_DONE, NULL, val); ++ return true; ++} ++#endif /* !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ ++ ++#if IS_ENABLED(CONFIG_MALI_REAL_HW) ++void kbase_reg_write(struct kbase_device *kbdev, u32 offset, u32 value) ++{ ++ if (WARN_ON(!kbdev->pm.backend.gpu_powered)) ++ return; ++ ++ if (WARN_ON(kbdev->dev == NULL)) ++ return; ++ ++ if (!kbase_is_register_accessible(offset)) ++ return; ++ ++ writel(value, kbdev->reg + offset); ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ if (unlikely(kbdev->io_history.enabled)) ++ kbase_io_history_add(&kbdev->io_history, kbdev->reg + offset, ++ value, 1); ++#endif /* CONFIG_DEBUG_FS */ ++ dev_dbg(kbdev->dev, "w: reg %08x val %08x", offset, value); +} ++KBASE_EXPORT_TEST_API(kbase_reg_write); ++ ++u32 kbase_reg_read(struct kbase_device *kbdev, u32 offset) ++{ ++ u32 val; ++ ++ if (WARN_ON(!kbdev->pm.backend.gpu_powered)) ++ return 0; ++ ++ if (WARN_ON(kbdev->dev == NULL)) ++ return 0; ++ ++ if (!kbase_is_register_accessible(offset)) ++ return 0; ++ ++ val = readl(kbdev->reg + offset); ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ if (unlikely(kbdev->io_history.enabled)) ++ kbase_io_history_add(&kbdev->io_history, kbdev->reg + offset, ++ val, 0); ++#endif /* CONFIG_DEBUG_FS */ ++ dev_dbg(kbdev->dev, "r: reg %08x val %08x", offset, val); ++ ++ return val; ++} ++KBASE_EXPORT_TEST_API(kbase_reg_read); ++#endif /* !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c new file mode 100755 -index 000000000000..a11d778071b5 +index 000000000..38223af21 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c -@@ -0,0 +1,100 @@ -+// SPDX-License-Identifier: GPL-2.0 +@@ -0,0 +1,143 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -179661,8 +205662,6 @@ index 000000000000..a11d778071b5 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -179697,6 +205696,7 @@ index 000000000000..a11d778071b5 + address); + if (multiple) + dev_warn(kbdev->dev, "There were multiple GPU faults - some have not been reported\n"); ++ +} + +void kbase_gpu_interrupt(struct kbase_device *kbdev, u32 val) @@ -179708,12 +205708,20 @@ index 000000000000..a11d778071b5 + if (val & RESET_COMPLETED) + kbase_pm_reset_done(kbdev); + ++ /* Defer clearing CLEAN_CACHES_COMPLETED to kbase_clean_caches_done. ++ * We need to acquire hwaccess_lock to avoid a race condition with ++ * kbase_gpu_cache_flush_and_busy_wait ++ */ ++ KBASE_KTRACE_ADD(kbdev, CORE_GPU_IRQ_CLEAR, NULL, val & ~CLEAN_CACHES_COMPLETED); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), val & ~CLEAN_CACHES_COMPLETED); ++ ++ /* kbase_instr_hwcnt_sample_done frees the HWCNT pipeline to request another ++ * sample. Therefore this must be called after clearing the IRQ to avoid a ++ * race between clearing and the next sample raising the IRQ again. ++ */ + if (val & PRFCNT_SAMPLE_COMPLETED) + kbase_instr_hwcnt_sample_done(kbdev); + -+ KBASE_KTRACE_ADD(kbdev, CORE_GPU_IRQ_CLEAR, NULL, val); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), val); -+ + /* kbase_pm_check_transitions (called by kbase_pm_power_changed) must + * be called after the IRQ has been cleared. This is because it might + * trigger further power transitions and we don't want to miss the @@ -179742,21 +205750,57 @@ index 000000000000..a11d778071b5 + + KBASE_KTRACE_ADD(kbdev, CORE_GPU_IRQ_DONE, NULL, val); +} ++ ++#if IS_ENABLED(CONFIG_MALI_REAL_HW) ++void kbase_reg_write(struct kbase_device *kbdev, u32 offset, u32 value) ++{ ++ WARN_ON(!kbdev->pm.backend.gpu_powered); ++ ++ writel(value, kbdev->reg + offset); ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ if (unlikely(kbdev->io_history.enabled)) ++ kbase_io_history_add(&kbdev->io_history, kbdev->reg + offset, ++ value, 1); ++#endif /* CONFIG_DEBUG_FS */ ++ dev_dbg(kbdev->dev, "w: reg %08x val %08x", offset, value); ++} ++KBASE_EXPORT_TEST_API(kbase_reg_write); ++ ++u32 kbase_reg_read(struct kbase_device *kbdev, u32 offset) ++{ ++ u32 val; ++ ++ WARN_ON(!kbdev->pm.backend.gpu_powered); ++ ++ val = readl(kbdev->reg + offset); ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ if (unlikely(kbdev->io_history.enabled)) ++ kbase_io_history_add(&kbdev->io_history, kbdev->reg + offset, ++ val, 0); ++#endif /* CONFIG_DEBUG_FS */ ++ dev_dbg(kbdev->dev, "r: reg %08x val %08x", offset, val); ++ ++ return val; ++} ++KBASE_EXPORT_TEST_API(kbase_reg_read); ++#endif /* IS_ENABLED(CONFIG_MALI_REAL_HW) */ diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c new file mode 100755 -index 000000000000..8e853eb82fa1 +index 000000000..2d3672383 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c -@@ -0,0 +1,264 @@ -+// SPDX-License-Identifier: GPL-2.0 +@@ -0,0 +1,344 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -179767,21 +205811,20 @@ index 000000000000..8e853eb82fa1 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include "../mali_kbase_device_internal.h" -+#include "../mali_kbase_device.h" ++#include ++#include ++#include + +#include +#include +#include +#include -+ -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+#include -+#endif ++#include ++#include ++#include ++#include + +#ifdef CONFIG_MALI_ARBITER_SUPPORT +#include @@ -179822,13 +205865,13 @@ index 000000000000..8e853eb82fa1 + goto fail_timer; + +#ifdef CONFIG_MALI_BIFROST_DEBUG -+#ifndef CONFIG_MALI_BIFROST_NO_MALI ++#if IS_ENABLED(CONFIG_MALI_REAL_HW) + if (kbasep_common_test_interrupt_handlers(kbdev) != 0) { + dev_err(kbdev->dev, "Interrupt assignment check failed.\n"); + err = -EINVAL; + goto fail_interrupt_test; + } -+#endif /* !CONFIG_MALI_BIFROST_NO_MALI */ ++#endif /* IS_ENABLED(CONFIG_MALI_REAL_HW) */ +#endif /* CONFIG_MALI_BIFROST_DEBUG */ + + err = kbase_job_slot_init(kbdev); @@ -179846,31 +205889,39 @@ index 000000000000..8e853eb82fa1 + if (err) + goto fail_devfreq_init; + -+ /* Idle the GPU and/or cores, if the policy wants it to */ -+ kbase_pm_context_idle(kbdev); -+ + /* Update gpuprops with L2_FEATURES if applicable */ + err = kbase_gpuprops_update_l2_features(kbdev); + if (err) + goto fail_update_l2_features; + ++ err = kbase_backend_time_init(kbdev); ++ if (err) ++ goto fail_update_l2_features; ++ + init_waitqueue_head(&kbdev->hwaccess.backend.reset_wait); + ++ /* Idle the GPU and/or cores, if the policy wants it to */ ++ kbase_pm_context_idle(kbdev); ++ ++ mutex_init(&kbdev->fw_load_lock); ++ + return 0; + +fail_update_l2_features: ++ kbase_backend_devfreq_term(kbdev); +fail_devfreq_init: + kbase_job_slot_term(kbdev); +fail_job_slot: + +#ifdef CONFIG_MALI_BIFROST_DEBUG -+#ifndef CONFIG_MALI_BIFROST_NO_MALI ++#if IS_ENABLED(CONFIG_MALI_REAL_HW) +fail_interrupt_test: -+#endif /* !CONFIG_MALI_BIFROST_NO_MALI */ ++#endif /* IS_ENABLED(CONFIG_MALI_REAL_HW) */ +#endif /* CONFIG_MALI_BIFROST_DEBUG */ + + kbase_backend_timer_term(kbdev); +fail_timer: ++ kbase_pm_context_idle(kbdev); + kbase_hwaccess_pm_halt(kbdev); +fail_pm_powerup: + kbase_reset_gpu_term(kbdev); @@ -179895,60 +205946,117 @@ index 000000000000..8e853eb82fa1 + kbase_hwaccess_pm_term(kbdev); +} + ++/** ++ * kbase_device_hwcnt_watchdog_if_init - Create hardware counter watchdog ++ * interface. ++ * @kbdev: Device pointer ++ * Return: 0 on success, or an error code on failure. ++ */ ++static int kbase_device_hwcnt_watchdog_if_init(struct kbase_device *kbdev) ++{ ++ return kbase_hwcnt_watchdog_if_timer_create(&kbdev->hwcnt_watchdog_timer); ++} ++ ++/** ++ * kbase_device_hwcnt_watchdog_if_term - Terminate hardware counter watchdog ++ * interface. ++ * @kbdev: Device pointer ++ */ ++static void kbase_device_hwcnt_watchdog_if_term(struct kbase_device *kbdev) ++{ ++ kbase_hwcnt_watchdog_if_timer_destroy(&kbdev->hwcnt_watchdog_timer); ++} ++ ++/** ++ * kbase_device_hwcnt_backend_jm_init - Create hardware counter backend. ++ * @kbdev: Device pointer ++ * Return: 0 on success, or an error code on failure. ++ */ ++static int kbase_device_hwcnt_backend_jm_init(struct kbase_device *kbdev) ++{ ++ return kbase_hwcnt_backend_jm_create(kbdev, &kbdev->hwcnt_gpu_jm_backend); ++} ++ ++/** ++ * kbase_device_hwcnt_backend_jm_term - Terminate hardware counter backend. ++ * @kbdev: Device pointer ++ */ ++static void kbase_device_hwcnt_backend_jm_term(struct kbase_device *kbdev) ++{ ++ kbase_hwcnt_backend_jm_destroy(&kbdev->hwcnt_gpu_jm_backend); ++} ++ ++/** ++ * kbase_device_hwcnt_backend_jm_watchdog_init - Create hardware counter watchdog backend. ++ * @kbdev: Device pointer ++ * Return: 0 on success, or an error code on failure. ++ */ ++static int kbase_device_hwcnt_backend_jm_watchdog_init(struct kbase_device *kbdev) ++{ ++ return kbase_hwcnt_backend_jm_watchdog_create(&kbdev->hwcnt_gpu_jm_backend, ++ &kbdev->hwcnt_watchdog_timer, ++ &kbdev->hwcnt_gpu_iface); ++} ++ ++/** ++ * kbase_device_hwcnt_backend_jm_watchdog_term - Terminate hardware counter watchdog backend. ++ * @kbdev: Device pointer ++ */ ++static void kbase_device_hwcnt_backend_jm_watchdog_term(struct kbase_device *kbdev) ++{ ++ kbase_hwcnt_backend_jm_watchdog_destroy(&kbdev->hwcnt_gpu_iface); ++} ++ +static const struct kbase_device_init dev_init[] = { -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+ {kbase_gpu_device_create, kbase_gpu_device_destroy, -+ "Dummy model initialization failed"}, -+#else -+ {assign_irqs, NULL, -+ "IRQ search failed"}, -+ {registers_map, registers_unmap, -+ "Register map failed"}, -+#endif -+ {kbase_device_io_history_init, kbase_device_io_history_term, -+ "Register access history initialization failed"}, -+ {kbase_device_pm_init, kbase_device_pm_term, -+ "Power management initialization failed"}, -+ {kbase_device_early_init, kbase_device_early_term, -+ "Early device initialization failed"}, -+ {kbase_device_populate_max_freq, NULL, -+ "Populating max frequency failed"}, -+ {kbase_device_misc_init, kbase_device_misc_term, -+ "Miscellaneous device initialization failed"}, -+ {kbase_ctx_sched_init, kbase_ctx_sched_term, -+ "Context scheduler initialization failed"}, -+ {kbase_mem_init, kbase_mem_term, -+ "Memory subsystem initialization failed"}, -+ {kbase_device_coherency_init, NULL, -+ "Device coherency init failed"}, -+ {kbase_protected_mode_init, kbase_protected_mode_term, -+ "Protected mode subsystem initialization failed"}, -+ {kbase_device_list_init, kbase_device_list_term, -+ "Device list setup failed"}, -+ {kbasep_js_devdata_init, kbasep_js_devdata_term, -+ "Job JS devdata initialization failed"}, -+ {kbase_device_timeline_init, kbase_device_timeline_term, -+ "Timeline stream initialization failed"}, -+ {kbase_clk_rate_trace_manager_init, -+ kbase_clk_rate_trace_manager_term, -+ "Clock rate trace manager initialization failed"}, -+ {kbase_device_hwcnt_backend_jm_init, -+ kbase_device_hwcnt_backend_jm_term, -+ "GPU hwcnt backend creation failed"}, -+ {kbase_device_hwcnt_context_init, kbase_device_hwcnt_context_term, -+ "GPU hwcnt context initialization failed"}, -+ {kbase_device_hwcnt_virtualizer_init, -+ kbase_device_hwcnt_virtualizer_term, -+ "GPU hwcnt virtualizer initialization failed"}, -+ {kbase_device_vinstr_init, kbase_device_vinstr_term, -+ "Virtual instrumentation initialization failed"}, -+ {kbase_backend_late_init, kbase_backend_late_term, -+ "Late backend initialization failed"}, -+#ifdef MALI_KBASE_BUILD -+ {kbase_debug_job_fault_dev_init, kbase_debug_job_fault_dev_term, -+ "Job fault debug initialization failed"}, -+ {kbase_device_debugfs_init, kbase_device_debugfs_term, -+ "DebugFS initialization failed"}, ++#if !IS_ENABLED(CONFIG_MALI_REAL_HW) ++ { kbase_gpu_device_create, kbase_gpu_device_destroy, "Dummy model initialization failed" }, ++#else /* !IS_ENABLED(CONFIG_MALI_REAL_HW) */ ++ { assign_irqs, NULL, "IRQ search failed" }, ++#endif /* !IS_ENABLED(CONFIG_MALI_REAL_HW) */ ++#if !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ { registers_map, registers_unmap, "Register map failed" }, ++#endif /* !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ ++ { kbase_device_io_history_init, kbase_device_io_history_term, ++ "Register access history initialization failed" }, ++ { kbase_device_pm_init, kbase_device_pm_term, "Power management initialization failed" }, ++ { kbase_device_early_init, kbase_device_early_term, "Early device initialization failed" }, ++ { kbase_device_populate_max_freq, NULL, "Populating max frequency failed" }, ++ { kbase_pm_lowest_gpu_freq_init, NULL, "Lowest freq initialization failed" }, ++ { kbase_device_misc_init, kbase_device_misc_term, ++ "Miscellaneous device initialization failed" }, ++ { kbase_device_pcm_dev_init, kbase_device_pcm_dev_term, ++ "Priority control manager initialization failed" }, ++ { kbase_ctx_sched_init, kbase_ctx_sched_term, "Context scheduler initialization failed" }, ++ { kbase_mem_init, kbase_mem_term, "Memory subsystem initialization failed" }, ++ { kbase_device_coherency_init, NULL, "Device coherency init failed" }, ++ { kbase_protected_mode_init, kbase_protected_mode_term, ++ "Protected mode subsystem initialization failed" }, ++ { kbase_device_list_init, kbase_device_list_term, "Device list setup failed" }, ++ { kbasep_js_devdata_init, kbasep_js_devdata_term, "Job JS devdata initialization failed" }, ++ { kbase_device_timeline_init, kbase_device_timeline_term, ++ "Timeline stream initialization failed" }, ++ { kbase_clk_rate_trace_manager_init, kbase_clk_rate_trace_manager_term, ++ "Clock rate trace manager initialization failed" }, ++ { kbase_instr_backend_init, kbase_instr_backend_term, ++ "Instrumentation backend initialization failed" }, ++ { kbase_device_hwcnt_watchdog_if_init, kbase_device_hwcnt_watchdog_if_term, ++ "GPU hwcnt backend watchdog interface creation failed" }, ++ { kbase_device_hwcnt_backend_jm_init, kbase_device_hwcnt_backend_jm_term, ++ "GPU hwcnt backend creation failed" }, ++ { kbase_device_hwcnt_backend_jm_watchdog_init, kbase_device_hwcnt_backend_jm_watchdog_term, ++ "GPU hwcnt watchdog backend creation failed" }, ++ { kbase_device_hwcnt_context_init, kbase_device_hwcnt_context_term, ++ "GPU hwcnt context initialization failed" }, ++ { kbase_device_hwcnt_virtualizer_init, kbase_device_hwcnt_virtualizer_term, ++ "GPU hwcnt virtualizer initialization failed" }, ++ { kbase_device_vinstr_init, kbase_device_vinstr_term, ++ "Virtual instrumentation initialization failed" }, ++ { kbase_device_kinstr_prfcnt_init, kbase_device_kinstr_prfcnt_term, ++ "Performance counter instrumentation initialization failed" }, ++ { kbase_backend_late_init, kbase_backend_late_term, "Late backend initialization failed" }, ++ { kbase_debug_job_fault_dev_init, kbase_debug_job_fault_dev_term, ++ "Job fault debug initialization failed" }, ++ { kbase_device_debugfs_init, kbase_device_debugfs_term, "DebugFS initialization failed" }, + /* Sysfs init needs to happen before registering the device with + * misc_register(), otherwise it causes a race condition between + * registering the device and a uevent event being generated for @@ -179961,17 +206069,13 @@ index 000000000000..8e853eb82fa1 + * paragraph that starts with "Word of warning", currently the + * second-last paragraph. + */ -+ {kbase_sysfs_init, kbase_sysfs_term, "SysFS group creation failed"}, -+ {kbase_device_misc_register, kbase_device_misc_deregister, -+ "Misc device registration failed"}, -+#ifdef CONFIG_MALI_BUSLOG -+ {buslog_init, buslog_term, "Bus log client registration failed"}, -+#endif -+ {kbase_gpuprops_populate_user_buffer, kbase_gpuprops_free_user_buffer, -+ "GPU property population failed"}, -+#endif -+ {kbase_dummy_job_wa_load, kbase_dummy_job_wa_cleanup, -+ "Dummy job workaround load failed"}, ++ { kbase_sysfs_init, kbase_sysfs_term, "SysFS group creation failed" }, ++ { kbase_device_misc_register, kbase_device_misc_deregister, ++ "Misc device registration failed" }, ++ { kbase_gpuprops_populate_user_buffer, kbase_gpuprops_free_user_buffer, ++ "GPU property population failed" }, ++ { NULL, kbase_dummy_job_wa_cleanup, NULL }, ++ { kbase_device_late_init, kbase_device_late_term, "Late device initialization failed" }, +}; + +static void kbase_device_term_partial(struct kbase_device *kbdev, @@ -180001,32 +206105,52 @@ index 000000000000..8e853eb82fa1 + kbase_disjoint_init(kbdev); + + for (i = 0; i < ARRAY_SIZE(dev_init); i++) { -+ err = dev_init[i].init(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "%s error = %d\n", ++ if (dev_init[i].init) { ++ err = dev_init[i].init(kbdev); ++ if (err) { ++ if (err != -EPROBE_DEFER) ++ dev_err(kbdev->dev, "%s error = %d\n", + dev_init[i].err_mes, err); -+ kbase_device_term_partial(kbdev, i); -+ break; ++ kbase_device_term_partial(kbdev, i); ++ break; ++ } + } + } + + return err; +} ++ ++int kbase_device_firmware_init_once(struct kbase_device *kbdev) ++{ ++ int ret = 0; ++ ++ mutex_lock(&kbdev->fw_load_lock); ++ ++ if (!kbdev->dummy_job_wa_loaded) { ++ ret = kbase_dummy_job_wa_load(kbdev); ++ if (!ret) ++ kbdev->dummy_job_wa_loaded = true; ++ } ++ ++ mutex_unlock(&kbdev->fw_load_lock); ++ ++ return ret; ++} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device.c b/drivers/gpu/arm/bifrost/device/mali_kbase_device.c new file mode 100755 -index 000000000000..76fb33a5e881 +index 000000000..b2b0cfd6c --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device.c -@@ -0,0 +1,411 @@ -+// SPDX-License-Identifier: GPL-2.0 +@@ -0,0 +1,611 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -180037,8 +206161,6 @@ index 000000000000..76fb33a5e881 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -180052,38 +206174,42 @@ index 000000000000..76fb33a5e881 +#include +#include +#include ++#include + +#include +#include +#include ++#include +#include +#include ++#include + +#include ++#include "mali_kbase_kinstr_prfcnt.h" +#include "mali_kbase_vinstr.h" -+#include "mali_kbase_hwcnt_context.h" -+#include "mali_kbase_hwcnt_virtualizer.h" ++#include "hwcnt/mali_kbase_hwcnt_context.h" ++#include "hwcnt/mali_kbase_hwcnt_virtualizer.h" + +#include "mali_kbase_device.h" ++#include "mali_kbase_device_internal.h" +#include "backend/gpu/mali_kbase_pm_internal.h" +#include "backend/gpu/mali_kbase_irq_internal.h" +#include "mali_kbase_regs_history_debugfs.h" ++#include "mali_kbase_pbha.h" + +#ifdef CONFIG_MALI_ARBITER_SUPPORT +#include "arbiter/mali_kbase_arbiter_pm.h" +#endif /* CONFIG_MALI_ARBITER_SUPPORT */ + -+/* NOTE: Magic - 0x45435254 (TRCE in ASCII). -+ * Supports tracing feature provided in the base module. -+ * Please keep it in sync with the value of base module. -+ */ -+#define TRACE_BUFFER_HEADER_SPECIAL 0x45435254 ++#if defined(CONFIG_DEBUG_FS) && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) + +/* Number of register accesses for the buffer that we allocate during + * initialization time. The buffer size can be changed later via debugfs. + */ +#define KBASEP_DEFAULT_REGISTER_HISTORY_SIZE ((u16)512) + ++#endif /* defined(CONFIG_DEBUG_FS) && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ ++ +static DEFINE_MUTEX(kbase_dev_list_lock); +static LIST_HEAD(kbase_dev_list); +static int kbase_dev_nr; @@ -180126,16 +206252,128 @@ index 000000000000..76fb33a5e881 + kbase_mmu_as_term(kbdev, i); +} + ++int kbase_device_pcm_dev_init(struct kbase_device *const kbdev) ++{ ++ int err = 0; ++ ++#if IS_ENABLED(CONFIG_OF) ++ struct device_node *prio_ctrl_node; ++ ++ /* Check to see whether or not a platform specific priority control manager ++ * is available. ++ */ ++ prio_ctrl_node = of_parse_phandle(kbdev->dev->of_node, ++ "priority-control-manager", 0); ++ if (!prio_ctrl_node) { ++ dev_info(kbdev->dev, ++ "No priority control manager is configured"); ++ } else { ++ struct platform_device *const pdev = ++ of_find_device_by_node(prio_ctrl_node); ++ ++ if (!pdev) { ++ dev_err(kbdev->dev, ++ "The configured priority control manager was not found"); ++ } else { ++ struct priority_control_manager_device *pcm_dev = ++ platform_get_drvdata(pdev); ++ if (!pcm_dev) { ++ dev_info(kbdev->dev, "Priority control manager is not ready"); ++ err = -EPROBE_DEFER; ++ } else if (!try_module_get(pcm_dev->owner)) { ++ dev_err(kbdev->dev, "Failed to get priority control manager module"); ++ err = -ENODEV; ++ } else { ++ dev_info(kbdev->dev, "Priority control manager successfully loaded"); ++ kbdev->pcm_dev = pcm_dev; ++ } ++ } ++ of_node_put(prio_ctrl_node); ++ } ++#endif /* CONFIG_OF */ ++ ++ return err; ++} ++ ++void kbase_device_pcm_dev_term(struct kbase_device *const kbdev) ++{ ++ if (kbdev->pcm_dev) ++ module_put(kbdev->pcm_dev->owner); ++} ++ ++#define KBASE_PAGES_TO_KIB(pages) (((unsigned int)pages) << (PAGE_SHIFT - 10)) ++ ++/** ++ * mali_oom_notifier_handler - Mali driver out-of-memory handler ++ * ++ * @nb: notifier block - used to retrieve kbdev pointer ++ * @action: action (unused) ++ * @data: data pointer (unused) ++ * ++ * This function simply lists memory usage by the Mali driver, per GPU device, ++ * for diagnostic purposes. ++ * ++ * Return: NOTIFY_OK on success, NOTIFY_BAD otherwise. ++ */ ++static int mali_oom_notifier_handler(struct notifier_block *nb, ++ unsigned long action, void *data) ++{ ++ struct kbase_device *kbdev; ++ struct kbase_context *kctx = NULL; ++ unsigned long kbdev_alloc_total; ++ ++ if (WARN_ON(nb == NULL)) ++ return NOTIFY_BAD; ++ ++ kbdev = container_of(nb, struct kbase_device, oom_notifier_block); ++ ++ kbdev_alloc_total = ++ KBASE_PAGES_TO_KIB(atomic_read(&(kbdev->memdev.used_pages))); ++ ++ dev_err(kbdev->dev, "OOM notifier: dev %s %lu kB\n", kbdev->devname, ++ kbdev_alloc_total); ++ ++ mutex_lock(&kbdev->kctx_list_lock); ++ ++ list_for_each_entry(kctx, &kbdev->kctx_list, kctx_list_link) { ++ struct pid *pid_struct; ++ struct task_struct *task; ++ struct pid *tgid_struct; ++ struct task_struct *tgid_task; ++ ++ unsigned long task_alloc_total = ++ KBASE_PAGES_TO_KIB(atomic_read(&(kctx->used_pages))); ++ ++ rcu_read_lock(); ++ pid_struct = find_get_pid(kctx->pid); ++ task = pid_task(pid_struct, PIDTYPE_PID); ++ tgid_struct = find_get_pid(kctx->tgid); ++ tgid_task = pid_task(tgid_struct, PIDTYPE_PID); ++ ++ dev_err(kbdev->dev, ++ "OOM notifier: tsk %s:%s tgid (%u) pid (%u) %lu kB\n", ++ tgid_task ? tgid_task->comm : "[null task]", ++ task ? task->comm : "[null comm]", kctx->tgid, ++ kctx->pid, task_alloc_total); ++ ++ put_pid(pid_struct); ++ rcu_read_unlock(); ++ } ++ ++ mutex_unlock(&kbdev->kctx_list_lock); ++ return NOTIFY_OK; ++} ++ +int kbase_device_misc_init(struct kbase_device * const kbdev) +{ + int err; -+#ifdef CONFIG_ARM64 ++#if IS_ENABLED(CONFIG_ARM64) + struct device_node *np = NULL; +#endif /* CONFIG_ARM64 */ + + spin_lock_init(&kbdev->mmu_mask_change); + mutex_init(&kbdev->mmu_hw_mutex); -+#ifdef CONFIG_ARM64 ++#if IS_ENABLED(CONFIG_ARM64) + kbdev->cci_snoop_enabled = false; + np = kbdev->dev->of_node; + if (np != NULL) { @@ -180156,6 +206394,7 @@ index 000000000000..76fb33a5e881 + } + } +#endif /* CONFIG_ARM64 */ ++ + /* Get the list of workarounds for issues on the current HW + * (identified by the GPU_ID register) + */ @@ -180172,11 +206411,6 @@ index 000000000000..76fb33a5e881 + if (err) + goto fail; + -+ /* On Linux 4.0+, dma coherency is determined from device tree */ -+#if defined(CONFIG_ARM64) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) -+ set_dma_ops(kbdev->dev, &noncoherent_swiotlb_dma_ops); -+#endif -+ + /* Workaround a pre-3.13 Linux issue, where dma_mask is NULL when our + * device structure was created by device-tree + */ @@ -180193,15 +206427,20 @@ index 000000000000..76fb33a5e881 + if (err) + goto dma_set_mask_failed; + ++ ++ /* There is no limit for Mali, so set to max. */ ++ if (kbdev->dev->dma_parms) ++ err = dma_set_max_seg_size(kbdev->dev, UINT_MAX); ++ if (err) ++ goto dma_set_mask_failed; ++ + kbdev->nr_hw_address_spaces = kbdev->gpu_props.num_address_spaces; + + err = kbase_device_all_as_init(kbdev); + if (err) + goto dma_set_mask_failed; + -+ spin_lock_init(&kbdev->hwcnt.lock); -+ -+ err = kbase_ktrace_init(kbdev); ++ err = kbase_pbha_read_dtb(kbdev); + if (err) + goto term_as; + @@ -180211,27 +206450,41 @@ index 000000000000..76fb33a5e881 + + atomic_set(&kbdev->ctx_num, 0); + -+ err = kbase_instr_backend_init(kbdev); -+ if (err) -+ goto term_trace; -+ + kbdev->pm.dvfs_period = DEFAULT_PM_DVFS_PERIOD; + -+ kbdev->reset_timeout_ms = DEFAULT_RESET_TIMEOUT_MS; -+ -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) -+ kbdev->mmu_mode = kbase_mmu_mode_get_aarch64(); -+ else -+ kbdev->mmu_mode = kbase_mmu_mode_get_lpae(); ++#if MALI_USE_CSF ++ kbdev->reset_timeout_ms = kbase_get_timeout_ms(kbdev, CSF_CSG_SUSPEND_TIMEOUT); ++#else ++ kbdev->reset_timeout_ms = JM_DEFAULT_RESET_TIMEOUT_MS; ++#endif /* MALI_USE_CSF */ + ++ kbdev->mmu_mode = kbase_mmu_mode_get_aarch64(); ++ kbdev->mmu_as_inactive_wait_time_ms = ++ kbase_get_timeout_ms(kbdev, MMU_AS_INACTIVE_WAIT_TIMEOUT); + mutex_init(&kbdev->kctx_list_lock); + INIT_LIST_HEAD(&kbdev->kctx_list); + -+ spin_lock_init(&kbdev->hwaccess_lock); ++ dev_dbg(kbdev->dev, "Registering mali_oom_notifier_handlern"); ++ kbdev->oom_notifier_block.notifier_call = mali_oom_notifier_handler; ++ err = register_oom_notifier(&kbdev->oom_notifier_block); ++ ++ if (err) { ++ dev_err(kbdev->dev, ++ "Unable to register OOM notifier for Mali - but will continue\n"); ++ kbdev->oom_notifier_block.notifier_call = NULL; ++ } ++ ++#if !MALI_USE_CSF ++ spin_lock_init(&kbdev->quick_reset_lock); ++ kbdev->quick_reset_enabled = true; ++ kbdev->num_of_atoms_hw_completed = 0; ++#endif + ++#if MALI_USE_CSF && IS_ENABLED(CONFIG_SYNC_FILE) ++ atomic_set(&kbdev->live_fence_metadata, 0); ++#endif + return 0; -+term_trace: -+ kbase_ktrace_term(kbdev); ++ +term_as: + kbase_device_all_as_term(kbdev); +dma_set_mask_failed: @@ -180248,14 +206501,45 @@ index 000000000000..76fb33a5e881 +#if KBASE_KTRACE_ENABLE + kbase_debug_assert_register_hook(NULL, NULL); +#endif ++ kbase_device_all_as_term(kbdev); + -+ kbase_instr_backend_term(kbdev); + -+ kbase_ktrace_term(kbdev); ++ if (kbdev->oom_notifier_block.notifier_call) ++ unregister_oom_notifier(&kbdev->oom_notifier_block); + -+ kbase_device_all_as_term(kbdev); ++#if MALI_USE_CSF && IS_ENABLED(CONFIG_SYNC_FILE) ++ if (atomic_read(&kbdev->live_fence_metadata) > 0) ++ dev_warn(kbdev->dev, "Terminating Kbase device with live fence metadata!"); ++#endif +} + ++#if !MALI_USE_CSF ++void kbase_enable_quick_reset(struct kbase_device *kbdev) ++{ ++ spin_lock(&kbdev->quick_reset_lock); ++ ++ kbdev->quick_reset_enabled = true; ++ kbdev->num_of_atoms_hw_completed = 0; ++ ++ spin_unlock(&kbdev->quick_reset_lock); ++} ++ ++void kbase_disable_quick_reset(struct kbase_device *kbdev) ++{ ++ spin_lock(&kbdev->quick_reset_lock); ++ ++ kbdev->quick_reset_enabled = false; ++ kbdev->num_of_atoms_hw_completed = 0; ++ ++ spin_unlock(&kbdev->quick_reset_lock); ++} ++ ++bool kbase_is_quick_reset_enabled(struct kbase_device *kbdev) ++{ ++ return kbdev->quick_reset_enabled; ++} ++#endif ++ +void kbase_device_free(struct kbase_device *kbdev) +{ + kfree(kbdev); @@ -180273,16 +206557,6 @@ index 000000000000..76fb33a5e881 + kbase_dev_nr++; +} + -+int kbase_device_hwcnt_backend_jm_init(struct kbase_device *kbdev) -+{ -+ return kbase_hwcnt_backend_jm_create(kbdev, &kbdev->hwcnt_gpu_iface); -+} -+ -+void kbase_device_hwcnt_backend_jm_term(struct kbase_device *kbdev) -+{ -+ kbase_hwcnt_backend_jm_destroy(&kbdev->hwcnt_gpu_iface); -+} -+ +int kbase_device_hwcnt_context_init(struct kbase_device *kbdev) +{ + return kbase_hwcnt_context_init(&kbdev->hwcnt_gpu_iface, @@ -180327,6 +206601,17 @@ index 000000000000..76fb33a5e881 + kbase_vinstr_term(kbdev->vinstr_ctx); +} + ++int kbase_device_kinstr_prfcnt_init(struct kbase_device *kbdev) ++{ ++ return kbase_kinstr_prfcnt_init(kbdev->hwcnt_gpu_virt, ++ &kbdev->kinstr_prfcnt_ctx); ++} ++ ++void kbase_device_kinstr_prfcnt_term(struct kbase_device *kbdev) ++{ ++ kbase_kinstr_prfcnt_term(kbdev->kinstr_prfcnt_ctx); ++} ++ +int kbase_device_io_history_init(struct kbase_device *kbdev) +{ + return kbase_io_history_init(&kbdev->io_history, @@ -180385,24 +206670,46 @@ index 000000000000..76fb33a5e881 +{ + int err; + -+ err = kbasep_platform_device_init(kbdev); ++ err = kbase_ktrace_init(kbdev); + if (err) + return err; + ++ ++ err = kbasep_platform_device_init(kbdev); ++ if (err) ++ goto ktrace_term; ++ + err = kbase_pm_runtime_init(kbdev); + if (err) + goto fail_runtime_pm; + ++ /* This spinlock is initialized before doing the first access to GPU ++ * registers and installing interrupt handlers. ++ */ ++ spin_lock_init(&kbdev->hwaccess_lock); ++ + /* Ensure we can access the GPU registers */ + kbase_pm_register_access_enable(kbdev); + -+ /* Find out GPU properties based on the GPU feature registers */ ++ /* ++ * Find out GPU properties based on the GPU feature registers. ++ * Note that this does not populate the few properties that depend on ++ * hw_features being initialized. Those are set by kbase_gpuprops_set_features ++ * soon after this in the init process. ++ */ + kbase_gpuprops_set(kbdev); + + /* We're done accessing the GPU registers for now. */ + kbase_pm_register_access_disable(kbdev); + ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ if (kbdev->arb.arb_if) ++ err = kbase_arbiter_pm_install_interrupts(kbdev); ++ else ++ err = kbase_install_interrupts(kbdev); ++#else + err = kbase_install_interrupts(kbdev); ++#endif + if (err) + goto fail_interrupts; + @@ -180412,6 +206719,8 @@ index 000000000000..76fb33a5e881 + kbase_pm_runtime_term(kbdev); +fail_runtime_pm: + kbasep_platform_device_term(kbdev); ++ktrace_term: ++ kbase_ktrace_term(kbdev); + + return err; +} @@ -180428,21 +206737,37 @@ index 000000000000..76fb33a5e881 +#endif /* CONFIG_MALI_ARBITER_SUPPORT */ + kbase_pm_runtime_term(kbdev); + kbasep_platform_device_term(kbdev); ++ kbase_ktrace_term(kbdev); ++} ++ ++int kbase_device_late_init(struct kbase_device *kbdev) ++{ ++ int err; ++ ++ err = kbasep_platform_device_late_init(kbdev); ++ ++ return err; ++} ++ ++void kbase_device_late_term(struct kbase_device *kbdev) ++{ ++ kbasep_platform_device_late_term(kbdev); +} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device.h b/drivers/gpu/arm/bifrost/device/mali_kbase_device.h new file mode 100755 -index 000000000000..33264bcc0464 +index 000000000..f02501100 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device.h -@@ -0,0 +1,177 @@ +@@ -0,0 +1,227 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -180453,15 +206778,12 @@ index 000000000000..33264bcc0464 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include + +/** + * kbase_device_get_list - get device list. -+ * + * Get access to device list. + * + * Return: Pointer to the linked list head. @@ -180478,20 +206800,33 @@ index 000000000000..33264bcc0464 +void kbase_device_put_list(const struct list_head *dev_list); + +/** -+ * Kbase_increment_device_id - increment device id. ++ * kbase_increment_device_id - increment device id. + * + * Used to increment device id on successful initialization of the device. + */ +void kbase_increment_device_id(void); + +/** ++ * kbase_device_firmware_init_once - Initialize firmware and HWC ++ * ++ * @kbdev: An instance of the GPU platform device, allocated from the probe ++ * method of the driver. ++ * ++ * When a device file is opened for the first time, ++ * load firmware and initialize hardware counter components. ++ * ++ * Return: 0 on success. An error code on failure. ++ */ ++int kbase_device_firmware_init_once(struct kbase_device *kbdev); ++ ++/** + * kbase_device_init - Device initialisation. + * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * + * This is called from device probe to initialise various other + * components needed. + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * + * Return: 0 on success and non-zero value on failure. + */ +int kbase_device_init(struct kbase_device *kbdev); @@ -180499,11 +206834,10 @@ index 000000000000..33264bcc0464 +/** + * kbase_device_term - Device termination. + * -+ * This is called from device remove to terminate various components that -+ * were initialised during kbase_device_init. -+ * + * @kbdev: The kbase device structure for the device (must be a valid pointer) + * ++ * This is called from device remove to terminate various components that ++ * were initialised during kbase_device_init. + */ +void kbase_device_term(struct kbase_device *kbdev); + @@ -180543,22 +206877,62 @@ index 000000000000..33264bcc0464 +bool kbase_is_gpu_removed(struct kbase_device *kbdev); + +/** ++ * kbase_gpu_cache_flush_pa_range_and_busy_wait() - Start a cache physical range flush ++ * and busy wait ++ * ++ * @kbdev: kbase device to issue the MMU operation on. ++ * @phys: Starting address of the physical range to start the operation on. ++ * @nr_bytes: Number of bytes to work on. ++ * @flush_op: Flush command register value to be sent to HW ++ * ++ * Issue a cache flush physical range command, then busy wait an irq status. ++ * This function will clear FLUSH_PA_RANGE_COMPLETED irq mask bit ++ * and busy-wait the rawstat register. ++ * ++ * Return: 0 if successful or a negative error code on failure. ++ */ ++#if MALI_USE_CSF ++int kbase_gpu_cache_flush_pa_range_and_busy_wait(struct kbase_device *kbdev, phys_addr_t phys, ++ size_t nr_bytes, u32 flush_op); ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * kbase_gpu_cache_flush_and_busy_wait - Start a cache flush and busy wait ++ * @kbdev: Kbase device ++ * @flush_op: Flush command register value to be sent to HW ++ * ++ * Issue a cache flush command to hardware, then busy wait an irq status. ++ * This function will clear CLEAN_CACHES_COMPLETED irq mask bit set by other ++ * threads through kbase_gpu_start_cache_clean(), and wake them up manually ++ * after the busy-wait is done. Any pended cache flush commands raised by ++ * other thread are handled in this function. ++ * hwaccess_lock must be held by the caller. ++ * ++ * Return: 0 if successful or a negative error code on failure. ++ */ ++int kbase_gpu_cache_flush_and_busy_wait(struct kbase_device *kbdev, ++ u32 flush_op); ++ ++/** + * kbase_gpu_start_cache_clean - Start a cache clean + * @kbdev: Kbase device ++ * @flush_op: Flush command register value to be sent to HW + * -+ * Issue a cache clean and invalidate command to hardware. This function will -+ * take hwaccess_lock. ++ * Issue a given cache flush command to hardware. ++ * This function will take hwaccess_lock. + */ -+void kbase_gpu_start_cache_clean(struct kbase_device *kbdev); ++void kbase_gpu_start_cache_clean(struct kbase_device *kbdev, u32 flush_op); + +/** + * kbase_gpu_start_cache_clean_nolock - Start a cache clean + * @kbdev: Kbase device ++ * @flush_op: Flush command register value to be sent to HW + * -+ * Issue a cache clean and invalidate command to hardware. hwaccess_lock -+ * must be held by the caller. ++ * Issue a given cache flush command to hardware. ++ * hwaccess_lock must be held by the caller. + */ -+void kbase_gpu_start_cache_clean_nolock(struct kbase_device *kbdev); ++void kbase_gpu_start_cache_clean_nolock(struct kbase_device *kbdev, ++ u32 flush_op); + +/** + * kbase_gpu_wait_cache_clean - Wait for cache cleaning to finish @@ -180595,7 +206969,7 @@ index 000000000000..33264bcc0464 +void kbase_gpu_cache_clean_wait_complete(struct kbase_device *kbdev); + +/** -+ * kbase_clean_caches_done - Issue preiously queued cache clean request or ++ * kbase_clean_caches_done - Issue previously queued cache clean request or + * wake up the requester that issued cache clean. + * @kbdev: Kbase device + * @@ -180614,19 +206988,19 @@ index 000000000000..33264bcc0464 +void kbase_gpu_interrupt(struct kbase_device *kbdev, u32 val); diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c b/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c new file mode 100755 -index 000000000000..3a75c6c05cfa +index 000000000..d55495045 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c -@@ -0,0 +1,184 @@ -+// SPDX-License-Identifier: GPL-2.0 +@@ -0,0 +1,291 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2016, 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2016, 2018-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -180637,8 +207011,6 @@ index 000000000000..3a75c6c05cfa + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -180649,56 +207021,156 @@ index 000000000000..3a75c6c05cfa +#include +#include + -+#if !defined(CONFIG_MALI_BIFROST_NO_MALI) -+void kbase_reg_write(struct kbase_device *kbdev, u32 offset, u32 value) ++#if !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++bool kbase_is_gpu_removed(struct kbase_device *kbdev) +{ -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_powered); -+ KBASE_DEBUG_ASSERT(kbdev->dev != NULL); ++ u32 val; + -+ writel(value, kbdev->reg + offset); ++ val = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_ID)); + -+#ifdef CONFIG_DEBUG_FS -+ if (unlikely(kbdev->io_history.enabled)) -+ kbase_io_history_add(&kbdev->io_history, kbdev->reg + offset, -+ value, 1); -+#endif /* CONFIG_DEBUG_FS */ -+ dev_dbg(kbdev->dev, "w: reg %08x val %08x", offset, value); ++ return val == 0; +} ++#endif /* !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ + -+KBASE_EXPORT_TEST_API(kbase_reg_write); -+ -+u32 kbase_reg_read(struct kbase_device *kbdev, u32 offset) ++static int busy_wait_on_irq(struct kbase_device *kbdev, u32 irq_bit) +{ -+ u32 val; ++ char *irq_flag_name; ++ /* Previously MMU-AS command was used for L2 cache flush on page-table update. ++ * And we're using the same max-loops count for GPU command, because amount of ++ * L2 cache flush overhead are same between them. ++ */ ++ unsigned int max_loops = KBASE_AS_INACTIVE_MAX_LOOPS; + -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_powered); -+ KBASE_DEBUG_ASSERT(kbdev->dev != NULL); ++ /* Wait for the GPU cache clean operation to complete */ ++ while (--max_loops && ++ !(kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_RAWSTAT)) & irq_bit)) { ++ ; ++ } + -+ val = readl(kbdev->reg + offset); ++ /* reset gpu if time-out occurred */ ++ if (max_loops == 0) { ++ switch (irq_bit) { ++ case CLEAN_CACHES_COMPLETED: ++ irq_flag_name = "CLEAN_CACHES_COMPLETED"; ++ break; ++ case FLUSH_PA_RANGE_COMPLETED: ++ irq_flag_name = "FLUSH_PA_RANGE_COMPLETED"; ++ break; ++ default: ++ irq_flag_name = "UNKNOWN"; ++ break; ++ } + -+#ifdef CONFIG_DEBUG_FS -+ if (unlikely(kbdev->io_history.enabled)) -+ kbase_io_history_add(&kbdev->io_history, kbdev->reg + offset, -+ val, 0); -+#endif /* CONFIG_DEBUG_FS */ -+ dev_dbg(kbdev->dev, "r: reg %08x val %08x", offset, val); ++ dev_err(kbdev->dev, ++ "Stuck waiting on %s bit, might be caused by slow/unstable GPU clock or possible faulty FPGA connector\n", ++ irq_flag_name); + -+ return val; ++ if (kbase_prepare_to_reset_gpu_locked(kbdev, RESET_FLAGS_NONE)) ++ kbase_reset_gpu_locked(kbdev); ++ return -EBUSY; ++ } ++ ++ /* Clear the interrupt bit. */ ++ KBASE_KTRACE_ADD(kbdev, CORE_GPU_IRQ_CLEAR, NULL, irq_bit); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), irq_bit); ++ ++ return 0; +} + -+KBASE_EXPORT_TEST_API(kbase_reg_read); ++#if MALI_USE_CSF ++#define U64_LO_MASK ((1ULL << 32) - 1) ++#define U64_HI_MASK (~U64_LO_MASK) + -+bool kbase_is_gpu_removed(struct kbase_device *kbdev) ++int kbase_gpu_cache_flush_pa_range_and_busy_wait(struct kbase_device *kbdev, phys_addr_t phys, ++ size_t nr_bytes, u32 flush_op) +{ -+ u32 val; ++ u64 start_pa, end_pa; ++ int ret = 0; + -+ val = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_ID)); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ return val == 0; ++ /* 1. Clear the interrupt FLUSH_PA_RANGE_COMPLETED bit. */ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), FLUSH_PA_RANGE_COMPLETED); ++ ++ /* 2. Issue GPU_CONTROL.COMMAND.FLUSH_PA_RANGE operation. */ ++ start_pa = phys; ++ end_pa = start_pa + nr_bytes - 1; ++ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND_ARG0_LO), start_pa & U64_LO_MASK); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND_ARG0_HI), ++ (start_pa & U64_HI_MASK) >> 32); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND_ARG1_LO), end_pa & U64_LO_MASK); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND_ARG1_HI), (end_pa & U64_HI_MASK) >> 32); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), flush_op); ++ ++ /* 3. Busy-wait irq status to be enabled. */ ++ ret = busy_wait_on_irq(kbdev, (u32)FLUSH_PA_RANGE_COMPLETED); ++ ++ return ret; ++} ++#endif /* MALI_USE_CSF */ ++ ++int kbase_gpu_cache_flush_and_busy_wait(struct kbase_device *kbdev, ++ u32 flush_op) ++{ ++ int need_to_wake_up = 0; ++ int ret = 0; ++ ++ /* hwaccess_lock must be held to avoid any sync issue with ++ * kbase_gpu_start_cache_clean() / kbase_clean_caches_done() ++ */ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ /* 1. Check if kbdev->cache_clean_in_progress is set. ++ * If it is set, it means there are threads waiting for ++ * CLEAN_CACHES_COMPLETED irq to be raised and that the ++ * corresponding irq mask bit is set. ++ * We'll clear the irq mask bit and busy-wait for the cache ++ * clean operation to complete before submitting the cache ++ * clean command required after the GPU page table update. ++ * Pended flush commands will be merged to requested command. ++ */ ++ if (kbdev->cache_clean_in_progress) { ++ /* disable irq first */ ++ u32 irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK)); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), ++ irq_mask & ~CLEAN_CACHES_COMPLETED); ++ ++ /* busy wait irq status to be enabled */ ++ ret = busy_wait_on_irq(kbdev, (u32)CLEAN_CACHES_COMPLETED); ++ if (ret) ++ return ret; ++ ++ /* merge pended command if there's any */ ++ flush_op = GPU_COMMAND_FLUSH_CACHE_MERGE( ++ kbdev->cache_clean_queued, flush_op); ++ ++ /* enable wake up notify flag */ ++ need_to_wake_up = 1; ++ } else { ++ /* Clear the interrupt CLEAN_CACHES_COMPLETED bit. */ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), ++ CLEAN_CACHES_COMPLETED); ++ } ++ ++ /* 2. Issue GPU_CONTROL.COMMAND.FLUSH_CACHE operation. */ ++ KBASE_KTRACE_ADD(kbdev, CORE_GPU_CLEAN_INV_CACHES, NULL, flush_op); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), flush_op); ++ ++ /* 3. Busy-wait irq status to be enabled. */ ++ ret = busy_wait_on_irq(kbdev, (u32)CLEAN_CACHES_COMPLETED); ++ if (ret) ++ return ret; ++ ++ /* 4. Wake-up blocked threads when there is any. */ ++ if (need_to_wake_up) ++ kbase_gpu_cache_clean_wait_complete(kbdev); ++ ++ return ret; +} -+#endif /* !defined(CONFIG_MALI_BIFROST_NO_MALI) */ + -+void kbase_gpu_start_cache_clean_nolock(struct kbase_device *kbdev) ++void kbase_gpu_start_cache_clean_nolock(struct kbase_device *kbdev, ++ u32 flush_op) +{ + u32 irq_mask; + @@ -180707,10 +207179,11 @@ index 000000000000..3a75c6c05cfa + if (kbdev->cache_clean_in_progress) { + /* If this is called while another clean is in progress, we + * can't rely on the current one to flush any new changes in -+ * the cache. Instead, trigger another cache clean immediately -+ * after this one finishes. ++ * the cache. Instead, accumulate all cache clean operations ++ * and trigger that immediately after this one finishes. + */ -+ kbdev->cache_clean_queued = true; ++ kbdev->cache_clean_queued = GPU_COMMAND_FLUSH_CACHE_MERGE( ++ kbdev->cache_clean_queued, flush_op); + return; + } + @@ -180719,19 +207192,18 @@ index 000000000000..3a75c6c05cfa + kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), + irq_mask | CLEAN_CACHES_COMPLETED); + -+ KBASE_KTRACE_ADD(kbdev, CORE_GPU_CLEAN_INV_CACHES, NULL, 0); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_CLEAN_INV_CACHES); ++ KBASE_KTRACE_ADD(kbdev, CORE_GPU_CLEAN_INV_CACHES, NULL, flush_op); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), flush_op); + + kbdev->cache_clean_in_progress = true; +} + -+void kbase_gpu_start_cache_clean(struct kbase_device *kbdev) ++void kbase_gpu_start_cache_clean(struct kbase_device *kbdev, u32 flush_op) +{ + unsigned long flags; + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_gpu_start_cache_clean_nolock(kbdev); ++ kbase_gpu_start_cache_clean_nolock(kbdev, flush_op); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} + @@ -180739,7 +207211,7 @@ index 000000000000..3a75c6c05cfa +{ + lockdep_assert_held(&kbdev->hwaccess_lock); + -+ kbdev->cache_clean_queued = false; ++ kbdev->cache_clean_queued = 0; + kbdev->cache_clean_in_progress = false; + wake_up(&kbdev->cache_clean_wait); +} @@ -180751,19 +207223,28 @@ index 000000000000..3a75c6c05cfa + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ if (kbdev->cache_clean_queued) { -+ kbdev->cache_clean_queued = false; ++ if (kbdev->cache_clean_in_progress) { ++ /* Clear the interrupt CLEAN_CACHES_COMPLETED bit if set. ++ * It might have already been done by kbase_gpu_cache_flush_and_busy_wait. ++ */ ++ KBASE_KTRACE_ADD(kbdev, CORE_GPU_IRQ_CLEAR, NULL, CLEAN_CACHES_COMPLETED); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), CLEAN_CACHES_COMPLETED); + -+ KBASE_KTRACE_ADD(kbdev, CORE_GPU_CLEAN_INV_CACHES, NULL, 0); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_CLEAN_INV_CACHES); -+ } else { -+ /* Disable interrupt */ -+ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK)); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), -+ irq_mask & ~CLEAN_CACHES_COMPLETED); ++ if (kbdev->cache_clean_queued) { ++ u32 pended_flush_op = kbdev->cache_clean_queued; + -+ kbase_gpu_cache_clean_wait_complete(kbdev); ++ kbdev->cache_clean_queued = 0; ++ ++ KBASE_KTRACE_ADD(kbdev, CORE_GPU_CLEAN_INV_CACHES, NULL, pended_flush_op); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), pended_flush_op); ++ } else { ++ /* Disable interrupt */ ++ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK)); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), ++ irq_mask & ~CLEAN_CACHES_COMPLETED); ++ ++ kbase_gpu_cache_clean_wait_complete(kbdev); ++ } + } + + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); @@ -180804,18 +207285,19 @@ index 000000000000..3a75c6c05cfa +} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h b/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h new file mode 100755 -index 000000000000..54644582eac5 +index 000000000..6f77592df --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h -@@ -0,0 +1,78 @@ +@@ -0,0 +1,101 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -180826,8 +207308,6 @@ index 000000000000..54644582eac5 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -180850,12 +207330,12 @@ index 000000000000..54644582eac5 +int kbase_device_vinstr_init(struct kbase_device *kbdev); +void kbase_device_vinstr_term(struct kbase_device *kbdev); + ++int kbase_device_kinstr_prfcnt_init(struct kbase_device *kbdev); ++void kbase_device_kinstr_prfcnt_term(struct kbase_device *kbdev); ++ +int kbase_device_timeline_init(struct kbase_device *kbdev); +void kbase_device_timeline_term(struct kbase_device *kbdev); + -+int kbase_device_hwcnt_backend_jm_init(struct kbase_device *kbdev); -+void kbase_device_hwcnt_backend_jm_term(struct kbase_device *kbdev); -+ +int kbase_device_hwcnt_context_init(struct kbase_device *kbdev); +void kbase_device_hwcnt_context_term(struct kbase_device *kbdev); + @@ -180886,20 +207366,78 @@ index 000000000000..54644582eac5 + * @kbdev: Device pointer + */ +void kbase_device_early_term(struct kbase_device *kbdev); ++ ++/** ++ * kbase_device_late_init - Complete any device-specific initialization. ++ * @kbdev: Device pointer ++ * ++ * Return: 0 on success, or an error code on failure. ++ */ ++int kbase_device_late_init(struct kbase_device *kbdev); ++ ++/** ++ * kbase_device_late_term - Complete any device-specific termination. ++ * @kbdev: Device pointer ++ */ ++void kbase_device_late_term(struct kbase_device *kbdev); ++ ++#if MALI_USE_CSF && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++/** ++ * kbase_is_register_accessible - Checks if register is accessible ++ * @offset: Register offset ++ * ++ * Return: true if the register is accessible, false otherwise. ++ */ ++bool kbase_is_register_accessible(u32 offset); ++#endif /* MALI_USE_CSF && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ +diff --git a/drivers/gpu/arm/bifrost/gpu/Kbuild b/drivers/gpu/arm/bifrost/gpu/Kbuild +new file mode 100644 +index 000000000..f3a48caf6 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/gpu/Kbuild +@@ -0,0 +1,27 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++# ++# (C) COPYRIGHT 2012, 2020-2021 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU license. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, you can access it online at ++# http://www.gnu.org/licenses/gpl-2.0.html. ++# ++# ++ ++bifrost_kbase-y += gpu/mali_kbase_gpu.o ++ ++ifeq ($(CONFIG_MALI_CSF_SUPPORT),y) ++ bifrost_kbase-y += gpu/backend/mali_kbase_gpu_fault_csf.o ++else ++ bifrost_kbase-y += gpu/backend/mali_kbase_gpu_fault_jm.o ++endif diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c new file mode 100755 -index 000000000000..f7e9b125ba8b +index 000000000..60ba9beab --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c -@@ -0,0 +1,105 @@ +@@ -0,0 +1,179 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -180910,42 +207448,44 @@ index 000000000000..f7e9b125ba8b + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include -+#include "csf/mali_gpu_csf_registers.h" -+#include "../mali_kbase_gpu_fault.h" ++#include ++#include + +const char *kbase_gpu_exception_name(u32 const exception_code) +{ + const char *e; + + switch (exception_code) { -+ /* Command Stream exceptions */ ++ /* CS exceptions */ + case CS_FAULT_EXCEPTION_TYPE_CS_RESOURCE_TERMINATED: + e = "CS_RESOURCE_TERMINATED"; + break; + case CS_FAULT_EXCEPTION_TYPE_CS_INHERIT_FAULT: + e = "CS_INHERIT_FAULT"; + break; -+ /* Command Stream fatal exceptions */ ++ /* CS fatal exceptions */ + case CS_FATAL_EXCEPTION_TYPE_CS_CONFIG_FAULT: + e = "CS_CONFIG_FAULT"; + break; + case CS_FATAL_EXCEPTION_TYPE_CS_ENDPOINT_FAULT: + e = "FATAL_CS_ENDPOINT_FAULT"; + break; -+ case CS_FATAL_EXCEPTION_TYPE_CS_BUS_FAULT: -+ e = "FATAL_CS_BUS_FAULT"; -+ break; + case CS_FATAL_EXCEPTION_TYPE_CS_INVALID_INSTRUCTION: + e = "FATAL_CS_INVALID_INSTRUCTION"; + break; + case CS_FATAL_EXCEPTION_TYPE_CS_CALL_STACK_OVERFLOW: + e = "FATAL_CS_CALL_STACK_OVERFLOW"; + break; ++ /* ++ * CS_FAULT_EXCEPTION_TYPE_CS_BUS_FAULT and CS_FATAL_EXCEPTION_TYPE_CS_BUS_FAULT share the same error code ++ * Type of CS_BUS_FAULT will be differentiated by CSF exception handler ++ */ ++ case CS_FAULT_EXCEPTION_TYPE_CS_BUS_FAULT: ++ e = "CS_BUS_FAULT"; ++ break; + /* Shader exceptions */ + case CS_FAULT_EXCEPTION_TYPE_INSTR_INVALID_PC: + e = "INSTR_INVALID_PC"; @@ -180956,6 +207496,10 @@ index 000000000000..f7e9b125ba8b + case CS_FAULT_EXCEPTION_TYPE_INSTR_BARRIER_FAULT: + e = "INSTR_BARRIER_FAULT"; + break; ++ /* Iterator exceptions */ ++ case CS_FAULT_EXCEPTION_TYPE_KABOOM: ++ e = "KABOOM"; ++ break; + /* Misc exceptions */ + case CS_FAULT_EXCEPTION_TYPE_DATA_INVALID_FAULT: + e = "DATA_INVALID_FAULT"; @@ -180973,6 +207517,9 @@ index 000000000000..f7e9b125ba8b + case CS_FATAL_EXCEPTION_TYPE_FIRMWARE_INTERNAL_ERROR: + e = "FIRMWARE_INTERNAL_ERROR"; + break; ++ case CS_FATAL_EXCEPTION_TYPE_CS_UNRECOVERABLE: ++ e = "CS_UNRECOVERABLE"; ++ break; + case CS_FAULT_EXCEPTION_TYPE_RESOURCE_EVICTION_TIMEOUT: + e = "RESOURCE_EVICTION_TIMEOUT"; + break; @@ -180989,6 +207536,70 @@ index 000000000000..f7e9b125ba8b + case GPU_FAULTSTATUS_EXCEPTION_TYPE_GPU_CACHEABILITY_FAULT: + e = "GPU_CACHEABILITY_FAULT"; + break; ++ /* MMU Fault */ ++ case CS_FAULT_EXCEPTION_TYPE_TRANSLATION_FAULT_L0: ++ e = "TRANSLATION_FAULT at level 0"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_TRANSLATION_FAULT_L1: ++ e = "TRANSLATION_FAULT at level 1"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_TRANSLATION_FAULT_L2: ++ e = "TRANSLATION_FAULT at level 2"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_TRANSLATION_FAULT_L3: ++ e = "TRANSLATION_FAULT at level 3"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_TRANSLATION_FAULT_L4: ++ e = "TRANSLATION_FAULT"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_PERMISSION_FAULT_0: ++ e = "PERMISSION_FAULT at level 0"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_PERMISSION_FAULT_1: ++ e = "PERMISSION_FAULT at level 1"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_PERMISSION_FAULT_2: ++ e = "PERMISSION_FAULT at level 2"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_PERMISSION_FAULT_3: ++ e = "PERMISSION_FAULT at level 3"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_ACCESS_FLAG_1: ++ e = "ACCESS_FLAG at level 1"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_ACCESS_FLAG_2: ++ e = "ACCESS_FLAG at level 2"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_ACCESS_FLAG_3: ++ e = "ACCESS_FLAG at level 3"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_ADDRESS_SIZE_FAULT_IN: ++ e = "ADDRESS_SIZE_FAULT_IN"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_ADDRESS_SIZE_FAULT_OUT_0: ++ e = "ADDRESS_SIZE_FAULT_OUT_0 at level 0"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_ADDRESS_SIZE_FAULT_OUT_1: ++ e = "ADDRESS_SIZE_FAULT_OUT_1 at level 1"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_ADDRESS_SIZE_FAULT_OUT_2: ++ e = "ADDRESS_SIZE_FAULT_OUT_2 at level 2"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_ADDRESS_SIZE_FAULT_OUT_3: ++ e = "ADDRESS_SIZE_FAULT_OUT_3 at level 3"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_MEMORY_ATTRIBUTE_FAULT_0: ++ e = "MEMORY_ATTRIBUTE_FAULT_0 at level 0"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_MEMORY_ATTRIBUTE_FAULT_1: ++ e = "MEMORY_ATTRIBUTE_FAULT_1 at level 1"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_MEMORY_ATTRIBUTE_FAULT_2: ++ e = "MEMORY_ATTRIBUTE_FAULT_2 at level 2"; ++ break; ++ case CS_FAULT_EXCEPTION_TYPE_MEMORY_ATTRIBUTE_FAULT_3: ++ e = "MEMORY_ATTRIBUTE_FAULT_3 at level 3"; ++ break; + /* Any other exception code is unknown */ + default: + e = "UNKNOWN"; @@ -180999,18 +207610,19 @@ index 000000000000..f7e9b125ba8b +} diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c new file mode 100755 -index 000000000000..56f541516489 +index 000000000..7f3743ca6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c -@@ -0,0 +1,177 @@ +@@ -0,0 +1,176 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -181021,13 +207633,11 @@ index 000000000000..56f541516489 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include + -+#include "../mali_kbase_gpu_fault.h" ++#include + +const char *kbase_gpu_exception_name(u32 const exception_code) +{ @@ -181176,24 +207786,25 @@ index 000000000000..56f541516489 + default: + e = "UNKNOWN"; + break; -+ }; ++ } + + return e; +} diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h new file mode 100755 -index 000000000000..ff6e4ae47184 +index 000000000..e7457ddb5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h -@@ -0,0 +1,297 @@ +@@ -0,0 +1,381 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -181204,20 +207815,55 @@ index 000000000000..ff6e4ae47184 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_GPU_REGMAP_CSF_H_ +#define _KBASE_GPU_REGMAP_CSF_H_ + -+#if !MALI_USE_CSF ++#include ++ ++#if !MALI_USE_CSF && defined(__KERNEL__) +#error "Cannot be compiled with JM" +#endif + -+#include "csf/mali_gpu_csf_control_registers.h" -+#define GPU_CONTROL_MCU_REG(r) (GPU_CONTROL_MCU + (r)) ++/* GPU_CONTROL_MCU base address */ ++#define GPU_CONTROL_MCU_BASE 0x3000 ++ ++/* MCU_SUBSYSTEM base address */ ++#define MCU_SUBSYSTEM_BASE 0x20000 ++ ++/* IPA control registers */ ++#define COMMAND 0x000 /* (WO) Command register */ ++#define TIMER 0x008 /* (RW) Timer control register */ ++ ++#define SELECT_CSHW_LO 0x010 /* (RW) Counter select for CS hardware, low word */ ++#define SELECT_CSHW_HI 0x014 /* (RW) Counter select for CS hardware, high word */ ++#define SELECT_MEMSYS_LO 0x018 /* (RW) Counter select for Memory system, low word */ ++#define SELECT_MEMSYS_HI 0x01C /* (RW) Counter select for Memory system, high word */ ++#define SELECT_TILER_LO 0x020 /* (RW) Counter select for Tiler cores, low word */ ++#define SELECT_TILER_HI 0x024 /* (RW) Counter select for Tiler cores, high word */ ++#define SELECT_SHADER_LO 0x028 /* (RW) Counter select for Shader cores, low word */ ++#define SELECT_SHADER_HI 0x02C /* (RW) Counter select for Shader cores, high word */ ++ ++/* Accumulated counter values for CS hardware */ ++#define VALUE_CSHW_BASE 0x100 ++#define VALUE_CSHW_REG_LO(n) (VALUE_CSHW_BASE + ((n) << 3)) /* (RO) Counter value #n, low word */ ++#define VALUE_CSHW_REG_HI(n) (VALUE_CSHW_BASE + ((n) << 3) + 4) /* (RO) Counter value #n, high word */ ++ ++/* Accumulated counter values for memory system */ ++#define VALUE_MEMSYS_BASE 0x140 ++#define VALUE_MEMSYS_REG_LO(n) (VALUE_MEMSYS_BASE + ((n) << 3)) /* (RO) Counter value #n, low word */ ++#define VALUE_MEMSYS_REG_HI(n) (VALUE_MEMSYS_BASE + ((n) << 3) + 4) /* (RO) Counter value #n, high word */ ++ ++#define VALUE_TILER_BASE 0x180 ++#define VALUE_TILER_REG_LO(n) (VALUE_TILER_BASE + ((n) << 3)) /* (RO) Counter value #n, low word */ ++#define VALUE_TILER_REG_HI(n) (VALUE_TILER_BASE + ((n) << 3) + 4) /* (RO) Counter value #n, high word */ + ++#define VALUE_SHADER_BASE 0x1C0 ++#define VALUE_SHADER_REG_LO(n) (VALUE_SHADER_BASE + ((n) << 3)) /* (RO) Counter value #n, low word */ ++#define VALUE_SHADER_REG_HI(n) (VALUE_SHADER_BASE + ((n) << 3) + 4) /* (RO) Counter value #n, high word */ ++ ++#define AS_STATUS_AS_ACTIVE_INT 0x2 + +/* Set to implementation defined, outer caching */ +#define AS_MEMATTR_AARCH64_OUTER_IMPL_DEF 0x88ull @@ -181256,13 +207902,14 @@ index 000000000000..ff6e4ae47184 +/* Normal memory, shared between MCU and Host */ +#define AS_MEMATTR_INDEX_SHARED 6 + -+/* Configuration bits for the Command Stream Frontend. */ ++/* Configuration bits for the CSF. */ +#define CSF_CONFIG 0xF00 + +/* CSF_CONFIG register */ +#define CSF_CONFIG_FORCE_COHERENCY_FEATURES_SHIFT 2 + +/* GPU control registers */ ++#define CORE_FEATURES 0x008 /* () Shader Core Features */ +#define MCU_CONTROL 0x700 +#define MCU_STATUS 0x704 + @@ -181270,44 +207917,31 @@ index 000000000000..ff6e4ae47184 +#define MCU_CNTRL_AUTO (1 << 1) +#define MCU_CNTRL_DISABLE (0) + -+#define MCU_STATUS_HALTED (1 << 1) -+ -+#define PRFCNT_BASE_LO 0x060 /* (RW) Performance counter memory -+ * region base address, low word -+ */ -+#define PRFCNT_BASE_HI 0x064 /* (RW) Performance counter memory -+ * region base address, high word -+ */ -+#define PRFCNT_CONFIG 0x068 /* (RW) Performance counter -+ * configuration -+ */ ++#define MCU_CNTRL_DOORBELL_DISABLE_SHIFT (31) ++#define MCU_CNTRL_DOORBELL_DISABLE_MASK (1 << MCU_CNTRL_DOORBELL_DISABLE_SHIFT) + -+#define PRFCNT_CSHW_EN 0x06C /* (RW) Performance counter -+ * enable for Command Stream Hardware -+ */ ++#define MCU_STATUS_HALTED (1 << 1) + -+#define PRFCNT_SHADER_EN 0x070 /* (RW) Performance counter enable -+ * flags for shader cores -+ */ -+#define PRFCNT_TILER_EN 0x074 /* (RW) Performance counter enable -+ * flags for tiler -+ */ -+#define PRFCNT_MMU_L2_EN 0x07C /* (RW) Performance counter enable -+ * flags for MMU/L2 cache -+ */ ++#define L2_CONFIG_PBHA_HWU_SHIFT GPU_U(12) ++#define L2_CONFIG_PBHA_HWU_MASK (GPU_U(0xF) << L2_CONFIG_PBHA_HWU_SHIFT) ++#define L2_CONFIG_PBHA_HWU_GET(reg_val) \ ++ (((reg_val)&L2_CONFIG_PBHA_HWU_MASK) >> L2_CONFIG_PBHA_HWU_SHIFT) ++#define L2_CONFIG_PBHA_HWU_SET(reg_val, value) \ ++ (((reg_val) & ~L2_CONFIG_PBHA_HWU_MASK) | \ ++ (((value) << L2_CONFIG_PBHA_HWU_SHIFT) & L2_CONFIG_PBHA_HWU_MASK)) + +/* JOB IRQ flags */ -+#define JOB_IRQ_GLOBAL_IF (1 << 31) /* Global interface interrupt received */ ++#define JOB_IRQ_GLOBAL_IF (1u << 31) /* Global interface interrupt received */ + +/* GPU_COMMAND codes */ +#define GPU_COMMAND_CODE_NOP 0x00 /* No operation, nothing happens */ +#define GPU_COMMAND_CODE_RESET 0x01 /* Reset the GPU */ -+#define GPU_COMMAND_CODE_PRFCNT 0x02 /* Clear or sample performance counters */ +#define GPU_COMMAND_CODE_TIME 0x03 /* Configure time sources */ +#define GPU_COMMAND_CODE_FLUSH_CACHES 0x04 /* Flush caches */ +#define GPU_COMMAND_CODE_SET_PROTECTED_MODE 0x05 /* Places the GPU in protected mode */ +#define GPU_COMMAND_CODE_FINISH_HALT 0x06 /* Halt CSF */ +#define GPU_COMMAND_CODE_CLEAR_FAULT 0x07 /* Clear GPU_FAULTSTATUS and GPU_FAULTADDRESS, TODX */ ++#define GPU_COMMAND_CODE_FLUSH_PA_RANGE 0x08 /* Flush the GPU caches for a physical range, TITX */ + +/* GPU_COMMAND_RESET payloads */ + @@ -181316,7 +207950,7 @@ index 000000000000..ff6e4ae47184 + */ +#define GPU_COMMAND_RESET_PAYLOAD_FAST_RESET 0x00 + -+/* This will leave the state of active command streams UNDEFINED, but will leave the external bus in a defined and ++/* This will leave the state of active CSs UNDEFINED, but will leave the external bus in a defined and + * idle state. + */ +#define GPU_COMMAND_RESET_PAYLOAD_SOFT_RESET 0x01 @@ -181326,23 +207960,38 @@ index 000000000000..ff6e4ae47184 + */ +#define GPU_COMMAND_RESET_PAYLOAD_HARD_RESET 0x02 + -+/* GPU_COMMAND_PRFCNT payloads */ -+#define GPU_COMMAND_PRFCNT_PAYLOAD_SAMPLE 0x01 /* Sample performance counters */ -+#define GPU_COMMAND_PRFCNT_PAYLOAD_CLEAR 0x02 /* Clear performance counters */ -+ +/* GPU_COMMAND_TIME payloads */ +#define GPU_COMMAND_TIME_DISABLE 0x00 /* Disable cycle counter */ +#define GPU_COMMAND_TIME_ENABLE 0x01 /* Enable cycle counter */ + -+/* GPU_COMMAND_FLUSH_CACHES payloads */ -+#define GPU_COMMAND_FLUSH_PAYLOAD_NONE 0x00 /* No flush */ -+#define GPU_COMMAND_FLUSH_PAYLOAD_CLEAN 0x01 /* Clean the caches */ -+#define GPU_COMMAND_FLUSH_PAYLOAD_INVALIDATE 0x02 /* Invalidate the caches */ -+#define GPU_COMMAND_FLUSH_PAYLOAD_CLEAN_INVALIDATE 0x03 /* Clean and invalidate the caches */ ++/* GPU_COMMAND_FLUSH_CACHES payloads bits for L2 caches */ ++#define GPU_COMMAND_FLUSH_CACHES_PAYLOAD_L2_NONE 0x000 /* No flush */ ++#define GPU_COMMAND_FLUSH_CACHES_PAYLOAD_L2_CLEAN 0x001 /* CLN only */ ++#define GPU_COMMAND_FLUSH_CACHES_PAYLOAD_L2_CLEAN_INVALIDATE 0x003 /* CLN + INV */ ++ ++/* GPU_COMMAND_FLUSH_CACHES payloads bits for Load-store caches */ ++#define GPU_COMMAND_FLUSH_CACHES_PAYLOAD_LSC_NONE 0x000 /* No flush */ ++#define GPU_COMMAND_FLUSH_CACHES_PAYLOAD_LSC_CLEAN 0x010 /* CLN only */ ++#define GPU_COMMAND_FLUSH_CACHES_PAYLOAD_LSC_CLEAN_INVALIDATE 0x030 /* CLN + INV */ ++ ++/* GPU_COMMAND_FLUSH_CACHES payloads bits for Other caches */ ++#define GPU_COMMAND_FLUSH_CACHES_PAYLOAD_OTHER_NONE 0x000 /* No flush */ ++#define GPU_COMMAND_FLUSH_CACHES_PAYLOAD_OTHER_INVALIDATE 0x200 /* INV only */ ++ ++/* GPU_COMMAND_FLUSH_PA_RANGE payload bits for flush modes */ ++#define GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_MODE_NONE 0x00 /* No flush */ ++#define GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_MODE_CLEAN 0x01 /* CLN only */ ++#define GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_MODE_INVALIDATE 0x02 /* INV only */ ++#define GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_MODE_CLEAN_INVALIDATE 0x03 /* CLN + INV */ ++ ++/* GPU_COMMAND_FLUSH_PA_RANGE payload bits for which caches should be the target of the command */ ++#define GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_OTHER_CACHE 0x10 /* Other caches */ ++#define GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_LSC_CACHE 0x20 /* Load-store caches */ ++#define GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_L2_CACHE 0x40 /* L2 caches */ + +/* GPU_COMMAND command + payload */ +#define GPU_COMMAND_CODE_PAYLOAD(opcode, payload) \ -+ ((u32)opcode | ((u32)payload << 8)) ++ ((__u32)opcode | ((__u32)payload << 8)) + +/* Final GPU_COMMAND form */ +/* No operation, nothing happens */ @@ -181357,14 +208006,6 @@ index 000000000000..ff6e4ae47184 +#define GPU_COMMAND_HARD_RESET \ + GPU_COMMAND_CODE_PAYLOAD(GPU_COMMAND_CODE_RESET, GPU_COMMAND_RESET_PAYLOAD_HARD_RESET) + -+/* Clear all performance counters, setting them all to zero. */ -+#define GPU_COMMAND_PRFCNT_CLEAR \ -+ GPU_COMMAND_CODE_PAYLOAD(GPU_COMMAND_CODE_PRFCNT, GPU_COMMAND_PRFCNT_PAYLOAD_CLEAR) -+ -+/* Sample all performance counters, writing them out to memory */ -+#define GPU_COMMAND_PRFCNT_SAMPLE \ -+ GPU_COMMAND_CODE_PAYLOAD(GPU_COMMAND_CODE_PRFCNT, GPU_COMMAND_PRFCNT_PAYLOAD_SAMPLE) -+ +/* Starts the cycle counter, and system timestamp propagation */ +#define GPU_COMMAND_CYCLE_COUNT_START \ + GPU_COMMAND_CODE_PAYLOAD(GPU_COMMAND_CODE_TIME, GPU_COMMAND_TIME_ENABLE) @@ -181373,13 +208014,57 @@ index 000000000000..ff6e4ae47184 +#define GPU_COMMAND_CYCLE_COUNT_STOP \ + GPU_COMMAND_CODE_PAYLOAD(GPU_COMMAND_CODE_TIME, GPU_COMMAND_TIME_DISABLE) + -+/* Clean all caches */ -+#define GPU_COMMAND_CLEAN_CACHES \ -+ GPU_COMMAND_CODE_PAYLOAD(GPU_COMMAND_CODE_FLUSH_CACHES, GPU_COMMAND_FLUSH_PAYLOAD_CLEAN) -+ -+/* Clean and invalidate all caches */ -+#define GPU_COMMAND_CLEAN_INV_CACHES \ -+ GPU_COMMAND_CODE_PAYLOAD(GPU_COMMAND_CODE_FLUSH_CACHES, GPU_COMMAND_FLUSH_PAYLOAD_CLEAN_INVALIDATE) ++/* Clean and invalidate L2 cache (Equivalent to FLUSH_PT) */ ++#define GPU_COMMAND_CACHE_CLN_INV_L2 \ ++ GPU_COMMAND_CODE_PAYLOAD(GPU_COMMAND_CODE_FLUSH_CACHES, \ ++ (GPU_COMMAND_FLUSH_CACHES_PAYLOAD_L2_CLEAN_INVALIDATE | \ ++ GPU_COMMAND_FLUSH_CACHES_PAYLOAD_LSC_NONE | \ ++ GPU_COMMAND_FLUSH_CACHES_PAYLOAD_OTHER_NONE)) ++ ++/* Clean and invalidate L2 and LSC caches (Equivalent to FLUSH_MEM) */ ++#define GPU_COMMAND_CACHE_CLN_INV_L2_LSC \ ++ GPU_COMMAND_CODE_PAYLOAD(GPU_COMMAND_CODE_FLUSH_CACHES, \ ++ (GPU_COMMAND_FLUSH_CACHES_PAYLOAD_L2_CLEAN_INVALIDATE | \ ++ GPU_COMMAND_FLUSH_CACHES_PAYLOAD_LSC_CLEAN_INVALIDATE | \ ++ GPU_COMMAND_FLUSH_CACHES_PAYLOAD_OTHER_NONE)) ++ ++/* Clean and invalidate L2, LSC, and Other caches */ ++#define GPU_COMMAND_CACHE_CLN_INV_FULL \ ++ GPU_COMMAND_CODE_PAYLOAD(GPU_COMMAND_CODE_FLUSH_CACHES, \ ++ (GPU_COMMAND_FLUSH_CACHES_PAYLOAD_L2_CLEAN_INVALIDATE | \ ++ GPU_COMMAND_FLUSH_CACHES_PAYLOAD_LSC_CLEAN_INVALIDATE | \ ++ GPU_COMMAND_FLUSH_CACHES_PAYLOAD_OTHER_INVALIDATE)) ++ ++/* Clean and invalidate only LSC cache */ ++#define GPU_COMMAND_CACHE_CLN_INV_LSC \ ++ GPU_COMMAND_CODE_PAYLOAD(GPU_COMMAND_CODE_FLUSH_CACHES, \ ++ (GPU_COMMAND_FLUSH_CACHES_PAYLOAD_L2_NONE | \ ++ GPU_COMMAND_FLUSH_CACHES_PAYLOAD_LSC_CLEAN_INVALIDATE | \ ++ GPU_COMMAND_FLUSH_CACHES_PAYLOAD_OTHER_NONE)) ++ ++/* Clean and invalidate physical range L2 cache (equivalent to FLUSH_PT) */ ++#define GPU_COMMAND_FLUSH_PA_RANGE_CLN_INV_L2 \ ++ GPU_COMMAND_CODE_PAYLOAD(GPU_COMMAND_CODE_FLUSH_PA_RANGE, \ ++ (GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_MODE_CLEAN_INVALIDATE | \ ++ GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_L2_CACHE)) ++ ++/* Clean and invalidate physical range L2 and LSC cache (equivalent to FLUSH_MEM) */ ++#define GPU_COMMAND_FLUSH_PA_RANGE_CLN_INV_L2_LSC \ ++ GPU_COMMAND_CODE_PAYLOAD(GPU_COMMAND_CODE_FLUSH_PA_RANGE, \ ++ (GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_MODE_CLEAN_INVALIDATE | \ ++ GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_LSC_CACHE | \ ++ GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_L2_CACHE)) ++ ++/* Clean and invalidate physical range L2, LSC and Other caches */ ++#define GPU_COMMAND_FLUSH_PA_RANGE_CLN_INV_FULL \ ++ GPU_COMMAND_CODE_PAYLOAD(GPU_COMMAND_CODE_FLUSH_PA_RANGE, \ ++ (GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_MODE_CLEAN_INVALIDATE | \ ++ GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_OTHER_CACHE | \ ++ GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_LSC_CACHE | \ ++ GPU_COMMAND_FLUSH_PA_RANGE_PAYLOAD_L2_CACHE)) ++ ++/* Merge cache flush commands */ ++#define GPU_COMMAND_FLUSH_CACHE_MERGE(cmd1, cmd2) ((cmd1) | (cmd2)) + +/* Places the GPU in protected mode */ +#define GPU_COMMAND_SET_PROTECTED_MODE \ @@ -181433,9 +208118,12 @@ index 000000000000..ff6e4ae47184 +#define GPU_FAULTSTATUS_ACCESS_TYPE_WRITE 0x3 +/* End of GPU_FAULTSTATUS_ACCESS_TYPE values */ + -+/* TODO: Remove once 10.x.6 headers became available */ -+#define GPU_EXCEPTION_TYPE_SW_FAULT_0 ((u8)0x70) -+#define GPU_EXCEPTION_TYPE_SW_FAULT_1 ((u8)0x71) ++/* Implementation-dependent exception codes used to indicate CSG ++ * and CS errors that are not specified in the specs. ++ */ ++#define GPU_EXCEPTION_TYPE_SW_FAULT_0 ((__u8)0x70) ++#define GPU_EXCEPTION_TYPE_SW_FAULT_1 ((__u8)0x71) ++#define GPU_EXCEPTION_TYPE_SW_FAULT_2 ((__u8)0x72) + +/* GPU_FAULTSTATUS_EXCEPTION_TYPE values */ +#define GPU_FAULTSTATUS_EXCEPTION_TYPE_OK 0x00 @@ -181454,14 +208142,16 @@ index 000000000000..ff6e4ae47184 + (((value) << GPU_FAULTSTATUS_ADDRESS_VALID_SHIFT) & GPU_FAULTSTATUS_ADDRESS_VALID_MASK)) + +/* IRQ flags */ -+#define GPU_FAULT (1 << 0) /* A GPU Fault has occurred */ -+#define GPU_PROTECTED_FAULT (1 << 1) /* A GPU fault has occurred in protected mode */ -+#define RESET_COMPLETED (1 << 8) /* Set when a reset has completed. */ -+#define POWER_CHANGED_SINGLE (1 << 9) /* Set when a single core has finished powering up or down. */ -+#define POWER_CHANGED_ALL (1 << 10) /* Set when all cores have finished powering up or down. */ -+#define CLEAN_CACHES_COMPLETED (1 << 17) /* Set when a cache clean operation has completed. */ -+#define DOORBELL_MIRROR (1 << 18) /* Mirrors the doorbell interrupt line to the CPU */ -+#define MCU_STATUS_GPU_IRQ (1 << 19) /* MCU requires attention */ ++#define GPU_FAULT (1 << 0) /* A GPU Fault has occurred */ ++#define GPU_PROTECTED_FAULT (1 << 1) /* A GPU fault has occurred in protected mode */ ++#define RESET_COMPLETED (1 << 8) /* Set when a reset has completed. */ ++#define POWER_CHANGED_SINGLE (1 << 9) /* Set when a single core has finished powering up or down. */ ++#define POWER_CHANGED_ALL (1 << 10) /* Set when all cores have finished powering up or down. */ ++#define CLEAN_CACHES_COMPLETED (1 << 17) /* Set when a cache clean operation has completed. */ ++#define DOORBELL_MIRROR (1 << 18) /* Mirrors the doorbell interrupt line to the CPU */ ++#define MCU_STATUS_GPU_IRQ (1 << 19) /* MCU requires attention */ ++#define FLUSH_PA_RANGE_COMPLETED \ ++ (1 << 20) /* Set when a physical range cache clean operation has completed. */ + +/* + * In Debug build, @@ -181479,24 +208169,29 @@ index 000000000000..ff6e4ae47184 +#define GPU_IRQ_REG_COMMON (GPU_FAULT | GPU_PROTECTED_FAULT | RESET_COMPLETED \ + | POWER_CHANGED_ALL | MCU_STATUS_GPU_IRQ) + -+/* GPU_CONTROL_MCU.GPU_IRQ_RAWSTAT */ -+#define PRFCNT_SAMPLE_COMPLETED (1 << 16) /* Set when performance count sample has completed */ ++/* GPU_FEATURES register */ ++#define GPU_FEATURES_RAY_TRACING_SHIFT GPU_U(2) ++#define GPU_FEATURES_RAY_TRACING_MASK (GPU_U(0x1) << GPU_FEATURES_RAY_TRACING_SHIFT) ++#define GPU_FEATURES_RAY_TRACING_GET(reg_val) \ ++ (((reg_val)&GPU_FEATURES_RAY_TRACING_MASK) >> GPU_FEATURES_RAY_TRACING_SHIFT) ++/* End of GPU_FEATURES register */ + +#endif /* _KBASE_GPU_REGMAP_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h new file mode 100755 -index 000000000000..c9c2fbd49058 +index 000000000..f86f493c7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h -@@ -0,0 +1,288 @@ +@@ -0,0 +1,276 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -181507,14 +208202,11 @@ index 000000000000..c9c2fbd49058 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ -+ +#ifndef _KBASE_GPU_REGMAP_JM_H_ +#define _KBASE_GPU_REGMAP_JM_H_ + -+#if MALI_USE_CSF ++#if MALI_USE_CSF && defined(__KERNEL__) +#error "Cannot be compiled with CSF" +#endif + @@ -181552,9 +208244,6 @@ index 000000000000..c9c2fbd49058 + +#define CORE_FEATURES 0x008 /* (RO) Shader Core Features */ +#define JS_PRESENT 0x01C /* (RO) Job slots present */ -+#define LATEST_FLUSH 0x038 /* (RO) Flush ID of latest -+ * clean-and-invalidate operation -+ */ + +#define PRFCNT_BASE_LO 0x060 /* (RW) Performance counter memory + * region base address, low word @@ -181604,7 +208293,6 @@ index 000000000000..c9c2fbd49058 +#define JOB_IRQ_JS_STATE 0x010 /* status==active and _next == busy snapshot from last JOB_IRQ_CLEAR */ +#define JOB_IRQ_THROTTLE 0x014 /* cycles to delay delivering an interrupt externally. The JOB_IRQ_STATUS is NOT affected by this, just the delivery of the interrupt. */ + -+#define JOB_SLOT0 0x800 /* Configuration registers for job slot 0 */ +#define JOB_SLOT1 0x880 /* Configuration registers for job slot 1 */ +#define JOB_SLOT2 0x900 /* Configuration registers for job slot 2 */ +#define JOB_SLOT3 0x980 /* Configuration registers for job slot 3 */ @@ -181621,31 +208309,12 @@ index 000000000000..c9c2fbd49058 +#define JOB_SLOT14 0xF00 /* Configuration registers for job slot 14 */ +#define JOB_SLOT15 0xF80 /* Configuration registers for job slot 15 */ + -+#define JOB_SLOT_REG(n, r) (JOB_CONTROL_REG(JOB_SLOT0 + ((n) << 7)) + (r)) -+ -+#define JS_HEAD_LO 0x00 /* (RO) Job queue head pointer for job slot n, low word */ -+#define JS_HEAD_HI 0x04 /* (RO) Job queue head pointer for job slot n, high word */ -+#define JS_TAIL_LO 0x08 /* (RO) Job queue tail pointer for job slot n, low word */ -+#define JS_TAIL_HI 0x0C /* (RO) Job queue tail pointer for job slot n, high word */ -+#define JS_AFFINITY_LO 0x10 /* (RO) Core affinity mask for job slot n, low word */ -+#define JS_AFFINITY_HI 0x14 /* (RO) Core affinity mask for job slot n, high word */ -+#define JS_CONFIG 0x18 /* (RO) Configuration settings for job slot n */ -+#define JS_XAFFINITY 0x1C /* (RO) Extended affinity mask for job -+ slot n */ ++#define JS_XAFFINITY 0x1C /* (RO) Extended affinity mask for job slot n*/ + +#define JS_COMMAND 0x20 /* (WO) Command register for job slot n */ +#define JS_STATUS 0x24 /* (RO) Status register for job slot n */ + -+#define JS_HEAD_NEXT_LO 0x40 /* (RW) Next job queue head pointer for job slot n, low word */ -+#define JS_HEAD_NEXT_HI 0x44 /* (RW) Next job queue head pointer for job slot n, high word */ -+ -+#define JS_AFFINITY_NEXT_LO 0x50 /* (RW) Next core affinity mask for job slot n, low word */ -+#define JS_AFFINITY_NEXT_HI 0x54 /* (RW) Next core affinity mask for job slot n, high word */ -+#define JS_CONFIG_NEXT 0x58 /* (RW) Next configuration settings for job slot n */ -+#define JS_XAFFINITY_NEXT 0x5C /* (RW) Next extended affinity mask for -+ job slot n */ -+ -+#define JS_COMMAND_NEXT 0x60 /* (RW) Next command register for job slot n */ ++#define JS_XAFFINITY_NEXT 0x5C /* (RW) Next extended affinity mask for job slot n */ + +#define JS_FLUSH_ID_NEXT 0x70 /* (RW) Next job slot n cache flush ID */ + @@ -181667,6 +208336,7 @@ index 000000000000..c9c2fbd49058 +/* Possible values of JS_CONFIG and JS_CONFIG_NEXT registers */ +#define JS_CONFIG_START_FLUSH_NO_ACTION (0u << 0) +#define JS_CONFIG_START_FLUSH_CLEAN (1u << 8) ++#define JS_CONFIG_START_FLUSH_INV_SHADER_OTHER (2u << 8) +#define JS_CONFIG_START_FLUSH_CLEAN_INVALIDATE (3u << 8) +#define JS_CONFIG_START_MMU (1u << 10) +#define JS_CONFIG_JOB_CHAIN_FLAG (1u << 11) @@ -181753,14 +208423,26 @@ index 000000000000..c9c2fbd49058 +#define GPU_COMMAND_CLEAN_INV_CACHES 0x08 /* Clean and invalidate all caches */ +#define GPU_COMMAND_SET_PROTECTED_MODE 0x09 /* Places the GPU in protected mode */ + ++/* GPU_COMMAND cache flush alias to CSF command payload */ ++#define GPU_COMMAND_CACHE_CLN_INV_L2 GPU_COMMAND_CLEAN_INV_CACHES ++#define GPU_COMMAND_CACHE_CLN_INV_L2_LSC GPU_COMMAND_CLEAN_INV_CACHES ++#define GPU_COMMAND_CACHE_CLN_INV_FULL GPU_COMMAND_CLEAN_INV_CACHES ++#define GPU_COMMAND_CACHE_CLN_INV_LSC GPU_COMMAND_CLEAN_INV_CACHES ++ ++/* Merge cache flush commands */ ++#define GPU_COMMAND_FLUSH_CACHE_MERGE(cmd1, cmd2) \ ++ ((cmd1) > (cmd2) ? (cmd1) : (cmd2)) ++ +/* IRQ flags */ -+#define GPU_FAULT (1 << 0) /* A GPU Fault has occurred */ -+#define MULTIPLE_GPU_FAULTS (1 << 7) /* More than one GPU Fault occurred. */ -+#define RESET_COMPLETED (1 << 8) /* Set when a reset has completed. */ -+#define POWER_CHANGED_SINGLE (1 << 9) /* Set when a single core has finished powering up or down. */ -+#define POWER_CHANGED_ALL (1 << 10) /* Set when all cores have finished powering up or down. */ -+#define PRFCNT_SAMPLE_COMPLETED (1 << 16) /* Set when a performance count sample has completed. */ -+#define CLEAN_CACHES_COMPLETED (1 << 17) /* Set when a cache clean operation has completed. */ ++#define GPU_FAULT (1 << 0) /* A GPU Fault has occurred */ ++#define MULTIPLE_GPU_FAULTS (1 << 7) /* More than one GPU Fault occurred. */ ++#define RESET_COMPLETED (1 << 8) /* Set when a reset has completed. */ ++#define POWER_CHANGED_SINGLE (1 << 9) /* Set when a single core has finished powering up or down. */ ++#define POWER_CHANGED_ALL (1 << 10) /* Set when all cores have finished powering up or down. */ ++#define PRFCNT_SAMPLE_COMPLETED (1 << 16) /* Set when a performance count sample has completed. */ ++#define CLEAN_CACHES_COMPLETED (1 << 17) /* Set when a cache clean operation has completed. */ ++#define FLUSH_PA_RANGE_COMPLETED \ ++ (1 << 20) /* Set when a physical range cache clean operation has completed. */ + +/* + * In Debug build, @@ -181779,18 +208461,19 @@ index 000000000000..c9c2fbd49058 +#endif /* _KBASE_GPU_REGMAP_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c new file mode 100755 -index 000000000000..3128db4cabfc +index 000000000..8a84ef541 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c @@ -0,0 +1,41 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -181801,12 +208484,11 @@ index 000000000000..3128db4cabfc + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include +#include ++#include + +const char *kbase_gpu_access_type_name(u32 fault_status) +{ @@ -181824,94 +208506,21 @@ index 000000000000..3128db4cabfc + return NULL; + } +} -diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.h -new file mode 100755 -index 000000000000..9516e56eda01 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.h -@@ -0,0 +1,31 @@ -+/* -+ * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+#ifndef _KBASE_GPU_H_ -+#define _KBASE_GPU_H_ -+ -+#include "mali_kbase_gpu_regmap.h" -+#include "mali_kbase_gpu_fault.h" -+#include "mali_kbase_gpu_coherency.h" -+#include "mali_kbase_gpu_id.h" -+ -+#endif /* _KBASE_GPU_H_ */ -diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h -new file mode 100755 -index 000000000000..bb2b1613aa47 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h -@@ -0,0 +1,31 @@ -+/* -+ * -+ * (C) COPYRIGHT 2015-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+#ifndef _KBASE_GPU_COHERENCY_H_ -+#define _KBASE_GPU_COHERENCY_H_ -+ -+#define COHERENCY_ACE_LITE 0 -+#define COHERENCY_ACE 1 -+#define COHERENCY_NONE 31 -+#define COHERENCY_FEATURE_BIT(x) (1 << (x)) -+ -+#endif /* _KBASE_GPU_COHERENCY_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h new file mode 100755 -index 000000000000..e63c3881a3ca +index 000000000..6a937a5ed --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h @@ -0,0 +1,48 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -181922,20 +208531,19 @@ index 000000000000..e63c3881a3ca + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_GPU_FAULT_H_ +#define _KBASE_GPU_FAULT_H_ + -+/** Returns the name associated with a Mali exception code ++/** ++ * kbase_gpu_exception_name() - Returns associated string of the exception code + * + * @exception_code: exception code + * -+ * This function is called from the interrupt handler when a GPU fault occurs. ++ * This function is called by error handlers when GPU reports an error. + * -+ * Return: name associated with the exception code ++ * Return: Error string associated with the exception code + */ +const char *kbase_gpu_exception_name(u32 exception_code); + @@ -181952,145 +208560,21 @@ index 000000000000..e63c3881a3ca +const char *kbase_gpu_access_type_name(u32 fault_status); + +#endif /* _KBASE_GPU_FAULT_H_ */ -diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h -new file mode 100755 -index 000000000000..31d55264c67f ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h -@@ -0,0 +1,119 @@ -+/* -+ * -+ * (C) COPYRIGHT 2015-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+#ifndef _KBASE_GPU_ID_H_ -+#define _KBASE_GPU_ID_H_ -+ -+/* GPU_ID register */ -+#define GPU_ID_VERSION_STATUS_SHIFT 0 -+#define GPU_ID_VERSION_MINOR_SHIFT 4 -+#define GPU_ID_VERSION_MAJOR_SHIFT 12 -+#define GPU_ID_VERSION_PRODUCT_ID_SHIFT 16 -+#define GPU_ID_VERSION_STATUS (0xFu << GPU_ID_VERSION_STATUS_SHIFT) -+#define GPU_ID_VERSION_MINOR (0xFFu << GPU_ID_VERSION_MINOR_SHIFT) -+#define GPU_ID_VERSION_MAJOR (0xFu << GPU_ID_VERSION_MAJOR_SHIFT) -+#define GPU_ID_VERSION_PRODUCT_ID (0xFFFFu << GPU_ID_VERSION_PRODUCT_ID_SHIFT) -+ -+#define GPU_ID2_VERSION_STATUS_SHIFT 0 -+#define GPU_ID2_VERSION_MINOR_SHIFT 4 -+#define GPU_ID2_VERSION_MAJOR_SHIFT 12 -+#define GPU_ID2_PRODUCT_MAJOR_SHIFT 16 -+#define GPU_ID2_ARCH_REV_SHIFT 20 -+#define GPU_ID2_ARCH_MINOR_SHIFT 24 -+#define GPU_ID2_ARCH_MAJOR_SHIFT 28 -+#define GPU_ID2_VERSION_STATUS (0xFu << GPU_ID2_VERSION_STATUS_SHIFT) -+#define GPU_ID2_VERSION_MINOR (0xFFu << GPU_ID2_VERSION_MINOR_SHIFT) -+#define GPU_ID2_VERSION_MAJOR (0xFu << GPU_ID2_VERSION_MAJOR_SHIFT) -+#define GPU_ID2_PRODUCT_MAJOR (0xFu << GPU_ID2_PRODUCT_MAJOR_SHIFT) -+#define GPU_ID2_ARCH_REV (0xFu << GPU_ID2_ARCH_REV_SHIFT) -+#define GPU_ID2_ARCH_MINOR (0xFu << GPU_ID2_ARCH_MINOR_SHIFT) -+#define GPU_ID2_ARCH_MAJOR (0xFu << GPU_ID2_ARCH_MAJOR_SHIFT) -+#define GPU_ID2_PRODUCT_MODEL (GPU_ID2_ARCH_MAJOR | GPU_ID2_PRODUCT_MAJOR) -+#define GPU_ID2_VERSION (GPU_ID2_VERSION_MAJOR | \ -+ GPU_ID2_VERSION_MINOR | \ -+ GPU_ID2_VERSION_STATUS) -+ -+/* Helper macro to create a partial GPU_ID (new format) that defines -+ a product ignoring its version. */ -+#define GPU_ID2_PRODUCT_MAKE(arch_major, arch_minor, arch_rev, product_major) \ -+ ((((u32)arch_major) << GPU_ID2_ARCH_MAJOR_SHIFT) | \ -+ (((u32)arch_minor) << GPU_ID2_ARCH_MINOR_SHIFT) | \ -+ (((u32)arch_rev) << GPU_ID2_ARCH_REV_SHIFT) | \ -+ (((u32)product_major) << GPU_ID2_PRODUCT_MAJOR_SHIFT)) -+ -+/* Helper macro to create a partial GPU_ID (new format) that specifies the -+ revision (major, minor, status) of a product */ -+#define GPU_ID2_VERSION_MAKE(version_major, version_minor, version_status) \ -+ ((((u32)version_major) << GPU_ID2_VERSION_MAJOR_SHIFT) | \ -+ (((u32)version_minor) << GPU_ID2_VERSION_MINOR_SHIFT) | \ -+ (((u32)version_status) << GPU_ID2_VERSION_STATUS_SHIFT)) -+ -+/* Helper macro to create a complete GPU_ID (new format) */ -+#define GPU_ID2_MAKE(arch_major, arch_minor, arch_rev, product_major, \ -+ version_major, version_minor, version_status) \ -+ (GPU_ID2_PRODUCT_MAKE(arch_major, arch_minor, arch_rev, \ -+ product_major) | \ -+ GPU_ID2_VERSION_MAKE(version_major, version_minor, \ -+ version_status)) -+ -+/* Helper macro to create a partial GPU_ID (new format) that identifies -+ a particular GPU model by its arch_major and product_major. */ -+#define GPU_ID2_MODEL_MAKE(arch_major, product_major) \ -+ ((((u32)arch_major) << GPU_ID2_ARCH_MAJOR_SHIFT) | \ -+ (((u32)product_major) << GPU_ID2_PRODUCT_MAJOR_SHIFT)) -+ -+/* Strip off the non-relevant bits from a product_id value and make it suitable -+ for comparison against the GPU_ID2_PRODUCT_xxx values which identify a GPU -+ model. */ -+#define GPU_ID2_MODEL_MATCH_VALUE(product_id) \ -+ ((((u32)product_id) << GPU_ID2_PRODUCT_MAJOR_SHIFT) & \ -+ GPU_ID2_PRODUCT_MODEL) -+ -+#define GPU_ID2_PRODUCT_TMIX GPU_ID2_MODEL_MAKE(6, 0) -+#define GPU_ID2_PRODUCT_THEX GPU_ID2_MODEL_MAKE(6, 1) -+#define GPU_ID2_PRODUCT_TSIX GPU_ID2_MODEL_MAKE(7, 0) -+#define GPU_ID2_PRODUCT_TDVX GPU_ID2_MODEL_MAKE(7, 3) -+#define GPU_ID2_PRODUCT_TNOX GPU_ID2_MODEL_MAKE(7, 1) -+#define GPU_ID2_PRODUCT_TGOX GPU_ID2_MODEL_MAKE(7, 2) -+#define GPU_ID2_PRODUCT_TTRX GPU_ID2_MODEL_MAKE(9, 0) -+#define GPU_ID2_PRODUCT_TNAX GPU_ID2_MODEL_MAKE(9, 1) -+#define GPU_ID2_PRODUCT_TBEX GPU_ID2_MODEL_MAKE(9, 2) -+#define GPU_ID2_PRODUCT_LBEX GPU_ID2_MODEL_MAKE(9, 4) -+#define GPU_ID2_PRODUCT_TBAX GPU_ID2_MODEL_MAKE(9, 5) -+#define GPU_ID2_PRODUCT_TDUX GPU_ID2_MODEL_MAKE(10, 1) -+#define GPU_ID2_PRODUCT_TODX GPU_ID2_MODEL_MAKE(10, 2) -+#define GPU_ID2_PRODUCT_TGRX GPU_ID2_MODEL_MAKE(10, 3) -+#define GPU_ID2_PRODUCT_TVAX GPU_ID2_MODEL_MAKE(10, 4) -+#define GPU_ID2_PRODUCT_LODX GPU_ID2_MODEL_MAKE(10, 7) -+#define GPU_ID2_PRODUCT_TTUX GPU_ID2_MODEL_MAKE(11, 2) -+#define GPU_ID2_PRODUCT_LTUX GPU_ID2_MODEL_MAKE(11, 3) -+#define GPU_ID2_PRODUCT_TE2X GPU_ID2_MODEL_MAKE(11, 1) -+ -+/* Helper macro to create a GPU_ID assuming valid values for id, major, -+ minor, status */ -+#define GPU_ID_MAKE(id, major, minor, status) \ -+ ((((u32)id) << GPU_ID_VERSION_PRODUCT_ID_SHIFT) | \ -+ (((u32)major) << GPU_ID_VERSION_MAJOR_SHIFT) | \ -+ (((u32)minor) << GPU_ID_VERSION_MINOR_SHIFT) | \ -+ (((u32)status) << GPU_ID_VERSION_STATUS_SHIFT)) -+ -+#endif /* _KBASE_GPU_ID_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h new file mode 100755 -index 000000000000..d8066f43768b +index 000000000..6cef2bdd1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h -@@ -0,0 +1,428 @@ +@@ -0,0 +1,637 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -182101,36 +208585,41 @@ index 000000000000..d8066f43768b + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_GPU_REGMAP_H_ +#define _KBASE_GPU_REGMAP_H_ + -+#include "mali_kbase_gpu_coherency.h" -+#include "mali_kbase_gpu_id.h" ++#include ++#include ++#include +#if MALI_USE_CSF +#include "backend/mali_kbase_gpu_regmap_csf.h" +#else +#include "backend/mali_kbase_gpu_regmap_jm.h" +#endif + ++/* GPU_U definition */ ++#ifdef __ASSEMBLER__ ++#define GPU_U(x) x ++#define GPU_UL(x) x ++#define GPU_ULL(x) x ++#else ++#define GPU_U(x) x##u ++#define GPU_UL(x) x##ul ++#define GPU_ULL(x) x##ull ++#endif /* __ASSEMBLER__ */ ++ +/* Begin Register Offsets */ +/* GPU control registers */ + -+#define GPU_CONTROL_BASE 0x0000 -+#define GPU_CONTROL_REG(r) (GPU_CONTROL_BASE + (r)) -+#define GPU_ID 0x000 /* (RO) GPU and revision identifier */ +#define L2_FEATURES 0x004 /* (RO) Level 2 cache features */ +#define TILER_FEATURES 0x00C /* (RO) Tiler Features */ +#define MEM_FEATURES 0x010 /* (RO) Memory system features */ +#define MMU_FEATURES 0x014 /* (RO) MMU features */ +#define AS_PRESENT 0x018 /* (RO) Address space slots present */ +#define GPU_IRQ_RAWSTAT 0x020 /* (RW) */ -+#define GPU_IRQ_CLEAR 0x024 /* (WO) */ +#define GPU_IRQ_MASK 0x028 /* (RW) */ -+#define GPU_IRQ_STATUS 0x02C /* (RO) */ + +#define GPU_COMMAND 0x030 /* (WO) */ +#define GPU_STATUS 0x034 /* (RO) */ @@ -182151,7 +208640,11 @@ index 000000000000..d8066f43768b +#define PWR_KEY 0x050 /* (WO) Power manager key register */ +#define PWR_OVERRIDE0 0x054 /* (RW) Power manager override settings */ +#define PWR_OVERRIDE1 0x058 /* (RW) Power manager override settings */ -+ ++#define GPU_FEATURES_LO 0x060 /* (RO) GPU features, low word */ ++#define GPU_FEATURES_HI 0x064 /* (RO) GPU features, high word */ ++#define PRFCNT_FEATURES 0x068 /* (RO) Performance counter features */ ++#define TIMESTAMP_OFFSET_LO 0x088 /* (RW) Global time stamp offset, low word */ ++#define TIMESTAMP_OFFSET_HI 0x08C /* (RW) Global time stamp offset, high word */ +#define CYCLE_COUNT_LO 0x090 /* (RO) Cycle counter, low word */ +#define CYCLE_COUNT_HI 0x094 /* (RO) Cycle counter, high word */ +#define TIMESTAMP_LO 0x098 /* (RO) Global time stamp counter, low word */ @@ -182170,6 +208663,11 @@ index 000000000000..d8066f43768b + +#define TEXTURE_FEATURES_REG(n) GPU_CONTROL_REG(TEXTURE_FEATURES_0 + ((n) << 2)) + ++#define GPU_COMMAND_ARG0_LO 0x0D0 /* (RW) Additional parameter 0 for GPU commands, low word */ ++#define GPU_COMMAND_ARG0_HI 0x0D4 /* (RW) Additional parameter 0 for GPU commands, high word */ ++#define GPU_COMMAND_ARG1_LO 0x0D8 /* (RW) Additional parameter 1 for GPU commands, low word */ ++#define GPU_COMMAND_ARG1_HI 0x0DC /* (RW) Additional parameter 1 for GPU commands, high word */ ++ +#define SHADER_PRESENT_LO 0x100 /* (RO) Shader core present bitmap, low word */ +#define SHADER_PRESENT_HI 0x104 /* (RO) Shader core present bitmap, high word */ + @@ -182182,26 +208680,10 @@ index 000000000000..d8066f43768b +#define STACK_PRESENT_LO 0xE00 /* (RO) Core stack present bitmap, low word */ +#define STACK_PRESENT_HI 0xE04 /* (RO) Core stack present bitmap, high word */ + -+#define SHADER_READY_LO 0x140 /* (RO) Shader core ready bitmap, low word */ -+#define SHADER_READY_HI 0x144 /* (RO) Shader core ready bitmap, high word */ -+ -+#define TILER_READY_LO 0x150 /* (RO) Tiler core ready bitmap, low word */ -+#define TILER_READY_HI 0x154 /* (RO) Tiler core ready bitmap, high word */ -+ -+#define L2_READY_LO 0x160 /* (RO) Level 2 cache ready bitmap, low word */ -+#define L2_READY_HI 0x164 /* (RO) Level 2 cache ready bitmap, high word */ -+ +#define STACK_READY_LO 0xE10 /* (RO) Core stack ready bitmap, low word */ +#define STACK_READY_HI 0xE14 /* (RO) Core stack ready bitmap, high word */ + -+#define SHADER_PWRON_LO 0x180 /* (WO) Shader core power on bitmap, low word */ -+#define SHADER_PWRON_HI 0x184 /* (WO) Shader core power on bitmap, high word */ -+ -+#define TILER_PWRON_LO 0x190 /* (WO) Tiler core power on bitmap, low word */ -+#define TILER_PWRON_HI 0x194 /* (WO) Tiler core power on bitmap, high word */ -+ -+#define L2_PWRON_LO 0x1A0 /* (WO) Level 2 cache power on bitmap, low word */ -+#define L2_PWRON_HI 0x1A4 /* (WO) Level 2 cache power on bitmap, high word */ ++#define SHADER_PWRFEATURES 0x188 /* (RW) Shader core power features */ + +#define STACK_PWRON_LO 0xE20 /* (RO) Core stack power on bitmap, low word */ +#define STACK_PWRON_HI 0xE24 /* (RO) Core stack power on bitmap, high word */ @@ -182227,6 +208709,14 @@ index 000000000000..d8066f43768b +#define L2_PWRTRANS_LO 0x220 /* (RO) Level 2 cache power transition bitmap, low word */ +#define L2_PWRTRANS_HI 0x224 /* (RO) Level 2 cache power transition bitmap, high word */ + ++#define ASN_HASH_0 0x02C0 /* (RW) ASN hash function argument 0 */ ++#define ASN_HASH(n) (ASN_HASH_0 + (n)*4) ++#define ASN_HASH_COUNT 3 ++ ++#define SYSC_ALLOC0 0x0340 /* (RW) System cache allocation hint from source ID */ ++#define SYSC_ALLOC(n) (SYSC_ALLOC0 + (n)*4) ++#define SYSC_ALLOC_COUNT 8 ++ +#define STACK_PWRTRANS_LO 0xE40 /* (RO) Core stack power transition bitmap, low word */ +#define STACK_PWRTRANS_HI 0xE44 /* (RO) Core stack power transition bitmap, high word */ + @@ -182242,32 +208732,19 @@ index 000000000000..d8066f43768b +#define COHERENCY_FEATURES 0x300 /* (RO) Coherency features present */ +#define COHERENCY_ENABLE 0x304 /* (RW) Coherency enable */ + ++#define AMBA_FEATURES 0x300 /* (RO) AMBA bus supported features */ ++#define AMBA_ENABLE 0x304 /* (RW) AMBA features enable */ ++ +#define SHADER_CONFIG 0xF04 /* (RW) Shader core configuration (implementation-specific) */ +#define TILER_CONFIG 0xF08 /* (RW) Tiler core configuration (implementation-specific) */ +#define L2_MMU_CONFIG 0xF0C /* (RW) L2 cache and MMU configuration (implementation-specific) */ + +/* Job control registers */ + -+#define JOB_CONTROL_BASE 0x1000 -+ -+#define JOB_CONTROL_REG(r) (JOB_CONTROL_BASE + (r)) -+ +#define JOB_IRQ_RAWSTAT 0x000 /* Raw interrupt status register */ -+#define JOB_IRQ_CLEAR 0x004 /* Interrupt clear register */ -+#define JOB_IRQ_MASK 0x008 /* Interrupt mask register */ -+#define JOB_IRQ_STATUS 0x00C /* Interrupt status register */ + +/* MMU control registers */ + -+#define MEMORY_MANAGEMENT_BASE 0x2000 -+#define MMU_REG(r) (MEMORY_MANAGEMENT_BASE + (r)) -+ -+#define MMU_IRQ_RAWSTAT 0x000 /* (RW) Raw interrupt status register */ -+#define MMU_IRQ_CLEAR 0x004 /* (WO) Interrupt clear register */ -+#define MMU_IRQ_MASK 0x008 /* (RW) Interrupt mask register */ -+#define MMU_IRQ_STATUS 0x00C /* (RO) Interrupt status register */ -+ -+#define MMU_AS0 0x400 /* Configuration registers for address space 0 */ +#define MMU_AS1 0x440 /* Configuration registers for address space 1 */ +#define MMU_AS2 0x480 /* Configuration registers for address space 2 */ +#define MMU_AS3 0x4C0 /* Configuration registers for address space 3 */ @@ -182285,25 +208762,13 @@ index 000000000000..d8066f43768b +#define MMU_AS15 0x7C0 /* Configuration registers for address space 15 */ + +/* MMU address space control registers */ -+ -+#define MMU_AS_REG(n, r) (MMU_REG(MMU_AS0 + ((n) << 6)) + (r)) -+ -+#define AS_TRANSTAB_LO 0x00 /* (RW) Translation Table Base Address for address space n, low word */ -+#define AS_TRANSTAB_HI 0x04 /* (RW) Translation Table Base Address for address space n, high word */ -+#define AS_MEMATTR_LO 0x08 /* (RW) Memory attributes for address space n, low word. */ -+#define AS_MEMATTR_HI 0x0C /* (RW) Memory attributes for address space n, high word. */ +#define AS_LOCKADDR_LO 0x10 /* (RW) Lock region address for address space n, low word */ +#define AS_LOCKADDR_HI 0x14 /* (RW) Lock region address for address space n, high word */ -+#define AS_COMMAND 0x18 /* (WO) MMU command register for address space n */ +#define AS_FAULTSTATUS 0x1C /* (RO) MMU fault status register for address space n */ +#define AS_FAULTADDRESS_LO 0x20 /* (RO) Fault Address for address space n, low word */ +#define AS_FAULTADDRESS_HI 0x24 /* (RO) Fault Address for address space n, high word */ +#define AS_STATUS 0x28 /* (RO) Status flags for address space n */ + -+/* (RW) Translation table configuration for address space n, low word */ -+#define AS_TRANSCFG_LO 0x30 -+/* (RW) Translation table configuration for address space n, high word */ -+#define AS_TRANSCFG_HI 0x34 +/* (RO) Secondary fault address for address space n, low word */ +#define AS_FAULTEXTRA_LO 0x38 +/* (RO) Secondary fault address for address space n, high word */ @@ -182311,12 +208776,7 @@ index 000000000000..d8066f43768b + +/* End Register Offsets */ + -+/* Include POWER_CHANGED_SINGLE in debug builds for use in irq latency test. */ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+#define GPU_IRQ_REG_ALL (GPU_IRQ_REG_COMMON | POWER_CHANGED_SINGLE) -+#else /* CONFIG_MALI_BIFROST_DEBUG */ +#define GPU_IRQ_REG_ALL (GPU_IRQ_REG_COMMON) -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ + +/* + * MMU_IRQ_RAWSTAT register values. Values are valid also for @@ -182326,23 +208786,12 @@ index 000000000000..d8066f43768b +#define MMU_PAGE_FAULT_FLAGS 16 + +/* Macros returning a bitmask to retrieve page fault or bus error flags from -+ * MMU registers */ ++ * MMU registers ++ */ +#define MMU_PAGE_FAULT(n) (1UL << (n)) +#define MMU_BUS_ERROR(n) (1UL << ((n) + MMU_PAGE_FAULT_FLAGS)) + +/* -+ * Begin LPAE MMU TRANSTAB register values -+ */ -+#define AS_TRANSTAB_LPAE_ADDR_SPACE_MASK 0xfffff000 -+#define AS_TRANSTAB_LPAE_ADRMODE_UNMAPPED (0u << 0) -+#define AS_TRANSTAB_LPAE_ADRMODE_IDENTITY (1u << 1) -+#define AS_TRANSTAB_LPAE_ADRMODE_TABLE (3u << 0) -+#define AS_TRANSTAB_LPAE_READ_INNER (1u << 2) -+#define AS_TRANSTAB_LPAE_SHARE_OUTER (1u << 4) -+ -+#define AS_TRANSTAB_LPAE_ADRMODE_MASK 0x00000003 -+ -+/* + * Begin AARCH64 MMU TRANSTAB register values + */ +#define MMU_HW_OUTA_BITS 40 @@ -182382,6 +208831,13 @@ index 000000000000..d8066f43768b +#define AS_FAULTSTATUS_SOURCE_ID_GET(reg_val) \ + (((reg_val)&AS_FAULTSTATUS_SOURCE_ID_MASK) >> AS_FAULTSTATUS_SOURCE_ID_SHIFT) + ++#define PRFCNT_FEATURES_COUNTER_BLOCK_SIZE_SHIFT (0) ++#define PRFCNT_FEATURES_COUNTER_BLOCK_SIZE_MASK \ ++ ((0xFF) << PRFCNT_FEATURES_COUNTER_BLOCK_SIZE_SHIFT) ++#define PRFCNT_FEATURES_COUNTER_BLOCK_SIZE_GET(reg_val) \ ++ (((reg_val)&PRFCNT_FEATURES_COUNTER_BLOCK_SIZE_MASK) >> \ ++ PRFCNT_FEATURES_COUNTER_BLOCK_SIZE_SHIFT) ++ +/* + * Begin MMU TRANSCFG register values + */ @@ -182414,14 +208870,43 @@ index 000000000000..d8066f43768b +#define AS_COMMAND_UPDATE 0x01 /* Broadcasts the values in AS_TRANSTAB and ASn_MEMATTR to all MMUs */ +#define AS_COMMAND_LOCK 0x02 /* Issue a lock region command to all MMUs */ +#define AS_COMMAND_UNLOCK 0x03 /* Issue a flush region command to all MMUs */ -+#define AS_COMMAND_FLUSH 0x04 /* Flush all L2 caches then issue a flush region command to all MMUs -+ (deprecated - only for use with T60x) */ -+#define AS_COMMAND_FLUSH_PT 0x04 /* Flush all L2 caches then issue a flush region command to all MMUs */ -+#define AS_COMMAND_FLUSH_MEM 0x05 /* Wait for memory accesses to complete, flush all the L1s cache then -+ flush all L2 caches then issue a flush region command to all MMUs */ ++/* Flush all L2 caches then issue a flush region command to all MMUs */ ++#define AS_COMMAND_FLUSH_PT 0x04 ++/* Wait for memory accesses to complete, flush all the L1s cache then flush all ++ * L2 caches then issue a flush region command to all MMUs ++ */ ++#define AS_COMMAND_FLUSH_MEM 0x05 ++ ++/* AS_LOCKADDR register */ ++#define AS_LOCKADDR_LOCKADDR_SIZE_SHIFT GPU_U(0) ++#define AS_LOCKADDR_LOCKADDR_SIZE_MASK \ ++ (GPU_U(0x3F) << AS_LOCKADDR_LOCKADDR_SIZE_SHIFT) ++#define AS_LOCKADDR_LOCKADDR_SIZE_GET(reg_val) \ ++ (((reg_val)&AS_LOCKADDR_LOCKADDR_SIZE_MASK) >> \ ++ AS_LOCKADDR_LOCKADDR_SIZE_SHIFT) ++#define AS_LOCKADDR_LOCKADDR_SIZE_SET(reg_val, value) \ ++ (((reg_val) & ~AS_LOCKADDR_LOCKADDR_SIZE_MASK) | \ ++ (((value) << AS_LOCKADDR_LOCKADDR_SIZE_SHIFT) & \ ++ AS_LOCKADDR_LOCKADDR_SIZE_MASK)) ++#define AS_LOCKADDR_LOCKADDR_BASE_SHIFT GPU_U(12) ++#define AS_LOCKADDR_LOCKADDR_BASE_MASK \ ++ (GPU_ULL(0xFFFFFFFFFFFFF) << AS_LOCKADDR_LOCKADDR_BASE_SHIFT) ++#define AS_LOCKADDR_LOCKADDR_BASE_GET(reg_val) \ ++ (((reg_val)&AS_LOCKADDR_LOCKADDR_BASE_MASK) >> \ ++ AS_LOCKADDR_LOCKADDR_BASE_SHIFT) ++#define AS_LOCKADDR_LOCKADDR_BASE_SET(reg_val, value) \ ++ (((reg_val) & ~AS_LOCKADDR_LOCKADDR_BASE_MASK) | \ ++ (((value) << AS_LOCKADDR_LOCKADDR_BASE_SHIFT) & \ ++ AS_LOCKADDR_LOCKADDR_BASE_MASK)) ++#define AS_LOCKADDR_FLUSH_SKIP_LEVELS_SHIFT (6) ++#define AS_LOCKADDR_FLUSH_SKIP_LEVELS_MASK ((0xF) << AS_LOCKADDR_FLUSH_SKIP_LEVELS_SHIFT) ++#define AS_LOCKADDR_FLUSH_SKIP_LEVELS_SET(reg_val, value) \ ++ (((reg_val) & ~AS_LOCKADDR_FLUSH_SKIP_LEVELS_MASK) | \ ++ ((value << AS_LOCKADDR_FLUSH_SKIP_LEVELS_SHIFT) & AS_LOCKADDR_FLUSH_SKIP_LEVELS_MASK)) + +/* GPU_STATUS values */ +#define GPU_STATUS_PRFCNT_ACTIVE (1 << 2) /* Set if the performance counters are active. */ ++#define GPU_STATUS_CYCLE_COUNT_ACTIVE (1 << 6) /* Set if the cycle counter is active. */ +#define GPU_STATUS_PROTECTED_MODE_ACTIVE (1 << 7) /* Set if protected mode is active */ + +/* PRFCNT_CONFIG register values */ @@ -182504,26 +208989,234 @@ index 000000000000..d8066f43768b +#define L2_CONFIG_SIZE_MASK (0xFFul << L2_CONFIG_SIZE_SHIFT) +#define L2_CONFIG_HASH_SHIFT 24 +#define L2_CONFIG_HASH_MASK (0xFFul << L2_CONFIG_HASH_SHIFT) ++#define L2_CONFIG_ASN_HASH_ENABLE_SHIFT 24 ++#define L2_CONFIG_ASN_HASH_ENABLE_MASK (1ul << L2_CONFIG_ASN_HASH_ENABLE_SHIFT) +/* End L2_CONFIG register */ + ++/* AMBA_FEATURES register */ ++#define AMBA_FEATURES_ACE_LITE_SHIFT GPU_U(0) ++#define AMBA_FEATURES_ACE_LITE_MASK (GPU_U(0x1) << AMBA_FEATURES_ACE_LITE_SHIFT) ++#define AMBA_FEATURES_ACE_LITE_GET(reg_val) \ ++ (((reg_val)&AMBA_FEATURES_ACE_LITE_MASK) >> \ ++ AMBA_FEATURES_ACE_LITE_SHIFT) ++#define AMBA_FEATURES_ACE_LITE_SET(reg_val, value) \ ++ (((reg_val) & ~AMBA_FEATURES_ACE_LITE_MASK) | \ ++ (((value) << AMBA_FEATURES_ACE_LITE_SHIFT) & \ ++ AMBA_FEATURES_ACE_LITE_MASK)) ++#define AMBA_FEATURES_ACE_SHIFT GPU_U(1) ++#define AMBA_FEATURES_ACE_MASK (GPU_U(0x1) << AMBA_FEATURES_ACE_SHIFT) ++#define AMBA_FEATURES_ACE_GET(reg_val) \ ++ (((reg_val)&AMBA_FEATURES_ACE_MASK) >> AMBA_FEATURES_ACE_SHIFT) ++#define AMBA_FEATURES_ACE_SET(reg_val, value) \ ++ (((reg_val) & ~AMBA_FEATURES_ACE_MASK) | \ ++ (((value) << AMBA_FEATURES_ACE_SHIFT) & AMBA_FEATURES_ACE_MASK)) ++#define AMBA_FEATURES_MEMORY_CACHE_SUPPORT_SHIFT GPU_U(5) ++#define AMBA_FEATURES_MEMORY_CACHE_SUPPORT_MASK \ ++ (GPU_U(0x1) << AMBA_FEATURES_MEMORY_CACHE_SUPPORT_SHIFT) ++#define AMBA_FEATURES_MEMORY_CACHE_SUPPORT_GET(reg_val) \ ++ (((reg_val)&AMBA_FEATURES_MEMORY_CACHE_SUPPORT_MASK) >> \ ++ AMBA_FEATURES_MEMORY_CACHE_SUPPORT_SHIFT) ++#define AMBA_FEATURES_MEMORY_CACHE_SUPPORT_SET(reg_val, value) \ ++ (((reg_val) & ~AMBA_FEATURES_MEMORY_CACHE_SUPPORT_MASK) | \ ++ (((value) << AMBA_FEATURES_MEMORY_CACHE_SUPPORT_SHIFT) & \ ++ AMBA_FEATURES_MEMORY_CACHE_SUPPORT_MASK)) ++#define AMBA_FEATURES_INVALIDATE_HINT_SHIFT GPU_U(6) ++#define AMBA_FEATURES_INVALIDATE_HINT_MASK \ ++ (GPU_U(0x1) << AMBA_FEATURES_INVALIDATE_HINT_SHIFT) ++#define AMBA_FEATURES_INVALIDATE_HINT_GET(reg_val) \ ++ (((reg_val)&AMBA_FEATURES_INVALIDATE_HINT_MASK) >> \ ++ AMBA_FEATURES_INVALIDATE_HINT_SHIFT) ++#define AMBA_FEATURES_INVALIDATE_HINT_SET(reg_val, value) \ ++ (((reg_val) & ~AMBA_FEATURES_INVALIDATE_HINT_MASK) | \ ++ (((value) << AMBA_FEATURES_INVALIDATE_HINT_SHIFT) & \ ++ AMBA_FEATURES_INVALIDATE_HINT_MASK)) ++ ++/* AMBA_ENABLE register */ ++#define AMBA_ENABLE_COHERENCY_PROTOCOL_SHIFT GPU_U(0) ++#define AMBA_ENABLE_COHERENCY_PROTOCOL_MASK \ ++ (GPU_U(0x1F) << AMBA_ENABLE_COHERENCY_PROTOCOL_SHIFT) ++#define AMBA_ENABLE_COHERENCY_PROTOCOL_GET(reg_val) \ ++ (((reg_val)&AMBA_ENABLE_COHERENCY_PROTOCOL_MASK) >> \ ++ AMBA_ENABLE_COHERENCY_PROTOCOL_SHIFT) ++#define AMBA_ENABLE_COHERENCY_PROTOCOL_SET(reg_val, value) \ ++ (((reg_val) & ~AMBA_ENABLE_COHERENCY_PROTOCOL_MASK) | \ ++ (((value) << AMBA_ENABLE_COHERENCY_PROTOCOL_SHIFT) & \ ++ AMBA_ENABLE_COHERENCY_PROTOCOL_MASK)) ++/* AMBA_ENABLE_coherency_protocol values */ ++#define AMBA_ENABLE_COHERENCY_PROTOCOL_ACE_LITE 0x0 ++#define AMBA_ENABLE_COHERENCY_PROTOCOL_ACE 0x1 ++#define AMBA_ENABLE_COHERENCY_PROTOCOL_NO_COHERENCY 0x1F ++/* End of AMBA_ENABLE_coherency_protocol values */ ++#define AMBA_ENABLE_MEMORY_CACHE_SUPPORT_SHIFT GPU_U(5) ++#define AMBA_ENABLE_MEMORY_CACHE_SUPPORT_MASK \ ++ (GPU_U(0x1) << AMBA_ENABLE_MEMORY_CACHE_SUPPORT_SHIFT) ++#define AMBA_ENABLE_MEMORY_CACHE_SUPPORT_GET(reg_val) \ ++ (((reg_val)&AMBA_ENABLE_MEMORY_CACHE_SUPPORT_MASK) >> \ ++ AMBA_ENABLE_MEMORY_CACHE_SUPPORT_SHIFT) ++#define AMBA_ENABLE_MEMORY_CACHE_SUPPORT_SET(reg_val, value) \ ++ (((reg_val) & ~AMBA_ENABLE_MEMORY_CACHE_SUPPORT_MASK) | \ ++ (((value) << AMBA_ENABLE_MEMORY_CACHE_SUPPORT_SHIFT) & \ ++ AMBA_ENABLE_MEMORY_CACHE_SUPPORT_MASK)) ++#define AMBA_ENABLE_INVALIDATE_HINT_SHIFT GPU_U(6) ++#define AMBA_ENABLE_INVALIDATE_HINT_MASK \ ++ (GPU_U(0x1) << AMBA_ENABLE_INVALIDATE_HINT_SHIFT) ++#define AMBA_ENABLE_INVALIDATE_HINT_GET(reg_val) \ ++ (((reg_val)&AMBA_ENABLE_INVALIDATE_HINT_MASK) >> \ ++ AMBA_ENABLE_INVALIDATE_HINT_SHIFT) ++#define AMBA_ENABLE_INVALIDATE_HINT_SET(reg_val, value) \ ++ (((reg_val) & ~AMBA_ENABLE_INVALIDATE_HINT_MASK) | \ ++ (((value) << AMBA_ENABLE_INVALIDATE_HINT_SHIFT) & \ ++ AMBA_ENABLE_INVALIDATE_HINT_MASK)) ++ +/* IDVS_GROUP register */ +#define IDVS_GROUP_SIZE_SHIFT (16) +#define IDVS_GROUP_MAX_SIZE (0x3F) + ++/* SYSC_ALLOC read IDs */ ++#define SYSC_ALLOC_ID_R_OTHER 0x00 ++#define SYSC_ALLOC_ID_R_CSF 0x02 ++#define SYSC_ALLOC_ID_R_MMU 0x04 ++#define SYSC_ALLOC_ID_R_TILER_VERT 0x08 ++#define SYSC_ALLOC_ID_R_TILER_PTR 0x09 ++#define SYSC_ALLOC_ID_R_TILER_INDEX 0x0A ++#define SYSC_ALLOC_ID_R_TILER_OTHER 0x0B ++#define SYSC_ALLOC_ID_R_IC 0x10 ++#define SYSC_ALLOC_ID_R_ATTR 0x11 ++#define SYSC_ALLOC_ID_R_SCM 0x12 ++#define SYSC_ALLOC_ID_R_FSDC 0x13 ++#define SYSC_ALLOC_ID_R_VL 0x14 ++#define SYSC_ALLOC_ID_R_PLR 0x15 ++#define SYSC_ALLOC_ID_R_TEX 0x18 ++#define SYSC_ALLOC_ID_R_LSC 0x1c ++ ++/* SYSC_ALLOC write IDs */ ++#define SYSC_ALLOC_ID_W_OTHER 0x00 ++#define SYSC_ALLOC_ID_W_CSF 0x02 ++#define SYSC_ALLOC_ID_W_PCB 0x07 ++#define SYSC_ALLOC_ID_W_TILER_PTR 0x09 ++#define SYSC_ALLOC_ID_W_TILER_VERT_PLIST 0x0A ++#define SYSC_ALLOC_ID_W_TILER_OTHER 0x0B ++#define SYSC_ALLOC_ID_W_L2_EVICT 0x0C ++#define SYSC_ALLOC_ID_W_L2_FLUSH 0x0D ++#define SYSC_ALLOC_ID_W_TIB_COLOR 0x10 ++#define SYSC_ALLOC_ID_W_TIB_COLOR_AFBCH 0x11 ++#define SYSC_ALLOC_ID_W_TIB_COLOR_AFBCB 0x12 ++#define SYSC_ALLOC_ID_W_TIB_CRC 0x13 ++#define SYSC_ALLOC_ID_W_TIB_DS 0x14 ++#define SYSC_ALLOC_ID_W_TIB_DS_AFBCH 0x15 ++#define SYSC_ALLOC_ID_W_TIB_DS_AFBCB 0x16 ++#define SYSC_ALLOC_ID_W_LSC 0x1C ++ ++/* SYSC_ALLOC values */ ++#define SYSC_ALLOC_L2_ALLOC 0x0 ++#define SYSC_ALLOC_NEVER_ALLOC 0x2 ++#define SYSC_ALLOC_ALWAYS_ALLOC 0x3 ++#define SYSC_ALLOC_PTL_ALLOC 0x4 ++#define SYSC_ALLOC_L2_PTL_ALLOC 0x5 ++ ++/* SYSC_ALLOC register */ ++#define SYSC_ALLOC_R_SYSC_ALLOC0_SHIFT (0) ++#define SYSC_ALLOC_R_SYSC_ALLOC0_MASK ((0xF) << SYSC_ALLOC_R_SYSC_ALLOC0_SHIFT) ++#define SYSC_ALLOC_R_SYSC_ALLOC0_GET(reg_val) \ ++ (((reg_val)&SYSC_ALLOC_R_SYSC_ALLOC0_MASK) >> \ ++ SYSC_ALLOC_R_SYSC_ALLOC0_SHIFT) ++#define SYSC_ALLOC_R_SYSC_ALLOC0_SET(reg_val, value) \ ++ (((reg_val) & ~SYSC_ALLOC_R_SYSC_ALLOC0_MASK) | \ ++ (((value) << SYSC_ALLOC_R_SYSC_ALLOC0_SHIFT) & \ ++ SYSC_ALLOC_R_SYSC_ALLOC0_MASK)) ++/* End of SYSC_ALLOC_R_SYSC_ALLOC0 values */ ++#define SYSC_ALLOC_W_SYSC_ALLOC0_SHIFT (4) ++#define SYSC_ALLOC_W_SYSC_ALLOC0_MASK ((0xF) << SYSC_ALLOC_W_SYSC_ALLOC0_SHIFT) ++#define SYSC_ALLOC_W_SYSC_ALLOC0_GET(reg_val) \ ++ (((reg_val)&SYSC_ALLOC_W_SYSC_ALLOC0_MASK) >> \ ++ SYSC_ALLOC_W_SYSC_ALLOC0_SHIFT) ++#define SYSC_ALLOC_W_SYSC_ALLOC0_SET(reg_val, value) \ ++ (((reg_val) & ~SYSC_ALLOC_W_SYSC_ALLOC0_MASK) | \ ++ (((value) << SYSC_ALLOC_W_SYSC_ALLOC0_SHIFT) & \ ++ SYSC_ALLOC_W_SYSC_ALLOC0_MASK)) ++/* End of SYSC_ALLOC_W_SYSC_ALLOC0 values */ ++#define SYSC_ALLOC_R_SYSC_ALLOC1_SHIFT (8) ++#define SYSC_ALLOC_R_SYSC_ALLOC1_MASK ((0xF) << SYSC_ALLOC_R_SYSC_ALLOC1_SHIFT) ++#define SYSC_ALLOC_R_SYSC_ALLOC1_GET(reg_val) \ ++ (((reg_val)&SYSC_ALLOC_R_SYSC_ALLOC1_MASK) >> \ ++ SYSC_ALLOC_R_SYSC_ALLOC1_SHIFT) ++#define SYSC_ALLOC_R_SYSC_ALLOC1_SET(reg_val, value) \ ++ (((reg_val) & ~SYSC_ALLOC_R_SYSC_ALLOC1_MASK) | \ ++ (((value) << SYSC_ALLOC_R_SYSC_ALLOC1_SHIFT) & \ ++ SYSC_ALLOC_R_SYSC_ALLOC1_MASK)) ++/* End of SYSC_ALLOC_R_SYSC_ALLOC1 values */ ++#define SYSC_ALLOC_W_SYSC_ALLOC1_SHIFT (12) ++#define SYSC_ALLOC_W_SYSC_ALLOC1_MASK ((0xF) << SYSC_ALLOC_W_SYSC_ALLOC1_SHIFT) ++#define SYSC_ALLOC_W_SYSC_ALLOC1_GET(reg_val) \ ++ (((reg_val)&SYSC_ALLOC_W_SYSC_ALLOC1_MASK) >> \ ++ SYSC_ALLOC_W_SYSC_ALLOC1_SHIFT) ++#define SYSC_ALLOC_W_SYSC_ALLOC1_SET(reg_val, value) \ ++ (((reg_val) & ~SYSC_ALLOC_W_SYSC_ALLOC1_MASK) | \ ++ (((value) << SYSC_ALLOC_W_SYSC_ALLOC1_SHIFT) & \ ++ SYSC_ALLOC_W_SYSC_ALLOC1_MASK)) ++/* End of SYSC_ALLOC_W_SYSC_ALLOC1 values */ ++#define SYSC_ALLOC_R_SYSC_ALLOC2_SHIFT (16) ++#define SYSC_ALLOC_R_SYSC_ALLOC2_MASK ((0xF) << SYSC_ALLOC_R_SYSC_ALLOC2_SHIFT) ++#define SYSC_ALLOC_R_SYSC_ALLOC2_GET(reg_val) \ ++ (((reg_val)&SYSC_ALLOC_R_SYSC_ALLOC2_MASK) >> \ ++ SYSC_ALLOC_R_SYSC_ALLOC2_SHIFT) ++#define SYSC_ALLOC_R_SYSC_ALLOC2_SET(reg_val, value) \ ++ (((reg_val) & ~SYSC_ALLOC_R_SYSC_ALLOC2_MASK) | \ ++ (((value) << SYSC_ALLOC_R_SYSC_ALLOC2_SHIFT) & \ ++ SYSC_ALLOC_R_SYSC_ALLOC2_MASK)) ++/* End of SYSC_ALLOC_R_SYSC_ALLOC2 values */ ++#define SYSC_ALLOC_W_SYSC_ALLOC2_SHIFT (20) ++#define SYSC_ALLOC_W_SYSC_ALLOC2_MASK ((0xF) << SYSC_ALLOC_W_SYSC_ALLOC2_SHIFT) ++#define SYSC_ALLOC_W_SYSC_ALLOC2_GET(reg_val) \ ++ (((reg_val)&SYSC_ALLOC_W_SYSC_ALLOC2_MASK) >> \ ++ SYSC_ALLOC_W_SYSC_ALLOC2_SHIFT) ++#define SYSC_ALLOC_W_SYSC_ALLOC2_SET(reg_val, value) \ ++ (((reg_val) & ~SYSC_ALLOC_W_SYSC_ALLOC2_MASK) | \ ++ (((value) << SYSC_ALLOC_W_SYSC_ALLOC2_SHIFT) & \ ++ SYSC_ALLOC_W_SYSC_ALLOC2_MASK)) ++/* End of SYSC_ALLOC_W_SYSC_ALLOC2 values */ ++#define SYSC_ALLOC_R_SYSC_ALLOC3_SHIFT (24) ++#define SYSC_ALLOC_R_SYSC_ALLOC3_MASK ((0xF) << SYSC_ALLOC_R_SYSC_ALLOC3_SHIFT) ++#define SYSC_ALLOC_R_SYSC_ALLOC3_GET(reg_val) \ ++ (((reg_val)&SYSC_ALLOC_R_SYSC_ALLOC3_MASK) >> \ ++ SYSC_ALLOC_R_SYSC_ALLOC3_SHIFT) ++#define SYSC_ALLOC_R_SYSC_ALLOC3_SET(reg_val, value) \ ++ (((reg_val) & ~SYSC_ALLOC_R_SYSC_ALLOC3_MASK) | \ ++ (((value) << SYSC_ALLOC_R_SYSC_ALLOC3_SHIFT) & \ ++ SYSC_ALLOC_R_SYSC_ALLOC3_MASK)) ++/* End of SYSC_ALLOC_R_SYSC_ALLOC3 values */ ++#define SYSC_ALLOC_W_SYSC_ALLOC3_SHIFT (28) ++#define SYSC_ALLOC_W_SYSC_ALLOC3_MASK ((0xF) << SYSC_ALLOC_W_SYSC_ALLOC3_SHIFT) ++#define SYSC_ALLOC_W_SYSC_ALLOC3_GET(reg_val) \ ++ (((reg_val)&SYSC_ALLOC_W_SYSC_ALLOC3_MASK) >> \ ++ SYSC_ALLOC_W_SYSC_ALLOC3_SHIFT) ++#define SYSC_ALLOC_W_SYSC_ALLOC3_SET(reg_val, value) \ ++ (((reg_val) & ~SYSC_ALLOC_W_SYSC_ALLOC3_MASK) | \ ++ (((value) << SYSC_ALLOC_W_SYSC_ALLOC3_SHIFT) & \ ++ SYSC_ALLOC_W_SYSC_ALLOC3_MASK)) ++/* End of SYSC_ALLOC_W_SYSC_ALLOC3 values */ ++ ++/* Include POWER_CHANGED_SINGLE in debug builds for use in irq latency test. */ ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++#undef GPU_IRQ_REG_ALL ++#define GPU_IRQ_REG_ALL (GPU_IRQ_REG_COMMON | POWER_CHANGED_SINGLE) ++#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++ +#endif /* _KBASE_GPU_REGMAP_H_ */ -diff --git a/drivers/gpu/arm/bifrost/ipa/Kbuild b/drivers/gpu/arm/bifrost/ipa/Kbuild -new file mode 100755 -index 000000000000..04aa9d82d7c5 +diff --git a/drivers/gpu/arm/bifrost/hwcnt/Kbuild b/drivers/gpu/arm/bifrost/hwcnt/Kbuild +new file mode 100644 +index 000000000..c1a381b24 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/ipa/Kbuild -@@ -0,0 +1,28 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/Kbuild +@@ -0,0 +1,37 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2016-2018 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2022 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -182534,31 +209227,40 @@ index 000000000000..04aa9d82d7c5 +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + +bifrost_kbase-y += \ -+ ipa/mali_kbase_ipa_simple.o \ -+ ipa/mali_kbase_ipa.o \ -+ ipa/mali_kbase_ipa_vinstr_g7x.o \ -+ ipa/mali_kbase_ipa_vinstr_common.o -+ -+bifrost_kbase-$(CONFIG_DEBUG_FS) += ipa/mali_kbase_ipa_debugfs.o -diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c -new file mode 100755 -index 000000000000..67adb65306dd ++ hwcnt/mali_kbase_hwcnt.o \ ++ hwcnt/mali_kbase_hwcnt_gpu.o \ ++ hwcnt/mali_kbase_hwcnt_gpu_narrow.o \ ++ hwcnt/mali_kbase_hwcnt_types.o \ ++ hwcnt/mali_kbase_hwcnt_virtualizer.o \ ++ hwcnt/mali_kbase_hwcnt_watchdog_if_timer.o ++ ++ifeq ($(CONFIG_MALI_CSF_SUPPORT),y) ++ bifrost_kbase-y += \ ++ hwcnt/backend/mali_kbase_hwcnt_backend_csf.o \ ++ hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.o ++else ++ bifrost_kbase-y += \ ++ hwcnt/backend/mali_kbase_hwcnt_backend_jm.o \ ++ hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.o ++endif +diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend.h +new file mode 100644 +index 000000000..6cfa6f5ee --- /dev/null -+++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c -@@ -0,0 +1,672 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend.h +@@ -0,0 +1,225 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2016-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -182569,674 +209271,2129 @@ index 000000000000..67adb65306dd + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ */ ++ ++/* ++ * Virtual interface for hardware counter backends. ++ */ ++ ++#ifndef _KBASE_HWCNT_BACKEND_H_ ++#define _KBASE_HWCNT_BACKEND_H_ ++ ++#include ++ ++struct kbase_hwcnt_metadata; ++struct kbase_hwcnt_enable_map; ++struct kbase_hwcnt_dump_buffer; ++ ++/* ++ * struct kbase_hwcnt_backend_info - Opaque pointer to information used to ++ * create an instance of a hardware counter ++ * backend. ++ */ ++struct kbase_hwcnt_backend_info; ++ ++/* ++ * struct kbase_hwcnt_backend - Opaque pointer to a hardware counter ++ * backend, used to perform dumps. ++ */ ++struct kbase_hwcnt_backend; ++ ++/* ++ * typedef kbase_hwcnt_backend_metadata_fn - Get the immutable hardware counter ++ * metadata that describes the layout ++ * of the counter data structures. ++ * @info: Non-NULL pointer to backend info. ++ * ++ * Multiple calls to this function with the same info are guaranteed to return ++ * the same metadata object each time. + * ++ * Return: Non-NULL pointer to immutable hardware counter metadata. + */ -+#include -+#include -+#include -+#include "mali_kbase.h" -+#include "mali_kbase_ipa.h" -+#include "mali_kbase_ipa_debugfs.h" -+#include "mali_kbase_ipa_simple.h" -+#include "backend/gpu/mali_kbase_pm_internal.h" ++typedef const struct kbase_hwcnt_metadata * ++kbase_hwcnt_backend_metadata_fn(const struct kbase_hwcnt_backend_info *info); + -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)) -+#include -+#else -+#include -+#define dev_pm_opp_find_freq_exact opp_find_freq_exact -+#define dev_pm_opp_get_voltage opp_get_voltage -+#define dev_pm_opp opp ++/** ++ * typedef kbase_hwcnt_backend_init_fn - Initialise a counter backend. ++ * @info: Non-NULL pointer to backend info. ++ * @out_backend: Non-NULL pointer to where backend is stored on success. ++ * ++ * All uses of the created hardware counter backend must be externally ++ * synchronised. ++ * ++ * Return: 0 on success, else error code. ++ */ ++typedef int kbase_hwcnt_backend_init_fn(const struct kbase_hwcnt_backend_info *info, ++ struct kbase_hwcnt_backend **out_backend); ++ ++/** ++ * typedef kbase_hwcnt_backend_term_fn - Terminate a counter backend. ++ * @backend: Pointer to backend to be terminated. ++ */ ++typedef void kbase_hwcnt_backend_term_fn(struct kbase_hwcnt_backend *backend); ++ ++/** ++ * typedef kbase_hwcnt_backend_timestamp_ns_fn - Get the current backend ++ * timestamp. ++ * @backend: Non-NULL pointer to backend. ++ * ++ * Return: Backend timestamp in nanoseconds. ++ */ ++typedef u64 kbase_hwcnt_backend_timestamp_ns_fn(struct kbase_hwcnt_backend *backend); ++ ++/** ++ * typedef kbase_hwcnt_backend_dump_enable_fn - Start counter dumping with the ++ * backend. ++ * @backend: Non-NULL pointer to backend. ++ * @enable_map: Non-NULL pointer to enable map specifying enabled counters. ++ * ++ * The enable_map must have been created using the interface's metadata. ++ * If the backend has already been enabled, an error is returned. ++ * ++ * May be called in an atomic context. ++ * ++ * Return: 0 on success, else error code. ++ */ ++typedef int kbase_hwcnt_backend_dump_enable_fn(struct kbase_hwcnt_backend *backend, ++ const struct kbase_hwcnt_enable_map *enable_map); ++ ++/** ++ * typedef kbase_hwcnt_backend_dump_enable_nolock_fn - Start counter dumping ++ * with the backend. ++ * @backend: Non-NULL pointer to backend. ++ * @enable_map: Non-NULL pointer to enable map specifying enabled counters. ++ * ++ * Exactly the same as kbase_hwcnt_backend_dump_enable_fn(), except must be ++ * called in an atomic context with the spinlock documented by the specific ++ * backend interface held. ++ * ++ * Return: 0 on success, else error code. ++ */ ++typedef int ++kbase_hwcnt_backend_dump_enable_nolock_fn(struct kbase_hwcnt_backend *backend, ++ const struct kbase_hwcnt_enable_map *enable_map); ++ ++/** ++ * typedef kbase_hwcnt_backend_dump_disable_fn - Disable counter dumping with ++ * the backend. ++ * @backend: Non-NULL pointer to backend. ++ * ++ * If the backend is already disabled, does nothing. ++ * Any undumped counter values since the last dump get will be lost. ++ */ ++typedef void kbase_hwcnt_backend_dump_disable_fn(struct kbase_hwcnt_backend *backend); ++ ++/** ++ * typedef kbase_hwcnt_backend_dump_clear_fn - Reset all the current undumped ++ * counters. ++ * @backend: Non-NULL pointer to backend. ++ * ++ * If the backend is not enabled, returns an error. ++ * ++ * Return: 0 on success, else error code. ++ */ ++typedef int kbase_hwcnt_backend_dump_clear_fn(struct kbase_hwcnt_backend *backend); ++ ++/** ++ * typedef kbase_hwcnt_backend_dump_request_fn - Request an asynchronous counter ++ * dump. ++ * @backend: Non-NULL pointer to backend. ++ * @dump_time_ns: Non-NULL pointer where the timestamp of when the dump was ++ * requested will be written out to on success. ++ * ++ * If the backend is not enabled or another dump is already in progress, ++ * returns an error. ++ * ++ * Return: 0 on success, else error code. ++ */ ++typedef int kbase_hwcnt_backend_dump_request_fn(struct kbase_hwcnt_backend *backend, ++ u64 *dump_time_ns); ++ ++/** ++ * typedef kbase_hwcnt_backend_dump_wait_fn - Wait until the last requested ++ * counter dump has completed. ++ * @backend: Non-NULL pointer to backend. ++ * ++ * If the backend is not enabled, returns an error. ++ * ++ * Return: 0 on success, else error code. ++ */ ++typedef int kbase_hwcnt_backend_dump_wait_fn(struct kbase_hwcnt_backend *backend); ++ ++/** ++ * typedef kbase_hwcnt_backend_dump_get_fn - Copy or accumulate enable the ++ * counters dumped after the last dump ++ * request into the dump buffer. ++ * @backend: Non-NULL pointer to backend. ++ * @dump_buffer: Non-NULL pointer to destination dump buffer. ++ * @enable_map: Non-NULL pointer to enable map specifying enabled values. ++ * @accumulate: True if counters should be accumulated into dump_buffer, rather ++ * than copied. ++ * ++ * The resultant contents of the dump buffer are only well defined if a prior ++ * call to dump_wait returned successfully, and a new dump has not yet been ++ * requested by a call to dump_request. ++ * ++ * Return: 0 on success, else error code. ++ */ ++typedef int kbase_hwcnt_backend_dump_get_fn(struct kbase_hwcnt_backend *backend, ++ struct kbase_hwcnt_dump_buffer *dump_buffer, ++ const struct kbase_hwcnt_enable_map *enable_map, ++ bool accumulate); ++ ++/** ++ * struct kbase_hwcnt_backend_interface - Hardware counter backend virtual ++ * interface. ++ * @info: Immutable info used to initialise an instance of the ++ * backend. ++ * @metadata: Function ptr to get the immutable hardware counter ++ * metadata. ++ * @init: Function ptr to initialise an instance of the backend. ++ * @term: Function ptr to terminate an instance of the backend. ++ * @timestamp_ns: Function ptr to get the current backend timestamp. ++ * @dump_enable: Function ptr to enable dumping. ++ * @dump_enable_nolock: Function ptr to enable dumping while the ++ * backend-specific spinlock is already held. ++ * @dump_disable: Function ptr to disable dumping. ++ * @dump_clear: Function ptr to clear counters. ++ * @dump_request: Function ptr to request a dump. ++ * @dump_wait: Function ptr to wait until dump to complete. ++ * @dump_get: Function ptr to copy or accumulate dump into a dump ++ * buffer. ++ */ ++struct kbase_hwcnt_backend_interface { ++ const struct kbase_hwcnt_backend_info *info; ++ kbase_hwcnt_backend_metadata_fn *metadata; ++ kbase_hwcnt_backend_init_fn *init; ++ kbase_hwcnt_backend_term_fn *term; ++ kbase_hwcnt_backend_timestamp_ns_fn *timestamp_ns; ++ kbase_hwcnt_backend_dump_enable_fn *dump_enable; ++ kbase_hwcnt_backend_dump_enable_nolock_fn *dump_enable_nolock; ++ kbase_hwcnt_backend_dump_disable_fn *dump_disable; ++ kbase_hwcnt_backend_dump_clear_fn *dump_clear; ++ kbase_hwcnt_backend_dump_request_fn *dump_request; ++ kbase_hwcnt_backend_dump_wait_fn *dump_wait; ++ kbase_hwcnt_backend_dump_get_fn *dump_get; ++}; ++ ++#endif /* _KBASE_HWCNT_BACKEND_H_ */ +diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.c b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.c +new file mode 100644 +index 000000000..4a429a6cd +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.c +@@ -0,0 +1,1896 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2021-2023 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#include "hwcnt/backend/mali_kbase_hwcnt_backend_csf.h" ++#include "hwcnt/mali_kbase_hwcnt_gpu.h" ++#include "hwcnt/mali_kbase_hwcnt_types.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifndef BASE_MAX_NR_CLOCKS_REGULATORS ++#define BASE_MAX_NR_CLOCKS_REGULATORS 4 +#endif + -+#define KBASE_IPA_FALLBACK_MODEL_NAME "mali-simple-power-model" ++#if IS_ENABLED(CONFIG_MALI_IS_FPGA) && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++/* Backend watch dog timer interval in milliseconds: 18 seconds. */ ++#define HWCNT_BACKEND_WATCHDOG_TIMER_INTERVAL_MS ((u32)18000) ++#else ++/* Backend watch dog timer interval in milliseconds: 1 second. */ ++#define HWCNT_BACKEND_WATCHDOG_TIMER_INTERVAL_MS ((u32)1000) ++#endif /* IS_FPGA && !NO_MALI */ + -+static const struct kbase_ipa_model_ops *kbase_ipa_all_model_ops[] = { -+ &kbase_simple_ipa_model_ops, -+ &kbase_g71_ipa_model_ops, -+ &kbase_g72_ipa_model_ops, -+ &kbase_g76_ipa_model_ops, -+ &kbase_g52_ipa_model_ops, -+ &kbase_g52_r1_ipa_model_ops, -+ &kbase_g51_ipa_model_ops, -+ &kbase_g77_ipa_model_ops, -+ &kbase_tnax_ipa_model_ops, -+ &kbase_tbex_ipa_model_ops, -+ &kbase_tbax_ipa_model_ops ++/** ++ * enum kbase_hwcnt_backend_csf_dump_state - HWC CSF backend dumping states. ++ * ++ * @KBASE_HWCNT_BACKEND_CSF_DUMP_IDLE: Initial state, or the state if there is ++ * an error. ++ * ++ * @KBASE_HWCNT_BACKEND_CSF_DUMP_REQUESTED: A user dump has been requested and ++ * we are waiting for an ACK, this ACK could come from either PRFCNT_ACK, ++ * PROTMODE_ENTER_ACK, or if an error occurs. ++ * ++ * @KBASE_HWCNT_BACKEND_CSF_DUMP_WATCHDOG_REQUESTED: A watchdog dump has been ++ * requested and we're waiting for an ACK - this ACK could come from either ++ * PRFCNT_ACK, or if an error occurs, PROTMODE_ENTER_ACK is not applied here ++ * since watchdog request can't be triggered in protected mode. ++ * ++ * @KBASE_HWCNT_BACKEND_CSF_DUMP_QUERYING_INSERT: Checking the insert ++ * immediately after receiving the ACK, so we know which index corresponds to ++ * the buffer we requested. ++ * ++ * @KBASE_HWCNT_BACKEND_CSF_DUMP_WORKER_LAUNCHED: The insert has been saved and ++ * now we have kicked off the worker. ++ * ++ * @KBASE_HWCNT_BACKEND_CSF_DUMP_ACCUMULATING: The insert has been saved and now ++ * we have kicked off the worker to accumulate up to that insert and then copy ++ * the delta to the user buffer to prepare for dump_get(). ++ * ++ * @KBASE_HWCNT_BACKEND_CSF_DUMP_COMPLETED: The dump completed successfully. ++ * ++ * Valid state transitions: ++ * IDLE -> REQUESTED (on user dump request) ++ * IDLE -> WATCHDOG_REQUESTED (on watchdog request) ++ * IDLE -> QUERYING_INSERT (on user dump request in protected mode) ++ * REQUESTED -> QUERYING_INSERT (on dump acknowledged from firmware) ++ * WATCHDOG_REQUESTED -> REQUESTED (on user dump request) ++ * WATCHDOG_REQUESTED -> COMPLETED (on dump acknowledged from firmware for watchdog request) ++ * QUERYING_INSERT -> WORKER_LAUNCHED (on worker submission) ++ * WORKER_LAUNCHED -> ACCUMULATING (while the worker is accumulating) ++ * ACCUMULATING -> COMPLETED (on accumulation completion) ++ * COMPLETED -> QUERYING_INSERT (on user dump request in protected mode) ++ * COMPLETED -> REQUESTED (on user dump request) ++ * COMPLETED -> WATCHDOG_REQUESTED (on watchdog request) ++ * COMPLETED -> IDLE (on disable) ++ * ANY -> IDLE (on error) ++ */ ++enum kbase_hwcnt_backend_csf_dump_state { ++ KBASE_HWCNT_BACKEND_CSF_DUMP_IDLE, ++ KBASE_HWCNT_BACKEND_CSF_DUMP_REQUESTED, ++ KBASE_HWCNT_BACKEND_CSF_DUMP_WATCHDOG_REQUESTED, ++ KBASE_HWCNT_BACKEND_CSF_DUMP_QUERYING_INSERT, ++ KBASE_HWCNT_BACKEND_CSF_DUMP_WORKER_LAUNCHED, ++ KBASE_HWCNT_BACKEND_CSF_DUMP_ACCUMULATING, ++ KBASE_HWCNT_BACKEND_CSF_DUMP_COMPLETED, ++}; ++ ++/** ++ * enum kbase_hwcnt_backend_csf_enable_state - HWC CSF backend enable states. ++ * ++ * @KBASE_HWCNT_BACKEND_CSF_DISABLED: Initial state, and the state when backend ++ * is disabled. ++ * ++ * @KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_ENABLED: Enable request is in ++ * progress, waiting for firmware acknowledgment. ++ * ++ * @KBASE_HWCNT_BACKEND_CSF_ENABLED: Enable request has been acknowledged, ++ * enable is done. ++ * ++ * @KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_DISABLED: Disable request is in ++ * progress, waiting for firmware acknowledgment. ++ * ++ * @KBASE_HWCNT_BACKEND_CSF_DISABLED_WAIT_FOR_WORKER: Disable request has been ++ * acknowledged, waiting for dump workers to be finished. ++ * ++ * @KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR_WAIT_FOR_WORKER: An ++ * unrecoverable error happened, waiting for dump workers to be finished. ++ * ++ * @KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR: An unrecoverable error ++ * happened, and dump workers have finished, waiting for reset. ++ * ++ * Valid state transitions: ++ * DISABLED -> TRANSITIONING_TO_ENABLED (on enable) ++ * TRANSITIONING_TO_ENABLED -> ENABLED (on enable ack) ++ * ENABLED -> TRANSITIONING_TO_DISABLED (on disable) ++ * TRANSITIONING_TO_DISABLED -> DISABLED_WAIT_FOR_WORKER (on disable ack) ++ * DISABLED_WAIT_FOR_WORKER -> DISABLED (after workers are flushed) ++ * DISABLED -> UNRECOVERABLE_ERROR (on unrecoverable error) ++ * ANY but DISABLED -> UNRECOVERABLE_ERROR_WAIT_FOR_WORKER (on unrecoverable ++ * error) ++ * UNRECOVERABLE_ERROR -> DISABLED (on before reset) ++ */ ++enum kbase_hwcnt_backend_csf_enable_state { ++ KBASE_HWCNT_BACKEND_CSF_DISABLED, ++ KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_ENABLED, ++ KBASE_HWCNT_BACKEND_CSF_ENABLED, ++ KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_DISABLED, ++ KBASE_HWCNT_BACKEND_CSF_DISABLED_WAIT_FOR_WORKER, ++ KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR_WAIT_FOR_WORKER, ++ KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR, ++}; ++ ++/** ++ * struct kbase_hwcnt_backend_csf_info - Information used to create an instance ++ * of a CSF hardware counter backend. ++ * @backend: Pointer to access CSF backend. ++ * @fw_in_protected_mode: True if FW is running in protected mode, else ++ * false. ++ * @unrecoverable_error_happened: True if an recoverable error happened, else ++ * false. ++ * @csf_if: CSF interface object pointer. ++ * @ring_buf_cnt: Dump buffer count in the ring buffer. ++ * @counter_set: The performance counter set to use. ++ * @metadata: Hardware counter metadata. ++ * @prfcnt_info: Performance counter information. ++ * @watchdog_if: Watchdog interface object pointer. ++ */ ++struct kbase_hwcnt_backend_csf_info { ++ struct kbase_hwcnt_backend_csf *backend; ++ bool fw_in_protected_mode; ++ bool unrecoverable_error_happened; ++ struct kbase_hwcnt_backend_csf_if *csf_if; ++ u32 ring_buf_cnt; ++ enum kbase_hwcnt_set counter_set; ++ const struct kbase_hwcnt_metadata *metadata; ++ struct kbase_hwcnt_backend_csf_if_prfcnt_info prfcnt_info; ++ struct kbase_hwcnt_watchdog_interface *watchdog_if; ++}; ++ ++/** ++ * struct kbase_hwcnt_csf_physical_layout - HWC sample memory physical layout ++ * information. ++ * @hw_block_cnt: Total number of hardware counters blocks. The hw counters blocks are ++ * sub-categorized into 4 classes: front-end, tiler, memory system, and shader. ++ * hw_block_cnt = fe_cnt + tiler_cnt + mmu_l2_cnt + shader_cnt. ++ * @fe_cnt: Front end block count. ++ * @tiler_cnt: Tiler block count. ++ * @mmu_l2_cnt: Memory system (MMU and L2 cache) block count. ++ * @shader_cnt: Shader Core block count. ++ * @fw_block_cnt: Total number of firmware counters blocks. ++ * @block_cnt: Total block count (sum of all counter blocks: hw_block_cnt + fw_block_cnt). ++ * @shader_avail_mask: Bitmap of all shader cores in the system. ++ * @enable_mask_offset: Offset in array elements of enable mask in each block ++ * starting from the beginning of block. ++ * @headers_per_block: For any block, the number of counters designated as block's header. ++ * @counters_per_block: For any block, the number of counters designated as block's payload. ++ * @values_per_block: For any block, the number of counters in total (header + payload). ++ */ ++struct kbase_hwcnt_csf_physical_layout { ++ u8 hw_block_cnt; ++ u8 fe_cnt; ++ u8 tiler_cnt; ++ u8 mmu_l2_cnt; ++ u8 shader_cnt; ++ u8 fw_block_cnt; ++ u8 block_cnt; ++ u64 shader_avail_mask; ++ size_t enable_mask_offset; ++ size_t headers_per_block; ++ size_t counters_per_block; ++ size_t values_per_block; ++}; ++ ++/** ++ * struct kbase_hwcnt_backend_csf - Instance of a CSF hardware counter backend. ++ * @info: CSF Info used to create the backend. ++ * @dump_state: The dumping state of the backend. ++ * @enable_state: The CSF backend internal enabled state. ++ * @insert_index_to_accumulate: The insert index in the ring buffer which need ++ * to accumulate up to. ++ * @enable_state_waitq: Wait queue object used to notify the enable ++ * changing flag is done. ++ * @to_user_buf: HWC sample buffer for client user, size ++ * metadata.dump_buf_bytes. ++ * @accum_buf: HWC sample buffer used as an internal ++ * accumulator, size metadata.dump_buf_bytes. ++ * @old_sample_buf: HWC sample buffer to save the previous values ++ * for delta calculation, size ++ * prfcnt_info.dump_bytes. ++ * @watchdog_last_seen_insert_idx: The insert index which watchdog has last ++ * seen, to check any new firmware automatic ++ * samples generated during the watchdog ++ * period. ++ * @ring_buf: Opaque pointer for ring buffer object. ++ * @ring_buf_cpu_base: CPU base address of the allocated ring buffer. ++ * @clk_enable_map: The enable map specifying enabled clock domains. ++ * @cycle_count_elapsed: Cycle count elapsed for a given sample period. ++ * @prev_cycle_count: Previous cycle count to calculate the cycle ++ * count for sample period. ++ * @phys_layout: Physical memory layout information of HWC ++ * sample buffer. ++ * @dump_completed: Completion signaled by the dump worker when ++ * it is completed accumulating up to the ++ * insert_index_to_accumulate. ++ * Should be initialized to the "complete" state. ++ * @user_requested: Flag to indicate a dump_request called from ++ * user. ++ * @hwc_dump_workq: Single threaded work queue for HWC workers ++ * execution. ++ * @hwc_dump_work: Worker to accumulate samples. ++ * @hwc_threshold_work: Worker for consuming available samples when ++ * threshold interrupt raised. ++ */ ++struct kbase_hwcnt_backend_csf { ++ struct kbase_hwcnt_backend_csf_info *info; ++ enum kbase_hwcnt_backend_csf_dump_state dump_state; ++ enum kbase_hwcnt_backend_csf_enable_state enable_state; ++ u32 insert_index_to_accumulate; ++ wait_queue_head_t enable_state_waitq; ++ u64 *to_user_buf; ++ u64 *accum_buf; ++ u32 *old_sample_buf; ++ u32 watchdog_last_seen_insert_idx; ++ struct kbase_hwcnt_backend_csf_if_ring_buf *ring_buf; ++ void *ring_buf_cpu_base; ++ u64 clk_enable_map; ++ u64 cycle_count_elapsed[BASE_MAX_NR_CLOCKS_REGULATORS]; ++ u64 prev_cycle_count[BASE_MAX_NR_CLOCKS_REGULATORS]; ++ struct kbase_hwcnt_csf_physical_layout phys_layout; ++ struct completion dump_completed; ++ bool user_requested; ++ struct workqueue_struct *hwc_dump_workq; ++ struct work_struct hwc_dump_work; ++ struct work_struct hwc_threshold_work; +}; + -+int kbase_ipa_model_recalculate(struct kbase_ipa_model *model) ++static bool kbasep_hwcnt_backend_csf_backend_exists(struct kbase_hwcnt_backend_csf_info *csf_info) +{ -+ int err = 0; ++ WARN_ON(!csf_info); ++ csf_info->csf_if->assert_lock_held(csf_info->csf_if->ctx); ++ return (csf_info->backend != NULL); ++} + -+ lockdep_assert_held(&model->kbdev->ipa.lock); ++/** ++ * kbasep_hwcnt_backend_csf_cc_initial_sample() - Initialize cycle count ++ * tracking. ++ * ++ * @backend_csf: Non-NULL pointer to backend. ++ * @enable_map: Non-NULL pointer to enable map specifying enabled counters. ++ */ ++static void ++kbasep_hwcnt_backend_csf_cc_initial_sample(struct kbase_hwcnt_backend_csf *backend_csf, ++ const struct kbase_hwcnt_enable_map *enable_map) ++{ ++ u64 clk_enable_map = enable_map->clk_enable_map; ++ u64 cycle_counts[BASE_MAX_NR_CLOCKS_REGULATORS]; ++ size_t clk; + -+ if (model->ops->recalculate) { -+ err = model->ops->recalculate(model); -+ if (err) { -+ dev_err(model->kbdev->dev, -+ "recalculation of power model %s returned error %d\n", -+ model->ops->name, err); -+ } ++ memset(cycle_counts, 0, sizeof(cycle_counts)); ++ ++ /* Read cycle count from CSF interface for both clock domains. */ ++ backend_csf->info->csf_if->get_gpu_cycle_count(backend_csf->info->csf_if->ctx, cycle_counts, ++ clk_enable_map); ++ ++ kbase_hwcnt_metadata_for_each_clock(enable_map->metadata, clk) ++ { ++ if (kbase_hwcnt_clk_enable_map_enabled(clk_enable_map, clk)) ++ backend_csf->prev_cycle_count[clk] = cycle_counts[clk]; + } + -+ return err; ++ /* Keep clk_enable_map for dump_request. */ ++ backend_csf->clk_enable_map = clk_enable_map; +} + -+const struct kbase_ipa_model_ops *kbase_ipa_model_ops_find(struct kbase_device *kbdev, -+ const char *name) ++static void kbasep_hwcnt_backend_csf_cc_update(struct kbase_hwcnt_backend_csf *backend_csf) +{ -+ int i; ++ u64 cycle_counts[BASE_MAX_NR_CLOCKS_REGULATORS]; ++ size_t clk; + -+ for (i = 0; i < ARRAY_SIZE(kbase_ipa_all_model_ops); ++i) { -+ const struct kbase_ipa_model_ops *ops = kbase_ipa_all_model_ops[i]; ++ memset(cycle_counts, 0, sizeof(cycle_counts)); + -+ if (!strcmp(ops->name, name)) -+ return ops; ++ backend_csf->info->csf_if->assert_lock_held(backend_csf->info->csf_if->ctx); ++ ++ backend_csf->info->csf_if->get_gpu_cycle_count(backend_csf->info->csf_if->ctx, cycle_counts, ++ backend_csf->clk_enable_map); ++ ++ kbase_hwcnt_metadata_for_each_clock(backend_csf->info->metadata, clk) ++ { ++ if (kbase_hwcnt_clk_enable_map_enabled(backend_csf->clk_enable_map, clk)) { ++ backend_csf->cycle_count_elapsed[clk] = ++ cycle_counts[clk] - backend_csf->prev_cycle_count[clk]; ++ backend_csf->prev_cycle_count[clk] = cycle_counts[clk]; ++ } + } ++} + -+ dev_err(kbdev->dev, "power model \'%s\' not found\n", name); ++/* CSF backend implementation of kbase_hwcnt_backend_timestamp_ns_fn */ ++static u64 kbasep_hwcnt_backend_csf_timestamp_ns(struct kbase_hwcnt_backend *backend) ++{ ++ struct kbase_hwcnt_backend_csf *backend_csf = (struct kbase_hwcnt_backend_csf *)backend; + -+ return NULL; ++ if (!backend_csf || !backend_csf->info || !backend_csf->info->csf_if) ++ return 0; ++ ++ return backend_csf->info->csf_if->timestamp_ns(backend_csf->info->csf_if->ctx); +} -+KBASE_EXPORT_TEST_API(kbase_ipa_model_ops_find); + -+const char *kbase_ipa_model_name_from_id(u32 gpu_id) ++/** kbasep_hwcnt_backend_csf_process_enable_map() - Process the enable_map to ++ * guarantee headers are ++ * enabled if any counter is ++ * required. ++ *@phys_enable_map: HWC physical enable map to be processed. ++ */ ++static void ++kbasep_hwcnt_backend_csf_process_enable_map(struct kbase_hwcnt_physical_enable_map *phys_enable_map) +{ -+ const u32 prod_id = (gpu_id & GPU_ID_VERSION_PRODUCT_ID) >> -+ GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++ WARN_ON(!phys_enable_map); + -+ switch (GPU_ID2_MODEL_MATCH_VALUE(prod_id)) { -+ case GPU_ID2_PRODUCT_TMIX: -+ return "mali-g71-power-model"; -+ case GPU_ID2_PRODUCT_THEX: -+ return "mali-g72-power-model"; -+ case GPU_ID2_PRODUCT_TNOX: -+ return "mali-g76-power-model"; -+ case GPU_ID2_PRODUCT_TSIX: -+ return "mali-g51-power-model"; -+ case GPU_ID2_PRODUCT_TGOX: -+ if ((gpu_id & GPU_ID2_VERSION_MAJOR) == -+ (0 << GPU_ID2_VERSION_MAJOR_SHIFT)) -+ /* g52 aliased to g76 power-model's ops */ -+ return "mali-g52-power-model"; -+ else -+ return "mali-g52_r1-power-model"; -+ case GPU_ID2_PRODUCT_TNAX: -+ return "mali-tnax-power-model"; -+ case GPU_ID2_PRODUCT_TTRX: -+ return "mali-g77-power-model"; -+ case GPU_ID2_PRODUCT_TBEX: -+ return "mali-tbex-power-model"; -+ case GPU_ID2_PRODUCT_TBAX: -+ return "mali-tbax-power-model"; -+ default: -+ return KBASE_IPA_FALLBACK_MODEL_NAME; -+ } ++ /* Enable header if any counter is required from user, the header is ++ * controlled by bit 0 of the enable mask. ++ */ ++ if (phys_enable_map->fe_bm) ++ phys_enable_map->fe_bm |= 1; ++ ++ if (phys_enable_map->tiler_bm) ++ phys_enable_map->tiler_bm |= 1; ++ ++ if (phys_enable_map->mmu_l2_bm) ++ phys_enable_map->mmu_l2_bm |= 1; ++ ++ if (phys_enable_map->shader_bm) ++ phys_enable_map->shader_bm |= 1; +} -+KBASE_EXPORT_TEST_API(kbase_ipa_model_name_from_id); + -+static struct device_node *get_model_dt_node(struct kbase_ipa_model *model, -+ bool dt_required) ++static void kbasep_hwcnt_backend_csf_init_layout( ++ const struct kbase_hwcnt_backend_csf_if_prfcnt_info *prfcnt_info, ++ struct kbase_hwcnt_csf_physical_layout *phys_layout) +{ -+ struct device_node *model_dt_node; -+ char compat_string[64]; ++ size_t shader_core_cnt; ++ size_t values_per_block; ++ size_t fw_blocks_count; ++ size_t hw_blocks_count; + -+ snprintf(compat_string, sizeof(compat_string), "arm,%s", -+ model->ops->name); ++ WARN_ON(!prfcnt_info); ++ WARN_ON(!phys_layout); + -+ /* of_find_compatible_node() will call of_node_put() on the root node, -+ * so take a reference on it first. ++ shader_core_cnt = fls64(prfcnt_info->core_mask); ++ values_per_block = prfcnt_info->prfcnt_block_size / KBASE_HWCNT_VALUE_HW_BYTES; ++ fw_blocks_count = div_u64(prfcnt_info->prfcnt_fw_size, prfcnt_info->prfcnt_block_size); ++ hw_blocks_count = div_u64(prfcnt_info->prfcnt_hw_size, prfcnt_info->prfcnt_block_size); ++ ++ /* The number of hardware counters reported by the GPU matches the legacy guess-work we ++ * have done in the past + */ -+ of_node_get(model->kbdev->dev->of_node); -+ model_dt_node = of_find_compatible_node(model->kbdev->dev->of_node, -+ NULL, compat_string); -+ if (!model_dt_node && !model->missing_dt_node_warning) { -+ if (dt_required) -+ dev_warn(model->kbdev->dev, -+ "Couldn't find power_model DT node matching \'%s\'\n", -+ compat_string); -+ model->missing_dt_node_warning = true; ++ WARN_ON(hw_blocks_count != KBASE_HWCNT_V5_FE_BLOCK_COUNT + ++ KBASE_HWCNT_V5_TILER_BLOCK_COUNT + ++ prfcnt_info->l2_count + shader_core_cnt); ++ ++ *phys_layout = (struct kbase_hwcnt_csf_physical_layout){ ++ .fe_cnt = KBASE_HWCNT_V5_FE_BLOCK_COUNT, ++ .tiler_cnt = KBASE_HWCNT_V5_TILER_BLOCK_COUNT, ++ .mmu_l2_cnt = prfcnt_info->l2_count, ++ .shader_cnt = shader_core_cnt, ++ .fw_block_cnt = fw_blocks_count, ++ .hw_block_cnt = hw_blocks_count, ++ .block_cnt = fw_blocks_count + hw_blocks_count, ++ .shader_avail_mask = prfcnt_info->core_mask, ++ .headers_per_block = KBASE_HWCNT_V5_HEADERS_PER_BLOCK, ++ .values_per_block = values_per_block, ++ .counters_per_block = values_per_block - KBASE_HWCNT_V5_HEADERS_PER_BLOCK, ++ .enable_mask_offset = KBASE_HWCNT_V5_PRFCNT_EN_HEADER, ++ }; ++} ++ ++static void ++kbasep_hwcnt_backend_csf_reset_internal_buffers(struct kbase_hwcnt_backend_csf *backend_csf) ++{ ++ size_t user_buf_bytes = backend_csf->info->metadata->dump_buf_bytes; ++ ++ memset(backend_csf->to_user_buf, 0, user_buf_bytes); ++ memset(backend_csf->accum_buf, 0, user_buf_bytes); ++ memset(backend_csf->old_sample_buf, 0, backend_csf->info->prfcnt_info.dump_bytes); ++} ++ ++static void ++kbasep_hwcnt_backend_csf_zero_sample_prfcnt_en_header(struct kbase_hwcnt_backend_csf *backend_csf, ++ u32 *sample) ++{ ++ u32 block_idx; ++ const struct kbase_hwcnt_csf_physical_layout *phys_layout; ++ u32 *block_buf; ++ ++ phys_layout = &backend_csf->phys_layout; ++ ++ for (block_idx = 0; block_idx < phys_layout->block_cnt; block_idx++) { ++ block_buf = sample + block_idx * phys_layout->values_per_block; ++ block_buf[phys_layout->enable_mask_offset] = 0; + } ++} + -+ return model_dt_node; ++static void ++kbasep_hwcnt_backend_csf_zero_all_prfcnt_en_header(struct kbase_hwcnt_backend_csf *backend_csf) ++{ ++ u32 idx; ++ u32 *sample; ++ char *cpu_dump_base; ++ size_t dump_bytes = backend_csf->info->prfcnt_info.dump_bytes; ++ ++ cpu_dump_base = (char *)backend_csf->ring_buf_cpu_base; ++ ++ for (idx = 0; idx < backend_csf->info->ring_buf_cnt; idx++) { ++ sample = (u32 *)&cpu_dump_base[idx * dump_bytes]; ++ kbasep_hwcnt_backend_csf_zero_sample_prfcnt_en_header(backend_csf, sample); ++ } +} + -+int kbase_ipa_model_add_param_s32(struct kbase_ipa_model *model, -+ const char *name, s32 *addr, -+ size_t num_elems, bool dt_required) ++static void kbasep_hwcnt_backend_csf_update_user_sample(struct kbase_hwcnt_backend_csf *backend_csf) +{ -+ int err, i; -+ struct device_node *model_dt_node = get_model_dt_node(model, -+ dt_required); -+ char *origin; ++ size_t user_buf_bytes = backend_csf->info->metadata->dump_buf_bytes; + -+ err = of_property_read_u32_array(model_dt_node, name, addr, num_elems); -+ /* We're done with model_dt_node now, so drop the reference taken in -+ * get_model_dt_node()/of_find_compatible_node(). ++ /* Copy the data into the sample and wait for the user to get it. */ ++ memcpy(backend_csf->to_user_buf, backend_csf->accum_buf, user_buf_bytes); ++ ++ /* After copied data into user sample, clear the accumulator values to ++ * prepare for the next accumulator, such as the next request or ++ * threshold. + */ -+ of_node_put(model_dt_node); ++ memset(backend_csf->accum_buf, 0, user_buf_bytes); ++} + -+ if (err && dt_required) { -+ memset(addr, 0, sizeof(s32) * num_elems); -+ dev_warn(model->kbdev->dev, -+ "Error %d, no DT entry: %s.%s = %zu*[0]\n", -+ err, model->ops->name, name, num_elems); -+ origin = "zero"; -+ } else if (err && !dt_required) { -+ origin = "default"; -+ } else /* !err */ { -+ origin = "DT"; -+ } ++static void kbasep_hwcnt_backend_csf_accumulate_sample( ++ const struct kbase_hwcnt_csf_physical_layout *phys_layout, size_t dump_bytes, ++ u64 *accum_buf, const u32 *old_sample_buf, const u32 *new_sample_buf, bool clearing_samples) ++{ ++ size_t block_idx; ++ const u32 *old_block = old_sample_buf; ++ const u32 *new_block = new_sample_buf; ++ u64 *acc_block = accum_buf; ++ const size_t values_per_block = phys_layout->values_per_block; + -+ /* Create a unique debugfs entry for each element */ -+ for (i = 0; i < num_elems; ++i) { -+ char elem_name[32]; ++ /* Performance counter blocks for firmware are stored before blocks for hardware. ++ * We skip over the firmware's performance counter blocks (counters dumping is not ++ * supported for firmware blocks, only hardware ones). ++ */ ++ old_block += values_per_block * phys_layout->fw_block_cnt; ++ new_block += values_per_block * phys_layout->fw_block_cnt; + -+ if (num_elems == 1) -+ snprintf(elem_name, sizeof(elem_name), "%s", name); -+ else -+ snprintf(elem_name, sizeof(elem_name), "%s.%d", -+ name, i); ++ for (block_idx = phys_layout->fw_block_cnt; block_idx < phys_layout->block_cnt; ++ block_idx++) { ++ const u32 old_enable_mask = old_block[phys_layout->enable_mask_offset]; ++ const u32 new_enable_mask = new_block[phys_layout->enable_mask_offset]; + -+ dev_dbg(model->kbdev->dev, "%s.%s = %d (%s)\n", -+ model->ops->name, elem_name, addr[i], origin); ++ if (new_enable_mask == 0) { ++ /* Hardware block was unavailable or we didn't turn on ++ * any counters. Do nothing. ++ */ ++ } else { ++ /* Hardware block was available and it had some counters ++ * enabled. We need to update the accumulation buffer. ++ */ ++ size_t ctr_idx; + -+ err = kbase_ipa_model_param_add(model, elem_name, -+ &addr[i], sizeof(s32), -+ PARAM_TYPE_S32); -+ if (err) -+ goto exit; ++ /* Unconditionally copy the headers. */ ++ for (ctr_idx = 0; ctr_idx < phys_layout->headers_per_block; ctr_idx++) { ++ acc_block[ctr_idx] = new_block[ctr_idx]; ++ } ++ ++ /* Accumulate counter samples ++ * ++ * When accumulating samples we need to take into ++ * account whether the counter sampling method involves ++ * clearing counters back to zero after each sample is ++ * taken. ++ * ++ * The intention for CSF was that all HW should use ++ * counters which wrap to zero when their maximum value ++ * is reached. This, combined with non-clearing ++ * sampling, enables multiple concurrent users to ++ * request samples without interfering with each other. ++ * ++ * However some early HW may not support wrapping ++ * counters, for these GPUs counters must be cleared on ++ * sample to avoid loss of data due to counters ++ * saturating at their maximum value. ++ */ ++ if (!clearing_samples) { ++ if (old_enable_mask == 0) { ++ /* Hardware block was previously ++ * unavailable. Accumulate the new ++ * counters only, as we know previous ++ * values are zeroes. ++ */ ++ for (ctr_idx = phys_layout->headers_per_block; ++ ctr_idx < values_per_block; ctr_idx++) { ++ acc_block[ctr_idx] += new_block[ctr_idx]; ++ } ++ } else { ++ /* Hardware block was previously ++ * available. Accumulate the delta ++ * between old and new counter values. ++ */ ++ for (ctr_idx = phys_layout->headers_per_block; ++ ctr_idx < values_per_block; ctr_idx++) { ++ acc_block[ctr_idx] += ++ new_block[ctr_idx] - old_block[ctr_idx]; ++ } ++ } ++ } else { ++ for (ctr_idx = phys_layout->headers_per_block; ++ ctr_idx < values_per_block; ctr_idx++) { ++ acc_block[ctr_idx] += new_block[ctr_idx]; ++ } ++ } ++ } ++ old_block += values_per_block; ++ new_block += values_per_block; ++ acc_block += values_per_block; + } -+exit: -+ return err; ++ ++ WARN_ON(old_block != old_sample_buf + (dump_bytes / KBASE_HWCNT_VALUE_HW_BYTES)); ++ WARN_ON(new_block != new_sample_buf + (dump_bytes / KBASE_HWCNT_VALUE_HW_BYTES)); ++ WARN_ON(acc_block != accum_buf + (dump_bytes / KBASE_HWCNT_VALUE_HW_BYTES) - ++ (values_per_block * phys_layout->fw_block_cnt)); ++ (void)dump_bytes; +} + -+int kbase_ipa_model_add_param_string(struct kbase_ipa_model *model, -+ const char *name, char *addr, -+ size_t size, bool dt_required) ++static void kbasep_hwcnt_backend_csf_accumulate_samples(struct kbase_hwcnt_backend_csf *backend_csf, ++ u32 extract_index_to_start, ++ u32 insert_index_to_stop) +{ -+ int err; -+ struct device_node *model_dt_node = get_model_dt_node(model, -+ dt_required); -+ const char *string_prop_value; -+ char *origin; ++ u32 raw_idx; ++ unsigned long flags = 0UL; ++ u8 *cpu_dump_base = (u8 *)backend_csf->ring_buf_cpu_base; ++ const size_t ring_buf_cnt = backend_csf->info->ring_buf_cnt; ++ const size_t buf_dump_bytes = backend_csf->info->prfcnt_info.dump_bytes; ++ bool clearing_samples = backend_csf->info->prfcnt_info.clearing_samples; ++ u32 *old_sample_buf = backend_csf->old_sample_buf; ++ u32 *new_sample_buf = old_sample_buf; + -+ err = of_property_read_string(model_dt_node, name, -+ &string_prop_value); ++ if (extract_index_to_start == insert_index_to_stop) ++ /* No samples to accumulate. Early out. */ ++ return; + -+ /* We're done with model_dt_node now, so drop the reference taken in -+ * get_model_dt_node()/of_find_compatible_node(). ++ /* Sync all the buffers to CPU side before read the data. */ ++ backend_csf->info->csf_if->ring_buf_sync(backend_csf->info->csf_if->ctx, ++ backend_csf->ring_buf, extract_index_to_start, ++ insert_index_to_stop, true); ++ ++ /* Consider u32 wrap case, '!=' is used here instead of '<' operator */ ++ for (raw_idx = extract_index_to_start; raw_idx != insert_index_to_stop; raw_idx++) { ++ /* The logical "&" acts as a modulo operation since buf_count ++ * must be a power of two. ++ */ ++ const u32 buf_idx = raw_idx & (ring_buf_cnt - 1); ++ ++ new_sample_buf = (u32 *)&cpu_dump_base[buf_idx * buf_dump_bytes]; ++ ++ kbasep_hwcnt_backend_csf_accumulate_sample(&backend_csf->phys_layout, ++ buf_dump_bytes, backend_csf->accum_buf, ++ old_sample_buf, new_sample_buf, ++ clearing_samples); ++ ++ old_sample_buf = new_sample_buf; ++ } ++ ++ /* Save the newest buffer as the old buffer for next time. */ ++ memcpy(backend_csf->old_sample_buf, new_sample_buf, buf_dump_bytes); ++ ++ /* Reset the prfcnt_en header on each sample before releasing them. */ ++ for (raw_idx = extract_index_to_start; raw_idx != insert_index_to_stop; raw_idx++) { ++ const u32 buf_idx = raw_idx & (ring_buf_cnt - 1); ++ u32 *sample = (u32 *)&cpu_dump_base[buf_idx * buf_dump_bytes]; ++ ++ kbasep_hwcnt_backend_csf_zero_sample_prfcnt_en_header(backend_csf, sample); ++ } ++ ++ /* Sync zeroed buffers to avoid coherency issues on future use. */ ++ backend_csf->info->csf_if->ring_buf_sync(backend_csf->info->csf_if->ctx, ++ backend_csf->ring_buf, extract_index_to_start, ++ insert_index_to_stop, false); ++ ++ /* After consuming all samples between extract_idx and insert_idx, ++ * set the raw extract index to insert_idx so that the sample buffers ++ * can be released back to the ring buffer pool. + */ -+ of_node_put(model_dt_node); ++ backend_csf->info->csf_if->lock(backend_csf->info->csf_if->ctx, &flags); ++ backend_csf->info->csf_if->set_extract_index(backend_csf->info->csf_if->ctx, ++ insert_index_to_stop); ++ /* Update the watchdog last seen index to check any new FW auto samples ++ * in next watchdog callback. ++ */ ++ backend_csf->watchdog_last_seen_insert_idx = insert_index_to_stop; ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++} + -+ if (err && dt_required) { -+ strncpy(addr, "", size - 1); -+ dev_warn(model->kbdev->dev, -+ "Error %d, no DT entry: %s.%s = \'%s\'\n", -+ err, model->ops->name, name, addr); -+ err = 0; -+ origin = "zero"; -+ } else if (err && !dt_required) { -+ origin = "default"; -+ } else /* !err */ { -+ strncpy(addr, string_prop_value, size - 1); -+ origin = "DT"; ++static void kbasep_hwcnt_backend_csf_change_es_and_wake_waiters( ++ struct kbase_hwcnt_backend_csf *backend_csf, ++ enum kbase_hwcnt_backend_csf_enable_state new_state) ++{ ++ backend_csf->info->csf_if->assert_lock_held(backend_csf->info->csf_if->ctx); ++ ++ if (backend_csf->enable_state != new_state) { ++ backend_csf->enable_state = new_state; ++ ++ wake_up(&backend_csf->enable_state_waitq); + } ++} + -+ addr[size - 1] = '\0'; ++static void kbasep_hwcnt_backend_watchdog_timer_cb(void *info) ++{ ++ struct kbase_hwcnt_backend_csf_info *csf_info = info; ++ struct kbase_hwcnt_backend_csf *backend_csf; ++ unsigned long flags = 0UL; + -+ dev_dbg(model->kbdev->dev, "%s.%s = \'%s\' (%s)\n", -+ model->ops->name, name, string_prop_value, origin); ++ csf_info->csf_if->lock(csf_info->csf_if->ctx, &flags); + -+ err = kbase_ipa_model_param_add(model, name, addr, size, -+ PARAM_TYPE_STRING); -+ return err; ++ if (WARN_ON(!kbasep_hwcnt_backend_csf_backend_exists(csf_info))) { ++ csf_info->csf_if->unlock(csf_info->csf_if->ctx, flags); ++ return; ++ } ++ ++ backend_csf = csf_info->backend; ++ ++ /* Only do watchdog request when all conditions are met: */ ++ if (/* 1. Backend is enabled. */ ++ (backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_ENABLED) && ++ /* 2. FW is not in protected mode. */ ++ (!csf_info->fw_in_protected_mode) && ++ /* 3. dump state indicates no other dumping is in progress. */ ++ ((backend_csf->dump_state == KBASE_HWCNT_BACKEND_CSF_DUMP_IDLE) || ++ (backend_csf->dump_state == KBASE_HWCNT_BACKEND_CSF_DUMP_COMPLETED))) { ++ u32 extract_index = 0U; ++ u32 insert_index = 0U; ++ ++ /* Read the raw extract and insert indexes from the CSF interface. */ ++ csf_info->csf_if->get_indexes(csf_info->csf_if->ctx, &extract_index, &insert_index); ++ ++ /* Do watchdog request if no new FW auto samples. */ ++ if (insert_index == backend_csf->watchdog_last_seen_insert_idx) { ++ /* Trigger the watchdog request. */ ++ csf_info->csf_if->dump_request(csf_info->csf_if->ctx); ++ ++ /* A watchdog dump is required, change the state to ++ * start the request process. ++ */ ++ backend_csf->dump_state = KBASE_HWCNT_BACKEND_CSF_DUMP_WATCHDOG_REQUESTED; ++ } ++ } ++ ++ /* Must schedule another callback when in the transitional state because ++ * this function can be called for the first time before the performance ++ * counter enabled interrupt. ++ */ ++ if ((backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_ENABLED) || ++ (backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_ENABLED)) { ++ /* Reschedule the timer for next watchdog callback. */ ++ csf_info->watchdog_if->modify(csf_info->watchdog_if->timer, ++ HWCNT_BACKEND_WATCHDOG_TIMER_INTERVAL_MS); ++ } ++ ++ csf_info->csf_if->unlock(csf_info->csf_if->ctx, flags); +} + -+void kbase_ipa_term_model(struct kbase_ipa_model *model) ++/** ++ * kbasep_hwcnt_backend_csf_dump_worker() - HWC dump worker. ++ * @work: Work structure. ++ * ++ * To accumulate all available samples in the ring buffer when a request has ++ * been done. ++ * ++ */ ++static void kbasep_hwcnt_backend_csf_dump_worker(struct work_struct *work) +{ -+ if (!model) ++ unsigned long flags = 0ULL; ++ struct kbase_hwcnt_backend_csf *backend_csf; ++ u32 insert_index_to_acc; ++ u32 extract_index = 0U; ++ u32 insert_index = 0U; ++ ++ WARN_ON(!work); ++ backend_csf = container_of(work, struct kbase_hwcnt_backend_csf, hwc_dump_work); ++ backend_csf->info->csf_if->lock(backend_csf->info->csf_if->ctx, &flags); ++ /* Assert the backend is not destroyed. */ ++ WARN_ON(backend_csf != backend_csf->info->backend); ++ ++ /* The backend was disabled or had an error while the worker was being ++ * launched. ++ */ ++ if (backend_csf->enable_state != KBASE_HWCNT_BACKEND_CSF_ENABLED) { ++ WARN_ON(backend_csf->dump_state != KBASE_HWCNT_BACKEND_CSF_DUMP_IDLE); ++ WARN_ON(!completion_done(&backend_csf->dump_completed)); ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); + return; ++ } + -+ lockdep_assert_held(&model->kbdev->ipa.lock); ++ WARN_ON(backend_csf->dump_state != KBASE_HWCNT_BACKEND_CSF_DUMP_WORKER_LAUNCHED); + -+ if (model->ops->term) -+ model->ops->term(model); ++ backend_csf->dump_state = KBASE_HWCNT_BACKEND_CSF_DUMP_ACCUMULATING; ++ insert_index_to_acc = backend_csf->insert_index_to_accumulate; + -+ kbase_ipa_model_param_free_all(model); ++ /* Read the raw extract and insert indexes from the CSF interface. */ ++ backend_csf->info->csf_if->get_indexes(backend_csf->info->csf_if->ctx, &extract_index, ++ &insert_index); + -+ kfree(model); ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++ ++ /* Accumulate up to the insert we grabbed at the prfcnt request ++ * interrupt. ++ */ ++ kbasep_hwcnt_backend_csf_accumulate_samples(backend_csf, extract_index, ++ insert_index_to_acc); ++ ++ /* Copy to the user buffer so if a threshold interrupt fires ++ * between now and get(), the accumulations are untouched. ++ */ ++ kbasep_hwcnt_backend_csf_update_user_sample(backend_csf); ++ ++ /* Dump done, set state back to COMPLETED for next request. */ ++ backend_csf->info->csf_if->lock(backend_csf->info->csf_if->ctx, &flags); ++ /* Assert the backend is not destroyed. */ ++ WARN_ON(backend_csf != backend_csf->info->backend); ++ ++ /* The backend was disabled or had an error while we were accumulating. ++ */ ++ if (backend_csf->enable_state != KBASE_HWCNT_BACKEND_CSF_ENABLED) { ++ WARN_ON(backend_csf->dump_state != KBASE_HWCNT_BACKEND_CSF_DUMP_IDLE); ++ WARN_ON(!completion_done(&backend_csf->dump_completed)); ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++ return; ++ } ++ ++ WARN_ON(backend_csf->dump_state != KBASE_HWCNT_BACKEND_CSF_DUMP_ACCUMULATING); ++ ++ /* Our work here is done - set the wait object and unblock waiters. */ ++ backend_csf->dump_state = KBASE_HWCNT_BACKEND_CSF_DUMP_COMPLETED; ++ complete_all(&backend_csf->dump_completed); ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); +} -+KBASE_EXPORT_TEST_API(kbase_ipa_term_model); + -+struct kbase_ipa_model *kbase_ipa_init_model(struct kbase_device *kbdev, -+ const struct kbase_ipa_model_ops *ops) ++/** ++ * kbasep_hwcnt_backend_csf_threshold_worker() - Threshold worker. ++ * ++ * @work: Work structure. ++ * ++ * Called when a HWC threshold interrupt raised to consume all available samples ++ * in the ring buffer. ++ */ ++static void kbasep_hwcnt_backend_csf_threshold_worker(struct work_struct *work) +{ -+ struct kbase_ipa_model *model; -+ int err; ++ unsigned long flags = 0ULL; ++ struct kbase_hwcnt_backend_csf *backend_csf; ++ u32 extract_index = 0U; ++ u32 insert_index = 0U; + -+ lockdep_assert_held(&kbdev->ipa.lock); ++ WARN_ON(!work); + -+ if (!ops || !ops->name) -+ return NULL; ++ backend_csf = container_of(work, struct kbase_hwcnt_backend_csf, hwc_threshold_work); ++ backend_csf->info->csf_if->lock(backend_csf->info->csf_if->ctx, &flags); + -+ model = kzalloc(sizeof(struct kbase_ipa_model), GFP_KERNEL); -+ if (!model) -+ return NULL; ++ /* Assert the backend is not destroyed. */ ++ WARN_ON(backend_csf != backend_csf->info->backend); + -+ model->kbdev = kbdev; -+ model->ops = ops; -+ INIT_LIST_HEAD(&model->params); ++ /* Read the raw extract and insert indexes from the CSF interface. */ ++ backend_csf->info->csf_if->get_indexes(backend_csf->info->csf_if->ctx, &extract_index, ++ &insert_index); + -+ err = model->ops->init(model); -+ if (err) { -+ dev_err(kbdev->dev, -+ "init of power model \'%s\' returned error %d\n", -+ ops->name, err); -+ kfree(model); -+ return NULL; ++ /* The backend was disabled or had an error while the worker was being ++ * launched. ++ */ ++ if (backend_csf->enable_state != KBASE_HWCNT_BACKEND_CSF_ENABLED) { ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++ return; + } + -+ err = kbase_ipa_model_recalculate(model); -+ if (err) { -+ kbase_ipa_term_model(model); -+ return NULL; ++ /* Early out if we are not in the IDLE state or COMPLETED state, as this ++ * means a concurrent dump is in progress and we don't want to ++ * interfere. ++ */ ++ if ((backend_csf->dump_state != KBASE_HWCNT_BACKEND_CSF_DUMP_IDLE) && ++ (backend_csf->dump_state != KBASE_HWCNT_BACKEND_CSF_DUMP_COMPLETED)) { ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++ return; + } ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); + -+ return model; ++ /* Accumulate everything we possibly can. We grabbed the insert index ++ * immediately after we acquired the lock but before we checked whether ++ * a concurrent dump was triggered. This ensures that if a concurrent ++ * dump was triggered between releasing the lock and now, we know for a ++ * fact that our insert will not exceed the concurrent dump's ++ * insert_to_accumulate, so we don't risk accumulating too much data. ++ */ ++ kbasep_hwcnt_backend_csf_accumulate_samples(backend_csf, extract_index, insert_index); ++ ++ /* No need to wake up anything since it is not a user dump request. */ +} -+KBASE_EXPORT_TEST_API(kbase_ipa_init_model); + -+static void kbase_ipa_term_locked(struct kbase_device *kbdev) ++static void ++kbase_hwcnt_backend_csf_submit_dump_worker(struct kbase_hwcnt_backend_csf_info *csf_info) +{ -+ lockdep_assert_held(&kbdev->ipa.lock); ++ u32 extract_index; + -+ /* Clean up the models */ -+ if (kbdev->ipa.configured_model != kbdev->ipa.fallback_model) -+ kbase_ipa_term_model(kbdev->ipa.configured_model); -+ kbase_ipa_term_model(kbdev->ipa.fallback_model); ++ WARN_ON(!csf_info); ++ csf_info->csf_if->assert_lock_held(csf_info->csf_if->ctx); + -+ kbdev->ipa.configured_model = NULL; -+ kbdev->ipa.fallback_model = NULL; ++ WARN_ON(!kbasep_hwcnt_backend_csf_backend_exists(csf_info)); ++ WARN_ON(csf_info->backend->enable_state != KBASE_HWCNT_BACKEND_CSF_ENABLED); ++ WARN_ON(csf_info->backend->dump_state != KBASE_HWCNT_BACKEND_CSF_DUMP_QUERYING_INSERT); ++ ++ /* Save insert index now so that the dump worker only accumulates the ++ * HWC data associated with this request. Extract index is not stored ++ * as that needs to be checked when accumulating to prevent re-reading ++ * buffers that have already been read and returned to the GPU. ++ */ ++ csf_info->csf_if->get_indexes(csf_info->csf_if->ctx, &extract_index, ++ &csf_info->backend->insert_index_to_accumulate); ++ csf_info->backend->dump_state = KBASE_HWCNT_BACKEND_CSF_DUMP_WORKER_LAUNCHED; ++ ++ /* Submit the accumulator task into the work queue. */ ++ queue_work(csf_info->backend->hwc_dump_workq, &csf_info->backend->hwc_dump_work); +} + -+int kbase_ipa_init(struct kbase_device *kbdev) ++static void ++kbasep_hwcnt_backend_csf_get_physical_enable(struct kbase_hwcnt_backend_csf *backend_csf, ++ const struct kbase_hwcnt_enable_map *enable_map, ++ struct kbase_hwcnt_backend_csf_if_enable *enable) +{ ++ enum kbase_hwcnt_physical_set phys_counter_set; ++ struct kbase_hwcnt_physical_enable_map phys_enable_map; + -+ const char *model_name; -+ const struct kbase_ipa_model_ops *ops; -+ struct kbase_ipa_model *default_model = NULL; ++ kbase_hwcnt_gpu_enable_map_to_physical(&phys_enable_map, enable_map); ++ ++ /* process the enable_map to guarantee the block header is enabled which ++ * is needed for delta calculation. ++ */ ++ kbasep_hwcnt_backend_csf_process_enable_map(&phys_enable_map); ++ ++ kbase_hwcnt_gpu_set_to_physical(&phys_counter_set, backend_csf->info->counter_set); ++ ++ /* Use processed enable_map to enable HWC in HW level. */ ++ enable->fe_bm = phys_enable_map.fe_bm; ++ enable->shader_bm = phys_enable_map.shader_bm; ++ enable->tiler_bm = phys_enable_map.tiler_bm; ++ enable->mmu_l2_bm = phys_enable_map.mmu_l2_bm; ++ enable->counter_set = phys_counter_set; ++ enable->clk_enable_map = enable_map->clk_enable_map; ++} ++ ++/* CSF backend implementation of kbase_hwcnt_backend_dump_enable_nolock_fn */ ++static int ++kbasep_hwcnt_backend_csf_dump_enable_nolock(struct kbase_hwcnt_backend *backend, ++ const struct kbase_hwcnt_enable_map *enable_map) ++{ ++ struct kbase_hwcnt_backend_csf *backend_csf = (struct kbase_hwcnt_backend_csf *)backend; ++ struct kbase_hwcnt_backend_csf_if_enable enable; + int err; + -+ mutex_init(&kbdev->ipa.lock); -+ /* -+ * Lock during init to avoid warnings from lockdep_assert_held (there -+ * shouldn't be any concurrent access yet). ++ if (!backend_csf || !enable_map || (enable_map->metadata != backend_csf->info->metadata)) ++ return -EINVAL; ++ ++ backend_csf->info->csf_if->assert_lock_held(backend_csf->info->csf_if->ctx); ++ ++ kbasep_hwcnt_backend_csf_get_physical_enable(backend_csf, enable_map, &enable); ++ ++ /* enable_state should be DISABLED before we transfer it to enabled */ ++ if (backend_csf->enable_state != KBASE_HWCNT_BACKEND_CSF_DISABLED) ++ return -EIO; ++ ++ err = backend_csf->info->watchdog_if->enable(backend_csf->info->watchdog_if->timer, ++ HWCNT_BACKEND_WATCHDOG_TIMER_INTERVAL_MS, ++ kbasep_hwcnt_backend_watchdog_timer_cb, ++ backend_csf->info); ++ if (err) ++ return err; ++ ++ backend_csf->dump_state = KBASE_HWCNT_BACKEND_CSF_DUMP_IDLE; ++ WARN_ON(!completion_done(&backend_csf->dump_completed)); ++ kbasep_hwcnt_backend_csf_change_es_and_wake_waiters( ++ backend_csf, KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_ENABLED); ++ ++ backend_csf->info->csf_if->dump_enable(backend_csf->info->csf_if->ctx, ++ backend_csf->ring_buf, &enable); ++ ++ kbasep_hwcnt_backend_csf_cc_initial_sample(backend_csf, enable_map); ++ ++ return 0; ++} ++ ++/* CSF backend implementation of kbase_hwcnt_backend_dump_enable_fn */ ++static int kbasep_hwcnt_backend_csf_dump_enable(struct kbase_hwcnt_backend *backend, ++ const struct kbase_hwcnt_enable_map *enable_map) ++{ ++ int errcode; ++ unsigned long flags = 0UL; ++ struct kbase_hwcnt_backend_csf *backend_csf = (struct kbase_hwcnt_backend_csf *)backend; ++ ++ if (!backend_csf) ++ return -EINVAL; ++ ++ backend_csf->info->csf_if->lock(backend_csf->info->csf_if->ctx, &flags); ++ errcode = kbasep_hwcnt_backend_csf_dump_enable_nolock(backend, enable_map); ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++ return errcode; ++} ++ ++static void kbasep_hwcnt_backend_csf_wait_enable_transition_complete( ++ struct kbase_hwcnt_backend_csf *backend_csf, unsigned long *lock_flags) ++{ ++ backend_csf->info->csf_if->assert_lock_held(backend_csf->info->csf_if->ctx); ++ ++ while ((backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_ENABLED) || ++ (backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_DISABLED)) { ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, *lock_flags); ++ ++ wait_event(backend_csf->enable_state_waitq, ++ (backend_csf->enable_state != ++ KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_ENABLED) && ++ (backend_csf->enable_state != ++ KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_DISABLED)); ++ ++ backend_csf->info->csf_if->lock(backend_csf->info->csf_if->ctx, lock_flags); ++ } ++} ++ ++/* CSF backend implementation of kbase_hwcnt_backend_dump_disable_fn */ ++static void kbasep_hwcnt_backend_csf_dump_disable(struct kbase_hwcnt_backend *backend) ++{ ++ unsigned long flags = 0UL; ++ struct kbase_hwcnt_backend_csf *backend_csf = (struct kbase_hwcnt_backend_csf *)backend; ++ bool do_disable = false; ++ ++ WARN_ON(!backend_csf); ++ ++ backend_csf->info->csf_if->lock(backend_csf->info->csf_if->ctx, &flags); ++ ++ /* Make sure we wait until any previous enable or disable have completed ++ * before doing anything. + */ -+ mutex_lock(&kbdev->ipa.lock); ++ kbasep_hwcnt_backend_csf_wait_enable_transition_complete(backend_csf, &flags); + -+ /* The simple IPA model must *always* be present.*/ -+ ops = kbase_ipa_model_ops_find(kbdev, KBASE_IPA_FALLBACK_MODEL_NAME); ++ if (backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_DISABLED || ++ backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR) { ++ /* If we are already disabled or in an unrecoverable error ++ * state, there is nothing for us to do. ++ */ ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++ return; ++ } + -+ default_model = kbase_ipa_init_model(kbdev, ops); -+ if (!default_model) { -+ err = -EINVAL; -+ goto end; ++ if (backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_ENABLED) { ++ kbasep_hwcnt_backend_csf_change_es_and_wake_waiters( ++ backend_csf, KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_DISABLED); ++ backend_csf->dump_state = KBASE_HWCNT_BACKEND_CSF_DUMP_IDLE; ++ complete_all(&backend_csf->dump_completed); ++ /* Only disable if we were previously enabled - in all other ++ * cases the call to disable will have already been made. ++ */ ++ do_disable = true; + } + -+ kbdev->ipa.fallback_model = default_model; -+ err = of_property_read_string(kbdev->dev->of_node, -+ "ipa-model", -+ &model_name); -+ if (err) { -+ /* Attempt to load a match from GPU-ID */ -+ u32 gpu_id; ++ WARN_ON(backend_csf->dump_state != KBASE_HWCNT_BACKEND_CSF_DUMP_IDLE); ++ WARN_ON(!completion_done(&backend_csf->dump_completed)); + -+ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ model_name = kbase_ipa_model_name_from_id(gpu_id); -+ dev_dbg(kbdev->dev, -+ "Inferring model from GPU ID 0x%x: \'%s\'\n", -+ gpu_id, model_name); -+ err = 0; -+ } else { -+ dev_dbg(kbdev->dev, -+ "Using ipa-model parameter from DT: \'%s\'\n", -+ model_name); ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++ ++ /* Deregister the timer and block until any timer callback has completed. ++ * We've transitioned out of the ENABLED state so we can guarantee it ++ * won't reschedule itself. ++ */ ++ backend_csf->info->watchdog_if->disable(backend_csf->info->watchdog_if->timer); ++ ++ /* Block until any async work has completed. We have transitioned out of ++ * the ENABLED state so we can guarantee no new work will concurrently ++ * be submitted. ++ */ ++ flush_workqueue(backend_csf->hwc_dump_workq); ++ ++ backend_csf->info->csf_if->lock(backend_csf->info->csf_if->ctx, &flags); ++ ++ if (do_disable) ++ backend_csf->info->csf_if->dump_disable(backend_csf->info->csf_if->ctx); ++ ++ kbasep_hwcnt_backend_csf_wait_enable_transition_complete(backend_csf, &flags); ++ ++ switch (backend_csf->enable_state) { ++ case KBASE_HWCNT_BACKEND_CSF_DISABLED_WAIT_FOR_WORKER: ++ kbasep_hwcnt_backend_csf_change_es_and_wake_waiters( ++ backend_csf, KBASE_HWCNT_BACKEND_CSF_DISABLED); ++ break; ++ case KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR_WAIT_FOR_WORKER: ++ kbasep_hwcnt_backend_csf_change_es_and_wake_waiters( ++ backend_csf, KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR); ++ break; ++ default: ++ WARN_ON(true); ++ break; + } + -+ if (strcmp(KBASE_IPA_FALLBACK_MODEL_NAME, model_name) != 0) { -+ ops = kbase_ipa_model_ops_find(kbdev, model_name); -+ kbdev->ipa.configured_model = kbase_ipa_init_model(kbdev, ops); -+ if (!kbdev->ipa.configured_model) { -+ dev_warn(kbdev->dev, -+ "Failed to initialize ipa-model: \'%s\'\n" -+ "Falling back on default model\n", -+ model_name); -+ kbdev->ipa.configured_model = default_model; -+ } ++ backend_csf->user_requested = false; ++ backend_csf->watchdog_last_seen_insert_idx = 0; ++ ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++ ++ /* After disable, zero the header of all buffers in the ring buffer back ++ * to 0 to prepare for the next enable. ++ */ ++ kbasep_hwcnt_backend_csf_zero_all_prfcnt_en_header(backend_csf); ++ ++ /* Sync zeroed buffers to avoid coherency issues on future use. */ ++ backend_csf->info->csf_if->ring_buf_sync(backend_csf->info->csf_if->ctx, ++ backend_csf->ring_buf, 0, ++ backend_csf->info->ring_buf_cnt, false); ++ ++ /* Reset accumulator, old_sample_buf and user_sample to all-0 to prepare ++ * for next enable. ++ */ ++ kbasep_hwcnt_backend_csf_reset_internal_buffers(backend_csf); ++} ++ ++/* CSF backend implementation of kbase_hwcnt_backend_dump_request_fn */ ++static int kbasep_hwcnt_backend_csf_dump_request(struct kbase_hwcnt_backend *backend, ++ u64 *dump_time_ns) ++{ ++ unsigned long flags = 0UL; ++ struct kbase_hwcnt_backend_csf *backend_csf = (struct kbase_hwcnt_backend_csf *)backend; ++ bool do_request = false; ++ bool watchdog_dumping = false; ++ ++ if (!backend_csf) ++ return -EINVAL; ++ ++ backend_csf->info->csf_if->lock(backend_csf->info->csf_if->ctx, &flags); ++ ++ /* If we're transitioning to enabled there's nothing to accumulate, and ++ * the user dump buffer is already zeroed. We can just short circuit to ++ * the DUMP_COMPLETED state. ++ */ ++ if (backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_ENABLED) { ++ backend_csf->dump_state = KBASE_HWCNT_BACKEND_CSF_DUMP_COMPLETED; ++ *dump_time_ns = kbasep_hwcnt_backend_csf_timestamp_ns(backend); ++ kbasep_hwcnt_backend_csf_cc_update(backend_csf); ++ backend_csf->user_requested = true; ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++ return 0; ++ } ++ ++ /* Otherwise, make sure we're already enabled. */ ++ if (backend_csf->enable_state != KBASE_HWCNT_BACKEND_CSF_ENABLED) { ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++ return -EIO; ++ } ++ ++ /* Make sure that this is either the first request since enable or the ++ * previous user dump has completed or a watchdog dump is in progress, ++ * so we can avoid midway through a user dump. ++ * If user request comes while a watchdog dumping is in progress, ++ * the user request takes the ownership of the watchdog dumping sample by ++ * changing the dump_state so the interrupt for the watchdog ++ * request can be processed instead of ignored. ++ */ ++ if ((backend_csf->dump_state != KBASE_HWCNT_BACKEND_CSF_DUMP_IDLE) && ++ (backend_csf->dump_state != KBASE_HWCNT_BACKEND_CSF_DUMP_COMPLETED) && ++ (backend_csf->dump_state != KBASE_HWCNT_BACKEND_CSF_DUMP_WATCHDOG_REQUESTED)) { ++ /* HWC is disabled or another user dump is ongoing, ++ * or we're on fault. ++ */ ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++ /* HWC is disabled or another dump is ongoing, or we are on ++ * fault. ++ */ ++ return -EIO; ++ } ++ ++ /* Reset the completion so dump_wait() has something to wait on. */ ++ reinit_completion(&backend_csf->dump_completed); ++ ++ if (backend_csf->dump_state == KBASE_HWCNT_BACKEND_CSF_DUMP_WATCHDOG_REQUESTED) ++ watchdog_dumping = true; ++ ++ if ((backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_ENABLED) && ++ !backend_csf->info->fw_in_protected_mode) { ++ /* Only do the request if we are fully enabled and not in ++ * protected mode. ++ */ ++ backend_csf->dump_state = KBASE_HWCNT_BACKEND_CSF_DUMP_REQUESTED; ++ do_request = true; + } else { -+ kbdev->ipa.configured_model = default_model; ++ /* Skip the request and waiting for ack and go straight to ++ * checking the insert and kicking off the worker to do the dump ++ */ ++ backend_csf->dump_state = KBASE_HWCNT_BACKEND_CSF_DUMP_QUERYING_INSERT; + } + -+end: -+ if (err) -+ kbase_ipa_term_locked(kbdev); ++ /* CSF firmware might enter protected mode now, but still call request. ++ * That is fine, as we changed state while holding the lock, so the ++ * protected mode enter function will query the insert and launch the ++ * dumping worker. ++ * At some point we will get the dump request ACK saying a dump is done, ++ * but we can ignore it if we are not in the REQUESTED state and process ++ * it in next round dumping worker. ++ */ ++ ++ *dump_time_ns = kbasep_hwcnt_backend_csf_timestamp_ns(backend); ++ kbasep_hwcnt_backend_csf_cc_update(backend_csf); ++ backend_csf->user_requested = true; ++ ++ if (do_request) { ++ /* If a watchdog dumping is in progress, don't need to do ++ * another request, just update the dump_state and take the ++ * ownership of the sample which watchdog requested. ++ */ ++ if (!watchdog_dumping) ++ backend_csf->info->csf_if->dump_request(backend_csf->info->csf_if->ctx); ++ } else ++ kbase_hwcnt_backend_csf_submit_dump_worker(backend_csf->info); ++ ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++ ++ /* Modify watchdog timer to delay the regular check time since ++ * just requested. ++ */ ++ backend_csf->info->watchdog_if->modify(backend_csf->info->watchdog_if->timer, ++ HWCNT_BACKEND_WATCHDOG_TIMER_INTERVAL_MS); ++ ++ return 0; ++} ++ ++/* CSF backend implementation of kbase_hwcnt_backend_dump_wait_fn */ ++static int kbasep_hwcnt_backend_csf_dump_wait(struct kbase_hwcnt_backend *backend) ++{ ++ unsigned long flags = 0UL; ++ struct kbase_hwcnt_backend_csf *backend_csf = (struct kbase_hwcnt_backend_csf *)backend; ++ int errcode; ++ ++ if (!backend_csf) ++ return -EINVAL; ++ ++ wait_for_completion(&backend_csf->dump_completed); ++ ++ backend_csf->info->csf_if->lock(backend_csf->info->csf_if->ctx, &flags); ++ /* Make sure the last dump actually succeeded when user requested is ++ * set. ++ */ ++ if (backend_csf->user_requested && ++ ((backend_csf->dump_state == KBASE_HWCNT_BACKEND_CSF_DUMP_COMPLETED) || ++ (backend_csf->dump_state == KBASE_HWCNT_BACKEND_CSF_DUMP_WATCHDOG_REQUESTED))) ++ errcode = 0; + else -+ dev_info(kbdev->dev, -+ "Using configured power model %s, and fallback %s\n", -+ kbdev->ipa.configured_model->ops->name, -+ kbdev->ipa.fallback_model->ops->name); ++ errcode = -EIO; + -+ mutex_unlock(&kbdev->ipa.lock); -+ return err; ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++ ++ return errcode; +} -+KBASE_EXPORT_TEST_API(kbase_ipa_init); + -+void kbase_ipa_term(struct kbase_device *kbdev) ++/* CSF backend implementation of kbase_hwcnt_backend_dump_clear_fn */ ++static int kbasep_hwcnt_backend_csf_dump_clear(struct kbase_hwcnt_backend *backend) +{ -+ mutex_lock(&kbdev->ipa.lock); -+ kbase_ipa_term_locked(kbdev); -+ mutex_unlock(&kbdev->ipa.lock); ++ struct kbase_hwcnt_backend_csf *backend_csf = (struct kbase_hwcnt_backend_csf *)backend; ++ int errcode; ++ u64 ts; + -+ mutex_destroy(&kbdev->ipa.lock); ++ if (!backend_csf) ++ return -EINVAL; ++ ++ /* Request a dump so we can clear all current counters. */ ++ errcode = kbasep_hwcnt_backend_csf_dump_request(backend, &ts); ++ if (!errcode) ++ /* Wait for the manual dump or auto dump to be done and ++ * accumulator to be updated. ++ */ ++ errcode = kbasep_hwcnt_backend_csf_dump_wait(backend); ++ ++ return errcode; ++} ++ ++/* CSF backend implementation of kbase_hwcnt_backend_dump_get_fn */ ++static int kbasep_hwcnt_backend_csf_dump_get(struct kbase_hwcnt_backend *backend, ++ struct kbase_hwcnt_dump_buffer *dst, ++ const struct kbase_hwcnt_enable_map *dst_enable_map, ++ bool accumulate) ++{ ++ struct kbase_hwcnt_backend_csf *backend_csf = (struct kbase_hwcnt_backend_csf *)backend; ++ int ret; ++ size_t clk; ++ ++ if (!backend_csf || !dst || !dst_enable_map || ++ (backend_csf->info->metadata != dst->metadata) || ++ (dst_enable_map->metadata != dst->metadata)) ++ return -EINVAL; ++ ++ /* Extract elapsed cycle count for each clock domain if enabled. */ ++ kbase_hwcnt_metadata_for_each_clock(dst_enable_map->metadata, clk) ++ { ++ if (!kbase_hwcnt_clk_enable_map_enabled(dst_enable_map->clk_enable_map, clk)) ++ continue; ++ ++ /* Reset the counter to zero if accumulation is off. */ ++ if (!accumulate) ++ dst->clk_cnt_buf[clk] = 0; ++ dst->clk_cnt_buf[clk] += backend_csf->cycle_count_elapsed[clk]; ++ } ++ ++ /* We just return the user buffer without checking the current state, ++ * as it is undefined to call this function without a prior succeeding ++ * one to dump_wait(). ++ */ ++ ret = kbase_hwcnt_csf_dump_get(dst, backend_csf->to_user_buf, dst_enable_map, accumulate); ++ ++ return ret; +} -+KBASE_EXPORT_TEST_API(kbase_ipa_term); + +/** -+ * kbase_scale_dynamic_power() - Scale a dynamic power coefficient to an OPP -+ * @c: Dynamic model coefficient, in pW/(Hz V^2). Should be in range -+ * 0 < c < 2^26 to prevent overflow. -+ * @freq: Frequency, in Hz. Range: 2^23 < freq < 2^30 (~8MHz to ~1GHz) -+ * @voltage: Voltage, in mV. Range: 2^9 < voltage < 2^13 (~0.5V to ~8V) ++ * kbasep_hwcnt_backend_csf_destroy() - Destroy CSF backend. ++ * @backend_csf: Pointer to CSF backend to destroy. + * -+ * Keep a record of the approximate range of each value at every stage of the -+ * calculation, to ensure we don't overflow. This makes heavy use of the -+ * approximations 1000 = 2^10 and 1000000 = 2^20, but does the actual -+ * calculations in decimal for increased accuracy. ++ * Can be safely called on a backend in any state of partial construction. + * -+ * Return: Power consumption, in mW. Range: 0 < p < 2^13 (0W to ~8W) + */ -+static u32 kbase_scale_dynamic_power(const u32 c, const u32 freq, -+ const u32 voltage) ++static void kbasep_hwcnt_backend_csf_destroy(struct kbase_hwcnt_backend_csf *backend_csf) +{ -+ /* Range: 2^8 < v2 < 2^16 m(V^2) */ -+ const u32 v2 = (voltage * voltage) / 1000; ++ if (!backend_csf) ++ return; + -+ /* Range: 2^3 < f_MHz < 2^10 MHz */ -+ const u32 f_MHz = freq / 1000000; ++ destroy_workqueue(backend_csf->hwc_dump_workq); + -+ /* Range: 2^11 < v2f_big < 2^26 kHz V^2 */ -+ const u32 v2f_big = v2 * f_MHz; ++ backend_csf->info->csf_if->ring_buf_free(backend_csf->info->csf_if->ctx, ++ backend_csf->ring_buf); + -+ /* Range: 2^1 < v2f < 2^16 MHz V^2 */ -+ const u32 v2f = v2f_big / 1000; ++ kfree(backend_csf->accum_buf); ++ backend_csf->accum_buf = NULL; + -+ /* Range (working backwards from next line): 0 < v2fc < 2^23 uW. -+ * Must be < 2^42 to avoid overflowing the return value. */ -+ const u64 v2fc = (u64) c * (u64) v2f; ++ kfree(backend_csf->old_sample_buf); ++ backend_csf->old_sample_buf = NULL; + -+ /* Range: 0 < v2fc / 1000 < 2^13 mW */ -+ return div_u64(v2fc, 1000); ++ kfree(backend_csf->to_user_buf); ++ backend_csf->to_user_buf = NULL; ++ ++ kfree(backend_csf); +} + +/** -+ * kbase_scale_static_power() - Scale a static power coefficient to an OPP -+ * @c: Static model coefficient, in uW/V^3. Should be in range -+ * 0 < c < 2^32 to prevent overflow. -+ * @voltage: Voltage, in mV. Range: 2^9 < voltage < 2^13 (~0.5V to ~8V) ++ * kbasep_hwcnt_backend_csf_create() - Create a CSF backend instance. + * -+ * Return: Power consumption, in mW. Range: 0 < p < 2^13 (0W to ~8W) ++ * @csf_info: Non-NULL pointer to backend info. ++ * @out_backend: Non-NULL pointer to where backend is stored on success. ++ * ++ * Return: 0 on success, else error code. + */ -+u32 kbase_scale_static_power(const u32 c, const u32 voltage) ++static int kbasep_hwcnt_backend_csf_create(struct kbase_hwcnt_backend_csf_info *csf_info, ++ struct kbase_hwcnt_backend_csf **out_backend) +{ -+ /* Range: 2^8 < v2 < 2^16 m(V^2) */ -+ const u32 v2 = (voltage * voltage) / 1000; ++ struct kbase_hwcnt_backend_csf *backend_csf = NULL; ++ int errcode = -ENOMEM; + -+ /* Range: 2^17 < v3_big < 2^29 m(V^2) mV */ -+ const u32 v3_big = v2 * voltage; ++ WARN_ON(!csf_info); ++ WARN_ON(!out_backend); + -+ /* Range: 2^7 < v3 < 2^19 m(V^3) */ -+ const u32 v3 = v3_big / 1000; ++ backend_csf = kzalloc(sizeof(*backend_csf), GFP_KERNEL); ++ if (!backend_csf) ++ goto alloc_error; + -+ /* -+ * Range (working backwards from next line): 0 < v3c_big < 2^33 nW. -+ * The result should be < 2^52 to avoid overflowing the return value. ++ backend_csf->info = csf_info; ++ kbasep_hwcnt_backend_csf_init_layout(&csf_info->prfcnt_info, &backend_csf->phys_layout); ++ ++ backend_csf->accum_buf = kzalloc(csf_info->metadata->dump_buf_bytes, GFP_KERNEL); ++ if (!backend_csf->accum_buf) ++ goto err_alloc_acc_buf; ++ ++ backend_csf->old_sample_buf = kzalloc(csf_info->prfcnt_info.dump_bytes, GFP_KERNEL); ++ if (!backend_csf->old_sample_buf) ++ goto err_alloc_pre_sample_buf; ++ ++ backend_csf->to_user_buf = kzalloc(csf_info->metadata->dump_buf_bytes, GFP_KERNEL); ++ if (!backend_csf->to_user_buf) ++ goto err_alloc_user_sample_buf; ++ ++ errcode = csf_info->csf_if->ring_buf_alloc(csf_info->csf_if->ctx, csf_info->ring_buf_cnt, ++ &backend_csf->ring_buf_cpu_base, ++ &backend_csf->ring_buf); ++ if (errcode) ++ goto err_ring_buf_alloc; ++ errcode = -ENOMEM; ++ ++ /* Zero all performance enable header to prepare for first enable. */ ++ kbasep_hwcnt_backend_csf_zero_all_prfcnt_en_header(backend_csf); ++ ++ /* Sync zeroed buffers to avoid coherency issues on use. */ ++ backend_csf->info->csf_if->ring_buf_sync(backend_csf->info->csf_if->ctx, ++ backend_csf->ring_buf, 0, ++ backend_csf->info->ring_buf_cnt, false); ++ ++ init_completion(&backend_csf->dump_completed); ++ ++ init_waitqueue_head(&backend_csf->enable_state_waitq); ++ ++ /* Allocate a single threaded work queue for dump worker and threshold ++ * worker. + */ -+ const u64 v3c_big = (u64) c * (u64) v3; ++ backend_csf->hwc_dump_workq = ++ alloc_workqueue("mali_hwc_dump_wq", WQ_HIGHPRI | WQ_UNBOUND, 1); ++ if (!backend_csf->hwc_dump_workq) ++ goto err_alloc_workqueue; + -+ /* Range: 0 < v3c_big / 1000000 < 2^13 mW */ -+ return div_u64(v3c_big, 1000000); ++ INIT_WORK(&backend_csf->hwc_dump_work, kbasep_hwcnt_backend_csf_dump_worker); ++ INIT_WORK(&backend_csf->hwc_threshold_work, kbasep_hwcnt_backend_csf_threshold_worker); ++ ++ backend_csf->enable_state = KBASE_HWCNT_BACKEND_CSF_DISABLED; ++ backend_csf->dump_state = KBASE_HWCNT_BACKEND_CSF_DUMP_IDLE; ++ complete_all(&backend_csf->dump_completed); ++ backend_csf->user_requested = false; ++ backend_csf->watchdog_last_seen_insert_idx = 0; ++ ++ *out_backend = backend_csf; ++ return 0; ++ ++err_alloc_workqueue: ++ backend_csf->info->csf_if->ring_buf_free(backend_csf->info->csf_if->ctx, ++ backend_csf->ring_buf); ++err_ring_buf_alloc: ++ kfree(backend_csf->to_user_buf); ++ backend_csf->to_user_buf = NULL; ++err_alloc_user_sample_buf: ++ kfree(backend_csf->old_sample_buf); ++ backend_csf->old_sample_buf = NULL; ++err_alloc_pre_sample_buf: ++ kfree(backend_csf->accum_buf); ++ backend_csf->accum_buf = NULL; ++err_alloc_acc_buf: ++ kfree(backend_csf); ++alloc_error: ++ return errcode; +} + -+void kbase_ipa_protection_mode_switch_event(struct kbase_device *kbdev) ++/* CSF backend implementation of kbase_hwcnt_backend_init_fn */ ++static int kbasep_hwcnt_backend_csf_init(const struct kbase_hwcnt_backend_info *info, ++ struct kbase_hwcnt_backend **out_backend) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ unsigned long flags = 0UL; ++ struct kbase_hwcnt_backend_csf *backend_csf = NULL; ++ struct kbase_hwcnt_backend_csf_info *csf_info = (struct kbase_hwcnt_backend_csf_info *)info; ++ int errcode; ++ bool success = false; + -+ /* Record the event of GPU entering protected mode. */ -+ kbdev->ipa_protection_mode_switched = true; ++ if (!info || !out_backend) ++ return -EINVAL; ++ ++ /* Create the backend. */ ++ errcode = kbasep_hwcnt_backend_csf_create(csf_info, &backend_csf); ++ if (errcode) ++ return errcode; ++ ++ /* If it was not created before, attach it to csf_info. ++ * Use spin lock to avoid concurrent initialization. ++ */ ++ backend_csf->info->csf_if->lock(backend_csf->info->csf_if->ctx, &flags); ++ if (csf_info->backend == NULL) { ++ csf_info->backend = backend_csf; ++ *out_backend = (struct kbase_hwcnt_backend *)backend_csf; ++ success = true; ++ if (csf_info->unrecoverable_error_happened) ++ backend_csf->enable_state = KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR; ++ } ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); ++ ++ /* Destroy the new created backend if the backend has already created ++ * before. In normal case, this won't happen if the client call init() ++ * function properly. ++ */ ++ if (!success) { ++ kbasep_hwcnt_backend_csf_destroy(backend_csf); ++ return -EBUSY; ++ } ++ ++ return 0; +} + -+static struct kbase_ipa_model *get_current_model(struct kbase_device *kbdev) ++/* CSF backend implementation of kbase_hwcnt_backend_term_fn */ ++static void kbasep_hwcnt_backend_csf_term(struct kbase_hwcnt_backend *backend) +{ -+ struct kbase_ipa_model *model; -+ unsigned long flags; -+ -+ lockdep_assert_held(&kbdev->ipa.lock); ++ unsigned long flags = 0UL; ++ struct kbase_hwcnt_backend_csf *backend_csf = (struct kbase_hwcnt_backend_csf *)backend; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ if (!backend) ++ return; + -+ if (kbdev->ipa_protection_mode_switched || -+ kbdev->ipa.force_fallback_model) -+ model = kbdev->ipa.fallback_model; -+ else -+ model = kbdev->ipa.configured_model; ++ kbasep_hwcnt_backend_csf_dump_disable(backend); + -+ /* -+ * Having taken cognizance of the fact that whether GPU earlier -+ * protected mode or not, the event can be now reset (if GPU is not -+ * currently in protected mode) so that configured model is used -+ * for the next sample. ++ /* Set the backend in csf_info to NULL so we won't handle any external ++ * notification anymore since we are terminating. + */ -+ if (!kbdev->protected_mode) -+ kbdev->ipa_protection_mode_switched = false; ++ backend_csf->info->csf_if->lock(backend_csf->info->csf_if->ctx, &flags); ++ backend_csf->info->backend = NULL; ++ backend_csf->info->csf_if->unlock(backend_csf->info->csf_if->ctx, flags); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ kbasep_hwcnt_backend_csf_destroy(backend_csf); ++} + -+ return model; ++/** ++ * kbasep_hwcnt_backend_csf_info_destroy() - Destroy a CSF backend info. ++ * @info: Pointer to info to destroy. ++ * ++ * Can be safely called on a backend info in any state of partial construction. ++ * ++ */ ++static void kbasep_hwcnt_backend_csf_info_destroy(const struct kbase_hwcnt_backend_csf_info *info) ++{ ++ if (!info) ++ return; ++ ++ /* The backend should be destroyed before the info object destroy. */ ++ WARN_ON(info->backend != NULL); ++ ++ /* The metadata should be destroyed before the info object destroy. */ ++ WARN_ON(info->metadata != NULL); ++ ++ kfree(info); +} + -+static u32 get_static_power_locked(struct kbase_device *kbdev, -+ struct kbase_ipa_model *model, -+ unsigned long voltage) ++/** ++ * kbasep_hwcnt_backend_csf_info_create() - Create a CSF backend info. ++ * ++ * @csf_if: Non-NULL pointer to a hwcnt backend CSF interface structure ++ * used to create backend interface. ++ * @ring_buf_cnt: The buffer count of the CSF hwcnt backend ring buffer. ++ * MUST be power of 2. ++ * @watchdog_if: Non-NULL pointer to a hwcnt watchdog interface structure used to create ++ * backend interface. ++ * @out_info: Non-NULL pointer to where info is stored on success. ++ * ++ * Return: 0 on success, else error code. ++ */ ++static int ++kbasep_hwcnt_backend_csf_info_create(struct kbase_hwcnt_backend_csf_if *csf_if, u32 ring_buf_cnt, ++ struct kbase_hwcnt_watchdog_interface *watchdog_if, ++ const struct kbase_hwcnt_backend_csf_info **out_info) +{ -+ u32 power = 0; -+ int err; -+ u32 power_coeff; ++ struct kbase_hwcnt_backend_csf_info *info = NULL; + -+ lockdep_assert_held(&model->kbdev->ipa.lock); ++ if (WARN_ON(!csf_if) || WARN_ON(!watchdog_if) || WARN_ON(!out_info) || ++ WARN_ON(!is_power_of_2(ring_buf_cnt))) ++ return -EINVAL; + -+ if (!model->ops->get_static_coeff) -+ model = kbdev->ipa.fallback_model; ++ info = kmalloc(sizeof(*info), GFP_KERNEL); ++ if (!info) ++ return -ENOMEM; + -+ if (model->ops->get_static_coeff) { -+ err = model->ops->get_static_coeff(model, &power_coeff); -+ if (!err) -+ power = kbase_scale_static_power(power_coeff, -+ (u32) voltage); ++ *info = (struct kbase_hwcnt_backend_csf_info) ++ { ++#if defined(CONFIG_MALI_BIFROST_PRFCNT_SET_SECONDARY) ++ .counter_set = KBASE_HWCNT_SET_SECONDARY, ++#elif defined(CONFIG_MALI_PRFCNT_SET_TERTIARY) ++ .counter_set = KBASE_HWCNT_SET_TERTIARY, ++#else ++ /* Default to primary */ ++ .counter_set = KBASE_HWCNT_SET_PRIMARY, ++#endif ++ .backend = NULL, .csf_if = csf_if, .ring_buf_cnt = ring_buf_cnt, ++ .fw_in_protected_mode = false, .unrecoverable_error_happened = false, ++ .watchdog_if = watchdog_if, ++ }; ++ *out_info = info; ++ ++ return 0; ++} ++ ++/* CSF backend implementation of kbase_hwcnt_backend_metadata_fn */ ++static const struct kbase_hwcnt_metadata * ++kbasep_hwcnt_backend_csf_metadata(const struct kbase_hwcnt_backend_info *info) ++{ ++ if (!info) ++ return NULL; ++ ++ WARN_ON(!((const struct kbase_hwcnt_backend_csf_info *)info)->metadata); ++ ++ return ((const struct kbase_hwcnt_backend_csf_info *)info)->metadata; ++} ++ ++static void ++kbasep_hwcnt_backend_csf_handle_unrecoverable_error(struct kbase_hwcnt_backend_csf *backend_csf) ++{ ++ bool do_disable = false; ++ ++ backend_csf->info->csf_if->assert_lock_held(backend_csf->info->csf_if->ctx); ++ ++ /* We are already in or transitioning to the unrecoverable error state. ++ * Early out. ++ */ ++ if ((backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR) || ++ (backend_csf->enable_state == ++ KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR_WAIT_FOR_WORKER)) ++ return; ++ ++ /* If we are disabled, we know we have no pending workers, so skip the ++ * waiting state. ++ */ ++ if (backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_DISABLED) { ++ kbasep_hwcnt_backend_csf_change_es_and_wake_waiters( ++ backend_csf, KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR); ++ return; + } + -+ return power; ++ /* Trigger a disable only if we are not already transitioning to ++ * disabled, we don't want to disable twice if an unrecoverable error ++ * happens while we are disabling. ++ */ ++ do_disable = ++ (backend_csf->enable_state != KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_DISABLED); ++ ++ kbasep_hwcnt_backend_csf_change_es_and_wake_waiters( ++ backend_csf, KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR_WAIT_FOR_WORKER); ++ ++ /* Transition the dump to the IDLE state and unblock any waiters. The ++ * IDLE state signifies an error. ++ */ ++ backend_csf->dump_state = KBASE_HWCNT_BACKEND_CSF_DUMP_IDLE; ++ complete_all(&backend_csf->dump_completed); ++ ++ /* Trigger a disable only if we are not already transitioning to ++ * disabled, - we don't want to disable twice if an unrecoverable error ++ * happens while we are disabling. ++ */ ++ if (do_disable) ++ backend_csf->info->csf_if->dump_disable(backend_csf->info->csf_if->ctx); +} + -+#if defined(CONFIG_MALI_PWRSOFT_765) || \ -+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+static unsigned long kbase_get_static_power(struct devfreq *df, -+ unsigned long voltage) -+#else -+static unsigned long kbase_get_static_power(unsigned long voltage) -+#endif ++static void ++kbasep_hwcnt_backend_csf_handle_recoverable_error(struct kbase_hwcnt_backend_csf *backend_csf) ++{ ++ backend_csf->info->csf_if->assert_lock_held(backend_csf->info->csf_if->ctx); ++ ++ switch (backend_csf->enable_state) { ++ case KBASE_HWCNT_BACKEND_CSF_DISABLED: ++ case KBASE_HWCNT_BACKEND_CSF_DISABLED_WAIT_FOR_WORKER: ++ case KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_DISABLED: ++ case KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR: ++ case KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR_WAIT_FOR_WORKER: ++ /* Already disabled or disabling, or in an unrecoverable error. ++ * Nothing to be done to handle the error. ++ */ ++ return; ++ case KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_ENABLED: ++ /* A seemingly recoverable error that occurs while we are ++ * transitioning to enabled is probably unrecoverable. ++ */ ++ kbasep_hwcnt_backend_csf_handle_unrecoverable_error(backend_csf); ++ return; ++ case KBASE_HWCNT_BACKEND_CSF_ENABLED: ++ /* Start transitioning to the disabled state. We can't wait for ++ * it as this recoverable error might be triggered from an ++ * interrupt. The wait will be done in the eventual call to ++ * disable(). ++ */ ++ kbasep_hwcnt_backend_csf_change_es_and_wake_waiters( ++ backend_csf, KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_DISABLED); ++ /* Transition the dump to the IDLE state and unblock any ++ * waiters. The IDLE state signifies an error. ++ */ ++ backend_csf->dump_state = KBASE_HWCNT_BACKEND_CSF_DUMP_IDLE; ++ complete_all(&backend_csf->dump_completed); ++ ++ backend_csf->info->csf_if->dump_disable(backend_csf->info->csf_if->ctx); ++ return; ++ } ++} ++ ++void kbase_hwcnt_backend_csf_protm_entered(struct kbase_hwcnt_backend_interface *iface) +{ -+ struct kbase_ipa_model *model; -+ u32 power = 0; -+#if defined(CONFIG_MALI_PWRSOFT_765) || \ -+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ struct kbase_device *kbdev = dev_get_drvdata(&df->dev); -+#else -+ struct kbase_device *kbdev = kbase_find_device(-1); -+#endif ++ struct kbase_hwcnt_backend_csf_info *csf_info = ++ (struct kbase_hwcnt_backend_csf_info *)iface->info; + -+ if (!kbdev) -+ return 0ul; ++ csf_info->csf_if->assert_lock_held(csf_info->csf_if->ctx); ++ csf_info->fw_in_protected_mode = true; + -+ mutex_lock(&kbdev->ipa.lock); ++ /* Call on_prfcnt_sample() to trigger collection of the protected mode ++ * entry auto-sample if there is currently a pending dump request. ++ */ ++ kbase_hwcnt_backend_csf_on_prfcnt_sample(iface); ++} + -+ model = get_current_model(kbdev); -+ power = get_static_power_locked(kbdev, model, voltage); ++void kbase_hwcnt_backend_csf_protm_exited(struct kbase_hwcnt_backend_interface *iface) ++{ ++ struct kbase_hwcnt_backend_csf_info *csf_info; + -+ mutex_unlock(&kbdev->ipa.lock); ++ csf_info = (struct kbase_hwcnt_backend_csf_info *)iface->info; + -+#if !(defined(CONFIG_MALI_PWRSOFT_765) || \ -+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)) -+ kbase_release_device(kbdev); -+#endif ++ csf_info->csf_if->assert_lock_held(csf_info->csf_if->ctx); ++ csf_info->fw_in_protected_mode = false; ++} + -+ return power; ++void kbase_hwcnt_backend_csf_on_unrecoverable_error(struct kbase_hwcnt_backend_interface *iface) ++{ ++ unsigned long flags = 0UL; ++ struct kbase_hwcnt_backend_csf_info *csf_info; ++ ++ csf_info = (struct kbase_hwcnt_backend_csf_info *)iface->info; ++ ++ csf_info->csf_if->lock(csf_info->csf_if->ctx, &flags); ++ csf_info->unrecoverable_error_happened = true; ++ /* Early out if the backend does not exist. */ ++ if (!kbasep_hwcnt_backend_csf_backend_exists(csf_info)) { ++ csf_info->csf_if->unlock(csf_info->csf_if->ctx, flags); ++ return; ++ } ++ ++ kbasep_hwcnt_backend_csf_handle_unrecoverable_error(csf_info->backend); ++ ++ csf_info->csf_if->unlock(csf_info->csf_if->ctx, flags); +} + -+#if defined(CONFIG_MALI_PWRSOFT_765) || \ -+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+static unsigned long kbase_get_dynamic_power(struct devfreq *df, -+ unsigned long freq, -+ unsigned long voltage) -+#else -+static unsigned long kbase_get_dynamic_power(unsigned long freq, -+ unsigned long voltage) -+#endif ++void kbase_hwcnt_backend_csf_on_before_reset(struct kbase_hwcnt_backend_interface *iface) +{ -+ struct kbase_ipa_model *model; -+ u32 power_coeff = 0, power = 0; -+ int err = 0; -+#if defined(CONFIG_MALI_PWRSOFT_765) || \ -+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ struct kbase_device *kbdev = dev_get_drvdata(&df->dev); -+#else -+ struct kbase_device *kbdev = kbase_find_device(-1); -+#endif ++ unsigned long flags = 0UL; ++ struct kbase_hwcnt_backend_csf_info *csf_info; ++ struct kbase_hwcnt_backend_csf *backend_csf; + -+ if (!kbdev) -+ return 0ul; ++ csf_info = (struct kbase_hwcnt_backend_csf_info *)iface->info; + -+ mutex_lock(&kbdev->ipa.lock); ++ csf_info->csf_if->lock(csf_info->csf_if->ctx, &flags); ++ csf_info->unrecoverable_error_happened = false; ++ /* Early out if the backend does not exist. */ ++ if (!kbasep_hwcnt_backend_csf_backend_exists(csf_info)) { ++ csf_info->csf_if->unlock(csf_info->csf_if->ctx, flags); ++ return; ++ } ++ backend_csf = csf_info->backend; + -+ model = kbdev->ipa.fallback_model; ++ if ((backend_csf->enable_state != KBASE_HWCNT_BACKEND_CSF_DISABLED) && ++ (backend_csf->enable_state != KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR)) { ++ /* Before a reset occurs, we must either have been disabled ++ * (else we lose data) or we should have encountered an ++ * unrecoverable error. Either way, we will have disabled the ++ * interface and waited for any workers that might have still ++ * been in flight. ++ * If not in these states, fire off one more disable to make ++ * sure everything is turned off before the power is pulled. ++ * We can't wait for this disable to complete, but it doesn't ++ * really matter, the power is being pulled. ++ */ ++ kbasep_hwcnt_backend_csf_handle_unrecoverable_error(csf_info->backend); ++ } + -+ err = model->ops->get_dynamic_coeff(model, &power_coeff); ++ /* A reset is the only way to exit the unrecoverable error state */ ++ if (backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_UNRECOVERABLE_ERROR) { ++ kbasep_hwcnt_backend_csf_change_es_and_wake_waiters( ++ backend_csf, KBASE_HWCNT_BACKEND_CSF_DISABLED); ++ } + -+ if (!err) -+ power = kbase_scale_dynamic_power(power_coeff, freq, voltage); -+ else -+ dev_err_ratelimited(kbdev->dev, -+ "Model %s returned error code %d\n", -+ model->ops->name, err); ++ csf_info->csf_if->unlock(csf_info->csf_if->ctx, flags); ++} + -+ mutex_unlock(&kbdev->ipa.lock); ++void kbase_hwcnt_backend_csf_on_prfcnt_sample(struct kbase_hwcnt_backend_interface *iface) ++{ ++ struct kbase_hwcnt_backend_csf_info *csf_info; ++ struct kbase_hwcnt_backend_csf *backend_csf; + -+#if !(defined(CONFIG_MALI_PWRSOFT_765) || \ -+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)) -+ kbase_release_device(kbdev); -+#endif ++ csf_info = (struct kbase_hwcnt_backend_csf_info *)iface->info; ++ csf_info->csf_if->assert_lock_held(csf_info->csf_if->ctx); + -+ return power; ++ /* Early out if the backend does not exist. */ ++ if (!kbasep_hwcnt_backend_csf_backend_exists(csf_info)) ++ return; ++ backend_csf = csf_info->backend; ++ ++ /* Skip the dump_work if it's a watchdog request. */ ++ if (backend_csf->dump_state == KBASE_HWCNT_BACKEND_CSF_DUMP_WATCHDOG_REQUESTED) { ++ backend_csf->dump_state = KBASE_HWCNT_BACKEND_CSF_DUMP_COMPLETED; ++ return; ++ } ++ ++ /* If the current state is not REQUESTED, this HWC sample will be ++ * skipped and processed in next dump_request. ++ */ ++ if (backend_csf->dump_state != KBASE_HWCNT_BACKEND_CSF_DUMP_REQUESTED) ++ return; ++ backend_csf->dump_state = KBASE_HWCNT_BACKEND_CSF_DUMP_QUERYING_INSERT; ++ ++ kbase_hwcnt_backend_csf_submit_dump_worker(csf_info); +} + -+int kbase_get_real_power_locked(struct kbase_device *kbdev, u32 *power, -+ unsigned long freq, -+ unsigned long voltage) ++void kbase_hwcnt_backend_csf_on_prfcnt_threshold(struct kbase_hwcnt_backend_interface *iface) +{ -+ struct kbase_ipa_model *model; -+ u32 power_coeff = 0; -+ int err = 0; -+ struct kbasep_pm_metrics diff; -+ u64 total_time; ++ struct kbase_hwcnt_backend_csf_info *csf_info; ++ struct kbase_hwcnt_backend_csf *backend_csf; + -+ lockdep_assert_held(&kbdev->ipa.lock); ++ csf_info = (struct kbase_hwcnt_backend_csf_info *)iface->info; ++ csf_info->csf_if->assert_lock_held(csf_info->csf_if->ctx); + -+ kbase_pm_get_dvfs_metrics(kbdev, &kbdev->ipa.last_metrics, &diff); ++ /* Early out if the backend does not exist. */ ++ if (!kbasep_hwcnt_backend_csf_backend_exists(csf_info)) ++ return; ++ backend_csf = csf_info->backend; + -+ model = get_current_model(kbdev); ++ if (backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_ENABLED) ++ /* Submit the threshold work into the work queue to consume the ++ * available samples. ++ */ ++ queue_work(backend_csf->hwc_dump_workq, &backend_csf->hwc_threshold_work); ++} + -+ err = model->ops->get_dynamic_coeff(model, &power_coeff); ++void kbase_hwcnt_backend_csf_on_prfcnt_overflow(struct kbase_hwcnt_backend_interface *iface) ++{ ++ struct kbase_hwcnt_backend_csf_info *csf_info; + -+ /* If the counter model returns an error (e.g. switching back to -+ * protected mode and failing to read counters, or a counter sample -+ * with too few cycles), revert to the fallback model. ++ csf_info = (struct kbase_hwcnt_backend_csf_info *)iface->info; ++ csf_info->csf_if->assert_lock_held(csf_info->csf_if->ctx); ++ ++ /* Early out if the backend does not exist. */ ++ if (!kbasep_hwcnt_backend_csf_backend_exists(csf_info)) ++ return; ++ ++ /* Called when an overflow occurs. We treat this as a recoverable error, ++ * so we start transitioning to the disabled state. ++ * We could try and handle it while enabled, but in a real system we ++ * never expect an overflow to occur so there is no point implementing ++ * complex recovery code when we can just turn ourselves off instead for ++ * a while. + */ -+ if (err && model != kbdev->ipa.fallback_model) { -+ model = kbdev->ipa.fallback_model; -+ err = model->ops->get_dynamic_coeff(model, &power_coeff); ++ kbasep_hwcnt_backend_csf_handle_recoverable_error(csf_info->backend); ++} ++ ++void kbase_hwcnt_backend_csf_on_prfcnt_enable(struct kbase_hwcnt_backend_interface *iface) ++{ ++ struct kbase_hwcnt_backend_csf_info *csf_info; ++ struct kbase_hwcnt_backend_csf *backend_csf; ++ ++ csf_info = (struct kbase_hwcnt_backend_csf_info *)iface->info; ++ csf_info->csf_if->assert_lock_held(csf_info->csf_if->ctx); ++ ++ /* Early out if the backend does not exist. */ ++ if (!kbasep_hwcnt_backend_csf_backend_exists(csf_info)) ++ return; ++ backend_csf = csf_info->backend; ++ ++ if (backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_ENABLED) { ++ kbasep_hwcnt_backend_csf_change_es_and_wake_waiters( ++ backend_csf, KBASE_HWCNT_BACKEND_CSF_ENABLED); ++ } else if (backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_ENABLED) { ++ /* Unexpected, but we are already in the right state so just ++ * ignore it. ++ */ ++ } else { ++ /* Unexpected state change, assume everything is broken until ++ * we reset. ++ */ ++ kbasep_hwcnt_backend_csf_handle_unrecoverable_error(csf_info->backend); + } ++} + -+ if (err) -+ return err; ++void kbase_hwcnt_backend_csf_on_prfcnt_disable(struct kbase_hwcnt_backend_interface *iface) ++{ ++ struct kbase_hwcnt_backend_csf_info *csf_info; ++ struct kbase_hwcnt_backend_csf *backend_csf; + -+ *power = kbase_scale_dynamic_power(power_coeff, freq, voltage); ++ csf_info = (struct kbase_hwcnt_backend_csf_info *)iface->info; ++ csf_info->csf_if->assert_lock_held(csf_info->csf_if->ctx); ++ ++ /* Early out if the backend does not exist. */ ++ if (!kbasep_hwcnt_backend_csf_backend_exists(csf_info)) ++ return; ++ backend_csf = csf_info->backend; ++ ++ if (backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_TRANSITIONING_TO_DISABLED) { ++ kbasep_hwcnt_backend_csf_change_es_and_wake_waiters( ++ backend_csf, KBASE_HWCNT_BACKEND_CSF_DISABLED_WAIT_FOR_WORKER); ++ } else if (backend_csf->enable_state == KBASE_HWCNT_BACKEND_CSF_DISABLED) { ++ /* Unexpected, but we are already in the right state so just ++ * ignore it. ++ */ ++ } else { ++ /* Unexpected state change, assume everything is broken until ++ * we reset. ++ */ ++ kbasep_hwcnt_backend_csf_handle_unrecoverable_error(csf_info->backend); ++ } ++} ++ ++int kbase_hwcnt_backend_csf_metadata_init(struct kbase_hwcnt_backend_interface *iface) ++{ ++ struct kbase_hwcnt_backend_csf_info *csf_info; ++ struct kbase_hwcnt_gpu_info gpu_info; ++ ++ if (!iface) ++ return -EINVAL; ++ ++ csf_info = (struct kbase_hwcnt_backend_csf_info *)iface->info; ++ ++ WARN_ON(!csf_info->csf_if->get_prfcnt_info); ++ ++ csf_info->csf_if->get_prfcnt_info(csf_info->csf_if->ctx, &csf_info->prfcnt_info); + -+ /* time_busy / total_time cannot be >1, so assigning the 64-bit -+ * result of div_u64 to *power cannot overflow. ++ /* The clock domain counts should not exceed the number of maximum ++ * number of clock regulators. + */ -+ total_time = diff.time_busy + (u64) diff.time_idle; -+ *power = div_u64(*power * (u64) diff.time_busy, -+ max(total_time, 1ull)); ++ if (csf_info->prfcnt_info.clk_cnt > BASE_MAX_NR_CLOCKS_REGULATORS) ++ return -EIO; + -+ *power += get_static_power_locked(kbdev, model, voltage); ++ gpu_info.l2_count = csf_info->prfcnt_info.l2_count; ++ gpu_info.core_mask = csf_info->prfcnt_info.core_mask; ++ gpu_info.clk_cnt = csf_info->prfcnt_info.clk_cnt; ++ gpu_info.prfcnt_values_per_block = ++ csf_info->prfcnt_info.prfcnt_block_size / KBASE_HWCNT_VALUE_HW_BYTES; ++ return kbase_hwcnt_csf_metadata_create(&gpu_info, csf_info->counter_set, ++ &csf_info->metadata); ++} + -+ return err; ++void kbase_hwcnt_backend_csf_metadata_term(struct kbase_hwcnt_backend_interface *iface) ++{ ++ struct kbase_hwcnt_backend_csf_info *csf_info; ++ ++ if (!iface) ++ return; ++ ++ csf_info = (struct kbase_hwcnt_backend_csf_info *)iface->info; ++ if (csf_info->metadata) { ++ kbase_hwcnt_csf_metadata_destroy(csf_info->metadata); ++ csf_info->metadata = NULL; ++ } +} -+KBASE_EXPORT_TEST_API(kbase_get_real_power_locked); + -+int kbase_get_real_power(struct devfreq *df, u32 *power, -+ unsigned long freq, -+ unsigned long voltage) ++int kbase_hwcnt_backend_csf_create(struct kbase_hwcnt_backend_csf_if *csf_if, u32 ring_buf_cnt, ++ struct kbase_hwcnt_watchdog_interface *watchdog_if, ++ struct kbase_hwcnt_backend_interface *iface) +{ -+ int ret; -+ struct kbase_device *kbdev = dev_get_drvdata(&df->dev); ++ int errcode; ++ const struct kbase_hwcnt_backend_csf_info *info = NULL; + -+ if (!kbdev) -+ return -ENODEV; ++ if (!iface || !csf_if || !watchdog_if) ++ return -EINVAL; + -+ mutex_lock(&kbdev->ipa.lock); -+ ret = kbase_get_real_power_locked(kbdev, power, freq, voltage); -+ mutex_unlock(&kbdev->ipa.lock); ++ /* The buffer count must be power of 2 */ ++ if (!is_power_of_2(ring_buf_cnt)) ++ return -EINVAL; + -+ return ret; ++ errcode = kbasep_hwcnt_backend_csf_info_create(csf_if, ring_buf_cnt, watchdog_if, &info); ++ if (errcode) ++ return errcode; ++ ++ iface->info = (struct kbase_hwcnt_backend_info *)info; ++ iface->metadata = kbasep_hwcnt_backend_csf_metadata; ++ iface->init = kbasep_hwcnt_backend_csf_init; ++ iface->term = kbasep_hwcnt_backend_csf_term; ++ iface->timestamp_ns = kbasep_hwcnt_backend_csf_timestamp_ns; ++ iface->dump_enable = kbasep_hwcnt_backend_csf_dump_enable; ++ iface->dump_enable_nolock = kbasep_hwcnt_backend_csf_dump_enable_nolock; ++ iface->dump_disable = kbasep_hwcnt_backend_csf_dump_disable; ++ iface->dump_clear = kbasep_hwcnt_backend_csf_dump_clear; ++ iface->dump_request = kbasep_hwcnt_backend_csf_dump_request; ++ iface->dump_wait = kbasep_hwcnt_backend_csf_dump_wait; ++ iface->dump_get = kbasep_hwcnt_backend_csf_dump_get; ++ ++ return 0; +} -+KBASE_EXPORT_TEST_API(kbase_get_real_power); + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) -+struct devfreq_cooling_ops kbase_ipa_power_model_ops = { -+#else -+struct devfreq_cooling_power kbase_ipa_power_model_ops = { -+#endif -+ .get_static_power = &kbase_get_static_power, -+ .get_dynamic_power = &kbase_get_dynamic_power, -+}; -+KBASE_EXPORT_TEST_API(kbase_ipa_power_model_ops); -diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h -new file mode 100755 -index 000000000000..f43f3d9416b4 ++void kbase_hwcnt_backend_csf_destroy(struct kbase_hwcnt_backend_interface *iface) ++{ ++ if (!iface) ++ return; ++ ++ kbasep_hwcnt_backend_csf_info_destroy( ++ (const struct kbase_hwcnt_backend_csf_info *)iface->info); ++ memset(iface, 0, sizeof(*iface)); ++} +diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.h +new file mode 100644 +index 000000000..9c5a5c996 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h -@@ -0,0 +1,254 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.h +@@ -0,0 +1,153 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2016-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -183247,256 +211404,463 @@ index 000000000000..f43f3d9416b4 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ */ ++ ++/* ++ * Concrete implementation of mali_kbase_hwcnt_backend interface for CSF ++ * backend. ++ */ ++ ++#ifndef _KBASE_HWCNT_BACKEND_CSF_H_ ++#define _KBASE_HWCNT_BACKEND_CSF_H_ ++ ++#include "hwcnt/backend/mali_kbase_hwcnt_backend.h" ++#include "hwcnt/backend/mali_kbase_hwcnt_backend_csf_if.h" ++#include "hwcnt/mali_kbase_hwcnt_watchdog_if.h" ++ ++/** ++ * kbase_hwcnt_backend_csf_create() - Create a CSF hardware counter backend ++ * interface. ++ * @csf_if: Non-NULL pointer to a hwcnt backend CSF interface structure ++ * used to create backend interface. ++ * @ring_buf_cnt: The buffer count of CSF hwcnt backend, used when allocate ring ++ * buffer, MUST be power of 2. ++ * @watchdog_if: Non-NULL pointer to a hwcnt watchdog interface structure used ++ * to create backend interface. ++ * @iface: Non-NULL pointer to backend interface structure that is filled ++ * in on creation success. ++ * ++ * Calls to iface->dump_enable_nolock() require the CSF Scheduler IRQ lock. + * ++ * Return: 0 on success, else error code. + */ ++int kbase_hwcnt_backend_csf_create(struct kbase_hwcnt_backend_csf_if *csf_if, u32 ring_buf_cnt, ++ struct kbase_hwcnt_watchdog_interface *watchdog_if, ++ struct kbase_hwcnt_backend_interface *iface); + -+#ifndef _KBASE_IPA_H_ -+#define _KBASE_IPA_H_ ++/** ++ * kbase_hwcnt_backend_csf_metadata_init() - Initialize the metadata for a CSF ++ * hardware counter backend. ++ * @iface: Non-NULL pointer to backend interface structure ++ * Return: 0 on success, else error code. ++ */ ++int kbase_hwcnt_backend_csf_metadata_init(struct kbase_hwcnt_backend_interface *iface); + -+#if defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) ++/** ++ * kbase_hwcnt_backend_csf_metadata_term() - Terminate the metadata for a CSF ++ * hardware counter backend. ++ * @iface: Non-NULL pointer to backend interface structure. ++ */ ++void kbase_hwcnt_backend_csf_metadata_term(struct kbase_hwcnt_backend_interface *iface); + -+struct devfreq; ++/** ++ * kbase_hwcnt_backend_csf_destroy() - Destroy a CSF hardware counter backend ++ * interface. ++ * @iface: Pointer to interface to destroy. ++ * ++ * Can be safely called on an all-zeroed interface, or on an already destroyed ++ * interface. ++ */ ++void kbase_hwcnt_backend_csf_destroy(struct kbase_hwcnt_backend_interface *iface); + +/** -+ * struct kbase_ipa_model - Object describing a particular IPA model. -+ * @kbdev: pointer to kbase device -+ * @model_data: opaque pointer to model specific data, accessed -+ * only by model specific methods. -+ * @ops: pointer to object containing model specific methods. -+ * @params: head of the list of debugfs params added for model -+ * @missing_dt_node_warning: flag to limit the matching power model DT not found -+ * warning to once. ++ * kbase_hwcnt_backend_csf_protm_entered() - CSF HWC backend function to receive ++ * notification that protected mode ++ * has been entered. ++ * @iface: Non-NULL pointer to HWC backend interface. + */ -+struct kbase_ipa_model { -+ struct kbase_device *kbdev; -+ void *model_data; -+ const struct kbase_ipa_model_ops *ops; -+ struct list_head params; -+ bool missing_dt_node_warning; -+}; ++void kbase_hwcnt_backend_csf_protm_entered(struct kbase_hwcnt_backend_interface *iface); + +/** -+ * kbase_ipa_model_add_param_s32 - Add an integer model parameter -+ * @model: pointer to IPA model -+ * @name: name of corresponding debugfs entry -+ * @addr: address where the value is stored -+ * @num_elems: number of elements (1 if not an array) -+ * @dt_required: if false, a corresponding devicetree entry is not required, -+ * and the current value will be used. If true, a warning is -+ * output and the data is zeroed ++ * kbase_hwcnt_backend_csf_protm_exited() - CSF HWC backend function to receive ++ * notification that protected mode has ++ * been exited. ++ * @iface: Non-NULL pointer to HWC backend interface. ++ */ ++void kbase_hwcnt_backend_csf_protm_exited(struct kbase_hwcnt_backend_interface *iface); ++ ++/** ++ * kbase_hwcnt_backend_csf_on_unrecoverable_error() - CSF HWC backend function ++ * called when unrecoverable ++ * errors are detected. ++ * @iface: Non-NULL pointer to HWC backend interface. + * -+ * Return: 0 on success, or an error code ++ * This should be called on encountering errors that can only be recovered from ++ * with reset, or that may put HWC logic in state that could result in hang. For ++ * example, on bus error, or when FW becomes unresponsive. + */ -+int kbase_ipa_model_add_param_s32(struct kbase_ipa_model *model, -+ const char *name, s32 *addr, -+ size_t num_elems, bool dt_required); ++void kbase_hwcnt_backend_csf_on_unrecoverable_error(struct kbase_hwcnt_backend_interface *iface); + +/** -+ * kbase_ipa_model_add_param_string - Add a string model parameter -+ * @model: pointer to IPA model -+ * @name: name of corresponding debugfs entry -+ * @addr: address where the value is stored -+ * @size: size, in bytes, of the value storage (so the maximum string -+ * length is size - 1) -+ * @dt_required: if false, a corresponding devicetree entry is not required, -+ * and the current value will be used. If true, a warning is -+ * output and the data is zeroed ++ * kbase_hwcnt_backend_csf_on_before_reset() - CSF HWC backend function to be ++ * called immediately before a ++ * reset. Takes us out of the ++ * unrecoverable error state, if we ++ * were in it. ++ * @iface: Non-NULL pointer to HWC backend interface. ++ */ ++void kbase_hwcnt_backend_csf_on_before_reset(struct kbase_hwcnt_backend_interface *iface); ++ ++/** ++ * kbase_hwcnt_backend_csf_on_prfcnt_sample() - CSF performance counter sample ++ * complete interrupt handler. ++ * @iface: Non-NULL pointer to HWC backend interface. ++ */ ++void kbase_hwcnt_backend_csf_on_prfcnt_sample(struct kbase_hwcnt_backend_interface *iface); ++ ++/** ++ * kbase_hwcnt_backend_csf_on_prfcnt_threshold() - CSF performance counter ++ * buffer reach threshold ++ * interrupt handler. ++ * @iface: Non-NULL pointer to HWC backend interface. ++ */ ++void kbase_hwcnt_backend_csf_on_prfcnt_threshold(struct kbase_hwcnt_backend_interface *iface); ++ ++/** ++ * kbase_hwcnt_backend_csf_on_prfcnt_overflow() - CSF performance counter buffer ++ * overflow interrupt handler. ++ * @iface: Non-NULL pointer to HWC backend interface. ++ */ ++void kbase_hwcnt_backend_csf_on_prfcnt_overflow(struct kbase_hwcnt_backend_interface *iface); ++ ++/** ++ * kbase_hwcnt_backend_csf_on_prfcnt_enable() - CSF performance counter enabled ++ * interrupt handler. ++ * @iface: Non-NULL pointer to HWC backend interface. ++ */ ++void kbase_hwcnt_backend_csf_on_prfcnt_enable(struct kbase_hwcnt_backend_interface *iface); ++ ++/** ++ * kbase_hwcnt_backend_csf_on_prfcnt_disable() - CSF performance counter ++ * disabled interrupt handler. ++ * @iface: Non-NULL pointer to HWC backend interface. ++ */ ++void kbase_hwcnt_backend_csf_on_prfcnt_disable(struct kbase_hwcnt_backend_interface *iface); ++ ++#endif /* _KBASE_HWCNT_BACKEND_CSF_H_ */ +diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if.h +new file mode 100644 +index 000000000..382a3adaa +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if.h +@@ -0,0 +1,302 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Return: 0 on success, or an error code + */ -+int kbase_ipa_model_add_param_string(struct kbase_ipa_model *model, -+ const char *name, char *addr, -+ size_t size, bool dt_required); + -+struct kbase_ipa_model_ops { -+ char *name; -+ /* The init, recalculate and term ops on the default model are always -+ * called. However, all the other models are only invoked if the model -+ * is selected in the device tree. Otherwise they are never -+ * initialized. Additional resources can be acquired by models in -+ * init(), however they must be terminated in the term(). -+ */ -+ int (*init)(struct kbase_ipa_model *model); -+ /* Called immediately after init(), or when a parameter is changed, so -+ * that any coefficients derived from model parameters can be -+ * recalculated. */ -+ int (*recalculate)(struct kbase_ipa_model *model); -+ void (*term)(struct kbase_ipa_model *model); -+ /* -+ * get_dynamic_coeff() - calculate dynamic power coefficient -+ * @model: pointer to model -+ * @coeffp: pointer to return value location -+ * -+ * Calculate a dynamic power coefficient, with units pW/(Hz V^2), which -+ * is then scaled by the IPA framework according to the current OPP's -+ * frequency and voltage. -+ * -+ * Return: 0 on success, or an error code. -+ */ -+ int (*get_dynamic_coeff)(struct kbase_ipa_model *model, u32 *coeffp); -+ /* -+ * get_static_coeff() - calculate static power coefficient -+ * @model: pointer to model -+ * @coeffp: pointer to return value location -+ * -+ * Calculate a static power coefficient, with units uW/(V^3), which is -+ * scaled by the IPA framework according to the current OPP's voltage. -+ * -+ * Return: 0 on success, or an error code. -+ */ -+ int (*get_static_coeff)(struct kbase_ipa_model *model, u32 *coeffp); ++/* ++ * Virtual interface for CSF hardware counter backend. ++ */ ++ ++#ifndef _KBASE_HWCNT_BACKEND_CSF_IF_H_ ++#define _KBASE_HWCNT_BACKEND_CSF_IF_H_ ++ ++#include ++ ++struct kbase_hwcnt_backend_csf_if_ctx; ++ ++struct kbase_hwcnt_backend_csf_if_ring_buf; ++ ++/** ++ * struct kbase_hwcnt_backend_csf_if_enable - enable hardware counter collection ++ * structure. ++ * @fe_bm: Front End counters selection bitmask. ++ * @shader_bm: Shader counters selection bitmask. ++ * @tiler_bm: Tiler counters selection bitmask. ++ * @mmu_l2_bm: MMU_L2 counters selection bitmask. ++ * @counter_set: The performance counter set to enable. ++ * @clk_enable_map: An array of u64 bitfields, each bit of which enables cycle ++ * counter for a given clock domain. ++ */ ++struct kbase_hwcnt_backend_csf_if_enable { ++ u32 fe_bm; ++ u32 shader_bm; ++ u32 tiler_bm; ++ u32 mmu_l2_bm; ++ u8 counter_set; ++ u64 clk_enable_map; +}; + +/** -+ * kbase_ipa_init - Initialize the IPA feature -+ * @kbdev: pointer to kbase device -+ * -+ * simple IPA power model is initialized as a fallback model and if that -+ * initialization fails then IPA is not used. -+ * The device tree is read for the name of ipa model to be used, by using the -+ * property string "ipa-model". If that ipa model is supported then it is -+ * initialized but if the initialization fails then simple power model is used. ++ * struct kbase_hwcnt_backend_csf_if_prfcnt_info - Performance counter ++ * information. ++ * @prfcnt_hw_size: Total length in bytes of all the hardware counters data. The hardware ++ * counters are sub-divided into 4 classes: front-end, shader, tiler, and ++ * memory system (l2 cache + MMU). ++ * @prfcnt_fw_size: Total length in bytes of all the firmware counters data. ++ * @dump_bytes: Bytes of GPU memory required to perform a performance ++ * counter dump. dump_bytes = prfcnt_hw_size + prfcnt_fw_size. ++ * @prfcnt_block_size: Bytes of each performance counter block. ++ * @l2_count: The MMU L2 cache count. ++ * @core_mask: Shader core mask. ++ * @clk_cnt: Clock domain count in the system. ++ * @clearing_samples: Indicates whether counters are cleared after each sample ++ * is taken. ++ */ ++struct kbase_hwcnt_backend_csf_if_prfcnt_info { ++ size_t prfcnt_hw_size; ++ size_t prfcnt_fw_size; ++ size_t dump_bytes; ++ size_t prfcnt_block_size; ++ size_t l2_count; ++ u64 core_mask; ++ u8 clk_cnt; ++ bool clearing_samples; ++}; ++ ++/** ++ * typedef kbase_hwcnt_backend_csf_if_assert_lock_held_fn - Assert that the ++ * backend spinlock is ++ * held. ++ * @ctx: Non-NULL pointer to a CSF context. ++ */ ++typedef void ++kbase_hwcnt_backend_csf_if_assert_lock_held_fn(struct kbase_hwcnt_backend_csf_if_ctx *ctx); ++ ++/** ++ * typedef kbase_hwcnt_backend_csf_if_lock_fn - Acquire backend spinlock. + * -+ * Return: 0 on success, negative -errno on error ++ * @ctx: Non-NULL pointer to a CSF context. ++ * @flags: Pointer to the memory location that would store the previous ++ * interrupt state. + */ -+int kbase_ipa_init(struct kbase_device *kbdev); ++typedef void kbase_hwcnt_backend_csf_if_lock_fn(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ unsigned long *flags); + +/** -+ * kbase_ipa_term - Terminate the IPA feature -+ * @kbdev: pointer to kbase device ++ * typedef kbase_hwcnt_backend_csf_if_unlock_fn - Release backend spinlock. + * -+ * Both simple IPA power model and model retrieved from device tree are -+ * terminated. ++ * @ctx: Non-NULL pointer to a CSF context. ++ * @flags: Previously stored interrupt state when Scheduler interrupt ++ * spinlock was acquired. + */ -+void kbase_ipa_term(struct kbase_device *kbdev); ++typedef void kbase_hwcnt_backend_csf_if_unlock_fn(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ unsigned long flags); + +/** -+ * kbase_ipa_model_recalculate - Recalculate the model coefficients -+ * @model: pointer to the IPA model object, already initialized ++ * typedef kbase_hwcnt_backend_csf_if_get_prfcnt_info_fn - Get performance ++ * counter information. ++ * @ctx: Non-NULL pointer to a CSF context. ++ * @prfcnt_info: Non-NULL pointer to struct where performance counter ++ * information should be stored. ++ */ ++typedef void kbase_hwcnt_backend_csf_if_get_prfcnt_info_fn( ++ struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ struct kbase_hwcnt_backend_csf_if_prfcnt_info *prfcnt_info); ++ ++/** ++ * typedef kbase_hwcnt_backend_csf_if_ring_buf_alloc_fn - Allocate a ring buffer ++ * for CSF interface. ++ * @ctx: Non-NULL pointer to a CSF context. ++ * @buf_count: The buffer count in the ring buffer to be allocated, ++ * MUST be power of 2. ++ * @cpu_dump_base: Non-NULL pointer to where ring buffer CPU base address is ++ * stored when success. ++ * @ring_buf: Non-NULL pointer to where ring buffer is stored when success. + * -+ * It shall be called immediately after the model has been initialized -+ * or when the model parameter has changed, so that any coefficients -+ * derived from parameters can be recalculated. -+ * Its a wrapper for the module specific recalculate() method. ++ * A ring buffer is needed by the CSF interface to do manual HWC sample and ++ * automatic HWC samples, the buffer count in the ring buffer MUST be power ++ * of 2 to meet the hardware requirement. + * -+ * Return: 0 on success, negative -errno on error ++ * Return: 0 on success, else error code. + */ -+int kbase_ipa_model_recalculate(struct kbase_ipa_model *model); ++typedef int ++kbase_hwcnt_backend_csf_if_ring_buf_alloc_fn(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ u32 buf_count, void **cpu_dump_base, ++ struct kbase_hwcnt_backend_csf_if_ring_buf **ring_buf); + +/** -+ * kbase_ipa_model_ops_find - Lookup an IPA model using its name -+ * @kbdev: pointer to kbase device -+ * @name: name of model to lookup ++ * typedef kbase_hwcnt_backend_csf_if_ring_buf_sync_fn - Sync HWC dump buffers ++ * memory. ++ * @ctx: Non-NULL pointer to a CSF context. ++ * @ring_buf: Non-NULL pointer to the ring buffer. ++ * @buf_index_first: The first buffer index in the ring buffer to be synced, ++ * inclusive. ++ * @buf_index_last: The last buffer index in the ring buffer to be synced, ++ * exclusive. ++ * @for_cpu: The direction of sync to be applied, set to true when CPU ++ * cache needs invalidating before reading the buffer, and set ++ * to false after CPU writes to flush these before this memory ++ * is overwritten by the GPU. + * -+ * Return: Pointer to model's 'ops' structure, or NULL if the lookup failed. ++ * Flush cached HWC dump buffer data to ensure that all writes from GPU and CPU ++ * are correctly observed. + */ -+const struct kbase_ipa_model_ops *kbase_ipa_model_ops_find(struct kbase_device *kbdev, -+ const char *name); ++typedef void ++kbase_hwcnt_backend_csf_if_ring_buf_sync_fn(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ struct kbase_hwcnt_backend_csf_if_ring_buf *ring_buf, ++ u32 buf_index_first, u32 buf_index_last, bool for_cpu); + +/** -+ * kbase_ipa_model_name_from_id - Find the best model for a given GPU ID -+ * @gpu_id: GPU ID of GPU the model will be used for ++ * typedef kbase_hwcnt_backend_csf_if_ring_buf_free_fn - Free a ring buffer for ++ * the CSF interface. + * -+ * Return: The name of the appropriate counter-based model, or the name of the -+ * fallback model if no counter model exists. ++ * @ctx: Non-NULL pointer to a CSF interface context. ++ * @ring_buf: Non-NULL pointer to the ring buffer which to be freed. + */ -+const char *kbase_ipa_model_name_from_id(u32 gpu_id); ++typedef void ++kbase_hwcnt_backend_csf_if_ring_buf_free_fn(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ struct kbase_hwcnt_backend_csf_if_ring_buf *ring_buf); + +/** -+ * kbase_ipa_init_model - Initilaize the particular IPA model -+ * @kbdev: pointer to kbase device -+ * @ops: pointer to object containing model specific methods. -+ * -+ * Initialize the model corresponding to the @ops pointer passed. -+ * The init() method specified in @ops would be called. ++ * typedef kbase_hwcnt_backend_csf_if_timestamp_ns_fn - Get the current ++ * timestamp of the CSF ++ * interface. ++ * @ctx: Non-NULL pointer to a CSF interface context. + * -+ * Return: pointer to kbase_ipa_model on success, NULL on error ++ * Return: CSF interface timestamp in nanoseconds. + */ -+struct kbase_ipa_model *kbase_ipa_init_model(struct kbase_device *kbdev, -+ const struct kbase_ipa_model_ops *ops); ++typedef u64 kbase_hwcnt_backend_csf_if_timestamp_ns_fn(struct kbase_hwcnt_backend_csf_if_ctx *ctx); ++ +/** -+ * kbase_ipa_term_model - Terminate the particular IPA model -+ * @model: pointer to the IPA model object, already initialized ++ * typedef kbase_hwcnt_backend_csf_if_dump_enable_fn - Setup and enable hardware ++ * counter in CSF interface. ++ * @ctx: Non-NULL pointer to a CSF interface context. ++ * @ring_buf: Non-NULL pointer to the ring buffer which used to setup the HWC. ++ * @enable: Non-NULL pointer to the enable map of HWC. + * -+ * Terminate the model, using the term() method. -+ * Module specific parameters would be freed. ++ * Requires lock to be taken before calling. + */ -+void kbase_ipa_term_model(struct kbase_ipa_model *model); ++typedef void ++kbase_hwcnt_backend_csf_if_dump_enable_fn(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ struct kbase_hwcnt_backend_csf_if_ring_buf *ring_buf, ++ struct kbase_hwcnt_backend_csf_if_enable *enable); + +/** -+ * kbase_ipa_protection_mode_switch_event - Inform IPA of the GPU's entry into -+ * protected mode -+ * @kbdev: pointer to kbase device ++ * typedef kbase_hwcnt_backend_csf_if_dump_disable_fn - Disable hardware counter ++ * in CSF interface. ++ * @ctx: Non-NULL pointer to a CSF interface context. + * -+ * Makes IPA aware of the GPU switching to protected mode. ++ * Requires lock to be taken before calling. + */ -+void kbase_ipa_protection_mode_switch_event(struct kbase_device *kbdev); -+ -+extern const struct kbase_ipa_model_ops kbase_g71_ipa_model_ops; -+extern const struct kbase_ipa_model_ops kbase_g72_ipa_model_ops; -+extern const struct kbase_ipa_model_ops kbase_g76_ipa_model_ops; -+extern const struct kbase_ipa_model_ops kbase_g52_ipa_model_ops; -+extern const struct kbase_ipa_model_ops kbase_g52_r1_ipa_model_ops; -+extern const struct kbase_ipa_model_ops kbase_g51_ipa_model_ops; -+extern const struct kbase_ipa_model_ops kbase_g77_ipa_model_ops; -+extern const struct kbase_ipa_model_ops kbase_tnax_ipa_model_ops; -+extern const struct kbase_ipa_model_ops kbase_tbex_ipa_model_ops; -+extern const struct kbase_ipa_model_ops kbase_tbax_ipa_model_ops; ++typedef void kbase_hwcnt_backend_csf_if_dump_disable_fn(struct kbase_hwcnt_backend_csf_if_ctx *ctx); + +/** -+ * kbase_get_real_power() - get the real power consumption of the GPU -+ * @df: dynamic voltage and frequency scaling information for the GPU. -+ * @power: where to store the power consumption, in mW. -+ * @freq: a frequency, in HZ. -+ * @voltage: a voltage, in mV. ++ * typedef kbase_hwcnt_backend_csf_if_dump_request_fn - Request a HWC dump. + * -+ * The returned value incorporates both static and dynamic power consumption. ++ * @ctx: Non-NULL pointer to the interface context. + * -+ * Return: 0 on success, or an error code. ++ * Requires lock to be taken before calling. + */ -+int kbase_get_real_power(struct devfreq *df, u32 *power, -+ unsigned long freq, -+ unsigned long voltage); ++typedef void kbase_hwcnt_backend_csf_if_dump_request_fn(struct kbase_hwcnt_backend_csf_if_ctx *ctx); + -+#if MALI_UNIT_TEST -+/* Called by kbase_get_real_power() to invoke the power models. -+ * Must be called with kbdev->ipa.lock held. -+ * This function is only exposed for use by unit tests. ++/** ++ * typedef kbase_hwcnt_backend_csf_if_get_indexes_fn - Get current extract and ++ * insert indexes of the ++ * ring buffer. ++ * ++ * @ctx: Non-NULL pointer to a CSF interface context. ++ * @extract_index: Non-NULL pointer where current extract index to be saved. ++ * @insert_index: Non-NULL pointer where current insert index to be saved. ++ * ++ * Requires lock to be taken before calling. + */ -+int kbase_get_real_power_locked(struct kbase_device *kbdev, u32 *power, -+ unsigned long freq, -+ unsigned long voltage); -+#endif /* MALI_UNIT_TEST */ -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) -+extern struct devfreq_cooling_ops kbase_ipa_power_model_ops; -+#else -+extern struct devfreq_cooling_power kbase_ipa_power_model_ops; -+#endif -+ -+#else /* !(defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL)) */ ++typedef void kbase_hwcnt_backend_csf_if_get_indexes_fn(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ u32 *extract_index, u32 *insert_index); + -+static inline void kbase_ipa_protection_mode_switch_event(struct kbase_device *kbdev) -+{ } ++/** ++ * typedef kbase_hwcnt_backend_csf_if_set_extract_index_fn - Update the extract ++ * index of the ring ++ * buffer. ++ * ++ * @ctx: Non-NULL pointer to a CSF interface context. ++ * @extract_index: New extract index to be set. ++ * ++ * Requires lock to be taken before calling. ++ */ ++typedef void ++kbase_hwcnt_backend_csf_if_set_extract_index_fn(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ u32 extract_index); + -+#endif /* (defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL)) */ ++/** ++ * typedef kbase_hwcnt_backend_csf_if_get_gpu_cycle_count_fn - Get the current ++ * GPU cycle count. ++ * @ctx: Non-NULL pointer to a CSF interface context. ++ * @cycle_counts: Non-NULL pointer to an array where cycle counts to be saved, ++ * the array size should be at least as big as the number of ++ * clock domains returned by get_prfcnt_info interface. ++ * @clk_enable_map: An array of bitfields, each bit specifies an enabled clock ++ * domain. ++ * ++ * Requires lock to be taken before calling. ++ */ ++typedef void ++kbase_hwcnt_backend_csf_if_get_gpu_cycle_count_fn(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ u64 *cycle_counts, u64 clk_enable_map); + -+#endif -diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c -new file mode 100755 -index 000000000000..30a3b7d1b3be ++/** ++ * struct kbase_hwcnt_backend_csf_if - Hardware counter backend CSF virtual ++ * interface. ++ * @ctx: CSF interface context. ++ * @assert_lock_held: Function ptr to assert backend spinlock is held. ++ * @lock: Function ptr to acquire backend spinlock. ++ * @unlock: Function ptr to release backend spinlock. ++ * @get_prfcnt_info: Function ptr to get performance counter related ++ * information. ++ * @ring_buf_alloc: Function ptr to allocate ring buffer for CSF HWC. ++ * @ring_buf_sync: Function ptr to sync ring buffer to CPU. ++ * @ring_buf_free: Function ptr to free ring buffer for CSF HWC. ++ * @timestamp_ns: Function ptr to get the current CSF interface ++ * timestamp. ++ * @dump_enable: Function ptr to enable dumping. ++ * @dump_disable: Function ptr to disable dumping. ++ * @dump_request: Function ptr to request a dump. ++ * @get_indexes: Function ptr to get extract and insert indexes of the ++ * ring buffer. ++ * @set_extract_index: Function ptr to set extract index of ring buffer. ++ * @get_gpu_cycle_count: Function ptr to get the GPU cycle count. ++ */ ++struct kbase_hwcnt_backend_csf_if { ++ struct kbase_hwcnt_backend_csf_if_ctx *ctx; ++ kbase_hwcnt_backend_csf_if_assert_lock_held_fn *assert_lock_held; ++ kbase_hwcnt_backend_csf_if_lock_fn *lock; ++ kbase_hwcnt_backend_csf_if_unlock_fn *unlock; ++ kbase_hwcnt_backend_csf_if_get_prfcnt_info_fn *get_prfcnt_info; ++ kbase_hwcnt_backend_csf_if_ring_buf_alloc_fn *ring_buf_alloc; ++ kbase_hwcnt_backend_csf_if_ring_buf_sync_fn *ring_buf_sync; ++ kbase_hwcnt_backend_csf_if_ring_buf_free_fn *ring_buf_free; ++ kbase_hwcnt_backend_csf_if_timestamp_ns_fn *timestamp_ns; ++ kbase_hwcnt_backend_csf_if_dump_enable_fn *dump_enable; ++ kbase_hwcnt_backend_csf_if_dump_disable_fn *dump_disable; ++ kbase_hwcnt_backend_csf_if_dump_request_fn *dump_request; ++ kbase_hwcnt_backend_csf_if_get_indexes_fn *get_indexes; ++ kbase_hwcnt_backend_csf_if_set_extract_index_fn *set_extract_index; ++ kbase_hwcnt_backend_csf_if_get_gpu_cycle_count_fn *get_gpu_cycle_count; ++}; ++ ++#endif /* #define _KBASE_HWCNT_BACKEND_CSF_IF_H_ */ +diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.c b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.c +new file mode 100644 +index 000000000..b11f3a4e5 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c -@@ -0,0 +1,322 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.c +@@ -0,0 +1,787 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2017-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -183507,324 +211871,789 @@ index 000000000000..30a3b7d1b3be + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include -+#include -+#include ++/* ++ * CSF GPU HWC backend firmware interface APIs. ++ */ + -+#include "mali_kbase.h" -+#include "mali_kbase_ipa.h" -+#include "mali_kbase_ipa_debugfs.h" ++#include ++#include ++#include ++#include "hwcnt/mali_kbase_hwcnt_gpu.h" ++#include "hwcnt/mali_kbase_hwcnt_types.h" ++#include + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)) -+#define DEFINE_DEBUGFS_ATTRIBUTE DEFINE_SIMPLE_ATTRIBUTE -+#endif ++#include "csf/mali_kbase_csf_firmware.h" ++#include "hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.h" ++#include "mali_kbase_hwaccess_time.h" ++#include "backend/gpu/mali_kbase_clk_rate_trace_mgr.h" ++#include + -+struct kbase_ipa_model_param { -+ char *name; -+ union { -+ void *voidp; -+ s32 *s32p; -+ char *str; -+ } addr; -+ size_t size; -+ enum kbase_ipa_model_param_type type; -+ struct kbase_ipa_model *model; -+ struct list_head link; ++#include ++#include "mali_kbase_ccswe.h" ++ ++ ++/* Ring buffer virtual address start at 4GB */ ++#define KBASE_HWC_CSF_RING_BUFFER_VA_START (1ull << 32) ++ ++/** ++ * struct kbase_hwcnt_backend_csf_if_fw_ring_buf - ring buffer for CSF interface ++ * used to save the manual and ++ * auto HWC samples from ++ * firmware. ++ * @gpu_dump_base: Starting GPU base address of the ring buffer. ++ * @cpu_dump_base: Starting CPU address for the mapping. ++ * @buf_count: Buffer count in the ring buffer, MUST be power of 2. ++ * @as_nr: Address space number for the memory mapping. ++ * @phys: Physical memory allocation used by the mapping. ++ * @num_pages: Size of the mapping, in memory pages. ++ */ ++struct kbase_hwcnt_backend_csf_if_fw_ring_buf { ++ u64 gpu_dump_base; ++ void *cpu_dump_base; ++ size_t buf_count; ++ u32 as_nr; ++ struct tagged_addr *phys; ++ size_t num_pages; +}; + -+static int param_int_get(void *data, u64 *val) ++/** ++ * struct kbase_hwcnt_backend_csf_if_fw_ctx - Firmware context for the CSF ++ * interface, used to communicate ++ * with firmware. ++ * @kbdev: KBase device. ++ * @buf_bytes: The size in bytes for each buffer in the ring buffer. ++ * @clk_cnt: The number of clock domains in the system. ++ * The maximum is 64. ++ * @clk_enable_map: Bitmask of enabled clocks ++ * @rate_listener: Clock rate listener callback state. ++ * @ccswe_shader_cores: Shader cores cycle count software estimator. ++ */ ++struct kbase_hwcnt_backend_csf_if_fw_ctx { ++ struct kbase_device *kbdev; ++ size_t buf_bytes; ++ u8 clk_cnt; ++ u64 clk_enable_map; ++ struct kbase_clk_rate_listener rate_listener; ++ struct kbase_ccswe ccswe_shader_cores; ++}; ++ ++static void ++kbasep_hwcnt_backend_csf_if_fw_assert_lock_held(struct kbase_hwcnt_backend_csf_if_ctx *ctx) +{ -+ struct kbase_ipa_model_param *param = data; ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx; ++ struct kbase_device *kbdev; + -+ mutex_lock(¶m->model->kbdev->ipa.lock); -+ *(s64 *) val = *param->addr.s32p; -+ mutex_unlock(¶m->model->kbdev->ipa.lock); ++ WARN_ON(!ctx); + -+ return 0; ++ fw_ctx = (struct kbase_hwcnt_backend_csf_if_fw_ctx *)ctx; ++ kbdev = fw_ctx->kbdev; ++ ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); +} + -+static int param_int_set(void *data, u64 val) ++static void kbasep_hwcnt_backend_csf_if_fw_lock(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ unsigned long *flags) ++ __acquires(&(struct kbase_hwcnt_backend_csf_if_fw_ctx) ++ ctx->kbdev->csf.scheduler.interrupt_lock) +{ -+ struct kbase_ipa_model_param *param = data; -+ struct kbase_ipa_model *model = param->model; -+ s64 sval = (s64) val; -+ s32 old_val; -+ int err = 0; ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx; ++ struct kbase_device *kbdev; + -+ if (sval < S32_MIN || sval > S32_MAX) -+ return -ERANGE; ++ WARN_ON(!ctx); + -+ mutex_lock(¶m->model->kbdev->ipa.lock); -+ old_val = *param->addr.s32p; -+ *param->addr.s32p = val; -+ err = kbase_ipa_model_recalculate(model); -+ if (err < 0) -+ *param->addr.s32p = old_val; -+ mutex_unlock(¶m->model->kbdev->ipa.lock); ++ fw_ctx = (struct kbase_hwcnt_backend_csf_if_fw_ctx *)ctx; ++ kbdev = fw_ctx->kbdev; + -+ return err; ++ kbase_csf_scheduler_spin_lock(kbdev, flags); +} + -+DEFINE_DEBUGFS_ATTRIBUTE(fops_s32, param_int_get, param_int_set, "%lld\n"); ++static void kbasep_hwcnt_backend_csf_if_fw_unlock(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ unsigned long flags) ++ __releases(&(struct kbase_hwcnt_backend_csf_if_fw_ctx) ++ ctx->kbdev->csf.scheduler.interrupt_lock) ++{ ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx; ++ struct kbase_device *kbdev; + -+static ssize_t param_string_get(struct file *file, char __user *user_buf, -+ size_t count, loff_t *ppos) ++ WARN_ON(!ctx); ++ ++ fw_ctx = (struct kbase_hwcnt_backend_csf_if_fw_ctx *)ctx; ++ kbdev = fw_ctx->kbdev; ++ ++ kbase_csf_scheduler_spin_lock_assert_held(kbdev); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++} ++ ++/** ++ * kbasep_hwcnt_backend_csf_if_fw_on_freq_change() - On freq change callback ++ * ++ * @rate_listener: Callback state ++ * @clk_index: Clock index ++ * @clk_rate_hz: Clock frequency(hz) ++ */ ++static void ++kbasep_hwcnt_backend_csf_if_fw_on_freq_change(struct kbase_clk_rate_listener *rate_listener, ++ u32 clk_index, u32 clk_rate_hz) +{ -+ struct kbase_ipa_model_param *param = file->private_data; -+ ssize_t ret; -+ size_t len; ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx = container_of( ++ rate_listener, struct kbase_hwcnt_backend_csf_if_fw_ctx, rate_listener); ++ u64 timestamp_ns; + -+ mutex_lock(¶m->model->kbdev->ipa.lock); -+ len = strnlen(param->addr.str, param->size - 1) + 1; -+ ret = simple_read_from_buffer(user_buf, count, ppos, -+ param->addr.str, len); -+ mutex_unlock(¶m->model->kbdev->ipa.lock); ++ if (clk_index != KBASE_CLOCK_DOMAIN_SHADER_CORES) ++ return; + -+ return ret; ++ timestamp_ns = ktime_get_raw_ns(); ++ kbase_ccswe_freq_change(&fw_ctx->ccswe_shader_cores, timestamp_ns, clk_rate_hz); +} + -+static ssize_t param_string_set(struct file *file, const char __user *user_buf, -+ size_t count, loff_t *ppos) ++/** ++ * kbasep_hwcnt_backend_csf_if_fw_cc_enable() - Enable cycle count tracking ++ * ++ * @fw_ctx: Non-NULL pointer to CSF firmware interface context. ++ * @clk_enable_map: Non-NULL pointer to enable map specifying enabled counters. ++ */ ++static void ++kbasep_hwcnt_backend_csf_if_fw_cc_enable(struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx, ++ u64 clk_enable_map) +{ -+ struct kbase_ipa_model_param *param = file->private_data; -+ struct kbase_ipa_model *model = param->model; -+ char *old_str = NULL; -+ ssize_t ret = count; -+ size_t buf_size; -+ int err; ++ struct kbase_device *kbdev = fw_ctx->kbdev; + -+ mutex_lock(&model->kbdev->ipa.lock); ++ if (kbase_hwcnt_clk_enable_map_enabled(clk_enable_map, KBASE_CLOCK_DOMAIN_SHADER_CORES)) { ++ /* software estimation for non-top clock domains */ ++ struct kbase_clk_rate_trace_manager *rtm = &kbdev->pm.clk_rtm; ++ const struct kbase_clk_data *clk_data = rtm->clks[KBASE_CLOCK_DOMAIN_SHADER_CORES]; ++ u32 cur_freq; ++ unsigned long flags; ++ u64 timestamp_ns; + -+ if (count > param->size) { -+ ret = -EINVAL; -+ goto end; -+ } ++ timestamp_ns = ktime_get_raw_ns(); + -+ old_str = kstrndup(param->addr.str, param->size, GFP_KERNEL); -+ if (!old_str) { -+ ret = -ENOMEM; -+ goto end; -+ } ++ spin_lock_irqsave(&rtm->lock, flags); + -+ buf_size = min(param->size - 1, count); -+ if (copy_from_user(param->addr.str, user_buf, buf_size)) { -+ ret = -EFAULT; -+ goto end; -+ } ++ cur_freq = (u32)clk_data->clock_val; ++ kbase_ccswe_reset(&fw_ctx->ccswe_shader_cores); ++ kbase_ccswe_freq_change(&fw_ctx->ccswe_shader_cores, timestamp_ns, cur_freq); + -+ param->addr.str[buf_size] = '\0'; ++ kbase_clk_rate_trace_manager_subscribe_no_lock(rtm, &fw_ctx->rate_listener); + -+ err = kbase_ipa_model_recalculate(model); -+ if (err < 0) { -+ ret = err; -+ strlcpy(param->addr.str, old_str, param->size); ++ spin_unlock_irqrestore(&rtm->lock, flags); + } + -+end: -+ kfree(old_str); -+ mutex_unlock(&model->kbdev->ipa.lock); ++ fw_ctx->clk_enable_map = clk_enable_map; ++} + -+ return ret; ++/** ++ * kbasep_hwcnt_backend_csf_if_fw_cc_disable() - Disable cycle count tracking ++ * ++ * @fw_ctx: Non-NULL pointer to CSF firmware interface context. ++ */ ++static void ++kbasep_hwcnt_backend_csf_if_fw_cc_disable(struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx) ++{ ++ struct kbase_device *kbdev = fw_ctx->kbdev; ++ struct kbase_clk_rate_trace_manager *rtm = &kbdev->pm.clk_rtm; ++ u64 clk_enable_map = fw_ctx->clk_enable_map; ++ ++ if (kbase_hwcnt_clk_enable_map_enabled(clk_enable_map, KBASE_CLOCK_DOMAIN_SHADER_CORES)) ++ kbase_clk_rate_trace_manager_unsubscribe(rtm, &fw_ctx->rate_listener); +} + -+static const struct file_operations fops_string = { -+ .owner = THIS_MODULE, -+ .read = param_string_get, -+ .write = param_string_set, -+ .open = simple_open, -+ .llseek = default_llseek, -+}; ++static void kbasep_hwcnt_backend_csf_if_fw_get_prfcnt_info( ++ struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ struct kbase_hwcnt_backend_csf_if_prfcnt_info *prfcnt_info) ++{ ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx = ++ (struct kbase_hwcnt_backend_csf_if_fw_ctx *)ctx; + -+int kbase_ipa_model_param_add(struct kbase_ipa_model *model, const char *name, -+ void *addr, size_t size, -+ enum kbase_ipa_model_param_type type) ++ *prfcnt_info = (struct kbase_hwcnt_backend_csf_if_prfcnt_info){ ++ .l2_count = KBASE_DUMMY_MODEL_MAX_MEMSYS_BLOCKS, ++ .core_mask = (1ull << KBASE_DUMMY_MODEL_MAX_SHADER_CORES) - 1, ++ .prfcnt_hw_size = ++ KBASE_DUMMY_MODEL_MAX_NUM_HARDWARE_BLOCKS * KBASE_DUMMY_MODEL_BLOCK_SIZE, ++ .prfcnt_fw_size = ++ KBASE_DUMMY_MODEL_MAX_FIRMWARE_BLOCKS * KBASE_DUMMY_MODEL_BLOCK_SIZE, ++ .dump_bytes = KBASE_DUMMY_MODEL_MAX_SAMPLE_SIZE, ++ .prfcnt_block_size = KBASE_DUMMY_MODEL_BLOCK_SIZE, ++ .clk_cnt = 1, ++ .clearing_samples = true, ++ }; ++ ++ fw_ctx->buf_bytes = prfcnt_info->dump_bytes; ++#else ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx; ++ struct kbase_device *kbdev; ++ u32 prfcnt_size; ++ u32 prfcnt_hw_size; ++ u32 prfcnt_fw_size; ++ u32 prfcnt_block_size = ++ KBASE_HWCNT_V5_DEFAULT_VALUES_PER_BLOCK * KBASE_HWCNT_VALUE_HW_BYTES; ++ ++ WARN_ON(!ctx); ++ WARN_ON(!prfcnt_info); ++ ++ fw_ctx = (struct kbase_hwcnt_backend_csf_if_fw_ctx *)ctx; ++ kbdev = fw_ctx->kbdev; ++ prfcnt_size = kbdev->csf.global_iface.prfcnt_size; ++ prfcnt_hw_size = GLB_PRFCNT_SIZE_HARDWARE_SIZE_GET(prfcnt_size); ++ prfcnt_fw_size = GLB_PRFCNT_SIZE_FIRMWARE_SIZE_GET(prfcnt_size); ++ fw_ctx->buf_bytes = prfcnt_hw_size + prfcnt_fw_size; ++ ++ /* Read the block size if the GPU has the register PRFCNT_FEATURES ++ * which was introduced in architecture version 11.x.7. ++ */ ++ if ((kbdev->gpu_props.props.raw_props.gpu_id & GPU_ID2_PRODUCT_MODEL) >= ++ GPU_ID2_PRODUCT_TTUX) { ++ prfcnt_block_size = PRFCNT_FEATURES_COUNTER_BLOCK_SIZE_GET( ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(PRFCNT_FEATURES))) ++ << 8; ++ } ++ ++ *prfcnt_info = (struct kbase_hwcnt_backend_csf_if_prfcnt_info){ ++ .prfcnt_hw_size = prfcnt_hw_size, ++ .prfcnt_fw_size = prfcnt_fw_size, ++ .dump_bytes = fw_ctx->buf_bytes, ++ .prfcnt_block_size = prfcnt_block_size, ++ .l2_count = kbdev->gpu_props.props.l2_props.num_l2_slices, ++ .core_mask = kbdev->gpu_props.props.coherency_info.group[0].core_mask, ++ .clk_cnt = fw_ctx->clk_cnt, ++ .clearing_samples = true, ++ }; ++ ++ /* Block size must be multiple of counter size. */ ++ WARN_ON((prfcnt_info->prfcnt_block_size % KBASE_HWCNT_VALUE_HW_BYTES) != 0); ++ /* Total size must be multiple of block size. */ ++ WARN_ON((prfcnt_info->dump_bytes % prfcnt_info->prfcnt_block_size) != 0); ++#endif ++} ++ ++static int kbasep_hwcnt_backend_csf_if_fw_ring_buf_alloc( ++ struct kbase_hwcnt_backend_csf_if_ctx *ctx, u32 buf_count, void **cpu_dump_base, ++ struct kbase_hwcnt_backend_csf_if_ring_buf **out_ring_buf) +{ -+ struct kbase_ipa_model_param *param; ++ struct kbase_device *kbdev; ++ struct tagged_addr *phys; ++ struct page **page_list; ++ void *cpu_addr; ++ int ret; ++ int i; ++ size_t num_pages; ++ u64 flags; ++ struct kbase_hwcnt_backend_csf_if_fw_ring_buf *fw_ring_buf; + -+ param = kzalloc(sizeof(*param), GFP_KERNEL); ++ pgprot_t cpu_map_prot = PAGE_KERNEL; ++ u64 gpu_va_base = KBASE_HWC_CSF_RING_BUFFER_VA_START; + -+ if (!param) -+ return -ENOMEM; ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx = ++ (struct kbase_hwcnt_backend_csf_if_fw_ctx *)ctx; + -+ /* 'name' is stack-allocated for array elements, so copy it into -+ * heap-allocated storage */ -+ param->name = kstrdup(name, GFP_KERNEL); ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; + -+ if (!param->name) { -+ kfree(param); ++ WARN_ON(!ctx); ++ WARN_ON(!cpu_dump_base); ++ WARN_ON(!out_ring_buf); ++ ++ kbdev = fw_ctx->kbdev; ++ ++ /* The buffer count must be power of 2 */ ++ if (!is_power_of_2(buf_count)) ++ return -EINVAL; ++ ++ /* alignment failure */ ++ if (gpu_va_base & (2048 - 1)) ++ return -EINVAL; ++ ++ fw_ring_buf = kzalloc(sizeof(*fw_ring_buf), GFP_KERNEL); ++ if (!fw_ring_buf) + return -ENOMEM; -+ } + -+ param->addr.voidp = addr; -+ param->size = size; -+ param->type = type; -+ param->model = model; ++ num_pages = PFN_UP(fw_ctx->buf_bytes * buf_count); ++ phys = kmalloc_array(num_pages, sizeof(*phys), GFP_KERNEL); ++ if (!phys) ++ goto phys_alloc_error; + -+ list_add(¶m->link, &model->params); ++ page_list = kmalloc_array(num_pages, sizeof(*page_list), GFP_KERNEL); ++ if (!page_list) ++ goto page_list_alloc_error; ++ ++ /* Get physical page for the buffer */ ++ ret = kbase_mem_pool_alloc_pages(&kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], num_pages, ++ phys, false, NULL); ++ if (ret != num_pages) ++ goto phys_mem_pool_alloc_error; ++ ++ /* Get the CPU virtual address */ ++ for (i = 0; i < num_pages; i++) ++ page_list[i] = as_page(phys[i]); ++ ++ cpu_addr = vmap(page_list, num_pages, VM_MAP, cpu_map_prot); ++ if (!cpu_addr) ++ goto vmap_error; ++ ++ flags = KBASE_REG_GPU_WR | KBASE_REG_GPU_NX | ++ KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_NON_CACHEABLE); ++ ++ /* Update MMU table */ ++ ret = kbase_mmu_insert_pages(kbdev, &kbdev->csf.mcu_mmu, gpu_va_base >> PAGE_SHIFT, phys, ++ num_pages, flags, MCU_AS_NR, KBASE_MEM_GROUP_CSF_FW, ++ mmu_sync_info, NULL, false); ++ if (ret) ++ goto mmu_insert_failed; ++ ++ kfree(page_list); ++ ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ fw_ring_buf->gpu_dump_base = (uintptr_t)cpu_addr; ++#else ++ fw_ring_buf->gpu_dump_base = gpu_va_base; ++#endif /* CONFIG_MALI_BIFROST_NO_MALI */ ++ fw_ring_buf->cpu_dump_base = cpu_addr; ++ fw_ring_buf->phys = phys; ++ fw_ring_buf->num_pages = num_pages; ++ fw_ring_buf->buf_count = buf_count; ++ fw_ring_buf->as_nr = MCU_AS_NR; ++ ++ *cpu_dump_base = fw_ring_buf->cpu_dump_base; ++ *out_ring_buf = (struct kbase_hwcnt_backend_csf_if_ring_buf *)fw_ring_buf; + + return 0; ++ ++mmu_insert_failed: ++ vunmap(cpu_addr); ++vmap_error: ++ kbase_mem_pool_free_pages(&kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], num_pages, phys, ++ false, false); ++phys_mem_pool_alloc_error: ++ kfree(page_list); ++page_list_alloc_error: ++ kfree(phys); ++phys_alloc_error: ++ kfree(fw_ring_buf); ++ return -ENOMEM; +} + -+void kbase_ipa_model_param_free_all(struct kbase_ipa_model *model) -+{ -+ struct kbase_ipa_model_param *param_p, *param_n; ++static void ++kbasep_hwcnt_backend_csf_if_fw_ring_buf_sync(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ struct kbase_hwcnt_backend_csf_if_ring_buf *ring_buf, ++ u32 buf_index_first, u32 buf_index_last, bool for_cpu) ++{ ++ struct kbase_hwcnt_backend_csf_if_fw_ring_buf *fw_ring_buf = ++ (struct kbase_hwcnt_backend_csf_if_fw_ring_buf *)ring_buf; ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx = ++ (struct kbase_hwcnt_backend_csf_if_fw_ctx *)ctx; ++ size_t i; ++ size_t pg_first; ++ size_t pg_last; ++ u64 start_address; ++ u64 stop_address; ++ u32 ring_buf_index_first; ++ u32 ring_buf_index_last; + -+ list_for_each_entry_safe(param_p, param_n, &model->params, link) { -+ list_del(¶m_p->link); -+ kfree(param_p->name); -+ kfree(param_p); ++ WARN_ON(!ctx); ++ WARN_ON(!ring_buf); ++ ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ /* When using the dummy backend syncing the ring buffer is unnecessary as ++ * the ring buffer is only accessed by the CPU. It may also cause data loss ++ * due to cache invalidation so return early. ++ */ ++ return; ++#endif /* CONFIG_MALI_BIFROST_NO_MALI */ ++ ++ /* The index arguments for this function form an inclusive, exclusive ++ * range. ++ * However, when masking back to the available buffers we will make this ++ * inclusive at both ends so full flushes are not 0 -> 0. ++ */ ++ ring_buf_index_first = buf_index_first & (fw_ring_buf->buf_count - 1); ++ ring_buf_index_last = (buf_index_last - 1) & (fw_ring_buf->buf_count - 1); ++ ++ /* The start address is the offset of the first buffer. */ ++ start_address = fw_ctx->buf_bytes * ring_buf_index_first; ++ pg_first = start_address >> PAGE_SHIFT; ++ ++ /* The stop address is the last byte in the final buffer. */ ++ stop_address = (fw_ctx->buf_bytes * (ring_buf_index_last + 1)) - 1; ++ pg_last = stop_address >> PAGE_SHIFT; ++ ++ /* Check whether the buffer range wraps. */ ++ if (start_address > stop_address) { ++ /* sync the first part to the end of ring buffer. */ ++ for (i = pg_first; i < fw_ring_buf->num_pages; i++) { ++ struct page *pg = as_page(fw_ring_buf->phys[i]); ++ ++ if (for_cpu) { ++ kbase_sync_single_for_cpu(fw_ctx->kbdev, kbase_dma_addr(pg), ++ PAGE_SIZE, DMA_BIDIRECTIONAL); ++ } else { ++ kbase_sync_single_for_device(fw_ctx->kbdev, kbase_dma_addr(pg), ++ PAGE_SIZE, DMA_BIDIRECTIONAL); ++ } ++ } ++ ++ /* second part starts from page 0. */ ++ pg_first = 0; ++ } ++ ++ for (i = pg_first; i <= pg_last; i++) { ++ struct page *pg = as_page(fw_ring_buf->phys[i]); ++ ++ if (for_cpu) { ++ kbase_sync_single_for_cpu(fw_ctx->kbdev, kbase_dma_addr(pg), PAGE_SIZE, ++ DMA_BIDIRECTIONAL); ++ } else { ++ kbase_sync_single_for_device(fw_ctx->kbdev, kbase_dma_addr(pg), PAGE_SIZE, ++ DMA_BIDIRECTIONAL); ++ } + } +} + -+static int force_fallback_model_get(void *data, u64 *val) ++static u64 kbasep_hwcnt_backend_csf_if_fw_timestamp_ns(struct kbase_hwcnt_backend_csf_if_ctx *ctx) +{ -+ struct kbase_device *kbdev = data; ++ CSTD_UNUSED(ctx); ++ return ktime_get_raw_ns(); ++} + -+ mutex_lock(&kbdev->ipa.lock); -+ *val = kbdev->ipa.force_fallback_model; -+ mutex_unlock(&kbdev->ipa.lock); ++static void ++kbasep_hwcnt_backend_csf_if_fw_ring_buf_free(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ struct kbase_hwcnt_backend_csf_if_ring_buf *ring_buf) ++{ ++ struct kbase_hwcnt_backend_csf_if_fw_ring_buf *fw_ring_buf = ++ (struct kbase_hwcnt_backend_csf_if_fw_ring_buf *)ring_buf; ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx = ++ (struct kbase_hwcnt_backend_csf_if_fw_ctx *)ctx; + -+ return 0; ++ if (!fw_ring_buf) ++ return; ++ ++ if (fw_ring_buf->phys) { ++ u64 gpu_va_base = KBASE_HWC_CSF_RING_BUFFER_VA_START; ++ ++ WARN_ON(kbase_mmu_teardown_pages(fw_ctx->kbdev, &fw_ctx->kbdev->csf.mcu_mmu, ++ gpu_va_base >> PAGE_SHIFT, fw_ring_buf->phys, ++ fw_ring_buf->num_pages, fw_ring_buf->num_pages, ++ MCU_AS_NR, true)); ++ ++ vunmap(fw_ring_buf->cpu_dump_base); ++ ++ kbase_mem_pool_free_pages(&fw_ctx->kbdev->mem_pools.small[KBASE_MEM_GROUP_CSF_FW], ++ fw_ring_buf->num_pages, fw_ring_buf->phys, false, false); ++ ++ kfree(fw_ring_buf->phys); ++ ++ kfree(fw_ring_buf); ++ } +} + -+static int force_fallback_model_set(void *data, u64 val) ++static void ++kbasep_hwcnt_backend_csf_if_fw_dump_enable(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ struct kbase_hwcnt_backend_csf_if_ring_buf *ring_buf, ++ struct kbase_hwcnt_backend_csf_if_enable *enable) +{ -+ struct kbase_device *kbdev = data; ++ u32 prfcnt_config; ++ struct kbase_device *kbdev; ++ struct kbase_csf_global_iface *global_iface; ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx = ++ (struct kbase_hwcnt_backend_csf_if_fw_ctx *)ctx; ++ struct kbase_hwcnt_backend_csf_if_fw_ring_buf *fw_ring_buf = ++ (struct kbase_hwcnt_backend_csf_if_fw_ring_buf *)ring_buf; + -+ mutex_lock(&kbdev->ipa.lock); -+ kbdev->ipa.force_fallback_model = (val ? true : false); -+ mutex_unlock(&kbdev->ipa.lock); ++ WARN_ON(!ctx); ++ WARN_ON(!ring_buf); ++ WARN_ON(!enable); ++ kbasep_hwcnt_backend_csf_if_fw_assert_lock_held(ctx); + -+ return 0; -+} ++ kbdev = fw_ctx->kbdev; ++ global_iface = &kbdev->csf.global_iface; + -+DEFINE_DEBUGFS_ATTRIBUTE(force_fallback_model, -+ force_fallback_model_get, -+ force_fallback_model_set, -+ "%llu\n"); ++ /* Configure */ ++ prfcnt_config = GLB_PRFCNT_CONFIG_SIZE_SET(0, fw_ring_buf->buf_count); ++ prfcnt_config = GLB_PRFCNT_CONFIG_SET_SELECT_SET(prfcnt_config, enable->counter_set); + -+static int current_power_get(void *data, u64 *val) ++ /* Configure the ring buffer base address */ ++ kbase_csf_firmware_global_input(global_iface, GLB_PRFCNT_JASID, fw_ring_buf->as_nr); ++ kbase_csf_firmware_global_input(global_iface, GLB_PRFCNT_BASE_LO, ++ fw_ring_buf->gpu_dump_base & U32_MAX); ++ kbase_csf_firmware_global_input(global_iface, GLB_PRFCNT_BASE_HI, ++ fw_ring_buf->gpu_dump_base >> 32); ++ ++ /* Set extract position to 0 */ ++ kbase_csf_firmware_global_input(global_iface, GLB_PRFCNT_EXTRACT, 0); ++ ++ /* Configure the enable bitmap */ ++ kbase_csf_firmware_global_input(global_iface, GLB_PRFCNT_CSF_EN, enable->fe_bm); ++ kbase_csf_firmware_global_input(global_iface, GLB_PRFCNT_SHADER_EN, enable->shader_bm); ++ kbase_csf_firmware_global_input(global_iface, GLB_PRFCNT_MMU_L2_EN, enable->mmu_l2_bm); ++ kbase_csf_firmware_global_input(global_iface, GLB_PRFCNT_TILER_EN, enable->tiler_bm); ++ ++ /* Configure the HWC set and buffer size */ ++ kbase_csf_firmware_global_input(global_iface, GLB_PRFCNT_CONFIG, prfcnt_config); ++ ++ kbdev->csf.hwcnt.enable_pending = true; ++ ++ /* Unmask the interrupts */ ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_ACK_IRQ_MASK, ++ GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_MASK, ++ GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_MASK); ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_ACK_IRQ_MASK, ++ GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_MASK, ++ GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_MASK); ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_ACK_IRQ_MASK, ++ GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_MASK, ++ GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_MASK); ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_ACK_IRQ_MASK, ++ GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_MASK, ++ GLB_ACK_IRQ_MASK_PRFCNT_ENABLE_MASK); ++ ++ /* Enable the HWC */ ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_REQ, ++ (1 << GLB_REQ_PRFCNT_ENABLE_SHIFT), ++ GLB_REQ_PRFCNT_ENABLE_MASK); ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++ ++ prfcnt_config = kbase_csf_firmware_global_input_read(global_iface, GLB_PRFCNT_CONFIG); ++ ++ kbasep_hwcnt_backend_csf_if_fw_cc_enable(fw_ctx, enable->clk_enable_map); ++} ++ ++static void kbasep_hwcnt_backend_csf_if_fw_dump_disable(struct kbase_hwcnt_backend_csf_if_ctx *ctx) +{ -+ struct kbase_device *kbdev = data; -+ struct devfreq *df = kbdev->devfreq; -+ u32 power; ++ struct kbase_device *kbdev; ++ struct kbase_csf_global_iface *global_iface; ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx = ++ (struct kbase_hwcnt_backend_csf_if_fw_ctx *)ctx; + -+ kbase_pm_context_active(kbdev); -+ /* The current model assumes that there's no more than one voltage -+ * regulator currently available in the system. ++ WARN_ON(!ctx); ++ kbasep_hwcnt_backend_csf_if_fw_assert_lock_held(ctx); ++ ++ kbdev = fw_ctx->kbdev; ++ global_iface = &kbdev->csf.global_iface; ++ ++ /* Disable the HWC */ ++ kbdev->csf.hwcnt.enable_pending = true; ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_REQ, 0, GLB_REQ_PRFCNT_ENABLE_MASK); ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); ++ ++ /* mask the interrupts */ ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_ACK_IRQ_MASK, 0, ++ GLB_ACK_IRQ_MASK_PRFCNT_SAMPLE_MASK); ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_ACK_IRQ_MASK, 0, ++ GLB_ACK_IRQ_MASK_PRFCNT_THRESHOLD_MASK); ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_ACK_IRQ_MASK, 0, ++ GLB_ACK_IRQ_MASK_PRFCNT_OVERFLOW_MASK); ++ ++ /* In case we have a previous request in flight when the disable ++ * happens. + */ -+ kbase_get_real_power(df, &power, -+ kbdev->current_nominal_freq, -+ (kbdev->current_voltages[0] / 1000)); -+ kbase_pm_context_idle(kbdev); ++ kbdev->csf.hwcnt.request_pending = false; + -+ *val = power; ++ kbasep_hwcnt_backend_csf_if_fw_cc_disable(fw_ctx); ++} + -+ return 0; ++static void kbasep_hwcnt_backend_csf_if_fw_dump_request(struct kbase_hwcnt_backend_csf_if_ctx *ctx) ++{ ++ u32 glb_req; ++ struct kbase_device *kbdev; ++ struct kbase_csf_global_iface *global_iface; ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx = ++ (struct kbase_hwcnt_backend_csf_if_fw_ctx *)ctx; ++ ++ WARN_ON(!ctx); ++ kbasep_hwcnt_backend_csf_if_fw_assert_lock_held(ctx); ++ ++ kbdev = fw_ctx->kbdev; ++ global_iface = &kbdev->csf.global_iface; ++ ++ /* Trigger dumping */ ++ kbdev->csf.hwcnt.request_pending = true; ++ glb_req = kbase_csf_firmware_global_input_read(global_iface, GLB_REQ); ++ glb_req ^= GLB_REQ_PRFCNT_SAMPLE_MASK; ++ kbase_csf_firmware_global_input_mask(global_iface, GLB_REQ, glb_req, ++ GLB_REQ_PRFCNT_SAMPLE_MASK); ++ kbase_csf_ring_doorbell(kbdev, CSF_KERNEL_DOORBELL_NR); +} -+DEFINE_DEBUGFS_ATTRIBUTE(current_power, current_power_get, NULL, "%llu\n"); + -+static void kbase_ipa_model_debugfs_init(struct kbase_ipa_model *model) ++static void kbasep_hwcnt_backend_csf_if_fw_get_indexes(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ u32 *extract_index, u32 *insert_index) +{ -+ struct list_head *it; -+ struct dentry *dir; ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx = ++ (struct kbase_hwcnt_backend_csf_if_fw_ctx *)ctx; + -+ lockdep_assert_held(&model->kbdev->ipa.lock); ++ WARN_ON(!ctx); ++ WARN_ON(!extract_index); ++ WARN_ON(!insert_index); ++ kbasep_hwcnt_backend_csf_if_fw_assert_lock_held(ctx); + -+ dir = debugfs_create_dir(model->ops->name, -+ model->kbdev->mali_debugfs_directory); ++ *extract_index = kbase_csf_firmware_global_input_read(&fw_ctx->kbdev->csf.global_iface, ++ GLB_PRFCNT_EXTRACT); ++ *insert_index = kbase_csf_firmware_global_output(&fw_ctx->kbdev->csf.global_iface, ++ GLB_PRFCNT_INSERT); ++} + -+ if (!dir) { -+ dev_err(model->kbdev->dev, -+ "Couldn't create mali debugfs %s directory", -+ model->ops->name); -+ return; -+ } ++static void ++kbasep_hwcnt_backend_csf_if_fw_set_extract_index(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ u32 extract_idx) ++{ ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx = ++ (struct kbase_hwcnt_backend_csf_if_fw_ctx *)ctx; + -+ list_for_each(it, &model->params) { -+ struct kbase_ipa_model_param *param = -+ list_entry(it, -+ struct kbase_ipa_model_param, -+ link); -+ const struct file_operations *fops = NULL; ++ WARN_ON(!ctx); ++ kbasep_hwcnt_backend_csf_if_fw_assert_lock_held(ctx); + -+ switch (param->type) { -+ case PARAM_TYPE_S32: -+ fops = &fops_s32; -+ break; -+ case PARAM_TYPE_STRING: -+ fops = &fops_string; -+ break; -+ } ++ /* Set the raw extract index to release the buffer back to the ring ++ * buffer. ++ */ ++ kbase_csf_firmware_global_input(&fw_ctx->kbdev->csf.global_iface, GLB_PRFCNT_EXTRACT, ++ extract_idx); ++} + -+ if (unlikely(!fops)) { -+ dev_err(model->kbdev->dev, -+ "Type not set for %s parameter %s\n", -+ model->ops->name, param->name); ++static void ++kbasep_hwcnt_backend_csf_if_fw_get_gpu_cycle_count(struct kbase_hwcnt_backend_csf_if_ctx *ctx, ++ u64 *cycle_counts, u64 clk_enable_map) ++{ ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx = ++ (struct kbase_hwcnt_backend_csf_if_fw_ctx *)ctx; ++ u8 clk; ++ u64 timestamp_ns = ktime_get_raw_ns(); ++ ++ WARN_ON(!ctx); ++ WARN_ON(!cycle_counts); ++ kbasep_hwcnt_backend_csf_if_fw_assert_lock_held(ctx); ++ ++ for (clk = 0; clk < fw_ctx->clk_cnt; clk++) { ++ if (!(clk_enable_map & (1ull << clk))) ++ continue; ++ ++ if (clk == KBASE_CLOCK_DOMAIN_TOP) { ++ /* Read cycle count for top clock domain. */ ++ kbase_backend_get_gpu_time_norequest(fw_ctx->kbdev, &cycle_counts[clk], ++ NULL, NULL); + } else { -+ debugfs_create_file(param->name, S_IRUGO | S_IWUSR, -+ dir, param, fops); ++ /* Estimate cycle count for non-top clock domain. */ ++ cycle_counts[clk] = ++ kbase_ccswe_cycle_at(&fw_ctx->ccswe_shader_cores, timestamp_ns); + } + } +} + -+void kbase_ipa_model_param_set_s32(struct kbase_ipa_model *model, -+ const char *name, s32 val) ++/** ++ * kbasep_hwcnt_backend_csf_if_fw_ctx_destroy() - Destroy a CSF FW interface context. ++ * ++ * @fw_ctx: Pointer to context to destroy. ++ */ ++static void ++kbasep_hwcnt_backend_csf_if_fw_ctx_destroy(struct kbase_hwcnt_backend_csf_if_fw_ctx *fw_ctx) +{ -+ struct kbase_ipa_model_param *param; ++ if (!fw_ctx) ++ return; + -+ mutex_lock(&model->kbdev->ipa.lock); ++ kfree(fw_ctx); ++} + -+ list_for_each_entry(param, &model->params, link) { -+ if (!strcmp(param->name, name)) { -+ if (param->type == PARAM_TYPE_S32) { -+ *param->addr.s32p = val; -+ } else { -+ dev_err(model->kbdev->dev, -+ "Wrong type for %s parameter %s\n", -+ model->ops->name, param->name); -+ } ++/** ++ * kbasep_hwcnt_backend_csf_if_fw_ctx_create() - Create a CSF Firmware context. ++ * ++ * @kbdev: Non_NULL pointer to kbase device. ++ * @out_ctx: Non-NULL pointer to where info is stored on success. ++ * Return: 0 on success, else error code. ++ */ ++static int ++kbasep_hwcnt_backend_csf_if_fw_ctx_create(struct kbase_device *kbdev, ++ struct kbase_hwcnt_backend_csf_if_fw_ctx **out_ctx) ++{ ++ u8 clk; ++ int errcode = -ENOMEM; ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *ctx = NULL; ++ ++ WARN_ON(!kbdev); ++ WARN_ON(!out_ctx); ++ ++ ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); ++ if (!ctx) ++ goto error; ++ ++ ctx->kbdev = kbdev; ++ ++ /* Determine the number of available clock domains. */ ++ for (clk = 0; clk < BASE_MAX_NR_CLOCKS_REGULATORS; clk++) { ++ if (kbdev->pm.clk_rtm.clks[clk] == NULL) + break; -+ } + } ++ ctx->clk_cnt = clk; + -+ mutex_unlock(&model->kbdev->ipa.lock); ++ ctx->clk_enable_map = 0; ++ kbase_ccswe_init(&ctx->ccswe_shader_cores); ++ ctx->rate_listener.notify = kbasep_hwcnt_backend_csf_if_fw_on_freq_change; ++ ++ *out_ctx = ctx; ++ ++ return 0; ++error: ++ kbasep_hwcnt_backend_csf_if_fw_ctx_destroy(ctx); ++ return errcode; +} -+KBASE_EXPORT_TEST_API(kbase_ipa_model_param_set_s32); + -+void kbase_ipa_debugfs_init(struct kbase_device *kbdev) ++void kbase_hwcnt_backend_csf_if_fw_destroy(struct kbase_hwcnt_backend_csf_if *if_fw) +{ -+ mutex_lock(&kbdev->ipa.lock); ++ if (!if_fw) ++ return; + -+ if (kbdev->ipa.configured_model != kbdev->ipa.fallback_model) -+ kbase_ipa_model_debugfs_init(kbdev->ipa.configured_model); -+ kbase_ipa_model_debugfs_init(kbdev->ipa.fallback_model); ++ kbasep_hwcnt_backend_csf_if_fw_ctx_destroy( ++ (struct kbase_hwcnt_backend_csf_if_fw_ctx *)if_fw->ctx); ++ memset(if_fw, 0, sizeof(*if_fw)); ++} + -+ debugfs_create_file("ipa_current_power", 0444, -+ kbdev->mali_debugfs_directory, kbdev, ¤t_power); -+ debugfs_create_file("ipa_force_fallback_model", 0644, -+ kbdev->mali_debugfs_directory, kbdev, &force_fallback_model); ++int kbase_hwcnt_backend_csf_if_fw_create(struct kbase_device *kbdev, ++ struct kbase_hwcnt_backend_csf_if *if_fw) ++{ ++ int errcode; ++ struct kbase_hwcnt_backend_csf_if_fw_ctx *ctx = NULL; + -+ mutex_unlock(&kbdev->ipa.lock); -+} -diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h -new file mode 100755 -index 000000000000..a983d9c14216 ++ if (!kbdev || !if_fw) ++ return -EINVAL; ++ ++ errcode = kbasep_hwcnt_backend_csf_if_fw_ctx_create(kbdev, &ctx); ++ if (errcode) ++ return errcode; ++ ++ if_fw->ctx = (struct kbase_hwcnt_backend_csf_if_ctx *)ctx; ++ if_fw->assert_lock_held = kbasep_hwcnt_backend_csf_if_fw_assert_lock_held; ++ if_fw->lock = kbasep_hwcnt_backend_csf_if_fw_lock; ++ if_fw->unlock = kbasep_hwcnt_backend_csf_if_fw_unlock; ++ if_fw->get_prfcnt_info = kbasep_hwcnt_backend_csf_if_fw_get_prfcnt_info; ++ if_fw->ring_buf_alloc = kbasep_hwcnt_backend_csf_if_fw_ring_buf_alloc; ++ if_fw->ring_buf_sync = kbasep_hwcnt_backend_csf_if_fw_ring_buf_sync; ++ if_fw->ring_buf_free = kbasep_hwcnt_backend_csf_if_fw_ring_buf_free; ++ if_fw->timestamp_ns = kbasep_hwcnt_backend_csf_if_fw_timestamp_ns; ++ if_fw->dump_enable = kbasep_hwcnt_backend_csf_if_fw_dump_enable; ++ if_fw->dump_disable = kbasep_hwcnt_backend_csf_if_fw_dump_disable; ++ if_fw->dump_request = kbasep_hwcnt_backend_csf_if_fw_dump_request; ++ if_fw->get_gpu_cycle_count = kbasep_hwcnt_backend_csf_if_fw_get_gpu_cycle_count; ++ if_fw->get_indexes = kbasep_hwcnt_backend_csf_if_fw_get_indexes; ++ if_fw->set_extract_index = kbasep_hwcnt_backend_csf_if_fw_set_extract_index; ++ ++ return 0; ++} +diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.h +new file mode 100644 +index 000000000..71d150669 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h -@@ -0,0 +1,68 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.h +@@ -0,0 +1,49 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -183835,70 +212664,51 @@ index 000000000000..a983d9c14216 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#ifndef _KBASE_IPA_DEBUGFS_H_ -+#define _KBASE_IPA_DEBUGFS_H_ -+ -+enum kbase_ipa_model_param_type { -+ PARAM_TYPE_S32 = 1, -+ PARAM_TYPE_STRING, -+}; ++/* ++ * Concrete implementation of kbase_hwcnt_backend_csf_if interface for CSF FW ++ */ + -+#ifdef CONFIG_DEBUG_FS ++#ifndef _KBASE_HWCNT_BACKEND_CSF_IF_FW_H_ ++#define _KBASE_HWCNT_BACKEND_CSF_IF_FW_H_ + -+void kbase_ipa_debugfs_init(struct kbase_device *kbdev); -+int kbase_ipa_model_param_add(struct kbase_ipa_model *model, const char *name, -+ void *addr, size_t size, -+ enum kbase_ipa_model_param_type type); -+void kbase_ipa_model_param_free_all(struct kbase_ipa_model *model); ++#include "hwcnt/backend/mali_kbase_hwcnt_backend_csf_if.h" + +/** -+ * kbase_ipa_model_param_set_s32 - Set an integer model parameter -+ * -+ * @model: pointer to IPA model -+ * @name: name of corresponding debugfs entry -+ * @val: new value of the parameter -+ * -+ * This function is only exposed for use by unit tests running in -+ * kernel space. Normally it is expected that parameter values will -+ * instead be set via debugfs. ++ * kbase_hwcnt_backend_csf_if_fw_create() - Create a firmware CSF interface ++ * of hardware counter backend. ++ * @kbdev: Non-NULL pointer to Kbase device. ++ * @if_fw: Non-NULL pointer to backend interface structure that is filled in on ++ * creation success. ++ * Return: 0 on success, else error code. + */ -+void kbase_ipa_model_param_set_s32(struct kbase_ipa_model *model, -+ const char *name, s32 val); -+ -+#else /* CONFIG_DEBUG_FS */ -+ -+static inline int kbase_ipa_model_param_add(struct kbase_ipa_model *model, -+ const char *name, void *addr, -+ size_t size, -+ enum kbase_ipa_model_param_type type) -+{ -+ return 0; -+} ++int kbase_hwcnt_backend_csf_if_fw_create(struct kbase_device *kbdev, ++ struct kbase_hwcnt_backend_csf_if *if_fw); + -+static inline void kbase_ipa_model_param_free_all(struct kbase_ipa_model *model) -+{ } -+ -+#endif /* CONFIG_DEBUG_FS */ ++/** ++ * kbase_hwcnt_backend_csf_if_fw_destroy() - Destroy a firmware CSF interface of ++ * hardware counter backend. ++ * @if_fw: Pointer to a CSF interface to destroy. ++ */ ++void kbase_hwcnt_backend_csf_if_fw_destroy(struct kbase_hwcnt_backend_csf_if *if_fw); + -+#endif /* _KBASE_IPA_DEBUGFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c -new file mode 100755 -index 000000000000..9a11ee5b1e74 ++#endif /* _KBASE_HWCNT_BACKEND_CSF_IF_FW_H_ */ +diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.c b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.c +new file mode 100644 +index 000000000..669701c29 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c -@@ -0,0 +1,356 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.c +@@ -0,0 +1,860 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2016-2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -183909,358 +212719,862 @@ index 000000000000..9a11ee5b1e74 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include -+#include -+#include -+#ifdef CONFIG_DEVFREQ_THERMAL -+#include -+#endif -+#include -+#include -+#include -+ ++#include "hwcnt/backend/mali_kbase_hwcnt_backend_jm.h" ++#include "hwcnt/mali_kbase_hwcnt_gpu.h" ++#include "hwcnt/mali_kbase_hwcnt_types.h" +#include "mali_kbase.h" -+#include "mali_kbase_defs.h" -+#include "mali_kbase_ipa_simple.h" -+#include "mali_kbase_ipa_debugfs.h" ++#include "backend/gpu/mali_kbase_pm_ca.h" ++#include "mali_kbase_hwaccess_instr.h" ++#include "mali_kbase_hwaccess_time.h" ++#include "mali_kbase_ccswe.h" ++#include "backend/gpu/mali_kbase_model_linux.h" ++#include "backend/gpu/mali_kbase_clk_rate_trace_mgr.h" + -+#if MALI_UNIT_TEST ++#include "backend/gpu/mali_kbase_pm_internal.h" + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) -+static unsigned long dummy_temp; ++/** ++ * struct kbase_hwcnt_backend_jm_info - Information used to create an instance ++ * of a JM hardware counter backend. ++ * @kbdev: KBase device. ++ * @counter_set: The performance counter set to use. ++ * @metadata: Hardware counter metadata. ++ * @dump_bytes: Bytes of GPU memory required to perform a ++ * hardware counter dump. ++ * @hwcnt_gpu_info: Hardware counter block information. ++ */ ++struct kbase_hwcnt_backend_jm_info { ++ struct kbase_device *kbdev; ++ enum kbase_hwcnt_set counter_set; ++ const struct kbase_hwcnt_metadata *metadata; ++ size_t dump_bytes; ++ struct kbase_hwcnt_gpu_info hwcnt_gpu_info; ++}; + -+static int kbase_simple_power_model_get_dummy_temp( -+ struct thermal_zone_device *tz, -+ unsigned long *temp) -+{ -+ *temp = READ_ONCE(dummy_temp); -+ return 0; -+} ++/** ++ * struct kbase_hwcnt_jm_physical_layout - HWC sample memory physical layout ++ * information. ++ * @fe_cnt: Front end block count. ++ * @tiler_cnt: Tiler block count. ++ * @mmu_l2_cnt: Memory system(MMU and L2 cache) block count. ++ * @shader_cnt: Shader Core block count. ++ * @block_cnt: Total block count (sum of all other block counts). ++ * @shader_avail_mask: Bitmap of all shader cores in the system. ++ * @enable_mask_offset: Offset in array elements of enable mask in each block ++ * starting from the beginning of block. ++ * @headers_per_block: Header size per block. ++ * @counters_per_block: Counters size per block. ++ * @values_per_block: Total size per block. ++ */ ++struct kbase_hwcnt_jm_physical_layout { ++ u8 fe_cnt; ++ u8 tiler_cnt; ++ u8 mmu_l2_cnt; ++ u8 shader_cnt; ++ u8 block_cnt; ++ u64 shader_avail_mask; ++ size_t enable_mask_offset; ++ size_t headers_per_block; ++ size_t counters_per_block; ++ size_t values_per_block; ++}; + -+#else -+static int dummy_temp; ++/** ++ * struct kbase_hwcnt_backend_jm - Instance of a JM hardware counter backend. ++ * @info: Info used to create the backend. ++ * @kctx: KBase context used for GPU memory allocation and ++ * counter dumping. ++ * @gpu_dump_va: GPU hardware counter dump buffer virtual address. ++ * @cpu_dump_va: CPU mapping of gpu_dump_va. ++ * @vmap: Dump buffer vmap. ++ * @to_user_buf: HWC sample buffer for client user, size ++ * metadata.dump_buf_bytes. ++ * @enabled: True if dumping has been enabled, else false. ++ * @pm_core_mask: PM state sync-ed shaders core mask for the enabled ++ * dumping. ++ * @curr_config: Current allocated hardware resources to correctly map the ++ * source raw dump buffer to the destination dump buffer. ++ * @clk_enable_map: The enable map specifying enabled clock domains. ++ * @cycle_count_elapsed: ++ * Cycle count elapsed for a given sample period. ++ * The top clock cycle, index 0, is read directly from ++ * hardware, but the other clock domains need to be ++ * calculated with software estimation. ++ * @prev_cycle_count: Previous cycle count to calculate the cycle count for ++ * sample period. ++ * @rate_listener: Clock rate listener callback state. ++ * @ccswe_shader_cores: Shader cores cycle count software estimator. ++ * @phys_layout: Physical memory layout information of HWC sample buffer. ++ */ ++struct kbase_hwcnt_backend_jm { ++ const struct kbase_hwcnt_backend_jm_info *info; ++ struct kbase_context *kctx; ++ u64 gpu_dump_va; ++ void *cpu_dump_va; ++ struct kbase_vmap_struct *vmap; ++ u64 *to_user_buf; ++ bool enabled; ++ u64 pm_core_mask; ++ struct kbase_hwcnt_curr_config curr_config; ++ u64 clk_enable_map; ++ u64 cycle_count_elapsed[BASE_MAX_NR_CLOCKS_REGULATORS]; ++ u64 prev_cycle_count[BASE_MAX_NR_CLOCKS_REGULATORS]; ++ struct kbase_clk_rate_listener rate_listener; ++ struct kbase_ccswe ccswe_shader_cores; ++ struct kbase_hwcnt_jm_physical_layout phys_layout; ++}; + -+static int kbase_simple_power_model_get_dummy_temp( -+ struct thermal_zone_device *tz, -+ int *temp) ++/** ++ * kbasep_hwcnt_backend_jm_gpu_info_init() - Initialise an info structure used ++ * to create the hwcnt metadata. ++ * @kbdev: Non-NULL pointer to kbase device. ++ * @info: Non-NULL pointer to data structure to be filled in. ++ * ++ * The initialised info struct will only be valid for use while kbdev is valid. ++ * ++ * Return: 0 on success, else error code. ++ */ ++static int kbasep_hwcnt_backend_jm_gpu_info_init(struct kbase_device *kbdev, ++ struct kbase_hwcnt_gpu_info *info) +{ -+ *temp = READ_ONCE(dummy_temp); ++ size_t clk; ++ ++ if (!kbdev || !info) ++ return -EINVAL; ++ ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ info->l2_count = KBASE_DUMMY_MODEL_MAX_MEMSYS_BLOCKS; ++ info->core_mask = (1ull << KBASE_DUMMY_MODEL_MAX_SHADER_CORES) - 1; ++ info->prfcnt_values_per_block = KBASE_HWCNT_V5_DEFAULT_VALUES_PER_BLOCK; ++#else /* CONFIG_MALI_BIFROST_NO_MALI */ ++ { ++ const struct base_gpu_props *props = &kbdev->gpu_props.props; ++ const size_t l2_count = props->l2_props.num_l2_slices; ++ const size_t core_mask = props->coherency_info.group[0].core_mask; ++ ++ info->l2_count = l2_count; ++ info->core_mask = core_mask; ++ info->prfcnt_values_per_block = KBASE_HWCNT_V5_DEFAULT_VALUES_PER_BLOCK; ++ } ++#endif /* CONFIG_MALI_BIFROST_NO_MALI */ ++ ++ /* Determine the number of available clock domains. */ ++ for (clk = 0; clk < BASE_MAX_NR_CLOCKS_REGULATORS; clk++) { ++ if (kbdev->pm.clk_rtm.clks[clk] == NULL) ++ break; ++ } ++ info->clk_cnt = clk; ++ + return 0; +} -+#endif + -+/* Intercept calls to the kernel function using a macro */ -+#ifdef thermal_zone_get_temp -+#undef thermal_zone_get_temp -+#endif -+#define thermal_zone_get_temp(tz, temp) \ -+ kbase_simple_power_model_get_dummy_temp(tz, temp) ++static void kbasep_hwcnt_backend_jm_init_layout(const struct kbase_hwcnt_gpu_info *gpu_info, ++ struct kbase_hwcnt_jm_physical_layout *phys_layout) ++{ ++ u8 shader_core_cnt; + -+void kbase_simple_power_model_set_dummy_temp(int temp) ++ WARN_ON(!gpu_info); ++ WARN_ON(!phys_layout); ++ ++ shader_core_cnt = fls64(gpu_info->core_mask); ++ ++ *phys_layout = (struct kbase_hwcnt_jm_physical_layout){ ++ .fe_cnt = KBASE_HWCNT_V5_FE_BLOCK_COUNT, ++ .tiler_cnt = KBASE_HWCNT_V5_TILER_BLOCK_COUNT, ++ .mmu_l2_cnt = gpu_info->l2_count, ++ .shader_cnt = shader_core_cnt, ++ .block_cnt = KBASE_HWCNT_V5_FE_BLOCK_COUNT + KBASE_HWCNT_V5_TILER_BLOCK_COUNT + ++ gpu_info->l2_count + shader_core_cnt, ++ .shader_avail_mask = gpu_info->core_mask, ++ .headers_per_block = KBASE_HWCNT_V5_HEADERS_PER_BLOCK, ++ .values_per_block = gpu_info->prfcnt_values_per_block, ++ .counters_per_block = ++ gpu_info->prfcnt_values_per_block - KBASE_HWCNT_V5_HEADERS_PER_BLOCK, ++ .enable_mask_offset = KBASE_HWCNT_V5_PRFCNT_EN_HEADER, ++ }; ++} ++ ++static void ++kbasep_hwcnt_backend_jm_dump_sample(const struct kbase_hwcnt_backend_jm *const backend_jm) +{ -+ WRITE_ONCE(dummy_temp, temp); ++ size_t block_idx; ++ const u32 *new_sample_buf = backend_jm->cpu_dump_va; ++ const u32 *new_block = new_sample_buf; ++ u64 *dst_buf = backend_jm->to_user_buf; ++ u64 *dst_block = dst_buf; ++ const size_t values_per_block = backend_jm->phys_layout.values_per_block; ++ const size_t dump_bytes = backend_jm->info->dump_bytes; ++ ++ for (block_idx = 0; block_idx < backend_jm->phys_layout.block_cnt; block_idx++) { ++ size_t ctr_idx; ++ ++ for (ctr_idx = 0; ctr_idx < values_per_block; ctr_idx++) ++ dst_block[ctr_idx] = new_block[ctr_idx]; ++ ++ new_block += values_per_block; ++ dst_block += values_per_block; ++ } ++ ++ WARN_ON(new_block != new_sample_buf + (dump_bytes / KBASE_HWCNT_VALUE_HW_BYTES)); ++ WARN_ON(dst_block != dst_buf + (dump_bytes / KBASE_HWCNT_VALUE_HW_BYTES)); +} -+KBASE_EXPORT_TEST_API(kbase_simple_power_model_set_dummy_temp); + -+#endif /* MALI_UNIT_TEST */ ++/** ++ * kbasep_hwcnt_backend_jm_on_freq_change() - On freq change callback ++ * ++ * @rate_listener: Callback state ++ * @clk_index: Clock index ++ * @clk_rate_hz: Clock frequency(hz) ++ */ ++static void kbasep_hwcnt_backend_jm_on_freq_change(struct kbase_clk_rate_listener *rate_listener, ++ u32 clk_index, u32 clk_rate_hz) ++{ ++ struct kbase_hwcnt_backend_jm *backend_jm = ++ container_of(rate_listener, struct kbase_hwcnt_backend_jm, rate_listener); ++ u64 timestamp_ns; + -+/* -+ * This model is primarily designed for the Juno platform. It may not be -+ * suitable for other platforms. The additional resources in this model -+ * should preferably be minimal, as this model is rarely used when a dynamic -+ * model is available. ++ if (clk_index != KBASE_CLOCK_DOMAIN_SHADER_CORES) ++ return; ++ ++ timestamp_ns = ktime_get_raw_ns(); ++ kbase_ccswe_freq_change(&backend_jm->ccswe_shader_cores, timestamp_ns, clk_rate_hz); ++} ++ ++/** ++ * kbasep_hwcnt_backend_jm_cc_enable() - Enable cycle count tracking ++ * ++ * @backend_jm: Non-NULL pointer to backend. ++ * @enable_map: Non-NULL pointer to enable map specifying enabled counters. ++ * @timestamp_ns: Timestamp(ns) when HWCNT were enabled. + */ ++static void kbasep_hwcnt_backend_jm_cc_enable(struct kbase_hwcnt_backend_jm *backend_jm, ++ const struct kbase_hwcnt_enable_map *enable_map, ++ u64 timestamp_ns) ++{ ++ struct kbase_device *kbdev = backend_jm->kctx->kbdev; ++ u64 clk_enable_map = enable_map->clk_enable_map; ++ u64 cycle_count; ++ ++ if (kbase_hwcnt_clk_enable_map_enabled(clk_enable_map, KBASE_CLOCK_DOMAIN_TOP)) { ++ /* turn on the cycle counter */ ++ kbase_pm_request_gpu_cycle_counter_l2_is_on(kbdev); ++ /* Read cycle count for top clock domain. */ ++ kbase_backend_get_gpu_time_norequest(kbdev, &cycle_count, NULL, NULL); ++ ++ backend_jm->prev_cycle_count[KBASE_CLOCK_DOMAIN_TOP] = cycle_count; ++ } ++ ++ if (kbase_hwcnt_clk_enable_map_enabled(clk_enable_map, KBASE_CLOCK_DOMAIN_SHADER_CORES)) { ++ /* software estimation for non-top clock domains */ ++ struct kbase_clk_rate_trace_manager *rtm = &kbdev->pm.clk_rtm; ++ const struct kbase_clk_data *clk_data = rtm->clks[KBASE_CLOCK_DOMAIN_SHADER_CORES]; ++ u32 cur_freq; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&rtm->lock, flags); ++ ++ cur_freq = (u32)clk_data->clock_val; ++ kbase_ccswe_reset(&backend_jm->ccswe_shader_cores); ++ kbase_ccswe_freq_change(&backend_jm->ccswe_shader_cores, timestamp_ns, cur_freq); ++ ++ kbase_clk_rate_trace_manager_subscribe_no_lock(rtm, &backend_jm->rate_listener); ++ ++ spin_unlock_irqrestore(&rtm->lock, flags); ++ ++ /* ccswe was reset. The estimated cycle is zero. */ ++ backend_jm->prev_cycle_count[KBASE_CLOCK_DOMAIN_SHADER_CORES] = 0; ++ } ++ ++ /* Keep clk_enable_map for dump_request. */ ++ backend_jm->clk_enable_map = clk_enable_map; ++} + +/** -+ * struct kbase_ipa_model_simple_data - IPA context per device -+ * @dynamic_coefficient: dynamic coefficient of the model -+ * @static_coefficient: static coefficient of the model -+ * @ts: Thermal scaling coefficients of the model -+ * @tz_name: Thermal zone name -+ * @gpu_tz: thermal zone device -+ * @poll_temperature_thread: Handle for temperature polling thread -+ * @current_temperature: Most recent value of polled temperature -+ * @temperature_poll_interval_ms: How often temperature should be checked, in ms ++ * kbasep_hwcnt_backend_jm_cc_disable() - Disable cycle count tracking ++ * ++ * @backend_jm: Non-NULL pointer to backend. + */ ++static void kbasep_hwcnt_backend_jm_cc_disable(struct kbase_hwcnt_backend_jm *backend_jm) ++{ ++ struct kbase_device *kbdev = backend_jm->kctx->kbdev; ++ struct kbase_clk_rate_trace_manager *rtm = &kbdev->pm.clk_rtm; ++ u64 clk_enable_map = backend_jm->clk_enable_map; + -+struct kbase_ipa_model_simple_data { -+ u32 dynamic_coefficient; -+ u32 static_coefficient; -+ s32 ts[4]; -+ char tz_name[THERMAL_NAME_LENGTH]; -+ struct thermal_zone_device *gpu_tz; -+ struct task_struct *poll_temperature_thread; -+ int current_temperature; -+ int temperature_poll_interval_ms; -+}; -+#define FALLBACK_STATIC_TEMPERATURE 55000 ++ if (kbase_hwcnt_clk_enable_map_enabled(clk_enable_map, KBASE_CLOCK_DOMAIN_TOP)) { ++ /* turn off the cycle counter */ ++ kbase_pm_release_gpu_cycle_counter(kbdev); ++ } ++ ++ if (kbase_hwcnt_clk_enable_map_enabled(clk_enable_map, KBASE_CLOCK_DOMAIN_SHADER_CORES)) { ++ kbase_clk_rate_trace_manager_unsubscribe(rtm, &backend_jm->rate_listener); ++ } ++} + +/** -+ * calculate_temp_scaling_factor() - Calculate temperature scaling coefficient -+ * @ts: Signed coefficients, in order t^0 to t^3, with units Deg^-N -+ * @t: Temperature, in mDeg C. Range: -2^17 < t < 2^17 ++ * kbasep_hwcnt_gpu_update_curr_config() - Update the destination buffer with ++ * current config information. ++ * @kbdev: Non-NULL pointer to kbase device. ++ * @curr_config: Non-NULL pointer to return the current configuration of ++ * hardware allocated to the GPU. + * -+ * Scale the temperature according to a cubic polynomial whose coefficients are -+ * provided in the device tree. The result is used to scale the static power -+ * coefficient, where 1000000 means no change. ++ * The current configuration information is used for architectures where the ++ * max_config interface is available from the Arbiter. In this case the current ++ * allocated hardware is not always the same, so the current config information ++ * is used to correctly map the current allocated resources to the memory layout ++ * that is copied to the user space. + * -+ * Return: Temperature scaling factor. Range 0 <= ret <= 10,000,000. ++ * Return: 0 on success, else error code. + */ -+static u32 calculate_temp_scaling_factor(s32 ts[4], s64 t) ++static int kbasep_hwcnt_gpu_update_curr_config(struct kbase_device *kbdev, ++ struct kbase_hwcnt_curr_config *curr_config) +{ -+ /* Range: -2^24 < t2 < 2^24 m(Deg^2) */ -+ const s64 t2 = div_s64((t * t), 1000); -+ -+ /* Range: -2^31 < t3 < 2^31 m(Deg^3) */ -+ const s64 t3 = div_s64((t * t2), 1000); ++ if (WARN_ON(!kbdev) || WARN_ON(!curr_config)) ++ return -EINVAL; + -+ /* -+ * Sum the parts. t^[1-3] are in m(Deg^N), but the coefficients are in -+ * Deg^-N, so we need to multiply the last coefficient by 1000. -+ * Range: -2^63 < res_big < 2^63 -+ */ -+ const s64 res_big = ts[3] * t3 /* +/- 2^62 */ -+ + ts[2] * t2 /* +/- 2^55 */ -+ + ts[1] * t /* +/- 2^48 */ -+ + ts[0] * (s64)1000; /* +/- 2^41 */ ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ /* Range: -2^60 < res_unclamped < 2^60 */ -+ s64 res_unclamped = div_s64(res_big, 1000); ++ curr_config->num_l2_slices = kbdev->gpu_props.curr_config.l2_slices; ++ curr_config->shader_present = kbdev->gpu_props.curr_config.shader_present; ++ return 0; ++} + -+ /* Clamp to range of 0x to 10x the static power */ -+ return clamp(res_unclamped, (s64) 0, (s64) 10000000); ++/* JM backend implementation of kbase_hwcnt_backend_timestamp_ns_fn */ ++static u64 kbasep_hwcnt_backend_jm_timestamp_ns(struct kbase_hwcnt_backend *backend) ++{ ++ (void)backend; ++ return ktime_get_raw_ns(); +} + -+/* We can't call thermal_zone_get_temp() directly in model_static_coeff(), -+ * because we don't know if tz->lock is held in the same thread. So poll it in -+ * a separate thread to get around this. */ -+static int poll_temperature(void *data) ++/* JM backend implementation of kbase_hwcnt_backend_dump_enable_nolock_fn */ ++static int ++kbasep_hwcnt_backend_jm_dump_enable_nolock(struct kbase_hwcnt_backend *backend, ++ const struct kbase_hwcnt_enable_map *enable_map) +{ -+ struct kbase_ipa_model_simple_data *model_data = -+ (struct kbase_ipa_model_simple_data *) data; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) -+ unsigned long temp; ++ int errcode; ++ struct kbase_hwcnt_backend_jm *backend_jm = (struct kbase_hwcnt_backend_jm *)backend; ++ struct kbase_context *kctx; ++ struct kbase_device *kbdev; ++ struct kbase_hwcnt_physical_enable_map phys_enable_map; ++ enum kbase_hwcnt_physical_set phys_counter_set; ++ struct kbase_instr_hwcnt_enable enable; ++ u64 timestamp_ns; ++ ++ if (!backend_jm || !enable_map || backend_jm->enabled || ++ (enable_map->metadata != backend_jm->info->metadata)) ++ return -EINVAL; ++ ++ kctx = backend_jm->kctx; ++ kbdev = backend_jm->kctx->kbdev; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ kbase_hwcnt_gpu_enable_map_to_physical(&phys_enable_map, enable_map); ++ ++ kbase_hwcnt_gpu_set_to_physical(&phys_counter_set, backend_jm->info->counter_set); ++ ++ enable.fe_bm = phys_enable_map.fe_bm; ++ enable.shader_bm = phys_enable_map.shader_bm; ++ enable.tiler_bm = phys_enable_map.tiler_bm; ++ enable.mmu_l2_bm = phys_enable_map.mmu_l2_bm; ++ enable.counter_set = phys_counter_set; ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ /* The dummy model needs the CPU mapping. */ ++ enable.dump_buffer = (uintptr_t)backend_jm->cpu_dump_va; +#else -+ int temp; -+#endif ++ enable.dump_buffer = backend_jm->gpu_dump_va; ++#endif /* CONFIG_MALI_BIFROST_NO_MALI */ ++ enable.dump_buffer_bytes = backend_jm->info->dump_bytes; + -+ set_freezable(); ++ timestamp_ns = kbasep_hwcnt_backend_jm_timestamp_ns(backend); + -+ while (!kthread_should_stop()) { -+ struct thermal_zone_device *tz = READ_ONCE(model_data->gpu_tz); ++ /* Update the current configuration information. */ ++ errcode = kbasep_hwcnt_gpu_update_curr_config(kbdev, &backend_jm->curr_config); ++ if (errcode) ++ goto error; + -+ if (tz) { -+ int ret; ++ errcode = kbase_instr_hwcnt_enable_internal(kbdev, kctx, &enable); ++ if (errcode) ++ goto error; + -+ ret = thermal_zone_get_temp(tz, &temp); -+ if (ret) { -+ pr_warn_ratelimited("Error reading temperature for gpu thermal zone: %d\n", -+ ret); -+ temp = FALLBACK_STATIC_TEMPERATURE; ++ backend_jm->pm_core_mask = kbase_pm_ca_get_instr_core_mask(kbdev); ++ ++ backend_jm->enabled = true; ++ ++ kbasep_hwcnt_backend_jm_cc_enable(backend_jm, enable_map, timestamp_ns); ++ ++ return 0; ++error: ++ return errcode; ++} ++ ++/* JM backend implementation of kbase_hwcnt_backend_dump_enable_fn */ ++static int kbasep_hwcnt_backend_jm_dump_enable(struct kbase_hwcnt_backend *backend, ++ const struct kbase_hwcnt_enable_map *enable_map) ++{ ++ unsigned long flags; ++ int errcode; ++ struct kbase_hwcnt_backend_jm *backend_jm = (struct kbase_hwcnt_backend_jm *)backend; ++ struct kbase_device *kbdev; ++ ++ if (!backend_jm) ++ return -EINVAL; ++ ++ kbdev = backend_jm->kctx->kbdev; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ++ errcode = kbasep_hwcnt_backend_jm_dump_enable_nolock(backend, enable_map); ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ return errcode; ++} ++ ++/* JM backend implementation of kbase_hwcnt_backend_dump_disable_fn */ ++static void kbasep_hwcnt_backend_jm_dump_disable(struct kbase_hwcnt_backend *backend) ++{ ++ int errcode; ++ struct kbase_hwcnt_backend_jm *backend_jm = (struct kbase_hwcnt_backend_jm *)backend; ++ ++ if (WARN_ON(!backend_jm) || !backend_jm->enabled) ++ return; ++ ++ kbasep_hwcnt_backend_jm_cc_disable(backend_jm); ++ ++ errcode = kbase_instr_hwcnt_disable_internal(backend_jm->kctx); ++ WARN_ON(errcode); ++ ++ backend_jm->enabled = false; ++} ++ ++/* JM backend implementation of kbase_hwcnt_backend_dump_clear_fn */ ++static int kbasep_hwcnt_backend_jm_dump_clear(struct kbase_hwcnt_backend *backend) ++{ ++ struct kbase_hwcnt_backend_jm *backend_jm = (struct kbase_hwcnt_backend_jm *)backend; ++ ++ if (!backend_jm || !backend_jm->enabled) ++ return -EINVAL; ++ ++ return kbase_instr_hwcnt_clear(backend_jm->kctx); ++} ++ ++/* JM backend implementation of kbase_hwcnt_backend_dump_request_fn */ ++static int kbasep_hwcnt_backend_jm_dump_request(struct kbase_hwcnt_backend *backend, ++ u64 *dump_time_ns) ++{ ++ struct kbase_hwcnt_backend_jm *backend_jm = (struct kbase_hwcnt_backend_jm *)backend; ++ struct kbase_device *kbdev; ++ const struct kbase_hwcnt_metadata *metadata; ++ u64 current_cycle_count; ++ size_t clk; ++ int ret; ++ ++ if (!backend_jm || !backend_jm->enabled || !dump_time_ns) ++ return -EINVAL; ++ ++ kbdev = backend_jm->kctx->kbdev; ++ metadata = backend_jm->info->metadata; ++ ++ /* Disable pre-emption, to make the timestamp as accurate as possible */ ++ preempt_disable(); ++ { ++ *dump_time_ns = kbasep_hwcnt_backend_jm_timestamp_ns(backend); ++ ret = kbase_instr_hwcnt_request_dump(backend_jm->kctx); ++ ++ kbase_hwcnt_metadata_for_each_clock(metadata, clk) ++ { ++ if (!kbase_hwcnt_clk_enable_map_enabled(backend_jm->clk_enable_map, clk)) ++ continue; ++ ++ if (clk == KBASE_CLOCK_DOMAIN_TOP) { ++ /* Read cycle count for top clock domain. */ ++ kbase_backend_get_gpu_time_norequest(kbdev, ¤t_cycle_count, ++ NULL, NULL); ++ } else { ++ /* ++ * Estimate cycle count for non-top clock ++ * domain. ++ */ ++ current_cycle_count = kbase_ccswe_cycle_at( ++ &backend_jm->ccswe_shader_cores, *dump_time_ns); + } -+ } else { -+ temp = FALLBACK_STATIC_TEMPERATURE; ++ backend_jm->cycle_count_elapsed[clk] = ++ current_cycle_count - backend_jm->prev_cycle_count[clk]; ++ ++ /* ++ * Keep the current cycle count for later calculation. ++ */ ++ backend_jm->prev_cycle_count[clk] = current_cycle_count; + } ++ } ++ preempt_enable(); + -+ WRITE_ONCE(model_data->current_temperature, temp); ++ return ret; ++} + -+ msleep_interruptible(READ_ONCE(model_data->temperature_poll_interval_ms)); ++/* JM backend implementation of kbase_hwcnt_backend_dump_wait_fn */ ++static int kbasep_hwcnt_backend_jm_dump_wait(struct kbase_hwcnt_backend *backend) ++{ ++ struct kbase_hwcnt_backend_jm *backend_jm = (struct kbase_hwcnt_backend_jm *)backend; + -+ try_to_freeze(); -+ } ++ if (!backend_jm || !backend_jm->enabled) ++ return -EINVAL; + -+ return 0; ++ return kbase_instr_hwcnt_wait_for_dump(backend_jm->kctx); +} + -+static int model_static_coeff(struct kbase_ipa_model *model, u32 *coeffp) ++/* JM backend implementation of kbase_hwcnt_backend_dump_get_fn */ ++static int kbasep_hwcnt_backend_jm_dump_get(struct kbase_hwcnt_backend *backend, ++ struct kbase_hwcnt_dump_buffer *dst, ++ const struct kbase_hwcnt_enable_map *dst_enable_map, ++ bool accumulate) +{ -+ u32 temp_scaling_factor; -+ struct kbase_ipa_model_simple_data *model_data = -+ (struct kbase_ipa_model_simple_data *) model->model_data; -+ u64 coeff_big; -+ int temp; ++ struct kbase_hwcnt_backend_jm *backend_jm = (struct kbase_hwcnt_backend_jm *)backend; ++ size_t clk; ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ struct kbase_device *kbdev; ++ unsigned long flags; ++ int errcode; ++#endif /* CONFIG_MALI_BIFROST_NO_MALI */ + -+ temp = READ_ONCE(model_data->current_temperature); ++ if (!backend_jm || !dst || !dst_enable_map || ++ (backend_jm->info->metadata != dst->metadata) || ++ (dst_enable_map->metadata != dst->metadata)) ++ return -EINVAL; + -+ /* Range: 0 <= temp_scaling_factor < 2^24 */ -+ temp_scaling_factor = calculate_temp_scaling_factor(model_data->ts, -+ temp); ++ /* Invalidate the kernel buffer before reading from it. */ ++ kbase_sync_mem_regions(backend_jm->kctx, backend_jm->vmap, KBASE_SYNC_TO_CPU); + -+ /* -+ * Range: 0 <= coeff_big < 2^52 to avoid overflowing *coeffp. This -+ * means static_coefficient must be in range -+ * 0 <= static_coefficient < 2^28. ++ /* Dump sample to the internal 64-bit user buffer. */ ++ kbasep_hwcnt_backend_jm_dump_sample(backend_jm); ++ ++ /* Extract elapsed cycle count for each clock domain if enabled. */ ++ kbase_hwcnt_metadata_for_each_clock(dst_enable_map->metadata, clk) ++ { ++ if (!kbase_hwcnt_clk_enable_map_enabled(dst_enable_map->clk_enable_map, clk)) ++ continue; ++ ++ /* Reset the counter to zero if accumulation is off. */ ++ if (!accumulate) ++ dst->clk_cnt_buf[clk] = 0; ++ dst->clk_cnt_buf[clk] += backend_jm->cycle_count_elapsed[clk]; ++ } ++ ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ kbdev = backend_jm->kctx->kbdev; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ++ /* Update the current configuration information. */ ++ errcode = kbasep_hwcnt_gpu_update_curr_config(kbdev, &backend_jm->curr_config); ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ if (errcode) ++ return errcode; ++#endif /* CONFIG_MALI_BIFROST_NO_MALI */ ++ return kbase_hwcnt_jm_dump_get(dst, backend_jm->to_user_buf, dst_enable_map, ++ backend_jm->pm_core_mask, &backend_jm->curr_config, ++ accumulate); ++} ++ ++/** ++ * kbasep_hwcnt_backend_jm_dump_alloc() - Allocate a GPU dump buffer. ++ * @info: Non-NULL pointer to JM backend info. ++ * @kctx: Non-NULL pointer to kbase context. ++ * @gpu_dump_va: Non-NULL pointer to where GPU dump buffer virtual address ++ * is stored on success. ++ * ++ * Return: 0 on success, else error code. ++ */ ++static int kbasep_hwcnt_backend_jm_dump_alloc(const struct kbase_hwcnt_backend_jm_info *info, ++ struct kbase_context *kctx, u64 *gpu_dump_va) ++{ ++ struct kbase_va_region *reg; ++ u64 flags; ++ u64 nr_pages; ++ ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. + */ -+ coeff_big = (u64) model_data->static_coefficient * (u64) temp_scaling_factor; -+ *coeffp = div_u64(coeff_big, 1000000); ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; ++ ++ WARN_ON(!info); ++ WARN_ON(!kctx); ++ WARN_ON(!gpu_dump_va); ++ ++ flags = BASE_MEM_PROT_CPU_RD | BASE_MEM_PROT_GPU_WR | BASEP_MEM_PERMANENT_KERNEL_MAPPING | ++ BASE_MEM_CACHED_CPU | BASE_MEM_UNCACHED_GPU; ++ ++ nr_pages = PFN_UP(info->dump_bytes); ++ ++ reg = kbase_mem_alloc(kctx, nr_pages, nr_pages, 0, &flags, gpu_dump_va, mmu_sync_info); ++ ++ if (!reg) ++ return -ENOMEM; + + return 0; +} + -+static int model_dynamic_coeff(struct kbase_ipa_model *model, u32 *coeffp) ++/** ++ * kbasep_hwcnt_backend_jm_dump_free() - Free an allocated GPU dump buffer. ++ * @kctx: Non-NULL pointer to kbase context. ++ * @gpu_dump_va: GPU dump buffer virtual address. ++ */ ++static void kbasep_hwcnt_backend_jm_dump_free(struct kbase_context *kctx, u64 gpu_dump_va) +{ -+ struct kbase_ipa_model_simple_data *model_data = -+ (struct kbase_ipa_model_simple_data *) model->model_data; ++ WARN_ON(!kctx); ++ if (gpu_dump_va) ++ kbase_mem_free(kctx, gpu_dump_va); ++} + -+ *coeffp = model_data->dynamic_coefficient; ++/** ++ * kbasep_hwcnt_backend_jm_destroy() - Destroy a JM backend. ++ * @backend: Pointer to JM backend to destroy. ++ * ++ * Can be safely called on a backend in any state of partial construction. ++ */ ++static void kbasep_hwcnt_backend_jm_destroy(struct kbase_hwcnt_backend_jm *backend) ++{ ++ if (!backend) ++ return; + -+ return 0; ++ if (backend->kctx) { ++ struct kbase_context *kctx = backend->kctx; ++ struct kbase_device *kbdev = kctx->kbdev; ++ ++ if (backend->cpu_dump_va) ++ kbase_phy_alloc_mapping_put(kctx, backend->vmap); ++ ++ if (backend->gpu_dump_va) ++ kbasep_hwcnt_backend_jm_dump_free(kctx, backend->gpu_dump_va); ++ ++ kbasep_js_release_privileged_ctx(kbdev, kctx); ++ kbase_destroy_context(kctx); ++ } ++ ++ kfree(backend->to_user_buf); ++ ++ kfree(backend); +} + -+static int add_params(struct kbase_ipa_model *model) ++/** ++ * kbasep_hwcnt_backend_jm_create() - Create a JM backend. ++ * @info: Non-NULL pointer to backend info. ++ * @out_backend: Non-NULL pointer to where backend is stored on success. ++ * ++ * Return: 0 on success, else error code. ++ */ ++static int kbasep_hwcnt_backend_jm_create(const struct kbase_hwcnt_backend_jm_info *info, ++ struct kbase_hwcnt_backend_jm **out_backend) +{ -+ int err = 0; -+ struct kbase_ipa_model_simple_data *model_data = -+ (struct kbase_ipa_model_simple_data *)model->model_data; ++ int errcode; ++ struct kbase_device *kbdev; ++ struct kbase_hwcnt_backend_jm *backend = NULL; + -+ err = kbase_ipa_model_add_param_s32(model, "static-coefficient", -+ &model_data->static_coefficient, -+ 1, true); -+ if (err) -+ goto end; ++ WARN_ON(!info); ++ WARN_ON(!out_backend); + -+ err = kbase_ipa_model_add_param_s32(model, "dynamic-coefficient", -+ &model_data->dynamic_coefficient, -+ 1, true); -+ if (err) -+ goto end; ++ kbdev = info->kbdev; + -+ err = kbase_ipa_model_add_param_s32(model, "ts", -+ model_data->ts, 4, true); -+ if (err) -+ goto end; ++ backend = kzalloc(sizeof(*backend), GFP_KERNEL); ++ if (!backend) ++ goto alloc_error; + -+ err = kbase_ipa_model_add_param_string(model, "thermal-zone", -+ model_data->tz_name, -+ sizeof(model_data->tz_name), true); -+ if (err) -+ goto end; ++ backend->info = info; ++ kbasep_hwcnt_backend_jm_init_layout(&info->hwcnt_gpu_info, &backend->phys_layout); + -+ model_data->temperature_poll_interval_ms = 200; -+ err = kbase_ipa_model_add_param_s32(model, "temp-poll-interval-ms", -+ &model_data->temperature_poll_interval_ms, -+ 1, false); ++ backend->kctx = kbase_create_context(kbdev, true, ++ BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED, 0, NULL); ++ if (!backend->kctx) ++ goto alloc_error; + -+end: -+ return err; ++ kbasep_js_schedule_privileged_ctx(kbdev, backend->kctx); ++ ++ errcode = kbasep_hwcnt_backend_jm_dump_alloc(info, backend->kctx, &backend->gpu_dump_va); ++ if (errcode) ++ goto error; ++ ++ backend->cpu_dump_va = ++ kbase_phy_alloc_mapping_get(backend->kctx, backend->gpu_dump_va, &backend->vmap); ++ if (!backend->cpu_dump_va || !backend->vmap) ++ goto alloc_error; ++ ++ backend->to_user_buf = kzalloc(info->metadata->dump_buf_bytes, GFP_KERNEL); ++ if (!backend->to_user_buf) ++ goto alloc_error; ++ ++ kbase_ccswe_init(&backend->ccswe_shader_cores); ++ backend->rate_listener.notify = kbasep_hwcnt_backend_jm_on_freq_change; ++ ++ *out_backend = backend; ++ return 0; ++ ++alloc_error: ++ errcode = -ENOMEM; ++error: ++ kbasep_hwcnt_backend_jm_destroy(backend); ++ return errcode; +} + -+static int kbase_simple_power_model_init(struct kbase_ipa_model *model) ++/* JM backend implementation of kbase_hwcnt_backend_metadata_fn */ ++static const struct kbase_hwcnt_metadata * ++kbasep_hwcnt_backend_jm_metadata(const struct kbase_hwcnt_backend_info *info) +{ -+ int err; -+ struct kbase_ipa_model_simple_data *model_data; ++ if (!info) ++ return NULL; + -+ model_data = kzalloc(sizeof(struct kbase_ipa_model_simple_data), -+ GFP_KERNEL); -+ if (!model_data) -+ return -ENOMEM; ++ return ((const struct kbase_hwcnt_backend_jm_info *)info)->metadata; ++} + -+ model->model_data = (void *) model_data; ++/* JM backend implementation of kbase_hwcnt_backend_init_fn */ ++static int kbasep_hwcnt_backend_jm_init(const struct kbase_hwcnt_backend_info *info, ++ struct kbase_hwcnt_backend **out_backend) ++{ ++ int errcode; ++ struct kbase_hwcnt_backend_jm *backend = NULL; + -+ model_data->current_temperature = FALLBACK_STATIC_TEMPERATURE; -+ model_data->poll_temperature_thread = kthread_run(poll_temperature, -+ (void *) model_data, -+ "mali-simple-power-model-temp-poll"); -+ if (IS_ERR(model_data->poll_temperature_thread)) { -+ err = PTR_ERR(model_data->poll_temperature_thread); -+ kfree(model_data); -+ return err; -+ } ++ if (!info || !out_backend) ++ return -EINVAL; + -+ err = add_params(model); -+ if (err) { -+ kbase_ipa_model_param_free_all(model); -+ kthread_stop(model_data->poll_temperature_thread); -+ kfree(model_data); -+ } ++ errcode = kbasep_hwcnt_backend_jm_create((const struct kbase_hwcnt_backend_jm_info *)info, ++ &backend); ++ if (errcode) ++ return errcode; + -+ return err; ++ *out_backend = (struct kbase_hwcnt_backend *)backend; ++ ++ return 0; +} + -+static int kbase_simple_power_model_recalculate(struct kbase_ipa_model *model) ++/* JM backend implementation of kbase_hwcnt_backend_term_fn */ ++static void kbasep_hwcnt_backend_jm_term(struct kbase_hwcnt_backend *backend) +{ -+ struct kbase_ipa_model_simple_data *model_data = -+ (struct kbase_ipa_model_simple_data *)model->model_data; -+ struct thermal_zone_device *tz; ++ if (!backend) ++ return; + -+ lockdep_assert_held(&model->kbdev->ipa.lock); ++ kbasep_hwcnt_backend_jm_dump_disable(backend); ++ kbasep_hwcnt_backend_jm_destroy((struct kbase_hwcnt_backend_jm *)backend); ++} + -+ if (!strnlen(model_data->tz_name, sizeof(model_data->tz_name))) { -+ model_data->gpu_tz = NULL; -+ } else { -+ char tz_name[THERMAL_NAME_LENGTH]; ++/** ++ * kbasep_hwcnt_backend_jm_info_destroy() - Destroy a JM backend info. ++ * @info: Pointer to info to destroy. ++ * ++ * Can be safely called on a backend info in any state of partial construction. ++ */ ++static void kbasep_hwcnt_backend_jm_info_destroy(const struct kbase_hwcnt_backend_jm_info *info) ++{ ++ if (!info) ++ return; + -+ strlcpy(tz_name, model_data->tz_name, sizeof(tz_name)); ++ kbase_hwcnt_jm_metadata_destroy(info->metadata); ++ kfree(info); ++} + -+ /* Release ipa.lock so that thermal_list_lock is not acquired -+ * with ipa.lock held, thereby avoid lock ordering violation -+ * lockdep warning. The warning comes as a chain of locks -+ * ipa.lock --> thermal_list_lock --> tz->lock gets formed -+ * on registering devfreq cooling device when probe method -+ * of mali platform driver is invoked. -+ */ -+ mutex_unlock(&model->kbdev->ipa.lock); -+ tz = thermal_zone_get_zone_by_name(tz_name); -+ mutex_lock(&model->kbdev->ipa.lock); ++/** ++ * kbasep_hwcnt_backend_jm_info_create() - Create a JM backend info. ++ * @kbdev: Non_NULL pointer to kbase device. ++ * @out_info: Non-NULL pointer to where info is stored on success. ++ * ++ * Return: 0 on success, else error code. ++ */ ++static int kbasep_hwcnt_backend_jm_info_create(struct kbase_device *kbdev, ++ const struct kbase_hwcnt_backend_jm_info **out_info) ++{ ++ int errcode = -ENOMEM; ++ struct kbase_hwcnt_backend_jm_info *info = NULL; + -+ if (IS_ERR_OR_NULL(tz)) { -+ pr_warn_ratelimited("Error %ld getting thermal zone \'%s\', not yet ready?\n", -+ PTR_ERR(tz), tz_name); -+ return -EPROBE_DEFER; -+ } ++ WARN_ON(!kbdev); ++ WARN_ON(!out_info); + -+ /* Check if another thread raced against us & updated the -+ * thermal zone name string. Update the gpu_tz pointer only if -+ * the name string did not change whilst we retrieved the new -+ * thermal_zone_device pointer, otherwise model_data->tz_name & -+ * model_data->gpu_tz would become inconsistent with each other. -+ * The below check will succeed only for the thread which last -+ * updated the name string. -+ */ -+ if (strncmp(tz_name, model_data->tz_name, sizeof(tz_name)) == 0) -+ model_data->gpu_tz = tz; -+ } ++ info = kzalloc(sizeof(*info), GFP_KERNEL); ++ if (!info) ++ return errcode; ++ ++ info->kbdev = kbdev; ++ ++#ifdef CONFIG_MALI_BIFROST_PRFCNT_SET_SECONDARY ++ info->counter_set = KBASE_HWCNT_SET_SECONDARY; ++#elif defined(CONFIG_MALI_PRFCNT_SET_TERTIARY) ++ info->counter_set = KBASE_HWCNT_SET_TERTIARY; ++#else ++ /* Default to primary */ ++ info->counter_set = KBASE_HWCNT_SET_PRIMARY; ++#endif ++ ++ errcode = kbasep_hwcnt_backend_jm_gpu_info_init(kbdev, &info->hwcnt_gpu_info); ++ if (errcode) ++ goto error; ++ ++ errcode = kbase_hwcnt_jm_metadata_create(&info->hwcnt_gpu_info, info->counter_set, ++ &info->metadata, &info->dump_bytes); ++ if (errcode) ++ goto error; ++ ++ *out_info = info; + + return 0; ++error: ++ kbasep_hwcnt_backend_jm_info_destroy(info); ++ return errcode; +} + -+static void kbase_simple_power_model_term(struct kbase_ipa_model *model) ++int kbase_hwcnt_backend_jm_create(struct kbase_device *kbdev, ++ struct kbase_hwcnt_backend_interface *iface) +{ -+ struct kbase_ipa_model_simple_data *model_data = -+ (struct kbase_ipa_model_simple_data *)model->model_data; ++ int errcode; ++ const struct kbase_hwcnt_backend_jm_info *info = NULL; + -+ kthread_stop(model_data->poll_temperature_thread); ++ if (!kbdev || !iface) ++ return -EINVAL; + -+ kfree(model_data); ++ errcode = kbasep_hwcnt_backend_jm_info_create(kbdev, &info); ++ ++ if (errcode) ++ return errcode; ++ ++ iface->info = (struct kbase_hwcnt_backend_info *)info; ++ iface->metadata = kbasep_hwcnt_backend_jm_metadata; ++ iface->init = kbasep_hwcnt_backend_jm_init; ++ iface->term = kbasep_hwcnt_backend_jm_term; ++ iface->timestamp_ns = kbasep_hwcnt_backend_jm_timestamp_ns; ++ iface->dump_enable = kbasep_hwcnt_backend_jm_dump_enable; ++ iface->dump_enable_nolock = kbasep_hwcnt_backend_jm_dump_enable_nolock; ++ iface->dump_disable = kbasep_hwcnt_backend_jm_dump_disable; ++ iface->dump_clear = kbasep_hwcnt_backend_jm_dump_clear; ++ iface->dump_request = kbasep_hwcnt_backend_jm_dump_request; ++ iface->dump_wait = kbasep_hwcnt_backend_jm_dump_wait; ++ iface->dump_get = kbasep_hwcnt_backend_jm_dump_get; ++ ++ return 0; +} + -+struct kbase_ipa_model_ops kbase_simple_ipa_model_ops = { -+ .name = "mali-simple-power-model", -+ .init = &kbase_simple_power_model_init, -+ .recalculate = &kbase_simple_power_model_recalculate, -+ .term = &kbase_simple_power_model_term, -+ .get_dynamic_coeff = &model_dynamic_coeff, -+ .get_static_coeff = &model_static_coeff, -+}; -+KBASE_EXPORT_TEST_API(kbase_simple_ipa_model_ops); -diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h -new file mode 100755 -index 000000000000..84534e07ec55 ++void kbase_hwcnt_backend_jm_destroy(struct kbase_hwcnt_backend_interface *iface) ++{ ++ if (!iface) ++ return; ++ ++ kbasep_hwcnt_backend_jm_info_destroy( ++ (const struct kbase_hwcnt_backend_jm_info *)iface->info); ++ memset(iface, 0, sizeof(*iface)); ++} +diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.h +new file mode 100644 +index 000000000..4a6293c25 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h -@@ -0,0 +1,45 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.h +@@ -0,0 +1,58 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -184271,47 +213585,60 @@ index 000000000000..84534e07ec55 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#ifndef _KBASE_IPA_SIMPLE_H_ -+#define _KBASE_IPA_SIMPLE_H_ ++/* ++ * Concrete implementation of mali_kbase_hwcnt_backend interface for JM ++ * backend. ++ */ + -+#if defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) ++#ifndef _KBASE_HWCNT_BACKEND_JM_H_ ++#define _KBASE_HWCNT_BACKEND_JM_H_ + -+extern struct kbase_ipa_model_ops kbase_simple_ipa_model_ops; ++#include "hwcnt/backend/mali_kbase_hwcnt_backend.h" ++ ++struct kbase_device; + -+#if MALI_UNIT_TEST +/** -+ * kbase_simple_power_model_set_dummy_temp() - set a dummy temperature value -+ * @temp: Temperature of the thermal zone, in millidegrees celsius. ++ * kbase_hwcnt_backend_jm_create() - Create a JM hardware counter backend ++ * interface. ++ * @kbdev: Non-NULL pointer to kbase device. ++ * @iface: Non-NULL pointer to backend interface structure that is filled in ++ * on creation success. + * -+ * This is only intended for use in unit tests, to ensure that the temperature -+ * values used by the simple power model are predictable. Deterministic -+ * behavior is necessary to allow validation of the static power values -+ * computed by this model. ++ * Calls to iface->dump_enable_nolock() require kbdev->hwaccess_lock held. ++ * ++ * Return: 0 on success, else error code. + */ -+void kbase_simple_power_model_set_dummy_temp(int temp); -+#endif /* MALI_UNIT_TEST */ ++int kbase_hwcnt_backend_jm_create(struct kbase_device *kbdev, ++ struct kbase_hwcnt_backend_interface *iface); + -+#endif /* (defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL)) */ ++/** ++ * kbase_hwcnt_backend_jm_destroy() - Destroy a JM hardware counter backend ++ * interface. ++ * @iface: Pointer to interface to destroy. ++ * ++ * Can be safely called on an all-zeroed interface, or on an already destroyed ++ * interface. ++ */ ++void kbase_hwcnt_backend_jm_destroy(struct kbase_hwcnt_backend_interface *iface); + -+#endif /* _KBASE_IPA_SIMPLE_H_ */ -diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_common.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_common.c -new file mode 100755 -index 000000000000..702db1623101 ++#endif /* _KBASE_HWCNT_BACKEND_JM_H_ */ +diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.c b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.c +new file mode 100644 +index 000000000..564700b2d --- /dev/null -+++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_common.c -@@ -0,0 +1,349 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.c +@@ -0,0 +1,829 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2017-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -184322,351 +213649,831 @@ index 000000000000..702db1623101 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include "mali_kbase_ipa_vinstr_common.h" -+#include "mali_kbase_ipa_debugfs.h" ++#include + -+#define DEFAULT_SCALING_FACTOR 5 ++#include ++#include ++ ++#include ++#include ++#include ++ ++#if IS_ENABLED(CONFIG_MALI_IS_FPGA) && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++/* Backend watch dog timer interval in milliseconds: 18 seconds. */ ++static const u32 hwcnt_backend_watchdog_timer_interval_ms = 18000; ++#else ++/* Backend watch dog timer interval in milliseconds: 1 second. */ ++static const u32 hwcnt_backend_watchdog_timer_interval_ms = 1000; ++#endif /* IS_FPGA && !NO_MALI */ ++ ++/* ++ * IDLE_BUFFER_EMPTY -> USER_DUMPING_BUFFER_EMPTY on dump_request. ++ * IDLE_BUFFER_EMPTY -> TIMER_DUMPING after ++ * hwcnt_backend_watchdog_timer_interval_ms ++ * milliseconds, if no dump_request has been ++ * called in the meantime. ++ * IDLE_BUFFER_FULL -> USER_DUMPING_BUFFER_FULL on dump_request. ++ * IDLE_BUFFER_FULL -> TIMER_DUMPING after ++ * hwcnt_backend_watchdog_timer_interval_ms ++ * milliseconds, if no dump_request has been ++ * called in the meantime. ++ * IDLE_BUFFER_FULL -> IDLE_BUFFER_EMPTY on dump_disable, upon discarding undumped ++ * counter values since the last dump_get. ++ * IDLE_BUFFER_EMPTY -> BUFFER_CLEARING on dump_clear, before calling job manager ++ * backend dump_clear. ++ * IDLE_BUFFER_FULL -> BUFFER_CLEARING on dump_clear, before calling job manager ++ * backend dump_clear. ++ * USER_DUMPING_BUFFER_EMPTY -> BUFFER_CLEARING on dump_clear, before calling job manager ++ * backend dump_clear. ++ * USER_DUMPING_BUFFER_FULL -> BUFFER_CLEARING on dump_clear, before calling job manager ++ * backend dump_clear. ++ * BUFFER_CLEARING -> IDLE_BUFFER_EMPTY on dump_clear, upon job manager backend ++ * dump_clear completion. ++ * TIMER_DUMPING -> IDLE_BUFFER_FULL on timer's callback completion. ++ * TIMER_DUMPING -> TIMER_DUMPING_USER_CLEAR on dump_clear, notifies the callback thread ++ * that there is no need for dumping the buffer ++ * anymore, and that the client will proceed ++ * clearing the buffer. ++ * TIMER_DUMPING_USER_CLEAR -> IDLE_BUFFER_EMPTY on timer's callback completion, when a user ++ * requested a dump_clear. ++ * TIMER_DUMPING -> TIMER_DUMPING_USER_REQUESTED on dump_request, when a client performs a ++ * dump request while the timer is dumping (the ++ * timer will perform the dump and (once ++ * completed) the client will retrieve the value ++ * from the buffer). ++ * TIMER_DUMPING_USER_REQUESTED -> IDLE_BUFFER_EMPTY on dump_get, when a timer completed and the ++ * user reads the periodic dump buffer. ++ * Any -> ERROR if the job manager backend returns an error ++ * (of any kind). ++ * USER_DUMPING_BUFFER_EMPTY -> IDLE_BUFFER_EMPTY on dump_get (performs get, ignores the ++ * periodic dump buffer and returns). ++ * USER_DUMPING_BUFFER_FULL -> IDLE_BUFFER_EMPTY on dump_get (performs get, accumulates with ++ * periodic dump buffer and returns). ++ */ ++ ++/** enum backend_watchdog_state State used to synchronize timer callbacks with the main thread. ++ * @HWCNT_JM_WD_ERROR: Received an error from the job manager backend calls. ++ * @HWCNT_JM_WD_IDLE_BUFFER_EMPTY: Initial state. Watchdog timer enabled, periodic dump buffer is ++ * empty. ++ * @HWCNT_JM_WD_IDLE_BUFFER_FULL: Watchdog timer enabled, periodic dump buffer is full. ++ * @HWCNT_JM_WD_BUFFER_CLEARING: The client is performing a dump clear. A concurrent timer callback ++ * thread should just ignore and reschedule another callback in ++ * hwcnt_backend_watchdog_timer_interval_ms milliseconds. ++ * @HWCNT_JM_WD_TIMER_DUMPING: The timer ran out. The callback is performing a periodic dump. ++ * @HWCNT_JM_WD_TIMER_DUMPING_USER_REQUESTED: While the timer is performing a periodic dump, user ++ * requested a dump. ++ * @HWCNT_JM_WD_TIMER_DUMPING_USER_CLEAR: While the timer is performing a dump, user requested a ++ * dump_clear. The timer has to complete the periodic dump ++ * and clear buffer (internal and job manager backend). ++ * @HWCNT_JM_WD_USER_DUMPING_BUFFER_EMPTY: From IDLE state, user requested a dump. The periodic ++ * dump buffer is empty. ++ * @HWCNT_JM_WD_USER_DUMPING_BUFFER_FULL: From IDLE state, user requested a dump. The periodic dump ++ * buffer is full. ++ * ++ * While the state machine is in HWCNT_JM_WD_TIMER_DUMPING*, only the timer callback thread is ++ * allowed to call the job manager backend layer. ++ */ ++enum backend_watchdog_state { ++ HWCNT_JM_WD_ERROR, ++ HWCNT_JM_WD_IDLE_BUFFER_EMPTY, ++ HWCNT_JM_WD_IDLE_BUFFER_FULL, ++ HWCNT_JM_WD_BUFFER_CLEARING, ++ HWCNT_JM_WD_TIMER_DUMPING, ++ HWCNT_JM_WD_TIMER_DUMPING_USER_REQUESTED, ++ HWCNT_JM_WD_TIMER_DUMPING_USER_CLEAR, ++ HWCNT_JM_WD_USER_DUMPING_BUFFER_EMPTY, ++ HWCNT_JM_WD_USER_DUMPING_BUFFER_FULL, ++}; ++ ++/** enum wd_init_state - State machine for initialization / termination of the backend resources ++ */ ++enum wd_init_state { ++ HWCNT_JM_WD_INIT_START, ++ HWCNT_JM_WD_INIT_BACKEND = HWCNT_JM_WD_INIT_START, ++ HWCNT_JM_WD_INIT_ENABLE_MAP, ++ HWCNT_JM_WD_INIT_DUMP_BUFFER, ++ HWCNT_JM_WD_INIT_END ++}; ++ ++/** ++ * struct kbase_hwcnt_backend_jm_watchdog_info - Immutable information used to initialize an ++ * instance of the job manager watchdog backend. ++ * @jm_backend_iface: Hardware counter backend interface. This module extends ++ * this interface with a watchdog that performs regular ++ * dumps. The new interface this module provides complies ++ * with the old backend interface. ++ * @dump_watchdog_iface: Dump watchdog interface, used to periodically dump the ++ * hardware counter in case no reads are requested within ++ * a certain time, used to avoid hardware counter's buffer ++ * saturation. ++ */ ++struct kbase_hwcnt_backend_jm_watchdog_info { ++ struct kbase_hwcnt_backend_interface *jm_backend_iface; ++ struct kbase_hwcnt_watchdog_interface *dump_watchdog_iface; ++}; ++ ++/** ++ * struct kbase_hwcnt_backend_jm_watchdog - An instance of the job manager watchdog backend. ++ * @info: Immutable information used to create the job manager watchdog backend. ++ * @jm_backend: Job manager's backend internal state. To be passed as argument during parent calls. ++ * @timeout_ms: Time period in milliseconds for hardware counters dumping. ++ * @wd_dump_buffer: Used to store periodic dumps done by a timer callback function. Contents are ++ * valid in state %HWCNT_JM_WD_TIMER_DUMPING_USER_REQUESTED, ++ * %HWCNT_JM_WD_IDLE_BUFFER_FULL or %HWCNT_JM_WD_USER_DUMPING_BUFFER_FULL. ++ * @wd_enable_map: Watchdog backend internal buffer mask, initialized during dump_enable copying ++ * the enable_map passed as argument. ++ * @wd_dump_timestamp: Holds the dumping timestamp for potential future client dump_request, filled ++ * during watchdog timer dumps. ++ * @watchdog_complete: Used for synchronization between watchdog dumper thread and client calls. ++ * @locked: Members protected from concurrent access by different threads. ++ * @locked.watchdog_lock: Lock used to access fields within this struct (that require mutual ++ * exclusion). ++ * @locked.is_enabled: If true then the wrapped job manager hardware counter backend and the ++ * watchdog timer are both enabled. If false then both are disabled (or soon ++ * will be). Races between enable and disable have undefined behavior. ++ * @locked.state: State used to synchronize timer callbacks with the main thread. ++ */ ++struct kbase_hwcnt_backend_jm_watchdog { ++ const struct kbase_hwcnt_backend_jm_watchdog_info *info; ++ struct kbase_hwcnt_backend *jm_backend; ++ u32 timeout_ms; ++ struct kbase_hwcnt_dump_buffer wd_dump_buffer; ++ struct kbase_hwcnt_enable_map wd_enable_map; ++ u64 wd_dump_timestamp; ++ struct completion watchdog_complete; ++ struct { ++ spinlock_t watchdog_lock; ++ bool is_enabled; ++ enum backend_watchdog_state state; ++ } locked; ++}; + -+/* If the value of GPU_ACTIVE is below this, use the simple model -+ * instead, to avoid extrapolating small amounts of counter data across -+ * large sample periods. -+ */ -+#define DEFAULT_MIN_SAMPLE_CYCLES 10000 ++/* timer's callback function */ ++static void kbasep_hwcnt_backend_jm_watchdog_timer_callback(void *backend) ++{ ++ struct kbase_hwcnt_backend_jm_watchdog *wd_backend = backend; ++ unsigned long flags; ++ bool wd_accumulate; + -+/** -+ * read_hwcnt() - read a counter value -+ * @model_data: pointer to model data -+ * @offset: offset, in bytes, into vinstr buffer -+ * -+ * Return: A 32-bit counter value. Range: 0 < value < 2^27 (worst case would be -+ * incrementing every cycle over a ~100ms sample period at a high frequency, -+ * e.g. 1 GHz: 2^30 * 0.1seconds ~= 2^27. -+ */ -+static inline u32 kbase_ipa_read_hwcnt( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ u32 offset) ++ spin_lock_irqsave(&wd_backend->locked.watchdog_lock, flags); ++ ++ if (!wd_backend->locked.is_enabled || wd_backend->locked.state == HWCNT_JM_WD_ERROR) { ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ return; ++ } ++ ++ if (!(wd_backend->locked.state == HWCNT_JM_WD_IDLE_BUFFER_EMPTY || ++ wd_backend->locked.state == HWCNT_JM_WD_IDLE_BUFFER_FULL)) { ++ /*resetting the timer. Calling modify on a disabled timer enables it.*/ ++ wd_backend->info->dump_watchdog_iface->modify( ++ wd_backend->info->dump_watchdog_iface->timer, wd_backend->timeout_ms); ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ return; ++ } ++ /*start performing the dump*/ ++ ++ /* if there has been a previous timeout use accumulating dump_get() ++ * otherwise use non-accumulating to overwrite buffer ++ */ ++ wd_accumulate = (wd_backend->locked.state == HWCNT_JM_WD_IDLE_BUFFER_FULL); ++ ++ wd_backend->locked.state = HWCNT_JM_WD_TIMER_DUMPING; ++ ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ ++ if (wd_backend->info->jm_backend_iface->dump_request(wd_backend->jm_backend, ++ &wd_backend->wd_dump_timestamp) || ++ wd_backend->info->jm_backend_iface->dump_wait(wd_backend->jm_backend) || ++ wd_backend->info->jm_backend_iface->dump_get( ++ wd_backend->jm_backend, &wd_backend->wd_dump_buffer, &wd_backend->wd_enable_map, ++ wd_accumulate)) { ++ spin_lock_irqsave(&wd_backend->locked.watchdog_lock, flags); ++ WARN_ON(wd_backend->locked.state != HWCNT_JM_WD_TIMER_DUMPING && ++ wd_backend->locked.state != HWCNT_JM_WD_TIMER_DUMPING_USER_CLEAR && ++ wd_backend->locked.state != HWCNT_JM_WD_TIMER_DUMPING_USER_REQUESTED); ++ wd_backend->locked.state = HWCNT_JM_WD_ERROR; ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ /* Unblock user if it's waiting. */ ++ complete_all(&wd_backend->watchdog_complete); ++ return; ++ } ++ ++ spin_lock_irqsave(&wd_backend->locked.watchdog_lock, flags); ++ WARN_ON(wd_backend->locked.state != HWCNT_JM_WD_TIMER_DUMPING && ++ wd_backend->locked.state != HWCNT_JM_WD_TIMER_DUMPING_USER_CLEAR && ++ wd_backend->locked.state != HWCNT_JM_WD_TIMER_DUMPING_USER_REQUESTED); ++ ++ if (wd_backend->locked.state == HWCNT_JM_WD_TIMER_DUMPING) { ++ /* If there is no user request/clear, transit to HWCNT_JM_WD_IDLE_BUFFER_FULL ++ * to indicate timer dump is done and the buffer is full. If state changed to ++ * HWCNT_JM_WD_TIMER_DUMPING_USER_REQUESTED or ++ * HWCNT_JM_WD_TIMER_DUMPING_USER_CLEAR then user will transit the state ++ * machine to next state. ++ */ ++ wd_backend->locked.state = HWCNT_JM_WD_IDLE_BUFFER_FULL; ++ } ++ if (wd_backend->locked.state != HWCNT_JM_WD_ERROR && wd_backend->locked.is_enabled) { ++ /* reset the timer to schedule another callback. Calling modify on a ++ * disabled timer enables it. ++ */ ++ /*The spin lock needs to be held in case the client calls dump_enable*/ ++ wd_backend->info->dump_watchdog_iface->modify( ++ wd_backend->info->dump_watchdog_iface->timer, wd_backend->timeout_ms); ++ } ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ ++ /* Unblock user if it's waiting. */ ++ complete_all(&wd_backend->watchdog_complete); ++} ++ ++/* helper methods, info structure creation and destruction*/ ++ ++static struct kbase_hwcnt_backend_jm_watchdog_info * ++kbasep_hwcnt_backend_jm_watchdog_info_create(struct kbase_hwcnt_backend_interface *backend_iface, ++ struct kbase_hwcnt_watchdog_interface *watchdog_iface) +{ -+ u8 *p = (u8 *)model_data->dump_buf.dump_buf; ++ struct kbase_hwcnt_backend_jm_watchdog_info *const info = ++ kmalloc(sizeof(*info), GFP_KERNEL); + -+ return *(u32 *)&p[offset]; ++ if (!info) ++ return NULL; ++ ++ *info = (struct kbase_hwcnt_backend_jm_watchdog_info){ .jm_backend_iface = backend_iface, ++ .dump_watchdog_iface = ++ watchdog_iface }; ++ ++ return info; +} + -+static inline s64 kbase_ipa_add_saturate(s64 a, s64 b) ++/****** kbase_hwcnt_backend_interface implementation *******/ ++ ++/* Job manager watchdog backend, implementation of kbase_hwcnt_backend_metadata_fn */ ++static const struct kbase_hwcnt_metadata * ++kbasep_hwcnt_backend_jm_watchdog_metadata(const struct kbase_hwcnt_backend_info *info) +{ -+ s64 rtn; ++ const struct kbase_hwcnt_backend_jm_watchdog_info *wd_info = (void *)info; + -+ if (a > 0 && (S64_MAX - a) < b) -+ rtn = S64_MAX; -+ else if (a < 0 && (S64_MIN - a) > b) -+ rtn = S64_MIN; -+ else -+ rtn = a + b; ++ if (WARN_ON(!info)) ++ return NULL; + -+ return rtn; ++ return wd_info->jm_backend_iface->metadata(wd_info->jm_backend_iface->info); +} + -+s64 kbase_ipa_sum_all_shader_cores( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ s32 coeff, u32 counter) ++static void ++kbasep_hwcnt_backend_jm_watchdog_term_partial(struct kbase_hwcnt_backend_jm_watchdog *wd_backend, ++ enum wd_init_state state) +{ -+ struct kbase_device *kbdev = model_data->kbdev; -+ u64 core_mask; -+ u32 base = 0; -+ s64 ret = 0; ++ if (!wd_backend) ++ return; + -+ core_mask = kbdev->gpu_props.props.coherency_info.group[0].core_mask; -+ while (core_mask != 0ull) { -+ if ((core_mask & 1ull) != 0ull) { -+ /* 0 < counter_value < 2^27 */ -+ u32 counter_value = kbase_ipa_read_hwcnt(model_data, -+ base + counter); ++ WARN_ON(state > HWCNT_JM_WD_INIT_END); + -+ /* 0 < ret < 2^27 * max_num_cores = 2^32 */ -+ ret = kbase_ipa_add_saturate(ret, counter_value); ++ while (state-- > HWCNT_JM_WD_INIT_START) { ++ switch (state) { ++ case HWCNT_JM_WD_INIT_BACKEND: ++ wd_backend->info->jm_backend_iface->term(wd_backend->jm_backend); ++ break; ++ case HWCNT_JM_WD_INIT_ENABLE_MAP: ++ kbase_hwcnt_enable_map_free(&wd_backend->wd_enable_map); ++ break; ++ case HWCNT_JM_WD_INIT_DUMP_BUFFER: ++ kbase_hwcnt_dump_buffer_free(&wd_backend->wd_dump_buffer); ++ break; ++ case HWCNT_JM_WD_INIT_END: ++ break; + } -+ base += KBASE_IPA_NR_BYTES_PER_BLOCK; -+ core_mask >>= 1; + } + -+ /* Range: -2^54 < ret * coeff < 2^54 */ -+ return ret * coeff; ++ kfree(wd_backend); +} + -+s64 kbase_ipa_sum_all_memsys_blocks( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ s32 coeff, u32 counter) ++/* Job manager watchdog backend, implementation of kbase_hwcnt_backend_term_fn ++ * Calling term does *not* destroy the interface ++ */ ++static void kbasep_hwcnt_backend_jm_watchdog_term(struct kbase_hwcnt_backend *backend) +{ -+ struct kbase_device *kbdev = model_data->kbdev; -+ const u32 num_blocks = kbdev->gpu_props.props.l2_props.num_l2_slices; -+ u32 base = 0; -+ s64 ret = 0; -+ u32 i; ++ struct kbase_hwcnt_backend_jm_watchdog *wd_backend = ++ (struct kbase_hwcnt_backend_jm_watchdog *)backend; + -+ for (i = 0; i < num_blocks; i++) { -+ /* 0 < counter_value < 2^27 */ -+ u32 counter_value = kbase_ipa_read_hwcnt(model_data, -+ base + counter); ++ if (!backend) ++ return; + -+ /* 0 < ret < 2^27 * max_num_memsys_blocks = 2^29 */ -+ ret = kbase_ipa_add_saturate(ret, counter_value); -+ base += KBASE_IPA_NR_BYTES_PER_BLOCK; -+ } ++ /* disable timer thread to avoid concurrent access to shared resources */ ++ wd_backend->info->dump_watchdog_iface->disable( ++ wd_backend->info->dump_watchdog_iface->timer); + -+ /* Range: -2^51 < ret * coeff < 2^51 */ -+ return ret * coeff; ++ kbasep_hwcnt_backend_jm_watchdog_term_partial(wd_backend, HWCNT_JM_WD_INIT_END); +} + -+s64 kbase_ipa_single_counter( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ s32 coeff, u32 counter) ++/* Job manager watchdog backend, implementation of kbase_hwcnt_backend_init_fn */ ++static int kbasep_hwcnt_backend_jm_watchdog_init(const struct kbase_hwcnt_backend_info *info, ++ struct kbase_hwcnt_backend **out_backend) +{ -+ /* Range: 0 < counter_value < 2^27 */ -+ const u32 counter_value = kbase_ipa_read_hwcnt(model_data, counter); ++ int errcode = 0; ++ struct kbase_hwcnt_backend_jm_watchdog *wd_backend = NULL; ++ struct kbase_hwcnt_backend_jm_watchdog_info *const wd_info = (void *)info; ++ const struct kbase_hwcnt_backend_info *jm_info; ++ const struct kbase_hwcnt_metadata *metadata; ++ enum wd_init_state state = HWCNT_JM_WD_INIT_START; + -+ /* Range: -2^49 < ret < 2^49 */ -+ return counter_value * (s64) coeff; -+} ++ if (WARN_ON(!info) || WARN_ON(!out_backend)) ++ return -EINVAL; + -+int kbase_ipa_attach_vinstr(struct kbase_ipa_model_vinstr_data *model_data) -+{ -+ int errcode; -+ struct kbase_device *kbdev = model_data->kbdev; -+ struct kbase_hwcnt_virtualizer *hvirt = kbdev->hwcnt_gpu_virt; -+ struct kbase_hwcnt_enable_map enable_map; -+ const struct kbase_hwcnt_metadata *metadata = -+ kbase_hwcnt_virtualizer_metadata(hvirt); ++ jm_info = wd_info->jm_backend_iface->info; ++ metadata = wd_info->jm_backend_iface->metadata(wd_info->jm_backend_iface->info); + -+ if (!metadata) -+ return -1; ++ wd_backend = kmalloc(sizeof(*wd_backend), GFP_KERNEL); ++ if (!wd_backend) { ++ *out_backend = NULL; ++ return -ENOMEM; ++ } ++ ++ *wd_backend = (struct kbase_hwcnt_backend_jm_watchdog){ ++ .info = wd_info, ++ .timeout_ms = hwcnt_backend_watchdog_timer_interval_ms, ++ .locked = { .state = HWCNT_JM_WD_IDLE_BUFFER_EMPTY, .is_enabled = false } ++ }; ++ ++ while (state < HWCNT_JM_WD_INIT_END && !errcode) { ++ switch (state) { ++ case HWCNT_JM_WD_INIT_BACKEND: ++ errcode = wd_info->jm_backend_iface->init(jm_info, &wd_backend->jm_backend); ++ break; ++ case HWCNT_JM_WD_INIT_ENABLE_MAP: ++ errcode = ++ kbase_hwcnt_enable_map_alloc(metadata, &wd_backend->wd_enable_map); ++ break; ++ case HWCNT_JM_WD_INIT_DUMP_BUFFER: ++ errcode = kbase_hwcnt_dump_buffer_alloc(metadata, ++ &wd_backend->wd_dump_buffer); ++ break; ++ case HWCNT_JM_WD_INIT_END: ++ break; ++ } ++ if (!errcode) ++ state++; ++ } + -+ errcode = kbase_hwcnt_enable_map_alloc(metadata, &enable_map); + if (errcode) { -+ dev_err(kbdev->dev, "Failed to allocate IPA enable map"); ++ kbasep_hwcnt_backend_jm_watchdog_term_partial(wd_backend, state); ++ *out_backend = NULL; + return errcode; + } + -+ kbase_hwcnt_enable_map_enable_all(&enable_map); ++ WARN_ON(state != HWCNT_JM_WD_INIT_END); + -+ /* Disable cycle counter only. */ -+ enable_map.clk_enable_map = 0; ++ spin_lock_init(&wd_backend->locked.watchdog_lock); ++ init_completion(&wd_backend->watchdog_complete); + -+ errcode = kbase_hwcnt_virtualizer_client_create( -+ hvirt, &enable_map, &model_data->hvirt_cli); -+ kbase_hwcnt_enable_map_free(&enable_map); -+ if (errcode) { -+ dev_err(kbdev->dev, "Failed to register IPA with virtualizer"); -+ model_data->hvirt_cli = NULL; -+ return errcode; ++ *out_backend = (struct kbase_hwcnt_backend *)wd_backend; ++ return 0; ++} ++ ++/* Job manager watchdog backend, implementation of timestamp_ns */ ++static u64 kbasep_hwcnt_backend_jm_watchdog_timestamp_ns(struct kbase_hwcnt_backend *backend) ++{ ++ struct kbase_hwcnt_backend_jm_watchdog *const wd_backend = (void *)backend; ++ ++ return wd_backend->info->jm_backend_iface->timestamp_ns(wd_backend->jm_backend); ++} ++ ++static int kbasep_hwcnt_backend_jm_watchdog_dump_enable_common( ++ struct kbase_hwcnt_backend_jm_watchdog *wd_backend, ++ const struct kbase_hwcnt_enable_map *enable_map, kbase_hwcnt_backend_dump_enable_fn enabler) ++{ ++ int errcode = -EPERM; ++ unsigned long flags; ++ ++ if (WARN_ON(!wd_backend) || WARN_ON(!enable_map)) ++ return -EINVAL; ++ ++ spin_lock_irqsave(&wd_backend->locked.watchdog_lock, flags); ++ ++ /* If the backend is already enabled return an error */ ++ if (wd_backend->locked.is_enabled) { ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ return -EPERM; + } + -+ errcode = kbase_hwcnt_dump_buffer_alloc( -+ metadata, &model_data->dump_buf); -+ if (errcode) { -+ dev_err(kbdev->dev, "Failed to allocate IPA dump buffer"); -+ kbase_hwcnt_virtualizer_client_destroy(model_data->hvirt_cli); -+ model_data->hvirt_cli = NULL; -+ return errcode; ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ ++ /*We copy the enable map into our watchdog backend copy, for future usage*/ ++ kbase_hwcnt_enable_map_copy(&wd_backend->wd_enable_map, enable_map); ++ ++ errcode = enabler(wd_backend->jm_backend, enable_map); ++ if (!errcode) { ++ /*Enable dump watchdog*/ ++ errcode = wd_backend->info->dump_watchdog_iface->enable( ++ wd_backend->info->dump_watchdog_iface->timer, wd_backend->timeout_ms, ++ kbasep_hwcnt_backend_jm_watchdog_timer_callback, wd_backend); ++ if (!errcode) { ++ spin_lock_irqsave(&wd_backend->locked.watchdog_lock, flags); ++ WARN_ON(wd_backend->locked.is_enabled); ++ wd_backend->locked.is_enabled = true; ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ } else ++ /*Reverting the job manager backend back to disabled*/ ++ wd_backend->info->jm_backend_iface->dump_disable(wd_backend->jm_backend); + } + -+ return 0; ++ return errcode; +} + -+void kbase_ipa_detach_vinstr(struct kbase_ipa_model_vinstr_data *model_data) ++/* Job manager watchdog backend, implementation of dump_enable */ ++static int ++kbasep_hwcnt_backend_jm_watchdog_dump_enable(struct kbase_hwcnt_backend *backend, ++ const struct kbase_hwcnt_enable_map *enable_map) +{ -+ if (model_data->hvirt_cli) { -+ kbase_hwcnt_virtualizer_client_destroy(model_data->hvirt_cli); -+ kbase_hwcnt_dump_buffer_free(&model_data->dump_buf); -+ model_data->hvirt_cli = NULL; ++ struct kbase_hwcnt_backend_jm_watchdog *const wd_backend = (void *)backend; ++ ++ return kbasep_hwcnt_backend_jm_watchdog_dump_enable_common( ++ wd_backend, enable_map, wd_backend->info->jm_backend_iface->dump_enable); ++} ++ ++/* Job manager watchdog backend, implementation of dump_enable_nolock */ ++static int ++kbasep_hwcnt_backend_jm_watchdog_dump_enable_nolock(struct kbase_hwcnt_backend *backend, ++ const struct kbase_hwcnt_enable_map *enable_map) ++{ ++ struct kbase_hwcnt_backend_jm_watchdog *const wd_backend = (void *)backend; ++ ++ return kbasep_hwcnt_backend_jm_watchdog_dump_enable_common( ++ wd_backend, enable_map, wd_backend->info->jm_backend_iface->dump_enable_nolock); ++} ++ ++/* Job manager watchdog backend, implementation of dump_disable */ ++static void kbasep_hwcnt_backend_jm_watchdog_dump_disable(struct kbase_hwcnt_backend *backend) ++{ ++ struct kbase_hwcnt_backend_jm_watchdog *const wd_backend = (void *)backend; ++ unsigned long flags; ++ ++ if (WARN_ON(!backend)) ++ return; ++ ++ spin_lock_irqsave(&wd_backend->locked.watchdog_lock, flags); ++ if (!wd_backend->locked.is_enabled) { ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ return; + } ++ ++ wd_backend->locked.is_enabled = false; ++ ++ /* Discard undumped counter values since the last dump_get. */ ++ if (wd_backend->locked.state == HWCNT_JM_WD_IDLE_BUFFER_FULL) ++ wd_backend->locked.state = HWCNT_JM_WD_IDLE_BUFFER_EMPTY; ++ ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ ++ wd_backend->info->dump_watchdog_iface->disable( ++ wd_backend->info->dump_watchdog_iface->timer); ++ ++ wd_backend->info->jm_backend_iface->dump_disable(wd_backend->jm_backend); +} + -+int kbase_ipa_vinstr_dynamic_coeff(struct kbase_ipa_model *model, u32 *coeffp) ++/* Job manager watchdog backend, implementation of dump_clear */ ++static int kbasep_hwcnt_backend_jm_watchdog_dump_clear(struct kbase_hwcnt_backend *backend) +{ -+ struct kbase_ipa_model_vinstr_data *model_data = -+ (struct kbase_ipa_model_vinstr_data *)model->model_data; -+ s64 energy = 0; -+ size_t i; -+ u64 coeff = 0, coeff_mul = 0; -+ u64 start_ts_ns, end_ts_ns; -+ u32 active_cycles; -+ int err = 0; ++ int errcode = -EPERM; ++ bool clear_wd_wait_completion = false; ++ unsigned long flags; ++ struct kbase_hwcnt_backend_jm_watchdog *const wd_backend = (void *)backend; + -+ err = kbase_hwcnt_virtualizer_client_dump(model_data->hvirt_cli, -+ &start_ts_ns, &end_ts_ns, &model_data->dump_buf); -+ if (err) -+ goto err0; ++ if (WARN_ON(!backend)) ++ return -EINVAL; + -+ /* Range: 0 (GPU not used at all), to the max sampling interval, say -+ * 1s, * max GPU frequency (GPU 100% utilized). -+ * 0 <= active_cycles <= 1 * ~2GHz -+ * 0 <= active_cycles < 2^31 -+ */ -+ active_cycles = model_data->get_active_cycles(model_data); ++ spin_lock_irqsave(&wd_backend->locked.watchdog_lock, flags); ++ if (!wd_backend->locked.is_enabled) { ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ return -EPERM; ++ } + -+ if (active_cycles < (u32) max(model_data->min_sample_cycles, 0)) { -+ err = -ENODATA; -+ goto err0; ++ switch (wd_backend->locked.state) { ++ case HWCNT_JM_WD_IDLE_BUFFER_FULL: ++ case HWCNT_JM_WD_USER_DUMPING_BUFFER_FULL: ++ case HWCNT_JM_WD_IDLE_BUFFER_EMPTY: ++ case HWCNT_JM_WD_USER_DUMPING_BUFFER_EMPTY: ++ wd_backend->locked.state = HWCNT_JM_WD_BUFFER_CLEARING; ++ errcode = 0; ++ break; ++ case HWCNT_JM_WD_TIMER_DUMPING: ++ /* The timer asked for a dump request, when complete, the job manager backend ++ * buffer will be zero ++ */ ++ clear_wd_wait_completion = true; ++ /* This thread will have to wait for the callback to terminate and then call a ++ * dump_clear on the job manager backend. We change the state to ++ * HWCNT_JM_WD_TIMER_DUMPING_USER_CLEAR to notify the callback thread there is ++ * no more need to dump the buffer (since we will clear it right after anyway). ++ * We set up a wait queue to synchronize with the callback. ++ */ ++ reinit_completion(&wd_backend->watchdog_complete); ++ wd_backend->locked.state = HWCNT_JM_WD_TIMER_DUMPING_USER_CLEAR; ++ errcode = 0; ++ break; ++ default: ++ errcode = -EPERM; ++ break; + } ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); + -+ /* Range: 1 <= active_cycles < 2^31 */ -+ active_cycles = max(1u, active_cycles); ++ if (!errcode) { ++ if (clear_wd_wait_completion) { ++ /* Waiting for the callback to finish */ ++ wait_for_completion(&wd_backend->watchdog_complete); ++ } + -+ /* Range of 'energy' is +/- 2^54 * number of IPA groups (~8), so around -+ * -2^57 < energy < 2^57 -+ */ -+ for (i = 0; i < model_data->groups_def_num; i++) { -+ const struct kbase_ipa_group *group = &model_data->groups_def[i]; -+ s32 coeff = model_data->group_values[i]; -+ s64 group_energy = group->op(model_data, coeff, -+ group->counter_block_offset); ++ /* Clearing job manager backend buffer */ ++ errcode = wd_backend->info->jm_backend_iface->dump_clear(wd_backend->jm_backend); + -+ energy = kbase_ipa_add_saturate(energy, group_energy); ++ spin_lock_irqsave(&wd_backend->locked.watchdog_lock, flags); ++ ++ WARN_ON(wd_backend->locked.state != HWCNT_JM_WD_TIMER_DUMPING_USER_CLEAR && ++ wd_backend->locked.state != HWCNT_JM_WD_BUFFER_CLEARING && ++ wd_backend->locked.state != HWCNT_JM_WD_ERROR); ++ ++ WARN_ON(!wd_backend->locked.is_enabled); ++ ++ if (!errcode && wd_backend->locked.state != HWCNT_JM_WD_ERROR) { ++ /* Setting the internal buffer state to EMPTY */ ++ wd_backend->locked.state = HWCNT_JM_WD_IDLE_BUFFER_EMPTY; ++ /* Resetting the timer. Calling modify on a disabled timer ++ * enables it. ++ */ ++ wd_backend->info->dump_watchdog_iface->modify( ++ wd_backend->info->dump_watchdog_iface->timer, ++ wd_backend->timeout_ms); ++ } else { ++ wd_backend->locked.state = HWCNT_JM_WD_ERROR; ++ errcode = -EPERM; ++ } ++ ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); + } + -+ /* Range: 0 <= coeff < 2^57 */ -+ if (energy > 0) -+ coeff = energy; ++ return errcode; ++} + -+ /* Range: 0 <= coeff < 2^57 (because active_cycles >= 1). However, this -+ * can be constrained further: Counter values can only be increased by -+ * a theoretical maximum of about 64k per clock cycle. Beyond this, -+ * we'd have to sample every 1ms to avoid them overflowing at the -+ * lowest clock frequency (say 100MHz). Therefore, we can write the -+ * range of 'coeff' in terms of active_cycles: -+ * -+ * coeff = SUM(coeffN * counterN * num_cores_for_counterN) -+ * coeff <= SUM(coeffN * counterN) * max_num_cores -+ * coeff <= num_IPA_groups * max_coeff * max_counter * max_num_cores -+ * (substitute max_counter = 2^16 * active_cycles) -+ * coeff <= num_IPA_groups * max_coeff * 2^16 * active_cycles * max_num_cores -+ * coeff <= 2^3 * 2^22 * 2^16 * active_cycles * 2^5 -+ * coeff <= 2^46 * active_cycles -+ * -+ * So after the division: 0 <= coeff <= 2^46 -+ */ -+ coeff = div_u64(coeff, active_cycles); ++/* Job manager watchdog backend, implementation of dump_request */ ++static int kbasep_hwcnt_backend_jm_watchdog_dump_request(struct kbase_hwcnt_backend *backend, ++ u64 *dump_time_ns) ++{ ++ bool call_dump_request = false; ++ int errcode = 0; ++ unsigned long flags; ++ struct kbase_hwcnt_backend_jm_watchdog *const wd_backend = (void *)backend; + -+ /* Not all models were derived at the same reference voltage. Voltage -+ * scaling is done by multiplying by V^2, so we need to *divide* by -+ * Vref^2 here. -+ * Range: 0 <= coeff <= 2^49 -+ */ -+ coeff = div_u64(coeff * 1000, max(model_data->reference_voltage, 1)); -+ /* Range: 0 <= coeff <= 2^52 */ -+ coeff = div_u64(coeff * 1000, max(model_data->reference_voltage, 1)); ++ if (WARN_ON(!backend) || WARN_ON(!dump_time_ns)) ++ return -EINVAL; + -+ /* Scale by user-specified integer factor. -+ * Range: 0 <= coeff_mul < 2^57 -+ */ -+ coeff_mul = coeff * model_data->scaling_factor; ++ spin_lock_irqsave(&wd_backend->locked.watchdog_lock, flags); + -+ /* The power models have results with units -+ * mW/(MHz V^2), i.e. nW/(Hz V^2). With precision of 1/1000000, this -+ * becomes fW/(Hz V^2), which are the units of coeff_mul. However, -+ * kbase_scale_dynamic_power() expects units of pW/(Hz V^2), so divide -+ * by 1000. -+ * Range: 0 <= coeff_mul < 2^47 -+ */ -+ coeff_mul = div_u64(coeff_mul, 1000u); ++ if (!wd_backend->locked.is_enabled) { ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ return -EPERM; ++ } + -+err0: -+ /* Clamp to a sensible range - 2^16 gives about 14W at 400MHz/750mV */ -+ *coeffp = clamp(coeff_mul, (u64) 0, (u64) 1 << 16); -+ return err; ++ switch (wd_backend->locked.state) { ++ case HWCNT_JM_WD_IDLE_BUFFER_EMPTY: ++ /* progressing the state to avoid callbacks running while calling the job manager ++ * backend ++ */ ++ wd_backend->locked.state = HWCNT_JM_WD_USER_DUMPING_BUFFER_EMPTY; ++ call_dump_request = true; ++ break; ++ case HWCNT_JM_WD_IDLE_BUFFER_FULL: ++ wd_backend->locked.state = HWCNT_JM_WD_USER_DUMPING_BUFFER_FULL; ++ call_dump_request = true; ++ break; ++ case HWCNT_JM_WD_TIMER_DUMPING: ++ /* Retrieve timing information from previous dump_request */ ++ *dump_time_ns = wd_backend->wd_dump_timestamp; ++ /* On the next client call (dump_wait) the thread will have to wait for the ++ * callback to finish the dumping. ++ * We set up a wait queue to synchronize with the callback. ++ */ ++ reinit_completion(&wd_backend->watchdog_complete); ++ wd_backend->locked.state = HWCNT_JM_WD_TIMER_DUMPING_USER_REQUESTED; ++ break; ++ default: ++ errcode = -EPERM; ++ break; ++ } ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ ++ if (call_dump_request) { ++ errcode = wd_backend->info->jm_backend_iface->dump_request(wd_backend->jm_backend, ++ dump_time_ns); ++ if (!errcode) { ++ /*resetting the timer. Calling modify on a disabled timer enables it*/ ++ wd_backend->info->dump_watchdog_iface->modify( ++ wd_backend->info->dump_watchdog_iface->timer, ++ wd_backend->timeout_ms); ++ } else { ++ spin_lock_irqsave(&wd_backend->locked.watchdog_lock, flags); ++ WARN_ON(!wd_backend->locked.is_enabled); ++ wd_backend->locked.state = HWCNT_JM_WD_ERROR; ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ } ++ } ++ ++ return errcode; +} + -+int kbase_ipa_vinstr_common_model_init(struct kbase_ipa_model *model, -+ const struct kbase_ipa_group *ipa_groups_def, -+ size_t ipa_group_size, -+ kbase_ipa_get_active_cycles_callback get_active_cycles, -+ s32 reference_voltage) ++/* Job manager watchdog backend, implementation of dump_wait */ ++static int kbasep_hwcnt_backend_jm_watchdog_dump_wait(struct kbase_hwcnt_backend *backend) +{ -+ int err = 0; -+ size_t i; -+ struct kbase_ipa_model_vinstr_data *model_data; ++ int errcode = -EPERM; ++ bool wait_for_auto_dump = false, wait_for_user_dump = false; ++ struct kbase_hwcnt_backend_jm_watchdog *const wd_backend = (void *)backend; ++ unsigned long flags; + -+ if (!model || !ipa_groups_def || !ipa_group_size || !get_active_cycles) ++ if (WARN_ON(!backend)) + return -EINVAL; + -+ model_data = kzalloc(sizeof(*model_data), GFP_KERNEL); -+ if (!model_data) -+ return -ENOMEM; ++ spin_lock_irqsave(&wd_backend->locked.watchdog_lock, flags); ++ if (!wd_backend->locked.is_enabled) { ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ return -EPERM; ++ } + -+ model_data->kbdev = model->kbdev; -+ model_data->groups_def = ipa_groups_def; -+ model_data->groups_def_num = ipa_group_size; -+ model_data->get_active_cycles = get_active_cycles; ++ switch (wd_backend->locked.state) { ++ case HWCNT_JM_WD_TIMER_DUMPING_USER_REQUESTED: ++ wait_for_auto_dump = true; ++ errcode = 0; ++ break; ++ case HWCNT_JM_WD_USER_DUMPING_BUFFER_EMPTY: ++ case HWCNT_JM_WD_USER_DUMPING_BUFFER_FULL: ++ wait_for_user_dump = true; ++ errcode = 0; ++ break; ++ default: ++ errcode = -EPERM; ++ break; ++ } ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); + -+ model->model_data = (void *) model_data; ++ if (wait_for_auto_dump) ++ wait_for_completion(&wd_backend->watchdog_complete); ++ else if (wait_for_user_dump) { ++ errcode = wd_backend->info->jm_backend_iface->dump_wait(wd_backend->jm_backend); ++ if (errcode) { ++ spin_lock_irqsave(&wd_backend->locked.watchdog_lock, flags); ++ WARN_ON(!wd_backend->locked.is_enabled); ++ wd_backend->locked.state = HWCNT_JM_WD_ERROR; ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); ++ } ++ } + -+ for (i = 0; i < model_data->groups_def_num; ++i) { -+ const struct kbase_ipa_group *group = &model_data->groups_def[i]; ++ return errcode; ++} + -+ model_data->group_values[i] = group->default_value; -+ err = kbase_ipa_model_add_param_s32(model, group->name, -+ &model_data->group_values[i], -+ 1, false); -+ if (err) -+ goto exit; ++/* Job manager watchdog backend, implementation of dump_get */ ++static int kbasep_hwcnt_backend_jm_watchdog_dump_get( ++ struct kbase_hwcnt_backend *backend, struct kbase_hwcnt_dump_buffer *dump_buffer, ++ const struct kbase_hwcnt_enable_map *enable_map, bool accumulate) ++{ ++ bool call_dump_get = false; ++ struct kbase_hwcnt_backend_jm_watchdog *const wd_backend = (void *)backend; ++ unsigned long flags; ++ int errcode = 0; ++ ++ if (WARN_ON(!backend) || WARN_ON(!dump_buffer) || WARN_ON(!enable_map)) ++ return -EINVAL; ++ ++ /* The resultant contents of the dump buffer are only well defined if a prior ++ * call to dump_wait returned successfully, and a new dump has not yet been ++ * requested by a call to dump_request. ++ */ ++ ++ spin_lock_irqsave(&wd_backend->locked.watchdog_lock, flags); ++ ++ switch (wd_backend->locked.state) { ++ case HWCNT_JM_WD_TIMER_DUMPING_USER_REQUESTED: ++ /*we assume dump_wait has been called and completed successfully*/ ++ if (accumulate) ++ kbase_hwcnt_dump_buffer_accumulate(dump_buffer, &wd_backend->wd_dump_buffer, ++ enable_map); ++ else ++ kbase_hwcnt_dump_buffer_copy(dump_buffer, &wd_backend->wd_dump_buffer, ++ enable_map); ++ ++ /*use state to indicate the the buffer is now empty*/ ++ wd_backend->locked.state = HWCNT_JM_WD_IDLE_BUFFER_EMPTY; ++ break; ++ case HWCNT_JM_WD_USER_DUMPING_BUFFER_FULL: ++ /*accumulate or copy watchdog data to user buffer first so that dump_get can set ++ * the header correctly ++ */ ++ if (accumulate) ++ kbase_hwcnt_dump_buffer_accumulate(dump_buffer, &wd_backend->wd_dump_buffer, ++ enable_map); ++ else ++ kbase_hwcnt_dump_buffer_copy(dump_buffer, &wd_backend->wd_dump_buffer, ++ enable_map); ++ ++ /*accumulate backend data into user buffer on top of watchdog data*/ ++ accumulate = true; ++ call_dump_get = true; ++ break; ++ case HWCNT_JM_WD_USER_DUMPING_BUFFER_EMPTY: ++ call_dump_get = true; ++ break; ++ default: ++ errcode = -EPERM; ++ break; + } + -+ model_data->scaling_factor = DEFAULT_SCALING_FACTOR; -+ err = kbase_ipa_model_add_param_s32(model, "scale", -+ &model_data->scaling_factor, -+ 1, false); -+ if (err) -+ goto exit; ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); + -+ model_data->min_sample_cycles = DEFAULT_MIN_SAMPLE_CYCLES; -+ err = kbase_ipa_model_add_param_s32(model, "min_sample_cycles", -+ &model_data->min_sample_cycles, -+ 1, false); -+ if (err) -+ goto exit; ++ if (call_dump_get && !errcode) { ++ /*we just dump the job manager backend into the user buffer, following ++ *accumulate flag ++ */ ++ errcode = wd_backend->info->jm_backend_iface->dump_get( ++ wd_backend->jm_backend, dump_buffer, enable_map, accumulate); + -+ model_data->reference_voltage = reference_voltage; -+ err = kbase_ipa_model_add_param_s32(model, "reference_voltage", -+ &model_data->reference_voltage, -+ 1, false); -+ if (err) -+ goto exit; ++ spin_lock_irqsave(&wd_backend->locked.watchdog_lock, flags); + -+ err = kbase_ipa_attach_vinstr(model_data); ++ WARN_ON(wd_backend->locked.state != HWCNT_JM_WD_USER_DUMPING_BUFFER_EMPTY && ++ wd_backend->locked.state != HWCNT_JM_WD_USER_DUMPING_BUFFER_FULL && ++ wd_backend->locked.state != HWCNT_JM_WD_TIMER_DUMPING_USER_REQUESTED); + -+exit: -+ if (err) { -+ kbase_ipa_model_param_free_all(model); -+ kfree(model_data); ++ if (!errcode) ++ wd_backend->locked.state = HWCNT_JM_WD_IDLE_BUFFER_EMPTY; ++ else ++ wd_backend->locked.state = HWCNT_JM_WD_ERROR; ++ ++ spin_unlock_irqrestore(&wd_backend->locked.watchdog_lock, flags); + } -+ return err; ++ ++ return errcode; +} + -+void kbase_ipa_vinstr_common_model_term(struct kbase_ipa_model *model) ++/* exposed methods */ ++ ++int kbase_hwcnt_backend_jm_watchdog_create(struct kbase_hwcnt_backend_interface *backend_iface, ++ struct kbase_hwcnt_watchdog_interface *watchdog_iface, ++ struct kbase_hwcnt_backend_interface *out_iface) +{ -+ struct kbase_ipa_model_vinstr_data *model_data = -+ (struct kbase_ipa_model_vinstr_data *)model->model_data; ++ struct kbase_hwcnt_backend_jm_watchdog_info *info = NULL; + -+ kbase_ipa_detach_vinstr(model_data); -+ kfree(model_data); ++ if (WARN_ON(!backend_iface) || WARN_ON(!watchdog_iface) || WARN_ON(!out_iface)) ++ return -EINVAL; ++ ++ info = kbasep_hwcnt_backend_jm_watchdog_info_create(backend_iface, watchdog_iface); ++ if (!info) ++ return -ENOMEM; ++ ++ /*linking the info table with the output iface, to allow the callbacks below to access the ++ *info object later on ++ */ ++ *out_iface = (struct kbase_hwcnt_backend_interface){ ++ .info = (void *)info, ++ .metadata = kbasep_hwcnt_backend_jm_watchdog_metadata, ++ .init = kbasep_hwcnt_backend_jm_watchdog_init, ++ .term = kbasep_hwcnt_backend_jm_watchdog_term, ++ .timestamp_ns = kbasep_hwcnt_backend_jm_watchdog_timestamp_ns, ++ .dump_enable = kbasep_hwcnt_backend_jm_watchdog_dump_enable, ++ .dump_enable_nolock = kbasep_hwcnt_backend_jm_watchdog_dump_enable_nolock, ++ .dump_disable = kbasep_hwcnt_backend_jm_watchdog_dump_disable, ++ .dump_clear = kbasep_hwcnt_backend_jm_watchdog_dump_clear, ++ .dump_request = kbasep_hwcnt_backend_jm_watchdog_dump_request, ++ .dump_wait = kbasep_hwcnt_backend_jm_watchdog_dump_wait, ++ .dump_get = kbasep_hwcnt_backend_jm_watchdog_dump_get ++ }; ++ ++ /*registering watchdog backend module methods on the output interface*/ ++ ++ return 0; +} -diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_common.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_common.h -new file mode 100755 -index 000000000000..46e3cd4bc6e1 ++ ++void kbase_hwcnt_backend_jm_watchdog_destroy(struct kbase_hwcnt_backend_interface *iface) ++{ ++ if (!iface || !iface->info) ++ return; ++ ++ kfree((struct kbase_hwcnt_backend_jm_watchdog_info *)iface->info); ++ ++ /*blanking the watchdog backend interface*/ ++ memset(iface, 0, sizeof(*iface)); ++} +diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.h +new file mode 100644 +index 000000000..02a7952cc --- /dev/null -+++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_common.h -@@ -0,0 +1,217 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.h +@@ -0,0 +1,65 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2017-2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -184677,219 +214484,67 @@ index 000000000000..46e3cd4bc6e1 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+#ifndef _KBASE_IPA_VINSTR_COMMON_H_ -+#define _KBASE_IPA_VINSTR_COMMON_H_ -+ -+#include "mali_kbase.h" -+#include "mali_kbase_hwcnt_virtualizer.h" -+#include "mali_kbase_hwcnt_types.h" -+ -+/* Maximum number of IPA groups for an IPA model. */ -+#define KBASE_IPA_MAX_GROUP_DEF_NUM 16 -+ -+/* Number of bytes per hardware counter in a vinstr_buffer. */ -+#define KBASE_IPA_NR_BYTES_PER_CNT 4 -+ -+/* Number of hardware counters per block in a vinstr_buffer. */ -+#define KBASE_IPA_NR_CNT_PER_BLOCK 64 -+ -+/* Number of bytes per block in a vinstr_buffer. */ -+#define KBASE_IPA_NR_BYTES_PER_BLOCK \ -+ (KBASE_IPA_NR_CNT_PER_BLOCK * KBASE_IPA_NR_BYTES_PER_CNT) -+ -+struct kbase_ipa_model_vinstr_data; -+ -+typedef u32 (*kbase_ipa_get_active_cycles_callback)(struct kbase_ipa_model_vinstr_data *); -+ -+/** -+ * struct kbase_ipa_model_vinstr_data - IPA context per device -+ * @kbdev: pointer to kbase device -+ * @groups_def: Array of IPA groups. -+ * @groups_def_num: Number of elements in the array of IPA groups. -+ * @get_active_cycles: Callback to return number of active cycles during -+ * counter sample period -+ * @hvirt_cli: hardware counter virtualizer client handle -+ * @dump_buf: buffer to dump hardware counters onto -+ * @reference_voltage: voltage, in mV, of the operating point used when -+ * deriving the power model coefficients. Range approx -+ * 0.1V - 5V (~= 8V): 2^7 <= reference_voltage <= 2^13 -+ * @scaling_factor: User-specified power scaling factor. This is an -+ * integer, which is multiplied by the power coefficient -+ * just before OPP scaling. -+ * Range approx 0-32: 0 < scaling_factor < 2^5 -+ * @min_sample_cycles: If the value of the GPU_ACTIVE counter (the number of -+ * cycles the GPU was working) is less than -+ * min_sample_cycles, the counter model will return an -+ * error, causing the IPA framework to approximate using -+ * the cached simple model results instead. This may be -+ * more accurate than extrapolating using a very small -+ * counter dump. -+ */ -+struct kbase_ipa_model_vinstr_data { -+ struct kbase_device *kbdev; -+ s32 group_values[KBASE_IPA_MAX_GROUP_DEF_NUM]; -+ const struct kbase_ipa_group *groups_def; -+ size_t groups_def_num; -+ kbase_ipa_get_active_cycles_callback get_active_cycles; -+ struct kbase_hwcnt_virtualizer_client *hvirt_cli; -+ struct kbase_hwcnt_dump_buffer dump_buf; -+ s32 reference_voltage; -+ s32 scaling_factor; -+ s32 min_sample_cycles; -+}; -+ -+/** -+ * struct ipa_group - represents a single IPA group -+ * @name: name of the IPA group -+ * @default_value: default value of coefficient for IPA group. -+ * Coefficients are interpreted as fractions where the -+ * denominator is 1000000. -+ * @op: which operation to be performed on the counter values -+ * @counter_block_offset: block offset in bytes of the counter used to calculate energy for IPA group -+ */ -+struct kbase_ipa_group { -+ const char *name; -+ s32 default_value; -+ s64 (*op)(struct kbase_ipa_model_vinstr_data *, s32, u32); -+ u32 counter_block_offset; -+}; -+ -+/** -+ * kbase_ipa_sum_all_shader_cores() - sum a counter over all cores -+ * @model_data: pointer to model data -+ * @coeff: model coefficient. Unity is ~2^20, so range approx -+ * +/- 4.0: -2^22 < coeff < 2^22 -+ * @counter offset in bytes of the counter used to calculate energy -+ * for IPA group -+ * -+ * Calculate energy estimation based on hardware counter `counter' -+ * across all shader cores. -+ * -+ * Return: Sum of counter values. Range: -2^54 < ret < 2^54 -+ */ -+s64 kbase_ipa_sum_all_shader_cores( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ s32 coeff, u32 counter); -+ -+/** -+ * kbase_ipa_sum_all_memsys_blocks() - sum a counter over all mem system blocks -+ * @model_data: pointer to model data -+ * @coeff: model coefficient. Unity is ~2^20, so range approx -+ * +/- 4.0: -2^22 < coeff < 2^22 -+ * @counter: offset in bytes of the counter used to calculate energy -+ * for IPA group -+ * -+ * Calculate energy estimation based on hardware counter `counter' across all -+ * memory system blocks. -+ * -+ * Return: Sum of counter values. Range: -2^51 < ret < 2^51 -+ */ -+s64 kbase_ipa_sum_all_memsys_blocks( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ s32 coeff, u32 counter); -+ -+/** -+ * kbase_ipa_single_counter() - sum a single counter -+ * @model_data: pointer to model data -+ * @coeff: model coefficient. Unity is ~2^20, so range approx -+ * +/- 4.0: -2^22 < coeff < 2^22 -+ * @counter: offset in bytes of the counter used to calculate energy -+ * for IPA group -+ * -+ * Calculate energy estimation based on hardware counter `counter'. -+ * -+ * Return: Counter value. Range: -2^49 < ret < 2^49 + */ -+s64 kbase_ipa_single_counter( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ s32 coeff, u32 counter); + -+/** -+ * attach_vinstr() - attach a vinstr_buffer to an IPA model. -+ * @model_data pointer to model data -+ * -+ * Attach a vinstr_buffer to an IPA model. The vinstr_buffer -+ * allows access to the hardware counters used to calculate -+ * energy consumption. -+ * -+ * Return: 0 on success, or an error code. ++/* ++ * Concrete implementation of mali_kbase_hwcnt_backend interface for job manager ++ * backend. This module functionally interleaves between the hardware counter ++ * (hwcnt_accumulator) module (the interface consumer) and the job manager ++ * backend module (hwcnt_backend_jm). This module provides buffering ++ * functionality for the dumping requests requested by the hwcnt_accumulator ++ * consumer. This module is NOT multi-thread safe. The programmer must ++ * ensure the exposed methods are called by at most one thread at any time. + */ -+int kbase_ipa_attach_vinstr(struct kbase_ipa_model_vinstr_data *model_data); + -+/** -+ * detach_vinstr() - detach a vinstr_buffer from an IPA model. -+ * @model_data pointer to model data -+ * -+ * Detach a vinstr_buffer from an IPA model. -+ */ -+void kbase_ipa_detach_vinstr(struct kbase_ipa_model_vinstr_data *model_data); ++#ifndef _KBASE_HWCNT_BACKEND_JM_WATCHDOG_H_ ++#define _KBASE_HWCNT_BACKEND_JM_WATCHDOG_H_ + -+/** -+ * kbase_ipa_vinstr_dynamic_coeff() - calculate dynamic power based on HW counters -+ * @model: pointer to instantiated model -+ * @coeffp: pointer to location where calculated power, in -+ * pW/(Hz V^2), is stored. -+ * -+ * This is a GPU-agnostic implementation of the get_dynamic_coeff() -+ * function of an IPA model. It relies on the model being populated -+ * with GPU-specific attributes at initialization time. -+ * -+ * Return: 0 on success, or an error code. -+ */ -+int kbase_ipa_vinstr_dynamic_coeff(struct kbase_ipa_model *model, u32 *coeffp); ++#include ++#include + +/** -+ * kbase_ipa_vinstr_common_model_init() - initialize ipa power model -+ * @model: ipa power model to initialize -+ * @ipa_groups_def: array of ipa groups which sets coefficients for -+ * the corresponding counters used in the ipa model -+ * @ipa_group_size: number of elements in the array @ipa_groups_def -+ * @get_active_cycles: callback to return the number of cycles the GPU was -+ * active during the counter sample period. -+ * @reference_voltage: voltage, in mV, of the operating point used when -+ * deriving the power model coefficients. ++ * kbase_hwcnt_backend_jm_watchdog_create() - Create a job manager hardware counter watchdog ++ * backend interface. ++ * @backend_iface: Non-NULL pointer to the backend interface structure that this module will ++ * extend. ++ * @watchdog_iface: Non-NULL pointer to an hardware counter watchdog interface. ++ * @out_iface: Non-NULL pointer to backend interface structure that is filled in ++ * on creation success. + * -+ * This initialization function performs initialization steps common -+ * for ipa models based on counter values. In each call, the model -+ * passes its specific coefficient values per ipa counter group via -+ * @ipa_groups_def array. ++ * Calls to out_iface->dump_enable_nolock() require kbdev->hwaccess_lock held. + * -+ * Return: 0 on success, error code otherwise ++ * Return: 0 on success, error otherwise. + */ -+int kbase_ipa_vinstr_common_model_init(struct kbase_ipa_model *model, -+ const struct kbase_ipa_group *ipa_groups_def, -+ size_t ipa_group_size, -+ kbase_ipa_get_active_cycles_callback get_active_cycles, -+ s32 reference_voltage); ++int kbase_hwcnt_backend_jm_watchdog_create(struct kbase_hwcnt_backend_interface *backend_iface, ++ struct kbase_hwcnt_watchdog_interface *watchdog_iface, ++ struct kbase_hwcnt_backend_interface *out_iface); + +/** -+ * kbase_ipa_vinstr_common_model_term() - terminate ipa power model -+ * @model: ipa power model to terminate ++ * kbase_hwcnt_backend_jm_watchdog_destroy() - Destroy a job manager hardware counter watchdog ++ * backend interface. ++ * @iface: Pointer to interface to destroy. + * -+ * This function performs all necessary steps to terminate ipa power model -+ * including clean up of resources allocated to hold model data. ++ * Can be safely called on an all-zeroed interface, or on an already destroyed ++ * interface. + */ -+void kbase_ipa_vinstr_common_model_term(struct kbase_ipa_model *model); ++void kbase_hwcnt_backend_jm_watchdog_destroy(struct kbase_hwcnt_backend_interface *iface); + -+#endif /* _KBASE_IPA_VINSTR_COMMON_H_ */ -diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_g7x.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_g7x.c -new file mode 100755 -index 000000000000..83174eb66ded ++#endif /* _KBASE_HWCNT_BACKEND_JM_WATCHDOG_H_ */ +diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt.c +new file mode 100644 +index 000000000..34deb5d9e --- /dev/null -+++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_g7x.c -@@ -0,0 +1,490 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt.c +@@ -0,0 +1,775 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2016-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -184900,1577 +214555,1820 @@ index 000000000000..83174eb66ded + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ -+#include -+ -+#include "mali_kbase_ipa_vinstr_common.h" -+#include "mali_kbase.h" -+ -+ -+/* Performance counter blocks base offsets */ -+#define JM_BASE (0 * KBASE_IPA_NR_BYTES_PER_BLOCK) -+#define TILER_BASE (1 * KBASE_IPA_NR_BYTES_PER_BLOCK) -+#define MEMSYS_BASE (2 * KBASE_IPA_NR_BYTES_PER_BLOCK) -+ -+/* JM counter block offsets */ -+#define JM_GPU_ACTIVE (KBASE_IPA_NR_BYTES_PER_CNT * 6) + -+/* Tiler counter block offsets */ -+#define TILER_ACTIVE (KBASE_IPA_NR_BYTES_PER_CNT * 45) ++/* ++ * Implementation of hardware counter context and accumulator APIs. ++ */ + -+/* MEMSYS counter block offsets */ -+#define MEMSYS_L2_ANY_LOOKUP (KBASE_IPA_NR_BYTES_PER_CNT * 25) ++#include "hwcnt/mali_kbase_hwcnt_context.h" ++#include "hwcnt/mali_kbase_hwcnt_accumulator.h" ++#include "hwcnt/backend/mali_kbase_hwcnt_backend.h" ++#include "hwcnt/mali_kbase_hwcnt_types.h" + -+/* SC counter block offsets */ -+#define SC_FRAG_ACTIVE (KBASE_IPA_NR_BYTES_PER_CNT * 4) -+#define SC_EXEC_CORE_ACTIVE (KBASE_IPA_NR_BYTES_PER_CNT * 26) -+#define SC_EXEC_INSTR_FMA (KBASE_IPA_NR_BYTES_PER_CNT * 27) -+#define SC_EXEC_INSTR_COUNT (KBASE_IPA_NR_BYTES_PER_CNT * 28) -+#define SC_EXEC_INSTR_MSG (KBASE_IPA_NR_BYTES_PER_CNT * 30) -+#define SC_TEX_FILT_NUM_OPERATIONS (KBASE_IPA_NR_BYTES_PER_CNT * 39) -+#define SC_TEX_COORD_ISSUE (KBASE_IPA_NR_BYTES_PER_CNT * 40) -+#define SC_TEX_TFCH_NUM_OPERATIONS (KBASE_IPA_NR_BYTES_PER_CNT * 42) -+#define SC_VARY_INSTR (KBASE_IPA_NR_BYTES_PER_CNT * 49) -+#define SC_VARY_SLOT_32 (KBASE_IPA_NR_BYTES_PER_CNT * 50) -+#define SC_VARY_SLOT_16 (KBASE_IPA_NR_BYTES_PER_CNT * 51) -+#define SC_BEATS_RD_LSC (KBASE_IPA_NR_BYTES_PER_CNT * 56) -+#define SC_BEATS_WR_LSC (KBASE_IPA_NR_BYTES_PER_CNT * 61) -+#define SC_BEATS_WR_TIB (KBASE_IPA_NR_BYTES_PER_CNT * 62) ++#include ++#include ++#include + +/** -+ * get_jm_counter() - get performance counter offset inside the Job Manager block -+ * @model_data: pointer to GPU model data. -+ * @counter_block_offset: offset in bytes of the performance counter inside the Job Manager block. -+ * -+ * Return: Block offset in bytes of the required performance counter. ++ * enum kbase_hwcnt_accum_state - Hardware counter accumulator states. ++ * @ACCUM_STATE_ERROR: Error state, where all accumulator operations fail. ++ * @ACCUM_STATE_DISABLED: Disabled state, where dumping is always disabled. ++ * @ACCUM_STATE_ENABLED: Enabled state, where dumping is enabled if there are ++ * any enabled counters. + */ -+static u32 kbase_g7x_power_model_get_jm_counter(struct kbase_ipa_model_vinstr_data *model_data, -+ u32 counter_block_offset) -+{ -+ return JM_BASE + counter_block_offset; -+} ++enum kbase_hwcnt_accum_state { ACCUM_STATE_ERROR, ACCUM_STATE_DISABLED, ACCUM_STATE_ENABLED }; + +/** -+ * get_memsys_counter() - get performance counter offset inside the Memory System block -+ * @model_data: pointer to GPU model data. -+ * @counter_block_offset: offset in bytes of the performance counter inside the (first) Memory System block. -+ * -+ * Return: Block offset in bytes of the required performance counter. ++ * struct kbase_hwcnt_accumulator - Hardware counter accumulator structure. ++ * @metadata: Pointer to immutable hwcnt metadata. ++ * @backend: Pointer to created counter backend. ++ * @state: The current state of the accumulator. ++ * - State transition from disabled->enabled or ++ * disabled->error requires state_lock. ++ * - State transition from enabled->disabled or ++ * enabled->error requires both accum_lock and ++ * state_lock. ++ * - Error state persists until next disable. ++ * @enable_map: The current set of enabled counters. ++ * - Must only be modified while holding both ++ * accum_lock and state_lock. ++ * - Can be read while holding either lock. ++ * - Must stay in sync with enable_map_any_enabled. ++ * @enable_map_any_enabled: True if any counters in the map are enabled, else ++ * false. If true, and state is ACCUM_STATE_ENABLED, ++ * then the counter backend will be enabled. ++ * - Must only be modified while holding both ++ * accum_lock and state_lock. ++ * - Can be read while holding either lock. ++ * - Must stay in sync with enable_map. ++ * @scratch_map: Scratch enable map, used as temporary enable map ++ * storage during dumps. ++ * - Must only be read or modified while holding ++ * accum_lock. ++ * @accum_buf: Accumulation buffer, where dumps will be accumulated ++ * into on transition to a disable state. ++ * - Must only be read or modified while holding ++ * accum_lock. ++ * @accumulated: True if the accumulation buffer has been accumulated ++ * into and not subsequently read from yet, else false. ++ * - Must only be read or modified while holding ++ * accum_lock. ++ * @ts_last_dump_ns: Timestamp (ns) of the end time of the most recent ++ * dump that was requested by the user. ++ * - Must only be read or modified while holding ++ * accum_lock. + */ -+static u32 kbase_g7x_power_model_get_memsys_counter(struct kbase_ipa_model_vinstr_data *model_data, -+ u32 counter_block_offset) -+{ -+ /* The base address of Memory System performance counters is always the same, although their number -+ * may vary based on the number of cores. For the moment it's ok to return a constant. -+ */ -+ return MEMSYS_BASE + counter_block_offset; -+} ++struct kbase_hwcnt_accumulator { ++ const struct kbase_hwcnt_metadata *metadata; ++ struct kbase_hwcnt_backend *backend; ++ enum kbase_hwcnt_accum_state state; ++ struct kbase_hwcnt_enable_map enable_map; ++ bool enable_map_any_enabled; ++ struct kbase_hwcnt_enable_map scratch_map; ++ struct kbase_hwcnt_dump_buffer accum_buf; ++ bool accumulated; ++ u64 ts_last_dump_ns; ++}; + +/** -+ * get_sc_counter() - get performance counter offset inside the Shader Cores block -+ * @model_data: pointer to GPU model data. -+ * @counter_block_offset: offset in bytes of the performance counter inside the (first) Shader Cores block. -+ * -+ * Return: Block offset in bytes of the required performance counter. ++ * struct kbase_hwcnt_context - Hardware counter context structure. ++ * @iface: Pointer to hardware counter backend interface. ++ * @state_lock: Spinlock protecting state. ++ * @disable_count: Disable count of the context. Initialised to 1. ++ * Decremented when the accumulator is acquired, and incremented ++ * on release. Incremented on calls to ++ * kbase_hwcnt_context_disable[_atomic], and decremented on ++ * calls to kbase_hwcnt_context_enable. ++ * - Must only be read or modified while holding state_lock. ++ * @accum_lock: Mutex protecting accumulator. ++ * @accum_inited: Flag to prevent concurrent accumulator initialisation and/or ++ * termination. Set to true before accumulator initialisation, ++ * and false after accumulator termination. ++ * - Must only be modified while holding both accum_lock and ++ * state_lock. ++ * - Can be read while holding either lock. ++ * @accum: Hardware counter accumulator structure. ++ * @wq: Centralized workqueue for users of hardware counters to ++ * submit async hardware counter related work. Never directly ++ * called, but it's expected that a lot of the functions in this ++ * API will end up called from the enqueued async work. + */ -+static u32 kbase_g7x_power_model_get_sc_counter(struct kbase_ipa_model_vinstr_data *model_data, -+ u32 counter_block_offset) ++struct kbase_hwcnt_context { ++ const struct kbase_hwcnt_backend_interface *iface; ++ spinlock_t state_lock; ++ size_t disable_count; ++ struct mutex accum_lock; ++ bool accum_inited; ++ struct kbase_hwcnt_accumulator accum; ++ struct workqueue_struct *wq; ++}; ++ ++int kbase_hwcnt_context_init(const struct kbase_hwcnt_backend_interface *iface, ++ struct kbase_hwcnt_context **out_hctx) +{ -+ const u32 sc_base = MEMSYS_BASE + -+ (model_data->kbdev->gpu_props.props.l2_props.num_l2_slices * -+ KBASE_IPA_NR_BYTES_PER_BLOCK); ++ struct kbase_hwcnt_context *hctx = NULL; + -+ return sc_base + counter_block_offset; -+} ++ if (!iface || !out_hctx) ++ return -EINVAL; + -+/** -+ * memsys_single_counter() - calculate energy for a single Memory System performance counter. -+ * @model_data: pointer to GPU model data. -+ * @coeff: default value of coefficient for IPA group. -+ * @offset: offset in bytes of the counter inside the block it belongs to. -+ * -+ * Return: Energy estimation for a single Memory System performance counter. -+ */ -+static s64 kbase_g7x_sum_all_memsys_blocks( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ s32 coeff, -+ u32 offset) -+{ -+ u32 counter; ++ hctx = kzalloc(sizeof(*hctx), GFP_KERNEL); ++ if (!hctx) ++ goto err_alloc_hctx; + -+ counter = kbase_g7x_power_model_get_memsys_counter(model_data, offset); -+ return kbase_ipa_sum_all_memsys_blocks(model_data, coeff, counter); ++ hctx->iface = iface; ++ spin_lock_init(&hctx->state_lock); ++ hctx->disable_count = 1; ++ mutex_init(&hctx->accum_lock); ++ hctx->accum_inited = false; ++ ++ hctx->wq = alloc_workqueue("mali_kbase_hwcnt", WQ_HIGHPRI | WQ_UNBOUND, 0); ++ if (!hctx->wq) ++ goto err_alloc_workqueue; ++ ++ *out_hctx = hctx; ++ ++ return 0; ++ ++err_alloc_workqueue: ++ kfree(hctx); ++err_alloc_hctx: ++ return -ENOMEM; +} + -+/** -+ * sum_all_shader_cores() - calculate energy for a Shader Cores performance counter for all cores. -+ * @model_data: pointer to GPU model data. -+ * @coeff: default value of coefficient for IPA group. -+ * @counter_block_offset: offset in bytes of the counter inside the block it belongs to. -+ * -+ * Return: Energy estimation for a Shader Cores performance counter for all cores. -+ */ -+static s64 kbase_g7x_sum_all_shader_cores( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ s32 coeff, -+ u32 counter_block_offset) ++void kbase_hwcnt_context_term(struct kbase_hwcnt_context *hctx) +{ -+ u32 counter; ++ if (!hctx) ++ return; + -+ counter = kbase_g7x_power_model_get_sc_counter(model_data, -+ counter_block_offset); -+ return kbase_ipa_sum_all_shader_cores(model_data, coeff, counter); ++ /* Make sure we didn't leak the accumulator */ ++ WARN_ON(hctx->accum_inited); ++ ++ /* We don't expect any work to be pending on this workqueue. ++ * Regardless, this will safely drain and complete the work. ++ */ ++ destroy_workqueue(hctx->wq); ++ kfree(hctx); +} + +/** -+ * jm_single_counter() - calculate energy for a single Job Manager performance counter. -+ * @model_data: pointer to GPU model data. -+ * @coeff: default value of coefficient for IPA group. -+ * @counter_block_offset: offset in bytes of the counter inside the block it belongs to. -+ * -+ * Return: Energy estimation for a single Job Manager performance counter. ++ * kbasep_hwcnt_accumulator_term() - Terminate the accumulator for the context. ++ * @hctx: Non-NULL pointer to hardware counter context. + */ -+static s64 kbase_g7x_jm_single_counter( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ s32 coeff, -+ u32 counter_block_offset) ++static void kbasep_hwcnt_accumulator_term(struct kbase_hwcnt_context *hctx) +{ -+ u32 counter; ++ WARN_ON(!hctx); ++ WARN_ON(!hctx->accum_inited); + -+ counter = kbase_g7x_power_model_get_jm_counter(model_data, -+ counter_block_offset); -+ return kbase_ipa_single_counter(model_data, coeff, counter); ++ kbase_hwcnt_enable_map_free(&hctx->accum.scratch_map); ++ kbase_hwcnt_dump_buffer_free(&hctx->accum.accum_buf); ++ kbase_hwcnt_enable_map_free(&hctx->accum.enable_map); ++ hctx->iface->term(hctx->accum.backend); ++ memset(&hctx->accum, 0, sizeof(hctx->accum)); +} + +/** -+ * get_active_cycles() - return the GPU_ACTIVE counter -+ * @model_data: pointer to GPU model data. ++ * kbasep_hwcnt_accumulator_init() - Initialise the accumulator for the context. ++ * @hctx: Non-NULL pointer to hardware counter context. + * -+ * Return: the number of cycles the GPU was active during the counter sampling -+ * period. ++ * Return: 0 on success, else error code. + */ -+static u32 kbase_g7x_get_active_cycles( -+ struct kbase_ipa_model_vinstr_data *model_data) ++static int kbasep_hwcnt_accumulator_init(struct kbase_hwcnt_context *hctx) +{ -+ u32 counter = kbase_g7x_power_model_get_jm_counter(model_data, JM_GPU_ACTIVE); ++ int errcode; + -+ /* Counters are only 32-bit, so we can safely multiply by 1 then cast -+ * the 64-bit result back to a u32. -+ */ -+ return kbase_ipa_single_counter(model_data, 1, counter); -+} ++ WARN_ON(!hctx); ++ WARN_ON(!hctx->accum_inited); + -+/** Table of IPA group definitions. -+ * -+ * For each IPA group, this table defines a function to access the given performance block counter (or counters, -+ * if the operation needs to be iterated on multiple blocks) and calculate energy estimation. -+ */ ++ errcode = hctx->iface->init(hctx->iface->info, &hctx->accum.backend); ++ if (errcode) ++ goto error; + -+static const struct kbase_ipa_group ipa_groups_def_g71[] = { -+ { -+ .name = "l2_access", -+ .default_value = 526300, -+ .op = kbase_g7x_sum_all_memsys_blocks, -+ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, -+ }, -+ { -+ .name = "exec_instr_count", -+ .default_value = 301100, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_EXEC_INSTR_COUNT, -+ }, -+ { -+ .name = "tex_issue", -+ .default_value = 197400, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_TEX_COORD_ISSUE, -+ }, -+ { -+ .name = "tile_wb", -+ .default_value = -156400, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_BEATS_WR_TIB, -+ }, -+ { -+ .name = "gpu_active", -+ .default_value = 115800, -+ .op = kbase_g7x_jm_single_counter, -+ .counter_block_offset = JM_GPU_ACTIVE, -+ }, -+}; ++ hctx->accum.metadata = hctx->iface->metadata(hctx->iface->info); ++ hctx->accum.state = ACCUM_STATE_ERROR; + -+static const struct kbase_ipa_group ipa_groups_def_g72[] = { -+ { -+ .name = "l2_access", -+ .default_value = 393000, -+ .op = kbase_g7x_sum_all_memsys_blocks, -+ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, -+ }, -+ { -+ .name = "exec_instr_count", -+ .default_value = 227000, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_EXEC_INSTR_COUNT, -+ }, -+ { -+ .name = "tex_issue", -+ .default_value = 181900, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_TEX_COORD_ISSUE, -+ }, -+ { -+ .name = "tile_wb", -+ .default_value = -120200, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_BEATS_WR_TIB, -+ }, -+ { -+ .name = "gpu_active", -+ .default_value = 133100, -+ .op = kbase_g7x_jm_single_counter, -+ .counter_block_offset = JM_GPU_ACTIVE, -+ }, -+}; ++ errcode = kbase_hwcnt_enable_map_alloc(hctx->accum.metadata, &hctx->accum.enable_map); ++ if (errcode) ++ goto error; + -+static const struct kbase_ipa_group ipa_groups_def_g76[] = { -+ { -+ .name = "gpu_active", -+ .default_value = 122000, -+ .op = kbase_g7x_jm_single_counter, -+ .counter_block_offset = JM_GPU_ACTIVE, -+ }, -+ { -+ .name = "exec_instr_count", -+ .default_value = 488900, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_EXEC_INSTR_COUNT, -+ }, -+ { -+ .name = "vary_instr", -+ .default_value = 212100, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_VARY_INSTR, -+ }, -+ { -+ .name = "tex_tfch_num_operations", -+ .default_value = 288000, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_TEX_TFCH_NUM_OPERATIONS, -+ }, -+ { -+ .name = "l2_access", -+ .default_value = 378100, -+ .op = kbase_g7x_sum_all_memsys_blocks, -+ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, -+ }, -+}; ++ hctx->accum.enable_map_any_enabled = false; + -+static const struct kbase_ipa_group ipa_groups_def_g52_r1[] = { -+ { -+ .name = "gpu_active", -+ .default_value = 224200, -+ .op = kbase_g7x_jm_single_counter, -+ .counter_block_offset = JM_GPU_ACTIVE, -+ }, -+ { -+ .name = "exec_instr_count", -+ .default_value = 384700, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_EXEC_INSTR_COUNT, -+ }, -+ { -+ .name = "vary_instr", -+ .default_value = 271900, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_VARY_INSTR, -+ }, -+ { -+ .name = "tex_tfch_num_operations", -+ .default_value = 477700, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_TEX_TFCH_NUM_OPERATIONS, -+ }, -+ { -+ .name = "l2_access", -+ .default_value = 551400, -+ .op = kbase_g7x_sum_all_memsys_blocks, -+ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, -+ }, -+}; ++ errcode = kbase_hwcnt_dump_buffer_alloc(hctx->accum.metadata, &hctx->accum.accum_buf); ++ if (errcode) ++ goto error; + -+static const struct kbase_ipa_group ipa_groups_def_g51[] = { -+ { -+ .name = "gpu_active", -+ .default_value = 201400, -+ .op = kbase_g7x_jm_single_counter, -+ .counter_block_offset = JM_GPU_ACTIVE, -+ }, -+ { -+ .name = "exec_instr_count", -+ .default_value = 392700, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_EXEC_INSTR_COUNT, -+ }, -+ { -+ .name = "vary_instr", -+ .default_value = 274000, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_VARY_INSTR, -+ }, -+ { -+ .name = "tex_tfch_num_operations", -+ .default_value = 528000, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_TEX_TFCH_NUM_OPERATIONS, -+ }, -+ { -+ .name = "l2_access", -+ .default_value = 506400, -+ .op = kbase_g7x_sum_all_memsys_blocks, -+ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, -+ }, -+}; ++ errcode = kbase_hwcnt_enable_map_alloc(hctx->accum.metadata, &hctx->accum.scratch_map); ++ if (errcode) ++ goto error; + -+static const struct kbase_ipa_group ipa_groups_def_g77[] = { -+ { -+ .name = "l2_access", -+ .default_value = 710800, -+ .op = kbase_g7x_sum_all_memsys_blocks, -+ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, -+ }, -+ { -+ .name = "exec_instr_msg", -+ .default_value = 2375300, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_EXEC_INSTR_MSG, -+ }, -+ { -+ .name = "exec_instr_fma", -+ .default_value = 656100, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_EXEC_INSTR_FMA, -+ }, -+ { -+ .name = "tex_filt_num_operations", -+ .default_value = 318800, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_TEX_FILT_NUM_OPERATIONS, -+ }, -+ { -+ .name = "gpu_active", -+ .default_value = 172800, -+ .op = kbase_g7x_jm_single_counter, -+ .counter_block_offset = JM_GPU_ACTIVE, -+ }, -+}; ++ hctx->accum.accumulated = false; + -+static const struct kbase_ipa_group ipa_groups_def_tbex[] = { -+ { -+ .name = "l2_access", -+ .default_value = 599800, -+ .op = kbase_g7x_sum_all_memsys_blocks, -+ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, -+ }, -+ { -+ .name = "exec_instr_msg", -+ .default_value = 1830200, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_EXEC_INSTR_MSG, -+ }, -+ { -+ .name = "exec_instr_fma", -+ .default_value = 407300, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_EXEC_INSTR_FMA, -+ }, -+ { -+ .name = "tex_filt_num_operations", -+ .default_value = 224500, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_TEX_FILT_NUM_OPERATIONS, -+ }, -+ { -+ .name = "gpu_active", -+ .default_value = 153800, -+ .op = kbase_g7x_jm_single_counter, -+ .counter_block_offset = JM_GPU_ACTIVE, -+ }, -+}; ++ hctx->accum.ts_last_dump_ns = hctx->iface->timestamp_ns(hctx->accum.backend); + -+static const struct kbase_ipa_group ipa_groups_def_tbax[] = { -+ { -+ .name = "l2_access", -+ .default_value = 599800, -+ .op = kbase_g7x_sum_all_memsys_blocks, -+ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, -+ }, -+ { -+ .name = "exec_instr_msg", -+ .default_value = 1830200, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_EXEC_INSTR_MSG, -+ }, -+ { -+ .name = "exec_instr_fma", -+ .default_value = 407300, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_EXEC_INSTR_FMA, -+ }, -+ { -+ .name = "tex_filt_num_operations", -+ .default_value = 224500, -+ .op = kbase_g7x_sum_all_shader_cores, -+ .counter_block_offset = SC_TEX_FILT_NUM_OPERATIONS, -+ }, -+ { -+ .name = "gpu_active", -+ .default_value = 153800, -+ .op = kbase_g7x_jm_single_counter, -+ .counter_block_offset = JM_GPU_ACTIVE, -+ }, -+}; ++ return 0; + ++error: ++ kbasep_hwcnt_accumulator_term(hctx); ++ return errcode; ++} + -+#define IPA_POWER_MODEL_OPS(gpu, init_token) \ -+ const struct kbase_ipa_model_ops kbase_ ## gpu ## _ipa_model_ops = { \ -+ .name = "mali-" #gpu "-power-model", \ -+ .init = kbase_ ## init_token ## _power_model_init, \ -+ .term = kbase_ipa_vinstr_common_model_term, \ -+ .get_dynamic_coeff = kbase_ipa_vinstr_dynamic_coeff, \ -+ }; \ -+ KBASE_EXPORT_TEST_API(kbase_ ## gpu ## _ipa_model_ops) ++/** ++ * kbasep_hwcnt_accumulator_disable() - Transition the accumulator into the ++ * disabled state, from the enabled or ++ * error states. ++ * @hctx: Non-NULL pointer to hardware counter context. ++ * @accumulate: True if we should accumulate before disabling, else false. ++ */ ++static void kbasep_hwcnt_accumulator_disable(struct kbase_hwcnt_context *hctx, bool accumulate) ++{ ++ int errcode = 0; ++ bool backend_enabled = false; ++ struct kbase_hwcnt_accumulator *accum; ++ unsigned long flags; ++ u64 dump_time_ns; + -+#define STANDARD_POWER_MODEL(gpu, reference_voltage) \ -+ static int kbase_ ## gpu ## _power_model_init(\ -+ struct kbase_ipa_model *model) \ -+ { \ -+ BUILD_BUG_ON(ARRAY_SIZE(ipa_groups_def_ ## gpu) > \ -+ KBASE_IPA_MAX_GROUP_DEF_NUM); \ -+ return kbase_ipa_vinstr_common_model_init(model, \ -+ ipa_groups_def_ ## gpu, \ -+ ARRAY_SIZE(ipa_groups_def_ ## gpu), \ -+ kbase_g7x_get_active_cycles, \ -+ (reference_voltage)); \ -+ } \ -+ IPA_POWER_MODEL_OPS(gpu, gpu) ++ WARN_ON(!hctx); ++ lockdep_assert_held(&hctx->accum_lock); ++ WARN_ON(!hctx->accum_inited); + -+#define ALIAS_POWER_MODEL(gpu, as_gpu) \ -+ IPA_POWER_MODEL_OPS(gpu, as_gpu) ++ accum = &hctx->accum; + -+STANDARD_POWER_MODEL(g71, 800); -+STANDARD_POWER_MODEL(g72, 800); -+STANDARD_POWER_MODEL(g76, 800); -+STANDARD_POWER_MODEL(g52_r1, 1000); -+STANDARD_POWER_MODEL(g51, 1000); -+STANDARD_POWER_MODEL(g77, 1000); -+STANDARD_POWER_MODEL(tbex, 1000); -+STANDARD_POWER_MODEL(tbax, 1000); ++ spin_lock_irqsave(&hctx->state_lock, flags); + -+/* g52 is an alias of g76 (TNOX) for IPA */ -+ALIAS_POWER_MODEL(g52, g76); -+/* tnax is an alias of g77 (TTRX) for IPA */ -+ALIAS_POWER_MODEL(tnax, g77); -diff --git a/drivers/gpu/arm/bifrost/jm/mali_base_jm_kernel.h b/drivers/gpu/arm/bifrost/jm/mali_base_jm_kernel.h -new file mode 100755 -index 000000000000..9367cc5431cf ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/jm/mali_base_jm_kernel.h -@@ -0,0 +1,1079 @@ -+/* -+ * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+#ifndef _BASE_JM_KERNEL_H_ -+#define _BASE_JM_KERNEL_H_ ++ WARN_ON(hctx->disable_count != 0); ++ WARN_ON(hctx->accum.state == ACCUM_STATE_DISABLED); + -+/* Memory allocation, access/hint flags. -+ * -+ * See base_mem_alloc_flags. -+ */ ++ if ((hctx->accum.state == ACCUM_STATE_ENABLED) && (accum->enable_map_any_enabled)) ++ backend_enabled = true; + -+/* IN */ -+/* Read access CPU side -+ */ -+#define BASE_MEM_PROT_CPU_RD ((base_mem_alloc_flags)1 << 0) ++ if (!backend_enabled) ++ hctx->accum.state = ACCUM_STATE_DISABLED; + -+/* Write access CPU side -+ */ -+#define BASE_MEM_PROT_CPU_WR ((base_mem_alloc_flags)1 << 1) ++ spin_unlock_irqrestore(&hctx->state_lock, flags); + -+/* Read access GPU side -+ */ -+#define BASE_MEM_PROT_GPU_RD ((base_mem_alloc_flags)1 << 2) ++ /* Early out if the backend is not already enabled */ ++ if (!backend_enabled) ++ return; + -+/* Write access GPU side -+ */ -+#define BASE_MEM_PROT_GPU_WR ((base_mem_alloc_flags)1 << 3) ++ if (!accumulate) ++ goto disable; + -+/* Execute allowed on the GPU side -+ */ -+#define BASE_MEM_PROT_GPU_EX ((base_mem_alloc_flags)1 << 4) ++ /* Try and accumulate before disabling */ ++ errcode = hctx->iface->dump_request(accum->backend, &dump_time_ns); ++ if (errcode) ++ goto disable; + -+/* Will be permanently mapped in kernel space. -+ * Flag is only allowed on allocations originating from kbase. -+ */ -+#define BASEP_MEM_PERMANENT_KERNEL_MAPPING ((base_mem_alloc_flags)1 << 5) ++ errcode = hctx->iface->dump_wait(accum->backend); ++ if (errcode) ++ goto disable; + -+/* The allocation will completely reside within the same 4GB chunk in the GPU -+ * virtual space. -+ * Since this flag is primarily required only for the TLS memory which will -+ * not be used to contain executable code and also not used for Tiler heap, -+ * it can't be used along with BASE_MEM_PROT_GPU_EX and TILER_ALIGN_TOP flags. -+ */ -+#define BASE_MEM_GPU_VA_SAME_4GB_PAGE ((base_mem_alloc_flags)1 << 6) ++ errcode = hctx->iface->dump_get(accum->backend, &accum->accum_buf, &accum->enable_map, ++ accum->accumulated); ++ if (errcode) ++ goto disable; + -+/* Userspace is not allowed to free this memory. -+ * Flag is only allowed on allocations originating from kbase. -+ */ -+#define BASEP_MEM_NO_USER_FREE ((base_mem_alloc_flags)1 << 7) ++ accum->accumulated = true; + -+#define BASE_MEM_RESERVED_BIT_8 ((base_mem_alloc_flags)1 << 8) ++disable: ++ hctx->iface->dump_disable(accum->backend); + -+/* Grow backing store on GPU Page Fault -+ */ -+#define BASE_MEM_GROW_ON_GPF ((base_mem_alloc_flags)1 << 9) ++ /* Regardless of any errors during the accumulate, put the accumulator ++ * in the disabled state. ++ */ ++ spin_lock_irqsave(&hctx->state_lock, flags); + -+/* Page coherence Outer shareable, if available -+ */ -+#define BASE_MEM_COHERENT_SYSTEM ((base_mem_alloc_flags)1 << 10) -+ -+/* Page coherence Inner shareable -+ */ -+#define BASE_MEM_COHERENT_LOCAL ((base_mem_alloc_flags)1 << 11) -+ -+/* IN/OUT */ -+/* Should be cached on the CPU, returned if actually cached -+ */ -+#define BASE_MEM_CACHED_CPU ((base_mem_alloc_flags)1 << 12) ++ hctx->accum.state = ACCUM_STATE_DISABLED; + -+/* IN/OUT */ -+/* Must have same VA on both the GPU and the CPU -+ */ -+#define BASE_MEM_SAME_VA ((base_mem_alloc_flags)1 << 13) ++ spin_unlock_irqrestore(&hctx->state_lock, flags); ++} + -+/* OUT */ -+/* Must call mmap to acquire a GPU address for the allocation ++/** ++ * kbasep_hwcnt_accumulator_enable() - Transition the accumulator into the ++ * enabled state, from the disabled state. ++ * @hctx: Non-NULL pointer to hardware counter context. + */ -+#define BASE_MEM_NEED_MMAP ((base_mem_alloc_flags)1 << 14) ++static void kbasep_hwcnt_accumulator_enable(struct kbase_hwcnt_context *hctx) ++{ ++ int errcode = 0; ++ struct kbase_hwcnt_accumulator *accum; + -+/* IN */ -+/* Page coherence Outer shareable, required. -+ */ -+#define BASE_MEM_COHERENT_SYSTEM_REQUIRED ((base_mem_alloc_flags)1 << 15) ++ WARN_ON(!hctx); ++ lockdep_assert_held(&hctx->state_lock); ++ WARN_ON(!hctx->accum_inited); ++ WARN_ON(hctx->accum.state != ACCUM_STATE_DISABLED); + -+/* Protected memory -+ */ -+#define BASE_MEM_PROTECTED ((base_mem_alloc_flags)1 << 16) ++ accum = &hctx->accum; + -+/* Not needed physical memory -+ */ -+#define BASE_MEM_DONT_NEED ((base_mem_alloc_flags)1 << 17) ++ /* The backend only needs enabling if any counters are enabled */ ++ if (accum->enable_map_any_enabled) ++ errcode = hctx->iface->dump_enable_nolock(accum->backend, &accum->enable_map); + -+/* Must use shared CPU/GPU zone (SAME_VA zone) but doesn't require the -+ * addresses to be the same -+ */ -+#define BASE_MEM_IMPORT_SHARED ((base_mem_alloc_flags)1 << 18) ++ if (!errcode) ++ accum->state = ACCUM_STATE_ENABLED; ++ else ++ accum->state = ACCUM_STATE_ERROR; ++} + +/** -+ * Bit 19 is reserved. ++ * kbasep_hwcnt_accumulator_dump() - Perform a dump with the most up-to-date ++ * values of enabled counters possible, and ++ * optionally update the set of enabled ++ * counters. ++ * @hctx: Non-NULL pointer to the hardware counter context ++ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will ++ * be written out to on success ++ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will ++ * be written out to on success ++ * @dump_buf: Pointer to the buffer where the dump will be written out to on ++ * success. If non-NULL, must have the same metadata as the ++ * accumulator. If NULL, the dump will be discarded. ++ * @new_map: Pointer to the new counter enable map. If non-NULL, must have ++ * the same metadata as the accumulator. If NULL, the set of ++ * enabled counters will be unchanged. + * -+ * Do not remove, use the next unreserved bit for new flags ++ * Return: 0 on success, else error code. + */ -+#define BASE_MEM_RESERVED_BIT_19 ((base_mem_alloc_flags)1 << 19) ++static int kbasep_hwcnt_accumulator_dump(struct kbase_hwcnt_context *hctx, u64 *ts_start_ns, ++ u64 *ts_end_ns, struct kbase_hwcnt_dump_buffer *dump_buf, ++ const struct kbase_hwcnt_enable_map *new_map) ++{ ++ int errcode = 0; ++ unsigned long flags; ++ enum kbase_hwcnt_accum_state state; ++ bool dump_requested = false; ++ bool dump_written = false; ++ bool cur_map_any_enabled; ++ struct kbase_hwcnt_enable_map *cur_map; ++ bool new_map_any_enabled = false; ++ u64 dump_time_ns = 0; ++ struct kbase_hwcnt_accumulator *accum; + -+/** -+ * Memory starting from the end of the initial commit is aligned to 'extent' -+ * pages, where 'extent' must be a power of 2 and no more than -+ * BASE_MEM_TILER_ALIGN_TOP_EXTENT_MAX_PAGES -+ */ -+#define BASE_MEM_TILER_ALIGN_TOP ((base_mem_alloc_flags)1 << 20) ++ WARN_ON(!hctx); ++ WARN_ON(!ts_start_ns); ++ WARN_ON(!ts_end_ns); ++ WARN_ON(dump_buf && (dump_buf->metadata != hctx->accum.metadata)); ++ WARN_ON(new_map && (new_map->metadata != hctx->accum.metadata)); ++ WARN_ON(!hctx->accum_inited); ++ lockdep_assert_held(&hctx->accum_lock); + -+/* Should be uncached on the GPU, will work only for GPUs using AARCH64 mmu -+ * mode. Some components within the GPU might only be able to access memory -+ * that is GPU cacheable. Refer to the specific GPU implementation for more -+ * details. The 3 shareability flags will be ignored for GPU uncached memory. -+ * If used while importing USER_BUFFER type memory, then the import will fail -+ * if the memory is not aligned to GPU and CPU cache line width. -+ */ -+#define BASE_MEM_UNCACHED_GPU ((base_mem_alloc_flags)1 << 21) ++ accum = &hctx->accum; ++ cur_map = &accum->scratch_map; + -+/* -+ * Bits [22:25] for group_id (0~15). -+ * -+ * base_mem_group_id_set() should be used to pack a memory group ID into a -+ * base_mem_alloc_flags value instead of accessing the bits directly. -+ * base_mem_group_id_get() should be used to extract the memory group ID from -+ * a base_mem_alloc_flags value. -+ */ -+#define BASEP_MEM_GROUP_ID_SHIFT 22 -+#define BASE_MEM_GROUP_ID_MASK \ -+ ((base_mem_alloc_flags)0xF << BASEP_MEM_GROUP_ID_SHIFT) ++ /* Save out info about the current enable map */ ++ cur_map_any_enabled = accum->enable_map_any_enabled; ++ kbase_hwcnt_enable_map_copy(cur_map, &accum->enable_map); + -+/* Must do CPU cache maintenance when imported memory is mapped/unmapped -+ * on GPU. Currently applicable to dma-buf type only. -+ */ -+#define BASE_MEM_IMPORT_SYNC_ON_MAP_UNMAP ((base_mem_alloc_flags)1 << 26) ++ if (new_map) ++ new_map_any_enabled = kbase_hwcnt_enable_map_any_enabled(new_map); + -+/* Use the GPU VA chosen by the kernel client */ -+#define BASE_MEM_FLAG_MAP_FIXED ((base_mem_alloc_flags)1 << 27) ++ /* ++ * We're holding accum_lock, so the accumulator state might transition ++ * from disabled to enabled during this function (as enabling is lock ++ * free), but it will never disable (as disabling needs to hold the ++ * accum_lock), nor will it ever transition from enabled to error (as ++ * an enable while we're already enabled is impossible). ++ * ++ * If we're already disabled, we'll only look at the accumulation buffer ++ * rather than do a real dump, so a concurrent enable does not affect ++ * us. ++ * ++ * If a concurrent enable fails, we might transition to the error ++ * state, but again, as we're only looking at the accumulation buffer, ++ * it's not an issue. ++ */ ++ spin_lock_irqsave(&hctx->state_lock, flags); + -+/* OUT */ -+/* Kernel side cache sync ops required */ -+#define BASE_MEM_KERNEL_SYNC ((base_mem_alloc_flags)1 << 28) ++ state = accum->state; + -+/* Force trimming of JIT allocations when creating a new allocation */ -+#define BASEP_MEM_PERFORM_JIT_TRIM ((base_mem_alloc_flags)1 << 29) ++ /* ++ * Update the new map now, such that if an enable occurs during this ++ * dump then that enable will set the new map. If we're already enabled, ++ * then we'll do it ourselves after the dump. ++ */ ++ if (new_map) { ++ kbase_hwcnt_enable_map_copy(&accum->enable_map, new_map); ++ accum->enable_map_any_enabled = new_map_any_enabled; ++ } + -+/* Number of bits used as flags for base memory management -+ * -+ * Must be kept in sync with the base_mem_alloc_flags flags -+ */ -+#define BASE_MEM_FLAGS_NR_BITS 30 ++ spin_unlock_irqrestore(&hctx->state_lock, flags); + -+/* A mask of all the flags which are only valid for allocations within kbase, -+ * and may not be passed from user space. -+ */ -+#define BASEP_MEM_FLAGS_KERNEL_ONLY \ -+ (BASEP_MEM_PERMANENT_KERNEL_MAPPING | BASEP_MEM_NO_USER_FREE | \ -+ BASE_MEM_FLAG_MAP_FIXED | BASEP_MEM_PERFORM_JIT_TRIM) ++ /* Error state, so early out. No need to roll back any map updates */ ++ if (state == ACCUM_STATE_ERROR) ++ return -EIO; + -+/* A mask for all output bits, excluding IN/OUT bits. -+ */ -+#define BASE_MEM_FLAGS_OUTPUT_MASK BASE_MEM_NEED_MMAP ++ /* Initiate the dump if the backend is enabled. */ ++ if ((state == ACCUM_STATE_ENABLED) && cur_map_any_enabled) { ++ if (dump_buf) { ++ errcode = hctx->iface->dump_request(accum->backend, &dump_time_ns); ++ dump_requested = true; ++ } else { ++ dump_time_ns = hctx->iface->timestamp_ns(accum->backend); ++ errcode = hctx->iface->dump_clear(accum->backend); ++ } + -+/* A mask for all input bits, including IN/OUT bits. -+ */ -+#define BASE_MEM_FLAGS_INPUT_MASK \ -+ (((1 << BASE_MEM_FLAGS_NR_BITS) - 1) & ~BASE_MEM_FLAGS_OUTPUT_MASK) ++ if (errcode) ++ goto error; ++ } else { ++ dump_time_ns = hctx->iface->timestamp_ns(accum->backend); ++ } + -+/* A mask of all currently reserved flags -+ */ -+#define BASE_MEM_FLAGS_RESERVED \ -+ (BASE_MEM_RESERVED_BIT_8 | BASE_MEM_RESERVED_BIT_19) ++ /* Copy any accumulation into the dest buffer */ ++ if (accum->accumulated && dump_buf) { ++ kbase_hwcnt_dump_buffer_copy(dump_buf, &accum->accum_buf, cur_map); ++ dump_written = true; ++ } + -+#define BASEP_MEM_INVALID_HANDLE (0ull << 12) -+#define BASE_MEM_MMU_DUMP_HANDLE (1ull << 12) -+#define BASE_MEM_TRACE_BUFFER_HANDLE (2ull << 12) -+#define BASE_MEM_MAP_TRACKING_HANDLE (3ull << 12) -+#define BASEP_MEM_WRITE_ALLOC_PAGES_HANDLE (4ull << 12) -+/* reserved handles ..-47< for future special handles */ -+#define BASE_MEM_COOKIE_BASE (64ul << 12) -+#define BASE_MEM_FIRST_FREE_ADDRESS ((BITS_PER_LONG << 12) + \ -+ BASE_MEM_COOKIE_BASE) ++ /* Wait for any requested dumps to complete */ ++ if (dump_requested) { ++ WARN_ON(state != ACCUM_STATE_ENABLED); ++ errcode = hctx->iface->dump_wait(accum->backend); ++ if (errcode) ++ goto error; ++ } + -+/* Similar to BASE_MEM_TILER_ALIGN_TOP, memory starting from the end of the -+ * initial commit is aligned to 'extent' pages, where 'extent' must be a power -+ * of 2 and no more than BASE_MEM_TILER_ALIGN_TOP_EXTENT_MAX_PAGES -+ */ -+#define BASE_JIT_ALLOC_MEM_TILER_ALIGN_TOP (1 << 0) ++ /* If we're enabled and there's a new enable map, change the enabled set ++ * as soon after the dump has completed as possible. ++ */ ++ if ((state == ACCUM_STATE_ENABLED) && new_map) { ++ /* Backend is only enabled if there were any enabled counters */ ++ if (cur_map_any_enabled) ++ hctx->iface->dump_disable(accum->backend); + -+/** -+ * If set, the heap info address points to a u32 holding the used size in bytes; -+ * otherwise it points to a u64 holding the lowest address of unused memory. -+ */ -+#define BASE_JIT_ALLOC_HEAP_INFO_IS_SIZE (1 << 1) ++ /* (Re-)enable the backend if the new map has enabled counters. ++ * No need to acquire the spinlock, as concurrent enable while ++ * we're already enabled and holding accum_lock is impossible. ++ */ ++ if (new_map_any_enabled) { ++ errcode = hctx->iface->dump_enable(accum->backend, new_map); ++ if (errcode) ++ goto error; ++ } ++ } + -+/** -+ * Valid set of just-in-time memory allocation flags -+ * -+ * Note: BASE_JIT_ALLOC_HEAP_INFO_IS_SIZE cannot be set if heap_info_gpu_addr -+ * in %base_jit_alloc_info is 0 (atom with BASE_JIT_ALLOC_HEAP_INFO_IS_SIZE set -+ * and heap_info_gpu_addr being 0 will be rejected). -+ */ -+#define BASE_JIT_ALLOC_VALID_FLAGS \ -+ (BASE_JIT_ALLOC_MEM_TILER_ALIGN_TOP | BASE_JIT_ALLOC_HEAP_INFO_IS_SIZE) ++ /* Copy, accumulate, or zero into the dest buffer to finish */ ++ if (dump_buf) { ++ /* If we dumped, copy or accumulate it into the destination */ ++ if (dump_requested) { ++ WARN_ON(state != ACCUM_STATE_ENABLED); ++ errcode = hctx->iface->dump_get(accum->backend, dump_buf, cur_map, ++ dump_written); ++ if (errcode) ++ goto error; ++ dump_written = true; ++ } ++ ++ /* If we've not written anything into the dump buffer so far, it ++ * means there was nothing to write. Zero any enabled counters. ++ */ ++ if (!dump_written) ++ kbase_hwcnt_dump_buffer_zero(dump_buf, cur_map); ++ } ++ ++ /* Write out timestamps */ ++ *ts_start_ns = accum->ts_last_dump_ns; ++ *ts_end_ns = dump_time_ns; ++ ++ accum->accumulated = false; ++ accum->ts_last_dump_ns = dump_time_ns; ++ ++ return 0; ++error: ++ /* An error was only physically possible if the backend was enabled */ ++ WARN_ON(state != ACCUM_STATE_ENABLED); ++ ++ /* Disable the backend, and transition to the error state */ ++ hctx->iface->dump_disable(accum->backend); ++ spin_lock_irqsave(&hctx->state_lock, flags); ++ ++ accum->state = ACCUM_STATE_ERROR; ++ ++ spin_unlock_irqrestore(&hctx->state_lock, flags); ++ ++ return errcode; ++} + +/** -+ * typedef base_context_create_flags - Flags to pass to ::base_context_init. -+ * -+ * Flags can be ORed together to enable multiple things. -+ * -+ * These share the same space as BASEP_CONTEXT_FLAG_*, and so must -+ * not collide with them. ++ * kbasep_hwcnt_context_disable() - Increment the disable count of the context. ++ * @hctx: Non-NULL pointer to hardware counter context. ++ * @accumulate: True if we should accumulate before disabling, else false. + */ -+typedef u32 base_context_create_flags; ++static void kbasep_hwcnt_context_disable(struct kbase_hwcnt_context *hctx, bool accumulate) ++{ ++ unsigned long flags; + -+/* No flags set */ -+#define BASE_CONTEXT_CREATE_FLAG_NONE ((base_context_create_flags)0) ++ WARN_ON(!hctx); ++ lockdep_assert_held(&hctx->accum_lock); + -+/* Base context is embedded in a cctx object (flag used for CINSTR -+ * software counter macros) -+ */ -+#define BASE_CONTEXT_CCTX_EMBEDDED ((base_context_create_flags)1 << 0) ++ if (!kbase_hwcnt_context_disable_atomic(hctx)) { ++ kbasep_hwcnt_accumulator_disable(hctx, accumulate); + -+/* Base context is a 'System Monitor' context for Hardware counters. -+ * -+ * One important side effect of this is that job submission is disabled. -+ */ -+#define BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED \ -+ ((base_context_create_flags)1 << 1) ++ spin_lock_irqsave(&hctx->state_lock, flags); + -+/* Bit-shift used to encode a memory group ID in base_context_create_flags -+ */ -+#define BASEP_CONTEXT_MMU_GROUP_ID_SHIFT (3) ++ /* Atomic disable failed and we're holding the mutex, so current ++ * disable count must be 0. ++ */ ++ WARN_ON(hctx->disable_count != 0); ++ hctx->disable_count++; + -+/* Bitmask used to encode a memory group ID in base_context_create_flags -+ */ -+#define BASEP_CONTEXT_MMU_GROUP_ID_MASK \ -+ ((base_context_create_flags)0xF << BASEP_CONTEXT_MMU_GROUP_ID_SHIFT) ++ spin_unlock_irqrestore(&hctx->state_lock, flags); ++ } ++} + -+/* Bitpattern describing the base_context_create_flags that can be -+ * passed to the kernel -+ */ -+#define BASEP_CONTEXT_CREATE_KERNEL_FLAGS \ -+ (BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED | \ -+ BASEP_CONTEXT_MMU_GROUP_ID_MASK) ++int kbase_hwcnt_accumulator_acquire(struct kbase_hwcnt_context *hctx, ++ struct kbase_hwcnt_accumulator **accum) ++{ ++ int errcode = 0; ++ unsigned long flags; + -+/* Bitpattern describing the ::base_context_create_flags that can be -+ * passed to base_context_init() -+ */ -+#define BASEP_CONTEXT_CREATE_ALLOWED_FLAGS \ -+ (BASE_CONTEXT_CCTX_EMBEDDED | BASEP_CONTEXT_CREATE_KERNEL_FLAGS) ++ if (!hctx || !accum) ++ return -EINVAL; + -+/* -+ * Private flags used on the base context -+ * -+ * These start at bit 31, and run down to zero. -+ * -+ * They share the same space as base_context_create_flags, and so must -+ * not collide with them. -+ */ ++ mutex_lock(&hctx->accum_lock); ++ spin_lock_irqsave(&hctx->state_lock, flags); + -+/* Private flag tracking whether job descriptor dumping is disabled */ -+#define BASEP_CONTEXT_FLAG_JOB_DUMP_DISABLED \ -+ ((base_context_create_flags)(1 << 31)) ++ if (!hctx->accum_inited) ++ /* Set accum initing now to prevent concurrent init */ ++ hctx->accum_inited = true; ++ else ++ /* Already have an accum, or already being inited */ ++ errcode = -EBUSY; + -+/* Enable additional tracepoints for latency measurements (TL_ATOM_READY, -+ * TL_ATOM_DONE, TL_ATOM_PRIO_CHANGE, TL_ATOM_EVENT_POST) -+ */ -+#define BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS (1 << 0) ++ spin_unlock_irqrestore(&hctx->state_lock, flags); ++ mutex_unlock(&hctx->accum_lock); + -+/* Indicate that job dumping is enabled. This could affect certain timers -+ * to account for the performance impact. -+ */ -+#define BASE_TLSTREAM_JOB_DUMPING_ENABLED (1 << 1) ++ if (errcode) ++ return errcode; + -+#define BASE_TLSTREAM_FLAGS_MASK (BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS | \ -+ BASE_TLSTREAM_JOB_DUMPING_ENABLED) -+/* -+ * Dependency stuff, keep it private for now. May want to expose it if -+ * we decide to make the number of semaphores a configurable -+ * option. -+ */ -+#define BASE_JD_ATOM_COUNT 256 ++ errcode = kbasep_hwcnt_accumulator_init(hctx); + -+/* Maximum number of concurrent render passes. -+ */ -+#define BASE_JD_RP_COUNT (256) ++ if (errcode) { ++ mutex_lock(&hctx->accum_lock); ++ spin_lock_irqsave(&hctx->state_lock, flags); + -+/* Set/reset values for a software event */ -+#define BASE_JD_SOFT_EVENT_SET ((unsigned char)1) -+#define BASE_JD_SOFT_EVENT_RESET ((unsigned char)0) ++ hctx->accum_inited = false; + -+/** -+ * struct base_jd_udata - Per-job data -+ * -+ * This structure is used to store per-job data, and is completely unused -+ * by the Base driver. It can be used to store things such as callback -+ * function pointer, data to handle job completion. It is guaranteed to be -+ * untouched by the Base driver. -+ * -+ * @blob: per-job data array -+ */ -+struct base_jd_udata { -+ u64 blob[2]; -+}; ++ spin_unlock_irqrestore(&hctx->state_lock, flags); ++ mutex_unlock(&hctx->accum_lock); + -+/** -+ * typedef base_jd_dep_type - Job dependency type. -+ * -+ * A flags field will be inserted into the atom structure to specify whether a -+ * dependency is a data or ordering dependency (by putting it before/after -+ * 'core_req' in the structure it should be possible to add without changing -+ * the structure size). -+ * When the flag is set for a particular dependency to signal that it is an -+ * ordering only dependency then errors will not be propagated. -+ */ -+typedef u8 base_jd_dep_type; ++ return errcode; ++ } + -+#define BASE_JD_DEP_TYPE_INVALID (0) /**< Invalid dependency */ -+#define BASE_JD_DEP_TYPE_DATA (1U << 0) /**< Data dependency */ -+#define BASE_JD_DEP_TYPE_ORDER (1U << 1) /**< Order dependency */ ++ spin_lock_irqsave(&hctx->state_lock, flags); + -+/** -+ * typedef base_jd_core_req - Job chain hardware requirements. -+ * -+ * A job chain must specify what GPU features it needs to allow the -+ * driver to schedule the job correctly. By not specifying the -+ * correct settings can/will cause an early job termination. Multiple -+ * values can be ORed together to specify multiple requirements. -+ * Special case is ::BASE_JD_REQ_DEP, which is used to express complex -+ * dependencies, and that doesn't execute anything on the hardware. -+ */ -+typedef u32 base_jd_core_req; ++ WARN_ON(hctx->disable_count == 0); ++ WARN_ON(hctx->accum.enable_map_any_enabled); + -+/* Requirements that come from the HW */ ++ /* Decrement the disable count to allow the accumulator to be accessible ++ * now that it's fully constructed. ++ */ ++ hctx->disable_count--; + -+/* No requirement, dependency only -+ */ -+#define BASE_JD_REQ_DEP ((base_jd_core_req)0) ++ /* ++ * Make sure the accumulator is initialised to the correct state. ++ * Regardless of initial state, counters don't need to be enabled via ++ * the backend, as the initial enable map has no enabled counters. ++ */ ++ hctx->accum.state = (hctx->disable_count == 0) ? ACCUM_STATE_ENABLED : ACCUM_STATE_DISABLED; + -+/* Requires fragment shaders -+ */ -+#define BASE_JD_REQ_FS ((base_jd_core_req)1 << 0) ++ spin_unlock_irqrestore(&hctx->state_lock, flags); + -+/* Requires compute shaders -+ * -+ * This covers any of the following GPU job types: -+ * - Vertex Shader Job -+ * - Geometry Shader Job -+ * - An actual Compute Shader Job -+ * -+ * Compare this with BASE_JD_REQ_ONLY_COMPUTE, which specifies that the -+ * job is specifically just the "Compute Shader" job type, and not the "Vertex -+ * Shader" nor the "Geometry Shader" job type. -+ */ -+#define BASE_JD_REQ_CS ((base_jd_core_req)1 << 1) ++ *accum = &hctx->accum; + -+/* Requires tiling */ -+#define BASE_JD_REQ_T ((base_jd_core_req)1 << 2) ++ return 0; ++} + -+/* Requires cache flushes */ -+#define BASE_JD_REQ_CF ((base_jd_core_req)1 << 3) ++void kbase_hwcnt_accumulator_release(struct kbase_hwcnt_accumulator *accum) ++{ ++ unsigned long flags; ++ struct kbase_hwcnt_context *hctx; + -+/* Requires value writeback */ -+#define BASE_JD_REQ_V ((base_jd_core_req)1 << 4) ++ if (!accum) ++ return; + -+/* SW-only requirements - the HW does not expose these as part of the job slot -+ * capabilities -+ */ ++ hctx = container_of(accum, struct kbase_hwcnt_context, accum); + -+/* Requires fragment job with AFBC encoding */ -+#define BASE_JD_REQ_FS_AFBC ((base_jd_core_req)1 << 13) ++ mutex_lock(&hctx->accum_lock); + -+/* SW-only requirement: coalesce completion events. -+ * If this bit is set then completion of this atom will not cause an event to -+ * be sent to userspace, whether successful or not; completion events will be -+ * deferred until an atom completes which does not have this bit set. -+ * -+ * This bit may not be used in combination with BASE_JD_REQ_EXTERNAL_RESOURCES. -+ */ -+#define BASE_JD_REQ_EVENT_COALESCE ((base_jd_core_req)1 << 5) ++ /* Double release is a programming error */ ++ WARN_ON(!hctx->accum_inited); + -+/* SW Only requirement: the job chain requires a coherent core group. We don't -+ * mind which coherent core group is used. -+ */ -+#define BASE_JD_REQ_COHERENT_GROUP ((base_jd_core_req)1 << 6) ++ /* Disable the context to ensure the accumulator is inaccesible while ++ * we're destroying it. This performs the corresponding disable count ++ * increment to the decrement done during acquisition. ++ */ ++ kbasep_hwcnt_context_disable(hctx, false); + -+/* SW Only requirement: The performance counters should be enabled only when -+ * they are needed, to reduce power consumption. -+ */ -+#define BASE_JD_REQ_PERMON ((base_jd_core_req)1 << 7) ++ mutex_unlock(&hctx->accum_lock); + -+/* SW Only requirement: External resources are referenced by this atom. -+ * -+ * This bit may not be used in combination with BASE_JD_REQ_EVENT_COALESCE and -+ * BASE_JD_REQ_SOFT_EVENT_WAIT. -+ */ -+#define BASE_JD_REQ_EXTERNAL_RESOURCES ((base_jd_core_req)1 << 8) ++ kbasep_hwcnt_accumulator_term(hctx); + -+/* SW Only requirement: Software defined job. Jobs with this bit set will not be -+ * submitted to the hardware but will cause some action to happen within the -+ * driver -+ */ -+#define BASE_JD_REQ_SOFT_JOB ((base_jd_core_req)1 << 9) ++ mutex_lock(&hctx->accum_lock); ++ spin_lock_irqsave(&hctx->state_lock, flags); + -+#define BASE_JD_REQ_SOFT_DUMP_CPU_GPU_TIME (BASE_JD_REQ_SOFT_JOB | 0x1) -+#define BASE_JD_REQ_SOFT_FENCE_TRIGGER (BASE_JD_REQ_SOFT_JOB | 0x2) -+#define BASE_JD_REQ_SOFT_FENCE_WAIT (BASE_JD_REQ_SOFT_JOB | 0x3) ++ hctx->accum_inited = false; + -+/* 0x4 RESERVED for now */ ++ spin_unlock_irqrestore(&hctx->state_lock, flags); ++ mutex_unlock(&hctx->accum_lock); ++} + -+/* SW only requirement: event wait/trigger job. -+ * -+ * - BASE_JD_REQ_SOFT_EVENT_WAIT: this job will block until the event is set. -+ * - BASE_JD_REQ_SOFT_EVENT_SET: this job sets the event, thus unblocks the -+ * other waiting jobs. It completes immediately. -+ * - BASE_JD_REQ_SOFT_EVENT_RESET: this job resets the event, making it -+ * possible for other jobs to wait upon. It completes immediately. -+ */ -+#define BASE_JD_REQ_SOFT_EVENT_WAIT (BASE_JD_REQ_SOFT_JOB | 0x5) -+#define BASE_JD_REQ_SOFT_EVENT_SET (BASE_JD_REQ_SOFT_JOB | 0x6) -+#define BASE_JD_REQ_SOFT_EVENT_RESET (BASE_JD_REQ_SOFT_JOB | 0x7) ++void kbase_hwcnt_context_disable(struct kbase_hwcnt_context *hctx) ++{ ++ if (WARN_ON(!hctx)) ++ return; + -+#define BASE_JD_REQ_SOFT_DEBUG_COPY (BASE_JD_REQ_SOFT_JOB | 0x8) ++ /* Try and atomically disable first, so we can avoid locking the mutex ++ * if we don't need to. ++ */ ++ if (kbase_hwcnt_context_disable_atomic(hctx)) ++ return; + -+/* SW only requirement: Just In Time allocation -+ * -+ * This job requests a single or multiple just-in-time allocations through a -+ * list of base_jit_alloc_info structure which is passed via the jc element of -+ * the atom. The number of base_jit_alloc_info structures present in the -+ * list is passed via the nr_extres element of the atom ++ mutex_lock(&hctx->accum_lock); ++ ++ kbasep_hwcnt_context_disable(hctx, true); ++ ++ mutex_unlock(&hctx->accum_lock); ++} ++ ++bool kbase_hwcnt_context_disable_atomic(struct kbase_hwcnt_context *hctx) ++{ ++ unsigned long flags; ++ bool atomic_disabled = false; ++ ++ if (WARN_ON(!hctx)) ++ return false; ++ ++ spin_lock_irqsave(&hctx->state_lock, flags); ++ ++ if (!WARN_ON(hctx->disable_count == SIZE_MAX)) { ++ /* ++ * If disable count is non-zero, we can just bump the disable ++ * count. ++ * ++ * Otherwise, we can't disable in an atomic context. ++ */ ++ if (hctx->disable_count != 0) { ++ hctx->disable_count++; ++ atomic_disabled = true; ++ } ++ } ++ ++ spin_unlock_irqrestore(&hctx->state_lock, flags); ++ ++ return atomic_disabled; ++} ++ ++void kbase_hwcnt_context_enable(struct kbase_hwcnt_context *hctx) ++{ ++ unsigned long flags; ++ ++ if (WARN_ON(!hctx)) ++ return; ++ ++ spin_lock_irqsave(&hctx->state_lock, flags); ++ ++ if (!WARN_ON(hctx->disable_count == 0)) { ++ if (hctx->disable_count == 1) ++ kbasep_hwcnt_accumulator_enable(hctx); ++ ++ hctx->disable_count--; ++ } ++ ++ spin_unlock_irqrestore(&hctx->state_lock, flags); ++} ++ ++const struct kbase_hwcnt_metadata *kbase_hwcnt_context_metadata(struct kbase_hwcnt_context *hctx) ++{ ++ if (!hctx) ++ return NULL; ++ ++ return hctx->iface->metadata(hctx->iface->info); ++} ++ ++bool kbase_hwcnt_context_queue_work(struct kbase_hwcnt_context *hctx, struct work_struct *work) ++{ ++ if (WARN_ON(!hctx) || WARN_ON(!work)) ++ return false; ++ ++ return queue_work(hctx->wq, work); ++} ++ ++int kbase_hwcnt_accumulator_set_counters(struct kbase_hwcnt_accumulator *accum, ++ const struct kbase_hwcnt_enable_map *new_map, ++ u64 *ts_start_ns, u64 *ts_end_ns, ++ struct kbase_hwcnt_dump_buffer *dump_buf) ++{ ++ int errcode; ++ struct kbase_hwcnt_context *hctx; ++ ++ if (!accum || !new_map || !ts_start_ns || !ts_end_ns) ++ return -EINVAL; ++ ++ hctx = container_of(accum, struct kbase_hwcnt_context, accum); ++ ++ if ((new_map->metadata != hctx->accum.metadata) || ++ (dump_buf && (dump_buf->metadata != hctx->accum.metadata))) ++ return -EINVAL; ++ ++ mutex_lock(&hctx->accum_lock); ++ ++ errcode = kbasep_hwcnt_accumulator_dump(hctx, ts_start_ns, ts_end_ns, dump_buf, new_map); ++ ++ mutex_unlock(&hctx->accum_lock); ++ ++ return errcode; ++} ++ ++int kbase_hwcnt_accumulator_dump(struct kbase_hwcnt_accumulator *accum, u64 *ts_start_ns, ++ u64 *ts_end_ns, struct kbase_hwcnt_dump_buffer *dump_buf) ++{ ++ int errcode; ++ struct kbase_hwcnt_context *hctx; ++ ++ if (!accum || !ts_start_ns || !ts_end_ns) ++ return -EINVAL; ++ ++ hctx = container_of(accum, struct kbase_hwcnt_context, accum); ++ ++ if (dump_buf && (dump_buf->metadata != hctx->accum.metadata)) ++ return -EINVAL; ++ ++ mutex_lock(&hctx->accum_lock); ++ ++ errcode = kbasep_hwcnt_accumulator_dump(hctx, ts_start_ns, ts_end_ns, dump_buf, NULL); ++ ++ mutex_unlock(&hctx->accum_lock); ++ ++ return errcode; ++} ++ ++u64 kbase_hwcnt_accumulator_timestamp_ns(struct kbase_hwcnt_accumulator *accum) ++{ ++ struct kbase_hwcnt_context *hctx; ++ ++ if (WARN_ON(!accum)) ++ return 0; ++ ++ hctx = container_of(accum, struct kbase_hwcnt_context, accum); ++ return hctx->iface->timestamp_ns(accum->backend); ++} +diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_accumulator.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_accumulator.h +new file mode 100644 +index 000000000..069e02068 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_accumulator.h +@@ -0,0 +1,139 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* + * -+ * It should be noted that the id entry in base_jit_alloc_info must not -+ * be reused until it has been released via BASE_JD_REQ_SOFT_JIT_FREE. ++ * (C) COPYRIGHT 2018, 2020-2022 ARM Limited. All rights reserved. + * -+ * Should this soft job fail it is expected that a BASE_JD_REQ_SOFT_JIT_FREE -+ * soft job to free the JIT allocation is still made. ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. + * -+ * The job will complete immediately. -+ */ -+#define BASE_JD_REQ_SOFT_JIT_ALLOC (BASE_JD_REQ_SOFT_JOB | 0x9) -+ -+/* SW only requirement: Just In Time free ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. + * -+ * This job requests a single or multiple just-in-time allocations created by -+ * BASE_JD_REQ_SOFT_JIT_ALLOC to be freed. The ID list of the just-in-time -+ * allocations is passed via the jc element of the atom. ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * The job will complete immediately. + */ -+#define BASE_JD_REQ_SOFT_JIT_FREE (BASE_JD_REQ_SOFT_JOB | 0xa) + -+/* SW only requirement: Map external resource -+ * -+ * This job requests external resource(s) are mapped once the dependencies -+ * of the job have been satisfied. The list of external resources are -+ * passed via the jc element of the atom which is a pointer to a -+ * base_external_resource_list. ++/* ++ * Hardware counter accumulator API. + */ -+#define BASE_JD_REQ_SOFT_EXT_RES_MAP (BASE_JD_REQ_SOFT_JOB | 0xb) + -+/* SW only requirement: Unmap external resource -+ * -+ * This job requests external resource(s) are unmapped once the dependencies -+ * of the job has been satisfied. The list of external resources are -+ * passed via the jc element of the atom which is a pointer to a -+ * base_external_resource_list. -+ */ -+#define BASE_JD_REQ_SOFT_EXT_RES_UNMAP (BASE_JD_REQ_SOFT_JOB | 0xc) ++#ifndef _KBASE_HWCNT_ACCUMULATOR_H_ ++#define _KBASE_HWCNT_ACCUMULATOR_H_ + -+/* HW Requirement: Requires Compute shaders (but not Vertex or Geometry Shaders) ++#include ++ ++struct kbase_hwcnt_context; ++struct kbase_hwcnt_accumulator; ++struct kbase_hwcnt_enable_map; ++struct kbase_hwcnt_dump_buffer; ++ ++/** ++ * kbase_hwcnt_accumulator_acquire() - Acquire the hardware counter accumulator ++ * for a hardware counter context. ++ * @hctx: Non-NULL pointer to a hardware counter context. ++ * @accum: Non-NULL pointer to where the pointer to the created accumulator ++ * will be stored on success. + * -+ * This indicates that the Job Chain contains GPU jobs of the 'Compute -+ * Shaders' type. ++ * There can exist at most one instance of the hardware counter accumulator per ++ * context at a time. + * -+ * In contrast to BASE_JD_REQ_CS, this does not indicate that the Job -+ * Chain contains 'Geometry Shader' or 'Vertex Shader' jobs. -+ */ -+#define BASE_JD_REQ_ONLY_COMPUTE ((base_jd_core_req)1 << 10) -+ -+/* HW Requirement: Use the base_jd_atom::device_nr field to specify a -+ * particular core group ++ * If multiple clients need access to the hardware counters at the same time, ++ * then an abstraction built on top of the single instance to the hardware ++ * counter accumulator is required. + * -+ * If both BASE_JD_REQ_COHERENT_GROUP and this flag are set, this flag -+ * takes priority ++ * No counters will be enabled with the returned accumulator. A subsequent call ++ * to kbase_hwcnt_accumulator_set_counters must be used to turn them on. + * -+ * This is only guaranteed to work for BASE_JD_REQ_ONLY_COMPUTE atoms. ++ * There are four components to a hardware counter dump: ++ * - A set of enabled counters ++ * - A start time ++ * - An end time ++ * - A dump buffer containing the accumulated counter values for all enabled ++ * counters between the start and end times. + * -+ * If the core availability policy is keeping the required core group turned -+ * off, then the job will fail with a BASE_JD_EVENT_PM_EVENT error code. -+ */ -+#define BASE_JD_REQ_SPECIFIC_COHERENT_GROUP ((base_jd_core_req)1 << 11) -+ -+/* SW Flag: If this bit is set then the successful completion of this atom -+ * will not cause an event to be sent to userspace -+ */ -+#define BASE_JD_REQ_EVENT_ONLY_ON_FAILURE ((base_jd_core_req)1 << 12) -+ -+/* SW Flag: If this bit is set then completion of this atom will not cause an -+ * event to be sent to userspace, whether successful or not. ++ * For each dump, it is guaranteed that all enabled counters were active for the ++ * entirety of the period between the start and end times. ++ * ++ * It is also guaranteed that the start time of dump "n" is always equal to the ++ * end time of dump "n - 1". ++ * ++ * For all dumps, the values of any counters that were not enabled is undefined. ++ * ++ * Return: 0 on success or error code. + */ -+#define BASEP_JD_REQ_EVENT_NEVER ((base_jd_core_req)1 << 14) ++int kbase_hwcnt_accumulator_acquire(struct kbase_hwcnt_context *hctx, ++ struct kbase_hwcnt_accumulator **accum); + -+/* SW Flag: Skip GPU cache clean and invalidation before starting a GPU job. ++/** ++ * kbase_hwcnt_accumulator_release() - Release a hardware counter accumulator. ++ * @accum: Non-NULL pointer to the hardware counter accumulator. + * -+ * If this bit is set then the GPU's cache will not be cleaned and invalidated -+ * until a GPU job starts which does not have this bit set or a job completes -+ * which does not have the BASE_JD_REQ_SKIP_CACHE_END bit set. Do not use -+ * if the CPU may have written to memory addressed by the job since the last job -+ * without this bit set was submitted. ++ * The accumulator must be released before the context the accumulator was ++ * created from is terminated. + */ -+#define BASE_JD_REQ_SKIP_CACHE_START ((base_jd_core_req)1 << 15) ++void kbase_hwcnt_accumulator_release(struct kbase_hwcnt_accumulator *accum); + -+/* SW Flag: Skip GPU cache clean and invalidation after a GPU job completes. ++/** ++ * kbase_hwcnt_accumulator_set_counters() - Perform a dump of the currently ++ * enabled counters, and enable a new ++ * set of counters that will be used ++ * for subsequent dumps. ++ * @accum: Non-NULL pointer to the hardware counter accumulator. ++ * @new_map: Non-NULL pointer to the new counter enable map. Must have the ++ * same metadata as the accumulator. ++ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will ++ * be written out to on success. ++ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will ++ * be written out to on success. ++ * @dump_buf: Pointer to the buffer where the dump will be written out to on ++ * success. If non-NULL, must have the same metadata as the ++ * accumulator. If NULL, the dump will be discarded. + * -+ * If this bit is set then the GPU's cache will not be cleaned and invalidated -+ * until a GPU job completes which does not have this bit set or a job starts -+ * which does not have the BASE_JD_REQ_SKIP_CACHE_START bit set. Do not use -+ * if the CPU may read from or partially overwrite memory addressed by the job -+ * before the next job without this bit set completes. ++ * If this function fails for some unexpected reason (i.e. anything other than ++ * invalid args), then the accumulator will be put into the error state until ++ * the parent context is next disabled. ++ * ++ * Return: 0 on success or error code. + */ -+#define BASE_JD_REQ_SKIP_CACHE_END ((base_jd_core_req)1 << 16) ++int kbase_hwcnt_accumulator_set_counters(struct kbase_hwcnt_accumulator *accum, ++ const struct kbase_hwcnt_enable_map *new_map, ++ u64 *ts_start_ns, u64 *ts_end_ns, ++ struct kbase_hwcnt_dump_buffer *dump_buf); + -+/* Request the atom be executed on a specific job slot. ++/** ++ * kbase_hwcnt_accumulator_dump() - Perform a dump of the currently enabled ++ * counters. ++ * @accum: Non-NULL pointer to the hardware counter accumulator. ++ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will ++ * be written out to on success. ++ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will ++ * be written out to on success. ++ * @dump_buf: Pointer to the buffer where the dump will be written out to on ++ * success. If non-NULL, must have the same metadata as the ++ * accumulator. If NULL, the dump will be discarded. + * -+ * When this flag is specified, it takes precedence over any existing job slot -+ * selection logic. ++ * If this function fails for some unexpected reason (i.e. anything other than ++ * invalid args), then the accumulator will be put into the error state until ++ * the parent context is next disabled. ++ * ++ * Return: 0 on success or error code. + */ -+#define BASE_JD_REQ_JOB_SLOT ((base_jd_core_req)1 << 17) ++int kbase_hwcnt_accumulator_dump(struct kbase_hwcnt_accumulator *accum, u64 *ts_start_ns, ++ u64 *ts_end_ns, struct kbase_hwcnt_dump_buffer *dump_buf); + -+/* SW-only requirement: The atom is the start of a renderpass. -+ * -+ * If this bit is set then the job chain will be soft-stopped if it causes the -+ * GPU to write beyond the end of the physical pages backing the tiler heap, and -+ * committing more memory to the heap would exceed an internal threshold. It may -+ * be resumed after running one of the job chains attached to an atom with -+ * BASE_JD_REQ_END_RENDERPASS set and the same renderpass ID. It may be -+ * resumed multiple times until it completes without memory usage exceeding the -+ * threshold. ++/** ++ * kbase_hwcnt_accumulator_timestamp_ns() - Get the current accumulator backend ++ * timestamp. ++ * @accum: Non-NULL pointer to the hardware counter accumulator. + * -+ * Usually used with BASE_JD_REQ_T. ++ * Return: Accumulator backend timestamp in nanoseconds. + */ -+#define BASE_JD_REQ_START_RENDERPASS ((base_jd_core_req)1 << 18) ++u64 kbase_hwcnt_accumulator_timestamp_ns(struct kbase_hwcnt_accumulator *accum); + -+/* SW-only requirement: The atom is the end of a renderpass. ++#endif /* _KBASE_HWCNT_ACCUMULATOR_H_ */ +diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_context.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_context.h +new file mode 100644 +index 000000000..89732a908 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_context.h +@@ -0,0 +1,148 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* + * -+ * If this bit is set then the atom incorporates the CPU address of a -+ * base_jd_fragment object instead of the GPU address of a job chain. ++ * (C) COPYRIGHT 2018, 2020-2022 ARM Limited. All rights reserved. + * -+ * Which job chain is run depends upon whether the atom with the same renderpass -+ * ID and the BASE_JD_REQ_START_RENDERPASS bit set completed normally or -+ * was soft-stopped when it exceeded an upper threshold for tiler heap memory -+ * usage. ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. + * -+ * It also depends upon whether one of the job chains attached to the atom has -+ * already been run as part of the same renderpass (in which case it would have -+ * written unresolved multisampled and otherwise-discarded output to temporary -+ * buffers that need to be read back). The job chain for doing a forced read and -+ * forced write (from/to temporary buffers) is run as many times as necessary. ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Usually used with BASE_JD_REQ_FS. + */ -+#define BASE_JD_REQ_END_RENDERPASS ((base_jd_core_req)1 << 19) + -+/* These requirement bits are currently unused in base_jd_core_req ++/* ++ * Hardware counter context API. + */ -+#define BASEP_JD_REQ_RESERVED \ -+ (~(BASE_JD_REQ_ATOM_TYPE | BASE_JD_REQ_EXTERNAL_RESOURCES | \ -+ BASE_JD_REQ_EVENT_ONLY_ON_FAILURE | BASEP_JD_REQ_EVENT_NEVER | \ -+ BASE_JD_REQ_EVENT_COALESCE | \ -+ BASE_JD_REQ_COHERENT_GROUP | BASE_JD_REQ_SPECIFIC_COHERENT_GROUP | \ -+ BASE_JD_REQ_FS_AFBC | BASE_JD_REQ_PERMON | \ -+ BASE_JD_REQ_SKIP_CACHE_START | BASE_JD_REQ_SKIP_CACHE_END | \ -+ BASE_JD_REQ_JOB_SLOT | BASE_JD_REQ_START_RENDERPASS | \ -+ BASE_JD_REQ_END_RENDERPASS)) + -+/* Mask of all bits in base_jd_core_req that control the type of the atom. -+ * -+ * This allows dependency only atoms to have flags set -+ */ -+#define BASE_JD_REQ_ATOM_TYPE \ -+ (BASE_JD_REQ_FS | BASE_JD_REQ_CS | BASE_JD_REQ_T | BASE_JD_REQ_CF | \ -+ BASE_JD_REQ_V | BASE_JD_REQ_SOFT_JOB | BASE_JD_REQ_ONLY_COMPUTE) ++#ifndef _KBASE_HWCNT_CONTEXT_H_ ++#define _KBASE_HWCNT_CONTEXT_H_ + -+/** -+ * Mask of all bits in base_jd_core_req that control the type of a soft job. -+ */ -+#define BASE_JD_REQ_SOFT_JOB_TYPE (BASE_JD_REQ_SOFT_JOB | 0x1f) ++#include ++#include + -+/* Returns non-zero value if core requirements passed define a soft job or -+ * a dependency only job. -+ */ -+#define BASE_JD_REQ_SOFT_JOB_OR_DEP(core_req) \ -+ (((core_req) & BASE_JD_REQ_SOFT_JOB) || \ -+ ((core_req) & BASE_JD_REQ_ATOM_TYPE) == BASE_JD_REQ_DEP) ++struct kbase_hwcnt_backend_interface; ++struct kbase_hwcnt_context; + +/** -+ * enum kbase_jd_atom_state ++ * kbase_hwcnt_context_init() - Initialise a hardware counter context. ++ * @iface: Non-NULL pointer to a hardware counter backend interface. ++ * @out_hctx: Non-NULL pointer to where the pointer to the created context will ++ * be stored on success. + * -+ * @KBASE_JD_ATOM_STATE_UNUSED: Atom is not used. -+ * @KBASE_JD_ATOM_STATE_QUEUED: Atom is queued in JD. -+ * @KBASE_JD_ATOM_STATE_IN_JS: Atom has been given to JS (is runnable/running). -+ * @KBASE_JD_ATOM_STATE_HW_COMPLETED: Atom has been completed, but not yet -+ * handed back to job dispatcher for -+ * dependency resolution. -+ * @KBASE_JD_ATOM_STATE_COMPLETED: Atom has been completed, but not yet handed -+ * back to userspace. ++ * On creation, the disable count of the context will be 0. ++ * A hardware counter accumulator can be acquired using a created context. ++ * ++ * Return: 0 on success, else error code. + */ -+enum kbase_jd_atom_state { -+ KBASE_JD_ATOM_STATE_UNUSED, -+ KBASE_JD_ATOM_STATE_QUEUED, -+ KBASE_JD_ATOM_STATE_IN_JS, -+ KBASE_JD_ATOM_STATE_HW_COMPLETED, -+ KBASE_JD_ATOM_STATE_COMPLETED -+}; ++int kbase_hwcnt_context_init(const struct kbase_hwcnt_backend_interface *iface, ++ struct kbase_hwcnt_context **out_hctx); + +/** -+ * typedef base_atom_id - Type big enough to store an atom number in. ++ * kbase_hwcnt_context_term() - Terminate a hardware counter context. ++ * @hctx: Pointer to context to be terminated. + */ -+typedef u8 base_atom_id; ++void kbase_hwcnt_context_term(struct kbase_hwcnt_context *hctx); + +/** -+ * struct base_dependency - ++ * kbase_hwcnt_context_metadata() - Get the hardware counter metadata used by ++ * the context, so related counter data ++ * structures can be created. ++ * @hctx: Non-NULL pointer to the hardware counter context. + * -+ * @atom_id: An atom number -+ * @dependency_type: Dependency type ++ * Return: Non-NULL pointer to metadata, or NULL on error. + */ -+struct base_dependency { -+ base_atom_id atom_id; -+ base_jd_dep_type dependency_type; -+}; ++const struct kbase_hwcnt_metadata *kbase_hwcnt_context_metadata(struct kbase_hwcnt_context *hctx); + +/** -+ * struct base_jd_fragment - Set of GPU fragment job chains used for rendering. ++ * kbase_hwcnt_context_disable() - Increment the disable count of the context. ++ * @hctx: Non-NULL pointer to the hardware counter context. + * -+ * @norm_read_norm_write: Job chain for full rendering. -+ * GPU address of a fragment job chain to render in the -+ * circumstance where the tiler job chain did not exceed -+ * its memory usage threshold and no fragment job chain -+ * was previously run for the same renderpass. -+ * It is used no more than once per renderpass. -+ * @norm_read_forced_write: Job chain for starting incremental -+ * rendering. -+ * GPU address of a fragment job chain to render in -+ * the circumstance where the tiler job chain exceeded -+ * its memory usage threshold for the first time and -+ * no fragment job chain was previously run for the -+ * same renderpass. -+ * Writes unresolved multisampled and normally- -+ * discarded output to temporary buffers that must be -+ * read back by a subsequent forced_read job chain -+ * before the renderpass is complete. -+ * It is used no more than once per renderpass. -+ * @forced_read_forced_write: Job chain for continuing incremental -+ * rendering. -+ * GPU address of a fragment job chain to render in -+ * the circumstance where the tiler job chain -+ * exceeded its memory usage threshold again -+ * and a fragment job chain was previously run for -+ * the same renderpass. -+ * Reads unresolved multisampled and -+ * normally-discarded output from temporary buffers -+ * written by a previous forced_write job chain and -+ * writes the same to temporary buffers again. -+ * It is used as many times as required until -+ * rendering completes. -+ * @forced_read_norm_write: Job chain for ending incremental rendering. -+ * GPU address of a fragment job chain to render in the -+ * circumstance where the tiler job chain did not -+ * exceed its memory usage threshold this time and a -+ * fragment job chain was previously run for the same -+ * renderpass. -+ * Reads unresolved multisampled and normally-discarded -+ * output from temporary buffers written by a previous -+ * forced_write job chain in order to complete a -+ * renderpass. -+ * It is used no more than once per renderpass. ++ * If a call to this function increments the disable count from 0 to 1, and ++ * an accumulator has been acquired, then a counter dump will be performed ++ * before counters are disabled via the backend interface. + * -+ * This structure is referenced by the main atom structure if -+ * BASE_JD_REQ_END_RENDERPASS is set in the base_jd_core_req. ++ * Subsequent dumps via the accumulator while counters are disabled will first ++ * return the accumulated dump, then will return dumps with zeroed counters. ++ * ++ * After this function call returns, it is guaranteed that counters will not be ++ * enabled via the backend interface. + */ -+struct base_jd_fragment { -+ u64 norm_read_norm_write; -+ u64 norm_read_forced_write; -+ u64 forced_read_forced_write; -+ u64 forced_read_norm_write; -+}; ++void kbase_hwcnt_context_disable(struct kbase_hwcnt_context *hctx); + +/** -+ * typedef base_jd_prio - Base Atom priority. -+ * -+ * Only certain priority levels are actually implemented, as specified by the -+ * BASE_JD_PRIO_<...> definitions below. It is undefined to use a priority -+ * level that is not one of those defined below. -+ * -+ * Priority levels only affect scheduling after the atoms have had dependencies -+ * resolved. For example, a low priority atom that has had its dependencies -+ * resolved might run before a higher priority atom that has not had its -+ * dependencies resolved. ++ * kbase_hwcnt_context_disable_atomic() - Increment the disable count of the ++ * context if possible in an atomic ++ * context. ++ * @hctx: Non-NULL pointer to the hardware counter context. + * -+ * In general, fragment atoms do not affect non-fragment atoms with -+ * lower priorities, and vice versa. One exception is that there is only one -+ * priority value for each context. So a high-priority (e.g.) fragment atom -+ * could increase its context priority, causing its non-fragment atoms to also -+ * be scheduled sooner. ++ * This function will only succeed if hardware counters are effectively already ++ * disabled, i.e. there is no accumulator, the disable count is already ++ * non-zero, or the accumulator has no counters set. + * -+ * The atoms are scheduled as follows with respect to their priorities: -+ * * Let atoms 'X' and 'Y' be for the same job slot who have dependencies -+ * resolved, and atom 'X' has a higher priority than atom 'Y' -+ * * If atom 'Y' is currently running on the HW, then it is interrupted to -+ * allow atom 'X' to run soon after -+ * * If instead neither atom 'Y' nor atom 'X' are running, then when choosing -+ * the next atom to run, atom 'X' will always be chosen instead of atom 'Y' -+ * * Any two atoms that have the same priority could run in any order with -+ * respect to each other. That is, there is no ordering constraint between -+ * atoms of the same priority. ++ * After this function call returns true, it is guaranteed that counters will ++ * not be enabled via the backend interface. + * -+ * The sysfs file 'js_ctx_scheduling_mode' is used to control how atoms are -+ * scheduled between contexts. The default value, 0, will cause higher-priority -+ * atoms to be scheduled first, regardless of their context. The value 1 will -+ * use a round-robin algorithm when deciding which context's atoms to schedule -+ * next, so higher-priority atoms can only preempt lower priority atoms within -+ * the same context. See KBASE_JS_SYSTEM_PRIORITY_MODE and -+ * KBASE_JS_PROCESS_LOCAL_PRIORITY_MODE for more details. -+ */ -+typedef u8 base_jd_prio; -+ -+/* Medium atom priority. This is a priority higher than BASE_JD_PRIO_LOW */ -+#define BASE_JD_PRIO_MEDIUM ((base_jd_prio)0) -+/* High atom priority. This is a priority higher than BASE_JD_PRIO_MEDIUM and -+ * BASE_JD_PRIO_LOW ++ * Return: True if the disable count was incremented, else False. + */ -+#define BASE_JD_PRIO_HIGH ((base_jd_prio)1) -+/* Low atom priority. */ -+#define BASE_JD_PRIO_LOW ((base_jd_prio)2) ++bool kbase_hwcnt_context_disable_atomic(struct kbase_hwcnt_context *hctx); + -+/* Count of the number of priority levels. This itself is not a valid -+ * base_jd_prio setting ++/** ++ * kbase_hwcnt_context_enable() - Decrement the disable count of the context. ++ * @hctx: Non-NULL pointer to the hardware counter context. ++ * ++ * If a call to this function decrements the disable count from 1 to 0, and ++ * an accumulator has been acquired, then counters will be re-enabled via the ++ * backend interface. ++ * ++ * If an accumulator has been acquired and enabling counters fails for some ++ * reason, the accumulator will be placed into an error state. ++ * ++ * It is only valid to call this function one time for each prior returned call ++ * to kbase_hwcnt_context_disable. ++ * ++ * The spinlock documented in the backend interface that was passed in to ++ * kbase_hwcnt_context_init() must be held before calling this function. + */ -+#define BASE_JD_NR_PRIO_LEVELS 3 ++void kbase_hwcnt_context_enable(struct kbase_hwcnt_context *hctx); + +/** -+ * struct base_jd_atom_v2 - Node of a dependency graph used to submit a -+ * GPU job chain or soft-job to the kernel driver. ++ * kbase_hwcnt_context_queue_work() - Queue hardware counter related async ++ * work on a workqueue specialized for ++ * hardware counters. ++ * @hctx: Non-NULL pointer to the hardware counter context. ++ * @work: Non-NULL pointer to work to queue. + * -+ * @jc: GPU address of a job chain or (if BASE_JD_REQ_END_RENDERPASS -+ * is set in the base_jd_core_req) the CPU address of a -+ * base_jd_fragment object. -+ * @udata: User data. -+ * @extres_list: List of external resources. -+ * @nr_extres: Number of external resources or JIT allocations. -+ * @jit_id: Zero-terminated array of IDs of just-in-time memory -+ * allocations written to by the atom. When the atom -+ * completes, the value stored at the -+ * &struct_base_jit_alloc_info.heap_info_gpu_addr of -+ * each allocation is read in order to enforce an -+ * overall physical memory usage limit. -+ * @pre_dep: Pre-dependencies. One need to use SETTER function to assign -+ * this field; this is done in order to reduce possibility of -+ * improper assignment of a dependency field. -+ * @atom_number: Unique number to identify the atom. -+ * @prio: Atom priority. Refer to base_jd_prio for more details. -+ * @device_nr: Core group when BASE_JD_REQ_SPECIFIC_COHERENT_GROUP -+ * specified. -+ * @jobslot: Job slot to use when BASE_JD_REQ_JOB_SLOT is specified. -+ * @core_req: Core requirements. -+ * @renderpass_id: Renderpass identifier used to associate an atom that has -+ * BASE_JD_REQ_START_RENDERPASS set in its core requirements -+ * with an atom that has BASE_JD_REQ_END_RENDERPASS set. -+ * @padding: Unused. Must be zero. ++ * Return: false if work was already on a queue, true otherwise. + * -+ * This structure has changed since UK 10.2 for which base_jd_core_req was a -+ * u16 value. ++ * Performance counter related work is high priority, short running, and ++ * generally CPU locality is unimportant. There is no standard workqueue that ++ * can service this flavor of work. + * -+ * In UK 10.3 a core_req field of a u32 type was added to the end of the -+ * structure, and the place in the structure previously occupied by u16 -+ * core_req was kept but renamed to compat_core_req. ++ * Rather than have each user of counters define their own workqueue, we have ++ * a centralized one in here that anybody using this hardware counter API ++ * should use. + * -+ * From UK 11.20 - compat_core_req is now occupied by u8 jit_id[2]. -+ * Compatibility with UK 10.x from UK 11.y is not handled because -+ * the major version increase prevents this. ++ * Before the context is destroyed, all work submitted must have been completed. ++ * Given that the work enqueued via this function is likely to be hardware ++ * counter related and will therefore use the context object, this is likely ++ * to be behavior that will occur naturally. + * -+ * For UK 11.20 jit_id[2] must be initialized to zero. ++ * Historical note: prior to this centralized workqueue, the system_highpri_wq ++ * was used. This was generally fine, except when a particularly long running, ++ * higher priority thread ended up scheduled on the enqueuing CPU core. Given ++ * that hardware counters requires tight integration with power management, ++ * this meant progress through the power management states could be stalled ++ * for however long that higher priority thread took. + */ -+struct base_jd_atom_v2 { -+ u64 jc; -+ struct base_jd_udata udata; -+ u64 extres_list; -+ u16 nr_extres; -+ u8 jit_id[2]; -+ struct base_dependency pre_dep[2]; -+ base_atom_id atom_number; -+ base_jd_prio prio; -+ u8 device_nr; -+ u8 jobslot; -+ base_jd_core_req core_req; -+ u8 renderpass_id; -+ u8 padding[7]; -+}; ++bool kbase_hwcnt_context_queue_work(struct kbase_hwcnt_context *hctx, struct work_struct *work); + -+/** -+ * struct base_jd_atom - Same as base_jd_atom_v2, but has an extra seq_nr -+ * at the beginning. ++#endif /* _KBASE_HWCNT_CONTEXT_H_ */ +diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.c +new file mode 100644 +index 000000000..74916dab0 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.c +@@ -0,0 +1,738 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2018-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * @seq_nr: Sequence number of logical grouping of atoms. -+ * @jc: GPU address of a job chain or (if BASE_JD_REQ_END_RENDERPASS -+ * is set in the base_jd_core_req) the CPU address of a -+ * base_jd_fragment object. -+ * @udata: User data. -+ * @extres_list: List of external resources. -+ * @nr_extres: Number of external resources or JIT allocations. -+ * @jit_id: Zero-terminated array of IDs of just-in-time memory -+ * allocations written to by the atom. When the atom -+ * completes, the value stored at the -+ * &struct_base_jit_alloc_info.heap_info_gpu_addr of -+ * each allocation is read in order to enforce an -+ * overall physical memory usage limit. -+ * @pre_dep: Pre-dependencies. One need to use SETTER function to assign -+ * this field; this is done in order to reduce possibility of -+ * improper assignment of a dependency field. -+ * @atom_number: Unique number to identify the atom. -+ * @prio: Atom priority. Refer to base_jd_prio for more details. -+ * @device_nr: Core group when BASE_JD_REQ_SPECIFIC_COHERENT_GROUP -+ * specified. -+ * @jobslot: Job slot to use when BASE_JD_REQ_JOB_SLOT is specified. -+ * @core_req: Core requirements. -+ * @renderpass_id: Renderpass identifier used to associate an atom that has -+ * BASE_JD_REQ_START_RENDERPASS set in its core requirements -+ * with an atom that has BASE_JD_REQ_END_RENDERPASS set. -+ * @padding: Unused. Must be zero. + */ -+typedef struct base_jd_atom { -+ u64 seq_nr; -+ u64 jc; -+ struct base_jd_udata udata; -+ u64 extres_list; -+ u16 nr_extres; -+ u8 jit_id[2]; -+ struct base_dependency pre_dep[2]; -+ base_atom_id atom_number; -+ base_jd_prio prio; -+ u8 device_nr; -+ u8 jobslot; -+ base_jd_core_req core_req; -+ u8 renderpass_id; -+ u8 padding[7]; -+} base_jd_atom; + -+/* Job chain event code bits -+ * Defines the bits used to create ::base_jd_event_code ++#include "hwcnt/mali_kbase_hwcnt_gpu.h" ++#include "hwcnt/mali_kbase_hwcnt_types.h" ++ ++#include ++ ++/** enum enable_map_idx - index into a block enable map that spans multiple u64 array elements + */ -+enum { -+ BASE_JD_SW_EVENT_KERNEL = (1u << 15), /* Kernel side event */ -+ BASE_JD_SW_EVENT = (1u << 14), /* SW defined event */ -+ /* Event indicates success (SW events only) */ -+ BASE_JD_SW_EVENT_SUCCESS = (1u << 13), -+ BASE_JD_SW_EVENT_JOB = (0u << 11), /* Job related event */ -+ BASE_JD_SW_EVENT_BAG = (1u << 11), /* Bag related event */ -+ BASE_JD_SW_EVENT_INFO = (2u << 11), /* Misc/info event */ -+ BASE_JD_SW_EVENT_RESERVED = (3u << 11), /* Reserved event type */ -+ /* Mask to extract the type from an event code */ -+ BASE_JD_SW_EVENT_TYPE_MASK = (3u << 11) ++enum enable_map_idx { ++ EM_LO, ++ EM_HI, ++ EM_COUNT, +}; + ++static void kbasep_get_fe_block_type(u64 *dst, enum kbase_hwcnt_set counter_set, bool is_csf) ++{ ++ switch (counter_set) { ++ case KBASE_HWCNT_SET_PRIMARY: ++ *dst = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE; ++ break; ++ case KBASE_HWCNT_SET_SECONDARY: ++ if (is_csf) ++ *dst = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE2; ++ else ++ *dst = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE_UNDEFINED; ++ break; ++ case KBASE_HWCNT_SET_TERTIARY: ++ if (is_csf) ++ *dst = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE3; ++ else ++ *dst = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE_UNDEFINED; ++ break; ++ default: ++ WARN_ON(true); ++ } ++} ++ ++static void kbasep_get_tiler_block_type(u64 *dst, enum kbase_hwcnt_set counter_set) ++{ ++ switch (counter_set) { ++ case KBASE_HWCNT_SET_PRIMARY: ++ *dst = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER; ++ break; ++ case KBASE_HWCNT_SET_SECONDARY: ++ case KBASE_HWCNT_SET_TERTIARY: ++ *dst = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER_UNDEFINED; ++ break; ++ default: ++ WARN_ON(true); ++ } ++} ++ ++static void kbasep_get_sc_block_type(u64 *dst, enum kbase_hwcnt_set counter_set, bool is_csf) ++{ ++ switch (counter_set) { ++ case KBASE_HWCNT_SET_PRIMARY: ++ *dst = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC; ++ break; ++ case KBASE_HWCNT_SET_SECONDARY: ++ *dst = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC2; ++ break; ++ case KBASE_HWCNT_SET_TERTIARY: ++ if (is_csf) ++ *dst = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC3; ++ else ++ *dst = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC_UNDEFINED; ++ break; ++ default: ++ WARN_ON(true); ++ } ++} ++ ++static void kbasep_get_memsys_block_type(u64 *dst, enum kbase_hwcnt_set counter_set) ++{ ++ switch (counter_set) { ++ case KBASE_HWCNT_SET_PRIMARY: ++ *dst = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS; ++ break; ++ case KBASE_HWCNT_SET_SECONDARY: ++ *dst = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS2; ++ break; ++ case KBASE_HWCNT_SET_TERTIARY: ++ *dst = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS_UNDEFINED; ++ break; ++ default: ++ WARN_ON(true); ++ } ++} ++ +/** -+ * enum base_jd_event_code - Job chain event codes -+ * -+ * @BASE_JD_EVENT_RANGE_HW_NONFAULT_START: Start of hardware non-fault status -+ * codes. -+ * Obscurely, BASE_JD_EVENT_TERMINATED -+ * indicates a real fault, because the -+ * job was hard-stopped. -+ * @BASE_JD_EVENT_NOT_STARTED: Can't be seen by userspace, treated as -+ * 'previous job done'. -+ * @BASE_JD_EVENT_STOPPED: Can't be seen by userspace, becomes -+ * TERMINATED, DONE or JOB_CANCELLED. -+ * @BASE_JD_EVENT_TERMINATED: This is actually a fault status code - the job -+ * was hard stopped. -+ * @BASE_JD_EVENT_ACTIVE: Can't be seen by userspace, jobs only returned on -+ * complete/fail/cancel. -+ * @BASE_JD_EVENT_RANGE_HW_NONFAULT_END: End of hardware non-fault status codes. -+ * Obscurely, BASE_JD_EVENT_TERMINATED -+ * indicates a real fault, -+ * because the job was hard-stopped. -+ * @BASE_JD_EVENT_RANGE_HW_FAULT_OR_SW_ERROR_START: Start of hardware fault and -+ * software error status codes. -+ * @BASE_JD_EVENT_RANGE_HW_FAULT_OR_SW_ERROR_END: End of hardware fault and -+ * software error status codes. -+ * @BASE_JD_EVENT_RANGE_SW_SUCCESS_START: Start of software success status -+ * codes. -+ * @BASE_JD_EVENT_RANGE_SW_SUCCESS_END: End of software success status codes. -+ * @BASE_JD_EVENT_RANGE_KERNEL_ONLY_START: Start of kernel-only status codes. -+ * Such codes are never returned to -+ * user-space. -+ * @BASE_JD_EVENT_RANGE_KERNEL_ONLY_END: End of kernel-only status codes. -+ * -+ * HW and low-level SW events are represented by event codes. -+ * The status of jobs which succeeded are also represented by -+ * an event code (see @BASE_JD_EVENT_DONE). -+ * Events are usually reported as part of a &struct base_jd_event. -+ * -+ * The event codes are encoded in the following way: -+ * * 10:0 - subtype -+ * * 12:11 - type -+ * * 13 - SW success (only valid if the SW bit is set) -+ * * 14 - SW event (HW event if not set) -+ * * 15 - Kernel event (should never be seen in userspace) -+ * -+ * Events are split up into ranges as follows: -+ * * BASE_JD_EVENT_RANGE__START -+ * * BASE_JD_EVENT_RANGE__END -+ * -+ * code is in 's range when: -+ * BASE_JD_EVENT_RANGE__START <= code < -+ * BASE_JD_EVENT_RANGE__END -+ * -+ * Ranges can be asserted for adjacency by testing that the END of the previous -+ * is equal to the START of the next. This is useful for optimizing some tests -+ * for range. ++ * kbasep_hwcnt_backend_gpu_metadata_create() - Create hardware counter metadata ++ * for the GPU. ++ * @gpu_info: Non-NULL pointer to hwcnt info for current GPU. ++ * @is_csf: true for CSF GPU, otherwise false. ++ * @counter_set: The performance counter set to use. ++ * @metadata: Non-NULL pointer to where created metadata is stored ++ * on success. + * -+ * A limitation is that the last member of this enum must explicitly be handled -+ * (with an assert-unreachable statement) in switch statements that use -+ * variables of this type. Otherwise, the compiler warns that we have not -+ * handled that enum value. ++ * Return: 0 on success, else error code. + */ -+enum base_jd_event_code { -+ /* HW defined exceptions */ -+ BASE_JD_EVENT_RANGE_HW_NONFAULT_START = 0, -+ -+ /* non-fatal exceptions */ -+ BASE_JD_EVENT_NOT_STARTED = 0x00, -+ BASE_JD_EVENT_DONE = 0x01, -+ BASE_JD_EVENT_STOPPED = 0x03, -+ BASE_JD_EVENT_TERMINATED = 0x04, -+ BASE_JD_EVENT_ACTIVE = 0x08, ++static int kbasep_hwcnt_backend_gpu_metadata_create(const struct kbase_hwcnt_gpu_info *gpu_info, ++ const bool is_csf, ++ enum kbase_hwcnt_set counter_set, ++ const struct kbase_hwcnt_metadata **metadata) ++{ ++ struct kbase_hwcnt_description desc; ++ struct kbase_hwcnt_group_description group; ++ struct kbase_hwcnt_block_description blks[KBASE_HWCNT_V5_BLOCK_TYPE_COUNT]; ++ size_t non_sc_block_count; ++ size_t sc_block_count; + -+ BASE_JD_EVENT_RANGE_HW_NONFAULT_END = 0x40, -+ BASE_JD_EVENT_RANGE_HW_FAULT_OR_SW_ERROR_START = 0x40, ++ WARN_ON(!gpu_info); ++ WARN_ON(!metadata); + -+ /* job exceptions */ -+ BASE_JD_EVENT_JOB_CONFIG_FAULT = 0x40, -+ BASE_JD_EVENT_JOB_POWER_FAULT = 0x41, -+ BASE_JD_EVENT_JOB_READ_FAULT = 0x42, -+ BASE_JD_EVENT_JOB_WRITE_FAULT = 0x43, -+ BASE_JD_EVENT_JOB_AFFINITY_FAULT = 0x44, -+ BASE_JD_EVENT_JOB_BUS_FAULT = 0x48, -+ BASE_JD_EVENT_INSTR_INVALID_PC = 0x50, -+ BASE_JD_EVENT_INSTR_INVALID_ENC = 0x51, -+ BASE_JD_EVENT_INSTR_TYPE_MISMATCH = 0x52, -+ BASE_JD_EVENT_INSTR_OPERAND_FAULT = 0x53, -+ BASE_JD_EVENT_INSTR_TLS_FAULT = 0x54, -+ BASE_JD_EVENT_INSTR_BARRIER_FAULT = 0x55, -+ BASE_JD_EVENT_INSTR_ALIGN_FAULT = 0x56, -+ BASE_JD_EVENT_DATA_INVALID_FAULT = 0x58, -+ BASE_JD_EVENT_TILE_RANGE_FAULT = 0x59, -+ BASE_JD_EVENT_STATE_FAULT = 0x5A, -+ BASE_JD_EVENT_OUT_OF_MEMORY = 0x60, -+ BASE_JD_EVENT_UNKNOWN = 0x7F, ++ /* Calculate number of block instances that aren't shader cores */ ++ non_sc_block_count = 2 + gpu_info->l2_count; ++ /* Calculate number of block instances that are shader cores */ ++ sc_block_count = fls64(gpu_info->core_mask); + -+ /* GPU exceptions */ -+ BASE_JD_EVENT_DELAYED_BUS_FAULT = 0x80, -+ BASE_JD_EVENT_SHAREABILITY_FAULT = 0x88, ++ /* ++ * A system can have up to 64 shader cores, but the 64-bit ++ * availability mask can't physically represent that many cores as well ++ * as the other hardware blocks. ++ * Error out if there are more blocks than our implementation can ++ * support. ++ */ ++ if ((sc_block_count + non_sc_block_count) > KBASE_HWCNT_AVAIL_MASK_BITS) ++ return -EINVAL; + -+ /* MMU exceptions */ -+ BASE_JD_EVENT_TRANSLATION_FAULT_LEVEL1 = 0xC1, -+ BASE_JD_EVENT_TRANSLATION_FAULT_LEVEL2 = 0xC2, -+ BASE_JD_EVENT_TRANSLATION_FAULT_LEVEL3 = 0xC3, -+ BASE_JD_EVENT_TRANSLATION_FAULT_LEVEL4 = 0xC4, -+ BASE_JD_EVENT_PERMISSION_FAULT = 0xC8, -+ BASE_JD_EVENT_TRANSTAB_BUS_FAULT_LEVEL1 = 0xD1, -+ BASE_JD_EVENT_TRANSTAB_BUS_FAULT_LEVEL2 = 0xD2, -+ BASE_JD_EVENT_TRANSTAB_BUS_FAULT_LEVEL3 = 0xD3, -+ BASE_JD_EVENT_TRANSTAB_BUS_FAULT_LEVEL4 = 0xD4, -+ BASE_JD_EVENT_ACCESS_FLAG = 0xD8, ++ /* One Front End block */ ++ kbasep_get_fe_block_type(&blks[0].type, counter_set, is_csf); ++ blks[0].inst_cnt = 1; ++ blks[0].hdr_cnt = KBASE_HWCNT_V5_HEADERS_PER_BLOCK; ++ blks[0].ctr_cnt = gpu_info->prfcnt_values_per_block - KBASE_HWCNT_V5_HEADERS_PER_BLOCK; + -+ /* SW defined exceptions */ -+ BASE_JD_EVENT_MEM_GROWTH_FAILED = -+ BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x000, -+ BASE_JD_EVENT_TIMED_OUT = -+ BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x001, -+ BASE_JD_EVENT_JOB_CANCELLED = -+ BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x002, -+ BASE_JD_EVENT_JOB_INVALID = -+ BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x003, -+ BASE_JD_EVENT_PM_EVENT = -+ BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x004, ++ /* One Tiler block */ ++ kbasep_get_tiler_block_type(&blks[1].type, counter_set); ++ blks[1].inst_cnt = 1; ++ blks[1].hdr_cnt = KBASE_HWCNT_V5_HEADERS_PER_BLOCK; ++ blks[1].ctr_cnt = gpu_info->prfcnt_values_per_block - KBASE_HWCNT_V5_HEADERS_PER_BLOCK; + -+ BASE_JD_EVENT_BAG_INVALID = -+ BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_BAG | 0x003, ++ /* l2_count memsys blks */ ++ kbasep_get_memsys_block_type(&blks[2].type, counter_set); ++ blks[2].inst_cnt = gpu_info->l2_count; ++ blks[2].hdr_cnt = KBASE_HWCNT_V5_HEADERS_PER_BLOCK; ++ blks[2].ctr_cnt = gpu_info->prfcnt_values_per_block - KBASE_HWCNT_V5_HEADERS_PER_BLOCK; + -+ BASE_JD_EVENT_RANGE_HW_FAULT_OR_SW_ERROR_END = BASE_JD_SW_EVENT | -+ BASE_JD_SW_EVENT_RESERVED | 0x3FF, ++ /* ++ * There are as many shader cores in the system as there are bits set in ++ * the core mask. However, the dump buffer memory requirements need to ++ * take into account the fact that the core mask may be non-contiguous. ++ * ++ * For example, a system with a core mask of 0b1011 has the same dump ++ * buffer memory requirements as a system with 0b1111, but requires more ++ * memory than a system with 0b0111. However, core 2 of the system with ++ * 0b1011 doesn't physically exist, and the dump buffer memory that ++ * accounts for that core will never be written to when we do a counter ++ * dump. ++ * ++ * We find the core mask's last set bit to determine the memory ++ * requirements, and embed the core mask into the availability mask so ++ * we can determine later which shader cores physically exist. ++ */ ++ kbasep_get_sc_block_type(&blks[3].type, counter_set, is_csf); ++ blks[3].inst_cnt = sc_block_count; ++ blks[3].hdr_cnt = KBASE_HWCNT_V5_HEADERS_PER_BLOCK; ++ blks[3].ctr_cnt = gpu_info->prfcnt_values_per_block - KBASE_HWCNT_V5_HEADERS_PER_BLOCK; + -+ BASE_JD_EVENT_RANGE_SW_SUCCESS_START = BASE_JD_SW_EVENT | -+ BASE_JD_SW_EVENT_SUCCESS | 0x000, ++ WARN_ON(KBASE_HWCNT_V5_BLOCK_TYPE_COUNT != 4); + -+ BASE_JD_EVENT_PROGRESS_REPORT = BASE_JD_SW_EVENT | -+ BASE_JD_SW_EVENT_SUCCESS | BASE_JD_SW_EVENT_JOB | 0x000, -+ BASE_JD_EVENT_BAG_DONE = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_SUCCESS | -+ BASE_JD_SW_EVENT_BAG | 0x000, -+ BASE_JD_EVENT_DRV_TERMINATED = BASE_JD_SW_EVENT | -+ BASE_JD_SW_EVENT_SUCCESS | BASE_JD_SW_EVENT_INFO | 0x000, ++ group.type = KBASE_HWCNT_GPU_GROUP_TYPE_V5; ++ group.blk_cnt = KBASE_HWCNT_V5_BLOCK_TYPE_COUNT; ++ group.blks = blks; + -+ BASE_JD_EVENT_RANGE_SW_SUCCESS_END = BASE_JD_SW_EVENT | -+ BASE_JD_SW_EVENT_SUCCESS | BASE_JD_SW_EVENT_RESERVED | 0x3FF, ++ desc.grp_cnt = 1; ++ desc.grps = &group; ++ desc.clk_cnt = gpu_info->clk_cnt; + -+ BASE_JD_EVENT_RANGE_KERNEL_ONLY_START = BASE_JD_SW_EVENT | -+ BASE_JD_SW_EVENT_KERNEL | 0x000, -+ BASE_JD_EVENT_REMOVED_FROM_NEXT = BASE_JD_SW_EVENT | -+ BASE_JD_SW_EVENT_KERNEL | BASE_JD_SW_EVENT_JOB | 0x000, -+ BASE_JD_EVENT_END_RP_DONE = BASE_JD_SW_EVENT | -+ BASE_JD_SW_EVENT_KERNEL | BASE_JD_SW_EVENT_JOB | 0x001, ++ /* The JM, Tiler, and L2s are always available, and are before cores */ ++ desc.avail_mask = (1ull << non_sc_block_count) - 1; ++ /* Embed the core mask directly in the availability mask */ ++ desc.avail_mask |= (gpu_info->core_mask << non_sc_block_count); + -+ BASE_JD_EVENT_RANGE_KERNEL_ONLY_END = BASE_JD_SW_EVENT | -+ BASE_JD_SW_EVENT_KERNEL | BASE_JD_SW_EVENT_RESERVED | 0x3FF -+}; ++ return kbase_hwcnt_metadata_create(&desc, metadata); ++} + +/** -+ * struct base_jd_event_v2 - Event reporting structure -+ * -+ * @event_code: event code. -+ * @atom_number: the atom number that has completed. -+ * @udata: user data. -+ * -+ * This structure is used by the kernel driver to report information -+ * about GPU events. They can either be HW-specific events or low-level -+ * SW events, such as job-chain completion. ++ * kbasep_hwcnt_backend_jm_dump_bytes() - Get the raw dump buffer size for the ++ * GPU. ++ * @gpu_info: Non-NULL pointer to hwcnt info for the GPU. + * -+ * The event code contains an event type field which can be extracted -+ * by ANDing with BASE_JD_SW_EVENT_TYPE_MASK. ++ * Return: Size of buffer the GPU needs to perform a counter dump. + */ -+struct base_jd_event_v2 { -+ enum base_jd_event_code event_code; -+ base_atom_id atom_number; -+ struct base_jd_udata udata; -+}; ++static size_t kbasep_hwcnt_backend_jm_dump_bytes(const struct kbase_hwcnt_gpu_info *gpu_info) ++{ ++ WARN_ON(!gpu_info); ++ ++ return (2 + gpu_info->l2_count + fls64(gpu_info->core_mask)) * ++ gpu_info->prfcnt_values_per_block * KBASE_HWCNT_VALUE_HW_BYTES; ++} ++ ++int kbase_hwcnt_jm_metadata_create(const struct kbase_hwcnt_gpu_info *gpu_info, ++ enum kbase_hwcnt_set counter_set, ++ const struct kbase_hwcnt_metadata **out_metadata, ++ size_t *out_dump_bytes) ++{ ++ int errcode; ++ const struct kbase_hwcnt_metadata *metadata; ++ size_t dump_bytes; ++ ++ if (!gpu_info || !out_metadata || !out_dump_bytes) ++ return -EINVAL; ++ ++ /* ++ * For architectures where a max_config interface is available ++ * from the arbiter, the v5 dump bytes and the metadata v5 are ++ * based on the maximum possible allocation of the HW in the ++ * GPU cause it needs to be prepared for the worst case where ++ * all the available L2 cache and Shader cores are allocated. ++ */ ++ dump_bytes = kbasep_hwcnt_backend_jm_dump_bytes(gpu_info); ++ errcode = kbasep_hwcnt_backend_gpu_metadata_create(gpu_info, false, counter_set, &metadata); ++ if (errcode) ++ return errcode; ++ ++ /* ++ * The physical dump size should be half of dump abstraction size in ++ * metadata since physical HW uses 32-bit per value but metadata ++ * specifies 64-bit per value. ++ */ ++ WARN_ON(dump_bytes * 2 != metadata->dump_buf_bytes); ++ ++ *out_metadata = metadata; ++ *out_dump_bytes = dump_bytes; ++ ++ return 0; ++} ++ ++void kbase_hwcnt_jm_metadata_destroy(const struct kbase_hwcnt_metadata *metadata) ++{ ++ if (!metadata) ++ return; ++ ++ kbase_hwcnt_metadata_destroy(metadata); ++} ++ ++int kbase_hwcnt_csf_metadata_create(const struct kbase_hwcnt_gpu_info *gpu_info, ++ enum kbase_hwcnt_set counter_set, ++ const struct kbase_hwcnt_metadata **out_metadata) ++{ ++ int errcode; ++ const struct kbase_hwcnt_metadata *metadata; ++ ++ if (!gpu_info || !out_metadata) ++ return -EINVAL; ++ ++ errcode = kbasep_hwcnt_backend_gpu_metadata_create(gpu_info, true, counter_set, &metadata); ++ if (errcode) ++ return errcode; ++ ++ *out_metadata = metadata; ++ ++ return 0; ++} ++ ++void kbase_hwcnt_csf_metadata_destroy(const struct kbase_hwcnt_metadata *metadata) ++{ ++ if (!metadata) ++ return; ++ ++ kbase_hwcnt_metadata_destroy(metadata); ++} ++ ++static bool is_block_type_shader(const u64 grp_type, const u64 blk_type, const size_t blk) ++{ ++ bool is_shader = false; ++ ++ /* Warn on unknown group type */ ++ if (WARN_ON(grp_type != KBASE_HWCNT_GPU_GROUP_TYPE_V5)) ++ return false; ++ ++ if (blk_type == KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC || ++ blk_type == KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC2 || ++ blk_type == KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC3 || ++ blk_type == KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC_UNDEFINED) ++ is_shader = true; ++ ++ return is_shader; ++} ++ ++static bool is_block_type_l2_cache(const u64 grp_type, const u64 blk_type) ++{ ++ bool is_l2_cache = false; ++ ++ switch (grp_type) { ++ case KBASE_HWCNT_GPU_GROUP_TYPE_V5: ++ if (blk_type == KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS || ++ blk_type == KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS2 || ++ blk_type == KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS_UNDEFINED) ++ is_l2_cache = true; ++ break; ++ default: ++ /* Warn on unknown group type */ ++ WARN_ON(true); ++ } ++ ++ return is_l2_cache; ++} ++ ++int kbase_hwcnt_jm_dump_get(struct kbase_hwcnt_dump_buffer *dst, u64 *src, ++ const struct kbase_hwcnt_enable_map *dst_enable_map, u64 pm_core_mask, ++ const struct kbase_hwcnt_curr_config *curr_config, bool accumulate) ++{ ++ const struct kbase_hwcnt_metadata *metadata; ++ size_t grp, blk, blk_inst; ++ const u64 *dump_src = src; ++ size_t src_offset = 0; ++ u64 core_mask = pm_core_mask; ++ ++ /* Variables to deal with the current configuration */ ++ int l2_count = 0; ++ ++ if (!dst || !src || !dst_enable_map || (dst_enable_map->metadata != dst->metadata)) ++ return -EINVAL; ++ ++ metadata = dst->metadata; ++ ++ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) ++ { ++ const size_t hdr_cnt = kbase_hwcnt_metadata_block_headers_count(metadata, grp, blk); ++ const size_t ctr_cnt = ++ kbase_hwcnt_metadata_block_counters_count(metadata, grp, blk); ++ const u64 blk_type = kbase_hwcnt_metadata_block_type(metadata, grp, blk); ++ const bool is_shader_core = is_block_type_shader( ++ kbase_hwcnt_metadata_group_type(metadata, grp), blk_type, blk); ++ const bool is_l2_cache = is_block_type_l2_cache( ++ kbase_hwcnt_metadata_group_type(metadata, grp), blk_type); ++ const bool is_undefined = kbase_hwcnt_is_block_type_undefined( ++ kbase_hwcnt_metadata_group_type(metadata, grp), blk_type); ++ bool hw_res_available = true; ++ ++ /* ++ * If l2 blocks is greater than the current allocated number of ++ * L2 slices, there is no hw allocated to that block. ++ */ ++ if (is_l2_cache) { ++ l2_count++; ++ if (l2_count > curr_config->num_l2_slices) ++ hw_res_available = false; ++ else ++ hw_res_available = true; ++ } ++ /* ++ * For the shader cores, the current shader_mask allocated is ++ * always a subgroup of the maximum shader_mask, so after ++ * jumping any L2 cache not available the available shader cores ++ * will always have a matching set of blk instances available to ++ * accumulate them. ++ */ ++ else ++ hw_res_available = true; ++ ++ /* ++ * Skip block if no values in the destination block are enabled. ++ */ ++ if (kbase_hwcnt_enable_map_block_enabled(dst_enable_map, grp, blk, blk_inst)) { ++ u64 *dst_blk = ++ kbase_hwcnt_dump_buffer_block_instance(dst, grp, blk, blk_inst); ++ const u64 *src_blk = dump_src + src_offset; ++ bool blk_powered; ++ ++ if (!is_shader_core) { ++ /* Under the current PM system, counters will ++ * only be enabled after all non shader core ++ * blocks are powered up. ++ */ ++ blk_powered = true; ++ } else { ++ /* Check the PM core mask to see if the shader ++ * core is powered up. ++ */ ++ blk_powered = core_mask & 1; ++ } ++ ++ if (blk_powered && !is_undefined && hw_res_available) { ++ /* Only powered and defined blocks have valid data. */ ++ if (accumulate) { ++ kbase_hwcnt_dump_buffer_block_accumulate(dst_blk, src_blk, ++ hdr_cnt, ctr_cnt); ++ } else { ++ kbase_hwcnt_dump_buffer_block_copy(dst_blk, src_blk, ++ (hdr_cnt + ctr_cnt)); ++ } ++ } else { ++ /* Even though the block might be undefined, the ++ * user has enabled counter collection for it. ++ * We should not propagate garbage data. ++ */ ++ if (accumulate) { ++ /* No-op to preserve existing values */ ++ } else { ++ /* src is garbage, so zero the dst */ ++ kbase_hwcnt_dump_buffer_block_zero(dst_blk, ++ (hdr_cnt + ctr_cnt)); ++ } ++ } ++ } ++ ++ /* Just increase the src_offset if the HW is available */ ++ if (hw_res_available) ++ src_offset += (hdr_cnt + ctr_cnt); ++ if (is_shader_core) ++ core_mask = core_mask >> 1; ++ } ++ ++ return 0; ++} ++ ++int kbase_hwcnt_csf_dump_get(struct kbase_hwcnt_dump_buffer *dst, u64 *src, ++ const struct kbase_hwcnt_enable_map *dst_enable_map, bool accumulate) ++{ ++ const struct kbase_hwcnt_metadata *metadata; ++ const u64 *dump_src = src; ++ size_t src_offset = 0; ++ size_t grp, blk, blk_inst; ++ ++ if (!dst || !src || !dst_enable_map || (dst_enable_map->metadata != dst->metadata)) ++ return -EINVAL; ++ ++ metadata = dst->metadata; ++ ++ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) ++ { ++ const size_t hdr_cnt = kbase_hwcnt_metadata_block_headers_count(metadata, grp, blk); ++ const size_t ctr_cnt = ++ kbase_hwcnt_metadata_block_counters_count(metadata, grp, blk); ++ const uint64_t blk_type = kbase_hwcnt_metadata_block_type(metadata, grp, blk); ++ const bool is_undefined = kbase_hwcnt_is_block_type_undefined( ++ kbase_hwcnt_metadata_group_type(metadata, grp), blk_type); ++ ++ /* ++ * Skip block if no values in the destination block are enabled. ++ */ ++ if (kbase_hwcnt_enable_map_block_enabled(dst_enable_map, grp, blk, blk_inst)) { ++ u64 *dst_blk = ++ kbase_hwcnt_dump_buffer_block_instance(dst, grp, blk, blk_inst); ++ const u64 *src_blk = dump_src + src_offset; ++ ++ if (!is_undefined) { ++ if (accumulate) { ++ kbase_hwcnt_dump_buffer_block_accumulate(dst_blk, src_blk, ++ hdr_cnt, ctr_cnt); ++ } else { ++ kbase_hwcnt_dump_buffer_block_copy(dst_blk, src_blk, ++ (hdr_cnt + ctr_cnt)); ++ } ++ } else { ++ /* Even though the block might be undefined, the ++ * user has enabled counter collection for it. ++ * We should not propagate garbage data. ++ */ ++ if (accumulate) { ++ /* No-op to preserve existing values */ ++ } else { ++ /* src is garbage, so zero the dst */ ++ kbase_hwcnt_dump_buffer_block_zero(dst_blk, ++ (hdr_cnt + ctr_cnt)); ++ } ++ } ++ } ++ ++ src_offset += (hdr_cnt + ctr_cnt); ++ } ++ ++ return 0; ++} + +/** -+ * struct base_dump_cpu_gpu_counters - Structure for -+ * BASE_JD_REQ_SOFT_DUMP_CPU_GPU_COUNTERS -+ * jobs. -+ * -+ * This structure is stored into the memory pointed to by the @jc field -+ * of &struct base_jd_atom. -+ * -+ * It must not occupy the same CPU cache line(s) as any neighboring data. -+ * This is to avoid cases where access to pages containing the structure -+ * is shared between cached and un-cached memory regions, which would -+ * cause memory corruption. ++ * kbasep_hwcnt_backend_gpu_block_map_from_physical() - Convert from a physical ++ * block enable map to a ++ * block enable map ++ * abstraction. ++ * @phys: Physical 32-bit block enable map ++ * @lo: Non-NULL pointer to where low 64 bits of block enable map abstraction ++ * will be stored. ++ * @hi: Non-NULL pointer to where high 64 bits of block enable map abstraction ++ * will be stored. + */ ++static inline void kbasep_hwcnt_backend_gpu_block_map_from_physical(u32 phys, u64 *lo, u64 *hi) ++{ ++ u64 dwords[2] = { 0, 0 }; + -+struct base_dump_cpu_gpu_counters { -+ u64 system_time; -+ u64 cycle_counter; -+ u64 sec; -+ u32 usec; -+ u8 padding[36]; -+}; ++ size_t dword_idx; + -+#endif /* _BASE_JM_KERNEL_H_ */ -diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h -new file mode 100755 -index 000000000000..4fb5d1d9c410 ++ for (dword_idx = 0; dword_idx < 2; dword_idx++) { ++ const u16 packed = phys >> (16 * dword_idx); ++ u64 dword = 0; ++ ++ size_t hword_bit; ++ ++ for (hword_bit = 0; hword_bit < 16; hword_bit++) { ++ const size_t dword_bit = hword_bit * 4; ++ const u64 mask = (packed >> (hword_bit)) & 0x1; ++ ++ dword |= mask << (dword_bit + 0); ++ dword |= mask << (dword_bit + 1); ++ dword |= mask << (dword_bit + 2); ++ dword |= mask << (dword_bit + 3); ++ } ++ dwords[dword_idx] = dword; ++ } ++ *lo = dwords[0]; ++ *hi = dwords[1]; ++} ++ ++void kbase_hwcnt_gpu_enable_map_to_physical(struct kbase_hwcnt_physical_enable_map *dst, ++ const struct kbase_hwcnt_enable_map *src) ++{ ++ const struct kbase_hwcnt_metadata *metadata; ++ u64 fe_bm[EM_COUNT] = { 0 }; ++ u64 shader_bm[EM_COUNT] = { 0 }; ++ u64 tiler_bm[EM_COUNT] = { 0 }; ++ u64 mmu_l2_bm[EM_COUNT] = { 0 }; ++ size_t grp, blk, blk_inst; ++ ++ if (WARN_ON(!src) || WARN_ON(!dst)) ++ return; ++ ++ metadata = src->metadata; ++ ++ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) ++ { ++ const u64 grp_type = kbase_hwcnt_metadata_group_type(metadata, grp); ++ const u64 blk_type = kbase_hwcnt_metadata_block_type(metadata, grp, blk); ++ const u64 *blk_map = kbase_hwcnt_enable_map_block_instance(src, grp, blk, blk_inst); ++ ++ if ((enum kbase_hwcnt_gpu_group_type)grp_type == KBASE_HWCNT_GPU_GROUP_TYPE_V5) { ++ const size_t map_stride = ++ kbase_hwcnt_metadata_block_enable_map_stride(metadata, grp, blk); ++ size_t map_idx; ++ ++ for (map_idx = 0; map_idx < map_stride; ++map_idx) { ++ if (WARN_ON(map_idx >= EM_COUNT)) ++ break; ++ ++ switch ((enum kbase_hwcnt_gpu_v5_block_type)blk_type) { ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE_UNDEFINED: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC_UNDEFINED: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER_UNDEFINED: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS_UNDEFINED: ++ /* Nothing to do in this case. */ ++ break; ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE2: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE3: ++ fe_bm[map_idx] |= blk_map[map_idx]; ++ break; ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER: ++ tiler_bm[map_idx] |= blk_map[map_idx]; ++ break; ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC2: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC3: ++ shader_bm[map_idx] |= blk_map[map_idx]; ++ break; ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS2: ++ mmu_l2_bm[map_idx] |= blk_map[map_idx]; ++ break; ++ default: ++ WARN_ON(true); ++ } ++ } ++ } else { ++ WARN_ON(true); ++ } ++ } ++ ++ dst->fe_bm = kbase_hwcnt_backend_gpu_block_map_to_physical(fe_bm[EM_LO], fe_bm[EM_HI]); ++ dst->shader_bm = ++ kbase_hwcnt_backend_gpu_block_map_to_physical(shader_bm[EM_LO], shader_bm[EM_HI]); ++ dst->tiler_bm = ++ kbase_hwcnt_backend_gpu_block_map_to_physical(tiler_bm[EM_LO], tiler_bm[EM_HI]); ++ dst->mmu_l2_bm = ++ kbase_hwcnt_backend_gpu_block_map_to_physical(mmu_l2_bm[EM_LO], mmu_l2_bm[EM_HI]); ++} ++ ++void kbase_hwcnt_gpu_set_to_physical(enum kbase_hwcnt_physical_set *dst, enum kbase_hwcnt_set src) ++{ ++ switch (src) { ++ case KBASE_HWCNT_SET_PRIMARY: ++ *dst = KBASE_HWCNT_PHYSICAL_SET_PRIMARY; ++ break; ++ case KBASE_HWCNT_SET_SECONDARY: ++ *dst = KBASE_HWCNT_PHYSICAL_SET_SECONDARY; ++ break; ++ case KBASE_HWCNT_SET_TERTIARY: ++ *dst = KBASE_HWCNT_PHYSICAL_SET_TERTIARY; ++ break; ++ default: ++ WARN_ON(true); ++ } ++} ++ ++void kbase_hwcnt_gpu_enable_map_from_physical(struct kbase_hwcnt_enable_map *dst, ++ const struct kbase_hwcnt_physical_enable_map *src) ++{ ++ const struct kbase_hwcnt_metadata *metadata; ++ ++ u64 fe_bm[EM_COUNT] = { 0 }; ++ u64 shader_bm[EM_COUNT] = { 0 }; ++ u64 tiler_bm[EM_COUNT] = { 0 }; ++ u64 mmu_l2_bm[EM_COUNT] = { 0 }; ++ size_t grp, blk, blk_inst; ++ ++ if (WARN_ON(!src) || WARN_ON(!dst)) ++ return; ++ ++ metadata = dst->metadata; ++ ++ kbasep_hwcnt_backend_gpu_block_map_from_physical(src->fe_bm, &fe_bm[EM_LO], &fe_bm[EM_HI]); ++ kbasep_hwcnt_backend_gpu_block_map_from_physical(src->shader_bm, &shader_bm[EM_LO], ++ &shader_bm[EM_HI]); ++ kbasep_hwcnt_backend_gpu_block_map_from_physical(src->tiler_bm, &tiler_bm[EM_LO], ++ &tiler_bm[EM_HI]); ++ kbasep_hwcnt_backend_gpu_block_map_from_physical(src->mmu_l2_bm, &mmu_l2_bm[EM_LO], ++ &mmu_l2_bm[EM_HI]); ++ ++ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) ++ { ++ const u64 grp_type = kbase_hwcnt_metadata_group_type(metadata, grp); ++ const u64 blk_type = kbase_hwcnt_metadata_block_type(metadata, grp, blk); ++ u64 *blk_map = kbase_hwcnt_enable_map_block_instance(dst, grp, blk, blk_inst); ++ ++ if ((enum kbase_hwcnt_gpu_group_type)grp_type == KBASE_HWCNT_GPU_GROUP_TYPE_V5) { ++ const size_t map_stride = ++ kbase_hwcnt_metadata_block_enable_map_stride(metadata, grp, blk); ++ size_t map_idx; ++ ++ for (map_idx = 0; map_idx < map_stride; ++map_idx) { ++ if (WARN_ON(map_idx >= EM_COUNT)) ++ break; ++ ++ switch ((enum kbase_hwcnt_gpu_v5_block_type)blk_type) { ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE_UNDEFINED: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC_UNDEFINED: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER_UNDEFINED: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS_UNDEFINED: ++ /* Nothing to do in this case. */ ++ break; ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE2: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE3: ++ blk_map[map_idx] = fe_bm[map_idx]; ++ break; ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER: ++ blk_map[map_idx] = tiler_bm[map_idx]; ++ break; ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC2: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC3: ++ blk_map[map_idx] = shader_bm[map_idx]; ++ break; ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS2: ++ blk_map[map_idx] = mmu_l2_bm[map_idx]; ++ break; ++ default: ++ WARN_ON(true); ++ } ++ } ++ } else { ++ WARN_ON(true); ++ } ++ } ++} ++ ++void kbase_hwcnt_gpu_patch_dump_headers(struct kbase_hwcnt_dump_buffer *buf, ++ const struct kbase_hwcnt_enable_map *enable_map) ++{ ++ const struct kbase_hwcnt_metadata *metadata; ++ size_t grp, blk, blk_inst; ++ ++ if (WARN_ON(!buf) || WARN_ON(!enable_map) || WARN_ON(buf->metadata != enable_map->metadata)) ++ return; ++ ++ metadata = buf->metadata; ++ ++ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) ++ { ++ const u64 grp_type = kbase_hwcnt_metadata_group_type(metadata, grp); ++ u64 *buf_blk = kbase_hwcnt_dump_buffer_block_instance(buf, grp, blk, blk_inst); ++ const u64 *blk_map = ++ kbase_hwcnt_enable_map_block_instance(enable_map, grp, blk, blk_inst); ++ ++ if ((enum kbase_hwcnt_gpu_group_type)grp_type == KBASE_HWCNT_GPU_GROUP_TYPE_V5) { ++ const size_t map_stride = ++ kbase_hwcnt_metadata_block_enable_map_stride(metadata, grp, blk); ++ u64 prfcnt_bm[EM_COUNT] = { 0 }; ++ u32 prfcnt_en = 0; ++ size_t map_idx; ++ ++ for (map_idx = 0; map_idx < map_stride; ++map_idx) { ++ if (WARN_ON(map_idx >= EM_COUNT)) ++ break; ++ ++ prfcnt_bm[map_idx] = blk_map[map_idx]; ++ } ++ ++ prfcnt_en = kbase_hwcnt_backend_gpu_block_map_to_physical(prfcnt_bm[EM_LO], ++ prfcnt_bm[EM_HI]); ++ ++ buf_blk[KBASE_HWCNT_V5_PRFCNT_EN_HEADER] = prfcnt_en; ++ } else { ++ WARN_ON(true); ++ } ++ } ++} +diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.h +new file mode 100644 +index 000000000..a49c31e52 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h -@@ -0,0 +1,844 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.h +@@ -0,0 +1,407 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -186481,1068 +216379,713 @@ index 000000000000..4fb5d1d9c410 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + ++#ifndef _KBASE_HWCNT_GPU_H_ ++#define _KBASE_HWCNT_GPU_H_ + ++#include ++#include + -+/* -+ * Definitions (types, defines, etcs) specific to Job Manager Kbase. -+ * They are placed here to allow the hierarchy of header files to work. -+ */ ++struct kbase_device; ++struct kbase_hwcnt_metadata; ++struct kbase_hwcnt_enable_map; ++struct kbase_hwcnt_dump_buffer; + -+#ifndef _KBASE_JM_DEFS_H_ -+#define _KBASE_JM_DEFS_H_ ++/* Hardware counter version 5 definitions, V5 is the only supported version. */ ++#define KBASE_HWCNT_V5_BLOCK_TYPE_COUNT 4 ++#define KBASE_HWCNT_V5_HEADERS_PER_BLOCK 4 ++#define KBASE_HWCNT_V5_DEFAULT_COUNTERS_PER_BLOCK 60 ++#define KBASE_HWCNT_V5_DEFAULT_VALUES_PER_BLOCK \ ++ (KBASE_HWCNT_V5_HEADERS_PER_BLOCK + KBASE_HWCNT_V5_DEFAULT_COUNTERS_PER_BLOCK) + -+#include "mali_kbase_js_defs.h" ++/* FrontEnd block count in V5 GPU hardware counter. */ ++#define KBASE_HWCNT_V5_FE_BLOCK_COUNT 1 ++/* Tiler block count in V5 GPU hardware counter. */ ++#define KBASE_HWCNT_V5_TILER_BLOCK_COUNT 1 + -+/* Dump Job slot trace on error (only active if KBASE_KTRACE_ENABLE != 0) */ -+#define KBASE_KTRACE_DUMP_ON_JOB_SLOT_ERROR 1 ++/* Index of the PRFCNT_EN header into a V5 counter block */ ++#define KBASE_HWCNT_V5_PRFCNT_EN_HEADER 2 + -+/* -+ * Number of milliseconds before resetting the GPU when a job cannot be "zapped" -+ * from the hardware. Note that the time is actually -+ * ZAP_TIMEOUT+SOFT_STOP_RESET_TIMEOUT between the context zap starting and -+ * the GPU actually being reset to give other contexts time for their jobs -+ * to be soft-stopped and removed from the hardware before resetting. -+ */ -+#define ZAP_TIMEOUT 1000 ++/* Number of bytes for each counter value in hardware. */ ++#define KBASE_HWCNT_VALUE_HW_BYTES (sizeof(u32)) + -+/* -+ * Prevent soft-stops from occurring in scheduling situations -+ * -+ * This is not due to HW issues, but when scheduling is desired to be more -+ * predictable. -+ * -+ * Therefore, soft stop may still be disabled due to HW issues. -+ * -+ * Soft stop will still be used for non-scheduling purposes e.g. when -+ * terminating a context. -+ * -+ * if not in use, define this value to 0 instead of being undefined. ++/** ++ * enum kbase_hwcnt_gpu_group_type - GPU hardware counter group types, used to ++ * identify metadata groups. ++ * @KBASE_HWCNT_GPU_GROUP_TYPE_V5: GPU V5 group type. + */ -+#define KBASE_DISABLE_SCHEDULING_SOFT_STOPS 0 ++enum kbase_hwcnt_gpu_group_type { ++ KBASE_HWCNT_GPU_GROUP_TYPE_V5, ++}; + -+/* -+ * Prevent hard-stops from occurring in scheduling situations -+ * -+ * This is not due to HW issues, but when scheduling is desired to be more -+ * predictable. -+ * -+ * Hard stop will still be used for non-scheduling purposes e.g. when -+ * terminating a context. -+ * -+ * if not in use, define this value to 0 instead of being undefined. ++/** ++ * enum kbase_hwcnt_gpu_v5_block_type - GPU V5 hardware counter block types, ++ * used to identify metadata blocks. ++ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE: Front End block (Job manager ++ * or CSF HW). ++ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE2: Secondary Front End block (Job ++ * manager or CSF HW). ++ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE3: Tertiary Front End block (Job ++ * manager or CSF HW). ++ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE_UNDEFINED: Undefined Front End block ++ * (e.g. if a counter set that ++ * a block doesn't support is ++ * used). ++ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER: Tiler block. ++ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER_UNDEFINED: Undefined Tiler block. ++ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC: Shader Core block. ++ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC2: Secondary Shader Core block. ++ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC3: Tertiary Shader Core block. ++ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC_UNDEFINED: Undefined Shader Core block. ++ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS: Memsys block. ++ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS2: Secondary Memsys block. ++ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS_UNDEFINED: Undefined Memsys block. + */ -+#define KBASE_DISABLE_SCHEDULING_HARD_STOPS 0 ++enum kbase_hwcnt_gpu_v5_block_type { ++ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE, ++ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE2, ++ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE3, ++ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE_UNDEFINED, ++ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER, ++ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER_UNDEFINED, ++ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC, ++ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC2, ++ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC3, ++ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC_UNDEFINED, ++ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS, ++ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS2, ++ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS_UNDEFINED, ++}; + -+/* Atom has been previously soft-stopped */ -+#define KBASE_KATOM_FLAG_BEEN_SOFT_STOPPED (1<<1) -+/* Atom has been previously retried to execute */ -+#define KBASE_KATOM_FLAGS_RERUN (1<<2) -+/* Atom submitted with JOB_CHAIN_FLAG bit set in JS_CONFIG_NEXT register, helps -+ * to disambiguate short-running job chains during soft/hard stopping of jobs ++/** ++ * enum kbase_hwcnt_set - GPU hardware counter sets ++ * @KBASE_HWCNT_SET_PRIMARY: The Primary set of counters ++ * @KBASE_HWCNT_SET_SECONDARY: The Secondary set of counters ++ * @KBASE_HWCNT_SET_TERTIARY: The Tertiary set of counters ++ * @KBASE_HWCNT_SET_UNDEFINED: Undefined set of counters + */ -+#define KBASE_KATOM_FLAGS_JOBCHAIN (1<<3) -+/* Atom has been previously hard-stopped. */ -+#define KBASE_KATOM_FLAG_BEEN_HARD_STOPPED (1<<4) -+/* Atom has caused us to enter disjoint state */ -+#define KBASE_KATOM_FLAG_IN_DISJOINT (1<<5) -+/* Atom blocked on cross-slot dependency */ -+#define KBASE_KATOM_FLAG_X_DEP_BLOCKED (1<<7) -+/* Atom has fail dependency on cross-slot dependency */ -+#define KBASE_KATOM_FLAG_FAIL_BLOCKER (1<<8) -+/* Atom is currently in the list of atoms blocked on cross-slot dependencies */ -+#define KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST (1<<9) -+/* Atom is currently holding a context reference */ -+#define KBASE_KATOM_FLAG_HOLDING_CTX_REF (1<<10) -+/* Atom requires GPU to be in protected mode */ -+#define KBASE_KATOM_FLAG_PROTECTED (1<<11) -+/* Atom has been stored in runnable_tree */ -+#define KBASE_KATOM_FLAG_JSCTX_IN_TREE (1<<12) -+/* Atom is waiting for L2 caches to power up in order to enter protected mode */ -+#define KBASE_KATOM_FLAG_HOLDING_L2_REF_PROT (1<<13) ++enum kbase_hwcnt_set { ++ KBASE_HWCNT_SET_PRIMARY, ++ KBASE_HWCNT_SET_SECONDARY, ++ KBASE_HWCNT_SET_TERTIARY, ++ KBASE_HWCNT_SET_UNDEFINED = 255, ++}; + -+/* SW related flags about types of JS_COMMAND action -+ * NOTE: These must be masked off by JS_COMMAND_MASK ++/** ++ * struct kbase_hwcnt_physical_enable_map - Representation of enable map ++ * directly used by GPU. ++ * @fe_bm: Front end (JM/CSHW) counters selection bitmask. ++ * @shader_bm: Shader counters selection bitmask. ++ * @tiler_bm: Tiler counters selection bitmask. ++ * @mmu_l2_bm: MMU_L2 counters selection bitmask. + */ ++struct kbase_hwcnt_physical_enable_map { ++ u32 fe_bm; ++ u32 shader_bm; ++ u32 tiler_bm; ++ u32 mmu_l2_bm; ++}; + -+/* This command causes a disjoint event */ -+#define JS_COMMAND_SW_CAUSES_DISJOINT 0x100 -+ -+/* Bitmask of all SW related flags */ -+#define JS_COMMAND_SW_BITS (JS_COMMAND_SW_CAUSES_DISJOINT) -+ -+#if (JS_COMMAND_SW_BITS & JS_COMMAND_MASK) -+#error "JS_COMMAND_SW_BITS not masked off by JS_COMMAND_MASK." \ -+ "Must update JS_COMMAND_SW_<..> bitmasks" -+#endif ++/* ++ * Values for Hardware Counter SET_SELECT value. ++ * Directly passed to HW. ++ */ ++enum kbase_hwcnt_physical_set { ++ KBASE_HWCNT_PHYSICAL_SET_PRIMARY = 0, ++ KBASE_HWCNT_PHYSICAL_SET_SECONDARY = 1, ++ KBASE_HWCNT_PHYSICAL_SET_TERTIARY = 2, ++}; + -+/* Soft-stop command that causes a Disjoint event. This of course isn't -+ * entirely masked off by JS_COMMAND_MASK ++/** ++ * struct kbase_hwcnt_gpu_info - Information about hwcnt blocks on the GPUs. ++ * @l2_count: L2 cache count. ++ * @core_mask: Shader core mask. May be sparse. ++ * @clk_cnt: Number of clock domains available. ++ * @prfcnt_values_per_block: Total entries (header + counters) of performance ++ * counter per block. + */ -+#define JS_COMMAND_SOFT_STOP_WITH_SW_DISJOINT \ -+ (JS_COMMAND_SW_CAUSES_DISJOINT | JS_COMMAND_SOFT_STOP) ++struct kbase_hwcnt_gpu_info { ++ size_t l2_count; ++ u64 core_mask; ++ u8 clk_cnt; ++ size_t prfcnt_values_per_block; ++}; ++ ++/** ++ * struct kbase_hwcnt_curr_config - Current Configuration of HW allocated to the ++ * GPU. ++ * @num_l2_slices: Current number of L2 slices allocated to the GPU. ++ * @shader_present: Current shader present bitmap that is allocated to the GPU. ++ * ++ * For architectures with the max_config interface available from the Arbiter, ++ * the current resources allocated may change during runtime due to a ++ * re-partitioning (possible with partition manager). Thus, the HWC needs to be ++ * prepared to report any possible set of counters. For this reason the memory ++ * layout in the userspace is based on the maximum possible allocation. On the ++ * other hand, each partition has just the view of its currently allocated ++ * resources. Therefore, it is necessary to correctly map the dumped HWC values ++ * from the registers into this maximum memory layout so that it can be exposed ++ * to the userspace side correctly. ++ * ++ * For L2 cache just the number is enough once the allocated ones will be ++ * accumulated on the first L2 slots available in the destination buffer. ++ * ++ * For the correct mapping of the shader cores it is necessary to jump all the ++ * L2 cache slots in the destination buffer that are not allocated. But, it is ++ * not necessary to add any logic to map the shader cores bitmap into the memory ++ * layout because the shader_present allocated will always be a subset of the ++ * maximum shader_present. It is possible because: ++ * 1 - Partitions are made of slices and they are always ordered from the ones ++ * with more shader cores to the ones with less. ++ * 2 - The shader cores in a slice are always contiguous. ++ * 3 - A partition can only have a contiguous set of slices allocated to it. ++ * So, for example, if 4 slices are available in total, 1 with 4 cores, 2 with ++ * 3 cores and 1 with 2 cores. The maximum possible shader_present would be: ++ * 0x0011|0111|0111|1111 -> note the order and that the shader cores are ++ * contiguous in any slice. ++ * Supposing that a partition takes the two slices in the middle, the current ++ * config shader_present for this partition would be: ++ * 0x0111|0111 -> note that this is a subset of the maximum above and the slices ++ * are contiguous. ++ * Therefore, by directly copying any subset of the maximum possible ++ * shader_present the mapping is already achieved. ++ */ ++struct kbase_hwcnt_curr_config { ++ size_t num_l2_slices; ++ u64 shader_present; ++}; + -+#define KBASEP_ATOM_ID_INVALID BASE_JD_ATOM_COUNT ++/** ++ * kbase_hwcnt_is_block_type_undefined() - Check if a block type is undefined. ++ * ++ * @grp_type: Hardware counter group type. ++ * @blk_type: Hardware counter block type. ++ * ++ * Return: true if the block type is undefined, else false. ++ */ ++static inline bool kbase_hwcnt_is_block_type_undefined(const uint64_t grp_type, ++ const uint64_t blk_type) ++{ ++ /* Warn on unknown group type */ ++ if (WARN_ON(grp_type != KBASE_HWCNT_GPU_GROUP_TYPE_V5)) ++ return false; + -+/* Serialize atoms within a slot (ie only one atom per job slot) */ -+#define KBASE_SERIALIZE_INTRA_SLOT (1 << 0) -+/* Serialize atoms between slots (ie only one job slot running at any time) */ -+#define KBASE_SERIALIZE_INTER_SLOT (1 << 1) -+/* Reset the GPU after each atom completion */ -+#define KBASE_SERIALIZE_RESET (1 << 2) ++ return (blk_type == KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE_UNDEFINED || ++ blk_type == KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER_UNDEFINED || ++ blk_type == KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC_UNDEFINED || ++ blk_type == KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS_UNDEFINED); ++} + -+#ifdef CONFIG_DEBUG_FS +/** -+ * struct base_job_fault_event - keeps track of the atom which faulted or which -+ * completed after the faulty atom but before the -+ * debug data for faulty atom was dumped. ++ * kbase_hwcnt_jm_metadata_create() - Create hardware counter metadata for the ++ * JM GPUs. ++ * @info: Non-NULL pointer to info struct. ++ * @counter_set: The performance counter set used. ++ * @out_metadata: Non-NULL pointer to where created metadata is stored on ++ * success. ++ * @out_dump_bytes: Non-NULL pointer to where the size of the GPU counter dump ++ * buffer is stored on success. + * -+ * @event_code: event code for the atom, should != BASE_JD_EVENT_DONE for -+ * the atom which faulted. -+ * @katom: pointer to the atom for which job fault occurred or which -+ * completed after the faulty atom. -+ * @job_fault_work: work item, queued only for the faulty atom, which waits for -+ * the dumping to get completed and then does the bottom half -+ * of job done for the atoms which followed the faulty atom. -+ * @head: List head used to store the atom in the global list of -+ * faulty atoms or context specific list of atoms which got -+ * completed during the dump. -+ * @reg_offset: offset of the register to be dumped next, only applicable -+ * for the faulty atom. ++ * Return: 0 on success, else error code. + */ -+struct base_job_fault_event { -+ -+ u32 event_code; -+ struct kbase_jd_atom *katom; -+ struct work_struct job_fault_work; -+ struct list_head head; -+ int reg_offset; -+}; -+#endif ++int kbase_hwcnt_jm_metadata_create(const struct kbase_hwcnt_gpu_info *info, ++ enum kbase_hwcnt_set counter_set, ++ const struct kbase_hwcnt_metadata **out_metadata, ++ size_t *out_dump_bytes); + +/** -+ * struct kbase_jd_atom_dependency - Contains the dependency info for an atom. -+ * @atom: pointer to the dependee atom. -+ * @dep_type: type of dependency on the dependee @atom, i.e. order or data -+ * dependency. BASE_JD_DEP_TYPE_INVALID indicates no dependency. ++ * kbase_hwcnt_jm_metadata_destroy() - Destroy JM GPU hardware counter metadata. ++ * ++ * @metadata: Pointer to metadata to destroy. + */ -+struct kbase_jd_atom_dependency { -+ struct kbase_jd_atom *atom; -+ u8 dep_type; -+}; ++void kbase_hwcnt_jm_metadata_destroy(const struct kbase_hwcnt_metadata *metadata); + +/** -+ * kbase_jd_katom_dep_atom - Retrieves a read-only reference to the -+ * dependee atom. -+ * @dep: pointer to the dependency info structure. ++ * kbase_hwcnt_csf_metadata_create() - Create hardware counter metadata for the ++ * CSF GPUs. ++ * @info: Non-NULL pointer to info struct. ++ * @counter_set: The performance counter set used. ++ * @out_metadata: Non-NULL pointer to where created metadata is stored on ++ * success. + * -+ * Return: readonly reference to dependee atom. ++ * Return: 0 on success, else error code. + */ -+static inline const struct kbase_jd_atom * -+kbase_jd_katom_dep_atom(const struct kbase_jd_atom_dependency *dep) -+{ -+ LOCAL_ASSERT(dep != NULL); ++int kbase_hwcnt_csf_metadata_create(const struct kbase_hwcnt_gpu_info *info, ++ enum kbase_hwcnt_set counter_set, ++ const struct kbase_hwcnt_metadata **out_metadata); + -+ return (const struct kbase_jd_atom *)(dep->atom); -+} ++/** ++ * kbase_hwcnt_csf_metadata_destroy() - Destroy CSF GPU hardware counter ++ * metadata. ++ * @metadata: Pointer to metadata to destroy. ++ */ ++void kbase_hwcnt_csf_metadata_destroy(const struct kbase_hwcnt_metadata *metadata); + +/** -+ * kbase_jd_katom_dep_type - Retrieves the dependency type info ++ * kbase_hwcnt_jm_dump_get() - Copy or accumulate enabled counters from the raw ++ * dump buffer in src into the dump buffer ++ * abstraction in dst. ++ * @dst: Non-NULL pointer to destination dump buffer. ++ * @src: Non-NULL pointer to source raw dump buffer, of same length ++ * as dump_buf_bytes in the metadata of destination dump ++ * buffer. ++ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. ++ * @pm_core_mask: PM state synchronized shaders core mask with the dump. ++ * @curr_config: Current allocated hardware resources to correctly map the ++ * source raw dump buffer to the destination dump buffer. ++ * @accumulate: True if counters in source should be accumulated into ++ * destination, rather than copied. + * -+ * @dep: pointer to the dependency info structure. ++ * The dst and dst_enable_map MUST have been created from the same metadata as ++ * returned from the call to kbase_hwcnt_jm_metadata_create as was used to get ++ * the length of src. + * -+ * Return: the type of dependency there is on the dependee atom. ++ * Return: 0 on success, else error code. + */ -+static inline u8 kbase_jd_katom_dep_type( -+ const struct kbase_jd_atom_dependency *dep) -+{ -+ LOCAL_ASSERT(dep != NULL); ++int kbase_hwcnt_jm_dump_get(struct kbase_hwcnt_dump_buffer *dst, u64 *src, ++ const struct kbase_hwcnt_enable_map *dst_enable_map, ++ const u64 pm_core_mask, ++ const struct kbase_hwcnt_curr_config *curr_config, bool accumulate); + -+ return dep->dep_type; -+} ++/** ++ * kbase_hwcnt_csf_dump_get() - Copy or accumulate enabled counters from the raw ++ * dump buffer in src into the dump buffer ++ * abstraction in dst. ++ * @dst: Non-NULL pointer to destination dump buffer. ++ * @src: Non-NULL pointer to source raw dump buffer, of same length ++ * as dump_buf_bytes in the metadata of dst dump buffer. ++ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. ++ * @accumulate: True if counters in src should be accumulated into ++ * destination, rather than copied. ++ * ++ * The dst and dst_enable_map MUST have been created from the same metadata as ++ * returned from the call to kbase_hwcnt_csf_metadata_create as was used to get ++ * the length of src. ++ * ++ * Return: 0 on success, else error code. ++ */ ++int kbase_hwcnt_csf_dump_get(struct kbase_hwcnt_dump_buffer *dst, u64 *src, ++ const struct kbase_hwcnt_enable_map *dst_enable_map, bool accumulate); + +/** -+ * kbase_jd_katom_dep_set - sets up the dependency info structure -+ * as per the values passed. -+ * @const_dep: pointer to the dependency info structure to be setup. -+ * @a: pointer to the dependee atom. -+ * @type: type of dependency there is on the dependee atom. ++ * kbase_hwcnt_backend_gpu_block_map_to_physical() - Convert from a block ++ * enable map abstraction to ++ * a physical block enable ++ * map. ++ * @lo: Low 64 bits of block enable map abstraction. ++ * @hi: High 64 bits of block enable map abstraction. ++ * ++ * The abstraction uses 128 bits to enable 128 block values, whereas the ++ * physical uses just 32 bits, as bit n enables values [n*4, n*4+3]. ++ * Therefore, this conversion is lossy. ++ * ++ * Return: 32-bit physical block enable map. + */ -+static inline void kbase_jd_katom_dep_set( -+ const struct kbase_jd_atom_dependency *const_dep, -+ struct kbase_jd_atom *a, u8 type) ++static inline u32 kbase_hwcnt_backend_gpu_block_map_to_physical(u64 lo, u64 hi) +{ -+ struct kbase_jd_atom_dependency *dep; ++ u32 phys = 0; ++ u64 dwords[2] = { lo, hi }; ++ size_t dword_idx; + -+ LOCAL_ASSERT(const_dep != NULL); ++ for (dword_idx = 0; dword_idx < 2; dword_idx++) { ++ const u64 dword = dwords[dword_idx]; ++ u16 packed = 0; + -+ dep = (struct kbase_jd_atom_dependency *)const_dep; ++ size_t hword_bit; + -+ dep->atom = a; -+ dep->dep_type = type; ++ for (hword_bit = 0; hword_bit < 16; hword_bit++) { ++ const size_t dword_bit = hword_bit * 4; ++ const u16 mask = ((dword >> (dword_bit + 0)) & 0x1) | ++ ((dword >> (dword_bit + 1)) & 0x1) | ++ ((dword >> (dword_bit + 2)) & 0x1) | ++ ((dword >> (dword_bit + 3)) & 0x1); ++ packed |= (mask << hword_bit); ++ } ++ phys |= ((u32)packed) << (16 * dword_idx); ++ } ++ return phys; +} + +/** -+ * kbase_jd_katom_dep_clear - resets the dependency info structure ++ * kbase_hwcnt_gpu_enable_map_to_physical() - Convert an enable map abstraction ++ * into a physical enable map. ++ * @dst: Non-NULL pointer to destination physical enable map. ++ * @src: Non-NULL pointer to source enable map abstraction. + * -+ * @const_dep: pointer to the dependency info structure to be setup. ++ * The src must have been created from a metadata returned from a call to ++ * kbase_hwcnt_jm_metadata_create or kbase_hwcnt_csf_metadata_create. ++ * ++ * This is a lossy conversion, as the enable map abstraction has one bit per ++ * individual counter block value, but the physical enable map uses 1 bit for ++ * every 4 counters, shared over all instances of a block. + */ -+static inline void kbase_jd_katom_dep_clear( -+ const struct kbase_jd_atom_dependency *const_dep) -+{ -+ struct kbase_jd_atom_dependency *dep; -+ -+ LOCAL_ASSERT(const_dep != NULL); ++void kbase_hwcnt_gpu_enable_map_to_physical(struct kbase_hwcnt_physical_enable_map *dst, ++ const struct kbase_hwcnt_enable_map *src); + -+ dep = (struct kbase_jd_atom_dependency *)const_dep; ++/** ++ * kbase_hwcnt_gpu_set_to_physical() - Map counter set selection to physical ++ * SET_SELECT value. ++ * ++ * @dst: Non-NULL pointer to destination physical SET_SELECT value. ++ * @src: Non-NULL pointer to source counter set selection. ++ */ ++void kbase_hwcnt_gpu_set_to_physical(enum kbase_hwcnt_physical_set *dst, enum kbase_hwcnt_set src); + -+ dep->atom = NULL; -+ dep->dep_type = BASE_JD_DEP_TYPE_INVALID; -+} ++/** ++ * kbase_hwcnt_gpu_enable_map_from_physical() - Convert a physical enable map to ++ * an enable map abstraction. ++ * @dst: Non-NULL pointer to destination enable map abstraction. ++ * @src: Non-NULL pointer to source physical enable map. ++ * ++ * The dst must have been created from a metadata returned from a call to ++ * kbase_hwcnt_jm_metadata_create or kbase_hwcnt_csf_metadata_create. ++ * ++ * This is a lossy conversion, as the physical enable map can technically ++ * support counter blocks with 128 counters each, but no hardware actually uses ++ * more than 64, so the enable map abstraction has nowhere to store the enable ++ * information for the 64 non-existent counters. ++ */ ++void kbase_hwcnt_gpu_enable_map_from_physical(struct kbase_hwcnt_enable_map *dst, ++ const struct kbase_hwcnt_physical_enable_map *src); + +/** -+ * enum kbase_atom_gpu_rb_state - The state of an atom, pertinent after it -+ * becomes runnable, with respect to job slot -+ * ringbuffer/fifo. -+ * @KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB: Atom not currently present in slot fifo, -+ * which implies that either atom has not become -+ * runnable due to dependency or has completed -+ * the execution on GPU. -+ * @KBASE_ATOM_GPU_RB_WAITING_BLOCKED: Atom has been added to slot fifo but is -+ * blocked due to cross slot dependency, -+ * can't be submitted to GPU. -+ * @KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV: Atom has been added to slot -+ * fifo but is waiting for the completion of -+ * previously added atoms in current & other -+ * slots, as their protected mode requirements -+ * do not match with the current atom. -+ * @KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION: Atom is in slot fifo -+ * and is waiting for completion of protected -+ * mode transition, needed before the atom is -+ * submitted to GPU. -+ * @KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE: Atom is in slot fifo but is -+ * waiting for the cores, which are needed to -+ * execute the job chain represented by the atom, -+ * to become available -+ * @KBASE_ATOM_GPU_RB_READY: Atom is in slot fifo and can be submitted to -+ * GPU. -+ * @KBASE_ATOM_GPU_RB_SUBMITTED: Atom is in slot fifo and has been submitted -+ * to GPU. -+ * @KBASE_ATOM_GPU_RB_RETURN_TO_JS: Atom must be returned to JS due to some -+ * failure, but only after the previously added -+ * atoms in fifo have completed or have also -+ * been returned to JS. -+ */ -+enum kbase_atom_gpu_rb_state { -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB, -+ KBASE_ATOM_GPU_RB_WAITING_BLOCKED, -+ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV, -+ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION, -+ KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE, -+ KBASE_ATOM_GPU_RB_READY, -+ KBASE_ATOM_GPU_RB_SUBMITTED, -+ KBASE_ATOM_GPU_RB_RETURN_TO_JS = -1 -+}; -+ -+/** -+ * enum kbase_atom_enter_protected_state - The state of an atom with respect to -+ * the preparation for GPU's entry into protected mode, -+ * becomes pertinent only after atom's state with respect -+ * to slot ringbuffer is -+ * KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION -+ * @KBASE_ATOM_ENTER_PROTECTED_CHECK: Starting state. Check if there are any -+ * atoms currently submitted to GPU and protected mode -+ * transition is not already in progress. -+ * @KBASE_ATOM_ENTER_PROTECTED_HWCNT: Wait for hardware counter context to -+ * become disabled before entry into protected mode. -+ * @KBASE_ATOM_ENTER_PROTECTED_IDLE_L2: Wait for the L2 to become idle in -+ * preparation for the coherency change. L2 shall be -+ * powered down and GPU shall come out of fully -+ * coherent mode before entering protected mode. -+ * @KBASE_ATOM_ENTER_PROTECTED_SET_COHERENCY: Prepare coherency change; -+ * for BASE_HW_ISSUE_TGOX_R1_1234 also request L2 power on -+ * so that coherency register contains correct value when -+ * GPU enters protected mode. -+ * @KBASE_ATOM_ENTER_PROTECTED_FINISHED: End state; for -+ * BASE_HW_ISSUE_TGOX_R1_1234 check -+ * that L2 is powered up and switch GPU to protected mode. -+ */ -+enum kbase_atom_enter_protected_state { -+ /* -+ * NOTE: The integer value of this must match -+ * KBASE_ATOM_EXIT_PROTECTED_CHECK. -+ */ -+ KBASE_ATOM_ENTER_PROTECTED_CHECK = 0, -+ KBASE_ATOM_ENTER_PROTECTED_HWCNT, -+ KBASE_ATOM_ENTER_PROTECTED_IDLE_L2, -+ KBASE_ATOM_ENTER_PROTECTED_SET_COHERENCY, -+ KBASE_ATOM_ENTER_PROTECTED_FINISHED, -+}; -+ -+/** -+ * enum kbase_atom_exit_protected_state - The state of an atom with respect to -+ * the preparation for GPU's exit from protected mode, -+ * becomes pertinent only after atom's state with respect -+ * to slot ngbuffer is -+ * KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION -+ * @KBASE_ATOM_EXIT_PROTECTED_CHECK: Starting state. Check if there are any -+ * atoms currently submitted to GPU and protected mode -+ * transition is not already in progress. -+ * @KBASE_ATOM_EXIT_PROTECTED_IDLE_L2: Wait for the L2 to become idle in -+ * preparation for the reset, as exiting protected mode -+ * requires a reset. -+ * @KBASE_ATOM_EXIT_PROTECTED_RESET: Issue the reset to trigger exit from -+ * protected mode -+ * @KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT: End state, Wait for the reset to -+ * complete -+ */ -+enum kbase_atom_exit_protected_state { -+ /* -+ * NOTE: The integer value of this must match -+ * KBASE_ATOM_ENTER_PROTECTED_CHECK. -+ */ -+ KBASE_ATOM_EXIT_PROTECTED_CHECK = 0, -+ KBASE_ATOM_EXIT_PROTECTED_IDLE_L2, -+ KBASE_ATOM_EXIT_PROTECTED_RESET, -+ KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT, -+}; -+ -+/** -+ * struct kbase_ext_res - Contains the info for external resources referred -+ * by an atom, which have been mapped on GPU side. -+ * @gpu_address: Start address of the memory region allocated for -+ * the resource from GPU virtual address space. -+ * @alloc: pointer to physical pages tracking object, set on -+ * mapping the external resource on GPU side. ++ * kbase_hwcnt_gpu_patch_dump_headers() - Patch all the performance counter ++ * enable headers in a dump buffer to ++ * reflect the specified enable map. ++ * @buf: Non-NULL pointer to dump buffer to patch. ++ * @enable_map: Non-NULL pointer to enable map. ++ * ++ * The buf and enable_map must have been created from a metadata returned from ++ * a call to kbase_hwcnt_jm_metadata_create or kbase_hwcnt_csf_metadata_create. ++ * ++ * This function should be used before handing off a dump buffer over the ++ * kernel-user boundary, to ensure the header is accurate for the enable map ++ * used by the user. + */ -+struct kbase_ext_res { -+ u64 gpu_address; -+ struct kbase_mem_phy_alloc *alloc; -+}; ++void kbase_hwcnt_gpu_patch_dump_headers(struct kbase_hwcnt_dump_buffer *buf, ++ const struct kbase_hwcnt_enable_map *enable_map); + -+/** -+ * struct kbase_jd_atom - object representing the atom, containing the complete -+ * state and attributes of an atom. -+ * @work: work item for the bottom half processing of the atom, -+ * by JD or JS, after it got executed on GPU or the -+ * input fence got signaled -+ * @start_timestamp: time at which the atom was submitted to the GPU, by -+ * updating the JS_HEAD_NEXTn register. -+ * @udata: copy of the user data sent for the atom in -+ * base_jd_submit. -+ * @kctx: Pointer to the base context with which the atom is -+ * associated. -+ * @dep_head: Array of 2 list heads, pointing to the two list of -+ * atoms -+ * which are blocked due to dependency on this atom. -+ * @dep_item: Array of 2 list heads, used to store the atom in the -+ * list of other atoms depending on the same dependee -+ * atom. -+ * @dep: Array containing the dependency info for the 2 atoms -+ * on which the atom depends upon. -+ * @jd_item: List head used during job dispatch job_done -+ * processing - as dependencies may not be entirely -+ * resolved at this point, -+ * we need to use a separate list head. -+ * @in_jd_list: flag set to true if atom's @jd_item is currently on -+ * a list, prevents atom being processed twice. -+ * @jit_ids: Zero-terminated array of IDs of just-in-time memory -+ * allocations written to by the atom. When the atom -+ * completes, the value stored at the -+ * &struct_base_jit_alloc_info.heap_info_gpu_addr of -+ * each allocation is read in order to enforce an -+ * overall physical memory usage limit. -+ * @nr_extres: number of external resources referenced by the atom. -+ * @extres: pointer to the location containing info about -+ * @nr_extres external resources referenced by the atom. -+ * @device_nr: indicates the coregroup with which the atom is -+ * associated, when -+ * BASE_JD_REQ_SPECIFIC_COHERENT_GROUP specified. -+ * @jc: GPU address of the job-chain. -+ * @softjob_data: Copy of data read from the user space buffer that @jc -+ * points to. -+ * @fence: Stores either an input or output sync fence, -+ * depending on soft-job type -+ * @sync_waiter: Pointer to the sync fence waiter structure passed to -+ * the callback function on signaling of the input -+ * fence. -+ * @dma_fence: object containing pointers to both input & output -+ * fences and other related members used for explicit -+ * sync through soft jobs and for the implicit -+ * synchronization required on access to external -+ * resources. -+ * @event_code: Event code for the job chain represented by the atom, -+ * both HW and low-level SW events are represented by -+ * event codes. -+ * @core_req: bitmask of BASE_JD_REQ_* flags specifying either -+ * Hw or Sw requirements for the job chain represented -+ * by the atom. -+ * @ticks: Number of scheduling ticks for which atom has been -+ * running on the GPU. -+ * @sched_priority: Priority of the atom for Job scheduling, as per the -+ * KBASE_JS_ATOM_SCHED_PRIO_*. -+ * @completed: Wait queue to wait upon for the completion of atom. -+ * @status: Indicates at high level at what stage the atom is in, -+ * as per KBASE_JD_ATOM_STATE_*, that whether it is not -+ * in use or its queued in JD or given to JS or -+ * submitted to Hw or it completed the execution on Hw. -+ * @work_id: used for GPU tracepoints, its a snapshot of the -+ * 'work_id' counter in kbase_jd_context which is -+ * incremented on every call to base_jd_submit. -+ * @slot_nr: Job slot chosen for the atom. -+ * @atom_flags: bitmask of KBASE_KATOM_FLAG* flags capturing the -+ * excat low level state of the atom. -+ * @gpu_rb_state: bitmnask of KBASE_ATOM_GPU_RB_* flags, precisely -+ * tracking atom's state after it has entered -+ * Job scheduler on becoming runnable. Atom -+ * could be blocked due to cross slot dependency -+ * or waiting for the shader cores to become available -+ * or waiting for protected mode transitions to -+ * complete. -+ * @need_cache_flush_cores_retained: flag indicating that manual flush of GPU -+ * cache is needed for the atom and the shader cores -+ * used for atom have been kept on. -+ * @blocked: flag indicating that atom's resubmission to GPU is -+ * blocked till the work item is scheduled to return the -+ * atom to JS. -+ * @pre_dep: Pointer to atom that this atom has same-slot -+ * dependency on -+ * @post_dep: Pointer to atom that has same-slot dependency on -+ * this atom -+ * @x_pre_dep: Pointer to atom that this atom has cross-slot -+ * dependency on -+ * @x_post_dep: Pointer to atom that has cross-slot dependency on -+ * this atom -+ * @flush_id: The GPU's flush count recorded at the time of -+ * submission, -+ * used for the cache flush optimization -+ * @fault_event: Info for dumping the debug data on Job fault. -+ * @queue: List head used for 4 different purposes : -+ * Adds atom to the list of dma-buf fence waiting atoms. -+ * Adds atom to the list of atoms blocked due to cross -+ * slot dependency. -+ * Adds atom to the list of softjob atoms for which JIT -+ * allocation has been deferred -+ * Adds atom to the list of softjob atoms waiting for -+ * the signaling of fence. -+ * @jit_node: Used to keep track of all JIT free/alloc jobs in -+ * submission order -+ * @jit_blocked: Flag indicating that JIT allocation requested through -+ * softjob atom will be reattempted after the impending -+ * free of other active JIT allocations. -+ * @will_fail_event_code: If non-zero, this indicates that the atom will fail -+ * with the set event_code when the atom is processed. -+ * Used for special handling of atoms, which have a data -+ * dependency on the failed atoms. -+ * @protected_state: State of the atom, as per -+ * KBASE_ATOM_(ENTER|EXIT)_PROTECTED_*, -+ * when transitioning into or out of protected mode. -+ * Atom will be either entering or exiting the -+ * protected mode. -+ * @runnable_tree_node: The node added to context's job slot specific rb tree -+ * when the atom becomes runnable. -+ * @age: Age of atom relative to other atoms in the context, -+ * is snapshot of the age_count counter in kbase -+ * context. ++#endif /* _KBASE_HWCNT_GPU_H_ */ +diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.c +new file mode 100644 +index 000000000..0cf2f94cf +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.c +@@ -0,0 +1,298 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * + */ -+struct kbase_jd_atom { -+ struct work_struct work; -+ ktime_t start_timestamp; -+ -+ struct base_jd_udata udata; -+ struct kbase_context *kctx; + -+ struct list_head dep_head[2]; -+ struct list_head dep_item[2]; -+ const struct kbase_jd_atom_dependency dep[2]; -+ struct list_head jd_item; -+ bool in_jd_list; ++#include "hwcnt/mali_kbase_hwcnt_gpu.h" ++#include "hwcnt/mali_kbase_hwcnt_gpu_narrow.h" + -+#if MALI_JIT_PRESSURE_LIMIT_BASE -+ u8 jit_ids[2]; -+#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ ++#include ++#include ++#include + -+ u16 nr_extres; -+ struct kbase_ext_res *extres; ++int kbase_hwcnt_gpu_metadata_narrow_create(const struct kbase_hwcnt_metadata_narrow **dst_md_narrow, ++ const struct kbase_hwcnt_metadata *src_md) ++{ ++ struct kbase_hwcnt_description desc; ++ struct kbase_hwcnt_group_description group; ++ struct kbase_hwcnt_block_description blks[KBASE_HWCNT_V5_BLOCK_TYPE_COUNT]; ++ size_t prfcnt_values_per_block; ++ size_t blk; ++ int err; ++ struct kbase_hwcnt_metadata_narrow *metadata_narrow; + -+ u32 device_nr; -+ u64 jc; -+ void *softjob_data; -+#if defined(CONFIG_SYNC) -+ struct sync_fence *fence; -+ struct sync_fence_waiter sync_waiter; -+#endif /* CONFIG_SYNC */ -+#if defined(CONFIG_MALI_BIFROST_DMA_FENCE) || defined(CONFIG_SYNC_FILE) -+ struct { -+ /* Use the functions/API defined in mali_kbase_fence.h to -+ * when working with this sub struct -+ */ -+#if defined(CONFIG_SYNC_FILE) -+ /* Input fence */ -+#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) -+ struct fence *fence_in; -+#else -+ struct dma_fence *fence_in; -+#endif -+#endif -+ /* This points to the dma-buf output fence for this atom. If -+ * this is NULL then there is no fence for this atom and the -+ * following fields related to dma_fence may have invalid data. -+ * -+ * The context and seqno fields contain the details for this -+ * fence. -+ * -+ * This fence is signaled when the katom is completed, -+ * regardless of the event_code of the katom (signal also on -+ * failure). -+ */ -+#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) -+ struct fence *fence; -+#else -+ struct dma_fence *fence; -+#endif -+ /* The dma-buf fence context number for this atom. A unique -+ * context number is allocated to each katom in the context on -+ * context creation. -+ */ -+ unsigned int context; -+ /* The dma-buf fence sequence number for this atom. This is -+ * increased every time this katom uses dma-buf fence. -+ */ -+ atomic_t seqno; -+ /* This contains a list of all callbacks set up to wait on -+ * other fences. This atom must be held back from JS until all -+ * these callbacks have been called and dep_count have reached -+ * 0. The initial value of dep_count must be equal to the -+ * number of callbacks on this list. -+ * -+ * This list is protected by jctx.lock. Callbacks are added to -+ * this list when the atom is built and the wait are set up. -+ * All the callbacks then stay on the list until all callbacks -+ * have been called and the atom is queued, or cancelled, and -+ * then all callbacks are taken off the list and freed. -+ */ -+ struct list_head callbacks; -+ /* Atomic counter of number of outstandind dma-buf fence -+ * dependencies for this atom. When dep_count reaches 0 the -+ * atom may be queued. -+ * -+ * The special value "-1" may only be set after the count -+ * reaches 0, while holding jctx.lock. This indicates that the -+ * atom has been handled, either queued in JS or cancelled. -+ * -+ * If anyone but the dma-fence worker sets this to -1 they must -+ * ensure that any potentially queued worker must have -+ * completed before allowing the atom to be marked as unused. -+ * This can be done by flushing the fence work queue: -+ * kctx->dma_fence.wq. -+ */ -+ atomic_t dep_count; -+ } dma_fence; -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE || CONFIG_SYNC_FILE */ ++ if (!dst_md_narrow || !src_md || !src_md->grp_metadata || ++ !src_md->grp_metadata[0].blk_metadata) ++ return -EINVAL; + -+ /* Note: refer to kbasep_js_atom_retained_state, which will take a copy -+ * of some of the following members ++ /* Only support 1 group count and KBASE_HWCNT_V5_BLOCK_TYPE_COUNT block ++ * count in the metadata. + */ -+ enum base_jd_event_code event_code; -+ base_jd_core_req core_req; -+ u8 jobslot; -+ u8 renderpass_id; -+ struct base_jd_fragment jc_fragment; ++ if ((kbase_hwcnt_metadata_group_count(src_md) != 1) || ++ (kbase_hwcnt_metadata_block_count(src_md, 0) != KBASE_HWCNT_V5_BLOCK_TYPE_COUNT)) ++ return -EINVAL; + -+ u32 ticks; -+ int sched_priority; ++ /* Get the values count in the first block. */ ++ prfcnt_values_per_block = kbase_hwcnt_metadata_block_values_count(src_md, 0, 0); + -+ wait_queue_head_t completed; -+ enum kbase_jd_atom_state status; -+#ifdef CONFIG_GPU_TRACEPOINTS -+ int work_id; -+#endif -+ int slot_nr; ++ /* check all blocks should have same values count. */ ++ for (blk = 1; blk < KBASE_HWCNT_V5_BLOCK_TYPE_COUNT; blk++) { ++ size_t val_cnt = kbase_hwcnt_metadata_block_values_count(src_md, 0, blk); ++ if (val_cnt != prfcnt_values_per_block) ++ return -EINVAL; ++ } + -+ u32 atom_flags; ++ /* Only support 64 and 128 entries per block. */ ++ if ((prfcnt_values_per_block != 64) && (prfcnt_values_per_block != 128)) ++ return -EINVAL; + -+ int retry_count; ++ metadata_narrow = kmalloc(sizeof(*metadata_narrow), GFP_KERNEL); ++ if (!metadata_narrow) ++ return -ENOMEM; + -+ enum kbase_atom_gpu_rb_state gpu_rb_state; ++ /* Narrow to 64 entries per block to keep API backward compatibility. */ ++ prfcnt_values_per_block = 64; + -+ bool need_cache_flush_cores_retained; ++ for (blk = 0; blk < KBASE_HWCNT_V5_BLOCK_TYPE_COUNT; blk++) { ++ size_t blk_hdr_cnt = kbase_hwcnt_metadata_block_headers_count(src_md, 0, blk); ++ blks[blk] = (struct kbase_hwcnt_block_description){ ++ .type = kbase_hwcnt_metadata_block_type(src_md, 0, blk), ++ .inst_cnt = kbase_hwcnt_metadata_block_instance_count(src_md, 0, blk), ++ .hdr_cnt = blk_hdr_cnt, ++ .ctr_cnt = prfcnt_values_per_block - blk_hdr_cnt, ++ }; ++ } + -+ atomic_t blocked; ++ group = (struct kbase_hwcnt_group_description){ ++ .type = kbase_hwcnt_metadata_group_type(src_md, 0), ++ .blk_cnt = KBASE_HWCNT_V5_BLOCK_TYPE_COUNT, ++ .blks = blks, ++ }; + -+ /* user-space sequence number, to order atoms in some temporal order */ -+ u64 seq_nr; ++ desc = (struct kbase_hwcnt_description){ ++ .grp_cnt = kbase_hwcnt_metadata_group_count(src_md), ++ .avail_mask = src_md->avail_mask, ++ .clk_cnt = src_md->clk_cnt, ++ .grps = &group, ++ }; + -+ struct kbase_jd_atom *pre_dep; -+ struct kbase_jd_atom *post_dep; ++ err = kbase_hwcnt_metadata_create(&desc, &metadata_narrow->metadata); ++ if (!err) { ++ /* Narrow down the buffer size to half as the narrowed metadata ++ * only supports 32-bit but the created metadata uses 64-bit for ++ * block entry. ++ */ ++ metadata_narrow->dump_buf_bytes = metadata_narrow->metadata->dump_buf_bytes >> 1; ++ *dst_md_narrow = metadata_narrow; ++ } else { ++ kfree(metadata_narrow); ++ } + -+ struct kbase_jd_atom *x_pre_dep; -+ struct kbase_jd_atom *x_post_dep; ++ return err; ++} + -+ u32 flush_id; ++void kbase_hwcnt_gpu_metadata_narrow_destroy(const struct kbase_hwcnt_metadata_narrow *md_narrow) ++{ ++ if (!md_narrow) ++ return; + -+#ifdef CONFIG_DEBUG_FS -+ struct base_job_fault_event fault_event; -+#endif -+ struct list_head queue; ++ kbase_hwcnt_metadata_destroy(md_narrow->metadata); ++ kfree(md_narrow); ++} + -+ struct list_head jit_node; -+ bool jit_blocked; ++int kbase_hwcnt_dump_buffer_narrow_alloc(const struct kbase_hwcnt_metadata_narrow *md_narrow, ++ struct kbase_hwcnt_dump_buffer_narrow *dump_buf) ++{ ++ size_t dump_buf_bytes; ++ size_t clk_cnt_buf_bytes; ++ u8 *buf; + -+ enum base_jd_event_code will_fail_event_code; ++ if (!md_narrow || !dump_buf) ++ return -EINVAL; + -+ union { -+ enum kbase_atom_enter_protected_state enter; -+ enum kbase_atom_exit_protected_state exit; -+ } protected_state; ++ dump_buf_bytes = md_narrow->dump_buf_bytes; ++ clk_cnt_buf_bytes = sizeof(*dump_buf->clk_cnt_buf) * md_narrow->metadata->clk_cnt; + -+ struct rb_node runnable_tree_node; ++ /* Make a single allocation for both dump_buf and clk_cnt_buf. */ ++ buf = kmalloc(dump_buf_bytes + clk_cnt_buf_bytes, GFP_KERNEL); ++ if (!buf) ++ return -ENOMEM; + -+ u32 age; -+}; ++ *dump_buf = (struct kbase_hwcnt_dump_buffer_narrow){ ++ .md_narrow = md_narrow, ++ .dump_buf = (u32 *)buf, ++ .clk_cnt_buf = (u64 *)(buf + dump_buf_bytes), ++ }; + -+static inline bool kbase_jd_katom_is_protected( -+ const struct kbase_jd_atom *katom) -+{ -+ return (bool)(katom->atom_flags & KBASE_KATOM_FLAG_PROTECTED); ++ return 0; +} + -+/* -+ * Theory of operations: -+ * -+ * Atom objects are statically allocated within the context structure. -+ * -+ * Each atom is the head of two lists, one for the "left" set of dependencies, -+ * one for the "right" set. -+ */ -+ -+#define KBASE_JD_DEP_QUEUE_SIZE 256 ++void kbase_hwcnt_dump_buffer_narrow_free(struct kbase_hwcnt_dump_buffer_narrow *dump_buf_narrow) ++{ ++ if (!dump_buf_narrow) ++ return; + -+/** -+ * enum kbase_jd_renderpass_state - State of a renderpass -+ * @KBASE_JD_RP_COMPLETE: Unused or completed renderpass. Can only transition to -+ * START. -+ * @KBASE_JD_RP_START: Renderpass making a first attempt at tiling. -+ * Can transition to PEND_OOM or COMPLETE. -+ * @KBASE_JD_RP_PEND_OOM: Renderpass whose first attempt at tiling used too much -+ * memory and has a soft-stop pending. Can transition to -+ * OOM or COMPLETE. -+ * @KBASE_JD_RP_OOM: Renderpass whose first attempt at tiling used too much -+ * memory and therefore switched to incremental -+ * rendering. The fragment job chain is forced to run. -+ * Can only transition to RETRY. -+ * @KBASE_JD_RP_RETRY: Renderpass making a second or subsequent attempt at -+ * tiling. Can transition to RETRY_PEND_OOM or COMPLETE. -+ * @KBASE_JD_RP_RETRY_PEND_OOM: Renderpass whose second or subsequent attempt at -+ * tiling used too much memory again and has a -+ * soft-stop pending. Can transition to RETRY_OOM -+ * or COMPLETE. -+ * @KBASE_JD_RP_RETRY_OOM: Renderpass whose second or subsequent attempt at -+ * tiling used too much memory again. The fragment job -+ * chain is forced to run. Can only transition to RETRY. -+ * -+ * A state machine is used to control incremental rendering. -+ */ -+enum kbase_jd_renderpass_state { -+ KBASE_JD_RP_COMPLETE, /* COMPLETE => START */ -+ KBASE_JD_RP_START, /* START => PEND_OOM or COMPLETE */ -+ KBASE_JD_RP_PEND_OOM, /* PEND_OOM => OOM or COMPLETE */ -+ KBASE_JD_RP_OOM, /* OOM => RETRY */ -+ KBASE_JD_RP_RETRY, /* RETRY => RETRY_PEND_OOM or -+ * COMPLETE -+ */ -+ KBASE_JD_RP_RETRY_PEND_OOM, /* RETRY_PEND_OOM => RETRY_OOM or -+ * COMPLETE -+ */ -+ KBASE_JD_RP_RETRY_OOM, /* RETRY_OOM => RETRY */ -+}; ++ kfree(dump_buf_narrow->dump_buf); ++ *dump_buf_narrow = (struct kbase_hwcnt_dump_buffer_narrow){ .md_narrow = NULL, ++ .dump_buf = NULL, ++ .clk_cnt_buf = NULL }; ++} + -+/** -+ * struct kbase_jd_renderpass - Data for a renderpass -+ * @state: Current state of the renderpass. If KBASE_JD_RP_COMPLETE then -+ * all other members are invalid. -+ * Both the job dispatcher context and hwaccess_lock must be -+ * locked to modify this so that it can be read with either -+ * (or both) locked. -+ * @start_katom: Address of the atom that is the start of a renderpass. -+ * Both the job dispatcher context and hwaccess_lock must be -+ * locked to modify this so that it can be read with either -+ * (or both) locked. -+ * @end_katom: Address of the atom that is the end of a renderpass, or NULL -+ * if that atom hasn't been added to the job scheduler yet. -+ * The job dispatcher context and hwaccess_lock must be -+ * locked to modify this so that it can be read with either -+ * (or both) locked. -+ * @oom_reg_list: A list of region structures which triggered out-of-memory. -+ * The hwaccess_lock must be locked to access this. -+ * -+ * Atoms tagged with BASE_JD_REQ_START_RENDERPASS or BASE_JD_REQ_END_RENDERPASS -+ * are associated with an object of this type, which is created and maintained -+ * by kbase to keep track of each renderpass. -+ */ -+struct kbase_jd_renderpass { -+ enum kbase_jd_renderpass_state state; -+ struct kbase_jd_atom *start_katom; -+ struct kbase_jd_atom *end_katom; -+ struct list_head oom_reg_list; -+}; ++int kbase_hwcnt_dump_buffer_narrow_array_alloc( ++ const struct kbase_hwcnt_metadata_narrow *md_narrow, size_t n, ++ struct kbase_hwcnt_dump_buffer_narrow_array *dump_bufs) ++{ ++ struct kbase_hwcnt_dump_buffer_narrow *buffers; ++ size_t buf_idx; ++ unsigned int order; ++ unsigned long addr; ++ size_t dump_buf_bytes; ++ size_t clk_cnt_buf_bytes; ++ size_t total_dump_buf_size; + -+/** -+ * struct kbase_jd_context - per context object encapsulating all the -+ * Job dispatcher related state. -+ * @lock: lock to serialize the updates made to the -+ * Job dispatcher state and kbase_jd_atom objects. -+ * @sched_info: Structure encapsulating all the Job scheduling -+ * info. -+ * @atoms: Array of the objects representing atoms, -+ * containing the complete state and attributes -+ * of an atom. -+ * @renderpasses: Array of renderpass state for incremental -+ * rendering, indexed by user-specified renderpass -+ * ID. -+ * @job_nr: Tracks the number of atoms being processed by the -+ * kbase. This includes atoms that are not tracked by -+ * scheduler: 'not ready to run' & 'dependency-only' -+ * jobs. -+ * @zero_jobs_wait: Waitq that reflects whether there are no jobs -+ * (including SW-only dependency jobs). This is set -+ * when no jobs are present on the ctx, and clear -+ * when there are jobs. -+ * This must be updated atomically with @job_nr. -+ * note: Job Dispatcher knows about more jobs than -+ * the Job Scheduler as it is unaware of jobs that -+ * are blocked on dependencies and SW-only dependency -+ * jobs. This waitq can be waited upon to find out -+ * when the context jobs are all done/cancelled -+ * (including those that might've been blocked -+ * on dependencies) - and so, whether it can be -+ * terminated. However, it should only be terminated -+ * once it is not present in the run-pool. -+ * Since the waitq is only set under @lock, -+ * the waiter should also briefly obtain and drop -+ * @lock to guarantee that the setter has completed -+ * its work on the kbase_context -+ * @job_done_wq: Workqueue to which the per atom work item is -+ * queued for bottom half processing when the -+ * atom completes -+ * execution on GPU or the input fence get signaled. -+ * @tb_lock: Lock to serialize the write access made to @tb to -+ * to store the register access trace messages. -+ * @tb: Pointer to the Userspace accessible buffer storing -+ * the trace messages for register read/write -+ * accesses made by the Kbase. The buffer is filled -+ * in circular fashion. -+ * @tb_wrap_offset: Offset to the end location in the trace buffer, -+ * the write pointer is moved to the beginning on -+ * reaching this offset. -+ * @work_id: atomic variable used for GPU tracepoints, -+ * incremented on every call to base_jd_submit. -+ * @jit_atoms_head: A list of the just-in-time memory soft-jobs, both -+ * allocate & free, in submission order, protected -+ * by kbase_jd_context.lock. -+ * @jit_pending_alloc: A list of just-in-time memory allocation -+ * soft-jobs which will be reattempted after the -+ * impending free of other active allocations. -+ */ -+struct kbase_jd_context { -+ struct mutex lock; -+ struct kbasep_js_kctx_info sched_info; -+ struct kbase_jd_atom atoms[BASE_JD_ATOM_COUNT]; -+ struct kbase_jd_renderpass renderpasses[BASE_JD_RP_COUNT]; -+ struct workqueue_struct *job_done_wq; ++ if (!md_narrow || !dump_bufs) ++ return -EINVAL; + -+ wait_queue_head_t zero_jobs_wait; -+ spinlock_t tb_lock; -+ u32 *tb; -+ u32 job_nr; -+ size_t tb_wrap_offset; ++ dump_buf_bytes = md_narrow->dump_buf_bytes; ++ clk_cnt_buf_bytes = sizeof(*dump_bufs->bufs->clk_cnt_buf) * md_narrow->metadata->clk_cnt; + -+#ifdef CONFIG_GPU_TRACEPOINTS -+ atomic_t work_id; -+#endif ++ /* Allocate memory for the dump buffer struct array */ ++ buffers = kmalloc_array(n, sizeof(*buffers), GFP_KERNEL); ++ if (!buffers) ++ return -ENOMEM; + -+ struct list_head jit_atoms_head; -+ struct list_head jit_pending_alloc; -+}; ++ /* Allocate pages for the actual dump buffers, as they tend to be fairly ++ * large. ++ */ ++ order = get_order((dump_buf_bytes + clk_cnt_buf_bytes) * n); ++ addr = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order); + -+/** -+ * struct jsctx_queue - JS context atom queue -+ * @runnable_tree: Root of RB-tree containing currently runnable atoms on this -+ * job slot. -+ * @x_dep_head: Head item of the linked list of atoms blocked on cross-slot -+ * dependencies. Atoms on this list will be moved to the -+ * runnable_tree when the blocking atom completes. -+ * -+ * hwaccess_lock must be held when accessing this structure. -+ */ -+struct jsctx_queue { -+ struct rb_root runnable_tree; -+ struct list_head x_dep_head; -+}; ++ if (!addr) { ++ kfree(buffers); ++ return -ENOMEM; ++ } + -+/** -+ * struct kbase_as - Object representing an address space of GPU. -+ * @number: Index at which this address space structure is present -+ * in an array of address space structures embedded inside -+ * the &struct kbase_device. -+ * @pf_wq: Workqueue for processing work items related to -+ * Page fault and Bus fault handling. -+ * @work_pagefault: Work item for the Page fault handling. -+ * @work_busfault: Work item for the Bus fault handling. -+ * @pf_data: Data relating to Page fault. -+ * @bf_data: Data relating to Bus fault. -+ * @current_setup: Stores the MMU configuration for this address space. -+ */ -+struct kbase_as { -+ int number; -+ struct workqueue_struct *pf_wq; -+ struct work_struct work_pagefault; -+ struct work_struct work_busfault; -+ struct kbase_fault pf_data; -+ struct kbase_fault bf_data; -+ struct kbase_mmu_setup current_setup; -+}; ++ *dump_bufs = (struct kbase_hwcnt_dump_buffer_narrow_array){ ++ .page_addr = addr, ++ .page_order = order, ++ .buf_cnt = n, ++ .bufs = buffers, ++ }; + -+#endif /* _KBASE_JM_DEFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h -new file mode 100755 -index 000000000000..305a9eb221ae ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h -@@ -0,0 +1,216 @@ -+/* -+ * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ ++ total_dump_buf_size = dump_buf_bytes * n; ++ /* Set the buffer of each dump buf */ ++ for (buf_idx = 0; buf_idx < n; buf_idx++) { ++ const size_t dump_buf_offset = dump_buf_bytes * buf_idx; ++ const size_t clk_cnt_buf_offset = ++ total_dump_buf_size + (clk_cnt_buf_bytes * buf_idx); + -+#ifndef _KBASE_JM_IOCTL_H_ -+#define _KBASE_JM_IOCTL_H_ ++ buffers[buf_idx] = (struct kbase_hwcnt_dump_buffer_narrow){ ++ .md_narrow = md_narrow, ++ .dump_buf = (u32 *)(addr + dump_buf_offset), ++ .clk_cnt_buf = (u64 *)(addr + clk_cnt_buf_offset), ++ }; ++ } + -+#include -+#include ++ return 0; ++} + -+/* -+ * 11.1: -+ * - Add BASE_MEM_TILER_ALIGN_TOP under base_mem_alloc_flags -+ * 11.2: -+ * - KBASE_MEM_QUERY_FLAGS can return KBASE_REG_PF_GROW and KBASE_REG_PROTECTED, -+ * which some user-side clients prior to 11.2 might fault if they received -+ * them -+ * 11.3: -+ * - New ioctls KBASE_IOCTL_STICKY_RESOURCE_MAP and -+ * KBASE_IOCTL_STICKY_RESOURCE_UNMAP -+ * 11.4: -+ * - New ioctl KBASE_IOCTL_MEM_FIND_GPU_START_AND_OFFSET -+ * 11.5: -+ * - New ioctl: KBASE_IOCTL_MEM_JIT_INIT (old ioctl renamed to _OLD) -+ * 11.6: -+ * - Added flags field to base_jit_alloc_info structure, which can be used to -+ * specify pseudo chunked tiler alignment for JIT allocations. -+ * 11.7: -+ * - Removed UMP support -+ * 11.8: -+ * - Added BASE_MEM_UNCACHED_GPU under base_mem_alloc_flags -+ * 11.9: -+ * - Added BASE_MEM_PERMANENT_KERNEL_MAPPING and BASE_MEM_FLAGS_KERNEL_ONLY -+ * under base_mem_alloc_flags -+ * 11.10: -+ * - Enabled the use of nr_extres field of base_jd_atom_v2 structure for -+ * JIT_ALLOC and JIT_FREE type softjobs to enable multiple JIT allocations -+ * with one softjob. -+ * 11.11: -+ * - Added BASE_MEM_GPU_VA_SAME_4GB_PAGE under base_mem_alloc_flags -+ * 11.12: -+ * - Removed ioctl: KBASE_IOCTL_GET_PROFILING_CONTROLS -+ * 11.13: -+ * - New ioctl: KBASE_IOCTL_MEM_EXEC_INIT -+ * 11.14: -+ * - Add BASE_MEM_GROUP_ID_MASK, base_mem_group_id_get, base_mem_group_id_set -+ * under base_mem_alloc_flags -+ * 11.15: -+ * - Added BASEP_CONTEXT_MMU_GROUP_ID_MASK under base_context_create_flags. -+ * - Require KBASE_IOCTL_SET_FLAGS before BASE_MEM_MAP_TRACKING_HANDLE can be -+ * passed to mmap(). -+ * 11.16: -+ * - Extended ioctl KBASE_IOCTL_MEM_SYNC to accept imported dma-buf. -+ * - Modified (backwards compatible) ioctl KBASE_IOCTL_MEM_IMPORT behavior for -+ * dma-buf. Now, buffers are mapped on GPU when first imported, no longer -+ * requiring external resource or sticky resource tracking. UNLESS, -+ * CONFIG_MALI_DMA_BUF_MAP_ON_DEMAND is enabled. -+ * 11.17: -+ * - Added BASE_JD_REQ_JOB_SLOT. -+ * - Reused padding field in base_jd_atom_v2 to pass job slot number. -+ * - New ioctl: KBASE_IOCTL_GET_CPU_GPU_TIMEINFO -+ * 11.18: -+ * - Added BASE_MEM_IMPORT_SYNC_ON_MAP_UNMAP under base_mem_alloc_flags -+ * 11.19: -+ * - Extended base_jd_atom_v2 to allow a renderpass ID to be specified. -+ * 11.20: -+ * - Added new phys_pages member to kbase_ioctl_mem_jit_init for -+ * KBASE_IOCTL_MEM_JIT_INIT, previous variants of this renamed to use _10_2 -+ * (replacing '_OLD') and _11_5 suffixes -+ * - Replaced compat_core_req (deprecated in 10.3) with jit_id[2] in -+ * base_jd_atom_v2. It must currently be initialized to zero. -+ * - Added heap_info_gpu_addr to base_jit_alloc_info, and -+ * BASE_JIT_ALLOC_HEAP_INFO_IS_SIZE allowable in base_jit_alloc_info's -+ * flags member. Previous variants of this structure are kept and given _10_2 -+ * and _11_5 suffixes. -+ * - The above changes are checked for safe values in usual builds -+ * 11.21: -+ * - v2.0 of mali_trace debugfs file, which now versions the file separately -+ * 11.22: -+ * - Added base_jd_atom (v3), which is seq_nr + base_jd_atom_v2. -+ * KBASE_IOCTL_JOB_SUBMIT supports both in parallel. -+ * 11.23: -+ * - Modified KBASE_IOCTL_MEM_COMMIT behavior to reject requests to modify -+ * the physical memory backing of JIT allocations. This was not supposed -+ * to be a valid use case, but it was allowed by the previous implementation. -+ * 11.24: -+ * - Added a sysfs file 'serialize_jobs' inside a new sub-directory -+ * 'scheduling'. -+ * 11.25: -+ * - Enabled JIT pressure limit in base/kbase by default -+ * 11.26: -+ * - Added kinstr_jm API -+ * 11.27: -+ * - Backwards compatible extension to HWC ioctl. -+ * 11.28: -+ * - Added kernel side cache ops needed hint -+ * 11.29: -+ * - Reserve ioctl 52 -+ */ -+#define BASE_UK_VERSION_MAJOR 11 -+#define BASE_UK_VERSION_MINOR 29 ++void kbase_hwcnt_dump_buffer_narrow_array_free( ++ struct kbase_hwcnt_dump_buffer_narrow_array *dump_bufs) ++{ ++ if (!dump_bufs) ++ return; + -+/** -+ * struct kbase_ioctl_version_check - Check version compatibility between -+ * kernel and userspace -+ * -+ * @major: Major version number -+ * @minor: Minor version number -+ */ -+struct kbase_ioctl_version_check { -+ __u16 major; -+ __u16 minor; -+}; ++ kfree(dump_bufs->bufs); ++ free_pages(dump_bufs->page_addr, dump_bufs->page_order); ++ memset(dump_bufs, 0, sizeof(*dump_bufs)); ++} + -+#define KBASE_IOCTL_VERSION_CHECK \ -+ _IOWR(KBASE_IOCTL_TYPE, 0, struct kbase_ioctl_version_check) ++void kbase_hwcnt_dump_buffer_block_copy_strict_narrow(u32 *dst_blk, const u64 *src_blk, ++ const u64 *blk_em, size_t val_cnt) ++{ ++ size_t val; + -+#define KBASE_IOCTL_VERSION_CHECK_RESERVED \ -+ _IOWR(KBASE_IOCTL_TYPE, 52, struct kbase_ioctl_version_check) ++ for (val = 0; val < val_cnt; val++) { ++ bool val_enabled = kbase_hwcnt_enable_map_block_value_enabled(blk_em, val); ++ u32 src_val = (src_blk[val] > U32_MAX) ? U32_MAX : (u32)src_blk[val]; + -+/** -+ * struct kbase_ioctl_job_submit - Submit jobs/atoms to the kernel -+ * -+ * @addr: Memory address of an array of struct base_jd_atom_v2 or v3 -+ * @nr_atoms: Number of entries in the array -+ * @stride: sizeof(struct base_jd_atom_v2) or sizeof(struct base_jd_atom) -+ */ -+struct kbase_ioctl_job_submit { -+ __u64 addr; -+ __u32 nr_atoms; -+ __u32 stride; -+}; ++ dst_blk[val] = val_enabled ? src_val : 0; ++ } ++} + -+#define KBASE_IOCTL_JOB_SUBMIT \ -+ _IOW(KBASE_IOCTL_TYPE, 2, struct kbase_ioctl_job_submit) ++void kbase_hwcnt_dump_buffer_copy_strict_narrow(struct kbase_hwcnt_dump_buffer_narrow *dst_narrow, ++ const struct kbase_hwcnt_dump_buffer *src, ++ const struct kbase_hwcnt_enable_map *dst_enable_map) ++{ ++ const struct kbase_hwcnt_metadata_narrow *metadata_narrow; ++ size_t grp; ++ size_t clk; + -+#define KBASE_IOCTL_POST_TERM \ -+ _IO(KBASE_IOCTL_TYPE, 4) ++ if (WARN_ON(!dst_narrow) || WARN_ON(!src) || WARN_ON(!dst_enable_map) || ++ WARN_ON(dst_narrow->md_narrow->metadata == src->metadata) || ++ WARN_ON(dst_narrow->md_narrow->metadata->grp_cnt != src->metadata->grp_cnt) || ++ WARN_ON(src->metadata->grp_cnt != 1) || ++ WARN_ON(dst_narrow->md_narrow->metadata->grp_metadata[0].blk_cnt != ++ src->metadata->grp_metadata[0].blk_cnt) || ++ WARN_ON(dst_narrow->md_narrow->metadata->grp_metadata[0].blk_cnt != ++ KBASE_HWCNT_V5_BLOCK_TYPE_COUNT) || ++ WARN_ON(dst_narrow->md_narrow->metadata->grp_metadata[0].blk_metadata[0].ctr_cnt > ++ src->metadata->grp_metadata[0].blk_metadata[0].ctr_cnt)) ++ return; + -+/** -+ * struct kbase_ioctl_soft_event_update - Update the status of a soft-event -+ * @event: GPU address of the event which has been updated -+ * @new_status: The new status to set -+ * @flags: Flags for future expansion -+ */ -+struct kbase_ioctl_soft_event_update { -+ __u64 event; -+ __u32 new_status; -+ __u32 flags; -+}; ++ /* Don't use src metadata since src buffer is bigger than dst buffer. */ ++ metadata_narrow = dst_narrow->md_narrow; + -+#define KBASE_IOCTL_SOFT_EVENT_UPDATE \ -+ _IOW(KBASE_IOCTL_TYPE, 28, struct kbase_ioctl_soft_event_update) ++ for (grp = 0; grp < kbase_hwcnt_metadata_narrow_group_count(metadata_narrow); grp++) { ++ size_t blk; ++ size_t blk_cnt = kbase_hwcnt_metadata_narrow_block_count(metadata_narrow, grp); + -+/** -+ * struct kbase_kinstr_jm_fd_out - Explains the compatibility information for -+ * the `struct kbase_kinstr_jm_atom_state_change` structure returned from the -+ * kernel -+ * -+ * @size: The size of the `struct kbase_kinstr_jm_atom_state_change` -+ * @version: Represents a breaking change in the -+ * `struct kbase_kinstr_jm_atom_state_change` -+ * @padding: Explicit padding to get the structure up to 64bits. See -+ * https://www.kernel.org/doc/Documentation/ioctl/botching-up-ioctls.rst -+ * -+ * The `struct kbase_kinstr_jm_atom_state_change` may have extra members at the -+ * end of the structure that older user space might not understand. If the -+ * `version` is the same, the structure is still compatible with newer kernels. -+ * The `size` can be used to cast the opaque memory returned from the kernel. -+ */ -+struct kbase_kinstr_jm_fd_out { -+ __u16 size; -+ __u8 version; -+ __u8 padding[5]; -+}; ++ for (blk = 0; blk < blk_cnt; blk++) { ++ size_t blk_inst; ++ size_t blk_inst_cnt = kbase_hwcnt_metadata_narrow_block_instance_count( ++ metadata_narrow, grp, blk); + -+/** -+ * struct kbase_kinstr_jm_fd_in - Options when creating the file descriptor -+ * -+ * @count: Number of atom states that can be stored in the kernel circular -+ * buffer. Must be a power of two -+ * @padding: Explicit padding to get the structure up to 64bits. See -+ * https://www.kernel.org/doc/Documentation/ioctl/botching-up-ioctls.rst -+ */ -+struct kbase_kinstr_jm_fd_in { -+ __u16 count; -+ __u8 padding[6]; -+}; ++ for (blk_inst = 0; blk_inst < blk_inst_cnt; blk_inst++) { ++ /* The narrowed down buffer is only 32-bit. */ ++ u32 *dst_blk = kbase_hwcnt_dump_buffer_narrow_block_instance( ++ dst_narrow, grp, blk, blk_inst); ++ const u64 *src_blk = kbase_hwcnt_dump_buffer_block_instance( ++ src, grp, blk, blk_inst); ++ const u64 *blk_em = kbase_hwcnt_enable_map_block_instance( ++ dst_enable_map, grp, blk, blk_inst); ++ size_t val_cnt = kbase_hwcnt_metadata_narrow_block_values_count( ++ metadata_narrow, grp, blk); ++ /* Align upwards to include padding bytes */ ++ val_cnt = KBASE_HWCNT_ALIGN_UPWARDS( ++ val_cnt, (KBASE_HWCNT_BLOCK_BYTE_ALIGNMENT / ++ KBASE_HWCNT_VALUE_BYTES)); + -+union kbase_kinstr_jm_fd { -+ struct kbase_kinstr_jm_fd_in in; -+ struct kbase_kinstr_jm_fd_out out; -+}; ++ kbase_hwcnt_dump_buffer_block_copy_strict_narrow(dst_blk, src_blk, ++ blk_em, val_cnt); ++ } ++ } ++ } + -+#define KBASE_IOCTL_KINSTR_JM_FD \ -+ _IOWR(KBASE_IOCTL_TYPE, 51, union kbase_kinstr_jm_fd) ++ for (clk = 0; clk < metadata_narrow->metadata->clk_cnt; clk++) { ++ bool clk_enabled = ++ kbase_hwcnt_clk_enable_map_enabled(dst_enable_map->clk_enable_map, clk); + -+#endif /* _KBASE_JM_IOCTL_H_ */ -diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h -new file mode 100755 -index 000000000000..6c222ceae8ee ++ dst_narrow->clk_cnt_buf[clk] = clk_enabled ? src->clk_cnt_buf[clk] : 0; ++ } ++} +diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.h +new file mode 100644 +index 000000000..afd236d71 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h -@@ -0,0 +1,892 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.h +@@ -0,0 +1,330 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -187553,894 +217096,849 @@ index 000000000000..6c222ceae8ee + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+/* -+ * Job Scheduler Interface. -+ * These interfaces are Internal to KBase. -+ */ ++#ifndef _KBASE_HWCNT_GPU_NARROW_H_ ++#define _KBASE_HWCNT_GPU_NARROW_H_ + -+#ifndef _KBASE_JM_JS_H_ -+#define _KBASE_JM_JS_H_ ++#include "hwcnt/mali_kbase_hwcnt_types.h" ++#include + -+#include "mali_kbase_js_ctx_attr.h" ++struct kbase_device; ++struct kbase_hwcnt_metadata; ++struct kbase_hwcnt_enable_map; ++struct kbase_hwcnt_dump_buffer; + +/** -+ * kbasep_js_devdata_init - Initialize the Job Scheduler -+ * -+ * The struct kbasep_js_device_data sub-structure of kbdev must be zero -+ * initialized before passing to the kbasep_js_devdata_init() function. This is -+ * to give efficient error path code. ++ * struct kbase_hwcnt_metadata_narrow - Narrow metadata describing the physical ++ * layout of narrow dump buffers. ++ * For backward compatibility, the narrow ++ * metadata only supports 64 counters per ++ * block and 32-bit per block entry. ++ * @metadata: Non-NULL pointer to the metadata before narrow down to ++ * 32-bit per block entry, it has 64 counters per block and ++ * 64-bit per value. ++ * @dump_buf_bytes: The size in bytes after narrow 64-bit to 32-bit per block ++ * entry. + */ -+int kbasep_js_devdata_init(struct kbase_device * const kbdev); ++struct kbase_hwcnt_metadata_narrow { ++ const struct kbase_hwcnt_metadata *metadata; ++ size_t dump_buf_bytes; ++}; + +/** -+ * kbasep_js_devdata_halt - Halt the Job Scheduler. -+ * -+ * It is safe to call this on kbdev even if it the kbasep_js_device_data -+ * sub-structure was never initialized/failed initialization, to give efficient -+ * error-path code. -+ * -+ * For this to work, the struct kbasep_js_device_data sub-structure of kbdev -+ * must be zero initialized before passing to the kbasep_js_devdata_init() -+ * function. This is to give efficient error path code. -+ * -+ * It is a programming error to call this whilst there are still kbase_context -+ * structures registered with this scheduler. -+ * ++ * struct kbase_hwcnt_dump_buffer_narrow - Hardware counter narrow dump buffer. ++ * @md_narrow: Non-NULL pointer to narrow metadata used to identify, and to ++ * describe the layout of the narrow dump buffer. ++ * @dump_buf: Non-NULL pointer to an array of u32 values, the array size ++ * is md_narrow->dump_buf_bytes. ++ * @clk_cnt_buf: A pointer to an array of u64 values for cycle count elapsed ++ * for each clock domain. + */ -+void kbasep_js_devdata_halt(struct kbase_device *kbdev); ++struct kbase_hwcnt_dump_buffer_narrow { ++ const struct kbase_hwcnt_metadata_narrow *md_narrow; ++ u32 *dump_buf; ++ u64 *clk_cnt_buf; ++}; + +/** -+ * kbasep_js_devdata_term - Terminate the Job Scheduler -+ * -+ * It is safe to call this on kbdev even if it the kbasep_js_device_data -+ * sub-structure was never initialized/failed initialization, to give efficient -+ * error-path code. -+ * -+ * For this to work, the struct kbasep_js_device_data sub-structure of kbdev -+ * must be zero initialized before passing to the kbasep_js_devdata_init() -+ * function. This is to give efficient error path code. -+ * -+ * It is a programming error to call this whilst there are still kbase_context -+ * structures registered with this scheduler. ++ * struct kbase_hwcnt_dump_buffer_narrow_array - Hardware counter narrow dump ++ * buffer array. ++ * @page_addr: Address of first allocated page. A single allocation is used for ++ * all narrow dump buffers in the array. ++ * @page_order: The allocation order of the pages, the order is on a logarithmic ++ * scale. ++ * @buf_cnt: The number of allocated dump buffers. ++ * @bufs: Non-NULL pointer to the array of narrow dump buffer descriptors. + */ -+void kbasep_js_devdata_term(struct kbase_device *kbdev); ++struct kbase_hwcnt_dump_buffer_narrow_array { ++ unsigned long page_addr; ++ unsigned int page_order; ++ size_t buf_cnt; ++ struct kbase_hwcnt_dump_buffer_narrow *bufs; ++}; + +/** -+ * kbasep_js_kctx_init - Initialize the Scheduling Component of a -+ * struct kbase_context on the Job Scheduler. -+ * -+ * This effectively registers a struct kbase_context with a Job Scheduler. ++ * kbase_hwcnt_metadata_narrow_group_count() - Get the number of groups from ++ * narrow metadata. ++ * @md_narrow: Non-NULL pointer to narrow metadata. + * -+ * It does not register any jobs owned by the struct kbase_context with -+ * the scheduler. Those must be separately registered by kbasep_js_add_job(). -+ * -+ * The struct kbase_context must be zero initialized before passing to the -+ * kbase_js_init() function. This is to give efficient error path code. ++ * Return: Number of hardware counter groups described by narrow metadata. + */ -+int kbasep_js_kctx_init(struct kbase_context *const kctx); ++static inline size_t ++kbase_hwcnt_metadata_narrow_group_count(const struct kbase_hwcnt_metadata_narrow *md_narrow) ++{ ++ return kbase_hwcnt_metadata_group_count(md_narrow->metadata); ++} + +/** -+ * kbasep_js_kctx_term - Terminate the Scheduling Component of a -+ * struct kbase_context on the Job Scheduler -+ * -+ * This effectively de-registers a struct kbase_context from its Job Scheduler -+ * -+ * It is safe to call this on a struct kbase_context that has never had or -+ * failed initialization of its jctx.sched_info member, to give efficient -+ * error-path code. -+ * -+ * For this to work, the struct kbase_context must be zero intitialized before -+ * passing to the kbase_js_init() function. ++ * kbase_hwcnt_metadata_narrow_group_type() - Get the arbitrary type of a group ++ * from narrow metadata. ++ * @md_narrow: Non-NULL pointer to narrow metadata. ++ * @grp: Index of the group in the narrow metadata. + * -+ * It is a Programming Error to call this whilst there are still jobs -+ * registered with this context. ++ * Return: Type of the group grp. + */ -+void kbasep_js_kctx_term(struct kbase_context *kctx); ++static inline u64 ++kbase_hwcnt_metadata_narrow_group_type(const struct kbase_hwcnt_metadata_narrow *md_narrow, ++ size_t grp) ++{ ++ return kbase_hwcnt_metadata_group_type(md_narrow->metadata, grp); ++} + +/** -+ * kbasep_js_add_job - Add a job chain to the Job Scheduler, -+ * and take necessary actions to -+ * schedule the context/run the job. -+ * -+ * This atomically does the following: -+ * * Update the numbers of jobs information -+ * * Add the job to the run pool if necessary (part of init_job) -+ * -+ * Once this is done, then an appropriate action is taken: -+ * * If the ctx is scheduled, it attempts to start the next job (which might be -+ * this added job) -+ * * Otherwise, and if this is the first job on the context, it enqueues it on -+ * the Policy Queue -+ * -+ * The Policy's Queue can be updated by this in the following ways: -+ * * In the above case that this is the first job on the context -+ * * If the context is high priority and the context is not scheduled, then it -+ * could cause the Policy to schedule out a low-priority context, allowing -+ * this context to be scheduled in. -+ * -+ * If the context is already scheduled on the RunPool, then adding a job to it -+ * is guaranteed not to update the Policy Queue. And so, the caller is -+ * guaranteed to not need to try scheduling a context from the Run Pool - it -+ * can safely assert that the result is false. -+ * -+ * It is a programming error to have more than U32_MAX jobs in flight at a time. -+ * -+ * The following locking conditions are made on the caller: -+ * * it must not hold kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * * it must not hold hwaccess_lock (as this will be obtained internally) -+ * * it must not hold kbasep_js_device_data::runpool_mutex (as this will be -+ * obtained internally) -+ * * it must not hold kbasep_jd_device_data::queue_mutex (again, it's used -+ * internally). ++ * kbase_hwcnt_metadata_narrow_block_count() - Get the number of blocks in a ++ * group from narrow metadata. ++ * @md_narrow: Non-NULL pointer to narrow metadata. ++ * @grp: Index of the group in the narrow metadata. + * -+ * Return: true indicates that the Policy Queue was updated, and so the -+ * caller will need to try scheduling a context onto the Run Pool, -+ * false indicates that no updates were made to the Policy Queue, -+ * so no further action is required from the caller. This is always returned -+ * when the context is currently scheduled. ++ * Return: Number of blocks in group grp. + */ -+bool kbasep_js_add_job(struct kbase_context *kctx, struct kbase_jd_atom *atom); ++static inline size_t ++kbase_hwcnt_metadata_narrow_block_count(const struct kbase_hwcnt_metadata_narrow *md_narrow, ++ size_t grp) ++{ ++ return kbase_hwcnt_metadata_block_count(md_narrow->metadata, grp); ++} + +/** -+ * kbasep_js_remove_job - Remove a job chain from the Job Scheduler, -+ * except for its 'retained state'. -+ * -+ * Completely removing a job requires several calls: -+ * * kbasep_js_copy_atom_retained_state(), to capture the 'retained state' of -+ * the atom -+ * * kbasep_js_remove_job(), to partially remove the atom from the Job Scheduler -+ * * kbasep_js_runpool_release_ctx_and_katom_retained_state(), to release the -+ * remaining state held as part of the job having been run. -+ * -+ * In the common case of atoms completing normally, this set of actions is more -+ * optimal for spinlock purposes than having kbasep_js_remove_job() handle all -+ * of the actions. -+ * -+ * In the case of canceling atoms, it is easier to call -+ * kbasep_js_remove_cancelled_job(), which handles all the necessary actions. -+ * -+ * It is a programming error to call this when: -+ * * a atom is not a job belonging to kctx. -+ * * a atom has already been removed from the Job Scheduler. -+ * * a atom is still in the runpool -+ * -+ * Do not use this for removing jobs being killed by kbase_jd_cancel() - use -+ * kbasep_js_remove_cancelled_job() instead. -+ * -+ * The following locking conditions are made on the caller: -+ * * it must hold kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * kbase_hwcnt_metadata_narrow_block_instance_count() - Get the number of ++ * instances of a block ++ * from narrow metadata. ++ * @md_narrow: Non-NULL pointer to narrow metadata. ++ * @grp: Index of the group in the narrow metadata. ++ * @blk: Index of the block in the group. + * ++ * Return: Number of instances of block blk in group grp. + */ -+void kbasep_js_remove_job(struct kbase_device *kbdev, -+ struct kbase_context *kctx, struct kbase_jd_atom *atom); ++static inline size_t kbase_hwcnt_metadata_narrow_block_instance_count( ++ const struct kbase_hwcnt_metadata_narrow *md_narrow, size_t grp, size_t blk) ++{ ++ return kbase_hwcnt_metadata_block_instance_count(md_narrow->metadata, grp, blk); ++} + +/** -+ * kbasep_js_remove_cancelled_job - Completely remove a job chain from the -+ * Job Scheduler, in the case -+ * where the job chain was cancelled. -+ * -+ * This is a variant of kbasep_js_remove_job() that takes care of removing all -+ * of the retained state too. This is generally useful for cancelled atoms, -+ * which need not be handled in an optimal way. -+ * -+ * It is a programming error to call this when: -+ * * a atom is not a job belonging to kctx. -+ * * a atom has already been removed from the Job Scheduler. -+ * * a atom is still in the runpool: -+ * * it is not being killed with kbasep_jd_cancel() -+ * -+ * The following locking conditions are made on the caller: -+ * * it must hold kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * * it must not hold the hwaccess_lock, (as this will be obtained -+ * internally) -+ * * it must not hold kbasep_js_device_data::runpool_mutex (as this could be -+ * obtained internally) ++ * kbase_hwcnt_metadata_narrow_block_headers_count() - Get the number of counter ++ * headers from narrow ++ * metadata. ++ * @md_narrow: Non-NULL pointer to narrow metadata. ++ * @grp: Index of the group in the narrow metadata. ++ * @blk: Index of the block in the group. + * -+ * Return: true indicates that ctx attributes have changed and the caller -+ * should call kbase_js_sched_all() to try to run more jobs and -+ * false otherwise. ++ * Return: Number of counter headers in each instance of block blk in group grp. + */ -+bool kbasep_js_remove_cancelled_job(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ struct kbase_jd_atom *katom); ++static inline size_t ++kbase_hwcnt_metadata_narrow_block_headers_count(const struct kbase_hwcnt_metadata_narrow *md_narrow, ++ size_t grp, size_t blk) ++{ ++ return kbase_hwcnt_metadata_block_headers_count(md_narrow->metadata, grp, blk); ++} + +/** -+ * kbasep_js_runpool_requeue_or_kill_ctx - Handling the requeuing/killing of a -+ * context that was evicted from the -+ * policy queue or runpool. -+ * -+ * This should be used whenever handing off a context that has been evicted -+ * from the policy queue or the runpool: -+ * * If the context is not dying and has jobs, it gets re-added to the policy -+ * queue -+ * * Otherwise, it is not added -+ * -+ * In addition, if the context is dying the jobs are killed asynchronously. -+ * -+ * In all cases, the Power Manager active reference is released -+ * (kbase_pm_context_idle()) whenever the has_pm_ref parameter is true. -+ * has_pm_ref must be set to false whenever the context was not previously in -+ * the runpool and does not hold a Power Manager active refcount. Note that -+ * contexts in a rollback of kbasep_js_try_schedule_head_ctx() might have an -+ * active refcount even though they weren't in the runpool. ++ * kbase_hwcnt_metadata_narrow_block_counters_count() - Get the number of ++ * counters from narrow ++ * metadata. ++ * @md_narrow: Non-NULL pointer to narrow metadata. ++ * @grp: Index of the group in the narrow metadata. ++ * @blk: Index of the block in the group. + * -+ * The following locking conditions are made on the caller: -+ * * it must hold kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * * it must not hold kbasep_jd_device_data::queue_mutex (as this will be -+ * obtained internally) ++ * Return: Number of counters in each instance of block blk in group grp. + */ -+void kbasep_js_runpool_requeue_or_kill_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx, bool has_pm_ref); ++static inline size_t kbase_hwcnt_metadata_narrow_block_counters_count( ++ const struct kbase_hwcnt_metadata_narrow *md_narrow, size_t grp, size_t blk) ++{ ++ return kbase_hwcnt_metadata_block_counters_count(md_narrow->metadata, grp, blk); ++} + +/** -+ * kbasep_js_runpool_release_ctx - Release a refcount of a context being busy, -+ * allowing it to be scheduled out. -+ * -+ * When the refcount reaches zero and the context might be scheduled out -+ * (depending on whether the Scheduling Policy has deemed it so, or if it has -+ * run out of jobs). -+ * -+ * If the context does get scheduled out, then The following actions will be -+ * taken as part of deschduling a context: -+ * For the context being descheduled: -+ * * If the context is in the processing of dying (all the jobs are being -+ * removed from it), then descheduling also kills off any jobs remaining in the -+ * context. -+ * * If the context is not dying, and any jobs remain after descheduling the -+ * context then it is re-enqueued to the Policy's Queue. -+ * * Otherwise, the context is still known to the scheduler, but remains absent -+ * from the Policy Queue until a job is next added to it. -+ * * In all descheduling cases, the Power Manager active reference (obtained -+ * during kbasep_js_try_schedule_head_ctx()) is released -+ * (kbase_pm_context_idle()). -+ * -+ * Whilst the context is being descheduled, this also handles actions that -+ * cause more atoms to be run: -+ * * Attempt submitting atoms when the Context Attributes on the Runpool have -+ * changed. This is because the context being scheduled out could mean that -+ * there are more opportunities to run atoms. -+ * * Attempt submitting to a slot that was previously blocked due to affinity -+ * restrictions. This is usually only necessary when releasing a context -+ * happens as part of completing a previous job, but is harmless nonetheless. -+ * * Attempt scheduling in a new context (if one is available), and if -+ * necessary, running a job from that new context. -+ * -+ * Unlike retaining a context in the runpool, this function cannot be called -+ * from IRQ context. -+ * -+ * It is a programming error to call this on a kctx that is not currently -+ * scheduled, or that already has a zero refcount. -+ * -+ * The following locking conditions are made on the caller: -+ * * it must not hold the hwaccess_lock, because it will be used internally. -+ * * it must not hold kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * * it must not hold kbasep_js_device_data::runpool_mutex (as this will be -+ * obtained internally) -+ * * it must not hold the kbase_device::mmu_hw_mutex (as this will be -+ * obtained internally) -+ * * it must not hold kbasep_jd_device_data::queue_mutex (as this will be -+ * obtained internally) ++ * kbase_hwcnt_metadata_narrow_block_values_count() - Get the number of values ++ * from narrow metadata. ++ * @md_narrow: Non-NULL pointer to narrow metadata. ++ * @grp: Index of the group in the narrow metadata. ++ * @blk: Index of the block in the group. + * ++ * Return: Number of headers plus counters in each instance of block blk ++ * in group grp. + */ -+void kbasep_js_runpool_release_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx); ++static inline size_t ++kbase_hwcnt_metadata_narrow_block_values_count(const struct kbase_hwcnt_metadata_narrow *md_narrow, ++ size_t grp, size_t blk) ++{ ++ return kbase_hwcnt_metadata_narrow_block_counters_count(md_narrow, grp, blk) + ++ kbase_hwcnt_metadata_narrow_block_headers_count(md_narrow, grp, blk); ++} + +/** -+ * kbasep_js_runpool_release_ctx_and_katom_retained_state - Variant of -+ * kbasep_js_runpool_release_ctx() that handles additional -+ * actions from completing an atom. -+ * -+ * This is usually called as part of completing an atom and releasing the -+ * refcount on the context held by the atom. -+ * -+ * Therefore, the extra actions carried out are part of handling actions queued -+ * on a completed atom, namely: -+ * * Releasing the atom's context attributes -+ * * Retrying the submission on a particular slot, because we couldn't submit -+ * on that slot from an IRQ handler. ++ * kbase_hwcnt_dump_buffer_narrow_block_instance() - Get the pointer to a ++ * narrowed block instance's ++ * dump buffer. ++ * @buf: Non-NULL pointer to narrow dump buffer. ++ * @grp: Index of the group in the narrow metadata. ++ * @blk: Index of the block in the group. ++ * @blk_inst: Index of the block instance in the block. + * -+ * The locking conditions of this function are the same as those for -+ * kbasep_js_runpool_release_ctx() -+ */ -+void kbasep_js_runpool_release_ctx_and_katom_retained_state( -+ struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ struct kbasep_js_atom_retained_state *katom_retained_state); -+ -+/** -+ * kbasep_js_runpool_release_ctx_nolock - Variant of -+ * kbase_js_runpool_release_ctx() that assumes that -+ * kbasep_js_device_data::runpool_mutex and -+ * kbasep_js_kctx_info::ctx::jsctx_mutex are held by the caller, and does not -+ * attempt to schedule new contexts. ++ * Return: u32* to the dump buffer for the block instance. + */ -+void kbasep_js_runpool_release_ctx_nolock(struct kbase_device *kbdev, -+ struct kbase_context *kctx); ++static inline u32 * ++kbase_hwcnt_dump_buffer_narrow_block_instance(const struct kbase_hwcnt_dump_buffer_narrow *buf, ++ size_t grp, size_t blk, size_t blk_inst) ++{ ++ return buf->dump_buf + buf->md_narrow->metadata->grp_metadata[grp].dump_buf_index + ++ buf->md_narrow->metadata->grp_metadata[grp].blk_metadata[blk].dump_buf_index + ++ (buf->md_narrow->metadata->grp_metadata[grp].blk_metadata[blk].dump_buf_stride * ++ blk_inst); ++} + +/** -+ * kbasep_js_schedule_privileged_ctx - Schedule in a privileged context ++ * kbase_hwcnt_gpu_metadata_narrow_create() - Create HWC metadata with HWC ++ * entries per block truncated to ++ * 64 entries and block entry size ++ * narrowed down to 32-bit. + * -+ * This schedules a context in regardless of the context priority. -+ * If the runpool is full, a context will be forced out of the runpool and the -+ * function will wait for the new context to be scheduled in. -+ * The context will be kept scheduled in (and the corresponding address space -+ * reserved) until kbasep_js_release_privileged_ctx is called). ++ * @dst_md_narrow: Non-NULL pointer to where created narrow metadata is stored ++ * on success. ++ * @src_md: Non-NULL pointer to the HWC metadata used as the source to ++ * create dst_md_narrow. + * -+ * The following locking conditions are made on the caller: -+ * * it must not hold the hwaccess_lock, because it will be used internally. -+ * * it must not hold kbasep_js_device_data::runpool_mutex (as this will be -+ * obtained internally) -+ * * it must not hold the kbase_device::mmu_hw_mutex (as this will be -+ * obtained internally) -+ * * it must not hold kbasep_jd_device_data::queue_mutex (again, it's used -+ * internally). -+ * * it must not hold kbasep_js_kctx_info::ctx::jsctx_mutex, because it will -+ * be used internally. ++ * For backward compatibility of the interface to user clients, a new metadata ++ * with entries per block truncated to 64 and block entry size narrowed down ++ * to 32-bit will be created for dst_md_narrow. ++ * The total entries per block in src_md must be 64 or 128, if it's other ++ * values, function returns error since it's not supported. + * ++ * Return: 0 on success, else error code. + */ -+void kbasep_js_schedule_privileged_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx); ++int kbase_hwcnt_gpu_metadata_narrow_create(const struct kbase_hwcnt_metadata_narrow **dst_md_narrow, ++ const struct kbase_hwcnt_metadata *src_md); + +/** -+ * kbasep_js_release_privileged_ctx - Release a privileged context, -+ * allowing it to be scheduled out. -+ * -+ * See kbasep_js_runpool_release_ctx for potential side effects. -+ * -+ * The following locking conditions are made on the caller: -+ * * it must not hold the hwaccess_lock, because it will be used internally. -+ * * it must not hold kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * * it must not hold kbasep_js_device_data::runpool_mutex (as this will be -+ * obtained internally) -+ * * it must not hold the kbase_device::mmu_hw_mutex (as this will be -+ * obtained internally) -+ * ++ * kbase_hwcnt_gpu_metadata_narrow_destroy() - Destroy a hardware counter narrow ++ * metadata object. ++ * @md_narrow: Pointer to hardware counter narrow metadata. + */ -+void kbasep_js_release_privileged_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx); ++void kbase_hwcnt_gpu_metadata_narrow_destroy(const struct kbase_hwcnt_metadata_narrow *md_narrow); + +/** -+ * kbase_js_try_run_jobs - Try to submit the next job on each slot ++ * kbase_hwcnt_dump_buffer_narrow_alloc() - Allocate a narrow dump buffer. ++ * @md_narrow: Non-NULL pointer to narrow metadata. ++ * @dump_buf: Non-NULL pointer to narrow dump buffer to be initialised. Will be ++ * initialised to undefined values, so must be used as a copy ++ * destination, or cleared before use. + * -+ * The following locks may be used: -+ * * kbasep_js_device_data::runpool_mutex -+ * * hwaccess_lock ++ * Return: 0 on success, else error code. + */ -+void kbase_js_try_run_jobs(struct kbase_device *kbdev); ++int kbase_hwcnt_dump_buffer_narrow_alloc(const struct kbase_hwcnt_metadata_narrow *md_narrow, ++ struct kbase_hwcnt_dump_buffer_narrow *dump_buf); + +/** -+ * kbasep_js_suspend - Suspend the job scheduler during a Power Management -+ * Suspend event. -+ * -+ * Causes all contexts to be removed from the runpool, and prevents any -+ * contexts from (re)entering the runpool. -+ * -+ * This does not handle suspending the one privileged context: the caller must -+ * instead do this by by suspending the GPU HW Counter Instrumentation. -+ * -+ * This will eventually cause all Power Management active references held by -+ * contexts on the runpool to be released, without running any more atoms. -+ * -+ * The caller must then wait for all Power Management active refcount to become -+ * zero before completing the suspend. ++ * kbase_hwcnt_dump_buffer_narrow_free() - Free a narrow dump buffer. ++ * @dump_buf: Dump buffer to be freed. + * -+ * The emptying mechanism may take some time to complete, since it can wait for -+ * jobs to complete naturally instead of forcing them to end quickly. However, -+ * this is bounded by the Job Scheduler's Job Timeouts. Hence, this -+ * function is guaranteed to complete in a finite time. ++ * Can be safely called on an all-zeroed narrow dump buffer structure, or on an ++ * already freed narrow dump buffer. + */ -+void kbasep_js_suspend(struct kbase_device *kbdev); ++void kbase_hwcnt_dump_buffer_narrow_free(struct kbase_hwcnt_dump_buffer_narrow *dump_buf); + +/** -+ * kbasep_js_resume - Resume the Job Scheduler after a Power Management -+ * Resume event. ++ * kbase_hwcnt_dump_buffer_narrow_array_alloc() - Allocate an array of narrow ++ * dump buffers. ++ * @md_narrow: Non-NULL pointer to narrow metadata. ++ * @n: Number of narrow dump buffers to allocate ++ * @dump_bufs: Non-NULL pointer to a kbase_hwcnt_dump_buffer_narrow_array ++ * object to be initialised. + * -+ * This restores the actions from kbasep_js_suspend(): -+ * * Schedules contexts back into the runpool -+ * * Resumes running atoms on the GPU ++ * A single zeroed contiguous page allocation will be used for all of the ++ * buffers inside the object, where: ++ * dump_bufs->bufs[n].dump_buf == page_addr + n * md_narrow.dump_buf_bytes ++ * ++ * Return: 0 on success, else error code. + */ -+void kbasep_js_resume(struct kbase_device *kbdev); ++int kbase_hwcnt_dump_buffer_narrow_array_alloc( ++ const struct kbase_hwcnt_metadata_narrow *md_narrow, size_t n, ++ struct kbase_hwcnt_dump_buffer_narrow_array *dump_bufs); + +/** -+ * kbase_js_dep_resolved_submit - Submit an atom to the job scheduler. -+ * -+ * @kctx: Context pointer -+ * @atom: Pointer to the atom to submit ++ * kbase_hwcnt_dump_buffer_narrow_array_free() - Free a narrow dump buffer ++ * array. ++ * @dump_bufs: Narrow Dump buffer array to be freed. + * -+ * The atom is enqueued on the context's ringbuffer. The caller must have -+ * ensured that all dependencies can be represented in the ringbuffer. -+ * -+ * Caller must hold jctx->lock -+ * -+ * Return: true if the context requires to be enqueued, otherwise false. ++ * Can be safely called on an all-zeroed narrow dump buffer array structure, or ++ * on an already freed narrow dump buffer array. + */ -+bool kbase_js_dep_resolved_submit(struct kbase_context *kctx, -+ struct kbase_jd_atom *katom); ++void kbase_hwcnt_dump_buffer_narrow_array_free( ++ struct kbase_hwcnt_dump_buffer_narrow_array *dump_bufs); + +/** -+ * jsctx_ll_flush_to_rb() - Pushes atoms from the linked list to ringbuffer. -+ * @kctx: Context Pointer -+ * @prio: Priority (specifies the queue together with js). -+ * @js: Job slot (specifies the queue together with prio). -+ * -+ * Pushes all possible atoms from the linked list to the ringbuffer. -+ * Number of atoms are limited to free space in the ringbuffer and -+ * number of available atoms in the linked list. ++ * kbase_hwcnt_dump_buffer_block_copy_strict_narrow() - Copy all enabled block ++ * values from source to ++ * destination. ++ * @dst_blk: Non-NULL pointer to destination block obtained from a call to ++ * kbase_hwcnt_dump_buffer_narrow_block_instance. ++ * @src_blk: Non-NULL pointer to source block obtained from a call to ++ * kbase_hwcnt_dump_buffer_block_instance. ++ * @blk_em: Non-NULL pointer to the block bitfield(s) obtained from a call to ++ * kbase_hwcnt_enable_map_block_instance. ++ * @val_cnt: Number of values in the block. + * ++ * After the copy, any disabled values in destination will be zero, the enabled ++ * values in destination will be saturated at U32_MAX if the corresponding ++ * source value is bigger than U32_MAX, or copy the value from source if the ++ * corresponding source value is less than or equal to U32_MAX. + */ -+void jsctx_ll_flush_to_rb(struct kbase_context *kctx, int prio, int js); ++void kbase_hwcnt_dump_buffer_block_copy_strict_narrow(u32 *dst_blk, const u64 *src_blk, ++ const u64 *blk_em, size_t val_cnt); + +/** -+ * kbase_js_pull - Pull an atom from a context in the job scheduler for -+ * execution. -+ * -+ * @kctx: Context to pull from -+ * @js: Job slot to pull from -+ * -+ * The atom will not be removed from the ringbuffer at this stage. ++ * kbase_hwcnt_dump_buffer_copy_strict_narrow() - Copy all enabled values to a ++ * narrow dump buffer. ++ * @dst_narrow: Non-NULL pointer to destination dump buffer. ++ * @src: Non-NULL pointer to source dump buffer. ++ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. + * -+ * The HW access lock must be held when calling this function. ++ * After the operation, all non-enabled values (including padding bytes) will be ++ * zero. Slower than the non-strict variant. + * -+ * Return: a pointer to an atom, or NULL if there are no atoms for this -+ * slot that can be currently run. ++ * The enabled values in dst_narrow will be saturated at U32_MAX if the ++ * corresponding source value is bigger than U32_MAX, or copy the value from ++ * source if the corresponding source value is less than or equal to U32_MAX. + */ -+struct kbase_jd_atom *kbase_js_pull(struct kbase_context *kctx, int js); ++void kbase_hwcnt_dump_buffer_copy_strict_narrow(struct kbase_hwcnt_dump_buffer_narrow *dst_narrow, ++ const struct kbase_hwcnt_dump_buffer *src, ++ const struct kbase_hwcnt_enable_map *dst_enable_map); + -+/** -+ * kbase_js_unpull - Return an atom to the job scheduler ringbuffer. ++#endif /* _KBASE_HWCNT_GPU_NARROW_H_ */ +diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.c +new file mode 100644 +index 000000000..763eb315d +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.c +@@ -0,0 +1,511 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* + * -+ * @kctx: Context pointer -+ * @atom: Pointer to the atom to unpull ++ * (C) COPYRIGHT 2018, 2020-2022 ARM Limited. All rights reserved. + * -+ * An atom is 'unpulled' if execution is stopped but intended to be returned to -+ * later. The most common reason for this is that the atom has been -+ * soft-stopped. Another reason is if an end-of-renderpass atom completed -+ * but will need to be run again as part of the same renderpass. ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. + * -+ * Note that if multiple atoms are to be 'unpulled', they must be returned in -+ * the reverse order to which they were originally pulled. It is a programming -+ * error to return atoms in any other order. ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. + * -+ * The HW access lock must be held when calling this function. ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * + */ -+void kbase_js_unpull(struct kbase_context *kctx, struct kbase_jd_atom *katom); + -+/** -+ * kbase_js_complete_atom_wq - Complete an atom from jd_done_worker(), -+ * removing it from the job -+ * scheduler ringbuffer. -+ * @kctx: Context pointer -+ * @katom: Pointer to the atom to complete -+ * -+ * If the atom failed then all dependee atoms marked for failure propagation -+ * will also fail. -+ * -+ * Return: true if the context is now idle (no jobs pulled) false otherwise. -+ */ -+bool kbase_js_complete_atom_wq(struct kbase_context *kctx, -+ struct kbase_jd_atom *katom); ++#include "hwcnt/mali_kbase_hwcnt_types.h" + -+/** -+ * kbase_js_complete_atom - Complete an atom. -+ * -+ * @katom: Pointer to the atom to complete -+ * @end_timestamp: The time that the atom completed (may be NULL) -+ * -+ * Most of the work required to complete an atom will be performed by -+ * jd_done_worker(). -+ * -+ * The HW access lock must be held when calling this function. -+ * -+ * Return: a atom that has now been unblocked and can now be run, or NULL -+ * if none -+ */ -+struct kbase_jd_atom *kbase_js_complete_atom(struct kbase_jd_atom *katom, -+ ktime_t *end_timestamp); ++#include + -+/** -+ * kbase_js_atom_blocked_on_x_dep - Decide whether to ignore a cross-slot -+ * dependency -+ * @katom: Pointer to an atom in the slot ringbuffer -+ * -+ * A cross-slot dependency is ignored if necessary to unblock incremental -+ * rendering. If the atom at the start of a renderpass used too much memory -+ * and was soft-stopped then the atom at the end of a renderpass is submitted -+ * to hardware regardless of its dependency on the start-of-renderpass atom. -+ * This can happen multiple times for the same pair of atoms. -+ * -+ * Return: true to block the atom or false to allow it to be submitted to -+ * hardware. -+ */ -+bool kbase_js_atom_blocked_on_x_dep(struct kbase_jd_atom *katom); ++int kbase_hwcnt_metadata_create(const struct kbase_hwcnt_description *desc, ++ const struct kbase_hwcnt_metadata **out_metadata) ++{ ++ char *buf; ++ struct kbase_hwcnt_metadata *metadata; ++ struct kbase_hwcnt_group_metadata *grp_mds; ++ size_t grp; ++ size_t enable_map_count; /* Number of u64 bitfields (inc padding) */ ++ size_t dump_buf_count; /* Number of u64 values (inc padding) */ ++ size_t avail_mask_bits; /* Number of availability mask bits */ + -+/** -+ * kbase_js_sched - Submit atoms from all available contexts. -+ * -+ * @kbdev: Device pointer -+ * @js_mask: Mask of job slots to submit to -+ * -+ * This will attempt to submit as many jobs as possible to the provided job -+ * slots. It will exit when either all job slots are full, or all contexts have -+ * been used. -+ * -+ */ -+void kbase_js_sched(struct kbase_device *kbdev, int js_mask); ++ size_t size; ++ size_t offset; + -+/** -+ * kbase_jd_zap_context - Attempt to deschedule a context that is being -+ * destroyed -+ * @kctx: Context pointer -+ * -+ * This will attempt to remove a context from any internal job scheduler queues -+ * and perform any other actions to ensure a context will not be submitted -+ * from. -+ * -+ * If the context is currently scheduled, then the caller must wait for all -+ * pending jobs to complete before taking any further action. -+ */ -+void kbase_js_zap_context(struct kbase_context *kctx); ++ if (!desc || !out_metadata) ++ return -EINVAL; + -+/** -+ * kbase_js_is_atom_valid - Validate an atom -+ * -+ * @kbdev: Device pointer -+ * @katom: Atom to validate -+ * -+ * This will determine whether the atom can be scheduled onto the GPU. Atoms -+ * with invalid combinations of core requirements will be rejected. -+ * -+ * Return: true if atom is valid false otherwise. -+ */ -+bool kbase_js_is_atom_valid(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom); ++ /* The maximum number of clock domains is 64. */ ++ if (desc->clk_cnt > (sizeof(u64) * BITS_PER_BYTE)) ++ return -EINVAL; + -+/** -+ * kbase_js_set_timeouts - update all JS timeouts with user specified data -+ * -+ * @kbdev: Device pointer -+ * -+ * Timeouts are specified through the 'js_timeouts' sysfs file. If a timeout is -+ * set to a positive number then that becomes the new value used, if a timeout -+ * is negative then the default is set. -+ */ -+void kbase_js_set_timeouts(struct kbase_device *kbdev); ++ /* Calculate the bytes needed to tightly pack the metadata */ + -+/** -+ * kbase_js_set_ctx_priority - set the context priority -+ * -+ * @kctx: Context pointer -+ * @new_priority: New priority value for the Context -+ * -+ * The context priority is set to a new value and it is moved to the -+ * pullable/unpullable list as per the new priority. -+ */ -+void kbase_js_set_ctx_priority(struct kbase_context *kctx, int new_priority); ++ /* Top level metadata */ ++ size = 0; ++ size += sizeof(struct kbase_hwcnt_metadata); ++ ++ /* Group metadata */ ++ size += sizeof(struct kbase_hwcnt_group_metadata) * desc->grp_cnt; + ++ /* Block metadata */ ++ for (grp = 0; grp < desc->grp_cnt; grp++) { ++ size += sizeof(struct kbase_hwcnt_block_metadata) * desc->grps[grp].blk_cnt; ++ } + -+/** -+ * kbase_js_update_ctx_priority - update the context priority -+ * -+ * @kctx: Context pointer -+ * -+ * The context priority gets updated as per the priority of atoms currently in -+ * use for that context, but only if system priority mode for context scheduling -+ * is being used. -+ */ -+void kbase_js_update_ctx_priority(struct kbase_context *kctx); ++ /* Single allocation for the entire metadata */ ++ buf = kmalloc(size, GFP_KERNEL); ++ if (!buf) ++ return -ENOMEM; + -+/* -+ * Helpers follow -+ */ ++ /* Use the allocated memory for the metadata and its members */ + -+/** -+ * kbasep_js_is_submit_allowed - Check that a context is allowed to submit -+ * jobs on this policy -+ * -+ * The purpose of this abstraction is to hide the underlying data size, -+ * and wrap up the long repeated line of code. -+ * -+ * As with any bool, never test the return value with true. -+ * -+ * The caller must hold hwaccess_lock. -+ */ -+static inline bool kbasep_js_is_submit_allowed( -+ struct kbasep_js_device_data *js_devdata, -+ struct kbase_context *kctx) -+{ -+ u16 test_bit; -+ bool is_allowed; ++ /* Bump allocate the top level metadata */ ++ offset = 0; ++ metadata = (struct kbase_hwcnt_metadata *)(buf + offset); ++ offset += sizeof(struct kbase_hwcnt_metadata); + -+ /* Ensure context really is scheduled in */ -+ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); -+ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ /* Bump allocate the group metadata */ ++ grp_mds = (struct kbase_hwcnt_group_metadata *)(buf + offset); ++ offset += sizeof(struct kbase_hwcnt_group_metadata) * desc->grp_cnt; + -+ test_bit = (u16) (1u << kctx->as_nr); ++ enable_map_count = 0; ++ dump_buf_count = 0; ++ avail_mask_bits = 0; + -+ is_allowed = (bool) (js_devdata->runpool_irq.submit_allowed & test_bit); -+ dev_dbg(kctx->kbdev->dev, "JS: submit %s allowed on %p (as=%d)", -+ is_allowed ? "is" : "isn't", (void *)kctx, kctx->as_nr); -+ return is_allowed; ++ for (grp = 0; grp < desc->grp_cnt; grp++) { ++ size_t blk; ++ ++ const struct kbase_hwcnt_group_description *grp_desc = desc->grps + grp; ++ struct kbase_hwcnt_group_metadata *grp_md = grp_mds + grp; ++ ++ size_t group_enable_map_count = 0; ++ size_t group_dump_buffer_count = 0; ++ size_t group_avail_mask_bits = 0; ++ ++ /* Bump allocate this group's block metadata */ ++ struct kbase_hwcnt_block_metadata *blk_mds = ++ (struct kbase_hwcnt_block_metadata *)(buf + offset); ++ offset += sizeof(struct kbase_hwcnt_block_metadata) * grp_desc->blk_cnt; ++ ++ /* Fill in each block in the group's information */ ++ for (blk = 0; blk < grp_desc->blk_cnt; blk++) { ++ const struct kbase_hwcnt_block_description *blk_desc = grp_desc->blks + blk; ++ struct kbase_hwcnt_block_metadata *blk_md = blk_mds + blk; ++ const size_t n_values = blk_desc->hdr_cnt + blk_desc->ctr_cnt; ++ ++ blk_md->type = blk_desc->type; ++ blk_md->inst_cnt = blk_desc->inst_cnt; ++ blk_md->hdr_cnt = blk_desc->hdr_cnt; ++ blk_md->ctr_cnt = blk_desc->ctr_cnt; ++ blk_md->enable_map_index = group_enable_map_count; ++ blk_md->enable_map_stride = kbase_hwcnt_bitfield_count(n_values); ++ blk_md->dump_buf_index = group_dump_buffer_count; ++ blk_md->dump_buf_stride = KBASE_HWCNT_ALIGN_UPWARDS( ++ n_values, ++ (KBASE_HWCNT_BLOCK_BYTE_ALIGNMENT / KBASE_HWCNT_VALUE_BYTES)); ++ blk_md->avail_mask_index = group_avail_mask_bits; ++ ++ group_enable_map_count += blk_md->enable_map_stride * blk_md->inst_cnt; ++ group_dump_buffer_count += blk_md->dump_buf_stride * blk_md->inst_cnt; ++ group_avail_mask_bits += blk_md->inst_cnt; ++ } ++ ++ /* Fill in the group's information */ ++ grp_md->type = grp_desc->type; ++ grp_md->blk_cnt = grp_desc->blk_cnt; ++ grp_md->blk_metadata = blk_mds; ++ grp_md->enable_map_index = enable_map_count; ++ grp_md->dump_buf_index = dump_buf_count; ++ grp_md->avail_mask_index = avail_mask_bits; ++ ++ enable_map_count += group_enable_map_count; ++ dump_buf_count += group_dump_buffer_count; ++ avail_mask_bits += group_avail_mask_bits; ++ } ++ ++ /* Fill in the top level metadata's information */ ++ metadata->grp_cnt = desc->grp_cnt; ++ metadata->grp_metadata = grp_mds; ++ metadata->enable_map_bytes = enable_map_count * KBASE_HWCNT_BITFIELD_BYTES; ++ metadata->dump_buf_bytes = dump_buf_count * KBASE_HWCNT_VALUE_BYTES; ++ metadata->avail_mask = desc->avail_mask; ++ metadata->clk_cnt = desc->clk_cnt; ++ ++ WARN_ON(size != offset); ++ /* Due to the block alignment, there should be exactly one enable map ++ * bit per 4 bytes in the dump buffer. ++ */ ++ WARN_ON(metadata->dump_buf_bytes != ++ (metadata->enable_map_bytes * BITS_PER_BYTE * KBASE_HWCNT_VALUE_BYTES)); ++ ++ *out_metadata = metadata; ++ return 0; +} + -+/** -+ * kbasep_js_set_submit_allowed - Allow a context to submit jobs on this policy -+ * -+ * The purpose of this abstraction is to hide the underlying data size, -+ * and wrap up the long repeated line of code. -+ * -+ * The caller must hold hwaccess_lock. -+ */ -+static inline void kbasep_js_set_submit_allowed( -+ struct kbasep_js_device_data *js_devdata, -+ struct kbase_context *kctx) ++void kbase_hwcnt_metadata_destroy(const struct kbase_hwcnt_metadata *metadata) +{ -+ u16 set_bit; ++ kfree(metadata); ++} + -+ /* Ensure context really is scheduled in */ -+ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); -+ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++int kbase_hwcnt_enable_map_alloc(const struct kbase_hwcnt_metadata *metadata, ++ struct kbase_hwcnt_enable_map *enable_map) ++{ ++ u64 *enable_map_buf; + -+ set_bit = (u16) (1u << kctx->as_nr); ++ if (!metadata || !enable_map) ++ return -EINVAL; + -+ dev_dbg(kctx->kbdev->dev, "JS: Setting Submit Allowed on %p (as=%d)", -+ kctx, kctx->as_nr); ++ if (metadata->enable_map_bytes > 0) { ++ enable_map_buf = kzalloc(metadata->enable_map_bytes, GFP_KERNEL); ++ if (!enable_map_buf) ++ return -ENOMEM; ++ } else { ++ enable_map_buf = NULL; ++ } + -+ js_devdata->runpool_irq.submit_allowed |= set_bit; ++ enable_map->metadata = metadata; ++ enable_map->hwcnt_enable_map = enable_map_buf; ++ return 0; +} + -+/** -+ * kbasep_js_clear_submit_allowed - Prevent a context from submitting more -+ * jobs on this policy -+ * -+ * The purpose of this abstraction is to hide the underlying data size, -+ * and wrap up the long repeated line of code. -+ * -+ * The caller must hold hwaccess_lock. -+ */ -+static inline void kbasep_js_clear_submit_allowed( -+ struct kbasep_js_device_data *js_devdata, -+ struct kbase_context *kctx) ++void kbase_hwcnt_enable_map_free(struct kbase_hwcnt_enable_map *enable_map) +{ -+ u16 clear_bit; -+ u16 clear_mask; ++ if (!enable_map) ++ return; + -+ /* Ensure context really is scheduled in */ -+ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); -+ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ kfree(enable_map->hwcnt_enable_map); ++ enable_map->hwcnt_enable_map = NULL; ++ enable_map->metadata = NULL; ++} + -+ clear_bit = (u16) (1u << kctx->as_nr); -+ clear_mask = ~clear_bit; ++int kbase_hwcnt_dump_buffer_alloc(const struct kbase_hwcnt_metadata *metadata, ++ struct kbase_hwcnt_dump_buffer *dump_buf) ++{ ++ size_t dump_buf_bytes; ++ size_t clk_cnt_buf_bytes; ++ u8 *buf; + -+ dev_dbg(kctx->kbdev->dev, "JS: Clearing Submit Allowed on %p (as=%d)", -+ kctx, kctx->as_nr); ++ if (!metadata || !dump_buf) ++ return -EINVAL; + -+ js_devdata->runpool_irq.submit_allowed &= clear_mask; ++ dump_buf_bytes = metadata->dump_buf_bytes; ++ clk_cnt_buf_bytes = sizeof(*dump_buf->clk_cnt_buf) * metadata->clk_cnt; ++ ++ /* Make a single allocation for both dump_buf and clk_cnt_buf. */ ++ buf = kmalloc(dump_buf_bytes + clk_cnt_buf_bytes, GFP_KERNEL); ++ if (!buf) ++ return -ENOMEM; ++ ++ dump_buf->metadata = metadata; ++ dump_buf->dump_buf = (u64 *)buf; ++ dump_buf->clk_cnt_buf = (u64 *)(buf + dump_buf_bytes); ++ ++ return 0; +} + -+/** -+ * Create an initial 'invalid' atom retained state, that requires no -+ * atom-related work to be done on releasing with -+ * kbasep_js_runpool_release_ctx_and_katom_retained_state() -+ */ -+static inline void kbasep_js_atom_retained_state_init_invalid( -+ struct kbasep_js_atom_retained_state *retained_state) ++void kbase_hwcnt_dump_buffer_free(struct kbase_hwcnt_dump_buffer *dump_buf) +{ -+ retained_state->event_code = BASE_JD_EVENT_NOT_STARTED; -+ retained_state->core_req = -+ KBASEP_JS_ATOM_RETAINED_STATE_CORE_REQ_INVALID; ++ if (!dump_buf) ++ return; ++ ++ kfree(dump_buf->dump_buf); ++ memset(dump_buf, 0, sizeof(*dump_buf)); +} + -+/** -+ * Copy atom state that can be made available after jd_done_nolock() is called -+ * on that atom. -+ */ -+static inline void kbasep_js_atom_retained_state_copy( -+ struct kbasep_js_atom_retained_state *retained_state, -+ const struct kbase_jd_atom *katom) ++int kbase_hwcnt_dump_buffer_array_alloc(const struct kbase_hwcnt_metadata *metadata, size_t n, ++ struct kbase_hwcnt_dump_buffer_array *dump_bufs) +{ -+ retained_state->event_code = katom->event_code; -+ retained_state->core_req = katom->core_req; -+ retained_state->sched_priority = katom->sched_priority; -+ retained_state->device_nr = katom->device_nr; ++ struct kbase_hwcnt_dump_buffer *buffers; ++ size_t buf_idx; ++ unsigned int order; ++ unsigned long addr; ++ size_t dump_buf_bytes; ++ size_t clk_cnt_buf_bytes; ++ ++ if (!metadata || !dump_bufs) ++ return -EINVAL; ++ ++ dump_buf_bytes = metadata->dump_buf_bytes; ++ clk_cnt_buf_bytes = sizeof(*dump_bufs->bufs->clk_cnt_buf) * metadata->clk_cnt; ++ ++ /* Allocate memory for the dump buffer struct array */ ++ buffers = kmalloc_array(n, sizeof(*buffers), GFP_KERNEL); ++ if (!buffers) ++ return -ENOMEM; ++ ++ /* Allocate pages for the actual dump buffers, as they tend to be fairly ++ * large. ++ */ ++ order = get_order((dump_buf_bytes + clk_cnt_buf_bytes) * n); ++ addr = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order); ++ ++ if (!addr) { ++ kfree(buffers); ++ return -ENOMEM; ++ } ++ ++ dump_bufs->page_addr = addr; ++ dump_bufs->page_order = order; ++ dump_bufs->buf_cnt = n; ++ dump_bufs->bufs = buffers; ++ ++ /* Set the buffer of each dump buf */ ++ for (buf_idx = 0; buf_idx < n; buf_idx++) { ++ const size_t dump_buf_offset = dump_buf_bytes * buf_idx; ++ const size_t clk_cnt_buf_offset = ++ (dump_buf_bytes * n) + (clk_cnt_buf_bytes * buf_idx); ++ ++ buffers[buf_idx].metadata = metadata; ++ buffers[buf_idx].dump_buf = (u64 *)(addr + dump_buf_offset); ++ buffers[buf_idx].clk_cnt_buf = (u64 *)(addr + clk_cnt_buf_offset); ++ } ++ ++ return 0; +} + -+/** -+ * kbasep_js_has_atom_finished - Determine whether an atom has finished -+ * (given its retained state), -+ * and so should be given back to -+ * userspace/removed from the system. -+ * -+ * @katom_retained_state: the retained state of the atom to check -+ * -+ * Reasons for an atom not finishing include: -+ * * Being soft-stopped (and so, the atom should be resubmitted sometime later) -+ * * It is an end of renderpass atom that was run to consume the output of a -+ * start-of-renderpass atom that was soft-stopped because it used too much -+ * memory. In this case, it will have to be run again later. -+ * -+ * Return: false if the atom has not finished, true otherwise. -+ */ -+static inline bool kbasep_js_has_atom_finished( -+ const struct kbasep_js_atom_retained_state *katom_retained_state) ++void kbase_hwcnt_dump_buffer_array_free(struct kbase_hwcnt_dump_buffer_array *dump_bufs) +{ -+ return (bool) (katom_retained_state->event_code != -+ BASE_JD_EVENT_STOPPED && -+ katom_retained_state->event_code != -+ BASE_JD_EVENT_REMOVED_FROM_NEXT && -+ katom_retained_state->event_code != -+ BASE_JD_EVENT_END_RP_DONE); ++ if (!dump_bufs) ++ return; ++ ++ kfree(dump_bufs->bufs); ++ free_pages(dump_bufs->page_addr, dump_bufs->page_order); ++ memset(dump_bufs, 0, sizeof(*dump_bufs)); +} + -+/** -+ * kbasep_js_atom_retained_state_is_valid - Determine whether a struct -+ * kbasep_js_atom_retained_state -+ * is valid -+ * @katom_retained_state the atom's retained state to check -+ * -+ * An invalid struct kbasep_js_atom_retained_state is allowed, and indicates -+ * that the code should just ignore it. -+ * -+ * Return: false if the retained state is invalid, true otherwise. -+ */ -+static inline bool kbasep_js_atom_retained_state_is_valid( -+ const struct kbasep_js_atom_retained_state *katom_retained_state) ++void kbase_hwcnt_dump_buffer_zero(struct kbase_hwcnt_dump_buffer *dst, ++ const struct kbase_hwcnt_enable_map *dst_enable_map) +{ -+ return (bool) (katom_retained_state->core_req != -+ KBASEP_JS_ATOM_RETAINED_STATE_CORE_REQ_INVALID); ++ const struct kbase_hwcnt_metadata *metadata; ++ size_t grp, blk, blk_inst; ++ ++ if (WARN_ON(!dst) || WARN_ON(!dst_enable_map) || ++ WARN_ON(dst->metadata != dst_enable_map->metadata)) ++ return; ++ ++ metadata = dst->metadata; ++ ++ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) ++ { ++ u64 *dst_blk; ++ size_t val_cnt; ++ ++ if (!kbase_hwcnt_enable_map_block_enabled(dst_enable_map, grp, blk, blk_inst)) ++ continue; ++ ++ dst_blk = kbase_hwcnt_dump_buffer_block_instance(dst, grp, blk, blk_inst); ++ val_cnt = kbase_hwcnt_metadata_block_values_count(metadata, grp, blk); ++ ++ kbase_hwcnt_dump_buffer_block_zero(dst_blk, val_cnt); ++ } ++ ++ memset(dst->clk_cnt_buf, 0, sizeof(*dst->clk_cnt_buf) * metadata->clk_cnt); +} + -+/** -+ * kbase_js_runpool_inc_context_count - Increment number of running contexts. -+ * -+ * The following locking conditions are made on the caller: -+ * * The caller must hold the kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * * The caller must hold the kbasep_js_device_data::runpool_mutex -+ */ -+static inline void kbase_js_runpool_inc_context_count( -+ struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++void kbase_hwcnt_dump_buffer_zero_strict(struct kbase_hwcnt_dump_buffer *dst) +{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbasep_js_kctx_info *js_kctx_info; ++ if (WARN_ON(!dst)) ++ return; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); ++ memset(dst->dump_buf, 0, dst->metadata->dump_buf_bytes); + -+ js_devdata = &kbdev->js_data; -+ js_kctx_info = &kctx->jctx.sched_info; ++ memset(dst->clk_cnt_buf, 0, sizeof(*dst->clk_cnt_buf) * dst->metadata->clk_cnt); ++} + -+ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); -+ lockdep_assert_held(&js_devdata->runpool_mutex); ++void kbase_hwcnt_dump_buffer_zero_non_enabled(struct kbase_hwcnt_dump_buffer *dst, ++ const struct kbase_hwcnt_enable_map *dst_enable_map) ++{ ++ const struct kbase_hwcnt_metadata *metadata; ++ size_t grp, blk, blk_inst; + -+ /* Track total contexts */ -+ KBASE_DEBUG_ASSERT(js_devdata->nr_all_contexts_running < S8_MAX); -+ ++(js_devdata->nr_all_contexts_running); ++ if (WARN_ON(!dst) || WARN_ON(!dst_enable_map) || ++ WARN_ON(dst->metadata != dst_enable_map->metadata)) ++ return; + -+ if (!kbase_ctx_flag(kctx, KCTX_SUBMIT_DISABLED)) { -+ /* Track contexts that can submit jobs */ -+ KBASE_DEBUG_ASSERT(js_devdata->nr_user_contexts_running < -+ S8_MAX); -+ ++(js_devdata->nr_user_contexts_running); ++ metadata = dst->metadata; ++ ++ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) ++ { ++ u64 *dst_blk = kbase_hwcnt_dump_buffer_block_instance(dst, grp, blk, blk_inst); ++ const u64 *blk_em = ++ kbase_hwcnt_enable_map_block_instance(dst_enable_map, grp, blk, blk_inst); ++ size_t val_cnt = kbase_hwcnt_metadata_block_values_count(metadata, grp, blk); ++ ++ /* Align upwards to include padding bytes */ ++ val_cnt = KBASE_HWCNT_ALIGN_UPWARDS( ++ val_cnt, (KBASE_HWCNT_BLOCK_BYTE_ALIGNMENT / KBASE_HWCNT_VALUE_BYTES)); ++ ++ if (kbase_hwcnt_metadata_block_instance_avail(metadata, grp, blk, blk_inst)) { ++ /* Block available, so only zero non-enabled values */ ++ kbase_hwcnt_dump_buffer_block_zero_non_enabled(dst_blk, blk_em, val_cnt); ++ } else { ++ /* Block not available, so zero the entire thing */ ++ kbase_hwcnt_dump_buffer_block_zero(dst_blk, val_cnt); ++ } + } +} + -+/** -+ * kbase_js_runpool_dec_context_count - decrement number of running contexts. -+ * -+ * The following locking conditions are made on the caller: -+ * * The caller must hold the kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * * The caller must hold the kbasep_js_device_data::runpool_mutex -+ */ -+static inline void kbase_js_runpool_dec_context_count( -+ struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++void kbase_hwcnt_dump_buffer_copy(struct kbase_hwcnt_dump_buffer *dst, ++ const struct kbase_hwcnt_dump_buffer *src, ++ const struct kbase_hwcnt_enable_map *dst_enable_map) +{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbasep_js_kctx_info *js_kctx_info; ++ const struct kbase_hwcnt_metadata *metadata; ++ size_t grp, blk, blk_inst; ++ size_t clk; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); ++ if (WARN_ON(!dst) || WARN_ON(!src) || WARN_ON(!dst_enable_map) || WARN_ON(dst == src) || ++ WARN_ON(dst->metadata != src->metadata) || ++ WARN_ON(dst->metadata != dst_enable_map->metadata)) ++ return; + -+ js_devdata = &kbdev->js_data; -+ js_kctx_info = &kctx->jctx.sched_info; ++ metadata = dst->metadata; + -+ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); -+ lockdep_assert_held(&js_devdata->runpool_mutex); ++ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) ++ { ++ u64 *dst_blk; ++ const u64 *src_blk; ++ size_t val_cnt; + -+ /* Track total contexts */ -+ --(js_devdata->nr_all_contexts_running); -+ KBASE_DEBUG_ASSERT(js_devdata->nr_all_contexts_running >= 0); ++ if (!kbase_hwcnt_enable_map_block_enabled(dst_enable_map, grp, blk, blk_inst)) ++ continue; + -+ if (!kbase_ctx_flag(kctx, KCTX_SUBMIT_DISABLED)) { -+ /* Track contexts that can submit jobs */ -+ --(js_devdata->nr_user_contexts_running); -+ KBASE_DEBUG_ASSERT(js_devdata->nr_user_contexts_running >= 0); ++ dst_blk = kbase_hwcnt_dump_buffer_block_instance(dst, grp, blk, blk_inst); ++ src_blk = kbase_hwcnt_dump_buffer_block_instance(src, grp, blk, blk_inst); ++ val_cnt = kbase_hwcnt_metadata_block_values_count(metadata, grp, blk); ++ ++ kbase_hwcnt_dump_buffer_block_copy(dst_blk, src_blk, val_cnt); ++ } ++ ++ kbase_hwcnt_metadata_for_each_clock(metadata, clk) ++ { ++ if (kbase_hwcnt_clk_enable_map_enabled(dst_enable_map->clk_enable_map, clk)) ++ dst->clk_cnt_buf[clk] = src->clk_cnt_buf[clk]; + } +} + -+/** -+ * kbase_js_sched_all - Submit atoms from all available contexts to all -+ * job slots. -+ * -+ * @kbdev: Device pointer -+ * -+ * This will attempt to submit as many jobs as possible. It will exit when -+ * either all job slots are full, or all contexts have been used. -+ */ -+static inline void kbase_js_sched_all(struct kbase_device *kbdev) ++void kbase_hwcnt_dump_buffer_copy_strict(struct kbase_hwcnt_dump_buffer *dst, ++ const struct kbase_hwcnt_dump_buffer *src, ++ const struct kbase_hwcnt_enable_map *dst_enable_map) +{ -+ kbase_js_sched(kbdev, (1 << kbdev->gpu_props.num_job_slots) - 1); -+} ++ const struct kbase_hwcnt_metadata *metadata; ++ size_t grp, blk, blk_inst; ++ size_t clk; + -+extern const int -+kbasep_js_atom_priority_to_relative[BASE_JD_NR_PRIO_LEVELS]; ++ if (WARN_ON(!dst) || WARN_ON(!src) || WARN_ON(!dst_enable_map) || WARN_ON(dst == src) || ++ WARN_ON(dst->metadata != src->metadata) || ++ WARN_ON(dst->metadata != dst_enable_map->metadata)) ++ return; + -+extern const base_jd_prio -+kbasep_js_relative_priority_to_atom[KBASE_JS_ATOM_SCHED_PRIO_COUNT]; ++ metadata = dst->metadata; + -+/** -+ * kbasep_js_atom_prio_to_sched_prio(): - Convert atom priority (base_jd_prio) -+ * to relative ordering -+ * @atom_prio: Priority ID to translate. -+ * -+ * Atom priority values for @ref base_jd_prio cannot be compared directly to -+ * find out which are higher or lower. -+ * -+ * This function will convert base_jd_prio values for successively lower -+ * priorities into a monotonically increasing sequence. That is, the lower the -+ * base_jd_prio priority, the higher the value produced by this function. This -+ * is in accordance with how the rest of the kernel treats priority. -+ * -+ * The mapping is 1:1 and the size of the valid input range is the same as the -+ * size of the valid output range, i.e. -+ * KBASE_JS_ATOM_SCHED_PRIO_COUNT == BASE_JD_NR_PRIO_LEVELS -+ * -+ * Note This must be kept in sync with BASE_JD_PRIO_<...> definitions -+ * -+ * Return: On success: a value in the inclusive range -+ * 0..KBASE_JS_ATOM_SCHED_PRIO_COUNT-1. On failure: -+ * KBASE_JS_ATOM_SCHED_PRIO_INVALID -+ */ -+static inline int kbasep_js_atom_prio_to_sched_prio(base_jd_prio atom_prio) -+{ -+ if (atom_prio >= BASE_JD_NR_PRIO_LEVELS) -+ return KBASE_JS_ATOM_SCHED_PRIO_INVALID; ++ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) ++ { ++ u64 *dst_blk = kbase_hwcnt_dump_buffer_block_instance(dst, grp, blk, blk_inst); ++ const u64 *src_blk = ++ kbase_hwcnt_dump_buffer_block_instance(src, grp, blk, blk_inst); ++ const u64 *blk_em = ++ kbase_hwcnt_enable_map_block_instance(dst_enable_map, grp, blk, blk_inst); ++ size_t val_cnt = kbase_hwcnt_metadata_block_values_count(metadata, grp, blk); ++ /* Align upwards to include padding bytes */ ++ val_cnt = KBASE_HWCNT_ALIGN_UPWARDS( ++ val_cnt, (KBASE_HWCNT_BLOCK_BYTE_ALIGNMENT / KBASE_HWCNT_VALUE_BYTES)); + -+ return kbasep_js_atom_priority_to_relative[atom_prio]; ++ kbase_hwcnt_dump_buffer_block_copy_strict(dst_blk, src_blk, blk_em, val_cnt); ++ } ++ ++ kbase_hwcnt_metadata_for_each_clock(metadata, clk) ++ { ++ bool clk_enabled = ++ kbase_hwcnt_clk_enable_map_enabled(dst_enable_map->clk_enable_map, clk); ++ ++ dst->clk_cnt_buf[clk] = clk_enabled ? src->clk_cnt_buf[clk] : 0; ++ } +} + -+static inline base_jd_prio kbasep_js_sched_prio_to_atom_prio(int sched_prio) ++void kbase_hwcnt_dump_buffer_accumulate(struct kbase_hwcnt_dump_buffer *dst, ++ const struct kbase_hwcnt_dump_buffer *src, ++ const struct kbase_hwcnt_enable_map *dst_enable_map) +{ -+ unsigned int prio_idx; ++ const struct kbase_hwcnt_metadata *metadata; ++ size_t grp, blk, blk_inst; ++ size_t clk; + -+ KBASE_DEBUG_ASSERT(sched_prio >= 0 && -+ sched_prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT); ++ if (WARN_ON(!dst) || WARN_ON(!src) || WARN_ON(!dst_enable_map) || WARN_ON(dst == src) || ++ WARN_ON(dst->metadata != src->metadata) || ++ WARN_ON(dst->metadata != dst_enable_map->metadata)) ++ return; + -+ prio_idx = (unsigned int)sched_prio; ++ metadata = dst->metadata; + -+ return kbasep_js_relative_priority_to_atom[prio_idx]; ++ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) ++ { ++ u64 *dst_blk; ++ const u64 *src_blk; ++ size_t hdr_cnt; ++ size_t ctr_cnt; ++ ++ if (!kbase_hwcnt_enable_map_block_enabled(dst_enable_map, grp, blk, blk_inst)) ++ continue; ++ ++ dst_blk = kbase_hwcnt_dump_buffer_block_instance(dst, grp, blk, blk_inst); ++ src_blk = kbase_hwcnt_dump_buffer_block_instance(src, grp, blk, blk_inst); ++ hdr_cnt = kbase_hwcnt_metadata_block_headers_count(metadata, grp, blk); ++ ctr_cnt = kbase_hwcnt_metadata_block_counters_count(metadata, grp, blk); ++ ++ kbase_hwcnt_dump_buffer_block_accumulate(dst_blk, src_blk, hdr_cnt, ctr_cnt); ++ } ++ ++ kbase_hwcnt_metadata_for_each_clock(metadata, clk) ++ { ++ if (kbase_hwcnt_clk_enable_map_enabled(dst_enable_map->clk_enable_map, clk)) ++ dst->clk_cnt_buf[clk] += src->clk_cnt_buf[clk]; ++ } +} + -+#endif /* _KBASE_JM_JS_H_ */ -diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h -new file mode 100755 -index 000000000000..900ecd2c1b8d ++void kbase_hwcnt_dump_buffer_accumulate_strict(struct kbase_hwcnt_dump_buffer *dst, ++ const struct kbase_hwcnt_dump_buffer *src, ++ const struct kbase_hwcnt_enable_map *dst_enable_map) ++{ ++ const struct kbase_hwcnt_metadata *metadata; ++ size_t grp, blk, blk_inst; ++ size_t clk; ++ ++ if (WARN_ON(!dst) || WARN_ON(!src) || WARN_ON(!dst_enable_map) || WARN_ON(dst == src) || ++ WARN_ON(dst->metadata != src->metadata) || ++ WARN_ON(dst->metadata != dst_enable_map->metadata)) ++ return; ++ ++ metadata = dst->metadata; ++ ++ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) ++ { ++ u64 *dst_blk = kbase_hwcnt_dump_buffer_block_instance(dst, grp, blk, blk_inst); ++ const u64 *src_blk = ++ kbase_hwcnt_dump_buffer_block_instance(src, grp, blk, blk_inst); ++ const u64 *blk_em = ++ kbase_hwcnt_enable_map_block_instance(dst_enable_map, grp, blk, blk_inst); ++ size_t hdr_cnt = kbase_hwcnt_metadata_block_headers_count(metadata, grp, blk); ++ size_t ctr_cnt = kbase_hwcnt_metadata_block_counters_count(metadata, grp, blk); ++ /* Align upwards to include padding bytes */ ++ ctr_cnt = KBASE_HWCNT_ALIGN_UPWARDS( ++ hdr_cnt + ctr_cnt, ++ (KBASE_HWCNT_BLOCK_BYTE_ALIGNMENT / KBASE_HWCNT_VALUE_BYTES) - hdr_cnt); ++ ++ kbase_hwcnt_dump_buffer_block_accumulate_strict(dst_blk, src_blk, blk_em, hdr_cnt, ++ ctr_cnt); ++ } ++ ++ kbase_hwcnt_metadata_for_each_clock(metadata, clk) ++ { ++ if (kbase_hwcnt_clk_enable_map_enabled(dst_enable_map->clk_enable_map, clk)) ++ dst->clk_cnt_buf[clk] += src->clk_cnt_buf[clk]; ++ else ++ dst->clk_cnt_buf[clk] = 0; ++ } ++} +diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.h +new file mode 100644 +index 000000000..5c5ada401 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h -@@ -0,0 +1,409 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.h +@@ -0,0 +1,1231 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2011-2018, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -188451,3118 +217949,2235 @@ index 000000000000..900ecd2c1b8d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ */ ++ ++/* ++ * Hardware counter types. ++ * Contains structures for describing the physical layout of hardware counter ++ * dump buffers and enable maps within a system. ++ * ++ * Also contains helper functions for manipulation of these dump buffers and ++ * enable maps. ++ * ++ * Through use of these structures and functions, hardware counters can be ++ * enabled, copied, accumulated, and generally manipulated in a generic way, ++ * regardless of the physical counter dump layout. ++ * ++ * Terminology: ++ * ++ * Hardware Counter System: ++ * A collection of hardware counter groups, making a full hardware counter ++ * system. ++ * Hardware Counter Group: ++ * A group of Hardware Counter Blocks (e.g. a t62x might have more than one ++ * core group, so has one counter group per core group, where each group ++ * may have a different number and layout of counter blocks). ++ * Hardware Counter Block: ++ * A block of hardware counters (e.g. shader block, tiler block). ++ * Hardware Counter Block Instance: ++ * An instance of a Hardware Counter Block (e.g. an MP4 GPU might have ++ * 4 shader block instances). ++ * ++ * Block Header: ++ * A header value inside a counter block. Headers don't count anything, ++ * so it is only valid to copy or zero them. Headers are always the first ++ * values in the block. ++ * Block Counter: ++ * A counter value inside a counter block. Counters can be zeroed, copied, ++ * or accumulated. Counters are always immediately after the headers in the ++ * block. ++ * Block Value: ++ * A catch-all term for block headers and block counters. ++ * ++ * Enable Map: ++ * An array of u64 bitfields, where each bit either enables exactly one ++ * block value, or is unused (padding). ++ * Dump Buffer: ++ * An array of u64 values, where each u64 corresponds either to one block ++ * value, or is unused (padding). ++ * Availability Mask: ++ * A bitfield, where each bit corresponds to whether a block instance is ++ * physically available (e.g. an MP3 GPU may have a sparse core mask of ++ * 0b1011, meaning it only has 3 cores but for hardware counter dumps has the ++ * same dump buffer layout as an MP4 GPU with a core mask of 0b1111. In this ++ * case, the availability mask might be 0b1011111 (the exact layout will ++ * depend on the specific hardware architecture), with the 3 extra early bits ++ * corresponding to other block instances in the hardware counter system). ++ * Metadata: ++ * Structure describing the physical layout of the enable map and dump buffers ++ * for a specific hardware counter system. + * + */ + ++#ifndef _KBASE_HWCNT_TYPES_H_ ++#define _KBASE_HWCNT_TYPES_H_ + -+/** -+ * @file mali_kbase_js.h -+ * Job Scheduler Type Definitions -+ */ ++#include ++#include ++#include ++#include ++#include + -+#ifndef _KBASE_JS_DEFS_H_ -+#define _KBASE_JS_DEFS_H_ ++/* Number of bytes in each bitfield */ ++#define KBASE_HWCNT_BITFIELD_BYTES (sizeof(u64)) + -+/** -+ * @addtogroup base_api -+ * @{ -+ */ ++/* Number of bits in each bitfield */ ++#define KBASE_HWCNT_BITFIELD_BITS (KBASE_HWCNT_BITFIELD_BYTES * BITS_PER_BYTE) + -+/** -+ * @addtogroup base_kbase_api -+ * @{ ++/* Number of bytes for each counter value. ++ * Use 64-bit per counter in driver to avoid HW 32-bit register values ++ * overflow after a long time accumulation. + */ ++#define KBASE_HWCNT_VALUE_BYTES (sizeof(u64)) + -+/** -+ * @addtogroup kbase_js -+ * @{ ++/* Number of bits in an availability mask (i.e. max total number of block ++ * instances supported in a Hardware Counter System) + */ -+/* Forward decls */ -+struct kbase_device; -+struct kbase_jd_atom; -+ -+ -+typedef u32 kbase_context_flags; ++#define KBASE_HWCNT_AVAIL_MASK_BITS (sizeof(u64) * BITS_PER_BYTE) + -+/** Callback function run on all of a context's jobs registered with the Job -+ * Scheduler */ -+typedef void (*kbasep_js_ctx_job_cb)(struct kbase_device *kbdev, struct kbase_jd_atom *katom); ++/* Minimum alignment of each block of hardware counters */ ++#define KBASE_HWCNT_BLOCK_BYTE_ALIGNMENT (KBASE_HWCNT_BITFIELD_BITS * KBASE_HWCNT_VALUE_BYTES) + +/** -+ * @brief Maximum number of jobs that can be submitted to a job slot whilst -+ * inside the IRQ handler. ++ * KBASE_HWCNT_ALIGN_UPWARDS() - Calculate next aligned value. ++ * @value: The value to align upwards. ++ * @alignment: The alignment boundary. + * -+ * This is important because GPU NULL jobs can complete whilst the IRQ handler -+ * is running. Otherwise, it potentially allows an unlimited number of GPU NULL -+ * jobs to be submitted inside the IRQ handler, which increases IRQ latency. ++ * Return: Input value if already aligned to the specified boundary, or next ++ * (incrementing upwards) aligned value. + */ -+#define KBASE_JS_MAX_JOB_SUBMIT_PER_SLOT_PER_IRQ 2 ++#define KBASE_HWCNT_ALIGN_UPWARDS(value, alignment) \ ++ (value + ((alignment - (value % alignment)) % alignment)) + +/** -+ * @brief Context attributes -+ * -+ * Each context attribute can be thought of as a boolean value that caches some -+ * state information about either the runpool, or the context: -+ * - In the case of the runpool, it is a cache of "Do any contexts owned by -+ * the runpool have attribute X?" -+ * - In the case of a context, it is a cache of "Do any atoms owned by the -+ * context have attribute X?" -+ * -+ * The boolean value of the context attributes often affect scheduling -+ * decisions, such as affinities to use and job slots to use. -+ * -+ * To accomodate changes of state in the context, each attribute is refcounted -+ * in the context, and in the runpool for all running contexts. Specifically: -+ * - The runpool holds a refcount of how many contexts in the runpool have this -+ * attribute. -+ * - The context holds a refcount of how many atoms have this attribute. ++ * struct kbase_hwcnt_block_description - Description of one or more identical, ++ * contiguous, Hardware Counter Blocks. ++ * @type: The arbitrary identifier used to identify the type of the block. ++ * @inst_cnt: The number of Instances of the block. ++ * @hdr_cnt: The number of 64-bit Block Headers in the block. ++ * @ctr_cnt: The number of 64-bit Block Counters in the block. + */ -+enum kbasep_js_ctx_attr { -+ /** Attribute indicating a context that contains Compute jobs. That is, -+ * the context has jobs of type @ref BASE_JD_REQ_ONLY_COMPUTE -+ * -+ * @note A context can be both 'Compute' and 'Non Compute' if it contains -+ * both types of jobs. -+ */ -+ KBASEP_JS_CTX_ATTR_COMPUTE, -+ -+ /** Attribute indicating a context that contains Non-Compute jobs. That is, -+ * the context has some jobs that are \b not of type @ref -+ * BASE_JD_REQ_ONLY_COMPUTE. -+ * -+ * @note A context can be both 'Compute' and 'Non Compute' if it contains -+ * both types of jobs. -+ */ -+ KBASEP_JS_CTX_ATTR_NON_COMPUTE, -+ -+ /** Attribute indicating that a context contains compute-job atoms that -+ * aren't restricted to a coherent group, and can run on all cores. -+ * -+ * Specifically, this is when the atom's \a core_req satisfy: -+ * - (\a core_req & (BASE_JD_REQ_CS | BASE_JD_REQ_ONLY_COMPUTE | BASE_JD_REQ_T) // uses slot 1 or slot 2 -+ * - && !(\a core_req & BASE_JD_REQ_COHERENT_GROUP) // not restricted to coherent groups -+ * -+ * Such atoms could be blocked from running if one of the coherent groups -+ * is being used by another job slot, so tracking this context attribute -+ * allows us to prevent such situations. -+ * -+ * @note This doesn't take into account the 1-coregroup case, where all -+ * compute atoms would effectively be able to run on 'all cores', but -+ * contexts will still not always get marked with this attribute. Instead, -+ * it is the caller's responsibility to take into account the number of -+ * coregroups when interpreting this attribute. -+ * -+ * @note Whilst Tiler atoms are normally combined with -+ * BASE_JD_REQ_COHERENT_GROUP, it is possible to send such atoms without -+ * BASE_JD_REQ_COHERENT_GROUP set. This is an unlikely case, but it's easy -+ * enough to handle anyway. -+ */ -+ KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES, -+ -+ /** Must be the last in the enum */ -+ KBASEP_JS_CTX_ATTR_COUNT ++struct kbase_hwcnt_block_description { ++ u64 type; ++ size_t inst_cnt; ++ size_t hdr_cnt; ++ size_t ctr_cnt; +}; + -+enum { -+ /** Bit indicating that new atom should be started because this atom completed */ -+ KBASE_JS_ATOM_DONE_START_NEW_ATOMS = (1u << 0), -+ /** Bit indicating that the atom was evicted from the JS_NEXT registers */ -+ KBASE_JS_ATOM_DONE_EVICTED_FROM_NEXT = (1u << 1) ++/** ++ * struct kbase_hwcnt_group_description - Description of one or more identical, ++ * contiguous Hardware Counter Groups. ++ * @type: The arbitrary identifier used to identify the type of the group. ++ * @blk_cnt: The number of types of Hardware Counter Block in the group. ++ * @blks: Non-NULL pointer to an array of blk_cnt block descriptions, ++ * describing each type of Hardware Counter Block in the group. ++ */ ++struct kbase_hwcnt_group_description { ++ u64 type; ++ size_t blk_cnt; ++ const struct kbase_hwcnt_block_description *blks; +}; + -+/** Combination of KBASE_JS_ATOM_DONE_<...> bits */ -+typedef u32 kbasep_js_atom_done_code; -+ -+/* -+ * Context scheduling mode defines for kbase_device::js_ctx_scheduling_mode ++/** ++ * struct kbase_hwcnt_description - Description of a Hardware Counter System. ++ * @grp_cnt: The number of Hardware Counter Groups. ++ * @grps: Non-NULL pointer to an array of grp_cnt group descriptions, ++ * describing each Hardware Counter Group in the system. ++ * @avail_mask: Flat Availability Mask for all block instances in the system. ++ * @clk_cnt: The number of clock domains in the system. The maximum is 64. + */ -+enum { -+ /* -+ * In this mode, higher priority atoms will be scheduled first, -+ * regardless of the context they belong to. Newly-runnable higher -+ * priority atoms can preempt lower priority atoms currently running on -+ * the GPU, even if they belong to a different context. -+ */ -+ KBASE_JS_SYSTEM_PRIORITY_MODE = 0, -+ -+ /* -+ * In this mode, the highest-priority atom will be chosen from each -+ * context in turn using a round-robin algorithm, so priority only has -+ * an effect within the context an atom belongs to. Newly-runnable -+ * higher priority atoms can preempt the lower priority atoms currently -+ * running on the GPU, but only if they belong to the same context. -+ */ -+ KBASE_JS_PROCESS_LOCAL_PRIORITY_MODE, -+ -+ /* Must be the last in the enum */ -+ KBASE_JS_PRIORITY_MODE_COUNT, ++struct kbase_hwcnt_description { ++ size_t grp_cnt; ++ const struct kbase_hwcnt_group_description *grps; ++ u64 avail_mask; ++ u8 clk_cnt; +}; + -+/* -+ * Internal atom priority defines for kbase_jd_atom::sched_prio ++/** ++ * struct kbase_hwcnt_block_metadata - Metadata describing the physical layout ++ * of a block in a Hardware Counter System's ++ * Dump Buffers and Enable Maps. ++ * @type: The arbitrary identifier used to identify the type of the ++ * block. ++ * @inst_cnt: The number of Instances of the block. ++ * @hdr_cnt: The number of 64-bit Block Headers in the block. ++ * @ctr_cnt: The number of 64-bit Block Counters in the block. ++ * @enable_map_index: Index in u64s into the parent's Enable Map where the ++ * Enable Map bitfields of the Block Instances described by ++ * this metadata start. ++ * @enable_map_stride: Stride in u64s between the Enable Maps of each of the ++ * Block Instances described by this metadata. ++ * @dump_buf_index: Index in u64s into the parent's Dump Buffer where the ++ * Dump Buffers of the Block Instances described by this ++ * metadata start. ++ * @dump_buf_stride: Stride in u64s between the Dump Buffers of each of the ++ * Block Instances described by this metadata. ++ * @avail_mask_index: Index in bits into the parent's Availability Mask where ++ * the Availability Masks of the Block Instances described ++ * by this metadata start. + */ -+enum { -+ KBASE_JS_ATOM_SCHED_PRIO_HIGH = 0, -+ KBASE_JS_ATOM_SCHED_PRIO_MED, -+ KBASE_JS_ATOM_SCHED_PRIO_LOW, -+ KBASE_JS_ATOM_SCHED_PRIO_COUNT, ++struct kbase_hwcnt_block_metadata { ++ u64 type; ++ size_t inst_cnt; ++ size_t hdr_cnt; ++ size_t ctr_cnt; ++ size_t enable_map_index; ++ size_t enable_map_stride; ++ size_t dump_buf_index; ++ size_t dump_buf_stride; ++ size_t avail_mask_index; +}; + -+/* Invalid priority for kbase_jd_atom::sched_prio */ -+#define KBASE_JS_ATOM_SCHED_PRIO_INVALID -1 -+ -+/* Default priority in the case of contexts with no atoms, or being lenient -+ * about invalid priorities from userspace. ++/** ++ * struct kbase_hwcnt_group_metadata - Metadata describing the physical layout ++ * of a group of blocks in a Hardware ++ * Counter System's Dump Buffers and Enable ++ * Maps. ++ * @type: The arbitrary identifier used to identify the type of the ++ * group. ++ * @blk_cnt: The number of types of Hardware Counter Block in the ++ * group. ++ * @blk_metadata: Non-NULL pointer to an array of blk_cnt block metadata, ++ * describing the physical layout of each type of Hardware ++ * Counter Block in the group. ++ * @enable_map_index: Index in u64s into the parent's Enable Map where the ++ * Enable Maps of the blocks within the group described by ++ * this metadata start. ++ * @dump_buf_index: Index in u64s into the parent's Dump Buffer where the ++ * Dump Buffers of the blocks within the group described by ++ * metadata start. ++ * @avail_mask_index: Index in bits into the parent's Availability Mask where ++ * the Availability Masks of the blocks within the group ++ * described by this metadata start. + */ -+#define KBASE_JS_ATOM_SCHED_PRIO_DEFAULT KBASE_JS_ATOM_SCHED_PRIO_MED ++struct kbase_hwcnt_group_metadata { ++ u64 type; ++ size_t blk_cnt; ++ const struct kbase_hwcnt_block_metadata *blk_metadata; ++ size_t enable_map_index; ++ size_t dump_buf_index; ++ size_t avail_mask_index; ++}; + +/** -+ * @brief KBase Device Data Job Scheduler sub-structure -+ * -+ * This encapsulates the current context of the Job Scheduler on a particular -+ * device. This context is global to the device, and is not tied to any -+ * particular struct kbase_context running on the device. -+ * -+ * nr_contexts_running and as_free are optimized for packing together (by making -+ * them smaller types than u32). The operations on them should rarely involve -+ * masking. The use of signed types for arithmetic indicates to the compiler that -+ * the value will not rollover (which would be undefined behavior), and so under -+ * the Total License model, it is free to make optimizations based on that (i.e. -+ * to remove masking). ++ * struct kbase_hwcnt_metadata - Metadata describing the memory layout ++ * of Dump Buffers and Enable Maps within a ++ * Hardware Counter System. ++ * @grp_cnt: The number of Hardware Counter Groups. ++ * @grp_metadata: Non-NULL pointer to an array of grp_cnt group metadata, ++ * describing the physical layout of each Hardware Counter ++ * Group in the system. ++ * @enable_map_bytes: The size in bytes of an Enable Map needed for the system. ++ * @dump_buf_bytes: The size in bytes of a Dump Buffer needed for the system. ++ * @avail_mask: The Availability Mask for the system. ++ * @clk_cnt: The number of clock domains in the system. + */ -+struct kbasep_js_device_data { -+ /* Sub-structure to collect together Job Scheduling data used in IRQ -+ * context. The hwaccess_lock must be held when accessing. */ -+ struct runpool_irq { -+ /** Bitvector indicating whether a currently scheduled context is allowed to submit jobs. -+ * When bit 'N' is set in this, it indicates whether the context bound to address space -+ * 'N' is allowed to submit jobs. -+ */ -+ u16 submit_allowed; -+ -+ /** Context Attributes: -+ * Each is large enough to hold a refcount of the number of contexts -+ * that can fit into the runpool. This is currently BASE_MAX_NR_AS -+ * -+ * Note that when BASE_MAX_NR_AS==16 we need 5 bits (not 4) to store -+ * the refcount. Hence, it's not worthwhile reducing this to -+ * bit-manipulation on u32s to save space (where in contrast, 4 bit -+ * sub-fields would be easy to do and would save space). -+ * -+ * Whilst this must not become negative, the sign bit is used for: -+ * - error detection in debug builds -+ * - Optimization: it is undefined for a signed int to overflow, and so -+ * the compiler can optimize for that never happening (thus, no masking -+ * is required on updating the variable) */ -+ s8 ctx_attr_ref_count[KBASEP_JS_CTX_ATTR_COUNT]; -+ -+ /* -+ * Affinity management and tracking -+ */ -+ /** Bitvector to aid affinity checking. Element 'n' bit 'i' indicates -+ * that slot 'n' is using core i (i.e. slot_affinity_refcount[n][i] > 0) */ -+ u64 slot_affinities[BASE_JM_MAX_NR_SLOTS]; -+ /** Refcount for each core owned by each slot. Used to generate the -+ * slot_affinities array of bitvectors -+ * -+ * The value of the refcount will not exceed BASE_JM_SUBMIT_SLOTS, -+ * because it is refcounted only when a job is definitely about to be -+ * submitted to a slot, and is de-refcounted immediately after a job -+ * finishes */ -+ s8 slot_affinity_refcount[BASE_JM_MAX_NR_SLOTS][64]; -+ } runpool_irq; -+ -+ /** -+ * Scheduling semaphore. This must be held when calling -+ * kbase_jm_kick() -+ */ -+ struct semaphore schedule_sem; -+ -+ /** -+ * List of contexts that can currently be pulled from -+ */ -+ struct list_head ctx_list_pullable[BASE_JM_MAX_NR_SLOTS][KBASE_JS_ATOM_SCHED_PRIO_COUNT]; -+ /** -+ * List of contexts that can not currently be pulled from, but have -+ * jobs currently running. -+ */ -+ struct list_head ctx_list_unpullable[BASE_JM_MAX_NR_SLOTS][KBASE_JS_ATOM_SCHED_PRIO_COUNT]; -+ -+ /** Number of currently scheduled user contexts (excluding ones that are not submitting jobs) */ -+ s8 nr_user_contexts_running; -+ /** Number of currently scheduled contexts (including ones that are not submitting jobs) */ -+ s8 nr_all_contexts_running; -+ -+ /** Core Requirements to match up with base_js_atom's core_req memeber -+ * @note This is a write-once member, and so no locking is required to read */ -+ base_jd_core_req js_reqs[BASE_JM_MAX_NR_SLOTS]; -+ -+ u32 scheduling_period_ns; /*< Value for JS_SCHEDULING_PERIOD_NS */ -+ u32 soft_stop_ticks; /*< Value for JS_SOFT_STOP_TICKS */ -+ u32 soft_stop_ticks_cl; /*< Value for JS_SOFT_STOP_TICKS_CL */ -+ u32 hard_stop_ticks_ss; /*< Value for JS_HARD_STOP_TICKS_SS */ -+ u32 hard_stop_ticks_cl; /*< Value for JS_HARD_STOP_TICKS_CL */ -+ u32 hard_stop_ticks_dumping; /*< Value for JS_HARD_STOP_TICKS_DUMPING */ -+ u32 gpu_reset_ticks_ss; /*< Value for JS_RESET_TICKS_SS */ -+ u32 gpu_reset_ticks_cl; /*< Value for JS_RESET_TICKS_CL */ -+ u32 gpu_reset_ticks_dumping; /*< Value for JS_RESET_TICKS_DUMPING */ -+ u32 ctx_timeslice_ns; /**< Value for JS_CTX_TIMESLICE_NS */ -+ -+ /** List of suspended soft jobs */ -+ struct list_head suspended_soft_jobs_list; -+ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ /* Support soft-stop on a single context */ -+ bool softstop_always; -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+ -+ /** The initalized-flag is placed at the end, to avoid cache-pollution (we should -+ * only be using this during init/term paths). -+ * @note This is a write-once member, and so no locking is required to read */ -+ int init_status; -+ -+ /* Number of contexts that can currently be pulled from */ -+ u32 nr_contexts_pullable; -+ -+ /* Number of contexts that can either be pulled from or are currently -+ * running */ -+ atomic_t nr_contexts_runnable; -+ -+ /** Value for JS_SOFT_JOB_TIMEOUT */ -+ atomic_t soft_job_timeout_ms; -+ -+ /** -+ * Queue Lock, used to access the Policy's queue of contexts -+ * independently of the Run Pool. -+ * -+ * Of course, you don't need the Run Pool lock to access this. -+ */ -+ struct mutex queue_mutex; -+ -+ /** -+ * Run Pool mutex, for managing contexts within the runpool. -+ * Unless otherwise specified, you must hold this lock whilst accessing -+ * any members that follow -+ * -+ * In addition, this is used to access: -+ * * the kbasep_js_kctx_info::runpool substructure -+ */ -+ struct mutex runpool_mutex; ++struct kbase_hwcnt_metadata { ++ size_t grp_cnt; ++ const struct kbase_hwcnt_group_metadata *grp_metadata; ++ size_t enable_map_bytes; ++ size_t dump_buf_bytes; ++ u64 avail_mask; ++ u8 clk_cnt; +}; + +/** -+ * @brief KBase Context Job Scheduling information structure -+ * -+ * This is a substructure in the struct kbase_context that encapsulates all the -+ * scheduling information. ++ * struct kbase_hwcnt_enable_map - Hardware Counter Enable Map. Array of u64 ++ * bitfields. ++ * @metadata: Non-NULL pointer to metadata used to identify, and to describe ++ * the layout of the enable map. ++ * @hwcnt_enable_map: Non-NULL pointer of size metadata->enable_map_bytes to an ++ * array of u64 bitfields, each bit of which enables one hardware ++ * counter. ++ * @clk_enable_map: An array of u64 bitfields, each bit of which enables cycle ++ * counter for a given clock domain. + */ -+struct kbasep_js_kctx_info { -+ -+ /** -+ * Job Scheduler Context information sub-structure. These members are -+ * accessed regardless of whether the context is: -+ * - In the Policy's Run Pool -+ * - In the Policy's Queue -+ * - Not queued nor in the Run Pool. -+ * -+ * You must obtain the jsctx_mutex before accessing any other members of -+ * this substructure. -+ * -+ * You may not access any of these members from IRQ context. -+ */ -+ struct kbase_jsctx { -+ struct mutex jsctx_mutex; /**< Job Scheduler Context lock */ -+ -+ /** Number of jobs ready to run - does \em not include the jobs waiting in -+ * the dispatcher, and dependency-only jobs. See kbase_jd_context::job_nr -+ * for such jobs*/ -+ u32 nr_jobs; -+ -+ /** Context Attributes: -+ * Each is large enough to hold a refcount of the number of atoms on -+ * the context. **/ -+ u32 ctx_attr_ref_count[KBASEP_JS_CTX_ATTR_COUNT]; -+ -+ /** -+ * Wait queue to wait for KCTX_SHEDULED flag state changes. -+ * */ -+ wait_queue_head_t is_scheduled_wait; -+ -+ /** Link implementing JS queues. Context can be present on one -+ * list per job slot -+ */ -+ struct list_head ctx_list_entry[BASE_JM_MAX_NR_SLOTS]; -+ } ctx; -+ -+ /* The initalized-flag is placed at the end, to avoid cache-pollution (we should -+ * only be using this during init/term paths) */ -+ int init_status; ++struct kbase_hwcnt_enable_map { ++ const struct kbase_hwcnt_metadata *metadata; ++ u64 *hwcnt_enable_map; ++ u64 clk_enable_map; +}; + -+/** Subset of atom state that can be available after jd_done_nolock() is called -+ * on that atom. A copy must be taken via kbasep_js_atom_retained_state_copy(), -+ * because the original atom could disappear. */ -+struct kbasep_js_atom_retained_state { -+ /** Event code - to determine whether the atom has finished */ -+ enum base_jd_event_code event_code; -+ /** core requirements */ -+ base_jd_core_req core_req; -+ /* priority */ -+ int sched_priority; -+ /* Core group atom was executed on */ -+ u32 device_nr; -+ ++/** ++ * struct kbase_hwcnt_dump_buffer - Hardware Counter Dump Buffer. ++ * @metadata: Non-NULL pointer to metadata used to identify, and to describe ++ * the layout of the Dump Buffer. ++ * @dump_buf: Non-NULL pointer to an array of u64 values, the array size is ++ * metadata->dump_buf_bytes. ++ * @clk_cnt_buf: A pointer to an array of u64 values for cycle count elapsed ++ * for each clock domain. ++ */ ++struct kbase_hwcnt_dump_buffer { ++ const struct kbase_hwcnt_metadata *metadata; ++ u64 *dump_buf; ++ u64 *clk_cnt_buf; +}; + +/** -+ * Value signifying 'no retry on a slot required' for: -+ * - kbase_js_atom_retained_state::retry_submit_on_slot -+ * - kbase_jd_atom::retry_submit_on_slot ++ * struct kbase_hwcnt_dump_buffer_array - Hardware Counter Dump Buffer array. ++ * @page_addr: Address of allocated pages. A single allocation is used for all ++ * Dump Buffers in the array. ++ * @page_order: The allocation order of the pages, the order is on a logarithmic ++ * scale. ++ * @buf_cnt: The number of allocated Dump Buffers. ++ * @bufs: Non-NULL pointer to the array of Dump Buffers. + */ -+#define KBASEP_JS_RETRY_SUBMIT_SLOT_INVALID (-1) ++struct kbase_hwcnt_dump_buffer_array { ++ unsigned long page_addr; ++ unsigned int page_order; ++ size_t buf_cnt; ++ struct kbase_hwcnt_dump_buffer *bufs; ++}; + +/** -+ * base_jd_core_req value signifying 'invalid' for a kbase_jd_atom_retained_state. ++ * kbase_hwcnt_metadata_create() - Create a hardware counter metadata object ++ * from a description. ++ * @desc: Non-NULL pointer to a hardware counter description. ++ * @metadata: Non-NULL pointer to where created metadata will be stored on ++ * success. + * -+ * @see kbase_atom_retained_state_is_valid() ++ * Return: 0 on success, else error code. + */ -+#define KBASEP_JS_ATOM_RETAINED_STATE_CORE_REQ_INVALID BASE_JD_REQ_DEP ++int kbase_hwcnt_metadata_create(const struct kbase_hwcnt_description *desc, ++ const struct kbase_hwcnt_metadata **metadata); + +/** -+ * @brief The JS timer resolution, in microseconds -+ * -+ * Any non-zero difference in time will be at least this size. ++ * kbase_hwcnt_metadata_destroy() - Destroy a hardware counter metadata object. ++ * @metadata: Pointer to hardware counter metadata + */ -+#define KBASEP_JS_TICK_RESOLUTION_US 1 -+ -+ -+ /** @} *//* end group kbase_js */ -+ /** @} *//* end group base_kbase_api */ -+ /** @} *//* end group base_api */ ++void kbase_hwcnt_metadata_destroy(const struct kbase_hwcnt_metadata *metadata); + -+#endif /* _KBASE_JS_DEFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h b/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h -new file mode 100755 -index 000000000000..0dc08381bee6 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h -@@ -0,0 +1,515 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 ++/** ++ * kbase_hwcnt_metadata_group_count() - Get the number of groups. ++ * @metadata: Non-NULL pointer to metadata. + * ++ * Return: Number of hardware counter groups described by metadata. + */ ++static inline size_t kbase_hwcnt_metadata_group_count(const struct kbase_hwcnt_metadata *metadata) ++{ ++ if (WARN_ON(!metadata)) ++ return 0; + -+/* AUTOMATICALLY GENERATED FILE. If you want to amend the issues/features, -+ * please update base/tools/hwconfig_generator/hwc_{issues,features}.py -+ * For more information see base/tools/hwconfig_generator/README -+ */ -+ -+#ifndef _BASE_HWCONFIG_FEATURES_H_ -+#define _BASE_HWCONFIG_FEATURES_H_ -+ -+enum base_hw_feature { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_TLS_HASHING, -+ BASE_HW_FEATURE_THREAD_GROUP_SPLIT, -+ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, -+ BASE_HW_FEATURE_IDVS_GROUP_SIZE, -+ BASE_HW_FEATURE_L2_CONFIG, -+ BASE_HW_FEATURE_END -+}; -+ -+static const enum base_hw_feature base_hw_features_generic[] = { -+ BASE_HW_FEATURE_END -+}; ++ return metadata->grp_cnt; ++} + -+static const enum base_hw_feature base_hw_features_tMIx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_THREAD_GROUP_SPLIT, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_END -+}; ++/** ++ * kbase_hwcnt_metadata_group_type() - Get the arbitrary type of a group. ++ * @metadata: Non-NULL pointer to metadata. ++ * @grp: Index of the group in the metadata. ++ * ++ * Return: Type of the group grp. ++ */ ++static inline u64 kbase_hwcnt_metadata_group_type(const struct kbase_hwcnt_metadata *metadata, ++ size_t grp) ++{ ++ if (WARN_ON(!metadata) || WARN_ON(grp >= metadata->grp_cnt)) ++ return 0; + -+static const enum base_hw_feature base_hw_features_tHEx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_THREAD_GROUP_SPLIT, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_END -+}; ++ return metadata->grp_metadata[grp].type; ++} + -+static const enum base_hw_feature base_hw_features_tSIx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_THREAD_GROUP_SPLIT, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_END -+}; ++/** ++ * kbase_hwcnt_metadata_block_count() - Get the number of blocks in a group. ++ * @metadata: Non-NULL pointer to metadata. ++ * @grp: Index of the group in the metadata. ++ * ++ * Return: Number of blocks in group grp. ++ */ ++static inline size_t kbase_hwcnt_metadata_block_count(const struct kbase_hwcnt_metadata *metadata, ++ size_t grp) ++{ ++ if (WARN_ON(!metadata) || WARN_ON(grp >= metadata->grp_cnt)) ++ return 0; + -+static const enum base_hw_feature base_hw_features_tDVx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_THREAD_GROUP_SPLIT, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_END -+}; ++ return metadata->grp_metadata[grp].blk_cnt; ++} + -+static const enum base_hw_feature base_hw_features_tNOx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_THREAD_GROUP_SPLIT, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_TLS_HASHING, -+ BASE_HW_FEATURE_IDVS_GROUP_SIZE, -+ BASE_HW_FEATURE_END -+}; ++/** ++ * kbase_hwcnt_metadata_block_type() - Get the arbitrary type of a block. ++ * @metadata: Non-NULL pointer to metadata. ++ * @grp: Index of the group in the metadata. ++ * @blk: Index of the block in the group. ++ * ++ * Return: Type of the block blk in group grp. ++ */ ++static inline u64 kbase_hwcnt_metadata_block_type(const struct kbase_hwcnt_metadata *metadata, ++ size_t grp, size_t blk) ++{ ++ if (WARN_ON(!metadata) || WARN_ON(grp >= metadata->grp_cnt) || ++ WARN_ON(blk >= metadata->grp_metadata[grp].blk_cnt)) ++ return 0; + -+static const enum base_hw_feature base_hw_features_tGOx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_THREAD_GROUP_SPLIT, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_TLS_HASHING, -+ BASE_HW_FEATURE_IDVS_GROUP_SIZE, -+ BASE_HW_FEATURE_END -+}; ++ return metadata->grp_metadata[grp].blk_metadata[blk].type; ++} + -+static const enum base_hw_feature base_hw_features_tTRx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_IDVS_GROUP_SIZE, -+ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, -+ BASE_HW_FEATURE_END -+}; ++/** ++ * kbase_hwcnt_metadata_block_instance_count() - Get the number of instances of ++ * a block. ++ * @metadata: Non-NULL pointer to metadata. ++ * @grp: Index of the group in the metadata. ++ * @blk: Index of the block in the group. ++ * ++ * Return: Number of instances of block blk in group grp. ++ */ ++static inline size_t ++kbase_hwcnt_metadata_block_instance_count(const struct kbase_hwcnt_metadata *metadata, size_t grp, ++ size_t blk) ++{ ++ if (WARN_ON(!metadata) || WARN_ON(grp >= metadata->grp_cnt) || ++ WARN_ON(blk >= metadata->grp_metadata[grp].blk_cnt)) ++ return 0; + -+static const enum base_hw_feature base_hw_features_tNAx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_IDVS_GROUP_SIZE, -+ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, -+ BASE_HW_FEATURE_END -+}; ++ return metadata->grp_metadata[grp].blk_metadata[blk].inst_cnt; ++} + -+static const enum base_hw_feature base_hw_features_tBEx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_IDVS_GROUP_SIZE, -+ BASE_HW_FEATURE_L2_CONFIG, -+ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, -+ BASE_HW_FEATURE_END -+}; ++/** ++ * kbase_hwcnt_metadata_block_headers_count() - Get the number of counter ++ * headers. ++ * @metadata: Non-NULL pointer to metadata. ++ * @grp: Index of the group in the metadata. ++ * @blk: Index of the block in the group. ++ * ++ * Return: Number of counter headers in each instance of block blk in group grp. ++ */ ++static inline size_t ++kbase_hwcnt_metadata_block_headers_count(const struct kbase_hwcnt_metadata *metadata, size_t grp, ++ size_t blk) ++{ ++ if (WARN_ON(!metadata) || WARN_ON(grp >= metadata->grp_cnt) || ++ WARN_ON(blk >= metadata->grp_metadata[grp].blk_cnt)) ++ return 0; + -+static const enum base_hw_feature base_hw_features_tBAx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_IDVS_GROUP_SIZE, -+ BASE_HW_FEATURE_L2_CONFIG, -+ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, -+ BASE_HW_FEATURE_END -+}; ++ return metadata->grp_metadata[grp].blk_metadata[blk].hdr_cnt; ++} + -+static const enum base_hw_feature base_hw_features_tDUx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_IDVS_GROUP_SIZE, -+ BASE_HW_FEATURE_L2_CONFIG, -+ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, -+ BASE_HW_FEATURE_END -+}; ++/** ++ * kbase_hwcnt_metadata_block_counters_count() - Get the number of counters. ++ * @metadata: Non-NULL pointer to metadata. ++ * @grp: Index of the group in the metadata. ++ * @blk: Index of the block in the group. ++ * ++ * Return: Number of counters in each instance of block blk in group grp. ++ */ ++static inline size_t ++kbase_hwcnt_metadata_block_counters_count(const struct kbase_hwcnt_metadata *metadata, size_t grp, ++ size_t blk) ++{ ++ if (WARN_ON(!metadata) || WARN_ON(grp >= metadata->grp_cnt) || ++ WARN_ON(blk >= metadata->grp_metadata[grp].blk_cnt)) ++ return 0; + -+static const enum base_hw_feature base_hw_features_tODx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_L2_CONFIG, -+ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, -+ BASE_HW_FEATURE_END -+}; ++ return metadata->grp_metadata[grp].blk_metadata[blk].ctr_cnt; ++} + -+static const enum base_hw_feature base_hw_features_tGRx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_L2_CONFIG, -+ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, -+ BASE_HW_FEATURE_END -+}; ++/** ++ * kbase_hwcnt_metadata_block_enable_map_stride() - Get the enable map stride. ++ * @metadata: Non-NULL pointer to metadata. ++ * @grp: Index of the group in the metadata. ++ * @blk: Index of the block in the group. ++ * ++ * Return: enable map stride in each instance of block blk in group grp. ++ */ ++static inline size_t ++kbase_hwcnt_metadata_block_enable_map_stride(const struct kbase_hwcnt_metadata *metadata, ++ size_t grp, size_t blk) ++{ ++ if (WARN_ON(!metadata) || WARN_ON(grp >= metadata->grp_cnt) || ++ WARN_ON(blk >= metadata->grp_metadata[grp].blk_cnt)) ++ return 0; + -+static const enum base_hw_feature base_hw_features_tVAx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_L2_CONFIG, -+ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, -+ BASE_HW_FEATURE_END -+}; ++ return metadata->grp_metadata[grp].blk_metadata[blk].enable_map_stride; ++} + -+static const enum base_hw_feature base_hw_features_tTUx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_L2_CONFIG, -+ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, -+ BASE_HW_FEATURE_END -+}; ++/** ++ * kbase_hwcnt_metadata_block_values_count() - Get the number of values. ++ * @metadata: Non-NULL pointer to metadata. ++ * @grp: Index of the group in the metadata. ++ * @blk: Index of the block in the group. ++ * ++ * Return: Number of headers plus counters in each instance of block blk ++ * in group grp. ++ */ ++static inline size_t ++kbase_hwcnt_metadata_block_values_count(const struct kbase_hwcnt_metadata *metadata, size_t grp, ++ size_t blk) ++{ ++ if (WARN_ON(!metadata) || WARN_ON(grp >= metadata->grp_cnt) || ++ WARN_ON(blk >= metadata->grp_metadata[grp].blk_cnt)) ++ return 0; + -+static const enum base_hw_feature base_hw_features_tE2x[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_IDVS_GROUP_SIZE, -+ BASE_HW_FEATURE_L2_CONFIG, -+ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, -+ BASE_HW_FEATURE_END -+}; ++ return kbase_hwcnt_metadata_block_counters_count(metadata, grp, blk) + ++ kbase_hwcnt_metadata_block_headers_count(metadata, grp, blk); ++} + -+#endif /* _BASE_HWCONFIG_FEATURES_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h b/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h -new file mode 100755 -index 000000000000..c1ad3ac40705 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h -@@ -0,0 +1,684 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 ++/** ++ * kbase_hwcnt_metadata_for_each_block() - Iterate over each block instance in ++ * the metadata. ++ * @md: Non-NULL pointer to metadata. ++ * @grp: size_t variable used as group iterator. ++ * @blk: size_t variable used as block iterator. ++ * @blk_inst: size_t variable used as block instance iterator. + * ++ * Iteration order is group, then block, then block instance (i.e. linearly ++ * through memory). + */ ++#define kbase_hwcnt_metadata_for_each_block(md, grp, blk, blk_inst) \ ++ for ((grp) = 0; (grp) < kbase_hwcnt_metadata_group_count((md)); (grp)++) \ ++ for ((blk) = 0; (blk) < kbase_hwcnt_metadata_block_count((md), (grp)); (blk)++) \ ++ for ((blk_inst) = 0; \ ++ (blk_inst) < \ ++ kbase_hwcnt_metadata_block_instance_count((md), (grp), (blk)); \ ++ (blk_inst)++) + -+/* AUTOMATICALLY GENERATED FILE. If you want to amend the issues/features, -+ * please update base/tools/hwconfig_generator/hwc_{issues,features}.py -+ * For more information see base/tools/hwconfig_generator/README ++/** ++ * kbase_hwcnt_metadata_block_avail_bit() - Get the bit index into the avail ++ * mask corresponding to the block. ++ * @metadata: Non-NULL pointer to metadata. ++ * @grp: Index of the group in the metadata. ++ * @blk: Index of the block in the group. ++ * ++ * Return: The bit index into the avail mask for the block. + */ ++static inline size_t ++kbase_hwcnt_metadata_block_avail_bit(const struct kbase_hwcnt_metadata *metadata, size_t grp, ++ size_t blk) ++{ ++ if (WARN_ON(!metadata) || WARN_ON(grp >= metadata->grp_cnt) || ++ WARN_ON(blk >= metadata->grp_metadata[grp].blk_cnt)) ++ return 0; + -+#ifndef _BASE_HWCONFIG_ISSUES_H_ -+#define _BASE_HWCONFIG_ISSUES_H_ -+ -+enum base_hw_issue { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_7940, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TMIX_8138, -+ BASE_HW_ISSUE_TMIX_8206, -+ BASE_HW_ISSUE_TMIX_8343, -+ BASE_HW_ISSUE_TMIX_8463, -+ BASE_HW_ISSUE_TMIX_8456, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_TNOX_1194, -+ BASE_HW_ISSUE_TGOX_R1_1234, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TSIX_1792, -+ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, -+ BASE_HW_ISSUE_TTRX_3076, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_TTRX_3485, -+ BASE_HW_ISSUE_GPU2019_3212, -+ BASE_HW_ISSUE_END -+}; -+ -+static const enum base_hw_issue base_hw_issues_generic[] = { -+ BASE_HW_ISSUE_END -+}; -+ -+static const enum base_hw_issue base_hw_issues_tMIx_r0p0_05dev0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TMIX_8138, -+ BASE_HW_ISSUE_TMIX_8206, -+ BASE_HW_ISSUE_TMIX_8343, -+ BASE_HW_ISSUE_TMIX_8463, -+ BASE_HW_ISSUE_TMIX_8456, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_END -+}; ++ return metadata->grp_metadata[grp].avail_mask_index + ++ metadata->grp_metadata[grp].blk_metadata[blk].avail_mask_index; ++} + -+static const enum base_hw_issue base_hw_issues_tMIx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_7940, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TMIX_8138, -+ BASE_HW_ISSUE_TMIX_8206, -+ BASE_HW_ISSUE_TMIX_8343, -+ BASE_HW_ISSUE_TMIX_8463, -+ BASE_HW_ISSUE_TMIX_8456, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_END -+}; ++/** ++ * kbase_hwcnt_metadata_block_instance_avail() - Check if a block instance is ++ * available. ++ * @metadata: Non-NULL pointer to metadata. ++ * @grp: Index of the group in the metadata. ++ * @blk: Index of the block in the group. ++ * @blk_inst: Index of the block instance in the block. ++ * ++ * Return: true if the block instance is available, else false. ++ */ ++static inline bool ++kbase_hwcnt_metadata_block_instance_avail(const struct kbase_hwcnt_metadata *metadata, size_t grp, ++ size_t blk, size_t blk_inst) ++{ ++ size_t bit; ++ u64 mask; + -+static const enum base_hw_issue base_hw_issues_tMIx_r0p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_7940, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TMIX_8138, -+ BASE_HW_ISSUE_TMIX_8206, -+ BASE_HW_ISSUE_TMIX_8343, -+ BASE_HW_ISSUE_TMIX_8463, -+ BASE_HW_ISSUE_TMIX_8456, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_END -+}; ++ if (WARN_ON(!metadata)) ++ return false; + -+static const enum base_hw_issue base_hw_issues_model_tMIx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_7940, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TMIX_8138, -+ BASE_HW_ISSUE_TMIX_8206, -+ BASE_HW_ISSUE_TMIX_8343, -+ BASE_HW_ISSUE_TMIX_8456, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_END -+}; ++ bit = kbase_hwcnt_metadata_block_avail_bit(metadata, grp, blk) + blk_inst; ++ mask = 1ull << bit; + -+static const enum base_hw_issue base_hw_issues_tHEx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_END -+}; ++ return (metadata->avail_mask & mask) != 0; ++} + -+static const enum base_hw_issue base_hw_issues_tHEx_r0p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_END -+}; ++/** ++ * kbase_hwcnt_enable_map_alloc() - Allocate an enable map. ++ * @metadata: Non-NULL pointer to metadata describing the system. ++ * @enable_map: Non-NULL pointer to enable map to be initialised. Will be ++ * initialised to all zeroes (i.e. all counters disabled). ++ * ++ * Return: 0 on success, else error code. ++ */ ++int kbase_hwcnt_enable_map_alloc(const struct kbase_hwcnt_metadata *metadata, ++ struct kbase_hwcnt_enable_map *enable_map); + -+static const enum base_hw_issue base_hw_issues_tHEx_r0p2[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_END -+}; ++/** ++ * kbase_hwcnt_enable_map_free() - Free an enable map. ++ * @enable_map: Enable map to be freed. ++ * ++ * Can be safely called on an all-zeroed enable map structure, or on an already ++ * freed enable map. ++ */ ++void kbase_hwcnt_enable_map_free(struct kbase_hwcnt_enable_map *enable_map); + -+static const enum base_hw_issue base_hw_issues_tHEx_r0p3[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_END -+}; ++/** ++ * kbase_hwcnt_enable_map_block_instance() - Get the pointer to a block ++ * instance's enable map. ++ * @map: Non-NULL pointer to enable map. ++ * @grp: Index of the group in the metadata. ++ * @blk: Index of the block in the group. ++ * @blk_inst: Index of the block instance in the block. ++ * ++ * Return: u64* to the bitfield(s) used as the enable map for the ++ * block instance. ++ */ ++static inline u64 *kbase_hwcnt_enable_map_block_instance(const struct kbase_hwcnt_enable_map *map, ++ size_t grp, size_t blk, size_t blk_inst) ++{ ++ if (WARN_ON(!map) || WARN_ON(!map->hwcnt_enable_map)) ++ return NULL; + -+static const enum base_hw_issue base_hw_issues_model_tHEx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_END -+}; ++ if (WARN_ON(!map->metadata) || WARN_ON(grp >= map->metadata->grp_cnt) || ++ WARN_ON(blk >= map->metadata->grp_metadata[grp].blk_cnt) || ++ WARN_ON(blk_inst >= map->metadata->grp_metadata[grp].blk_metadata[blk].inst_cnt)) ++ return map->hwcnt_enable_map; + -+static const enum base_hw_issue base_hw_issues_tSIx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TSIX_1792, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ return map->hwcnt_enable_map + map->metadata->grp_metadata[grp].enable_map_index + ++ map->metadata->grp_metadata[grp].blk_metadata[blk].enable_map_index + ++ (map->metadata->grp_metadata[grp].blk_metadata[blk].enable_map_stride * blk_inst); ++} + -+static const enum base_hw_issue base_hw_issues_tSIx_r0p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TSIX_1792, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++/** ++ * kbase_hwcnt_bitfield_count() - Calculate the number of u64 bitfields required ++ * to have at minimum one bit per value. ++ * @val_cnt: Number of values. ++ * ++ * Return: Number of required bitfields. ++ */ ++static inline size_t kbase_hwcnt_bitfield_count(size_t val_cnt) ++{ ++ return (val_cnt + KBASE_HWCNT_BITFIELD_BITS - 1) / KBASE_HWCNT_BITFIELD_BITS; ++} + -+static const enum base_hw_issue base_hw_issues_tSIx_r1p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++/** ++ * kbase_hwcnt_enable_map_block_disable_all() - Disable all values in a block. ++ * @dst: Non-NULL pointer to enable map. ++ * @grp: Index of the group in the metadata. ++ * @blk: Index of the block in the group. ++ * @blk_inst: Index of the block instance in the block. ++ */ ++static inline void kbase_hwcnt_enable_map_block_disable_all(struct kbase_hwcnt_enable_map *dst, ++ size_t grp, size_t blk, size_t blk_inst) ++{ ++ size_t val_cnt; ++ size_t bitfld_cnt; ++ u64 *const block_enable_map = ++ kbase_hwcnt_enable_map_block_instance(dst, grp, blk, blk_inst); + -+static const enum base_hw_issue base_hw_issues_tSIx_r1p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ if (WARN_ON(!dst)) ++ return; + -+static const enum base_hw_issue base_hw_issues_model_tSIx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ val_cnt = kbase_hwcnt_metadata_block_values_count(dst->metadata, grp, blk); ++ bitfld_cnt = kbase_hwcnt_bitfield_count(val_cnt); + -+static const enum base_hw_issue base_hw_issues_tDVx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ memset(block_enable_map, 0, bitfld_cnt * KBASE_HWCNT_BITFIELD_BYTES); ++} + -+static const enum base_hw_issue base_hw_issues_model_tDVx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++/** ++ * kbase_hwcnt_enable_map_disable_all() - Disable all values in the enable map. ++ * @dst: Non-NULL pointer to enable map to zero. ++ */ ++static inline void kbase_hwcnt_enable_map_disable_all(struct kbase_hwcnt_enable_map *dst) ++{ ++ if (WARN_ON(!dst) || WARN_ON(!dst->metadata)) ++ return; + -+static const enum base_hw_issue base_hw_issues_tNOx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TNOX_1194, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ if (dst->hwcnt_enable_map != NULL) ++ memset(dst->hwcnt_enable_map, 0, dst->metadata->enable_map_bytes); + -+static const enum base_hw_issue base_hw_issues_model_tNOx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ dst->clk_enable_map = 0; ++} + -+static const enum base_hw_issue base_hw_issues_tGOx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TNOX_1194, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++/** ++ * kbase_hwcnt_enable_map_block_enable_all() - Enable all values in a block. ++ * @dst: Non-NULL pointer to enable map. ++ * @grp: Index of the group in the metadata. ++ * @blk: Index of the block in the group. ++ * @blk_inst: Index of the block instance in the block. ++ */ ++static inline void kbase_hwcnt_enable_map_block_enable_all(struct kbase_hwcnt_enable_map *dst, ++ size_t grp, size_t blk, size_t blk_inst) ++{ ++ size_t val_cnt; ++ size_t bitfld_cnt; ++ u64 *const block_enable_map = ++ kbase_hwcnt_enable_map_block_instance(dst, grp, blk, blk_inst); ++ size_t bitfld_idx; + -+static const enum base_hw_issue base_hw_issues_tGOx_r1p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TGOX_R1_1234, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ if (WARN_ON(!dst)) ++ return; + -+static const enum base_hw_issue base_hw_issues_model_tGOx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ val_cnt = kbase_hwcnt_metadata_block_values_count(dst->metadata, grp, blk); ++ bitfld_cnt = kbase_hwcnt_bitfield_count(val_cnt); + -+static const enum base_hw_issue base_hw_issues_tTRx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, -+ BASE_HW_ISSUE_TTRX_3076, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_TTRX_3485, -+ BASE_HW_ISSUE_END -+}; ++ for (bitfld_idx = 0; bitfld_idx < bitfld_cnt; bitfld_idx++) { ++ const u64 remaining_values = val_cnt - (bitfld_idx * KBASE_HWCNT_BITFIELD_BITS); ++ u64 block_enable_map_mask = U64_MAX; + -+static const enum base_hw_issue base_hw_issues_tTRx_r0p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, -+ BASE_HW_ISSUE_TTRX_3076, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_TTRX_3485, -+ BASE_HW_ISSUE_END -+}; ++ if (remaining_values < KBASE_HWCNT_BITFIELD_BITS) ++ block_enable_map_mask = (1ull << remaining_values) - 1; + -+static const enum base_hw_issue base_hw_issues_tTRx_r0p2[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, -+ BASE_HW_ISSUE_TTRX_3076, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ block_enable_map[bitfld_idx] = block_enable_map_mask; ++ } ++} + -+static const enum base_hw_issue base_hw_issues_model_tTRx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++/** ++ * kbase_hwcnt_enable_map_enable_all() - Enable all values in an enable ++ * map. ++ * @dst: Non-NULL pointer to enable map. ++ */ ++static inline void kbase_hwcnt_enable_map_enable_all(struct kbase_hwcnt_enable_map *dst) ++{ ++ size_t grp, blk, blk_inst; + -+static const enum base_hw_issue base_hw_issues_tNAx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, -+ BASE_HW_ISSUE_TTRX_3076, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_TTRX_3485, -+ BASE_HW_ISSUE_END -+}; ++ if (WARN_ON(!dst) || WARN_ON(!dst->metadata)) ++ return; + -+static const enum base_hw_issue base_hw_issues_tNAx_r0p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, -+ BASE_HW_ISSUE_TTRX_3076, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_GPU2017_1336, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ kbase_hwcnt_metadata_for_each_block(dst->metadata, grp, blk, blk_inst) ++ kbase_hwcnt_enable_map_block_enable_all(dst, grp, blk, blk_inst); + -+static const enum base_hw_issue base_hw_issues_model_tNAx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ dst->clk_enable_map = (1ull << dst->metadata->clk_cnt) - 1; ++} + -+static const enum base_hw_issue base_hw_issues_tBEx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_TTRX_3485, -+ BASE_HW_ISSUE_END -+}; ++/** ++ * kbase_hwcnt_enable_map_copy() - Copy an enable map to another. ++ * @dst: Non-NULL pointer to destination enable map. ++ * @src: Non-NULL pointer to source enable map. ++ * ++ * The dst and src MUST have been created from the same metadata. ++ */ ++static inline void kbase_hwcnt_enable_map_copy(struct kbase_hwcnt_enable_map *dst, ++ const struct kbase_hwcnt_enable_map *src) ++{ ++ if (WARN_ON(!dst) || WARN_ON(!src) || WARN_ON(!dst->metadata) || ++ WARN_ON(dst->metadata != src->metadata)) ++ return; + -+static const enum base_hw_issue base_hw_issues_tBEx_r0p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ if (dst->hwcnt_enable_map != NULL) { ++ if (WARN_ON(!src->hwcnt_enable_map)) ++ return; + -+static const enum base_hw_issue base_hw_issues_tBEx_r1p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ memcpy(dst->hwcnt_enable_map, src->hwcnt_enable_map, ++ dst->metadata->enable_map_bytes); ++ } + -+static const enum base_hw_issue base_hw_issues_tBEx_r1p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ dst->clk_enable_map = src->clk_enable_map; ++} + -+static const enum base_hw_issue base_hw_issues_model_tBEx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++/** ++ * kbase_hwcnt_enable_map_union() - Union dst and src enable maps into dst. ++ * @dst: Non-NULL pointer to destination enable map. ++ * @src: Non-NULL pointer to source enable map. ++ * ++ * The dst and src MUST have been created from the same metadata. ++ */ ++static inline void kbase_hwcnt_enable_map_union(struct kbase_hwcnt_enable_map *dst, ++ const struct kbase_hwcnt_enable_map *src) ++{ ++ if (WARN_ON(!dst) || WARN_ON(!src) || WARN_ON(!dst->metadata) || ++ WARN_ON(dst->metadata != src->metadata)) ++ return; + -+static const enum base_hw_issue base_hw_issues_lBEx_r1p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_TTRX_3485, -+ BASE_HW_ISSUE_END -+}; ++ if (dst->hwcnt_enable_map != NULL) { ++ size_t i; ++ size_t const bitfld_count = ++ dst->metadata->enable_map_bytes / KBASE_HWCNT_BITFIELD_BYTES; + -+static const enum base_hw_issue base_hw_issues_lBEx_r1p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ if (WARN_ON(!src->hwcnt_enable_map)) ++ return; + -+static const enum base_hw_issue base_hw_issues_tBAx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ for (i = 0; i < bitfld_count; i++) ++ dst->hwcnt_enable_map[i] |= src->hwcnt_enable_map[i]; ++ } + -+static const enum base_hw_issue base_hw_issues_tBAx_r1p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++ dst->clk_enable_map |= src->clk_enable_map; ++} + -+static const enum base_hw_issue base_hw_issues_model_tBAx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_TTRX_3470, -+ BASE_HW_ISSUE_TTRX_3464, -+ BASE_HW_ISSUE_END -+}; ++/** ++ * kbase_hwcnt_enable_map_block_enabled() - Check if any values in a block ++ * instance are enabled. ++ * @enable_map: Non-NULL pointer to enable map. ++ * @grp: Index of the group in the metadata. ++ * @blk: Index of the block in the group. ++ * @blk_inst: Index of the block instance in the block. ++ * ++ * Return: true if any values in the block are enabled, else false. ++ */ ++static inline bool ++kbase_hwcnt_enable_map_block_enabled(const struct kbase_hwcnt_enable_map *enable_map, size_t grp, ++ size_t blk, size_t blk_inst) ++{ ++ bool any_enabled = false; ++ size_t val_cnt; ++ size_t bitfld_cnt; ++ const u64 *const block_enable_map = ++ kbase_hwcnt_enable_map_block_instance(enable_map, grp, blk, blk_inst); ++ size_t bitfld_idx; + -+static const enum base_hw_issue base_hw_issues_tDUx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_END -+}; ++ if (WARN_ON(!enable_map)) ++ return false; + -+static const enum base_hw_issue base_hw_issues_model_tDUx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_END -+}; ++ val_cnt = kbase_hwcnt_metadata_block_values_count(enable_map->metadata, grp, blk); ++ bitfld_cnt = kbase_hwcnt_bitfield_count(val_cnt); + -+static const enum base_hw_issue base_hw_issues_tODx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_GPU2019_3212, -+ BASE_HW_ISSUE_END -+}; ++ for (bitfld_idx = 0; bitfld_idx < bitfld_cnt; bitfld_idx++) { ++ const u64 remaining_values = val_cnt - (bitfld_idx * KBASE_HWCNT_BITFIELD_BITS); ++ u64 block_enable_map_mask = U64_MAX; + -+static const enum base_hw_issue base_hw_issues_model_tODx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_GPU2019_3212, -+ BASE_HW_ISSUE_END -+}; ++ if (remaining_values < KBASE_HWCNT_BITFIELD_BITS) ++ block_enable_map_mask = (1ull << remaining_values) - 1; + -+static const enum base_hw_issue base_hw_issues_tGRx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_GPU2019_3212, -+ BASE_HW_ISSUE_END -+}; ++ any_enabled = any_enabled || (block_enable_map[bitfld_idx] & block_enable_map_mask); ++ } + -+static const enum base_hw_issue base_hw_issues_model_tGRx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_GPU2019_3212, -+ BASE_HW_ISSUE_END -+}; ++ return any_enabled; ++} + -+static const enum base_hw_issue base_hw_issues_tVAx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_GPU2019_3212, -+ BASE_HW_ISSUE_END -+}; ++/** ++ * kbase_hwcnt_enable_map_any_enabled() - Check if any values are enabled. ++ * @enable_map: Non-NULL pointer to enable map. ++ * ++ * Return: true if any values are enabled, else false. ++ */ ++static inline bool ++kbase_hwcnt_enable_map_any_enabled(const struct kbase_hwcnt_enable_map *enable_map) ++{ ++ size_t grp, blk, blk_inst; ++ u64 clk_enable_map_mask; + -+static const enum base_hw_issue base_hw_issues_model_tVAx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_GPU2019_3212, -+ BASE_HW_ISSUE_END -+}; ++ if (WARN_ON(!enable_map) || WARN_ON(!enable_map->metadata)) ++ return false; + -+static const enum base_hw_issue base_hw_issues_tTUx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_GPU2019_3212, -+ BASE_HW_ISSUE_END -+}; ++ clk_enable_map_mask = (1ull << enable_map->metadata->clk_cnt) - 1; + -+static const enum base_hw_issue base_hw_issues_model_tTUx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_GPU2019_3212, -+ BASE_HW_ISSUE_END -+}; ++ if (enable_map->metadata->clk_cnt > 0 && (enable_map->clk_enable_map & clk_enable_map_mask)) ++ return true; + -+static const enum base_hw_issue base_hw_issues_tE2x_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_921, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_GPU2019_3212, -+ BASE_HW_ISSUE_END -+}; ++ kbase_hwcnt_metadata_for_each_block(enable_map->metadata, grp, blk, blk_inst) ++ { ++ if (kbase_hwcnt_enable_map_block_enabled(enable_map, grp, blk, blk_inst)) ++ return true; ++ } + -+static const enum base_hw_issue base_hw_issues_model_tE2x[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TSIX_2033, -+ BASE_HW_ISSUE_TTRX_1337, -+ BASE_HW_ISSUE_TTRX_3414, -+ BASE_HW_ISSUE_TTRX_3083, -+ BASE_HW_ISSUE_GPU2019_3212, -+ BASE_HW_ISSUE_END -+}; ++ return false; ++} + -+#endif /* _BASE_HWCONFIG_ISSUES_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_base_kernel.h b/drivers/gpu/arm/bifrost/mali_base_kernel.h -new file mode 100755 -index 000000000000..086171adb6e5 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_base_kernel.h -@@ -0,0 +1,807 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 ++/** ++ * kbase_hwcnt_enable_map_block_value_enabled() - Check if a value in a block ++ * instance is enabled. ++ * @bitfld: Non-NULL pointer to the block bitfield(s) obtained from a call to ++ * kbase_hwcnt_enable_map_block_instance. ++ * @val_idx: Index of the value to check in the block instance. + * ++ * Return: true if the value was enabled, else false. + */ ++static inline bool kbase_hwcnt_enable_map_block_value_enabled(const u64 *bitfld, size_t val_idx) ++{ ++ const size_t idx = val_idx / KBASE_HWCNT_BITFIELD_BITS; ++ const size_t bit = val_idx % KBASE_HWCNT_BITFIELD_BITS; ++ const u64 mask = 1ull << bit; + ++ return (bitfld[idx] & mask) != 0; ++} + -+ -+/* -+ * Base structures shared with the kernel. ++/** ++ * kbase_hwcnt_enable_map_block_enable_value() - Enable a value in a block ++ * instance. ++ * @bitfld: Non-NULL pointer to the block bitfield(s) obtained from a call to ++ * kbase_hwcnt_enable_map_block_instance. ++ * @val_idx: Index of the value to enable in the block instance. + */ ++static inline void kbase_hwcnt_enable_map_block_enable_value(u64 *bitfld, size_t val_idx) ++{ ++ const size_t idx = val_idx / KBASE_HWCNT_BITFIELD_BITS; ++ const size_t bit = val_idx % KBASE_HWCNT_BITFIELD_BITS; ++ const u64 mask = 1ull << bit; + -+#ifndef _BASE_KERNEL_H_ -+#define _BASE_KERNEL_H_ -+ -+struct base_mem_handle { -+ struct { -+ u64 handle; -+ } basep; -+}; -+ -+#include "mali_base_mem_priv.h" -+#include "gpu/mali_kbase_gpu_coherency.h" -+#include "gpu/mali_kbase_gpu_id.h" -+ -+#define BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS 4 -+ -+#define BASE_MAX_COHERENT_GROUPS 16 -+ -+#if defined CDBG_ASSERT -+#define LOCAL_ASSERT CDBG_ASSERT -+#elif defined KBASE_DEBUG_ASSERT -+#define LOCAL_ASSERT KBASE_DEBUG_ASSERT -+#else -+#error assert macro not defined! -+#endif -+ -+#if defined(PAGE_MASK) && defined(PAGE_SHIFT) -+#define LOCAL_PAGE_SHIFT PAGE_SHIFT -+#define LOCAL_PAGE_LSB ~PAGE_MASK -+#else -+#include -+ -+#if defined OSU_CONFIG_CPU_PAGE_SIZE_LOG2 -+#define LOCAL_PAGE_SHIFT OSU_CONFIG_CPU_PAGE_SIZE_LOG2 -+#define LOCAL_PAGE_LSB ((1ul << OSU_CONFIG_CPU_PAGE_SIZE_LOG2) - 1) -+#else -+#error Failed to find page size -+#endif -+#endif ++ bitfld[idx] |= mask; ++} + -+/* Physical memory group ID for normal usage. ++/** ++ * kbase_hwcnt_enable_map_block_disable_value() - Disable a value in a block ++ * instance. ++ * @bitfld: Non-NULL pointer to the block bitfield(s) obtained from a call to ++ * kbase_hwcnt_enable_map_block_instance. ++ * @val_idx: Index of the value to disable in the block instance. + */ -+#define BASE_MEM_GROUP_DEFAULT (0) ++static inline void kbase_hwcnt_enable_map_block_disable_value(u64 *bitfld, size_t val_idx) ++{ ++ const size_t idx = val_idx / KBASE_HWCNT_BITFIELD_BITS; ++ const size_t bit = val_idx % KBASE_HWCNT_BITFIELD_BITS; ++ const u64 mask = 1ull << bit; + -+/* Number of physical memory groups. -+ */ -+#define BASE_MEM_GROUP_COUNT (16) ++ bitfld[idx] &= ~mask; ++} + +/** -+ * typedef base_mem_alloc_flags - Memory allocation, access/hint flags. ++ * kbase_hwcnt_dump_buffer_alloc() - Allocate a dump buffer. ++ * @metadata: Non-NULL pointer to metadata describing the system. ++ * @dump_buf: Non-NULL pointer to dump buffer to be initialised. Will be ++ * initialised to undefined values, so must be used as a copy dest, ++ * or cleared before use. + * -+ * A combination of MEM_PROT/MEM_HINT flags must be passed to each allocator -+ * in order to determine the best cache policy. Some combinations are -+ * of course invalid (e.g. MEM_PROT_CPU_WR | MEM_HINT_CPU_RD), -+ * which defines a write-only region on the CPU side, which is -+ * heavily read by the CPU... -+ * Other flags are only meaningful to a particular allocator. -+ * More flags can be added to this list, as long as they don't clash -+ * (see BASE_MEM_FLAGS_NR_BITS for the number of the first free bit). -+ */ -+typedef u32 base_mem_alloc_flags; -+ -+/* A mask for all the flags which are modifiable via the base_mem_set_flags -+ * interface. ++ * Return: 0 on success, else error code. + */ -+#define BASE_MEM_FLAGS_MODIFIABLE \ -+ (BASE_MEM_DONT_NEED | BASE_MEM_COHERENT_SYSTEM | \ -+ BASE_MEM_COHERENT_LOCAL) ++int kbase_hwcnt_dump_buffer_alloc(const struct kbase_hwcnt_metadata *metadata, ++ struct kbase_hwcnt_dump_buffer *dump_buf); + -+/* A mask of all the flags that can be returned via the base_mem_get_flags() -+ * interface. ++/** ++ * kbase_hwcnt_dump_buffer_free() - Free a dump buffer. ++ * @dump_buf: Dump buffer to be freed. ++ * ++ * Can be safely called on an all-zeroed dump buffer structure, or on an already ++ * freed dump buffer. + */ -+#define BASE_MEM_FLAGS_QUERYABLE \ -+ (BASE_MEM_FLAGS_INPUT_MASK & ~(BASE_MEM_SAME_VA | \ -+ BASE_MEM_COHERENT_SYSTEM_REQUIRED | BASE_MEM_DONT_NEED | \ -+ BASE_MEM_IMPORT_SHARED | BASE_MEM_FLAGS_RESERVED | \ -+ BASEP_MEM_FLAGS_KERNEL_ONLY)) ++void kbase_hwcnt_dump_buffer_free(struct kbase_hwcnt_dump_buffer *dump_buf); + +/** -+ * enum base_mem_import_type - Memory types supported by @a base_mem_import -+ * -+ * @BASE_MEM_IMPORT_TYPE_INVALID: Invalid type -+ * @BASE_MEM_IMPORT_TYPE_UMM: UMM import. Handle type is a file descriptor (int) -+ * @BASE_MEM_IMPORT_TYPE_USER_BUFFER: User buffer import. Handle is a -+ * base_mem_import_user_buffer ++ * kbase_hwcnt_dump_buffer_array_alloc() - Allocate an array of dump buffers. ++ * @metadata: Non-NULL pointer to metadata describing the system. ++ * @n: Number of dump buffers to allocate ++ * @dump_bufs: Non-NULL pointer to dump buffer array to be initialised. + * -+ * Each type defines what the supported handle type is. ++ * A single zeroed contiguous page allocation will be used for all of the ++ * buffers inside the array, where: ++ * dump_bufs[n].dump_buf == page_addr + n * metadata.dump_buf_bytes + * -+ * If any new type is added here ARM must be contacted -+ * to allocate a numeric value for it. -+ * Do not just add a new type without synchronizing with ARM -+ * as future releases from ARM might include other new types -+ * which could clash with your custom types. ++ * Return: 0 on success, else error code. + */ -+enum base_mem_import_type { -+ BASE_MEM_IMPORT_TYPE_INVALID = 0, -+ /** -+ * Import type with value 1 is deprecated. -+ */ -+ BASE_MEM_IMPORT_TYPE_UMM = 2, -+ BASE_MEM_IMPORT_TYPE_USER_BUFFER = 3 -+}; ++int kbase_hwcnt_dump_buffer_array_alloc(const struct kbase_hwcnt_metadata *metadata, size_t n, ++ struct kbase_hwcnt_dump_buffer_array *dump_bufs); + +/** -+ * struct base_mem_import_user_buffer - Handle of an imported user buffer ++ * kbase_hwcnt_dump_buffer_array_free() - Free a dump buffer array. ++ * @dump_bufs: Dump buffer array to be freed. + * -+ * @ptr: address of imported user buffer -+ * @length: length of imported user buffer in bytes ++ * Can be safely called on an all-zeroed dump buffer array structure, or on an ++ * already freed dump buffer array. ++ */ ++void kbase_hwcnt_dump_buffer_array_free(struct kbase_hwcnt_dump_buffer_array *dump_bufs); ++ ++/** ++ * kbase_hwcnt_dump_buffer_block_instance() - Get the pointer to a block ++ * instance's dump buffer. ++ * @buf: Non-NULL pointer to dump buffer. ++ * @grp: Index of the group in the metadata. ++ * @blk: Index of the block in the group. ++ * @blk_inst: Index of the block instance in the block. + * -+ * This structure is used to represent a handle of an imported user buffer. ++ * Return: u64* to the dump buffer for the block instance. + */ ++static inline u64 *kbase_hwcnt_dump_buffer_block_instance(const struct kbase_hwcnt_dump_buffer *buf, ++ size_t grp, size_t blk, size_t blk_inst) ++{ ++ if (WARN_ON(!buf) || WARN_ON(!buf->dump_buf)) ++ return NULL; + -+struct base_mem_import_user_buffer { -+ u64 ptr; -+ u64 length; -+}; ++ if (WARN_ON(!buf->metadata) || WARN_ON(grp >= buf->metadata->grp_cnt) || ++ WARN_ON(blk >= buf->metadata->grp_metadata[grp].blk_cnt) || ++ WARN_ON(blk_inst >= buf->metadata->grp_metadata[grp].blk_metadata[blk].inst_cnt)) ++ return buf->dump_buf; + -+/* Mask to detect 4GB boundary alignment */ -+#define BASE_MEM_MASK_4GB 0xfffff000UL -+/* Mask to detect 4GB boundary (in page units) alignment */ -+#define BASE_MEM_PFN_MASK_4GB (BASE_MEM_MASK_4GB >> LOCAL_PAGE_SHIFT) ++ return buf->dump_buf + buf->metadata->grp_metadata[grp].dump_buf_index + ++ buf->metadata->grp_metadata[grp].blk_metadata[blk].dump_buf_index + ++ (buf->metadata->grp_metadata[grp].blk_metadata[blk].dump_buf_stride * blk_inst); ++} + -+/* Limit on the 'extent' parameter for an allocation with the -+ * BASE_MEM_TILER_ALIGN_TOP flag set ++/** ++ * kbase_hwcnt_dump_buffer_zero() - Zero all enabled values in dst. ++ * After the operation, all non-enabled values ++ * will be undefined. ++ * @dst: Non-NULL pointer to dump buffer. ++ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. + * -+ * This is the same as the maximum limit for a Buffer Descriptor's chunk size ++ * The dst and dst_enable_map MUST have been created from the same metadata. + */ -+#define BASE_MEM_TILER_ALIGN_TOP_EXTENT_MAX_PAGES_LOG2 \ -+ (21u - (LOCAL_PAGE_SHIFT)) -+#define BASE_MEM_TILER_ALIGN_TOP_EXTENT_MAX_PAGES \ -+ (1ull << (BASE_MEM_TILER_ALIGN_TOP_EXTENT_MAX_PAGES_LOG2)) ++void kbase_hwcnt_dump_buffer_zero(struct kbase_hwcnt_dump_buffer *dst, ++ const struct kbase_hwcnt_enable_map *dst_enable_map); + -+/* Bit mask of cookies used for for memory allocation setup */ -+#define KBASE_COOKIE_MASK ~1UL /* bit 0 is reserved */ ++/** ++ * kbase_hwcnt_dump_buffer_block_zero() - Zero all values in a block. ++ * @dst_blk: Non-NULL pointer to dst block obtained from a call to ++ * kbase_hwcnt_dump_buffer_block_instance. ++ * @val_cnt: Number of values in the block. ++ */ ++static inline void kbase_hwcnt_dump_buffer_block_zero(u64 *dst_blk, size_t val_cnt) ++{ ++ if (WARN_ON(!dst_blk)) ++ return; + -+/* Maximum size allowed in a single KBASE_IOCTL_MEM_ALLOC call */ -+#define KBASE_MEM_ALLOC_MAX_SIZE ((8ull << 30) >> PAGE_SHIFT) /* 8 GB */ ++ memset(dst_blk, 0, (val_cnt * KBASE_HWCNT_VALUE_BYTES)); ++} + +/** -+ * struct base_fence - Cross-device synchronisation fence. -+ * -+ * A fence is used to signal when the GPU has finished accessing a resource that -+ * may be shared with other devices, and also to delay work done asynchronously -+ * by the GPU until other devices have finished accessing a shared resource. ++ * kbase_hwcnt_dump_buffer_zero_strict() - Zero all values in dst. ++ * After the operation, all values ++ * (including padding bytes) will be ++ * zero. ++ * Slower than the non-strict variant. ++ * @dst: Non-NULL pointer to dump buffer. + */ -+struct base_fence { -+ struct { -+ int fd; -+ int stream_fd; -+ } basep; -+}; ++void kbase_hwcnt_dump_buffer_zero_strict(struct kbase_hwcnt_dump_buffer *dst); + +/** -+ * struct base_mem_aliasing_info - Memory aliasing info -+ * -+ * Describes a memory handle to be aliased. -+ * A subset of the handle can be chosen for aliasing, given an offset and a -+ * length. -+ * A special handle BASE_MEM_WRITE_ALLOC_PAGES_HANDLE is used to represent a -+ * region where a special page is mapped with a write-alloc cache setup, -+ * typically used when the write result of the GPU isn't needed, but the GPU -+ * must write anyway. -+ * -+ * Offset and length are specified in pages. -+ * Offset must be within the size of the handle. -+ * Offset+length must not overrun the size of the handle. ++ * kbase_hwcnt_dump_buffer_zero_non_enabled() - Zero all non-enabled values in ++ * dst (including padding bytes and ++ * unavailable blocks). ++ * After the operation, all enabled ++ * values will be unchanged. ++ * @dst: Non-NULL pointer to dump buffer. ++ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. + * -+ * @handle: Handle to alias, can be BASE_MEM_WRITE_ALLOC_PAGES_HANDLE -+ * @offset: Offset within the handle to start aliasing from, in pages. -+ * Not used with BASE_MEM_WRITE_ALLOC_PAGES_HANDLE. -+ * @length: Length to alias, in pages. For BASE_MEM_WRITE_ALLOC_PAGES_HANDLE -+ * specifies the number of times the special page is needed. ++ * The dst and dst_enable_map MUST have been created from the same metadata. + */ -+struct base_mem_aliasing_info { -+ struct base_mem_handle handle; -+ u64 offset; -+ u64 length; -+}; ++void kbase_hwcnt_dump_buffer_zero_non_enabled(struct kbase_hwcnt_dump_buffer *dst, ++ const struct kbase_hwcnt_enable_map *dst_enable_map); + -+/* Maximum percentage of just-in-time memory allocation trimming to perform -+ * on free. ++/** ++ * kbase_hwcnt_dump_buffer_block_zero_non_enabled() - Zero all non-enabled ++ * values in a block. ++ * After the operation, all ++ * enabled values will be ++ * unchanged. ++ * @dst_blk: Non-NULL pointer to dst block obtained from a call to ++ * kbase_hwcnt_dump_buffer_block_instance. ++ * @blk_em: Non-NULL pointer to the block bitfield(s) obtained from a call to ++ * kbase_hwcnt_enable_map_block_instance. ++ * @val_cnt: Number of values in the block. + */ -+#define BASE_JIT_MAX_TRIM_LEVEL (100) ++static inline void kbase_hwcnt_dump_buffer_block_zero_non_enabled(u64 *dst_blk, const u64 *blk_em, ++ size_t val_cnt) ++{ ++ size_t val; + -+/* Maximum number of concurrent just-in-time memory allocations. -+ */ -+#define BASE_JIT_ALLOC_COUNT (255) ++ if (WARN_ON(!dst_blk)) ++ return; + -+/* base_jit_alloc_info in use for kernel driver versions 10.2 to early 11.5 -+ * -+ * jit_version is 1 -+ * -+ * Due to the lack of padding specified, user clients between 32 and 64-bit -+ * may have assumed a different size of the struct -+ * -+ * An array of structures was not supported -+ */ -+struct base_jit_alloc_info_10_2 { -+ u64 gpu_alloc_addr; -+ u64 va_pages; -+ u64 commit_pages; -+ u64 extent; -+ u8 id; -+}; ++ for (val = 0; val < val_cnt; val++) { ++ if (!kbase_hwcnt_enable_map_block_value_enabled(blk_em, val)) ++ dst_blk[val] = 0; ++ } ++} + -+/* base_jit_alloc_info introduced by kernel driver version 11.5, and in use up -+ * to 11.19 -+ * -+ * This structure had a number of modifications during and after kernel driver -+ * version 11.5, but remains size-compatible throughout its version history, and -+ * with earlier variants compatible with future variants by requiring -+ * zero-initialization to the unused space in the structure. -+ * -+ * jit_version is 2 ++/** ++ * kbase_hwcnt_dump_buffer_copy() - Copy all enabled values from src to dst. ++ * After the operation, all non-enabled values ++ * will be undefined. ++ * @dst: Non-NULL pointer to dst dump buffer. ++ * @src: Non-NULL pointer to src dump buffer. ++ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. + * -+ * Kernel driver version history: -+ * 11.5: Initial introduction with 'usage_id' and padding[5]. All padding bytes -+ * must be zero. Kbase minor version was not incremented, so some -+ * versions of 11.5 do not have this change. -+ * 11.5: Added 'bin_id' and 'max_allocations', replacing 2 padding bytes (Kbase -+ * minor version not incremented) -+ * 11.6: Added 'flags', replacing 1 padding byte -+ * 11.10: Arrays of this structure are supported ++ * The dst, src, and dst_enable_map MUST have been created from the same ++ * metadata. + */ -+struct base_jit_alloc_info_11_5 { -+ u64 gpu_alloc_addr; -+ u64 va_pages; -+ u64 commit_pages; -+ u64 extent; -+ u8 id; -+ u8 bin_id; -+ u8 max_allocations; -+ u8 flags; -+ u8 padding[2]; -+ u16 usage_id; -+}; ++void kbase_hwcnt_dump_buffer_copy(struct kbase_hwcnt_dump_buffer *dst, ++ const struct kbase_hwcnt_dump_buffer *src, ++ const struct kbase_hwcnt_enable_map *dst_enable_map); + +/** -+ * struct base_jit_alloc_info - Structure which describes a JIT allocation -+ * request. -+ * @gpu_alloc_addr: The GPU virtual address to write the JIT -+ * allocated GPU virtual address to. -+ * @va_pages: The minimum number of virtual pages required. -+ * @commit_pages: The minimum number of physical pages which -+ * should back the allocation. -+ * @extent: Granularity of physical pages to grow the -+ * allocation by during a fault. -+ * @id: Unique ID provided by the caller, this is used -+ * to pair allocation and free requests. -+ * Zero is not a valid value. -+ * @bin_id: The JIT allocation bin, used in conjunction with -+ * @max_allocations to limit the number of each -+ * type of JIT allocation. -+ * @max_allocations: The maximum number of allocations allowed within -+ * the bin specified by @bin_id. Should be the same -+ * for all allocations within the same bin. -+ * @flags: flags specifying the special requirements for -+ * the JIT allocation, see -+ * %BASE_JIT_ALLOC_VALID_FLAGS -+ * @padding: Expansion space - should be initialised to zero -+ * @usage_id: A hint about which allocation should be reused. -+ * The kernel should attempt to use a previous -+ * allocation with the same usage_id -+ * @heap_info_gpu_addr: Pointer to an object in GPU memory describing -+ * the actual usage of the region. -+ * -+ * jit_version is 3. -+ * -+ * When modifications are made to this structure, it is still compatible with -+ * jit_version 3 when: a) the size is unchanged, and b) new members only -+ * replace the padding bytes. -+ * -+ * Previous jit_version history: -+ * jit_version == 1, refer to &base_jit_alloc_info_10_2 -+ * jit_version == 2, refer to &base_jit_alloc_info_11_5 -+ * -+ * Kbase version history: -+ * 11.20: added @heap_info_gpu_addr ++ * kbase_hwcnt_dump_buffer_block_copy() - Copy all block values from src to dst. ++ * @dst_blk: Non-NULL pointer to dst block obtained from a call to ++ * kbase_hwcnt_dump_buffer_block_instance. ++ * @src_blk: Non-NULL pointer to src block obtained from a call to ++ * kbase_hwcnt_dump_buffer_block_instance. ++ * @val_cnt: Number of values in the block. + */ -+struct base_jit_alloc_info { -+ u64 gpu_alloc_addr; -+ u64 va_pages; -+ u64 commit_pages; -+ u64 extent; -+ u8 id; -+ u8 bin_id; -+ u8 max_allocations; -+ u8 flags; -+ u8 padding[2]; -+ u16 usage_id; -+ u64 heap_info_gpu_addr; -+}; -+ -+enum base_external_resource_access { -+ BASE_EXT_RES_ACCESS_SHARED, -+ BASE_EXT_RES_ACCESS_EXCLUSIVE -+}; -+ -+struct base_external_resource { -+ u64 ext_resource; -+}; ++static inline void kbase_hwcnt_dump_buffer_block_copy(u64 *dst_blk, const u64 *src_blk, ++ size_t val_cnt) ++{ ++ if (WARN_ON(!dst_blk) || WARN_ON(!src_blk)) ++ return; + ++ /* Copy all the counters in the block instance. ++ * Values of non-enabled counters are undefined. ++ */ ++ memcpy(dst_blk, src_blk, (val_cnt * KBASE_HWCNT_VALUE_BYTES)); ++} + +/** -+ * The maximum number of external resources which can be mapped/unmapped -+ * in a single request. ++ * kbase_hwcnt_dump_buffer_copy_strict() - Copy all enabled values from src to ++ * dst. ++ * After the operation, all non-enabled ++ * values (including padding bytes) will ++ * be zero. ++ * Slower than the non-strict variant. ++ * @dst: Non-NULL pointer to dst dump buffer. ++ * @src: Non-NULL pointer to src dump buffer. ++ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. ++ * ++ * The dst, src, and dst_enable_map MUST have been created from the same ++ * metadata. + */ -+#define BASE_EXT_RES_COUNT_MAX 10 ++void kbase_hwcnt_dump_buffer_copy_strict(struct kbase_hwcnt_dump_buffer *dst, ++ const struct kbase_hwcnt_dump_buffer *src, ++ const struct kbase_hwcnt_enable_map *dst_enable_map); + +/** -+ * struct base_external_resource_list - Structure which describes a list of -+ * external resources. -+ * @count: The number of resources. -+ * @ext_res: Array of external resources which is -+ * sized at allocation time. ++ * kbase_hwcnt_dump_buffer_block_copy_strict() - Copy all enabled block values ++ * from src to dst. ++ * After the operation, all ++ * non-enabled values will be ++ * zero. ++ * @dst_blk: Non-NULL pointer to dst block obtained from a call to ++ * kbase_hwcnt_dump_buffer_block_instance. ++ * @src_blk: Non-NULL pointer to src block obtained from a call to ++ * kbase_hwcnt_dump_buffer_block_instance. ++ * @blk_em: Non-NULL pointer to the block bitfield(s) obtained from a call to ++ * kbase_hwcnt_enable_map_block_instance. ++ * @val_cnt: Number of values in the block. ++ * ++ * After the copy, any disabled values in dst will be zero. + */ -+struct base_external_resource_list { -+ u64 count; -+ struct base_external_resource ext_res[1]; -+}; ++static inline void kbase_hwcnt_dump_buffer_block_copy_strict(u64 *dst_blk, const u64 *src_blk, ++ const u64 *blk_em, size_t val_cnt) ++{ ++ size_t val; + -+struct base_jd_debug_copy_buffer { -+ u64 address; -+ u64 size; -+ struct base_external_resource extres; -+}; ++ if (WARN_ON(!dst_blk) || WARN_ON(!src_blk)) ++ return; + -+#define GPU_MAX_JOB_SLOTS 16 ++ for (val = 0; val < val_cnt; val++) { ++ bool val_enabled = kbase_hwcnt_enable_map_block_value_enabled(blk_em, val); ++ ++ dst_blk[val] = val_enabled ? src_blk[val] : 0; ++ } ++} + +/** -+ * User-side Base GPU Property Queries -+ * -+ * The User-side Base GPU Property Query interface encapsulates two -+ * sub-modules: -+ * -+ * - "Dynamic GPU Properties" -+ * - "Base Platform Config GPU Properties" -+ * -+ * Base only deals with properties that vary between different GPU -+ * implementations - the Dynamic GPU properties and the Platform Config -+ * properties. -+ * -+ * For properties that are constant for the GPU Architecture, refer to the -+ * GPU module. However, we will discuss their relevance here just to -+ * provide background information. -+ * -+ * About the GPU Properties in Base and GPU modules -+ * -+ * The compile-time properties (Platform Config, GPU Compile-time -+ * properties) are exposed as pre-processor macros. -+ * -+ * Complementing the compile-time properties are the Dynamic GPU -+ * Properties, which act as a conduit for the GPU Configuration -+ * Discovery. -+ * -+ * In general, the dynamic properties are present to verify that the platform -+ * has been configured correctly with the right set of Platform Config -+ * Compile-time Properties. -+ * -+ * As a consistent guide across the entire DDK, the choice for dynamic or -+ * compile-time should consider the following, in order: -+ * 1. Can the code be written so that it doesn't need to know the -+ * implementation limits at all? -+ * 2. If you need the limits, get the information from the Dynamic Property -+ * lookup. This should be done once as you fetch the context, and then cached -+ * as part of the context data structure, so it's cheap to access. -+ * 3. If there's a clear and arguable inefficiency in using Dynamic Properties, -+ * then use a Compile-Time Property (Platform Config, or GPU Compile-time -+ * property). Examples of where this might be sensible follow: -+ * - Part of a critical inner-loop -+ * - Frequent re-use throughout the driver, causing significant extra load -+ * instructions or control flow that would be worthwhile optimizing out. -+ * -+ * We cannot provide an exhaustive set of examples, neither can we provide a -+ * rule for every possible situation. Use common sense, and think about: what -+ * the rest of the driver will be doing; how the compiler might represent the -+ * value if it is a compile-time constant; whether an OEM shipping multiple -+ * devices would benefit much more from a single DDK binary, instead of -+ * insignificant micro-optimizations. -+ * -+ * Dynamic GPU Properties -+ * -+ * Dynamic GPU properties are presented in two sets: -+ * 1. the commonly used properties in @ref base_gpu_props, which have been -+ * unpacked from GPU register bitfields. -+ * 2. The full set of raw, unprocessed properties in gpu_raw_gpu_props -+ * (also a member of base_gpu_props). All of these are presented in -+ * the packed form, as presented by the GPU registers themselves. -+ * -+ * The raw properties in gpu_raw_gpu_props are necessary to -+ * allow a user of the Mali Tools (e.g. PAT) to determine "Why is this device -+ * behaving differently?". In this case, all information about the -+ * configuration is potentially useful, but it does not need to be processed -+ * by the driver. Instead, the raw registers can be processed by the Mali -+ * Tools software on the host PC. -+ * -+ * The properties returned extend the GPU Configuration Discovery -+ * registers. For example, GPU clock speed is not specified in the GPU -+ * Architecture, but is necessary for OpenCL's clGetDeviceInfo() function. -+ * -+ * The GPU properties are obtained by a call to -+ * base_get_gpu_props(). This simply returns a pointer to a const -+ * base_gpu_props structure. It is constant for the life of a base -+ * context. Multiple calls to base_get_gpu_props() to a base context -+ * return the same pointer to a constant structure. This avoids cache pollution -+ * of the common data. -+ * -+ * This pointer must not be freed, because it does not point to the start of a -+ * region allocated by the memory allocator; instead, just close the @ref -+ * base_context. -+ * -+ * -+ * Kernel Operation -+ * -+ * During Base Context Create time, user-side makes a single kernel call: -+ * - A call to fill user memory with GPU information structures -+ * -+ * The kernel-side will fill the provided the entire processed base_gpu_props -+ * structure, because this information is required in both -+ * user and kernel side; it does not make sense to decode it twice. -+ * -+ * Coherency groups must be derived from the bitmasks, but this can be done -+ * kernel side, and just once at kernel startup: Coherency groups must already -+ * be known kernel-side, to support chains that specify a 'Only Coherent Group' -+ * SW requirement, or 'Only Coherent Group with Tiler' SW requirement. -+ * -+ * Coherency Group calculation -+ * -+ * Creation of the coherent group data is done at device-driver startup, and so -+ * is one-time. This will most likely involve a loop with CLZ, shifting, and -+ * bit clearing on the L2_PRESENT mask, depending on whether the -+ * system is L2 Coherent. The number of shader cores is done by a -+ * population count, since faulty cores may be disabled during production, -+ * producing a non-contiguous mask. ++ * kbase_hwcnt_dump_buffer_accumulate() - Copy all enabled headers and ++ * accumulate all enabled counters from ++ * src to dst. ++ * After the operation, all non-enabled ++ * values will be undefined. ++ * @dst: Non-NULL pointer to dst dump buffer. ++ * @src: Non-NULL pointer to src dump buffer. ++ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. + * -+ * The memory requirements for this algorithm can be determined either by a u64 -+ * population count on the L2_PRESENT mask (a LUT helper already is -+ * required for the above), or simple assumption that there can be no more than -+ * 16 coherent groups, since core groups are typically 4 cores. ++ * The dst, src, and dst_enable_map MUST have been created from the same ++ * metadata. + */ ++void kbase_hwcnt_dump_buffer_accumulate(struct kbase_hwcnt_dump_buffer *dst, ++ const struct kbase_hwcnt_dump_buffer *src, ++ const struct kbase_hwcnt_enable_map *dst_enable_map); + -+#define BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS 4 -+ -+#define BASE_MAX_COHERENT_GROUPS 16 -+ -+struct mali_base_gpu_core_props { -+ /** -+ * Product specific value. -+ */ -+ u32 product_id; ++/** ++ * kbase_hwcnt_dump_buffer_block_accumulate() - Copy all block headers and ++ * accumulate all block counters ++ * from src to dst. ++ * @dst_blk: Non-NULL pointer to dst block obtained from a call to ++ * kbase_hwcnt_dump_buffer_block_instance. ++ * @src_blk: Non-NULL pointer to src block obtained from a call to ++ * kbase_hwcnt_dump_buffer_block_instance. ++ * @hdr_cnt: Number of headers in the block. ++ * @ctr_cnt: Number of counters in the block. ++ */ ++static inline void kbase_hwcnt_dump_buffer_block_accumulate(u64 *dst_blk, const u64 *src_blk, ++ size_t hdr_cnt, size_t ctr_cnt) ++{ ++ size_t ctr; + -+ /** -+ * Status of the GPU release. -+ * No defined values, but starts at 0 and increases by one for each -+ * release status (alpha, beta, EAC, etc.). -+ * 4 bit values (0-15). -+ */ -+ u16 version_status; ++ if (WARN_ON(!dst_blk) || WARN_ON(!src_blk)) ++ return; + -+ /** -+ * Minor release number of the GPU. "P" part of an "RnPn" release number. -+ * 8 bit values (0-255). ++ /* Copy all the headers in the block instance. ++ * Values of non-enabled headers are undefined. + */ -+ u16 minor_revision; ++ memcpy(dst_blk, src_blk, hdr_cnt * KBASE_HWCNT_VALUE_BYTES); + -+ /** -+ * Major release number of the GPU. "R" part of an "RnPn" release number. -+ * 4 bit values (0-15). ++ /* Accumulate all the counters in the block instance. ++ * Values of non-enabled counters are undefined. + */ -+ u16 major_revision; ++ for (ctr = hdr_cnt; ctr < ctr_cnt + hdr_cnt; ctr++) ++ dst_blk[ctr] += src_blk[ctr]; ++} + -+ u16 padding; ++/** ++ * kbase_hwcnt_dump_buffer_accumulate_strict() - Copy all enabled headers and ++ * accumulate all enabled counters ++ * from src to dst. ++ * After the operation, all ++ * non-enabled values (including ++ * padding bytes) will be zero. ++ * Slower than the non-strict ++ * variant. ++ * @dst: Non-NULL pointer to dst dump buffer. ++ * @src: Non-NULL pointer to src dump buffer. ++ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. ++ * ++ * The dst, src, and dst_enable_map MUST have been created from the same ++ * metadata. ++ */ ++void kbase_hwcnt_dump_buffer_accumulate_strict(struct kbase_hwcnt_dump_buffer *dst, ++ const struct kbase_hwcnt_dump_buffer *src, ++ const struct kbase_hwcnt_enable_map *dst_enable_map); + -+ /* The maximum GPU frequency. Reported to applications by -+ * clGetDeviceInfo() -+ */ -+ u32 gpu_freq_khz_max; ++/** ++ * kbase_hwcnt_dump_buffer_block_accumulate_strict() - Copy all enabled block ++ * headers and accumulate ++ * all block counters from ++ * src to dst. ++ * After the operation, all ++ * non-enabled values will ++ * be zero. ++ * @dst_blk: Non-NULL pointer to dst block obtained from a call to ++ * kbase_hwcnt_dump_buffer_block_instance. ++ * @src_blk: Non-NULL pointer to src block obtained from a call to ++ * kbase_hwcnt_dump_buffer_block_instance. ++ * @blk_em: Non-NULL pointer to the block bitfield(s) obtained from a call to ++ * kbase_hwcnt_enable_map_block_instance. ++ * @hdr_cnt: Number of headers in the block. ++ * @ctr_cnt: Number of counters in the block. ++ */ ++static inline void kbase_hwcnt_dump_buffer_block_accumulate_strict(u64 *dst_blk, const u64 *src_blk, ++ const u64 *blk_em, ++ size_t hdr_cnt, size_t ctr_cnt) ++{ ++ size_t ctr; + -+ /** -+ * Size of the shader program counter, in bits. -+ */ -+ u32 log2_program_counter_size; ++ if (WARN_ON(!dst_blk) || WARN_ON(!src_blk)) ++ return; + -+ /** -+ * TEXTURE_FEATURES_x registers, as exposed by the GPU. This is a -+ * bitpattern where a set bit indicates that the format is supported. -+ * -+ * Before using a texture format, it is recommended that the corresponding -+ * bit be checked. -+ */ -+ u32 texture_features[BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS]; ++ kbase_hwcnt_dump_buffer_block_copy_strict(dst_blk, src_blk, blk_em, hdr_cnt); + -+ /** -+ * Theoretical maximum memory available to the GPU. It is unlikely that a -+ * client will be able to allocate all of this memory for their own -+ * purposes, but this at least provides an upper bound on the memory -+ * available to the GPU. -+ * -+ * This is required for OpenCL's clGetDeviceInfo() call when -+ * CL_DEVICE_GLOBAL_MEM_SIZE is requested, for OpenCL GPU devices. The -+ * client will not be expecting to allocate anywhere near this value. -+ */ -+ u64 gpu_available_memory_size; ++ for (ctr = hdr_cnt; ctr < ctr_cnt + hdr_cnt; ctr++) { ++ bool ctr_enabled = kbase_hwcnt_enable_map_block_value_enabled(blk_em, ctr); + -+ /** -+ * The number of execution engines. -+ */ -+ u8 num_exec_engines; -+}; ++ if (ctr_enabled) ++ dst_blk[ctr] += src_blk[ctr]; ++ else ++ dst_blk[ctr] = 0; ++ } ++} + +/** -+ * -+ * More information is possible - but associativity and bus width are not -+ * required by upper-level apis. ++ * kbase_hwcnt_metadata_for_each_clock() - Iterate over each clock domain in the ++ * metadata. ++ * @md: Non-NULL pointer to metadata. ++ * @clk: size_t variable used as clock iterator. + */ -+struct mali_base_gpu_l2_cache_props { -+ u8 log2_line_size; -+ u8 log2_cache_size; -+ u8 num_l2_slices; /* Number of L2C slices. 1 or higher */ -+ u8 padding[5]; -+}; -+ -+struct mali_base_gpu_tiler_props { -+ u32 bin_size_bytes; /* Max is 4*2^15 */ -+ u32 max_active_levels; /* Max is 2^15 */ -+}; ++#define kbase_hwcnt_metadata_for_each_clock(md, clk) for ((clk) = 0; (clk) < (md)->clk_cnt; (clk)++) + +/** -+ * GPU threading system details. ++ * kbase_hwcnt_clk_enable_map_enabled() - Check if the given index is enabled ++ * in clk_enable_map. ++ * @clk_enable_map: An enable map for clock domains. ++ * @index: Index of the enable map for clock domain. ++ * ++ * Return: true if the index of the clock domain is enabled, else false. + */ -+struct mali_base_gpu_thread_props { -+ u32 max_threads; /* Max. number of threads per core */ -+ u32 max_workgroup_size; /* Max. number of threads per workgroup */ -+ u32 max_barrier_size; /* Max. number of threads that can synchronize on a simple barrier */ -+ u16 max_registers; /* Total size [1..65535] of the register file available per core. */ -+ u8 max_task_queue; /* Max. tasks [1..255] which may be sent to a core before it becomes blocked. */ -+ u8 max_thread_group_split; /* Max. allowed value [1..15] of the Thread Group Split field. */ -+ u8 impl_tech; /* 0 = Not specified, 1 = Silicon, 2 = FPGA, 3 = SW Model/Emulation */ -+ u8 padding[3]; -+ u32 tls_alloc; /* Number of threads per core that TLS must -+ * be allocated for -+ */ -+}; ++static inline bool kbase_hwcnt_clk_enable_map_enabled(const u64 clk_enable_map, const size_t index) ++{ ++ if (WARN_ON(index >= 64)) ++ return false; ++ if (clk_enable_map & (1ull << index)) ++ return true; ++ return false; ++} + -+/** -+ * struct mali_base_gpu_coherent_group - descriptor for a coherent group ++#endif /* _KBASE_HWCNT_TYPES_H_ */ +diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.c +new file mode 100644 +index 000000000..d618764d3 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.c +@@ -0,0 +1,744 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* + * -+ * \c core_mask exposes all cores in that coherent group, and \c num_cores -+ * provides a cached population-count for that mask. ++ * (C) COPYRIGHT 2018, 2020-2022 ARM Limited. All rights reserved. + * -+ * @note Whilst all cores are exposed in the mask, not all may be available to -+ * the application, depending on the Kernel Power policy. ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. + * -+ * @note if u64s must be 8-byte aligned, then this structure has 32-bits of wastage. -+ */ -+struct mali_base_gpu_coherent_group { -+ u64 core_mask; /**< Core restriction mask required for the group */ -+ u16 num_cores; /**< Number of cores in the group */ -+ u16 padding[3]; -+}; -+ -+/** -+ * struct mali_base_gpu_coherent_group_info - Coherency group information ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. + * -+ * Note that the sizes of the members could be reduced. However, the \c group -+ * member might be 8-byte aligned to ensure the u64 core_mask is 8-byte -+ * aligned, thus leading to wastage if the other members sizes were reduced. ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * The groups are sorted by core mask. The core masks are non-repeating and do -+ * not intersect. + */ -+struct mali_base_gpu_coherent_group_info { -+ u32 num_groups; -+ -+ /** -+ * Number of core groups (coherent or not) in the GPU. Equivalent to the number of L2 Caches. -+ * -+ * The GPU Counter dumping writes 2048 bytes per core group, regardless of -+ * whether the core groups are coherent or not. Hence this member is needed -+ * to calculate how much memory is required for dumping. -+ * -+ * @note Do not use it to work out how many valid elements are in the -+ * group[] member. Use num_groups instead. -+ */ -+ u32 num_core_groups; + -+ /** -+ * Coherency features of the memory, accessed by gpu_mem_features -+ * methods -+ */ -+ u32 coherency; ++#include "hwcnt/mali_kbase_hwcnt_virtualizer.h" ++#include "hwcnt/mali_kbase_hwcnt_accumulator.h" ++#include "hwcnt/mali_kbase_hwcnt_context.h" ++#include "hwcnt/mali_kbase_hwcnt_types.h" + -+ u32 padding; ++#include ++#include + -+ /** -+ * Descriptors of coherent groups -+ */ -+ struct mali_base_gpu_coherent_group group[BASE_MAX_COHERENT_GROUPS]; ++/** ++ * struct kbase_hwcnt_virtualizer - Hardware counter virtualizer structure. ++ * @hctx: Hardware counter context being virtualized. ++ * @dump_threshold_ns: Minimum threshold period for dumps between different ++ * clients where a new accumulator dump will not be ++ * performed, and instead accumulated values will be used. ++ * If 0, rate limiting is disabled. ++ * @metadata: Hardware counter metadata. ++ * @lock: Lock acquired at all entrypoints, to protect mutable ++ * state. ++ * @client_count: Current number of virtualizer clients. ++ * @clients: List of virtualizer clients. ++ * @accum: Hardware counter accumulator. NULL if no clients. ++ * @scratch_map: Enable map used as scratch space during counter changes. ++ * @scratch_buf: Dump buffer used as scratch space during dumps. ++ * @ts_last_dump_ns: End time of most recent dump across all clients. ++ */ ++struct kbase_hwcnt_virtualizer { ++ struct kbase_hwcnt_context *hctx; ++ u64 dump_threshold_ns; ++ const struct kbase_hwcnt_metadata *metadata; ++ struct mutex lock; ++ size_t client_count; ++ struct list_head clients; ++ struct kbase_hwcnt_accumulator *accum; ++ struct kbase_hwcnt_enable_map scratch_map; ++ struct kbase_hwcnt_dump_buffer scratch_buf; ++ u64 ts_last_dump_ns; +}; + +/** -+ * struct gpu_raw_gpu_props - A complete description of the GPU's Hardware -+ * Configuration Discovery registers. -+ * -+ * The information is presented inefficiently for access. For frequent access, -+ * the values should be better expressed in an unpacked form in the -+ * base_gpu_props structure. -+ * -+ * The raw properties in gpu_raw_gpu_props are necessary to -+ * allow a user of the Mali Tools (e.g. PAT) to determine "Why is this device -+ * behaving differently?". In this case, all information about the -+ * configuration is potentially useful, but it does not need to be processed -+ * by the driver. Instead, the raw registers can be processed by the Mali -+ * Tools software on the host PC. -+ * ++ * struct kbase_hwcnt_virtualizer_client - Virtualizer client structure. ++ * @node: List node used for virtualizer client list. ++ * @hvirt: Hardware counter virtualizer. ++ * @enable_map: Enable map with client's current enabled counters. ++ * @accum_buf: Dump buffer with client's current accumulated counters. ++ * @has_accum: True if accum_buf contains any accumulated counters. ++ * @ts_start_ns: Counter collection start time of current dump. + */ -+struct gpu_raw_gpu_props { -+ u64 shader_present; -+ u64 tiler_present; -+ u64 l2_present; -+ u64 stack_present; -+ -+ u32 l2_features; -+ u32 core_features; -+ u32 mem_features; -+ u32 mmu_features; -+ -+ u32 as_present; -+ -+ u32 js_present; -+ u32 js_features[GPU_MAX_JOB_SLOTS]; -+ u32 tiler_features; -+ u32 texture_features[BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS]; -+ -+ u32 gpu_id; -+ -+ u32 thread_max_threads; -+ u32 thread_max_workgroup_size; -+ u32 thread_max_barrier_size; -+ u32 thread_features; ++struct kbase_hwcnt_virtualizer_client { ++ struct list_head node; ++ struct kbase_hwcnt_virtualizer *hvirt; ++ struct kbase_hwcnt_enable_map enable_map; ++ struct kbase_hwcnt_dump_buffer accum_buf; ++ bool has_accum; ++ u64 ts_start_ns; ++}; + -+ /* -+ * Note: This is the _selected_ coherency mode rather than the -+ * available modes as exposed in the coherency_features register. -+ */ -+ u32 coherency_mode; ++const struct kbase_hwcnt_metadata * ++kbase_hwcnt_virtualizer_metadata(struct kbase_hwcnt_virtualizer *hvirt) ++{ ++ if (!hvirt) ++ return NULL; + -+ u32 thread_tls_alloc; -+}; ++ return hvirt->metadata; ++} + +/** -+ * struct base_gpu_props - Return structure for base_get_gpu_props(). -+ * -+ * NOTE: the raw_props member in this data structure contains the register -+ * values from which the value of the other members are derived. The derived -+ * members exist to allow for efficient access and/or shielding the details -+ * of the layout of the registers. ++ * kbasep_hwcnt_virtualizer_client_free - Free a virtualizer client's memory. ++ * @hvcli: Pointer to virtualizer client. + * -+ * @unused_1: Keep for backwards compatibility. -+ * @raw_props: This member is large, likely to be 128 bytes. -+ * @coherency_info: This must be last member of the structure. ++ * Will safely free a client in any partial state of construction. + */ -+struct base_gpu_props { -+ struct mali_base_gpu_core_props core_props; -+ struct mali_base_gpu_l2_cache_props l2_props; -+ u64 unused_1; -+ struct mali_base_gpu_tiler_props tiler_props; -+ struct mali_base_gpu_thread_props thread_props; -+ struct gpu_raw_gpu_props raw_props; -+ struct mali_base_gpu_coherent_group_info coherency_info; -+}; ++static void kbasep_hwcnt_virtualizer_client_free(struct kbase_hwcnt_virtualizer_client *hvcli) ++{ ++ if (!hvcli) ++ return; + -+#if MALI_USE_CSF -+#include "csf/mali_base_csf_kernel.h" -+#else -+#include "jm/mali_base_jm_kernel.h" -+#endif ++ kbase_hwcnt_dump_buffer_free(&hvcli->accum_buf); ++ kbase_hwcnt_enable_map_free(&hvcli->enable_map); ++ kfree(hvcli); ++} + +/** -+ * base_mem_group_id_get() - Get group ID from flags -+ * @flags: Flags to pass to base_mem_alloc -+ * -+ * This inline function extracts the encoded group ID from flags -+ * and converts it into numeric value (0~15). ++ * kbasep_hwcnt_virtualizer_client_alloc - Allocate memory for a virtualizer ++ * client. ++ * @metadata: Non-NULL pointer to counter metadata. ++ * @out_hvcli: Non-NULL pointer to where created client will be stored on ++ * success. + * -+ * Return: group ID(0~15) extracted from the parameter ++ * Return: 0 on success, else error code. + */ -+static inline int base_mem_group_id_get(base_mem_alloc_flags flags) ++static int kbasep_hwcnt_virtualizer_client_alloc(const struct kbase_hwcnt_metadata *metadata, ++ struct kbase_hwcnt_virtualizer_client **out_hvcli) +{ -+ LOCAL_ASSERT((flags & ~BASE_MEM_FLAGS_INPUT_MASK) == 0); -+ return (int)((flags & BASE_MEM_GROUP_ID_MASK) >> -+ BASEP_MEM_GROUP_ID_SHIFT); ++ int errcode; ++ struct kbase_hwcnt_virtualizer_client *hvcli = NULL; ++ ++ WARN_ON(!metadata); ++ WARN_ON(!out_hvcli); ++ ++ hvcli = kzalloc(sizeof(*hvcli), GFP_KERNEL); ++ if (!hvcli) ++ return -ENOMEM; ++ ++ errcode = kbase_hwcnt_enable_map_alloc(metadata, &hvcli->enable_map); ++ if (errcode) ++ goto error; ++ ++ errcode = kbase_hwcnt_dump_buffer_alloc(metadata, &hvcli->accum_buf); ++ if (errcode) ++ goto error; ++ ++ *out_hvcli = hvcli; ++ return 0; ++error: ++ kbasep_hwcnt_virtualizer_client_free(hvcli); ++ return errcode; +} + +/** -+ * base_mem_group_id_set() - Set group ID into base_mem_alloc_flags -+ * @id: group ID(0~15) you want to encode -+ * -+ * This inline function encodes specific group ID into base_mem_alloc_flags. -+ * Parameter 'id' should lie in-between 0 to 15. -+ * -+ * Return: base_mem_alloc_flags with the group ID (id) encoded -+ * -+ * The return value can be combined with other flags against base_mem_alloc -+ * to identify a specific memory group. ++ * kbasep_hwcnt_virtualizer_client_accumulate - Accumulate a dump buffer into a ++ * client's accumulation buffer. ++ * @hvcli: Non-NULL pointer to virtualizer client. ++ * @dump_buf: Non-NULL pointer to dump buffer to accumulate from. + */ -+static inline base_mem_alloc_flags base_mem_group_id_set(int id) ++static void ++kbasep_hwcnt_virtualizer_client_accumulate(struct kbase_hwcnt_virtualizer_client *hvcli, ++ const struct kbase_hwcnt_dump_buffer *dump_buf) +{ -+ if ((id < 0) || (id >= BASE_MEM_GROUP_COUNT)) { -+ /* Set to default value when id is out of range. */ -+ id = BASE_MEM_GROUP_DEFAULT; -+ } ++ WARN_ON(!hvcli); ++ WARN_ON(!dump_buf); ++ lockdep_assert_held(&hvcli->hvirt->lock); + -+ return ((base_mem_alloc_flags)id << BASEP_MEM_GROUP_ID_SHIFT) & -+ BASE_MEM_GROUP_ID_MASK; ++ if (hvcli->has_accum) { ++ /* If already some accumulation, accumulate */ ++ kbase_hwcnt_dump_buffer_accumulate(&hvcli->accum_buf, dump_buf, &hvcli->enable_map); ++ } else { ++ /* If no accumulation, copy */ ++ kbase_hwcnt_dump_buffer_copy(&hvcli->accum_buf, dump_buf, &hvcli->enable_map); ++ } ++ hvcli->has_accum = true; +} + +/** -+ * base_context_mmu_group_id_set - Encode a memory group ID in -+ * base_context_create_flags -+ * -+ * Memory allocated for GPU page tables will come from the specified group. -+ * -+ * @group_id: Physical memory group ID. Range is 0..(BASE_MEM_GROUP_COUNT-1). ++ * kbasep_hwcnt_virtualizer_accumulator_term - Terminate the hardware counter ++ * accumulator after final client ++ * removal. ++ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. + * -+ * Return: Bitmask of flags to pass to base_context_init. ++ * Will safely terminate the accumulator in any partial state of initialisation. + */ -+static inline base_context_create_flags base_context_mmu_group_id_set( -+ int const group_id) ++static void kbasep_hwcnt_virtualizer_accumulator_term(struct kbase_hwcnt_virtualizer *hvirt) +{ -+ LOCAL_ASSERT(group_id >= 0); -+ LOCAL_ASSERT(group_id < BASE_MEM_GROUP_COUNT); -+ return BASEP_CONTEXT_MMU_GROUP_ID_MASK & -+ ((base_context_create_flags)group_id << -+ BASEP_CONTEXT_MMU_GROUP_ID_SHIFT); ++ WARN_ON(!hvirt); ++ lockdep_assert_held(&hvirt->lock); ++ WARN_ON(hvirt->client_count); ++ ++ kbase_hwcnt_dump_buffer_free(&hvirt->scratch_buf); ++ kbase_hwcnt_enable_map_free(&hvirt->scratch_map); ++ kbase_hwcnt_accumulator_release(hvirt->accum); ++ hvirt->accum = NULL; +} + +/** -+ * base_context_mmu_group_id_get - Decode a memory group ID from -+ * base_context_create_flags -+ * -+ * Memory allocated for GPU page tables will come from the returned group. -+ * -+ * @flags: Bitmask of flags to pass to base_context_init. ++ * kbasep_hwcnt_virtualizer_accumulator_init - Initialise the hardware counter ++ * accumulator before first client ++ * addition. ++ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. + * -+ * Return: Physical memory group ID. Valid range is 0..(BASE_MEM_GROUP_COUNT-1). ++ * Return: 0 on success, else error code. + */ -+static inline int base_context_mmu_group_id_get( -+ base_context_create_flags const flags) ++static int kbasep_hwcnt_virtualizer_accumulator_init(struct kbase_hwcnt_virtualizer *hvirt) +{ -+ LOCAL_ASSERT(flags == (flags & BASEP_CONTEXT_CREATE_ALLOWED_FLAGS)); -+ return (int)((flags & BASEP_CONTEXT_MMU_GROUP_ID_MASK) >> -+ BASEP_CONTEXT_MMU_GROUP_ID_SHIFT); -+} ++ int errcode; + -+/* -+ * A number of bit flags are defined for requesting cpu_gpu_timeinfo. These -+ * flags are also used, where applicable, for specifying which fields -+ * are valid following the request operation. -+ */ ++ WARN_ON(!hvirt); ++ lockdep_assert_held(&hvirt->lock); ++ WARN_ON(hvirt->client_count); ++ WARN_ON(hvirt->accum); + -+/* For monotonic (counter) timefield */ -+#define BASE_TIMEINFO_MONOTONIC_FLAG (1UL << 0) -+/* For system wide timestamp */ -+#define BASE_TIMEINFO_TIMESTAMP_FLAG (1UL << 1) -+/* For GPU cycle counter */ -+#define BASE_TIMEINFO_CYCLE_COUNTER_FLAG (1UL << 2) -+/* Specify kernel GPU register timestamp */ -+#define BASE_TIMEINFO_KERNEL_SOURCE_FLAG (1UL << 30) -+/* Specify userspace cntvct_el0 timestamp source */ -+#define BASE_TIMEINFO_USER_SOURCE_FLAG (1UL << 31) ++ errcode = kbase_hwcnt_accumulator_acquire(hvirt->hctx, &hvirt->accum); ++ if (errcode) ++ goto error; + -+#define BASE_TIMEREQUEST_ALLOWED_FLAGS (\ -+ BASE_TIMEINFO_MONOTONIC_FLAG | \ -+ BASE_TIMEINFO_TIMESTAMP_FLAG | \ -+ BASE_TIMEINFO_CYCLE_COUNTER_FLAG | \ -+ BASE_TIMEINFO_KERNEL_SOURCE_FLAG | \ -+ BASE_TIMEINFO_USER_SOURCE_FLAG) ++ errcode = kbase_hwcnt_enable_map_alloc(hvirt->metadata, &hvirt->scratch_map); ++ if (errcode) ++ goto error; + -+#endif /* _BASE_KERNEL_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_base_mem_priv.h b/drivers/gpu/arm/bifrost/mali_base_mem_priv.h -new file mode 100755 -index 000000000000..844a025b715d ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_base_mem_priv.h -@@ -0,0 +1,57 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2015, 2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 ++ errcode = kbase_hwcnt_dump_buffer_alloc(hvirt->metadata, &hvirt->scratch_buf); ++ if (errcode) ++ goto error; ++ ++ return 0; ++error: ++ kbasep_hwcnt_virtualizer_accumulator_term(hvirt); ++ return errcode; ++} ++ ++/** ++ * kbasep_hwcnt_virtualizer_client_add - Add a newly allocated client to the ++ * virtualizer. ++ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. ++ * @hvcli: Non-NULL pointer to the virtualizer client to add. ++ * @enable_map: Non-NULL pointer to client's initial enable map. + * ++ * Return: 0 on success, else error code. + */ ++static int kbasep_hwcnt_virtualizer_client_add(struct kbase_hwcnt_virtualizer *hvirt, ++ struct kbase_hwcnt_virtualizer_client *hvcli, ++ const struct kbase_hwcnt_enable_map *enable_map) ++{ ++ int errcode = 0; ++ u64 ts_start_ns; ++ u64 ts_end_ns; + ++ WARN_ON(!hvirt); ++ WARN_ON(!hvcli); ++ WARN_ON(!enable_map); ++ lockdep_assert_held(&hvirt->lock); + ++ if (hvirt->client_count == 0) ++ /* First client added, so initialise the accumulator */ ++ errcode = kbasep_hwcnt_virtualizer_accumulator_init(hvirt); ++ if (errcode) ++ return errcode; + -+#ifndef _BASE_MEM_PRIV_H_ -+#define _BASE_MEM_PRIV_H_ ++ hvirt->client_count += 1; + -+#define BASE_SYNCSET_OP_MSYNC (1U << 0) -+#define BASE_SYNCSET_OP_CSYNC (1U << 1) ++ if (hvirt->client_count == 1) { ++ /* First client, so just pass the enable map onwards as is */ ++ errcode = kbase_hwcnt_accumulator_set_counters(hvirt->accum, enable_map, ++ &ts_start_ns, &ts_end_ns, NULL); ++ } else { ++ struct kbase_hwcnt_virtualizer_client *pos; + -+/* -+ * This structure describe a basic memory coherency operation. -+ * It can either be: -+ * @li a sync from CPU to Memory: -+ * - type = ::BASE_SYNCSET_OP_MSYNC -+ * - mem_handle = a handle to the memory object on which the operation -+ * is taking place -+ * - user_addr = the address of the range to be synced -+ * - size = the amount of data to be synced, in bytes -+ * - offset is ignored. -+ * @li a sync from Memory to CPU: -+ * - type = ::BASE_SYNCSET_OP_CSYNC -+ * - mem_handle = a handle to the memory object on which the operation -+ * is taking place -+ * - user_addr = the address of the range to be synced -+ * - size = the amount of data to be synced, in bytes. -+ * - offset is ignored. ++ /* Make the scratch enable map the union of all enable maps */ ++ kbase_hwcnt_enable_map_copy(&hvirt->scratch_map, enable_map); ++ list_for_each_entry (pos, &hvirt->clients, node) ++ kbase_hwcnt_enable_map_union(&hvirt->scratch_map, &pos->enable_map); ++ ++ /* Set the counters with the new union enable map */ ++ errcode = kbase_hwcnt_accumulator_set_counters(hvirt->accum, &hvirt->scratch_map, ++ &ts_start_ns, &ts_end_ns, ++ &hvirt->scratch_buf); ++ /* Accumulate into only existing clients' accumulation bufs */ ++ if (!errcode) ++ list_for_each_entry (pos, &hvirt->clients, node) ++ kbasep_hwcnt_virtualizer_client_accumulate(pos, ++ &hvirt->scratch_buf); ++ } ++ if (errcode) ++ goto error; ++ ++ list_add(&hvcli->node, &hvirt->clients); ++ hvcli->hvirt = hvirt; ++ kbase_hwcnt_enable_map_copy(&hvcli->enable_map, enable_map); ++ hvcli->has_accum = false; ++ hvcli->ts_start_ns = ts_end_ns; ++ ++ /* Store the most recent dump time for rate limiting */ ++ hvirt->ts_last_dump_ns = ts_end_ns; ++ ++ return 0; ++error: ++ hvirt->client_count -= 1; ++ if (hvirt->client_count == 0) ++ kbasep_hwcnt_virtualizer_accumulator_term(hvirt); ++ return errcode; ++} ++ ++/** ++ * kbasep_hwcnt_virtualizer_client_remove - Remove a client from the ++ * virtualizer. ++ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. ++ * @hvcli: Non-NULL pointer to the virtualizer client to remove. + */ -+struct basep_syncset { -+ struct base_mem_handle mem_handle; -+ u64 user_addr; -+ u64 size; -+ u8 type; -+ u8 padding[7]; -+}; ++static void kbasep_hwcnt_virtualizer_client_remove(struct kbase_hwcnt_virtualizer *hvirt, ++ struct kbase_hwcnt_virtualizer_client *hvcli) ++{ ++ int errcode = 0; ++ u64 ts_start_ns; ++ u64 ts_end_ns; + -+#endif -diff --git a/drivers/gpu/arm/bifrost/mali_kbase.h b/drivers/gpu/arm/bifrost/mali_kbase.h -new file mode 100755 -index 000000000000..8189d02ab910 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase.h -@@ -0,0 +1,614 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 ++ WARN_ON(!hvirt); ++ WARN_ON(!hvcli); ++ lockdep_assert_held(&hvirt->lock); ++ ++ list_del(&hvcli->node); ++ hvirt->client_count -= 1; ++ ++ if (hvirt->client_count == 0) { ++ /* Last client removed, so terminate the accumulator */ ++ kbasep_hwcnt_virtualizer_accumulator_term(hvirt); ++ } else { ++ struct kbase_hwcnt_virtualizer_client *pos; ++ /* Make the scratch enable map the union of all enable maps */ ++ kbase_hwcnt_enable_map_disable_all(&hvirt->scratch_map); ++ list_for_each_entry (pos, &hvirt->clients, node) ++ kbase_hwcnt_enable_map_union(&hvirt->scratch_map, &pos->enable_map); ++ /* Set the counters with the new union enable map */ ++ errcode = kbase_hwcnt_accumulator_set_counters(hvirt->accum, &hvirt->scratch_map, ++ &ts_start_ns, &ts_end_ns, ++ &hvirt->scratch_buf); ++ /* Accumulate into remaining clients' accumulation bufs */ ++ if (!errcode) { ++ list_for_each_entry (pos, &hvirt->clients, node) ++ kbasep_hwcnt_virtualizer_client_accumulate(pos, ++ &hvirt->scratch_buf); ++ ++ /* Store the most recent dump time for rate limiting */ ++ hvirt->ts_last_dump_ns = ts_end_ns; ++ } ++ } ++ WARN_ON(errcode); ++} ++ ++/** ++ * kbasep_hwcnt_virtualizer_client_set_counters - Perform a dump of the client's ++ * currently enabled counters, ++ * and enable a new set of ++ * counters that will be used for ++ * subsequent dumps. ++ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. ++ * @hvcli: Non-NULL pointer to the virtualizer client. ++ * @enable_map: Non-NULL pointer to the new counter enable map for the client. ++ * Must have the same metadata as the virtualizer. ++ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will ++ * be written out to on success. ++ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will ++ * be written out to on success. ++ * @dump_buf: Pointer to the buffer where the dump will be written out to on ++ * success. If non-NULL, must have the same metadata as the ++ * accumulator. If NULL, the dump will be discarded. + * ++ * Return: 0 on success or error code. + */ ++static int kbasep_hwcnt_virtualizer_client_set_counters( ++ struct kbase_hwcnt_virtualizer *hvirt, struct kbase_hwcnt_virtualizer_client *hvcli, ++ const struct kbase_hwcnt_enable_map *enable_map, u64 *ts_start_ns, u64 *ts_end_ns, ++ struct kbase_hwcnt_dump_buffer *dump_buf) ++{ ++ int errcode; ++ struct kbase_hwcnt_virtualizer_client *pos; + ++ WARN_ON(!hvirt); ++ WARN_ON(!hvcli); ++ WARN_ON(!enable_map); ++ WARN_ON(!ts_start_ns); ++ WARN_ON(!ts_end_ns); ++ WARN_ON(enable_map->metadata != hvirt->metadata); ++ WARN_ON(dump_buf && (dump_buf->metadata != hvirt->metadata)); ++ lockdep_assert_held(&hvirt->lock); + ++ /* Make the scratch enable map the union of all enable maps */ ++ kbase_hwcnt_enable_map_copy(&hvirt->scratch_map, enable_map); ++ list_for_each_entry (pos, &hvirt->clients, node) ++ /* Ignore the enable map of the selected client */ ++ if (pos != hvcli) ++ kbase_hwcnt_enable_map_union(&hvirt->scratch_map, &pos->enable_map); + -+#ifndef _KBASE_H_ -+#define _KBASE_H_ ++ /* Set the counters with the new union enable map */ ++ errcode = kbase_hwcnt_accumulator_set_counters(hvirt->accum, &hvirt->scratch_map, ++ ts_start_ns, ts_end_ns, &hvirt->scratch_buf); ++ if (errcode) ++ return errcode; + -+#include ++ /* Accumulate into all accumulation bufs except the selected client's */ ++ list_for_each_entry (pos, &hvirt->clients, node) ++ if (pos != hvcli) ++ kbasep_hwcnt_virtualizer_client_accumulate(pos, &hvirt->scratch_buf); + -+#include ++ /* Finally, write into the dump buf */ ++ if (dump_buf) { ++ const struct kbase_hwcnt_dump_buffer *src = &hvirt->scratch_buf; + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)) -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include ++ if (hvcli->has_accum) { ++ kbase_hwcnt_dump_buffer_accumulate(&hvcli->accum_buf, src, ++ &hvcli->enable_map); ++ src = &hvcli->accum_buf; ++ } ++ kbase_hwcnt_dump_buffer_copy(dump_buf, src, &hvcli->enable_map); ++ } ++ hvcli->has_accum = false; + -+#include "mali_base_kernel.h" -+#include ++ /* Update the selected client's enable map */ ++ kbase_hwcnt_enable_map_copy(&hvcli->enable_map, enable_map); + -+/* -+ * Include mali_kbase_defs.h first as this provides types needed by other local -+ * header files. -+ */ -+#include "mali_kbase_defs.h" ++ /* Fix up the timestamps */ ++ *ts_start_ns = hvcli->ts_start_ns; ++ hvcli->ts_start_ns = *ts_end_ns; + -+#include "debug/mali_kbase_debug_ktrace.h" -+#include "context/mali_kbase_context.h" -+#include "mali_kbase_strings.h" -+#include "mali_kbase_mem_lowlevel.h" -+#include "mali_kbase_utility.h" -+#include "mali_kbase_mem.h" -+#include "mmu/mali_kbase_mmu.h" -+#include "mali_kbase_gpu_memory_debugfs.h" -+#include "mali_kbase_mem_profile_debugfs.h" -+#include "mali_kbase_gpuprops.h" -+#include "mali_kbase_ioctl.h" -+#if !MALI_USE_CSF -+#include "mali_kbase_debug_job_fault.h" -+#include "mali_kbase_jd_debugfs.h" -+#include "mali_kbase_jm.h" -+#include "mali_kbase_js.h" -+#endif /* !MALI_USE_CSF */ ++ /* Store the most recent dump time for rate limiting */ ++ hvirt->ts_last_dump_ns = *ts_end_ns; + -+#include "ipa/mali_kbase_ipa.h" ++ return errcode; ++} + -+#ifdef CONFIG_GPU_TRACEPOINTS -+#include -+#endif ++int kbase_hwcnt_virtualizer_client_set_counters(struct kbase_hwcnt_virtualizer_client *hvcli, ++ const struct kbase_hwcnt_enable_map *enable_map, ++ u64 *ts_start_ns, u64 *ts_end_ns, ++ struct kbase_hwcnt_dump_buffer *dump_buf) ++{ ++ int errcode; ++ struct kbase_hwcnt_virtualizer *hvirt; + -+#include "mali_linux_trace.h" ++ if (!hvcli || !enable_map || !ts_start_ns || !ts_end_ns) ++ return -EINVAL; + -+#if MALI_USE_CSF -+#include "csf/mali_kbase_csf.h" -+#endif ++ hvirt = hvcli->hvirt; + -+#ifndef u64_to_user_ptr -+/* Introduced in Linux v4.6 */ -+#define u64_to_user_ptr(x) ((void __user *)(uintptr_t)x) -+#endif ++ if ((enable_map->metadata != hvirt->metadata) || ++ (dump_buf && (dump_buf->metadata != hvirt->metadata))) ++ return -EINVAL; + -+#if MALI_USE_CSF -+/* Physical memory group ID for command stream frontend user I/O. -+ */ -+#define KBASE_MEM_GROUP_CSF_IO BASE_MEM_GROUP_DEFAULT ++ mutex_lock(&hvirt->lock); + -+/* Physical memory group ID for command stream frontend firmware. -+ */ -+#define KBASE_MEM_GROUP_CSF_FW BASE_MEM_GROUP_DEFAULT -+#endif ++ if ((hvirt->client_count == 1) && (!hvcli->has_accum)) { ++ /* ++ * If there's only one client with no prior accumulation, we can ++ * completely skip the virtualize and just pass through the call ++ * to the accumulator, saving a fair few copies and ++ * accumulations. ++ */ ++ errcode = kbase_hwcnt_accumulator_set_counters(hvirt->accum, enable_map, ++ ts_start_ns, ts_end_ns, dump_buf); + -+/* Physical memory group ID for a special page which can alias several regions. -+ */ -+#define KBASE_MEM_GROUP_SINK BASE_MEM_GROUP_DEFAULT ++ if (!errcode) { ++ /* Update the selected client's enable map */ ++ kbase_hwcnt_enable_map_copy(&hvcli->enable_map, enable_map); + -+/* -+ * Kernel-side Base (KBase) APIs -+ */ ++ /* Fix up the timestamps */ ++ *ts_start_ns = hvcli->ts_start_ns; ++ hvcli->ts_start_ns = *ts_end_ns; + -+struct kbase_device *kbase_device_alloc(void); -+/* -+* note: configuration attributes member of kbdev needs to have -+* been setup before calling kbase_device_init -+*/ ++ /* Store the most recent dump time for rate limiting */ ++ hvirt->ts_last_dump_ns = *ts_end_ns; ++ } ++ } else { ++ /* Otherwise, do the full virtualize */ ++ errcode = kbasep_hwcnt_virtualizer_client_set_counters( ++ hvirt, hvcli, enable_map, ts_start_ns, ts_end_ns, dump_buf); ++ } + -+int kbase_device_misc_init(struct kbase_device *kbdev); -+void kbase_device_misc_term(struct kbase_device *kbdev); -+void kbase_device_free(struct kbase_device *kbdev); -+int kbase_device_has_feature(struct kbase_device *kbdev, u32 feature); ++ mutex_unlock(&hvirt->lock); + -+/* Needed for gator integration and for reporting vsync information */ -+struct kbase_device *kbase_find_device(int minor); -+void kbase_release_device(struct kbase_device *kbdev); ++ return errcode; ++} + +/** -+ * kbase_context_get_unmapped_area() - get an address range which is currently -+ * unmapped. -+ * @kctx: A kernel base context (which has its own GPU address space). -+ * @addr: CPU mapped address (set to 0 since MAP_FIXED mapping is not allowed -+ * as Mali GPU driver decides about the mapping). -+ * @len: Length of the address range. -+ * @pgoff: Page offset within the GPU address space of the kbase context. -+ * @flags: Flags for the allocation. -+ * -+ * Finds the unmapped address range which satisfies requirements specific to -+ * GPU and those provided by the call parameters. -+ * -+ * 1) Requirement for allocations greater than 2MB: -+ * - alignment offset is set to 2MB and the alignment mask to 2MB decremented -+ * by 1. -+ * -+ * 2) Requirements imposed for the shader memory alignment: -+ * - alignment is decided by the number of GPU pc bits which can be read from -+ * GPU properties of the device associated with this kbase context; alignment -+ * offset is set to this value in bytes and the alignment mask to the offset -+ * decremented by 1. -+ * - allocations must not to be at 4GB boundaries. Such cases are indicated -+ * by the flag KBASE_REG_GPU_NX not being set (check the flags of the kbase -+ * region). 4GB boundaries can be checked against @ref BASE_MEM_MASK_4GB. -+ * -+ * 3) Requirements imposed for tiler memory alignment, cases indicated by -+ * the flag @ref KBASE_REG_TILER_ALIGN_TOP (check the flags of the kbase -+ * region): -+ * - alignment offset is set to the difference between the kbase region -+ * extent (converted from the original value in pages to bytes) and the kbase -+ * region initial_commit (also converted from the original value in pages to -+ * bytes); alignment mask is set to the kbase region extent in bytes and -+ * decremented by 1. ++ * kbasep_hwcnt_virtualizer_client_dump - Perform a dump of the client's ++ * currently enabled counters. ++ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. ++ * @hvcli: Non-NULL pointer to the virtualizer client. ++ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will ++ * be written out to on success. ++ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will ++ * be written out to on success. ++ * @dump_buf: Pointer to the buffer where the dump will be written out to on ++ * success. If non-NULL, must have the same metadata as the ++ * accumulator. If NULL, the dump will be discarded. + * -+ * Return: if successful, address of the unmapped area aligned as required; -+ * error code (negative) in case of failure; ++ * Return: 0 on success or error code. + */ -+unsigned long kbase_context_get_unmapped_area(struct kbase_context *kctx, -+ const unsigned long addr, const unsigned long len, -+ const unsigned long pgoff, const unsigned long flags); ++static int kbasep_hwcnt_virtualizer_client_dump(struct kbase_hwcnt_virtualizer *hvirt, ++ struct kbase_hwcnt_virtualizer_client *hvcli, ++ u64 *ts_start_ns, u64 *ts_end_ns, ++ struct kbase_hwcnt_dump_buffer *dump_buf) ++{ ++ int errcode; ++ struct kbase_hwcnt_virtualizer_client *pos; + ++ WARN_ON(!hvirt); ++ WARN_ON(!hvcli); ++ WARN_ON(!ts_start_ns); ++ WARN_ON(!ts_end_ns); ++ WARN_ON(dump_buf && (dump_buf->metadata != hvirt->metadata)); ++ lockdep_assert_held(&hvirt->lock); + -+int assign_irqs(struct kbase_device *kbdev); ++ /* Perform the dump */ ++ errcode = kbase_hwcnt_accumulator_dump(hvirt->accum, ts_start_ns, ts_end_ns, ++ &hvirt->scratch_buf); ++ if (errcode) ++ return errcode; + -+int kbase_sysfs_init(struct kbase_device *kbdev); -+void kbase_sysfs_term(struct kbase_device *kbdev); ++ /* Accumulate into all accumulation bufs except the selected client's */ ++ list_for_each_entry (pos, &hvirt->clients, node) ++ if (pos != hvcli) ++ kbasep_hwcnt_virtualizer_client_accumulate(pos, &hvirt->scratch_buf); + ++ /* Finally, write into the dump buf */ ++ if (dump_buf) { ++ const struct kbase_hwcnt_dump_buffer *src = &hvirt->scratch_buf; + -+int kbase_protected_mode_init(struct kbase_device *kbdev); -+void kbase_protected_mode_term(struct kbase_device *kbdev); ++ if (hvcli->has_accum) { ++ kbase_hwcnt_dump_buffer_accumulate(&hvcli->accum_buf, src, ++ &hvcli->enable_map); ++ src = &hvcli->accum_buf; ++ } ++ kbase_hwcnt_dump_buffer_copy(dump_buf, src, &hvcli->enable_map); ++ } ++ hvcli->has_accum = false; + -+/** -+ * kbase_device_pm_init() - Performs power management initialization and -+ * Verifies device tree configurations. -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * Return: 0 if successful, otherwise a standard Linux error code -+ */ -+int kbase_device_pm_init(struct kbase_device *kbdev); ++ /* Fix up the timestamps */ ++ *ts_start_ns = hvcli->ts_start_ns; ++ hvcli->ts_start_ns = *ts_end_ns; ++ ++ /* Store the most recent dump time for rate limiting */ ++ hvirt->ts_last_dump_ns = *ts_end_ns; ++ ++ return errcode; ++} + +/** -+ * kbase_device_pm_term() - Performs power management deinitialization and -+ * Free resources. -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * kbasep_hwcnt_virtualizer_client_dump_rate_limited - Perform a dump of the ++ * client's currently enabled counters ++ * if it hasn't been rate limited, ++ * otherwise return the client's most ++ * recent accumulation. ++ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. ++ * @hvcli: Non-NULL pointer to the virtualizer client. ++ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will ++ * be written out to on success. ++ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will ++ * be written out to on success. ++ * @dump_buf: Pointer to the buffer where the dump will be written out to on ++ * success. If non-NULL, must have the same metadata as the ++ * accumulator. If NULL, the dump will be discarded. + * -+ * Clean up all the resources ++ * Return: 0 on success or error code. + */ -+void kbase_device_pm_term(struct kbase_device *kbdev); ++static int kbasep_hwcnt_virtualizer_client_dump_rate_limited( ++ struct kbase_hwcnt_virtualizer *hvirt, struct kbase_hwcnt_virtualizer_client *hvcli, ++ u64 *ts_start_ns, u64 *ts_end_ns, struct kbase_hwcnt_dump_buffer *dump_buf) ++{ ++ bool rate_limited = true; + ++ WARN_ON(!hvirt); ++ WARN_ON(!hvcli); ++ WARN_ON(!ts_start_ns); ++ WARN_ON(!ts_end_ns); ++ WARN_ON(dump_buf && (dump_buf->metadata != hvirt->metadata)); ++ lockdep_assert_held(&hvirt->lock); + -+int power_control_init(struct kbase_device *kbdev); -+void power_control_term(struct kbase_device *kbdev); ++ if (hvirt->dump_threshold_ns == 0) { ++ /* Threshold == 0, so rate limiting disabled */ ++ rate_limited = false; ++ } else if (hvirt->ts_last_dump_ns == hvcli->ts_start_ns) { ++ /* Last dump was performed by this client, and dumps from an ++ * individual client are never rate limited ++ */ ++ rate_limited = false; ++ } else { ++ const u64 ts_ns = kbase_hwcnt_accumulator_timestamp_ns(hvirt->accum); ++ const u64 time_since_last_dump_ns = ts_ns - hvirt->ts_last_dump_ns; ++ ++ /* Dump period equals or exceeds the threshold */ ++ if (time_since_last_dump_ns >= hvirt->dump_threshold_ns) ++ rate_limited = false; ++ } ++ ++ if (!rate_limited) ++ return kbasep_hwcnt_virtualizer_client_dump(hvirt, hvcli, ts_start_ns, ts_end_ns, ++ dump_buf); ++ ++ /* If we've gotten this far, the client must have something accumulated ++ * otherwise it is a logic error ++ */ ++ WARN_ON(!hvcli->has_accum); ++ ++ if (dump_buf) ++ kbase_hwcnt_dump_buffer_copy(dump_buf, &hvcli->accum_buf, &hvcli->enable_map); ++ hvcli->has_accum = false; ++ ++ *ts_start_ns = hvcli->ts_start_ns; ++ *ts_end_ns = hvirt->ts_last_dump_ns; ++ hvcli->ts_start_ns = hvirt->ts_last_dump_ns; + -+#ifdef CONFIG_DEBUG_FS -+void kbase_device_debugfs_term(struct kbase_device *kbdev); -+int kbase_device_debugfs_init(struct kbase_device *kbdev); -+#else /* CONFIG_DEBUG_FS */ -+static inline int kbase_device_debugfs_init(struct kbase_device *kbdev) -+{ + return 0; +} + -+static inline void kbase_device_debugfs_term(struct kbase_device *kbdev) { } -+#endif /* CONFIG_DEBUG_FS */ ++int kbase_hwcnt_virtualizer_client_dump(struct kbase_hwcnt_virtualizer_client *hvcli, ++ u64 *ts_start_ns, u64 *ts_end_ns, ++ struct kbase_hwcnt_dump_buffer *dump_buf) ++{ ++ int errcode; ++ struct kbase_hwcnt_virtualizer *hvirt; + -+int registers_map(struct kbase_device *kbdev); -+void registers_unmap(struct kbase_device *kbdev); ++ if (!hvcli || !ts_start_ns || !ts_end_ns) ++ return -EINVAL; + -+int kbase_device_coherency_init(struct kbase_device *kbdev); ++ hvirt = hvcli->hvirt; + -+#ifdef CONFIG_MALI_BUSLOG -+int buslog_init(struct kbase_device *kbdev); -+void buslog_term(struct kbase_device *kbdev); -+#endif ++ if (dump_buf && (dump_buf->metadata != hvirt->metadata)) ++ return -EINVAL; + -+#if !MALI_USE_CSF -+int kbase_jd_init(struct kbase_context *kctx); -+void kbase_jd_exit(struct kbase_context *kctx); ++ mutex_lock(&hvirt->lock); + -+/** -+ * kbase_jd_submit - Submit atoms to the job dispatcher -+ * -+ * @kctx: The kbase context to submit to -+ * @user_addr: The address in user space of the struct base_jd_atom array -+ * @nr_atoms: The number of atoms in the array -+ * @stride: sizeof(struct base_jd_atom) -+ * @uk6_atom: true if the atoms are legacy atoms (struct base_jd_atom_v2_uk6) -+ * -+ * Return: 0 on success or error code -+ */ -+int kbase_jd_submit(struct kbase_context *kctx, -+ void __user *user_addr, u32 nr_atoms, u32 stride, -+ bool uk6_atom); ++ if ((hvirt->client_count == 1) && (!hvcli->has_accum)) { ++ /* ++ * If there's only one client with no prior accumulation, we can ++ * completely skip the virtualize and just pass through the call ++ * to the accumulator, saving a fair few copies and ++ * accumulations. ++ */ ++ errcode = kbase_hwcnt_accumulator_dump(hvirt->accum, ts_start_ns, ts_end_ns, ++ dump_buf); + -+/** -+ * kbase_jd_done_worker - Handle a job completion -+ * @data: a &struct work_struct -+ * -+ * This function requeues the job from the runpool (if it was soft-stopped or -+ * removed from NEXT registers). -+ * -+ * Removes it from the system if it finished/failed/was cancelled. -+ * -+ * Resolves dependencies to add dependent jobs to the context, potentially -+ * starting them if necessary (which may add more references to the context) -+ * -+ * Releases the reference to the context from the no-longer-running job. -+ * -+ * Handles retrying submission outside of IRQ context if it failed from within -+ * IRQ context. -+ */ -+void kbase_jd_done_worker(struct work_struct *data); ++ if (!errcode) { ++ /* Fix up the timestamps */ ++ *ts_start_ns = hvcli->ts_start_ns; ++ hvcli->ts_start_ns = *ts_end_ns; + -+void kbase_jd_done(struct kbase_jd_atom *katom, int slot_nr, ktime_t *end_timestamp, -+ kbasep_js_atom_done_code done_code); -+void kbase_jd_cancel(struct kbase_device *kbdev, struct kbase_jd_atom *katom); -+void kbase_jd_zap_context(struct kbase_context *kctx); -+bool jd_done_nolock(struct kbase_jd_atom *katom, -+ struct list_head *completed_jobs_ctx); -+void kbase_jd_free_external_resources(struct kbase_jd_atom *katom); -+void kbase_jd_dep_clear_locked(struct kbase_jd_atom *katom); ++ /* Store the most recent dump time for rate limiting */ ++ hvirt->ts_last_dump_ns = *ts_end_ns; ++ } ++ } else { ++ /* Otherwise, do the full virtualize */ ++ errcode = kbasep_hwcnt_virtualizer_client_dump_rate_limited( ++ hvirt, hvcli, ts_start_ns, ts_end_ns, dump_buf); ++ } + -+/** -+ * kbase_job_done - Process completed jobs from job interrupt -+ * @kbdev: Pointer to the kbase device. -+ * @done: Bitmask of done or failed jobs, from JOB_IRQ_STAT register -+ * -+ * This function processes the completed, or failed, jobs from the GPU job -+ * slots, for the bits set in the @done bitmask. -+ * -+ * The hwaccess_lock must be held when calling this function. -+ */ -+void kbase_job_done(struct kbase_device *kbdev, u32 done); ++ mutex_unlock(&hvirt->lock); + -+/** -+ * kbase_job_slot_ctx_priority_check_locked(): - Check for lower priority atoms -+ * and soft stop them -+ * @kctx: Pointer to context to check. -+ * @katom: Pointer to priority atom. -+ * -+ * Atoms from @kctx on the same job slot as @katom, which have lower priority -+ * than @katom will be soft stopped and put back in the queue, so that atoms -+ * with higher priority can run. -+ * -+ * The hwaccess_lock must be held when calling this function. -+ */ -+void kbase_job_slot_ctx_priority_check_locked(struct kbase_context *kctx, -+ struct kbase_jd_atom *katom); ++ return errcode; ++} + -+/** -+ * kbase_job_slot_softstop_start_rp() - Soft-stop the atom at the start -+ * of a renderpass. -+ * @kctx: Pointer to a kernel base context. -+ * @reg: Reference of a growable GPU memory region in the same context. -+ * Takes ownership of the reference if successful. -+ * -+ * Used to switch to incremental rendering if we have nearly run out of -+ * virtual address space in a growable memory region and the atom currently -+ * executing on a job slot is the tiler job chain at the start of a renderpass. -+ * -+ * Return 0 if successful, otherwise a negative error code. -+ */ -+int kbase_job_slot_softstop_start_rp(struct kbase_context *kctx, -+ struct kbase_va_region *reg); ++int kbase_hwcnt_virtualizer_client_create(struct kbase_hwcnt_virtualizer *hvirt, ++ const struct kbase_hwcnt_enable_map *enable_map, ++ struct kbase_hwcnt_virtualizer_client **out_hvcli) ++{ ++ int errcode; ++ struct kbase_hwcnt_virtualizer_client *hvcli; + -+void kbase_job_slot_softstop(struct kbase_device *kbdev, int js, -+ struct kbase_jd_atom *target_katom); -+void kbase_job_slot_softstop_swflags(struct kbase_device *kbdev, int js, -+ struct kbase_jd_atom *target_katom, u32 sw_flags); -+void kbase_job_slot_hardstop(struct kbase_context *kctx, int js, -+ struct kbase_jd_atom *target_katom); -+void kbase_job_check_enter_disjoint(struct kbase_device *kbdev, u32 action, -+ base_jd_core_req core_reqs, struct kbase_jd_atom *target_katom); -+void kbase_job_check_leave_disjoint(struct kbase_device *kbdev, -+ struct kbase_jd_atom *target_katom); ++ if (!hvirt || !enable_map || !out_hvcli || (enable_map->metadata != hvirt->metadata)) ++ return -EINVAL; + -+#endif /* !MALI_USE_CSF */ ++ errcode = kbasep_hwcnt_virtualizer_client_alloc(hvirt->metadata, &hvcli); ++ if (errcode) ++ return errcode; + -+void kbase_event_post(struct kbase_context *ctx, struct kbase_jd_atom *event); -+#if !MALI_USE_CSF -+int kbase_event_dequeue(struct kbase_context *ctx, struct base_jd_event_v2 *uevent); -+#endif /* !MALI_USE_CSF */ -+int kbase_event_pending(struct kbase_context *ctx); -+int kbase_event_init(struct kbase_context *kctx); -+void kbase_event_close(struct kbase_context *kctx); -+void kbase_event_cleanup(struct kbase_context *kctx); -+void kbase_event_wakeup(struct kbase_context *kctx); ++ mutex_lock(&hvirt->lock); + -+/** -+ * kbasep_jit_alloc_validate() - Validate the JIT allocation info. -+ * -+ * @kctx: Pointer to the kbase context within which the JIT -+ * allocation is to be validated. -+ * @info: Pointer to struct @base_jit_alloc_info -+ * which is to be validated. -+ * @return: 0 if jit allocation is valid; negative error code otherwise -+ */ -+int kbasep_jit_alloc_validate(struct kbase_context *kctx, -+ struct base_jit_alloc_info *info); ++ errcode = kbasep_hwcnt_virtualizer_client_add(hvirt, hvcli, enable_map); + -+/** -+ * kbase_jit_retry_pending_alloc() - Retry blocked just-in-time memory -+ * allocations. -+ * -+ * @kctx: Pointer to the kbase context within which the just-in-time -+ * memory allocations are to be retried. -+ */ -+void kbase_jit_retry_pending_alloc(struct kbase_context *kctx); ++ mutex_unlock(&hvirt->lock); + -+/** -+ * kbase_free_user_buffer() - Free memory allocated for struct -+ * @kbase_debug_copy_buffer. -+ * -+ * @buffer: Pointer to the memory location allocated for the object -+ * of the type struct @kbase_debug_copy_buffer. -+ */ -+static inline void kbase_free_user_buffer( -+ struct kbase_debug_copy_buffer *buffer) ++ if (errcode) { ++ kbasep_hwcnt_virtualizer_client_free(hvcli); ++ return errcode; ++ } ++ ++ *out_hvcli = hvcli; ++ return 0; ++} ++ ++void kbase_hwcnt_virtualizer_client_destroy(struct kbase_hwcnt_virtualizer_client *hvcli) +{ -+ struct page **pages = buffer->extres_pages; -+ int nr_pages = buffer->nr_extres_pages; ++ if (!hvcli) ++ return; + -+ if (pages) { -+ int i; ++ mutex_lock(&hvcli->hvirt->lock); + -+ for (i = 0; i < nr_pages; i++) { -+ struct page *pg = pages[i]; ++ kbasep_hwcnt_virtualizer_client_remove(hvcli->hvirt, hvcli); + -+ if (pg) -+ put_page(pg); -+ } -+ kfree(pages); -+ } ++ mutex_unlock(&hvcli->hvirt->lock); ++ ++ kbasep_hwcnt_virtualizer_client_free(hvcli); +} + -+/** -+ * kbase_mem_copy_from_extres() - Copy from external resources. -+ * -+ * @kctx: kbase context within which the copying is to take place. -+ * @buf_data: Pointer to the information about external resources: -+ * pages pertaining to the external resource, number of -+ * pages to copy. -+ */ -+int kbase_mem_copy_from_extres(struct kbase_context *kctx, -+ struct kbase_debug_copy_buffer *buf_data); -+#if !MALI_USE_CSF -+int kbase_process_soft_job(struct kbase_jd_atom *katom); -+int kbase_prepare_soft_job(struct kbase_jd_atom *katom); -+void kbase_finish_soft_job(struct kbase_jd_atom *katom); -+void kbase_cancel_soft_job(struct kbase_jd_atom *katom); -+void kbase_resume_suspended_soft_jobs(struct kbase_device *kbdev); -+void kbasep_remove_waiting_soft_job(struct kbase_jd_atom *katom); -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+void kbase_soft_event_wait_callback(struct kbase_jd_atom *katom); -+#endif -+int kbase_soft_event_update(struct kbase_context *kctx, -+ u64 event, -+ unsigned char new_status); ++int kbase_hwcnt_virtualizer_init(struct kbase_hwcnt_context *hctx, u64 dump_threshold_ns, ++ struct kbase_hwcnt_virtualizer **out_hvirt) ++{ ++ struct kbase_hwcnt_virtualizer *virt; ++ const struct kbase_hwcnt_metadata *metadata; + -+void kbasep_soft_job_timeout_worker(struct timer_list *timer); -+void kbasep_complete_triggered_soft_events(struct kbase_context *kctx, u64 evt); -+#endif /* !MALI_USE_CSF */ ++ if (!hctx || !out_hvirt) ++ return -EINVAL; + -+void kbasep_as_do_poke(struct work_struct *work); ++ metadata = kbase_hwcnt_context_metadata(hctx); ++ if (!metadata) ++ return -EINVAL; + -+/** -+ * Check whether a system suspend is in progress, or has already been suspended -+ * -+ * The caller should ensure that either kbdev->pm.active_count_lock is held, or -+ * a dmb was executed recently (to ensure the value is most -+ * up-to-date). However, without a lock the value could change afterwards. -+ * -+ * @return false if a suspend is not in progress -+ * @return !=false otherwise -+ */ -+static inline bool kbase_pm_is_suspending(struct kbase_device *kbdev) ++ virt = kzalloc(sizeof(*virt), GFP_KERNEL); ++ if (!virt) ++ return -ENOMEM; ++ ++ virt->hctx = hctx; ++ virt->dump_threshold_ns = dump_threshold_ns; ++ virt->metadata = metadata; ++ ++ mutex_init(&virt->lock); ++ INIT_LIST_HEAD(&virt->clients); ++ ++ *out_hvirt = virt; ++ return 0; ++} ++ ++void kbase_hwcnt_virtualizer_term(struct kbase_hwcnt_virtualizer *hvirt) +{ -+ return kbdev->pm.suspending; ++ if (!hvirt) ++ return; ++ ++ /* Non-zero client count implies client leak */ ++ if (WARN_ON(hvirt->client_count != 0)) { ++ struct kbase_hwcnt_virtualizer_client *pos, *n; ++ ++ list_for_each_entry_safe (pos, n, &hvirt->clients, node) ++ kbase_hwcnt_virtualizer_client_destroy(pos); ++ } ++ ++ WARN_ON(hvirt->client_count != 0); ++ WARN_ON(hvirt->accum); ++ ++ kfree(hvirt); +} + -+#ifdef CONFIG_MALI_ARBITER_SUPPORT ++bool kbase_hwcnt_virtualizer_queue_work(struct kbase_hwcnt_virtualizer *hvirt, ++ struct work_struct *work) ++{ ++ if (WARN_ON(!hvirt) || WARN_ON(!work)) ++ return false; ++ ++ return kbase_hwcnt_context_queue_work(hvirt->hctx, work); ++} +diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.h +new file mode 100644 +index 000000000..485ba7496 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.h +@@ -0,0 +1,151 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* -+ * Check whether a gpu lost is in progress + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * (C) COPYRIGHT 2018, 2020-2022 ARM Limited. All rights reserved. + * -+ * Indicates whether a gpu lost has been received and jobs are no longer -+ * being scheduled ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Return: false if gpu is lost -+ * Return: != false otherwise + */ -+static inline bool kbase_pm_is_gpu_lost(struct kbase_device *kbdev) -+{ -+ return (atomic_read(&kbdev->pm.gpu_lost) == 0 ? false : true); -+} + +/* -+ * Set or clear gpu lost state -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * @gpu_lost: true to activate GPU lost state, FALSE is deactive it ++ * Hardware counter virtualizer API. + * -+ * Puts power management code into gpu lost state or takes it out of the -+ * state. Once in gpu lost state new GPU jobs will no longer be -+ * scheduled. ++ * Virtualizes a hardware counter context, so multiple clients can access ++ * a single hardware counter resource as though each was the exclusive user. + */ -+static inline void kbase_pm_set_gpu_lost(struct kbase_device *kbdev, -+ bool gpu_lost) -+{ -+ atomic_set(&kbdev->pm.gpu_lost, (gpu_lost ? 1 : 0)); -+} -+#endif ++ ++#ifndef _KBASE_HWCNT_VIRTUALIZER_H_ ++#define _KBASE_HWCNT_VIRTUALIZER_H_ ++ ++#include ++#include ++ ++struct kbase_hwcnt_context; ++struct kbase_hwcnt_virtualizer; ++struct kbase_hwcnt_virtualizer_client; ++struct kbase_hwcnt_enable_map; ++struct kbase_hwcnt_dump_buffer; + +/** -+ * kbase_pm_is_active - Determine whether the GPU is active -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * This takes into account whether there is an active context reference. ++ * kbase_hwcnt_virtualizer_init - Initialise a hardware counter virtualizer. ++ * @hctx: Non-NULL pointer to the hardware counter context to ++ * virtualize. ++ * @dump_threshold_ns: Minimum threshold period for dumps between different ++ * clients where a new accumulator dump will not be ++ * performed, and instead accumulated values will be used. ++ * If 0, rate limiting will be disabled. ++ * @out_hvirt: Non-NULL pointer to where the pointer to the created ++ * virtualizer will be stored on success. + * -+ * Return: true if the GPU is active, false otherwise ++ * Return: 0 on success, else error code. + */ -+static inline bool kbase_pm_is_active(struct kbase_device *kbdev) -+{ -+ return kbdev->pm.active_count > 0; -+} ++int kbase_hwcnt_virtualizer_init(struct kbase_hwcnt_context *hctx, u64 dump_threshold_ns, ++ struct kbase_hwcnt_virtualizer **out_hvirt); + +/** -+ * kbase_pm_metrics_start - Start the utilization metrics timer -+ * @kbdev: Pointer to the kbase device for which to start the utilization -+ * metrics calculation thread. -+ * -+ * Start the timer that drives the metrics calculation, runs the custom DVFS. ++ * kbase_hwcnt_virtualizer_term - Terminate a hardware counter virtualizer. ++ * @hvirt: Pointer to virtualizer to be terminated. + */ -+void kbase_pm_metrics_start(struct kbase_device *kbdev); ++void kbase_hwcnt_virtualizer_term(struct kbase_hwcnt_virtualizer *hvirt); + +/** -+ * kbase_pm_metrics_stop - Stop the utilization metrics timer -+ * @kbdev: Pointer to the kbase device for which to stop the utilization -+ * metrics calculation thread. ++ * kbase_hwcnt_virtualizer_metadata - Get the hardware counter metadata used by ++ * the virtualizer, so related counter data ++ * structures can be created. ++ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. + * -+ * Stop the timer that drives the metrics calculation, runs the custom DVFS. ++ * Return: Non-NULL pointer to metadata, or NULL on error. + */ -+void kbase_pm_metrics_stop(struct kbase_device *kbdev); ++const struct kbase_hwcnt_metadata * ++kbase_hwcnt_virtualizer_metadata(struct kbase_hwcnt_virtualizer *hvirt); + -+#if !MALI_USE_CSF +/** -+ * Return the atom's ID, as was originally supplied by userspace in -+ * base_jd_atom::atom_number ++ * kbase_hwcnt_virtualizer_client_create - Create a new virtualizer client. ++ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. ++ * @enable_map: Non-NULL pointer to the enable map for the client. Must have the ++ * same metadata as the virtualizer. ++ * @out_hvcli: Non-NULL pointer to where the pointer to the created client will ++ * be stored on success. ++ * ++ * Return: 0 on success, else error code. + */ -+static inline int kbase_jd_atom_id(struct kbase_context *kctx, struct kbase_jd_atom *katom) -+{ -+ int result; -+ -+ KBASE_DEBUG_ASSERT(kctx); -+ KBASE_DEBUG_ASSERT(katom); -+ KBASE_DEBUG_ASSERT(katom->kctx == kctx); ++int kbase_hwcnt_virtualizer_client_create(struct kbase_hwcnt_virtualizer *hvirt, ++ const struct kbase_hwcnt_enable_map *enable_map, ++ struct kbase_hwcnt_virtualizer_client **out_hvcli); + -+ result = katom - &kctx->jctx.atoms[0]; -+ KBASE_DEBUG_ASSERT(result >= 0 && result <= BASE_JD_ATOM_COUNT); -+ return result; -+} ++/** ++ * kbase_hwcnt_virtualizer_client_destroy() - Destroy a virtualizer client. ++ * @hvcli: Pointer to the hardware counter client. ++ */ ++void kbase_hwcnt_virtualizer_client_destroy(struct kbase_hwcnt_virtualizer_client *hvcli); + +/** -+ * kbase_jd_atom_from_id - Return the atom structure for the given atom ID -+ * @kctx: Context pointer -+ * @id: ID of atom to retrieve ++ * kbase_hwcnt_virtualizer_client_set_counters - Perform a dump of the client's ++ * currently enabled counters, and ++ * enable a new set of counters ++ * that will be used for ++ * subsequent dumps. ++ * @hvcli: Non-NULL pointer to the virtualizer client. ++ * @enable_map: Non-NULL pointer to the new counter enable map for the client. ++ * Must have the same metadata as the virtualizer. ++ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will ++ * be written out to on success. ++ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will ++ * be written out to on success. ++ * @dump_buf: Pointer to the buffer where the dump will be written out to on ++ * success. If non-NULL, must have the same metadata as the ++ * accumulator. If NULL, the dump will be discarded. + * -+ * Return: Pointer to struct kbase_jd_atom associated with the supplied ID ++ * Return: 0 on success or error code. + */ -+static inline struct kbase_jd_atom *kbase_jd_atom_from_id( -+ struct kbase_context *kctx, int id) -+{ -+ return &kctx->jctx.atoms[id]; -+} -+#endif /* !MALI_USE_CSF */ ++int kbase_hwcnt_virtualizer_client_set_counters(struct kbase_hwcnt_virtualizer_client *hvcli, ++ const struct kbase_hwcnt_enable_map *enable_map, ++ u64 *ts_start_ns, u64 *ts_end_ns, ++ struct kbase_hwcnt_dump_buffer *dump_buf); + +/** -+ * Initialize the disjoint state -+ * -+ * The disjoint event count and state are both set to zero. ++ * kbase_hwcnt_virtualizer_client_dump - Perform a dump of the client's ++ * currently enabled counters. ++ * @hvcli: Non-NULL pointer to the virtualizer client. ++ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will ++ * be written out to on success. ++ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will ++ * be written out to on success. ++ * @dump_buf: Pointer to the buffer where the dump will be written out to on ++ * success. If non-NULL, must have the same metadata as the ++ * accumulator. If NULL, the dump will be discarded. + * -+ * Disjoint functions usage: ++ * Return: 0 on success or error code. ++ */ ++int kbase_hwcnt_virtualizer_client_dump(struct kbase_hwcnt_virtualizer_client *hvcli, ++ u64 *ts_start_ns, u64 *ts_end_ns, ++ struct kbase_hwcnt_dump_buffer *dump_buf); ++ ++/** ++ * kbase_hwcnt_virtualizer_queue_work() - Queue hardware counter related async ++ * work on a workqueue specialized for ++ * hardware counters. ++ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. ++ * @work: Non-NULL pointer to work to queue. + * -+ * The disjoint event count should be incremented whenever a disjoint event occurs. ++ * Return: false if work was already on a queue, true otherwise. + * -+ * There are several cases which are regarded as disjoint behavior. Rather than just increment -+ * the counter during disjoint events we also increment the counter when jobs may be affected -+ * by what the GPU is currently doing. To facilitate this we have the concept of disjoint state. ++ * This is a convenience function that directly calls the underlying ++ * kbase_hwcnt_context's kbase_hwcnt_context_queue_work. ++ */ ++bool kbase_hwcnt_virtualizer_queue_work(struct kbase_hwcnt_virtualizer *hvirt, ++ struct work_struct *work); ++ ++#endif /* _KBASE_HWCNT_VIRTUALIZER_H_ */ +diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if.h +new file mode 100644 +index 000000000..501c0087b +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if.h +@@ -0,0 +1,89 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* + * -+ * Disjoint state is entered during GPU reset. Increasing the disjoint state also increases -+ * the count of disjoint events. ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. + * -+ * The disjoint state is then used to increase the count of disjoint events during job submission -+ * and job completion. Any atom submitted or completed while the disjoint state is greater than -+ * zero is regarded as a disjoint event. ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. + * -+ * The disjoint event counter is also incremented immediately whenever a job is soft stopped -+ * and during context creation. ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. + * -+ * @param kbdev The kbase device ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Return: 0 on success and non-zero value on failure. + */ -+void kbase_disjoint_init(struct kbase_device *kbdev); + -+/** -+ * Increase the count of disjoint events -+ * called when a disjoint event has happened -+ * -+ * @param kbdev The kbase device ++/* ++ * Virtual interface for hardware counter watchdog. + */ -+void kbase_disjoint_event(struct kbase_device *kbdev); + -+/** -+ * Increase the count of disjoint events only if the GPU is in a disjoint state -+ * -+ * This should be called when something happens which could be disjoint if the GPU -+ * is in a disjoint state. The state refcount keeps track of this. -+ * -+ * @param kbdev The kbase device ++#ifndef _KBASE_HWCNT_WATCHDOG_IF_H_ ++#define _KBASE_HWCNT_WATCHDOG_IF_H_ ++ ++#include ++ ++/* ++ * Opaque structure of information used to create a watchdog timer interface. + */ -+void kbase_disjoint_event_potential(struct kbase_device *kbdev); ++struct kbase_hwcnt_watchdog_info; + +/** -+ * Returns the count of disjoint events ++ * typedef kbase_hwcnt_watchdog_callback_fn - Callback function when watchdog timer is done + * -+ * @param kbdev The kbase device -+ * @return the count of disjoint events ++ * @user_data: Pointer to the callback user data. + */ -+u32 kbase_disjoint_event_get(struct kbase_device *kbdev); ++typedef void kbase_hwcnt_watchdog_callback_fn(void *user_data); + +/** -+ * Increment the refcount state indicating that the GPU is in a disjoint state. ++ * typedef kbase_hwcnt_watchdog_enable_fn - Enable watchdog timer + * -+ * Also Increment the disjoint event count (calls @ref kbase_disjoint_event) -+ * eventually after the disjoint state has completed @ref kbase_disjoint_state_down -+ * should be called ++ * @timer: Non-NULL pointer to a watchdog timer interface context ++ * @period_ms: Period in milliseconds of the watchdog timer ++ * @callback: Non-NULL pointer to a watchdog callback function ++ * @user_data: Pointer to the user data, used when watchdog timer callback is called + * -+ * @param kbdev The kbase device ++ * Return: 0 if the watchdog timer enabled successfully, error code otherwise. + */ -+void kbase_disjoint_state_up(struct kbase_device *kbdev); ++typedef int kbase_hwcnt_watchdog_enable_fn(const struct kbase_hwcnt_watchdog_info *timer, ++ u32 period_ms, ++ kbase_hwcnt_watchdog_callback_fn *callback, ++ void *user_data); + +/** -+ * Decrement the refcount state -+ * -+ * Also Increment the disjoint event count (calls @ref kbase_disjoint_event) -+ * -+ * Called after @ref kbase_disjoint_state_up once the disjoint state is over ++ * typedef kbase_hwcnt_watchdog_disable_fn - Disable watchdog timer + * -+ * @param kbdev The kbase device ++ * @timer: Non-NULL pointer to a watchdog timer interface context + */ -+void kbase_disjoint_state_down(struct kbase_device *kbdev); ++typedef void kbase_hwcnt_watchdog_disable_fn(const struct kbase_hwcnt_watchdog_info *timer); + +/** -+ * If a job is soft stopped and the number of contexts is >= this value -+ * it is reported as a disjoint event ++ * typedef kbase_hwcnt_watchdog_modify_fn - Modify watchdog timer's timeout ++ * ++ * @timer: Non-NULL pointer to a watchdog timer interface context ++ * @delay_ms: Watchdog timer expiration in milliseconds + */ -+#define KBASE_DISJOINT_STATE_INTERLEAVED_CONTEXT_COUNT_THRESHOLD 2 ++typedef void kbase_hwcnt_watchdog_modify_fn(const struct kbase_hwcnt_watchdog_info *timer, ++ u32 delay_ms); + -+#if !defined(UINT64_MAX) -+ #define UINT64_MAX ((uint64_t)0xFFFFFFFFFFFFFFFFULL) -+#endif ++/** ++ * struct kbase_hwcnt_watchdog_interface - Hardware counter watchdog virtual interface. ++ * ++ * @timer: Immutable watchdog timer info ++ * @enable: Function ptr to enable watchdog ++ * @disable: Function ptr to disable watchdog ++ * @modify: Function ptr to modify watchdog ++ */ ++struct kbase_hwcnt_watchdog_interface { ++ const struct kbase_hwcnt_watchdog_info *timer; ++ kbase_hwcnt_watchdog_enable_fn *enable; ++ kbase_hwcnt_watchdog_disable_fn *disable; ++ kbase_hwcnt_watchdog_modify_fn *modify; ++}; + -+#endif -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c -new file mode 100755 -index 000000000000..76bbfffe03a0 ++#endif /* _KBASE_HWCNT_WATCHDOG_IF_H_ */ +diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.c +new file mode 100644 +index 000000000..4caa832cd --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c -@@ -0,0 +1,113 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.c +@@ -0,0 +1,157 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2016-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -191573,115 +220188,159 @@ index 000000000000..76bbfffe03a0 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include ++#include "mali_kbase.h" ++#include "hwcnt/mali_kbase_hwcnt_watchdog_if.h" ++#include "hwcnt/mali_kbase_hwcnt_watchdog_if_timer.h" + -+#include -+#include -+#include ++#include ++#include + -+#ifdef CONFIG_DEBUG_FS -+#ifdef CONFIG_MALI_BIFROST_DEBUG ++/** ++ * struct kbase_hwcnt_watchdog_if_timer_info - Timer information for watchdog ++ * interface. ++ * ++ * @workq: Single threaded work queue in which to execute callbacks. ++ * @dwork: Worker to execute callback function. ++ * @timer_enabled: True if watchdog timer enabled, otherwise false ++ * @callback: Watchdog callback function ++ * @user_data: Pointer to user data passed as argument to the callback ++ * function ++ */ ++struct kbase_hwcnt_watchdog_if_timer_info { ++ struct workqueue_struct *workq; ++ struct delayed_work dwork; ++ bool timer_enabled; ++ kbase_hwcnt_watchdog_callback_fn *callback; ++ void *user_data; ++}; + -+static int kbase_as_fault_read(struct seq_file *sfile, void *data) ++/** ++ * kbasep_hwcnt_watchdog_callback() - Watchdog callback ++ * ++ * @work: Work structure ++ * ++ * Function to be called in a work queue after watchdog timer has expired. ++ */ ++static void kbasep_hwcnt_watchdog_callback(struct work_struct *const work) +{ -+ uintptr_t as_no = (uintptr_t) sfile->private; ++ struct kbase_hwcnt_watchdog_if_timer_info *const info = ++ container_of(work, struct kbase_hwcnt_watchdog_if_timer_info, dwork.work); + -+ struct list_head *entry; -+ const struct list_head *kbdev_list; -+ struct kbase_device *kbdev = NULL; ++ if (info->callback) ++ info->callback(info->user_data); ++} + -+ kbdev_list = kbase_device_get_list(); ++static int kbasep_hwcnt_watchdog_if_timer_enable( ++ const struct kbase_hwcnt_watchdog_info *const timer, u32 const period_ms, ++ kbase_hwcnt_watchdog_callback_fn *const callback, void *const user_data) ++{ ++ struct kbase_hwcnt_watchdog_if_timer_info *const timer_info = (void *)timer; + -+ list_for_each(entry, kbdev_list) { -+ kbdev = list_entry(entry, struct kbase_device, entry); ++ if (WARN_ON(!timer) || WARN_ON(!callback) || WARN_ON(timer_info->timer_enabled)) ++ return -EINVAL; + -+ if (kbdev->debugfs_as_read_bitmap & (1ULL << as_no)) { ++ timer_info->callback = callback; ++ timer_info->user_data = user_data; + -+ /* don't show this one again until another fault occors */ -+ kbdev->debugfs_as_read_bitmap &= ~(1ULL << as_no); ++ queue_delayed_work(timer_info->workq, &timer_info->dwork, msecs_to_jiffies(period_ms)); ++ timer_info->timer_enabled = true; + -+ /* output the last page fault addr */ -+ seq_printf(sfile, "%llu\n", -+ (u64) kbdev->as[as_no].pf_data.addr); -+ } ++ return 0; ++} + -+ } ++static void ++kbasep_hwcnt_watchdog_if_timer_disable(const struct kbase_hwcnt_watchdog_info *const timer) ++{ ++ struct kbase_hwcnt_watchdog_if_timer_info *const timer_info = (void *)timer; + -+ kbase_device_put_list(kbdev_list); ++ if (WARN_ON(!timer)) ++ return; + -+ return 0; ++ if (!timer_info->timer_enabled) ++ return; ++ ++ cancel_delayed_work_sync(&timer_info->dwork); ++ timer_info->timer_enabled = false; +} + -+static int kbase_as_fault_debugfs_open(struct inode *in, struct file *file) ++static void ++kbasep_hwcnt_watchdog_if_timer_modify(const struct kbase_hwcnt_watchdog_info *const timer, ++ u32 const delay_ms) +{ -+ return single_open(file, kbase_as_fault_read, in->i_private); ++ struct kbase_hwcnt_watchdog_if_timer_info *const timer_info = (void *)timer; ++ ++ if (WARN_ON(!timer) || WARN_ON(!timer_info->timer_enabled)) ++ return; ++ ++ mod_delayed_work(timer_info->workq, &timer_info->dwork, msecs_to_jiffies(delay_ms)); +} + -+static const struct file_operations as_fault_fops = { -+ .owner = THIS_MODULE, -+ .open = kbase_as_fault_debugfs_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; ++void kbase_hwcnt_watchdog_if_timer_destroy(struct kbase_hwcnt_watchdog_interface *const watchdog_if) ++{ ++ struct kbase_hwcnt_watchdog_if_timer_info *timer_info; + -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+#endif /* CONFIG_DEBUG_FS */ ++ if (WARN_ON(!watchdog_if)) ++ return; + -+/* -+ * Initialize debugfs entry for each address space -+ */ -+void kbase_as_fault_debugfs_init(struct kbase_device *kbdev) ++ timer_info = (void *)watchdog_if->timer; ++ ++ if (WARN_ON(!timer_info)) ++ return; ++ ++ destroy_workqueue(timer_info->workq); ++ kfree(timer_info); ++ ++ *watchdog_if = (struct kbase_hwcnt_watchdog_interface){ ++ .timer = NULL, .enable = NULL, .disable = NULL, .modify = NULL ++ }; ++} ++ ++int kbase_hwcnt_watchdog_if_timer_create(struct kbase_hwcnt_watchdog_interface *const watchdog_if) +{ -+#ifdef CONFIG_DEBUG_FS -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ uint i; -+ char as_name[64]; -+ struct dentry *debugfs_directory; ++ struct kbase_hwcnt_watchdog_if_timer_info *timer_info; + -+ kbdev->debugfs_as_read_bitmap = 0ULL; ++ if (WARN_ON(!watchdog_if)) ++ return -EINVAL; + -+ KBASE_DEBUG_ASSERT(kbdev->nr_hw_address_spaces); -+ KBASE_DEBUG_ASSERT(sizeof(kbdev->as[0].pf_data.addr) == sizeof(u64)); ++ timer_info = kmalloc(sizeof(*timer_info), GFP_KERNEL); ++ if (!timer_info) ++ return -ENOMEM; + -+ debugfs_directory = debugfs_create_dir("address_spaces", -+ kbdev->mali_debugfs_directory); ++ *timer_info = (struct kbase_hwcnt_watchdog_if_timer_info){ .timer_enabled = false }; + -+ if (debugfs_directory) { -+ for (i = 0; i < kbdev->nr_hw_address_spaces; i++) { -+ snprintf(as_name, ARRAY_SIZE(as_name), "as%u", i); -+ debugfs_create_file(as_name, S_IRUGO, -+ debugfs_directory, -+ (void *)(uintptr_t)i, -+ &as_fault_fops); -+ } -+ } else { -+ dev_warn(kbdev->dev, -+ "unable to create address_spaces debugfs directory"); -+ } ++ INIT_DELAYED_WORK(&timer_info->dwork, kbasep_hwcnt_watchdog_callback); + -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+#endif /* CONFIG_DEBUG_FS */ -+ return; ++ *watchdog_if = (struct kbase_hwcnt_watchdog_interface){ ++ .timer = (void *)timer_info, ++ .enable = kbasep_hwcnt_watchdog_if_timer_enable, ++ .disable = kbasep_hwcnt_watchdog_if_timer_disable, ++ .modify = kbasep_hwcnt_watchdog_if_timer_modify, ++ }; ++ ++ timer_info->workq = alloc_workqueue("mali_hwc_watchdog_wq", WQ_HIGHPRI | WQ_UNBOUND, 1); ++ if (timer_info->workq) ++ return 0; ++ ++ kfree(timer_info); ++ return -ENOMEM; +} -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h -new file mode 100755 -index 000000000000..58d7fcf030a4 +diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.h +new file mode 100644 +index 000000000..a545ad3e3 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h -@@ -0,0 +1,50 @@ ++++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.h +@@ -0,0 +1,48 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -191692,99 +220351,91 @@ index 000000000000..58d7fcf030a4 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#ifndef _KBASE_AS_FAULT_DEBUG_FS_H -+#define _KBASE_AS_FAULT_DEBUG_FS_H ++/* ++ * Concrete implementation of kbase_hwcnt_watchdog_interface for HWC backend ++ */ ++ ++#ifndef _KBASE_HWCNT_WATCHDOG_IF_TIMER_H_ ++#define _KBASE_HWCNT_WATCHDOG_IF_TIMER_H_ ++ ++struct kbase_hwcnt_watchdog_interface; + +/** -+ * kbase_as_fault_debugfs_init() - Add debugfs files for reporting page faults ++ * kbase_hwcnt_watchdog_if_timer_create() - Create a watchdog interface of hardware counter backend. + * -+ * @kbdev: Pointer to kbase_device ++ * @watchdog_if: Non-NULL pointer to watchdog interface that is filled in on creation success ++ * ++ * Return: 0 on success, error otherwise. + */ -+void kbase_as_fault_debugfs_init(struct kbase_device *kbdev); ++int kbase_hwcnt_watchdog_if_timer_create(struct kbase_hwcnt_watchdog_interface *watchdog_if); + +/** -+ * kbase_as_fault_debugfs_new() - make the last fault available on debugfs ++ * kbase_hwcnt_watchdog_if_timer_destroy() - Destroy a watchdog interface of hardware counter ++ * backend. + * -+ * @kbdev: Pointer to kbase_device -+ * @as_no: The address space the fault occurred on ++ * @watchdog_if: Pointer to watchdog interface to destroy + */ -+static inline void -+kbase_as_fault_debugfs_new(struct kbase_device *kbdev, int as_no) -+{ -+#ifdef CONFIG_DEBUG_FS -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ kbdev->debugfs_as_read_bitmap |= (1ULL << as_no); -+#endif /* CONFIG_DEBUG_FS */ -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+ return; -+} ++void kbase_hwcnt_watchdog_if_timer_destroy(struct kbase_hwcnt_watchdog_interface *watchdog_if); + -+#endif /*_KBASE_AS_FAULT_DEBUG_FS_H*/ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_bits.h b/drivers/gpu/arm/bifrost/mali_kbase_bits.h ++#endif /* _KBASE_HWCNT_WATCHDOG_IF_TIMER_H_ */ +diff --git a/drivers/gpu/arm/bifrost/ipa/Kbuild b/drivers/gpu/arm/bifrost/ipa/Kbuild new file mode 100755 -index 000000000000..2c110937a792 +index 000000000..0be664c47 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_bits.h -@@ -0,0 +1,41 @@ -+/* -+ * -+ * (C) COPYRIGHT ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ *//* SPDX-License-Identifier: GPL-2.0 */ -+/* -+ * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ */ ++++ b/drivers/gpu/arm/bifrost/ipa/Kbuild +@@ -0,0 +1,35 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++# ++# (C) COPYRIGHT 2016-2018, 2020-2021 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU license. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, you can access it online at ++# http://www.gnu.org/licenses/gpl-2.0.html. ++# ++# + -+#ifndef _KBASE_BITS_H_ -+#define _KBASE_BITS_H_ ++bifrost_kbase-y += \ ++ ipa/mali_kbase_ipa_simple.o \ ++ ipa/mali_kbase_ipa.o + -+#if (KERNEL_VERSION(4, 19, 0) <= LINUX_VERSION_CODE) -+#include -+#else -+#include -+#endif ++bifrost_kbase-$(CONFIG_DEBUG_FS) += ipa/mali_kbase_ipa_debugfs.o + -+#endif /* _KBASE_BITS_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c -new file mode 100755 -index 000000000000..27a03cf02138 ++ifeq ($(MALI_USE_CSF),1) ++ bifrost_kbase-y += \ ++ ipa/backend/mali_kbase_ipa_counter_csf.o \ ++ ipa/backend/mali_kbase_ipa_counter_common_csf.o ++else ++ bifrost_kbase-y += \ ++ ipa/backend/mali_kbase_ipa_counter_jm.o \ ++ ipa/backend/mali_kbase_ipa_counter_common_jm.o ++endif +diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.c b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.c +new file mode 100644 +index 000000000..60b061ef6 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c -@@ -0,0 +1,67 @@ ++++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.c +@@ -0,0 +1,457 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2012-2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -191795,307 +220446,459 @@ index 000000000000..27a03cf02138 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + ++#include "mali_kbase_ipa_counter_common_csf.h" ++#include "ipa/mali_kbase_ipa_debugfs.h" + ++#define DEFAULT_SCALING_FACTOR 5 + -+/* -+ * Cache Policy API. ++/* If the value of GPU_ACTIVE is below this, use the simple model ++ * instead, to avoid extrapolating small amounts of counter data across ++ * large sample periods. + */ ++#define DEFAULT_MIN_SAMPLE_CYCLES 10000 + -+#include "mali_kbase_cache_policy.h" ++/* Typical value for the sampling interval is expected to be less than 100ms, ++ * So 5 seconds is a reasonable upper limit for the time gap between the ++ * 2 samples. ++ */ ++#define MAX_SAMPLE_INTERVAL_MS ((s64)5000) + -+/* -+ * The output flags should be a combination of the following values: -+ * KBASE_REG_CPU_CACHED: CPU cache should be enabled -+ * KBASE_REG_GPU_CACHED: GPU cache should be enabled ++/* Maximum increment that is expected for a counter value during a sampling ++ * interval is derived assuming ++ * - max sampling interval of 1 second. ++ * - max GPU frequency of 2 GHz. ++ * - max number of cores as 32. ++ * - max increment of 4 in per core counter value at every clock cycle. + * -+ * NOTE: Some components within the GPU might only be able to access memory -+ * that is KBASE_REG_GPU_CACHED. Refer to the specific GPU implementation for -+ * more details. ++ * So max increment = 2 * 10^9 * 32 * 4 = ~2^38. ++ * If a counter increases by an amount greater than this value, then an error ++ * will be returned and the simple power model will be used. + */ -+u32 kbase_cache_enabled(u32 flags, u32 nr_pages) -+{ -+ u32 cache_flags = 0; -+ -+ CSTD_UNUSED(nr_pages); ++#define MAX_COUNTER_INCREMENT (((u64)1 << 38) - 1) + -+ if (!(flags & BASE_MEM_UNCACHED_GPU)) -+ cache_flags |= KBASE_REG_GPU_CACHED; ++static inline s64 kbase_ipa_add_saturate(s64 a, s64 b) ++{ ++ s64 rtn; + -+ if (flags & BASE_MEM_CACHED_CPU) -+ cache_flags |= KBASE_REG_CPU_CACHED; ++ if (a > 0 && (S64_MAX - a) < b) ++ rtn = S64_MAX; ++ else if (a < 0 && (S64_MIN - a) > b) ++ rtn = S64_MIN; ++ else ++ rtn = a + b; + -+ return cache_flags; ++ return rtn; +} + -+ -+void kbase_sync_single_for_device(struct kbase_device *kbdev, dma_addr_t handle, -+ size_t size, enum dma_data_direction dir) ++static s64 kbase_ipa_group_energy(s32 coeff, u64 counter_value) +{ -+ dma_sync_single_for_device(kbdev->dev, handle, size, dir); ++ /* Range: 0 < counter_value < 2^38 */ ++ ++ /* Range: -2^59 < ret < 2^59 (as -2^21 < coeff < 2^21) */ ++ return counter_value * (s64)coeff; +} + -+ -+void kbase_sync_single_for_cpu(struct kbase_device *kbdev, dma_addr_t handle, -+ size_t size, enum dma_data_direction dir) -+{ -+ dma_sync_single_for_cpu(kbdev->dev, handle, size, dir); -+} -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h -new file mode 100755 -index 000000000000..8a1e5291bf5f ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h -@@ -0,0 +1,50 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2013, 2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. ++/** ++ * kbase_ipa_attach_ipa_control() - register with kbase_ipa_control ++ * @model_data: Pointer to counter model data + * -+ * SPDX-License-Identifier: GPL-2.0 ++ * Register IPA counter model as a client of kbase_ipa_control, which ++ * provides an interface to retreive the accumulated value of hardware ++ * counters to calculate energy consumption. + * ++ * Return: 0 on success, or an error code. + */ ++static int ++kbase_ipa_attach_ipa_control(struct kbase_ipa_counter_model_data *model_data) ++{ ++ struct kbase_device *kbdev = model_data->kbdev; ++ struct kbase_ipa_control_perf_counter *perf_counters; ++ u32 cnt_idx = 0; ++ int err; ++ size_t i; + ++ /* Value for GPU_ACTIVE counter also needs to be queried. It is required ++ * for the normalization of top-level and shader core counters. ++ */ ++ model_data->num_counters = 1 + model_data->num_top_level_cntrs + ++ model_data->num_shader_cores_cntrs; + ++ perf_counters = kcalloc(model_data->num_counters, ++ sizeof(*perf_counters), GFP_KERNEL); + -+/* -+ * Cache Policy API. -+ */ ++ if (!perf_counters) { ++ dev_err(kbdev->dev, ++ "Failed to allocate memory for perf_counters array"); ++ return -ENOMEM; ++ } + -+#ifndef _KBASE_CACHE_POLICY_H_ -+#define _KBASE_CACHE_POLICY_H_ ++ /* Fill in the description for GPU_ACTIVE counter which is always ++ * needed, as mentioned above, regardless of the energy model used ++ * by the CSF GPUs. ++ */ ++ perf_counters[cnt_idx].type = KBASE_IPA_CORE_TYPE_CSHW; ++ perf_counters[cnt_idx].idx = GPU_ACTIVE_CNT_IDX; ++ perf_counters[cnt_idx].gpu_norm = false; ++ perf_counters[cnt_idx].scaling_factor = 1; ++ cnt_idx++; + -+#include "mali_kbase.h" -+#include "mali_base_kernel.h" ++ for (i = 0; i < model_data->num_top_level_cntrs; ++i) { ++ const struct kbase_ipa_counter *counter = ++ &model_data->top_level_cntrs_def[i]; + -+/** -+ * kbase_cache_enabled - Choose the cache policy for a specific region -+ * @flags: flags describing attributes of the region -+ * @nr_pages: total number of pages (backed or not) for the region -+ * -+ * Tells whether the CPU and GPU caches should be enabled or not for a specific -+ * region. -+ * This function can be modified to customize the cache policy depending on the -+ * flags and size of the region. -+ * -+ * Return: a combination of %KBASE_REG_CPU_CACHED and %KBASE_REG_GPU_CACHED -+ * depending on the cache policy -+ */ -+u32 kbase_cache_enabled(u32 flags, u32 nr_pages); ++ perf_counters[cnt_idx].type = counter->counter_block_type; ++ perf_counters[cnt_idx].idx = counter->counter_block_offset; ++ perf_counters[cnt_idx].gpu_norm = false; ++ perf_counters[cnt_idx].scaling_factor = 1; ++ cnt_idx++; ++ } + -+#endif /* _KBASE_CACHE_POLICY_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_caps.h b/drivers/gpu/arm/bifrost/mali_kbase_caps.h -new file mode 100755 -index 000000000000..b201a60fa6e3 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_caps.h -@@ -0,0 +1,65 @@ -+/* -+ * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ ++ for (i = 0; i < model_data->num_shader_cores_cntrs; ++i) { ++ const struct kbase_ipa_counter *counter = ++ &model_data->shader_cores_cntrs_def[i]; ++ ++ perf_counters[cnt_idx].type = counter->counter_block_type; ++ perf_counters[cnt_idx].idx = counter->counter_block_offset; ++ perf_counters[cnt_idx].gpu_norm = false; ++ perf_counters[cnt_idx].scaling_factor = 1; ++ cnt_idx++; ++ } ++ ++ err = kbase_ipa_control_register(kbdev, perf_counters, ++ model_data->num_counters, ++ &model_data->ipa_control_client); ++ if (err) ++ dev_err(kbdev->dev, ++ "Failed to register IPA with kbase_ipa_control"); + ++ kfree(perf_counters); ++ return err; ++} + +/** -+ * @file mali_kbase_caps.h -+ * -+ * Driver Capability Queries. ++ * kbase_ipa_detach_ipa_control() - De-register from kbase_ipa_control. ++ * @model_data: Pointer to counter model data + */ ++static void ++kbase_ipa_detach_ipa_control(struct kbase_ipa_counter_model_data *model_data) ++{ ++ if (model_data->ipa_control_client) { ++ kbase_ipa_control_unregister(model_data->kbdev, ++ model_data->ipa_control_client); ++ model_data->ipa_control_client = NULL; ++ } ++} + -+#ifndef _KBASE_CAPS_H_ -+#define _KBASE_CAPS_H_ ++static int calculate_coeff(struct kbase_ipa_counter_model_data *model_data, ++ const struct kbase_ipa_counter *const cnt_defs, ++ size_t num_counters, s32 *counter_coeffs, ++ u64 *counter_values, u32 active_cycles, u32 *coeffp) ++{ ++ u64 coeff = 0, coeff_mul = 0; ++ s64 total_energy = 0; ++ size_t i; + -+#include ++ /* Range for the 'counter_value' is [0, 2^38) ++ * Range for the 'coeff' is [-2^21, 2^21] ++ * So range for the 'group_energy' is [-2^59, 2^59) and range for the ++ * 'total_energy' is +/- 2^59 * number of IPA groups (~16), i.e. ++ * [-2^63, 2^63). ++ */ ++ for (i = 0; i < num_counters; i++) { ++ s32 coeff = counter_coeffs[i]; ++ u64 counter_value = counter_values[i]; ++ s64 group_energy = kbase_ipa_group_energy(coeff, counter_value); ++ ++ if (counter_value > MAX_COUNTER_INCREMENT) { ++ dev_warn(model_data->kbdev->dev, ++ "Increment in counter %s more than expected", ++ cnt_defs[i].name); ++ return -ERANGE; ++ } + -+typedef enum mali_kbase_cap { -+ MALI_KBASE_CAP_SYSTEM_MONITOR = 0, -+ MALI_KBASE_CAP_JIT_PRESSURE_LIMIT, -+ MALI_KBASE_CAP_MEM_GROW_ON_GPF, -+ MALI_KBASE_CAP_MEM_PROTECTED, -+ MALI_KBASE_NUM_CAPS -+} mali_kbase_cap; ++ total_energy = ++ kbase_ipa_add_saturate(total_energy, group_energy); ++ } + -+extern bool mali_kbase_supports_cap(unsigned long api_version, mali_kbase_cap cap); ++ /* Range: 0 <= coeff < 2^63 */ ++ if (total_energy >= 0) ++ coeff = total_energy; ++ else ++ dev_dbg(model_data->kbdev->dev, ++ "Energy value came negative as %lld", total_energy); + -+static inline bool mali_kbase_supports_system_monitor(unsigned long api_version) -+{ -+ return mali_kbase_supports_cap(api_version, MALI_KBASE_CAP_SYSTEM_MONITOR); -+} ++ /* Range: 0 <= coeff < 2^63 (because active_cycles >= 1). However, this ++ * can be constrained further: the value of counters that are being ++ * used for dynamic power estimation can only increment by about 128 ++ * maximum per clock cycle. This is because max number of shader ++ * cores is expected to be 32 (max number of L2 slices is expected to ++ * be 8) and some counters (per shader core) like SC_BEATS_RD_TEX_EXT & ++ * SC_EXEC_STARVE_ARITH can increment by 4 every clock cycle. ++ * Each "beat" is defined as 128 bits and each shader core can ++ * (currently) do 512 bits read and 512 bits write to/from the L2 ++ * cache per cycle, so the SC_BEATS_RD_TEX_EXT counter can increment ++ * [0, 4] per shader core per cycle. ++ * We can thus write the range of 'coeff' in terms of active_cycles: ++ * ++ * coeff = SUM(coeffN * counterN * num_cores_for_counterN) ++ * coeff <= SUM(coeffN * counterN) * max_cores ++ * coeff <= num_IPA_groups * max_coeff * max_counter * max_cores ++ * (substitute max_counter = 2^2 * active_cycles) ++ * coeff <= num_IPA_groups * max_coeff * 2^2 * active_cycles * max_cores ++ * coeff <= 2^4 * 2^21 * 2^2 * active_cycles * 2^5 ++ * coeff <= 2^32 * active_cycles ++ * ++ * So after the division: 0 <= coeff <= 2^32 ++ */ ++ coeff = div_u64(coeff, active_cycles); + -+static inline bool mali_kbase_supports_jit_pressure_limit(unsigned long api_version) -+{ -+ return mali_kbase_supports_cap(api_version, MALI_KBASE_CAP_JIT_PRESSURE_LIMIT); -+} ++ /* Not all models were derived at the same reference voltage. Voltage ++ * scaling is done by multiplying by V^2, so we need to *divide* by ++ * Vref^2 here. ++ * Range: 0 <= coeff <= 2^35 ++ */ ++ coeff = div_u64(coeff * 1000, max(model_data->reference_voltage, 1)); ++ /* Range: 0 <= coeff <= 2^38 */ ++ coeff = div_u64(coeff * 1000, max(model_data->reference_voltage, 1)); + -+static inline bool mali_kbase_supports_mem_grow_on_gpf(unsigned long api_version) -+{ -+ return mali_kbase_supports_cap(api_version, MALI_KBASE_CAP_MEM_GROW_ON_GPF); ++ /* Scale by user-specified integer factor. ++ * Range: 0 <= coeff_mul < 2^43 ++ */ ++ coeff_mul = coeff * model_data->scaling_factor; ++ ++ /* The power models have results with units ++ * mW/(MHz V^2), i.e. nW/(Hz V^2). With precision of 1/1000000, this ++ * becomes fW/(Hz V^2), which are the units of coeff_mul. However, ++ * kbase_scale_dynamic_power() expects units of pW/(Hz V^2), so divide ++ * by 1000. ++ * Range: 0 <= coeff_mul < 2^33 ++ */ ++ coeff_mul = div_u64(coeff_mul, 1000u); ++ ++ /* Clamp to a sensible range - 2^16 gives about 14W at 400MHz/750mV */ ++ *coeffp = clamp(coeff_mul, (u64)0, (u64)1 << 16); ++ ++ return 0; +} + -+static inline bool mali_kbase_supports_mem_protected(unsigned long api_version) ++int kbase_ipa_counter_dynamic_coeff(struct kbase_ipa_model *model, u32 *coeffp) +{ -+ return mali_kbase_supports_cap(api_version, MALI_KBASE_CAP_MEM_PROTECTED); -+} ++ struct kbase_ipa_counter_model_data *model_data = ++ (struct kbase_ipa_counter_model_data *)model->model_data; ++ struct kbase_device *kbdev = model->kbdev; ++ s32 *counter_coeffs_p = model_data->counter_coeffs; ++ u64 *cnt_values_p = model_data->counter_values; ++ const u64 num_counters = model_data->num_counters; ++ u32 active_cycles; ++ ktime_t now, diff; ++ s64 diff_ms; ++ int ret; + -+#endif /* __KBASE_CAPS_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c -new file mode 100755 -index 000000000000..87d5aaa6bb5d ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c -@@ -0,0 +1,105 @@ -+/* -+ * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ ++ lockdep_assert_held(&kbdev->ipa.lock); + -+#include "mali_kbase_ccswe.h" -+#include "mali_kbase_linux.h" ++ /* The last argument is supposed to be a pointer to the location that ++ * will store the time for which GPU has been in protected mode since ++ * last query. This can be passed as NULL as counter model itself will ++ * not be used when GPU enters protected mode, as IPA is supposed to ++ * switch to the simple power model. ++ */ ++ ret = kbase_ipa_control_query(kbdev, ++ model_data->ipa_control_client, ++ cnt_values_p, num_counters, NULL); ++ if (WARN_ON(ret)) ++ return ret; + -+#include -+#include ++ now = ktime_get_raw(); ++ diff = ktime_sub(now, kbdev->ipa.last_sample_time); ++ diff_ms = ktime_to_ms(diff); + -+static u64 kbasep_ccswe_cycle_at_no_lock( -+ struct kbase_ccswe *self, u64 timestamp_ns) -+{ -+ s64 diff_s, diff_ns; -+ u32 gpu_freq; ++ kbdev->ipa.last_sample_time = now; + -+ lockdep_assert_held(&self->access); ++ /* The counter values cannot be relied upon if the sampling interval was ++ * too long. Typically this will happen when the polling is started ++ * after the temperature has risen above a certain trip point. After ++ * that regular calls every 25-100 ms interval are expected. ++ */ ++ if (diff_ms > MAX_SAMPLE_INTERVAL_MS) { ++ dev_dbg(kbdev->dev, ++ "Last sample was taken %lld milli seconds ago", ++ diff_ms); ++ return -EOVERFLOW; ++ } + -+ diff_ns = timestamp_ns - self->timestamp_ns; -+ gpu_freq = diff_ns > 0 ? self->gpu_freq : self->prev_gpu_freq; ++ /* Range: 0 (GPU not used at all), to the max sampling interval, say ++ * 1 seconds, * max GPU frequency (GPU 100% utilized). ++ * 0 <= active_cycles <= 1 * ~2GHz ++ * 0 <= active_cycles < 2^31 ++ */ ++ if (*cnt_values_p > U32_MAX) { ++ dev_warn(kbdev->dev, ++ "Increment in GPU_ACTIVE counter more than expected"); ++ return -ERANGE; ++ } + -+ diff_s = div_s64(diff_ns, NSEC_PER_SEC); -+ diff_ns -= diff_s * NSEC_PER_SEC; ++ active_cycles = (u32)*cnt_values_p; + -+ return self->cycles_elapsed + diff_s * gpu_freq -+ + div_s64(diff_ns * gpu_freq, NSEC_PER_SEC); -+} ++ /* If the value of the active_cycles is less than the threshold, then ++ * return an error so that IPA framework can approximate using the ++ * cached simple model results instead. This may be more accurate ++ * than extrapolating using a very small counter dump. ++ */ ++ if (active_cycles < (u32)max(model_data->min_sample_cycles, 0)) ++ return -ENODATA; + -+void kbase_ccswe_init(struct kbase_ccswe *self) -+{ -+ memset(self, 0, sizeof(*self)); ++ /* Range: 1 <= active_cycles < 2^31 */ ++ active_cycles = max(1u, active_cycles); + -+ spin_lock_init(&self->access); ++ cnt_values_p++; ++ ret = calculate_coeff(model_data, model_data->top_level_cntrs_def, ++ model_data->num_top_level_cntrs, ++ counter_coeffs_p, cnt_values_p, active_cycles, ++ &coeffp[KBASE_IPA_BLOCK_TYPE_TOP_LEVEL]); ++ if (ret) ++ return ret; ++ ++ cnt_values_p += model_data->num_top_level_cntrs; ++ counter_coeffs_p += model_data->num_top_level_cntrs; ++ ret = calculate_coeff(model_data, model_data->shader_cores_cntrs_def, ++ model_data->num_shader_cores_cntrs, ++ counter_coeffs_p, cnt_values_p, active_cycles, ++ &coeffp[KBASE_IPA_BLOCK_TYPE_SHADER_CORES]); ++ ++ return ret; +} -+KBASE_EXPORT_TEST_API(kbase_ccswe_init); + -+u64 kbase_ccswe_cycle_at(struct kbase_ccswe *self, u64 timestamp_ns) ++void kbase_ipa_counter_reset_data(struct kbase_ipa_model *model) +{ -+ unsigned long flags; -+ u64 result; ++ struct kbase_ipa_counter_model_data *model_data = ++ (struct kbase_ipa_counter_model_data *)model->model_data; ++ u64 *cnt_values_p = model_data->counter_values; ++ const u64 num_counters = model_data->num_counters; ++ int ret; + -+ spin_lock_irqsave(&self->access, flags); -+ result = kbasep_ccswe_cycle_at_no_lock(self, timestamp_ns); -+ spin_unlock_irqrestore(&self->access, flags); ++ lockdep_assert_held(&model->kbdev->ipa.lock); + -+ return result; ++ ret = kbase_ipa_control_query(model->kbdev, ++ model_data->ipa_control_client, ++ cnt_values_p, num_counters, NULL); ++ WARN_ON(ret); +} -+KBASE_EXPORT_TEST_API(kbase_ccswe_cycle_at); + -+void kbase_ccswe_freq_change( -+ struct kbase_ccswe *self, u64 timestamp_ns, u32 gpu_freq) ++int kbase_ipa_counter_common_model_init(struct kbase_ipa_model *model, ++ const struct kbase_ipa_counter *top_level_cntrs_def, ++ size_t num_top_level_cntrs, ++ const struct kbase_ipa_counter *shader_cores_cntrs_def, ++ size_t num_shader_cores_cntrs, ++ s32 reference_voltage) +{ -+ unsigned long flags; ++ struct kbase_ipa_counter_model_data *model_data; ++ s32 *counter_coeffs_p; ++ int err = 0; ++ size_t i; + -+ spin_lock_irqsave(&self->access, flags); ++ if (!model || !top_level_cntrs_def || !shader_cores_cntrs_def || ++ !num_top_level_cntrs || !num_shader_cores_cntrs) ++ return -EINVAL; + -+ /* The time must go only forward. */ -+ if (WARN_ON(timestamp_ns < self->timestamp_ns)) ++ model_data = kzalloc(sizeof(*model_data), GFP_KERNEL); ++ if (!model_data) ++ return -ENOMEM; ++ ++ model_data->kbdev = model->kbdev; ++ ++ model_data->top_level_cntrs_def = top_level_cntrs_def; ++ model_data->num_top_level_cntrs = num_top_level_cntrs; ++ ++ model_data->shader_cores_cntrs_def = shader_cores_cntrs_def; ++ model_data->num_shader_cores_cntrs = num_shader_cores_cntrs; ++ ++ model->model_data = (void *)model_data; ++ ++ counter_coeffs_p = model_data->counter_coeffs; ++ ++ for (i = 0; i < model_data->num_top_level_cntrs; ++i) { ++ const struct kbase_ipa_counter *counter = ++ &model_data->top_level_cntrs_def[i]; ++ ++ *counter_coeffs_p = counter->coeff_default_value; ++ ++ err = kbase_ipa_model_add_param_s32( ++ model, counter->name, counter_coeffs_p, 1, false); ++ if (err) ++ goto exit; ++ ++ counter_coeffs_p++; ++ } ++ ++ for (i = 0; i < model_data->num_shader_cores_cntrs; ++i) { ++ const struct kbase_ipa_counter *counter = ++ &model_data->shader_cores_cntrs_def[i]; ++ ++ *counter_coeffs_p = counter->coeff_default_value; ++ ++ err = kbase_ipa_model_add_param_s32( ++ model, counter->name, counter_coeffs_p, 1, false); ++ if (err) ++ goto exit; ++ ++ counter_coeffs_p++; ++ } ++ ++ model_data->scaling_factor = DEFAULT_SCALING_FACTOR; ++ err = kbase_ipa_model_add_param_s32( ++ model, "scale", &model_data->scaling_factor, 1, false); ++ if (err) + goto exit; + -+ /* If this is the first frequency change, cycles_elapsed is zero. */ -+ if (self->timestamp_ns) -+ self->cycles_elapsed = kbasep_ccswe_cycle_at_no_lock( -+ self, timestamp_ns); ++ model_data->min_sample_cycles = DEFAULT_MIN_SAMPLE_CYCLES; ++ err = kbase_ipa_model_add_param_s32(model, "min_sample_cycles", ++ &model_data->min_sample_cycles, 1, ++ false); ++ if (err) ++ goto exit; ++ ++ model_data->reference_voltage = reference_voltage; ++ err = kbase_ipa_model_add_param_s32(model, "reference_voltage", ++ &model_data->reference_voltage, 1, ++ false); ++ if (err) ++ goto exit; ++ ++ err = kbase_ipa_attach_ipa_control(model_data); + -+ self->timestamp_ns = timestamp_ns; -+ self->prev_gpu_freq = self->gpu_freq; -+ self->gpu_freq = gpu_freq; +exit: -+ spin_unlock_irqrestore(&self->access, flags); ++ if (err) { ++ kbase_ipa_model_param_free_all(model); ++ kfree(model_data); ++ } ++ return err; +} -+KBASE_EXPORT_TEST_API(kbase_ccswe_freq_change); + -+void kbase_ccswe_reset(struct kbase_ccswe *self) ++void kbase_ipa_counter_common_model_term(struct kbase_ipa_model *model) +{ -+ unsigned long flags; -+ -+ spin_lock_irqsave(&self->access, flags); -+ -+ self->timestamp_ns = 0; -+ self->cycles_elapsed = 0; -+ self->gpu_freq = 0; -+ self->prev_gpu_freq = 0; ++ struct kbase_ipa_counter_model_data *model_data = ++ (struct kbase_ipa_counter_model_data *)model->model_data; + -+ spin_unlock_irqrestore(&self->access, flags); ++ kbase_ipa_detach_ipa_control(model_data); ++ kfree(model_data); +} -+ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h -new file mode 100755 -index 000000000000..3a7cf73d9eac +diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.h b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.h +new file mode 100644 +index 000000000..37d2efc59 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h -@@ -0,0 +1,97 @@ ++++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.h +@@ -0,0 +1,159 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -192106,99 +220909,161 @@ index 000000000000..3a7cf73d9eac + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#ifndef _KBASE_CCSWE_H_ -+#define _KBASE_CCSWE_H_ -+ -+#include ++#ifndef _KBASE_IPA_COUNTER_COMMON_CSF_H_ ++#define _KBASE_IPA_COUNTER_COMMON_CSF_H_ + -+/** -+ * struct kbase_ccswe - Cycle count software estimator. -+ * -+ * @access: Spinlock protecting this structure access. -+ * @timestamp_ns: Timestamp(ns) when the last frequency change -+ * occurred. -+ * @cycles_elapsed: Number of cycles elapsed before the last frequency -+ * change -+ * @gpu_freq: Current GPU frequency(Hz) value. -+ * @prev_gpu_freq: Previous GPU frequency(Hz) before the last frequency -+ * change. ++#include "mali_kbase.h" ++#include "csf/ipa_control/mali_kbase_csf_ipa_control.h" ++ ++/* Maximum number of HW counters used by the IPA counter model. */ ++#define KBASE_IPA_MAX_COUNTER_DEF_NUM 24 ++ ++struct kbase_ipa_counter_model_data; ++ ++/** ++ * struct kbase_ipa_counter_model_data - IPA counter model context per device ++ * @kbdev: Pointer to kbase device ++ * @ipa_control_client: Handle returned on registering IPA counter model as a ++ * client of kbase_ipa_control. ++ * @top_level_cntrs_def: Array of description of HW counters used by the IPA ++ * counter model for top-level. ++ * @num_top_level_cntrs: Number of elements in @top_level_cntrs_def array. ++ * @shader_cores_cntrs_def: Array of description of HW counters used by the IPA ++ * counter model for shader cores. ++ * @num_shader_cores_cntrs: Number of elements in @shader_cores_cntrs_def array. ++ * @counter_coeffs: Buffer to store coefficient value used for HW counters ++ * @counter_values: Buffer to store the accumulated value of HW counters ++ * retreived from kbase_ipa_control. ++ * @num_counters: Number of counters queried from kbase_ipa_control. ++ * @reference_voltage: voltage, in mV, of the operating point used when ++ * deriving the power model coefficients. Range approx ++ * 0.1V - 5V (~= 8V): 2^7 <= reference_voltage <= 2^13 ++ * @scaling_factor: User-specified power scaling factor. This is an ++ * integer, which is multiplied by the power coefficient ++ * just before OPP scaling. ++ * Range approx 0-32: 0 < scaling_factor < 2^5 ++ * @min_sample_cycles: If the value of the GPU_ACTIVE counter (the number of ++ * cycles the GPU was working) is less than ++ * min_sample_cycles, the counter model will return an ++ * error, causing the IPA framework to approximate using ++ * the cached simple model results instead. This may be ++ * more accurate than extrapolating using a very small ++ * counter dump. + */ -+struct kbase_ccswe { -+ spinlock_t access; -+ u64 timestamp_ns; -+ u64 cycles_elapsed; -+ u32 gpu_freq; -+ u32 prev_gpu_freq; ++struct kbase_ipa_counter_model_data { ++ struct kbase_device *kbdev; ++ void *ipa_control_client; ++ const struct kbase_ipa_counter *top_level_cntrs_def; ++ size_t num_top_level_cntrs; ++ const struct kbase_ipa_counter *shader_cores_cntrs_def; ++ size_t num_shader_cores_cntrs; ++ s32 counter_coeffs[KBASE_IPA_MAX_COUNTER_DEF_NUM]; ++ u64 counter_values[KBASE_IPA_MAX_COUNTER_DEF_NUM]; ++ u64 num_counters; ++ s32 reference_voltage; ++ s32 scaling_factor; ++ s32 min_sample_cycles; +}; + +/** -+ * kbase_ccswe_init() - initialize the cycle count estimator. -+ * -+ * @self: Cycles count software estimator instance. ++ * struct kbase_ipa_counter - represents a single HW counter used by IPA model ++ * @name: Name of the HW counter used by IPA counter model ++ * for energy estimation. ++ * @coeff_default_value: Default value of coefficient for the counter. ++ * Coefficients are interpreted as fractions where the ++ * denominator is 1000000. ++ * @counter_block_offset: Index to the counter within the counter block of ++ * type @counter_block_type. ++ * @counter_block_type: Type of the counter block. + */ -+void kbase_ccswe_init(struct kbase_ccswe *self); -+ ++struct kbase_ipa_counter { ++ const char *name; ++ s32 coeff_default_value; ++ u32 counter_block_offset; ++ enum kbase_ipa_core_type counter_block_type; ++}; + +/** -+ * kbase_ccswe_cycle_at() - Estimate cycle count at given timestamp. -+ * -+ * @self: Cycles count software estimator instance. -+ * @timestamp_ns: The timestamp(ns) for cycle count estimation. -+ * -+ * The timestamp must be bigger than the timestamp of the penultimate -+ * frequency change. If only one frequency change occurred, the -+ * timestamp must be bigger than the timestamp of the frequency change. -+ * This is to allow the following code to be executed w/o synchronization. -+ * If lines below executed atomically, it is safe to assume that only -+ * one frequency change may happen in between. ++ * kbase_ipa_counter_dynamic_coeff() - calculate dynamic power based on HW counters ++ * @model: pointer to instantiated model ++ * @coeffp: pointer to location where calculated power, in ++ * pW/(Hz V^2), is stored for top level and shader cores. + * -+ * u64 ts = ktime_get_raw_ns(); -+ * u64 cycle = kbase_ccswe_cycle_at(&ccswe, ts) ++ * This is a GPU-agnostic implementation of the get_dynamic_coeff() ++ * function of an IPA model. It relies on the model being populated ++ * with GPU-specific attributes at initialization time. + * -+ * Returns: estimated value of cycle count at a given time. ++ * Return: 0 on success, or an error code. + */ -+u64 kbase_ccswe_cycle_at(struct kbase_ccswe *self, u64 timestamp_ns); ++int kbase_ipa_counter_dynamic_coeff(struct kbase_ipa_model *model, u32 *coeffp); + +/** -+ * kbase_ccswe_freq_change() - update GPU frequency. ++ * kbase_ipa_counter_reset_data() - Reset the counters data used for dynamic ++ * power estimation ++ * @model: pointer to instantiated model + * -+ * @self: Cycles count software estimator instance. -+ * @timestamp_ns: Timestamp(ns) when frequency change occurred. -+ * @gpu_freq: New GPU frequency value. ++ * Retrieve the accumulated value of HW counters from the kbase_ipa_control ++ * component, without doing any processing, which is effectively a reset as the ++ * next call to kbase_ipa_counter_dynamic_coeff() will see the increment in ++ * counter values from this point onwards. ++ */ ++void kbase_ipa_counter_reset_data(struct kbase_ipa_model *model); ++ ++/** ++ * kbase_ipa_counter_common_model_init() - initialize ipa power model ++ * @model: Pointer to the ipa power model to initialize ++ * @top_level_cntrs_def: Array corresponding to the HW counters used in the ++ * top level counter model, contains the counter index, ++ * default value of the coefficient. ++ * @num_top_level_cntrs: Number of elements in the array @top_level_cntrs_def ++ * @shader_cores_cntrs_def: Array corresponding to the HW counters used in the ++ * shader cores counter model, contains the counter index, ++ * default value of the coefficient. ++ * @num_shader_cores_cntrs: Number of elements in the array ++ * @shader_cores_cntrs_def. ++ * @reference_voltage: voltage, in mV, of the operating point used when ++ * deriving the power model coefficients. + * -+ * The timestamp must be bigger than the timestamp of the previous -+ * frequency change. The function is to be called at the frequency -+ * change moment (not later). ++ * This function performs initialization steps common for ipa counter based ++ * model of all CSF GPUs. The set of counters and their respective weights ++ * could be different for each GPU. The tuple of counter index and weight ++ * is passed via @top_level_cntrs_def and @shader_cores_cntrs_def array. ++ * ++ * Return: 0 on success, error code otherwise + */ -+void kbase_ccswe_freq_change( -+ struct kbase_ccswe *self, u64 timestamp_ns, u32 gpu_freq); -+ ++int kbase_ipa_counter_common_model_init(struct kbase_ipa_model *model, ++ const struct kbase_ipa_counter *top_level_cntrs_def, ++ size_t num_top_level_cntrs, ++ const struct kbase_ipa_counter *shader_cores_cntrs_def, ++ size_t num_shader_cores_cntrs, ++ s32 reference_voltage); +/** -+ * kbase_ccswe_reset() - reset estimator state ++ * kbase_ipa_counter_common_model_term() - terminate ipa power model ++ * @model: ipa power model to terminate + * -+ * @self: Cycles count software estimator instance. ++ * This function performs all necessary steps to terminate ipa power model ++ * including clean up of resources allocated to hold model data. + */ -+void kbase_ccswe_reset(struct kbase_ccswe *self); ++void kbase_ipa_counter_common_model_term(struct kbase_ipa_model *model); + -+#endif /* _KBASE_CCSWE_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config.c b/drivers/gpu/arm/bifrost/mali_kbase_config.c -new file mode 100755 -index 000000000000..ce7070d1d634 ++#endif /* _KBASE_IPA_COUNTER_COMMON_CSF_H_ */ +diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.c b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.c +new file mode 100644 +index 000000000..34515a934 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_config.c -@@ -0,0 +1,48 @@ ++++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.c +@@ -0,0 +1,355 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2011-2015,2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2017-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -192209,449 +221074,357 @@ index 000000000000..ce7070d1d634 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + ++#include "mali_kbase_ipa_counter_common_jm.h" ++#include "ipa/mali_kbase_ipa_debugfs.h" + ++#define DEFAULT_SCALING_FACTOR 5 + -+#include -+#include -+#include ++/* If the value of GPU_ACTIVE is below this, use the simple model ++ * instead, to avoid extrapolating small amounts of counter data across ++ * large sample periods. ++ */ ++#define DEFAULT_MIN_SAMPLE_CYCLES 10000 + -+int kbasep_platform_device_init(struct kbase_device *kbdev) ++/** ++ * kbase_ipa_read_hwcnt() - read a counter value ++ * @model_data: pointer to model data ++ * @offset: offset, in bytes, into vinstr buffer ++ * ++ * Return: A 32-bit counter value. Range: 0 < value < 2^27 (worst case would be ++ * incrementing every cycle over a ~100ms sample period at a high frequency, ++ * e.g. 1 GHz: 2^30 * 0.1seconds ~= 2^27. ++ */ ++static inline u32 kbase_ipa_read_hwcnt( ++ struct kbase_ipa_model_vinstr_data *model_data, ++ u32 offset) +{ -+ struct kbase_platform_funcs_conf *platform_funcs_p; ++ u8 *p = (u8 *)model_data->dump_buf.dump_buf; ++ u64 val = *(u64 *)&p[offset]; + -+ platform_funcs_p = (struct kbase_platform_funcs_conf *)PLATFORM_FUNCS; -+ if (platform_funcs_p && platform_funcs_p->platform_init_func) -+ return platform_funcs_p->platform_init_func(kbdev); ++ return (val > U32_MAX) ? U32_MAX : (u32)val; ++} + -+ return 0; ++static inline s64 kbase_ipa_add_saturate(s64 a, s64 b) ++{ ++ s64 rtn; ++ ++ if (a > 0 && (S64_MAX - a) < b) ++ rtn = S64_MAX; ++ else if (a < 0 && (S64_MIN - a) > b) ++ rtn = S64_MIN; ++ else ++ rtn = a + b; ++ ++ return rtn; +} + -+void kbasep_platform_device_term(struct kbase_device *kbdev) ++s64 kbase_ipa_sum_all_shader_cores( ++ struct kbase_ipa_model_vinstr_data *model_data, ++ s32 coeff, u32 counter) +{ -+ struct kbase_platform_funcs_conf *platform_funcs_p; ++ struct kbase_device *kbdev = model_data->kbdev; ++ u64 core_mask; ++ u32 base = 0; ++ s64 ret = 0; + -+ platform_funcs_p = (struct kbase_platform_funcs_conf *)PLATFORM_FUNCS; -+ if (platform_funcs_p && platform_funcs_p->platform_term_func) -+ platform_funcs_p->platform_term_func(kbdev); ++ core_mask = kbdev->gpu_props.props.coherency_info.group[0].core_mask; ++ while (core_mask != 0ull) { ++ if ((core_mask & 1ull) != 0ull) { ++ /* 0 < counter_value < 2^27 */ ++ u32 counter_value = kbase_ipa_read_hwcnt(model_data, ++ base + counter); ++ ++ /* 0 < ret < 2^27 * max_num_cores = 2^32 */ ++ ret = kbase_ipa_add_saturate(ret, counter_value); ++ } ++ base += KBASE_IPA_NR_BYTES_PER_BLOCK; ++ core_mask >>= 1; ++ } ++ ++ /* Range: -2^54 < ret * coeff < 2^54 */ ++ return ret * coeff; +} + -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config.h b/drivers/gpu/arm/bifrost/mali_kbase_config.h -new file mode 100755 -index 000000000000..57456e2b90db ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_config.h -@@ -0,0 +1,393 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017, 2019-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ ++s64 kbase_ipa_sum_all_memsys_blocks( ++ struct kbase_ipa_model_vinstr_data *model_data, ++ s32 coeff, u32 counter) ++{ ++ struct kbase_device *kbdev = model_data->kbdev; ++ const u32 num_blocks = kbdev->gpu_props.props.l2_props.num_l2_slices; ++ u32 base = 0; ++ s64 ret = 0; ++ u32 i; + ++ for (i = 0; i < num_blocks; i++) { ++ /* 0 < counter_value < 2^27 */ ++ u32 counter_value = kbase_ipa_read_hwcnt(model_data, ++ base + counter); + ++ /* 0 < ret < 2^27 * max_num_memsys_blocks = 2^29 */ ++ ret = kbase_ipa_add_saturate(ret, counter_value); ++ base += KBASE_IPA_NR_BYTES_PER_BLOCK; ++ } + -+/** -+ * @file mali_kbase_config.h -+ * Configuration API and Attributes for KBase -+ */ ++ /* Range: -2^51 < ret * coeff < 2^51 */ ++ return ret * coeff; ++} + -+#ifndef _KBASE_CONFIG_H_ -+#define _KBASE_CONFIG_H_ ++s64 kbase_ipa_single_counter( ++ struct kbase_ipa_model_vinstr_data *model_data, ++ s32 coeff, u32 counter) ++{ ++ /* Range: 0 < counter_value < 2^27 */ ++ const u32 counter_value = kbase_ipa_read_hwcnt(model_data, counter); + -+#include -+#include -+#include -+#include ++ /* Range: -2^49 < ret < 2^49 */ ++ return counter_value * (s64) coeff; ++} + -+/** -+ * @addtogroup base_api -+ * @{ -+ */ ++int kbase_ipa_attach_vinstr(struct kbase_ipa_model_vinstr_data *model_data) ++{ ++ int errcode; ++ struct kbase_device *kbdev = model_data->kbdev; ++ struct kbase_hwcnt_virtualizer *hvirt = kbdev->hwcnt_gpu_virt; ++ struct kbase_hwcnt_enable_map enable_map; ++ const struct kbase_hwcnt_metadata *metadata = ++ kbase_hwcnt_virtualizer_metadata(hvirt); + -+/** -+ * @addtogroup base_kbase_api -+ * @{ -+ */ ++ if (!metadata) ++ return -1; + -+/** -+ * @addtogroup kbase_config Configuration API and Attributes -+ * @{ -+ */ ++ errcode = kbase_hwcnt_enable_map_alloc(metadata, &enable_map); ++ if (errcode) { ++ dev_err(kbdev->dev, "Failed to allocate IPA enable map"); ++ return errcode; ++ } + -+/* Forward declaration of struct kbase_device */ -+struct kbase_device; ++ kbase_hwcnt_enable_map_enable_all(&enable_map); + -+/** -+ * kbase_platform_funcs_conf - Specifies platform init/term function pointers -+ * -+ * Specifies the functions pointers for platform specific initialization and -+ * termination. By default no functions are required. No additional platform -+ * specific control is necessary. -+ */ -+struct kbase_platform_funcs_conf { -+ /** -+ * platform_init_func - platform specific init function pointer -+ * @kbdev - kbase_device pointer -+ * -+ * Returns 0 on success, negative error code otherwise. -+ * -+ * Function pointer for platform specific initialization or NULL if no -+ * initialization function is required. At the point this the GPU is -+ * not active and its power and clocks are in unknown (platform specific -+ * state) as kbase doesn't yet have control of power and clocks. -+ * -+ * The platform specific private pointer kbase_device::platform_context -+ * can be accessed (and possibly initialized) in here. -+ */ -+ int (*platform_init_func)(struct kbase_device *kbdev); -+ /** -+ * platform_term_func - platform specific termination function pointer -+ * @kbdev - kbase_device pointer -+ * -+ * Function pointer for platform specific termination or NULL if no -+ * termination function is required. At the point this the GPU will be -+ * idle but still powered and clocked. -+ * -+ * The platform specific private pointer kbase_device::platform_context -+ * can be accessed (and possibly terminated) in here. -+ */ -+ void (*platform_term_func)(struct kbase_device *kbdev); -+}; ++ /* Disable cycle counter only. */ ++ enable_map.clk_enable_map = 0; + -+/* -+ * @brief Specifies the callbacks for power management -+ * -+ * By default no callbacks will be made and the GPU must not be powered off. -+ */ -+struct kbase_pm_callback_conf { -+ /** Callback for when the GPU is idle and the power to it can be switched off. -+ * -+ * The system integrator can decide whether to either do nothing, just switch off -+ * the clocks to the GPU, or to completely power down the GPU. -+ * The platform specific private pointer kbase_device::platform_context can be accessed and modified in here. It is the -+ * platform \em callbacks responsibility to initialize and terminate this pointer if used (see @ref kbase_platform_funcs_conf). -+ */ -+ void (*power_off_callback)(struct kbase_device *kbdev); ++ errcode = kbase_hwcnt_virtualizer_client_create( ++ hvirt, &enable_map, &model_data->hvirt_cli); ++ kbase_hwcnt_enable_map_free(&enable_map); ++ if (errcode) { ++ dev_err(kbdev->dev, "Failed to register IPA with virtualizer"); ++ model_data->hvirt_cli = NULL; ++ return errcode; ++ } + -+ /** Callback for when the GPU is about to become active and power must be supplied. -+ * -+ * This function must not return until the GPU is powered and clocked sufficiently for register access to -+ * succeed. The return value specifies whether the GPU was powered down since the call to power_off_callback. -+ * If the GPU state has been lost then this function must return 1, otherwise it should return 0. -+ * The platform specific private pointer kbase_device::platform_context can be accessed and modified in here. It is the -+ * platform \em callbacks responsibility to initialize and terminate this pointer if used (see @ref kbase_platform_funcs_conf). -+ * -+ * The return value of the first call to this function is ignored. -+ * -+ * @return 1 if the GPU state may have been lost, 0 otherwise. -+ */ -+ int (*power_on_callback)(struct kbase_device *kbdev); ++ errcode = kbase_hwcnt_dump_buffer_alloc( ++ metadata, &model_data->dump_buf); ++ if (errcode) { ++ dev_err(kbdev->dev, "Failed to allocate IPA dump buffer"); ++ kbase_hwcnt_virtualizer_client_destroy(model_data->hvirt_cli); ++ model_data->hvirt_cli = NULL; ++ return errcode; ++ } + -+ /** Callback for when the system is requesting a suspend and GPU power -+ * must be switched off. -+ * -+ * Note that if this callback is present, then this may be called -+ * without a preceding call to power_off_callback. Therefore this -+ * callback must be able to take any action that might otherwise happen -+ * in power_off_callback. -+ * -+ * The platform specific private pointer kbase_device::platform_context -+ * can be accessed and modified in here. It is the platform \em -+ * callbacks responsibility to initialize and terminate this pointer if -+ * used (see @ref kbase_platform_funcs_conf). -+ */ -+ void (*power_suspend_callback)(struct kbase_device *kbdev); ++ return 0; ++} + -+ /** Callback for when the system is resuming from a suspend and GPU -+ * power must be switched on. -+ * -+ * Note that if this callback is present, then this may be called -+ * without a following call to power_on_callback. Therefore this -+ * callback must be able to take any action that might otherwise happen -+ * in power_on_callback. -+ * -+ * The platform specific private pointer kbase_device::platform_context -+ * can be accessed and modified in here. It is the platform \em -+ * callbacks responsibility to initialize and terminate this pointer if -+ * used (see @ref kbase_platform_funcs_conf). -+ */ -+ void (*power_resume_callback)(struct kbase_device *kbdev); ++void kbase_ipa_detach_vinstr(struct kbase_ipa_model_vinstr_data *model_data) ++{ ++ if (model_data->hvirt_cli) { ++ kbase_hwcnt_virtualizer_client_destroy(model_data->hvirt_cli); ++ kbase_hwcnt_dump_buffer_free(&model_data->dump_buf); ++ model_data->hvirt_cli = NULL; ++ } ++} + -+ /** Callback for handling runtime power management initialization. -+ * -+ * The runtime power management callbacks @ref power_runtime_off_callback and @ref power_runtime_on_callback -+ * will become active from calls made to the OS from within this function. -+ * The runtime calls can be triggered by calls from @ref power_off_callback and @ref power_on_callback. -+ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. -+ * -+ * @return 0 on success, else int error code. -+ */ -+ int (*power_runtime_init_callback)(struct kbase_device *kbdev); ++int kbase_ipa_vinstr_dynamic_coeff(struct kbase_ipa_model *model, u32 *coeffp) ++{ ++ struct kbase_ipa_model_vinstr_data *model_data = ++ (struct kbase_ipa_model_vinstr_data *)model->model_data; ++ s64 energy = 0; ++ size_t i; ++ u64 coeff = 0, coeff_mul = 0; ++ u64 start_ts_ns, end_ts_ns; ++ u32 active_cycles; ++ int err = 0; + -+ /** Callback for handling runtime power management termination. -+ * -+ * The runtime power management callbacks @ref power_runtime_off_callback and @ref power_runtime_on_callback -+ * should no longer be called by the OS on completion of this function. -+ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. -+ */ -+ void (*power_runtime_term_callback)(struct kbase_device *kbdev); ++ err = kbase_hwcnt_virtualizer_client_dump(model_data->hvirt_cli, ++ &start_ts_ns, &end_ts_ns, &model_data->dump_buf); ++ if (err) ++ goto err0; + -+ /** Callback for runtime power-off power management callback -+ * -+ * For linux this callback will be called by the kernel runtime_suspend callback. -+ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. -+ * -+ * @return 0 on success, else OS error code. ++ /* Range: 0 (GPU not used at all), to the max sampling interval, say ++ * 1s, * max GPU frequency (GPU 100% utilized). ++ * 0 <= active_cycles <= 1 * ~2GHz ++ * 0 <= active_cycles < 2^31 + */ -+ void (*power_runtime_off_callback)(struct kbase_device *kbdev); ++ active_cycles = model_data->get_active_cycles(model_data); + -+ /** Callback for runtime power-on power management callback -+ * -+ * For linux this callback will be called by the kernel runtime_resume callback. -+ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. -+ */ -+ int (*power_runtime_on_callback)(struct kbase_device *kbdev); ++ if (active_cycles < (u32) max(model_data->min_sample_cycles, 0)) { ++ err = -ENODATA; ++ goto err0; ++ } + -+ /* -+ * Optional callback for checking if GPU can be suspended when idle -+ * -+ * This callback will be called by the runtime power management core -+ * when the reference count goes to 0 to provide notification that the -+ * GPU now seems idle. -+ * -+ * If this callback finds that the GPU can't be powered off, or handles -+ * suspend by powering off directly or queueing up a power off, a -+ * non-zero value must be returned to prevent the runtime PM core from -+ * also triggering a suspend. -+ * -+ * Returning 0 will cause the runtime PM core to conduct a regular -+ * autosuspend. -+ * -+ * This callback is optional and if not provided regular autosuspend -+ * will be triggered. -+ * -+ * Note: The Linux kernel must have CONFIG_PM_RUNTIME enabled to use -+ * this feature. -+ * -+ * Return 0 if GPU can be suspended, positive value if it can not be -+ * suspeneded by runtime PM, else OS error code -+ */ -+ int (*power_runtime_idle_callback)(struct kbase_device *kbdev); ++ /* Range: 1 <= active_cycles < 2^31 */ ++ active_cycles = max(1u, active_cycles); + -+ /* -+ * Optional callback for software reset -+ * -+ * This callback will be called by the power management core to trigger -+ * a GPU soft reset. -+ * -+ * Return 0 if the soft reset was successful and the RESET_COMPLETED -+ * interrupt will be raised, or a positive value if the interrupt won't -+ * be raised. On error, return the corresponding OS error code. ++ /* Range of 'energy' is +/- 2^54 * number of IPA groups (~8), so around ++ * -2^57 < energy < 2^57 + */ -+ int (*soft_reset_callback)(struct kbase_device *kbdev); -+}; ++ for (i = 0; i < model_data->groups_def_num; i++) { ++ const struct kbase_ipa_group *group = &model_data->groups_def[i]; ++ s32 coeff = model_data->group_values[i]; ++ s64 group_energy = group->op(model_data, coeff, ++ group->counter_block_offset); + -+/* struct kbase_gpu_clk_notifier_data - Data for clock rate change notifier. -+ * -+ * Pointer to this structure is supposed to be passed to the gpu clock rate -+ * change notifier function. This structure is deliberately aligned with the -+ * common clock framework notification structure 'struct clk_notifier_data' -+ * and such alignment should be maintained. -+ * -+ * @gpu_clk_handle: Handle of the GPU clock for which notifier was registered. -+ * @old_rate: Previous rate of this GPU clock. -+ * @new_rate: New rate of this GPU clock. -+ */ -+struct kbase_gpu_clk_notifier_data { -+ void *gpu_clk_handle; -+ unsigned long old_rate; -+ unsigned long new_rate; -+}; ++ energy = kbase_ipa_add_saturate(energy, group_energy); ++ } + -+/** -+ * kbase_clk_rate_trace_op_conf - Specifies GPU clock rate trace operations. -+ * -+ * Specifies the functions pointers for platform specific GPU clock rate trace -+ * operations. By default no functions are required. -+ */ -+struct kbase_clk_rate_trace_op_conf { -+ /** -+ * enumerate_gpu_clk - Enumerate a GPU clock on the given index -+ * @kbdev - kbase_device pointer -+ * @index - GPU clock index ++ /* Range: 0 <= coeff < 2^57 */ ++ if (energy > 0) ++ coeff = energy; ++ ++ /* Range: 0 <= coeff < 2^57 (because active_cycles >= 1). However, this ++ * can be constrained further: Counter values can only be increased by ++ * a theoretical maximum of about 64k per clock cycle. Beyond this, ++ * we'd have to sample every 1ms to avoid them overflowing at the ++ * lowest clock frequency (say 100MHz). Therefore, we can write the ++ * range of 'coeff' in terms of active_cycles: + * -+ * Returns a handle unique to the given GPU clock, or NULL if the clock -+ * array has been exhausted at the given index value. ++ * coeff = SUM(coeffN * counterN * num_cores_for_counterN) ++ * coeff <= SUM(coeffN * counterN) * max_num_cores ++ * coeff <= num_IPA_groups * max_coeff * max_counter * max_num_cores ++ * (substitute max_counter = 2^16 * active_cycles) ++ * coeff <= num_IPA_groups * max_coeff * 2^16 * active_cycles * max_num_cores ++ * coeff <= 2^3 * 2^22 * 2^16 * active_cycles * 2^5 ++ * coeff <= 2^46 * active_cycles + * -+ * Kbase will use this function pointer to enumerate the existence of a -+ * GPU clock on the given index. ++ * So after the division: 0 <= coeff <= 2^46 + */ -+ void *(*enumerate_gpu_clk)(struct kbase_device *kbdev, -+ unsigned int index); ++ coeff = div_u64(coeff, active_cycles); + -+ /** -+ * get_gpu_clk_rate - Get the current rate for an enumerated clock. -+ * @kbdev - kbase_device pointer -+ * @gpu_clk_handle - Handle unique to the enumerated GPU clock -+ * -+ * Returns current rate of the GPU clock in unit of Hz. ++ /* Not all models were derived at the same reference voltage. Voltage ++ * scaling is done by multiplying by V^2, so we need to *divide* by ++ * Vref^2 here. ++ * Range: 0 <= coeff <= 2^49 + */ -+ unsigned long (*get_gpu_clk_rate)(struct kbase_device *kbdev, -+ void *gpu_clk_handle); ++ coeff = div_u64(coeff * 1000, max(model_data->reference_voltage, 1)); ++ /* Range: 0 <= coeff <= 2^52 */ ++ coeff = div_u64(coeff * 1000, max(model_data->reference_voltage, 1)); + -+ /** -+ * gpu_clk_notifier_register - Register a clock rate change notifier. -+ * @kbdev - kbase_device pointer -+ * @gpu_clk_handle - Handle unique to the enumerated GPU clock -+ * @nb - notifier block containing the callback function -+ * pointer -+ * -+ * Returns 0 on success, negative error code otherwise. -+ * -+ * This function pointer is used to register a callback function that -+ * is supposed to be invoked whenever the rate of clock corresponding -+ * to @gpu_clk_handle changes. -+ * @nb contains the pointer to callback function. -+ * The callback function expects the pointer of type -+ * 'struct kbase_gpu_clk_notifier_data' as the third argument. ++ /* Scale by user-specified integer factor. ++ * Range: 0 <= coeff_mul < 2^57 + */ -+ int (*gpu_clk_notifier_register)(struct kbase_device *kbdev, -+ void *gpu_clk_handle, struct notifier_block *nb); ++ coeff_mul = coeff * model_data->scaling_factor; + -+ /** -+ * gpu_clk_notifier_unregister - Unregister clock rate change notifier -+ * @kbdev - kbase_device pointer -+ * @gpu_clk_handle - Handle unique to the enumerated GPU clock -+ * @nb - notifier block containing the callback function -+ * pointer -+ * -+ * This function pointer is used to unregister a callback function that -+ * was previously registered to get notified of the change in rate -+ * of clock corresponding to @gpu_clk_handle. ++ /* The power models have results with units ++ * mW/(MHz V^2), i.e. nW/(Hz V^2). With precision of 1/1000000, this ++ * becomes fW/(Hz V^2), which are the units of coeff_mul. However, ++ * kbase_scale_dynamic_power() expects units of pW/(Hz V^2), so divide ++ * by 1000. ++ * Range: 0 <= coeff_mul < 2^47 + */ -+ void (*gpu_clk_notifier_unregister)(struct kbase_device *kbdev, -+ void *gpu_clk_handle, struct notifier_block *nb); -+}; ++ coeff_mul = div_u64(coeff_mul, 1000u); + -+#ifdef CONFIG_OF -+struct kbase_platform_config { -+}; -+#else ++err0: ++ /* Clamp to a sensible range - 2^16 gives about 14W at 400MHz/750mV */ ++ *coeffp = clamp(coeff_mul, (u64) 0, (u64) 1 << 16); ++ return err; ++} + -+/* -+ * @brief Specifies start and end of I/O memory region. -+ */ -+struct kbase_io_memory_region { -+ u64 start; -+ u64 end; -+}; ++void kbase_ipa_vinstr_reset_data(struct kbase_ipa_model *model) ++{ ++ /* Currently not implemented */ ++ WARN_ON_ONCE(1); ++} + -+/* -+ * @brief Specifies I/O related resources like IRQs and memory region for I/O operations. -+ */ -+struct kbase_io_resources { -+ u32 job_irq_number; -+ u32 mmu_irq_number; -+ u32 gpu_irq_number; -+ struct kbase_io_memory_region io_memory_region; -+}; ++int kbase_ipa_vinstr_common_model_init(struct kbase_ipa_model *model, ++ const struct kbase_ipa_group *ipa_groups_def, ++ size_t ipa_group_size, ++ kbase_ipa_get_active_cycles_callback get_active_cycles, ++ s32 reference_voltage) ++{ ++ int err = 0; ++ size_t i; ++ struct kbase_ipa_model_vinstr_data *model_data; + -+struct kbase_platform_config { -+ const struct kbase_io_resources *io_resources; -+}; ++ if (!model || !ipa_groups_def || !ipa_group_size || !get_active_cycles) ++ return -EINVAL; + -+#endif /* CONFIG_OF */ ++ model_data = kzalloc(sizeof(*model_data), GFP_KERNEL); ++ if (!model_data) ++ return -ENOMEM; + -+/** -+ * @brief Gets the pointer to platform config. -+ * -+ * @return Pointer to the platform config -+ */ -+struct kbase_platform_config *kbase_get_platform_config(void); ++ model_data->kbdev = model->kbdev; ++ model_data->groups_def = ipa_groups_def; ++ model_data->groups_def_num = ipa_group_size; ++ model_data->get_active_cycles = get_active_cycles; + -+/** -+ * kbasep_platform_device_init: - Platform specific call to initialize hardware -+ * @kbdev: kbase device pointer -+ * -+ * Function calls a platform defined routine if specified in the configuration -+ * attributes. The routine can initialize any hardware and context state that -+ * is required for the GPU block to function. -+ * -+ * Return: 0 if no errors have been found in the config. -+ * Negative error code otherwise. -+ */ -+int kbasep_platform_device_init(struct kbase_device *kbdev); ++ model->model_data = (void *) model_data; + -+/** -+ * kbasep_platform_device_term - Platform specific call to terminate hardware -+ * @kbdev: Kbase device pointer -+ * -+ * Function calls a platform defined routine if specified in the configuration -+ * attributes. The routine can destroy any platform specific context state and -+ * shut down any hardware functionality that are outside of the Power Management -+ * callbacks. -+ * -+ */ -+void kbasep_platform_device_term(struct kbase_device *kbdev); ++ for (i = 0; i < model_data->groups_def_num; ++i) { ++ const struct kbase_ipa_group *group = &model_data->groups_def[i]; + -+#ifndef CONFIG_OF -+/** -+ * kbase_platform_register - Register a platform device for the GPU -+ * -+ * This can be used to register a platform device on systems where device tree -+ * is not enabled and the platform initialisation code in the kernel doesn't -+ * create the GPU device. Where possible device tree should be used instead. -+ * -+ * Return: 0 for success, any other fail causes module initialisation to fail -+ */ -+int kbase_platform_register(void); ++ model_data->group_values[i] = group->default_value; ++ err = kbase_ipa_model_add_param_s32(model, group->name, ++ &model_data->group_values[i], ++ 1, false); ++ if (err) ++ goto exit; ++ } + -+/** -+ * kbase_platform_unregister - Unregister a fake platform device -+ * -+ * Unregister the platform device created with kbase_platform_register() -+ */ -+void kbase_platform_unregister(void); -+#endif ++ model_data->scaling_factor = DEFAULT_SCALING_FACTOR; ++ err = kbase_ipa_model_add_param_s32(model, "scale", ++ &model_data->scaling_factor, ++ 1, false); ++ if (err) ++ goto exit; + -+ /** @} *//* end group kbase_config */ -+ /** @} *//* end group base_kbase_api */ -+ /** @} *//* end group base_api */ ++ model_data->min_sample_cycles = DEFAULT_MIN_SAMPLE_CYCLES; ++ err = kbase_ipa_model_add_param_s32(model, "min_sample_cycles", ++ &model_data->min_sample_cycles, ++ 1, false); ++ if (err) ++ goto exit; + -+#endif /* _KBASE_CONFIG_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h b/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h -new file mode 100755 -index 000000000000..e079281127ab ++ model_data->reference_voltage = reference_voltage; ++ err = kbase_ipa_model_add_param_s32(model, "reference_voltage", ++ &model_data->reference_voltage, ++ 1, false); ++ if (err) ++ goto exit; ++ ++ err = kbase_ipa_attach_vinstr(model_data); ++ ++exit: ++ if (err) { ++ kbase_ipa_model_param_free_all(model); ++ kfree(model_data); ++ } ++ return err; ++} ++ ++void kbase_ipa_vinstr_common_model_term(struct kbase_ipa_model *model) ++{ ++ struct kbase_ipa_model_vinstr_data *model_data = ++ (struct kbase_ipa_model_vinstr_data *)model->model_data; ++ ++ kbase_ipa_detach_vinstr(model_data); ++ kfree(model_data); ++} +diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.h b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.h +new file mode 100644 +index 000000000..608961084 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h -@@ -0,0 +1,213 @@ ++++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.h +@@ -0,0 +1,234 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2013-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2017-2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -192662,215 +221435,236 @@ index 000000000000..e079281127ab + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+/** -+ * @file mali_kbase_config_defaults.h -+ * -+ * Default values for configuration settings -+ * -+ */ -+ -+#ifndef _KBASE_CONFIG_DEFAULTS_H_ -+#define _KBASE_CONFIG_DEFAULTS_H_ -+ -+/* Include mandatory definitions per platform */ -+#include -+ -+enum { -+ /** -+ * Use unrestricted Address ID width on the AXI bus. -+ */ -+ KBASE_AID_32 = 0x0, -+ -+ /** -+ * Restrict GPU to a half of maximum Address ID count. -+ * This will reduce performance, but reduce bus load due to GPU. -+ */ -+ KBASE_AID_16 = 0x3, -+ -+ /** -+ * Restrict GPU to a quarter of maximum Address ID count. -+ * This will reduce performance, but reduce bus load due to GPU. -+ */ -+ KBASE_AID_8 = 0x2, -+ -+ /** -+ * Restrict GPU to an eighth of maximum Address ID count. -+ * This will reduce performance, but reduce bus load due to GPU. -+ */ -+ KBASE_AID_4 = 0x1 -+}; -+ -+enum { -+ /** -+ * Use unrestricted Address ID width on the AXI bus. -+ * Restricting ID width will reduce performance & bus load due to GPU. -+ */ -+ KBASE_3BIT_AID_32 = 0x0, -+ -+ /* Restrict GPU to 7/8 of maximum Address ID count. */ -+ KBASE_3BIT_AID_28 = 0x1, -+ -+ /* Restrict GPU to 3/4 of maximum Address ID count. */ -+ KBASE_3BIT_AID_24 = 0x2, ++#ifndef _KBASE_IPA_COUNTER_COMMON_JM_H_ ++#define _KBASE_IPA_COUNTER_COMMON_JM_H_ + -+ /* Restrict GPU to 5/8 of maximum Address ID count. */ -+ KBASE_3BIT_AID_20 = 0x3, ++#include "mali_kbase.h" ++#include "hwcnt/mali_kbase_hwcnt_virtualizer.h" ++#include "hwcnt/mali_kbase_hwcnt_types.h" + -+ /* Restrict GPU to 1/2 of maximum Address ID count. */ -+ KBASE_3BIT_AID_16 = 0x4, ++/* Maximum number of IPA groups for an IPA model. */ ++#define KBASE_IPA_MAX_GROUP_DEF_NUM 16 + -+ /* Restrict GPU to 3/8 of maximum Address ID count. */ -+ KBASE_3BIT_AID_12 = 0x5, ++/* Number of bytes per hardware counter in a vinstr_buffer. */ ++#define KBASE_IPA_NR_BYTES_PER_CNT (sizeof(u64)) + -+ /* Restrict GPU to 1/4 of maximum Address ID count. */ -+ KBASE_3BIT_AID_8 = 0x6, ++/* Number of hardware counters per block in a vinstr_buffer. */ ++#define KBASE_IPA_NR_CNT_PER_BLOCK 64 + -+ /* Restrict GPU to 1/8 of maximum Address ID count. */ -+ KBASE_3BIT_AID_4 = 0x7 -+}; ++/* Number of bytes per block in a vinstr_buffer. */ ++#define KBASE_IPA_NR_BYTES_PER_BLOCK \ ++ (KBASE_IPA_NR_CNT_PER_BLOCK * KBASE_IPA_NR_BYTES_PER_CNT) + -+/** -+ * Default period for DVFS sampling -+ */ -+#define DEFAULT_PM_DVFS_PERIOD 100 /* 100ms */ ++struct kbase_ipa_model_vinstr_data; + -+/** -+ * Power Management poweroff tick granuality. This is in nanoseconds to -+ * allow HR timer support. -+ * -+ * On each scheduling tick, the power manager core may decide to: -+ * -# Power off one or more shader cores -+ * -# Power off the entire GPU -+ */ -+#define DEFAULT_PM_GPU_POWEROFF_TICK_NS (400000) /* 400us */ ++typedef u32 ++kbase_ipa_get_active_cycles_callback(struct kbase_ipa_model_vinstr_data *); + +/** -+ * Power Manager number of ticks before shader cores are powered off ++ * struct kbase_ipa_model_vinstr_data - IPA context per device ++ * @kbdev: pointer to kbase device ++ * @group_values: values of coefficients for IPA groups ++ * @groups_def: Array of IPA groups. ++ * @groups_def_num: Number of elements in the array of IPA groups. ++ * @get_active_cycles: Callback to return number of active cycles during ++ * counter sample period ++ * @hvirt_cli: hardware counter virtualizer client handle ++ * @dump_buf: buffer to dump hardware counters onto ++ * @reference_voltage: voltage, in mV, of the operating point used when ++ * deriving the power model coefficients. Range approx ++ * 0.1V - 5V (~= 8V): 2^7 <= reference_voltage <= 2^13 ++ * @scaling_factor: User-specified power scaling factor. This is an ++ * integer, which is multiplied by the power coefficient ++ * just before OPP scaling. ++ * Range approx 0-32: 0 < scaling_factor < 2^5 ++ * @min_sample_cycles: If the value of the GPU_ACTIVE counter (the number of ++ * cycles the GPU was working) is less than ++ * min_sample_cycles, the counter model will return an ++ * error, causing the IPA framework to approximate using ++ * the cached simple model results instead. This may be ++ * more accurate than extrapolating using a very small ++ * counter dump. + */ -+#define DEFAULT_PM_POWEROFF_TICK_SHADER (2) /* 400-800us */ ++struct kbase_ipa_model_vinstr_data { ++ struct kbase_device *kbdev; ++ s32 group_values[KBASE_IPA_MAX_GROUP_DEF_NUM]; ++ const struct kbase_ipa_group *groups_def; ++ size_t groups_def_num; ++ kbase_ipa_get_active_cycles_callback *get_active_cycles; ++ struct kbase_hwcnt_virtualizer_client *hvirt_cli; ++ struct kbase_hwcnt_dump_buffer dump_buf; ++ s32 reference_voltage; ++ s32 scaling_factor; ++ s32 min_sample_cycles; ++}; + +/** -+ * Default scheduling tick granuality ++ * struct kbase_ipa_group - represents a single IPA group ++ * @name: name of the IPA group ++ * @default_value: default value of coefficient for IPA group. ++ * Coefficients are interpreted as fractions where the ++ * denominator is 1000000. ++ * @op: which operation to be performed on the counter values ++ * @counter_block_offset: block offset in bytes of the counter used to calculate energy for IPA group + */ -+#define DEFAULT_JS_SCHEDULING_PERIOD_NS (100000000u) /* 100ms */ ++struct kbase_ipa_group { ++ const char *name; ++ s32 default_value; ++ s64 (*op)( ++ struct kbase_ipa_model_vinstr_data *model_data, ++ s32 coeff, ++ u32 counter_block_offset); ++ u32 counter_block_offset; ++}; + +/** -+ * Default minimum number of scheduling ticks before jobs are soft-stopped. ++ * kbase_ipa_sum_all_shader_cores() - sum a counter over all cores ++ * @model_data: pointer to model data ++ * @coeff: model coefficient. Unity is ~2^20, so range approx ++ * +/- 4.0: -2^22 < coeff < 2^22 ++ * @counter: offset in bytes of the counter used to calculate energy ++ * for IPA group + * -+ * This defines the time-slice for a job (which may be different from that of a -+ * context) -+ */ -+#define DEFAULT_JS_SOFT_STOP_TICKS (1) /* 100ms-200ms */ -+ -+/** -+ * Default minimum number of scheduling ticks before CL jobs are soft-stopped. -+ */ -+#define DEFAULT_JS_SOFT_STOP_TICKS_CL (1) /* 100ms-200ms */ -+ -+/** -+ * Default minimum number of scheduling ticks before jobs are hard-stopped -+ */ -+#define DEFAULT_JS_HARD_STOP_TICKS_SS (50) /* 5s */ -+ -+/** -+ * Default minimum number of scheduling ticks before CL jobs are hard-stopped. -+ */ -+#define DEFAULT_JS_HARD_STOP_TICKS_CL (50) /* 5s */ -+ -+/** -+ * Default minimum number of scheduling ticks before jobs are hard-stopped -+ * during dumping -+ */ -+#define DEFAULT_JS_HARD_STOP_TICKS_DUMPING (15000) /* 1500s */ -+ -+/** -+ * Default timeout for some software jobs, after which the software event wait -+ * jobs will be cancelled. ++ * Calculate energy estimation based on hardware counter `counter' ++ * across all shader cores. ++ * ++ * Return: Sum of counter values. Range: -2^54 < ret < 2^54 + */ -+#define DEFAULT_JS_SOFT_JOB_TIMEOUT (3000) /* 3s */ ++s64 kbase_ipa_sum_all_shader_cores( ++ struct kbase_ipa_model_vinstr_data *model_data, ++ s32 coeff, u32 counter); + +/** -+ * Default minimum number of scheduling ticks before the GPU is reset to clear a -+ * "stuck" job ++ * kbase_ipa_sum_all_memsys_blocks() - sum a counter over all mem system blocks ++ * @model_data: pointer to model data ++ * @coeff: model coefficient. Unity is ~2^20, so range approx ++ * +/- 4.0: -2^22 < coeff < 2^22 ++ * @counter: offset in bytes of the counter used to calculate energy ++ * for IPA group ++ * ++ * Calculate energy estimation based on hardware counter `counter' across all ++ * memory system blocks. ++ * ++ * Return: Sum of counter values. Range: -2^51 < ret < 2^51 + */ -+#define DEFAULT_JS_RESET_TICKS_SS (55) /* 5.5s */ ++s64 kbase_ipa_sum_all_memsys_blocks( ++ struct kbase_ipa_model_vinstr_data *model_data, ++ s32 coeff, u32 counter); + +/** -+ * Default minimum number of scheduling ticks before the GPU is reset to clear a -+ * "stuck" CL job. ++ * kbase_ipa_single_counter() - sum a single counter ++ * @model_data: pointer to model data ++ * @coeff: model coefficient. Unity is ~2^20, so range approx ++ * +/- 4.0: -2^22 < coeff < 2^22 ++ * @counter: offset in bytes of the counter used to calculate energy ++ * for IPA group ++ * ++ * Calculate energy estimation based on hardware counter `counter'. ++ * ++ * Return: Counter value. Range: -2^49 < ret < 2^49 + */ -+#define DEFAULT_JS_RESET_TICKS_CL (55) /* 5.5s */ ++s64 kbase_ipa_single_counter( ++ struct kbase_ipa_model_vinstr_data *model_data, ++ s32 coeff, u32 counter); + +/** -+ * Default minimum number of scheduling ticks before the GPU is reset to clear a -+ * "stuck" job during dumping. ++ * kbase_ipa_attach_vinstr() - attach a vinstr_buffer to an IPA model. ++ * @model_data: pointer to model data ++ * ++ * Attach a vinstr_buffer to an IPA model. The vinstr_buffer ++ * allows access to the hardware counters used to calculate ++ * energy consumption. ++ * ++ * Return: 0 on success, or an error code. + */ -+#define DEFAULT_JS_RESET_TICKS_DUMPING (15020) /* 1502s */ ++int kbase_ipa_attach_vinstr(struct kbase_ipa_model_vinstr_data *model_data); + +/** -+ * Default number of milliseconds given for other jobs on the GPU to be -+ * soft-stopped when the GPU needs to be reset. ++ * kbase_ipa_detach_vinstr() - detach a vinstr_buffer from an IPA model. ++ * @model_data: pointer to model data ++ * ++ * Detach a vinstr_buffer from an IPA model. + */ -+#define DEFAULT_RESET_TIMEOUT_MS (3000) /* 3s */ ++void kbase_ipa_detach_vinstr(struct kbase_ipa_model_vinstr_data *model_data); + +/** -+ * Default timeslice that a context is scheduled in for, in nanoseconds. ++ * kbase_ipa_vinstr_dynamic_coeff() - calculate dynamic power based on HW counters ++ * @model: pointer to instantiated model ++ * @coeffp: pointer to location where calculated power, in ++ * pW/(Hz V^2), is stored. + * -+ * When a context has used up this amount of time across its jobs, it is -+ * scheduled out to let another run. ++ * This is a GPU-agnostic implementation of the get_dynamic_coeff() ++ * function of an IPA model. It relies on the model being populated ++ * with GPU-specific attributes at initialization time. + * -+ * @note the resolution is nanoseconds (ns) here, because that's the format -+ * often used by the OS. ++ * Return: 0 on success, or an error code. + */ -+#define DEFAULT_JS_CTX_TIMESLICE_NS (50000000) /* 50ms */ ++int kbase_ipa_vinstr_dynamic_coeff(struct kbase_ipa_model *model, u32 *coeffp); + +/** -+ * Maximum frequency (in kHz) that the GPU can be clocked. For some platforms -+ * this isn't available, so we simply define a dummy value here. If devfreq -+ * is enabled the value will be read from there, otherwise this should be -+ * overridden by defining GPU_FREQ_KHZ_MAX in the platform file. ++ * kbase_ipa_vinstr_reset_data() - Reset the counters data used for dynamic ++ * power estimation ++ * @model: pointer to instantiated model ++ * ++ * Currently it is not implemented for JM GPUs. ++ * When implemented it is expected to retrieve the accumulated value of HW ++ * counters from the Vinstr component, without doing any processing, which is ++ * effectively a reset as the next call to kbase_ipa_counter_dynamic_coeff() ++ * will see the increment in counter values from this point onwards. + */ -+#define DEFAULT_GPU_FREQ_KHZ_MAX (5000) ++void kbase_ipa_vinstr_reset_data(struct kbase_ipa_model *model); + +/** -+ * Default timeout for task execution on an endpoint ++ * kbase_ipa_vinstr_common_model_init() - initialize ipa power model ++ * @model: ipa power model to initialize ++ * @ipa_groups_def: array of ipa groups which sets coefficients for ++ * the corresponding counters used in the ipa model ++ * @ipa_group_size: number of elements in the array @ipa_groups_def ++ * @get_active_cycles: callback to return the number of cycles the GPU was ++ * active during the counter sample period. ++ * @reference_voltage: voltage, in mV, of the operating point used when ++ * deriving the power model coefficients. + * -+ * Number of GPU clock cycles before the driver terminates a task that is -+ * making no forward progress on an endpoint (e.g. shader core). -+ * Value chosen is equivalent to the time after which a job is hard stopped -+ * which is 5 seconds (assuming the GPU is usually clocked at ~500 MHZ). ++ * This initialization function performs initialization steps common ++ * for ipa models based on counter values. In each call, the model ++ * passes its specific coefficient values per ipa counter group via ++ * @ipa_groups_def array. ++ * ++ * Return: 0 on success, error code otherwise + */ -+#define DEFAULT_PROGRESS_TIMEOUT ((u64)5 * 500 * 1024 * 1024) ++int kbase_ipa_vinstr_common_model_init(struct kbase_ipa_model *model, ++ const struct kbase_ipa_group *ipa_groups_def, ++ size_t ipa_group_size, ++ kbase_ipa_get_active_cycles_callback *get_active_cycles, ++ s32 reference_voltage); + +/** -+ * Default threshold at which to switch to incremental rendering ++ * kbase_ipa_vinstr_common_model_term() - terminate ipa power model ++ * @model: ipa power model to terminate + * -+ * Fraction of the maximum size of an allocation that grows on GPU page fault -+ * that can be used up before the driver switches to incremental rendering, -+ * in 256ths. 0 means disable incremental rendering. ++ * This function performs all necessary steps to terminate ipa power model ++ * including clean up of resources allocated to hold model data. + */ -+#define DEFAULT_IR_THRESHOLD (192) -+ -+#endif /* _KBASE_CONFIG_DEFAULTS_H_ */ ++void kbase_ipa_vinstr_common_model_term(struct kbase_ipa_model *model); + -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c b/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c -new file mode 100755 -index 000000000000..071b9236dee0 ++#endif /* _KBASE_IPA_COUNTER_COMMON_JM_H_ */ +diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_csf.c b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_csf.c +new file mode 100644 +index 000000000..21b4e5288 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c -@@ -0,0 +1,5001 @@ ++++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_csf.c +@@ -0,0 +1,280 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -192881,5003 +221675,7229 @@ index 000000000000..071b9236dee0 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include -+#include -+#include -+#include -+#include -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+#include -+#include -+#ifdef CONFIG_DEVFREQ_THERMAL -+#include -+#endif /* CONFIG_DEVFREQ_THERMAL */ -+#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+#include "mali_kbase_model_linux.h" -+#include -+#endif /* CONFIG_MALI_BIFROST_NO_MALI */ -+#include "mali_kbase_mem_profile_debugfs_buf_size.h" -+#include "mali_kbase_debug_mem_view.h" -+#include "mali_kbase_mem.h" -+#include "mali_kbase_mem_pool_debugfs.h" -+#include "mali_kbase_debugfs_helper.h" -+#if !MALI_CUSTOMER_RELEASE -+#include "mali_kbase_regs_dump_debugfs.h" -+#endif /* !MALI_CUSTOMER_RELEASE */ -+#include "mali_kbase_regs_history_debugfs.h" -+#include -+#include -+#if !MALI_USE_CSF -+#include -+#endif /* !MALI_USE_CSF */ -+#ifdef CONFIG_MALI_PRFCNT_SET_SECONDARY_VIA_DEBUG_FS -+#include -+#endif -+#include -+#include -+#include "mali_kbase_ioctl.h" -+#if !MALI_USE_CSF -+#include "mali_kbase_kinstr_jm.h" -+#endif -+#include "mali_kbase_hwcnt_context.h" -+#include "mali_kbase_hwcnt_virtualizer.h" -+#include "mali_kbase_hwcnt_legacy.h" -+#include "mali_kbase_vinstr.h" -+#if MALI_USE_CSF -+#include "csf/mali_kbase_csf_firmware.h" -+#include "csf/mali_kbase_csf_tiler_heap.h" -+#include "csf/mali_kbase_csf_kcpu_debugfs.h" -+#include "csf/mali_kbase_csf_csg_debugfs.h" -+#endif -+#ifdef CONFIG_MALI_ARBITER_SUPPORT -+#include "arbiter/mali_kbase_arbiter_pm.h" -+#endif ++#include "mali_kbase_ipa_counter_common_csf.h" ++#include "mali_kbase.h" + -+#include "mali_kbase_cs_experimental.h" ++/* MEMSYS counter block offsets */ ++#define L2_RD_MSG_IN_CU (13) ++#define L2_RD_MSG_IN (16) ++#define L2_WR_MSG_IN (18) ++#define L2_SNP_MSG_IN (20) ++#define L2_RD_MSG_OUT (22) ++#define L2_READ_LOOKUP (26) ++#define L2_EXT_READ_NOSNP (30) ++#define L2_EXT_WRITE_NOSNP_FULL (43) + -+#ifdef CONFIG_MALI_CINSTR_GWT -+#include "mali_kbase_gwt.h" -+#endif -+#include "mali_kbase_pm_internal.h" ++/* SC counter block offsets */ ++#define FRAG_STARVING (8) ++#define FRAG_PARTIAL_QUADS_RAST (10) ++#define FRAG_QUADS_EZS_UPDATE (13) ++#define FULL_QUAD_WARPS (21) ++#define EXEC_INSTR_FMA (27) ++#define EXEC_INSTR_CVT (28) ++#define EXEC_INSTR_SFU (29) ++#define EXEC_INSTR_MSG (30) ++#define TEX_FILT_NUM_OPS (39) ++#define LS_MEM_READ_SHORT (45) ++#define LS_MEM_WRITE_SHORT (47) ++#define VARY_SLOT_16 (51) ++#define BEATS_RD_LSC_EXT (57) ++#define BEATS_RD_TEX (58) ++#define BEATS_RD_TEX_EXT (59) ++#define FRAG_QUADS_COARSE (68) + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include /* is_compat_task/in_compat_syscall */ -+#include -+#include -+#include -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+#include -+#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ -+#include -+#include -+#include -+#include ++/* Tiler counter block offsets */ ++#define IDVS_POS_SHAD_STALL (23) ++#define PREFETCH_STALL (25) ++#define VFETCH_POS_READ_WAIT (29) ++#define VFETCH_VERTEX_WAIT (30) ++#define PRIMASSY_STALL (32) ++#define IDVS_VAR_SHAD_STALL (38) ++#define ITER_STALL (40) ++#define PMGR_PTR_RD_STALL (48) ++ ++#define COUNTER_DEF(cnt_name, coeff, cnt_idx, block_type) \ ++ { \ ++ .name = cnt_name, \ ++ .coeff_default_value = coeff, \ ++ .counter_block_offset = cnt_idx, \ ++ .counter_block_type = block_type, \ ++ } + -+#include ++#define MEMSYS_COUNTER_DEF(cnt_name, coeff, cnt_idx) \ ++ COUNTER_DEF(cnt_name, coeff, cnt_idx, KBASE_IPA_CORE_TYPE_MEMSYS) + ++#define SC_COUNTER_DEF(cnt_name, coeff, cnt_idx) \ ++ COUNTER_DEF(cnt_name, coeff, cnt_idx, KBASE_IPA_CORE_TYPE_SHADER) + -+#if (KERNEL_VERSION(3, 13, 0) <= LINUX_VERSION_CODE) -+#include -+#include -+#else -+#include -+#endif ++#define TILER_COUNTER_DEF(cnt_name, coeff, cnt_idx) \ ++ COUNTER_DEF(cnt_name, coeff, cnt_idx, KBASE_IPA_CORE_TYPE_TILER) + -+#include ++/* Tables of description of HW counters used by IPA counter model. ++ * ++ * These tables provide a description of each performance counter ++ * used by the top level counter model for energy estimation. ++ */ ++static const struct kbase_ipa_counter ipa_top_level_cntrs_def_todx[] = { ++ MEMSYS_COUNTER_DEF("l2_rd_msg_in", 295631, L2_RD_MSG_IN), ++ MEMSYS_COUNTER_DEF("l2_ext_write_nosnp_ull", 325168, L2_EXT_WRITE_NOSNP_FULL), + -+#include ++ TILER_COUNTER_DEF("prefetch_stall", 145435, PREFETCH_STALL), ++ TILER_COUNTER_DEF("idvs_var_shad_stall", -171917, IDVS_VAR_SHAD_STALL), ++ TILER_COUNTER_DEF("idvs_pos_shad_stall", 109980, IDVS_POS_SHAD_STALL), ++ TILER_COUNTER_DEF("vfetch_pos_read_wait", -119118, VFETCH_POS_READ_WAIT), ++}; + -+#include -+#include -+#include ++static const struct kbase_ipa_counter ipa_top_level_cntrs_def_tgrx[] = { ++ MEMSYS_COUNTER_DEF("l2_rd_msg_in", 295631, L2_RD_MSG_IN), ++ MEMSYS_COUNTER_DEF("l2_ext_write_nosnp_ull", 325168, L2_EXT_WRITE_NOSNP_FULL), + -+#include ++ TILER_COUNTER_DEF("prefetch_stall", 145435, PREFETCH_STALL), ++ TILER_COUNTER_DEF("idvs_var_shad_stall", -171917, IDVS_VAR_SHAD_STALL), ++ TILER_COUNTER_DEF("idvs_pos_shad_stall", 109980, IDVS_POS_SHAD_STALL), ++ TILER_COUNTER_DEF("vfetch_pos_read_wait", -119118, VFETCH_POS_READ_WAIT), ++}; + -+/* GPU IRQ Tags */ -+#define JOB_IRQ_TAG 0 -+#define MMU_IRQ_TAG 1 -+#define GPU_IRQ_TAG 2 ++static const struct kbase_ipa_counter ipa_top_level_cntrs_def_tvax[] = { ++ MEMSYS_COUNTER_DEF("l2_rd_msg_out", 491414, L2_RD_MSG_OUT), ++ MEMSYS_COUNTER_DEF("l2_wr_msg_in", 408645, L2_WR_MSG_IN), + -+#define KERNEL_SIDE_DDK_VERSION_STRING "K:" MALI_RELEASE_NAME "(GPL)" ++ TILER_COUNTER_DEF("iter_stall", 893324, ITER_STALL), ++ TILER_COUNTER_DEF("pmgr_ptr_rd_stall", -975117, PMGR_PTR_RD_STALL), ++ TILER_COUNTER_DEF("idvs_pos_shad_stall", 22555, IDVS_POS_SHAD_STALL), ++}; + -+/** -+ * Kernel min/maj <=> API Version -+ */ -+#define KBASE_API_VERSION(major, minor) ((((major) & 0xFFF) << 20) | \ -+ (((minor) & 0xFFF) << 8) | \ -+ ((0 & 0xFF) << 0)) ++static const struct kbase_ipa_counter ipa_top_level_cntrs_def_ttux[] = { ++ MEMSYS_COUNTER_DEF("l2_rd_msg_in", 800836, L2_RD_MSG_IN), ++ MEMSYS_COUNTER_DEF("l2_wr_msg_in", 415579, L2_WR_MSG_IN), ++ MEMSYS_COUNTER_DEF("l2_read_lookup", -198124, L2_READ_LOOKUP), + -+#define KBASE_API_MIN(api_version) ((api_version >> 8) & 0xFFF) -+#define KBASE_API_MAJ(api_version) ((api_version >> 20) & 0xFFF) ++ TILER_COUNTER_DEF("idvs_pos_shad_stall", 117358, IDVS_POS_SHAD_STALL), ++ TILER_COUNTER_DEF("vfetch_vertex_wait", -391964, VFETCH_VERTEX_WAIT), ++}; + -+/** -+ * mali_kbase_api_version_to_maj_min - convert an api_version to a min/maj pair -+ * -+ * @api_version: API version to convert -+ * @major: Major version number (must not exceed 12 bits) -+ * @minor: Major version number (must not exceed 12 bits) ++static const struct kbase_ipa_counter ipa_top_level_cntrs_def_ttix[] = { ++ TILER_COUNTER_DEF("primassy_stall", 471953, PRIMASSY_STALL), ++ TILER_COUNTER_DEF("idvs_var_shad_stall", -460559, IDVS_VAR_SHAD_STALL), ++ ++ MEMSYS_COUNTER_DEF("l2_rd_msg_in_cu", -6189604, L2_RD_MSG_IN_CU), ++ MEMSYS_COUNTER_DEF("l2_snp_msg_in", 6289609, L2_SNP_MSG_IN), ++ MEMSYS_COUNTER_DEF("l2_ext_read_nosnp", 512341, L2_EXT_READ_NOSNP), ++}; ++ ++/* These tables provide a description of each performance counter ++ * used by the shader cores counter model for energy estimation. + */ -+void mali_kbase_api_version_to_maj_min(unsigned long api_version, u16 *maj, u16 *min) -+{ -+ if (WARN_ON(!maj)) -+ return; ++static const struct kbase_ipa_counter ipa_shader_core_cntrs_def_todx[] = { ++ SC_COUNTER_DEF("exec_instr_fma", 505449, EXEC_INSTR_FMA), ++ SC_COUNTER_DEF("tex_filt_num_operations", 574869, TEX_FILT_NUM_OPS), ++ SC_COUNTER_DEF("ls_mem_read_short", 60917, LS_MEM_READ_SHORT), ++ SC_COUNTER_DEF("frag_quads_ezs_update", 694555, FRAG_QUADS_EZS_UPDATE), ++ SC_COUNTER_DEF("ls_mem_write_short", 698290, LS_MEM_WRITE_SHORT), ++ SC_COUNTER_DEF("vary_slot_16", 181069, VARY_SLOT_16), ++}; + -+ if (WARN_ON(!min)) -+ return; ++static const struct kbase_ipa_counter ipa_shader_core_cntrs_def_tgrx[] = { ++ SC_COUNTER_DEF("exec_instr_fma", 505449, EXEC_INSTR_FMA), ++ SC_COUNTER_DEF("tex_filt_num_operations", 574869, TEX_FILT_NUM_OPS), ++ SC_COUNTER_DEF("ls_mem_read_short", 60917, LS_MEM_READ_SHORT), ++ SC_COUNTER_DEF("frag_quads_ezs_update", 694555, FRAG_QUADS_EZS_UPDATE), ++ SC_COUNTER_DEF("ls_mem_write_short", 698290, LS_MEM_WRITE_SHORT), ++ SC_COUNTER_DEF("vary_slot_16", 181069, VARY_SLOT_16), ++}; + -+ *maj = KBASE_API_MAJ(api_version); -+ *min = KBASE_API_MIN(api_version); -+} ++static const struct kbase_ipa_counter ipa_shader_core_cntrs_def_tvax[] = { ++ SC_COUNTER_DEF("tex_filt_num_operations", 142536, TEX_FILT_NUM_OPS), ++ SC_COUNTER_DEF("exec_instr_fma", 243497, EXEC_INSTR_FMA), ++ SC_COUNTER_DEF("exec_instr_msg", 1344410, EXEC_INSTR_MSG), ++ SC_COUNTER_DEF("vary_slot_16", -119612, VARY_SLOT_16), ++ SC_COUNTER_DEF("frag_partial_quads_rast", 676201, FRAG_PARTIAL_QUADS_RAST), ++ SC_COUNTER_DEF("frag_starving", 62421, FRAG_STARVING), ++}; + -+/** -+ * kbase capabilities table -+ */ -+typedef struct mali_kbase_capability_def { -+ u16 required_major; -+ u16 required_minor; -+} mali_kbase_capability_def; ++static const struct kbase_ipa_counter ipa_shader_core_cntrs_def_ttux[] = { ++ SC_COUNTER_DEF("exec_instr_fma", 457012, EXEC_INSTR_FMA), ++ SC_COUNTER_DEF("tex_filt_num_operations", 441911, TEX_FILT_NUM_OPS), ++ SC_COUNTER_DEF("ls_mem_read_short", 322525, LS_MEM_READ_SHORT), ++ SC_COUNTER_DEF("full_quad_warps", 844124, FULL_QUAD_WARPS), ++ SC_COUNTER_DEF("exec_instr_cvt", 226411, EXEC_INSTR_CVT), ++ SC_COUNTER_DEF("frag_quads_ezs_update", 372032, FRAG_QUADS_EZS_UPDATE), ++}; + -+/** -+ * This must be kept in-sync with mali_kbase_cap -+ * -+ * TODO: The alternative approach would be to embed the cap enum values -+ * in the table. Less efficient but potentially safer. -+ */ -+static mali_kbase_capability_def kbase_caps_table[MALI_KBASE_NUM_CAPS] = { -+#if MALI_USE_CSF -+ { 1, 0 }, /* SYSTEM_MONITOR */ -+ { 1, 0 }, /* JIT_PRESSURE_LIMIT */ -+ { 1, 0 }, /* MEM_GROW_ON_GPF */ -+ { 1, 0 } /* MEM_PROTECTED */ -+#else -+ { 11, 15 }, /* SYSTEM_MONITOR */ -+ { 11, 25 }, /* JIT_PRESSURE_LIMIT */ -+ { 11, 2 }, /* MEM_GROW_ON_GPF */ -+ { 11, 2 } /* MEM_PROTECTED */ -+#endif ++static const struct kbase_ipa_counter ipa_shader_core_cntrs_def_ttix[] = { ++ SC_COUNTER_DEF("exec_instr_fma", 192642, EXEC_INSTR_FMA), ++ SC_COUNTER_DEF("exec_instr_msg", 1326465, EXEC_INSTR_MSG), ++ SC_COUNTER_DEF("beats_rd_tex", 163518, BEATS_RD_TEX), ++ SC_COUNTER_DEF("beats_rd_lsc_ext", 127475, BEATS_RD_LSC_EXT), ++ SC_COUNTER_DEF("frag_quads_coarse", -36247, FRAG_QUADS_COARSE), ++ SC_COUNTER_DEF("ls_mem_write_short", 51547, LS_MEM_WRITE_SHORT), ++ SC_COUNTER_DEF("beats_rd_tex_ext", -43370, BEATS_RD_TEX_EXT), ++ SC_COUNTER_DEF("exec_instr_sfu", 31583, EXEC_INSTR_SFU), +}; + -+/** -+ * mali_kbase_supports_cap - Query whether a kbase capability is supported -+ * -+ * @api_version: API version to convert -+ * @cap: Capability to query for - see mali_kbase_caps.h -+ */ -+bool mali_kbase_supports_cap(unsigned long api_version, mali_kbase_cap cap) -+{ -+ bool supported = false; -+ unsigned long required_ver; ++#define IPA_POWER_MODEL_OPS(gpu, init_token) \ ++ const struct kbase_ipa_model_ops kbase_ ## gpu ## _ipa_model_ops = { \ ++ .name = "mali-" #gpu "-power-model", \ ++ .init = kbase_ ## init_token ## _power_model_init, \ ++ .term = kbase_ipa_counter_common_model_term, \ ++ .get_dynamic_coeff = kbase_ipa_counter_dynamic_coeff, \ ++ .reset_counter_data = kbase_ipa_counter_reset_data, \ ++ }; \ ++ KBASE_EXPORT_TEST_API(kbase_ ## gpu ## _ipa_model_ops) ++ ++#define STANDARD_POWER_MODEL(gpu, reference_voltage) \ ++ static int kbase_ ## gpu ## _power_model_init(\ ++ struct kbase_ipa_model *model) \ ++ { \ ++ BUILD_BUG_ON((1 + \ ++ ARRAY_SIZE(ipa_top_level_cntrs_def_ ## gpu) +\ ++ ARRAY_SIZE(ipa_shader_core_cntrs_def_ ## gpu)) > \ ++ KBASE_IPA_MAX_COUNTER_DEF_NUM); \ ++ return kbase_ipa_counter_common_model_init(model, \ ++ ipa_top_level_cntrs_def_ ## gpu, \ ++ ARRAY_SIZE(ipa_top_level_cntrs_def_ ## gpu), \ ++ ipa_shader_core_cntrs_def_ ## gpu, \ ++ ARRAY_SIZE(ipa_shader_core_cntrs_def_ ## gpu), \ ++ (reference_voltage)); \ ++ } \ ++ IPA_POWER_MODEL_OPS(gpu, gpu) + -+ mali_kbase_capability_def const *cap_def; + -+ if (WARN_ON(cap < 0)) -+ return false; ++#define ALIAS_POWER_MODEL(gpu, as_gpu) \ ++ IPA_POWER_MODEL_OPS(gpu, as_gpu) + -+ if (WARN_ON(cap >= MALI_KBASE_NUM_CAPS)) -+ return false; ++/* Reference voltage value is 750 mV. */ ++STANDARD_POWER_MODEL(todx, 750); ++STANDARD_POWER_MODEL(tgrx, 750); ++STANDARD_POWER_MODEL(tvax, 750); ++STANDARD_POWER_MODEL(ttux, 750); ++/* Reference voltage value is 550 mV. */ ++STANDARD_POWER_MODEL(ttix, 550); + -+ cap_def = &kbase_caps_table[(int)cap]; -+ required_ver = KBASE_API_VERSION(cap_def->required_major, cap_def->required_minor); -+ supported = (api_version >= required_ver); ++/* Assuming LODX is an alias of TODX for IPA */ ++ALIAS_POWER_MODEL(lodx, todx); + -+ return supported; -+} ++/* Assuming LTUX is an alias of TTUX for IPA */ ++ALIAS_POWER_MODEL(ltux, ttux); + -+/** -+ * kbase_file_new - Create an object representing a device file -+ * -+ * @kbdev: An instance of the GPU platform device, allocated from the probe -+ * method of the driver. -+ * @filp: Pointer to the struct file corresponding to device file -+ * /dev/malixx instance, passed to the file's open method. -+ * -+ * In its initial state, the device file has no context (i.e. no GPU -+ * address space) and no API version number. Both must be assigned before -+ * kbase_file_get_kctx_if_setup_complete() can be used successfully. -+ * -+ * @return Address of an object representing a simulated device file, or NULL -+ * on failure. -+ */ -+static struct kbase_file *kbase_file_new(struct kbase_device *const kbdev, -+ struct file *const filp) ++/* Assuming LTUX is an alias of TTUX for IPA */ ++ALIAS_POWER_MODEL(ltix, ttix); ++ ++static const struct kbase_ipa_model_ops *ipa_counter_model_ops[] = { ++ &kbase_todx_ipa_model_ops, &kbase_lodx_ipa_model_ops, ++ &kbase_tgrx_ipa_model_ops, &kbase_tvax_ipa_model_ops, ++ &kbase_ttux_ipa_model_ops, &kbase_ltux_ipa_model_ops, ++ &kbase_ttix_ipa_model_ops, &kbase_ltix_ipa_model_ops, ++}; ++ ++const struct kbase_ipa_model_ops *kbase_ipa_counter_model_ops_find( ++ struct kbase_device *kbdev, const char *name) +{ -+ struct kbase_file *const kfile = kmalloc(sizeof(*kfile), GFP_KERNEL); ++ int i; + -+ if (kfile) { -+ kfile->kbdev = kbdev; -+ kfile->filp = filp; -+ kfile->kctx = NULL; -+ kfile->api_version = 0; -+ atomic_set(&kfile->setup_state, KBASE_FILE_NEED_VSN); ++ for (i = 0; i < ARRAY_SIZE(ipa_counter_model_ops); ++i) { ++ const struct kbase_ipa_model_ops *ops = ++ ipa_counter_model_ops[i]; ++ ++ if (!strcmp(ops->name, name)) ++ return ops; + } -+ return kfile; ++ ++ dev_err(kbdev->dev, "power model \'%s\' not found\n", name); ++ ++ return NULL; +} + -+/** -+ * kbase_file_set_api_version - Set the application programmer interface version ++const char *kbase_ipa_counter_model_name_from_id(u32 gpu_id) ++{ ++ const u32 prod_id = ++ (gpu_id & GPU_ID_VERSION_PRODUCT_ID) >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++ ++ switch (GPU_ID2_MODEL_MATCH_VALUE(prod_id)) { ++ case GPU_ID2_PRODUCT_TODX: ++ return "mali-todx-power-model"; ++ case GPU_ID2_PRODUCT_LODX: ++ return "mali-lodx-power-model"; ++ case GPU_ID2_PRODUCT_TGRX: ++ return "mali-tgrx-power-model"; ++ case GPU_ID2_PRODUCT_TVAX: ++ return "mali-tvax-power-model"; ++ case GPU_ID2_PRODUCT_TTUX: ++ return "mali-ttux-power-model"; ++ case GPU_ID2_PRODUCT_LTUX: ++ return "mali-ltux-power-model"; ++ case GPU_ID2_PRODUCT_TTIX: ++ return "mali-ttix-power-model"; ++ case GPU_ID2_PRODUCT_LTIX: ++ return "mali-ltix-power-model"; ++ default: ++ return NULL; ++ } ++} +diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_jm.c b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_jm.c +new file mode 100644 +index 000000000..2092db042 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_jm.c +@@ -0,0 +1,561 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* + * -+ * @kfile: A device file created by kbase_file_new() -+ * @major: Major version number (must not exceed 12 bits) -+ * @minor: Major version number (must not exceed 12 bits) ++ * (C) COPYRIGHT 2016-2023 ARM Limited. All rights reserved. + * -+ * An application programmer interface (API) version must be specified -+ * before calling kbase_file_create_kctx(), otherwise an error is returned. ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. + * -+ * If a version number was already set for the given @kfile (or is in the -+ * process of being set by another thread) then an error is returned. ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Return: 0 if successful, otherwise a negative error code. + */ -+static int kbase_file_set_api_version(struct kbase_file *const kfile, -+ u16 const major, u16 const minor) -+{ -+ if (WARN_ON(!kfile)) -+ return -EINVAL; + -+ /* setup pending, try to signal that we'll do the setup, -+ * if setup was already in progress, err this call -+ */ -+ if (atomic_cmpxchg(&kfile->setup_state, KBASE_FILE_NEED_VSN, -+ KBASE_FILE_VSN_IN_PROGRESS) != KBASE_FILE_NEED_VSN) -+ return -EPERM; ++#include + -+ /* save the proposed version number for later use */ -+ kfile->api_version = KBASE_API_VERSION(major, minor); ++#include "mali_kbase_ipa_counter_common_jm.h" ++#include "mali_kbase.h" ++#include + -+ atomic_set(&kfile->setup_state, KBASE_FILE_NEED_CTX); -+ return 0; -+} ++/* Performance counter blocks base offsets */ ++#define JM_BASE (0 * KBASE_IPA_NR_BYTES_PER_BLOCK) ++#define MEMSYS_BASE (2 * KBASE_IPA_NR_BYTES_PER_BLOCK) + -+/** -+ * kbase_file_get_api_version - Get the application programmer interface version -+ * -+ * @kfile: A device file created by kbase_file_new() -+ * -+ * Return: The version number (encoded with KBASE_API_VERSION) or 0 if none has -+ * been set. -+ */ -+static unsigned long kbase_file_get_api_version(struct kbase_file *const kfile) -+{ -+ if (WARN_ON(!kfile)) -+ return 0; ++/* JM counter block offsets */ ++#define JM_GPU_ACTIVE (KBASE_IPA_NR_BYTES_PER_CNT * 6) + -+ if (atomic_read(&kfile->setup_state) < KBASE_FILE_NEED_CTX) -+ return 0; ++/* MEMSYS counter block offsets */ ++#define MEMSYS_L2_ANY_LOOKUP (KBASE_IPA_NR_BYTES_PER_CNT * 25) + -+ return kfile->api_version; -+} ++/* SC counter block offsets */ ++#define SC_EXEC_INSTR_FMA (KBASE_IPA_NR_BYTES_PER_CNT * 27) ++#define SC_EXEC_INSTR_COUNT (KBASE_IPA_NR_BYTES_PER_CNT * 28) ++#define SC_EXEC_INSTR_MSG (KBASE_IPA_NR_BYTES_PER_CNT * 30) ++#define SC_TEX_FILT_NUM_OPERATIONS (KBASE_IPA_NR_BYTES_PER_CNT * 39) ++#define SC_TEX_COORD_ISSUE (KBASE_IPA_NR_BYTES_PER_CNT * 40) ++#define SC_TEX_TFCH_NUM_OPERATIONS (KBASE_IPA_NR_BYTES_PER_CNT * 42) ++#define SC_VARY_INSTR (KBASE_IPA_NR_BYTES_PER_CNT * 49) ++#define SC_BEATS_WR_TIB (KBASE_IPA_NR_BYTES_PER_CNT * 62) + +/** -+ * kbase_file_create_kctx - Create a kernel base context -+ * -+ * @kfile: A device file created by kbase_file_new() -+ * @flags: Flags to set, which can be any combination of -+ * BASEP_CONTEXT_CREATE_KERNEL_FLAGS. -+ * -+ * This creates a new context for the GPU platform device instance that was -+ * specified when kbase_file_new() was called. Each context has its own GPU -+ * address space. If a context was already created for the given @kfile (or is -+ * in the process of being created for it by another thread) then an error is -+ * returned. -+ * -+ * An API version number must have been set by kbase_file_set_api_version() -+ * before calling this function, otherwise an error is returned. ++ * kbase_g7x_power_model_get_jm_counter() - get performance counter offset ++ * inside the Job Manager block ++ * @model_data: pointer to GPU model data. ++ * @counter_block_offset: offset in bytes of the performance counter inside ++ * the Job Manager block. + * -+ * Return: 0 if a new context was created, otherwise a negative error code. ++ * Return: Block offset in bytes of the required performance counter. + */ -+static int kbase_file_create_kctx(struct kbase_file *kfile, -+ base_context_create_flags flags); ++static u32 kbase_g7x_power_model_get_jm_counter(struct kbase_ipa_model_vinstr_data *model_data, ++ u32 counter_block_offset) ++{ ++ return JM_BASE + counter_block_offset; ++} + +/** -+ * kbase_file_get_kctx_if_setup_complete - Get a kernel base context -+ * pointer from a device file -+ * -+ * @kfile: A device file created by kbase_file_new() -+ * -+ * This function returns an error code (encoded with ERR_PTR) if no context -+ * has been created for the given @kfile. This makes it safe to use in -+ * circumstances where the order of initialization cannot be enforced, but -+ * only if the caller checks the return value. ++ * kbase_g7x_power_model_get_memsys_counter() - get performance counter offset ++ * inside the Memory System block ++ * @model_data: pointer to GPU model data. ++ * @counter_block_offset: offset in bytes of the performance counter inside ++ * the (first) Memory System block. + * -+ * Return: Address of the kernel base context associated with the @kfile, or -+ * NULL if no context exists. ++ * Return: Block offset in bytes of the required performance counter. + */ -+static struct kbase_context *kbase_file_get_kctx_if_setup_complete( -+ struct kbase_file *const kfile) ++static u32 kbase_g7x_power_model_get_memsys_counter(struct kbase_ipa_model_vinstr_data *model_data, ++ u32 counter_block_offset) +{ -+ if (WARN_ON(!kfile) || -+ atomic_read(&kfile->setup_state) != KBASE_FILE_COMPLETE || -+ WARN_ON(!kfile->kctx)) -+ return NULL; -+ -+ return kfile->kctx; ++ /* The base address of Memory System performance counters is always the same, although their number ++ * may vary based on the number of cores. For the moment it's ok to return a constant. ++ */ ++ return MEMSYS_BASE + counter_block_offset; +} + +/** -+ * kbase_file_delete - Destroy an object representing a device file -+ * -+ * @kfile: A device file created by kbase_file_new() ++ * kbase_g7x_power_model_get_sc_counter() - get performance counter offset ++ * inside the Shader Cores block ++ * @model_data: pointer to GPU model data. ++ * @counter_block_offset: offset in bytes of the performance counter inside ++ * the (first) Shader Cores block. + * -+ * If any context was created for the @kfile then it is destroyed. ++ * Return: Block offset in bytes of the required performance counter. + */ -+static void kbase_file_delete(struct kbase_file *const kfile) ++static u32 kbase_g7x_power_model_get_sc_counter(struct kbase_ipa_model_vinstr_data *model_data, ++ u32 counter_block_offset) +{ -+ struct kbase_device *kbdev = NULL; -+ -+ if (WARN_ON(!kfile)) -+ return; -+ -+ kfile->filp->private_data = NULL; -+ kbdev = kfile->kbdev; -+ -+ if (atomic_read(&kfile->setup_state) == KBASE_FILE_COMPLETE) { -+ struct kbase_context *kctx = kfile->kctx; -+ -+#ifdef CONFIG_DEBUG_FS -+ kbasep_mem_profile_debugfs_remove(kctx); ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ const u32 sc_base = MEMSYS_BASE + ++ (KBASE_DUMMY_MODEL_MAX_MEMSYS_BLOCKS * ++ KBASE_IPA_NR_BYTES_PER_BLOCK); ++#else ++ const u32 sc_base = MEMSYS_BASE + ++ (model_data->kbdev->gpu_props.props.l2_props.num_l2_slices * ++ KBASE_IPA_NR_BYTES_PER_BLOCK); +#endif -+ -+ mutex_lock(&kctx->legacy_hwcnt_lock); -+ /* If this client was performing hardware counter dumping and -+ * did not explicitly detach itself, destroy it now -+ */ -+ kbase_hwcnt_legacy_client_destroy(kctx->legacy_hwcnt_cli); -+ kctx->legacy_hwcnt_cli = NULL; -+ mutex_unlock(&kctx->legacy_hwcnt_lock); -+ -+ kbase_context_debugfs_term(kctx); -+ -+ kbase_destroy_context(kctx); -+ -+ dev_dbg(kbdev->dev, "deleted base context\n"); -+ } -+ -+ kbase_release_device(kbdev); -+ -+ kfree(kfile); -+} -+ -+static int kbase_api_handshake(struct kbase_file *kfile, -+ struct kbase_ioctl_version_check *version) -+{ -+ int err = 0; -+ -+ switch (version->major) { -+ case BASE_UK_VERSION_MAJOR: -+ /* set minor to be the lowest common */ -+ version->minor = min_t(int, BASE_UK_VERSION_MINOR, -+ (int)version->minor); -+ break; -+ default: -+ /* We return our actual version regardless if it -+ * matches the version returned by userspace - -+ * userspace can bail if it can't handle this -+ * version -+ */ -+ version->major = BASE_UK_VERSION_MAJOR; -+ version->minor = BASE_UK_VERSION_MINOR; -+ break; -+ } -+ -+ /* save the proposed version number for later use */ -+ err = kbase_file_set_api_version(kfile, version->major, version->minor); -+ if (unlikely(err)) -+ return err; -+ -+ /* For backward compatibility, we may need to create the context before -+ * the flags have been set. Originally it was created on file open -+ * (with job submission disabled) but we don't support that usage. -+ */ -+ if (!mali_kbase_supports_system_monitor(kbase_file_get_api_version(kfile))) -+ err = kbase_file_create_kctx(kfile, -+ BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED); -+ -+ return err; -+} -+ -+static int kbase_api_handshake_dummy(struct kbase_file *kfile, -+ struct kbase_ioctl_version_check *version) -+{ -+ return -EPERM; ++ return sc_base + counter_block_offset; +} + +/** -+ * enum mali_error - Mali error codes shared with userspace -+ * -+ * This is subset of those common Mali errors that can be returned to userspace. -+ * Values of matching user and kernel space enumerators MUST be the same. -+ * MALI_ERROR_NONE is guaranteed to be 0. ++ * kbase_g7x_sum_all_memsys_blocks() - calculate energy for a single Memory ++ * System performance counter. ++ * @model_data: pointer to GPU model data. ++ * @coeff: default value of coefficient for IPA group. ++ * @counter_block_offset: offset in bytes of the counter inside the block it ++ * belongs to. + * -+ * @MALI_ERROR_NONE: Success -+ * @MALI_ERROR_OUT_OF_GPU_MEMORY: Not used in the kernel driver -+ * @MALI_ERROR_OUT_OF_MEMORY: Memory allocation failure -+ * @MALI_ERROR_FUNCTION_FAILED: Generic error code ++ * Return: Energy estimation for a single Memory System performance counter. + */ -+enum mali_error { -+ MALI_ERROR_NONE = 0, -+ MALI_ERROR_OUT_OF_GPU_MEMORY, -+ MALI_ERROR_OUT_OF_MEMORY, -+ MALI_ERROR_FUNCTION_FAILED, -+}; -+ -+static struct kbase_device *to_kbase_device(struct device *dev) -+{ -+ return dev_get_drvdata(dev); -+} -+ -+int assign_irqs(struct kbase_device *kbdev) ++static s64 kbase_g7x_sum_all_memsys_blocks( ++ struct kbase_ipa_model_vinstr_data *model_data, ++ s32 coeff, ++ u32 counter_block_offset) +{ -+ struct platform_device *pdev; -+ int i; -+ -+ if (!kbdev) -+ return -ENODEV; -+ -+ pdev = to_platform_device(kbdev->dev); -+ /* 3 IRQ resources */ -+ for (i = 0; i < 3; i++) { -+ struct resource *irq_res; -+ int irqtag; -+ -+ irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, i); -+ if (!irq_res) { -+ dev_err(kbdev->dev, "No IRQ resource at index %d\n", i); -+ return -ENOENT; -+ } -+ -+#ifdef CONFIG_OF -+ if (!strncasecmp(irq_res->name, "JOB", 4)) { -+ irqtag = JOB_IRQ_TAG; -+ } else if (!strncasecmp(irq_res->name, "MMU", 4)) { -+ irqtag = MMU_IRQ_TAG; -+ } else if (!strncasecmp(irq_res->name, "GPU", 4)) { -+ irqtag = GPU_IRQ_TAG; -+ } else { -+ dev_err(&pdev->dev, "Invalid irq res name: '%s'\n", -+ irq_res->name); -+ return -EINVAL; -+ } -+#else -+ irqtag = i; -+#endif /* CONFIG_OF */ -+ kbdev->irqs[irqtag].irq = irq_res->start; -+ kbdev->irqs[irqtag].flags = irq_res->flags & IRQF_TRIGGER_MASK; -+ } ++ u32 counter; + -+ return 0; ++ counter = kbase_g7x_power_model_get_memsys_counter(model_data, ++ counter_block_offset); ++ return kbase_ipa_sum_all_memsys_blocks(model_data, coeff, counter); +} + -+/* Find a particular kbase device (as specified by minor number), or find the "first" device if -1 is specified */ -+struct kbase_device *kbase_find_device(int minor) ++/** ++ * kbase_g7x_sum_all_shader_cores() - calculate energy for a Shader Cores ++ * performance counter for all cores. ++ * @model_data: pointer to GPU model data. ++ * @coeff: default value of coefficient for IPA group. ++ * @counter_block_offset: offset in bytes of the counter inside the block it ++ * belongs to. ++ * ++ * Return: Energy estimation for a Shader Cores performance counter for all ++ * cores. ++ */ ++static s64 kbase_g7x_sum_all_shader_cores( ++ struct kbase_ipa_model_vinstr_data *model_data, ++ s32 coeff, ++ u32 counter_block_offset) +{ -+ struct kbase_device *kbdev = NULL; -+ struct list_head *entry; -+ const struct list_head *dev_list = kbase_device_get_list(); -+ -+ list_for_each(entry, dev_list) { -+ struct kbase_device *tmp; -+ -+ tmp = list_entry(entry, struct kbase_device, entry); -+ if (tmp->mdev.minor == minor || minor == -1) { -+ kbdev = tmp; -+ get_device(kbdev->dev); -+ break; -+ } -+ } -+ kbase_device_put_list(dev_list); -+ -+ return kbdev; -+} -+EXPORT_SYMBOL(kbase_find_device); ++ u32 counter; + -+void kbase_release_device(struct kbase_device *kbdev) -+{ -+ put_device(kbdev->dev); ++ counter = kbase_g7x_power_model_get_sc_counter(model_data, ++ counter_block_offset); ++ return kbase_ipa_sum_all_shader_cores(model_data, coeff, counter); +} -+EXPORT_SYMBOL(kbase_release_device); + -+#ifdef CONFIG_DEBUG_FS -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) && \ -+ !(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 28) && \ -+ LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)) -+/* -+ * Older versions, before v4.6, of the kernel doesn't have -+ * kstrtobool_from_user(), except longterm 4.4.y which had it added in 4.4.28 ++/** ++ * kbase_g7x_jm_single_counter() - calculate energy for a single Job Manager performance counter. ++ * @model_data: pointer to GPU model data. ++ * @coeff: default value of coefficient for IPA group. ++ * @counter_block_offset: offset in bytes of the counter inside the block it belongs to. ++ * ++ * Return: Energy estimation for a single Job Manager performance counter. + */ -+static int kstrtobool_from_user(const char __user *s, size_t count, bool *res) ++static s64 kbase_g7x_jm_single_counter( ++ struct kbase_ipa_model_vinstr_data *model_data, ++ s32 coeff, ++ u32 counter_block_offset) +{ -+ char buf[4]; -+ -+ count = min(count, sizeof(buf) - 1); -+ -+ if (copy_from_user(buf, s, count)) -+ return -EFAULT; -+ buf[count] = '\0'; ++ u32 counter; + -+ return strtobool(buf, res); ++ counter = kbase_g7x_power_model_get_jm_counter(model_data, ++ counter_block_offset); ++ return kbase_ipa_single_counter(model_data, coeff, counter); +} -+#endif + -+static ssize_t write_ctx_infinite_cache(struct file *f, const char __user *ubuf, size_t size, loff_t *off) ++/** ++ * kbase_g7x_get_active_cycles() - return the GPU_ACTIVE counter ++ * @model_data: pointer to GPU model data. ++ * ++ * Return: the number of cycles the GPU was active during the counter sampling ++ * period. ++ */ ++static u32 kbase_g7x_get_active_cycles( ++ struct kbase_ipa_model_vinstr_data *model_data) +{ -+ struct kbase_context *kctx = f->private_data; -+ int err; -+ bool value; -+ -+ err = kstrtobool_from_user(ubuf, size, &value); -+ if (err) -+ return err; -+ -+ if (value) -+ kbase_ctx_flag_set(kctx, KCTX_INFINITE_CACHE); -+ else -+ kbase_ctx_flag_clear(kctx, KCTX_INFINITE_CACHE); ++ u32 counter = kbase_g7x_power_model_get_jm_counter(model_data, JM_GPU_ACTIVE); + -+ return size; ++ /* Counters are only 32-bit, so we can safely multiply by 1 then cast ++ * the 64-bit result back to a u32. ++ */ ++ return kbase_ipa_single_counter(model_data, 1, counter); +} + -+static ssize_t read_ctx_infinite_cache(struct file *f, char __user *ubuf, size_t size, loff_t *off) -+{ -+ struct kbase_context *kctx = f->private_data; -+ char buf[32]; -+ int count; -+ bool value; -+ -+ value = kbase_ctx_flag(kctx, KCTX_INFINITE_CACHE); ++/* Table of IPA group definitions. ++ * ++ * For each IPA group, this table defines a function to access the given performance block counter (or counters, ++ * if the operation needs to be iterated on multiple blocks) and calculate energy estimation. ++ */ + -+ count = scnprintf(buf, sizeof(buf), "%s\n", value ? "Y" : "N"); ++static const struct kbase_ipa_group ipa_groups_def_g71[] = { ++ { ++ .name = "l2_access", ++ .default_value = 526300, ++ .op = kbase_g7x_sum_all_memsys_blocks, ++ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, ++ }, ++ { ++ .name = "exec_instr_count", ++ .default_value = 301100, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_EXEC_INSTR_COUNT, ++ }, ++ { ++ .name = "tex_issue", ++ .default_value = 197400, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_TEX_COORD_ISSUE, ++ }, ++ { ++ .name = "tile_wb", ++ .default_value = -156400, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_BEATS_WR_TIB, ++ }, ++ { ++ .name = "gpu_active", ++ .default_value = 115800, ++ .op = kbase_g7x_jm_single_counter, ++ .counter_block_offset = JM_GPU_ACTIVE, ++ }, ++}; + -+ return simple_read_from_buffer(ubuf, size, off, buf, count); -+} ++static const struct kbase_ipa_group ipa_groups_def_g72[] = { ++ { ++ .name = "l2_access", ++ .default_value = 393000, ++ .op = kbase_g7x_sum_all_memsys_blocks, ++ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, ++ }, ++ { ++ .name = "exec_instr_count", ++ .default_value = 227000, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_EXEC_INSTR_COUNT, ++ }, ++ { ++ .name = "tex_issue", ++ .default_value = 181900, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_TEX_COORD_ISSUE, ++ }, ++ { ++ .name = "tile_wb", ++ .default_value = -120200, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_BEATS_WR_TIB, ++ }, ++ { ++ .name = "gpu_active", ++ .default_value = 133100, ++ .op = kbase_g7x_jm_single_counter, ++ .counter_block_offset = JM_GPU_ACTIVE, ++ }, ++}; + -+static const struct file_operations kbase_infinite_cache_fops = { -+ .owner = THIS_MODULE, -+ .open = simple_open, -+ .write = write_ctx_infinite_cache, -+ .read = read_ctx_infinite_cache, ++static const struct kbase_ipa_group ipa_groups_def_g76[] = { ++ { ++ .name = "gpu_active", ++ .default_value = 122000, ++ .op = kbase_g7x_jm_single_counter, ++ .counter_block_offset = JM_GPU_ACTIVE, ++ }, ++ { ++ .name = "exec_instr_count", ++ .default_value = 488900, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_EXEC_INSTR_COUNT, ++ }, ++ { ++ .name = "vary_instr", ++ .default_value = 212100, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_VARY_INSTR, ++ }, ++ { ++ .name = "tex_tfch_num_operations", ++ .default_value = 288000, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_TEX_TFCH_NUM_OPERATIONS, ++ }, ++ { ++ .name = "l2_access", ++ .default_value = 378100, ++ .op = kbase_g7x_sum_all_memsys_blocks, ++ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, ++ }, +}; + -+static ssize_t write_ctx_force_same_va(struct file *f, const char __user *ubuf, -+ size_t size, loff_t *off) -+{ -+ struct kbase_context *kctx = f->private_data; -+ int err; -+ bool value; ++static const struct kbase_ipa_group ipa_groups_def_g52_r1[] = { ++ { ++ .name = "gpu_active", ++ .default_value = 224200, ++ .op = kbase_g7x_jm_single_counter, ++ .counter_block_offset = JM_GPU_ACTIVE, ++ }, ++ { ++ .name = "exec_instr_count", ++ .default_value = 384700, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_EXEC_INSTR_COUNT, ++ }, ++ { ++ .name = "vary_instr", ++ .default_value = 271900, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_VARY_INSTR, ++ }, ++ { ++ .name = "tex_tfch_num_operations", ++ .default_value = 477700, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_TEX_TFCH_NUM_OPERATIONS, ++ }, ++ { ++ .name = "l2_access", ++ .default_value = 551400, ++ .op = kbase_g7x_sum_all_memsys_blocks, ++ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, ++ }, ++}; + -+ err = kstrtobool_from_user(ubuf, size, &value); -+ if (err) -+ return err; ++static const struct kbase_ipa_group ipa_groups_def_g51[] = { ++ { ++ .name = "gpu_active", ++ .default_value = 201400, ++ .op = kbase_g7x_jm_single_counter, ++ .counter_block_offset = JM_GPU_ACTIVE, ++ }, ++ { ++ .name = "exec_instr_count", ++ .default_value = 392700, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_EXEC_INSTR_COUNT, ++ }, ++ { ++ .name = "vary_instr", ++ .default_value = 274000, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_VARY_INSTR, ++ }, ++ { ++ .name = "tex_tfch_num_operations", ++ .default_value = 528000, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_TEX_TFCH_NUM_OPERATIONS, ++ }, ++ { ++ .name = "l2_access", ++ .default_value = 506400, ++ .op = kbase_g7x_sum_all_memsys_blocks, ++ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, ++ }, ++}; + -+ if (value) { -+#if defined(CONFIG_64BIT) -+ /* 32-bit clients cannot force SAME_VA */ -+ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) -+ return -EINVAL; -+ kbase_ctx_flag_set(kctx, KCTX_FORCE_SAME_VA); -+#else /* defined(CONFIG_64BIT) */ -+ /* 32-bit clients cannot force SAME_VA */ -+ return -EINVAL; -+#endif /* defined(CONFIG_64BIT) */ -+ } else { -+ kbase_ctx_flag_clear(kctx, KCTX_FORCE_SAME_VA); -+ } ++static const struct kbase_ipa_group ipa_groups_def_g77[] = { ++ { ++ .name = "l2_access", ++ .default_value = 710800, ++ .op = kbase_g7x_sum_all_memsys_blocks, ++ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, ++ }, ++ { ++ .name = "exec_instr_msg", ++ .default_value = 2375300, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_EXEC_INSTR_MSG, ++ }, ++ { ++ .name = "exec_instr_fma", ++ .default_value = 656100, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_EXEC_INSTR_FMA, ++ }, ++ { ++ .name = "tex_filt_num_operations", ++ .default_value = 318800, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_TEX_FILT_NUM_OPERATIONS, ++ }, ++ { ++ .name = "gpu_active", ++ .default_value = 172800, ++ .op = kbase_g7x_jm_single_counter, ++ .counter_block_offset = JM_GPU_ACTIVE, ++ }, ++}; + -+ return size; -+} ++static const struct kbase_ipa_group ipa_groups_def_tbex[] = { ++ { ++ .name = "l2_access", ++ .default_value = 599800, ++ .op = kbase_g7x_sum_all_memsys_blocks, ++ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, ++ }, ++ { ++ .name = "exec_instr_msg", ++ .default_value = 1830200, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_EXEC_INSTR_MSG, ++ }, ++ { ++ .name = "exec_instr_fma", ++ .default_value = 407300, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_EXEC_INSTR_FMA, ++ }, ++ { ++ .name = "tex_filt_num_operations", ++ .default_value = 224500, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_TEX_FILT_NUM_OPERATIONS, ++ }, ++ { ++ .name = "gpu_active", ++ .default_value = 153800, ++ .op = kbase_g7x_jm_single_counter, ++ .counter_block_offset = JM_GPU_ACTIVE, ++ }, ++}; + -+static ssize_t read_ctx_force_same_va(struct file *f, char __user *ubuf, -+ size_t size, loff_t *off) -+{ -+ struct kbase_context *kctx = f->private_data; -+ char buf[32]; -+ int count; -+ bool value; ++static const struct kbase_ipa_group ipa_groups_def_tbax[] = { ++ { ++ .name = "l2_access", ++ .default_value = 599800, ++ .op = kbase_g7x_sum_all_memsys_blocks, ++ .counter_block_offset = MEMSYS_L2_ANY_LOOKUP, ++ }, ++ { ++ .name = "exec_instr_msg", ++ .default_value = 1830200, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_EXEC_INSTR_MSG, ++ }, ++ { ++ .name = "exec_instr_fma", ++ .default_value = 407300, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_EXEC_INSTR_FMA, ++ }, ++ { ++ .name = "tex_filt_num_operations", ++ .default_value = 224500, ++ .op = kbase_g7x_sum_all_shader_cores, ++ .counter_block_offset = SC_TEX_FILT_NUM_OPERATIONS, ++ }, ++ { ++ .name = "gpu_active", ++ .default_value = 153800, ++ .op = kbase_g7x_jm_single_counter, ++ .counter_block_offset = JM_GPU_ACTIVE, ++ }, ++}; + -+ value = kbase_ctx_flag(kctx, KCTX_FORCE_SAME_VA); ++#define IPA_POWER_MODEL_OPS(gpu, init_token) \ ++ static const struct kbase_ipa_model_ops kbase_##gpu##_ipa_model_ops = { \ ++ .name = "mali-" #gpu "-power-model", \ ++ .init = kbase_##init_token##_power_model_init, \ ++ .term = kbase_ipa_vinstr_common_model_term, \ ++ .get_dynamic_coeff = kbase_ipa_vinstr_dynamic_coeff, \ ++ .reset_counter_data = kbase_ipa_vinstr_reset_data, \ ++ } + -+ count = scnprintf(buf, sizeof(buf), "%s\n", value ? "Y" : "N"); ++#define STANDARD_POWER_MODEL(gpu, reference_voltage) \ ++ static int kbase_ ## gpu ## _power_model_init(\ ++ struct kbase_ipa_model *model) \ ++ { \ ++ BUILD_BUG_ON(ARRAY_SIZE(ipa_groups_def_ ## gpu) > \ ++ KBASE_IPA_MAX_GROUP_DEF_NUM); \ ++ return kbase_ipa_vinstr_common_model_init(model, \ ++ ipa_groups_def_ ## gpu, \ ++ ARRAY_SIZE(ipa_groups_def_ ## gpu), \ ++ kbase_g7x_get_active_cycles, \ ++ (reference_voltage)); \ ++ } \ ++ IPA_POWER_MODEL_OPS(gpu, gpu) + -+ return simple_read_from_buffer(ubuf, size, off, buf, count); -+} ++#define ALIAS_POWER_MODEL(gpu, as_gpu) \ ++ IPA_POWER_MODEL_OPS(gpu, as_gpu) + -+static const struct file_operations kbase_force_same_va_fops = { -+ .owner = THIS_MODULE, -+ .open = simple_open, -+ .write = write_ctx_force_same_va, -+ .read = read_ctx_force_same_va, ++STANDARD_POWER_MODEL(g71, 800); ++STANDARD_POWER_MODEL(g72, 800); ++STANDARD_POWER_MODEL(g76, 800); ++STANDARD_POWER_MODEL(g52_r1, 1000); ++STANDARD_POWER_MODEL(g51, 1000); ++STANDARD_POWER_MODEL(g77, 1000); ++STANDARD_POWER_MODEL(tbex, 1000); ++STANDARD_POWER_MODEL(tbax, 1000); ++ ++/* g52 is an alias of g76 (TNOX) for IPA */ ++ALIAS_POWER_MODEL(g52, g76); ++/* tnax is an alias of g77 (TTRX) for IPA */ ++ALIAS_POWER_MODEL(tnax, g77); ++ ++static const struct kbase_ipa_model_ops *ipa_counter_model_ops[] = { ++ &kbase_g71_ipa_model_ops, ++ &kbase_g72_ipa_model_ops, ++ &kbase_g76_ipa_model_ops, ++ &kbase_g52_ipa_model_ops, ++ &kbase_g52_r1_ipa_model_ops, ++ &kbase_g51_ipa_model_ops, ++ &kbase_g77_ipa_model_ops, ++ &kbase_tnax_ipa_model_ops, ++ &kbase_tbex_ipa_model_ops, ++ &kbase_tbax_ipa_model_ops +}; -+#endif /* CONFIG_DEBUG_FS */ + -+static int kbase_file_create_kctx(struct kbase_file *const kfile, -+ base_context_create_flags const flags) ++const struct kbase_ipa_model_ops *kbase_ipa_counter_model_ops_find( ++ struct kbase_device *kbdev, const char *name) +{ -+ struct kbase_device *kbdev = NULL; -+ struct kbase_context *kctx = NULL; -+#ifdef CONFIG_DEBUG_FS -+ char kctx_name[64]; -+#endif ++ int i; + -+ if (WARN_ON(!kfile)) -+ return -EINVAL; ++ for (i = 0; i < ARRAY_SIZE(ipa_counter_model_ops); ++i) { ++ const struct kbase_ipa_model_ops *ops = ++ ipa_counter_model_ops[i]; + -+ /* setup pending, try to signal that we'll do the setup, -+ * if setup was already in progress, err this call -+ */ -+ if (atomic_cmpxchg(&kfile->setup_state, KBASE_FILE_NEED_CTX, -+ KBASE_FILE_CTX_IN_PROGRESS) != KBASE_FILE_NEED_CTX) -+ return -EPERM; ++ if (!strcmp(ops->name, name)) ++ return ops; ++ } + -+ kbdev = kfile->kbdev; ++ dev_err(kbdev->dev, "power model \'%s\' not found\n", name); + -+#if (KERNEL_VERSION(4, 6, 0) <= LINUX_VERSION_CODE) -+ kctx = kbase_create_context(kbdev, in_compat_syscall(), -+ flags, kfile->api_version, kfile->filp); -+#else -+ kctx = kbase_create_context(kbdev, is_compat_task(), -+ flags, kfile->api_version, kfile->filp); -+#endif /* (KERNEL_VERSION(4, 6, 0) <= LINUX_VERSION_CODE) */ ++ return NULL; ++} + -+ /* if bad flags, will stay stuck in setup mode */ -+ if (!kctx) -+ return -ENOMEM; ++const char *kbase_ipa_counter_model_name_from_id(u32 gpu_id) ++{ ++ const u32 prod_id = ++ (gpu_id & GPU_ID_VERSION_PRODUCT_ID) >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT; + -+ if (kbdev->infinite_cache_active_default) -+ kbase_ctx_flag_set(kctx, KCTX_INFINITE_CACHE); ++ switch (GPU_ID2_MODEL_MATCH_VALUE(prod_id)) { ++ case GPU_ID2_PRODUCT_TMIX: ++ return "mali-g71-power-model"; ++ case GPU_ID2_PRODUCT_THEX: ++ return "mali-g72-power-model"; ++ case GPU_ID2_PRODUCT_TNOX: ++ return "mali-g76-power-model"; ++ case GPU_ID2_PRODUCT_TSIX: ++ return "mali-g51-power-model"; ++ case GPU_ID2_PRODUCT_TGOX: ++ if ((gpu_id & GPU_ID2_VERSION_MAJOR) == ++ (0 << GPU_ID2_VERSION_MAJOR_SHIFT)) ++ /* g52 aliased to g76 power-model's ops */ ++ return "mali-g52-power-model"; ++ else ++ return "mali-g52_r1-power-model"; ++ case GPU_ID2_PRODUCT_TNAX: ++ return "mali-tnax-power-model"; ++ case GPU_ID2_PRODUCT_TTRX: ++ return "mali-g77-power-model"; ++ case GPU_ID2_PRODUCT_TBEX: ++ return "mali-tbex-power-model"; ++ case GPU_ID2_PRODUCT_TBAX: ++ return "mali-tbax-power-model"; ++ default: ++ return NULL; ++ } ++} +diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c +new file mode 100755 +index 000000000..b2e6bc459 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c +@@ -0,0 +1,778 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2016-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+#ifdef CONFIG_DEBUG_FS -+ snprintf(kctx_name, 64, "%d_%d", kctx->tgid, kctx->id); ++#include ++#include ++#include ++#include "mali_kbase.h" ++#include "mali_kbase_ipa.h" ++#include "mali_kbase_ipa_debugfs.h" ++#include "mali_kbase_ipa_simple.h" ++#include "backend/gpu/mali_kbase_pm_internal.h" ++#include "backend/gpu/mali_kbase_devfreq.h" ++#include + -+ mutex_init(&kctx->mem_profile_lock); ++#define KBASE_IPA_FALLBACK_MODEL_NAME "mali-simple-power-model" + -+ kctx->kctx_dentry = debugfs_create_dir(kctx_name, -+ kbdev->debugfs_ctx_directory); ++/* Polling by thermal governor starts when the temperature exceeds the certain ++ * trip point. In order to have meaningful value for the counters, when the ++ * polling starts and first call to kbase_get_real_power() is made, it is ++ * required to reset the counter values every now and then. ++ * It is reasonable to do the reset every second if no polling is being done, ++ * the counter model implementation also assumes max sampling interval of 1 sec. ++ */ ++#define RESET_INTERVAL_MS ((s64)1000) + -+ if (IS_ERR_OR_NULL(kctx->kctx_dentry)) { -+ /* we don't treat this as a fail - just warn about it */ -+ dev_warn(kbdev->dev, "couldn't create debugfs dir for kctx\n"); -+ } else { -+#if (KERNEL_VERSION(4, 7, 0) > LINUX_VERSION_CODE) -+ /* prevent unprivileged use of debug file system -+ * in old kernel version -+ */ -+ debugfs_create_file("infinite_cache", 0600, kctx->kctx_dentry, -+ kctx, &kbase_infinite_cache_fops); -+#else -+ debugfs_create_file("infinite_cache", 0644, kctx->kctx_dentry, -+ kctx, &kbase_infinite_cache_fops); -+#endif -+ debugfs_create_file("force_same_va", 0600, kctx->kctx_dentry, -+ kctx, &kbase_force_same_va_fops); ++int kbase_ipa_model_recalculate(struct kbase_ipa_model *model) ++{ ++ int err = 0; + -+ kbase_context_debugfs_init(kctx); ++ lockdep_assert_held(&model->kbdev->ipa.lock); ++ ++ if (model->ops->recalculate) { ++ err = model->ops->recalculate(model); ++ if (err) { ++ dev_err(model->kbdev->dev, ++ "recalculation of power model %s returned error %d\n", ++ model->ops->name, err); ++ } + } -+#endif /* CONFIG_DEBUG_FS */ + -+ dev_dbg(kbdev->dev, "created base context\n"); ++ return err; ++} + -+ kfile->kctx = kctx; -+ atomic_set(&kfile->setup_state, KBASE_FILE_COMPLETE); ++const struct kbase_ipa_model_ops *kbase_ipa_model_ops_find(struct kbase_device *kbdev, ++ const char *name) ++{ ++ if (!strcmp(name, kbase_simple_ipa_model_ops.name)) ++ return &kbase_simple_ipa_model_ops; + -+ return 0; ++ return kbase_ipa_counter_model_ops_find(kbdev, name); +} ++KBASE_EXPORT_TEST_API(kbase_ipa_model_ops_find); + -+static int kbase_open(struct inode *inode, struct file *filp) ++const char *kbase_ipa_model_name_from_id(u32 gpu_id) +{ -+ struct kbase_device *kbdev = NULL; -+ struct kbase_file *kfile; -+ int ret = 0; -+ -+ kbdev = kbase_find_device(iminor(inode)); ++ const char *model_name = ++ kbase_ipa_counter_model_name_from_id(gpu_id); + -+ if (!kbdev) -+ return -ENODEV; ++ if (!model_name) ++ return KBASE_IPA_FALLBACK_MODEL_NAME; ++ else ++ return model_name; ++} ++KBASE_EXPORT_TEST_API(kbase_ipa_model_name_from_id); + -+ kfile = kbase_file_new(kbdev, filp); -+ if (!kfile) { -+ ret = -ENOMEM; -+ goto out; -+ } ++static struct device_node *get_model_dt_node(struct kbase_ipa_model *model, ++ bool dt_required) ++{ ++ struct device_node *model_dt_node = NULL; ++ char compat_string[64]; + -+ filp->private_data = kfile; -+ filp->f_mode |= FMODE_UNSIGNED_OFFSET; ++ if (unlikely(!scnprintf(compat_string, sizeof(compat_string), "arm,%s", model->ops->name))) ++ return NULL; + -+ return 0; ++ /* of_find_compatible_node() will call of_node_put() on the root node, ++ * so take a reference on it first. ++ */ ++ of_node_get(model->kbdev->dev->of_node); ++ model_dt_node = of_find_compatible_node(model->kbdev->dev->of_node, ++ NULL, compat_string); ++ if (!model_dt_node && !model->missing_dt_node_warning) { ++ if (dt_required) ++ dev_warn(model->kbdev->dev, ++ "Couldn't find power_model DT node matching \'%s\'\n", ++ compat_string); ++ model->missing_dt_node_warning = true; ++ } + -+ out: -+ kbase_release_device(kbdev); -+ return ret; ++ return model_dt_node; +} + -+static int kbase_release(struct inode *inode, struct file *filp) ++int kbase_ipa_model_add_param_s32(struct kbase_ipa_model *model, ++ const char *name, s32 *addr, ++ size_t num_elems, bool dt_required) +{ -+ struct kbase_file *const kfile = filp->private_data; ++ int err = -EINVAL, i; ++ struct device_node *model_dt_node = get_model_dt_node(model, ++ dt_required); ++ char *origin; + -+ kbase_file_delete(kfile); -+ return 0; ++ err = of_property_read_u32_array(model_dt_node, name, (u32 *)addr, num_elems); ++ /* We're done with model_dt_node now, so drop the reference taken in ++ * get_model_dt_node()/of_find_compatible_node(). ++ */ ++ of_node_put(model_dt_node); ++ ++ if (err && dt_required) { ++ memset(addr, 0, sizeof(s32) * num_elems); ++ dev_warn(model->kbdev->dev, ++ "Error %d, no DT entry: %s.%s = %zu*[0]\n", ++ err, model->ops->name, name, num_elems); ++ origin = "zero"; ++ } else if (err && !dt_required) { ++ origin = "default"; ++ } else /* !err */ { ++ origin = "DT"; ++ } ++ ++ /* Create a unique debugfs entry for each element */ ++ for (i = 0; i < num_elems; ++i) { ++ char elem_name[32]; ++ ++ if (num_elems == 1) { ++ if (unlikely(!scnprintf(elem_name, sizeof(elem_name), "%s", name))) { ++ err = -ENOMEM; ++ goto exit; ++ } ++ } else { ++ if (unlikely(!scnprintf(elem_name, sizeof(elem_name), "%s.%d", name, i))) { ++ err = -ENOMEM; ++ goto exit; ++ } ++ } ++ ++ dev_dbg(model->kbdev->dev, "%s.%s = %d (%s)\n", ++ model->ops->name, elem_name, addr[i], origin); ++ ++ err = kbase_ipa_model_param_add(model, elem_name, ++ &addr[i], sizeof(s32), ++ PARAM_TYPE_S32); ++ if (err) ++ goto exit; ++ } ++exit: ++ return err; +} + -+static int kbase_api_set_flags(struct kbase_file *kfile, -+ struct kbase_ioctl_set_flags *flags) ++int kbase_ipa_model_add_param_string(struct kbase_ipa_model *model, ++ const char *name, char *addr, ++ size_t size, bool dt_required) +{ -+ int err = 0; -+ unsigned long const api_version = kbase_file_get_api_version(kfile); -+ struct kbase_context *kctx = NULL; ++ int err; ++ struct device_node *model_dt_node = get_model_dt_node(model, ++ dt_required); ++ const char *string_prop_value = ""; ++ char *origin; + -+ /* Validate flags */ -+ if (flags->create_flags != -+ (flags->create_flags & BASEP_CONTEXT_CREATE_KERNEL_FLAGS)) -+ return -EINVAL; ++ err = of_property_read_string(model_dt_node, name, ++ &string_prop_value); + -+ /* For backward compatibility, the context may have been created before -+ * the flags were set. ++ /* We're done with model_dt_node now, so drop the reference taken in ++ * get_model_dt_node()/of_find_compatible_node(). + */ -+ if (mali_kbase_supports_system_monitor(api_version)) { -+ err = kbase_file_create_kctx(kfile, flags->create_flags); -+ } else { -+#if !MALI_USE_CSF -+ struct kbasep_js_kctx_info *js_kctx_info = NULL; -+ unsigned long irq_flags = 0; -+#endif -+ -+ /* If setup is incomplete (e.g. because the API version -+ * wasn't set) then we have to give up. -+ */ -+ kctx = kbase_file_get_kctx_if_setup_complete(kfile); -+ if (unlikely(!kctx)) -+ return -EPERM; ++ of_node_put(model_dt_node); + -+#if MALI_USE_CSF -+ /* On CSF GPUs Job Manager interface isn't used to submit jobs -+ * (there are no job slots). So the legacy job manager path to -+ * submit jobs needs to remain disabled for CSF GPUs. -+ */ -+#else -+ js_kctx_info = &kctx->jctx.sched_info; -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); -+ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, irq_flags); -+ /* Translate the flags */ -+ if ((flags->create_flags & -+ BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED) == 0) -+ kbase_ctx_flag_clear(kctx, KCTX_SUBMIT_DISABLED); ++ if (err && dt_required) { ++ strncpy(addr, "", size - 1); ++ dev_warn(model->kbdev->dev, ++ "Error %d, no DT entry: %s.%s = \'%s\'\n", ++ err, model->ops->name, name, addr); ++ err = 0; ++ origin = "zero"; ++ } else if (err && !dt_required) { ++ origin = "default"; ++ } else /* !err */ { ++ strncpy(addr, string_prop_value, size - 1); ++ origin = "DT"; ++ } + ++ addr[size - 1] = '\0'; + -+ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, irq_flags); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); -+#endif -+ } ++ dev_dbg(model->kbdev->dev, "%s.%s = \'%s\' (%s)\n", ++ model->ops->name, name, string_prop_value, origin); + ++ err = kbase_ipa_model_param_add(model, name, addr, size, ++ PARAM_TYPE_STRING); + return err; +} + -+#if !MALI_USE_CSF -+static int kbase_api_job_submit(struct kbase_context *kctx, -+ struct kbase_ioctl_job_submit *submit) ++void kbase_ipa_term_model(struct kbase_ipa_model *model) +{ -+ return kbase_jd_submit(kctx, u64_to_user_ptr(submit->addr), -+ submit->nr_atoms, -+ submit->stride, false); ++ if (!model) ++ return; ++ ++ lockdep_assert_held(&model->kbdev->ipa.lock); ++ ++ if (model->ops->term) ++ model->ops->term(model); ++ ++ kbase_ipa_model_param_free_all(model); ++ ++ kfree(model); +} -+#endif /* !MALI_USE_CSF */ ++KBASE_EXPORT_TEST_API(kbase_ipa_term_model); + -+static int kbase_api_get_gpuprops(struct kbase_context *kctx, -+ struct kbase_ioctl_get_gpuprops *get_props) ++struct kbase_ipa_model *kbase_ipa_init_model(struct kbase_device *kbdev, ++ const struct kbase_ipa_model_ops *ops) +{ -+ struct kbase_gpu_props *kprops = &kctx->kbdev->gpu_props; ++ struct kbase_ipa_model *model; + int err; + -+ if (get_props->flags != 0) { -+ dev_err(kctx->kbdev->dev, "Unsupported flags to get_gpuprops"); -+ return -EINVAL; ++ lockdep_assert_held(&kbdev->ipa.lock); ++ ++ if (!ops || !ops->name) ++ return NULL; ++ ++ model = kzalloc(sizeof(struct kbase_ipa_model), GFP_KERNEL); ++ if (!model) ++ return NULL; ++ ++ model->kbdev = kbdev; ++ model->ops = ops; ++ INIT_LIST_HEAD(&model->params); ++ ++ err = model->ops->init(model); ++ if (err) { ++ dev_err(kbdev->dev, ++ "init of power model \'%s\' returned error %d\n", ++ ops->name, err); ++ kfree(model); ++ return NULL; + } + -+ if (get_props->size == 0) -+ return kprops->prop_buffer_size; -+ if (get_props->size < kprops->prop_buffer_size) -+ return -EINVAL; ++ err = kbase_ipa_model_recalculate(model); ++ if (err) { ++ kbase_ipa_term_model(model); ++ return NULL; ++ } + -+ err = copy_to_user(u64_to_user_ptr(get_props->buffer), -+ kprops->prop_buffer, -+ kprops->prop_buffer_size); -+ if (err) -+ return -EFAULT; -+ return kprops->prop_buffer_size; ++ return model; +} ++KBASE_EXPORT_TEST_API(kbase_ipa_init_model); + -+#if !MALI_USE_CSF -+static int kbase_api_post_term(struct kbase_context *kctx) ++static void kbase_ipa_term_locked(struct kbase_device *kbdev) +{ -+ kbase_event_close(kctx); -+ return 0; ++ lockdep_assert_held(&kbdev->ipa.lock); ++ ++ /* Clean up the models */ ++ if (kbdev->ipa.configured_model != kbdev->ipa.fallback_model) ++ kbase_ipa_term_model(kbdev->ipa.configured_model); ++ kbase_ipa_term_model(kbdev->ipa.fallback_model); ++ ++ kbdev->ipa.configured_model = NULL; ++ kbdev->ipa.fallback_model = NULL; +} -+#endif /* !MALI_USE_CSF */ + -+static int kbase_api_mem_alloc(struct kbase_context *kctx, -+ union kbase_ioctl_mem_alloc *alloc) ++int kbase_ipa_init(struct kbase_device *kbdev) +{ -+ struct kbase_va_region *reg; -+ u64 flags = alloc->in.flags; -+ u64 gpu_va; + -+ rcu_read_lock(); -+ /* Don't allow memory allocation until user space has set up the -+ * tracking page (which sets kctx->process_mm). Also catches when we've -+ * forked. ++ const char *model_name; ++ const struct kbase_ipa_model_ops *ops; ++ struct kbase_ipa_model *default_model = NULL; ++ int err; ++ ++ mutex_init(&kbdev->ipa.lock); ++ /* ++ * Lock during init to avoid warnings from lockdep_assert_held (there ++ * shouldn't be any concurrent access yet). + */ -+ if (rcu_dereference(kctx->process_mm) != current->mm) { -+ rcu_read_unlock(); -+ return -EINVAL; -+ } -+ rcu_read_unlock(); ++ mutex_lock(&kbdev->ipa.lock); + -+ if (flags & BASEP_MEM_FLAGS_KERNEL_ONLY) -+ return -ENOMEM; ++ /* The simple IPA model must *always* be present.*/ ++ ops = kbase_ipa_model_ops_find(kbdev, KBASE_IPA_FALLBACK_MODEL_NAME); + -+ /* Force SAME_VA if a 64-bit client. -+ * The only exception is GPU-executable memory if an EXEC_VA zone -+ * has been initialized. In that case, GPU-executable memory may -+ * or may not be SAME_VA. -+ */ -+ if ((!kbase_ctx_flag(kctx, KCTX_COMPAT)) && -+ kbase_ctx_flag(kctx, KCTX_FORCE_SAME_VA)) { -+ if (!(flags & BASE_MEM_PROT_GPU_EX) || !kbase_has_exec_va_zone(kctx)) -+ flags |= BASE_MEM_SAME_VA; ++ default_model = kbase_ipa_init_model(kbdev, ops); ++ if (!default_model) { ++ err = -EINVAL; ++ goto end; + } + -+#if MALI_USE_CSF -+ /* If CSF event memory allocation, need to force certain flags. -+ * SAME_VA - GPU address needs to be used as a CPU address, explicit -+ * mmap has to be avoided. -+ * CACHED_CPU - Frequent access to the event memory by CPU. -+ * COHERENT_SYSTEM - No explicit cache maintenance around the access -+ * to event memory so need to leverage the coherency support. -+ */ -+ if (flags & BASE_MEM_CSF_EVENT) { -+ flags |= (BASE_MEM_SAME_VA | -+ BASE_MEM_CACHED_CPU | -+ BASE_MEM_COHERENT_SYSTEM); ++ kbdev->ipa.fallback_model = default_model; ++ err = of_property_read_string(kbdev->dev->of_node, ++ "ipa-model", ++ &model_name); ++ if (err) { ++ /* Attempt to load a match from GPU-ID */ ++ u32 gpu_id; ++ ++ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++ model_name = kbase_ipa_model_name_from_id(gpu_id); ++ dev_dbg(kbdev->dev, ++ "Inferring model from GPU ID 0x%x: \'%s\'\n", ++ gpu_id, model_name); ++ err = 0; ++ } else { ++ dev_dbg(kbdev->dev, ++ "Using ipa-model parameter from DT: \'%s\'\n", ++ model_name); + } -+#endif + -+ reg = kbase_mem_alloc(kctx, alloc->in.va_pages, -+ alloc->in.commit_pages, -+ alloc->in.extent, -+ &flags, &gpu_va); ++ if (strcmp(KBASE_IPA_FALLBACK_MODEL_NAME, model_name) != 0) { ++ ops = kbase_ipa_model_ops_find(kbdev, model_name); ++ kbdev->ipa.configured_model = kbase_ipa_init_model(kbdev, ops); ++ if (!kbdev->ipa.configured_model) { ++ dev_warn(kbdev->dev, ++ "Failed to initialize ipa-model: \'%s\'\n" ++ "Falling back on default model\n", ++ model_name); ++ kbdev->ipa.configured_model = default_model; ++ } ++ } else { ++ kbdev->ipa.configured_model = default_model; ++ } + -+ if (!reg) -+ return -ENOMEM; ++ kbdev->ipa.last_sample_time = ktime_get_raw(); + -+ alloc->out.flags = flags; -+ alloc->out.gpu_va = gpu_va; ++end: ++ if (err) ++ kbase_ipa_term_locked(kbdev); ++ else ++ dev_info(kbdev->dev, ++ "Using configured power model %s, and fallback %s\n", ++ kbdev->ipa.configured_model->ops->name, ++ kbdev->ipa.fallback_model->ops->name); + -+ return 0; ++ mutex_unlock(&kbdev->ipa.lock); ++ return err; +} ++KBASE_EXPORT_TEST_API(kbase_ipa_init); + -+static int kbase_api_mem_query(struct kbase_context *kctx, -+ union kbase_ioctl_mem_query *query) ++void kbase_ipa_term(struct kbase_device *kbdev) +{ -+ return kbase_mem_query(kctx, query->in.gpu_addr, -+ query->in.query, &query->out.value); ++ mutex_lock(&kbdev->ipa.lock); ++ kbase_ipa_term_locked(kbdev); ++ mutex_unlock(&kbdev->ipa.lock); ++ ++ mutex_destroy(&kbdev->ipa.lock); +} ++KBASE_EXPORT_TEST_API(kbase_ipa_term); + -+static int kbase_api_mem_free(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_free *free) ++/** ++ * kbase_scale_dynamic_power() - Scale a dynamic power coefficient to an OPP ++ * @c: Dynamic model coefficient, in pW/(Hz V^2). Should be in range ++ * 0 < c < 2^26 to prevent overflow. ++ * @freq: Frequency, in Hz. Range: 2^23 < freq < 2^30 (~8MHz to ~1GHz) ++ * @voltage: Voltage, in mV. Range: 2^9 < voltage < 2^13 (~0.5V to ~8V) ++ * ++ * Keep a record of the approximate range of each value at every stage of the ++ * calculation, to ensure we don't overflow. This makes heavy use of the ++ * approximations 1000 = 2^10 and 1000000 = 2^20, but does the actual ++ * calculations in decimal for increased accuracy. ++ * ++ * Return: Power consumption, in mW. Range: 0 < p < 2^13 (0W to ~8W) ++ */ ++static u32 kbase_scale_dynamic_power(const u32 c, const u32 freq, ++ const u32 voltage) +{ -+ return kbase_mem_free(kctx, free->gpu_addr); ++ /* Range: 2^8 < v2 < 2^16 m(V^2) */ ++ const u32 v2 = (voltage * voltage) / 1000; ++ ++ /* Range: 2^3 < f_MHz < 2^10 MHz */ ++ const u32 f_MHz = freq / 1000000; ++ ++ /* Range: 2^11 < v2f_big < 2^26 kHz V^2 */ ++ const u32 v2f_big = v2 * f_MHz; ++ ++ /* Range: 2^1 < v2f < 2^16 MHz V^2 */ ++ const u32 v2f = v2f_big / 1000; ++ ++ /* Range (working backwards from next line): 0 < v2fc < 2^23 uW. ++ * Must be < 2^42 to avoid overflowing the return value. ++ */ ++ const u64 v2fc = (u64) c * (u64) v2f; ++ ++ /* Range: 0 < v2fc / 1000 < 2^13 mW */ ++ return div_u64(v2fc, 1000); +} + -+#if !MALI_USE_CSF -+static int kbase_api_kinstr_jm_fd(struct kbase_context *kctx, -+ union kbase_kinstr_jm_fd *arg) ++/** ++ * kbase_scale_static_power() - Scale a static power coefficient to an OPP ++ * @c: Static model coefficient, in uW/V^3. Should be in range ++ * 0 < c < 2^32 to prevent overflow. ++ * @voltage: Voltage, in mV. Range: 2^9 < voltage < 2^13 (~0.5V to ~8V) ++ * ++ * Return: Power consumption, in mW. Range: 0 < p < 2^13 (0W to ~8W) ++ */ ++static u32 kbase_scale_static_power(const u32 c, const u32 voltage) +{ -+ return kbase_kinstr_jm_get_fd(kctx->kinstr_jm, arg); ++ /* Range: 2^8 < v2 < 2^16 m(V^2) */ ++ const u32 v2 = (voltage * voltage) / 1000; ++ ++ /* Range: 2^17 < v3_big < 2^29 m(V^2) mV */ ++ const u32 v3_big = v2 * voltage; ++ ++ /* Range: 2^7 < v3 < 2^19 m(V^3) */ ++ const u32 v3 = v3_big / 1000; ++ ++ /* ++ * Range (working backwards from next line): 0 < v3c_big < 2^33 nW. ++ * The result should be < 2^52 to avoid overflowing the return value. ++ */ ++ const u64 v3c_big = (u64) c * (u64) v3; ++ ++ /* Range: 0 < v3c_big / 1000000 < 2^13 mW */ ++ return div_u64(v3c_big, 1000000); +} -+#endif + -+static int kbase_api_hwcnt_reader_setup(struct kbase_context *kctx, -+ struct kbase_ioctl_hwcnt_reader_setup *setup) ++void kbase_ipa_protection_mode_switch_event(struct kbase_device *kbdev) +{ -+ return kbase_vinstr_hwcnt_reader_setup(kctx->kbdev->vinstr_ctx, setup); ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ /* Record the event of GPU entering protected mode. */ ++ kbdev->ipa_protection_mode_switched = true; +} + -+static int kbase_api_hwcnt_enable(struct kbase_context *kctx, -+ struct kbase_ioctl_hwcnt_enable *enable) ++static struct kbase_ipa_model *get_current_model(struct kbase_device *kbdev) +{ -+ int ret; ++ struct kbase_ipa_model *model; ++ unsigned long flags; + -+ mutex_lock(&kctx->legacy_hwcnt_lock); -+ if (enable->dump_buffer != 0) { -+ /* Non-zero dump buffer, so user wants to create the client */ -+ if (kctx->legacy_hwcnt_cli == NULL) { -+ ret = kbase_hwcnt_legacy_client_create( -+ kctx->kbdev->hwcnt_gpu_virt, -+ enable, -+ &kctx->legacy_hwcnt_cli); -+ } else { -+ /* This context already has a client */ -+ ret = -EBUSY; -+ } -+ } else { -+ /* Zero dump buffer, so user wants to destroy the client */ -+ if (kctx->legacy_hwcnt_cli != NULL) { -+ kbase_hwcnt_legacy_client_destroy( -+ kctx->legacy_hwcnt_cli); -+ kctx->legacy_hwcnt_cli = NULL; -+ ret = 0; -+ } else { -+ /* This context has no client to destroy */ -+ ret = -EINVAL; -+ } -+ } -+ mutex_unlock(&kctx->legacy_hwcnt_lock); ++ lockdep_assert_held(&kbdev->ipa.lock); + -+ return ret; -+} ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+static int kbase_api_hwcnt_dump(struct kbase_context *kctx) -+{ -+ int ret; ++ if (kbdev->ipa_protection_mode_switched || ++ kbdev->ipa.force_fallback_model) ++ model = kbdev->ipa.fallback_model; ++ else ++ model = kbdev->ipa.configured_model; ++ ++ /* ++ * Having taken cognizance of the fact that whether GPU earlier ++ * protected mode or not, the event can be now reset (if GPU is not ++ * currently in protected mode) so that configured model is used ++ * for the next sample. ++ */ ++ if (!kbdev->protected_mode) ++ kbdev->ipa_protection_mode_switched = false; + -+ mutex_lock(&kctx->legacy_hwcnt_lock); -+ ret = kbase_hwcnt_legacy_client_dump(kctx->legacy_hwcnt_cli); -+ mutex_unlock(&kctx->legacy_hwcnt_lock); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ return ret; ++ return model; +} + -+static int kbase_api_hwcnt_clear(struct kbase_context *kctx) ++static u32 get_static_power_locked(struct kbase_device *kbdev, ++ struct kbase_ipa_model *model, ++ unsigned long voltage) +{ -+ int ret; ++ u32 power = 0; ++ int err; ++ u32 power_coeff; + -+ mutex_lock(&kctx->legacy_hwcnt_lock); -+ ret = kbase_hwcnt_legacy_client_clear(kctx->legacy_hwcnt_cli); -+ mutex_unlock(&kctx->legacy_hwcnt_lock); ++ lockdep_assert_held(&model->kbdev->ipa.lock); + -+ return ret; ++ if (!model->ops->get_static_coeff) ++ model = kbdev->ipa.fallback_model; ++ ++ if (model->ops->get_static_coeff) { ++ err = model->ops->get_static_coeff(model, &power_coeff); ++ if (!err) ++ power = kbase_scale_static_power(power_coeff, ++ (u32) voltage); ++ } ++ ++ return power; +} + -+static int kbase_api_get_cpu_gpu_timeinfo(struct kbase_context *kctx, -+ union kbase_ioctl_get_cpu_gpu_timeinfo *timeinfo) ++#if KERNEL_VERSION(5, 10, 0) > LINUX_VERSION_CODE ++#if defined(CONFIG_MALI_PWRSOFT_765) || \ ++ KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE ++static unsigned long kbase_get_static_power(struct devfreq *df, ++ unsigned long voltage) ++#else ++static unsigned long kbase_get_static_power(unsigned long voltage) ++#endif +{ -+ u32 flags = timeinfo->in.request_flags; -+ struct timespec64 ts; -+ u64 timestamp; -+ u64 cycle_cnt; -+ -+ kbase_pm_context_active(kctx->kbdev); ++ struct kbase_ipa_model *model; ++ u32 power = 0; ++#if defined(CONFIG_MALI_PWRSOFT_765) || \ ++ KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE ++ struct kbase_device *kbdev = dev_get_drvdata(&df->dev); ++#else ++ struct kbase_device *kbdev = kbase_find_device(-1); ++#endif + -+ kbase_backend_get_gpu_time(kctx->kbdev, -+ (flags & BASE_TIMEINFO_CYCLE_COUNTER_FLAG) ? &cycle_cnt : NULL, -+ (flags & BASE_TIMEINFO_TIMESTAMP_FLAG) ? ×tamp : NULL, -+ (flags & BASE_TIMEINFO_MONOTONIC_FLAG) ? &ts : NULL); ++ if (!kbdev) ++ return 0ul; + -+ if (flags & BASE_TIMEINFO_TIMESTAMP_FLAG) -+ timeinfo->out.timestamp = timestamp; ++ mutex_lock(&kbdev->ipa.lock); + -+ if (flags & BASE_TIMEINFO_CYCLE_COUNTER_FLAG) -+ timeinfo->out.cycle_counter = cycle_cnt; ++ model = get_current_model(kbdev); ++ power = get_static_power_locked(kbdev, model, voltage); + -+ if (flags & BASE_TIMEINFO_MONOTONIC_FLAG) { -+ timeinfo->out.sec = ts.tv_sec; -+ timeinfo->out.nsec = ts.tv_nsec; -+ } ++ mutex_unlock(&kbdev->ipa.lock); + -+ kbase_pm_context_idle(kctx->kbdev); ++#if !(defined(CONFIG_MALI_PWRSOFT_765) || \ ++ KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE) ++ kbase_release_device(kbdev); ++#endif + -+ return 0; ++ return power; +} ++#endif /* KERNEL_VERSION(5, 10, 0) > LINUX_VERSION_CODE */ + -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+static int kbase_api_hwcnt_set(struct kbase_context *kctx, -+ struct kbase_ioctl_hwcnt_values *values) ++/** ++ * opp_translate_freq_voltage() - Translate nominal OPP frequency from ++ * devicetree into the real frequency for ++ * top-level and shader cores. ++ * @kbdev: Device pointer ++ * @nominal_freq: Nominal frequency in Hz. ++ * @nominal_voltage: Nominal voltage, in mV. ++ * @freqs: Pointer to array of real frequency values. ++ * @volts: Pointer to array of voltages. ++ * ++ * If there are 2 clock domains, then top-level and shader cores can operate ++ * at different frequency and voltage level. The nominal frequency ("opp-hz") ++ * used by devfreq from the devicetree may not be same as the real frequency ++ * at which top-level and shader cores are operating, so a translation is ++ * needed. ++ * Nominal voltage shall always be same as the real voltage for top-level. ++ */ ++static void opp_translate_freq_voltage(struct kbase_device *kbdev, ++ unsigned long nominal_freq, ++ unsigned long nominal_voltage, ++ unsigned long *freqs, ++ unsigned long *volts) +{ -+ gpu_model_set_dummy_prfcnt_sample( -+ (u32 __user *)(uintptr_t)values->data, -+ values->size); ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ /* An arbitrary voltage and frequency value can be chosen for testing ++ * in no mali configuration which may not match with any OPP level. ++ */ ++ freqs[KBASE_IPA_BLOCK_TYPE_TOP_LEVEL] = nominal_freq; ++ volts[KBASE_IPA_BLOCK_TYPE_TOP_LEVEL] = nominal_voltage; + -+ return 0; -+} -+#endif ++ freqs[KBASE_IPA_BLOCK_TYPE_SHADER_CORES] = nominal_freq; ++ volts[KBASE_IPA_BLOCK_TYPE_SHADER_CORES] = nominal_voltage; ++#else ++ u64 core_mask; ++ unsigned int i; + -+static int kbase_api_disjoint_query(struct kbase_context *kctx, -+ struct kbase_ioctl_disjoint_query *query) -+{ -+ query->counter = kbase_disjoint_event_get(kctx->kbdev); ++ kbase_devfreq_opp_translate(kbdev, nominal_freq, &core_mask, ++ freqs, volts); ++ CSTD_UNUSED(core_mask); + -+ return 0; ++ /* Convert micro volts to milli volts */ ++ for (i = 0; i < kbdev->nr_clocks; i++) ++ volts[i] /= 1000; ++ ++ if (kbdev->nr_clocks == 1) { ++ freqs[KBASE_IPA_BLOCK_TYPE_SHADER_CORES] = ++ freqs[KBASE_IPA_BLOCK_TYPE_TOP_LEVEL]; ++ volts[KBASE_IPA_BLOCK_TYPE_SHADER_CORES] = ++ volts[KBASE_IPA_BLOCK_TYPE_TOP_LEVEL]; ++ } ++#endif +} + -+static int kbase_api_get_ddk_version(struct kbase_context *kctx, -+ struct kbase_ioctl_get_ddk_version *version) ++#if KERNEL_VERSION(5, 10, 0) > LINUX_VERSION_CODE ++#if defined(CONFIG_MALI_PWRSOFT_765) || \ ++ KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE ++static unsigned long kbase_get_dynamic_power(struct devfreq *df, ++ unsigned long freq, ++ unsigned long voltage) ++#else ++static unsigned long kbase_get_dynamic_power(unsigned long freq, ++ unsigned long voltage) ++#endif +{ -+ int ret; -+ int len = sizeof(KERNEL_SIDE_DDK_VERSION_STRING); ++ struct kbase_ipa_model *model; ++ unsigned long freqs[KBASE_IPA_BLOCK_TYPE_NUM] = {0}; ++ unsigned long volts[KBASE_IPA_BLOCK_TYPE_NUM] = {0}; ++ u32 power_coeffs[KBASE_IPA_BLOCK_TYPE_NUM] = {0}; ++ u32 power = 0; ++ int err = 0; ++#if defined(CONFIG_MALI_PWRSOFT_765) || \ ++ KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE ++ struct kbase_device *kbdev = dev_get_drvdata(&df->dev); ++#else ++ struct kbase_device *kbdev = kbase_find_device(-1); ++#endif + -+ if (version->version_buffer == 0) -+ return len; ++ if (!kbdev) ++ return 0ul; + -+ if (version->size < len) -+ return -EOVERFLOW; ++ mutex_lock(&kbdev->ipa.lock); + -+ ret = copy_to_user(u64_to_user_ptr(version->version_buffer), -+ KERNEL_SIDE_DDK_VERSION_STRING, -+ sizeof(KERNEL_SIDE_DDK_VERSION_STRING)); ++ model = kbdev->ipa.fallback_model; + -+ if (ret) -+ return -EFAULT; ++ err = model->ops->get_dynamic_coeff(model, power_coeffs); + -+ return len; -+} ++ if (!err) { ++ opp_translate_freq_voltage(kbdev, freq, voltage, freqs, volts); + -+/* Defaults for legacy just-in-time memory allocator initialization -+ * kernel calls -+ */ -+#define DEFAULT_MAX_JIT_ALLOCATIONS 255 -+#define JIT_LEGACY_TRIM_LEVEL (0) /* No trimming */ ++ power = kbase_scale_dynamic_power( ++ power_coeffs[KBASE_IPA_BLOCK_TYPE_TOP_LEVEL], ++ freqs[KBASE_IPA_BLOCK_TYPE_TOP_LEVEL], ++ volts[KBASE_IPA_BLOCK_TYPE_TOP_LEVEL]); + -+static int kbase_api_mem_jit_init_10_2(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_jit_init_10_2 *jit_init) -+{ -+ kctx->jit_version = 1; ++ /* Here unlike kbase_get_real_power(), shader core frequency is ++ * used for the scaling as simple power model is used to obtain ++ * the value of dynamic coefficient (which is a fixed value ++ * retrieved from the device tree). ++ */ ++ power += kbase_scale_dynamic_power( ++ power_coeffs[KBASE_IPA_BLOCK_TYPE_SHADER_CORES], ++ freqs[KBASE_IPA_BLOCK_TYPE_SHADER_CORES], ++ volts[KBASE_IPA_BLOCK_TYPE_SHADER_CORES]); ++ } else ++ dev_err_ratelimited(kbdev->dev, ++ "Model %s returned error code %d\n", ++ model->ops->name, err); + -+ /* since no phys_pages parameter, use the maximum: va_pages */ -+ return kbase_region_tracker_init_jit(kctx, jit_init->va_pages, -+ DEFAULT_MAX_JIT_ALLOCATIONS, -+ JIT_LEGACY_TRIM_LEVEL, BASE_MEM_GROUP_DEFAULT, -+ jit_init->va_pages); ++ mutex_unlock(&kbdev->ipa.lock); ++ ++#if !(defined(CONFIG_MALI_PWRSOFT_765) || \ ++ KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE) ++ kbase_release_device(kbdev); ++#endif ++ ++ return power; +} ++#endif /* KERNEL_VERSION(5, 10, 0) > LINUX_VERSION_CODE */ + -+static int kbase_api_mem_jit_init_11_5(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_jit_init_11_5 *jit_init) ++int kbase_get_real_power_locked(struct kbase_device *kbdev, u32 *power, ++ unsigned long freq, ++ unsigned long voltage) +{ -+ int i; ++ struct kbase_ipa_model *model; ++ unsigned long freqs[KBASE_IPA_BLOCK_TYPE_NUM] = {0}; ++ unsigned long volts[KBASE_IPA_BLOCK_TYPE_NUM] = {0}; ++ u32 power_coeffs[KBASE_IPA_BLOCK_TYPE_NUM] = {0}; ++ struct kbasep_pm_metrics diff; ++ u64 total_time; ++ bool skip_utilization_scaling = false; ++ int err = 0; + -+ kctx->jit_version = 2; ++ lockdep_assert_held(&kbdev->ipa.lock); + -+ for (i = 0; i < sizeof(jit_init->padding); i++) { -+ /* Ensure all padding bytes are 0 for potential future -+ * extension ++ kbase_pm_get_dvfs_metrics(kbdev, &kbdev->ipa.last_metrics, &diff); ++ ++ model = get_current_model(kbdev); ++ ++ err = model->ops->get_dynamic_coeff(model, power_coeffs); ++ ++ /* If the counter model returns an error (e.g. switching back to ++ * protected mode and failing to read counters, or a counter sample ++ * with too few cycles), revert to the fallback model. ++ */ ++ if (err && model != kbdev->ipa.fallback_model) { ++ /* No meaningful scaling for GPU utilization can be done if ++ * the sampling interval was too long. This is equivalent to ++ * assuming GPU was busy throughout (similar to what is done ++ * during protected mode). + */ -+ if (jit_init->padding[i]) -+ return -EINVAL; ++ if (err == -EOVERFLOW) ++ skip_utilization_scaling = true; ++ ++ model = kbdev->ipa.fallback_model; ++ err = model->ops->get_dynamic_coeff(model, power_coeffs); + } + -+ /* since no phys_pages parameter, use the maximum: va_pages */ -+ return kbase_region_tracker_init_jit(kctx, jit_init->va_pages, -+ jit_init->max_allocations, jit_init->trim_level, -+ jit_init->group_id, jit_init->va_pages); -+} ++ if (WARN_ON(err)) ++ return err; + -+static int kbase_api_mem_jit_init(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_jit_init *jit_init) -+{ -+ int i; ++ opp_translate_freq_voltage(kbdev, freq, voltage, freqs, volts); + -+ kctx->jit_version = 3; ++ *power = kbase_scale_dynamic_power( ++ power_coeffs[KBASE_IPA_BLOCK_TYPE_TOP_LEVEL], ++ freqs[KBASE_IPA_BLOCK_TYPE_TOP_LEVEL], ++ volts[KBASE_IPA_BLOCK_TYPE_TOP_LEVEL]); + -+ for (i = 0; i < sizeof(jit_init->padding); i++) { -+ /* Ensure all padding bytes are 0 for potential future -+ * extension ++ if (power_coeffs[KBASE_IPA_BLOCK_TYPE_SHADER_CORES]) { ++ unsigned long freq = freqs[KBASE_IPA_BLOCK_TYPE_SHADER_CORES]; ++ ++ /* As per the HW team, the top-level frequency needs to be used ++ * for the scaling if the counter based model was used as ++ * counter values are normalized with the GPU_ACTIVE counter ++ * value, which increments at the rate of top-level frequency. + */ -+ if (jit_init->padding[i]) -+ return -EINVAL; ++ if (model != kbdev->ipa.fallback_model) ++ freq = freqs[KBASE_IPA_BLOCK_TYPE_TOP_LEVEL]; ++ ++ *power += kbase_scale_dynamic_power( ++ power_coeffs[KBASE_IPA_BLOCK_TYPE_SHADER_CORES], ++ freq, volts[KBASE_IPA_BLOCK_TYPE_SHADER_CORES]); + } + -+ return kbase_region_tracker_init_jit(kctx, jit_init->va_pages, -+ jit_init->max_allocations, jit_init->trim_level, -+ jit_init->group_id, jit_init->phys_pages); -+} ++ if (!skip_utilization_scaling) { ++ /* time_busy / total_time cannot be >1, so assigning the 64-bit ++ * result of div_u64 to *power cannot overflow. ++ */ ++ total_time = diff.time_busy + (u64) diff.time_idle; ++ *power = div_u64(*power * (u64) diff.time_busy, ++ max(total_time, 1ull)); ++ } + -+static int kbase_api_mem_exec_init(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_exec_init *exec_init) -+{ -+ return kbase_region_tracker_init_exec(kctx, exec_init->va_pages); ++ *power += get_static_power_locked(kbdev, model, ++ volts[KBASE_IPA_BLOCK_TYPE_TOP_LEVEL]); ++ ++ return err; +} ++KBASE_EXPORT_TEST_API(kbase_get_real_power_locked); + -+static int kbase_api_mem_sync(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_sync *sync) ++int kbase_get_real_power(struct devfreq *df, u32 *power, ++ unsigned long freq, ++ unsigned long voltage) +{ -+ struct basep_syncset sset = { -+ .mem_handle.basep.handle = sync->handle, -+ .user_addr = sync->user_addr, -+ .size = sync->size, -+ .type = sync->type -+ }; ++ int ret; ++ struct kbase_device *kbdev = dev_get_drvdata(&df->dev); + -+ return kbase_sync_now(kctx, &sset); -+} ++ if (!kbdev) ++ return -ENODEV; + -+static int kbase_api_mem_find_cpu_offset(struct kbase_context *kctx, -+ union kbase_ioctl_mem_find_cpu_offset *find) -+{ -+ return kbasep_find_enclosing_cpu_mapping_offset( -+ kctx, -+ find->in.cpu_addr, -+ find->in.size, -+ &find->out.offset); -+} ++ mutex_lock(&kbdev->ipa.lock); ++ ret = kbase_get_real_power_locked(kbdev, power, freq, voltage); ++ mutex_unlock(&kbdev->ipa.lock); + -+static int kbase_api_mem_find_gpu_start_and_offset(struct kbase_context *kctx, -+ union kbase_ioctl_mem_find_gpu_start_and_offset *find) -+{ -+ return kbasep_find_enclosing_gpu_mapping_start_and_offset( -+ kctx, -+ find->in.gpu_addr, -+ find->in.size, -+ &find->out.start, -+ &find->out.offset); ++ return ret; +} ++KBASE_EXPORT_TEST_API(kbase_get_real_power); + -+static int kbase_api_get_context_id(struct kbase_context *kctx, -+ struct kbase_ioctl_get_context_id *info) ++struct devfreq_cooling_power kbase_ipa_power_model_ops = { ++#if KERNEL_VERSION(5, 10, 0) > LINUX_VERSION_CODE ++ .get_static_power = &kbase_get_static_power, ++ .get_dynamic_power = &kbase_get_dynamic_power, ++#endif /* KERNEL_VERSION(5, 10, 0) > LINUX_VERSION_CODE */ ++#if defined(CONFIG_MALI_PWRSOFT_765) || \ ++ KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE ++ .get_real_power = &kbase_get_real_power, ++#endif ++}; ++KBASE_EXPORT_TEST_API(kbase_ipa_power_model_ops); ++ ++void kbase_ipa_reset_data(struct kbase_device *kbdev) +{ -+ info->id = kctx->id; ++ ktime_t now, diff; ++ s64 elapsed_time; + -+ return 0; -+} ++ mutex_lock(&kbdev->ipa.lock); + -+static int kbase_api_tlstream_acquire(struct kbase_context *kctx, -+ struct kbase_ioctl_tlstream_acquire *acquire) -+{ -+ return kbase_timeline_io_acquire(kctx->kbdev, acquire->flags); -+} ++ now = ktime_get_raw(); ++ diff = ktime_sub(now, kbdev->ipa.last_sample_time); ++ elapsed_time = ktime_to_ms(diff); + -+static int kbase_api_tlstream_flush(struct kbase_context *kctx) -+{ -+ kbase_timeline_streams_flush(kctx->kbdev->timeline); ++ if (elapsed_time > RESET_INTERVAL_MS) { ++ struct kbasep_pm_metrics diff; ++ struct kbase_ipa_model *model; + -+ return 0; -+} ++ kbase_pm_get_dvfs_metrics( ++ kbdev, &kbdev->ipa.last_metrics, &diff); + -+static int kbase_api_mem_commit(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_commit *commit) -+{ -+ return kbase_mem_commit(kctx, commit->gpu_addr, commit->pages); ++ model = get_current_model(kbdev); ++ if (model != kbdev->ipa.fallback_model) ++ model->ops->reset_counter_data(model); ++ ++ kbdev->ipa.last_sample_time = ktime_get_raw(); ++ } ++ ++ mutex_unlock(&kbdev->ipa.lock); +} +diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h +new file mode 100755 +index 000000000..c875ffb49 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h +@@ -0,0 +1,304 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2016-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+static int kbase_api_mem_alias(struct kbase_context *kctx, -+ union kbase_ioctl_mem_alias *alias) -+{ -+ struct base_mem_aliasing_info *ai; -+ u64 flags; -+ int err; ++#ifndef _KBASE_IPA_H_ ++#define _KBASE_IPA_H_ + -+ if (alias->in.nents == 0 || alias->in.nents > 2048) -+ return -EINVAL; ++#if defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) + -+ if (alias->in.stride > (U64_MAX / 2048)) -+ return -EINVAL; ++struct devfreq; + -+ ai = vmalloc(sizeof(*ai) * alias->in.nents); -+ if (!ai) -+ return -ENOMEM; ++/** ++ * enum kbase_ipa_block_type - Type of block for which power estimation is done. ++ * ++ * @KBASE_IPA_BLOCK_TYPE_USING_CLK_MALI: ++ * Blocks using clk_mali in dts. ++ * @KBASE_IPA_BLOCK_TYPE_TOP_LEVEL: Top-level block, that covers CSHW, ++ * MEMSYS, Tiler. ++ * @KBASE_IPA_BLOCK_TYPE_SHADER_CORES: All Shader cores. ++ * @KBASE_IPA_BLOCK_TYPE_FOR_CLK_GPU: Dummy for clk_gpu in dts. ++ * @KBASE_IPA_BLOCK_TYPE_NUM: Number of blocks. ++ */ ++enum kbase_ipa_block_type { ++ KBASE_IPA_BLOCK_TYPE_USING_CLK_MALI, ++ KBASE_IPA_BLOCK_TYPE_TOP_LEVEL, ++ KBASE_IPA_BLOCK_TYPE_SHADER_CORES, ++ KBASE_IPA_BLOCK_TYPE_FOR_CLK_GPU, ++ KBASE_IPA_BLOCK_TYPE_NUM ++}; + -+ err = copy_from_user(ai, -+ u64_to_user_ptr(alias->in.aliasing_info), -+ sizeof(*ai) * alias->in.nents); -+ if (err) { -+ vfree(ai); -+ return -EFAULT; -+ } ++/** ++ * struct kbase_ipa_model - Object describing a particular IPA model. ++ * @kbdev: pointer to kbase device ++ * @model_data: opaque pointer to model specific data, accessed ++ * only by model specific methods. ++ * @ops: pointer to object containing model specific methods. ++ * @params: head of the list of debugfs params added for model ++ * @missing_dt_node_warning: flag to limit the matching power model DT not found ++ * warning to once. ++ */ ++struct kbase_ipa_model { ++ struct kbase_device *kbdev; ++ void *model_data; ++ const struct kbase_ipa_model_ops *ops; ++ struct list_head params; ++ bool missing_dt_node_warning; ++}; + -+ flags = alias->in.flags; -+ if (flags & BASEP_MEM_FLAGS_KERNEL_ONLY) { -+ vfree(ai); -+ return -EINVAL; -+ } ++/** ++ * kbase_ipa_model_add_param_s32 - Add an integer model parameter ++ * @model: pointer to IPA model ++ * @name: name of corresponding debugfs entry ++ * @addr: address where the value is stored ++ * @num_elems: number of elements (1 if not an array) ++ * @dt_required: if false, a corresponding devicetree entry is not required, ++ * and the current value will be used. If true, a warning is ++ * output and the data is zeroed ++ * ++ * Return: 0 on success, or an error code ++ */ ++int kbase_ipa_model_add_param_s32(struct kbase_ipa_model *model, ++ const char *name, s32 *addr, ++ size_t num_elems, bool dt_required); + -+ alias->out.gpu_va = kbase_mem_alias(kctx, &flags, -+ alias->in.stride, alias->in.nents, -+ ai, &alias->out.va_pages); ++/** ++ * kbase_ipa_model_add_param_string - Add a string model parameter ++ * @model: pointer to IPA model ++ * @name: name of corresponding debugfs entry ++ * @addr: address where the value is stored ++ * @size: size, in bytes, of the value storage (so the maximum string ++ * length is size - 1) ++ * @dt_required: if false, a corresponding devicetree entry is not required, ++ * and the current value will be used. If true, a warning is ++ * output and the data is zeroed ++ * ++ * Return: 0 on success, or an error code ++ */ ++int kbase_ipa_model_add_param_string(struct kbase_ipa_model *model, ++ const char *name, char *addr, ++ size_t size, bool dt_required); + -+ alias->out.flags = flags; ++struct kbase_ipa_model_ops { ++ char *name; ++ /* The init, recalculate and term ops on the default model are always ++ * called. However, all the other models are only invoked if the model ++ * is selected in the device tree. Otherwise they are never ++ * initialized. Additional resources can be acquired by models in ++ * init(), however they must be terminated in the term(). ++ */ ++ int (*init)(struct kbase_ipa_model *model); ++ /* Called immediately after init(), or when a parameter is changed, so ++ * that any coefficients derived from model parameters can be ++ * recalculated ++ */ ++ int (*recalculate)(struct kbase_ipa_model *model); ++ void (*term)(struct kbase_ipa_model *model); ++ /* ++ * get_dynamic_coeff() - calculate dynamic power coefficient ++ * @model: pointer to model ++ * @coeffp: pointer to return value location ++ * ++ * Calculate a dynamic power coefficient, with units pW/(Hz V^2), which ++ * is then scaled by the IPA framework according to the current OPP's ++ * frequency and voltage. ++ * ++ * Return: 0 on success, or an error code. -EOVERFLOW error code will ++ * indicate that sampling interval was too large and no meaningful ++ * scaling for GPU utiliation can be done. ++ */ ++ int (*get_dynamic_coeff)(struct kbase_ipa_model *model, u32 *coeffp); ++ /* ++ * get_static_coeff() - calculate static power coefficient ++ * @model: pointer to model ++ * @coeffp: pointer to return value location ++ * ++ * Calculate a static power coefficient, with units uW/(V^3), which is ++ * scaled by the IPA framework according to the current OPP's voltage. ++ * ++ * Return: 0 on success, or an error code. ++ */ ++ int (*get_static_coeff)(struct kbase_ipa_model *model, u32 *coeffp); + -+ vfree(ai); ++ /* ++ * reset_counter_data() - Reset the HW counter data used for calculating ++ * dynamic power coefficient ++ * @model: pointer to model ++ * ++ * This method is currently applicable only to the counter based model. ++ * The next call to get_dynamic_coeff() will have to calculate the ++ * dynamic power coefficient based on the HW counter data generated ++ * from this point onwards. ++ */ ++ void (*reset_counter_data)(struct kbase_ipa_model *model); ++}; + -+ if (alias->out.gpu_va == 0) -+ return -ENOMEM; ++/** ++ * kbase_ipa_init - Initialize the IPA feature ++ * @kbdev: pointer to kbase device ++ * ++ * simple IPA power model is initialized as a fallback model and if that ++ * initialization fails then IPA is not used. ++ * The device tree is read for the name of ipa model to be used, by using the ++ * property string "ipa-model". If that ipa model is supported then it is ++ * initialized but if the initialization fails then simple power model is used. ++ * ++ * Return: 0 on success, negative -errno on error ++ */ ++int kbase_ipa_init(struct kbase_device *kbdev); + -+ return 0; -+} ++/** ++ * kbase_ipa_term - Terminate the IPA feature ++ * @kbdev: pointer to kbase device ++ * ++ * Both simple IPA power model and model retrieved from device tree are ++ * terminated. ++ */ ++void kbase_ipa_term(struct kbase_device *kbdev); + -+static int kbase_api_mem_import(struct kbase_context *kctx, -+ union kbase_ioctl_mem_import *import) -+{ -+ int ret; -+ u64 flags = import->in.flags; ++/** ++ * kbase_ipa_model_recalculate - Recalculate the model coefficients ++ * @model: pointer to the IPA model object, already initialized ++ * ++ * It shall be called immediately after the model has been initialized ++ * or when the model parameter has changed, so that any coefficients ++ * derived from parameters can be recalculated. ++ * Its a wrapper for the module specific recalculate() method. ++ * ++ * Return: 0 on success, negative -errno on error ++ */ ++int kbase_ipa_model_recalculate(struct kbase_ipa_model *model); + -+ if (flags & BASEP_MEM_FLAGS_KERNEL_ONLY) -+ return -ENOMEM; ++/** ++ * kbase_ipa_model_ops_find - Lookup an IPA model using its name ++ * @kbdev: pointer to kbase device ++ * @name: name of model to lookup ++ * ++ * Return: Pointer to model's 'ops' structure, or NULL if the lookup failed. ++ */ ++const struct kbase_ipa_model_ops *kbase_ipa_model_ops_find(struct kbase_device *kbdev, ++ const char *name); + -+ ret = kbase_mem_import(kctx, -+ import->in.type, -+ u64_to_user_ptr(import->in.phandle), -+ import->in.padding, -+ &import->out.gpu_va, -+ &import->out.va_pages, -+ &flags); ++/** ++ * kbase_ipa_counter_model_ops_find - Lookup an IPA counter model using its name ++ * @kbdev: pointer to kbase device ++ * @name: name of counter model to lookup ++ * ++ * Return: Pointer to counter model's 'ops' structure, or NULL if the lookup ++ * failed. ++ */ ++const struct kbase_ipa_model_ops *kbase_ipa_counter_model_ops_find( ++ struct kbase_device *kbdev, const char *name); + -+ import->out.flags = flags; ++/** ++ * kbase_ipa_model_name_from_id - Find the best model for a given GPU ID ++ * @gpu_id: GPU ID of GPU the model will be used for ++ * ++ * Return: The name of the appropriate counter-based model, or the name of the ++ * fallback model if no counter model exists. ++ */ ++const char *kbase_ipa_model_name_from_id(u32 gpu_id); + -+ return ret; -+} ++/** ++ * kbase_ipa_counter_model_name_from_id - Find the best counter model for a ++ * given GPU ID ++ * @gpu_id: GPU ID of GPU the counter model will be used for ++ * ++ * Return: The name of the appropriate counter-based model, or NULL if the ++ * no counter model exists. ++ */ ++const char *kbase_ipa_counter_model_name_from_id(u32 gpu_id); + -+static int kbase_api_mem_flags_change(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_flags_change *change) -+{ -+ if (change->flags & BASEP_MEM_FLAGS_KERNEL_ONLY) -+ return -ENOMEM; ++/** ++ * kbase_ipa_init_model - Initilaize the particular IPA model ++ * @kbdev: pointer to kbase device ++ * @ops: pointer to object containing model specific methods. ++ * ++ * Initialize the model corresponding to the @ops pointer passed. ++ * The init() method specified in @ops would be called. ++ * ++ * Return: pointer to kbase_ipa_model on success, NULL on error ++ */ ++struct kbase_ipa_model *kbase_ipa_init_model(struct kbase_device *kbdev, ++ const struct kbase_ipa_model_ops *ops); ++/** ++ * kbase_ipa_term_model - Terminate the particular IPA model ++ * @model: pointer to the IPA model object, already initialized ++ * ++ * Terminate the model, using the term() method. ++ * Module specific parameters would be freed. ++ */ ++void kbase_ipa_term_model(struct kbase_ipa_model *model); + -+ return kbase_mem_flags_change(kctx, change->gpu_va, -+ change->flags, change->mask); -+} ++/** ++ * kbase_ipa_protection_mode_switch_event - Inform IPA of the GPU's entry into ++ * protected mode ++ * @kbdev: pointer to kbase device ++ * ++ * Makes IPA aware of the GPU switching to protected mode. ++ */ ++void kbase_ipa_protection_mode_switch_event(struct kbase_device *kbdev); + -+static int kbase_api_stream_create(struct kbase_context *kctx, -+ struct kbase_ioctl_stream_create *stream) -+{ -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ int fd, ret; ++/** ++ * kbase_get_real_power() - get the real power consumption of the GPU ++ * @df: dynamic voltage and frequency scaling information for the GPU. ++ * @power: where to store the power consumption, in mW. ++ * @freq: a frequency, in HZ. ++ * @voltage: a voltage, in mV. ++ * ++ * The returned value incorporates both static and dynamic power consumption. ++ * ++ * Return: 0 on success, or an error code. ++ */ ++int kbase_get_real_power(struct devfreq *df, u32 *power, ++ unsigned long freq, ++ unsigned long voltage); + -+ /* Name must be NULL-terminated and padded with NULLs, so check last -+ * character is NULL -+ */ -+ if (stream->name[sizeof(stream->name)-1] != 0) -+ return -EINVAL; ++/* Called by kbase_get_real_power() to invoke the power models. ++ * Must be called with kbdev->ipa.lock held. ++ * This function is only exposed for use by unit tests. ++ */ ++int kbase_get_real_power_locked(struct kbase_device *kbdev, u32 *power, ++ unsigned long freq, ++ unsigned long voltage); + -+ ret = kbase_sync_fence_stream_create(stream->name, &fd); ++extern struct devfreq_cooling_power kbase_ipa_power_model_ops; ++ ++/** ++ * kbase_ipa_reset_data() - Reset the data required for power estimation. ++ * @kbdev: Pointer to kbase device. ++ * ++ * This function is called to ensure a meaningful baseline for ++ * kbase_get_real_power(), when thermal governor starts the polling, and ++ * that is achieved by updating the GPU utilization metrics and retrieving ++ * the accumulated value of HW counters. ++ * Basically this function collects all the data required for power estimation ++ * but does not process it. ++ */ ++void kbase_ipa_reset_data(struct kbase_device *kbdev); ++ ++#else /* !(defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL)) */ ++ ++static inline void kbase_ipa_protection_mode_switch_event(struct kbase_device *kbdev) ++{ } ++ ++#endif /* (defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL)) */ + -+ if (ret) -+ return ret; -+ return fd; -+#else -+ return -ENOENT; +#endif -+} +diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c +new file mode 100755 +index 000000000..a0963bbb2 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c +@@ -0,0 +1,324 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2017-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+static int kbase_api_fence_validate(struct kbase_context *kctx, -+ struct kbase_ioctl_fence_validate *validate) ++#include ++#include ++#include ++ ++#include "mali_kbase.h" ++#include "mali_kbase_ipa.h" ++#include "mali_kbase_ipa_debugfs.h" ++ ++struct kbase_ipa_model_param { ++ char *name; ++ union { ++ void *voidp; ++ s32 *s32p; ++ char *str; ++ } addr; ++ size_t size; ++ enum kbase_ipa_model_param_type type; ++ struct kbase_ipa_model *model; ++ struct list_head link; ++}; ++ ++static int param_int_get(void *data, u64 *val) +{ -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ return kbase_sync_fence_validate(validate->fd); -+#else -+ return -ENOENT; -+#endif ++ struct kbase_ipa_model_param *param = data; ++ ++ mutex_lock(¶m->model->kbdev->ipa.lock); ++ *(s64 *) val = *param->addr.s32p; ++ mutex_unlock(¶m->model->kbdev->ipa.lock); ++ ++ return 0; +} + -+static int kbase_api_mem_profile_add(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_profile_add *data) ++static int param_int_set(void *data, u64 val) +{ -+ char *buf; -+ int err; -+ -+ if (data->len > KBASE_MEM_PROFILE_MAX_BUF_SIZE) { -+ dev_err(kctx->kbdev->dev, "mem_profile_add: buffer too big\n"); -+ return -EINVAL; -+ } ++ struct kbase_ipa_model_param *param = data; ++ struct kbase_ipa_model *model = param->model; ++ s64 sval = (s64) val; ++ s32 old_val; ++ int err = 0; + -+ buf = kmalloc(data->len, GFP_KERNEL); -+ if (ZERO_OR_NULL_PTR(buf)) -+ return -ENOMEM; ++ if (sval < S32_MIN || sval > S32_MAX) ++ return -ERANGE; + -+ err = copy_from_user(buf, u64_to_user_ptr(data->buffer), -+ data->len); -+ if (err) { -+ kfree(buf); -+ return -EFAULT; -+ } ++ mutex_lock(¶m->model->kbdev->ipa.lock); ++ old_val = *param->addr.s32p; ++ *param->addr.s32p = val; ++ err = kbase_ipa_model_recalculate(model); ++ if (err < 0) ++ *param->addr.s32p = old_val; ++ mutex_unlock(¶m->model->kbdev->ipa.lock); + -+ return kbasep_mem_profile_debugfs_insert(kctx, buf, data->len); ++ return err; +} + -+#if !MALI_USE_CSF -+static int kbase_api_soft_event_update(struct kbase_context *kctx, -+ struct kbase_ioctl_soft_event_update *update) ++DEFINE_DEBUGFS_ATTRIBUTE(fops_s32, param_int_get, param_int_set, "%lld\n"); ++ ++static ssize_t param_string_get(struct file *file, char __user *user_buf, ++ size_t count, loff_t *ppos) +{ -+ if (update->flags != 0) -+ return -EINVAL; ++ struct kbase_ipa_model_param *param = file->private_data; ++ ssize_t ret; ++ size_t len; + -+ return kbase_soft_event_update(kctx, update->event, update->new_status); ++ mutex_lock(¶m->model->kbdev->ipa.lock); ++ len = strnlen(param->addr.str, param->size - 1) + 1; ++ ret = simple_read_from_buffer(user_buf, count, ppos, ++ param->addr.str, len); ++ mutex_unlock(¶m->model->kbdev->ipa.lock); ++ ++ return ret; +} -+#endif /* !MALI_USE_CSF */ + -+static int kbase_api_sticky_resource_map(struct kbase_context *kctx, -+ struct kbase_ioctl_sticky_resource_map *map) ++static ssize_t param_string_set(struct file *file, const char __user *user_buf, ++ size_t count, loff_t *ppos) +{ -+ int ret; -+ u64 i; -+ u64 gpu_addr[BASE_EXT_RES_COUNT_MAX]; -+ -+ if (!map->count || map->count > BASE_EXT_RES_COUNT_MAX) -+ return -EOVERFLOW; ++ struct kbase_ipa_model_param *param = file->private_data; ++ struct kbase_ipa_model *model = param->model; ++ char *old_str = NULL; ++ ssize_t ret = count; ++ size_t buf_size; ++ int err; + -+ ret = copy_from_user(gpu_addr, u64_to_user_ptr(map->address), -+ sizeof(u64) * map->count); ++ mutex_lock(&model->kbdev->ipa.lock); + -+ if (ret != 0) -+ return -EFAULT; ++ if (count > param->size) { ++ ret = -EINVAL; ++ goto end; ++ } + -+ kbase_gpu_vm_lock(kctx); ++ old_str = kstrndup(param->addr.str, param->size, GFP_KERNEL); ++ if (!old_str) { ++ ret = -ENOMEM; ++ goto end; ++ } + -+ for (i = 0; i < map->count; i++) { -+ if (!kbase_sticky_resource_acquire(kctx, gpu_addr[i])) { -+ /* Invalid resource */ -+ ret = -EINVAL; -+ break; -+ } ++ buf_size = min(param->size - 1, count); ++ if (copy_from_user(param->addr.str, user_buf, buf_size)) { ++ ret = -EFAULT; ++ goto end; + } + -+ if (ret != 0) { -+ while (i > 0) { -+ i--; -+ kbase_sticky_resource_release_force(kctx, NULL, gpu_addr[i]); -+ } ++ param->addr.str[buf_size] = '\0'; ++ ++ err = kbase_ipa_model_recalculate(model); ++ if (err < 0) { ++ u32 string_len = strscpy(param->addr.str, old_str, param->size); ++ ++ string_len += sizeof(char); ++ /* Make sure that the source string fit into the buffer. */ ++ KBASE_DEBUG_ASSERT(string_len <= param->size); ++ CSTD_UNUSED(string_len); ++ ++ ret = err; + } + -+ kbase_gpu_vm_unlock(kctx); ++end: ++ kfree(old_str); ++ mutex_unlock(&model->kbdev->ipa.lock); + + return ret; +} + -+static int kbase_api_sticky_resource_unmap(struct kbase_context *kctx, -+ struct kbase_ioctl_sticky_resource_unmap *unmap) -+{ -+ int ret; -+ u64 i; -+ u64 gpu_addr[BASE_EXT_RES_COUNT_MAX]; ++static const struct file_operations fops_string = { ++ .owner = THIS_MODULE, ++ .read = param_string_get, ++ .write = param_string_set, ++ .open = simple_open, ++ .llseek = default_llseek, ++}; + -+ if (!unmap->count || unmap->count > BASE_EXT_RES_COUNT_MAX) -+ return -EOVERFLOW; ++int kbase_ipa_model_param_add(struct kbase_ipa_model *model, const char *name, ++ void *addr, size_t size, ++ enum kbase_ipa_model_param_type type) ++{ ++ struct kbase_ipa_model_param *param; + -+ ret = copy_from_user(gpu_addr, u64_to_user_ptr(unmap->address), -+ sizeof(u64) * unmap->count); ++ param = kzalloc(sizeof(*param), GFP_KERNEL); + -+ if (ret != 0) -+ return -EFAULT; ++ if (!param) ++ return -ENOMEM; + -+ kbase_gpu_vm_lock(kctx); ++ /* 'name' is stack-allocated for array elements, so copy it into ++ * heap-allocated storage ++ */ ++ param->name = kstrdup(name, GFP_KERNEL); + -+ for (i = 0; i < unmap->count; i++) { -+ if (!kbase_sticky_resource_release_force(kctx, NULL, gpu_addr[i])) { -+ /* Invalid resource, but we keep going anyway */ -+ ret = -EINVAL; -+ } ++ if (!param->name) { ++ kfree(param); ++ return -ENOMEM; + } + -+ kbase_gpu_vm_unlock(kctx); ++ param->addr.voidp = addr; ++ param->size = size; ++ param->type = type; ++ param->model = model; + -+ return ret; ++ list_add(¶m->link, &model->params); ++ ++ return 0; +} + -+#if MALI_UNIT_TEST -+static int kbase_api_tlstream_test(struct kbase_context *kctx, -+ struct kbase_ioctl_tlstream_test *test) ++void kbase_ipa_model_param_free_all(struct kbase_ipa_model *model) +{ -+ kbase_timeline_test( -+ kctx->kbdev, -+ test->tpw_count, -+ test->msg_delay, -+ test->msg_count, -+ test->aux_msg); ++ struct kbase_ipa_model_param *param_p, *param_n; + -+ return 0; ++ list_for_each_entry_safe(param_p, param_n, &model->params, link) { ++ list_del(¶m_p->link); ++ kfree(param_p->name); ++ kfree(param_p); ++ } +} + -+static int kbase_api_tlstream_stats(struct kbase_context *kctx, -+ struct kbase_ioctl_tlstream_stats *stats) ++static int force_fallback_model_get(void *data, u64 *val) +{ -+ kbase_timeline_stats(kctx->kbdev->timeline, -+ &stats->bytes_collected, -+ &stats->bytes_generated); ++ struct kbase_device *kbdev = data; ++ ++ mutex_lock(&kbdev->ipa.lock); ++ *val = kbdev->ipa.force_fallback_model; ++ mutex_unlock(&kbdev->ipa.lock); + + return 0; +} -+#endif /* MALI_UNIT_TEST */ + -+#if MALI_USE_CSF -+static int kbasep_cs_event_signal(struct kbase_context *kctx) ++static int force_fallback_model_set(void *data, u64 val) +{ -+ kbase_csf_event_signal_notify_gpu(kctx); ++ struct kbase_device *kbdev = data; ++ ++ mutex_lock(&kbdev->ipa.lock); ++ kbdev->ipa.force_fallback_model = (val ? true : false); ++ mutex_unlock(&kbdev->ipa.lock); ++ + return 0; +} + -+static int kbasep_cs_queue_register(struct kbase_context *kctx, -+ struct kbase_ioctl_cs_queue_register *reg) ++DEFINE_DEBUGFS_ATTRIBUTE(force_fallback_model, ++ force_fallback_model_get, ++ force_fallback_model_set, ++ "%llu\n"); ++ ++static int current_power_get(void *data, u64 *val) +{ -+ kctx->jit_group_id = BASE_MEM_GROUP_DEFAULT; ++ struct kbase_device *kbdev = data; ++ struct devfreq *df = kbdev->devfreq; ++ u32 power; + -+ return kbase_csf_queue_register(kctx, reg); -+} ++ kbase_pm_context_active(kbdev); ++ /* The current model assumes that there's no more than one voltage ++ * regulator currently available in the system. ++ */ ++ kbase_get_real_power(df, &power, ++ kbdev->current_nominal_freq, ++ (kbdev->current_voltages[0] / 1000)); ++ kbase_pm_context_idle(kbdev); + -+static int kbasep_cs_queue_terminate(struct kbase_context *kctx, -+ struct kbase_ioctl_cs_queue_terminate *term) -+{ -+ kbase_csf_queue_terminate(kctx, term); ++ *val = power; + + return 0; +} ++DEFINE_DEBUGFS_ATTRIBUTE(current_power, current_power_get, NULL, "%llu\n"); + -+static int kbasep_cs_queue_bind(struct kbase_context *kctx, -+ union kbase_ioctl_cs_queue_bind *bind) ++static void kbase_ipa_model_debugfs_init(struct kbase_ipa_model *model) +{ -+ return kbase_csf_queue_bind(kctx, bind); -+} ++ struct list_head *it; ++ struct dentry *dir; + -+static int kbasep_cs_queue_kick(struct kbase_context *kctx, -+ struct kbase_ioctl_cs_queue_kick *kick) -+{ -+ return kbase_csf_queue_kick(kctx, kick); -+} ++ lockdep_assert_held(&model->kbdev->ipa.lock); + -+static int kbasep_cs_queue_group_create(struct kbase_context *kctx, -+ union kbase_ioctl_cs_queue_group_create *create) -+{ -+ return kbase_csf_queue_group_create(kctx, create); -+} ++ dir = debugfs_create_dir(model->ops->name, ++ model->kbdev->mali_debugfs_directory); + -+static int kbasep_cs_queue_group_terminate(struct kbase_context *kctx, -+ struct kbase_ioctl_cs_queue_group_term *term) -+{ -+ kbase_csf_queue_group_terminate(kctx, term->group_handle); ++ if (IS_ERR_OR_NULL(dir)) { ++ dev_err(model->kbdev->dev, ++ "Couldn't create mali debugfs %s directory", ++ model->ops->name); ++ return; ++ } + -+ return 0; -+} ++ list_for_each(it, &model->params) { ++ struct kbase_ipa_model_param *param = ++ list_entry(it, ++ struct kbase_ipa_model_param, ++ link); ++ const struct file_operations *fops = NULL; + -+static int kbasep_kcpu_queue_new(struct kbase_context *kctx, -+ struct kbase_ioctl_kcpu_queue_new *new) -+{ -+ return kbase_csf_kcpu_queue_new(kctx, new); -+} ++ switch (param->type) { ++ case PARAM_TYPE_S32: ++ fops = &fops_s32; ++ break; ++ case PARAM_TYPE_STRING: ++ fops = &fops_string; ++ break; ++ } + -+static int kbasep_kcpu_queue_delete(struct kbase_context *kctx, -+ struct kbase_ioctl_kcpu_queue_delete *delete) -+{ -+ return kbase_csf_kcpu_queue_delete(kctx, delete); ++ if (unlikely(!fops)) { ++ dev_err(model->kbdev->dev, ++ "Type not set for %s parameter %s\n", ++ model->ops->name, param->name); ++ } else { ++ debugfs_create_file(param->name, 0644, ++ dir, param, fops); ++ } ++ } +} + -+static int kbasep_kcpu_queue_enqueue(struct kbase_context *kctx, -+ struct kbase_ioctl_kcpu_queue_enqueue *enqueue) ++void kbase_ipa_model_param_set_s32(struct kbase_ipa_model *model, ++ const char *name, s32 val) +{ -+ return kbase_csf_kcpu_queue_enqueue(kctx, enqueue); -+} ++ struct kbase_ipa_model_param *param; + -+static int kbasep_cs_tiler_heap_init(struct kbase_context *kctx, -+ union kbase_ioctl_cs_tiler_heap_init *heap_init) -+{ -+ kctx->jit_group_id = heap_init->in.group_id; ++ mutex_lock(&model->kbdev->ipa.lock); + -+ return kbase_csf_tiler_heap_init(kctx, heap_init->in.chunk_size, -+ heap_init->in.initial_chunks, heap_init->in.max_chunks, -+ heap_init->in.target_in_flight, -+ &heap_init->out.gpu_heap_va, &heap_init->out.first_chunk_va); -+} ++ list_for_each_entry(param, &model->params, link) { ++ if (!strcmp(param->name, name)) { ++ if (param->type == PARAM_TYPE_S32) { ++ *param->addr.s32p = val; ++ } else { ++ dev_err(model->kbdev->dev, ++ "Wrong type for %s parameter %s\n", ++ model->ops->name, param->name); ++ } ++ break; ++ } ++ } + -+static int kbasep_cs_tiler_heap_term(struct kbase_context *kctx, -+ struct kbase_ioctl_cs_tiler_heap_term *heap_term) -+{ -+ return kbase_csf_tiler_heap_term(kctx, heap_term->gpu_heap_va); ++ mutex_unlock(&model->kbdev->ipa.lock); +} ++KBASE_EXPORT_TEST_API(kbase_ipa_model_param_set_s32); + -+static int kbase_ioctl_cs_get_glb_iface(struct kbase_context *kctx, -+ union kbase_ioctl_cs_get_glb_iface *param) ++void kbase_ipa_debugfs_init(struct kbase_device *kbdev) +{ -+ struct basep_cs_stream_control *stream_data = NULL; -+ struct basep_cs_group_control *group_data = NULL; -+ void __user *user_groups, *user_streams; -+ int err = 0; -+ u32 const max_group_num = param->in.max_group_num; -+ u32 const max_total_stream_num = param->in.max_total_stream_num; ++ mutex_lock(&kbdev->ipa.lock); + -+ if (max_group_num > MAX_SUPPORTED_CSGS) -+ return -EINVAL; ++ if (kbdev->ipa.configured_model != kbdev->ipa.fallback_model) ++ kbase_ipa_model_debugfs_init(kbdev->ipa.configured_model); ++ kbase_ipa_model_debugfs_init(kbdev->ipa.fallback_model); + -+ if (max_total_stream_num > -+ MAX_SUPPORTED_CSGS * MAX_SUPPORTED_STREAMS_PER_GROUP) -+ return -EINVAL; ++ debugfs_create_file("ipa_current_power", 0444, ++ kbdev->mali_debugfs_directory, kbdev, ¤t_power); ++ debugfs_create_file("ipa_force_fallback_model", 0644, ++ kbdev->mali_debugfs_directory, kbdev, &force_fallback_model); + -+ user_groups = u64_to_user_ptr(param->in.groups_ptr); -+ user_streams = u64_to_user_ptr(param->in.streams_ptr); ++ mutex_unlock(&kbdev->ipa.lock); ++} +diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h +new file mode 100755 +index 000000000..f69036775 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h +@@ -0,0 +1,70 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2017, 2020-2021 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+ if (max_group_num > 0) { -+ if (!user_groups) -+ err = -EINVAL; -+ else { -+ group_data = kcalloc(max_group_num, -+ sizeof(*group_data), GFP_KERNEL); -+ if (!group_data) -+ err = -ENOMEM; -+ } -+ } ++#ifndef _KBASE_IPA_DEBUGFS_H_ ++#define _KBASE_IPA_DEBUGFS_H_ + -+ if (max_total_stream_num > 0) { -+ if (!user_streams) -+ err = -EINVAL; -+ else { -+ stream_data = kcalloc(max_total_stream_num, -+ sizeof(*stream_data), GFP_KERNEL); -+ if (!stream_data) -+ err = -ENOMEM; -+ } -+ } ++enum kbase_ipa_model_param_type { ++ PARAM_TYPE_S32 = 1, ++ PARAM_TYPE_STRING, ++}; + -+ if (!err) { -+ param->out.total_stream_num = -+ kbase_csf_firmware_get_glb_iface(kctx->kbdev, -+ group_data, max_group_num, -+ stream_data, max_total_stream_num, -+ ¶m->out.glb_version, ¶m->out.features, -+ ¶m->out.group_num, ¶m->out.prfcnt_size); ++#if IS_ENABLED(CONFIG_DEBUG_FS) + -+ param->out.padding = 0; ++void kbase_ipa_debugfs_init(struct kbase_device *kbdev); ++int kbase_ipa_model_param_add(struct kbase_ipa_model *model, const char *name, ++ void *addr, size_t size, ++ enum kbase_ipa_model_param_type type); ++void kbase_ipa_model_param_free_all(struct kbase_ipa_model *model); + -+ if (copy_to_user(user_groups, group_data, -+ MIN(max_group_num, param->out.group_num) * -+ sizeof(*group_data))) -+ err = -EFAULT; -+ } ++/** ++ * kbase_ipa_model_param_set_s32 - Set an integer model parameter ++ * ++ * @model: pointer to IPA model ++ * @name: name of corresponding debugfs entry ++ * @val: new value of the parameter ++ * ++ * This function is only exposed for use by unit tests running in ++ * kernel space. Normally it is expected that parameter values will ++ * instead be set via debugfs. ++ */ ++void kbase_ipa_model_param_set_s32(struct kbase_ipa_model *model, ++ const char *name, s32 val); + -+ if (!err) -+ if (copy_to_user(user_streams, stream_data, -+ MIN(max_total_stream_num, param->out.total_stream_num) * -+ sizeof(*stream_data))) -+ err = -EFAULT; ++#else /* CONFIG_DEBUG_FS */ + -+ kfree(group_data); -+ kfree(stream_data); -+ return err; ++static inline int kbase_ipa_model_param_add(struct kbase_ipa_model *model, ++ const char *name, void *addr, ++ size_t size, ++ enum kbase_ipa_model_param_type type) ++{ ++ return 0; +} -+#endif /* MALI_USE_CSF */ + -+#define KBASE_HANDLE_IOCTL(cmd, function, arg) \ -+ do { \ -+ BUILD_BUG_ON(_IOC_DIR(cmd) != _IOC_NONE); \ -+ return function(arg); \ -+ } while (0) ++static inline void kbase_ipa_model_param_free_all(struct kbase_ipa_model *model) ++{ } + -+#define KBASE_HANDLE_IOCTL_IN(cmd, function, type, arg) \ -+ do { \ -+ type param; \ -+ int err; \ -+ BUILD_BUG_ON(_IOC_DIR(cmd) != _IOC_WRITE); \ -+ BUILD_BUG_ON(sizeof(param) != _IOC_SIZE(cmd)); \ -+ err = copy_from_user(¶m, uarg, sizeof(param)); \ -+ if (err) \ -+ return -EFAULT; \ -+ return function(arg, ¶m); \ -+ } while (0) ++static inline void kbase_ipa_model_param_set_s32(struct kbase_ipa_model *model, ++ const char *name, s32 val) ++{ } ++#endif /* CONFIG_DEBUG_FS */ + -+#define KBASE_HANDLE_IOCTL_OUT(cmd, function, type, arg) \ -+ do { \ -+ type param; \ -+ int ret, err; \ -+ BUILD_BUG_ON(_IOC_DIR(cmd) != _IOC_READ); \ -+ BUILD_BUG_ON(sizeof(param) != _IOC_SIZE(cmd)); \ -+ memset(¶m, 0, sizeof(param)); \ -+ ret = function(arg, ¶m); \ -+ err = copy_to_user(uarg, ¶m, sizeof(param)); \ -+ if (err) \ -+ return -EFAULT; \ -+ return ret; \ -+ } while (0) ++#endif /* _KBASE_IPA_DEBUGFS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c +new file mode 100755 +index 000000000..8557fe872 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c +@@ -0,0 +1,370 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2016-2018, 2020-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+#define KBASE_HANDLE_IOCTL_INOUT(cmd, function, type, arg) \ -+ do { \ -+ type param; \ -+ int ret, err; \ -+ BUILD_BUG_ON(_IOC_DIR(cmd) != (_IOC_WRITE|_IOC_READ)); \ -+ BUILD_BUG_ON(sizeof(param) != _IOC_SIZE(cmd)); \ -+ err = copy_from_user(¶m, uarg, sizeof(param)); \ -+ if (err) \ -+ return -EFAULT; \ -+ ret = function(arg, ¶m); \ -+ err = copy_to_user(uarg, ¶m, sizeof(param)); \ -+ if (err) \ -+ return -EFAULT; \ -+ return ret; \ -+ } while (0) ++#include ++#include ++#include ++#if IS_ENABLED(CONFIG_DEVFREQ_THERMAL) ++#include ++#endif ++#include ++#include ++#include + -+static long kbase_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ++#include "mali_kbase.h" ++#include "mali_kbase_defs.h" ++#include "mali_kbase_ipa_simple.h" ++#include "mali_kbase_ipa_debugfs.h" ++ ++#if MALI_USE_CSF ++ ++/* This is used if the dynamic power for top-level is estimated separately ++ * through the counter model. To roughly match the contribution of top-level ++ * power in the total dynamic power, when calculated through counter model, ++ * this scalar is used for the dynamic coefficient specified in the device tree ++ * for simple power model. This value was provided by the HW team after ++ * taking all the power data collected and dividing top level power by shader ++ * core power and then averaging it across all samples. ++ */ ++#define TOP_LEVEL_DYN_COEFF_SCALER (3) ++ ++#endif /* MALI_USE_CSF */ ++ ++#if MALI_UNIT_TEST ++ ++static int dummy_temp; ++ ++static int kbase_simple_power_model_get_dummy_temp( ++ struct thermal_zone_device *tz, ++ int *temp) +{ -+ struct kbase_file *const kfile = filp->private_data; -+ struct kbase_context *kctx = NULL; -+ struct kbase_device *kbdev = kfile->kbdev; -+ void __user *uarg = (void __user *)arg; ++ *temp = READ_ONCE(dummy_temp); ++ return 0; ++} + -+ /* Only these ioctls are available until setup is complete */ -+ switch (cmd) { -+ case KBASE_IOCTL_VERSION_CHECK: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_VERSION_CHECK, -+ kbase_api_handshake, -+ struct kbase_ioctl_version_check, -+ kfile); -+ break; ++/* Intercept calls to the kernel function using a macro */ ++#ifdef thermal_zone_get_temp ++#undef thermal_zone_get_temp ++#endif ++#define thermal_zone_get_temp(tz, temp) \ ++ kbase_simple_power_model_get_dummy_temp(tz, temp) + -+ case KBASE_IOCTL_VERSION_CHECK_RESERVED: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_VERSION_CHECK_RESERVED, -+ kbase_api_handshake_dummy, -+ struct kbase_ioctl_version_check, -+ kfile); -+ break; ++void kbase_simple_power_model_set_dummy_temp(int temp) ++{ ++ WRITE_ONCE(dummy_temp, temp); ++} ++KBASE_EXPORT_TEST_API(kbase_simple_power_model_set_dummy_temp); + -+ case KBASE_IOCTL_SET_FLAGS: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_SET_FLAGS, -+ kbase_api_set_flags, -+ struct kbase_ioctl_set_flags, -+ kfile); -+ break; -+ } ++#endif /* MALI_UNIT_TEST */ + -+ kctx = kbase_file_get_kctx_if_setup_complete(kfile); -+ if (unlikely(!kctx)) -+ return -EPERM; ++/* ++ * This model is primarily designed for the Juno platform. It may not be ++ * suitable for other platforms. The additional resources in this model ++ * should preferably be minimal, as this model is rarely used when a dynamic ++ * model is available. ++ */ + -+ /* Normal ioctls */ -+ switch (cmd) { -+#if !MALI_USE_CSF -+ case KBASE_IOCTL_JOB_SUBMIT: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_JOB_SUBMIT, -+ kbase_api_job_submit, -+ struct kbase_ioctl_job_submit, -+ kctx); -+ break; -+#endif /* !MALI_USE_CSF */ -+ case KBASE_IOCTL_GET_GPUPROPS: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_GET_GPUPROPS, -+ kbase_api_get_gpuprops, -+ struct kbase_ioctl_get_gpuprops, -+ kctx); -+ break; -+#if !MALI_USE_CSF -+ case KBASE_IOCTL_POST_TERM: -+ KBASE_HANDLE_IOCTL(KBASE_IOCTL_POST_TERM, -+ kbase_api_post_term, -+ kctx); -+ break; -+#endif /* !MALI_USE_CSF */ -+ case KBASE_IOCTL_MEM_ALLOC: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_ALLOC, -+ kbase_api_mem_alloc, -+ union kbase_ioctl_mem_alloc, -+ kctx); -+ break; -+ case KBASE_IOCTL_MEM_QUERY: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_QUERY, -+ kbase_api_mem_query, -+ union kbase_ioctl_mem_query, -+ kctx); -+ break; -+ case KBASE_IOCTL_MEM_FREE: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_FREE, -+ kbase_api_mem_free, -+ struct kbase_ioctl_mem_free, -+ kctx); -+ break; -+ case KBASE_IOCTL_DISJOINT_QUERY: -+ KBASE_HANDLE_IOCTL_OUT(KBASE_IOCTL_DISJOINT_QUERY, -+ kbase_api_disjoint_query, -+ struct kbase_ioctl_disjoint_query, -+ kctx); -+ break; -+ case KBASE_IOCTL_GET_DDK_VERSION: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_GET_DDK_VERSION, -+ kbase_api_get_ddk_version, -+ struct kbase_ioctl_get_ddk_version, -+ kctx); -+ break; -+ case KBASE_IOCTL_MEM_JIT_INIT_10_2: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_JIT_INIT_10_2, -+ kbase_api_mem_jit_init_10_2, -+ struct kbase_ioctl_mem_jit_init_10_2, -+ kctx); -+ break; -+ case KBASE_IOCTL_MEM_JIT_INIT_11_5: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_JIT_INIT_11_5, -+ kbase_api_mem_jit_init_11_5, -+ struct kbase_ioctl_mem_jit_init_11_5, -+ kctx); -+ break; -+ case KBASE_IOCTL_MEM_JIT_INIT: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_JIT_INIT, -+ kbase_api_mem_jit_init, -+ struct kbase_ioctl_mem_jit_init, -+ kctx); -+ break; -+ case KBASE_IOCTL_MEM_EXEC_INIT: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_EXEC_INIT, -+ kbase_api_mem_exec_init, -+ struct kbase_ioctl_mem_exec_init, -+ kctx); -+ break; -+ case KBASE_IOCTL_MEM_SYNC: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_SYNC, -+ kbase_api_mem_sync, -+ struct kbase_ioctl_mem_sync, -+ kctx); -+ break; -+ case KBASE_IOCTL_MEM_FIND_CPU_OFFSET: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_FIND_CPU_OFFSET, -+ kbase_api_mem_find_cpu_offset, -+ union kbase_ioctl_mem_find_cpu_offset, -+ kctx); -+ break; -+ case KBASE_IOCTL_MEM_FIND_GPU_START_AND_OFFSET: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_FIND_GPU_START_AND_OFFSET, -+ kbase_api_mem_find_gpu_start_and_offset, -+ union kbase_ioctl_mem_find_gpu_start_and_offset, -+ kctx); -+ break; -+ case KBASE_IOCTL_GET_CONTEXT_ID: -+ KBASE_HANDLE_IOCTL_OUT(KBASE_IOCTL_GET_CONTEXT_ID, -+ kbase_api_get_context_id, -+ struct kbase_ioctl_get_context_id, -+ kctx); -+ break; -+ case KBASE_IOCTL_TLSTREAM_ACQUIRE: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_TLSTREAM_ACQUIRE, -+ kbase_api_tlstream_acquire, -+ struct kbase_ioctl_tlstream_acquire, -+ kctx); -+ break; -+ case KBASE_IOCTL_TLSTREAM_FLUSH: -+ KBASE_HANDLE_IOCTL(KBASE_IOCTL_TLSTREAM_FLUSH, -+ kbase_api_tlstream_flush, -+ kctx); -+ break; -+ case KBASE_IOCTL_MEM_COMMIT: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_COMMIT, -+ kbase_api_mem_commit, -+ struct kbase_ioctl_mem_commit, -+ kctx); -+ break; -+ case KBASE_IOCTL_MEM_ALIAS: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_ALIAS, -+ kbase_api_mem_alias, -+ union kbase_ioctl_mem_alias, -+ kctx); -+ break; -+ case KBASE_IOCTL_MEM_IMPORT: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_IMPORT, -+ kbase_api_mem_import, -+ union kbase_ioctl_mem_import, -+ kctx); -+ break; -+ case KBASE_IOCTL_MEM_FLAGS_CHANGE: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_FLAGS_CHANGE, -+ kbase_api_mem_flags_change, -+ struct kbase_ioctl_mem_flags_change, -+ kctx); -+ break; -+ case KBASE_IOCTL_STREAM_CREATE: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_STREAM_CREATE, -+ kbase_api_stream_create, -+ struct kbase_ioctl_stream_create, -+ kctx); -+ break; -+ case KBASE_IOCTL_FENCE_VALIDATE: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_FENCE_VALIDATE, -+ kbase_api_fence_validate, -+ struct kbase_ioctl_fence_validate, -+ kctx); -+ break; -+ case KBASE_IOCTL_MEM_PROFILE_ADD: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_PROFILE_ADD, -+ kbase_api_mem_profile_add, -+ struct kbase_ioctl_mem_profile_add, -+ kctx); -+ break; ++/** ++ * struct kbase_ipa_model_simple_data - IPA context per device ++ * @dynamic_coefficient: dynamic coefficient of the model ++ * @static_coefficient: static coefficient of the model ++ * @ts: Thermal scaling coefficients of the model ++ * @tz_name: Thermal zone name ++ * @gpu_tz: thermal zone device ++ * @poll_temperature_thread: Handle for temperature polling thread ++ * @current_temperature: Most recent value of polled temperature ++ * @temperature_poll_interval_ms: How often temperature should be checked, in ms ++ */ + -+#if !MALI_USE_CSF -+ case KBASE_IOCTL_SOFT_EVENT_UPDATE: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_SOFT_EVENT_UPDATE, -+ kbase_api_soft_event_update, -+ struct kbase_ioctl_soft_event_update, -+ kctx); -+ break; -+#endif /* !MALI_USE_CSF */ ++struct kbase_ipa_model_simple_data { ++ u32 dynamic_coefficient; ++ u32 static_coefficient; ++ s32 ts[4]; ++ char tz_name[THERMAL_NAME_LENGTH]; ++ struct thermal_zone_device *gpu_tz; ++ struct task_struct *poll_temperature_thread; ++ int current_temperature; ++ int temperature_poll_interval_ms; ++}; ++#define FALLBACK_STATIC_TEMPERATURE 55000 + -+ case KBASE_IOCTL_STICKY_RESOURCE_MAP: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_STICKY_RESOURCE_MAP, -+ kbase_api_sticky_resource_map, -+ struct kbase_ioctl_sticky_resource_map, -+ kctx); -+ break; -+ case KBASE_IOCTL_STICKY_RESOURCE_UNMAP: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_STICKY_RESOURCE_UNMAP, -+ kbase_api_sticky_resource_unmap, -+ struct kbase_ioctl_sticky_resource_unmap, -+ kctx); -+ break; ++/** ++ * calculate_temp_scaling_factor() - Calculate temperature scaling coefficient ++ * @ts: Signed coefficients, in order t^0 to t^3, with units Deg^-N ++ * @t: Temperature, in mDeg C. Range: -2^17 < t < 2^17 ++ * ++ * Scale the temperature according to a cubic polynomial whose coefficients are ++ * provided in the device tree. The result is used to scale the static power ++ * coefficient, where 1000000 means no change. ++ * ++ * Return: Temperature scaling factor. Range 0 <= ret <= 10,000,000. ++ */ ++static u32 calculate_temp_scaling_factor(s32 ts[4], s64 t) ++{ ++ /* Range: -2^24 < t2 < 2^24 m(Deg^2) */ ++ const s64 t2 = div_s64((t * t), 1000); + -+ /* Instrumentation. */ -+#if !MALI_USE_CSF -+ case KBASE_IOCTL_KINSTR_JM_FD: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_KINSTR_JM_FD, -+ kbase_api_kinstr_jm_fd, -+ union kbase_kinstr_jm_fd, -+ kctx); -+ break; -+#endif -+ case KBASE_IOCTL_HWCNT_READER_SETUP: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_HWCNT_READER_SETUP, -+ kbase_api_hwcnt_reader_setup, -+ struct kbase_ioctl_hwcnt_reader_setup, -+ kctx); -+ break; -+ case KBASE_IOCTL_HWCNT_ENABLE: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_HWCNT_ENABLE, -+ kbase_api_hwcnt_enable, -+ struct kbase_ioctl_hwcnt_enable, -+ kctx); -+ break; -+ case KBASE_IOCTL_HWCNT_DUMP: -+ KBASE_HANDLE_IOCTL(KBASE_IOCTL_HWCNT_DUMP, -+ kbase_api_hwcnt_dump, -+ kctx); -+ break; -+ case KBASE_IOCTL_HWCNT_CLEAR: -+ KBASE_HANDLE_IOCTL(KBASE_IOCTL_HWCNT_CLEAR, -+ kbase_api_hwcnt_clear, -+ kctx); -+ break; -+ case KBASE_IOCTL_GET_CPU_GPU_TIMEINFO: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_GET_CPU_GPU_TIMEINFO, -+ kbase_api_get_cpu_gpu_timeinfo, -+ union kbase_ioctl_get_cpu_gpu_timeinfo, -+ kctx); -+ break; -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+ case KBASE_IOCTL_HWCNT_SET: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_HWCNT_SET, -+ kbase_api_hwcnt_set, -+ struct kbase_ioctl_hwcnt_values, -+ kctx); -+ break; -+#endif -+#ifdef CONFIG_MALI_CINSTR_GWT -+ case KBASE_IOCTL_CINSTR_GWT_START: -+ KBASE_HANDLE_IOCTL(KBASE_IOCTL_CINSTR_GWT_START, -+ kbase_gpu_gwt_start, -+ kctx); -+ break; -+ case KBASE_IOCTL_CINSTR_GWT_STOP: -+ KBASE_HANDLE_IOCTL(KBASE_IOCTL_CINSTR_GWT_STOP, -+ kbase_gpu_gwt_stop, -+ kctx); -+ break; -+ case KBASE_IOCTL_CINSTR_GWT_DUMP: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_CINSTR_GWT_DUMP, -+ kbase_gpu_gwt_dump, -+ union kbase_ioctl_cinstr_gwt_dump, -+ kctx); -+ break; -+#endif -+#if MALI_USE_CSF -+ case KBASE_IOCTL_CS_EVENT_SIGNAL: -+ KBASE_HANDLE_IOCTL(KBASE_IOCTL_CS_EVENT_SIGNAL, -+ kbasep_cs_event_signal, -+ kctx); -+ break; -+ case KBASE_IOCTL_CS_QUEUE_REGISTER: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_CS_QUEUE_REGISTER, -+ kbasep_cs_queue_register, -+ struct kbase_ioctl_cs_queue_register, -+ kctx); -+ break; -+ case KBASE_IOCTL_CS_QUEUE_TERMINATE: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_CS_QUEUE_TERMINATE, -+ kbasep_cs_queue_terminate, -+ struct kbase_ioctl_cs_queue_terminate, -+ kctx); -+ break; -+ case KBASE_IOCTL_CS_QUEUE_BIND: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_CS_QUEUE_BIND, -+ kbasep_cs_queue_bind, -+ union kbase_ioctl_cs_queue_bind, -+ kctx); -+ break; -+ case KBASE_IOCTL_CS_QUEUE_KICK: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_CS_QUEUE_KICK, -+ kbasep_cs_queue_kick, -+ struct kbase_ioctl_cs_queue_kick, -+ kctx); -+ break; -+ case KBASE_IOCTL_CS_QUEUE_GROUP_CREATE: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_CS_QUEUE_GROUP_CREATE, -+ kbasep_cs_queue_group_create, -+ union kbase_ioctl_cs_queue_group_create, -+ kctx); -+ break; -+ case KBASE_IOCTL_CS_QUEUE_GROUP_TERMINATE: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_CS_QUEUE_GROUP_TERMINATE, -+ kbasep_cs_queue_group_terminate, -+ struct kbase_ioctl_cs_queue_group_term, -+ kctx); -+ break; -+ case KBASE_IOCTL_KCPU_QUEUE_CREATE: -+ KBASE_HANDLE_IOCTL_OUT(KBASE_IOCTL_KCPU_QUEUE_CREATE, -+ kbasep_kcpu_queue_new, -+ struct kbase_ioctl_kcpu_queue_new, -+ kctx); -+ break; -+ case KBASE_IOCTL_KCPU_QUEUE_DELETE: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_KCPU_QUEUE_DELETE, -+ kbasep_kcpu_queue_delete, -+ struct kbase_ioctl_kcpu_queue_delete, -+ kctx); -+ break; -+ case KBASE_IOCTL_KCPU_QUEUE_ENQUEUE: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_KCPU_QUEUE_ENQUEUE, -+ kbasep_kcpu_queue_enqueue, -+ struct kbase_ioctl_kcpu_queue_enqueue, -+ kctx); -+ break; -+ case KBASE_IOCTL_CS_TILER_HEAP_INIT: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_CS_TILER_HEAP_INIT, -+ kbasep_cs_tiler_heap_init, -+ union kbase_ioctl_cs_tiler_heap_init, -+ kctx); -+ break; -+ case KBASE_IOCTL_CS_TILER_HEAP_TERM: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_CS_TILER_HEAP_TERM, -+ kbasep_cs_tiler_heap_term, -+ struct kbase_ioctl_cs_tiler_heap_term, -+ kctx); -+ break; -+ case KBASE_IOCTL_CS_GET_GLB_IFACE: -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_CS_GET_GLB_IFACE, -+ kbase_ioctl_cs_get_glb_iface, -+ union kbase_ioctl_cs_get_glb_iface, -+ kctx); -+ break; -+#endif /* MALI_USE_CSF */ -+#if MALI_UNIT_TEST -+ case KBASE_IOCTL_TLSTREAM_TEST: -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_TLSTREAM_TEST, -+ kbase_api_tlstream_test, -+ struct kbase_ioctl_tlstream_test, -+ kctx); -+ break; -+ case KBASE_IOCTL_TLSTREAM_STATS: -+ KBASE_HANDLE_IOCTL_OUT(KBASE_IOCTL_TLSTREAM_STATS, -+ kbase_api_tlstream_stats, -+ struct kbase_ioctl_tlstream_stats, -+ kctx); -+ break; -+#endif /* MALI_UNIT_TEST */ -+ } ++ /* Range: -2^31 < t3 < 2^31 m(Deg^3) */ ++ const s64 t3 = div_s64((t * t2), 1000); + -+ dev_warn(kbdev->dev, "Unknown ioctl 0x%x nr:%d", cmd, _IOC_NR(cmd)); ++ /* ++ * Sum the parts. t^[1-3] are in m(Deg^N), but the coefficients are in ++ * Deg^-N, so we need to multiply the last coefficient by 1000. ++ * Range: -2^63 < res_big < 2^63 ++ */ ++ const s64 res_big = ts[3] * t3 /* +/- 2^62 */ ++ + ts[2] * t2 /* +/- 2^55 */ ++ + ts[1] * t /* +/- 2^48 */ ++ + ts[0] * (s64)1000; /* +/- 2^41 */ + -+ return -ENOIOCTLCMD; ++ /* Range: -2^60 < res_unclamped < 2^60 */ ++ s64 res_unclamped = div_s64(res_big, 1000); ++ ++ /* Clamp to range of 0x to 10x the static power */ ++ return clamp(res_unclamped, (s64) 0, (s64) 10000000); +} + -+#if MALI_USE_CSF -+static ssize_t kbase_read(struct file *filp, char __user *buf, size_t count, loff_t *f_pos) ++/* We can't call thermal_zone_get_temp() directly in model_static_coeff(), ++ * because we don't know if tz->lock is held in the same thread. So poll it in ++ * a separate thread to get around this. ++ */ ++static int poll_temperature(void *data) +{ -+ struct kbase_file *const kfile = filp->private_data; -+ struct kbase_context *const kctx = -+ kbase_file_get_kctx_if_setup_complete(kfile); -+ struct base_csf_notification event_data = { -+ .type = BASE_CSF_NOTIFICATION_EVENT }; -+ const size_t data_size = sizeof(event_data); -+ bool read_event = false, read_error = false; -+ -+ if (unlikely(!kctx)) -+ return -EPERM; ++ struct kbase_ipa_model_simple_data *model_data = ++ (struct kbase_ipa_model_simple_data *) data; ++ int temp; + -+ if (atomic_read(&kctx->event_count)) -+ read_event = true; -+ else -+ read_error = kbase_csf_read_error(kctx, &event_data); ++ set_freezable(); + -+ if (!read_event && !read_error) { -+ /* This condition is not treated as an error. -+ * It is possible that event handling thread was woken up due -+ * to a fault/error that occurred for a queue group, but before -+ * the corresponding fault data was read by the thread the -+ * queue group was already terminated by the userspace. -+ */ -+ dev_dbg(kctx->kbdev->dev, "Neither event nor error signaled"); -+ } ++ while (!kthread_should_stop()) { ++ struct thermal_zone_device *tz = READ_ONCE(model_data->gpu_tz); + -+ if (copy_to_user(buf, &event_data, data_size) != 0) { -+ dev_warn(kctx->kbdev->dev, -+ "Failed to copy data\n"); -+ return -EFAULT; -+ } ++ if (tz) { ++ int ret; + -+ if (read_event) -+ atomic_set(&kctx->event_count, 0); ++ ret = thermal_zone_get_temp(tz, &temp); ++ if (ret) { ++ pr_warn_ratelimited("Error reading temperature for gpu thermal zone: %d\n", ++ ret); ++ temp = FALLBACK_STATIC_TEMPERATURE; ++ } ++ } else { ++ temp = FALLBACK_STATIC_TEMPERATURE; ++ } + -+ return data_size; -+} -+#else /* MALI_USE_CSF */ -+static ssize_t kbase_read(struct file *filp, char __user *buf, size_t count, loff_t *f_pos) -+{ -+ struct kbase_file *const kfile = filp->private_data; -+ struct kbase_context *const kctx = -+ kbase_file_get_kctx_if_setup_complete(kfile); -+ struct base_jd_event_v2 uevent; -+ int out_count = 0; ++ WRITE_ONCE(model_data->current_temperature, temp); + -+ if (unlikely(!kctx)) -+ return -EPERM; ++ msleep_interruptible(READ_ONCE(model_data->temperature_poll_interval_ms)); + -+ if (count < sizeof(uevent)) -+ return -ENOBUFS; ++ try_to_freeze(); ++ } + -+ do { -+ while (kbase_event_dequeue(kctx, &uevent)) { -+ if (out_count > 0) -+ goto out; ++ return 0; ++} + -+ if (filp->f_flags & O_NONBLOCK) -+ return -EAGAIN; ++static int model_static_coeff(struct kbase_ipa_model *model, u32 *coeffp) ++{ ++ u32 temp_scaling_factor; ++ struct kbase_ipa_model_simple_data *model_data = ++ (struct kbase_ipa_model_simple_data *) model->model_data; ++ u64 coeff_big; ++ int temp; + -+ if (wait_event_interruptible(kctx->event_queue, -+ kbase_event_pending(kctx)) != 0) -+ return -ERESTARTSYS; -+ } -+ if (uevent.event_code == BASE_JD_EVENT_DRV_TERMINATED) { -+ if (out_count == 0) -+ return -EPIPE; -+ goto out; -+ } ++ temp = READ_ONCE(model_data->current_temperature); + -+ if (copy_to_user(buf, &uevent, sizeof(uevent)) != 0) -+ return -EFAULT; ++ /* Range: 0 <= temp_scaling_factor < 2^24 */ ++ temp_scaling_factor = calculate_temp_scaling_factor(model_data->ts, ++ temp); + -+ buf += sizeof(uevent); -+ out_count++; -+ count -= sizeof(uevent); -+ } while (count >= sizeof(uevent)); ++ /* ++ * Range: 0 <= coeff_big < 2^52 to avoid overflowing *coeffp. This ++ * means static_coefficient must be in range ++ * 0 <= static_coefficient < 2^28. ++ */ ++ coeff_big = (u64) model_data->static_coefficient * (u64) temp_scaling_factor; ++ *coeffp = div_u64(coeff_big, 1000000); + -+ out: -+ return out_count * sizeof(uevent); ++ return 0; +} -+#endif /* MALI_USE_CSF */ + -+static unsigned int kbase_poll(struct file *filp, poll_table *wait) ++static int model_dynamic_coeff(struct kbase_ipa_model *model, u32 *coeffp) +{ -+ struct kbase_file *const kfile = filp->private_data; -+ struct kbase_context *const kctx = -+ kbase_file_get_kctx_if_setup_complete(kfile); -+ -+ if (unlikely(!kctx)) -+ return POLLERR; ++ struct kbase_ipa_model_simple_data *model_data = ++ (struct kbase_ipa_model_simple_data *) model->model_data; + -+ poll_wait(filp, &kctx->event_queue, wait); -+ if (kbase_event_pending(kctx)) -+ return POLLIN | POLLRDNORM; ++#if MALI_USE_CSF ++ /* On CSF GPUs, the dynamic power for top-level and shader cores is ++ * estimated separately. Currently there is a single dynamic ++ * coefficient value provided in the device tree for simple model. ++ * As per the discussion with HW team the coefficient value needs to ++ * be scaled down for top-level to limit its contribution in the ++ * total dyanmic power. ++ */ ++ coeffp[KBASE_IPA_BLOCK_TYPE_TOP_LEVEL] = ++ model_data->dynamic_coefficient / TOP_LEVEL_DYN_COEFF_SCALER; ++ coeffp[KBASE_IPA_BLOCK_TYPE_SHADER_CORES] = ++ model_data->dynamic_coefficient; ++#else ++ *coeffp = model_data->dynamic_coefficient; ++#endif + + return 0; +} + -+void kbase_event_wakeup(struct kbase_context *kctx) ++static int add_params(struct kbase_ipa_model *model) +{ -+ KBASE_DEBUG_ASSERT(kctx); ++ int err = 0; ++ struct kbase_ipa_model_simple_data *model_data = ++ (struct kbase_ipa_model_simple_data *)model->model_data; + -+ wake_up_interruptible(&kctx->event_queue); -+} ++ err = kbase_ipa_model_add_param_s32(model, "static-coefficient", ++ (s32 *)&model_data->static_coefficient, 1, true); ++ if (err) ++ goto end; + -+KBASE_EXPORT_TEST_API(kbase_event_wakeup); ++ err = kbase_ipa_model_add_param_s32(model, "dynamic-coefficient", ++ (s32 *)&model_data->dynamic_coefficient, 1, true); ++ if (err) ++ goto end; + -+#if MALI_USE_CSF -+int kbase_event_pending(struct kbase_context *ctx) -+{ -+ WARN_ON_ONCE(!ctx); ++ err = kbase_ipa_model_add_param_s32(model, "ts", ++ model_data->ts, 4, true); ++ if (err) ++ goto end; + -+ return (atomic_read(&ctx->event_count) != 0) || -+ kbase_csf_error_pending(ctx); ++ err = kbase_ipa_model_add_param_string(model, "thermal-zone", ++ model_data->tz_name, ++ sizeof(model_data->tz_name), true); ++ if (err) ++ goto end; ++ ++ model_data->temperature_poll_interval_ms = 200; ++ err = kbase_ipa_model_add_param_s32(model, "temp-poll-interval-ms", ++ &model_data->temperature_poll_interval_ms, ++ 1, false); ++ ++end: ++ return err; +} -+#else -+int kbase_event_pending(struct kbase_context *ctx) ++ ++static int kbase_simple_power_model_init(struct kbase_ipa_model *model) +{ -+ KBASE_DEBUG_ASSERT(ctx); ++ int err; ++ struct kbase_ipa_model_simple_data *model_data; + -+ return (atomic_read(&ctx->event_count) != 0) || -+ (atomic_read(&ctx->event_closed) != 0); -+} -+#endif ++ model_data = kzalloc(sizeof(struct kbase_ipa_model_simple_data), ++ GFP_KERNEL); ++ if (!model_data) ++ return -ENOMEM; + -+KBASE_EXPORT_TEST_API(kbase_event_pending); ++ model->model_data = (void *) model_data; + -+static int kbase_mmap(struct file *const filp, struct vm_area_struct *const vma) -+{ -+ struct kbase_file *const kfile = filp->private_data; -+ struct kbase_context *const kctx = -+ kbase_file_get_kctx_if_setup_complete(kfile); ++ model_data->current_temperature = FALLBACK_STATIC_TEMPERATURE; ++ model_data->poll_temperature_thread = kthread_run(poll_temperature, ++ (void *) model_data, ++ "mali-simple-power-model-temp-poll"); ++ if (IS_ERR(model_data->poll_temperature_thread)) { ++ err = PTR_ERR(model_data->poll_temperature_thread); ++ kfree(model_data); ++ return err; ++ } + -+ if (unlikely(!kctx)) -+ return -EPERM; ++ err = add_params(model); ++ if (err) { ++ kbase_ipa_model_param_free_all(model); ++ kthread_stop(model_data->poll_temperature_thread); ++ kfree(model_data); ++ } + -+ return kbase_context_mmap(kctx, vma); ++ return err; +} + -+static int kbase_check_flags(int flags) ++static int kbase_simple_power_model_recalculate(struct kbase_ipa_model *model) +{ -+ /* Enforce that the driver keeps the O_CLOEXEC flag so that execve() always -+ * closes the file descriptor in a child process. -+ */ -+ if (0 == (flags & O_CLOEXEC)) -+ return -EINVAL; ++ struct kbase_ipa_model_simple_data *model_data = ++ (struct kbase_ipa_model_simple_data *)model->model_data; ++ struct thermal_zone_device *tz; ++ ++ lockdep_assert_held(&model->kbdev->ipa.lock); ++ ++ if (!strnlen(model_data->tz_name, sizeof(model_data->tz_name))) { ++ model_data->gpu_tz = NULL; ++ } else { ++ char tz_name[THERMAL_NAME_LENGTH]; ++ u32 string_len = strscpy(tz_name, model_data->tz_name, sizeof(tz_name)); ++ ++ string_len += sizeof(char); ++ /* Make sure that the source string fit into the buffer. */ ++ KBASE_DEBUG_ASSERT(string_len <= sizeof(tz_name)); ++ CSTD_UNUSED(string_len); ++ ++ /* Release ipa.lock so that thermal_list_lock is not acquired ++ * with ipa.lock held, thereby avoid lock ordering violation ++ * lockdep warning. The warning comes as a chain of locks ++ * ipa.lock --> thermal_list_lock --> tz->lock gets formed ++ * on registering devfreq cooling device when probe method ++ * of mali platform driver is invoked. ++ */ ++ mutex_unlock(&model->kbdev->ipa.lock); ++ tz = thermal_zone_get_zone_by_name(tz_name); ++ mutex_lock(&model->kbdev->ipa.lock); ++ ++ if (IS_ERR_OR_NULL(tz)) { ++ pr_warn_ratelimited( ++ "Error %d getting thermal zone \'%s\', not yet ready?\n", ++ PTR_ERR_OR_ZERO(tz), tz_name); ++ return -EPROBE_DEFER; ++ } ++ ++ /* Check if another thread raced against us & updated the ++ * thermal zone name string. Update the gpu_tz pointer only if ++ * the name string did not change whilst we retrieved the new ++ * thermal_zone_device pointer, otherwise model_data->tz_name & ++ * model_data->gpu_tz would become inconsistent with each other. ++ * The below check will succeed only for the thread which last ++ * updated the name string. ++ */ ++ if (strncmp(tz_name, model_data->tz_name, sizeof(tz_name)) == 0) ++ model_data->gpu_tz = tz; ++ } + + return 0; +} + -+static unsigned long kbase_get_unmapped_area(struct file *const filp, -+ const unsigned long addr, const unsigned long len, -+ const unsigned long pgoff, const unsigned long flags) ++static void kbase_simple_power_model_term(struct kbase_ipa_model *model) +{ -+ struct kbase_file *const kfile = filp->private_data; -+ struct kbase_context *const kctx = -+ kbase_file_get_kctx_if_setup_complete(kfile); ++ struct kbase_ipa_model_simple_data *model_data = ++ (struct kbase_ipa_model_simple_data *)model->model_data; + -+ if (unlikely(!kctx)) -+ return -EPERM; ++ kthread_stop(model_data->poll_temperature_thread); + -+ return kbase_context_get_unmapped_area(kctx, addr, len, pgoff, flags); ++ kfree(model_data); +} + -+static const struct file_operations kbase_fops = { -+ .owner = THIS_MODULE, -+ .open = kbase_open, -+ .release = kbase_release, -+ .read = kbase_read, -+ .poll = kbase_poll, -+ .unlocked_ioctl = kbase_ioctl, -+ .compat_ioctl = kbase_ioctl, -+ .mmap = kbase_mmap, -+ .check_flags = kbase_check_flags, -+ .get_unmapped_area = kbase_get_unmapped_area, ++struct kbase_ipa_model_ops kbase_simple_ipa_model_ops = { ++ .name = "mali-simple-power-model", ++ .init = &kbase_simple_power_model_init, ++ .recalculate = &kbase_simple_power_model_recalculate, ++ .term = &kbase_simple_power_model_term, ++ .get_dynamic_coeff = &model_dynamic_coeff, ++ .get_static_coeff = &model_static_coeff, +}; -+ -+/** -+ * show_policy - Show callback for the power_policy sysfs file. ++KBASE_EXPORT_TEST_API(kbase_simple_ipa_model_ops); +diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h +new file mode 100755 +index 000000000..dd17786a5 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h +@@ -0,0 +1,44 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* + * -+ * This function is called to get the contents of the power_policy sysfs -+ * file. This is a list of the available policies with the currently active one -+ * surrounded by square brackets. ++ * (C) COPYRIGHT 2017, 2020-2021 ARM Limited. All rights reserved. + * -+ * @dev: The device this sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The output buffer for the sysfs file contents ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Return: The number of bytes output to @buf. + */ -+static ssize_t show_policy(struct device *dev, struct device_attribute *attr, char *const buf) -+{ -+ struct kbase_device *kbdev; -+ const struct kbase_pm_policy *current_policy; -+ const struct kbase_pm_policy *const *policy_list; -+ int policy_count; -+ int i; -+ ssize_t ret = 0; -+ -+ kbdev = to_kbase_device(dev); -+ -+ if (!kbdev) -+ return -ENODEV; + -+ current_policy = kbase_pm_get_policy(kbdev); ++#ifndef _KBASE_IPA_SIMPLE_H_ ++#define _KBASE_IPA_SIMPLE_H_ + -+ policy_count = kbase_pm_list_policies(kbdev, &policy_list); ++#if defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) + -+ for (i = 0; i < policy_count && ret < PAGE_SIZE; i++) { -+ if (policy_list[i] == current_policy) -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "[%s] ", policy_list[i]->name); -+ else -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s ", policy_list[i]->name); -+ } ++extern struct kbase_ipa_model_ops kbase_simple_ipa_model_ops; + -+ if (ret < PAGE_SIZE - 1) { -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "\n"); -+ } else { -+ buf[PAGE_SIZE - 2] = '\n'; -+ buf[PAGE_SIZE - 1] = '\0'; -+ ret = PAGE_SIZE - 1; -+ } ++#if MALI_UNIT_TEST ++/** ++ * kbase_simple_power_model_set_dummy_temp() - set a dummy temperature value ++ * @temp: Temperature of the thermal zone, in millidegrees celsius. ++ * ++ * This is only intended for use in unit tests, to ensure that the temperature ++ * values used by the simple power model are predictable. Deterministic ++ * behavior is necessary to allow validation of the static power values ++ * computed by this model. ++ */ ++void kbase_simple_power_model_set_dummy_temp(int temp); ++#endif /* MALI_UNIT_TEST */ + -+ return ret; -+} ++#endif /* (defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL)) */ + -+/** -+ * set_policy - Store callback for the power_policy sysfs file. ++#endif /* _KBASE_IPA_SIMPLE_H_ */ +diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h +new file mode 100755 +index 000000000..debc3ad25 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h +@@ -0,0 +1,878 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* + * -+ * This function is called when the power_policy sysfs file is written to. -+ * It matches the requested policy against the available policies and if a -+ * matching policy is found calls kbase_pm_set_policy() to change the -+ * policy. ++ * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. + * -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes to write to the sysfs file ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Return: @count if the function succeeded. An error code on failure. + */ -+static ssize_t set_policy(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ const struct kbase_pm_policy *new_policy = NULL; -+ const struct kbase_pm_policy *const *policy_list; -+ int policy_count; -+ int i; + -+ kbdev = to_kbase_device(dev); -+ -+ if (!kbdev) -+ return -ENODEV; -+ -+ policy_count = kbase_pm_list_policies(kbdev, &policy_list); -+ -+ for (i = 0; i < policy_count; i++) { -+ if (sysfs_streq(policy_list[i]->name, buf)) { -+ new_policy = policy_list[i]; -+ break; -+ } -+ } ++/* ++ * Definitions (types, defines, etcs) specific to Job Manager Kbase. ++ * They are placed here to allow the hierarchy of header files to work. ++ */ + -+ if (!new_policy) { -+ dev_err(dev, "power_policy: policy not found\n"); -+ return -EINVAL; -+ } ++#ifndef _KBASE_JM_DEFS_H_ ++#define _KBASE_JM_DEFS_H_ + -+ kbase_pm_set_policy(kbdev, new_policy); ++#include "mali_kbase_js_defs.h" + -+ return count; -+} ++/* Dump Job slot trace on error (only active if KBASE_KTRACE_ENABLE != 0) */ ++#define KBASE_KTRACE_DUMP_ON_JOB_SLOT_ERROR 1 + +/* -+ * The sysfs file power_policy. -+ * -+ * This is used for obtaining information about the available policies, -+ * determining which policy is currently active, and changing the active -+ * policy. ++ * Number of milliseconds before resetting the GPU when a job cannot be "zapped" ++ * from the hardware. Note that the time is actually ++ * ZAP_TIMEOUT+SOFT_STOP_RESET_TIMEOUT between the context zap starting and ++ * the GPU actually being reset to give other contexts time for their jobs ++ * to be soft-stopped and removed from the hardware before resetting. + */ -+static DEVICE_ATTR(power_policy, S_IRUGO | S_IWUSR, show_policy, set_policy); ++#define ZAP_TIMEOUT 1000 + +/* -+ * show_core_mask - Show callback for the core_mask sysfs file. ++ * Prevent soft-stops from occurring in scheduling situations + * -+ * This function is called to get the contents of the core_mask sysfs file. ++ * This is not due to HW issues, but when scheduling is desired to be more ++ * predictable. + * -+ * @dev: The device this sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The output buffer for the sysfs file contents ++ * Therefore, soft stop may still be disabled due to HW issues. + * -+ * Return: The number of bytes output to @buf. ++ * Soft stop will still be used for non-scheduling purposes e.g. when ++ * terminating a context. ++ * ++ * if not in use, define this value to 0 instead of being undefined. + */ -+static ssize_t show_core_mask(struct device *dev, struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ ssize_t ret = 0; -+ -+ kbdev = to_kbase_device(dev); -+ -+ if (!kbdev) -+ return -ENODEV; -+ -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, -+ "Current core mask (JS0) : 0x%llX\n", -+ kbdev->pm.debug_core_mask[0]); -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, -+ "Current core mask (JS1) : 0x%llX\n", -+ kbdev->pm.debug_core_mask[1]); -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, -+ "Current core mask (JS2) : 0x%llX\n", -+ kbdev->pm.debug_core_mask[2]); -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, -+ "Available core mask : 0x%llX\n", -+ kbdev->gpu_props.props.raw_props.shader_present); -+ -+ return ret; -+} ++#define KBASE_DISABLE_SCHEDULING_SOFT_STOPS 0 + -+/** -+ * set_core_mask - Store callback for the core_mask sysfs file. ++/* ++ * Prevent hard-stops from occurring in scheduling situations + * -+ * This function is called when the core_mask sysfs file is written to. ++ * This is not due to HW issues, but when scheduling is desired to be more ++ * predictable. + * -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes to write to the sysfs file ++ * Hard stop will still be used for non-scheduling purposes e.g. when ++ * terminating a context. + * -+ * Return: @count if the function succeeded. An error code on failure. ++ * if not in use, define this value to 0 instead of being undefined. + */ -+static ssize_t set_core_mask(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ u64 new_core_mask[3]; -+ int items, i; -+ ssize_t err = count; -+ unsigned long flags; -+ u64 shader_present, group0_core_mask; -+ -+ kbdev = to_kbase_device(dev); ++#define KBASE_DISABLE_SCHEDULING_HARD_STOPS 0 + -+ if (!kbdev) -+ return -ENODEV; ++/* Atom has been previously soft-stopped */ ++#define KBASE_KATOM_FLAG_BEEN_SOFT_STOPPED (1<<1) ++/* Atom has been previously retried to execute */ ++#define KBASE_KATOM_FLAGS_RERUN (1<<2) ++/* Atom submitted with JOB_CHAIN_FLAG bit set in JS_CONFIG_NEXT register, helps ++ * to disambiguate short-running job chains during soft/hard stopping of jobs ++ */ ++#define KBASE_KATOM_FLAGS_JOBCHAIN (1<<3) ++/* Atom has been previously hard-stopped. */ ++#define KBASE_KATOM_FLAG_BEEN_HARD_STOPPED (1<<4) ++/* Atom has caused us to enter disjoint state */ ++#define KBASE_KATOM_FLAG_IN_DISJOINT (1<<5) ++/* Atom blocked on cross-slot dependency */ ++#define KBASE_KATOM_FLAG_X_DEP_BLOCKED (1<<7) ++/* Atom has fail dependency on cross-slot dependency */ ++#define KBASE_KATOM_FLAG_FAIL_BLOCKER (1<<8) ++/* Atom is currently in the list of atoms blocked on cross-slot dependencies */ ++#define KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST (1<<9) ++/* Atom requires GPU to be in protected mode */ ++#define KBASE_KATOM_FLAG_PROTECTED (1<<11) ++/* Atom has been stored in runnable_tree */ ++#define KBASE_KATOM_FLAG_JSCTX_IN_TREE (1<<12) ++/* Atom is waiting for L2 caches to power up in order to enter protected mode */ ++#define KBASE_KATOM_FLAG_HOLDING_L2_REF_PROT (1<<13) + -+ items = sscanf(buf, "%llx %llx %llx", -+ &new_core_mask[0], &new_core_mask[1], -+ &new_core_mask[2]); ++/* SW related flags about types of JS_COMMAND action ++ * NOTE: These must be masked off by JS_COMMAND_MASK ++ */ + -+ if (items != 1 && items != 3) { -+ dev_err(kbdev->dev, "Couldn't process core mask write operation.\n" -+ "Use format \n" -+ "or \n"); -+ err = -EINVAL; -+ goto end; -+ } ++/* This command causes a disjoint event */ ++#define JS_COMMAND_SW_CAUSES_DISJOINT 0x100 + -+ if (items == 1) -+ new_core_mask[1] = new_core_mask[2] = new_core_mask[0]; ++/* Bitmask of all SW related flags */ ++#define JS_COMMAND_SW_BITS (JS_COMMAND_SW_CAUSES_DISJOINT) + -+ mutex_lock(&kbdev->pm.lock); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++#if (JS_COMMAND_SW_BITS & JS_COMMAND_MASK) ++#error "JS_COMMAND_SW_BITS not masked off by JS_COMMAND_MASK." \ ++ "Must update JS_COMMAND_SW_<..> bitmasks" ++#endif + -+ shader_present = kbdev->gpu_props.props.raw_props.shader_present; -+ group0_core_mask = kbdev->gpu_props.props.coherency_info.group[0].core_mask; ++/* Soft-stop command that causes a Disjoint event. This of course isn't ++ * entirely masked off by JS_COMMAND_MASK ++ */ ++#define JS_COMMAND_SOFT_STOP_WITH_SW_DISJOINT \ ++ (JS_COMMAND_SW_CAUSES_DISJOINT | JS_COMMAND_SOFT_STOP) + -+ for (i = 0; i < 3; ++i) { -+ if ((new_core_mask[i] & shader_present) != new_core_mask[i]) { -+ dev_err(dev, "Invalid core mask 0x%llX for JS %d: Includes non-existent cores (present = 0x%llX)", -+ new_core_mask[i], i, shader_present); -+ err = -EINVAL; -+ goto unlock; ++#define KBASEP_ATOM_ID_INVALID BASE_JD_ATOM_COUNT + -+ } else if (!(new_core_mask[i] & shader_present & kbdev->pm.backend.ca_cores_enabled)) { -+ dev_err(dev, "Invalid core mask 0x%llX for JS %d: No intersection with currently available cores (present = 0x%llX, CA enabled = 0x%llX\n", -+ new_core_mask[i], i, -+ kbdev->gpu_props.props.raw_props.shader_present, -+ kbdev->pm.backend.ca_cores_enabled); -+ err = -EINVAL; -+ goto unlock; ++/* Serialize atoms within a slot (ie only one atom per job slot) */ ++#define KBASE_SERIALIZE_INTRA_SLOT (1 << 0) ++/* Serialize atoms between slots (ie only one job slot running at any time) */ ++#define KBASE_SERIALIZE_INTER_SLOT (1 << 1) ++/* Reset the GPU after each atom completion */ ++#define KBASE_SERIALIZE_RESET (1 << 2) + -+ } else if (!(new_core_mask[i] & group0_core_mask)) { -+ dev_err(dev, "Invalid core mask 0x%llX for JS %d: No intersection with group 0 core mask 0x%llX\n", -+ new_core_mask[i], i, group0_core_mask); -+ err = -EINVAL; -+ goto unlock; -+ } -+ } ++/** ++ * enum kbase_timeout_selector - The choice of which timeout to get scaled ++ * using the lowest GPU frequency. ++ * @MMU_AS_INACTIVE_WAIT_TIMEOUT: Maximum waiting time in ms for the completion ++ * of a MMU operation ++ * @JM_DEFAULT_JS_FREE_TIMEOUT: Maximum timeout to wait for JS_COMMAND_NEXT ++ * to be updated on HW side so a Job Slot is ++ * considered free. ++ * @KBASE_TIMEOUT_SELECTOR_COUNT: Number of timeout selectors. Must be last in ++ * the enum. ++ */ ++enum kbase_timeout_selector { ++ MMU_AS_INACTIVE_WAIT_TIMEOUT, ++ JM_DEFAULT_JS_FREE_TIMEOUT, + -+ if (kbdev->pm.debug_core_mask[0] != new_core_mask[0] || -+ kbdev->pm.debug_core_mask[1] != -+ new_core_mask[1] || -+ kbdev->pm.debug_core_mask[2] != -+ new_core_mask[2]) { ++ /* Must be the last in the enum */ ++ KBASE_TIMEOUT_SELECTOR_COUNT ++}; + -+ kbase_pm_set_debug_core_mask(kbdev, new_core_mask[0], -+ new_core_mask[1], new_core_mask[2]); -+ } ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++/** ++ * struct base_job_fault_event - keeps track of the atom which faulted or which ++ * completed after the faulty atom but before the ++ * debug data for faulty atom was dumped. ++ * ++ * @event_code: event code for the atom, should != BASE_JD_EVENT_DONE for ++ * the atom which faulted. ++ * @katom: pointer to the atom for which job fault occurred or which ++ * completed after the faulty atom. ++ * @job_fault_work: work item, queued only for the faulty atom, which waits for ++ * the dumping to get completed and then does the bottom half ++ * of job done for the atoms which followed the faulty atom. ++ * @head: List head used to store the atom in the global list of ++ * faulty atoms or context specific list of atoms which got ++ * completed during the dump. ++ * @reg_offset: offset of the register to be dumped next, only applicable ++ * for the faulty atom. ++ */ ++struct base_job_fault_event { + -+unlock: -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kbdev->pm.lock); -+end: -+ return err; -+} ++ u32 event_code; ++ struct kbase_jd_atom *katom; ++ struct work_struct job_fault_work; ++ struct list_head head; ++ int reg_offset; ++}; ++#endif + -+/* -+ * The sysfs file core_mask. -+ * -+ * This is used to restrict shader core availability for debugging purposes. -+ * Reading it will show the current core mask and the mask of cores available. -+ * Writing to it will set the current core mask. ++/** ++ * struct kbase_jd_atom_dependency - Contains the dependency info for an atom. ++ * @atom: pointer to the dependee atom. ++ * @dep_type: type of dependency on the dependee @atom, i.e. order or data ++ * dependency. BASE_JD_DEP_TYPE_INVALID indicates no dependency. + */ -+static DEVICE_ATTR(core_mask, S_IRUGO | S_IWUSR, show_core_mask, set_core_mask); ++struct kbase_jd_atom_dependency { ++ struct kbase_jd_atom *atom; ++ u8 dep_type; ++}; + -+#if !MALI_USE_CSF +/** -+ * set_soft_job_timeout - Store callback for the soft_job_timeout sysfs -+ * file. -+ * -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The value written to the sysfs file. -+ * @count: The number of bytes to write to the sysfs file. -+ * -+ * This allows setting the timeout for software jobs. Waiting soft event wait -+ * jobs will be cancelled after this period expires, while soft fence wait jobs -+ * will print debug information if the fence debug feature is enabled. -+ * -+ * This is expressed in milliseconds. ++ * kbase_jd_katom_dep_atom - Retrieves a read-only reference to the ++ * dependee atom. ++ * @dep: pointer to the dependency info structure. + * -+ * Return: count if the function succeeded. An error code on failure. ++ * Return: readonly reference to dependee atom. + */ -+static ssize_t set_soft_job_timeout(struct device *dev, -+ struct device_attribute *attr, -+ const char *buf, size_t count) ++static inline const struct kbase_jd_atom * ++kbase_jd_katom_dep_atom(const struct kbase_jd_atom_dependency *dep) +{ -+ struct kbase_device *kbdev; -+ int soft_job_timeout_ms; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; -+ -+ if ((kstrtoint(buf, 0, &soft_job_timeout_ms) != 0) || -+ (soft_job_timeout_ms <= 0)) -+ return -EINVAL; -+ -+ atomic_set(&kbdev->js_data.soft_job_timeout_ms, -+ soft_job_timeout_ms); -+ -+ return count; ++ return (const struct kbase_jd_atom *)(dep->atom); +} + +/** -+ * show_soft_job_timeout - Show callback for the soft_job_timeout sysfs -+ * file. -+ * -+ * This will return the timeout for the software jobs. ++ * kbase_jd_katom_dep_type - Retrieves the dependency type info + * -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer for the sysfs file contents. ++ * @dep: pointer to the dependency info structure. + * -+ * Return: The number of bytes output to buf. ++ * Return: the type of dependency there is on the dependee atom. + */ -+static ssize_t show_soft_job_timeout(struct device *dev, -+ struct device_attribute *attr, -+ char * const buf) ++static inline u8 kbase_jd_katom_dep_type( ++ const struct kbase_jd_atom_dependency *dep) +{ -+ struct kbase_device *kbdev; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; -+ -+ return scnprintf(buf, PAGE_SIZE, "%i\n", -+ atomic_read(&kbdev->js_data.soft_job_timeout_ms)); ++ return dep->dep_type; +} + -+static DEVICE_ATTR(soft_job_timeout, S_IRUGO | S_IWUSR, -+ show_soft_job_timeout, set_soft_job_timeout); -+ -+static u32 timeout_ms_to_ticks(struct kbase_device *kbdev, long timeout_ms, -+ int default_ticks, u32 old_ticks) ++/** ++ * kbase_jd_katom_dep_set - sets up the dependency info structure ++ * as per the values passed. ++ * @const_dep: pointer to the dependency info structure to be setup. ++ * @a: pointer to the dependee atom. ++ * @type: type of dependency there is on the dependee atom. ++ */ ++static inline void kbase_jd_katom_dep_set( ++ const struct kbase_jd_atom_dependency *const_dep, ++ struct kbase_jd_atom *a, u8 type) +{ -+ if (timeout_ms > 0) { -+ u64 ticks = timeout_ms * 1000000ULL; -+ do_div(ticks, kbdev->js_data.scheduling_period_ns); -+ if (!ticks) -+ return 1; -+ return ticks; -+ } else if (timeout_ms < 0) { -+ return default_ticks; -+ } else { -+ return old_ticks; -+ } ++ struct kbase_jd_atom_dependency *dep; ++ ++ dep = (struct kbase_jd_atom_dependency *)const_dep; ++ ++ dep->atom = a; ++ dep->dep_type = type; +} + +/** -+ * set_js_timeouts - Store callback for the js_timeouts sysfs file. -+ * -+ * This function is called to get the contents of the js_timeouts sysfs -+ * file. This file contains five values separated by whitespace. The values -+ * are basically the same as %JS_SOFT_STOP_TICKS, %JS_HARD_STOP_TICKS_SS, -+ * %JS_HARD_STOP_TICKS_DUMPING, %JS_RESET_TICKS_SS, %JS_RESET_TICKS_DUMPING -+ * configuration values (in that order), with the difference that the js_timeout -+ * values are expressed in MILLISECONDS. -+ * -+ * The js_timeouts sysfile file allows the current values in -+ * use by the job scheduler to get override. Note that a value needs to -+ * be other than 0 for it to override the current job scheduler value. -+ * -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes to write to the sysfs file ++ * kbase_jd_katom_dep_clear - resets the dependency info structure + * -+ * Return: @count if the function succeeded. An error code on failure. ++ * @const_dep: pointer to the dependency info structure to be setup. + */ -+static ssize_t set_js_timeouts(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) ++static inline void kbase_jd_katom_dep_clear( ++ const struct kbase_jd_atom_dependency *const_dep) +{ -+ struct kbase_device *kbdev; -+ int items; -+ long js_soft_stop_ms; -+ long js_soft_stop_ms_cl; -+ long js_hard_stop_ms_ss; -+ long js_hard_stop_ms_cl; -+ long js_hard_stop_ms_dumping; -+ long js_reset_ms_ss; -+ long js_reset_ms_cl; -+ long js_reset_ms_dumping; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; -+ -+ items = sscanf(buf, "%ld %ld %ld %ld %ld %ld %ld %ld", -+ &js_soft_stop_ms, &js_soft_stop_ms_cl, -+ &js_hard_stop_ms_ss, &js_hard_stop_ms_cl, -+ &js_hard_stop_ms_dumping, &js_reset_ms_ss, -+ &js_reset_ms_cl, &js_reset_ms_dumping); -+ -+ if (items == 8) { -+ struct kbasep_js_device_data *js_data = &kbdev->js_data; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ -+#define UPDATE_TIMEOUT(ticks_name, ms_name, default) do {\ -+ js_data->ticks_name = timeout_ms_to_ticks(kbdev, ms_name, \ -+ default, js_data->ticks_name); \ -+ dev_dbg(kbdev->dev, "Overriding " #ticks_name \ -+ " with %lu ticks (%lu ms)\n", \ -+ (unsigned long)js_data->ticks_name, \ -+ ms_name); \ -+ } while (0) -+ -+ UPDATE_TIMEOUT(soft_stop_ticks, js_soft_stop_ms, -+ DEFAULT_JS_SOFT_STOP_TICKS); -+ UPDATE_TIMEOUT(soft_stop_ticks_cl, js_soft_stop_ms_cl, -+ DEFAULT_JS_SOFT_STOP_TICKS_CL); -+ UPDATE_TIMEOUT(hard_stop_ticks_ss, js_hard_stop_ms_ss, -+ DEFAULT_JS_HARD_STOP_TICKS_SS); -+ UPDATE_TIMEOUT(hard_stop_ticks_cl, js_hard_stop_ms_cl, -+ DEFAULT_JS_HARD_STOP_TICKS_CL); -+ UPDATE_TIMEOUT(hard_stop_ticks_dumping, -+ js_hard_stop_ms_dumping, -+ DEFAULT_JS_HARD_STOP_TICKS_DUMPING); -+ UPDATE_TIMEOUT(gpu_reset_ticks_ss, js_reset_ms_ss, -+ DEFAULT_JS_RESET_TICKS_SS); -+ UPDATE_TIMEOUT(gpu_reset_ticks_cl, js_reset_ms_cl, -+ DEFAULT_JS_RESET_TICKS_CL); -+ UPDATE_TIMEOUT(gpu_reset_ticks_dumping, js_reset_ms_dumping, -+ DEFAULT_JS_RESET_TICKS_DUMPING); -+ -+ kbase_js_set_timeouts(kbdev); -+ -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ struct kbase_jd_atom_dependency *dep; + -+ return count; -+ } ++ dep = (struct kbase_jd_atom_dependency *)const_dep; + -+ dev_err(kbdev->dev, "Couldn't process js_timeouts write operation.\n" -+ "Use format \n" -+ "Write 0 for no change, -1 to restore default timeout\n"); -+ return -EINVAL; ++ dep->atom = NULL; ++ dep->dep_type = BASE_JD_DEP_TYPE_INVALID; +} + -+static unsigned long get_js_timeout_in_ms( -+ u32 scheduling_period_ns, -+ u32 ticks) -+{ -+ u64 ms = (u64)ticks * scheduling_period_ns; ++/** ++ * enum kbase_atom_gpu_rb_state - The state of an atom, pertinent after it ++ * becomes runnable, with respect to job slot ++ * ringbuffer/fifo. ++ * @KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB: Atom not currently present in slot fifo, ++ * which implies that either atom has not become ++ * runnable due to dependency or has completed ++ * the execution on GPU. ++ * @KBASE_ATOM_GPU_RB_WAITING_BLOCKED: Atom has been added to slot fifo but is ++ * blocked due to cross slot dependency, ++ * can't be submitted to GPU. ++ * @KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV: Atom has been added to slot ++ * fifo but is waiting for the completion of ++ * previously added atoms in current & other ++ * slots, as their protected mode requirements ++ * do not match with the current atom. ++ * @KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION: Atom is in slot fifo ++ * and is waiting for completion of protected ++ * mode transition, needed before the atom is ++ * submitted to GPU. ++ * @KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE: Atom is in slot fifo but is ++ * waiting for the cores, which are needed to ++ * execute the job chain represented by the atom, ++ * to become available ++ * @KBASE_ATOM_GPU_RB_READY: Atom is in slot fifo and can be submitted to ++ * GPU. ++ * @KBASE_ATOM_GPU_RB_SUBMITTED: Atom is in slot fifo and has been submitted ++ * to GPU. ++ * @KBASE_ATOM_GPU_RB_RETURN_TO_JS: Atom must be returned to JS due to some ++ * failure, but only after the previously added ++ * atoms in fifo have completed or have also ++ * been returned to JS. ++ */ ++enum kbase_atom_gpu_rb_state { ++ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB, ++ KBASE_ATOM_GPU_RB_WAITING_BLOCKED, ++ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV, ++ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION, ++ KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE, ++ KBASE_ATOM_GPU_RB_READY, ++ KBASE_ATOM_GPU_RB_SUBMITTED, ++ KBASE_ATOM_GPU_RB_RETURN_TO_JS = -1 ++}; + -+ do_div(ms, 1000000UL); -+ return ms; -+} ++/** ++ * enum kbase_atom_enter_protected_state - The state of an atom with respect to ++ * the preparation for GPU's entry into protected mode, ++ * becomes pertinent only after atom's state with respect ++ * to slot ringbuffer is ++ * KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION ++ * @KBASE_ATOM_ENTER_PROTECTED_CHECK: Starting state. Check if there are any ++ * atoms currently submitted to GPU and protected mode ++ * transition is not already in progress. ++ * @KBASE_ATOM_ENTER_PROTECTED_HWCNT: Wait for hardware counter context to ++ * become disabled before entry into protected mode. ++ * @KBASE_ATOM_ENTER_PROTECTED_IDLE_L2: Wait for the L2 to become idle in ++ * preparation for the coherency change. L2 shall be ++ * powered down and GPU shall come out of fully ++ * coherent mode before entering protected mode. ++ * @KBASE_ATOM_ENTER_PROTECTED_SET_COHERENCY: Prepare coherency change; ++ * for BASE_HW_ISSUE_TGOX_R1_1234 also request L2 power on ++ * so that coherency register contains correct value when ++ * GPU enters protected mode. ++ * @KBASE_ATOM_ENTER_PROTECTED_FINISHED: End state; for ++ * BASE_HW_ISSUE_TGOX_R1_1234 check ++ * that L2 is powered up and switch GPU to protected mode. ++ */ ++enum kbase_atom_enter_protected_state { ++ /* ++ * NOTE: The integer value of this must match ++ * KBASE_ATOM_EXIT_PROTECTED_CHECK. ++ */ ++ KBASE_ATOM_ENTER_PROTECTED_CHECK = 0, ++ KBASE_ATOM_ENTER_PROTECTED_HWCNT, ++ KBASE_ATOM_ENTER_PROTECTED_IDLE_L2, ++ KBASE_ATOM_ENTER_PROTECTED_SET_COHERENCY, ++ KBASE_ATOM_ENTER_PROTECTED_FINISHED, ++}; + +/** -+ * show_js_timeouts - Show callback for the js_timeouts sysfs file. -+ * -+ * This function is called to get the contents of the js_timeouts sysfs -+ * file. It returns the last set values written to the js_timeouts sysfs file. -+ * If the file didn't get written yet, the values will be current setting in -+ * use. -+ * @dev: The device this sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The output buffer for the sysfs file contents -+ * -+ * Return: The number of bytes output to @buf. ++ * enum kbase_atom_exit_protected_state - The state of an atom with respect to ++ * the preparation for GPU's exit from protected mode, ++ * becomes pertinent only after atom's state with respect ++ * to slot ngbuffer is ++ * KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION ++ * @KBASE_ATOM_EXIT_PROTECTED_CHECK: Starting state. Check if there are any ++ * atoms currently submitted to GPU and protected mode ++ * transition is not already in progress. ++ * @KBASE_ATOM_EXIT_PROTECTED_IDLE_L2: Wait for the L2 to become idle in ++ * preparation for the reset, as exiting protected mode ++ * requires a reset. ++ * @KBASE_ATOM_EXIT_PROTECTED_RESET: Issue the reset to trigger exit from ++ * protected mode ++ * @KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT: End state, Wait for the reset to ++ * complete + */ -+static ssize_t show_js_timeouts(struct device *dev, struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ ssize_t ret; -+ unsigned long js_soft_stop_ms; -+ unsigned long js_soft_stop_ms_cl; -+ unsigned long js_hard_stop_ms_ss; -+ unsigned long js_hard_stop_ms_cl; -+ unsigned long js_hard_stop_ms_dumping; -+ unsigned long js_reset_ms_ss; -+ unsigned long js_reset_ms_cl; -+ unsigned long js_reset_ms_dumping; -+ u32 scheduling_period_ns; ++enum kbase_atom_exit_protected_state { ++ /* ++ * NOTE: The integer value of this must match ++ * KBASE_ATOM_ENTER_PROTECTED_CHECK. ++ */ ++ KBASE_ATOM_EXIT_PROTECTED_CHECK = 0, ++ KBASE_ATOM_EXIT_PROTECTED_IDLE_L2, ++ KBASE_ATOM_EXIT_PROTECTED_RESET, ++ KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT, ++}; + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++/** ++ * struct kbase_jd_atom - object representing the atom, containing the complete ++ * state and attributes of an atom. ++ * @work: work item for the bottom half processing of the atom, ++ * by JD or JS, after it got executed on GPU or the ++ * input fence got signaled ++ * @start_timestamp: time at which the atom was submitted to the GPU, by ++ * updating the JS_HEAD_NEXTn register. ++ * @udata: copy of the user data sent for the atom in ++ * base_jd_submit. ++ * @kctx: Pointer to the base context with which the atom is ++ * associated. ++ * @dep_head: Array of 2 list heads, pointing to the two list of ++ * atoms ++ * which are blocked due to dependency on this atom. ++ * @dep_item: Array of 2 list heads, used to store the atom in the ++ * list of other atoms depending on the same dependee ++ * atom. ++ * @dep: Array containing the dependency info for the 2 atoms ++ * on which the atom depends upon. ++ * @jd_item: List head used during job dispatch job_done ++ * processing - as dependencies may not be entirely ++ * resolved at this point, ++ * we need to use a separate list head. ++ * @in_jd_list: flag set to true if atom's @jd_item is currently on ++ * a list, prevents atom being processed twice. ++ * @jit_ids: Zero-terminated array of IDs of just-in-time memory ++ * allocations written to by the atom. When the atom ++ * completes, the value stored at the ++ * &struct_base_jit_alloc_info.heap_info_gpu_addr of ++ * each allocation is read in order to enforce an ++ * overall physical memory usage limit. ++ * @nr_extres: number of external resources referenced by the atom. ++ * @extres: Pointer to @nr_extres VA regions containing the external ++ * resource allocation and other information. ++ * @nr_extres external resources referenced by the atom. ++ * @device_nr: indicates the coregroup with which the atom is ++ * associated, when ++ * BASE_JD_REQ_SPECIFIC_COHERENT_GROUP specified. ++ * @jc: GPU address of the job-chain. ++ * @softjob_data: Copy of data read from the user space buffer that @jc ++ * points to. ++ * @fence: Stores either an input or output sync fence, ++ * depending on soft-job type ++ * @sync_waiter: Pointer to the sync fence waiter structure passed to ++ * the callback function on signaling of the input ++ * fence. ++ * @dma_fence: object containing pointers to both input & output ++ * fences and other related members used for explicit ++ * sync through soft jobs and for the implicit ++ * synchronization required on access to external ++ * resources. ++ * @dma_fence.fence_in: Points to the dma-buf input fence for this atom. ++ * The atom would complete only after the fence is ++ * signaled. ++ * @dma_fence.fence: Points to the dma-buf output fence for this atom. ++ * @dma_fence.fence_cb: The object that is passed at the time of adding the ++ * callback that gets invoked when @dma_fence.fence_in ++ * is signaled. ++ * @dma_fence.fence_cb_added: Flag to keep a track if the callback was successfully ++ * added for @dma_fence.fence_in, which is supposed to be ++ * invoked on the signaling of fence. ++ * @dma_fence.context: The dma-buf fence context number for this atom. A ++ * unique context number is allocated to each katom in ++ * the context on context creation. ++ * @dma_fence.seqno: The dma-buf fence sequence number for this atom. This ++ * is increased every time this katom uses dma-buf fence ++ * @event_code: Event code for the job chain represented by the atom, ++ * both HW and low-level SW events are represented by ++ * event codes. ++ * @core_req: bitmask of BASE_JD_REQ_* flags specifying either ++ * Hw or Sw requirements for the job chain represented ++ * by the atom. ++ * @ticks: Number of scheduling ticks for which atom has been ++ * running on the GPU. ++ * @sched_priority: Priority of the atom for Job scheduling, as per the ++ * KBASE_JS_ATOM_SCHED_PRIO_*. ++ * @completed: Wait queue to wait upon for the completion of atom. ++ * @status: Indicates at high level at what stage the atom is in, ++ * as per KBASE_JD_ATOM_STATE_*, that whether it is not ++ * in use or its queued in JD or given to JS or ++ * submitted to Hw or it completed the execution on Hw. ++ * @work_id: used for GPU tracepoints, its a snapshot of the ++ * 'work_id' counter in kbase_jd_context which is ++ * incremented on every call to base_jd_submit. ++ * @slot_nr: Job slot chosen for the atom. ++ * @atom_flags: bitmask of KBASE_KATOM_FLAG* flags capturing the ++ * excat low level state of the atom. ++ * @gpu_rb_state: bitmnask of KBASE_ATOM_GPU_RB_* flags, precisely ++ * tracking atom's state after it has entered ++ * Job scheduler on becoming runnable. Atom ++ * could be blocked due to cross slot dependency ++ * or waiting for the shader cores to become available ++ * or waiting for protected mode transitions to ++ * complete. ++ * @need_cache_flush_cores_retained: flag indicating that manual flush of GPU ++ * cache is needed for the atom and the shader cores ++ * used for atom have been kept on. ++ * @blocked: flag indicating that atom's resubmission to GPU is ++ * blocked till the work item is scheduled to return the ++ * atom to JS. ++ * @seq_nr: user-space sequence number, to order atoms in some ++ * temporal order ++ * @pre_dep: Pointer to atom that this atom has same-slot ++ * dependency on ++ * @post_dep: Pointer to atom that has same-slot dependency on ++ * this atom ++ * @x_pre_dep: Pointer to atom that this atom has cross-slot ++ * dependency on ++ * @x_post_dep: Pointer to atom that has cross-slot dependency on ++ * this atom ++ * @flush_id: The GPU's flush count recorded at the time of ++ * submission, ++ * used for the cache flush optimization ++ * @fault_event: Info for dumping the debug data on Job fault. ++ * @queue: List head used for 4 different purposes : ++ * Adds atom to the list of dma-buf fence waiting atoms. ++ * Adds atom to the list of atoms blocked due to cross ++ * slot dependency. ++ * Adds atom to the list of softjob atoms for which JIT ++ * allocation has been deferred ++ * Adds atom to the list of softjob atoms waiting for ++ * the signaling of fence. ++ * @jit_node: Used to keep track of all JIT free/alloc jobs in ++ * submission order ++ * @jit_blocked: Flag indicating that JIT allocation requested through ++ * softjob atom will be reattempted after the impending ++ * free of other active JIT allocations. ++ * @will_fail_event_code: If non-zero, this indicates that the atom will fail ++ * with the set event_code when the atom is processed. ++ * Used for special handling of atoms, which have a data ++ * dependency on the failed atoms. ++ * @protected_state: State of the atom, as per ++ * KBASE_ATOM_(ENTER|EXIT)_PROTECTED_*, ++ * when transitioning into or out of protected mode. ++ * Atom will be either entering or exiting the ++ * protected mode. ++ * @protected_state.enter: entering the protected mode. ++ * @protected_state.exit: exiting the protected mode. ++ * @runnable_tree_node: The node added to context's job slot specific rb tree ++ * when the atom becomes runnable. ++ * @age: Age of atom relative to other atoms in the context, ++ * is snapshot of the age_count counter in kbase ++ * context. ++ * @jobslot: Job slot to use when BASE_JD_REQ_JOB_SLOT is specified. ++ * @renderpass_id:Renderpass identifier used to associate an atom that has ++ * BASE_JD_REQ_START_RENDERPASS set in its core requirements ++ * with an atom that has BASE_JD_REQ_END_RENDERPASS set. ++ * @jc_fragment: Set of GPU fragment job chains ++ */ ++struct kbase_jd_atom { ++ struct work_struct work; ++ ktime_t start_timestamp; + -+ scheduling_period_ns = kbdev->js_data.scheduling_period_ns; ++ struct base_jd_udata udata; ++ struct kbase_context *kctx; + -+#define GET_TIMEOUT(name) get_js_timeout_in_ms(\ -+ scheduling_period_ns, \ -+ kbdev->js_data.name) ++ struct list_head dep_head[2]; ++ struct list_head dep_item[2]; ++ const struct kbase_jd_atom_dependency dep[2]; ++ struct list_head jd_item; ++ bool in_jd_list; + -+ js_soft_stop_ms = GET_TIMEOUT(soft_stop_ticks); -+ js_soft_stop_ms_cl = GET_TIMEOUT(soft_stop_ticks_cl); -+ js_hard_stop_ms_ss = GET_TIMEOUT(hard_stop_ticks_ss); -+ js_hard_stop_ms_cl = GET_TIMEOUT(hard_stop_ticks_cl); -+ js_hard_stop_ms_dumping = GET_TIMEOUT(hard_stop_ticks_dumping); -+ js_reset_ms_ss = GET_TIMEOUT(gpu_reset_ticks_ss); -+ js_reset_ms_cl = GET_TIMEOUT(gpu_reset_ticks_cl); -+ js_reset_ms_dumping = GET_TIMEOUT(gpu_reset_ticks_dumping); ++#if MALI_JIT_PRESSURE_LIMIT_BASE ++ u8 jit_ids[2]; ++#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ + -+#undef GET_TIMEOUT ++ u16 nr_extres; ++ struct kbase_va_region **extres; + -+ ret = scnprintf(buf, PAGE_SIZE, "%lu %lu %lu %lu %lu %lu %lu %lu\n", -+ js_soft_stop_ms, js_soft_stop_ms_cl, -+ js_hard_stop_ms_ss, js_hard_stop_ms_cl, -+ js_hard_stop_ms_dumping, js_reset_ms_ss, -+ js_reset_ms_cl, js_reset_ms_dumping); ++ u32 device_nr; ++ u64 jc; ++ void *softjob_data; ++#if IS_ENABLED(CONFIG_SYNC_FILE) ++ struct { ++ /* Use the functions/API defined in mali_kbase_fence.h to ++ * when working with this sub struct ++ */ ++#if IS_ENABLED(CONFIG_SYNC_FILE) ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++ struct fence *fence_in; ++#else ++ struct dma_fence *fence_in; ++#endif ++#endif ++ /* This points to the dma-buf output fence for this atom. If ++ * this is NULL then there is no fence for this atom and the ++ * following fields related to dma_fence may have invalid data. ++ * ++ * The context and seqno fields contain the details for this ++ * fence. ++ * ++ * This fence is signaled when the katom is completed, ++ * regardless of the event_code of the katom (signal also on ++ * failure). ++ */ ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++ struct fence *fence; ++#else ++ struct dma_fence *fence; ++#endif + -+ if (ret >= PAGE_SIZE) { -+ buf[PAGE_SIZE - 2] = '\n'; -+ buf[PAGE_SIZE - 1] = '\0'; -+ ret = PAGE_SIZE - 1; -+ } ++ /* This is the callback object that is registered for the fence_in. ++ * The callback is invoked when the fence_in is signaled. ++ */ ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++ struct fence_cb fence_cb; ++#else ++ struct dma_fence_cb fence_cb; ++#endif ++ bool fence_cb_added; + -+ return ret; -+} ++ unsigned int context; ++ atomic_t seqno; ++ } dma_fence; ++#endif /* CONFIG_SYNC_FILE */ + -+/* -+ * The sysfs file js_timeouts. -+ * -+ * This is used to override the current job scheduler values for -+ * JS_STOP_STOP_TICKS_SS -+ * JS_STOP_STOP_TICKS_CL -+ * JS_HARD_STOP_TICKS_SS -+ * JS_HARD_STOP_TICKS_CL -+ * JS_HARD_STOP_TICKS_DUMPING -+ * JS_RESET_TICKS_SS -+ * JS_RESET_TICKS_CL -+ * JS_RESET_TICKS_DUMPING. -+ */ -+static DEVICE_ATTR(js_timeouts, S_IRUGO | S_IWUSR, show_js_timeouts, set_js_timeouts); ++ /* Note: refer to kbasep_js_atom_retained_state, which will take a copy ++ * of some of the following members ++ */ ++ enum base_jd_event_code event_code; ++ base_jd_core_req core_req; ++ u8 jobslot; ++ u8 renderpass_id; ++ struct base_jd_fragment jc_fragment; + -+static u32 get_new_js_timeout( -+ u32 old_period, -+ u32 old_ticks, -+ u32 new_scheduling_period_ns) -+{ -+ u64 ticks = (u64)old_period * (u64)old_ticks; -+ do_div(ticks, new_scheduling_period_ns); -+ return ticks?ticks:1; -+} ++ u32 ticks; ++ int sched_priority; + -+/** -+ * set_js_scheduling_period - Store callback for the js_scheduling_period sysfs -+ * file -+ * @dev: The device the sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes to write to the sysfs file -+ * -+ * This function is called when the js_scheduling_period sysfs file is written -+ * to. It checks the data written, and if valid updates the js_scheduling_period -+ * value -+ * -+ * Return: @count if the function succeeded. An error code on failure. -+ */ -+static ssize_t set_js_scheduling_period(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ int ret; -+ unsigned int js_scheduling_period; -+ u32 new_scheduling_period_ns; -+ u32 old_period; -+ struct kbasep_js_device_data *js_data; -+ unsigned long flags; ++ wait_queue_head_t completed; ++ enum kbase_jd_atom_state status; ++#if IS_ENABLED(CONFIG_GPU_TRACEPOINTS) ++ int work_id; ++#endif ++ unsigned int slot_nr; + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ u32 atom_flags; + -+ js_data = &kbdev->js_data; ++ enum kbase_atom_gpu_rb_state gpu_rb_state; + -+ ret = kstrtouint(buf, 0, &js_scheduling_period); -+ if (ret || !js_scheduling_period) { -+ dev_err(kbdev->dev, "Couldn't process js_scheduling_period write operation.\n" -+ "Use format \n"); -+ return -EINVAL; -+ } ++ bool need_cache_flush_cores_retained; + -+ new_scheduling_period_ns = js_scheduling_period * 1000000; ++ atomic_t blocked; + -+ /* Update scheduling timeouts */ -+ mutex_lock(&js_data->runpool_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ u64 seq_nr; + -+ /* If no contexts have been scheduled since js_timeouts was last written -+ * to, the new timeouts might not have been latched yet. So check if an -+ * update is pending and use the new values if necessary. */ ++ struct kbase_jd_atom *pre_dep; ++ struct kbase_jd_atom *post_dep; + -+ /* Use previous 'new' scheduling period as a base if present. */ -+ old_period = js_data->scheduling_period_ns; ++ struct kbase_jd_atom *x_pre_dep; ++ struct kbase_jd_atom *x_post_dep; + -+#define SET_TIMEOUT(name) \ -+ (js_data->name = get_new_js_timeout(\ -+ old_period, \ -+ kbdev->js_data.name, \ -+ new_scheduling_period_ns)) ++ u32 flush_id; + -+ SET_TIMEOUT(soft_stop_ticks); -+ SET_TIMEOUT(soft_stop_ticks_cl); -+ SET_TIMEOUT(hard_stop_ticks_ss); -+ SET_TIMEOUT(hard_stop_ticks_cl); -+ SET_TIMEOUT(hard_stop_ticks_dumping); -+ SET_TIMEOUT(gpu_reset_ticks_ss); -+ SET_TIMEOUT(gpu_reset_ticks_cl); -+ SET_TIMEOUT(gpu_reset_ticks_dumping); ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ struct base_job_fault_event fault_event; ++#endif ++ struct list_head queue; + -+#undef SET_TIMEOUT ++ struct list_head jit_node; ++ bool jit_blocked; + -+ js_data->scheduling_period_ns = new_scheduling_period_ns; ++ enum base_jd_event_code will_fail_event_code; + -+ kbase_js_set_timeouts(kbdev); ++ union { ++ enum kbase_atom_enter_protected_state enter; ++ enum kbase_atom_exit_protected_state exit; ++ } protected_state; + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&js_data->runpool_mutex); ++ struct rb_node runnable_tree_node; + -+ dev_dbg(kbdev->dev, "JS scheduling period: %dms\n", -+ js_scheduling_period); ++ u32 age; ++}; + -+ return count; ++static inline bool kbase_jd_katom_is_protected( ++ const struct kbase_jd_atom *katom) ++{ ++ return (bool)(katom->atom_flags & KBASE_KATOM_FLAG_PROTECTED); +} + +/** -+ * show_js_scheduling_period - Show callback for the js_scheduling_period sysfs -+ * entry. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the GPU information. ++ * kbase_jd_atom_is_younger - query if one atom is younger by age than another + * -+ * This function is called to get the current period used for the JS scheduling -+ * period. ++ * @katom_a: the first atom ++ * @katom_b: the second atom + * -+ * Return: The number of bytes output to @buf. ++ * Return: true if the first atom is strictly younger than the second, ++ * false otherwise. + */ -+static ssize_t show_js_scheduling_period(struct device *dev, -+ struct device_attribute *attr, char * const buf) ++static inline bool kbase_jd_atom_is_younger(const struct kbase_jd_atom *katom_a, ++ const struct kbase_jd_atom *katom_b) +{ -+ struct kbase_device *kbdev; -+ u32 period; -+ ssize_t ret; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; -+ -+ period = kbdev->js_data.scheduling_period_ns; -+ -+ ret = scnprintf(buf, PAGE_SIZE, "%d\n", -+ period / 1000000); -+ -+ return ret; ++ return ((s32)(katom_a->age - katom_b->age) < 0); +} + -+static DEVICE_ATTR(js_scheduling_period, S_IRUGO | S_IWUSR, -+ show_js_scheduling_period, set_js_scheduling_period); -+ -+ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+static ssize_t set_js_softstop_always(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) ++/** ++ * kbase_jd_atom_is_earlier - Check whether the first atom has been submitted ++ * earlier than the second one ++ * ++ * @katom_a: the first atom ++ * @katom_b: the second atom ++ * ++ * Return: true if the first atom has been submitted earlier than the ++ * second atom. It is used to understand if an atom that is ready has been ++ * submitted earlier than the currently running atom, so that the currently ++ * running atom should be preempted to allow the ready atom to run. ++ */ ++static inline bool kbase_jd_atom_is_earlier(const struct kbase_jd_atom *katom_a, ++ const struct kbase_jd_atom *katom_b) +{ -+ struct kbase_device *kbdev; -+ int ret; -+ int softstop_always; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; -+ -+ ret = kstrtoint(buf, 0, &softstop_always); -+ if (ret || ((softstop_always != 0) && (softstop_always != 1))) { -+ dev_err(kbdev->dev, "Couldn't process js_softstop_always write operation.\n" -+ "Use format \n"); -+ return -EINVAL; -+ } ++ /* No seq_nr set? */ ++ if (!katom_a->seq_nr || !katom_b->seq_nr) ++ return false; + -+ kbdev->js_data.softstop_always = (bool) softstop_always; -+ dev_dbg(kbdev->dev, "Support for softstop on a single context: %s\n", -+ (kbdev->js_data.softstop_always) ? -+ "Enabled" : "Disabled"); -+ return count; ++ /* Efficiently handle the unlikely case of wrapping. ++ * The following code assumes that the delta between the sequence number ++ * of the two atoms is less than INT64_MAX. ++ * In the extremely unlikely case where the delta is higher, the comparison ++ * defaults for no preemption. ++ * The code also assumes that the conversion from unsigned to signed types ++ * works because the signed integers are 2's complement. ++ */ ++ return (s64)(katom_a->seq_nr - katom_b->seq_nr) < 0; +} + -+static ssize_t show_js_softstop_always(struct device *dev, -+ struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ ssize_t ret; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++/* ++ * Theory of operations: ++ * ++ * Atom objects are statically allocated within the context structure. ++ * ++ * Each atom is the head of two lists, one for the "left" set of dependencies, ++ * one for the "right" set. ++ */ + -+ ret = scnprintf(buf, PAGE_SIZE, "%d\n", kbdev->js_data.softstop_always); ++#define KBASE_JD_DEP_QUEUE_SIZE 256 + -+ if (ret >= PAGE_SIZE) { -+ buf[PAGE_SIZE - 2] = '\n'; -+ buf[PAGE_SIZE - 1] = '\0'; -+ ret = PAGE_SIZE - 1; -+ } ++/** ++ * enum kbase_jd_renderpass_state - State of a renderpass ++ * @KBASE_JD_RP_COMPLETE: Unused or completed renderpass. Can only transition to ++ * START. ++ * @KBASE_JD_RP_START: Renderpass making a first attempt at tiling. ++ * Can transition to PEND_OOM or COMPLETE. ++ * @KBASE_JD_RP_PEND_OOM: Renderpass whose first attempt at tiling used too much ++ * memory and has a soft-stop pending. Can transition to ++ * OOM or COMPLETE. ++ * @KBASE_JD_RP_OOM: Renderpass whose first attempt at tiling used too much ++ * memory and therefore switched to incremental ++ * rendering. The fragment job chain is forced to run. ++ * Can only transition to RETRY. ++ * @KBASE_JD_RP_RETRY: Renderpass making a second or subsequent attempt at ++ * tiling. Can transition to RETRY_PEND_OOM or COMPLETE. ++ * @KBASE_JD_RP_RETRY_PEND_OOM: Renderpass whose second or subsequent attempt at ++ * tiling used too much memory again and has a ++ * soft-stop pending. Can transition to RETRY_OOM ++ * or COMPLETE. ++ * @KBASE_JD_RP_RETRY_OOM: Renderpass whose second or subsequent attempt at ++ * tiling used too much memory again. The fragment job ++ * chain is forced to run. Can only transition to RETRY. ++ * ++ * A state machine is used to control incremental rendering. ++ */ ++enum kbase_jd_renderpass_state { ++ KBASE_JD_RP_COMPLETE, /* COMPLETE => START */ ++ KBASE_JD_RP_START, /* START => PEND_OOM or COMPLETE */ ++ KBASE_JD_RP_PEND_OOM, /* PEND_OOM => OOM or COMPLETE */ ++ KBASE_JD_RP_OOM, /* OOM => RETRY */ ++ KBASE_JD_RP_RETRY, /* RETRY => RETRY_PEND_OOM or COMPLETE */ ++ KBASE_JD_RP_RETRY_PEND_OOM, /* RETRY_PEND_OOM => RETRY_OOM or COMPLETE */ ++ KBASE_JD_RP_RETRY_OOM /* RETRY_OOM => RETRY */ ++}; + -+ return ret; -+} ++/** ++ * struct kbase_jd_renderpass - Data for a renderpass ++ * @state: Current state of the renderpass. If KBASE_JD_RP_COMPLETE then ++ * all other members are invalid. ++ * Both the job dispatcher context and hwaccess_lock must be ++ * locked to modify this so that it can be read with either ++ * (or both) locked. ++ * @start_katom: Address of the atom that is the start of a renderpass. ++ * Both the job dispatcher context and hwaccess_lock must be ++ * locked to modify this so that it can be read with either ++ * (or both) locked. ++ * @end_katom: Address of the atom that is the end of a renderpass, or NULL ++ * if that atom hasn't been added to the job scheduler yet. ++ * The job dispatcher context and hwaccess_lock must be ++ * locked to modify this so that it can be read with either ++ * (or both) locked. ++ * @oom_reg_list: A list of region structures which triggered out-of-memory. ++ * The hwaccess_lock must be locked to access this. ++ * ++ * Atoms tagged with BASE_JD_REQ_START_RENDERPASS or BASE_JD_REQ_END_RENDERPASS ++ * are associated with an object of this type, which is created and maintained ++ * by kbase to keep track of each renderpass. ++ */ ++struct kbase_jd_renderpass { ++ enum kbase_jd_renderpass_state state; ++ struct kbase_jd_atom *start_katom; ++ struct kbase_jd_atom *end_katom; ++ struct list_head oom_reg_list; ++}; + -+/* -+ * By default, soft-stops are disabled when only a single context is present. -+ * The ability to enable soft-stop when only a single context is present can be -+ * used for debug and unit-testing purposes. -+ * (see CL t6xx_stress_1 unit-test as an example whereby this feature is used.) ++/** ++ * struct kbase_jd_context - per context object encapsulating all the ++ * Job dispatcher related state. ++ * @lock: lock to serialize the updates made to the ++ * Job dispatcher state and kbase_jd_atom objects. ++ * @sched_info: Structure encapsulating all the Job scheduling ++ * info. ++ * @atoms: Array of the objects representing atoms, ++ * containing the complete state and attributes ++ * of an atom. ++ * @renderpasses: Array of renderpass state for incremental ++ * rendering, indexed by user-specified renderpass ++ * ID. ++ * @job_nr: Tracks the number of atoms being processed by the ++ * kbase. This includes atoms that are not tracked by ++ * scheduler: 'not ready to run' & 'dependency-only' ++ * jobs. ++ * @zero_jobs_wait: Waitq that reflects whether there are no jobs ++ * (including SW-only dependency jobs). This is set ++ * when no jobs are present on the ctx, and clear ++ * when there are jobs. ++ * This must be updated atomically with @job_nr. ++ * note: Job Dispatcher knows about more jobs than ++ * the Job Scheduler as it is unaware of jobs that ++ * are blocked on dependencies and SW-only dependency ++ * jobs. This waitq can be waited upon to find out ++ * when the context jobs are all done/cancelled ++ * (including those that might've been blocked ++ * on dependencies) - and so, whether it can be ++ * terminated. However, it should only be terminated ++ * once it is not present in the run-pool. ++ * Since the waitq is only set under @lock, ++ * the waiter should also briefly obtain and drop ++ * @lock to guarantee that the setter has completed ++ * its work on the kbase_context ++ * @job_done_wq: Workqueue to which the per atom work item is ++ * queued for bottom half processing when the ++ * atom completes ++ * execution on GPU or the input fence get signaled. ++ * @tb_lock: Lock to serialize the write access made to @tb to ++ * store the register access trace messages. ++ * @tb: Pointer to the Userspace accessible buffer storing ++ * the trace messages for register read/write ++ * accesses made by the Kbase. The buffer is filled ++ * in circular fashion. ++ * @tb_wrap_offset: Offset to the end location in the trace buffer, ++ * the write pointer is moved to the beginning on ++ * reaching this offset. ++ * @work_id: atomic variable used for GPU tracepoints, ++ * incremented on every call to base_jd_submit. ++ * @jit_atoms_head: A list of the just-in-time memory soft-jobs, both ++ * allocate & free, in submission order, protected ++ * by kbase_jd_context.lock. ++ * @jit_pending_alloc: A list of just-in-time memory allocation ++ * soft-jobs which will be reattempted after the ++ * impending free of other active allocations. ++ * @max_priority: Max priority level allowed for this context. + */ -+static DEVICE_ATTR(js_softstop_always, S_IRUGO | S_IWUSR, show_js_softstop_always, set_js_softstop_always); -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+#endif /* !MALI_USE_CSF */ ++struct kbase_jd_context { ++ struct mutex lock; ++ struct kbasep_js_kctx_info sched_info; ++ struct kbase_jd_atom atoms[BASE_JD_ATOM_COUNT]; ++ struct kbase_jd_renderpass renderpasses[BASE_JD_RP_COUNT]; ++ struct workqueue_struct *job_done_wq; + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+typedef void (kbasep_debug_command_func) (struct kbase_device *); ++ wait_queue_head_t zero_jobs_wait; ++ spinlock_t tb_lock; ++ u32 *tb; ++ u32 job_nr; ++ size_t tb_wrap_offset; + -+enum kbasep_debug_command_code { -+ KBASEP_DEBUG_COMMAND_DUMPTRACE, ++#if IS_ENABLED(CONFIG_GPU_TRACEPOINTS) ++ atomic_t work_id; ++#endif + -+ /* This must be the last enum */ -+ KBASEP_DEBUG_COMMAND_COUNT ++ struct list_head jit_atoms_head; ++ struct list_head jit_pending_alloc; ++ int max_priority; +}; + -+struct kbasep_debug_command { -+ char *str; -+ kbasep_debug_command_func *func; ++/** ++ * struct jsctx_queue - JS context atom queue ++ * @runnable_tree: Root of RB-tree containing currently runnable atoms on this ++ * job slot. ++ * @x_dep_head: Head item of the linked list of atoms blocked on cross-slot ++ * dependencies. Atoms on this list will be moved to the ++ * runnable_tree when the blocking atom completes. ++ * ++ * hwaccess_lock must be held when accessing this structure. ++ */ ++struct jsctx_queue { ++ struct rb_root runnable_tree; ++ struct list_head x_dep_head; +}; + -+void kbasep_ktrace_dump_wrapper(struct kbase_device *kbdev) -+{ -+ KBASE_KTRACE_DUMP(kbdev); -+} -+ -+/* Debug commands supported by the driver */ -+static const struct kbasep_debug_command debug_commands[] = { -+ { -+ .str = "dumptrace", -+ .func = &kbasep_ktrace_dump_wrapper, -+ } ++/** ++ * struct kbase_as - Object representing an address space of GPU. ++ * @number: Index at which this address space structure is present ++ * in an array of address space structures embedded inside ++ * the &struct kbase_device. ++ * @pf_wq: Workqueue for processing work items related to ++ * Page fault and Bus fault handling. ++ * @work_pagefault: Work item for the Page fault handling. ++ * @work_busfault: Work item for the Bus fault handling. ++ * @pf_data: Data relating to Page fault. ++ * @bf_data: Data relating to Bus fault. ++ * @current_setup: Stores the MMU configuration for this address space. ++ * @is_unresponsive: Flag to indicate MMU is not responding. ++ * Set if a MMU command isn't completed within ++ * &kbase_device:mmu_as_inactive_wait_time_ms. ++ * Clear by kbase_ctx_sched_restore_all_as() after GPU reset completes. ++ */ ++struct kbase_as { ++ int number; ++ struct workqueue_struct *pf_wq; ++ struct work_struct work_pagefault; ++ struct work_struct work_busfault; ++ struct kbase_fault pf_data; ++ struct kbase_fault bf_data; ++ struct kbase_mmu_setup current_setup; ++ bool is_unresponsive; +}; + -+/** -+ * show_debug - Show callback for the debug_command sysfs file. ++#endif /* _KBASE_JM_DEFS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h +new file mode 100755 +index 000000000..53819caaf +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h +@@ -0,0 +1,1044 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* + * -+ * This function is called to get the contents of the debug_command sysfs -+ * file. This is a list of the available debug commands, separated by newlines. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * -+ * @dev: The device this sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The output buffer for the sysfs file contents ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Return: The number of bytes output to @buf. + */ -+static ssize_t show_debug(struct device *dev, struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ int i; -+ ssize_t ret = 0; + -+ kbdev = to_kbase_device(dev); ++/* ++ * Job Scheduler Interface. ++ * These interfaces are Internal to KBase. ++ */ + -+ if (!kbdev) -+ return -ENODEV; ++#ifndef _KBASE_JM_JS_H_ ++#define _KBASE_JM_JS_H_ + -+ for (i = 0; i < KBASEP_DEBUG_COMMAND_COUNT && ret < PAGE_SIZE; i++) -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s\n", debug_commands[i].str); ++#include "mali_kbase_js_ctx_attr.h" + -+ if (ret >= PAGE_SIZE) { -+ buf[PAGE_SIZE - 2] = '\n'; -+ buf[PAGE_SIZE - 1] = '\0'; -+ ret = PAGE_SIZE - 1; -+ } ++#define JS_MAX_RUNNING_JOBS 8 + -+ return ret; -+} ++/** ++ * kbasep_js_devdata_init - Initialize the Job Scheduler ++ * @kbdev: The kbase_device to operate on ++ * ++ * The struct kbasep_js_device_data sub-structure of kbdev must be zero ++ * initialized before passing to the kbasep_js_devdata_init() function. This is ++ * to give efficient error path code. ++ * ++ * Return: 0 on success, error code otherwise. ++ */ ++int kbasep_js_devdata_init(struct kbase_device * const kbdev); + +/** -+ * issue_debug - Store callback for the debug_command sysfs file. ++ * kbasep_js_devdata_halt - Halt the Job Scheduler. ++ * @kbdev: The kbase_device to operate on + * -+ * This function is called when the debug_command sysfs file is written to. -+ * It matches the requested command against the available commands, and if -+ * a matching command is found calls the associated function from -+ * @debug_commands to issue the command. ++ * It is safe to call this on kbdev even if it the kbasep_js_device_data ++ * sub-structure was never initialized/failed initialization, to give efficient ++ * error-path code. + * -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes written to the sysfs file ++ * For this to work, the struct kbasep_js_device_data sub-structure of kbdev ++ * must be zero initialized before passing to the kbasep_js_devdata_init() ++ * function. This is to give efficient error path code. ++ * ++ * It is a programming error to call this whilst there are still kbase_context ++ * structures registered with this scheduler. + * -+ * Return: @count if the function succeeded. An error code on failure. + */ -+static ssize_t issue_debug(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ int i; -+ -+ kbdev = to_kbase_device(dev); -+ -+ if (!kbdev) -+ return -ENODEV; -+ -+ for (i = 0; i < KBASEP_DEBUG_COMMAND_COUNT; i++) { -+ if (sysfs_streq(debug_commands[i].str, buf)) { -+ debug_commands[i].func(kbdev); -+ return count; -+ } -+ } ++void kbasep_js_devdata_halt(struct kbase_device *kbdev); + -+ /* Debug Command not found */ -+ dev_err(dev, "debug_command: command not known\n"); -+ return -EINVAL; -+} -+ -+/* The sysfs file debug_command. ++/** ++ * kbasep_js_devdata_term - Terminate the Job Scheduler ++ * @kbdev: The kbase_device to operate on + * -+ * This is used to issue general debug commands to the device driver. -+ * Reading it will produce a list of debug commands, separated by newlines. -+ * Writing to it with one of those commands will issue said command. ++ * It is safe to call this on kbdev even if it the kbasep_js_device_data ++ * sub-structure was never initialized/failed initialization, to give efficient ++ * error-path code. ++ * ++ * For this to work, the struct kbasep_js_device_data sub-structure of kbdev ++ * must be zero initialized before passing to the kbasep_js_devdata_init() ++ * function. This is to give efficient error path code. ++ * ++ * It is a programming error to call this whilst there are still kbase_context ++ * structures registered with this scheduler. + */ -+static DEVICE_ATTR(debug_command, S_IRUGO | S_IWUSR, show_debug, issue_debug); -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++void kbasep_js_devdata_term(struct kbase_device *kbdev); + +/** -+ * kbase_show_gpuinfo - Show callback for the gpuinfo sysfs entry. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the GPU information. ++ * kbasep_js_kctx_init - Initialize the Scheduling Component of a ++ * struct kbase_context on the Job Scheduler. ++ * @kctx: The kbase_context to operate on + * -+ * This function is called to get a description of the present Mali -+ * GPU via the gpuinfo sysfs entry. This includes the GPU family, the -+ * number of cores, the hardware version and the raw product id. For -+ * example ++ * This effectively registers a struct kbase_context with a Job Scheduler. + * -+ * Mali-T60x MP4 r0p0 0x6956 ++ * It does not register any jobs owned by the struct kbase_context with ++ * the scheduler. Those must be separately registered by kbasep_js_add_job(). + * -+ * Return: The number of bytes output to @buf. ++ * The struct kbase_context must be zero initialized before passing to the ++ * kbase_js_init() function. This is to give efficient error path code. ++ * ++ * Return: 0 on success, error code otherwise. + */ -+static ssize_t kbase_show_gpuinfo(struct device *dev, -+ struct device_attribute *attr, char *buf) -+{ -+ static const struct gpu_product_id_name { -+ unsigned id; -+ char *name; -+ } gpu_product_id_names[] = { -+ { .id = GPU_ID2_PRODUCT_TMIX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-G71" }, -+ { .id = GPU_ID2_PRODUCT_THEX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-G72" }, -+ { .id = GPU_ID2_PRODUCT_TSIX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-G51" }, -+ { .id = GPU_ID2_PRODUCT_TNOX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-G76" }, -+ { .id = GPU_ID2_PRODUCT_TDVX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-G31" }, -+ { .id = GPU_ID2_PRODUCT_TGOX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-G52" }, -+ { .id = GPU_ID2_PRODUCT_TTRX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-G77" }, -+ { .id = GPU_ID2_PRODUCT_TBEX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-G78" }, -+ { .id = GPU_ID2_PRODUCT_TBAX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-TBAX" }, -+ { .id = GPU_ID2_PRODUCT_LBEX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-G68" }, -+ { .id = GPU_ID2_PRODUCT_TNAX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-G57" }, -+ { .id = GPU_ID2_PRODUCT_TODX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-TODX" }, -+ { .id = GPU_ID2_PRODUCT_TGRX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-TGRX" }, -+ { .id = GPU_ID2_PRODUCT_TVAX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-TVAX" }, -+ { .id = GPU_ID2_PRODUCT_LODX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-LODX" }, -+ { .id = GPU_ID2_PRODUCT_TTUX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-TTUX" }, -+ { .id = GPU_ID2_PRODUCT_LTUX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-LTUX" }, -+ { .id = GPU_ID2_PRODUCT_TE2X >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-TE2X" }, -+ }; -+ const char *product_name = "(Unknown Mali GPU)"; -+ struct kbase_device *kbdev; -+ u32 gpu_id; -+ unsigned product_id, product_id_mask; -+ unsigned i; ++int kbasep_js_kctx_init(struct kbase_context *const kctx); + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++/** ++ * kbasep_js_kctx_term - Terminate the Scheduling Component of a ++ * struct kbase_context on the Job Scheduler ++ * @kctx: The kbase_context to operate on ++ * ++ * This effectively de-registers a struct kbase_context from its Job Scheduler ++ * ++ * It is safe to call this on a struct kbase_context that has never had or ++ * failed initialization of its jctx.sched_info member, to give efficient ++ * error-path code. ++ * ++ * For this to work, the struct kbase_context must be zero intitialized before ++ * passing to the kbase_js_init() function. ++ * ++ * It is a Programming Error to call this whilst there are still jobs ++ * registered with this context. ++ */ ++void kbasep_js_kctx_term(struct kbase_context *kctx); + -+ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ product_id = gpu_id >> GPU_ID_VERSION_PRODUCT_ID_SHIFT; -+ product_id_mask = GPU_ID2_PRODUCT_MODEL >> GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++/* kbase_jsctx_slot_prio_blocked_set - Set a context as being blocked for a job ++ * slot at and below a given priority level ++ * @kctx: The kbase_context ++ * @js: The job slot ++ * @sched_prio: The priority levels that the context is blocked at for @js (all ++ * priority levels at this level and below will be blocked) ++ * ++ * To preserve ordering and dependencies of atoms on soft-stopping (both within ++ * an between priority levels), a context must be marked as blocked for that ++ * atom's job slot, for all priority levels at or below the atom's priority. ++ * ++ * This must only be called due to an atom that was pulled from the context, ++ * otherwise there will be no way of unblocking the context when the atom is ++ * completed/unpulled. ++ * ++ * Atoms of higher priority might still be able to be pulled from the context ++ * on @js. This helps with starting a high priority atom as soon as possible. ++ */ ++static inline void kbase_jsctx_slot_prio_blocked_set(struct kbase_context *kctx, unsigned int js, ++ int sched_prio) ++{ ++ struct kbase_jsctx_slot_tracking *slot_tracking = ++ &kctx->slot_tracking[js]; + -+ for (i = 0; i < ARRAY_SIZE(gpu_product_id_names); ++i) { -+ const struct gpu_product_id_name *p = &gpu_product_id_names[i]; ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ WARN(!slot_tracking->atoms_pulled_pri[sched_prio], ++ "When marking slot %u as blocked for priority %d on a kctx, no atoms were pulled - the slot cannot become unblocked", ++ js, sched_prio); + -+ if ((p->id & product_id_mask) == -+ (product_id & product_id_mask)) { -+ product_name = p->name; -+ break; -+ } -+ } ++ slot_tracking->blocked |= ((kbase_js_prio_bitmap_t)1) << sched_prio; ++ KBASE_KTRACE_ADD_JM_SLOT_INFO(kctx->kbdev, JS_SLOT_PRIO_BLOCKED, kctx, ++ NULL, 0, js, (unsigned int)sched_prio); ++} + -+ return scnprintf(buf, PAGE_SIZE, "%s %d cores r%dp%d 0x%04X\n", -+ product_name, kbdev->gpu_props.num_cores, -+ (gpu_id & GPU_ID_VERSION_MAJOR) >> GPU_ID_VERSION_MAJOR_SHIFT, -+ (gpu_id & GPU_ID_VERSION_MINOR) >> GPU_ID_VERSION_MINOR_SHIFT, -+ product_id); ++/* kbase_jsctx_atoms_pulled - Return number of atoms pulled on a context ++ * @kctx: The kbase_context ++ * ++ * Having atoms pulled indicates the context is not idle. ++ * ++ * Return: the number of atoms pulled on @kctx ++ */ ++static inline int kbase_jsctx_atoms_pulled(struct kbase_context *kctx) ++{ ++ return atomic_read(&kctx->atoms_pulled_all_slots); +} -+static DEVICE_ATTR(gpuinfo, S_IRUGO, kbase_show_gpuinfo, NULL); + +/** -+ * set_dvfs_period - Store callback for the dvfs_period sysfs file. -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes written to the sysfs file ++ * kbasep_js_add_job - Add a job chain to the Job Scheduler, ++ * and take necessary actions to ++ * schedule the context/run the job. ++ * @kctx: The kbase_context to operate on ++ * @atom: Atom to add + * -+ * This function is called when the dvfs_period sysfs file is written to. It -+ * checks the data written, and if valid updates the DVFS period variable, ++ * This atomically does the following: ++ * * Update the numbers of jobs information ++ * * Add the job to the run pool if necessary (part of init_job) + * -+ * Return: @count if the function succeeded. An error code on failure. ++ * Once this is done, then an appropriate action is taken: ++ * * If the ctx is scheduled, it attempts to start the next job (which might be ++ * this added job) ++ * * Otherwise, and if this is the first job on the context, it enqueues it on ++ * the Policy Queue ++ * ++ * The Policy's Queue can be updated by this in the following ways: ++ * * In the above case that this is the first job on the context ++ * * If the context is high priority and the context is not scheduled, then it ++ * could cause the Policy to schedule out a low-priority context, allowing ++ * this context to be scheduled in. ++ * ++ * If the context is already scheduled on the RunPool, then adding a job to it ++ * is guaranteed not to update the Policy Queue. And so, the caller is ++ * guaranteed to not need to try scheduling a context from the Run Pool - it ++ * can safely assert that the result is false. ++ * ++ * It is a programming error to have more than U32_MAX jobs in flight at a time. ++ * ++ * The following locking conditions are made on the caller: ++ * * it must not hold kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * * it must not hold hwaccess_lock (as this will be obtained internally) ++ * * it must not hold kbasep_js_device_data::runpool_mutex (as this will be ++ * obtained internally) ++ * * it must not hold kbasep_jd_device_data::queue_mutex (again, it's used ++ * internally). ++ * ++ * Return: true indicates that the Policy Queue was updated, and so the ++ * caller will need to try scheduling a context onto the Run Pool, ++ * false indicates that no updates were made to the Policy Queue, ++ * so no further action is required from the caller. This is always returned ++ * when the context is currently scheduled. + */ -+static ssize_t set_dvfs_period(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ int ret; -+ int dvfs_period; ++bool kbasep_js_add_job(struct kbase_context *kctx, struct kbase_jd_atom *atom); + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++/** ++ * kbasep_js_remove_job - Remove a job chain from the Job Scheduler, ++ * except for its 'retained state'. ++ * @kbdev: The kbase_device to operate on ++ * @kctx: The kbase_context to operate on ++ * @atom: Atom to remove ++ * ++ * Completely removing a job requires several calls: ++ * * kbasep_js_copy_atom_retained_state(), to capture the 'retained state' of ++ * the atom ++ * * kbasep_js_remove_job(), to partially remove the atom from the Job Scheduler ++ * * kbasep_js_runpool_release_ctx_and_katom_retained_state(), to release the ++ * remaining state held as part of the job having been run. ++ * ++ * In the common case of atoms completing normally, this set of actions is more ++ * optimal for spinlock purposes than having kbasep_js_remove_job() handle all ++ * of the actions. ++ * ++ * In the case of canceling atoms, it is easier to call ++ * kbasep_js_remove_cancelled_job(), which handles all the necessary actions. ++ * ++ * It is a programming error to call this when: ++ * * a atom is not a job belonging to kctx. ++ * * a atom has already been removed from the Job Scheduler. ++ * * a atom is still in the runpool ++ * ++ * Do not use this for removing jobs being killed by kbase_jd_cancel() - use ++ * kbasep_js_remove_cancelled_job() instead. ++ * ++ * The following locking conditions are made on the caller: ++ * * it must hold kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * ++ */ ++void kbasep_js_remove_job(struct kbase_device *kbdev, ++ struct kbase_context *kctx, struct kbase_jd_atom *atom); + -+ ret = kstrtoint(buf, 0, &dvfs_period); -+ if (ret || dvfs_period <= 0) { -+ dev_err(kbdev->dev, "Couldn't process dvfs_period write operation.\n" -+ "Use format \n"); -+ return -EINVAL; -+ } ++/** ++ * kbasep_js_remove_cancelled_job - Completely remove a job chain from the ++ * Job Scheduler, in the case ++ * where the job chain was cancelled. ++ * @kbdev: The kbase_device to operate on ++ * @kctx: The kbase_context to operate on ++ * @katom: Atom to remove ++ * ++ * This is a variant of kbasep_js_remove_job() that takes care of removing all ++ * of the retained state too. This is generally useful for cancelled atoms, ++ * which need not be handled in an optimal way. ++ * ++ * It is a programming error to call this when: ++ * * a atom is not a job belonging to kctx. ++ * * a atom has already been removed from the Job Scheduler. ++ * * a atom is still in the runpool: ++ * * it is not being killed with kbasep_jd_cancel() ++ * ++ * The following locking conditions are made on the caller: ++ * * it must hold kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * * it must not hold the hwaccess_lock, (as this will be obtained ++ * internally) ++ * * it must not hold kbasep_js_device_data::runpool_mutex (as this could be ++ * obtained internally) ++ * ++ * Return: true indicates that ctx attributes have changed and the caller ++ * should call kbase_js_sched_all() to try to run more jobs and ++ * false otherwise. ++ */ ++bool kbasep_js_remove_cancelled_job(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ struct kbase_jd_atom *katom); + -+ kbdev->pm.dvfs_period = dvfs_period; -+ dev_dbg(kbdev->dev, "DVFS period: %dms\n", dvfs_period); ++/** ++ * kbasep_js_runpool_requeue_or_kill_ctx - Handling the requeuing/killing of a ++ * context that was evicted from the ++ * policy queue or runpool. ++ * @kbdev: The kbase_device to operate on ++ * @kctx: The kbase_context to operate on ++ * @has_pm_ref: tells whether to release Power Manager active reference ++ * ++ * This should be used whenever handing off a context that has been evicted ++ * from the policy queue or the runpool: ++ * * If the context is not dying and has jobs, it gets re-added to the policy ++ * queue ++ * * Otherwise, it is not added ++ * ++ * In addition, if the context is dying the jobs are killed asynchronously. ++ * ++ * In all cases, the Power Manager active reference is released ++ * (kbase_pm_context_idle()) whenever the has_pm_ref parameter is true. ++ * has_pm_ref must be set to false whenever the context was not previously in ++ * the runpool and does not hold a Power Manager active refcount. Note that ++ * contexts in a rollback of kbasep_js_try_schedule_head_ctx() might have an ++ * active refcount even though they weren't in the runpool. ++ * ++ * The following locking conditions are made on the caller: ++ * * it must hold kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * * it must not hold kbasep_jd_device_data::queue_mutex (as this will be ++ * obtained internally) ++ */ ++void kbasep_js_runpool_requeue_or_kill_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx, bool has_pm_ref); + -+ return count; -+} ++/** ++ * kbasep_js_runpool_release_ctx - Release a refcount of a context being busy, ++ * allowing it to be scheduled out. ++ * @kbdev: The kbase_device to operate on ++ * @kctx: The kbase_context to operate on ++ * ++ * When the refcount reaches zero and the context might be scheduled out ++ * (depending on whether the Scheduling Policy has deemed it so, or if it has ++ * run out of jobs). ++ * ++ * If the context does get scheduled out, then The following actions will be ++ * taken as part of deschduling a context: ++ * For the context being descheduled: ++ * * If the context is in the processing of dying (all the jobs are being ++ * removed from it), then descheduling also kills off any jobs remaining in the ++ * context. ++ * * If the context is not dying, and any jobs remain after descheduling the ++ * context then it is re-enqueued to the Policy's Queue. ++ * * Otherwise, the context is still known to the scheduler, but remains absent ++ * from the Policy Queue until a job is next added to it. ++ * * In all descheduling cases, the Power Manager active reference (obtained ++ * during kbasep_js_try_schedule_head_ctx()) is released ++ * (kbase_pm_context_idle()). ++ * ++ * Whilst the context is being descheduled, this also handles actions that ++ * cause more atoms to be run: ++ * * Attempt submitting atoms when the Context Attributes on the Runpool have ++ * changed. This is because the context being scheduled out could mean that ++ * there are more opportunities to run atoms. ++ * * Attempt submitting to a slot that was previously blocked due to affinity ++ * restrictions. This is usually only necessary when releasing a context ++ * happens as part of completing a previous job, but is harmless nonetheless. ++ * * Attempt scheduling in a new context (if one is available), and if ++ * necessary, running a job from that new context. ++ * ++ * Unlike retaining a context in the runpool, this function cannot be called ++ * from IRQ context. ++ * ++ * It is a programming error to call this on a kctx that is not currently ++ * scheduled, or that already has a zero refcount. ++ * ++ * The following locking conditions are made on the caller: ++ * * it must not hold the hwaccess_lock, because it will be used internally. ++ * * it must not hold kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * * it must not hold kbasep_js_device_data::runpool_mutex (as this will be ++ * obtained internally) ++ * * it must not hold the kbase_device::mmu_hw_mutex (as this will be ++ * obtained internally) ++ * * it must not hold kbasep_jd_device_data::queue_mutex (as this will be ++ * obtained internally) ++ * ++ */ ++void kbasep_js_runpool_release_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx); + +/** -+ * show_dvfs_period - Show callback for the dvfs_period sysfs entry. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the GPU information. ++ * kbasep_js_runpool_release_ctx_and_katom_retained_state - Variant of ++ * kbasep_js_runpool_release_ctx() that handles additional ++ * actions from completing an atom. + * -+ * This function is called to get the current period used for the DVFS sample -+ * timer. ++ * @kbdev: KBase device ++ * @kctx: KBase context ++ * @katom_retained_state: Retained state from the atom + * -+ * Return: The number of bytes output to @buf. ++ * This is usually called as part of completing an atom and releasing the ++ * refcount on the context held by the atom. ++ * ++ * Therefore, the extra actions carried out are part of handling actions queued ++ * on a completed atom, namely: ++ * * Releasing the atom's context attributes ++ * * Retrying the submission on a particular slot, because we couldn't submit ++ * on that slot from an IRQ handler. ++ * ++ * The locking conditions of this function are the same as those for ++ * kbasep_js_runpool_release_ctx() + */ -+static ssize_t show_dvfs_period(struct device *dev, -+ struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ ssize_t ret; ++void kbasep_js_runpool_release_ctx_and_katom_retained_state( ++ struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ struct kbasep_js_atom_retained_state *katom_retained_state); + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++/** ++ * kbasep_js_runpool_release_ctx_nolock - Variant of kbase_js_runpool_release_ctx() ++ * without locks ++ * @kbdev: KBase device ++ * @kctx: KBase context ++ * ++ * Variant of kbase_js_runpool_release_ctx() that assumes that ++ * kbasep_js_device_data::runpool_mutex and ++ * kbasep_js_kctx_info::ctx::jsctx_mutex are held by the caller, and does not ++ * attempt to schedule new contexts. ++ */ ++void kbasep_js_runpool_release_ctx_nolock(struct kbase_device *kbdev, ++ struct kbase_context *kctx); + -+ ret = scnprintf(buf, PAGE_SIZE, "%d\n", kbdev->pm.dvfs_period); ++/** ++ * kbasep_js_schedule_privileged_ctx - Schedule in a privileged context ++ * ++ * @kbdev: KBase device ++ * @kctx: KBase context ++ * ++ * This schedules a context in regardless of the context priority. ++ * If the runpool is full, a context will be forced out of the runpool and the ++ * function will wait for the new context to be scheduled in. ++ * The context will be kept scheduled in (and the corresponding address space ++ * reserved) until kbasep_js_release_privileged_ctx is called). ++ * ++ * The following locking conditions are made on the caller: ++ * * it must not hold the hwaccess_lock, because it will be used internally. ++ * * it must not hold kbasep_js_device_data::runpool_mutex (as this will be ++ * obtained internally) ++ * * it must not hold the kbase_device::mmu_hw_mutex (as this will be ++ * obtained internally) ++ * * it must not hold kbasep_jd_device_data::queue_mutex (again, it's used ++ * internally). ++ * * it must not hold kbasep_js_kctx_info::ctx::jsctx_mutex, because it will ++ * be used internally. ++ * ++ */ ++void kbasep_js_schedule_privileged_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx); + -+ return ret; -+} ++/** ++ * kbasep_js_release_privileged_ctx - Release a privileged context, ++ * allowing it to be scheduled out. ++ * @kbdev: KBase device ++ * @kctx: KBase context ++ * ++ * See kbasep_js_runpool_release_ctx for potential side effects. ++ * ++ * The following locking conditions are made on the caller: ++ * * it must not hold the hwaccess_lock, because it will be used internally. ++ * * it must not hold kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * * it must not hold kbasep_js_device_data::runpool_mutex (as this will be ++ * obtained internally) ++ * * it must not hold the kbase_device::mmu_hw_mutex (as this will be ++ * obtained internally) ++ * ++ */ ++void kbasep_js_release_privileged_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx); + -+static DEVICE_ATTR(dvfs_period, S_IRUGO | S_IWUSR, show_dvfs_period, -+ set_dvfs_period); ++/** ++ * kbase_js_try_run_jobs - Try to submit the next job on each slot ++ * @kbdev: KBase device ++ * ++ * The following locks may be used: ++ * * kbasep_js_device_data::runpool_mutex ++ * * hwaccess_lock ++ */ ++void kbase_js_try_run_jobs(struct kbase_device *kbdev); + +/** -+ * set_pm_poweroff - Store callback for the pm_poweroff sysfs file. -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes written to the sysfs file ++ * kbasep_js_suspend - Suspend the job scheduler during a Power Management ++ * Suspend event. ++ * @kbdev: KBase device + * -+ * This function is called when the pm_poweroff sysfs file is written to. ++ * Causes all contexts to be removed from the runpool, and prevents any ++ * contexts from (re)entering the runpool. + * -+ * This file contains three values separated by whitespace. The values -+ * are gpu_poweroff_time (the period of the poweroff timer, in ns), -+ * poweroff_shader_ticks (the number of poweroff timer ticks before an idle -+ * shader is powered off), and poweroff_gpu_ticks (the number of poweroff timer -+ * ticks before the GPU is powered off), in that order. ++ * This does not handle suspending the one privileged context: the caller must ++ * instead do this by suspending the GPU HW Counter Instrumentation. + * -+ * Return: @count if the function succeeded. An error code on failure. ++ * This will eventually cause all Power Management active references held by ++ * contexts on the runpool to be released, without running any more atoms. ++ * ++ * The caller must then wait for all Power Management active refcount to become ++ * zero before completing the suspend. ++ * ++ * The emptying mechanism may take some time to complete, since it can wait for ++ * jobs to complete naturally instead of forcing them to end quickly. However, ++ * this is bounded by the Job Scheduler's Job Timeouts. Hence, this ++ * function is guaranteed to complete in a finite time. + */ -+static ssize_t set_pm_poweroff(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ struct kbasep_pm_tick_timer_state *stt; -+ int items; -+ u64 gpu_poweroff_time; -+ unsigned int poweroff_shader_ticks, poweroff_gpu_ticks; -+ unsigned long flags; ++void kbasep_js_suspend(struct kbase_device *kbdev); + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++/** ++ * kbasep_js_resume - Resume the Job Scheduler after a Power Management ++ * Resume event. ++ * @kbdev: KBase device ++ * ++ * This restores the actions from kbasep_js_suspend(): ++ * * Schedules contexts back into the runpool ++ * * Resumes running atoms on the GPU ++ */ ++void kbasep_js_resume(struct kbase_device *kbdev); + -+ items = sscanf(buf, "%llu %u %u", &gpu_poweroff_time, -+ &poweroff_shader_ticks, -+ &poweroff_gpu_ticks); -+ if (items != 3) { -+ dev_err(kbdev->dev, "Couldn't process pm_poweroff write operation.\n" -+ "Use format \n"); -+ return -EINVAL; -+ } ++/** ++ * kbase_js_dep_resolved_submit - Submit an atom to the job scheduler. ++ * ++ * @kctx: Context pointer ++ * @katom: Pointer to the atom to submit ++ * ++ * The atom is enqueued on the context's ringbuffer. The caller must have ++ * ensured that all dependencies can be represented in the ringbuffer. ++ * ++ * Caller must hold jctx->lock ++ * ++ * Return: true if the context requires to be enqueued, otherwise false. ++ */ ++bool kbase_js_dep_resolved_submit(struct kbase_context *kctx, ++ struct kbase_jd_atom *katom); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++/** ++ * kbase_js_pull - Pull an atom from a context in the job scheduler for ++ * execution. ++ * ++ * @kctx: Context to pull from ++ * @js: Job slot to pull from ++ * ++ * The atom will not be removed from the ringbuffer at this stage. ++ * ++ * The HW access lock must be held when calling this function. ++ * ++ * Return: a pointer to an atom, or NULL if there are no atoms for this ++ * slot that can be currently run. ++ */ ++struct kbase_jd_atom *kbase_js_pull(struct kbase_context *kctx, unsigned int js); + -+ stt = &kbdev->pm.backend.shader_tick_timer; -+ stt->configured_interval = HR_TIMER_DELAY_NSEC(gpu_poweroff_time); -+ stt->configured_ticks = poweroff_shader_ticks; ++/** ++ * kbase_js_unpull - Return an atom to the job scheduler ringbuffer. ++ * ++ * @kctx: Context pointer ++ * @katom: Pointer to the atom to unpull ++ * ++ * An atom is 'unpulled' if execution is stopped but intended to be returned to ++ * later. The most common reason for this is that the atom has been ++ * soft-stopped. Another reason is if an end-of-renderpass atom completed ++ * but will need to be run again as part of the same renderpass. ++ * ++ * Note that if multiple atoms are to be 'unpulled', they must be returned in ++ * the reverse order to which they were originally pulled. It is a programming ++ * error to return atoms in any other order. ++ * ++ * The HW access lock must be held when calling this function. ++ * ++ */ ++void kbase_js_unpull(struct kbase_context *kctx, struct kbase_jd_atom *katom); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++/** ++ * kbase_js_complete_atom_wq - Complete an atom from jd_done_worker(), ++ * removing it from the job ++ * scheduler ringbuffer. ++ * @kctx: Context pointer ++ * @katom: Pointer to the atom to complete ++ * ++ * If the atom failed then all dependee atoms marked for failure propagation ++ * will also fail. ++ * ++ * Return: true if the context is now idle (no jobs pulled) false otherwise. ++ */ ++bool kbase_js_complete_atom_wq(struct kbase_context *kctx, ++ struct kbase_jd_atom *katom); + -+ if (poweroff_gpu_ticks != 0) -+ dev_warn(kbdev->dev, "Separate GPU poweroff delay no longer supported.\n"); ++/** ++ * kbase_js_complete_atom - Complete an atom. ++ * ++ * @katom: Pointer to the atom to complete ++ * @end_timestamp: The time that the atom completed (may be NULL) ++ * ++ * Most of the work required to complete an atom will be performed by ++ * jd_done_worker(). ++ * ++ * The HW access lock must be held when calling this function. ++ * ++ * Return: a atom that has now been unblocked and can now be run, or NULL ++ * if none ++ */ ++struct kbase_jd_atom *kbase_js_complete_atom(struct kbase_jd_atom *katom, ++ ktime_t *end_timestamp); + -+ return count; -+} ++/** ++ * kbase_js_atom_blocked_on_x_dep - Decide whether to ignore a cross-slot ++ * dependency ++ * @katom: Pointer to an atom in the slot ringbuffer ++ * ++ * A cross-slot dependency is ignored if necessary to unblock incremental ++ * rendering. If the atom at the start of a renderpass used too much memory ++ * and was soft-stopped then the atom at the end of a renderpass is submitted ++ * to hardware regardless of its dependency on the start-of-renderpass atom. ++ * This can happen multiple times for the same pair of atoms. ++ * ++ * Return: true to block the atom or false to allow it to be submitted to ++ * hardware. ++ */ ++bool kbase_js_atom_blocked_on_x_dep(struct kbase_jd_atom *katom); + +/** -+ * show_pm_poweroff - Show callback for the pm_poweroff sysfs entry. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the GPU information. ++ * kbase_js_sched - Submit atoms from all available contexts. + * -+ * This function is called to get the current period used for the DVFS sample -+ * timer. ++ * @kbdev: Device pointer ++ * @js_mask: Mask of job slots to submit to ++ * ++ * This will attempt to submit as many jobs as possible to the provided job ++ * slots. It will exit when either all job slots are full, or all contexts have ++ * been used. + * -+ * Return: The number of bytes output to @buf. + */ -+static ssize_t show_pm_poweroff(struct device *dev, -+ struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ struct kbasep_pm_tick_timer_state *stt; -+ ssize_t ret; -+ unsigned long flags; ++void kbase_js_sched(struct kbase_device *kbdev, unsigned int js_mask); + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++/** ++ * kbase_js_zap_context - Attempt to deschedule a context that is being ++ * destroyed ++ * @kctx: Context pointer ++ * ++ * This will attempt to remove a context from any internal job scheduler queues ++ * and perform any other actions to ensure a context will not be submitted ++ * from. ++ * ++ * If the context is currently scheduled, then the caller must wait for all ++ * pending jobs to complete before taking any further action. ++ */ ++void kbase_js_zap_context(struct kbase_context *kctx); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++/** ++ * kbase_js_is_atom_valid - Validate an atom ++ * ++ * @kbdev: Device pointer ++ * @katom: Atom to validate ++ * ++ * This will determine whether the atom can be scheduled onto the GPU. Atoms ++ * with invalid combinations of core requirements will be rejected. ++ * ++ * Return: true if atom is valid false otherwise. ++ */ ++bool kbase_js_is_atom_valid(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom); + -+ stt = &kbdev->pm.backend.shader_tick_timer; -+ ret = scnprintf(buf, PAGE_SIZE, "%llu %u 0\n", -+ ktime_to_ns(stt->configured_interval), -+ stt->configured_ticks); ++/** ++ * kbase_js_set_timeouts - update all JS timeouts with user specified data ++ * ++ * @kbdev: Device pointer ++ * ++ * Timeouts are specified through the 'js_timeouts' sysfs file. If a timeout is ++ * set to a positive number then that becomes the new value used, if a timeout ++ * is negative then the default is set. ++ */ ++void kbase_js_set_timeouts(struct kbase_device *kbdev); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++/** ++ * kbase_js_set_ctx_priority - set the context priority ++ * ++ * @kctx: Context pointer ++ * @new_priority: New priority value for the Context ++ * ++ * The context priority is set to a new value and it is moved to the ++ * pullable/unpullable list as per the new priority. ++ */ ++void kbase_js_set_ctx_priority(struct kbase_context *kctx, int new_priority); + -+ return ret; -+} ++/** ++ * kbase_js_update_ctx_priority - update the context priority ++ * ++ * @kctx: Context pointer ++ * ++ * The context priority gets updated as per the priority of atoms currently in ++ * use for that context, but only if system priority mode for context scheduling ++ * is being used. ++ */ ++void kbase_js_update_ctx_priority(struct kbase_context *kctx); + -+static DEVICE_ATTR(pm_poweroff, S_IRUGO | S_IWUSR, show_pm_poweroff, -+ set_pm_poweroff); ++/* ++ * Helpers follow ++ */ + +/** -+ * set_reset_timeout - Store callback for the reset_timeout sysfs file. -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes written to the sysfs file ++ * kbasep_js_is_submit_allowed - Check that a context is allowed to submit ++ * jobs on this policy ++ * @js_devdata: KBase Job Scheduler Device Data ++ * @kctx: KBase context + * -+ * This function is called when the reset_timeout sysfs file is written to. It -+ * checks the data written, and if valid updates the reset timeout. ++ * The purpose of this abstraction is to hide the underlying data size, ++ * and wrap up the long repeated line of code. + * -+ * Return: @count if the function succeeded. An error code on failure. ++ * As with any bool, never test the return value with true. ++ * ++ * The caller must hold hwaccess_lock. ++ * ++ * Return: true if the context is allowed to submit jobs, false otherwise. + */ -+static ssize_t set_reset_timeout(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) ++static inline bool kbasep_js_is_submit_allowed( ++ struct kbasep_js_device_data *js_devdata, ++ struct kbase_context *kctx) +{ -+ struct kbase_device *kbdev; -+ int ret; -+ int reset_timeout; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ u16 test_bit; ++ bool is_allowed; + -+ ret = kstrtoint(buf, 0, &reset_timeout); -+ if (ret || reset_timeout <= 0) { -+ dev_err(kbdev->dev, "Couldn't process reset_timeout write operation.\n" -+ "Use format \n"); -+ return -EINVAL; -+ } ++ /* Ensure context really is scheduled in */ ++ if (WARN((kctx->as_nr == KBASEP_AS_NR_INVALID) || !kbase_ctx_flag(kctx, KCTX_SCHEDULED), ++ "%s: kctx %pK has assigned AS %d and context flag %d\n", __func__, (void *)kctx, ++ kctx->as_nr, atomic_read(&kctx->flags))) ++ return false; + -+ kbdev->reset_timeout_ms = reset_timeout; -+ dev_dbg(kbdev->dev, "Reset timeout: %dms\n", reset_timeout); ++ test_bit = (u16) (1u << kctx->as_nr); + -+ return count; ++ is_allowed = (bool) (js_devdata->runpool_irq.submit_allowed & test_bit); ++ dev_dbg(kctx->kbdev->dev, "JS: submit %s allowed on %pK (as=%d)", ++ is_allowed ? "is" : "isn't", (void *)kctx, kctx->as_nr); ++ return is_allowed; +} + +/** -+ * show_reset_timeout - Show callback for the reset_timeout sysfs entry. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the GPU information. ++ * kbasep_js_set_submit_allowed - Allow a context to submit jobs on this policy ++ * @js_devdata: KBase Job Scheduler Device Data ++ * @kctx: KBase context + * -+ * This function is called to get the current reset timeout. ++ * The purpose of this abstraction is to hide the underlying data size, ++ * and wrap up the long repeated line of code. + * -+ * Return: The number of bytes output to @buf. ++ * The caller must hold hwaccess_lock. + */ -+static ssize_t show_reset_timeout(struct device *dev, -+ struct device_attribute *attr, char * const buf) ++static inline void kbasep_js_set_submit_allowed( ++ struct kbasep_js_device_data *js_devdata, ++ struct kbase_context *kctx) +{ -+ struct kbase_device *kbdev; -+ ssize_t ret; ++ u16 set_bit; + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ /* Ensure context really is scheduled in */ ++ if (WARN((kctx->as_nr == KBASEP_AS_NR_INVALID) || !kbase_ctx_flag(kctx, KCTX_SCHEDULED), ++ "%s: kctx %pK has assigned AS %d and context flag %d\n", __func__, (void *)kctx, ++ kctx->as_nr, atomic_read(&kctx->flags))) ++ return; + -+ ret = scnprintf(buf, PAGE_SIZE, "%d\n", kbdev->reset_timeout_ms); ++ set_bit = (u16) (1u << kctx->as_nr); + -+ return ret; ++ dev_dbg(kctx->kbdev->dev, "JS: Setting Submit Allowed on %pK (as=%d)", ++ kctx, kctx->as_nr); ++ ++ js_devdata->runpool_irq.submit_allowed |= set_bit; +} + -+static DEVICE_ATTR(reset_timeout, S_IRUGO | S_IWUSR, show_reset_timeout, -+ set_reset_timeout); ++/** ++ * kbasep_js_clear_submit_allowed - Prevent a context from submitting more ++ * jobs on this policy ++ * @js_devdata: KBase Job Scheduler Device Data ++ * @kctx: KBase context ++ * ++ * The purpose of this abstraction is to hide the underlying data size, ++ * and wrap up the long repeated line of code. ++ * ++ * The caller must hold hwaccess_lock. ++ */ ++static inline void kbasep_js_clear_submit_allowed( ++ struct kbasep_js_device_data *js_devdata, ++ struct kbase_context *kctx) ++{ ++ u16 clear_bit; ++ u16 clear_mask; + ++ /* Ensure context really is scheduled in */ ++ if (WARN((kctx->as_nr == KBASEP_AS_NR_INVALID) || !kbase_ctx_flag(kctx, KCTX_SCHEDULED), ++ "%s: kctx %pK has assigned AS %d and context flag %d\n", __func__, (void *)kctx, ++ kctx->as_nr, atomic_read(&kctx->flags))) ++ return; + -+static ssize_t show_mem_pool_size(struct device *dev, -+ struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *const kbdev = to_kbase_device(dev); ++ clear_bit = (u16) (1u << kctx->as_nr); ++ clear_mask = ~clear_bit; + -+ if (!kbdev) -+ return -ENODEV; ++ dev_dbg(kctx->kbdev->dev, "JS: Clearing Submit Allowed on %pK (as=%d)", ++ kctx, kctx->as_nr); + -+ return kbase_debugfs_helper_get_attr_to_string(buf, PAGE_SIZE, -+ kbdev->mem_pools.small, MEMORY_GROUP_MANAGER_NR_GROUPS, -+ kbase_mem_pool_debugfs_size); ++ js_devdata->runpool_irq.submit_allowed &= clear_mask; +} + -+static ssize_t set_mem_pool_size(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) ++/** ++ * kbasep_js_atom_retained_state_init_invalid - Create an initial 'invalid' ++ * atom retained state ++ * ++ * @retained_state: pointer where to create and initialize the state ++ * ++ * Create an initial 'invalid' atom retained state, that requires no ++ * atom-related work to be done on releasing with ++ * kbasep_js_runpool_release_ctx_and_katom_retained_state() ++ */ ++static inline void kbasep_js_atom_retained_state_init_invalid( ++ struct kbasep_js_atom_retained_state *retained_state) +{ -+ struct kbase_device *const kbdev = to_kbase_device(dev); -+ int err; -+ -+ if (!kbdev) -+ return -ENODEV; -+ -+ err = kbase_debugfs_helper_set_attr_from_string(buf, -+ kbdev->mem_pools.small, MEMORY_GROUP_MANAGER_NR_GROUPS, -+ kbase_mem_pool_debugfs_trim); -+ -+ return err ? err : count; ++ retained_state->event_code = BASE_JD_EVENT_NOT_STARTED; ++ retained_state->core_req = ++ KBASEP_JS_ATOM_RETAINED_STATE_CORE_REQ_INVALID; +} + -+static DEVICE_ATTR(mem_pool_size, S_IRUGO | S_IWUSR, show_mem_pool_size, -+ set_mem_pool_size); -+ -+static ssize_t show_mem_pool_max_size(struct device *dev, -+ struct device_attribute *attr, char * const buf) ++/** ++ * kbasep_js_atom_retained_state_copy() - Copy atom state ++ * @retained_state: where to copy ++ * @katom: where to copy from ++ * ++ * Copy atom state that can be made available after kbase_jd_done_nolock() is called ++ * on that atom. ++ */ ++static inline void kbasep_js_atom_retained_state_copy( ++ struct kbasep_js_atom_retained_state *retained_state, ++ const struct kbase_jd_atom *katom) +{ -+ struct kbase_device *const kbdev = to_kbase_device(dev); -+ -+ if (!kbdev) -+ return -ENODEV; -+ -+ return kbase_debugfs_helper_get_attr_to_string(buf, PAGE_SIZE, -+ kbdev->mem_pools.small, MEMORY_GROUP_MANAGER_NR_GROUPS, -+ kbase_mem_pool_debugfs_max_size); ++ retained_state->event_code = katom->event_code; ++ retained_state->core_req = katom->core_req; ++ retained_state->sched_priority = katom->sched_priority; ++ retained_state->device_nr = katom->device_nr; +} + -+static ssize_t set_mem_pool_max_size(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) ++/** ++ * kbasep_js_has_atom_finished - Determine whether an atom has finished ++ * (given its retained state), ++ * and so should be given back to ++ * userspace/removed from the system. ++ * ++ * @katom_retained_state: the retained state of the atom to check ++ * ++ * Reasons for an atom not finishing include: ++ * * Being soft-stopped (and so, the atom should be resubmitted sometime later) ++ * * It is an end of renderpass atom that was run to consume the output of a ++ * start-of-renderpass atom that was soft-stopped because it used too much ++ * memory. In this case, it will have to be run again later. ++ * ++ * Return: false if the atom has not finished, true otherwise. ++ */ ++static inline bool kbasep_js_has_atom_finished( ++ const struct kbasep_js_atom_retained_state *katom_retained_state) +{ -+ struct kbase_device *const kbdev = to_kbase_device(dev); -+ int err; -+ -+ if (!kbdev) -+ return -ENODEV; -+ -+ err = kbase_debugfs_helper_set_attr_from_string(buf, -+ kbdev->mem_pools.small, MEMORY_GROUP_MANAGER_NR_GROUPS, -+ kbase_mem_pool_debugfs_set_max_size); -+ -+ return err ? err : count; ++ return (bool) (katom_retained_state->event_code != ++ BASE_JD_EVENT_STOPPED && ++ katom_retained_state->event_code != ++ BASE_JD_EVENT_REMOVED_FROM_NEXT && ++ katom_retained_state->event_code != ++ BASE_JD_EVENT_END_RP_DONE); +} + -+static DEVICE_ATTR(mem_pool_max_size, S_IRUGO | S_IWUSR, show_mem_pool_max_size, -+ set_mem_pool_max_size); -+ +/** -+ * show_lp_mem_pool_size - Show size of the large memory pages pool. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the pool size. ++ * kbasep_js_atom_retained_state_is_valid - Determine whether a struct ++ * kbasep_js_atom_retained_state ++ * is valid ++ * @katom_retained_state: the atom's retained state to check + * -+ * This function is called to get the number of large memory pages which currently populate the kbdev pool. ++ * An invalid struct kbasep_js_atom_retained_state is allowed, and indicates ++ * that the code should just ignore it. + * -+ * Return: The number of bytes output to @buf. ++ * Return: false if the retained state is invalid, true otherwise. + */ -+static ssize_t show_lp_mem_pool_size(struct device *dev, -+ struct device_attribute *attr, char * const buf) ++static inline bool kbasep_js_atom_retained_state_is_valid( ++ const struct kbasep_js_atom_retained_state *katom_retained_state) +{ -+ struct kbase_device *const kbdev = to_kbase_device(dev); -+ -+ if (!kbdev) -+ return -ENODEV; -+ -+ return kbase_debugfs_helper_get_attr_to_string(buf, PAGE_SIZE, -+ kbdev->mem_pools.large, MEMORY_GROUP_MANAGER_NR_GROUPS, -+ kbase_mem_pool_debugfs_size); ++ return (bool) (katom_retained_state->core_req != ++ KBASEP_JS_ATOM_RETAINED_STATE_CORE_REQ_INVALID); +} + +/** -+ * set_lp_mem_pool_size - Set size of the large memory pages pool. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The value written to the sysfs file. -+ * @count: The number of bytes written to the sysfs file. -+ * -+ * This function is called to set the number of large memory pages which should populate the kbdev pool. -+ * This may cause existing pages to be removed from the pool, or new pages to be created and then added to the pool. ++ * kbase_js_runpool_inc_context_count - Increment number of running contexts. ++ * @kbdev: KBase device ++ * @kctx: KBase context + * -+ * Return: @count if the function succeeded. An error code on failure. ++ * The following locking conditions are made on the caller: ++ * * The caller must hold the kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * * The caller must hold the kbasep_js_device_data::runpool_mutex + */ -+static ssize_t set_lp_mem_pool_size(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) ++static inline void kbase_js_runpool_inc_context_count( ++ struct kbase_device *kbdev, ++ struct kbase_context *kctx) +{ -+ struct kbase_device *const kbdev = to_kbase_device(dev); -+ int err; ++ struct kbasep_js_device_data *js_devdata; ++ struct kbasep_js_kctx_info *js_kctx_info; + -+ if (!kbdev) -+ return -ENODEV; ++ js_devdata = &kbdev->js_data; ++ js_kctx_info = &kctx->jctx.sched_info; + -+ err = kbase_debugfs_helper_set_attr_from_string(buf, -+ kbdev->mem_pools.large, MEMORY_GROUP_MANAGER_NR_GROUPS, -+ kbase_mem_pool_debugfs_trim); ++ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); ++ lockdep_assert_held(&js_devdata->runpool_mutex); + -+ return err ? err : count; -+} ++ /* Track total contexts */ ++ WARN_ON_ONCE(js_devdata->nr_all_contexts_running >= JS_MAX_RUNNING_JOBS); ++ ++(js_devdata->nr_all_contexts_running); + -+static DEVICE_ATTR(lp_mem_pool_size, S_IRUGO | S_IWUSR, show_lp_mem_pool_size, -+ set_lp_mem_pool_size); ++ if (!kbase_ctx_flag(kctx, KCTX_SUBMIT_DISABLED)) { ++ /* Track contexts that can submit jobs */ ++ WARN_ON_ONCE(js_devdata->nr_user_contexts_running >= JS_MAX_RUNNING_JOBS); ++ ++(js_devdata->nr_user_contexts_running); ++ } ++} + +/** -+ * show_lp_mem_pool_max_size - Show maximum size of the large memory pages pool. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the pool size. -+ * -+ * This function is called to get the maximum number of large memory pages that the kbdev pool can possibly contain. ++ * kbase_js_runpool_dec_context_count - decrement number of running contexts. + * -+ * Return: The number of bytes output to @buf. ++ * @kbdev: KBase device ++ * @kctx: KBase context ++ * The following locking conditions are made on the caller: ++ * * The caller must hold the kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * * The caller must hold the kbasep_js_device_data::runpool_mutex + */ -+static ssize_t show_lp_mem_pool_max_size(struct device *dev, -+ struct device_attribute *attr, char * const buf) ++static inline void kbase_js_runpool_dec_context_count( ++ struct kbase_device *kbdev, ++ struct kbase_context *kctx) +{ -+ struct kbase_device *const kbdev = to_kbase_device(dev); ++ struct kbasep_js_device_data *js_devdata; ++ struct kbasep_js_kctx_info *js_kctx_info; + -+ if (!kbdev) -+ return -ENODEV; ++ js_devdata = &kbdev->js_data; ++ js_kctx_info = &kctx->jctx.sched_info; + -+ return kbase_debugfs_helper_get_attr_to_string(buf, PAGE_SIZE, -+ kbdev->mem_pools.large, MEMORY_GROUP_MANAGER_NR_GROUPS, -+ kbase_mem_pool_debugfs_max_size); ++ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); ++ lockdep_assert_held(&js_devdata->runpool_mutex); ++ ++ /* Track total contexts */ ++ --(js_devdata->nr_all_contexts_running); ++ WARN_ON_ONCE(js_devdata->nr_all_contexts_running < 0); ++ ++ if (!kbase_ctx_flag(kctx, KCTX_SUBMIT_DISABLED)) { ++ /* Track contexts that can submit jobs */ ++ --(js_devdata->nr_user_contexts_running); ++ WARN_ON_ONCE(js_devdata->nr_user_contexts_running < 0); ++ } +} + +/** -+ * set_lp_mem_pool_max_size - Set maximum size of the large memory pages pool. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The value written to the sysfs file. -+ * @count: The number of bytes written to the sysfs file. ++ * kbase_js_sched_all - Submit atoms from all available contexts to all ++ * job slots. + * -+ * This function is called to set the maximum number of large memory pages that the kbdev pool can possibly contain. ++ * @kbdev: Device pointer + * -+ * Return: @count if the function succeeded. An error code on failure. ++ * This will attempt to submit as many jobs as possible. It will exit when ++ * either all job slots are full, or all contexts have been used. + */ -+static ssize_t set_lp_mem_pool_max_size(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) ++static inline void kbase_js_sched_all(struct kbase_device *kbdev) +{ -+ struct kbase_device *const kbdev = to_kbase_device(dev); -+ int err; -+ -+ if (!kbdev) -+ return -ENODEV; -+ -+ err = kbase_debugfs_helper_set_attr_from_string(buf, -+ kbdev->mem_pools.large, MEMORY_GROUP_MANAGER_NR_GROUPS, -+ kbase_mem_pool_debugfs_set_max_size); -+ -+ return err ? err : count; ++ kbase_js_sched(kbdev, (1 << kbdev->gpu_props.num_job_slots) - 1); +} + -+static DEVICE_ATTR(lp_mem_pool_max_size, S_IRUGO | S_IWUSR, show_lp_mem_pool_max_size, -+ set_lp_mem_pool_max_size); ++extern const int ++kbasep_js_atom_priority_to_relative[BASE_JD_NR_PRIO_LEVELS]; ++ ++extern const base_jd_prio ++kbasep_js_relative_priority_to_atom[KBASE_JS_ATOM_SCHED_PRIO_COUNT]; + -+#if !MALI_USE_CSF +/** -+ * show_js_ctx_scheduling_mode - Show callback for js_ctx_scheduling_mode sysfs -+ * entry. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the context scheduling mode information. ++ * kbasep_js_atom_prio_to_sched_prio - Convert atom priority (base_jd_prio) ++ * to relative ordering. ++ * @atom_prio: Priority ID to translate. + * -+ * This function is called to get the context scheduling mode being used by JS. ++ * Atom priority values for @ref base_jd_prio cannot be compared directly to ++ * find out which are higher or lower. + * -+ * Return: The number of bytes output to @buf. ++ * This function will convert base_jd_prio values for successively lower ++ * priorities into a monotonically increasing sequence. That is, the lower the ++ * base_jd_prio priority, the higher the value produced by this function. This ++ * is in accordance with how the rest of the kernel treats priority. ++ * ++ * The mapping is 1:1 and the size of the valid input range is the same as the ++ * size of the valid output range, i.e. ++ * KBASE_JS_ATOM_SCHED_PRIO_COUNT == BASE_JD_NR_PRIO_LEVELS ++ * ++ * Note This must be kept in sync with BASE_JD_PRIO_<...> definitions ++ * ++ * Return: On success: a value in the inclusive range ++ * 0..KBASE_JS_ATOM_SCHED_PRIO_COUNT-1. On failure: ++ * KBASE_JS_ATOM_SCHED_PRIO_INVALID + */ -+static ssize_t show_js_ctx_scheduling_mode(struct device *dev, -+ struct device_attribute *attr, char * const buf) ++static inline int kbasep_js_atom_prio_to_sched_prio(base_jd_prio atom_prio) +{ -+ struct kbase_device *kbdev; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ if (atom_prio >= BASE_JD_NR_PRIO_LEVELS) ++ return KBASE_JS_ATOM_SCHED_PRIO_INVALID; + -+ return scnprintf(buf, PAGE_SIZE, "%u\n", kbdev->js_ctx_scheduling_mode); ++ return kbasep_js_atom_priority_to_relative[atom_prio]; +} + +/** -+ * set_js_ctx_scheduling_mode - Set callback for js_ctx_scheduling_mode sysfs -+ * entry. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The value written to the sysfs file. -+ * @count: The number of bytes written to the sysfs file. ++ * kbasep_js_sched_prio_to_atom_prio - Convert relative scheduler priority ++ * to atom priority (base_jd_prio). + * -+ * This function is called when the js_ctx_scheduling_mode sysfs file is written -+ * to. It checks the data written, and if valid updates the ctx scheduling mode -+ * being by JS. ++ * @kbdev: Device pointer ++ * @sched_prio: Relative scheduler priority to translate. + * -+ * Return: @count if the function succeeded. An error code on failure. ++ * This function will convert relative scheduler priority back into base_jd_prio ++ * values. It takes values which priorities are monotonically increasing ++ * and converts them to the corresponding base_jd_prio values. If an invalid number is ++ * passed in (i.e. not within the expected range) an error code is returned instead. ++ * ++ * The mapping is 1:1 and the size of the valid input range is the same as the ++ * size of the valid output range, i.e. ++ * KBASE_JS_ATOM_SCHED_PRIO_COUNT == BASE_JD_NR_PRIO_LEVELS ++ * ++ * Return: On success: a value in the inclusive range ++ * 0..BASE_JD_NR_PRIO_LEVELS-1. On failure: BASE_JD_PRIO_INVALID. + */ -+static ssize_t set_js_ctx_scheduling_mode(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) ++static inline base_jd_prio kbasep_js_sched_prio_to_atom_prio(struct kbase_device *kbdev, ++ int sched_prio) +{ -+ struct kbase_context *kctx; -+ u32 new_js_ctx_scheduling_mode; -+ struct kbase_device *kbdev; -+ unsigned long flags; -+ int ret; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; -+ -+ ret = kstrtouint(buf, 0, &new_js_ctx_scheduling_mode); -+ if (ret || new_js_ctx_scheduling_mode >= KBASE_JS_PRIORITY_MODE_COUNT) { -+ dev_err(kbdev->dev, "Couldn't process js_ctx_scheduling_mode" -+ " write operation.\n" -+ "Use format \n"); -+ return -EINVAL; -+ } -+ -+ if (new_js_ctx_scheduling_mode == kbdev->js_ctx_scheduling_mode) -+ return count; ++ if (likely(sched_prio >= 0 && sched_prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT)) ++ return kbasep_js_relative_priority_to_atom[sched_prio]; ++ /* Invalid priority value if reached here */ ++ dev_warn(kbdev->dev, "Unknown JS scheduling priority %d", sched_prio); ++ return BASE_JD_PRIO_INVALID; ++} + -+ mutex_lock(&kbdev->kctx_list_lock); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++/** ++ * kbase_js_priority_check - Check the priority requested ++ * ++ * @kbdev: Device pointer ++ * @priority: Requested priority ++ * ++ * This will determine whether the requested priority can be satisfied. ++ * ++ * Return: The same or lower priority than requested. ++ */ ++base_jd_prio kbase_js_priority_check(struct kbase_device *kbdev, base_jd_prio priority); + -+ /* Update the context priority mode */ -+ kbdev->js_ctx_scheduling_mode = new_js_ctx_scheduling_mode; ++/** ++ * kbase_js_atom_runs_before - determine if atoms for the same slot have an ++ * ordering relation ++ * @kbdev: kbase device ++ * @katom_a: the first atom ++ * @katom_b: the second atom. ++ * @order_flags: combination of KBASE_ATOM_ORDERING_FLAG_<...> for the ordering ++ * relation ++ * ++ * This is for making consistent decisions about the ordering of atoms when we ++ * need to do pre-emption on a slot, which includes stopping existing atoms ++ * when a new atom is ready to run, and also which other atoms to remove from ++ * the slot when the atom in JSn_HEAD is being pre-empted. ++ * ++ * This only handles @katom_a and @katom_b being for the same job slot, as ++ * pre-emption only operates within a slot. ++ * ++ * Note: there is currently no use-case for this as a sorting comparison ++ * functions, hence only a boolean returned instead of int -1, 0, +1 return. If ++ * required in future, a modification to do so would be better than calling ++ * twice with katom_a and katom_b swapped. ++ * ++ * Return: ++ * true if @katom_a should run before @katom_b, false otherwise. ++ * A false return value does not distinguish between "no ordering relation" and ++ * "@katom_a should run after @katom_b". ++ */ ++bool kbase_js_atom_runs_before(struct kbase_device *kbdev, ++ const struct kbase_jd_atom *katom_a, ++ const struct kbase_jd_atom *katom_b, ++ const kbase_atom_ordering_flag_t order_flags); + -+ /* Adjust priority of all the contexts as per the new mode */ -+ list_for_each_entry(kctx, &kbdev->kctx_list, kctx_list_link) -+ kbase_js_update_ctx_priority(kctx); ++#endif /* _KBASE_JM_JS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h +new file mode 100755 +index 000000000..465cf7ec0 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h +@@ -0,0 +1,447 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2011-2023 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kbdev->kctx_list_lock); ++/** ++ * DOC: Job Scheduler Type Definitions ++ */ + -+ dev_dbg(kbdev->dev, "JS ctx scheduling mode: %u\n", new_js_ctx_scheduling_mode); ++#ifndef _KBASE_JS_DEFS_H_ ++#define _KBASE_JS_DEFS_H_ + -+ return count; -+} ++/* Forward decls */ ++struct kbase_device; ++struct kbase_jd_atom; + -+static DEVICE_ATTR(js_ctx_scheduling_mode, S_IRUGO | S_IWUSR, -+ show_js_ctx_scheduling_mode, -+ set_js_ctx_scheduling_mode); + -+#ifdef MALI_KBASE_BUILD ++typedef u32 kbase_context_flags; + -+/* Number of entries in serialize_jobs_settings[] */ -+#define NR_SERIALIZE_JOBS_SETTINGS 5 -+/* Maximum string length in serialize_jobs_settings[].name */ -+#define MAX_SERIALIZE_JOBS_NAME_LEN 16 ++/* ++ * typedef kbasep_js_ctx_job_cb - Callback function run on all of a context's ++ * jobs registered with the Job Scheduler ++ */ ++typedef void kbasep_js_ctx_job_cb(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom); + -+static struct -+{ -+ char *name; -+ u8 setting; -+} serialize_jobs_settings[NR_SERIALIZE_JOBS_SETTINGS] = { -+ {"none", 0}, -+ {"intra-slot", KBASE_SERIALIZE_INTRA_SLOT}, -+ {"inter-slot", KBASE_SERIALIZE_INTER_SLOT}, -+ {"full", KBASE_SERIALIZE_INTRA_SLOT | KBASE_SERIALIZE_INTER_SLOT}, -+ {"full-reset", KBASE_SERIALIZE_INTRA_SLOT | KBASE_SERIALIZE_INTER_SLOT | -+ KBASE_SERIALIZE_RESET} -+}; ++/* ++ * @brief Maximum number of jobs that can be submitted to a job slot whilst ++ * inside the IRQ handler. ++ * ++ * This is important because GPU NULL jobs can complete whilst the IRQ handler ++ * is running. Otherwise, it potentially allows an unlimited number of GPU NULL ++ * jobs to be submitted inside the IRQ handler, which increases IRQ latency. ++ */ ++#define KBASE_JS_MAX_JOB_SUBMIT_PER_SLOT_PER_IRQ 2 + +/** -+ * update_serialize_jobs_setting - Update the serialization setting for the -+ * submission of GPU jobs. ++ * enum kbasep_js_ctx_attr - Context attributes ++ * @KBASEP_JS_CTX_ATTR_COMPUTE: Attribute indicating a context that contains ++ * Compute jobs. ++ * @KBASEP_JS_CTX_ATTR_NON_COMPUTE: Attribute indicating a context that contains ++ * Non-Compute jobs. ++ * @KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES: Attribute indicating that a context ++ * contains compute-job atoms that aren't ++ * restricted to a coherent group, ++ * and can run on all cores. ++ * @KBASEP_JS_CTX_ATTR_COUNT: Must be the last in the enum + * -+ * This function is called when the serialize_jobs sysfs/debugfs file is -+ * written to. It matches the requested setting against the available settings -+ * and if a matching setting is found updates kbdev->serialize_jobs. ++ * Each context attribute can be thought of as a boolean value that caches some ++ * state information about either the runpool, or the context: ++ * - In the case of the runpool, it is a cache of "Do any contexts owned by ++ * the runpool have attribute X?" ++ * - In the case of a context, it is a cache of "Do any atoms owned by the ++ * context have attribute X?" + * -+ * @kbdev: An instance of the GPU platform device, allocated from the probe -+ * method of the driver. -+ * @buf: Buffer containing the value written to the sysfs/debugfs file. -+ * @count: The number of bytes to write to the sysfs/debugfs file. ++ * The boolean value of the context attributes often affect scheduling ++ * decisions, such as affinities to use and job slots to use. ++ * ++ * To accomodate changes of state in the context, each attribute is refcounted ++ * in the context, and in the runpool for all running contexts. Specifically: ++ * - The runpool holds a refcount of how many contexts in the runpool have this ++ * attribute. ++ * - The context holds a refcount of how many atoms have this attribute. ++ * ++ * KBASEP_JS_CTX_ATTR_COMPUTE: ++ * Attribute indicating a context that contains Compute jobs. That is, ++ * the context has jobs of type @ref BASE_JD_REQ_ONLY_COMPUTE ++ * ++ * @note A context can be both 'Compute' and 'Non Compute' if it contains ++ * both types of jobs. ++ * ++ * KBASEP_JS_CTX_ATTR_NON_COMPUTE: ++ * Attribute indicating a context that contains Non-Compute jobs. That is, ++ * the context has some jobs that are \b not of type @ref ++ * BASE_JD_REQ_ONLY_COMPUTE. ++ * ++ * @note A context can be both 'Compute' and 'Non Compute' if it contains ++ * both types of jobs. ++ * ++ * KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES: ++ * Attribute indicating that a context contains compute-job atoms that ++ * aren't restricted to a coherent group, and can run on all cores. ++ * ++ * Specifically, this is when the atom's \a core_req satisfy: ++ * - (\a core_req & (BASE_JD_REQ_CS | BASE_JD_REQ_ONLY_COMPUTE | BASE_JD_REQ_T) // uses slot 1 or slot 2 ++ * - && !(\a core_req & BASE_JD_REQ_COHERENT_GROUP) // not restricted to coherent groups ++ * ++ * Such atoms could be blocked from running if one of the coherent groups ++ * is being used by another job slot, so tracking this context attribute ++ * allows us to prevent such situations. ++ * ++ * @note This doesn't take into account the 1-coregroup case, where all ++ * compute atoms would effectively be able to run on 'all cores', but ++ * contexts will still not always get marked with this attribute. Instead, ++ * it is the caller's responsibility to take into account the number of ++ * coregroups when interpreting this attribute. ++ * ++ * @note Whilst Tiler atoms are normally combined with ++ * BASE_JD_REQ_COHERENT_GROUP, it is possible to send such atoms without ++ * BASE_JD_REQ_COHERENT_GROUP set. This is an unlikely case, but it's easy ++ * enough to handle anyway. + * -+ * Return: @count if the function succeeded. An error code on failure. + */ -+static ssize_t update_serialize_jobs_setting(struct kbase_device *kbdev, -+ const char *buf, size_t count) -+{ -+ int i; -+ bool valid = false; -+ -+ for (i = 0; i < NR_SERIALIZE_JOBS_SETTINGS; i++) { -+ if (sysfs_streq(serialize_jobs_settings[i].name, buf)) { -+ kbdev->serialize_jobs = -+ serialize_jobs_settings[i].setting; -+ valid = true; -+ break; -+ } -+ } -+ -+ if (!valid) { -+ dev_err(kbdev->dev, "serialize_jobs: invalid setting"); -+ return -EINVAL; -+ } ++enum kbasep_js_ctx_attr { ++ KBASEP_JS_CTX_ATTR_COMPUTE, ++ KBASEP_JS_CTX_ATTR_NON_COMPUTE, ++ KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES, ++ KBASEP_JS_CTX_ATTR_COUNT ++}; + -+ return count; -+} ++enum { ++ /* ++ * Bit indicating that new atom should be started because this atom ++ * completed ++ */ ++ KBASE_JS_ATOM_DONE_START_NEW_ATOMS = (1u << 0), ++ /* ++ * Bit indicating that the atom was evicted from the JS_NEXT registers ++ */ ++ KBASE_JS_ATOM_DONE_EVICTED_FROM_NEXT = (1u << 1) ++}; + -+#ifdef CONFIG_DEBUG_FS +/** -+ * kbasep_serialize_jobs_seq_debugfs_show - Show callback for the serialize_jobs -+ * debugfs file -+ * @sfile: seq_file pointer -+ * @data: Private callback data -+ * -+ * This function is called to get the contents of the serialize_jobs debugfs -+ * file. This is a list of the available settings with the currently active one -+ * surrounded by square brackets. -+ * -+ * Return: 0 on success, or an error code on error ++ * typedef kbasep_js_atom_done_code - Combination of KBASE_JS_ATOM_DONE_<...> ++ * bits + */ -+static int kbasep_serialize_jobs_seq_debugfs_show(struct seq_file *sfile, -+ void *data) -+{ -+ struct kbase_device *kbdev = sfile->private; -+ int i; ++typedef u32 kbasep_js_atom_done_code; + -+ CSTD_UNUSED(data); ++/* ++ * Context scheduling mode defines for kbase_device::js_ctx_scheduling_mode ++ */ ++enum { ++ /* ++ * In this mode, higher priority atoms will be scheduled first, ++ * regardless of the context they belong to. Newly-runnable higher ++ * priority atoms can preempt lower priority atoms currently running on ++ * the GPU, even if they belong to a different context. ++ */ ++ KBASE_JS_SYSTEM_PRIORITY_MODE = 0, + -+ for (i = 0; i < NR_SERIALIZE_JOBS_SETTINGS; i++) { -+ if (kbdev->serialize_jobs == serialize_jobs_settings[i].setting) -+ seq_printf(sfile, "[%s] ", -+ serialize_jobs_settings[i].name); -+ else -+ seq_printf(sfile, "%s ", -+ serialize_jobs_settings[i].name); -+ } ++ /* ++ * In this mode, the highest-priority atom will be chosen from each ++ * context in turn using a round-robin algorithm, so priority only has ++ * an effect within the context an atom belongs to. Newly-runnable ++ * higher priority atoms can preempt the lower priority atoms currently ++ * running on the GPU, but only if they belong to the same context. ++ */ ++ KBASE_JS_PROCESS_LOCAL_PRIORITY_MODE, + -+ seq_puts(sfile, "\n"); ++ /* Must be the last in the enum */ ++ KBASE_JS_PRIORITY_MODE_COUNT, ++}; + -+ return 0; -+} ++/* ++ * Internal atom priority defines for kbase_jd_atom::sched_prio ++ */ ++enum { ++ KBASE_JS_ATOM_SCHED_PRIO_FIRST = 0, ++ KBASE_JS_ATOM_SCHED_PRIO_REALTIME = KBASE_JS_ATOM_SCHED_PRIO_FIRST, ++ KBASE_JS_ATOM_SCHED_PRIO_HIGH, ++ KBASE_JS_ATOM_SCHED_PRIO_MED, ++ KBASE_JS_ATOM_SCHED_PRIO_LOW, ++ KBASE_JS_ATOM_SCHED_PRIO_COUNT, ++}; + -+/** -+ * kbasep_serialize_jobs_debugfs_write - Store callback for the serialize_jobs -+ * debugfs file. -+ * @file: File pointer -+ * @ubuf: User buffer containing data to store -+ * @count: Number of bytes in user buffer -+ * @ppos: File position ++/* Invalid priority for kbase_jd_atom::sched_prio */ ++#define KBASE_JS_ATOM_SCHED_PRIO_INVALID -1 ++ ++/* Default priority in the case of contexts with no atoms, or being lenient ++ * about invalid priorities from userspace. ++ */ ++#define KBASE_JS_ATOM_SCHED_PRIO_DEFAULT KBASE_JS_ATOM_SCHED_PRIO_MED ++ ++/* Atom priority bitmaps, where bit 0 is the highest priority, and higher bits ++ * indicate successively lower KBASE_JS_ATOM_SCHED_PRIO_<...> levels. ++ * ++ * Must be strictly larger than the number of bits to represent a bitmap of ++ * priorities, so that we can do calculations such as: ++ * (1 << KBASE_JS_ATOM_SCHED_PRIO_COUNT) - 1 ++ * ...without causing undefined behavior due to a shift beyond the width of the ++ * type ++ * ++ * If KBASE_JS_ATOM_SCHED_PRIO_COUNT starts requiring 32 bits, then it's worth ++ * moving to DECLARE_BITMAP() ++ */ ++typedef u8 kbase_js_prio_bitmap_t; ++ ++/* Ordering modification for kbase_js_atom_runs_before() */ ++typedef u32 kbase_atom_ordering_flag_t; ++ ++/* Atoms of the same context and priority should have their ordering decided by ++ * their seq_nr instead of their age. ++ * ++ * seq_nr is used as a more slowly changing variant of age - it increases once ++ * per group of related atoms, as determined by user-space. Hence, it can be ++ * used to limit re-ordering decisions (such as pre-emption) to only re-order ++ * between such groups, rather than re-order within those groups of atoms. ++ */ ++#define KBASE_ATOM_ORDERING_FLAG_SEQNR (((kbase_atom_ordering_flag_t)1) << 0) ++ ++/** ++ * struct kbasep_js_device_data - KBase Device Data Job Scheduler sub-structure ++ * @runpool_irq: Sub-structure to collect together Job Scheduling data used in ++ * IRQ context. The hwaccess_lock must be held when accessing. ++ * @runpool_irq.submit_allowed: Bitvector indicating whether a currently ++ * scheduled context is allowed to submit jobs. ++ * When bit 'N' is set in this, it indicates whether ++ * the context bound to address space 'N' is ++ * allowed to submit jobs. ++ * @runpool_irq.ctx_attr_ref_count: Array of Context Attributes Ref_counters: ++ * Each is large enough to hold a refcount of the number of contexts ++ * that can fit into the runpool. This is currently BASE_MAX_NR_AS. ++ * Note that when BASE_MAX_NR_AS==16 we need 5 bits (not 4) to store ++ * the refcount. Hence, it's not worthwhile reducing this to ++ * bit-manipulation on u32s to save space (where in contrast, 4 bit ++ * sub-fields would be easy to do and would save space). ++ * Whilst this must not become negative, the sign bit is used for: ++ * - error detection in debug builds ++ * - Optimization: it is undefined for a signed int to overflow, and so ++ * the compiler can optimize for that never happening (thus, no masking ++ * is required on updating the variable) ++ * @runpool_irq.slot_affinities: Affinity management and tracking. Bitvector ++ * to aid affinity checking. ++ * Element 'n' bit 'i' indicates that slot 'n' ++ * is using core i (i.e. slot_affinity_refcount[n][i] > 0) ++ * @runpool_irq.slot_affinity_refcount: Array of fefcount for each core owned ++ * by each slot. Used to generate the slot_affinities array of bitvectors. ++ * The value of the refcount will not exceed BASE_JM_SUBMIT_SLOTS, ++ * because it is refcounted only when a job is definitely about to be ++ * submitted to a slot, and is de-refcounted immediately after a job ++ * finishes ++ * @schedule_sem: Scheduling semaphore. This must be held when calling ++ * kbase_jm_kick() ++ * @ctx_list_pullable: List of contexts that can currently be pulled from ++ * @ctx_list_unpullable: List of contexts that can not currently be pulled ++ * from, but have jobs currently running. ++ * @nr_user_contexts_running: Number of currently scheduled user contexts ++ * (excluding ones that are not submitting jobs) ++ * @nr_all_contexts_running: Number of currently scheduled contexts (including ++ * ones that are not submitting jobs) ++ * @js_reqs: Core Requirements to match up with base_js_atom's core_req memeber ++ * @note This is a write-once member, and so no locking is required to ++ * read ++ * @scheduling_period_ns: Value for JS_SCHEDULING_PERIOD_NS ++ * @soft_stop_ticks: Value for JS_SOFT_STOP_TICKS ++ * @soft_stop_ticks_cl: Value for JS_SOFT_STOP_TICKS_CL ++ * @hard_stop_ticks_ss: Value for JS_HARD_STOP_TICKS_SS ++ * @hard_stop_ticks_cl: Value for JS_HARD_STOP_TICKS_CL ++ * @hard_stop_ticks_dumping: Value for JS_HARD_STOP_TICKS_DUMPING ++ * @gpu_reset_ticks_ss: Value for JS_RESET_TICKS_SS ++ * @gpu_reset_ticks_cl: Value for JS_RESET_TICKS_CL ++ * @gpu_reset_ticks_dumping: Value for JS_RESET_TICKS_DUMPING ++ * @ctx_timeslice_ns: Value for JS_CTX_TIMESLICE_NS ++ * @suspended_soft_jobs_list: List of suspended soft jobs ++ * @softstop_always: Support soft-stop on a single context ++ * @init_status:The initialized-flag is placed at the end, to avoid ++ * cache-pollution (we should only be using this during init/term paths). ++ * @note This is a write-once member, and so no locking is required to ++ * read ++ * @nr_contexts_pullable:Number of contexts that can currently be pulled from ++ * @nr_contexts_runnable:Number of contexts that can either be pulled from or ++ * arecurrently running ++ * @soft_job_timeout_ms:Value for JS_SOFT_JOB_TIMEOUT ++ * @js_free_wait_time_ms: Maximum waiting time in ms for a Job Slot to be seen free. ++ * @queue_mutex: Queue Lock, used to access the Policy's queue of contexts ++ * independently of the Run Pool. ++ * Of course, you don't need the Run Pool lock to access this. ++ * @runpool_mutex: Run Pool mutex, for managing contexts within the runpool. + * -+ * This function is called when the serialize_jobs debugfs file is written to. -+ * It matches the requested setting against the available settings and if a -+ * matching setting is found updates kbdev->serialize_jobs. ++ * This encapsulates the current context of the Job Scheduler on a particular ++ * device. This context is global to the device, and is not tied to any ++ * particular struct kbase_context running on the device. + * -+ * Return: @count if the function succeeded. An error code on failure. ++ * nr_contexts_running and as_free are optimized for packing together (by making ++ * them smaller types than u32). The operations on them should rarely involve ++ * masking. The use of signed types for arithmetic indicates to the compiler ++ * that the value will not rollover (which would be undefined behavior), and so ++ * under the Total License model, it is free to make optimizations based on ++ * that (i.e. to remove masking). + */ -+static ssize_t kbasep_serialize_jobs_debugfs_write(struct file *file, -+ const char __user *ubuf, size_t count, loff_t *ppos) -+{ -+ struct seq_file *s = file->private_data; -+ struct kbase_device *kbdev = s->private; -+ char buf[MAX_SERIALIZE_JOBS_NAME_LEN]; ++struct kbasep_js_device_data { ++ struct runpool_irq { ++ u16 submit_allowed; ++ s8 ctx_attr_ref_count[KBASEP_JS_CTX_ATTR_COUNT]; ++ u64 slot_affinities[BASE_JM_MAX_NR_SLOTS]; ++ s8 slot_affinity_refcount[BASE_JM_MAX_NR_SLOTS][64]; ++ } runpool_irq; ++ struct semaphore schedule_sem; ++ struct list_head ctx_list_pullable[BASE_JM_MAX_NR_SLOTS] ++ [KBASE_JS_ATOM_SCHED_PRIO_COUNT]; ++ struct list_head ctx_list_unpullable[BASE_JM_MAX_NR_SLOTS] ++ [KBASE_JS_ATOM_SCHED_PRIO_COUNT]; ++ s8 nr_user_contexts_running; ++ s8 nr_all_contexts_running; ++ base_jd_core_req js_reqs[BASE_JM_MAX_NR_SLOTS]; + -+ CSTD_UNUSED(ppos); ++ u32 scheduling_period_ns; ++ u32 soft_stop_ticks; ++ u32 soft_stop_ticks_cl; ++ u32 hard_stop_ticks_ss; ++ u32 hard_stop_ticks_cl; ++ u32 hard_stop_ticks_dumping; ++ u32 gpu_reset_ticks_ss; ++ u32 gpu_reset_ticks_cl; ++ u32 gpu_reset_ticks_dumping; ++ u32 ctx_timeslice_ns; + -+ count = min_t(size_t, sizeof(buf) - 1, count); -+ if (copy_from_user(buf, ubuf, count)) -+ return -EFAULT; ++ struct list_head suspended_soft_jobs_list; + -+ buf[count] = 0; ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ bool softstop_always; ++#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++ int init_status; ++ u32 nr_contexts_pullable; ++ atomic_t nr_contexts_runnable; ++ atomic_t soft_job_timeout_ms; ++ u32 js_free_wait_time_ms; + -+ return update_serialize_jobs_setting(kbdev, buf, count); -+} ++ struct mutex queue_mutex; ++ /* ++ * Run Pool mutex, for managing contexts within the runpool. ++ * Unless otherwise specified, you must hold this lock whilst accessing ++ * any members that follow ++ * ++ * In addition, this is used to access: ++ * * the kbasep_js_kctx_info::runpool substructure ++ */ ++ struct mutex runpool_mutex; ++}; + +/** -+ * kbasep_serialize_jobs_debugfs_open - Open callback for the serialize_jobs -+ * debugfs file -+ * @in: inode pointer -+ * @file: file pointer ++ * struct kbasep_js_kctx_info - KBase Context Job Scheduling information ++ * structure ++ * @ctx: Job Scheduler Context information sub-structure.Its members are ++ * accessed regardless of whether the context is: ++ * - In the Policy's Run Pool ++ * - In the Policy's Queue ++ * - Not queued nor in the Run Pool. ++ * You must obtain the @ctx.jsctx_mutex before accessing any other members ++ * of this substructure. ++ * You may not access any of its members from IRQ context. ++ * @ctx.jsctx_mutex: Job Scheduler Context lock ++ * @ctx.nr_jobs: Number of jobs ready to run - does \em not include ++ * the jobs waiting in the dispatcher, and dependency-only ++ * jobs. See kbase_jd_context::job_nr for such jobs ++ * @ctx.ctx_attr_ref_count: Context Attributes ref count. Each is large enough ++ * to hold a refcount of the number of atoms on the context. ++ * @ctx.is_scheduled_wait: Wait queue to wait for KCTX_SHEDULED flag state ++ * changes. ++ * @ctx.ctx_list_entry: Link implementing JS queues. Context can be present on ++ * one list per job slot. ++ * @init_status: The initalized-flag is placed at the end, to avoid ++ * cache-pollution (we should only be using this during init/term paths) + * -+ * Return: Zero on success, error code on failure ++ * This is a substructure in the struct kbase_context that encapsulates all the ++ * scheduling information. + */ -+static int kbasep_serialize_jobs_debugfs_open(struct inode *in, -+ struct file *file) -+{ -+ return single_open(file, kbasep_serialize_jobs_seq_debugfs_show, -+ in->i_private); -+} ++struct kbasep_js_kctx_info { ++ struct kbase_jsctx { ++ struct mutex jsctx_mutex; + -+static const struct file_operations kbasep_serialize_jobs_debugfs_fops = { -+ .owner = THIS_MODULE, -+ .open = kbasep_serialize_jobs_debugfs_open, -+ .read = seq_read, -+ .write = kbasep_serialize_jobs_debugfs_write, -+ .llseek = seq_lseek, -+ .release = single_release, ++ u32 nr_jobs; ++ u32 ctx_attr_ref_count[KBASEP_JS_CTX_ATTR_COUNT]; ++ wait_queue_head_t is_scheduled_wait; ++ struct list_head ctx_list_entry[BASE_JM_MAX_NR_SLOTS]; ++ } ctx; ++ int init_status; +}; + -+#endif /* CONFIG_DEBUG_FS */ -+ +/** -+ * show_serialize_jobs_sysfs - Show callback for serialize_jobs sysfs file. -+ * -+ * This function is called to get the contents of the serialize_jobs sysfs -+ * file. This is a list of the available settings with the currently active -+ * one surrounded by square brackets. -+ * -+ * @dev: The device this sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The output buffer for the sysfs file contents ++ * struct kbasep_js_atom_retained_state - Subset of atom state. ++ * @event_code: to determine whether the atom has finished ++ * @core_req: core requirements ++ * @sched_priority: priority ++ * @device_nr: Core group atom was executed on + * -+ * Return: The number of bytes output to @buf. ++ * Subset of atom state that can be available after kbase_jd_done_nolock() is called ++ * on that atom. A copy must be taken via kbasep_js_atom_retained_state_copy(), ++ * because the original atom could disappear. + */ -+static ssize_t show_serialize_jobs_sysfs(struct device *dev, -+ struct device_attribute *attr, -+ char *buf) -+{ -+ struct kbase_device *kbdev = to_kbase_device(dev); -+ ssize_t ret = 0; -+ int i; ++struct kbasep_js_atom_retained_state { ++ /* Event code - to determine whether the atom has finished */ ++ enum base_jd_event_code event_code; ++ /* core requirements */ ++ base_jd_core_req core_req; ++ /* priority */ ++ int sched_priority; ++ /* Core group atom was executed on */ ++ u32 device_nr; + -+ for (i = 0; i < NR_SERIALIZE_JOBS_SETTINGS; i++) { -+ if (kbdev->serialize_jobs == -+ serialize_jobs_settings[i].setting) -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "[%s]", -+ serialize_jobs_settings[i].name); -+ else -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s ", -+ serialize_jobs_settings[i].name); -+ } ++}; + -+ if (ret < PAGE_SIZE - 1) { -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "\n"); -+ } else { -+ buf[PAGE_SIZE - 2] = '\n'; -+ buf[PAGE_SIZE - 1] = '\0'; -+ ret = PAGE_SIZE - 1; -+ } ++/* ++ * Value signifying 'no retry on a slot required' for: ++ * - kbase_js_atom_retained_state::retry_submit_on_slot ++ * - kbase_jd_atom::retry_submit_on_slot ++ */ ++#define KBASEP_JS_RETRY_SUBMIT_SLOT_INVALID (-1) + -+ return ret; -+} ++/* ++ * base_jd_core_req value signifying 'invalid' for a ++ * kbase_jd_atom_retained_state. See kbase_atom_retained_state_is_valid() ++ */ ++#define KBASEP_JS_ATOM_RETAINED_STATE_CORE_REQ_INVALID BASE_JD_REQ_DEP ++ ++/* ++ * The JS timer resolution, in microseconds ++ * Any non-zero difference in time will be at least this size. ++ */ ++#define KBASEP_JS_TICK_RESOLUTION_US 1 + +/** -+ * store_serialize_jobs_sysfs - Store callback for serialize_jobs sysfs file. ++ * struct kbase_jsctx_slot_tracking - Job Scheduling tracking of a context's ++ * use of a job slot ++ * @blocked: bitmap of priorities that this slot is blocked at ++ * @atoms_pulled: counts of atoms that have been pulled from this slot, ++ * across all priority levels ++ * @atoms_pulled_pri: counts of atoms that have been pulled from this slot, per ++ * priority level + * -+ * This function is called when the serialize_jobs sysfs file is written to. -+ * It matches the requested setting against the available settings and if a -+ * matching setting is found updates kbdev->serialize_jobs. ++ * Controls how a slot from the &struct kbase_context's jsctx_queue is managed, ++ * for example to ensure correct ordering of atoms when atoms of different ++ * priorities are unpulled. ++ */ ++struct kbase_jsctx_slot_tracking { ++ kbase_js_prio_bitmap_t blocked; ++ atomic_t atoms_pulled; ++ int atoms_pulled_pri[KBASE_JS_ATOM_SCHED_PRIO_COUNT]; ++}; ++ ++#endif /* _KBASE_JS_DEFS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h b/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h +new file mode 100755 +index 000000000..11aedef80 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h +@@ -0,0 +1,185 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* + * -+ * @dev: The device this sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes to write to the sysfs file ++ * (C) COPYRIGHT 2014-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Return: @count if the function succeeded. An error code on failure. + */ -+static ssize_t store_serialize_jobs_sysfs(struct device *dev, -+ struct device_attribute *attr, -+ const char *buf, size_t count) -+{ -+ return update_serialize_jobs_setting(to_kbase_device(dev), buf, count); -+} + -+static DEVICE_ATTR(serialize_jobs, 0600, show_serialize_jobs_sysfs, -+ store_serialize_jobs_sysfs); -+#endif /* MALI_KBASE_BUILD */ -+#endif /* !MALI_USE_CSF */ ++/* AUTOMATICALLY GENERATED FILE. If you want to amend the issues/features, ++ * please update base/tools/hwconfig_generator/hwc_{issues,features}.py ++ * For more information see base/tools/hwconfig_generator/README ++ */ + -+static void kbasep_protected_mode_hwcnt_disable_worker(struct work_struct *data) -+{ -+ struct kbase_device *kbdev = container_of(data, struct kbase_device, -+ protected_mode_hwcnt_disable_work); -+ unsigned long flags; ++#ifndef _BASE_HWCONFIG_FEATURES_H_ ++#define _BASE_HWCONFIG_FEATURES_H_ + -+ bool do_disable; ++enum base_hw_feature { ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_TLS_HASHING, ++ BASE_HW_FEATURE_THREAD_GROUP_SPLIT, ++ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, ++ BASE_HW_FEATURE_IDVS_GROUP_SIZE, ++ BASE_HW_FEATURE_L2_CONFIG, ++ BASE_HW_FEATURE_ASN_HASH, ++ BASE_HW_FEATURE_GPU_SLEEP, ++ BASE_HW_FEATURE_FLUSH_INV_SHADER_OTHER, ++ BASE_HW_FEATURE_CORE_FEATURES, ++ BASE_HW_FEATURE_PBHA_HWU, ++ BASE_HW_FEATURE_LARGE_PAGE_ALLOC, ++ BASE_HW_FEATURE_END ++}; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ do_disable = !kbdev->protected_mode_hwcnt_desired && -+ !kbdev->protected_mode_hwcnt_disabled; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_generic[] = { ++ BASE_HW_FEATURE_END ++}; + -+ if (!do_disable) -+ return; ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tMIx[] = { ++ BASE_HW_FEATURE_THREAD_GROUP_SPLIT, ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_END ++}; + -+ kbase_hwcnt_context_disable(kbdev->hwcnt_gpu_ctx); ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tHEx[] = { ++ BASE_HW_FEATURE_THREAD_GROUP_SPLIT, ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_END ++}; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ do_disable = !kbdev->protected_mode_hwcnt_desired && -+ !kbdev->protected_mode_hwcnt_disabled; ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tSIx[] = { ++ BASE_HW_FEATURE_THREAD_GROUP_SPLIT, ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_END ++}; + -+ if (do_disable) { -+ /* Protected mode state did not change while we were doing the -+ * disable, so commit the work we just performed and continue -+ * the state machine. -+ */ -+ kbdev->protected_mode_hwcnt_disabled = true; -+#if !MALI_USE_CSF -+ kbase_backend_slot_update(kbdev); -+#endif /* !MALI_USE_CSF */ -+ } else { -+ /* Protected mode state was updated while we were doing the -+ * disable, so we need to undo the disable we just performed. -+ */ -+ kbase_hwcnt_context_enable(kbdev->hwcnt_gpu_ctx); -+ } ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tDVx[] = { ++ BASE_HW_FEATURE_THREAD_GROUP_SPLIT, ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_END ++}; + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+} ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tNOx[] = { ++ BASE_HW_FEATURE_THREAD_GROUP_SPLIT, ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_TLS_HASHING, ++ BASE_HW_FEATURE_IDVS_GROUP_SIZE, ++ BASE_HW_FEATURE_END ++}; + -+static int kbasep_protected_mode_enable(struct protected_mode_device *pdev) -+{ -+ struct kbase_device *kbdev = pdev->data; ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tGOx[] = { ++ BASE_HW_FEATURE_THREAD_GROUP_SPLIT, ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_TLS_HASHING, ++ BASE_HW_FEATURE_IDVS_GROUP_SIZE, ++ BASE_HW_FEATURE_CORE_FEATURES, ++ BASE_HW_FEATURE_END ++}; + -+ return kbase_pm_protected_mode_enable(kbdev); -+} ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tTRx[] = { ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_IDVS_GROUP_SIZE, ++ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, ++ BASE_HW_FEATURE_FLUSH_INV_SHADER_OTHER, ++ BASE_HW_FEATURE_END ++}; + -+static int kbasep_protected_mode_disable(struct protected_mode_device *pdev) -+{ -+ struct kbase_device *kbdev = pdev->data; ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tNAx[] = { ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_IDVS_GROUP_SIZE, ++ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, ++ BASE_HW_FEATURE_FLUSH_INV_SHADER_OTHER, ++ BASE_HW_FEATURE_END ++}; + -+ return kbase_pm_protected_mode_disable(kbdev); -+} ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tBEx[] = { ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_IDVS_GROUP_SIZE, ++ BASE_HW_FEATURE_L2_CONFIG, ++ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, ++ BASE_HW_FEATURE_FLUSH_INV_SHADER_OTHER, ++ BASE_HW_FEATURE_END ++}; + -+static const struct protected_mode_ops kbasep_native_protected_ops = { -+ .protected_mode_enable = kbasep_protected_mode_enable, -+ .protected_mode_disable = kbasep_protected_mode_disable ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tBAx[] = { ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_IDVS_GROUP_SIZE, ++ BASE_HW_FEATURE_L2_CONFIG, ++ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, ++ BASE_HW_FEATURE_FLUSH_INV_SHADER_OTHER, ++ BASE_HW_FEATURE_END +}; + -+int kbase_protected_mode_init(struct kbase_device *kbdev) -+{ -+ /* Use native protected ops */ -+ kbdev->protected_dev = kzalloc(sizeof(*kbdev->protected_dev), -+ GFP_KERNEL); -+ if (!kbdev->protected_dev) -+ return -ENOMEM; -+ kbdev->protected_dev->data = kbdev; -+ kbdev->protected_ops = &kbasep_native_protected_ops; -+ INIT_WORK(&kbdev->protected_mode_hwcnt_disable_work, -+ kbasep_protected_mode_hwcnt_disable_worker); -+ kbdev->protected_mode_hwcnt_desired = true; -+ kbdev->protected_mode_hwcnt_disabled = false; -+ return 0; -+} ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tODx[] = { ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_L2_CONFIG, ++ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, ++ BASE_HW_FEATURE_END ++}; + -+void kbase_protected_mode_term(struct kbase_device *kbdev) -+{ -+ cancel_work_sync(&kbdev->protected_mode_hwcnt_disable_work); -+ kfree(kbdev->protected_dev); -+} ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tGRx[] = { ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_L2_CONFIG, ++ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, ++ BASE_HW_FEATURE_CORE_FEATURES, ++ BASE_HW_FEATURE_END ++}; + -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+static int kbase_common_reg_map(struct kbase_device *kbdev) -+{ -+ return 0; -+} -+static void kbase_common_reg_unmap(struct kbase_device * const kbdev) -+{ -+} -+#else /* CONFIG_MALI_BIFROST_NO_MALI */ -+static int kbase_common_reg_map(struct kbase_device *kbdev) -+{ -+ int err = 0; ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tVAx[] = { ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_L2_CONFIG, ++ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, ++ BASE_HW_FEATURE_CORE_FEATURES, ++ BASE_HW_FEATURE_END ++}; + -+ if (!request_mem_region(kbdev->reg_start, kbdev->reg_size, dev_name(kbdev->dev))) { -+ dev_err(kbdev->dev, "Register window unavailable\n"); -+ err = -EIO; -+ goto out_region; -+ } ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tTUx[] = { ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_L2_CONFIG, ++ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, ++ BASE_HW_FEATURE_ASN_HASH, ++ BASE_HW_FEATURE_GPU_SLEEP, ++ BASE_HW_FEATURE_CORE_FEATURES, ++ BASE_HW_FEATURE_END ++}; + -+ kbdev->reg = ioremap(kbdev->reg_start, kbdev->reg_size); -+ if (!kbdev->reg) { -+ dev_err(kbdev->dev, "Can't remap register window\n"); -+ err = -EINVAL; -+ goto out_ioremap; -+ } ++__attribute__((unused)) static const enum base_hw_feature base_hw_features_tTIx[] = { ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_L2_CONFIG, ++ BASE_HW_FEATURE_CLEAN_ONLY_SAFE, ++ BASE_HW_FEATURE_ASN_HASH, ++ BASE_HW_FEATURE_GPU_SLEEP, ++ BASE_HW_FEATURE_CORE_FEATURES, ++ BASE_HW_FEATURE_PBHA_HWU, ++ BASE_HW_FEATURE_END ++}; + -+ return err; + -+out_ioremap: -+ release_mem_region(kbdev->reg_start, kbdev->reg_size); -+out_region: -+ return err; -+} ++#endif /* _BASE_HWCONFIG_FEATURES_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h b/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h +new file mode 100755 +index 000000000..0fbdec0bb +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h +@@ -0,0 +1,835 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2014-2023 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+static void kbase_common_reg_unmap(struct kbase_device * const kbdev) -+{ -+ if (kbdev->reg) { -+ iounmap(kbdev->reg); -+ release_mem_region(kbdev->reg_start, kbdev->reg_size); -+ kbdev->reg = NULL; -+ kbdev->reg_start = 0; -+ kbdev->reg_size = 0; -+ } -+} -+#endif /* CONFIG_MALI_BIFROST_NO_MALI */ ++/* AUTOMATICALLY GENERATED FILE. If you want to amend the issues/features, ++ * please update base/tools/hwconfig_generator/hwc_{issues,features}.py ++ * For more information see base/tools/hwconfig_generator/README ++ */ + -+int registers_map(struct kbase_device * const kbdev) -+{ -+ /* the first memory resource is the physical address of the GPU -+ * registers. -+ */ -+ struct platform_device *pdev = to_platform_device(kbdev->dev); -+ struct resource *reg_res; -+ int err; ++#ifndef _BASE_HWCONFIG_ISSUES_H_ ++#define _BASE_HWCONFIG_ISSUES_H_ + -+ reg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ if (!reg_res) { -+ dev_err(kbdev->dev, "Invalid register resource\n"); -+ return -ENOENT; -+ } ++enum base_hw_issue { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_7940, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TMIX_8138, ++ BASE_HW_ISSUE_TMIX_8206, ++ BASE_HW_ISSUE_TMIX_8343, ++ BASE_HW_ISSUE_TMIX_8463, ++ BASE_HW_ISSUE_TMIX_8456, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_TNOX_1194, ++ BASE_HW_ISSUE_TGOX_R1_1234, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TSIX_1792, ++ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, ++ BASE_HW_ISSUE_TTRX_3076, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TTRX_3485, ++ BASE_HW_ISSUE_GPU2019_3212, ++ BASE_HW_ISSUE_TURSEHW_1997, ++ BASE_HW_ISSUE_GPU2019_3878, ++ BASE_HW_ISSUE_TURSEHW_2716, ++ BASE_HW_ISSUE_GPU2019_3901, ++ BASE_HW_ISSUE_GPU2021PRO_290, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_TITANHW_2679, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ kbdev->reg_start = reg_res->start; -+ kbdev->reg_size = resource_size(reg_res); ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_generic[] = { ++ BASE_HW_ISSUE_END ++}; + -+#if MALI_USE_CSF -+ if (kbdev->reg_size < -+ (CSF_HW_DOORBELL_PAGE_OFFSET + -+ CSF_NUM_DOORBELL * CSF_HW_DOORBELL_PAGE_SIZE)) { -+ dev_err(kbdev->dev, "Insufficient register space, will override to the required size\n"); -+ kbdev->reg_size = CSF_HW_DOORBELL_PAGE_OFFSET + -+ CSF_NUM_DOORBELL * CSF_HW_DOORBELL_PAGE_SIZE; -+ } -+#endif ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tMIx_r0p0_05dev0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TMIX_8138, ++ BASE_HW_ISSUE_TMIX_8206, ++ BASE_HW_ISSUE_TMIX_8343, ++ BASE_HW_ISSUE_TMIX_8463, ++ BASE_HW_ISSUE_TMIX_8456, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ err = kbase_common_reg_map(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "Failed to map registers\n"); -+ return err; -+ } ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tMIx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_7940, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TMIX_8138, ++ BASE_HW_ISSUE_TMIX_8206, ++ BASE_HW_ISSUE_TMIX_8343, ++ BASE_HW_ISSUE_TMIX_8463, ++ BASE_HW_ISSUE_TMIX_8456, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ return 0; -+} ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tMIx_r0p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_7940, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TMIX_8138, ++ BASE_HW_ISSUE_TMIX_8206, ++ BASE_HW_ISSUE_TMIX_8343, ++ BASE_HW_ISSUE_TMIX_8463, ++ BASE_HW_ISSUE_TMIX_8456, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+void registers_unmap(struct kbase_device *kbdev) -+{ -+ kbase_common_reg_unmap(kbdev); -+} ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tMIx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_7940, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TMIX_8138, ++ BASE_HW_ISSUE_TMIX_8206, ++ BASE_HW_ISSUE_TMIX_8343, ++ BASE_HW_ISSUE_TMIX_8456, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+#if defined(CONFIG_MALI_ARBITER_SUPPORT) && defined(CONFIG_OF) ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tHEx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+static bool kbase_is_pm_enabled(const struct device_node *gpu_node) -+{ -+ const struct device_node *power_model_node; -+ const void *cooling_cells_node; -+ const void *operating_point_node; -+ bool is_pm_enable = false; ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tHEx_r0p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ power_model_node = of_get_child_by_name(gpu_node, -+ "power_model"); -+ if (power_model_node) -+ is_pm_enable = true; ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tHEx_r0p2[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ cooling_cells_node = of_get_property(gpu_node, -+ "#cooling-cells", NULL); -+ if (cooling_cells_node) -+ is_pm_enable = true; ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tHEx_r0p3[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ operating_point_node = of_get_property(gpu_node, -+ "operating-points", NULL); -+ if (operating_point_node) -+ is_pm_enable = true; ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tHEx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ return is_pm_enable; -+} ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tSIx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TSIX_1792, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+static bool kbase_is_pv_enabled(const struct device_node *gpu_node) -+{ -+ const void *arbiter_if_node; ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tSIx_r0p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TSIX_1792, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ arbiter_if_node = of_get_property(gpu_node, -+ "arbiter_if", NULL); ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tSIx_r1p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ return arbiter_if_node ? true : false; -+} ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tSIx_r1p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+static bool kbase_is_full_coherency_enabled(const struct device_node *gpu_node) -+{ -+ const void *coherency_dts; -+ u32 coherency; ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tSIx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ coherency_dts = of_get_property(gpu_node, -+ "system-coherency", -+ NULL); -+ if (coherency_dts) { -+ coherency = be32_to_cpup(coherency_dts); -+ if (coherency == COHERENCY_ACE) -+ return true; -+ } -+ return false; -+} ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tDVx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+#endif /* CONFIG_MALI_ARBITER_SUPPORT && CONFIG_OF */ ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tDVx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+int kbase_device_pm_init(struct kbase_device *kbdev) -+{ -+ int err = 0; ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tNOx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TNOX_1194, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+#if defined(CONFIG_MALI_ARBITER_SUPPORT) && defined(CONFIG_OF) ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tNOx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ u32 gpu_id; -+ u32 product_id; -+ u32 gpu_model_id; ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tGOx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TNOX_1194, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ if (kbase_is_pv_enabled(kbdev->dev->of_node)) { -+ if (kbase_is_pm_enabled(kbdev->dev->of_node)) { -+ /* Arbitration AND power management invalid */ -+ dev_err(kbdev->dev, "Invalid combination of arbitration AND power management\n"); -+ return -EPERM; -+ } -+ if (kbase_is_full_coherency_enabled(kbdev->dev->of_node)) { -+ /* Arbitration AND full coherency invalid */ -+ dev_err(kbdev->dev, "Invalid combination of arbitration AND full coherency\n"); -+ return -EPERM; -+ } -+ err = kbase_arbiter_pm_early_init(kbdev); -+ if (err == 0) { -+ /* Check if Arbitration is running on -+ * supported GPU platform -+ */ -+ kbase_pm_register_access_enable(kbdev); -+ gpu_id = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_ID)); -+ kbase_pm_register_access_disable(kbdev); -+ product_id = KBASE_UBFX32(gpu_id, -+ GPU_ID_VERSION_PRODUCT_ID_SHIFT, 16); -+ gpu_model_id = GPU_ID2_MODEL_MATCH_VALUE(product_id); ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tGOx_r1p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TGOX_R1_1234, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ if (gpu_model_id != GPU_ID2_PRODUCT_TGOX -+ && gpu_model_id != GPU_ID2_PRODUCT_TNOX) { -+ kbase_arbiter_pm_early_term(kbdev); -+ dev_err(kbdev->dev, "GPU platform not suitable for arbitration\n"); -+ return -EPERM; -+ } -+ } -+ } else { -+ err = power_control_init(kbdev); -+ } -+#else -+ err = power_control_init(kbdev); -+#endif /* CONFIG_MALI_ARBITER_SUPPORT && CONFIG_OF */ -+ return err; -+} ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tGOx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+void kbase_device_pm_term(struct kbase_device *kbdev) -+{ -+#ifdef CONFIG_MALI_ARBITER_SUPPORT -+#ifdef CONFIG_OF -+ if (kbase_is_pv_enabled(kbdev->dev->of_node)) -+ kbase_arbiter_pm_early_term(kbdev); -+ else -+ power_control_term(kbdev); -+#endif /* CONFIG_OF */ -+#else -+ power_control_term(kbdev); -+#endif -+} ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tTRx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, ++ BASE_HW_ISSUE_TTRX_3076, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TTRX_3485, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+int power_control_init(struct kbase_device *kbdev) -+{ -+#if KERNEL_VERSION(3, 18, 0) > LINUX_VERSION_CODE || !defined(CONFIG_OF) -+ /* Power control initialization requires at least the capability to get -+ * regulators and clocks from the device tree, as well as parsing -+ * arrays of unsigned integer values. -+ * -+ * The whole initialization process shall simply be skipped if the -+ * minimum capability is not available. -+ */ -+ return 0; -+#else -+ struct platform_device *pdev; -+ int err = 0; -+ unsigned int i; -+#if defined(CONFIG_REGULATOR) -+ static const char *regulator_names[] = { -+ "mali", "shadercores" -+ }; -+ BUILD_BUG_ON(ARRAY_SIZE(regulator_names) < BASE_MAX_NR_CLOCKS_REGULATORS); -+#endif /* CONFIG_REGULATOR */ ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tTRx_r0p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, ++ BASE_HW_ISSUE_TTRX_3076, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TTRX_3485, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ if (!kbdev) -+ return -ENODEV; ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tTRx_r0p2[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, ++ BASE_HW_ISSUE_TTRX_3076, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ pdev = to_platform_device(kbdev->dev); ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tTRx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+#if defined(CONFIG_REGULATOR) -+ /* Since the error code EPROBE_DEFER causes the entire probing -+ * procedure to be restarted from scratch at a later time, -+ * all regulators will be released before returning. -+ * -+ * Any other error is ignored and the driver will continue -+ * operating with a partial initialization of regulators. -+ */ -+ for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) { -+ kbdev->regulators[i] = regulator_get_optional(kbdev->dev, -+ regulator_names[i]); -+ if (IS_ERR_OR_NULL(kbdev->regulators[i])) { -+ err = PTR_ERR(kbdev->regulators[i]); -+ kbdev->regulators[i] = NULL; -+ break; -+ } -+ } -+ if (err == -EPROBE_DEFER) { -+ while ((i > 0) && (i < BASE_MAX_NR_CLOCKS_REGULATORS)) -+ regulator_put(kbdev->regulators[--i]); -+ return err; -+ } ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tNAx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, ++ BASE_HW_ISSUE_TTRX_3076, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TTRX_3485, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ kbdev->nr_regulators = i; -+ dev_dbg(&pdev->dev, "Regulators probed: %u\n", kbdev->nr_regulators); -+#endif ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tNAx_r0p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, ++ BASE_HW_ISSUE_TTRX_3076, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_GPU2017_1336, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ /* Having more clocks than regulators is acceptable, while the -+ * opposite shall not happen. -+ * -+ * Since the error code EPROBE_DEFER causes the entire probing -+ * procedure to be restarted from scratch at a later time, -+ * all clocks and regulators will be released before returning. -+ * -+ * Any other error is ignored and the driver will continue -+ * operating with a partial initialization of clocks. -+ */ -+ for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) { -+ kbdev->clocks[i] = of_clk_get(kbdev->dev->of_node, i); -+ if (IS_ERR_OR_NULL(kbdev->clocks[i])) { -+ err = PTR_ERR(kbdev->clocks[i]); -+ kbdev->clocks[i] = NULL; -+ break; -+ } ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tNAx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ err = clk_prepare(kbdev->clocks[i]); -+ if (err) { -+ dev_err(kbdev->dev, -+ "Failed to prepare and enable clock (%d)\n", -+ err); -+ clk_put(kbdev->clocks[i]); -+ break; -+ } -+ } -+ if (err == -EPROBE_DEFER) { -+ while ((i > 0) && (i < BASE_MAX_NR_CLOCKS_REGULATORS)) { -+ clk_unprepare(kbdev->clocks[--i]); -+ clk_put(kbdev->clocks[i]); -+ } -+ goto clocks_probe_defer; -+ } ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tBEx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TTRX_3485, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ kbdev->nr_clocks = i; -+ dev_dbg(&pdev->dev, "Clocks probed: %u\n", kbdev->nr_clocks); ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tBEx_r0p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+#if defined(CONFIG_PM_OPP) -+#if ((KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE) && \ -+ defined(CONFIG_REGULATOR)) -+ if (kbdev->nr_regulators > 0) { -+ kbdev->opp_table = dev_pm_opp_set_regulators(kbdev->dev, -+ regulator_names, BASE_MAX_NR_CLOCKS_REGULATORS); -+ } -+#endif /* (KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE */ -+#ifdef CONFIG_ARCH_ROCKCHIP -+ err = kbase_platform_rk_init_opp_table(kbdev); -+ if (err) -+ dev_err(kbdev->dev, "Failed to init_opp_table (%d)\n", err); -+#else -+ err = dev_pm_opp_of_add_table(kbdev->dev); -+ CSTD_UNUSED(err); -+#endif -+#endif /* CONFIG_PM_OPP */ ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tBEx_r1p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+#endif /* KERNEL_VERSION(4, 4, 0) > LINUX_VERSION_CODE */ -+ return 0; ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tBEx_r1p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+clocks_probe_defer: -+#if defined(CONFIG_REGULATOR) -+ for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) -+ regulator_put(kbdev->regulators[i]); -+#endif -+ return err; -+} ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tBEx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+void power_control_term(struct kbase_device *kbdev) -+{ -+ unsigned int i; ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_lBEx_r1p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TTRX_3485, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+#if (KERNEL_VERSION(4, 4, 0) > LINUX_VERSION_CODE && \ -+ !defined(LSK_OPPV2_BACKPORT)) -+#if KERNEL_VERSION(3, 19, 0) <= LINUX_VERSION_CODE -+ of_free_opp_table(kbdev->dev); -+#endif -+#else ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_lBEx_r1p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+#if defined(CONFIG_PM_OPP) -+ dev_pm_opp_of_remove_table(kbdev->dev); -+#if ((KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE) && \ -+ defined(CONFIG_REGULATOR)) -+ if (!IS_ERR_OR_NULL(kbdev->opp_table)) -+ dev_pm_opp_put_regulators(kbdev->opp_table); -+#endif /* (KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE */ -+#endif /* CONFIG_PM_OPP */ ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tBAx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+#endif /* KERNEL_VERSION(4, 4, 0) > LINUX_VERSION_CODE */ ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tBAx_r1p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_2968_TTRX_3162, ++ BASE_HW_ISSUE_TTRX_921, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) { -+ if (kbdev->clocks[i]) { -+ clk_unprepare(kbdev->clocks[i]); -+ clk_put(kbdev->clocks[i]); -+ kbdev->clocks[i] = NULL; -+ } else -+ break; -+ } ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tBAx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TTRX_3414, ++ BASE_HW_ISSUE_TTRX_3083, ++ BASE_HW_ISSUE_TTRX_3470, ++ BASE_HW_ISSUE_TTRX_3464, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) && defined(CONFIG_OF) \ -+ && defined(CONFIG_REGULATOR) -+ for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) { -+ if (kbdev->regulators[i]) { -+ regulator_put(kbdev->regulators[i]); -+ kbdev->regulators[i] = NULL; -+ } -+ } -+#endif /* LINUX_VERSION_CODE >= 3, 12, 0 */ -+} ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tODx_r0p0[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_GPU2019_3212, ++ BASE_HW_ISSUE_GPU2019_3878, ++ BASE_HW_ISSUE_GPU2019_3901, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+#ifdef MALI_KBASE_BUILD -+#ifdef CONFIG_DEBUG_FS ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tODx[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_GPU2019_3212, ++ BASE_HW_ISSUE_GPU2019_3878, ++ BASE_HW_ISSUE_GPU2019_3901, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+static void trigger_reset(struct kbase_device *kbdev) -+{ -+ kbase_pm_context_active(kbdev); -+ if (kbase_prepare_to_reset_gpu(kbdev)) -+ kbase_reset_gpu(kbdev); -+ kbase_pm_context_idle(kbdev); -+} ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tGRx_r0p0[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_GPU2019_3878, ++ BASE_HW_ISSUE_GPU2019_3901, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+#define MAKE_QUIRK_ACCESSORS(type) \ -+static int type##_quirks_set(void *data, u64 val) \ -+{ \ -+ struct kbase_device *kbdev; \ -+ kbdev = (struct kbase_device *)data; \ -+ kbdev->hw_quirks_##type = (u32)val; \ -+ trigger_reset(kbdev); \ -+ return 0;\ -+} \ -+\ -+static int type##_quirks_get(void *data, u64 *val) \ -+{ \ -+ struct kbase_device *kbdev;\ -+ kbdev = (struct kbase_device *)data;\ -+ *val = kbdev->hw_quirks_##type;\ -+ return 0;\ -+} \ -+DEFINE_SIMPLE_ATTRIBUTE(fops_##type##_quirks, type##_quirks_get,\ -+ type##_quirks_set, "%llu\n") ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tGRx[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_GPU2019_3878, ++ BASE_HW_ISSUE_GPU2019_3901, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+MAKE_QUIRK_ACCESSORS(sc); -+MAKE_QUIRK_ACCESSORS(tiler); -+MAKE_QUIRK_ACCESSORS(mmu); -+MAKE_QUIRK_ACCESSORS(jm); ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tVAx_r0p0[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_GPU2019_3878, ++ BASE_HW_ISSUE_GPU2019_3901, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+static ssize_t kbase_device_debugfs_reset_write(struct file *file, -+ const char __user *ubuf, size_t count, loff_t *ppos) -+{ -+ struct kbase_device *kbdev = file->private_data; -+ CSTD_UNUSED(ubuf); -+ CSTD_UNUSED(count); -+ CSTD_UNUSED(ppos); ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tVAx[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_GPU2019_3878, ++ BASE_HW_ISSUE_GPU2019_3901, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ trigger_reset(kbdev); ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tTUx_r0p0[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TURSEHW_1997, ++ BASE_HW_ISSUE_GPU2019_3878, ++ BASE_HW_ISSUE_TURSEHW_2716, ++ BASE_HW_ISSUE_GPU2019_3901, ++ BASE_HW_ISSUE_GPU2021PRO_290, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_TITANHW_2679, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+ return count; -+} ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tTUx_r0p1[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TURSEHW_1997, ++ BASE_HW_ISSUE_GPU2019_3878, ++ BASE_HW_ISSUE_TURSEHW_2716, ++ BASE_HW_ISSUE_GPU2019_3901, ++ BASE_HW_ISSUE_GPU2021PRO_290, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_TITANHW_2679, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; + -+static const struct file_operations fops_trigger_reset = { -+ .owner = THIS_MODULE, -+ .open = simple_open, -+ .write = kbase_device_debugfs_reset_write, -+ .llseek = default_llseek, ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tTUx[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_GPU2019_3878, ++ BASE_HW_ISSUE_TURSEHW_2716, ++ BASE_HW_ISSUE_GPU2019_3901, ++ BASE_HW_ISSUE_GPU2021PRO_290, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_TITANHW_2679, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END +}; + -+/** -+ * debugfs_protected_debug_mode_read - "protected_debug_mode" debugfs read -+ * @file: File object to read is for -+ * @buf: User buffer to populate with data -+ * @len: Length of user buffer -+ * @ppos: Offset within file object ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tTUx_r1p0[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_GPU2019_3878, ++ BASE_HW_ISSUE_TURSEHW_2716, ++ BASE_HW_ISSUE_GPU2019_3901, ++ BASE_HW_ISSUE_GPU2021PRO_290, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_TITANHW_2679, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; ++ ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tTUx_r1p1[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_GPU2019_3878, ++ BASE_HW_ISSUE_TURSEHW_2716, ++ BASE_HW_ISSUE_GPU2019_3901, ++ BASE_HW_ISSUE_GPU2021PRO_290, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_TITANHW_2679, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; ++ ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tTUx_r1p2[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_GPU2019_3878, ++ BASE_HW_ISSUE_TURSEHW_2716, ++ BASE_HW_ISSUE_GPU2019_3901, ++ BASE_HW_ISSUE_GPU2021PRO_290, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_TITANHW_2679, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; ++ ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tTUx_r1p3[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_GPU2019_3878, ++ BASE_HW_ISSUE_TURSEHW_2716, ++ BASE_HW_ISSUE_GPU2019_3901, ++ BASE_HW_ISSUE_GPU2021PRO_290, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_TITANHW_2679, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; ++ ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_model_tTIx[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TURSEHW_2716, ++ BASE_HW_ISSUE_GPU2021PRO_290, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_TITANHW_2679, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; ++ ++__attribute__((unused)) static const enum base_hw_issue base_hw_issues_tTIx_r0p0[] = { ++ BASE_HW_ISSUE_TSIX_2033, ++ BASE_HW_ISSUE_TTRX_1337, ++ BASE_HW_ISSUE_TURSEHW_2716, ++ BASE_HW_ISSUE_GPU2021PRO_290, ++ BASE_HW_ISSUE_TITANHW_2710, ++ BASE_HW_ISSUE_TITANHW_2679, ++ BASE_HW_ISSUE_GPU2022PRO_148, ++ BASE_HW_ISSUE_END ++}; ++ ++ ++#endif /* _BASE_HWCONFIG_ISSUES_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase.h b/drivers/gpu/arm/bifrost/mali_kbase.h +new file mode 100755 +index 000000000..542e8f63f +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase.h +@@ -0,0 +1,752 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* + * -+ * Retrieves the current status of protected debug mode -+ * (0 = disabled, 1 = enabled) ++ * (C) COPYRIGHT 2010-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Return: Number of bytes added to user buffer + */ -+static ssize_t debugfs_protected_debug_mode_read(struct file *file, -+ char __user *buf, size_t len, loff_t *ppos) -+{ -+ struct kbase_device *kbdev = (struct kbase_device *)file->private_data; -+ u32 gpu_status; -+ ssize_t ret_val; + -+ kbase_pm_context_active(kbdev); -+ gpu_status = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_STATUS)); -+ kbase_pm_context_idle(kbdev); ++#ifndef _KBASE_H_ ++#define _KBASE_H_ + -+ if (gpu_status & GPU_DBGEN) -+ ret_val = simple_read_from_buffer(buf, len, ppos, "1\n", 2); -+ else -+ ret_val = simple_read_from_buffer(buf, len, ppos, "0\n", 2); ++#include + -+ return ret_val; -+} ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#if (KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE) ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include + +/* -+ * struct fops_protected_debug_mode - "protected_debug_mode" debugfs fops -+ * -+ * Contains the file operations for the "protected_debug_mode" debugfs file ++ * Include mali_kbase_defs.h first as this provides types needed by other local ++ * header files. + */ -+static const struct file_operations fops_protected_debug_mode = { -+ .owner = THIS_MODULE, -+ .open = simple_open, -+ .read = debugfs_protected_debug_mode_read, -+ .llseek = default_llseek, -+}; ++#include "mali_kbase_defs.h" + -+static int kbase_device_debugfs_mem_pool_max_size_show(struct seq_file *sfile, -+ void *data) -+{ -+ CSTD_UNUSED(data); -+ return kbase_debugfs_helper_seq_read(sfile, -+ MEMORY_GROUP_MANAGER_NR_GROUPS, -+ kbase_mem_pool_config_debugfs_max_size); -+} ++#include "debug/mali_kbase_debug_ktrace.h" ++#include "context/mali_kbase_context.h" ++#include "mali_kbase_strings.h" ++#include "mali_kbase_mem_lowlevel.h" ++#include "mali_kbase_utility.h" ++#include "mali_kbase_mem.h" ++#include "mmu/mali_kbase_mmu.h" ++#include "mali_kbase_gpu_memory_debugfs.h" ++#include "mali_kbase_mem_profile_debugfs.h" ++#include "mali_kbase_gpuprops.h" ++#include ++#if !MALI_USE_CSF ++#include "mali_kbase_debug_job_fault.h" ++#include "mali_kbase_jd_debugfs.h" ++#include "mali_kbase_jm.h" ++#include "mali_kbase_js.h" ++#else /* !MALI_USE_CSF */ ++#include "csf/mali_kbase_debug_csf_fault.h" ++#endif /* MALI_USE_CSF */ + -+static ssize_t kbase_device_debugfs_mem_pool_max_size_write(struct file *file, -+ const char __user *ubuf, size_t count, loff_t *ppos) -+{ -+ int err = 0; ++#include "ipa/mali_kbase_ipa.h" + -+ CSTD_UNUSED(ppos); -+ err = kbase_debugfs_helper_seq_write(file, ubuf, count, -+ MEMORY_GROUP_MANAGER_NR_GROUPS, -+ kbase_mem_pool_config_debugfs_set_max_size); ++#if IS_ENABLED(CONFIG_GPU_TRACEPOINTS) ++#include ++#endif + -+ return err ? err : count; -+} ++#include "mali_linux_trace.h" + -+static int kbase_device_debugfs_mem_pool_max_size_open(struct inode *in, -+ struct file *file) -+{ -+ return single_open(file, kbase_device_debugfs_mem_pool_max_size_show, -+ in->i_private); -+} ++#if MALI_USE_CSF ++#include "csf/mali_kbase_csf.h" + -+static const struct file_operations -+ kbase_device_debugfs_mem_pool_max_size_fops = { -+ .owner = THIS_MODULE, -+ .open = kbase_device_debugfs_mem_pool_max_size_open, -+ .read = seq_read, -+ .write = kbase_device_debugfs_mem_pool_max_size_write, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; ++/* Physical memory group ID for CSF user I/O. ++ */ ++#define KBASE_MEM_GROUP_CSF_IO BASE_MEM_GROUP_DEFAULT + -+int kbase_device_debugfs_init(struct kbase_device *kbdev) -+{ -+ struct dentry *debugfs_ctx_defaults_directory; -+ int err; -+ /* prevent unprivileged use of debug file system -+ * in old kernel version -+ */ -+#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE) -+ /* only for newer kernel version debug file system is safe */ -+ const mode_t mode = 0644; -+#else -+ const mode_t mode = 0600; ++/* Physical memory group ID for CSF firmware. ++ */ ++#define KBASE_MEM_GROUP_CSF_FW BASE_MEM_GROUP_DEFAULT +#endif + -+ kbdev->mali_debugfs_directory = debugfs_create_dir(kbdev->devname, -+ NULL); -+ if (!kbdev->mali_debugfs_directory) { -+ dev_err(kbdev->dev, "Couldn't create mali debugfs directory\n"); -+ err = -ENOMEM; -+ goto out; -+ } -+ -+ kbdev->debugfs_ctx_directory = debugfs_create_dir("ctx", -+ kbdev->mali_debugfs_directory); -+ if (!kbdev->debugfs_ctx_directory) { -+ dev_err(kbdev->dev, "Couldn't create mali debugfs ctx directory\n"); -+ err = -ENOMEM; -+ goto out; -+ } ++/* Physical memory group ID for a special page which can alias several regions. ++ */ ++#define KBASE_MEM_GROUP_SINK BASE_MEM_GROUP_DEFAULT + -+ kbdev->debugfs_instr_directory = debugfs_create_dir("instrumentation", -+ kbdev->mali_debugfs_directory); -+ if (!kbdev->debugfs_instr_directory) { -+ dev_err(kbdev->dev, "Couldn't create mali debugfs instrumentation directory\n"); -+ err = -ENOMEM; -+ goto out; -+ } ++/* ++ * Kernel-side Base (KBase) APIs ++ */ + -+ debugfs_ctx_defaults_directory = debugfs_create_dir("defaults", -+ kbdev->debugfs_ctx_directory); -+ if (!debugfs_ctx_defaults_directory) { -+ dev_err(kbdev->dev, "Couldn't create mali debugfs ctx defaults directory\n"); -+ err = -ENOMEM; -+ goto out; -+ } ++struct kbase_device *kbase_device_alloc(void); ++/* ++ * note: configuration attributes member of kbdev needs to have ++ * been setup before calling kbase_device_init ++ */ + -+#if !MALI_CUSTOMER_RELEASE -+ kbasep_regs_dump_debugfs_init(kbdev); -+#endif /* !MALI_CUSTOMER_RELEASE */ -+ kbasep_regs_history_debugfs_init(kbdev); ++int kbase_device_misc_init(struct kbase_device *kbdev); ++void kbase_device_misc_term(struct kbase_device *kbdev); + +#if !MALI_USE_CSF -+ kbase_debug_job_fault_debugfs_init(kbdev); -+#endif /* !MALI_USE_CSF */ -+ -+ kbasep_gpu_memory_debugfs_init(kbdev); -+ kbase_as_fault_debugfs_init(kbdev); -+#ifdef CONFIG_MALI_PRFCNT_SET_SECONDARY_VIA_DEBUG_FS -+ kbase_instr_backend_debugfs_init(kbdev); ++void kbase_enable_quick_reset(struct kbase_device *kbdev); ++void kbase_disable_quick_reset(struct kbase_device *kbdev); ++bool kbase_is_quick_reset_enabled(struct kbase_device *kbdev); +#endif -+ /* fops_* variables created by invocations of macro -+ * MAKE_QUIRK_ACCESSORS() above. */ -+ debugfs_create_file("quirks_sc", 0644, -+ kbdev->mali_debugfs_directory, kbdev, -+ &fops_sc_quirks); -+ debugfs_create_file("quirks_tiler", 0644, -+ kbdev->mali_debugfs_directory, kbdev, -+ &fops_tiler_quirks); -+ debugfs_create_file("quirks_mmu", 0644, -+ kbdev->mali_debugfs_directory, kbdev, -+ &fops_mmu_quirks); -+ debugfs_create_file("quirks_jm", 0644, -+ kbdev->mali_debugfs_directory, kbdev, -+ &fops_jm_quirks); -+ -+ debugfs_create_bool("infinite_cache", mode, -+ debugfs_ctx_defaults_directory, -+ &kbdev->infinite_cache_active_default); + -+ debugfs_create_file("mem_pool_max_size", mode, -+ debugfs_ctx_defaults_directory, -+ &kbdev->mem_pool_defaults.small, -+ &kbase_device_debugfs_mem_pool_max_size_fops); ++void kbase_device_free(struct kbase_device *kbdev); ++int kbase_device_has_feature(struct kbase_device *kbdev, u32 feature); + -+ debugfs_create_file("lp_mem_pool_max_size", mode, -+ debugfs_ctx_defaults_directory, -+ &kbdev->mem_pool_defaults.large, -+ &kbase_device_debugfs_mem_pool_max_size_fops); ++/* Needed for gator integration and for reporting vsync information */ ++struct kbase_device *kbase_find_device(int minor); ++void kbase_release_device(struct kbase_device *kbdev); + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_DEBUG_MODE)) { -+ debugfs_create_file("protected_debug_mode", S_IRUGO, -+ kbdev->mali_debugfs_directory, kbdev, -+ &fops_protected_debug_mode); -+ } ++/** ++ * kbase_context_get_unmapped_area() - get an address range which is currently ++ * unmapped. ++ * @kctx: A kernel base context (which has its own GPU address space). ++ * @addr: CPU mapped address (set to 0 since MAP_FIXED mapping is not allowed ++ * as Mali GPU driver decides about the mapping). ++ * @len: Length of the address range. ++ * @pgoff: Page offset within the GPU address space of the kbase context. ++ * @flags: Flags for the allocation. ++ * ++ * Finds the unmapped address range which satisfies requirements specific to ++ * GPU and those provided by the call parameters. ++ * ++ * 1) Requirement for allocations greater than 2MB: ++ * - alignment offset is set to 2MB and the alignment mask to 2MB decremented ++ * by 1. ++ * ++ * 2) Requirements imposed for the shader memory alignment: ++ * - alignment is decided by the number of GPU pc bits which can be read from ++ * GPU properties of the device associated with this kbase context; alignment ++ * offset is set to this value in bytes and the alignment mask to the offset ++ * decremented by 1. ++ * - allocations must not to be at 4GB boundaries. Such cases are indicated ++ * by the flag KBASE_REG_GPU_NX not being set (check the flags of the kbase ++ * region). 4GB boundaries can be checked against @ref BASE_MEM_MASK_4GB. ++ * ++ * 3) Requirements imposed for tiler memory alignment, cases indicated by ++ * the flag @ref KBASE_REG_TILER_ALIGN_TOP (check the flags of the kbase ++ * region): ++ * - alignment offset is set to the difference between the kbase region ++ * extension (converted from the original value in pages to bytes) and the kbase ++ * region initial_commit (also converted from the original value in pages to ++ * bytes); alignment mask is set to the kbase region extension in bytes and ++ * decremented by 1. ++ * ++ * Return: if successful, address of the unmapped area aligned as required; ++ * error code (negative) in case of failure; ++ */ ++unsigned long kbase_context_get_unmapped_area(struct kbase_context *kctx, ++ const unsigned long addr, const unsigned long len, ++ const unsigned long pgoff, const unsigned long flags); + -+ debugfs_create_file("reset", 0644, -+ kbdev->mali_debugfs_directory, kbdev, -+ &fops_trigger_reset); + -+ kbase_ktrace_debugfs_init(kbdev); ++int assign_irqs(struct kbase_device *kbdev); + -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+#ifdef CONFIG_DEVFREQ_THERMAL -+ if (kbdev->devfreq && !kbdev->model_data) -+ kbase_ipa_debugfs_init(kbdev); -+#endif /* CONFIG_DEVFREQ_THERMAL */ -+#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ ++int kbase_sysfs_init(struct kbase_device *kbdev); ++void kbase_sysfs_term(struct kbase_device *kbdev); + -+#if MALI_USE_CSF -+ kbase_csf_debugfs_init(kbdev); -+#else -+ debugfs_create_file("serialize_jobs", S_IRUGO | S_IWUSR, -+ kbdev->mali_debugfs_directory, kbdev, -+ &kbasep_serialize_jobs_debugfs_fops); -+#endif + -+ return 0; ++int kbase_protected_mode_init(struct kbase_device *kbdev); ++void kbase_protected_mode_term(struct kbase_device *kbdev); + -+out: -+ debugfs_remove_recursive(kbdev->mali_debugfs_directory); -+ return err; -+} ++/** ++ * kbase_device_pm_init() - Performs power management initialization and ++ * Verifies device tree configurations. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Return: 0 if successful, otherwise a standard Linux error code ++ */ ++int kbase_device_pm_init(struct kbase_device *kbdev); + -+void kbase_device_debugfs_term(struct kbase_device *kbdev) -+{ -+ debugfs_remove_recursive(kbdev->mali_debugfs_directory); -+} -+#endif /* CONFIG_DEBUG_FS */ -+#endif /* MALI_KBASE_BUILD */ ++/** ++ * kbase_device_pm_term() - Performs power management deinitialization and ++ * Free resources. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Clean up all the resources ++ */ ++void kbase_device_pm_term(struct kbase_device *kbdev); + -+int kbase_device_coherency_init(struct kbase_device *kbdev) -+{ -+#ifdef CONFIG_OF -+ u32 supported_coherency_bitmap = -+ kbdev->gpu_props.props.raw_props.coherency_mode; -+ const void *coherency_override_dts; -+ u32 override_coherency, gpu_id; -+ unsigned int prod_id; + -+ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ gpu_id &= GPU_ID_VERSION_PRODUCT_ID; -+ prod_id = gpu_id >> GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++int power_control_init(struct kbase_device *kbdev); ++void power_control_term(struct kbase_device *kbdev); + -+ /* Only for tMIx : -+ * (COHERENCY_ACE_LITE | COHERENCY_ACE) was incorrectly -+ * documented for tMIx so force correct value here. -+ */ -+ if (GPU_ID2_MODEL_MATCH_VALUE(prod_id) == -+ GPU_ID2_PRODUCT_TMIX) -+ if (supported_coherency_bitmap == -+ COHERENCY_FEATURE_BIT(COHERENCY_ACE)) -+ supported_coherency_bitmap |= -+ COHERENCY_FEATURE_BIT(COHERENCY_ACE_LITE); ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++void kbase_device_debugfs_term(struct kbase_device *kbdev); ++int kbase_device_debugfs_init(struct kbase_device *kbdev); ++#else /* CONFIG_DEBUG_FS */ ++static inline int kbase_device_debugfs_init(struct kbase_device *kbdev) ++{ ++ return 0; ++} + -+#endif /* CONFIG_OF */ ++static inline void kbase_device_debugfs_term(struct kbase_device *kbdev) { } ++#endif /* CONFIG_DEBUG_FS */ + -+ kbdev->system_coherency = COHERENCY_NONE; ++int registers_map(struct kbase_device *kbdev); ++void registers_unmap(struct kbase_device *kbdev); + -+ /* device tree may override the coherency */ -+#ifdef CONFIG_OF -+ coherency_override_dts = of_get_property(kbdev->dev->of_node, -+ "system-coherency", -+ NULL); -+ if (coherency_override_dts) { ++int kbase_device_coherency_init(struct kbase_device *kbdev); + -+ override_coherency = be32_to_cpup(coherency_override_dts); + -+ if ((override_coherency <= COHERENCY_NONE) && -+ (supported_coherency_bitmap & -+ COHERENCY_FEATURE_BIT(override_coherency))) { ++#if !MALI_USE_CSF ++int kbase_jd_init(struct kbase_context *kctx); ++void kbase_jd_exit(struct kbase_context *kctx); + -+ kbdev->system_coherency = override_coherency; ++/** ++ * kbase_jd_submit - Submit atoms to the job dispatcher ++ * ++ * @kctx: The kbase context to submit to ++ * @user_addr: The address in user space of the struct base_jd_atom array ++ * @nr_atoms: The number of atoms in the array ++ * @stride: sizeof(struct base_jd_atom) ++ * @uk6_atom: true if the atoms are legacy atoms (struct base_jd_atom_v2_uk6) ++ * ++ * Return: 0 on success or error code ++ */ ++int kbase_jd_submit(struct kbase_context *kctx, ++ void __user *user_addr, u32 nr_atoms, u32 stride, ++ bool uk6_atom); + -+ dev_info(kbdev->dev, -+ "Using coherency mode %u set from dtb", -+ override_coherency); -+ } else -+ dev_warn(kbdev->dev, -+ "Ignoring unsupported coherency mode %u set from dtb", -+ override_coherency); -+ } ++/** ++ * kbase_jd_done_worker - Handle a job completion ++ * @data: a &struct work_struct ++ * ++ * This function requeues the job from the runpool (if it was soft-stopped or ++ * removed from NEXT registers). ++ * ++ * Removes it from the system if it finished/failed/was cancelled. ++ * ++ * Resolves dependencies to add dependent jobs to the context, potentially ++ * starting them if necessary (which may add more references to the context) ++ * ++ * Releases the reference to the context from the no-longer-running job. ++ * ++ * Handles retrying submission outside of IRQ context if it failed from within ++ * IRQ context. ++ */ ++void kbase_jd_done_worker(struct work_struct *data); + -+#endif /* CONFIG_OF */ ++void kbase_jd_done(struct kbase_jd_atom *katom, int slot_nr, ktime_t *end_timestamp, ++ kbasep_js_atom_done_code done_code); ++void kbase_jd_cancel(struct kbase_device *kbdev, struct kbase_jd_atom *katom); ++void kbase_jd_zap_context(struct kbase_context *kctx); + -+ kbdev->gpu_props.props.raw_props.coherency_mode = -+ kbdev->system_coherency; ++/* ++ * kbase_jd_done_nolock - Perform the necessary handling of an atom that has completed ++ * the execution. ++ * ++ * @katom: Pointer to the atom that completed the execution ++ * @post_immediately: Flag indicating that completion event can be posted ++ * immediately for @katom and the other atoms depdendent ++ * on @katom which also completed execution. The flag is ++ * false only for the case where the function is called by ++ * kbase_jd_done_worker() on the completion of atom running ++ * on the GPU. ++ * ++ * Note that if this is a soft-job that has had kbase_prepare_soft_job called on it then the caller ++ * is responsible for calling kbase_finish_soft_job *before* calling this function. ++ * ++ * The caller must hold the kbase_jd_context.lock. ++ */ ++bool kbase_jd_done_nolock(struct kbase_jd_atom *katom, bool post_immediately); + -+ return 0; -+} ++void kbase_jd_free_external_resources(struct kbase_jd_atom *katom); ++void kbase_jd_dep_clear_locked(struct kbase_jd_atom *katom); + -+#ifdef CONFIG_MALI_BUSLOG ++/** ++ * kbase_job_done - Process completed jobs from job interrupt ++ * @kbdev: Pointer to the kbase device. ++ * @done: Bitmask of done or failed jobs, from JOB_IRQ_STAT register ++ * ++ * This function processes the completed, or failed, jobs from the GPU job ++ * slots, for the bits set in the @done bitmask. ++ * ++ * The hwaccess_lock must be held when calling this function. ++ */ ++void kbase_job_done(struct kbase_device *kbdev, u32 done); + -+/* Callback used by the kbase bus logger client, to initiate a GPU reset -+ * when the bus log is restarted. GPU reset is used as reference point -+ * in HW bus log analyses. ++/** ++ * kbase_job_slot_ctx_priority_check_locked(): - Check for lower priority atoms ++ * and soft stop them ++ * @kctx: Pointer to context to check. ++ * @katom: Pointer to priority atom. ++ * ++ * Atoms from @kctx on the same job slot as @katom, which have lower priority ++ * than @katom will be soft stopped and put back in the queue, so that atoms ++ * with higher priority can run. ++ * ++ * The hwaccess_lock must be held when calling this function. + */ -+static void kbase_logging_started_cb(void *data) -+{ -+ struct kbase_device *kbdev = (struct kbase_device *)data; ++void kbase_job_slot_ctx_priority_check_locked(struct kbase_context *kctx, ++ struct kbase_jd_atom *katom); + -+ if (kbase_prepare_to_reset_gpu(kbdev)) -+ kbase_reset_gpu(kbdev); -+ dev_info(kbdev->dev, "KBASE - Bus logger restarted\n"); -+} ++/** ++ * kbase_job_slot_softstop_start_rp() - Soft-stop the atom at the start ++ * of a renderpass. ++ * @kctx: Pointer to a kernel base context. ++ * @reg: Reference of a growable GPU memory region in the same context. ++ * Takes ownership of the reference if successful. ++ * ++ * Used to switch to incremental rendering if we have nearly run out of ++ * virtual address space in a growable memory region and the atom currently ++ * executing on a job slot is the tiler job chain at the start of a renderpass. ++ * ++ * Return: 0 if successful, otherwise a negative error code. ++ */ ++int kbase_job_slot_softstop_start_rp(struct kbase_context *kctx, ++ struct kbase_va_region *reg); + -+int buslog_init(struct kbase_device *kbdev) -+{ -+ int err = 0; ++/** ++ * kbase_job_slot_softstop - Soft-stop the specified job slot ++ * ++ * @kbdev: The kbase device ++ * @js: The job slot to soft-stop ++ * @target_katom: The job that should be soft-stopped (or NULL for any job) ++ * Context: ++ * The job slot lock must be held when calling this function. ++ * The job slot must not already be in the process of being soft-stopped. ++ * ++ * Where possible any job in the next register is evicted before the soft-stop. ++ */ ++void kbase_job_slot_softstop(struct kbase_device *kbdev, int js, ++ struct kbase_jd_atom *target_katom); + -+ err = bl_core_client_register(kbdev->devname, -+ kbase_logging_started_cb, -+ kbdev, &kbdev->buslogger, -+ THIS_MODULE, NULL); -+ if (err == 0) -+ bl_core_set_threshold(kbdev->buslogger, 1024*1024*1024); ++void kbase_job_slot_softstop_swflags(struct kbase_device *kbdev, unsigned int js, ++ struct kbase_jd_atom *target_katom, u32 sw_flags); + -+ return err; -+} ++/** ++ * kbase_job_check_enter_disjoint - potentiall enter disjoint mode ++ * @kbdev: kbase device ++ * @action: the event which has occurred ++ * @core_reqs: core requirements of the atom ++ * @target_katom: the atom which is being affected ++ * ++ * For a certain soft-stop action, work out whether to enter disjoint ++ * state. ++ * ++ * This does not register multiple disjoint events if the atom has already ++ * started a disjoint period ++ * ++ * @core_reqs can be supplied as 0 if the atom had not started on the hardware ++ * (and so a 'real' soft/hard-stop was not required, but it still interrupted ++ * flow, perhaps on another context) ++ * ++ * kbase_job_check_leave_disjoint() should be used to end the disjoint ++ * state when the soft/hard-stop action is complete ++ */ ++void kbase_job_check_enter_disjoint(struct kbase_device *kbdev, u32 action, ++ base_jd_core_req core_reqs, struct kbase_jd_atom *target_katom); + -+void buslog_term(struct kbase_device *kbdev) -+{ -+ bl_core_client_unregister(kbdev->buslogger); -+} -+#endif ++/** ++ * kbase_job_check_leave_disjoint - potentially leave disjoint state ++ * @kbdev: kbase device ++ * @target_katom: atom which is finishing ++ * ++ * Work out whether to leave disjoint state when finishing an atom that was ++ * originated by kbase_job_check_enter_disjoint(). ++ */ ++void kbase_job_check_leave_disjoint(struct kbase_device *kbdev, ++ struct kbase_jd_atom *target_katom); + -+static struct attribute *kbase_scheduling_attrs[] = { -+#if !MALI_USE_CSF -+ &dev_attr_serialize_jobs.attr, +#endif /* !MALI_USE_CSF */ -+ NULL -+}; + -+static struct attribute *kbase_attrs[] = { -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ &dev_attr_debug_command.attr, -+#if !MALI_USE_CSF -+ &dev_attr_js_softstop_always.attr, -+#endif /* !MALI_USE_CSF */ -+#endif -+#if !MALI_USE_CSF -+ &dev_attr_js_timeouts.attr, -+ &dev_attr_soft_job_timeout.attr, -+#endif /* !MALI_USE_CSF */ -+ &dev_attr_gpuinfo.attr, -+ &dev_attr_dvfs_period.attr, -+ &dev_attr_pm_poweroff.attr, -+ &dev_attr_reset_timeout.attr, -+#if !MALI_USE_CSF -+ &dev_attr_js_scheduling_period.attr, -+#endif /* !MALI_USE_CSF */ -+ &dev_attr_power_policy.attr, -+ &dev_attr_core_mask.attr, -+ &dev_attr_mem_pool_size.attr, -+ &dev_attr_mem_pool_max_size.attr, -+ &dev_attr_lp_mem_pool_size.attr, -+ &dev_attr_lp_mem_pool_max_size.attr, ++void kbase_event_post(struct kbase_context *ctx, struct kbase_jd_atom *event); +#if !MALI_USE_CSF -+ &dev_attr_js_ctx_scheduling_mode.attr, ++int kbase_event_dequeue(struct kbase_context *ctx, struct base_jd_event_v2 *uevent); +#endif /* !MALI_USE_CSF */ -+ NULL -+}; ++int kbase_event_pending(struct kbase_context *ctx); ++int kbase_event_init(struct kbase_context *kctx); ++void kbase_event_close(struct kbase_context *kctx); ++void kbase_event_cleanup(struct kbase_context *kctx); ++void kbase_event_wakeup(struct kbase_context *kctx); + -+#define SYSFS_SCHEDULING_GROUP "scheduling" -+static const struct attribute_group kbase_scheduling_attr_group = { -+ .name = SYSFS_SCHEDULING_GROUP, -+ .attrs = kbase_scheduling_attrs, -+}; ++/** ++ * kbasep_jit_alloc_validate() - Validate the JIT allocation info. ++ * ++ * @kctx: Pointer to the kbase context within which the JIT ++ * allocation is to be validated. ++ * @info: Pointer to struct @base_jit_alloc_info ++ * which is to be validated. ++ * Return: 0 if jit allocation is valid; negative error code otherwise ++ */ ++int kbasep_jit_alloc_validate(struct kbase_context *kctx, ++ struct base_jit_alloc_info *info); + -+static const struct attribute_group kbase_attr_group = { -+ .attrs = kbase_attrs, -+}; ++/** ++ * kbase_jit_retry_pending_alloc() - Retry blocked just-in-time memory ++ * allocations. ++ * ++ * @kctx: Pointer to the kbase context within which the just-in-time ++ * memory allocations are to be retried. ++ */ ++void kbase_jit_retry_pending_alloc(struct kbase_context *kctx); + -+int kbase_sysfs_init(struct kbase_device *kbdev) ++/** ++ * kbase_free_user_buffer() - Free memory allocated for struct ++ * @kbase_debug_copy_buffer. ++ * ++ * @buffer: Pointer to the memory location allocated for the object ++ * of the type struct @kbase_debug_copy_buffer. ++ */ ++static inline void kbase_free_user_buffer( ++ struct kbase_debug_copy_buffer *buffer) +{ -+ int err = 0; ++ struct page **pages = buffer->extres_pages; ++ int nr_pages = buffer->nr_extres_pages; + -+ kbdev->mdev.minor = MISC_DYNAMIC_MINOR; -+ kbdev->mdev.name = kbdev->devname; -+ kbdev->mdev.fops = &kbase_fops; -+ kbdev->mdev.parent = get_device(kbdev->dev); -+ kbdev->mdev.mode = 0666; ++ if (pages) { ++ int i; + -+ err = sysfs_create_group(&kbdev->dev->kobj, &kbase_attr_group); -+ if (!err) { -+ err = sysfs_create_group(&kbdev->dev->kobj, -+ &kbase_scheduling_attr_group); -+ if (err) { -+ dev_err(kbdev->dev, "Creation of %s sysfs group failed", -+ SYSFS_SCHEDULING_GROUP); -+ sysfs_remove_group(&kbdev->dev->kobj, -+ &kbase_attr_group); ++ for (i = 0; i < nr_pages; i++) { ++ struct page *pg = pages[i]; ++ ++ if (pg) ++ put_page(pg); + } ++ kfree(pages); + } -+ -+ return err; -+} -+ -+void kbase_sysfs_term(struct kbase_device *kbdev) -+{ -+ sysfs_remove_group(&kbdev->dev->kobj, &kbase_scheduling_attr_group); -+ sysfs_remove_group(&kbdev->dev->kobj, &kbase_attr_group); -+ put_device(kbdev->dev); +} + -+static int kbase_platform_device_remove(struct platform_device *pdev) -+{ -+ struct kbase_device *kbdev = to_kbase_device(&pdev->dev); ++#if !MALI_USE_CSF ++int kbase_process_soft_job(struct kbase_jd_atom *katom); ++int kbase_prepare_soft_job(struct kbase_jd_atom *katom); ++void kbase_finish_soft_job(struct kbase_jd_atom *katom); ++void kbase_cancel_soft_job(struct kbase_jd_atom *katom); ++void kbase_resume_suspended_soft_jobs(struct kbase_device *kbdev); ++void kbasep_remove_waiting_soft_job(struct kbase_jd_atom *katom); ++#if IS_ENABLED(CONFIG_SYNC_FILE) ++void kbase_soft_event_wait_callback(struct kbase_jd_atom *katom); ++#endif ++int kbase_soft_event_update(struct kbase_context *kctx, ++ u64 event, ++ unsigned char new_status); + -+ if (!kbdev) -+ return -ENODEV; ++void kbasep_soft_job_timeout_worker(struct timer_list *timer); ++void kbasep_complete_triggered_soft_events(struct kbase_context *kctx, u64 evt); ++#endif /* !MALI_USE_CSF */ + -+ kbase_device_term(kbdev); -+ dev_set_drvdata(kbdev->dev, NULL); -+ kbase_device_free(kbdev); ++void kbasep_as_do_poke(struct work_struct *work); + -+ return 0; ++/** ++ * kbase_pm_is_suspending - Check whether a system suspend is in progress, ++ * or has already been suspended ++ * ++ * @kbdev: The kbase device structure for the device ++ * ++ * The caller should ensure that either kbdev->pm.active_count_lock is held, or ++ * a dmb was executed recently (to ensure the value is most ++ * up-to-date). However, without a lock the value could change afterwards. ++ * ++ * Return: ++ * * false if a suspend is not in progress ++ * * !=false otherwise ++ */ ++static inline bool kbase_pm_is_suspending(struct kbase_device *kbdev) ++{ ++ return kbdev->pm.suspending; +} + -+void kbase_backend_devfreq_term(struct kbase_device *kbdev) ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++/* ++ * Check whether a gpu lost is in progress ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Indicates whether a gpu lost has been received and jobs are no longer ++ * being scheduled ++ * ++ * Return: false if gpu is lost ++ * Return: != false otherwise ++ */ ++static inline bool kbase_pm_is_gpu_lost(struct kbase_device *kbdev) +{ -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+ if (kbdev->devfreq) -+ kbase_devfreq_term(kbdev); -+#endif ++ return (atomic_read(&kbdev->pm.gpu_lost) == 0 ? false : true); +} + -+int kbase_backend_devfreq_init(struct kbase_device *kbdev) ++/* ++ * Set or clear gpu lost state ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @gpu_lost: true to activate GPU lost state, FALSE is deactive it ++ * ++ * Puts power management code into gpu lost state or takes it out of the ++ * state. Once in gpu lost state new GPU jobs will no longer be ++ * scheduled. ++ */ ++static inline void kbase_pm_set_gpu_lost(struct kbase_device *kbdev, ++ bool gpu_lost) +{ -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+ /* Devfreq uses hardware counters, so must be initialized after it. */ -+ int err = kbase_devfreq_init(kbdev); ++ const int new_val = (gpu_lost ? 1 : 0); ++ const int cur_val = atomic_xchg(&kbdev->pm.gpu_lost, new_val); + -+ if (err) -+ dev_err(kbdev->dev, "Continuing without devfreq\n"); -+#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ -+ return 0; ++ if (new_val != cur_val) ++ KBASE_KTRACE_ADD(kbdev, ARB_GPU_LOST, NULL, new_val); +} ++#endif + -+static int kbase_platform_device_probe(struct platform_device *pdev) ++/** ++ * kbase_pm_is_active - Determine whether the GPU is active ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * This takes into account whether there is an active context reference. ++ * ++ * Return: true if the GPU is active, false otherwise ++ */ ++static inline bool kbase_pm_is_active(struct kbase_device *kbdev) +{ -+ struct kbase_device *kbdev; -+ int err = 0; -+ -+ mali_kbase_print_cs_experimental(); -+ -+ kbdev = kbase_device_alloc(); -+ if (!kbdev) { -+ dev_err(&pdev->dev, "Allocate device failed\n"); -+ return -ENOMEM; -+ } -+ -+ kbdev->dev = &pdev->dev; -+ dev_set_drvdata(kbdev->dev, kbdev); -+ -+ err = kbase_device_init(kbdev); ++ return kbdev->pm.active_count > 0; ++} + -+ if (err) { -+ if (err == -EPROBE_DEFER) -+ dev_err(kbdev->dev, "Device initialization Deferred\n"); -+ else -+ dev_err(kbdev->dev, "Device initialization failed\n"); ++/** ++ * kbase_pm_lowest_gpu_freq_init() - Find the lowest frequency that the GPU can ++ * run as using the device tree, and save this ++ * within kbdev. ++ * @kbdev: Pointer to kbase device. ++ * ++ * This function could be called from kbase_clk_rate_trace_manager_init, ++ * but is left separate as it can be called as soon as ++ * dev_pm_opp_of_add_table() has been called to initialize the OPP table, ++ * which occurs in power_control_init(). ++ * ++ * Return: 0 in any case. ++ */ ++int kbase_pm_lowest_gpu_freq_init(struct kbase_device *kbdev); + -+ dev_set_drvdata(kbdev->dev, NULL); -+ kbase_device_free(kbdev); -+ } else { -+#ifdef MALI_KBASE_BUILD -+ dev_info(kbdev->dev, -+ "Probed as %s\n", dev_name(kbdev->mdev.this_device)); -+#endif /* MALI_KBASE_BUILD */ -+ kbase_increment_device_id(); -+#ifdef CONFIG_MALI_ARBITER_SUPPORT -+ mutex_lock(&kbdev->pm.lock); -+ kbase_arbiter_pm_vm_event(kbdev, KBASE_VM_GPU_INITIALIZED_EVT); -+ mutex_unlock(&kbdev->pm.lock); -+#endif -+ } ++/** ++ * kbase_pm_metrics_start - Start the utilization metrics timer ++ * @kbdev: Pointer to the kbase device for which to start the utilization ++ * metrics calculation thread. ++ * ++ * Start the timer that drives the metrics calculation, runs the custom DVFS. ++ */ ++void kbase_pm_metrics_start(struct kbase_device *kbdev); + -+ return err; -+} ++/** ++ * kbase_pm_metrics_stop - Stop the utilization metrics timer ++ * @kbdev: Pointer to the kbase device for which to stop the utilization ++ * metrics calculation thread. ++ * ++ * Stop the timer that drives the metrics calculation, runs the custom DVFS. ++ */ ++void kbase_pm_metrics_stop(struct kbase_device *kbdev); + -+#undef KBASEP_DEFAULT_REGISTER_HISTORY_SIZE ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++/** ++ * kbase_pm_handle_runtime_suspend - Handle the runtime suspend of GPU ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * This function is called from the runtime suspend callback function for ++ * saving the HW state and powering down GPU, if GPU was in sleep state mode. ++ * It does the following steps ++ * - Powers up the L2 cache and re-activates the MCU. ++ * - Suspend the CSGs ++ * - Halts the MCU ++ * - Powers down the L2 cache. ++ * - Invokes the power_off callback to power down the GPU. ++ * ++ * Return: 0 if the GPU was already powered down or no error was encountered ++ * in the power down, otherwise an error code. ++ */ ++int kbase_pm_handle_runtime_suspend(struct kbase_device *kbdev); + +/** -+ * kbase_device_suspend - Suspend callback from the OS. ++ * kbase_pm_force_mcu_wakeup_after_sleep - Force the wake up of MCU from sleep + * -+ * This is called by Linux when the device should suspend. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * -+ * @dev: The device to suspend ++ * This function forces the wake up of MCU from sleep state and wait for ++ * MCU to become active. ++ * It usually gets called from the runtime suspend callback function. ++ * It also gets called from the GPU reset handler or at the time of system ++ * suspend or when User tries to terminate/suspend the on-slot group. + * -+ * Return: A standard Linux error code ++ * Note: @gpu_wakeup_override flag that forces the reactivation of MCU is ++ * set by this function and it is the caller's responsibility to ++ * clear the flag. ++ * ++ * Return: 0 if the wake up was successful. + */ -+static int kbase_device_suspend(struct device *dev) ++int kbase_pm_force_mcu_wakeup_after_sleep(struct kbase_device *kbdev); ++#endif ++ ++#if !MALI_USE_CSF ++/** ++ * kbase_jd_atom_id - Return the atom's ID, as was originally supplied by userspace in ++ * base_jd_atom::atom_number ++ * @kctx: KBase context pointer ++ * @katom: Atome for which to return ID ++ * ++ * Return: the atom's ID. ++ */ ++static inline int kbase_jd_atom_id(struct kbase_context *kctx, ++ const struct kbase_jd_atom *katom) +{ -+ struct kbase_device *kbdev = to_kbase_device(dev); ++ int result; + -+ if (!kbdev) -+ return -ENODEV; ++ KBASE_DEBUG_ASSERT(kctx); ++ KBASE_DEBUG_ASSERT(katom); ++ KBASE_DEBUG_ASSERT(katom->kctx == kctx); + -+ kbase_pm_suspend(kbdev); ++ result = katom - &kctx->jctx.atoms[0]; ++ KBASE_DEBUG_ASSERT(result >= 0 && result <= BASE_JD_ATOM_COUNT); ++ return result; ++} + -+#if defined(CONFIG_MALI_BIFROST_DEVFREQ) && \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+ dev_dbg(dev, "Callback %s\n", __func__); -+ if (kbdev->devfreq) { -+ kbase_devfreq_enqueue_work(kbdev, DEVFREQ_WORK_SUSPEND); -+ flush_workqueue(kbdev->devfreq_queue.workq); -+ } -+#endif -+ return 0; ++/** ++ * kbase_jd_atom_from_id - Return the atom structure for the given atom ID ++ * @kctx: Context pointer ++ * @id: ID of atom to retrieve ++ * ++ * Return: Pointer to struct kbase_jd_atom associated with the supplied ID ++ */ ++static inline struct kbase_jd_atom *kbase_jd_atom_from_id( ++ struct kbase_context *kctx, int id) ++{ ++ return &kctx->jctx.atoms[id]; +} ++#endif /* !MALI_USE_CSF */ + +/** -+ * kbase_device_resume - Resume callback from the OS. ++ * kbase_disjoint_init - Initialize the disjoint state + * -+ * This is called by Linux when the device should resume from suspension. ++ * @kbdev: The kbase device + * -+ * @dev: The device to resume ++ * The disjoint event count and state are both set to zero. + * -+ * Return: A standard Linux error code ++ * Disjoint functions usage: ++ * ++ * The disjoint event count should be incremented whenever a disjoint event occurs. ++ * ++ * There are several cases which are regarded as disjoint behavior. Rather than just increment ++ * the counter during disjoint events we also increment the counter when jobs may be affected ++ * by what the GPU is currently doing. To facilitate this we have the concept of disjoint state. ++ * ++ * Disjoint state is entered during GPU reset. Increasing the disjoint state also increases ++ * the count of disjoint events. ++ * ++ * The disjoint state is then used to increase the count of disjoint events during job submission ++ * and job completion. Any atom submitted or completed while the disjoint state is greater than ++ * zero is regarded as a disjoint event. ++ * ++ * The disjoint event counter is also incremented immediately whenever a job is soft stopped ++ * and during context creation. ++ * ++ * Return: 0 on success and non-zero value on failure. + */ -+static int kbase_device_resume(struct device *dev) -+{ -+ struct kbase_device *kbdev = to_kbase_device(dev); -+ -+ if (!kbdev) -+ return -ENODEV; ++void kbase_disjoint_init(struct kbase_device *kbdev); + -+ kbase_pm_resume(kbdev); ++/** ++ * kbase_disjoint_event - Increase the count of disjoint events ++ * called when a disjoint event has happened ++ * ++ * @kbdev: The kbase device ++ */ ++void kbase_disjoint_event(struct kbase_device *kbdev); + -+#if defined(CONFIG_MALI_BIFROST_DEVFREQ) && \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+ dev_dbg(dev, "Callback %s\n", __func__); -+ if (kbdev->devfreq) { -+ mutex_lock(&kbdev->pm.lock); -+ if (kbdev->pm.active_count > 0) -+ kbase_devfreq_enqueue_work(kbdev, DEVFREQ_WORK_RESUME); -+ mutex_unlock(&kbdev->pm.lock); -+ flush_workqueue(kbdev->devfreq_queue.workq); -+ } -+#endif -+ return 0; -+} ++/** ++ * kbase_disjoint_event_potential - Increase the count of disjoint events ++ * only if the GPU is in a disjoint state ++ * ++ * @kbdev: The kbase device ++ * ++ * This should be called when something happens which could be disjoint if the GPU ++ * is in a disjoint state. The state refcount keeps track of this. ++ */ ++void kbase_disjoint_event_potential(struct kbase_device *kbdev); + +/** -+ * kbase_device_runtime_suspend - Runtime suspend callback from the OS. ++ * kbase_disjoint_event_get - Returns the count of disjoint events + * -+ * This is called by Linux when the device should prepare for a condition in -+ * which it will not be able to communicate with the CPU(s) and RAM due to -+ * power management. ++ * @kbdev: The kbase device ++ * Return: the count of disjoint events ++ */ ++u32 kbase_disjoint_event_get(struct kbase_device *kbdev); ++ ++/** ++ * kbase_disjoint_state_up - Increment the refcount state indicating that ++ * the GPU is in a disjoint state. + * -+ * @dev: The device to suspend ++ * @kbdev: The kbase device + * -+ * Return: A standard Linux error code ++ * Also Increment the disjoint event count (calls @ref kbase_disjoint_event) ++ * eventually after the disjoint state has completed @ref kbase_disjoint_state_down ++ * should be called + */ -+#ifdef KBASE_PM_RUNTIME -+static int kbase_device_runtime_suspend(struct device *dev) -+{ -+ struct kbase_device *kbdev = to_kbase_device(dev); ++void kbase_disjoint_state_up(struct kbase_device *kbdev); + -+ if (!kbdev) -+ return -ENODEV; ++/** ++ * kbase_disjoint_state_down - Decrement the refcount state ++ * ++ * @kbdev: The kbase device ++ * ++ * Also Increment the disjoint event count (calls @ref kbase_disjoint_event) ++ * ++ * Called after @ref kbase_disjoint_state_up once the disjoint state is over ++ */ ++void kbase_disjoint_state_down(struct kbase_device *kbdev); + -+#if defined(CONFIG_MALI_BIFROST_DEVFREQ) && \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+ if (kbdev->devfreq) -+ kbase_devfreq_enqueue_work(kbdev, DEVFREQ_WORK_SUSPEND); -+#endif ++/** ++ * kbase_device_pcm_dev_init() - Initialize the priority control manager device ++ * ++ * @kbdev: Pointer to the structure for the kbase device ++ * ++ * Pointer to the priority control manager device is retrieved from the device ++ * tree and a reference is taken on the module implementing the callbacks for ++ * priority control manager operations. ++ * ++ * Return: 0 if successful, or an error code on failure ++ */ ++int kbase_device_pcm_dev_init(struct kbase_device *const kbdev); + -+ if (kbdev->pm.backend.callback_power_runtime_off) { -+ kbdev->pm.backend.callback_power_runtime_off(kbdev); -+ dev_dbg(dev, "runtime suspend\n"); -+ } -+ return 0; -+} -+#endif /* KBASE_PM_RUNTIME */ ++/** ++ * kbase_device_pcm_dev_term() - Performs priority control manager device ++ * deinitialization. ++ * ++ * @kbdev: Pointer to the structure for the kbase device ++ * ++ * Reference is released on the module implementing the callbacks for priority ++ * control manager operations. ++ */ ++void kbase_device_pcm_dev_term(struct kbase_device *const kbdev); + +/** -+ * kbase_device_runtime_resume - Runtime resume callback from the OS. ++ * KBASE_DISJOINT_STATE_INTERLEAVED_CONTEXT_COUNT_THRESHOLD - If a job is soft stopped ++ * and the number of contexts is >= this value it is reported as a disjoint event ++ */ ++#define KBASE_DISJOINT_STATE_INTERLEAVED_CONTEXT_COUNT_THRESHOLD 2 ++ ++#if !defined(UINT64_MAX) ++ #define UINT64_MAX ((uint64_t)0xFFFFFFFFFFFFFFFFULL) ++#endif ++ ++#endif +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c +new file mode 100755 +index 000000000..10dbeee02 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c +@@ -0,0 +1,109 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* + * -+ * This is called by Linux when the device should go into a fully active state. ++ * (C) COPYRIGHT 2016-2022 ARM Limited. All rights reserved. + * -+ * @dev: The device to suspend ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Return: A standard Linux error code + */ + -+#ifdef KBASE_PM_RUNTIME -+static int kbase_device_runtime_resume(struct device *dev) ++#include ++ ++#include ++#include ++#include ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ ++static int kbase_as_fault_read(struct seq_file *sfile, void *data) +{ -+ int ret = 0; -+ struct kbase_device *kbdev = to_kbase_device(dev); ++ uintptr_t as_no = (uintptr_t) sfile->private; + -+ if (!kbdev) -+ return -ENODEV; ++ struct list_head *entry; ++ const struct list_head *kbdev_list; ++ struct kbase_device *kbdev = NULL; + -+ dev_dbg(dev, "Callback %s\n", __func__); -+ if (kbdev->pm.backend.callback_power_runtime_on) { -+ ret = kbdev->pm.backend.callback_power_runtime_on(kbdev); -+ dev_dbg(dev, "runtime resume\n"); -+ } ++ kbdev_list = kbase_device_get_list(); + -+#if defined(CONFIG_MALI_BIFROST_DEVFREQ) && \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+ if (kbdev->devfreq) -+ kbase_devfreq_enqueue_work(kbdev, DEVFREQ_WORK_RESUME); -+#endif ++ list_for_each(entry, kbdev_list) { ++ kbdev = list_entry(entry, struct kbase_device, entry); + -+ return ret; -+} -+#endif /* KBASE_PM_RUNTIME */ ++ if (kbdev->debugfs_as_read_bitmap & (1ULL << as_no)) { + ++ /* don't show this one again until another fault occors */ ++ kbdev->debugfs_as_read_bitmap &= ~(1ULL << as_no); + -+#ifdef KBASE_PM_RUNTIME -+/** -+ * kbase_device_runtime_idle - Runtime idle callback from the OS. -+ * @dev: The device to suspend -+ * -+ * This is called by Linux when the device appears to be inactive and it might -+ * be placed into a low power state. -+ * -+ * Return: 0 if device can be suspended, non-zero to avoid runtime autosuspend, -+ * otherwise a standard Linux error code -+ */ -+static int kbase_device_runtime_idle(struct device *dev) -+{ -+ struct kbase_device *kbdev = to_kbase_device(dev); ++ /* output the last page fault addr */ ++ seq_printf(sfile, "%llu\n", ++ (u64) kbdev->as[as_no].pf_data.addr); ++ } + -+ if (!kbdev) -+ return -ENODEV; ++ } + -+ dev_dbg(dev, "Callback %s\n", __func__); -+ /* Use platform specific implementation if it exists. */ -+ if (kbdev->pm.backend.callback_power_runtime_idle) -+ return kbdev->pm.backend.callback_power_runtime_idle(kbdev); ++ kbase_device_put_list(kbdev_list); + -+ /* Just need to update the device's last busy mark. Kernel will respect -+ * the autosuspend delay and so won't suspend the device immediately. -+ */ -+ pm_runtime_mark_last_busy(kbdev->dev); + return 0; +} -+#endif /* KBASE_PM_RUNTIME */ + -+/* The power management operations for the platform driver. -+ */ -+static const struct dev_pm_ops kbase_pm_ops = { -+ .suspend = kbase_device_suspend, -+ .resume = kbase_device_resume, -+#ifdef KBASE_PM_RUNTIME -+ .runtime_suspend = kbase_device_runtime_suspend, -+ .runtime_resume = kbase_device_runtime_resume, -+ .runtime_idle = kbase_device_runtime_idle, -+#endif /* KBASE_PM_RUNTIME */ -+}; ++static int kbase_as_fault_debugfs_open(struct inode *in, struct file *file) ++{ ++ return single_open(file, kbase_as_fault_read, in->i_private); ++} + -+#ifdef CONFIG_OF -+static const struct of_device_id kbase_dt_ids[] = { -+ { .compatible = "arm,mali-bifrost" }, -+ { /* sentinel */ } ++static const struct file_operations as_fault_fops = { ++ .owner = THIS_MODULE, ++ .open = kbase_as_fault_debugfs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, +}; -+MODULE_DEVICE_TABLE(of, kbase_dt_ids); -+#endif + -+static struct platform_driver kbase_platform_driver = { -+ .probe = kbase_platform_device_probe, -+ .remove = kbase_platform_device_remove, -+ .driver = { -+ .name = kbase_drv_name, -+ .owner = THIS_MODULE, -+ .pm = &kbase_pm_ops, -+ .of_match_table = of_match_ptr(kbase_dt_ids), -+ }, -+}; ++#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++#endif /* CONFIG_DEBUG_FS */ + +/* -+ * The driver will not provide a shortcut to create the Mali platform device -+ * anymore when using Device Tree. ++ * Initialize debugfs entry for each address space + */ -+#ifdef CONFIG_OF -+module_platform_driver(kbase_platform_driver); -+#else -+ -+static int __init kbase_driver_init(void) ++void kbase_as_fault_debugfs_init(struct kbase_device *kbdev) +{ -+ int ret; ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ uint i; ++ char as_name[64]; ++ struct dentry *debugfs_directory; + -+ ret = kbase_platform_register(); -+ if (ret) -+ return ret; ++ kbdev->debugfs_as_read_bitmap = 0ULL; + -+ ret = platform_driver_register(&kbase_platform_driver); ++ KBASE_DEBUG_ASSERT(kbdev->nr_hw_address_spaces); ++ KBASE_DEBUG_ASSERT(sizeof(kbdev->as[0].pf_data.addr) == sizeof(u64)); + -+ if (ret) -+ kbase_platform_unregister(); ++ debugfs_directory = debugfs_create_dir("address_spaces", ++ kbdev->mali_debugfs_directory); + -+ return ret; ++ if (IS_ERR_OR_NULL(debugfs_directory)) { ++ dev_warn(kbdev->dev, ++ "unable to create address_spaces debugfs directory"); ++ } else { ++ for (i = 0; i < kbdev->nr_hw_address_spaces; i++) { ++ if (likely(scnprintf(as_name, ARRAY_SIZE(as_name), "as%u", i))) ++ debugfs_create_file(as_name, 0444, debugfs_directory, ++ (void *)(uintptr_t)i, &as_fault_fops); ++ } ++ } ++ ++#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++#endif /* CONFIG_DEBUG_FS */ +} +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h +new file mode 100755 +index 000000000..59bbcf6f4 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h +@@ -0,0 +1,48 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2016, 2020-2021 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+static void __exit kbase_driver_exit(void) ++#ifndef _KBASE_AS_FAULT_DEBUG_FS_H ++#define _KBASE_AS_FAULT_DEBUG_FS_H ++ ++/** ++ * kbase_as_fault_debugfs_init() - Add debugfs files for reporting page faults ++ * ++ * @kbdev: Pointer to kbase_device ++ */ ++void kbase_as_fault_debugfs_init(struct kbase_device *kbdev); ++ ++/** ++ * kbase_as_fault_debugfs_new() - make the last fault available on debugfs ++ * ++ * @kbdev: Pointer to kbase_device ++ * @as_no: The address space the fault occurred on ++ */ ++static inline void ++kbase_as_fault_debugfs_new(struct kbase_device *kbdev, int as_no) +{ -+ platform_driver_unregister(&kbase_platform_driver); -+ kbase_platform_unregister(); ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ kbdev->debugfs_as_read_bitmap |= (1ULL << as_no); ++#endif /* CONFIG_DEBUG_FS */ ++#endif /* CONFIG_MALI_BIFROST_DEBUG */ +} + -+module_init(kbase_driver_init); -+module_exit(kbase_driver_exit); ++#endif /*_KBASE_AS_FAULT_DEBUG_FS_H*/ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_bits.h b/drivers/gpu/arm/bifrost/mali_kbase_bits.h +new file mode 100755 +index 000000000..a085fd86c +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_bits.h +@@ -0,0 +1,31 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+#endif /* CONFIG_OF */ ++#ifndef _KBASE_BITS_H_ ++#define _KBASE_BITS_H_ + -+MODULE_LICENSE("GPL"); -+MODULE_VERSION(MALI_RELEASE_NAME " (UK version " \ -+ __stringify(BASE_UK_VERSION_MAJOR) "." \ -+ __stringify(BASE_UK_VERSION_MINOR) ")"); ++#if (KERNEL_VERSION(4, 19, 0) <= LINUX_VERSION_CODE) ++#include ++#else ++#include ++#endif + -+#define CREATE_TRACE_POINTS -+/* Create the trace points (otherwise we just get code to call a tracepoint) */ -+#include "mali_linux_trace.h" ++#endif /* _KBASE_BITS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c +new file mode 100755 +index 000000000..af51ed8c2 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c +@@ -0,0 +1,65 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2012-2018, 2020-2021 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+#ifdef CONFIG_MALI_BIFROST_GATOR_SUPPORT -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_job_slots_event); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_pm_status); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_page_fault_insert_pages); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_total_alloc_pages_change); ++/* ++ * Cache Policy API. ++ */ + -+void kbase_trace_mali_pm_status(u32 dev_id, u32 event, u64 value) -+{ -+ trace_mali_pm_status(dev_id, event, value); -+} ++#include "mali_kbase_cache_policy.h" + -+void kbase_trace_mali_job_slots_event(u32 dev_id, u32 event, const struct kbase_context *kctx, u8 atom_id) ++/* ++ * The output flags should be a combination of the following values: ++ * KBASE_REG_CPU_CACHED: CPU cache should be enabled ++ * KBASE_REG_GPU_CACHED: GPU cache should be enabled ++ * ++ * NOTE: Some components within the GPU might only be able to access memory ++ * that is KBASE_REG_GPU_CACHED. Refer to the specific GPU implementation for ++ * more details. ++ */ ++u32 kbase_cache_enabled(u32 flags, u32 nr_pages) +{ -+ trace_mali_job_slots_event(dev_id, event, -+ (kctx != NULL ? kctx->tgid : 0), -+ (kctx != NULL ? kctx->pid : 0), -+ atom_id); ++ u32 cache_flags = 0; ++ ++ CSTD_UNUSED(nr_pages); ++ ++ if (!(flags & BASE_MEM_UNCACHED_GPU)) ++ cache_flags |= KBASE_REG_GPU_CACHED; ++ ++ if (flags & BASE_MEM_CACHED_CPU) ++ cache_flags |= KBASE_REG_CPU_CACHED; ++ ++ return cache_flags; +} + -+void kbase_trace_mali_page_fault_insert_pages(u32 dev_id, int event, u32 value) ++ ++void kbase_sync_single_for_device(struct kbase_device *kbdev, dma_addr_t handle, ++ size_t size, enum dma_data_direction dir) +{ -+ trace_mali_page_fault_insert_pages(dev_id, event, value); ++ dma_sync_single_for_device(kbdev->dev, handle, size, dir); +} ++KBASE_EXPORT_TEST_API(kbase_sync_single_for_device); + -+void kbase_trace_mali_total_alloc_pages_change(u32 dev_id, long long int event) ++void kbase_sync_single_for_cpu(struct kbase_device *kbdev, dma_addr_t handle, ++ size_t size, enum dma_data_direction dir) +{ -+ trace_mali_total_alloc_pages_change(dev_id, event); ++ dma_sync_single_for_cpu(kbdev->dev, handle, size, dir); +} -+#endif /* CONFIG_MALI_BIFROST_GATOR_SUPPORT */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h b/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h ++KBASE_EXPORT_TEST_API(kbase_sync_single_for_cpu); +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h new file mode 100755 -index 000000000000..caba2cd7a0e3 +index 000000000..598d24538 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h -@@ -0,0 +1,51 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h +@@ -0,0 +1,47 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2013, 2015, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -197888,53 +228908,49 @@ index 000000000000..caba2cd7a0e3 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ *//* SPDX-License-Identifier: GPL-2.0 */ ++ */ + +/* -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * ++ * Cache Policy API. + */ + -+#ifndef _KBASE_CS_EXPERIMENTAL_H_ -+#define _KBASE_CS_EXPERIMENTAL_H_ ++#ifndef _KBASE_CACHE_POLICY_H_ ++#define _KBASE_CACHE_POLICY_H_ + -+#include ++#include "mali_kbase.h" ++#include + +/** -+ * mali_kbase_print_cs_experimental() - Print a string for every Core Services -+ * experimental feature that is enabled ++ * kbase_cache_enabled - Choose the cache policy for a specific region ++ * @flags: flags describing attributes of the region ++ * @nr_pages: total number of pages (backed or not) for the region ++ * ++ * Tells whether the CPU and GPU caches should be enabled or not for a specific ++ * region. ++ * This function can be modified to customize the cache policy depending on the ++ * flags and size of the region. ++ * ++ * Return: a combination of %KBASE_REG_CPU_CACHED and %KBASE_REG_GPU_CACHED ++ * depending on the cache policy + */ -+static inline void mali_kbase_print_cs_experimental(void) -+{ -+#if MALI_INCREMENTAL_RENDERING -+ pr_info("mali_kbase: INCREMENTAL_RENDERING (experimental) enabled"); -+#endif /* MALI_INCREMENTAL_RENDERING */ -+} -+ -+#endif /* _KBASE_CS_EXPERIMENTAL_H_ */ -+ ++u32 kbase_cache_enabled(u32 flags, u32 nr_pages); + -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c ++#endif /* _KBASE_CACHE_POLICY_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_caps.h b/drivers/gpu/arm/bifrost/mali_kbase_caps.h new file mode 100755 -index 000000000000..750dbd8c3924 +index 000000000..6aa31f3d3 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c -@@ -0,0 +1,355 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_caps.h +@@ -0,0 +1,70 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2017-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -197945,357 +228961,389 @@ index 000000000000..750dbd8c3924 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include -+#include ++/** ++ * DOC: Driver Capability Queries. ++ */ + -+#include -+#include "mali_kbase_ctx_sched.h" -+#include "tl/mali_kbase_tracepoints.h" ++#ifndef _KBASE_CAPS_H_ ++#define _KBASE_CAPS_H_ + -+/* Helper for ktrace */ -+#if KBASE_KTRACE_ENABLE -+static int kbase_ktrace_get_ctx_refcnt(struct kbase_context *kctx) ++#include ++ ++/** ++ * enum mali_kbase_cap - Enumeration for kbase capability ++ * ++ * @MALI_KBASE_CAP_SYSTEM_MONITOR: System Monitor ++ * @MALI_KBASE_CAP_JIT_PRESSURE_LIMIT: JIT Pressure limit ++ * @MALI_KBASE_CAP_MEM_GROW_ON_GPF: Memory grow on page fault ++ * @MALI_KBASE_CAP_MEM_PROTECTED: Protected memory ++ * @MALI_KBASE_NUM_CAPS: Delimiter ++ */ ++enum mali_kbase_cap { ++ MALI_KBASE_CAP_SYSTEM_MONITOR = 0, ++ MALI_KBASE_CAP_JIT_PRESSURE_LIMIT, ++ MALI_KBASE_CAP_MEM_GROW_ON_GPF, ++ MALI_KBASE_CAP_MEM_PROTECTED, ++ MALI_KBASE_NUM_CAPS ++}; ++ ++extern bool mali_kbase_supports_cap(unsigned long api_version, enum mali_kbase_cap cap); ++ ++static inline bool mali_kbase_supports_system_monitor(unsigned long api_version) +{ -+ return atomic_read(&kctx->refcount); ++ return mali_kbase_supports_cap(api_version, MALI_KBASE_CAP_SYSTEM_MONITOR); +} -+#else /* KBASE_KTRACE_ENABLE */ -+static int kbase_ktrace_get_ctx_refcnt(struct kbase_context *kctx) ++ ++static inline bool mali_kbase_supports_jit_pressure_limit(unsigned long api_version) +{ -+ CSTD_UNUSED(kctx); -+ return 0; ++ return mali_kbase_supports_cap(api_version, MALI_KBASE_CAP_JIT_PRESSURE_LIMIT); +} -+#endif /* KBASE_KTRACE_ENABLE */ + -+int kbase_ctx_sched_init(struct kbase_device *kbdev) ++static inline bool mali_kbase_supports_mem_grow_on_gpf(unsigned long api_version) +{ -+ int as_present = (1U << kbdev->nr_hw_address_spaces) - 1; -+ -+ /* These two must be recalculated if nr_hw_address_spaces changes -+ * (e.g. for HW workarounds) */ -+ kbdev->nr_user_address_spaces = kbdev->nr_hw_address_spaces; -+ kbdev->as_free = as_present; /* All ASs initially free */ -+ -+ memset(kbdev->as_to_kctx, 0, sizeof(kbdev->as_to_kctx)); -+ -+ return 0; ++ return mali_kbase_supports_cap(api_version, MALI_KBASE_CAP_MEM_GROW_ON_GPF); +} + -+void kbase_ctx_sched_term(struct kbase_device *kbdev) ++static inline bool mali_kbase_supports_mem_protected(unsigned long api_version) +{ -+ s8 i; -+ -+ /* Sanity checks */ -+ for (i = 0; i != kbdev->nr_hw_address_spaces; ++i) { -+ WARN_ON(kbdev->as_to_kctx[i] != NULL); -+ WARN_ON(!(kbdev->as_free & (1u << i))); -+ } ++ return mali_kbase_supports_cap(api_version, MALI_KBASE_CAP_MEM_PROTECTED); +} + -+/* kbasep_ctx_sched_find_as_for_ctx - Find a free address space ++#endif /* __KBASE_CAPS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c +new file mode 100755 +index 000000000..6a1e7e4c5 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c +@@ -0,0 +1,100 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* + * -+ * @kbdev: The context for which to find a free address space ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. + * -+ * Return: A valid AS if successful, otherwise KBASEP_AS_NR_INVALID ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * This function returns an address space available for use. It would prefer -+ * returning an AS that has been previously assigned to the context to -+ * avoid having to reprogram the MMU. + */ -+static int kbasep_ctx_sched_find_as_for_ctx(struct kbase_context *kctx) -+{ -+ struct kbase_device *const kbdev = kctx->kbdev; -+ int free_as; -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ /* First check if the previously assigned AS is available */ -+ if ((kctx->as_nr != KBASEP_AS_NR_INVALID) && -+ (kbdev->as_free & (1u << kctx->as_nr))) -+ return kctx->as_nr; + -+ /* The previously assigned AS was taken, we'll be returning any free -+ * AS at this point. -+ */ -+ free_as = ffs(kbdev->as_free) - 1; -+ if (free_as >= 0 && free_as < kbdev->nr_hw_address_spaces) -+ return free_as; ++#include "mali_kbase_ccswe.h" ++#include "mali_kbase_linux.h" + -+ return KBASEP_AS_NR_INVALID; -+} ++#include ++#include + -+int kbase_ctx_sched_retain_ctx(struct kbase_context *kctx) ++static u64 kbasep_ccswe_cycle_at_no_lock( ++ struct kbase_ccswe *self, u64 timestamp_ns) +{ -+ struct kbase_device *const kbdev = kctx->kbdev; -+ -+ lockdep_assert_held(&kbdev->mmu_hw_mutex); -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ WARN_ON(!kbdev->pm.backend.gpu_powered); -+ -+ if (atomic_inc_return(&kctx->refcount) == 1) { -+ int const free_as = kbasep_ctx_sched_find_as_for_ctx(kctx); -+ -+ if (free_as != KBASEP_AS_NR_INVALID) { -+ kbdev->as_free &= ~(1u << free_as); -+ /* Only program the MMU if the context has not been -+ * assigned the same address space before. -+ */ -+ if (free_as != kctx->as_nr) { -+ struct kbase_context *const prev_kctx = -+ kbdev->as_to_kctx[free_as]; ++ s64 diff_s, diff_ns; ++ u32 gpu_freq; + -+ if (prev_kctx) { -+ WARN_ON(atomic_read(&prev_kctx->refcount) != 0); -+ kbase_mmu_disable(prev_kctx); -+ KBASE_TLSTREAM_TL_KBASE_CTX_UNASSIGN_AS( -+ kbdev, prev_kctx->id); -+ prev_kctx->as_nr = KBASEP_AS_NR_INVALID; -+ } ++ lockdep_assert_held(&self->access); + -+ kctx->as_nr = free_as; -+ kbdev->as_to_kctx[free_as] = kctx; -+ KBASE_TLSTREAM_TL_KBASE_CTX_ASSIGN_AS( -+ kbdev, kctx->id, free_as); -+ kbase_mmu_update(kbdev, &kctx->mmu, -+ kctx->as_nr); -+ } -+ } else { -+ atomic_dec(&kctx->refcount); ++ diff_ns = timestamp_ns - self->timestamp_ns; ++ gpu_freq = diff_ns > 0 ? self->gpu_freq : self->prev_gpu_freq; + -+ /* Failed to find an available address space, we must -+ * be returning an error at this point. -+ */ -+ WARN_ON(kctx->as_nr != KBASEP_AS_NR_INVALID); -+ } -+ } ++ diff_s = div_s64(diff_ns, NSEC_PER_SEC); ++ diff_ns -= diff_s * NSEC_PER_SEC; + -+ return kctx->as_nr; ++ return self->cycles_elapsed + diff_s * gpu_freq ++ + div_s64(diff_ns * gpu_freq, NSEC_PER_SEC); +} + -+void kbase_ctx_sched_retain_ctx_refcount(struct kbase_context *kctx) ++void kbase_ccswe_init(struct kbase_ccswe *self) +{ -+ struct kbase_device *const kbdev = kctx->kbdev; -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ WARN_ON(atomic_read(&kctx->refcount) == 0); -+ WARN_ON(kctx->as_nr == KBASEP_AS_NR_INVALID); -+ WARN_ON(kbdev->as_to_kctx[kctx->as_nr] != kctx); ++ memset(self, 0, sizeof(*self)); + -+ atomic_inc(&kctx->refcount); ++ spin_lock_init(&self->access); +} + -+void kbase_ctx_sched_release_ctx(struct kbase_context *kctx) ++u64 kbase_ccswe_cycle_at(struct kbase_ccswe *self, u64 timestamp_ns) +{ -+ struct kbase_device *const kbdev = kctx->kbdev; -+ int new_ref_count; -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ unsigned long flags; ++ u64 result; + -+ new_ref_count = atomic_dec_return(&kctx->refcount); -+ if (new_ref_count == 0) { -+ kbdev->as_free |= (1u << kctx->as_nr); -+ if (kbase_ctx_flag(kctx, KCTX_AS_DISABLED_ON_FAULT)) { -+ KBASE_TLSTREAM_TL_KBASE_CTX_UNASSIGN_AS( -+ kbdev, kctx->id); -+ kbdev->as_to_kctx[kctx->as_nr] = NULL; -+ kctx->as_nr = KBASEP_AS_NR_INVALID; -+ kbase_ctx_flag_clear(kctx, KCTX_AS_DISABLED_ON_FAULT); -+ } -+ } ++ spin_lock_irqsave(&self->access, flags); ++ result = kbasep_ccswe_cycle_at_no_lock(self, timestamp_ns); ++ spin_unlock_irqrestore(&self->access, flags); + -+ KBASE_KTRACE_ADD(kbdev, SCHED_RELEASE_CTX, kctx, new_ref_count); ++ return result; +} + -+void kbase_ctx_sched_remove_ctx(struct kbase_context *kctx) ++void kbase_ccswe_freq_change( ++ struct kbase_ccswe *self, u64 timestamp_ns, u32 gpu_freq) +{ -+ struct kbase_device *const kbdev = kctx->kbdev; ++ unsigned long flags; + -+ lockdep_assert_held(&kbdev->mmu_hw_mutex); -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ spin_lock_irqsave(&self->access, flags); + -+ WARN_ON(atomic_read(&kctx->refcount) != 0); ++ /* The time must go only forward. */ ++ if (WARN_ON(timestamp_ns < self->timestamp_ns)) ++ goto exit; + -+ if (kctx->as_nr != KBASEP_AS_NR_INVALID) { -+ if (kbdev->pm.backend.gpu_powered) -+ kbase_mmu_disable(kctx); ++ /* If this is the first frequency change, cycles_elapsed is zero. */ ++ if (self->timestamp_ns) ++ self->cycles_elapsed = kbasep_ccswe_cycle_at_no_lock( ++ self, timestamp_ns); + -+ KBASE_TLSTREAM_TL_KBASE_CTX_UNASSIGN_AS(kbdev, kctx->id); -+ kbdev->as_to_kctx[kctx->as_nr] = NULL; -+ kctx->as_nr = KBASEP_AS_NR_INVALID; -+ } ++ self->timestamp_ns = timestamp_ns; ++ self->prev_gpu_freq = self->gpu_freq; ++ self->gpu_freq = gpu_freq; ++exit: ++ spin_unlock_irqrestore(&self->access, flags); +} + -+void kbase_ctx_sched_restore_all_as(struct kbase_device *kbdev) ++void kbase_ccswe_reset(struct kbase_ccswe *self) +{ -+ s8 i; -+ -+ lockdep_assert_held(&kbdev->mmu_hw_mutex); -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ unsigned long flags; + -+ WARN_ON(!kbdev->pm.backend.gpu_powered); ++ spin_lock_irqsave(&self->access, flags); + -+ for (i = 0; i != kbdev->nr_hw_address_spaces; ++i) { -+ struct kbase_context *kctx; -+ -+#if MALI_USE_CSF -+ if ((i == MCU_AS_NR) && kbdev->csf.firmware_inited) { -+ kbase_mmu_update(kbdev, &kbdev->csf.mcu_mmu, -+ MCU_AS_NR); -+ continue; -+ } -+#endif -+ kctx = kbdev->as_to_kctx[i]; -+ if (kctx) { -+ if (atomic_read(&kctx->refcount)) { -+ WARN_ON(kctx->as_nr != i); ++ self->timestamp_ns = 0; ++ self->cycles_elapsed = 0; ++ self->gpu_freq = 0; ++ self->prev_gpu_freq = 0; + -+ kbase_mmu_update(kbdev, &kctx->mmu, -+ kctx->as_nr); -+ kbase_ctx_flag_clear(kctx, -+ KCTX_AS_DISABLED_ON_FAULT); -+ } else { -+ /* This context might have been assigned an -+ * AS before, clear it. -+ */ -+ if (kctx->as_nr != KBASEP_AS_NR_INVALID) { -+ KBASE_TLSTREAM_TL_KBASE_CTX_UNASSIGN_AS( -+ kbdev, kctx->id); -+ kbdev->as_to_kctx[kctx->as_nr] = NULL; -+ kctx->as_nr = KBASEP_AS_NR_INVALID; -+ } -+ } -+ } else { -+ kbase_mmu_disable_as(kbdev, i); -+ } -+ } ++ spin_unlock_irqrestore(&self->access, flags); +} +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h +new file mode 100755 +index 000000000..f7fcf7780 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h +@@ -0,0 +1,95 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+struct kbase_context *kbase_ctx_sched_as_to_ctx_refcount( -+ struct kbase_device *kbdev, size_t as_nr) -+{ -+ unsigned long flags; -+ struct kbase_context *found_kctx = NULL; -+ -+ if (WARN_ON(kbdev == NULL)) -+ return NULL; -+ -+ if (WARN_ON(as_nr >= BASE_MAX_NR_AS)) -+ return NULL; ++#ifndef _KBASE_CCSWE_H_ ++#define _KBASE_CCSWE_H_ + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++#include + -+ found_kctx = kbdev->as_to_kctx[as_nr]; ++/** ++ * struct kbase_ccswe - Cycle count software estimator. ++ * ++ * @access: Spinlock protecting this structure access. ++ * @timestamp_ns: Timestamp(ns) when the last frequency change ++ * occurred. ++ * @cycles_elapsed: Number of cycles elapsed before the last frequency ++ * change ++ * @gpu_freq: Current GPU frequency(Hz) value. ++ * @prev_gpu_freq: Previous GPU frequency(Hz) before the last frequency ++ * change. ++ */ ++struct kbase_ccswe { ++ spinlock_t access; ++ u64 timestamp_ns; ++ u64 cycles_elapsed; ++ u32 gpu_freq; ++ u32 prev_gpu_freq; ++}; + -+ if (found_kctx != NULL) -+ kbase_ctx_sched_retain_ctx_refcount(found_kctx); ++/** ++ * kbase_ccswe_init() - initialize the cycle count estimator. ++ * ++ * @self: Cycles count software estimator instance. ++ */ ++void kbase_ccswe_init(struct kbase_ccswe *self); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++/** ++ * kbase_ccswe_cycle_at() - Estimate cycle count at given timestamp. ++ * ++ * @self: Cycles count software estimator instance. ++ * @timestamp_ns: The timestamp(ns) for cycle count estimation. ++ * ++ * The timestamp must be bigger than the timestamp of the penultimate ++ * frequency change. If only one frequency change occurred, the ++ * timestamp must be bigger than the timestamp of the frequency change. ++ * This is to allow the following code to be executed w/o synchronization. ++ * If lines below executed atomically, it is safe to assume that only ++ * one frequency change may happen in between. ++ * ++ * u64 ts = ktime_get_raw_ns(); ++ * u64 cycle = kbase_ccswe_cycle_at(&ccswe, ts) ++ * ++ * Return: estimated value of cycle count at a given time. ++ */ ++u64 kbase_ccswe_cycle_at(struct kbase_ccswe *self, u64 timestamp_ns); + -+ return found_kctx; -+} ++/** ++ * kbase_ccswe_freq_change() - update GPU frequency. ++ * ++ * @self: Cycles count software estimator instance. ++ * @timestamp_ns: Timestamp(ns) when frequency change occurred. ++ * @gpu_freq: New GPU frequency value. ++ * ++ * The timestamp must be bigger than the timestamp of the previous ++ * frequency change. The function is to be called at the frequency ++ * change moment (not later). ++ */ ++void kbase_ccswe_freq_change( ++ struct kbase_ccswe *self, u64 timestamp_ns, u32 gpu_freq); + -+struct kbase_context *kbase_ctx_sched_as_to_ctx(struct kbase_device *kbdev, -+ size_t as_nr) -+{ -+ unsigned long flags; -+ struct kbase_context *found_kctx; ++/** ++ * kbase_ccswe_reset() - reset estimator state ++ * ++ * @self: Cycles count software estimator instance. ++ */ ++void kbase_ccswe_reset(struct kbase_ccswe *self); + -+ if (WARN_ON(kbdev == NULL)) -+ return NULL; ++#endif /* _KBASE_CCSWE_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config.c b/drivers/gpu/arm/bifrost/mali_kbase_config.c +new file mode 100755 +index 000000000..37dbca129 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_config.c +@@ -0,0 +1,104 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2011-2015, 2017, 2020-2021 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+ if (WARN_ON(as_nr >= BASE_MAX_NR_AS)) -+ return NULL; ++#include ++#include ++#include + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++int kbasep_platform_device_init(struct kbase_device *kbdev) ++{ ++ struct kbase_platform_funcs_conf *platform_funcs_p; + -+ found_kctx = kbdev->as_to_kctx[as_nr]; ++ platform_funcs_p = (struct kbase_platform_funcs_conf *)PLATFORM_FUNCS; ++ if (platform_funcs_p && platform_funcs_p->platform_init_func) ++ return platform_funcs_p->platform_init_func(kbdev); + -+ if (found_kctx) { -+ if (WARN_ON(atomic_read(&found_kctx->refcount) <= 0)) -+ found_kctx = NULL; -+ } ++ return 0; ++} + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++void kbasep_platform_device_term(struct kbase_device *kbdev) ++{ ++ struct kbase_platform_funcs_conf *platform_funcs_p; + -+ return found_kctx; ++ platform_funcs_p = (struct kbase_platform_funcs_conf *)PLATFORM_FUNCS; ++ if (platform_funcs_p && platform_funcs_p->platform_term_func) ++ platform_funcs_p->platform_term_func(kbdev); +} + -+bool kbase_ctx_sched_inc_refcount_nolock(struct kbase_context *kctx) ++int kbasep_platform_device_late_init(struct kbase_device *kbdev) +{ -+ bool result = false; -+ int as_nr; -+ -+ if (WARN_ON(kctx == NULL)) -+ return result; ++ struct kbase_platform_funcs_conf *platform_funcs_p; + -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ platform_funcs_p = (struct kbase_platform_funcs_conf *)PLATFORM_FUNCS; ++ if (platform_funcs_p && platform_funcs_p->platform_late_init_func) ++ platform_funcs_p->platform_late_init_func(kbdev); + -+ as_nr = kctx->as_nr; -+ if (atomic_read(&kctx->refcount) > 0) { -+ KBASE_DEBUG_ASSERT(as_nr >= 0); ++ return 0; ++} + -+ kbase_ctx_sched_retain_ctx_refcount(kctx); -+ KBASE_KTRACE_ADD(kctx->kbdev, SCHED_RETAIN_CTX_NOLOCK, kctx, -+ kbase_ktrace_get_ctx_refcnt(kctx)); -+ result = true; -+ } ++void kbasep_platform_device_late_term(struct kbase_device *kbdev) ++{ ++ struct kbase_platform_funcs_conf *platform_funcs_p; + -+ return result; ++ platform_funcs_p = (struct kbase_platform_funcs_conf *)PLATFORM_FUNCS; ++ if (platform_funcs_p && platform_funcs_p->platform_late_term_func) ++ platform_funcs_p->platform_late_term_func(kbdev); +} + -+bool kbase_ctx_sched_inc_refcount(struct kbase_context *kctx) ++#if !MALI_USE_CSF ++int kbasep_platform_context_init(struct kbase_context *kctx) +{ -+ unsigned long flags; -+ bool result = false; ++ struct kbase_platform_funcs_conf *platform_funcs_p; + -+ if (WARN_ON(kctx == NULL)) -+ return result; ++ platform_funcs_p = (struct kbase_platform_funcs_conf *)PLATFORM_FUNCS; ++ if (platform_funcs_p && platform_funcs_p->platform_handler_context_init_func) ++ return platform_funcs_p->platform_handler_context_init_func(kctx); + -+ if (WARN_ON(kctx->kbdev == NULL)) -+ return result; ++ return 0; ++} + -+ mutex_lock(&kctx->kbdev->mmu_hw_mutex); -+ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, flags); -+ result = kbase_ctx_sched_inc_refcount_nolock(kctx); -+ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kctx->kbdev->mmu_hw_mutex); ++void kbasep_platform_context_term(struct kbase_context *kctx) ++{ ++ struct kbase_platform_funcs_conf *platform_funcs_p; + -+ return result; ++ platform_funcs_p = (struct kbase_platform_funcs_conf *)PLATFORM_FUNCS; ++ if (platform_funcs_p && platform_funcs_p->platform_handler_context_term_func) ++ platform_funcs_p->platform_handler_context_term_func(kctx); +} + -+void kbase_ctx_sched_release_ctx_lock(struct kbase_context *kctx) ++void kbasep_platform_event_atom_submit(struct kbase_jd_atom *katom) +{ -+ unsigned long flags; -+ -+ if (WARN_ON(!kctx)) -+ return; ++ struct kbase_platform_funcs_conf *platform_funcs_p; + -+ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, flags); ++ platform_funcs_p = (struct kbase_platform_funcs_conf *)PLATFORM_FUNCS; ++ if (platform_funcs_p && platform_funcs_p->platform_handler_atom_submit_func) ++ platform_funcs_p->platform_handler_atom_submit_func(katom); ++} + -+ if (!WARN_ON(kctx->as_nr == KBASEP_AS_NR_INVALID) && -+ !WARN_ON(atomic_read(&kctx->refcount) <= 0)) -+ kbase_ctx_sched_release_ctx(kctx); ++void kbasep_platform_event_atom_complete(struct kbase_jd_atom *katom) ++{ ++ struct kbase_platform_funcs_conf *platform_funcs_p; + -+ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, flags); ++ platform_funcs_p = (struct kbase_platform_funcs_conf *)PLATFORM_FUNCS; ++ if (platform_funcs_p && platform_funcs_p->platform_handler_atom_complete_func) ++ platform_funcs_p->platform_handler_atom_complete_func(katom); +} -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h ++#endif +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config.h b/drivers/gpu/arm/bifrost/mali_kbase_config.h new file mode 100755 -index 000000000000..1affa719e6dc +index 000000000..ecfdb2876 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h -@@ -0,0 +1,209 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_config.h +@@ -0,0 +1,583 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2017-2018, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2017, 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -198306,211 +229354,585 @@ index 000000000000..1affa719e6dc + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#ifndef _KBASE_CTX_SCHED_H_ -+#define _KBASE_CTX_SCHED_H_ ++/** ++ * DOC: Configuration API and Attributes for KBase ++ */ + -+#include ++#ifndef _KBASE_CONFIG_H_ ++#define _KBASE_CONFIG_H_ ++ ++#include ++#include ++#include ++#include ++ ++/* Forward declaration of struct kbase_device */ ++struct kbase_device; ++ ++#if !MALI_USE_CSF ++/* Forward declaration of struct kbase_context */ ++struct kbase_context; ++ ++/* Forward declaration of struct kbase_atom */ ++struct kbase_jd_atom; ++#endif + +/** -+ * The Context Scheduler manages address space assignment and reference -+ * counting to kbase_context. The interface has been designed to minimise -+ * interactions between the Job Scheduler and Power Management/MMU to support -+ * the existing Job Scheduler interface. ++ * struct kbase_platform_funcs_conf - Specifies platform integration function ++ * pointers for DDK events such as device init and term. + * -+ * The initial implementation of the Context Scheduler does not schedule -+ * contexts. Instead it relies on the Job Scheduler to make decisions of -+ * when to schedule/evict contexts if address spaces are starved. In the -+ * future, once an interface between the CS and JS has been devised to -+ * provide enough information about how each context is consuming GPU resources, -+ * those decisions can be made in the CS itself, thereby reducing duplicated -+ * code. ++ * Specifies the functions pointers for platform specific initialization and ++ * termination as well as other events. By default no functions are required. ++ * No additional platform specific control is necessary. + */ ++struct kbase_platform_funcs_conf { ++ /** ++ * @platform_init_func: platform specific init function pointer ++ * @kbdev - kbase_device pointer ++ * ++ * Returns 0 on success, negative error code otherwise. ++ * ++ * Function pointer for platform specific initialization or NULL if no ++ * initialization function is required. At the point this the GPU is ++ * not active and its power and clocks are in unknown (platform specific ++ * state) as kbase doesn't yet have control of power and clocks. ++ * ++ * The platform specific private pointer kbase_device::platform_context ++ * can be accessed (and possibly initialized) in here. ++ */ ++ int (*platform_init_func)(struct kbase_device *kbdev); ++ /** ++ * @platform_term_func: platform specific termination function pointer ++ * @kbdev - kbase_device pointer ++ * ++ * Function pointer for platform specific termination or NULL if no ++ * termination function is required. At the point this the GPU will be ++ * idle but still powered and clocked. ++ * ++ * The platform specific private pointer kbase_device::platform_context ++ * can be accessed (and possibly terminated) in here. ++ */ ++ void (*platform_term_func)(struct kbase_device *kbdev); + -+/** -+ * kbase_ctx_sched_init - Initialise the context scheduler -+ * @kbdev: The device for which the context scheduler needs to be initialised ++ /** ++ * @platform_late_init_func: platform specific late init function pointer ++ * @kbdev - kbase_device pointer ++ * ++ * Function pointer to inform that the kbase driver initialization completed ++ * or NULL if no such function is required. At this point the GPU driver will be ++ * fully initialized. ++ * ++ * The platform specific private pointer kbase_device::platform_context ++ * can be accessed (and possibly terminated) in here. ++ */ ++ int (*platform_late_init_func)(struct kbase_device *kbdev); ++ ++ /** ++ * @platform_late_term_func: platform specific late termination function pointer ++ * @kbdev - kbase_device pointer ++ * ++ * Function pointer for platform specific termination or NULL if no ++ * termination function is required. At this point the GPU driver will complete ++ * termination process ++ * ++ * The platform specific private pointer kbase_device::platform_context ++ * can be accessed (and possibly terminated) in here. ++ */ ++ void (*platform_late_term_func)(struct kbase_device *kbdev); ++ ++#if !MALI_USE_CSF ++ /** ++ * @platform_handler_context_init_func: platform specific handler for ++ * when a new kbase_context is created. ++ * @kctx - kbase_context pointer ++ * ++ * Returns 0 on success, negative error code otherwise. ++ * ++ * Function pointer for platform specific initialization of a kernel ++ * context or NULL if not required. Called at the last stage of kernel ++ * context initialization. ++ */ ++ int (*platform_handler_context_init_func)(struct kbase_context *kctx); ++ /** ++ * @platform_handler_context_term_func: platform specific handler for ++ * when a kbase_context is terminated. ++ * @kctx - kbase_context pointer ++ * ++ * Function pointer for platform specific termination of a kernel ++ * context or NULL if not required. Called at the first stage of kernel ++ * context termination. ++ */ ++ void (*platform_handler_context_term_func)(struct kbase_context *kctx); ++ /** ++ * @platform_handler_atom_submit_func: platform specific handler for ++ * when a kbase_jd_atom is submitted. ++ * @katom - kbase_jd_atom pointer ++ * ++ * Function pointer for platform specific handling at the point when an ++ * atom is submitted to the GPU or set to NULL if not required. The ++ * function cannot assume that it is running in a process context. ++ * ++ * Context: The caller must hold the hwaccess_lock. Function must be ++ * runnable in an interrupt context. ++ */ ++ void (*platform_handler_atom_submit_func)(struct kbase_jd_atom *katom); ++ /** ++ * @platform_handler_atom_complete_func: platform specific handler for ++ * when a kbase_jd_atom completes. ++ * @katom - kbase_jd_atom pointer ++ * ++ * Function pointer for platform specific handling at the point when an ++ * atom stops running on the GPU or set to NULL if not required. The ++ * function cannot assume that it is running in a process context. ++ * ++ * Context: The caller must hold the hwaccess_lock. Function must be ++ * runnable in an interrupt context. ++ */ ++ void (*platform_handler_atom_complete_func)( ++ struct kbase_jd_atom *katom); ++#endif ++}; ++ ++/* ++ * @brief Specifies the callbacks for power management + * -+ * This must be called during device initialisation. The number of hardware -+ * address spaces must already be established before calling this function. ++ * By default no callbacks will be made and the GPU must not be powered off. ++ */ ++struct kbase_pm_callback_conf { ++ /** Callback for when the GPU is idle and the power to it can be switched off. ++ * ++ * The system integrator can decide whether to either do nothing, just switch off ++ * the clocks to the GPU, or to completely power down the GPU. ++ * The platform specific private pointer kbase_device::platform_context can be accessed and modified in here. It is the ++ * platform \em callbacks responsibility to initialize and terminate this pointer if used (see @ref kbase_platform_funcs_conf). ++ * ++ * If runtime PM is enabled and @power_runtime_gpu_idle_callback is used ++ * then this callback should power off the GPU (or switch off the clocks ++ * to GPU) immediately. If @power_runtime_gpu_idle_callback is not used, ++ * then this callback can set the autosuspend timeout (if desired) and ++ * let the GPU be powered down later. ++ */ ++ void (*power_off_callback)(struct kbase_device *kbdev); ++ ++ /** Callback for when the GPU is about to become active and power must be supplied. ++ * ++ * This function must not return until the GPU is powered and clocked sufficiently for register access to ++ * succeed. The return value specifies whether the GPU was powered down since the call to power_off_callback. ++ * If the GPU state has been lost then this function must return 1, otherwise it should return 0. ++ * The platform specific private pointer kbase_device::platform_context can be accessed and modified in here. It is the ++ * platform \em callbacks responsibility to initialize and terminate this pointer if used (see @ref kbase_platform_funcs_conf). ++ * ++ * The return value of the first call to this function is ignored. ++ * ++ * @return 1 if the GPU state may have been lost, 0 otherwise. ++ */ ++ int (*power_on_callback)(struct kbase_device *kbdev); ++ ++ /** Callback for when the system is requesting a suspend and GPU power ++ * must be switched off. ++ * ++ * Note that if this callback is present, then this may be called ++ * without a preceding call to power_off_callback. Therefore this ++ * callback must be able to take any action that might otherwise happen ++ * in power_off_callback. ++ * ++ * The platform specific private pointer kbase_device::platform_context ++ * can be accessed and modified in here. It is the platform \em ++ * callbacks responsibility to initialize and terminate this pointer if ++ * used (see @ref kbase_platform_funcs_conf). ++ */ ++ void (*power_suspend_callback)(struct kbase_device *kbdev); ++ ++ /** Callback for when the system is resuming from a suspend and GPU ++ * power must be switched on. ++ * ++ * Note that if this callback is present, then this may be called ++ * without a following call to power_on_callback. Therefore this ++ * callback must be able to take any action that might otherwise happen ++ * in power_on_callback. ++ * ++ * The platform specific private pointer kbase_device::platform_context ++ * can be accessed and modified in here. It is the platform \em ++ * callbacks responsibility to initialize and terminate this pointer if ++ * used (see @ref kbase_platform_funcs_conf). ++ */ ++ void (*power_resume_callback)(struct kbase_device *kbdev); ++ ++ /** Callback for handling runtime power management initialization. ++ * ++ * The runtime power management callbacks @ref power_runtime_off_callback and @ref power_runtime_on_callback ++ * will become active from calls made to the OS from within this function. ++ * The runtime calls can be triggered by calls from @ref power_off_callback and @ref power_on_callback. ++ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. ++ * ++ * @return 0 on success, else int error code. ++ */ ++ int (*power_runtime_init_callback)(struct kbase_device *kbdev); ++ ++ /** Callback for handling runtime power management termination. ++ * ++ * The runtime power management callbacks @ref power_runtime_off_callback and @ref power_runtime_on_callback ++ * should no longer be called by the OS on completion of this function. ++ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. ++ */ ++ void (*power_runtime_term_callback)(struct kbase_device *kbdev); ++ ++ /** Callback for runtime power-off power management callback ++ * ++ * For linux this callback will be called by the kernel runtime_suspend callback. ++ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. ++ */ ++ void (*power_runtime_off_callback)(struct kbase_device *kbdev); ++ ++ /** Callback for runtime power-on power management callback ++ * ++ * For linux this callback will be called by the kernel runtime_resume callback. ++ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. ++ * ++ * @return 0 on success, else OS error code. ++ */ ++ int (*power_runtime_on_callback)(struct kbase_device *kbdev); ++ ++ /* ++ * Optional callback for checking if GPU can be suspended when idle ++ * ++ * This callback will be called by the runtime power management core ++ * when the reference count goes to 0 to provide notification that the ++ * GPU now seems idle. ++ * ++ * If this callback finds that the GPU can't be powered off, or handles ++ * suspend by powering off directly or queueing up a power off, a ++ * non-zero value must be returned to prevent the runtime PM core from ++ * also triggering a suspend. ++ * ++ * Returning 0 will cause the runtime PM core to conduct a regular ++ * autosuspend. ++ * ++ * This callback is optional and if not provided regular autosuspend ++ * will be triggered. ++ * ++ * Note: The Linux kernel must have CONFIG_PM_RUNTIME enabled to use ++ * this feature. ++ * ++ * Return 0 if GPU can be suspended, positive value if it can not be ++ * suspeneded by runtime PM, else OS error code ++ */ ++ int (*power_runtime_idle_callback)(struct kbase_device *kbdev); ++ ++ /* ++ * Optional callback for software reset ++ * ++ * This callback will be called by the power management core to trigger ++ * a GPU soft reset. ++ * ++ * Return 0 if the soft reset was successful and the RESET_COMPLETED ++ * interrupt will be raised, or a positive value if the interrupt won't ++ * be raised. On error, return the corresponding OS error code. ++ */ ++ int (*soft_reset_callback)(struct kbase_device *kbdev); ++ ++ /* ++ * Optional callback invoked after GPU becomes idle, not supported on ++ * JM GPUs. ++ * ++ * This callback will be invoked by the Kbase when GPU becomes idle. ++ * For JM GPUs or when runtime PM is disabled, Kbase will not invoke ++ * this callback and @power_off_callback will be invoked directly. ++ * ++ * This callback is supposed to decrement the runtime PM core reference ++ * count to zero and trigger the auto-suspend timer, which implies that ++ * @power_off_callback shouldn't initiate the runtime suspend. ++ * ++ * GPU registers still remain accessible until @power_off_callback gets ++ * invoked later on the expiry of auto-suspend timer. ++ * ++ * Note: The Linux kernel must have CONFIG_PM_RUNTIME enabled to use ++ * this feature. ++ */ ++ void (*power_runtime_gpu_idle_callback)(struct kbase_device *kbdev); ++ ++ /* ++ * Optional callback invoked to change the runtime PM core state to ++ * active. ++ * ++ * This callback will be invoked by Kbase when GPU needs to be ++ * reactivated, but only if @power_runtime_gpu_idle_callback was invoked ++ * previously. So both @power_runtime_gpu_idle_callback and this ++ * callback needs to be implemented at the same time. ++ * ++ * Kbase will invoke @power_on_callback first before invoking this ++ * callback if the GPU was powered down previously, otherwise directly. ++ * ++ * This callback is supposed to increment the runtime PM core reference ++ * count to 1, which implies that @power_on_callback shouldn't initiate ++ * the runtime resume. The runtime resume may not happen synchronously ++ * to avoid a potential deadlock due to the runtime suspend happening ++ * simultaneously from some other thread. ++ * ++ * Note: The Linux kernel must have CONFIG_PM_RUNTIME enabled to use ++ * this feature. ++ */ ++ void (*power_runtime_gpu_active_callback)(struct kbase_device *kbdev); ++}; ++ ++/* struct kbase_gpu_clk_notifier_data - Data for clock rate change notifier. + * -+ * Return: 0 for success, otherwise failure ++ * Pointer to this structure is supposed to be passed to the gpu clock rate ++ * change notifier function. This structure is deliberately aligned with the ++ * common clock framework notification structure 'struct clk_notifier_data' ++ * and such alignment should be maintained. ++ * ++ * @gpu_clk_handle: Handle of the GPU clock for which notifier was registered. ++ * @old_rate: Previous rate of this GPU clock in Hz. ++ * @new_rate: New rate of this GPU clock in Hz. + */ -+int kbase_ctx_sched_init(struct kbase_device *kbdev); ++struct kbase_gpu_clk_notifier_data { ++ void *gpu_clk_handle; ++ unsigned long old_rate; ++ unsigned long new_rate; ++}; + +/** -+ * kbase_ctx_sched_term - Terminate the context scheduler -+ * @kbdev: The device for which the context scheduler needs to be terminated ++ * struct kbase_clk_rate_trace_op_conf - Specifies GPU clock rate trace ++ * operations. + * -+ * This must be called during device termination after all contexts have been -+ * destroyed. ++ * Specifies the functions pointers for platform specific GPU clock rate trace ++ * operations. By default no functions are required. + */ -+void kbase_ctx_sched_term(struct kbase_device *kbdev); ++struct kbase_clk_rate_trace_op_conf { ++ /** ++ * @enumerate_gpu_clk: Enumerate a GPU clock on the given index ++ * @kbdev - kbase_device pointer ++ * @index - GPU clock index ++ * ++ * Returns a handle unique to the given GPU clock, or NULL if the clock ++ * array has been exhausted at the given index value. ++ * ++ * Kbase will use this function pointer to enumerate the existence of a ++ * GPU clock on the given index. ++ */ ++ void *(*enumerate_gpu_clk)(struct kbase_device *kbdev, ++ unsigned int index); ++ ++ /** ++ * @get_gpu_clk_rate: Get the current rate for an enumerated clock. ++ * @kbdev - kbase_device pointer ++ * @gpu_clk_handle - Handle unique to the enumerated GPU clock ++ * ++ * Returns current rate of the GPU clock in unit of Hz. ++ */ ++ unsigned long (*get_gpu_clk_rate)(struct kbase_device *kbdev, ++ void *gpu_clk_handle); ++ ++ /** ++ * @gpu_clk_notifier_register: Register a clock rate change notifier. ++ * @kbdev - kbase_device pointer ++ * @gpu_clk_handle - Handle unique to the enumerated GPU clock ++ * @nb - notifier block containing the callback function ++ * pointer ++ * ++ * Returns 0 on success, negative error code otherwise. ++ * ++ * This function pointer is used to register a callback function that ++ * is supposed to be invoked whenever the rate of clock corresponding ++ * to @gpu_clk_handle changes. ++ * @nb contains the pointer to callback function. ++ * The callback function expects the pointer of type ++ * 'struct kbase_gpu_clk_notifier_data' as the third argument. ++ */ ++ int (*gpu_clk_notifier_register)(struct kbase_device *kbdev, ++ void *gpu_clk_handle, struct notifier_block *nb); ++ ++ /** ++ * @gpu_clk_notifier_unregister: Unregister clock rate change notifier ++ * @kbdev - kbase_device pointer ++ * @gpu_clk_handle - Handle unique to the enumerated GPU clock ++ * @nb - notifier block containing the callback function ++ * pointer ++ * ++ * This function pointer is used to unregister a callback function that ++ * was previously registered to get notified of the change in rate ++ * of clock corresponding to @gpu_clk_handle. ++ */ ++ void (*gpu_clk_notifier_unregister)(struct kbase_device *kbdev, ++ void *gpu_clk_handle, struct notifier_block *nb); ++}; ++ ++#if IS_ENABLED(CONFIG_OF) ++struct kbase_platform_config { ++}; ++#else ++ ++/* ++ * @brief Specifies start and end of I/O memory region. ++ */ ++struct kbase_io_memory_region { ++ u64 start; ++ u64 end; ++}; ++ ++/* ++ * @brief Specifies I/O related resources like IRQs and memory region for I/O operations. ++ */ ++struct kbase_io_resources { ++ u32 job_irq_number; ++ u32 mmu_irq_number; ++ u32 gpu_irq_number; ++ struct kbase_io_memory_region io_memory_region; ++}; ++ ++struct kbase_platform_config { ++ const struct kbase_io_resources *io_resources; ++}; ++ ++#endif /* CONFIG_OF */ + +/** -+ * kbase_ctx_sched_retain_ctx - Retain a reference to the @ref kbase_context -+ * @kctx: The context to which to retain a reference -+ * -+ * This function should be called whenever an address space should be assigned -+ * to a context and programmed onto the MMU. It should typically be called -+ * when jobs are ready to be submitted to the GPU. -+ * -+ * It can be called as many times as necessary. The address space will be -+ * assigned to the context for as long as there is a reference to said context. -+ * -+ * The kbase_device::mmu_hw_mutex and kbase_device::hwaccess_lock locks must be -+ * held whilst calling this function. ++ * kbase_get_platform_config - Gets the pointer to platform config. + * -+ * Return: The address space that the context has been assigned to or -+ * KBASEP_AS_NR_INVALID if no address space was available. ++ * Return: Pointer to the platform config + */ -+int kbase_ctx_sched_retain_ctx(struct kbase_context *kctx); ++struct kbase_platform_config *kbase_get_platform_config(void); + +/** -+ * kbase_ctx_sched_retain_ctx_refcount -+ * @kctx: The context to which to retain a reference -+ * -+ * This function only retains a reference to the context. It must be called -+ * only when the context already has a reference. ++ * kbasep_platform_device_init: - Platform specific call to initialize hardware ++ * @kbdev: kbase device pointer + * -+ * This is typically called inside an atomic session where we know the context -+ * is already scheduled in but want to take an extra reference to ensure that -+ * it doesn't get descheduled. ++ * Function calls a platform defined routine if specified in the configuration ++ * attributes. The routine can initialize any hardware and context state that ++ * is required for the GPU block to function. + * -+ * The kbase_device::hwaccess_lock must be held whilst calling this function ++ * Return: 0 if no errors have been found in the config. ++ * Negative error code otherwise. + */ -+void kbase_ctx_sched_retain_ctx_refcount(struct kbase_context *kctx); ++int kbasep_platform_device_init(struct kbase_device *kbdev); + +/** -+ * kbase_ctx_sched_release_ctx - Release a reference to the @ref kbase_context -+ * @kctx: The context from which to release a reference ++ * kbasep_platform_device_term - Platform specific call to terminate hardware ++ * @kbdev: Kbase device pointer + * -+ * This function should be called whenever an address space could be unassigned -+ * from a context. When there are no more references to said context, the -+ * address space previously assigned to this context shall be reassigned to -+ * other contexts as needed. ++ * Function calls a platform defined routine if specified in the configuration ++ * attributes. The routine can destroy any platform specific context state and ++ * shut down any hardware functionality that are outside of the Power Management ++ * callbacks. + * -+ * The kbase_device::hwaccess_lock must be held whilst calling this function + */ -+void kbase_ctx_sched_release_ctx(struct kbase_context *kctx); ++void kbasep_platform_device_term(struct kbase_device *kbdev); + +/** -+ * kbase_ctx_sched_remove_ctx - Unassign previously assigned address space -+ * @kctx: The context to be removed ++ * kbasep_platform_device_late_init: - Platform specific call to finish hardware ++ * initialization ++ * @kbdev: kbase device pointer + * -+ * This function should be called when a context is being destroyed. The -+ * context must no longer have any reference. If it has been assigned an -+ * address space before then the AS will be unprogrammed. ++ * Function calls a platform defined routine if specified in the configuration ++ * attributes. The routine can initialize any hardware and context state that ++ * is required for the GPU block to function. + * -+ * The kbase_device::mmu_hw_mutex and kbase_device::hwaccess_lock locks must be -+ * held whilst calling this function. ++ * Return: 0 if no errors have been found in the config. ++ * Negative error code otherwise. + */ -+void kbase_ctx_sched_remove_ctx(struct kbase_context *kctx); ++int kbasep_platform_device_late_init(struct kbase_device *kbdev); + +/** -+ * kbase_ctx_sched_restore_all_as - Reprogram all address spaces -+ * @kbdev: The device for which address spaces to be reprogrammed ++ * kbasep_platform_device_late_term - Platform specific call to finish hardware ++ * termination ++ * @kbdev: Kbase device pointer + * -+ * This function shall reprogram all address spaces previously assigned to -+ * contexts. It can be used after the GPU is reset. ++ * Function calls a platform defined routine if specified in the configuration ++ * attributes. The routine can destroy any platform specific context state and ++ * shut down any hardware functionality that are outside of the Power Management ++ * callbacks. + * -+ * The kbase_device::mmu_hw_mutex and kbase_device::hwaccess_lock locks must be -+ * held whilst calling this function. + */ -+void kbase_ctx_sched_restore_all_as(struct kbase_device *kbdev); ++void kbasep_platform_device_late_term(struct kbase_device *kbdev); + ++#if !MALI_USE_CSF +/** -+ * kbase_ctx_sched_as_to_ctx_refcount - Lookup a context based on its current -+ * address space and ensure that is stays scheduled in -+ * @kbdev: The device for which the returned context must belong -+ * @as_nr: address space assigned to the context of interest ++ * kbasep_platform_context_init - Platform specific callback when a kernel ++ * context is created ++ * @kctx: kbase_context pointer + * -+ * The context is refcounted as being busy to prevent it from scheduling -+ * out. It must be released with kbase_ctx_sched_release_ctx() when it is no -+ * longer required to stay scheduled in. ++ * Function calls a platform defined routine if specified in the configuration ++ * attributes. The routine can initialize any per kernel context structures ++ * that are required for the GPU block to function. + * -+ * This function can safely be called from IRQ context. ++ * Return: 0 if no errors were encountered. Negative error code otherwise. ++ */ ++int kbasep_platform_context_init(struct kbase_context *kctx); ++ ++/** ++ * kbasep_platform_context_term - Platform specific callback when a kernel ++ * context is terminated ++ * @kctx: kbase_context pointer + * -+ * The following locking conditions are made on the caller: -+ * * it must not hold the kbase_device::hwaccess_lock, because it will be used -+ * internally. ++ * Function calls a platform defined routine if specified in the configuration ++ * attributes. The routine should terminate any per kernel context structures ++ * created as part of &kbasep_platform_context_init. + * -+ * Return: a valid struct kbase_context on success, which has been refcounted -+ * as being busy or return NULL on failure, indicating that no context was found -+ * in as_nr. + */ -+struct kbase_context *kbase_ctx_sched_as_to_ctx_refcount( -+ struct kbase_device *kbdev, size_t as_nr); ++void kbasep_platform_context_term(struct kbase_context *kctx); + +/** -+ * kbase_ctx_sched_as_to_ctx - Lookup a context based on its current address -+ * space -+ * @kbdev: The device for which the returned context must belong -+ * @as_nr: address space assigned to the context of interest ++ * kbasep_platform_event_atom_submit - Platform specific callback when an atom ++ * is submitted to the GPU ++ * @katom: kbase_jd_atom pointer + * -+ * Return: a valid struct kbase_context on success or NULL on failure, -+ * indicating that no context was found in as_nr. ++ * Function calls a platform defined routine if specified in the configuration ++ * attributes. The routine should not assume that it is in a process context. ++ * ++ * Return: 0 if no errors were encountered. Negative error code otherwise. + */ -+struct kbase_context *kbase_ctx_sched_as_to_ctx(struct kbase_device *kbdev, -+ size_t as_nr); ++void kbasep_platform_event_atom_submit(struct kbase_jd_atom *katom); + +/** -+ * kbase_ctx_sched_inc_refcount_nolock - Refcount a context as being busy, -+ * preventing it from being scheduled out. -+ * @kctx: Context to be refcounted ++ * kbasep_platform_event_atom_complete - Platform specific callback when an atom ++ * has stopped running on the GPU ++ * @katom: kbase_jd_atom pointer + * -+ * The following locks must be held by the caller: -+ * * kbase_device::mmu_hw_mutex -+ * * kbase_device::hwaccess_lock ++ * Function calls a platform defined routine if specified in the configuration ++ * attributes. The routine should not assume that it is in a process context. + * -+ * Return: true if refcount succeeded, and the context will not be scheduled -+ * out, false if the refcount failed (because the context is being/has been -+ * scheduled out). + */ -+bool kbase_ctx_sched_inc_refcount_nolock(struct kbase_context *kctx); ++void kbasep_platform_event_atom_complete(struct kbase_jd_atom *katom); ++#endif + ++#ifndef CONFIG_OF +/** -+ * kbase_ctx_sched_inc_refcount - Refcount a context as being busy, preventing -+ * it from being scheduled out. -+ * @kctx: Context to be refcounted -+ * -+ * The following locking conditions are made on the caller: -+ * * it must not hold kbase_device::mmu_hw_mutex and -+ * kbase_device::hwaccess_lock, because they will be used internally. ++ * kbase_platform_register - Register a platform device for the GPU ++ * This can be used to register a platform device on systems where device tree ++ * is not enabled and the platform initialisation code in the kernel doesn't ++ * create the GPU device. Where possible device tree should be used instead. + * -+ * Return: true if refcount succeeded, and the context will not be scheduled -+ * out, false if the refcount failed (because the context is being/has been -+ * scheduled out). ++ * Return: 0 for success, any other fail causes module initialisation to fail + */ -+bool kbase_ctx_sched_inc_refcount(struct kbase_context *kctx); ++int kbase_platform_register(void); + +/** -+ * kbase_ctx_sched_release_ctx_lock - Release a reference count of a context -+ * @kctx: Context for which refcount should be decreased ++ * kbase_platform_unregister - Unregister a fake platform device + * -+ * Effectivelly, this is a wrapper for kbase_ctx_sched_release_ctx, but -+ * kbase_device::hwaccess_lock is required NOT to be locked. ++ * Unregister the platform device created with kbase_platform_register() + */ -+void kbase_ctx_sched_release_ctx_lock(struct kbase_context *kctx); ++void kbase_platform_unregister(void); ++#endif + -+#endif /* _KBASE_CTX_SCHED_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug.c b/drivers/gpu/arm/bifrost/mali_kbase_debug.c ++#endif /* _KBASE_CONFIG_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h b/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h new file mode 100755 -index 000000000000..118f787fb74c +index 000000000..14493a77e --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.c -@@ -0,0 +1,44 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h +@@ -0,0 +1,278 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2012-2014 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2013-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -198521,221 +229943,280 @@ index 000000000000..118f787fb74c + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ */ ++ ++/** ++ * DOC: Default values for configuration settings + * + */ + ++#ifndef _KBASE_CONFIG_DEFAULTS_H_ ++#define _KBASE_CONFIG_DEFAULTS_H_ + ++/* Include mandatory definitions per platform */ ++#include + -+#include ++enum { ++ /* Use unrestricted Address ID width on the AXI bus. */ ++ KBASE_AID_32 = 0x0, + -+static struct kbasep_debug_assert_cb kbasep_debug_assert_registered_cb = { -+ NULL, -+ NULL ++ /* Restrict GPU to a half of maximum Address ID count. ++ * This will reduce performance, but reduce bus load due to GPU. ++ */ ++ KBASE_AID_16 = 0x3, ++ ++ /* Restrict GPU to a quarter of maximum Address ID count. ++ * This will reduce performance, but reduce bus load due to GPU. ++ */ ++ KBASE_AID_8 = 0x2, ++ ++ /* Restrict GPU to an eighth of maximum Address ID count. ++ * This will reduce performance, but reduce bus load due to GPU. ++ */ ++ KBASE_AID_4 = 0x1 +}; + -+void kbase_debug_assert_register_hook(kbase_debug_assert_hook *func, void *param) -+{ -+ kbasep_debug_assert_registered_cb.func = func; -+ kbasep_debug_assert_registered_cb.param = param; -+} ++enum { ++ /* Use unrestricted Address ID width on the AXI bus. ++ * Restricting ID width will reduce performance & bus load due to GPU. ++ */ ++ KBASE_3BIT_AID_32 = 0x0, + -+void kbasep_debug_assert_call_hook(void) -+{ -+ if (kbasep_debug_assert_registered_cb.func != NULL) -+ kbasep_debug_assert_registered_cb.func(kbasep_debug_assert_registered_cb.param); -+} -+KBASE_EXPORT_SYMBOL(kbasep_debug_assert_call_hook); ++ /* Restrict GPU to 7/8 of maximum Address ID count. */ ++ KBASE_3BIT_AID_28 = 0x1, + -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug.h b/drivers/gpu/arm/bifrost/mali_kbase_debug.h -new file mode 100755 -index 000000000000..f33413908405 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.h -@@ -0,0 +1,169 @@ ++ /* Restrict GPU to 3/4 of maximum Address ID count. */ ++ KBASE_3BIT_AID_24 = 0x2, ++ ++ /* Restrict GPU to 5/8 of maximum Address ID count. */ ++ KBASE_3BIT_AID_20 = 0x3, ++ ++ /* Restrict GPU to 1/2 of maximum Address ID count. */ ++ KBASE_3BIT_AID_16 = 0x4, ++ ++ /* Restrict GPU to 3/8 of maximum Address ID count. */ ++ KBASE_3BIT_AID_12 = 0x5, ++ ++ /* Restrict GPU to 1/4 of maximum Address ID count. */ ++ KBASE_3BIT_AID_8 = 0x6, ++ ++ /* Restrict GPU to 1/8 of maximum Address ID count. */ ++ KBASE_3BIT_AID_4 = 0x7 ++}; ++ ++#if MALI_USE_CSF +/* ++ * Default value for the TIMER register of the IPA Control interface, ++ * expressed in milliseconds. + * -+ * (C) COPYRIGHT 2012-2015, 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 ++ * The chosen value is a trade off between two requirements: the IPA Control ++ * interface should sample counters with a resolution in the order of ++ * milliseconds, while keeping GPU overhead as limited as possible. ++ */ ++#define IPA_CONTROL_TIMER_DEFAULT_VALUE_MS ((u32)10) /* 10 milliseconds */ ++#endif /* MALI_USE_CSF */ ++ ++/* Default period for DVFS sampling (can be overridden by platform header) */ ++#ifndef DEFAULT_PM_DVFS_PERIOD ++#define DEFAULT_PM_DVFS_PERIOD 100 /* 100ms */ ++#endif ++ ++/* Power Management poweroff tick granuality. This is in nanoseconds to ++ * allow HR timer support (can be overridden by platform header). + * ++ * On each scheduling tick, the power manager core may decide to: ++ * -# Power off one or more shader cores ++ * -# Power off the entire GPU + */ ++#ifndef DEFAULT_PM_GPU_POWEROFF_TICK_NS ++#define DEFAULT_PM_GPU_POWEROFF_TICK_NS (400000) /* 400us */ ++#endif + ++/* Power Manager number of ticks before shader cores are powered off ++ * (can be overridden by platform header). ++ */ ++#ifndef DEFAULT_PM_POWEROFF_TICK_SHADER ++#define DEFAULT_PM_POWEROFF_TICK_SHADER (2) /* 400-800us */ ++#endif + ++/* Default scheduling tick granuality (can be overridden by platform header) */ ++#ifndef DEFAULT_JS_SCHEDULING_PERIOD_NS ++#define DEFAULT_JS_SCHEDULING_PERIOD_NS (100000000u) /* 100ms */ ++#endif + -+#ifndef _KBASE_DEBUG_H -+#define _KBASE_DEBUG_H ++/* Default minimum number of scheduling ticks before jobs are soft-stopped. ++ * ++ * This defines the time-slice for a job (which may be different from that of a ++ * context) ++ */ ++#define DEFAULT_JS_SOFT_STOP_TICKS (1) /* 100ms-200ms */ + -+#include ++/* Default minimum number of scheduling ticks before CL jobs are soft-stopped. */ ++#define DEFAULT_JS_SOFT_STOP_TICKS_CL (1) /* 100ms-200ms */ + -+/** @brief If equals to 0, a trace containing the file, line, and function will be displayed before each message. */ -+#define KBASE_DEBUG_SKIP_TRACE 0 ++/* Default minimum number of scheduling ticks before jobs are hard-stopped */ ++#define DEFAULT_JS_HARD_STOP_TICKS_SS (50) /* 5s */ + -+/** @brief If different from 0, the trace will only contain the file and line. */ -+#define KBASE_DEBUG_SKIP_FUNCTION_NAME 0 ++/* Default minimum number of scheduling ticks before CL jobs are hard-stopped. */ ++#define DEFAULT_JS_HARD_STOP_TICKS_CL (50) /* 5s */ + -+/** @brief Disable the asserts tests if set to 1. Default is to disable the asserts in release. */ -+#ifndef KBASE_DEBUG_DISABLE_ASSERTS -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+#define KBASE_DEBUG_DISABLE_ASSERTS 0 -+#else -+#define KBASE_DEBUG_DISABLE_ASSERTS 1 -+#endif -+#endif /* KBASE_DEBUG_DISABLE_ASSERTS */ ++/* Default minimum number of scheduling ticks before jobs are hard-stopped ++ * during dumping ++ */ ++#define DEFAULT_JS_HARD_STOP_TICKS_DUMPING (15000) /* 1500s */ + -+/** Function type that is called on an KBASE_DEBUG_ASSERT() or KBASE_DEBUG_ASSERT_MSG() */ -+typedef void (kbase_debug_assert_hook) (void *); ++/* Default timeout for some software jobs, after which the software event wait ++ * jobs will be cancelled. ++ */ ++#define DEFAULT_JS_SOFT_JOB_TIMEOUT (3000) /* 3s */ + -+struct kbasep_debug_assert_cb { -+ kbase_debug_assert_hook *func; -+ void *param; -+}; ++/* Default minimum number of scheduling ticks before the GPU is reset to clear a ++ * "stuck" job ++ */ ++#define DEFAULT_JS_RESET_TICKS_SS (55) /* 5.5s */ + -+/** -+ * @def KBASEP_DEBUG_PRINT_TRACE -+ * @brief Private macro containing the format of the trace to display before every message -+ * @sa KBASE_DEBUG_SKIP_TRACE, KBASE_DEBUG_SKIP_FUNCTION_NAME ++/* Default minimum number of scheduling ticks before the GPU is reset to clear a ++ * "stuck" CL job. + */ -+#if !KBASE_DEBUG_SKIP_TRACE -+#define KBASEP_DEBUG_PRINT_TRACE \ -+ "In file: " __FILE__ " line: " CSTD_STR2(__LINE__) -+#if !KBASE_DEBUG_SKIP_FUNCTION_NAME -+#define KBASEP_DEBUG_PRINT_FUNCTION __func__ -+#else -+#define KBASEP_DEBUG_PRINT_FUNCTION "" -+#endif -+#else -+#define KBASEP_DEBUG_PRINT_TRACE "" -+#endif ++#define DEFAULT_JS_RESET_TICKS_CL (55) /* 5.5s */ + -+/** -+ * @def KBASEP_DEBUG_ASSERT_OUT(trace, function, ...) -+ * @brief (Private) system printing function associated to the @ref KBASE_DEBUG_ASSERT_MSG event. -+ * @param trace location in the code from where the message is printed -+ * @param function function from where the message is printed -+ * @param ... Format string followed by format arguments. -+ * @note function parameter cannot be concatenated with other strings ++/* Default minimum number of scheduling ticks before the GPU is reset to clear a ++ * "stuck" job during dumping. + */ -+/* Select the correct system output function*/ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+#define KBASEP_DEBUG_ASSERT_OUT(trace, function, ...)\ -+ do { \ -+ pr_err("Mali: %s function:%s ", trace, function);\ -+ pr_err(__VA_ARGS__);\ -+ pr_err("\n");\ -+ } while (false) -+#else -+#define KBASEP_DEBUG_ASSERT_OUT(trace, function, ...) CSTD_NOP() -+#endif ++#define DEFAULT_JS_RESET_TICKS_DUMPING (15020) /* 1502s */ + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+#define KBASE_CALL_ASSERT_HOOK() kbasep_debug_assert_call_hook() -+#else -+#define KBASE_CALL_ASSERT_HOOK() CSTD_NOP() -+#endif ++/* Nominal reference frequency that was used to obtain all following ++ * <...>_TIMEOUT_CYCLES macros, in kHz. ++ * ++ * Timeouts are scaled based on the relation between this value and the lowest ++ * GPU clock frequency. ++ */ ++#define DEFAULT_REF_TIMEOUT_FREQ_KHZ (100000) + -+/** -+ * @def KBASE_DEBUG_ASSERT(expr) -+ * @brief Calls @ref KBASE_PRINT_ASSERT and prints the expression @a expr if @a expr is false ++#if MALI_USE_CSF ++/* Waiting timeout for status change acknowledgment, in clock cycles. + * -+ * @note This macro does nothing if the flag @ref KBASE_DEBUG_DISABLE_ASSERTS is set to 1 ++ * This is also the default timeout to be used when an invalid timeout ++ * selector is used to retrieve the timeout on CSF GPUs. + * -+ * @param expr Boolean expression ++ * Based on 75000ms timeout at nominal 100MHz, as is required for Android - based ++ * on scaling from a 50MHz GPU system. + */ -+#define KBASE_DEBUG_ASSERT(expr) \ -+ KBASE_DEBUG_ASSERT_MSG(expr, #expr) ++#define CSF_FIRMWARE_TIMEOUT_CYCLES (7500000000ull) + -+#if KBASE_DEBUG_DISABLE_ASSERTS -+#define KBASE_DEBUG_ASSERT_MSG(expr, ...) CSTD_NOP() -+#else -+ /** -+ * @def KBASE_DEBUG_ASSERT_MSG(expr, ...) -+ * @brief Calls @ref KBASEP_DEBUG_ASSERT_OUT and prints the given message if @a expr is false -+ * -+ * @note This macro does nothing if the flag @ref KBASE_DEBUG_DISABLE_ASSERTS is set to 1 -+ * -+ * @param expr Boolean expression -+ * @param ... Message to display when @a expr is false, as a format string followed by format arguments. -+ */ -+#define KBASE_DEBUG_ASSERT_MSG(expr, ...) \ -+ do { \ -+ if (!(expr)) { \ -+ KBASEP_DEBUG_ASSERT_OUT(KBASEP_DEBUG_PRINT_TRACE, KBASEP_DEBUG_PRINT_FUNCTION, __VA_ARGS__);\ -+ KBASE_CALL_ASSERT_HOOK();\ -+ BUG();\ -+ } \ -+ } while (false) -+#endif /* KBASE_DEBUG_DISABLE_ASSERTS */ ++/* Timeout in clock cycles for GPU Power Management to reach the desired ++ * Shader, L2 and MCU state. ++ * ++ * Based on 2500ms timeout at nominal 100MHz, scaled from a 50MHz GPU system. ++ */ ++#define CSF_PM_TIMEOUT_CYCLES (250000000) + -+/** -+ * @def KBASE_DEBUG_CODE( X ) -+ * @brief Executes the code inside the macro only in debug mode ++/* Waiting timeout in clock cycles for GPU reset to complete. + * -+ * @param X Code to compile only in debug mode. ++ * Based on 2500ms timeout at 100MHz, scaled from a 50MHz GPU system + */ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+#define KBASE_DEBUG_CODE(X) X -+#else -+#define KBASE_DEBUG_CODE(X) CSTD_NOP() -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++#define CSF_GPU_RESET_TIMEOUT_CYCLES (250000000) + -+/** @} */ ++/* Waiting timeout in clock cycles for all active CSGs to be suspended. ++ * ++ * Based on 1500ms timeout at 100MHz, scaled from a 50MHz GPU system. ++ */ ++#define CSF_CSG_SUSPEND_TIMEOUT_CYCLES (150000000) + -+/** -+ * @brief Register a function to call on ASSERT ++/* Waiting timeout in clock cycles for GPU firmware to boot. + * -+ * Such functions will \b only be called during Debug mode, and for debugging -+ * features \b only. Do not rely on them to be called in general use. ++ * Based on 250ms timeout at 100MHz, scaled from a 50MHz GPU system. ++ */ ++#define CSF_FIRMWARE_BOOT_TIMEOUT_CYCLES (25000000) ++ ++/* Waiting timeout for a ping request to be acknowledged, in clock cycles. + * -+ * To disable the hook, supply NULL to \a func. ++ * Based on 6000ms timeout at 100MHz, scaled from a 50MHz GPU system. ++ */ ++#define CSF_FIRMWARE_PING_TIMEOUT_CYCLES (600000000ull) ++ ++#else /* MALI_USE_CSF */ ++ ++/* A default timeout in clock cycles to be used when an invalid timeout ++ * selector is used to retrieve the timeout, on JM GPUs. ++ */ ++#define JM_DEFAULT_TIMEOUT_CYCLES (150000000) ++ ++/* Default number of milliseconds given for other jobs on the GPU to be ++ * soft-stopped when the GPU needs to be reset. ++ */ ++#define JM_DEFAULT_RESET_TIMEOUT_MS (1) /* 1 ms */ ++ ++/* Default timeout in clock cycles to be used when checking if JS_COMMAND_NEXT ++ * is updated on HW side so a Job Slot is considered free. ++ * This timeout will only take effect on GPUs with low value for the minimum ++ * GPU clock frequency (<= 100MHz). + * -+ * @note This function is not thread-safe, and should only be used to -+ * register/deregister once in the module's lifetime. ++ * Based on 1ms timeout at 100MHz. Will default to 0ms on GPUs with higher ++ * value for minimum GPU clock frequency. ++ */ ++#define JM_DEFAULT_JS_FREE_TIMEOUT_CYCLES (100000) ++ ++#endif /* MALI_USE_CSF */ ++ ++/* Default timeslice that a context is scheduled in for, in nanoseconds. + * -+ * @param[in] func the function to call when an assert is triggered. -+ * @param[in] param the parameter to pass to \a func when calling it ++ * When a context has used up this amount of time across its jobs, it is ++ * scheduled out to let another run. ++ * ++ * @note the resolution is nanoseconds (ns) here, because that's the format ++ * often used by the OS. + */ -+void kbase_debug_assert_register_hook(kbase_debug_assert_hook *func, void *param); ++#define DEFAULT_JS_CTX_TIMESLICE_NS (50000000) /* 50ms */ + -+/** -+ * @brief Call a debug assert hook previously registered with kbase_debug_assert_register_hook() ++/* Maximum frequency (in kHz) that the GPU can be clocked. For some platforms ++ * this isn't available, so we simply define a dummy value here. If devfreq ++ * is enabled the value will be read from there, otherwise this should be ++ * overridden by defining GPU_FREQ_KHZ_MAX in the platform file. ++ */ ++#define DEFAULT_GPU_FREQ_KHZ_MAX (5000) ++ ++/* Default timeout for task execution on an endpoint + * -+ * @note This function is not thread-safe with respect to multiple threads -+ * registering functions and parameters with -+ * kbase_debug_assert_register_hook(). Otherwise, thread safety is the -+ * responsibility of the registered hook. ++ * Number of GPU clock cycles before the driver terminates a task that is ++ * making no forward progress on an endpoint (e.g. shader core). ++ * Value chosen is equivalent to the time after which a job is hard stopped ++ * which is 5 seconds (assuming the GPU is usually clocked at ~500 MHZ). + */ -+void kbasep_debug_assert_call_hook(void); ++#define DEFAULT_PROGRESS_TIMEOUT ((u64)5 * 500 * 1024 * 1024) + -+#endif /* _KBASE_DEBUG_H */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c ++/* Default threshold at which to switch to incremental rendering ++ * ++ * Fraction of the maximum size of an allocation that grows on GPU page fault ++ * that can be used up before the driver switches to incremental rendering, ++ * in 256ths. 0 means disable incremental rendering. ++ */ ++#define DEFAULT_IR_THRESHOLD (192) ++ ++/* Waiting time in clock cycles for the completion of a MMU operation. ++ * ++ * Ideally 1.6M GPU cycles required for the L2 cache (512KiB slice) flush. ++ * ++ * As a pessimistic value, 50M GPU cycles ( > 30 times bigger ) is chosen. ++ * It corresponds to 0.5s in GPU @ 100Mhz. ++ */ ++#define MMU_AS_INACTIVE_WAIT_TIMEOUT_CYCLES ((u64)50 * 1024 * 1024) ++#endif /* _KBASE_CONFIG_DEFAULTS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c b/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c new file mode 100755 -index 000000000000..dbc774d56ab4 +index 000000000..12d6cc896 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c -@@ -0,0 +1,566 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c +@@ -0,0 +1,5904 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2012-2016, 2018-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -198746,5507 +230227,5906 @@ index 000000000000..dbc774d56ab4 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include -+#include ++#include ++#include ++#include ++#include ++#ifdef CONFIG_MALI_BIFROST_DEVFREQ ++#include ++#include ++#if IS_ENABLED(CONFIG_DEVFREQ_THERMAL) ++#include ++#endif /* CONFIG_DEVFREQ_THERMAL */ ++#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ ++#include "backend/gpu/mali_kbase_model_linux.h" ++#include "uapi/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h" ++#include "mali_kbase_mem.h" ++#include "mali_kbase_mem_pool_debugfs.h" ++#include "mali_kbase_mem_pool_group.h" ++#include "mali_kbase_debugfs_helper.h" ++#include "mali_kbase_regs_history_debugfs.h" ++#include ++#include ++#if !MALI_USE_CSF +#include ++#endif /* !MALI_USE_CSF */ ++#ifdef CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS ++#include ++#endif ++#include ++#include ++#if !MALI_USE_CSF ++#include "mali_kbase_kinstr_jm.h" ++#endif ++#include "hwcnt/mali_kbase_hwcnt_context.h" ++#include "hwcnt/mali_kbase_hwcnt_virtualizer.h" ++#include "mali_kbase_kinstr_prfcnt.h" ++#include "mali_kbase_vinstr.h" ++#if MALI_USE_CSF ++#include "csf/mali_kbase_csf_firmware.h" ++#include "csf/mali_kbase_csf_tiler_heap.h" ++#include "csf/mali_kbase_csf_csg_debugfs.h" ++#include "csf/mali_kbase_csf_cpu_queue_debugfs.h" ++#include "csf/mali_kbase_csf_event.h" ++#endif ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++#include "arbiter/mali_kbase_arbiter_pm.h" ++#endif + -+#ifdef CONFIG_DEBUG_FS ++#include "mali_kbase_cs_experimental.h" + -+static bool kbase_is_job_fault_event_pending(struct kbase_device *kbdev) -+{ -+ struct list_head *event_list = &kbdev->job_fault_event_list; -+ unsigned long flags; -+ bool ret; ++#ifdef CONFIG_MALI_CINSTR_GWT ++#include "mali_kbase_gwt.h" ++#endif ++#include "backend/gpu/mali_kbase_pm_internal.h" ++#include "mali_kbase_dvfs_debugfs.h" ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++#include "mali_kbase_pbha_debugfs.h" ++#endif + -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); -+ ret = !list_empty(event_list); -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include /* is_compat_task/in_compat_syscall */ ++#include ++#include ++#include ++#include ++#if IS_ENABLED(CONFIG_SYNC_FILE) ++#include ++#endif /* CONFIG_SYNC_FILE */ ++#include ++#include ++#include ++#include + -+ return ret; -+} ++#include + -+static void kbase_ctx_remove_pending_event(struct kbase_context *kctx) -+{ -+ struct list_head *event_list = &kctx->kbdev->job_fault_event_list; -+ struct base_job_fault_event *event; -+ unsigned long flags; ++#include ++#include ++#include + -+ spin_lock_irqsave(&kctx->kbdev->job_fault_event_lock, flags); -+ list_for_each_entry(event, event_list, head) { -+ if (event->katom->kctx == kctx) { -+ list_del(&event->head); -+ spin_unlock_irqrestore(&kctx->kbdev->job_fault_event_lock, flags); ++#include + -+ wake_up(&kctx->kbdev->job_fault_resume_wq); -+ flush_work(&event->job_fault_work); ++#include ++#include ++#include + -+ /* job_fault_event_list can only have a single atom for -+ * each context. -+ */ -+ return; -+ } -+ } -+ spin_unlock_irqrestore(&kctx->kbdev->job_fault_event_lock, flags); -+} ++#include + -+static bool kbase_ctx_has_no_event_pending(struct kbase_context *kctx) -+{ -+ struct kbase_device *kbdev = kctx->kbdev; -+ struct list_head *event_list = &kctx->kbdev->job_fault_event_list; -+ struct base_job_fault_event *event; -+ unsigned long flags; ++#define KERNEL_SIDE_DDK_VERSION_STRING "K:" MALI_RELEASE_NAME "(GPL)" + -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); -+ if (list_empty(event_list)) { -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); -+ return true; -+ } -+ list_for_each_entry(event, event_list, head) { -+ if (event->katom->kctx == kctx) { -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, -+ flags); -+ return false; -+ } -+ } -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); -+ return true; -+} ++/** ++ * KBASE_API_VERSION - KBase API Version ++ * @major: Kernel major version ++ * @minor: Kernel minor version ++ */ ++#define KBASE_API_VERSION(major, minor) ((((major) & 0xFFF) << 20) | \ ++ (((minor) & 0xFFF) << 8) | \ ++ ((0 & 0xFF) << 0)) + -+static int wait_for_job_fault(struct kbase_device *kbdev) -+{ -+#if KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE && \ -+ KERNEL_VERSION(4, 15, 0) > LINUX_VERSION_CODE -+ int ret = wait_event_interruptible_timeout(kbdev->job_fault_wq, -+ kbase_is_job_fault_event_pending(kbdev), -+ msecs_to_jiffies(2000)); -+ if (ret == 0) -+ return -EAGAIN; -+ else if (ret > 0) -+ return 0; -+ else -+ return ret; ++/** ++ * struct mali_kbase_capability_def - kbase capabilities table ++ * ++ * @required_major: required major ++ * @required_minor: required minor ++ */ ++struct mali_kbase_capability_def { ++ u16 required_major; ++ u16 required_minor; ++}; ++ ++/* ++ * This must be kept in-sync with mali_kbase_cap ++ * ++ * TODO: The alternative approach would be to embed the cap enum values ++ * in the table. Less efficient but potentially safer. ++ */ ++static const struct mali_kbase_capability_def kbase_caps_table[MALI_KBASE_NUM_CAPS] = { ++#if MALI_USE_CSF ++ { 1, 0 }, /* SYSTEM_MONITOR */ ++ { 1, 0 }, /* JIT_PRESSURE_LIMIT */ ++ { 1, 0 }, /* MEM_GROW_ON_GPF */ ++ { 1, 0 } /* MEM_PROTECTED */ +#else -+ return wait_event_interruptible(kbdev->job_fault_wq, -+ kbase_is_job_fault_event_pending(kbdev)); ++ { 11, 15 }, /* SYSTEM_MONITOR */ ++ { 11, 25 }, /* JIT_PRESSURE_LIMIT */ ++ { 11, 2 }, /* MEM_GROW_ON_GPF */ ++ { 11, 2 } /* MEM_PROTECTED */ +#endif -+} ++}; + -+/* wait until the fault happen and copy the event */ -+static int kbase_job_fault_event_wait(struct kbase_device *kbdev, -+ struct base_job_fault_event *event) ++#if (KERNEL_VERSION(5, 3, 0) <= LINUX_VERSION_CODE) ++/* Mutex to synchronize the probe of multiple kbase instances */ ++static struct mutex kbase_probe_mutex; ++#endif ++ ++#ifndef CONFIG_MALI_BIFROST_DEVFREQ ++static inline int kbase_devfreq_opp_helper(struct dev_pm_set_opp_data *data) +{ -+ struct list_head *event_list = &kbdev->job_fault_event_list; -+ struct base_job_fault_event *event_in; -+ unsigned long flags; ++ return -EOPNOTSUPP; ++} ++#endif + -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); -+ while (list_empty(event_list)) { -+ int err; ++/** ++ * mali_kbase_supports_cap - Query whether a kbase capability is supported ++ * ++ * @api_version: API version to convert ++ * @cap: Capability to query for - see mali_kbase_caps.h ++ * ++ * Return: true if the capability is supported ++ */ ++bool mali_kbase_supports_cap(unsigned long api_version, enum mali_kbase_cap cap) ++{ ++ bool supported = false; ++ unsigned long required_ver; + -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ struct mali_kbase_capability_def const *cap_def; + -+ err = wait_for_job_fault(kbdev); -+ if (err) -+ return err; ++ if (WARN_ON(cap < 0)) ++ return false; + -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); -+ } ++ if (WARN_ON(cap >= MALI_KBASE_NUM_CAPS)) ++ return false; + -+ event_in = list_entry(event_list->next, -+ struct base_job_fault_event, head); -+ event->event_code = event_in->event_code; -+ event->katom = event_in->katom; ++ cap_def = &kbase_caps_table[(int)cap]; ++ required_ver = KBASE_API_VERSION(cap_def->required_major, cap_def->required_minor); ++ supported = (api_version >= required_ver); + -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ return supported; ++} + -+ return 0; ++/** ++ * kbase_file_new - Create an object representing a device file ++ * ++ * @kbdev: An instance of the GPU platform device, allocated from the probe ++ * method of the driver. ++ * @filp: Pointer to the struct file corresponding to device file ++ * /dev/malixx instance, passed to the file's open method. ++ * ++ * In its initial state, the device file has no context (i.e. no GPU ++ * address space) and no API version number. Both must be assigned before ++ * kbase_file_get_kctx_if_setup_complete() can be used successfully. ++ * ++ * Return: Address of an object representing a simulated device file, or NULL ++ * on failure. ++ */ ++static struct kbase_file *kbase_file_new(struct kbase_device *const kbdev, ++ struct file *const filp) ++{ ++ struct kbase_file *const kfile = kmalloc(sizeof(*kfile), GFP_KERNEL); + ++ if (kfile) { ++ kfile->kbdev = kbdev; ++ kfile->filp = filp; ++ kfile->kctx = NULL; ++ kfile->api_version = 0; ++ atomic_set(&kfile->setup_state, KBASE_FILE_NEED_VSN); ++ } ++ return kfile; +} + -+/* remove the event from the queue */ -+static struct base_job_fault_event *kbase_job_fault_event_dequeue( -+ struct kbase_device *kbdev, struct list_head *event_list) ++/** ++ * kbase_file_set_api_version - Set the application programmer interface version ++ * ++ * @kfile: A device file created by kbase_file_new() ++ * @major: Major version number (must not exceed 12 bits) ++ * @minor: Major version number (must not exceed 12 bits) ++ * ++ * An application programmer interface (API) version must be specified ++ * before calling kbase_file_create_kctx(), otherwise an error is returned. ++ * ++ * If a version number was already set for the given @kfile (or is in the ++ * process of being set by another thread) then an error is returned. ++ * ++ * Return: 0 if successful, otherwise a negative error code. ++ */ ++static int kbase_file_set_api_version(struct kbase_file *const kfile, ++ u16 const major, u16 const minor) +{ -+ struct base_job_fault_event *event; ++ if (WARN_ON(!kfile)) ++ return -EINVAL; + -+ event = list_entry(event_list->next, -+ struct base_job_fault_event, head); -+ list_del(event_list->next); ++ /* setup pending, try to signal that we'll do the setup, ++ * if setup was already in progress, err this call ++ */ ++ if (atomic_cmpxchg(&kfile->setup_state, KBASE_FILE_NEED_VSN, ++ KBASE_FILE_VSN_IN_PROGRESS) != KBASE_FILE_NEED_VSN) ++ return -EPERM; + -+ return event; ++ /* save the proposed version number for later use */ ++ kfile->api_version = KBASE_API_VERSION(major, minor); + ++ atomic_set(&kfile->setup_state, KBASE_FILE_NEED_CTX); ++ return 0; +} + -+/* Remove all the following atoms after the failed atom in the same context -+ * Call the postponed bottom half of job done. -+ * Then, this context could be rescheduled. ++/** ++ * kbase_file_get_api_version - Get the application programmer interface version ++ * ++ * @kfile: A device file created by kbase_file_new() ++ * ++ * Return: The version number (encoded with KBASE_API_VERSION) or 0 if none has ++ * been set. + */ -+static void kbase_job_fault_resume_event_cleanup(struct kbase_context *kctx) ++static unsigned long kbase_file_get_api_version(struct kbase_file *const kfile) +{ -+ struct list_head *event_list = &kctx->job_fault_resume_event_list; ++ if (WARN_ON(!kfile)) ++ return 0; + -+ while (!list_empty(event_list)) { -+ struct base_job_fault_event *event; ++ if (atomic_read(&kfile->setup_state) < KBASE_FILE_NEED_CTX) ++ return 0; + -+ event = kbase_job_fault_event_dequeue(kctx->kbdev, -+ &kctx->job_fault_resume_event_list); -+ kbase_jd_done_worker(&event->katom->work); -+ } ++ return kfile->api_version; ++} ++ ++/** ++ * kbase_file_create_kctx - Create a kernel base context ++ * ++ * @kfile: A device file created by kbase_file_new() ++ * @flags: Flags to set, which can be any combination of ++ * BASEP_CONTEXT_CREATE_KERNEL_FLAGS. ++ * ++ * This creates a new context for the GPU platform device instance that was ++ * specified when kbase_file_new() was called. Each context has its own GPU ++ * address space. If a context was already created for the given @kfile (or is ++ * in the process of being created for it by another thread) then an error is ++ * returned. ++ * ++ * An API version number must have been set by kbase_file_set_api_version() ++ * before calling this function, otherwise an error is returned. ++ * ++ * Return: 0 if a new context was created, otherwise a negative error code. ++ */ ++static int kbase_file_create_kctx(struct kbase_file *kfile, ++ base_context_create_flags flags); ++ ++/** ++ * kbase_file_get_kctx_if_setup_complete - Get a kernel base context ++ * pointer from a device file ++ * ++ * @kfile: A device file created by kbase_file_new() ++ * ++ * This function returns NULL if no context has been created for the given @kfile. ++ * This makes it safe to use in circumstances where the order of initialization ++ * cannot be enforced, but only if the caller checks the return value. ++ * ++ * Return: Address of the kernel base context associated with the @kfile, or ++ * NULL if no context exists. ++ */ ++static struct kbase_context *kbase_file_get_kctx_if_setup_complete( ++ struct kbase_file *const kfile) ++{ ++ if (WARN_ON(!kfile) || ++ atomic_read(&kfile->setup_state) != KBASE_FILE_COMPLETE || ++ WARN_ON(!kfile->kctx)) ++ return NULL; + ++ return kfile->kctx; +} + -+static void kbase_job_fault_resume_worker(struct work_struct *data) ++/** ++ * kbase_file_delete - Destroy an object representing a device file ++ * ++ * @kfile: A device file created by kbase_file_new() ++ * ++ * If any context was created for the @kfile then it is destroyed. ++ */ ++static void kbase_file_delete(struct kbase_file *const kfile) +{ -+ struct base_job_fault_event *event = container_of(data, -+ struct base_job_fault_event, job_fault_work); -+ struct kbase_context *kctx; -+ struct kbase_jd_atom *katom; ++ struct kbase_device *kbdev = NULL; + -+ katom = event->katom; -+ kctx = katom->kctx; ++ if (WARN_ON(!kfile)) ++ return; + -+ dev_info(kctx->kbdev->dev, "Job dumping wait\n"); ++ kfile->filp->private_data = NULL; ++ kbdev = kfile->kbdev; + -+ /* When it was waked up, it need to check if queue is empty or the -+ * failed atom belongs to different context. If yes, wake up. Both -+ * of them mean the failed job has been dumped. Please note, it -+ * should never happen that the job_fault_event_list has the two -+ * atoms belong to the same context. -+ */ -+ wait_event(kctx->kbdev->job_fault_resume_wq, -+ kbase_ctx_has_no_event_pending(kctx)); ++ if (atomic_read(&kfile->setup_state) == KBASE_FILE_COMPLETE) { ++ struct kbase_context *kctx = kfile->kctx; + -+ atomic_set(&kctx->job_fault_count, 0); -+ kbase_jd_done_worker(&katom->work); ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ kbasep_mem_profile_debugfs_remove(kctx); ++#endif ++ kbase_context_debugfs_term(kctx); + -+ /* In case the following atoms were scheduled during failed job dump -+ * the job_done_worker was held. We need to rerun it after the dump -+ * was finished -+ */ -+ kbase_job_fault_resume_event_cleanup(kctx); ++ kbase_destroy_context(kctx); + -+ dev_info(kctx->kbdev->dev, "Job dumping finish, resume scheduler\n"); ++ dev_dbg(kbdev->dev, "deleted base context\n"); ++ } ++ ++ kbase_release_device(kbdev); ++ ++ kfree(kfile); +} + -+static struct base_job_fault_event *kbase_job_fault_event_queue( -+ struct list_head *event_list, -+ struct kbase_jd_atom *atom, -+ u32 completion_code) ++static int kbase_api_handshake(struct kbase_file *kfile, ++ struct kbase_ioctl_version_check *version) +{ -+ struct base_job_fault_event *event; -+ -+ event = &atom->fault_event; ++ int err = 0; + -+ event->katom = atom; -+ event->event_code = completion_code; ++ switch (version->major) { ++ case BASE_UK_VERSION_MAJOR: ++ /* set minor to be the lowest common */ ++ version->minor = min_t(int, BASE_UK_VERSION_MINOR, ++ (int)version->minor); ++ break; ++ default: ++ /* We return our actual version regardless if it ++ * matches the version returned by userspace - ++ * userspace can bail if it can't handle this ++ * version ++ */ ++ version->major = BASE_UK_VERSION_MAJOR; ++ version->minor = BASE_UK_VERSION_MINOR; ++ break; ++ } + -+ list_add_tail(&event->head, event_list); ++ /* save the proposed version number for later use */ ++ err = kbase_file_set_api_version(kfile, version->major, version->minor); ++ if (unlikely(err)) ++ return err; + -+ return event; ++ /* For backward compatibility, we may need to create the context before ++ * the flags have been set. Originally it was created on file open ++ * (with job submission disabled) but we don't support that usage. ++ */ ++ if (!mali_kbase_supports_system_monitor(kbase_file_get_api_version(kfile))) ++ err = kbase_file_create_kctx(kfile, ++ BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED); + ++ return err; +} + -+static void kbase_job_fault_event_post(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, u32 completion_code) ++static int kbase_api_handshake_dummy(struct kbase_file *kfile, ++ struct kbase_ioctl_version_check *version) +{ -+ struct base_job_fault_event *event; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); -+ event = kbase_job_fault_event_queue(&kbdev->job_fault_event_list, -+ katom, completion_code); -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); -+ -+ wake_up_interruptible(&kbdev->job_fault_wq); -+ -+ INIT_WORK(&event->job_fault_work, kbase_job_fault_resume_worker); -+ queue_work(kbdev->job_fault_resume_workq, &event->job_fault_work); ++ return -EPERM; ++} + -+ dev_info(katom->kctx->kbdev->dev, "Job fault happen, start dump: %d_%d", -+ katom->kctx->tgid, katom->kctx->id); ++static int kbase_api_kinstr_prfcnt_enum_info( ++ struct kbase_file *kfile, ++ struct kbase_ioctl_kinstr_prfcnt_enum_info *prfcnt_enum_info) ++{ ++ return kbase_kinstr_prfcnt_enum_info(kfile->kbdev->kinstr_prfcnt_ctx, ++ prfcnt_enum_info); ++} + ++static int kbase_api_kinstr_prfcnt_setup( ++ struct kbase_file *kfile, ++ union kbase_ioctl_kinstr_prfcnt_setup *prfcnt_setup) ++{ ++ return kbase_kinstr_prfcnt_setup(kfile->kbdev->kinstr_prfcnt_ctx, ++ prfcnt_setup); +} + -+/* -+ * This function will process the job fault -+ * Get the register copy -+ * Send the failed job dump event -+ * Create a Wait queue to wait until the job dump finish -+ */ ++static struct kbase_device *to_kbase_device(struct device *dev) ++{ ++ return dev_get_drvdata(dev); ++} + -+bool kbase_debug_job_fault_process(struct kbase_jd_atom *katom, -+ u32 completion_code) ++int assign_irqs(struct kbase_device *kbdev) +{ -+ struct kbase_context *kctx = katom->kctx; ++ static const char *const irq_names_caps[] = { "JOB", "MMU", "GPU" }; + -+ /* Check if dumping is in the process -+ * only one atom of each context can be dumped at the same time -+ * If the atom belongs to different context, it can be dumped -+ */ -+ if (atomic_read(&kctx->job_fault_count) > 0) { -+ kbase_job_fault_event_queue( -+ &kctx->job_fault_resume_event_list, -+ katom, completion_code); -+ dev_info(kctx->kbdev->dev, "queue:%d\n", -+ kbase_jd_atom_id(kctx, katom)); -+ return true; -+ } ++#if IS_ENABLED(CONFIG_OF) ++ static const char *const irq_names[] = { "job", "mmu", "gpu" }; ++#endif + -+ if (kbase_ctx_flag(kctx, KCTX_DYING)) -+ return false; ++ struct platform_device *pdev; ++ int i; + -+ if (atomic_read(&kctx->kbdev->job_fault_debug) > 0) { ++ if (!kbdev) ++ return -ENODEV; + -+ if (completion_code != BASE_JD_EVENT_DONE) { ++ pdev = to_platform_device(kbdev->dev); + -+ if (kbase_job_fault_get_reg_snapshot(kctx) == false) { -+ dev_warn(kctx->kbdev->dev, "get reg dump failed\n"); -+ return false; -+ } ++ for (i = 0; i < ARRAY_SIZE(irq_names_caps); i++) { ++ int irq; + -+ kbase_job_fault_event_post(kctx->kbdev, katom, -+ completion_code); -+ atomic_inc(&kctx->job_fault_count); -+ dev_info(kctx->kbdev->dev, "post:%d\n", -+ kbase_jd_atom_id(kctx, katom)); -+ return true; ++#if IS_ENABLED(CONFIG_OF) ++ /* We recommend using Upper case for the irq names in dts, but if ++ * there are devices in the world using Lower case then we should ++ * avoid breaking support for them. So try using names in Upper case ++ * first then try using Lower case names. If both attempts fail then ++ * we assume there is no IRQ resource specified for the GPU. ++ */ ++ irq = platform_get_irq_byname(pdev, irq_names_caps[i]); ++ if (irq < 0) ++ irq = platform_get_irq_byname(pdev, irq_names[i]); ++#else ++ irq = platform_get_irq(pdev, i); ++#endif /* CONFIG_OF */ + ++ if (irq < 0) { ++ dev_err(kbdev->dev, "No IRQ resource '%s'\n", irq_names_caps[i]); ++ return irq; + } ++ ++ kbdev->irqs[i].irq = irq; ++ kbdev->irqs[i].flags = irqd_get_trigger_type(irq_get_irq_data(irq)); + } -+ return false; + ++ return 0; +} + -+static int debug_job_fault_show(struct seq_file *m, void *v) ++/* Find a particular kbase device (as specified by minor number), or find the "first" device if -1 is specified */ ++struct kbase_device *kbase_find_device(int minor) +{ -+ struct kbase_device *kbdev = m->private; -+ struct base_job_fault_event *event = (struct base_job_fault_event *)v; -+ struct kbase_context *kctx = event->katom->kctx; -+ int i; -+ -+ dev_info(kbdev->dev, "debug job fault seq show:%d_%d, %d", -+ kctx->tgid, kctx->id, event->reg_offset); -+ -+ if (kctx->reg_dump == NULL) { -+ dev_warn(kbdev->dev, "reg dump is NULL"); -+ return -1; -+ } -+ -+ if (kctx->reg_dump[event->reg_offset] == -+ REGISTER_DUMP_TERMINATION_FLAG) { -+ /* Return the error here to stop the read. And the -+ * following next() will not be called. The stop can -+ * get the real event resource and release it -+ */ -+ return -1; -+ } ++ struct kbase_device *kbdev = NULL; ++ struct list_head *entry; ++ const struct list_head *dev_list = kbase_device_get_list(); + -+ if (event->reg_offset == 0) -+ seq_printf(m, "%d_%d\n", kctx->tgid, kctx->id); ++ list_for_each(entry, dev_list) { ++ struct kbase_device *tmp; + -+ for (i = 0; i < 50; i++) { -+ if (kctx->reg_dump[event->reg_offset] == -+ REGISTER_DUMP_TERMINATION_FLAG) { ++ tmp = list_entry(entry, struct kbase_device, entry); ++ if (tmp->mdev.minor == minor || minor == -1) { ++ kbdev = tmp; ++ get_device(kbdev->dev); + break; + } -+ seq_printf(m, "%08x: %08x\n", -+ kctx->reg_dump[event->reg_offset], -+ kctx->reg_dump[1+event->reg_offset]); -+ event->reg_offset += 2; -+ + } ++ kbase_device_put_list(dev_list); + ++ return kbdev; ++} ++EXPORT_SYMBOL(kbase_find_device); + -+ return 0; ++void kbase_release_device(struct kbase_device *kbdev) ++{ ++ put_device(kbdev->dev); +} -+static void *debug_job_fault_next(struct seq_file *m, void *v, loff_t *pos) ++EXPORT_SYMBOL(kbase_release_device); ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++static ssize_t write_ctx_infinite_cache(struct file *f, const char __user *ubuf, size_t size, loff_t *off) +{ -+ struct kbase_device *kbdev = m->private; -+ struct base_job_fault_event *event = (struct base_job_fault_event *)v; ++ struct kbase_context *kctx = f->private_data; ++ int err; ++ bool value; + -+ dev_info(kbdev->dev, "debug job fault seq next:%d, %d", -+ event->reg_offset, (int)*pos); ++ err = kstrtobool_from_user(ubuf, size, &value); ++ if (err) ++ return err; + -+ return event; ++ if (value) ++ kbase_ctx_flag_set(kctx, KCTX_INFINITE_CACHE); ++ else ++ kbase_ctx_flag_clear(kctx, KCTX_INFINITE_CACHE); ++ ++ return size; +} + -+static void *debug_job_fault_start(struct seq_file *m, loff_t *pos) ++static ssize_t read_ctx_infinite_cache(struct file *f, char __user *ubuf, size_t size, loff_t *off) +{ -+ struct kbase_device *kbdev = m->private; -+ struct base_job_fault_event *event; -+ -+ dev_info(kbdev->dev, "fault job seq start:%d", (int)*pos); ++ struct kbase_context *kctx = f->private_data; ++ char buf[32]; ++ int count; ++ bool value; + -+ /* The condition is trick here. It needs make sure the -+ * fault hasn't happened and the dumping hasn't been started, -+ * or the dumping has finished -+ */ -+ if (*pos == 0) { -+ event = kmalloc(sizeof(*event), GFP_KERNEL); -+ if (!event) -+ return NULL; -+ event->reg_offset = 0; -+ if (kbase_job_fault_event_wait(kbdev, event)) { -+ kfree(event); -+ return NULL; -+ } ++ value = kbase_ctx_flag(kctx, KCTX_INFINITE_CACHE); + -+ /* The cache flush workaround is called in bottom half of -+ * job done but we delayed it. Now we should clean cache -+ * earlier. Then the GPU memory dump should be correct. -+ */ -+ kbase_backend_cache_clean(kbdev, event->katom); -+ } else -+ return NULL; ++ count = scnprintf(buf, sizeof(buf), "%s\n", value ? "Y" : "N"); + -+ return event; ++ return simple_read_from_buffer(ubuf, size, off, buf, count); +} + -+static void debug_job_fault_stop(struct seq_file *m, void *v) -+{ -+ struct kbase_device *kbdev = m->private; ++static const struct file_operations kbase_infinite_cache_fops = { ++ .owner = THIS_MODULE, ++ .open = simple_open, ++ .write = write_ctx_infinite_cache, ++ .read = read_ctx_infinite_cache, ++}; + -+ /* here we wake up the kbase_jd_done_worker after stop, it needs -+ * get the memory dump before the register dump in debug daemon, -+ * otherwise, the memory dump may be incorrect. -+ */ ++static ssize_t write_ctx_force_same_va(struct file *f, const char __user *ubuf, ++ size_t size, loff_t *off) ++{ ++ struct kbase_context *kctx = f->private_data; ++ int err; ++ bool value; + -+ if (v != NULL) { -+ kfree(v); -+ dev_info(kbdev->dev, "debug job fault seq stop stage 1"); ++ err = kstrtobool_from_user(ubuf, size, &value); ++ if (err) ++ return err; + ++ if (value) { ++#if defined(CONFIG_64BIT) ++ /* 32-bit clients cannot force SAME_VA */ ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ return -EINVAL; ++ kbase_ctx_flag_set(kctx, KCTX_FORCE_SAME_VA); ++#else /* defined(CONFIG_64BIT) */ ++ /* 32-bit clients cannot force SAME_VA */ ++ return -EINVAL; ++#endif /* defined(CONFIG_64BIT) */ + } else { -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); -+ if (!list_empty(&kbdev->job_fault_event_list)) { -+ kbase_job_fault_event_dequeue(kbdev, -+ &kbdev->job_fault_event_list); -+ wake_up(&kbdev->job_fault_resume_wq); -+ } -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); -+ dev_info(kbdev->dev, "debug job fault seq stop stage 2"); ++ kbase_ctx_flag_clear(kctx, KCTX_FORCE_SAME_VA); + } + ++ return size; +} + -+static const struct seq_operations ops = { -+ .start = debug_job_fault_start, -+ .next = debug_job_fault_next, -+ .stop = debug_job_fault_stop, -+ .show = debug_job_fault_show, ++static ssize_t read_ctx_force_same_va(struct file *f, char __user *ubuf, ++ size_t size, loff_t *off) ++{ ++ struct kbase_context *kctx = f->private_data; ++ char buf[32]; ++ int count; ++ bool value; ++ ++ value = kbase_ctx_flag(kctx, KCTX_FORCE_SAME_VA); ++ ++ count = scnprintf(buf, sizeof(buf), "%s\n", value ? "Y" : "N"); ++ ++ return simple_read_from_buffer(ubuf, size, off, buf, count); ++} ++ ++static const struct file_operations kbase_force_same_va_fops = { ++ .owner = THIS_MODULE, ++ .open = simple_open, ++ .write = write_ctx_force_same_va, ++ .read = read_ctx_force_same_va, +}; ++#endif /* CONFIG_DEBUG_FS */ + -+static int debug_job_fault_open(struct inode *in, struct file *file) ++static int kbase_file_create_kctx(struct kbase_file *const kfile, ++ base_context_create_flags const flags) +{ -+ struct kbase_device *kbdev = in->i_private; ++ struct kbase_device *kbdev = NULL; ++ struct kbase_context *kctx = NULL; ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ char kctx_name[64]; ++#endif + -+ if (atomic_cmpxchg(&kbdev->job_fault_debug, 0, 1) == 1) { -+ dev_warn(kbdev->dev, "debug job fault is busy, only a single client is allowed"); -+ return -EBUSY; -+ } ++ if (WARN_ON(!kfile)) ++ return -EINVAL; + -+ seq_open(file, &ops); ++ /* setup pending, try to signal that we'll do the setup, ++ * if setup was already in progress, err this call ++ */ ++ if (atomic_cmpxchg(&kfile->setup_state, KBASE_FILE_NEED_CTX, ++ KBASE_FILE_CTX_IN_PROGRESS) != KBASE_FILE_NEED_CTX) ++ return -EPERM; + -+ ((struct seq_file *)file->private_data)->private = kbdev; -+ dev_info(kbdev->dev, "debug job fault seq open"); ++ kbdev = kfile->kbdev; + ++ kctx = kbase_create_context(kbdev, in_compat_syscall(), ++ flags, kfile->api_version, kfile->filp); + -+ return 0; ++ /* if bad flags, will stay stuck in setup mode */ ++ if (!kctx) ++ return -ENOMEM; + -+} ++ if (kbdev->infinite_cache_active_default) ++ kbase_ctx_flag_set(kctx, KCTX_INFINITE_CACHE); + -+static int debug_job_fault_release(struct inode *in, struct file *file) -+{ -+ struct kbase_device *kbdev = in->i_private; -+ struct list_head *event_list = &kbdev->job_fault_event_list; -+ unsigned long flags; ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ if (unlikely(!scnprintf(kctx_name, 64, "%d_%d", kctx->tgid, kctx->id))) ++ return -ENOMEM; + -+ seq_release(in, file); ++ mutex_init(&kctx->mem_profile_lock); + -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ kctx->kctx_dentry = debugfs_create_dir(kctx_name, ++ kbdev->debugfs_ctx_directory); + -+ /* Disable job fault dumping. This will let kbase run jobs as normal, -+ * without blocking waiting for a job_fault client to read failed jobs. -+ * -+ * After this a new client may open the file, and may re-enable job -+ * fault dumping, but the job_fault_event_lock we hold here will block -+ * that from interfering until after we've completed the cleanup. -+ */ -+ atomic_dec(&kbdev->job_fault_debug); ++ if (IS_ERR_OR_NULL(kctx->kctx_dentry)) { ++ /* we don't treat this as a fail - just warn about it */ ++ dev_warn(kbdev->dev, "couldn't create debugfs dir for kctx\n"); ++ } else { ++ debugfs_create_file("infinite_cache", 0644, kctx->kctx_dentry, ++ kctx, &kbase_infinite_cache_fops); ++ debugfs_create_file("force_same_va", 0600, kctx->kctx_dentry, ++ kctx, &kbase_force_same_va_fops); + -+ /* Clean the unprocessed job fault. After that, all the suspended -+ * contexts could be rescheduled. Remove all the failed atoms that -+ * belong to different contexts Resume all the contexts that were -+ * suspend due to failed job. -+ */ -+ while (!list_empty(event_list)) { -+ kbase_job_fault_event_dequeue(kbdev, event_list); -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); -+ wake_up(&kbdev->job_fault_resume_wq); -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ kbase_context_debugfs_init(kctx); + } ++#endif /* CONFIG_DEBUG_FS */ + -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ dev_dbg(kbdev->dev, "created base context\n"); + -+ dev_info(kbdev->dev, "debug job fault seq close"); ++ kfile->kctx = kctx; ++ atomic_set(&kfile->setup_state, KBASE_FILE_COMPLETE); + + return 0; +} + -+static const struct file_operations kbasep_debug_job_fault_fops = { -+ .owner = THIS_MODULE, -+ .open = debug_job_fault_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = debug_job_fault_release, -+}; -+ -+/* -+ * Initialize debugfs entry for job fault dump -+ */ -+void kbase_debug_job_fault_debugfs_init(struct kbase_device *kbdev) ++static int kbase_open(struct inode *inode, struct file *filp) +{ -+ debugfs_create_file("job_fault", 0400, -+ kbdev->mali_debugfs_directory, kbdev, -+ &kbasep_debug_job_fault_fops); -+} ++ struct kbase_device *kbdev = NULL; ++ struct kbase_file *kfile; ++ int ret = 0; + ++ kbdev = kbase_find_device(iminor(inode)); + -+int kbase_debug_job_fault_dev_init(struct kbase_device *kbdev) -+{ ++ if (!kbdev) ++ return -ENODEV; + -+ INIT_LIST_HEAD(&kbdev->job_fault_event_list); ++#if (KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE) ++ /* Set address space operations for page migration */ ++ kbase_mem_migrate_set_address_space_ops(kbdev, filp); ++#endif + -+ init_waitqueue_head(&(kbdev->job_fault_wq)); -+ init_waitqueue_head(&(kbdev->job_fault_resume_wq)); -+ spin_lock_init(&kbdev->job_fault_event_lock); ++ /* Device-wide firmware load is moved here from probing to comply with ++ * Android GKI vendor guideline. ++ */ ++ ret = kbase_device_firmware_init_once(kbdev); ++ if (ret) ++ goto out; + -+ kbdev->job_fault_resume_workq = alloc_workqueue( -+ "kbase_job_fault_resume_work_queue", WQ_MEM_RECLAIM, 1); -+ if (!kbdev->job_fault_resume_workq) -+ return -ENOMEM; ++ kfile = kbase_file_new(kbdev, filp); ++ if (!kfile) { ++ ret = -ENOMEM; ++ goto out; ++ } + -+ atomic_set(&kbdev->job_fault_debug, 0); ++ filp->private_data = kfile; ++ filp->f_mode |= FMODE_UNSIGNED_OFFSET; + + return 0; ++ ++out: ++ kbase_release_device(kbdev); ++ return ret; +} + -+/* -+ * Release the relevant resource per device -+ */ -+void kbase_debug_job_fault_dev_term(struct kbase_device *kbdev) ++static int kbase_release(struct inode *inode, struct file *filp) +{ -+ destroy_workqueue(kbdev->job_fault_resume_workq); -+} ++ struct kbase_file *const kfile = filp->private_data; + ++ kbase_file_delete(kfile); ++ return 0; ++} + -+/* -+ * Initialize the relevant data structure per context -+ */ -+void kbase_debug_job_fault_context_init(struct kbase_context *kctx) ++static int kbase_api_set_flags(struct kbase_file *kfile, ++ struct kbase_ioctl_set_flags *flags) +{ ++ int err = 0; ++ unsigned long const api_version = kbase_file_get_api_version(kfile); ++ struct kbase_context *kctx = NULL; + -+ /* We need allocate double size register range -+ * Because this memory will keep the register address and value ++ /* Validate flags */ ++ if (flags->create_flags != ++ (flags->create_flags & BASEP_CONTEXT_CREATE_KERNEL_FLAGS)) ++ return -EINVAL; ++ ++ /* For backward compatibility, the context may have been created before ++ * the flags were set. + */ -+ kctx->reg_dump = vmalloc(0x4000 * 2); -+ if (kctx->reg_dump == NULL) -+ return; ++ if (mali_kbase_supports_system_monitor(api_version)) { ++ err = kbase_file_create_kctx(kfile, flags->create_flags); ++ } else { ++#if !MALI_USE_CSF ++ struct kbasep_js_kctx_info *js_kctx_info = NULL; ++ unsigned long irq_flags = 0; ++#endif + -+ if (kbase_debug_job_fault_reg_snapshot_init(kctx, 0x4000) == false) { -+ vfree(kctx->reg_dump); -+ kctx->reg_dump = NULL; ++ /* If setup is incomplete (e.g. because the API version ++ * wasn't set) then we have to give up. ++ */ ++ kctx = kbase_file_get_kctx_if_setup_complete(kfile); ++ if (unlikely(!kctx)) ++ return -EPERM; ++ ++#if MALI_USE_CSF ++ /* On CSF GPUs Job Manager interface isn't used to submit jobs ++ * (there are no job slots). So the legacy job manager path to ++ * submit jobs needs to remain disabled for CSF GPUs. ++ */ ++#else ++ js_kctx_info = &kctx->jctx.sched_info; ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, irq_flags); ++ /* Translate the flags */ ++ if ((flags->create_flags & ++ BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED) == 0) ++ kbase_ctx_flag_clear(kctx, KCTX_SUBMIT_DISABLED); ++ ++ ++ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, irq_flags); ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++#endif + } -+ INIT_LIST_HEAD(&kctx->job_fault_resume_event_list); -+ atomic_set(&kctx->job_fault_count, 0); + ++ return err; +} + -+/* -+ * release the relevant resource per context -+ */ -+void kbase_debug_job_fault_context_term(struct kbase_context *kctx) ++#if !MALI_USE_CSF ++static int kbase_api_job_submit(struct kbase_context *kctx, ++ struct kbase_ioctl_job_submit *submit) +{ -+ vfree(kctx->reg_dump); ++ return kbase_jd_submit(kctx, u64_to_user_ptr(submit->addr), ++ submit->nr_atoms, ++ submit->stride, false); +} ++#endif /* !MALI_USE_CSF */ + -+void kbase_debug_job_fault_kctx_unblock(struct kbase_context *kctx) ++static int kbase_api_get_gpuprops(struct kbase_file *kfile, ++ struct kbase_ioctl_get_gpuprops *get_props) +{ -+ WARN_ON(!kbase_ctx_flag(kctx, KCTX_DYING)); ++ struct kbase_gpu_props *kprops = &kfile->kbdev->gpu_props; ++ int err; + -+ kbase_ctx_remove_pending_event(kctx); -+} ++ if (get_props->flags != 0) { ++ dev_err(kfile->kbdev->dev, "Unsupported flags to get_gpuprops"); ++ return -EINVAL; ++ } + -+#else /* CONFIG_DEBUG_FS */ ++ if (get_props->size == 0) ++ return kprops->prop_buffer_size; ++ if (get_props->size < kprops->prop_buffer_size) ++ return -EINVAL; + -+int kbase_debug_job_fault_dev_init(struct kbase_device *kbdev) ++ err = copy_to_user(u64_to_user_ptr(get_props->buffer), ++ kprops->prop_buffer, ++ kprops->prop_buffer_size); ++ if (err) ++ return -EFAULT; ++ return kprops->prop_buffer_size; ++} ++ ++#if !MALI_USE_CSF ++static int kbase_api_post_term(struct kbase_context *kctx) +{ ++ kbase_event_close(kctx); + return 0; +} ++#endif /* !MALI_USE_CSF */ + -+void kbase_debug_job_fault_dev_term(struct kbase_device *kbdev) ++#if MALI_USE_CSF ++static int kbase_api_mem_alloc_ex(struct kbase_context *kctx, ++ union kbase_ioctl_mem_alloc_ex *alloc_ex) +{ -+} ++ struct kbase_va_region *reg; ++ u64 flags = alloc_ex->in.flags; ++ u64 gpu_va; + -+#endif /* CONFIG_DEBUG_FS */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h -new file mode 100755 -index 000000000000..ef69627cdce8 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h -@@ -0,0 +1,116 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2016, 2018 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; + -+#ifndef _KBASE_DEBUG_JOB_FAULT_H -+#define _KBASE_DEBUG_JOB_FAULT_H ++ bool gpu_executable = (flags & BASE_MEM_PROT_GPU_EX) && kbase_has_exec_va_zone(kctx); ++ bool fixed_or_fixable = (flags & (BASE_MEM_FIXED | BASE_MEM_FIXABLE)); + -+#include -+#include ++ if (!kbase_mem_allow_alloc(kctx)) ++ return -EINVAL; + -+#define REGISTER_DUMP_TERMINATION_FLAG 0xFFFFFFFF ++ /* The driver counts the number of FIXABLE and FIXED allocations because ++ * they're not supposed to happen at the same time. However, that is not ++ * a security concern: nothing bad happens if the two types of allocations ++ * are made at the same time. The only reason why the driver is guarding ++ * against them is because there's no client use case that is supposed ++ * to need both of them at the same time, and the driver wants to help ++ * the user space catch some obvious mistake. ++ * ++ * The driver is able to switch from FIXABLE allocations to FIXED and ++ * vice versa, if all the allocations of one kind are freed before trying ++ * to create allocations of a different kind. ++ */ ++ if ((flags & BASE_MEM_FIXED) && (atomic64_read(&kctx->num_fixable_allocs) > 0)) ++ return -EINVAL; + -+/** -+ * kbase_debug_job_fault_dev_init - Create the fault event wait queue -+ * per device and initialize the required lists. -+ * @kbdev: Device pointer -+ * -+ * Return: Zero on success or a negative error code. -+ */ -+int kbase_debug_job_fault_dev_init(struct kbase_device *kbdev); ++ if ((flags & BASE_MEM_FIXABLE) && (atomic64_read(&kctx->num_fixed_allocs) > 0)) ++ return -EINVAL; + -+/** -+ * kbase_debug_job_fault_debugfs_init - Initialize job fault debug sysfs -+ * @kbdev: Device pointer -+ */ -+void kbase_debug_job_fault_debugfs_init(struct kbase_device *kbdev); ++ if (flags & BASEP_MEM_FLAGS_KERNEL_ONLY) ++ return -ENOMEM; + -+/** -+ * kbase_debug_job_fault_dev_term - Clean up resources created in -+ * kbase_debug_job_fault_dev_init. -+ * @kbdev: Device pointer -+ */ -+void kbase_debug_job_fault_dev_term(struct kbase_device *kbdev); ++ /* The fixed_address parameter must be either a non-zero, page-aligned ++ * value for FIXED allocations or zero for any other kind of allocation. ++ */ ++ if (flags & BASE_MEM_FIXED) { ++ u64 aligned_fixed_address = alloc_ex->in.fixed_address & PAGE_MASK; + -+/** -+ * kbase_debug_job_fault_context_init - Initialize the relevant -+ * data structure per context -+ * @kctx: KBase context pointer -+ */ -+void kbase_debug_job_fault_context_init(struct kbase_context *kctx); ++ if ((aligned_fixed_address == 0) || ++ (aligned_fixed_address != alloc_ex->in.fixed_address)) ++ return -EINVAL; + -+/** -+ * kbase_debug_job_fault_context_term - Release the relevant -+ * resource per context -+ * @kctx: KBase context pointer -+ */ -+void kbase_debug_job_fault_context_term(struct kbase_context *kctx); ++ gpu_va = aligned_fixed_address; ++ } else if (alloc_ex->in.fixed_address != 0) { ++ return -EINVAL; ++ } + -+/** -+ * kbase_debug_job_fault_kctx_unblock - Unblock the atoms blocked on job fault -+ * dumping on context termination. -+ * -+ * This function is called during context termination to unblock the atom for -+ * which the job fault occurred and also the atoms following it. This is needed -+ * otherwise the wait for zero jobs could timeout (leading to an assertion -+ * failure, kernel panic in debug builds) in the pathological case where -+ * although the thread/daemon capturing the job fault events is running, -+ * but for some reasons has stopped consuming the events. -+ * -+ * @kctx: KBase context pointer -+ */ -+void kbase_debug_job_fault_kctx_unblock(struct kbase_context *kctx); ++ /* For 64-bit clients, force SAME_VA up to 2^(47)-1. ++ * For 32-bit clients, force SAME_VA up to 2^(32)-1. ++ * ++ * In both cases, the executable and fixed/fixable zones, and ++ * the executable+fixed/fixable zone, are all above this range. ++ */ ++ if ((!kbase_ctx_flag(kctx, KCTX_COMPAT)) && ++ kbase_ctx_flag(kctx, KCTX_FORCE_SAME_VA)) { ++ if (!gpu_executable && !fixed_or_fixable) ++ flags |= BASE_MEM_SAME_VA; ++ } + -+/** -+ * kbase_debug_job_fault_process - Process the failed job. -+ * It will send a event and wake up the job fault waiting queue -+ * Then create a work queue to wait for job dump finish -+ * This function should be called in the interrupt handler and before -+ * jd_done that make sure the jd_done_worker will be delayed until the -+ * job dump finish -+ * @katom: The failed atom pointer -+ * @completion_code: the job status -+ * @return true if dump is going on -+ */ -+bool kbase_debug_job_fault_process(struct kbase_jd_atom *katom, -+ u32 completion_code); ++ /* If CSF event memory allocation, need to force certain flags. ++ * SAME_VA - GPU address needs to be used as a CPU address, explicit ++ * mmap has to be avoided. ++ * CACHED_CPU - Frequent access to the event memory by CPU. ++ * COHERENT_SYSTEM - No explicit cache maintenance around the access ++ * to event memory so need to leverage the coherency support. ++ */ ++ if (flags & BASE_MEM_CSF_EVENT) { ++ /* We cannot honor this request */ ++ if (gpu_executable || fixed_or_fixable) ++ return -ENOMEM; + ++ flags |= (BASE_MEM_SAME_VA | ++ BASE_MEM_CACHED_CPU | ++ BASE_MEM_COHERENT_SYSTEM); ++ } + -+/** -+ * kbase_debug_job_fault_reg_snapshot_init - Set the interested registers -+ * address during the job fault process, the relevant registers will -+ * be saved when a job fault happen -+ * @kctx: KBase context pointer -+ * @reg_range: Maximum register address space -+ * @return true if initializing successfully -+ */ -+bool kbase_debug_job_fault_reg_snapshot_init(struct kbase_context *kctx, -+ int reg_range); ++ reg = kbase_mem_alloc(kctx, alloc_ex->in.va_pages, alloc_ex->in.commit_pages, ++ alloc_ex->in.extension, &flags, &gpu_va, mmu_sync_info); + -+/** -+ * kbase_job_fault_get_reg_snapshot - Read the interested registers for -+ * failed job dump -+ * @kctx: KBase context pointer -+ * @return true if getting registers successfully -+ */ -+bool kbase_job_fault_get_reg_snapshot(struct kbase_context *kctx); ++ if (!reg) ++ return -ENOMEM; + -+#endif /*_KBASE_DEBUG_JOB_FAULT_H*/ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c -new file mode 100755 -index 000000000000..478813705a41 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c -@@ -0,0 +1,313 @@ -+/* -+ * -+ * (C) COPYRIGHT 2013-2019 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ ++ alloc_ex->out.flags = flags; ++ alloc_ex->out.gpu_va = gpu_va; + -+/* -+ * Debugfs interface to dump the memory visible to the GPU -+ */ ++ return 0; ++} + -+#include "mali_kbase_debug_mem_view.h" -+#include "mali_kbase.h" ++static int kbase_api_mem_alloc(struct kbase_context *kctx, union kbase_ioctl_mem_alloc *alloc) ++{ ++ int ret; ++ union kbase_ioctl_mem_alloc_ex mem_alloc_ex = { { 0 } }; + -+#include -+#include ++ mem_alloc_ex.in.va_pages = alloc->in.va_pages; ++ mem_alloc_ex.in.commit_pages = alloc->in.commit_pages; ++ mem_alloc_ex.in.extension = alloc->in.extension; ++ mem_alloc_ex.in.flags = alloc->in.flags; ++ mem_alloc_ex.in.fixed_address = 0; + -+#ifdef CONFIG_DEBUG_FS ++ ret = kbase_api_mem_alloc_ex(kctx, &mem_alloc_ex); + -+#if (KERNEL_VERSION(4, 1, 0) > LINUX_VERSION_CODE) -+#define get_file_rcu(x) atomic_long_inc_not_zero(&(x)->f_count) -+#endif ++ alloc->out.flags = mem_alloc_ex.out.flags; ++ alloc->out.gpu_va = mem_alloc_ex.out.gpu_va; + -+struct debug_mem_mapping { -+ struct list_head node; ++ return ret; ++} ++#else ++static int kbase_api_mem_alloc(struct kbase_context *kctx, union kbase_ioctl_mem_alloc *alloc) ++{ ++ struct kbase_va_region *reg; ++ u64 flags = alloc->in.flags; ++ u64 gpu_va; + -+ struct kbase_mem_phy_alloc *alloc; -+ unsigned long flags; ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; + -+ u64 start_pfn; -+ size_t nr_pages; -+}; ++ if (!kbase_mem_allow_alloc(kctx)) ++ return -EINVAL; + -+struct debug_mem_data { -+ struct list_head mapping_list; -+ struct kbase_context *kctx; -+}; ++ if (flags & BASEP_MEM_FLAGS_KERNEL_ONLY) ++ return -ENOMEM; + -+struct debug_mem_seq_off { -+ struct list_head *lh; -+ size_t offset; -+}; ++ /* Force SAME_VA if a 64-bit client. ++ * The only exception is GPU-executable memory if an EXEC_VA zone ++ * has been initialized. In that case, GPU-executable memory may ++ * or may not be SAME_VA. ++ */ ++ if ((!kbase_ctx_flag(kctx, KCTX_COMPAT)) && kbase_ctx_flag(kctx, KCTX_FORCE_SAME_VA)) { ++ if (!(flags & BASE_MEM_PROT_GPU_EX) || !kbase_has_exec_va_zone(kctx)) ++ flags |= BASE_MEM_SAME_VA; ++ } + -+static void *debug_mem_start(struct seq_file *m, loff_t *_pos) ++ reg = kbase_mem_alloc(kctx, alloc->in.va_pages, alloc->in.commit_pages, alloc->in.extension, ++ &flags, &gpu_va, mmu_sync_info); ++ ++ if (!reg) ++ return -ENOMEM; ++ ++ alloc->out.flags = flags; ++ alloc->out.gpu_va = gpu_va; ++ ++ return 0; ++} ++#endif /* MALI_USE_CSF */ ++ ++static int kbase_api_mem_query(struct kbase_context *kctx, ++ union kbase_ioctl_mem_query *query) +{ -+ struct debug_mem_data *mem_data = m->private; -+ struct debug_mem_seq_off *data; -+ struct debug_mem_mapping *map; -+ loff_t pos = *_pos; ++ return kbase_mem_query(kctx, query->in.gpu_addr, ++ query->in.query, &query->out.value); ++} + -+ list_for_each_entry(map, &mem_data->mapping_list, node) { -+ if (pos >= map->nr_pages) { -+ pos -= map->nr_pages; -+ } else { -+ data = kmalloc(sizeof(*data), GFP_KERNEL); -+ if (!data) -+ return NULL; -+ data->lh = &map->node; -+ data->offset = pos; -+ return data; -+ } -+ } ++static int kbase_api_mem_free(struct kbase_context *kctx, ++ struct kbase_ioctl_mem_free *free) ++{ ++ return kbase_mem_free(kctx, free->gpu_addr); ++} + -+ /* Beyond the end */ -+ return NULL; ++#if !MALI_USE_CSF ++static int kbase_api_kinstr_jm_fd(struct kbase_context *kctx, ++ union kbase_kinstr_jm_fd *arg) ++{ ++ return kbase_kinstr_jm_get_fd(kctx->kinstr_jm, arg); +} ++#endif + -+static void debug_mem_stop(struct seq_file *m, void *v) ++static int kbase_api_hwcnt_reader_setup(struct kbase_context *kctx, ++ struct kbase_ioctl_hwcnt_reader_setup *setup) +{ -+ kfree(v); ++ return kbase_vinstr_hwcnt_reader_setup(kctx->kbdev->vinstr_ctx, setup); +} + -+static void *debug_mem_next(struct seq_file *m, void *v, loff_t *pos) ++static int kbase_api_get_cpu_gpu_timeinfo(struct kbase_context *kctx, ++ union kbase_ioctl_get_cpu_gpu_timeinfo *timeinfo) +{ -+ struct debug_mem_data *mem_data = m->private; -+ struct debug_mem_seq_off *data = v; -+ struct debug_mem_mapping *map; ++ u32 flags = timeinfo->in.request_flags; ++ struct timespec64 ts = { 0 }; ++ u64 timestamp = 0; ++ u64 cycle_cnt = 0; + -+ map = list_entry(data->lh, struct debug_mem_mapping, node); ++ kbase_pm_context_active(kctx->kbdev); + -+ if (data->offset < map->nr_pages - 1) { -+ data->offset++; -+ ++*pos; -+ return data; -+ } ++ kbase_backend_get_gpu_time(kctx->kbdev, ++ (flags & BASE_TIMEINFO_CYCLE_COUNTER_FLAG) ? &cycle_cnt : NULL, ++ (flags & BASE_TIMEINFO_TIMESTAMP_FLAG) ? ×tamp : NULL, ++ (flags & BASE_TIMEINFO_MONOTONIC_FLAG) ? &ts : NULL); + -+ if (list_is_last(data->lh, &mem_data->mapping_list)) { -+ kfree(data); -+ return NULL; ++ if (flags & BASE_TIMEINFO_TIMESTAMP_FLAG) ++ timeinfo->out.timestamp = timestamp; ++ ++ if (flags & BASE_TIMEINFO_CYCLE_COUNTER_FLAG) ++ timeinfo->out.cycle_counter = cycle_cnt; ++ ++ if (flags & BASE_TIMEINFO_MONOTONIC_FLAG) { ++ timeinfo->out.sec = ts.tv_sec; ++ timeinfo->out.nsec = ts.tv_nsec; + } + -+ data->lh = data->lh->next; -+ data->offset = 0; -+ ++*pos; ++ kbase_pm_context_idle(kctx->kbdev); + -+ return data; ++ return 0; +} + -+static int debug_mem_show(struct seq_file *m, void *v) ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++static int kbase_api_hwcnt_set(struct kbase_context *kctx, ++ struct kbase_ioctl_hwcnt_values *values) +{ -+ struct debug_mem_data *mem_data = m->private; -+ struct debug_mem_seq_off *data = v; -+ struct debug_mem_mapping *map; -+ int i, j; -+ struct page *page; -+ uint32_t *mapping; -+ pgprot_t prot = PAGE_KERNEL; ++ return gpu_model_set_dummy_prfcnt_user_sample(u64_to_user_ptr(values->data), values->size); ++} ++#endif /* CONFIG_MALI_BIFROST_NO_MALI */ + -+ map = list_entry(data->lh, struct debug_mem_mapping, node); ++static int kbase_api_disjoint_query(struct kbase_context *kctx, ++ struct kbase_ioctl_disjoint_query *query) ++{ ++ query->counter = kbase_disjoint_event_get(kctx->kbdev); + -+ kbase_gpu_vm_lock(mem_data->kctx); ++ return 0; ++} + -+ if (data->offset >= map->alloc->nents) { -+ seq_printf(m, "%016llx: Unbacked page\n\n", (map->start_pfn + -+ data->offset) << PAGE_SHIFT); -+ goto out; -+ } ++static int kbase_api_get_ddk_version(struct kbase_context *kctx, ++ struct kbase_ioctl_get_ddk_version *version) ++{ ++ int ret; ++ int len = sizeof(KERNEL_SIDE_DDK_VERSION_STRING); + -+ if (!(map->flags & KBASE_REG_CPU_CACHED)) -+ prot = pgprot_writecombine(prot); ++ if (version->version_buffer == 0) ++ return len; + -+ page = as_page(map->alloc->pages[data->offset]); -+ mapping = vmap(&page, 1, VM_MAP, prot); -+ if (!mapping) -+ goto out; ++ if (version->size < len) ++ return -EOVERFLOW; + -+ for (i = 0; i < PAGE_SIZE; i += 4*sizeof(*mapping)) { -+ seq_printf(m, "%016llx:", i + ((map->start_pfn + -+ data->offset) << PAGE_SHIFT)); ++ ret = copy_to_user(u64_to_user_ptr(version->version_buffer), ++ KERNEL_SIDE_DDK_VERSION_STRING, ++ sizeof(KERNEL_SIDE_DDK_VERSION_STRING)); + -+ for (j = 0; j < 4*sizeof(*mapping); j += sizeof(*mapping)) -+ seq_printf(m, " %08x", mapping[(i+j)/sizeof(*mapping)]); -+ seq_putc(m, '\n'); ++ if (ret) ++ return -EFAULT; ++ ++ return len; ++} ++ ++static int kbase_api_mem_jit_init(struct kbase_context *kctx, ++ struct kbase_ioctl_mem_jit_init *jit_init) ++{ ++ int i; ++ ++ for (i = 0; i < sizeof(jit_init->padding); i++) { ++ /* Ensure all padding bytes are 0 for potential future ++ * extension ++ */ ++ if (jit_init->padding[i]) ++ return -EINVAL; + } + -+ vunmap(mapping); ++ return kbase_region_tracker_init_jit(kctx, jit_init->va_pages, ++ jit_init->max_allocations, jit_init->trim_level, ++ jit_init->group_id, jit_init->phys_pages); ++} + -+ seq_putc(m, '\n'); ++static int kbase_api_mem_exec_init(struct kbase_context *kctx, ++ struct kbase_ioctl_mem_exec_init *exec_init) ++{ ++ return kbase_region_tracker_init_exec(kctx, exec_init->va_pages); ++} ++ ++static int kbase_api_mem_sync(struct kbase_context *kctx, ++ struct kbase_ioctl_mem_sync *sync) ++{ ++ struct basep_syncset sset = { ++ .mem_handle.basep.handle = sync->handle, ++ .user_addr = sync->user_addr, ++ .size = sync->size, ++ .type = sync->type ++ }; ++ ++ return kbase_sync_now(kctx, &sset); ++} ++ ++static int kbase_api_mem_find_cpu_offset(struct kbase_context *kctx, ++ union kbase_ioctl_mem_find_cpu_offset *find) ++{ ++ return kbasep_find_enclosing_cpu_mapping_offset( ++ kctx, ++ find->in.cpu_addr, ++ find->in.size, ++ &find->out.offset); ++} ++ ++static int kbase_api_mem_find_gpu_start_and_offset(struct kbase_context *kctx, ++ union kbase_ioctl_mem_find_gpu_start_and_offset *find) ++{ ++ return kbasep_find_enclosing_gpu_mapping_start_and_offset( ++ kctx, ++ find->in.gpu_addr, ++ find->in.size, ++ &find->out.start, ++ &find->out.offset); ++} ++ ++static int kbase_api_get_context_id(struct kbase_context *kctx, ++ struct kbase_ioctl_get_context_id *info) ++{ ++ info->id = kctx->id; + -+out: -+ kbase_gpu_vm_unlock(mem_data->kctx); + return 0; +} + -+static const struct seq_operations ops = { -+ .start = debug_mem_start, -+ .next = debug_mem_next, -+ .stop = debug_mem_stop, -+ .show = debug_mem_show, -+}; ++static int kbase_api_tlstream_acquire(struct kbase_context *kctx, ++ struct kbase_ioctl_tlstream_acquire *acquire) ++{ ++ return kbase_timeline_io_acquire(kctx->kbdev, acquire->flags); ++} + -+static int debug_mem_zone_open(struct rb_root *rbtree, -+ struct debug_mem_data *mem_data) ++static int kbase_api_tlstream_flush(struct kbase_context *kctx) +{ -+ int ret = 0; -+ struct rb_node *p; -+ struct kbase_va_region *reg; -+ struct debug_mem_mapping *mapping; ++ kbase_timeline_streams_flush(kctx->kbdev->timeline); + -+ for (p = rb_first(rbtree); p; p = rb_next(p)) { -+ reg = rb_entry(p, struct kbase_va_region, rblink); ++ return 0; ++} + -+ if (reg->gpu_alloc == NULL) -+ /* Empty region - ignore */ -+ continue; ++static int kbase_api_mem_commit(struct kbase_context *kctx, ++ struct kbase_ioctl_mem_commit *commit) ++{ ++ return kbase_mem_commit(kctx, commit->gpu_addr, commit->pages); ++} + -+ mapping = kmalloc(sizeof(*mapping), GFP_KERNEL); -+ if (!mapping) { -+ ret = -ENOMEM; -+ goto out; -+ } ++static int kbase_api_mem_alias(struct kbase_context *kctx, ++ union kbase_ioctl_mem_alias *alias) ++{ ++ struct base_mem_aliasing_info *ai; ++ u64 flags; ++ int err; + -+ mapping->alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); -+ mapping->start_pfn = reg->start_pfn; -+ mapping->nr_pages = reg->nr_pages; -+ mapping->flags = reg->flags; -+ list_add_tail(&mapping->node, &mem_data->mapping_list); ++ if (alias->in.nents == 0 || alias->in.nents > BASE_MEM_ALIAS_MAX_ENTS) ++ return -EINVAL; ++ ++ ai = vmalloc(sizeof(*ai) * alias->in.nents); ++ if (!ai) ++ return -ENOMEM; ++ ++ err = copy_from_user(ai, ++ u64_to_user_ptr(alias->in.aliasing_info), ++ sizeof(*ai) * alias->in.nents); ++ if (err) { ++ vfree(ai); ++ return -EFAULT; + } + -+out: -+ return ret; ++ flags = alias->in.flags; ++ if (flags & BASEP_MEM_FLAGS_KERNEL_ONLY) { ++ vfree(ai); ++ return -EINVAL; ++ } ++ ++ alias->out.gpu_va = kbase_mem_alias(kctx, &flags, ++ alias->in.stride, alias->in.nents, ++ ai, &alias->out.va_pages); ++ ++ alias->out.flags = flags; ++ ++ vfree(ai); ++ ++ if (alias->out.gpu_va == 0) ++ return -ENOMEM; ++ ++ return 0; +} + -+static int debug_mem_open(struct inode *i, struct file *file) ++static int kbase_api_mem_import(struct kbase_context *kctx, ++ union kbase_ioctl_mem_import *import) +{ -+ struct kbase_context *const kctx = i->i_private; -+ struct debug_mem_data *mem_data; + int ret; ++ u64 flags = import->in.flags; + -+ if (get_file_rcu(kctx->filp) == 0) -+ return -ENOENT; ++ if (flags & BASEP_MEM_FLAGS_KERNEL_ONLY) ++ return -ENOMEM; + -+ ret = seq_open(file, &ops); -+ if (ret) -+ goto open_fail; ++ ret = kbase_mem_import(kctx, ++ import->in.type, ++ u64_to_user_ptr(import->in.phandle), ++ import->in.padding, ++ &import->out.gpu_va, ++ &import->out.va_pages, ++ &flags); + -+ mem_data = kmalloc(sizeof(*mem_data), GFP_KERNEL); -+ if (!mem_data) { -+ ret = -ENOMEM; -+ goto out; -+ } ++ import->out.flags = flags; + -+ mem_data->kctx = kctx; ++ return ret; ++} + -+ INIT_LIST_HEAD(&mem_data->mapping_list); ++static int kbase_api_mem_flags_change(struct kbase_context *kctx, ++ struct kbase_ioctl_mem_flags_change *change) ++{ ++ if (change->flags & BASEP_MEM_FLAGS_KERNEL_ONLY) ++ return -ENOMEM; + -+ kbase_gpu_vm_lock(kctx); ++ return kbase_mem_flags_change(kctx, change->gpu_va, ++ change->flags, change->mask); ++} + -+ ret = debug_mem_zone_open(&kctx->reg_rbtree_same, mem_data); -+ if (0 != ret) { -+ kbase_gpu_vm_unlock(kctx); -+ goto out; ++static int kbase_api_stream_create(struct kbase_context *kctx, ++ struct kbase_ioctl_stream_create *stream) ++{ ++#if IS_ENABLED(CONFIG_SYNC_FILE) ++ int fd, ret; ++ ++ /* Name must be NULL-terminated and padded with NULLs, so check last ++ * character is NULL ++ */ ++ if (stream->name[sizeof(stream->name)-1] != 0) ++ return -EINVAL; ++ ++ ret = kbase_sync_fence_stream_create(stream->name, &fd); ++ ++ if (ret) ++ return ret; ++ return fd; ++#else ++ return -ENOENT; ++#endif ++} ++ ++static int kbase_api_fence_validate(struct kbase_context *kctx, ++ struct kbase_ioctl_fence_validate *validate) ++{ ++#if IS_ENABLED(CONFIG_SYNC_FILE) ++ return kbase_sync_fence_validate(validate->fd); ++#else ++ return -ENOENT; ++#endif ++} ++ ++static int kbase_api_mem_profile_add(struct kbase_context *kctx, ++ struct kbase_ioctl_mem_profile_add *data) ++{ ++ char *buf; ++ int err; ++ ++ if (data->len > KBASE_MEM_PROFILE_MAX_BUF_SIZE) { ++ dev_err(kctx->kbdev->dev, "mem_profile_add: buffer too big"); ++ return -EINVAL; + } + -+ ret = debug_mem_zone_open(&kctx->reg_rbtree_custom, mem_data); -+ if (0 != ret) { -+ kbase_gpu_vm_unlock(kctx); -+ goto out; ++ if (!data->len) { ++ dev_err(kctx->kbdev->dev, "mem_profile_add: buffer size is 0"); ++ /* Should return -EINVAL, but returning -ENOMEM for backwards compat */ ++ return -ENOMEM; + } + -+ ret = debug_mem_zone_open(&kctx->reg_rbtree_exec, mem_data); -+ if (0 != ret) { -+ kbase_gpu_vm_unlock(kctx); -+ goto out; ++ buf = kmalloc(data->len, GFP_KERNEL); ++ if (!buf) ++ return -ENOMEM; ++ ++ err = copy_from_user(buf, u64_to_user_ptr(data->buffer), ++ data->len); ++ if (err) { ++ kfree(buf); ++ return -EFAULT; + } + -+ kbase_gpu_vm_unlock(kctx); ++ return kbasep_mem_profile_debugfs_insert(kctx, buf, data->len); ++} + -+ ((struct seq_file *)file->private_data)->private = mem_data; ++#if !MALI_USE_CSF ++static int kbase_api_soft_event_update(struct kbase_context *kctx, ++ struct kbase_ioctl_soft_event_update *update) ++{ ++ if (update->flags != 0) ++ return -EINVAL; + -+ return 0; ++ return kbase_soft_event_update(kctx, update->event, update->new_status); ++} ++#endif /* !MALI_USE_CSF */ + -+out: -+ if (mem_data) { -+ while (!list_empty(&mem_data->mapping_list)) { -+ struct debug_mem_mapping *mapping; ++static int kbase_api_sticky_resource_map(struct kbase_context *kctx, ++ struct kbase_ioctl_sticky_resource_map *map) ++{ ++ int ret; ++ u64 i; ++ u64 gpu_addr[BASE_EXT_RES_COUNT_MAX]; + -+ mapping = list_first_entry(&mem_data->mapping_list, -+ struct debug_mem_mapping, node); -+ kbase_mem_phy_alloc_put(mapping->alloc); -+ list_del(&mapping->node); -+ kfree(mapping); ++ if (!map->count || map->count > BASE_EXT_RES_COUNT_MAX) ++ return -EOVERFLOW; ++ ++ ret = copy_from_user(gpu_addr, u64_to_user_ptr(map->address), ++ sizeof(u64) * map->count); ++ ++ if (ret != 0) ++ return -EFAULT; ++ ++ kbase_gpu_vm_lock(kctx); ++ ++ for (i = 0; i < map->count; i++) { ++ if (!kbase_sticky_resource_acquire(kctx, gpu_addr[i])) { ++ /* Invalid resource */ ++ ret = -EINVAL; ++ break; + } -+ kfree(mem_data); + } -+ seq_release(i, file); -+open_fail: -+ fput(kctx->filp); ++ ++ if (ret != 0) { ++ while (i > 0) { ++ i--; ++ kbase_sticky_resource_release_force(kctx, NULL, gpu_addr[i]); ++ } ++ } ++ ++ kbase_gpu_vm_unlock(kctx); + + return ret; +} + -+static int debug_mem_release(struct inode *inode, struct file *file) ++static int kbase_api_sticky_resource_unmap(struct kbase_context *kctx, ++ struct kbase_ioctl_sticky_resource_unmap *unmap) +{ -+ struct kbase_context *const kctx = inode->i_private; -+ struct seq_file *sfile = file->private_data; -+ struct debug_mem_data *mem_data = sfile->private; -+ struct debug_mem_mapping *mapping; ++ int ret; ++ u64 i; ++ u64 gpu_addr[BASE_EXT_RES_COUNT_MAX]; + -+ seq_release(inode, file); ++ if (!unmap->count || unmap->count > BASE_EXT_RES_COUNT_MAX) ++ return -EOVERFLOW; + -+ while (!list_empty(&mem_data->mapping_list)) { -+ mapping = list_first_entry(&mem_data->mapping_list, -+ struct debug_mem_mapping, node); -+ kbase_mem_phy_alloc_put(mapping->alloc); -+ list_del(&mapping->node); -+ kfree(mapping); -+ } ++ ret = copy_from_user(gpu_addr, u64_to_user_ptr(unmap->address), ++ sizeof(u64) * unmap->count); + -+ kfree(mem_data); ++ if (ret != 0) ++ return -EFAULT; + -+ fput(kctx->filp); ++ kbase_gpu_vm_lock(kctx); + -+ return 0; ++ for (i = 0; i < unmap->count; i++) { ++ if (!kbase_sticky_resource_release_force(kctx, NULL, gpu_addr[i])) { ++ /* Invalid resource, but we keep going anyway */ ++ ret = -EINVAL; ++ } ++ } ++ ++ kbase_gpu_vm_unlock(kctx); ++ ++ return ret; +} + -+static const struct file_operations kbase_debug_mem_view_fops = { -+ .owner = THIS_MODULE, -+ .open = debug_mem_open, -+ .release = debug_mem_release, -+ .read = seq_read, -+ .llseek = seq_lseek -+}; ++#if MALI_UNIT_TEST + -+void kbase_debug_mem_view_init(struct kbase_context *const kctx) ++static int kbase_api_tlstream_stats(struct kbase_context *kctx, ++ struct kbase_ioctl_tlstream_stats *stats) +{ -+ /* Caller already ensures this, but we keep the pattern for -+ * maintenance safety. -+ */ -+ if (WARN_ON(!kctx) || -+ WARN_ON(IS_ERR_OR_NULL(kctx->kctx_dentry))) -+ return; ++ kbase_timeline_stats(kctx->kbdev->timeline, ++ &stats->bytes_collected, ++ &stats->bytes_generated); + -+ debugfs_create_file("mem_view", 0400, kctx->kctx_dentry, kctx, -+ &kbase_debug_mem_view_fops); ++ return 0; +} ++#endif /* MALI_UNIT_TEST */ + -+#endif -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h -new file mode 100755 -index 000000000000..b948b7cd9dd4 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h -@@ -0,0 +1,40 @@ -+/* -+ * -+ * (C) COPYRIGHT 2013-2015, 2019 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ ++#if MALI_USE_CSF ++static int kbasep_cs_event_signal(struct kbase_context *kctx) ++{ ++ kbase_csf_event_signal_notify_gpu(kctx); ++ return 0; ++} + -+#ifndef _KBASE_DEBUG_MEM_VIEW_H -+#define _KBASE_DEBUG_MEM_VIEW_H ++static int kbasep_cs_queue_register(struct kbase_context *kctx, ++ struct kbase_ioctl_cs_queue_register *reg) ++{ ++ kctx->jit_group_id = BASE_MEM_GROUP_DEFAULT; + -+#include ++ return kbase_csf_queue_register(kctx, reg); ++} + -+/** -+ * kbase_debug_mem_view_init - Initialize the mem_view sysfs file -+ * @kctx: Pointer to kernel base context -+ * -+ * This function creates a "mem_view" file which can be used to get a view of -+ * the context's memory as the GPU sees it (i.e. using the GPU's page tables). -+ * -+ * The file is cleaned up by a call to debugfs_remove_recursive() deleting the -+ * parent directory. -+ */ -+void kbase_debug_mem_view_init(struct kbase_context *kctx); ++static int kbasep_cs_queue_register_ex(struct kbase_context *kctx, ++ struct kbase_ioctl_cs_queue_register_ex *reg) ++{ ++ kctx->jit_group_id = BASE_MEM_GROUP_DEFAULT; + -+#endif -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c -new file mode 100755 -index 000000000000..37e507b164c5 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c -@@ -0,0 +1,183 @@ -+/* -+ * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ ++ return kbase_csf_queue_register_ex(kctx, reg); ++} + -+#include -+#include -+#include -+#include ++static int kbasep_cs_queue_terminate(struct kbase_context *kctx, ++ struct kbase_ioctl_cs_queue_terminate *term) ++{ ++ kbase_csf_queue_terminate(kctx, term); + -+#include "mali_kbase_debugfs_helper.h" ++ return 0; ++} + -+/* Arbitrary maximum size to prevent user space allocating too much kernel -+ * memory -+ */ -+#define DEBUGFS_MEM_POOLS_MAX_WRITE_SIZE (256u) ++static int kbasep_cs_queue_bind(struct kbase_context *kctx, ++ union kbase_ioctl_cs_queue_bind *bind) ++{ ++ return kbase_csf_queue_bind(kctx, bind); ++} + -+/** -+ * set_attr_from_string - Parse a string to set elements of an array -+ * -+ * This is the core of the implementation of -+ * kbase_debugfs_helper_set_attr_from_string. The only difference between the -+ * two functions is that this one requires the input string to be writable. -+ * -+ * @buf: Input string to parse. Must be nul-terminated! -+ * @array: Address of an object that can be accessed like an array. -+ * @nelems: Number of elements in the array. -+ * @set_attr_fn: Function to be called back for each array element. -+ * -+ * Return: 0 if success, negative error code otherwise. -+ */ -+static int set_attr_from_string( -+ char *const buf, -+ void *const array, size_t const nelems, -+ kbase_debugfs_helper_set_attr_fn const set_attr_fn) ++static int kbasep_cs_queue_kick(struct kbase_context *kctx, ++ struct kbase_ioctl_cs_queue_kick *kick) +{ -+ size_t index, err = 0; -+ char *ptr = buf; ++ return kbase_csf_queue_kick(kctx, kick); ++} + -+ for (index = 0; index < nelems && *ptr; ++index) { -+ unsigned long new_size; -+ size_t len; -+ char sep; ++static int kbasep_cs_queue_group_create_1_6( ++ struct kbase_context *kctx, ++ union kbase_ioctl_cs_queue_group_create_1_6 *create) ++{ ++ union kbase_ioctl_cs_queue_group_create ++ new_create = { .in = { ++ .tiler_mask = create->in.tiler_mask, ++ .fragment_mask = ++ create->in.fragment_mask, ++ .compute_mask = create->in.compute_mask, ++ .cs_min = create->in.cs_min, ++ .priority = create->in.priority, ++ .tiler_max = create->in.tiler_max, ++ .fragment_max = create->in.fragment_max, ++ .compute_max = create->in.compute_max, ++ } }; + -+ /* Drop leading spaces */ -+ while (*ptr == ' ') -+ ptr++; ++ int ret = kbase_csf_queue_group_create(kctx, &new_create); + -+ len = strcspn(ptr, "\n "); -+ if (len == 0) { -+ /* No more values (allow this) */ -+ break; -+ } ++ create->out.group_handle = new_create.out.group_handle; ++ create->out.group_uid = new_create.out.group_uid; + -+ /* Substitute a nul terminator for a space character -+ * to make the substring valid for kstrtoul. -+ */ -+ sep = ptr[len]; -+ if (sep == ' ') -+ ptr[len++] = '\0'; ++ return ret; ++} ++static int kbasep_cs_queue_group_create(struct kbase_context *kctx, ++ union kbase_ioctl_cs_queue_group_create *create) ++{ ++ return kbase_csf_queue_group_create(kctx, create); ++} + -+ err = kstrtoul(ptr, 0, &new_size); -+ if (err) -+ break; ++static int kbasep_cs_queue_group_terminate(struct kbase_context *kctx, ++ struct kbase_ioctl_cs_queue_group_term *term) ++{ ++ kbase_csf_queue_group_terminate(kctx, term->group_handle); + -+ /* Skip the substring (including any premature nul terminator) -+ */ -+ ptr += len; ++ return 0; ++} + -+ set_attr_fn(array, index, new_size); -+ } ++static int kbasep_kcpu_queue_new(struct kbase_context *kctx, ++ struct kbase_ioctl_kcpu_queue_new *new) ++{ ++ return kbase_csf_kcpu_queue_new(kctx, new); ++} + -+ return err; ++static int kbasep_kcpu_queue_delete(struct kbase_context *kctx, ++ struct kbase_ioctl_kcpu_queue_delete *delete) ++{ ++ return kbase_csf_kcpu_queue_delete(kctx, delete); +} + -+int kbase_debugfs_helper_set_attr_from_string( -+ const char *const buf, void *const array, size_t const nelems, -+ kbase_debugfs_helper_set_attr_fn const set_attr_fn) ++static int kbasep_kcpu_queue_enqueue(struct kbase_context *kctx, ++ struct kbase_ioctl_kcpu_queue_enqueue *enqueue) +{ -+ char *const wbuf = kstrdup(buf, GFP_KERNEL); -+ int err = 0; ++ return kbase_csf_kcpu_queue_enqueue(kctx, enqueue); ++} + -+ if (!wbuf) -+ return -ENOMEM; ++static int kbasep_cs_tiler_heap_init(struct kbase_context *kctx, ++ union kbase_ioctl_cs_tiler_heap_init *heap_init) ++{ ++ if (heap_init->in.group_id >= MEMORY_GROUP_MANAGER_NR_GROUPS) ++ return -EINVAL; + -+ err = set_attr_from_string(wbuf, array, nelems, -+ set_attr_fn); ++ kctx->jit_group_id = heap_init->in.group_id; + -+ kfree(wbuf); -+ return err; ++ return kbase_csf_tiler_heap_init(kctx, heap_init->in.chunk_size, ++ heap_init->in.initial_chunks, heap_init->in.max_chunks, ++ heap_init->in.target_in_flight, heap_init->in.buf_desc_va, ++ &heap_init->out.gpu_heap_va, ++ &heap_init->out.first_chunk_va); +} + -+ssize_t kbase_debugfs_helper_get_attr_to_string( -+ char *const buf, size_t const size, -+ void *const array, size_t const nelems, -+ kbase_debugfs_helper_get_attr_fn const get_attr_fn) ++static int kbasep_cs_tiler_heap_init_1_13(struct kbase_context *kctx, ++ union kbase_ioctl_cs_tiler_heap_init_1_13 *heap_init) +{ -+ ssize_t total = 0; -+ size_t index; -+ -+ for (index = 0; index < nelems; ++index) { -+ const char *postfix = " "; ++ if (heap_init->in.group_id >= MEMORY_GROUP_MANAGER_NR_GROUPS) ++ return -EINVAL; + -+ if (index == (nelems-1)) -+ postfix = "\n"; ++ kctx->jit_group_id = heap_init->in.group_id; + -+ total += scnprintf(buf + total, size - total, "%zu%s", -+ get_attr_fn(array, index), postfix); -+ } ++ return kbase_csf_tiler_heap_init(kctx, heap_init->in.chunk_size, ++ heap_init->in.initial_chunks, heap_init->in.max_chunks, ++ heap_init->in.target_in_flight, 0, ++ &heap_init->out.gpu_heap_va, ++ &heap_init->out.first_chunk_va); ++} + -+ return total; ++static int kbasep_cs_tiler_heap_term(struct kbase_context *kctx, ++ struct kbase_ioctl_cs_tiler_heap_term *heap_term) ++{ ++ return kbase_csf_tiler_heap_term(kctx, heap_term->gpu_heap_va); +} + -+int kbase_debugfs_helper_seq_write(struct file *const file, -+ const char __user *const ubuf, size_t const count, -+ size_t const nelems, -+ kbase_debugfs_helper_set_attr_fn const set_attr_fn) ++static int kbase_ioctl_cs_get_glb_iface(struct kbase_context *kctx, ++ union kbase_ioctl_cs_get_glb_iface *param) +{ -+ const struct seq_file *const sfile = file->private_data; -+ void *const array = sfile->private; ++ struct basep_cs_stream_control *stream_data = NULL; ++ struct basep_cs_group_control *group_data = NULL; ++ void __user *user_groups, *user_streams; + int err = 0; -+ char *buf; ++ u32 const max_group_num = param->in.max_group_num; ++ u32 const max_total_stream_num = param->in.max_total_stream_num; + -+ if (WARN_ON(!array)) ++ if (max_group_num > MAX_SUPPORTED_CSGS) + return -EINVAL; + -+ if (WARN_ON(count > DEBUGFS_MEM_POOLS_MAX_WRITE_SIZE)) ++ if (max_total_stream_num > ++ MAX_SUPPORTED_CSGS * MAX_SUPPORTED_STREAMS_PER_GROUP) + return -EINVAL; + -+ buf = kmalloc(count + 1, GFP_KERNEL); -+ if (buf == NULL) -+ return -ENOMEM; ++ user_groups = u64_to_user_ptr(param->in.groups_ptr); ++ user_streams = u64_to_user_ptr(param->in.streams_ptr); + -+ if (copy_from_user(buf, ubuf, count)) { -+ kfree(buf); -+ return -EFAULT; ++ if (max_group_num > 0) { ++ if (!user_groups) ++ err = -EINVAL; ++ else { ++ group_data = kcalloc(max_group_num, ++ sizeof(*group_data), GFP_KERNEL); ++ if (!group_data) ++ err = -ENOMEM; ++ } + } + -+ buf[count] = '\0'; -+ err = set_attr_from_string(buf, -+ array, nelems, set_attr_fn); -+ kfree(buf); ++ if (max_total_stream_num > 0) { ++ if (!user_streams) ++ err = -EINVAL; ++ else { ++ stream_data = kcalloc(max_total_stream_num, ++ sizeof(*stream_data), GFP_KERNEL); ++ if (!stream_data) ++ err = -ENOMEM; ++ } ++ } ++ ++ if (!err) { ++ param->out.total_stream_num = kbase_csf_firmware_get_glb_iface( ++ kctx->kbdev, group_data, max_group_num, stream_data, ++ max_total_stream_num, ¶m->out.glb_version, ++ ¶m->out.features, ¶m->out.group_num, ++ ¶m->out.prfcnt_size, ¶m->out.instr_features); ++ ++ if (copy_to_user(user_groups, group_data, ++ MIN(max_group_num, param->out.group_num) * ++ sizeof(*group_data))) ++ err = -EFAULT; ++ } ++ ++ if (!err) ++ if (copy_to_user(user_streams, stream_data, ++ MIN(max_total_stream_num, param->out.total_stream_num) * ++ sizeof(*stream_data))) ++ err = -EFAULT; + ++ kfree(group_data); ++ kfree(stream_data); + return err; +} + -+int kbase_debugfs_helper_seq_read(struct seq_file *const sfile, -+ size_t const nelems, -+ kbase_debugfs_helper_get_attr_fn const get_attr_fn) ++static int kbasep_ioctl_cs_cpu_queue_dump(struct kbase_context *kctx, ++ struct kbase_ioctl_cs_cpu_queue_info *cpu_queue_info) +{ -+ void *const array = sfile->private; -+ size_t index; ++ return kbase_csf_cpu_queue_dump(kctx, cpu_queue_info->buffer, ++ cpu_queue_info->size); ++} + -+ if (WARN_ON(!array)) ++static int kbase_ioctl_read_user_page(struct kbase_context *kctx, ++ union kbase_ioctl_read_user_page *user_page) ++{ ++ struct kbase_device *kbdev = kctx->kbdev; ++ unsigned long flags; ++ ++ /* As of now, only LATEST_FLUSH is supported */ ++ if (unlikely(user_page->in.offset != LATEST_FLUSH)) + return -EINVAL; + -+ for (index = 0; index < nelems; ++index) { -+ const char *postfix = " "; ++ /* Validating padding that must be zero */ ++ if (unlikely(user_page->in.padding != 0)) ++ return -EINVAL; + -+ if (index == (nelems-1)) -+ postfix = "\n"; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ if (!kbdev->pm.backend.gpu_powered) ++ user_page->out.val_lo = POWER_DOWN_LATEST_FLUSH_VALUE; ++ else ++ user_page->out.val_lo = kbase_reg_read(kbdev, USER_REG(LATEST_FLUSH)); ++ user_page->out.val_hi = 0; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ seq_printf(sfile, "%zu%s", get_attr_fn(array, index), postfix); -+ } + return 0; +} -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h -new file mode 100755 -index 000000000000..c3c9efa14e65 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h -@@ -0,0 +1,141 @@ -+/* -+ * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ ++#endif /* MALI_USE_CSF */ + -+#ifndef _KBASE_DEBUGFS_HELPER_H_ -+#define _KBASE_DEBUGFS_HELPER_H_ ++static int kbasep_ioctl_context_priority_check(struct kbase_context *kctx, ++ struct kbase_ioctl_context_priority_check *priority_check) ++{ ++#if MALI_USE_CSF ++ priority_check->priority = kbase_csf_priority_check(kctx->kbdev, priority_check->priority); ++#else ++ base_jd_prio req_priority = (base_jd_prio)priority_check->priority; + -+/** -+ * typedef kbase_debugfs_helper_set_attr_fn - Type of function to set an -+ * attribute value from an array -+ * -+ * @array: Address of an object that can be accessed like an array. -+ * @index: An element index. The valid range depends on the use-case. -+ * @value: Attribute value to be set. -+ */ -+typedef void (*kbase_debugfs_helper_set_attr_fn)( -+ void *array, size_t index, size_t value); ++ priority_check->priority = (u8)kbase_js_priority_check(kctx->kbdev, req_priority); ++#endif ++ return 0; ++} + -+/** -+ * kbase_debugfs_helper_set_attr_from_string - Parse a string to reconfigure an -+ * array -+ * -+ * The given function is called once for each attribute value found in the -+ * input string. It is not an error if the string specifies fewer attribute -+ * values than the specified number of array elements. -+ * -+ * The number base of each attribute value is detected automatically -+ * according to the standard rules (e.g. prefix "0x" for hexadecimal). -+ * Attribute values are separated by one or more space characters. -+ * Additional leading and trailing spaces are ignored. -+ * -+ * @buf: Input string to parse. Must be nul-terminated! -+ * @array: Address of an object that can be accessed like an array. -+ * @nelems: Number of elements in the array. -+ * @set_attr_fn: Function to be called back for each array element. -+ * -+ * Return: 0 if success, negative error code otherwise. -+ */ -+int kbase_debugfs_helper_set_attr_from_string( -+ const char *buf, void *array, size_t nelems, -+ kbase_debugfs_helper_set_attr_fn set_attr_fn); ++#define KBASE_HANDLE_IOCTL(cmd, function, arg) \ ++ do { \ ++ int ret; \ ++ BUILD_BUG_ON(_IOC_DIR(cmd) != _IOC_NONE); \ ++ dev_dbg(arg->kbdev->dev, "Enter ioctl %s\n", #function); \ ++ ret = function(arg); \ ++ dev_dbg(arg->kbdev->dev, "Return %d from ioctl %s\n", ret, \ ++ #function); \ ++ return ret; \ ++ } while (0) + -+/** -+ * typedef kbase_debugfs_helper_get_attr_fn - Type of function to get an -+ * attribute value from an array -+ * -+ * @array: Address of an object that can be accessed like an array. -+ * @index: An element index. The valid range depends on the use-case. -+ * -+ * Return: Value of attribute. -+ */ -+typedef size_t (*kbase_debugfs_helper_get_attr_fn)( -+ void *array, size_t index); ++#define KBASE_HANDLE_IOCTL_IN(cmd, function, type, arg) \ ++ do { \ ++ type param; \ ++ int ret, err; \ ++ dev_dbg(arg->kbdev->dev, "Enter ioctl %s\n", #function); \ ++ BUILD_BUG_ON(_IOC_DIR(cmd) != _IOC_WRITE); \ ++ BUILD_BUG_ON(sizeof(param) != _IOC_SIZE(cmd)); \ ++ err = copy_from_user(¶m, uarg, sizeof(param)); \ ++ if (err) \ ++ return -EFAULT; \ ++ ret = function(arg, ¶m); \ ++ dev_dbg(arg->kbdev->dev, "Return %d from ioctl %s\n", ret, \ ++ #function); \ ++ return ret; \ ++ } while (0) + -+/** -+ * kbase_debugfs_helper_get_attr_to_string - Construct a formatted string -+ * from elements in an array -+ * -+ * The given function is called once for each array element to get the -+ * value of the attribute to be inspected. The attribute values are -+ * written to the buffer as a formatted string of decimal numbers -+ * separated by spaces and terminated by a linefeed. -+ * -+ * @buf: Buffer in which to store the formatted output string. -+ * @size: The size of the buffer, in bytes. -+ * @array: Address of an object that can be accessed like an array. -+ * @nelems: Number of elements in the array. -+ * @get_attr_fn: Function to be called back for each array element. -+ * -+ * Return: Number of characters written excluding the nul terminator. -+ */ -+ssize_t kbase_debugfs_helper_get_attr_to_string( -+ char *buf, size_t size, void *array, size_t nelems, -+ kbase_debugfs_helper_get_attr_fn get_attr_fn); ++#define KBASE_HANDLE_IOCTL_OUT(cmd, function, type, arg) \ ++ do { \ ++ type param; \ ++ int ret, err; \ ++ dev_dbg(arg->kbdev->dev, "Enter ioctl %s\n", #function); \ ++ BUILD_BUG_ON(_IOC_DIR(cmd) != _IOC_READ); \ ++ BUILD_BUG_ON(sizeof(param) != _IOC_SIZE(cmd)); \ ++ memset(¶m, 0, sizeof(param)); \ ++ ret = function(arg, ¶m); \ ++ err = copy_to_user(uarg, ¶m, sizeof(param)); \ ++ if (err) \ ++ return -EFAULT; \ ++ dev_dbg(arg->kbdev->dev, "Return %d from ioctl %s\n", ret, \ ++ #function); \ ++ return ret; \ ++ } while (0) + -+/** -+ * kbase_debugfs_helper_seq_read - Implements reads from a virtual file for an -+ * array -+ * -+ * The virtual file must have been opened by calling single_open and passing -+ * the address of an object that can be accessed like an array. -+ * -+ * The given function is called once for each array element to get the -+ * value of the attribute to be inspected. The attribute values are -+ * written to the buffer as a formatted string of decimal numbers -+ * separated by spaces and terminated by a linefeed. -+ * -+ * @sfile: A virtual file previously opened by calling single_open. -+ * @nelems: Number of elements in the array. -+ * @get_attr_fn: Function to be called back for each array element. -+ * -+ * Return: 0 if success, negative error code otherwise. -+ */ -+int kbase_debugfs_helper_seq_read( -+ struct seq_file *const sfile, size_t const nelems, -+ kbase_debugfs_helper_get_attr_fn const get_attr_fn); ++#define KBASE_HANDLE_IOCTL_INOUT(cmd, function, type, arg) \ ++ do { \ ++ type param; \ ++ int ret, err; \ ++ dev_dbg(arg->kbdev->dev, "Enter ioctl %s\n", #function); \ ++ BUILD_BUG_ON(_IOC_DIR(cmd) != (_IOC_WRITE | _IOC_READ)); \ ++ BUILD_BUG_ON(sizeof(param) != _IOC_SIZE(cmd)); \ ++ err = copy_from_user(¶m, uarg, sizeof(param)); \ ++ if (err) \ ++ return -EFAULT; \ ++ ret = function(arg, ¶m); \ ++ err = copy_to_user(uarg, ¶m, sizeof(param)); \ ++ if (err) \ ++ return -EFAULT; \ ++ dev_dbg(arg->kbdev->dev, "Return %d from ioctl %s\n", ret, \ ++ #function); \ ++ return ret; \ ++ } while (0) + -+/** -+ * kbase_debugfs_helper_seq_write - Implements writes to a virtual file for an -+ * array -+ * -+ * The virtual file must have been opened by calling single_open and passing -+ * the address of an object that can be accessed like an array. -+ * -+ * The given function is called once for each attribute value found in the -+ * data written to the virtual file. For further details, refer to the -+ * description of set_attr_from_string. -+ * -+ * @file: A virtual file previously opened by calling single_open. -+ * @ubuf: Source address in user space. -+ * @count: Number of bytes written to the virtual file. -+ * @nelems: Number of elements in the array. -+ * @set_attr_fn: Function to be called back for each array element. -+ * -+ * Return: 0 if success, negative error code otherwise. -+ */ -+int kbase_debugfs_helper_seq_write(struct file *const file, -+ const char __user *const ubuf, size_t const count, -+ size_t const nelems, -+ kbase_debugfs_helper_set_attr_fn const set_attr_fn); ++static int kbasep_ioctl_set_limited_core_count(struct kbase_context *kctx, ++ struct kbase_ioctl_set_limited_core_count *set_limited_core_count) ++{ ++ const u64 shader_core_mask = ++ kbase_pm_get_present_cores(kctx->kbdev, KBASE_PM_CORE_SHADER); ++ const u64 limited_core_mask = ++ ((u64)1 << (set_limited_core_count->max_core_count)) - 1; + -+#endif /*_KBASE_DEBUGFS_HELPER_H_ */ ++ if ((shader_core_mask & limited_core_mask) == 0) { ++ /* At least one shader core must be available after applying the mask */ ++ return -EINVAL; ++ } + -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_defs.h -new file mode 100755 -index 000000000000..980cf09500ef ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_defs.h -@@ -0,0 +1,1807 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ ++ kctx->limited_core_mask = limited_core_mask; ++ return 0; ++} + ++static long kbase_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ++{ ++ struct kbase_file *const kfile = filp->private_data; ++ struct kbase_context *kctx = NULL; ++ struct kbase_device *kbdev = kfile->kbdev; ++ void __user *uarg = (void __user *)arg; + ++ /* Only these ioctls are available until setup is complete */ ++ switch (cmd) { ++ case KBASE_IOCTL_VERSION_CHECK: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_VERSION_CHECK, ++ kbase_api_handshake, ++ struct kbase_ioctl_version_check, ++ kfile); ++ break; + -+/** -+ * @file mali_kbase_defs.h -+ * -+ * Defintions (types, defines, etcs) common to Kbase. They are placed here to -+ * allow the hierarchy of header files to work. -+ */ ++ case KBASE_IOCTL_VERSION_CHECK_RESERVED: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_VERSION_CHECK_RESERVED, ++ kbase_api_handshake_dummy, ++ struct kbase_ioctl_version_check, ++ kfile); ++ break; + -+#ifndef _KBASE_DEFS_H_ -+#define _KBASE_DEFS_H_ ++ case KBASE_IOCTL_SET_FLAGS: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_SET_FLAGS, ++ kbase_api_set_flags, ++ struct kbase_ioctl_set_flags, ++ kfile); ++ break; + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++ case KBASE_IOCTL_KINSTR_PRFCNT_ENUM_INFO: ++ KBASE_HANDLE_IOCTL_INOUT( ++ KBASE_IOCTL_KINSTR_PRFCNT_ENUM_INFO, ++ kbase_api_kinstr_prfcnt_enum_info, ++ struct kbase_ioctl_kinstr_prfcnt_enum_info, kfile); ++ break; + -+#include -+#include -+#include -+#include -+#include ++ case KBASE_IOCTL_KINSTR_PRFCNT_SETUP: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_KINSTR_PRFCNT_SETUP, ++ kbase_api_kinstr_prfcnt_setup, ++ union kbase_ioctl_kinstr_prfcnt_setup, ++ kfile); ++ break; ++ case KBASE_IOCTL_GET_GPUPROPS: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_GET_GPUPROPS, kbase_api_get_gpuprops, ++ struct kbase_ioctl_get_gpuprops, kfile); ++ break; ++ } + -+#ifdef CONFIG_MALI_BUSLOG -+#include ++ kctx = kbase_file_get_kctx_if_setup_complete(kfile); ++ if (unlikely(!kctx)) ++ return -EPERM; ++ ++ /* Normal ioctls */ ++ switch (cmd) { ++#if !MALI_USE_CSF ++ case KBASE_IOCTL_JOB_SUBMIT: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_JOB_SUBMIT, ++ kbase_api_job_submit, ++ struct kbase_ioctl_job_submit, ++ kctx); ++ break; ++#endif /* !MALI_USE_CSF */ ++#if !MALI_USE_CSF ++ case KBASE_IOCTL_POST_TERM: ++ KBASE_HANDLE_IOCTL(KBASE_IOCTL_POST_TERM, ++ kbase_api_post_term, ++ kctx); ++ break; ++#endif /* !MALI_USE_CSF */ ++ case KBASE_IOCTL_MEM_ALLOC: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_ALLOC, ++ kbase_api_mem_alloc, ++ union kbase_ioctl_mem_alloc, ++ kctx); ++ break; ++#if MALI_USE_CSF ++ case KBASE_IOCTL_MEM_ALLOC_EX: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_ALLOC_EX, kbase_api_mem_alloc_ex, ++ union kbase_ioctl_mem_alloc_ex, kctx); ++ break; +#endif ++ case KBASE_IOCTL_MEM_QUERY: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_QUERY, ++ kbase_api_mem_query, ++ union kbase_ioctl_mem_query, ++ kctx); ++ break; ++ case KBASE_IOCTL_MEM_FREE: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_FREE, ++ kbase_api_mem_free, ++ struct kbase_ioctl_mem_free, ++ kctx); ++ break; ++ case KBASE_IOCTL_DISJOINT_QUERY: ++ KBASE_HANDLE_IOCTL_OUT(KBASE_IOCTL_DISJOINT_QUERY, ++ kbase_api_disjoint_query, ++ struct kbase_ioctl_disjoint_query, ++ kctx); ++ break; ++ case KBASE_IOCTL_GET_DDK_VERSION: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_GET_DDK_VERSION, ++ kbase_api_get_ddk_version, ++ struct kbase_ioctl_get_ddk_version, ++ kctx); ++ break; ++ case KBASE_IOCTL_MEM_JIT_INIT: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_JIT_INIT, ++ kbase_api_mem_jit_init, ++ struct kbase_ioctl_mem_jit_init, ++ kctx); ++ break; ++ case KBASE_IOCTL_MEM_EXEC_INIT: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_EXEC_INIT, ++ kbase_api_mem_exec_init, ++ struct kbase_ioctl_mem_exec_init, ++ kctx); ++ break; ++ case KBASE_IOCTL_MEM_SYNC: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_SYNC, ++ kbase_api_mem_sync, ++ struct kbase_ioctl_mem_sync, ++ kctx); ++ break; ++ case KBASE_IOCTL_MEM_FIND_CPU_OFFSET: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_FIND_CPU_OFFSET, ++ kbase_api_mem_find_cpu_offset, ++ union kbase_ioctl_mem_find_cpu_offset, ++ kctx); ++ break; ++ case KBASE_IOCTL_MEM_FIND_GPU_START_AND_OFFSET: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_FIND_GPU_START_AND_OFFSET, ++ kbase_api_mem_find_gpu_start_and_offset, ++ union kbase_ioctl_mem_find_gpu_start_and_offset, ++ kctx); ++ break; ++ case KBASE_IOCTL_GET_CONTEXT_ID: ++ KBASE_HANDLE_IOCTL_OUT(KBASE_IOCTL_GET_CONTEXT_ID, ++ kbase_api_get_context_id, ++ struct kbase_ioctl_get_context_id, ++ kctx); ++ break; ++ case KBASE_IOCTL_TLSTREAM_ACQUIRE: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_TLSTREAM_ACQUIRE, ++ kbase_api_tlstream_acquire, ++ struct kbase_ioctl_tlstream_acquire, ++ kctx); ++ break; ++ case KBASE_IOCTL_TLSTREAM_FLUSH: ++ KBASE_HANDLE_IOCTL(KBASE_IOCTL_TLSTREAM_FLUSH, ++ kbase_api_tlstream_flush, ++ kctx); ++ break; ++ case KBASE_IOCTL_MEM_COMMIT: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_COMMIT, ++ kbase_api_mem_commit, ++ struct kbase_ioctl_mem_commit, ++ kctx); ++ break; ++ case KBASE_IOCTL_MEM_ALIAS: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_ALIAS, ++ kbase_api_mem_alias, ++ union kbase_ioctl_mem_alias, ++ kctx); ++ break; ++ case KBASE_IOCTL_MEM_IMPORT: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_IMPORT, ++ kbase_api_mem_import, ++ union kbase_ioctl_mem_import, ++ kctx); ++ break; ++ case KBASE_IOCTL_MEM_FLAGS_CHANGE: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_FLAGS_CHANGE, ++ kbase_api_mem_flags_change, ++ struct kbase_ioctl_mem_flags_change, ++ kctx); ++ break; ++ case KBASE_IOCTL_STREAM_CREATE: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_STREAM_CREATE, ++ kbase_api_stream_create, ++ struct kbase_ioctl_stream_create, ++ kctx); ++ break; ++ case KBASE_IOCTL_FENCE_VALIDATE: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_FENCE_VALIDATE, ++ kbase_api_fence_validate, ++ struct kbase_ioctl_fence_validate, ++ kctx); ++ break; ++ case KBASE_IOCTL_MEM_PROFILE_ADD: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_PROFILE_ADD, ++ kbase_api_mem_profile_add, ++ struct kbase_ioctl_mem_profile_add, ++ kctx); ++ break; + -+#if defined(CONFIG_SYNC) -+#include -+#else -+#include "mali_kbase_fence_defs.h" ++#if !MALI_USE_CSF ++ case KBASE_IOCTL_SOFT_EVENT_UPDATE: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_SOFT_EVENT_UPDATE, ++ kbase_api_soft_event_update, ++ struct kbase_ioctl_soft_event_update, ++ kctx); ++ break; ++#endif /* !MALI_USE_CSF */ ++ ++ case KBASE_IOCTL_STICKY_RESOURCE_MAP: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_STICKY_RESOURCE_MAP, ++ kbase_api_sticky_resource_map, ++ struct kbase_ioctl_sticky_resource_map, ++ kctx); ++ break; ++ case KBASE_IOCTL_STICKY_RESOURCE_UNMAP: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_STICKY_RESOURCE_UNMAP, ++ kbase_api_sticky_resource_unmap, ++ struct kbase_ioctl_sticky_resource_unmap, ++ kctx); ++ break; ++ ++ /* Instrumentation. */ ++#if !MALI_USE_CSF ++ case KBASE_IOCTL_KINSTR_JM_FD: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_KINSTR_JM_FD, ++ kbase_api_kinstr_jm_fd, ++ union kbase_kinstr_jm_fd, ++ kctx); ++ break; ++#endif ++ case KBASE_IOCTL_HWCNT_READER_SETUP: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_HWCNT_READER_SETUP, ++ kbase_api_hwcnt_reader_setup, ++ struct kbase_ioctl_hwcnt_reader_setup, ++ kctx); ++ break; ++ case KBASE_IOCTL_GET_CPU_GPU_TIMEINFO: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_GET_CPU_GPU_TIMEINFO, ++ kbase_api_get_cpu_gpu_timeinfo, ++ union kbase_ioctl_get_cpu_gpu_timeinfo, ++ kctx); ++ break; ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ case KBASE_IOCTL_HWCNT_SET: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_HWCNT_SET, ++ kbase_api_hwcnt_set, ++ struct kbase_ioctl_hwcnt_values, ++ kctx); ++ break; ++#endif /* CONFIG_MALI_BIFROST_NO_MALI */ ++#ifdef CONFIG_MALI_CINSTR_GWT ++ case KBASE_IOCTL_CINSTR_GWT_START: ++ KBASE_HANDLE_IOCTL(KBASE_IOCTL_CINSTR_GWT_START, ++ kbase_gpu_gwt_start, ++ kctx); ++ break; ++ case KBASE_IOCTL_CINSTR_GWT_STOP: ++ KBASE_HANDLE_IOCTL(KBASE_IOCTL_CINSTR_GWT_STOP, ++ kbase_gpu_gwt_stop, ++ kctx); ++ break; ++ case KBASE_IOCTL_CINSTR_GWT_DUMP: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_CINSTR_GWT_DUMP, ++ kbase_gpu_gwt_dump, ++ union kbase_ioctl_cinstr_gwt_dump, ++ kctx); ++ break; +#endif ++#if MALI_USE_CSF ++ case KBASE_IOCTL_CS_EVENT_SIGNAL: ++ KBASE_HANDLE_IOCTL(KBASE_IOCTL_CS_EVENT_SIGNAL, ++ kbasep_cs_event_signal, ++ kctx); ++ break; ++ case KBASE_IOCTL_CS_QUEUE_REGISTER: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_CS_QUEUE_REGISTER, ++ kbasep_cs_queue_register, ++ struct kbase_ioctl_cs_queue_register, ++ kctx); ++ break; ++ case KBASE_IOCTL_CS_QUEUE_REGISTER_EX: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_CS_QUEUE_REGISTER_EX, ++ kbasep_cs_queue_register_ex, ++ struct kbase_ioctl_cs_queue_register_ex, ++ kctx); ++ break; ++ case KBASE_IOCTL_CS_QUEUE_TERMINATE: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_CS_QUEUE_TERMINATE, ++ kbasep_cs_queue_terminate, ++ struct kbase_ioctl_cs_queue_terminate, ++ kctx); ++ break; ++ case KBASE_IOCTL_CS_QUEUE_BIND: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_CS_QUEUE_BIND, ++ kbasep_cs_queue_bind, ++ union kbase_ioctl_cs_queue_bind, ++ kctx); ++ break; ++ case KBASE_IOCTL_CS_QUEUE_KICK: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_CS_QUEUE_KICK, ++ kbasep_cs_queue_kick, ++ struct kbase_ioctl_cs_queue_kick, ++ kctx); ++ break; ++ case KBASE_IOCTL_CS_QUEUE_GROUP_CREATE_1_6: ++ KBASE_HANDLE_IOCTL_INOUT( ++ KBASE_IOCTL_CS_QUEUE_GROUP_CREATE_1_6, ++ kbasep_cs_queue_group_create_1_6, ++ union kbase_ioctl_cs_queue_group_create_1_6, kctx); ++ break; ++ case KBASE_IOCTL_CS_QUEUE_GROUP_CREATE: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_CS_QUEUE_GROUP_CREATE, ++ kbasep_cs_queue_group_create, ++ union kbase_ioctl_cs_queue_group_create, ++ kctx); ++ break; ++ case KBASE_IOCTL_CS_QUEUE_GROUP_TERMINATE: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_CS_QUEUE_GROUP_TERMINATE, ++ kbasep_cs_queue_group_terminate, ++ struct kbase_ioctl_cs_queue_group_term, ++ kctx); ++ break; ++ case KBASE_IOCTL_KCPU_QUEUE_CREATE: ++ KBASE_HANDLE_IOCTL_OUT(KBASE_IOCTL_KCPU_QUEUE_CREATE, ++ kbasep_kcpu_queue_new, ++ struct kbase_ioctl_kcpu_queue_new, ++ kctx); ++ break; ++ case KBASE_IOCTL_KCPU_QUEUE_DELETE: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_KCPU_QUEUE_DELETE, ++ kbasep_kcpu_queue_delete, ++ struct kbase_ioctl_kcpu_queue_delete, ++ kctx); ++ break; ++ case KBASE_IOCTL_KCPU_QUEUE_ENQUEUE: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_KCPU_QUEUE_ENQUEUE, ++ kbasep_kcpu_queue_enqueue, ++ struct kbase_ioctl_kcpu_queue_enqueue, ++ kctx); ++ break; ++ case KBASE_IOCTL_CS_TILER_HEAP_INIT: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_CS_TILER_HEAP_INIT, ++ kbasep_cs_tiler_heap_init, ++ union kbase_ioctl_cs_tiler_heap_init, ++ kctx); ++ break; ++ case KBASE_IOCTL_CS_TILER_HEAP_INIT_1_13: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_CS_TILER_HEAP_INIT_1_13, ++ kbasep_cs_tiler_heap_init_1_13, ++ union kbase_ioctl_cs_tiler_heap_init_1_13, kctx); ++ break; ++ case KBASE_IOCTL_CS_TILER_HEAP_TERM: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_CS_TILER_HEAP_TERM, ++ kbasep_cs_tiler_heap_term, ++ struct kbase_ioctl_cs_tiler_heap_term, ++ kctx); ++ break; ++ case KBASE_IOCTL_CS_GET_GLB_IFACE: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_CS_GET_GLB_IFACE, ++ kbase_ioctl_cs_get_glb_iface, ++ union kbase_ioctl_cs_get_glb_iface, ++ kctx); ++ break; ++ case KBASE_IOCTL_CS_CPU_QUEUE_DUMP: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_CS_CPU_QUEUE_DUMP, ++ kbasep_ioctl_cs_cpu_queue_dump, ++ struct kbase_ioctl_cs_cpu_queue_info, ++ kctx); ++ break; ++ /* This IOCTL will be kept for backward compatibility */ ++ case KBASE_IOCTL_READ_USER_PAGE: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_READ_USER_PAGE, kbase_ioctl_read_user_page, ++ union kbase_ioctl_read_user_page, kctx); ++ break; ++#endif /* MALI_USE_CSF */ ++#if MALI_UNIT_TEST ++ case KBASE_IOCTL_TLSTREAM_STATS: ++ KBASE_HANDLE_IOCTL_OUT(KBASE_IOCTL_TLSTREAM_STATS, ++ kbase_api_tlstream_stats, ++ struct kbase_ioctl_tlstream_stats, ++ kctx); ++ break; ++#endif /* MALI_UNIT_TEST */ ++ case KBASE_IOCTL_CONTEXT_PRIORITY_CHECK: ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_CONTEXT_PRIORITY_CHECK, ++ kbasep_ioctl_context_priority_check, ++ struct kbase_ioctl_context_priority_check, ++ kctx); ++ break; ++ case KBASE_IOCTL_SET_LIMITED_CORE_COUNT: ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_SET_LIMITED_CORE_COUNT, ++ kbasep_ioctl_set_limited_core_count, ++ struct kbase_ioctl_set_limited_core_count, ++ kctx); ++ break; ++ } + -+#ifdef CONFIG_DEBUG_FS -+#include -+#endif /* CONFIG_DEBUG_FS */ ++ dev_warn(kbdev->dev, "Unknown ioctl 0x%x nr:%d", cmd, _IOC_NR(cmd)); + -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+#include -+#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ ++ return -ENOIOCTLCMD; ++} + -+#ifdef CONFIG_MALI_ARBITER_SUPPORT -+#include -+#endif /* CONFIG_MALI_ARBITER_SUPPORT */ ++#if MALI_USE_CSF ++static ssize_t kbase_read(struct file *filp, char __user *buf, size_t count, loff_t *f_pos) ++{ ++ struct kbase_file *const kfile = filp->private_data; ++ struct kbase_context *const kctx = ++ kbase_file_get_kctx_if_setup_complete(kfile); ++ struct base_csf_notification event_data = { ++ .type = BASE_CSF_NOTIFICATION_EVENT }; ++ const size_t data_size = sizeof(event_data); ++ bool read_event = false, read_error = false; + -+#include -+#include -+#include ++ if (unlikely(!kctx)) ++ return -EPERM; + -+#if defined(CONFIG_PM_RUNTIME) || \ -+ (defined(CONFIG_PM) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) -+#define KBASE_PM_RUNTIME 1 -+#endif ++ if (count < data_size) ++ return -ENOBUFS; + -+#include "debug/mali_kbase_debug_ktrace_defs.h" ++ if (atomic_read(&kctx->event_count)) ++ read_event = true; ++ else ++ read_error = kbase_csf_event_read_error(kctx, &event_data); + -+/** Number of milliseconds before we time out on a GPU soft/hard reset */ -+#define RESET_TIMEOUT 500 ++ if (!read_event && !read_error) { ++ bool dump = kbase_csf_cpu_queue_read_dump_req(kctx, ++ &event_data); ++ /* This condition is not treated as an error. ++ * It is possible that event handling thread was woken up due ++ * to a fault/error that occurred for a queue group, but before ++ * the corresponding fault data was read by the thread the ++ * queue group was already terminated by the userspace. ++ */ ++ if (!dump) ++ dev_dbg(kctx->kbdev->dev, ++ "Neither event nor error signaled"); ++ } + -+/** -+ * The maximum number of Job Slots to support in the Hardware. -+ * -+ * You can optimize this down if your target devices will only ever support a -+ * small number of job slots. -+ */ -+#define BASE_JM_MAX_NR_SLOTS 3 ++ if (copy_to_user(buf, &event_data, data_size) != 0) { ++ dev_warn(kctx->kbdev->dev, ++ "Failed to copy data\n"); ++ return -EFAULT; ++ } + -+/** -+ * The maximum number of Address Spaces to support in the Hardware. -+ * -+ * You can optimize this down if your target devices will only ever support a -+ * small number of Address Spaces -+ */ -+#define BASE_MAX_NR_AS 16 ++ if (read_event) ++ atomic_set(&kctx->event_count, 0); + -+/* mmu */ -+#define MIDGARD_MMU_LEVEL(x) (x) ++ return data_size; ++} ++#else /* MALI_USE_CSF */ ++static ssize_t kbase_read(struct file *filp, char __user *buf, size_t count, loff_t *f_pos) ++{ ++ struct kbase_file *const kfile = filp->private_data; ++ struct kbase_context *const kctx = ++ kbase_file_get_kctx_if_setup_complete(kfile); ++ struct base_jd_event_v2 uevent; ++ int out_count = 0; + -+#define MIDGARD_MMU_TOPLEVEL MIDGARD_MMU_LEVEL(0) ++ if (unlikely(!kctx)) ++ return -EPERM; + -+#define MIDGARD_MMU_BOTTOMLEVEL MIDGARD_MMU_LEVEL(3) ++ if (count < sizeof(uevent)) ++ return -ENOBUFS; + -+#define GROWABLE_FLAGS_REQUIRED (KBASE_REG_PF_GROW | KBASE_REG_GPU_WR) ++ memset(&uevent, 0, sizeof(uevent)); + -+/** setting in kbase_context::as_nr that indicates it's invalid */ -+#define KBASEP_AS_NR_INVALID (-1) ++ do { ++ while (kbase_event_dequeue(kctx, &uevent)) { ++ if (out_count > 0) ++ goto out; + -+/** -+ * Maximum size in bytes of a MMU lock region, as a logarithm -+ */ -+#define KBASE_LOCK_REGION_MAX_SIZE_LOG2 (64) ++ if (filp->f_flags & O_NONBLOCK) ++ return -EAGAIN; + -+/** -+ * Minimum size in bytes of a MMU lock region, as a logarithm -+ */ -+#define KBASE_LOCK_REGION_MIN_SIZE_LOG2 (15) ++ if (wait_event_interruptible(kctx->event_queue, ++ kbase_event_pending(kctx)) != 0) ++ return -ERESTARTSYS; ++ } ++ if (uevent.event_code == BASE_JD_EVENT_DRV_TERMINATED) { ++ if (out_count == 0) ++ return -EPIPE; ++ goto out; ++ } + -+#include "mali_kbase_hwaccess_defs.h" ++ if (copy_to_user(buf, &uevent, sizeof(uevent)) != 0) ++ return -EFAULT; + -+/* Maximum number of pages of memory that require a permanent mapping, per -+ * kbase_context -+ */ -+#define KBASE_PERMANENTLY_MAPPED_MEM_LIMIT_PAGES ((32 * 1024ul * 1024ul) >> \ -+ PAGE_SHIFT) -+/* Minimum threshold period for hwcnt dumps between different hwcnt virtualizer -+ * clients, to reduce undesired system load. -+ * If a virtualizer client requests a dump within this threshold period after -+ * some other client has performed a dump, a new dump won't be performed and -+ * the accumulated counter values for that client will be returned instead. -+ */ -+#define KBASE_HWCNT_GPU_VIRTUALIZER_DUMP_THRESHOLD_NS (200 * NSEC_PER_USEC) ++ buf += sizeof(uevent); ++ out_count++; ++ count -= sizeof(uevent); ++ } while (count >= sizeof(uevent)); + -+/* Maximum number of clock/regulator pairs that may be referenced by -+ * the device node. -+ * This is dependent on support for of_property_read_u64_array() in the -+ * kernel. -+ */ -+#if (KERNEL_VERSION(4, 0, 0) <= LINUX_VERSION_CODE) || \ -+ defined(LSK_OPPV2_BACKPORT) -+#define BASE_MAX_NR_CLOCKS_REGULATORS (2) -+#else -+#define BASE_MAX_NR_CLOCKS_REGULATORS (1) -+#endif ++ out: ++ return out_count * sizeof(uevent); ++} ++#endif /* MALI_USE_CSF */ + -+/* Forward declarations */ -+struct kbase_context; -+struct kbase_device; -+struct kbase_as; -+struct kbase_mmu_setup; -+struct kbase_ipa_model_vinstr_data; -+struct kbase_kinstr_jm; ++static __poll_t kbase_poll(struct file *filp, poll_table *wait) ++{ ++ struct kbase_file *const kfile = filp->private_data; ++ struct kbase_context *const kctx = ++ kbase_file_get_kctx_if_setup_complete(kfile); + -+/** -+ * struct kbase_io_access - holds information about 1 register access -+ * -+ * @addr: first bit indicates r/w (r=0, w=1) -+ * @value: value written or read -+ */ -+struct kbase_io_access { -+ uintptr_t addr; -+ u32 value; -+}; ++ if (unlikely(!kctx)) { ++#if (KERNEL_VERSION(4, 19, 0) > LINUX_VERSION_CODE) ++ return POLLERR; ++#else ++ return EPOLLERR; ++#endif ++ } + -+/** -+ * struct kbase_io_history - keeps track of all recent register accesses -+ * -+ * @enabled: true if register accesses are recorded, false otherwise -+ * @lock: spinlock protecting kbase_io_access array -+ * @count: number of registers read/written -+ * @size: number of elements in kbase_io_access array -+ * @buf: array of kbase_io_access -+ */ -+struct kbase_io_history { -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) -+ bool enabled; ++ poll_wait(filp, &kctx->event_queue, wait); ++ if (kbase_event_pending(kctx)) { ++#if (KERNEL_VERSION(4, 19, 0) > LINUX_VERSION_CODE) ++ return POLLIN | POLLRDNORM; +#else -+ u32 enabled; ++ return EPOLLIN | EPOLLRDNORM; +#endif ++ } + -+ spinlock_t lock; -+ size_t count; -+ u16 size; -+ struct kbase_io_access *buf; -+}; ++ return 0; ++} + -+/** -+ * struct kbase_debug_copy_buffer - information about the buffer to be copied. -+ * -+ * @size: size of the buffer in bytes -+ * @pages: pointer to an array of pointers to the pages which contain -+ * the buffer -+ * @is_vmalloc: true if @pages was allocated with vzalloc. false if @pages was -+ * allocated with kcalloc -+ * @nr_pages: number of pages -+ * @offset: offset into the pages -+ * @gpu_alloc: pointer to physical memory allocated by the GPU -+ * @extres_pages: array of pointers to the pages containing external resources -+ * for this buffer -+ * @nr_extres_pages: number of pages in @extres_pages -+ */ -+struct kbase_debug_copy_buffer { -+ size_t size; -+ struct page **pages; -+ bool is_vmalloc; -+ int nr_pages; -+ size_t offset; -+ struct kbase_mem_phy_alloc *gpu_alloc; ++void kbase_event_wakeup(struct kbase_context *kctx) ++{ ++ KBASE_DEBUG_ASSERT(kctx); ++ dev_dbg(kctx->kbdev->dev, "Waking event queue for context %pK\n", ++ (void *)kctx); ++ wake_up_interruptible(&kctx->event_queue); ++} + -+ struct page **extres_pages; -+ int nr_extres_pages; -+}; ++KBASE_EXPORT_TEST_API(kbase_event_wakeup); + -+struct kbase_device_info { -+ u32 features; -+}; ++#if MALI_USE_CSF ++int kbase_event_pending(struct kbase_context *ctx) ++{ ++ KBASE_DEBUG_ASSERT(ctx); + -+struct kbase_mmu_setup { -+ u64 transtab; -+ u64 memattr; -+ u64 transcfg; -+}; ++ if (unlikely(!ctx)) ++ return -EPERM; + -+/** -+ * struct kbase_fault - object containing data relating to a page or bus fault. -+ * @addr: Records the faulting address. -+ * @extra_addr: Records the secondary fault address. -+ * @status: Records the fault status as reported by Hw. -+ * @protected_mode: Flag indicating whether the fault occurred in protected mode -+ * or not. -+ */ -+struct kbase_fault { -+ u64 addr; -+ u64 extra_addr; -+ u32 status; -+ bool protected_mode; -+}; ++ return (atomic_read(&ctx->event_count) != 0) || ++ kbase_csf_event_error_pending(ctx) || ++ kbase_csf_cpu_queue_dump_needed(ctx); ++} ++#else ++int kbase_event_pending(struct kbase_context *ctx) ++{ ++ KBASE_DEBUG_ASSERT(ctx); + -+/** -+ * struct kbase_mmu_table - object representing a set of GPU page tables -+ * @mmu_teardown_pages: Buffer of 4 Pages in size, used to cache the entries -+ * of top & intermediate level page tables to avoid -+ * repeated calls to kmap_atomic during the MMU teardown. -+ * @mmu_lock: Lock to serialize the accesses made to multi level GPU -+ * page tables -+ * @pgd: Physical address of the page allocated for the top -+ * level page table of the context, this is used for -+ * MMU HW programming as the address translation will -+ * start from the top level page table. -+ * @group_id: A memory group ID to be passed to a platform-specific -+ * memory group manager. -+ * Valid range is 0..(MEMORY_GROUP_MANAGER_NR_GROUPS-1). -+ * @kctx: If this set of MMU tables belongs to a context then -+ * this is a back-reference to the context, otherwise -+ * it is NULL -+ */ -+struct kbase_mmu_table { -+ u64 *mmu_teardown_pages; -+ struct mutex mmu_lock; -+ phys_addr_t pgd; -+ u8 group_id; -+ struct kbase_context *kctx; -+}; ++ if (unlikely(!ctx)) ++ return -EPERM; + -+#if MALI_USE_CSF -+#include "csf/mali_kbase_csf_defs.h" -+#else -+#include "jm/mali_kbase_jm_defs.h" ++ return (atomic_read(&ctx->event_count) != 0) || ++ (atomic_read(&ctx->event_closed) != 0); ++} +#endif + -+static inline int kbase_as_has_bus_fault(struct kbase_as *as, -+ struct kbase_fault *fault) ++KBASE_EXPORT_TEST_API(kbase_event_pending); ++ ++static int kbase_mmap(struct file *const filp, struct vm_area_struct *const vma) +{ -+ return (fault == &as->bf_data); ++ struct kbase_file *const kfile = filp->private_data; ++ struct kbase_context *const kctx = ++ kbase_file_get_kctx_if_setup_complete(kfile); ++ ++ if (unlikely(!kctx)) ++ return -EPERM; ++ ++ return kbase_context_mmap(kctx, vma); +} + -+static inline int kbase_as_has_page_fault(struct kbase_as *as, -+ struct kbase_fault *fault) ++static int kbase_check_flags(int flags) +{ -+ return (fault == &as->pf_data); ++ /* Enforce that the driver keeps the O_CLOEXEC flag so that execve() always ++ * closes the file descriptor in a child process. ++ */ ++ if (0 == (flags & O_CLOEXEC)) ++ return -EINVAL; ++ ++ return 0; +} + -+/** -+ * struct kbasep_mem_device - Data stored per device for memory allocation -+ * -+ * @used_pages: Tracks usage of OS shared memory. Updated when OS memory is -+ * allocated/freed. -+ * @ir_threshold: Fraction of the maximum size of an allocation that grows -+ * on GPU page fault that can be used before the driver -+ * switches to incremental rendering, in 1/256ths. -+ * 0 means disabled. -+ */ -+struct kbasep_mem_device { -+ atomic_t used_pages; -+ atomic_t ir_threshold; -+}; ++static unsigned long kbase_get_unmapped_area(struct file *const filp, ++ const unsigned long addr, const unsigned long len, ++ const unsigned long pgoff, const unsigned long flags) ++{ ++ struct kbase_file *const kfile = filp->private_data; ++ struct kbase_context *const kctx = ++ kbase_file_get_kctx_if_setup_complete(kfile); + -+struct kbase_clk_rate_listener; ++ if (unlikely(!kctx)) ++ return -EPERM; + -+/** -+ * kbase_clk_rate_listener_on_change_t() - Frequency change callback -+ * -+ * @listener: Clock frequency change listener. -+ * @clk_index: Index of the clock for which the change has occurred. -+ * @clk_rate_hz: Clock frequency(Hz). -+ * -+ * A callback to call when clock rate changes. The function must not -+ * sleep. No clock rate manager functions must be called from here, as -+ * its lock is taken. -+ */ -+typedef void (*kbase_clk_rate_listener_on_change_t)( -+ struct kbase_clk_rate_listener *listener, -+ u32 clk_index, -+ u32 clk_rate_hz); ++ return kbase_context_get_unmapped_area(kctx, addr, len, pgoff, flags); ++} + -+/** -+ * struct kbase_clk_rate_listener - Clock frequency listener -+ * -+ * @node: List node. -+ * @notify: Callback to be called when GPU frequency changes. -+ */ -+struct kbase_clk_rate_listener { -+ struct list_head node; -+ kbase_clk_rate_listener_on_change_t notify; ++static const struct file_operations kbase_fops = { ++ .owner = THIS_MODULE, ++ .open = kbase_open, ++ .release = kbase_release, ++ .read = kbase_read, ++ .poll = kbase_poll, ++ .unlocked_ioctl = kbase_ioctl, ++ .compat_ioctl = kbase_ioctl, ++ .mmap = kbase_mmap, ++ .check_flags = kbase_check_flags, ++ .get_unmapped_area = kbase_get_unmapped_area, +}; + +/** -+ * struct kbase_clk_rate_trace_manager - Data stored per device for GPU clock -+ * rate trace manager. ++ * power_policy_show - Show callback for the power_policy sysfs file. + * -+ * @gpu_idle: Tracks the idle state of GPU. -+ * @clks: Array of pointer to structures storing data for every -+ * enumerated GPU clock. -+ * @clk_rate_trace_ops: Pointer to the platform specific GPU clock rate trace -+ * operations. -+ * @gpu_clk_rate_trace_write: Pointer to the function that would emit the -+ * tracepoint for the clock rate change. -+ * @listeners: List of listener attached. -+ * @lock: Lock to serialize the actions of GPU clock rate trace -+ * manager. -+ */ -+struct kbase_clk_rate_trace_manager { -+ bool gpu_idle; -+ struct kbase_clk_data *clks[BASE_MAX_NR_CLOCKS_REGULATORS]; -+ struct kbase_clk_rate_trace_op_conf *clk_rate_trace_ops; -+ struct list_head listeners; -+ spinlock_t lock; -+}; -+ -+/** -+ * Data stored per device for power management. ++ * @dev: The device this sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The output buffer for the sysfs file contents + * -+ * This structure contains data for the power management framework. There is one -+ * instance of this structure per device in the system. ++ * This function is called to get the contents of the power_policy sysfs ++ * file. This is a list of the available policies with the currently active one ++ * surrounded by square brackets. ++ * ++ * Return: The number of bytes output to @buf. + */ -+struct kbase_pm_device_data { -+ /** -+ * The lock protecting Power Management structures accessed outside of -+ * IRQ. -+ * -+ * This lock must also be held whenever the GPU is being powered on or -+ * off. -+ */ -+ struct mutex lock; -+ -+ /** -+ * The reference count of active contexts on this device. Note that -+ * some code paths keep shaders/the tiler powered whilst this is 0. Use -+ * kbase_pm_is_active() instead to check for such cases. -+ */ -+ int active_count; -+ /** Flag indicating suspending/suspended */ -+ bool suspending; -+#ifdef CONFIG_MALI_ARBITER_SUPPORT -+ /* Flag indicating gpu lost */ -+ atomic_t gpu_lost; -+#endif /* CONFIG_MALI_ARBITER_SUPPORT */ -+ /* Wait queue set when active_count == 0 */ -+ wait_queue_head_t zero_active_count_wait; ++static ssize_t power_policy_show(struct device *dev, struct device_attribute *attr, char *const buf) ++{ ++ struct kbase_device *kbdev; ++ const struct kbase_pm_policy *current_policy; ++ const struct kbase_pm_policy *const *policy_list; ++ int policy_count; ++ int i; ++ ssize_t ret = 0; + -+ /** -+ * Bit masks identifying the available shader cores that are specified -+ * via sysfs. One mask per job slot. -+ */ -+ u64 debug_core_mask[BASE_JM_MAX_NR_SLOTS]; -+ u64 debug_core_mask_all; ++ kbdev = to_kbase_device(dev); + -+ /** -+ * Callback for initializing the runtime power management. -+ * -+ * @param kbdev The kbase device -+ * -+ * @return 0 on success, else error code -+ */ -+ int (*callback_power_runtime_init)(struct kbase_device *kbdev); ++ if (!kbdev) ++ return -ENODEV; + -+ /** -+ * Callback for terminating the runtime power management. -+ * -+ * @param kbdev The kbase device -+ */ -+ void (*callback_power_runtime_term)(struct kbase_device *kbdev); ++ current_policy = kbase_pm_get_policy(kbdev); + -+ /* Time in milliseconds between each dvfs sample */ -+ u32 dvfs_period; ++ policy_count = kbase_pm_list_policies(kbdev, &policy_list); + -+ struct kbase_pm_backend_data backend; ++ for (i = 0; i < policy_count && ret < PAGE_SIZE; i++) { ++ if (policy_list[i] == current_policy) ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "[%s] ", policy_list[i]->name); ++ else ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s ", policy_list[i]->name); ++ } + -+#ifdef CONFIG_MALI_ARBITER_SUPPORT -+ /** -+ * The state of the arbiter VM machine -+ */ -+ struct kbase_arbiter_vm_state *arb_vm_state; -+#endif /* CONFIG_MALI_ARBITER_SUPPORT */ ++ if (ret < PAGE_SIZE - 1) { ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "\n"); ++ } else { ++ buf[PAGE_SIZE - 2] = '\n'; ++ buf[PAGE_SIZE - 1] = '\0'; ++ ret = PAGE_SIZE - 1; ++ } + -+ /** -+ * The state of the GPU clock rate trace manager -+ */ -+ struct kbase_clk_rate_trace_manager clk_rtm; -+}; ++ return ret; ++} + +/** -+ * struct kbase_mem_pool - Page based memory pool for kctx/kbdev -+ * @kbdev: Kbase device where memory is used -+ * @cur_size: Number of free pages currently in the pool (may exceed -+ * @max_size in some corner cases) -+ * @max_size: Maximum number of free pages in the pool -+ * @order: order = 0 refers to a pool of 4 KB pages -+ * order = 9 refers to a pool of 2 MB pages (2^9 * 4KB = 2 MB) -+ * @group_id: A memory group ID to be passed to a platform-specific -+ * memory group manager, if present. Immutable. -+ * Valid range is 0..(MEMORY_GROUP_MANAGER_NR_GROUPS-1). -+ * @pool_lock: Lock protecting the pool - must be held when modifying -+ * @cur_size and @page_list -+ * @page_list: List of free pages in the pool -+ * @reclaim: Shrinker for kernel reclaim of free pages -+ * @next_pool: Pointer to next pool where pages can be allocated when this -+ * pool is empty. Pages will spill over to the next pool when -+ * this pool is full. Can be NULL if there is no next pool. -+ * @dying: true if the pool is being terminated, and any ongoing -+ * operations should be abandoned -+ * @dont_reclaim: true if the shrinker is forbidden from reclaiming memory from -+ * this pool, eg during a grow operation ++ * power_policy_store - Store callback for the power_policy sysfs file. ++ * ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes to write to the sysfs file ++ * ++ * This function is called when the power_policy sysfs file is written to. ++ * It matches the requested policy against the available policies and if a ++ * matching policy is found calls kbase_pm_set_policy() to change the ++ * policy. ++ * ++ * Return: @count if the function succeeded. An error code on failure. + */ -+struct kbase_mem_pool { ++static ssize_t power_policy_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) ++{ + struct kbase_device *kbdev; -+ size_t cur_size; -+ size_t max_size; -+ u8 order; -+ u8 group_id; -+ spinlock_t pool_lock; -+ struct list_head page_list; -+ struct shrinker reclaim; ++ const struct kbase_pm_policy *new_policy = NULL; ++ const struct kbase_pm_policy *const *policy_list; ++ int policy_count; ++ int i; + -+ struct kbase_mem_pool *next_pool; ++ kbdev = to_kbase_device(dev); + -+ bool dying; -+ bool dont_reclaim; -+}; ++ if (!kbdev) ++ return -ENODEV; + -+/** -+ * struct kbase_mem_pool_group - a complete set of physical memory pools. -+ * -+ * Memory pools are used to allow efficient reallocation of previously-freed -+ * physical pages. A pair of memory pools is initialized for each physical -+ * memory group: one for 4 KiB pages and one for 2 MiB pages. These arrays -+ * should be indexed by physical memory group ID, the meaning of which is -+ * defined by the systems integrator. -+ * -+ * @small: Array of objects containing the state for pools of 4 KiB size -+ * physical pages. -+ * @large: Array of objects containing the state for pools of 2 MiB size -+ * physical pages. -+ */ -+struct kbase_mem_pool_group { -+ struct kbase_mem_pool small[MEMORY_GROUP_MANAGER_NR_GROUPS]; -+ struct kbase_mem_pool large[MEMORY_GROUP_MANAGER_NR_GROUPS]; -+}; ++ policy_count = kbase_pm_list_policies(kbdev, &policy_list); + -+/** -+ * struct kbase_mem_pool_config - Initial configuration for a physical memory -+ * pool ++ for (i = 0; i < policy_count; i++) { ++ if (sysfs_streq(policy_list[i]->name, buf)) { ++ new_policy = policy_list[i]; ++ break; ++ } ++ } ++ ++ if (!new_policy) { ++ dev_err(dev, "power_policy: policy not found\n"); ++ return -EINVAL; ++ } ++ ++ kbase_pm_set_policy(kbdev, new_policy); ++ ++ return count; ++} ++ ++/* ++ * The sysfs file power_policy. + * -+ * @max_size: Maximum number of free pages that the pool can hold. ++ * This is used for obtaining information about the available policies, ++ * determining which policy is currently active, and changing the active ++ * policy. + */ -+struct kbase_mem_pool_config { -+ size_t max_size; -+}; ++static DEVICE_ATTR_RW(power_policy); + -+/** -+ * struct kbase_mem_pool_group_config - Initial configuration for a complete -+ * set of physical memory pools ++/* ++ * core_mask_show - Show callback for the core_mask sysfs file. + * -+ * This array should be indexed by physical memory group ID, the meaning -+ * of which is defined by the systems integrator. ++ * @dev: The device this sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The output buffer for the sysfs file contents + * -+ * @small: Array of initial configuration for pools of 4 KiB pages. -+ * @large: Array of initial configuration for pools of 2 MiB pages. ++ * This function is called to get the contents of the core_mask sysfs file. ++ * ++ * Return: The number of bytes output to @buf. + */ -+struct kbase_mem_pool_group_config { -+ struct kbase_mem_pool_config small[MEMORY_GROUP_MANAGER_NR_GROUPS]; -+ struct kbase_mem_pool_config large[MEMORY_GROUP_MANAGER_NR_GROUPS]; -+}; ++static ssize_t core_mask_show(struct device *dev, struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *kbdev; ++ unsigned long flags; ++ ssize_t ret = 0; + -+/** -+ * struct kbase_devfreq_opp - Lookup table for converting between nominal OPP -+ * frequency, real frequencies and core mask -+ * @real_freqs: Real GPU frequencies. -+ * @opp_volts: OPP voltages. -+ * @opp_freq: Nominal OPP frequency -+ * @core_mask: Shader core mask -+ */ -+struct kbase_devfreq_opp { -+ u64 opp_freq; -+ u64 core_mask; -+ u64 real_freqs[BASE_MAX_NR_CLOCKS_REGULATORS]; -+ u32 opp_volts[BASE_MAX_NR_CLOCKS_REGULATORS]; -+}; ++ kbdev = to_kbase_device(dev); + -+/* MMU mode flags */ -+#define KBASE_MMU_MODE_HAS_NON_CACHEABLE (1ul << 0) /* Has NON_CACHEABLE MEMATTR */ ++ if (!kbdev) ++ return -ENODEV; + -+/** -+ * struct kbase_mmu_mode - object containing pointer to methods invoked for -+ * programming the MMU, as per the MMU mode supported -+ * by Hw. -+ * @update: enable & setup/configure one of the GPU address space. -+ * @get_as_setup: retrieve the configuration of one of the GPU address space. -+ * @disable_as: disable one of the GPU address space. -+ * @pte_to_phy_addr: retrieve the physical address encoded in the page table entry. -+ * @ate_is_valid: check if the pte is a valid address translation entry -+ * encoding the physical address of the actual mapped page. -+ * @pte_is_valid: check if the pte is a valid entry encoding the physical -+ * address of the next lower level page table. -+ * @entry_set_ate: program the pte to be a valid address translation entry to -+ * encode the physical address of the actual page being mapped. -+ * @entry_set_pte: program the pte to be a valid entry to encode the physical -+ * address of the next lower level page table. -+ * @entry_invalidate: clear out or invalidate the pte. -+ * @flags: bitmask of MMU mode flags. Refer to KBASE_MMU_MODE_ constants. -+ */ -+struct kbase_mmu_mode { -+ void (*update)(struct kbase_device *kbdev, -+ struct kbase_mmu_table *mmut, -+ int as_nr); -+ void (*get_as_setup)(struct kbase_mmu_table *mmut, -+ struct kbase_mmu_setup * const setup); -+ void (*disable_as)(struct kbase_device *kbdev, int as_nr); -+ phys_addr_t (*pte_to_phy_addr)(u64 entry); -+ int (*ate_is_valid)(u64 ate, int level); -+ int (*pte_is_valid)(u64 pte, int level); -+ void (*entry_set_ate)(u64 *entry, struct tagged_addr phy, -+ unsigned long flags, int level); -+ void (*entry_set_pte)(u64 *entry, phys_addr_t phy); -+ void (*entry_invalidate)(u64 *entry); -+ unsigned long flags; -+}; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+struct kbase_mmu_mode const *kbase_mmu_mode_get_lpae(void); -+struct kbase_mmu_mode const *kbase_mmu_mode_get_aarch64(void); ++#if MALI_USE_CSF ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, ++ "Current debug core mask : 0x%llX\n", ++ kbdev->pm.debug_core_mask); ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, ++ "Current desired core mask : 0x%llX\n", ++ kbase_pm_ca_get_core_mask(kbdev)); ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, ++ "Current in use core mask : 0x%llX\n", ++ kbdev->pm.backend.shaders_avail); ++#else ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, ++ "Current core mask (JS0) : 0x%llX\n", ++ kbdev->pm.debug_core_mask[0]); ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, ++ "Current core mask (JS1) : 0x%llX\n", ++ kbdev->pm.debug_core_mask[1]); ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, ++ "Current core mask (JS2) : 0x%llX\n", ++ kbdev->pm.debug_core_mask[2]); ++#endif /* MALI_USE_CSF */ + -+#define DEVNAME_SIZE 16 ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, ++ "Available core mask : 0x%llX\n", ++ kbdev->gpu_props.props.raw_props.shader_present); + -+/** -+ * enum kbase_devfreq_work_type - The type of work to perform in the devfreq -+ * suspend/resume worker. -+ * @DEVFREQ_WORK_NONE: Initilisation state. -+ * @DEVFREQ_WORK_SUSPEND: Call devfreq_suspend_device(). -+ * @DEVFREQ_WORK_RESUME: Call devfreq_resume_device(). -+ */ -+enum kbase_devfreq_work_type { -+ DEVFREQ_WORK_NONE, -+ DEVFREQ_WORK_SUSPEND, -+ DEVFREQ_WORK_RESUME -+}; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+/** -+ * struct kbase_devfreq_queue_info - Object representing an instance for managing -+ * the queued devfreq suspend/resume works. -+ * @workq: Workqueue for devfreq suspend/resume requests -+ * @work: Work item for devfreq suspend & resume -+ * @req_type: Requested work type to be performed by the devfreq -+ * suspend/resume worker -+ * @acted_type: Work type has been acted on by the worker, i.e. the -+ * internal recorded state of the suspend/resume -+ */ -+struct kbase_devfreq_queue_info { -+ struct workqueue_struct *workq; -+ struct work_struct work; -+ enum kbase_devfreq_work_type req_type; -+ enum kbase_devfreq_work_type acted_type; -+}; ++ return ret; ++} + +/** -+ * struct kbase_process - Representing an object of a kbase process instantiated -+ * when the first kbase context is created under it. -+ * @tgid: Thread group ID. -+ * @total_gpu_pages: Total gpu pages allocated across all the contexts -+ * of this process, it accounts for both native allocations -+ * and dma_buf imported allocations. -+ * @kctx_list: List of kbase contexts created for the process. -+ * @kprcs_node: Node to a rb_tree, kbase_device will maintain a rb_tree -+ * based on key tgid, kprcs_node is the node link to -+ * &struct_kbase_device.process_root. -+ * @dma_buf_root: RB tree of the dma-buf imported allocations, imported -+ * across all the contexts created for this process. -+ * Used to ensure that pages of allocation are accounted -+ * only once for the process, even if the allocation gets -+ * imported multiple times for the process. ++ * core_mask_store - Store callback for the core_mask sysfs file. ++ * ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes to write to the sysfs file ++ * ++ * This function is called when the core_mask sysfs file is written to. ++ * ++ * Return: @count if the function succeeded. An error code on failure. + */ -+struct kbase_process { -+ pid_t tgid; -+ size_t total_gpu_pages; -+ struct list_head kctx_list; ++static ssize_t core_mask_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_device *kbdev; ++#if MALI_USE_CSF ++ u64 new_core_mask; ++#else ++ u64 new_core_mask[3]; ++ u64 group0_core_mask; ++ int i; ++#endif /* MALI_USE_CSF */ + -+ struct rb_node kprcs_node; -+ struct rb_root dma_buf_root; -+}; ++ int items; ++ ssize_t err = count; ++ unsigned long flags; ++ u64 shader_present; + -+/** -+ * struct kbase_device - Object representing an instance of GPU platform device, -+ * allocated from the probe method of mali driver. -+ * @hw_quirks_sc: Configuration to be used for the shader cores as per -+ * the HW issues present in the GPU. -+ * @hw_quirks_tiler: Configuration to be used for the Tiler as per the HW -+ * issues present in the GPU. -+ * @hw_quirks_mmu: Configuration to be used for the MMU as per the HW -+ * issues present in the GPU. -+ * @hw_quirks_jm: Configuration to be used for the Job Manager as per -+ * the HW issues present in the GPU. -+ * @entry: Links the device instance to the global list of GPU -+ * devices. The list would have as many entries as there -+ * are GPU device instances. -+ * @dev: Pointer to the kernel's generic/base representation -+ * of the GPU platform device. -+ * @mdev: Pointer to the miscellaneous device registered to -+ * provide Userspace access to kernel driver through the -+ * device file /dev/malixx. -+ * @reg_start: Base address of the region in physical address space -+ * where GPU registers have been mapped. -+ * @reg_size: Size of the region containing GPU registers -+ * @reg: Kernel virtual address of the region containing GPU -+ * registers, using which Driver will access the registers. -+ * @irqs: Array containing IRQ resource info for 3 types of -+ * interrupts : Job scheduling, MMU & GPU events (like -+ * power management, cache etc.) -+ * @clocks: Pointer to the input clock resources referenced by -+ * the GPU device node. -+ * @nr_clocks: Number of clocks set in the clocks array. -+ * @regulators: Pointer to the structs corresponding to the -+ * regulators referenced by the GPU device node. -+ * @nr_regulators: Number of regulators set in the regulators array. -+ * @opp_table: Pointer to the device OPP structure maintaining the -+ * link to OPPs attached to a device. This is obtained -+ * after setting regulator names for the device. -+ * @devname: string containing the name used for GPU device instance, -+ * miscellaneous device is registered using the same name. -+ * @id: Unique identifier for the device, indicates the number of -+ * devices which have been created so far. -+ * @model: Pointer, valid only when Driver is compiled to not access -+ * the real GPU Hw, to the dummy model which tries to mimic -+ * to some extent the state & behavior of GPU Hw in response -+ * to the register accesses made by the Driver. -+ * @irq_slab: slab cache for allocating the work items queued when -+ * model mimics raising of IRQ to cause an interrupt on CPU. -+ * @irq_workq: workqueue for processing the irq work items. -+ * @serving_job_irq: function to execute work items queued when model mimics -+ * the raising of JS irq, mimics the interrupt handler -+ * processing JS interrupts. -+ * @serving_gpu_irq: function to execute work items queued when model mimics -+ * the raising of GPU irq, mimics the interrupt handler -+ * processing GPU interrupts. -+ * @serving_mmu_irq: function to execute work items queued when model mimics -+ * the raising of MMU irq, mimics the interrupt handler -+ * processing MMU interrupts. -+ * @reg_op_lock: lock used by model to serialize the handling of register -+ * accesses made by the driver. -+ * @pm: Per device object for storing data for power management -+ * framework. -+ * @js_data: Per device object encapsulating the current context of -+ * Job Scheduler, which is global to the device and is not -+ * tied to any particular struct kbase_context running on -+ * the device -+ * @mem_pools: Global pools of free physical memory pages which can -+ * be used by all the contexts. -+ * @memdev: keeps track of the in use physical pages allocated by -+ * the Driver. -+ * @mmu_mode: Pointer to the object containing methods for programming -+ * the MMU, depending on the type of MMU supported by Hw. -+ * @mgm_dev: Pointer to the memory group manager device attached -+ * to the GPU device. This points to an internal memory -+ * group manager if no platform-specific memory group -+ * manager was retrieved through device tree. -+ * @as: Array of objects representing address spaces of GPU. -+ * @as_free: Bitpattern of free/available GPU address spaces. -+ * @as_to_kctx: Array of pointers to struct kbase_context, having -+ * GPU adrress spaces assigned to them. -+ * @mmu_mask_change: Lock to serialize the access to MMU interrupt mask -+ * register used in the handling of Bus & Page faults. -+ * @gpu_props: Object containing complete information about the -+ * configuration/properties of GPU HW device in use. -+ * @hw_issues_mask: List of SW workarounds for HW issues -+ * @hw_features_mask: List of available HW features. -+ * @disjoint_event: struct for keeping track of the disjoint information, -+ * that whether the GPU is in a disjoint state and the -+ * number of disjoint events that have occurred on GPU. -+ * @nr_hw_address_spaces: Number of address spaces actually available in the -+ * GPU, remains constant after driver initialisation. -+ * @nr_user_address_spaces: Number of address spaces available to user contexts -+ * @hwcnt: Structure used for instrumentation and HW counters -+ * dumping -+ * @hwcnt_gpu_iface: Backend interface for GPU hardware counter access. -+ * @hwcnt_gpu_ctx: Context for GPU hardware counter access. -+ * @hwaccess_lock must be held when calling -+ * kbase_hwcnt_context_enable() with @hwcnt_gpu_ctx. -+ * @hwcnt_gpu_virt: Virtualizer for GPU hardware counters. -+ * @vinstr_ctx: vinstr context created per device. -+ * @timeline_flags: Bitmask defining which sets of timeline tracepoints -+ * are enabled. If zero, there is no timeline client and -+ * therefore timeline is disabled. -+ * @timeline: Timeline context created per device. -+ * @trace_lock: Lock to serialize the access to trace buffer. -+ * @trace_first_out: Index/offset in the trace buffer at which the first -+ * unread message is present. -+ * @trace_next_in: Index/offset in the trace buffer at which the new -+ * message will be written. -+ * @trace_rbuf: Pointer to the buffer storing debug messages/prints -+ * tracing the various events in Driver. -+ * The buffer is filled in circular fashion. -+ * @reset_timeout_ms: Number of milliseconds to wait for the soft stop to -+ * complete for the GPU jobs before proceeding with the -+ * GPU reset. -+ * @cache_clean_in_progress: Set when a cache clean has been started, and -+ * cleared when it has finished. This prevents multiple -+ * cache cleans being done simultaneously. -+ * @cache_clean_queued: Set if a cache clean is invoked while another is in -+ * progress. If this happens, another cache clean needs -+ * to be triggered immediately after completion of the -+ * current one. -+ * @cache_clean_wait: Signalled when a cache clean has finished. -+ * @platform_context: Platform specific private data to be accessed by -+ * platform specific config files only. -+ * @kctx_list: List of kbase_contexts created for the device, -+ * including any contexts that might be created for -+ * hardware counters. -+ * @kctx_list_lock: Lock protecting concurrent accesses to @kctx_list. -+ * @devfreq_profile: Describes devfreq profile for the Mali GPU device, passed -+ * to devfreq_add_device() to add devfreq feature to Mali -+ * GPU device. -+ * @devfreq: Pointer to devfreq structure for Mali GPU device, -+ * returned on the call to devfreq_add_device(). -+ * @current_freqs: The real frequencies, corresponding to -+ * @current_nominal_freq, at which the Mali GPU device -+ * is currently operating, as retrieved from -+ * @devfreq_table in the target callback of -+ * @devfreq_profile. -+ * @current_nominal_freq: The nominal frequency currently used for the Mali GPU -+ * device as retrieved through devfreq_recommended_opp() -+ * using the freq value passed as an argument to target -+ * callback of @devfreq_profile -+ * @current_voltages: The voltages corresponding to @current_nominal_freq, -+ * as retrieved from @devfreq_table in the target -+ * callback of @devfreq_profile. -+ * @current_core_mask: bitmask of shader cores that are currently desired & -+ * enabled, corresponding to @current_nominal_freq as -+ * retrieved from @devfreq_table in the target callback -+ * of @devfreq_profile. -+ * @devfreq_table: Pointer to the lookup table for converting between -+ * nominal OPP (operating performance point) frequency, -+ * and real frequency and core mask. This table is -+ * constructed according to operating-points-v2-mali -+ * table in devicetree. -+ * @num_opps: Number of operating performance points available for the Mali -+ * GPU device. -+ * @devfreq_queue: Per device object for storing data that manages devfreq -+ * suspend & resume request queue and the related items. -+ * @devfreq_cooling: Pointer returned on registering devfreq cooling device -+ * corresponding to @devfreq. -+ * @ipa_protection_mode_switched: is set to TRUE when GPU is put into protected -+ * mode. It is a sticky flag which is cleared by IPA -+ * once it has made use of information that GPU had -+ * previously entered protected mode. -+ * @ipa: Top level structure for IPA, containing pointers to both -+ * configured & fallback models. -+ * @previous_frequency: Previous frequency of GPU clock used for -+ * BASE_HW_ISSUE_GPU2017_1336 workaround, This clock is -+ * restored when L2 is powered on. -+ * @job_fault_debug: Flag to control the dumping of debug data for job faults, -+ * set when the 'job_fault' debugfs file is opened. -+ * @mali_debugfs_directory: Root directory for the debugfs files created by the driver -+ * @debugfs_ctx_directory: Directory inside the @mali_debugfs_directory containing -+ * a sub-directory for every context. -+ * @debugfs_as_read_bitmap: bitmap of address spaces for which the bus or page fault -+ * has occurred. -+ * @job_fault_wq: Waitqueue to block the job fault dumping daemon till the -+ * occurrence of a job fault. -+ * @job_fault_resume_wq: Waitqueue on which every context with a faulty job wait -+ * for the job fault dumping to complete before they can -+ * do bottom half of job done for the atoms which followed -+ * the faulty atom. -+ * @job_fault_resume_workq: workqueue to process the work items queued for the faulty -+ * atoms, whereby the work item function waits for the dumping -+ * to get completed. -+ * @job_fault_event_list: List of atoms, each belonging to a different context, which -+ * generated a job fault. -+ * @job_fault_event_lock: Lock to protect concurrent accesses to @job_fault_event_list -+ * @regs_dump_debugfs_data: Contains the offset of register to be read through debugfs -+ * file "read_register". -+ * @ctx_num: Total number of contexts created for the device. -+ * @io_history: Pointer to an object keeping a track of all recent -+ * register accesses. The history of register accesses -+ * can be read through "regs_history" debugfs file. -+ * @hwaccess: Contains a pointer to active kbase context and GPU -+ * backend specific data for HW access layer. -+ * @faults_pending: Count of page/bus faults waiting for bottom half processing -+ * via workqueues. -+ * @poweroff_pending: Set when power off operation for GPU is started, reset when -+ * power on for GPU is started. -+ * @infinite_cache_active_default: Set to enable using infinite cache for all the -+ * allocations of a new context. -+ * @mem_pool_defaults: Default configuration for the group of memory pools -+ * created for a new context. -+ * @current_gpu_coherency_mode: coherency mode in use, which can be different -+ * from @system_coherency, when using protected mode. -+ * @system_coherency: coherency mode as retrieved from the device tree. -+ * @cci_snoop_enabled: Flag to track when CCI snoops have been enabled. -+ * @snoop_enable_smc: SMC function ID to call into Trusted firmware to -+ * enable cache snooping. Value of 0 indicates that it -+ * is not used. -+ * @snoop_disable_smc: SMC function ID to call disable cache snooping. -+ * @protected_ops: Pointer to the methods for switching in or out of the -+ * protected mode, as per the @protected_dev being used. -+ * @protected_dev: Pointer to the protected mode switcher device attached -+ * to the GPU device retrieved through device tree if -+ * GPU do not support protected mode switching natively. -+ * @protected_mode: set to TRUE when GPU is put into protected mode -+ * @protected_mode_transition: set to TRUE when GPU is transitioning into or -+ * out of protected mode. -+ * @protected_mode_hwcnt_desired: True if we want GPU hardware counters to be -+ * enabled. Counters must be disabled before transition -+ * into protected mode. -+ * @protected_mode_hwcnt_disabled: True if GPU hardware counters are not -+ * enabled. -+ * @protected_mode_hwcnt_disable_work: Work item to disable GPU hardware -+ * counters, used if atomic disable is not possible. -+ * @buslogger: Pointer to the structure required for interfacing -+ * with the bus logger module to set the size of buffer -+ * used by the module for capturing bus logs. -+ * @irq_reset_flush: Flag to indicate that GPU reset is in-flight and flush of -+ * IRQ + bottom half is being done, to prevent the writes -+ * to MMU_IRQ_CLEAR & MMU_IRQ_MASK registers. -+ * @inited_subsys: Bitmap of inited sub systems at the time of device probe. -+ * Used during device remove or for handling error in probe. -+ * @hwaccess_lock: Lock, which can be taken from IRQ context, to serialize -+ * the updates made to Job dispatcher + scheduler states. -+ * @mmu_hw_mutex: Protects access to MMU operations and address space -+ * related state. -+ * @serialize_jobs: Currently used mode for serialization of jobs, both -+ * intra & inter slots serialization is supported. -+ * @backup_serialize_jobs: Copy of the original value of @serialize_jobs taken -+ * when GWT is enabled. Used to restore the original value -+ * on disabling of GWT. -+ * @js_ctx_scheduling_mode: Context scheduling mode currently being used by -+ * Job Scheduler -+ * @l2_size_override: Used to set L2 cache size via device tree blob -+ * @l2_hash_override: Used to set L2 cache hash via device tree blob -+ * @process_root: rb_tree root node for maintaining a rb_tree of -+ * kbase_process based on key tgid(thread group ID). -+ * @dma_buf_root: rb_tree root node for maintaining a rb_tree of -+ * &struct kbase_dma_buf based on key dma_buf. -+ * We maintain a rb_tree of dma_buf mappings under -+ * kbase_device and kbase_process, one indicates a -+ * mapping and gpu memory usage at device level and -+ * other one at process level. -+ * @total_gpu_pages: Total GPU pages used for the complete GPU device. -+ * @dma_buf_lock: This mutex should be held while accounting for -+ * @total_gpu_pages from imported dma buffers. -+ * @gpu_mem_usage_lock: This spinlock should be held while accounting -+ * @total_gpu_pages for both native and dma-buf imported -+ * allocations. -+ */ -+struct kbase_device { -+ u32 hw_quirks_sc; -+ u32 hw_quirks_tiler; -+ u32 hw_quirks_mmu; -+ u32 hw_quirks_jm; ++ kbdev = to_kbase_device(dev); + -+ struct list_head entry; -+ struct device *dev; -+ struct miscdevice mdev; -+ u64 reg_start; -+ size_t reg_size; -+ void __iomem *reg; ++ if (!kbdev) ++ return -ENODEV; + -+ struct { -+ int irq; -+ int flags; -+ } irqs[3]; ++#if MALI_USE_CSF ++ items = sscanf(buf, "%llx", &new_core_mask); + -+ struct clk *clocks[BASE_MAX_NR_CLOCKS_REGULATORS]; -+ unsigned int nr_clocks; -+#ifdef CONFIG_REGULATOR -+ struct regulator *regulators[BASE_MAX_NR_CLOCKS_REGULATORS]; -+ unsigned int nr_regulators; -+#if (KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE) -+ struct opp_table *opp_table; -+#endif /* (KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE */ -+#endif /* CONFIG_REGULATOR */ -+ char devname[DEVNAME_SIZE]; -+ u32 id; ++ if (items != 1) { ++ dev_err(kbdev->dev, ++ "Couldn't process core mask write operation.\n" ++ "Use format \n"); ++ err = -EINVAL; ++ goto end; ++ } ++#else ++ items = sscanf(buf, "%llx %llx %llx", ++ &new_core_mask[0], &new_core_mask[1], ++ &new_core_mask[2]); + -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+ void *model; -+ struct kmem_cache *irq_slab; -+ struct workqueue_struct *irq_workq; -+ atomic_t serving_job_irq; -+ atomic_t serving_gpu_irq; -+ atomic_t serving_mmu_irq; -+ spinlock_t reg_op_lock; -+#endif /* CONFIG_MALI_BIFROST_NO_MALI */ ++ if (items != 1 && items != 3) { ++ dev_err(kbdev->dev, "Couldn't process core mask write operation.\n" ++ "Use format \n" ++ "or \n"); ++ err = -EINVAL; ++ goto end; ++ } + -+ struct kbase_pm_device_data pm; ++ if (items == 1) ++ new_core_mask[1] = new_core_mask[2] = new_core_mask[0]; ++#endif + -+ struct kbase_mem_pool_group mem_pools; -+ struct kbasep_mem_device memdev; -+ struct kbase_mmu_mode const *mmu_mode; ++ mutex_lock(&kbdev->pm.lock); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ struct memory_group_manager_device *mgm_dev; ++ shader_present = kbdev->gpu_props.props.raw_props.shader_present; + -+ struct kbase_as as[BASE_MAX_NR_AS]; -+ u16 as_free; /* Bitpattern of free Address Spaces */ -+ struct kbase_context *as_to_kctx[BASE_MAX_NR_AS]; ++#if MALI_USE_CSF ++ if ((new_core_mask & shader_present) != new_core_mask) { ++ dev_err(dev, ++ "Invalid core mask 0x%llX: Includes non-existent cores (present = 0x%llX)", ++ new_core_mask, shader_present); ++ err = -EINVAL; ++ goto unlock; + -+ spinlock_t mmu_mask_change; ++ } else if (!(new_core_mask & shader_present & ++ kbdev->pm.backend.ca_cores_enabled)) { ++ dev_err(dev, ++ "Invalid core mask 0x%llX: No intersection with currently available cores (present = 0x%llX, CA enabled = 0x%llX\n", ++ new_core_mask, ++ kbdev->gpu_props.props.raw_props.shader_present, ++ kbdev->pm.backend.ca_cores_enabled); ++ err = -EINVAL; ++ goto unlock; ++ } + -+ struct kbase_gpu_props gpu_props; ++ if (kbdev->pm.debug_core_mask != new_core_mask) ++ kbase_pm_set_debug_core_mask(kbdev, new_core_mask); ++#else ++ group0_core_mask = kbdev->gpu_props.props.coherency_info.group[0].core_mask; + -+ unsigned long hw_issues_mask[(BASE_HW_ISSUE_END + BITS_PER_LONG - 1) / BITS_PER_LONG]; -+ unsigned long hw_features_mask[(BASE_HW_FEATURE_END + BITS_PER_LONG - 1) / BITS_PER_LONG]; ++ for (i = 0; i < 3; ++i) { ++ if ((new_core_mask[i] & shader_present) != new_core_mask[i]) { ++ dev_err(dev, "Invalid core mask 0x%llX for JS %d: Includes non-existent cores (present = 0x%llX)", ++ new_core_mask[i], i, shader_present); ++ err = -EINVAL; ++ goto unlock; + -+ struct { -+ atomic_t count; -+ atomic_t state; -+ } disjoint_event; ++ } else if (!(new_core_mask[i] & shader_present & kbdev->pm.backend.ca_cores_enabled)) { ++ dev_err(dev, "Invalid core mask 0x%llX for JS %d: No intersection with currently available cores (present = 0x%llX, CA enabled = 0x%llX\n", ++ new_core_mask[i], i, ++ kbdev->gpu_props.props.raw_props.shader_present, ++ kbdev->pm.backend.ca_cores_enabled); ++ err = -EINVAL; ++ goto unlock; + -+ s8 nr_hw_address_spaces; -+ s8 nr_user_address_spaces; ++ } else if (!(new_core_mask[i] & group0_core_mask)) { ++ dev_err(dev, "Invalid core mask 0x%llX for JS %d: No intersection with group 0 core mask 0x%llX\n", ++ new_core_mask[i], i, group0_core_mask); ++ err = -EINVAL; ++ goto unlock; ++ } else if (!(new_core_mask[i] & kbdev->gpu_props.curr_config.shader_present)) { ++ dev_err(dev, "Invalid core mask 0x%llX for JS %d: No intersection with current core mask 0x%llX\n", ++ new_core_mask[i], i, kbdev->gpu_props.curr_config.shader_present); ++ err = -EINVAL; ++ goto unlock; ++ } ++ } + -+ struct kbase_hwcnt { -+ /* The lock should be used when accessing any of the following members */ -+ spinlock_t lock; ++ if (kbdev->pm.debug_core_mask[0] != new_core_mask[0] || ++ kbdev->pm.debug_core_mask[1] != ++ new_core_mask[1] || ++ kbdev->pm.debug_core_mask[2] != ++ new_core_mask[2]) { + -+ struct kbase_context *kctx; -+ u64 addr; -+ u64 addr_bytes; ++ kbase_pm_set_debug_core_mask(kbdev, new_core_mask[0], ++ new_core_mask[1], new_core_mask[2]); ++ } ++#endif /* MALI_USE_CSF */ + -+ struct kbase_instr_backend backend; -+ } hwcnt; ++unlock: ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->pm.lock); ++end: ++ return err; ++} + -+ struct kbase_hwcnt_backend_interface hwcnt_gpu_iface; -+ struct kbase_hwcnt_context *hwcnt_gpu_ctx; -+ struct kbase_hwcnt_virtualizer *hwcnt_gpu_virt; -+ struct kbase_vinstr_context *vinstr_ctx; ++/* ++ * The sysfs file core_mask. ++ * ++ * This is used to restrict shader core availability for debugging purposes. ++ * Reading it will show the current core mask and the mask of cores available. ++ * Writing to it will set the current core mask. ++ */ ++static DEVICE_ATTR_RW(core_mask); + -+ atomic_t timeline_flags; -+ struct kbase_timeline *timeline; ++#if !MALI_USE_CSF ++/** ++ * soft_job_timeout_store - Store callback for the soft_job_timeout sysfs ++ * file. ++ * ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The value written to the sysfs file. ++ * @count: The number of bytes to write to the sysfs file. ++ * ++ * This allows setting the timeout for software jobs. Waiting soft event wait ++ * jobs will be cancelled after this period expires, while soft fence wait jobs ++ * will print debug information if the fence debug feature is enabled. ++ * ++ * This is expressed in milliseconds. ++ * ++ * Return: count if the function succeeded. An error code on failure. ++ */ ++static ssize_t soft_job_timeout_store(struct device *dev, ++ struct device_attribute *attr, ++ const char *buf, size_t count) ++{ ++ struct kbase_device *kbdev; ++ int soft_job_timeout_ms; + -+#if KBASE_KTRACE_TARGET_RBUF -+ struct kbase_ktrace ktrace; -+#endif -+ u32 reset_timeout_ms; ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ bool cache_clean_in_progress; -+ bool cache_clean_queued; -+ wait_queue_head_t cache_clean_wait; ++ if ((kstrtoint(buf, 0, &soft_job_timeout_ms) != 0) || ++ (soft_job_timeout_ms <= 0)) ++ return -EINVAL; + -+ void *platform_context; ++ atomic_set(&kbdev->js_data.soft_job_timeout_ms, ++ soft_job_timeout_ms); + -+ struct list_head kctx_list; -+ struct mutex kctx_list_lock; ++ return count; ++} + -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+ struct devfreq_dev_profile devfreq_profile; -+ struct devfreq *devfreq; -+ unsigned long current_freqs[BASE_MAX_NR_CLOCKS_REGULATORS]; -+ unsigned long current_nominal_freq; -+ unsigned long current_voltages[BASE_MAX_NR_CLOCKS_REGULATORS]; -+ u64 current_core_mask; -+ struct kbase_devfreq_opp *devfreq_table; -+ int num_opps; -+ struct kbasep_pm_metrics last_devfreq_metrics; -+ struct monitor_dev_info *mdev_info; -+ struct ipa_power_model_data *model_data; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) -+ struct kbase_devfreq_queue_info devfreq_queue; -+#endif ++/** ++ * soft_job_timeout_show - Show callback for the soft_job_timeout sysfs ++ * file. ++ * ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer for the sysfs file contents. ++ * ++ * This will return the timeout for the software jobs. ++ * ++ * Return: The number of bytes output to buf. ++ */ ++static ssize_t soft_job_timeout_show(struct device *dev, ++ struct device_attribute *attr, ++ char * const buf) ++{ ++ struct kbase_device *kbdev; + -+#ifdef CONFIG_DEVFREQ_THERMAL -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) -+ struct devfreq_cooling_device *devfreq_cooling; -+#else -+ struct thermal_cooling_device *devfreq_cooling; -+#endif -+ bool ipa_protection_mode_switched; -+ struct { -+ /* Access to this struct must be with ipa.lock held */ -+ struct mutex lock; -+ struct kbase_ipa_model *configured_model; -+ struct kbase_ipa_model *fallback_model; ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ /* Values of the PM utilization metrics from last time the -+ * power model was invoked. The utilization is calculated as -+ * the difference between last_metrics and the current values. -+ */ -+ struct kbasep_pm_metrics last_metrics; -+ /* Model data to pass to ipa_gpu_active/idle() */ -+ struct kbase_ipa_model_vinstr_data *model_data; ++ return scnprintf(buf, PAGE_SIZE, "%i\n", ++ atomic_read(&kbdev->js_data.soft_job_timeout_ms)); ++} + -+ /* true if use of fallback model has been forced by the User */ -+ bool force_fallback_model; -+ } ipa; -+#endif /* CONFIG_DEVFREQ_THERMAL */ -+#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ -+ unsigned long previous_frequency; ++static DEVICE_ATTR_RW(soft_job_timeout); + -+ atomic_t job_fault_debug; ++static u32 timeout_ms_to_ticks(struct kbase_device *kbdev, long timeout_ms, ++ int default_ticks, u32 old_ticks) ++{ ++ if (timeout_ms > 0) { ++ u64 ticks = timeout_ms * 1000000ULL; + -+#ifdef CONFIG_DEBUG_FS -+ struct dentry *mali_debugfs_directory; -+ struct dentry *debugfs_ctx_directory; -+ struct dentry *debugfs_instr_directory; ++ do_div(ticks, kbdev->js_data.scheduling_period_ns); ++ if (!ticks) ++ return 1; ++ return ticks; ++ } else if (timeout_ms < 0) { ++ return default_ticks; ++ } else { ++ return old_ticks; ++ } ++} + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ u64 debugfs_as_read_bitmap; -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++/** ++ * js_timeouts_store - Store callback for the js_timeouts sysfs file. ++ * ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes to write to the sysfs file ++ * ++ * This function is called to get the contents of the js_timeouts sysfs ++ * file. This file contains five values separated by whitespace. The values ++ * are basically the same as %JS_SOFT_STOP_TICKS, %JS_HARD_STOP_TICKS_SS, ++ * %JS_HARD_STOP_TICKS_DUMPING, %JS_RESET_TICKS_SS, %JS_RESET_TICKS_DUMPING ++ * configuration values (in that order), with the difference that the js_timeout ++ * values are expressed in MILLISECONDS. ++ * ++ * The js_timeouts sysfile file allows the current values in ++ * use by the job scheduler to get override. Note that a value needs to ++ * be other than 0 for it to override the current job scheduler value. ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t js_timeouts_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_device *kbdev; ++ int items; ++ long js_soft_stop_ms; ++ long js_soft_stop_ms_cl; ++ long js_hard_stop_ms_ss; ++ long js_hard_stop_ms_cl; ++ long js_hard_stop_ms_dumping; ++ long js_reset_ms_ss; ++ long js_reset_ms_cl; ++ long js_reset_ms_dumping; + -+ wait_queue_head_t job_fault_wq; -+ wait_queue_head_t job_fault_resume_wq; -+ struct workqueue_struct *job_fault_resume_workq; -+ struct list_head job_fault_event_list; -+ spinlock_t job_fault_event_lock; ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+#if !MALI_CUSTOMER_RELEASE -+ struct { -+ u16 reg_offset; -+ } regs_dump_debugfs_data; -+#endif /* !MALI_CUSTOMER_RELEASE */ -+#endif /* CONFIG_DEBUG_FS */ ++ items = sscanf(buf, "%ld %ld %ld %ld %ld %ld %ld %ld", ++ &js_soft_stop_ms, &js_soft_stop_ms_cl, ++ &js_hard_stop_ms_ss, &js_hard_stop_ms_cl, ++ &js_hard_stop_ms_dumping, &js_reset_ms_ss, ++ &js_reset_ms_cl, &js_reset_ms_dumping); + -+ atomic_t ctx_num; ++ if (items == 8) { ++ struct kbasep_js_device_data *js_data = &kbdev->js_data; ++ unsigned long flags; + -+#ifdef CONFIG_DEBUG_FS -+ struct kbase_io_history io_history; -+#endif /* CONFIG_DEBUG_FS */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ struct kbase_hwaccess_data hwaccess; ++#define UPDATE_TIMEOUT(ticks_name, ms_name, default) do {\ ++ js_data->ticks_name = timeout_ms_to_ticks(kbdev, ms_name, \ ++ default, js_data->ticks_name); \ ++ dev_dbg(kbdev->dev, "Overriding " #ticks_name \ ++ " with %lu ticks (%lu ms)\n", \ ++ (unsigned long)js_data->ticks_name, \ ++ ms_name); \ ++ } while (0) + -+ atomic_t faults_pending; ++ UPDATE_TIMEOUT(soft_stop_ticks, js_soft_stop_ms, ++ DEFAULT_JS_SOFT_STOP_TICKS); ++ UPDATE_TIMEOUT(soft_stop_ticks_cl, js_soft_stop_ms_cl, ++ DEFAULT_JS_SOFT_STOP_TICKS_CL); ++ UPDATE_TIMEOUT(hard_stop_ticks_ss, js_hard_stop_ms_ss, ++ DEFAULT_JS_HARD_STOP_TICKS_SS); ++ UPDATE_TIMEOUT(hard_stop_ticks_cl, js_hard_stop_ms_cl, ++ DEFAULT_JS_HARD_STOP_TICKS_CL); ++ UPDATE_TIMEOUT(hard_stop_ticks_dumping, ++ js_hard_stop_ms_dumping, ++ DEFAULT_JS_HARD_STOP_TICKS_DUMPING); ++ UPDATE_TIMEOUT(gpu_reset_ticks_ss, js_reset_ms_ss, ++ DEFAULT_JS_RESET_TICKS_SS); ++ UPDATE_TIMEOUT(gpu_reset_ticks_cl, js_reset_ms_cl, ++ DEFAULT_JS_RESET_TICKS_CL); ++ UPDATE_TIMEOUT(gpu_reset_ticks_dumping, js_reset_ms_dumping, ++ DEFAULT_JS_RESET_TICKS_DUMPING); + -+ bool poweroff_pending; ++ kbase_js_set_timeouts(kbdev); + ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) -+ bool infinite_cache_active_default; -+#else -+ u32 infinite_cache_active_default; -+#endif -+ struct kbase_mem_pool_group_config mem_pool_defaults; ++ return count; ++ } + -+ u32 current_gpu_coherency_mode; -+ u32 system_coherency; ++ dev_err(kbdev->dev, "Couldn't process js_timeouts write operation.\n" ++ "Use format \n" ++ "Write 0 for no change, -1 to restore default timeout\n"); ++ return -EINVAL; ++} + -+ bool cci_snoop_enabled; ++static unsigned long get_js_timeout_in_ms( ++ u32 scheduling_period_ns, ++ u32 ticks) ++{ ++ u64 ms = (u64)ticks * scheduling_period_ns; + -+ u32 snoop_enable_smc; -+ u32 snoop_disable_smc; ++ do_div(ms, 1000000UL); ++ return ms; ++} + -+ const struct protected_mode_ops *protected_ops; ++/** ++ * js_timeouts_show - Show callback for the js_timeouts sysfs file. ++ * ++ * @dev: The device this sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The output buffer for the sysfs file contents ++ * ++ * This function is called to get the contents of the js_timeouts sysfs ++ * file. It returns the last set values written to the js_timeouts sysfs file. ++ * If the file didn't get written yet, the values will be current setting in ++ * use. ++ * ++ * Return: The number of bytes output to @buf. ++ */ ++static ssize_t js_timeouts_show(struct device *dev, struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *kbdev; ++ ssize_t ret; ++ unsigned long js_soft_stop_ms; ++ unsigned long js_soft_stop_ms_cl; ++ unsigned long js_hard_stop_ms_ss; ++ unsigned long js_hard_stop_ms_cl; ++ unsigned long js_hard_stop_ms_dumping; ++ unsigned long js_reset_ms_ss; ++ unsigned long js_reset_ms_cl; ++ unsigned long js_reset_ms_dumping; ++ u32 scheduling_period_ns; + -+ struct protected_mode_device *protected_dev; ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ bool protected_mode; ++ scheduling_period_ns = kbdev->js_data.scheduling_period_ns; + -+ bool protected_mode_transition; ++#define GET_TIMEOUT(name) get_js_timeout_in_ms(\ ++ scheduling_period_ns, \ ++ kbdev->js_data.name) + -+ bool protected_mode_hwcnt_desired; ++ js_soft_stop_ms = GET_TIMEOUT(soft_stop_ticks); ++ js_soft_stop_ms_cl = GET_TIMEOUT(soft_stop_ticks_cl); ++ js_hard_stop_ms_ss = GET_TIMEOUT(hard_stop_ticks_ss); ++ js_hard_stop_ms_cl = GET_TIMEOUT(hard_stop_ticks_cl); ++ js_hard_stop_ms_dumping = GET_TIMEOUT(hard_stop_ticks_dumping); ++ js_reset_ms_ss = GET_TIMEOUT(gpu_reset_ticks_ss); ++ js_reset_ms_cl = GET_TIMEOUT(gpu_reset_ticks_cl); ++ js_reset_ms_dumping = GET_TIMEOUT(gpu_reset_ticks_dumping); + -+ bool protected_mode_hwcnt_disabled; ++#undef GET_TIMEOUT + -+ struct work_struct protected_mode_hwcnt_disable_work; ++ ret = scnprintf(buf, PAGE_SIZE, "%lu %lu %lu %lu %lu %lu %lu %lu\n", ++ js_soft_stop_ms, js_soft_stop_ms_cl, ++ js_hard_stop_ms_ss, js_hard_stop_ms_cl, ++ js_hard_stop_ms_dumping, js_reset_ms_ss, ++ js_reset_ms_cl, js_reset_ms_dumping); + -+#ifdef CONFIG_MALI_BUSLOG -+ struct bus_logger_client *buslogger; -+#endif ++ if (ret >= PAGE_SIZE) { ++ buf[PAGE_SIZE - 2] = '\n'; ++ buf[PAGE_SIZE - 1] = '\0'; ++ ret = PAGE_SIZE - 1; ++ } + -+ bool irq_reset_flush; ++ return ret; ++} + -+ u32 inited_subsys; ++/* ++ * The sysfs file js_timeouts. ++ * ++ * This is used to override the current job scheduler values for ++ * JS_STOP_STOP_TICKS_SS ++ * JS_STOP_STOP_TICKS_CL ++ * JS_HARD_STOP_TICKS_SS ++ * JS_HARD_STOP_TICKS_CL ++ * JS_HARD_STOP_TICKS_DUMPING ++ * JS_RESET_TICKS_SS ++ * JS_RESET_TICKS_CL ++ * JS_RESET_TICKS_DUMPING. ++ */ ++static DEVICE_ATTR_RW(js_timeouts); + -+ spinlock_t hwaccess_lock; ++static u32 get_new_js_timeout( ++ u32 old_period, ++ u32 old_ticks, ++ u32 new_scheduling_period_ns) ++{ ++ u64 ticks = (u64)old_period * (u64)old_ticks; + -+ struct mutex mmu_hw_mutex; ++ do_div(ticks, new_scheduling_period_ns); ++ return ticks?ticks:1; ++} + -+ u8 l2_size_override; -+ u8 l2_hash_override; ++/** ++ * js_scheduling_period_store - Store callback for the js_scheduling_period sysfs ++ * file ++ * @dev: The device the sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes to write to the sysfs file ++ * ++ * This function is called when the js_scheduling_period sysfs file is written ++ * to. It checks the data written, and if valid updates the js_scheduling_period ++ * value ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t js_scheduling_period_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_device *kbdev; ++ int ret; ++ unsigned int js_scheduling_period; ++ u32 new_scheduling_period_ns; ++ u32 old_period; ++ struct kbasep_js_device_data *js_data; ++ unsigned long flags; + -+#if MALI_USE_CSF -+ /* Command-stream front-end for the device. */ -+ struct kbase_csf_device csf; -+#else -+ struct kbasep_js_device_data js_data; ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ /* See KBASE_JS_*_PRIORITY_MODE for details. */ -+ u32 js_ctx_scheduling_mode; ++ js_data = &kbdev->js_data; + -+ /* See KBASE_SERIALIZE_* for details */ -+ u8 serialize_jobs; ++ ret = kstrtouint(buf, 0, &js_scheduling_period); ++ if (ret || !js_scheduling_period) { ++ dev_err(kbdev->dev, "Couldn't process js_scheduling_period write operation.\n" ++ "Use format \n"); ++ return -EINVAL; ++ } + -+#ifdef CONFIG_MALI_CINSTR_GWT -+ u8 backup_serialize_jobs; -+#endif /* CONFIG_MALI_CINSTR_GWT */ ++ new_scheduling_period_ns = js_scheduling_period * 1000000; + -+#endif /* MALI_USE_CSF */ ++ /* Update scheduling timeouts */ ++ mutex_lock(&js_data->runpool_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ struct rb_root process_root; -+ struct rb_root dma_buf_root; ++ /* If no contexts have been scheduled since js_timeouts was last written ++ * to, the new timeouts might not have been latched yet. So check if an ++ * update is pending and use the new values if necessary. ++ */ + -+ size_t total_gpu_pages; -+ struct mutex dma_buf_lock; -+ spinlock_t gpu_mem_usage_lock; ++ /* Use previous 'new' scheduling period as a base if present. */ ++ old_period = js_data->scheduling_period_ns; + -+ struct { -+ struct kbase_context *ctx; -+ u64 jc; -+ int slot; -+ u64 flags; -+ } dummy_job_wa; ++#define SET_TIMEOUT(name) \ ++ (js_data->name = get_new_js_timeout(\ ++ old_period, \ ++ kbdev->js_data.name, \ ++ new_scheduling_period_ns)) + -+#ifdef CONFIG_MALI_ARBITER_SUPPORT -+ /* Pointer to the arbiter device */ -+ struct kbase_arbiter_device arb; -+#endif -+}; ++ SET_TIMEOUT(soft_stop_ticks); ++ SET_TIMEOUT(soft_stop_ticks_cl); ++ SET_TIMEOUT(hard_stop_ticks_ss); ++ SET_TIMEOUT(hard_stop_ticks_cl); ++ SET_TIMEOUT(hard_stop_ticks_dumping); ++ SET_TIMEOUT(gpu_reset_ticks_ss); ++ SET_TIMEOUT(gpu_reset_ticks_cl); ++ SET_TIMEOUT(gpu_reset_ticks_dumping); + -+/** -+ * enum kbase_file_state - Initialization state of a file opened by @kbase_open -+ * -+ * @KBASE_FILE_NEED_VSN: Initial state, awaiting API version. -+ * @KBASE_FILE_VSN_IN_PROGRESS: Indicates if setting an API version is in -+ * progress and other setup calls shall be -+ * rejected. -+ * @KBASE_FILE_NEED_CTX: Indicates if the API version handshake has -+ * completed, awaiting context creation flags. -+ * @KBASE_FILE_CTX_IN_PROGRESS: Indicates if the context's setup is in progress -+ * and other setup calls shall be rejected. -+ * @KBASE_FILE_COMPLETE: Indicates if the setup for context has -+ * completed, i.e. flags have been set for the -+ * context. -+ * -+ * The driver allows only limited interaction with user-space until setup -+ * is complete. -+ */ -+enum kbase_file_state { -+ KBASE_FILE_NEED_VSN, -+ KBASE_FILE_VSN_IN_PROGRESS, -+ KBASE_FILE_NEED_CTX, -+ KBASE_FILE_CTX_IN_PROGRESS, -+ KBASE_FILE_COMPLETE -+}; ++#undef SET_TIMEOUT + -+/** -+ * struct kbase_file - Object representing a file opened by @kbase_open -+ * -+ * @kbdev: Object representing an instance of GPU platform device, -+ * allocated from the probe method of the Mali driver. -+ * @filp: Pointer to the struct file corresponding to device file -+ * /dev/malixx instance, passed to the file's open method. -+ * @kctx: Object representing an entity, among which GPU is -+ * scheduled and which gets its own GPU address space. -+ * Invalid until @setup_state is KBASE_FILE_COMPLETE. -+ * @api_version: Contains the version number for User/kernel interface, -+ * used for compatibility check. Invalid until -+ * @setup_state is KBASE_FILE_NEED_CTX. -+ * @setup_state: Initialization state of the file. Values come from -+ * the kbase_file_state enumeration. -+ */ -+struct kbase_file { -+ struct kbase_device *kbdev; -+ struct file *filp; -+ struct kbase_context *kctx; -+ unsigned long api_version; -+ atomic_t setup_state; -+}; ++ js_data->scheduling_period_ns = new_scheduling_period_ns; + -+/** -+ * enum kbase_context_flags - Flags for kbase contexts -+ * -+ * @KCTX_COMPAT: Set when the context process is a compat process, 32-bit -+ * process on a 64-bit kernel. -+ * -+ * @KCTX_RUNNABLE_REF: Set when context is counted in -+ * kbdev->js_data.nr_contexts_runnable. Must hold queue_mutex when accessing. -+ * -+ * @KCTX_ACTIVE: Set when the context is active. -+ * -+ * @KCTX_PULLED: Set when last kick() caused atoms to be pulled from this -+ * context. -+ * -+ * @KCTX_MEM_PROFILE_INITIALIZED: Set when the context's memory profile has been -+ * initialized. -+ * -+ * @KCTX_INFINITE_CACHE: Set when infinite cache is to be enabled for new -+ * allocations. Existing allocations will not change. -+ * -+ * @KCTX_SUBMIT_DISABLED: Set to prevent context from submitting any jobs. -+ * -+ * @KCTX_PRIVILEGED:Set if the context uses an address space and should be kept -+ * scheduled in. -+ * -+ * @KCTX_SCHEDULED: Set when the context is scheduled on the Run Pool. -+ * This is only ever updated whilst the jsctx_mutex is held. -+ * -+ * @KCTX_DYING: Set when the context process is in the process of being evicted. -+ * -+ * @KCTX_NO_IMPLICIT_SYNC: Set when explicit Android fences are in use on this -+ * context, to disable use of implicit dma-buf fences. This is used to avoid -+ * potential synchronization deadlocks. -+ * -+ * @KCTX_FORCE_SAME_VA: Set when BASE_MEM_SAME_VA should be forced on memory -+ * allocations. For 64-bit clients it is enabled by default, and disabled by -+ * default on 32-bit clients. Being able to clear this flag is only used for -+ * testing purposes of the custom zone allocation on 64-bit user-space builds, -+ * where we also require more control than is available through e.g. the JIT -+ * allocation mechanism. However, the 64-bit user-space client must still -+ * reserve a JIT region using KBASE_IOCTL_MEM_JIT_INIT -+ * -+ * @KCTX_PULLED_SINCE_ACTIVE_JS0: Set when the context has had an atom pulled -+ * from it for job slot 0. This is reset when the context first goes active or -+ * is re-activated on that slot. -+ * -+ * @KCTX_PULLED_SINCE_ACTIVE_JS1: Set when the context has had an atom pulled -+ * from it for job slot 1. This is reset when the context first goes active or -+ * is re-activated on that slot. -+ * -+ * @KCTX_PULLED_SINCE_ACTIVE_JS2: Set when the context has had an atom pulled -+ * from it for job slot 2. This is reset when the context first goes active or -+ * is re-activated on that slot. -+ * -+ * @KCTX_AS_DISABLED_ON_FAULT: Set when the GPU address space is disabled for -+ * the context due to unhandled page(or bus) fault. It is cleared when the -+ * refcount for the context drops to 0 or on when the address spaces are -+ * re-enabled on GPU reset or power cycle. -+ * -+ * All members need to be separate bits. This enum is intended for use in a -+ * bitmask where multiple values get OR-ed together. -+ */ -+enum kbase_context_flags { -+ KCTX_COMPAT = 1U << 0, -+ KCTX_RUNNABLE_REF = 1U << 1, -+ KCTX_ACTIVE = 1U << 2, -+ KCTX_PULLED = 1U << 3, -+ KCTX_MEM_PROFILE_INITIALIZED = 1U << 4, -+ KCTX_INFINITE_CACHE = 1U << 5, -+ KCTX_SUBMIT_DISABLED = 1U << 6, -+ KCTX_PRIVILEGED = 1U << 7, -+ KCTX_SCHEDULED = 1U << 8, -+ KCTX_DYING = 1U << 9, -+ KCTX_NO_IMPLICIT_SYNC = 1U << 10, -+ KCTX_FORCE_SAME_VA = 1U << 11, -+ KCTX_PULLED_SINCE_ACTIVE_JS0 = 1U << 12, -+ KCTX_PULLED_SINCE_ACTIVE_JS1 = 1U << 13, -+ KCTX_PULLED_SINCE_ACTIVE_JS2 = 1U << 14, -+ KCTX_AS_DISABLED_ON_FAULT = 1U << 15, -+#if MALI_JIT_PRESSURE_LIMIT_BASE -+ /* -+ * Set when JIT physical page limit is less than JIT virtual address -+ * page limit, so we must take care to not exceed the physical limit -+ */ -+ KCTX_JPL_ENABLED = 1U << 16, -+#endif /* !MALI_JIT_PRESSURE_LIMIT_BASE */ -+}; ++ kbase_js_set_timeouts(kbdev); + -+struct kbase_sub_alloc { -+ struct list_head link; -+ struct page *page; -+ DECLARE_BITMAP(sub_pages, SZ_2M / SZ_4K); -+}; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&js_data->runpool_mutex); ++ ++ dev_dbg(kbdev->dev, "JS scheduling period: %dms\n", ++ js_scheduling_period); ++ ++ return count; ++} + +/** -+ * struct kbase_context - Kernel base context ++ * js_scheduling_period_show - Show callback for the js_scheduling_period sysfs ++ * entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the GPU information. + * -+ * @filp: Pointer to the struct file corresponding to device file -+ * /dev/malixx instance, passed to the file's open method. -+ * @kbdev: Pointer to the Kbase device for which the context is created. -+ * @kctx_list_link: Node into Kbase device list of contexts. -+ * @mmu: Structure holding details of the MMU tables for this -+ * context -+ * @id: Unique identifier for the context, indicates the number of -+ * contexts which have been created for the device so far. -+ * @api_version: contains the version number for User/kernel interface, -+ * used for compatibility check. -+ * @event_list: list of posted events about completed atoms, to be sent to -+ * event handling thread of Userpsace. -+ * @event_coalesce_list: list containing events corresponding to successive atoms -+ * which have requested deferred delivery of the completion -+ * events to Userspace. -+ * @event_mutex: Lock to protect the concurrent access to @event_list & -+ * @event_mutex. -+ * @event_closed: Flag set through POST_TERM ioctl, indicates that Driver -+ * should stop posting events and also inform event handling -+ * thread that context termination is in progress. -+ * @event_workq: Workqueue for processing work items corresponding to atoms -+ * that do not return an event to userspace. -+ * @event_count: Count of the posted events to be consumed by Userspace. -+ * @event_coalesce_count: Count of the events present in @event_coalesce_list. -+ * @flags: bitmap of enums from kbase_context_flags, indicating the -+ * state & attributes for the context. -+ * @aliasing_sink_page: Special page used for KBASE_MEM_TYPE_ALIAS allocations, -+ * which can alias number of memory regions. The page is -+ * represent a region where it is mapped with a write-alloc -+ * cache setup, typically used when the write result of the -+ * GPU isn't needed, but the GPU must write anyway. -+ * @mem_partials_lock: Lock for protecting the operations done on the elements -+ * added to @mem_partials list. -+ * @mem_partials: List head for the list of large pages, 2MB in size, which -+ * which have been split into 4 KB pages and are used -+ * partially for the allocations >= 2 MB in size. -+ * @reg_lock: Lock used for GPU virtual address space management operations, -+ * like adding/freeing a memory region in the address space. -+ * Can be converted to a rwlock ?. -+ * @reg_rbtree_same: RB tree of the memory regions allocated from the SAME_VA -+ * zone of the GPU virtual address space. Used for allocations -+ * having the same value for GPU & CPU virtual address. -+ * @reg_rbtree_custom: RB tree of the memory regions allocated from the CUSTOM_VA -+ * zone of the GPU virtual address space. -+ * @reg_rbtree_exec: RB tree of the memory regions allocated from the EXEC_VA -+ * zone of the GPU virtual address space. Used for GPU-executable -+ * allocations which don't need the SAME_VA property. -+ * @cookies: Bitmask containing of BITS_PER_LONG bits, used mainly for -+ * SAME_VA allocations to defer the reservation of memory region -+ * (from the GPU virtual address space) from base_mem_alloc -+ * ioctl to mmap system call. This helps returning unique -+ * handles, disguised as GPU VA, to Userspace from base_mem_alloc -+ * and later retrieving the pointer to memory region structure -+ * in the mmap handler. -+ * @pending_regions: Array containing pointers to memory region structures, -+ * used in conjunction with @cookies bitmask mainly for -+ * providing a mechansim to have the same value for CPU & -+ * GPU virtual address. -+ * @event_queue: Wait queue used for blocking the thread, which consumes -+ * the base_jd_event corresponding to an atom, when there -+ * are no more posted events. -+ * @tgid: Thread group ID of the process whose thread created -+ * the context (by calling KBASE_IOCTL_VERSION_CHECK or -+ * KBASE_IOCTL_SET_FLAGS, depending on the @api_version). -+ * This is usually, but not necessarily, the same as the -+ * process whose thread opened the device file -+ * /dev/malixx instance. -+ * @pid: ID of the thread, corresponding to process @tgid, -+ * which actually created the context. This is usually, -+ * but not necessarily, the same as the thread which -+ * opened the device file /dev/malixx instance. -+ * @jctx: object encapsulating all the Job dispatcher related state, -+ * including the array of atoms. -+ * @used_pages: Keeps a track of the number of 4KB physical pages in use -+ * for the context. -+ * @nonmapped_pages: Updated in the same way as @used_pages, except for the case -+ * when special tracking page is freed by userspace where it -+ * is reset to 0. -+ * @permanent_mapped_pages: Usage count of permanently mapped memory -+ * @mem_pools: Context-specific pools of free physical memory pages. -+ * @reclaim: Shrinker object registered with the kernel containing -+ * the pointer to callback function which is invoked under -+ * low memory conditions. In the callback function Driver -+ * frees up the memory for allocations marked as -+ * evictable/reclaimable. -+ * @evict_list: List head for the list containing the allocations which -+ * can be evicted or freed up in the shrinker callback. -+ * @waiting_soft_jobs: List head for the list containing softjob atoms, which -+ * are either waiting for the event set operation, or waiting -+ * for the signaling of input fence or waiting for the GPU -+ * device to powered on so as to dump the CPU/GPU timestamps. -+ * @waiting_soft_jobs_lock: Lock to protect @waiting_soft_jobs list from concurrent -+ * accesses. -+ * @dma_fence: Object containing list head for the list of dma-buf fence -+ * waiting atoms and the waitqueue to process the work item -+ * queued for the atoms blocked on the signaling of dma-buf -+ * fences. -+ * @as_nr: id of the address space being used for the scheduled in -+ * context. This is effectively part of the Run Pool, because -+ * it only has a valid setting (!=KBASEP_AS_NR_INVALID) whilst -+ * the context is scheduled in. The hwaccess_lock must be held -+ * whilst accessing this. -+ * If the context relating to this value of as_nr is required, -+ * then the context must be retained to ensure that it doesn't -+ * disappear whilst it is being used. Alternatively, hwaccess_lock -+ * can be held to ensure the context doesn't disappear (but this -+ * has restrictions on what other locks can be taken simutaneously). -+ * @refcount: Keeps track of the number of users of this context. A user -+ * can be a job that is available for execution, instrumentation -+ * needing to 'pin' a context for counter collection, etc. -+ * If the refcount reaches 0 then this context is considered -+ * inactive and the previously programmed AS might be cleared -+ * at any point. -+ * Generally the reference count is incremented when the context -+ * is scheduled in and an atom is pulled from the context's per -+ * slot runnable tree in JM GPU or GPU command queue -+ * group is programmed on CSG slot in CSF GPU. -+ * @mm_update_lock: lock used for handling of special tracking page. -+ * @process_mm: Pointer to the memory descriptor of the process which -+ * created the context. Used for accounting the physical -+ * pages used for GPU allocations, done for the context, -+ * to the memory consumed by the process. -+ * @same_va_end: End address of the SAME_VA zone (in 4KB page units) -+ * @exec_va_start: Start address of the EXEC_VA zone (in 4KB page units) -+ * or U64_MAX if the EXEC_VA zone is uninitialized. -+ * @gpu_va_end: End address of the GPU va space (in 4KB page units) -+ * @jit_va: Indicates if a JIT_VA zone has been created. -+ * @mem_profile_data: Buffer containing the profiling information provided by -+ * Userspace, can be read through the mem_profile debugfs file. -+ * @mem_profile_size: Size of the @mem_profile_data. -+ * @mem_profile_lock: Lock to serialize the operations related to mem_profile -+ * debugfs file. -+ * @kctx_dentry: Pointer to the debugfs directory created for every context, -+ * inside kbase_device::debugfs_ctx_directory, containing -+ * context specific files. -+ * @reg_dump: Buffer containing a register offset & value pair, used -+ * for dumping job fault debug info. -+ * @job_fault_count: Indicates that a job fault occurred for the context and -+ * dumping of its debug info is in progress. -+ * @job_fault_resume_event_list: List containing atoms completed after the faulty -+ * atom but before the debug data for faulty atom was dumped. -+ * @jsctx_queue: Per slot & priority arrays of object containing the root -+ * of RB-tree holding currently runnable atoms on the job slot -+ * and the head item of the linked list of atoms blocked on -+ * cross-slot dependencies. -+ * @atoms_pulled: Total number of atoms currently pulled from the context. -+ * @atoms_pulled_slot: Per slot count of the number of atoms currently pulled -+ * from the context. -+ * @atoms_pulled_slot_pri: Per slot & priority count of the number of atoms currently -+ * pulled from the context. hwaccess_lock shall be held when -+ * accessing it. -+ * @blocked_js: Indicates if the context is blocked from submitting atoms -+ * on a slot at a given priority. This is set to true, when -+ * the atom corresponding to context is soft/hard stopped or -+ * removed from the HEAD_NEXT register in response to -+ * soft/hard stop. -+ * @slots_pullable: Bitmask of slots, indicating the slots for which the -+ * context has pullable atoms in the runnable tree. -+ * @work: Work structure used for deferred ASID assignment. -+ * @legacy_hwcnt_cli: Pointer to the legacy userspace hardware counters -+ * client, there can be only such client per kbase -+ * context. -+ * @legacy_hwcnt_lock: Lock used to prevent concurrent access to -+ * @legacy_hwcnt_cli. -+ * @completed_jobs: List containing completed atoms for which base_jd_event is -+ * to be posted. -+ * @work_count: Number of work items, corresponding to atoms, currently -+ * pending on job_done workqueue of @jctx. -+ * @soft_job_timeout: Timer object used for failing/cancelling the waiting -+ * soft-jobs which have been blocked for more than the -+ * timeout value used for the soft-jobs -+ * @jit_alloc: Array of 256 pointers to GPU memory regions, used for -+ * just-in-time memory allocations. -+ * @jit_max_allocations: Maximum allowed number of in-flight -+ * just-in-time memory allocations. -+ * @jit_current_allocations: Current number of in-flight just-in-time -+ * memory allocations. -+ * @jit_current_allocations_per_bin: Current number of in-flight just-in-time -+ * memory allocations per bin. -+ * @jit_version: Version number indicating whether userspace is using -+ * old or new version of interface for just-in-time -+ * memory allocations. -+ * 1 -> client used KBASE_IOCTL_MEM_JIT_INIT_10_2 -+ * 2 -> client used KBASE_IOCTL_MEM_JIT_INIT_11_5 -+ * 3 -> client used KBASE_IOCTL_MEM_JIT_INIT -+ * @jit_group_id: A memory group ID to be passed to a platform-specific -+ * memory group manager. -+ * Valid range is 0..(MEMORY_GROUP_MANAGER_NR_GROUPS-1). -+ * @jit_phys_pages_limit: Limit of physical pages to apply across all -+ * just-in-time memory allocations, applied to -+ * @jit_current_phys_pressure. -+ * @jit_current_phys_pressure: Current 'pressure' on physical pages, which is -+ * the sum of the worst case estimate of pages that -+ * could be used (i.e. the -+ * &struct_kbase_va_region.nr_pages for all in-use -+ * just-in-time memory regions that have not yet had -+ * a usage report) and the actual number of pages -+ * that were used (i.e. the -+ * &struct_kbase_va_region.used_pages for regions -+ * that have had a usage report). -+ * @jit_phys_pages_to_be_allocated: Count of the physical pages that are being -+ * now allocated for just-in-time memory -+ * allocations of a context (across all the -+ * threads). This is supposed to be updated -+ * with @reg_lock held before allocating -+ * the backing pages. This helps ensure that -+ * total physical memory usage for just in -+ * time memory allocation remains within the -+ * @jit_phys_pages_limit in multi-threaded -+ * scenarios. -+ * @jit_active_head: List containing the just-in-time memory allocations -+ * which are in use. -+ * @jit_pool_head: List containing the just-in-time memory allocations -+ * which have been freed up by userspace and so not being -+ * used by them. -+ * Driver caches them to quickly fulfill requests for new -+ * JIT allocations. They are released in case of memory -+ * pressure as they are put on the @evict_list when they -+ * are freed up by userspace. -+ * @jit_destroy_head: List containing the just-in-time memory allocations -+ * which were moved to it from @jit_pool_head, in the -+ * shrinker callback, after freeing their backing -+ * physical pages. -+ * @jit_evict_lock: Lock used for operations done on just-in-time memory -+ * allocations and also for accessing @evict_list. -+ * @jit_work: Work item queued to defer the freeing of a memory -+ * region when a just-in-time memory allocation is moved -+ * to @jit_destroy_head. -+ * @ext_res_meta_head: A list of sticky external resources which were requested to -+ * be mapped on GPU side, through a softjob atom of type -+ * EXT_RES_MAP or STICKY_RESOURCE_MAP ioctl. -+ * @age_count: Counter incremented on every call to jd_submit_atom, -+ * atom is assigned the snapshot of this counter, which -+ * is used to determine the atom's age when it is added to -+ * the runnable RB-tree. -+ * @trim_level: Level of JIT allocation trimming to perform on free (0-100%) -+ * @kprcs: Reference to @struct kbase_process that the current -+ * kbase_context belongs to. -+ * @kprcs_link: List link for the list of kbase context maintained -+ * under kbase_process. -+ * @gwt_enabled: Indicates if tracking of GPU writes is enabled, protected by -+ * kbase_context.reg_lock. -+ * @gwt_was_enabled: Simple sticky bit flag to know if GWT was ever enabled. -+ * @gwt_current_list: A list of addresses for which GPU has generated write faults, -+ * after the last snapshot of it was sent to userspace. -+ * @gwt_snapshot_list: Snapshot of the @gwt_current_list for sending to user space. -+ * @priority: Indicates the context priority. Used along with @atoms_count -+ * for context scheduling, protected by hwaccess_lock. -+ * @atoms_count: Number of GPU atoms currently in use, per priority -+ * @create_flags: Flags used in context creation. -+ * @kinstr_jm: Kernel job manager instrumentation context handle ++ * This function is called to get the current period used for the JS scheduling ++ * period. + * -+ * A kernel base context is an entity among which the GPU is scheduled. -+ * Each context has its own GPU address space. -+ * Up to one context can be created for each client that opens the device file -+ * /dev/malixx. Context creation is deferred until a special ioctl() system call -+ * is made on the device file. ++ * Return: The number of bytes output to @buf. + */ -+struct kbase_context { -+ struct file *filp; ++static ssize_t js_scheduling_period_show(struct device *dev, ++ struct device_attribute *attr, char * const buf) ++{ + struct kbase_device *kbdev; -+ struct list_head kctx_list_link; -+ struct kbase_mmu_table mmu; -+ -+ u32 id; -+ unsigned long api_version; -+ struct list_head event_list; -+ struct list_head event_coalesce_list; -+ struct mutex event_mutex; -+#if !MALI_USE_CSF -+ atomic_t event_closed; -+#endif -+ struct workqueue_struct *event_workq; -+ atomic_t event_count; -+ int event_coalesce_count; -+ -+ atomic_t flags; -+ -+ struct tagged_addr aliasing_sink_page; -+ -+ spinlock_t mem_partials_lock; -+ struct list_head mem_partials; -+ -+ struct mutex reg_lock; -+ -+ struct rb_root reg_rbtree_same; -+ struct rb_root reg_rbtree_custom; -+ struct rb_root reg_rbtree_exec; ++ u32 period; ++ ssize_t ret; + -+#if MALI_USE_CSF -+ struct kbase_csf_context csf; -+#else -+ struct kbase_jd_context jctx; -+ struct jsctx_queue jsctx_queue -+ [KBASE_JS_ATOM_SCHED_PRIO_COUNT][BASE_JM_MAX_NR_SLOTS]; ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ struct list_head completed_jobs; -+ atomic_t work_count; -+ struct timer_list soft_job_timeout; ++ period = kbdev->js_data.scheduling_period_ns; + -+ atomic_t atoms_pulled; -+ atomic_t atoms_pulled_slot[BASE_JM_MAX_NR_SLOTS]; -+ int atoms_pulled_slot_pri[BASE_JM_MAX_NR_SLOTS][ -+ KBASE_JS_ATOM_SCHED_PRIO_COUNT]; -+ int priority; -+ bool blocked_js[BASE_JM_MAX_NR_SLOTS][KBASE_JS_ATOM_SCHED_PRIO_COUNT]; -+ s16 atoms_count[KBASE_JS_ATOM_SCHED_PRIO_COUNT]; -+ u32 slots_pullable; -+ u32 age_count; -+#endif /* MALI_USE_CSF */ ++ ret = scnprintf(buf, PAGE_SIZE, "%d\n", ++ period / 1000000); + -+ DECLARE_BITMAP(cookies, BITS_PER_LONG); -+ struct kbase_va_region *pending_regions[BITS_PER_LONG]; ++ return ret; ++} + -+ wait_queue_head_t event_queue; -+ pid_t tgid; -+ pid_t pid; -+ atomic_t used_pages; -+ atomic_t nonmapped_pages; -+ atomic_t permanent_mapped_pages; ++static DEVICE_ATTR_RW(js_scheduling_period); + -+ struct kbase_mem_pool_group mem_pools; + -+ struct shrinker reclaim; -+ struct list_head evict_list; ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++static ssize_t js_softstop_always_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_device *kbdev; ++ int ret; ++ int softstop_always; + -+ struct list_head waiting_soft_jobs; -+ spinlock_t waiting_soft_jobs_lock; -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ struct { -+ struct list_head waiting_resource; -+ struct workqueue_struct *wq; -+ } dma_fence; -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ int as_nr; ++ ret = kstrtoint(buf, 0, &softstop_always); ++ if (ret || ((softstop_always != 0) && (softstop_always != 1))) { ++ dev_err(kbdev->dev, "Couldn't process js_softstop_always write operation.\n" ++ "Use format \n"); ++ return -EINVAL; ++ } + -+ atomic_t refcount; ++ kbdev->js_data.softstop_always = (bool) softstop_always; ++ dev_dbg(kbdev->dev, "Support for softstop on a single context: %s\n", ++ (kbdev->js_data.softstop_always) ? ++ "Enabled" : "Disabled"); ++ return count; ++} + -+ spinlock_t mm_update_lock; -+ struct mm_struct __rcu *process_mm; -+ u64 same_va_end; -+ u64 exec_va_start; -+ u64 gpu_va_end; -+ bool jit_va; ++static ssize_t js_softstop_always_show(struct device *dev, ++ struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *kbdev; ++ ssize_t ret; + -+#ifdef CONFIG_DEBUG_FS -+ char *mem_profile_data; -+ size_t mem_profile_size; -+ struct mutex mem_profile_lock; -+ struct dentry *kctx_dentry; ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ unsigned int *reg_dump; -+ atomic_t job_fault_count; -+ struct list_head job_fault_resume_event_list; ++ ret = scnprintf(buf, PAGE_SIZE, "%d\n", kbdev->js_data.softstop_always); + -+#endif /* CONFIG_DEBUG_FS */ ++ if (ret >= PAGE_SIZE) { ++ buf[PAGE_SIZE - 2] = '\n'; ++ buf[PAGE_SIZE - 1] = '\0'; ++ ret = PAGE_SIZE - 1; ++ } + -+ struct kbase_hwcnt_legacy_client *legacy_hwcnt_cli; -+ struct mutex legacy_hwcnt_lock; ++ return ret; ++} + -+ struct kbase_va_region *jit_alloc[1 + BASE_JIT_ALLOC_COUNT]; -+ u8 jit_max_allocations; -+ u8 jit_current_allocations; -+ u8 jit_current_allocations_per_bin[256]; -+ u8 jit_version; -+ u8 jit_group_id; -+#if MALI_JIT_PRESSURE_LIMIT_BASE -+ u64 jit_phys_pages_limit; -+ u64 jit_current_phys_pressure; -+ u64 jit_phys_pages_to_be_allocated; -+#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ -+ struct list_head jit_active_head; -+ struct list_head jit_pool_head; -+ struct list_head jit_destroy_head; -+ struct mutex jit_evict_lock; -+ struct work_struct jit_work; ++/* ++ * By default, soft-stops are disabled when only a single context is present. ++ * The ability to enable soft-stop when only a single context is present can be ++ * used for debug and unit-testing purposes. ++ * (see CL t6xx_stress_1 unit-test as an example whereby this feature is used.) ++ */ ++static DEVICE_ATTR_RW(js_softstop_always); ++#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++#endif /* !MALI_USE_CSF */ + -+ struct list_head ext_res_meta_head; ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++typedef void kbasep_debug_command_func(struct kbase_device *); + -+ u8 trim_level; ++enum kbasep_debug_command_code { ++ KBASEP_DEBUG_COMMAND_DUMPTRACE, + -+ struct kbase_process *kprcs; -+ struct list_head kprcs_link; ++ /* This must be the last enum */ ++ KBASEP_DEBUG_COMMAND_COUNT ++}; + -+#ifdef CONFIG_MALI_CINSTR_GWT -+ bool gwt_enabled; -+ bool gwt_was_enabled; -+ struct list_head gwt_current_list; -+ struct list_head gwt_snapshot_list; -+#endif ++struct kbasep_debug_command { ++ char *str; ++ kbasep_debug_command_func *func; ++}; + -+ base_context_create_flags create_flags; ++static void kbasep_ktrace_dump_wrapper(struct kbase_device *kbdev) ++{ ++ KBASE_KTRACE_DUMP(kbdev); ++} + -+#if !MALI_USE_CSF -+ struct kbase_kinstr_jm *kinstr_jm; -+#endif ++/* Debug commands supported by the driver */ ++static const struct kbasep_debug_command debug_commands[] = { ++ { ++ .str = "dumptrace", ++ .func = &kbasep_ktrace_dump_wrapper, ++ } +}; + -+#ifdef CONFIG_MALI_CINSTR_GWT +/** -+ * struct kbasep_gwt_list_element - Structure used to collect GPU -+ * write faults. -+ * @link: List head for adding write faults. -+ * @region: Details of the region where we have the -+ * faulting page address. -+ * @page_addr: Page address where GPU write fault occurred. -+ * @num_pages: The number of pages modified. ++ * debug_command_show - Show callback for the debug_command sysfs file. + * -+ * Using this structure all GPU write faults are stored in a list. ++ * @dev: The device this sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The output buffer for the sysfs file contents ++ * ++ * This function is called to get the contents of the debug_command sysfs ++ * file. This is a list of the available debug commands, separated by newlines. ++ * ++ * Return: The number of bytes output to @buf. + */ -+struct kbasep_gwt_list_element { -+ struct list_head link; -+ struct kbase_va_region *region; -+ u64 page_addr; -+ u64 num_pages; -+}; ++static ssize_t debug_command_show(struct device *dev, struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *kbdev; ++ int i; ++ ssize_t ret = 0; + -+#endif ++ kbdev = to_kbase_device(dev); + -+/** -+ * struct kbase_ctx_ext_res_meta - Structure which binds an external resource -+ * to a @kbase_context. -+ * @ext_res_node: List head for adding the metadata to a -+ * @kbase_context. -+ * @alloc: The physical memory allocation structure -+ * which is mapped. -+ * @gpu_addr: The GPU virtual address the resource is -+ * mapped to. -+ * @ref: Reference count. -+ * -+ * External resources can be mapped into multiple contexts as well as the same -+ * context multiple times. -+ * As kbase_va_region itself isn't refcounted we can't attach our extra -+ * information to it as it could be removed under our feet leaving external -+ * resources pinned. -+ * This metadata structure binds a single external resource to a single -+ * context, ensuring that per context mapping is tracked separately so it can -+ * be overridden when needed and abuses by the application (freeing the resource -+ * multiple times) don't effect the refcount of the physical allocation. -+ */ -+struct kbase_ctx_ext_res_meta { -+ struct list_head ext_res_node; -+ struct kbase_mem_phy_alloc *alloc; -+ u64 gpu_addr; -+ u32 ref; -+}; ++ if (!kbdev) ++ return -ENODEV; + -+enum kbase_reg_access_type { -+ REG_READ, -+ REG_WRITE -+}; ++ for (i = 0; i < KBASEP_DEBUG_COMMAND_COUNT && ret < PAGE_SIZE; i++) ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s\n", debug_commands[i].str); + -+enum kbase_share_attr_bits { -+ /* (1ULL << 8) bit is reserved */ -+ SHARE_BOTH_BITS = (2ULL << 8), /* inner and outer shareable coherency */ -+ SHARE_INNER_BITS = (3ULL << 8) /* inner shareable coherency */ -+}; ++ if (ret >= PAGE_SIZE) { ++ buf[PAGE_SIZE - 2] = '\n'; ++ buf[PAGE_SIZE - 1] = '\0'; ++ ret = PAGE_SIZE - 1; ++ } ++ ++ return ret; ++} + +/** -+ * kbase_device_is_cpu_coherent - Returns if the device is CPU coherent. -+ * @kbdev: kbase device ++ * debug_command_store - Store callback for the debug_command sysfs file. + * -+ * Return: true if the device access are coherent, false if not. ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file ++ * ++ * This function is called when the debug_command sysfs file is written to. ++ * It matches the requested command against the available commands, and if ++ * a matching command is found calls the associated function from ++ * @debug_commands to issue the command. ++ * ++ * Return: @count if the function succeeded. An error code on failure. + */ -+static inline bool kbase_device_is_cpu_coherent(struct kbase_device *kbdev) ++static ssize_t debug_command_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ -+ if ((kbdev->system_coherency == COHERENCY_ACE_LITE) || -+ (kbdev->system_coherency == COHERENCY_ACE)) -+ return true; ++ struct kbase_device *kbdev; ++ int i; + -+ return false; -+} ++ kbdev = to_kbase_device(dev); + -+/* Conversion helpers for setting up high resolution timers */ -+#define HR_TIMER_DELAY_MSEC(x) (ns_to_ktime(((u64)(x))*1000000U)) -+#define HR_TIMER_DELAY_NSEC(x) (ns_to_ktime(x)) ++ if (!kbdev) ++ return -ENODEV; + -+/* Maximum number of loops polling the GPU for a cache flush before we assume it must have completed */ -+#define KBASE_CLEAN_CACHE_MAX_LOOPS 100000 -+/* Maximum number of loops polling the GPU for an AS command to complete before we assume the GPU has hung */ -+#define KBASE_AS_INACTIVE_MAX_LOOPS 100000000 ++ for (i = 0; i < KBASEP_DEBUG_COMMAND_COUNT; i++) { ++ if (sysfs_streq(debug_commands[i].str, buf)) { ++ debug_commands[i].func(kbdev); ++ return count; ++ } ++ } + -+/* JobDescriptorHeader - taken from the architecture specifications, the layout -+ * is currently identical for all GPU archs. */ -+struct job_descriptor_header { -+ u32 exception_status; -+ u32 first_incomplete_task; -+ u64 fault_pointer; -+ u8 job_descriptor_size : 1; -+ u8 job_type : 7; -+ u8 job_barrier : 1; -+ u8 _reserved_01 : 1; -+ u8 _reserved_1 : 1; -+ u8 _reserved_02 : 1; -+ u8 _reserved_03 : 1; -+ u8 _reserved_2 : 1; -+ u8 _reserved_04 : 1; -+ u8 _reserved_05 : 1; -+ u16 job_index; -+ u16 job_dependency_index_1; -+ u16 job_dependency_index_2; -+ union { -+ u64 _64; -+ u32 _32; -+ } next_job; -+}; ++ /* Debug Command not found */ ++ dev_err(dev, "debug_command: command not known\n"); ++ return -EINVAL; ++} + -+#endif /* _KBASE_DEFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c b/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c -new file mode 100755 -index 000000000000..b5ac414b1223 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c -@@ -0,0 +1,81 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014, 2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++/* The sysfs file debug_command. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * This is used to issue general debug commands to the device driver. ++ * Reading it will produce a list of debug commands, separated by newlines. ++ * Writing to it with one of those commands will issue said command. ++ */ ++static DEVICE_ATTR_RW(debug_command); ++#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++ ++/** ++ * gpuinfo_show - Show callback for the gpuinfo sysfs entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the GPU information. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * This function is called to get a description of the present Mali ++ * GPU via the gpuinfo sysfs entry. This includes the GPU family, the ++ * number of cores, the hardware version and the raw product id. For ++ * example + * -+ * SPDX-License-Identifier: GPL-2.0 ++ * Mali-T60x MP4 r0p0 0x6956 + * ++ * Return: The number of bytes output to @buf. + */ -+ -+/* -+ * Base kernel disjoint events helper functions -+ */ -+ -+#include -+ -+void kbase_disjoint_init(struct kbase_device *kbdev) ++static ssize_t gpuinfo_show(struct device *dev, ++ struct device_attribute *attr, char *buf) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ static const struct gpu_product_id_name { ++ unsigned int id; ++ char *name; ++ } gpu_product_id_names[] = { ++ { .id = GPU_ID2_PRODUCT_TMIX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G71" }, ++ { .id = GPU_ID2_PRODUCT_THEX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G72" }, ++ { .id = GPU_ID2_PRODUCT_TSIX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G51" }, ++ { .id = GPU_ID2_PRODUCT_TNOX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G76" }, ++ { .id = GPU_ID2_PRODUCT_TDVX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G31" }, ++ { .id = GPU_ID2_PRODUCT_TGOX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G52" }, ++ { .id = GPU_ID2_PRODUCT_TTRX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G77" }, ++ { .id = GPU_ID2_PRODUCT_TBEX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G78" }, ++ { .id = GPU_ID2_PRODUCT_TBAX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G78AE" }, ++ { .id = GPU_ID2_PRODUCT_LBEX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G68" }, ++ { .id = GPU_ID2_PRODUCT_TNAX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G57" }, ++ { .id = GPU_ID2_PRODUCT_TODX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G710" }, ++ { .id = GPU_ID2_PRODUCT_LODX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G610" }, ++ { .id = GPU_ID2_PRODUCT_TGRX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G510" }, ++ { .id = GPU_ID2_PRODUCT_TVAX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G310" }, ++ { .id = GPU_ID2_PRODUCT_TTIX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-TTIX" }, ++ { .id = GPU_ID2_PRODUCT_LTIX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-LTIX" }, ++ }; ++ const char *product_name = "(Unknown Mali GPU)"; ++ struct kbase_device *kbdev; ++ u32 gpu_id; ++ unsigned int product_id, product_id_mask; ++ unsigned int i; ++ struct kbase_gpu_props *gpu_props; + -+ atomic_set(&kbdev->disjoint_event.count, 0); -+ atomic_set(&kbdev->disjoint_event.state, 0); -+} ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+/* increment the disjoint event count */ -+void kbase_disjoint_event(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ gpu_props = &kbdev->gpu_props; ++ gpu_id = gpu_props->props.raw_props.gpu_id; ++ product_id = gpu_id >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++ product_id_mask = GPU_ID2_PRODUCT_MODEL >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT; + -+ atomic_inc(&kbdev->disjoint_event.count); -+} ++ for (i = 0; i < ARRAY_SIZE(gpu_product_id_names); ++i) { ++ const struct gpu_product_id_name *p = &gpu_product_id_names[i]; + -+/* increment the state and the event counter */ -+void kbase_disjoint_state_up(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ if ((p->id & product_id_mask) == ++ (product_id & product_id_mask)) { ++ product_name = p->name; ++ break; ++ } ++ } + -+ atomic_inc(&kbdev->disjoint_event.state); ++#if MALI_USE_CSF ++ if ((product_id & product_id_mask) == ++ ((GPU_ID2_PRODUCT_TTUX >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT) & product_id_mask)) { ++ const bool rt_supported = ++ GPU_FEATURES_RAY_TRACING_GET(gpu_props->props.raw_props.gpu_features); ++ const u8 nr_cores = gpu_props->num_cores; ++ ++ /* Mali-G715-Immortalis if 10 < number of cores with ray tracing supproted. ++ * Mali-G715 if 10 < number of cores without ray tracing supported. ++ * Mali-G715 if 7 <= number of cores <= 10 regardless ray tracing. ++ * Mali-G615 if number of cores < 7. ++ */ ++ if ((nr_cores > 10) && rt_supported) ++ product_name = "Mali-G715-Immortalis"; ++ else if (nr_cores >= 7) ++ product_name = "Mali-G715"; ++ ++ if (nr_cores < 7) { ++ dev_warn(kbdev->dev, "nr_cores(%u) GPU ID must be G615", nr_cores); ++ product_name = "Mali-G615"; ++ } else ++ dev_dbg(kbdev->dev, "GPU ID_Name: %s, nr_cores(%u)\n", product_name, ++ nr_cores); ++ } ++#endif /* MALI_USE_CSF */ + -+ kbase_disjoint_event(kbdev); ++ return scnprintf(buf, PAGE_SIZE, "%s %d cores r%dp%d 0x%04X\n", product_name, ++ kbdev->gpu_props.num_cores, ++ (gpu_id & GPU_ID_VERSION_MAJOR) >> KBASE_GPU_ID_VERSION_MAJOR_SHIFT, ++ (gpu_id & GPU_ID_VERSION_MINOR) >> KBASE_GPU_ID_VERSION_MINOR_SHIFT, ++ product_id); +} ++static DEVICE_ATTR_RO(gpuinfo); + -+/* decrement the state */ -+void kbase_disjoint_state_down(struct kbase_device *kbdev) ++/** ++ * dvfs_period_store - Store callback for the dvfs_period sysfs file. ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file ++ * ++ * This function is called when the dvfs_period sysfs file is written to. It ++ * checks the data written, and if valid updates the DVFS period variable, ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t dvfs_period_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(atomic_read(&kbdev->disjoint_event.state) > 0); ++ struct kbase_device *kbdev; ++ int ret; ++ int dvfs_period; + -+ kbase_disjoint_event(kbdev); ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ atomic_dec(&kbdev->disjoint_event.state); -+} ++ ret = kstrtoint(buf, 0, &dvfs_period); ++ if (ret || dvfs_period <= 0) { ++ dev_err(kbdev->dev, "Couldn't process dvfs_period write operation.\n" ++ "Use format \n"); ++ return -EINVAL; ++ } + -+/* increments the count only if the state is > 0 */ -+void kbase_disjoint_event_potential(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ kbdev->pm.dvfs_period = dvfs_period; ++ dev_dbg(kbdev->dev, "DVFS period: %dms\n", dvfs_period); + -+ if (atomic_read(&kbdev->disjoint_event.state)) -+ kbase_disjoint_event(kbdev); ++ return count; +} + -+u32 kbase_disjoint_event_get(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ -+ return atomic_read(&kbdev->disjoint_event.count); -+} -+KBASE_EXPORT_TEST_API(kbase_disjoint_event_get); -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dma_fence.c b/drivers/gpu/arm/bifrost/mali_kbase_dma_fence.c -new file mode 100755 -index 000000000000..1fac5e3e68f1 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_dma_fence.c -@@ -0,0 +1,473 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2016, 2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. ++/** ++ * dvfs_period_show - Show callback for the dvfs_period sysfs entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the GPU information. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ * This function is called to get the current period used for the DVFS sample ++ * timer. + * ++ * Return: The number of bytes output to @buf. + */ ++static ssize_t dvfs_period_show(struct device *dev, ++ struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *kbdev; ++ ssize_t ret; + -+/* Include mali_kbase_dma_fence.h before checking for CONFIG_MALI_BIFROST_DMA_FENCE as -+ * it will be set there. -+ */ -+#include "mali_kbase_dma_fence.h" -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static void -+kbase_dma_fence_work(struct work_struct *pwork); ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+static void -+kbase_dma_fence_waiters_add(struct kbase_jd_atom *katom) -+{ -+ struct kbase_context *kctx = katom->kctx; ++ ret = scnprintf(buf, PAGE_SIZE, "%d\n", kbdev->pm.dvfs_period); + -+ list_add_tail(&katom->queue, &kctx->dma_fence.waiting_resource); ++ return ret; +} + -+static void -+kbase_dma_fence_waiters_remove(struct kbase_jd_atom *katom) -+{ -+ list_del(&katom->queue); -+} ++static DEVICE_ATTR_RW(dvfs_period); + -+static int -+kbase_dma_fence_lock_reservations(struct kbase_dma_fence_resv_info *info, -+ struct ww_acquire_ctx *ctx) ++int kbase_pm_lowest_gpu_freq_init(struct kbase_device *kbdev) +{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) -+ struct reservation_object *content_res = NULL; -+#else -+ struct dma_resv *content_res = NULL; -+#endif -+ unsigned int content_res_idx = 0; -+ unsigned int r; -+ int err = 0; ++ /* Uses default reference frequency defined in below macro */ ++ u64 lowest_freq_khz = DEFAULT_REF_TIMEOUT_FREQ_KHZ; + -+ ww_acquire_init(ctx, &reservation_ww_class); ++ /* Only check lowest frequency in cases when OPPs are used and ++ * present in the device tree. ++ */ ++#ifdef CONFIG_PM_OPP ++ struct dev_pm_opp *opp_ptr; ++ unsigned long found_freq = 0; + -+retry: -+ for (r = 0; r < info->dma_fence_resv_count; r++) { -+ if (info->resv_objs[r] == content_res) { -+ content_res = NULL; -+ continue; -+ } ++ /* find lowest frequency OPP */ ++ opp_ptr = dev_pm_opp_find_freq_ceil(kbdev->dev, &found_freq); ++ if (IS_ERR(opp_ptr)) { ++ dev_err(kbdev->dev, "No OPPs found in device tree! Scaling timeouts using %llu kHz", ++ (unsigned long long)lowest_freq_khz); ++ } else { ++#if KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE ++ dev_pm_opp_put(opp_ptr); /* decrease OPP refcount */ ++#endif ++ /* convert found frequency to KHz */ ++ found_freq /= 1000; + -+ err = ww_mutex_lock(&info->resv_objs[r]->lock, ctx); -+ if (err) -+ goto error; ++ /* If lowest frequency in OPP table is still higher ++ * than the reference, then keep the reference frequency ++ * as the one to use for scaling . ++ */ ++ if (found_freq < lowest_freq_khz) ++ lowest_freq_khz = found_freq; + } ++#else ++ dev_err(kbdev->dev, "No operating-points-v2 node or operating-points property in DT"); ++#endif + -+ ww_acquire_done(ctx); -+ return err; -+ -+error: -+ content_res_idx = r; ++ kbdev->lowest_gpu_freq_khz = lowest_freq_khz; ++ dev_dbg(kbdev->dev, "Lowest frequency identified is %llu kHz", kbdev->lowest_gpu_freq_khz); ++ return 0; ++} + -+ /* Unlock the locked one ones */ -+ while (r--) -+ ww_mutex_unlock(&info->resv_objs[r]->lock); ++/** ++ * pm_poweroff_store - Store callback for the pm_poweroff sysfs file. ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file ++ * ++ * This function is called when the pm_poweroff sysfs file is written to. ++ * ++ * This file contains three values separated by whitespace. The values ++ * are gpu_poweroff_time (the period of the poweroff timer, in ns), ++ * poweroff_shader_ticks (the number of poweroff timer ticks before an idle ++ * shader is powered off), and poweroff_gpu_ticks (the number of poweroff timer ++ * ticks before the GPU is powered off), in that order. ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t pm_poweroff_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_device *kbdev; ++ struct kbasep_pm_tick_timer_state *stt; ++ int items; ++ u64 gpu_poweroff_time; ++ unsigned int poweroff_shader_ticks, poweroff_gpu_ticks; ++ unsigned long flags; + -+ if (content_res) -+ ww_mutex_unlock(&content_res->lock); ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ /* If we deadlock try with lock_slow and retry */ -+ if (err == -EDEADLK) { -+ content_res = info->resv_objs[content_res_idx]; -+ ww_mutex_lock_slow(&content_res->lock, ctx); -+ goto retry; ++ items = sscanf(buf, "%llu %u %u", &gpu_poweroff_time, ++ &poweroff_shader_ticks, ++ &poweroff_gpu_ticks); ++ if (items != 3) { ++ dev_err(kbdev->dev, "Couldn't process pm_poweroff write operation.\n" ++ "Use format \n"); ++ return -EINVAL; + } + -+ /* If we are here the function failed */ -+ ww_acquire_fini(ctx); -+ return err; -+} -+ -+static void -+kbase_dma_fence_unlock_reservations(struct kbase_dma_fence_resv_info *info, -+ struct ww_acquire_ctx *ctx) -+{ -+ unsigned int r; -+ -+ for (r = 0; r < info->dma_fence_resv_count; r++) -+ ww_mutex_unlock(&info->resv_objs[r]->lock); -+ ww_acquire_fini(ctx); -+} ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + ++ stt = &kbdev->pm.backend.shader_tick_timer; ++ stt->configured_interval = HR_TIMER_DELAY_NSEC(gpu_poweroff_time); ++ stt->default_ticks = poweroff_shader_ticks; ++ stt->configured_ticks = stt->default_ticks; + ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+/** -+ * kbase_dma_fence_queue_work() - Queue work to handle @katom -+ * @katom: Pointer to atom for which to queue work -+ * -+ * Queue kbase_dma_fence_work() for @katom to clean up the fence callbacks and -+ * submit the atom. -+ */ -+static void -+kbase_dma_fence_queue_work(struct kbase_jd_atom *katom) -+{ -+ struct kbase_context *kctx = katom->kctx; -+ bool ret; ++ if (poweroff_gpu_ticks != 0) ++ dev_warn(kbdev->dev, "Separate GPU poweroff delay no longer supported.\n"); + -+ INIT_WORK(&katom->work, kbase_dma_fence_work); -+ ret = queue_work(kctx->dma_fence.wq, &katom->work); -+ /* Warn if work was already queued, that should not happen. */ -+ WARN_ON(!ret); ++ return count; +} + +/** -+ * kbase_dma_fence_cancel_atom() - Cancels waiting on an atom -+ * @katom: Katom to cancel ++ * pm_poweroff_show - Show callback for the pm_poweroff sysfs entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the GPU information. + * -+ * Locking: katom->dma_fence.callbacks list assumes jctx.lock is held. ++ * This function is called to get the current period used for the DVFS sample ++ * timer. ++ * ++ * Return: The number of bytes output to @buf. + */ -+static void -+kbase_dma_fence_cancel_atom(struct kbase_jd_atom *katom) ++static ssize_t pm_poweroff_show(struct device *dev, ++ struct device_attribute *attr, char * const buf) +{ -+ lockdep_assert_held(&katom->kctx->jctx.lock); ++ struct kbase_device *kbdev; ++ struct kbasep_pm_tick_timer_state *stt; ++ ssize_t ret; ++ unsigned long flags; + -+ /* Cancel callbacks and clean up. */ -+ kbase_fence_free_callbacks(katom); ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ /* Mark the atom as handled in case all fences signaled just before -+ * canceling the callbacks and the worker was queued. -+ */ -+ kbase_fence_dep_count_set(katom, -1); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ /* Prevent job_done_nolock from being called twice on an atom when -+ * there is a race between job completion and cancellation. -+ */ ++ stt = &kbdev->pm.backend.shader_tick_timer; ++ ret = scnprintf(buf, PAGE_SIZE, "%llu %u 0\n", ++ ktime_to_ns(stt->configured_interval), ++ stt->default_ticks); + -+ if (katom->status == KBASE_JD_ATOM_STATE_QUEUED) { -+ /* Wait was cancelled - zap the atom */ -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ if (jd_done_nolock(katom, NULL)) -+ kbase_js_sched_all(katom->kctx->kbdev); -+ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ return ret; +} + ++static DEVICE_ATTR_RW(pm_poweroff); ++ +/** -+ * kbase_dma_fence_work() - Worker thread called when a fence is signaled -+ * @pwork: work_struct containing a pointer to a katom ++ * reset_timeout_store - Store callback for the reset_timeout sysfs file. ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file + * -+ * This function will clean and mark all dependencies as satisfied ++ * This function is called when the reset_timeout sysfs file is written to. It ++ * checks the data written, and if valid updates the reset timeout. ++ * ++ * Return: @count if the function succeeded. An error code on failure. + */ -+static void -+kbase_dma_fence_work(struct work_struct *pwork) ++static ssize_t reset_timeout_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) +{ -+ struct kbase_jd_atom *katom; -+ struct kbase_jd_context *ctx; ++ struct kbase_device *kbdev; ++ int ret; ++ int reset_timeout; + -+ katom = container_of(pwork, struct kbase_jd_atom, work); -+ ctx = &katom->kctx->jctx; -+ -+ mutex_lock(&ctx->lock); -+ if (kbase_fence_dep_count_read(katom) != 0) -+ goto out; ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ kbase_fence_dep_count_set(katom, -1); ++ ret = kstrtoint(buf, 0, &reset_timeout); ++ if (ret || reset_timeout <= 0) { ++ dev_err(kbdev->dev, "Couldn't process reset_timeout write operation.\n" ++ "Use format \n"); ++ return -EINVAL; ++ } + -+ /* Remove atom from list of dma-fence waiting atoms. */ -+ kbase_dma_fence_waiters_remove(katom); -+ /* Cleanup callbacks. */ -+ kbase_fence_free_callbacks(katom); -+ /* -+ * Queue atom on GPU, unless it has already completed due to a failing -+ * dependency. Run jd_done_nolock() on the katom if it is completed. -+ */ -+ if (unlikely(katom->status == KBASE_JD_ATOM_STATE_COMPLETED)) -+ jd_done_nolock(katom, NULL); -+ else -+ kbase_jd_dep_clear_locked(katom); ++ kbdev->reset_timeout_ms = reset_timeout; ++ dev_dbg(kbdev->dev, "Reset timeout: %dms\n", reset_timeout); + -+out: -+ mutex_unlock(&ctx->lock); ++ return count; +} + -+static void -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+kbase_dma_fence_cb(struct fence *fence, struct fence_cb *cb) -+#else -+kbase_dma_fence_cb(struct dma_fence *fence, struct dma_fence_cb *cb) -+#endif ++/** ++ * reset_timeout_show - Show callback for the reset_timeout sysfs entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the GPU information. ++ * ++ * This function is called to get the current reset timeout. ++ * ++ * Return: The number of bytes output to @buf. ++ */ ++static ssize_t reset_timeout_show(struct device *dev, ++ struct device_attribute *attr, char * const buf) +{ -+ struct kbase_fence_cb *kcb = container_of(cb, -+ struct kbase_fence_cb, -+ fence_cb); -+ struct kbase_jd_atom *katom = kcb->katom; ++ struct kbase_device *kbdev; ++ ssize_t ret; + -+ /* If the atom is zapped dep_count will be forced to a negative number -+ * preventing this callback from ever scheduling work. Which in turn -+ * would reschedule the atom. -+ */ ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ if (kbase_fence_dep_count_dec_and_test(katom)) -+ kbase_dma_fence_queue_work(katom); -+} ++ ret = scnprintf(buf, PAGE_SIZE, "%d\n", kbdev->reset_timeout_ms); + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) -+static int -+kbase_dma_fence_add_reservation_callback(struct kbase_jd_atom *katom, -+ struct reservation_object *resv, -+ bool exclusive) -+#else -+static int -+kbase_dma_fence_add_reservation_callback(struct kbase_jd_atom *katom, -+ struct dma_resv *resv, -+ bool exclusive) -+#endif -+{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *excl_fence = NULL; -+ struct fence **shared_fences = NULL; -+#else -+ struct dma_fence *excl_fence = NULL; -+ struct dma_fence **shared_fences = NULL; -+#endif -+ unsigned int shared_count = 0; -+ int err, i; ++ return ret; ++} + -+ err = reservation_object_get_fences_rcu(resv, -+ &excl_fence, -+ &shared_count, -+ &shared_fences); -+ if (err) -+ return err; ++static DEVICE_ATTR_RW(reset_timeout); + -+ if (excl_fence) { -+ err = kbase_fence_add_callback(katom, -+ excl_fence, -+ kbase_dma_fence_cb); ++static ssize_t mem_pool_size_show(struct device *dev, ++ struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *const kbdev = to_kbase_device(dev); + -+ /* Release our reference, taken by reservation_object_get_fences_rcu(), -+ * to the fence. We have set up our callback (if that was possible), -+ * and it's the fence's owner is responsible for singling the fence -+ * before allowing it to disappear. -+ */ -+ dma_fence_put(excl_fence); ++ if (!kbdev) ++ return -ENODEV; + -+ if (err) -+ goto out; -+ } ++ return kbase_debugfs_helper_get_attr_to_string(buf, PAGE_SIZE, ++ kbdev->mem_pools.small, MEMORY_GROUP_MANAGER_NR_GROUPS, ++ kbase_mem_pool_debugfs_size); ++} + -+ if (exclusive) { -+ for (i = 0; i < shared_count; i++) { -+ err = kbase_fence_add_callback(katom, -+ shared_fences[i], -+ kbase_dma_fence_cb); -+ if (err) -+ goto out; -+ } -+ } ++static ssize_t mem_pool_size_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_device *const kbdev = to_kbase_device(dev); ++ int err; + -+ /* Release all our references to the shared fences, taken by -+ * reservation_object_get_fences_rcu(). We have set up our callback (if -+ * that was possible), and it's the fence's owner is responsible for -+ * signaling the fence before allowing it to disappear. -+ */ -+out: -+ for (i = 0; i < shared_count; i++) -+ dma_fence_put(shared_fences[i]); -+ kfree(shared_fences); ++ if (!kbdev) ++ return -ENODEV; + -+ if (err) { -+ /* -+ * On error, cancel and clean up all callbacks that was set up -+ * before the error. -+ */ -+ kbase_fence_free_callbacks(katom); -+ } ++ err = kbase_debugfs_helper_set_attr_from_string(buf, ++ kbdev->mem_pools.small, MEMORY_GROUP_MANAGER_NR_GROUPS, ++ kbase_mem_pool_debugfs_trim); + -+ return err; ++ return err ? err : count; +} + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) -+void kbase_dma_fence_add_reservation(struct reservation_object *resv, -+ struct kbase_dma_fence_resv_info *info, -+ bool exclusive) -+#else -+void kbase_dma_fence_add_reservation(struct dma_resv *resv, -+ struct kbase_dma_fence_resv_info *info, -+ bool exclusive) -+#endif ++static DEVICE_ATTR_RW(mem_pool_size); ++ ++static ssize_t mem_pool_max_size_show(struct device *dev, ++ struct device_attribute *attr, char * const buf) +{ -+ unsigned int i; ++ struct kbase_device *const kbdev = to_kbase_device(dev); + -+ for (i = 0; i < info->dma_fence_resv_count; i++) { -+ /* Duplicate resource, ignore */ -+ if (info->resv_objs[i] == resv) -+ return; -+ } ++ if (!kbdev) ++ return -ENODEV; + -+ info->resv_objs[info->dma_fence_resv_count] = resv; -+ if (exclusive) -+ set_bit(info->dma_fence_resv_count, -+ info->dma_fence_excl_bitmap); -+ (info->dma_fence_resv_count)++; ++ return kbase_debugfs_helper_get_attr_to_string(buf, PAGE_SIZE, ++ kbdev->mem_pools.small, MEMORY_GROUP_MANAGER_NR_GROUPS, ++ kbase_mem_pool_debugfs_max_size); +} + -+int kbase_dma_fence_wait(struct kbase_jd_atom *katom, -+ struct kbase_dma_fence_resv_info *info) ++static ssize_t mem_pool_max_size_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) +{ -+ int err, i; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence; -+#else -+ struct dma_fence *fence; -+#endif -+ struct ww_acquire_ctx ww_ctx; ++ struct kbase_device *const kbdev = to_kbase_device(dev); ++ int err; + -+ lockdep_assert_held(&katom->kctx->jctx.lock); ++ if (!kbdev) ++ return -ENODEV; + -+ fence = kbase_fence_out_new(katom); -+ if (!fence) { -+ err = -ENOMEM; -+ dev_err(katom->kctx->kbdev->dev, -+ "Error %d creating fence.\n", err); -+ return err; -+ } ++ err = kbase_debugfs_helper_set_attr_from_string(buf, ++ kbdev->mem_pools.small, MEMORY_GROUP_MANAGER_NR_GROUPS, ++ kbase_mem_pool_debugfs_set_max_size); + -+ kbase_fence_dep_count_set(katom, 1); ++ return err ? err : count; ++} + -+ err = kbase_dma_fence_lock_reservations(info, &ww_ctx); -+ if (err) { -+ dev_err(katom->kctx->kbdev->dev, -+ "Error %d locking reservations.\n", err); -+ kbase_fence_dep_count_set(katom, -1); -+ kbase_fence_out_remove(katom); -+ return err; -+ } ++static DEVICE_ATTR_RW(mem_pool_max_size); + -+ for (i = 0; i < info->dma_fence_resv_count; i++) { -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) -+ struct reservation_object *obj = info->resv_objs[i]; -+#else -+ struct dma_resv *obj = info->resv_objs[i]; -+#endif -+ if (!test_bit(i, info->dma_fence_excl_bitmap)) { -+ err = reservation_object_reserve_shared(obj); -+ if (err) { -+ dev_err(katom->kctx->kbdev->dev, -+ "Error %d reserving space for shared fence.\n", err); -+ goto end; -+ } ++/** ++ * lp_mem_pool_size_show - Show size of the large memory pages pool. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the pool size. ++ * ++ * This function is called to get the number of large memory pages which currently populate the kbdev pool. ++ * ++ * Return: The number of bytes output to @buf. ++ */ ++static ssize_t lp_mem_pool_size_show(struct device *dev, ++ struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *const kbdev = to_kbase_device(dev); + -+ err = kbase_dma_fence_add_reservation_callback(katom, obj, false); -+ if (err) { -+ dev_err(katom->kctx->kbdev->dev, -+ "Error %d adding reservation to callback.\n", err); -+ goto end; -+ } ++ if (!kbdev) ++ return -ENODEV; + -+ reservation_object_add_shared_fence(obj, fence); -+ } else { -+ err = kbase_dma_fence_add_reservation_callback(katom, obj, true); -+ if (err) { -+ dev_err(katom->kctx->kbdev->dev, -+ "Error %d adding reservation to callback.\n", err); -+ goto end; -+ } ++ return kbase_debugfs_helper_get_attr_to_string(buf, PAGE_SIZE, ++ kbdev->mem_pools.large, MEMORY_GROUP_MANAGER_NR_GROUPS, ++ kbase_mem_pool_debugfs_size); ++} + -+ reservation_object_add_excl_fence(obj, fence); -+ } -+ } ++/** ++ * lp_mem_pool_size_store - Set size of the large memory pages pool. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The value written to the sysfs file. ++ * @count: The number of bytes written to the sysfs file. ++ * ++ * This function is called to set the number of large memory pages which should populate the kbdev pool. ++ * This may cause existing pages to be removed from the pool, or new pages to be created and then added to the pool. ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t lp_mem_pool_size_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_device *const kbdev = to_kbase_device(dev); ++ int err; + -+end: -+ kbase_dma_fence_unlock_reservations(info, &ww_ctx); ++ if (!kbdev) ++ return -ENODEV; + -+ if (likely(!err)) { -+ /* Test if the callbacks are already triggered */ -+ if (kbase_fence_dep_count_dec_and_test(katom)) { -+ kbase_fence_dep_count_set(katom, -1); -+ kbase_fence_free_callbacks(katom); -+ } else { -+ /* Add katom to the list of dma-buf fence waiting atoms -+ * only if it is still waiting. -+ */ -+ kbase_dma_fence_waiters_add(katom); -+ } -+ } else { -+ /* There was an error, cancel callbacks, set dep_count to -1 to -+ * indicate that the atom has been handled (the caller will -+ * kill it for us), signal the fence, free callbacks and the -+ * fence. -+ */ -+ kbase_fence_free_callbacks(katom); -+ kbase_fence_dep_count_set(katom, -1); -+ kbase_dma_fence_signal(katom); -+ } ++ err = kbase_debugfs_helper_set_attr_from_string(buf, ++ kbdev->mem_pools.large, MEMORY_GROUP_MANAGER_NR_GROUPS, ++ kbase_mem_pool_debugfs_trim); + -+ return err; ++ return err ? err : count; +} + -+void kbase_dma_fence_cancel_all_atoms(struct kbase_context *kctx) -+{ -+ struct list_head *list = &kctx->dma_fence.waiting_resource; ++static DEVICE_ATTR_RW(lp_mem_pool_size); + -+ while (!list_empty(list)) { -+ struct kbase_jd_atom *katom; ++/** ++ * lp_mem_pool_max_size_show - Show maximum size of the large memory pages pool. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the pool size. ++ * ++ * This function is called to get the maximum number of large memory pages that the kbdev pool can possibly contain. ++ * ++ * Return: The number of bytes output to @buf. ++ */ ++static ssize_t lp_mem_pool_max_size_show(struct device *dev, ++ struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *const kbdev = to_kbase_device(dev); + -+ katom = list_first_entry(list, struct kbase_jd_atom, queue); -+ kbase_dma_fence_waiters_remove(katom); -+ kbase_dma_fence_cancel_atom(katom); -+ } -+} ++ if (!kbdev) ++ return -ENODEV; + -+void kbase_dma_fence_cancel_callbacks(struct kbase_jd_atom *katom) -+{ -+ /* Cancel callbacks and clean up. */ -+ if (kbase_fence_free_callbacks(katom)) -+ kbase_dma_fence_queue_work(katom); ++ return kbase_debugfs_helper_get_attr_to_string(buf, PAGE_SIZE, ++ kbdev->mem_pools.large, MEMORY_GROUP_MANAGER_NR_GROUPS, ++ kbase_mem_pool_debugfs_max_size); +} + -+void kbase_dma_fence_signal(struct kbase_jd_atom *katom) ++/** ++ * lp_mem_pool_max_size_store - Set maximum size of the large memory pages pool. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The value written to the sysfs file. ++ * @count: The number of bytes written to the sysfs file. ++ * ++ * This function is called to set the maximum number of large memory pages that the kbdev pool can possibly contain. ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t lp_mem_pool_max_size_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) +{ -+ if (!katom->dma_fence.fence) -+ return; ++ struct kbase_device *const kbdev = to_kbase_device(dev); ++ int err; + -+ /* Signal the atom's fence. */ -+ dma_fence_signal(katom->dma_fence.fence); ++ if (!kbdev) ++ return -ENODEV; + -+ kbase_fence_out_remove(katom); ++ err = kbase_debugfs_helper_set_attr_from_string(buf, ++ kbdev->mem_pools.large, MEMORY_GROUP_MANAGER_NR_GROUPS, ++ kbase_mem_pool_debugfs_set_max_size); + -+ kbase_fence_free_callbacks(katom); ++ return err ? err : count; +} + -+void kbase_dma_fence_term(struct kbase_context *kctx) -+{ -+ destroy_workqueue(kctx->dma_fence.wq); -+ kctx->dma_fence.wq = NULL; -+} ++static DEVICE_ATTR_RW(lp_mem_pool_max_size); + -+int kbase_dma_fence_init(struct kbase_context *kctx) ++/** ++ * show_simplified_mem_pool_max_size - Show the maximum size for the memory ++ * pool 0 of small (4KiB) pages. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the max size. ++ * ++ * This function is called to get the maximum size for the memory pool 0 of ++ * small (4KiB) pages. It is assumed that the maximum size value is same for ++ * all the pools. ++ * ++ * Return: The number of bytes output to @buf. ++ */ ++static ssize_t show_simplified_mem_pool_max_size(struct device *dev, ++ struct device_attribute *attr, char * const buf) +{ -+ INIT_LIST_HEAD(&kctx->dma_fence.waiting_resource); ++ struct kbase_device *const kbdev = to_kbase_device(dev); + -+ kctx->dma_fence.wq = alloc_workqueue("mali-fence-%d", -+ WQ_UNBOUND, 1, kctx->pid); -+ if (!kctx->dma_fence.wq) -+ return -ENOMEM; ++ if (!kbdev) ++ return -ENODEV; + -+ return 0; ++ return kbase_debugfs_helper_get_attr_to_string(buf, PAGE_SIZE, ++ kbdev->mem_pools.small, 1, kbase_mem_pool_debugfs_max_size); +} -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dma_fence.h b/drivers/gpu/arm/bifrost/mali_kbase_dma_fence.h -new file mode 100755 -index 000000000000..3ac8186328a1 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_dma_fence.h -@@ -0,0 +1,144 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2016, 2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. ++ ++/** ++ * set_simplified_mem_pool_max_size - Set the same maximum size for all the ++ * memory pools of small (4KiB) pages. ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file + * -+ * SPDX-License-Identifier: GPL-2.0 ++ * This function is called to set the same maximum size for all the memory ++ * pools of small (4KiB) pages. + * ++ * Return: The number of bytes output to @buf. + */ ++static ssize_t set_simplified_mem_pool_max_size(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_device *const kbdev = to_kbase_device(dev); ++ unsigned long new_size; ++ int gid; ++ int err; + -+#ifndef _KBASE_DMA_FENCE_H_ -+#define _KBASE_DMA_FENCE_H_ ++ if (!kbdev) ++ return -ENODEV; + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE ++ err = kstrtoul(buf, 0, &new_size); ++ if (err) ++ return -EINVAL; + -+#include -+#include -+#include ++ for (gid = 0; gid < MEMORY_GROUP_MANAGER_NR_GROUPS; ++gid) ++ kbase_mem_pool_debugfs_set_max_size( ++ kbdev->mem_pools.small, gid, (size_t)new_size); + -+/* Forward declaration from mali_kbase_defs.h */ -+struct kbase_jd_atom; -+struct kbase_context; ++ return count; ++} + -+/** -+ * struct kbase_dma_fence_resv_info - Structure with list of reservation objects -+ * @resv_objs: Array of reservation objects to attach the -+ * new fence to. -+ * @dma_fence_resv_count: Number of reservation objects in the array. -+ * @dma_fence_excl_bitmap: Specifies which resv_obj are exclusive. -+ * -+ * This is used by some functions to pass around a collection of data about -+ * reservation objects. -+ */ -+struct kbase_dma_fence_resv_info { -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) -+ struct reservation_object **resv_objs; -+#else -+ struct dma_resv **resv_objs; -+#endif -+ unsigned int dma_fence_resv_count; -+ unsigned long *dma_fence_excl_bitmap; -+}; ++static DEVICE_ATTR(max_size, 0600, show_simplified_mem_pool_max_size, ++ set_simplified_mem_pool_max_size); + +/** -+ * kbase_dma_fence_add_reservation() - Adds a resv to the array of resv_objs -+ * @resv: Reservation object to add to the array. -+ * @info: Pointer to struct with current reservation info -+ * @exclusive: Boolean indicating if exclusive access is needed ++ * show_simplified_lp_mem_pool_max_size - Show the maximum size for the memory ++ * pool 0 of large (2MiB) pages. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the total current pool size. + * -+ * The function adds a new reservation_object to an existing array of -+ * reservation_objects. At the same time keeps track of which objects require -+ * exclusive access in dma_fence_excl_bitmap. -+ */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) -+void kbase_dma_fence_add_reservation(struct reservation_object *resv, -+ struct kbase_dma_fence_resv_info *info, -+ bool exclusive); -+#else -+void kbase_dma_fence_add_reservation(struct dma_resv *resv, -+ struct kbase_dma_fence_resv_info *info, -+ bool exclusive); -+#endif -+ -+/** -+ * kbase_dma_fence_wait() - Creates a new fence and attaches it to the resv_objs -+ * @katom: Katom with the external dependency. -+ * @info: Pointer to struct with current reservation info ++ * This function is called to get the maximum size for the memory pool 0 of ++ * large (2MiB) pages. It is assumed that the maximum size value is same for ++ * all the pools. + * -+ * Return: An error code or 0 if succeeds ++ * Return: The number of bytes output to @buf. + */ -+int kbase_dma_fence_wait(struct kbase_jd_atom *katom, -+ struct kbase_dma_fence_resv_info *info); ++static ssize_t show_simplified_lp_mem_pool_max_size(struct device *dev, ++ struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *const kbdev = to_kbase_device(dev); ++ ++ if (!kbdev) ++ return -ENODEV; ++ ++ return kbase_debugfs_helper_get_attr_to_string(buf, PAGE_SIZE, ++ kbdev->mem_pools.large, 1, kbase_mem_pool_debugfs_max_size); ++} + +/** -+ * kbase_dma_fence_cancel_ctx() - Cancel all dma-fences blocked atoms on kctx -+ * @kctx: Pointer to kbase context ++ * set_simplified_lp_mem_pool_max_size - Set the same maximum size for all the ++ * memory pools of large (2MiB) pages. ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file + * -+ * This function will cancel and clean up all katoms on @kctx that is waiting -+ * on dma-buf fences. ++ * This function is called to set the same maximum size for all the memory ++ * pools of large (2MiB) pages. + * -+ * Locking: jctx.lock needs to be held when calling this function. ++ * Return: The number of bytes output to @buf. + */ -+void kbase_dma_fence_cancel_all_atoms(struct kbase_context *kctx); ++static ssize_t set_simplified_lp_mem_pool_max_size(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_device *const kbdev = to_kbase_device(dev); ++ unsigned long new_size; ++ int gid; ++ int err; ++ ++ if (!kbdev) ++ return -ENODEV; ++ ++ err = kstrtoul(buf, 0, &new_size); ++ if (err) ++ return -EINVAL; ++ ++ for (gid = 0; gid < MEMORY_GROUP_MANAGER_NR_GROUPS; ++gid) ++ kbase_mem_pool_debugfs_set_max_size( ++ kbdev->mem_pools.large, gid, (size_t)new_size); ++ ++ return count; ++} ++ ++static DEVICE_ATTR(lp_max_size, 0600, show_simplified_lp_mem_pool_max_size, ++ set_simplified_lp_mem_pool_max_size); + +/** -+ * kbase_dma_fence_cancel_callbacks() - Cancel only callbacks on katom -+ * @katom: Pointer to katom whose callbacks are to be canceled -+ * -+ * This function cancels all dma-buf fence callbacks on @katom, but does not -+ * cancel the katom itself. ++ * show_simplified_ctx_default_max_size - Show the default maximum size for the ++ * memory pool 0 of small (4KiB) pages. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the pool size. + * -+ * The caller is responsible for ensuring that jd_done_nolock is called on -+ * @katom. ++ * This function is called to get the default ctx maximum size for the memory ++ * pool 0 of small (4KiB) pages. It is assumed that maximum size value is same ++ * for all the pools. The maximum size for the pool of large (2MiB) pages will ++ * be same as max size of the pool of small (4KiB) pages in terms of bytes. + * -+ * Locking: jctx.lock must be held when calling this function. ++ * Return: The number of bytes output to @buf. + */ -+void kbase_dma_fence_cancel_callbacks(struct kbase_jd_atom *katom); ++static ssize_t show_simplified_ctx_default_max_size(struct device *dev, ++ struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *kbdev = to_kbase_device(dev); ++ size_t max_size; ++ ++ if (!kbdev) ++ return -ENODEV; ++ ++ max_size = kbase_mem_pool_config_debugfs_max_size( ++ kbdev->mem_pool_defaults.small, 0); ++ ++ return scnprintf(buf, PAGE_SIZE, "%zu\n", max_size); ++} + +/** -+ * kbase_dma_fence_signal() - Signal katom's fence and clean up after wait -+ * @katom: Pointer to katom to signal and clean up ++ * set_simplified_ctx_default_max_size - Set the same default maximum size for ++ * all the pools created for new ++ * contexts. This covers the pool of ++ * large pages as well and its max size ++ * will be same as max size of the pool ++ * of small pages in terms of bytes. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The value written to the sysfs file. ++ * @count: The number of bytes written to the sysfs file. + * -+ * This function will signal the @katom's fence, if it has one, and clean up -+ * the callback data from the katom's wait on earlier fences. ++ * This function is called to set the same maximum size for all pools created ++ * for new contexts. + * -+ * Locking: jctx.lock must be held while calling this function. ++ * Return: @count if the function succeeded. An error code on failure. + */ -+void kbase_dma_fence_signal(struct kbase_jd_atom *katom); ++static ssize_t set_simplified_ctx_default_max_size(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_device *kbdev; ++ unsigned long new_size; ++ int err; + -+/** -+ * kbase_dma_fence_term() - Terminate Mali dma-fence context -+ * @kctx: kbase context to terminate -+ */ -+void kbase_dma_fence_term(struct kbase_context *kctx); ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+/** -+ * kbase_dma_fence_init() - Initialize Mali dma-fence context -+ * @kctx: kbase context to initialize -+ */ -+int kbase_dma_fence_init(struct kbase_context *kctx); ++ err = kstrtoul(buf, 0, &new_size); ++ if (err) ++ return -EINVAL; + -+#else /* CONFIG_MALI_BIFROST_DMA_FENCE */ -+/* Dummy functions for when dma-buf fence isn't enabled. */ ++ kbase_mem_pool_group_config_set_max_size( ++ &kbdev->mem_pool_defaults, (size_t)new_size); + -+static inline int kbase_dma_fence_init(struct kbase_context *kctx) -+{ -+ return 0; ++ return count; +} + -+static inline void kbase_dma_fence_term(struct kbase_context *kctx) {} -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ -+#endif -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c -new file mode 100755 -index 000000000000..a5a7ad744a8e ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c -@@ -0,0 +1,442 @@ -+/* -+ * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++static DEVICE_ATTR(ctx_default_max_size, 0600, ++ show_simplified_ctx_default_max_size, ++ set_simplified_ctx_default_max_size); ++ ++#if !MALI_USE_CSF ++/** ++ * js_ctx_scheduling_mode_show - Show callback for js_ctx_scheduling_mode sysfs ++ * entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the context scheduling mode information. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * This function is called to get the context scheduling mode being used by JS. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * Return: The number of bytes output to @buf. ++ */ ++static ssize_t js_ctx_scheduling_mode_show(struct device *dev, ++ struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *kbdev; ++ ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; ++ ++ return scnprintf(buf, PAGE_SIZE, "%u\n", kbdev->js_ctx_scheduling_mode); ++} ++ ++/** ++ * js_ctx_scheduling_mode_store - Set callback for js_ctx_scheduling_mode sysfs ++ * entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The value written to the sysfs file. ++ * @count: The number of bytes written to the sysfs file. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ * This function is called when the js_ctx_scheduling_mode sysfs file is written ++ * to. It checks the data written, and if valid updates the ctx scheduling mode ++ * being by JS. + * ++ * Return: @count if the function succeeded. An error code on failure. + */ ++static ssize_t js_ctx_scheduling_mode_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_context *kctx; ++ u32 new_js_ctx_scheduling_mode; ++ struct kbase_device *kbdev; ++ unsigned long flags; ++ int ret; + -+/* -+ * Implementation of the dummy job execution workaround for the GPU hang issue. -+ */ ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+#include -+#include -+#include ++ ret = kstrtouint(buf, 0, &new_js_ctx_scheduling_mode); ++ if (ret || new_js_ctx_scheduling_mode >= KBASE_JS_PRIORITY_MODE_COUNT) { ++ dev_err(kbdev->dev, "Couldn't process js_ctx_scheduling_mode" ++ " write operation.\n" ++ "Use format \n"); ++ return -EINVAL; ++ } + -+#include -+#include ++ if (new_js_ctx_scheduling_mode == kbdev->js_ctx_scheduling_mode) ++ return count; + -+#define DUMMY_JOB_WA_BINARY_NAME "valhall-1691526.wa" ++ mutex_lock(&kbdev->kctx_list_lock); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+struct wa_header { -+ u16 signature; -+ u16 version; -+ u32 info_offset; -+} __packed; ++ /* Update the context priority mode */ ++ kbdev->js_ctx_scheduling_mode = new_js_ctx_scheduling_mode; + -+struct wa_v2_info { -+ u64 jc; -+ u32 js; -+ u32 blob_offset; -+ u64 flags; -+} __packed; ++ /* Adjust priority of all the contexts as per the new mode */ ++ list_for_each_entry(kctx, &kbdev->kctx_list, kctx_list_link) ++ kbase_js_update_ctx_priority(kctx); + -+struct wa_blob { -+ u64 base; -+ u32 size; -+ u32 map_flags; -+ u32 payload_offset; -+ u32 blob_offset; -+} __packed; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->kctx_list_lock); + -+static bool in_range(const u8 *base, const u8 *end, off_t off, size_t sz) -+{ -+ return !(end - base - off < sz); ++ dev_dbg(kbdev->dev, "JS ctx scheduling mode: %u\n", new_js_ctx_scheduling_mode); ++ ++ return count; +} + -+static u32 wait_any(struct kbase_device *kbdev, off_t offset, u32 bits) ++static DEVICE_ATTR_RW(js_ctx_scheduling_mode); ++ ++/* Number of entries in serialize_jobs_settings[] */ ++#define NR_SERIALIZE_JOBS_SETTINGS 5 ++/* Maximum string length in serialize_jobs_settings[].name */ ++#define MAX_SERIALIZE_JOBS_NAME_LEN 16 ++ ++static struct +{ -+ int loop; -+ const int timeout = 100; -+ u32 val; ++ char *name; ++ u8 setting; ++} serialize_jobs_settings[NR_SERIALIZE_JOBS_SETTINGS] = { ++ {"none", 0}, ++ {"intra-slot", KBASE_SERIALIZE_INTRA_SLOT}, ++ {"inter-slot", KBASE_SERIALIZE_INTER_SLOT}, ++ {"full", KBASE_SERIALIZE_INTRA_SLOT | KBASE_SERIALIZE_INTER_SLOT}, ++ {"full-reset", KBASE_SERIALIZE_INTRA_SLOT | KBASE_SERIALIZE_INTER_SLOT | ++ KBASE_SERIALIZE_RESET} ++}; + -+ for (loop = 0; loop < timeout; loop++) { -+ val = kbase_reg_read(kbdev, offset); -+ if (val & bits) ++/** ++ * update_serialize_jobs_setting - Update the serialization setting for the ++ * submission of GPU jobs. ++ * ++ * @kbdev: An instance of the GPU platform device, allocated from the probe ++ * method of the driver. ++ * @buf: Buffer containing the value written to the sysfs/debugfs file. ++ * @count: The number of bytes to write to the sysfs/debugfs file. ++ * ++ * This function is called when the serialize_jobs sysfs/debugfs file is ++ * written to. It matches the requested setting against the available settings ++ * and if a matching setting is found updates kbdev->serialize_jobs. ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t update_serialize_jobs_setting(struct kbase_device *kbdev, ++ const char *buf, size_t count) ++{ ++ int i; ++ bool valid = false; ++ ++ for (i = 0; i < NR_SERIALIZE_JOBS_SETTINGS; i++) { ++ if (sysfs_streq(serialize_jobs_settings[i].name, buf)) { ++ kbdev->serialize_jobs = ++ serialize_jobs_settings[i].setting; ++ valid = true; + break; -+ udelay(10); ++ } + } + -+ if (loop == timeout) { -+ dev_err(kbdev->dev, -+ "Timeout reading register 0x%lx, bits 0x%lx, last read was 0x%lx\n", -+ (unsigned long)offset, (unsigned long)bits, -+ (unsigned long)val); ++ if (!valid) { ++ dev_err(kbdev->dev, "serialize_jobs: invalid setting"); ++ return -EINVAL; + } + -+ return (val & bits); ++ return count; +} + -+static int wait(struct kbase_device *kbdev, off_t offset, u32 bits, bool set) ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++/** ++ * kbasep_serialize_jobs_seq_debugfs_show - Show callback for the serialize_jobs ++ * debugfs file ++ * @sfile: seq_file pointer ++ * @data: Private callback data ++ * ++ * This function is called to get the contents of the serialize_jobs debugfs ++ * file. This is a list of the available settings with the currently active one ++ * surrounded by square brackets. ++ * ++ * Return: 0 on success, or an error code on error ++ */ ++static int kbasep_serialize_jobs_seq_debugfs_show(struct seq_file *sfile, ++ void *data) +{ -+ int loop; -+ const int timeout = 100; -+ u32 val; -+ u32 target = 0; -+ -+ if (set) -+ target = bits; ++ struct kbase_device *kbdev = sfile->private; ++ int i; + -+ for (loop = 0; loop < timeout; loop++) { -+ val = kbase_reg_read(kbdev, (offset)); -+ if ((val & bits) == target) -+ break; ++ CSTD_UNUSED(data); + -+ udelay(10); ++ for (i = 0; i < NR_SERIALIZE_JOBS_SETTINGS; i++) { ++ if (kbdev->serialize_jobs == serialize_jobs_settings[i].setting) ++ seq_printf(sfile, "[%s] ", ++ serialize_jobs_settings[i].name); ++ else ++ seq_printf(sfile, "%s ", ++ serialize_jobs_settings[i].name); + } + -+ if (loop == timeout) { -+ dev_err(kbdev->dev, -+ "Timeout reading register 0x%lx, bits 0x%lx, last read was 0x%lx\n", -+ (unsigned long)offset, (unsigned long)bits, -+ (unsigned long)val); -+ return -ETIMEDOUT; -+ } ++ seq_puts(sfile, "\n"); + + return 0; +} + -+static inline int run_job(struct kbase_device *kbdev, int as, int slot, -+ u64 cores, u64 jc) ++/** ++ * kbasep_serialize_jobs_debugfs_write - Store callback for the serialize_jobs ++ * debugfs file. ++ * @file: File pointer ++ * @ubuf: User buffer containing data to store ++ * @count: Number of bytes in user buffer ++ * @ppos: File position ++ * ++ * This function is called when the serialize_jobs debugfs file is written to. ++ * It matches the requested setting against the available settings and if a ++ * matching setting is found updates kbdev->serialize_jobs. ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t kbasep_serialize_jobs_debugfs_write(struct file *file, ++ const char __user *ubuf, size_t count, loff_t *ppos) +{ -+ u32 done; -+ -+ /* setup job */ -+ kbase_reg_write(kbdev, JOB_SLOT_REG(slot, JS_HEAD_NEXT_LO), -+ jc & U32_MAX); -+ kbase_reg_write(kbdev, JOB_SLOT_REG(slot, JS_HEAD_NEXT_HI), -+ jc >> 32); -+ kbase_reg_write(kbdev, JOB_SLOT_REG(slot, JS_AFFINITY_NEXT_LO), -+ cores & U32_MAX); -+ kbase_reg_write(kbdev, JOB_SLOT_REG(slot, JS_AFFINITY_NEXT_HI), -+ cores >> 32); -+ kbase_reg_write(kbdev, JOB_SLOT_REG(slot, JS_CONFIG_NEXT), -+ JS_CONFIG_DISABLE_DESCRIPTOR_WR_BK | as); ++ struct seq_file *s = file->private_data; ++ struct kbase_device *kbdev = s->private; ++ char buf[MAX_SERIALIZE_JOBS_NAME_LEN]; + -+ /* go */ -+ kbase_reg_write(kbdev, JOB_SLOT_REG(slot, JS_COMMAND_NEXT), -+ JS_COMMAND_START); ++ CSTD_UNUSED(ppos); + -+ /* wait for the slot to finish (done, error) */ -+ done = wait_any(kbdev, JOB_CONTROL_REG(JOB_IRQ_RAWSTAT), -+ (1ul << (16+slot)) | (1ul << slot)); -+ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_CLEAR), done); ++ count = min_t(size_t, sizeof(buf) - 1, count); ++ if (copy_from_user(buf, ubuf, count)) ++ return -EFAULT; + -+ if (done != (1ul << slot)) { -+ dev_err(kbdev->dev, -+ "Failed to run WA job on slot %d cores 0x%llx: done 0x%lx\n", -+ slot, (unsigned long long)cores, -+ (unsigned long)done); -+ dev_err(kbdev->dev, "JS_STATUS on failure: 0x%x\n", -+ kbase_reg_read(kbdev, JOB_SLOT_REG(slot, JS_STATUS))); ++ buf[count] = 0; + -+ return -EFAULT; -+ } else { -+ return 0; -+ } ++ return update_serialize_jobs_setting(kbdev, buf, count); +} + -+/* To be called after power up & MMU init, but before everything else */ -+int kbase_dummy_job_wa_execute(struct kbase_device *kbdev, u64 cores) ++/** ++ * kbasep_serialize_jobs_debugfs_open - Open callback for the serialize_jobs ++ * debugfs file ++ * @in: inode pointer ++ * @file: file pointer ++ * ++ * Return: Zero on success, error code on failure ++ */ ++static int kbasep_serialize_jobs_debugfs_open(struct inode *in, ++ struct file *file) +{ -+ int as; -+ int slot; -+ u64 jc; -+ int failed = 0; -+ int runs = 0; -+ u32 old_gpu_mask; -+ u32 old_job_mask; -+ -+ if (!kbdev) -+ return -EFAULT; ++ return single_open(file, kbasep_serialize_jobs_seq_debugfs_show, ++ in->i_private); ++} + -+ if (!kbdev->dummy_job_wa.ctx) -+ return -EFAULT; ++static const struct file_operations kbasep_serialize_jobs_debugfs_fops = { ++ .owner = THIS_MODULE, ++ .open = kbasep_serialize_jobs_debugfs_open, ++ .read = seq_read, ++ .write = kbasep_serialize_jobs_debugfs_write, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; + -+ as = kbdev->dummy_job_wa.ctx->as_nr; -+ slot = kbdev->dummy_job_wa.slot; -+ jc = kbdev->dummy_job_wa.jc; ++#endif /* CONFIG_DEBUG_FS */ + -+ /* mask off all but MMU IRQs */ -+ old_gpu_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK)); -+ old_job_mask = kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_MASK)); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), 0); -+ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_MASK), 0); ++/** ++ * show_serialize_jobs_sysfs - Show callback for serialize_jobs sysfs file. ++ * ++ * @dev: The device this sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The output buffer for the sysfs file contents ++ * ++ * This function is called to get the contents of the serialize_jobs sysfs ++ * file. This is a list of the available settings with the currently active ++ * one surrounded by square brackets. ++ * ++ * Return: The number of bytes output to @buf. ++ */ ++static ssize_t show_serialize_jobs_sysfs(struct device *dev, ++ struct device_attribute *attr, ++ char *buf) ++{ ++ struct kbase_device *kbdev = to_kbase_device(dev); ++ ssize_t ret = 0; ++ int i; + -+ /* power up requested cores */ -+ kbase_reg_write(kbdev, SHADER_PWRON_LO, (cores & U32_MAX)); -+ kbase_reg_write(kbdev, SHADER_PWRON_HI, (cores >> 32)); ++ for (i = 0; i < NR_SERIALIZE_JOBS_SETTINGS; i++) { ++ if (kbdev->serialize_jobs == ++ serialize_jobs_settings[i].setting) ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "[%s]", ++ serialize_jobs_settings[i].name); ++ else ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s ", ++ serialize_jobs_settings[i].name); ++ } + -+ if (kbdev->dummy_job_wa.flags & KBASE_DUMMY_JOB_WA_FLAG_WAIT_POWERUP) { -+ /* wait for power-ups */ -+ wait(kbdev, SHADER_READY_LO, (cores & U32_MAX), true); -+ if (cores >> 32) -+ wait(kbdev, SHADER_READY_HI, (cores >> 32), true); ++ if (ret < PAGE_SIZE - 1) { ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "\n"); ++ } else { ++ buf[PAGE_SIZE - 2] = '\n'; ++ buf[PAGE_SIZE - 1] = '\0'; ++ ret = PAGE_SIZE - 1; + } + -+ if (kbdev->dummy_job_wa.flags & KBASE_DUMMY_JOB_WA_FLAG_SERIALIZE) { -+ int i; ++ return ret; ++} + -+ /* do for each requested core */ -+ for (i = 0; i < sizeof(cores) * 8; i++) { -+ u64 affinity; ++/** ++ * store_serialize_jobs_sysfs - Store callback for serialize_jobs sysfs file. ++ * ++ * @dev: The device this sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes to write to the sysfs file ++ * ++ * This function is called when the serialize_jobs sysfs file is written to. ++ * It matches the requested setting against the available settings and if a ++ * matching setting is found updates kbdev->serialize_jobs. ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t store_serialize_jobs_sysfs(struct device *dev, ++ struct device_attribute *attr, ++ const char *buf, size_t count) ++{ ++ return update_serialize_jobs_setting(to_kbase_device(dev), buf, count); ++} + -+ affinity = 1ull << i; ++static DEVICE_ATTR(serialize_jobs, 0600, show_serialize_jobs_sysfs, ++ store_serialize_jobs_sysfs); ++#endif /* !MALI_USE_CSF */ + -+ if (!(cores & affinity)) -+ continue; ++static void kbasep_protected_mode_hwcnt_disable_worker(struct work_struct *data) ++{ ++ struct kbase_device *kbdev = container_of(data, struct kbase_device, ++ protected_mode_hwcnt_disable_work); ++ spinlock_t *backend_lock; ++ unsigned long flags; + -+ if (run_job(kbdev, as, slot, affinity, jc)) -+ failed++; -+ runs++; -+ } ++ bool do_disable; + -+ } else { -+ if (run_job(kbdev, as, slot, cores, jc)) -+ failed++; -+ runs++; -+ } ++#if MALI_USE_CSF ++ backend_lock = &kbdev->csf.scheduler.interrupt_lock; ++#else ++ backend_lock = &kbdev->hwaccess_lock; ++#endif + -+ if (kbdev->dummy_job_wa.flags & -+ KBASE_DUMMY_JOB_WA_FLAG_LOGICAL_SHADER_POWER) { -+ /* power off shader cores (to reduce any dynamic leakage) */ -+ kbase_reg_write(kbdev, SHADER_PWROFF_LO, (cores & U32_MAX)); -+ kbase_reg_write(kbdev, SHADER_PWROFF_HI, (cores >> 32)); ++ spin_lock_irqsave(backend_lock, flags); ++ do_disable = !kbdev->protected_mode_hwcnt_desired && ++ !kbdev->protected_mode_hwcnt_disabled; ++ spin_unlock_irqrestore(backend_lock, flags); + -+ /* wait for power off complete */ -+ wait(kbdev, SHADER_READY_LO, (cores & U32_MAX), false); -+ wait(kbdev, SHADER_PWRTRANS_LO, (cores & U32_MAX), false); -+ if (cores >> 32) { -+ wait(kbdev, SHADER_READY_HI, (cores >> 32), false); -+ wait(kbdev, SHADER_PWRTRANS_HI, (cores >> 32), false); -+ } -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), U32_MAX); -+ } ++ if (!do_disable) ++ return; + -+ /* restore IRQ masks */ -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), old_gpu_mask); -+ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_MASK), old_job_mask); ++ kbase_hwcnt_context_disable(kbdev->hwcnt_gpu_ctx); + -+ if (failed) -+ dev_err(kbdev->dev, -+ "WA complete with %d failures out of %d runs\n", failed, -+ runs); ++ spin_lock_irqsave(backend_lock, flags); ++ do_disable = !kbdev->protected_mode_hwcnt_desired && ++ !kbdev->protected_mode_hwcnt_disabled; + -+ return failed ? -EFAULT : 0; ++ if (do_disable) { ++ /* Protected mode state did not change while we were doing the ++ * disable, so commit the work we just performed and continue ++ * the state machine. ++ */ ++ kbdev->protected_mode_hwcnt_disabled = true; ++#if !MALI_USE_CSF ++ kbase_backend_slot_update(kbdev); ++#endif /* !MALI_USE_CSF */ ++ } else { ++ /* Protected mode state was updated while we were doing the ++ * disable, so we need to undo the disable we just performed. ++ */ ++ kbase_hwcnt_context_enable(kbdev->hwcnt_gpu_ctx); ++ } ++ ++ spin_unlock_irqrestore(backend_lock, flags); +} + -+static ssize_t show_dummy_job_wa_info(struct device * const dev, -+ struct device_attribute * const attr, char * const buf) ++#ifndef PLATFORM_PROTECTED_CALLBACKS ++static int kbasep_protected_mode_enable(struct protected_mode_device *pdev) +{ -+ struct kbase_device *const kbdev = dev_get_drvdata(dev); -+ int err; ++ struct kbase_device *kbdev = pdev->data; + -+ if (!kbdev || !kbdev->dummy_job_wa.ctx) -+ return -ENODEV; ++ return kbase_pm_protected_mode_enable(kbdev); ++} + -+ err = scnprintf(buf, PAGE_SIZE, "slot %u flags %llx\n", -+ kbdev->dummy_job_wa.slot, kbdev->dummy_job_wa.flags); ++static int kbasep_protected_mode_disable(struct protected_mode_device *pdev) ++{ ++ struct kbase_device *kbdev = pdev->data; + -+ return err; ++ return kbase_pm_protected_mode_disable(kbdev); +} + -+static DEVICE_ATTR(dummy_job_wa_info, 0444, show_dummy_job_wa_info, NULL); -+ -+static bool wa_blob_load_needed(struct kbase_device *kbdev) -+{ -+ if (of_machine_is_compatible("arm,juno")) -+ return false; ++static const struct protected_mode_ops kbasep_native_protected_ops = { ++ .protected_mode_enable = kbasep_protected_mode_enable, ++ .protected_mode_disable = kbasep_protected_mode_disable ++}; + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TTRX_3485)) -+ return true; ++#define PLATFORM_PROTECTED_CALLBACKS (&kbasep_native_protected_ops) ++#endif /* PLATFORM_PROTECTED_CALLBACKS */ + -+ return false; ++int kbase_protected_mode_init(struct kbase_device *kbdev) ++{ ++ /* Use native protected ops */ ++ kbdev->protected_dev = kzalloc(sizeof(*kbdev->protected_dev), ++ GFP_KERNEL); ++ if (!kbdev->protected_dev) ++ return -ENOMEM; ++ kbdev->protected_dev->data = kbdev; ++ kbdev->protected_ops = PLATFORM_PROTECTED_CALLBACKS; ++ INIT_WORK(&kbdev->protected_mode_hwcnt_disable_work, ++ kbasep_protected_mode_hwcnt_disable_worker); ++ kbdev->protected_mode_hwcnt_desired = true; ++ kbdev->protected_mode_hwcnt_disabled = false; ++ return 0; +} + -+int kbase_dummy_job_wa_load(struct kbase_device *kbdev) ++void kbase_protected_mode_term(struct kbase_device *kbdev) +{ -+ const struct firmware *firmware; -+ static const char wa_name[] = DUMMY_JOB_WA_BINARY_NAME; -+ const u32 signature = 0x4157; -+ const u32 version = 2; -+ const u8 *fw_end; -+ const u8 *fw; -+ const struct wa_header *header; -+ const struct wa_v2_info *v2_info; -+ u32 blob_offset; -+ int err; -+ struct kbase_context *kctx; -+ -+ if (!wa_blob_load_needed(kbdev)) -+ return 0; ++ cancel_work_sync(&kbdev->protected_mode_hwcnt_disable_work); ++ kfree(kbdev->protected_dev); ++} + -+ /* load the wa */ -+ err = request_firmware(&firmware, wa_name, kbdev->dev); ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++static int kbase_common_reg_map(struct kbase_device *kbdev) ++{ ++ return 0; ++} ++static void kbase_common_reg_unmap(struct kbase_device * const kbdev) ++{ ++} ++#else /* !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ ++static int kbase_common_reg_map(struct kbase_device *kbdev) ++{ ++ int err = 0; + -+ if (err) { -+ dev_err(kbdev->dev, "WA blob missing. Please refer to the Arm Mali DDK Valhall Release Notes, " -+ "Part number DC-06002 or contact support-mali@arm.com - driver probe will be failed"); -+ return -ENODEV; ++ if (!request_mem_region(kbdev->reg_start, kbdev->reg_size, dev_name(kbdev->dev))) { ++ dev_err(kbdev->dev, "Register window unavailable\n"); ++ err = -EIO; ++ goto out_region; + } + -+ kctx = kbase_create_context(kbdev, true, -+ BASE_CONTEXT_CREATE_FLAG_NONE, 0, -+ NULL); -+ -+ if (!kctx) { -+ dev_err(kbdev->dev, "Failed to create WA context\n"); -+ goto no_ctx; ++ kbdev->reg = ioremap(kbdev->reg_start, kbdev->reg_size); ++ if (!kbdev->reg) { ++ dev_err(kbdev->dev, "Can't remap register window\n"); ++ err = -EINVAL; ++ goto out_ioremap; + } + -+ fw = firmware->data; -+ fw_end = fw + firmware->size; ++ return err; + -+ dev_dbg(kbdev->dev, "Loaded firmware of size %zu bytes\n", -+ firmware->size); ++out_ioremap: ++ release_mem_region(kbdev->reg_start, kbdev->reg_size); ++out_region: ++ return err; ++} + -+ if (!in_range(fw, fw_end, 0, sizeof(*header))) { -+ dev_err(kbdev->dev, "WA too small\n"); -+ goto bad_fw; ++static void kbase_common_reg_unmap(struct kbase_device * const kbdev) ++{ ++ if (kbdev->reg) { ++ iounmap(kbdev->reg); ++ release_mem_region(kbdev->reg_start, kbdev->reg_size); ++ kbdev->reg = NULL; ++ kbdev->reg_start = 0; ++ kbdev->reg_size = 0; + } ++} ++#endif /* !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ + -+ header = (const struct wa_header *)(fw + 0); ++int registers_map(struct kbase_device * const kbdev) ++{ ++ /* the first memory resource is the physical address of the GPU ++ * registers. ++ */ ++ struct platform_device *pdev = to_platform_device(kbdev->dev); ++ struct resource *reg_res; ++ int err; + -+ if (header->signature != signature) { -+ dev_err(kbdev->dev, "WA signature failure: 0x%lx\n", -+ (unsigned long)header->signature); -+ goto bad_fw; ++ reg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ if (!reg_res) { ++ dev_err(kbdev->dev, "Invalid register resource\n"); ++ return -ENOENT; + } + -+ if (header->version != version) { -+ dev_err(kbdev->dev, "WA version 0x%lx not supported\n", -+ (unsigned long)header->version); -+ goto bad_fw; -+ } ++ kbdev->reg_start = reg_res->start; ++ kbdev->reg_size = resource_size(reg_res); + -+ if (!in_range(fw, fw_end, header->info_offset, sizeof(*v2_info))) { -+ dev_err(kbdev->dev, "WA info offset out of bounds\n"); -+ goto bad_fw; ++#if MALI_USE_CSF ++ if (kbdev->reg_size < ++ (CSF_HW_DOORBELL_PAGE_OFFSET + ++ CSF_NUM_DOORBELL * CSF_HW_DOORBELL_PAGE_SIZE)) { ++ dev_err(kbdev->dev, "Insufficient register space, will override to the required size\n"); ++ kbdev->reg_size = CSF_HW_DOORBELL_PAGE_OFFSET + ++ CSF_NUM_DOORBELL * CSF_HW_DOORBELL_PAGE_SIZE; + } ++#endif + -+ v2_info = (const struct wa_v2_info *)(fw + header->info_offset); -+ -+ if (v2_info->flags & ~KBASE_DUMMY_JOB_WA_FLAGS) { -+ dev_err(kbdev->dev, "Unsupported WA flag(s): 0x%llx\n", -+ (unsigned long long)v2_info->flags); -+ goto bad_fw; ++ err = kbase_common_reg_map(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, "Failed to map registers\n"); ++ return err; + } + -+ kbdev->dummy_job_wa.slot = v2_info->js; -+ kbdev->dummy_job_wa.jc = v2_info->jc; -+ kbdev->dummy_job_wa.flags = v2_info->flags; -+ -+ blob_offset = v2_info->blob_offset; -+ -+ while (blob_offset) { -+ const struct wa_blob *blob; -+ size_t nr_pages; -+ u64 flags; -+ u64 gpu_va; -+ struct kbase_va_region *va_region; -+ -+ if (!in_range(fw, fw_end, blob_offset, sizeof(*blob))) { -+ dev_err(kbdev->dev, "Blob offset out-of-range: 0x%lx\n", -+ (unsigned long)blob_offset); -+ goto bad_fw; -+ } -+ -+ blob = (const struct wa_blob *)(fw + blob_offset); -+ if (!in_range(fw, fw_end, blob->payload_offset, blob->size)) { -+ dev_err(kbdev->dev, "Payload out-of-bounds\n"); -+ goto bad_fw; -+ } -+ -+ gpu_va = blob->base; -+ if (PAGE_ALIGN(gpu_va) != gpu_va) { -+ dev_err(kbdev->dev, "blob not page aligned\n"); -+ goto bad_fw; -+ } -+ nr_pages = PFN_UP(blob->size); -+ flags = blob->map_flags | BASE_MEM_FLAG_MAP_FIXED; -+ -+ va_region = kbase_mem_alloc(kctx, nr_pages, nr_pages, -+ 0, &flags, &gpu_va); -+ -+ if (!va_region) { -+ dev_err(kbdev->dev, "Failed to allocate for blob\n"); -+ } else { -+ struct kbase_vmap_struct vmap = { 0 }; -+ const u8 *payload; -+ void *dst; ++ return 0; ++} + -+ /* copy the payload, */ -+ payload = fw + blob->payload_offset; ++void registers_unmap(struct kbase_device *kbdev) ++{ ++ kbase_common_reg_unmap(kbdev); ++} + -+ dst = kbase_vmap(kctx, -+ va_region->start_pfn << PAGE_SHIFT, -+ nr_pages << PAGE_SHIFT, &vmap); ++#if defined(CONFIG_MALI_ARBITER_SUPPORT) && defined(CONFIG_OF) + -+ if (dst) { -+ memcpy(dst, payload, blob->size); -+ kbase_vunmap(kctx, &vmap); -+ } else { -+ dev_err(kbdev->dev, -+ "Failed to copy payload\n"); -+ } ++static bool kbase_is_pm_enabled(const struct device_node *gpu_node) ++{ ++ const struct device_node *power_model_node; ++ const void *cooling_cells_node; ++ const void *operating_point_node; ++ bool is_pm_enable = false; + -+ } -+ blob_offset = blob->blob_offset; /* follow chain */ -+ } ++ power_model_node = of_get_child_by_name(gpu_node, ++ "power_model"); ++ if (power_model_node) ++ is_pm_enable = true; + -+ release_firmware(firmware); ++ cooling_cells_node = of_get_property(gpu_node, ++ "#cooling-cells", NULL); ++ if (cooling_cells_node) ++ is_pm_enable = true; + -+ kbasep_js_schedule_privileged_ctx(kbdev, kctx); ++ operating_point_node = of_get_property(gpu_node, ++ "operating-points", NULL); ++ if (operating_point_node) ++ is_pm_enable = true; + -+ kbdev->dummy_job_wa.ctx = kctx; ++ return is_pm_enable; ++} + -+ err = sysfs_create_file(&kbdev->dev->kobj, -+ &dev_attr_dummy_job_wa_info.attr); -+ if (err) -+ dev_err(kbdev->dev, "SysFS file creation for dummy job wa failed\n"); ++static bool kbase_is_pv_enabled(const struct device_node *gpu_node) ++{ ++ const void *arbiter_if_node; + -+ return 0; ++ arbiter_if_node = of_get_property(gpu_node, ++ "arbiter_if", NULL); + -+bad_fw: -+ kbase_destroy_context(kctx); -+no_ctx: -+ release_firmware(firmware); -+ return -EFAULT; ++ return arbiter_if_node ? true : false; +} + -+void kbase_dummy_job_wa_cleanup(struct kbase_device *kbdev) ++static bool kbase_is_full_coherency_enabled(const struct device_node *gpu_node) +{ -+ struct kbase_context *wa_ctx; -+ -+ /* Can be safely called even if the file wasn't created on probe */ -+ sysfs_remove_file(&kbdev->dev->kobj, &dev_attr_dummy_job_wa_info.attr); -+ -+ wa_ctx = READ_ONCE(kbdev->dummy_job_wa.ctx); -+ WRITE_ONCE(kbdev->dummy_job_wa.ctx, NULL); -+ /* make this write visible before we tear down the ctx */ -+ smp_mb(); ++ const void *coherency_dts; ++ u32 coherency; + -+ if (wa_ctx) { -+ kbasep_js_release_privileged_ctx(kbdev, wa_ctx); -+ kbase_destroy_context(wa_ctx); ++ coherency_dts = of_get_property(gpu_node, ++ "system-coherency", ++ NULL); ++ if (coherency_dts) { ++ coherency = be32_to_cpup(coherency_dts); ++ if (coherency == COHERENCY_ACE) ++ return true; + } ++ return false; +} -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h -new file mode 100755 -index 000000000000..e19495055b48 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h -@@ -0,0 +1,74 @@ -+/* -+ * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ + -+#ifndef _KBASE_DUMMY_JOB_WORKAROUND_ -+#define _KBASE_DUMMY_JOB_WORKAROUND_ ++#endif /* CONFIG_MALI_ARBITER_SUPPORT && CONFIG_OF */ + -+#define KBASE_DUMMY_JOB_WA_FLAG_SERIALIZE (1ull << 0) -+#define KBASE_DUMMY_JOB_WA_FLAG_WAIT_POWERUP (1ull << 1) -+#define KBASE_DUMMY_JOB_WA_FLAG_LOGICAL_SHADER_POWER (1ull << 2) ++int kbase_device_pm_init(struct kbase_device *kbdev) ++{ ++ int err = 0; + -+#define KBASE_DUMMY_JOB_WA_FLAGS (KBASE_DUMMY_JOB_WA_FLAG_SERIALIZE | \ -+ KBASE_DUMMY_JOB_WA_FLAG_WAIT_POWERUP | \ -+ KBASE_DUMMY_JOB_WA_FLAG_LOGICAL_SHADER_POWER) ++#if defined(CONFIG_MALI_ARBITER_SUPPORT) && defined(CONFIG_OF) + -+#if MALI_USE_CSF ++ u32 gpu_id; ++ u32 product_id; ++ u32 gpu_model_id; + -+static inline int kbase_dummy_job_wa_load(struct kbase_device *kbdev) -+{ -+ CSTD_UNUSED(kbdev); -+ return 0; -+} ++ if (kbase_is_pv_enabled(kbdev->dev->of_node)) { ++ dev_info(kbdev->dev, "Arbitration interface enabled\n"); ++ if (kbase_is_pm_enabled(kbdev->dev->of_node)) { ++ /* Arbitration AND power management invalid */ ++ dev_err(kbdev->dev, "Invalid combination of arbitration AND power management\n"); ++ return -EPERM; ++ } ++ if (kbase_is_full_coherency_enabled(kbdev->dev->of_node)) { ++ /* Arbitration AND full coherency invalid */ ++ dev_err(kbdev->dev, "Invalid combination of arbitration AND full coherency\n"); ++ return -EPERM; ++ } ++ err = kbase_arbiter_pm_early_init(kbdev); ++ if (err == 0) { ++ /* Check if Arbitration is running on ++ * supported GPU platform ++ */ ++ kbase_pm_register_access_enable(kbdev); ++ gpu_id = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_ID)); ++ kbase_pm_register_access_disable(kbdev); ++ product_id = ++ KBASE_UBFX32(gpu_id, KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT, 16); ++ gpu_model_id = GPU_ID2_MODEL_MATCH_VALUE(product_id); + -+static inline void kbase_dummy_job_wa_cleanup(struct kbase_device *kbdev) -+{ -+ CSTD_UNUSED(kbdev); ++ if (gpu_model_id != GPU_ID2_PRODUCT_TGOX ++ && gpu_model_id != GPU_ID2_PRODUCT_TNOX ++ && gpu_model_id != GPU_ID2_PRODUCT_TBAX) { ++ kbase_arbiter_pm_early_term(kbdev); ++ dev_err(kbdev->dev, "GPU platform not suitable for arbitration\n"); ++ return -EPERM; ++ } ++ } ++ } else { ++ kbdev->arb.arb_if = NULL; ++ kbdev->arb.arb_dev = NULL; ++ err = power_control_init(kbdev); ++ } ++#else ++ err = power_control_init(kbdev); ++#endif /* CONFIG_MALI_ARBITER_SUPPORT && CONFIG_OF */ ++ return err; +} + -+static inline int kbase_dummy_job_wa_execute(struct kbase_device *kbdev, -+ u64 cores) ++void kbase_device_pm_term(struct kbase_device *kbdev) +{ -+ CSTD_UNUSED(kbdev); -+ CSTD_UNUSED(cores); -+ return 0; ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++#if IS_ENABLED(CONFIG_OF) ++ if (kbase_is_pv_enabled(kbdev->dev->of_node)) ++ kbase_arbiter_pm_early_term(kbdev); ++ else ++ power_control_term(kbdev); ++#endif /* CONFIG_OF */ ++#else ++ power_control_term(kbdev); ++#endif +} + -+static inline bool kbase_dummy_job_wa_enabled(struct kbase_device *kbdev) ++int power_control_init(struct kbase_device *kbdev) +{ -+ CSTD_UNUSED(kbdev); -+ return false; -+} -+ ++#ifndef CONFIG_OF ++ /* Power control initialization requires at least the capability to get ++ * regulators and clocks from the device tree, as well as parsing ++ * arrays of unsigned integer values. ++ * ++ * The whole initialization process shall simply be skipped if the ++ * minimum capability is not available. ++ */ ++ return 0; +#else ++ struct platform_device *pdev; ++ int err = 0; ++ unsigned int i; ++#if defined(CONFIG_REGULATOR) ++ static const char * const regulator_names[] = { ++ "mali", "mem" ++ }; ++#endif /* CONFIG_REGULATOR */ + -+int kbase_dummy_job_wa_load(struct kbase_device *kbdev); -+void kbase_dummy_job_wa_cleanup(struct kbase_device *kbdev); -+int kbase_dummy_job_wa_execute(struct kbase_device *kbdev, u64 cores); -+ -+static inline bool kbase_dummy_job_wa_enabled(struct kbase_device *kbdev) -+{ -+ return (kbdev->dummy_job_wa.ctx != NULL); -+} ++ if (!kbdev) ++ return -ENODEV; + -+#endif /* MALI_USE_CSF */ ++ pdev = to_platform_device(kbdev->dev); + -+#endif /* _KBASE_DUMMY_JOB_WORKAROUND_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_event.c b/drivers/gpu/arm/bifrost/mali_kbase_event.c -new file mode 100755 -index 000000000000..5adb80f9bbd2 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_event.c -@@ -0,0 +1,274 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2016,2018-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ ++#if defined(CONFIG_REGULATOR) ++ /* Since the error code EPROBE_DEFER causes the entire probing ++ * procedure to be restarted from scratch at a later time, ++ * all regulators will be released before returning. ++ * ++ * Any other error is ignored and the driver will continue ++ * operating with a partial initialization of regulators. ++ */ ++ for (i = 0; i < ARRAY_SIZE(regulator_names); i++) { ++ kbdev->regulators[i] = regulator_get_optional(kbdev->dev, ++ regulator_names[i]); ++ if (IS_ERR(kbdev->regulators[i])) { ++ err = PTR_ERR(kbdev->regulators[i]); ++ kbdev->regulators[i] = NULL; ++ break; ++ } ++ } ++ if (err == -EPROBE_DEFER) { ++ while (i > 0) ++ regulator_put(kbdev->regulators[--i]); ++ return err; ++ } + ++ kbdev->nr_regulators = i; ++ dev_dbg(&pdev->dev, "Regulators probed: %u\n", kbdev->nr_regulators); ++#endif + ++ /* Having more clocks than regulators is acceptable, while the ++ * opposite shall not happen. ++ * ++ * Since the error code EPROBE_DEFER causes the entire probing ++ * procedure to be restarted from scratch at a later time, ++ * all clocks and regulators will be released before returning. ++ * ++ * Any other error is ignored and the driver will continue ++ * operating with a partial initialization of clocks. ++ */ ++ for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) { ++ kbdev->clocks[i] = of_clk_get(kbdev->dev->of_node, i); ++ if (IS_ERR(kbdev->clocks[i])) { ++ err = PTR_ERR(kbdev->clocks[i]); ++ kbdev->clocks[i] = NULL; ++ break; ++ } + -+#include -+#include -+#include -+#include ++ err = clk_prepare(kbdev->clocks[i]); ++ if (err) { ++ dev_err(kbdev->dev, ++ "Failed to prepare and enable clock (%d)\n", ++ err); ++ clk_put(kbdev->clocks[i]); ++ break; ++ } ++ } ++ if (err == -EPROBE_DEFER) { ++ while (i > 0) { ++ clk_disable_unprepare(kbdev->clocks[--i]); ++ clk_put(kbdev->clocks[i]); ++ } ++ goto clocks_probe_defer; ++ } + -+static struct base_jd_udata kbase_event_process(struct kbase_context *kctx, struct kbase_jd_atom *katom) -+{ -+ struct base_jd_udata data; -+ struct kbase_device *kbdev; ++ kbdev->nr_clocks = i; ++ dev_dbg(&pdev->dev, "Clocks probed: %u\n", kbdev->nr_clocks); + -+ lockdep_assert_held(&kctx->jctx.lock); ++ /* Any error in parsing the OPP table from the device file ++ * shall be ignored. The fact that the table may be absent or wrong ++ * on the device tree of the platform shouldn't prevent the driver ++ * from completing its initialization. ++ */ ++#if defined(CONFIG_PM_OPP) ++#if defined(CONFIG_REGULATOR) ++#if (KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE) ++ if (kbdev->nr_regulators > 0) { ++ kbdev->token = dev_pm_opp_set_regulators(kbdev->dev, regulator_names); + -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ KBASE_DEBUG_ASSERT(katom != NULL); -+ KBASE_DEBUG_ASSERT(katom->status == KBASE_JD_ATOM_STATE_COMPLETED); ++ if (kbdev->token < 0) { ++ err = kbdev->token; ++ goto regulators_probe_defer; ++ } + -+ kbdev = kctx->kbdev; -+ data = katom->udata; ++ } ++#elif (KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE) ++ if (kbdev->nr_regulators > 0) { ++ kbdev->opp_table = ++ dev_pm_opp_set_regulators(kbdev->dev, regulator_names, ++ kbdev->nr_regulators); ++ if (IS_ERR(kbdev->opp_table)) { ++ dev_err(kbdev->dev, "Failed to set regulators\n"); ++ return 0; ++ } ++ kbdev->opp_table = ++ dev_pm_opp_register_set_opp_helper(kbdev->dev, ++ kbase_devfreq_opp_helper); ++ if (IS_ERR(kbdev->opp_table)) { ++ dev_pm_opp_put_regulators(kbdev->opp_table); ++ kbdev->opp_table = NULL; ++ dev_err(kbdev->dev, "Failed to set opp helper\n"); ++ return 0; ++ } ++ } ++#endif /* (KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE) */ ++#endif /* CONFIG_REGULATOR */ + -+ KBASE_TLSTREAM_TL_NRET_ATOM_CTX(kbdev, katom, kctx); -+ KBASE_TLSTREAM_TL_DEL_ATOM(kbdev, katom); ++#ifdef CONFIG_ARCH_ROCKCHIP ++ err = kbase_platform_rk_init_opp_table(kbdev); ++ if (err) ++ dev_err(kbdev->dev, "Failed to init_opp_table (%d)\n", err); ++#else ++ err = dev_pm_opp_of_add_table(kbdev->dev); ++ CSTD_UNUSED(err); ++#endif ++#endif /* CONFIG_PM_OPP */ ++ return 0; + -+ katom->status = KBASE_JD_ATOM_STATE_UNUSED; -+ dev_dbg(kbdev->dev, "Atom %p status to unused\n", (void *)katom); -+ wake_up(&katom->completed); ++#if defined(CONFIG_PM_OPP) && \ ++ ((KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE) && defined(CONFIG_REGULATOR)) ++ for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) { ++ if (kbdev->clocks[i]) { ++ if (__clk_is_enabled(kbdev->clocks[i])) ++ clk_disable_unprepare(kbdev->clocks[i]); ++ clk_put(kbdev->clocks[i]); ++ kbdev->clocks[i] = NULL; ++ } else ++ break; ++ } ++#endif + -+ return data; ++clocks_probe_defer: ++#if defined(CONFIG_REGULATOR) ++ for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) ++ regulator_put(kbdev->regulators[i]); ++#endif ++ return err; ++#endif /* CONFIG_OF */ +} + -+int kbase_event_dequeue(struct kbase_context *ctx, struct base_jd_event_v2 *uevent) ++void power_control_term(struct kbase_device *kbdev) +{ -+ struct kbase_jd_atom *atom; ++ unsigned int i; + -+ KBASE_DEBUG_ASSERT(ctx); ++#if defined(CONFIG_PM_OPP) ++ dev_pm_opp_of_remove_table(kbdev->dev); ++#if defined(CONFIG_REGULATOR) ++#if (KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE) ++ if (kbdev->token > -EPERM) { ++ dev_pm_opp_unregister_set_opp_helper(kbdev->opp_table); ++ dev_pm_opp_put_regulators(kbdev->token); ++ } ++#elif (KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE) ++ if (!IS_ERR_OR_NULL(kbdev->opp_table)) ++ dev_pm_opp_put_regulators(kbdev->opp_table); ++#endif /* (KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE) */ ++#endif /* CONFIG_REGULATOR */ ++#endif /* CONFIG_PM_OPP */ + -+ mutex_lock(&ctx->event_mutex); ++ for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) { ++ if (kbdev->clocks[i]) { ++ clk_unprepare(kbdev->clocks[i]); ++ clk_put(kbdev->clocks[i]); ++ kbdev->clocks[i] = NULL; ++ } else ++ break; ++ } + -+ if (list_empty(&ctx->event_list)) { -+ if (!atomic_read(&ctx->event_closed)) { -+ mutex_unlock(&ctx->event_mutex); -+ return -1; ++#if defined(CONFIG_OF) && defined(CONFIG_REGULATOR) ++ for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) { ++ if (kbdev->regulators[i]) { ++ regulator_put(kbdev->regulators[i]); ++ kbdev->regulators[i] = NULL; + } -+ -+ /* generate the BASE_JD_EVENT_DRV_TERMINATED message on the fly */ -+ mutex_unlock(&ctx->event_mutex); -+ uevent->event_code = BASE_JD_EVENT_DRV_TERMINATED; -+ memset(&uevent->udata, 0, sizeof(uevent->udata)); -+ dev_dbg(ctx->kbdev->dev, -+ "event system closed, returning BASE_JD_EVENT_DRV_TERMINATED(0x%X)\n", -+ BASE_JD_EVENT_DRV_TERMINATED); -+ return 0; + } ++#endif ++} + -+ /* normal event processing */ -+ atomic_dec(&ctx->event_count); -+ atom = list_entry(ctx->event_list.next, struct kbase_jd_atom, dep_item[0]); -+ list_del(ctx->event_list.next); ++#if IS_ENABLED(CONFIG_DEBUG_FS) + -+ mutex_unlock(&ctx->event_mutex); ++static void trigger_reset(struct kbase_device *kbdev) ++{ ++ kbase_pm_context_active(kbdev); ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_NONE)) ++ kbase_reset_gpu(kbdev); ++ kbase_pm_context_idle(kbdev); ++} + -+ dev_dbg(ctx->kbdev->dev, "event dequeuing %p\n", (void *)atom); -+ uevent->event_code = atom->event_code; ++#define MAKE_QUIRK_ACCESSORS(type) \ ++static int type##_quirks_set(void *data, u64 val) \ ++{ \ ++ struct kbase_device *kbdev; \ ++ kbdev = (struct kbase_device *)data; \ ++ kbdev->hw_quirks_##type = (u32)val; \ ++ trigger_reset(kbdev); \ ++ return 0; \ ++} \ ++\ ++static int type##_quirks_get(void *data, u64 *val) \ ++{ \ ++ struct kbase_device *kbdev; \ ++ kbdev = (struct kbase_device *)data; \ ++ *val = kbdev->hw_quirks_##type; \ ++ return 0; \ ++} \ ++DEFINE_DEBUGFS_ATTRIBUTE(fops_##type##_quirks, type##_quirks_get, \ ++ type##_quirks_set, "%llu\n") + -+ uevent->atom_number = (atom - ctx->jctx.atoms); ++MAKE_QUIRK_ACCESSORS(sc); ++MAKE_QUIRK_ACCESSORS(tiler); ++MAKE_QUIRK_ACCESSORS(mmu); ++MAKE_QUIRK_ACCESSORS(gpu); + -+ if (atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) -+ kbase_jd_free_external_resources(atom); ++/** ++ * kbase_device_debugfs_reset_write() - Reset the GPU ++ * ++ * @data: Pointer to the Kbase device. ++ * @wait_for_reset: Value written to the file. ++ * ++ * This function will perform the GPU reset, and if the value written to ++ * the file is 1 it will also wait for the reset to complete. ++ * ++ * Return: 0 in case of no error otherwise a negative value. ++ */ ++static int kbase_device_debugfs_reset_write(void *data, u64 wait_for_reset) ++{ ++ struct kbase_device *kbdev = data; + -+ mutex_lock(&ctx->jctx.lock); -+ uevent->udata = kbase_event_process(ctx, atom); -+ mutex_unlock(&ctx->jctx.lock); ++ trigger_reset(kbdev); ++ ++ if (wait_for_reset == 1) ++ return kbase_reset_gpu_wait(kbdev); + + return 0; +} + -+KBASE_EXPORT_TEST_API(kbase_event_dequeue); ++DEFINE_DEBUGFS_ATTRIBUTE(fops_trigger_reset, NULL, &kbase_device_debugfs_reset_write, "%llu\n"); + +/** -+ * kbase_event_process_noreport_worker - Worker for processing atoms that do not -+ * return an event but do have external -+ * resources -+ * @data: Work structure ++ * debugfs_protected_debug_mode_read - "protected_debug_mode" debugfs read ++ * @file: File object to read is for ++ * @buf: User buffer to populate with data ++ * @len: Length of user buffer ++ * @ppos: Offset within file object ++ * ++ * Retrieves the current status of protected debug mode ++ * (0 = disabled, 1 = enabled) ++ * ++ * Return: Number of bytes added to user buffer + */ -+static void kbase_event_process_noreport_worker(struct work_struct *data) ++static ssize_t debugfs_protected_debug_mode_read(struct file *file, ++ char __user *buf, size_t len, loff_t *ppos) +{ -+ struct kbase_jd_atom *katom = container_of(data, struct kbase_jd_atom, -+ work); -+ struct kbase_context *kctx = katom->kctx; ++ struct kbase_device *kbdev = (struct kbase_device *)file->private_data; ++ u32 gpu_status; ++ ssize_t ret_val; + -+ if (katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) -+ kbase_jd_free_external_resources(katom); ++ kbase_pm_context_active(kbdev); ++ gpu_status = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_STATUS)); ++ kbase_pm_context_idle(kbdev); + -+ mutex_lock(&kctx->jctx.lock); -+ kbase_event_process(kctx, katom); -+ mutex_unlock(&kctx->jctx.lock); ++ if (gpu_status & GPU_DBGEN) ++ ret_val = simple_read_from_buffer(buf, len, ppos, "1\n", 2); ++ else ++ ret_val = simple_read_from_buffer(buf, len, ppos, "0\n", 2); ++ ++ return ret_val; +} + -+/** -+ * kbase_event_process_noreport - Process atoms that do not return an event -+ * @kctx: Context pointer -+ * @katom: Atom to be processed ++/* ++ * struct fops_protected_debug_mode - "protected_debug_mode" debugfs fops + * -+ * Atoms that do not have external resources will be processed immediately. -+ * Atoms that do have external resources will be processed on a workqueue, in -+ * order to avoid locking issues. ++ * Contains the file operations for the "protected_debug_mode" debugfs file + */ -+static void kbase_event_process_noreport(struct kbase_context *kctx, -+ struct kbase_jd_atom *katom) ++static const struct file_operations fops_protected_debug_mode = { ++ .owner = THIS_MODULE, ++ .open = simple_open, ++ .read = debugfs_protected_debug_mode_read, ++ .llseek = default_llseek, ++}; ++ ++static int kbase_device_debugfs_mem_pool_max_size_show(struct seq_file *sfile, ++ void *data) +{ -+ if (katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) { -+ INIT_WORK(&katom->work, kbase_event_process_noreport_worker); -+ queue_work(kctx->event_workq, &katom->work); -+ } else { -+ kbase_event_process(kctx, katom); -+ } ++ CSTD_UNUSED(data); ++ return kbase_debugfs_helper_seq_read(sfile, ++ MEMORY_GROUP_MANAGER_NR_GROUPS, ++ kbase_mem_pool_config_debugfs_max_size); +} + -+/** -+ * kbase_event_coalesce - Move pending events to the main event list -+ * @kctx: Context pointer -+ * -+ * kctx->event_list and kctx->event_coalesce_count must be protected -+ * by a lock unless this is the last thread using them -+ * (and we're about to terminate the lock). -+ * -+ * Return: The number of pending events moved to the main event list -+ */ -+static int kbase_event_coalesce(struct kbase_context *kctx) ++static ssize_t kbase_device_debugfs_mem_pool_max_size_write(struct file *file, ++ const char __user *ubuf, size_t count, loff_t *ppos) +{ -+ const int event_count = kctx->event_coalesce_count; ++ int err = 0; + -+ /* Join the list of pending events onto the tail of the main list -+ and reset it */ -+ list_splice_tail_init(&kctx->event_coalesce_list, &kctx->event_list); -+ kctx->event_coalesce_count = 0; ++ CSTD_UNUSED(ppos); ++ err = kbase_debugfs_helper_seq_write(file, ubuf, count, ++ MEMORY_GROUP_MANAGER_NR_GROUPS, ++ kbase_mem_pool_config_debugfs_set_max_size); + -+ /* Return the number of events moved */ -+ return event_count; ++ return err ? err : count; +} + -+void kbase_event_post(struct kbase_context *ctx, struct kbase_jd_atom *atom) ++static int kbase_device_debugfs_mem_pool_max_size_open(struct inode *in, ++ struct file *file) +{ -+ struct kbase_device *kbdev = ctx->kbdev; ++ return single_open(file, kbase_device_debugfs_mem_pool_max_size_show, ++ in->i_private); ++} + -+ dev_dbg(kbdev->dev, "Posting event for atom %p\n", (void *)atom); ++static const struct file_operations ++ kbase_device_debugfs_mem_pool_max_size_fops = { ++ .owner = THIS_MODULE, ++ .open = kbase_device_debugfs_mem_pool_max_size_open, ++ .read = seq_read, ++ .write = kbase_device_debugfs_mem_pool_max_size_write, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; + -+ if (WARN_ON(atom->status != KBASE_JD_ATOM_STATE_COMPLETED)) { -+ dev_warn(kbdev->dev, -+ "%s: Atom %d (%p) not completed (status %d)\n", -+ __func__, -+ kbase_jd_atom_id(atom->kctx, atom), -+ atom->kctx, -+ atom->status); -+ return; -+ } ++/** ++ * debugfs_ctx_defaults_init - Create the default configuration of new contexts in debugfs ++ * @kbdev: An instance of the GPU platform device, allocated from the probe method of the driver. ++ * Return: A pointer to the last dentry that it tried to create, whether successful or not. ++ * Could be NULL or encode another error value. ++ */ ++static struct dentry *debugfs_ctx_defaults_init(struct kbase_device *const kbdev) ++{ ++ /* prevent unprivileged use of debug file system ++ * in old kernel version ++ */ ++ const mode_t mode = 0644; ++ struct dentry *dentry = debugfs_create_dir("defaults", kbdev->debugfs_ctx_directory); ++ struct dentry *debugfs_ctx_defaults_directory = dentry; + -+ if (atom->core_req & BASE_JD_REQ_EVENT_ONLY_ON_FAILURE) { -+ if (atom->event_code == BASE_JD_EVENT_DONE) { -+ dev_dbg(kbdev->dev, "Suppressing event (atom done)\n"); -+ kbase_event_process_noreport(ctx, atom); -+ return; -+ } ++ if (IS_ERR_OR_NULL(dentry)) { ++ dev_err(kbdev->dev, "Couldn't create mali debugfs ctx defaults directory\n"); ++ return dentry; + } + -+ if (atom->core_req & BASEP_JD_REQ_EVENT_NEVER) { -+ dev_dbg(kbdev->dev, "Suppressing event (never)\n"); -+ kbase_event_process_noreport(ctx, atom); -+ return; -+ } -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(kbdev, atom, TL_ATOM_STATE_POSTED); -+ if (atom->core_req & BASE_JD_REQ_EVENT_COALESCE) { -+ /* Don't report the event until other event(s) have completed */ -+ dev_dbg(kbdev->dev, "Deferring event (coalesced)\n"); -+ mutex_lock(&ctx->event_mutex); -+ list_add_tail(&atom->dep_item[0], &ctx->event_coalesce_list); -+ ++ctx->event_coalesce_count; -+ mutex_unlock(&ctx->event_mutex); -+ } else { -+ /* Report the event and any pending events now */ -+ int event_count = 1; ++ debugfs_create_bool("infinite_cache", mode, ++ debugfs_ctx_defaults_directory, ++ &kbdev->infinite_cache_active_default); + -+ mutex_lock(&ctx->event_mutex); -+ event_count += kbase_event_coalesce(ctx); -+ list_add_tail(&atom->dep_item[0], &ctx->event_list); -+ atomic_add(event_count, &ctx->event_count); -+ mutex_unlock(&ctx->event_mutex); -+ dev_dbg(kbdev->dev, "Reporting %d events\n", event_count); ++ dentry = debugfs_create_file("mem_pool_max_size", mode, debugfs_ctx_defaults_directory, ++ &kbdev->mem_pool_defaults.small, ++ &kbase_device_debugfs_mem_pool_max_size_fops); ++ if (IS_ERR_OR_NULL(dentry)) { ++ dev_err(kbdev->dev, "Unable to create mem_pool_max_size debugfs entry\n"); ++ return dentry; ++ } + -+ kbase_event_wakeup(ctx); ++ dentry = debugfs_create_file("lp_mem_pool_max_size", mode, debugfs_ctx_defaults_directory, ++ &kbdev->mem_pool_defaults.large, ++ &kbase_device_debugfs_mem_pool_max_size_fops); ++ if (IS_ERR_OR_NULL(dentry)) ++ dev_err(kbdev->dev, "Unable to create lp_mem_pool_max_size debugfs entry\n"); + -+ /* Post-completion latency */ -+ trace_sysgraph(SGR_POST, ctx->id, -+ kbase_jd_atom_id(ctx, atom)); -+ } ++ return dentry; +} -+KBASE_EXPORT_TEST_API(kbase_event_post); + -+void kbase_event_close(struct kbase_context *kctx) ++/** ++ * init_debugfs - Create device-wide debugfs directories and files for the Mali driver ++ * @kbdev: An instance of the GPU platform device, allocated from the probe method of the driver. ++ * Return: A pointer to the last dentry that it tried to create, whether successful or not. ++ * Could be NULL or encode another error value. ++ */ ++static struct dentry *init_debugfs(struct kbase_device *kbdev) +{ -+ mutex_lock(&kctx->event_mutex); -+ atomic_set(&kctx->event_closed, true); -+ mutex_unlock(&kctx->event_mutex); -+ kbase_event_wakeup(kctx); -+} ++ struct dentry *dentry = debugfs_create_dir(kbdev->devname, NULL); + -+int kbase_event_init(struct kbase_context *kctx) -+{ -+ KBASE_DEBUG_ASSERT(kctx); ++ kbdev->mali_debugfs_directory = dentry; ++ if (IS_ERR_OR_NULL(dentry)) { ++ dev_err(kbdev->dev, ++ "Couldn't create mali debugfs directory: %s\n", ++ kbdev->devname); ++ return dentry; ++ } + -+ INIT_LIST_HEAD(&kctx->event_list); -+ INIT_LIST_HEAD(&kctx->event_coalesce_list); -+ mutex_init(&kctx->event_mutex); -+ kctx->event_coalesce_count = 0; -+ kctx->event_workq = alloc_workqueue("kbase_event", WQ_MEM_RECLAIM, 1); ++ dentry = debugfs_create_dir("ctx", kbdev->mali_debugfs_directory); ++ kbdev->debugfs_ctx_directory = dentry; ++ if (IS_ERR_OR_NULL(dentry)) { ++ dev_err(kbdev->dev, "Couldn't create mali debugfs ctx directory\n"); ++ return dentry; ++ } + -+ if (NULL == kctx->event_workq) -+ return -EINVAL; ++ dentry = debugfs_create_dir("instrumentation", kbdev->mali_debugfs_directory); ++ kbdev->debugfs_instr_directory = dentry; ++ if (IS_ERR_OR_NULL(dentry)) { ++ dev_err(kbdev->dev, "Couldn't create mali debugfs instrumentation directory\n"); ++ return dentry; ++ } + -+ return 0; -+} ++ kbasep_regs_history_debugfs_init(kbdev); + -+KBASE_EXPORT_TEST_API(kbase_event_init); ++#if MALI_USE_CSF ++ kbase_debug_csf_fault_debugfs_init(kbdev); ++#else /* MALI_USE_CSF */ ++ kbase_debug_job_fault_debugfs_init(kbdev); ++#endif /* !MALI_USE_CSF */ + -+void kbase_event_cleanup(struct kbase_context *kctx) -+{ -+ int event_count; ++ kbasep_gpu_memory_debugfs_init(kbdev); ++ kbase_as_fault_debugfs_init(kbdev); ++#ifdef CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS ++ kbase_instr_backend_debugfs_init(kbdev); ++#endif ++ kbase_pbha_debugfs_init(kbdev); + -+ KBASE_DEBUG_ASSERT(kctx); -+ KBASE_DEBUG_ASSERT(kctx->event_workq); ++ /* fops_* variables created by invocations of macro ++ * MAKE_QUIRK_ACCESSORS() above. ++ */ ++ dentry = debugfs_create_file("quirks_sc", 0644, ++ kbdev->mali_debugfs_directory, kbdev, ++ &fops_sc_quirks); ++ if (IS_ERR_OR_NULL(dentry)) { ++ dev_err(kbdev->dev, "Unable to create quirks_sc debugfs entry\n"); ++ return dentry; ++ } + -+ flush_workqueue(kctx->event_workq); -+ destroy_workqueue(kctx->event_workq); ++ dentry = debugfs_create_file("quirks_tiler", 0644, ++ kbdev->mali_debugfs_directory, kbdev, ++ &fops_tiler_quirks); ++ if (IS_ERR_OR_NULL(dentry)) { ++ dev_err(kbdev->dev, "Unable to create quirks_tiler debugfs entry\n"); ++ return dentry; ++ } + -+ /* We use kbase_event_dequeue to remove the remaining events as that -+ * deals with all the cleanup needed for the atoms. -+ * -+ * Note: use of kctx->event_list without a lock is safe because this must be the last -+ * thread using it (because we're about to terminate the lock) -+ */ -+ event_count = kbase_event_coalesce(kctx); -+ atomic_add(event_count, &kctx->event_count); ++ dentry = debugfs_create_file("quirks_mmu", 0644, ++ kbdev->mali_debugfs_directory, kbdev, ++ &fops_mmu_quirks); ++ if (IS_ERR_OR_NULL(dentry)) { ++ dev_err(kbdev->dev, "Unable to create quirks_mmu debugfs entry\n"); ++ return dentry; ++ } + -+ while (!list_empty(&kctx->event_list)) { -+ struct base_jd_event_v2 event; ++ dentry = debugfs_create_file("quirks_gpu", 0644, kbdev->mali_debugfs_directory, ++ kbdev, &fops_gpu_quirks); ++ if (IS_ERR_OR_NULL(dentry)) { ++ dev_err(kbdev->dev, "Unable to create quirks_gpu debugfs entry\n"); ++ return dentry; ++ } + -+ kbase_event_dequeue(kctx, &event); ++ dentry = debugfs_ctx_defaults_init(kbdev); ++ if (IS_ERR_OR_NULL(dentry)) ++ return dentry; ++ ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_DEBUG_MODE)) { ++ dentry = debugfs_create_file("protected_debug_mode", 0444, ++ kbdev->mali_debugfs_directory, kbdev, ++ &fops_protected_debug_mode); ++ if (IS_ERR_OR_NULL(dentry)) { ++ dev_err(kbdev->dev, "Unable to create protected_debug_mode debugfs entry\n"); ++ return dentry; ++ } + } -+} + -+KBASE_EXPORT_TEST_API(kbase_event_cleanup); -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence.c b/drivers/gpu/arm/bifrost/mali_kbase_fence.c -new file mode 100755 -index 000000000000..5e04acf87892 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.c -@@ -0,0 +1,154 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ ++ dentry = debugfs_create_file("reset", 0644, ++ kbdev->mali_debugfs_directory, kbdev, ++ &fops_trigger_reset); ++ if (IS_ERR_OR_NULL(dentry)) { ++ dev_err(kbdev->dev, "Unable to create reset debugfs entry\n"); ++ return dentry; ++ } + -+#include -+#include -+#include -+#include -+#include ++ kbase_ktrace_debugfs_init(kbdev); + -+/* Spin lock protecting all Mali fences as fence->lock. */ -+static DEFINE_SPINLOCK(kbase_fence_lock); ++#ifdef CONFIG_MALI_BIFROST_DEVFREQ ++#if IS_ENABLED(CONFIG_DEVFREQ_THERMAL) ++ if (kbdev->devfreq && !kbdev->model_data && ++ !kbdev->dfc_power.dyn_power_coeff) ++ kbase_ipa_debugfs_init(kbdev); ++#endif /* CONFIG_DEVFREQ_THERMAL */ ++#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+struct fence * -+kbase_fence_out_new(struct kbase_jd_atom *katom) -+#else -+struct dma_fence * -+kbase_fence_out_new(struct kbase_jd_atom *katom) -+#endif -+{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence; -+#else -+ struct dma_fence *fence; ++#if !MALI_USE_CSF ++ dentry = debugfs_create_file("serialize_jobs", 0644, ++ kbdev->mali_debugfs_directory, kbdev, ++ &kbasep_serialize_jobs_debugfs_fops); ++ if (IS_ERR_OR_NULL(dentry)) { ++ dev_err(kbdev->dev, "Unable to create serialize_jobs debugfs entry\n"); ++ return dentry; ++ } ++ kbase_timeline_io_debugfs_init(kbdev); +#endif ++ kbase_dvfs_status_debugfs_init(kbdev); + -+ WARN_ON(katom->dma_fence.fence); + -+ fence = kzalloc(sizeof(*fence), GFP_KERNEL); -+ if (!fence) -+ return NULL; ++ return dentry; ++} + -+ dma_fence_init(fence, -+ &kbase_fence_ops, -+ &kbase_fence_lock, -+ katom->dma_fence.context, -+ atomic_inc_return(&katom->dma_fence.seqno)); ++int kbase_device_debugfs_init(struct kbase_device *kbdev) ++{ ++ struct dentry *dentry = init_debugfs(kbdev); + -+ katom->dma_fence.fence = fence; ++ if (IS_ERR_OR_NULL(dentry)) { ++ debugfs_remove_recursive(kbdev->mali_debugfs_directory); ++ return IS_ERR(dentry) ? PTR_ERR(dentry) : -ENOMEM; ++ } ++ return 0; ++} + -+ return fence; ++void kbase_device_debugfs_term(struct kbase_device *kbdev) ++{ ++ debugfs_remove_recursive(kbdev->mali_debugfs_directory); +} ++#endif /* CONFIG_DEBUG_FS */ + -+bool -+kbase_fence_free_callbacks(struct kbase_jd_atom *katom) ++int kbase_device_coherency_init(struct kbase_device *kbdev) +{ -+ struct kbase_fence_cb *cb, *tmp; -+ bool res = false; ++#if IS_ENABLED(CONFIG_OF) ++ u32 supported_coherency_bitmap = ++ kbdev->gpu_props.props.raw_props.coherency_mode; ++ const void *coherency_override_dts; ++ bool dma_coherent; ++ u32 override_coherency, gpu_id; ++ unsigned int prod_id; + -+ lockdep_assert_held(&katom->kctx->jctx.lock); ++ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++ gpu_id &= GPU_ID_VERSION_PRODUCT_ID; ++ prod_id = gpu_id >> KBASE_GPU_ID_VERSION_PRODUCT_ID_SHIFT; + -+ /* Clean up and free callbacks. */ -+ list_for_each_entry_safe(cb, tmp, &katom->dma_fence.callbacks, node) { -+ bool ret; ++ /* Only for tMIx : ++ * (COHERENCY_ACE_LITE | COHERENCY_ACE) was incorrectly ++ * documented for tMIx so force correct value here. ++ */ ++ if (GPU_ID2_MODEL_MATCH_VALUE(prod_id) == ++ GPU_ID2_PRODUCT_TMIX) ++ if (supported_coherency_bitmap == ++ COHERENCY_FEATURE_BIT(COHERENCY_ACE)) ++ supported_coherency_bitmap |= ++ COHERENCY_FEATURE_BIT(COHERENCY_ACE_LITE); + -+ /* Cancel callbacks that hasn't been called yet. */ -+ ret = dma_fence_remove_callback(cb->fence, &cb->fence_cb); -+ if (ret) { -+ int ret; ++#endif /* CONFIG_OF */ + -+ /* Fence had not signaled, clean up after -+ * canceling. -+ */ -+ ret = atomic_dec_return(&katom->dma_fence.dep_count); ++ kbdev->system_coherency = COHERENCY_NONE; + -+ if (unlikely(ret == 0)) -+ res = true; ++ /* device tree may override the coherency */ ++#if IS_ENABLED(CONFIG_OF) ++ /* treat "dma-coherency" as a synonym for ACE-lite */ ++ dma_coherent = of_dma_is_coherent(kbdev->dev->of_node); ++ coherency_override_dts = of_get_property(kbdev->dev->of_node, ++ "system-coherency", ++ NULL); ++ if (coherency_override_dts || dma_coherent) { ++ if (coherency_override_dts) { ++ override_coherency = be32_to_cpup(coherency_override_dts); ++ if (dma_coherent && override_coherency != COHERENCY_ACE_LITE) { ++ dev_err(kbdev->dev, ++ "system-coherency needs to be 0 when dma-coherent is set\n"); ++ return -EINVAL; ++ } ++ } else { ++ /* dma-coherent set and system-coherency not specified */ ++ override_coherency = COHERENCY_ACE_LITE; + } + -+ /* -+ * Release the reference taken in -+ * kbase_fence_add_callback(). ++#if MALI_USE_CSF && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ /* ACE coherency mode is not supported by Driver on CSF GPUs. ++ * Return an error to signal the invalid device tree configuration. + */ -+ dma_fence_put(cb->fence); -+ list_del(&cb->node); -+ kfree(cb); -+ } ++ if (override_coherency == COHERENCY_ACE) { ++ dev_err(kbdev->dev, ++ "ACE coherency not supported, wrong DT configuration"); ++ return -EINVAL; ++ } ++#endif + -+ return res; -+} -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+int -+kbase_fence_add_callback(struct kbase_jd_atom *katom, -+ struct fence *fence, -+ fence_func_t callback) -+#else -+int -+kbase_fence_add_callback(struct kbase_jd_atom *katom, -+ struct dma_fence *fence, -+ dma_fence_func_t callback) -+#endif -+{ -+ int err = 0; -+ struct kbase_fence_cb *kbase_fence_cb; ++ if ((override_coherency <= COHERENCY_NONE) && ++ (supported_coherency_bitmap & ++ COHERENCY_FEATURE_BIT(override_coherency))) { + -+ if (!fence) -+ return -EINVAL; ++ kbdev->system_coherency = override_coherency; + -+ kbase_fence_cb = kmalloc(sizeof(*kbase_fence_cb), GFP_KERNEL); -+ if (!kbase_fence_cb) -+ return -ENOMEM; ++ dev_info(kbdev->dev, ++ "Using coherency mode %u set from dtb", ++ override_coherency); ++ } else ++ dev_warn(kbdev->dev, ++ "Ignoring unsupported coherency mode %u set from dtb", ++ override_coherency); ++ } + -+ kbase_fence_cb->fence = fence; -+ kbase_fence_cb->katom = katom; -+ INIT_LIST_HEAD(&kbase_fence_cb->node); -+ atomic_inc(&katom->dma_fence.dep_count); ++#endif /* CONFIG_OF */ + -+ err = dma_fence_add_callback(fence, &kbase_fence_cb->fence_cb, -+ callback); -+ if (err == -ENOENT) { -+ /* Fence signaled, get the completion result */ -+ err = dma_fence_get_status(fence); ++ kbdev->gpu_props.props.raw_props.coherency_mode = ++ kbdev->system_coherency; + -+ /* remap success completion to err code */ -+ if (err == 1) -+ err = 0; ++ return 0; ++} + -+ kfree(kbase_fence_cb); -+ atomic_dec(&katom->dma_fence.dep_count); -+ } else if (err) { -+ kfree(kbase_fence_cb); -+ atomic_dec(&katom->dma_fence.dep_count); -+ } else { -+ /* -+ * Get reference to fence that will be kept until callback gets -+ * cleaned up in kbase_fence_free_callbacks(). -+ */ -+ dma_fence_get(fence); -+ /* Add callback to katom's list of callbacks */ -+ list_add(&kbase_fence_cb->node, &katom->dma_fence.callbacks); -+ } + -+ return err; -+} -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence.h b/drivers/gpu/arm/bifrost/mali_kbase_fence.h -new file mode 100755 -index 000000000000..f319d9e1dce6 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.h -@@ -0,0 +1,284 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2018, 2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. ++#if MALI_USE_CSF ++/** ++ * csg_scheduling_period_store - Store callback for the csg_scheduling_period ++ * sysfs file. ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file + * -+ * SPDX-License-Identifier: GPL-2.0 ++ * This function is called when the csg_scheduling_period sysfs file is written ++ * to. It checks the data written, and if valid updates the reset timeout. + * ++ * Return: @count if the function succeeded. An error code on failure. + */ ++static ssize_t csg_scheduling_period_store(struct device *dev, ++ struct device_attribute *attr, ++ const char *buf, size_t count) ++{ ++ struct kbase_device *kbdev; ++ int ret; ++ unsigned int csg_scheduling_period; + -+#ifndef _KBASE_FENCE_H_ -+#define _KBASE_FENCE_H_ -+ -+/* -+ * mali_kbase_fence.[hc] has common fence code used by both -+ * - CONFIG_MALI_BIFROST_DMA_FENCE - implicit DMA fences -+ * - CONFIG_SYNC_FILE - explicit fences beginning with 4.9 kernel -+ */ -+ -+#if defined(CONFIG_MALI_BIFROST_DMA_FENCE) || defined(CONFIG_SYNC_FILE) ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+#include -+#include "mali_kbase_fence_defs.h" -+#include "mali_kbase.h" ++ ret = kstrtouint(buf, 0, &csg_scheduling_period); ++ if (ret || csg_scheduling_period == 0) { ++ dev_err(kbdev->dev, ++ "Couldn't process csg_scheduling_period write operation.\n" ++ "Use format 'csg_scheduling_period_ms', and csg_scheduling_period_ms > 0\n"); ++ return -EINVAL; ++ } + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+extern const struct fence_ops kbase_fence_ops; -+#else -+extern const struct dma_fence_ops kbase_fence_ops; -+#endif ++ kbase_csf_scheduler_lock(kbdev); ++ kbdev->csf.scheduler.csg_scheduling_period_ms = csg_scheduling_period; ++ dev_dbg(kbdev->dev, "CSG scheduling period: %ums\n", ++ csg_scheduling_period); ++ kbase_csf_scheduler_unlock(kbdev); + -+/** -+* struct kbase_fence_cb - Mali dma-fence callback data struct -+* @fence_cb: Callback function -+* @katom: Pointer to katom that is waiting on this callback -+* @fence: Pointer to the fence object on which this callback is waiting -+* @node: List head for linking this callback to the katom -+*/ -+struct kbase_fence_cb { -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence_cb fence_cb; -+ struct fence *fence; -+#else -+ struct dma_fence_cb fence_cb; -+ struct dma_fence *fence; -+#endif -+ struct kbase_jd_atom *katom; -+ struct list_head node; -+}; ++ return count; ++} + +/** -+ * kbase_fence_out_new() - Creates a new output fence and puts it on the atom -+ * @katom: Atom to create an output fence for ++ * csg_scheduling_period_show - Show callback for the csg_scheduling_period ++ * sysfs entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the GPU information. + * -+ * return: A new fence object on success, NULL on failure. -+ */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+struct fence *kbase_fence_out_new(struct kbase_jd_atom *katom); -+#else -+struct dma_fence *kbase_fence_out_new(struct kbase_jd_atom *katom); -+#endif -+ -+#if defined(CONFIG_SYNC_FILE) -+/** -+ * kbase_fence_fence_in_set() - Assign input fence to atom -+ * @katom: Atom to assign input fence to -+ * @fence: Input fence to assign to atom ++ * This function is called to get the current reset timeout. + * -+ * This function will take ownership of one fence reference! ++ * Return: The number of bytes output to @buf. + */ -+#define kbase_fence_fence_in_set(katom, fence) \ -+ do { \ -+ WARN_ON((katom)->dma_fence.fence_in); \ -+ (katom)->dma_fence.fence_in = fence; \ -+ } while (0) -+#endif ++static ssize_t csg_scheduling_period_show(struct device *dev, ++ struct device_attribute *attr, ++ char *const buf) ++{ ++ struct kbase_device *kbdev; ++ ssize_t ret; + ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+#if !MALI_USE_CSF -+/** -+ * kbase_fence_out_remove() - Removes the output fence from atom -+ * @katom: Atom to remove output fence for -+ * -+ * This will also release the reference to this fence which the atom keeps -+ */ -+static inline void kbase_fence_out_remove(struct kbase_jd_atom *katom) -+{ -+ if (katom->dma_fence.fence) { -+ dma_fence_put(katom->dma_fence.fence); -+ katom->dma_fence.fence = NULL; -+ } ++ ret = scnprintf(buf, PAGE_SIZE, "%u\n", ++ kbdev->csf.scheduler.csg_scheduling_period_ms); ++ ++ return ret; +} + -+#if defined(CONFIG_SYNC_FILE) ++static DEVICE_ATTR_RW(csg_scheduling_period); ++ +/** -+ * kbase_fence_out_remove() - Removes the input fence from atom -+ * @katom: Atom to remove input fence for ++ * fw_timeout_store - Store callback for the fw_timeout sysfs file. ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file + * -+ * This will also release the reference to this fence which the atom keeps ++ * This function is called when the fw_timeout sysfs file is written to. It ++ * checks the data written, and if valid updates the reset timeout. ++ * ++ * Return: @count if the function succeeded. An error code on failure. + */ -+static inline void kbase_fence_in_remove(struct kbase_jd_atom *katom) ++static ssize_t fw_timeout_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, ++ size_t count) +{ -+ if (katom->dma_fence.fence_in) { -+ dma_fence_put(katom->dma_fence.fence_in); -+ katom->dma_fence.fence_in = NULL; ++ struct kbase_device *kbdev; ++ int ret; ++ unsigned int fw_timeout; ++ ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; ++ ++ ret = kstrtouint(buf, 0, &fw_timeout); ++ if (ret || fw_timeout == 0) { ++ dev_err(kbdev->dev, ++ "Couldn't process fw_timeout write operation.\n" ++ "Use format 'fw_timeout_ms', and fw_timeout_ms > 0\n" ++ "Default fw_timeout: %u", ++ kbase_get_timeout_ms(kbdev, CSF_FIRMWARE_PING_TIMEOUT)); ++ return -EINVAL; + } -+} -+#endif + -+/** -+ * kbase_fence_out_is_ours() - Check if atom has a valid fence created by us -+ * @katom: Atom to check output fence for -+ * -+ * Return: true if fence exists and is valid, otherwise false -+ */ -+static inline bool kbase_fence_out_is_ours(struct kbase_jd_atom *katom) -+{ -+ return katom->dma_fence.fence && -+ katom->dma_fence.fence->ops == &kbase_fence_ops; ++ kbase_csf_scheduler_lock(kbdev); ++ kbdev->csf.fw_timeout_ms = fw_timeout; ++ kbase_csf_scheduler_unlock(kbdev); ++ dev_dbg(kbdev->dev, "Firmware timeout: %ums\n", fw_timeout); ++ ++ return count; +} + +/** -+ * kbase_fence_out_signal() - Signal output fence of atom -+ * @katom: Atom to signal output fence for -+ * @status: Status to signal with (0 for success, < 0 for error) ++ * fw_timeout_show - Show callback for the firmware timeout sysfs entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the GPU information. + * -+ * Return: 0 on success, < 0 on error ++ * This function is called to get the current reset timeout. ++ * ++ * Return: The number of bytes output to @buf. + */ -+static inline int kbase_fence_out_signal(struct kbase_jd_atom *katom, -+ int status) ++static ssize_t fw_timeout_show(struct device *dev, ++ struct device_attribute *attr, char *const buf) +{ -+ if (status) { -+#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE && \ -+ KERNEL_VERSION(4, 9, 68) <= LINUX_VERSION_CODE) -+ fence_set_error(katom->dma_fence.fence, status); -+#elif (KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE) -+ dma_fence_set_error(katom->dma_fence.fence, status); -+#else -+ katom->dma_fence.fence->status = status; -+#endif -+ } -+ return dma_fence_signal(katom->dma_fence.fence); ++ struct kbase_device *kbdev; ++ ssize_t ret; ++ ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; ++ ++ ret = scnprintf(buf, PAGE_SIZE, "%u\n", kbdev->csf.fw_timeout_ms); ++ ++ return ret; +} + -+/** -+ * kbase_fence_add_callback() - Add callback on @fence to block @katom -+ * @katom: Pointer to katom that will be blocked by @fence -+ * @fence: Pointer to fence on which to set up the callback -+ * @callback: Pointer to function to be called when fence is signaled -+ * -+ * Caller needs to hold a reference to @fence when calling this function, and -+ * the caller is responsible for releasing that reference. An additional -+ * reference to @fence will be taken when the callback was successfully set up -+ * and @fence needs to be kept valid until the callback has been called and -+ * cleanup have been done. -+ * -+ * Return: 0 on success: fence was either already signaled, or callback was -+ * set up. Negative error code is returned on error. -+ */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+int kbase_fence_add_callback(struct kbase_jd_atom *katom, -+ struct fence *fence, -+ fence_func_t callback); -+#else -+int kbase_fence_add_callback(struct kbase_jd_atom *katom, -+ struct dma_fence *fence, -+ dma_fence_func_t callback); -+#endif ++static DEVICE_ATTR_RW(fw_timeout); + +/** -+ * kbase_fence_dep_count_set() - Set dep_count value on atom to specified value -+ * @katom: Atom to set dep_count for -+ * @val: value to set dep_count to ++ * idle_hysteresis_time_store - Store callback for CSF idle_hysteresis_time ++ * sysfs file. ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file + * -+ * The dep_count is available to the users of this module so that they can -+ * synchronize completion of the wait with cancellation and adding of more -+ * callbacks. For instance, a user could do the following: ++ * This function is called when the idle_hysteresis_time sysfs file is ++ * written to. + * -+ * dep_count set to 1 -+ * callback #1 added, dep_count is increased to 2 -+ * callback #1 happens, dep_count decremented to 1 -+ * since dep_count > 0, no completion is done -+ * callback #2 is added, dep_count is increased to 2 -+ * dep_count decremented to 1 -+ * callback #2 happens, dep_count decremented to 0 -+ * since dep_count now is zero, completion executes ++ * This file contains values of the idle hysteresis duration. + * -+ * The dep_count can also be used to make sure that the completion only -+ * executes once. This is typically done by setting dep_count to -1 for the -+ * thread that takes on this responsibility. ++ * Return: @count if the function succeeded. An error code on failure. + */ -+static inline void -+kbase_fence_dep_count_set(struct kbase_jd_atom *katom, int val) ++static ssize_t idle_hysteresis_time_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) +{ -+ atomic_set(&katom->dma_fence.dep_count, val); -+} ++ struct kbase_device *kbdev; ++ u32 dur = 0; + -+/** -+ * kbase_fence_dep_count_dec_and_test() - Decrements dep_count -+ * @katom: Atom to decrement dep_count for -+ * -+ * See @kbase_fence_dep_count_set for general description about dep_count -+ * -+ * Return: true if value was decremented to zero, otherwise false -+ */ -+static inline bool -+kbase_fence_dep_count_dec_and_test(struct kbase_jd_atom *katom) -+{ -+ return atomic_dec_and_test(&katom->dma_fence.dep_count); ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; ++ ++ if (kstrtou32(buf, 0, &dur)) { ++ dev_err(kbdev->dev, "Couldn't process idle_hysteresis_time write operation.\n" ++ "Use format \n"); ++ return -EINVAL; ++ } ++ ++ kbase_csf_firmware_set_gpu_idle_hysteresis_time(kbdev, dur); ++ ++ return count; +} + +/** -+ * kbase_fence_dep_count_read() - Returns the current dep_count value -+ * @katom: Pointer to katom ++ * idle_hysteresis_time_show - Show callback for CSF idle_hysteresis_time ++ * sysfs entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the GPU information. + * -+ * See @kbase_fence_dep_count_set for general description about dep_count ++ * This function is called to get the current idle hysteresis duration in ms. + * -+ * Return: The current dep_count value ++ * Return: The number of bytes output to @buf. + */ -+static inline int kbase_fence_dep_count_read(struct kbase_jd_atom *katom) ++static ssize_t idle_hysteresis_time_show(struct device *dev, ++ struct device_attribute *attr, char * const buf) +{ -+ return atomic_read(&katom->dma_fence.dep_count); ++ struct kbase_device *kbdev; ++ ssize_t ret; ++ u32 dur; ++ ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; ++ ++ dur = kbase_csf_firmware_get_gpu_idle_hysteresis_time(kbdev); ++ ret = scnprintf(buf, PAGE_SIZE, "%u\n", dur); ++ ++ return ret; +} + ++static DEVICE_ATTR_RW(idle_hysteresis_time); ++ +/** -+ * kbase_fence_free_callbacks() - Free dma-fence callbacks on a katom -+ * @katom: Pointer to katom ++ * mcu_shader_pwroff_timeout_show - Get the MCU shader Core power-off time value. + * -+ * This function will free all fence callbacks on the katom's list of -+ * callbacks. Callbacks that have not yet been called, because their fence -+ * hasn't yet signaled, will first be removed from the fence. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer for the sysfs file contents + * -+ * Locking: katom->dma_fence.callbacks list assumes jctx.lock is held. ++ * Get the internally recorded MCU shader Core power-off (nominal) timeout value. ++ * The unit of the value is in micro-seconds. + * -+ * Return: true if dep_count reached 0, otherwise false. ++ * Return: The number of bytes output to @buf if the ++ * function succeeded. A Negative value on failure. + */ -+bool kbase_fence_free_callbacks(struct kbase_jd_atom *katom); ++static ssize_t mcu_shader_pwroff_timeout_show(struct device *dev, struct device_attribute *attr, ++ char *const buf) ++{ ++ struct kbase_device *kbdev = dev_get_drvdata(dev); ++ u32 pwroff; + -+#if defined(CONFIG_SYNC_FILE) -+/** -+ * kbase_fence_in_get() - Retrieve input fence for atom. -+ * @katom: Atom to get input fence from -+ * -+ * A ref will be taken for the fence, so use @kbase_fence_put() to release it -+ * -+ * Return: The fence, or NULL if there is no input fence for atom -+ */ -+#define kbase_fence_in_get(katom) dma_fence_get((katom)->dma_fence.fence_in) -+#endif ++ if (!kbdev) ++ return -ENODEV; ++ ++ pwroff = kbase_csf_firmware_get_mcu_core_pwroff_time(kbdev); ++ return scnprintf(buf, PAGE_SIZE, "%u\n", pwroff); ++} + +/** -+ * kbase_fence_out_get() - Retrieve output fence for atom. -+ * @katom: Atom to get output fence from ++ * mcu_shader_pwroff_timeout_store - Set the MCU shader core power-off time value. + * -+ * A ref will be taken for the fence, so use @kbase_fence_put() to release it ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes to write to the sysfs file + * -+ * Return: The fence, or NULL if there is no output fence for atom ++ * The duration value (unit: micro-seconds) for configuring MCU Shader Core ++ * timer, when the shader cores' power transitions are delegated to the ++ * MCU (normal operational mode) ++ * ++ * Return: @count if the function succeeded. An error code on failure. + */ -+#define kbase_fence_out_get(katom) dma_fence_get((katom)->dma_fence.fence) ++static ssize_t mcu_shader_pwroff_timeout_store(struct device *dev, struct device_attribute *attr, ++ const char *buf, size_t count) ++{ ++ struct kbase_device *kbdev = dev_get_drvdata(dev); ++ u32 dur; + -+#endif /* !MALI_USE_CSF */ ++ if (!kbdev) ++ return -ENODEV; + -+/** -+ * kbase_fence_put() - Releases a reference to a fence -+ * @fence: Fence to release reference for. -+ */ -+#define kbase_fence_put(fence) dma_fence_put(fence) ++ if (kstrtouint(buf, 0, &dur)) ++ return -EINVAL; + ++ kbase_csf_firmware_set_mcu_core_pwroff_time(kbdev, dur); + -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE || defined(CONFIG_SYNC_FILE */ ++ return count; ++} + -+#endif /* _KBASE_FENCE_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h -new file mode 100755 -index 000000000000..303029639d38 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h -@@ -0,0 +1,64 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2018, 2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ ++static DEVICE_ATTR_RW(mcu_shader_pwroff_timeout); + -+#ifndef _KBASE_FENCE_DEFS_H_ -+#define _KBASE_FENCE_DEFS_H_ ++#endif /* MALI_USE_CSF */ + -+/* -+ * There was a big rename in the 4.10 kernel (fence* -> dma_fence*) -+ * This file hides the compatibility issues with this for the rest the driver -+ */ ++static struct attribute *kbase_scheduling_attrs[] = { ++#if !MALI_USE_CSF ++ &dev_attr_serialize_jobs.attr, ++#endif /* !MALI_USE_CSF */ ++ NULL ++}; + -+#include ++static struct attribute *kbase_attrs[] = { ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ &dev_attr_debug_command.attr, ++#if !MALI_USE_CSF ++ &dev_attr_js_softstop_always.attr, ++#endif /* !MALI_USE_CSF */ ++#endif ++#if !MALI_USE_CSF ++ &dev_attr_js_timeouts.attr, ++ &dev_attr_soft_job_timeout.attr, ++#endif /* !MALI_USE_CSF */ ++ &dev_attr_gpuinfo.attr, ++ &dev_attr_dvfs_period.attr, ++ &dev_attr_pm_poweroff.attr, ++ &dev_attr_reset_timeout.attr, ++#if !MALI_USE_CSF ++ &dev_attr_js_scheduling_period.attr, ++#else ++ &dev_attr_csg_scheduling_period.attr, ++ &dev_attr_fw_timeout.attr, ++ &dev_attr_idle_hysteresis_time.attr, ++ &dev_attr_mcu_shader_pwroff_timeout.attr, ++#endif /* !MALI_USE_CSF */ ++ &dev_attr_power_policy.attr, ++ &dev_attr_core_mask.attr, ++ &dev_attr_mem_pool_size.attr, ++ &dev_attr_mem_pool_max_size.attr, ++ &dev_attr_lp_mem_pool_size.attr, ++ &dev_attr_lp_mem_pool_max_size.attr, ++#if !MALI_USE_CSF ++ &dev_attr_js_ctx_scheduling_mode.attr, ++#endif /* !MALI_USE_CSF */ ++ NULL ++}; + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++static struct attribute *kbase_mempool_attrs[] = { ++ &dev_attr_max_size.attr, ++ &dev_attr_lp_max_size.attr, ++ &dev_attr_ctx_default_max_size.attr, ++ NULL ++}; + -+#include ++#define SYSFS_SCHEDULING_GROUP "scheduling" ++static const struct attribute_group kbase_scheduling_attr_group = { ++ .name = SYSFS_SCHEDULING_GROUP, ++ .attrs = kbase_scheduling_attrs, ++}; + -+#define dma_fence_context_alloc(a) fence_context_alloc(a) -+#define dma_fence_init(a, b, c, d, e) fence_init(a, b, c, d, e) -+#define dma_fence_get(a) fence_get(a) -+#define dma_fence_put(a) fence_put(a) -+#define dma_fence_signal(a) fence_signal(a) -+#define dma_fence_is_signaled(a) fence_is_signaled(a) -+#define dma_fence_add_callback(a, b, c) fence_add_callback(a, b, c) -+#define dma_fence_remove_callback(a, b) fence_remove_callback(a, b) ++#define SYSFS_MEMPOOL_GROUP "mempool" ++static const struct attribute_group kbase_mempool_attr_group = { ++ .name = SYSFS_MEMPOOL_GROUP, ++ .attrs = kbase_mempool_attrs, ++}; + -+#if (KERNEL_VERSION(4, 9, 68) <= LINUX_VERSION_CODE) -+#define dma_fence_get_status(a) (fence_is_signaled(a) ? (a)->error ?: 1 : 0) -+#else -+#define dma_fence_get_status(a) (fence_is_signaled(a) ? (a)->status ?: 1 : 0) -+#endif ++static const struct attribute_group kbase_attr_group = { ++ .attrs = kbase_attrs, ++}; + -+#else ++int kbase_sysfs_init(struct kbase_device *kbdev) ++{ ++ int err = 0; + -+#include ++ kbdev->mdev.minor = MISC_DYNAMIC_MINOR; ++ kbdev->mdev.name = kbdev->devname; ++ kbdev->mdev.fops = &kbase_fops; ++ kbdev->mdev.parent = get_device(kbdev->dev); ++ kbdev->mdev.mode = 0666; + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)) -+#define dma_fence_get_status(a) (dma_fence_is_signaled(a) ? \ -+ (a)->status ?: 1 \ -+ : 0) -+#endif ++ err = sysfs_create_group(&kbdev->dev->kobj, &kbase_attr_group); ++ if (err) ++ return err; + -+#endif /* < 4.10.0 */ ++ err = sysfs_create_group(&kbdev->dev->kobj, ++ &kbase_scheduling_attr_group); ++ if (err) { ++ dev_err(kbdev->dev, "Creation of %s sysfs group failed", ++ SYSFS_SCHEDULING_GROUP); ++ sysfs_remove_group(&kbdev->dev->kobj, ++ &kbase_attr_group); ++ return err; ++ } + -+#endif /* _KBASE_FENCE_DEFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c b/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c -new file mode 100755 -index 000000000000..c4703748bec6 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c -@@ -0,0 +1,84 @@ -+/* -+ * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ ++ err = sysfs_create_group(&kbdev->dev->kobj, ++ &kbase_mempool_attr_group); ++ if (err) { ++ dev_err(kbdev->dev, "Creation of %s sysfs group failed", ++ SYSFS_MEMPOOL_GROUP); ++ sysfs_remove_group(&kbdev->dev->kobj, ++ &kbase_scheduling_attr_group); ++ sysfs_remove_group(&kbdev->dev->kobj, ++ &kbase_attr_group); ++ } + -+#include -+#include -+#include -+#include ++ return err; ++} + -+static const char * -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+kbase_fence_get_driver_name(struct fence *fence) -+#else -+kbase_fence_get_driver_name(struct dma_fence *fence) -+#endif ++void kbase_sysfs_term(struct kbase_device *kbdev) +{ -+ return kbase_drv_name; ++ sysfs_remove_group(&kbdev->dev->kobj, &kbase_mempool_attr_group); ++ sysfs_remove_group(&kbdev->dev->kobj, &kbase_scheduling_attr_group); ++ sysfs_remove_group(&kbdev->dev->kobj, &kbase_attr_group); ++ put_device(kbdev->dev); +} + -+static const char * -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+kbase_fence_get_timeline_name(struct fence *fence) -+#else -+kbase_fence_get_timeline_name(struct dma_fence *fence) -+#endif ++static int kbase_platform_device_remove(struct platform_device *pdev) +{ -+ return kbase_timeline_name; ++ struct kbase_device *kbdev = to_kbase_device(&pdev->dev); ++ ++ if (!kbdev) ++ return -ENODEV; ++ ++ kbase_device_term(kbdev); ++ dev_set_drvdata(kbdev->dev, NULL); ++ kbase_device_free(kbdev); ++ ++ return 0; +} + -+static bool -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+kbase_fence_enable_signaling(struct fence *fence) -+#else -+kbase_fence_enable_signaling(struct dma_fence *fence) ++void kbase_backend_devfreq_term(struct kbase_device *kbdev) ++{ ++#ifdef CONFIG_MALI_BIFROST_DEVFREQ ++ if (kbdev->devfreq) ++ kbase_devfreq_term(kbdev); +#endif ++} ++ ++int kbase_backend_devfreq_init(struct kbase_device *kbdev) +{ -+ return true; ++#ifdef CONFIG_MALI_BIFROST_DEVFREQ ++ /* Devfreq uses hardware counters, so must be initialized after it. */ ++ int err = kbase_devfreq_init(kbdev); ++ ++ if (err) ++ dev_err(kbdev->dev, "Continuing without devfreq\n"); ++#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ ++ return 0; +} + -+static void -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+kbase_fence_fence_value_str(struct fence *fence, char *str, int size) -+#else -+kbase_fence_fence_value_str(struct dma_fence *fence, char *str, int size) -+#endif ++static int kbase_platform_device_probe(struct platform_device *pdev) +{ -+#if (KERNEL_VERSION(5, 1, 0) > LINUX_VERSION_CODE) -+ snprintf(str, size, "%u", fence->seqno); -+#else -+ snprintf(str, size, "%llu", fence->seqno); ++ struct kbase_device *kbdev; ++ int err = 0; ++ ++ mali_kbase_print_cs_experimental(); ++ ++ kbdev = kbase_device_alloc(); ++ if (!kbdev) { ++ dev_err(&pdev->dev, "Allocate device failed\n"); ++ return -ENOMEM; ++ } ++ ++ kbdev->dev = &pdev->dev; ++ ++#if (KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE) ++ kbdev->token = -EPERM; ++#endif /* (KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE) */ ++ ++ dev_set_drvdata(kbdev->dev, kbdev); ++#if (KERNEL_VERSION(5, 3, 0) <= LINUX_VERSION_CODE) ++ mutex_lock(&kbase_probe_mutex); +#endif -+} ++ err = kbase_device_init(kbdev); + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+const struct fence_ops kbase_fence_ops = { -+ .wait = fence_default_wait, -+#else -+const struct dma_fence_ops kbase_fence_ops = { -+ .wait = dma_fence_default_wait, ++ if (err) { ++ if (err == -EPROBE_DEFER) ++ dev_info(kbdev->dev, ++ "Device initialization Deferred\n"); ++ else ++ dev_err(kbdev->dev, "Device initialization failed\n"); ++ ++ dev_set_drvdata(kbdev->dev, NULL); ++ kbase_device_free(kbdev); ++#if (KERNEL_VERSION(5, 3, 0) <= LINUX_VERSION_CODE) ++ mutex_unlock(&kbase_probe_mutex); +#endif -+ .get_driver_name = kbase_fence_get_driver_name, -+ .get_timeline_name = kbase_fence_get_timeline_name, -+ .enable_signaling = kbase_fence_enable_signaling, -+ .fence_value_str = kbase_fence_fence_value_str -+}; ++ } else { ++ dev_info(kbdev->dev, ++ "Probed as %s\n", dev_name(kbdev->mdev.this_device)); ++ kbase_increment_device_id(); ++#if (KERNEL_VERSION(5, 3, 0) <= LINUX_VERSION_CODE) ++ mutex_unlock(&kbase_probe_mutex); ++#endif ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ mutex_lock(&kbdev->pm.lock); ++ kbase_arbiter_pm_vm_event(kbdev, KBASE_VM_GPU_INITIALIZED_EVT); ++ mutex_unlock(&kbdev->pm.lock); ++#endif ++ } + -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gator.h b/drivers/gpu/arm/bifrost/mali_kbase_gator.h -new file mode 100755 -index 000000000000..579c7b6ff3aa ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_gator.h -@@ -0,0 +1,53 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2019 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ return err; ++} ++ ++#undef KBASEP_DEFAULT_REGISTER_HISTORY_SIZE ++ ++/** ++ * kbase_device_suspend - Suspend callback from the OS. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * @dev: The device to suspend + * -+ * SPDX-License-Identifier: GPL-2.0 ++ * This is called by Linux when the device should suspend. + * ++ * Return: A standard Linux error code on failure, 0 otherwise. + */ ++static int kbase_device_suspend(struct device *dev) ++{ ++ struct kbase_device *kbdev = to_kbase_device(dev); + -+/* NB taken from gator */ -+/* -+ * List of possible actions to be controlled by DS-5 Streamline. -+ * The following numbers are used by gator to control the frame buffer dumping -+ * and s/w counter reporting. We cannot use the enums in mali_uk_types.h because -+ * they are unknown inside gator. -+ */ -+ -+#ifndef _KBASE_GATOR_H_ -+#define _KBASE_GATOR_H_ -+ -+#include ++ if (!kbdev) ++ return -ENODEV; + -+#define GATOR_JOB_SLOT_START 1 -+#define GATOR_JOB_SLOT_STOP 2 -+#define GATOR_JOB_SLOT_SOFT_STOPPED 3 ++ if (kbase_pm_suspend(kbdev)) { ++ dev_warn(kbdev->dev, "Abort suspend as GPU suspension failed"); ++ return -EBUSY; ++ } + -+#ifdef CONFIG_MALI_BIFROST_GATOR_SUPPORT ++#ifdef CONFIG_MALI_BIFROST_DVFS ++ kbase_pm_metrics_stop(kbdev); ++#endif + -+#define GATOR_MAKE_EVENT(type, number) (((type) << 24) | ((number) << 16)) ++#ifdef CONFIG_MALI_BIFROST_DEVFREQ ++ dev_dbg(dev, "Callback %s\n", __func__); ++ if (kbdev->devfreq) { ++ kbase_devfreq_enqueue_work(kbdev, DEVFREQ_WORK_SUSPEND); ++ flush_workqueue(kbdev->devfreq_queue.workq); ++ } ++#endif + -+struct kbase_context; ++#ifdef CONFIG_ARCH_ROCKCHIP ++ kbase_platform_rk_enable_regulator(kbdev); ++#endif + -+void kbase_trace_mali_job_slots_event(u32 dev_id, u32 event, const struct kbase_context *kctx, u8 atom_id); -+void kbase_trace_mali_pm_status(u32 dev_id, u32 event, u64 value); -+void kbase_trace_mali_page_fault_insert_pages(u32 dev_id, int event, u32 value); -+void kbase_trace_mali_total_alloc_pages_change(u32 dev_id, long long int event); ++#ifdef KBASE_PM_RUNTIME ++ if (kbdev->is_runtime_resumed) { ++ if (kbdev->pm.backend.callback_power_runtime_off) ++ kbdev->pm.backend.callback_power_runtime_off(kbdev); ++ } ++#endif /* KBASE_PM_RUNTIME */ + -+#endif /* CONFIG_MALI_BIFROST_GATOR_SUPPORT */ ++ return 0; ++} + -+#endif /* _KBASE_GATOR_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c -new file mode 100755 -index 000000000000..569abd920fde ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c -@@ -0,0 +1,104 @@ -+/* ++/** ++ * kbase_device_resume - Resume callback from the OS. + * -+ * (C) COPYRIGHT 2012-2017, 2019 ARM Limited. All rights reserved. ++ * @dev: The device to resume + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * This is called by Linux when the device should resume from suspension. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * Return: A standard Linux error code ++ */ ++static int kbase_device_resume(struct device *dev) ++{ ++ struct kbase_device *kbdev = to_kbase_device(dev); ++ ++ if (!kbdev) ++ return -ENODEV; ++ ++#ifdef KBASE_PM_RUNTIME ++ if (kbdev->is_runtime_resumed) { ++ if (kbdev->pm.backend.callback_power_runtime_on) ++ kbdev->pm.backend.callback_power_runtime_on(kbdev); ++ } ++#endif /* KBASE_PM_RUNTIME */ ++ ++ kbase_pm_resume(kbdev); ++ ++#ifdef CONFIG_MALI_BIFROST_DVFS ++ kbase_pm_metrics_start(kbdev); ++#endif ++ ++#ifdef CONFIG_MALI_BIFROST_DEVFREQ ++ dev_dbg(dev, "Callback %s\n", __func__); ++ if (kbdev->devfreq) ++ kbase_devfreq_enqueue_work(kbdev, DEVFREQ_WORK_RESUME); ++#endif ++ ++#if !MALI_USE_CSF ++ kbase_enable_quick_reset(kbdev); ++#endif ++ ++ return 0; ++} ++ ++/** ++ * kbase_device_runtime_suspend - Runtime suspend callback from the OS. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * @dev: The device to suspend + * -+ * SPDX-License-Identifier: GPL-2.0 ++ * This is called by Linux when the device should prepare for a condition in ++ * which it will not be able to communicate with the CPU(s) and RAM due to ++ * power management. + * ++ * Return: A standard Linux error code + */ ++#ifdef KBASE_PM_RUNTIME ++static int kbase_device_runtime_suspend(struct device *dev) ++{ ++ struct kbase_device *kbdev = to_kbase_device(dev); ++ int ret = 0; + -+#include -+#include ++ if (!kbdev) ++ return -ENODEV; + -+#ifdef CONFIG_DEBUG_FS -+/** Show callback for the @c gpu_memory debugfs file. ++ dev_dbg(dev, "Callback %s\n", __func__); ++ KBASE_KTRACE_ADD(kbdev, PM_RUNTIME_SUSPEND_CALLBACK, NULL, 0); ++ ++#if MALI_USE_CSF ++ ret = kbase_pm_handle_runtime_suspend(kbdev); ++ if (ret) ++ return ret; ++#endif ++ ++#ifdef CONFIG_MALI_BIFROST_DVFS ++ kbase_pm_metrics_stop(kbdev); ++#endif ++ ++#ifdef CONFIG_MALI_BIFROST_DEVFREQ ++ if (kbdev->devfreq) ++ kbase_devfreq_enqueue_work(kbdev, DEVFREQ_WORK_SUSPEND); ++#endif ++ ++ if (kbdev->pm.backend.callback_power_runtime_off) { ++ kbdev->pm.backend.callback_power_runtime_off(kbdev); ++ kbdev->is_runtime_resumed = false; ++ dev_dbg(dev, "runtime suspend\n"); ++ } ++ return ret; ++} ++#endif /* KBASE_PM_RUNTIME */ ++ ++/** ++ * kbase_device_runtime_resume - Runtime resume callback from the OS. + * -+ * This function is called to get the contents of the @c gpu_memory debugfs -+ * file. This is a report of current gpu memory usage. ++ * @dev: The device to suspend + * -+ * @param sfile The debugfs entry -+ * @param data Data associated with the entry ++ * This is called by Linux when the device should go into a fully active state. + * -+ * @return 0 if successfully prints data in debugfs entry file -+ * -1 if it encountered an error ++ * Return: A standard Linux error code + */ + -+static int kbasep_gpu_memory_seq_show(struct seq_file *sfile, void *data) ++#ifdef KBASE_PM_RUNTIME ++static int kbase_device_runtime_resume(struct device *dev) +{ -+ struct list_head *entry; -+ const struct list_head *kbdev_list; ++ int ret = 0; ++ struct kbase_device *kbdev = to_kbase_device(dev); + -+ kbdev_list = kbase_device_get_list(); -+ list_for_each(entry, kbdev_list) { -+ struct kbase_device *kbdev = NULL; -+ struct kbase_context *kctx; ++ if (!kbdev) ++ return -ENODEV; + -+ kbdev = list_entry(entry, struct kbase_device, entry); -+ /* output the total memory usage and cap for this device */ -+ seq_printf(sfile, "%-16s %10u\n", -+ kbdev->devname, -+ atomic_read(&(kbdev->memdev.used_pages))); -+ mutex_lock(&kbdev->kctx_list_lock); -+ list_for_each_entry(kctx, &kbdev->kctx_list, kctx_list_link) { -+ /* output the memory usage and cap for each kctx -+ * opened on this device */ -+ seq_printf(sfile, " %s-0x%p %10u\n", -+ "kctx", -+ kctx, -+ atomic_read(&(kctx->used_pages))); -+ } -+ mutex_unlock(&kbdev->kctx_list_lock); ++ dev_dbg(dev, "Callback %s\n", __func__); ++ // KBASE_KTRACE_ADD(kbdev, PM_RUNTIME_RESUME_CALLBACK, NULL, 0); ++ if (kbdev->pm.backend.callback_power_runtime_on) { ++ ret = kbdev->pm.backend.callback_power_runtime_on(kbdev); ++ kbdev->is_runtime_resumed = true; ++ dev_dbg(dev, "runtime resume\n"); + } -+ kbase_device_put_list(kbdev_list); -+ return 0; ++ ++#ifdef CONFIG_MALI_BIFROST_DVFS ++ kbase_pm_metrics_start(kbdev); ++#endif ++ ++#ifdef CONFIG_MALI_BIFROST_DEVFREQ ++ if (kbdev->devfreq) ++ kbase_devfreq_enqueue_work(kbdev, DEVFREQ_WORK_RESUME); ++#endif ++ ++ return ret; +} ++#endif /* KBASE_PM_RUNTIME */ + -+/* -+ * File operations related to debugfs entry for gpu_memory ++ ++#ifdef KBASE_PM_RUNTIME ++/** ++ * kbase_device_runtime_idle - Runtime idle callback from the OS. ++ * @dev: The device to suspend ++ * ++ * This is called by Linux when the device appears to be inactive and it might ++ * be placed into a low power state. ++ * ++ * Return: 0 if device can be suspended, non-zero to avoid runtime autosuspend, ++ * otherwise a standard Linux error code + */ -+static int kbasep_gpu_memory_debugfs_open(struct inode *in, struct file *file) ++static int kbase_device_runtime_idle(struct device *dev) +{ -+ return single_open(file, kbasep_gpu_memory_seq_show, NULL); ++ struct kbase_device *kbdev = to_kbase_device(dev); ++ ++ if (!kbdev) ++ return -ENODEV; ++ ++ dev_dbg(dev, "Callback %s\n", __func__); ++ /* Use platform specific implementation if it exists. */ ++ if (kbdev->pm.backend.callback_power_runtime_idle) ++ return kbdev->pm.backend.callback_power_runtime_idle(kbdev); ++ ++ /* Just need to update the device's last busy mark. Kernel will respect ++ * the autosuspend delay and so won't suspend the device immediately. ++ */ ++ pm_runtime_mark_last_busy(kbdev->dev); ++ return 0; +} ++#endif /* KBASE_PM_RUNTIME */ + -+static const struct file_operations kbasep_gpu_memory_debugfs_fops = { -+ .owner = THIS_MODULE, -+ .open = kbasep_gpu_memory_debugfs_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, ++/* The power management operations for the platform driver. ++ */ ++static const struct dev_pm_ops kbase_pm_ops = { ++ .suspend = kbase_device_suspend, ++ .resume = kbase_device_resume, ++#ifdef KBASE_PM_RUNTIME ++ .runtime_suspend = kbase_device_runtime_suspend, ++ .runtime_resume = kbase_device_runtime_resume, ++ .runtime_idle = kbase_device_runtime_idle, ++#endif /* KBASE_PM_RUNTIME */ +}; + -+/* -+ * Initialize debugfs entry for gpu_memory -+ */ -+void kbasep_gpu_memory_debugfs_init(struct kbase_device *kbdev) ++#if IS_ENABLED(CONFIG_OF) ++static const struct of_device_id kbase_dt_ids[] = { { .compatible = "arm,malit6xx" }, ++ { .compatible = "arm,mali-midgard" }, ++ { .compatible = "arm,mali-bifrost" }, ++ { .compatible = "arm,mali-valhall" }, ++ { /* sentinel */ } }; ++MODULE_DEVICE_TABLE(of, kbase_dt_ids); ++#endif ++ ++static struct platform_driver kbase_platform_driver = { ++ .probe = kbase_platform_device_probe, ++ .remove = kbase_platform_device_remove, ++ .driver = { ++ .name = kbase_drv_name, ++ .pm = &kbase_pm_ops, ++ .of_match_table = of_match_ptr(kbase_dt_ids), ++ .probe_type = PROBE_PREFER_ASYNCHRONOUS, ++ }, ++}; ++ ++#if (KERNEL_VERSION(5, 3, 0) > LINUX_VERSION_CODE) && IS_ENABLED(CONFIG_OF) ++module_platform_driver(kbase_platform_driver); ++#else ++static int __init kbase_driver_init(void) +{ -+ debugfs_create_file("gpu_memory", S_IRUGO, -+ kbdev->mali_debugfs_directory, NULL, -+ &kbasep_gpu_memory_debugfs_fops); -+ return; ++ int ret; ++ ++#if (KERNEL_VERSION(5, 3, 0) <= LINUX_VERSION_CODE) ++ mutex_init(&kbase_probe_mutex); ++#endif ++ ++#ifndef CONFIG_OF ++ ret = kbase_platform_register(); ++ if (ret) ++ return ret; ++#endif ++ ret = platform_driver_register(&kbase_platform_driver); ++#ifndef CONFIG_OF ++ if (ret) { ++ kbase_platform_unregister(); ++ return ret; ++ } ++#endif ++ ++ return ret; +} + -+#else -+/* -+ * Stub functions for when debugfs is disabled -+ */ -+void kbasep_gpu_memory_debugfs_init(struct kbase_device *kbdev) ++static void __exit kbase_driver_exit(void) +{ -+ return; ++ platform_driver_unregister(&kbase_platform_driver); ++#ifndef CONFIG_OF ++ kbase_platform_unregister(); ++#endif +} ++ ++module_init(kbase_driver_init); ++module_exit(kbase_driver_exit); +#endif -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h ++MODULE_LICENSE("GPL"); ++MODULE_VERSION(MALI_RELEASE_NAME " (UK version " \ ++ __stringify(BASE_UK_VERSION_MAJOR) "." \ ++ __stringify(BASE_UK_VERSION_MINOR) ")"); ++MODULE_SOFTDEP("pre: memory_group_manager"); ++MODULE_INFO(import_ns, "DMA_BUF"); ++ ++#define CREATE_TRACE_POINTS ++/* Create the trace points (otherwise we just get code to call a tracepoint) */ ++#include "mali_linux_trace.h" ++ ++#ifdef CONFIG_MALI_BIFROST_GATOR_SUPPORT ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_job_slots_event); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_pm_status); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_page_fault_insert_pages); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_total_alloc_pages_change); ++ ++void kbase_trace_mali_pm_status(u32 dev_id, u32 event, u64 value) ++{ ++ trace_mali_pm_status(dev_id, event, value); ++} ++ ++void kbase_trace_mali_job_slots_event(u32 dev_id, u32 event, const struct kbase_context *kctx, u8 atom_id) ++{ ++ trace_mali_job_slots_event(dev_id, event, ++ (kctx != NULL ? kctx->tgid : 0), ++ (kctx != NULL ? kctx->pid : 0), ++ atom_id); ++} ++ ++void kbase_trace_mali_page_fault_insert_pages(u32 dev_id, int event, u32 value) ++{ ++ trace_mali_page_fault_insert_pages(dev_id, event, value); ++} ++ ++void kbase_trace_mali_total_alloc_pages_change(u32 dev_id, long long event) ++{ ++ trace_mali_total_alloc_pages_change(dev_id, event); ++} ++#endif /* CONFIG_MALI_BIFROST_GATOR_SUPPORT */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h b/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h new file mode 100755 -index 000000000000..a45dabbb680f +index 000000000..7e885ca46 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h -@@ -0,0 +1,54 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h +@@ -0,0 +1,40 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2012-2014, 2016, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -204257,57 +236137,42 @@ index 000000000000..a45dabbb680f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + ++#ifndef _KBASE_CS_EXPERIMENTAL_H_ ++#define _KBASE_CS_EXPERIMENTAL_H_ + ++#include + +/** -+ * @file mali_kbase_gpu_memory_debugfs.h -+ * Header file for gpu_memory entry in debugfs -+ * ++ * mali_kbase_print_cs_experimental() - Print a string for every Core Services ++ * experimental feature that is enabled + */ ++static inline void mali_kbase_print_cs_experimental(void) ++{ ++#if MALI_INCREMENTAL_RENDERING_JM ++ pr_info("mali_kbase: INCREMENTAL_RENDERING_JM (experimental) enabled"); ++#endif /* MALI_INCREMENTAL_RENDERING_JM */ ++} + -+#ifndef _KBASE_GPU_MEMORY_DEBUGFS_H -+#define _KBASE_GPU_MEMORY_DEBUGFS_H -+ -+#include -+#include -+ -+/* kbase_io_history_add - add new entry to the register access history -+ * -+ * @h: Pointer to the history data structure -+ * @addr: Register address -+ * @value: The value that is either read from or written to the register -+ * @write: 1 if it's a register write, 0 if it's a read -+ */ -+void kbase_io_history_add(struct kbase_io_history *h, void __iomem const *addr, -+ u32 value, u8 write); ++#endif /* _KBASE_CS_EXPERIMENTAL_H_ */ + -+/** -+ * kbasep_gpu_memory_debugfs_init - Initialize gpu_memory debugfs entry -+ * -+ * @kbdev: Device pointer -+ */ -+void kbasep_gpu_memory_debugfs_init(struct kbase_device *kbdev); + -+#endif /*_KBASE_GPU_MEMORY_DEBUGFS_H*/ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c new file mode 100755 -index 000000000000..020b5d853608 +index 000000000..dc6feb95a --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c -@@ -0,0 +1,649 @@ -+// SPDX-License-Identifier: GPL-2.0 ++++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c +@@ -0,0 +1,433 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2011-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2017-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -204318,650 +236183,435 @@ index 000000000000..020b5d853608 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+ -+ -+/* -+ * Base kernel property query APIs + */ + +#include -+#include -+#include -+#include -+#include -+#include "mali_kbase_ioctl.h" -+#include -+#include -+#include -+#include -+ ++#include ++#include "mali_kbase_ctx_sched.h" ++#include "tl/mali_kbase_tracepoints.h" ++#if MALI_USE_CSF ++#include "mali_kbase_reset_gpu.h" ++#else ++#include ++#endif + -+static void kbase_gpuprops_construct_coherent_groups( -+ struct base_gpu_props * const props) ++/* Helper for ktrace */ ++#if KBASE_KTRACE_ENABLE ++static int kbase_ktrace_get_ctx_refcnt(struct kbase_context *kctx) +{ -+ struct mali_base_gpu_coherent_group *current_group; -+ u64 group_present; -+ u64 group_mask; -+ u64 first_set, first_set_prev; -+ u32 num_groups = 0; -+ -+ KBASE_DEBUG_ASSERT(NULL != props); -+ -+ props->coherency_info.coherency = props->raw_props.mem_features; -+ props->coherency_info.num_core_groups = hweight64(props->raw_props.l2_present); ++ return atomic_read(&kctx->refcount); ++} ++#else /* KBASE_KTRACE_ENABLE */ ++static int kbase_ktrace_get_ctx_refcnt(struct kbase_context *kctx) ++{ ++ CSTD_UNUSED(kctx); ++ return 0; ++} ++#endif /* KBASE_KTRACE_ENABLE */ + -+ if (props->coherency_info.coherency & GROUPS_L2_COHERENT) { -+ /* Group is l2 coherent */ -+ group_present = props->raw_props.l2_present; -+ } else { -+ /* Group is l1 coherent */ -+ group_present = props->raw_props.shader_present; -+ } ++int kbase_ctx_sched_init(struct kbase_device *kbdev) ++{ ++ int as_present = (1U << kbdev->nr_hw_address_spaces) - 1; + -+ /* -+ * The coherent group mask can be computed from the l2 present -+ * register. -+ * -+ * For the coherent group n: -+ * group_mask[n] = (first_set[n] - 1) & ~(first_set[n-1] - 1) -+ * where first_set is group_present with only its nth set-bit kept -+ * (i.e. the position from where a new group starts). -+ * -+ * For instance if the groups are l2 coherent and l2_present=0x0..01111: -+ * The first mask is: -+ * group_mask[1] = (first_set[1] - 1) & ~(first_set[0] - 1) -+ * = (0x0..010 - 1) & ~(0x0..01 - 1) -+ * = 0x0..00f -+ * The second mask is: -+ * group_mask[2] = (first_set[2] - 1) & ~(first_set[1] - 1) -+ * = (0x0..100 - 1) & ~(0x0..010 - 1) -+ * = 0x0..0f0 -+ * And so on until all the bits from group_present have been cleared -+ * (i.e. there is no group left). ++ /* These two must be recalculated if nr_hw_address_spaces changes ++ * (e.g. for HW workarounds) + */ ++ kbdev->nr_user_address_spaces = kbdev->nr_hw_address_spaces; ++ kbdev->as_free = as_present; /* All ASs initially free */ + -+ current_group = props->coherency_info.group; -+ first_set = group_present & ~(group_present - 1); -+ -+ while (group_present != 0 && num_groups < BASE_MAX_COHERENT_GROUPS) { -+ group_present -= first_set; /* Clear the current group bit */ -+ first_set_prev = first_set; ++ memset(kbdev->as_to_kctx, 0, sizeof(kbdev->as_to_kctx)); + -+ first_set = group_present & ~(group_present - 1); -+ group_mask = (first_set - 1) & ~(first_set_prev - 1); ++ return 0; ++} + -+ /* Populate the coherent_group structure for each group */ -+ current_group->core_mask = group_mask & props->raw_props.shader_present; -+ current_group->num_cores = hweight64(current_group->core_mask); ++void kbase_ctx_sched_term(struct kbase_device *kbdev) ++{ ++ s8 i; + -+ num_groups++; -+ current_group++; ++ /* Sanity checks */ ++ for (i = 0; i != kbdev->nr_hw_address_spaces; ++i) { ++ WARN_ON(kbdev->as_to_kctx[i] != NULL); ++ WARN_ON(!(kbdev->as_free & (1u << i))); + } ++} + -+ if (group_present != 0) -+ pr_warn("Too many coherent groups (keeping only %d groups).\n", BASE_MAX_COHERENT_GROUPS); -+ -+ props->coherency_info.num_groups = num_groups; ++void kbase_ctx_sched_init_ctx(struct kbase_context *kctx) ++{ ++ kctx->as_nr = KBASEP_AS_NR_INVALID; ++ atomic_set(&kctx->refcount, 0); +} + -+/** -+ * kbase_gpuprops_get_props - Get the GPU configuration -+ * @gpu_props: The &struct base_gpu_props structure -+ * @kbdev: The &struct kbase_device structure for the device ++/* kbasep_ctx_sched_find_as_for_ctx - Find a free address space + * -+ * Fill the &struct base_gpu_props structure with values from the GPU -+ * configuration registers. Only the raw properties are filled in this function. ++ * @kbdev: The context for which to find a free address space + * -+ * Return: Zero on success, Linux error code on failure ++ * Return: A valid AS if successful, otherwise KBASEP_AS_NR_INVALID ++ * ++ * This function returns an address space available for use. It would prefer ++ * returning an AS that has been previously assigned to the context to ++ * avoid having to reprogram the MMU. + */ -+static int kbase_gpuprops_get_props(struct base_gpu_props * const gpu_props, -+ struct kbase_device *kbdev) ++static int kbasep_ctx_sched_find_as_for_ctx(struct kbase_context *kctx) +{ -+ struct kbase_gpuprops_regdump regdump; -+ int i; -+ int err; ++ struct kbase_device *const kbdev = kctx->kbdev; ++ int free_as; + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); -+ KBASE_DEBUG_ASSERT(NULL != gpu_props); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ /* Dump relevant registers */ -+ err = kbase_backend_gpuprops_get(kbdev, ®dump); -+ if (err) -+ return err; ++ /* First check if the previously assigned AS is available */ ++ if ((kctx->as_nr != KBASEP_AS_NR_INVALID) && ++ (kbdev->as_free & (1u << kctx->as_nr))) ++ return kctx->as_nr; + -+ gpu_props->raw_props.gpu_id = regdump.gpu_id; -+ gpu_props->raw_props.tiler_features = regdump.tiler_features; -+ gpu_props->raw_props.mem_features = regdump.mem_features; -+ gpu_props->raw_props.mmu_features = regdump.mmu_features; -+ gpu_props->raw_props.l2_features = regdump.l2_features; -+ gpu_props->raw_props.core_features = regdump.core_features; ++ /* The previously assigned AS was taken, we'll be returning any free ++ * AS at this point. ++ */ ++ free_as = ffs(kbdev->as_free) - 1; ++ if (free_as >= 0 && free_as < kbdev->nr_hw_address_spaces) ++ return free_as; + -+ gpu_props->raw_props.as_present = regdump.as_present; -+ gpu_props->raw_props.js_present = regdump.js_present; -+ gpu_props->raw_props.shader_present = -+ ((u64) regdump.shader_present_hi << 32) + -+ regdump.shader_present_lo; -+ gpu_props->raw_props.tiler_present = -+ ((u64) regdump.tiler_present_hi << 32) + -+ regdump.tiler_present_lo; -+ gpu_props->raw_props.l2_present = -+ ((u64) regdump.l2_present_hi << 32) + -+ regdump.l2_present_lo; -+ gpu_props->raw_props.stack_present = -+ ((u64) regdump.stack_present_hi << 32) + -+ regdump.stack_present_lo; ++ return KBASEP_AS_NR_INVALID; ++} + -+ for (i = 0; i < GPU_MAX_JOB_SLOTS; i++) -+ gpu_props->raw_props.js_features[i] = regdump.js_features[i]; ++int kbase_ctx_sched_retain_ctx(struct kbase_context *kctx) ++{ ++ struct kbase_device *const kbdev = kctx->kbdev; + -+ for (i = 0; i < BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS; i++) -+ gpu_props->raw_props.texture_features[i] = regdump.texture_features[i]; ++ lockdep_assert_held(&kbdev->mmu_hw_mutex); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ gpu_props->raw_props.thread_max_barrier_size = regdump.thread_max_barrier_size; -+ gpu_props->raw_props.thread_max_threads = regdump.thread_max_threads; -+ gpu_props->raw_props.thread_max_workgroup_size = regdump.thread_max_workgroup_size; -+ gpu_props->raw_props.thread_features = regdump.thread_features; -+ gpu_props->raw_props.thread_tls_alloc = regdump.thread_tls_alloc; ++ WARN_ON(!kbdev->pm.backend.gpu_powered); + -+ return 0; ++ if (atomic_inc_return(&kctx->refcount) == 1) { ++ int const free_as = kbasep_ctx_sched_find_as_for_ctx(kctx); ++ ++ if (free_as >= 0) { ++ kbdev->as_free &= ~(1u << free_as); ++ /* Only program the MMU if the context has not been ++ * assigned the same address space before. ++ */ ++ if (free_as != kctx->as_nr) { ++ struct kbase_context *const prev_kctx = ++ kbdev->as_to_kctx[free_as]; ++ ++ if (prev_kctx) { ++ WARN_ON(atomic_read(&prev_kctx->refcount) != 0); ++ kbase_mmu_disable(prev_kctx); ++ KBASE_TLSTREAM_TL_KBASE_CTX_UNASSIGN_AS( ++ kbdev, prev_kctx->id); ++ prev_kctx->as_nr = KBASEP_AS_NR_INVALID; ++ } ++ kctx->as_nr = free_as; ++ kbdev->as_to_kctx[free_as] = kctx; ++ KBASE_TLSTREAM_TL_KBASE_CTX_ASSIGN_AS( ++ kbdev, kctx->id, free_as); ++ kbase_mmu_update(kbdev, &kctx->mmu, ++ kctx->as_nr); ++ } ++ } else { ++ atomic_dec(&kctx->refcount); ++ ++ /* Failed to find an available address space, we must ++ * be returning an error at this point. ++ */ ++ WARN_ON(kctx->as_nr != KBASEP_AS_NR_INVALID); ++ } ++ } ++ ++ return kctx->as_nr; +} + -+void kbase_gpuprops_update_core_props_gpu_id( -+ struct base_gpu_props * const gpu_props) ++void kbase_ctx_sched_retain_ctx_refcount(struct kbase_context *kctx) +{ -+ gpu_props->core_props.version_status = -+ KBASE_UBFX32(gpu_props->raw_props.gpu_id, 0U, 4); -+ gpu_props->core_props.minor_revision = -+ KBASE_UBFX32(gpu_props->raw_props.gpu_id, 4U, 8); -+ gpu_props->core_props.major_revision = -+ KBASE_UBFX32(gpu_props->raw_props.gpu_id, 12U, 4); -+ gpu_props->core_props.product_id = -+ KBASE_UBFX32(gpu_props->raw_props.gpu_id, 16U, 16); ++ struct kbase_device *const kbdev = kctx->kbdev; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++#if MALI_USE_CSF ++ /* We expect the context to be active when this function is called, ++ * except for the case where a page fault is reported for it during ++ * the GPU reset sequence, in which case we can expect the refcount ++ * to be 0. ++ */ ++ WARN_ON(!atomic_read(&kctx->refcount) && !kbase_reset_gpu_is_active(kbdev)); ++#else ++ /* We expect the context to be active (and thus refcount should be non-zero) ++ * when this function is called ++ */ ++ WARN_ON(!atomic_read(&kctx->refcount)); ++#endif ++ if (likely((kctx->as_nr >= 0) && (kctx->as_nr < BASE_MAX_NR_AS))) ++ WARN_ON(kbdev->as_to_kctx[kctx->as_nr] != kctx); ++ else ++ WARN(true, "Invalid as_nr(%d)", kctx->as_nr); ++ ++ atomic_inc(&kctx->refcount); +} + -+/** -+ * kbase_gpuprops_calculate_props - Calculate the derived properties -+ * @gpu_props: The &struct base_gpu_props structure -+ * @kbdev: The &struct kbase_device structure for the device -+ * -+ * Fill the &struct base_gpu_props structure with values derived from the GPU -+ * configuration registers -+ */ -+static void kbase_gpuprops_calculate_props( -+ struct base_gpu_props * const gpu_props, struct kbase_device *kbdev) ++void kbase_ctx_sched_release_ctx(struct kbase_context *kctx) +{ -+ int i; -+ u32 gpu_id; -+ u32 product_id; ++ struct kbase_device *const kbdev = kctx->kbdev; ++ int new_ref_count; + -+ /* Populate the base_gpu_props structure */ -+ kbase_gpuprops_update_core_props_gpu_id(gpu_props); -+ gpu_props->core_props.log2_program_counter_size = KBASE_GPU_PC_SIZE_LOG2; -+#if KERNEL_VERSION(5, 0, 0) > LINUX_VERSION_CODE -+ gpu_props->core_props.gpu_available_memory_size = totalram_pages << PAGE_SHIFT; -+#else -+ gpu_props->core_props.gpu_available_memory_size = -+ totalram_pages() << PAGE_SHIFT; ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ new_ref_count = atomic_dec_return(&kctx->refcount); ++ if (new_ref_count == 0) { ++ if (likely((kctx->as_nr >= 0) && (kctx->as_nr < BASE_MAX_NR_AS))) { ++ kbdev->as_free |= (1u << kctx->as_nr); ++ if (kbase_ctx_flag(kctx, KCTX_AS_DISABLED_ON_FAULT)) { ++ KBASE_TLSTREAM_TL_KBASE_CTX_UNASSIGN_AS(kbdev, kctx->id); ++ kbdev->as_to_kctx[kctx->as_nr] = NULL; ++ kctx->as_nr = KBASEP_AS_NR_INVALID; ++ kbase_ctx_flag_clear(kctx, KCTX_AS_DISABLED_ON_FAULT); ++#if !MALI_USE_CSF ++ kbase_backend_slot_kctx_purge_locked(kbdev, kctx); +#endif ++ } ++ } ++ } + -+ gpu_props->core_props.num_exec_engines = -+ KBASE_UBFX32(gpu_props->raw_props.core_features, 0, 4); ++ KBASE_KTRACE_ADD(kbdev, SCHED_RELEASE_CTX, kctx, new_ref_count); ++} + -+ for (i = 0; i < BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS; i++) -+ gpu_props->core_props.texture_features[i] = gpu_props->raw_props.texture_features[i]; ++void kbase_ctx_sched_remove_ctx(struct kbase_context *kctx) ++{ ++ struct kbase_device *const kbdev = kctx->kbdev; ++ unsigned long flags; + -+ gpu_props->l2_props.log2_line_size = KBASE_UBFX32(gpu_props->raw_props.l2_features, 0U, 8); -+ gpu_props->l2_props.log2_cache_size = KBASE_UBFX32(gpu_props->raw_props.l2_features, 16U, 8); ++ mutex_lock(&kbdev->mmu_hw_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ /* Field with number of l2 slices is added to MEM_FEATURES register -+ * since t76x. Below code assumes that for older GPU reserved bits will -+ * be read as zero. */ -+ gpu_props->l2_props.num_l2_slices = -+ KBASE_UBFX32(gpu_props->raw_props.mem_features, 8U, 4) + 1; ++ WARN_ON(atomic_read(&kctx->refcount) != 0); + -+ gpu_props->tiler_props.bin_size_bytes = 1 << KBASE_UBFX32(gpu_props->raw_props.tiler_features, 0U, 6); -+ gpu_props->tiler_props.max_active_levels = KBASE_UBFX32(gpu_props->raw_props.tiler_features, 8U, 4); ++ if ((kctx->as_nr >= 0) && (kctx->as_nr < BASE_MAX_NR_AS)) { ++ if (kbdev->pm.backend.gpu_powered) ++ kbase_mmu_disable(kctx); + -+ if (gpu_props->raw_props.thread_max_threads == 0) -+ gpu_props->thread_props.max_threads = THREAD_MT_DEFAULT; -+ else -+ gpu_props->thread_props.max_threads = gpu_props->raw_props.thread_max_threads; ++ KBASE_TLSTREAM_TL_KBASE_CTX_UNASSIGN_AS(kbdev, kctx->id); ++ kbdev->as_to_kctx[kctx->as_nr] = NULL; ++ kctx->as_nr = KBASEP_AS_NR_INVALID; ++ } + -+ if (gpu_props->raw_props.thread_max_workgroup_size == 0) -+ gpu_props->thread_props.max_workgroup_size = THREAD_MWS_DEFAULT; -+ else -+ gpu_props->thread_props.max_workgroup_size = gpu_props->raw_props.thread_max_workgroup_size; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++} + -+ if (gpu_props->raw_props.thread_max_barrier_size == 0) -+ gpu_props->thread_props.max_barrier_size = THREAD_MBS_DEFAULT; -+ else -+ gpu_props->thread_props.max_barrier_size = gpu_props->raw_props.thread_max_barrier_size; ++void kbase_ctx_sched_restore_all_as(struct kbase_device *kbdev) ++{ ++ s8 i; + -+ if (gpu_props->raw_props.thread_tls_alloc == 0) -+ gpu_props->thread_props.tls_alloc = -+ gpu_props->thread_props.max_threads; -+ else -+ gpu_props->thread_props.tls_alloc = -+ gpu_props->raw_props.thread_tls_alloc; ++ lockdep_assert_held(&kbdev->mmu_hw_mutex); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ /* MIDHARC-2364 was intended for tULx. -+ * Workaround for the incorrectly applied THREAD_FEATURES to tDUx. -+ */ -+ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ product_id = gpu_id & GPU_ID_VERSION_PRODUCT_ID; -+ product_id >>= GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++ WARN_ON(!kbdev->pm.backend.gpu_powered); ++ ++ for (i = 0; i != kbdev->nr_hw_address_spaces; ++i) { ++ struct kbase_context *kctx; + ++ kbdev->as[i].is_unresponsive = false; +#if MALI_USE_CSF -+ gpu_props->thread_props.max_registers = -+ KBASE_UBFX32(gpu_props->raw_props.thread_features, -+ 0U, 22); -+ gpu_props->thread_props.impl_tech = -+ KBASE_UBFX32(gpu_props->raw_props.thread_features, -+ 22U, 2); -+ gpu_props->thread_props.max_task_queue = -+ KBASE_UBFX32(gpu_props->raw_props.thread_features, -+ 24U, 8); -+ gpu_props->thread_props.max_thread_group_split = 0; -+#else -+ if ((gpu_id & GPU_ID2_PRODUCT_MODEL) == GPU_ID2_PRODUCT_TDUX) { -+ gpu_props->thread_props.max_registers = -+ KBASE_UBFX32(gpu_props->raw_props.thread_features, -+ 0U, 22); -+ gpu_props->thread_props.impl_tech = -+ KBASE_UBFX32(gpu_props->raw_props.thread_features, -+ 22U, 2); -+ gpu_props->thread_props.max_task_queue = -+ KBASE_UBFX32(gpu_props->raw_props.thread_features, -+ 24U, 8); -+ gpu_props->thread_props.max_thread_group_split = 0; -+ } else { -+ gpu_props->thread_props.max_registers = -+ KBASE_UBFX32(gpu_props->raw_props.thread_features, -+ 0U, 16); -+ gpu_props->thread_props.max_task_queue = -+ KBASE_UBFX32(gpu_props->raw_props.thread_features, -+ 16U, 8); -+ gpu_props->thread_props.max_thread_group_split = -+ KBASE_UBFX32(gpu_props->raw_props.thread_features, -+ 24U, 6); -+ gpu_props->thread_props.impl_tech = -+ KBASE_UBFX32(gpu_props->raw_props.thread_features, -+ 30U, 2); -+ } ++ if ((i == MCU_AS_NR) && kbdev->csf.firmware_inited) { ++ kbase_mmu_update(kbdev, &kbdev->csf.mcu_mmu, ++ MCU_AS_NR); ++ continue; ++ } +#endif ++ kctx = kbdev->as_to_kctx[i]; ++ if (kctx) { ++ if (atomic_read(&kctx->refcount)) { ++ WARN_ON(kctx->as_nr != i); + -+ /* If values are not specified, then use defaults */ -+ if (gpu_props->thread_props.max_registers == 0) { -+ gpu_props->thread_props.max_registers = THREAD_MR_DEFAULT; -+ gpu_props->thread_props.max_task_queue = THREAD_MTQ_DEFAULT; -+ gpu_props->thread_props.max_thread_group_split = THREAD_MTGS_DEFAULT; ++ kbase_mmu_update(kbdev, &kctx->mmu, ++ kctx->as_nr); ++ kbase_ctx_flag_clear(kctx, ++ KCTX_AS_DISABLED_ON_FAULT); ++ } else { ++ /* This context might have been assigned an ++ * AS before, clear it. ++ */ ++ if (kctx->as_nr != KBASEP_AS_NR_INVALID) { ++ KBASE_TLSTREAM_TL_KBASE_CTX_UNASSIGN_AS( ++ kbdev, kctx->id); ++ kbdev->as_to_kctx[kctx->as_nr] = NULL; ++ kctx->as_nr = KBASEP_AS_NR_INVALID; ++ } ++ } ++ } else { ++ kbase_mmu_disable_as(kbdev, i); ++ } + } -+ /* Initialize the coherent_group structure for each group */ -+ kbase_gpuprops_construct_coherent_groups(gpu_props); +} + -+void kbase_gpuprops_set(struct kbase_device *kbdev) ++struct kbase_context *kbase_ctx_sched_as_to_ctx_refcount( ++ struct kbase_device *kbdev, size_t as_nr) +{ -+ struct kbase_gpu_props *gpu_props; -+ struct gpu_raw_gpu_props *raw; ++ unsigned long flags; ++ struct kbase_context *found_kctx = NULL; + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); -+ gpu_props = &kbdev->gpu_props; -+ raw = &gpu_props->props.raw_props; ++ if (WARN_ON(kbdev == NULL)) ++ return NULL; + -+ /* Initialize the base_gpu_props structure from the hardware */ -+ kbase_gpuprops_get_props(&gpu_props->props, kbdev); ++ if (WARN_ON(as_nr >= BASE_MAX_NR_AS)) ++ return NULL; + -+ /* Populate the derived properties */ -+ kbase_gpuprops_calculate_props(&gpu_props->props, kbdev); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ /* Populate kbase-only fields */ -+ gpu_props->l2_props.associativity = KBASE_UBFX32(raw->l2_features, 8U, 8); -+ gpu_props->l2_props.external_bus_width = KBASE_UBFX32(raw->l2_features, 24U, 8); ++ found_kctx = kbdev->as_to_kctx[as_nr]; + -+ gpu_props->mem.core_group = KBASE_UBFX32(raw->mem_features, 0U, 1); ++ if (!WARN_ON(found_kctx == NULL)) ++ kbase_ctx_sched_retain_ctx_refcount(found_kctx); + -+ gpu_props->mmu.va_bits = KBASE_UBFX32(raw->mmu_features, 0U, 8); -+ gpu_props->mmu.pa_bits = KBASE_UBFX32(raw->mmu_features, 8U, 8); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ gpu_props->num_cores = hweight64(raw->shader_present); -+ gpu_props->num_core_groups = hweight64(raw->l2_present); -+ gpu_props->num_address_spaces = hweight32(raw->as_present); -+ gpu_props->num_job_slots = hweight32(raw->js_present); ++ return found_kctx; +} + -+int kbase_gpuprops_set_features(struct kbase_device *kbdev) ++struct kbase_context *kbase_ctx_sched_as_to_ctx(struct kbase_device *kbdev, ++ size_t as_nr) +{ -+ struct base_gpu_props *gpu_props; -+ struct kbase_gpuprops_regdump regdump; -+ int err; -+ -+ gpu_props = &kbdev->gpu_props.props; ++ unsigned long flags; ++ struct kbase_context *found_kctx; + -+ /* Dump relevant registers */ -+ err = kbase_backend_gpuprops_get_features(kbdev, ®dump); -+ if (err) -+ return err; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ /* -+ * Copy the raw value from the register, later this will get turned -+ * into the selected coherency mode. -+ * Additionally, add non-coherent mode, as this is always supported. -+ */ -+ gpu_props->raw_props.coherency_mode = regdump.coherency_features | -+ COHERENCY_FEATURE_BIT(COHERENCY_NONE); ++ found_kctx = kbase_ctx_sched_as_to_ctx_nolock(kbdev, as_nr); + -+ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_THREAD_GROUP_SPLIT)) -+ gpu_props->thread_props.max_thread_group_split = 0; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ return err; ++ return found_kctx; +} + -+/* -+ * Module parameters to allow the L2 size and hash configuration to be -+ * overridden. -+ * -+ * These parameters must be set on insmod to take effect, and are not visible -+ * in sysfs. -+ */ -+static u8 override_l2_size; -+module_param(override_l2_size, byte, 0); -+MODULE_PARM_DESC(override_l2_size, "Override L2 size config for testing"); -+ -+static u8 override_l2_hash; -+module_param(override_l2_hash, byte, 0); -+MODULE_PARM_DESC(override_l2_hash, "Override L2 hash config for testing"); -+ -+/** -+ * kbase_read_l2_config_from_dt - Read L2 configuration -+ * @kbdev: The kbase device for which to get the L2 configuration. -+ * -+ * Check for L2 configuration overrides in module parameters and device tree. -+ * Override values in module parameters take priority over override values in -+ * device tree. -+ * -+ * Return: true if either size or hash was overridden, false if no overrides -+ * were found. -+ */ -+static bool kbase_read_l2_config_from_dt(struct kbase_device * const kbdev) ++struct kbase_context *kbase_ctx_sched_as_to_ctx_nolock( ++ struct kbase_device *kbdev, size_t as_nr) +{ -+ struct device_node *np = kbdev->dev->of_node; ++ struct kbase_context *found_kctx; + -+ if (!np) -+ return false; ++ if (WARN_ON(kbdev == NULL)) ++ return NULL; + -+ if (override_l2_size) -+ kbdev->l2_size_override = override_l2_size; -+ else if (of_property_read_u8(np, "l2-size", &kbdev->l2_size_override)) -+ kbdev->l2_size_override = 0; ++ if (WARN_ON(as_nr >= BASE_MAX_NR_AS)) ++ return NULL; + -+ if (override_l2_hash) -+ kbdev->l2_hash_override = override_l2_hash; -+ else if (of_property_read_u8(np, "l2-hash", &kbdev->l2_hash_override)) -+ kbdev->l2_hash_override = 0; ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ if (kbdev->l2_size_override || kbdev->l2_hash_override) -+ return true; ++ found_kctx = kbdev->as_to_kctx[as_nr]; + -+ return false; ++ if (found_kctx) { ++ if (atomic_read(&found_kctx->refcount) <= 0) ++ found_kctx = NULL; ++ } ++ ++ return found_kctx; +} + -+int kbase_gpuprops_update_l2_features(struct kbase_device *kbdev) ++bool kbase_ctx_sched_inc_refcount_nolock(struct kbase_context *kctx) +{ -+ int err = 0; -+ -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_L2_CONFIG)) { -+ struct kbase_gpuprops_regdump regdump; -+ struct base_gpu_props *gpu_props = &kbdev->gpu_props.props; -+ -+ /* Check for L2 cache size & hash overrides */ -+ if (!kbase_read_l2_config_from_dt(kbdev)) -+ return 0; -+ -+ /* Need L2 to get powered to reflect to L2_FEATURES */ -+ kbase_pm_context_active(kbdev); -+ -+ /* Wait for the completion of L2 power transition */ -+ kbase_pm_wait_for_l2_powered(kbdev); ++ bool result = false; + -+ /* Dump L2_FEATURES register */ -+ err = kbase_backend_gpuprops_get_l2_features(kbdev, ®dump); -+ if (err) -+ goto idle_gpu; ++ if (WARN_ON(kctx == NULL)) ++ return result; + -+ dev_info(kbdev->dev, "Reflected L2_FEATURES is 0x%x\n", -+ regdump.l2_features); ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ /* Update gpuprops with reflected L2_FEATURES */ -+ gpu_props->raw_props.l2_features = regdump.l2_features; -+ gpu_props->l2_props.log2_cache_size = -+ KBASE_UBFX32(gpu_props->raw_props.l2_features, 16U, 8); ++ if (atomic_read(&kctx->refcount) > 0) { ++ KBASE_DEBUG_ASSERT(kctx->as_nr >= 0); + -+idle_gpu: -+ /* Let GPU idle */ -+ kbase_pm_context_idle(kbdev); ++ kbase_ctx_sched_retain_ctx_refcount(kctx); ++ KBASE_KTRACE_ADD(kctx->kbdev, SCHED_RETAIN_CTX_NOLOCK, kctx, ++ kbase_ktrace_get_ctx_refcnt(kctx)); ++ result = true; + } + -+ return err; ++ return result; +} + -+static struct { -+ u32 type; -+ size_t offset; -+ int size; -+} gpu_property_mapping[] = { -+#define PROP(name, member) \ -+ {KBASE_GPUPROP_ ## name, offsetof(struct base_gpu_props, member), \ -+ sizeof(((struct base_gpu_props *)0)->member)} -+ PROP(PRODUCT_ID, core_props.product_id), -+ PROP(VERSION_STATUS, core_props.version_status), -+ PROP(MINOR_REVISION, core_props.minor_revision), -+ PROP(MAJOR_REVISION, core_props.major_revision), -+ PROP(GPU_FREQ_KHZ_MAX, core_props.gpu_freq_khz_max), -+ PROP(LOG2_PROGRAM_COUNTER_SIZE, core_props.log2_program_counter_size), -+ PROP(TEXTURE_FEATURES_0, core_props.texture_features[0]), -+ PROP(TEXTURE_FEATURES_1, core_props.texture_features[1]), -+ PROP(TEXTURE_FEATURES_2, core_props.texture_features[2]), -+ PROP(TEXTURE_FEATURES_3, core_props.texture_features[3]), -+ PROP(GPU_AVAILABLE_MEMORY_SIZE, core_props.gpu_available_memory_size), -+ PROP(NUM_EXEC_ENGINES, core_props.num_exec_engines), -+ -+ PROP(L2_LOG2_LINE_SIZE, l2_props.log2_line_size), -+ PROP(L2_LOG2_CACHE_SIZE, l2_props.log2_cache_size), -+ PROP(L2_NUM_L2_SLICES, l2_props.num_l2_slices), -+ -+ PROP(TILER_BIN_SIZE_BYTES, tiler_props.bin_size_bytes), -+ PROP(TILER_MAX_ACTIVE_LEVELS, tiler_props.max_active_levels), ++bool kbase_ctx_sched_inc_refcount(struct kbase_context *kctx) ++{ ++ unsigned long flags; ++ bool result = false; + -+ PROP(MAX_THREADS, thread_props.max_threads), -+ PROP(MAX_WORKGROUP_SIZE, thread_props.max_workgroup_size), -+ PROP(MAX_BARRIER_SIZE, thread_props.max_barrier_size), -+ PROP(MAX_REGISTERS, thread_props.max_registers), -+ PROP(MAX_TASK_QUEUE, thread_props.max_task_queue), -+ PROP(MAX_THREAD_GROUP_SPLIT, thread_props.max_thread_group_split), -+ PROP(IMPL_TECH, thread_props.impl_tech), -+ PROP(TLS_ALLOC, thread_props.tls_alloc), ++ if (WARN_ON(kctx == NULL)) ++ return result; + -+ PROP(RAW_SHADER_PRESENT, raw_props.shader_present), -+ PROP(RAW_TILER_PRESENT, raw_props.tiler_present), -+ PROP(RAW_L2_PRESENT, raw_props.l2_present), -+ PROP(RAW_STACK_PRESENT, raw_props.stack_present), -+ PROP(RAW_L2_FEATURES, raw_props.l2_features), -+ PROP(RAW_CORE_FEATURES, raw_props.core_features), -+ PROP(RAW_MEM_FEATURES, raw_props.mem_features), -+ PROP(RAW_MMU_FEATURES, raw_props.mmu_features), -+ PROP(RAW_AS_PRESENT, raw_props.as_present), -+ PROP(RAW_JS_PRESENT, raw_props.js_present), -+ PROP(RAW_JS_FEATURES_0, raw_props.js_features[0]), -+ PROP(RAW_JS_FEATURES_1, raw_props.js_features[1]), -+ PROP(RAW_JS_FEATURES_2, raw_props.js_features[2]), -+ PROP(RAW_JS_FEATURES_3, raw_props.js_features[3]), -+ PROP(RAW_JS_FEATURES_4, raw_props.js_features[4]), -+ PROP(RAW_JS_FEATURES_5, raw_props.js_features[5]), -+ PROP(RAW_JS_FEATURES_6, raw_props.js_features[6]), -+ PROP(RAW_JS_FEATURES_7, raw_props.js_features[7]), -+ PROP(RAW_JS_FEATURES_8, raw_props.js_features[8]), -+ PROP(RAW_JS_FEATURES_9, raw_props.js_features[9]), -+ PROP(RAW_JS_FEATURES_10, raw_props.js_features[10]), -+ PROP(RAW_JS_FEATURES_11, raw_props.js_features[11]), -+ PROP(RAW_JS_FEATURES_12, raw_props.js_features[12]), -+ PROP(RAW_JS_FEATURES_13, raw_props.js_features[13]), -+ PROP(RAW_JS_FEATURES_14, raw_props.js_features[14]), -+ PROP(RAW_JS_FEATURES_15, raw_props.js_features[15]), -+ PROP(RAW_TILER_FEATURES, raw_props.tiler_features), -+ PROP(RAW_TEXTURE_FEATURES_0, raw_props.texture_features[0]), -+ PROP(RAW_TEXTURE_FEATURES_1, raw_props.texture_features[1]), -+ PROP(RAW_TEXTURE_FEATURES_2, raw_props.texture_features[2]), -+ PROP(RAW_TEXTURE_FEATURES_3, raw_props.texture_features[3]), -+ PROP(RAW_GPU_ID, raw_props.gpu_id), -+ PROP(RAW_THREAD_MAX_THREADS, raw_props.thread_max_threads), -+ PROP(RAW_THREAD_MAX_WORKGROUP_SIZE, -+ raw_props.thread_max_workgroup_size), -+ PROP(RAW_THREAD_MAX_BARRIER_SIZE, raw_props.thread_max_barrier_size), -+ PROP(RAW_THREAD_FEATURES, raw_props.thread_features), -+ PROP(RAW_THREAD_TLS_ALLOC, raw_props.thread_tls_alloc), -+ PROP(RAW_COHERENCY_MODE, raw_props.coherency_mode), ++ if (WARN_ON(kctx->kbdev == NULL)) ++ return result; + -+ PROP(COHERENCY_NUM_GROUPS, coherency_info.num_groups), -+ PROP(COHERENCY_NUM_CORE_GROUPS, coherency_info.num_core_groups), -+ PROP(COHERENCY_COHERENCY, coherency_info.coherency), -+ PROP(COHERENCY_GROUP_0, coherency_info.group[0].core_mask), -+ PROP(COHERENCY_GROUP_1, coherency_info.group[1].core_mask), -+ PROP(COHERENCY_GROUP_2, coherency_info.group[2].core_mask), -+ PROP(COHERENCY_GROUP_3, coherency_info.group[3].core_mask), -+ PROP(COHERENCY_GROUP_4, coherency_info.group[4].core_mask), -+ PROP(COHERENCY_GROUP_5, coherency_info.group[5].core_mask), -+ PROP(COHERENCY_GROUP_6, coherency_info.group[6].core_mask), -+ PROP(COHERENCY_GROUP_7, coherency_info.group[7].core_mask), -+ PROP(COHERENCY_GROUP_8, coherency_info.group[8].core_mask), -+ PROP(COHERENCY_GROUP_9, coherency_info.group[9].core_mask), -+ PROP(COHERENCY_GROUP_10, coherency_info.group[10].core_mask), -+ PROP(COHERENCY_GROUP_11, coherency_info.group[11].core_mask), -+ PROP(COHERENCY_GROUP_12, coherency_info.group[12].core_mask), -+ PROP(COHERENCY_GROUP_13, coherency_info.group[13].core_mask), -+ PROP(COHERENCY_GROUP_14, coherency_info.group[14].core_mask), -+ PROP(COHERENCY_GROUP_15, coherency_info.group[15].core_mask), ++ mutex_lock(&kctx->kbdev->mmu_hw_mutex); ++ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, flags); ++ result = kbase_ctx_sched_inc_refcount_nolock(kctx); ++ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kctx->kbdev->mmu_hw_mutex); + -+#undef PROP -+}; ++ return result; ++} + -+int kbase_gpuprops_populate_user_buffer(struct kbase_device *kbdev) ++void kbase_ctx_sched_release_ctx_lock(struct kbase_context *kctx) +{ -+ struct kbase_gpu_props *kprops = &kbdev->gpu_props; -+ struct base_gpu_props *props = &kprops->props; -+ u32 count = ARRAY_SIZE(gpu_property_mapping); -+ u32 i; -+ u32 size = 0; -+ u8 *p; ++ unsigned long flags; + -+ for (i = 0; i < count; i++) { -+ /* 4 bytes for the ID, and the size of the property */ -+ size += 4 + gpu_property_mapping[i].size; -+ } ++ if (WARN_ON(!kctx)) ++ return; + -+ kprops->prop_buffer_size = size; -+ kprops->prop_buffer = kmalloc(size, GFP_KERNEL); ++ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, flags); + -+ if (!kprops->prop_buffer) { -+ kprops->prop_buffer_size = 0; -+ return -ENOMEM; -+ } ++ if (!WARN_ON(kctx->as_nr == KBASEP_AS_NR_INVALID) && ++ !WARN_ON(atomic_read(&kctx->refcount) <= 0)) ++ kbase_ctx_sched_release_ctx(kctx); + -+ p = kprops->prop_buffer; ++ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, flags); ++} + -+#define WRITE_U8(v) (*p++ = (v) & 0xFF) -+#define WRITE_U16(v) do { WRITE_U8(v); WRITE_U8((v) >> 8); } while (0) -+#define WRITE_U32(v) do { WRITE_U16(v); WRITE_U16((v) >> 16); } while (0) -+#define WRITE_U64(v) do { WRITE_U32(v); WRITE_U32((v) >> 32); } while (0) ++#if MALI_USE_CSF ++bool kbase_ctx_sched_inc_refcount_if_as_valid(struct kbase_context *kctx) ++{ ++ struct kbase_device *kbdev; ++ bool added_ref = false; ++ unsigned long flags; + -+ for (i = 0; i < count; i++) { -+ u32 type = gpu_property_mapping[i].type; -+ u8 type_size; -+ void *field = ((u8 *)props) + gpu_property_mapping[i].offset; ++ if (WARN_ON(kctx == NULL)) ++ return added_ref; + -+ switch (gpu_property_mapping[i].size) { -+ case 1: -+ type_size = KBASE_GPUPROP_VALUE_SIZE_U8; -+ break; -+ case 2: -+ type_size = KBASE_GPUPROP_VALUE_SIZE_U16; -+ break; -+ case 4: -+ type_size = KBASE_GPUPROP_VALUE_SIZE_U32; -+ break; -+ case 8: -+ type_size = KBASE_GPUPROP_VALUE_SIZE_U64; -+ break; -+ default: -+ dev_err(kbdev->dev, -+ "Invalid gpu_property_mapping type=%d size=%d", -+ type, gpu_property_mapping[i].size); -+ return -EINVAL; -+ } ++ kbdev = kctx->kbdev; + -+ WRITE_U32((type<<2) | type_size); ++ if (WARN_ON(kbdev == NULL)) ++ return added_ref; + -+ switch (type_size) { -+ case KBASE_GPUPROP_VALUE_SIZE_U8: -+ WRITE_U8(*((u8 *)field)); -+ break; -+ case KBASE_GPUPROP_VALUE_SIZE_U16: -+ WRITE_U16(*((u16 *)field)); -+ break; -+ case KBASE_GPUPROP_VALUE_SIZE_U32: -+ WRITE_U32(*((u32 *)field)); -+ break; -+ case KBASE_GPUPROP_VALUE_SIZE_U64: -+ WRITE_U64(*((u64 *)field)); -+ break; -+ default: /* Cannot be reached */ -+ WARN_ON(1); -+ return -EINVAL; -+ } -+ } ++ mutex_lock(&kbdev->mmu_hw_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ return 0; -+} ++ if ((kctx->as_nr != KBASEP_AS_NR_INVALID) && ++ (kctx == kbdev->as_to_kctx[kctx->as_nr])) { ++ atomic_inc(&kctx->refcount); + -+void kbase_gpuprops_free_user_buffer(struct kbase_device *kbdev) -+{ -+ kfree(kbdev->gpu_props.prop_buffer); -+} ++ if (kbdev->as_free & (1u << kctx->as_nr)) ++ kbdev->as_free &= ~(1u << kctx->as_nr); + -+int kbase_device_populate_max_freq(struct kbase_device *kbdev) -+{ -+ struct mali_base_gpu_core_props *core_props; ++ KBASE_KTRACE_ADD(kbdev, SCHED_RETAIN_CTX_NOLOCK, kctx, ++ kbase_ktrace_get_ctx_refcnt(kctx)); ++ added_ref = true; ++ } + -+ /* obtain max configured gpu frequency, if devfreq is enabled then -+ * this will be overridden by the highest operating point found -+ */ -+ core_props = &(kbdev->gpu_props.props.core_props); -+#ifdef GPU_FREQ_KHZ_MAX -+ core_props->gpu_freq_khz_max = GPU_FREQ_KHZ_MAX; -+#else -+ core_props->gpu_freq_khz_max = DEFAULT_GPU_FREQ_KHZ_MAX; -+#endif ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); + -+ return 0; ++ return added_ref; +} -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h ++#endif +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h new file mode 100755 -index 000000000000..5eee7948381a +index 000000000..5a8d17547 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h -@@ -0,0 +1,135 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h +@@ -0,0 +1,247 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2017-2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -204972,241 +236622,468 @@ index 000000000000..5eee7948381a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ *//* SPDX-License-Identifier: GPL-2.0 */ -+/* -+ * -+ * (C) COPYRIGHT 2011-2015, 2017, 2019-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * + */ + ++#ifndef _KBASE_CTX_SCHED_H_ ++#define _KBASE_CTX_SCHED_H_ + ++#include + +/** -+ * @file mali_kbase_gpuprops.h -+ * Base kernel property query APIs ++ * DOC: The Context Scheduler manages address space assignment and reference ++ * counting to kbase_context. The interface has been designed to minimise ++ * interactions between the Job Scheduler and Power Management/MMU to support ++ * the existing Job Scheduler interface. ++ * ++ * The initial implementation of the Context Scheduler does not schedule ++ * contexts. Instead it relies on the Job Scheduler to make decisions of ++ * when to schedule/evict contexts if address spaces are starved. In the ++ * future, once an interface between the CS and JS has been devised to ++ * provide enough information about how each context is consuming GPU resources, ++ * those decisions can be made in the CS itself, thereby reducing duplicated ++ * code. + */ + -+#ifndef _KBASE_GPUPROPS_H_ -+#define _KBASE_GPUPROPS_H_ -+ -+#include "mali_kbase_gpuprops_types.h" -+ -+/* Forward definition - see mali_kbase.h */ -+struct kbase_device; -+ +/** -+ * KBASE_UBFX32 - Extracts bits from a 32-bit bitfield. -+ * @value: The value from which to extract bits. -+ * @offset: The first bit to extract (0 being the LSB). -+ * @size: The number of bits to extract. ++ * kbase_ctx_sched_init() - Initialise the context scheduler ++ * @kbdev: The device for which the context scheduler needs to be initialised + * -+ * Context: @offset + @size <= 32. ++ * This must be called during device initialisation. The number of hardware ++ * address spaces must already be established before calling this function. + * -+ * Return: Bits [@offset, @offset + @size) from @value. ++ * Return: 0 for success, otherwise failure + */ -+/* from mali_cdsb.h */ -+#define KBASE_UBFX32(value, offset, size) \ -+ (((u32)(value) >> (u32)(offset)) & (u32)((1ULL << (u32)(size)) - 1)) ++int kbase_ctx_sched_init(struct kbase_device *kbdev); + +/** -+ * @brief Set up Kbase GPU properties. -+ * -+ * Set up Kbase GPU properties with information from the GPU registers ++ * kbase_ctx_sched_term - Terminate the context scheduler ++ * @kbdev: The device for which the context scheduler needs to be terminated + * -+ * @param kbdev The struct kbase_device structure for the device ++ * This must be called during device termination after all contexts have been ++ * destroyed. + */ -+void kbase_gpuprops_set(struct kbase_device *kbdev); ++void kbase_ctx_sched_term(struct kbase_device *kbdev); + +/** -+ * kbase_gpuprops_set_features - Set up Kbase GPU properties -+ * @kbdev: Device pointer -+ * -+ * This function sets up GPU properties that are dependent on the hardware -+ * features bitmask. This function must be preceeded by a call to -+ * kbase_hw_set_features_mask(). ++ * kbase_ctx_sched_ctx_init - Initialize per-context data fields for scheduling ++ * @kctx: The context to initialize + * -+ * Return: Zero on success, Linux error code on failure ++ * This must be called during context initialization before any other context ++ * scheduling functions are called on @kctx + */ -+int kbase_gpuprops_set_features(struct kbase_device *kbdev); ++void kbase_ctx_sched_init_ctx(struct kbase_context *kctx); + +/** -+ * kbase_gpuprops_update_l2_features - Update GPU property of L2_FEATURES -+ * @kbdev: Device pointer ++ * kbase_ctx_sched_retain_ctx - Retain a reference to the @ref kbase_context ++ * @kctx: The context to which to retain a reference + * -+ * This function updates l2_features and the log2 cache size. ++ * This function should be called whenever an address space should be assigned ++ * to a context and programmed onto the MMU. It should typically be called ++ * when jobs are ready to be submitted to the GPU. + * -+ * Return: Zero on success, Linux error code for failure -+ */ -+int kbase_gpuprops_update_l2_features(struct kbase_device *kbdev); -+ -+/** -+ * kbase_gpuprops_populate_user_buffer - Populate the GPU properties buffer -+ * @kbdev: The kbase device ++ * It can be called as many times as necessary. The address space will be ++ * assigned to the context for as long as there is a reference to said context. + * -+ * Fills prop_buffer with the GPU properties for user space to read. ++ * The kbase_device::mmu_hw_mutex and kbase_device::hwaccess_lock locks must be ++ * held whilst calling this function. ++ * ++ * Return: The address space that the context has been assigned to or ++ * KBASEP_AS_NR_INVALID if no address space was available. + */ -+int kbase_gpuprops_populate_user_buffer(struct kbase_device *kbdev); ++int kbase_ctx_sched_retain_ctx(struct kbase_context *kctx); + +/** -+ * kbase_gpuprops_free_user_buffer - Free the GPU properties buffer. -+ * @kbdev: kbase device pointer ++ * kbase_ctx_sched_retain_ctx_refcount - Retain a reference to the @ref kbase_context ++ * @kctx: The context to which to retain a reference + * -+ * Free the GPU properties buffer allocated from -+ * kbase_gpuprops_populate_user_buffer. ++ * This function only retains a reference to the context. It must be called ++ * only when the context already has a reference. ++ * ++ * This is typically called inside an atomic session where we know the context ++ * is already scheduled in but want to take an extra reference to ensure that ++ * it doesn't get descheduled. ++ * ++ * The kbase_device::hwaccess_lock must be held whilst calling this function + */ -+void kbase_gpuprops_free_user_buffer(struct kbase_device *kbdev); ++void kbase_ctx_sched_retain_ctx_refcount(struct kbase_context *kctx); + +/** -+ * kbase_device_populate_max_freq - Populate max gpu frequency. -+ * @kbdev: kbase device pointer ++ * kbase_ctx_sched_release_ctx - Release a reference to the @ref kbase_context ++ * @kctx: The context from which to release a reference + * -+ * Populate the maximum gpu frequency to be used when devfreq is disabled. ++ * This function should be called whenever an address space could be unassigned ++ * from a context. When there are no more references to said context, the ++ * address space previously assigned to this context shall be reassigned to ++ * other contexts as needed. + * -+ * Return: 0 on success and non-zero value on failure. ++ * The kbase_device::hwaccess_lock must be held whilst calling this function + */ -+int kbase_device_populate_max_freq(struct kbase_device *kbdev); ++void kbase_ctx_sched_release_ctx(struct kbase_context *kctx); + +/** -+ * kbase_gpuprops_update_core_props_gpu_id - break down gpu id value -+ * @gpu_props: the &base_gpu_props structure ++ * kbase_ctx_sched_remove_ctx - Unassign previously assigned address space ++ * @kctx: The context to be removed + * -+ * Break down gpu_id value stored in base_gpu_props::raw_props.gpu_id into -+ * separate fields (version_status, minor_revision, major_revision, product_id) -+ * stored in base_gpu_props::core_props. ++ * This function should be called when a context is being destroyed. The ++ * context must no longer have any reference. If it has been assigned an ++ * address space before then the AS will be unprogrammed. + */ -+void kbase_gpuprops_update_core_props_gpu_id( -+ struct base_gpu_props * const gpu_props); ++void kbase_ctx_sched_remove_ctx(struct kbase_context *kctx); + -+#endif /* _KBASE_GPUPROPS_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h -new file mode 100755 -index 000000000000..ec6f1c39ccb0 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h -@@ -0,0 +1,98 @@ -+/* ++/** ++ * kbase_ctx_sched_restore_all_as - Reprogram all address spaces ++ * @kbdev: The device for which address spaces to be reprogrammed + * -+ * (C) COPYRIGHT 2011-2018, 2020 ARM Limited. All rights reserved. ++ * This function shall reprogram all address spaces previously assigned to ++ * contexts. It can be used after the GPU is reset. + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * The kbase_device::mmu_hw_mutex and kbase_device::hwaccess_lock locks must be ++ * held whilst calling this function. ++ */ ++void kbase_ctx_sched_restore_all_as(struct kbase_device *kbdev); ++ ++/** ++ * kbase_ctx_sched_as_to_ctx_refcount - Lookup a context based on its current ++ * address space and ensure that is stays scheduled in ++ * @kbdev: The device for which the returned context must belong ++ * @as_nr: address space assigned to the context of interest + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * The context is refcounted as being busy to prevent it from scheduling ++ * out. It must be released with kbase_ctx_sched_release_ctx() when it is no ++ * longer required to stay scheduled in. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * This function can safely be called from IRQ context. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ * The following locking conditions are made on the caller: ++ * * it must not hold the kbase_device::hwaccess_lock, because it will be used ++ * internally. + * ++ * Return: a valid struct kbase_context on success, which has been refcounted ++ * as being busy or return NULL on failure, indicating that no context was found ++ * in as_nr. + */ -+ -+ ++struct kbase_context *kbase_ctx_sched_as_to_ctx_refcount( ++ struct kbase_device *kbdev, size_t as_nr); + +/** -+ * @file mali_kbase_gpuprops_types.h -+ * Base kernel property query APIs ++ * kbase_ctx_sched_as_to_ctx - Lookup a context based on its current address ++ * space ++ * @kbdev: The device for which the returned context must belong ++ * @as_nr: address space assigned to the context of interest ++ * ++ * Return: a valid struct kbase_context on success or NULL on failure, ++ * indicating that no context was found in as_nr. + */ ++struct kbase_context *kbase_ctx_sched_as_to_ctx(struct kbase_device *kbdev, ++ size_t as_nr); + -+#ifndef _KBASE_GPUPROPS_TYPES_H_ -+#define _KBASE_GPUPROPS_TYPES_H_ -+ -+#include "mali_base_kernel.h" ++/** ++ * kbase_ctx_sched_as_to_ctx_nolock - Lookup a context based on its current ++ * address space. ++ * @kbdev: The device for which the returned context must belong ++ * @as_nr: address space assigned to the context of interest ++ * ++ * The following lock must be held by the caller: ++ * * kbase_device::hwaccess_lock ++ * ++ * Return: a valid struct kbase_context on success or NULL on failure, ++ * indicating that no context was found in as_nr. ++ */ ++struct kbase_context *kbase_ctx_sched_as_to_ctx_nolock( ++ struct kbase_device *kbdev, size_t as_nr); + -+#define KBASE_GPU_SPEED_MHZ 123 -+#define KBASE_GPU_PC_SIZE_LOG2 24U ++/** ++ * kbase_ctx_sched_inc_refcount_nolock - Refcount a context as being busy, ++ * preventing it from being scheduled out. ++ * @kctx: Context to be refcounted ++ * ++ * The following locks must be held by the caller: ++ * &kbase_device.mmu_hw_mutex ++ * &kbase_device.hwaccess_lock ++ * ++ * Return: true if refcount succeeded, and the context will not be scheduled ++ * out, false if the refcount failed (because the context is being/has been ++ * scheduled out). ++ */ ++bool kbase_ctx_sched_inc_refcount_nolock(struct kbase_context *kctx); + -+struct kbase_gpuprops_regdump { -+ u32 gpu_id; -+ u32 l2_features; -+ u32 core_features; -+ u32 tiler_features; -+ u32 mem_features; -+ u32 mmu_features; -+ u32 as_present; -+ u32 js_present; -+ u32 thread_max_threads; -+ u32 thread_max_workgroup_size; -+ u32 thread_max_barrier_size; -+ u32 thread_features; -+ u32 thread_tls_alloc; -+ u32 texture_features[BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS]; -+ u32 js_features[GPU_MAX_JOB_SLOTS]; -+ u32 shader_present_lo; -+ u32 shader_present_hi; -+ u32 tiler_present_lo; -+ u32 tiler_present_hi; -+ u32 l2_present_lo; -+ u32 l2_present_hi; -+ u32 stack_present_lo; -+ u32 stack_present_hi; -+ u32 coherency_features; -+}; ++/** ++ * kbase_ctx_sched_inc_refcount - Refcount a context as being busy, preventing ++ * it from being scheduled out. ++ * @kctx: Context to be refcounted ++ * ++ * The following locking conditions are made on the caller: ++ * * it must not hold kbase_device::mmu_hw_mutex and ++ * kbase_device::hwaccess_lock, because they will be used internally. ++ * ++ * Return: true if refcount succeeded, and the context will not be scheduled ++ * out, false if the refcount failed (because the context is being/has been ++ * scheduled out). ++ */ ++bool kbase_ctx_sched_inc_refcount(struct kbase_context *kctx); + -+struct kbase_gpu_cache_props { -+ u8 associativity; -+ u8 external_bus_width; -+}; ++/** ++ * kbase_ctx_sched_release_ctx_lock - Release a reference count of a context ++ * @kctx: Context for which refcount should be decreased ++ * ++ * Effectivelly, this is a wrapper for kbase_ctx_sched_release_ctx, but ++ * kbase_device::hwaccess_lock is required NOT to be locked. ++ */ ++void kbase_ctx_sched_release_ctx_lock(struct kbase_context *kctx); + -+struct kbase_gpu_mem_props { -+ u8 core_group; -+}; ++#if MALI_USE_CSF ++/** ++ * kbase_ctx_sched_inc_refcount_if_as_valid - Refcount the context if it has GPU ++ * address space slot assigned to it. ++ * ++ * @kctx: Context to be refcounted ++ * ++ * This function takes a reference on the context if it has a GPU address space ++ * slot assigned to it. The address space slot will not be available for ++ * re-assignment until the reference is released. ++ * ++ * Return: true if refcount succeeded and the address space slot will not be ++ * reassigned, false if the refcount failed (because the address space slot ++ * was not assigned). ++ */ ++bool kbase_ctx_sched_inc_refcount_if_as_valid(struct kbase_context *kctx); ++#endif + -+struct kbase_gpu_mmu_props { -+ u8 va_bits; -+ u8 pa_bits; ++#endif /* _KBASE_CTX_SCHED_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug.c b/drivers/gpu/arm/bifrost/mali_kbase_debug.c +new file mode 100755 +index 000000000..6d3b1093b +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.c +@@ -0,0 +1,41 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2012-2014, 2020-2021 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#include ++ ++static struct kbasep_debug_assert_cb kbasep_debug_assert_registered_cb = { ++ NULL, ++ NULL +}; + -+struct kbase_gpu_props { -+ /* kernel-only properties */ -+ u8 num_cores; -+ u8 num_core_groups; -+ u8 num_address_spaces; -+ u8 num_job_slots; ++void kbase_debug_assert_register_hook(kbase_debug_assert_hook *func, void *param) ++{ ++ kbasep_debug_assert_registered_cb.func = func; ++ kbasep_debug_assert_registered_cb.param = param; ++} + -+ struct kbase_gpu_cache_props l2_props; ++void kbasep_debug_assert_call_hook(void) ++{ ++ if (kbasep_debug_assert_registered_cb.func != NULL) ++ kbasep_debug_assert_registered_cb.func(kbasep_debug_assert_registered_cb.param); ++} ++KBASE_EXPORT_SYMBOL(kbasep_debug_assert_call_hook); + -+ struct kbase_gpu_mem_props mem; -+ struct kbase_gpu_mmu_props mmu; +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug.h b/drivers/gpu/arm/bifrost/mali_kbase_debug.h +new file mode 100755 +index 000000000..9d6ff73aa +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.h +@@ -0,0 +1,166 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2012-2015, 2017, 2020-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+ /* Properties shared with userspace */ -+ struct base_gpu_props props; ++#ifndef _KBASE_DEBUG_H ++#define _KBASE_DEBUG_H + -+ u32 prop_buffer_size; -+ void *prop_buffer; ++#include ++ ++/** @brief If equals to 0, a trace containing the file, line, and function will be displayed before each message. */ ++#define KBASE_DEBUG_SKIP_TRACE 0 ++ ++/** @brief If different from 0, the trace will only contain the file and line. */ ++#define KBASE_DEBUG_SKIP_FUNCTION_NAME 0 ++ ++/** @brief Disable the asserts tests if set to 1. Default is to disable the asserts in release. */ ++#ifndef KBASE_DEBUG_DISABLE_ASSERTS ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++#define KBASE_DEBUG_DISABLE_ASSERTS 0 ++#else ++#define KBASE_DEBUG_DISABLE_ASSERTS 1 ++#endif ++#endif /* KBASE_DEBUG_DISABLE_ASSERTS */ ++ ++/** Function type that is called on an KBASE_DEBUG_ASSERT() or KBASE_DEBUG_ASSERT_MSG() */ ++typedef void kbase_debug_assert_hook(void *); ++ ++struct kbasep_debug_assert_cb { ++ kbase_debug_assert_hook *func; ++ void *param; +}; + -+#endif /* _KBASE_GPUPROPS_TYPES_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gwt.c b/drivers/gpu/arm/bifrost/mali_kbase_gwt.c ++/** ++ * KBASEP_DEBUG_PRINT_TRACE - Private macro containing the format of the trace ++ * to display before every message @sa KBASE_DEBUG_SKIP_TRACE, ++ * KBASE_DEBUG_SKIP_FUNCTION_NAME ++ */ ++#if !KBASE_DEBUG_SKIP_TRACE ++#define KBASEP_DEBUG_PRINT_TRACE \ ++ "In file: " __FILE__ " line: " CSTD_STR2(__LINE__) ++#if !KBASE_DEBUG_SKIP_FUNCTION_NAME ++#define KBASEP_DEBUG_PRINT_FUNCTION __func__ ++#else ++#define KBASEP_DEBUG_PRINT_FUNCTION "" ++#endif ++#else ++#define KBASEP_DEBUG_PRINT_TRACE "" ++#endif ++ ++/** ++ * KBASEP_DEBUG_ASSERT_OUT() - (Private) system printing ++ * function associated to the @ref KBASE_DEBUG_ASSERT_MSG event. ++ * @trace: location in the code from where the message is printed ++ * @function: function from where the message is printed ++ * @...: Format string followed by format arguments. ++ * ++ * @note function parameter cannot be concatenated with other strings ++ */ ++/* Select the correct system output function*/ ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++#define KBASEP_DEBUG_ASSERT_OUT(trace, function, ...) \ ++ do { \ ++ pr_err("Mali: %s function:%s ", trace, function); \ ++ pr_err(__VA_ARGS__); \ ++ pr_err("\n"); \ ++ } while (false) ++#else ++#define KBASEP_DEBUG_ASSERT_OUT(trace, function, ...) CSTD_NOP() ++#endif ++ ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++#define KBASE_CALL_ASSERT_HOOK() kbasep_debug_assert_call_hook() ++#else ++#define KBASE_CALL_ASSERT_HOOK() CSTD_NOP() ++#endif ++ ++/** ++ * KBASE_DEBUG_ASSERT(expr) - Calls @ref KBASE_PRINT_ASSERT and prints the ++ * expression @a expr if @a expr is false ++ * @expr: Boolean expression ++ * ++ * @note This macro does nothing if the flag @ref KBASE_DEBUG_DISABLE_ASSERTS is set to 1 ++ * ++ */ ++#define KBASE_DEBUG_ASSERT(expr) \ ++ KBASE_DEBUG_ASSERT_MSG(expr, #expr) ++ ++#if KBASE_DEBUG_DISABLE_ASSERTS ++#define KBASE_DEBUG_ASSERT_MSG(expr, ...) CSTD_NOP() ++#else ++/** ++ * KBASE_DEBUG_ASSERT_MSG() - Calls @ref KBASEP_DEBUG_ASSERT_OUT and prints the ++ * given message if @a expr is false ++ * @expr: Boolean expression ++ * @...: Message to display when @a expr is false, as a format string followed ++ * by format arguments. ++ * ++ * This macro does nothing if the flag KBASE_DEBUG_DISABLE_ASSERTS is set to 1 ++ */ ++#define KBASE_DEBUG_ASSERT_MSG(expr, ...) \ ++ do { \ ++ if (!(expr)) { \ ++ KBASEP_DEBUG_ASSERT_OUT(KBASEP_DEBUG_PRINT_TRACE, KBASEP_DEBUG_PRINT_FUNCTION, __VA_ARGS__);\ ++ KBASE_CALL_ASSERT_HOOK();\ ++ BUG();\ ++ } \ ++ } while (false) ++#endif /* KBASE_DEBUG_DISABLE_ASSERTS */ ++ ++/** ++ * KBASE_DEBUG_CODE() - Executes the code inside the macro only in debug mode ++ * @X: Code to compile only in debug mode. ++ */ ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++#define KBASE_DEBUG_CODE(X) X ++#else ++#define KBASE_DEBUG_CODE(X) CSTD_NOP() ++#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++ ++/** @} */ ++ ++/** ++ * kbase_debug_assert_register_hook - Register a function to call on ASSERT ++ * @func: the function to call when an assert is triggered. ++ * @param: the parameter to pass to \a func when calling it ++ * ++ * Such functions will \b only be called during Debug mode, and for debugging ++ * features \b only. Do not rely on them to be called in general use. ++ * ++ * To disable the hook, supply NULL to \a func. ++ * ++ * @note This function is not thread-safe, and should only be used to ++ * register/deregister once in the module's lifetime. ++ * ++ */ ++void kbase_debug_assert_register_hook(kbase_debug_assert_hook *func, void *param); ++ ++/** ++ * kbasep_debug_assert_call_hook - Call a debug assert hook previously ++ * registered with kbase_debug_assert_register_hook() ++ * ++ * @note This function is not thread-safe with respect to multiple threads ++ * registering functions and parameters with ++ * kbase_debug_assert_register_hook(). Otherwise, thread safety is the ++ * responsibility of the registered hook. ++ */ ++void kbasep_debug_assert_call_hook(void); ++ ++#endif /* _KBASE_DEBUG_H */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c new file mode 100755 -index 000000000000..91dc4dbc0800 +index 000000000..d6518b476 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.c -@@ -0,0 +1,273 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c +@@ -0,0 +1,573 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2016, 2018-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -205217,275 +237094,575 @@ index 000000000000..91dc4dbc0800 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include "mali_kbase_gwt.h" -+#include ++#include ++#include ++#include + -+static inline void kbase_gpu_gwt_setup_page_permission( -+ struct kbase_context *kctx, -+ unsigned long flag, -+ struct rb_node *node) ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ ++static bool kbase_is_job_fault_event_pending(struct kbase_device *kbdev) +{ -+ struct rb_node *rbnode = node; ++ struct list_head *event_list = &kbdev->job_fault_event_list; ++ unsigned long flags; ++ bool ret; + -+ while (rbnode) { -+ struct kbase_va_region *reg; -+ int err = 0; ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ ret = !list_empty(event_list); ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); + -+ reg = rb_entry(rbnode, struct kbase_va_region, rblink); -+ if (reg->nr_pages && !kbase_is_region_invalid_or_free(reg) && -+ (reg->flags & KBASE_REG_GPU_WR)) { -+ err = kbase_mmu_update_pages(kctx, reg->start_pfn, -+ kbase_get_gpu_phy_pages(reg), -+ reg->gpu_alloc->nents, -+ reg->flags & flag, -+ reg->gpu_alloc->group_id); -+ if (err) -+ dev_warn(kctx->kbdev->dev, "kbase_mmu_update_pages failure\n"); ++ return ret; ++} ++ ++static void kbase_ctx_remove_pending_event(struct kbase_context *kctx) ++{ ++ struct list_head *event_list = &kctx->kbdev->job_fault_event_list; ++ struct base_job_fault_event *event; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kctx->kbdev->job_fault_event_lock, flags); ++ list_for_each_entry(event, event_list, head) { ++ if (event->katom->kctx == kctx) { ++ list_del(&event->head); ++ spin_unlock_irqrestore(&kctx->kbdev->job_fault_event_lock, flags); ++ ++ wake_up(&kctx->kbdev->job_fault_resume_wq); ++ flush_work(&event->job_fault_work); ++ ++ /* job_fault_event_list can only have a single atom for ++ * each context. ++ */ ++ return; + } ++ } ++ spin_unlock_irqrestore(&kctx->kbdev->job_fault_event_lock, flags); ++} + -+ rbnode = rb_next(rbnode); ++static bool kbase_ctx_has_no_event_pending(struct kbase_context *kctx) ++{ ++ struct kbase_device *kbdev = kctx->kbdev; ++ struct list_head *event_list = &kctx->kbdev->job_fault_event_list; ++ struct base_job_fault_event *event; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ if (list_empty(event_list)) { ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ return true; ++ } ++ list_for_each_entry(event, event_list, head) { ++ if (event->katom->kctx == kctx) { ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, ++ flags); ++ return false; ++ } + } ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ return true; +} + -+static void kbase_gpu_gwt_setup_pages(struct kbase_context *kctx, -+ unsigned long flag) ++static int wait_for_job_fault(struct kbase_device *kbdev) +{ -+ kbase_gpu_gwt_setup_page_permission(kctx, flag, -+ rb_first(&(kctx->reg_rbtree_same))); -+ kbase_gpu_gwt_setup_page_permission(kctx, flag, -+ rb_first(&(kctx->reg_rbtree_custom))); ++#if KERNEL_VERSION(4, 15, 0) > LINUX_VERSION_CODE ++ int ret = wait_event_interruptible_timeout(kbdev->job_fault_wq, ++ kbase_is_job_fault_event_pending(kbdev), ++ msecs_to_jiffies(2000)); ++ if (ret == 0) ++ return -EAGAIN; ++ else if (ret > 0) ++ return 0; ++ else ++ return ret; ++#else ++ return wait_event_interruptible(kbdev->job_fault_wq, ++ kbase_is_job_fault_event_pending(kbdev)); ++#endif +} + ++/* wait until the fault happen and copy the event */ ++static int kbase_job_fault_event_wait(struct kbase_device *kbdev, ++ struct base_job_fault_event *event) ++{ ++ struct list_head *event_list = &kbdev->job_fault_event_list; ++ struct base_job_fault_event *event_in; ++ unsigned long flags; + -+int kbase_gpu_gwt_start(struct kbase_context *kctx) ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ while (list_empty(event_list)) { ++ int err; ++ ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ ++ err = wait_for_job_fault(kbdev); ++ if (err) ++ return err; ++ ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ } ++ ++ event_in = list_entry(event_list->next, ++ struct base_job_fault_event, head); ++ event->event_code = event_in->event_code; ++ event->katom = event_in->katom; ++ ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ ++ return 0; ++ ++} ++ ++/* remove the event from the queue */ ++static struct base_job_fault_event *kbase_job_fault_event_dequeue( ++ struct kbase_device *kbdev, struct list_head *event_list) +{ -+ kbase_gpu_vm_lock(kctx); -+ if (kctx->gwt_enabled) { -+ kbase_gpu_vm_unlock(kctx); -+ return -EBUSY; ++ struct base_job_fault_event *event; ++ ++ event = list_entry(event_list->next, ++ struct base_job_fault_event, head); ++ list_del(event_list->next); ++ ++ return event; ++ ++} ++ ++/* Remove all the following atoms after the failed atom in the same context ++ * Call the postponed bottom half of job done. ++ * Then, this context could be rescheduled. ++ */ ++static void kbase_job_fault_resume_event_cleanup(struct kbase_context *kctx) ++{ ++ struct list_head *event_list = &kctx->job_fault_resume_event_list; ++ ++ while (!list_empty(event_list)) { ++ struct base_job_fault_event *event; ++ ++ event = kbase_job_fault_event_dequeue(kctx->kbdev, ++ &kctx->job_fault_resume_event_list); ++ kbase_jd_done_worker(&event->katom->work); + } + -+ INIT_LIST_HEAD(&kctx->gwt_current_list); -+ INIT_LIST_HEAD(&kctx->gwt_snapshot_list); ++} + -+#if !MALI_USE_CSF -+ /* If GWT is enabled using new vector dumping format -+ * from user space, back up status of the job serialization flag and -+ * use full serialisation of jobs for dumping. -+ * Status will be restored on end of dumping in gwt_stop. ++static void kbase_job_fault_resume_worker(struct work_struct *data) ++{ ++ struct base_job_fault_event *event = container_of(data, ++ struct base_job_fault_event, job_fault_work); ++ struct kbase_context *kctx; ++ struct kbase_jd_atom *katom; ++ ++ katom = event->katom; ++ kctx = katom->kctx; ++ ++ dev_info(kctx->kbdev->dev, "Job dumping wait\n"); ++ ++ /* When it was waked up, it need to check if queue is empty or the ++ * failed atom belongs to different context. If yes, wake up. Both ++ * of them mean the failed job has been dumped. Please note, it ++ * should never happen that the job_fault_event_list has the two ++ * atoms belong to the same context. + */ -+ kctx->kbdev->backup_serialize_jobs = kctx->kbdev->serialize_jobs; -+ kctx->kbdev->serialize_jobs = KBASE_SERIALIZE_INTRA_SLOT | -+ KBASE_SERIALIZE_INTER_SLOT; ++ wait_event(kctx->kbdev->job_fault_resume_wq, ++ kbase_ctx_has_no_event_pending(kctx)); + -+#endif -+ /* Mark gwt enabled before making pages read only in case a -+ write page fault is triggered while we're still in this loop. -+ (kbase_gpu_vm_lock() doesn't prevent this!) -+ */ -+ kctx->gwt_enabled = true; -+ kctx->gwt_was_enabled = true; ++ atomic_set(&kctx->job_fault_count, 0); ++ kbase_jd_done_worker(&katom->work); + -+ kbase_gpu_gwt_setup_pages(kctx, ~KBASE_REG_GPU_WR); ++ /* In case the following atoms were scheduled during failed job dump ++ * the job_done_worker was held. We need to rerun it after the dump ++ * was finished ++ */ ++ kbase_job_fault_resume_event_cleanup(kctx); + -+ kbase_gpu_vm_unlock(kctx); -+ return 0; ++ dev_info(kctx->kbdev->dev, "Job dumping finish, resume scheduler\n"); +} + -+int kbase_gpu_gwt_stop(struct kbase_context *kctx) ++static struct base_job_fault_event *kbase_job_fault_event_queue( ++ struct list_head *event_list, ++ struct kbase_jd_atom *atom, ++ u32 completion_code) +{ -+ struct kbasep_gwt_list_element *pos, *n; ++ struct base_job_fault_event *event; + -+ kbase_gpu_vm_lock(kctx); -+ if (!kctx->gwt_enabled) { -+ kbase_gpu_vm_unlock(kctx); -+ return -EINVAL; ++ event = &atom->fault_event; ++ ++ event->katom = atom; ++ event->event_code = completion_code; ++ ++ list_add_tail(&event->head, event_list); ++ ++ return event; ++ ++} ++ ++static void kbase_job_fault_event_post(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom, u32 completion_code) ++{ ++ struct base_job_fault_event *event; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ event = kbase_job_fault_event_queue(&kbdev->job_fault_event_list, ++ katom, completion_code); ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ ++ wake_up_interruptible(&kbdev->job_fault_wq); ++ ++ INIT_WORK(&event->job_fault_work, kbase_job_fault_resume_worker); ++ queue_work(kbdev->job_fault_resume_workq, &event->job_fault_work); ++ ++ dev_info(katom->kctx->kbdev->dev, "Job fault happen, start dump: %d_%d", ++ katom->kctx->tgid, katom->kctx->id); ++ ++} ++ ++/* ++ * This function will process the job fault ++ * Get the register copy ++ * Send the failed job dump event ++ * Create a Wait queue to wait until the job dump finish ++ */ ++ ++bool kbase_debug_job_fault_process(struct kbase_jd_atom *katom, ++ u32 completion_code) ++{ ++ struct kbase_context *kctx = katom->kctx; ++ ++ /* Check if dumping is in the process ++ * only one atom of each context can be dumped at the same time ++ * If the atom belongs to different context, it can be dumped ++ */ ++ if (atomic_read(&kctx->job_fault_count) > 0) { ++ kbase_job_fault_event_queue( ++ &kctx->job_fault_resume_event_list, ++ katom, completion_code); ++ dev_info(kctx->kbdev->dev, "queue:%d\n", ++ kbase_jd_atom_id(kctx, katom)); ++ return true; + } + -+ list_for_each_entry_safe(pos, n, &kctx->gwt_current_list, link) { -+ list_del(&pos->link); -+ kfree(pos); ++ if (kbase_ctx_flag(kctx, KCTX_DYING)) ++ return false; ++ ++ if (atomic_read(&kctx->kbdev->job_fault_debug) > 0) { ++ ++ if (completion_code != BASE_JD_EVENT_DONE) { ++ ++ if (kbase_job_fault_get_reg_snapshot(kctx) == false) { ++ dev_warn(kctx->kbdev->dev, "get reg dump failed\n"); ++ return false; ++ } ++ ++ kbase_job_fault_event_post(kctx->kbdev, katom, ++ completion_code); ++ atomic_inc(&kctx->job_fault_count); ++ dev_info(kctx->kbdev->dev, "post:%d\n", ++ kbase_jd_atom_id(kctx, katom)); ++ return true; ++ ++ } + } ++ return false; + -+ list_for_each_entry_safe(pos, n, &kctx->gwt_snapshot_list, link) { -+ list_del(&pos->link); -+ kfree(pos); ++} ++ ++static int debug_job_fault_show(struct seq_file *m, void *v) ++{ ++ struct kbase_device *kbdev = m->private; ++ struct base_job_fault_event *event = (struct base_job_fault_event *)v; ++ struct kbase_context *kctx = event->katom->kctx; ++ int i; ++ ++ dev_info(kbdev->dev, "debug job fault seq show:%d_%d, %d", ++ kctx->tgid, kctx->id, event->reg_offset); ++ ++ if (kctx->reg_dump == NULL) { ++ dev_warn(kbdev->dev, "reg dump is NULL"); ++ return -1; + } + -+#if !MALI_USE_CSF -+ kctx->kbdev->serialize_jobs = kctx->kbdev->backup_serialize_jobs; -+#endif ++ if (kctx->reg_dump[event->reg_offset] == ++ REGISTER_DUMP_TERMINATION_FLAG) { ++ /* Return the error here to stop the read. And the ++ * following next() will not be called. The stop can ++ * get the real event resource and release it ++ */ ++ return -1; ++ } ++ ++ if (event->reg_offset == 0) ++ seq_printf(m, "%d_%d\n", kctx->tgid, kctx->id); ++ ++ for (i = 0; i < 50; i++) { ++ if (kctx->reg_dump[event->reg_offset] == ++ REGISTER_DUMP_TERMINATION_FLAG) { ++ break; ++ } ++ seq_printf(m, "%08x: %08x\n", ++ kctx->reg_dump[event->reg_offset], ++ kctx->reg_dump[1+event->reg_offset]); ++ event->reg_offset += 2; ++ ++ } + -+ kbase_gpu_gwt_setup_pages(kctx, ~0UL); + -+ kctx->gwt_enabled = false; -+ kbase_gpu_vm_unlock(kctx); + return 0; +} ++static void *debug_job_fault_next(struct seq_file *m, void *v, loff_t *pos) ++{ ++ struct kbase_device *kbdev = m->private; ++ struct base_job_fault_event *event = (struct base_job_fault_event *)v; + ++ dev_info(kbdev->dev, "debug job fault seq next:%d, %d", ++ event->reg_offset, (int)*pos); + -+static int list_cmp_function(void *priv, struct list_head *a, -+ struct list_head *b) ++ return event; ++} ++ ++static void *debug_job_fault_start(struct seq_file *m, loff_t *pos) +{ -+ struct kbasep_gwt_list_element *elementA = container_of(a, -+ struct kbasep_gwt_list_element, link); -+ struct kbasep_gwt_list_element *elementB = container_of(b, -+ struct kbasep_gwt_list_element, link); ++ struct kbase_device *kbdev = m->private; ++ struct base_job_fault_event *event; + -+ CSTD_UNUSED(priv); ++ dev_info(kbdev->dev, "fault job seq start:%d", (int)*pos); + -+ if (elementA->page_addr > elementB->page_addr) -+ return 1; -+ return -1; ++ /* The condition is trick here. It needs make sure the ++ * fault hasn't happened and the dumping hasn't been started, ++ * or the dumping has finished ++ */ ++ if (*pos == 0) { ++ event = kmalloc(sizeof(*event), GFP_KERNEL); ++ if (!event) ++ return NULL; ++ event->reg_offset = 0; ++ if (kbase_job_fault_event_wait(kbdev, event)) { ++ kfree(event); ++ return NULL; ++ } ++ ++ /* The cache flush workaround is called in bottom half of ++ * job done but we delayed it. Now we should clean cache ++ * earlier. Then the GPU memory dump should be correct. ++ */ ++ kbase_backend_cache_clean(kbdev, event->katom); ++ } else ++ return NULL; ++ ++ return event; +} + -+static void kbase_gpu_gwt_collate(struct kbase_context *kctx, -+ struct list_head *snapshot_list) ++static void debug_job_fault_stop(struct seq_file *m, void *v) +{ -+ struct kbasep_gwt_list_element *pos, *n; -+ struct kbasep_gwt_list_element *collated = NULL; ++ struct kbase_device *kbdev = m->private; + -+ /* Sort the list */ -+ list_sort(NULL, snapshot_list, list_cmp_function); ++ /* here we wake up the kbase_jd_done_worker after stop, it needs ++ * get the memory dump before the register dump in debug daemon, ++ * otherwise, the memory dump may be incorrect. ++ */ + -+ /* Combine contiguous areas. */ -+ list_for_each_entry_safe(pos, n, snapshot_list, link) { -+ if (collated == NULL || collated->region != -+ pos->region || -+ (collated->page_addr + -+ (collated->num_pages * PAGE_SIZE)) != -+ pos->page_addr) { -+ /* This is the first time through, a new region or -+ * is not contiguous - start collating to this element -+ */ -+ collated = pos; -+ } else { -+ /* contiguous so merge */ -+ collated->num_pages += pos->num_pages; -+ /* remove element from list */ -+ list_del(&pos->link); -+ kfree(pos); ++ if (v != NULL) { ++ kfree(v); ++ dev_info(kbdev->dev, "debug job fault seq stop stage 1"); ++ ++ } else { ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ if (!list_empty(&kbdev->job_fault_event_list)) { ++ kbase_job_fault_event_dequeue(kbdev, ++ &kbdev->job_fault_event_list); ++ wake_up(&kbdev->job_fault_resume_wq); + } ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ dev_info(kbdev->dev, "debug job fault seq stop stage 2"); + } ++ +} + -+int kbase_gpu_gwt_dump(struct kbase_context *kctx, -+ union kbase_ioctl_cinstr_gwt_dump *gwt_dump) -+{ -+ const u32 ubuf_size = gwt_dump->in.len; -+ u32 ubuf_count = 0; -+ __user void *user_addr = (__user void *) -+ (uintptr_t)gwt_dump->in.addr_buffer; -+ __user void *user_sizes = (__user void *) -+ (uintptr_t)gwt_dump->in.size_buffer; ++static const struct seq_operations ops = { ++ .start = debug_job_fault_start, ++ .next = debug_job_fault_next, ++ .stop = debug_job_fault_stop, ++ .show = debug_job_fault_show, ++}; + -+ kbase_gpu_vm_lock(kctx); ++static int debug_job_fault_open(struct inode *in, struct file *file) ++{ ++ struct kbase_device *kbdev = in->i_private; + -+ if (!kctx->gwt_enabled) { -+ kbase_gpu_vm_unlock(kctx); -+ /* gwt_dump shouldn't be called when gwt is disabled */ -+ return -EPERM; ++ if (atomic_cmpxchg(&kbdev->job_fault_debug, 0, 1) == 1) { ++ dev_warn(kbdev->dev, "debug job fault is busy, only a single client is allowed"); ++ return -EBUSY; + } + -+ if (!gwt_dump->in.len || !gwt_dump->in.addr_buffer -+ || !gwt_dump->in.size_buffer) { -+ kbase_gpu_vm_unlock(kctx); -+ /* We don't have any valid user space buffer to copy the -+ * write modified addresses. -+ */ -+ return -EINVAL; -+ } ++ seq_open(file, &ops); + -+ if (list_empty(&kctx->gwt_snapshot_list) && -+ !list_empty(&kctx->gwt_current_list)) { ++ ((struct seq_file *)file->private_data)->private = kbdev; ++ dev_info(kbdev->dev, "debug job fault seq open"); + -+ list_replace_init(&kctx->gwt_current_list, -+ &kctx->gwt_snapshot_list); + -+ /* We have collected all write faults so far -+ * and they will be passed on to user space. -+ * Reset the page flags state to allow collection of -+ * further write faults. -+ */ -+ kbase_gpu_gwt_setup_pages(kctx, ~KBASE_REG_GPU_WR); ++ return 0; + -+ /* Sort and combine consecutive pages in the dump list*/ -+ kbase_gpu_gwt_collate(kctx, &kctx->gwt_snapshot_list); ++} ++ ++static int debug_job_fault_release(struct inode *in, struct file *file) ++{ ++ struct kbase_device *kbdev = in->i_private; ++ struct list_head *event_list = &kbdev->job_fault_event_list; ++ unsigned long flags; ++ ++ seq_release(in, file); ++ ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ ++ /* Disable job fault dumping. This will let kbase run jobs as normal, ++ * without blocking waiting for a job_fault client to read failed jobs. ++ * ++ * After this a new client may open the file, and may re-enable job ++ * fault dumping, but the job_fault_event_lock we hold here will block ++ * that from interfering until after we've completed the cleanup. ++ */ ++ atomic_dec(&kbdev->job_fault_debug); ++ ++ /* Clean the unprocessed job fault. After that, all the suspended ++ * contexts could be rescheduled. Remove all the failed atoms that ++ * belong to different contexts Resume all the contexts that were ++ * suspend due to failed job. ++ */ ++ while (!list_empty(event_list)) { ++ kbase_job_fault_event_dequeue(kbdev, event_list); ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ wake_up(&kbdev->job_fault_resume_wq); ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); + } + -+ while ((!list_empty(&kctx->gwt_snapshot_list))) { -+ u64 addr_buffer[32]; -+ u64 num_page_buffer[32]; -+ u32 count = 0; -+ int err; -+ struct kbasep_gwt_list_element *dump_info, *n; ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); + -+ list_for_each_entry_safe(dump_info, n, -+ &kctx->gwt_snapshot_list, link) { -+ addr_buffer[count] = dump_info->page_addr; -+ num_page_buffer[count] = dump_info->num_pages; -+ count++; -+ list_del(&dump_info->link); -+ kfree(dump_info); -+ if (ARRAY_SIZE(addr_buffer) == count || -+ ubuf_size == (ubuf_count + count)) -+ break; -+ } ++ dev_info(kbdev->dev, "debug job fault seq close"); + -+ if (count) { -+ err = copy_to_user((user_addr + -+ (ubuf_count * sizeof(u64))), -+ (void *)addr_buffer, -+ count * sizeof(u64)); -+ if (err) { -+ dev_err(kctx->kbdev->dev, "Copy to user failure\n"); -+ kbase_gpu_vm_unlock(kctx); -+ return err; -+ } -+ err = copy_to_user((user_sizes + -+ (ubuf_count * sizeof(u64))), -+ (void *)num_page_buffer, -+ count * sizeof(u64)); -+ if (err) { -+ dev_err(kctx->kbdev->dev, "Copy to user failure\n"); -+ kbase_gpu_vm_unlock(kctx); -+ return err; -+ } ++ return 0; ++} + -+ ubuf_count += count; -+ } ++static const struct file_operations kbasep_debug_job_fault_fops = { ++ .owner = THIS_MODULE, ++ .open = debug_job_fault_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = debug_job_fault_release, ++}; + -+ if (ubuf_count == ubuf_size) -+ break; ++/* ++ * Initialize debugfs entry for job fault dump ++ */ ++void kbase_debug_job_fault_debugfs_init(struct kbase_device *kbdev) ++{ ++ debugfs_create_file("job_fault", 0400, ++ kbdev->mali_debugfs_directory, kbdev, ++ &kbasep_debug_job_fault_fops); ++} ++ ++ ++int kbase_debug_job_fault_dev_init(struct kbase_device *kbdev) ++{ ++ ++ INIT_LIST_HEAD(&kbdev->job_fault_event_list); ++ ++ init_waitqueue_head(&(kbdev->job_fault_wq)); ++ init_waitqueue_head(&(kbdev->job_fault_resume_wq)); ++ spin_lock_init(&kbdev->job_fault_event_lock); ++ ++ kbdev->job_fault_resume_workq = alloc_workqueue( ++ "kbase_job_fault_resume_work_queue", WQ_MEM_RECLAIM, 1); ++ if (!kbdev->job_fault_resume_workq) ++ return -ENOMEM; ++ ++ atomic_set(&kbdev->job_fault_debug, 0); ++ ++ return 0; ++} ++ ++/* ++ * Release the relevant resource per device ++ */ ++void kbase_debug_job_fault_dev_term(struct kbase_device *kbdev) ++{ ++ destroy_workqueue(kbdev->job_fault_resume_workq); ++} ++ ++ ++/* ++ * Initialize the relevant data structure per context ++ */ ++int kbase_debug_job_fault_context_init(struct kbase_context *kctx) ++{ ++ ++ /* We need allocate double size register range ++ * Because this memory will keep the register address and value ++ */ ++ kctx->reg_dump = vmalloc(0x4000 * 2); ++ if (kctx->reg_dump != NULL) { ++ if (kbase_debug_job_fault_reg_snapshot_init(kctx, 0x4000) == ++ false) { ++ vfree(kctx->reg_dump); ++ kctx->reg_dump = NULL; ++ } ++ INIT_LIST_HEAD(&kctx->job_fault_resume_event_list); ++ atomic_set(&kctx->job_fault_count, 0); + } + -+ if (!list_empty(&kctx->gwt_snapshot_list)) -+ gwt_dump->out.more_data_available = 1; -+ else -+ gwt_dump->out.more_data_available = 0; ++ return 0; ++} + -+ gwt_dump->out.no_of_addr_collected = ubuf_count; -+ kbase_gpu_vm_unlock(kctx); ++/* ++ * release the relevant resource per context ++ */ ++void kbase_debug_job_fault_context_term(struct kbase_context *kctx) ++{ ++ vfree(kctx->reg_dump); ++} ++ ++void kbase_debug_job_fault_kctx_unblock(struct kbase_context *kctx) ++{ ++ WARN_ON(!kbase_ctx_flag(kctx, KCTX_DYING)); ++ ++ /* Return early if the job fault part of the kbase_device is not ++ * initialized yet. An error can happen during the device probe after ++ * the privileged Kbase context was created for the HW counter dumping ++ * but before the job fault part is initialized. ++ */ ++ if (!kctx->kbdev->job_fault_resume_workq) ++ return; ++ ++ kbase_ctx_remove_pending_event(kctx); ++} ++ ++#else /* CONFIG_DEBUG_FS */ ++ ++int kbase_debug_job_fault_dev_init(struct kbase_device *kbdev) ++{ + return 0; +} -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gwt.h b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h ++ ++void kbase_debug_job_fault_dev_term(struct kbase_device *kbdev) ++{ ++} ++ ++#endif /* CONFIG_DEBUG_FS */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h new file mode 100755 -index 000000000000..7e7746e64915 +index 000000000..059d9c455 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h -@@ -0,0 +1,55 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h +@@ -0,0 +1,121 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2016, 2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -205496,57 +237673,123 @@ index 000000000000..7e7746e64915 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ */ ++ ++#ifndef _KBASE_DEBUG_JOB_FAULT_H ++#define _KBASE_DEBUG_JOB_FAULT_H ++ ++#include ++#include ++ ++#define REGISTER_DUMP_TERMINATION_FLAG 0xFFFFFFFF ++ ++/** ++ * kbase_debug_job_fault_dev_init - Create the fault event wait queue ++ * per device and initialize the required lists. ++ * @kbdev: Device pointer + * ++ * Return: Zero on success or a negative error code. + */ ++int kbase_debug_job_fault_dev_init(struct kbase_device *kbdev); + -+#if !defined(_KBASE_GWT_H) -+#define _KBASE_GWT_H ++/** ++ * kbase_debug_job_fault_debugfs_init - Initialize job fault debug sysfs ++ * @kbdev: Device pointer ++ */ ++void kbase_debug_job_fault_debugfs_init(struct kbase_device *kbdev); + -+#include -+#include ++/** ++ * kbase_debug_job_fault_dev_term - Clean up resources created in ++ * kbase_debug_job_fault_dev_init. ++ * @kbdev: Device pointer ++ */ ++void kbase_debug_job_fault_dev_term(struct kbase_device *kbdev); + +/** -+ * kbase_gpu_gwt_start - Start the GPU write tracking -+ * @kctx: Pointer to kernel context ++ * kbase_debug_job_fault_context_init - Initialize the relevant ++ * data structure per context ++ * @kctx: KBase context pointer ++ * Return: 0 on success ++ */ ++int kbase_debug_job_fault_context_init(struct kbase_context *kctx); ++ ++/** ++ * kbase_debug_job_fault_context_term - Release the relevant ++ * resource per context ++ * @kctx: KBase context pointer ++ */ ++void kbase_debug_job_fault_context_term(struct kbase_context *kctx); ++ ++/** ++ * kbase_debug_job_fault_kctx_unblock - Unblock the atoms blocked on job fault ++ * dumping on context termination. + * -+ * @return 0 on success, error on failure. ++ * @kctx: KBase context pointer ++ * ++ * This function is called during context termination to unblock the atom for ++ * which the job fault occurred and also the atoms following it. This is needed ++ * otherwise the wait for zero jobs could timeout (leading to an assertion ++ * failure, kernel panic in debug builds) in the pathological case where ++ * although the thread/daemon capturing the job fault events is running, ++ * but for some reasons has stopped consuming the events. + */ -+int kbase_gpu_gwt_start(struct kbase_context *kctx); ++void kbase_debug_job_fault_kctx_unblock(struct kbase_context *kctx); + +/** -+ * kbase_gpu_gwt_stop - Stop the GPU write tracking -+ * @kctx: Pointer to kernel context ++ * kbase_debug_job_fault_process - Process the failed job. ++ * ++ * @katom: The failed atom pointer ++ * @completion_code: the job status + * -+ * @return 0 on success, error on failure. ++ * It will send a event and wake up the job fault waiting queue ++ * Then create a work queue to wait for job dump finish ++ * This function should be called in the interrupt handler and before ++ * jd_done that make sure the jd_done_worker will be delayed until the ++ * job dump finish ++ * ++ * Return: true if dump is going on + */ -+int kbase_gpu_gwt_stop(struct kbase_context *kctx); ++bool kbase_debug_job_fault_process(struct kbase_jd_atom *katom, ++ u32 completion_code); + +/** -+ * kbase_gpu_gwt_dump - Pass page address of faulting addresses to user space. -+ * @kctx: Pointer to kernel context -+ * @gwt_dump: User space data to be passed. ++ * kbase_debug_job_fault_reg_snapshot_init - Set the interested registers ++ * address during the job fault process, the relevant registers will ++ * be saved when a job fault happen ++ * @kctx: KBase context pointer ++ * @reg_range: Maximum register address space + * -+ * @return 0 on success, error on failure. ++ * Return: true if initializing successfully + */ -+int kbase_gpu_gwt_dump(struct kbase_context *kctx, -+ union kbase_ioctl_cinstr_gwt_dump *gwt_dump); ++bool kbase_debug_job_fault_reg_snapshot_init(struct kbase_context *kctx, ++ int reg_range); + -+#endif /* _KBASE_GWT_H */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hw.c b/drivers/gpu/arm/bifrost/mali_kbase_hw.c -new file mode 100755 -index 000000000000..dc58ffb931be ++/** ++ * kbase_job_fault_get_reg_snapshot - Read the interested registers for ++ * failed job dump ++ * ++ * @kctx: KBase context pointer ++ * ++ * Return: true if getting registers successfully ++ */ ++bool kbase_job_fault_get_reg_snapshot(struct kbase_context *kctx); ++ ++#endif /*_KBASE_DEBUG_JOB_FAULT_H*/ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.c +new file mode 100644 +index 000000000..418bb1908 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.c -@@ -0,0 +1,437 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.c +@@ -0,0 +1,138 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2012-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2022-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -205557,515 +237800,601 @@ index 000000000000..dc58ffb931be + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/* -+ * Run-time work-arounds helpers ++ * Debugfs interface to dump information about GPU allocations in kctx + */ + -+#include -+#include -+#include "gpu/mali_kbase_gpu_regmap.h" ++#include "mali_kbase_debug_mem_allocs.h" +#include "mali_kbase.h" -+#include "mali_kbase_hw.h" + -+void kbase_hw_set_features_mask(struct kbase_device *kbdev) -+{ -+ const enum base_hw_feature *features; -+ u32 gpu_id; ++#include ++#include ++#include + -+ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++#if IS_ENABLED(CONFIG_DEBUG_FS) + -+ switch (gpu_id & GPU_ID2_PRODUCT_MODEL) { -+ case GPU_ID2_PRODUCT_TMIX: -+ features = base_hw_features_tMIx; -+ break; -+ case GPU_ID2_PRODUCT_THEX: -+ features = base_hw_features_tHEx; -+ break; -+ case GPU_ID2_PRODUCT_TSIX: -+ features = base_hw_features_tSIx; -+ break; -+ case GPU_ID2_PRODUCT_TDVX: -+ features = base_hw_features_tDVx; -+ break; -+ case GPU_ID2_PRODUCT_TNOX: -+ features = base_hw_features_tNOx; -+ break; -+ case GPU_ID2_PRODUCT_TGOX: -+ features = base_hw_features_tGOx; -+ break; -+ case GPU_ID2_PRODUCT_TTRX: -+ features = base_hw_features_tTRx; -+ break; -+ case GPU_ID2_PRODUCT_TNAX: -+ features = base_hw_features_tNAx; -+ break; -+ case GPU_ID2_PRODUCT_LBEX: -+ case GPU_ID2_PRODUCT_TBEX: -+ features = base_hw_features_tBEx; -+ break; -+ case GPU_ID2_PRODUCT_TBAX: -+ features = base_hw_features_tBAx; -+ break; -+ case GPU_ID2_PRODUCT_TDUX: -+ features = base_hw_features_tDUx; -+ break; -+ case GPU_ID2_PRODUCT_TODX: -+ case GPU_ID2_PRODUCT_LODX: -+ features = base_hw_features_tODx; -+ break; -+ case GPU_ID2_PRODUCT_TGRX: -+ features = base_hw_features_tGRx; -+ break; -+ case GPU_ID2_PRODUCT_TVAX: -+ features = base_hw_features_tVAx; -+ break; -+ case GPU_ID2_PRODUCT_TTUX: -+ /* Fallthrough */ -+ case GPU_ID2_PRODUCT_LTUX: -+ features = base_hw_features_tTUx; -+ break; -+ case GPU_ID2_PRODUCT_TE2X: -+ features = base_hw_features_tE2x; -+ break; -+ default: -+ features = base_hw_features_generic; -+ break; ++/** ++ * debug_zone_mem_allocs_show - Show information from specific rbtree ++ * @zone: Name of GPU virtual memory zone ++ * @rbtree: Pointer to the root of the rbtree associated with @zone ++ * @sfile: The debugfs entry ++ * ++ * This function is called to show information about all the GPU allocations of a ++ * a particular zone within GPU virtual memory space of a context. ++ * The information like the start virtual address and size (in bytes) is shown for ++ * every GPU allocation mapped in the zone. ++ */ ++static void debug_zone_mem_allocs_show(char *zone, struct rb_root *rbtree, struct seq_file *sfile) ++{ ++ struct rb_node *p; ++ struct kbase_va_region *reg; ++ const char *type_names[5] = { ++ "Native", ++ "Imported UMM", ++ "Imported user buf", ++ "Alias", ++ "Raw" ++ }; ++ ++#define MEM_ALLOCS_HEADER \ ++ " VA, VA size, Commit size, Flags, Mem type\n" ++ seq_printf(sfile, "Zone name: %s\n:", zone); ++ seq_printf(sfile, MEM_ALLOCS_HEADER); ++ for (p = rb_first(rbtree); p; p = rb_next(p)) { ++ reg = rb_entry(p, struct kbase_va_region, rblink); ++ if (!(reg->flags & KBASE_REG_FREE)) { ++ seq_printf(sfile, "%16llx, %16zx, %16zx, %8lx, %s\n", ++ reg->start_pfn << PAGE_SHIFT, reg->nr_pages << PAGE_SHIFT, ++ kbase_reg_current_backed_size(reg) << PAGE_SHIFT, ++ reg->flags, type_names[reg->gpu_alloc->type]); ++ } + } ++} + -+ for (; *features != BASE_HW_FEATURE_END; features++) -+ set_bit(*features, &kbdev->hw_features_mask[0]); ++/** ++ * debug_ctx_mem_allocs_show - Show information about GPU allocations in a kctx ++ * @sfile: The debugfs entry ++ * @data: Data associated with the entry ++ * ++ * Return: ++ * 0 if successfully prints data in debugfs entry file ++ * -1 if it encountered an error ++ */ ++static int debug_ctx_mem_allocs_show(struct seq_file *sfile, void *data) ++{ ++ struct kbase_context *const kctx = sfile->private; + -+#if defined(CONFIG_MALI_VECTOR_DUMP) -+ /* When dumping is enabled, need to disable flush reduction optimization -+ * for GPUs on which it is safe to have only cache clean operation at -+ * the end of job chain. -+ * This is required to make vector dump work. There is some discrepancy -+ * in the implementation of flush reduction optimization due to -+ * unclear or ambiguous ARCH spec. ++ kbase_gpu_vm_lock(kctx); ++ ++ debug_zone_mem_allocs_show("SAME_VA:", &kctx->reg_rbtree_same, sfile); ++ debug_zone_mem_allocs_show("CUSTOM_VA:", &kctx->reg_rbtree_custom, sfile); ++ debug_zone_mem_allocs_show("EXEC_VA:", &kctx->reg_rbtree_exec, sfile); ++ ++#if MALI_USE_CSF ++ debug_zone_mem_allocs_show("EXEC_VA_FIXED:", &kctx->reg_rbtree_exec_fixed, sfile); ++ debug_zone_mem_allocs_show("FIXED_VA:", &kctx->reg_rbtree_fixed, sfile); ++#endif /* MALI_USE_CSF */ ++ ++ kbase_gpu_vm_unlock(kctx); ++ return 0; ++} ++ ++/* ++ * File operations related to debugfs entry for mem_zones ++ */ ++static int debug_mem_allocs_open(struct inode *in, struct file *file) ++{ ++ return single_open(file, debug_ctx_mem_allocs_show, in->i_private); ++} ++ ++static const struct file_operations kbase_debug_mem_allocs_fops = { ++ .owner = THIS_MODULE, ++ .open = debug_mem_allocs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++ ++/* ++ * Initialize debugfs entry for mem_allocs ++ */ ++void kbase_debug_mem_allocs_init(struct kbase_context *const kctx) ++{ ++ /* Caller already ensures this, but we keep the pattern for ++ * maintenance safety. + */ -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_CLEAN_ONLY_SAFE)) -+ clear_bit(BASE_HW_FEATURE_FLUSH_REDUCTION, -+ &kbdev->hw_features_mask[0]); -+#endif ++ if (WARN_ON(!kctx) || WARN_ON(IS_ERR_OR_NULL(kctx->kctx_dentry))) ++ return; ++ ++ debugfs_create_file("mem_allocs", 0400, kctx->kctx_dentry, kctx, ++ &kbase_debug_mem_allocs_fops); ++} ++#else ++/* ++ * Stub functions for when debugfs is disabled ++ */ ++void kbase_debug_mem_allocs_init(struct kbase_context *const kctx) ++{ +} ++#endif +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.h +new file mode 100644 +index 000000000..8cf69c2cb +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.h +@@ -0,0 +1,39 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#ifndef _KBASE_DEBUG_MEM_ALLOCS_H ++#define _KBASE_DEBUG_MEM_ALLOCS_H ++ ++#include + +/** -+ * kbase_hw_get_issues_for_new_id - Get the hardware issues for a new GPU ID -+ * @kbdev: Device pointer ++ * kbase_debug_mem_allocs_init() - Initialize the mem_allocs debugfs file ++ * @kctx: Pointer to kernel base context + * -+ * Return: pointer to an array of hardware issues, terminated by -+ * BASE_HW_ISSUE_END. ++ * This function creates a "mem_allocs" file for a context to show infor about the ++ * GPU allocations created for that context. + * -+ * In debugging versions of the driver, unknown versions of a known GPU will -+ * be treated as the most recent known version not later than the actual -+ * version. In such circumstances, the GPU ID in @kbdev will also be replaced -+ * with the most recent known version. ++ * The file is cleaned up by a call to debugfs_remove_recursive() deleting the ++ * parent directory. ++ */ ++void kbase_debug_mem_allocs_init(struct kbase_context *kctx); ++ ++#endif +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c +new file mode 100755 +index 000000000..ce87a0070 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c +@@ -0,0 +1,410 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2013-2021 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Note: The GPU configuration must have been read by kbase_gpuprops_get_props() -+ * before calling this function. + */ -+static const enum base_hw_issue *kbase_hw_get_issues_for_new_id( -+ struct kbase_device *kbdev) ++ ++/* ++ * Debugfs interface to dump the memory visible to the GPU ++ */ ++ ++#include "mali_kbase_debug_mem_view.h" ++#include "mali_kbase.h" ++ ++#include ++#include ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ ++#define SHOW_GPU_MEM_DATA(type, format) \ ++{ \ ++ unsigned int i, j; \ ++ const type *ptr = (type *)cpu_addr; \ ++ const unsigned int col_width = sizeof(type); \ ++ const unsigned int row_width = (col_width == sizeof(u64)) ? 32 : 16; \ ++ const unsigned int num_cols = row_width / col_width; \ ++ for (i = 0; i < PAGE_SIZE; i += row_width) { \ ++ seq_printf(m, "%016llx:", gpu_addr + i); \ ++ for (j = 0; j < num_cols; j++) \ ++ seq_printf(m, format, ptr[j]); \ ++ ptr += num_cols; \ ++ seq_putc(m, '\n'); \ ++ } \ ++} ++ ++struct debug_mem_mapping { ++ struct list_head node; ++ ++ struct kbase_mem_phy_alloc *alloc; ++ unsigned long flags; ++ ++ u64 start_pfn; ++ size_t nr_pages; ++}; ++ ++struct debug_mem_data { ++ struct list_head mapping_list; ++ struct kbase_context *kctx; ++ unsigned int column_width; ++}; ++ ++struct debug_mem_seq_off { ++ struct list_head *lh; ++ size_t offset; ++}; ++ ++static void *debug_mem_start(struct seq_file *m, loff_t *_pos) +{ -+ const enum base_hw_issue *issues = NULL; ++ struct debug_mem_data *mem_data = m->private; ++ struct debug_mem_seq_off *data; ++ struct debug_mem_mapping *map; ++ loff_t pos = *_pos; + -+ struct base_hw_product { -+ u32 product_model; -+ struct { -+ u32 version; -+ const enum base_hw_issue *issues; -+ } map[7]; -+ }; ++ list_for_each_entry(map, &mem_data->mapping_list, node) { ++ if (pos >= map->nr_pages) { ++ pos -= map->nr_pages; ++ } else { ++ data = kmalloc(sizeof(*data), GFP_KERNEL); ++ if (!data) ++ return NULL; ++ data->lh = &map->node; ++ data->offset = pos; ++ return data; ++ } ++ } + -+ static const struct base_hw_product base_hw_products[] = { -+ {GPU_ID2_PRODUCT_TMIX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 1), -+ base_hw_issues_tMIx_r0p0_05dev0}, -+ {GPU_ID2_VERSION_MAKE(0, 0, 2), base_hw_issues_tMIx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tMIx_r0p1}, -+ {U32_MAX /* sentinel value */, NULL} } }, ++ /* Beyond the end */ ++ return NULL; ++} + -+ {GPU_ID2_PRODUCT_THEX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tHEx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 0, 1), base_hw_issues_tHEx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tHEx_r0p1}, -+ {GPU_ID2_VERSION_MAKE(0, 1, 1), base_hw_issues_tHEx_r0p1}, -+ {GPU_ID2_VERSION_MAKE(0, 2, 0), base_hw_issues_tHEx_r0p2}, -+ {GPU_ID2_VERSION_MAKE(0, 3, 0), base_hw_issues_tHEx_r0p3}, -+ {U32_MAX, NULL} } }, ++static void debug_mem_stop(struct seq_file *m, void *v) ++{ ++ kfree(v); ++} + -+ {GPU_ID2_PRODUCT_TSIX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tSIx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 0, 1), base_hw_issues_tSIx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tSIx_r0p1}, -+ {GPU_ID2_VERSION_MAKE(1, 0, 0), base_hw_issues_tSIx_r1p0}, -+ {GPU_ID2_VERSION_MAKE(1, 1, 0), base_hw_issues_tSIx_r1p1}, -+ {U32_MAX, NULL} } }, ++static void *debug_mem_next(struct seq_file *m, void *v, loff_t *pos) ++{ ++ struct debug_mem_data *mem_data = m->private; ++ struct debug_mem_seq_off *data = v; ++ struct debug_mem_mapping *map; + -+ {GPU_ID2_PRODUCT_TDVX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tDVx_r0p0}, -+ {U32_MAX, NULL} } }, ++ map = list_entry(data->lh, struct debug_mem_mapping, node); + -+ {GPU_ID2_PRODUCT_TNOX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tNOx_r0p0}, -+ {U32_MAX, NULL} } }, ++ if (data->offset < map->nr_pages - 1) { ++ data->offset++; ++ ++*pos; ++ return data; ++ } + -+ {GPU_ID2_PRODUCT_TGOX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tGOx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(1, 0, 0), base_hw_issues_tGOx_r1p0}, -+ {U32_MAX, NULL} } }, ++ if (list_is_last(data->lh, &mem_data->mapping_list)) { ++ kfree(data); ++ return NULL; ++ } + -+ {GPU_ID2_PRODUCT_TTRX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tTRx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 0, 3), base_hw_issues_tTRx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tTRx_r0p1}, -+ {GPU_ID2_VERSION_MAKE(0, 1, 1), base_hw_issues_tTRx_r0p1}, -+ {GPU_ID2_VERSION_MAKE(0, 2, 0), base_hw_issues_tTRx_r0p2}, -+ {U32_MAX, NULL} } }, ++ data->lh = data->lh->next; ++ data->offset = 0; ++ ++*pos; + -+ {GPU_ID2_PRODUCT_TNAX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tNAx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 0, 3), base_hw_issues_tNAx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 0, 4), base_hw_issues_tNAx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 0, 5), base_hw_issues_tNAx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tNAx_r0p1}, -+ {GPU_ID2_VERSION_MAKE(0, 1, 1), base_hw_issues_tNAx_r0p1}, -+ {U32_MAX, NULL} } }, ++ return data; ++} + -+ {GPU_ID2_PRODUCT_LBEX, -+ {{GPU_ID2_VERSION_MAKE(1, 0, 0), base_hw_issues_lBEx_r1p0}, -+ {GPU_ID2_VERSION_MAKE(1, 1, 0), base_hw_issues_lBEx_r1p1}, -+ {U32_MAX, NULL} } }, ++static int debug_mem_show(struct seq_file *m, void *v) ++{ ++ struct debug_mem_data *mem_data = m->private; ++ struct debug_mem_seq_off *data = v; ++ struct debug_mem_mapping *map; ++ unsigned long long gpu_addr; ++ struct page *page; ++ void *cpu_addr; ++ pgprot_t prot = PAGE_KERNEL; + -+ {GPU_ID2_PRODUCT_TBEX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tBEx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 0, 3), base_hw_issues_tBEx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tBEx_r0p1}, -+ {GPU_ID2_VERSION_MAKE(1, 0, 0), base_hw_issues_tBEx_r1p0}, -+ {U32_MAX, NULL} } }, ++ map = list_entry(data->lh, struct debug_mem_mapping, node); + -+ {GPU_ID2_PRODUCT_TBAX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tBAx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 0, 3), base_hw_issues_tBAx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(1, 0, 0), base_hw_issues_tBAx_r1p0}, -+ {U32_MAX, NULL} } }, ++ kbase_gpu_vm_lock(mem_data->kctx); + -+ {GPU_ID2_PRODUCT_TDUX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tDUx_r0p0}, -+ {U32_MAX, NULL} } }, ++ if (data->offset >= map->alloc->nents) { ++ seq_printf(m, "%016llx: Unbacked page\n\n", (map->start_pfn + ++ data->offset) << PAGE_SHIFT); ++ goto out; ++ } + -+ {GPU_ID2_PRODUCT_TODX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tODx_r0p0}, -+ {U32_MAX, NULL} } }, ++ if (!(map->flags & KBASE_REG_CPU_CACHED)) ++ prot = pgprot_writecombine(prot); + -+ {GPU_ID2_PRODUCT_LODX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tODx_r0p0}, -+ {U32_MAX, NULL} } }, ++ page = as_page(map->alloc->pages[data->offset]); ++ cpu_addr = vmap(&page, 1, VM_MAP, prot); ++ if (!cpu_addr) ++ goto out; + -+ {GPU_ID2_PRODUCT_TGRX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tGRx_r0p0}, -+ {U32_MAX, NULL} } }, ++ gpu_addr = (map->start_pfn + data->offset) << PAGE_SHIFT; + -+ {GPU_ID2_PRODUCT_TVAX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tVAx_r0p0}, -+ {U32_MAX, NULL} } }, ++ /* Cases for 4 supported values of column_width for showing ++ * the GPU memory contents. ++ */ ++ switch (mem_data->column_width) { ++ case 1: ++ SHOW_GPU_MEM_DATA(u8, " %02hhx"); ++ break; ++ case 2: ++ SHOW_GPU_MEM_DATA(u16, " %04hx"); ++ break; ++ case 4: ++ SHOW_GPU_MEM_DATA(u32, " %08x"); ++ break; ++ case 8: ++ SHOW_GPU_MEM_DATA(u64, " %016llx"); ++ break; ++ default: ++ dev_warn(mem_data->kctx->kbdev->dev, "Unexpected column width"); ++ } + -+ {GPU_ID2_PRODUCT_TTUX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tTUx_r0p0}, -+ {U32_MAX, NULL} } }, ++ vunmap(cpu_addr); + -+ {GPU_ID2_PRODUCT_LTUX, -+ {{GPU_ID2_VERSION_MAKE(3, 0, 0), base_hw_issues_tTUx_r0p0}, -+ {U32_MAX, NULL} } }, ++ seq_putc(m, '\n'); + -+ {GPU_ID2_PRODUCT_TE2X, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tE2x_r0p0}, -+ {U32_MAX, NULL} } }, -+ }; ++out: ++ kbase_gpu_vm_unlock(mem_data->kctx); ++ return 0; ++} + -+ u32 gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ const u32 product_model = gpu_id & GPU_ID2_PRODUCT_MODEL; -+ const struct base_hw_product *product = NULL; -+ size_t p; ++static const struct seq_operations ops = { ++ .start = debug_mem_start, ++ .next = debug_mem_next, ++ .stop = debug_mem_stop, ++ .show = debug_mem_show, ++}; + -+ /* Stop when we reach the end of the products array. */ -+ for (p = 0; p < ARRAY_SIZE(base_hw_products); ++p) { -+ if (product_model == base_hw_products[p].product_model) { -+ product = &base_hw_products[p]; -+ break; ++static int debug_mem_zone_open(struct rb_root *rbtree, ++ struct debug_mem_data *mem_data) ++{ ++ int ret = 0; ++ struct rb_node *p; ++ struct kbase_va_region *reg; ++ struct debug_mem_mapping *mapping; ++ ++ for (p = rb_first(rbtree); p; p = rb_next(p)) { ++ reg = rb_entry(p, struct kbase_va_region, rblink); ++ ++ if (reg->gpu_alloc == NULL) ++ /* Empty region - ignore */ ++ continue; ++ ++ if (reg->flags & KBASE_REG_PROTECTED) { ++ /* CPU access to protected memory is forbidden - so ++ * skip this GPU virtual region. ++ */ ++ continue; ++ } ++ ++ mapping = kmalloc(sizeof(*mapping), GFP_KERNEL); ++ if (!mapping) { ++ ret = -ENOMEM; ++ goto out; + } ++ ++ mapping->alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); ++ mapping->start_pfn = reg->start_pfn; ++ mapping->nr_pages = reg->nr_pages; ++ mapping->flags = reg->flags; ++ list_add_tail(&mapping->node, &mem_data->mapping_list); + } + -+ if (product != NULL) { -+ /* Found a matching product. */ -+ const u32 version = gpu_id & GPU_ID2_VERSION; -+ u32 fallback_version = 0; -+ const enum base_hw_issue *fallback_issues = NULL; -+ size_t v; ++out: ++ return ret; ++} + -+ /* Stop when we reach the end of the map. */ -+ for (v = 0; product->map[v].version != U32_MAX; ++v) { ++static int debug_mem_open(struct inode *i, struct file *file) ++{ ++ struct kbase_context *const kctx = i->i_private; ++ struct debug_mem_data *mem_data; ++ int ret; + -+ if (version == product->map[v].version) { -+ /* Exact match so stop. */ -+ issues = product->map[v].issues; -+ break; -+ } ++ if (get_file_rcu(kctx->filp) == 0) ++ return -ENOENT; + -+ /* Check whether this is a candidate for most recent -+ known version not later than the actual -+ version. */ -+ if ((version > product->map[v].version) && -+ (product->map[v].version >= fallback_version)) { -+#if MALI_CUSTOMER_RELEASE -+ /* Match on version's major and minor fields */ -+ if (((version ^ product->map[v].version) >> -+ GPU_ID2_VERSION_MINOR_SHIFT) == 0) -+#endif -+ { -+ fallback_version = product->map[v].version; -+ fallback_issues = product->map[v].issues; -+ } -+ } -+ } ++ /* Check if file was opened in write mode. GPU memory contents ++ * are returned only when the file is not opened in write mode. ++ */ ++ if (file->f_mode & FMODE_WRITE) { ++ file->private_data = kctx; ++ return 0; ++ } + -+ if ((issues == NULL) && (fallback_issues != NULL)) { -+ /* Fall back to the issue set of the most recent known -+ version not later than the actual version. */ -+ issues = fallback_issues; ++ ret = seq_open(file, &ops); ++ if (ret) ++ goto open_fail; + -+#if MALI_CUSTOMER_RELEASE -+ dev_warn(kbdev->dev, -+ "GPU hardware issue table may need updating:\n" -+#else -+ dev_info(kbdev->dev, ++ mem_data = kmalloc(sizeof(*mem_data), GFP_KERNEL); ++ if (!mem_data) { ++ ret = -ENOMEM; ++ goto out; ++ } ++ ++ mem_data->kctx = kctx; ++ ++ INIT_LIST_HEAD(&mem_data->mapping_list); ++ ++ kbase_gpu_vm_lock(kctx); ++ ++ mem_data->column_width = kctx->mem_view_column_width; ++ ++ ret = debug_mem_zone_open(&kctx->reg_rbtree_same, mem_data); ++ if (ret != 0) { ++ kbase_gpu_vm_unlock(kctx); ++ goto out; ++ } ++ ++ ret = debug_mem_zone_open(&kctx->reg_rbtree_custom, mem_data); ++ if (ret != 0) { ++ kbase_gpu_vm_unlock(kctx); ++ goto out; ++ } ++ ++ ret = debug_mem_zone_open(&kctx->reg_rbtree_exec, mem_data); ++ if (ret != 0) { ++ kbase_gpu_vm_unlock(kctx); ++ goto out; ++ } ++ ++#if MALI_USE_CSF ++ ret = debug_mem_zone_open(&kctx->reg_rbtree_exec_fixed, mem_data); ++ if (ret != 0) { ++ kbase_gpu_vm_unlock(kctx); ++ goto out; ++ } ++ ++ ret = debug_mem_zone_open(&kctx->reg_rbtree_fixed, mem_data); ++ if (ret != 0) { ++ kbase_gpu_vm_unlock(kctx); ++ goto out; ++ } +#endif -+ "r%dp%d status %d is unknown; treating as r%dp%d status %d", -+ (gpu_id & GPU_ID2_VERSION_MAJOR) >> -+ GPU_ID2_VERSION_MAJOR_SHIFT, -+ (gpu_id & GPU_ID2_VERSION_MINOR) >> -+ GPU_ID2_VERSION_MINOR_SHIFT, -+ (gpu_id & GPU_ID2_VERSION_STATUS) >> -+ GPU_ID2_VERSION_STATUS_SHIFT, -+ (fallback_version & GPU_ID2_VERSION_MAJOR) >> -+ GPU_ID2_VERSION_MAJOR_SHIFT, -+ (fallback_version & GPU_ID2_VERSION_MINOR) >> -+ GPU_ID2_VERSION_MINOR_SHIFT, -+ (fallback_version & GPU_ID2_VERSION_STATUS) >> -+ GPU_ID2_VERSION_STATUS_SHIFT); + -+ gpu_id &= ~GPU_ID2_VERSION; -+ gpu_id |= fallback_version; -+ kbdev->gpu_props.props.raw_props.gpu_id = gpu_id; ++ kbase_gpu_vm_unlock(kctx); + -+ kbase_gpuprops_update_core_props_gpu_id( -+ &kbdev->gpu_props.props); ++ ((struct seq_file *)file->private_data)->private = mem_data; ++ ++ return 0; ++ ++out: ++ if (mem_data) { ++ while (!list_empty(&mem_data->mapping_list)) { ++ struct debug_mem_mapping *mapping; ++ ++ mapping = list_first_entry(&mem_data->mapping_list, ++ struct debug_mem_mapping, node); ++ kbase_mem_phy_alloc_put(mapping->alloc); ++ list_del(&mapping->node); ++ kfree(mapping); + } ++ kfree(mem_data); + } -+ return issues; ++ seq_release(i, file); ++open_fail: ++ fput(kctx->filp); ++ ++ return ret; +} + -+int kbase_hw_set_issues_mask(struct kbase_device *kbdev) ++static int debug_mem_release(struct inode *inode, struct file *file) +{ -+ const enum base_hw_issue *issues; -+ u32 gpu_id; -+ u32 impl_tech; ++ struct kbase_context *const kctx = inode->i_private; + -+ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ impl_tech = kbdev->gpu_props.props.thread_props.impl_tech; ++ /* If the file wasn't opened in write mode, then release the ++ * memory allocated to show the GPU memory contents. ++ */ ++ if (!(file->f_mode & FMODE_WRITE)) { ++ struct seq_file *sfile = file->private_data; ++ struct debug_mem_data *mem_data = sfile->private; ++ struct debug_mem_mapping *mapping; + -+ if (impl_tech != IMPLEMENTATION_MODEL) { -+ issues = kbase_hw_get_issues_for_new_id(kbdev); -+ if (issues == NULL) { -+ dev_err(kbdev->dev, -+ "Unknown GPU ID %x", gpu_id); -+ return -EINVAL; -+ } ++ seq_release(inode, file); + -+#if !MALI_CUSTOMER_RELEASE -+ /* The GPU ID might have been replaced with the last -+ known version of the same GPU. */ -+ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+#endif -+ } else { -+ /* Software model */ -+ switch (gpu_id & GPU_ID2_PRODUCT_MODEL) { -+ case GPU_ID2_PRODUCT_TMIX: -+ issues = base_hw_issues_model_tMIx; -+ break; -+ case GPU_ID2_PRODUCT_THEX: -+ issues = base_hw_issues_model_tHEx; -+ break; -+ case GPU_ID2_PRODUCT_TSIX: -+ issues = base_hw_issues_model_tSIx; -+ break; -+ case GPU_ID2_PRODUCT_TDVX: -+ issues = base_hw_issues_model_tDVx; -+ break; -+ case GPU_ID2_PRODUCT_TNOX: -+ issues = base_hw_issues_model_tNOx; -+ break; -+ case GPU_ID2_PRODUCT_TGOX: -+ issues = base_hw_issues_model_tGOx; -+ break; -+ case GPU_ID2_PRODUCT_TTRX: -+ issues = base_hw_issues_model_tTRx; -+ break; -+ case GPU_ID2_PRODUCT_TNAX: -+ issues = base_hw_issues_model_tNAx; -+ break; -+ case GPU_ID2_PRODUCT_LBEX: -+ case GPU_ID2_PRODUCT_TBEX: -+ issues = base_hw_issues_model_tBEx; -+ break; -+ case GPU_ID2_PRODUCT_TBAX: -+ issues = base_hw_issues_model_tBAx; -+ break; -+ case GPU_ID2_PRODUCT_TDUX: -+ issues = base_hw_issues_model_tDUx; -+ break; -+ case GPU_ID2_PRODUCT_TODX: -+ case GPU_ID2_PRODUCT_LODX: -+ issues = base_hw_issues_model_tODx; -+ break; -+ case GPU_ID2_PRODUCT_TGRX: -+ issues = base_hw_issues_model_tGRx; -+ break; -+ case GPU_ID2_PRODUCT_TVAX: -+ issues = base_hw_issues_model_tVAx; -+ break; -+ case GPU_ID2_PRODUCT_TTUX: -+ case GPU_ID2_PRODUCT_LTUX: -+ issues = base_hw_issues_model_tTUx; -+ break; -+ case GPU_ID2_PRODUCT_TE2X: -+ issues = base_hw_issues_model_tE2x; -+ break; -+ default: -+ dev_err(kbdev->dev, -+ "Unknown GPU ID %x", gpu_id); -+ return -EINVAL; ++ while (!list_empty(&mem_data->mapping_list)) { ++ mapping = list_first_entry(&mem_data->mapping_list, ++ struct debug_mem_mapping, node); ++ kbase_mem_phy_alloc_put(mapping->alloc); ++ list_del(&mapping->node); ++ kfree(mapping); + } -+ } + -+ dev_info(kbdev->dev, -+ "GPU identified as 0x%x arch %d.%d.%d r%dp%d status %d", -+ (gpu_id & GPU_ID2_PRODUCT_MAJOR) >> -+ GPU_ID2_PRODUCT_MAJOR_SHIFT, -+ (gpu_id & GPU_ID2_ARCH_MAJOR) >> -+ GPU_ID2_ARCH_MAJOR_SHIFT, -+ (gpu_id & GPU_ID2_ARCH_MINOR) >> -+ GPU_ID2_ARCH_MINOR_SHIFT, -+ (gpu_id & GPU_ID2_ARCH_REV) >> -+ GPU_ID2_ARCH_REV_SHIFT, -+ (gpu_id & GPU_ID2_VERSION_MAJOR) >> -+ GPU_ID2_VERSION_MAJOR_SHIFT, -+ (gpu_id & GPU_ID2_VERSION_MINOR) >> -+ GPU_ID2_VERSION_MINOR_SHIFT, -+ (gpu_id & GPU_ID2_VERSION_STATUS) >> -+ GPU_ID2_VERSION_STATUS_SHIFT); ++ kfree(mem_data); ++ } + -+ for (; *issues != BASE_HW_ISSUE_END; issues++) -+ set_bit(*issues, &kbdev->hw_issues_mask[0]); ++ fput(kctx->filp); + + return 0; +} -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hw.h b/drivers/gpu/arm/bifrost/mali_kbase_hw.h -new file mode 100755 -index 000000000000..f386b1624317 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.h -@@ -0,0 +1,70 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ + ++static ssize_t debug_mem_write(struct file *file, const char __user *ubuf, ++ size_t count, loff_t *ppos) ++{ ++ struct kbase_context *const kctx = file->private_data; ++ unsigned int column_width = 0; ++ int ret = 0; + ++ CSTD_UNUSED(ppos); + -+/** -+ * @file -+ * Run-time work-arounds helpers -+ */ ++ ret = kstrtouint_from_user(ubuf, count, 0, &column_width); + -+#ifndef _KBASE_HW_H_ -+#define _KBASE_HW_H_ ++ if (ret) ++ return ret; ++ if (!is_power_of_2(column_width)) { ++ dev_dbg(kctx->kbdev->dev, ++ "Column width %u not a multiple of power of 2", column_width); ++ return -EINVAL; ++ } ++ if (column_width > 8) { ++ dev_dbg(kctx->kbdev->dev, ++ "Column width %u greater than 8 not supported", column_width); ++ return -EINVAL; ++ } + -+#include "mali_kbase_defs.h" ++ kbase_gpu_vm_lock(kctx); ++ kctx->mem_view_column_width = column_width; ++ kbase_gpu_vm_unlock(kctx); + -+/** -+ * @brief Tell whether a work-around should be enabled -+ */ -+#define kbase_hw_has_issue(kbdev, issue)\ -+ test_bit(issue, &(kbdev)->hw_issues_mask[0]) ++ return count; ++} + -+/** -+ * @brief Tell whether a feature is supported -+ */ -+#define kbase_hw_has_feature(kbdev, feature)\ -+ test_bit(feature, &(kbdev)->hw_features_mask[0]) ++static const struct file_operations kbase_debug_mem_view_fops = { ++ .owner = THIS_MODULE, ++ .open = debug_mem_open, ++ .release = debug_mem_release, ++ .read = seq_read, ++ .write = debug_mem_write, ++ .llseek = seq_lseek ++}; + -+/** -+ * kbase_hw_set_issues_mask - Set the hardware issues mask based on the GPU ID -+ * @kbdev: Device pointer -+ * -+ * Return: 0 if the GPU ID was recognized, otherwise -EINVAL. -+ * -+ * The GPU ID is read from the @kbdev. -+ * -+ * In debugging versions of the driver, unknown versions of a known GPU with a -+ * new-format ID will be treated as the most recent known version not later -+ * than the actual version. In such circumstances, the GPU ID in @kbdev will -+ * also be replaced with the most recent known version. -+ * -+ * Note: The GPU configuration must have been read by -+ * kbase_gpuprops_get_props() before calling this function. -+ */ -+int kbase_hw_set_issues_mask(struct kbase_device *kbdev); ++void kbase_debug_mem_view_init(struct kbase_context *const kctx) ++{ ++ /* Caller already ensures this, but we keep the pattern for ++ * maintenance safety. ++ */ ++ if (WARN_ON(!kctx) || ++ WARN_ON(IS_ERR_OR_NULL(kctx->kctx_dentry))) ++ return; + -+/** -+ * @brief Set the features mask depending on the GPU ID -+ */ -+void kbase_hw_set_features_mask(struct kbase_device *kbdev); ++ /* Default column width is 4 */ ++ kctx->mem_view_column_width = sizeof(u32); + -+#endif /* _KBASE_HW_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h ++ debugfs_create_file("mem_view", 0400, kctx->kctx_dentry, kctx, ++ &kbase_debug_mem_view_fops); ++} ++ ++#endif +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h new file mode 100755 -index 000000000000..89df2519ab97 +index 000000000..cb8050d9b --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h -@@ -0,0 +1,45 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h +@@ -0,0 +1,39 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2015, 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2013-2015, 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -206076,47 +238405,41 @@ index 000000000000..89df2519ab97 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + ++#ifndef _KBASE_DEBUG_MEM_VIEW_H ++#define _KBASE_DEBUG_MEM_VIEW_H + -+/* -+ * HW access backend common APIs -+ */ -+ -+#ifndef _KBASE_HWACCESS_BACKEND_H_ -+#define _KBASE_HWACCESS_BACKEND_H_ ++#include + +/** -+ * kbase_backend_devfreq_init - Perform backend devfreq related initialization. -+ * @kbdev: Device pointer ++ * kbase_debug_mem_view_init - Initialize the mem_view debugfs file ++ * @kctx: Pointer to kernel base context + * -+ * Return: 0 on success, or an error code on failure. -+ */ -+int kbase_backend_devfreq_init(struct kbase_device *kbdev); -+ -+/** -+ * kbase_backend_devfreq_term - Perform backend-devfreq termination. -+ * @kbdev: Device pointer ++ * This function creates a "mem_view" file which can be used to get a view of ++ * the context's memory as the GPU sees it (i.e. using the GPU's page tables). ++ * ++ * The file is cleaned up by a call to debugfs_remove_recursive() deleting the ++ * parent directory. + */ -+void kbase_backend_devfreq_term(struct kbase_device *kbdev); ++void kbase_debug_mem_view_init(struct kbase_context *kctx); + -+#endif /* _KBASE_HWACCESS_BACKEND_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h -new file mode 100755 -index 000000000000..124a2d9cf0c3 ++#endif +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.c +new file mode 100644 +index 000000000..1f8db32aa --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h -@@ -0,0 +1,51 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.c +@@ -0,0 +1,116 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014, 2016, 2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -206127,53 +238450,118 @@ index 000000000000..124a2d9cf0c3 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + ++/* ++ * Debugfs interface to dump information about GPU_VA memory zones ++ */ ++ ++#include "mali_kbase_debug_mem_zones.h" ++#include "mali_kbase.h" ++ ++#include ++#include ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) + +/** -+ * @file mali_kbase_hwaccess_gpu_defs.h -+ * HW access common definitions ++ * debug_mem_zones_show - Show information about GPU_VA memory zones ++ * @sfile: The debugfs entry ++ * @data: Data associated with the entry ++ * ++ * This function is called to get the contents of the @c mem_zones debugfs file. ++ * This lists the start address and size (in pages) of each initialized memory ++ * zone within GPU_VA memory. ++ * ++ * Return: ++ * 0 if successfully prints data in debugfs entry file ++ * -1 if it encountered an error + */ ++static int debug_mem_zones_show(struct seq_file *sfile, void *data) ++{ ++ struct kbase_context *const kctx = sfile->private; ++ size_t i; + -+#ifndef _KBASE_HWACCESS_DEFS_H_ -+#define _KBASE_HWACCESS_DEFS_H_ ++ const char *zone_names[KBASE_REG_ZONE_MAX] = { ++ "SAME_VA", ++ "CUSTOM_VA", ++ "EXEC_VA" ++#if MALI_USE_CSF ++ , ++ "MCU_SHARED_VA", ++ "EXEC_FIXED_VA", ++ "FIXED_VA" ++#endif ++ }; + -+#include ++ kbase_gpu_vm_lock(kctx); + -+/** -+ * struct kbase_hwaccess_data - object encapsulating the GPU backend specific -+ * data for the HW access layer. -+ * hwaccess_lock (a spinlock) must be held when -+ * accessing this structure. -+ * @active_kctx: pointer to active kbase context which last submitted an -+ * atom to GPU and while the context is active it can -+ * submit new atoms to GPU from the irq context also, without -+ * going through the bottom half of job completion path. -+ * @backend: GPU backend specific data for HW access layer ++ for (i = 0; i < KBASE_REG_ZONE_MAX; i++) { ++ struct kbase_reg_zone *reg_zone = &kctx->reg_zone[i]; ++ ++ if (reg_zone->base_pfn) { ++ seq_printf(sfile, "%15s %zu 0x%.16llx 0x%.16llx\n", zone_names[i], i, ++ reg_zone->base_pfn, reg_zone->va_size_pages); ++ } ++ } ++ ++ kbase_gpu_vm_unlock(kctx); ++ return 0; ++} ++ ++/* ++ * File operations related to debugfs entry for mem_zones + */ -+struct kbase_hwaccess_data { -+ struct kbase_context *active_kctx[BASE_JM_MAX_NR_SLOTS]; ++static int debug_mem_zones_open(struct inode *in, struct file *file) ++{ ++ return single_open(file, debug_mem_zones_show, in->i_private); ++} + -+ struct kbase_backend_data backend; ++static const struct file_operations kbase_debug_mem_zones_fops = { ++ .owner = THIS_MODULE, ++ .open = debug_mem_zones_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, +}; + -+#endif /* _KBASE_HWACCESS_DEFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h -new file mode 100755 -index 000000000000..3ae0dbe6886d ++/* ++ * Initialize debugfs entry for mem_zones ++ */ ++void kbase_debug_mem_zones_init(struct kbase_context *const kctx) ++{ ++ /* Caller already ensures this, but we keep the pattern for ++ * maintenance safety. ++ */ ++ if (WARN_ON(!kctx) || WARN_ON(IS_ERR_OR_NULL(kctx->kctx_dentry))) ++ return; ++ ++ debugfs_create_file("mem_zones", 0400, kctx->kctx_dentry, kctx, ++ &kbase_debug_mem_zones_fops); ++} ++#else ++/* ++ * Stub functions for when debugfs is disabled ++ */ ++void kbase_debug_mem_zones_init(struct kbase_context *const kctx) ++{ ++} ++#endif +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.h +new file mode 100644 +index 000000000..acf349b60 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h -@@ -0,0 +1,87 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.h +@@ -0,0 +1,39 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -206184,89 +238572,41 @@ index 000000000000..3ae0dbe6886d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ *//* SPDX-License-Identifier: GPL-2.0 */ -+/* -+ * -+ * (C) COPYRIGHT 2014-2015, 2018, 2019-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * + */ + ++#ifndef _KBASE_DEBUG_MEM_ZONES_H ++#define _KBASE_DEBUG_MEM_ZONES_H + -+/** -+ * Base kernel property query backend APIs -+ */ -+ -+#ifndef _KBASE_HWACCESS_GPUPROPS_H_ -+#define _KBASE_HWACCESS_GPUPROPS_H_ -+ -+/** -+ * kbase_backend_gpuprops_get() - Fill @regdump with GPU properties read from -+ * GPU -+ * @kbdev: Device pointer -+ * @regdump: Pointer to struct kbase_gpuprops_regdump structure -+ * -+ * The caller should ensure that GPU remains powered-on during this function. -+ * -+ * Return: Zero for succeess or a Linux error code -+ */ -+int kbase_backend_gpuprops_get(struct kbase_device *kbdev, -+ struct kbase_gpuprops_regdump *regdump); -+ -+/** -+ * kbase_backend_gpuprops_get_features - Fill @regdump with GPU properties read -+ * from GPU -+ * @kbdev: Device pointer -+ * @regdump: Pointer to struct kbase_gpuprops_regdump structure -+ * -+ * This function reads GPU properties that are dependent on the hardware -+ * features bitmask. It will power-on the GPU if required. -+ * -+ * Return: Zero for succeess or a Linux error code -+ */ -+int kbase_backend_gpuprops_get_features(struct kbase_device *kbdev, -+ struct kbase_gpuprops_regdump *regdump); ++#include + +/** -+ * kbase_backend_gpuprops_get_l2_features - Fill @regdump with L2_FEATURES read -+ * from GPU -+ * @kbdev: Device pointer -+ * @regdump: Pointer to struct kbase_gpuprops_regdump structure ++ * kbase_debug_mem_zones_init() - Initialize the mem_zones sysfs file ++ * @kctx: Pointer to kernel base context + * -+ * This function reads L2_FEATURES register that is dependent on the hardware -+ * features bitmask. It will power-on the GPU if required. ++ * This function creates a "mem_zones" file which can be used to determine the ++ * address ranges of GPU memory zones, in the GPU Virtual-Address space. + * -+ * Return: Zero on success, Linux error code on failure ++ * The file is cleaned up by a call to debugfs_remove_recursive() deleting the ++ * parent directory. + */ -+int kbase_backend_gpuprops_get_l2_features(struct kbase_device *kbdev, -+ struct kbase_gpuprops_regdump *regdump); ++void kbase_debug_mem_zones_init(struct kbase_context *kctx); + -+ -+#endif /* _KBASE_HWACCESS_GPUPROPS_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h ++#endif +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c new file mode 100755 -index 000000000000..4fd2e3549268 +index 000000000..c846491e7 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h -@@ -0,0 +1,151 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c +@@ -0,0 +1,248 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2015, 2017-2018, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -206277,153 +238617,250 @@ index 000000000000..4fd2e3549268 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+ -+ -+/* -+ * HW Access instrumentation common APIs + */ + -+#ifndef _KBASE_HWACCESS_INSTR_H_ -+#define _KBASE_HWACCESS_INSTR_H_ -+ -+#include ++#include ++#include ++#include ++#include + -+/** -+ * struct kbase_instr_hwcnt_enable - Enable hardware counter collection. -+ * @dump_buffer: GPU address to write counters to. -+ * @dump_buffer_bytes: Size in bytes of the buffer pointed to by dump_buffer. -+ * @fe_bm: counters selection bitmask (Front End). -+ * @shader_bm: counters selection bitmask (Shader). -+ * @tiler_bm: counters selection bitmask (Tiler). -+ * @mmu_l2_bm: counters selection bitmask (MMU_L2). -+ * @use_secondary: use secondary performance counters set for applicable -+ * counter blocks. -+ */ -+struct kbase_instr_hwcnt_enable { -+ u64 dump_buffer; -+ u64 dump_buffer_bytes; -+ u32 fe_bm; -+ u32 shader_bm; -+ u32 tiler_bm; -+ u32 mmu_l2_bm; -+ bool use_secondary; -+}; ++#include "mali_kbase_debugfs_helper.h" + -+/** -+ * kbase_instr_hwcnt_enable_internal() - Enable HW counters collection -+ * @kbdev: Kbase device -+ * @kctx: Kbase context -+ * @enable: HW counter setup parameters -+ * -+ * Context: might sleep, waiting for reset to complete -+ * -+ * Return: 0 on success ++/* Arbitrary maximum size to prevent user space allocating too much kernel ++ * memory + */ -+int kbase_instr_hwcnt_enable_internal(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ struct kbase_instr_hwcnt_enable *enable); ++#define DEBUGFS_MEM_POOLS_MAX_WRITE_SIZE (256u) + +/** -+ * kbase_instr_hwcnt_disable_internal() - Disable HW counters collection -+ * @kctx: Kbase context -+ * -+ * Context: might sleep, waiting for an ongoing dump to complete ++ * set_attr_from_string - Parse a string to set elements of an array + * -+ * Return: 0 on success -+ */ -+int kbase_instr_hwcnt_disable_internal(struct kbase_context *kctx); -+ -+/** -+ * kbase_instr_hwcnt_request_dump() - Request HW counter dump from GPU -+ * @kctx: Kbase context ++ * @buf: Input string to parse. Must be nul-terminated! ++ * @array: Address of an object that can be accessed like an array. ++ * @nelems: Number of elements in the array. ++ * @set_attr_fn: Function to be called back for each array element. + * -+ * Caller must either wait for kbase_instr_hwcnt_dump_complete() to return true, -+ * of call kbase_instr_hwcnt_wait_for_dump(). ++ * This is the core of the implementation of ++ * kbase_debugfs_helper_set_attr_from_string. The only difference between the ++ * two functions is that this one requires the input string to be writable. + * -+ * Return: 0 on success ++ * Return: 0 if success, negative error code otherwise. + */ -+int kbase_instr_hwcnt_request_dump(struct kbase_context *kctx); ++static int ++set_attr_from_string(char *const buf, void *const array, size_t const nelems, ++ kbase_debugfs_helper_set_attr_fn * const set_attr_fn) ++{ ++ size_t index, err = 0; ++ char *ptr = buf; + -+/** -+ * kbase_instr_hwcnt_wait_for_dump() - Wait until pending HW counter dump has -+ * completed. -+ * @kctx: Kbase context -+ * -+ * Context: will sleep, waiting for dump to complete -+ * -+ * Return: 0 on success -+ */ -+int kbase_instr_hwcnt_wait_for_dump(struct kbase_context *kctx); ++ for (index = 0; index < nelems && *ptr; ++index) { ++ unsigned long new_size; ++ size_t len; ++ char sep; + -+/** -+ * kbase_instr_hwcnt_dump_complete - Tell whether the HW counters dump has -+ * completed -+ * @kctx: Kbase context -+ * @success: Set to true if successful -+ * -+ * Context: does not sleep. -+ * -+ * Return: true if the dump is complete -+ */ -+bool kbase_instr_hwcnt_dump_complete(struct kbase_context *kctx, -+ bool * const success); ++ /* Drop leading spaces */ ++ while (*ptr == ' ') ++ ptr++; + -+/** -+ * kbase_instr_hwcnt_clear() - Clear HW counters -+ * @kctx: Kbase context -+ * -+ * Context: might sleep, waiting for reset to complete -+ * -+ * Return: 0 on success -+ */ -+int kbase_instr_hwcnt_clear(struct kbase_context *kctx); ++ len = strcspn(ptr, "\n "); ++ if (len == 0) { ++ /* No more values (allow this) */ ++ break; ++ } + -+/** -+ * kbase_instr_backend_init() - Initialise the instrumentation backend -+ * @kbdev: Kbase device -+ * -+ * This function should be called during driver initialization. -+ * -+ * Return: 0 on success -+ */ -+int kbase_instr_backend_init(struct kbase_device *kbdev); ++ /* Substitute a nul terminator for a space character ++ * to make the substring valid for kstrtoul. ++ */ ++ sep = ptr[len]; ++ if (sep == ' ') ++ ptr[len++] = '\0'; + -+/** -+ * kbase_instr_backend_init() - Terminate the instrumentation backend -+ * @kbdev: Kbase device -+ * -+ * This function should be called during driver termination. -+ */ -+void kbase_instr_backend_term(struct kbase_device *kbdev); ++ err = kstrtoul(ptr, 0, &new_size); ++ if (err) ++ break; + -+#ifdef CONFIG_MALI_PRFCNT_SET_SECONDARY_VIA_DEBUG_FS -+/** -+ * kbase_instr_backend_debugfs_init() - Add a debugfs entry for the -+ * hardware counter set. -+ * @kbdev: kbase device -+ */ -+void kbase_instr_backend_debugfs_init(struct kbase_device *kbdev); -+#endif ++ /* Skip the substring (including any premature nul terminator) ++ */ ++ ptr += len; + -+#endif /* _KBASE_HWACCESS_INSTR_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h ++ set_attr_fn(array, index, new_size); ++ } ++ ++ return err; ++} ++ ++int kbase_debugfs_string_validator(char *const buf) ++{ ++ int err = 0; ++ char *ptr = buf; ++ ++ while (*ptr) { ++ unsigned long test_number; ++ size_t len; ++ ++ /* Drop leading spaces */ ++ while (*ptr == ' ') ++ ptr++; ++ ++ /* Strings passed into the validator will be NULL terminated ++ * by nature, so here strcspn only needs to delimit by ++ * newlines, spaces and NULL terminator (delimited natively). ++ */ ++ len = strcspn(ptr, "\n "); ++ if (len == 0) { ++ /* No more values (allow this) */ ++ break; ++ } ++ ++ /* Substitute a nul terminator for a space character to make ++ * the substring valid for kstrtoul, and then replace it back. ++ */ ++ if (ptr[len] == ' ') { ++ ptr[len] = '\0'; ++ err = kstrtoul(ptr, 0, &test_number); ++ ptr[len] = ' '; ++ ++ /* len should only be incremented if there is a valid ++ * number to follow - otherwise this will skip over ++ * the NULL terminator in cases with no ending newline ++ */ ++ len++; ++ } else { ++ /* This would occur at the last element before a space ++ * or a NULL terminator. ++ */ ++ err = kstrtoul(ptr, 0, &test_number); ++ } ++ ++ if (err) ++ break; ++ /* Skip the substring (including any premature nul terminator) ++ */ ++ ptr += len; ++ } ++ return err; ++} ++ ++int kbase_debugfs_helper_set_attr_from_string( ++ const char *const buf, void *const array, size_t const nelems, ++ kbase_debugfs_helper_set_attr_fn * const set_attr_fn) ++{ ++ char *const wbuf = kstrdup(buf, GFP_KERNEL); ++ int err = 0; ++ ++ if (!wbuf) ++ return -ENOMEM; ++ ++ /* validate string before actually writing values */ ++ err = kbase_debugfs_string_validator(wbuf); ++ if (err) { ++ kfree(wbuf); ++ return err; ++ } ++ ++ err = set_attr_from_string(wbuf, array, nelems, ++ set_attr_fn); ++ ++ kfree(wbuf); ++ return err; ++} ++ ++ssize_t kbase_debugfs_helper_get_attr_to_string( ++ char *const buf, size_t const size, void *const array, ++ size_t const nelems, ++ kbase_debugfs_helper_get_attr_fn * const get_attr_fn) ++{ ++ ssize_t total = 0; ++ size_t index; ++ ++ for (index = 0; index < nelems; ++index) { ++ const char *postfix = " "; ++ ++ if (index == (nelems-1)) ++ postfix = "\n"; ++ ++ total += scnprintf(buf + total, size - total, "%zu%s", ++ get_attr_fn(array, index), postfix); ++ } ++ ++ return total; ++} ++ ++int kbase_debugfs_helper_seq_write( ++ struct file *const file, const char __user *const ubuf, ++ size_t const count, size_t const nelems, ++ kbase_debugfs_helper_set_attr_fn * const set_attr_fn) ++{ ++ const struct seq_file *const sfile = file->private_data; ++ void *const array = sfile->private; ++ int err = 0; ++ char *buf; ++ ++ if (WARN_ON(!array)) ++ return -EINVAL; ++ ++ if (WARN_ON(count > DEBUGFS_MEM_POOLS_MAX_WRITE_SIZE)) ++ return -EINVAL; ++ ++ buf = kmalloc(count + 1, GFP_KERNEL); ++ if (buf == NULL) ++ return -ENOMEM; ++ ++ if (copy_from_user(buf, ubuf, count)) { ++ kfree(buf); ++ return -EFAULT; ++ } ++ ++ buf[count] = '\0'; ++ ++ /* validate string before actually writing values */ ++ err = kbase_debugfs_string_validator(buf); ++ if (err) { ++ kfree(buf); ++ return err; ++ } ++ ++ err = set_attr_from_string(buf, ++ array, nelems, set_attr_fn); ++ kfree(buf); ++ ++ return err; ++} ++ ++int kbase_debugfs_helper_seq_read( ++ struct seq_file * const sfile, size_t const nelems, ++ kbase_debugfs_helper_get_attr_fn * const get_attr_fn) ++{ ++ void *const array = sfile->private; ++ size_t index; ++ ++ if (WARN_ON(!array)) ++ return -EINVAL; ++ ++ for (index = 0; index < nelems; ++index) { ++ const char *postfix = " "; ++ ++ if (index == (nelems-1)) ++ postfix = "\n"; ++ ++ seq_printf(sfile, "%zu%s", get_attr_fn(array, index), postfix); ++ } ++ return 0; ++} +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h new file mode 100755 -index 000000000000..f6ce17e4180f +index 000000000..cbb24d6e0 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h -@@ -0,0 +1,304 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h +@@ -0,0 +1,162 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -206434,306 +238871,164 @@ index 000000000000..f6ce17e4180f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+ -+/* -+ * HW access job manager common APIs -+ */ -+ -+#ifndef _KBASE_HWACCESS_JM_H_ -+#define _KBASE_HWACCESS_JM_H_ -+ -+/** -+ * kbase_backend_run_atom() - Run an atom on the GPU -+ * @kbdev: Device pointer -+ * @atom: Atom to run -+ * -+ * Caller must hold the HW access lock -+ */ -+void kbase_backend_run_atom(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom); -+ -+/** -+ * kbase_backend_slot_update - Update state based on slot ringbuffers -+ * -+ * @kbdev: Device pointer -+ * -+ * Inspect the jobs in the slot ringbuffers and update state. -+ * -+ * This will cause jobs to be submitted to hardware if they are unblocked + */ -+void kbase_backend_slot_update(struct kbase_device *kbdev); + -+/** -+ * kbase_backend_find_and_release_free_address_space() - Release a free AS -+ * @kbdev: Device pointer -+ * @kctx: Context pointer -+ * -+ * This function can evict an idle context from the runpool, freeing up the -+ * address space it was using. -+ * -+ * The address space is marked as in use. The caller must either assign a -+ * context using kbase_gpu_use_ctx(), or release it using -+ * kbase_ctx_sched_release() -+ * -+ * Return: Number of free address space, or KBASEP_AS_NR_INVALID if none -+ * available -+ */ -+int kbase_backend_find_and_release_free_address_space( -+ struct kbase_device *kbdev, struct kbase_context *kctx); ++#ifndef _KBASE_DEBUGFS_HELPER_H_ ++#define _KBASE_DEBUGFS_HELPER_H_ + +/** -+ * kbase_backend_use_ctx() - Activate a currently unscheduled context, using the -+ * provided address space. -+ * @kbdev: Device pointer -+ * @kctx: Context pointer. May be NULL -+ * @as_nr: Free address space to use -+ * -+ * kbase_gpu_next_job() will pull atoms from the active context. ++ * typedef kbase_debugfs_helper_set_attr_fn - Type of function to set an ++ * attribute value from an array + * -+ * Return: true if successful, false if ASID not assigned. ++ * @array: Address of an object that can be accessed like an array. ++ * @index: An element index. The valid range depends on the use-case. ++ * @value: Attribute value to be set. + */ -+bool kbase_backend_use_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int as_nr); ++typedef void kbase_debugfs_helper_set_attr_fn(void *array, size_t index, ++ size_t value); + +/** -+ * kbase_backend_use_ctx_sched() - Activate a context. -+ * @kbdev: Device pointer -+ * @kctx: Context pointer -+ * @js: Job slot to activate context on ++ * kbase_debugfs_helper_set_attr_from_string - Parse a string to reconfigure an ++ * array + * -+ * kbase_gpu_next_job() will pull atoms from the active context. ++ * @buf: Input string to parse. Must be nul-terminated! ++ * @array: Address of an object that can be accessed like an array. ++ * @nelems: Number of elements in the array. ++ * @set_attr_fn: Function to be called back for each array element. + * -+ * The context must already be scheduled and assigned to an address space. If -+ * the context is not scheduled, then kbase_gpu_use_ctx() should be used -+ * instead. ++ * The given function is called once for each attribute value found in the ++ * input string. It is not an error if the string specifies fewer attribute ++ * values than the specified number of array elements. + * -+ * Caller must hold hwaccess_lock ++ * The number base of each attribute value is detected automatically ++ * according to the standard rules (e.g. prefix "0x" for hexadecimal). ++ * Attribute values are separated by one or more space characters. ++ * Additional leading and trailing spaces are ignored. + * -+ * Return: true if context is now active, false otherwise (ie if context does -+ * not have an address space assigned) ++ * Return: 0 if success, negative error code otherwise. + */ -+bool kbase_backend_use_ctx_sched(struct kbase_device *kbdev, -+ struct kbase_context *kctx, int js); ++int kbase_debugfs_helper_set_attr_from_string( ++ const char *buf, void *array, size_t nelems, ++ kbase_debugfs_helper_set_attr_fn *set_attr_fn); + +/** -+ * kbase_backend_release_ctx_irq - Release a context from the GPU. This will -+ * de-assign the assigned address space. -+ * @kbdev: Device pointer -+ * @kctx: Context pointer ++ * kbase_debugfs_string_validator - Validate a string to be written to a ++ * debugfs file for any incorrect formats ++ * or wrong values. + * -+ * Caller must hold kbase_device->mmu_hw_mutex and hwaccess_lock -+ */ -+void kbase_backend_release_ctx_irq(struct kbase_device *kbdev, -+ struct kbase_context *kctx); -+ -+/** -+ * kbase_backend_release_ctx_noirq - Release a context from the GPU. This will -+ * de-assign the assigned address space. -+ * @kbdev: Device pointer -+ * @kctx: Context pointer ++ * @buf: Null-terminated string to validate. + * -+ * Caller must hold kbase_device->mmu_hw_mutex ++ * This function is to be used before any writes to debugfs values are done ++ * such that any strings with erroneous values (such as octal 09 or ++ * hexadecimal 0xGH are fully ignored) - without this validation, any correct ++ * values before the first incorrect one will still be entered into the ++ * debugfs file. This essentially iterates the values through kstrtoul to see ++ * if it is valid. + * -+ * This function must perform any operations that could not be performed in IRQ -+ * context by kbase_backend_release_ctx_irq(). -+ */ -+void kbase_backend_release_ctx_noirq(struct kbase_device *kbdev, -+ struct kbase_context *kctx); -+ -+/** -+ * kbase_backend_cache_clean - Perform a cache clean if the given atom requires -+ * one -+ * @kbdev: Device pointer -+ * @katom: Pointer to the failed atom ++ * It is largely similar to set_attr_from_string to iterate through the values ++ * of the input string. This function also requires the input string to be ++ * writable. + * -+ * On some GPUs, the GPU cache must be cleaned following a failed atom. This -+ * function performs a clean if it is required by @katom. ++ * Return: 0 with no error, else -22 (the invalid return value of kstrtoul) if ++ * any value in the string was wrong or with an incorrect format. + */ -+void kbase_backend_cache_clean(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom); -+ ++int kbase_debugfs_string_validator(char *const buf); + +/** -+ * kbase_backend_complete_wq() - Perform backend-specific actions required on -+ * completing an atom. -+ * @kbdev: Device pointer -+ * @katom: Pointer to the atom to complete -+ * -+ * This function should only be called from kbase_jd_done_worker() or -+ * js_return_worker(). ++ * typedef kbase_debugfs_helper_get_attr_fn - Type of function to get an ++ * attribute value from an array + * -+ * Return: true if atom has completed, false if atom should be re-submitted -+ */ -+void kbase_backend_complete_wq(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom); -+ -+#if !MALI_USE_CSF -+/** -+ * kbase_backend_complete_wq_post_sched - Perform backend-specific actions -+ * required on completing an atom, after -+ * any scheduling has taken place. -+ * @kbdev: Device pointer -+ * @core_req: Core requirements of atom ++ * @array: Address of an object that can be accessed like an array. ++ * @index: An element index. The valid range depends on the use-case. + * -+ * This function should only be called from kbase_jd_done_worker() or -+ * js_return_worker(). -+ */ -+void kbase_backend_complete_wq_post_sched(struct kbase_device *kbdev, -+ base_jd_core_req core_req); -+#endif /* !MALI_USE_CSF */ -+ -+/** -+ * kbase_backend_reset() - The GPU is being reset. Cancel all jobs on the GPU -+ * and remove any others from the ringbuffers. -+ * @kbdev: Device pointer -+ * @end_timestamp: Timestamp of reset ++ * Return: Value of attribute. + */ -+void kbase_backend_reset(struct kbase_device *kbdev, ktime_t *end_timestamp); ++typedef size_t kbase_debugfs_helper_get_attr_fn(void *array, size_t index); + +/** -+ * kbase_backend_inspect_tail - Return the atom currently at the tail of slot -+ * @js -+ * @kbdev: Device pointer -+ * @js: Job slot to inspect ++ * kbase_debugfs_helper_get_attr_to_string - Construct a formatted string ++ * from elements in an array + * -+ * Return : Atom currently at the head of slot @js, or NULL -+ */ -+struct kbase_jd_atom *kbase_backend_inspect_tail(struct kbase_device *kbdev, -+ int js); -+ -+/** -+ * kbase_backend_nr_atoms_on_slot() - Return the number of atoms currently on a -+ * slot. -+ * @kbdev: Device pointer -+ * @js: Job slot to inspect ++ * @buf: Buffer in which to store the formatted output string. ++ * @size: The size of the buffer, in bytes. ++ * @array: Address of an object that can be accessed like an array. ++ * @nelems: Number of elements in the array. ++ * @get_attr_fn: Function to be called back for each array element. + * -+ * Return : Number of atoms currently on slot -+ */ -+int kbase_backend_nr_atoms_on_slot(struct kbase_device *kbdev, int js); -+ -+/** -+ * kbase_backend_nr_atoms_submitted() - Return the number of atoms on a slot -+ * that are currently on the GPU. -+ * @kbdev: Device pointer -+ * @js: Job slot to inspect ++ * The given function is called once for each array element to get the ++ * value of the attribute to be inspected. The attribute values are ++ * written to the buffer as a formatted string of decimal numbers ++ * separated by spaces and terminated by a linefeed. + * -+ * Return : Number of atoms currently on slot @js that are currently on the GPU. ++ * Return: Number of characters written excluding the nul terminator. + */ -+int kbase_backend_nr_atoms_submitted(struct kbase_device *kbdev, int js); ++ssize_t kbase_debugfs_helper_get_attr_to_string( ++ char *buf, size_t size, void *array, size_t nelems, ++ kbase_debugfs_helper_get_attr_fn *get_attr_fn); + +/** -+ * kbase_backend_ctx_count_changed() - Number of contexts ready to submit jobs -+ * has changed. -+ * @kbdev: Device pointer ++ * kbase_debugfs_helper_seq_read - Implements reads from a virtual file for an ++ * array + * -+ * Perform any required backend-specific actions (eg starting/stopping -+ * scheduling timers). -+ */ -+void kbase_backend_ctx_count_changed(struct kbase_device *kbdev); -+ -+/** -+ * kbase_backend_timeouts_changed() - Job Scheduler timeouts have changed. -+ * @kbdev: Device pointer ++ * @sfile: A virtual file previously opened by calling single_open. ++ * @nelems: Number of elements in the array. ++ * @get_attr_fn: Function to be called back for each array element. + * -+ * Perform any required backend-specific actions (eg updating timeouts of -+ * currently running atoms). -+ */ -+void kbase_backend_timeouts_changed(struct kbase_device *kbdev); -+ -+/** -+ * kbase_backend_slot_free() - Return the number of jobs that can be currently -+ * submitted to slot @js. -+ * @kbdev: Device pointer -+ * @js: Job slot to inspect ++ * The virtual file must have been opened by calling single_open and passing ++ * the address of an object that can be accessed like an array. + * -+ * Return : Number of jobs that can be submitted. -+ */ -+int kbase_backend_slot_free(struct kbase_device *kbdev, int js); -+ -+/** -+ * kbase_job_check_enter_disjoint - potentially leave disjoint state -+ * @kbdev: kbase device -+ * @target_katom: atom which is finishing ++ * The given function is called once for each array element to get the ++ * value of the attribute to be inspected. The attribute values are ++ * written to the buffer as a formatted string of decimal numbers ++ * separated by spaces and terminated by a linefeed. + * -+ * Work out whether to leave disjoint state when finishing an atom that was -+ * originated by kbase_job_check_enter_disjoint(). ++ * Return: 0 if success, negative error code otherwise. + */ -+void kbase_job_check_leave_disjoint(struct kbase_device *kbdev, -+ struct kbase_jd_atom *target_katom); ++int kbase_debugfs_helper_seq_read( ++ struct seq_file *sfile, size_t nelems, ++ kbase_debugfs_helper_get_attr_fn *get_attr_fn); + +/** -+ * kbase_backend_jm_kill_running_jobs_from_kctx - Kill all jobs that are -+ * currently running on GPU from a context -+ * @kctx: Context pointer -+ * -+ * This is used in response to a page fault to remove all jobs from the faulting -+ * context from the hardware. ++ * kbase_debugfs_helper_seq_write - Implements writes to a virtual file for an ++ * array + * -+ * Caller must hold hwaccess_lock. -+ */ -+void kbase_backend_jm_kill_running_jobs_from_kctx(struct kbase_context *kctx); -+ -+/** -+ * kbase_jm_wait_for_zero_jobs - Wait for context to have zero jobs running, and -+ * to be descheduled. -+ * @kctx: Context pointer ++ * @file: A virtual file previously opened by calling single_open. ++ * @ubuf: Source address in user space. ++ * @count: Number of bytes written to the virtual file. ++ * @nelems: Number of elements in the array. ++ * @set_attr_fn: Function to be called back for each array element. + * -+ * This should be called following kbase_js_zap_context(), to ensure the context -+ * can be safely destroyed. -+ */ -+void kbase_jm_wait_for_zero_jobs(struct kbase_context *kctx); -+ -+/** -+ * kbase_backend_get_current_flush_id - Return the current flush ID ++ * The virtual file must have been opened by calling single_open and passing ++ * the address of an object that can be accessed like an array. + * -+ * @kbdev: Device pointer ++ * The given function is called once for each attribute value found in the ++ * data written to the virtual file. For further details, refer to the ++ * description of set_attr_from_string. + * -+ * Return: the current flush ID to be recorded for each job chain -+ */ -+u32 kbase_backend_get_current_flush_id(struct kbase_device *kbdev); -+ -+/** -+ * kbase_job_slot_hardstop - Hard-stop the specified job slot -+ * @kctx: The kbase context that contains the job(s) that should -+ * be hard-stopped -+ * @js: The job slot to hard-stop -+ * @target_katom: The job that should be hard-stopped (or NULL for all -+ * jobs from the context) -+ * Context: -+ * The job slot lock must be held when calling this function. ++ * Return: 0 if success, negative error code otherwise. + */ -+void kbase_job_slot_hardstop(struct kbase_context *kctx, int js, -+ struct kbase_jd_atom *target_katom); ++int kbase_debugfs_helper_seq_write(struct file *file, ++ const char __user *ubuf, size_t count, ++ size_t nelems, ++ kbase_debugfs_helper_set_attr_fn *set_attr_fn); + -+/** -+ * kbase_gpu_atoms_submitted_any() - Inspect whether there are any atoms -+ * currently on the GPU -+ * @kbdev: Device pointer -+ * -+ * Return: true if there are any atoms on the GPU, false otherwise -+ */ -+bool kbase_gpu_atoms_submitted_any(struct kbase_device *kbdev); ++#endif /*_KBASE_DEBUGFS_HELPER_H_ */ + -+#endif /* _KBASE_HWACCESS_JM_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_defs.h new file mode 100755 -index 000000000000..bbaf6eaf8d88 +index 000000000..809e73000 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h -@@ -0,0 +1,229 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_defs.h +@@ -0,0 +1,2105 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2015, 2018-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -206744,1245 +239039,2107 @@ index 000000000000..bbaf6eaf8d88 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ +/** -+ * @file mali_kbase_hwaccess_pm.h -+ * HW access power manager common APIs ++ * DOC: Defintions (types, defines, etcs) common to Kbase. They are placed here ++ * to allow the hierarchy of header files to work. + */ + -+#ifndef _KBASE_HWACCESS_PM_H_ -+#define _KBASE_HWACCESS_PM_H_ ++#ifndef _KBASE_DEFS_H_ ++#define _KBASE_DEFS_H_ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#if MALI_USE_CSF ++#include ++#else ++#include ++#include ++#endif ++ ++#include + -+#include +#include ++#include ++#include ++#include ++#include + -+#include + -+/* Forward definition - see mali_kbase.h */ -+struct kbase_device; ++#include "mali_kbase_fence_defs.h" + -+/* Functions common to all HW access backends */ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++#include ++#endif /* CONFIG_DEBUG_FS */ ++ ++#ifdef CONFIG_MALI_BIFROST_DEVFREQ ++#include ++#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ ++ ++#if IS_ENABLED(CONFIG_DEVFREQ_THERMAL) ++#include ++#endif ++ ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++#include ++#endif /* CONFIG_MALI_ARBITER_SUPPORT */ ++ ++#include ++#include ++#include ++#include ++ ++#include "debug/mali_kbase_debug_ktrace_defs.h" ++ ++/** Number of milliseconds before we time out on a GPU soft/hard reset */ ++#define RESET_TIMEOUT 500 + +/** -+ * Initialize the power management framework. -+ * -+ * Must be called before any other power management function -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * BASE_JM_MAX_NR_SLOTS - The maximum number of Job Slots to support in the Hardware. + * -+ * Return: 0 if the power management framework was successfully initialized. ++ * You can optimize this down if your target devices will only ever support a ++ * small number of job slots. + */ -+int kbase_hwaccess_pm_init(struct kbase_device *kbdev); ++#define BASE_JM_MAX_NR_SLOTS 3 + +/** -+ * Terminate the power management framework. -+ * -+ * No power management functions may be called after this ++ * BASE_MAX_NR_AS - The maximum number of Address Spaces to support in the Hardware. + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * You can optimize this down if your target devices will only ever support a ++ * small number of Address Spaces + */ -+void kbase_hwaccess_pm_term(struct kbase_device *kbdev); ++#define BASE_MAX_NR_AS 16 ++ ++/* mmu */ ++#define MIDGARD_MMU_LEVEL(x) (x) ++ ++#define MIDGARD_MMU_TOPLEVEL MIDGARD_MMU_LEVEL(0) ++ ++#define MIDGARD_MMU_BOTTOMLEVEL MIDGARD_MMU_LEVEL(3) ++ ++#define GROWABLE_FLAGS_REQUIRED (KBASE_REG_PF_GROW | KBASE_REG_GPU_WR) ++ ++/** setting in kbase_context::as_nr that indicates it's invalid */ ++#define KBASEP_AS_NR_INVALID (-1) + +/** -+ * kbase_hwaccess_pm_powerup - Power up the GPU. -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * @flags: Flags to pass on to kbase_pm_init_hw -+ * -+ * Power up GPU after all modules have been initialized and interrupt handlers -+ * installed. -+ * -+ * Return: 0 if powerup was successful. ++ * KBASE_LOCK_REGION_MAX_SIZE_LOG2 - Maximum size in bytes of a MMU lock region, ++ * as a logarithm + */ -+int kbase_hwaccess_pm_powerup(struct kbase_device *kbdev, -+ unsigned int flags); ++#define KBASE_LOCK_REGION_MAX_SIZE_LOG2 (48) /* 256 TB */ + +/** -+ * Halt the power management framework. -+ * -+ * Should ensure that no new interrupts are generated, but allow any currently -+ * running interrupt handlers to complete successfully. The GPU is forced off by -+ * the time this function returns, regardless of whether or not the active power -+ * policy asks for the GPU to be powered off. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) ++ * KBASE_REG_ZONE_MAX - Maximum number of GPU memory region zones + */ -+void kbase_hwaccess_pm_halt(struct kbase_device *kbdev); ++#if MALI_USE_CSF ++#define KBASE_REG_ZONE_MAX 6ul ++#else ++#define KBASE_REG_ZONE_MAX 4ul ++#endif + -+/** -+ * Perform any backend-specific actions to suspend the GPU -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) ++#include "mali_kbase_hwaccess_defs.h" ++ ++/* Maximum number of pages of memory that require a permanent mapping, per ++ * kbase_context + */ -+void kbase_hwaccess_pm_suspend(struct kbase_device *kbdev); ++#define KBASE_PERMANENTLY_MAPPED_MEM_LIMIT_PAGES ((64 * 1024ul * 1024ul) >> PAGE_SHIFT) ++/* Minimum threshold period for hwcnt dumps between different hwcnt virtualizer ++ * clients, to reduce undesired system load. ++ * If a virtualizer client requests a dump within this threshold period after ++ * some other client has performed a dump, a new dump won't be performed and ++ * the accumulated counter values for that client will be returned instead. ++ */ ++#define KBASE_HWCNT_GPU_VIRTUALIZER_DUMP_THRESHOLD_NS (200 * NSEC_PER_USEC) + -+/** -+ * Perform any backend-specific actions to resume the GPU from a suspend -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) ++#if MALI_USE_CSF ++/* The buffer count of CSF hwcnt backend ring buffer, which is used when CSF ++ * hwcnt backend allocate the ring buffer to communicate with CSF firmware for ++ * HWC dump samples. ++ * To meet the hardware requirement, this number MUST be power of 2, otherwise, ++ * CSF hwcnt backend creation will be failed. + */ -+void kbase_hwaccess_pm_resume(struct kbase_device *kbdev); ++#define KBASE_HWCNT_BACKEND_CSF_RING_BUFFER_COUNT (128) ++#endif ++ ++/* Maximum number of clock/regulator pairs that may be referenced by ++ * the device node. ++ * This is dependent on support for of_property_read_u64_array() in the ++ * kernel. ++ * While, the number of clocks could be more than regulators, ++ * as mentioned in power_control_init(). ++ */ ++#define BASE_MAX_NR_CLOCKS_REGULATORS (4) ++ ++/* Forward declarations */ ++struct kbase_context; ++struct kbase_device; ++struct kbase_as; ++struct kbase_mmu_setup; ++struct kbase_kinstr_jm; + +/** -+ * Perform any required actions for activating the GPU. Called when the first -+ * context goes active. ++ * struct kbase_io_access - holds information about 1 register access + * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) ++ * @addr: first bit indicates r/w (r=0, w=1) ++ * @value: value written or read + */ -+void kbase_hwaccess_pm_gpu_active(struct kbase_device *kbdev); ++struct kbase_io_access { ++ uintptr_t addr; ++ u32 value; ++}; + +/** -+ * Perform any required actions for idling the GPU. Called when the last -+ * context goes idle. ++ * struct kbase_io_history - keeps track of all recent register accesses + * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) ++ * @enabled: true if register accesses are recorded, false otherwise ++ * @lock: spinlock protecting kbase_io_access array ++ * @count: number of registers read/written ++ * @size: number of elements in kbase_io_access array ++ * @buf: array of kbase_io_access + */ -+void kbase_hwaccess_pm_gpu_idle(struct kbase_device *kbdev); ++struct kbase_io_history { ++ bool enabled; + ++ spinlock_t lock; ++ size_t count; ++ u16 size; ++ struct kbase_io_access *buf; ++}; + +/** -+ * Set the debug core mask. -+ * -+ * This determines which cores the power manager is allowed to use. ++ * struct kbase_debug_copy_buffer - information about the buffer to be copied. + * -+ * @param kbdev The kbase device structure for the device (must be a -+ * valid pointer) -+ * @param new_core_mask_js0 The core mask to use for job slot 0 -+ * @param new_core_mask_js0 The core mask to use for job slot 1 -+ * @param new_core_mask_js0 The core mask to use for job slot 2 ++ * @size: size of the buffer in bytes ++ * @pages: pointer to an array of pointers to the pages which contain ++ * the buffer ++ * @is_vmalloc: true if @pages was allocated with vzalloc. false if @pages was ++ * allocated with kcalloc ++ * @nr_pages: number of pages ++ * @offset: offset into the pages ++ * @gpu_alloc: pointer to physical memory allocated by the GPU ++ * @extres_pages: array of pointers to the pages containing external resources ++ * for this buffer ++ * @nr_extres_pages: number of pages in @extres_pages + */ -+void kbase_pm_set_debug_core_mask(struct kbase_device *kbdev, -+ u64 new_core_mask_js0, u64 new_core_mask_js1, -+ u64 new_core_mask_js2); ++struct kbase_debug_copy_buffer { ++ size_t size; ++ struct page **pages; ++ bool is_vmalloc; ++ int nr_pages; ++ size_t offset; ++ struct kbase_mem_phy_alloc *gpu_alloc; ++ ++ struct page **extres_pages; ++ int nr_extres_pages; ++}; ++ ++struct kbase_device_info { ++ u32 features; ++}; + ++struct kbase_mmu_setup { ++ u64 transtab; ++ u64 memattr; ++ u64 transcfg; ++}; + +/** -+ * Get the current policy. -+ * -+ * Returns the policy that is currently active. ++ * struct kbase_fault - object containing data relating to a page or bus fault. ++ * @addr: Records the faulting address. ++ * @extra_addr: Records the secondary fault address. ++ * @status: Records the fault status as reported by Hw. ++ * @protected_mode: Flag indicating whether the fault occurred in protected mode ++ * or not. ++ */ ++struct kbase_fault { ++ u64 addr; ++ u64 extra_addr; ++ u32 status; ++ bool protected_mode; ++}; ++ ++/** Maximum number of memory pages that should be allocated for the array ++ * of pointers to free PGDs. + * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) ++ * This number has been pre-calculated to deal with the maximum allocation ++ * size expressed by the default value of KBASE_MEM_ALLOC_MAX_SIZE. ++ * This is supposed to be enough for almost the entirety of MMU operations. ++ * Any size greater than KBASE_MEM_ALLOC_MAX_SIZE requires being broken down ++ * into multiple iterations, each dealing with at most KBASE_MEM_ALLOC_MAX_SIZE ++ * bytes. + * -+ * @return The current policy ++ * Please update this value if KBASE_MEM_ALLOC_MAX_SIZE changes. + */ -+const struct kbase_pm_ca_policy -+*kbase_pm_ca_get_policy(struct kbase_device *kbdev); ++#define MAX_PAGES_FOR_FREE_PGDS ((size_t)9) ++ ++/* Maximum number of pointers to free PGDs */ ++#define MAX_FREE_PGDS ((PAGE_SIZE / sizeof(struct page *)) * MAX_PAGES_FOR_FREE_PGDS) + +/** -+ * Change the policy to the one specified. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) -+ * @param policy The policy to change to (valid pointer returned from -+ * @ref kbase_pm_ca_list_policies) ++ * struct kbase_mmu_table - object representing a set of GPU page tables ++ * @mmu_lock: Lock to serialize the accesses made to multi level GPU ++ * page tables ++ * @pgd: Physical address of the page allocated for the top ++ * level page table of the context, this is used for ++ * MMU HW programming as the address translation will ++ * start from the top level page table. ++ * @group_id: A memory group ID to be passed to a platform-specific ++ * memory group manager. ++ * Valid range is 0..(MEMORY_GROUP_MANAGER_NR_GROUPS-1). ++ * @kctx: If this set of MMU tables belongs to a context then ++ * this is a back-reference to the context, otherwise ++ * it is NULL. ++ * @scratch_mem: Scratch memory used for MMU operations, which are ++ * serialized by the @mmu_lock. + */ -+void kbase_pm_ca_set_policy(struct kbase_device *kbdev, -+ const struct kbase_pm_ca_policy *policy); ++struct kbase_mmu_table { ++ struct mutex mmu_lock; ++ phys_addr_t pgd; ++ u8 group_id; ++ struct kbase_context *kctx; ++ union { ++ /** ++ * @teardown_pages: Scratch memory used for backup copies of whole ++ * PGD pages when tearing down levels upon ++ * termination of the MMU table. ++ */ ++ struct { ++ /** ++ * @levels: Array of PGD pages, large enough to copy one PGD ++ * for each level of the MMU table. ++ */ ++ u64 levels[MIDGARD_MMU_BOTTOMLEVEL][PAGE_SIZE / sizeof(u64)]; ++ } teardown_pages; ++ /** ++ * @free_pgds: Scratch memory user for insertion, update and teardown ++ * operations to store a temporary list of PGDs to be freed ++ * at the end of the operation. ++ */ ++ struct { ++ /** @pgds: Array of pointers to PGDs to free. */ ++ struct page *pgds[MAX_FREE_PGDS]; ++ /** @head_index: Index of first free element in the PGDs array. */ ++ size_t head_index; ++ } free_pgds; ++ } scratch_mem; ++}; + +/** -+ * Retrieve a static list of the available policies. -+ * -+ * @param[out] policies An array pointer to take the list of policies. This may -+ * be NULL. The contents of this array must not be -+ * modified. ++ * struct kbase_reg_zone - Information about GPU memory region zones ++ * @base_pfn: Page Frame Number in GPU virtual address space for the start of ++ * the Zone ++ * @va_size_pages: Size of the Zone in pages + * -+ * @return The number of policies ++ * Track information about a zone KBASE_REG_ZONE() and related macros. ++ * In future, this could also store the &rb_root that are currently in ++ * &kbase_context and &kbase_csf_device. + */ -+int -+kbase_pm_ca_list_policies(const struct kbase_pm_ca_policy * const **policies); ++struct kbase_reg_zone { ++ u64 base_pfn; ++ u64 va_size_pages; ++}; + ++#if MALI_USE_CSF ++#include "csf/mali_kbase_csf_defs.h" ++#else ++#include "jm/mali_kbase_jm_defs.h" ++#endif + -+/** -+ * Get the current policy. -+ * -+ * Returns the policy that is currently active. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) -+ * -+ * @return The current policy -+ */ -+const struct kbase_pm_policy *kbase_pm_get_policy(struct kbase_device *kbdev); ++#include "mali_kbase_hwaccess_time.h" ++ ++static inline int kbase_as_has_bus_fault(struct kbase_as *as, ++ struct kbase_fault *fault) ++{ ++ return (fault == &as->bf_data); ++} ++ ++static inline int kbase_as_has_page_fault(struct kbase_as *as, ++ struct kbase_fault *fault) ++{ ++ return (fault == &as->pf_data); ++} + +/** -+ * Change the policy to the one specified. ++ * struct kbasep_mem_device - Data stored per device for memory allocation + * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) -+ * @param policy The policy to change to (valid pointer returned from -+ * @ref kbase_pm_list_policies) ++ * @used_pages: Tracks usage of OS shared memory. Updated when OS memory is ++ * allocated/freed. ++ * @ir_threshold: Fraction of the maximum size of an allocation that grows ++ * on GPU page fault that can be used before the driver ++ * switches to incremental rendering, in 1/256ths. ++ * 0 means disabled. + */ -+void kbase_pm_set_policy(struct kbase_device *kbdev, -+ const struct kbase_pm_policy *policy); ++struct kbasep_mem_device { ++ atomic_t used_pages; ++ atomic_t ir_threshold; ++}; ++ ++struct kbase_clk_rate_listener; + +/** -+ * kbase_pm_list_policies - Retrieve a static list of the available policies. ++ * typedef kbase_clk_rate_listener_on_change_t() - Frequency change callback + * -+ * @kbdev: The kbase device structure for the device. -+ * @list: An array pointer to take the list of policies. This may be NULL. -+ * The contents of this array must not be modified. ++ * @listener: Clock frequency change listener. ++ * @clk_index: Index of the clock for which the change has occurred. ++ * @clk_rate_hz: Clock frequency(Hz). + * -+ * Return: The number of policies ++ * A callback to call when clock rate changes. The function must not ++ * sleep. No clock rate manager functions must be called from here, as ++ * its lock is taken. + */ -+int kbase_pm_list_policies(struct kbase_device *kbdev, -+ const struct kbase_pm_policy * const **list); ++typedef void ++kbase_clk_rate_listener_on_change_t(struct kbase_clk_rate_listener *listener, ++ u32 clk_index, u32 clk_rate_hz); + +/** -+ * kbase_protected_most_enable - Enable protected mode -+ * -+ * @kbdev: Address of the instance of a GPU platform device. ++ * struct kbase_clk_rate_listener - Clock frequency listener + * -+ * Return: Zero on success or an error code ++ * @node: List node. ++ * @notify: Callback to be called when GPU frequency changes. + */ -+int kbase_pm_protected_mode_enable(struct kbase_device *kbdev); ++struct kbase_clk_rate_listener { ++ struct list_head node; ++ kbase_clk_rate_listener_on_change_t *notify; ++}; + +/** -+ * kbase_protected_mode_disable - Disable protected mode -+ * -+ * @kbdev: Address of the instance of a GPU platform device. ++ * struct kbase_clk_rate_trace_manager - Data stored per device for GPU clock ++ * rate trace manager. + * -+ * Return: Zero on success or an error code ++ * @gpu_idle: Tracks the idle state of GPU. ++ * @clks: Array of pointer to structures storing data for every ++ * enumerated GPU clock. ++ * @clk_rate_trace_ops: Pointer to the platform specific GPU clock rate trace ++ * operations. ++ * @listeners: List of listener attached. ++ * @lock: Lock to serialize the actions of GPU clock rate trace ++ * manager. + */ -+int kbase_pm_protected_mode_disable(struct kbase_device *kbdev); ++struct kbase_clk_rate_trace_manager { ++ bool gpu_idle; ++ struct kbase_clk_data *clks[BASE_MAX_NR_CLOCKS_REGULATORS]; ++ struct kbase_clk_rate_trace_op_conf *clk_rate_trace_ops; ++ struct list_head listeners; ++ spinlock_t lock; ++}; + -+#endif /* _KBASE_HWACCESS_PM_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h -new file mode 100755 -index 000000000000..94b7551b865e ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h -@@ -0,0 +1,56 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014,2018-2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * ++/** ++ * struct kbase_pm_device_data - Data stored per device for power management. ++ * @lock: The lock protecting Power Management structures accessed ++ * outside of IRQ. ++ * This lock must also be held whenever the GPU is being ++ * powered on or off. ++ * @active_count: The reference count of active contexts on this device. ++ * Note that some code paths keep shaders/the tiler ++ * powered whilst this is 0. ++ * Use kbase_pm_is_active() instead to check for such cases. ++ * @suspending: Flag indicating suspending/suspended ++ * @runtime_active: Flag to track if the GPU is in runtime suspended or active ++ * state. This ensures that runtime_put and runtime_get ++ * functions are called in pairs. For example if runtime_get ++ * has already been called from the power_on callback, then ++ * the call to it from runtime_gpu_active callback can be ++ * skipped. ++ * @gpu_lost: Flag indicating gpu lost ++ * This structure contains data for the power management framework. ++ * There is one instance of this structure per device in the system. ++ * @zero_active_count_wait: Wait queue set when active_count == 0 ++ * @resume_wait: system resume of GPU device. ++ * @debug_core_mask: Bit masks identifying the available shader cores that are ++ * specified via sysfs. One mask per job slot. ++ * @debug_core_mask_all: Bit masks identifying the available shader cores that ++ * are specified via sysfs. ++ * @callback_power_runtime_init: Callback for initializing the runtime power ++ * management. Return 0 on success, else error code ++ * @callback_power_runtime_term: Callback for terminating the runtime power ++ * management. ++ * @dvfs_period: Time in milliseconds between each dvfs sample ++ * @backend: KBase PM backend data ++ * @arb_vm_state: The state of the arbiter VM machine ++ * @gpu_users_waiting: Used by virtualization to notify the arbiter that there ++ * are users waiting for the GPU so that it can request ++ * and resume the driver. ++ * @clk_rtm: The state of the GPU clock rate trace manager + */ ++struct kbase_pm_device_data { ++ struct mutex lock; ++ int active_count; ++ bool suspending; ++#if MALI_USE_CSF ++ bool runtime_active; ++#endif ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ atomic_t gpu_lost; ++#endif /* CONFIG_MALI_ARBITER_SUPPORT */ ++ wait_queue_head_t zero_active_count_wait; ++ wait_queue_head_t resume_wait; ++ ++#if MALI_USE_CSF ++ u64 debug_core_mask; ++#else ++ /* One mask per job slot. */ ++ u64 debug_core_mask[BASE_JM_MAX_NR_SLOTS]; ++ u64 debug_core_mask_all; ++#endif /* MALI_USE_CSF */ + ++ int (*callback_power_runtime_init)(struct kbase_device *kbdev); ++ void (*callback_power_runtime_term)(struct kbase_device *kbdev); ++ u32 dvfs_period; ++ struct kbase_pm_backend_data backend; ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ struct kbase_arbiter_vm_state *arb_vm_state; ++ atomic_t gpu_users_waiting; ++#endif /* CONFIG_MALI_ARBITER_SUPPORT */ ++ struct kbase_clk_rate_trace_manager clk_rtm; ++}; + +/** -+ * ++ * struct kbase_mem_pool - Page based memory pool for kctx/kbdev ++ * @kbdev: Kbase device where memory is used ++ * @cur_size: Number of free pages currently in the pool (may exceed ++ * @max_size in some corner cases) ++ * @max_size: Maximum number of free pages in the pool ++ * @order: order = 0 refers to a pool of 4 KB pages ++ * order = 9 refers to a pool of 2 MB pages (2^9 * 4KB = 2 MB) ++ * @group_id: A memory group ID to be passed to a platform-specific ++ * memory group manager, if present. Immutable. ++ * Valid range is 0..(MEMORY_GROUP_MANAGER_NR_GROUPS-1). ++ * @pool_lock: Lock protecting the pool - must be held when modifying ++ * @cur_size and @page_list ++ * @page_list: List of free pages in the pool ++ * @reclaim: Shrinker for kernel reclaim of free pages ++ * @isolation_in_progress_cnt: Number of pages in pool undergoing page isolation. ++ * This is used to avoid race condition between pool termination ++ * and page isolation for page migration. ++ * @next_pool: Pointer to next pool where pages can be allocated when this ++ * pool is empty. Pages will spill over to the next pool when ++ * this pool is full. Can be NULL if there is no next pool. ++ * @dying: true if the pool is being terminated, and any ongoing ++ * operations should be abandoned ++ * @dont_reclaim: true if the shrinker is forbidden from reclaiming memory from ++ * this pool, eg during a grow operation + */ ++struct kbase_mem_pool { ++ struct kbase_device *kbdev; ++ size_t cur_size; ++ size_t max_size; ++ u8 order; ++ u8 group_id; ++ spinlock_t pool_lock; ++ struct list_head page_list; ++ struct shrinker reclaim; ++ atomic_t isolation_in_progress_cnt; + -+#ifndef _KBASE_BACKEND_TIME_H_ -+#define _KBASE_BACKEND_TIME_H_ ++ struct kbase_mem_pool *next_pool; ++ ++ bool dying; ++ bool dont_reclaim; ++}; + +/** -+ * kbase_backend_get_gpu_time() - Get current GPU time -+ * @kbdev: Device pointer -+ * @cycle_counter: Pointer to u64 to store cycle counter in -+ * @system_time: Pointer to u64 to store system time in -+ * @ts: Pointer to struct timespec to store current monotonic -+ * time in ++ * struct kbase_mem_pool_group - a complete set of physical memory pools. ++ * ++ * @small: Array of objects containing the state for pools of 4 KiB size ++ * physical pages. ++ * @large: Array of objects containing the state for pools of 2 MiB size ++ * physical pages. ++ * ++ * Memory pools are used to allow efficient reallocation of previously-freed ++ * physical pages. A pair of memory pools is initialized for each physical ++ * memory group: one for 4 KiB pages and one for 2 MiB pages. These arrays ++ * should be indexed by physical memory group ID, the meaning of which is ++ * defined by the systems integrator. + */ -+void kbase_backend_get_gpu_time(struct kbase_device *kbdev, u64 *cycle_counter, -+ u64 *system_time, struct timespec64 *ts); ++struct kbase_mem_pool_group { ++ struct kbase_mem_pool small[MEMORY_GROUP_MANAGER_NR_GROUPS]; ++ struct kbase_mem_pool large[MEMORY_GROUP_MANAGER_NR_GROUPS]; ++}; + +/** -+ * kbase_backend_get_gpu_time_norequest() - Get current GPU time without -+ * request/release cycle counter -+ * @kbdev: Device pointer -+ * @cycle_counter: Pointer to u64 to store cycle counter in -+ * @system_time: Pointer to u64 to store system time in -+ * @ts: Pointer to struct timespec to store current monotonic -+ * time in ++ * struct kbase_mem_pool_config - Initial configuration for a physical memory ++ * pool ++ * ++ * @max_size: Maximum number of free pages that the pool can hold. + */ -+void kbase_backend_get_gpu_time_norequest(struct kbase_device *kbdev, -+ u64 *cycle_counter, -+ u64 *system_time, -+ struct timespec64 *ts); ++struct kbase_mem_pool_config { ++ size_t max_size; ++}; + -+#endif /* _KBASE_BACKEND_TIME_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt.c b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt.c -new file mode 100755 -index 000000000000..2708af78b292 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt.c -@@ -0,0 +1,794 @@ -+/* -+ * -+ * (C) COPYRIGHT 2018, 2020 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. ++/** ++ * struct kbase_mem_pool_group_config - Initial configuration for a complete ++ * set of physical memory pools + * -+ * SPDX-License-Identifier: GPL-2.0 ++ * @small: Array of initial configuration for pools of 4 KiB pages. ++ * @large: Array of initial configuration for pools of 2 MiB pages. + * ++ * This array should be indexed by physical memory group ID, the meaning ++ * of which is defined by the systems integrator. + */ ++struct kbase_mem_pool_group_config { ++ struct kbase_mem_pool_config small[MEMORY_GROUP_MANAGER_NR_GROUPS]; ++ struct kbase_mem_pool_config large[MEMORY_GROUP_MANAGER_NR_GROUPS]; ++}; + -+/* -+ * Implementation of hardware counter context and accumulator APIs. ++/** ++ * struct kbase_devfreq_opp - Lookup table for converting between nominal OPP ++ * frequency, real frequencies and core mask ++ * @real_freqs: Real GPU frequencies. ++ * @opp_volts: OPP voltages. ++ * @opp_freq: Nominal OPP frequency ++ * @core_mask: Shader core mask + */ ++struct kbase_devfreq_opp { ++ u64 opp_freq; ++ u64 core_mask; ++ u64 real_freqs[BASE_MAX_NR_CLOCKS_REGULATORS]; ++ u32 opp_volts[BASE_MAX_NR_CLOCKS_REGULATORS]; ++}; + -+#include "mali_kbase_hwcnt_context.h" -+#include "mali_kbase_hwcnt_accumulator.h" -+#include "mali_kbase_hwcnt_backend.h" -+#include "mali_kbase_hwcnt_types.h" -+#include "mali_malisw.h" -+#include "mali_kbase_debug.h" -+#include "mali_kbase_linux.h" -+ -+#include -+#include -+#include ++/* MMU mode flags */ ++#define KBASE_MMU_MODE_HAS_NON_CACHEABLE (1ul << 0) /* Has NON_CACHEABLE MEMATTR */ + +/** -+ * enum kbase_hwcnt_accum_state - Hardware counter accumulator states. -+ * @ACCUM_STATE_ERROR: Error state, where all accumulator operations fail. -+ * @ACCUM_STATE_DISABLED: Disabled state, where dumping is always disabled. -+ * @ACCUM_STATE_ENABLED: Enabled state, where dumping is enabled if there are -+ * any enabled counters. ++ * struct kbase_mmu_mode - object containing pointer to methods invoked for ++ * programming the MMU, as per the MMU mode supported ++ * by Hw. ++ * @update: enable & setup/configure one of the GPU address space. ++ * @get_as_setup: retrieve the configuration of one of the GPU address space. ++ * @disable_as: disable one of the GPU address space. ++ * @pte_to_phy_addr: retrieve the physical address encoded in the page table entry. ++ * @ate_is_valid: check if the pte is a valid address translation entry ++ * encoding the physical address of the actual mapped page. ++ * @pte_is_valid: check if the pte is a valid entry encoding the physical ++ * address of the next lower level page table. ++ * @entry_set_ate: program the pte to be a valid address translation entry to ++ * encode the physical address of the actual page being mapped. ++ * @entry_set_pte: program the pte to be a valid entry to encode the physical ++ * address of the next lower level page table and also update ++ * the number of valid entries. ++ * @entries_invalidate: clear out or invalidate a range of ptes. ++ * @get_num_valid_entries: returns the number of valid entries for a specific pgd. ++ * @set_num_valid_entries: sets the number of valid entries for a specific pgd ++ * @flags: bitmask of MMU mode flags. Refer to KBASE_MMU_MODE_ constants. + */ -+enum kbase_hwcnt_accum_state { -+ ACCUM_STATE_ERROR, -+ ACCUM_STATE_DISABLED, -+ ACCUM_STATE_ENABLED ++struct kbase_mmu_mode { ++ void (*update)(struct kbase_device *kbdev, ++ struct kbase_mmu_table *mmut, ++ int as_nr); ++ void (*get_as_setup)(struct kbase_mmu_table *mmut, ++ struct kbase_mmu_setup * const setup); ++ void (*disable_as)(struct kbase_device *kbdev, int as_nr); ++ phys_addr_t (*pte_to_phy_addr)(u64 entry); ++ int (*ate_is_valid)(u64 ate, int level); ++ int (*pte_is_valid)(u64 pte, int level); ++ void (*entry_set_ate)(u64 *entry, struct tagged_addr phy, ++ unsigned long flags, int level); ++ void (*entry_set_pte)(u64 *entry, phys_addr_t phy); ++ void (*entries_invalidate)(u64 *entry, u32 count); ++ unsigned int (*get_num_valid_entries)(u64 *pgd); ++ void (*set_num_valid_entries)(u64 *pgd, ++ unsigned int num_of_valid_entries); ++ unsigned long flags; +}; + ++struct kbase_mmu_mode const *kbase_mmu_mode_get_aarch64(void); ++ ++#define DEVNAME_SIZE 16 ++ +/** -+ * struct kbase_hwcnt_accumulator - Hardware counter accumulator structure. -+ * @backend: Pointer to created counter backend. -+ * @state: The current state of the accumulator. -+ * - State transition from disabled->enabled or -+ * disabled->error requires state_lock. -+ * - State transition from enabled->disabled or -+ * enabled->error requires both accum_lock and -+ * state_lock. -+ * - Error state persists until next disable. -+ * @enable_map: The current set of enabled counters. -+ * - Must only be modified while holding both -+ * accum_lock and state_lock. -+ * - Can be read while holding either lock. -+ * - Must stay in sync with enable_map_any_enabled. -+ * @enable_map_any_enabled: True if any counters in the map are enabled, else -+ * false. If true, and state is ACCUM_STATE_ENABLED, -+ * then the counter backend will be enabled. -+ * - Must only be modified while holding both -+ * accum_lock and state_lock. -+ * - Can be read while holding either lock. -+ * - Must stay in sync with enable_map. -+ * @scratch_map: Scratch enable map, used as temporary enable map -+ * storage during dumps. -+ * - Must only be read or modified while holding -+ * accum_lock. -+ * @accum_buf: Accumulation buffer, where dumps will be accumulated -+ * into on transition to a disable state. -+ * - Must only be read or modified while holding -+ * accum_lock. -+ * @accumulated: True if the accumulation buffer has been accumulated -+ * into and not subsequently read from yet, else false. -+ * - Must only be read or modified while holding -+ * accum_lock. -+ * @ts_last_dump_ns: Timestamp (ns) of the end time of the most recent -+ * dump that was requested by the user. -+ * - Must only be read or modified while holding -+ * accum_lock. ++ * enum kbase_devfreq_work_type - The type of work to perform in the devfreq ++ * suspend/resume worker. ++ * @DEVFREQ_WORK_NONE: Initilisation state. ++ * @DEVFREQ_WORK_SUSPEND: Call devfreq_suspend_device(). ++ * @DEVFREQ_WORK_RESUME: Call devfreq_resume_device(). + */ -+struct kbase_hwcnt_accumulator { -+ struct kbase_hwcnt_backend *backend; -+ enum kbase_hwcnt_accum_state state; -+ struct kbase_hwcnt_enable_map enable_map; -+ bool enable_map_any_enabled; -+ struct kbase_hwcnt_enable_map scratch_map; -+ struct kbase_hwcnt_dump_buffer accum_buf; -+ bool accumulated; -+ u64 ts_last_dump_ns; ++enum kbase_devfreq_work_type { ++ DEVFREQ_WORK_NONE, ++ DEVFREQ_WORK_SUSPEND, ++ DEVFREQ_WORK_RESUME +}; + +/** -+ * struct kbase_hwcnt_context - Hardware counter context structure. -+ * @iface: Pointer to hardware counter backend interface. -+ * @state_lock: Spinlock protecting state. -+ * @disable_count: Disable count of the context. Initialised to 1. -+ * Decremented when the accumulator is acquired, and incremented -+ * on release. Incremented on calls to -+ * kbase_hwcnt_context_disable[_atomic], and decremented on -+ * calls to kbase_hwcnt_context_enable. -+ * - Must only be read or modified while holding state_lock. -+ * @accum_lock: Mutex protecting accumulator. -+ * @accum_inited: Flag to prevent concurrent accumulator initialisation and/or -+ * termination. Set to true before accumulator initialisation, -+ * and false after accumulator termination. -+ * - Must only be modified while holding both accum_lock and -+ * state_lock. -+ * - Can be read while holding either lock. -+ * @accum: Hardware counter accumulator structure. ++ * struct kbase_devfreq_queue_info - Object representing an instance for managing ++ * the queued devfreq suspend/resume works. ++ * @workq: Workqueue for devfreq suspend/resume requests ++ * @work: Work item for devfreq suspend & resume ++ * @req_type: Requested work type to be performed by the devfreq ++ * suspend/resume worker ++ * @acted_type: Work type has been acted on by the worker, i.e. the ++ * internal recorded state of the suspend/resume + */ -+struct kbase_hwcnt_context { -+ const struct kbase_hwcnt_backend_interface *iface; -+ spinlock_t state_lock; -+ size_t disable_count; -+ struct mutex accum_lock; -+ bool accum_inited; -+ struct kbase_hwcnt_accumulator accum; ++struct kbase_devfreq_queue_info { ++ struct workqueue_struct *workq; ++ struct work_struct work; ++ enum kbase_devfreq_work_type req_type; ++ enum kbase_devfreq_work_type acted_type; +}; + -+int kbase_hwcnt_context_init( -+ const struct kbase_hwcnt_backend_interface *iface, -+ struct kbase_hwcnt_context **out_hctx) -+{ -+ struct kbase_hwcnt_context *hctx = NULL; -+ -+ if (!iface || !out_hctx) -+ return -EINVAL; -+ -+ hctx = kzalloc(sizeof(*hctx), GFP_KERNEL); -+ if (!hctx) -+ return -ENOMEM; -+ -+ hctx->iface = iface; -+ spin_lock_init(&hctx->state_lock); -+ hctx->disable_count = 1; -+ mutex_init(&hctx->accum_lock); -+ hctx->accum_inited = false; -+ -+ *out_hctx = hctx; -+ -+ return 0; -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_context_init); -+ -+void kbase_hwcnt_context_term(struct kbase_hwcnt_context *hctx) -+{ -+ if (!hctx) -+ return; -+ -+ /* Make sure we didn't leak the accumulator */ -+ WARN_ON(hctx->accum_inited); -+ kfree(hctx); -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_context_term); -+ +/** -+ * kbasep_hwcnt_accumulator_term() - Terminate the accumulator for the context. -+ * @hctx: Non-NULL pointer to hardware counter context. ++ * struct kbase_process - Representing an object of a kbase process instantiated ++ * when the first kbase context is created under it. ++ * @tgid: Thread group ID. ++ * @total_gpu_pages: Total gpu pages allocated across all the contexts ++ * of this process, it accounts for both native allocations ++ * and dma_buf imported allocations. ++ * @kctx_list: List of kbase contexts created for the process. ++ * @kprcs_node: Node to a rb_tree, kbase_device will maintain a rb_tree ++ * based on key tgid, kprcs_node is the node link to ++ * &struct_kbase_device.process_root. ++ * @dma_buf_root: RB tree of the dma-buf imported allocations, imported ++ * across all the contexts created for this process. ++ * Used to ensure that pages of allocation are accounted ++ * only once for the process, even if the allocation gets ++ * imported multiple times for the process. + */ -+static void kbasep_hwcnt_accumulator_term(struct kbase_hwcnt_context *hctx) -+{ -+ WARN_ON(!hctx); -+ WARN_ON(!hctx->accum_inited); ++struct kbase_process { ++ pid_t tgid; ++ size_t total_gpu_pages; ++ struct list_head kctx_list; + -+ kbase_hwcnt_enable_map_free(&hctx->accum.scratch_map); -+ kbase_hwcnt_dump_buffer_free(&hctx->accum.accum_buf); -+ kbase_hwcnt_enable_map_free(&hctx->accum.enable_map); -+ hctx->iface->term(hctx->accum.backend); -+ memset(&hctx->accum, 0, sizeof(hctx->accum)); -+} ++ struct rb_node kprcs_node; ++ struct rb_root dma_buf_root; ++}; + +/** -+ * kbasep_hwcnt_accumulator_init() - Initialise the accumulator for the context. -+ * @hctx: Non-NULL pointer to hardware counter context. ++ * struct kbase_mem_migrate - Object representing an instance for managing ++ * page migration. + * -+ * Return: 0 on success, else error code. ++ * @free_pages_list: List of deferred pages to free. Mostly used when page migration ++ * is enabled. Pages in memory pool that require migrating ++ * will be freed instead. However page cannot be freed ++ * right away as Linux will need to release the page lock. ++ * Therefore page will be added to this list and freed later. ++ * @free_pages_lock: This lock should be held when adding or removing pages ++ * from @free_pages_list. ++ * @free_pages_workq: Work queue to process the work items queued to free ++ * pages in @free_pages_list. ++ * @free_pages_work: Work item to free pages in @free_pages_list. ++ * @inode: Pointer to inode whose address space operations are used ++ * for page migration purposes. + */ -+static int kbasep_hwcnt_accumulator_init(struct kbase_hwcnt_context *hctx) -+{ -+ int errcode; -+ -+ WARN_ON(!hctx); -+ WARN_ON(!hctx->accum_inited); -+ -+ errcode = hctx->iface->init( -+ hctx->iface->info, &hctx->accum.backend); -+ if (errcode) -+ goto error; -+ -+ hctx->accum.state = ACCUM_STATE_ERROR; -+ -+ errcode = kbase_hwcnt_enable_map_alloc( -+ hctx->iface->metadata, &hctx->accum.enable_map); -+ if (errcode) -+ goto error; -+ -+ hctx->accum.enable_map_any_enabled = false; -+ -+ errcode = kbase_hwcnt_dump_buffer_alloc( -+ hctx->iface->metadata, &hctx->accum.accum_buf); -+ if (errcode) -+ goto error; -+ -+ errcode = kbase_hwcnt_enable_map_alloc( -+ hctx->iface->metadata, &hctx->accum.scratch_map); -+ if (errcode) -+ goto error; -+ -+ hctx->accum.accumulated = false; -+ -+ hctx->accum.ts_last_dump_ns = -+ hctx->iface->timestamp_ns(hctx->accum.backend); -+ -+ return 0; -+ -+error: -+ kbasep_hwcnt_accumulator_term(hctx); -+ return errcode; -+} ++struct kbase_mem_migrate { ++ struct list_head free_pages_list; ++ spinlock_t free_pages_lock; ++ struct workqueue_struct *free_pages_workq; ++ struct work_struct free_pages_work; ++#if (KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE) ++ struct inode *inode; ++#endif ++}; + +/** -+ * kbasep_hwcnt_accumulator_disable() - Transition the accumulator into the -+ * disabled state, from the enabled or -+ * error states. -+ * @hctx: Non-NULL pointer to hardware counter context. -+ * @accumulate: True if we should accumulate before disabling, else false. ++ * struct kbase_device - Object representing an instance of GPU platform device, ++ * allocated from the probe method of mali driver. ++ * @hw_quirks_sc: Configuration to be used for the shader cores as per ++ * the HW issues present in the GPU. ++ * @hw_quirks_tiler: Configuration to be used for the Tiler as per the HW ++ * issues present in the GPU. ++ * @hw_quirks_mmu: Configuration to be used for the MMU as per the HW ++ * issues present in the GPU. ++ * @hw_quirks_gpu: Configuration to be used for the Job Manager or CSF/MCU ++ * subsystems as per the HW issues present in the GPU. ++ * @entry: Links the device instance to the global list of GPU ++ * devices. The list would have as many entries as there ++ * are GPU device instances. ++ * @dev: Pointer to the kernel's generic/base representation ++ * of the GPU platform device. ++ * @mdev: Pointer to the miscellaneous device registered to ++ * provide Userspace access to kernel driver through the ++ * device file /dev/malixx. ++ * @reg_start: Base address of the region in physical address space ++ * where GPU registers have been mapped. ++ * @reg_size: Size of the region containing GPU registers ++ * @reg: Kernel virtual address of the region containing GPU ++ * registers, using which Driver will access the registers. ++ * @irqs: Array containing IRQ resource info for 3 types of ++ * interrupts : Job scheduling, MMU & GPU events (like ++ * power management, cache etc.) ++ * @irqs.irq: irq number ++ * @irqs.flags: irq flags ++ * @clocks: Pointer to the input clock resources referenced by ++ * the GPU device node. ++ * @scmi_clk: Pointer to the input scmi clock resources ++ * @nr_clocks: Number of clocks set in the clocks array. ++ * @regulators: Pointer to the structs corresponding to the ++ * regulators referenced by the GPU device node. ++ * @nr_regulators: Number of regulators set in the regulators array. ++ * @opp_table: Pointer to the device OPP structure maintaining the ++ * link to OPPs attached to a device. This is obtained ++ * after setting regulator names for the device. ++ * @token: Integer replacement for opp_table in kernel versions ++ * 6 and greater. Value is a token id number when 0 or greater, ++ * and a linux errno when negative. Must be initialised ++ * to an non-zero value as 0 is valid token id. ++ * @devname: string containing the name used for GPU device instance, ++ * miscellaneous device is registered using the same name. ++ * @id: Unique identifier for the device, indicates the number of ++ * devices which have been created so far. ++ * @model: Pointer, valid only when Driver is compiled to not access ++ * the real GPU Hw, to the dummy model which tries to mimic ++ * to some extent the state & behavior of GPU Hw in response ++ * to the register accesses made by the Driver. ++ * @irq_slab: slab cache for allocating the work items queued when ++ * model mimics raising of IRQ to cause an interrupt on CPU. ++ * @irq_workq: workqueue for processing the irq work items. ++ * @serving_job_irq: function to execute work items queued when model mimics ++ * the raising of JS irq, mimics the interrupt handler ++ * processing JS interrupts. ++ * @serving_gpu_irq: function to execute work items queued when model mimics ++ * the raising of GPU irq, mimics the interrupt handler ++ * processing GPU interrupts. ++ * @serving_mmu_irq: function to execute work items queued when model mimics ++ * the raising of MMU irq, mimics the interrupt handler ++ * processing MMU interrupts. ++ * @reg_op_lock: lock used by model to serialize the handling of register ++ * accesses made by the driver. ++ * @pm: Per device object for storing data for power management ++ * framework. ++ * @fw_load_lock: Mutex to protect firmware loading in @ref kbase_open. ++ * @csf: CSF object for the GPU device. ++ * @js_data: Per device object encapsulating the current context of ++ * Job Scheduler, which is global to the device and is not ++ * tied to any particular struct kbase_context running on ++ * the device ++ * @mem_pools: Global pools of free physical memory pages which can ++ * be used by all the contexts. ++ * @memdev: keeps track of the in use physical pages allocated by ++ * the Driver. ++ * @mmu_mode: Pointer to the object containing methods for programming ++ * the MMU, depending on the type of MMU supported by Hw. ++ * @mgm_dev: Pointer to the memory group manager device attached ++ * to the GPU device. This points to an internal memory ++ * group manager if no platform-specific memory group ++ * manager was retrieved through device tree. ++ * @as: Array of objects representing address spaces of GPU. ++ * @as_free: Bitpattern of free/available GPU address spaces. ++ * @as_to_kctx: Array of pointers to struct kbase_context, having ++ * GPU adrress spaces assigned to them. ++ * @mmu_mask_change: Lock to serialize the access to MMU interrupt mask ++ * register used in the handling of Bus & Page faults. ++ * @pagesize_2mb: Boolean to determine whether 2MiB page sizes are ++ * supported and used where possible. ++ * @gpu_props: Object containing complete information about the ++ * configuration/properties of GPU HW device in use. ++ * @hw_issues_mask: List of SW workarounds for HW issues ++ * @hw_features_mask: List of available HW features. ++ * @disjoint_event: struct for keeping track of the disjoint information, ++ * that whether the GPU is in a disjoint state and the ++ * number of disjoint events that have occurred on GPU. ++ * @disjoint_event.count: disjoint event count ++ * @disjoint_event.state: disjoint event state ++ * @nr_hw_address_spaces: Number of address spaces actually available in the ++ * GPU, remains constant after driver initialisation. ++ * @nr_user_address_spaces: Number of address spaces available to user contexts ++ * @hwcnt_backend_csf_if_fw: Firmware interface to access CSF GPU performance ++ * counters. ++ * @hwcnt: Structure used for instrumentation and HW counters ++ * dumping ++ * @hwcnt.lock: The lock should be used when accessing any of the ++ * following members ++ * @hwcnt.kctx: kbase context ++ * @hwcnt.addr: HW counter address ++ * @hwcnt.addr_bytes: HW counter size in bytes ++ * @hwcnt.backend: Kbase instrumentation backend ++ * @hwcnt_gpu_jm_backend: Job manager GPU backend interface, used as superclass reference ++ * pointer by hwcnt_gpu_iface, which wraps this implementation in ++ * order to extend it with periodic dumping functionality. ++ * @hwcnt_gpu_iface: Backend interface for GPU hardware counter access. ++ * @hwcnt_watchdog_timer: Watchdog interface, used by the GPU backend hwcnt_gpu_iface to ++ * perform periodic dumps in order to prevent hardware counter value ++ * overflow or saturation. ++ * @hwcnt_gpu_ctx: Context for GPU hardware counter access. ++ * @hwaccess_lock must be held when calling ++ * kbase_hwcnt_context_enable() with @hwcnt_gpu_ctx. ++ * @hwcnt_gpu_virt: Virtualizer for GPU hardware counters. ++ * @vinstr_ctx: vinstr context created per device. ++ * @kinstr_prfcnt_ctx: kinstr_prfcnt context created per device. ++ * @timeline_flags: Bitmask defining which sets of timeline tracepoints ++ * are enabled. If zero, there is no timeline client and ++ * therefore timeline is disabled. ++ * @timeline: Timeline context created per device. ++ * @ktrace: kbase device's ktrace ++ * @reset_timeout_ms: Number of milliseconds to wait for the soft stop to ++ * complete for the GPU jobs before proceeding with the ++ * GPU reset. ++ * @lowest_gpu_freq_khz: Lowest frequency in KHz that the GPU can run at. Used ++ * to calculate suitable timeouts for wait operations. ++ * @backend_time: Kbase backend time related attributes. ++ * @cache_clean_in_progress: Set when a cache clean has been started, and ++ * cleared when it has finished. This prevents multiple ++ * cache cleans being done simultaneously. ++ * @cache_clean_queued: Pended cache clean operations invoked while another is ++ * in progress. If this is not 0, another cache clean needs ++ * to be triggered immediately after completion of the ++ * current one. ++ * @cache_clean_wait: Signalled when a cache clean has finished. ++ * @platform_context: Platform specific private data to be accessed by ++ * platform specific config files only. ++ * @kctx_list: List of kbase_contexts created for the device, ++ * including any contexts that might be created for ++ * hardware counters. ++ * @kctx_list_lock: Lock protecting concurrent accesses to @kctx_list. ++ * @devfreq_profile: Describes devfreq profile for the Mali GPU device, passed ++ * to devfreq_add_device() to add devfreq feature to Mali ++ * GPU device. ++ * @devfreq: Pointer to devfreq structure for Mali GPU device, ++ * returned on the call to devfreq_add_device(). ++ * @current_freqs: The real frequencies, corresponding to ++ * @current_nominal_freq, at which the Mali GPU device ++ * is currently operating, as retrieved from ++ * @devfreq_table in the target callback of ++ * @devfreq_profile. ++ * @current_nominal_freq: The nominal frequency currently used for the Mali GPU ++ * device as retrieved through devfreq_recommended_opp() ++ * using the freq value passed as an argument to target ++ * callback of @devfreq_profile ++ * @current_voltages: The voltages corresponding to @current_nominal_freq, ++ * as retrieved from @devfreq_table in the target ++ * callback of @devfreq_profile. ++ * @current_core_mask: bitmask of shader cores that are currently desired & ++ * enabled, corresponding to @current_nominal_freq as ++ * retrieved from @devfreq_table in the target callback ++ * of @devfreq_profile. ++ * @devfreq_table: Pointer to the lookup table for converting between ++ * nominal OPP (operating performance point) frequency, ++ * and real frequency and core mask. This table is ++ * constructed according to operating-points-v2-mali ++ * table in devicetree. ++ * @num_opps: Number of operating performance points available for the Mali ++ * GPU device. ++ * @last_devfreq_metrics: last PM metrics ++ * @devfreq_queue: Per device object for storing data that manages devfreq ++ * suspend & resume request queue and the related items. ++ * @devfreq_cooling: Pointer returned on registering devfreq cooling device ++ * corresponding to @devfreq. ++ * @ipa_protection_mode_switched: is set to TRUE when GPU is put into protected ++ * mode. It is a sticky flag which is cleared by IPA ++ * once it has made use of information that GPU had ++ * previously entered protected mode. ++ * @ipa: Top level structure for IPA, containing pointers to both ++ * configured & fallback models. ++ * @ipa.lock: Access to this struct must be with ipa.lock held ++ * @ipa.configured_model: ipa model to use ++ * @ipa.fallback_model: ipa fallback model ++ * @ipa.last_metrics: Values of the PM utilization metrics from last time ++ * the power model was invoked. The utilization is ++ * calculated as the difference between last_metrics ++ * and the current values. ++ * @ipa.force_fallback_model: true if use of fallback model has been forced by ++ * the User ++ * @ipa.last_sample_time: Records the time when counters, used for dynamic ++ * energy estimation, were last sampled. ++ * @previous_frequency: Previous frequency of GPU clock used for ++ * BASE_HW_ISSUE_GPU2017_1336 workaround, This clock is ++ * restored when L2 is powered on. ++ * @job_fault_debug: Flag to control the dumping of debug data for job faults, ++ * set when the 'job_fault' debugfs file is opened. ++ * @mali_debugfs_directory: Root directory for the debugfs files created by the driver ++ * @debugfs_ctx_directory: Directory inside the @mali_debugfs_directory containing ++ * a sub-directory for every context. ++ * @debugfs_instr_directory: Instrumentation debugfs directory ++ * @debugfs_as_read_bitmap: bitmap of address spaces for which the bus or page fault ++ * has occurred. ++ * @job_fault_wq: Waitqueue to block the job fault dumping daemon till the ++ * occurrence of a job fault. ++ * @job_fault_resume_wq: Waitqueue on which every context with a faulty job wait ++ * for the job fault dumping to complete before they can ++ * do bottom half of job done for the atoms which followed ++ * the faulty atom. ++ * @job_fault_resume_workq: workqueue to process the work items queued for the faulty ++ * atoms, whereby the work item function waits for the dumping ++ * to get completed. ++ * @job_fault_event_list: List of atoms, each belonging to a different context, which ++ * generated a job fault. ++ * @job_fault_event_lock: Lock to protect concurrent accesses to @job_fault_event_list ++ * @regs_dump_debugfs_data: Contains the offset of register to be read through debugfs ++ * file "read_register". ++ * @regs_dump_debugfs_data.reg_offset: Contains the offset of register to be ++ * read through debugfs file "read_register". ++ * @ctx_num: Total number of contexts created for the device. ++ * @io_history: Pointer to an object keeping a track of all recent ++ * register accesses. The history of register accesses ++ * can be read through "regs_history" debugfs file. ++ * @hwaccess: Contains a pointer to active kbase context and GPU ++ * backend specific data for HW access layer. ++ * @faults_pending: Count of page/bus faults waiting for bottom half processing ++ * via workqueues. ++ * @mmu_hw_operation_in_progress: Set before sending the MMU command and is ++ * cleared after the command is complete. Whilst this ++ * flag is set, the write to L2_PWROFF register will be ++ * skipped which is needed to workaround the HW issue ++ * GPU2019-3878. PM state machine is invoked after ++ * clearing this flag and @hwaccess_lock is used to ++ * serialize the access. ++ * @mmu_page_migrate_in_progress: Set before starting a MMU page migration transaction ++ * and cleared after the transaction completes. PM L2 state is ++ * prevented from entering powering up/down transitions when the ++ * flag is set, @hwaccess_lock is used to serialize the access. ++ * @poweroff_pending: Set when power off operation for GPU is started, reset when ++ * power on for GPU is started. ++ * @infinite_cache_active_default: Set to enable using infinite cache for all the ++ * allocations of a new context. ++ * @mem_pool_defaults: Default configuration for the group of memory pools ++ * created for a new context. ++ * @current_gpu_coherency_mode: coherency mode in use, which can be different ++ * from @system_coherency, when using protected mode. ++ * @system_coherency: coherency mode as retrieved from the device tree. ++ * @cci_snoop_enabled: Flag to track when CCI snoops have been enabled. ++ * @snoop_enable_smc: SMC function ID to call into Trusted firmware to ++ * enable cache snooping. Value of 0 indicates that it ++ * is not used. ++ * @snoop_disable_smc: SMC function ID to call disable cache snooping. ++ * @protected_ops: Pointer to the methods for switching in or out of the ++ * protected mode, as per the @protected_dev being used. ++ * @protected_dev: Pointer to the protected mode switcher device attached ++ * to the GPU device retrieved through device tree if ++ * GPU do not support protected mode switching natively. ++ * @protected_mode: set to TRUE when GPU is put into protected mode ++ * @protected_mode_transition: set to TRUE when GPU is transitioning into or ++ * out of protected mode. ++ * @protected_mode_hwcnt_desired: True if we want GPU hardware counters to be ++ * enabled. Counters must be disabled before transition ++ * into protected mode. ++ * @protected_mode_hwcnt_disabled: True if GPU hardware counters are not ++ * enabled. ++ * @protected_mode_hwcnt_disable_work: Work item to disable GPU hardware ++ * counters, used if atomic disable is not possible. ++ * @irq_reset_flush: Flag to indicate that GPU reset is in-flight and flush of ++ * IRQ + bottom half is being done, to prevent the writes ++ * to MMU_IRQ_CLEAR & MMU_IRQ_MASK registers. ++ * @inited_subsys: Bitmap of inited sub systems at the time of device probe. ++ * Used during device remove or for handling error in probe. ++ * @hwaccess_lock: Lock, which can be taken from IRQ context, to serialize ++ * the updates made to Job dispatcher + scheduler states. ++ * @mmu_hw_mutex: Protects access to MMU operations and address space ++ * related state. ++ * @serialize_jobs: Currently used mode for serialization of jobs, both ++ * intra & inter slots serialization is supported. ++ * @backup_serialize_jobs: Copy of the original value of @serialize_jobs taken ++ * when GWT is enabled. Used to restore the original value ++ * on disabling of GWT. ++ * @js_ctx_scheduling_mode: Context scheduling mode currently being used by ++ * Job Scheduler ++ * @l2_size_override: Used to set L2 cache size via device tree blob ++ * @l2_hash_override: Used to set L2 cache hash via device tree blob ++ * @l2_hash_values_override: true if @l2_hash_values is valid. ++ * @l2_hash_values: Used to set L2 asn_hash via device tree blob ++ * @sysc_alloc: Array containing values to be programmed into ++ * SYSC_ALLOC[0..7] GPU registers on L2 cache ++ * power down. These come from either DTB or ++ * via DebugFS (if it is available in kernel). ++ * @process_root: rb_tree root node for maintaining a rb_tree of ++ * kbase_process based on key tgid(thread group ID). ++ * @dma_buf_root: rb_tree root node for maintaining a rb_tree of ++ * &struct kbase_dma_buf based on key dma_buf. ++ * We maintain a rb_tree of dma_buf mappings under ++ * kbase_device and kbase_process, one indicates a ++ * mapping and gpu memory usage at device level and ++ * other one at process level. ++ * @total_gpu_pages: Total GPU pages used for the complete GPU device. ++ * @dma_buf_lock: This mutex should be held while accounting for ++ * @total_gpu_pages from imported dma buffers. ++ * @gpu_mem_usage_lock: This spinlock should be held while accounting ++ * @total_gpu_pages for both native and dma-buf imported ++ * allocations. ++ * @dummy_job_wa: struct for dummy job execution workaround for the ++ * GPU hang issue ++ * @dummy_job_wa.ctx: dummy job workaround context ++ * @dummy_job_wa.jc: dummy job workaround job ++ * @dummy_job_wa.slot: dummy job workaround slot ++ * @dummy_job_wa.flags: dummy job workaround flags ++ * @dummy_job_wa_loaded: Flag for indicating that the workaround blob has ++ * been loaded. Protected by @fw_load_lock. ++ * @arb: Pointer to the arbiter device ++ * @pcm_dev: The priority control manager device. ++ * @oom_notifier_block: notifier_block containing kernel-registered out-of- ++ * memory handler. ++ * @mem_migrate: Per device object for managing page migration. ++ * @live_fence_metadata: Count of live fence metadata structures created by ++ * KCPU queue. These structures may outlive kbase module ++ * itself. Therefore, in such a case, a warning should be ++ * be produced. ++ * @mmu_as_inactive_wait_time_ms: Maximum waiting time in ms for the completion of ++ * a MMU operation ++ * @va_region_slab: kmem_cache (slab) for allocated kbase_va_region structures. + */ -+static void kbasep_hwcnt_accumulator_disable( -+ struct kbase_hwcnt_context *hctx, bool accumulate) -+{ -+ int errcode = 0; -+ bool backend_enabled = false; -+ struct kbase_hwcnt_accumulator *accum; -+ unsigned long flags; -+ u64 dump_time_ns; -+ -+ WARN_ON(!hctx); -+ lockdep_assert_held(&hctx->accum_lock); -+ WARN_ON(!hctx->accum_inited); ++struct kbase_device { ++ u32 hw_quirks_sc; ++ u32 hw_quirks_tiler; ++ u32 hw_quirks_mmu; ++ u32 hw_quirks_gpu; + -+ accum = &hctx->accum; ++ struct list_head entry; ++ struct device *dev; ++ struct miscdevice mdev; ++ u64 reg_start; ++ size_t reg_size; ++ void __iomem *reg; + -+ spin_lock_irqsave(&hctx->state_lock, flags); ++ struct { ++ int irq; ++ int flags; ++ } irqs[3]; + -+ WARN_ON(hctx->disable_count != 0); -+ WARN_ON(hctx->accum.state == ACCUM_STATE_DISABLED); ++ struct clk *clocks[BASE_MAX_NR_CLOCKS_REGULATORS]; ++ unsigned int nr_clocks; ++#if IS_ENABLED(CONFIG_REGULATOR) ++ struct regulator *regulators[BASE_MAX_NR_CLOCKS_REGULATORS]; ++ unsigned int nr_regulators; ++#if (KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE) ++ int token; ++#elif (KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE) ++ struct opp_table *opp_table; ++#endif /* (KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE) */ ++#endif /* CONFIG_REGULATOR */ ++ char devname[DEVNAME_SIZE]; ++ u32 id; + -+ if ((hctx->accum.state == ACCUM_STATE_ENABLED) && -+ (accum->enable_map_any_enabled)) -+ backend_enabled = true; ++#if !IS_ENABLED(CONFIG_MALI_REAL_HW) ++ void *model; ++ struct kmem_cache *irq_slab; ++ struct workqueue_struct *irq_workq; ++ atomic_t serving_job_irq; ++ atomic_t serving_gpu_irq; ++ atomic_t serving_mmu_irq; ++ spinlock_t reg_op_lock; ++#endif /* !IS_ENABLED(CONFIG_MALI_REAL_HW) */ ++ struct kbase_pm_device_data pm; + -+ if (!backend_enabled) -+ hctx->accum.state = ACCUM_STATE_DISABLED; ++ struct kbase_mem_pool_group mem_pools; ++ struct kbasep_mem_device memdev; ++ struct kbase_mmu_mode const *mmu_mode; + -+ spin_unlock_irqrestore(&hctx->state_lock, flags); ++ struct memory_group_manager_device *mgm_dev; + -+ /* Early out if the backend is not already enabled */ -+ if (!backend_enabled) -+ return; ++ struct kbase_as as[BASE_MAX_NR_AS]; ++ u16 as_free; ++ struct kbase_context *as_to_kctx[BASE_MAX_NR_AS]; + -+ if (!accumulate) -+ goto disable; ++ spinlock_t mmu_mask_change; + -+ /* Try and accumulate before disabling */ -+ errcode = hctx->iface->dump_request(accum->backend, &dump_time_ns); -+ if (errcode) -+ goto disable; ++ bool pagesize_2mb; + -+ errcode = hctx->iface->dump_wait(accum->backend); -+ if (errcode) -+ goto disable; ++ struct kbase_gpu_props gpu_props; + -+ errcode = hctx->iface->dump_get(accum->backend, -+ &accum->accum_buf, &accum->enable_map, accum->accumulated); -+ if (errcode) -+ goto disable; ++ unsigned long hw_issues_mask[(BASE_HW_ISSUE_END + BITS_PER_LONG - 1) / BITS_PER_LONG]; ++ unsigned long hw_features_mask[(BASE_HW_FEATURE_END + BITS_PER_LONG - 1) / BITS_PER_LONG]; + -+ accum->accumulated = true; ++ struct { ++ atomic_t count; ++ atomic_t state; ++ } disjoint_event; + -+disable: -+ hctx->iface->dump_disable(accum->backend); ++ s8 nr_hw_address_spaces; ++ s8 nr_user_address_spaces; + -+ /* Regardless of any errors during the accumulate, put the accumulator -+ * in the disabled state. ++ /** ++ * @pbha_propagate_bits: Record of Page-Based Hardware Attribute Propagate bits to ++ * restore to L2_CONFIG upon GPU reset. + */ -+ spin_lock_irqsave(&hctx->state_lock, flags); -+ -+ hctx->accum.state = ACCUM_STATE_DISABLED; -+ -+ spin_unlock_irqrestore(&hctx->state_lock, flags); -+} -+ -+/** -+ * kbasep_hwcnt_accumulator_enable() - Transition the accumulator into the -+ * enabled state, from the disabled state. -+ * @hctx: Non-NULL pointer to hardware counter context. -+ */ -+static void kbasep_hwcnt_accumulator_enable(struct kbase_hwcnt_context *hctx) -+{ -+ int errcode = 0; -+ struct kbase_hwcnt_accumulator *accum; -+ -+ WARN_ON(!hctx); -+ lockdep_assert_held(&hctx->state_lock); -+ WARN_ON(!hctx->accum_inited); -+ WARN_ON(hctx->accum.state != ACCUM_STATE_DISABLED); ++ u8 pbha_propagate_bits; + -+ accum = &hctx->accum; -+ -+ /* The backend only needs enabling if any counters are enabled */ -+ if (accum->enable_map_any_enabled) -+ errcode = hctx->iface->dump_enable_nolock( -+ accum->backend, &accum->enable_map); -+ -+ if (!errcode) -+ accum->state = ACCUM_STATE_ENABLED; -+ else -+ accum->state = ACCUM_STATE_ERROR; -+} -+ -+/** -+ * kbasep_hwcnt_accumulator_dump() - Perform a dump with the most up-to-date -+ * values of enabled counters possible, and -+ * optionally update the set of enabled -+ * counters. -+ * @hctx : Non-NULL pointer to the hardware counter context -+ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will -+ * be written out to on success -+ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will -+ * be written out to on success -+ * @dump_buf: Pointer to the buffer where the dump will be written out to on -+ * success. If non-NULL, must have the same metadata as the -+ * accumulator. If NULL, the dump will be discarded. -+ * @new_map: Pointer to the new counter enable map. If non-NULL, must have -+ * the same metadata as the accumulator. If NULL, the set of -+ * enabled counters will be unchanged. -+ */ -+static int kbasep_hwcnt_accumulator_dump( -+ struct kbase_hwcnt_context *hctx, -+ u64 *ts_start_ns, -+ u64 *ts_end_ns, -+ struct kbase_hwcnt_dump_buffer *dump_buf, -+ const struct kbase_hwcnt_enable_map *new_map) -+{ -+ int errcode = 0; -+ unsigned long flags; -+ enum kbase_hwcnt_accum_state state; -+ bool dump_requested = false; -+ bool dump_written = false; -+ bool cur_map_any_enabled; -+ struct kbase_hwcnt_enable_map *cur_map; -+ bool new_map_any_enabled = false; -+ u64 dump_time_ns; -+ struct kbase_hwcnt_accumulator *accum; ++#if MALI_USE_CSF ++ struct kbase_hwcnt_backend_csf_if hwcnt_backend_csf_if_fw; ++#else ++ struct kbase_hwcnt { ++ spinlock_t lock; + -+ WARN_ON(!hctx); -+ WARN_ON(!ts_start_ns); -+ WARN_ON(!ts_end_ns); -+ WARN_ON(dump_buf && (dump_buf->metadata != hctx->iface->metadata)); -+ WARN_ON(new_map && (new_map->metadata != hctx->iface->metadata)); -+ WARN_ON(!hctx->accum_inited); -+ lockdep_assert_held(&hctx->accum_lock); ++ struct kbase_context *kctx; ++ u64 addr; ++ u64 addr_bytes; + -+ accum = &hctx->accum; -+ cur_map = &accum->scratch_map; ++ struct kbase_instr_backend backend; ++ } hwcnt; + -+ /* Save out info about the current enable map */ -+ cur_map_any_enabled = accum->enable_map_any_enabled; -+ kbase_hwcnt_enable_map_copy(cur_map, &accum->enable_map); ++ struct kbase_hwcnt_backend_interface hwcnt_gpu_jm_backend; ++#endif + -+ if (new_map) -+ new_map_any_enabled = -+ kbase_hwcnt_enable_map_any_enabled(new_map); ++ struct kbase_hwcnt_backend_interface hwcnt_gpu_iface; ++ struct kbase_hwcnt_watchdog_interface hwcnt_watchdog_timer; + -+ /* -+ * We're holding accum_lock, so the accumulator state might transition -+ * from disabled to enabled during this function (as enabling is lock -+ * free), but it will never disable (as disabling needs to hold the -+ * accum_lock), nor will it ever transition from enabled to error (as -+ * an enable while we're already enabled is impossible). -+ * -+ * If we're already disabled, we'll only look at the accumulation buffer -+ * rather than do a real dump, so a concurrent enable does not affect -+ * us. -+ * -+ * If a concurrent enable fails, we might transition to the error -+ * state, but again, as we're only looking at the accumulation buffer, -+ * it's not an issue. -+ */ -+ spin_lock_irqsave(&hctx->state_lock, flags); ++ struct kbase_hwcnt_context *hwcnt_gpu_ctx; ++ struct kbase_hwcnt_virtualizer *hwcnt_gpu_virt; ++ struct kbase_vinstr_context *vinstr_ctx; ++ struct kbase_kinstr_prfcnt_context *kinstr_prfcnt_ctx; + -+ state = accum->state; ++ atomic_t timeline_flags; ++ struct kbase_timeline *timeline; + -+ /* -+ * Update the new map now, such that if an enable occurs during this -+ * dump then that enable will set the new map. If we're already enabled, -+ * then we'll do it ourselves after the dump. -+ */ -+ if (new_map) { -+ kbase_hwcnt_enable_map_copy( -+ &accum->enable_map, new_map); -+ accum->enable_map_any_enabled = new_map_any_enabled; -+ } ++#if KBASE_KTRACE_TARGET_RBUF ++ struct kbase_ktrace ktrace; ++#endif ++ u32 reset_timeout_ms; + -+ spin_unlock_irqrestore(&hctx->state_lock, flags); ++ u64 lowest_gpu_freq_khz; + -+ /* Error state, so early out. No need to roll back any map updates */ -+ if (state == ACCUM_STATE_ERROR) -+ return -EIO; ++#if MALI_USE_CSF ++ struct kbase_backend_time backend_time; ++#endif + -+ /* Initiate the dump if the backend is enabled. */ -+ if ((state == ACCUM_STATE_ENABLED) && cur_map_any_enabled) { -+ if (dump_buf) { -+ errcode = hctx->iface->dump_request( -+ accum->backend, &dump_time_ns); -+ dump_requested = true; -+ } else { -+ dump_time_ns = hctx->iface->timestamp_ns( -+ accum->backend); -+ errcode = hctx->iface->dump_clear(accum->backend); -+ } ++ bool cache_clean_in_progress; ++ u32 cache_clean_queued; ++ wait_queue_head_t cache_clean_wait; + -+ if (errcode) -+ goto error; -+ } else { -+ dump_time_ns = hctx->iface->timestamp_ns(accum->backend); -+ } ++ void *platform_context; + -+ /* Copy any accumulation into the dest buffer */ -+ if (accum->accumulated && dump_buf) { -+ kbase_hwcnt_dump_buffer_copy( -+ dump_buf, &accum->accum_buf, cur_map); -+ dump_written = true; -+ } ++ struct list_head kctx_list; ++ struct mutex kctx_list_lock; + -+ /* Wait for any requested dumps to complete */ -+ if (dump_requested) { -+ WARN_ON(state != ACCUM_STATE_ENABLED); -+ errcode = hctx->iface->dump_wait(accum->backend); -+ if (errcode) -+ goto error; -+ } ++ struct rockchip_opp_info opp_info; ++ bool is_runtime_resumed; ++ unsigned long current_nominal_freq; ++ struct monitor_dev_info *mdev_info; ++#ifdef CONFIG_MALI_BIFROST_DEVFREQ ++ struct devfreq_dev_profile devfreq_profile; ++ struct devfreq *devfreq; ++ unsigned long current_freqs[BASE_MAX_NR_CLOCKS_REGULATORS]; ++ unsigned long current_voltages[BASE_MAX_NR_CLOCKS_REGULATORS]; ++ u64 current_core_mask; ++ struct kbase_devfreq_opp *devfreq_table; ++ int num_opps; ++ struct kbasep_pm_metrics last_devfreq_metrics; ++ struct ipa_power_model_data *model_data; ++ struct kbase_devfreq_queue_info devfreq_queue; + -+ /* If we're enabled and there's a new enable map, change the enabled set -+ * as soon after the dump has completed as possible. -+ */ -+ if ((state == ACCUM_STATE_ENABLED) && new_map) { -+ /* Backend is only enabled if there were any enabled counters */ -+ if (cur_map_any_enabled) -+ hctx->iface->dump_disable(accum->backend); ++#if IS_ENABLED(CONFIG_DEVFREQ_THERMAL) ++ struct devfreq_cooling_power dfc_power; ++ struct thermal_cooling_device *devfreq_cooling; ++ bool ipa_protection_mode_switched; ++ struct { ++ /* Access to this struct must be with ipa.lock held */ ++ struct mutex lock; ++ struct kbase_ipa_model *configured_model; ++ struct kbase_ipa_model *fallback_model; + -+ /* (Re-)enable the backend if the new map has enabled counters. -+ * No need to acquire the spinlock, as concurrent enable while -+ * we're already enabled and holding accum_lock is impossible. ++ /* Values of the PM utilization metrics from last time the ++ * power model was invoked. The utilization is calculated as ++ * the difference between last_metrics and the current values. + */ -+ if (new_map_any_enabled) { -+ errcode = hctx->iface->dump_enable( -+ accum->backend, new_map); -+ if (errcode) -+ goto error; -+ } -+ } -+ -+ /* Copy, accumulate, or zero into the dest buffer to finish */ -+ if (dump_buf) { -+ /* If we dumped, copy or accumulate it into the destination */ -+ if (dump_requested) { -+ WARN_ON(state != ACCUM_STATE_ENABLED); -+ errcode = hctx->iface->dump_get( -+ accum->backend, -+ dump_buf, -+ cur_map, -+ dump_written); -+ if (errcode) -+ goto error; -+ dump_written = true; -+ } ++ struct kbasep_pm_metrics last_metrics; + -+ /* If we've not written anything into the dump buffer so far, it -+ * means there was nothing to write. Zero any enabled counters. ++ /* true if use of fallback model has been forced by the User */ ++ bool force_fallback_model; ++ /* Records the time when counters, used for dynamic energy ++ * estimation, were last sampled. + */ -+ if (!dump_written) -+ kbase_hwcnt_dump_buffer_zero(dump_buf, cur_map); -+ } -+ -+ /* Write out timestamps */ -+ *ts_start_ns = accum->ts_last_dump_ns; -+ *ts_end_ns = dump_time_ns; -+ -+ accum->accumulated = false; -+ accum->ts_last_dump_ns = dump_time_ns; -+ -+ return 0; -+error: -+ /* An error was only physically possible if the backend was enabled */ -+ WARN_ON(state != ACCUM_STATE_ENABLED); -+ -+ /* Disable the backend, and transition to the error state */ -+ hctx->iface->dump_disable(accum->backend); -+ spin_lock_irqsave(&hctx->state_lock, flags); ++ ktime_t last_sample_time; ++ } ipa; ++#endif /* CONFIG_DEVFREQ_THERMAL */ ++#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ ++ unsigned long previous_frequency; + -+ accum->state = ACCUM_STATE_ERROR; ++#if !MALI_USE_CSF ++ atomic_t job_fault_debug; ++#endif /* !MALI_USE_CSF */ + -+ spin_unlock_irqrestore(&hctx->state_lock, flags); ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ struct dentry *mali_debugfs_directory; ++ struct dentry *debugfs_ctx_directory; ++ struct dentry *debugfs_instr_directory; + -+ return errcode; -+} ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ u64 debugfs_as_read_bitmap; ++#endif /* CONFIG_MALI_BIFROST_DEBUG */ + -+/** -+ * kbasep_hwcnt_context_disable() - Increment the disable count of the context. -+ * @hctx: Non-NULL pointer to hardware counter context. -+ * @accumulate: True if we should accumulate before disabling, else false. -+ */ -+static void kbasep_hwcnt_context_disable( -+ struct kbase_hwcnt_context *hctx, bool accumulate) -+{ -+ unsigned long flags; ++#if !MALI_USE_CSF ++ wait_queue_head_t job_fault_wq; ++ wait_queue_head_t job_fault_resume_wq; ++ struct workqueue_struct *job_fault_resume_workq; ++ struct list_head job_fault_event_list; ++ spinlock_t job_fault_event_lock; ++#endif /* !MALI_USE_CSF */ + -+ WARN_ON(!hctx); -+ lockdep_assert_held(&hctx->accum_lock); ++#if !MALI_CUSTOMER_RELEASE ++ struct { ++ u32 reg_offset; ++ } regs_dump_debugfs_data; ++#endif /* !MALI_CUSTOMER_RELEASE */ ++#endif /* CONFIG_DEBUG_FS */ + -+ if (!kbase_hwcnt_context_disable_atomic(hctx)) { -+ kbasep_hwcnt_accumulator_disable(hctx, accumulate); ++ atomic_t ctx_num; + -+ spin_lock_irqsave(&hctx->state_lock, flags); ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ struct kbase_io_history io_history; ++#endif /* CONFIG_DEBUG_FS */ + -+ /* Atomic disable failed and we're holding the mutex, so current -+ * disable count must be 0. -+ */ -+ WARN_ON(hctx->disable_count != 0); -+ hctx->disable_count++; ++ struct kbase_hwaccess_data hwaccess; + -+ spin_unlock_irqrestore(&hctx->state_lock, flags); -+ } -+} ++ atomic_t faults_pending; + -+int kbase_hwcnt_accumulator_acquire( -+ struct kbase_hwcnt_context *hctx, -+ struct kbase_hwcnt_accumulator **accum) -+{ -+ int errcode = 0; -+ unsigned long flags; ++#if MALI_USE_CSF ++ bool mmu_hw_operation_in_progress; ++#endif ++ bool mmu_page_migrate_in_progress; ++ bool poweroff_pending; + -+ if (!hctx || !accum) -+ return -EINVAL; ++ bool infinite_cache_active_default; + -+ mutex_lock(&hctx->accum_lock); -+ spin_lock_irqsave(&hctx->state_lock, flags); ++ struct kbase_mem_pool_group_config mem_pool_defaults; + -+ if (!hctx->accum_inited) -+ /* Set accum initing now to prevent concurrent init */ -+ hctx->accum_inited = true; -+ else -+ /* Already have an accum, or already being inited */ -+ errcode = -EBUSY; ++ u32 current_gpu_coherency_mode; ++ u32 system_coherency; + -+ spin_unlock_irqrestore(&hctx->state_lock, flags); -+ mutex_unlock(&hctx->accum_lock); ++ bool cci_snoop_enabled; + -+ if (errcode) -+ return errcode; ++ u32 snoop_enable_smc; ++ u32 snoop_disable_smc; + -+ errcode = kbasep_hwcnt_accumulator_init(hctx); ++ const struct protected_mode_ops *protected_ops; + -+ if (errcode) { -+ mutex_lock(&hctx->accum_lock); -+ spin_lock_irqsave(&hctx->state_lock, flags); ++ struct protected_mode_device *protected_dev; + -+ hctx->accum_inited = false; ++ bool protected_mode; + -+ spin_unlock_irqrestore(&hctx->state_lock, flags); -+ mutex_unlock(&hctx->accum_lock); ++ bool protected_mode_transition; + -+ return errcode; -+ } ++ bool protected_mode_hwcnt_desired; + -+ spin_lock_irqsave(&hctx->state_lock, flags); ++ bool protected_mode_hwcnt_disabled; + -+ WARN_ON(hctx->disable_count == 0); -+ WARN_ON(hctx->accum.enable_map_any_enabled); ++ struct work_struct protected_mode_hwcnt_disable_work; + -+ /* Decrement the disable count to allow the accumulator to be accessible -+ * now that it's fully constructed. -+ */ -+ hctx->disable_count--; + -+ /* -+ * Make sure the accumulator is initialised to the correct state. -+ * Regardless of initial state, counters don't need to be enabled via -+ * the backend, as the initial enable map has no enabled counters. -+ */ -+ hctx->accum.state = (hctx->disable_count == 0) ? -+ ACCUM_STATE_ENABLED : -+ ACCUM_STATE_DISABLED; ++ bool irq_reset_flush; + -+ spin_unlock_irqrestore(&hctx->state_lock, flags); ++ u32 inited_subsys; + -+ *accum = &hctx->accum; ++ spinlock_t hwaccess_lock; + -+ return 0; -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_accumulator_acquire); ++ struct mutex mmu_hw_mutex; + -+void kbase_hwcnt_accumulator_release(struct kbase_hwcnt_accumulator *accum) -+{ -+ unsigned long flags; -+ struct kbase_hwcnt_context *hctx; ++ u8 l2_size_override; ++ u8 l2_hash_override; ++ bool l2_hash_values_override; ++ u32 l2_hash_values[ASN_HASH_COUNT]; + -+ if (!accum) -+ return; ++ u32 sysc_alloc[SYSC_ALLOC_COUNT]; + -+ hctx = container_of(accum, struct kbase_hwcnt_context, accum); ++ struct mutex fw_load_lock; ++#if MALI_USE_CSF ++ /* CSF object for the GPU device. */ ++ struct kbase_csf_device csf; ++#else ++ struct kbasep_js_device_data js_data; + -+ mutex_lock(&hctx->accum_lock); ++ /* See KBASE_JS_*_PRIORITY_MODE for details. */ ++ u32 js_ctx_scheduling_mode; + -+ /* Double release is a programming error */ -+ WARN_ON(!hctx->accum_inited); ++ /* See KBASE_SERIALIZE_* for details */ ++ u8 serialize_jobs; + -+ /* Disable the context to ensure the accumulator is inaccesible while -+ * we're destroying it. This performs the corresponding disable count -+ * increment to the decrement done during acquisition. -+ */ -+ kbasep_hwcnt_context_disable(hctx, false); ++#ifdef CONFIG_MALI_CINSTR_GWT ++ u8 backup_serialize_jobs; ++#endif /* CONFIG_MALI_CINSTR_GWT */ + -+ mutex_unlock(&hctx->accum_lock); ++#endif /* MALI_USE_CSF */ + -+ kbasep_hwcnt_accumulator_term(hctx); ++ struct rb_root process_root; ++ struct rb_root dma_buf_root; + -+ mutex_lock(&hctx->accum_lock); -+ spin_lock_irqsave(&hctx->state_lock, flags); ++ size_t total_gpu_pages; ++ struct mutex dma_buf_lock; ++ spinlock_t gpu_mem_usage_lock; + -+ hctx->accum_inited = false; ++ struct { ++ struct kbase_context *ctx; ++ u64 jc; ++ int slot; ++ u64 flags; ++ } dummy_job_wa; ++ bool dummy_job_wa_loaded; + -+ spin_unlock_irqrestore(&hctx->state_lock, flags); -+ mutex_unlock(&hctx->accum_lock); -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_accumulator_release); ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ struct kbase_arbiter_device arb; ++#endif ++ /* Priority Control Manager device */ ++ struct priority_control_manager_device *pcm_dev; + -+void kbase_hwcnt_context_disable(struct kbase_hwcnt_context *hctx) -+{ -+ if (WARN_ON(!hctx)) -+ return; ++ struct notifier_block oom_notifier_block; + -+ /* Try and atomically disable first, so we can avoid locking the mutex -+ * if we don't need to. ++#if !MALI_USE_CSF ++ spinlock_t quick_reset_lock; ++ bool quick_reset_enabled; ++ /* ++ * 进入 quck_reset_mode åŽ (quick_reset_enabled 为 true), ++ * 对已ç»è¿›å…¥ KBASE_JD_ATOM_STATE_HW_COMPLETED 状æ€çš„ atom 的计数. ++ * ++ * è‹¥ num_of_atoms_hw_completed 达到一定值, 将退出 quck_reset_mode. ++ * è§ kbase_js_complete_atom() 对 num_of_atoms_hw_completed 的引用. + */ -+ if (kbase_hwcnt_context_disable_atomic(hctx)) -+ return; ++ u32 num_of_atoms_hw_completed; ++#endif + -+ mutex_lock(&hctx->accum_lock); ++ struct kbase_mem_migrate mem_migrate; + -+ kbasep_hwcnt_context_disable(hctx, true); ++#if MALI_USE_CSF && IS_ENABLED(CONFIG_SYNC_FILE) ++ atomic_t live_fence_metadata; ++#endif ++ u32 mmu_as_inactive_wait_time_ms; ++ struct kmem_cache *va_region_slab; ++}; + -+ mutex_unlock(&hctx->accum_lock); -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_context_disable); ++/** ++ * enum kbase_file_state - Initialization state of a file opened by @kbase_open ++ * ++ * @KBASE_FILE_NEED_VSN: Initial state, awaiting API version. ++ * @KBASE_FILE_VSN_IN_PROGRESS: Indicates if setting an API version is in ++ * progress and other setup calls shall be ++ * rejected. ++ * @KBASE_FILE_NEED_CTX: Indicates if the API version handshake has ++ * completed, awaiting context creation flags. ++ * @KBASE_FILE_CTX_IN_PROGRESS: Indicates if the context's setup is in progress ++ * and other setup calls shall be rejected. ++ * @KBASE_FILE_COMPLETE: Indicates if the setup for context has ++ * completed, i.e. flags have been set for the ++ * context. ++ * ++ * The driver allows only limited interaction with user-space until setup ++ * is complete. ++ */ ++enum kbase_file_state { ++ KBASE_FILE_NEED_VSN, ++ KBASE_FILE_VSN_IN_PROGRESS, ++ KBASE_FILE_NEED_CTX, ++ KBASE_FILE_CTX_IN_PROGRESS, ++ KBASE_FILE_COMPLETE ++}; + -+bool kbase_hwcnt_context_disable_atomic(struct kbase_hwcnt_context *hctx) -+{ -+ unsigned long flags; -+ bool atomic_disabled = false; ++/** ++ * struct kbase_file - Object representing a file opened by @kbase_open ++ * ++ * @kbdev: Object representing an instance of GPU platform device, ++ * allocated from the probe method of the Mali driver. ++ * @filp: Pointer to the struct file corresponding to device file ++ * /dev/malixx instance, passed to the file's open method. ++ * @kctx: Object representing an entity, among which GPU is ++ * scheduled and which gets its own GPU address space. ++ * Invalid until @setup_state is KBASE_FILE_COMPLETE. ++ * @api_version: Contains the version number for User/kernel interface, ++ * used for compatibility check. Invalid until ++ * @setup_state is KBASE_FILE_NEED_CTX. ++ * @setup_state: Initialization state of the file. Values come from ++ * the kbase_file_state enumeration. ++ */ ++struct kbase_file { ++ struct kbase_device *kbdev; ++ struct file *filp; ++ struct kbase_context *kctx; ++ unsigned long api_version; ++ atomic_t setup_state; ++}; ++#if MALI_JIT_PRESSURE_LIMIT_BASE ++/** ++ * enum kbase_context_flags - Flags for kbase contexts ++ * ++ * @KCTX_COMPAT: Set when the context process is a compat process, 32-bit ++ * process on a 64-bit kernel. ++ * ++ * @KCTX_RUNNABLE_REF: Set when context is counted in ++ * kbdev->js_data.nr_contexts_runnable. Must hold queue_mutex when accessing. ++ * ++ * @KCTX_ACTIVE: Set when the context is active. ++ * ++ * @KCTX_PULLED: Set when last kick() caused atoms to be pulled from this ++ * context. ++ * ++ * @KCTX_MEM_PROFILE_INITIALIZED: Set when the context's memory profile has been ++ * initialized. ++ * ++ * @KCTX_INFINITE_CACHE: Set when infinite cache is to be enabled for new ++ * allocations. Existing allocations will not change. ++ * ++ * @KCTX_SUBMIT_DISABLED: Set to prevent context from submitting any jobs. ++ * ++ * @KCTX_PRIVILEGED:Set if the context uses an address space and should be kept ++ * scheduled in. ++ * ++ * @KCTX_SCHEDULED: Set when the context is scheduled on the Run Pool. ++ * This is only ever updated whilst the jsctx_mutex is held. ++ * ++ * @KCTX_DYING: Set when the context process is in the process of being evicted. ++ * ++ * @KCTX_FORCE_SAME_VA: Set when BASE_MEM_SAME_VA should be forced on memory ++ * allocations. For 64-bit clients it is enabled by default, and disabled by ++ * default on 32-bit clients. Being able to clear this flag is only used for ++ * testing purposes of the custom zone allocation on 64-bit user-space builds, ++ * where we also require more control than is available through e.g. the JIT ++ * allocation mechanism. However, the 64-bit user-space client must still ++ * reserve a JIT region using KBASE_IOCTL_MEM_JIT_INIT ++ * ++ * @KCTX_PULLED_SINCE_ACTIVE_JS0: Set when the context has had an atom pulled ++ * from it for job slot 0. This is reset when the context first goes active or ++ * is re-activated on that slot. ++ * ++ * @KCTX_PULLED_SINCE_ACTIVE_JS1: Set when the context has had an atom pulled ++ * from it for job slot 1. This is reset when the context first goes active or ++ * is re-activated on that slot. ++ * ++ * @KCTX_PULLED_SINCE_ACTIVE_JS2: Set when the context has had an atom pulled ++ * from it for job slot 2. This is reset when the context first goes active or ++ * is re-activated on that slot. ++ * ++ * @KCTX_AS_DISABLED_ON_FAULT: Set when the GPU address space is disabled for ++ * the context due to unhandled page(or bus) fault. It is cleared when the ++ * refcount for the context drops to 0 or on when the address spaces are ++ * re-enabled on GPU reset or power cycle. ++ * ++ * @KCTX_JPL_ENABLED: Set when JIT physical page limit is less than JIT virtual ++ * address page limit, so we must take care to not exceed the physical limit ++ * ++ * All members need to be separate bits. This enum is intended for use in a ++ * bitmask where multiple values get OR-ed together. ++ */ ++enum kbase_context_flags { ++ KCTX_COMPAT = 1U << 0, ++ KCTX_RUNNABLE_REF = 1U << 1, ++ KCTX_ACTIVE = 1U << 2, ++ KCTX_PULLED = 1U << 3, ++ KCTX_MEM_PROFILE_INITIALIZED = 1U << 4, ++ KCTX_INFINITE_CACHE = 1U << 5, ++ KCTX_SUBMIT_DISABLED = 1U << 6, ++ KCTX_PRIVILEGED = 1U << 7, ++ KCTX_SCHEDULED = 1U << 8, ++ KCTX_DYING = 1U << 9, ++ KCTX_FORCE_SAME_VA = 1U << 11, ++ KCTX_PULLED_SINCE_ACTIVE_JS0 = 1U << 12, ++ KCTX_PULLED_SINCE_ACTIVE_JS1 = 1U << 13, ++ KCTX_PULLED_SINCE_ACTIVE_JS2 = 1U << 14, ++ KCTX_AS_DISABLED_ON_FAULT = 1U << 15, ++ KCTX_JPL_ENABLED = 1U << 16, ++}; ++#else ++/** ++ * enum kbase_context_flags - Flags for kbase contexts ++ * ++ * @KCTX_COMPAT: Set when the context process is a compat process, 32-bit ++ * process on a 64-bit kernel. ++ * ++ * @KCTX_RUNNABLE_REF: Set when context is counted in ++ * kbdev->js_data.nr_contexts_runnable. Must hold queue_mutex when accessing. ++ * ++ * @KCTX_ACTIVE: Set when the context is active. ++ * ++ * @KCTX_PULLED: Set when last kick() caused atoms to be pulled from this ++ * context. ++ * ++ * @KCTX_MEM_PROFILE_INITIALIZED: Set when the context's memory profile has been ++ * initialized. ++ * ++ * @KCTX_INFINITE_CACHE: Set when infinite cache is to be enabled for new ++ * allocations. Existing allocations will not change. ++ * ++ * @KCTX_SUBMIT_DISABLED: Set to prevent context from submitting any jobs. ++ * ++ * @KCTX_PRIVILEGED:Set if the context uses an address space and should be kept ++ * scheduled in. ++ * ++ * @KCTX_SCHEDULED: Set when the context is scheduled on the Run Pool. ++ * This is only ever updated whilst the jsctx_mutex is held. ++ * ++ * @KCTX_DYING: Set when the context process is in the process of being evicted. ++ * ++ * ++ * @KCTX_FORCE_SAME_VA: Set when BASE_MEM_SAME_VA should be forced on memory ++ * allocations. For 64-bit clients it is enabled by default, and disabled by ++ * default on 32-bit clients. Being able to clear this flag is only used for ++ * testing purposes of the custom zone allocation on 64-bit user-space builds, ++ * where we also require more control than is available through e.g. the JIT ++ * allocation mechanism. However, the 64-bit user-space client must still ++ * reserve a JIT region using KBASE_IOCTL_MEM_JIT_INIT ++ * ++ * @KCTX_PULLED_SINCE_ACTIVE_JS0: Set when the context has had an atom pulled ++ * from it for job slot 0. This is reset when the context first goes active or ++ * is re-activated on that slot. ++ * ++ * @KCTX_PULLED_SINCE_ACTIVE_JS1: Set when the context has had an atom pulled ++ * from it for job slot 1. This is reset when the context first goes active or ++ * is re-activated on that slot. ++ * ++ * @KCTX_PULLED_SINCE_ACTIVE_JS2: Set when the context has had an atom pulled ++ * from it for job slot 2. This is reset when the context first goes active or ++ * is re-activated on that slot. ++ * ++ * @KCTX_AS_DISABLED_ON_FAULT: Set when the GPU address space is disabled for ++ * the context due to unhandled page(or bus) fault. It is cleared when the ++ * refcount for the context drops to 0 or on when the address spaces are ++ * re-enabled on GPU reset or power cycle. ++ * ++ * All members need to be separate bits. This enum is intended for use in a ++ * bitmask where multiple values get OR-ed together. ++ */ ++enum kbase_context_flags { ++ KCTX_COMPAT = 1U << 0, ++ KCTX_RUNNABLE_REF = 1U << 1, ++ KCTX_ACTIVE = 1U << 2, ++ KCTX_PULLED = 1U << 3, ++ KCTX_MEM_PROFILE_INITIALIZED = 1U << 4, ++ KCTX_INFINITE_CACHE = 1U << 5, ++ KCTX_SUBMIT_DISABLED = 1U << 6, ++ KCTX_PRIVILEGED = 1U << 7, ++ KCTX_SCHEDULED = 1U << 8, ++ KCTX_DYING = 1U << 9, ++ KCTX_FORCE_SAME_VA = 1U << 11, ++ KCTX_PULLED_SINCE_ACTIVE_JS0 = 1U << 12, ++ KCTX_PULLED_SINCE_ACTIVE_JS1 = 1U << 13, ++ KCTX_PULLED_SINCE_ACTIVE_JS2 = 1U << 14, ++ KCTX_AS_DISABLED_ON_FAULT = 1U << 15, ++}; ++#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ + -+ if (WARN_ON(!hctx)) -+ return false; ++struct kbase_sub_alloc { ++ struct list_head link; ++ struct page *page; ++ DECLARE_BITMAP(sub_pages, SZ_2M / SZ_4K); ++}; + -+ spin_lock_irqsave(&hctx->state_lock, flags); ++/** ++ * struct kbase_context - Kernel base context ++ * ++ * @filp: Pointer to the struct file corresponding to device file ++ * /dev/malixx instance, passed to the file's open method. ++ * @kbdev: Pointer to the Kbase device for which the context is created. ++ * @kctx_list_link: Node into Kbase device list of contexts. ++ * @mmu: Structure holding details of the MMU tables for this ++ * context ++ * @id: Unique identifier for the context, indicates the number of ++ * contexts which have been created for the device so far. ++ * @api_version: contains the version number for User/kernel interface, ++ * used for compatibility check. ++ * @event_list: list of posted events about completed atoms, to be sent to ++ * event handling thread of Userpsace. ++ * @event_coalesce_list: list containing events corresponding to successive atoms ++ * which have requested deferred delivery of the completion ++ * events to Userspace. ++ * @event_mutex: Lock to protect the concurrent access to @event_list & ++ * @event_mutex. ++ * @event_closed: Flag set through POST_TERM ioctl, indicates that Driver ++ * should stop posting events and also inform event handling ++ * thread that context termination is in progress. ++ * @event_workq: Workqueue for processing work items corresponding to atoms ++ * that do not return an event to userspace. ++ * @event_count: Count of the posted events to be consumed by Userspace. ++ * @event_coalesce_count: Count of the events present in @event_coalesce_list. ++ * @flags: bitmap of enums from kbase_context_flags, indicating the ++ * state & attributes for the context. ++ * @aliasing_sink_page: Special page used for KBASE_MEM_TYPE_ALIAS allocations, ++ * which can alias number of memory regions. The page is ++ * represent a region where it is mapped with a write-alloc ++ * cache setup, typically used when the write result of the ++ * GPU isn't needed, but the GPU must write anyway. ++ * @mem_partials_lock: Lock for protecting the operations done on the elements ++ * added to @mem_partials list. ++ * @mem_partials: List head for the list of large pages, 2MB in size, which ++ * have been split into 4 KB pages and are used partially ++ * for the allocations >= 2 MB in size. ++ * @reg_lock: Lock used for GPU virtual address space management operations, ++ * like adding/freeing a memory region in the address space. ++ * Can be converted to a rwlock ?. ++ * @reg_rbtree_same: RB tree of the memory regions allocated from the SAME_VA ++ * zone of the GPU virtual address space. Used for allocations ++ * having the same value for GPU & CPU virtual address. ++ * @reg_rbtree_custom: RB tree of the memory regions allocated from the CUSTOM_VA ++ * zone of the GPU virtual address space. ++ * @reg_rbtree_exec: RB tree of the memory regions allocated from the EXEC_VA ++ * zone of the GPU virtual address space. Used for GPU-executable ++ * allocations which don't need the SAME_VA property. ++ * @reg_rbtree_exec_fixed: RB tree of the memory regions allocated from the ++ * EXEC_FIXED_VA zone of the GPU virtual address space. Used for ++ * GPU-executable allocations with FIXED/FIXABLE GPU virtual ++ * addresses. ++ * @reg_rbtree_fixed: RB tree of the memory regions allocated from the FIXED_VA zone ++ * of the GPU virtual address space. Used for allocations with ++ * FIXED/FIXABLE GPU virtual addresses. ++ * @num_fixable_allocs: A count for the number of memory allocations with the ++ * BASE_MEM_FIXABLE property. ++ * @num_fixed_allocs: A count for the number of memory allocations with the ++ * BASE_MEM_FIXED property. ++ * @reg_zone: Zone information for the reg_rbtree_<...> members. ++ * @cookies: Bitmask containing of BITS_PER_LONG bits, used mainly for ++ * SAME_VA allocations to defer the reservation of memory region ++ * (from the GPU virtual address space) from base_mem_alloc ++ * ioctl to mmap system call. This helps returning unique ++ * handles, disguised as GPU VA, to Userspace from base_mem_alloc ++ * and later retrieving the pointer to memory region structure ++ * in the mmap handler. ++ * @pending_regions: Array containing pointers to memory region structures, ++ * used in conjunction with @cookies bitmask mainly for ++ * providing a mechansim to have the same value for CPU & ++ * GPU virtual address. ++ * @event_queue: Wait queue used for blocking the thread, which consumes ++ * the base_jd_event corresponding to an atom, when there ++ * are no more posted events. ++ * @tgid: Thread group ID of the process whose thread created ++ * the context (by calling KBASE_IOCTL_VERSION_CHECK or ++ * KBASE_IOCTL_SET_FLAGS, depending on the @api_version). ++ * This is usually, but not necessarily, the same as the ++ * process whose thread opened the device file ++ * /dev/malixx instance. ++ * @pid: ID of the thread, corresponding to process @tgid, ++ * which actually created the context. This is usually, ++ * but not necessarily, the same as the thread which ++ * opened the device file /dev/malixx instance. ++ * @csf: kbase csf context ++ * @jctx: object encapsulating all the Job dispatcher related state, ++ * including the array of atoms. ++ * @used_pages: Keeps a track of the number of 4KB physical pages in use ++ * for the context. ++ * @nonmapped_pages: Updated in the same way as @used_pages, except for the case ++ * when special tracking page is freed by userspace where it ++ * is reset to 0. ++ * @permanent_mapped_pages: Usage count of permanently mapped memory ++ * @mem_pools: Context-specific pools of free physical memory pages. ++ * @reclaim: Shrinker object registered with the kernel containing ++ * the pointer to callback function which is invoked under ++ * low memory conditions. In the callback function Driver ++ * frees up the memory for allocations marked as ++ * evictable/reclaimable. ++ * @evict_list: List head for the list containing the allocations which ++ * can be evicted or freed up in the shrinker callback. ++ * @evict_nents: Total number of pages allocated by the allocations within ++ * @evict_list (atomic). ++ * @waiting_soft_jobs: List head for the list containing softjob atoms, which ++ * are either waiting for the event set operation, or waiting ++ * for the signaling of input fence or waiting for the GPU ++ * device to powered on so as to dump the CPU/GPU timestamps. ++ * @waiting_soft_jobs_lock: Lock to protect @waiting_soft_jobs list from concurrent ++ * accesses. ++ * @dma_fence: Object containing list head for the list of dma-buf fence ++ * waiting atoms and the waitqueue to process the work item ++ * queued for the atoms blocked on the signaling of dma-buf ++ * fences. ++ * @dma_fence.waiting_resource: list head for the list of dma-buf fence ++ * @dma_fence.wq: waitqueue to process the work item queued ++ * @as_nr: id of the address space being used for the scheduled in ++ * context. This is effectively part of the Run Pool, because ++ * it only has a valid setting (!=KBASEP_AS_NR_INVALID) whilst ++ * the context is scheduled in. The hwaccess_lock must be held ++ * whilst accessing this. ++ * If the context relating to this value of as_nr is required, ++ * then the context must be retained to ensure that it doesn't ++ * disappear whilst it is being used. Alternatively, hwaccess_lock ++ * can be held to ensure the context doesn't disappear (but this ++ * has restrictions on what other locks can be taken simutaneously). ++ * @refcount: Keeps track of the number of users of this context. A user ++ * can be a job that is available for execution, instrumentation ++ * needing to 'pin' a context for counter collection, etc. ++ * If the refcount reaches 0 then this context is considered ++ * inactive and the previously programmed AS might be cleared ++ * at any point. ++ * Generally the reference count is incremented when the context ++ * is scheduled in and an atom is pulled from the context's per ++ * slot runnable tree in JM GPU or GPU command queue ++ * group is programmed on CSG slot in CSF GPU. ++ * @process_mm: Pointer to the memory descriptor of the process which ++ * created the context. Used for accounting the physical ++ * pages used for GPU allocations, done for the context, ++ * to the memory consumed by the process. A reference is taken ++ * on this descriptor for the Userspace created contexts so that ++ * Kbase can safely access it to update the memory usage counters. ++ * The reference is dropped on context termination. ++ * @gpu_va_end: End address of the GPU va space (in 4KB page units) ++ * @running_total_tiler_heap_nr_chunks: Running total of number of chunks in all ++ * tiler heaps of the kbase context. ++ * @running_total_tiler_heap_memory: Running total of the tiler heap memory in the ++ * kbase context. ++ * @peak_total_tiler_heap_memory: Peak value of the total tiler heap memory in the ++ * kbase context. ++ * @jit_va: Indicates if a JIT_VA zone has been created. ++ * @mem_profile_data: Buffer containing the profiling information provided by ++ * Userspace, can be read through the mem_profile debugfs file. ++ * @mem_profile_size: Size of the @mem_profile_data. ++ * @mem_profile_lock: Lock to serialize the operations related to mem_profile ++ * debugfs file. ++ * @kctx_dentry: Pointer to the debugfs directory created for every context, ++ * inside kbase_device::debugfs_ctx_directory, containing ++ * context specific files. ++ * @reg_dump: Buffer containing a register offset & value pair, used ++ * for dumping job fault debug info. ++ * @job_fault_count: Indicates that a job fault occurred for the context and ++ * dumping of its debug info is in progress. ++ * @job_fault_resume_event_list: List containing atoms completed after the faulty ++ * atom but before the debug data for faulty atom was dumped. ++ * @mem_view_column_width: Controls the number of bytes shown in every column of the ++ * output of "mem_view" debugfs file. ++ * @jsctx_queue: Per slot & priority arrays of object containing the root ++ * of RB-tree holding currently runnable atoms on the job slot ++ * and the head item of the linked list of atoms blocked on ++ * cross-slot dependencies. ++ * @slot_tracking: Tracking and control of this context's use of all job ++ * slots ++ * @atoms_pulled_all_slots: Total number of atoms currently pulled from the ++ * context, across all slots. ++ * @slots_pullable: Bitmask of slots, indicating the slots for which the ++ * context has pullable atoms in the runnable tree. ++ * @work: Work structure used for deferred ASID assignment. ++ * @completed_jobs: List containing completed atoms for which base_jd_event is ++ * to be posted. ++ * @work_count: Number of work items, corresponding to atoms, currently ++ * pending on job_done workqueue of @jctx. ++ * @soft_job_timeout: Timer object used for failing/cancelling the waiting ++ * soft-jobs which have been blocked for more than the ++ * timeout value used for the soft-jobs ++ * @jit_alloc: Array of 256 pointers to GPU memory regions, used for ++ * just-in-time memory allocations. ++ * @jit_max_allocations: Maximum allowed number of in-flight ++ * just-in-time memory allocations. ++ * @jit_current_allocations: Current number of in-flight just-in-time ++ * memory allocations. ++ * @jit_current_allocations_per_bin: Current number of in-flight just-in-time ++ * memory allocations per bin. ++ * @jit_group_id: A memory group ID to be passed to a platform-specific ++ * memory group manager. ++ * Valid range is 0..(MEMORY_GROUP_MANAGER_NR_GROUPS-1). ++ * @jit_phys_pages_limit: Limit of physical pages to apply across all ++ * just-in-time memory allocations, applied to ++ * @jit_current_phys_pressure. ++ * @jit_current_phys_pressure: Current 'pressure' on physical pages, which is ++ * the sum of the worst case estimate of pages that ++ * could be used (i.e. the ++ * &struct_kbase_va_region.nr_pages for all in-use ++ * just-in-time memory regions that have not yet had ++ * a usage report) and the actual number of pages ++ * that were used (i.e. the ++ * &struct_kbase_va_region.used_pages for regions ++ * that have had a usage report). ++ * @jit_phys_pages_to_be_allocated: Count of the physical pages that are being ++ * now allocated for just-in-time memory ++ * allocations of a context (across all the ++ * threads). This is supposed to be updated ++ * with @reg_lock held before allocating ++ * the backing pages. This helps ensure that ++ * total physical memory usage for just in ++ * time memory allocation remains within the ++ * @jit_phys_pages_limit in multi-threaded ++ * scenarios. ++ * @jit_active_head: List containing the just-in-time memory allocations ++ * which are in use. ++ * @jit_pool_head: List containing the just-in-time memory allocations ++ * which have been freed up by userspace and so not being ++ * used by them. ++ * Driver caches them to quickly fulfill requests for new ++ * JIT allocations. They are released in case of memory ++ * pressure as they are put on the @evict_list when they ++ * are freed up by userspace. ++ * @jit_destroy_head: List containing the just-in-time memory allocations ++ * which were moved to it from @jit_pool_head, in the ++ * shrinker callback, after freeing their backing ++ * physical pages. ++ * @jit_evict_lock: Lock used for operations done on just-in-time memory ++ * allocations and also for accessing @evict_list. ++ * @jit_work: Work item queued to defer the freeing of a memory ++ * region when a just-in-time memory allocation is moved ++ * to @jit_destroy_head. ++ * @ext_res_meta_head: A list of sticky external resources which were requested to ++ * be mapped on GPU side, through a softjob atom of type ++ * EXT_RES_MAP or STICKY_RESOURCE_MAP ioctl. ++ * @age_count: Counter incremented on every call to jd_submit_atom, ++ * atom is assigned the snapshot of this counter, which ++ * is used to determine the atom's age when it is added to ++ * the runnable RB-tree. ++ * @trim_level: Level of JIT allocation trimming to perform on free (0-100%) ++ * @kprcs: Reference to @struct kbase_process that the current ++ * kbase_context belongs to. ++ * @kprcs_link: List link for the list of kbase context maintained ++ * under kbase_process. ++ * @gwt_enabled: Indicates if tracking of GPU writes is enabled, protected by ++ * kbase_context.reg_lock. ++ * @gwt_was_enabled: Simple sticky bit flag to know if GWT was ever enabled. ++ * @gwt_current_list: A list of addresses for which GPU has generated write faults, ++ * after the last snapshot of it was sent to userspace. ++ * @gwt_snapshot_list: Snapshot of the @gwt_current_list for sending to user space. ++ * @priority: Indicates the context priority. Used along with @atoms_count ++ * for context scheduling, protected by hwaccess_lock. ++ * @atoms_count: Number of GPU atoms currently in use, per priority ++ * @create_flags: Flags used in context creation. ++ * @kinstr_jm: Kernel job manager instrumentation context handle ++ * @tl_kctx_list_node: List item into the device timeline's list of ++ * contexts, for timeline summarization. ++ * @limited_core_mask: The mask that is applied to the affinity in case of atoms ++ * marked with BASE_JD_REQ_LIMITED_CORE_MASK. ++ * @platform_data: Pointer to platform specific per-context data. ++ * @task: Pointer to the task structure of the main thread of the process ++ * that created the Kbase context. It would be set only for the ++ * contexts created by the Userspace and not for the contexts ++ * created internally by the Kbase. ++ * ++ * A kernel base context is an entity among which the GPU is scheduled. ++ * Each context has its own GPU address space. ++ * Up to one context can be created for each client that opens the device file ++ * /dev/malixx. Context creation is deferred until a special ioctl() system call ++ * is made on the device file. ++ */ ++struct kbase_context { ++ struct file *filp; ++ struct kbase_device *kbdev; ++ struct list_head kctx_list_link; ++ struct kbase_mmu_table mmu; + -+ if (!WARN_ON(hctx->disable_count == SIZE_MAX)) { -+ /* -+ * If disable count is non-zero, we can just bump the disable -+ * count. -+ * -+ * Otherwise, we can't disable in an atomic context. -+ */ -+ if (hctx->disable_count != 0) { -+ hctx->disable_count++; -+ atomic_disabled = true; -+ } -+ } ++ u32 id; ++ unsigned long api_version; ++ struct list_head event_list; ++ struct list_head event_coalesce_list; ++ struct mutex event_mutex; ++#if !MALI_USE_CSF ++ atomic_t event_closed; ++#endif ++ struct workqueue_struct *event_workq; ++ atomic_t event_count; ++ int event_coalesce_count; + -+ spin_unlock_irqrestore(&hctx->state_lock, flags); ++ atomic_t flags; + -+ return atomic_disabled; -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_context_disable_atomic); ++ struct tagged_addr aliasing_sink_page; + -+void kbase_hwcnt_context_enable(struct kbase_hwcnt_context *hctx) -+{ -+ unsigned long flags; ++ spinlock_t mem_partials_lock; ++ struct list_head mem_partials; + -+ if (WARN_ON(!hctx)) -+ return; ++ struct mutex reg_lock; + -+ spin_lock_irqsave(&hctx->state_lock, flags); ++ struct rb_root reg_rbtree_same; ++ struct rb_root reg_rbtree_custom; ++ struct rb_root reg_rbtree_exec; ++#if MALI_USE_CSF ++ struct rb_root reg_rbtree_exec_fixed; ++ struct rb_root reg_rbtree_fixed; ++ atomic64_t num_fixable_allocs; ++ atomic64_t num_fixed_allocs; ++#endif ++ struct kbase_reg_zone reg_zone[KBASE_REG_ZONE_MAX]; + -+ if (!WARN_ON(hctx->disable_count == 0)) { -+ if (hctx->disable_count == 1) -+ kbasep_hwcnt_accumulator_enable(hctx); ++#if MALI_USE_CSF ++ struct kbase_csf_context csf; ++#else ++ struct kbase_jd_context jctx; ++ struct jsctx_queue jsctx_queue ++ [KBASE_JS_ATOM_SCHED_PRIO_COUNT][BASE_JM_MAX_NR_SLOTS]; ++ struct kbase_jsctx_slot_tracking slot_tracking[BASE_JM_MAX_NR_SLOTS]; ++ atomic_t atoms_pulled_all_slots; + -+ hctx->disable_count--; -+ } ++ struct list_head completed_jobs; ++ atomic_t work_count; ++ struct timer_list soft_job_timeout; + -+ spin_unlock_irqrestore(&hctx->state_lock, flags); -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_context_enable); ++ int priority; ++ s16 atoms_count[KBASE_JS_ATOM_SCHED_PRIO_COUNT]; ++ u32 slots_pullable; ++ u32 age_count; ++#endif /* MALI_USE_CSF */ + -+const struct kbase_hwcnt_metadata *kbase_hwcnt_context_metadata( -+ struct kbase_hwcnt_context *hctx) -+{ -+ if (!hctx) -+ return NULL; ++ DECLARE_BITMAP(cookies, BITS_PER_LONG); ++ struct kbase_va_region *pending_regions[BITS_PER_LONG]; + -+ return hctx->iface->metadata; -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_context_metadata); ++ wait_queue_head_t event_queue; ++ pid_t tgid; ++ pid_t pid; ++ atomic_t used_pages; ++ atomic_t nonmapped_pages; ++ atomic_t permanent_mapped_pages; + -+int kbase_hwcnt_accumulator_set_counters( -+ struct kbase_hwcnt_accumulator *accum, -+ const struct kbase_hwcnt_enable_map *new_map, -+ u64 *ts_start_ns, -+ u64 *ts_end_ns, -+ struct kbase_hwcnt_dump_buffer *dump_buf) -+{ -+ int errcode; -+ struct kbase_hwcnt_context *hctx; ++ struct kbase_mem_pool_group mem_pools; + -+ if (!accum || !new_map || !ts_start_ns || !ts_end_ns) -+ return -EINVAL; ++ struct shrinker reclaim; ++ struct list_head evict_list; ++ atomic_t evict_nents; + -+ hctx = container_of(accum, struct kbase_hwcnt_context, accum); ++ struct list_head waiting_soft_jobs; ++ spinlock_t waiting_soft_jobs_lock; + -+ if ((new_map->metadata != hctx->iface->metadata) || -+ (dump_buf && (dump_buf->metadata != hctx->iface->metadata))) -+ return -EINVAL; ++ int as_nr; + -+ mutex_lock(&hctx->accum_lock); ++ atomic_t refcount; + -+ errcode = kbasep_hwcnt_accumulator_dump( -+ hctx, ts_start_ns, ts_end_ns, dump_buf, new_map); ++ struct mm_struct *process_mm; ++ u64 gpu_va_end; ++#if MALI_USE_CSF ++ u32 running_total_tiler_heap_nr_chunks; ++ u64 running_total_tiler_heap_memory; ++ u64 peak_total_tiler_heap_memory; ++#endif ++ bool jit_va; + -+ mutex_unlock(&hctx->accum_lock); ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++ char *mem_profile_data; ++ size_t mem_profile_size; ++ struct mutex mem_profile_lock; ++ struct dentry *kctx_dentry; + -+ return errcode; -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_accumulator_set_counters); ++ unsigned int *reg_dump; ++ atomic_t job_fault_count; ++ struct list_head job_fault_resume_event_list; ++ unsigned int mem_view_column_width; + -+int kbase_hwcnt_accumulator_dump( -+ struct kbase_hwcnt_accumulator *accum, -+ u64 *ts_start_ns, -+ u64 *ts_end_ns, -+ struct kbase_hwcnt_dump_buffer *dump_buf) -+{ -+ int errcode; -+ struct kbase_hwcnt_context *hctx; ++#endif /* CONFIG_DEBUG_FS */ ++ struct kbase_va_region *jit_alloc[1 + BASE_JIT_ALLOC_COUNT]; ++ u8 jit_max_allocations; ++ u8 jit_current_allocations; ++ u8 jit_current_allocations_per_bin[256]; ++ u8 jit_group_id; ++#if MALI_JIT_PRESSURE_LIMIT_BASE ++ u64 jit_phys_pages_limit; ++ u64 jit_current_phys_pressure; ++ u64 jit_phys_pages_to_be_allocated; ++#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ ++ struct list_head jit_active_head; ++ struct list_head jit_pool_head; ++ struct list_head jit_destroy_head; ++ struct mutex jit_evict_lock; ++ struct work_struct jit_work; + -+ if (!accum || !ts_start_ns || !ts_end_ns) -+ return -EINVAL; ++ struct list_head ext_res_meta_head; + -+ hctx = container_of(accum, struct kbase_hwcnt_context, accum); ++ u8 trim_level; + -+ if (dump_buf && (dump_buf->metadata != hctx->iface->metadata)) -+ return -EINVAL; ++ struct kbase_process *kprcs; ++ struct list_head kprcs_link; + -+ mutex_lock(&hctx->accum_lock); ++#ifdef CONFIG_MALI_CINSTR_GWT ++ bool gwt_enabled; ++ bool gwt_was_enabled; ++ struct list_head gwt_current_list; ++ struct list_head gwt_snapshot_list; ++#endif + -+ errcode = kbasep_hwcnt_accumulator_dump( -+ hctx, ts_start_ns, ts_end_ns, dump_buf, NULL); ++ base_context_create_flags create_flags; + -+ mutex_unlock(&hctx->accum_lock); ++#if !MALI_USE_CSF ++ struct kbase_kinstr_jm *kinstr_jm; ++#endif ++ struct list_head tl_kctx_list_node; + -+ return errcode; -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_accumulator_dump); ++ u64 limited_core_mask; + -+u64 kbase_hwcnt_accumulator_timestamp_ns(struct kbase_hwcnt_accumulator *accum) -+{ -+ struct kbase_hwcnt_context *hctx; ++#if !MALI_USE_CSF ++ void *platform_data; ++#endif + -+ if (WARN_ON(!accum)) -+ return 0; ++ struct task_struct *task; ++}; + -+ hctx = container_of(accum, struct kbase_hwcnt_context, accum); -+ return hctx->iface->timestamp_ns(accum->backend); -+} -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_accumulator.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_accumulator.h -new file mode 100755 -index 000000000000..eb82ea4bfd14 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_accumulator.h -@@ -0,0 +1,146 @@ -+/* -+ * -+ * (C) COPYRIGHT 2018 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 ++#ifdef CONFIG_MALI_CINSTR_GWT ++/** ++ * struct kbasep_gwt_list_element - Structure used to collect GPU ++ * write faults. ++ * @link: List head for adding write faults. ++ * @region: Details of the region where we have the ++ * faulting page address. ++ * @page_addr: Page address where GPU write fault occurred. ++ * @num_pages: The number of pages modified. + * ++ * Using this structure all GPU write faults are stored in a list. + */ ++struct kbasep_gwt_list_element { ++ struct list_head link; ++ struct kbase_va_region *region; ++ u64 page_addr; ++ u64 num_pages; ++}; ++ ++#endif + +/** -+ * Hardware counter accumulator API. ++ * struct kbase_ctx_ext_res_meta - Structure which binds an external resource ++ * to a @kbase_context. ++ * @ext_res_node: List head for adding the metadata to a ++ * @kbase_context. ++ * @reg: External resource information, containing ++ * the corresponding VA region ++ * @ref: Reference count. ++ * ++ * External resources can be mapped into multiple contexts as well as the same ++ * context multiple times. ++ * As kbase_va_region is refcounted, we guarantee that it will be available ++ * for the duration of the external resource, meaning it is sufficient to use ++ * it to rederive any additional data, like the GPU address. ++ * This metadata structure binds a single external resource to a single ++ * context, ensuring that per context mapping is tracked separately so it can ++ * be overridden when needed and abuses by the application (freeing the resource ++ * multiple times) don't effect the refcount of the physical allocation. + */ ++struct kbase_ctx_ext_res_meta { ++ struct list_head ext_res_node; ++ struct kbase_va_region *reg; ++ u32 ref; ++}; + -+#ifndef _KBASE_HWCNT_ACCUMULATOR_H_ -+#define _KBASE_HWCNT_ACCUMULATOR_H_ -+ -+#include ++enum kbase_reg_access_type { ++ REG_READ, ++ REG_WRITE ++}; + -+struct kbase_hwcnt_context; -+struct kbase_hwcnt_accumulator; -+struct kbase_hwcnt_enable_map; -+struct kbase_hwcnt_dump_buffer; ++enum kbase_share_attr_bits { ++ /* (1ULL << 8) bit is reserved */ ++ SHARE_BOTH_BITS = (2ULL << 8), /* inner and outer shareable coherency */ ++ SHARE_INNER_BITS = (3ULL << 8) /* inner shareable coherency */ ++}; + +/** -+ * kbase_hwcnt_accumulator_acquire() - Acquire the hardware counter accumulator -+ * for a hardware counter context. -+ * @hctx: Non-NULL pointer to a hardware counter context. -+ * @accum: Non-NULL pointer to where the pointer to the created accumulator -+ * will be stored on success. -+ * -+ * There can exist at most one instance of the hardware counter accumulator per -+ * context at a time. -+ * -+ * If multiple clients need access to the hardware counters at the same time, -+ * then an abstraction built on top of the single instance to the hardware -+ * counter accumulator is required. -+ * -+ * No counters will be enabled with the returned accumulator. A subsequent call -+ * to kbase_hwcnt_accumulator_set_counters must be used to turn them on. -+ * -+ * There are four components to a hardware counter dump: -+ * - A set of enabled counters -+ * - A start time -+ * - An end time -+ * - A dump buffer containing the accumulated counter values for all enabled -+ * counters between the start and end times. -+ * -+ * For each dump, it is guaranteed that all enabled counters were active for the -+ * entirety of the period between the start and end times. -+ * -+ * It is also guaranteed that the start time of dump "n" is always equal to the -+ * end time of dump "n - 1". -+ * -+ * For all dumps, the values of any counters that were not enabled is undefined. ++ * kbase_device_is_cpu_coherent - Returns if the device is CPU coherent. ++ * @kbdev: kbase device + * -+ * Return: 0 on success or error code. ++ * Return: true if the device access are coherent, false if not. + */ -+int kbase_hwcnt_accumulator_acquire( -+ struct kbase_hwcnt_context *hctx, -+ struct kbase_hwcnt_accumulator **accum); ++static inline bool kbase_device_is_cpu_coherent(struct kbase_device *kbdev) ++{ ++ if ((kbdev->system_coherency == COHERENCY_ACE_LITE) || ++ (kbdev->system_coherency == COHERENCY_ACE)) ++ return true; + -+/** -+ * kbase_hwcnt_accumulator_release() - Release a hardware counter accumulator. -+ * @accum: Non-NULL pointer to the hardware counter accumulator. -+ * -+ * The accumulator must be released before the context the accumulator was -+ * created from is terminated. -+ */ -+void kbase_hwcnt_accumulator_release(struct kbase_hwcnt_accumulator *accum); ++ return false; ++} + +/** -+ * kbase_hwcnt_accumulator_set_counters() - Perform a dump of the currently -+ * enabled counters, and enable a new -+ * set of counters that will be used -+ * for subsequent dumps. -+ * @accum: Non-NULL pointer to the hardware counter accumulator. -+ * @new_map: Non-NULL pointer to the new counter enable map. Must have the -+ * same metadata as the accumulator. -+ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will -+ * be written out to on success. -+ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will -+ * be written out to on success. -+ * @dump_buf: Pointer to the buffer where the dump will be written out to on -+ * success. If non-NULL, must have the same metadata as the -+ * accumulator. If NULL, the dump will be discarded. ++ * kbase_get_lock_region_min_size_log2 - Returns the minimum size of the MMU lock ++ * region, as a logarithm + * -+ * If this function fails for some unexpected reason (i.e. anything other than -+ * invalid args), then the accumulator will be put into the error state until -+ * the parent context is next disabled. ++ * @gpu_props: GPU properties + * -+ * Return: 0 on success or error code. ++ * Return: the minimum size of the MMU lock region as dictated by the corresponding ++ * arch spec. + */ -+int kbase_hwcnt_accumulator_set_counters( -+ struct kbase_hwcnt_accumulator *accum, -+ const struct kbase_hwcnt_enable_map *new_map, -+ u64 *ts_start_ns, -+ u64 *ts_end_ns, -+ struct kbase_hwcnt_dump_buffer *dump_buf); ++static inline u64 kbase_get_lock_region_min_size_log2(struct kbase_gpu_props const *gpu_props) ++{ ++ if (GPU_ID2_MODEL_MATCH_VALUE(gpu_props->props.core_props.product_id) >= ++ GPU_ID2_MODEL_MAKE(12, 0)) ++ return 12; /* 4 kB */ + -+/** -+ * kbase_hwcnt_accumulator_dump() - Perform a dump of the currently enabled -+ * counters. -+ * @accum: Non-NULL pointer to the hardware counter accumulator. -+ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will -+ * be written out to on success. -+ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will -+ * be written out to on success. -+ * @dump_buf: Pointer to the buffer where the dump will be written out to on -+ * success. If non-NULL, must have the same metadata as the -+ * accumulator. If NULL, the dump will be discarded. -+ * -+ * If this function fails for some unexpected reason (i.e. anything other than -+ * invalid args), then the accumulator will be put into the error state until -+ * the parent context is next disabled. -+ * -+ * Return: 0 on success or error code. -+ */ -+int kbase_hwcnt_accumulator_dump( -+ struct kbase_hwcnt_accumulator *accum, -+ u64 *ts_start_ns, -+ u64 *ts_end_ns, -+ struct kbase_hwcnt_dump_buffer *dump_buf); ++ return 15; /* 32 kB */ ++} + -+/** -+ * kbase_hwcnt_accumulator_timestamp_ns() - Get the current accumulator backend -+ * timestamp. -+ * @accum: Non-NULL pointer to the hardware counter accumulator. -+ * -+ * Return: Accumulator backend timestamp in nanoseconds. -+ */ -+u64 kbase_hwcnt_accumulator_timestamp_ns(struct kbase_hwcnt_accumulator *accum); ++/* Conversion helpers for setting up high resolution timers */ ++#define HR_TIMER_DELAY_MSEC(x) (ns_to_ktime(((u64)(x))*1000000U)) ++#define HR_TIMER_DELAY_NSEC(x) (ns_to_ktime(x)) + -+#endif /* _KBASE_HWCNT_ACCUMULATOR_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend.h ++/* Maximum number of loops polling the GPU for a cache flush before we assume it must have completed */ ++#define KBASE_CLEAN_CACHE_MAX_LOOPS 100000 ++/* Maximum number of loops polling the GPU for an AS command to complete before we assume the GPU has hung */ ++#define KBASE_AS_INACTIVE_MAX_LOOPS 100000000 ++/* Maximum number of loops polling the GPU PRFCNT_ACTIVE bit before we assume the GPU has hung */ ++#define KBASE_PRFCNT_ACTIVE_MAX_LOOPS 100000000 ++#endif /* _KBASE_DEFS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c b/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c new file mode 100755 -index 000000000000..3a921b754b55 +index 000000000..7d6e47558 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend.h -@@ -0,0 +1,220 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c +@@ -0,0 +1,80 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2018, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -207993,222 +241150,82 @@ index 000000000000..3a921b754b55 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* -+ * Virtual interface for hardware counter backends. ++ * Base kernel disjoint events helper functions + */ + -+#ifndef _KBASE_HWCNT_BACKEND_H_ -+#define _KBASE_HWCNT_BACKEND_H_ -+ -+#include -+ -+struct kbase_hwcnt_metadata; -+struct kbase_hwcnt_enable_map; -+struct kbase_hwcnt_dump_buffer; ++#include + -+/* -+ * struct kbase_hwcnt_backend_info - Opaque pointer to information used to -+ * create an instance of a hardware counter -+ * backend. -+ */ -+struct kbase_hwcnt_backend_info; ++void kbase_disjoint_init(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+/* -+ * struct kbase_hwcnt_backend_info - Opaque pointer to a hardware counter -+ * backend, used to perform dumps. -+ */ -+struct kbase_hwcnt_backend; ++ atomic_set(&kbdev->disjoint_event.count, 0); ++ atomic_set(&kbdev->disjoint_event.state, 0); ++} + -+/** -+ * typedef kbase_hwcnt_backend_init_fn - Initialise a counter backend. -+ * @info: Non-NULL pointer to backend info. -+ * @out_backend: Non-NULL pointer to where backend is stored on success. -+ * -+ * All uses of the created hardware counter backend must be externally -+ * synchronised. -+ * -+ * Return: 0 on success, else error code. -+ */ -+typedef int (*kbase_hwcnt_backend_init_fn)( -+ const struct kbase_hwcnt_backend_info *info, -+ struct kbase_hwcnt_backend **out_backend); ++/* increment the disjoint event count */ ++void kbase_disjoint_event(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+/** -+ * typedef kbase_hwcnt_backend_term_fn - Terminate a counter backend. -+ * @backend: Pointer to backend to be terminated. -+ */ -+typedef void (*kbase_hwcnt_backend_term_fn)( -+ struct kbase_hwcnt_backend *backend); ++ atomic_inc(&kbdev->disjoint_event.count); ++} + -+/** -+ * typedef kbase_hwcnt_backend_timestamp_ns_fn - Get the current backend -+ * timestamp. -+ * @backend: Non-NULL pointer to backend. -+ * -+ * Return: Backend timestamp in nanoseconds. -+ */ -+typedef u64 (*kbase_hwcnt_backend_timestamp_ns_fn)( -+ struct kbase_hwcnt_backend *backend); ++/* increment the state and the event counter */ ++void kbase_disjoint_state_up(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+/** -+ * typedef kbase_hwcnt_backend_dump_enable_fn - Start counter dumping with the -+ * backend. -+ * @backend: Non-NULL pointer to backend. -+ * @enable_map: Non-NULL pointer to enable map specifying enabled counters. -+ * -+ * The enable_map must have been created using the interface's metadata. -+ * If the backend has already been enabled, an error is returned. -+ * -+ * May be called in an atomic context. -+ * -+ * Return: 0 on success, else error code. -+ */ -+typedef int (*kbase_hwcnt_backend_dump_enable_fn)( -+ struct kbase_hwcnt_backend *backend, -+ const struct kbase_hwcnt_enable_map *enable_map); ++ atomic_inc(&kbdev->disjoint_event.state); + -+/** -+ * typedef kbase_hwcnt_backend_dump_enable_nolock_fn - Start counter dumping -+ * with the backend. -+ * @backend: Non-NULL pointer to backend. -+ * @enable_map: Non-NULL pointer to enable map specifying enabled counters. -+ * -+ * Exactly the same as kbase_hwcnt_backend_dump_enable_fn(), except must be -+ * called in an atomic context with the spinlock documented by the specific -+ * backend interface held. -+ * -+ * Return: 0 on success, else error code. -+ */ -+typedef int (*kbase_hwcnt_backend_dump_enable_nolock_fn)( -+ struct kbase_hwcnt_backend *backend, -+ const struct kbase_hwcnt_enable_map *enable_map); ++ kbase_disjoint_event(kbdev); ++} + -+/** -+ * typedef kbase_hwcnt_backend_dump_disable_fn - Disable counter dumping with -+ * the backend. -+ * @backend: Non-NULL pointer to backend. -+ * -+ * If the backend is already disabled, does nothing. -+ * Any undumped counter values since the last dump get will be lost. -+ */ -+typedef void (*kbase_hwcnt_backend_dump_disable_fn)( -+ struct kbase_hwcnt_backend *backend); ++/* decrement the state */ ++void kbase_disjoint_state_down(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(atomic_read(&kbdev->disjoint_event.state) > 0); + -+/** -+ * typedef kbase_hwcnt_backend_dump_clear_fn - Reset all the current undumped -+ * counters. -+ * @backend: Non-NULL pointer to backend. -+ * -+ * If the backend is not enabled, returns an error. -+ * -+ * Return: 0 on success, else error code. -+ */ -+typedef int (*kbase_hwcnt_backend_dump_clear_fn)( -+ struct kbase_hwcnt_backend *backend); ++ kbase_disjoint_event(kbdev); + -+/** -+ * typedef kbase_hwcnt_backend_dump_request_fn - Request an asynchronous counter -+ * dump. -+ * @backend: Non-NULL pointer to backend. -+ * @dump_time_ns: Non-NULL pointer where the timestamp of when the dump was -+ * requested will be written out to on success. -+ * -+ * If the backend is not enabled or another dump is already in progress, -+ * returns an error. -+ * -+ * Return: 0 on success, else error code. -+ */ -+typedef int (*kbase_hwcnt_backend_dump_request_fn)( -+ struct kbase_hwcnt_backend *backend, -+ u64 *dump_time_ns); ++ atomic_dec(&kbdev->disjoint_event.state); ++} + -+/** -+ * typedef kbase_hwcnt_backend_dump_wait_fn - Wait until the last requested -+ * counter dump has completed. -+ * @backend: Non-NULL pointer to backend. -+ * -+ * If the backend is not enabled, returns an error. -+ * -+ * Return: 0 on success, else error code. -+ */ -+typedef int (*kbase_hwcnt_backend_dump_wait_fn)( -+ struct kbase_hwcnt_backend *backend); ++/* increments the count only if the state is > 0 */ ++void kbase_disjoint_event_potential(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+/** -+ * typedef kbase_hwcnt_backend_dump_get_fn - Copy or accumulate enable the -+ * counters dumped after the last dump -+ * request into the dump buffer. -+ * @backend: Non-NULL pointer to backend. -+ * @dump_buffer: Non-NULL pointer to destination dump buffer. -+ * @enable_map: Non-NULL pointer to enable map specifying enabled values. -+ * @accumulate: True if counters should be accumulated into dump_buffer, rather -+ * than copied. -+ * -+ * If the backend is not enabled, returns an error. -+ * If a dump is in progress (i.e. dump_wait has not yet returned successfully) -+ * then the resultant contents of the dump buffer will be undefined. -+ * -+ * Return: 0 on success, else error code. -+ */ -+typedef int (*kbase_hwcnt_backend_dump_get_fn)( -+ struct kbase_hwcnt_backend *backend, -+ struct kbase_hwcnt_dump_buffer *dump_buffer, -+ const struct kbase_hwcnt_enable_map *enable_map, -+ bool accumulate); ++ if (atomic_read(&kbdev->disjoint_event.state)) ++ kbase_disjoint_event(kbdev); ++} + -+/** -+ * struct kbase_hwcnt_backend_interface - Hardware counter backend virtual -+ * interface. -+ * @metadata: Immutable hardware counter metadata. -+ * @info: Immutable info used to initialise an instance of the -+ * backend. -+ * @init: Function ptr to initialise an instance of the backend. -+ * @term: Function ptr to terminate an instance of the backend. -+ * @timestamp_ns: Function ptr to get the current backend timestamp. -+ * @dump_enable: Function ptr to enable dumping. -+ * @dump_enable_nolock: Function ptr to enable dumping while the -+ * backend-specific spinlock is already held. -+ * @dump_disable: Function ptr to disable dumping. -+ * @dump_clear: Function ptr to clear counters. -+ * @dump_request: Function ptr to request a dump. -+ * @dump_wait: Function ptr to wait until dump to complete. -+ * @dump_get: Function ptr to copy or accumulate dump into a dump -+ * buffer. -+ */ -+struct kbase_hwcnt_backend_interface { -+ const struct kbase_hwcnt_metadata *metadata; -+ const struct kbase_hwcnt_backend_info *info; -+ kbase_hwcnt_backend_init_fn init; -+ kbase_hwcnt_backend_term_fn term; -+ kbase_hwcnt_backend_timestamp_ns_fn timestamp_ns; -+ kbase_hwcnt_backend_dump_enable_fn dump_enable; -+ kbase_hwcnt_backend_dump_enable_nolock_fn dump_enable_nolock; -+ kbase_hwcnt_backend_dump_disable_fn dump_disable; -+ kbase_hwcnt_backend_dump_clear_fn dump_clear; -+ kbase_hwcnt_backend_dump_request_fn dump_request; -+ kbase_hwcnt_backend_dump_wait_fn dump_wait; -+ kbase_hwcnt_backend_dump_get_fn dump_get; -+}; ++u32 kbase_disjoint_event_get(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+#endif /* _KBASE_HWCNT_BACKEND_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend_jm.c b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend_jm.c ++ return atomic_read(&kbdev->disjoint_event.count); ++} ++KBASE_EXPORT_TEST_API(kbase_disjoint_event_get); +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c new file mode 100755 -index 000000000000..9f65de41694f +index 000000000..0e0dab912 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend_jm.c -@@ -0,0 +1,736 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c +@@ -0,0 +1,452 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -208219,738 +241236,533 @@ index 000000000000..9f65de41694f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include "mali_kbase_hwcnt_backend_jm.h" -+#include "mali_kbase_hwcnt_gpu.h" -+#include "mali_kbase_hwcnt_types.h" -+#include "mali_kbase.h" -+#include "mali_kbase_pm_ca.h" -+#include "mali_kbase_hwaccess_instr.h" -+#include "mali_kbase_hwaccess_time.h" -+#include "mali_kbase_ccswe.h" ++/* ++ * Implementation of the dummy job execution workaround for the GPU hang issue. ++ */ + -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+#include "backend/gpu/mali_kbase_model_dummy.h" -+#endif -+#include "backend/gpu/mali_kbase_clk_rate_trace_mgr.h" ++#include ++#include ++#include + -+#if MALI_USE_CSF -+#include "mali_kbase_ctx_sched.h" -+#else -+#include "backend/gpu/mali_kbase_pm_internal.h" -+#endif ++#include ++#include + -+/** -+ * struct kbase_hwcnt_backend_jm_info - Information used to create an instance -+ * of a JM hardware counter backend. -+ * @kbdev: KBase device. -+ * @use_secondary: True if secondary performance counters should be used, -+ * else false. Ignored if secondary counters are not supported. -+ * @metadata: Hardware counter metadata. -+ * @dump_bytes: Bytes of GPU memory required to perform a -+ * hardware counter dump. -+ */ -+struct kbase_hwcnt_backend_jm_info { -+ struct kbase_device *kbdev; -+ bool use_secondary; -+ const struct kbase_hwcnt_metadata *metadata; -+ size_t dump_bytes; -+}; ++#define DUMMY_JOB_WA_BINARY_NAME "valhall-1691526.wa" + -+/** -+ * struct kbase_hwcnt_backend_jm - Instance of a JM hardware counter backend. -+ * @info: Info used to create the backend. -+ * @kctx: KBase context used for GPU memory allocation and -+ * counter dumping. -+ * @gpu_dump_va: GPU hardware counter dump buffer virtual address. -+ * @cpu_dump_va: CPU mapping of gpu_dump_va. -+ * @vmap: Dump buffer vmap. -+ * @enabled: True if dumping has been enabled, else false. -+ * @pm_core_mask: PM state sync-ed shaders core mask for the enabled -+ * dumping. -+ * @clk_enable_map: The enable map specifying enabled clock domains. -+ * @cycle_count_elapsed: -+ * Cycle count elapsed for a given sample period. -+ * The top clock cycle, index 0, is read directly from -+ * hardware, but the other clock domains need to be -+ * calculated with software estimation. -+ * @prev_cycle_count: Previous cycle count to calculate the cycle count for -+ * sample period. -+ * @rate_listener: Clock rate listener callback state. -+ * @ccswe_shader_cores: Shader cores cycle count software estimator. -+ */ -+struct kbase_hwcnt_backend_jm { -+ const struct kbase_hwcnt_backend_jm_info *info; -+ struct kbase_context *kctx; -+ u64 gpu_dump_va; -+ void *cpu_dump_va; -+ struct kbase_vmap_struct *vmap; -+ bool enabled; -+ u64 pm_core_mask; -+ u64 clk_enable_map; -+ u64 cycle_count_elapsed[BASE_MAX_NR_CLOCKS_REGULATORS]; -+ u64 prev_cycle_count[BASE_MAX_NR_CLOCKS_REGULATORS]; -+ struct kbase_clk_rate_listener rate_listener; -+ struct kbase_ccswe ccswe_shader_cores; -+}; ++struct wa_header { ++ u16 signature; ++ u16 version; ++ u32 info_offset; ++} __packed; + -+/** -+ * kbasep_hwcnt_backend_jm_on_freq_change() - On freq change callback -+ * -+ * @rate_listener: Callback state -+ * @clk_index: Clock index -+ * @clk_rate_hz: Clock frequency(hz) -+ */ -+static void kbasep_hwcnt_backend_jm_on_freq_change( -+ struct kbase_clk_rate_listener *rate_listener, -+ u32 clk_index, -+ u32 clk_rate_hz) -+{ -+ struct kbase_hwcnt_backend_jm *backend_jm = container_of( -+ rate_listener, struct kbase_hwcnt_backend_jm, rate_listener); -+ u64 timestamp_ns; ++struct wa_v2_info { ++ u64 jc; ++ u32 js; ++ u32 blob_offset; ++ u64 flags; ++} __packed; + -+ if (clk_index != KBASE_CLOCK_DOMAIN_SHADER_CORES) -+ return; ++struct wa_blob { ++ u64 base; ++ u32 size; ++ u32 map_flags; ++ u32 payload_offset; ++ u32 blob_offset; ++} __packed; + -+ timestamp_ns = ktime_get_raw_ns(); -+ kbase_ccswe_freq_change( -+ &backend_jm->ccswe_shader_cores, timestamp_ns, clk_rate_hz); ++static bool in_range(const u8 *base, const u8 *end, off_t off, size_t sz) ++{ ++ return !(end - base - off < sz); +} + -+/** -+ * kbasep_hwcnt_backend_jm_cc_enable() - Enable cycle count tracking -+ * -+ * @backend: Non-NULL pointer to backend. -+ * @enable_map: Non-NULL pointer to enable map specifying enabled counters. -+ * @timestamp_ns: Timestamp(ns) when HWCNT were enabled. -+ */ -+static void kbasep_hwcnt_backend_jm_cc_enable( -+ struct kbase_hwcnt_backend_jm *backend_jm, -+ const struct kbase_hwcnt_enable_map *enable_map, -+ u64 timestamp_ns) ++static u32 wait_any(struct kbase_device *kbdev, off_t offset, u32 bits) +{ -+ struct kbase_device *kbdev = backend_jm->kctx->kbdev; -+ u64 clk_enable_map = enable_map->clk_enable_map; -+ u64 cycle_count; ++ int loop; ++ const int timeout = 100; ++ u32 val; + -+ if (kbase_hwcnt_clk_enable_map_enabled( -+ clk_enable_map, KBASE_CLOCK_DOMAIN_TOP)) { -+#if !MALI_USE_CSF -+ /* turn on the cycle counter */ -+ kbase_pm_request_gpu_cycle_counter_l2_is_on(kbdev); -+#endif -+ /* Read cycle count for top clock domain. */ -+ kbase_backend_get_gpu_time_norequest( -+ kbdev, &cycle_count, NULL, NULL); ++ for (loop = 0; loop < timeout; loop++) { ++ val = kbase_reg_read(kbdev, offset); ++ if (val & bits) ++ break; ++ udelay(10); ++ } + -+ backend_jm->prev_cycle_count[KBASE_CLOCK_DOMAIN_TOP] = -+ cycle_count; ++ if (loop == timeout) { ++ dev_err(kbdev->dev, ++ "Timeout reading register 0x%lx, bits 0x%lx, last read was 0x%lx\n", ++ (unsigned long)offset, (unsigned long)bits, ++ (unsigned long)val); + } + -+ if (kbase_hwcnt_clk_enable_map_enabled( -+ clk_enable_map, KBASE_CLOCK_DOMAIN_SHADER_CORES)) { -+ /* software estimation for non-top clock domains */ -+ struct kbase_clk_rate_trace_manager *rtm = &kbdev->pm.clk_rtm; -+ const struct kbase_clk_data *clk_data = -+ rtm->clks[KBASE_CLOCK_DOMAIN_SHADER_CORES]; -+ u32 cur_freq; -+ unsigned long flags; ++ return (val & bits); ++} + -+ spin_lock_irqsave(&rtm->lock, flags); ++static int wait(struct kbase_device *kbdev, off_t offset, u32 bits, bool set) ++{ ++ int loop; ++ const int timeout = 100; ++ u32 val; ++ u32 target = 0; + -+ cur_freq = (u32) clk_data->clock_val; -+ kbase_ccswe_reset(&backend_jm->ccswe_shader_cores); -+ kbase_ccswe_freq_change( -+ &backend_jm->ccswe_shader_cores, -+ timestamp_ns, -+ cur_freq); ++ if (set) ++ target = bits; + -+ kbase_clk_rate_trace_manager_subscribe_no_lock( -+ rtm, &backend_jm->rate_listener); ++ for (loop = 0; loop < timeout; loop++) { ++ val = kbase_reg_read(kbdev, (offset)); ++ if ((val & bits) == target) ++ break; + -+ spin_unlock_irqrestore(&rtm->lock, flags); ++ udelay(10); ++ } + -+ /* ccswe was reset. The estimated cycle is zero. */ -+ backend_jm->prev_cycle_count[ -+ KBASE_CLOCK_DOMAIN_SHADER_CORES] = 0; ++ if (loop == timeout) { ++ dev_err(kbdev->dev, ++ "Timeout reading register 0x%lx, bits 0x%lx, last read was 0x%lx\n", ++ (unsigned long)offset, (unsigned long)bits, ++ (unsigned long)val); ++ return -ETIMEDOUT; + } + -+ /* Keep clk_enable_map for dump_request. */ -+ backend_jm->clk_enable_map = clk_enable_map; ++ return 0; +} + -+/** -+ * kbasep_hwcnt_backend_jm_cc_disable() - Disable cycle count tracking -+ * -+ * @backend: Non-NULL pointer to backend. -+ */ -+static void kbasep_hwcnt_backend_jm_cc_disable( -+ struct kbase_hwcnt_backend_jm *backend_jm) ++static inline int run_job(struct kbase_device *kbdev, int as, int slot, ++ u64 cores, u64 jc) +{ -+ struct kbase_device *kbdev = backend_jm->kctx->kbdev; -+ struct kbase_clk_rate_trace_manager *rtm = &kbdev->pm.clk_rtm; -+ u64 clk_enable_map = backend_jm->clk_enable_map; ++ u32 done; + -+#if !MALI_USE_CSF -+ if (kbase_hwcnt_clk_enable_map_enabled( -+ clk_enable_map, KBASE_CLOCK_DOMAIN_TOP)) { -+ /* turn off the cycle counter */ -+ kbase_pm_release_gpu_cycle_counter(kbdev); -+ } -+#endif -+ if (kbase_hwcnt_clk_enable_map_enabled( -+ clk_enable_map, KBASE_CLOCK_DOMAIN_SHADER_CORES)) { ++ /* setup job */ ++ kbase_reg_write(kbdev, JOB_SLOT_REG(slot, JS_HEAD_NEXT_LO), ++ jc & U32_MAX); ++ kbase_reg_write(kbdev, JOB_SLOT_REG(slot, JS_HEAD_NEXT_HI), ++ jc >> 32); ++ kbase_reg_write(kbdev, JOB_SLOT_REG(slot, JS_AFFINITY_NEXT_LO), ++ cores & U32_MAX); ++ kbase_reg_write(kbdev, JOB_SLOT_REG(slot, JS_AFFINITY_NEXT_HI), ++ cores >> 32); ++ kbase_reg_write(kbdev, JOB_SLOT_REG(slot, JS_CONFIG_NEXT), ++ JS_CONFIG_DISABLE_DESCRIPTOR_WR_BK | as); + -+ kbase_clk_rate_trace_manager_unsubscribe( -+ rtm, &backend_jm->rate_listener); -+ } -+} ++ /* go */ ++ kbase_reg_write(kbdev, JOB_SLOT_REG(slot, JS_COMMAND_NEXT), ++ JS_COMMAND_START); + ++ /* wait for the slot to finish (done, error) */ ++ done = wait_any(kbdev, JOB_CONTROL_REG(JOB_IRQ_RAWSTAT), ++ (1ul << (16+slot)) | (1ul << slot)); ++ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_CLEAR), done); + -+/* JM backend implementation of kbase_hwcnt_backend_timestamp_ns_fn */ -+static u64 kbasep_hwcnt_backend_jm_timestamp_ns( -+ struct kbase_hwcnt_backend *backend) -+{ -+ (void)backend; -+ return ktime_get_raw_ns(); ++ if (done != (1ul << slot)) { ++ dev_err(kbdev->dev, ++ "Failed to run WA job on slot %d cores 0x%llx: done 0x%lx\n", ++ slot, (unsigned long long)cores, ++ (unsigned long)done); ++ dev_err(kbdev->dev, "JS_STATUS on failure: 0x%x\n", ++ kbase_reg_read(kbdev, JOB_SLOT_REG(slot, JS_STATUS))); ++ ++ return -EFAULT; ++ } else { ++ return 0; ++ } +} + -+/* JM backend implementation of kbase_hwcnt_backend_dump_enable_nolock_fn */ -+static int kbasep_hwcnt_backend_jm_dump_enable_nolock( -+ struct kbase_hwcnt_backend *backend, -+ const struct kbase_hwcnt_enable_map *enable_map) ++/* To be called after power up & MMU init, but before everything else */ ++int kbase_dummy_job_wa_execute(struct kbase_device *kbdev, u64 cores) +{ -+ int errcode; -+ struct kbase_hwcnt_backend_jm *backend_jm = -+ (struct kbase_hwcnt_backend_jm *)backend; -+ struct kbase_context *kctx; -+ struct kbase_device *kbdev; -+ struct kbase_hwcnt_physical_enable_map phys; -+ struct kbase_instr_hwcnt_enable enable; -+ u64 timestamp_ns; ++ int as; ++ int slot; ++ u64 jc; ++ int failed = 0; ++ int runs = 0; ++ u32 old_gpu_mask; ++ u32 old_job_mask; + -+ if (!backend_jm || !enable_map || backend_jm->enabled || -+ (enable_map->metadata != backend_jm->info->metadata)) -+ return -EINVAL; ++ if (!kbdev) ++ return -EFAULT; + -+ kctx = backend_jm->kctx; -+ kbdev = backend_jm->kctx->kbdev; ++ if (!kbdev->dummy_job_wa.ctx) ++ return -EFAULT; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ as = kbdev->dummy_job_wa.ctx->as_nr; ++ slot = kbdev->dummy_job_wa.slot; ++ jc = kbdev->dummy_job_wa.jc; + -+ kbase_hwcnt_gpu_enable_map_to_physical(&phys, enable_map); ++ /* mask off all but MMU IRQs */ ++ old_gpu_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK)); ++ old_job_mask = kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_MASK)); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), 0); ++ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_MASK), 0); + -+ enable.fe_bm = phys.fe_bm; -+ enable.shader_bm = phys.shader_bm; -+ enable.tiler_bm = phys.tiler_bm; -+ enable.mmu_l2_bm = phys.mmu_l2_bm; -+ enable.use_secondary = backend_jm->info->use_secondary; -+ enable.dump_buffer = backend_jm->gpu_dump_va; -+ enable.dump_buffer_bytes = backend_jm->info->dump_bytes; ++ /* power up requested cores */ ++ kbase_reg_write(kbdev, SHADER_PWRON_LO, (cores & U32_MAX)); ++ kbase_reg_write(kbdev, SHADER_PWRON_HI, (cores >> 32)); + -+ timestamp_ns = kbasep_hwcnt_backend_jm_timestamp_ns(backend); ++ if (kbdev->dummy_job_wa.flags & KBASE_DUMMY_JOB_WA_FLAG_WAIT_POWERUP) { ++ /* wait for power-ups */ ++ wait(kbdev, SHADER_READY_LO, (cores & U32_MAX), true); ++ if (cores >> 32) ++ wait(kbdev, SHADER_READY_HI, (cores >> 32), true); ++ } + -+ errcode = kbase_instr_hwcnt_enable_internal(kbdev, kctx, &enable); -+ if (errcode) -+ goto error; ++ if (kbdev->dummy_job_wa.flags & KBASE_DUMMY_JOB_WA_FLAG_SERIALIZE) { ++ int i; + -+ backend_jm->pm_core_mask = kbase_pm_ca_get_instr_core_mask(kbdev); -+ backend_jm->enabled = true; ++ /* do for each requested core */ ++ for (i = 0; i < sizeof(cores) * 8; i++) { ++ u64 affinity; + -+ kbasep_hwcnt_backend_jm_cc_enable(backend_jm, enable_map, timestamp_ns); ++ affinity = 1ull << i; + -+ return 0; -+error: -+ return errcode; -+} ++ if (!(cores & affinity)) ++ continue; + -+/* JM backend implementation of kbase_hwcnt_backend_dump_enable_fn */ -+static int kbasep_hwcnt_backend_jm_dump_enable( -+ struct kbase_hwcnt_backend *backend, -+ const struct kbase_hwcnt_enable_map *enable_map) -+{ -+ unsigned long flags; -+ int errcode; -+ struct kbase_hwcnt_backend_jm *backend_jm = -+ (struct kbase_hwcnt_backend_jm *)backend; -+ struct kbase_device *kbdev; ++ if (run_job(kbdev, as, slot, affinity, jc)) ++ failed++; ++ runs++; ++ } + -+ if (!backend_jm) -+ return -EINVAL; ++ } else { ++ if (run_job(kbdev, as, slot, cores, jc)) ++ failed++; ++ runs++; ++ } + -+ kbdev = backend_jm->kctx->kbdev; ++ if (kbdev->dummy_job_wa.flags & ++ KBASE_DUMMY_JOB_WA_FLAG_LOGICAL_SHADER_POWER) { ++ /* power off shader cores (to reduce any dynamic leakage) */ ++ kbase_reg_write(kbdev, SHADER_PWROFF_LO, (cores & U32_MAX)); ++ kbase_reg_write(kbdev, SHADER_PWROFF_HI, (cores >> 32)); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ /* wait for power off complete */ ++ wait(kbdev, SHADER_READY_LO, (cores & U32_MAX), false); ++ wait(kbdev, SHADER_PWRTRANS_LO, (cores & U32_MAX), false); ++ if (cores >> 32) { ++ wait(kbdev, SHADER_READY_HI, (cores >> 32), false); ++ wait(kbdev, SHADER_PWRTRANS_HI, (cores >> 32), false); ++ } ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), U32_MAX); ++ } + -+ errcode = kbasep_hwcnt_backend_jm_dump_enable_nolock( -+ backend, enable_map); ++ /* restore IRQ masks */ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), old_gpu_mask); ++ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_MASK), old_job_mask); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ if (failed) ++ dev_err(kbdev->dev, ++ "WA complete with %d failures out of %d runs\n", failed, ++ runs); + -+ return errcode; ++ return failed ? -EFAULT : 0; +} + -+/* JM backend implementation of kbase_hwcnt_backend_dump_disable_fn */ -+static void kbasep_hwcnt_backend_jm_dump_disable( -+ struct kbase_hwcnt_backend *backend) ++static ssize_t dummy_job_wa_info_show(struct device * const dev, ++ struct device_attribute * const attr, char * const buf) +{ -+ int errcode; -+ struct kbase_hwcnt_backend_jm *backend_jm = -+ (struct kbase_hwcnt_backend_jm *)backend; -+ -+ if (WARN_ON(!backend_jm) || !backend_jm->enabled) -+ return; ++ struct kbase_device *const kbdev = dev_get_drvdata(dev); ++ int err; + -+ kbasep_hwcnt_backend_jm_cc_disable(backend_jm); ++ if (!kbdev || !kbdev->dummy_job_wa.ctx) ++ return -ENODEV; + -+ errcode = kbase_instr_hwcnt_disable_internal(backend_jm->kctx); -+ WARN_ON(errcode); ++ err = scnprintf(buf, PAGE_SIZE, "slot %u flags %llx\n", ++ kbdev->dummy_job_wa.slot, kbdev->dummy_job_wa.flags); + -+ backend_jm->enabled = false; ++ return err; +} + -+/* JM backend implementation of kbase_hwcnt_backend_dump_clear_fn */ -+static int kbasep_hwcnt_backend_jm_dump_clear( -+ struct kbase_hwcnt_backend *backend) ++static DEVICE_ATTR_RO(dummy_job_wa_info); ++ ++static bool wa_blob_load_needed(struct kbase_device *kbdev) +{ -+ struct kbase_hwcnt_backend_jm *backend_jm = -+ (struct kbase_hwcnt_backend_jm *)backend; ++ if (of_machine_is_compatible("arm,juno")) ++ return false; + -+ if (!backend_jm || !backend_jm->enabled) -+ return -EINVAL; ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TTRX_3485)) ++ return true; + -+ return kbase_instr_hwcnt_clear(backend_jm->kctx); ++ return false; +} + -+/* JM backend implementation of kbase_hwcnt_backend_dump_request_fn */ -+static int kbasep_hwcnt_backend_jm_dump_request( -+ struct kbase_hwcnt_backend *backend, -+ u64 *dump_time_ns) ++int kbase_dummy_job_wa_load(struct kbase_device *kbdev) +{ -+ struct kbase_hwcnt_backend_jm *backend_jm = -+ (struct kbase_hwcnt_backend_jm *)backend; -+ struct kbase_device *kbdev; -+ const struct kbase_hwcnt_metadata *metadata; -+ u64 current_cycle_count; -+ size_t clk; -+ int ret; -+ -+ if (!backend_jm || !backend_jm->enabled) -+ return -EINVAL; ++ const struct firmware *firmware; ++ static const char wa_name[] = DUMMY_JOB_WA_BINARY_NAME; ++ const u32 signature = 0x4157; ++ const u32 version = 2; ++ const u8 *fw_end; ++ const u8 *fw; ++ const struct wa_header *header; ++ const struct wa_v2_info *v2_info; ++ u32 blob_offset; ++ int err; ++ struct kbase_context *kctx; + -+ kbdev = backend_jm->kctx->kbdev; -+ metadata = backend_jm->info->metadata; ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; + -+ /* Disable pre-emption, to make the timestamp as accurate as possible */ -+ preempt_disable(); -+ { -+ *dump_time_ns = kbasep_hwcnt_backend_jm_timestamp_ns(backend); -+ ret = kbase_instr_hwcnt_request_dump(backend_jm->kctx); ++ lockdep_assert_held(&kbdev->fw_load_lock); + -+ kbase_hwcnt_metadata_for_each_clock(metadata, clk) { -+ if (!kbase_hwcnt_clk_enable_map_enabled( -+ backend_jm->clk_enable_map, clk)) -+ continue; ++ if (!wa_blob_load_needed(kbdev)) ++ return 0; + -+ if (clk == KBASE_CLOCK_DOMAIN_TOP) { -+ /* Read cycle count for top clock domain. */ -+ kbase_backend_get_gpu_time_norequest( -+ kbdev, ¤t_cycle_count, -+ NULL, NULL); -+ } else { -+ /* -+ * Estimate cycle count for non-top clock -+ * domain. -+ */ -+ current_cycle_count = kbase_ccswe_cycle_at( -+ &backend_jm->ccswe_shader_cores, -+ *dump_time_ns); -+ } -+ backend_jm->cycle_count_elapsed[clk] = -+ current_cycle_count - -+ backend_jm->prev_cycle_count[clk]; ++ /* load the wa */ ++ err = request_firmware(&firmware, wa_name, kbdev->dev); + -+ /* -+ * Keep the current cycle count for later calculation. -+ */ -+ backend_jm->prev_cycle_count[clk] = current_cycle_count; -+ } ++ if (err) { ++ dev_err(kbdev->dev, "WA blob missing. Please refer to the Arm Mali DDK Valhall Release Notes, " ++ "Part number DC-06002 or contact support-mali@arm.com - driver probe will be failed"); ++ return -ENODEV; + } -+ preempt_enable(); -+ -+ return ret; -+} + -+/* JM backend implementation of kbase_hwcnt_backend_dump_wait_fn */ -+static int kbasep_hwcnt_backend_jm_dump_wait( -+ struct kbase_hwcnt_backend *backend) -+{ -+ struct kbase_hwcnt_backend_jm *backend_jm = -+ (struct kbase_hwcnt_backend_jm *)backend; ++ kctx = kbase_create_context(kbdev, true, ++ BASE_CONTEXT_CREATE_FLAG_NONE, 0, ++ NULL); + -+ if (!backend_jm || !backend_jm->enabled) -+ return -EINVAL; ++ if (!kctx) { ++ dev_err(kbdev->dev, "Failed to create WA context\n"); ++ goto no_ctx; ++ } + -+ return kbase_instr_hwcnt_wait_for_dump(backend_jm->kctx); -+} ++ fw = firmware->data; ++ fw_end = fw + firmware->size; + -+/* JM backend implementation of kbase_hwcnt_backend_dump_get_fn */ -+static int kbasep_hwcnt_backend_jm_dump_get( -+ struct kbase_hwcnt_backend *backend, -+ struct kbase_hwcnt_dump_buffer *dst, -+ const struct kbase_hwcnt_enable_map *dst_enable_map, -+ bool accumulate) -+{ -+ struct kbase_hwcnt_backend_jm *backend_jm = -+ (struct kbase_hwcnt_backend_jm *)backend; -+ size_t clk; ++ dev_dbg(kbdev->dev, "Loaded firmware of size %zu bytes\n", ++ firmware->size); + -+ if (!backend_jm || !dst || !dst_enable_map || -+ (backend_jm->info->metadata != dst->metadata) || -+ (dst_enable_map->metadata != dst->metadata)) -+ return -EINVAL; ++ if (!in_range(fw, fw_end, 0, sizeof(*header))) { ++ dev_err(kbdev->dev, "WA too small\n"); ++ goto bad_fw; ++ } + -+ /* Invalidate the kernel buffer before reading from it. */ -+ kbase_sync_mem_regions( -+ backend_jm->kctx, backend_jm->vmap, KBASE_SYNC_TO_CPU); ++ header = (const struct wa_header *)(fw + 0); + -+ kbase_hwcnt_metadata_for_each_clock(dst_enable_map->metadata, clk) { -+ if (!kbase_hwcnt_clk_enable_map_enabled( -+ dst_enable_map->clk_enable_map, clk)) -+ continue; ++ if (header->signature != signature) { ++ dev_err(kbdev->dev, "WA signature failure: 0x%lx\n", ++ (unsigned long)header->signature); ++ goto bad_fw; ++ } + -+ /* Extract elapsed cycle count for each clock domain. */ -+ dst->clk_cnt_buf[clk] = backend_jm->cycle_count_elapsed[clk]; ++ if (header->version != version) { ++ dev_err(kbdev->dev, "WA version 0x%lx not supported\n", ++ (unsigned long)header->version); ++ goto bad_fw; + } + -+ return kbase_hwcnt_gpu_dump_get( -+ dst, backend_jm->cpu_dump_va, dst_enable_map, -+ backend_jm->pm_core_mask, accumulate); -+} ++ if (!in_range(fw, fw_end, header->info_offset, sizeof(*v2_info))) { ++ dev_err(kbdev->dev, "WA info offset out of bounds\n"); ++ goto bad_fw; ++ } + -+/** -+ * kbasep_hwcnt_backend_jm_dump_alloc() - Allocate a GPU dump buffer. -+ * @info: Non-NULL pointer to JM backend info. -+ * @kctx: Non-NULL pointer to kbase context. -+ * @gpu_dump_va: Non-NULL pointer to where GPU dump buffer virtual address -+ * is stored on success. -+ * -+ * Return: 0 on success, else error code. -+ */ -+static int kbasep_hwcnt_backend_jm_dump_alloc( -+ const struct kbase_hwcnt_backend_jm_info *info, -+ struct kbase_context *kctx, -+ u64 *gpu_dump_va) -+{ -+ struct kbase_va_region *reg; -+ u64 flags; -+ u64 nr_pages; ++ v2_info = (const struct wa_v2_info *)(fw + header->info_offset); + -+ WARN_ON(!info); -+ WARN_ON(!kctx); -+ WARN_ON(!gpu_dump_va); ++ if (v2_info->flags & ~KBASE_DUMMY_JOB_WA_FLAGS) { ++ dev_err(kbdev->dev, "Unsupported WA flag(s): 0x%llx\n", ++ (unsigned long long)v2_info->flags); ++ goto bad_fw; ++ } + -+ flags = BASE_MEM_PROT_CPU_RD | -+ BASE_MEM_PROT_GPU_WR | -+ BASEP_MEM_PERMANENT_KERNEL_MAPPING | -+ BASE_MEM_CACHED_CPU; ++ kbdev->dummy_job_wa.slot = v2_info->js; ++ kbdev->dummy_job_wa.jc = v2_info->jc; ++ kbdev->dummy_job_wa.flags = v2_info->flags; + -+ if (kctx->kbdev->mmu_mode->flags & KBASE_MMU_MODE_HAS_NON_CACHEABLE) -+ flags |= BASE_MEM_UNCACHED_GPU; ++ blob_offset = v2_info->blob_offset; + -+ nr_pages = PFN_UP(info->dump_bytes); ++ while (blob_offset) { ++ const struct wa_blob *blob; ++ size_t nr_pages; ++ u64 flags; ++ u64 gpu_va; ++ struct kbase_va_region *va_region; + -+ reg = kbase_mem_alloc(kctx, nr_pages, nr_pages, 0, &flags, gpu_dump_va); ++ if (!in_range(fw, fw_end, blob_offset, sizeof(*blob))) { ++ dev_err(kbdev->dev, "Blob offset out-of-range: 0x%lx\n", ++ (unsigned long)blob_offset); ++ goto bad_fw; ++ } + -+ if (!reg) -+ return -ENOMEM; ++ blob = (const struct wa_blob *)(fw + blob_offset); ++ if (!in_range(fw, fw_end, blob->payload_offset, blob->size)) { ++ dev_err(kbdev->dev, "Payload out-of-bounds\n"); ++ goto bad_fw; ++ } + -+ return 0; -+} ++ gpu_va = blob->base; ++ if (PAGE_ALIGN(gpu_va) != gpu_va) { ++ dev_err(kbdev->dev, "blob not page aligned\n"); ++ goto bad_fw; ++ } ++ nr_pages = PFN_UP(blob->size); ++ flags = blob->map_flags | BASE_MEM_FLAG_MAP_FIXED; + -+/** -+ * kbasep_hwcnt_backend_jm_dump_free() - Free an allocated GPU dump buffer. -+ * @kctx: Non-NULL pointer to kbase context. -+ * @gpu_dump_va: GPU dump buffer virtual address. -+ */ -+static void kbasep_hwcnt_backend_jm_dump_free( -+ struct kbase_context *kctx, -+ u64 gpu_dump_va) -+{ -+ WARN_ON(!kctx); -+ if (gpu_dump_va) -+ kbase_mem_free(kctx, gpu_dump_va); -+} ++ va_region = kbase_mem_alloc(kctx, nr_pages, nr_pages, 0, &flags, ++ &gpu_va, mmu_sync_info); + -+/** -+ * kbasep_hwcnt_backend_jm_destroy() - Destroy a JM backend. -+ * @backend: Pointer to JM backend to destroy. -+ * -+ * Can be safely called on a backend in any state of partial construction. -+ */ -+static void kbasep_hwcnt_backend_jm_destroy( -+ struct kbase_hwcnt_backend_jm *backend) -+{ -+ if (!backend) -+ return; ++ if (!va_region) { ++ dev_err(kbdev->dev, "Failed to allocate for blob\n"); ++ } else { ++ struct kbase_vmap_struct vmap = { 0 }; ++ const u8 *payload; ++ void *dst; + -+ if (backend->kctx) { -+#if MALI_USE_CSF -+ unsigned long flags; -+#endif -+ struct kbase_context *kctx = backend->kctx; -+ struct kbase_device *kbdev = kctx->kbdev; ++ /* copy the payload, */ ++ payload = fw + blob->payload_offset; + -+ if (backend->cpu_dump_va) -+ kbase_phy_alloc_mapping_put(kctx, backend->vmap); ++ dst = kbase_vmap(kctx, ++ va_region->start_pfn << PAGE_SHIFT, ++ nr_pages << PAGE_SHIFT, &vmap); + -+ if (backend->gpu_dump_va) -+ kbasep_hwcnt_backend_jm_dump_free( -+ kctx, backend->gpu_dump_va); ++ if (dst) { ++ memcpy(dst, payload, blob->size); ++ kbase_vunmap(kctx, &vmap); ++ } else { ++ dev_err(kbdev->dev, ++ "Failed to copy payload\n"); ++ } + -+#if MALI_USE_CSF -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_ctx_sched_release_ctx(kctx); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+#else -+ kbasep_js_release_privileged_ctx(kbdev, kctx); -+#endif -+ kbase_destroy_context(kctx); ++ } ++ blob_offset = blob->blob_offset; /* follow chain */ + } + -+ kfree(backend); -+} -+ -+/** -+ * kbasep_hwcnt_backend_jm_create() - Create a JM backend. -+ * @info: Non-NULL pointer to backend info. -+ * @out_backend: Non-NULL pointer to where backend is stored on success. -+ * -+ * Return: 0 on success, else error code. -+ */ -+static int kbasep_hwcnt_backend_jm_create( -+ const struct kbase_hwcnt_backend_jm_info *info, -+ struct kbase_hwcnt_backend_jm **out_backend) -+{ -+#if MALI_USE_CSF -+ unsigned long flags; -+#endif -+ int errcode; -+ struct kbase_device *kbdev; -+ struct kbase_hwcnt_backend_jm *backend = NULL; -+ -+ WARN_ON(!info); -+ WARN_ON(!out_backend); -+ -+ kbdev = info->kbdev; -+ -+ backend = kzalloc(sizeof(*backend), GFP_KERNEL); -+ if (!backend) -+ goto alloc_error; -+ -+ backend->info = info; -+ -+ backend->kctx = kbase_create_context(kbdev, true, -+ BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED, 0, NULL); -+ if (!backend->kctx) -+ goto alloc_error; -+ -+#if MALI_USE_CSF -+ kbase_pm_context_active(kbdev); -+ mutex_lock(&kbdev->mmu_hw_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_ctx_sched_retain_ctx(backend->kctx); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kbdev->mmu_hw_mutex); -+ kbase_pm_context_idle(kbdev); -+#else -+ kbasep_js_schedule_privileged_ctx(kbdev, backend->kctx); -+#endif -+ -+ errcode = kbasep_hwcnt_backend_jm_dump_alloc( -+ info, backend->kctx, &backend->gpu_dump_va); -+ if (errcode) -+ goto error; ++ release_firmware(firmware); + -+ backend->cpu_dump_va = kbase_phy_alloc_mapping_get(backend->kctx, -+ backend->gpu_dump_va, &backend->vmap); -+ if (!backend->cpu_dump_va) -+ goto alloc_error; ++ kbasep_js_schedule_privileged_ctx(kbdev, kctx); + -+ kbase_ccswe_init(&backend->ccswe_shader_cores); -+ backend->rate_listener.notify = kbasep_hwcnt_backend_jm_on_freq_change; ++ kbdev->dummy_job_wa.ctx = kctx; + -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+ /* The dummy model needs the CPU mapping. */ -+ gpu_model_set_dummy_prfcnt_base_cpu(backend->cpu_dump_va); -+#endif ++ err = sysfs_create_file(&kbdev->dev->kobj, ++ &dev_attr_dummy_job_wa_info.attr); ++ if (err) ++ dev_err(kbdev->dev, "SysFS file creation for dummy job wa failed\n"); + -+ *out_backend = backend; + return 0; + -+alloc_error: -+ errcode = -ENOMEM; -+error: -+ kbasep_hwcnt_backend_jm_destroy(backend); -+ return errcode; ++bad_fw: ++ kbase_destroy_context(kctx); ++no_ctx: ++ release_firmware(firmware); ++ return -EFAULT; +} + -+/* JM backend implementation of kbase_hwcnt_backend_init_fn */ -+static int kbasep_hwcnt_backend_jm_init( -+ const struct kbase_hwcnt_backend_info *info, -+ struct kbase_hwcnt_backend **out_backend) ++void kbase_dummy_job_wa_cleanup(struct kbase_device *kbdev) +{ -+ int errcode; -+ struct kbase_hwcnt_backend_jm *backend = NULL; -+ -+ if (!info || !out_backend) -+ return -EINVAL; -+ -+ errcode = kbasep_hwcnt_backend_jm_create( -+ (const struct kbase_hwcnt_backend_jm_info *) info, &backend); -+ if (errcode) -+ return errcode; -+ -+ *out_backend = (struct kbase_hwcnt_backend *)backend; -+ -+ return 0; -+} ++ struct kbase_context *wa_ctx; + -+/* JM backend implementation of kbase_hwcnt_backend_term_fn */ -+static void kbasep_hwcnt_backend_jm_term(struct kbase_hwcnt_backend *backend) -+{ -+ if (!backend) ++ /* return if the dummy job has not been loaded */ ++ if (kbdev->dummy_job_wa_loaded == false) + return; + -+ kbasep_hwcnt_backend_jm_dump_disable(backend); -+ kbasep_hwcnt_backend_jm_destroy( -+ (struct kbase_hwcnt_backend_jm *)backend); -+} ++ /* Can be safely called even if the file wasn't created on probe */ ++ sysfs_remove_file(&kbdev->dev->kobj, &dev_attr_dummy_job_wa_info.attr); + -+/** -+ * kbasep_hwcnt_backend_jm_info_destroy() - Destroy a JM backend info. -+ * @info: Pointer to info to destroy. -+ * -+ * Can be safely called on a backend info in any state of partial construction. -+ */ -+static void kbasep_hwcnt_backend_jm_info_destroy( -+ const struct kbase_hwcnt_backend_jm_info *info) -+{ -+ if (!info) -+ return; ++ wa_ctx = READ_ONCE(kbdev->dummy_job_wa.ctx); ++ WRITE_ONCE(kbdev->dummy_job_wa.ctx, NULL); ++ /* make this write visible before we tear down the ctx */ ++ smp_mb(); + -+ kbase_hwcnt_gpu_metadata_destroy(info->metadata); -+ kfree(info); ++ if (wa_ctx) { ++ kbasep_js_release_privileged_ctx(kbdev, wa_ctx); ++ kbase_destroy_context(wa_ctx); ++ } +} -+ -+/** -+ * kbasep_hwcnt_backend_jm_info_create() - Create a JM backend info. -+ * @kbdev: Non_NULL pointer to kbase device. -+ * @out_info: Non-NULL pointer to where info is stored on success. +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h +new file mode 100755 +index 000000000..8713ba1ea +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h +@@ -0,0 +1,73 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Return 0 on success, else error code. + */ -+static int kbasep_hwcnt_backend_jm_info_create( -+ struct kbase_device *kbdev, -+ const struct kbase_hwcnt_backend_jm_info **out_info) -+{ -+ int errcode = -ENOMEM; -+ struct kbase_hwcnt_gpu_info hwcnt_gpu_info; -+ struct kbase_hwcnt_backend_jm_info *info = NULL; -+ -+ WARN_ON(!kbdev); -+ WARN_ON(!out_info); -+ -+ errcode = kbase_hwcnt_gpu_info_init(kbdev, &hwcnt_gpu_info); -+ if (errcode) -+ return errcode; -+ -+ info = kzalloc(sizeof(*info), GFP_KERNEL); -+ if (!info) -+ goto error; + -+ info->kbdev = kbdev; ++#ifndef _KBASE_DUMMY_JOB_WORKAROUND_ ++#define _KBASE_DUMMY_JOB_WORKAROUND_ + -+#ifdef CONFIG_MALI_BIFROST_PRFCNT_SET_SECONDARY -+ info->use_secondary = true; -+#else -+ info->use_secondary = false; -+#endif ++#define KBASE_DUMMY_JOB_WA_FLAG_SERIALIZE (1ull << 0) ++#define KBASE_DUMMY_JOB_WA_FLAG_WAIT_POWERUP (1ull << 1) ++#define KBASE_DUMMY_JOB_WA_FLAG_LOGICAL_SHADER_POWER (1ull << 2) + -+ errcode = kbase_hwcnt_gpu_metadata_create( -+ &hwcnt_gpu_info, info->use_secondary, -+ &info->metadata, -+ &info->dump_bytes); -+ if (errcode) -+ goto error; ++#define KBASE_DUMMY_JOB_WA_FLAGS (KBASE_DUMMY_JOB_WA_FLAG_SERIALIZE | \ ++ KBASE_DUMMY_JOB_WA_FLAG_WAIT_POWERUP | \ ++ KBASE_DUMMY_JOB_WA_FLAG_LOGICAL_SHADER_POWER) + -+ *out_info = info; ++#if MALI_USE_CSF + ++static inline int kbase_dummy_job_wa_load(struct kbase_device *kbdev) ++{ ++ CSTD_UNUSED(kbdev); + return 0; -+error: -+ kbasep_hwcnt_backend_jm_info_destroy(info); -+ return errcode; +} + -+int kbase_hwcnt_backend_jm_create( -+ struct kbase_device *kbdev, -+ struct kbase_hwcnt_backend_interface *iface) ++static inline void kbase_dummy_job_wa_cleanup(struct kbase_device *kbdev) +{ -+ int errcode; -+ const struct kbase_hwcnt_backend_jm_info *info = NULL; ++ CSTD_UNUSED(kbdev); ++} + -+ if (!kbdev || !iface) -+ return -EINVAL; ++static inline int kbase_dummy_job_wa_execute(struct kbase_device *kbdev, ++ u64 cores) ++{ ++ CSTD_UNUSED(kbdev); ++ CSTD_UNUSED(cores); ++ return 0; ++} + -+ errcode = kbasep_hwcnt_backend_jm_info_create(kbdev, &info); ++static inline bool kbase_dummy_job_wa_enabled(struct kbase_device *kbdev) ++{ ++ CSTD_UNUSED(kbdev); ++ return false; ++} + -+ if (errcode) -+ return errcode; ++#else + -+ iface->metadata = info->metadata; -+ iface->info = (struct kbase_hwcnt_backend_info *)info; -+ iface->init = kbasep_hwcnt_backend_jm_init; -+ iface->term = kbasep_hwcnt_backend_jm_term; -+ iface->timestamp_ns = kbasep_hwcnt_backend_jm_timestamp_ns; -+ iface->dump_enable = kbasep_hwcnt_backend_jm_dump_enable; -+ iface->dump_enable_nolock = kbasep_hwcnt_backend_jm_dump_enable_nolock; -+ iface->dump_disable = kbasep_hwcnt_backend_jm_dump_disable; -+ iface->dump_clear = kbasep_hwcnt_backend_jm_dump_clear; -+ iface->dump_request = kbasep_hwcnt_backend_jm_dump_request; -+ iface->dump_wait = kbasep_hwcnt_backend_jm_dump_wait; -+ iface->dump_get = kbasep_hwcnt_backend_jm_dump_get; ++int kbase_dummy_job_wa_load(struct kbase_device *kbdev); ++void kbase_dummy_job_wa_cleanup(struct kbase_device *kbdev); ++int kbase_dummy_job_wa_execute(struct kbase_device *kbdev, u64 cores); + -+ return 0; ++static inline bool kbase_dummy_job_wa_enabled(struct kbase_device *kbdev) ++{ ++ return (kbdev->dummy_job_wa.ctx != NULL); +} + -+void kbase_hwcnt_backend_jm_destroy( -+ struct kbase_hwcnt_backend_interface *iface) -+{ -+ if (!iface) -+ return; ++#endif /* MALI_USE_CSF */ + -+ kbasep_hwcnt_backend_jm_info_destroy( -+ (const struct kbase_hwcnt_backend_jm_info *)iface->info); -+ memset(iface, 0, sizeof(*iface)); -+} -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend_jm.h -new file mode 100755 -index 000000000000..f15faeba704a ++#endif /* _KBASE_DUMMY_JOB_WORKAROUND_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.c +new file mode 100644 +index 000000000..e4cb71632 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend_jm.h -@@ -0,0 +1,61 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.c +@@ -0,0 +1,94 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2018, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -208961,63 +241773,96 @@ index 000000000000..f15faeba704a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+/** -+ * Concrete implementation of mali_kbase_hwcnt_backend interface for JM -+ * backend. + */ + -+#ifndef _KBASE_HWCNT_BACKEND_JM_H_ -+#define _KBASE_HWCNT_BACKEND_JM_H_ -+ -+#include "mali_kbase_hwcnt_backend.h" ++#include "mali_kbase_dvfs_debugfs.h" ++#include ++#include + -+struct kbase_device; ++#if IS_ENABLED(CONFIG_DEBUG_FS) + +/** -+ * kbase_hwcnt_backend_jm_create() - Create a JM hardware counter backend -+ * interface. -+ * @kbdev: Non-NULL pointer to kbase device. -+ * @iface: Non-NULL pointer to backend interface structure that is filled in -+ * on creation success. ++ * kbasep_dvfs_utilization_debugfs_show() - Print the DVFS utilization info + * -+ * Calls to iface->dump_enable_nolock() require kbdev->hwaccess_lock held. ++ * @file: The seq_file for printing to ++ * @data: The debugfs dentry private data, a pointer to kbase_context + * -+ * Return: 0 on success, else error code. ++ * Return: Negative error code or 0 on success. + */ -+int kbase_hwcnt_backend_jm_create( -+ struct kbase_device *kbdev, -+ struct kbase_hwcnt_backend_interface *iface); ++static int kbasep_dvfs_utilization_debugfs_show(struct seq_file *file, void *data) ++{ ++ struct kbase_device *kbdev = file->private; + -+/** -+ * kbase_hwcnt_backend_jm_destroy() - Destroy a JM hardware counter backend -+ * interface. -+ * @iface: Pointer to interface to destroy. -+ * -+ * Can be safely called on an all-zeroed interface, or on an already destroyed -+ * interface. ++#if MALI_USE_CSF ++ seq_printf(file, "busy_time: %u idle_time: %u protm_time: %u\n", ++ kbdev->pm.backend.metrics.values.time_busy, ++ kbdev->pm.backend.metrics.values.time_idle, ++ kbdev->pm.backend.metrics.values.time_in_protm); ++#else ++ seq_printf(file, "busy_time: %u idle_time: %u\n", ++ kbdev->pm.backend.metrics.values.time_busy, ++ kbdev->pm.backend.metrics.values.time_idle); ++#endif ++ ++ return 0; ++} ++ ++static int kbasep_dvfs_utilization_debugfs_open(struct inode *in, ++ struct file *file) ++{ ++ return single_open(file, kbasep_dvfs_utilization_debugfs_show, ++ in->i_private); ++} ++ ++static const struct file_operations kbasep_dvfs_utilization_debugfs_fops = { ++ .open = kbasep_dvfs_utilization_debugfs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++ ++void kbase_dvfs_status_debugfs_init(struct kbase_device *kbdev) ++{ ++ struct dentry *file; ++ const mode_t mode = 0444; ++ ++ if (WARN_ON(!kbdev || IS_ERR_OR_NULL(kbdev->mali_debugfs_directory))) ++ return; ++ ++ file = debugfs_create_file("dvfs_utilization", mode, ++ kbdev->mali_debugfs_directory, kbdev, ++ &kbasep_dvfs_utilization_debugfs_fops); ++ ++ if (IS_ERR_OR_NULL(file)) { ++ dev_warn(kbdev->dev, ++ "Unable to create dvfs debugfs entry"); ++ } ++} ++ ++#else ++/* ++ * Stub functions for when debugfs is disabled + */ -+void kbase_hwcnt_backend_jm_destroy( -+ struct kbase_hwcnt_backend_interface *iface); ++void kbase_dvfs_status_debugfs_init(struct kbase_device *kbdev) ++{ ++} + -+#endif /* _KBASE_HWCNT_BACKEND_JM_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_context.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_context.h -new file mode 100755 -index 000000000000..bc50ad12c2f4 ++#endif /* CONFIG_DEBUG_FS */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.h +new file mode 100644 +index 000000000..8334db7cc --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_context.h -@@ -0,0 +1,119 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.h +@@ -0,0 +1,35 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -209028,121 +241873,37 @@ index 000000000000..bc50ad12c2f4 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+/** -+ * Hardware counter context API. -+ */ -+ -+#ifndef _KBASE_HWCNT_CONTEXT_H_ -+#define _KBASE_HWCNT_CONTEXT_H_ -+ -+#include -+ -+struct kbase_hwcnt_backend_interface; -+struct kbase_hwcnt_context; -+ -+/** -+ * kbase_hwcnt_context_init() - Initialise a hardware counter context. -+ * @iface: Non-NULL pointer to a hardware counter backend interface. -+ * @out_hctx: Non-NULL pointer to where the pointer to the created context will -+ * be stored on success. -+ * -+ * On creation, the disable count of the context will be 0. -+ * A hardware counter accumulator can be acquired using a created context. -+ * -+ * Return: 0 on success, else error code. -+ */ -+int kbase_hwcnt_context_init( -+ const struct kbase_hwcnt_backend_interface *iface, -+ struct kbase_hwcnt_context **out_hctx); -+ -+/** -+ * kbase_hwcnt_context_term() - Terminate a hardware counter context. -+ * @hctx: Pointer to context to be terminated. -+ */ -+void kbase_hwcnt_context_term(struct kbase_hwcnt_context *hctx); -+ -+/** -+ * kbase_hwcnt_context_metadata() - Get the hardware counter metadata used by -+ * the context, so related counter data -+ * structures can be created. -+ * @hctx: Non-NULL pointer to the hardware counter context. -+ * -+ * Return: Non-NULL pointer to metadata, or NULL on error. + */ -+const struct kbase_hwcnt_metadata *kbase_hwcnt_context_metadata( -+ struct kbase_hwcnt_context *hctx); + -+/** -+ * kbase_hwcnt_context_disable() - Increment the disable count of the context. -+ * @hctx: Pointer to the hardware counter context. -+ * -+ * If a call to this function increments the disable count from 0 to 1, and -+ * an accumulator has been acquired, then a counter dump will be performed -+ * before counters are disabled via the backend interface. -+ * -+ * Subsequent dumps via the accumulator while counters are disabled will first -+ * return the accumulated dump, then will return dumps with zeroed counters. -+ * -+ * After this function call returns, it is guaranteed that counters will not be -+ * enabled via the backend interface. -+ */ -+void kbase_hwcnt_context_disable(struct kbase_hwcnt_context *hctx); ++#ifndef _KBASE_DVFS_DEBUGFS_H_ ++#define _KBASE_DVFS_DEBUGFS_H_ + -+/** -+ * kbase_hwcnt_context_disable_atomic() - Increment the disable count of the -+ * context if possible in an atomic -+ * context. -+ * @hctx: Pointer to the hardware counter context. -+ * -+ * This function will only succeed if hardware counters are effectively already -+ * disabled, i.e. there is no accumulator, the disable count is already -+ * non-zero, or the accumulator has no counters set. -+ * -+ * After this function call returns true, it is guaranteed that counters will -+ * not be enabled via the backend interface. -+ * -+ * Return: True if the disable count was incremented, else False. -+ */ -+bool kbase_hwcnt_context_disable_atomic(struct kbase_hwcnt_context *hctx); ++/* Forward declaration */ ++struct kbase_device; + +/** -+ * kbase_hwcnt_context_enable() - Decrement the disable count of the context. -+ * @hctx: Pointer to the hardware counter context. -+ * -+ * If a call to this function decrements the disable count from 1 to 0, and -+ * an accumulator has been acquired, then counters will be re-enabled via the -+ * backend interface. ++ * kbase_dvfs_status_debugfs_init() - Create a debugfs entry for DVFS queries + * -+ * If an accumulator has been acquired and enabling counters fails for some -+ * reason, the accumulator will be placed into an error state. -+ * -+ * It is only valid to call this function one time for each prior returned call -+ * to kbase_hwcnt_context_disable. -+ * -+ * The spinlock documented in the backend interface that was passed in to -+ * kbase_hwcnt_context_init() must be held before calling this function. ++ * @kbdev: Pointer to the GPU device for which to create the debugfs entry + */ -+void kbase_hwcnt_context_enable(struct kbase_hwcnt_context *hctx); ++void kbase_dvfs_status_debugfs_init(struct kbase_device *kbdev); + -+#endif /* _KBASE_HWCNT_CONTEXT_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_gpu.c b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_gpu.c ++#endif /* _KBASE_DVFS_DEBUGFS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_event.c b/drivers/gpu/arm/bifrost/mali_kbase_event.c new file mode 100755 -index 000000000000..499f3bc23bec +index 000000000..910c51170 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_gpu.c -@@ -0,0 +1,571 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_event.c +@@ -0,0 +1,272 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2016, 2018-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -209153,573 +241914,341 @@ index 000000000000..499f3bc23bec + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include "mali_kbase_hwcnt_gpu.h" -+#include "mali_kbase_hwcnt_types.h" -+#include "mali_kbase.h" -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+#include "backend/gpu/mali_kbase_model_dummy.h" -+#endif -+ -+#define KBASE_HWCNT_V5_BLOCK_TYPE_COUNT 4 -+#define KBASE_HWCNT_V5_HEADERS_PER_BLOCK 4 -+#define KBASE_HWCNT_V5_COUNTERS_PER_BLOCK 60 -+#define KBASE_HWCNT_V5_VALUES_PER_BLOCK \ -+ (KBASE_HWCNT_V5_HEADERS_PER_BLOCK + KBASE_HWCNT_V5_COUNTERS_PER_BLOCK) -+/* Index of the PRFCNT_EN header into a V5 counter block */ -+#define KBASE_HWCNT_V5_PRFCNT_EN_HEADER 2 ++#include ++#include ++#include ++#include + -+/** -+ * kbasep_hwcnt_backend_gpu_metadata_v5_create() - Create hardware counter -+ * metadata for a v5 GPU. -+ * @v5_info: Non-NULL pointer to hwcnt info for a v5 GPU. -+ * @use_secondary: True if secondary performance counters should be used, else -+ * false. Ignored if secondary counters are not supported. -+ * @metadata: Non-NULL pointer to where created metadata is stored -+ * on success. -+ * -+ * Return: 0 on success, else error code. -+ */ -+static int kbasep_hwcnt_backend_gpu_metadata_v5_create( -+ const struct kbase_hwcnt_gpu_v5_info *v5_info, -+ bool use_secondary, -+ const struct kbase_hwcnt_metadata **metadata) ++static struct base_jd_udata kbase_event_process(struct kbase_context *kctx, struct kbase_jd_atom *katom) +{ -+ struct kbase_hwcnt_description desc; -+ struct kbase_hwcnt_group_description group; -+ struct kbase_hwcnt_block_description -+ blks[KBASE_HWCNT_V5_BLOCK_TYPE_COUNT]; -+ size_t non_sc_block_count; -+ size_t sc_block_count; -+ -+ WARN_ON(!v5_info); -+ WARN_ON(!metadata); ++ struct base_jd_udata data; ++ struct kbase_device *kbdev; + -+ /* Calculate number of block instances that aren't shader cores */ -+ non_sc_block_count = 2 + v5_info->l2_count; -+ /* Calculate number of block instances that are shader cores */ -+ sc_block_count = fls64(v5_info->core_mask); ++ lockdep_assert_held(&kctx->jctx.lock); + -+ /* -+ * A system can have up to 64 shader cores, but the 64-bit -+ * availability mask can't physically represent that many cores as well -+ * as the other hardware blocks. -+ * Error out if there are more blocks than our implementation can -+ * support. -+ */ -+ if ((sc_block_count + non_sc_block_count) > KBASE_HWCNT_AVAIL_MASK_BITS) -+ return -EINVAL; ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(katom != NULL); ++ KBASE_DEBUG_ASSERT(katom->status == KBASE_JD_ATOM_STATE_COMPLETED); + -+ /* One Job Manager block */ -+ blks[0].type = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_JM; -+ blks[0].inst_cnt = 1; -+ blks[0].hdr_cnt = KBASE_HWCNT_V5_HEADERS_PER_BLOCK; -+ blks[0].ctr_cnt = KBASE_HWCNT_V5_COUNTERS_PER_BLOCK; ++ kbdev = kctx->kbdev; ++ data = katom->udata; + -+ /* One Tiler block */ -+ blks[1].type = KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER; -+ blks[1].inst_cnt = 1; -+ blks[1].hdr_cnt = KBASE_HWCNT_V5_HEADERS_PER_BLOCK; -+ blks[1].ctr_cnt = KBASE_HWCNT_V5_COUNTERS_PER_BLOCK; ++ KBASE_TLSTREAM_TL_NRET_ATOM_CTX(kbdev, katom, kctx); ++ KBASE_TLSTREAM_TL_DEL_ATOM(kbdev, katom); + -+ /* l2_count memsys blks */ -+ blks[2].type = use_secondary ? -+ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS2 : -+ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS; -+ blks[2].inst_cnt = v5_info->l2_count; -+ blks[2].hdr_cnt = KBASE_HWCNT_V5_HEADERS_PER_BLOCK; -+ blks[2].ctr_cnt = KBASE_HWCNT_V5_COUNTERS_PER_BLOCK; ++ katom->status = KBASE_JD_ATOM_STATE_UNUSED; ++ dev_dbg(kbdev->dev, "Atom %pK status to unused\n", (void *)katom); ++ wake_up(&katom->completed); + -+ /* -+ * There are as many shader cores in the system as there are bits set in -+ * the core mask. However, the dump buffer memory requirements need to -+ * take into account the fact that the core mask may be non-contiguous. -+ * -+ * For example, a system with a core mask of 0b1011 has the same dump -+ * buffer memory requirements as a system with 0b1111, but requires more -+ * memory than a system with 0b0111. However, core 2 of the system with -+ * 0b1011 doesn't physically exist, and the dump buffer memory that -+ * accounts for that core will never be written to when we do a counter -+ * dump. -+ * -+ * We find the core mask's last set bit to determine the memory -+ * requirements, and embed the core mask into the availability mask so -+ * we can determine later which shader cores physically exist. -+ */ -+ blks[3].type = use_secondary ? -+ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC2 : -+ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC; -+ blks[3].inst_cnt = sc_block_count; -+ blks[3].hdr_cnt = KBASE_HWCNT_V5_HEADERS_PER_BLOCK; -+ blks[3].ctr_cnt = KBASE_HWCNT_V5_COUNTERS_PER_BLOCK; ++ return data; ++} + -+ WARN_ON(KBASE_HWCNT_V5_BLOCK_TYPE_COUNT != 4); ++int kbase_event_dequeue(struct kbase_context *ctx, struct base_jd_event_v2 *uevent) ++{ ++ struct kbase_jd_atom *atom; + -+ group.type = KBASE_HWCNT_GPU_GROUP_TYPE_V5; -+ group.blk_cnt = KBASE_HWCNT_V5_BLOCK_TYPE_COUNT; -+ group.blks = blks; ++ KBASE_DEBUG_ASSERT(ctx); + -+ desc.grp_cnt = 1; -+ desc.grps = &group; -+ desc.clk_cnt = v5_info->clk_cnt; ++ mutex_lock(&ctx->event_mutex); + -+ /* The JM, Tiler, and L2s are always available, and are before cores */ -+ desc.avail_mask = (1ull << non_sc_block_count) - 1; -+ /* Embed the core mask directly in the availability mask */ -+ desc.avail_mask |= (v5_info->core_mask << non_sc_block_count); ++ if (list_empty(&ctx->event_list)) { ++ if (!atomic_read(&ctx->event_closed)) { ++ mutex_unlock(&ctx->event_mutex); ++ return -1; ++ } + -+ return kbase_hwcnt_metadata_create(&desc, metadata); -+} ++ /* generate the BASE_JD_EVENT_DRV_TERMINATED message on the fly */ ++ mutex_unlock(&ctx->event_mutex); ++ uevent->event_code = BASE_JD_EVENT_DRV_TERMINATED; ++ memset(&uevent->udata, 0, sizeof(uevent->udata)); ++ dev_dbg(ctx->kbdev->dev, ++ "event system closed, returning BASE_JD_EVENT_DRV_TERMINATED(0x%X)\n", ++ BASE_JD_EVENT_DRV_TERMINATED); ++ return 0; ++ } + -+/** -+ * kbasep_hwcnt_backend_gpu_v5_dump_bytes() - Get the raw dump buffer size for a -+ * V5 GPU. -+ * @v5_info: Non-NULL pointer to hwcnt info for a v5 GPU. -+ * -+ * Return: Size of buffer the V5 GPU needs to perform a counter dump. -+ */ -+static size_t kbasep_hwcnt_backend_gpu_v5_dump_bytes( -+ const struct kbase_hwcnt_gpu_v5_info *v5_info) -+{ -+ WARN_ON(!v5_info); -+ return (2 + v5_info->l2_count + fls64(v5_info->core_mask)) * -+ KBASE_HWCNT_V5_VALUES_PER_BLOCK * -+ KBASE_HWCNT_VALUE_BYTES; -+} ++ /* normal event processing */ ++ atomic_dec(&ctx->event_count); ++ atom = list_entry(ctx->event_list.next, struct kbase_jd_atom, dep_item[0]); ++ list_del(ctx->event_list.next); + -+int kbase_hwcnt_gpu_info_init( -+ struct kbase_device *kbdev, -+ struct kbase_hwcnt_gpu_info *info) -+{ -+ size_t clk; ++ mutex_unlock(&ctx->event_mutex); + -+ if (!kbdev || !info) -+ return -EINVAL; ++ dev_dbg(ctx->kbdev->dev, "event dequeuing %pK\n", (void *)atom); ++ uevent->event_code = atom->event_code; + -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+ /* NO_MALI uses V5 layout, regardless of the underlying platform. */ -+ info->type = KBASE_HWCNT_GPU_GROUP_TYPE_V5; -+ info->v5.l2_count = KBASE_DUMMY_MODEL_MAX_MEMSYS_BLOCKS; -+ info->v5.core_mask = (1ull << KBASE_DUMMY_MODEL_MAX_SHADER_CORES) - 1; -+#else -+ { -+ const struct base_gpu_props *props = &kbdev->gpu_props.props; -+ const size_t l2_count = props->l2_props.num_l2_slices; -+ const size_t core_mask = -+ props->coherency_info.group[0].core_mask; ++ uevent->atom_number = (atom - ctx->jctx.atoms); + -+ info->type = KBASE_HWCNT_GPU_GROUP_TYPE_V5; -+ info->v5.l2_count = l2_count; -+ info->v5.core_mask = core_mask; -+ } -+#endif ++ if (atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) ++ kbase_jd_free_external_resources(atom); + -+ /* Determine the number of available clock domains. */ -+ for (clk = 0; clk < BASE_MAX_NR_CLOCKS_REGULATORS; clk++) { -+ if (kbdev->pm.clk_rtm.clks[clk] == NULL) -+ break; -+ } -+ info->v5.clk_cnt = clk; ++ mutex_lock(&ctx->jctx.lock); ++ uevent->udata = kbase_event_process(ctx, atom); ++ mutex_unlock(&ctx->jctx.lock); + + return 0; +} + -+int kbase_hwcnt_gpu_metadata_create( -+ const struct kbase_hwcnt_gpu_info *info, -+ bool use_secondary, -+ const struct kbase_hwcnt_metadata **out_metadata, -+ size_t *out_dump_bytes) -+{ -+ int errcode; -+ const struct kbase_hwcnt_metadata *metadata; -+ size_t dump_bytes; -+ -+ if (!info || !out_metadata || !out_dump_bytes) -+ return -EINVAL; -+ -+ if (info->type == KBASE_HWCNT_GPU_GROUP_TYPE_V5) { -+ dump_bytes = kbasep_hwcnt_backend_gpu_v5_dump_bytes(&info->v5); -+ errcode = kbasep_hwcnt_backend_gpu_metadata_v5_create( -+ &info->v5, use_secondary, &metadata); -+ } else { -+ return -EINVAL; -+ } -+ if (errcode) -+ return errcode; ++KBASE_EXPORT_TEST_API(kbase_event_dequeue); + -+ /* -+ * Dump abstraction size should be exactly the same size and layout as -+ * the physical dump size, for backwards compatibility. -+ */ -+ WARN_ON(dump_bytes != metadata->dump_buf_bytes); ++/** ++ * kbase_event_process_noreport_worker - Worker for processing atoms that do not ++ * return an event but do have external ++ * resources ++ * @data: Work structure ++ */ ++static void kbase_event_process_noreport_worker(struct work_struct *data) ++{ ++ struct kbase_jd_atom *katom = container_of(data, struct kbase_jd_atom, ++ work); ++ struct kbase_context *kctx = katom->kctx; + -+ *out_metadata = metadata; -+ *out_dump_bytes = dump_bytes; ++ if (katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) ++ kbase_jd_free_external_resources(katom); + -+ return 0; ++ mutex_lock(&kctx->jctx.lock); ++ kbase_event_process(kctx, katom); ++ mutex_unlock(&kctx->jctx.lock); +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_gpu_metadata_create); + -+void kbase_hwcnt_gpu_metadata_destroy( -+ const struct kbase_hwcnt_metadata *metadata) ++/** ++ * kbase_event_process_noreport - Process atoms that do not return an event ++ * @kctx: Context pointer ++ * @katom: Atom to be processed ++ * ++ * Atoms that do not have external resources will be processed immediately. ++ * Atoms that do have external resources will be processed on a workqueue, in ++ * order to avoid locking issues. ++ */ ++static void kbase_event_process_noreport(struct kbase_context *kctx, ++ struct kbase_jd_atom *katom) +{ -+ if (!metadata) -+ return; -+ -+ kbase_hwcnt_metadata_destroy(metadata); ++ if (katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) { ++ INIT_WORK(&katom->work, kbase_event_process_noreport_worker); ++ queue_work(kctx->event_workq, &katom->work); ++ } else { ++ kbase_event_process(kctx, katom); ++ } +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_gpu_metadata_destroy); + -+static bool is_block_type_shader( -+ const u64 grp_type, -+ const u64 blk_type, -+ const size_t blk) ++/** ++ * kbase_event_coalesce - Move pending events to the main event list ++ * @kctx: Context pointer ++ * ++ * kctx->event_list and kctx->event_coalesce_count must be protected ++ * by a lock unless this is the last thread using them ++ * (and we're about to terminate the lock). ++ * ++ * Return: The number of pending events moved to the main event list ++ */ ++static int kbase_event_coalesce(struct kbase_context *kctx) +{ -+ bool is_shader = false; -+ -+ /* Warn on unknown group type */ -+ if (WARN_ON(grp_type != KBASE_HWCNT_GPU_GROUP_TYPE_V5)) -+ return false; ++ const int event_count = kctx->event_coalesce_count; + -+ if (blk_type == KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC || -+ blk_type == KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC2) -+ is_shader = true; ++ /* Join the list of pending events onto the tail of the main list ++ * and reset it ++ */ ++ list_splice_tail_init(&kctx->event_coalesce_list, &kctx->event_list); ++ kctx->event_coalesce_count = 0; + -+ return is_shader; ++ /* Return the number of events moved */ ++ return event_count; +} + -+int kbase_hwcnt_gpu_dump_get( -+ struct kbase_hwcnt_dump_buffer *dst, -+ void *src, -+ const struct kbase_hwcnt_enable_map *dst_enable_map, -+ u64 pm_core_mask, -+ bool accumulate) ++void kbase_event_post(struct kbase_context *ctx, struct kbase_jd_atom *atom) +{ -+ const struct kbase_hwcnt_metadata *metadata; -+ const u32 *dump_src; -+ size_t src_offset, grp, blk, blk_inst; -+ u64 core_mask = pm_core_mask; -+ -+ if (!dst || !src || !dst_enable_map || -+ (dst_enable_map->metadata != dst->metadata)) -+ return -EINVAL; ++ struct kbase_device *kbdev = ctx->kbdev; + -+ metadata = dst->metadata; -+ dump_src = (const u32 *)src; -+ src_offset = 0; -+ -+ kbase_hwcnt_metadata_for_each_block( -+ metadata, grp, blk, blk_inst) { -+ const size_t hdr_cnt = -+ kbase_hwcnt_metadata_block_headers_count( -+ metadata, grp, blk); -+ const size_t ctr_cnt = -+ kbase_hwcnt_metadata_block_counters_count( -+ metadata, grp, blk); -+ const u64 blk_type = kbase_hwcnt_metadata_block_type( -+ metadata, grp, blk); -+ const bool is_shader_core = is_block_type_shader( -+ kbase_hwcnt_metadata_group_type(metadata, grp), -+ blk_type, blk); ++ dev_dbg(kbdev->dev, "Posting event for atom %pK\n", (void *)atom); + -+ /* Early out if no values in the dest block are enabled */ -+ if (kbase_hwcnt_enable_map_block_enabled( -+ dst_enable_map, grp, blk, blk_inst)) { -+ u32 *dst_blk = kbase_hwcnt_dump_buffer_block_instance( -+ dst, grp, blk, blk_inst); -+ const u32 *src_blk = dump_src + src_offset; ++ if (WARN_ON(atom->status != KBASE_JD_ATOM_STATE_COMPLETED)) { ++ dev_warn(kbdev->dev, ++ "%s: Atom %d (%pK) not completed (status %d)\n", ++ __func__, ++ kbase_jd_atom_id(atom->kctx, atom), ++ atom->kctx, ++ atom->status); ++ return; ++ } + -+ if (!is_shader_core || (core_mask & 1)) { -+ if (accumulate) { -+ kbase_hwcnt_dump_buffer_block_accumulate( -+ dst_blk, src_blk, hdr_cnt, -+ ctr_cnt); -+ } else { -+ kbase_hwcnt_dump_buffer_block_copy( -+ dst_blk, src_blk, -+ (hdr_cnt + ctr_cnt)); -+ } -+ } else if (!accumulate) { -+ kbase_hwcnt_dump_buffer_block_zero( -+ dst_blk, (hdr_cnt + ctr_cnt)); -+ } ++ if (atom->core_req & BASE_JD_REQ_EVENT_ONLY_ON_FAILURE) { ++ if (atom->event_code == BASE_JD_EVENT_DONE) { ++ dev_dbg(kbdev->dev, "Suppressing event (atom done)\n"); ++ kbase_event_process_noreport(ctx, atom); ++ return; + } -+ -+ src_offset += (hdr_cnt + ctr_cnt); -+ if (is_shader_core) -+ core_mask = core_mask >> 1; + } + -+ return 0; -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_gpu_dump_get); -+ -+/** -+ * kbasep_hwcnt_backend_gpu_block_map_to_physical() - Convert from a block -+ * enable map abstraction to -+ * a physical block enable -+ * map. -+ * @lo: Low 64 bits of block enable map abstraction. -+ * @hi: High 64 bits of block enable map abstraction. -+ * -+ * The abstraction uses 128 bits to enable 128 block values, whereas the -+ * physical uses just 32 bits, as bit n enables values [n*4, n*4+3]. -+ * Therefore, this conversion is lossy. -+ * -+ * Return: 32-bit physical block enable map. -+ */ -+static inline u32 kbasep_hwcnt_backend_gpu_block_map_to_physical( -+ u64 lo, -+ u64 hi) -+{ -+ u32 phys = 0; -+ u64 dwords[2] = {lo, hi}; -+ size_t dword_idx; ++ if (atom->core_req & BASEP_JD_REQ_EVENT_NEVER) { ++ dev_dbg(kbdev->dev, "Suppressing event (never)\n"); ++ kbase_event_process_noreport(ctx, atom); ++ return; ++ } ++ KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(kbdev, atom, TL_ATOM_STATE_POSTED); ++ if (atom->core_req & BASE_JD_REQ_EVENT_COALESCE) { ++ /* Don't report the event until other event(s) have completed */ ++ dev_dbg(kbdev->dev, "Deferring event (coalesced)\n"); ++ mutex_lock(&ctx->event_mutex); ++ list_add_tail(&atom->dep_item[0], &ctx->event_coalesce_list); ++ ++ctx->event_coalesce_count; ++ mutex_unlock(&ctx->event_mutex); ++ } else { ++ /* Report the event and any pending events now */ ++ int event_count = 1; + -+ for (dword_idx = 0; dword_idx < 2; dword_idx++) { -+ const u64 dword = dwords[dword_idx]; -+ u16 packed = 0; ++ mutex_lock(&ctx->event_mutex); ++ event_count += kbase_event_coalesce(ctx); ++ list_add_tail(&atom->dep_item[0], &ctx->event_list); ++ atomic_add(event_count, &ctx->event_count); ++ mutex_unlock(&ctx->event_mutex); ++ dev_dbg(kbdev->dev, "Reporting %d events\n", event_count); + -+ size_t hword_bit; ++ kbase_event_wakeup(ctx); + -+ for (hword_bit = 0; hword_bit < 16; hword_bit++) { -+ const size_t dword_bit = hword_bit * 4; -+ const u16 mask = -+ ((dword >> (dword_bit + 0)) & 0x1) | -+ ((dword >> (dword_bit + 1)) & 0x1) | -+ ((dword >> (dword_bit + 2)) & 0x1) | -+ ((dword >> (dword_bit + 3)) & 0x1); -+ packed |= (mask << hword_bit); -+ } -+ phys |= ((u32)packed) << (16 * dword_idx); ++ /* Post-completion latency */ ++ trace_sysgraph(SGR_POST, ctx->id, ++ kbase_jd_atom_id(ctx, atom)); + } -+ return phys; +} ++KBASE_EXPORT_TEST_API(kbase_event_post); + -+/** -+ * kbasep_hwcnt_backend_gpu_block_map_from_physical() - Convert from a physical -+ * block enable map to a -+ * block enable map -+ * abstraction. -+ * @phys: Physical 32-bit block enable map -+ * @lo: Non-NULL pointer to where low 64 bits of block enable map abstraction -+ * will be stored. -+ * @hi: Non-NULL pointer to where high 64 bits of block enable map abstraction -+ * will be stored. -+ */ -+static inline void kbasep_hwcnt_backend_gpu_block_map_from_physical( -+ u32 phys, -+ u64 *lo, -+ u64 *hi) ++void kbase_event_close(struct kbase_context *kctx) +{ -+ u64 dwords[2] = {0, 0}; -+ -+ size_t dword_idx; ++ mutex_lock(&kctx->event_mutex); ++ atomic_set(&kctx->event_closed, true); ++ mutex_unlock(&kctx->event_mutex); ++ kbase_event_wakeup(kctx); ++} + -+ for (dword_idx = 0; dword_idx < 2; dword_idx++) { -+ const u16 packed = phys >> (16 * dword_idx); -+ u64 dword = 0; ++int kbase_event_init(struct kbase_context *kctx) ++{ ++ KBASE_DEBUG_ASSERT(kctx); + -+ size_t hword_bit; ++ INIT_LIST_HEAD(&kctx->event_list); ++ INIT_LIST_HEAD(&kctx->event_coalesce_list); ++ mutex_init(&kctx->event_mutex); ++ kctx->event_coalesce_count = 0; ++ kctx->event_workq = alloc_workqueue("kbase_event", WQ_MEM_RECLAIM, 1); + -+ for (hword_bit = 0; hword_bit < 16; hword_bit++) { -+ const size_t dword_bit = hword_bit * 4; -+ const u64 mask = (packed >> (hword_bit)) & 0x1; ++ if (kctx->event_workq == NULL) ++ return -EINVAL; + -+ dword |= mask << (dword_bit + 0); -+ dword |= mask << (dword_bit + 1); -+ dword |= mask << (dword_bit + 2); -+ dword |= mask << (dword_bit + 3); -+ } -+ dwords[dword_idx] = dword; -+ } -+ *lo = dwords[0]; -+ *hi = dwords[1]; ++ return 0; +} + -+void kbase_hwcnt_gpu_enable_map_to_physical( -+ struct kbase_hwcnt_physical_enable_map *dst, -+ const struct kbase_hwcnt_enable_map *src) ++KBASE_EXPORT_TEST_API(kbase_event_init); ++ ++void kbase_event_cleanup(struct kbase_context *kctx) +{ -+ const struct kbase_hwcnt_metadata *metadata; ++ int event_count; + -+ u64 fe_bm = 0; -+ u64 shader_bm = 0; -+ u64 tiler_bm = 0; -+ u64 mmu_l2_bm = 0; ++ KBASE_DEBUG_ASSERT(kctx); ++ KBASE_DEBUG_ASSERT(kctx->event_workq); + -+ size_t grp, blk, blk_inst; ++ flush_workqueue(kctx->event_workq); ++ destroy_workqueue(kctx->event_workq); + -+ if (WARN_ON(!src) || WARN_ON(!dst)) -+ return; ++ /* We use kbase_event_dequeue to remove the remaining events as that ++ * deals with all the cleanup needed for the atoms. ++ * ++ * Note: use of kctx->event_list without a lock is safe because this must be the last ++ * thread using it (because we're about to terminate the lock) ++ */ ++ event_count = kbase_event_coalesce(kctx); ++ atomic_add(event_count, &kctx->event_count); + -+ metadata = src->metadata; ++ while (!list_empty(&kctx->event_list)) { ++ struct base_jd_event_v2 event; + -+ kbase_hwcnt_metadata_for_each_block( -+ metadata, grp, blk, blk_inst) { -+ const u64 grp_type = kbase_hwcnt_metadata_group_type( -+ metadata, grp); -+ const u64 blk_type = kbase_hwcnt_metadata_block_type( -+ metadata, grp, blk); -+ const size_t blk_val_cnt = -+ kbase_hwcnt_metadata_block_values_count( -+ metadata, grp, blk); -+ const u64 *blk_map = kbase_hwcnt_enable_map_block_instance( -+ src, grp, blk, blk_inst); -+ -+ if ((enum kbase_hwcnt_gpu_group_type)grp_type == -+ KBASE_HWCNT_GPU_GROUP_TYPE_V5) { -+ WARN_ON(blk_val_cnt != KBASE_HWCNT_V5_VALUES_PER_BLOCK); -+ switch ((enum kbase_hwcnt_gpu_v5_block_type)blk_type) { -+ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_JM: -+ fe_bm |= *blk_map; -+ break; -+ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER: -+ tiler_bm |= *blk_map; -+ break; -+ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC: -+ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC2: -+ shader_bm |= *blk_map; -+ break; -+ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS: -+ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS2: -+ mmu_l2_bm |= *blk_map; -+ break; -+ default: -+ WARN_ON(true); -+ } -+ } else { -+ WARN_ON(true); -+ } ++ kbase_event_dequeue(kctx, &event); + } -+ -+ dst->fe_bm = -+ kbasep_hwcnt_backend_gpu_block_map_to_physical(fe_bm, 0); -+ dst->shader_bm = -+ kbasep_hwcnt_backend_gpu_block_map_to_physical(shader_bm, 0); -+ dst->tiler_bm = -+ kbasep_hwcnt_backend_gpu_block_map_to_physical(tiler_bm, 0); -+ dst->mmu_l2_bm = -+ kbasep_hwcnt_backend_gpu_block_map_to_physical(mmu_l2_bm, 0); +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_gpu_enable_map_to_physical); + -+void kbase_hwcnt_gpu_enable_map_from_physical( -+ struct kbase_hwcnt_enable_map *dst, -+ const struct kbase_hwcnt_physical_enable_map *src) -+{ -+ const struct kbase_hwcnt_metadata *metadata; -+ -+ u64 ignored_hi; -+ u64 fe_bm; -+ u64 shader_bm; -+ u64 tiler_bm; -+ u64 mmu_l2_bm; -+ size_t grp, blk, blk_inst; ++KBASE_EXPORT_TEST_API(kbase_event_cleanup); +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence.c b/drivers/gpu/arm/bifrost/mali_kbase_fence.c +new file mode 100755 +index 000000000..b16b27659 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.c +@@ -0,0 +1,61 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2011-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+ if (WARN_ON(!src) || WARN_ON(!dst)) -+ return; ++#include ++#include ++#include ++#include ++#include + -+ metadata = dst->metadata; ++/* Spin lock protecting all Mali fences as fence->lock. */ ++static DEFINE_SPINLOCK(kbase_fence_lock); + -+ kbasep_hwcnt_backend_gpu_block_map_from_physical( -+ src->fe_bm, &fe_bm, &ignored_hi); -+ kbasep_hwcnt_backend_gpu_block_map_from_physical( -+ src->shader_bm, &shader_bm, &ignored_hi); -+ kbasep_hwcnt_backend_gpu_block_map_from_physical( -+ src->tiler_bm, &tiler_bm, &ignored_hi); -+ kbasep_hwcnt_backend_gpu_block_map_from_physical( -+ src->mmu_l2_bm, &mmu_l2_bm, &ignored_hi); ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++struct fence * ++kbase_fence_out_new(struct kbase_jd_atom *katom) ++#else ++struct dma_fence * ++kbase_fence_out_new(struct kbase_jd_atom *katom) ++#endif ++{ ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++ struct fence *fence; ++#else ++ struct dma_fence *fence; ++#endif + -+ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) { -+ const u64 grp_type = kbase_hwcnt_metadata_group_type( -+ metadata, grp); -+ const u64 blk_type = kbase_hwcnt_metadata_block_type( -+ metadata, grp, blk); -+ const size_t blk_val_cnt = -+ kbase_hwcnt_metadata_block_values_count( -+ metadata, grp, blk); -+ u64 *blk_map = kbase_hwcnt_enable_map_block_instance( -+ dst, grp, blk, blk_inst); -+ -+ if ((enum kbase_hwcnt_gpu_group_type)grp_type == -+ KBASE_HWCNT_GPU_GROUP_TYPE_V5) { -+ WARN_ON(blk_val_cnt != KBASE_HWCNT_V5_VALUES_PER_BLOCK); -+ switch ((enum kbase_hwcnt_gpu_v5_block_type)blk_type) { -+ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_JM: -+ *blk_map = fe_bm; -+ break; -+ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER: -+ *blk_map = tiler_bm; -+ break; -+ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC: -+ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC2: -+ *blk_map = shader_bm; -+ break; -+ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS: -+ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS2: -+ *blk_map = mmu_l2_bm; -+ break; -+ default: -+ WARN_ON(true); -+ } -+ } else { -+ WARN_ON(true); -+ } -+ } -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_gpu_enable_map_from_physical); ++ WARN_ON(katom->dma_fence.fence); + -+void kbase_hwcnt_gpu_patch_dump_headers( -+ struct kbase_hwcnt_dump_buffer *buf, -+ const struct kbase_hwcnt_enable_map *enable_map) -+{ -+ const struct kbase_hwcnt_metadata *metadata; -+ size_t grp, blk, blk_inst; ++ fence = kzalloc(sizeof(*fence), GFP_KERNEL); ++ if (!fence) ++ return NULL; + -+ if (WARN_ON(!buf) || WARN_ON(!enable_map) || -+ WARN_ON(buf->metadata != enable_map->metadata)) -+ return; ++ dma_fence_init(fence, ++ &kbase_fence_ops, ++ &kbase_fence_lock, ++ katom->dma_fence.context, ++ atomic_inc_return(&katom->dma_fence.seqno)); + -+ metadata = buf->metadata; ++ katom->dma_fence.fence = fence; + -+ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) { -+ const u64 grp_type = -+ kbase_hwcnt_metadata_group_type(metadata, grp); -+ u32 *buf_blk = kbase_hwcnt_dump_buffer_block_instance( -+ buf, grp, blk, blk_inst); -+ const u64 *blk_map = kbase_hwcnt_enable_map_block_instance( -+ enable_map, grp, blk, blk_inst); -+ const u32 prfcnt_en = -+ kbasep_hwcnt_backend_gpu_block_map_to_physical( -+ blk_map[0], 0); -+ -+ if ((enum kbase_hwcnt_gpu_group_type)grp_type == -+ KBASE_HWCNT_GPU_GROUP_TYPE_V5) { -+ buf_blk[KBASE_HWCNT_V5_PRFCNT_EN_HEADER] = prfcnt_en; -+ } else { -+ WARN_ON(true); -+ } -+ } ++ return fence; +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_gpu_patch_dump_headers); -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_gpu.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_gpu.h ++ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence.h b/drivers/gpu/arm/bifrost/mali_kbase_fence.h new file mode 100755 -index 000000000000..f0d51763f7f7 +index 000000000..f4507ac43 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_gpu.h -@@ -0,0 +1,217 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.h +@@ -0,0 +1,259 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -209730,219 +242259,261 @@ index 000000000000..f0d51763f7f7 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#ifndef _KBASE_HWCNT_GPU_H_ -+#define _KBASE_HWCNT_GPU_H_ ++#ifndef _KBASE_FENCE_H_ ++#define _KBASE_FENCE_H_ + -+#include ++/* ++ * mali_kbase_fence.[hc] has fence code used only by ++ * - CONFIG_SYNC_FILE - explicit fences ++ */ + -+struct kbase_device; -+struct kbase_hwcnt_metadata; -+struct kbase_hwcnt_enable_map; -+struct kbase_hwcnt_dump_buffer; ++#if IS_ENABLED(CONFIG_SYNC_FILE) ++ ++#include ++#include "mali_kbase_fence_defs.h" ++#include "mali_kbase.h" ++#include "mali_kbase_refcount_defs.h" ++ ++#if MALI_USE_CSF ++/* Maximum number of characters in DMA fence timeline name. */ ++#define MAX_TIMELINE_NAME (32) + +/** -+ * enum kbase_hwcnt_gpu_group_type - GPU hardware counter group types, used to -+ * identify metadata groups. -+ * @KBASE_HWCNT_GPU_GROUP_TYPE_V5: GPU V5 group type. ++ * struct kbase_kcpu_dma_fence_meta - Metadata structure for dma fence objects containing ++ * information about KCPU queue. One instance per KCPU ++ * queue. ++ * ++ * @refcount: Atomic value to keep track of number of references to an instance. ++ * An instance can outlive the KCPU queue itself. ++ * @kbdev: Pointer to Kbase device. ++ * @kctx_id: Kbase context ID. ++ * @timeline_name: String of timeline name for associated fence object. + */ -+enum kbase_hwcnt_gpu_group_type { -+ KBASE_HWCNT_GPU_GROUP_TYPE_V5 = 0x10, ++struct kbase_kcpu_dma_fence_meta { ++ kbase_refcount_t refcount; ++ struct kbase_device *kbdev; ++ int kctx_id; ++ char timeline_name[MAX_TIMELINE_NAME]; +}; + +/** -+ * enum kbase_hwcnt_gpu_v5_block_type - GPU V5 hardware counter block types, -+ * used to identify metadata blocks. -+ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_JM: Job Manager block. -+ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER: Tiler block. -+ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC: Shader Core block. -+ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC2: Secondary Shader Core block. -+ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS: Memsys block. -+ * @KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS2: Secondary Memsys block. ++ * struct kbase_kcpu_dma_fence - Structure which extends a dma fence object to include a ++ * reference to metadata containing more informaiton about it. ++ * ++ * @base: Fence object itself. ++ * @metadata: Pointer to metadata structure. + */ -+enum kbase_hwcnt_gpu_v5_block_type { -+ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_JM = 0x40, -+ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER, -+ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC, -+ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC2, -+ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS, -+ KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS2, ++struct kbase_kcpu_dma_fence { ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++ struct fence base; ++#else ++ struct dma_fence base; ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) */ ++ struct kbase_kcpu_dma_fence_meta *metadata; +}; ++#endif ++ ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++extern const struct fence_ops kbase_fence_ops; ++#else ++extern const struct dma_fence_ops kbase_fence_ops; ++#endif + +/** -+ * struct kbase_hwcnt_physical_enable_map - Representation of enable map -+ * directly used by GPU. -+ * @fe_bm: Front end (JM/CSHW) counters selection bitmask. -+ * @shader_bm: Shader counters selection bitmask. -+ * @tiler_bm: Tiler counters selection bitmask. -+ * @mmu_l2_bm: MMU_L2 counters selection bitmask. ++ * kbase_fence_out_new() - Creates a new output fence and puts it on the atom ++ * @katom: Atom to create an output fence for ++ * ++ * Return: A new fence object on success, NULL on failure. + */ -+struct kbase_hwcnt_physical_enable_map { -+ u32 fe_bm; -+ u32 shader_bm; -+ u32 tiler_bm; -+ u32 mmu_l2_bm; -+}; ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++struct fence *kbase_fence_out_new(struct kbase_jd_atom *katom); ++#else ++struct dma_fence *kbase_fence_out_new(struct kbase_jd_atom *katom); ++#endif + ++#if IS_ENABLED(CONFIG_SYNC_FILE) +/** -+ * struct kbase_hwcnt_gpu_v5_info - Information about hwcnt blocks on v5 GPUs. -+ * @l2_count: L2 cache count. -+ * @core_mask: Shader core mask. May be sparse. -+ * @clk_cnt: Number of clock domains available. ++ * kbase_fence_fence_in_set() - Assign input fence to atom ++ * @katom: Atom to assign input fence to ++ * @fence: Input fence to assign to atom ++ * ++ * This function will take ownership of one fence reference! + */ -+struct kbase_hwcnt_gpu_v5_info { -+ size_t l2_count; -+ u64 core_mask; -+ u8 clk_cnt; -+}; ++#define kbase_fence_fence_in_set(katom, fence) \ ++ do { \ ++ WARN_ON((katom)->dma_fence.fence_in); \ ++ (katom)->dma_fence.fence_in = fence; \ ++ } while (0) ++#endif ++ + ++#if !MALI_USE_CSF +/** -+ * struct kbase_hwcnt_gpu_info - Tagged union with information about the current -+ * GPU's hwcnt blocks. -+ * @type: GPU type. -+ * @v5: Info filled in if a v5 GPU. ++ * kbase_fence_out_remove() - Removes the output fence from atom ++ * @katom: Atom to remove output fence for ++ * ++ * This will also release the reference to this fence which the atom keeps + */ -+struct kbase_hwcnt_gpu_info { -+ enum kbase_hwcnt_gpu_group_type type; -+ struct kbase_hwcnt_gpu_v5_info v5; -+}; ++static inline void kbase_fence_out_remove(struct kbase_jd_atom *katom) ++{ ++ if (katom->dma_fence.fence) { ++ dma_fence_put(katom->dma_fence.fence); ++ katom->dma_fence.fence = NULL; ++ } ++} + ++#if IS_ENABLED(CONFIG_SYNC_FILE) +/** -+ * kbase_hwcnt_gpu_info_init() - Initialise an info structure used to create the -+ * hwcnt metadata. -+ * @kbdev: Non-NULL pointer to kbase device. -+ * @info: Non-NULL pointer to data structure to be filled in. ++ * kbase_fence_in_remove() - Removes the input fence from atom ++ * @katom: Atom to remove input fence for + * -+ * The initialised info struct will only be valid for use while kbdev is valid. ++ * This will also release the reference to this fence which the atom keeps + */ -+int kbase_hwcnt_gpu_info_init( -+ struct kbase_device *kbdev, -+ struct kbase_hwcnt_gpu_info *info); ++static inline void kbase_fence_in_remove(struct kbase_jd_atom *katom) ++{ ++ if (katom->dma_fence.fence_in) { ++ dma_fence_put(katom->dma_fence.fence_in); ++ katom->dma_fence.fence_in = NULL; ++ } ++} ++#endif + +/** -+ * kbase_hwcnt_gpu_metadata_create() - Create hardware counter metadata for the -+ * current GPU. -+ * @info: Non-NULL pointer to info struct initialised by -+ * kbase_hwcnt_gpu_info_init. -+ * @use_secondary: True if secondary performance counters should be used, else -+ * false. Ignored if secondary counters are not supported. -+ * @out_metadata: Non-NULL pointer to where created metadata is stored on -+ * success. -+ * @out_dump_bytes: Non-NULL pointer to where the size of the GPU counter dump -+ * buffer is stored on success. ++ * kbase_fence_out_is_ours() - Check if atom has a valid fence created by us ++ * @katom: Atom to check output fence for + * -+ * Return: 0 on success, else error code. ++ * Return: true if fence exists and is valid, otherwise false + */ -+int kbase_hwcnt_gpu_metadata_create( -+ const struct kbase_hwcnt_gpu_info *info, -+ bool use_secondary, -+ const struct kbase_hwcnt_metadata **out_metadata, -+ size_t *out_dump_bytes); ++static inline bool kbase_fence_out_is_ours(struct kbase_jd_atom *katom) ++{ ++ return katom->dma_fence.fence && ++ katom->dma_fence.fence->ops == &kbase_fence_ops; ++} + +/** -+ * kbase_hwcnt_gpu_metadata_destroy() - Destroy GPU hardware counter metadata. -+ * @metadata: Pointer to metadata to destroy. ++ * kbase_fence_out_signal() - Signal output fence of atom ++ * @katom: Atom to signal output fence for ++ * @status: Status to signal with (0 for success, < 0 for error) ++ * ++ * Return: 0 on success, < 0 on error + */ -+void kbase_hwcnt_gpu_metadata_destroy( -+ const struct kbase_hwcnt_metadata *metadata); ++static inline int kbase_fence_out_signal(struct kbase_jd_atom *katom, ++ int status) ++{ ++ if (status) { ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE && \ ++ KERNEL_VERSION(4, 9, 68) <= LINUX_VERSION_CODE) ++ fence_set_error(katom->dma_fence.fence, status); ++#elif (KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE) ++ dma_fence_set_error(katom->dma_fence.fence, status); ++#else ++ katom->dma_fence.fence->status = status; ++#endif ++ } ++ return dma_fence_signal(katom->dma_fence.fence); ++} + ++#if IS_ENABLED(CONFIG_SYNC_FILE) +/** -+ * kbase_hwcnt_gpu_dump_get() - Copy or accumulate enabled counters from the raw -+ * dump buffer in src into the dump buffer -+ * abstraction in dst. -+ * @dst: Non-NULL pointer to dst dump buffer. -+ * @src: Non-NULL pointer to src raw dump buffer, of same length -+ * as returned in out_dump_bytes parameter of -+ * kbase_hwcnt_gpu_metadata_create. -+ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. -+ * @pm_core_mask: PM state synchronized shaders core mask with the dump. -+ * @accumulate: True if counters in src should be accumulated into dst, -+ * rather than copied. ++ * kbase_fence_in_get() - Retrieve input fence for atom. ++ * @katom: Atom to get input fence from + * -+ * The dst and dst_enable_map MUST have been created from the same metadata as -+ * returned from the call to kbase_hwcnt_gpu_metadata_create as was used to get -+ * the length of src. ++ * A ref will be taken for the fence, so use @kbase_fence_put() to release it + * -+ * Return: 0 on success, else error code. ++ * Return: The fence, or NULL if there is no input fence for atom + */ -+int kbase_hwcnt_gpu_dump_get( -+ struct kbase_hwcnt_dump_buffer *dst, -+ void *src, -+ const struct kbase_hwcnt_enable_map *dst_enable_map, -+ const u64 pm_core_mask, -+ bool accumulate); ++#define kbase_fence_in_get(katom) dma_fence_get((katom)->dma_fence.fence_in) ++#endif + +/** -+ * kbase_hwcnt_gpu_enable_map_to_physical() - Convert an enable map abstraction -+ * into a physical enable map. -+ * @dst: Non-NULL pointer to dst physical enable map. -+ * @src: Non-NULL pointer to src enable map abstraction. ++ * kbase_fence_out_get() - Retrieve output fence for atom. ++ * @katom: Atom to get output fence from + * -+ * The src must have been created from a metadata returned from a call to -+ * kbase_hwcnt_gpu_metadata_create. ++ * A ref will be taken for the fence, so use @kbase_fence_put() to release it + * -+ * This is a lossy conversion, as the enable map abstraction has one bit per -+ * individual counter block value, but the physical enable map uses 1 bit for -+ * every 4 counters, shared over all instances of a block. ++ * Return: The fence, or NULL if there is no output fence for atom + */ -+void kbase_hwcnt_gpu_enable_map_to_physical( -+ struct kbase_hwcnt_physical_enable_map *dst, -+ const struct kbase_hwcnt_enable_map *src); ++#define kbase_fence_out_get(katom) dma_fence_get((katom)->dma_fence.fence) ++ ++#endif /* !MALI_USE_CSF */ + +/** -+ * kbase_hwcnt_gpu_enable_map_from_physical() - Convert a physical enable map to -+ * an enable map abstraction. -+ * @dst: Non-NULL pointer to dst enable map abstraction. -+ * @src: Non-NULL pointer to src physical enable map. ++ * kbase_fence_get() - Retrieve fence for a KCPUQ fence command. ++ * @fence_info: KCPUQ fence command + * -+ * The dst must have been created from a metadata returned from a call to -+ * kbase_hwcnt_gpu_metadata_create. ++ * A ref will be taken for the fence, so use @kbase_fence_put() to release it + * -+ * This is a lossy conversion, as the physical enable map can technically -+ * support counter blocks with 128 counters each, but no hardware actually uses -+ * more than 64, so the enable map abstraction has nowhere to store the enable -+ * information for the 64 non-existent counters. ++ * Return: The fence, or NULL if there is no fence for KCPUQ fence command + */ -+void kbase_hwcnt_gpu_enable_map_from_physical( -+ struct kbase_hwcnt_enable_map *dst, -+ const struct kbase_hwcnt_physical_enable_map *src); ++#define kbase_fence_get(fence_info) dma_fence_get((fence_info)->fence) ++ ++#if MALI_USE_CSF ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++static inline struct kbase_kcpu_dma_fence *kbase_kcpu_dma_fence_get(struct fence *fence) ++#else ++static inline struct kbase_kcpu_dma_fence *kbase_kcpu_dma_fence_get(struct dma_fence *fence) ++#endif ++{ ++ if (fence->ops == &kbase_fence_ops) ++ return (struct kbase_kcpu_dma_fence *)fence; ++ ++ return NULL; ++} ++ ++static inline void kbase_kcpu_dma_fence_meta_put(struct kbase_kcpu_dma_fence_meta *metadata) ++{ ++ if (kbase_refcount_dec_and_test(&metadata->refcount)) { ++ atomic_dec(&metadata->kbdev->live_fence_metadata); ++ kfree(metadata); ++ } ++} ++ ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++static inline void kbase_kcpu_dma_fence_put(struct fence *fence) ++#else ++static inline void kbase_kcpu_dma_fence_put(struct dma_fence *fence) ++#endif ++{ ++ struct kbase_kcpu_dma_fence *kcpu_fence = kbase_kcpu_dma_fence_get(fence); ++ ++ if (kcpu_fence) ++ kbase_kcpu_dma_fence_meta_put(kcpu_fence->metadata); ++} ++#endif /* MALI_USE_CSF */ + +/** -+ * kbase_hwcnt_gpu_patch_dump_headers() - Patch all the performance counter -+ * enable headers in a dump buffer to -+ * reflect the specified enable map. -+ * @buf: Non-NULL pointer to dump buffer to patch. -+ * @enable_map: Non-NULL pointer to enable map. -+ * -+ * The buf and enable_map must have been created from a metadata returned from -+ * a call to kbase_hwcnt_gpu_metadata_create. -+ * -+ * This function should be used before handing off a dump buffer over the -+ * kernel-user boundary, to ensure the header is accurate for the enable map -+ * used by the user. ++ * kbase_fence_put() - Releases a reference to a fence ++ * @fence: Fence to release reference for. + */ -+void kbase_hwcnt_gpu_patch_dump_headers( -+ struct kbase_hwcnt_dump_buffer *buf, -+ const struct kbase_hwcnt_enable_map *enable_map); ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++static inline void kbase_fence_put(struct fence *fence) ++#else ++static inline void kbase_fence_put(struct dma_fence *fence) ++#endif ++{ ++ dma_fence_put(fence); ++} + -+#endif /* _KBASE_HWCNT_GPU_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_legacy.c b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_legacy.c ++#endif /* IS_ENABLED(CONFIG_SYNC_FILE) */ ++ ++#endif /* _KBASE_FENCE_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h new file mode 100755 -index 000000000000..794ef39e365c +index 000000000..7a150bdf2 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_legacy.c -@@ -0,0 +1,152 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h +@@ -0,0 +1,63 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2018, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -209953,154 +242524,182 @@ index 000000000000..794ef39e365c + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include "mali_kbase_hwcnt_legacy.h" -+#include "mali_kbase_hwcnt_virtualizer.h" -+#include "mali_kbase_hwcnt_types.h" -+#include "mali_kbase_hwcnt_gpu.h" -+#include "mali_kbase_ioctl.h" -+ -+#include -+#include ++#ifndef _KBASE_FENCE_DEFS_H_ ++#define _KBASE_FENCE_DEFS_H_ + -+/** -+ * struct kbase_hwcnt_legacy_client - Legacy hardware counter client. -+ * @user_dump_buf: Pointer to a non-NULL user buffer, where dumps are returned. -+ * @enable_map: Counter enable map. -+ * @dump_buf: Dump buffer used to manipulate dumps before copied to user. -+ * @hvcli: Hardware counter virtualizer client. ++/* ++ * There was a big rename in the 4.10 kernel (fence* -> dma_fence*) ++ * This file hides the compatibility issues with this for the rest the driver + */ -+struct kbase_hwcnt_legacy_client { -+ void __user *user_dump_buf; -+ struct kbase_hwcnt_enable_map enable_map; -+ struct kbase_hwcnt_dump_buffer dump_buf; -+ struct kbase_hwcnt_virtualizer_client *hvcli; -+}; + -+int kbase_hwcnt_legacy_client_create( -+ struct kbase_hwcnt_virtualizer *hvirt, -+ struct kbase_ioctl_hwcnt_enable *enable, -+ struct kbase_hwcnt_legacy_client **out_hlcli) -+{ -+ int errcode; -+ struct kbase_hwcnt_legacy_client *hlcli; -+ const struct kbase_hwcnt_metadata *metadata; -+ struct kbase_hwcnt_physical_enable_map phys_em; ++#include + -+ if (!hvirt || !enable || !enable->dump_buffer || !out_hlcli) -+ return -EINVAL; ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) + -+ metadata = kbase_hwcnt_virtualizer_metadata(hvirt); ++#include + -+ hlcli = kzalloc(sizeof(*hlcli), GFP_KERNEL); -+ if (!hlcli) -+ return -ENOMEM; ++#define dma_fence_context_alloc(a) fence_context_alloc(a) ++#define dma_fence_init(a, b, c, d, e) fence_init(a, b, c, d, e) ++#define dma_fence_get(a) fence_get(a) ++#define dma_fence_put(a) fence_put(a) ++#define dma_fence_signal(a) fence_signal(a) ++#define dma_fence_is_signaled(a) fence_is_signaled(a) ++#define dma_fence_add_callback(a, b, c) fence_add_callback(a, b, c) ++#define dma_fence_remove_callback(a, b) fence_remove_callback(a, b) + -+ hlcli->user_dump_buf = (void __user *)(uintptr_t)enable->dump_buffer; ++#if (KERNEL_VERSION(4, 9, 68) <= LINUX_VERSION_CODE) ++#define dma_fence_get_status(a) (fence_is_signaled(a) ? (a)->error ?: 1 : 0) ++#else ++#define dma_fence_get_status(a) (fence_is_signaled(a) ? (a)->status ?: 1 : 0) ++#endif + -+ errcode = kbase_hwcnt_enable_map_alloc(metadata, &hlcli->enable_map); -+ if (errcode) -+ goto error; ++#else + -+ /* Translate from the ioctl enable map to the internal one */ -+ phys_em.fe_bm = enable->fe_bm; -+ phys_em.shader_bm = enable->shader_bm; -+ phys_em.tiler_bm = enable->tiler_bm; -+ phys_em.mmu_l2_bm = enable->mmu_l2_bm; -+ kbase_hwcnt_gpu_enable_map_from_physical(&hlcli->enable_map, &phys_em); ++#include + -+ errcode = kbase_hwcnt_dump_buffer_alloc(metadata, &hlcli->dump_buf); -+ if (errcode) -+ goto error; ++#if (KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE) ++#define dma_fence_get_status(a) (dma_fence_is_signaled(a) ? \ ++ (a)->status ?: 1 \ ++ : 0) ++#endif + -+ errcode = kbase_hwcnt_virtualizer_client_create( -+ hvirt, &hlcli->enable_map, &hlcli->hvcli); -+ if (errcode) -+ goto error; ++#endif /* < 4.10.0 */ + -+ *out_hlcli = hlcli; -+ return 0; ++#endif /* _KBASE_FENCE_DEFS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c b/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c +new file mode 100755 +index 000000000..25b4c9c03 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c +@@ -0,0 +1,111 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+error: -+ kbase_hwcnt_legacy_client_destroy(hlcli); -+ return errcode; -+} ++#include ++#include ++#include ++#include + -+void kbase_hwcnt_legacy_client_destroy(struct kbase_hwcnt_legacy_client *hlcli) ++static const char * ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++kbase_fence_get_driver_name(struct fence *fence) ++#else ++kbase_fence_get_driver_name(struct dma_fence *fence) ++#endif +{ -+ if (!hlcli) -+ return; -+ -+ kbase_hwcnt_virtualizer_client_destroy(hlcli->hvcli); -+ kbase_hwcnt_dump_buffer_free(&hlcli->dump_buf); -+ kbase_hwcnt_enable_map_free(&hlcli->enable_map); -+ kfree(hlcli); ++ return kbase_drv_name; +} + -+int kbase_hwcnt_legacy_client_dump(struct kbase_hwcnt_legacy_client *hlcli) ++static const char * ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++kbase_fence_get_timeline_name(struct fence *fence) ++#else ++kbase_fence_get_timeline_name(struct dma_fence *fence) ++#endif +{ -+ int errcode; -+ u64 ts_start_ns; -+ u64 ts_end_ns; -+ -+ if (!hlcli) -+ return -EINVAL; -+ -+ /* Dump into the kernel buffer */ -+ errcode = kbase_hwcnt_virtualizer_client_dump(hlcli->hvcli, -+ &ts_start_ns, &ts_end_ns, &hlcli->dump_buf); -+ if (errcode) -+ return errcode; -+ -+ /* Patch the dump buf headers, to hide the counters that other hwcnt -+ * clients are using. -+ */ -+ kbase_hwcnt_gpu_patch_dump_headers( -+ &hlcli->dump_buf, &hlcli->enable_map); -+ -+ /* Zero all non-enabled counters (current values are undefined) */ -+ kbase_hwcnt_dump_buffer_zero_non_enabled( -+ &hlcli->dump_buf, &hlcli->enable_map); ++#if MALI_USE_CSF ++ struct kbase_kcpu_dma_fence *kcpu_fence = (struct kbase_kcpu_dma_fence *)fence; + -+ /* Copy into the user's buffer */ -+ errcode = copy_to_user(hlcli->user_dump_buf, hlcli->dump_buf.dump_buf, -+ hlcli->dump_buf.metadata->dump_buf_bytes); -+ /* Non-zero errcode implies user buf was invalid or too small */ -+ if (errcode) -+ return -EFAULT; ++ return kcpu_fence->metadata->timeline_name; ++#else ++ return kbase_timeline_name; ++#endif /* MALI_USE_CSF */ ++} + -+ return 0; ++static bool ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++kbase_fence_enable_signaling(struct fence *fence) ++#else ++kbase_fence_enable_signaling(struct dma_fence *fence) ++#endif ++{ ++ return true; +} + -+int kbase_hwcnt_legacy_client_clear(struct kbase_hwcnt_legacy_client *hlcli) ++static void ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++kbase_fence_fence_value_str(struct fence *fence, char *str, int size) ++#else ++kbase_fence_fence_value_str(struct dma_fence *fence, char *str, int size) ++#endif +{ -+ u64 ts_start_ns; -+ u64 ts_end_ns; ++#if (KERNEL_VERSION(5, 1, 0) > LINUX_VERSION_CODE) ++ const char *format = "%u"; ++#else ++ const char *format = "%llu"; ++#endif ++ if (unlikely(!scnprintf(str, size, format, fence->seqno))) ++ pr_err("Fail to encode fence seqno to string"); ++} + -+ if (!hlcli) -+ return -EINVAL; ++#if MALI_USE_CSF ++static void ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++kbase_fence_release(struct fence *fence) ++#else ++kbase_fence_release(struct dma_fence *fence) ++#endif ++{ ++ struct kbase_kcpu_dma_fence *kcpu_fence = (struct kbase_kcpu_dma_fence *)fence; + -+ /* Dump with a NULL buffer to clear this client's counters */ -+ return kbase_hwcnt_virtualizer_client_dump(hlcli->hvcli, -+ &ts_start_ns, &ts_end_ns, NULL); ++ kbase_kcpu_dma_fence_meta_put(kcpu_fence->metadata); ++ kfree(kcpu_fence); +} -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_legacy.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_legacy.h ++#endif ++ ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++extern const struct fence_ops kbase_fence_ops; /* silence checker warning */ ++const struct fence_ops kbase_fence_ops = { .wait = fence_default_wait, ++#else ++extern const struct dma_fence_ops kbase_fence_ops; /* silence checker warning */ ++const struct dma_fence_ops kbase_fence_ops = { .wait = dma_fence_default_wait, ++#endif ++ .get_driver_name = kbase_fence_get_driver_name, ++ .get_timeline_name = kbase_fence_get_timeline_name, ++ .enable_signaling = kbase_fence_enable_signaling, ++#if MALI_USE_CSF ++ .fence_value_str = kbase_fence_fence_value_str, ++ .release = kbase_fence_release ++#else ++ .fence_value_str = kbase_fence_fence_value_str ++#endif ++}; ++KBASE_EXPORT_TEST_API(kbase_fence_ops); +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gator.h b/drivers/gpu/arm/bifrost/mali_kbase_gator.h new file mode 100755 -index 000000000000..7a610ae378a2 +index 000000000..dd7df8746 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_legacy.h -@@ -0,0 +1,94 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_gator.h +@@ -0,0 +1,52 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -210111,96 +242710,54 @@ index 000000000000..7a610ae378a2 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+/** -+ * Legacy hardware counter interface, giving userspace clients simple, -+ * synchronous access to hardware counters. -+ * -+ * Any functions operating on an single legacy hardware counter client instance -+ * must be externally synchronised. -+ * Different clients may safely be used concurrently. ++/* NB taken from gator */ ++/* ++ * List of possible actions to be controlled by DS-5 Streamline. ++ * The following numbers are used by gator to control the frame buffer dumping ++ * and s/w counter reporting. We cannot use the enums in mali_uk_types.h because ++ * they are unknown inside gator. + */ + -+#ifndef _KBASE_HWCNT_LEGACY_H_ -+#define _KBASE_HWCNT_LEGACY_H_ ++#ifndef _KBASE_GATOR_H_ ++#define _KBASE_GATOR_H_ ++ ++#include + -+struct kbase_hwcnt_legacy_client; -+struct kbase_ioctl_hwcnt_enable; -+struct kbase_hwcnt_virtualizer; ++#define GATOR_JOB_SLOT_START 1 ++#define GATOR_JOB_SLOT_STOP 2 ++#define GATOR_JOB_SLOT_SOFT_STOPPED 3 + -+/** -+ * kbase_hwcnt_legacy_client_create() - Create a legacy hardware counter client. -+ * @hvirt: Non-NULL pointer to hardware counter virtualizer the client -+ * should be attached to. -+ * @enable: Non-NULL pointer to hwcnt_enable structure, containing a valid -+ * pointer to a user dump buffer large enough to hold a dump, and -+ * the counters that should be enabled. -+ * @out_hlcli: Non-NULL pointer to where the pointer to the created client will -+ * be stored on success. -+ * -+ * Return: 0 on success, else error code. -+ */ -+int kbase_hwcnt_legacy_client_create( -+ struct kbase_hwcnt_virtualizer *hvirt, -+ struct kbase_ioctl_hwcnt_enable *enable, -+ struct kbase_hwcnt_legacy_client **out_hlcli); ++#ifdef CONFIG_MALI_BIFROST_GATOR_SUPPORT + -+/** -+ * kbase_hwcnt_legacy_client_destroy() - Destroy a legacy hardware counter -+ * client. -+ * @hlcli: Pointer to the legacy hardware counter client. -+ * -+ * Will safely destroy a client in any partial state of construction. -+ */ -+void kbase_hwcnt_legacy_client_destroy(struct kbase_hwcnt_legacy_client *hlcli); ++#define GATOR_MAKE_EVENT(type, number) (((type) << 24) | ((number) << 16)) + -+/** -+ * kbase_hwcnt_legacy_client_dump() - Perform a hardware counter dump into the -+ * client's user buffer. -+ * @hlcli: Non-NULL pointer to the legacy hardware counter client. -+ * -+ * This function will synchronously dump hardware counters into the user buffer -+ * specified on client creation, with the counters specified on client creation. -+ * -+ * The counters are automatically cleared after each dump, such that the next -+ * dump performed will return the counter values accumulated between the time of -+ * this function call and the next dump. -+ * -+ * Return: 0 on success, else error code. -+ */ -+int kbase_hwcnt_legacy_client_dump(struct kbase_hwcnt_legacy_client *hlcli); ++struct kbase_context; + -+/** -+ * kbase_hwcnt_legacy_client_clear() - Perform and discard a hardware counter -+ * dump. -+ * @hlcli: Non-NULL pointer to the legacy hardware counter client. -+ * -+ * This function will synchronously clear the hardware counters, such that the -+ * next dump performed will return the counter values accumulated between the -+ * time of this function call and the next dump. -+ * -+ * Return: 0 on success, else error code. -+ */ -+int kbase_hwcnt_legacy_client_clear(struct kbase_hwcnt_legacy_client *hlcli); ++void kbase_trace_mali_job_slots_event(u32 dev_id, u32 event, const struct kbase_context *kctx, u8 atom_id); ++void kbase_trace_mali_pm_status(u32 dev_id, u32 event, u64 value); ++void kbase_trace_mali_page_fault_insert_pages(u32 dev_id, int event, u32 value); ++void kbase_trace_mali_total_alloc_pages_change(u32 dev_id, long long event); ++ ++#endif /* CONFIG_MALI_BIFROST_GATOR_SUPPORT */ + -+#endif /* _KBASE_HWCNT_LEGACY_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h ++#endif /* _KBASE_GATOR_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c new file mode 100755 -index 000000000000..8cd3835595f7 +index 000000000..bf5f259a0 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h -@@ -0,0 +1,106 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c +@@ -0,0 +1,112 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2015, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2017, 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -210211,108 +242768,114 @@ index 000000000000..8cd3835595f7 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#ifndef _KBASE_HWCNT_READER_H_ -+#define _KBASE_HWCNT_READER_H_ -+ -+#include -+ -+/* The ids of ioctl commands. */ -+#define KBASE_HWCNT_READER 0xBE -+#define KBASE_HWCNT_READER_GET_HWVER _IOR(KBASE_HWCNT_READER, 0x00, u32) -+#define KBASE_HWCNT_READER_GET_BUFFER_SIZE _IOR(KBASE_HWCNT_READER, 0x01, u32) -+#define KBASE_HWCNT_READER_DUMP _IOW(KBASE_HWCNT_READER, 0x10, u32) -+#define KBASE_HWCNT_READER_CLEAR _IOW(KBASE_HWCNT_READER, 0x11, u32) -+#define KBASE_HWCNT_READER_GET_BUFFER _IOC(_IOC_READ, KBASE_HWCNT_READER, 0x20,\ -+ offsetof(struct kbase_hwcnt_reader_metadata, cycles)) -+#define KBASE_HWCNT_READER_GET_BUFFER_WITH_CYCLES _IOR(KBASE_HWCNT_READER, 0x20,\ -+ struct kbase_hwcnt_reader_metadata) -+#define KBASE_HWCNT_READER_PUT_BUFFER _IOC(_IOC_WRITE, KBASE_HWCNT_READER, 0x21,\ -+ offsetof(struct kbase_hwcnt_reader_metadata, cycles)) -+#define KBASE_HWCNT_READER_PUT_BUFFER_WITH_CYCLES _IOW(KBASE_HWCNT_READER, 0x21,\ -+ struct kbase_hwcnt_reader_metadata) -+#define KBASE_HWCNT_READER_SET_INTERVAL _IOW(KBASE_HWCNT_READER, 0x30, u32) -+#define KBASE_HWCNT_READER_ENABLE_EVENT _IOW(KBASE_HWCNT_READER, 0x40, u32) -+#define KBASE_HWCNT_READER_DISABLE_EVENT _IOW(KBASE_HWCNT_READER, 0x41, u32) -+#define KBASE_HWCNT_READER_GET_API_VERSION _IOW(KBASE_HWCNT_READER, 0xFF, u32) -+#define KBASE_HWCNT_READER_GET_API_VERSION_WITH_FEATURES \ -+ _IOW(KBASE_HWCNT_READER, 0xFF, \ -+ struct kbase_hwcnt_reader_api_version) ++#include ++#include + ++#if IS_ENABLED(CONFIG_DEBUG_FS) +/** -+ * struct kbase_hwcnt_reader_metadata_cycles - GPU clock cycles -+ * @top: the number of cycles associated with the main clock for the -+ * GPU -+ * @shader_cores: the cycles that have elapsed on the GPU shader cores ++ * kbasep_gpu_memory_seq_show - Show callback for the @c gpu_memory debugfs file ++ * @sfile: The debugfs entry ++ * @data: Data associated with the entry ++ * ++ * This function is called to get the contents of the @c gpu_memory debugfs ++ * file. This is a report of current gpu memory usage. ++ * ++ * Return: ++ * * 0 if successfully prints data in debugfs entry file ++ * * -1 if it encountered an error + */ -+struct kbase_hwcnt_reader_metadata_cycles { -+ u64 top; -+ u64 shader_cores; -+}; + -+/** -+ * struct kbase_hwcnt_reader_metadata - hwcnt reader sample buffer metadata -+ * @timestamp: time when sample was collected -+ * @event_id: id of an event that triggered sample collection -+ * @buffer_idx: position in sampling area where sample buffer was stored -+ * @cycles: the GPU cycles that occurred since the last sample -+ */ -+struct kbase_hwcnt_reader_metadata { -+ u64 timestamp; -+ u32 event_id; -+ u32 buffer_idx; -+ struct kbase_hwcnt_reader_metadata_cycles cycles; -+}; ++static int kbasep_gpu_memory_seq_show(struct seq_file *sfile, void *data) ++{ ++ struct list_head *entry; ++ const struct list_head *kbdev_list; + -+/** -+ * enum base_hwcnt_reader_event - hwcnt dumping events -+ * @BASE_HWCNT_READER_EVENT_MANUAL: manual request for dump -+ * @BASE_HWCNT_READER_EVENT_PERIODIC: periodic dump -+ * @BASE_HWCNT_READER_EVENT_PREJOB: prejob dump request -+ * @BASE_HWCNT_READER_EVENT_POSTJOB: postjob dump request -+ * @BASE_HWCNT_READER_EVENT_COUNT: number of supported events -+ */ -+enum base_hwcnt_reader_event { -+ BASE_HWCNT_READER_EVENT_MANUAL, -+ BASE_HWCNT_READER_EVENT_PERIODIC, -+ BASE_HWCNT_READER_EVENT_PREJOB, -+ BASE_HWCNT_READER_EVENT_POSTJOB, ++ kbdev_list = kbase_device_get_list(); ++ list_for_each(entry, kbdev_list) { ++ struct kbase_device *kbdev = NULL; ++ struct kbase_context *kctx; + -+ BASE_HWCNT_READER_EVENT_COUNT -+}; ++ kbdev = list_entry(entry, struct kbase_device, entry); ++ /* output the total memory usage and cap for this device */ ++ seq_printf(sfile, " \n"); ++ seq_printf(sfile, "%-16s %10u\n", ++ kbdev->devname, ++ atomic_read(&(kbdev->memdev.used_pages))); ++ mutex_lock(&kbdev->kctx_list_lock); ++ seq_printf(sfile, " \n"); ++ list_for_each_entry(kctx, &kbdev->kctx_list, kctx_list_link) { ++ struct pid *pid_struct; ++ struct task_struct *task; + -+/** -+ * struct kbase_hwcnt_reader_api_version - hwcnt reader API version -+ * @versoin: API version -+ * @features: available features in this API version ++ rcu_read_lock(); ++ pid_struct = find_get_pid(kctx->tgid); ++ task = pid_task(pid_struct, PIDTYPE_PID); ++ /* output the memory usage and cap for each kctx ++ * opened on this device ++ */ ++ seq_printf(sfile, " %s-0x%pK %-20s %-10d %10u\n", ++ "kctx", ++ kctx, ++ task ? task->comm : "[null comm]", ++ kctx->tgid, ++ atomic_read(&(kctx->used_pages))); ++ put_pid(pid_struct); ++ rcu_read_unlock(); ++ } ++ mutex_unlock(&kbdev->kctx_list_lock); ++ } ++ kbase_device_put_list(kbdev_list); ++ return 0; ++} ++ ++/* ++ * File operations related to debugfs entry for gpu_memory + */ -+#define KBASE_HWCNT_READER_API_VERSION_NO_FEATURE (0) -+#define KBASE_HWCNT_READER_API_VERSION_FEATURE_CYCLES_TOP (1 << 0) -+#define KBASE_HWCNT_READER_API_VERSION_FEATURE_CYCLES_SHADER_CORES (1 << 1) -+struct kbase_hwcnt_reader_api_version { -+ u32 version; -+ u32 features; -+}; ++static int kbasep_gpu_memory_debugfs_open(struct inode *in, struct file *file) ++{ ++ return single_open(file, kbasep_gpu_memory_seq_show, NULL); ++} + -+#endif /* _KBASE_HWCNT_READER_H_ */ ++static const struct file_operations kbasep_gpu_memory_debugfs_fops = { ++ .owner = THIS_MODULE, ++ .open = kbasep_gpu_memory_debugfs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; + -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_types.c b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_types.c ++/* ++ * Initialize debugfs entry for gpu_memory ++ */ ++void kbasep_gpu_memory_debugfs_init(struct kbase_device *kbdev) ++{ ++ debugfs_create_file("gpu_memory", 0444, ++ kbdev->mali_debugfs_directory, NULL, ++ &kbasep_gpu_memory_debugfs_fops); ++} ++#else ++/* ++ * Stub functions for when debugfs is disabled ++ */ ++void kbasep_gpu_memory_debugfs_init(struct kbase_device *kbdev) {} ++#endif +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h new file mode 100755 -index 000000000000..2b9fe02acd75 +index 000000000..6d5423f37 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_types.c -@@ -0,0 +1,604 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h +@@ -0,0 +1,50 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2014, 2016, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -210323,606 +242886,946 @@ index 000000000000..2b9fe02acd75 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ */ ++ ++/** ++ * DOC: Header file for gpu_memory entry in debugfs + * + */ + -+#include "mali_kbase_hwcnt_types.h" -+#include "mali_kbase.h" ++#ifndef _KBASE_GPU_MEMORY_DEBUGFS_H ++#define _KBASE_GPU_MEMORY_DEBUGFS_H + -+/* Minimum alignment of each block of hardware counters */ -+#define KBASE_HWCNT_BLOCK_BYTE_ALIGNMENT \ -+ (KBASE_HWCNT_BITFIELD_BITS * KBASE_HWCNT_VALUE_BYTES) ++#include ++#include ++ ++/* kbase_io_history_add - add new entry to the register access history ++ * ++ * @h: Pointer to the history data structure ++ * @addr: Register address ++ * @value: The value that is either read from or written to the register ++ * @write: 1 if it's a register write, 0 if it's a read ++ */ ++void kbase_io_history_add(struct kbase_io_history *h, void __iomem const *addr, ++ u32 value, u8 write); + +/** -+ * KBASE_HWCNT_ALIGN_UPWARDS() - Align a value to an alignment. -+ * @value: The value to align upwards. -+ * @alignment: The alignment. ++ * kbasep_gpu_memory_debugfs_init - Initialize gpu_memory debugfs entry + * -+ * Return: A number greater than or equal to value that is aligned to alignment. ++ * @kbdev: Device pointer + */ -+#define KBASE_HWCNT_ALIGN_UPWARDS(value, alignment) \ -+ (value + ((alignment - (value % alignment)) % alignment)) ++void kbasep_gpu_memory_debugfs_init(struct kbase_device *kbdev); + -+int kbase_hwcnt_metadata_create( -+ const struct kbase_hwcnt_description *desc, -+ const struct kbase_hwcnt_metadata **out_metadata) -+{ -+ char *buf; -+ struct kbase_hwcnt_metadata *metadata; -+ struct kbase_hwcnt_group_metadata *grp_mds; -+ size_t grp; -+ size_t enable_map_count; /* Number of u64 bitfields (inc padding) */ -+ size_t dump_buf_count; /* Number of u32 values (inc padding) */ -+ size_t avail_mask_bits; /* Number of availability mask bits */ ++#endif /*_KBASE_GPU_MEMORY_DEBUGFS_H*/ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c +new file mode 100755 +index 000000000..7a7d17ea5 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c +@@ -0,0 +1,888 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2011-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+ size_t size; -+ size_t offset; ++/* ++ * Base kernel property query APIs ++ */ + -+ if (!desc || !out_metadata) -+ return -EINVAL; ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+ /* The maximum number of clock domains is 64. */ -+ if (desc->clk_cnt > (sizeof(u64) * BITS_PER_BYTE)) -+ return -EINVAL; + -+ /* Calculate the bytes needed to tightly pack the metadata */ ++static void kbase_gpuprops_construct_coherent_groups( ++ struct base_gpu_props * const props) ++{ ++ struct mali_base_gpu_coherent_group *current_group; ++ u64 group_present; ++ u64 group_mask; ++ u64 first_set, first_set_prev; ++ u32 num_groups = 0; + -+ /* Top level metadata */ -+ size = 0; -+ size += sizeof(struct kbase_hwcnt_metadata); ++ KBASE_DEBUG_ASSERT(props != NULL); + -+ /* Group metadata */ -+ size += sizeof(struct kbase_hwcnt_group_metadata) * desc->grp_cnt; ++ props->coherency_info.coherency = props->raw_props.mem_features; ++ props->coherency_info.num_core_groups = hweight64(props->raw_props.l2_present); + -+ /* Block metadata */ -+ for (grp = 0; grp < desc->grp_cnt; grp++) { -+ size += sizeof(struct kbase_hwcnt_block_metadata) * -+ desc->grps[grp].blk_cnt; ++ if (props->coherency_info.coherency & GROUPS_L2_COHERENT) { ++ /* Group is l2 coherent */ ++ group_present = props->raw_props.l2_present; ++ } else { ++ /* Group is l1 coherent */ ++ group_present = props->raw_props.shader_present; + } + -+ /* Single allocation for the entire metadata */ -+ buf = kmalloc(size, GFP_KERNEL); -+ if (!buf) -+ return -ENOMEM; ++ /* ++ * The coherent group mask can be computed from the l2 present ++ * register. ++ * ++ * For the coherent group n: ++ * group_mask[n] = (first_set[n] - 1) & ~(first_set[n-1] - 1) ++ * where first_set is group_present with only its nth set-bit kept ++ * (i.e. the position from where a new group starts). ++ * ++ * For instance if the groups are l2 coherent and l2_present=0x0..01111: ++ * The first mask is: ++ * group_mask[1] = (first_set[1] - 1) & ~(first_set[0] - 1) ++ * = (0x0..010 - 1) & ~(0x0..01 - 1) ++ * = 0x0..00f ++ * The second mask is: ++ * group_mask[2] = (first_set[2] - 1) & ~(first_set[1] - 1) ++ * = (0x0..100 - 1) & ~(0x0..010 - 1) ++ * = 0x0..0f0 ++ * And so on until all the bits from group_present have been cleared ++ * (i.e. there is no group left). ++ */ + -+ /* Use the allocated memory for the metadata and its members */ ++ current_group = props->coherency_info.group; ++ first_set = group_present & ~(group_present - 1); + -+ /* Bump allocate the top level metadata */ -+ offset = 0; -+ metadata = (struct kbase_hwcnt_metadata *)(buf + offset); -+ offset += sizeof(struct kbase_hwcnt_metadata); ++ while (group_present != 0 && num_groups < BASE_MAX_COHERENT_GROUPS) { ++ group_present -= first_set; /* Clear the current group bit */ ++ first_set_prev = first_set; + -+ /* Bump allocate the group metadata */ -+ grp_mds = (struct kbase_hwcnt_group_metadata *)(buf + offset); -+ offset += sizeof(struct kbase_hwcnt_group_metadata) * desc->grp_cnt; ++ first_set = group_present & ~(group_present - 1); ++ group_mask = (first_set - 1) & ~(first_set_prev - 1); + -+ enable_map_count = 0; -+ dump_buf_count = 0; -+ avail_mask_bits = 0; ++ /* Populate the coherent_group structure for each group */ ++ current_group->core_mask = group_mask & props->raw_props.shader_present; ++ current_group->num_cores = hweight64(current_group->core_mask); + -+ for (grp = 0; grp < desc->grp_cnt; grp++) { -+ size_t blk; ++ num_groups++; ++ current_group++; ++ } + -+ const struct kbase_hwcnt_group_description *grp_desc = -+ desc->grps + grp; -+ struct kbase_hwcnt_group_metadata *grp_md = grp_mds + grp; ++ if (group_present != 0) ++ pr_warn("Too many coherent groups (keeping only %d groups).\n", BASE_MAX_COHERENT_GROUPS); + -+ size_t group_enable_map_count = 0; -+ size_t group_dump_buffer_count = 0; -+ size_t group_avail_mask_bits = 0; ++ props->coherency_info.num_groups = num_groups; ++} + -+ /* Bump allocate this group's block metadata */ -+ struct kbase_hwcnt_block_metadata *blk_mds = -+ (struct kbase_hwcnt_block_metadata *)(buf + offset); -+ offset += sizeof(struct kbase_hwcnt_block_metadata) * -+ grp_desc->blk_cnt; ++/** ++ * kbase_gpuprops_get_curr_config_props - Get the current allocated resources ++ * @kbdev: The &struct kbase_device structure for the device ++ * @curr_config: The &struct curr_config_props structure to receive the result ++ * ++ * Fill the &struct curr_config_props structure with values from the GPU ++ * configuration registers. ++ * ++ * Return: Zero on success, Linux error code on failure ++ */ ++int kbase_gpuprops_get_curr_config_props(struct kbase_device *kbdev, ++ struct curr_config_props * const curr_config) ++{ ++ struct kbase_current_config_regdump curr_config_regdump; ++ int err; + -+ /* Fill in each block in the group's information */ -+ for (blk = 0; blk < grp_desc->blk_cnt; blk++) { -+ const struct kbase_hwcnt_block_description *blk_desc = -+ grp_desc->blks + blk; -+ struct kbase_hwcnt_block_metadata *blk_md = -+ blk_mds + blk; -+ const size_t n_values = -+ blk_desc->hdr_cnt + blk_desc->ctr_cnt; ++ if (WARN_ON(!kbdev) || WARN_ON(!curr_config)) ++ return -EINVAL; + -+ blk_md->type = blk_desc->type; -+ blk_md->inst_cnt = blk_desc->inst_cnt; -+ blk_md->hdr_cnt = blk_desc->hdr_cnt; -+ blk_md->ctr_cnt = blk_desc->ctr_cnt; -+ blk_md->enable_map_index = group_enable_map_count; -+ blk_md->enable_map_stride = -+ kbase_hwcnt_bitfield_count(n_values); -+ blk_md->dump_buf_index = group_dump_buffer_count; -+ blk_md->dump_buf_stride = -+ KBASE_HWCNT_ALIGN_UPWARDS( -+ n_values, -+ (KBASE_HWCNT_BLOCK_BYTE_ALIGNMENT / -+ KBASE_HWCNT_VALUE_BYTES)); -+ blk_md->avail_mask_index = group_avail_mask_bits; ++ /* If update not needed just return. */ ++ if (!curr_config->update_needed) ++ return 0; + -+ group_enable_map_count += -+ blk_md->enable_map_stride * blk_md->inst_cnt; -+ group_dump_buffer_count += -+ blk_md->dump_buf_stride * blk_md->inst_cnt; -+ group_avail_mask_bits += blk_md->inst_cnt; -+ } ++ /* Dump relevant registers */ ++ err = kbase_backend_gpuprops_get_curr_config(kbdev, ++ &curr_config_regdump); ++ if (err) ++ return err; + -+ /* Fill in the group's information */ -+ grp_md->type = grp_desc->type; -+ grp_md->blk_cnt = grp_desc->blk_cnt; -+ grp_md->blk_metadata = blk_mds; -+ grp_md->enable_map_index = enable_map_count; -+ grp_md->dump_buf_index = dump_buf_count; -+ grp_md->avail_mask_index = avail_mask_bits; ++ curr_config->l2_slices = ++ KBASE_UBFX32(curr_config_regdump.mem_features, 8U, 4) + 1; + -+ enable_map_count += group_enable_map_count; -+ dump_buf_count += group_dump_buffer_count; -+ avail_mask_bits += group_avail_mask_bits; -+ } ++ curr_config->l2_present = ++ ((u64) curr_config_regdump.l2_present_hi << 32) + ++ curr_config_regdump.l2_present_lo; + -+ /* Fill in the top level metadata's information */ -+ metadata->grp_cnt = desc->grp_cnt; -+ metadata->grp_metadata = grp_mds; -+ metadata->enable_map_bytes = -+ enable_map_count * KBASE_HWCNT_BITFIELD_BYTES; -+ metadata->dump_buf_bytes = dump_buf_count * KBASE_HWCNT_VALUE_BYTES; -+ metadata->avail_mask = desc->avail_mask; -+ metadata->clk_cnt = desc->clk_cnt; ++ curr_config->shader_present = ++ ((u64) curr_config_regdump.shader_present_hi << 32) + ++ curr_config_regdump.shader_present_lo; + -+ WARN_ON(size != offset); -+ /* Due to the block alignment, there should be exactly one enable map -+ * bit per 4 bytes in the dump buffer. -+ */ -+ WARN_ON(metadata->dump_buf_bytes != -+ (metadata->enable_map_bytes * -+ BITS_PER_BYTE * KBASE_HWCNT_VALUE_BYTES)); ++ curr_config->num_cores = hweight64(curr_config->shader_present); + -+ *out_metadata = metadata; -+ return 0; -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_metadata_create); ++ curr_config->update_needed = false; + -+void kbase_hwcnt_metadata_destroy(const struct kbase_hwcnt_metadata *metadata) -+{ -+ kfree(metadata); ++ return 0; +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_metadata_destroy); + -+int kbase_hwcnt_enable_map_alloc( -+ const struct kbase_hwcnt_metadata *metadata, -+ struct kbase_hwcnt_enable_map *enable_map) ++/** ++ * kbase_gpuprops_req_curr_config_update - Request Current Config Update ++ * @kbdev: The &struct kbase_device structure for the device ++ * ++ * Requests the current configuration to be updated next time the ++ * kbase_gpuprops_get_curr_config_props() is called. ++ * ++ * Return: Zero on success, Linux error code on failure ++ */ ++int kbase_gpuprops_req_curr_config_update(struct kbase_device *kbdev) +{ -+ u64 *enable_map_buf; -+ -+ if (!metadata || !enable_map) ++ if (WARN_ON(!kbdev)) + return -EINVAL; + -+ if (metadata->enable_map_bytes > 0) { -+ enable_map_buf = -+ kzalloc(metadata->enable_map_bytes, GFP_KERNEL); -+ if (!enable_map_buf) -+ return -ENOMEM; -+ } else { -+ enable_map_buf = NULL; -+ } -+ -+ enable_map->metadata = metadata; -+ enable_map->hwcnt_enable_map = enable_map_buf; ++ kbdev->gpu_props.curr_config.update_needed = true; + return 0; +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_enable_map_alloc); + -+void kbase_hwcnt_enable_map_free(struct kbase_hwcnt_enable_map *enable_map) ++/** ++ * kbase_gpuprops_get_props - Get the GPU configuration ++ * @gpu_props: The &struct base_gpu_props structure ++ * @kbdev: The &struct kbase_device structure for the device ++ * ++ * Fill the &struct base_gpu_props structure with values from the GPU ++ * configuration registers. Only the raw properties are filled in this function. ++ * ++ * Return: Zero on success, Linux error code on failure ++ */ ++static int kbase_gpuprops_get_props(struct base_gpu_props * const gpu_props, ++ struct kbase_device *kbdev) +{ -+ if (!enable_map) -+ return; ++ struct kbase_gpuprops_regdump regdump; ++ int i; ++ int err; + -+ kfree(enable_map->hwcnt_enable_map); -+ enable_map->hwcnt_enable_map = NULL; -+ enable_map->metadata = NULL; -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_enable_map_free); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(gpu_props != NULL); + -+int kbase_hwcnt_dump_buffer_alloc( -+ const struct kbase_hwcnt_metadata *metadata, -+ struct kbase_hwcnt_dump_buffer *dump_buf) -+{ -+ size_t dump_buf_bytes; -+ size_t clk_cnt_buf_bytes; -+ u8 *buf; ++ /* Dump relevant registers */ ++ err = kbase_backend_gpuprops_get(kbdev, ®dump); ++ if (err) ++ return err; + -+ if (!metadata || !dump_buf) -+ return -EINVAL; ++ gpu_props->raw_props.gpu_id = regdump.gpu_id; ++ gpu_props->raw_props.tiler_features = regdump.tiler_features; ++ gpu_props->raw_props.mem_features = regdump.mem_features; ++ gpu_props->raw_props.mmu_features = regdump.mmu_features; ++ gpu_props->raw_props.l2_features = regdump.l2_features; + -+ dump_buf_bytes = metadata->dump_buf_bytes; -+ clk_cnt_buf_bytes = sizeof(*dump_buf->clk_cnt_buf) * metadata->clk_cnt; ++ gpu_props->raw_props.as_present = regdump.as_present; ++ gpu_props->raw_props.js_present = regdump.js_present; ++ gpu_props->raw_props.shader_present = ++ ((u64) regdump.shader_present_hi << 32) + ++ regdump.shader_present_lo; ++ gpu_props->raw_props.tiler_present = ++ ((u64) regdump.tiler_present_hi << 32) + ++ regdump.tiler_present_lo; ++ gpu_props->raw_props.l2_present = ++ ((u64) regdump.l2_present_hi << 32) + ++ regdump.l2_present_lo; ++ gpu_props->raw_props.stack_present = ++ ((u64) regdump.stack_present_hi << 32) + ++ regdump.stack_present_lo; + -+ /* Make a single allocation for both dump_buf and clk_cnt_buf. */ -+ buf = kmalloc(dump_buf_bytes + clk_cnt_buf_bytes, GFP_KERNEL); -+ if (!buf) -+ return -ENOMEM; ++ for (i = 0; i < GPU_MAX_JOB_SLOTS; i++) ++ gpu_props->raw_props.js_features[i] = regdump.js_features[i]; + -+ dump_buf->metadata = metadata; -+ dump_buf->dump_buf = (u32 *)buf; -+ dump_buf->clk_cnt_buf = (u64 *)(buf + dump_buf_bytes); ++ for (i = 0; i < BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS; i++) ++ gpu_props->raw_props.texture_features[i] = regdump.texture_features[i]; ++ ++ gpu_props->raw_props.thread_max_barrier_size = regdump.thread_max_barrier_size; ++ gpu_props->raw_props.thread_max_threads = regdump.thread_max_threads; ++ gpu_props->raw_props.thread_max_workgroup_size = regdump.thread_max_workgroup_size; ++ gpu_props->raw_props.thread_features = regdump.thread_features; ++ gpu_props->raw_props.thread_tls_alloc = regdump.thread_tls_alloc; ++ ++ gpu_props->raw_props.gpu_features = ++ ((u64) regdump.gpu_features_hi << 32) + ++ regdump.gpu_features_lo; + + return 0; +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_dump_buffer_alloc); + -+void kbase_hwcnt_dump_buffer_free(struct kbase_hwcnt_dump_buffer *dump_buf) ++void kbase_gpuprops_update_core_props_gpu_id( ++ struct base_gpu_props * const gpu_props) +{ -+ if (!dump_buf) ++ gpu_props->core_props.version_status = ++ KBASE_UBFX32(gpu_props->raw_props.gpu_id, 0U, 4); ++ gpu_props->core_props.minor_revision = ++ KBASE_UBFX32(gpu_props->raw_props.gpu_id, 4U, 8); ++ gpu_props->core_props.major_revision = ++ KBASE_UBFX32(gpu_props->raw_props.gpu_id, 12U, 4); ++ gpu_props->core_props.product_id = ++ KBASE_UBFX32(gpu_props->raw_props.gpu_id, 16U, 16); ++} ++ ++/** ++ * kbase_gpuprops_update_max_config_props - Updates the max config properties in ++ * the base_gpu_props. ++ * @base_props: The &struct base_gpu_props structure ++ * @kbdev: The &struct kbase_device structure for the device ++ * ++ * Updates the &struct base_gpu_props structure with the max config properties. ++ */ ++static void kbase_gpuprops_update_max_config_props( ++ struct base_gpu_props * const base_props, struct kbase_device *kbdev) ++{ ++ int l2_n = 0; ++ ++ if (WARN_ON(!kbdev) || WARN_ON(!base_props)) + return; + -+ kfree(dump_buf->dump_buf); -+ memset(dump_buf, 0, sizeof(*dump_buf)); ++ /* return if the max_config is not set during arbif initialization */ ++ if (kbdev->gpu_props.max_config.core_mask == 0) ++ return; ++ ++ /* ++ * Set the base_props with the maximum config values to ensure that the ++ * user space will always be based on the maximum resources available. ++ */ ++ base_props->l2_props.num_l2_slices = ++ kbdev->gpu_props.max_config.l2_slices; ++ base_props->raw_props.shader_present = ++ kbdev->gpu_props.max_config.core_mask; ++ /* ++ * Update l2_present in the raw data to be consistent with the ++ * max_config.l2_slices number. ++ */ ++ base_props->raw_props.l2_present = 0; ++ for (l2_n = 0; l2_n < base_props->l2_props.num_l2_slices; l2_n++) { ++ base_props->raw_props.l2_present <<= 1; ++ base_props->raw_props.l2_present |= 0x1; ++ } ++ /* ++ * Update the coherency_info data using just one core group. For ++ * architectures where the max_config is provided by the arbiter it is ++ * not necessary to split the shader core groups in different coherent ++ * groups. ++ */ ++ base_props->coherency_info.coherency = ++ base_props->raw_props.mem_features; ++ base_props->coherency_info.num_core_groups = 1; ++ base_props->coherency_info.num_groups = 1; ++ base_props->coherency_info.group[0].core_mask = ++ kbdev->gpu_props.max_config.core_mask; ++ base_props->coherency_info.group[0].num_cores = ++ hweight32(kbdev->gpu_props.max_config.core_mask); +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_dump_buffer_free); + -+int kbase_hwcnt_dump_buffer_array_alloc( -+ const struct kbase_hwcnt_metadata *metadata, -+ size_t n, -+ struct kbase_hwcnt_dump_buffer_array *dump_bufs) ++/** ++ * kbase_gpuprops_calculate_props - Calculate the derived properties ++ * @gpu_props: The &struct base_gpu_props structure ++ * @kbdev: The &struct kbase_device structure for the device ++ * ++ * Fill the &struct base_gpu_props structure with values derived from the GPU ++ * configuration registers ++ */ ++static void kbase_gpuprops_calculate_props( ++ struct base_gpu_props * const gpu_props, struct kbase_device *kbdev) +{ -+ struct kbase_hwcnt_dump_buffer *buffers; -+ size_t buf_idx; -+ unsigned int order; -+ unsigned long addr; -+ size_t dump_buf_bytes; -+ size_t clk_cnt_buf_bytes; ++ int i; + -+ if (!metadata || !dump_bufs) -+ return -EINVAL; ++ /* Populate the base_gpu_props structure */ ++ kbase_gpuprops_update_core_props_gpu_id(gpu_props); ++ gpu_props->core_props.log2_program_counter_size = KBASE_GPU_PC_SIZE_LOG2; ++#if KERNEL_VERSION(5, 0, 0) > LINUX_VERSION_CODE ++ gpu_props->core_props.gpu_available_memory_size = totalram_pages << PAGE_SHIFT; ++#else ++ gpu_props->core_props.gpu_available_memory_size = ++ totalram_pages() << PAGE_SHIFT; ++#endif + -+ dump_buf_bytes = metadata->dump_buf_bytes; -+ clk_cnt_buf_bytes = -+ sizeof(*dump_bufs->bufs->clk_cnt_buf) * metadata->clk_cnt; ++ for (i = 0; i < BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS; i++) ++ gpu_props->core_props.texture_features[i] = gpu_props->raw_props.texture_features[i]; + -+ /* Allocate memory for the dump buffer struct array */ -+ buffers = kmalloc_array(n, sizeof(*buffers), GFP_KERNEL); -+ if (!buffers) -+ return -ENOMEM; ++ gpu_props->l2_props.log2_line_size = KBASE_UBFX32(gpu_props->raw_props.l2_features, 0U, 8); ++ gpu_props->l2_props.log2_cache_size = KBASE_UBFX32(gpu_props->raw_props.l2_features, 16U, 8); + -+ /* Allocate pages for the actual dump buffers, as they tend to be fairly -+ * large. ++ /* Field with number of l2 slices is added to MEM_FEATURES register ++ * since t76x. Below code assumes that for older GPU reserved bits will ++ * be read as zero. + */ -+ order = get_order((dump_buf_bytes + clk_cnt_buf_bytes) * n); -+ addr = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order); ++ gpu_props->l2_props.num_l2_slices = ++ KBASE_UBFX32(gpu_props->raw_props.mem_features, 8U, 4) + 1; + -+ if (!addr) { -+ kfree(buffers); -+ return -ENOMEM; -+ } ++ gpu_props->tiler_props.bin_size_bytes = 1 << KBASE_UBFX32(gpu_props->raw_props.tiler_features, 0U, 6); ++ gpu_props->tiler_props.max_active_levels = KBASE_UBFX32(gpu_props->raw_props.tiler_features, 8U, 4); + -+ dump_bufs->page_addr = addr; -+ dump_bufs->page_order = order; -+ dump_bufs->buf_cnt = n; -+ dump_bufs->bufs = buffers; ++ if (gpu_props->raw_props.thread_max_threads == 0) ++ gpu_props->thread_props.max_threads = THREAD_MT_DEFAULT; ++ else ++ gpu_props->thread_props.max_threads = gpu_props->raw_props.thread_max_threads; + -+ /* Set the buffer of each dump buf */ -+ for (buf_idx = 0; buf_idx < n; buf_idx++) { -+ const size_t dump_buf_offset = dump_buf_bytes * buf_idx; -+ const size_t clk_cnt_buf_offset = -+ (dump_buf_bytes * n) + (clk_cnt_buf_bytes * buf_idx); ++ if (gpu_props->raw_props.thread_max_workgroup_size == 0) ++ gpu_props->thread_props.max_workgroup_size = THREAD_MWS_DEFAULT; ++ else ++ gpu_props->thread_props.max_workgroup_size = gpu_props->raw_props.thread_max_workgroup_size; + -+ buffers[buf_idx].metadata = metadata; -+ buffers[buf_idx].dump_buf = (u32 *)(addr + dump_buf_offset); -+ buffers[buf_idx].clk_cnt_buf = -+ (u64 *)(addr + clk_cnt_buf_offset); ++ if (gpu_props->raw_props.thread_max_barrier_size == 0) ++ gpu_props->thread_props.max_barrier_size = THREAD_MBS_DEFAULT; ++ else ++ gpu_props->thread_props.max_barrier_size = gpu_props->raw_props.thread_max_barrier_size; ++ ++ if (gpu_props->raw_props.thread_tls_alloc == 0) ++ gpu_props->thread_props.tls_alloc = ++ gpu_props->thread_props.max_threads; ++ else ++ gpu_props->thread_props.tls_alloc = ++ gpu_props->raw_props.thread_tls_alloc; ++ ++#if MALI_USE_CSF ++ gpu_props->thread_props.max_registers = ++ KBASE_UBFX32(gpu_props->raw_props.thread_features, 0U, 22); ++ gpu_props->thread_props.impl_tech = ++ KBASE_UBFX32(gpu_props->raw_props.thread_features, 22U, 2); ++ gpu_props->thread_props.max_task_queue = ++ KBASE_UBFX32(gpu_props->raw_props.thread_features, 24U, 8); ++ gpu_props->thread_props.max_thread_group_split = 0; ++#else ++ gpu_props->thread_props.max_registers = ++ KBASE_UBFX32(gpu_props->raw_props.thread_features, 0U, 16); ++ gpu_props->thread_props.max_task_queue = ++ KBASE_UBFX32(gpu_props->raw_props.thread_features, 16U, 8); ++ gpu_props->thread_props.max_thread_group_split = ++ KBASE_UBFX32(gpu_props->raw_props.thread_features, 24U, 6); ++ gpu_props->thread_props.impl_tech = ++ KBASE_UBFX32(gpu_props->raw_props.thread_features, 30U, 2); ++#endif ++ ++ /* If values are not specified, then use defaults */ ++ if (gpu_props->thread_props.max_registers == 0) { ++ gpu_props->thread_props.max_registers = THREAD_MR_DEFAULT; ++ gpu_props->thread_props.max_task_queue = THREAD_MTQ_DEFAULT; ++ gpu_props->thread_props.max_thread_group_split = THREAD_MTGS_DEFAULT; + } + -+ return 0; ++ /* ++ * If the maximum resources allocated information is available it is ++ * necessary to update the base_gpu_props with the max_config info to ++ * the userspace. This is applicable to systems that receive this ++ * information from the arbiter. ++ */ ++ if (kbdev->gpu_props.max_config.core_mask) ++ /* Update the max config properties in the base_gpu_props */ ++ kbase_gpuprops_update_max_config_props(gpu_props, ++ kbdev); ++ else ++ /* Initialize the coherent_group structure for each group */ ++ kbase_gpuprops_construct_coherent_groups(gpu_props); +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_dump_buffer_array_alloc); + -+void kbase_hwcnt_dump_buffer_array_free( -+ struct kbase_hwcnt_dump_buffer_array *dump_bufs) ++void kbase_gpuprops_set_max_config(struct kbase_device *kbdev, ++ const struct max_config_props *max_config) +{ -+ if (!dump_bufs) ++ if (WARN_ON(!kbdev) || WARN_ON(!max_config)) + return; + -+ kfree(dump_bufs->bufs); -+ free_pages(dump_bufs->page_addr, dump_bufs->page_order); -+ memset(dump_bufs, 0, sizeof(*dump_bufs)); ++ kbdev->gpu_props.max_config.l2_slices = max_config->l2_slices; ++ kbdev->gpu_props.max_config.core_mask = max_config->core_mask; +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_dump_buffer_array_free); + -+void kbase_hwcnt_dump_buffer_zero( -+ struct kbase_hwcnt_dump_buffer *dst, -+ const struct kbase_hwcnt_enable_map *dst_enable_map) ++void kbase_gpuprops_set(struct kbase_device *kbdev) +{ -+ const struct kbase_hwcnt_metadata *metadata; -+ size_t grp, blk, blk_inst; ++ struct kbase_gpu_props *gpu_props; ++ struct gpu_raw_gpu_props *raw; + -+ if (WARN_ON(!dst) || -+ WARN_ON(!dst_enable_map) || -+ WARN_ON(dst->metadata != dst_enable_map->metadata)) ++ if (WARN_ON(!kbdev)) + return; ++ gpu_props = &kbdev->gpu_props; ++ raw = &gpu_props->props.raw_props; + -+ metadata = dst->metadata; ++ /* Initialize the base_gpu_props structure from the hardware */ ++ kbase_gpuprops_get_props(&gpu_props->props, kbdev); + -+ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) { -+ u32 *dst_blk; -+ size_t val_cnt; ++ /* Populate the derived properties */ ++ kbase_gpuprops_calculate_props(&gpu_props->props, kbdev); + -+ if (!kbase_hwcnt_enable_map_block_enabled( -+ dst_enable_map, grp, blk, blk_inst)) -+ continue; ++ /* Populate kbase-only fields */ ++ gpu_props->l2_props.associativity = KBASE_UBFX32(raw->l2_features, 8U, 8); ++ gpu_props->l2_props.external_bus_width = KBASE_UBFX32(raw->l2_features, 24U, 8); + -+ dst_blk = kbase_hwcnt_dump_buffer_block_instance( -+ dst, grp, blk, blk_inst); -+ val_cnt = kbase_hwcnt_metadata_block_values_count( -+ metadata, grp, blk); ++ gpu_props->mem.core_group = KBASE_UBFX32(raw->mem_features, 0U, 1); + -+ kbase_hwcnt_dump_buffer_block_zero(dst_blk, val_cnt); -+ } ++ gpu_props->mmu.va_bits = KBASE_UBFX32(raw->mmu_features, 0U, 8); ++ gpu_props->mmu.pa_bits = KBASE_UBFX32(raw->mmu_features, 8U, 8); ++ ++ gpu_props->num_cores = hweight64(raw->shader_present); ++ gpu_props->num_core_groups = ++ gpu_props->props.coherency_info.num_core_groups; ++ gpu_props->num_address_spaces = hweight32(raw->as_present); ++ gpu_props->num_job_slots = hweight32(raw->js_present); + -+ memset(dst->clk_cnt_buf, 0, -+ sizeof(*dst->clk_cnt_buf) * metadata->clk_cnt); ++ /* ++ * Current configuration is used on HW interactions so that the maximum ++ * config is just used for user space avoiding interactions with parts ++ * of the hardware that might not be allocated to the kbase instance at ++ * that moment. ++ */ ++ kbase_gpuprops_req_curr_config_update(kbdev); ++ kbase_gpuprops_get_curr_config_props(kbdev, &gpu_props->curr_config); +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_dump_buffer_zero); + -+void kbase_hwcnt_dump_buffer_zero_strict( -+ struct kbase_hwcnt_dump_buffer *dst) ++int kbase_gpuprops_set_features(struct kbase_device *kbdev) +{ -+ if (WARN_ON(!dst)) -+ return; ++ struct base_gpu_props *gpu_props; ++ struct kbase_gpuprops_regdump regdump; ++ int err; + -+ memset(dst->dump_buf, 0, dst->metadata->dump_buf_bytes); ++ gpu_props = &kbdev->gpu_props.props; ++ ++ /* Dump relevant registers */ ++ err = kbase_backend_gpuprops_get_features(kbdev, ®dump); ++ if (err) ++ return err; ++ ++ /* ++ * Copy the raw value from the register, later this will get turned ++ * into the selected coherency mode. ++ * Additionally, add non-coherent mode, as this is always supported. ++ */ ++ gpu_props->raw_props.coherency_mode = regdump.coherency_features | ++ COHERENCY_FEATURE_BIT(COHERENCY_NONE); ++ ++ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_THREAD_GROUP_SPLIT)) ++ gpu_props->thread_props.max_thread_group_split = 0; ++ ++ /* ++ * The CORE_FEATURES register has different meanings depending on GPU. ++ * On tGOx, bits[3:0] encode num_exec_engines. ++ * On CSF GPUs, bits[7:0] is an enumeration that needs to be parsed, ++ * instead. ++ * GPUs like tTIx have additional fields like LSC_SIZE that are ++ * otherwise reserved/RAZ on older GPUs. ++ */ ++ gpu_props->raw_props.core_features = regdump.core_features; ++ ++#if !MALI_USE_CSF ++ gpu_props->core_props.num_exec_engines = ++ KBASE_UBFX32(gpu_props->raw_props.core_features, 0, 4); ++#endif + -+ memset(dst->clk_cnt_buf, 0, -+ sizeof(*dst->clk_cnt_buf) * dst->metadata->clk_cnt); ++ return err; +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_dump_buffer_zero_strict); + -+void kbase_hwcnt_dump_buffer_zero_non_enabled( -+ struct kbase_hwcnt_dump_buffer *dst, -+ const struct kbase_hwcnt_enable_map *dst_enable_map) ++/* ++ * Module parameters to allow the L2 size and hash configuration to be ++ * overridden. ++ * ++ * These parameters must be set on insmod to take effect, and are not visible ++ * in sysfs. ++ */ ++static u8 override_l2_size; ++module_param(override_l2_size, byte, 0000); ++MODULE_PARM_DESC(override_l2_size, "Override L2 size config for testing"); ++ ++static u8 override_l2_hash; ++module_param(override_l2_hash, byte, 0000); ++MODULE_PARM_DESC(override_l2_hash, "Override L2 hash config for testing"); ++ ++static u32 l2_hash_values[ASN_HASH_COUNT] = { ++ 0, ++}; ++static unsigned int num_override_l2_hash_values; ++module_param_array(l2_hash_values, uint, &num_override_l2_hash_values, 0000); ++MODULE_PARM_DESC(l2_hash_values, "Override L2 hash values config for testing"); ++ ++/* Definitions for range of supported user defined hash functions for GPUs ++ * that support L2_CONFIG and not ASN_HASH features. Supported hash function ++ * range from 0b1000-0b1111 inclusive. Selection of any other values will ++ * lead to undefined behavior. ++ */ ++#define USER_DEFINED_HASH_LO ((u8)0x08) ++#define USER_DEFINED_HASH_HI ((u8)0x0F) ++ ++enum l2_config_override_result { ++ L2_CONFIG_OVERRIDE_FAIL = -1, ++ L2_CONFIG_OVERRIDE_NONE, ++ L2_CONFIG_OVERRIDE_OK, ++}; ++ ++/** ++ * kbase_read_l2_config_from_dt - Read L2 configuration ++ * @kbdev: The kbase device for which to get the L2 configuration. ++ * ++ * Check for L2 configuration overrides in module parameters and device tree. ++ * Override values in module parameters take priority over override values in ++ * device tree. ++ * ++ * Return: L2_CONFIG_OVERRIDE_OK if either size or hash, or both was properly ++ * overridden, L2_CONFIG_OVERRIDE_NONE if no overrides are provided. ++ * L2_CONFIG_OVERRIDE_FAIL otherwise. ++ */ ++static enum l2_config_override_result ++kbase_read_l2_config_from_dt(struct kbase_device *const kbdev) +{ -+ const struct kbase_hwcnt_metadata *metadata; -+ size_t grp, blk, blk_inst; ++ struct device_node *np = kbdev->dev->of_node; + -+ if (WARN_ON(!dst) || -+ WARN_ON(!dst_enable_map) || -+ WARN_ON(dst->metadata != dst_enable_map->metadata)) -+ return; ++ if (!np) ++ return L2_CONFIG_OVERRIDE_NONE; + -+ metadata = dst->metadata; ++ if (override_l2_size) ++ kbdev->l2_size_override = override_l2_size; ++ else if (of_property_read_u8(np, "l2-size", &kbdev->l2_size_override)) ++ kbdev->l2_size_override = 0; + -+ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) { -+ u32 *dst_blk = kbase_hwcnt_dump_buffer_block_instance( -+ dst, grp, blk, blk_inst); -+ const u64 *blk_em = kbase_hwcnt_enable_map_block_instance( -+ dst_enable_map, grp, blk, blk_inst); -+ size_t val_cnt = kbase_hwcnt_metadata_block_values_count( -+ metadata, grp, blk); ++ /* Check overriding value is supported, if not will result in ++ * undefined behavior. ++ */ ++ if (override_l2_hash >= USER_DEFINED_HASH_LO && ++ override_l2_hash <= USER_DEFINED_HASH_HI) ++ kbdev->l2_hash_override = override_l2_hash; ++ else if (of_property_read_u8(np, "l2-hash", &kbdev->l2_hash_override)) ++ kbdev->l2_hash_override = 0; + -+ /* Align upwards to include padding bytes */ -+ val_cnt = KBASE_HWCNT_ALIGN_UPWARDS(val_cnt, -+ (KBASE_HWCNT_BLOCK_BYTE_ALIGNMENT / -+ KBASE_HWCNT_VALUE_BYTES)); ++ kbdev->l2_hash_values_override = false; ++ if (num_override_l2_hash_values) { ++ unsigned int i; + -+ if (kbase_hwcnt_metadata_block_instance_avail( -+ metadata, grp, blk, blk_inst)) { -+ /* Block available, so only zero non-enabled values */ -+ kbase_hwcnt_dump_buffer_block_zero_non_enabled( -+ dst_blk, blk_em, val_cnt); -+ } else { -+ /* Block not available, so zero the entire thing */ -+ kbase_hwcnt_dump_buffer_block_zero(dst_blk, val_cnt); -+ } ++ kbdev->l2_hash_values_override = true; ++ for (i = 0; i < num_override_l2_hash_values; i++) ++ kbdev->l2_hash_values[i] = l2_hash_values[i]; ++ } else if (!of_property_read_u32_array(np, "l2-hash-values", ++ kbdev->l2_hash_values, ++ ASN_HASH_COUNT)) ++ kbdev->l2_hash_values_override = true; ++ ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_ASN_HASH) && ++ (kbdev->l2_hash_override)) { ++ dev_err(kbdev->dev, "l2-hash not supported\n"); ++ return L2_CONFIG_OVERRIDE_FAIL; + } ++ ++ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_ASN_HASH) && ++ (kbdev->l2_hash_values_override)) { ++ dev_err(kbdev->dev, "l2-hash-values not supported\n"); ++ return L2_CONFIG_OVERRIDE_FAIL; ++ } ++ ++ if (kbdev->l2_hash_override && kbdev->l2_hash_values_override) { ++ dev_err(kbdev->dev, ++ "both l2-hash & l2-hash-values not supported\n"); ++ return L2_CONFIG_OVERRIDE_FAIL; ++ } ++ ++ if (kbdev->l2_size_override || kbdev->l2_hash_override || ++ kbdev->l2_hash_values_override) ++ return L2_CONFIG_OVERRIDE_OK; ++ ++ return L2_CONFIG_OVERRIDE_NONE; +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_dump_buffer_zero_non_enabled); + -+void kbase_hwcnt_dump_buffer_copy( -+ struct kbase_hwcnt_dump_buffer *dst, -+ const struct kbase_hwcnt_dump_buffer *src, -+ const struct kbase_hwcnt_enable_map *dst_enable_map) ++int kbase_gpuprops_update_l2_features(struct kbase_device *kbdev) +{ -+ const struct kbase_hwcnt_metadata *metadata; -+ size_t grp, blk, blk_inst; -+ size_t clk; ++ int err = 0; + -+ if (WARN_ON(!dst) || -+ WARN_ON(!src) || -+ WARN_ON(!dst_enable_map) || -+ WARN_ON(dst == src) || -+ WARN_ON(dst->metadata != src->metadata) || -+ WARN_ON(dst->metadata != dst_enable_map->metadata)) -+ return; ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_L2_CONFIG)) { ++ struct kbase_gpuprops_regdump regdump; ++ struct base_gpu_props *gpu_props = &kbdev->gpu_props.props; + -+ metadata = dst->metadata; ++ /* Check for L2 cache size & hash overrides */ ++ switch (kbase_read_l2_config_from_dt(kbdev)) { ++ case L2_CONFIG_OVERRIDE_FAIL: ++ err = -EIO; ++ goto exit; ++ case L2_CONFIG_OVERRIDE_NONE: ++ goto exit; ++ default: ++ break; ++ } + -+ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) { -+ u32 *dst_blk; -+ const u32 *src_blk; -+ size_t val_cnt; ++ /* pm.active_count is expected to be 1 here, which is set in ++ * kbase_hwaccess_pm_powerup(). ++ */ ++ WARN_ON(kbdev->pm.active_count != 1); ++ /* The new settings for L2 cache can only be applied when it is ++ * off, so first do the power down. ++ */ ++ kbase_pm_context_idle(kbdev); ++ kbase_pm_wait_for_desired_state(kbdev); + -+ if (!kbase_hwcnt_enable_map_block_enabled( -+ dst_enable_map, grp, blk, blk_inst)) -+ continue; ++ /* Need L2 to get powered to reflect to L2_FEATURES */ ++ kbase_pm_context_active(kbdev); + -+ dst_blk = kbase_hwcnt_dump_buffer_block_instance( -+ dst, grp, blk, blk_inst); -+ src_blk = kbase_hwcnt_dump_buffer_block_instance( -+ src, grp, blk, blk_inst); -+ val_cnt = kbase_hwcnt_metadata_block_values_count( -+ metadata, grp, blk); ++ /* Wait for the completion of L2 power transition */ ++ kbase_pm_wait_for_l2_powered(kbdev); + -+ kbase_hwcnt_dump_buffer_block_copy(dst_blk, src_blk, val_cnt); -+ } ++ /* Dump L2_FEATURES register */ ++ err = kbase_backend_gpuprops_get_l2_features(kbdev, ®dump); ++ if (err) ++ goto exit; + -+ kbase_hwcnt_metadata_for_each_clock(metadata, clk) { -+ if (kbase_hwcnt_clk_enable_map_enabled( -+ dst_enable_map->clk_enable_map, clk)) -+ dst->clk_cnt_buf[clk] = src->clk_cnt_buf[clk]; ++ dev_info(kbdev->dev, "Reflected L2_FEATURES is 0x%x\n", ++ regdump.l2_features); ++ dev_info(kbdev->dev, "Reflected L2_CONFIG is 0x%08x\n", ++ regdump.l2_config); ++ ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_ASN_HASH)) { ++ int idx; ++ const bool asn_he = regdump.l2_config & ++ L2_CONFIG_ASN_HASH_ENABLE_MASK; ++#if !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ if (!asn_he && kbdev->l2_hash_values_override) ++ dev_err(kbdev->dev, ++ "Failed to use requested ASN_HASH, fallback to default"); ++#endif ++ for (idx = 0; idx < ASN_HASH_COUNT; idx++) ++ dev_info(kbdev->dev, ++ "%s ASN_HASH[%d] is [0x%08x]\n", ++ asn_he ? "Overridden" : "Default", idx, ++ regdump.l2_asn_hash[idx]); ++ } ++ ++ /* Update gpuprops with reflected L2_FEATURES */ ++ gpu_props->raw_props.l2_features = regdump.l2_features; ++ gpu_props->l2_props.log2_cache_size = ++ KBASE_UBFX32(gpu_props->raw_props.l2_features, 16U, 8); + } ++ ++exit: ++ return err; +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_dump_buffer_copy); + -+void kbase_hwcnt_dump_buffer_copy_strict( -+ struct kbase_hwcnt_dump_buffer *dst, -+ const struct kbase_hwcnt_dump_buffer *src, -+ const struct kbase_hwcnt_enable_map *dst_enable_map) -+{ -+ const struct kbase_hwcnt_metadata *metadata; -+ size_t grp, blk, blk_inst; -+ size_t clk; ++static struct { ++ u32 type; ++ size_t offset; ++ int size; ++} gpu_property_mapping[] = { ++#define PROP(name, member) \ ++ {KBASE_GPUPROP_ ## name, offsetof(struct base_gpu_props, member), \ ++ sizeof(((struct base_gpu_props *)0)->member)} ++ PROP(PRODUCT_ID, core_props.product_id), ++ PROP(VERSION_STATUS, core_props.version_status), ++ PROP(MINOR_REVISION, core_props.minor_revision), ++ PROP(MAJOR_REVISION, core_props.major_revision), ++ PROP(GPU_FREQ_KHZ_MAX, core_props.gpu_freq_khz_max), ++ PROP(LOG2_PROGRAM_COUNTER_SIZE, core_props.log2_program_counter_size), ++ PROP(TEXTURE_FEATURES_0, core_props.texture_features[0]), ++ PROP(TEXTURE_FEATURES_1, core_props.texture_features[1]), ++ PROP(TEXTURE_FEATURES_2, core_props.texture_features[2]), ++ PROP(TEXTURE_FEATURES_3, core_props.texture_features[3]), ++ PROP(GPU_AVAILABLE_MEMORY_SIZE, core_props.gpu_available_memory_size), + -+ if (WARN_ON(!dst) || -+ WARN_ON(!src) || -+ WARN_ON(!dst_enable_map) || -+ WARN_ON(dst == src) || -+ WARN_ON(dst->metadata != src->metadata) || -+ WARN_ON(dst->metadata != dst_enable_map->metadata)) -+ return; ++#if MALI_USE_CSF ++#define BACKWARDS_COMPAT_PROP(name, type) \ ++ { \ ++ KBASE_GPUPROP_##name, SIZE_MAX, sizeof(type) \ ++ } ++ BACKWARDS_COMPAT_PROP(NUM_EXEC_ENGINES, u8), ++#else ++ PROP(NUM_EXEC_ENGINES, core_props.num_exec_engines), ++#endif ++ ++ PROP(L2_LOG2_LINE_SIZE, l2_props.log2_line_size), ++ PROP(L2_LOG2_CACHE_SIZE, l2_props.log2_cache_size), ++ PROP(L2_NUM_L2_SLICES, l2_props.num_l2_slices), ++ ++ PROP(TILER_BIN_SIZE_BYTES, tiler_props.bin_size_bytes), ++ PROP(TILER_MAX_ACTIVE_LEVELS, tiler_props.max_active_levels), ++ ++ PROP(MAX_THREADS, thread_props.max_threads), ++ PROP(MAX_WORKGROUP_SIZE, thread_props.max_workgroup_size), ++ PROP(MAX_BARRIER_SIZE, thread_props.max_barrier_size), ++ PROP(MAX_REGISTERS, thread_props.max_registers), ++ PROP(MAX_TASK_QUEUE, thread_props.max_task_queue), ++ PROP(MAX_THREAD_GROUP_SPLIT, thread_props.max_thread_group_split), ++ PROP(IMPL_TECH, thread_props.impl_tech), ++ PROP(TLS_ALLOC, thread_props.tls_alloc), ++ ++ PROP(RAW_SHADER_PRESENT, raw_props.shader_present), ++ PROP(RAW_TILER_PRESENT, raw_props.tiler_present), ++ PROP(RAW_L2_PRESENT, raw_props.l2_present), ++ PROP(RAW_STACK_PRESENT, raw_props.stack_present), ++ PROP(RAW_L2_FEATURES, raw_props.l2_features), ++ PROP(RAW_CORE_FEATURES, raw_props.core_features), ++ PROP(RAW_MEM_FEATURES, raw_props.mem_features), ++ PROP(RAW_MMU_FEATURES, raw_props.mmu_features), ++ PROP(RAW_AS_PRESENT, raw_props.as_present), ++ PROP(RAW_JS_PRESENT, raw_props.js_present), ++ PROP(RAW_JS_FEATURES_0, raw_props.js_features[0]), ++ PROP(RAW_JS_FEATURES_1, raw_props.js_features[1]), ++ PROP(RAW_JS_FEATURES_2, raw_props.js_features[2]), ++ PROP(RAW_JS_FEATURES_3, raw_props.js_features[3]), ++ PROP(RAW_JS_FEATURES_4, raw_props.js_features[4]), ++ PROP(RAW_JS_FEATURES_5, raw_props.js_features[5]), ++ PROP(RAW_JS_FEATURES_6, raw_props.js_features[6]), ++ PROP(RAW_JS_FEATURES_7, raw_props.js_features[7]), ++ PROP(RAW_JS_FEATURES_8, raw_props.js_features[8]), ++ PROP(RAW_JS_FEATURES_9, raw_props.js_features[9]), ++ PROP(RAW_JS_FEATURES_10, raw_props.js_features[10]), ++ PROP(RAW_JS_FEATURES_11, raw_props.js_features[11]), ++ PROP(RAW_JS_FEATURES_12, raw_props.js_features[12]), ++ PROP(RAW_JS_FEATURES_13, raw_props.js_features[13]), ++ PROP(RAW_JS_FEATURES_14, raw_props.js_features[14]), ++ PROP(RAW_JS_FEATURES_15, raw_props.js_features[15]), ++ PROP(RAW_TILER_FEATURES, raw_props.tiler_features), ++ PROP(RAW_TEXTURE_FEATURES_0, raw_props.texture_features[0]), ++ PROP(RAW_TEXTURE_FEATURES_1, raw_props.texture_features[1]), ++ PROP(RAW_TEXTURE_FEATURES_2, raw_props.texture_features[2]), ++ PROP(RAW_TEXTURE_FEATURES_3, raw_props.texture_features[3]), ++ PROP(RAW_GPU_ID, raw_props.gpu_id), ++ PROP(RAW_THREAD_MAX_THREADS, raw_props.thread_max_threads), ++ PROP(RAW_THREAD_MAX_WORKGROUP_SIZE, raw_props.thread_max_workgroup_size), ++ PROP(RAW_THREAD_MAX_BARRIER_SIZE, raw_props.thread_max_barrier_size), ++ PROP(RAW_THREAD_FEATURES, raw_props.thread_features), ++ PROP(RAW_COHERENCY_MODE, raw_props.coherency_mode), ++ PROP(RAW_THREAD_TLS_ALLOC, raw_props.thread_tls_alloc), ++ PROP(RAW_GPU_FEATURES, raw_props.gpu_features), ++ PROP(COHERENCY_NUM_GROUPS, coherency_info.num_groups), ++ PROP(COHERENCY_NUM_CORE_GROUPS, coherency_info.num_core_groups), ++ PROP(COHERENCY_COHERENCY, coherency_info.coherency), ++ PROP(COHERENCY_GROUP_0, coherency_info.group[0].core_mask), ++ PROP(COHERENCY_GROUP_1, coherency_info.group[1].core_mask), ++ PROP(COHERENCY_GROUP_2, coherency_info.group[2].core_mask), ++ PROP(COHERENCY_GROUP_3, coherency_info.group[3].core_mask), ++ PROP(COHERENCY_GROUP_4, coherency_info.group[4].core_mask), ++ PROP(COHERENCY_GROUP_5, coherency_info.group[5].core_mask), ++ PROP(COHERENCY_GROUP_6, coherency_info.group[6].core_mask), ++ PROP(COHERENCY_GROUP_7, coherency_info.group[7].core_mask), ++ PROP(COHERENCY_GROUP_8, coherency_info.group[8].core_mask), ++ PROP(COHERENCY_GROUP_9, coherency_info.group[9].core_mask), ++ PROP(COHERENCY_GROUP_10, coherency_info.group[10].core_mask), ++ PROP(COHERENCY_GROUP_11, coherency_info.group[11].core_mask), ++ PROP(COHERENCY_GROUP_12, coherency_info.group[12].core_mask), ++ PROP(COHERENCY_GROUP_13, coherency_info.group[13].core_mask), ++ PROP(COHERENCY_GROUP_14, coherency_info.group[14].core_mask), ++ PROP(COHERENCY_GROUP_15, coherency_info.group[15].core_mask), + -+ metadata = dst->metadata; ++#undef PROP ++}; + -+ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) { -+ u32 *dst_blk = kbase_hwcnt_dump_buffer_block_instance( -+ dst, grp, blk, blk_inst); -+ const u32 *src_blk = kbase_hwcnt_dump_buffer_block_instance( -+ src, grp, blk, blk_inst); -+ const u64 *blk_em = kbase_hwcnt_enable_map_block_instance( -+ dst_enable_map, grp, blk, blk_inst); -+ size_t val_cnt = kbase_hwcnt_metadata_block_values_count( -+ metadata, grp, blk); -+ /* Align upwards to include padding bytes */ -+ val_cnt = KBASE_HWCNT_ALIGN_UPWARDS(val_cnt, -+ (KBASE_HWCNT_BLOCK_BYTE_ALIGNMENT / -+ KBASE_HWCNT_VALUE_BYTES)); ++int kbase_gpuprops_populate_user_buffer(struct kbase_device *kbdev) ++{ ++ struct kbase_gpu_props *kprops = &kbdev->gpu_props; ++ struct base_gpu_props *props = &kprops->props; ++ u32 count = ARRAY_SIZE(gpu_property_mapping); ++ u32 i; ++ u32 size = 0; ++ u8 *p; + -+ kbase_hwcnt_dump_buffer_block_copy_strict( -+ dst_blk, src_blk, blk_em, val_cnt); ++ for (i = 0; i < count; i++) { ++ /* 4 bytes for the ID, and the size of the property */ ++ size += 4 + gpu_property_mapping[i].size; + } + -+ kbase_hwcnt_metadata_for_each_clock(metadata, clk) { -+ bool clk_enabled = -+ kbase_hwcnt_clk_enable_map_enabled( -+ dst_enable_map->clk_enable_map, clk); ++ kprops->prop_buffer_size = size; ++ kprops->prop_buffer = kzalloc(size, GFP_KERNEL); + -+ dst->clk_cnt_buf[clk] = clk_enabled ? src->clk_cnt_buf[clk] : 0; ++ if (!kprops->prop_buffer) { ++ kprops->prop_buffer_size = 0; ++ return -ENOMEM; + } -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_dump_buffer_copy_strict); + -+void kbase_hwcnt_dump_buffer_accumulate( -+ struct kbase_hwcnt_dump_buffer *dst, -+ const struct kbase_hwcnt_dump_buffer *src, -+ const struct kbase_hwcnt_enable_map *dst_enable_map) -+{ -+ const struct kbase_hwcnt_metadata *metadata; -+ size_t grp, blk, blk_inst; -+ size_t clk; ++ p = kprops->prop_buffer; + -+ if (WARN_ON(!dst) || -+ WARN_ON(!src) || -+ WARN_ON(!dst_enable_map) || -+ WARN_ON(dst == src) || -+ WARN_ON(dst->metadata != src->metadata) || -+ WARN_ON(dst->metadata != dst_enable_map->metadata)) -+ return; ++#define WRITE_U8(v) (*p++ = (v) & 0xFF) ++#define WRITE_U16(v) do { WRITE_U8(v); WRITE_U8((v) >> 8); } while (0) ++#define WRITE_U32(v) do { WRITE_U16(v); WRITE_U16((v) >> 16); } while (0) ++#define WRITE_U64(v) do { WRITE_U32(v); WRITE_U32((v) >> 32); } while (0) + -+ metadata = dst->metadata; ++ for (i = 0; i < count; i++) { ++ u32 type = gpu_property_mapping[i].type; ++ u8 type_size; ++ const size_t offset = gpu_property_mapping[i].offset; ++ const u64 dummy_backwards_compat_value = (u64)0; ++ const void *field; + -+ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) { -+ u32 *dst_blk; -+ const u32 *src_blk; -+ size_t hdr_cnt; -+ size_t ctr_cnt; ++ if (likely(offset < sizeof(struct base_gpu_props))) ++ field = ((const u8 *)props) + offset; ++ else ++ field = &dummy_backwards_compat_value; + -+ if (!kbase_hwcnt_enable_map_block_enabled( -+ dst_enable_map, grp, blk, blk_inst)) -+ continue; ++ switch (gpu_property_mapping[i].size) { ++ case 1: ++ type_size = KBASE_GPUPROP_VALUE_SIZE_U8; ++ break; ++ case 2: ++ type_size = KBASE_GPUPROP_VALUE_SIZE_U16; ++ break; ++ case 4: ++ type_size = KBASE_GPUPROP_VALUE_SIZE_U32; ++ break; ++ case 8: ++ type_size = KBASE_GPUPROP_VALUE_SIZE_U64; ++ break; ++ default: ++ dev_err(kbdev->dev, ++ "Invalid gpu_property_mapping type=%d size=%d", ++ type, gpu_property_mapping[i].size); ++ return -EINVAL; ++ } + -+ dst_blk = kbase_hwcnt_dump_buffer_block_instance( -+ dst, grp, blk, blk_inst); -+ src_blk = kbase_hwcnt_dump_buffer_block_instance( -+ src, grp, blk, blk_inst); -+ hdr_cnt = kbase_hwcnt_metadata_block_headers_count( -+ metadata, grp, blk); -+ ctr_cnt = kbase_hwcnt_metadata_block_counters_count( -+ metadata, grp, blk); ++ WRITE_U32((type<<2) | type_size); + -+ kbase_hwcnt_dump_buffer_block_accumulate( -+ dst_blk, src_blk, hdr_cnt, ctr_cnt); ++ switch (type_size) { ++ case KBASE_GPUPROP_VALUE_SIZE_U8: ++ WRITE_U8(*((const u8 *)field)); ++ break; ++ case KBASE_GPUPROP_VALUE_SIZE_U16: ++ WRITE_U16(*((const u16 *)field)); ++ break; ++ case KBASE_GPUPROP_VALUE_SIZE_U32: ++ WRITE_U32(*((const u32 *)field)); ++ break; ++ case KBASE_GPUPROP_VALUE_SIZE_U64: ++ WRITE_U64(*((const u64 *)field)); ++ break; ++ default: /* Cannot be reached */ ++ WARN_ON(1); ++ return -EINVAL; ++ } + } + -+ kbase_hwcnt_metadata_for_each_clock(metadata, clk) { -+ if (kbase_hwcnt_clk_enable_map_enabled( -+ dst_enable_map->clk_enable_map, clk)) -+ dst->clk_cnt_buf[clk] += src->clk_cnt_buf[clk]; -+ } ++ return 0; +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_dump_buffer_accumulate); + -+void kbase_hwcnt_dump_buffer_accumulate_strict( -+ struct kbase_hwcnt_dump_buffer *dst, -+ const struct kbase_hwcnt_dump_buffer *src, -+ const struct kbase_hwcnt_enable_map *dst_enable_map) ++void kbase_gpuprops_free_user_buffer(struct kbase_device *kbdev) +{ -+ const struct kbase_hwcnt_metadata *metadata; -+ size_t grp, blk, blk_inst; -+ size_t clk; -+ -+ if (WARN_ON(!dst) || -+ WARN_ON(!src) || -+ WARN_ON(!dst_enable_map) || -+ WARN_ON(dst == src) || -+ WARN_ON(dst->metadata != src->metadata) || -+ WARN_ON(dst->metadata != dst_enable_map->metadata)) -+ return; -+ -+ metadata = dst->metadata; ++ kfree(kbdev->gpu_props.prop_buffer); ++} + -+ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) { -+ u32 *dst_blk = kbase_hwcnt_dump_buffer_block_instance( -+ dst, grp, blk, blk_inst); -+ const u32 *src_blk = kbase_hwcnt_dump_buffer_block_instance( -+ src, grp, blk, blk_inst); -+ const u64 *blk_em = kbase_hwcnt_enable_map_block_instance( -+ dst_enable_map, grp, blk, blk_inst); -+ size_t hdr_cnt = kbase_hwcnt_metadata_block_headers_count( -+ metadata, grp, blk); -+ size_t ctr_cnt = kbase_hwcnt_metadata_block_counters_count( -+ metadata, grp, blk); -+ /* Align upwards to include padding bytes */ -+ ctr_cnt = KBASE_HWCNT_ALIGN_UPWARDS(hdr_cnt + ctr_cnt, -+ (KBASE_HWCNT_BLOCK_BYTE_ALIGNMENT / -+ KBASE_HWCNT_VALUE_BYTES) - hdr_cnt); ++int kbase_device_populate_max_freq(struct kbase_device *kbdev) ++{ ++ struct mali_base_gpu_core_props *core_props; + -+ kbase_hwcnt_dump_buffer_block_accumulate_strict( -+ dst_blk, src_blk, blk_em, hdr_cnt, ctr_cnt); -+ } ++ /* obtain max configured gpu frequency, if devfreq is enabled then ++ * this will be overridden by the highest operating point found ++ */ ++ core_props = &(kbdev->gpu_props.props.core_props); ++#ifdef GPU_FREQ_KHZ_MAX ++ core_props->gpu_freq_khz_max = GPU_FREQ_KHZ_MAX; ++#else ++ core_props->gpu_freq_khz_max = DEFAULT_GPU_FREQ_KHZ_MAX; ++#endif + -+ kbase_hwcnt_metadata_for_each_clock(metadata, clk) { -+ if (kbase_hwcnt_clk_enable_map_enabled( -+ dst_enable_map->clk_enable_map, clk)) -+ dst->clk_cnt_buf[clk] += src->clk_cnt_buf[clk]; -+ else -+ dst->clk_cnt_buf[clk] = 0; -+ } ++ return 0; +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_dump_buffer_accumulate_strict); -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_types.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_types.h +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h new file mode 100755 -index 000000000000..3394b1271cc8 +index 000000000..f0a97312c --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_types.h -@@ -0,0 +1,1142 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h +@@ -0,0 +1,154 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2015, 2017, 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -210933,1144 +243836,613 @@ index 000000000000..3394b1271cc8 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+/** -+ * Hardware counter types. -+ * Contains structures for describing the physical layout of hardware counter -+ * dump buffers and enable maps within a system. -+ * -+ * Also contains helper functions for manipulation of these dump buffers and -+ * enable maps. -+ * -+ * Through use of these structures and functions, hardware counters can be -+ * enabled, copied, accumulated, and generally manipulated in a generic way, -+ * regardless of the physical counter dump layout. -+ * -+ * Terminology: -+ * -+ * Hardware Counter System: -+ * A collection of hardware counter groups, making a full hardware counter -+ * system. -+ * Hardware Counter Group: -+ * A group of Hardware Counter Blocks (e.g. a t62x might have more than one -+ * core group, so has one counter group per core group, where each group -+ * may have a different number and layout of counter blocks). -+ * Hardware Counter Block: -+ * A block of hardware counters (e.g. shader block, tiler block). -+ * Hardware Counter Block Instance: -+ * An instance of a Hardware Counter Block (e.g. an MP4 GPU might have -+ * 4 shader block instances). -+ * -+ * Block Header: -+ * A header value inside a counter block. Headers don't count anything, -+ * so it is only valid to copy or zero them. Headers are always the first -+ * values in the block. -+ * Block Counter: -+ * A counter value inside a counter block. Counters can be zeroed, copied, -+ * or accumulated. Counters are always immediately after the headers in the -+ * block. -+ * Block Value: -+ * A catch-all term for block headers and block counters. -+ * -+ * Enable Map: -+ * An array of u64 bitfields, where each bit either enables exactly one -+ * block value, or is unused (padding). -+ * Dump Buffer: -+ * An array of u32 values, where each u32 corresponds either to one block -+ * value, or is unused (padding). -+ * Availability Mask: -+ * A bitfield, where each bit corresponds to whether a block instance is -+ * physically available (e.g. an MP3 GPU may have a sparse core mask of -+ * 0b1011, meaning it only has 3 cores but for hardware counter dumps has the -+ * same dump buffer layout as an MP4 GPU with a core mask of 0b1111. In this -+ * case, the availability mask might be 0b1011111 (the exact layout will -+ * depend on the specific hardware architecture), with the 3 extra early bits -+ * corresponding to other block instances in the hardware counter system). -+ * Metadata: -+ * Structure describing the physical layout of the enable map and dump buffers -+ * for a specific hardware counter system. -+ * -+ */ -+ -+#ifndef _KBASE_HWCNT_TYPES_H_ -+#define _KBASE_HWCNT_TYPES_H_ -+ -+#include -+#include -+#include -+#include -+#include "mali_malisw.h" -+ -+/* Number of bytes in each bitfield */ -+#define KBASE_HWCNT_BITFIELD_BYTES (sizeof(u64)) -+ -+/* Number of bits in each bitfield */ -+#define KBASE_HWCNT_BITFIELD_BITS (KBASE_HWCNT_BITFIELD_BYTES * BITS_PER_BYTE) -+ -+/* Number of bytes for each counter value */ -+#define KBASE_HWCNT_VALUE_BYTES (sizeof(u32)) -+ -+/* Number of bits in an availability mask (i.e. max total number of block -+ * instances supported in a Hardware Counter System) + */ -+#define KBASE_HWCNT_AVAIL_MASK_BITS (sizeof(u64) * BITS_PER_BYTE) + +/** -+ * struct kbase_hwcnt_block_description - Description of one or more identical, -+ * contiguous, Hardware Counter Blocks. -+ * @type: The arbitrary identifier used to identify the type of the block. -+ * @inst_cnt: The number of Instances of the block. -+ * @hdr_cnt: The number of 32-bit Block Headers in the block. -+ * @ctr_cnt: The number of 32-bit Block Counters in the block. ++ * DOC: Base kernel property query APIs + */ -+struct kbase_hwcnt_block_description { -+ u64 type; -+ size_t inst_cnt; -+ size_t hdr_cnt; -+ size_t ctr_cnt; -+}; + -+/** -+ * struct kbase_hwcnt_group_description - Description of one or more identical, -+ * contiguous Hardware Counter Groups. -+ * @type: The arbitrary identifier used to identify the type of the group. -+ * @blk_cnt: The number of types of Hardware Counter Block in the group. -+ * @blks: Non-NULL pointer to an array of blk_cnt block descriptions, -+ * describing each type of Hardware Counter Block in the group. -+ */ -+struct kbase_hwcnt_group_description { -+ u64 type; -+ size_t blk_cnt; -+ const struct kbase_hwcnt_block_description *blks; -+}; ++#ifndef _KBASE_GPUPROPS_H_ ++#define _KBASE_GPUPROPS_H_ + -+/** -+ * struct kbase_hwcnt_description - Description of a Hardware Counter System. -+ * @grp_cnt: The number of Hardware Counter Groups. -+ * @grps: Non-NULL pointer to an array of grp_cnt group descriptions, -+ * describing each Hardware Counter Group in the system. -+ * @avail_mask: Flat Availability Mask for all block instances in the system. -+ * @clk_cnt: The number of clock domains in the system. The maximum is 64. -+ */ -+struct kbase_hwcnt_description { -+ size_t grp_cnt; -+ const struct kbase_hwcnt_group_description *grps; -+ u64 avail_mask; -+ u8 clk_cnt; -+}; ++#include "mali_kbase_gpuprops_types.h" + -+/** -+ * struct kbase_hwcnt_block_metadata - Metadata describing the physical layout -+ * of a block in a Hardware Counter System's -+ * Dump Buffers and Enable Maps. -+ * @type: The arbitrary identifier used to identify the type of the -+ * block. -+ * @inst_cnt: The number of Instances of the block. -+ * @hdr_cnt: The number of 32-bit Block Headers in the block. -+ * @ctr_cnt: The number of 32-bit Block Counters in the block. -+ * @enable_map_index: Index in u64s into the parent's Enable Map where the -+ * Enable Map bitfields of the Block Instances described by -+ * this metadata start. -+ * @enable_map_stride: Stride in u64s between the Enable Maps of each of the -+ * Block Instances described by this metadata. -+ * @dump_buf_index: Index in u32s into the parent's Dump Buffer where the -+ * Dump Buffers of the Block Instances described by this -+ * metadata start. -+ * @dump_buf_stride: Stride in u32s between the Dump Buffers of each of the -+ * Block Instances described by this metadata. -+ * @avail_mask_index: Index in bits into the parent's Availability Mask where -+ * the Availability Masks of the Block Instances described -+ * by this metadata start. -+ */ -+struct kbase_hwcnt_block_metadata { -+ u64 type; -+ size_t inst_cnt; -+ size_t hdr_cnt; -+ size_t ctr_cnt; -+ size_t enable_map_index; -+ size_t enable_map_stride; -+ size_t dump_buf_index; -+ size_t dump_buf_stride; -+ size_t avail_mask_index; -+}; ++/* Forward definition - see mali_kbase.h */ ++struct kbase_device; + +/** -+ * struct kbase_hwcnt_group_metadata - Metadata describing the physical layout -+ * of a group of blocks in a Hardware -+ * Counter System's Dump Buffers and Enable -+ * Maps. -+ * @type: The arbitrary identifier used to identify the type of the -+ * group. -+ * @blk_cnt: The number of types of Hardware Counter Block in the -+ * group. -+ * @blk_metadata: Non-NULL pointer to an array of blk_cnt block metadata, -+ * describing the physical layout of each type of Hardware -+ * Counter Block in the group. -+ * @enable_map_index: Index in u64s into the parent's Enable Map where the -+ * Enable Maps of the blocks within the group described by -+ * this metadata start. -+ * @dump_buf_index: Index in u32s into the parent's Dump Buffer where the -+ * Dump Buffers of the blocks within the group described by -+ * metadata start. -+ * @avail_mask_index: Index in bits into the parent's Availability Mask where -+ * the Availability Masks of the blocks within the group -+ * described by this metadata start. ++ * KBASE_UBFX32 - Extracts bits from a 32-bit bitfield. ++ * @value: The value from which to extract bits. ++ * @offset: The first bit to extract (0 being the LSB). ++ * @size: The number of bits to extract. ++ * ++ * Context: @offset + @size <= 32. ++ * ++ * Return: Bits [@offset, @offset + @size) from @value. + */ -+struct kbase_hwcnt_group_metadata { -+ u64 type; -+ size_t blk_cnt; -+ const struct kbase_hwcnt_block_metadata *blk_metadata; -+ size_t enable_map_index; -+ size_t dump_buf_index; -+ size_t avail_mask_index; -+}; ++/* from mali_cdsb.h */ ++#define KBASE_UBFX32(value, offset, size) \ ++ (((u32)(value) >> (u32)(offset)) & (u32)((1ULL << (u32)(size)) - 1)) + +/** -+ * struct kbase_hwcnt_metadata - Metadata describing the physical layout -+ * of Dump Buffers and Enable Maps within a -+ * Hardware Counter System. -+ * @grp_cnt: The number of Hardware Counter Groups. -+ * @grp_metadata: Non-NULL pointer to an array of grp_cnt group metadata, -+ * describing the physical layout of each Hardware Counter -+ * Group in the system. -+ * @enable_map_bytes: The size in bytes of an Enable Map needed for the system. -+ * @dump_buf_bytes: The size in bytes of a Dump Buffer needed for the system. -+ * @avail_mask: The Availability Mask for the system. -+ * @clk_cnt: The number of clock domains in the system. ++ * kbase_gpuprops_set - Set up Kbase GPU properties. ++ * @kbdev: The struct kbase_device structure for the device ++ * ++ * Set up Kbase GPU properties with information from the GPU registers + */ -+struct kbase_hwcnt_metadata { -+ size_t grp_cnt; -+ const struct kbase_hwcnt_group_metadata *grp_metadata; -+ size_t enable_map_bytes; -+ size_t dump_buf_bytes; -+ u64 avail_mask; -+ u8 clk_cnt; -+}; ++void kbase_gpuprops_set(struct kbase_device *kbdev); + +/** -+ * struct kbase_hwcnt_enable_map - Hardware Counter Enable Map. Array of u64 -+ * bitfields. -+ * @metadata: Non-NULL pointer to metadata used to identify, and to describe -+ * the layout of the enable map. -+ * @hwcnt_enable_map: Non-NULL pointer of size metadata->enable_map_bytes to an -+ * array of u64 bitfields, each bit of which enables one hardware -+ * counter. -+ * @clk_enable_map: An array of u64 bitfields, each bit of which enables cycle -+ * counter for a given clock domain. ++ * kbase_gpuprops_set_features - Set up Kbase GPU properties ++ * @kbdev: Device pointer ++ * ++ * This function sets up GPU properties that are dependent on the hardware ++ * features bitmask. This function must be preceeded by a call to ++ * kbase_hw_set_features_mask(). ++ * ++ * Return: Zero on success, Linux error code on failure + */ -+struct kbase_hwcnt_enable_map { -+ const struct kbase_hwcnt_metadata *metadata; -+ u64 *hwcnt_enable_map; -+ u64 clk_enable_map; -+}; ++int kbase_gpuprops_set_features(struct kbase_device *kbdev); + +/** -+ * struct kbase_hwcnt_dump_buffer - Hardware Counter Dump Buffer. Array of u32 -+ * values. -+ * @metadata: Non-NULL pointer to metadata used to identify, and to describe -+ * the layout of the Dump Buffer. -+ * @dump_buf: Non-NULL pointer of size metadata->dump_buf_bytes to an array -+ * of u32 values. -+ * @clk_cnt_buf: A pointer to an array of u64 values for cycle count elapsed -+ * for each clock domain. ++ * kbase_gpuprops_update_l2_features - Update GPU property of L2_FEATURES ++ * @kbdev: Device pointer ++ * ++ * This function updates l2_features and the log2 cache size. ++ * The function expects GPU to be powered up and value of pm.active_count ++ * to be 1. ++ * ++ * Return: Zero on success, Linux error code for failure + */ -+struct kbase_hwcnt_dump_buffer { -+ const struct kbase_hwcnt_metadata *metadata; -+ u32 *dump_buf; -+ u64 *clk_cnt_buf; -+}; ++int kbase_gpuprops_update_l2_features(struct kbase_device *kbdev); + +/** -+ * struct kbase_hwcnt_dump_buffer_array - Hardware Counter Dump Buffer array. -+ * @page_addr: Address of allocated pages. A single allocation is used for all -+ * Dump Buffers in the array. -+ * @page_order: The allocation order of the pages. -+ * @buf_cnt: The number of allocated Dump Buffers. -+ * @bufs: Non-NULL pointer to the array of Dump Buffers. ++ * kbase_gpuprops_populate_user_buffer - Populate the GPU properties buffer ++ * @kbdev: The kbase device ++ * ++ * Fills prop_buffer with the GPU properties for user space to read. ++ * ++ * Return: MALI_ERROR_NONE on success. Any other value indicates failure. + */ -+struct kbase_hwcnt_dump_buffer_array { -+ unsigned long page_addr; -+ unsigned int page_order; -+ size_t buf_cnt; -+ struct kbase_hwcnt_dump_buffer *bufs; -+}; ++int kbase_gpuprops_populate_user_buffer(struct kbase_device *kbdev); + +/** -+ * kbase_hwcnt_metadata_create() - Create a hardware counter metadata object -+ * from a description. -+ * @desc: Non-NULL pointer to a hardware counter description. -+ * @metadata: Non-NULL pointer to where created metadata will be stored on -+ * success. ++ * kbase_gpuprops_free_user_buffer - Free the GPU properties buffer. ++ * @kbdev: kbase device pointer + * -+ * Return: 0 on success, else error code. ++ * Free the GPU properties buffer allocated from ++ * kbase_gpuprops_populate_user_buffer. + */ -+int kbase_hwcnt_metadata_create( -+ const struct kbase_hwcnt_description *desc, -+ const struct kbase_hwcnt_metadata **metadata); ++void kbase_gpuprops_free_user_buffer(struct kbase_device *kbdev); + +/** -+ * kbase_hwcnt_metadata_destroy() - Destroy a hardware counter metadata object. -+ * @metadata: Pointer to hardware counter metadata ++ * kbase_device_populate_max_freq - Populate max gpu frequency. ++ * @kbdev: kbase device pointer ++ * ++ * Populate the maximum gpu frequency to be used when devfreq is disabled. ++ * ++ * Return: 0 on success and non-zero value on failure. + */ -+void kbase_hwcnt_metadata_destroy(const struct kbase_hwcnt_metadata *metadata); ++int kbase_device_populate_max_freq(struct kbase_device *kbdev); + +/** -+ * kbase_hwcnt_metadata_group_count() - Get the number of groups. -+ * @metadata: Non-NULL pointer to metadata. ++ * kbase_gpuprops_update_core_props_gpu_id - break down gpu id value ++ * @gpu_props: the &base_gpu_props structure + * -+ * Return: Number of hardware counter groups described by metadata. ++ * Break down gpu_id value stored in base_gpu_props::raw_props.gpu_id into ++ * separate fields (version_status, minor_revision, major_revision, product_id) ++ * stored in base_gpu_props::core_props. + */ -+#define kbase_hwcnt_metadata_group_count(metadata) \ -+ ((metadata)->grp_cnt) ++void kbase_gpuprops_update_core_props_gpu_id( ++ struct base_gpu_props * const gpu_props); + +/** -+ * kbase_hwcnt_metadata_group_type() - Get the arbitrary type of a group. -+ * @metadata: Non-NULL pointer to metadata. -+ * @grp: Index of the group in the metadata. ++ * kbase_gpuprops_set_max_config - Set the max config information ++ * @kbdev: Device pointer ++ * @max_config: Maximum configuration data to be updated + * -+ * Return: Type of the group grp. ++ * This function sets max_config in the kbase_gpu_props. + */ -+#define kbase_hwcnt_metadata_group_type(metadata, grp) \ -+ ((metadata)->grp_metadata[(grp)].type) ++void kbase_gpuprops_set_max_config(struct kbase_device *kbdev, ++ const struct max_config_props *max_config); + +/** -+ * kbase_hwcnt_metadata_block_count() - Get the number of blocks in a group. -+ * @metadata: Non-NULL pointer to metadata. -+ * @grp: Index of the group in the metadata. ++ * kbase_gpuprops_get_curr_config_props - Get the current allocated resources ++ * @kbdev: The &struct kbase_device structure for the device ++ * @curr_config: The &struct curr_config_props structure to receive the result + * -+ * Return: Number of blocks in group grp. ++ * Fill the &struct curr_config_props structure with values from the GPU ++ * configuration registers. ++ * ++ * Return: Zero on success, Linux error code on failure + */ -+#define kbase_hwcnt_metadata_block_count(metadata, grp) \ -+ ((metadata)->grp_metadata[(grp)].blk_cnt) ++int kbase_gpuprops_get_curr_config_props(struct kbase_device *kbdev, ++ struct curr_config_props * const curr_config); + +/** -+ * kbase_hwcnt_metadata_block_type() - Get the arbitrary type of a block. -+ * @metadata: Non-NULL pointer to metadata. -+ * @grp: Index of the group in the metadata. -+ * @blk: Index of the block in the group. ++ * kbase_gpuprops_req_curr_config_update - Request Current Config Update ++ * @kbdev: The &struct kbase_device structure for the device + * -+ * Return: Type of the block blk in group grp. ++ * Requests the current configuration to be updated next time the ++ * kbase_gpuprops_get_curr_config_props() is called. ++ * ++ * Return: Zero on success, Linux error code on failure + */ -+#define kbase_hwcnt_metadata_block_type(metadata, grp, blk) \ -+ ((metadata)->grp_metadata[(grp)].blk_metadata[(blk)].type) ++int kbase_gpuprops_req_curr_config_update(struct kbase_device *kbdev); + -+/** -+ * kbase_hwcnt_metadata_block_instance_count() - Get the number of instances of -+ * a block. -+ * @metadata: Non-NULL pointer to metadata. -+ * @grp: Index of the group in the metadata. -+ * @blk: Index of the block in the group. ++#endif /* _KBASE_GPUPROPS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h +new file mode 100755 +index 000000000..45cb603fa +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h +@@ -0,0 +1,170 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* + * -+ * Return: Number of instances of block blk in group grp. -+ */ -+#define kbase_hwcnt_metadata_block_instance_count(metadata, grp, blk) \ -+ ((metadata)->grp_metadata[(grp)].blk_metadata[(blk)].inst_cnt) -+ -+/** -+ * kbase_hwcnt_metadata_block_headers_count() - Get the number of counter -+ * headers. -+ * @metadata: Non-NULL pointer to metadata. -+ * @grp: Index of the group in the metadata. -+ * @blk: Index of the block in the group. ++ * (C) COPYRIGHT 2011-2018, 2020-2021 ARM Limited. All rights reserved. + * -+ * Return: Number of u32 counter headers in each instance of block blk in -+ * group grp. -+ */ -+#define kbase_hwcnt_metadata_block_headers_count(metadata, grp, blk) \ -+ ((metadata)->grp_metadata[(grp)].blk_metadata[(blk)].hdr_cnt) -+ -+/** -+ * kbase_hwcnt_metadata_block_counters_count() - Get the number of counters. -+ * @metadata: Non-NULL pointer to metadata. -+ * @grp: Index of the group in the metadata. -+ * @blk: Index of the block in the group. ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. + * -+ * Return: Number of u32 counters in each instance of block blk in group -+ * grp. -+ */ -+#define kbase_hwcnt_metadata_block_counters_count(metadata, grp, blk) \ -+ ((metadata)->grp_metadata[(grp)].blk_metadata[(blk)].ctr_cnt) -+ -+/** -+ * kbase_hwcnt_metadata_block_values_count() - Get the number of values. -+ * @metadata: Non-NULL pointer to metadata. -+ * @grp: Index of the group in the metadata. -+ * @blk: Index of the block in the group. ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. + * -+ * Return: Number of u32 headers plus counters in each instance of block blk -+ * in group grp. -+ */ -+#define kbase_hwcnt_metadata_block_values_count(metadata, grp, blk) \ -+ (kbase_hwcnt_metadata_block_counters_count((metadata), (grp), (blk)) \ -+ + kbase_hwcnt_metadata_block_headers_count((metadata), (grp), (blk))) -+ -+/** -+ * kbase_hwcnt_metadata_for_each_block() - Iterate over each block instance in -+ * the metadata. -+ * @md: Non-NULL pointer to metadata. -+ * @grp: size_t variable used as group iterator. -+ * @blk: size_t variable used as block iterator. -+ * @blk_inst: size_t variable used as block instance iterator. ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Iteration order is group, then block, then block instance (i.e. linearly -+ * through memory). + */ -+#define kbase_hwcnt_metadata_for_each_block(md, grp, blk, blk_inst) \ -+ for ((grp) = 0; (grp) < kbase_hwcnt_metadata_group_count((md)); (grp)++) \ -+ for ((blk) = 0; (blk) < kbase_hwcnt_metadata_block_count((md), (grp)); (blk)++) \ -+ for ((blk_inst) = 0; (blk_inst) < kbase_hwcnt_metadata_block_instance_count((md), (grp), (blk)); (blk_inst)++) + +/** -+ * kbase_hwcnt_metadata_block_avail_bit() - Get the bit index into the avail -+ * mask corresponding to the block. -+ * @metadata: Non-NULL pointer to metadata. -+ * @grp: Index of the group in the metadata. -+ * @blk: Index of the block in the group. -+ * -+ * Return: The bit index into the avail mask for the block. ++ * DOC: Base kernel property query APIs + */ -+static inline size_t kbase_hwcnt_metadata_block_avail_bit( -+ const struct kbase_hwcnt_metadata *metadata, -+ size_t grp, -+ size_t blk) -+{ -+ const size_t bit = -+ metadata->grp_metadata[grp].avail_mask_index + -+ metadata->grp_metadata[grp].blk_metadata[blk].avail_mask_index; + -+ return bit; -+} -+ -+/** -+ * kbase_hwcnt_metadata_block_instance_avail() - Check if a block instance is -+ * available. -+ * @metadata: Non-NULL pointer to metadata. -+ * @grp: Index of the group in the metadata. -+ * @blk: Index of the block in the group. -+ * @blk_inst: Index of the block instance in the block. -+ * -+ * Return: true if the block instance is available, else false. -+ */ -+static inline bool kbase_hwcnt_metadata_block_instance_avail( -+ const struct kbase_hwcnt_metadata *metadata, -+ size_t grp, -+ size_t blk, -+ size_t blk_inst) -+{ -+ const size_t bit = kbase_hwcnt_metadata_block_avail_bit( -+ metadata, grp, blk) + blk_inst; -+ const u64 mask = 1ull << bit; ++#ifndef _KBASE_GPUPROPS_TYPES_H_ ++#define _KBASE_GPUPROPS_TYPES_H_ + -+ return (metadata->avail_mask & mask) != 0; -+} ++#include + -+/** -+ * kbase_hwcnt_enable_map_alloc() - Allocate an enable map. -+ * @metadata: Non-NULL pointer to metadata describing the system. -+ * @enable_map: Non-NULL pointer to enable map to be initialised. Will be -+ * initialised to all zeroes (i.e. all counters disabled). -+ * -+ * Return: 0 on success, else error code. -+ */ -+int kbase_hwcnt_enable_map_alloc( -+ const struct kbase_hwcnt_metadata *metadata, -+ struct kbase_hwcnt_enable_map *enable_map); ++#define KBASE_GPU_SPEED_MHZ 123 ++#define KBASE_GPU_PC_SIZE_LOG2 24U + -+/** -+ * kbase_hwcnt_enable_map_free() - Free an enable map. -+ * @enable_map: Enable map to be freed. -+ * -+ * Can be safely called on an all-zeroed enable map structure, or on an already -+ * freed enable map. -+ */ -+void kbase_hwcnt_enable_map_free(struct kbase_hwcnt_enable_map *enable_map); ++struct kbase_gpuprops_regdump { ++ u32 gpu_id; ++ u32 l2_features; ++ u32 l2_config; ++ u32 l2_asn_hash[ASN_HASH_COUNT]; ++ u32 core_features; ++ u32 tiler_features; ++ u32 mem_features; ++ u32 mmu_features; ++ u32 as_present; ++ u32 js_present; ++ u32 thread_max_threads; ++ u32 thread_max_workgroup_size; ++ u32 thread_max_barrier_size; ++ u32 thread_features; ++ u32 thread_tls_alloc; ++ u32 texture_features[BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS]; ++ u32 js_features[GPU_MAX_JOB_SLOTS]; ++ u32 shader_present_lo; ++ u32 shader_present_hi; ++ u32 tiler_present_lo; ++ u32 tiler_present_hi; ++ u32 l2_present_lo; ++ u32 l2_present_hi; ++ u32 stack_present_lo; ++ u32 stack_present_hi; ++ u32 coherency_features; ++ u32 gpu_features_lo; ++ u32 gpu_features_hi; ++}; + +/** -+ * kbase_hwcnt_enable_map_block_instance() - Get the pointer to a block -+ * instance's enable map. -+ * @map: Non-NULL pointer to (const) enable map. -+ * @grp: Index of the group in the metadata. -+ * @blk: Index of the block in the group. -+ * @blk_inst: Index of the block instance in the block. ++ * struct kbase_current_config_regdump - Register dump for current resources ++ * allocated to the GPU. ++ * @mem_features: Memory system features. Contains information about the ++ * features of the memory system. Used here to get the L2 slice ++ * count. ++ * @shader_present_lo: Shader core present bitmap. Low word. ++ * @shader_present_hi: Shader core present bitmap. High word. ++ * @l2_present_lo: L2 cache present bitmap. Low word. ++ * @l2_present_hi: L2 cache present bitmap. High word. + * -+ * Return: (const) u64* to the bitfield(s) used as the enable map for the -+ * block instance. ++ * Register dump structure used to store the resgisters data realated to the ++ * current resources allocated to the GPU. + */ -+#define kbase_hwcnt_enable_map_block_instance(map, grp, blk, blk_inst) \ -+ ((map)->hwcnt_enable_map + \ -+ (map)->metadata->grp_metadata[(grp)].enable_map_index + \ -+ (map)->metadata->grp_metadata[(grp)].blk_metadata[(blk)].enable_map_index + \ -+ (map)->metadata->grp_metadata[(grp)].blk_metadata[(blk)].enable_map_stride * (blk_inst)) ++struct kbase_current_config_regdump { ++ u32 mem_features; ++ u32 shader_present_lo; ++ u32 shader_present_hi; ++ u32 l2_present_lo; ++ u32 l2_present_hi; ++}; + -+/** -+ * kbase_hwcnt_bitfield_count() - Calculate the number of u64 bitfields required -+ * to have at minimum one bit per value. -+ * @val_cnt: Number of values. -+ * -+ * Return: Number of required bitfields. -+ */ -+static inline size_t kbase_hwcnt_bitfield_count(size_t val_cnt) -+{ -+ return (val_cnt + KBASE_HWCNT_BITFIELD_BITS - 1) / -+ KBASE_HWCNT_BITFIELD_BITS; -+} ++struct kbase_gpu_cache_props { ++ u8 associativity; ++ u8 external_bus_width; ++}; + -+/** -+ * kbase_hwcnt_enable_map_block_disable_all() - Disable all values in a block. -+ * @dst: Non-NULL pointer to enable map. -+ * @grp: Index of the group in the metadata. -+ * @blk: Index of the block in the group. -+ * @blk_inst: Index of the block instance in the block. -+ */ -+static inline void kbase_hwcnt_enable_map_block_disable_all( -+ struct kbase_hwcnt_enable_map *dst, -+ size_t grp, -+ size_t blk, -+ size_t blk_inst) -+{ -+ const size_t val_cnt = kbase_hwcnt_metadata_block_values_count( -+ dst->metadata, grp, blk); -+ const size_t bitfld_cnt = kbase_hwcnt_bitfield_count(val_cnt); -+ u64 *block_enable_map = kbase_hwcnt_enable_map_block_instance( -+ dst, grp, blk, blk_inst); ++struct kbase_gpu_mem_props { ++ u8 core_group; ++}; + -+ memset(block_enable_map, 0, bitfld_cnt * KBASE_HWCNT_BITFIELD_BYTES); -+} ++struct kbase_gpu_mmu_props { ++ u8 va_bits; ++ u8 pa_bits; ++}; + +/** -+ * kbase_hwcnt_enable_map_disable_all() - Disable all values in the enable map. -+ * @dst: Non-NULL pointer to enable map to zero. ++ * struct max_config_props - Properties based on the maximum resources ++ * available. ++ * @l2_slices: Maximum number of L2 slices that can be assinged to the GPU ++ * during runtime. ++ * @padding: Padding to a multiple of 64 bits. ++ * @core_mask: Largest core mask bitmap that can be assigned to the GPU during ++ * runtime. ++ * ++ * Properties based on the maximum resources available (not necessarly ++ * allocated at that moment). Used to provide the maximum configuration to the ++ * userspace allowing the applications to allocate enough resources in case the ++ * real allocated resources change. + */ -+static inline void kbase_hwcnt_enable_map_disable_all( -+ struct kbase_hwcnt_enable_map *dst) -+{ -+ if (dst->hwcnt_enable_map != NULL) -+ memset(dst->hwcnt_enable_map, 0, -+ dst->metadata->enable_map_bytes); -+ -+ dst->clk_enable_map = 0; -+} ++struct max_config_props { ++ u8 l2_slices; ++ u8 padding[3]; ++ u32 core_mask; ++}; + +/** -+ * kbase_hwcnt_enable_map_block_enable_all() - Enable all values in a block. -+ * @dst: Non-NULL pointer to enable map. -+ * @grp: Index of the group in the metadata. -+ * @blk: Index of the block in the group. -+ * @blk_inst: Index of the block instance in the block. ++ * struct curr_config_props - Properties based on the current resources ++ * allocated to the GPU. ++ * @l2_present: Current L2 present bitmap that is allocated to the GPU. ++ * @shader_present: Current shader present bitmap that is allocated to the GPU. ++ * @num_cores: Current number of shader cores allocated to the GPU. ++ * @l2_slices: Current number of L2 slices allocated to the GPU. ++ * @update_needed: Defines if it is necessary to re-read the registers to ++ * update the current allocated resources. ++ * @padding: Padding to a multiple of 64 bits. ++ * ++ * Properties based on the current resource available. Used for operations with ++ * hardware interactions to avoid using userspace data that can be based on ++ * the maximum resource available. + */ -+static inline void kbase_hwcnt_enable_map_block_enable_all( -+ struct kbase_hwcnt_enable_map *dst, -+ size_t grp, -+ size_t blk, -+ size_t blk_inst) -+{ -+ const size_t val_cnt = kbase_hwcnt_metadata_block_values_count( -+ dst->metadata, grp, blk); -+ const size_t bitfld_cnt = kbase_hwcnt_bitfield_count(val_cnt); -+ u64 *block_enable_map = kbase_hwcnt_enable_map_block_instance( -+ dst, grp, blk, blk_inst); ++struct curr_config_props { ++ u64 l2_present; ++ u64 shader_present; ++ u16 num_cores; ++ u8 l2_slices; ++ bool update_needed; ++ u8 padding[4]; ++}; + -+ size_t bitfld_idx; ++struct kbase_gpu_props { ++ /* kernel-only properties */ ++ u8 num_cores; ++ u8 num_core_groups; ++ u8 num_address_spaces; ++ u8 num_job_slots; + -+ for (bitfld_idx = 0; bitfld_idx < bitfld_cnt; bitfld_idx++) { -+ const u64 remaining_values = val_cnt - -+ (bitfld_idx * KBASE_HWCNT_BITFIELD_BITS); -+ u64 block_enable_map_mask = U64_MAX; ++ struct kbase_gpu_cache_props l2_props; + -+ if (remaining_values < KBASE_HWCNT_BITFIELD_BITS) -+ block_enable_map_mask = (1ull << remaining_values) - 1; ++ struct kbase_gpu_mem_props mem; ++ struct kbase_gpu_mmu_props mmu; + -+ block_enable_map[bitfld_idx] = block_enable_map_mask; -+ } -+} ++ /* Properties based on the current resource available */ ++ struct curr_config_props curr_config; + -+/** -+ * kbase_hwcnt_enable_map_block_enable_all() - Enable all values in an enable -+ * map. -+ * @dst: Non-NULL pointer to enable map. -+ */ -+static inline void kbase_hwcnt_enable_map_enable_all( -+ struct kbase_hwcnt_enable_map *dst) -+{ -+ size_t grp, blk, blk_inst; ++ /* Properties based on the maximum resource available */ ++ struct max_config_props max_config; + -+ kbase_hwcnt_metadata_for_each_block(dst->metadata, grp, blk, blk_inst) -+ kbase_hwcnt_enable_map_block_enable_all( -+ dst, grp, blk, blk_inst); ++ /* Properties shared with userspace */ ++ struct base_gpu_props props; + -+ dst->clk_enable_map = (1ull << dst->metadata->clk_cnt) - 1; -+} ++ u32 prop_buffer_size; ++ void *prop_buffer; ++}; + -+/** -+ * kbase_hwcnt_enable_map_copy() - Copy an enable map to another. -+ * @dst: Non-NULL pointer to destination enable map. -+ * @src: Non-NULL pointer to source enable map. ++#endif /* _KBASE_GPUPROPS_TYPES_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gwt.c b/drivers/gpu/arm/bifrost/mali_kbase_gwt.c +new file mode 100755 +index 000000000..0eba889e5 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.c +@@ -0,0 +1,275 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* + * -+ * The dst and src MUST have been created from the same metadata. -+ */ -+static inline void kbase_hwcnt_enable_map_copy( -+ struct kbase_hwcnt_enable_map *dst, -+ const struct kbase_hwcnt_enable_map *src) -+{ -+ if (dst->hwcnt_enable_map != NULL) { -+ memcpy(dst->hwcnt_enable_map, -+ src->hwcnt_enable_map, -+ dst->metadata->enable_map_bytes); -+ } -+ -+ dst->clk_enable_map = src->clk_enable_map; -+} -+ -+/** -+ * kbase_hwcnt_enable_map_union() - Union dst and src enable maps into dst. -+ * @dst: Non-NULL pointer to destination enable map. -+ * @src: Non-NULL pointer to source enable map. ++ * (C) COPYRIGHT 2010-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * The dst and src MUST have been created from the same metadata. + */ -+static inline void kbase_hwcnt_enable_map_union( -+ struct kbase_hwcnt_enable_map *dst, -+ const struct kbase_hwcnt_enable_map *src) -+{ -+ const size_t bitfld_count = -+ dst->metadata->enable_map_bytes / KBASE_HWCNT_BITFIELD_BYTES; -+ size_t i; + -+ if (dst->hwcnt_enable_map != NULL) { -+ for (i = 0; i < bitfld_count; i++) -+ dst->hwcnt_enable_map[i] |= src->hwcnt_enable_map[i]; -+ } -+ -+ dst->clk_enable_map |= src->clk_enable_map; -+} ++#include "mali_kbase_gwt.h" ++#include + -+/** -+ * kbase_hwcnt_enable_map_block_enabled() - Check if any values in a block -+ * instance are enabled. -+ * @enable_map: Non-NULL pointer to enable map. -+ * @grp: Index of the group in the metadata. -+ * @blk: Index of the block in the group. -+ * @blk_inst: Index of the block instance in the block. -+ * -+ * Return: true if any values in the block are enabled, else false. -+ */ -+static inline bool kbase_hwcnt_enable_map_block_enabled( -+ const struct kbase_hwcnt_enable_map *enable_map, -+ size_t grp, -+ size_t blk, -+ size_t blk_inst) ++static inline void kbase_gpu_gwt_setup_page_permission( ++ struct kbase_context *kctx, ++ unsigned long flag, ++ struct rb_node *node) +{ -+ bool any_enabled = false; -+ const size_t val_cnt = kbase_hwcnt_metadata_block_values_count( -+ enable_map->metadata, grp, blk); -+ const size_t bitfld_cnt = kbase_hwcnt_bitfield_count(val_cnt); -+ const u64 *block_enable_map = kbase_hwcnt_enable_map_block_instance( -+ enable_map, grp, blk, blk_inst); -+ -+ size_t bitfld_idx; ++ struct rb_node *rbnode = node; + -+ for (bitfld_idx = 0; bitfld_idx < bitfld_cnt; bitfld_idx++) { -+ const u64 remaining_values = val_cnt - -+ (bitfld_idx * KBASE_HWCNT_BITFIELD_BITS); -+ u64 block_enable_map_mask = U64_MAX; ++ while (rbnode) { ++ struct kbase_va_region *reg; ++ int err = 0; + -+ if (remaining_values < KBASE_HWCNT_BITFIELD_BITS) -+ block_enable_map_mask = (1ull << remaining_values) - 1; ++ reg = rb_entry(rbnode, struct kbase_va_region, rblink); ++ if (reg->nr_pages && !kbase_is_region_invalid_or_free(reg) && ++ (reg->flags & KBASE_REG_GPU_WR)) { ++ err = kbase_mmu_update_pages(kctx, reg->start_pfn, ++ kbase_get_gpu_phy_pages(reg), ++ reg->gpu_alloc->nents, ++ reg->flags & flag, ++ reg->gpu_alloc->group_id); ++ if (err) ++ dev_warn(kctx->kbdev->dev, "kbase_mmu_update_pages failure\n"); ++ } + -+ any_enabled = any_enabled || -+ (block_enable_map[bitfld_idx] & block_enable_map_mask); ++ rbnode = rb_next(rbnode); + } -+ -+ return any_enabled; +} + -+/** -+ * kbase_hwcnt_enable_map_any_enabled() - Check if any values are enabled. -+ * @enable_map: Non-NULL pointer to enable map. -+ * -+ * Return: true if any values are enabled, else false. -+ */ -+static inline bool kbase_hwcnt_enable_map_any_enabled( -+ const struct kbase_hwcnt_enable_map *enable_map) ++static void kbase_gpu_gwt_setup_pages(struct kbase_context *kctx, ++ unsigned long flag) +{ -+ size_t grp, blk, blk_inst; -+ const u64 clk_enable_map_mask = -+ (1ull << enable_map->metadata->clk_cnt) - 1; ++ kbase_gpu_gwt_setup_page_permission(kctx, flag, ++ rb_first(&(kctx->reg_rbtree_same))); ++ kbase_gpu_gwt_setup_page_permission(kctx, flag, ++ rb_first(&(kctx->reg_rbtree_custom))); ++} + -+ if (enable_map->metadata->clk_cnt > 0 && -+ (enable_map->clk_enable_map & clk_enable_map_mask)) -+ return true; + -+ kbase_hwcnt_metadata_for_each_block( -+ enable_map->metadata, grp, blk, blk_inst) { -+ if (kbase_hwcnt_enable_map_block_enabled( -+ enable_map, grp, blk, blk_inst)) -+ return true; ++int kbase_gpu_gwt_start(struct kbase_context *kctx) ++{ ++ kbase_gpu_vm_lock(kctx); ++ if (kctx->gwt_enabled) { ++ kbase_gpu_vm_unlock(kctx); ++ return -EBUSY; + } + -+ return false; -+} ++ INIT_LIST_HEAD(&kctx->gwt_current_list); ++ INIT_LIST_HEAD(&kctx->gwt_snapshot_list); + -+/** -+ * kbase_hwcnt_enable_map_block_value_enabled() - Check if a value in a block -+ * instance is enabled. -+ * @bitfld: Non-NULL pointer to the block bitfield(s) obtained from a call to -+ * kbase_hwcnt_enable_map_block_instance. -+ * @val_idx: Index of the value to check in the block instance. -+ * -+ * Return: true if the value was enabled, else false. -+ */ -+static inline bool kbase_hwcnt_enable_map_block_value_enabled( -+ const u64 *bitfld, -+ size_t val_idx) -+{ -+ const size_t idx = val_idx / KBASE_HWCNT_BITFIELD_BITS; -+ const size_t bit = val_idx % KBASE_HWCNT_BITFIELD_BITS; -+ const u64 mask = 1ull << bit; ++#if !MALI_USE_CSF ++ /* If GWT is enabled using new vector dumping format ++ * from user space, back up status of the job serialization flag and ++ * use full serialisation of jobs for dumping. ++ * Status will be restored on end of dumping in gwt_stop. ++ */ ++ kctx->kbdev->backup_serialize_jobs = kctx->kbdev->serialize_jobs; ++ kctx->kbdev->serialize_jobs = KBASE_SERIALIZE_INTRA_SLOT | ++ KBASE_SERIALIZE_INTER_SLOT; + -+ return (bitfld[idx] & mask) != 0; -+} ++#endif ++ /* Mark gwt enabled before making pages read only in case a ++ * write page fault is triggered while we're still in this loop. ++ * (kbase_gpu_vm_lock() doesn't prevent this!) ++ */ ++ kctx->gwt_enabled = true; ++ kctx->gwt_was_enabled = true; + -+/** -+ * kbase_hwcnt_enable_map_block_enable_value() - Enable a value in a block -+ * instance. -+ * @bitfld: Non-NULL pointer to the block bitfield(s) obtained from a call to -+ * kbase_hwcnt_enable_map_block_instance. -+ * @val_idx: Index of the value to enable in the block instance. -+ */ -+static inline void kbase_hwcnt_enable_map_block_enable_value( -+ u64 *bitfld, -+ size_t val_idx) -+{ -+ const size_t idx = val_idx / KBASE_HWCNT_BITFIELD_BITS; -+ const size_t bit = val_idx % KBASE_HWCNT_BITFIELD_BITS; -+ const u64 mask = 1ull << bit; ++ kbase_gpu_gwt_setup_pages(kctx, ~KBASE_REG_GPU_WR); + -+ bitfld[idx] |= mask; ++ kbase_gpu_vm_unlock(kctx); ++ return 0; +} + -+/** -+ * kbase_hwcnt_enable_map_block_disable_value() - Disable a value in a block -+ * instance. -+ * @bitfld: Non-NULL pointer to the block bitfield(s) obtained from a call to -+ * kbase_hwcnt_enable_map_block_instance. -+ * @val_idx: Index of the value to disable in the block instance. -+ */ -+static inline void kbase_hwcnt_enable_map_block_disable_value( -+ u64 *bitfld, -+ size_t val_idx) ++int kbase_gpu_gwt_stop(struct kbase_context *kctx) +{ -+ const size_t idx = val_idx / KBASE_HWCNT_BITFIELD_BITS; -+ const size_t bit = val_idx % KBASE_HWCNT_BITFIELD_BITS; -+ const u64 mask = 1ull << bit; -+ -+ bitfld[idx] &= ~mask; -+} -+ -+/** -+ * kbase_hwcnt_dump_buffer_alloc() - Allocate a dump buffer. -+ * @metadata: Non-NULL pointer to metadata describing the system. -+ * @dump_buf: Non-NULL pointer to dump buffer to be initialised. Will be -+ * initialised to undefined values, so must be used as a copy dest, -+ * or cleared before use. -+ * -+ * Return: 0 on success, else error code. -+ */ -+int kbase_hwcnt_dump_buffer_alloc( -+ const struct kbase_hwcnt_metadata *metadata, -+ struct kbase_hwcnt_dump_buffer *dump_buf); ++ struct kbasep_gwt_list_element *pos, *n; + -+/** -+ * kbase_hwcnt_dump_buffer_free() - Free a dump buffer. -+ * @dump_buf: Dump buffer to be freed. -+ * -+ * Can be safely called on an all-zeroed dump buffer structure, or on an already -+ * freed dump buffer. -+ */ -+void kbase_hwcnt_dump_buffer_free(struct kbase_hwcnt_dump_buffer *dump_buf); ++ kbase_gpu_vm_lock(kctx); ++ if (!kctx->gwt_enabled) { ++ kbase_gpu_vm_unlock(kctx); ++ return -EINVAL; ++ } + -+/** -+ * kbase_hwcnt_dump_buffer_array_alloc() - Allocate an array of dump buffers. -+ * @metadata: Non-NULL pointer to metadata describing the system. -+ * @n: Number of dump buffers to allocate -+ * @dump_bufs: Non-NULL pointer to dump buffer array to be initialised. Each -+ * dump buffer in the array will be initialised to undefined values, -+ * so must be used as a copy dest, or cleared before use. -+ * -+ * A single zeroed contiguous page allocation will be used for all of the -+ * buffers inside the array, where: -+ * dump_bufs[n].dump_buf == page_addr + n * metadata.dump_buf_bytes -+ * -+ * Return: 0 on success, else error code. -+ */ -+int kbase_hwcnt_dump_buffer_array_alloc( -+ const struct kbase_hwcnt_metadata *metadata, -+ size_t n, -+ struct kbase_hwcnt_dump_buffer_array *dump_bufs); ++ list_for_each_entry_safe(pos, n, &kctx->gwt_current_list, link) { ++ list_del(&pos->link); ++ kfree(pos); ++ } + -+/** -+ * kbase_hwcnt_dump_buffer_array_free() - Free a dump buffer array. -+ * @dump_bufs: Dump buffer array to be freed. -+ * -+ * Can be safely called on an all-zeroed dump buffer array structure, or on an -+ * already freed dump buffer array. -+ */ -+void kbase_hwcnt_dump_buffer_array_free( -+ struct kbase_hwcnt_dump_buffer_array *dump_bufs); ++ list_for_each_entry_safe(pos, n, &kctx->gwt_snapshot_list, link) { ++ list_del(&pos->link); ++ kfree(pos); ++ } + -+/** -+ * kbase_hwcnt_dump_buffer_block_instance() - Get the pointer to a block -+ * instance's dump buffer. -+ * @buf: Non-NULL pointer to (const) dump buffer. -+ * @grp: Index of the group in the metadata. -+ * @blk: Index of the block in the group. -+ * @blk_inst: Index of the block instance in the block. -+ * -+ * Return: (const) u32* to the dump buffer for the block instance. -+ */ -+#define kbase_hwcnt_dump_buffer_block_instance(buf, grp, blk, blk_inst) \ -+ ((buf)->dump_buf + \ -+ (buf)->metadata->grp_metadata[(grp)].dump_buf_index + \ -+ (buf)->metadata->grp_metadata[(grp)].blk_metadata[(blk)].dump_buf_index + \ -+ (buf)->metadata->grp_metadata[(grp)].blk_metadata[(blk)].dump_buf_stride * (blk_inst)) ++#if !MALI_USE_CSF ++ kctx->kbdev->serialize_jobs = kctx->kbdev->backup_serialize_jobs; ++#endif + -+/** -+ * kbase_hwcnt_dump_buffer_zero() - Zero all enabled values in dst. -+ * After the operation, all non-enabled values -+ * will be undefined. -+ * @dst: Non-NULL pointer to dump buffer. -+ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. -+ * -+ * The dst and dst_enable_map MUST have been created from the same metadata. -+ */ -+void kbase_hwcnt_dump_buffer_zero( -+ struct kbase_hwcnt_dump_buffer *dst, -+ const struct kbase_hwcnt_enable_map *dst_enable_map); ++ kbase_gpu_gwt_setup_pages(kctx, ~0UL); + -+/** -+ * kbase_hwcnt_dump_buffer_block_zero() - Zero all values in a block. -+ * @dst_blk: Non-NULL pointer to dst block obtained from a call to -+ * kbase_hwcnt_dump_buffer_block_instance. -+ * @val_cnt: Number of values in the block. -+ */ -+static inline void kbase_hwcnt_dump_buffer_block_zero( -+ u32 *dst_blk, -+ size_t val_cnt) -+{ -+ memset(dst_blk, 0, (val_cnt * KBASE_HWCNT_VALUE_BYTES)); ++ kctx->gwt_enabled = false; ++ kbase_gpu_vm_unlock(kctx); ++ return 0; +} + -+/** -+ * kbase_hwcnt_dump_buffer_zero_strict() - Zero all values in dst. -+ * After the operation, all values -+ * (including padding bytes) will be -+ * zero. -+ * Slower than the non-strict variant. -+ * @dst: Non-NULL pointer to dump buffer. -+ */ -+void kbase_hwcnt_dump_buffer_zero_strict( -+ struct kbase_hwcnt_dump_buffer *dst); -+ -+/** -+ * kbase_hwcnt_dump_buffer_zero_non_enabled() - Zero all non-enabled values in -+ * dst (including padding bytes and -+ * unavailable blocks). -+ * After the operation, all enabled -+ * values will be unchanged. -+ * @dst: Non-NULL pointer to dump buffer. -+ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. -+ * -+ * The dst and dst_enable_map MUST have been created from the same metadata. -+ */ -+void kbase_hwcnt_dump_buffer_zero_non_enabled( -+ struct kbase_hwcnt_dump_buffer *dst, -+ const struct kbase_hwcnt_enable_map *dst_enable_map); -+ -+/** -+ * kbase_hwcnt_dump_buffer_block_zero_non_enabled() - Zero all non-enabled -+ * values in a block. -+ * After the operation, all -+ * enabled values will be -+ * unchanged. -+ * @dst_blk: Non-NULL pointer to dst block obtained from a call to -+ * kbase_hwcnt_dump_buffer_block_instance. -+ * @blk_em: Non-NULL pointer to the block bitfield(s) obtained from a call to -+ * kbase_hwcnt_enable_map_block_instance. -+ * @val_cnt: Number of values in the block. -+ */ -+static inline void kbase_hwcnt_dump_buffer_block_zero_non_enabled( -+ u32 *dst_blk, -+ const u64 *blk_em, -+ size_t val_cnt) ++#if (KERNEL_VERSION(5, 13, 0) <= LINUX_VERSION_CODE) ++static int list_cmp_function(void *priv, const struct list_head *a, const struct list_head *b) ++#else ++static int list_cmp_function(void *priv, struct list_head *a, ++ struct list_head *b) ++#endif +{ -+ size_t val; -+ -+ for (val = 0; val < val_cnt; val++) { -+ if (!kbase_hwcnt_enable_map_block_value_enabled(blk_em, val)) -+ dst_blk[val] = 0; -+ } -+} ++ const struct kbasep_gwt_list_element *elementA = ++ container_of(a, struct kbasep_gwt_list_element, link); ++ const struct kbasep_gwt_list_element *elementB = ++ container_of(b, struct kbasep_gwt_list_element, link); + -+/** -+ * kbase_hwcnt_dump_buffer_copy() - Copy all enabled values from src to dst. -+ * After the operation, all non-enabled values -+ * will be undefined. -+ * @dst: Non-NULL pointer to dst dump buffer. -+ * @src: Non-NULL pointer to src dump buffer. -+ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. -+ * -+ * The dst, src, and dst_enable_map MUST have been created from the same -+ * metadata. -+ */ -+void kbase_hwcnt_dump_buffer_copy( -+ struct kbase_hwcnt_dump_buffer *dst, -+ const struct kbase_hwcnt_dump_buffer *src, -+ const struct kbase_hwcnt_enable_map *dst_enable_map); ++ CSTD_UNUSED(priv); + -+/** -+ * kbase_hwcnt_dump_buffer_block_copy() - Copy all block values from src to dst. -+ * @dst_blk: Non-NULL pointer to dst block obtained from a call to -+ * kbase_hwcnt_dump_buffer_block_instance. -+ * @src_blk: Non-NULL pointer to src block obtained from a call to -+ * kbase_hwcnt_dump_buffer_block_instance. -+ * @val_cnt: Number of values in the block. -+ */ -+static inline void kbase_hwcnt_dump_buffer_block_copy( -+ u32 *dst_blk, -+ const u32 *src_blk, -+ size_t val_cnt) -+{ -+ /* Copy all the counters in the block instance. -+ * Values of non-enabled counters are undefined. -+ */ -+ memcpy(dst_blk, src_blk, (val_cnt * KBASE_HWCNT_VALUE_BYTES)); ++ if (elementA->page_addr > elementB->page_addr) ++ return 1; ++ return -1; +} + -+/** -+ * kbase_hwcnt_dump_buffer_copy_strict() - Copy all enabled values from src to -+ * dst. -+ * After the operation, all non-enabled -+ * values (including padding bytes) will -+ * be zero. -+ * Slower than the non-strict variant. -+ * @dst: Non-NULL pointer to dst dump buffer. -+ * @src: Non-NULL pointer to src dump buffer. -+ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. -+ * -+ * The dst, src, and dst_enable_map MUST have been created from the same -+ * metadata. -+ */ -+void kbase_hwcnt_dump_buffer_copy_strict( -+ struct kbase_hwcnt_dump_buffer *dst, -+ const struct kbase_hwcnt_dump_buffer *src, -+ const struct kbase_hwcnt_enable_map *dst_enable_map); -+ -+/** -+ * kbase_hwcnt_dump_buffer_block_copy_strict() - Copy all enabled block values -+ * from src to dst. -+ * After the operation, all -+ * non-enabled values will be -+ * zero. -+ * @dst_blk: Non-NULL pointer to dst block obtained from a call to -+ * kbase_hwcnt_dump_buffer_block_instance. -+ * @src_blk: Non-NULL pointer to src block obtained from a call to -+ * kbase_hwcnt_dump_buffer_block_instance. -+ * @blk_em: Non-NULL pointer to the block bitfield(s) obtained from a call to -+ * kbase_hwcnt_enable_map_block_instance. -+ * @val_cnt: Number of values in the block. -+ * -+ * After the copy, any disabled values in dst will be zero. -+ */ -+static inline void kbase_hwcnt_dump_buffer_block_copy_strict( -+ u32 *dst_blk, -+ const u32 *src_blk, -+ const u64 *blk_em, -+ size_t val_cnt) ++static void kbase_gpu_gwt_collate(struct kbase_context *kctx, ++ struct list_head *snapshot_list) +{ -+ size_t val; ++ struct kbasep_gwt_list_element *pos, *n; ++ struct kbasep_gwt_list_element *collated = NULL; + -+ for (val = 0; val < val_cnt; val++) { -+ bool val_enabled = kbase_hwcnt_enable_map_block_value_enabled( -+ blk_em, val); ++ /* Sort the list */ ++ list_sort(NULL, snapshot_list, list_cmp_function); + -+ dst_blk[val] = val_enabled ? src_blk[val] : 0; ++ /* Combine contiguous areas. */ ++ list_for_each_entry_safe(pos, n, snapshot_list, link) { ++ if (collated == NULL || collated->region != ++ pos->region || ++ (collated->page_addr + ++ (collated->num_pages * PAGE_SIZE)) != ++ pos->page_addr) { ++ /* This is the first time through, a new region or ++ * is not contiguous - start collating to this element ++ */ ++ collated = pos; ++ } else { ++ /* contiguous so merge */ ++ collated->num_pages += pos->num_pages; ++ /* remove element from list */ ++ list_del(&pos->link); ++ kfree(pos); ++ } + } +} + -+/** -+ * kbase_hwcnt_dump_buffer_accumulate() - Copy all enabled headers and -+ * accumulate all enabled counters from -+ * src to dst. -+ * After the operation, all non-enabled -+ * values will be undefined. -+ * @dst: Non-NULL pointer to dst dump buffer. -+ * @src: Non-NULL pointer to src dump buffer. -+ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. -+ * -+ * The dst, src, and dst_enable_map MUST have been created from the same -+ * metadata. -+ */ -+void kbase_hwcnt_dump_buffer_accumulate( -+ struct kbase_hwcnt_dump_buffer *dst, -+ const struct kbase_hwcnt_dump_buffer *src, -+ const struct kbase_hwcnt_enable_map *dst_enable_map); -+ -+/** -+ * kbase_hwcnt_dump_buffer_block_accumulate() - Copy all block headers and -+ * accumulate all block counters -+ * from src to dst. -+ * @dst_blk: Non-NULL pointer to dst block obtained from a call to -+ * kbase_hwcnt_dump_buffer_block_instance. -+ * @src_blk: Non-NULL pointer to src block obtained from a call to -+ * kbase_hwcnt_dump_buffer_block_instance. -+ * @hdr_cnt: Number of headers in the block. -+ * @ctr_cnt: Number of counters in the block. -+ */ -+static inline void kbase_hwcnt_dump_buffer_block_accumulate( -+ u32 *dst_blk, -+ const u32 *src_blk, -+ size_t hdr_cnt, -+ size_t ctr_cnt) ++int kbase_gpu_gwt_dump(struct kbase_context *kctx, ++ union kbase_ioctl_cinstr_gwt_dump *gwt_dump) +{ -+ size_t ctr; -+ /* Copy all the headers in the block instance. -+ * Values of non-enabled headers are undefined. -+ */ -+ memcpy(dst_blk, src_blk, hdr_cnt * KBASE_HWCNT_VALUE_BYTES); -+ -+ /* Accumulate all the counters in the block instance. -+ * Values of non-enabled counters are undefined. -+ */ -+ for (ctr = hdr_cnt; ctr < ctr_cnt + hdr_cnt; ctr++) { -+ u32 *dst_ctr = dst_blk + ctr; -+ const u32 *src_ctr = src_blk + ctr; -+ -+ const u32 src_counter = *src_ctr; -+ const u32 dst_counter = *dst_ctr; ++ const u32 ubuf_size = gwt_dump->in.len; ++ u32 ubuf_count = 0; ++ __user void *user_addr = (__user void *) ++ (uintptr_t)gwt_dump->in.addr_buffer; ++ __user void *user_sizes = (__user void *) ++ (uintptr_t)gwt_dump->in.size_buffer; + -+ /* Saturating add */ -+ u32 accumulated = src_counter + dst_counter; ++ kbase_gpu_vm_lock(kctx); + -+ if (accumulated < src_counter) -+ accumulated = U32_MAX; ++ if (!kctx->gwt_enabled) { ++ kbase_gpu_vm_unlock(kctx); ++ /* gwt_dump shouldn't be called when gwt is disabled */ ++ return -EPERM; ++ } + -+ *dst_ctr = accumulated; ++ if (!gwt_dump->in.len || !gwt_dump->in.addr_buffer ++ || !gwt_dump->in.size_buffer) { ++ kbase_gpu_vm_unlock(kctx); ++ /* We don't have any valid user space buffer to copy the ++ * write modified addresses. ++ */ ++ return -EINVAL; + } -+} + -+/** -+ * kbase_hwcnt_dump_buffer_accumulate_strict() - Copy all enabled headers and -+ * accumulate all enabled counters -+ * from src to dst. -+ * After the operation, all -+ * non-enabled values (including -+ * padding bytes) will be zero. -+ * Slower than the non-strict -+ * variant. -+ * @dst: Non-NULL pointer to dst dump buffer. -+ * @src: Non-NULL pointer to src dump buffer. -+ * @dst_enable_map: Non-NULL pointer to enable map specifying enabled values. -+ * -+ * The dst, src, and dst_enable_map MUST have been created from the same -+ * metadata. -+ */ -+void kbase_hwcnt_dump_buffer_accumulate_strict( -+ struct kbase_hwcnt_dump_buffer *dst, -+ const struct kbase_hwcnt_dump_buffer *src, -+ const struct kbase_hwcnt_enable_map *dst_enable_map); ++ if (list_empty(&kctx->gwt_snapshot_list) && ++ !list_empty(&kctx->gwt_current_list)) { + -+/** -+ * kbase_hwcnt_dump_buffer_block_accumulate_strict() - Copy all enabled block -+ * headers and accumulate -+ * all block counters from -+ * src to dst. -+ * After the operation, all -+ * non-enabled values will -+ * be zero. -+ * @dst_blk: Non-NULL pointer to dst block obtained from a call to -+ * kbase_hwcnt_dump_buffer_block_instance. -+ * @src_blk: Non-NULL pointer to src block obtained from a call to -+ * kbase_hwcnt_dump_buffer_block_instance. -+ * @blk_em: Non-NULL pointer to the block bitfield(s) obtained from a call to -+ * kbase_hwcnt_enable_map_block_instance. -+ * @hdr_cnt: Number of headers in the block. -+ * @ctr_cnt: Number of counters in the block. -+ */ -+static inline void kbase_hwcnt_dump_buffer_block_accumulate_strict( -+ u32 *dst_blk, -+ const u32 *src_blk, -+ const u64 *blk_em, -+ size_t hdr_cnt, -+ size_t ctr_cnt) -+{ -+ size_t ctr; ++ list_replace_init(&kctx->gwt_current_list, ++ &kctx->gwt_snapshot_list); + -+ kbase_hwcnt_dump_buffer_block_copy_strict( -+ dst_blk, src_blk, blk_em, hdr_cnt); ++ /* We have collected all write faults so far ++ * and they will be passed on to user space. ++ * Reset the page flags state to allow collection of ++ * further write faults. ++ */ ++ kbase_gpu_gwt_setup_pages(kctx, ~KBASE_REG_GPU_WR); + -+ for (ctr = hdr_cnt; ctr < ctr_cnt + hdr_cnt; ctr++) { -+ bool ctr_enabled = kbase_hwcnt_enable_map_block_value_enabled( -+ blk_em, ctr); ++ /* Sort and combine consecutive pages in the dump list*/ ++ kbase_gpu_gwt_collate(kctx, &kctx->gwt_snapshot_list); ++ } + -+ u32 *dst_ctr = dst_blk + ctr; -+ const u32 *src_ctr = src_blk + ctr; ++ while ((!list_empty(&kctx->gwt_snapshot_list))) { ++ u64 addr_buffer[32]; ++ u64 num_page_buffer[32]; ++ u32 count = 0; ++ int err; ++ struct kbasep_gwt_list_element *dump_info, *n; + -+ const u32 src_counter = *src_ctr; -+ const u32 dst_counter = *dst_ctr; ++ list_for_each_entry_safe(dump_info, n, ++ &kctx->gwt_snapshot_list, link) { ++ addr_buffer[count] = dump_info->page_addr; ++ num_page_buffer[count] = dump_info->num_pages; ++ count++; ++ list_del(&dump_info->link); ++ kfree(dump_info); ++ if (ARRAY_SIZE(addr_buffer) == count || ++ ubuf_size == (ubuf_count + count)) ++ break; ++ } + -+ /* Saturating add */ -+ u32 accumulated = src_counter + dst_counter; ++ if (count) { ++ err = copy_to_user((user_addr + ++ (ubuf_count * sizeof(u64))), ++ (void *)addr_buffer, ++ count * sizeof(u64)); ++ if (err) { ++ dev_err(kctx->kbdev->dev, "Copy to user failure\n"); ++ kbase_gpu_vm_unlock(kctx); ++ return err; ++ } ++ err = copy_to_user((user_sizes + ++ (ubuf_count * sizeof(u64))), ++ (void *)num_page_buffer, ++ count * sizeof(u64)); ++ if (err) { ++ dev_err(kctx->kbdev->dev, "Copy to user failure\n"); ++ kbase_gpu_vm_unlock(kctx); ++ return err; ++ } + -+ if (accumulated < src_counter) -+ accumulated = U32_MAX; ++ ubuf_count += count; ++ } + -+ *dst_ctr = ctr_enabled ? accumulated : 0; ++ if (ubuf_count == ubuf_size) ++ break; + } -+} + -+/** -+ * @brief Iterate over each clock domain in the metadata. -+ * -+ * @param[in] md Non-NULL pointer to metadata. -+ * @param[in] clk size_t variable used as clock iterator. -+ */ -+#define kbase_hwcnt_metadata_for_each_clock(md, clk) \ -+ for ((clk) = 0; (clk) < (md)->clk_cnt; (clk)++) ++ if (!list_empty(&kctx->gwt_snapshot_list)) ++ gwt_dump->out.more_data_available = 1; ++ else ++ gwt_dump->out.more_data_available = 0; + -+/** -+ * kbase_hwcnt_clk_enable_map_enabled() - Check if the given index is enabled -+ * in clk_enable_map. -+ * @clk_enable_map: An enable map for clock domains. -+ * @index: Index of the enable map for clock domain. -+ * -+ * Return: true if the index of the clock domain is enabled, else false. -+ */ -+static inline bool kbase_hwcnt_clk_enable_map_enabled( -+ const u64 clk_enable_map, const size_t index) -+{ -+ if (clk_enable_map & (1ull << index)) -+ return true; -+ return false; ++ gwt_dump->out.no_of_addr_collected = ubuf_count; ++ kbase_gpu_vm_unlock(kctx); ++ return 0; +} -+ -+#endif /* _KBASE_HWCNT_TYPES_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_virtualizer.c b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_virtualizer.c +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gwt.h b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h new file mode 100755 -index 000000000000..917e47cda0f9 +index 000000000..9fdd68d62 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_virtualizer.c -@@ -0,0 +1,790 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h +@@ -0,0 +1,54 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2017, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -212081,792 +244453,499 @@ index 000000000000..917e47cda0f9 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+#include "mali_kbase_hwcnt_virtualizer.h" -+#include "mali_kbase_hwcnt_accumulator.h" -+#include "mali_kbase_hwcnt_context.h" -+#include "mali_kbase_hwcnt_types.h" -+#include "mali_malisw.h" -+#include "mali_kbase_debug.h" -+#include "mali_kbase_linux.h" -+ -+#include -+#include -+ -+/** -+ * struct kbase_hwcnt_virtualizer - Hardware counter virtualizer structure. -+ * @hctx: Hardware counter context being virtualized. -+ * @dump_threshold_ns: Minimum threshold period for dumps between different -+ * clients where a new accumulator dump will not be -+ * performed, and instead accumulated values will be used. -+ * If 0, rate limiting is disabled. -+ * @metadata: Hardware counter metadata. -+ * @lock: Lock acquired at all entrypoints, to protect mutable -+ * state. -+ * @client_count: Current number of virtualizer clients. -+ * @clients: List of virtualizer clients. -+ * @accum: Hardware counter accumulator. NULL if no clients. -+ * @scratch_map: Enable map used as scratch space during counter changes. -+ * @scratch_buf: Dump buffer used as scratch space during dumps. -+ * @ts_last_dump_ns: End time of most recent dump across all clients. -+ */ -+struct kbase_hwcnt_virtualizer { -+ struct kbase_hwcnt_context *hctx; -+ u64 dump_threshold_ns; -+ const struct kbase_hwcnt_metadata *metadata; -+ struct mutex lock; -+ size_t client_count; -+ struct list_head clients; -+ struct kbase_hwcnt_accumulator *accum; -+ struct kbase_hwcnt_enable_map scratch_map; -+ struct kbase_hwcnt_dump_buffer scratch_buf; -+ u64 ts_last_dump_ns; -+}; -+ -+/** -+ * struct kbase_hwcnt_virtualizer_client - Virtualizer client structure. -+ * @node: List node used for virtualizer client list. -+ * @hvirt: Hardware counter virtualizer. -+ * @enable_map: Enable map with client's current enabled counters. -+ * @accum_buf: Dump buffer with client's current accumulated counters. -+ * @has_accum: True if accum_buf contains any accumulated counters. -+ * @ts_start_ns: Counter collection start time of current dump. + */ -+struct kbase_hwcnt_virtualizer_client { -+ struct list_head node; -+ struct kbase_hwcnt_virtualizer *hvirt; -+ struct kbase_hwcnt_enable_map enable_map; -+ struct kbase_hwcnt_dump_buffer accum_buf; -+ bool has_accum; -+ u64 ts_start_ns; -+}; + -+const struct kbase_hwcnt_metadata *kbase_hwcnt_virtualizer_metadata( -+ struct kbase_hwcnt_virtualizer *hvirt) -+{ -+ if (!hvirt) -+ return NULL; ++#if !defined(_KBASE_GWT_H) ++#define _KBASE_GWT_H + -+ return hvirt->metadata; -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_virtualizer_metadata); ++#include ++#include + +/** -+ * kbasep_hwcnt_virtualizer_client_free - Free a virtualizer client's memory. -+ * @hvcli: Pointer to virtualizer client. ++ * kbase_gpu_gwt_start - Start the GPU write tracking ++ * @kctx: Pointer to kernel context + * -+ * Will safely free a client in any partial state of construction. ++ * Return: 0 on success, error on failure. + */ -+static void kbasep_hwcnt_virtualizer_client_free( -+ struct kbase_hwcnt_virtualizer_client *hvcli) -+{ -+ if (!hvcli) -+ return; -+ -+ kbase_hwcnt_dump_buffer_free(&hvcli->accum_buf); -+ kbase_hwcnt_enable_map_free(&hvcli->enable_map); -+ kfree(hvcli); -+} ++int kbase_gpu_gwt_start(struct kbase_context *kctx); + +/** -+ * kbasep_hwcnt_virtualizer_client_alloc - Allocate memory for a virtualizer -+ * client. -+ * @metadata: Non-NULL pointer to counter metadata. -+ * @out_hvcli: Non-NULL pointer to where created client will be stored on -+ * success. ++ * kbase_gpu_gwt_stop - Stop the GPU write tracking ++ * @kctx: Pointer to kernel context + * -+ * Return: 0 on success, else error code. -+ */ -+static int kbasep_hwcnt_virtualizer_client_alloc( -+ const struct kbase_hwcnt_metadata *metadata, -+ struct kbase_hwcnt_virtualizer_client **out_hvcli) -+{ -+ int errcode; -+ struct kbase_hwcnt_virtualizer_client *hvcli = NULL; -+ -+ WARN_ON(!metadata); -+ WARN_ON(!out_hvcli); -+ -+ hvcli = kzalloc(sizeof(*hvcli), GFP_KERNEL); -+ if (!hvcli) -+ return -ENOMEM; -+ -+ errcode = kbase_hwcnt_enable_map_alloc(metadata, &hvcli->enable_map); -+ if (errcode) -+ goto error; -+ -+ errcode = kbase_hwcnt_dump_buffer_alloc(metadata, &hvcli->accum_buf); -+ if (errcode) -+ goto error; -+ -+ *out_hvcli = hvcli; -+ return 0; -+error: -+ kbasep_hwcnt_virtualizer_client_free(hvcli); -+ return errcode; -+} -+ -+/** -+ * kbasep_hwcnt_virtualizer_client_accumulate - Accumulate a dump buffer into a -+ * client's accumulation buffer. -+ * @hvcli: Non-NULL pointer to virtualizer client. -+ * @dump_buf: Non-NULL pointer to dump buffer to accumulate from. ++ * Return: 0 on success, error on failure. + */ -+static void kbasep_hwcnt_virtualizer_client_accumulate( -+ struct kbase_hwcnt_virtualizer_client *hvcli, -+ const struct kbase_hwcnt_dump_buffer *dump_buf) -+{ -+ WARN_ON(!hvcli); -+ WARN_ON(!dump_buf); -+ lockdep_assert_held(&hvcli->hvirt->lock); -+ -+ if (hvcli->has_accum) { -+ /* If already some accumulation, accumulate */ -+ kbase_hwcnt_dump_buffer_accumulate( -+ &hvcli->accum_buf, dump_buf, &hvcli->enable_map); -+ } else { -+ /* If no accumulation, copy */ -+ kbase_hwcnt_dump_buffer_copy( -+ &hvcli->accum_buf, dump_buf, &hvcli->enable_map); -+ } -+ hvcli->has_accum = true; -+} ++int kbase_gpu_gwt_stop(struct kbase_context *kctx); + +/** -+ * kbasep_hwcnt_virtualizer_accumulator_term - Terminate the hardware counter -+ * accumulator after final client -+ * removal. -+ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. ++ * kbase_gpu_gwt_dump - Pass page address of faulting addresses to user space. ++ * @kctx: Pointer to kernel context ++ * @gwt_dump: User space data to be passed. + * -+ * Will safely terminate the accumulator in any partial state of initialisation. ++ * Return: 0 on success, error on failure. + */ -+static void kbasep_hwcnt_virtualizer_accumulator_term( -+ struct kbase_hwcnt_virtualizer *hvirt) -+{ -+ WARN_ON(!hvirt); -+ lockdep_assert_held(&hvirt->lock); -+ WARN_ON(hvirt->client_count); -+ -+ kbase_hwcnt_dump_buffer_free(&hvirt->scratch_buf); -+ kbase_hwcnt_enable_map_free(&hvirt->scratch_map); -+ kbase_hwcnt_accumulator_release(hvirt->accum); -+ hvirt->accum = NULL; -+} ++int kbase_gpu_gwt_dump(struct kbase_context *kctx, ++ union kbase_ioctl_cinstr_gwt_dump *gwt_dump); + -+/** -+ * kbasep_hwcnt_virtualizer_accumulator_init - Initialise the hardware counter -+ * accumulator before first client -+ * addition. -+ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. ++#endif /* _KBASE_GWT_H */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hw.c b/drivers/gpu/arm/bifrost/mali_kbase_hw.c +new file mode 100755 +index 000000000..b07327a55 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.c +@@ -0,0 +1,437 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* + * -+ * Return: 0 on success, else error code. -+ */ -+static int kbasep_hwcnt_virtualizer_accumulator_init( -+ struct kbase_hwcnt_virtualizer *hvirt) -+{ -+ int errcode; -+ -+ WARN_ON(!hvirt); -+ lockdep_assert_held(&hvirt->lock); -+ WARN_ON(hvirt->client_count); -+ WARN_ON(hvirt->accum); -+ -+ errcode = kbase_hwcnt_accumulator_acquire( -+ hvirt->hctx, &hvirt->accum); -+ if (errcode) -+ goto error; -+ -+ errcode = kbase_hwcnt_enable_map_alloc( -+ hvirt->metadata, &hvirt->scratch_map); -+ if (errcode) -+ goto error; -+ -+ errcode = kbase_hwcnt_dump_buffer_alloc( -+ hvirt->metadata, &hvirt->scratch_buf); -+ if (errcode) -+ goto error; -+ -+ return 0; -+error: -+ kbasep_hwcnt_virtualizer_accumulator_term(hvirt); -+ return errcode; -+} -+ -+/** -+ * kbasep_hwcnt_virtualizer_client_add - Add a newly allocated client to the -+ * virtualizer. -+ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. -+ * @hvcli: Non-NULL pointer to the virtualizer client to add. -+ * @enable_map: Non-NULL pointer to client's initial enable map. ++ * (C) COPYRIGHT 2012-2023 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Return: 0 on success, else error code. + */ -+static int kbasep_hwcnt_virtualizer_client_add( -+ struct kbase_hwcnt_virtualizer *hvirt, -+ struct kbase_hwcnt_virtualizer_client *hvcli, -+ const struct kbase_hwcnt_enable_map *enable_map) -+{ -+ int errcode = 0; -+ u64 ts_start_ns; -+ u64 ts_end_ns; -+ -+ WARN_ON(!hvirt); -+ WARN_ON(!hvcli); -+ WARN_ON(!enable_map); -+ lockdep_assert_held(&hvirt->lock); -+ -+ if (hvirt->client_count == 0) -+ /* First client added, so initialise the accumulator */ -+ errcode = kbasep_hwcnt_virtualizer_accumulator_init(hvirt); -+ if (errcode) -+ return errcode; -+ -+ hvirt->client_count += 1; -+ -+ if (hvirt->client_count == 1) { -+ /* First client, so just pass the enable map onwards as is */ -+ errcode = kbase_hwcnt_accumulator_set_counters(hvirt->accum, -+ enable_map, &ts_start_ns, &ts_end_ns, NULL); -+ } else { -+ struct kbase_hwcnt_virtualizer_client *pos; -+ -+ /* Make the scratch enable map the union of all enable maps */ -+ kbase_hwcnt_enable_map_copy( -+ &hvirt->scratch_map, enable_map); -+ list_for_each_entry(pos, &hvirt->clients, node) -+ kbase_hwcnt_enable_map_union( -+ &hvirt->scratch_map, &pos->enable_map); -+ -+ /* Set the counters with the new union enable map */ -+ errcode = kbase_hwcnt_accumulator_set_counters(hvirt->accum, -+ &hvirt->scratch_map, -+ &ts_start_ns, &ts_end_ns, -+ &hvirt->scratch_buf); -+ /* Accumulate into only existing clients' accumulation bufs */ -+ if (!errcode) -+ list_for_each_entry(pos, &hvirt->clients, node) -+ kbasep_hwcnt_virtualizer_client_accumulate( -+ pos, &hvirt->scratch_buf); -+ } -+ if (errcode) -+ goto error; -+ -+ list_add(&hvcli->node, &hvirt->clients); -+ hvcli->hvirt = hvirt; -+ kbase_hwcnt_enable_map_copy(&hvcli->enable_map, enable_map); -+ hvcli->has_accum = false; -+ hvcli->ts_start_ns = ts_end_ns; + -+ /* Store the most recent dump time for rate limiting */ -+ hvirt->ts_last_dump_ns = ts_end_ns; ++/* ++ * Run-time work-arounds helpers ++ */ + -+ return 0; -+error: -+ hvirt->client_count -= 1; -+ if (hvirt->client_count == 0) -+ kbasep_hwcnt_virtualizer_accumulator_term(hvirt); -+ return errcode; -+} ++#include ++#include ++#include "gpu/mali_kbase_gpu_regmap.h" ++#include "mali_kbase.h" ++#include "mali_kbase_hw.h" + -+/** -+ * kbasep_hwcnt_virtualizer_client_remove - Remove a client from the -+ * virtualizer. -+ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. -+ * @hvcli: Non-NULL pointer to the virtualizer client to remove. -+ */ -+static void kbasep_hwcnt_virtualizer_client_remove( -+ struct kbase_hwcnt_virtualizer *hvirt, -+ struct kbase_hwcnt_virtualizer_client *hvcli) ++void kbase_hw_set_features_mask(struct kbase_device *kbdev) +{ -+ int errcode = 0; -+ u64 ts_start_ns; -+ u64 ts_end_ns; ++ const enum base_hw_feature *features; ++ u32 gpu_id; + -+ WARN_ON(!hvirt); -+ WARN_ON(!hvcli); -+ lockdep_assert_held(&hvirt->lock); ++ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; + -+ list_del(&hvcli->node); -+ hvirt->client_count -= 1; ++ switch (gpu_id & GPU_ID2_PRODUCT_MODEL) { ++ case GPU_ID2_PRODUCT_TMIX: ++ features = base_hw_features_tMIx; ++ break; ++ case GPU_ID2_PRODUCT_THEX: ++ features = base_hw_features_tHEx; ++ break; ++ case GPU_ID2_PRODUCT_TSIX: ++ features = base_hw_features_tSIx; ++ break; ++ case GPU_ID2_PRODUCT_TDVX: ++ features = base_hw_features_tDVx; ++ break; ++ case GPU_ID2_PRODUCT_TNOX: ++ features = base_hw_features_tNOx; ++ break; ++ case GPU_ID2_PRODUCT_TGOX: ++ features = base_hw_features_tGOx; ++ break; ++ case GPU_ID2_PRODUCT_TTRX: ++ features = base_hw_features_tTRx; ++ break; ++ case GPU_ID2_PRODUCT_TNAX: ++ features = base_hw_features_tNAx; ++ break; ++ case GPU_ID2_PRODUCT_LBEX: ++ case GPU_ID2_PRODUCT_TBEX: ++ features = base_hw_features_tBEx; ++ break; ++ case GPU_ID2_PRODUCT_TBAX: ++ features = base_hw_features_tBAx; ++ break; ++ case GPU_ID2_PRODUCT_TODX: ++ case GPU_ID2_PRODUCT_LODX: ++ features = base_hw_features_tODx; ++ break; ++ case GPU_ID2_PRODUCT_TGRX: ++ features = base_hw_features_tGRx; ++ break; ++ case GPU_ID2_PRODUCT_TVAX: ++ features = base_hw_features_tVAx; ++ break; ++ case GPU_ID2_PRODUCT_TTUX: ++ case GPU_ID2_PRODUCT_LTUX: ++ features = base_hw_features_tTUx; ++ break; ++ case GPU_ID2_PRODUCT_TTIX: ++ case GPU_ID2_PRODUCT_LTIX: ++ features = base_hw_features_tTIx; ++ break; ++ default: ++ features = base_hw_features_generic; ++ break; ++ } + -+ if (hvirt->client_count == 0) { -+ /* Last client removed, so terminate the accumulator */ -+ kbasep_hwcnt_virtualizer_accumulator_term(hvirt); -+ } else { -+ struct kbase_hwcnt_virtualizer_client *pos; -+ /* Make the scratch enable map the union of all enable maps */ -+ kbase_hwcnt_enable_map_disable_all(&hvirt->scratch_map); -+ list_for_each_entry(pos, &hvirt->clients, node) -+ kbase_hwcnt_enable_map_union( -+ &hvirt->scratch_map, &pos->enable_map); -+ /* Set the counters with the new union enable map */ -+ errcode = kbase_hwcnt_accumulator_set_counters(hvirt->accum, -+ &hvirt->scratch_map, -+ &ts_start_ns, &ts_end_ns, -+ &hvirt->scratch_buf); -+ /* Accumulate into remaining clients' accumulation bufs */ -+ if (!errcode) -+ list_for_each_entry(pos, &hvirt->clients, node) -+ kbasep_hwcnt_virtualizer_client_accumulate( -+ pos, &hvirt->scratch_buf); ++ for (; *features != BASE_HW_FEATURE_END; features++) ++ set_bit(*features, &kbdev->hw_features_mask[0]); + -+ /* Store the most recent dump time for rate limiting */ -+ hvirt->ts_last_dump_ns = ts_end_ns; -+ } -+ WARN_ON(errcode); ++#if defined(CONFIG_MALI_VECTOR_DUMP) ++ /* When dumping is enabled, need to disable flush reduction optimization ++ * for GPUs on which it is safe to have only cache clean operation at ++ * the end of job chain. ++ * This is required to make vector dump work. There is some discrepancy ++ * in the implementation of flush reduction optimization due to ++ * unclear or ambiguous ARCH spec. ++ */ ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_CLEAN_ONLY_SAFE)) ++ clear_bit(BASE_HW_FEATURE_FLUSH_REDUCTION, ++ &kbdev->hw_features_mask[0]); ++#endif +} + +/** -+ * kbasep_hwcnt_virtualizer_client_set_counters - Perform a dump of the client's -+ * currently enabled counters, -+ * and enable a new set of -+ * counters that will be used for -+ * subsequent dumps. -+ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. -+ * @hvcli: Non-NULL pointer to the virtualizer client. -+ * @enable_map: Non-NULL pointer to the new counter enable map for the client. -+ * Must have the same metadata as the virtualizer. -+ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will -+ * be written out to on success. -+ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will -+ * be written out to on success. -+ * @dump_buf: Pointer to the buffer where the dump will be written out to on -+ * success. If non-NULL, must have the same metadata as the -+ * accumulator. If NULL, the dump will be discarded. ++ * kbase_hw_get_issues_for_new_id - Get the hardware issues for a new GPU ID ++ * @kbdev: Device pointer + * -+ * Return: 0 on success or error code. ++ * Return: pointer to an array of hardware issues, terminated by ++ * BASE_HW_ISSUE_END. ++ * ++ * In debugging versions of the driver, unknown versions of a known GPU will ++ * be treated as the most recent known version not later than the actual ++ * version. In such circumstances, the GPU ID in @kbdev will also be replaced ++ * with the most recent known version. ++ * ++ * Note: The GPU configuration must have been read by kbase_gpuprops_get_props() ++ * before calling this function. + */ -+static int kbasep_hwcnt_virtualizer_client_set_counters( -+ struct kbase_hwcnt_virtualizer *hvirt, -+ struct kbase_hwcnt_virtualizer_client *hvcli, -+ const struct kbase_hwcnt_enable_map *enable_map, -+ u64 *ts_start_ns, -+ u64 *ts_end_ns, -+ struct kbase_hwcnt_dump_buffer *dump_buf) ++static const enum base_hw_issue *kbase_hw_get_issues_for_new_id( ++ struct kbase_device *kbdev) +{ -+ int errcode; -+ struct kbase_hwcnt_virtualizer_client *pos; -+ -+ WARN_ON(!hvirt); -+ WARN_ON(!hvcli); -+ WARN_ON(!enable_map); -+ WARN_ON(!ts_start_ns); -+ WARN_ON(!ts_end_ns); -+ WARN_ON(enable_map->metadata != hvirt->metadata); -+ WARN_ON(dump_buf && (dump_buf->metadata != hvirt->metadata)); -+ lockdep_assert_held(&hvirt->lock); ++ const enum base_hw_issue *issues = NULL; + -+ /* Make the scratch enable map the union of all enable maps */ -+ kbase_hwcnt_enable_map_copy(&hvirt->scratch_map, enable_map); -+ list_for_each_entry(pos, &hvirt->clients, node) -+ /* Ignore the enable map of the selected client */ -+ if (pos != hvcli) -+ kbase_hwcnt_enable_map_union( -+ &hvirt->scratch_map, &pos->enable_map); ++ struct base_hw_product { ++ u32 product_model; ++ struct { ++ u32 version; ++ const enum base_hw_issue *issues; ++ } map[7]; ++ }; + -+ /* Set the counters with the new union enable map */ -+ errcode = kbase_hwcnt_accumulator_set_counters(hvirt->accum, -+ &hvirt->scratch_map, ts_start_ns, ts_end_ns, -+ &hvirt->scratch_buf); -+ if (errcode) -+ return errcode; ++ static const struct base_hw_product base_hw_products[] = { ++ { GPU_ID2_PRODUCT_TMIX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 1), base_hw_issues_tMIx_r0p0_05dev0 }, ++ { GPU_ID2_VERSION_MAKE(0, 0, 2), base_hw_issues_tMIx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tMIx_r0p1 }, ++ { U32_MAX /* sentinel value */, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_THEX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tHEx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 0, 1), base_hw_issues_tHEx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tHEx_r0p1 }, ++ { GPU_ID2_VERSION_MAKE(0, 1, 1), base_hw_issues_tHEx_r0p1 }, ++ { GPU_ID2_VERSION_MAKE(0, 2, 0), base_hw_issues_tHEx_r0p2 }, ++ { GPU_ID2_VERSION_MAKE(0, 3, 0), base_hw_issues_tHEx_r0p3 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_TSIX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tSIx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 0, 1), base_hw_issues_tSIx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tSIx_r0p1 }, ++ { GPU_ID2_VERSION_MAKE(1, 0, 0), base_hw_issues_tSIx_r1p0 }, ++ { GPU_ID2_VERSION_MAKE(1, 1, 0), base_hw_issues_tSIx_r1p1 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_TDVX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tDVx_r0p0 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_TNOX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tNOx_r0p0 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_TGOX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tGOx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(1, 0, 0), base_hw_issues_tGOx_r1p0 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_TTRX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tTRx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 0, 3), base_hw_issues_tTRx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tTRx_r0p1 }, ++ { GPU_ID2_VERSION_MAKE(0, 1, 1), base_hw_issues_tTRx_r0p1 }, ++ { GPU_ID2_VERSION_MAKE(0, 2, 0), base_hw_issues_tTRx_r0p2 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_TNAX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tNAx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 0, 3), base_hw_issues_tNAx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 0, 4), base_hw_issues_tNAx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 0, 5), base_hw_issues_tNAx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tNAx_r0p1 }, ++ { GPU_ID2_VERSION_MAKE(0, 1, 1), base_hw_issues_tNAx_r0p1 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_LBEX, ++ { { GPU_ID2_VERSION_MAKE(1, 0, 0), base_hw_issues_lBEx_r1p0 }, ++ { GPU_ID2_VERSION_MAKE(1, 1, 0), base_hw_issues_lBEx_r1p1 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_TBEX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tBEx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 0, 3), base_hw_issues_tBEx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tBEx_r0p1 }, ++ { GPU_ID2_VERSION_MAKE(1, 0, 0), base_hw_issues_tBEx_r1p0 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_TBAX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tBAx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 0, 1), base_hw_issues_tBAx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 0, 2), base_hw_issues_tBAx_r0p0 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_TODX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tODx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 0, 4), base_hw_issues_tODx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 0, 5), base_hw_issues_tODx_r0p0 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_LODX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tODx_r0p0 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_TGRX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tGRx_r0p0 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_TVAX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tVAx_r0p0 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_TTUX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tTUx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tTUx_r0p1 }, ++ { GPU_ID2_VERSION_MAKE(1, 0, 0), base_hw_issues_tTUx_r1p0 }, ++ { GPU_ID2_VERSION_MAKE(1, 1, 0), base_hw_issues_tTUx_r1p1 }, ++ { GPU_ID2_VERSION_MAKE(1, 2, 0), base_hw_issues_tTUx_r1p2 }, ++ { GPU_ID2_VERSION_MAKE(1, 3, 0), base_hw_issues_tTUx_r1p3 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_LTUX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tTUx_r0p0 }, ++ { GPU_ID2_VERSION_MAKE(1, 0, 0), base_hw_issues_tTUx_r1p0 }, ++ { GPU_ID2_VERSION_MAKE(1, 1, 0), base_hw_issues_tTUx_r1p1 }, ++ { GPU_ID2_VERSION_MAKE(1, 2, 0), base_hw_issues_tTUx_r1p2 }, ++ { GPU_ID2_VERSION_MAKE(1, 3, 0), base_hw_issues_tTUx_r1p3 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_TTIX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tTIx_r0p0 }, ++ { U32_MAX, NULL } } }, ++ ++ { GPU_ID2_PRODUCT_LTIX, ++ { { GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tTIx_r0p0 }, ++ { U32_MAX, NULL } } }, + -+ /* Accumulate into all accumulation bufs except the selected client's */ -+ list_for_each_entry(pos, &hvirt->clients, node) -+ if (pos != hvcli) -+ kbasep_hwcnt_virtualizer_client_accumulate( -+ pos, &hvirt->scratch_buf); ++ }; + -+ /* Finally, write into the dump buf */ -+ if (dump_buf) { -+ const struct kbase_hwcnt_dump_buffer *src = &hvirt->scratch_buf; ++ u32 gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++ const u32 product_model = gpu_id & GPU_ID2_PRODUCT_MODEL; ++ const struct base_hw_product *product = NULL; ++ size_t p; + -+ if (hvcli->has_accum) { -+ kbase_hwcnt_dump_buffer_accumulate( -+ &hvcli->accum_buf, src, &hvcli->enable_map); -+ src = &hvcli->accum_buf; ++ /* Stop when we reach the end of the products array. */ ++ for (p = 0; p < ARRAY_SIZE(base_hw_products); ++p) { ++ if (product_model == base_hw_products[p].product_model) { ++ product = &base_hw_products[p]; ++ break; + } -+ kbase_hwcnt_dump_buffer_copy(dump_buf, src, &hvcli->enable_map); + } -+ hvcli->has_accum = false; -+ -+ /* Update the selected client's enable map */ -+ kbase_hwcnt_enable_map_copy(&hvcli->enable_map, enable_map); + -+ /* Fix up the timestamps */ -+ *ts_start_ns = hvcli->ts_start_ns; -+ hvcli->ts_start_ns = *ts_end_ns; -+ -+ /* Store the most recent dump time for rate limiting */ -+ hvirt->ts_last_dump_ns = *ts_end_ns; -+ -+ return errcode; -+} -+ -+int kbase_hwcnt_virtualizer_client_set_counters( -+ struct kbase_hwcnt_virtualizer_client *hvcli, -+ const struct kbase_hwcnt_enable_map *enable_map, -+ u64 *ts_start_ns, -+ u64 *ts_end_ns, -+ struct kbase_hwcnt_dump_buffer *dump_buf) -+{ -+ int errcode; -+ struct kbase_hwcnt_virtualizer *hvirt; -+ -+ if (!hvcli || !enable_map || !ts_start_ns || !ts_end_ns) -+ return -EINVAL; ++ if (product != NULL) { ++ /* Found a matching product. */ ++ const u32 version = gpu_id & GPU_ID2_VERSION; ++ u32 fallback_version = 0; ++ const enum base_hw_issue *fallback_issues = NULL; ++ size_t v; + -+ hvirt = hvcli->hvirt; ++ /* Stop when we reach the end of the map. */ ++ for (v = 0; product->map[v].version != U32_MAX; ++v) { + -+ if ((enable_map->metadata != hvirt->metadata) || -+ (dump_buf && (dump_buf->metadata != hvirt->metadata))) -+ return -EINVAL; ++ if (version == product->map[v].version) { ++ /* Exact match so stop. */ ++ issues = product->map[v].issues; ++ break; ++ } + -+ mutex_lock(&hvirt->lock); ++ /* Check whether this is a candidate for most recent ++ * known version not later than the actual version. ++ */ ++ if ((version > product->map[v].version) && ++ (product->map[v].version >= fallback_version)) { ++#if MALI_CUSTOMER_RELEASE ++ /* Match on version's major and minor fields */ ++ if (((version ^ product->map[v].version) >> ++ GPU_ID2_VERSION_MINOR_SHIFT) == 0) ++#endif ++ { ++ fallback_version = product->map[v].version; ++ fallback_issues = product->map[v].issues; ++ } ++ } ++ } + -+ if ((hvirt->client_count == 1) && (!hvcli->has_accum)) { -+ /* -+ * If there's only one client with no prior accumulation, we can -+ * completely skip the virtualize and just pass through the call -+ * to the accumulator, saving a fair few copies and -+ * accumulations. -+ */ -+ errcode = kbase_hwcnt_accumulator_set_counters( -+ hvirt->accum, enable_map, -+ ts_start_ns, ts_end_ns, dump_buf); ++ if ((issues == NULL) && (fallback_issues != NULL)) { ++ /* Fall back to the issue set of the most recent known ++ * version not later than the actual version. ++ */ ++ issues = fallback_issues; + -+ if (!errcode) { -+ /* Update the selected client's enable map */ -+ kbase_hwcnt_enable_map_copy( -+ &hvcli->enable_map, enable_map); ++ dev_notice(kbdev->dev, "r%dp%d status %d not found in HW issues table;\n", ++ (gpu_id & GPU_ID2_VERSION_MAJOR) >> GPU_ID2_VERSION_MAJOR_SHIFT, ++ (gpu_id & GPU_ID2_VERSION_MINOR) >> GPU_ID2_VERSION_MINOR_SHIFT, ++ (gpu_id & GPU_ID2_VERSION_STATUS) >> ++ GPU_ID2_VERSION_STATUS_SHIFT); ++ dev_notice(kbdev->dev, "falling back to closest match: r%dp%d status %d\n", ++ (fallback_version & GPU_ID2_VERSION_MAJOR) >> ++ GPU_ID2_VERSION_MAJOR_SHIFT, ++ (fallback_version & GPU_ID2_VERSION_MINOR) >> ++ GPU_ID2_VERSION_MINOR_SHIFT, ++ (fallback_version & GPU_ID2_VERSION_STATUS) >> ++ GPU_ID2_VERSION_STATUS_SHIFT); ++ dev_notice(kbdev->dev, ++ "Execution proceeding normally with fallback match\n"); + -+ /* Fix up the timestamps */ -+ *ts_start_ns = hvcli->ts_start_ns; -+ hvcli->ts_start_ns = *ts_end_ns; ++ gpu_id &= ~GPU_ID2_VERSION; ++ gpu_id |= fallback_version; ++ kbdev->gpu_props.props.raw_props.gpu_id = gpu_id; + -+ /* Store the most recent dump time for rate limiting */ -+ hvirt->ts_last_dump_ns = *ts_end_ns; ++ kbase_gpuprops_update_core_props_gpu_id( ++ &kbdev->gpu_props.props); + } -+ } else { -+ /* Otherwise, do the full virtualize */ -+ errcode = kbasep_hwcnt_virtualizer_client_set_counters( -+ hvirt, hvcli, enable_map, -+ ts_start_ns, ts_end_ns, dump_buf); + } -+ -+ mutex_unlock(&hvirt->lock); -+ -+ return errcode; ++ return issues; +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_virtualizer_client_set_counters); + -+/** -+ * kbasep_hwcnt_virtualizer_client_dump - Perform a dump of the client's -+ * currently enabled counters. -+ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. -+ * @hvcli: Non-NULL pointer to the virtualizer client. -+ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will -+ * be written out to on success. -+ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will -+ * be written out to on success. -+ * @dump_buf: Pointer to the buffer where the dump will be written out to on -+ * success. If non-NULL, must have the same metadata as the -+ * accumulator. If NULL, the dump will be discarded. -+ * -+ * Return: 0 on success or error code. -+ */ -+static int kbasep_hwcnt_virtualizer_client_dump( -+ struct kbase_hwcnt_virtualizer *hvirt, -+ struct kbase_hwcnt_virtualizer_client *hvcli, -+ u64 *ts_start_ns, -+ u64 *ts_end_ns, -+ struct kbase_hwcnt_dump_buffer *dump_buf) ++int kbase_hw_set_issues_mask(struct kbase_device *kbdev) +{ -+ int errcode; -+ struct kbase_hwcnt_virtualizer_client *pos; -+ -+ WARN_ON(!hvirt); -+ WARN_ON(!hvcli); -+ WARN_ON(!ts_start_ns); -+ WARN_ON(!ts_end_ns); -+ WARN_ON(dump_buf && (dump_buf->metadata != hvirt->metadata)); -+ lockdep_assert_held(&hvirt->lock); -+ -+ /* Perform the dump */ -+ errcode = kbase_hwcnt_accumulator_dump(hvirt->accum, -+ ts_start_ns, ts_end_ns, &hvirt->scratch_buf); -+ if (errcode) -+ return errcode; -+ -+ /* Accumulate into all accumulation bufs except the selected client's */ -+ list_for_each_entry(pos, &hvirt->clients, node) -+ if (pos != hvcli) -+ kbasep_hwcnt_virtualizer_client_accumulate( -+ pos, &hvirt->scratch_buf); ++ const enum base_hw_issue *issues; ++ u32 gpu_id; ++ u32 impl_tech; + -+ /* Finally, write into the dump buf */ -+ if (dump_buf) { -+ const struct kbase_hwcnt_dump_buffer *src = &hvirt->scratch_buf; ++ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++ impl_tech = kbdev->gpu_props.props.thread_props.impl_tech; + -+ if (hvcli->has_accum) { -+ kbase_hwcnt_dump_buffer_accumulate( -+ &hvcli->accum_buf, src, &hvcli->enable_map); -+ src = &hvcli->accum_buf; ++ if (impl_tech != IMPLEMENTATION_MODEL) { ++ issues = kbase_hw_get_issues_for_new_id(kbdev); ++ if (issues == NULL) { ++ dev_err(kbdev->dev, ++ "HW product - Unknown GPU ID %x", gpu_id); ++ return -EINVAL; + } -+ kbase_hwcnt_dump_buffer_copy(dump_buf, src, &hvcli->enable_map); -+ } -+ hvcli->has_accum = false; -+ -+ /* Fix up the timestamps */ -+ *ts_start_ns = hvcli->ts_start_ns; -+ hvcli->ts_start_ns = *ts_end_ns; -+ -+ /* Store the most recent dump time for rate limiting */ -+ hvirt->ts_last_dump_ns = *ts_end_ns; -+ -+ return errcode; -+} -+ -+/** -+ * kbasep_hwcnt_virtualizer_client_dump_rate_limited - Perform a dump of the -+ * client's currently enabled counters -+ * if it hasn't been rate limited, -+ * otherwise return the client's most -+ * recent accumulation. -+ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. -+ * @hvcli: Non-NULL pointer to the virtualizer client. -+ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will -+ * be written out to on success. -+ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will -+ * be written out to on success. -+ * @dump_buf: Pointer to the buffer where the dump will be written out to on -+ * success. If non-NULL, must have the same metadata as the -+ * accumulator. If NULL, the dump will be discarded. -+ * -+ * Return: 0 on success or error code. -+ */ -+static int kbasep_hwcnt_virtualizer_client_dump_rate_limited( -+ struct kbase_hwcnt_virtualizer *hvirt, -+ struct kbase_hwcnt_virtualizer_client *hvcli, -+ u64 *ts_start_ns, -+ u64 *ts_end_ns, -+ struct kbase_hwcnt_dump_buffer *dump_buf) -+{ -+ bool rate_limited = true; -+ -+ WARN_ON(!hvirt); -+ WARN_ON(!hvcli); -+ WARN_ON(!ts_start_ns); -+ WARN_ON(!ts_end_ns); -+ WARN_ON(dump_buf && (dump_buf->metadata != hvirt->metadata)); -+ lockdep_assert_held(&hvirt->lock); + -+ if (hvirt->dump_threshold_ns == 0) { -+ /* Threshold == 0, so rate limiting disabled */ -+ rate_limited = false; -+ } else if (hvirt->ts_last_dump_ns == hvcli->ts_start_ns) { -+ /* Last dump was performed by this client, and dumps from an -+ * individual client are never rate limited ++#if !MALI_CUSTOMER_RELEASE ++ /* The GPU ID might have been replaced with the last ++ * known version of the same GPU. + */ -+ rate_limited = false; ++ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++#endif + } else { -+ const u64 ts_ns = -+ kbase_hwcnt_accumulator_timestamp_ns(hvirt->accum); -+ const u64 time_since_last_dump_ns = -+ ts_ns - hvirt->ts_last_dump_ns; -+ -+ /* Dump period equals or exceeds the threshold */ -+ if (time_since_last_dump_ns >= hvirt->dump_threshold_ns) -+ rate_limited = false; -+ } -+ -+ if (!rate_limited) -+ return kbasep_hwcnt_virtualizer_client_dump( -+ hvirt, hvcli, ts_start_ns, ts_end_ns, dump_buf); -+ -+ /* If we've gotten this far, the client must have something accumulated -+ * otherwise it is a logic error -+ */ -+ WARN_ON(!hvcli->has_accum); -+ -+ if (dump_buf) -+ kbase_hwcnt_dump_buffer_copy( -+ dump_buf, &hvcli->accum_buf, &hvcli->enable_map); -+ hvcli->has_accum = false; -+ -+ *ts_start_ns = hvcli->ts_start_ns; -+ *ts_end_ns = hvirt->ts_last_dump_ns; -+ hvcli->ts_start_ns = hvirt->ts_last_dump_ns; -+ -+ return 0; -+} -+ -+int kbase_hwcnt_virtualizer_client_dump( -+ struct kbase_hwcnt_virtualizer_client *hvcli, -+ u64 *ts_start_ns, -+ u64 *ts_end_ns, -+ struct kbase_hwcnt_dump_buffer *dump_buf) -+{ -+ int errcode; -+ struct kbase_hwcnt_virtualizer *hvirt; -+ -+ if (!hvcli || !ts_start_ns || !ts_end_ns) -+ return -EINVAL; -+ -+ hvirt = hvcli->hvirt; -+ -+ if (dump_buf && (dump_buf->metadata != hvirt->metadata)) -+ return -EINVAL; -+ -+ mutex_lock(&hvirt->lock); -+ -+ if ((hvirt->client_count == 1) && (!hvcli->has_accum)) { -+ /* -+ * If there's only one client with no prior accumulation, we can -+ * completely skip the virtualize and just pass through the call -+ * to the accumulator, saving a fair few copies and -+ * accumulations. -+ */ -+ errcode = kbase_hwcnt_accumulator_dump( -+ hvirt->accum, ts_start_ns, ts_end_ns, dump_buf); -+ -+ if (!errcode) { -+ /* Fix up the timestamps */ -+ *ts_start_ns = hvcli->ts_start_ns; -+ hvcli->ts_start_ns = *ts_end_ns; -+ -+ /* Store the most recent dump time for rate limiting */ -+ hvirt->ts_last_dump_ns = *ts_end_ns; ++ /* Software model */ ++ switch (gpu_id & GPU_ID2_PRODUCT_MODEL) { ++ case GPU_ID2_PRODUCT_TMIX: ++ issues = base_hw_issues_model_tMIx; ++ break; ++ case GPU_ID2_PRODUCT_THEX: ++ issues = base_hw_issues_model_tHEx; ++ break; ++ case GPU_ID2_PRODUCT_TSIX: ++ issues = base_hw_issues_model_tSIx; ++ break; ++ case GPU_ID2_PRODUCT_TDVX: ++ issues = base_hw_issues_model_tDVx; ++ break; ++ case GPU_ID2_PRODUCT_TNOX: ++ issues = base_hw_issues_model_tNOx; ++ break; ++ case GPU_ID2_PRODUCT_TGOX: ++ issues = base_hw_issues_model_tGOx; ++ break; ++ case GPU_ID2_PRODUCT_TTRX: ++ issues = base_hw_issues_model_tTRx; ++ break; ++ case GPU_ID2_PRODUCT_TNAX: ++ issues = base_hw_issues_model_tNAx; ++ break; ++ case GPU_ID2_PRODUCT_LBEX: ++ case GPU_ID2_PRODUCT_TBEX: ++ issues = base_hw_issues_model_tBEx; ++ break; ++ case GPU_ID2_PRODUCT_TBAX: ++ issues = base_hw_issues_model_tBAx; ++ break; ++ case GPU_ID2_PRODUCT_TODX: ++ case GPU_ID2_PRODUCT_LODX: ++ issues = base_hw_issues_model_tODx; ++ break; ++ case GPU_ID2_PRODUCT_TGRX: ++ issues = base_hw_issues_model_tGRx; ++ break; ++ case GPU_ID2_PRODUCT_TVAX: ++ issues = base_hw_issues_model_tVAx; ++ break; ++ case GPU_ID2_PRODUCT_TTUX: ++ case GPU_ID2_PRODUCT_LTUX: ++ issues = base_hw_issues_model_tTUx; ++ break; ++ case GPU_ID2_PRODUCT_TTIX: ++ case GPU_ID2_PRODUCT_LTIX: ++ issues = base_hw_issues_model_tTIx; ++ break; ++ default: ++ dev_err(kbdev->dev, ++ "HW issues - Unknown GPU ID %x", gpu_id); ++ return -EINVAL; + } -+ } else { -+ /* Otherwise, do the full virtualize */ -+ errcode = kbasep_hwcnt_virtualizer_client_dump_rate_limited( -+ hvirt, hvcli, ts_start_ns, ts_end_ns, dump_buf); -+ } -+ -+ mutex_unlock(&hvirt->lock); -+ -+ return errcode; -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_virtualizer_client_dump); -+ -+int kbase_hwcnt_virtualizer_client_create( -+ struct kbase_hwcnt_virtualizer *hvirt, -+ const struct kbase_hwcnt_enable_map *enable_map, -+ struct kbase_hwcnt_virtualizer_client **out_hvcli) -+{ -+ int errcode; -+ struct kbase_hwcnt_virtualizer_client *hvcli; -+ -+ if (!hvirt || !enable_map || !out_hvcli || -+ (enable_map->metadata != hvirt->metadata)) -+ return -EINVAL; -+ -+ errcode = kbasep_hwcnt_virtualizer_client_alloc( -+ hvirt->metadata, &hvcli); -+ if (errcode) -+ return errcode; -+ -+ mutex_lock(&hvirt->lock); -+ -+ errcode = kbasep_hwcnt_virtualizer_client_add(hvirt, hvcli, enable_map); -+ -+ mutex_unlock(&hvirt->lock); -+ -+ if (errcode) { -+ kbasep_hwcnt_virtualizer_client_free(hvcli); -+ return errcode; + } + -+ *out_hvcli = hvcli; -+ return 0; -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_virtualizer_client_create); -+ -+void kbase_hwcnt_virtualizer_client_destroy( -+ struct kbase_hwcnt_virtualizer_client *hvcli) -+{ -+ if (!hvcli) -+ return; -+ -+ mutex_lock(&hvcli->hvirt->lock); -+ -+ kbasep_hwcnt_virtualizer_client_remove(hvcli->hvirt, hvcli); -+ -+ mutex_unlock(&hvcli->hvirt->lock); -+ -+ kbasep_hwcnt_virtualizer_client_free(hvcli); -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_virtualizer_client_destroy); -+ -+int kbase_hwcnt_virtualizer_init( -+ struct kbase_hwcnt_context *hctx, -+ u64 dump_threshold_ns, -+ struct kbase_hwcnt_virtualizer **out_hvirt) -+{ -+ struct kbase_hwcnt_virtualizer *virt; -+ const struct kbase_hwcnt_metadata *metadata; -+ -+ if (!hctx || !out_hvirt) -+ return -EINVAL; -+ -+ metadata = kbase_hwcnt_context_metadata(hctx); -+ if (!metadata) -+ return -EINVAL; -+ -+ virt = kzalloc(sizeof(*virt), GFP_KERNEL); -+ if (!virt) -+ return -ENOMEM; -+ -+ virt->hctx = hctx; -+ virt->dump_threshold_ns = dump_threshold_ns; -+ virt->metadata = metadata; ++ dev_info(kbdev->dev, ++ "GPU identified as 0x%x arch %d.%d.%d r%dp%d status %d", ++ (gpu_id & GPU_ID2_PRODUCT_MAJOR) >> ++ GPU_ID2_PRODUCT_MAJOR_SHIFT, ++ (gpu_id & GPU_ID2_ARCH_MAJOR) >> ++ GPU_ID2_ARCH_MAJOR_SHIFT, ++ (gpu_id & GPU_ID2_ARCH_MINOR) >> ++ GPU_ID2_ARCH_MINOR_SHIFT, ++ (gpu_id & GPU_ID2_ARCH_REV) >> ++ GPU_ID2_ARCH_REV_SHIFT, ++ (gpu_id & GPU_ID2_VERSION_MAJOR) >> ++ GPU_ID2_VERSION_MAJOR_SHIFT, ++ (gpu_id & GPU_ID2_VERSION_MINOR) >> ++ GPU_ID2_VERSION_MINOR_SHIFT, ++ (gpu_id & GPU_ID2_VERSION_STATUS) >> ++ GPU_ID2_VERSION_STATUS_SHIFT); + -+ mutex_init(&virt->lock); -+ INIT_LIST_HEAD(&virt->clients); ++ for (; *issues != BASE_HW_ISSUE_END; issues++) ++ set_bit(*issues, &kbdev->hw_issues_mask[0]); + -+ *out_hvirt = virt; + return 0; +} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_virtualizer_init); -+ -+void kbase_hwcnt_virtualizer_term( -+ struct kbase_hwcnt_virtualizer *hvirt) -+{ -+ if (!hvirt) -+ return; -+ -+ /* Non-zero client count implies client leak */ -+ if (WARN_ON(hvirt->client_count != 0)) { -+ struct kbase_hwcnt_virtualizer_client *pos, *n; -+ -+ list_for_each_entry_safe(pos, n, &hvirt->clients, node) -+ kbase_hwcnt_virtualizer_client_destroy(pos); -+ } -+ -+ WARN_ON(hvirt->client_count != 0); -+ WARN_ON(hvirt->accum); -+ -+ kfree(hvirt); -+} -+KBASE_EXPORT_TEST_API(kbase_hwcnt_virtualizer_term); -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_virtualizer.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_virtualizer.h +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hw.h b/drivers/gpu/arm/bifrost/mali_kbase_hw.h new file mode 100755 -index 000000000000..8f628c3306fc +index 000000000..ddcddaaa4 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_virtualizer.h -@@ -0,0 +1,145 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.h +@@ -0,0 +1,71 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2017, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -212877,147 +244956,122 @@ index 000000000000..8f628c3306fc + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** -+ * Hardware counter virtualizer API. -+ * -+ * Virtualizes a hardware counter context, so multiple clients can access -+ * a single hardware counter resource as though each was the exclusive user. ++ * DOC: Run-time work-arounds helpers + */ + -+#ifndef _KBASE_HWCNT_VIRTUALIZER_H_ -+#define _KBASE_HWCNT_VIRTUALIZER_H_ -+ -+#include ++#ifndef _KBASE_HW_H_ ++#define _KBASE_HW_H_ + -+struct kbase_hwcnt_context; -+struct kbase_hwcnt_virtualizer; -+struct kbase_hwcnt_virtualizer_client; -+struct kbase_hwcnt_enable_map; -+struct kbase_hwcnt_dump_buffer; ++#include "mali_kbase_defs.h" + +/** -+ * kbase_hwcnt_virtualizer_init - Initialise a hardware counter virtualizer. -+ * @hctx: Non-NULL pointer to the hardware counter context to -+ * virtualize. -+ * @dump_threshold_ns: Minimum threshold period for dumps between different -+ * clients where a new accumulator dump will not be -+ * performed, and instead accumulated values will be used. -+ * If 0, rate limiting will be disabled. -+ * @out_hvirt: Non-NULL pointer to where the pointer to the created -+ * virtualizer will be stored on success. -+ * -+ * Return: 0 on success, else error code. ++ * kbase_hw_has_issue - Tell whether a work-around should be enabled ++ * @kbdev: Device pointer ++ * @issue: issue to be checked + */ -+int kbase_hwcnt_virtualizer_init( -+ struct kbase_hwcnt_context *hctx, -+ u64 dump_threshold_ns, -+ struct kbase_hwcnt_virtualizer **out_hvirt); ++#define kbase_hw_has_issue(kbdev, issue)\ ++ test_bit(issue, &(kbdev)->hw_issues_mask[0]) + +/** -+ * kbase_hwcnt_virtualizer_term - Terminate a hardware counter virtualizer. -+ * @hvirt: Pointer to virtualizer to be terminated. ++ * kbase_hw_has_feature - Tell whether a feature is supported ++ * @kbdev: Device pointer ++ * @feature: feature to be checked + */ -+void kbase_hwcnt_virtualizer_term( -+ struct kbase_hwcnt_virtualizer *hvirt); ++#define kbase_hw_has_feature(kbdev, feature)\ ++ test_bit(feature, &(kbdev)->hw_features_mask[0]) + +/** -+ * kbase_hwcnt_virtualizer_metadata - Get the hardware counter metadata used by -+ * the virtualizer, so related counter data -+ * structures can be created. -+ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. ++ * kbase_hw_set_issues_mask - Set the hardware issues mask based on the GPU ID ++ * @kbdev: Device pointer + * -+ * Return: Non-NULL pointer to metadata, or NULL on error. ++ * Return: 0 if the GPU ID was recognized, otherwise -EINVAL. ++ * ++ * The GPU ID is read from the @kbdev. ++ * ++ * In debugging versions of the driver, unknown versions of a known GPU with a ++ * new-format ID will be treated as the most recent known version not later ++ * than the actual version. In such circumstances, the GPU ID in @kbdev will ++ * also be replaced with the most recent known version. ++ * ++ * Note: The GPU configuration must have been read by ++ * kbase_gpuprops_get_props() before calling this function. + */ -+const struct kbase_hwcnt_metadata *kbase_hwcnt_virtualizer_metadata( -+ struct kbase_hwcnt_virtualizer *hvirt); ++int kbase_hw_set_issues_mask(struct kbase_device *kbdev); + +/** -+ * kbase_hwcnt_virtualizer_client_create - Create a new virtualizer client. -+ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. -+ * @enable_map: Non-NULL pointer to the enable map for the client. Must have the -+ * same metadata as the virtualizer. -+ * @out_hvcli: Non-NULL pointer to where the pointer to the created client will -+ * be stored on success. ++ * kbase_hw_set_features_mask - Set the features mask depending on the GPU ID ++ * @kbdev: Device pointer ++ */ ++void kbase_hw_set_features_mask(struct kbase_device *kbdev); ++ ++#endif /* _KBASE_HW_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h +new file mode 100755 +index 000000000..0da4eb258 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h +@@ -0,0 +1,43 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2014-2015, 2019-2021 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * Return: 0 on success, else error code. + */ -+int kbase_hwcnt_virtualizer_client_create( -+ struct kbase_hwcnt_virtualizer *hvirt, -+ const struct kbase_hwcnt_enable_map *enable_map, -+ struct kbase_hwcnt_virtualizer_client **out_hvcli); + -+/** -+ * kbase_hwcnt_virtualizer_client_destroy() - Destroy a virtualizer client. -+ * @hvcli: Pointer to the hardware counter client. ++/* ++ * HW access backend common APIs + */ -+void kbase_hwcnt_virtualizer_client_destroy( -+ struct kbase_hwcnt_virtualizer_client *hvcli); ++ ++#ifndef _KBASE_HWACCESS_BACKEND_H_ ++#define _KBASE_HWACCESS_BACKEND_H_ + +/** -+ * kbase_hwcnt_virtualizer_client_set_counters - Perform a dump of the client's -+ * currently enabled counters, and -+ * enable a new set of counters -+ * that will be used for -+ * subsequent dumps. -+ * @hvcli: Non-NULL pointer to the virtualizer client. -+ * @enable_map: Non-NULL pointer to the new counter enable map for the client. -+ * Must have the same metadata as the virtualizer. -+ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will -+ * be written out to on success. -+ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will -+ * be written out to on success. -+ * @dump_buf: Pointer to the buffer where the dump will be written out to on -+ * success. If non-NULL, must have the same metadata as the -+ * accumulator. If NULL, the dump will be discarded. ++ * kbase_backend_devfreq_init - Perform backend devfreq related initialization. ++ * @kbdev: Device pointer + * -+ * Return: 0 on success or error code. ++ * Return: 0 on success, or an error code on failure. + */ -+int kbase_hwcnt_virtualizer_client_set_counters( -+ struct kbase_hwcnt_virtualizer_client *hvcli, -+ const struct kbase_hwcnt_enable_map *enable_map, -+ u64 *ts_start_ns, -+ u64 *ts_end_ns, -+ struct kbase_hwcnt_dump_buffer *dump_buf); ++int kbase_backend_devfreq_init(struct kbase_device *kbdev); + +/** -+ * kbase_hwcnt_virtualizer_client_dump - Perform a dump of the client's -+ * currently enabled counters. -+ * @hvcli: Non-NULL pointer to the virtualizer client. -+ * @ts_start_ns: Non-NULL pointer where the start timestamp of the dump will -+ * be written out to on success. -+ * @ts_end_ns: Non-NULL pointer where the end timestamp of the dump will -+ * be written out to on success. -+ * @dump_buf: Pointer to the buffer where the dump will be written out to on -+ * success. If non-NULL, must have the same metadata as the -+ * accumulator. If NULL, the dump will be discarded. -+ * -+ * Return: 0 on success or error code. ++ * kbase_backend_devfreq_term - Perform backend-devfreq termination. ++ * @kbdev: Device pointer + */ -+int kbase_hwcnt_virtualizer_client_dump( -+ struct kbase_hwcnt_virtualizer_client *hvcli, -+ u64 *ts_start_ns, -+ u64 *ts_end_ns, -+ struct kbase_hwcnt_dump_buffer *dump_buf); ++void kbase_backend_devfreq_term(struct kbase_device *kbdev); + -+#endif /* _KBASE_HWCNT_VIRTUALIZER_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ioctl.h b/drivers/gpu/arm/bifrost/mali_kbase_ioctl.h ++#endif /* _KBASE_HWACCESS_BACKEND_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h new file mode 100755 -index 000000000000..fed45100b4be +index 000000000..62a6ec51b --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_ioctl.h -@@ -0,0 +1,838 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h +@@ -0,0 +1,50 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2017-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2016-2018, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -213028,840 +245082,1013 @@ index 000000000000..fed45100b4be + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#ifndef _KBASE_IOCTL_H_ -+#define _KBASE_IOCTL_H_ -+ -+#ifdef __cpluscplus -+extern "C" { -+#endif -+ -+#include -+#include ++/** ++ * DOC: HW access common definitions ++ */ + -+#if MALI_USE_CSF -+#include "csf/mali_kbase_csf_ioctl.h" -+#else -+#include "jm/mali_kbase_jm_ioctl.h" -+#endif /* MALI_USE_CSF */ ++#ifndef _KBASE_HWACCESS_DEFS_H_ ++#define _KBASE_HWACCESS_DEFS_H_ + -+#define KBASE_IOCTL_TYPE 0x80 ++#include + +/** -+ * struct kbase_ioctl_set_flags - Set kernel context creation flags -+ * -+ * @create_flags: Flags - see base_context_create_flags ++ * struct kbase_hwaccess_data - object encapsulating the GPU backend specific ++ * data for the HW access layer. ++ * hwaccess_lock (a spinlock) must be held when ++ * accessing this structure. ++ * @active_kctx: pointer to active kbase context which last submitted an ++ * atom to GPU and while the context is active it can ++ * submit new atoms to GPU from the irq context also, without ++ * going through the bottom half of job completion path. ++ * @backend: GPU backend specific data for HW access layer + */ -+struct kbase_ioctl_set_flags { -+ __u32 create_flags; -+}; ++struct kbase_hwaccess_data { ++#if !MALI_USE_CSF ++ struct kbase_context *active_kctx[BASE_JM_MAX_NR_SLOTS]; ++#endif + -+#define KBASE_IOCTL_SET_FLAGS \ -+ _IOW(KBASE_IOCTL_TYPE, 1, struct kbase_ioctl_set_flags) ++ struct kbase_backend_data backend; ++}; + -+/** -+ * struct kbase_ioctl_get_gpuprops - Read GPU properties from the kernel ++#endif /* _KBASE_HWACCESS_DEFS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h +new file mode 100755 +index 000000000..f537b7f0a +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h +@@ -0,0 +1,88 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* + * -+ * @buffer: Pointer to the buffer to store properties into -+ * @size: Size of the buffer -+ * @flags: Flags - must be zero for now ++ * (C) COPYRIGHT 2014-2015, 2017-2022 ARM Limited. All rights reserved. + * -+ * The ioctl will return the number of bytes stored into @buffer or an error -+ * on failure (e.g. @size is too small). If @size is specified as 0 then no -+ * data will be written but the return value will be the number of bytes needed -+ * for all the properties. ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. + * -+ * @flags may be used in the future to request a different format for the -+ * buffer. With @flags == 0 the following format is used. ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. + * -+ * The buffer will be filled with pairs of values, a u32 key identifying the -+ * property followed by the value. The size of the value is identified using -+ * the bottom bits of the key. The value then immediately followed the key and -+ * is tightly packed (there is no padding). All keys and values are -+ * little-endian. ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * 00 = u8 -+ * 01 = u16 -+ * 10 = u32 -+ * 11 = u64 + */ -+struct kbase_ioctl_get_gpuprops { -+ __u64 buffer; -+ __u32 size; -+ __u32 flags; -+}; + -+#define KBASE_IOCTL_GET_GPUPROPS \ -+ _IOW(KBASE_IOCTL_TYPE, 3, struct kbase_ioctl_get_gpuprops) ++/** ++ * DOC: Base kernel property query backend APIs ++ */ ++ ++#ifndef _KBASE_HWACCESS_GPUPROPS_H_ ++#define _KBASE_HWACCESS_GPUPROPS_H_ + +/** -+ * union kbase_ioctl_mem_alloc - Allocate memory on the GPU ++ * kbase_backend_gpuprops_get() - Fill @regdump with GPU properties read from ++ * GPU ++ * @kbdev: Device pointer ++ * @regdump: Pointer to struct kbase_gpuprops_regdump structure + * -+ * @va_pages: The number of pages of virtual address space to reserve -+ * @commit_pages: The number of physical pages to allocate -+ * @extent: The number of extra pages to allocate on each GPU fault which grows -+ * the region -+ * @flags: Flags -+ * @gpu_va: The GPU virtual address which is allocated ++ * The caller should ensure that GPU remains powered-on during this function. + * -+ * @in: Input parameters -+ * @out: Output parameters ++ * Return: Zero for succeess or a Linux error code + */ -+union kbase_ioctl_mem_alloc { -+ struct { -+ __u64 va_pages; -+ __u64 commit_pages; -+ __u64 extent; -+ __u64 flags; -+ } in; -+ struct { -+ __u64 flags; -+ __u64 gpu_va; -+ } out; -+}; -+ -+#define KBASE_IOCTL_MEM_ALLOC \ -+ _IOWR(KBASE_IOCTL_TYPE, 5, union kbase_ioctl_mem_alloc) ++int kbase_backend_gpuprops_get(struct kbase_device *kbdev, ++ struct kbase_gpuprops_regdump *regdump); + +/** -+ * struct kbase_ioctl_mem_query - Query properties of a GPU memory region -+ * @gpu_addr: A GPU address contained within the region -+ * @query: The type of query -+ * @value: The result of the query ++ * kbase_backend_gpuprops_get_curr_config() - Fill @curr_config_regdump with ++ * relevant GPU properties read from ++ * the GPU registers. ++ * @kbdev: Device pointer. ++ * @curr_config_regdump: Pointer to struct kbase_current_config_regdump ++ * structure. + * -+ * Use a %KBASE_MEM_QUERY_xxx flag as input for @query. ++ * The caller should ensure that GPU remains powered-on during this function and ++ * the caller must ensure this function returns success before using the values ++ * returned in the curr_config_regdump in any part of the kernel. + * -+ * @in: Input parameters -+ * @out: Output parameters ++ * Return: Zero for succeess or a Linux error code + */ -+union kbase_ioctl_mem_query { -+ struct { -+ __u64 gpu_addr; -+ __u64 query; -+ } in; -+ struct { -+ __u64 value; -+ } out; -+}; -+ -+#define KBASE_IOCTL_MEM_QUERY \ -+ _IOWR(KBASE_IOCTL_TYPE, 6, union kbase_ioctl_mem_query) -+ -+#define KBASE_MEM_QUERY_COMMIT_SIZE ((u64)1) -+#define KBASE_MEM_QUERY_VA_SIZE ((u64)2) -+#define KBASE_MEM_QUERY_FLAGS ((u64)3) ++int kbase_backend_gpuprops_get_curr_config(struct kbase_device *kbdev, ++ struct kbase_current_config_regdump *curr_config_regdump); + +/** -+ * struct kbase_ioctl_mem_free - Free a memory region -+ * @gpu_addr: Handle to the region to free ++ * kbase_backend_gpuprops_get_features - Fill @regdump with GPU properties read ++ * from GPU ++ * @kbdev: Device pointer ++ * @regdump: Pointer to struct kbase_gpuprops_regdump structure ++ * ++ * This function reads GPU properties that are dependent on the hardware ++ * features bitmask. It will power-on the GPU if required. ++ * ++ * Return: Zero for succeess or a Linux error code + */ -+struct kbase_ioctl_mem_free { -+ __u64 gpu_addr; -+}; -+ -+#define KBASE_IOCTL_MEM_FREE \ -+ _IOW(KBASE_IOCTL_TYPE, 7, struct kbase_ioctl_mem_free) ++int kbase_backend_gpuprops_get_features(struct kbase_device *kbdev, ++ struct kbase_gpuprops_regdump *regdump); + +/** -+ * struct kbase_ioctl_hwcnt_reader_setup - Setup HWC dumper/reader -+ * @buffer_count: requested number of dumping buffers -+ * @fe_bm: counters selection bitmask (Front end) -+ * @shader_bm: counters selection bitmask (Shader) -+ * @tiler_bm: counters selection bitmask (Tiler) -+ * @mmu_l2_bm: counters selection bitmask (MMU_L2) ++ * kbase_backend_gpuprops_get_l2_features - Fill @regdump with L2_FEATURES read ++ * from GPU ++ * @kbdev: Device pointer ++ * @regdump: Pointer to struct kbase_gpuprops_regdump structure + * -+ * A fd is returned from the ioctl if successful, or a negative value on error ++ * This function reads L2_FEATURES register that is dependent on the hardware ++ * features bitmask. It will power-on the GPU if required. ++ * ++ * Return: Zero on success, Linux error code on failure + */ -+struct kbase_ioctl_hwcnt_reader_setup { -+ __u32 buffer_count; -+ __u32 fe_bm; -+ __u32 shader_bm; -+ __u32 tiler_bm; -+ __u32 mmu_l2_bm; -+}; ++int kbase_backend_gpuprops_get_l2_features(struct kbase_device *kbdev, ++ struct kbase_gpuprops_regdump *regdump); + -+#define KBASE_IOCTL_HWCNT_READER_SETUP \ -+ _IOW(KBASE_IOCTL_TYPE, 8, struct kbase_ioctl_hwcnt_reader_setup) + -+/** -+ * struct kbase_ioctl_hwcnt_enable - Enable hardware counter collection -+ * @dump_buffer: GPU address to write counters to -+ * @fe_bm: counters selection bitmask (Front end) -+ * @shader_bm: counters selection bitmask (Shader) -+ * @tiler_bm: counters selection bitmask (Tiler) -+ * @mmu_l2_bm: counters selection bitmask (MMU_L2) ++#endif /* _KBASE_HWACCESS_GPUPROPS_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h +new file mode 100755 +index 000000000..37663101a +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h +@@ -0,0 +1,170 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2014-2015, 2017-2018, 2020-2021 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * + */ -+struct kbase_ioctl_hwcnt_enable { -+ __u64 dump_buffer; -+ __u32 fe_bm; -+ __u32 shader_bm; -+ __u32 tiler_bm; -+ __u32 mmu_l2_bm; -+}; + -+#define KBASE_IOCTL_HWCNT_ENABLE \ -+ _IOW(KBASE_IOCTL_TYPE, 9, struct kbase_ioctl_hwcnt_enable) ++/* ++ * HW Access instrumentation common APIs ++ */ + -+#define KBASE_IOCTL_HWCNT_DUMP \ -+ _IO(KBASE_IOCTL_TYPE, 10) ++#ifndef _KBASE_HWACCESS_INSTR_H_ ++#define _KBASE_HWACCESS_INSTR_H_ + -+#define KBASE_IOCTL_HWCNT_CLEAR \ -+ _IO(KBASE_IOCTL_TYPE, 11) ++#include + +/** -+ * struct kbase_ioctl_hwcnt_values - Values to set dummy the dummy counters to. -+ * @data: Counter samples for the dummy model. -+ * @size: Size of the counter sample data. -+ * @padding: Padding. ++ * struct kbase_instr_hwcnt_enable - Enable hardware counter collection. ++ * @dump_buffer: GPU address to write counters to. ++ * @dump_buffer_bytes: Size in bytes of the buffer pointed to by dump_buffer. ++ * @fe_bm: counters selection bitmask (Front End). ++ * @shader_bm: counters selection bitmask (Shader). ++ * @tiler_bm: counters selection bitmask (Tiler). ++ * @mmu_l2_bm: counters selection bitmask (MMU_L2). ++ * @counter_set: the performance counter set to use. + */ -+struct kbase_ioctl_hwcnt_values { -+ __u64 data; -+ __u32 size; -+ __u32 padding; ++struct kbase_instr_hwcnt_enable { ++ u64 dump_buffer; ++ u64 dump_buffer_bytes; ++ u32 fe_bm; ++ u32 shader_bm; ++ u32 tiler_bm; ++ u32 mmu_l2_bm; ++ u8 counter_set; +}; + -+#define KBASE_IOCTL_HWCNT_SET \ -+ _IOW(KBASE_IOCTL_TYPE, 32, struct kbase_ioctl_hwcnt_values) -+ +/** -+ * struct kbase_ioctl_disjoint_query - Query the disjoint counter -+ * @counter: A counter of disjoint events in the kernel -+ */ -+struct kbase_ioctl_disjoint_query { -+ __u32 counter; -+}; -+ -+#define KBASE_IOCTL_DISJOINT_QUERY \ -+ _IOR(KBASE_IOCTL_TYPE, 12, struct kbase_ioctl_disjoint_query) ++ * kbase_instr_hwcnt_enable_internal() - Enable HW counters collection ++ * @kbdev: Kbase device ++ * @kctx: Kbase context ++ * @enable: HW counter setup parameters ++ * ++ * Context: might sleep, waiting for reset to complete ++ * ++ * Return: 0 on success ++ */ ++int kbase_instr_hwcnt_enable_internal(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ struct kbase_instr_hwcnt_enable *enable); + +/** -+ * struct kbase_ioctl_get_ddk_version - Query the kernel version -+ * @version_buffer: Buffer to receive the kernel version string -+ * @size: Size of the buffer -+ * @padding: Padding ++ * kbase_instr_hwcnt_disable_internal() - Disable HW counters collection ++ * @kctx: Kbase context + * -+ * The ioctl will return the number of bytes written into version_buffer -+ * (which includes a NULL byte) or a negative error code ++ * Context: might sleep, waiting for an ongoing dump to complete + * -+ * The ioctl request code has to be _IOW because the data in ioctl struct is -+ * being copied to the kernel, even though the kernel then writes out the -+ * version info to the buffer specified in the ioctl. ++ * Return: 0 on success + */ -+struct kbase_ioctl_get_ddk_version { -+ __u64 version_buffer; -+ __u32 size; -+ __u32 padding; -+}; ++int kbase_instr_hwcnt_disable_internal(struct kbase_context *kctx); + -+#define KBASE_IOCTL_GET_DDK_VERSION \ -+ _IOW(KBASE_IOCTL_TYPE, 13, struct kbase_ioctl_get_ddk_version) ++/** ++ * kbase_instr_hwcnt_request_dump() - Request HW counter dump from GPU ++ * @kctx: Kbase context ++ * ++ * Caller must either wait for kbase_instr_hwcnt_dump_complete() to return true, ++ * of call kbase_instr_hwcnt_wait_for_dump(). ++ * ++ * Return: 0 on success ++ */ ++int kbase_instr_hwcnt_request_dump(struct kbase_context *kctx); + +/** -+ * struct kbase_ioctl_mem_jit_init_10_2 - Initialize the just-in-time memory -+ * allocator (between kernel driver -+ * version 10.2--11.4) -+ * @va_pages: Number of VA pages to reserve for JIT ++ * kbase_instr_hwcnt_wait_for_dump() - Wait until pending HW counter dump has ++ * completed. ++ * @kctx: Kbase context + * -+ * Note that depending on the VA size of the application and GPU, the value -+ * specified in @va_pages may be ignored. ++ * Context: will sleep, waiting for dump to complete + * -+ * New code should use KBASE_IOCTL_MEM_JIT_INIT instead, this is kept for -+ * backwards compatibility. ++ * Return: 0 on success + */ -+struct kbase_ioctl_mem_jit_init_10_2 { -+ __u64 va_pages; -+}; ++int kbase_instr_hwcnt_wait_for_dump(struct kbase_context *kctx); + -+#define KBASE_IOCTL_MEM_JIT_INIT_10_2 \ -+ _IOW(KBASE_IOCTL_TYPE, 14, struct kbase_ioctl_mem_jit_init_10_2) ++/** ++ * kbase_instr_hwcnt_dump_complete - Tell whether the HW counters dump has ++ * completed ++ * @kctx: Kbase context ++ * @success: Set to true if successful ++ * ++ * Context: does not sleep. ++ * ++ * Return: true if the dump is complete ++ */ ++bool kbase_instr_hwcnt_dump_complete(struct kbase_context *kctx, ++ bool * const success); + +/** -+ * struct kbase_ioctl_mem_jit_init_11_5 - Initialize the just-in-time memory -+ * allocator (between kernel driver -+ * version 11.5--11.19) -+ * @va_pages: Number of VA pages to reserve for JIT -+ * @max_allocations: Maximum number of concurrent allocations -+ * @trim_level: Level of JIT allocation trimming to perform on free (0 - 100%) -+ * @group_id: Group ID to be used for physical allocations -+ * @padding: Currently unused, must be zero ++ * kbase_instr_hwcnt_clear() - Clear HW counters ++ * @kctx: Kbase context + * -+ * Note that depending on the VA size of the application and GPU, the value -+ * specified in @va_pages may be ignored. ++ * Context: might sleep, waiting for reset to complete + * -+ * New code should use KBASE_IOCTL_MEM_JIT_INIT instead, this is kept for -+ * backwards compatibility. ++ * Return: 0 on success + */ -+struct kbase_ioctl_mem_jit_init_11_5 { -+ __u64 va_pages; -+ __u8 max_allocations; -+ __u8 trim_level; -+ __u8 group_id; -+ __u8 padding[5]; -+}; ++int kbase_instr_hwcnt_clear(struct kbase_context *kctx); + -+#define KBASE_IOCTL_MEM_JIT_INIT_11_5 \ -+ _IOW(KBASE_IOCTL_TYPE, 14, struct kbase_ioctl_mem_jit_init_11_5) ++/** ++ * kbase_instr_backend_init() - Initialise the instrumentation backend ++ * @kbdev: Kbase device ++ * ++ * This function should be called during driver initialization. ++ * ++ * Return: 0 on success ++ */ ++int kbase_instr_backend_init(struct kbase_device *kbdev); + +/** -+ * struct kbase_ioctl_mem_jit_init - Initialize the just-in-time memory -+ * allocator -+ * @va_pages: Number of GPU virtual address pages to reserve for just-in-time -+ * memory allocations -+ * @max_allocations: Maximum number of concurrent allocations -+ * @trim_level: Level of JIT allocation trimming to perform on free (0 - 100%) -+ * @group_id: Group ID to be used for physical allocations -+ * @padding: Currently unused, must be zero -+ * @phys_pages: Maximum number of physical pages to allocate just-in-time ++ * kbase_instr_backend_term() - Terminate the instrumentation backend ++ * @kbdev: Kbase device + * -+ * Note that depending on the VA size of the application and GPU, the value -+ * specified in @va_pages may be ignored. ++ * This function should be called during driver termination. + */ -+struct kbase_ioctl_mem_jit_init { -+ __u64 va_pages; -+ __u8 max_allocations; -+ __u8 trim_level; -+ __u8 group_id; -+ __u8 padding[5]; -+ __u64 phys_pages; -+}; ++void kbase_instr_backend_term(struct kbase_device *kbdev); + -+#define KBASE_IOCTL_MEM_JIT_INIT \ -+ _IOW(KBASE_IOCTL_TYPE, 14, struct kbase_ioctl_mem_jit_init) ++#ifdef CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS ++/** ++ * kbase_instr_backend_debugfs_init() - Add a debugfs entry for the ++ * hardware counter set. ++ * @kbdev: kbase device ++ */ ++void kbase_instr_backend_debugfs_init(struct kbase_device *kbdev); ++#endif + +/** -+ * struct kbase_ioctl_mem_sync - Perform cache maintenance on memory ++ * kbase_instr_hwcnt_on_unrecoverable_error() - JM HWC instr backend function ++ * called when unrecoverable errors ++ * are detected. ++ * @kbdev: Kbase device + * -+ * @handle: GPU memory handle (GPU VA) -+ * @user_addr: The address where it is mapped in user space -+ * @size: The number of bytes to synchronise -+ * @type: The direction to synchronise: 0 is sync to memory (clean), -+ * 1 is sync from memory (invalidate). Use the BASE_SYNCSET_OP_xxx constants. -+ * @padding: Padding to round up to a multiple of 8 bytes, must be zero ++ * This should be called on encountering errors that can only be recovered from ++ * with reset, or that may put HWC logic in state that could result in hang. For ++ * example, when HW becomes unresponsive. ++ * ++ * Caller requires kbdev->hwaccess_lock held. + */ -+struct kbase_ioctl_mem_sync { -+ __u64 handle; -+ __u64 user_addr; -+ __u64 size; -+ __u8 type; -+ __u8 padding[7]; -+}; -+ -+#define KBASE_IOCTL_MEM_SYNC \ -+ _IOW(KBASE_IOCTL_TYPE, 15, struct kbase_ioctl_mem_sync) ++void kbase_instr_hwcnt_on_unrecoverable_error(struct kbase_device *kbdev); + +/** -+ * union kbase_ioctl_mem_find_cpu_offset - Find the offset of a CPU pointer ++ * kbase_instr_hwcnt_on_before_reset() - JM HWC instr backend function to be ++ * called immediately before a reset. ++ * Takes us out of the unrecoverable ++ * error state, if we were in it. ++ * @kbdev: Kbase device ++ */ ++void kbase_instr_hwcnt_on_before_reset(struct kbase_device *kbdev); ++ ++#endif /* _KBASE_HWACCESS_INSTR_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h +new file mode 100755 +index 000000000..ca77c192d +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h +@@ -0,0 +1,318 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* + * -+ * @gpu_addr: The GPU address of the memory region -+ * @cpu_addr: The CPU address to locate -+ * @size: A size in bytes to validate is contained within the region -+ * @offset: The offset from the start of the memory region to @cpu_addr ++ * (C) COPYRIGHT 2014-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * @in: Input parameters -+ * @out: Output parameters + */ -+union kbase_ioctl_mem_find_cpu_offset { -+ struct { -+ __u64 gpu_addr; -+ __u64 cpu_addr; -+ __u64 size; -+ } in; -+ struct { -+ __u64 offset; -+ } out; -+}; + -+#define KBASE_IOCTL_MEM_FIND_CPU_OFFSET \ -+ _IOWR(KBASE_IOCTL_TYPE, 16, union kbase_ioctl_mem_find_cpu_offset) ++/* ++ * HW access job manager common APIs ++ */ ++ ++#ifndef _KBASE_HWACCESS_JM_H_ ++#define _KBASE_HWACCESS_JM_H_ + +/** -+ * struct kbase_ioctl_get_context_id - Get the kernel context ID ++ * kbase_backend_run_atom() - Run an atom on the GPU ++ * @kbdev: Device pointer ++ * @katom: Atom to run + * -+ * @id: The kernel context ID ++ * Caller must hold the HW access lock + */ -+struct kbase_ioctl_get_context_id { -+ __u32 id; -+}; -+ -+#define KBASE_IOCTL_GET_CONTEXT_ID \ -+ _IOR(KBASE_IOCTL_TYPE, 17, struct kbase_ioctl_get_context_id) ++void kbase_backend_run_atom(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom); + +/** -+ * struct kbase_ioctl_tlstream_acquire - Acquire a tlstream fd ++ * kbase_backend_slot_update - Update state based on slot ringbuffers + * -+ * @flags: Flags ++ * @kbdev: Device pointer + * -+ * The ioctl returns a file descriptor when successful ++ * Inspect the jobs in the slot ringbuffers and update state. ++ * ++ * This will cause jobs to be submitted to hardware if they are unblocked + */ -+struct kbase_ioctl_tlstream_acquire { -+ __u32 flags; -+}; -+ -+#define KBASE_IOCTL_TLSTREAM_ACQUIRE \ -+ _IOW(KBASE_IOCTL_TYPE, 18, struct kbase_ioctl_tlstream_acquire) -+ -+#define KBASE_IOCTL_TLSTREAM_FLUSH \ -+ _IO(KBASE_IOCTL_TYPE, 19) ++void kbase_backend_slot_update(struct kbase_device *kbdev); + +/** -+ * struct kbase_ioctl_mem_commit - Change the amount of memory backing a region ++ * kbase_backend_find_and_release_free_address_space() - Release a free AS ++ * @kbdev: Device pointer ++ * @kctx: Context pointer + * -+ * @gpu_addr: The memory region to modify -+ * @pages: The number of physical pages that should be present ++ * This function can evict an idle context from the runpool, freeing up the ++ * address space it was using. + * -+ * The ioctl may return on the following error codes or 0 for success: -+ * -ENOMEM: Out of memory -+ * -EINVAL: Invalid arguments ++ * The address space is marked as in use. The caller must either assign a ++ * context using kbase_gpu_use_ctx(), or release it using ++ * kbase_ctx_sched_release() ++ * ++ * Return: Number of free address space, or KBASEP_AS_NR_INVALID if none ++ * available + */ -+struct kbase_ioctl_mem_commit { -+ __u64 gpu_addr; -+ __u64 pages; -+}; -+ -+#define KBASE_IOCTL_MEM_COMMIT \ -+ _IOW(KBASE_IOCTL_TYPE, 20, struct kbase_ioctl_mem_commit) ++int kbase_backend_find_and_release_free_address_space( ++ struct kbase_device *kbdev, struct kbase_context *kctx); + +/** -+ * union kbase_ioctl_mem_alias - Create an alias of memory regions -+ * @flags: Flags, see BASE_MEM_xxx -+ * @stride: Bytes between start of each memory region -+ * @nents: The number of regions to pack together into the alias -+ * @aliasing_info: Pointer to an array of struct base_mem_aliasing_info -+ * @gpu_va: Address of the new alias -+ * @va_pages: Size of the new alias ++ * kbase_backend_use_ctx() - Activate a currently unscheduled context, using the ++ * provided address space. ++ * @kbdev: Device pointer ++ * @kctx: Context pointer. May be NULL ++ * @as_nr: Free address space to use + * -+ * @in: Input parameters -+ * @out: Output parameters ++ * kbase_gpu_next_job() will pull atoms from the active context. ++ * ++ * Return: true if successful, false if ASID not assigned. + */ -+union kbase_ioctl_mem_alias { -+ struct { -+ __u64 flags; -+ __u64 stride; -+ __u64 nents; -+ __u64 aliasing_info; -+ } in; -+ struct { -+ __u64 flags; -+ __u64 gpu_va; -+ __u64 va_pages; -+ } out; -+}; ++bool kbase_backend_use_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ int as_nr); + -+#define KBASE_IOCTL_MEM_ALIAS \ -+ _IOWR(KBASE_IOCTL_TYPE, 21, union kbase_ioctl_mem_alias) ++/** ++ * kbase_backend_use_ctx_sched() - Activate a context. ++ * @kbdev: Device pointer ++ * @kctx: Context pointer ++ * @js: Job slot to activate context on ++ * ++ * kbase_gpu_next_job() will pull atoms from the active context. ++ * ++ * The context must already be scheduled and assigned to an address space. If ++ * the context is not scheduled, then kbase_gpu_use_ctx() should be used ++ * instead. ++ * ++ * Caller must hold hwaccess_lock ++ * ++ * Return: true if context is now active, false otherwise (ie if context does ++ * not have an address space assigned) ++ */ ++bool kbase_backend_use_ctx_sched(struct kbase_device *kbdev, struct kbase_context *kctx, ++ unsigned int js); + +/** -+ * union kbase_ioctl_mem_import - Import memory for use by the GPU -+ * @flags: Flags, see BASE_MEM_xxx -+ * @phandle: Handle to the external memory -+ * @type: Type of external memory, see base_mem_import_type -+ * @padding: Amount of extra VA pages to append to the imported buffer -+ * @gpu_va: Address of the new alias -+ * @va_pages: Size of the new alias ++ * kbase_backend_release_ctx_irq - Release a context from the GPU. This will ++ * de-assign the assigned address space. ++ * @kbdev: Device pointer ++ * @kctx: Context pointer + * -+ * @in: Input parameters -+ * @out: Output parameters ++ * Caller must hold kbase_device->mmu_hw_mutex and hwaccess_lock + */ -+union kbase_ioctl_mem_import { -+ struct { -+ __u64 flags; -+ __u64 phandle; -+ __u32 type; -+ __u32 padding; -+ } in; -+ struct { -+ __u64 flags; -+ __u64 gpu_va; -+ __u64 va_pages; -+ } out; -+}; ++void kbase_backend_release_ctx_irq(struct kbase_device *kbdev, ++ struct kbase_context *kctx); + -+#define KBASE_IOCTL_MEM_IMPORT \ -+ _IOWR(KBASE_IOCTL_TYPE, 22, union kbase_ioctl_mem_import) ++/** ++ * kbase_backend_release_ctx_noirq - Release a context from the GPU. This will ++ * de-assign the assigned address space. ++ * @kbdev: Device pointer ++ * @kctx: Context pointer ++ * ++ * Caller must hold kbase_device->mmu_hw_mutex ++ * ++ * This function must perform any operations that could not be performed in IRQ ++ * context by kbase_backend_release_ctx_irq(). ++ */ ++void kbase_backend_release_ctx_noirq(struct kbase_device *kbdev, ++ struct kbase_context *kctx); + +/** -+ * struct kbase_ioctl_mem_flags_change - Change the flags for a memory region -+ * @gpu_va: The GPU region to modify -+ * @flags: The new flags to set -+ * @mask: Mask of the flags to modify ++ * kbase_backend_cache_clean - Perform a cache clean if the given atom requires ++ * one ++ * @kbdev: Device pointer ++ * @katom: Pointer to the failed atom ++ * ++ * On some GPUs, the GPU cache must be cleaned following a failed atom. This ++ * function performs a clean if it is required by @katom. + */ -+struct kbase_ioctl_mem_flags_change { -+ __u64 gpu_va; -+ __u64 flags; -+ __u64 mask; -+}; ++void kbase_backend_cache_clean(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom); + -+#define KBASE_IOCTL_MEM_FLAGS_CHANGE \ -+ _IOW(KBASE_IOCTL_TYPE, 23, struct kbase_ioctl_mem_flags_change) + +/** -+ * struct kbase_ioctl_stream_create - Create a synchronisation stream -+ * @name: A name to identify this stream. Must be NULL-terminated. -+ * -+ * Note that this is also called a "timeline", but is named stream to avoid -+ * confusion with other uses of the word. ++ * kbase_backend_complete_wq() - Perform backend-specific actions required on ++ * completing an atom. ++ * @kbdev: Device pointer ++ * @katom: Pointer to the atom to complete + * -+ * Unused bytes in @name (after the first NULL byte) must be also be NULL bytes. ++ * This function should only be called from kbase_jd_done_worker() or ++ * js_return_worker(). + * -+ * The ioctl returns a file descriptor. ++ * Return: true if atom has completed, false if atom should be re-submitted + */ -+struct kbase_ioctl_stream_create { -+ char name[32]; -+}; ++void kbase_backend_complete_wq(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom); + -+#define KBASE_IOCTL_STREAM_CREATE \ -+ _IOW(KBASE_IOCTL_TYPE, 24, struct kbase_ioctl_stream_create) ++#if !MALI_USE_CSF ++/** ++ * kbase_backend_complete_wq_post_sched - Perform backend-specific actions ++ * required on completing an atom, after ++ * any scheduling has taken place. ++ * @kbdev: Device pointer ++ * @core_req: Core requirements of atom ++ * ++ * This function should only be called from kbase_jd_done_worker() or ++ * js_return_worker(). ++ */ ++void kbase_backend_complete_wq_post_sched(struct kbase_device *kbdev, ++ base_jd_core_req core_req); ++#endif /* !MALI_USE_CSF */ + +/** -+ * struct kbase_ioctl_fence_validate - Validate a fd refers to a fence -+ * @fd: The file descriptor to validate ++ * kbase_backend_reset() - The GPU is being reset. Cancel all jobs on the GPU ++ * and remove any others from the ringbuffers. ++ * @kbdev: Device pointer ++ * @end_timestamp: Timestamp of reset + */ -+struct kbase_ioctl_fence_validate { -+ int fd; -+}; ++void kbase_backend_reset(struct kbase_device *kbdev, ktime_t *end_timestamp); + -+#define KBASE_IOCTL_FENCE_VALIDATE \ -+ _IOW(KBASE_IOCTL_TYPE, 25, struct kbase_ioctl_fence_validate) ++/** ++ * kbase_backend_inspect_tail - Return the atom currently at the tail of slot ++ * @js ++ * @kbdev: Device pointer ++ * @js: Job slot to inspect ++ * ++ * Return: Atom currently at the head of slot @js, or NULL ++ */ ++struct kbase_jd_atom *kbase_backend_inspect_tail(struct kbase_device *kbdev, unsigned int js); + +/** -+ * struct kbase_ioctl_mem_profile_add - Provide profiling information to kernel -+ * @buffer: Pointer to the information -+ * @len: Length -+ * @padding: Padding ++ * kbase_backend_nr_atoms_on_slot() - Return the number of atoms currently on a ++ * slot. ++ * @kbdev: Device pointer ++ * @js: Job slot to inspect + * -+ * The data provided is accessible through a debugfs file ++ * Return: Number of atoms currently on slot + */ -+struct kbase_ioctl_mem_profile_add { -+ __u64 buffer; -+ __u32 len; -+ __u32 padding; -+}; ++int kbase_backend_nr_atoms_on_slot(struct kbase_device *kbdev, unsigned int js); + -+#define KBASE_IOCTL_MEM_PROFILE_ADD \ -+ _IOW(KBASE_IOCTL_TYPE, 27, struct kbase_ioctl_mem_profile_add) ++/** ++ * kbase_backend_nr_atoms_submitted() - Return the number of atoms on a slot ++ * that are currently on the GPU. ++ * @kbdev: Device pointer ++ * @js: Job slot to inspect ++ * ++ * Return: Number of atoms currently on slot @js that are currently on the GPU. ++ */ ++int kbase_backend_nr_atoms_submitted(struct kbase_device *kbdev, unsigned int js); + +/** -+ * struct kbase_ioctl_sticky_resource_map - Permanently map an external resource -+ * @count: Number of resources -+ * @address: Array of u64 GPU addresses of the external resources to map ++ * kbase_backend_ctx_count_changed() - Number of contexts ready to submit jobs ++ * has changed. ++ * @kbdev: Device pointer ++ * ++ * Perform any required backend-specific actions (eg starting/stopping ++ * scheduling timers). + */ -+struct kbase_ioctl_sticky_resource_map { -+ __u64 count; -+ __u64 address; -+}; ++void kbase_backend_ctx_count_changed(struct kbase_device *kbdev); + -+#define KBASE_IOCTL_STICKY_RESOURCE_MAP \ -+ _IOW(KBASE_IOCTL_TYPE, 29, struct kbase_ioctl_sticky_resource_map) ++/** ++ * kbase_backend_timeouts_changed() - Job Scheduler timeouts have changed. ++ * @kbdev: Device pointer ++ * ++ * Perform any required backend-specific actions (eg updating timeouts of ++ * currently running atoms). ++ */ ++void kbase_backend_timeouts_changed(struct kbase_device *kbdev); + +/** -+ * struct kbase_ioctl_sticky_resource_map - Unmap a resource mapped which was -+ * previously permanently mapped -+ * @count: Number of resources -+ * @address: Array of u64 GPU addresses of the external resources to unmap ++ * kbase_backend_slot_free() - Return the number of jobs that can be currently ++ * submitted to slot @js. ++ * @kbdev: Device pointer ++ * @js: Job slot to inspect ++ * ++ * Return: Number of jobs that can be submitted. + */ -+struct kbase_ioctl_sticky_resource_unmap { -+ __u64 count; -+ __u64 address; -+}; ++int kbase_backend_slot_free(struct kbase_device *kbdev, unsigned int js); + -+#define KBASE_IOCTL_STICKY_RESOURCE_UNMAP \ -+ _IOW(KBASE_IOCTL_TYPE, 30, struct kbase_ioctl_sticky_resource_unmap) ++/** ++ * kbase_job_check_leave_disjoint - potentially leave disjoint state ++ * @kbdev: kbase device ++ * @target_katom: atom which is finishing ++ * ++ * Work out whether to leave disjoint state when finishing an atom that was ++ * originated by kbase_job_check_enter_disjoint(). ++ */ ++void kbase_job_check_leave_disjoint(struct kbase_device *kbdev, ++ struct kbase_jd_atom *target_katom); + +/** -+ * union kbase_ioctl_mem_find_gpu_start_and_offset - Find the start address of -+ * the GPU memory region for -+ * the given gpu address and -+ * the offset of that address -+ * into the region ++ * kbase_backend_jm_kill_running_jobs_from_kctx - Kill all jobs that are ++ * currently running on GPU from a context ++ * @kctx: Context pointer + * -+ * @gpu_addr: GPU virtual address -+ * @size: Size in bytes within the region -+ * @start: Address of the beginning of the memory region enclosing @gpu_addr -+ * for the length of @offset bytes -+ * @offset: The offset from the start of the memory region to @gpu_addr ++ * This is used in response to a page fault to remove all jobs from the faulting ++ * context from the hardware. + * -+ * @in: Input parameters -+ * @out: Output parameters ++ * Caller must hold hwaccess_lock. + */ -+union kbase_ioctl_mem_find_gpu_start_and_offset { -+ struct { -+ __u64 gpu_addr; -+ __u64 size; -+ } in; -+ struct { -+ __u64 start; -+ __u64 offset; -+ } out; -+}; ++void kbase_backend_jm_kill_running_jobs_from_kctx(struct kbase_context *kctx); + -+#define KBASE_IOCTL_MEM_FIND_GPU_START_AND_OFFSET \ -+ _IOWR(KBASE_IOCTL_TYPE, 31, union kbase_ioctl_mem_find_gpu_start_and_offset) ++/** ++ * kbase_jm_wait_for_zero_jobs - Wait for context to have zero jobs running, and ++ * to be descheduled. ++ * @kctx: Context pointer ++ * ++ * This should be called following kbase_js_zap_context(), to ensure the context ++ * can be safely destroyed. ++ */ ++void kbase_jm_wait_for_zero_jobs(struct kbase_context *kctx); + ++/** ++ * kbase_backend_get_current_flush_id - Return the current flush ID ++ * ++ * @kbdev: Device pointer ++ * ++ * Return: the current flush ID to be recorded for each job chain ++ */ ++u32 kbase_backend_get_current_flush_id(struct kbase_device *kbdev); + -+#define KBASE_IOCTL_CINSTR_GWT_START \ -+ _IO(KBASE_IOCTL_TYPE, 33) ++/** ++ * kbase_job_slot_hardstop - Hard-stop the specified job slot ++ * @kctx: The kbase context that contains the job(s) that should ++ * be hard-stopped ++ * @js: The job slot to hard-stop ++ * @target_katom: The job that should be hard-stopped (or NULL for all ++ * jobs from the context) ++ * Context: ++ * The job slot lock must be held when calling this function. ++ */ ++void kbase_job_slot_hardstop(struct kbase_context *kctx, unsigned int js, ++ struct kbase_jd_atom *target_katom); + -+#define KBASE_IOCTL_CINSTR_GWT_STOP \ -+ _IO(KBASE_IOCTL_TYPE, 34) ++/** ++ * kbase_gpu_atoms_submitted_any() - Inspect whether there are any atoms ++ * currently on the GPU ++ * @kbdev: Device pointer ++ * ++ * Return: true if there are any atoms on the GPU, false otherwise ++ */ ++bool kbase_gpu_atoms_submitted_any(struct kbase_device *kbdev); + +/** -+ * union kbase_ioctl_gwt_dump - Used to collect all GPU write fault addresses. -+ * @addr_buffer: Address of buffer to hold addresses of gpu modified areas. -+ * @size_buffer: Address of buffer to hold size of modified areas (in pages) -+ * @len: Number of addresses the buffers can hold. -+ * @more_data_available: Status indicating if more addresses are available. -+ * @no_of_addr_collected: Number of addresses collected into addr_buffer. ++ * kbase_backend_slot_kctx_purge_locked - Perform a purge on the slot_rb tracked ++ * kctx + * -+ * @in: Input parameters -+ * @out: Output parameters ++ * @kbdev: Device pointer ++ * @kctx: The kbase context that needs to be purged from slot_rb[] + * -+ * This structure is used when performing a call to dump GPU write fault -+ * addresses. ++ * For JM GPUs, the L1 read only caches may need a start_flush invalidation, ++ * potentially on all slots (even if the kctx was only using a single slot), ++ * following a context termination or address-space ID recycle. This function ++ * performs a clean-up purge on the given kctx which if it has been tracked by ++ * slot_rb[] objects. ++ * ++ * Caller must hold kbase_device->hwaccess_lock. + */ -+union kbase_ioctl_cinstr_gwt_dump { -+ struct { -+ __u64 addr_buffer; -+ __u64 size_buffer; -+ __u32 len; -+ __u32 padding; ++void kbase_backend_slot_kctx_purge_locked(struct kbase_device *kbdev, struct kbase_context *kctx); + -+ } in; -+ struct { -+ __u32 no_of_addr_collected; -+ __u8 more_data_available; -+ __u8 padding[27]; -+ } out; -+}; ++#endif /* _KBASE_HWACCESS_JM_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h +new file mode 100755 +index 000000000..effb2ffeb +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h +@@ -0,0 +1,229 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2014-2015, 2018-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++/** ++ * DOC: HW access power manager common APIs ++ */ + -+#define KBASE_IOCTL_CINSTR_GWT_DUMP \ -+ _IOWR(KBASE_IOCTL_TYPE, 35, union kbase_ioctl_cinstr_gwt_dump) ++#ifndef _KBASE_HWACCESS_PM_H_ ++#define _KBASE_HWACCESS_PM_H_ ++ ++#include ++#include ++ ++#include ++ ++/* Forward definition - see mali_kbase.h */ ++struct kbase_device; ++ ++/* Functions common to all HW access backends */ + +/** -+ * struct kbase_ioctl_mem_exec_init - Initialise the EXEC_VA memory zone ++ * kbase_hwaccess_pm_init - Initialize the power management framework. + * -+ * @va_pages: Number of VA pages to reserve for EXEC_VA ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Must be called before any other power management function ++ * ++ * Return: 0 if the power management framework was successfully initialized. + */ -+struct kbase_ioctl_mem_exec_init { -+ __u64 va_pages; -+}; -+ -+#define KBASE_IOCTL_MEM_EXEC_INIT \ -+ _IOW(KBASE_IOCTL_TYPE, 38, struct kbase_ioctl_mem_exec_init) ++int kbase_hwaccess_pm_init(struct kbase_device *kbdev); + +/** -+ * union kbase_ioctl_get_cpu_gpu_timeinfo - Request zero or more types of -+ * cpu/gpu time (counter values) ++ * kbase_hwaccess_pm_term - Terminate the power management framework. + * -+ * @request_flags: Bit-flags indicating the requested types. -+ * @paddings: Unused, size alignment matching the out. -+ * @sec: Integer field of the monotonic time, unit in seconds. -+ * @nsec: Fractional sec of the monotonic time, in nano-seconds. -+ * @padding: Unused, for u64 alignment -+ * @timestamp: System wide timestamp (counter) value. -+ * @cycle_counter: GPU cycle counter value. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * -+ * @in: Input parameters -+ * @out: Output parameters ++ * No power management functions may be called after this ++ */ ++void kbase_hwaccess_pm_term(struct kbase_device *kbdev); ++ ++/** ++ * kbase_hwaccess_pm_powerup - Power up the GPU. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @flags: Flags to pass on to kbase_pm_init_hw ++ * ++ * Power up GPU after all modules have been initialized and interrupt handlers ++ * installed. + * ++ * Return: 0 if powerup was successful. + */ -+union kbase_ioctl_get_cpu_gpu_timeinfo { -+ struct { -+ __u32 request_flags; -+ __u32 paddings[7]; -+ } in; -+ struct { -+ __u64 sec; -+ __u32 nsec; -+ __u32 padding; -+ __u64 timestamp; -+ __u64 cycle_counter; -+ } out; -+}; ++int kbase_hwaccess_pm_powerup(struct kbase_device *kbdev, ++ unsigned int flags); + -+#define KBASE_IOCTL_GET_CPU_GPU_TIMEINFO \ -+ _IOWR(KBASE_IOCTL_TYPE, 50, union kbase_ioctl_get_cpu_gpu_timeinfo) ++/** ++ * kbase_hwaccess_pm_halt - Halt the power management framework. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Should ensure that no new interrupts are generated, but allow any currently ++ * running interrupt handlers to complete successfully. The GPU is forced off by ++ * the time this function returns, regardless of whether or not the active power ++ * policy asks for the GPU to be powered off. ++ */ ++void kbase_hwaccess_pm_halt(struct kbase_device *kbdev); + -+/*************** -+ * test ioctls * -+ ***************/ -+#if MALI_UNIT_TEST -+/* These ioctls are purely for test purposes and are not used in the production -+ * driver, they therefore may change without notice ++/** ++ * kbase_hwaccess_pm_suspend - Perform any backend-specific actions to suspend the GPU ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Return: 0 if suspend was successful. + */ ++int kbase_hwaccess_pm_suspend(struct kbase_device *kbdev); + -+#define KBASE_IOCTL_TEST_TYPE (KBASE_IOCTL_TYPE + 1) ++/** ++ * kbase_hwaccess_pm_resume - Perform any backend-specific actions to resume the GPU ++ * from a suspend ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ */ ++void kbase_hwaccess_pm_resume(struct kbase_device *kbdev); + +/** -+ * struct kbase_ioctl_tlstream_test - Start a timeline stream test ++ * kbase_hwaccess_pm_gpu_active - Perform any required actions for activating the GPU. ++ * Called when the first context goes active. + * -+ * @tpw_count: number of trace point writers in each context -+ * @msg_delay: time delay between tracepoints from one writer in milliseconds -+ * @msg_count: number of trace points written by one writer -+ * @aux_msg: if non-zero aux messages will be included ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+struct kbase_ioctl_tlstream_test { -+ __u32 tpw_count; -+ __u32 msg_delay; -+ __u32 msg_count; -+ __u32 aux_msg; -+}; ++void kbase_hwaccess_pm_gpu_active(struct kbase_device *kbdev); + -+#define KBASE_IOCTL_TLSTREAM_TEST \ -+ _IOW(KBASE_IOCTL_TEST_TYPE, 1, struct kbase_ioctl_tlstream_test) ++/** ++ * kbase_hwaccess_pm_gpu_idle - Perform any required actions for idling the GPU. ++ * Called when the last context goes idle. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ */ ++void kbase_hwaccess_pm_gpu_idle(struct kbase_device *kbdev); + ++#if MALI_USE_CSF +/** -+ * struct kbase_ioctl_tlstream_stats - Read tlstream stats for test purposes -+ * @bytes_collected: number of bytes read by user -+ * @bytes_generated: number of bytes generated by tracepoints ++ * kbase_pm_set_debug_core_mask - Set the debug core mask. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @new_core_mask: The core mask to use ++ * ++ * This determines which cores the power manager is allowed to use. + */ -+struct kbase_ioctl_tlstream_stats { -+ __u32 bytes_collected; -+ __u32 bytes_generated; -+}; ++void kbase_pm_set_debug_core_mask(struct kbase_device *kbdev, ++ u64 new_core_mask); ++#else ++/** ++ * kbase_pm_set_debug_core_mask - Set the debug core mask. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @new_core_mask_js0: The core mask to use for job slot 0 ++ * @new_core_mask_js1: The core mask to use for job slot 1 ++ * @new_core_mask_js2: The core mask to use for job slot 2 ++ * ++ * This determines which cores the power manager is allowed to use. ++ */ ++void kbase_pm_set_debug_core_mask(struct kbase_device *kbdev, ++ u64 new_core_mask_js0, u64 new_core_mask_js1, ++ u64 new_core_mask_js2); ++#endif /* MALI_USE_CSF */ + -+#define KBASE_IOCTL_TLSTREAM_STATS \ -+ _IOR(KBASE_IOCTL_TEST_TYPE, 2, struct kbase_ioctl_tlstream_stats) ++/** ++ * kbase_pm_ca_get_policy - Get the current policy. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Returns the policy that is currently active. ++ * ++ * Return: The current policy ++ */ ++const struct kbase_pm_ca_policy ++*kbase_pm_ca_get_policy(struct kbase_device *kbdev); + -+#endif /* MALI_UNIT_TEST */ ++/** ++ * kbase_pm_ca_set_policy - Change the policy to the one specified. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @policy: The policy to change to (valid pointer returned from ++ * @ref kbase_pm_ca_list_policies) ++ */ ++void kbase_pm_ca_set_policy(struct kbase_device *kbdev, ++ const struct kbase_pm_ca_policy *policy); + -+/* Customer extension range */ -+#define KBASE_IOCTL_EXTRA_TYPE (KBASE_IOCTL_TYPE + 2) ++/** ++ * kbase_pm_ca_list_policies - Retrieve a static list of the available policies. ++ * ++ * @policies: An array pointer to take the list of policies. This may be NULL. ++ * The contents of this array must not be modified. ++ * ++ * Return: The number of policies ++ */ ++int ++kbase_pm_ca_list_policies(const struct kbase_pm_ca_policy * const **policies); + -+/* If the integration needs extra ioctl add them there -+ * like this: ++/** ++ * kbase_pm_get_policy - Get the current policy. + * -+ * struct my_ioctl_args { -+ * .... -+ * } ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * -+ * #define KBASE_IOCTL_MY_IOCTL \ -+ * _IOWR(KBASE_IOCTL_EXTRA_TYPE, 0, struct my_ioctl_args) ++ * Returns the policy that is currently active. ++ * ++ * Return: The current policy + */ ++const struct kbase_pm_policy *kbase_pm_get_policy(struct kbase_device *kbdev); + ++/** ++ * kbase_pm_set_policy - Change the policy to the one specified. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid ++ * pointer) ++ * @policy: The policy to change to (valid pointer returned from ++ * @ref kbase_pm_list_policies) ++ */ ++void kbase_pm_set_policy(struct kbase_device *kbdev, ++ const struct kbase_pm_policy *policy); + -+/********************************** -+ * Definitions for GPU properties * -+ **********************************/ -+#define KBASE_GPUPROP_VALUE_SIZE_U8 (0x0) -+#define KBASE_GPUPROP_VALUE_SIZE_U16 (0x1) -+#define KBASE_GPUPROP_VALUE_SIZE_U32 (0x2) -+#define KBASE_GPUPROP_VALUE_SIZE_U64 (0x3) ++/** ++ * kbase_pm_list_policies - Retrieve a static list of the available policies. ++ * ++ * @kbdev: The kbase device structure for the device. ++ * @list: An array pointer to take the list of policies. This may be NULL. ++ * The contents of this array must not be modified. ++ * ++ * Return: The number of policies ++ */ ++int kbase_pm_list_policies(struct kbase_device *kbdev, ++ const struct kbase_pm_policy * const **list); + -+#define KBASE_GPUPROP_PRODUCT_ID 1 -+#define KBASE_GPUPROP_VERSION_STATUS 2 -+#define KBASE_GPUPROP_MINOR_REVISION 3 -+#define KBASE_GPUPROP_MAJOR_REVISION 4 -+/* 5 previously used for GPU speed */ -+#define KBASE_GPUPROP_GPU_FREQ_KHZ_MAX 6 -+/* 7 previously used for minimum GPU speed */ -+#define KBASE_GPUPROP_LOG2_PROGRAM_COUNTER_SIZE 8 -+#define KBASE_GPUPROP_TEXTURE_FEATURES_0 9 -+#define KBASE_GPUPROP_TEXTURE_FEATURES_1 10 -+#define KBASE_GPUPROP_TEXTURE_FEATURES_2 11 -+#define KBASE_GPUPROP_GPU_AVAILABLE_MEMORY_SIZE 12 ++/** ++ * kbase_pm_protected_mode_enable() - Enable protected mode ++ * ++ * @kbdev: Address of the instance of a GPU platform device. ++ * ++ * Return: Zero on success or an error code ++ */ ++int kbase_pm_protected_mode_enable(struct kbase_device *kbdev); + -+#define KBASE_GPUPROP_L2_LOG2_LINE_SIZE 13 -+#define KBASE_GPUPROP_L2_LOG2_CACHE_SIZE 14 -+#define KBASE_GPUPROP_L2_NUM_L2_SLICES 15 ++/** ++ * kbase_pm_protected_mode_disable() - Disable protected mode ++ * ++ * @kbdev: Address of the instance of a GPU platform device. ++ * ++ * Return: Zero on success or an error code ++ */ ++int kbase_pm_protected_mode_disable(struct kbase_device *kbdev); + -+#define KBASE_GPUPROP_TILER_BIN_SIZE_BYTES 16 -+#define KBASE_GPUPROP_TILER_MAX_ACTIVE_LEVELS 17 ++#endif /* _KBASE_HWACCESS_PM_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h +new file mode 100755 +index 000000000..ac2a26d28 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h +@@ -0,0 +1,126 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2014, 2018-2021, 2023 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+#define KBASE_GPUPROP_MAX_THREADS 18 -+#define KBASE_GPUPROP_MAX_WORKGROUP_SIZE 19 -+#define KBASE_GPUPROP_MAX_BARRIER_SIZE 20 -+#define KBASE_GPUPROP_MAX_REGISTERS 21 -+#define KBASE_GPUPROP_MAX_TASK_QUEUE 22 -+#define KBASE_GPUPROP_MAX_THREAD_GROUP_SPLIT 23 -+#define KBASE_GPUPROP_IMPL_TECH 24 ++#ifndef _KBASE_BACKEND_TIME_H_ ++#define _KBASE_BACKEND_TIME_H_ + -+#define KBASE_GPUPROP_RAW_SHADER_PRESENT 25 -+#define KBASE_GPUPROP_RAW_TILER_PRESENT 26 -+#define KBASE_GPUPROP_RAW_L2_PRESENT 27 -+#define KBASE_GPUPROP_RAW_STACK_PRESENT 28 -+#define KBASE_GPUPROP_RAW_L2_FEATURES 29 -+#define KBASE_GPUPROP_RAW_CORE_FEATURES 30 -+#define KBASE_GPUPROP_RAW_MEM_FEATURES 31 -+#define KBASE_GPUPROP_RAW_MMU_FEATURES 32 -+#define KBASE_GPUPROP_RAW_AS_PRESENT 33 -+#define KBASE_GPUPROP_RAW_JS_PRESENT 34 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_0 35 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_1 36 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_2 37 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_3 38 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_4 39 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_5 40 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_6 41 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_7 42 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_8 43 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_9 44 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_10 45 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_11 46 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_12 47 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_13 48 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_14 49 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_15 50 -+#define KBASE_GPUPROP_RAW_TILER_FEATURES 51 -+#define KBASE_GPUPROP_RAW_TEXTURE_FEATURES_0 52 -+#define KBASE_GPUPROP_RAW_TEXTURE_FEATURES_1 53 -+#define KBASE_GPUPROP_RAW_TEXTURE_FEATURES_2 54 -+#define KBASE_GPUPROP_RAW_GPU_ID 55 -+#define KBASE_GPUPROP_RAW_THREAD_MAX_THREADS 56 -+#define KBASE_GPUPROP_RAW_THREAD_MAX_WORKGROUP_SIZE 57 -+#define KBASE_GPUPROP_RAW_THREAD_MAX_BARRIER_SIZE 58 -+#define KBASE_GPUPROP_RAW_THREAD_FEATURES 59 -+#define KBASE_GPUPROP_RAW_COHERENCY_MODE 60 ++#if MALI_USE_CSF ++/** ++ * struct kbase_backend_time - System timestamp attributes. ++ * ++ * @multiplier: Numerator of the converter's fraction. ++ * @divisor: Denominator of the converter's fraction. ++ * @offset: Converter's offset term. ++ * ++ * According to Generic timer spec, system timer: ++ * - Increments at a fixed frequency ++ * - Starts operating from zero ++ * ++ * Hence CPU time is a linear function of System Time. ++ * ++ * CPU_ts = alpha * SYS_ts + beta ++ * ++ * Where ++ * - alpha = 10^9/SYS_ts_freq ++ * - beta is calculated by two timer samples taken at the same time: ++ * beta = CPU_ts_s - SYS_ts_s * alpha ++ * ++ * Since alpha is a rational number, we minimizing possible ++ * rounding error by simplifying the ratio. Thus alpha is stored ++ * as a simple `multiplier / divisor` ratio. ++ * ++ */ ++struct kbase_backend_time { ++ u64 multiplier; ++ u64 divisor; ++ s64 offset; ++}; + -+#define KBASE_GPUPROP_COHERENCY_NUM_GROUPS 61 -+#define KBASE_GPUPROP_COHERENCY_NUM_CORE_GROUPS 62 -+#define KBASE_GPUPROP_COHERENCY_COHERENCY 63 -+#define KBASE_GPUPROP_COHERENCY_GROUP_0 64 -+#define KBASE_GPUPROP_COHERENCY_GROUP_1 65 -+#define KBASE_GPUPROP_COHERENCY_GROUP_2 66 -+#define KBASE_GPUPROP_COHERENCY_GROUP_3 67 -+#define KBASE_GPUPROP_COHERENCY_GROUP_4 68 -+#define KBASE_GPUPROP_COHERENCY_GROUP_5 69 -+#define KBASE_GPUPROP_COHERENCY_GROUP_6 70 -+#define KBASE_GPUPROP_COHERENCY_GROUP_7 71 -+#define KBASE_GPUPROP_COHERENCY_GROUP_8 72 -+#define KBASE_GPUPROP_COHERENCY_GROUP_9 73 -+#define KBASE_GPUPROP_COHERENCY_GROUP_10 74 -+#define KBASE_GPUPROP_COHERENCY_GROUP_11 75 -+#define KBASE_GPUPROP_COHERENCY_GROUP_12 76 -+#define KBASE_GPUPROP_COHERENCY_GROUP_13 77 -+#define KBASE_GPUPROP_COHERENCY_GROUP_14 78 -+#define KBASE_GPUPROP_COHERENCY_GROUP_15 79 ++/** ++ * kbase_backend_time_convert_gpu_to_cpu() - Convert GPU timestamp to CPU timestamp. ++ * ++ * @kbdev: Kbase device pointer ++ * @gpu_ts: System timestamp value to converter. ++ * ++ * Return: The CPU timestamp. ++ */ ++u64 __maybe_unused kbase_backend_time_convert_gpu_to_cpu(struct kbase_device *kbdev, u64 gpu_ts); ++#endif + -+#define KBASE_GPUPROP_TEXTURE_FEATURES_3 80 -+#define KBASE_GPUPROP_RAW_TEXTURE_FEATURES_3 81 ++/** ++ * kbase_backend_get_gpu_time() - Get current GPU time ++ * @kbdev: Device pointer ++ * @cycle_counter: Pointer to u64 to store cycle counter in. ++ * @system_time: Pointer to u64 to store system time in ++ * @ts: Pointer to struct timespec to store current monotonic ++ * time in ++ */ ++void kbase_backend_get_gpu_time(struct kbase_device *kbdev, u64 *cycle_counter, ++ u64 *system_time, struct timespec64 *ts); + -+#define KBASE_GPUPROP_NUM_EXEC_ENGINES 82 ++/** ++ * kbase_backend_get_gpu_time_norequest() - Get current GPU time without ++ * request/release cycle counter ++ * @kbdev: Device pointer ++ * @cycle_counter: Pointer to u64 to store cycle counter in ++ * @system_time: Pointer to u64 to store system time in ++ * @ts: Pointer to struct timespec to store current monotonic ++ * time in ++ */ ++void kbase_backend_get_gpu_time_norequest(struct kbase_device *kbdev, ++ u64 *cycle_counter, ++ u64 *system_time, ++ struct timespec64 *ts); ++/** ++ * kbase_get_timeout_ms - Choose a timeout value to get a timeout scaled ++ * GPU frequency, using a choice from ++ * kbase_timeout_selector. ++ * ++ * @kbdev: KBase device pointer. ++ * @selector: Value from kbase_scaled_timeout_selector enum. ++ * ++ * Return: Timeout in milliseconds, as an unsigned integer. ++ */ ++unsigned int kbase_get_timeout_ms(struct kbase_device *kbdev, ++ enum kbase_timeout_selector selector); + -+#define KBASE_GPUPROP_RAW_THREAD_TLS_ALLOC 83 -+#define KBASE_GPUPROP_TLS_ALLOC 84 ++/** ++ * kbase_backend_get_cycle_cnt - Reads the GPU cycle counter ++ * ++ * @kbdev: Instance of a GPU platform device that implements a CSF interface. ++ * ++ * Return: Snapshot of the GPU cycle count register. ++ */ ++u64 kbase_backend_get_cycle_cnt(struct kbase_device *kbdev); + -+#ifdef __cpluscplus -+} -+#endif ++/** ++ * kbase_backend_time_init() - Initialize system timestamp converter. ++ * ++ * @kbdev: Kbase device pointer ++ * ++ * This function should only be called after GPU is powered-up and ++ * L2 cached power-up has been initiated. ++ * ++ * Return: Zero on success, error code otherwise. ++ */ ++int kbase_backend_time_init(struct kbase_device *kbdev); + -+#endif ++#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd.c b/drivers/gpu/arm/bifrost/mali_kbase_jd.c new file mode 100755 -index 000000000000..d0674d1bd8f4 +index 000000000..f44426a73 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd.c -@@ -0,0 +1,1819 @@ +@@ -0,0 +1,1660 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -213872,20 +246099,22 @@ index 000000000000..d0674d1bd8f4 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +#include -+#ifdef CONFIG_COMPAT ++#if IS_ENABLED(CONFIG_COMPAT) +#include +#endif +#include +#include +#include +#include ++#include ++#if KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE ++#include ++#else ++#include ++#endif + +#include +#include @@ -213893,20 +246122,13 @@ index 000000000000..d0674d1bd8f4 +#include +#include + -+#include "mali_kbase_dma_fence.h" +#include + +#include + -+#define beenthere(kctx, f, a...) dev_dbg(kctx->kbdev->dev, "%s:" f, __func__, ##a) -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) -+/* random32 was renamed to prandom_u32 in 3.8 */ -+#define prandom_u32 random32 -+#endif -+ +/* Return whether katom will run on the GPU or not. Currently only soft jobs and -+ * dependency-only atoms do not run on the GPU */ ++ * dependency-only atoms do not run on the GPU ++ */ +#define IS_GPU_ATOM(katom) (!((katom->core_req & BASE_JD_REQ_SOFT_JOB) || \ + ((katom->core_req & BASE_JD_REQ_ATOM_TYPE) == \ + BASE_JD_REQ_DEP))) @@ -213924,7 +246146,7 @@ index 000000000000..d0674d1bd8f4 +static void __user * +get_compat_pointer(struct kbase_context *kctx, const u64 p) +{ -+#ifdef CONFIG_COMPAT ++#if IS_ENABLED(CONFIG_COMPAT) + if (kbase_ctx_flag(kctx, KCTX_COMPAT)) + return compat_ptr(p); +#endif @@ -213936,8 +246158,9 @@ index 000000000000..d0674d1bd8f4 +{ + katom->status = KBASE_JD_ATOM_STATE_COMPLETED; + kbase_kinstr_jm_atom_complete(katom); -+ dev_dbg(katom->kctx->kbdev->dev, "Atom %p status to completed\n", ++ dev_dbg(katom->kctx->kbdev->dev, "Atom %pK status to completed\n", + (void *)katom); ++ KBASE_TLSTREAM_TL_JD_ATOM_COMPLETE(katom->kctx->kbdev, katom); +} + +/* Runs an atom, either by handing to the JS or by immediately running it in the case of soft-jobs @@ -213945,13 +246168,13 @@ index 000000000000..d0674d1bd8f4 + * Returns whether the JS needs a reschedule. + * + * Note that the caller must also check the atom status and -+ * if it is KBASE_JD_ATOM_STATE_COMPLETED must call jd_done_nolock ++ * if it is KBASE_JD_ATOM_STATE_COMPLETED must call kbase_jd_done_nolock + */ +static bool jd_run_atom(struct kbase_jd_atom *katom) +{ + struct kbase_context *kctx = katom->kctx; + -+ dev_dbg(kctx->kbdev->dev, "JD run atom %p in kctx %p\n", ++ dev_dbg(kctx->kbdev->dev, "JD run atom %pK in kctx %pK\n", + (void *)katom, (void *)kctx); + + KBASE_DEBUG_ASSERT(katom->status != KBASE_JD_ATOM_STATE_UNUSED); @@ -213961,23 +246184,23 @@ index 000000000000..d0674d1bd8f4 + trace_sysgraph(SGR_SUBMIT, kctx->id, + kbase_jd_atom_id(katom->kctx, katom)); + jd_mark_atom_complete(katom); -+ return 0; ++ return false; + } else if (katom->core_req & BASE_JD_REQ_SOFT_JOB) { + /* Soft-job */ + if (katom->will_fail_event_code) { + kbase_finish_soft_job(katom); + jd_mark_atom_complete(katom); -+ return 0; ++ return false; + } + if (kbase_process_soft_job(katom) == 0) { + kbase_finish_soft_job(katom); + jd_mark_atom_complete(katom); + } -+ return 0; ++ return false; + } + + katom->status = KBASE_JD_ATOM_STATE_IN_JS; -+ dev_dbg(kctx->kbdev->dev, "Atom %p status to in JS\n", (void *)katom); ++ dev_dbg(kctx->kbdev->dev, "Atom %pK status to in JS\n", (void *)katom); + /* Queue an action about whether we should try scheduling a context */ + return kbasep_js_add_job(kctx, katom); +} @@ -214001,11 +246224,17 @@ index 000000000000..d0674d1bd8f4 + /* katom dep complete, attempt to run it */ + bool resched = false; + ++ KBASE_TLSTREAM_TL_RUN_ATOM_START( ++ katom->kctx->kbdev, katom, ++ kbase_jd_atom_id(katom->kctx, katom)); + resched = jd_run_atom(katom); ++ KBASE_TLSTREAM_TL_RUN_ATOM_END(katom->kctx->kbdev, katom, ++ kbase_jd_atom_id(katom->kctx, ++ katom)); + + if (katom->status == KBASE_JD_ATOM_STATE_COMPLETED) { + /* The atom has already finished */ -+ resched |= jd_done_nolock(katom, NULL); ++ resched |= kbase_jd_done_nolock(katom, true); + } + + if (resched) @@ -214015,15 +246244,6 @@ index 000000000000..d0674d1bd8f4 + +void kbase_jd_free_external_resources(struct kbase_jd_atom *katom) +{ -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ /* Flush dma-fence workqueue to ensure that any callbacks that may have -+ * been queued are done before continuing. -+ * Any successfully completed atom would have had all it's callbacks -+ * completed before the atom was run, so only flush for failed atoms. -+ */ -+ if (katom->event_code != BASE_JD_EVENT_DONE) -+ flush_workqueue(katom->kctx->dma_fence.wq); -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ +} + +static void kbase_jd_post_external_resources(struct kbase_jd_atom *katom) @@ -214031,10 +246251,6 @@ index 000000000000..d0674d1bd8f4 + KBASE_DEBUG_ASSERT(katom); + KBASE_DEBUG_ASSERT(katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES); + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ kbase_dma_fence_signal(katom); -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ -+ + kbase_gpu_vm_lock(katom->kctx); + /* only roll back if extres is non-NULL */ + if (katom->extres) { @@ -214042,13 +246258,7 @@ index 000000000000..d0674d1bd8f4 + + res_no = katom->nr_extres; + while (res_no-- > 0) { -+ struct kbase_mem_phy_alloc *alloc = katom->extres[res_no].alloc; -+ struct kbase_va_region *reg; -+ -+ reg = kbase_region_tracker_find_region_base_address( -+ katom->kctx, -+ katom->extres[res_no].gpu_address); -+ kbase_unmap_external_resource(katom->kctx, reg, alloc); ++ kbase_unmap_external_resource(katom->kctx, katom->extres[res_no]); + } + kfree(katom->extres); + katom->extres = NULL; @@ -214064,26 +246274,8 @@ index 000000000000..d0674d1bd8f4 + +static int kbase_jd_pre_external_resources(struct kbase_jd_atom *katom, const struct base_jd_atom *user_atom) +{ -+ int err_ret_val = -EINVAL; ++ int err = -EINVAL; + u32 res_no; -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ struct kbase_dma_fence_resv_info info = { -+ .resv_objs = NULL, -+ .dma_fence_resv_count = 0, -+ .dma_fence_excl_bitmap = NULL -+ }; -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ /* -+ * When both dma-buf fence and Android native sync is enabled, we -+ * disable dma-buf fence for contexts that are using Android native -+ * fences. -+ */ -+ const bool implicit_sync = !kbase_ctx_flag(katom->kctx, -+ KCTX_NO_IMPLICIT_SYNC); -+#else /* CONFIG_SYNC || CONFIG_SYNC_FILE*/ -+ const bool implicit_sync = true; -+#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ + struct base_external_resource *input_extres; + + KBASE_DEBUG_ASSERT(katom); @@ -214097,45 +246289,18 @@ index 000000000000..d0674d1bd8f4 + if (!katom->extres) + return -ENOMEM; + -+ /* copy user buffer to the end of our real buffer. -+ * Make sure the struct sizes haven't changed in a way -+ * we don't support */ -+ BUILD_BUG_ON(sizeof(*input_extres) > sizeof(*katom->extres)); -+ input_extres = (struct base_external_resource *) -+ (((unsigned char *)katom->extres) + -+ (sizeof(*katom->extres) - sizeof(*input_extres)) * -+ katom->nr_extres); ++ input_extres = kmalloc_array(katom->nr_extres, sizeof(*input_extres), GFP_KERNEL); ++ if (!input_extres) { ++ err = -ENOMEM; ++ goto failed_input_alloc; ++ } + + if (copy_from_user(input_extres, + get_compat_pointer(katom->kctx, user_atom->extres_list), + sizeof(*input_extres) * katom->nr_extres) != 0) { -+ err_ret_val = -EINVAL; -+ goto early_err_out; -+ } -+ -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ if (implicit_sync) { -+ info.resv_objs = kmalloc_array(katom->nr_extres, -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) -+ sizeof(struct reservation_object *), -+#else -+ sizeof(struct dma_resv *), -+#endif -+ GFP_KERNEL); -+ if (!info.resv_objs) { -+ err_ret_val = -ENOMEM; -+ goto early_err_out; -+ } -+ -+ info.dma_fence_excl_bitmap = -+ kcalloc(BITS_TO_LONGS(katom->nr_extres), -+ sizeof(unsigned long), GFP_KERNEL); -+ if (!info.dma_fence_excl_bitmap) { -+ err_ret_val = -ENOMEM; -+ goto early_err_out; -+ } ++ err = -EINVAL; ++ goto failed_input_copy; + } -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ + + /* Take the processes mmap lock */ + down_read(kbase_mem_get_process_mmap_lock()); @@ -214143,19 +246308,13 @@ index 000000000000..d0674d1bd8f4 + /* need to keep the GPU VM locked while we set up UMM buffers */ + kbase_gpu_vm_lock(katom->kctx); + for (res_no = 0; res_no < katom->nr_extres; res_no++) { -+ struct base_external_resource *res = &input_extres[res_no]; ++ struct base_external_resource *user_res = &input_extres[res_no]; + struct kbase_va_region *reg; -+ struct kbase_mem_phy_alloc *alloc; -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ bool exclusive; -+ exclusive = (res->ext_resource & BASE_EXT_RES_ACCESS_EXCLUSIVE) -+ ? true : false; -+#endif ++ + reg = kbase_region_tracker_find_region_enclosing_address( -+ katom->kctx, -+ res->ext_resource & ~BASE_EXT_RES_ACCESS_EXCLUSIVE); ++ katom->kctx, user_res->ext_resource & ~BASE_EXT_RES_ACCESS_EXCLUSIVE); + /* did we find a matching region object? */ -+ if (kbase_is_region_invalid_or_free(reg)) { ++ if (unlikely(kbase_is_region_invalid_or_free(reg))) { + /* roll back */ + goto failed_loop; + } @@ -214165,36 +246324,11 @@ index 000000000000..d0674d1bd8f4 + katom->atom_flags |= KBASE_KATOM_FLAG_PROTECTED; + } + -+ alloc = kbase_map_external_resource(katom->kctx, reg, -+ current->mm); -+ if (!alloc) { -+ err_ret_val = -EINVAL; ++ err = kbase_map_external_resource(katom->kctx, reg, current->mm); ++ if (err) + goto failed_loop; -+ } -+ -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ if (implicit_sync && -+ reg->gpu_alloc->type == KBASE_MEM_TYPE_IMPORTED_UMM) { -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) -+ struct reservation_object *resv; -+#else -+ struct dma_resv *resv; -+#endif -+ resv = reg->gpu_alloc->imported.umm.dma_buf->resv; -+ if (resv) -+ kbase_dma_fence_add_reservation(resv, &info, -+ exclusive); -+ } -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ + -+ /* finish with updating out array with the data we found */ -+ /* NOTE: It is important that this is the last thing we do (or -+ * at least not before the first write) as we overwrite elements -+ * as we loop and could be overwriting ourself, so no writes -+ * until the last read for an element. -+ * */ -+ katom->extres[res_no].gpu_address = reg->start_pfn << PAGE_SHIFT; /* save the start_pfn (as an address, not pfn) to use fast lookup later */ -+ katom->extres[res_no].alloc = alloc; ++ katom->extres[res_no] = reg; + } + /* successfully parsed the extres array */ + /* drop the vm lock now */ @@ -214203,57 +246337,33 @@ index 000000000000..d0674d1bd8f4 + /* Release the processes mmap lock */ + up_read(kbase_mem_get_process_mmap_lock()); + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ if (implicit_sync) { -+ if (info.dma_fence_resv_count) { -+ int ret; -+ -+ ret = kbase_dma_fence_wait(katom, &info); -+ if (ret < 0) -+ goto failed_dma_fence_setup; -+ } -+ -+ kfree(info.resv_objs); -+ kfree(info.dma_fence_excl_bitmap); -+ } -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ ++ /* Free the buffer holding data from userspace */ ++ kfree(input_extres); + + /* all done OK */ + return 0; + +/* error handling section */ -+ -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+failed_dma_fence_setup: -+ /* Lock the processes mmap lock */ -+ down_read(kbase_mem_get_process_mmap_lock()); -+ -+ /* lock before we unmap */ -+ kbase_gpu_vm_lock(katom->kctx); -+#endif -+ -+ failed_loop: -+ /* undo the loop work */ ++failed_loop: ++ /* undo the loop work. We are guaranteed to have access to the VA region ++ * as we hold a reference to it until it's unmapped ++ */ + while (res_no-- > 0) { -+ struct kbase_mem_phy_alloc *alloc = katom->extres[res_no].alloc; ++ struct kbase_va_region *reg = katom->extres[res_no]; + -+ kbase_unmap_external_resource(katom->kctx, NULL, alloc); ++ kbase_unmap_external_resource(katom->kctx, reg); + } + kbase_gpu_vm_unlock(katom->kctx); + + /* Release the processes mmap lock */ + up_read(kbase_mem_get_process_mmap_lock()); + -+ early_err_out: ++failed_input_copy: ++ kfree(input_extres); ++failed_input_alloc: + kfree(katom->extres); + katom->extres = NULL; -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ if (implicit_sync) { -+ kfree(info.resv_objs); -+ kfree(info.dma_fence_excl_bitmap); -+ } -+#endif -+ return err_ret_val; ++ return err; +} + +static inline void jd_resolve_dep(struct list_head *out_list, @@ -214276,10 +246386,6 @@ index 000000000000..d0674d1bd8f4 + + if (katom->event_code != BASE_JD_EVENT_DONE && + (dep_type != BASE_JD_DEP_TYPE_ORDER)) { -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ kbase_dma_fence_cancel_callbacks(dep_atom); -+#endif -+ + dep_atom->event_code = katom->event_code; + KBASE_DEBUG_ASSERT(dep_atom->status != + KBASE_JD_ATOM_STATE_UNUSED); @@ -214293,38 +246399,8 @@ index 000000000000..d0674d1bd8f4 + (IS_GPU_ATOM(dep_atom) && !ctx_is_dying && + !dep_atom->will_fail_event_code && + !other_dep_atom->will_fail_event_code))) { -+ bool dep_satisfied = true; -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ int dep_count; -+ -+ dep_count = kbase_fence_dep_count_read(dep_atom); -+ if (likely(dep_count == -1)) { -+ dep_satisfied = true; -+ } else { -+ /* -+ * There are either still active callbacks, or -+ * all fences for this @dep_atom has signaled, -+ * but the worker that will queue the atom has -+ * not yet run. -+ * -+ * Wait for the fences to signal and the fence -+ * worker to run and handle @dep_atom. If -+ * @dep_atom was completed due to error on -+ * @katom, then the fence worker will pick up -+ * the complete status and error code set on -+ * @dep_atom above. -+ */ -+ dep_satisfied = false; -+ } -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ -+ -+ if (dep_satisfied) { -+ trace_sysgraph(SGR_DEP_RES, -+ dep_atom->kctx->id, -+ kbase_jd_atom_id(katom->kctx, dep_atom)); -+ dep_atom->in_jd_list = true; -+ list_add_tail(&dep_atom->jd_item, out_list); -+ } ++ dep_atom->in_jd_list = true; ++ list_add_tail(&dep_atom->jd_item, out_list); + } + } +} @@ -214345,7 +246421,8 @@ index 000000000000..d0674d1bd8f4 +static bool is_dep_valid(struct kbase_jd_atom *katom) +{ + /* If there's no dependency then this is 'valid' from the perspective of -+ * early dependency submission */ ++ * early dependency submission ++ */ + if (!katom) + return true; + @@ -214354,7 +246431,8 @@ index 000000000000..d0674d1bd8f4 + return false; + + /* If dependency has completed and has failed or will fail then it is -+ * not valid */ ++ * not valid ++ */ + if (katom->status >= KBASE_JD_ATOM_STATE_HW_COMPLETED && + (katom->event_code != BASE_JD_EVENT_DONE || + katom->will_fail_event_code)) @@ -214381,37 +246459,8 @@ index 000000000000..d0674d1bd8f4 + dep_atom->dep[0].atom); + bool dep1_valid = is_dep_valid( + dep_atom->dep[1].atom); -+ bool dep_satisfied = true; -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ int dep_count; -+ -+ dep_count = kbase_fence_dep_count_read( -+ dep_atom); -+ if (likely(dep_count == -1)) { -+ dep_satisfied = true; -+ } else { -+ /* -+ * There are either still active callbacks, or -+ * all fences for this @dep_atom has signaled, -+ * but the worker that will queue the atom has -+ * not yet run. -+ * -+ * Wait for the fences to signal and the fence -+ * worker to run and handle @dep_atom. If -+ * @dep_atom was completed due to error on -+ * @katom, then the fence worker will pick up -+ * the complete status and error code set on -+ * @dep_atom above. -+ */ -+ dep_satisfied = false; -+ } -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ + -+ if (dep0_valid && dep1_valid && dep_satisfied) { -+ trace_sysgraph(SGR_DEP_RES, -+ dep_atom->kctx->id, -+ kbase_jd_atom_id(dep_atom->kctx, -+ dep_atom)); ++ if (dep0_valid && dep1_valid) { + dep_atom->in_jd_list = true; + list_add(&dep_atom->jd_item, out_list); + } @@ -214477,8 +246526,8 @@ index 000000000000..d0674d1bd8f4 + else if (reg->flags & KBASE_REG_TILER_ALIGN_TOP) + size_to_read = sizeof(u64[COUNT]); + -+ ptr = kbase_vmap(kctx, reg->heap_info_gpu_addr, size_to_read, -+ &mapping); ++ ptr = kbase_vmap_prot(kctx, reg->heap_info_gpu_addr, size_to_read, ++ KBASE_REG_CPU_RD, &mapping); + + if (!ptr) { + dev_warn(kctx->kbdev->dev, @@ -214496,8 +246545,8 @@ index 000000000000..d0674d1bd8f4 + u64 addr_end; + + if (reg->flags & KBASE_REG_TILER_ALIGN_TOP) { -+ const unsigned long extent_bytes = reg->extent -+ << PAGE_SHIFT; ++ const unsigned long extension_bytes = ++ reg->extension << PAGE_SHIFT; + const u64 low_ptr = ptr[LOW]; + const u64 high_ptr = ptr[HIGH]; + @@ -214518,8 +246567,8 @@ index 000000000000..d0674d1bd8f4 + * this, but here to avoid future maintenance + * hazards + */ -+ WARN_ON(!is_power_of_2(extent_bytes)); -+ addr_end = ALIGN(read_val, extent_bytes); ++ WARN_ON(!is_power_of_2(extension_bytes)); ++ addr_end = ALIGN(read_val, extension_bytes); + } else { + addr_end = read_val = READ_ONCE(*ptr); + } @@ -214562,17 +246611,7 @@ index 000000000000..d0674d1bd8f4 +} +#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ + -+/* -+ * Perform the necessary handling of an atom that has finished running -+ * on the GPU. -+ * -+ * Note that if this is a soft-job that has had kbase_prepare_soft_job called on it then the caller -+ * is responsible for calling kbase_finish_soft_job *before* calling this function. -+ * -+ * The caller must hold the kbase_jd_context.lock. -+ */ -+bool jd_done_nolock(struct kbase_jd_atom *katom, -+ struct list_head *completed_jobs_ctx) ++bool kbase_jd_done_nolock(struct kbase_jd_atom *katom, bool post_immediately) +{ + struct kbase_context *kctx = katom->kctx; + struct list_head completed_jobs; @@ -214580,6 +246619,10 @@ index 000000000000..d0674d1bd8f4 + bool need_to_try_schedule_context = false; + int i; + ++ lockdep_assert_held(&kctx->jctx.lock); ++ ++ KBASE_TLSTREAM_TL_JD_DONE_NO_LOCK_START(kctx->kbdev, katom); ++ + INIT_LIST_HEAD(&completed_jobs); + INIT_LIST_HEAD(&runnable_jobs); + @@ -214591,7 +246634,8 @@ index 000000000000..d0674d1bd8f4 +#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ + + /* This is needed in case an atom is failed due to being invalid, this -+ * can happen *before* the jobs that the atom depends on have completed */ ++ * can happen *before* the jobs that the atom depends on have completed ++ */ + for (i = 0; i < 2; i++) { + if (kbase_jd_katom_dep_atom(&katom->dep[i])) { + list_del(&katom->dep_item[i]); @@ -214600,6 +246644,7 @@ index 000000000000..d0674d1bd8f4 + } + + jd_mark_atom_complete(katom); ++ + list_add_tail(&katom->jd_item, &completed_jobs); + + while (!list_empty(&completed_jobs)) { @@ -214622,7 +246667,7 @@ index 000000000000..d0674d1bd8f4 + list_del(runnable_jobs.next); + node->in_jd_list = false; + -+ dev_dbg(kctx->kbdev->dev, "List node %p has status %d\n", ++ dev_dbg(kctx->kbdev->dev, "List node %pK has status %d\n", + node, node->status); + + KBASE_DEBUG_ASSERT(node->status != KBASE_JD_ATOM_STATE_UNUSED); @@ -214631,7 +246676,13 @@ index 000000000000..d0674d1bd8f4 + + if (node->status != KBASE_JD_ATOM_STATE_COMPLETED && + !kbase_ctx_flag(kctx, KCTX_DYING)) { ++ KBASE_TLSTREAM_TL_RUN_ATOM_START( ++ kctx->kbdev, node, ++ kbase_jd_atom_id(kctx, node)); + need_to_try_schedule_context |= jd_run_atom(node); ++ KBASE_TLSTREAM_TL_RUN_ATOM_END( ++ kctx->kbdev, node, ++ kbase_jd_atom_id(kctx, node)); + } else { + node->event_code = katom->event_code; + @@ -214649,7 +246700,8 @@ index 000000000000..d0674d1bd8f4 + !node->will_fail_event_code) { + /* Node successfully submitted, try submitting + * dependencies as they may now be representable -+ * in JS */ ++ * in JS ++ */ + jd_try_submitting_deps(&runnable_jobs, node); + } + } @@ -214658,25 +246710,29 @@ index 000000000000..d0674d1bd8f4 + * is in a disjoint state (ie. being reset). + */ + kbase_disjoint_event_potential(kctx->kbdev); -+ if (completed_jobs_ctx) -+ list_add_tail(&katom->jd_item, completed_jobs_ctx); -+ else ++ if (post_immediately && list_empty(&kctx->completed_jobs)) + kbase_event_post(kctx, katom); ++ else ++ list_add_tail(&katom->jd_item, &kctx->completed_jobs); + + /* Decrement and check the TOTAL number of jobs. This includes + * those not tracked by the scheduler: 'not ready to run' and -+ * 'dependency-only' jobs. */ ++ * 'dependency-only' jobs. ++ */ + if (--kctx->jctx.job_nr == 0) -+ wake_up(&kctx->jctx.zero_jobs_wait); /* All events are safely queued now, and we can signal any waiter -+ * that we've got no more jobs (so we can be safely terminated) */ ++ /* All events are safely queued now, and we can signal ++ * any waiter that we've got no more jobs (so we can be ++ * safely terminated) ++ */ ++ wake_up(&kctx->jctx.zero_jobs_wait); + } -+ ++ KBASE_TLSTREAM_TL_JD_DONE_NO_LOCK_END(kctx->kbdev, katom); + return need_to_try_schedule_context; +} + -+KBASE_EXPORT_TEST_API(jd_done_nolock); ++KBASE_EXPORT_TEST_API(kbase_jd_done_nolock); + -+#ifdef CONFIG_GPU_TRACEPOINTS ++#if IS_ENABLED(CONFIG_GPU_TRACEPOINTS) +enum { + CORE_REQ_DEP_ONLY, + CORE_REQ_SOFT, @@ -214760,13 +246816,14 @@ index 000000000000..d0674d1bd8f4 + unsigned long flags; + enum kbase_jd_atom_state status; + -+ dev_dbg(kbdev->dev, "User did JD submit atom %p\n", (void *)katom); ++ dev_dbg(kbdev->dev, "User did JD submit atom %pK\n", (void *)katom); + + /* Update the TOTAL number of jobs. This includes those not tracked by -+ * the scheduler: 'not ready to run' and 'dependency-only' jobs. */ ++ * the scheduler: 'not ready to run' and 'dependency-only' jobs. ++ */ + jctx->job_nr++; + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++#if KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE + katom->start_timestamp.tv64 = 0; +#else + katom->start_timestamp = 0; @@ -214781,7 +246838,6 @@ index 000000000000..d0674d1bd8f4 + katom->jobslot = user_atom->jobslot; + katom->seq_nr = user_atom->seq_nr; + katom->atom_flags = 0; -+ katom->retry_count = 0; + katom->need_cache_flush_cores_retained = 0; + katom->pre_dep = NULL; + katom->post_dep = NULL; @@ -214815,14 +246871,11 @@ index 000000000000..d0674d1bd8f4 + + INIT_LIST_HEAD(&katom->queue); + INIT_LIST_HEAD(&katom->jd_item); -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ kbase_fence_dep_count_set(katom, -1); -+#endif + + /* Don't do anything if there is a mess up with dependencies. -+ This is done in a separate cycle to check both the dependencies at ones, otherwise -+ it will be extra complexity to deal with 1st dependency ( just added to the list ) -+ if only the 2nd one has invalid config. ++ * This is done in a separate cycle to check both the dependencies at ones, otherwise ++ * it will be extra complexity to deal with 1st dependency ( just added to the list ) ++ * if only the 2nd one has invalid config. + */ + for (i = 0; i < 2; i++) { + int dep_atom_number = user_atom->pre_dep[i].atom_id; @@ -214834,15 +246887,15 @@ index 000000000000..d0674d1bd8f4 + katom->event_code = BASE_JD_EVENT_JOB_CONFIG_FAULT; + katom->status = KBASE_JD_ATOM_STATE_COMPLETED; + dev_dbg(kbdev->dev, -+ "Atom %p status to completed\n", ++ "Atom %pK status to completed\n", + (void *)katom); + + /* Wrong dependency setup. Atom will be sent + * back to user space. Do not record any -+ * dependencies. */ ++ * dependencies. ++ */ + jd_trace_atom_submit(kctx, katom, NULL); -+ -+ return jd_done_nolock(katom, NULL); ++ return kbase_jd_done_nolock(katom, true); + } + } + } @@ -214876,7 +246929,7 @@ index 000000000000..d0674d1bd8f4 + /* Atom has completed, propagate the error code if any */ + katom->event_code = dep_atom->event_code; + katom->status = KBASE_JD_ATOM_STATE_QUEUED; -+ dev_dbg(kbdev->dev, "Atom %p status to queued\n", ++ dev_dbg(kbdev->dev, "Atom %pK status to queued\n", + (void *)katom); + + /* This atom will be sent back to user space. @@ -214906,9 +246959,10 @@ index 000000000000..d0674d1bd8f4 + if (err >= 0) + kbase_finish_soft_job(katom); + } -+ -+ return jd_done_nolock(katom, NULL); ++ return kbase_jd_done_nolock(katom, true); + } ++ ++ katom->will_fail_event_code = katom->event_code; + } + + /* These must occur after the above loop to ensure that an atom @@ -214917,18 +246971,21 @@ index 000000000000..d0674d1bd8f4 + */ + katom->event_code = BASE_JD_EVENT_DONE; + katom->status = KBASE_JD_ATOM_STATE_QUEUED; -+ dev_dbg(kbdev->dev, "Atom %p status to queued\n", (void *)katom); ++ dev_dbg(kbdev->dev, "Atom %pK status to queued\n", (void *)katom); + + /* For invalid priority, be most lenient and choose the default */ + sched_prio = kbasep_js_atom_prio_to_sched_prio(user_atom->prio); + if (sched_prio == KBASE_JS_ATOM_SCHED_PRIO_INVALID) + sched_prio = KBASE_JS_ATOM_SCHED_PRIO_DEFAULT; -+ katom->sched_priority = sched_prio; ++ ++ /* Cap the priority to jctx.max_priority */ ++ katom->sched_priority = (sched_prio < kctx->jctx.max_priority) ? ++ kctx->jctx.max_priority : sched_prio; + + /* Create a new atom. */ + jd_trace_atom_submit(kctx, katom, &katom->sched_priority); + -+#if !MALI_INCREMENTAL_RENDERING ++#if !MALI_INCREMENTAL_RENDERING_JM + /* Reject atoms for incremental rendering if not supported */ + if (katom->core_req & + (BASE_JD_REQ_START_RENDERPASS|BASE_JD_REQ_END_RENDERPASS)) { @@ -214936,9 +246993,9 @@ index 000000000000..d0674d1bd8f4 + "Rejecting atom with unsupported core_req 0x%x\n", + katom->core_req); + katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ return jd_done_nolock(katom, NULL); ++ return kbase_jd_done_nolock(katom, true); + } -+#endif /* !MALI_INCREMENTAL_RENDERING */ ++#endif /* !MALI_INCREMENTAL_RENDERING_JM */ + + if (katom->core_req & BASE_JD_REQ_END_RENDERPASS) { + WARN_ON(katom->jc != 0); @@ -214950,7 +247007,7 @@ index 000000000000..d0674d1bd8f4 + */ + dev_err(kctx->kbdev->dev, "Rejecting atom with jc = NULL\n"); + katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ return jd_done_nolock(katom, NULL); ++ return kbase_jd_done_nolock(katom, true); + } + + /* Reject atoms with an invalid device_nr */ @@ -214960,7 +247017,7 @@ index 000000000000..d0674d1bd8f4 + "Rejecting atom with invalid device_nr %d\n", + katom->device_nr); + katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ return jd_done_nolock(katom, NULL); ++ return kbase_jd_done_nolock(katom, true); + } + + /* Reject atoms with invalid core requirements */ @@ -214970,7 +247027,7 @@ index 000000000000..d0674d1bd8f4 + "Rejecting atom with invalid core requirements\n"); + katom->event_code = BASE_JD_EVENT_JOB_INVALID; + katom->core_req &= ~BASE_JD_REQ_EVENT_COALESCE; -+ return jd_done_nolock(katom, NULL); ++ return kbase_jd_done_nolock(katom, true); + } + + /* Reject soft-job atom of certain types from accessing external resources */ @@ -214981,7 +247038,7 @@ index 000000000000..d0674d1bd8f4 + dev_err(kctx->kbdev->dev, + "Rejecting soft-job atom accessing external resources\n"); + katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ return jd_done_nolock(katom, NULL); ++ return kbase_jd_done_nolock(katom, true); + } + + if (katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) { @@ -214989,7 +247046,7 @@ index 000000000000..d0674d1bd8f4 + if (kbase_jd_pre_external_resources(katom, user_atom) != 0) { + /* setup failed (no access, bad resource, unknown resource types, etc.) */ + katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ return jd_done_nolock(katom, NULL); ++ return kbase_jd_done_nolock(katom, true); + } + } + @@ -215000,7 +247057,7 @@ index 000000000000..d0674d1bd8f4 + * JIT IDs - atom is invalid. + */ + katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ return jd_done_nolock(katom, NULL); ++ return kbase_jd_done_nolock(katom, true); + } +#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ + @@ -215014,17 +247071,17 @@ index 000000000000..d0674d1bd8f4 + if ((katom->core_req & BASE_JD_REQ_SOFT_JOB) == 0) { + if (!kbase_js_is_atom_valid(kctx->kbdev, katom)) { + katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ return jd_done_nolock(katom, NULL); ++ return kbase_jd_done_nolock(katom, true); + } + } else { + /* Soft-job */ + if (kbase_prepare_soft_job(katom) != 0) { + katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ return jd_done_nolock(katom, NULL); ++ return kbase_jd_done_nolock(katom, true); + } + } + -+#ifdef CONFIG_GPU_TRACEPOINTS ++#if IS_ENABLED(CONFIG_GPU_TRACEPOINTS) + katom->work_id = atomic_inc_return(&jctx->work_id); + trace_gpu_job_enqueue(kctx->id, katom->work_id, + kbasep_map_core_reqs_to_string(katom->core_req)); @@ -215033,16 +247090,10 @@ index 000000000000..d0674d1bd8f4 + if (queued && !IS_GPU_ATOM(katom)) + return false; + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ if (kbase_fence_dep_count_read(katom) != -1) -+ return false; -+ -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ -+ + if (katom->core_req & BASE_JD_REQ_SOFT_JOB) { + if (kbase_process_soft_job(katom) == 0) { + kbase_finish_soft_job(katom); -+ return jd_done_nolock(katom, NULL); ++ return kbase_jd_done_nolock(katom, true); + } + return false; + } @@ -215051,7 +247102,7 @@ index 000000000000..d0674d1bd8f4 + bool need_to_try_schedule_context; + + katom->status = KBASE_JD_ATOM_STATE_IN_JS; -+ dev_dbg(kctx->kbdev->dev, "Atom %p status to in JS\n", ++ dev_dbg(kctx->kbdev->dev, "Atom %pK status to in JS\n", + (void *)katom); + + need_to_try_schedule_context = kbasep_js_add_job(kctx, katom); @@ -215072,7 +247123,7 @@ index 000000000000..d0674d1bd8f4 + } + + /* This is a pure dependency. Resolve it immediately */ -+ return jd_done_nolock(katom, NULL); ++ return kbase_jd_done_nolock(katom, true); +} + +int kbase_jd_submit(struct kbase_context *kctx, @@ -215087,7 +247138,7 @@ index 000000000000..d0674d1bd8f4 + u32 latest_flush; + + bool jd_atom_is_v2 = (stride == sizeof(struct base_jd_atom_v2) || -+ stride == offsetof(struct base_jd_atom_v2, renderpass_id)); ++ stride == offsetof(struct base_jd_atom_v2, renderpass_id)); + + /* + * kbase_jd_submit isn't expected to fail and so all errors with the @@ -215095,8 +247146,6 @@ index 000000000000..d0674d1bd8f4 + */ + kbdev = kctx->kbdev; + -+ beenthere(kctx, "%s", "Enter"); -+ + if (kbase_ctx_flag(kctx, KCTX_SUBMIT_DISABLED)) { + dev_err(kbdev->dev, "Attempt to submit to a context that has SUBMIT_DISABLED set on it\n"); + return -EINVAL; @@ -215112,18 +247161,26 @@ index 000000000000..d0674d1bd8f4 + return -EINVAL; + } + ++ if (nr_atoms > BASE_JD_ATOM_COUNT) { ++ dev_dbg(kbdev->dev, "Invalid attempt to submit %u atoms at once for kctx %d_%d", ++ nr_atoms, kctx->tgid, kctx->id); ++ return -EINVAL; ++ } ++ + /* All atoms submitted in this call have the same flush ID */ + latest_flush = kbase_backend_get_current_flush_id(kbdev); + + for (i = 0; i < nr_atoms; i++) { -+ struct base_jd_atom user_atom; ++ struct base_jd_atom user_atom = { ++ .seq_nr = 0, ++ }; + struct base_jd_fragment user_jc_incr; + struct kbase_jd_atom *katom; + + if (unlikely(jd_atom_is_v2)) { + if (copy_from_user(&user_atom.jc, user_addr, sizeof(struct base_jd_atom_v2)) != 0) { -+ dev_err(kbdev->dev, -+ "Invalid atom address %p passed to job_submit\n", ++ dev_dbg(kbdev->dev, ++ "Invalid atom address %pK passed to job_submit\n", + user_addr); + err = -EFAULT; + break; @@ -215133,8 +247190,8 @@ index 000000000000..d0674d1bd8f4 + user_atom.seq_nr = 0; + } else { + if (copy_from_user(&user_atom, user_addr, stride) != 0) { -+ dev_err(kbdev->dev, -+ "Invalid atom address %p passed to job_submit\n", ++ dev_dbg(kbdev->dev, ++ "Invalid atom address %pK passed to job_submit\n", + user_addr); + err = -EFAULT; + break; @@ -215230,16 +247287,22 @@ index 000000000000..d0674d1bd8f4 + } + mutex_lock(&jctx->lock); + } -+ ++ KBASE_TLSTREAM_TL_JD_SUBMIT_ATOM_START(kbdev, katom); + need_to_try_schedule_context |= jd_submit_atom(kctx, &user_atom, + &user_jc_incr, katom); -+ ++ KBASE_TLSTREAM_TL_JD_SUBMIT_ATOM_END(kbdev, katom); + /* Register a completed job as a disjoint event when the GPU is in a disjoint state + * (ie. being reset). + */ + kbase_disjoint_event_potential(kbdev); + + mutex_unlock(&jctx->lock); ++ if (fatal_signal_pending(current)) { ++ dev_dbg(kbdev->dev, "Fatal signal pending for kctx %d_%d", ++ kctx->tgid, kctx->id); ++ /* We're being killed so the result code doesn't really matter */ ++ return 0; ++ } + } + + if (need_to_try_schedule_context) @@ -215272,7 +247335,7 @@ index 000000000000..d0674d1bd8f4 + js_kctx_info = &kctx->jctx.sched_info; + js_devdata = &kbdev->js_data; + -+ dev_dbg(kbdev->dev, "Enter atom %p done worker for kctx %p\n", ++ dev_dbg(kbdev->dev, "Enter atom %pK done worker for kctx %pK\n", + (void *)katom, (void *)kctx); + + KBASE_KTRACE_ADD_JM(kbdev, JD_DONE_WORKER, kctx, katom, katom->jc, 0); @@ -215296,7 +247359,7 @@ index 000000000000..d0674d1bd8f4 + if (katom->event_code == BASE_JD_EVENT_STOPPED) { + unsigned long flags; + -+ dev_dbg(kbdev->dev, "Atom %p has been promoted to stopped\n", ++ dev_dbg(kbdev->dev, "Atom %pK has been promoted to stopped\n", + (void *)katom); + mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); + mutex_unlock(&js_devdata->queue_mutex); @@ -215304,7 +247367,7 @@ index 000000000000..d0674d1bd8f4 + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + + katom->status = KBASE_JD_ATOM_STATE_IN_JS; -+ dev_dbg(kctx->kbdev->dev, "Atom %p status to in JS\n", ++ dev_dbg(kctx->kbdev->dev, "Atom %pK status to in JS\n", + (void *)katom); + kbase_js_unpull(kctx, katom); + @@ -215315,11 +247378,13 @@ index 000000000000..d0674d1bd8f4 + } + + if ((katom->event_code != BASE_JD_EVENT_DONE) && -+ (!kbase_ctx_flag(katom->kctx, KCTX_DYING))) -+ dev_err(kbdev->dev, -+ "t6xx: GPU fault 0x%02lx from job slot %d\n", -+ (unsigned long)katom->event_code, -+ katom->slot_nr); ++ (!kbase_ctx_flag(katom->kctx, KCTX_DYING))) { ++ if (!kbase_is_quick_reset_enabled(kbdev)) ++ dev_err(kbdev->dev, ++ "t6xx: GPU fault 0x%02lx from job slot %d\n", ++ (unsigned long)katom->event_code, ++ katom->slot_nr); ++ } + + /* Retain state before the katom disappears */ + kbasep_js_atom_retained_state_copy(&katom_retained_state, katom); @@ -215331,9 +247396,8 @@ index 000000000000..d0674d1bd8f4 + kbasep_js_remove_job(kbdev, kctx, katom); + mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); + mutex_unlock(&js_devdata->queue_mutex); -+ katom->atom_flags &= ~KBASE_KATOM_FLAG_HOLDING_CTX_REF; -+ /* jd_done_nolock() requires the jsctx_mutex lock to be dropped */ -+ jd_done_nolock(katom, &kctx->completed_jobs); ++ /* kbase_jd_done_nolock() requires the jsctx_mutex lock to be dropped */ ++ kbase_jd_done_nolock(katom, false); + + /* katom may have been freed now, do not use! */ + @@ -215350,22 +247414,23 @@ index 000000000000..d0674d1bd8f4 + * drop our reference. But do not call kbase_jm_idle_ctx(), as + * the context is active and fast-starting is allowed. + * -+ * If an atom has been fast-started then kctx->atoms_pulled will -+ * be non-zero but KCTX_ACTIVE will still be false (as the -+ * previous pm reference has been inherited). Do NOT drop our -+ * reference, as it has been re-used, and leave the context as -+ * active. ++ * If an atom has been fast-started then ++ * kbase_jsctx_atoms_pulled(kctx) will return non-zero but ++ * KCTX_ACTIVE will still be false (as the previous pm ++ * reference has been inherited). Do NOT drop our reference, as ++ * it has been re-used, and leave the context as active. + * -+ * If no new atoms have been started then KCTX_ACTIVE will still -+ * be false and atoms_pulled will be zero, so drop the reference -+ * and call kbase_jm_idle_ctx(). ++ * If no new atoms have been started then KCTX_ACTIVE will ++ * still be false and kbase_jsctx_atoms_pulled(kctx) will ++ * return zero, so drop the reference and call ++ * kbase_jm_idle_ctx(). + * + * As the checks are done under both the queue_mutex and + * hwaccess_lock is should be impossible for this to race + * with the scheduler code. + */ + if (kbase_ctx_flag(kctx, KCTX_ACTIVE) || -+ !atomic_read(&kctx->atoms_pulled)) { ++ !kbase_jsctx_atoms_pulled(kctx)) { + /* Calling kbase_jm_idle_ctx() here will ensure that + * atoms are not fast-started when we drop the + * hwaccess_lock. This is not performed if @@ -215389,15 +247454,18 @@ index 000000000000..d0674d1bd8f4 + mutex_unlock(&jctx->lock); + + /* Job is now no longer running, so can now safely release the context -+ * reference, and handle any actions that were logged against the atom's retained state */ ++ * reference, and handle any actions that were logged against the ++ * atom's retained state ++ */ + + kbasep_js_runpool_release_ctx_and_katom_retained_state(kbdev, kctx, &katom_retained_state); + + kbase_js_sched_all(kbdev); + + if (!atomic_dec_return(&kctx->work_count)) { -+ /* If worker now idle then post all events that jd_done_nolock() -+ * has queued */ ++ /* If worker now idle then post all events that kbase_jd_done_nolock() ++ * has queued ++ */ + mutex_lock(&jctx->lock); + while (!list_empty(&kctx->completed_jobs)) { + struct kbase_jd_atom *atom = list_entry( @@ -215417,7 +247485,7 @@ index 000000000000..d0674d1bd8f4 + + KBASE_KTRACE_ADD_JM(kbdev, JD_DONE_WORKER_END, kctx, NULL, cache_jc, 0); + -+ dev_dbg(kbdev->dev, "Leave atom %p done worker for kctx %p\n", ++ dev_dbg(kbdev->dev, "Leave atom %pK done worker for kctx %pK\n", + (void *)katom, (void *)kctx); +} + @@ -215444,6 +247512,7 @@ index 000000000000..d0674d1bd8f4 + bool need_to_try_schedule_context; + bool attr_state_changed; + struct kbase_device *kbdev; ++ CSTD_UNUSED(need_to_try_schedule_context); + + /* Soft jobs should never reach this function */ + KBASE_DEBUG_ASSERT((katom->core_req & BASE_JD_REQ_SOFT_JOB) == 0); @@ -215469,10 +247538,11 @@ index 000000000000..d0674d1bd8f4 + + mutex_lock(&jctx->lock); + -+ need_to_try_schedule_context = jd_done_nolock(katom, NULL); ++ need_to_try_schedule_context = kbase_jd_done_nolock(katom, true); + /* Because we're zapping, we're not adding any more jobs to this ctx, so no need to + * schedule the context. There's also no need for the jsctx_mutex to have been taken -+ * around this too. */ ++ * around this too. ++ */ + KBASE_DEBUG_ASSERT(!need_to_try_schedule_context); + + /* katom may have been freed now, do not use! */ @@ -215512,6 +247582,8 @@ index 000000000000..d0674d1bd8f4 + kbdev = kctx->kbdev; + KBASE_DEBUG_ASSERT(kbdev); + ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ + if (done_code & KBASE_JS_ATOM_DONE_EVICTED_FROM_NEXT) + katom->event_code = BASE_JD_EVENT_REMOVED_FROM_NEXT; + @@ -215523,7 +247595,7 @@ index 000000000000..d0674d1bd8f4 + + atomic_inc(&kctx->work_count); + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) + /* a failed job happened and is waiting for dumping*/ + if (!katom->will_fail_event_code && + kbase_debug_job_fault_process(katom, katom->event_code)) @@ -215541,12 +247613,12 @@ index 000000000000..d0674d1bd8f4 +{ + struct kbase_context *kctx; + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); -+ KBASE_DEBUG_ASSERT(NULL != katom); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(katom != NULL); + kctx = katom->kctx; -+ KBASE_DEBUG_ASSERT(NULL != kctx); ++ KBASE_DEBUG_ASSERT(kctx != NULL); + -+ dev_dbg(kbdev->dev, "JD: cancelling atom %p\n", (void *)katom); ++ dev_dbg(kbdev->dev, "JD: cancelling atom %pK\n", (void *)katom); + KBASE_KTRACE_ADD_JM(kbdev, JD_CANCEL, kctx, katom, katom->jc, 0); + + /* This should only be done from a context that is not scheduled */ @@ -215588,21 +247660,9 @@ index 000000000000..d0674d1bd8f4 + kbase_cancel_soft_job(katom); + } + -+ -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ kbase_dma_fence_cancel_all_atoms(kctx); -+#endif -+ + mutex_unlock(&kctx->jctx.lock); + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ /* Flush dma-fence workqueue to ensure that any callbacks that may have -+ * been queued are done before continuing. -+ */ -+ flush_workqueue(kctx->dma_fence.wq); -+#endif -+ -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) + kbase_debug_job_fault_kctx_unblock(kctx); +#endif + @@ -215615,12 +247675,15 @@ index 000000000000..d0674d1bd8f4 +{ + int i; + int mali_err = 0; ++ struct priority_control_manager_device *pcm_device = NULL; + + KBASE_DEBUG_ASSERT(kctx); ++ pcm_device = kctx->kbdev->pcm_dev; ++ kctx->jctx.max_priority = KBASE_JS_ATOM_SCHED_PRIO_REALTIME; + + kctx->jctx.job_done_wq = alloc_workqueue("mali_jd", + WQ_HIGHPRI | WQ_UNBOUND, 1); -+ if (NULL == kctx->jctx.job_done_wq) { ++ if (kctx->jctx.job_done_wq == NULL) { + mali_err = -ENOMEM; + goto out1; + } @@ -215635,11 +247698,10 @@ index 000000000000..d0674d1bd8f4 + kctx->jctx.atoms[i].event_code = BASE_JD_EVENT_JOB_INVALID; + kctx->jctx.atoms[i].status = KBASE_JD_ATOM_STATE_UNUSED; + -+#if defined(CONFIG_MALI_BIFROST_DMA_FENCE) || defined(CONFIG_SYNC_FILE) ++#if IS_ENABLED(CONFIG_SYNC_FILE) + kctx->jctx.atoms[i].dma_fence.context = + dma_fence_context_alloc(1); + atomic_set(&kctx->jctx.atoms[i].dma_fence.seqno, 0); -+ INIT_LIST_HEAD(&kctx->jctx.atoms[i].dma_fence.callbacks); +#endif + } + @@ -215656,6 +247718,11 @@ index 000000000000..d0674d1bd8f4 + INIT_LIST_HEAD(&kctx->completed_jobs); + atomic_set(&kctx->work_count, 0); + ++ /* Check if there are platform rules for maximum priority */ ++ if (pcm_device) ++ kctx->jctx.max_priority = pcm_device->ops.pcm_scheduler_priority_check( ++ pcm_device, current, KBASE_JS_ATOM_SCHED_PRIO_REALTIME); ++ + return 0; + + out1: @@ -215675,18 +247742,19 @@ index 000000000000..d0674d1bd8f4 +KBASE_EXPORT_TEST_API(kbase_jd_exit); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c new file mode 100755 -index 000000000000..6b0c36d6b93f +index 000000000..6196c0985 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c -@@ -0,0 +1,250 @@ +@@ -0,0 +1,199 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -215697,20 +247765,17 @@ index 000000000000..6b0c36d6b93f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) + +#include +#include +#include -+#include -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#if IS_ENABLED(CONFIG_SYNC_FILE) +#include +#endif -+#include ++#include + +struct kbase_jd_debugfs_depinfo { + u8 id; @@ -215720,7 +247785,7 @@ index 000000000000..6b0c36d6b93f +static void kbase_jd_debugfs_fence_info(struct kbase_jd_atom *atom, + struct seq_file *sfile) +{ -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#if IS_ENABLED(CONFIG_SYNC_FILE) + struct kbase_sync_fence_info info; + int res; + @@ -215728,65 +247793,19 @@ index 000000000000..6b0c36d6b93f + case BASE_JD_REQ_SOFT_FENCE_TRIGGER: + res = kbase_sync_fence_out_info_get(atom, &info); + if (res == 0) -+ seq_printf(sfile, "Sa([%p]%d) ", ++ seq_printf(sfile, "Sa([%pK]%d) ", + info.fence, info.status); + break; + case BASE_JD_REQ_SOFT_FENCE_WAIT: + res = kbase_sync_fence_in_info_get(atom, &info); + if (res == 0) -+ seq_printf(sfile, "Wa([%p]%d) ", ++ seq_printf(sfile, "Wa([%pK]%d) ", + info.fence, info.status); + break; + default: + break; + } -+#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ -+ -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ if (atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) { -+ struct kbase_fence_cb *cb; -+ -+ if (atom->dma_fence.fence) { -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence = atom->dma_fence.fence; -+#else -+ struct dma_fence *fence = atom->dma_fence.fence; -+#endif -+ -+ seq_printf(sfile, -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) -+ "Sd(%u#%u: %s) ", -+#else -+ "Sd(%llu#%u: %s) ", -+#endif -+ fence->context, -+ fence->seqno, -+ dma_fence_is_signaled(fence) ? -+ "signaled" : "active"); -+ } -+ -+ list_for_each_entry(cb, &atom->dma_fence.callbacks, -+ node) { -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence = cb->fence; -+#else -+ struct dma_fence *fence = cb->fence; -+#endif -+ -+ seq_printf(sfile, -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) -+ "Wd(%u#%u: %s) ", -+#else -+ "Wd(%llu#%u: %s) ", -+#endif -+ fence->context, -+ fence->seqno, -+ dma_fence_is_signaled(fence) ? -+ "signaled" : "active"); -+ } -+ } -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ -+ ++#endif /* CONFIG_SYNC_FILE */ +} + +static void kbasep_jd_debugfs_atom_deps( @@ -215797,7 +247816,7 @@ index 000000000000..6b0c36d6b93f + int i; + + for (i = 0; i < 2; i++) { -+ deps[i].id = (unsigned)(atom->dep[i].atom ? ++ deps[i].id = (unsigned int)(atom->dep[i].atom ? + kbase_jd_atom_id(kctx, atom->dep[i].atom) : 0); + + switch (atom->dep[i].dep_type) { @@ -215844,7 +247863,7 @@ index 000000000000..6b0c36d6b93f + BASE_UK_VERSION_MINOR); + + /* Print table heading */ -+ seq_puts(sfile, " ID, Core req, St, CR, Predeps, Start time, Additional info...\n"); ++ seq_puts(sfile, " ID, Core req, St, Predeps, Start time, Additional info...\n"); + + atoms = kctx->jctx.atoms; + /* General atom states */ @@ -215861,10 +247880,11 @@ index 000000000000..6b0c36d6b93f + + /* start_timestamp is cleared as soon as the atom leaves UNUSED state + * and set before a job is submitted to the h/w, a non-zero value means -+ * it is valid */ ++ * it is valid ++ */ + if (ktime_to_ns(atom->start_timestamp)) -+ start_timestamp = ktime_to_ns( -+ ktime_sub(ktime_get(), atom->start_timestamp)); ++ start_timestamp = ++ ktime_to_ns(ktime_sub(ktime_get_raw(), atom->start_timestamp)); + + kbasep_jd_debugfs_atom_deps(deps, atom); + @@ -215909,11 +247929,7 @@ index 000000000000..6b0c36d6b93f + +void kbasep_jd_debugfs_ctx_init(struct kbase_context *kctx) +{ -+#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE) -+ const mode_t mode = S_IRUGO; -+#else -+ const mode_t mode = S_IRUSR; -+#endif ++ const mode_t mode = 0444; + + /* Caller already ensures this, but we keep the pattern for + * maintenance safety. @@ -215931,18 +247947,19 @@ index 000000000000..6b0c36d6b93f +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h new file mode 100755 -index 000000000000..697bdef4d434 +index 000000000..8e6140c43 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h -@@ -0,0 +1,45 @@ +@@ -0,0 +1,43 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2018, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -215953,13 +247970,10 @@ index 000000000000..697bdef4d434 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** -+ * @file mali_kbase_jd_debugfs.h -+ * Header file for job dispatcher-related entries in debugfs ++ * DOC: Header file for job dispatcher-related entries in debugfs + */ + +#ifndef _KBASE_JD_DEBUGFS_H @@ -215975,25 +247989,26 @@ index 000000000000..697bdef4d434 +/** + * kbasep_jd_debugfs_ctx_init() - Add debugfs entries for JD system + * -+ * @kctx Pointer to kbase_context ++ * @kctx: Pointer to kbase_context + */ +void kbasep_jd_debugfs_ctx_init(struct kbase_context *kctx); + +#endif /*_KBASE_JD_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jm.c b/drivers/gpu/arm/bifrost/mali_kbase_jm.c new file mode 100755 -index 000000000000..fb15a8c1727a +index 000000000..1ac5cd3ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jm.c -@@ -0,0 +1,155 @@ +@@ -0,0 +1,153 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2013-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -216004,11 +248019,8 @@ index 000000000000..fb15a8c1727a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ +/* + * HW access job manager common APIs + */ @@ -216027,15 +248039,13 @@ index 000000000000..fb15a8c1727a + * + * Return: true if slot can still be submitted on, false if slot is now full. + */ -+static bool kbase_jm_next_job(struct kbase_device *kbdev, int js, -+ int nr_jobs_to_submit) ++static bool kbase_jm_next_job(struct kbase_device *kbdev, unsigned int js, int nr_jobs_to_submit) +{ + struct kbase_context *kctx; + int i; + + kctx = kbdev->hwaccess.active_kctx[js]; -+ dev_dbg(kbdev->dev, -+ "Trying to run the next %d jobs in kctx %p (s:%d)\n", ++ dev_dbg(kbdev->dev, "Trying to run the next %d jobs in kctx %pK (s:%u)\n", + nr_jobs_to_submit, (void *)kctx, js); + + if (!kctx) @@ -216050,7 +248060,7 @@ index 000000000000..fb15a8c1727a + kbase_backend_run_atom(kbdev, katom); + } + -+ dev_dbg(kbdev->dev, "Slot ringbuffer should now be full (s:%d)\n", js); ++ dev_dbg(kbdev->dev, "Slot ringbuffer should now be full (s:%u)\n", js); + return false; +} + @@ -216062,7 +248072,7 @@ index 000000000000..fb15a8c1727a + dev_dbg(kbdev->dev, "JM kick slot mask 0x%x\n", js_mask); + + while (js_mask) { -+ int js = ffs(js_mask) - 1; ++ unsigned int js = ffs(js_mask) - 1; + int nr_jobs_to_submit = kbase_backend_slot_free(kbdev, js); + + if (kbase_jm_next_job(kbdev, js, nr_jobs_to_submit)) @@ -216098,39 +248108,41 @@ index 000000000000..fb15a8c1727a + up(&js_devdata->schedule_sem); + } +} -+#endif /* !MALI_USE_CSF */ + +void kbase_jm_idle_ctx(struct kbase_device *kbdev, struct kbase_context *kctx) +{ -+ int js; ++ unsigned int js; + + lockdep_assert_held(&kbdev->hwaccess_lock); + + for (js = 0; js < BASE_JM_MAX_NR_SLOTS; js++) { + if (kbdev->hwaccess.active_kctx[js] == kctx) { -+ dev_dbg(kbdev->dev, "Marking kctx %p as inactive (s:%d)\n", -+ (void *)kctx, js); ++ dev_dbg(kbdev->dev, "Marking kctx %pK as inactive (s:%u)\n", (void *)kctx, ++ js); + kbdev->hwaccess.active_kctx[js] = NULL; + } + } +} + -+#if !MALI_USE_CSF +struct kbase_jd_atom *kbase_jm_return_atom_to_js(struct kbase_device *kbdev, + struct kbase_jd_atom *katom) +{ + lockdep_assert_held(&kbdev->hwaccess_lock); + -+ dev_dbg(kbdev->dev, "Atom %p is returning with event code 0x%x\n", ++ dev_dbg(kbdev->dev, "Atom %pK is returning with event code 0x%x\n", + (void *)katom, katom->event_code); + ++ KBASE_KTRACE_ADD_JM(kbdev, JM_RETURN_ATOM_TO_JS, katom->kctx, katom, ++ katom->jc, katom->event_code); ++ + if (katom->event_code != BASE_JD_EVENT_STOPPED && + katom->event_code != BASE_JD_EVENT_REMOVED_FROM_NEXT) { + return kbase_js_complete_atom(katom, NULL); -+ } else { -+ kbase_js_unpull(katom->kctx, katom); -+ return NULL; + } ++ ++ kbase_js_unpull(katom->kctx, katom); ++ ++ return NULL; +} + +struct kbase_jd_atom *kbase_jm_complete(struct kbase_device *kbdev, @@ -216143,18 +248155,19 @@ index 000000000000..fb15a8c1727a +#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_jm.h new file mode 100755 -index 000000000000..b3fd421a1ff3 +index 000000000..eeafcb6b1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jm.h -@@ -0,0 +1,119 @@ +@@ -0,0 +1,117 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014, 2016, 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2013-2014, 2016, 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -216165,11 +248178,8 @@ index 000000000000..b3fd421a1ff3 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ +/* + * Job manager common APIs + */ @@ -216225,6 +248235,7 @@ index 000000000000..b3fd421a1ff3 +void kbase_jm_try_kick_all(struct kbase_device *kbdev); +#endif /* !MALI_USE_CSF */ + ++#if !MALI_USE_CSF +/** + * kbase_jm_idle_ctx() - Mark a context as idle. + * @kbdev: Device pointer @@ -216234,13 +248245,12 @@ index 000000000000..b3fd421a1ff3 + * by kbase_js_use_ctx(). + * + * The context should have no atoms currently pulled from it -+ * (kctx->atoms_pulled == 0). ++ * (kbase_jsctx_atoms_pulled(kctx) == 0). + * + * Caller must hold the hwaccess_lock + */ +void kbase_jm_idle_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); + -+#if !MALI_USE_CSF +/** + * kbase_jm_return_atom_to_js() - Return an atom to the job scheduler that has + * been soft-stopped or will fail due to a @@ -216268,18 +248278,19 @@ index 000000000000..b3fd421a1ff3 +#endif /* _KBASE_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js.c b/drivers/gpu/arm/bifrost/mali_kbase_js.c new file mode 100755 -index 000000000000..9b338eb66531 +index 000000000..8ce09212a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js.c -@@ -0,0 +1,3760 @@ +@@ -0,0 +1,4007 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2011-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -216290,12 +248301,8 @@ index 000000000000..9b338eb66531 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/* + * Job Scheduler Implementation + */ @@ -216311,6 +248318,8 @@ index 000000000000..9b338eb66531 + +#include "mali_kbase_jm.h" +#include "mali_kbase_hwaccess_jm.h" ++#include ++#include + +/* + * Private types @@ -216319,26 +248328,30 @@ index 000000000000..9b338eb66531 +/* Bitpattern indicating the result of releasing a context */ +enum { + /* The context was descheduled - caller should try scheduling in a new -+ * one to keep the runpool full */ ++ * one to keep the runpool full ++ */ + KBASEP_JS_RELEASE_RESULT_WAS_DESCHEDULED = (1u << 0), + /* Ctx attributes were changed - caller should try scheduling all -+ * contexts */ ++ * contexts ++ */ + KBASEP_JS_RELEASE_RESULT_SCHED_ALL = (1u << 1) +}; + +typedef u32 kbasep_js_release_result; + +const int kbasep_js_atom_priority_to_relative[BASE_JD_NR_PRIO_LEVELS] = { -+ KBASE_JS_ATOM_SCHED_PRIO_MED, /* BASE_JD_PRIO_MEDIUM */ -+ KBASE_JS_ATOM_SCHED_PRIO_HIGH, /* BASE_JD_PRIO_HIGH */ -+ KBASE_JS_ATOM_SCHED_PRIO_LOW /* BASE_JD_PRIO_LOW */ ++ KBASE_JS_ATOM_SCHED_PRIO_MED, /* BASE_JD_PRIO_MEDIUM */ ++ KBASE_JS_ATOM_SCHED_PRIO_HIGH, /* BASE_JD_PRIO_HIGH */ ++ KBASE_JS_ATOM_SCHED_PRIO_LOW, /* BASE_JD_PRIO_LOW */ ++ KBASE_JS_ATOM_SCHED_PRIO_REALTIME /* BASE_JD_PRIO_REALTIME */ +}; + +const base_jd_prio +kbasep_js_relative_priority_to_atom[KBASE_JS_ATOM_SCHED_PRIO_COUNT] = { -+ BASE_JD_PRIO_HIGH, /* KBASE_JS_ATOM_SCHED_PRIO_HIGH */ -+ BASE_JD_PRIO_MEDIUM, /* KBASE_JS_ATOM_SCHED_PRIO_MED */ -+ BASE_JD_PRIO_LOW /* KBASE_JS_ATOM_SCHED_PRIO_LOW */ ++ BASE_JD_PRIO_REALTIME, /* KBASE_JS_ATOM_SCHED_PRIO_REALTIME */ ++ BASE_JD_PRIO_HIGH, /* KBASE_JS_ATOM_SCHED_PRIO_HIGH */ ++ BASE_JD_PRIO_MEDIUM, /* KBASE_JS_ATOM_SCHED_PRIO_MED */ ++ BASE_JD_PRIO_LOW /* KBASE_JS_ATOM_SCHED_PRIO_LOW */ +}; + + @@ -216349,11 +248362,10 @@ index 000000000000..9b338eb66531 + struct kbase_device *kbdev, struct kbase_context *kctx, + struct kbasep_js_atom_retained_state *katom_retained_state); + -+static int kbase_js_get_slot(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom); ++static unsigned int kbase_js_get_slot(struct kbase_device *kbdev, struct kbase_jd_atom *katom); + +static void kbase_js_foreach_ctx_job(struct kbase_context *kctx, -+ kbasep_js_ctx_job_cb callback); ++ kbasep_js_ctx_job_cb *callback); + +/* Helper for ktrace */ +#if KBASE_KTRACE_ENABLE @@ -216423,8 +248435,7 @@ index 000000000000..9b338eb66531 + * + * Return: true if there are no atoms to pull, false otherwise. + */ -+static inline bool -+jsctx_rb_none_to_pull_prio(struct kbase_context *kctx, int js, int prio) ++static inline bool jsctx_rb_none_to_pull_prio(struct kbase_context *kctx, unsigned int js, int prio) +{ + bool none_to_pull; + struct jsctx_queue *rb = &kctx->jsctx_queue[prio][js]; @@ -216433,9 +248444,8 @@ index 000000000000..9b338eb66531 + + none_to_pull = RB_EMPTY_ROOT(&rb->runnable_tree); + -+ dev_dbg(kctx->kbdev->dev, -+ "Slot %d (prio %d) is %spullable in kctx %p\n", -+ js, prio, none_to_pull ? "not " : "", kctx); ++ dev_dbg(kctx->kbdev->dev, "Slot %u (prio %d) is %spullable in kctx %pK\n", js, prio, ++ none_to_pull ? "not " : "", kctx); + + return none_to_pull; +} @@ -216451,14 +248461,13 @@ index 000000000000..9b338eb66531 + * Return: true if the ring buffers for all priorities have no pullable atoms, + * false otherwise. + */ -+static inline bool -+jsctx_rb_none_to_pull(struct kbase_context *kctx, int js) ++static inline bool jsctx_rb_none_to_pull(struct kbase_context *kctx, unsigned int js) +{ + int prio; + + lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ for (prio = KBASE_JS_ATOM_SCHED_PRIO_HIGH; ++ for (prio = KBASE_JS_ATOM_SCHED_PRIO_FIRST; + prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT; prio++) { + if (!jsctx_rb_none_to_pull_prio(kctx, js, prio)) + return false; @@ -216484,9 +248493,8 @@ index 000000000000..9b338eb66531 + * + * The HW access lock must always be held when calling this function. + */ -+static void -+jsctx_queue_foreach_prio(struct kbase_context *kctx, int js, int prio, -+ kbasep_js_ctx_job_cb callback) ++static void jsctx_queue_foreach_prio(struct kbase_context *kctx, unsigned int js, int prio, ++ kbasep_js_ctx_job_cb *callback) +{ + struct jsctx_queue *queue = &kctx->jsctx_queue[prio][js]; + @@ -216508,7 +248516,7 @@ index 000000000000..9b338eb66531 + WARN_ON(!(entry->core_req & + BASE_JD_REQ_END_RENDERPASS)); + dev_dbg(kctx->kbdev->dev, -+ "Del runnable atom %p from X_DEP list\n", ++ "Del runnable atom %pK from X_DEP list\n", + (void *)entry); + + list_del(&entry->queue); @@ -216524,7 +248532,7 @@ index 000000000000..9b338eb66531 + WARN_ON(!(entry->atom_flags & + KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST)); + dev_dbg(kctx->kbdev->dev, -+ "Del blocked atom %p from X_DEP list\n", ++ "Del blocked atom %pK from X_DEP list\n", + (void *)entry); + + list_del(queue->x_dep_head.next); @@ -216545,13 +248553,12 @@ index 000000000000..9b338eb66531 + * jsctx_queue_foreach_prio() to iterate over the queue and invoke @callback + * for each entry, and remove the entry from the queue. + */ -+static inline void -+jsctx_queue_foreach(struct kbase_context *kctx, int js, -+ kbasep_js_ctx_job_cb callback) ++static inline void jsctx_queue_foreach(struct kbase_context *kctx, unsigned int js, ++ kbasep_js_ctx_job_cb *callback) +{ + int prio; + -+ for (prio = KBASE_JS_ATOM_SCHED_PRIO_HIGH; ++ for (prio = KBASE_JS_ATOM_SCHED_PRIO_FIRST; + prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT; prio++) + jsctx_queue_foreach_prio(kctx, js, prio, callback); +} @@ -216567,15 +248574,14 @@ index 000000000000..9b338eb66531 + * + * Return: Pointer to next atom in buffer, or NULL if there is no atom. + */ -+static inline struct kbase_jd_atom * -+jsctx_rb_peek_prio(struct kbase_context *kctx, int js, int prio) ++static inline struct kbase_jd_atom *jsctx_rb_peek_prio(struct kbase_context *kctx, unsigned int js, ++ int prio) +{ + struct jsctx_queue *rb = &kctx->jsctx_queue[prio][js]; + struct rb_node *node; + + lockdep_assert_held(&kctx->kbdev->hwaccess_lock); -+ dev_dbg(kctx->kbdev->dev, -+ "Peeking runnable tree of kctx %p for prio %d (s:%d)\n", ++ dev_dbg(kctx->kbdev->dev, "Peeking runnable tree of kctx %pK for prio %d (s:%u)\n", + (void *)kctx, prio, js); + + node = rb_first(&rb->runnable_tree); @@ -216593,21 +248599,20 @@ index 000000000000..9b338eb66531 + * @js: Job slot id to check. + * + * Check the ring buffers for all priorities, starting from -+ * KBASE_JS_ATOM_SCHED_PRIO_HIGH, for the specified @js and @prio and return a ++ * KBASE_JS_ATOM_SCHED_PRIO_REALTIME, for the specified @js and @prio and return a + * pointer to the next atom, unless all the priority's ring buffers are empty. + * + * Caller must hold the hwaccess_lock. + * + * Return: Pointer to next atom in buffer, or NULL if there is no atom. + */ -+static inline struct kbase_jd_atom * -+jsctx_rb_peek(struct kbase_context *kctx, int js) ++static inline struct kbase_jd_atom *jsctx_rb_peek(struct kbase_context *kctx, unsigned int js) +{ + int prio; + + lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ for (prio = KBASE_JS_ATOM_SCHED_PRIO_HIGH; ++ for (prio = KBASE_JS_ATOM_SCHED_PRIO_FIRST; + prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT; prio++) { + struct kbase_jd_atom *katom; + @@ -216632,12 +248637,12 @@ index 000000000000..9b338eb66531 +jsctx_rb_pull(struct kbase_context *kctx, struct kbase_jd_atom *katom) +{ + int prio = katom->sched_priority; -+ int js = katom->slot_nr; ++ unsigned int js = katom->slot_nr; + struct jsctx_queue *rb = &kctx->jsctx_queue[prio][js]; + + lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ dev_dbg(kctx->kbdev->dev, "Erasing atom %p from runnable tree of kctx %p\n", ++ dev_dbg(kctx->kbdev->dev, "Erasing atom %pK from runnable tree of kctx %pK\n", + (void *)katom, (void *)kctx); + + /* Atoms must be pulled in the correct order. */ @@ -216646,28 +248651,26 @@ index 000000000000..9b338eb66531 + rb_erase(&katom->runnable_tree_node, &rb->runnable_tree); +} + -+#define LESS_THAN_WRAP(a, b) ((s32)(a - b) < 0) -+ +static void +jsctx_tree_add(struct kbase_context *kctx, struct kbase_jd_atom *katom) +{ + struct kbase_device *kbdev = kctx->kbdev; + int prio = katom->sched_priority; -+ int js = katom->slot_nr; ++ unsigned int js = katom->slot_nr; + struct jsctx_queue *queue = &kctx->jsctx_queue[prio][js]; + struct rb_node **new = &(queue->runnable_tree.rb_node), *parent = NULL; + + lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ dev_dbg(kbdev->dev, "Adding atom %p to runnable tree of kctx %p (s:%d)\n", -+ (void *)katom, (void *)kctx, js); ++ dev_dbg(kbdev->dev, "Adding atom %pK to runnable tree of kctx %pK (s:%u)\n", (void *)katom, ++ (void *)kctx, js); + + while (*new) { + struct kbase_jd_atom *entry = container_of(*new, + struct kbase_jd_atom, runnable_tree_node); + + parent = *new; -+ if (LESS_THAN_WRAP(katom->age, entry->age)) ++ if (kbase_jd_atom_is_younger(katom, entry)) + new = &((*new)->rb_left); + else + new = &((*new)->rb_right); @@ -216695,18 +248698,78 @@ index 000000000000..9b338eb66531 +{ + lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + ++ KBASE_KTRACE_ADD_JM(kctx->kbdev, JS_UNPULL_JOB, kctx, katom, katom->jc, ++ 0u); ++ + jsctx_tree_add(kctx, katom); +} + -+static bool kbase_js_ctx_pullable(struct kbase_context *kctx, -+ int js, -+ bool is_scheduled); ++static bool kbase_js_ctx_pullable(struct kbase_context *kctx, unsigned int js, bool is_scheduled); +static bool kbase_js_ctx_list_add_pullable_nolock(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js); ++ struct kbase_context *kctx, unsigned int js); +static bool kbase_js_ctx_list_add_unpullable_nolock(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js); ++ struct kbase_context *kctx, unsigned int js); ++ ++typedef bool(katom_ordering_func)(const struct kbase_jd_atom *, ++ const struct kbase_jd_atom *); ++ ++bool kbase_js_atom_runs_before(struct kbase_device *kbdev, ++ const struct kbase_jd_atom *katom_a, ++ const struct kbase_jd_atom *katom_b, ++ const kbase_atom_ordering_flag_t order_flags) ++{ ++ struct kbase_context *kctx_a = katom_a->kctx; ++ struct kbase_context *kctx_b = katom_b->kctx; ++ katom_ordering_func *samectxatomprio_ordering_func = ++ kbase_jd_atom_is_younger; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ if (order_flags & KBASE_ATOM_ORDERING_FLAG_SEQNR) ++ samectxatomprio_ordering_func = kbase_jd_atom_is_earlier; ++ ++ /* It only makes sense to make this test for atoms on the same slot */ ++ WARN_ON(katom_a->slot_nr != katom_b->slot_nr); ++ ++ if (kbdev->js_ctx_scheduling_mode == ++ KBASE_JS_PROCESS_LOCAL_PRIORITY_MODE) { ++ /* In local priority mode, querying either way around for "a ++ * should run before b" and "b should run before a" should ++ * always be false when they're from different contexts ++ */ ++ if (kctx_a != kctx_b) ++ return false; ++ } else { ++ /* In system priority mode, ordering is done first strictly by ++ * context priority, even when katom_b might be lower priority ++ * than katom_a. This is due to scheduling of contexts in order ++ * of highest priority first, regardless of whether the atoms ++ * for a particular slot from such contexts have the highest ++ * priority or not. ++ */ ++ if (kctx_a != kctx_b) { ++ if (kctx_a->priority < kctx_b->priority) ++ return true; ++ if (kctx_a->priority > kctx_b->priority) ++ return false; ++ } ++ } ++ ++ /* For same contexts/contexts with the same context priority (in system ++ * priority mode), ordering is next done by atom priority ++ */ ++ if (katom_a->sched_priority < katom_b->sched_priority) ++ return true; ++ if (katom_a->sched_priority > katom_b->sched_priority) ++ return false; ++ /* For atoms of same priority on the same kctx, they are ++ * ordered by seq_nr/age (dependent on caller) ++ */ ++ if (kctx_a == kctx_b && samectxatomprio_ordering_func(katom_a, katom_b)) ++ return true; ++ ++ return false; ++} + +/* + * Functions private to KBase ('Protected' functions) @@ -216722,7 +248785,8 @@ index 000000000000..9b338eb66531 + +#ifdef CONFIG_MALI_BIFROST_DEBUG + /* Soft-stop will be disabled on a single context by default unless -+ * softstop_always is set */ ++ * softstop_always is set ++ */ + jsdd->softstop_always = false; +#endif /* CONFIG_MALI_BIFROST_DEBUG */ + jsdd->nr_all_contexts_running = 0; @@ -216748,9 +248812,11 @@ index 000000000000..9b338eb66531 + jsdd->hard_stop_ticks_dumping = DEFAULT_JS_HARD_STOP_TICKS_DUMPING; + jsdd->gpu_reset_ticks_ss = DEFAULT_JS_RESET_TICKS_SS; + jsdd->gpu_reset_ticks_cl = DEFAULT_JS_RESET_TICKS_CL; ++ + jsdd->gpu_reset_ticks_dumping = DEFAULT_JS_RESET_TICKS_DUMPING; + jsdd->ctx_timeslice_ns = DEFAULT_JS_CTX_TIMESLICE_NS; + atomic_set(&jsdd->soft_job_timeout_ms, DEFAULT_JS_SOFT_JOB_TIMEOUT); ++ jsdd->js_free_wait_time_ms = kbase_get_timeout_ms(kbdev, JM_DEFAULT_JS_FREE_TIMEOUT); + + dev_dbg(kbdev->dev, "JS Config Attribs: "); + dev_dbg(kbdev->dev, "\tscheduling_period_ns:%u", @@ -216775,6 +248841,7 @@ index 000000000000..9b338eb66531 + jsdd->ctx_timeslice_ns); + dev_dbg(kbdev->dev, "\tsoft_job_timeout:%i", + atomic_read(&jsdd->soft_job_timeout_ms)); ++ dev_dbg(kbdev->dev, "\tjs_free_wait_time_ms:%u", jsdd->js_free_wait_time_ms); + + if (!(jsdd->soft_stop_ticks < jsdd->hard_stop_ticks_ss && + jsdd->hard_stop_ticks_ss < jsdd->gpu_reset_ticks_ss && @@ -216805,14 +248872,15 @@ index 000000000000..9b338eb66531 + kbdev->gpu_props.props.raw_props.js_features[i]); + + /* On error, we could continue on: providing none of the below resources -+ * rely on the ones above */ ++ * rely on the ones above ++ */ + + mutex_init(&jsdd->runpool_mutex); + mutex_init(&jsdd->queue_mutex); + sema_init(&jsdd->schedule_sem, 1); + + for (i = 0; i < kbdev->gpu_props.num_job_slots; ++i) { -+ for (j = 0; j < KBASE_JS_ATOM_SCHED_PRIO_COUNT; ++j) { ++ for (j = KBASE_JS_ATOM_SCHED_PRIO_FIRST; j < KBASE_JS_ATOM_SCHED_PRIO_COUNT; ++j) { + INIT_LIST_HEAD(&jsdd->ctx_list_pullable[i][j]); + INIT_LIST_HEAD(&jsdd->ctx_list_unpullable[i][j]); + } @@ -216830,6 +248898,7 @@ index 000000000000..9b338eb66531 +{ + struct kbasep_js_device_data *js_devdata; + s8 zero_ctx_attr_ref_count[KBASEP_JS_CTX_ATTR_COUNT] = { 0, }; ++ CSTD_UNUSED(js_devdata); + + KBASE_DEBUG_ASSERT(kbdev != NULL); + @@ -216847,14 +248916,13 @@ index 000000000000..9b338eb66531 + +int kbasep_js_kctx_init(struct kbase_context *const kctx) +{ -+ struct kbase_device *kbdev; + struct kbasep_js_kctx_info *js_kctx_info; + int i, j; ++ CSTD_UNUSED(js_kctx_info); + + KBASE_DEBUG_ASSERT(kctx != NULL); + -+ kbdev = kctx->kbdev; -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ kbase_ctx_sched_init_ctx(kctx); + + for (i = 0; i < BASE_JM_MAX_NR_SLOTS; ++i) + INIT_LIST_HEAD(&kctx->jctx.sched_info.ctx.ctx_list_entry[i]); @@ -216869,16 +248937,18 @@ index 000000000000..9b338eb66531 + sizeof(js_kctx_info->ctx.ctx_attr_ref_count)); + + /* Initially, the context is disabled from submission until the create -+ * flags are set */ ++ * flags are set ++ */ + kbase_ctx_flag_set(kctx, KCTX_SUBMIT_DISABLED); + + /* On error, we could continue on: providing none of the below resources -+ * rely on the ones above */ ++ * rely on the ones above ++ */ + mutex_init(&js_kctx_info->ctx.jsctx_mutex); + + init_waitqueue_head(&js_kctx_info->ctx.is_scheduled_wait); + -+ for (i = 0; i < KBASE_JS_ATOM_SCHED_PRIO_COUNT; i++) { ++ for (i = KBASE_JS_ATOM_SCHED_PRIO_FIRST; i < KBASE_JS_ATOM_SCHED_PRIO_COUNT; i++) { + for (j = 0; j < BASE_JM_MAX_NR_SLOTS; j++) { + INIT_LIST_HEAD(&kctx->jsctx_queue[i][j].x_dep_head); + kctx->jsctx_queue[i][j].runnable_tree = RB_ROOT; @@ -216892,9 +248962,10 @@ index 000000000000..9b338eb66531 +{ + struct kbase_device *kbdev; + struct kbasep_js_kctx_info *js_kctx_info; -+ int js; ++ unsigned int js; + bool update_ctx_count = false; + unsigned long flags; ++ CSTD_UNUSED(js_kctx_info); + + KBASE_DEBUG_ASSERT(kctx != NULL); + @@ -216930,6 +249001,149 @@ index 000000000000..9b338eb66531 + kbase_backend_ctx_count_changed(kbdev); + mutex_unlock(&kbdev->js_data.runpool_mutex); + } ++ ++ kbase_ctx_sched_remove_ctx(kctx); ++} ++ ++/* ++ * Priority blocking management functions ++ */ ++ ++/* Should not normally use directly - use kbase_jsctx_slot_atom_pulled_dec() instead */ ++static void kbase_jsctx_slot_prio_blocked_clear(struct kbase_context *kctx, unsigned int js, ++ int sched_prio) ++{ ++ struct kbase_jsctx_slot_tracking *slot_tracking = ++ &kctx->slot_tracking[js]; ++ ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ ++ slot_tracking->blocked &= ~(((kbase_js_prio_bitmap_t)1) << sched_prio); ++ KBASE_KTRACE_ADD_JM_SLOT_INFO(kctx->kbdev, JS_SLOT_PRIO_UNBLOCKED, kctx, ++ NULL, 0, js, (unsigned int)sched_prio); ++} ++ ++static int kbase_jsctx_slot_atoms_pulled(struct kbase_context *kctx, unsigned int js) ++{ ++ return atomic_read(&kctx->slot_tracking[js].atoms_pulled); ++} ++ ++/* ++ * A priority level on a slot is blocked when: ++ * - that priority level is blocked ++ * - or, any higher priority level is blocked ++ */ ++static bool kbase_jsctx_slot_prio_is_blocked(struct kbase_context *kctx, unsigned int js, ++ int sched_prio) ++{ ++ struct kbase_jsctx_slot_tracking *slot_tracking = ++ &kctx->slot_tracking[js]; ++ kbase_js_prio_bitmap_t prio_bit, higher_prios_mask; ++ ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ ++ /* done in two separate shifts to prevent future undefined behavior ++ * should the number of priority levels == (bit width of the type) ++ */ ++ prio_bit = (((kbase_js_prio_bitmap_t)1) << sched_prio); ++ /* all bits of sched_prio or higher, with sched_prio = 0 being the ++ * highest priority ++ */ ++ higher_prios_mask = (prio_bit << 1) - 1u; ++ return (slot_tracking->blocked & higher_prios_mask) != 0u; ++} ++ ++/** ++ * kbase_jsctx_slot_atom_pulled_inc - Increase counts of atoms that have being ++ * pulled for a slot from a ctx, based on ++ * this atom ++ * @kctx: kbase context ++ * @katom: atom pulled ++ * ++ * Manages counts of atoms pulled (including per-priority-level counts), for ++ * later determining when a ctx can become unblocked on a slot. ++ * ++ * Once a slot has been blocked at @katom's priority level, it should not be ++ * pulled from, hence this function should not be called in that case. ++ * ++ * The return value is to aid tracking of when @kctx becomes runnable. ++ * ++ * Return: new total count of atoms pulled from all slots on @kctx ++ */ ++static int kbase_jsctx_slot_atom_pulled_inc(struct kbase_context *kctx, ++ const struct kbase_jd_atom *katom) ++{ ++ unsigned int js = katom->slot_nr; ++ int sched_prio = katom->sched_priority; ++ struct kbase_jsctx_slot_tracking *slot_tracking = ++ &kctx->slot_tracking[js]; ++ int nr_atoms_pulled; ++ ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ ++ WARN(kbase_jsctx_slot_prio_is_blocked(kctx, js, sched_prio), ++ "Should not have pulled atoms for slot %u from a context that is blocked at priority %d or higher", ++ js, sched_prio); ++ ++ nr_atoms_pulled = atomic_inc_return(&kctx->atoms_pulled_all_slots); ++ atomic_inc(&slot_tracking->atoms_pulled); ++ slot_tracking->atoms_pulled_pri[sched_prio]++; ++ ++ return nr_atoms_pulled; ++} ++ ++/** ++ * kbase_jsctx_slot_atom_pulled_dec- Decrease counts of atoms that have being ++ * pulled for a slot from a ctx, and ++ * re-evaluate whether a context is blocked ++ * on this slot ++ * @kctx: kbase context ++ * @katom: atom that has just been removed from a job slot ++ * ++ * @kctx can become unblocked on a slot for a priority level when it no longer ++ * has any pulled atoms at that priority level on that slot, and all higher ++ * (numerically lower) priority levels are also unblocked @kctx on that ++ * slot. The latter condition is to retain priority ordering within @kctx. ++ * ++ * Return: true if the slot was previously blocked but has now become unblocked ++ * at @katom's priority level, false otherwise. ++ */ ++static bool kbase_jsctx_slot_atom_pulled_dec(struct kbase_context *kctx, ++ const struct kbase_jd_atom *katom) ++{ ++ unsigned int js = katom->slot_nr; ++ int sched_prio = katom->sched_priority; ++ int atoms_pulled_pri; ++ struct kbase_jsctx_slot_tracking *slot_tracking = ++ &kctx->slot_tracking[js]; ++ bool slot_prio_became_unblocked = false; ++ ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ ++ atomic_dec(&kctx->atoms_pulled_all_slots); ++ atomic_dec(&slot_tracking->atoms_pulled); ++ ++ atoms_pulled_pri = --(slot_tracking->atoms_pulled_pri[sched_prio]); ++ ++ /* We can safely clear this priority level's blocked status even if ++ * higher priority levels are still blocked: a subsequent query to ++ * kbase_jsctx_slot_prio_is_blocked() will still return true ++ */ ++ if (!atoms_pulled_pri && ++ kbase_jsctx_slot_prio_is_blocked(kctx, js, sched_prio)) { ++ kbase_jsctx_slot_prio_blocked_clear(kctx, js, sched_prio); ++ ++ if (!kbase_jsctx_slot_prio_is_blocked(kctx, js, sched_prio)) ++ slot_prio_became_unblocked = true; ++ } ++ ++ if (slot_prio_became_unblocked) ++ KBASE_KTRACE_ADD_JM_SLOT_INFO(kctx->kbdev, ++ JS_SLOT_PRIO_AND_HIGHER_UNBLOCKED, ++ kctx, katom, katom->jc, js, ++ (unsigned int)sched_prio); ++ ++ return slot_prio_became_unblocked; +} + +/** @@ -216946,14 +249160,12 @@ index 000000000000..9b338eb66531 + * Return: true if caller should call kbase_backend_ctx_count_changed() + */ +static bool kbase_js_ctx_list_add_pullable_nolock(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js) ++ struct kbase_context *kctx, unsigned int js) +{ + bool ret = false; + + lockdep_assert_held(&kbdev->hwaccess_lock); -+ dev_dbg(kbdev->dev, "Add pullable tail kctx %p (s:%d)\n", -+ (void *)kctx, js); ++ dev_dbg(kbdev->dev, "Add pullable tail kctx %pK (s:%u)\n", (void *)kctx, js); + + if (!list_empty(&kctx->jctx.sched_info.ctx.ctx_list_entry[js])) + list_del_init(&kctx->jctx.sched_info.ctx.ctx_list_entry[js]); @@ -216964,7 +249176,7 @@ index 000000000000..9b338eb66531 + if (!kctx->slots_pullable) { + kbdev->js_data.nr_contexts_pullable++; + ret = true; -+ if (!atomic_read(&kctx->atoms_pulled)) { ++ if (!kbase_jsctx_atoms_pulled(kctx)) { + WARN_ON(kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); + kbase_ctx_flag_set(kctx, KCTX_RUNNABLE_REF); + atomic_inc(&kbdev->js_data.nr_contexts_runnable); @@ -216988,14 +249200,13 @@ index 000000000000..9b338eb66531 + * + * Return: true if caller should call kbase_backend_ctx_count_changed() + */ -+static bool kbase_js_ctx_list_add_pullable_head_nolock( -+ struct kbase_device *kbdev, struct kbase_context *kctx, int js) ++static bool kbase_js_ctx_list_add_pullable_head_nolock(struct kbase_device *kbdev, ++ struct kbase_context *kctx, unsigned int js) +{ + bool ret = false; + + lockdep_assert_held(&kbdev->hwaccess_lock); -+ dev_dbg(kbdev->dev, "Add pullable head kctx %p (s:%d)\n", -+ (void *)kctx, js); ++ dev_dbg(kbdev->dev, "Add pullable head kctx %pK (s:%u)\n", (void *)kctx, js); + + if (!list_empty(&kctx->jctx.sched_info.ctx.ctx_list_entry[js])) + list_del_init(&kctx->jctx.sched_info.ctx.ctx_list_entry[js]); @@ -217006,7 +249217,7 @@ index 000000000000..9b338eb66531 + if (!kctx->slots_pullable) { + kbdev->js_data.nr_contexts_pullable++; + ret = true; -+ if (!atomic_read(&kctx->atoms_pulled)) { ++ if (!kbase_jsctx_atoms_pulled(kctx)) { + WARN_ON(kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); + kbase_ctx_flag_set(kctx, KCTX_RUNNABLE_REF); + atomic_inc(&kbdev->js_data.nr_contexts_runnable); @@ -217033,8 +249244,7 @@ index 000000000000..9b338eb66531 + * Return: true if caller should call kbase_backend_ctx_count_changed() + */ +static bool kbase_js_ctx_list_add_pullable_head(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js) ++ struct kbase_context *kctx, unsigned int js) +{ + bool ret; + unsigned long flags; @@ -217064,14 +249274,12 @@ index 000000000000..9b338eb66531 + * Return: true if caller should call kbase_backend_ctx_count_changed() + */ +static bool kbase_js_ctx_list_add_unpullable_nolock(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js) ++ struct kbase_context *kctx, unsigned int js) +{ + bool ret = false; + + lockdep_assert_held(&kbdev->hwaccess_lock); -+ dev_dbg(kbdev->dev, "Add unpullable tail kctx %p (s:%d)\n", -+ (void *)kctx, js); ++ dev_dbg(kbdev->dev, "Add unpullable tail kctx %pK (s:%u)\n", (void *)kctx, js); + + list_move_tail(&kctx->jctx.sched_info.ctx.ctx_list_entry[js], + &kbdev->js_data.ctx_list_unpullable[js][kctx->priority]); @@ -217079,7 +249287,7 @@ index 000000000000..9b338eb66531 + if (kctx->slots_pullable == (1 << js)) { + kbdev->js_data.nr_contexts_pullable--; + ret = true; -+ if (!atomic_read(&kctx->atoms_pulled)) { ++ if (!kbase_jsctx_atoms_pulled(kctx)) { + WARN_ON(!kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); + kbase_ctx_flag_clear(kctx, KCTX_RUNNABLE_REF); + atomic_dec(&kbdev->js_data.nr_contexts_runnable); @@ -217106,9 +249314,8 @@ index 000000000000..9b338eb66531 + * + * Return: true if caller should call kbase_backend_ctx_count_changed() + */ -+static bool kbase_js_ctx_list_remove_nolock(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js) ++static bool kbase_js_ctx_list_remove_nolock(struct kbase_device *kbdev, struct kbase_context *kctx, ++ unsigned int js) +{ + bool ret = false; + @@ -217121,7 +249328,7 @@ index 000000000000..9b338eb66531 + if (kctx->slots_pullable == (1 << js)) { + kbdev->js_data.nr_contexts_pullable--; + ret = true; -+ if (!atomic_read(&kctx->atoms_pulled)) { ++ if (!kbase_jsctx_atoms_pulled(kctx)) { + WARN_ON(!kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); + kbase_ctx_flag_clear(kctx, KCTX_RUNNABLE_REF); + atomic_dec(&kbdev->js_data.nr_contexts_runnable); @@ -217144,16 +249351,15 @@ index 000000000000..9b338eb66531 + * Return: Context to use for specified slot. + * NULL if no contexts present for specified slot + */ -+static struct kbase_context *kbase_js_ctx_list_pop_head_nolock( -+ struct kbase_device *kbdev, -+ int js) ++static struct kbase_context *kbase_js_ctx_list_pop_head_nolock(struct kbase_device *kbdev, ++ unsigned int js) +{ + struct kbase_context *kctx; + int i; + + lockdep_assert_held(&kbdev->hwaccess_lock); + -+ for (i = 0; i < KBASE_JS_ATOM_SCHED_PRIO_COUNT; i++) { ++ for (i = KBASE_JS_ATOM_SCHED_PRIO_FIRST; i < KBASE_JS_ATOM_SCHED_PRIO_COUNT; i++) { + if (list_empty(&kbdev->js_data.ctx_list_pullable[js][i])) + continue; + @@ -217162,9 +249368,8 @@ index 000000000000..9b338eb66531 + jctx.sched_info.ctx.ctx_list_entry[js]); + + list_del_init(&kctx->jctx.sched_info.ctx.ctx_list_entry[js]); -+ dev_dbg(kbdev->dev, -+ "Popped %p from the pullable queue (s:%d)\n", -+ (void *)kctx, js); ++ dev_dbg(kbdev->dev, "Popped %pK from the pullable queue (s:%u)\n", (void *)kctx, ++ js); + return kctx; + } + return NULL; @@ -217179,8 +249384,7 @@ index 000000000000..9b338eb66531 + * Return: Context to use for specified slot. + * NULL if no contexts present for specified slot + */ -+static struct kbase_context *kbase_js_ctx_list_pop_head( -+ struct kbase_device *kbdev, int js) ++static struct kbase_context *kbase_js_ctx_list_pop_head(struct kbase_device *kbdev, unsigned int js) +{ + struct kbase_context *kctx; + unsigned long flags; @@ -217204,8 +249408,7 @@ index 000000000000..9b338eb66531 + * Return: true if context can be pulled from on specified slot + * false otherwise + */ -+static bool kbase_js_ctx_pullable(struct kbase_context *kctx, int js, -+ bool is_scheduled) ++static bool kbase_js_ctx_pullable(struct kbase_context *kctx, unsigned int js, bool is_scheduled) +{ + struct kbasep_js_device_data *js_devdata; + struct kbase_jd_atom *katom; @@ -217217,25 +249420,27 @@ index 000000000000..9b338eb66531 + + if (is_scheduled) { + if (!kbasep_js_is_submit_allowed(js_devdata, kctx)) { -+ dev_dbg(kbdev->dev, "JS: No submit allowed for kctx %p\n", ++ dev_dbg(kbdev->dev, "JS: No submit allowed for kctx %pK\n", + (void *)kctx); + return false; + } + } + katom = jsctx_rb_peek(kctx, js); + if (!katom) { -+ dev_dbg(kbdev->dev, "JS: No pullable atom in kctx %p (s:%d)\n", -+ (void *)kctx, js); ++ dev_dbg(kbdev->dev, "JS: No pullable atom in kctx %pK (s:%u)\n", (void *)kctx, js); + return false; /* No pullable atoms */ + } -+ if (kctx->blocked_js[js][katom->sched_priority]) { ++ if (kbase_jsctx_slot_prio_is_blocked(kctx, js, katom->sched_priority)) { ++ KBASE_KTRACE_ADD_JM_SLOT_INFO( ++ kctx->kbdev, JS_SLOT_PRIO_IS_BLOCKED, kctx, katom, ++ katom->jc, js, (unsigned int)katom->sched_priority); + dev_dbg(kbdev->dev, -+ "JS: kctx %p is blocked from submitting atoms at priority %d (s:%d)\n", ++ "JS: kctx %pK is blocked from submitting atoms at priority %d and lower (s:%u)\n", + (void *)kctx, katom->sched_priority, js); + return false; + } + if (atomic_read(&katom->blocked)) { -+ dev_dbg(kbdev->dev, "JS: Atom %p is blocked in js_ctx_pullable\n", ++ dev_dbg(kbdev->dev, "JS: Atom %pK is blocked in js_ctx_pullable\n", + (void *)katom); + return false; /* next atom blocked */ + } @@ -217244,21 +249449,21 @@ index 000000000000..9b338eb66531 + KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB || + katom->x_pre_dep->will_fail_event_code) { + dev_dbg(kbdev->dev, -+ "JS: X pre-dep %p is not present in slot FIFO or will fail\n", ++ "JS: X pre-dep %pK is not present in slot FIFO or will fail\n", + (void *)katom->x_pre_dep); + return false; + } + if ((katom->atom_flags & KBASE_KATOM_FLAG_FAIL_BLOCKER) && + kbase_backend_nr_atoms_on_slot(kctx->kbdev, js)) { + dev_dbg(kbdev->dev, -+ "JS: Atom %p has cross-slot fail dependency and atoms on slot (s:%d)\n", ++ "JS: Atom %pK has cross-slot fail dependency and atoms on slot (s:%u)\n", + (void *)katom, js); + return false; + } + } + -+ dev_dbg(kbdev->dev, "JS: Atom %p is pullable in kctx %p (s:%d)\n", -+ (void *)katom, (void *)kctx, js); ++ dev_dbg(kbdev->dev, "JS: Atom %pK is pullable in kctx %pK (s:%u)\n", (void *)katom, ++ (void *)kctx, js); + + return true; +} @@ -217269,7 +249474,7 @@ index 000000000000..9b338eb66531 + struct kbase_device *kbdev = kctx->kbdev; + bool ret = true; + bool has_dep = false, has_x_dep = false; -+ int js = kbase_js_get_slot(kbdev, katom); ++ unsigned int js = kbase_js_get_slot(kbdev, katom); + int prio = katom->sched_priority; + int i; + @@ -217277,11 +249482,11 @@ index 000000000000..9b338eb66531 + struct kbase_jd_atom *dep_atom = katom->dep[i].atom; + + if (dep_atom) { -+ int dep_js = kbase_js_get_slot(kbdev, dep_atom); ++ unsigned int dep_js = kbase_js_get_slot(kbdev, dep_atom); + int dep_prio = dep_atom->sched_priority; + + dev_dbg(kbdev->dev, -+ "Checking dep %d of atom %p (s:%d) on %p (s:%d)\n", ++ "Checking dep %d of atom %pK (s:%d) on %pK (s:%d)\n", + i, (void *)katom, js, (void *)dep_atom, dep_js); + + /* Dependent atom must already have been submitted */ @@ -217294,7 +249499,8 @@ index 000000000000..9b338eb66531 + } + + /* Dependencies with different priorities can't -+ be represented in the ringbuffer */ ++ * be represented in the ringbuffer ++ */ + if (prio != dep_prio) { + dev_dbg(kbdev->dev, + "Different atom priorities\n"); @@ -217304,7 +249510,8 @@ index 000000000000..9b338eb66531 + + if (js == dep_js) { + /* Only one same-slot dependency can be -+ * represented in the ringbuffer */ ++ * represented in the ringbuffer ++ */ + if (has_dep) { + dev_dbg(kbdev->dev, + "Too many same-slot deps\n"); @@ -217312,7 +249519,8 @@ index 000000000000..9b338eb66531 + break; + } + /* Each dependee atom can only have one -+ * same-slot dependency */ ++ * same-slot dependency ++ */ + if (dep_atom->post_dep) { + dev_dbg(kbdev->dev, + "Too many same-slot successors\n"); @@ -217322,7 +249530,8 @@ index 000000000000..9b338eb66531 + has_dep = true; + } else { + /* Only one cross-slot dependency can be -+ * represented in the ringbuffer */ ++ * represented in the ringbuffer ++ */ + if (has_x_dep) { + dev_dbg(kbdev->dev, + "Too many cross-slot deps\n"); @@ -217330,7 +249539,8 @@ index 000000000000..9b338eb66531 + break; + } + /* Each dependee atom can only have one -+ * cross-slot dependency */ ++ * cross-slot dependency ++ */ + if (dep_atom->x_post_dep) { + dev_dbg(kbdev->dev, + "Too many cross-slot successors\n"); @@ -217338,7 +249548,8 @@ index 000000000000..9b338eb66531 + break; + } + /* The dependee atom can not already be in the -+ * HW access ringbuffer */ ++ * HW access ringbuffer ++ */ + if (dep_atom->gpu_rb_state != + KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { + dev_dbg(kbdev->dev, @@ -217348,7 +249559,8 @@ index 000000000000..9b338eb66531 + break; + } + /* The dependee atom can not already have -+ * completed */ ++ * completed ++ */ + if (dep_atom->status != + KBASE_JD_ATOM_STATE_IN_JS) { + dev_dbg(kbdev->dev, @@ -217366,7 +249578,8 @@ index 000000000000..9b338eb66531 + } + + /* If dependencies can be represented by ringbuffer then clear them from -+ * atom structure */ ++ * atom structure ++ */ + if (ret) { + for (i = 0; i < 2; i++) { + struct kbase_jd_atom *dep_atom = katom->dep[i].atom; @@ -217375,7 +249588,7 @@ index 000000000000..9b338eb66531 + int dep_js = kbase_js_get_slot(kbdev, dep_atom); + + dev_dbg(kbdev->dev, -+ "Clearing dep %d of atom %p (s:%d) on %p (s:%d)\n", ++ "Clearing dep %d of atom %pK (s:%d) on %pK (s:%d)\n", + i, (void *)katom, js, (void *)dep_atom, + dep_js); + @@ -217390,7 +249603,7 @@ index 000000000000..9b338eb66531 + katom->atom_flags |= + KBASE_KATOM_FLAG_X_DEP_BLOCKED; + -+ dev_dbg(kbdev->dev, "Set X_DEP flag on atom %p\n", ++ dev_dbg(kbdev->dev, "Set X_DEP flag on atom %pK\n", + (void *)katom); + + katom->x_pre_dep = dep_atom; @@ -217414,7 +249627,7 @@ index 000000000000..9b338eb66531 + } + } else { + dev_dbg(kbdev->dev, -+ "Deps of atom %p (s:%d) could not be represented\n", ++ "Deps of atom %pK (s:%d) could not be represented\n", + (void *)katom, js); + } + @@ -217424,7 +249637,7 @@ index 000000000000..9b338eb66531 +void kbase_js_set_ctx_priority(struct kbase_context *kctx, int new_priority) +{ + struct kbase_device *kbdev = kctx->kbdev; -+ int js; ++ unsigned int js; + + lockdep_assert_held(&kbdev->hwaccess_lock); + @@ -217455,7 +249668,7 @@ index 000000000000..9b338eb66531 + /* Determine the new priority for context, as per the priority + * of currently in-use atoms. + */ -+ for (prio = KBASE_JS_ATOM_SCHED_PRIO_HIGH; ++ for (prio = KBASE_JS_ATOM_SCHED_PRIO_FIRST; + prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT; prio++) { + if (kctx->atoms_count[prio]) { + new_priority = prio; @@ -217466,6 +249679,7 @@ index 000000000000..9b338eb66531 + + kbase_js_set_ctx_priority(kctx, new_priority); +} ++KBASE_EXPORT_TEST_API(kbase_js_update_ctx_priority); + +/** + * js_add_start_rp() - Add an atom that starts a renderpass to the job scheduler @@ -217496,7 +249710,7 @@ index 000000000000..9b338eb66531 + if (rp->state != KBASE_JD_RP_COMPLETE) + return -EINVAL; + -+ dev_dbg(kctx->kbdev->dev, "JS add start atom %p of RP %d\n", ++ dev_dbg(kctx->kbdev->dev, "JS add start atom %pK of RP %d\n", + (void *)start_katom, start_katom->renderpass_id); + + /* The following members are read when updating the job slot @@ -217539,7 +249753,7 @@ index 000000000000..9b338eb66531 + + rp = &kctx->jctx.renderpasses[end_katom->renderpass_id]; + -+ dev_dbg(kbdev->dev, "JS add end atom %p in state %d of RP %d\n", ++ dev_dbg(kbdev->dev, "JS add end atom %pK in state %d of RP %d\n", + (void *)end_katom, (int)rp->state, end_katom->renderpass_id); + + if (rp->state == KBASE_JD_RP_COMPLETE) @@ -217606,7 +249820,7 @@ index 000000000000..9b338eb66531 + /* Refcount ctx.nr_jobs */ + KBASE_DEBUG_ASSERT(js_kctx_info->ctx.nr_jobs < U32_MAX); + ++(js_kctx_info->ctx.nr_jobs); -+ dev_dbg(kbdev->dev, "Add atom %p to kctx %p; now %d in ctx\n", ++ dev_dbg(kbdev->dev, "Add atom %pK to kctx %pK; now %d in ctx\n", + (void *)atom, (void *)kctx, js_kctx_info->ctx.nr_jobs); + + /* Lock for state available during IRQ */ @@ -217619,13 +249833,14 @@ index 000000000000..9b338eb66531 + /* Dependencies could not be represented */ + --(js_kctx_info->ctx.nr_jobs); + dev_dbg(kbdev->dev, -+ "Remove atom %p from kctx %p; now %d in ctx\n", ++ "Remove atom %pK from kctx %pK; now %d in ctx\n", + (void *)atom, (void *)kctx, js_kctx_info->ctx.nr_jobs); + + /* Setting atom status back to queued as it still has unresolved -+ * dependencies */ ++ * dependencies ++ */ + atom->status = KBASE_JD_ATOM_STATE_QUEUED; -+ dev_dbg(kbdev->dev, "Atom %p status to queued\n", (void *)atom); ++ dev_dbg(kbdev->dev, "Atom %pK status to queued\n", (void *)atom); + + /* Undo the count, as the atom will get added again later but + * leave the context priority adjusted or boosted, in case if @@ -217663,7 +249878,8 @@ index 000000000000..9b338eb66531 + kbdev, kctx, atom->slot_nr); + } + /* If this context is active and the atom is the first on its slot, -+ * kick the job manager to attempt to fast-start the atom */ ++ * kick the job manager to attempt to fast-start the atom ++ */ + if (enqueue_required && kctx == + kbdev->hwaccess.active_kctx[atom->slot_nr]) + kbase_jm_try_kick(kbdev, 1 << atom->slot_nr); @@ -217678,22 +249894,25 @@ index 000000000000..9b338eb66531 + if (kbase_ctx_flag(kctx, KCTX_DYING)) { + /* A job got added while/after kbase_job_zap_context() + * was called on a non-scheduled context. Kill that job -+ * by killing the context. */ ++ * by killing the context. ++ */ + kbasep_js_runpool_requeue_or_kill_ctx(kbdev, kctx, + false); + } else if (js_kctx_info->ctx.nr_jobs == 1) { + /* Handle Refcount going from 0 to 1: schedule the -+ * context on the Queue */ ++ * context on the Queue ++ */ + KBASE_DEBUG_ASSERT(!kbase_ctx_flag(kctx, KCTX_SCHEDULED)); -+ dev_dbg(kbdev->dev, "JS: Enqueue Context %p", kctx); ++ dev_dbg(kbdev->dev, "JS: Enqueue Context %pK", kctx); + -+ /* Queue was updated - caller must try to -+ * schedule the head context */ ++ /* Queue was updated - caller must try to schedule the ++ * head context ++ */ + WARN_ON(!enqueue_required); + } + } +out_unlock: -+ dev_dbg(kbdev->dev, "Enqueue of kctx %p is %srequired\n", ++ dev_dbg(kbdev->dev, "Enqueue of kctx %pK is %srequired\n", + kctx, enqueue_required ? "" : "not "); + + mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); @@ -217722,7 +249941,7 @@ index 000000000000..9b338eb66531 + KBASE_DEBUG_ASSERT(js_kctx_info->ctx.nr_jobs > 0); + --(js_kctx_info->ctx.nr_jobs); + dev_dbg(kbdev->dev, -+ "Remove atom %p from kctx %p; now %d in ctx\n", ++ "Remove atom %pK from kctx %pK; now %d in ctx\n", + (void *)atom, (void *)kctx, js_kctx_info->ctx.nr_jobs); + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); @@ -217752,7 +249971,8 @@ index 000000000000..9b338eb66531 + * + * This is because it returns false for soft-stopped atoms, but we + * want to override that, because we're cancelling an atom regardless of -+ * whether it was soft-stopped or not */ ++ * whether it was soft-stopped or not ++ */ + attr_state_changed = kbasep_js_ctx_attr_ctx_release_atom(kbdev, kctx, + &katom_retained_state); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); @@ -217799,7 +250019,8 @@ index 000000000000..9b338eb66531 + + if (js_devdata->nr_user_contexts_running != 0 && runpool_ctx_attr_change) { + /* A change in runpool ctx attributes might mean we can -+ * run more jobs than before */ ++ * run more jobs than before ++ */ + result = KBASEP_JS_RELEASE_RESULT_SCHED_ALL; + + KBASE_KTRACE_ADD_JM_SLOT(kbdev, JD_DONE_TRY_RUN_NEXT_JOB, @@ -217847,6 +250068,7 @@ index 000000000000..9b338eb66531 + bool runpool_ctx_attr_change = false; + int kctx_as_nr; + int new_ref_count; ++ CSTD_UNUSED(kctx_as_nr); + + KBASE_DEBUG_ASSERT(kbdev != NULL); + KBASE_DEBUG_ASSERT(kctx != NULL); @@ -217898,7 +250120,8 @@ index 000000000000..9b338eb66531 + + /* Make a set of checks to see if the context should be scheduled out. + * Note that there'll always be at least 1 reference to the context -+ * which was previously acquired by kbasep_js_schedule_ctx(). */ ++ * which was previously acquired by kbasep_js_schedule_ctx(). ++ */ + if (new_ref_count == 1 && + (!kbasep_js_is_submit_allowed(js_devdata, kctx) || +#ifdef CONFIG_MALI_ARBITER_SUPPORT @@ -217909,8 +250132,9 @@ index 000000000000..9b338eb66531 + int slot; + + /* Last reference, and we've been told to remove this context -+ * from the Run Pool */ -+ dev_dbg(kbdev->dev, "JS: RunPool Remove Context %p because refcount=%d, jobs=%d, allowed=%d", ++ * from the Run Pool ++ */ ++ dev_dbg(kbdev->dev, "JS: RunPool Remove Context %pK because refcount=%d, jobs=%d, allowed=%d", + kctx, new_ref_count, js_kctx_info->ctx.nr_jobs, + kbasep_js_is_submit_allowed(js_devdata, kctx)); + @@ -217920,7 +250144,7 @@ index 000000000000..9b338eb66531 + + for (slot = 0; slot < num_slots; slot++) { + if (kbdev->hwaccess.active_kctx[slot] == kctx) { -+ dev_dbg(kbdev->dev, "Marking kctx %p as inactive (s:%d)\n", ++ dev_dbg(kbdev->dev, "Marking kctx %pK as inactive (s:%d)\n", + (void *)kctx, slot); + kbdev->hwaccess.active_kctx[slot] = NULL; + } @@ -217936,7 +250160,8 @@ index 000000000000..9b338eb66531 + kbasep_js_ctx_attr_runpool_release_ctx(kbdev, kctx); + + /* Releasing the context and katom retained state can allow -+ * more jobs to run */ ++ * more jobs to run ++ */ + release_result |= + kbasep_js_run_jobs_after_ctx_and_atom_release(kbdev, + kctx, katom_retained_state, @@ -217976,7 +250201,8 @@ index 000000000000..9b338eb66531 + kbase_ctx_flag_clear(kctx, KCTX_SCHEDULED); + /* Signal any waiter that the context is not scheduled, so is + * safe for termination - once the jsctx_mutex is also dropped, -+ * and jobs have finished. */ ++ * and jobs have finished. ++ */ + wake_up(&js_kctx_info->ctx.is_scheduled_wait); + + /* Queue an action to occur after we've dropped the lock */ @@ -218018,9 +250244,10 @@ index 000000000000..9b338eb66531 + + if (kbase_ctx_flag(kctx, KCTX_DYING)) { + /* Dying: don't requeue, but kill all jobs on the context. This -+ * happens asynchronously */ ++ * happens asynchronously ++ */ + dev_dbg(kbdev->dev, -+ "JS: ** Killing Context %p on RunPool Remove **", kctx); ++ "JS: ** Killing Context %pK on RunPool Remove **", kctx); + kbase_js_foreach_ctx_job(kctx, &kbase_jd_cancel); + } +} @@ -218072,7 +250299,8 @@ index 000000000000..9b338eb66531 +} + +/* Variant of kbasep_js_runpool_release_ctx() that doesn't call into -+ * kbase_js_sched_all() */ ++ * kbase_js_sched_all() ++ */ +static void kbasep_js_runpool_release_ctx_no_schedule( + struct kbase_device *kbdev, struct kbase_context *kctx) +{ @@ -218115,9 +250343,8 @@ index 000000000000..9b338eb66531 + kbase_backend_timeouts_changed(kbdev); +} + -+static bool kbasep_js_schedule_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js) ++static bool kbasep_js_schedule_ctx(struct kbase_device *kbdev, struct kbase_context *kctx, ++ unsigned int js) +{ + struct kbasep_js_device_data *js_devdata; + struct kbasep_js_kctx_info *js_kctx_info; @@ -218125,7 +250352,7 @@ index 000000000000..9b338eb66531 + bool kctx_suspended = false; + int as_nr; + -+ dev_dbg(kbdev->dev, "Scheduling kctx %p (s:%d)\n", kctx, js); ++ dev_dbg(kbdev->dev, "Scheduling kctx %pK (s:%u)\n", kctx, js); + + js_devdata = &kbdev->js_data; + js_kctx_info = &kctx->jctx.sched_info; @@ -218141,7 +250368,8 @@ index 000000000000..9b338eb66531 + kbdev, kctx); + if (as_nr != KBASEP_AS_NR_INVALID) { + /* Attempt to retain the context again, this should -+ * succeed */ ++ * succeed ++ */ + mutex_lock(&kbdev->mmu_hw_mutex); + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + as_nr = kbase_ctx_sched_retain_ctx(kctx); @@ -218151,8 +250379,8 @@ index 000000000000..9b338eb66531 + WARN_ON(as_nr == KBASEP_AS_NR_INVALID); + } + } -+ if (as_nr == KBASEP_AS_NR_INVALID) -+ return false; /* No address spaces currently available */ ++ if ((as_nr < 0) || (as_nr >= BASE_MAX_NR_AS)) ++ return false; /* No address space currently available */ + + /* + * Atomic transaction on the Context and Run Pool begins @@ -218200,7 +250428,8 @@ index 000000000000..9b338eb66531 + KBASE_TLSTREAM_TL_RET_AS_CTX(kbdev, &kbdev->as[kctx->as_nr], kctx); + + /* Cause any future waiter-on-termination to wait until the context is -+ * descheduled */ ++ * descheduled ++ */ + wake_up(&js_kctx_info->ctx.is_scheduled_wait); + + /* Re-check for suspending: a suspend could've occurred, and all the @@ -218213,7 +250442,8 @@ index 000000000000..9b338eb66531 + * was taken (i.e. this condition doesn't execute), then the + * kbasep_js_suspend() code will cleanup this context instead (by virtue + * of it being called strictly after the suspend flag is set, and will -+ * wait for this lock to drop) */ ++ * wait for this lock to drop) ++ */ +#ifdef CONFIG_MALI_ARBITER_SUPPORT + if (kbase_pm_is_suspending(kbdev) || kbase_pm_is_gpu_lost(kbdev)) { +#else @@ -218221,6 +250451,7 @@ index 000000000000..9b338eb66531 +#endif + /* Cause it to leave at some later point */ + bool retained; ++ CSTD_UNUSED(retained); + + retained = kbase_ctx_sched_inc_refcount_nolock(kctx); + KBASE_DEBUG_ASSERT(retained); @@ -218241,22 +250472,23 @@ index 000000000000..9b338eb66531 + mutex_unlock(&js_devdata->runpool_mutex); + mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); + /* Note: after this point, the context could potentially get scheduled -+ * out immediately */ ++ * out immediately ++ */ + + if (kctx_suspended) { + /* Finishing forcing out the context due to a suspend. Use a + * variant of kbasep_js_runpool_release_ctx() that doesn't + * schedule a new context, to prevent a risk of recursion back -+ * into this function */ ++ * into this function ++ */ + kbasep_js_runpool_release_ctx_no_schedule(kbdev, kctx); + return false; + } + return true; +} + -+static bool kbase_js_use_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js) ++static bool kbase_js_use_ctx(struct kbase_device *kbdev, struct kbase_context *kctx, ++ unsigned int js) +{ + unsigned long flags; + @@ -218264,9 +250496,7 @@ index 000000000000..9b338eb66531 + + if (kbase_ctx_flag(kctx, KCTX_SCHEDULED) && + kbase_backend_use_ctx_sched(kbdev, kctx, js)) { -+ -+ dev_dbg(kbdev->dev, -+ "kctx %p already has ASID - mark as active (s:%d)\n", ++ dev_dbg(kbdev->dev, "kctx %pK already has ASID - mark as active (s:%u)\n", + (void *)kctx, js); + + if (kbdev->hwaccess.active_kctx[js] != kctx) { @@ -218333,7 +250563,8 @@ index 000000000000..9b338eb66531 + kbase_js_sync_timers(kbdev); + + /* Fast-starting requires the jsctx_mutex to be dropped, -+ * because it works on multiple ctxs */ ++ * because it works on multiple ctxs ++ */ + mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); + mutex_unlock(&js_devdata->queue_mutex); + @@ -218345,7 +250576,8 @@ index 000000000000..9b338eb66531 + kbase_ctx_flag(kctx, KCTX_SCHEDULED)); + } else { + /* Already scheduled in - We need to retain it to keep the -+ * corresponding address space */ ++ * corresponding address space ++ */ + WARN_ON(!kbase_ctx_sched_inc_refcount(kctx)); + mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); + mutex_unlock(&js_devdata->queue_mutex); @@ -218390,7 +250622,8 @@ index 000000000000..9b338eb66531 + js_devdata->runpool_irq.submit_allowed = 0; + + /* Retain each of the contexts, so we can cause it to leave even if it -+ * had no refcount to begin with */ ++ * had no refcount to begin with ++ */ + for (i = BASE_MAX_NR_AS - 1; i >= 0; --i) { + struct kbase_context *kctx = kbdev->as_to_kctx[i]; + @@ -218411,7 +250644,8 @@ index 000000000000..9b338eb66531 + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + + /* De-ref the previous retain to ensure each context gets pulled out -+ * sometime later. */ ++ * sometime later. ++ */ + for (i = 0; + i < BASE_MAX_NR_AS; + ++i, retained = retained >> 1) { @@ -218422,7 +250656,8 @@ index 000000000000..9b338eb66531 + } + + /* Caller must wait for all Power Manager active references to be -+ * dropped */ ++ * dropped ++ */ +} + +void kbasep_js_resume(struct kbase_device *kbdev) @@ -218436,7 +250671,7 @@ index 000000000000..9b338eb66531 + + mutex_lock(&js_devdata->queue_mutex); + for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ for (prio = KBASE_JS_ATOM_SCHED_PRIO_HIGH; ++ for (prio = KBASE_JS_ATOM_SCHED_PRIO_FIRST; + prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT; prio++) { + struct kbase_context *kctx, *n; + unsigned long flags; @@ -218528,8 +250763,7 @@ index 000000000000..9b338eb66531 + return true; +} + -+static int kbase_js_get_slot(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) ++static unsigned int kbase_js_get_slot(struct kbase_device *kbdev, struct kbase_jd_atom *katom) +{ + if (katom->core_req & BASE_JD_REQ_JOB_SLOT) + return katom->jobslot; @@ -218557,22 +250791,21 @@ index 000000000000..9b338eb66531 + lockdep_assert_held(&kctx->jctx.lock); + + /* If slot will transition from unpullable to pullable then add to -+ * pullable list */ -+ if (jsctx_rb_none_to_pull(kctx, katom->slot_nr)) { ++ * pullable list ++ */ ++ if (jsctx_rb_none_to_pull(kctx, katom->slot_nr)) + enqueue_required = true; -+ } else { ++ else + enqueue_required = false; -+ } + + if ((katom->atom_flags & KBASE_KATOM_FLAG_X_DEP_BLOCKED) || + (katom->pre_dep && (katom->pre_dep->atom_flags & + KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST))) { + int prio = katom->sched_priority; -+ int js = katom->slot_nr; ++ unsigned int js = katom->slot_nr; + struct jsctx_queue *queue = &kctx->jsctx_queue[prio][js]; + -+ dev_dbg(kctx->kbdev->dev, "Add atom %p to X_DEP list (s:%d)\n", -+ (void *)katom, js); ++ dev_dbg(kctx->kbdev->dev, "Add atom %pK to X_DEP list (s:%u)\n", (void *)katom, js); + + list_add_tail(&katom->queue, &queue->x_dep_head); + katom->atom_flags |= KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST; @@ -218581,7 +250814,7 @@ index 000000000000..9b338eb66531 + add_required = false; + } + } else { -+ dev_dbg(kctx->kbdev->dev, "Atom %p not added to X_DEP list\n", ++ dev_dbg(kctx->kbdev->dev, "Atom %pK not added to X_DEP list\n", + (void *)katom); + } + @@ -218595,7 +250828,7 @@ index 000000000000..9b338eb66531 + } + + dev_dbg(kctx->kbdev->dev, -+ "Enqueue of kctx %p is %srequired to submit atom %p\n", ++ "Enqueue of kctx %pK is %srequired to submit atom %pK\n", + kctx, enqueue_required ? "" : "not ", katom); + + return enqueue_required; @@ -218622,7 +250855,7 @@ index 000000000000..9b338eb66531 + + if (!kbase_js_atom_blocked_on_x_dep(katom)) { + dev_dbg(kctx->kbdev->dev, -+ "Del atom %p from X_DEP list in js_move_to_tree\n", ++ "Del atom %pK from X_DEP list in js_move_to_tree\n", + (void *)katom); + + list_del(&katom->queue); @@ -218640,7 +250873,7 @@ index 000000000000..9b338eb66531 + } + } else { + dev_dbg(kctx->kbdev->dev, -+ "Atom %p blocked on x-dep in js_move_to_tree\n", ++ "Atom %pK blocked on x-dep in js_move_to_tree\n", + (void *)katom); + break; + } @@ -218663,8 +250896,8 @@ index 000000000000..9b338eb66531 + * + * Context: Caller must hold the HW access lock + */ -+static void kbase_js_evict_deps(struct kbase_context *kctx, -+ struct kbase_jd_atom *katom, int js, int prio) ++static void kbase_js_evict_deps(struct kbase_context *kctx, struct kbase_jd_atom *katom, ++ unsigned int js, int prio) +{ + struct kbase_jd_atom *x_dep = katom->x_post_dep; + struct kbase_jd_atom *next_katom = katom->post_dep; @@ -218683,22 +250916,20 @@ index 000000000000..9b338eb66531 + KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST))) { + /* Remove dependency.*/ + x_dep->atom_flags &= ~KBASE_KATOM_FLAG_X_DEP_BLOCKED; -+ trace_sysgraph(SGR_DEP_RES, kctx->id, -+ kbase_jd_atom_id(kctx, x_dep)); + -+ dev_dbg(kctx->kbdev->dev, "Cleared X_DEP flag on atom %p\n", ++ dev_dbg(kctx->kbdev->dev, "Cleared X_DEP flag on atom %pK\n", + (void *)x_dep); + + /* Fail if it had a data dependency. */ -+ if (x_dep->atom_flags & KBASE_KATOM_FLAG_FAIL_BLOCKER) { ++ if (x_dep->atom_flags & KBASE_KATOM_FLAG_FAIL_BLOCKER) + x_dep->will_fail_event_code = katom->event_code; -+ } ++ + if (x_dep->atom_flags & KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST) + kbase_js_move_to_tree(x_dep); + } +} + -+struct kbase_jd_atom *kbase_js_pull(struct kbase_context *kctx, int js) ++struct kbase_jd_atom *kbase_js_pull(struct kbase_context *kctx, unsigned int js) +{ + struct kbase_jd_atom *katom; + struct kbasep_js_device_data *js_devdata; @@ -218708,14 +250939,13 @@ index 000000000000..9b338eb66531 + KBASE_DEBUG_ASSERT(kctx); + + kbdev = kctx->kbdev; -+ dev_dbg(kbdev->dev, "JS: pulling an atom from kctx %p (s:%d)\n", -+ (void *)kctx, js); ++ dev_dbg(kbdev->dev, "JS: pulling an atom from kctx %pK (s:%u)\n", (void *)kctx, js); + + js_devdata = &kbdev->js_data; + lockdep_assert_held(&kbdev->hwaccess_lock); + + if (!kbasep_js_is_submit_allowed(js_devdata, kctx)) { -+ dev_dbg(kbdev->dev, "JS: No submit allowed for kctx %p\n", ++ dev_dbg(kbdev->dev, "JS: No submit allowed for kctx %pK\n", + (void *)kctx); + return NULL; + } @@ -218728,26 +250958,26 @@ index 000000000000..9b338eb66531 + + katom = jsctx_rb_peek(kctx, js); + if (!katom) { -+ dev_dbg(kbdev->dev, "JS: No pullable atom in kctx %p (s:%d)\n", -+ (void *)kctx, js); ++ dev_dbg(kbdev->dev, "JS: No pullable atom in kctx %pK (s:%u)\n", (void *)kctx, js); + return NULL; + } -+ if (kctx->blocked_js[js][katom->sched_priority]) { ++ if (kbase_jsctx_slot_prio_is_blocked(kctx, js, katom->sched_priority)) { + dev_dbg(kbdev->dev, -+ "JS: kctx %p is blocked from submitting atoms at priority %d (s:%d)\n", ++ "JS: kctx %pK is blocked from submitting atoms at priority %d and lower (s:%u)\n", + (void *)kctx, katom->sched_priority, js); + return NULL; + } + if (atomic_read(&katom->blocked)) { -+ dev_dbg(kbdev->dev, "JS: Atom %p is blocked in js_pull\n", ++ dev_dbg(kbdev->dev, "JS: Atom %pK is blocked in js_pull\n", + (void *)katom); + return NULL; + } + + /* Due to ordering restrictions when unpulling atoms on failure, we do + * not allow multiple runs of fail-dep atoms from the same context to be -+ * present on the same slot */ -+ if (katom->pre_dep && atomic_read(&kctx->atoms_pulled_slot[js])) { ++ * present on the same slot ++ */ ++ if (katom->pre_dep && kbase_jsctx_slot_atoms_pulled(kctx, js)) { + struct kbase_jd_atom *prev_atom = + kbase_backend_inspect_tail(kbdev, js); + @@ -218760,39 +250990,37 @@ index 000000000000..9b338eb66531 + KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB || + katom->x_pre_dep->will_fail_event_code) { + dev_dbg(kbdev->dev, -+ "JS: X pre-dep %p is not present in slot FIFO or will fail\n", ++ "JS: X pre-dep %pK is not present in slot FIFO or will fail\n", + (void *)katom->x_pre_dep); + return NULL; + } + if ((katom->atom_flags & KBASE_KATOM_FLAG_FAIL_BLOCKER) && + kbase_backend_nr_atoms_on_slot(kbdev, js)) { + dev_dbg(kbdev->dev, -+ "JS: Atom %p has cross-slot fail dependency and atoms on slot (s:%d)\n", ++ "JS: Atom %pK has cross-slot fail dependency and atoms on slot (s:%u)\n", + (void *)katom, js); + return NULL; + } + } + ++ KBASE_KTRACE_ADD_JM_SLOT_INFO(kbdev, JS_PULL_JOB, kctx, katom, ++ katom->jc, js, katom->sched_priority); + kbase_ctx_flag_set(kctx, KCTX_PULLED); + kbase_ctx_flag_set(kctx, (KCTX_PULLED_SINCE_ACTIVE_JS0 << js)); + -+ pulled = atomic_inc_return(&kctx->atoms_pulled); ++ pulled = kbase_jsctx_slot_atom_pulled_inc(kctx, katom); + if (pulled == 1 && !kctx->slots_pullable) { + WARN_ON(kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); + kbase_ctx_flag_set(kctx, KCTX_RUNNABLE_REF); + atomic_inc(&kbdev->js_data.nr_contexts_runnable); + } -+ atomic_inc(&kctx->atoms_pulled_slot[katom->slot_nr]); -+ kctx->atoms_pulled_slot_pri[katom->slot_nr][katom->sched_priority]++; + jsctx_rb_pull(kctx, katom); + + kbase_ctx_sched_retain_ctx_refcount(kctx); + -+ katom->atom_flags |= KBASE_KATOM_FLAG_HOLDING_CTX_REF; -+ + katom->ticks = 0; + -+ dev_dbg(kbdev->dev, "JS: successfully pulled atom %p from kctx %p (s:%d)\n", ++ dev_dbg(kbdev->dev, "JS: successfully pulled atom %pK from kctx %pK (s:%u)\n", + (void *)katom, (void *)kctx, js); + + return katom; @@ -218835,7 +251063,7 @@ index 000000000000..9b338eb66531 + return; + + dev_dbg(kctx->kbdev->dev, -+ "JS return start atom %p in state %d of RP %d\n", ++ "JS return start atom %pK in state %d of RP %d\n", + (void *)start_katom, (int)rp->state, + start_katom->renderpass_id); + @@ -218863,7 +251091,7 @@ index 000000000000..9b338eb66531 + /* Prevent the tiler job being pulled for execution in the + * job scheduler again. + */ -+ dev_dbg(kbdev->dev, "Blocking start atom %p\n", ++ dev_dbg(kbdev->dev, "Blocking start atom %pK\n", + (void *)start_katom); + atomic_inc(&start_katom->blocked); + @@ -218875,14 +251103,14 @@ index 000000000000..9b338eb66531 + /* Was the fragment job chain submitted to kbase yet? */ + end_katom = rp->end_katom; + if (end_katom) { -+ dev_dbg(kctx->kbdev->dev, "JS return add end atom %p\n", ++ dev_dbg(kctx->kbdev->dev, "JS return add end atom %pK\n", + (void *)end_katom); + + if (rp->state == KBASE_JD_RP_RETRY_OOM) { + /* Allow the end of the renderpass to be pulled for + * execution again to continue incremental rendering. + */ -+ dev_dbg(kbdev->dev, "Unblocking end atom %p\n", ++ dev_dbg(kbdev->dev, "Unblocking end atom %pK\n", + (void *)end_katom); + atomic_dec(&end_katom->blocked); + WARN_ON(!(end_katom->atom_flags & @@ -218944,7 +251172,7 @@ index 000000000000..9b338eb66531 + return; + + dev_dbg(kctx->kbdev->dev, -+ "JS return end atom %p in state %d of RP %d\n", ++ "JS return end atom %pK in state %d of RP %d\n", + (void *)end_katom, (int)rp->state, end_katom->renderpass_id); + + if (WARN_ON(rp->state != KBASE_JD_RP_OOM && @@ -218966,14 +251194,14 @@ index 000000000000..9b338eb66531 + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + + dev_dbg(kbdev->dev, -+ "Reset backing to %zu pages for region %p\n", ++ "Reset backing to %zu pages for region %pK\n", + reg->threshold_pages, (void *)reg); + + if (!WARN_ON(reg->flags & KBASE_REG_VA_FREED)) + kbase_mem_shrink(kctx, reg, reg->threshold_pages); + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ dev_dbg(kbdev->dev, "Deleting region %p from list\n", ++ dev_dbg(kbdev->dev, "Deleting region %pK from list\n", + (void *)reg); + list_del_init(®->link); + kbase_va_region_alloc_put(kctx, reg); @@ -218991,7 +251219,7 @@ index 000000000000..9b338eb66531 + */ + start_katom = rp->start_katom; + if (!WARN_ON(!start_katom)) { -+ dev_dbg(kbdev->dev, "Unblocking start atom %p\n", ++ dev_dbg(kbdev->dev, "Unblocking start atom %pK\n", + (void *)start_katom); + atomic_dec(&start_katom->blocked); + (void)kbase_js_ctx_list_add_pullable_head_nolock(kbdev, kctx, @@ -219011,15 +251239,18 @@ index 000000000000..9b338eb66531 + struct kbasep_js_kctx_info *js_kctx_info = &kctx->jctx.sched_info; + struct kbasep_js_atom_retained_state retained_state; + int js = katom->slot_nr; -+ int prio = katom->sched_priority; ++ bool slot_became_unblocked; + bool timer_sync = false; + bool context_idle = false; + unsigned long flags; + base_jd_core_req core_req = katom->core_req; ++ u64 cache_jc = katom->jc; + -+ dev_dbg(kbdev->dev, "%s for atom %p with event code 0x%x\n", ++ dev_dbg(kbdev->dev, "%s for atom %pK with event code 0x%x\n", + __func__, (void *)katom, katom->event_code); + ++ KBASE_KTRACE_ADD_JM(kbdev, JS_RETURN_WORKER, kctx, katom, katom->jc, 0); ++ + if (katom->event_code != BASE_JD_EVENT_END_RP_DONE) + KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_EX(kbdev, katom); + @@ -219030,42 +251261,34 @@ index 000000000000..9b338eb66531 + mutex_lock(&js_devdata->queue_mutex); + mutex_lock(&js_kctx_info->ctx.jsctx_mutex); + -+ atomic_dec(&kctx->atoms_pulled); -+ atomic_dec(&kctx->atoms_pulled_slot[js]); -+ + if (katom->event_code != BASE_JD_EVENT_END_RP_DONE) + atomic_dec(&katom->blocked); + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ kctx->atoms_pulled_slot_pri[js][katom->sched_priority]--; ++ slot_became_unblocked = kbase_jsctx_slot_atom_pulled_dec(kctx, katom); + -+ if (!atomic_read(&kctx->atoms_pulled_slot[js]) && -+ jsctx_rb_none_to_pull(kctx, js)) ++ if (!kbase_jsctx_slot_atoms_pulled(kctx, js) && ++ jsctx_rb_none_to_pull(kctx, js)) + timer_sync |= kbase_js_ctx_list_remove_nolock(kbdev, kctx, js); + -+ /* If this slot has been blocked due to soft-stopped atoms, and all -+ * atoms have now been processed, then unblock the slot */ -+ if (!kctx->atoms_pulled_slot_pri[js][prio] && -+ kctx->blocked_js[js][prio]) { -+ kctx->blocked_js[js][prio] = false; -+ -+ /* Only mark the slot as pullable if the context is not idle - -+ * that case is handled below */ -+ if (atomic_read(&kctx->atoms_pulled) && -+ kbase_js_ctx_pullable(kctx, js, true)) -+ timer_sync |= kbase_js_ctx_list_add_pullable_nolock( -+ kbdev, kctx, js); -+ } ++ /* If the context is now unblocked on this slot after soft-stopped ++ * atoms, then only mark it as pullable on this slot if it is not ++ * idle ++ */ ++ if (slot_became_unblocked && kbase_jsctx_atoms_pulled(kctx) && ++ kbase_js_ctx_pullable(kctx, js, true)) ++ timer_sync |= ++ kbase_js_ctx_list_add_pullable_nolock(kbdev, kctx, js); + -+ if (!atomic_read(&kctx->atoms_pulled)) { ++ if (!kbase_jsctx_atoms_pulled(kctx)) { + dev_dbg(kbdev->dev, -+ "No atoms currently pulled from context %p\n", ++ "No atoms currently pulled from context %pK\n", + (void *)kctx); + + if (!kctx->slots_pullable) { + dev_dbg(kbdev->dev, -+ "Context %p %s counted as runnable\n", ++ "Context %pK %s counted as runnable\n", + (void *)kctx, + kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF) ? + "is" : "isn't"); @@ -219101,7 +251324,7 @@ index 000000000000..9b338eb66531 + + if (context_idle) { + dev_dbg(kbdev->dev, -+ "Context %p %s counted as active\n", ++ "Context %pK %s counted as active\n", + (void *)kctx, + kbase_ctx_flag(kctx, KCTX_ACTIVE) ? + "is" : "isn't"); @@ -219126,7 +251349,6 @@ index 000000000000..9b338eb66531 + mutex_unlock(&kctx->jctx.lock); + } + -+ katom->atom_flags &= ~KBASE_KATOM_FLAG_HOLDING_CTX_REF; + dev_dbg(kbdev->dev, "JS: retained state %s finished", + kbasep_js_has_atom_finished(&retained_state) ? + "has" : "hasn't"); @@ -219140,13 +251362,16 @@ index 000000000000..9b338eb66531 + + kbase_backend_complete_wq_post_sched(kbdev, core_req); + -+ dev_dbg(kbdev->dev, "Leaving %s for atom %p\n", ++ KBASE_KTRACE_ADD_JM(kbdev, JS_RETURN_WORKER_END, kctx, NULL, cache_jc, ++ 0); ++ ++ dev_dbg(kbdev->dev, "Leaving %s for atom %pK\n", + __func__, (void *)katom); +} + +void kbase_js_unpull(struct kbase_context *kctx, struct kbase_jd_atom *katom) +{ -+ dev_dbg(kctx->kbdev->dev, "Unpulling atom %p in kctx %p\n", ++ dev_dbg(kctx->kbdev->dev, "Unpulling atom %pK in kctx %pK\n", + (void *)katom, (void *)kctx); + + lockdep_assert_held(&kctx->kbdev->hwaccess_lock); @@ -219201,7 +251426,7 @@ index 000000000000..9b338eb66531 + return false; + + dev_dbg(kctx->kbdev->dev, -+ "Start atom %p is done in state %d of RP %d\n", ++ "Start atom %pK is done in state %d of RP %d\n", + (void *)start_katom, (int)rp->state, + start_katom->renderpass_id); + @@ -219213,7 +251438,7 @@ index 000000000000..9b338eb66531 + unsigned long flags; + + dev_dbg(kctx->kbdev->dev, -+ "Start atom %p completed before soft-stop\n", ++ "Start atom %pK completed before soft-stop\n", + (void *)start_katom); + + kbase_gpu_vm_lock(kctx); @@ -219225,7 +251450,7 @@ index 000000000000..9b338eb66531 + struct kbase_va_region, link); + + WARN_ON(reg->flags & KBASE_REG_VA_FREED); -+ dev_dbg(kctx->kbdev->dev, "Deleting region %p from list\n", ++ dev_dbg(kctx->kbdev->dev, "Deleting region %pK from list\n", + (void *)reg); + list_del_init(®->link); + kbase_va_region_alloc_put(kctx, reg); @@ -219235,7 +251460,7 @@ index 000000000000..9b338eb66531 + kbase_gpu_vm_unlock(kctx); + } else { + dev_dbg(kctx->kbdev->dev, -+ "Start atom %p did not exceed memory threshold\n", ++ "Start atom %pK did not exceed memory threshold\n", + (void *)start_katom); + + WARN_ON(rp->state != KBASE_JD_RP_START && @@ -219252,7 +251477,7 @@ index 000000000000..9b338eb66531 + /* Allow the end of the renderpass to be pulled for + * execution again to continue incremental rendering. + */ -+ dev_dbg(kbdev->dev, "Unblocking end atom %p!\n", ++ dev_dbg(kbdev->dev, "Unblocking end atom %pK!\n", + (void *)end_katom); + atomic_dec(&end_katom->blocked); + @@ -219296,7 +251521,7 @@ index 000000000000..9b338eb66531 + if (WARN_ON(rp->end_katom != end_katom)) + return; + -+ dev_dbg(kbdev->dev, "End atom %p is done in state %d of RP %d\n", ++ dev_dbg(kbdev->dev, "End atom %pK is done in state %d of RP %d\n", + (void *)end_katom, (int)rp->state, end_katom->renderpass_id); + + if (WARN_ON(rp->state == KBASE_JD_RP_COMPLETE) || @@ -219330,7 +251555,7 @@ index 000000000000..9b338eb66531 + kbdev = kctx->kbdev; + atom_slot = katom->slot_nr; + -+ dev_dbg(kbdev->dev, "%s for atom %p (s:%d)\n", ++ dev_dbg(kbdev->dev, "%s for atom %pK (s:%d)\n", + __func__, (void *)katom, atom_slot); + + /* Update the incremental rendering state machine. @@ -219349,15 +251574,16 @@ index 000000000000..9b338eb66531 + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + + if (katom->atom_flags & KBASE_KATOM_FLAG_JSCTX_IN_TREE) { -+ dev_dbg(kbdev->dev, "Atom %p is in runnable_tree\n", ++ bool slot_became_unblocked; ++ ++ dev_dbg(kbdev->dev, "Atom %pK is in runnable_tree\n", + (void *)katom); + -+ context_idle = !atomic_dec_return(&kctx->atoms_pulled); -+ atomic_dec(&kctx->atoms_pulled_slot[atom_slot]); -+ kctx->atoms_pulled_slot_pri[atom_slot][prio]--; ++ slot_became_unblocked = ++ kbase_jsctx_slot_atom_pulled_dec(kctx, katom); ++ context_idle = !kbase_jsctx_atoms_pulled(kctx); + -+ if (!atomic_read(&kctx->atoms_pulled) && -+ !kctx->slots_pullable) { ++ if (!kbase_jsctx_atoms_pulled(kctx) && !kctx->slots_pullable) { + WARN_ON(!kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); + kbase_ctx_flag_clear(kctx, KCTX_RUNNABLE_REF); + atomic_dec(&kbdev->js_data.nr_contexts_runnable); @@ -219365,14 +251591,14 @@ index 000000000000..9b338eb66531 + } + + /* If this slot has been blocked due to soft-stopped atoms, and -+ * all atoms have now been processed, then unblock the slot */ -+ if (!kctx->atoms_pulled_slot_pri[atom_slot][prio] -+ && kctx->blocked_js[atom_slot][prio]) { ++ * all atoms have now been processed at this priority level and ++ * higher, then unblock the slot ++ */ ++ if (slot_became_unblocked) { + dev_dbg(kbdev->dev, -+ "kctx %p is no longer blocked from submitting on slot %d at priority %d\n", ++ "kctx %pK is no longer blocked from submitting on slot %d at priority %d or higher\n", + (void *)kctx, atom_slot, prio); + -+ kctx->blocked_js[atom_slot][prio] = false; + if (kbase_js_ctx_pullable(kctx, atom_slot, true)) + timer_sync |= + kbase_js_ctx_list_add_pullable_nolock( @@ -219381,8 +251607,8 @@ index 000000000000..9b338eb66531 + } + WARN_ON(!(katom->atom_flags & KBASE_KATOM_FLAG_JSCTX_IN_TREE)); + -+ if (!atomic_read(&kctx->atoms_pulled_slot[atom_slot]) && -+ jsctx_rb_none_to_pull(kctx, atom_slot)) { ++ if (!kbase_jsctx_slot_atoms_pulled(kctx, atom_slot) && ++ jsctx_rb_none_to_pull(kctx, atom_slot)) { + if (!list_empty( + &kctx->jctx.sched_info.ctx.ctx_list_entry[atom_slot])) + timer_sync |= kbase_js_ctx_list_remove_nolock( @@ -219395,9 +251621,9 @@ index 000000000000..9b338eb66531 + * re-enable submission so that context can be scheduled again. + */ + if (!kbasep_js_is_submit_allowed(js_devdata, kctx) && -+ !atomic_read(&kctx->atoms_pulled) && -+ !kbase_ctx_flag(kctx, KCTX_DYING)) { -+ int js; ++ !kbase_jsctx_atoms_pulled(kctx) && ++ !kbase_ctx_flag(kctx, KCTX_DYING)) { ++ unsigned int js; + + kbasep_js_set_submit_allowed(js_devdata, kctx); + @@ -219409,7 +251635,7 @@ index 000000000000..9b338eb66531 + } + } else if (katom->x_post_dep && + kbasep_js_is_submit_allowed(js_devdata, kctx)) { -+ int js; ++ unsigned int js; + + for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { + if (kbase_js_ctx_pullable(kctx, js, true)) @@ -219423,7 +251649,7 @@ index 000000000000..9b338eb66531 + * jd_done_worker(). + */ + if (context_idle) { -+ dev_dbg(kbdev->dev, "kctx %p is no longer active\n", ++ dev_dbg(kbdev->dev, "kctx %pK is no longer active\n", + (void *)kctx); + kbase_ctx_flag_clear(kctx, KCTX_ACTIVE); + } @@ -219474,7 +251700,7 @@ index 000000000000..9b338eb66531 + return true; + + dev_dbg(kbdev->dev, -+ "JS complete end atom %p in state %d of RP %d\n", ++ "JS complete end atom %pK in state %d of RP %d\n", + (void *)end_katom, (int)rp->state, + end_katom->renderpass_id); + @@ -219503,7 +251729,7 @@ index 000000000000..9b338eb66531 + struct kbase_jd_atom *x_dep = katom->x_post_dep; + + kbdev = kctx->kbdev; -+ dev_dbg(kbdev->dev, "Atom %p complete in kctx %p (post-dep %p)\n", ++ dev_dbg(kbdev->dev, "Atom %pK complete in kctx %pK (post-dep %pK)\n", + (void *)katom, (void *)kctx, (void *)x_dep); + + lockdep_assert_held(&kctx->kbdev->hwaccess_lock); @@ -219519,7 +251745,12 @@ index 000000000000..9b338eb66531 + katom->event_code = katom->will_fail_event_code; + + katom->status = KBASE_JD_ATOM_STATE_HW_COMPLETED; -+ dev_dbg(kbdev->dev, "Atom %p status to HW completed\n", (void *)katom); ++ dev_dbg(kbdev->dev, "Atom %pK status to HW completed\n", (void *)katom); ++ if (kbase_is_quick_reset_enabled(kbdev)) { ++ kbdev->num_of_atoms_hw_completed++; ++ if (kbdev->num_of_atoms_hw_completed >= 20) ++ kbase_disable_quick_reset(kbdev); ++ } + + if (katom->event_code != BASE_JD_EVENT_DONE) { + kbase_js_evict_deps(kctx, katom, katom->slot_nr, @@ -219532,7 +251763,9 @@ index 000000000000..9b338eb66531 + trace_sysgraph_gpu(SGR_COMPLETE, kctx->id, + kbase_jd_atom_id(katom->kctx, katom), katom->slot_nr); + ++ KBASE_TLSTREAM_TL_JD_DONE_START(kbdev, katom); + kbase_jd_done(katom, katom->slot_nr, end_timestamp, 0); ++ KBASE_TLSTREAM_TL_JD_DONE_END(kbdev, katom); + + /* Unblock cross dependency if present */ + if (x_dep && (katom->event_code == BASE_JD_EVENT_DONE || @@ -219541,9 +251774,7 @@ index 000000000000..9b338eb66531 + bool was_pullable = kbase_js_ctx_pullable(kctx, x_dep->slot_nr, + false); + x_dep->atom_flags &= ~KBASE_KATOM_FLAG_X_DEP_BLOCKED; -+ trace_sysgraph(SGR_DEP_RES, kctx->id, -+ kbase_jd_atom_id(katom->kctx, x_dep)); -+ dev_dbg(kbdev->dev, "Cleared X_DEP flag on atom %p\n", ++ dev_dbg(kbdev->dev, "Cleared X_DEP flag on atom %pK\n", + (void *)x_dep); + + kbase_js_move_to_tree(x_dep); @@ -219554,13 +251785,13 @@ index 000000000000..9b338eb66531 + x_dep->slot_nr); + + if (x_dep->atom_flags & KBASE_KATOM_FLAG_JSCTX_IN_TREE) { -+ dev_dbg(kbdev->dev, "Atom %p is in runnable tree\n", ++ dev_dbg(kbdev->dev, "Atom %pK is in runnable tree\n", + (void *)x_dep); + return x_dep; + } + } else { + dev_dbg(kbdev->dev, -+ "No cross-slot dep to unblock for atom %p\n", ++ "No cross-slot dep to unblock for atom %pK\n", + (void *)katom); + } + @@ -219591,13 +251822,13 @@ index 000000000000..9b338eb66531 + + if (!(katom->atom_flags & + KBASE_KATOM_FLAG_X_DEP_BLOCKED)) { -+ dev_dbg(kbdev->dev, "Atom %p is not blocked on a cross-slot dependency", ++ dev_dbg(kbdev->dev, "Atom %pK is not blocked on a cross-slot dependency", + (void *)katom); + return false; + } + + if (!(katom->core_req & BASE_JD_REQ_END_RENDERPASS)) { -+ dev_dbg(kbdev->dev, "Atom %p is blocked on a cross-slot dependency", ++ dev_dbg(kbdev->dev, "Atom %pK is blocked on a cross-slot dependency", + (void *)katom); + return true; + } @@ -219623,26 +251854,28 @@ index 000000000000..9b338eb66531 + * if it only depends on the tiler job chain. + */ + if (katom->x_pre_dep != rp->start_katom) { -+ dev_dbg(kbdev->dev, "Dependency is on %p not start atom %p\n", ++ dev_dbg(kbdev->dev, "Dependency is on %pK not start atom %pK\n", + (void *)katom->x_pre_dep, (void *)rp->start_katom); + return true; + } + -+ dev_dbg(kbdev->dev, "Ignoring cross-slot dep on atom %p\n", ++ dev_dbg(kbdev->dev, "Ignoring cross-slot dep on atom %pK\n", + (void *)katom->x_pre_dep); + + return false; +} + -+void kbase_js_sched(struct kbase_device *kbdev, int js_mask) ++void kbase_js_sched(struct kbase_device *kbdev, unsigned int js_mask) +{ + struct kbasep_js_device_data *js_devdata; + struct kbase_context *last_active[BASE_JM_MAX_NR_SLOTS]; + bool timer_sync = false; + bool ctx_waiting[BASE_JM_MAX_NR_SLOTS]; -+ int js; ++ unsigned int js; ++ ++ KBASE_TLSTREAM_TL_JS_SCHED_START(kbdev, 0); + -+ dev_dbg(kbdev->dev, "%s kbdev %p mask 0x%x\n", ++ dev_dbg(kbdev->dev, "%s kbdev %pK mask 0x%x\n", + __func__, (void *)kbdev, (unsigned int)js_mask); + + js_devdata = &kbdev->js_data; @@ -219667,26 +251900,23 @@ index 000000000000..9b338eb66531 + + if (!kctx) { + js_mask &= ~(1 << js); -+ dev_dbg(kbdev->dev, -+ "No kctx on pullable list (s:%d)\n", -+ js); ++ dev_dbg(kbdev->dev, "No kctx on pullable list (s:%u)\n", js); + break; + } + + if (!kbase_ctx_flag(kctx, KCTX_ACTIVE)) { + context_idle = true; + -+ dev_dbg(kbdev->dev, -+ "kctx %p is not active (s:%d)\n", -+ (void *)kctx, js); ++ dev_dbg(kbdev->dev, "kctx %pK is not active (s:%u)\n", (void *)kctx, ++ js); + + if (kbase_pm_context_active_handle_suspend( + kbdev, + KBASE_PM_SUSPEND_HANDLER_DONT_INCREASE)) { -+ dev_dbg(kbdev->dev, -+ "Suspend pending (s:%d)\n", js); ++ dev_dbg(kbdev->dev, "Suspend pending (s:%u)\n", js); + /* Suspend pending - return context to -+ * queue and stop scheduling */ ++ * queue and stop scheduling ++ */ + mutex_lock( + &kctx->jctx.sched_info.ctx.jsctx_mutex); + if (kbase_js_ctx_list_add_pullable_head( @@ -219696,6 +251926,8 @@ index 000000000000..9b338eb66531 + &kctx->jctx.sched_info.ctx.jsctx_mutex); + mutex_unlock(&js_devdata->queue_mutex); + up(&js_devdata->schedule_sem); ++ KBASE_TLSTREAM_TL_JS_SCHED_END(kbdev, ++ 0); + return; + } + kbase_ctx_flag_set(kctx, KCTX_ACTIVE); @@ -219706,7 +251938,7 @@ index 000000000000..9b338eb66531 + &kctx->jctx.sched_info.ctx.jsctx_mutex); + + dev_dbg(kbdev->dev, -+ "kctx %p cannot be used at this time\n", ++ "kctx %pK cannot be used at this time\n", + kctx); + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); @@ -219739,16 +251971,13 @@ index 000000000000..9b338eb66531 + kbase_ctx_flag_clear(kctx, KCTX_PULLED); + + if (!kbase_jm_kick(kbdev, 1 << js)) { -+ dev_dbg(kbdev->dev, -+ "No more jobs can be submitted (s:%d)\n", -+ js); ++ dev_dbg(kbdev->dev, "No more jobs can be submitted (s:%u)\n", js); + js_mask &= ~(1 << js); + } + if (!kbase_ctx_flag(kctx, KCTX_PULLED)) { + bool pullable; + -+ dev_dbg(kbdev->dev, -+ "No atoms pulled from kctx %p (s:%d)\n", ++ dev_dbg(kbdev->dev, "No atoms pulled from kctx %pK (s:%u)\n", + (void *)kctx, js); + + pullable = kbase_js_ctx_pullable(kctx, js, @@ -219757,7 +251986,8 @@ index 000000000000..9b338eb66531 + /* Failed to pull jobs - push to head of list. + * Unless this context is already 'active', in + * which case it's effectively already scheduled -+ * so push it to the back of the list. */ ++ * so push it to the back of the list. ++ */ + if (pullable && kctx == last_active[js] && + kbase_ctx_flag(kctx, + (KCTX_PULLED_SINCE_ACTIVE_JS0 << @@ -219782,7 +252012,8 @@ index 000000000000..9b338eb66531 + * slot, then we need to remove the active + * marker to prevent it from submitting atoms in + * the IRQ handler, which would prevent this -+ * context from making progress. */ ++ * context from making progress. ++ */ + if (last_active[js] && kctx != last_active[js] + && kbase_js_ctx_pullable( + last_active[js], js, true)) @@ -219808,7 +252039,7 @@ index 000000000000..9b338eb66531 + break; /* Could not run atoms on this slot */ + } + -+ dev_dbg(kbdev->dev, "Push kctx %p to back of list\n", ++ dev_dbg(kbdev->dev, "Push kctx %pK to back of list\n", + (void *)kctx); + if (kbase_js_ctx_pullable(kctx, js, true)) + timer_sync |= @@ -219830,14 +252061,15 @@ index 000000000000..9b338eb66531 + for (js = 0; js < BASE_JM_MAX_NR_SLOTS; js++) { + if (kbdev->hwaccess.active_kctx[js] == last_active[js] && + ctx_waiting[js]) { -+ dev_dbg(kbdev->dev, "Marking kctx %p as inactive (s:%d)\n", -+ (void *)last_active[js], js); ++ dev_dbg(kbdev->dev, "Marking kctx %pK as inactive (s:%u)\n", ++ (void *)last_active[js], js); + kbdev->hwaccess.active_kctx[js] = NULL; + } + } + + mutex_unlock(&js_devdata->queue_mutex); + up(&js_devdata->schedule_sem); ++ KBASE_TLSTREAM_TL_JS_SCHED_END(kbdev, 0); +} + +void kbase_js_zap_context(struct kbase_context *kctx) @@ -219854,13 +252086,14 @@ index 000000000000..9b338eb66531 + + /* First, atomically do the following: + * - mark the context as dying -+ * - try to evict it from the queue */ ++ * - try to evict it from the queue ++ */ + mutex_lock(&kctx->jctx.lock); + mutex_lock(&js_devdata->queue_mutex); + mutex_lock(&js_kctx_info->ctx.jsctx_mutex); + kbase_ctx_flag_set(kctx, KCTX_DYING); + -+ dev_dbg(kbdev->dev, "Zap: Try Evict Ctx %p", kctx); ++ dev_dbg(kbdev->dev, "Zap: Try Evict Ctx %pK", kctx); + + /* + * At this point we know: @@ -219900,7 +252133,7 @@ index 000000000000..9b338eb66531 + */ + if (!kbase_ctx_flag(kctx, KCTX_SCHEDULED)) { + unsigned long flags; -+ int js; ++ unsigned int js; + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { @@ -219924,13 +252157,14 @@ index 000000000000..9b338eb66531 + + KBASE_KTRACE_ADD_JM(kbdev, JM_ZAP_NON_SCHEDULED, kctx, NULL, 0u, kbase_ctx_flag(kctx, KCTX_SCHEDULED)); + -+ dev_dbg(kbdev->dev, "Zap: Ctx %p scheduled=0", kctx); ++ dev_dbg(kbdev->dev, "Zap: Ctx %pK scheduled=0", kctx); + + /* Only cancel jobs when we evicted from the + * queue. No Power Manager active reference was held. + * -+ * Having is_dying set ensures that this kills, and -+ * doesn't requeue */ ++ * Having is_dying set ensures that this kills, and doesn't ++ * requeue ++ */ + kbasep_js_runpool_requeue_or_kill_ctx(kbdev, kctx, false); + + mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); @@ -219939,31 +252173,36 @@ index 000000000000..9b338eb66531 + } else { + unsigned long flags; + bool was_retained; ++ CSTD_UNUSED(was_retained); + + /* Case c: didn't evict, but it is scheduled - it's in the Run -+ * Pool */ ++ * Pool ++ */ + KBASE_KTRACE_ADD_JM(kbdev, JM_ZAP_SCHEDULED, kctx, NULL, 0u, kbase_ctx_flag(kctx, KCTX_SCHEDULED)); -+ dev_dbg(kbdev->dev, "Zap: Ctx %p is in RunPool", kctx); ++ dev_dbg(kbdev->dev, "Zap: Ctx %pK is in RunPool", kctx); + + /* Disable the ctx from submitting any more jobs */ + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + + kbasep_js_clear_submit_allowed(js_devdata, kctx); + -+ /* Retain and (later) release the context whilst it is is now ++ /* Retain and (later) release the context whilst it is now + * disallowed from submitting jobs - ensures that someone -+ * somewhere will be removing the context later on */ ++ * somewhere will be removing the context later on ++ */ + was_retained = kbase_ctx_sched_inc_refcount_nolock(kctx); + + /* Since it's scheduled and we have the jsctx_mutex, it must be -+ * retained successfully */ ++ * retained successfully ++ */ + KBASE_DEBUG_ASSERT(was_retained); + -+ dev_dbg(kbdev->dev, "Zap: Ctx %p Kill Any Running jobs", kctx); ++ dev_dbg(kbdev->dev, "Zap: Ctx %pK Kill Any Running jobs", kctx); + + /* Cancel any remaining running jobs for this kctx - if any. + * Submit is disallowed which takes effect immediately, so no -+ * more new jobs will appear after we do this. */ ++ * more new jobs will appear after we do this. ++ */ + kbase_backend_jm_kill_running_jobs_from_kctx(kctx); + + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); @@ -219971,7 +252210,7 @@ index 000000000000..9b338eb66531 + mutex_unlock(&js_devdata->queue_mutex); + mutex_unlock(&kctx->jctx.lock); + -+ dev_dbg(kbdev->dev, "Zap: Ctx %p Release (may or may not schedule out immediately)", ++ dev_dbg(kbdev->dev, "Zap: Ctx %pK Release (may or may not schedule out immediately)", + kctx); + + kbasep_js_runpool_release_ctx(kbdev, kctx); @@ -219985,7 +252224,8 @@ index 000000000000..9b338eb66531 + * to be destroyed, and the context to be de-scheduled (if it was on the + * runpool). + * -+ * kbase_jd_zap_context() will do this. */ ++ * kbase_jd_zap_context() will do this. ++ */ +} + +static inline int trace_get_refcnt(struct kbase_device *kbdev, @@ -220013,11 +252253,11 @@ index 000000000000..9b338eb66531 + * - it will be holding kbasep_js_kctx_info::ctx::jsctx_mutex. + */ +static void kbase_js_foreach_ctx_job(struct kbase_context *kctx, -+ kbasep_js_ctx_job_cb callback) ++ kbasep_js_ctx_job_cb *callback) +{ + struct kbase_device *kbdev; + unsigned long flags; -+ u32 js; ++ unsigned int js; + + kbdev = kctx->kbdev; + @@ -220032,20 +252272,38 @@ index 000000000000..9b338eb66531 + + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} ++ ++base_jd_prio kbase_js_priority_check(struct kbase_device *kbdev, base_jd_prio priority) ++{ ++ struct priority_control_manager_device *pcm_device = kbdev->pcm_dev; ++ int req_priority, out_priority; ++ ++ req_priority = kbasep_js_atom_prio_to_sched_prio(priority); ++ out_priority = req_priority; ++ /* Does not use pcm defined priority check if PCM not defined or if ++ * kbasep_js_atom_prio_to_sched_prio returns an error ++ * (KBASE_JS_ATOM_SCHED_PRIO_INVALID). ++ */ ++ if (pcm_device && (req_priority != KBASE_JS_ATOM_SCHED_PRIO_INVALID)) ++ out_priority = pcm_device->ops.pcm_scheduler_priority_check(pcm_device, current, ++ req_priority); ++ return kbasep_js_sched_prio_to_atom_prio(kbdev, out_priority); ++} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js.h b/drivers/gpu/arm/bifrost/mali_kbase_js.h new file mode 100755 -index 000000000000..541acd4afed7 +index 000000000..96974c8c6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js.h -@@ -0,0 +1,40 @@ +@@ -0,0 +1,36 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2011-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -220056,15 +252314,10 @@ index 000000000000..541acd4afed7 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/** -+ * @file mali_kbase_js.h -+ * Job Scheduler APIs. ++ * DOC: Job Scheduler APIs. + */ + +#ifndef _KBASE_JS_H_ @@ -220080,18 +252333,19 @@ index 000000000000..541acd4afed7 +#endif /* _KBASE_JS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c new file mode 100755 -index 000000000000..141d04a385cb +index 000000000..04ea06b2f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c -@@ -0,0 +1,283 @@ +@@ -0,0 +1,298 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2012-2016, 2018, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2016, 2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -220102,11 +252356,8 @@ index 000000000000..141d04a385cb + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ +#include +#include + @@ -220115,19 +252366,23 @@ index 000000000000..141d04a385cb + */ + +/** -+ * @brief Check whether a ctx has a certain attribute, and if so, retain that -+ * attribute on the runpool. ++ * kbasep_js_ctx_attr_runpool_retain_attr - Check whether a ctx has a certain attribute ++ * and if so, retain that attribute on the runpool. ++ * ++ * @kbdev: Device pointer ++ * @kctx: KBase context ++ * @attribute: Atribute to check/retain + * + * Requires: + * - jsctx mutex + * - runpool_irq spinlock + * - ctx is scheduled on the runpool + * -+ * @return true indicates a change in ctx attributes state of the runpool. ++ * Return: true indicates a change in ctx attributes state of the runpool. + * In this state, the scheduler might be able to submit more jobs than + * previously, and so the caller should ensure kbasep_js_try_run_next_job_nolock() + * or similar is called sometime later. -+ * @return false indicates no change in ctx attributes state of the runpool. ++ * false indicates no change in ctx attributes state of the runpool. + */ +static bool kbasep_js_ctx_attr_runpool_retain_attr(struct kbase_device *kbdev, struct kbase_context *kctx, enum kbasep_js_ctx_attr attribute) +{ @@ -220161,19 +252416,23 @@ index 000000000000..141d04a385cb +} + +/** -+ * @brief Check whether a ctx has a certain attribute, and if so, release that -+ * attribute on the runpool. ++ * kbasep_js_ctx_attr_runpool_release_attr - Check whether a ctx has a certain attribute, ++ * and if so, release that attribute on the runpool. ++ * ++ * @kbdev: Device pointer ++ * @kctx: KBase context ++ * @attribute: Atribute to release + * + * Requires: + * - jsctx mutex + * - runpool_irq spinlock + * - ctx is scheduled on the runpool + * -+ * @return true indicates a change in ctx attributes state of the runpool. ++ * Return: true indicates a change in ctx attributes state of the runpool. + * In this state, the scheduler might be able to submit more jobs than + * previously, and so the caller should ensure kbasep_js_try_run_next_job_nolock() + * or similar is called sometime later. -+ * @return false indicates no change in ctx attributes state of the runpool. ++ * false indicates no change in ctx attributes state of the runpool. + */ +static bool kbasep_js_ctx_attr_runpool_release_attr(struct kbase_device *kbdev, struct kbase_context *kctx, enum kbasep_js_ctx_attr attribute) +{ @@ -220206,16 +252465,20 @@ index 000000000000..141d04a385cb +} + +/** -+ * @brief Retain a certain attribute on a ctx, also retaining it on the runpool -+ * if the context is scheduled. ++ * kbasep_js_ctx_attr_ctx_retain_attr - Retain a certain attribute on a ctx, ++ * also retaining it on the runpool if the context is scheduled. ++ * ++ * @kbdev: Device pointer ++ * @kctx: KBase context ++ * @attribute: Atribute to retain + * + * Requires: + * - jsctx mutex + * - If the context is scheduled, then runpool_irq spinlock must also be held + * -+ * @return true indicates a change in ctx attributes state of the runpool. ++ * Return: true indicates a change in ctx attributes state of the runpool. + * This may allow the scheduler to submit more jobs than previously. -+ * @return false indicates no change in ctx attributes state of the runpool. ++ * false indicates no change in ctx attributes state of the runpool. + */ +static bool kbasep_js_ctx_attr_ctx_retain_attr(struct kbase_device *kbdev, struct kbase_context *kctx, enum kbasep_js_ctx_attr attribute) +{ @@ -220242,17 +252505,21 @@ index 000000000000..141d04a385cb + return runpool_state_changed; +} + -+/* -+ * @brief Release a certain attribute on a ctx, also releasing it from the runpool -+ * if the context is scheduled. ++/** ++ * kbasep_js_ctx_attr_ctx_release_attr - Release a certain attribute on a ctx, ++ * also releasing it from the runpool if the context is scheduled. ++ * ++ * @kbdev: Device pointer ++ * @kctx: KBase context ++ * @attribute: Atribute to release + * + * Requires: + * - jsctx mutex + * - If the context is scheduled, then runpool_irq spinlock must also be held + * -+ * @return true indicates a change in ctx attributes state of the runpool. ++ * Return: true indicates a change in ctx attributes state of the runpool. + * This may allow the scheduler to submit more jobs than previously. -+ * @return false indicates no change in ctx attributes state of the runpool. ++ * false indicates no change in ctx attributes state of the runpool. + */ +static bool kbasep_js_ctx_attr_ctx_release_attr(struct kbase_device *kbdev, struct kbase_context *kctx, enum kbasep_js_ctx_attr attribute) +{ @@ -220297,7 +252564,8 @@ index 000000000000..141d04a385cb + + /* We don't need to know about state changed, because retaining a + * context occurs on scheduling it, and that itself will also try -+ * to run new atoms */ ++ * to run new atoms ++ */ + CSTD_UNUSED(runpool_state_changed); + } + } @@ -220337,9 +252605,9 @@ index 000000000000..141d04a385cb + runpool_state_changed |= kbasep_js_ctx_attr_ctx_retain_attr(kbdev, kctx, KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES); + } + -+ /* We don't need to know about state changed, because retaining an -+ * atom occurs on adding it, and that itself will also try to run -+ * new atoms */ ++ /* We don't need to know about state changed, because retaining an atom ++ * occurs on adding it, and that itself will also try to run new atoms ++ */ + CSTD_UNUSED(runpool_state_changed); +} + @@ -220369,18 +252637,19 @@ index 000000000000..141d04a385cb +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h new file mode 100755 -index 000000000000..25fd39787c71 +index 000000000..2dc640d5a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h -@@ -0,0 +1,155 @@ +@@ -0,0 +1,147 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2012-2015, 2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2015, 2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -220391,37 +252660,20 @@ index 000000000000..25fd39787c71 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/** -+ * @file mali_kbase_js_ctx_attr.h -+ * Job Scheduler Context Attribute APIs ++ * DOC: Job Scheduler Context Attribute APIs + */ + +#ifndef _KBASE_JS_CTX_ATTR_H_ +#define _KBASE_JS_CTX_ATTR_H_ + +/** -+ * @addtogroup base_api -+ * @{ -+ */ -+ -+/** -+ * @addtogroup base_kbase_api -+ * @{ -+ */ -+ -+/** -+ * @addtogroup kbase_js -+ * @{ -+ */ -+ -+/** -+ * Retain all attributes of a context ++ * kbasep_js_ctx_attr_runpool_retain_ctx - Retain all attributes of a context ++ * ++ * @kbdev: KBase device ++ * @kctx: KBase context + * + * This occurs on scheduling in the context on the runpool (but after + * is_scheduled is set) @@ -220434,7 +252686,10 @@ index 000000000000..25fd39787c71 +void kbasep_js_ctx_attr_runpool_retain_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); + +/** -+ * Release all attributes of a context ++ * kbasep_js_ctx_attr_runpool_release_ctx - Release all attributes of a context ++ * ++ * @kbdev: KBase device ++ * @kctx: KBase context + * + * This occurs on scheduling out the context from the runpool (but before + * is_scheduled is cleared) @@ -220444,16 +252699,20 @@ index 000000000000..25fd39787c71 + * - runpool_irq spinlock + * - ctx->is_scheduled is true + * -+ * @return true indicates a change in ctx attributes state of the runpool. ++ * Return: true indicates a change in ctx attributes state of the runpool. + * In this state, the scheduler might be able to submit more jobs than + * previously, and so the caller should ensure kbasep_js_try_run_next_job_nolock() + * or similar is called sometime later. -+ * @return false indicates no change in ctx attributes state of the runpool. ++ * false indicates no change in ctx attributes state of the runpool. + */ +bool kbasep_js_ctx_attr_runpool_release_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); + +/** -+ * Retain all attributes of an atom ++ * kbasep_js_ctx_attr_ctx_retain_atom - Retain all attributes of an atom ++ * ++ * @kbdev: KBase device ++ * @kctx: KBase context ++ * @katom: Atom + * + * This occurs on adding an atom to a context + * @@ -220464,7 +252723,12 @@ index 000000000000..25fd39787c71 +void kbasep_js_ctx_attr_ctx_retain_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *katom); + +/** -+ * Release all attributes of an atom, given its retained state. ++ * kbasep_js_ctx_attr_ctx_release_atom - Release all attributes of an atom, ++ * given its retained state. ++ * ++ * @kbdev: KBase device ++ * @kctx: KBase context ++ * @katom_retained_state: Retained state + * + * This occurs after (permanently) removing an atom from a context + * @@ -220474,15 +252738,15 @@ index 000000000000..25fd39787c71 + * + * This is a no-op when \a katom_retained_state is invalid. + * -+ * @return true indicates a change in ctx attributes state of the runpool. ++ * Return: true indicates a change in ctx attributes state of the runpool. + * In this state, the scheduler might be able to submit more jobs than + * previously, and so the caller should ensure kbasep_js_try_run_next_job_nolock() + * or similar is called sometime later. -+ * @return false indicates no change in ctx attributes state of the runpool. ++ * false indicates no change in ctx attributes state of the runpool. + */ +bool kbasep_js_ctx_attr_ctx_release_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbasep_js_atom_retained_state *katom_retained_state); + -+/** ++/* + * Requires: + * - runpool_irq spinlock + */ @@ -220497,7 +252761,7 @@ index 000000000000..25fd39787c71 + return js_devdata->runpool_irq.ctx_attr_ref_count[attribute]; +} + -+/** ++/* + * Requires: + * - runpool_irq spinlock + */ @@ -220507,7 +252771,7 @@ index 000000000000..25fd39787c71 + return (bool) kbasep_js_ctx_attr_count_on_runpool(kbdev, attribute); +} + -+/** ++/* + * Requires: + * - jsctx mutex + */ @@ -220523,25 +252787,22 @@ index 000000000000..25fd39787c71 + return (bool) (js_kctx_info->ctx.ctx_attr_ref_count[attribute]); +} + -+ /** @} *//* end group kbase_js */ -+ /** @} *//* end group base_kbase_api */ -+ /** @} *//* end group base_api */ -+ +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c new file mode 100755 -index 000000000000..fd1ea8815b16 +index 000000000..14a730dc5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c -@@ -0,0 +1,895 @@ +@@ -0,0 +1,896 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -220552,8 +252813,6 @@ index 000000000000..fd1ea8815b16 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -220562,18 +252821,19 @@ index 000000000000..fd1ea8815b16 + */ + +#include "mali_kbase_kinstr_jm.h" -+#include "mali_kbase_kinstr_jm_reader.h" ++#include + +#include "mali_kbase.h" +#include "mali_kbase_linux.h" + -+#include ++#include + +#include +#include +#include +#include +#include ++#include +#include +#include +#include @@ -220581,39 +252841,36 @@ index 000000000000..fd1ea8815b16 +#include +#include +#include ++#include +#include + ++/* Explicitly include epoll header for old kernels. Not required from 4.16. */ ++#if KERNEL_VERSION(4, 16, 0) > LINUX_VERSION_CODE ++#include ++#endif ++ ++/* Define static_assert(). ++ * ++ * The macro was introduced in kernel 5.1. But older vendor kernels may define ++ * it too. ++ */ +#if KERNEL_VERSION(5, 1, 0) <= LINUX_VERSION_CODE +#include -+#else ++#elif !defined(static_assert) +// Stringify the expression if no message is given. +#define static_assert(e, ...) __static_assert(e, #__VA_ARGS__, #e) +#define __static_assert(e, msg, ...) _Static_assert(e, msg) +#endif + -+#if KERNEL_VERSION(4, 16, 0) >= LINUX_VERSION_CODE -+typedef unsigned int __poll_t; -+#endif -+ -+#ifndef ENOTSUP -+#define ENOTSUP EOPNOTSUPP -+#endif -+ +/* The module printing prefix */ +#define PR_ "mali_kbase_kinstr_jm: " + +/* Allows us to perform ASM goto for the tracing + * https://www.kernel.org/doc/Documentation/static-keys.txt + */ -+#if KERNEL_VERSION(4, 3, 0) <= LINUX_VERSION_CODE +DEFINE_STATIC_KEY_FALSE(basep_kinstr_jm_reader_static_key); -+#else -+struct static_key basep_kinstr_jm_reader_static_key = STATIC_KEY_INIT_FALSE; -+#define static_branch_inc(key) static_key_slow_inc(key) -+#define static_branch_dec(key) static_key_slow_dec(key) -+#endif /* KERNEL_VERSION(4 ,3, 0) <= LINUX_VERSION_CODE */ + -+#define KBASE_KINSTR_JM_VERSION 1 ++#define KBASE_KINSTR_JM_VERSION 2 + +/** + * struct kbase_kinstr_jm - The context for the kernel job manager atom tracing @@ -220641,6 +252898,11 @@ index 000000000000..fd1ea8815b16 + * KBASE_KINSTR_JM_ATOM_STATE_FLAG_* defines. + * @reserved: Reserved for future use. + * @data: Extra data for the state change. Active member depends on state. ++ * @data.start: Extra data for the state change. Active member depends on ++ * state. ++ * @data.start.slot: Extra data for the state change. Active member depends on ++ * state. ++ * @data.padding: Padding + * + * We can add new fields to the structure and old user code will gracefully + * ignore the new fields. @@ -220741,9 +253003,8 @@ index 000000000000..fd1ea8815b16 + */ +static inline bool reader_changes_is_valid_size(const size_t size) +{ -+ typedef struct reader_changes changes_t; -+ const size_t elem_size = sizeof(*((changes_t *)0)->data); -+ const size_t size_size = sizeof(((changes_t *)0)->size); ++ const size_t elem_size = sizeof(*((struct reader_changes *)0)->data); ++ const size_t size_size = sizeof(((struct reader_changes *)0)->size); + const size_t size_max = (1ull << (size_size * 8)) - 1; + + return is_power_of_2(size) && /* Is a power of two */ @@ -220760,11 +253021,8 @@ index 000000000000..fd1ea8815b16 + * + * Return: + * (0, U16_MAX] - the number of data elements allocated -+ * -EINVAL - a pointer was invalid -+ * -ENOTSUP - we do not support allocation of the context + * -ERANGE - the requested memory size was invalid + * -ENOMEM - could not allocate the memory -+ * -EADDRINUSE - the buffer memory was already allocated + */ +static int reader_changes_init(struct reader_changes *const changes, + const size_t size) @@ -221159,31 +253417,34 @@ index 000000000000..fd1ea8815b16 + * + * Return: + * * 0 - no data ready -+ * * POLLIN - state changes have been buffered -+ * * -EBADF - the file descriptor did not have an attached reader -+ * * -EINVAL - the IO control arguments were invalid ++ * * EPOLLIN | EPOLLRDNORM - state changes have been buffered ++ * * EPOLLHUP | EPOLLERR - IO control arguments were invalid or the file ++ * descriptor did not have an attached reader. + */ +static __poll_t reader_poll(struct file *const file, + struct poll_table_struct *const wait) +{ + struct reader *reader; + struct reader_changes *changes; ++ __poll_t mask = 0; + + if (unlikely(!file || !wait)) -+ return -EINVAL; ++ return EPOLLHUP | EPOLLERR; + + reader = file->private_data; + if (unlikely(!reader)) -+ return -EBADF; ++ return EPOLLHUP | EPOLLERR; + + changes = &reader->changes; -+ + if (reader_changes_count(changes) >= changes->threshold) -+ return POLLIN; ++ return EPOLLIN | EPOLLRDNORM; + + poll_wait(file, &reader->wait_queue, wait); + -+ return (reader_changes_count(changes) > 0) ? POLLIN : 0; ++ if (reader_changes_count(changes) > 0) ++ mask |= EPOLLIN | EPOLLRDNORM; ++ ++ return mask; +} + +/* The file operations virtual function table */ @@ -221199,7 +253460,7 @@ index 000000000000..fd1ea8815b16 +static const size_t kbase_kinstr_jm_readers_max = 16; + +/** -+ * kbasep_kinstr_jm_release() - Invoked when the reference count is dropped ++ * kbase_kinstr_jm_release() - Invoked when the reference count is dropped + * @ref: the context reference count + */ +static void kbase_kinstr_jm_release(struct kref *const ref) @@ -221270,7 +253531,7 @@ index 000000000000..fd1ea8815b16 +} + +/** -+ * readers_del() - Deletes a reader from the list of readers ++ * kbase_kinstr_jm_readers_del() - Deletes a reader from the list of readers + * @ctx: the instrumentation context + * @reader: the reader to delete + */ @@ -221367,7 +253628,7 @@ index 000000000000..fd1ea8815b16 + + switch (state) { + case KBASE_KINSTR_JM_READER_ATOM_STATE_START: -+ change.data.start.slot = katom->jobslot; ++ change.data.start.slot = katom->slot_nr; + break; + default: + break; @@ -221431,18 +253692,19 @@ index 000000000000..fd1ea8815b16 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h new file mode 100755 -index 000000000000..555edfeef77c +index 000000000..9451d4cd9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h -@@ -0,0 +1,283 @@ +@@ -0,0 +1,273 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019,2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -221453,8 +253715,6 @@ index 000000000000..555edfeef77c + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -221501,7 +253761,7 @@ index 000000000000..555edfeef77c +#ifndef _KBASE_KINSTR_JM_H_ +#define _KBASE_KINSTR_JM_H_ + -+#include "mali_kbase_kinstr_jm_reader.h" ++#include + +#ifdef __KERNEL__ +#include @@ -221509,8 +253769,6 @@ index 000000000000..555edfeef77c +#else +/* empty wrapper macros for userspace */ +#define static_branch_unlikely(key) (1) -+#define KERNEL_VERSION(a, b, c) (0) -+#define LINUX_VERSION_CODE (1) +#endif /* __KERNEL__ */ + +/* Forward declarations */ @@ -221564,14 +253822,7 @@ index 000000000000..555edfeef77c + * shouldn't be changed externally, but if you do, make sure you use + * a static_key_inc()/static_key_dec() pair. + */ -+#if KERNEL_VERSION(4, 3, 0) <= LINUX_VERSION_CODE +extern struct static_key_false basep_kinstr_jm_reader_static_key; -+#else -+/* Pre-4.3 kernels have a different API for static keys, but work -+ * mostly the same with less type safety. */ -+extern struct static_key basep_kinstr_jm_reader_static_key; -+#define static_branch_unlikely(key) static_key_false(key) -+#endif /* KERNEL_VERSION(4, 3, 0) <= LINUX_VERSION_CODE */ + +/** + * kbase_kinstr_jm_atom_state() - Signifies that an atom has changed state @@ -221718,20 +253969,21 @@ index 000000000000..555edfeef77c +} + +#endif /* _KBASE_KINSTR_JM_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h -new file mode 100755 -index 000000000000..e267e6bc44de +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.c b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.c +new file mode 100644 +index 000000000..823f9156e --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h -@@ -0,0 +1,70 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.c +@@ -0,0 +1,2021 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -221742,72 +253994,2023 @@ index 000000000000..e267e6bc44de + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ */ ++ ++#include "mali_kbase.h" ++#include "mali_kbase_kinstr_prfcnt.h" ++#include "hwcnt/mali_kbase_hwcnt_virtualizer.h" ++#include "hwcnt/mali_kbase_hwcnt_gpu.h" ++#include ++#include "mali_malisw.h" ++#include "mali_kbase_debug.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* Explicitly include epoll header for old kernels. Not required from 4.16. */ ++#if KERNEL_VERSION(4, 16, 0) > LINUX_VERSION_CODE ++#include ++#endif ++ ++/* The minimum allowed interval between dumps, in nanoseconds ++ * (equivalent to 10KHz) ++ */ ++#define DUMP_INTERVAL_MIN_NS (100 * NSEC_PER_USEC) ++ ++/* The maximum allowed buffers per client */ ++#define MAX_BUFFER_COUNT 32 ++ ++/** ++ * struct kbase_kinstr_prfcnt_context - IOCTL interface for userspace hardware ++ * counters. ++ * @hvirt: Hardware counter virtualizer used by kinstr_prfcnt. ++ * @info_item_count: Number of metadata elements. ++ * @metadata: Hardware counter metadata provided by virtualizer. ++ * @lock: Lock protecting kinstr_prfcnt state. ++ * @suspend_count: Suspend reference count. If non-zero, timer and worker ++ * are prevented from being re-scheduled. ++ * @client_count: Number of kinstr_prfcnt clients. ++ * @clients: List of kinstr_prfcnt clients. ++ * @dump_timer: Timer that enqueues dump_work to a workqueue. ++ * @dump_work: Worker for performing periodic counter dumps. ++ */ ++struct kbase_kinstr_prfcnt_context { ++ struct kbase_hwcnt_virtualizer *hvirt; ++ u32 info_item_count; ++ const struct kbase_hwcnt_metadata *metadata; ++ struct mutex lock; ++ size_t suspend_count; ++ size_t client_count; ++ struct list_head clients; ++ struct hrtimer dump_timer; ++ struct work_struct dump_work; ++}; ++ ++/** ++ * struct kbase_kinstr_prfcnt_sample - Buffer and descriptor for sample data. ++ * @sample_meta: Pointer to sample metadata. ++ * @dump_buf: Dump buffer containing sample data. ++ */ ++struct kbase_kinstr_prfcnt_sample { ++ struct prfcnt_metadata *sample_meta; ++ struct kbase_hwcnt_dump_buffer dump_buf; ++}; ++ ++/** ++ * struct kbase_kinstr_prfcnt_sample_array - Array of sample data. ++ * @user_buf: Address of allocated userspace buffer. A single allocation is used ++ * for all Dump Buffers in the array. ++ * @sample_count: Number of allocated samples. ++ * @samples: Non-NULL pointer to the array of Dump Buffers. ++ */ ++struct kbase_kinstr_prfcnt_sample_array { ++ u8 *user_buf; ++ size_t sample_count; ++ struct kbase_kinstr_prfcnt_sample *samples; ++}; ++ ++/** ++ * struct kbase_kinstr_prfcnt_client_config - Client session configuration. ++ * @prfcnt_mode: Sampling mode: either manual or periodic. ++ * @counter_set: Set of performance counter blocks. ++ * @scope: Scope of performance counters to capture. ++ * @buffer_count: Number of buffers used to store samples. ++ * @period_ns: Sampling period, in nanoseconds, or 0 if manual mode. ++ * @phys_em: Enable map used by the GPU. ++ */ ++struct kbase_kinstr_prfcnt_client_config { ++ u8 prfcnt_mode; ++ u8 counter_set; ++ u8 scope; ++ u16 buffer_count; ++ u64 period_ns; ++ struct kbase_hwcnt_physical_enable_map phys_em; ++}; ++ ++/** ++ * enum kbase_kinstr_prfcnt_client_init_state - A list of ++ * initialisation states that the ++ * kinstr_prfcnt client can be at ++ * during initialisation. Useful ++ * for terminating a partially ++ * initialised client. ++ * ++ * @KINSTR_PRFCNT_UNINITIALISED : Client is uninitialised ++ * @KINSTR_PRFCNT_PARSE_SETUP : Parse the setup session ++ * @KINSTR_PRFCNT_ENABLE_MAP : Allocate memory for enable map ++ * @KINSTR_PRFCNT_DUMP_BUFFER : Allocate memory for dump buffer ++ * @KINSTR_PRFCNT_SAMPLE_ARRAY : Allocate memory for and initialise sample array ++ * @KINSTR_PRFCNT_VIRTUALIZER_CLIENT : Create virtualizer client ++ * @KINSTR_PRFCNT_WAITQ_MUTEX : Create and initialise mutex and waitqueue ++ * @KINSTR_PRFCNT_INITIALISED : Client is fully initialised ++ */ ++enum kbase_kinstr_prfcnt_client_init_state { ++ KINSTR_PRFCNT_UNINITIALISED, ++ KINSTR_PRFCNT_PARSE_SETUP = KINSTR_PRFCNT_UNINITIALISED, ++ KINSTR_PRFCNT_ENABLE_MAP, ++ KINSTR_PRFCNT_DUMP_BUFFER, ++ KINSTR_PRFCNT_SAMPLE_ARRAY, ++ KINSTR_PRFCNT_VIRTUALIZER_CLIENT, ++ KINSTR_PRFCNT_WAITQ_MUTEX, ++ KINSTR_PRFCNT_INITIALISED ++}; ++ ++/** ++ * struct kbase_kinstr_prfcnt_client - A kinstr_prfcnt client attached ++ * to a kinstr_prfcnt context. ++ * @kinstr_ctx: kinstr_prfcnt context client is attached to. ++ * @hvcli: Hardware counter virtualizer client. ++ * @node: Node used to attach this client to list in ++ * kinstr_prfcnt context. ++ * @cmd_sync_lock: Lock coordinating the reader interface for commands. ++ * @next_dump_time_ns: Time in ns when this client's next periodic dump must ++ * occur. If 0, not a periodic client. ++ * @dump_interval_ns: Interval between periodic dumps. If 0, not a periodic ++ * client. ++ * @sample_flags: Flags for the current active dumping sample, marking ++ * the conditions/events during the dump duration. ++ * @active: True if the client has been started. ++ * @config: Configuration of the client session. ++ * @enable_map: Counters enable map. ++ * @tmp_buf: Temporary buffer to use before handing over dump to ++ * client. ++ * @sample_arr: Array of dump buffers allocated by this client. ++ * @read_idx: Index of buffer read by userspace. ++ * @write_idx: Index of buffer being written by dump worker. ++ * @fetch_idx: Index of buffer being fetched by userspace, but ++ * pending a confirmation of being read (consumed) if it ++ * differs from the read_idx. ++ * @waitq: Client's notification queue. ++ * @sample_size: Size of the data required for one sample, in bytes. ++ * @sample_count: Number of samples the client is able to capture. ++ * @user_data: User data associated with the session. ++ * This is set when the session is started and stopped. ++ * This value is ignored for control commands that ++ * provide another value. ++ */ ++struct kbase_kinstr_prfcnt_client { ++ struct kbase_kinstr_prfcnt_context *kinstr_ctx; ++ struct kbase_hwcnt_virtualizer_client *hvcli; ++ struct list_head node; ++ struct mutex cmd_sync_lock; ++ u64 next_dump_time_ns; ++ u32 dump_interval_ns; ++ u32 sample_flags; ++ bool active; ++ struct kbase_kinstr_prfcnt_client_config config; ++ struct kbase_hwcnt_enable_map enable_map; ++ struct kbase_hwcnt_dump_buffer tmp_buf; ++ struct kbase_kinstr_prfcnt_sample_array sample_arr; ++ atomic_t read_idx; ++ atomic_t write_idx; ++ atomic_t fetch_idx; ++ wait_queue_head_t waitq; ++ size_t sample_size; ++ size_t sample_count; ++ u64 user_data; ++}; ++ ++static struct prfcnt_enum_item kinstr_prfcnt_supported_requests[] = { ++ { ++ /* Request description for MODE request */ ++ .hdr = { ++ .item_type = PRFCNT_ENUM_TYPE_REQUEST, ++ .item_version = PRFCNT_READER_API_VERSION, ++ }, ++ .u.request = { ++ .request_item_type = PRFCNT_REQUEST_MODE, ++ .versions_mask = 0x1, ++ }, ++ }, ++ { ++ /* Request description for ENABLE request */ ++ .hdr = { ++ .item_type = PRFCNT_ENUM_TYPE_REQUEST, ++ .item_version = PRFCNT_READER_API_VERSION, ++ }, ++ .u.request = { ++ .request_item_type = PRFCNT_REQUEST_ENABLE, ++ .versions_mask = 0x1, ++ }, ++ }, ++}; ++ ++/** ++ * kbasep_kinstr_prfcnt_hwcnt_reader_poll() - hwcnt reader's poll. ++ * @filp: Non-NULL pointer to file structure. ++ * @wait: Non-NULL pointer to poll table. + * ++ * Return: EPOLLIN | EPOLLRDNORM if data can be read without blocking, 0 if ++ * data can not be read without blocking, else EPOLLHUP | EPOLLERR. + */ ++static __poll_t ++kbasep_kinstr_prfcnt_hwcnt_reader_poll(struct file *filp, ++ struct poll_table_struct *wait) ++{ ++ struct kbase_kinstr_prfcnt_client *cli; + -+/* -+ * mali_kbase_kinstr_jm_reader.h -+ * Provides an ioctl API to read kernel atom state changes. The flow of the -+ * API is: -+ * 1. Obtain the file descriptor with ``KBASE_IOCTL_KINSTR_JM_FD`` -+ * 2. Determine the buffer structure layout via the above ioctl's returned -+ * size and version fields in ``struct kbase_kinstr_jm_fd_out`` -+ * 4. Poll the file descriptor for ``POLLIN`` -+ * 5. Get data with read() on the fd -+ * 6. Use the structure version to understand how to read the data from the -+ * buffer -+ * 7. Repeat 4-6 -+ * 8. Close the file descriptor ++ if (!filp || !wait) ++ return EPOLLHUP | EPOLLERR; ++ ++ cli = filp->private_data; ++ ++ if (!cli) ++ return EPOLLHUP | EPOLLERR; ++ ++ poll_wait(filp, &cli->waitq, wait); ++ ++ if (atomic_read(&cli->write_idx) != atomic_read(&cli->fetch_idx)) ++ return EPOLLIN | EPOLLRDNORM; ++ ++ return (__poll_t)0; ++} ++ ++/** ++ * kbasep_kinstr_prfcnt_next_dump_time_ns() - Calculate the next periodic ++ * dump time. ++ * @cur_ts_ns: Current time in nanoseconds. ++ * @interval: Interval between dumps in nanoseconds. ++ * ++ * Return: 0 if interval is 0 (i.e. a non-periodic client), or the next dump ++ * time that occurs after cur_ts_ns. + */ ++static u64 kbasep_kinstr_prfcnt_next_dump_time_ns(u64 cur_ts_ns, u32 interval) ++{ ++ /* Non-periodic client */ ++ if (interval == 0) ++ return 0; + -+#ifndef _KBASE_KINSTR_JM_READER_H_ -+#define _KBASE_KINSTR_JM_READER_H_ ++ /* ++ * Return the next interval after the current time relative to t=0. ++ * This means multiple clients with the same period will synchronize, ++ * regardless of when they were started, allowing the worker to be ++ * scheduled less frequently. ++ */ ++ do_div(cur_ts_ns, interval); ++ ++ return (cur_ts_ns + 1) * interval; ++} + +/** -+ * enum kbase_kinstr_jm_reader_atom_state - Determines the work state of an atom -+ * @KBASE_KINSTR_JM_READER_ATOM_STATE_QUEUE: Signifies that an atom has -+ * entered a hardware queue -+ * @KBASE_KINSTR_JM_READER_ATOM_STATE_START: Signifies that work has started -+ * on an atom -+ * @KBASE_KINSTR_JM_READER_ATOM_STATE_STOP: Signifies that work has stopped -+ * on an atom -+ * @KBASE_KINSTR_JM_READER_ATOM_STATE_COMPLETE: Signifies that work has -+ * completed on an atom -+ * @KBASE_KINSTR_JM_READER_ATOM_STATE_COUNT: The number of state enumerations ++ * kbasep_kinstr_prfcnt_timestamp_ns() - Get the current time in nanoseconds. + * -+ * We can add new states to the end of this if they do not break the existing -+ * state machine. Old user mode code can gracefully ignore states they do not -+ * understand. ++ * Return: Current time in nanoseconds. ++ */ ++static u64 kbasep_kinstr_prfcnt_timestamp_ns(void) ++{ ++ return ktime_get_raw_ns(); ++} ++ ++/** ++ * kbasep_kinstr_prfcnt_reschedule_worker() - Update next dump times for all ++ * periodic kinstr_prfcnt clients, ++ * then reschedule the dump worker ++ * appropriately. ++ * @kinstr_ctx: Non-NULL pointer to the kinstr_prfcnt context. + * -+ * If we need to make a breaking change to the state machine, we can do that by -+ * changing the version reported by KBASE_IOCTL_KINSTR_JM_FD. This will -+ * mean that old user mode code will fail to understand the new state field in -+ * the structure and gracefully not use the state change API. ++ * If there are no periodic clients, then the dump worker will not be ++ * rescheduled. Else, the dump worker will be rescheduled for the next ++ * periodic client dump. + */ -+enum kbase_kinstr_jm_reader_atom_state { -+ KBASE_KINSTR_JM_READER_ATOM_STATE_QUEUE, -+ KBASE_KINSTR_JM_READER_ATOM_STATE_START, -+ KBASE_KINSTR_JM_READER_ATOM_STATE_STOP, -+ KBASE_KINSTR_JM_READER_ATOM_STATE_COMPLETE, -+ KBASE_KINSTR_JM_READER_ATOM_STATE_COUNT ++static void kbasep_kinstr_prfcnt_reschedule_worker( ++ struct kbase_kinstr_prfcnt_context *kinstr_ctx) ++{ ++ u64 cur_ts_ns; ++ u64 shortest_period_ns = U64_MAX; ++ struct kbase_kinstr_prfcnt_client *pos; ++ ++ WARN_ON(!kinstr_ctx); ++ lockdep_assert_held(&kinstr_ctx->lock); ++ cur_ts_ns = kbasep_kinstr_prfcnt_timestamp_ns(); ++ ++ /* ++ * This loop fulfills 2 separate tasks that don't affect each other: ++ * ++ * 1) Determine the shortest period. ++ * 2) Update the next dump time of clients that have already been ++ * dumped. It's important not to alter the next dump time of clients ++ * that haven't been dumped yet. ++ * ++ * For the sake of efficiency, the rescheduling decision ignores the time ++ * of the next dump and just uses the shortest period among all periodic ++ * clients. It is more efficient to serve multiple dump requests at once, ++ * rather than trying to reschedule the worker to serve each request ++ * individually. ++ */ ++ list_for_each_entry(pos, &kinstr_ctx->clients, node) { ++ /* Ignore clients that are not periodic or not active. */ ++ if (pos->active && pos->dump_interval_ns > 0) { ++ shortest_period_ns = ++ MIN(shortest_period_ns, pos->dump_interval_ns); ++ ++ /* Next dump should happen exactly one period after the last dump. ++ * If last dump was overdue and scheduled to happen more than one ++ * period ago, compensate for that by scheduling next dump in the ++ * immediate future. ++ */ ++ if (pos->next_dump_time_ns < cur_ts_ns) ++ pos->next_dump_time_ns = ++ MAX(cur_ts_ns + 1, ++ pos->next_dump_time_ns + ++ pos->dump_interval_ns); ++ } ++ } ++ ++ /* Cancel the timer if it is already pending */ ++ hrtimer_cancel(&kinstr_ctx->dump_timer); ++ ++ /* Start the timer if there are periodic clients and kinstr_prfcnt is not ++ * suspended. ++ */ ++ if ((shortest_period_ns != U64_MAX) && ++ (kinstr_ctx->suspend_count == 0)) { ++ u64 next_schedule_time_ns = ++ kbasep_kinstr_prfcnt_next_dump_time_ns( ++ cur_ts_ns, shortest_period_ns); ++ hrtimer_start(&kinstr_ctx->dump_timer, ++ ns_to_ktime(next_schedule_time_ns - cur_ts_ns), ++ HRTIMER_MODE_REL); ++ } ++} ++ ++static enum prfcnt_block_type ++kbase_hwcnt_metadata_block_type_to_prfcnt_block_type(u64 type) ++{ ++ enum prfcnt_block_type block_type; ++ ++ switch (type) { ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE2: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE3: ++ block_type = PRFCNT_BLOCK_TYPE_FE; ++ break; ++ ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER: ++ block_type = PRFCNT_BLOCK_TYPE_TILER; ++ break; ++ ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC2: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC3: ++ block_type = PRFCNT_BLOCK_TYPE_SHADER_CORE; ++ break; ++ ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS2: ++ block_type = PRFCNT_BLOCK_TYPE_MEMORY; ++ break; ++ ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_FE_UNDEFINED: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_SC_UNDEFINED: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_TILER_UNDEFINED: ++ case KBASE_HWCNT_GPU_V5_BLOCK_TYPE_PERF_MEMSYS_UNDEFINED: ++ default: ++ block_type = PRFCNT_BLOCK_TYPE_RESERVED; ++ break; ++ } ++ ++ return block_type; ++} ++ ++static bool kbase_kinstr_is_block_type_reserved(const struct kbase_hwcnt_metadata *metadata, ++ size_t grp, size_t blk) ++{ ++ enum prfcnt_block_type block_type = kbase_hwcnt_metadata_block_type_to_prfcnt_block_type( ++ kbase_hwcnt_metadata_block_type(metadata, grp, blk)); ++ ++ return block_type == PRFCNT_BLOCK_TYPE_RESERVED; ++} ++ ++/** ++ * kbasep_kinstr_prfcnt_set_block_meta_items() - Populate a sample's block meta ++ * item array. ++ * @enable_map: Non-NULL pointer to the map of enabled counters. ++ * @dst: Non-NULL pointer to the sample's dump buffer object. ++ * @block_meta_base: Non-NULL double pointer to the start of the block meta ++ * data items. ++ * @base_addr: Address of allocated pages for array of samples. Used ++ * to calculate offset of block values. ++ * @counter_set: The SET which blocks represent. ++ * ++ * Return: 0 on success, else error code. ++ */ ++int kbasep_kinstr_prfcnt_set_block_meta_items(struct kbase_hwcnt_enable_map *enable_map, ++ struct kbase_hwcnt_dump_buffer *dst, ++ struct prfcnt_metadata **block_meta_base, ++ u8 *base_addr, u8 counter_set) ++{ ++ size_t grp, blk, blk_inst; ++ struct prfcnt_metadata **ptr_md = block_meta_base; ++ const struct kbase_hwcnt_metadata *metadata; ++ uint8_t block_idx = 0; ++ ++ if (!dst || !*block_meta_base) ++ return -EINVAL; ++ ++ metadata = dst->metadata; ++ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) { ++ u8 *dst_blk; ++ ++ /* Block indices must be reported with no gaps. */ ++ if (blk_inst == 0) ++ block_idx = 0; ++ ++ /* Skip unavailable or non-enabled blocks */ ++ if (kbase_kinstr_is_block_type_reserved(metadata, grp, blk) || ++ !kbase_hwcnt_metadata_block_instance_avail(metadata, grp, blk, blk_inst) || ++ !kbase_hwcnt_enable_map_block_enabled(enable_map, grp, blk, blk_inst)) ++ continue; ++ ++ dst_blk = (u8 *)kbase_hwcnt_dump_buffer_block_instance(dst, grp, blk, blk_inst); ++ (*ptr_md)->hdr.item_type = PRFCNT_SAMPLE_META_TYPE_BLOCK; ++ (*ptr_md)->hdr.item_version = PRFCNT_READER_API_VERSION; ++ (*ptr_md)->u.block_md.block_type = ++ kbase_hwcnt_metadata_block_type_to_prfcnt_block_type( ++ kbase_hwcnt_metadata_block_type(metadata, grp, ++ blk)); ++ (*ptr_md)->u.block_md.block_idx = block_idx; ++ (*ptr_md)->u.block_md.set = counter_set; ++ (*ptr_md)->u.block_md.block_state = BLOCK_STATE_UNKNOWN; ++ (*ptr_md)->u.block_md.values_offset = (u32)(dst_blk - base_addr); ++ ++ /* update the buf meta data block pointer to next item */ ++ (*ptr_md)++; ++ block_idx++; ++ } ++ ++ return 0; ++} ++ ++/** ++ * kbasep_kinstr_prfcnt_set_sample_metadata() - Set sample metadata for sample ++ * output. ++ * @cli: Non-NULL pointer to a kinstr_prfcnt client. ++ * @dump_buf: Non-NULL pointer to dump buffer where sample is stored. ++ * @ptr_md: Non-NULL pointer to sample metadata. ++ */ ++static void kbasep_kinstr_prfcnt_set_sample_metadata( ++ struct kbase_kinstr_prfcnt_client *cli, ++ struct kbase_hwcnt_dump_buffer *dump_buf, ++ struct prfcnt_metadata *ptr_md) ++{ ++ u8 clk_cnt, i; ++ ++ clk_cnt = cli->kinstr_ctx->metadata->clk_cnt; ++ ++ /* PRFCNT_SAMPLE_META_TYPE_SAMPLE must be the first item */ ++ ptr_md->hdr.item_type = PRFCNT_SAMPLE_META_TYPE_SAMPLE; ++ ptr_md->hdr.item_version = PRFCNT_READER_API_VERSION; ++ ptr_md->u.sample_md.seq = atomic_read(&cli->write_idx); ++ ptr_md->u.sample_md.flags = cli->sample_flags; ++ ++ /* Place the PRFCNT_SAMPLE_META_TYPE_CLOCK optionally as the 2nd */ ++ ptr_md++; ++ if (clk_cnt > MAX_REPORTED_DOMAINS) ++ clk_cnt = MAX_REPORTED_DOMAINS; ++ ++ /* Handle the prfcnt_clock_metadata meta item */ ++ ptr_md->hdr.item_type = PRFCNT_SAMPLE_META_TYPE_CLOCK; ++ ptr_md->hdr.item_version = PRFCNT_READER_API_VERSION; ++ ptr_md->u.clock_md.num_domains = clk_cnt; ++ for (i = 0; i < clk_cnt; i++) ++ ptr_md->u.clock_md.cycles[i] = dump_buf->clk_cnt_buf[i]; ++ ++ /* Dealing with counter blocks */ ++ ptr_md++; ++ if (WARN_ON(kbasep_kinstr_prfcnt_set_block_meta_items(&cli->enable_map, dump_buf, &ptr_md, ++ cli->sample_arr.user_buf, ++ cli->config.counter_set))) ++ return; ++ ++ /* Handle the last sentinel item */ ++ ptr_md->hdr.item_type = FLEX_LIST_TYPE_NONE; ++ ptr_md->hdr.item_version = 0; ++} ++ ++/** ++ * kbasep_kinstr_prfcnt_client_output_sample() - Assemble a sample for output. ++ * @cli: Non-NULL pointer to a kinstr_prfcnt client. ++ * @buf_idx: The index to the sample array for saving the sample. ++ * @user_data: User data to return to the user. ++ * @ts_start_ns: Time stamp for the start point of the sample dump. ++ * @ts_end_ns: Time stamp for the end point of the sample dump. ++ */ ++static void kbasep_kinstr_prfcnt_client_output_sample( ++ struct kbase_kinstr_prfcnt_client *cli, unsigned int buf_idx, ++ u64 user_data, u64 ts_start_ns, u64 ts_end_ns) ++{ ++ struct kbase_hwcnt_dump_buffer *dump_buf; ++ struct kbase_hwcnt_dump_buffer *tmp_buf = &cli->tmp_buf; ++ struct prfcnt_metadata *ptr_md; ++ ++ if (WARN_ON(buf_idx >= cli->sample_arr.sample_count)) ++ return; ++ ++ dump_buf = &cli->sample_arr.samples[buf_idx].dump_buf; ++ ptr_md = cli->sample_arr.samples[buf_idx].sample_meta; ++ ++ /* Patch the dump buf headers, to hide the counters that other hwcnt ++ * clients are using. ++ */ ++ kbase_hwcnt_gpu_patch_dump_headers(tmp_buf, &cli->enable_map); ++ ++ /* Copy the temp buffer to the userspace visible buffer. The strict ++ * variant will explicitly zero any non-enabled counters to ensure ++ * nothing except exactly what the user asked for is made visible. ++ */ ++ kbase_hwcnt_dump_buffer_copy_strict(dump_buf, tmp_buf, ++ &cli->enable_map); ++ ++ /* PRFCNT_SAMPLE_META_TYPE_SAMPLE must be the first item. ++ * Set timestamp and user data for real dump. ++ */ ++ ptr_md->u.sample_md.timestamp_start = ts_start_ns; ++ ptr_md->u.sample_md.timestamp_end = ts_end_ns; ++ ptr_md->u.sample_md.user_data = user_data; ++ ++ kbasep_kinstr_prfcnt_set_sample_metadata(cli, dump_buf, ptr_md); ++} ++ ++/** ++ * kbasep_kinstr_prfcnt_client_dump() - Perform a dump for a client. ++ * @cli: Non-NULL pointer to a kinstr_prfcnt client. ++ * @event_id: Event type that triggered the dump. ++ * @user_data: User data to return to the user. ++ * ++ * Return: 0 on success, else error code. ++ */ ++static int kbasep_kinstr_prfcnt_client_dump(struct kbase_kinstr_prfcnt_client *cli, ++ enum base_hwcnt_reader_event event_id, u64 user_data) ++{ ++ int ret; ++ u64 ts_start_ns = 0; ++ u64 ts_end_ns = 0; ++ unsigned int write_idx; ++ unsigned int read_idx; ++ size_t available_samples_count; ++ ++ WARN_ON(!cli); ++ lockdep_assert_held(&cli->kinstr_ctx->lock); ++ ++ write_idx = atomic_read(&cli->write_idx); ++ read_idx = atomic_read(&cli->read_idx); ++ ++ /* Check if there is a place to copy HWC block into. Calculate the ++ * number of available samples count, by taking into account the type ++ * of dump. ++ */ ++ available_samples_count = cli->sample_arr.sample_count; ++ WARN_ON(available_samples_count < 1); ++ /* Reserve one slot to store the implicit sample taken on CMD_STOP */ ++ available_samples_count -= 1; ++ if (write_idx - read_idx == available_samples_count) { ++ /* For periodic sampling, the current active dump ++ * will be accumulated in the next sample, when ++ * a buffer becomes available. ++ */ ++ if (event_id == BASE_HWCNT_READER_EVENT_PERIODIC) ++ cli->sample_flags |= SAMPLE_FLAG_OVERFLOW; ++ return -EBUSY; ++ } ++ ++ /* For the rest of the function, use the actual sample_count ++ * that represents the real size of the array. ++ */ ++ write_idx %= cli->sample_arr.sample_count; ++ ++ ret = kbase_hwcnt_virtualizer_client_dump(cli->hvcli, &ts_start_ns, &ts_end_ns, ++ &cli->tmp_buf); ++ /* HWC dump error, set the sample with error flag */ ++ if (ret) ++ cli->sample_flags |= SAMPLE_FLAG_ERROR; ++ ++ /* Make the sample ready and copy it to the userspace mapped buffer */ ++ kbasep_kinstr_prfcnt_client_output_sample(cli, write_idx, user_data, ts_start_ns, ++ ts_end_ns); ++ ++ /* Notify client. Make sure all changes to memory are visible. */ ++ wmb(); ++ atomic_inc(&cli->write_idx); ++ wake_up_interruptible(&cli->waitq); ++ /* Reset the flags for the next sample dump */ ++ cli->sample_flags = 0; ++ ++ return 0; ++} ++ ++static int ++kbasep_kinstr_prfcnt_client_start(struct kbase_kinstr_prfcnt_client *cli, ++ u64 user_data) ++{ ++ int ret; ++ u64 tm_start, tm_end; ++ unsigned int write_idx; ++ unsigned int read_idx; ++ size_t available_samples_count; ++ ++ WARN_ON(!cli); ++ lockdep_assert_held(&cli->cmd_sync_lock); ++ ++ /* If the client is already started, the command is a no-op */ ++ if (cli->active) ++ return 0; ++ ++ write_idx = atomic_read(&cli->write_idx); ++ read_idx = atomic_read(&cli->read_idx); ++ ++ /* Check whether there is space to store atleast an implicit sample ++ * corresponding to CMD_STOP. ++ */ ++ available_samples_count = cli->sample_count - (write_idx - read_idx); ++ if (!available_samples_count) ++ return -EBUSY; ++ ++ kbase_hwcnt_gpu_enable_map_from_physical(&cli->enable_map, ++ &cli->config.phys_em); ++ ++ /* Enable all the available clk_enable_map. */ ++ cli->enable_map.clk_enable_map = (1ull << cli->kinstr_ctx->metadata->clk_cnt) - 1; ++ ++ mutex_lock(&cli->kinstr_ctx->lock); ++ /* Enable HWC from the configuration of the client creation */ ++ ret = kbase_hwcnt_virtualizer_client_set_counters( ++ cli->hvcli, &cli->enable_map, &tm_start, &tm_end, NULL); ++ ++ if (!ret) { ++ cli->active = true; ++ cli->user_data = user_data; ++ cli->sample_flags = 0; ++ ++ if (cli->dump_interval_ns) ++ kbasep_kinstr_prfcnt_reschedule_worker(cli->kinstr_ctx); ++ } ++ ++ mutex_unlock(&cli->kinstr_ctx->lock); ++ ++ return ret; ++} ++ ++static int ++kbasep_kinstr_prfcnt_client_stop(struct kbase_kinstr_prfcnt_client *cli, ++ u64 user_data) ++{ ++ int ret; ++ u64 tm_start = 0; ++ u64 tm_end = 0; ++ struct kbase_hwcnt_physical_enable_map phys_em; ++ size_t available_samples_count; ++ unsigned int write_idx; ++ unsigned int read_idx; ++ ++ WARN_ON(!cli); ++ lockdep_assert_held(&cli->cmd_sync_lock); ++ ++ /* If the client is not started, the command is invalid */ ++ if (!cli->active) ++ return -EINVAL; ++ ++ mutex_lock(&cli->kinstr_ctx->lock); ++ ++ /* Disable counters under the lock, so we do not race with the ++ * sampling thread. ++ */ ++ phys_em.fe_bm = 0; ++ phys_em.tiler_bm = 0; ++ phys_em.mmu_l2_bm = 0; ++ phys_em.shader_bm = 0; ++ ++ kbase_hwcnt_gpu_enable_map_from_physical(&cli->enable_map, &phys_em); ++ ++ /* Check whether one has the buffer to hold the last sample */ ++ write_idx = atomic_read(&cli->write_idx); ++ read_idx = atomic_read(&cli->read_idx); ++ ++ available_samples_count = cli->sample_count - (write_idx - read_idx); ++ ++ ret = kbase_hwcnt_virtualizer_client_set_counters(cli->hvcli, ++ &cli->enable_map, ++ &tm_start, &tm_end, ++ &cli->tmp_buf); ++ /* If the last stop sample is in error, set the sample flag */ ++ if (ret) ++ cli->sample_flags |= SAMPLE_FLAG_ERROR; ++ ++ /* There must be a place to save the last stop produced sample */ ++ if (!WARN_ON(!available_samples_count)) { ++ write_idx %= cli->sample_arr.sample_count; ++ /* Handle the last stop sample */ ++ kbase_hwcnt_gpu_enable_map_from_physical(&cli->enable_map, ++ &cli->config.phys_em); ++ /* As this is a stop sample, mark it as MANUAL */ ++ kbasep_kinstr_prfcnt_client_output_sample( ++ cli, write_idx, user_data, tm_start, tm_end); ++ /* Notify client. Make sure all changes to memory are visible. */ ++ wmb(); ++ atomic_inc(&cli->write_idx); ++ wake_up_interruptible(&cli->waitq); ++ } ++ ++ cli->active = false; ++ cli->user_data = user_data; ++ ++ if (cli->dump_interval_ns) ++ kbasep_kinstr_prfcnt_reschedule_worker(cli->kinstr_ctx); ++ ++ mutex_unlock(&cli->kinstr_ctx->lock); ++ ++ return 0; ++} ++ ++static int ++kbasep_kinstr_prfcnt_client_sync_dump(struct kbase_kinstr_prfcnt_client *cli, ++ u64 user_data) ++{ ++ int ret; ++ ++ lockdep_assert_held(&cli->cmd_sync_lock); ++ ++ /* If the client is not started, or not manual, the command invalid */ ++ if (!cli->active || cli->dump_interval_ns) ++ return -EINVAL; ++ ++ mutex_lock(&cli->kinstr_ctx->lock); ++ ++ ret = kbasep_kinstr_prfcnt_client_dump(cli, BASE_HWCNT_READER_EVENT_MANUAL, user_data); ++ ++ mutex_unlock(&cli->kinstr_ctx->lock); ++ ++ return ret; ++} ++ ++static int ++kbasep_kinstr_prfcnt_client_discard(struct kbase_kinstr_prfcnt_client *cli) ++{ ++ unsigned int write_idx; ++ ++ WARN_ON(!cli); ++ lockdep_assert_held(&cli->cmd_sync_lock); ++ ++ mutex_lock(&cli->kinstr_ctx->lock); ++ ++ write_idx = atomic_read(&cli->write_idx); ++ ++ /* Discard (clear) all internally buffered samples. Note, if there ++ * is a fetched sample in flight, one should not touch the read index, ++ * leaving it alone for the put-sample operation to update it. The ++ * consistency between the read_idx and the fetch_idx is coordinated by ++ * holding the cli->cmd_sync_lock. ++ */ ++ if (atomic_read(&cli->fetch_idx) != atomic_read(&cli->read_idx)) { ++ atomic_set(&cli->fetch_idx, write_idx); ++ } else { ++ atomic_set(&cli->fetch_idx, write_idx); ++ atomic_set(&cli->read_idx, write_idx); ++ } ++ ++ mutex_unlock(&cli->kinstr_ctx->lock); ++ ++ return 0; ++} ++ ++int kbasep_kinstr_prfcnt_cmd(struct kbase_kinstr_prfcnt_client *cli, ++ struct prfcnt_control_cmd *control_cmd) ++{ ++ int ret = 0; ++ ++ mutex_lock(&cli->cmd_sync_lock); ++ ++ switch (control_cmd->cmd) { ++ case PRFCNT_CONTROL_CMD_START: ++ ret = kbasep_kinstr_prfcnt_client_start(cli, ++ control_cmd->user_data); ++ break; ++ case PRFCNT_CONTROL_CMD_STOP: ++ ret = kbasep_kinstr_prfcnt_client_stop(cli, ++ control_cmd->user_data); ++ break; ++ case PRFCNT_CONTROL_CMD_SAMPLE_SYNC: ++ ret = kbasep_kinstr_prfcnt_client_sync_dump( ++ cli, control_cmd->user_data); ++ break; ++ case PRFCNT_CONTROL_CMD_DISCARD: ++ ret = kbasep_kinstr_prfcnt_client_discard(cli); ++ break; ++ default: ++ ret = -EINVAL; ++ break; ++ } ++ ++ mutex_unlock(&cli->cmd_sync_lock); ++ ++ return ret; ++} ++ ++static int ++kbasep_kinstr_prfcnt_get_sample(struct kbase_kinstr_prfcnt_client *cli, ++ struct prfcnt_sample_access *sample_access) ++{ ++ unsigned int write_idx; ++ unsigned int read_idx; ++ unsigned int fetch_idx; ++ u64 sample_offset_bytes; ++ struct prfcnt_metadata *sample_meta; ++ int err = 0; ++ ++ mutex_lock(&cli->cmd_sync_lock); ++ write_idx = atomic_read(&cli->write_idx); ++ read_idx = atomic_read(&cli->read_idx); ++ ++ if (write_idx == read_idx) { ++ err = -EINVAL; ++ goto error_out; ++ } ++ ++ /* If the client interface has already had a sample been fetched, ++ * reflected by the fetch index not equal to read_idx, i.e., typically ++ * read_idx + 1 == fetch_idx, ++ * further fetch is not allowed until the previously fetched buffer ++ * is put back (which brings the read_idx == fetch_idx). As a design, ++ * the above add one equal condition (i.e. typical cases) may only be ++ * untrue if there had been an interface operation on sample discard, ++ * after the sample in question already been fetched, in which case, ++ * the fetch_idx could have a delta larger than 1 relative to the ++ * read_idx. ++ */ ++ fetch_idx = atomic_read(&cli->fetch_idx); ++ if (read_idx != fetch_idx) { ++ err = -EBUSY; ++ goto error_out; ++ } ++ ++ read_idx %= cli->sample_arr.sample_count; ++ sample_meta = cli->sample_arr.samples[read_idx].sample_meta; ++ sample_offset_bytes = (u8 *)sample_meta - cli->sample_arr.user_buf; ++ ++ sample_access->sequence = sample_meta->u.sample_md.seq; ++ sample_access->sample_offset_bytes = sample_offset_bytes; ++ ++ /* Marking a sample has been fetched by advancing the fetch index */ ++ atomic_inc(&cli->fetch_idx); ++ ++error_out: ++ mutex_unlock(&cli->cmd_sync_lock); ++ return err; ++} ++ ++static int ++kbasep_kinstr_prfcnt_put_sample(struct kbase_kinstr_prfcnt_client *cli, ++ struct prfcnt_sample_access *sample_access) ++{ ++ unsigned int write_idx; ++ unsigned int read_idx; ++ unsigned int fetch_idx; ++ u64 sample_offset_bytes; ++ int err = 0; ++ ++ mutex_lock(&cli->cmd_sync_lock); ++ write_idx = atomic_read(&cli->write_idx); ++ read_idx = atomic_read(&cli->read_idx); ++ ++ if (write_idx == read_idx || sample_access->sequence != read_idx) { ++ err = -EINVAL; ++ goto error_out; ++ } ++ ++ read_idx %= cli->sample_arr.sample_count; ++ sample_offset_bytes = ++ (u8 *)cli->sample_arr.samples[read_idx].sample_meta - cli->sample_arr.user_buf; ++ ++ if (sample_access->sample_offset_bytes != sample_offset_bytes) { ++ err = -EINVAL; ++ goto error_out; ++ } ++ ++ fetch_idx = atomic_read(&cli->fetch_idx); ++ WARN_ON(read_idx == fetch_idx); ++ /* Setting the read_idx matching the fetch_idx, signals no in-flight ++ * fetched sample. ++ */ ++ atomic_set(&cli->read_idx, fetch_idx); ++ ++error_out: ++ mutex_unlock(&cli->cmd_sync_lock); ++ return err; ++} ++ ++/** ++ * kbasep_kinstr_prfcnt_hwcnt_reader_ioctl() - hwcnt reader's ioctl. ++ * @filp: Non-NULL pointer to file structure. ++ * @cmd: User command. ++ * @arg: Command's argument. ++ * ++ * Return: 0 on success, else error code. ++ */ ++static long kbasep_kinstr_prfcnt_hwcnt_reader_ioctl(struct file *filp, ++ unsigned int cmd, ++ unsigned long arg) ++{ ++ long rcode = 0; ++ struct kbase_kinstr_prfcnt_client *cli; ++ void __user *uarg = (void __user *)arg; ++ ++ if (!filp) ++ return -EINVAL; ++ ++ cli = filp->private_data; ++ ++ if (!cli) ++ return -EINVAL; ++ ++ switch (_IOC_NR(cmd)) { ++ case _IOC_NR(KBASE_IOCTL_KINSTR_PRFCNT_CMD): { ++ struct prfcnt_control_cmd control_cmd; ++ int err; ++ ++ err = copy_from_user(&control_cmd, uarg, sizeof(control_cmd)); ++ if (err) ++ return -EFAULT; ++ rcode = kbasep_kinstr_prfcnt_cmd(cli, &control_cmd); ++ } break; ++ case _IOC_NR(KBASE_IOCTL_KINSTR_PRFCNT_GET_SAMPLE): { ++ struct prfcnt_sample_access sample_access; ++ int err; ++ ++ memset(&sample_access, 0, sizeof(sample_access)); ++ rcode = kbasep_kinstr_prfcnt_get_sample(cli, &sample_access); ++ err = copy_to_user(uarg, &sample_access, sizeof(sample_access)); ++ if (err) ++ return -EFAULT; ++ } break; ++ case _IOC_NR(KBASE_IOCTL_KINSTR_PRFCNT_PUT_SAMPLE): { ++ struct prfcnt_sample_access sample_access; ++ int err; ++ ++ err = copy_from_user(&sample_access, uarg, ++ sizeof(sample_access)); ++ if (err) ++ return -EFAULT; ++ rcode = kbasep_kinstr_prfcnt_put_sample(cli, &sample_access); ++ } break; ++ default: ++ rcode = -EINVAL; ++ break; ++ } ++ ++ return rcode; ++} ++ ++/** ++ * kbasep_kinstr_prfcnt_hwcnt_reader_mmap() - hwcnt reader's mmap. ++ * @filp: Non-NULL pointer to file structure. ++ * @vma: Non-NULL pointer to vma structure. ++ * ++ * Return: 0 on success, else error code. ++ */ ++static int kbasep_kinstr_prfcnt_hwcnt_reader_mmap(struct file *filp, ++ struct vm_area_struct *vma) ++{ ++ struct kbase_kinstr_prfcnt_client *cli; ++ ++ if (!filp || !vma) ++ return -EINVAL; ++ ++ cli = filp->private_data; ++ if (!cli) ++ return -EINVAL; ++ ++ return remap_vmalloc_range(vma, cli->sample_arr.user_buf, 0); ++} ++ ++static void kbasep_kinstr_prfcnt_sample_array_free( ++ struct kbase_kinstr_prfcnt_sample_array *sample_arr) ++{ ++ if (!sample_arr) ++ return; ++ ++ kfree(sample_arr->samples); ++ vfree(sample_arr->user_buf); ++ memset(sample_arr, 0, sizeof(*sample_arr)); ++} ++ ++static void ++kbasep_kinstr_prfcnt_client_destroy_partial(struct kbase_kinstr_prfcnt_client *cli, ++ enum kbase_kinstr_prfcnt_client_init_state init_state) ++{ ++ if (!cli) ++ return; ++ ++ while (init_state-- > KINSTR_PRFCNT_UNINITIALISED) { ++ switch (init_state) { ++ case KINSTR_PRFCNT_INITIALISED: ++ /* This shouldn't be reached */ ++ break; ++ case KINSTR_PRFCNT_WAITQ_MUTEX: ++ mutex_destroy(&cli->cmd_sync_lock); ++ break; ++ case KINSTR_PRFCNT_VIRTUALIZER_CLIENT: ++ kbase_hwcnt_virtualizer_client_destroy(cli->hvcli); ++ break; ++ case KINSTR_PRFCNT_SAMPLE_ARRAY: ++ kbasep_kinstr_prfcnt_sample_array_free(&cli->sample_arr); ++ break; ++ case KINSTR_PRFCNT_DUMP_BUFFER: ++ kbase_hwcnt_dump_buffer_free(&cli->tmp_buf); ++ break; ++ case KINSTR_PRFCNT_ENABLE_MAP: ++ kbase_hwcnt_enable_map_free(&cli->enable_map); ++ break; ++ case KINSTR_PRFCNT_PARSE_SETUP: ++ /* Nothing to do here */ ++ break; ++ } ++ } ++ kfree(cli); ++} ++ ++void kbasep_kinstr_prfcnt_client_destroy(struct kbase_kinstr_prfcnt_client *cli) ++{ ++ kbasep_kinstr_prfcnt_client_destroy_partial(cli, KINSTR_PRFCNT_INITIALISED); ++} ++ ++/** ++ * kbasep_kinstr_prfcnt_hwcnt_reader_release() - hwcnt reader's release. ++ * @inode: Non-NULL pointer to inode structure. ++ * @filp: Non-NULL pointer to file structure. ++ * ++ * Return: 0 always. ++ */ ++static int kbasep_kinstr_prfcnt_hwcnt_reader_release(struct inode *inode, ++ struct file *filp) ++{ ++ struct kbase_kinstr_prfcnt_client *cli = filp->private_data; ++ ++ mutex_lock(&cli->kinstr_ctx->lock); ++ ++ WARN_ON(cli->kinstr_ctx->client_count == 0); ++ if (cli->kinstr_ctx->client_count > 0) ++ cli->kinstr_ctx->client_count--; ++ list_del(&cli->node); ++ ++ mutex_unlock(&cli->kinstr_ctx->lock); ++ ++ kbasep_kinstr_prfcnt_client_destroy(cli); ++ ++ return 0; ++} ++ ++/* kinstr_prfcnt client file operations */ ++static const struct file_operations kinstr_prfcnt_client_fops = { ++ .owner = THIS_MODULE, ++ .poll = kbasep_kinstr_prfcnt_hwcnt_reader_poll, ++ .unlocked_ioctl = kbasep_kinstr_prfcnt_hwcnt_reader_ioctl, ++ .compat_ioctl = kbasep_kinstr_prfcnt_hwcnt_reader_ioctl, ++ .mmap = kbasep_kinstr_prfcnt_hwcnt_reader_mmap, ++ .release = kbasep_kinstr_prfcnt_hwcnt_reader_release, +}; + -+#endif /* _KBASE_KINSTR_JM_READER_H_ */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_linux.h b/drivers/gpu/arm/bifrost/mali_kbase_linux.h -new file mode 100755 -index 000000000000..003ac9e68a76 ++size_t kbasep_kinstr_prfcnt_get_sample_md_count(const struct kbase_hwcnt_metadata *metadata, ++ struct kbase_hwcnt_enable_map *enable_map) ++{ ++ size_t grp, blk, blk_inst; ++ size_t md_count = 0; ++ ++ if (!metadata) ++ return 0; ++ ++ kbase_hwcnt_metadata_for_each_block(metadata, grp, blk, blk_inst) { ++ /* Skip unavailable, non-enabled or reserved blocks */ ++ if (kbase_kinstr_is_block_type_reserved(metadata, grp, blk) || ++ !kbase_hwcnt_metadata_block_instance_avail(metadata, grp, blk, blk_inst) || ++ !kbase_hwcnt_enable_map_block_enabled(enable_map, grp, blk, blk_inst)) ++ continue; ++ ++ md_count++; ++ } ++ ++ /* add counts for clock_meta and sample meta, respectively */ ++ md_count += 2; ++ ++ /* Reserve one for last sentinel item. */ ++ md_count++; ++ ++ return md_count; ++} ++ ++static size_t kbasep_kinstr_prfcnt_get_sample_size(struct kbase_kinstr_prfcnt_client *cli, ++ const struct kbase_hwcnt_metadata *metadata) ++{ ++ size_t dump_buf_bytes; ++ size_t clk_cnt_buf_bytes; ++ size_t sample_meta_bytes; ++ struct kbase_hwcnt_dump_buffer *dump_buf = &cli->tmp_buf; ++ size_t md_count = kbasep_kinstr_prfcnt_get_sample_md_count(metadata, &cli->enable_map); ++ ++ if (!metadata) ++ return 0; ++ ++ sample_meta_bytes = sizeof(struct prfcnt_metadata) * md_count; ++ dump_buf_bytes = metadata->dump_buf_bytes; ++ clk_cnt_buf_bytes = sizeof(*dump_buf->clk_cnt_buf) * metadata->clk_cnt; ++ ++ return (sample_meta_bytes + dump_buf_bytes + clk_cnt_buf_bytes); ++} ++ ++/** ++ * kbasep_kinstr_prfcnt_dump_worker()- Dump worker, that dumps all periodic ++ * clients that need to be dumped, then ++ * reschedules itself. ++ * @work: Work structure. ++ */ ++static void kbasep_kinstr_prfcnt_dump_worker(struct work_struct *work) ++{ ++ struct kbase_kinstr_prfcnt_context *kinstr_ctx = container_of( ++ work, struct kbase_kinstr_prfcnt_context, dump_work); ++ struct kbase_kinstr_prfcnt_client *pos; ++ u64 cur_time_ns; ++ ++ mutex_lock(&kinstr_ctx->lock); ++ ++ cur_time_ns = kbasep_kinstr_prfcnt_timestamp_ns(); ++ ++ list_for_each_entry(pos, &kinstr_ctx->clients, node) { ++ if (pos->active && (pos->next_dump_time_ns != 0) && ++ (pos->next_dump_time_ns < cur_time_ns)) ++ kbasep_kinstr_prfcnt_client_dump(pos, BASE_HWCNT_READER_EVENT_PERIODIC, ++ pos->user_data); ++ } ++ ++ kbasep_kinstr_prfcnt_reschedule_worker(kinstr_ctx); ++ ++ mutex_unlock(&kinstr_ctx->lock); ++} ++ ++/** ++ * kbasep_kinstr_prfcnt_dump_timer() - Dump timer that schedules the dump worker for ++ * execution as soon as possible. ++ * @timer: Timer structure. ++ * ++ * Return: HRTIMER_NORESTART always. ++ */ ++static enum hrtimer_restart ++kbasep_kinstr_prfcnt_dump_timer(struct hrtimer *timer) ++{ ++ struct kbase_kinstr_prfcnt_context *kinstr_ctx = container_of( ++ timer, struct kbase_kinstr_prfcnt_context, dump_timer); ++ ++ /* We don't need to check kinstr_ctx->suspend_count here. ++ * Suspend and resume functions already ensure that the worker ++ * is cancelled when the driver is suspended, and resumed when ++ * the suspend_count reaches 0. ++ */ ++ kbase_hwcnt_virtualizer_queue_work(kinstr_ctx->hvirt, ++ &kinstr_ctx->dump_work); ++ ++ return HRTIMER_NORESTART; ++} ++ ++int kbase_kinstr_prfcnt_init(struct kbase_hwcnt_virtualizer *hvirt, ++ struct kbase_kinstr_prfcnt_context **out_kinstr_ctx) ++{ ++ struct kbase_kinstr_prfcnt_context *kinstr_ctx; ++ const struct kbase_hwcnt_metadata *metadata; ++ ++ if (!hvirt || !out_kinstr_ctx) ++ return -EINVAL; ++ ++ metadata = kbase_hwcnt_virtualizer_metadata(hvirt); ++ ++ if (!metadata) ++ return -EINVAL; ++ ++ kinstr_ctx = kzalloc(sizeof(*kinstr_ctx), GFP_KERNEL); ++ ++ if (!kinstr_ctx) ++ return -ENOMEM; ++ ++ kinstr_ctx->hvirt = hvirt; ++ kinstr_ctx->metadata = metadata; ++ ++ mutex_init(&kinstr_ctx->lock); ++ INIT_LIST_HEAD(&kinstr_ctx->clients); ++ hrtimer_init(&kinstr_ctx->dump_timer, CLOCK_MONOTONIC, ++ HRTIMER_MODE_REL); ++ kinstr_ctx->dump_timer.function = kbasep_kinstr_prfcnt_dump_timer; ++ INIT_WORK(&kinstr_ctx->dump_work, kbasep_kinstr_prfcnt_dump_worker); ++ ++ *out_kinstr_ctx = kinstr_ctx; ++ return 0; ++} ++ ++void kbase_kinstr_prfcnt_term(struct kbase_kinstr_prfcnt_context *kinstr_ctx) ++{ ++ if (!kinstr_ctx) ++ return; ++ ++ /* Non-zero client count implies client leak */ ++ if (WARN_ON(kinstr_ctx->client_count > 0)) { ++ struct kbase_kinstr_prfcnt_client *pos, *n; ++ ++ list_for_each_entry_safe (pos, n, &kinstr_ctx->clients, node) { ++ list_del(&pos->node); ++ kinstr_ctx->client_count--; ++ kbasep_kinstr_prfcnt_client_destroy(pos); ++ } ++ } ++ ++ cancel_work_sync(&kinstr_ctx->dump_work); ++ ++ WARN_ON(kinstr_ctx->client_count > 0); ++ kfree(kinstr_ctx); ++} ++ ++void kbase_kinstr_prfcnt_suspend(struct kbase_kinstr_prfcnt_context *kinstr_ctx) ++{ ++ if (WARN_ON(!kinstr_ctx)) ++ return; ++ ++ mutex_lock(&kinstr_ctx->lock); ++ ++ if (!WARN_ON(kinstr_ctx->suspend_count == SIZE_MAX)) ++ kinstr_ctx->suspend_count++; ++ ++ mutex_unlock(&kinstr_ctx->lock); ++ ++ /* Always sync cancel the timer and then the worker, regardless of the ++ * new suspend count. ++ * ++ * This ensures concurrent calls to kbase_kinstr_prfcnt_suspend() always block ++ * until kinstr_prfcnt is fully suspended. ++ * ++ * The timer is canceled before the worker, as the timer ++ * unconditionally re-enqueues the worker, but the worker checks the ++ * suspend_count that we just incremented before rescheduling the timer. ++ * ++ * Therefore if we cancel the worker first, the timer might re-enqueue ++ * the worker before we cancel the timer, but the opposite is not ++ * possible. ++ */ ++ hrtimer_cancel(&kinstr_ctx->dump_timer); ++ cancel_work_sync(&kinstr_ctx->dump_work); ++} ++ ++void kbase_kinstr_prfcnt_resume(struct kbase_kinstr_prfcnt_context *kinstr_ctx) ++{ ++ if (WARN_ON(!kinstr_ctx)) ++ return; ++ ++ mutex_lock(&kinstr_ctx->lock); ++ ++ if (!WARN_ON(kinstr_ctx->suspend_count == 0)) { ++ kinstr_ctx->suspend_count--; ++ ++ /* Last resume, so re-enqueue the worker if we have any periodic ++ * clients. ++ */ ++ if (kinstr_ctx->suspend_count == 0) { ++ struct kbase_kinstr_prfcnt_client *pos; ++ bool has_periodic_clients = false; ++ ++ list_for_each_entry (pos, &kinstr_ctx->clients, node) { ++ if (pos->dump_interval_ns != 0) { ++ has_periodic_clients = true; ++ break; ++ } ++ } ++ ++ if (has_periodic_clients) ++ kbase_hwcnt_virtualizer_queue_work( ++ kinstr_ctx->hvirt, ++ &kinstr_ctx->dump_work); ++ } ++ } ++ ++ mutex_unlock(&kinstr_ctx->lock); ++} ++ ++static int kbasep_kinstr_prfcnt_sample_array_alloc(struct kbase_kinstr_prfcnt_client *cli, ++ const struct kbase_hwcnt_metadata *metadata) ++{ ++ struct kbase_kinstr_prfcnt_sample_array *sample_arr = &cli->sample_arr; ++ struct kbase_kinstr_prfcnt_sample *samples; ++ size_t sample_idx; ++ size_t dump_buf_bytes; ++ size_t clk_cnt_buf_bytes; ++ size_t sample_meta_bytes; ++ size_t md_count; ++ size_t sample_size; ++ size_t buffer_count = cli->config.buffer_count; ++ ++ if (!metadata || !sample_arr) ++ return -EINVAL; ++ ++ md_count = kbasep_kinstr_prfcnt_get_sample_md_count(metadata, &cli->enable_map); ++ sample_meta_bytes = sizeof(struct prfcnt_metadata) * md_count; ++ dump_buf_bytes = metadata->dump_buf_bytes; ++ clk_cnt_buf_bytes = ++ sizeof(*samples->dump_buf.clk_cnt_buf) * metadata->clk_cnt; ++ sample_size = sample_meta_bytes + dump_buf_bytes + clk_cnt_buf_bytes; ++ ++ samples = kmalloc_array(buffer_count, sizeof(*samples), GFP_KERNEL); ++ ++ if (!samples) ++ return -ENOMEM; ++ ++ sample_arr->user_buf = vmalloc_user(sample_size * buffer_count); ++ ++ if (!sample_arr->user_buf) { ++ kfree(samples); ++ return -ENOMEM; ++ } ++ ++ sample_arr->sample_count = buffer_count; ++ sample_arr->samples = samples; ++ ++ for (sample_idx = 0; sample_idx < buffer_count; sample_idx++) { ++ const size_t sample_meta_offset = sample_size * sample_idx; ++ const size_t dump_buf_offset = ++ sample_meta_offset + sample_meta_bytes; ++ const size_t clk_cnt_buf_offset = ++ dump_buf_offset + dump_buf_bytes; ++ ++ /* Internal layout in a sample buffer: [sample metadata, dump_buf, clk_cnt_buf]. */ ++ samples[sample_idx].dump_buf.metadata = metadata; ++ samples[sample_idx].sample_meta = ++ (struct prfcnt_metadata *)(sample_arr->user_buf + sample_meta_offset); ++ samples[sample_idx].dump_buf.dump_buf = ++ (u64 *)(sample_arr->user_buf + dump_buf_offset); ++ samples[sample_idx].dump_buf.clk_cnt_buf = ++ (u64 *)(sample_arr->user_buf + clk_cnt_buf_offset); ++ } ++ ++ return 0; ++} ++ ++static bool prfcnt_mode_supported(u8 mode) ++{ ++ return (mode == PRFCNT_MODE_MANUAL) || (mode == PRFCNT_MODE_PERIODIC); ++} ++ ++static void ++kbasep_kinstr_prfcnt_block_enable_to_physical(uint32_t *phys_em, ++ const uint64_t *enable_mask) ++{ ++ *phys_em |= kbase_hwcnt_backend_gpu_block_map_to_physical( ++ enable_mask[0], enable_mask[1]); ++} ++ ++/** ++ * kbasep_kinstr_prfcnt_parse_request_enable - Parse an enable request ++ * @req_enable: Performance counters enable request to parse. ++ * @config: Client object the session configuration should be written to. ++ * ++ * This function parses a performance counters enable request. ++ * This type of request specifies a bitmask of HW counters to enable ++ * for one performance counters block type. In addition to that, ++ * a performance counters enable request may also set "global" ++ * configuration properties that affect the whole session, like the ++ * performance counters set, which shall be compatible with the same value ++ * set by other performance request items. ++ * ++ * Return: 0 on success, else error code. ++ */ ++static int kbasep_kinstr_prfcnt_parse_request_enable( ++ const struct prfcnt_request_enable *req_enable, ++ struct kbase_kinstr_prfcnt_client_config *config) ++{ ++ int err = 0; ++ u8 req_set = KBASE_HWCNT_SET_UNDEFINED, default_set; ++ ++ switch (req_enable->set) { ++ case PRFCNT_SET_PRIMARY: ++ req_set = KBASE_HWCNT_SET_PRIMARY; ++ break; ++ case PRFCNT_SET_SECONDARY: ++ req_set = KBASE_HWCNT_SET_SECONDARY; ++ break; ++ case PRFCNT_SET_TERTIARY: ++ req_set = KBASE_HWCNT_SET_TERTIARY; ++ break; ++ default: ++ err = -EINVAL; ++ break; ++ } ++ ++ /* The performance counter set is a "global" property that affects ++ * the whole session. Either this is the first request that sets ++ * the value, or it shall be identical to all previous requests. ++ */ ++ if (!err) { ++ if (config->counter_set == KBASE_HWCNT_SET_UNDEFINED) ++ config->counter_set = req_set; ++ else if (config->counter_set != req_set) ++ err = -EINVAL; ++ } ++ ++ /* Temporarily, the requested set cannot be different from the default ++ * set because it's the only one to be supported. This will change in ++ * the future. ++ */ ++#if defined(CONFIG_MALI_BIFROST_PRFCNT_SET_SECONDARY) ++ default_set = KBASE_HWCNT_SET_SECONDARY; ++#elif defined(CONFIG_MALI_PRFCNT_SET_TERTIARY) ++ default_set = KBASE_HWCNT_SET_TERTIARY; ++#else ++ /* Default to primary */ ++ default_set = KBASE_HWCNT_SET_PRIMARY; ++#endif ++ ++ if (req_set != default_set) ++ err = -EINVAL; ++ ++ if (err < 0) ++ return err; ++ ++ /* Enable the performance counters based on the bitmask provided ++ * by the user space client. ++ * It is possible to receive multiple requests for the same counter ++ * block, in which case the bitmask will be a logical OR of all the ++ * bitmasks given by the client. ++ */ ++ switch (req_enable->block_type) { ++ case PRFCNT_BLOCK_TYPE_FE: ++ kbasep_kinstr_prfcnt_block_enable_to_physical( ++ &config->phys_em.fe_bm, req_enable->enable_mask); ++ break; ++ case PRFCNT_BLOCK_TYPE_TILER: ++ kbasep_kinstr_prfcnt_block_enable_to_physical( ++ &config->phys_em.tiler_bm, req_enable->enable_mask); ++ break; ++ case PRFCNT_BLOCK_TYPE_MEMORY: ++ kbasep_kinstr_prfcnt_block_enable_to_physical( ++ &config->phys_em.mmu_l2_bm, req_enable->enable_mask); ++ break; ++ case PRFCNT_BLOCK_TYPE_SHADER_CORE: ++ kbasep_kinstr_prfcnt_block_enable_to_physical( ++ &config->phys_em.shader_bm, req_enable->enable_mask); ++ break; ++ default: ++ err = -EINVAL; ++ break; ++ } ++ ++ return err; ++} ++ ++/** ++ * kbasep_kinstr_prfcnt_parse_request_scope - Parse a scope request ++ * @req_scope: Performance counters scope request to parse. ++ * @config: Client object the session configuration should be written to. ++ * ++ * This function parses a performance counters scope request. ++ * There are only 2 acceptable outcomes: either the client leaves the scope ++ * as undefined, or all the scope requests are set to the same value. ++ * ++ * Return: 0 on success, else error code. ++ */ ++static int kbasep_kinstr_prfcnt_parse_request_scope( ++ const struct prfcnt_request_scope *req_scope, ++ struct kbase_kinstr_prfcnt_client_config *config) ++{ ++ int err = 0; ++ ++ if (config->scope == PRFCNT_SCOPE_RESERVED) ++ config->scope = req_scope->scope; ++ else if (config->scope != req_scope->scope) ++ err = -EINVAL; ++ ++ return err; ++} ++ ++/** ++ * kbasep_kinstr_prfcnt_parse_setup - Parse session setup ++ * @kinstr_ctx: Pointer to the kinstr_prfcnt context. ++ * @setup: Session setup information to parse. ++ * @config: Client object the session configuration should be written to. ++ * @req_arr: Pointer to array of request items for client session. ++ * ++ * This function parses the list of "request" items sent by the user space ++ * client, and writes the configuration for the new client to be created ++ * for the session. ++ * ++ * Return: 0 on success, else error code. ++ */ ++static int kbasep_kinstr_prfcnt_parse_setup(struct kbase_kinstr_prfcnt_context *kinstr_ctx, ++ union kbase_ioctl_kinstr_prfcnt_setup *setup, ++ struct kbase_kinstr_prfcnt_client_config *config, ++ struct prfcnt_request_item *req_arr) ++{ ++ uint32_t i; ++ unsigned int item_count = setup->in.request_item_count; ++ int err = 0; ++ ++ if (req_arr[item_count - 1].hdr.item_type != FLEX_LIST_TYPE_NONE || ++ req_arr[item_count - 1].hdr.item_version != 0) { ++ return -EINVAL; ++ } ++ ++ /* The session configuration can only feature one value for some ++ * properties (like capture mode, block counter set and scope), but the ++ * client may potential issue multiple requests and try to set more than ++ * one value for those properties. While issuing multiple requests for the ++ * same property is allowed by the protocol, asking for different values ++ * is illegal. Leaving these properties as undefined is illegal, too. ++ */ ++ config->prfcnt_mode = PRFCNT_MODE_RESERVED; ++ config->counter_set = KBASE_HWCNT_SET_UNDEFINED; ++ config->scope = PRFCNT_SCOPE_RESERVED; ++ ++ for (i = 0; i < item_count - 1; i++) { ++ if (req_arr[i].hdr.item_version > PRFCNT_READER_API_VERSION) { ++ err = -EINVAL; ++ break; ++ } ++ ++ switch (req_arr[i].hdr.item_type) { ++ /* Capture mode is initialized as undefined. ++ * The first request of this type sets the capture mode. ++ * The protocol allows the client to send redundant requests, ++ * but only if they replicate the same value that has already ++ * been set by the first request. ++ */ ++ case PRFCNT_REQUEST_TYPE_MODE: ++ if (!prfcnt_mode_supported(req_arr[i].u.req_mode.mode)) ++ err = -EINVAL; ++ else if (config->prfcnt_mode == PRFCNT_MODE_RESERVED) ++ config->prfcnt_mode = ++ req_arr[i].u.req_mode.mode; ++ else if (req_arr[i].u.req_mode.mode != ++ config->prfcnt_mode) ++ err = -EINVAL; ++ ++ if (err < 0) ++ break; ++ ++ if (config->prfcnt_mode == PRFCNT_MODE_PERIODIC) { ++ config->period_ns = ++ req_arr[i] ++ .u.req_mode.mode_config.periodic ++ .period_ns; ++ ++ if ((config->period_ns != 0) && ++ (config->period_ns < ++ DUMP_INTERVAL_MIN_NS)) { ++ config->period_ns = ++ DUMP_INTERVAL_MIN_NS; ++ } ++ ++ if (config->period_ns == 0) ++ err = -EINVAL; ++ } ++ break; ++ ++ case PRFCNT_REQUEST_TYPE_ENABLE: ++ err = kbasep_kinstr_prfcnt_parse_request_enable( ++ &req_arr[i].u.req_enable, config); ++ break; ++ ++ case PRFCNT_REQUEST_TYPE_SCOPE: ++ err = kbasep_kinstr_prfcnt_parse_request_scope( ++ &req_arr[i].u.req_scope, config); ++ break; ++ ++ default: ++ err = -EINVAL; ++ break; ++ } ++ ++ if (err < 0) ++ break; ++ } ++ ++ if (!err) { ++ /* Verify that properties (like capture mode and block counter ++ * set) have been defined by the user space client. ++ */ ++ if (config->prfcnt_mode == PRFCNT_MODE_RESERVED) ++ err = -EINVAL; ++ ++ if (config->counter_set == KBASE_HWCNT_SET_UNDEFINED) ++ err = -EINVAL; ++ } ++ ++ return err; ++} ++ ++int kbasep_kinstr_prfcnt_client_create(struct kbase_kinstr_prfcnt_context *kinstr_ctx, ++ union kbase_ioctl_kinstr_prfcnt_setup *setup, ++ struct kbase_kinstr_prfcnt_client **out_vcli, ++ struct prfcnt_request_item *req_arr) ++{ ++ int err; ++ struct kbase_kinstr_prfcnt_client *cli; ++ enum kbase_kinstr_prfcnt_client_init_state init_state; ++ ++ if (WARN_ON(!kinstr_ctx)) ++ return -EINVAL; ++ ++ if (WARN_ON(!setup)) ++ return -EINVAL; ++ ++ if (WARN_ON(!req_arr)) ++ return -EINVAL; ++ ++ cli = kzalloc(sizeof(*cli), GFP_KERNEL); ++ ++ if (!cli) ++ return -ENOMEM; ++ ++ for (init_state = KINSTR_PRFCNT_UNINITIALISED; init_state < KINSTR_PRFCNT_INITIALISED; ++ init_state++) { ++ err = 0; ++ switch (init_state) { ++ case KINSTR_PRFCNT_PARSE_SETUP: ++ cli->kinstr_ctx = kinstr_ctx; ++ err = kbasep_kinstr_prfcnt_parse_setup(kinstr_ctx, setup, &cli->config, ++ req_arr); ++ ++ break; ++ ++ case KINSTR_PRFCNT_ENABLE_MAP: ++ cli->config.buffer_count = MAX_BUFFER_COUNT; ++ cli->dump_interval_ns = cli->config.period_ns; ++ cli->next_dump_time_ns = 0; ++ cli->active = false; ++ atomic_set(&cli->write_idx, 0); ++ atomic_set(&cli->read_idx, 0); ++ atomic_set(&cli->fetch_idx, 0); ++ ++ err = kbase_hwcnt_enable_map_alloc(kinstr_ctx->metadata, &cli->enable_map); ++ break; ++ ++ case KINSTR_PRFCNT_DUMP_BUFFER: ++ kbase_hwcnt_gpu_enable_map_from_physical(&cli->enable_map, ++ &cli->config.phys_em); ++ ++ cli->sample_count = cli->config.buffer_count; ++ cli->sample_size = ++ kbasep_kinstr_prfcnt_get_sample_size(cli, kinstr_ctx->metadata); ++ ++ /* Use virtualizer's metadata to alloc tmp buffer which interacts with ++ * the HWC virtualizer. ++ */ ++ err = kbase_hwcnt_dump_buffer_alloc(kinstr_ctx->metadata, &cli->tmp_buf); ++ break; ++ ++ case KINSTR_PRFCNT_SAMPLE_ARRAY: ++ /* Disable clock map in setup, and enable clock map when start */ ++ cli->enable_map.clk_enable_map = 0; ++ ++ /* Use metadata from virtualizer to allocate dump buffers if ++ * kinstr_prfcnt doesn't have the truncated metadata. ++ */ ++ err = kbasep_kinstr_prfcnt_sample_array_alloc(cli, kinstr_ctx->metadata); ++ ++ break; ++ ++ case KINSTR_PRFCNT_VIRTUALIZER_CLIENT: ++ /* Set enable map to be 0 to prevent virtualizer to init and kick the ++ * backend to count. ++ */ ++ kbase_hwcnt_gpu_enable_map_from_physical( ++ &cli->enable_map, &(struct kbase_hwcnt_physical_enable_map){ 0 }); ++ ++ err = kbase_hwcnt_virtualizer_client_create(kinstr_ctx->hvirt, ++ &cli->enable_map, &cli->hvcli); ++ break; ++ ++ case KINSTR_PRFCNT_WAITQ_MUTEX: ++ init_waitqueue_head(&cli->waitq); ++ mutex_init(&cli->cmd_sync_lock); ++ break; ++ ++ case KINSTR_PRFCNT_INITIALISED: ++ /* This shouldn't be reached */ ++ break; ++ } ++ ++ if (err < 0) { ++ kbasep_kinstr_prfcnt_client_destroy_partial(cli, init_state); ++ return err; ++ } ++ } ++ *out_vcli = cli; ++ ++ return 0; ++ ++} ++ ++static size_t kbasep_kinstr_prfcnt_get_block_info_count( ++ const struct kbase_hwcnt_metadata *metadata) ++{ ++ size_t grp, blk; ++ size_t block_info_count = 0; ++ ++ if (!metadata) ++ return 0; ++ ++ for (grp = 0; grp < kbase_hwcnt_metadata_group_count(metadata); grp++) { ++ for (blk = 0; blk < kbase_hwcnt_metadata_block_count(metadata, grp); blk++) { ++ if (!kbase_kinstr_is_block_type_reserved(metadata, grp, blk)) ++ block_info_count++; ++ } ++ } ++ ++ return block_info_count; ++} ++ ++static void kbasep_kinstr_prfcnt_get_request_info_list( ++ struct prfcnt_enum_item *item_arr, size_t *arr_idx) ++{ ++ memcpy(&item_arr[*arr_idx], kinstr_prfcnt_supported_requests, ++ sizeof(kinstr_prfcnt_supported_requests)); ++ *arr_idx += ARRAY_SIZE(kinstr_prfcnt_supported_requests); ++} ++ ++static void kbasep_kinstr_prfcnt_get_sample_info_item(const struct kbase_hwcnt_metadata *metadata, ++ struct prfcnt_enum_item *item_arr, ++ size_t *arr_idx) ++{ ++ struct prfcnt_enum_item sample_info = { ++ .hdr = { ++ .item_type = PRFCNT_ENUM_TYPE_SAMPLE_INFO, ++ .item_version = PRFCNT_READER_API_VERSION, ++ }, ++ .u.sample_info = { ++ .num_clock_domains = metadata->clk_cnt, ++ }, ++ }; ++ ++ item_arr[*arr_idx] = sample_info; ++ *arr_idx += 1; ++} ++ ++int kbasep_kinstr_prfcnt_get_block_info_list(const struct kbase_hwcnt_metadata *metadata, ++ size_t block_set, struct prfcnt_enum_item *item_arr, ++ size_t *arr_idx) ++{ ++ size_t grp, blk; ++ ++ if (!metadata || !item_arr || !arr_idx) ++ return -EINVAL; ++ ++ for (grp = 0; grp < kbase_hwcnt_metadata_group_count(metadata); grp++) { ++ for (blk = 0; blk < kbase_hwcnt_metadata_block_count(metadata, grp); blk++) { ++ size_t blk_inst; ++ size_t unused_blk_inst_count = 0; ++ size_t blk_inst_count = ++ kbase_hwcnt_metadata_block_instance_count(metadata, grp, blk); ++ enum prfcnt_block_type block_type = ++ kbase_hwcnt_metadata_block_type_to_prfcnt_block_type( ++ kbase_hwcnt_metadata_block_type(metadata, grp, blk)); ++ ++ if (block_type == PRFCNT_BLOCK_TYPE_RESERVED) ++ continue; ++ ++ /* Count number of unused blocks to updated number of instances */ ++ for (blk_inst = 0; blk_inst < blk_inst_count; blk_inst++) { ++ if (!kbase_hwcnt_metadata_block_instance_avail(metadata, grp, blk, ++ blk_inst)) ++ unused_blk_inst_count++; ++ } ++ ++ item_arr[(*arr_idx)++] = (struct prfcnt_enum_item){ ++ .hdr = { ++ .item_type = PRFCNT_ENUM_TYPE_BLOCK, ++ .item_version = PRFCNT_READER_API_VERSION, ++ }, ++ .u.block_counter = { ++ .set = block_set, ++ .block_type = block_type, ++ .num_instances = blk_inst_count - unused_blk_inst_count, ++ .num_values = kbase_hwcnt_metadata_block_values_count( ++ metadata, grp, blk), ++ /* The bitmask of available counters should be dynamic. ++ * Temporarily, it is set to U64_MAX, waiting for the ++ * required functionality to be available in the future. ++ */ ++ .counter_mask = {U64_MAX, U64_MAX}, ++ }, ++ }; ++ } ++ } ++ ++ return 0; ++} ++ ++static int kbasep_kinstr_prfcnt_enum_info_count( ++ struct kbase_kinstr_prfcnt_context *kinstr_ctx, ++ struct kbase_ioctl_kinstr_prfcnt_enum_info *enum_info) ++{ ++ uint32_t count = 0; ++ size_t block_info_count = 0; ++ const struct kbase_hwcnt_metadata *metadata; ++ ++ count = ARRAY_SIZE(kinstr_prfcnt_supported_requests); ++ metadata = kbase_hwcnt_virtualizer_metadata(kinstr_ctx->hvirt); ++ ++ /* Add the sample_info (clock domain) descriptive item */ ++ count++; ++ ++ /* Other blocks based on meta data */ ++ block_info_count = kbasep_kinstr_prfcnt_get_block_info_count(metadata); ++ count += block_info_count; ++ ++ /* Reserve one for the last sentinel item. */ ++ count++; ++ enum_info->info_item_count = count; ++ enum_info->info_item_size = sizeof(struct prfcnt_enum_item); ++ kinstr_ctx->info_item_count = count; ++ ++ return 0; ++} ++ ++static int kbasep_kinstr_prfcnt_enum_info_list( ++ struct kbase_kinstr_prfcnt_context *kinstr_ctx, ++ struct kbase_ioctl_kinstr_prfcnt_enum_info *enum_info) ++{ ++ struct prfcnt_enum_item *prfcnt_item_arr; ++ size_t arr_idx = 0; ++ int err = 0; ++ size_t block_info_count = 0; ++ const struct kbase_hwcnt_metadata *metadata; ++ ++ if ((enum_info->info_item_size == 0) || ++ (enum_info->info_item_count == 0) || !enum_info->info_list_ptr) ++ return -EINVAL; ++ ++ if (enum_info->info_item_count != kinstr_ctx->info_item_count) ++ return -EINVAL; ++ ++ prfcnt_item_arr = kcalloc(enum_info->info_item_count, ++ sizeof(*prfcnt_item_arr), GFP_KERNEL); ++ if (!prfcnt_item_arr) ++ return -ENOMEM; ++ ++ kbasep_kinstr_prfcnt_get_request_info_list(prfcnt_item_arr, &arr_idx); ++ ++ metadata = kbase_hwcnt_virtualizer_metadata(kinstr_ctx->hvirt); ++ /* Place the sample_info item */ ++ kbasep_kinstr_prfcnt_get_sample_info_item(metadata, prfcnt_item_arr, &arr_idx); ++ ++ block_info_count = kbasep_kinstr_prfcnt_get_block_info_count(metadata); ++ ++ if (arr_idx + block_info_count >= enum_info->info_item_count) ++ err = -EINVAL; ++ ++ if (!err) { ++ size_t counter_set; ++ ++#if defined(CONFIG_MALI_BIFROST_PRFCNT_SET_SECONDARY) ++ counter_set = KBASE_HWCNT_SET_SECONDARY; ++#elif defined(CONFIG_MALI_PRFCNT_SET_TERTIARY) ++ counter_set = KBASE_HWCNT_SET_TERTIARY; ++#else ++ /* Default to primary */ ++ counter_set = KBASE_HWCNT_SET_PRIMARY; ++#endif ++ kbasep_kinstr_prfcnt_get_block_info_list( ++ metadata, counter_set, prfcnt_item_arr, &arr_idx); ++ if (arr_idx != enum_info->info_item_count - 1) ++ err = -EINVAL; ++ } ++ ++ /* The last sentinel item. */ ++ prfcnt_item_arr[enum_info->info_item_count - 1].hdr.item_type = ++ FLEX_LIST_TYPE_NONE; ++ prfcnt_item_arr[enum_info->info_item_count - 1].hdr.item_version = 0; ++ ++ if (!err) { ++ unsigned long bytes = ++ enum_info->info_item_count * sizeof(*prfcnt_item_arr); ++ ++ if (copy_to_user(u64_to_user_ptr(enum_info->info_list_ptr), ++ prfcnt_item_arr, bytes)) ++ err = -EFAULT; ++ } ++ ++ kfree(prfcnt_item_arr); ++ return err; ++} ++ ++int kbase_kinstr_prfcnt_enum_info( ++ struct kbase_kinstr_prfcnt_context *kinstr_ctx, ++ struct kbase_ioctl_kinstr_prfcnt_enum_info *enum_info) ++{ ++ int err; ++ ++ if (!kinstr_ctx || !enum_info) ++ return -EINVAL; ++ ++ if (!enum_info->info_list_ptr) ++ err = kbasep_kinstr_prfcnt_enum_info_count(kinstr_ctx, ++ enum_info); ++ else ++ err = kbasep_kinstr_prfcnt_enum_info_list(kinstr_ctx, ++ enum_info); ++ ++ return err; ++} ++ ++int kbase_kinstr_prfcnt_setup(struct kbase_kinstr_prfcnt_context *kinstr_ctx, ++ union kbase_ioctl_kinstr_prfcnt_setup *setup) ++{ ++ int err; ++ size_t item_count; ++ size_t bytes; ++ struct prfcnt_request_item *req_arr = NULL; ++ struct kbase_kinstr_prfcnt_client *cli = NULL; ++ const size_t max_bytes = 32 * sizeof(*req_arr); ++ ++ if (!kinstr_ctx || !setup) ++ return -EINVAL; ++ ++ item_count = setup->in.request_item_count; ++ ++ /* Limiting the request items to 2x of the expected: accommodating ++ * moderate duplications but rejecting excessive abuses. ++ */ ++ if (!setup->in.requests_ptr || (item_count < 2) || (setup->in.request_item_size == 0) || ++ item_count > 2 * kinstr_ctx->info_item_count) { ++ return -EINVAL; ++ } ++ ++ if (check_mul_overflow(item_count, sizeof(*req_arr), &bytes)) ++ return -EINVAL; ++ ++ /* Further limiting the max bytes to copy from userspace by setting it in the following ++ * fashion: a maximum of 1 mode item, 4 types of 3 sets for a total of 12 enable items, ++ * each currently at the size of prfcnt_request_item. ++ * ++ * Note: if more request types get added, this max limit needs to be updated. ++ */ ++ if (bytes > max_bytes) ++ return -EINVAL; ++ ++ req_arr = memdup_user(u64_to_user_ptr(setup->in.requests_ptr), bytes); ++ ++ if (IS_ERR(req_arr)) ++ return PTR_ERR(req_arr); ++ ++ err = kbasep_kinstr_prfcnt_client_create(kinstr_ctx, setup, &cli, req_arr); ++ ++ if (err < 0) ++ goto error; ++ ++ mutex_lock(&kinstr_ctx->lock); ++ kinstr_ctx->client_count++; ++ list_add(&cli->node, &kinstr_ctx->clients); ++ mutex_unlock(&kinstr_ctx->lock); ++ ++ setup->out.prfcnt_metadata_item_size = sizeof(struct prfcnt_metadata); ++ setup->out.prfcnt_mmap_size_bytes = ++ cli->sample_size * cli->sample_count; ++ ++ /* Expose to user-space only once the client is fully initialized */ ++ err = anon_inode_getfd("[mali_kinstr_prfcnt_desc]", ++ &kinstr_prfcnt_client_fops, cli, ++ O_RDONLY | O_CLOEXEC); ++ ++ if (err < 0) ++ goto client_installed_error; ++ ++ goto free_buf; ++ ++client_installed_error: ++ mutex_lock(&kinstr_ctx->lock); ++ kinstr_ctx->client_count--; ++ list_del(&cli->node); ++ mutex_unlock(&kinstr_ctx->lock); ++error: ++ kbasep_kinstr_prfcnt_client_destroy(cli); ++free_buf: ++ kfree(req_arr); ++ return err; ++} +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.h b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.h +new file mode 100644 +index 000000000..bbe33796e --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_linux.h -@@ -0,0 +1,48 @@ ++++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.h +@@ -0,0 +1,189 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2010-2014 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -221818,15 +256021,205 @@ index 000000000000..003ac9e68a76 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ */ ++ ++/* ++ * Kinstr_prfcnt, used to provide an ioctl for userspace access to ++ * performance counters. ++ */ ++#ifndef _KBASE_KINSTR_PRFCNT_H_ ++#define _KBASE_KINSTR_PRFCNT_H_ ++ ++#include "hwcnt/mali_kbase_hwcnt_types.h" ++#include ++ ++struct kbase_kinstr_prfcnt_context; ++struct kbase_kinstr_prfcnt_client; ++struct kbase_hwcnt_virtualizer; ++struct kbase_ioctl_hwcnt_reader_setup; ++struct kbase_ioctl_kinstr_prfcnt_enum_info; ++union kbase_ioctl_kinstr_prfcnt_setup; ++ ++/** ++ * kbase_kinstr_prfcnt_init() - Initialize a kinstr_prfcnt context. ++ * @hvirt: Non-NULL pointer to the hardware counter virtualizer. ++ * @out_kinstr_ctx: Non-NULL pointer to where the pointer to the created ++ * kinstr_prfcnt context will be stored on success. + * ++ * On creation, the suspend count of the context will be 0. ++ * ++ * Return: 0 on success, else error code. + */ ++int kbase_kinstr_prfcnt_init( ++ struct kbase_hwcnt_virtualizer *hvirt, ++ struct kbase_kinstr_prfcnt_context **out_kinstr_ctx); + ++/** ++ * kbase_kinstr_prfcnt_term() - Terminate a kinstr_prfcnt context. ++ * @kinstr_ctx: Pointer to the kinstr_prfcnt context to be terminated. ++ */ ++void kbase_kinstr_prfcnt_term(struct kbase_kinstr_prfcnt_context *kinstr_ctx); + ++/** ++ * kbase_kinstr_prfcnt_suspend() - Increment the suspend count of the context. ++ * @kinstr_ctx: Non-NULL pointer to the kinstr_prfcnt context to be suspended. ++ * ++ * After this function call returns, it is guaranteed that all timers and ++ * workers in kinstr_prfcnt will be canceled, and will not be re-triggered until ++ * after the context has been resumed. In effect, this means no new counter ++ * dumps will occur for any existing or subsequently added periodic clients. ++ */ ++void kbase_kinstr_prfcnt_suspend(struct kbase_kinstr_prfcnt_context *kinstr_ctx); + +/** -+ * @file mali_kbase_linux.h -+ * Base kernel APIs, Linux implementation. ++ * kbase_kinstr_prfcnt_resume() - Decrement the suspend count of the context. ++ * @kinstr_ctx: Non-NULL pointer to the kinstr_prfcnt context to be resumed. ++ * ++ * If a call to this function decrements the suspend count from 1 to 0, then ++ * normal operation of kinstr_prfcnt will be resumed (i.e. counter dumps will once ++ * again be automatically triggered for all periodic clients). ++ * ++ * It is only valid to call this function one time for each prior returned call ++ * to kbase_kinstr_prfcnt_suspend. ++ */ ++void kbase_kinstr_prfcnt_resume(struct kbase_kinstr_prfcnt_context *kinstr_ctx); ++ ++/** ++ * kbasep_kinstr_prfcnt_get_block_info_list() - Get list of all block types ++ * with their information. ++ * @metadata: Non-NULL pointer to the hardware counter metadata. ++ * @block_set: Which SET the blocks will represent. ++ * @item_arr: Non-NULL pointer to array of enumeration items to populate. ++ * @arr_idx: Non-NULL pointer to index of array @item_arr. ++ * ++ * Populate list of counter blocks with information for enumeration. ++ * ++ * Return: 0 on success, else error code. ++ */ ++int kbasep_kinstr_prfcnt_get_block_info_list(const struct kbase_hwcnt_metadata *metadata, ++ size_t block_set, struct prfcnt_enum_item *item_arr, ++ size_t *arr_idx); ++ ++/** ++ * kbasep_kinstr_prfcnt_get_sample_md_count() - Get count of sample ++ * metadata items. ++ * @metadata: Non-NULL pointer to the hardware counter metadata. ++ * @enable_map: Non-NULL pointer to the map of enabled counters. ++ * ++ * Return: Number of metadata items for available blocks in each sample. ++ */ ++size_t kbasep_kinstr_prfcnt_get_sample_md_count(const struct kbase_hwcnt_metadata *metadata, ++ struct kbase_hwcnt_enable_map *enable_map); ++ ++/** ++ * kbasep_kinstr_prfcnt_set_block_meta_items() - Populate a sample's block meta ++ * item array. ++ * @enable_map: Non-NULL pointer to the map of enabled counters. ++ * @dst: Non-NULL pointer to the sample's dump buffer object. ++ * @block_meta_base: Non-NULL double pointer to the start of the block meta ++ * data items. ++ * @base_addr: Address of allocated pages for array of samples. Used ++ * to calculate offset of block values. ++ * @counter_set: The SET which blocks represent. ++ * ++ * Return: 0 on success, else error code. ++ */ ++int kbasep_kinstr_prfcnt_set_block_meta_items(struct kbase_hwcnt_enable_map *enable_map, ++ struct kbase_hwcnt_dump_buffer *dst, ++ struct prfcnt_metadata **block_meta_base, ++ u8 *base_addr, u8 counter_set); ++ ++/** ++ * kbasep_kinstr_prfcnt_client_create() - Create a kinstr_prfcnt client. ++ * Does not attach to the kinstr_prfcnt ++ * context. ++ * @kinstr_ctx: Non-NULL pointer to kinstr_prfcnt context. ++ * @setup: Non-NULL pointer to hardware counter ioctl setup structure. ++ * @out_vcli: Non-NULL pointer to where created client will be stored on ++ * success. ++ * @req_arr: Non-NULL pointer to array of request items for client session. ++ * ++ * Return: 0 on success, else error code. ++ */ ++int kbasep_kinstr_prfcnt_client_create(struct kbase_kinstr_prfcnt_context *kinstr_ctx, ++ union kbase_ioctl_kinstr_prfcnt_setup *setup, ++ struct kbase_kinstr_prfcnt_client **out_vcli, ++ struct prfcnt_request_item *req_arr); ++ ++/** ++ * kbasep_kinstr_prfcnt_cmd() - Execute command for a client session. ++ * @cli: Non-NULL pointer to kinstr_prfcnt client. ++ * @control_cmd: Control command to execute. ++ * ++ * Return: 0 on success, else error code. ++ */ ++int kbasep_kinstr_prfcnt_cmd(struct kbase_kinstr_prfcnt_client *cli, ++ struct prfcnt_control_cmd *control_cmd); ++ ++/** ++ * kbasep_kinstr_prfcnt_client_destroy() - Destroy a kinstr_prfcnt client. ++ * @cli: kinstr_prfcnt client. Must not be attached to a kinstr_prfcnt context. ++ */ ++void kbasep_kinstr_prfcnt_client_destroy(struct kbase_kinstr_prfcnt_client *cli); ++ ++/** ++ * kbase_kinstr_prfcnt_enum_info - Enumerate performance counter information. ++ * @kinstr_ctx: Non-NULL pointer to the kinstr_prfcnt context. ++ * @enum_info: Non-NULL pointer to the enumeration information. ++ * ++ * Enumerate which counter blocks and banks exist, and what counters are ++ * available within them. ++ * ++ * Return: 0 on success, else error code. ++ */ ++int kbase_kinstr_prfcnt_enum_info( ++ struct kbase_kinstr_prfcnt_context *kinstr_ctx, ++ struct kbase_ioctl_kinstr_prfcnt_enum_info *enum_info); ++ ++/** ++ * kbase_kinstr_prfcnt_setup() - Set up a new hardware counter reader client. ++ * @kinstr_ctx: Non-NULL pointer to the kinstr_prfcnt context. ++ * @setup: Non-NULL pointer to the hwcnt reader configuration. ++ * ++ * Start a session between a user client and the kinstr_prfcnt component. ++ * A file descriptor shall be provided to the client as a handle to the ++ * hardware counter reader client that represents the session. ++ * ++ * Return: file descriptor on success, else error code. ++ */ ++int kbase_kinstr_prfcnt_setup(struct kbase_kinstr_prfcnt_context *kinstr_ctx, ++ union kbase_ioctl_kinstr_prfcnt_setup *setup); ++ ++#endif /* _KBASE_KINSTR_PRFCNT_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_linux.h b/drivers/gpu/arm/bifrost/mali_kbase_linux.h +new file mode 100755 +index 000000000..e5c6f7a0b +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_linux.h +@@ -0,0 +1,44 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2010-2014, 2020-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++/** ++ * DOC: Base kernel APIs, Linux implementation. + */ + +#ifndef _KBASE_LINUX_H_ @@ -221839,7 +256232,7 @@ index 000000000000..003ac9e68a76 +#include +#include + -+#if (defined(MALI_KERNEL_TEST_API) && (1 == MALI_KERNEL_TEST_API)) ++#if IS_ENABLED(MALI_KERNEL_TEST_API) + #define KBASE_EXPORT_TEST_API(func) EXPORT_SYMBOL(func) +#else + #define KBASE_EXPORT_TEST_API(func) @@ -221850,18 +256243,19 @@ index 000000000000..003ac9e68a76 +#endif /* _KBASE_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem.c b/drivers/gpu/arm/bifrost/mali_kbase_mem.c new file mode 100755 -index 000000000000..82a799c2d673 +index 000000000..1c94e9c57 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem.c -@@ -0,0 +1,4734 @@ +@@ -0,0 +1,5541 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -221872,12 +256266,10 @@ index 000000000000..82a799c2d673 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** -+ * Base kernel memory APIs ++ * DOC: Base kernel memory APIs + */ +#include +#include @@ -221885,7 +256277,7 @@ index 000000000000..82a799c2d673 +#include +#include +#include -+#ifdef CONFIG_OF ++#if IS_ENABLED(CONFIG_OF) +#include +#endif + @@ -221901,6 +256293,11 @@ index 000000000000..82a799c2d673 +#include +#include + ++#define VA_REGION_SLAB_NAME_PREFIX "va-region-slab-" ++#define VA_REGION_SLAB_NAME_SIZE (DEVNAME_SIZE + sizeof(VA_REGION_SLAB_NAME_PREFIX) + 1) ++ ++#if MALI_JIT_PRESSURE_LIMIT_BASE ++ +/* + * Alignment of objects allocated by the GPU inside a just-in-time memory + * region whose size is given by an end address @@ -221923,6 +256320,7 @@ index 000000000000..82a799c2d673 + */ +#define KBASE_GPU_ALLOCATED_OBJECT_MAX_BYTES (512u) + ++#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ + +/* Forward declarations */ +static void free_partial_locked(struct kbase_context *kctx, @@ -221946,37 +256344,50 @@ index 000000000000..82a799c2d673 +#error "Unknown CPU VA width for this architecture" +#endif + -+#ifdef CONFIG_64BIT -+ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ if (kbase_ctx_compat_mode(kctx)) + cpu_va_bits = 32; -+#endif + + return cpu_va_bits; +} + +/* This function finds out which RB tree the given pfn from the GPU VA belongs -+ * to based on the memory zone the pfn refers to */ ++ * to based on the memory zone the pfn refers to ++ */ +static struct rb_root *kbase_gpu_va_to_rbtree(struct kbase_context *kctx, + u64 gpu_pfn) +{ + struct rb_root *rbtree = NULL; + -+ /* The gpu_pfn can only be greater than the starting pfn of the EXEC_VA -+ * zone if this has been initialized. -+ */ -+ if (gpu_pfn >= kctx->exec_va_start) ++ struct kbase_reg_zone *exec_va_zone = kbase_ctx_reg_zone_get(kctx, KBASE_REG_ZONE_EXEC_VA); ++ ++#if MALI_USE_CSF ++ struct kbase_reg_zone *fixed_va_zone = ++ kbase_ctx_reg_zone_get(kctx, KBASE_REG_ZONE_FIXED_VA); ++ ++ struct kbase_reg_zone *exec_fixed_va_zone = ++ kbase_ctx_reg_zone_get(kctx, KBASE_REG_ZONE_EXEC_FIXED_VA); ++ ++ if (gpu_pfn >= fixed_va_zone->base_pfn) { ++ rbtree = &kctx->reg_rbtree_fixed; ++ return rbtree; ++ } else if (gpu_pfn >= exec_fixed_va_zone->base_pfn) { ++ rbtree = &kctx->reg_rbtree_exec_fixed; ++ return rbtree; ++ } ++#endif ++ if (gpu_pfn >= exec_va_zone->base_pfn) + rbtree = &kctx->reg_rbtree_exec; + else { + u64 same_va_end; + -+#ifdef CONFIG_64BIT -+ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) -+#endif /* CONFIG_64BIT */ ++ if (kbase_ctx_compat_mode(kctx)) { + same_va_end = KBASE_REG_ZONE_CUSTOM_VA_BASE; -+#ifdef CONFIG_64BIT -+ else -+ same_va_end = kctx->same_va_end; -+#endif /* CONFIG_64BIT */ ++ } else { ++ struct kbase_reg_zone *same_va_zone = ++ kbase_ctx_reg_zone_get(kctx, ++ KBASE_REG_ZONE_SAME_VA); ++ same_va_end = kbase_reg_zone_end_pfn(same_va_zone); ++ } + + if (gpu_pfn >= same_va_end) + rbtree = &kctx->reg_rbtree_custom; @@ -222085,7 +256496,7 @@ index 000000000000..82a799c2d673 + u64 gpu_pfn = gpu_addr >> PAGE_SHIFT; + struct rb_root *rbtree = NULL; + -+ KBASE_DEBUG_ASSERT(NULL != kctx); ++ KBASE_DEBUG_ASSERT(kctx != NULL); + + lockdep_assert_held(&kctx->reg_lock); + @@ -222145,7 +256556,8 @@ index 000000000000..82a799c2d673 + struct rb_root *rbtree = NULL; + + /* Note that this search is a linear search, as we do not have a target -+ address in mind, so does not benefit from the rbtree search */ ++ * address in mind, so does not benefit from the rbtree search ++ */ + rbtree = reg_reqs->rbtree; + + for (rbnode = rb_first(rbtree); rbnode; rbnode = rb_next(rbnode)) { @@ -222160,7 +256572,8 @@ index 000000000000..82a799c2d673 + * (start_pfn + align_mask) & ~(align_mask) + * + * Otherwise, it aligns to n*align + offset, for the -+ * lowest value n that makes this still >start_pfn */ ++ * lowest value n that makes this still >start_pfn ++ */ + start_pfn += align_mask; + start_pfn -= (start_pfn - align_offset) & (align_mask); + @@ -222198,36 +256611,48 @@ index 000000000000..82a799c2d673 +} + +/** -+ * @brief Remove a region object from the global list. ++ * kbase_remove_va_region - Remove a region object from the global list. ++ * ++ * @kbdev: The kbase device ++ * @reg: Region object to remove + * + * The region reg is removed, possibly by merging with other free and + * compatible adjacent regions. It must be called with the context + * region lock held. The associated memory is not released (see + * kbase_free_alloced_region). Internal use only. + */ -+int kbase_remove_va_region(struct kbase_va_region *reg) ++void kbase_remove_va_region(struct kbase_device *kbdev, ++ struct kbase_va_region *reg) +{ + struct rb_node *rbprev; + struct kbase_va_region *prev = NULL; + struct rb_node *rbnext; + struct kbase_va_region *next = NULL; + struct rb_root *reg_rbtree = NULL; ++ struct kbase_va_region *orig_reg = reg; + + int merged_front = 0; + int merged_back = 0; -+ int err = 0; + + reg_rbtree = reg->rbtree; + ++ if (WARN_ON(RB_EMPTY_ROOT(reg_rbtree))) ++ return; ++ + /* Try to merge with the previous block first */ + rbprev = rb_prev(&(reg->rblink)); + if (rbprev) { + prev = rb_entry(rbprev, struct kbase_va_region, rblink); + if (prev->flags & KBASE_REG_FREE) { -+ /* We're compatible with the previous VMA, -+ * merge with it */ ++ /* We're compatible with the previous VMA, merge with ++ * it, handling any gaps for robustness. ++ */ ++ u64 prev_end_pfn = prev->start_pfn + prev->nr_pages; ++ + WARN_ON((prev->flags & KBASE_REG_ZONE_MASK) != + (reg->flags & KBASE_REG_ZONE_MASK)); ++ if (!WARN_ON(reg->start_pfn < prev_end_pfn)) ++ prev->nr_pages += reg->start_pfn - prev_end_pfn; + prev->nr_pages += reg->nr_pages; + rb_erase(&(reg->rblink), reg_rbtree); + reg = prev; @@ -222239,42 +256664,76 @@ index 000000000000..82a799c2d673 + /* Note we do the lookup here as the tree may have been rebalanced. */ + rbnext = rb_next(&(reg->rblink)); + if (rbnext) { -+ /* We're compatible with the next VMA, merge with it */ + next = rb_entry(rbnext, struct kbase_va_region, rblink); + if (next->flags & KBASE_REG_FREE) { ++ /* We're compatible with the next VMA, merge with it, ++ * handling any gaps for robustness. ++ */ ++ u64 reg_end_pfn = reg->start_pfn + reg->nr_pages; ++ + WARN_ON((next->flags & KBASE_REG_ZONE_MASK) != + (reg->flags & KBASE_REG_ZONE_MASK)); ++ if (!WARN_ON(next->start_pfn < reg_end_pfn)) ++ next->nr_pages += next->start_pfn - reg_end_pfn; + next->start_pfn = reg->start_pfn; + next->nr_pages += reg->nr_pages; + rb_erase(&(reg->rblink), reg_rbtree); + merged_back = 1; -+ if (merged_front) { -+ /* We already merged with prev, free it */ -+ kfree(reg); -+ } + } + } + -+ /* If we failed to merge then we need to add a new block */ -+ if (!(merged_front || merged_back)) { ++ if (merged_front && merged_back) { ++ /* We already merged with prev, free it */ ++ kfree(reg); ++ } else if (!(merged_front || merged_back)) { ++ /* If we failed to merge then we need to add a new block */ ++ + /* -+ * We didn't merge anything. Add a new free -+ * placeholder and remove the original one. ++ * We didn't merge anything. Try to add a new free ++ * placeholder, and in any case, remove the original one. + */ + struct kbase_va_region *free_reg; + -+ free_reg = kbase_alloc_free_region(reg_rbtree, -+ reg->start_pfn, reg->nr_pages, -+ reg->flags & KBASE_REG_ZONE_MASK); ++ free_reg = kbase_alloc_free_region(kbdev, reg_rbtree, reg->start_pfn, reg->nr_pages, ++ reg->flags & KBASE_REG_ZONE_MASK); + if (!free_reg) { -+ err = -ENOMEM; ++ /* In case of failure, we cannot allocate a replacement ++ * free region, so we will be left with a 'gap' in the ++ * region tracker's address range (though, the rbtree ++ * will itself still be correct after erasing ++ * 'reg'). ++ * ++ * The gap will be rectified when an adjacent region is ++ * removed by one of the above merging paths. Other ++ * paths will gracefully fail to allocate if they try ++ * to allocate in the gap. ++ * ++ * There is nothing that the caller can do, since free ++ * paths must not fail. The existing 'reg' cannot be ++ * repurposed as the free region as callers must have ++ * freedom of use with it by virtue of it being owned ++ * by them, not the region tracker insert/remove code. ++ */ ++ dev_warn( ++ kbdev->dev, ++ "Could not alloc a replacement free region for 0x%.16llx..0x%.16llx", ++ (unsigned long long)reg->start_pfn << PAGE_SHIFT, ++ (unsigned long long)(reg->start_pfn + reg->nr_pages) << PAGE_SHIFT); ++ rb_erase(&(reg->rblink), reg_rbtree); ++ + goto out; + } + rb_replace_node(&(reg->rblink), &(free_reg->rblink), reg_rbtree); + } + -+ out: -+ return err; ++ /* This operation is always safe because the function never frees ++ * the region. If the region has been merged to both front and back, ++ * then it's the previous region that is supposed to be freed. ++ */ ++ orig_reg->start_pfn = 0; ++ ++out: ++ return; +} + +KBASE_EXPORT_TEST_API(kbase_remove_va_region); @@ -222283,13 +256742,18 @@ index 000000000000..82a799c2d673 + * kbase_insert_va_region_nolock - Insert a VA region to the list, + * replacing the existing one. + * ++ * @kbdev: The kbase device + * @new_reg: The new region to insert + * @at_reg: The region to replace + * @start_pfn: The Page Frame Number to insert at + * @nr_pages: The number of pages of the region ++ * ++ * Return: 0 on success, error code otherwise. + */ -+static int kbase_insert_va_region_nolock(struct kbase_va_region *new_reg, -+ struct kbase_va_region *at_reg, u64 start_pfn, size_t nr_pages) ++static int kbase_insert_va_region_nolock(struct kbase_device *kbdev, ++ struct kbase_va_region *new_reg, ++ struct kbase_va_region *at_reg, u64 start_pfn, ++ size_t nr_pages) +{ + struct rb_root *reg_rbtree = NULL; + int err = 0; @@ -222302,6 +256766,9 @@ index 000000000000..82a799c2d673 + KBASE_DEBUG_ASSERT((start_pfn >= at_reg->start_pfn) && (start_pfn < at_reg->start_pfn + at_reg->nr_pages)); + /* at least nr_pages from start_pfn should be contained within at_reg */ + KBASE_DEBUG_ASSERT(start_pfn + nr_pages <= at_reg->start_pfn + at_reg->nr_pages); ++ /* having at_reg means the rb_tree should not be empty */ ++ if (WARN_ON(RB_EMPTY_ROOT(reg_rbtree))) ++ return -ENOMEM; + + new_reg->start_pfn = start_pfn; + new_reg->nr_pages = nr_pages; @@ -222330,10 +256797,9 @@ index 000000000000..82a799c2d673 + else { + struct kbase_va_region *new_front_reg; + -+ new_front_reg = kbase_alloc_free_region(reg_rbtree, -+ at_reg->start_pfn, -+ start_pfn - at_reg->start_pfn, -+ at_reg->flags & KBASE_REG_ZONE_MASK); ++ new_front_reg = kbase_alloc_free_region(kbdev, reg_rbtree, at_reg->start_pfn, ++ start_pfn - at_reg->start_pfn, ++ at_reg->flags & KBASE_REG_ZONE_MASK); + + if (new_front_reg) { + at_reg->nr_pages -= nr_pages + new_front_reg->nr_pages; @@ -222357,6 +256823,8 @@ index 000000000000..82a799c2d673 + * @addr: the address to insert the region at + * @nr_pages: the number of pages in the region + * @align: the minimum alignment in pages ++ * ++ * Return: 0 on success, error code otherwise. + */ +int kbase_add_va_region(struct kbase_context *kctx, + struct kbase_va_region *reg, u64 addr, @@ -222368,17 +256836,24 @@ index 000000000000..82a799c2d673 + int gpu_pc_bits = + kbdev->gpu_props.props.core_props.log2_program_counter_size; + -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ KBASE_DEBUG_ASSERT(NULL != reg); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(reg != NULL); + + lockdep_assert_held(&kctx->reg_lock); + -+ /* The executable allocation from the SAME_VA zone would already have an ++ /* The executable allocation from the SAME_VA zone should already have an + * appropriately aligned GPU VA chosen for it. -+ * Also the executable allocation from EXEC_VA zone doesn't need the -+ * special alignment. ++ * Also, executable allocations from EXEC_VA don't need the special ++ * alignment. ++ */ ++#if MALI_USE_CSF ++ /* The same is also true for the EXEC_FIXED_VA zone. + */ ++#endif + if (!(reg->flags & KBASE_REG_GPU_NX) && !addr && ++#if MALI_USE_CSF ++ ((reg->flags & KBASE_REG_ZONE_MASK) != KBASE_REG_ZONE_EXEC_FIXED_VA) && ++#endif + ((reg->flags & KBASE_REG_ZONE_MASK) != KBASE_REG_ZONE_EXEC_VA)) { + if (cpu_va_bits > gpu_pc_bits) { + align = max(align, (size_t)((1ULL << gpu_pc_bits) @@ -222410,15 +256885,17 @@ index 000000000000..82a799c2d673 +/** + * kbase_add_va_region_rbtree - Insert a region into its corresponding rbtree + * -+ * Insert a region into the rbtree that was specified when the region was -+ * created. If addr is 0 a free area in the rbtree is used, otherwise the -+ * specified address is used. -+ * + * @kbdev: The kbase device + * @reg: The region to add + * @addr: The address to add the region at, or 0 to map at any available address + * @nr_pages: The size of the region in pages + * @align: The minimum alignment in pages ++ * ++ * Insert a region into the rbtree that was specified when the region was ++ * created. If addr is 0 a free area in the rbtree is used, otherwise the ++ * specified address is used. ++ * ++ * Return: 0 on success, error code otherwise. + */ +int kbase_add_va_region_rbtree(struct kbase_device *kbdev, + struct kbase_va_region *reg, @@ -222459,8 +256936,7 @@ index 000000000000..82a799c2d673 + goto exit; + } + -+ err = kbase_insert_va_region_nolock(reg, tmp, gpu_pfn, -+ nr_pages); ++ err = kbase_insert_va_region_nolock(kbdev, reg, tmp, gpu_pfn, nr_pages); + if (err) { + dev_warn(dev, "Failed to insert va region"); + err = -ENOMEM; @@ -222476,8 +256952,8 @@ index 000000000000..82a799c2d673 + WARN(align > 1, "%s with align %lx might not be honored for KBASE_REG_TILER_ALIGN_TOP memory", + __func__, + (unsigned long)align); -+ align_mask = reg->extent - 1; -+ align_offset = reg->extent - reg->initial_commit; ++ align_mask = reg->extension - 1; ++ align_offset = reg->extension - reg->initial_commit; + } +#endif /* !MALI_USE_CSF */ + @@ -222485,8 +256961,7 @@ index 000000000000..82a799c2d673 + nr_pages, align_offset, align_mask, + &start_pfn); + if (tmp) { -+ err = kbase_insert_va_region_nolock(reg, tmp, -+ start_pfn, nr_pages); ++ err = kbase_insert_va_region_nolock(kbdev, reg, tmp, start_pfn, nr_pages); + if (unlikely(err)) { + dev_warn(dev, "Failed to insert region: 0x%08llx start_pfn, %zu nr_pages", + start_pfn, nr_pages); @@ -222502,9 +256977,62 @@ index 000000000000..82a799c2d673 + return err; +} + -+/** ++/* + * @brief Initialize the internal region tracker data structure. + */ ++#if MALI_USE_CSF ++static void kbase_region_tracker_ds_init(struct kbase_context *kctx, ++ struct kbase_va_region *same_va_reg, ++ struct kbase_va_region *custom_va_reg, ++ struct kbase_va_region *exec_va_reg, ++ struct kbase_va_region *exec_fixed_va_reg, ++ struct kbase_va_region *fixed_va_reg) ++{ ++ u64 last_zone_end_pfn; ++ ++ kctx->reg_rbtree_same = RB_ROOT; ++ kbase_region_tracker_insert(same_va_reg); ++ ++ last_zone_end_pfn = same_va_reg->start_pfn + same_va_reg->nr_pages; ++ ++ /* Although custom_va_reg doesn't always exist, initialize ++ * unconditionally because of the mem_view debugfs ++ * implementation which relies on it being empty. ++ */ ++ kctx->reg_rbtree_custom = RB_ROOT; ++ kctx->reg_rbtree_exec = RB_ROOT; ++ ++ if (custom_va_reg) { ++ WARN_ON(custom_va_reg->start_pfn < last_zone_end_pfn); ++ kbase_region_tracker_insert(custom_va_reg); ++ last_zone_end_pfn = custom_va_reg->start_pfn + custom_va_reg->nr_pages; ++ } ++ ++ /* Initialize exec, fixed and exec_fixed. These are always ++ * initialized at this stage, if they will exist at all. ++ */ ++ kctx->reg_rbtree_fixed = RB_ROOT; ++ kctx->reg_rbtree_exec_fixed = RB_ROOT; ++ ++ if (exec_va_reg) { ++ WARN_ON(exec_va_reg->start_pfn < last_zone_end_pfn); ++ kbase_region_tracker_insert(exec_va_reg); ++ last_zone_end_pfn = exec_va_reg->start_pfn + exec_va_reg->nr_pages; ++ } ++ ++ if (exec_fixed_va_reg) { ++ WARN_ON(exec_fixed_va_reg->start_pfn < last_zone_end_pfn); ++ kbase_region_tracker_insert(exec_fixed_va_reg); ++ last_zone_end_pfn = exec_fixed_va_reg->start_pfn + exec_fixed_va_reg->nr_pages; ++ } ++ ++ if (fixed_va_reg) { ++ WARN_ON(fixed_va_reg->start_pfn < last_zone_end_pfn); ++ kbase_region_tracker_insert(fixed_va_reg); ++ last_zone_end_pfn = fixed_va_reg->start_pfn + fixed_va_reg->nr_pages; ++ } ++} ++#else +static void kbase_region_tracker_ds_init(struct kbase_context *kctx, + struct kbase_va_region *same_va_reg, + struct kbase_va_region *custom_va_reg) @@ -222525,6 +257053,41 @@ index 000000000000..82a799c2d673 + if (custom_va_reg) + kbase_region_tracker_insert(custom_va_reg); +} ++#endif /* MALI_USE_CSF */ ++ ++static struct kbase_context *kbase_reg_flags_to_kctx(struct kbase_va_region *reg) ++{ ++ struct kbase_context *kctx = NULL; ++ struct rb_root *rbtree = reg->rbtree; ++ ++ switch (reg->flags & KBASE_REG_ZONE_MASK) { ++ case KBASE_REG_ZONE_CUSTOM_VA: ++ kctx = container_of(rbtree, struct kbase_context, reg_rbtree_custom); ++ break; ++ case KBASE_REG_ZONE_SAME_VA: ++ kctx = container_of(rbtree, struct kbase_context, reg_rbtree_same); ++ break; ++ case KBASE_REG_ZONE_EXEC_VA: ++ kctx = container_of(rbtree, struct kbase_context, reg_rbtree_exec); ++ break; ++#if MALI_USE_CSF ++ case KBASE_REG_ZONE_EXEC_FIXED_VA: ++ kctx = container_of(rbtree, struct kbase_context, reg_rbtree_exec_fixed); ++ break; ++ case KBASE_REG_ZONE_FIXED_VA: ++ kctx = container_of(rbtree, struct kbase_context, reg_rbtree_fixed); ++ break; ++ case KBASE_REG_ZONE_MCU_SHARED: ++ /* This is only expected to be called on driver unload. */ ++ break; ++#endif ++ default: ++ WARN(1, "Unknown zone in region: flags=0x%lx\n", reg->flags); ++ break; ++ } ++ ++ return kctx; ++} + +static void kbase_region_tracker_erase_rbtree(struct rb_root *rbtree) +{ @@ -222536,7 +257099,9 @@ index 000000000000..82a799c2d673 + if (rbnode) { + rb_erase(rbnode, rbtree); + reg = rb_entry(rbnode, struct kbase_va_region, rblink); -+ WARN_ON(reg->va_refcnt != 1); ++ WARN_ON(kbase_refcount_read(®->va_refcnt) != 1); ++ if (kbase_page_migration_enabled) ++ kbase_gpu_munmap(kbase_reg_flags_to_kctx(reg), reg); + /* Reset the start_pfn - as the rbtree is being + * destroyed and we've already erased this region, there + * is no further need to attempt to remove it. @@ -222553,12 +257118,19 @@ index 000000000000..82a799c2d673 + +void kbase_region_tracker_term(struct kbase_context *kctx) +{ ++ WARN(kctx->as_nr != KBASEP_AS_NR_INVALID, ++ "kctx-%d_%d must first be scheduled out to flush GPU caches+tlbs before erasing remaining regions", ++ kctx->tgid, kctx->id); ++ + kbase_gpu_vm_lock(kctx); + kbase_region_tracker_erase_rbtree(&kctx->reg_rbtree_same); + kbase_region_tracker_erase_rbtree(&kctx->reg_rbtree_custom); + kbase_region_tracker_erase_rbtree(&kctx->reg_rbtree_exec); +#if MALI_USE_CSF + WARN_ON(!list_empty(&kctx->csf.event_pages_head)); ++ kbase_region_tracker_erase_rbtree(&kctx->reg_rbtree_exec_fixed); ++ kbase_region_tracker_erase_rbtree(&kctx->reg_rbtree_fixed); ++ +#endif + kbase_gpu_vm_unlock(kctx); +} @@ -222570,8 +257142,8 @@ index 000000000000..82a799c2d673 + +static size_t kbase_get_same_va_bits(struct kbase_context *kctx) +{ -+ return min(kbase_get_num_cpu_va_bits(kctx), -+ (size_t) kctx->kbdev->gpu_props.mmu.va_bits); ++ return min_t(size_t, kbase_get_num_cpu_va_bits(kctx), ++ kctx->kbdev->gpu_props.mmu.va_bits); +} + +int kbase_region_tracker_init(struct kbase_context *kctx) @@ -222580,28 +257152,50 @@ index 000000000000..82a799c2d673 + struct kbase_va_region *custom_va_reg = NULL; + size_t same_va_bits = kbase_get_same_va_bits(kctx); + u64 custom_va_size = KBASE_REG_ZONE_CUSTOM_VA_SIZE; -+ u64 gpu_va_limit = (1ULL << kctx->kbdev->gpu_props.mmu.va_bits) >> PAGE_SHIFT; ++ u64 gpu_va_bits = kctx->kbdev->gpu_props.mmu.va_bits; ++ u64 gpu_va_limit = (1ULL << gpu_va_bits) >> PAGE_SHIFT; + u64 same_va_pages; ++ u64 same_va_base = 1u; + int err; ++#if MALI_USE_CSF ++ struct kbase_va_region *exec_va_reg; ++ struct kbase_va_region *exec_fixed_va_reg; ++ struct kbase_va_region *fixed_va_reg; ++ ++ u64 exec_va_base; ++ u64 fixed_va_end; ++ u64 exec_fixed_va_base; ++ u64 fixed_va_base; ++ u64 fixed_va_pages; ++#endif + + /* Take the lock as kbase_free_alloced_region requires it */ + kbase_gpu_vm_lock(kctx); + -+ same_va_pages = (1ULL << (same_va_bits - PAGE_SHIFT)) - 1; ++ same_va_pages = (1ULL << (same_va_bits - PAGE_SHIFT)) - same_va_base; ++ ++#if MALI_USE_CSF ++ if ((same_va_base + same_va_pages) > KBASE_REG_ZONE_EXEC_VA_BASE_64) { ++ /* Depending on how the kernel is configured, it's possible (eg on aarch64) for ++ * same_va_bits to reach 48 bits. Cap same_va_pages so that the same_va zone ++ * doesn't cross into the exec_va zone. ++ */ ++ same_va_pages = KBASE_REG_ZONE_EXEC_VA_BASE_64 - same_va_base; ++ } ++#endif ++ + /* all have SAME_VA */ -+ same_va_reg = kbase_alloc_free_region(&kctx->reg_rbtree_same, 1, -+ same_va_pages, -+ KBASE_REG_ZONE_SAME_VA); ++ same_va_reg = kbase_alloc_free_region(kctx->kbdev, &kctx->reg_rbtree_same, same_va_base, ++ same_va_pages, KBASE_REG_ZONE_SAME_VA); + + if (!same_va_reg) { + err = -ENOMEM; + goto fail_unlock; + } ++ kbase_ctx_reg_zone_init(kctx, KBASE_REG_ZONE_SAME_VA, same_va_base, ++ same_va_pages); + -+#ifdef CONFIG_64BIT -+ /* 32-bit clients have custom VA zones */ -+ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) { -+#endif ++ if (kbase_ctx_compat_mode(kctx)) { + if (gpu_va_limit <= KBASE_REG_ZONE_CUSTOM_VA_BASE) { + err = -EINVAL; + goto fail_free_same_va; @@ -222613,35 +257207,105 @@ index 000000000000..82a799c2d673 + if ((KBASE_REG_ZONE_CUSTOM_VA_BASE + KBASE_REG_ZONE_CUSTOM_VA_SIZE) >= gpu_va_limit) + custom_va_size = gpu_va_limit - KBASE_REG_ZONE_CUSTOM_VA_BASE; + -+ custom_va_reg = kbase_alloc_free_region( -+ &kctx->reg_rbtree_custom, -+ KBASE_REG_ZONE_CUSTOM_VA_BASE, -+ custom_va_size, KBASE_REG_ZONE_CUSTOM_VA); ++ custom_va_reg = kbase_alloc_free_region(kctx->kbdev, &kctx->reg_rbtree_custom, ++ KBASE_REG_ZONE_CUSTOM_VA_BASE, ++ custom_va_size, KBASE_REG_ZONE_CUSTOM_VA); + + if (!custom_va_reg) { + err = -ENOMEM; + goto fail_free_same_va; + } -+#ifdef CONFIG_64BIT ++ kbase_ctx_reg_zone_init(kctx, KBASE_REG_ZONE_CUSTOM_VA, ++ KBASE_REG_ZONE_CUSTOM_VA_BASE, ++ custom_va_size); + } else { + custom_va_size = 0; + } -+#endif + -+ kbase_region_tracker_ds_init(kctx, same_va_reg, custom_va_reg); ++#if MALI_USE_CSF ++ /* The position of EXEC_VA depends on whether the client is 32-bit or 64-bit. */ ++ exec_va_base = KBASE_REG_ZONE_EXEC_VA_BASE_64; + -+ kctx->same_va_end = same_va_pages + 1; -+ kctx->gpu_va_end = kctx->same_va_end + custom_va_size; -+ kctx->exec_va_start = U64_MAX; -+ kctx->jit_va = false; ++ /* Similarly the end of the FIXED_VA zone also depends on whether the client ++ * is 32 or 64-bits. ++ */ ++ fixed_va_end = KBASE_REG_ZONE_FIXED_VA_END_64; ++ ++ if (kbase_ctx_compat_mode(kctx)) { ++ exec_va_base = KBASE_REG_ZONE_EXEC_VA_BASE_32; ++ fixed_va_end = KBASE_REG_ZONE_FIXED_VA_END_32; ++ } ++ ++ kbase_ctx_reg_zone_init(kctx, KBASE_REG_ZONE_EXEC_VA, exec_va_base, ++ KBASE_REG_ZONE_EXEC_VA_SIZE); ++ ++ exec_va_reg = kbase_alloc_free_region(kctx->kbdev, &kctx->reg_rbtree_exec, exec_va_base, ++ KBASE_REG_ZONE_EXEC_VA_SIZE, KBASE_REG_ZONE_EXEC_VA); ++ ++ if (!exec_va_reg) { ++ err = -ENOMEM; ++ goto fail_free_custom_va; ++ } ++ ++ exec_fixed_va_base = exec_va_base + KBASE_REG_ZONE_EXEC_VA_SIZE; ++ ++ kbase_ctx_reg_zone_init(kctx, KBASE_REG_ZONE_EXEC_FIXED_VA, exec_fixed_va_base, ++ KBASE_REG_ZONE_EXEC_FIXED_VA_SIZE); ++ ++ exec_fixed_va_reg = ++ kbase_alloc_free_region(kctx->kbdev, &kctx->reg_rbtree_exec_fixed, ++ exec_fixed_va_base, KBASE_REG_ZONE_EXEC_FIXED_VA_SIZE, ++ KBASE_REG_ZONE_EXEC_FIXED_VA); ++ ++ if (!exec_fixed_va_reg) { ++ err = -ENOMEM; ++ goto fail_free_exec_va; ++ } ++ ++ fixed_va_base = exec_fixed_va_base + KBASE_REG_ZONE_EXEC_FIXED_VA_SIZE; ++ fixed_va_pages = fixed_va_end - fixed_va_base; ++ ++ kbase_ctx_reg_zone_init(kctx, KBASE_REG_ZONE_FIXED_VA, fixed_va_base, fixed_va_pages); ++ ++ fixed_va_reg = kbase_alloc_free_region(kctx->kbdev, &kctx->reg_rbtree_fixed, fixed_va_base, ++ fixed_va_pages, KBASE_REG_ZONE_FIXED_VA); ++ ++ kctx->gpu_va_end = fixed_va_end; ++ ++ if (!fixed_va_reg) { ++ err = -ENOMEM; ++ goto fail_free_exec_fixed_va; ++ } ++ ++ kbase_region_tracker_ds_init(kctx, same_va_reg, custom_va_reg, exec_va_reg, ++ exec_fixed_va_reg, fixed_va_reg); + -+#if MALI_USE_CSF + INIT_LIST_HEAD(&kctx->csf.event_pages_head); ++#else ++ /* EXEC_VA zone's codepaths are slightly easier when its base_pfn is ++ * initially U64_MAX ++ */ ++ kbase_ctx_reg_zone_init(kctx, KBASE_REG_ZONE_EXEC_VA, U64_MAX, 0u); ++ /* Other zones are 0: kbase_create_context() uses vzalloc */ ++ ++ kbase_region_tracker_ds_init(kctx, same_va_reg, custom_va_reg); ++ kctx->gpu_va_end = same_va_base + same_va_pages + custom_va_size; +#endif ++ kctx->jit_va = false; + + kbase_gpu_vm_unlock(kctx); + return 0; + ++#if MALI_USE_CSF ++fail_free_exec_fixed_va: ++ kbase_free_alloced_region(exec_fixed_va_reg); ++fail_free_exec_va: ++ kbase_free_alloced_region(exec_va_reg); ++fail_free_custom_va: ++ if (custom_va_reg) ++ kbase_free_alloced_region(custom_va_reg); ++#endif ++ +fail_free_same_va: + kbase_free_alloced_region(same_va_reg); +fail_unlock: @@ -222649,44 +257313,149 @@ index 000000000000..82a799c2d673 + return err; +} + -+#ifdef CONFIG_64BIT ++static bool kbase_has_exec_va_zone_locked(struct kbase_context *kctx) ++{ ++ struct kbase_reg_zone *exec_va_zone; ++ ++ lockdep_assert_held(&kctx->reg_lock); ++ exec_va_zone = kbase_ctx_reg_zone_get(kctx, KBASE_REG_ZONE_EXEC_VA); ++ ++ return (exec_va_zone->base_pfn != U64_MAX); ++} ++ ++bool kbase_has_exec_va_zone(struct kbase_context *kctx) ++{ ++ bool has_exec_va_zone; ++ ++ kbase_gpu_vm_lock(kctx); ++ has_exec_va_zone = kbase_has_exec_va_zone_locked(kctx); ++ kbase_gpu_vm_unlock(kctx); ++ ++ return has_exec_va_zone; ++} ++ ++/** ++ * kbase_region_tracker_has_allocs - Determine if any allocations have been made ++ * on a context's region tracker ++ * ++ * @kctx: KBase context ++ * ++ * Check the context to determine if any allocations have been made yet from ++ * any of its zones. This check should be done before resizing a zone, e.g. to ++ * make space to add a second zone. ++ * ++ * Whilst a zone without allocations can be resized whilst other zones have ++ * allocations, we still check all of @kctx 's zones anyway: this is a stronger ++ * guarantee and should be adhered to when creating new zones anyway. ++ * ++ * Allocations from kbdev zones are not counted. ++ * ++ * Return: true if any allocs exist on any zone, false otherwise ++ */ ++static bool kbase_region_tracker_has_allocs(struct kbase_context *kctx) ++{ ++ unsigned int zone_idx; ++ ++ lockdep_assert_held(&kctx->reg_lock); ++ ++ for (zone_idx = 0; zone_idx < KBASE_REG_ZONE_MAX; ++zone_idx) { ++ struct kbase_reg_zone *zone; ++ struct kbase_va_region *reg; ++ u64 zone_base_addr; ++ unsigned long zone_bits = KBASE_REG_ZONE(zone_idx); ++ unsigned long reg_zone; ++ ++ if (!kbase_is_ctx_reg_zone(zone_bits)) ++ continue; ++ zone = kbase_ctx_reg_zone_get(kctx, zone_bits); ++ zone_base_addr = zone->base_pfn << PAGE_SHIFT; ++ ++ reg = kbase_region_tracker_find_region_base_address( ++ kctx, zone_base_addr); ++ ++ if (!zone->va_size_pages) { ++ WARN(reg, ++ "Should not have found a region that starts at 0x%.16llx for zone 0x%lx", ++ (unsigned long long)zone_base_addr, zone_bits); ++ continue; ++ } ++ ++ if (WARN(!reg, ++ "There should always be a region that starts at 0x%.16llx for zone 0x%lx, couldn't find it", ++ (unsigned long long)zone_base_addr, zone_bits)) ++ return true; /* Safest return value */ ++ ++ reg_zone = reg->flags & KBASE_REG_ZONE_MASK; ++ if (WARN(reg_zone != zone_bits, ++ "The region that starts at 0x%.16llx should be in zone 0x%lx but was found in the wrong zone 0x%lx", ++ (unsigned long long)zone_base_addr, zone_bits, ++ reg_zone)) ++ return true; /* Safest return value */ ++ ++ /* Unless the region is completely free, of the same size as ++ * the original zone, then it has allocs ++ */ ++ if ((!(reg->flags & KBASE_REG_FREE)) || ++ (reg->nr_pages != zone->va_size_pages)) ++ return true; ++ } ++ ++ /* All zones are the same size as originally made, so there are no ++ * allocs ++ */ ++ return false; ++} ++ +static int kbase_region_tracker_init_jit_64(struct kbase_context *kctx, + u64 jit_va_pages) +{ -+ struct kbase_va_region *same_va; ++ struct kbase_va_region *same_va_reg; ++ struct kbase_reg_zone *same_va_zone; ++ u64 same_va_zone_base_addr; ++ const unsigned long same_va_zone_bits = KBASE_REG_ZONE_SAME_VA; + struct kbase_va_region *custom_va_reg; ++ u64 jit_va_start; + + lockdep_assert_held(&kctx->reg_lock); + -+ /* First verify that a JIT_VA zone has not been created already. */ -+ if (kctx->jit_va) -+ return -EINVAL; -+ + /* -+ * Modify the same VA free region after creation. Be careful to ensure -+ * that allocations haven't been made as they could cause an overlap -+ * to happen with existing same VA allocations and the custom VA zone. ++ * Modify the same VA free region after creation. The caller has ++ * ensured that allocations haven't been made, as any allocations could ++ * cause an overlap to happen with existing same VA allocations and the ++ * custom VA zone. + */ -+ same_va = kbase_region_tracker_find_region_base_address(kctx, -+ PAGE_SIZE); -+ if (!same_va) ++ same_va_zone = kbase_ctx_reg_zone_get(kctx, same_va_zone_bits); ++ same_va_zone_base_addr = same_va_zone->base_pfn << PAGE_SHIFT; ++ ++ same_va_reg = kbase_region_tracker_find_region_base_address( ++ kctx, same_va_zone_base_addr); ++ if (WARN(!same_va_reg, ++ "Already found a free region at the start of every zone, but now cannot find any region for zone base 0x%.16llx zone 0x%lx", ++ (unsigned long long)same_va_zone_base_addr, same_va_zone_bits)) + return -ENOMEM; + -+ if (same_va->nr_pages < jit_va_pages || kctx->same_va_end < jit_va_pages) ++ /* kbase_region_tracker_has_allocs() in the caller has already ensured ++ * that all of the zones have no allocs, so no need to check that again ++ * on same_va_reg ++ */ ++ WARN_ON((!(same_va_reg->flags & KBASE_REG_FREE)) || ++ same_va_reg->nr_pages != same_va_zone->va_size_pages); ++ ++ if (same_va_reg->nr_pages < jit_va_pages || ++ same_va_zone->va_size_pages < jit_va_pages) + return -ENOMEM; + + /* It's safe to adjust the same VA zone now */ -+ same_va->nr_pages -= jit_va_pages; -+ kctx->same_va_end -= jit_va_pages; ++ same_va_reg->nr_pages -= jit_va_pages; ++ same_va_zone->va_size_pages -= jit_va_pages; ++ jit_va_start = kbase_reg_zone_end_pfn(same_va_zone); + + /* + * Create a custom VA zone at the end of the VA for allocations which + * JIT can use so it doesn't have to allocate VA from the kernel. + */ -+ custom_va_reg = kbase_alloc_free_region(&kctx->reg_rbtree_custom, -+ kctx->same_va_end, -+ jit_va_pages, -+ KBASE_REG_ZONE_CUSTOM_VA); ++ custom_va_reg = kbase_alloc_free_region(kctx->kbdev, &kctx->reg_rbtree_custom, jit_va_start, ++ jit_va_pages, KBASE_REG_ZONE_CUSTOM_VA); + + /* + * The context will be destroyed if we fail here so no point @@ -222694,11 +257463,15 @@ index 000000000000..82a799c2d673 + */ + if (!custom_va_reg) + return -ENOMEM; ++ /* Since this is 64-bit, the custom zone will not have been ++ * initialized, so initialize it now ++ */ ++ kbase_ctx_reg_zone_init(kctx, KBASE_REG_ZONE_CUSTOM_VA, jit_va_start, ++ jit_va_pages); + + kbase_region_tracker_insert(custom_va_reg); + return 0; +} -+#endif + +int kbase_region_tracker_init_jit(struct kbase_context *kctx, u64 jit_va_pages, + int max_allocations, int trim_level, int group_id, @@ -222722,10 +257495,25 @@ index 000000000000..82a799c2d673 + + kbase_gpu_vm_lock(kctx); + -+#ifdef CONFIG_64BIT -+ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ /* Verify that a JIT_VA zone has not been created already. */ ++ if (kctx->jit_va) { ++ err = -EINVAL; ++ goto exit_unlock; ++ } ++ ++ /* If in 64-bit, we always lookup the SAME_VA zone. To ensure it has no ++ * allocs, we can ensure there are no allocs anywhere. ++ * ++ * This check is also useful in 32-bit, just to make sure init of the ++ * zone is always done before any allocs. ++ */ ++ if (kbase_region_tracker_has_allocs(kctx)) { ++ err = -ENOMEM; ++ goto exit_unlock; ++ } ++ ++ if (!kbase_ctx_compat_mode(kctx)) + err = kbase_region_tracker_init_jit_64(kctx, jit_va_pages); -+#endif + /* + * Nothing to do for 32-bit clients, JIT uses the existing + * custom VA zone. @@ -222743,6 +257531,7 @@ index 000000000000..82a799c2d673 +#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ + } + ++exit_unlock: + kbase_gpu_vm_unlock(kctx); + + return err; @@ -222750,24 +257539,41 @@ index 000000000000..82a799c2d673 + +int kbase_region_tracker_init_exec(struct kbase_context *kctx, u64 exec_va_pages) +{ -+ struct kbase_va_region *shrinking_va_reg; ++#if !MALI_USE_CSF + struct kbase_va_region *exec_va_reg; -+ u64 exec_va_start, exec_va_base_addr; ++ struct kbase_reg_zone *exec_va_zone; ++ struct kbase_reg_zone *target_zone; ++ struct kbase_va_region *target_reg; ++ u64 target_zone_base_addr; ++ unsigned long target_zone_bits; ++ u64 exec_va_start; + int err; ++#endif + -+ /* The EXEC_VA zone shall be created by making space at the end of the -+ * address space. Firstly, verify that the number of EXEC_VA pages -+ * requested by the client is reasonable and then make sure that it is -+ * not greater than the address space itself before calculating the base -+ * address of the new zone. ++ /* The EXEC_VA zone shall be created by making space either: ++ * - for 64-bit clients, at the end of the process's address space ++ * - for 32-bit clients, in the CUSTOM zone ++ * ++ * Firstly, verify that the number of EXEC_VA pages requested by the ++ * client is reasonable and then make sure that it is not greater than ++ * the address space itself before calculating the base address of the ++ * new zone. + */ + if (exec_va_pages == 0 || exec_va_pages > KBASE_REG_ZONE_EXEC_VA_MAX_PAGES) + return -EINVAL; + ++#if MALI_USE_CSF ++ /* For CSF GPUs we now setup the EXEC_VA zone during initialization, ++ * so this request is a null-op. ++ */ ++ return 0; ++#else + kbase_gpu_vm_lock(kctx); + -+ /* First verify that a JIT_VA zone has not been created already. */ -+ if (kctx->jit_va) { ++ /* Verify that we've not already created a EXEC_VA zone, and that the ++ * EXEC_VA zone must come before JIT's CUSTOM_VA. ++ */ ++ if (kbase_has_exec_va_zone_locked(kctx) || kctx->jit_va) { + err = -EPERM; + goto exit_unlock; + } @@ -222777,43 +257583,64 @@ index 000000000000..82a799c2d673 + goto exit_unlock; + } + -+ exec_va_start = kctx->gpu_va_end - exec_va_pages; -+ exec_va_base_addr = exec_va_start << PAGE_SHIFT; -+ -+ shrinking_va_reg = kbase_region_tracker_find_region_enclosing_address(kctx, -+ exec_va_base_addr); -+ if (!shrinking_va_reg) { ++ /* Verify no allocations have already been made */ ++ if (kbase_region_tracker_has_allocs(kctx)) { + err = -ENOMEM; + goto exit_unlock; + } + -+ /* Make sure that the EXEC_VA region is still uninitialized */ -+ if ((shrinking_va_reg->flags & KBASE_REG_ZONE_MASK) == -+ KBASE_REG_ZONE_EXEC_VA) { -+ err = -EPERM; ++ if (kbase_ctx_compat_mode(kctx)) { ++ /* 32-bit client: take from CUSTOM_VA zone */ ++ target_zone_bits = KBASE_REG_ZONE_CUSTOM_VA; ++ } else { ++ /* 64-bit client: take from SAME_VA zone */ ++ target_zone_bits = KBASE_REG_ZONE_SAME_VA; ++ } ++ ++ target_zone = kbase_ctx_reg_zone_get(kctx, target_zone_bits); ++ target_zone_base_addr = target_zone->base_pfn << PAGE_SHIFT; ++ ++ target_reg = kbase_region_tracker_find_region_base_address( ++ kctx, target_zone_base_addr); ++ if (WARN(!target_reg, ++ "Already found a free region at the start of every zone, but now cannot find any region for zone base 0x%.16llx zone 0x%lx", ++ (unsigned long long)target_zone_base_addr, target_zone_bits)) { ++ err = -ENOMEM; + goto exit_unlock; + } ++ /* kbase_region_tracker_has_allocs() above has already ensured that all ++ * of the zones have no allocs, so no need to check that again on ++ * target_reg ++ */ ++ WARN_ON((!(target_reg->flags & KBASE_REG_FREE)) || ++ target_reg->nr_pages != target_zone->va_size_pages); + -+ if (shrinking_va_reg->nr_pages <= exec_va_pages) { ++ if (target_reg->nr_pages <= exec_va_pages || ++ target_zone->va_size_pages <= exec_va_pages) { + err = -ENOMEM; + goto exit_unlock; + } + -+ exec_va_reg = kbase_alloc_free_region(&kctx->reg_rbtree_exec, -+ exec_va_start, -+ exec_va_pages, -+ KBASE_REG_ZONE_EXEC_VA); ++ /* Taken from the end of the target zone */ ++ exec_va_start = kbase_reg_zone_end_pfn(target_zone) - exec_va_pages; ++ ++ exec_va_reg = kbase_alloc_free_region(kctx->kbdev, &kctx->reg_rbtree_exec, exec_va_start, ++ exec_va_pages, KBASE_REG_ZONE_EXEC_VA); + if (!exec_va_reg) { + err = -ENOMEM; + goto exit_unlock; + } ++ /* Update EXEC_VA zone ++ * ++ * not using kbase_ctx_reg_zone_init() - it was already initialized ++ */ ++ exec_va_zone = kbase_ctx_reg_zone_get(kctx, KBASE_REG_ZONE_EXEC_VA); ++ exec_va_zone->base_pfn = exec_va_start; ++ exec_va_zone->va_size_pages = exec_va_pages; + -+ shrinking_va_reg->nr_pages -= exec_va_pages; -+#ifdef CONFIG_64BIT -+ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) -+ kctx->same_va_end -= exec_va_pages; -+#endif -+ kctx->exec_va_start = exec_va_start; ++ /* Update target zone and corresponding region */ ++ target_reg->nr_pages -= exec_va_pages; ++ target_zone->va_size_pages -= exec_va_pages; + + kbase_region_tracker_insert(exec_va_reg); + err = 0; @@ -222821,6 +257648,7 @@ index 000000000000..82a799c2d673 +exit_unlock: + kbase_gpu_vm_unlock(kctx); + return err; ++#endif /* MALI_USE_CSF */ +} + +#if MALI_USE_CSF @@ -222840,10 +257668,9 @@ index 000000000000..82a799c2d673 + + kbdev->csf.shared_reg_rbtree = RB_ROOT; + -+ shared_reg = kbase_alloc_free_region(&kbdev->csf.shared_reg_rbtree, -+ shared_reg_start_pfn, -+ shared_reg_size, -+ KBASE_REG_ZONE_MCU_SHARED); ++ shared_reg = ++ kbase_alloc_free_region(kbdev, &kbdev->csf.shared_reg_rbtree, shared_reg_start_pfn, ++ shared_reg_size, KBASE_REG_ZONE_MCU_SHARED); + if (!shared_reg) + return -ENOMEM; + @@ -222852,11 +257679,31 @@ index 000000000000..82a799c2d673 +} +#endif + ++static void kbasep_mem_page_size_init(struct kbase_device *kbdev) ++{ ++#if IS_ENABLED(CONFIG_LARGE_PAGE_ALLOC_OVERRIDE) ++#if IS_ENABLED(CONFIG_LARGE_PAGE_ALLOC) ++ kbdev->pagesize_2mb = true; ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_LARGE_PAGE_ALLOC) != 1) { ++ dev_warn( ++ kbdev->dev, ++ "2MB page is enabled by force while current GPU-HW doesn't meet the requirement to do so.\n"); ++ } ++#else /* IS_ENABLED(CONFIG_LARGE_PAGE_ALLOC) */ ++ kbdev->pagesize_2mb = false; ++#endif /* IS_ENABLED(CONFIG_LARGE_PAGE_ALLOC) */ ++#else /* IS_ENABLED(CONFIG_LARGE_PAGE_ALLOC_OVERRIDE) */ ++ /* Set it to the default based on which GPU is present */ ++ kbdev->pagesize_2mb = kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_LARGE_PAGE_ALLOC); ++#endif /* IS_ENABLED(CONFIG_LARGE_PAGE_ALLOC_OVERRIDE) */ ++} ++ +int kbase_mem_init(struct kbase_device *kbdev) +{ + int err = 0; + struct kbasep_mem_device *memdev; -+#ifdef CONFIG_OF ++ char va_region_slab_name[VA_REGION_SLAB_NAME_SIZE]; ++#if IS_ENABLED(CONFIG_OF) + struct device_node *mgm_node = NULL; +#endif + @@ -222864,6 +257711,20 @@ index 000000000000..82a799c2d673 + + memdev = &kbdev->memdev; + ++ kbasep_mem_page_size_init(kbdev); ++ ++ scnprintf(va_region_slab_name, VA_REGION_SLAB_NAME_SIZE, VA_REGION_SLAB_NAME_PREFIX "%s", ++ kbdev->devname); ++ ++ /* Initialize slab cache for kbase_va_regions */ ++ kbdev->va_region_slab = ++ kmem_cache_create(va_region_slab_name, sizeof(struct kbase_va_region), 0, 0, NULL); ++ if (kbdev->va_region_slab == NULL) { ++ dev_err(kbdev->dev, "Failed to create va_region_slab\n"); ++ return -ENOMEM; ++ } ++ ++ kbase_mem_migrate_init(kbdev); + kbase_mem_pool_group_config_set_max_size(&kbdev->mem_pool_defaults, + KBASE_MEM_POOL_MAX_SIZE_KCTX); + @@ -222884,7 +257745,7 @@ index 000000000000..82a799c2d673 + + kbdev->mgm_dev = &kbase_native_mgm_dev; + -+#ifdef CONFIG_OF ++#if IS_ENABLED(CONFIG_OF) + /* Check to see whether or not a platform-specific memory group manager + * is configured and available. + */ @@ -222926,8 +257787,7 @@ index 000000000000..82a799c2d673 + kbase_mem_pool_group_config_set_max_size(&mem_pool_defaults, + KBASE_MEM_POOL_MAX_SIZE_KBDEV); + -+ err = kbase_mem_pool_group_init(&kbdev->mem_pools, kbdev, -+ &mem_pool_defaults, NULL); ++ err = kbase_mem_pool_group_init(&kbdev->mem_pools, kbdev, &mem_pool_defaults, NULL); + } + + return err; @@ -222953,6 +257813,11 @@ index 000000000000..82a799c2d673 + + kbase_mem_pool_group_term(&kbdev->mem_pools); + ++ kbase_mem_migrate_term(kbdev); ++ ++ kmem_cache_destroy(kbdev->va_region_slab); ++ kbdev->va_region_slab = NULL; ++ + WARN_ON(kbdev->total_gpu_pages); + WARN_ON(!RB_EMPTY_ROOT(&kbdev->process_root)); + WARN_ON(!RB_EMPTY_ROOT(&kbdev->dma_buf_root)); @@ -222964,16 +257829,23 @@ index 000000000000..82a799c2d673 +KBASE_EXPORT_TEST_API(kbase_mem_term); + +/** -+ * @brief Allocate a free region object. ++ * kbase_alloc_free_region - Allocate a free region object. ++ * ++ * @kbdev: kbase device ++ * @rbtree: Backlink to the red-black tree of memory regions. ++ * @start_pfn: The Page Frame Number in GPU virtual address space. ++ * @nr_pages: The size of the region in pages. ++ * @zone: KBASE_REG_ZONE_CUSTOM_VA or KBASE_REG_ZONE_SAME_VA + * + * The allocated object is not part of any list yet, and is flagged as + * KBASE_REG_FREE. No mapping is allocated yet. + * + * zone is KBASE_REG_ZONE_CUSTOM_VA or KBASE_REG_ZONE_SAME_VA. + * ++ * Return: pointer to the allocated region object on success, NULL otherwise. + */ -+struct kbase_va_region *kbase_alloc_free_region(struct rb_root *rbtree, -+ u64 start_pfn, size_t nr_pages, int zone) ++struct kbase_va_region *kbase_alloc_free_region(struct kbase_device *kbdev, struct rb_root *rbtree, ++ u64 start_pfn, size_t nr_pages, int zone) +{ + struct kbase_va_region *new_reg; + @@ -222985,12 +257857,13 @@ index 000000000000..82a799c2d673 + /* 64-bit address range is the max */ + KBASE_DEBUG_ASSERT(start_pfn + nr_pages <= (U64_MAX / PAGE_SIZE)); + -+ new_reg = kzalloc(sizeof(*new_reg), GFP_KERNEL); ++ new_reg = kmem_cache_zalloc(kbdev->va_region_slab, GFP_KERNEL); + + if (!new_reg) + return NULL; + -+ new_reg->va_refcnt = 1; ++ kbase_refcount_set(&new_reg->va_refcnt, 1); ++ atomic_set(&new_reg->no_user_free_count, 0); + new_reg->cpu_alloc = NULL; /* no alloc bound yet */ + new_reg->gpu_alloc = NULL; /* no alloc bound yet */ + new_reg->rbtree = rbtree; @@ -223009,35 +257882,10 @@ index 000000000000..82a799c2d673 + +KBASE_EXPORT_TEST_API(kbase_alloc_free_region); + -+static struct kbase_context *kbase_reg_flags_to_kctx( -+ struct kbase_va_region *reg) -+{ -+ struct kbase_context *kctx = NULL; -+ struct rb_root *rbtree = reg->rbtree; -+ -+ switch (reg->flags & KBASE_REG_ZONE_MASK) { -+ case KBASE_REG_ZONE_CUSTOM_VA: -+ kctx = container_of(rbtree, struct kbase_context, -+ reg_rbtree_custom); -+ break; -+ case KBASE_REG_ZONE_SAME_VA: -+ kctx = container_of(rbtree, struct kbase_context, -+ reg_rbtree_same); -+ break; -+ case KBASE_REG_ZONE_EXEC_VA: -+ kctx = container_of(rbtree, struct kbase_context, -+ reg_rbtree_exec); -+ break; -+ default: -+ WARN(1, "Unknown zone in region: flags=0x%lx\n", reg->flags); -+ break; -+ } -+ -+ return kctx; -+} -+ +/** -+ * @brief Free a region object. ++ * kbase_free_alloced_region - Free a region object. ++ * ++ * @reg: Region + * + * The described region must be freed of any mapping. + * @@ -223045,6 +257893,7 @@ index 000000000000..82a799c2d673 + * alloc object will be released. + * It is a bug if no alloc object exists for non-free regions. + * ++ * If region is KBASE_REG_ZONE_MCU_SHARED it is freed + */ +void kbase_free_alloced_region(struct kbase_va_region *reg) +{ @@ -223064,10 +257913,17 @@ index 000000000000..82a799c2d673 + if (WARN_ON(kbase_is_region_invalid(reg))) + return; + -+ dev_dbg(kctx->kbdev->dev, "Freeing memory region %p\n", ++ dev_dbg(kctx->kbdev->dev, "Freeing memory region %pK\n", + (void *)reg); +#if MALI_USE_CSF + if (reg->flags & KBASE_REG_CSF_EVENT) ++ /* ++ * This should not be reachable if called from 'mcu_shared' functions ++ * such as: ++ * kbase_csf_firmware_mcu_shared_mapping_init ++ * kbase_csf_firmware_mcu_shared_mapping_term ++ */ ++ + kbase_unlink_event_mem_page(kctx, reg); +#endif + @@ -223081,8 +257937,6 @@ index 000000000000..82a799c2d673 + * on the list at termination time of the region tracker. + */ + if (!list_empty(®->gpu_alloc->evict_node)) { -+ mutex_unlock(&kctx->jit_evict_lock); -+ + /* + * Unlink the physical allocation before unmaking it + * evictable so that the allocation isn't grown back to @@ -223093,6 +257947,8 @@ index 000000000000..82a799c2d673 + if (reg->cpu_alloc != reg->gpu_alloc) + reg->gpu_alloc->reg = NULL; + ++ mutex_unlock(&kctx->jit_evict_lock); ++ + /* + * If a region has been made evictable then we must + * unmake it before trying to free it. @@ -223128,7 +257984,9 @@ index 000000000000..82a799c2d673 + +KBASE_EXPORT_TEST_API(kbase_free_alloced_region); + -+int kbase_gpu_mmap(struct kbase_context *kctx, struct kbase_va_region *reg, u64 addr, size_t nr_pages, size_t align) ++int kbase_gpu_mmap(struct kbase_context *kctx, struct kbase_va_region *reg, ++ u64 addr, size_t nr_pages, size_t align, ++ enum kbase_caller_mmu_sync_info mmu_sync_info) +{ + int err; + size_t i = 0; @@ -223149,8 +258007,8 @@ index 000000000000..82a799c2d673 + else + attr = KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_WRITE_ALLOC); + -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ KBASE_DEBUG_ASSERT(NULL != reg); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(reg != NULL); + + err = kbase_add_va_region(kctx, reg, addr, nr_pages, align); + if (err) @@ -223165,39 +258023,46 @@ index 000000000000..82a799c2d673 + KBASE_DEBUG_ASSERT(alloc->imported.alias.aliased); + for (i = 0; i < alloc->imported.alias.nents; i++) { + if (alloc->imported.alias.aliased[i].alloc) { -+ err = kbase_mmu_insert_pages(kctx->kbdev, -+ &kctx->mmu, -+ reg->start_pfn + (i * stride), -+ alloc->imported.alias.aliased[i].alloc->pages + alloc->imported.alias.aliased[i].offset, -+ alloc->imported.alias.aliased[i].length, -+ reg->flags & gwt_mask, -+ kctx->as_nr, -+ group_id); ++ err = kbase_mmu_insert_aliased_pages( ++ kctx->kbdev, &kctx->mmu, reg->start_pfn + (i * stride), ++ alloc->imported.alias.aliased[i].alloc->pages + ++ alloc->imported.alias.aliased[i].offset, ++ alloc->imported.alias.aliased[i].length, ++ reg->flags & gwt_mask, kctx->as_nr, group_id, mmu_sync_info, ++ NULL); + if (err) -+ goto bad_insert; ++ goto bad_aliased_insert; + -+ kbase_mem_phy_alloc_gpu_mapped(alloc->imported.alias.aliased[i].alloc); ++ /* Note: mapping count is tracked at alias ++ * creation time ++ */ + } else { -+ err = kbase_mmu_insert_single_page(kctx, -+ reg->start_pfn + i * stride, -+ kctx->aliasing_sink_page, ++ err = kbase_mmu_insert_single_aliased_page( ++ kctx, reg->start_pfn + i * stride, kctx->aliasing_sink_page, + alloc->imported.alias.aliased[i].length, -+ (reg->flags & mask & gwt_mask) | attr, -+ group_id); ++ (reg->flags & mask & gwt_mask) | attr, group_id, ++ mmu_sync_info); + + if (err) -+ goto bad_insert; ++ goto bad_aliased_insert; + } + } + } else { -+ err = kbase_mmu_insert_pages(kctx->kbdev, -+ &kctx->mmu, -+ reg->start_pfn, -+ kbase_get_gpu_phy_pages(reg), -+ kbase_reg_current_backed_size(reg), -+ reg->flags & gwt_mask, -+ kctx->as_nr, -+ group_id); ++ if (reg->gpu_alloc->type == KBASE_MEM_TYPE_IMPORTED_UMM || ++ reg->gpu_alloc->type == KBASE_MEM_TYPE_IMPORTED_USER_BUF) { ++ ++ err = kbase_mmu_insert_imported_pages( ++ kctx->kbdev, &kctx->mmu, reg->start_pfn, ++ kbase_get_gpu_phy_pages(reg), kbase_reg_current_backed_size(reg), ++ reg->flags & gwt_mask, kctx->as_nr, group_id, mmu_sync_info, reg); ++ } else { ++ err = kbase_mmu_insert_pages(kctx->kbdev, &kctx->mmu, reg->start_pfn, ++ kbase_get_gpu_phy_pages(reg), ++ kbase_reg_current_backed_size(reg), ++ reg->flags & gwt_mask, kctx->as_nr, group_id, ++ mmu_sync_info, reg, true); ++ } ++ + if (err) + goto bad_insert; + kbase_mem_phy_alloc_gpu_mapped(alloc); @@ -223207,9 +258072,9 @@ index 000000000000..82a799c2d673 + !WARN_ON(reg->nr_pages < reg->gpu_alloc->nents) && + reg->gpu_alloc->type == KBASE_MEM_TYPE_IMPORTED_UMM && + reg->gpu_alloc->imported.umm.current_mapping_usage_count) { -+ /* For padded imported dma-buf memory, map the dummy aliasing -+ * page from the end of the dma-buf pages, to the end of the -+ * region using a read only mapping. ++ /* For padded imported dma-buf or user-buf memory, map the dummy ++ * aliasing page from the end of the imported pages, to the end of ++ * the region using a read only mapping. + * + * Only map when it's imported dma-buf memory that is currently + * mapped. @@ -223217,45 +258082,46 @@ index 000000000000..82a799c2d673 + * Assume reg->gpu_alloc->nents is the number of actual pages + * in the dma-buf memory. + */ -+ err = kbase_mmu_insert_single_page(kctx, -+ reg->start_pfn + reg->gpu_alloc->nents, -+ kctx->aliasing_sink_page, -+ reg->nr_pages - reg->gpu_alloc->nents, -+ (reg->flags | KBASE_REG_GPU_RD) & -+ ~KBASE_REG_GPU_WR, -+ KBASE_MEM_GROUP_SINK); ++ err = kbase_mmu_insert_single_imported_page( ++ kctx, reg->start_pfn + reg->gpu_alloc->nents, kctx->aliasing_sink_page, ++ reg->nr_pages - reg->gpu_alloc->nents, ++ (reg->flags | KBASE_REG_GPU_RD) & ~KBASE_REG_GPU_WR, KBASE_MEM_GROUP_SINK, ++ mmu_sync_info); + if (err) + goto bad_insert; + } + + return err; + -+bad_insert: -+ kbase_mmu_teardown_pages(kctx->kbdev, &kctx->mmu, -+ reg->start_pfn, reg->nr_pages, -+ kctx->as_nr); ++bad_aliased_insert: ++ while (i-- > 0) { ++ struct tagged_addr *phys_alloc = NULL; ++ u64 const stride = alloc->imported.alias.stride; + -+ if (alloc->type == KBASE_MEM_TYPE_ALIAS) { -+ KBASE_DEBUG_ASSERT(alloc->imported.alias.aliased); -+ while (i--) -+ if (alloc->imported.alias.aliased[i].alloc) -+ kbase_mem_phy_alloc_gpu_unmapped(alloc->imported.alias.aliased[i].alloc); -+ } ++ if (alloc->imported.alias.aliased[i].alloc != NULL) ++ phys_alloc = alloc->imported.alias.aliased[i].alloc->pages + ++ alloc->imported.alias.aliased[i].offset; + -+ kbase_remove_va_region(reg); ++ kbase_mmu_teardown_pages(kctx->kbdev, &kctx->mmu, reg->start_pfn + (i * stride), ++ phys_alloc, alloc->imported.alias.aliased[i].length, ++ alloc->imported.alias.aliased[i].length, kctx->as_nr, ++ false); ++ } ++bad_insert: ++ kbase_remove_va_region(kctx->kbdev, reg); + + return err; +} + +KBASE_EXPORT_TEST_API(kbase_gpu_mmap); + -+static void kbase_jd_user_buf_unmap(struct kbase_context *kctx, -+ struct kbase_mem_phy_alloc *alloc, bool writeable); ++static void kbase_jd_user_buf_unmap(struct kbase_context *kctx, struct kbase_mem_phy_alloc *alloc, ++ struct kbase_va_region *reg, bool writeable); + +int kbase_gpu_munmap(struct kbase_context *kctx, struct kbase_va_region *reg) +{ + int err = 0; -+ size_t i; ++ struct kbase_mem_phy_alloc *alloc; + + if (reg->start_pfn == 0) + return 0; @@ -223263,44 +258129,98 @@ index 000000000000..82a799c2d673 + if (!reg->gpu_alloc) + return -EINVAL; + -+ /* Tear down down GPU page tables, depending on memory type. */ -+ switch (reg->gpu_alloc->type) { -+ case KBASE_MEM_TYPE_ALIAS: /* Fall-through */ -+ case KBASE_MEM_TYPE_IMPORTED_UMM: -+ err = kbase_mmu_teardown_pages(kctx->kbdev, &kctx->mmu, -+ reg->start_pfn, reg->nr_pages, kctx->as_nr); ++ alloc = reg->gpu_alloc; ++ ++ /* Tear down GPU page tables, depending on memory type. */ ++ switch (alloc->type) { ++ case KBASE_MEM_TYPE_ALIAS: { ++ size_t i = 0; ++ /* Due to the way the number of valid PTEs and ATEs are tracked ++ * currently, only the GPU virtual range that is backed & mapped ++ * should be passed to the kbase_mmu_teardown_pages() function, ++ * hence individual aliased regions needs to be unmapped ++ * separately. ++ */ ++ for (i = 0; i < alloc->imported.alias.nents; i++) { ++ struct tagged_addr *phys_alloc = NULL; ++ int err_loop; ++ ++ if (alloc->imported.alias.aliased[i].alloc != NULL) ++ phys_alloc = alloc->imported.alias.aliased[i].alloc->pages + ++ alloc->imported.alias.aliased[i].offset; ++ ++ err_loop = kbase_mmu_teardown_pages( ++ kctx->kbdev, &kctx->mmu, ++ reg->start_pfn + (i * alloc->imported.alias.stride), ++ phys_alloc, alloc->imported.alias.aliased[i].length, ++ alloc->imported.alias.aliased[i].length, kctx->as_nr, ++ false); ++ ++ if (WARN_ON_ONCE(err_loop)) ++ err = err_loop; ++ } ++ } + break; -+ default: -+ err = kbase_mmu_teardown_pages(kctx->kbdev, &kctx->mmu, -+ reg->start_pfn, kbase_reg_current_backed_size(reg), -+ kctx->as_nr); ++ case KBASE_MEM_TYPE_IMPORTED_UMM: { ++ size_t nr_phys_pages = reg->nr_pages; ++ size_t nr_virt_pages = reg->nr_pages; ++ /* If the region has import padding and falls under the threshold for ++ * issuing a partial GPU cache flush, we want to reduce the number of ++ * physical pages that get flushed. ++ ++ * This is symmetric with case of mapping the memory, which first maps ++ * each imported physical page to a separate virtual page, and then ++ * maps the single aliasing sink page to each of the virtual padding ++ * pages. ++ */ ++ if (reg->flags & KBASE_REG_IMPORT_PAD) ++ nr_phys_pages = alloc->nents + 1; ++ ++ err = kbase_mmu_teardown_pages(kctx->kbdev, &kctx->mmu, reg->start_pfn, ++ alloc->pages, nr_phys_pages, nr_virt_pages, ++ kctx->as_nr, true); ++ } ++ break; ++ case KBASE_MEM_TYPE_IMPORTED_USER_BUF: { ++ size_t nr_reg_pages = kbase_reg_current_backed_size(reg); ++ ++ err = kbase_mmu_teardown_pages(kctx->kbdev, &kctx->mmu, reg->start_pfn, ++ alloc->pages, nr_reg_pages, nr_reg_pages, ++ kctx->as_nr, true); ++ } ++ break; ++ default: { ++ size_t nr_reg_pages = kbase_reg_current_backed_size(reg); ++ ++ err = kbase_mmu_teardown_pages(kctx->kbdev, &kctx->mmu, reg->start_pfn, ++ alloc->pages, nr_reg_pages, nr_reg_pages, ++ kctx->as_nr, false); ++ } + break; + } + + /* Update tracking, and other cleanup, depending on memory type. */ -+ switch (reg->gpu_alloc->type) { ++ switch (alloc->type) { + case KBASE_MEM_TYPE_ALIAS: -+ KBASE_DEBUG_ASSERT(reg->gpu_alloc->imported.alias.aliased); -+ for (i = 0; i < reg->gpu_alloc->imported.alias.nents; i++) -+ if (reg->gpu_alloc->imported.alias.aliased[i].alloc) -+ kbase_mem_phy_alloc_gpu_unmapped(reg->gpu_alloc->imported.alias.aliased[i].alloc); ++ /* We mark the source allocs as unmapped from the GPU when ++ * putting reg's allocs ++ */ + break; + case KBASE_MEM_TYPE_IMPORTED_USER_BUF: { -+ struct kbase_alloc_import_user_buf *user_buf = -+ ®->gpu_alloc->imported.user_buf; ++ struct kbase_alloc_import_user_buf *user_buf = &alloc->imported.user_buf; + -+ if (user_buf->current_mapping_usage_count & PINNED_ON_IMPORT) { -+ user_buf->current_mapping_usage_count &= -+ ~PINNED_ON_IMPORT; ++ if (user_buf->current_mapping_usage_count & PINNED_ON_IMPORT) { ++ user_buf->current_mapping_usage_count &= ~PINNED_ON_IMPORT; + -+ /* The allocation could still have active mappings. */ -+ if (user_buf->current_mapping_usage_count == 0) { -+ kbase_jd_user_buf_unmap(kctx, reg->gpu_alloc, -+ (reg->flags & KBASE_REG_GPU_WR)); -+ } ++ /* The allocation could still have active mappings. */ ++ if (user_buf->current_mapping_usage_count == 0) { ++ kbase_jd_user_buf_unmap(kctx, alloc, reg, ++ (reg->flags & ++ (KBASE_REG_CPU_WR | KBASE_REG_GPU_WR))); + } + } -+ /* Fall-through */ ++ } ++ fallthrough; + default: + kbase_mem_phy_alloc_gpu_unmapped(reg->gpu_alloc); + break; @@ -223419,7 +258339,8 @@ index 000000000000..82a799c2d673 + BUG_ON(!cpu_page); + BUG_ON(offset + size > PAGE_SIZE); + -+ dma_addr = kbase_dma_addr(cpu_page) + offset; ++ dma_addr = kbase_dma_addr_from_tagged(t_cpu_pa) + offset; ++ + if (sync_fn == KBASE_SYNC_TO_CPU) + dma_sync_single_for_cpu(kctx->kbdev->dev, dma_addr, + size, DMA_BIDIRECTIONAL); @@ -223430,29 +258351,30 @@ index 000000000000..82a799c2d673 + void *src = NULL; + void *dst = NULL; + struct page *gpu_page; ++ dma_addr_t dma_addr; + + if (WARN(!gpu_pa, "No GPU PA found for infinite cache op")) + return; + + gpu_page = pfn_to_page(PFN_DOWN(gpu_pa)); ++ dma_addr = kbase_dma_addr_from_tagged(t_gpu_pa) + offset; + + if (sync_fn == KBASE_SYNC_TO_DEVICE) { + src = ((unsigned char *)kmap(cpu_page)) + offset; + dst = ((unsigned char *)kmap(gpu_page)) + offset; + } else if (sync_fn == KBASE_SYNC_TO_CPU) { -+ dma_sync_single_for_cpu(kctx->kbdev->dev, -+ kbase_dma_addr(gpu_page) + offset, -+ size, DMA_BIDIRECTIONAL); ++ dma_sync_single_for_cpu(kctx->kbdev->dev, dma_addr, size, ++ DMA_BIDIRECTIONAL); + src = ((unsigned char *)kmap(gpu_page)) + offset; + dst = ((unsigned char *)kmap(cpu_page)) + offset; + } ++ + memcpy(dst, src, size); + kunmap(gpu_page); + kunmap(cpu_page); + if (sync_fn == KBASE_SYNC_TO_DEVICE) -+ dma_sync_single_for_device(kctx->kbdev->dev, -+ kbase_dma_addr(gpu_page) + offset, -+ size, DMA_BIDIRECTIONAL); ++ dma_sync_single_for_device(kctx->kbdev->dev, dma_addr, size, ++ DMA_BIDIRECTIONAL); + } +} + @@ -223592,35 +258514,33 @@ index 000000000000..82a799c2d673 +{ + int err; + -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ KBASE_DEBUG_ASSERT(NULL != reg); -+ dev_dbg(kctx->kbdev->dev, "%s %p in kctx %p\n", ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(reg != NULL); ++ dev_dbg(kctx->kbdev->dev, "%s %pK in kctx %pK\n", + __func__, (void *)reg, (void *)kctx); + lockdep_assert_held(&kctx->reg_lock); + -+ if (reg->flags & KBASE_REG_NO_USER_FREE) { ++ if (kbase_va_region_is_no_user_free(reg)) { + dev_warn(kctx->kbdev->dev, "Attempt to free GPU memory whose freeing by user space is forbidden!\n"); + return -EINVAL; + } + -+ /* -+ * Unlink the physical allocation before unmaking it evictable so -+ * that the allocation isn't grown back to its last backed size -+ * as we're going to unmap it anyway. -+ */ -+ reg->cpu_alloc->reg = NULL; -+ if (reg->cpu_alloc != reg->gpu_alloc) -+ reg->gpu_alloc->reg = NULL; -+ -+ /* -+ * If a region has been made evictable then we must unmake it ++ /* If a region has been made evictable then we must unmake it + * before trying to free it. + * If the memory hasn't been reclaimed it will be unmapped and freed + * below, if it has been reclaimed then the operations below are no-ops. + */ + if (reg->flags & KBASE_REG_DONT_NEED) { -+ KBASE_DEBUG_ASSERT(reg->cpu_alloc->type == -+ KBASE_MEM_TYPE_NATIVE); ++ WARN_ON(reg->cpu_alloc->type != KBASE_MEM_TYPE_NATIVE); ++ mutex_lock(&kctx->jit_evict_lock); ++ /* Unlink the physical allocation before unmaking it evictable so ++ * that the allocation isn't grown back to its last backed size ++ * as we're going to unmap it anyway. ++ */ ++ reg->cpu_alloc->reg = NULL; ++ if (reg->cpu_alloc != reg->gpu_alloc) ++ reg->gpu_alloc->reg = NULL; ++ mutex_unlock(&kctx->jit_evict_lock); + kbase_mem_evictable_unmake(reg->gpu_alloc); + } + @@ -223630,20 +258550,35 @@ index 000000000000..82a799c2d673 + goto out; + } + ++#if MALI_USE_CSF ++ if (((reg->flags & KBASE_REG_ZONE_MASK) == KBASE_REG_ZONE_FIXED_VA) || ++ ((reg->flags & KBASE_REG_ZONE_MASK) == KBASE_REG_ZONE_EXEC_FIXED_VA)) { ++ if (reg->flags & KBASE_REG_FIXED_ADDRESS) ++ atomic64_dec(&kctx->num_fixed_allocs); ++ else ++ atomic64_dec(&kctx->num_fixable_allocs); ++ } ++#endif ++ + /* This will also free the physical pages */ + kbase_free_alloced_region(reg); + -+ out: ++out: + return err; +} + +KBASE_EXPORT_TEST_API(kbase_mem_free_region); + +/** -+ * @brief Free the region from the GPU and unregister it. ++ * kbase_mem_free - Free the region from the GPU and unregister it. ++ * ++ * @kctx: KBase context ++ * @gpu_addr: GPU address to free + * + * This function implements the free operation on a memory segment. + * It will loudly fail if called with outstanding mappings. ++ * ++ * Return: 0 on success. + */ +int kbase_mem_free(struct kbase_context *kctx, u64 gpu_addr) +{ @@ -223651,16 +258586,18 @@ index 000000000000..82a799c2d673 + struct kbase_va_region *reg; + + KBASE_DEBUG_ASSERT(kctx != NULL); -+ dev_dbg(kctx->kbdev->dev, "%s 0x%llx in kctx %p\n", ++ dev_dbg(kctx->kbdev->dev, "%s 0x%llx in kctx %pK\n", + __func__, gpu_addr, (void *)kctx); + + if ((gpu_addr & ~PAGE_MASK) && (gpu_addr >= PAGE_SIZE)) { -+ dev_warn(kctx->kbdev->dev, "kbase_mem_free: gpu_addr parameter is invalid"); ++ dev_warn(kctx->kbdev->dev, "%s: gpu_addr parameter is invalid", __func__); + return -EINVAL; + } + -+ if (0 == gpu_addr) { -+ dev_warn(kctx->kbdev->dev, "gpu_addr 0 is reserved for the ringbuffer and it's an error to try to free it using kbase_mem_free\n"); ++ if (gpu_addr == 0) { ++ dev_warn(kctx->kbdev->dev, ++ "gpu_addr 0 is reserved for the ringbuffer and it's an error to try to free it using %s\n", ++ __func__); + return -EINVAL; + } + kbase_gpu_vm_lock(kctx); @@ -223686,8 +258623,8 @@ index 000000000000..82a799c2d673 + /* Validate the region */ + reg = kbase_region_tracker_find_region_base_address(kctx, gpu_addr); + if (kbase_is_region_invalid_or_free(reg)) { -+ dev_warn(kctx->kbdev->dev, "kbase_mem_free called with nonexistent gpu_addr 0x%llX", -+ gpu_addr); ++ dev_warn(kctx->kbdev->dev, "%s called with nonexistent gpu_addr 0x%llX", ++ __func__, gpu_addr); + err = -EINVAL; + goto out_unlock; + } @@ -223702,7 +258639,7 @@ index 000000000000..82a799c2d673 + err = kbase_mem_free_region(kctx, reg); + } + -+ out_unlock: ++out_unlock: + kbase_gpu_vm_unlock(kctx); + return err; +} @@ -223712,7 +258649,7 @@ index 000000000000..82a799c2d673 +int kbase_update_region_flags(struct kbase_context *kctx, + struct kbase_va_region *reg, unsigned long flags) +{ -+ KBASE_DEBUG_ASSERT(NULL != reg); ++ KBASE_DEBUG_ASSERT(reg != NULL); + KBASE_DEBUG_ASSERT((flags & ~((1ul << BASE_MEM_FLAGS_NR_BITS) - 1)) == 0); + + reg->flags |= kbase_cache_enabled(flags, reg->nr_pages); @@ -223802,12 +258739,20 @@ index 000000000000..82a799c2d673 + if (flags & BASEP_MEM_PERMANENT_KERNEL_MAPPING) + reg->flags |= KBASE_REG_PERMANENT_KERNEL_MAPPING; + -+ if (flags & BASEP_MEM_NO_USER_FREE) -+ reg->flags |= KBASE_REG_NO_USER_FREE; ++ if (flags & BASEP_MEM_NO_USER_FREE) { ++ kbase_gpu_vm_lock(kctx); ++ kbase_va_region_no_user_free_inc(reg); ++ kbase_gpu_vm_unlock(kctx); ++ } + + if (flags & BASE_MEM_GPU_VA_SAME_4GB_PAGE) + reg->flags |= KBASE_REG_GPU_VA_SAME_4GB_PAGE; + ++#if MALI_USE_CSF ++ if (flags & BASE_MEM_FIXED) ++ reg->flags |= KBASE_REG_FIXED_ADDRESS; ++#endif ++ + return 0; +} + @@ -223844,23 +258789,20 @@ index 000000000000..82a799c2d673 + &kctx->kbdev->memdev.used_pages); + + /* Increase mm counters before we allocate pages so that this -+ * allocation is visible to the OOM killer */ ++ * allocation is visible to the OOM killer ++ */ + kbase_process_page_usage_inc(kctx, nr_pages_requested); + + tp = alloc->pages + alloc->nents; + -+#ifdef CONFIG_MALI_2MB_ALLOC + /* Check if we have enough pages requested so we can allocate a large + * page (512 * 4KB = 2MB ) + */ -+ if (nr_left >= (SZ_2M / SZ_4K)) { ++ if (kbdev->pagesize_2mb && nr_left >= (SZ_2M / SZ_4K)) { + int nr_lp = nr_left / (SZ_2M / SZ_4K); + -+ res = kbase_mem_pool_alloc_pages( -+ &kctx->mem_pools.large[alloc->group_id], -+ nr_lp * (SZ_2M / SZ_4K), -+ tp, -+ true); ++ res = kbase_mem_pool_alloc_pages(&kctx->mem_pools.large[alloc->group_id], ++ nr_lp * (SZ_2M / SZ_4K), tp, true, kctx->task); + + if (res > 0) { + nr_left -= res; @@ -223914,7 +258856,7 @@ index 000000000000..82a799c2d673 + + err = kbase_mem_pool_grow( + &kctx->mem_pools.large[alloc->group_id], -+ 1); ++ 1, kctx->task); + if (err) + break; + } while (1); @@ -223955,13 +258897,11 @@ index 000000000000..82a799c2d673 + } + } + } -+no_new_partial: -+#endif + ++no_new_partial: + if (nr_left) { -+ res = kbase_mem_pool_alloc_pages( -+ &kctx->mem_pools.small[alloc->group_id], -+ nr_left, tp, false); ++ res = kbase_mem_pool_alloc_pages(&kctx->mem_pools.small[alloc->group_id], nr_left, ++ tp, false, kctx->task); + if (res <= 0) + goto alloc_failed; + } @@ -224020,18 +258960,17 @@ index 000000000000..82a799c2d673 + + lockdep_assert_held(&pool->pool_lock); + -+#if !defined(CONFIG_MALI_2MB_ALLOC) -+ WARN_ON(pool->order); -+#endif ++ kctx = alloc->imported.native.kctx; ++ kbdev = kctx->kbdev; ++ ++ if (!kbdev->pagesize_2mb) ++ WARN_ON(pool->order); + + if (alloc->reg) { + if (nr_pages_requested > alloc->reg->nr_pages - alloc->nents) + goto invalid_request; + } + -+ kctx = alloc->imported.native.kctx; -+ kbdev = kctx->kbdev; -+ + lockdep_assert_held(&kctx->mem_partials_lock); + + if (nr_pages_requested == 0) @@ -224050,8 +258989,7 @@ index 000000000000..82a799c2d673 + tp = alloc->pages + alloc->nents; + new_pages = tp; + -+#ifdef CONFIG_MALI_2MB_ALLOC -+ if (pool->order) { ++ if (kbdev->pagesize_2mb && pool->order) { + int nr_lp = nr_left / (SZ_2M / SZ_4K); + + res = kbase_mem_pool_alloc_pages_locked(pool, @@ -224135,15 +259073,12 @@ index 000000000000..82a799c2d673 + if (nr_left) + goto alloc_failed; + } else { -+#endif + res = kbase_mem_pool_alloc_pages_locked(pool, + nr_left, + tp); + if (res <= 0) + goto alloc_failed; -+#ifdef CONFIG_MALI_2MB_ALLOC + } -+#endif + + KBASE_TLSTREAM_AUX_PAGESALLOC( + kbdev, @@ -224164,8 +259099,7 @@ index 000000000000..82a799c2d673 + + struct tagged_addr *start_free = alloc->pages + alloc->nents; + -+#ifdef CONFIG_MALI_2MB_ALLOC -+ if (pool->order) { ++ if (kbdev->pagesize_2mb && pool->order) { + while (nr_pages_to_free) { + if (is_huge_head(*start_free)) { + kbase_mem_pool_free_pages_locked( @@ -224183,15 +259117,12 @@ index 000000000000..82a799c2d673 + } + } + } else { -+#endif + kbase_mem_pool_free_pages_locked(pool, + nr_pages_to_free, + start_free, + false, /* not dirty */ + true); /* return to pool */ -+#ifdef CONFIG_MALI_2MB_ALLOC + } -+#endif + } + + kbase_process_page_usage_dec(kctx, nr_pages_requested); @@ -224248,7 +259179,7 @@ index 000000000000..82a799c2d673 + } + + /* early out if nothing to do */ -+ if (0 == nr_pages_to_free) ++ if (nr_pages_to_free == 0) + return 0; + + start_free = alloc->pages + alloc->nents - nr_pages_to_free; @@ -224447,11 +259378,19 @@ index 000000000000..82a799c2d673 + kbase_trace_gpu_mem_usage_dec(kctx->kbdev, kctx, freed); + } +} ++KBASE_EXPORT_TEST_API(kbase_free_phy_pages_helper_locked); + +#if MALI_USE_CSF +/** + * kbase_jd_user_buf_unpin_pages - Release the pinned pages of a user buffer. + * @alloc: The allocation for the imported user buffer. ++ * ++ * This must only be called when terminating an alloc, when its refcount ++ * (number of users) has become 0. This also ensures it is only called once all ++ * CPU mappings have been closed. ++ * ++ * Instead call kbase_jd_user_buf_unmap() if you need to unpin pages on active ++ * allocations + */ +static void kbase_jd_user_buf_unpin_pages(struct kbase_mem_phy_alloc *alloc); +#endif @@ -224496,8 +259435,10 @@ index 000000000000..82a799c2d673 + aliased = alloc->imported.alias.aliased; + if (aliased) { + for (i = 0; i < alloc->imported.alias.nents; i++) -+ if (aliased[i].alloc) ++ if (aliased[i].alloc) { ++ kbase_mem_phy_alloc_gpu_unmapped(aliased[i].alloc); + kbase_mem_phy_alloc_put(aliased[i].alloc); ++ } + vfree(aliased); + } + break; @@ -224548,7 +259489,7 @@ index 000000000000..82a799c2d673 + +int kbase_alloc_phy_pages(struct kbase_va_region *reg, size_t vsize, size_t size) +{ -+ KBASE_DEBUG_ASSERT(NULL != reg); ++ KBASE_DEBUG_ASSERT(reg != NULL); + KBASE_DEBUG_ASSERT(vsize > 0); + + /* validate user provided arguments */ @@ -224561,7 +259502,7 @@ index 000000000000..82a799c2d673 + if ((size_t) vsize > ((size_t) -1 / sizeof(*reg->cpu_alloc->pages))) + goto out_term; + -+ KBASE_DEBUG_ASSERT(0 != vsize); ++ KBASE_DEBUG_ASSERT(vsize != 0); + + if (kbase_alloc_phy_pages_helper(reg->cpu_alloc, size) != 0) + goto out_term; @@ -224580,9 +259521,32 @@ index 000000000000..82a799c2d673 +out_term: + return -1; +} -+ +KBASE_EXPORT_TEST_API(kbase_alloc_phy_pages); + ++void kbase_set_phy_alloc_page_status(struct kbase_mem_phy_alloc *alloc, ++ enum kbase_page_status status) ++{ ++ u32 i = 0; ++ ++ for (; i < alloc->nents; i++) { ++ struct tagged_addr phys = alloc->pages[i]; ++ struct kbase_page_metadata *page_md = kbase_page_private(as_page(phys)); ++ ++ /* Skip the 4KB page that is part of a large page, as the large page is ++ * excluded from the migration process. ++ */ ++ if (is_huge(phys) || is_partial(phys)) ++ continue; ++ ++ if (!page_md) ++ continue; ++ ++ spin_lock(&page_md->migrate_lock); ++ page_md->status = PAGE_STATUS_SET(page_md->status, (u8)status); ++ spin_unlock(&page_md->migrate_lock); ++ } ++} ++ +bool kbase_check_alloc_flags(unsigned long flags) +{ + /* Only known input flags should be set. */ @@ -224611,7 +259575,7 @@ index 000000000000..82a799c2d673 + +#if !MALI_USE_CSF + /* GPU executable memory also cannot have the top of its initial -+ * commit aligned to 'extent' ++ * commit aligned to 'extension' + */ + if ((flags & BASE_MEM_PROT_GPU_EX) && (flags & + BASE_MEM_TILER_ALIGN_TOP)) @@ -224633,7 +259597,8 @@ index 000000000000..82a799c2d673 +#endif /* !MALI_USE_CSF */ + + /* GPU should have at least read or write access otherwise there is no -+ reason for allocating. */ ++ * reason for allocating. ++ */ + if ((flags & (BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR)) == 0) + return false; + @@ -224641,18 +259606,27 @@ index 000000000000..82a799c2d673 + if ((flags & BASE_MEM_IMPORT_SHARED) == BASE_MEM_IMPORT_SHARED) + return false; + -+ /* BASE_MEM_IMPORT_SYNC_ON_MAP_UNMAP is only valid for imported -+ * memory */ ++ /* BASE_MEM_IMPORT_SYNC_ON_MAP_UNMAP is only valid for imported memory ++ */ + if ((flags & BASE_MEM_IMPORT_SYNC_ON_MAP_UNMAP) == + BASE_MEM_IMPORT_SYNC_ON_MAP_UNMAP) + return false; + + /* Should not combine BASE_MEM_COHERENT_LOCAL with -+ * BASE_MEM_COHERENT_SYSTEM */ ++ * BASE_MEM_COHERENT_SYSTEM ++ */ + if ((flags & (BASE_MEM_COHERENT_LOCAL | BASE_MEM_COHERENT_SYSTEM)) == + (BASE_MEM_COHERENT_LOCAL | BASE_MEM_COHERENT_SYSTEM)) + return false; + ++#if MALI_USE_CSF ++ if ((flags & BASE_MEM_SAME_VA) && (flags & (BASE_MEM_FIXABLE | BASE_MEM_FIXED))) ++ return false; ++ ++ if ((flags & BASE_MEM_FIXABLE) && (flags & BASE_MEM_FIXED)) ++ return false; ++#endif ++ + return true; +} + @@ -224674,14 +259648,19 @@ index 000000000000..82a799c2d673 + if (flags & BASE_MEM_GROW_ON_GPF) + return false; + -+#if !MALI_USE_CSF ++#if MALI_USE_CSF ++ /* Imported memory cannot be fixed */ ++ if ((flags & (BASE_MEM_FIXED | BASE_MEM_FIXABLE))) ++ return false; ++#else + /* Imported memory cannot be aligned to the end of its initial commit */ + if (flags & BASE_MEM_TILER_ALIGN_TOP) + return false; +#endif /* !MALI_USE_CSF */ + + /* GPU should have at least read or write access otherwise there is no -+ reason for importing. */ ++ * reason for importing. ++ */ + if ((flags & (BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR)) == 0) + return false; + @@ -224693,19 +259672,19 @@ index 000000000000..82a799c2d673 +} + +int kbase_check_alloc_sizes(struct kbase_context *kctx, unsigned long flags, -+ u64 va_pages, u64 commit_pages, u64 large_extent) ++ u64 va_pages, u64 commit_pages, u64 large_extension) +{ + struct device *dev = kctx->kbdev->dev; + int gpu_pc_bits = kctx->kbdev->gpu_props.props.core_props.log2_program_counter_size; + u64 gpu_pc_pages_max = 1ULL << gpu_pc_bits >> PAGE_SHIFT; + struct kbase_va_region test_reg; + -+ /* kbase_va_region's extent member can be of variable size, so check against that type */ -+ test_reg.extent = large_extent; ++ /* kbase_va_region's extension member can be of variable size, so check against that type */ ++ test_reg.extension = large_extension; + +#define KBASE_MSG_PRE "GPU allocation attempted with " + -+ if (0 == va_pages) { ++ if (va_pages == 0) { + dev_warn(dev, KBASE_MSG_PRE "0 va_pages!"); + return -EINVAL; + } @@ -224717,7 +259696,8 @@ index 000000000000..82a799c2d673 + } + + /* Note: commit_pages is checked against va_pages during -+ * kbase_alloc_phy_pages() */ ++ * kbase_alloc_phy_pages() ++ */ + + /* Limit GPU executable allocs to GPU PC size */ + if ((flags & BASE_MEM_PROT_GPU_EX) && (va_pages > gpu_pc_pages_max)) { @@ -224728,25 +259708,30 @@ index 000000000000..82a799c2d673 + return -EINVAL; + } + -+ if ((flags & BASE_MEM_GROW_ON_GPF) && (test_reg.extent == 0)) { -+ dev_warn(dev, KBASE_MSG_PRE "BASE_MEM_GROW_ON_GPF but extent == 0\n"); ++ if ((flags & BASE_MEM_GROW_ON_GPF) && (test_reg.extension == 0)) { ++ dev_warn(dev, KBASE_MSG_PRE ++ "BASE_MEM_GROW_ON_GPF but extension == 0\n"); + return -EINVAL; + } + +#if !MALI_USE_CSF -+ if ((flags & BASE_MEM_TILER_ALIGN_TOP) && (test_reg.extent == 0)) { -+ dev_warn(dev, KBASE_MSG_PRE "BASE_MEM_TILER_ALIGN_TOP but extent == 0\n"); ++ if ((flags & BASE_MEM_TILER_ALIGN_TOP) && (test_reg.extension == 0)) { ++ dev_warn(dev, KBASE_MSG_PRE ++ "BASE_MEM_TILER_ALIGN_TOP but extension == 0\n"); + return -EINVAL; + } + + if (!(flags & (BASE_MEM_GROW_ON_GPF | BASE_MEM_TILER_ALIGN_TOP)) && -+ test_reg.extent != 0) { -+ dev_warn(dev, KBASE_MSG_PRE "neither BASE_MEM_GROW_ON_GPF nor BASE_MEM_TILER_ALIGN_TOP set but extent != 0\n"); ++ test_reg.extension != 0) { ++ dev_warn( ++ dev, KBASE_MSG_PRE ++ "neither BASE_MEM_GROW_ON_GPF nor BASE_MEM_TILER_ALIGN_TOP set but extension != 0\n"); + return -EINVAL; + } +#else -+ if (!(flags & BASE_MEM_GROW_ON_GPF) && test_reg.extent != 0) { -+ dev_warn(dev, KBASE_MSG_PRE "BASE_MEM_GROW_ON_GPF not set but extent != 0\n"); ++ if (!(flags & BASE_MEM_GROW_ON_GPF) && test_reg.extension != 0) { ++ dev_warn(dev, KBASE_MSG_PRE ++ "BASE_MEM_GROW_ON_GPF not set but extension != 0\n"); + return -EINVAL; + } +#endif /* !MALI_USE_CSF */ @@ -224755,28 +259740,36 @@ index 000000000000..82a799c2d673 + /* BASE_MEM_TILER_ALIGN_TOP memory has a number of restrictions */ + if (flags & BASE_MEM_TILER_ALIGN_TOP) { +#define KBASE_MSG_PRE_FLAG KBASE_MSG_PRE "BASE_MEM_TILER_ALIGN_TOP and " -+ unsigned long small_extent; -+ -+ if (large_extent > BASE_MEM_TILER_ALIGN_TOP_EXTENT_MAX_PAGES) { -+ dev_warn(dev, KBASE_MSG_PRE_FLAG "extent==%lld pages exceeds limit %lld", -+ (unsigned long long)large_extent, -+ BASE_MEM_TILER_ALIGN_TOP_EXTENT_MAX_PAGES); ++ unsigned long small_extension; ++ ++ if (large_extension > ++ BASE_MEM_TILER_ALIGN_TOP_EXTENSION_MAX_PAGES) { ++ dev_warn(dev, ++ KBASE_MSG_PRE_FLAG ++ "extension==%lld pages exceeds limit %lld", ++ (unsigned long long)large_extension, ++ BASE_MEM_TILER_ALIGN_TOP_EXTENSION_MAX_PAGES); + return -EINVAL; + } + /* For use with is_power_of_2, which takes unsigned long, so -+ * must ensure e.g. on 32-bit kernel it'll fit in that type */ -+ small_extent = (unsigned long)large_extent; ++ * must ensure e.g. on 32-bit kernel it'll fit in that type ++ */ ++ small_extension = (unsigned long)large_extension; + -+ if (!is_power_of_2(small_extent)) { -+ dev_warn(dev, KBASE_MSG_PRE_FLAG "extent==%ld not a non-zero power of 2", -+ small_extent); ++ if (!is_power_of_2(small_extension)) { ++ dev_warn(dev, ++ KBASE_MSG_PRE_FLAG ++ "extension==%ld not a non-zero power of 2", ++ small_extension); + return -EINVAL; + } + -+ if (commit_pages > large_extent) { -+ dev_warn(dev, KBASE_MSG_PRE_FLAG "commit_pages==%ld exceeds extent==%ld", -+ (unsigned long)commit_pages, -+ (unsigned long)large_extent); ++ if (commit_pages > large_extension) { ++ dev_warn(dev, ++ KBASE_MSG_PRE_FLAG ++ "commit_pages==%ld exceeds extension==%ld", ++ (unsigned long)commit_pages, ++ (unsigned long)large_extension); + return -EINVAL; + } +#undef KBASE_MSG_PRE_FLAG @@ -224794,9 +259787,6 @@ index 000000000000..82a799c2d673 +#undef KBASE_MSG_PRE +} + -+/** -+ * @brief Acquire the per-context region list lock -+ */ +void kbase_gpu_vm_lock(struct kbase_context *kctx) +{ + KBASE_DEBUG_ASSERT(kctx != NULL); @@ -224805,9 +259795,6 @@ index 000000000000..82a799c2d673 + +KBASE_EXPORT_TEST_API(kbase_gpu_vm_lock); + -+/** -+ * @brief Release the per-context region list lock -+ */ +void kbase_gpu_vm_unlock(struct kbase_context *kctx) +{ + KBASE_DEBUG_ASSERT(kctx != NULL); @@ -224816,9 +259803,9 @@ index 000000000000..82a799c2d673 + +KBASE_EXPORT_TEST_API(kbase_gpu_vm_unlock); + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) +struct kbase_jit_debugfs_data { -+ int (*func)(struct kbase_jit_debugfs_data *); ++ int (*func)(struct kbase_jit_debugfs_data *data); + struct mutex lock; + struct kbase_context *kctx; + u64 active_value; @@ -224869,7 +259856,7 @@ index 000000000000..82a799c2d673 + } + + size = scnprintf(data->buffer, sizeof(data->buffer), -+ "%llu,%llu,%llu", data->active_value, ++ "%llu,%llu,%llu\n", data->active_value, + data->pool_value, data->destroy_value); + } + @@ -225041,14 +260028,9 @@ index 000000000000..82a799c2d673 +void kbase_jit_debugfs_init(struct kbase_context *kctx) +{ + /* prevent unprivileged use of debug file system -+ * in old kernel version -+ */ -+#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE) -+ /* only for newer kernel version debug file system is safe */ ++ * in old kernel version ++ */ + const mode_t mode = 0444; -+#else -+ const mode_t mode = 0400; -+#endif + + /* Caller already ensures this, but we keep the pattern for + * maintenance safety. @@ -225122,7 +260104,15 @@ index 000000000000..82a799c2d673 + mutex_unlock(&kctx->jit_evict_lock); + + kbase_gpu_vm_lock(kctx); -+ reg->flags &= ~KBASE_REG_NO_USER_FREE; ++ ++ /* ++ * Incrementing the refcount is prevented on JIT regions. ++ * If/when this ever changes we would need to compensate ++ * by implementing "free on putting the last reference", ++ * but only for JIT regions. ++ */ ++ WARN_ON(atomic_read(®->no_user_free_count) > 1); ++ kbase_va_region_no_user_free_dec(reg); + kbase_mem_free_region(kctx, reg); + kbase_gpu_vm_unlock(kctx); + } while (1); @@ -225137,6 +260127,7 @@ index 000000000000..82a799c2d673 + INIT_WORK(&kctx->jit_work, kbase_jit_destroy_worker); + +#if MALI_USE_CSF ++ mutex_init(&kctx->csf.kcpu_queues.jit_lock); + INIT_LIST_HEAD(&kctx->csf.kcpu_queues.jit_cmds_head); + INIT_LIST_HEAD(&kctx->csf.kcpu_queues.jit_blocked_queues); +#else /* !MALI_USE_CSF */ @@ -225167,7 +260158,7 @@ index 000000000000..82a799c2d673 + +#if !MALI_USE_CSF + if (meet_reqs && (info->flags & BASE_JIT_ALLOC_MEM_TILER_ALIGN_TOP)) { -+ size_t align = info->extent; ++ size_t align = info->extension; + size_t align_mask = align - 1; + + if ((walker->start_pfn + info->commit_pages) & align_mask) @@ -225222,20 +260213,20 @@ index 000000000000..82a799c2d673 + KBASE_GPU_ALLOCATED_OBJECT_ALIGN_BYTES); + } else if (reg->flags & KBASE_REG_TILER_ALIGN_TOP) { + /* The GPU could report being ready to write to the next -+ * 'extent' sized chunk, but didn't actually write to it, so we -+ * can report up to 'extent' size pages more than the backed ++ * 'extension' sized chunk, but didn't actually write to it, so we ++ * can report up to 'extension' size pages more than the backed + * size. + * + * Note, this is allowed to exceed reg->nr_pages. + */ -+ max_allowed_pages += reg->extent; ++ max_allowed_pages += reg->extension; + + /* Also note that in these GPUs, the GPU may make a large (>1 + * page) initial allocation but not actually write out to all + * of it. Hence it might report that a much higher amount of + * memory was used than actually was written to. This does not + * result in a real warning because on growing this memory we -+ * round up the size of the allocation up to an 'extent' sized ++ * round up the size of the allocation up to an 'extension' sized + * chunk, hence automatically bringing the backed size up to + * the reported size. + */ @@ -225351,7 +260342,8 @@ index 000000000000..82a799c2d673 +static int kbase_jit_grow(struct kbase_context *kctx, + const struct base_jit_alloc_info *info, + struct kbase_va_region *reg, -+ struct kbase_sub_alloc **prealloc_sas) ++ struct kbase_sub_alloc **prealloc_sas, ++ enum kbase_caller_mmu_sync_info mmu_sync_info) +{ + size_t delta; + size_t pages_required; @@ -225381,18 +260373,14 @@ index 000000000000..82a799c2d673 + delta = info->commit_pages - reg->gpu_alloc->nents; + pages_required = delta; + -+#ifdef CONFIG_MALI_2MB_ALLOC -+ if (pages_required >= (SZ_2M / SZ_4K)) { ++ if (kctx->kbdev->pagesize_2mb && pages_required >= (SZ_2M / SZ_4K)) { + pool = &kctx->mem_pools.large[kctx->jit_group_id]; + /* Round up to number of 2 MB pages required */ + pages_required += ((SZ_2M / SZ_4K) - 1); + pages_required /= (SZ_2M / SZ_4K); + } else { -+#endif + pool = &kctx->mem_pools.small[kctx->jit_group_id]; -+#ifdef CONFIG_MALI_2MB_ALLOC + } -+#endif + + if (reg->cpu_alloc != reg->gpu_alloc) + pages_required *= 2; @@ -225413,7 +260401,7 @@ index 000000000000..82a799c2d673 + spin_unlock(&kctx->mem_partials_lock); + + kbase_gpu_vm_unlock(kctx); -+ ret = kbase_mem_pool_grow(pool, pool_delta); ++ ret = kbase_mem_pool_grow(pool, pool_delta, kctx->task); + kbase_gpu_vm_lock(kctx); + + if (ret) @@ -225448,7 +260436,7 @@ index 000000000000..82a799c2d673 + spin_unlock(&kctx->mem_partials_lock); + + ret = kbase_mem_grow_gpu_mapping(kctx, reg, info->commit_pages, -+ old_size); ++ old_size, mmu_sync_info); + /* + * The grow failed so put the allocation back in the + * pool and return failure. @@ -225461,7 +260449,7 @@ index 000000000000..82a799c2d673 + + /* Update attributes of JIT allocation taken from the pool */ + reg->initial_commit = info->commit_pages; -+ reg->extent = info->extent; ++ reg->extension = info->extension; + +update_failed: + return ret; @@ -225573,11 +260561,11 @@ index 000000000000..82a799c2d673 + const struct base_jit_alloc_info *info, + bool ignore_pressure_limit) +{ -+#if MALI_USE_CSF -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); -+#else ++#if !MALI_USE_CSF + lockdep_assert_held(&kctx->jctx.lock); -+#endif ++#else /* MALI_USE_CSF */ ++ lockdep_assert_held(&kctx->csf.kcpu_queues.jit_lock); ++#endif /* !MALI_USE_CSF */ + +#if MALI_JIT_PRESSURE_LIMIT_BASE + if (!ignore_pressure_limit && @@ -225663,23 +260651,28 @@ index 000000000000..82a799c2d673 + struct kbase_sub_alloc *prealloc_sas[2] = { NULL, NULL }; + int i; + -+#if MALI_USE_CSF -+ lockdep_assert_held(&kctx->csf.kcpu_queues.lock); -+#else ++ /* Calls to this function are inherently synchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_SYNC; ++ ++#if !MALI_USE_CSF + lockdep_assert_held(&kctx->jctx.lock); -+#endif ++#else /* MALI_USE_CSF */ ++ lockdep_assert_held(&kctx->csf.kcpu_queues.jit_lock); ++#endif /* !MALI_USE_CSF */ + + if (!jit_allow_allocate(kctx, info, ignore_pressure_limit)) + return NULL; + -+#ifdef CONFIG_MALI_2MB_ALLOC -+ /* Preallocate memory for the sub-allocation structs */ -+ for (i = 0; i != ARRAY_SIZE(prealloc_sas); ++i) { -+ prealloc_sas[i] = kmalloc(sizeof(*prealloc_sas[i]), GFP_KERNEL); -+ if (!prealloc_sas[i]) -+ goto end; ++ if (kctx->kbdev->pagesize_2mb) { ++ /* Preallocate memory for the sub-allocation structs */ ++ for (i = 0; i != ARRAY_SIZE(prealloc_sas); ++i) { ++ prealloc_sas[i] = kmalloc(sizeof(*prealloc_sas[i]), GFP_KERNEL); ++ if (!prealloc_sas[i]) ++ goto end; ++ } + } -+#endif + + kbase_gpu_vm_lock(kctx); + mutex_lock(&kctx->jit_evict_lock); @@ -225755,7 +260748,8 @@ index 000000000000..82a799c2d673 + * so any state protected by that lock might need to be + * re-evaluated if more code is added here in future. + */ -+ ret = kbase_jit_grow(kctx, info, reg, prealloc_sas); ++ ret = kbase_jit_grow(kctx, info, reg, prealloc_sas, ++ mmu_sync_info); + +#if MALI_JIT_PRESSURE_LIMIT_BASE + if (!ignore_pressure_limit) @@ -225767,7 +260761,7 @@ index 000000000000..82a799c2d673 + if (ret < 0) { + /* + * An update to an allocation from the pool failed, -+ * chances are slim a new allocation would fair any ++ * chances are slim a new allocation would fare any + * better so return the allocation to the pool and + * return the function with failure. + */ @@ -225789,6 +260783,17 @@ index 000000000000..82a799c2d673 + mutex_unlock(&kctx->jit_evict_lock); + reg = NULL; + goto end; ++ } else { ++ /* A suitable JIT allocation existed on the evict list, so we need ++ * to make sure that the NOT_MOVABLE property is cleared. ++ */ ++ if (kbase_page_migration_enabled) { ++ kbase_gpu_vm_lock(kctx); ++ mutex_lock(&kctx->jit_evict_lock); ++ kbase_set_phy_alloc_page_status(reg->gpu_alloc, ALLOCATED_MAPPED); ++ mutex_unlock(&kctx->jit_evict_lock); ++ kbase_gpu_vm_unlock(kctx); ++ } + } + } else { + /* No suitable JIT allocation was found so create a new one */ @@ -225803,7 +260808,7 @@ index 000000000000..82a799c2d673 + flags |= BASE_MEM_TILER_ALIGN_TOP; +#endif /* !MALI_USE_CSF */ + -+ flags |= base_mem_group_id_set(kctx->jit_group_id); ++ flags |= kbase_mem_group_id_set(kctx->jit_group_id); +#if MALI_JIT_PRESSURE_LIMIT_BASE + if (!ignore_pressure_limit) { + flags |= BASEP_MEM_PERFORM_JIT_TRIM; @@ -225818,8 +260823,8 @@ index 000000000000..82a799c2d673 + mutex_unlock(&kctx->jit_evict_lock); + kbase_gpu_vm_unlock(kctx); + -+ reg = kbase_mem_alloc(kctx, info->va_pages, info->commit_pages, -+ info->extent, &flags, &gpu_addr); ++ reg = kbase_mem_alloc(kctx, info->va_pages, info->commit_pages, info->extension, ++ &flags, &gpu_addr, mmu_sync_info); + if (!reg) { + /* Most likely not enough GPU virtual space left for + * the new JIT allocation. @@ -225845,6 +260850,29 @@ index 000000000000..82a799c2d673 + } + } + ++ /* Similarly to tiler heap init, there is a short window of time ++ * where the (either recycled or newly allocated, in our case) region has ++ * "no user free" count incremented but is still missing the DONT_NEED flag, and ++ * doesn't yet have the ACTIVE_JIT_ALLOC flag either. Temporarily leaking the ++ * allocation is the least bad option that doesn't lead to a security issue down the ++ * line (it will eventually be cleaned up during context termination). ++ * ++ * We also need to call kbase_gpu_vm_lock regardless, as we're updating the region ++ * flags. ++ */ ++ kbase_gpu_vm_lock(kctx); ++ if (unlikely(atomic_read(®->no_user_free_count) > 1)) { ++ kbase_gpu_vm_unlock(kctx); ++ dev_err(kctx->kbdev->dev, "JIT region has no_user_free_count > 1!\n"); ++ ++ mutex_lock(&kctx->jit_evict_lock); ++ list_move(®->jit_node, &kctx->jit_pool_head); ++ mutex_unlock(&kctx->jit_evict_lock); ++ ++ reg = NULL; ++ goto end; ++ } ++ + trace_mali_jit_alloc(reg, info->id); + + kctx->jit_current_allocations++; @@ -225862,6 +260890,7 @@ index 000000000000..82a799c2d673 + kbase_jit_report_update_pressure(kctx, reg, info->va_pages, + KBASE_JIT_REPORT_ON_ALLOC_OR_FREE); +#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ ++ kbase_gpu_vm_unlock(kctx); + +end: + for (i = 0; i != ARRAY_SIZE(prealloc_sas); ++i) @@ -225874,6 +260903,12 @@ index 000000000000..82a799c2d673 +{ + u64 old_pages; + ++#if !MALI_USE_CSF ++ lockdep_assert_held(&kctx->jctx.lock); ++#else /* MALI_USE_CSF */ ++ lockdep_assert_held(&kctx->csf.kcpu_queues.jit_lock); ++#endif /* !MALI_USE_CSF */ ++ + /* JIT id not immediately available here, so use 0u */ + trace_mali_jit_free(reg, 0u); + @@ -225887,8 +260922,11 @@ index 000000000000..82a799c2d673 + div_u64(old_pages * (100 - kctx->trim_level), 100)); + u64 delta = old_pages - new_size; + -+ if (delta) ++ if (delta) { ++ mutex_lock(&kctx->reg_lock); + kbase_mem_shrink(kctx, reg, old_pages - delta); ++ mutex_unlock(&kctx->reg_lock); ++ } + } + +#if MALI_JIT_PRESSURE_LIMIT_BASE @@ -225919,9 +260957,16 @@ index 000000000000..82a799c2d673 + /* This allocation can't already be on a list. */ + WARN_ON(!list_empty(®->gpu_alloc->evict_node)); + list_add(®->gpu_alloc->evict_node, &kctx->evict_list); ++ atomic_add(reg->gpu_alloc->nents, &kctx->evict_nents); + + list_move(®->jit_node, &kctx->jit_pool_head); + ++ /* Inactive JIT regions should be freed by the shrinker and not impacted ++ * by page migration. Once freed, they will enter into the page migration ++ * state machine via the mempools. ++ */ ++ if (kbase_page_migration_enabled) ++ kbase_set_phy_alloc_page_status(reg->gpu_alloc, NOT_MOVABLE); + mutex_unlock(&kctx->jit_evict_lock); +} + @@ -225968,7 +261013,14 @@ index 000000000000..82a799c2d673 + mutex_unlock(&kctx->jit_evict_lock); + + if (reg) { -+ reg->flags &= ~KBASE_REG_NO_USER_FREE; ++ /* ++ * Incrementing the refcount is prevented on JIT regions. ++ * If/when this ever changes we would need to compensate ++ * by implementing "free on putting the last reference", ++ * but only for JIT regions. ++ */ ++ WARN_ON(atomic_read(®->no_user_free_count) > 1); ++ kbase_va_region_no_user_free_dec(reg); + kbase_mem_free_region(kctx, reg); + } + @@ -225990,7 +261042,14 @@ index 000000000000..82a799c2d673 + list_del(&walker->jit_node); + list_del_init(&walker->gpu_alloc->evict_node); + mutex_unlock(&kctx->jit_evict_lock); -+ walker->flags &= ~KBASE_REG_NO_USER_FREE; ++ /* ++ * Incrementing the refcount is prevented on JIT regions. ++ * If/when this ever changes we would need to compensate ++ * by implementing "free on putting the last reference", ++ * but only for JIT regions. ++ */ ++ WARN_ON(atomic_read(&walker->no_user_free_count) > 1); ++ kbase_va_region_no_user_free_dec(walker); + kbase_mem_free_region(kctx, walker); + mutex_lock(&kctx->jit_evict_lock); + } @@ -226002,7 +261061,14 @@ index 000000000000..82a799c2d673 + list_del(&walker->jit_node); + list_del_init(&walker->gpu_alloc->evict_node); + mutex_unlock(&kctx->jit_evict_lock); -+ walker->flags &= ~KBASE_REG_NO_USER_FREE; ++ /* ++ * Incrementing the refcount is prevented on JIT regions. ++ * If/when this ever changes we would need to compensate ++ * by implementing "free on putting the last reference", ++ * but only for JIT regions. ++ */ ++ WARN_ON(atomic_read(&walker->no_user_free_count) > 1); ++ kbase_va_region_no_user_free_dec(walker); + kbase_mem_free_region(kctx, walker); + mutex_lock(&kctx->jit_evict_lock); + } @@ -226045,8 +261111,8 @@ index 000000000000..82a799c2d673 + + addr_start = reg->heap_info_gpu_addr - jit_report_gpu_mem_offset; + -+ ptr = kbase_vmap(kctx, addr_start, KBASE_JIT_REPORT_GPU_MEM_SIZE, -+ &mapping); ++ ptr = kbase_vmap_prot(kctx, addr_start, KBASE_JIT_REPORT_GPU_MEM_SIZE, ++ KBASE_REG_CPU_RD, &mapping); + if (!ptr) { + dev_warn(kctx->kbdev->dev, + "%s: JIT start=0x%llx unable to map memory near end pointer %llx\n", @@ -226104,28 +261170,44 @@ index 000000000000..82a799c2d673 +} +#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ + -+bool kbase_has_exec_va_zone(struct kbase_context *kctx) ++void kbase_unpin_user_buf_page(struct page *page) +{ -+ bool has_exec_va_zone; -+ -+ kbase_gpu_vm_lock(kctx); -+ has_exec_va_zone = (kctx->exec_va_start != U64_MAX); -+ kbase_gpu_vm_unlock(kctx); -+ -+ return has_exec_va_zone; ++#if KERNEL_VERSION(5, 9, 0) > LINUX_VERSION_CODE ++ put_page(page); ++#else ++ unpin_user_page(page); ++#endif +} + +#if MALI_USE_CSF +static void kbase_jd_user_buf_unpin_pages(struct kbase_mem_phy_alloc *alloc) +{ -+ if (alloc->nents) { ++ /* In CSF builds, we keep pages pinned until the last reference is ++ * released on the alloc. A refcount of 0 also means we can be sure ++ * that all CPU mappings have been closed on this alloc, and no more ++ * mappings of it will be created. ++ * ++ * Further, the WARN() below captures the restriction that this ++ * function will not handle anything other than the alloc termination ++ * path, because the caller of kbase_mem_phy_alloc_put() is not ++ * required to hold the kctx's reg_lock, and so we could not handle ++ * removing an existing CPU mapping here. ++ * ++ * Refer to this function's kernel-doc comments for alternatives for ++ * unpinning a User buffer. ++ */ ++ ++ if (alloc->nents && !WARN(kref_read(&alloc->kref) != 0, ++ "must only be called on terminating an allocation")) { + struct page **pages = alloc->imported.user_buf.pages; + long i; + + WARN_ON(alloc->nents != alloc->imported.user_buf.nr_pages); + + for (i = 0; i < alloc->nents; i++) -+ put_page(pages[i]); ++ kbase_unpin_user_buf_page(pages[i]); ++ ++ alloc->nents = 0; + } +} +#endif @@ -226139,6 +261221,9 @@ index 000000000000..82a799c2d673 + struct mm_struct *mm = alloc->imported.user_buf.mm; + long pinned_pages; + long i; ++ int write; ++ ++ lockdep_assert_held(&kctx->reg_lock); + + if (WARN_ON(alloc->type != KBASE_MEM_TYPE_IMPORTED_USER_BUF)) + return -EINVAL; @@ -226153,50 +261238,28 @@ index 000000000000..82a799c2d673 + if (WARN_ON(reg->gpu_alloc->imported.user_buf.mm != current->mm)) + return -EINVAL; + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ pinned_pages = get_user_pages(NULL, mm, -+ address, -+ alloc->imported.user_buf.nr_pages, -+#if KERNEL_VERSION(4, 4, 168) <= LINUX_VERSION_CODE && \ -+KERNEL_VERSION(4, 5, 0) > LINUX_VERSION_CODE -+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, -+ pages, NULL); -+#else -+ reg->flags & KBASE_REG_GPU_WR, -+ 0, pages, NULL); -+#endif -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) -+ pinned_pages = get_user_pages_remote(NULL, mm, -+ address, -+ alloc->imported.user_buf.nr_pages, -+ reg->flags & KBASE_REG_GPU_WR, -+ 0, pages, NULL); -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+ pinned_pages = get_user_pages_remote(NULL, mm, -+ address, -+ alloc->imported.user_buf.nr_pages, -+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, -+ pages, NULL); -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0) -+ pinned_pages = get_user_pages_remote(NULL, mm, -+ address, -+ alloc->imported.user_buf.nr_pages, -+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, -+ pages, NULL, NULL); ++ write = reg->flags & (KBASE_REG_CPU_WR | KBASE_REG_GPU_WR); ++ ++#if KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE ++ pinned_pages = get_user_pages_remote(NULL, mm, address, alloc->imported.user_buf.nr_pages, ++ write ? FOLL_WRITE : 0, pages, NULL); ++#elif KERNEL_VERSION(5, 9, 0) > LINUX_VERSION_CODE ++ pinned_pages = get_user_pages_remote(NULL, mm, address, alloc->imported.user_buf.nr_pages, ++ write ? FOLL_WRITE : 0, pages, NULL, NULL); +#else -+ pinned_pages = get_user_pages_remote(mm, -+ address, -+ alloc->imported.user_buf.nr_pages, -+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, -+ pages, NULL, NULL); ++ pinned_pages = pin_user_pages_remote(mm, address, alloc->imported.user_buf.nr_pages, ++ write ? FOLL_WRITE : 0, pages, NULL, NULL); +#endif + + if (pinned_pages <= 0) + return pinned_pages; + + if (pinned_pages != alloc->imported.user_buf.nr_pages) { ++ /* Above code already ensures there will not have been a CPU ++ * mapping by ensuring alloc->nents is 0 ++ */ + for (i = 0; i < pinned_pages; i++) -+ put_page(pages[i]); ++ kbase_unpin_user_buf_page(pages[i]); + return -ENOMEM; + } + @@ -226208,46 +261271,64 @@ index 000000000000..82a799c2d673 +static int kbase_jd_user_buf_map(struct kbase_context *kctx, + struct kbase_va_region *reg) +{ -+ long pinned_pages; ++ int err; ++ long pinned_pages = 0; + struct kbase_mem_phy_alloc *alloc; + struct page **pages; + struct tagged_addr *pa; -+ long i; -+ unsigned long address; ++ long i, dma_mapped_pages; + struct device *dev; -+ unsigned long offset; -+ unsigned long local_size; + unsigned long gwt_mask = ~0; -+ int err = kbase_jd_user_buf_pin_pages(kctx, reg); ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; ++ ++ lockdep_assert_held(&kctx->reg_lock); ++ ++ err = kbase_jd_user_buf_pin_pages(kctx, reg); + + if (err) + return err; + + alloc = reg->gpu_alloc; + pa = kbase_get_gpu_phy_pages(reg); -+ address = alloc->imported.user_buf.address; + pinned_pages = alloc->nents; + pages = alloc->imported.user_buf.pages; + dev = kctx->kbdev->dev; -+ offset = address & ~PAGE_MASK; -+ local_size = alloc->imported.user_buf.size; + ++ /* Manual CPU cache synchronization. ++ * ++ * The driver disables automatic CPU cache synchronization because the ++ * memory pages that enclose the imported region may also contain ++ * sub-regions which are not imported and that are allocated and used ++ * by the user process. This may be the case of memory at the beginning ++ * of the first page and at the end of the last page. Automatic CPU cache ++ * synchronization would force some operations on those memory allocations, ++ * unbeknown to the user process: in particular, a CPU cache invalidate ++ * upon unmapping would destroy the content of dirty CPU caches and cause ++ * the user process to lose CPU writes to the non-imported sub-regions. ++ * ++ * When the GPU claims ownership of the imported memory buffer, it shall ++ * commit CPU writes for the whole of all pages that enclose the imported ++ * region, otherwise the initial content of memory would be wrong. ++ */ + for (i = 0; i < pinned_pages; i++) { + dma_addr_t dma_addr; -+ unsigned long min; -+ -+ min = MIN(PAGE_SIZE - offset, local_size); -+ dma_addr = dma_map_page(dev, pages[i], -+ offset, min, -+ DMA_BIDIRECTIONAL); -+ if (dma_mapping_error(dev, dma_addr)) ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++ dma_addr = dma_map_page(dev, pages[i], 0, PAGE_SIZE, DMA_BIDIRECTIONAL); ++#else ++ dma_addr = dma_map_page_attrs(dev, pages[i], 0, PAGE_SIZE, DMA_BIDIRECTIONAL, ++ DMA_ATTR_SKIP_CPU_SYNC); ++#endif ++ err = dma_mapping_error(dev, dma_addr); ++ if (err) + goto unwind; + + alloc->imported.user_buf.dma_addrs[i] = dma_addr; + pa[i] = as_tagged(page_to_phys(pages[i])); + -+ local_size -= min; -+ offset = 0; ++ dma_sync_single_for_device(dev, dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); + } + +#ifdef CONFIG_MALI_CINSTR_GWT @@ -226255,24 +261336,46 @@ index 000000000000..82a799c2d673 + gwt_mask = ~KBASE_REG_GPU_WR; +#endif + -+ err = kbase_mmu_insert_pages(kctx->kbdev, &kctx->mmu, reg->start_pfn, -+ pa, kbase_reg_current_backed_size(reg), -+ reg->flags & gwt_mask, kctx->as_nr, -+ alloc->group_id); ++ err = kbase_mmu_insert_imported_pages(kctx->kbdev, &kctx->mmu, reg->start_pfn, pa, ++ kbase_reg_current_backed_size(reg), ++ reg->flags & gwt_mask, kctx->as_nr, alloc->group_id, ++ mmu_sync_info, NULL); + if (err == 0) + return 0; + + /* fall down */ +unwind: + alloc->nents = 0; -+ while (i--) { -+ dma_unmap_page(kctx->kbdev->dev, -+ alloc->imported.user_buf.dma_addrs[i], -+ PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_mapped_pages = i; ++ /* Run the unmap loop in the same order as map loop, and perform again ++ * CPU cache synchronization to re-write the content of dirty CPU caches ++ * to memory. This is precautionary measure in case a GPU job has taken ++ * advantage of a partially GPU-mapped range to write and corrupt the ++ * content of memory, either inside or outside the imported region. ++ * ++ * Notice that this error recovery path doesn't try to be optimal and just ++ * flushes the entire page range. ++ */ ++ for (i = 0; i < dma_mapped_pages; i++) { ++ dma_addr_t dma_addr = alloc->imported.user_buf.dma_addrs[i]; ++ ++ dma_sync_single_for_device(dev, dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++ dma_unmap_page(dev, dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++#else ++ dma_unmap_page_attrs(dev, dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL, ++ DMA_ATTR_SKIP_CPU_SYNC); ++#endif + } + -+ while (++i < pinned_pages) { -+ put_page(pages[i]); ++ /* The user buffer could already have been previously pinned before ++ * entering this function, and hence there could potentially be CPU ++ * mappings of it ++ */ ++ kbase_mem_shrink_cpu_mapping(kctx, reg, 0, pinned_pages); ++ ++ for (i = 0; i < pinned_pages; i++) { ++ kbase_unpin_user_buf_page(pages[i]); + pages[i] = NULL; + } + @@ -226283,30 +261386,118 @@ index 000000000000..82a799c2d673 + * GPUs, which implies that a call to kbase_jd_user_buf_pin_pages() will NOT + * have a corresponding call to kbase_jd_user_buf_unpin_pages(). + */ -+static void kbase_jd_user_buf_unmap(struct kbase_context *kctx, -+ struct kbase_mem_phy_alloc *alloc, bool writeable) ++static void kbase_jd_user_buf_unmap(struct kbase_context *kctx, struct kbase_mem_phy_alloc *alloc, ++ struct kbase_va_region *reg, bool writeable) +{ + long i; + struct page **pages; -+ unsigned long size = alloc->imported.user_buf.size; ++ unsigned long offset_within_page = alloc->imported.user_buf.address & ~PAGE_MASK; ++ unsigned long remaining_size = alloc->imported.user_buf.size; ++ ++ lockdep_assert_held(&kctx->reg_lock); + + KBASE_DEBUG_ASSERT(alloc->type == KBASE_MEM_TYPE_IMPORTED_USER_BUF); + pages = alloc->imported.user_buf.pages; ++ ++#if !MALI_USE_CSF ++ kbase_mem_shrink_cpu_mapping(kctx, reg, 0, alloc->nents); ++#else ++ CSTD_UNUSED(reg); ++#endif ++ + for (i = 0; i < alloc->imported.user_buf.nr_pages; i++) { -+ unsigned long local_size; ++ unsigned long imported_size = MIN(remaining_size, PAGE_SIZE - offset_within_page); ++ /* Notice: this is a temporary variable that is used for DMA sync ++ * operations, and that could be incremented by an offset if the ++ * current page contains both imported and non-imported memory ++ * sub-regions. ++ * ++ * It is valid to add an offset to this value, because the offset ++ * is always kept within the physically contiguous dma-mapped range ++ * and there's no need to translate to physical address to offset it. ++ * ++ * This variable is not going to be used for the actual DMA unmap ++ * operation, that shall always use the original DMA address of the ++ * whole memory page. ++ */ + dma_addr_t dma_addr = alloc->imported.user_buf.dma_addrs[i]; + -+ local_size = MIN(size, PAGE_SIZE - (dma_addr & ~PAGE_MASK)); -+ dma_unmap_page(kctx->kbdev->dev, dma_addr, local_size, -+ DMA_BIDIRECTIONAL); ++ /* Manual CPU cache synchronization. ++ * ++ * When the GPU returns ownership of the buffer to the CPU, the driver ++ * needs to treat imported and non-imported memory differently. ++ * ++ * The first case to consider is non-imported sub-regions at the ++ * beginning of the first page and at the end of last page. For these ++ * sub-regions: CPU cache shall be committed with a clean+invalidate, ++ * in order to keep the last CPU write. ++ * ++ * Imported region prefers the opposite treatment: this memory has been ++ * legitimately mapped and used by the GPU, hence GPU writes shall be ++ * committed to memory, while CPU cache shall be invalidated to make ++ * sure that CPU reads the correct memory content. ++ * ++ * The following diagram shows the expect value of the variables ++ * used in this loop in the corner case of an imported region encloed ++ * by a single memory page: ++ * ++ * page boundary ->|---------- | <- dma_addr (initial value) ++ * | | ++ * | - - - - - | <- offset_within_page ++ * |XXXXXXXXXXX|\ ++ * |XXXXXXXXXXX| \ ++ * |XXXXXXXXXXX| }- imported_size ++ * |XXXXXXXXXXX| / ++ * |XXXXXXXXXXX|/ ++ * | - - - - - | <- offset_within_page + imported_size ++ * | |\ ++ * | | }- PAGE_SIZE - imported_size - offset_within_page ++ * | |/ ++ * page boundary ->|-----------| ++ * ++ * If the imported region is enclosed by more than one page, then ++ * offset_within_page = 0 for any page after the first. ++ */ ++ ++ /* Only for first page: handle non-imported range at the beginning. */ ++ if (offset_within_page > 0) { ++ dma_sync_single_for_device(kctx->kbdev->dev, dma_addr, offset_within_page, ++ DMA_BIDIRECTIONAL); ++ dma_addr += offset_within_page; ++ } ++ ++ /* For every page: handle imported range. */ ++ if (imported_size > 0) ++ dma_sync_single_for_cpu(kctx->kbdev->dev, dma_addr, imported_size, ++ DMA_BIDIRECTIONAL); ++ ++ /* Only for last page (that may coincide with first page): ++ * handle non-imported range at the end. ++ */ ++ if ((imported_size + offset_within_page) < PAGE_SIZE) { ++ dma_addr += imported_size; ++ dma_sync_single_for_device(kctx->kbdev->dev, dma_addr, ++ PAGE_SIZE - imported_size - offset_within_page, ++ DMA_BIDIRECTIONAL); ++ } ++ ++ /* Notice: use the original DMA address to unmap the whole memory page. */ ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++ dma_unmap_page(kctx->kbdev->dev, alloc->imported.user_buf.dma_addrs[i], PAGE_SIZE, ++ DMA_BIDIRECTIONAL); ++#else ++ dma_unmap_page_attrs(kctx->kbdev->dev, alloc->imported.user_buf.dma_addrs[i], ++ PAGE_SIZE, DMA_BIDIRECTIONAL, DMA_ATTR_SKIP_CPU_SYNC); ++#endif + if (writeable) + set_page_dirty_lock(pages[i]); +#if !MALI_USE_CSF -+ put_page(pages[i]); ++ kbase_unpin_user_buf_page(pages[i]); + pages[i] = NULL; +#endif + -+ size -= local_size; ++ remaining_size -= imported_size; ++ offset_within_page = 0; + } +#if !MALI_USE_CSF + alloc->nents = 0; @@ -226353,11 +261544,11 @@ index 000000000000..82a799c2d673 + return 0; +} + -+struct kbase_mem_phy_alloc *kbase_map_external_resource( -+ struct kbase_context *kctx, struct kbase_va_region *reg, -+ struct mm_struct *locked_mm) ++int kbase_map_external_resource(struct kbase_context *kctx, struct kbase_va_region *reg, ++ struct mm_struct *locked_mm) +{ -+ int err; ++ int err = 0; ++ struct kbase_mem_phy_alloc *alloc = reg->gpu_alloc; + + lockdep_assert_held(&kctx->reg_lock); + @@ -226366,14 +261557,15 @@ index 000000000000..82a799c2d673 + case KBASE_MEM_TYPE_IMPORTED_USER_BUF: { + if ((reg->gpu_alloc->imported.user_buf.mm != locked_mm) && + (!reg->gpu_alloc->nents)) -+ goto exit; ++ return -EINVAL; + + reg->gpu_alloc->imported.user_buf.current_mapping_usage_count++; -+ if (1 == reg->gpu_alloc->imported.user_buf.current_mapping_usage_count) { ++ if (reg->gpu_alloc->imported.user_buf ++ .current_mapping_usage_count == 1) { + err = kbase_jd_user_buf_map(kctx, reg); + if (err) { + reg->gpu_alloc->imported.user_buf.current_mapping_usage_count--; -+ goto exit; ++ return err; + } + } + } @@ -226381,21 +261573,30 @@ index 000000000000..82a799c2d673 + case KBASE_MEM_TYPE_IMPORTED_UMM: { + err = kbase_mem_umm_map(kctx, reg); + if (err) -+ goto exit; ++ return err; + break; + } + default: -+ goto exit; ++ dev_dbg(kctx->kbdev->dev, ++ "Invalid external resource GPU allocation type (%x) on mapping", ++ alloc->type); ++ return -EINVAL; + } + -+ return kbase_mem_phy_alloc_get(reg->gpu_alloc); -+exit: -+ return NULL; ++ kbase_va_region_alloc_get(kctx, reg); ++ kbase_mem_phy_alloc_get(alloc); ++ return err; +} + -+void kbase_unmap_external_resource(struct kbase_context *kctx, -+ struct kbase_va_region *reg, struct kbase_mem_phy_alloc *alloc) ++void kbase_unmap_external_resource(struct kbase_context *kctx, struct kbase_va_region *reg) +{ ++ /* gpu_alloc was used in kbase_map_external_resources, so we need to use it for the ++ * unmapping operation. ++ */ ++ struct kbase_mem_phy_alloc *alloc = reg->gpu_alloc; ++ ++ lockdep_assert_held(&kctx->reg_lock); ++ + switch (alloc->type) { + case KBASE_MEM_TYPE_IMPORTED_UMM: { + kbase_mem_umm_unmap(kctx, reg, alloc); @@ -226404,29 +261605,36 @@ index 000000000000..82a799c2d673 + case KBASE_MEM_TYPE_IMPORTED_USER_BUF: { + alloc->imported.user_buf.current_mapping_usage_count--; + -+ if (0 == alloc->imported.user_buf.current_mapping_usage_count) { ++ if (alloc->imported.user_buf.current_mapping_usage_count == 0) { + bool writeable = true; + -+ if (!kbase_is_region_invalid_or_free(reg) && -+ reg->gpu_alloc == alloc) -+ kbase_mmu_teardown_pages( -+ kctx->kbdev, -+ &kctx->mmu, -+ reg->start_pfn, -+ kbase_reg_current_backed_size(reg), -+ kctx->as_nr); ++ if (!kbase_is_region_invalid_or_free(reg)) { ++ kbase_mmu_teardown_pages(kctx->kbdev, &kctx->mmu, reg->start_pfn, ++ alloc->pages, ++ kbase_reg_current_backed_size(reg), ++ kbase_reg_current_backed_size(reg), ++ kctx->as_nr, true); ++ } + -+ if (reg && ((reg->flags & KBASE_REG_GPU_WR) == 0)) ++ if ((reg->flags & (KBASE_REG_CPU_WR | KBASE_REG_GPU_WR)) == 0) + writeable = false; + -+ kbase_jd_user_buf_unmap(kctx, alloc, writeable); ++ kbase_jd_user_buf_unmap(kctx, alloc, reg, writeable); ++ } + } -+ } + break; + default: -+ break; ++ WARN(1, "Invalid external resource GPU allocation type (%x) on unmapping", ++ alloc->type); ++ return; + } + kbase_mem_phy_alloc_put(alloc); ++ kbase_va_region_alloc_put(kctx, reg); ++} ++ ++static inline u64 kbasep_get_va_gpu_addr(struct kbase_va_region *reg) ++{ ++ return reg->start_pfn << PAGE_SHIFT; +} + +struct kbase_ctx_ext_res_meta *kbase_sticky_resource_acquire( @@ -226442,7 +261650,7 @@ index 000000000000..82a799c2d673 + * metadata which matches the region which is being acquired. + */ + list_for_each_entry(walker, &kctx->ext_res_meta_head, ext_res_node) { -+ if (walker->gpu_addr == gpu_addr) { ++ if (kbasep_get_va_gpu_addr(walker->reg) == gpu_addr) { + meta = walker; + meta->ref++; + break; @@ -226454,8 +261662,7 @@ index 000000000000..82a799c2d673 + struct kbase_va_region *reg; + + /* Find the region */ -+ reg = kbase_region_tracker_find_region_enclosing_address( -+ kctx, gpu_addr); ++ reg = kbase_region_tracker_find_region_enclosing_address(kctx, gpu_addr); + if (kbase_is_region_invalid_or_free(reg)) + goto failed; + @@ -226463,18 +261670,18 @@ index 000000000000..82a799c2d673 + meta = kzalloc(sizeof(*meta), GFP_KERNEL); + if (!meta) + goto failed; -+ + /* + * Fill in the metadata object and acquire a reference + * for the physical resource. + */ -+ meta->alloc = kbase_map_external_resource(kctx, reg, NULL); -+ meta->ref = 1; ++ meta->reg = reg; + -+ if (!meta->alloc) ++ /* Map the external resource to the GPU allocation of the region ++ * and acquire the reference to the VA region ++ */ ++ if (kbase_map_external_resource(kctx, meta->reg, NULL)) + goto fail_map; -+ -+ meta->gpu_addr = reg->start_pfn << PAGE_SHIFT; ++ meta->ref = 1; + + list_add(&meta->ext_res_node, &kctx->ext_res_meta_head); + } @@ -226499,7 +261706,7 @@ index 000000000000..82a799c2d673 + * metadata which matches the region which is being released. + */ + list_for_each_entry(walker, &kctx->ext_res_meta_head, ext_res_node) -+ if (walker->gpu_addr == gpu_addr) ++ if (kbasep_get_va_gpu_addr(walker->reg) == gpu_addr) + return walker; + + return NULL; @@ -226508,14 +261715,7 @@ index 000000000000..82a799c2d673 +static void release_sticky_resource_meta(struct kbase_context *kctx, + struct kbase_ctx_ext_res_meta *meta) +{ -+ struct kbase_va_region *reg; -+ -+ /* Drop the physical memory reference and free the metadata. */ -+ reg = kbase_region_tracker_find_region_enclosing_address( -+ kctx, -+ meta->gpu_addr); -+ -+ kbase_unmap_external_resource(kctx, reg, meta->alloc); ++ kbase_unmap_external_resource(kctx, meta->reg); + list_del(&meta->ext_res_node); + kfree(meta); +} @@ -226590,18 +261790,19 @@ index 000000000000..82a799c2d673 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem.h b/drivers/gpu/arm/bifrost/mali_kbase_mem.h new file mode 100755 -index 000000000000..2238fbfe9e99 +index 000000000..490ad3c9c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem.h -@@ -0,0 +1,1962 @@ +@@ -0,0 +1,2570 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -226612,15 +261813,10 @@ index 000000000000..2238fbfe9e99 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/** -+ * @file mali_kbase_mem.h -+ * Base kernel memory APIs ++ * DOC: Base kernel memory APIs + */ + +#ifndef _KBASE_MEM_H_ @@ -226631,12 +261827,14 @@ index 000000000000..2238fbfe9e99 +#endif + +#include -+#include "mali_base_kernel.h" ++#include +#include +#include "mali_kbase_pm.h" +#include "mali_kbase_defs.h" +/* Required for kbase_mem_evictable_unmake */ +#include "mali_kbase_mem_linux.h" ++#include "mali_kbase_mem_migrate.h" ++#include "mali_kbase_refcount_defs.h" + +static inline void kbase_process_page_usage_inc(struct kbase_context *kctx, + int pages); @@ -226644,10 +261842,13 @@ index 000000000000..2238fbfe9e99 +/* Part of the workaround for uTLB invalid pages is to ensure we grow/shrink tmem by 4 pages at a time */ +#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2_HW_ISSUE_8316 (2) /* round to 4 pages */ + -+/* Part of the workaround for PRLAM-9630 requires us to grow/shrink memory by 8 pages. -+The MMU reads in 8 page table entries from memory at a time, if we have more than one page fault within the same 8 pages and -+page tables are updated accordingly, the MMU does not re-read the page table entries from memory for the subsequent page table -+updates and generates duplicate page faults as the page table information used by the MMU is not valid. */ ++/* Part of the workaround for PRLAM-9630 requires us to grow/shrink memory by ++ * 8 pages. The MMU reads in 8 page table entries from memory at a time, if we ++ * have more than one page fault within the same 8 pages and page tables are ++ * updated accordingly, the MMU does not re-read the page table entries from ++ * memory for the subsequent page table updates and generates duplicate page ++ * faults as the page table information used by the MMU is not valid. ++ */ +#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2_HW_ISSUE_9630 (3) /* round to 8 pages */ + +#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2 (0) /* round to 1 page */ @@ -226656,7 +261857,8 @@ index 000000000000..2238fbfe9e99 +#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES (1u << KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2) +#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_HW_ISSUE_8316 (1u << KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2_HW_ISSUE_8316) +#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_HW_ISSUE_9630 (1u << KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2_HW_ISSUE_9630) -+/** ++ ++/* + * A CPU mapping + */ +struct kbase_cpu_mapping { @@ -226677,16 +261879,15 @@ index 000000000000..2238fbfe9e99 +}; + +/* internal structure, mirroring base_mem_aliasing_info, -+ * but with alloc instead of a gpu va (handle) */ ++ * but with alloc instead of a gpu va (handle) ++ */ +struct kbase_aliased { + struct kbase_mem_phy_alloc *alloc; /* NULL for special, non-NULL for native */ + u64 offset; /* in pages */ + u64 length; /* in pages */ +}; + -+/** -+ * @brief Physical pages tracking object properties -+ */ ++/* Physical pages tracking object properties */ +#define KBASE_MEM_PHY_ALLOC_ACCESSED_CACHED (1u << 0) +#define KBASE_MEM_PHY_ALLOC_LARGE (1u << 1) + @@ -226701,7 +261902,13 @@ index 000000000000..2238fbfe9e99 + * updated as part of the change. + * + * @kref: number of users of this alloc -+ * @gpu_mappings: count number of times mapped on the GPU ++ * @gpu_mappings: count number of times mapped on the GPU. Indicates the number ++ * of references there are to the physical pages from different ++ * GPU VA regions. ++ * @kernel_mappings: count number of times mapped on the CPU, specifically in ++ * the kernel. Indicates the number of references there are ++ * to the physical pages to prevent flag changes or shrink ++ * while maps are still held. + * @nents: 0..N + * @pages: N elements, only 0..nents are valid + * @mappings: List of CPU mappings of this physical memory allocation. @@ -226724,6 +261931,7 @@ index 000000000000..2238fbfe9e99 +struct kbase_mem_phy_alloc { + struct kref kref; + atomic_t gpu_mappings; ++ atomic_t kernel_mappings; + size_t nents; + struct tagged_addr *pages; + struct list_head mappings; @@ -226772,6 +261980,106 @@ index 000000000000..2238fbfe9e99 + } imported; +}; + ++/** ++ * enum kbase_page_status - Status of a page used for page migration. ++ * ++ * @MEM_POOL: Stable state. Page is located in a memory pool and can safely ++ * be migrated. ++ * @ALLOCATE_IN_PROGRESS: Transitory state. A page is set to this status as ++ * soon as it leaves a memory pool. ++ * @SPILL_IN_PROGRESS: Transitory state. Corner case where pages in a memory ++ * pool of a dying context are being moved to the device ++ * memory pool. ++ * @NOT_MOVABLE: Stable state. Page has been allocated for an object that is ++ * not movable, but may return to be movable when the object ++ * is freed. ++ * @ALLOCATED_MAPPED: Stable state. Page has been allocated, mapped to GPU ++ * and has reference to kbase_mem_phy_alloc object. ++ * @PT_MAPPED: Stable state. Similar to ALLOCATED_MAPPED, but page doesn't ++ * reference kbase_mem_phy_alloc object. Used as a page in MMU ++ * page table. ++ * @FREE_IN_PROGRESS: Transitory state. A page is set to this status as soon as ++ * the driver manages to acquire a lock on the page while ++ * unmapping it. This status means that a memory release is ++ * happening and it's still not complete. ++ * @FREE_ISOLATED_IN_PROGRESS: Transitory state. This is a very particular corner case. ++ * A page is isolated while it is in ALLOCATED_MAPPED state, ++ * but then the driver tries to destroy the allocation. ++ * @FREE_PT_ISOLATED_IN_PROGRESS: Transitory state. This is a very particular corner case. ++ * A page is isolated while it is in PT_MAPPED state, but ++ * then the driver tries to destroy the allocation. ++ * ++ * Pages can only be migrated in stable states. ++ */ ++enum kbase_page_status { ++ MEM_POOL = 0, ++ ALLOCATE_IN_PROGRESS, ++ SPILL_IN_PROGRESS, ++ NOT_MOVABLE, ++ ALLOCATED_MAPPED, ++ PT_MAPPED, ++ FREE_IN_PROGRESS, ++ FREE_ISOLATED_IN_PROGRESS, ++ FREE_PT_ISOLATED_IN_PROGRESS, ++}; ++ ++#define PGD_VPFN_LEVEL_MASK ((u64)0x3) ++#define PGD_VPFN_LEVEL_GET_LEVEL(pgd_vpfn_level) (pgd_vpfn_level & PGD_VPFN_LEVEL_MASK) ++#define PGD_VPFN_LEVEL_GET_VPFN(pgd_vpfn_level) (pgd_vpfn_level & ~PGD_VPFN_LEVEL_MASK) ++#define PGD_VPFN_LEVEL_SET(pgd_vpfn, level) \ ++ ((pgd_vpfn & ~PGD_VPFN_LEVEL_MASK) | (level & PGD_VPFN_LEVEL_MASK)) ++ ++/** ++ * struct kbase_page_metadata - Metadata for each page in kbase ++ * ++ * @kbdev: Pointer to kbase device. ++ * @dma_addr: DMA address mapped to page. ++ * @migrate_lock: A spinlock to protect the private metadata. ++ * @data: Member in union valid based on @status. ++ * @status: Status to keep track if page can be migrated at any ++ * given moment. MSB will indicate if page is isolated. ++ * Protected by @migrate_lock. ++ * @vmap_count: Counter of kernel mappings. ++ * @group_id: Memory group ID obtained at the time of page allocation. ++ * ++ * Each 4KB page will have a reference to this struct in the private field. ++ * This will be used to keep track of information required for Linux page ++ * migration functionality as well as address for DMA mapping. ++ */ ++struct kbase_page_metadata { ++ dma_addr_t dma_addr; ++ spinlock_t migrate_lock; ++ ++ union { ++ struct { ++ struct kbase_mem_pool *pool; ++ /* Pool could be terminated after page is isolated and therefore ++ * won't be able to get reference to kbase device. ++ */ ++ struct kbase_device *kbdev; ++ } mem_pool; ++ struct { ++ struct kbase_va_region *reg; ++ struct kbase_mmu_table *mmut; ++ u64 vpfn; ++ } mapped; ++ struct { ++ struct kbase_mmu_table *mmut; ++ u64 pgd_vpfn_level; ++ } pt_mapped; ++ struct { ++ struct kbase_device *kbdev; ++ } free_isolated; ++ struct { ++ struct kbase_device *kbdev; ++ } free_pt_isolated; ++ } data; ++ ++ u8 status; ++ u8 vmap_count; ++ u8 group_id; ++}; ++ +/* The top bit of kbase_alloc_import_user_buf::current_mapping_usage_count is + * used to signify that a buffer was pinned when it was imported. Since the + * reference count is limited by the number of atoms that can be submitted at @@ -226794,6 +262102,20 @@ index 000000000000..2238fbfe9e99 + KBASE_JIT_REPORT_ON_ALLOC_OR_FREE = (1u << 0) +}; + ++/** ++ * kbase_set_phy_alloc_page_status - Set the page migration status of the underlying ++ * physical allocation. ++ * @alloc: the physical allocation containing the pages whose metadata is going ++ * to be modified ++ * @status: the status the pages should end up in ++ * ++ * Note that this function does not go through all of the checking to ensure that ++ * proper states are set. Instead, it is only used when we change the allocation ++ * to NOT_MOVABLE or from NOT_MOVABLE to ALLOCATED_MAPPED ++ */ ++void kbase_set_phy_alloc_page_status(struct kbase_mem_phy_alloc *alloc, ++ enum kbase_page_status status); ++ +static inline void kbase_mem_phy_alloc_gpu_mapped(struct kbase_mem_phy_alloc *alloc) +{ + KBASE_DEBUG_ASSERT(alloc); @@ -226807,13 +262129,38 @@ index 000000000000..2238fbfe9e99 + KBASE_DEBUG_ASSERT(alloc); + /* we only track mappings of NATIVE buffers */ + if (alloc->type == KBASE_MEM_TYPE_NATIVE) -+ if (0 > atomic_dec_return(&alloc->gpu_mappings)) { ++ if (atomic_dec_return(&alloc->gpu_mappings) < 0) { + pr_err("Mismatched %s:\n", __func__); + dump_stack(); + } +} + +/** ++ * kbase_mem_phy_alloc_kernel_mapped - Increment kernel_mappings counter for a ++ * memory region to prevent commit and flag ++ * changes ++ * ++ * @alloc: Pointer to physical pages tracking object ++ */ ++static inline void ++kbase_mem_phy_alloc_kernel_mapped(struct kbase_mem_phy_alloc *alloc) ++{ ++ atomic_inc(&alloc->kernel_mappings); ++} ++ ++/** ++ * kbase_mem_phy_alloc_kernel_unmapped - Decrement kernel_mappings ++ * counter for a memory region to allow commit and flag changes ++ * ++ * @alloc: Pointer to physical pages tracking object ++ */ ++static inline void ++kbase_mem_phy_alloc_kernel_unmapped(struct kbase_mem_phy_alloc *alloc) ++{ ++ WARN_ON(atomic_dec_return(&alloc->kernel_mappings) < 0); ++} ++ ++/** + * kbase_mem_is_imported - Indicate whether a memory type is imported + * + * @type: the memory type @@ -226845,7 +262192,7 @@ index 000000000000..2238fbfe9e99 +} + +/** -+ * A GPU memory region, and attributes for CPU mappings. ++ * struct kbase_va_region - A GPU memory region, and attributes for CPU mappings + * + * @rblink: Node in a red-black tree of memory regions within the same zone of + * the GPU's virtual address space. @@ -226853,25 +262200,48 @@ index 000000000000..2238fbfe9e99 + * that triggered incremental rendering by growing too much. + * @rbtree: Backlink to the red-black tree of memory regions. + * @start_pfn: The Page Frame Number in GPU virtual address space. ++ * @user_data: The address of GPU command queue when VA region represents ++ * a ring buffer. + * @nr_pages: The size of the region in pages. + * @initial_commit: Initial commit, for aligning the start address and + * correctly growing KBASE_REG_TILER_ALIGN_TOP regions. + * @threshold_pages: If non-zero and the amount of memory committed to a region + * that can grow on page fault exceeds this number of pages + * then the driver switches to incremental rendering. -+ * @extent: Number of pages allocated on page fault. ++ * @flags: Flags ++ * @extension: Number of pages allocated on page fault. + * @cpu_alloc: The physical memory we mmap to the CPU when mapping this region. + * @gpu_alloc: The physical memory we mmap to the GPU when mapping this region. + * @jit_node: Links to neighboring regions in the just-in-time memory pool. + * @jit_usage_id: The last just-in-time memory usage ID for this region. + * @jit_bin_id: The just-in-time memory bin this region came from. + * @va_refcnt: Number of users of this region. Protected by reg_lock. ++ * @no_user_free_count: Number of contexts that want to prevent the region ++ * from being freed by userspace. ++ * @heap_info_gpu_addr: Pointer to an object in GPU memory defining an end of ++ * an allocated region ++ * The object can be one of: ++ * - u32 value defining the size of the region ++ * - u64 pointer first unused byte in the region ++ * The interpretation of the object depends on ++ * BASE_JIT_ALLOC_HEAP_INFO_IS_SIZE flag in ++ * jit_info_flags - if it is set, the heap info object ++ * should be interpreted as size. ++ * @used_pages: The current estimate of the number of pages used, which in ++ * normal use is either: ++ * - the initial estimate == va_pages ++ * - the actual pages used, as found by a JIT usage report ++ * Note that since the value is calculated from GPU memory after a ++ * JIT usage report, at any point in time it is allowed to take a ++ * random value that is no greater than va_pages (e.g. it may be ++ * greater than gpu_alloc->nents) + */ +struct kbase_va_region { + struct rb_node rblink; + struct list_head link; + struct rb_root *rbtree; + u64 start_pfn; ++ void *user_data; + size_t nr_pages; + size_t initial_commit; + size_t threshold_pages; @@ -226904,14 +262274,26 @@ index 000000000000..2238fbfe9e99 +/* inner & outer shareable coherency */ +#define KBASE_REG_SHARE_BOTH (1ul << 10) + ++#if MALI_USE_CSF ++/* Space for 8 different zones */ ++#define KBASE_REG_ZONE_BITS 3 ++#else +/* Space for 4 different zones */ -+#define KBASE_REG_ZONE_MASK (3ul << 11) -+#define KBASE_REG_ZONE(x) (((x) & 3) << 11) ++#define KBASE_REG_ZONE_BITS 2 ++#endif ++ ++#define KBASE_REG_ZONE_MASK (((1 << KBASE_REG_ZONE_BITS) - 1ul) << 11) ++#define KBASE_REG_ZONE(x) (((x) & ((1 << KBASE_REG_ZONE_BITS) - 1ul)) << 11) ++#define KBASE_REG_ZONE_IDX(x) (((x) & KBASE_REG_ZONE_MASK) >> 11) ++ ++#if KBASE_REG_ZONE_MAX > (1 << KBASE_REG_ZONE_BITS) ++#error "Too many zones for the number of zone bits defined" ++#endif + +/* GPU read access */ -+#define KBASE_REG_GPU_RD (1ul<<13) ++#define KBASE_REG_GPU_RD (1ul << 14) +/* CPU read access */ -+#define KBASE_REG_CPU_RD (1ul<<14) ++#define KBASE_REG_CPU_RD (1ul << 15) + +/* Index of chosen MEMATTR for this region (0..7) */ +#define KBASE_REG_MEMATTR_MASK (7ul << 16) @@ -226920,6 +262302,13 @@ index 000000000000..2238fbfe9e99 + +#define KBASE_REG_PROTECTED (1ul << 19) + ++/* Region belongs to a shrinker. ++ * ++ * This can either mean that it is part of the JIT/Ephemeral or tiler heap ++ * shrinker paths. Should be removed only after making sure that there are ++ * no references remaining to it in these paths, as it may cause the physical ++ * backing of the region to disappear during use. ++ */ +#define KBASE_REG_DONT_NEED (1ul << 20) + +/* Imported buffer is padded? */ @@ -226937,8 +262326,9 @@ index 000000000000..2238fbfe9e99 +#endif + +#if !MALI_USE_CSF -+/* The top of the initial commit is aligned to extent pages. -+ * Extent must be a power of 2 */ ++/* The top of the initial commit is aligned to extension pages. ++ * Extent must be a power of 2 ++ */ +#define KBASE_REG_TILER_ALIGN_TOP (1ul << 23) +#else +/* Bit 23 is reserved. @@ -226948,10 +262338,7 @@ index 000000000000..2238fbfe9e99 +#define KBASE_REG_RESERVED_BIT_23 (1ul << 23) +#endif /* !MALI_USE_CSF */ + -+/* Whilst this flag is set the GPU allocation is not supposed to be freed by -+ * user space. The flag will remain set for the lifetime of JIT allocations. -+ */ -+#define KBASE_REG_NO_USER_FREE (1ul << 24) ++/* Bit 24 is currently unused and is available for use for a new flag */ + +/* Memory has permanent kernel side mapping */ +#define KBASE_REG_PERMANENT_KERNEL_MAPPING (1ul << 25) @@ -226981,21 +262368,39 @@ index 000000000000..2238fbfe9e99 +/* Allocation is actively used for JIT memory */ +#define KBASE_REG_ACTIVE_JIT_ALLOC (1ul << 28) + -+#define KBASE_REG_ZONE_SAME_VA KBASE_REG_ZONE(0) -+ -+/* only used with 32-bit clients */ -+/* -+ * On a 32bit platform, custom VA should be wired from 4GB -+ * to the VA limit of the GPU. Unfortunately, the Linux mmap() interface -+ * limits us to 2^32 pages (2^44 bytes, see mmap64 man page for reference). -+ * So we put the default limit to the maximum possible on Linux and shrink -+ * it down, if required by the GPU, during initialization. ++#if MALI_USE_CSF ++/* This flag only applies to allocations in the EXEC_FIXED_VA and FIXED_VA ++ * memory zones, and it determines whether they were created with a fixed ++ * GPU VA address requested by the user. + */ ++#define KBASE_REG_FIXED_ADDRESS (1ul << 29) ++#else ++#define KBASE_REG_RESERVED_BIT_29 (1ul << 29) ++#endif ++ ++#define KBASE_REG_ZONE_SAME_VA KBASE_REG_ZONE(0) + +#define KBASE_REG_ZONE_CUSTOM_VA KBASE_REG_ZONE(1) +#define KBASE_REG_ZONE_CUSTOM_VA_BASE (0x100000000ULL >> PAGE_SHIFT) -+#define KBASE_REG_ZONE_CUSTOM_VA_SIZE (((1ULL << 44) >> PAGE_SHIFT) - KBASE_REG_ZONE_CUSTOM_VA_BASE) ++ ++#if MALI_USE_CSF ++/* only used with 32-bit clients */ ++/* On a 32bit platform, custom VA should be wired from 4GB to 2^(43). ++ */ ++#define KBASE_REG_ZONE_CUSTOM_VA_SIZE \ ++ (((1ULL << 43) >> PAGE_SHIFT) - KBASE_REG_ZONE_CUSTOM_VA_BASE) ++#else ++/* only used with 32-bit clients */ ++/* On a 32bit platform, custom VA should be wired from 4GB to the VA limit of the ++ * GPU. Unfortunately, the Linux mmap() interface limits us to 2^32 pages (2^44 ++ * bytes, see mmap64 man page for reference). So we put the default limit to the ++ * maximum possible on Linux and shrink it down, if required by the GPU, during ++ * initialization. ++ */ ++#define KBASE_REG_ZONE_CUSTOM_VA_SIZE \ ++ (((1ULL << 44) >> PAGE_SHIFT) - KBASE_REG_ZONE_CUSTOM_VA_BASE) +/* end 32-bit clients only */ ++#endif + +/* The starting address and size of the GPU-executable zone are dynamic + * and depend on the platform and the number of pages requested by the @@ -227009,15 +262414,43 @@ index 000000000000..2238fbfe9e99 +#define KBASE_REG_ZONE_MCU_SHARED_BASE (0x04000000ULL >> PAGE_SHIFT) +#define KBASE_REG_ZONE_MCU_SHARED_SIZE (((0x08000000ULL) >> PAGE_SHIFT) - \ + KBASE_REG_ZONE_MCU_SHARED_BASE) ++ ++/* For CSF GPUs, the EXEC_VA zone is always 4GB in size, and starts at 2^47 for 64-bit ++ * clients, and 2^43 for 32-bit clients. ++ */ ++#define KBASE_REG_ZONE_EXEC_VA_BASE_64 ((1ULL << 47) >> PAGE_SHIFT) ++#define KBASE_REG_ZONE_EXEC_VA_BASE_32 ((1ULL << 43) >> PAGE_SHIFT) ++#define KBASE_REG_ZONE_EXEC_VA_SIZE KBASE_REG_ZONE_EXEC_VA_MAX_PAGES ++ ++/* Executable zone supporting FIXED/FIXABLE allocations. ++ * It is always 4GB in size. ++ */ ++ ++#define KBASE_REG_ZONE_EXEC_FIXED_VA KBASE_REG_ZONE(4) ++#define KBASE_REG_ZONE_EXEC_FIXED_VA_SIZE KBASE_REG_ZONE_EXEC_VA_MAX_PAGES ++ ++/* Non-executable zone supporting FIXED/FIXABLE allocations. ++ * It extends from (2^47) up to (2^48)-1, for 64-bit userspace clients, and from ++ * (2^43) up to (2^44)-1 for 32-bit userspace clients. ++ */ ++#define KBASE_REG_ZONE_FIXED_VA KBASE_REG_ZONE(5) ++ ++/* Again - 32-bit userspace cannot map addresses beyond 2^44, but 64-bit can - and so ++ * the end of the FIXED_VA zone for 64-bit clients is (2^48)-1. ++ */ ++#define KBASE_REG_ZONE_FIXED_VA_END_64 ((1ULL << 48) >> PAGE_SHIFT) ++#define KBASE_REG_ZONE_FIXED_VA_END_32 ((1ULL << 44) >> PAGE_SHIFT) ++ +#endif + + unsigned long flags; -+ size_t extent; ++ size_t extension; + struct kbase_mem_phy_alloc *cpu_alloc; + struct kbase_mem_phy_alloc *gpu_alloc; + struct list_head jit_node; + u16 jit_usage_id; + u8 jit_bin_id; ++ +#if MALI_JIT_PRESSURE_LIMIT_BASE + /* Pointer to an object in GPU memory defining an end of an allocated + * region @@ -227045,9 +262478,27 @@ index 000000000000..2238fbfe9e99 + size_t used_pages; +#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ + -+ int va_refcnt; ++ kbase_refcount_t va_refcnt; ++ atomic_t no_user_free_count; +}; + ++/** ++ * kbase_is_ctx_reg_zone - determine whether a KBASE_REG_ZONE_<...> is for a ++ * context or for a device ++ * @zone_bits: A KBASE_REG_ZONE_<...> to query ++ * ++ * Return: True if the zone for @zone_bits is a context zone, False otherwise ++ */ ++static inline bool kbase_is_ctx_reg_zone(unsigned long zone_bits) ++{ ++ WARN_ON((zone_bits & KBASE_REG_ZONE_MASK) != zone_bits); ++ return (zone_bits == KBASE_REG_ZONE_SAME_VA || ++#if MALI_USE_CSF ++ zone_bits == KBASE_REG_ZONE_EXEC_FIXED_VA || zone_bits == KBASE_REG_ZONE_FIXED_VA || ++#endif ++ zone_bits == KBASE_REG_ZONE_CUSTOM_VA || zone_bits == KBASE_REG_ZONE_EXEC_VA); ++} ++ +/* Special marker for failed JIT allocations that still must be marked as + * in-use + */ @@ -227071,12 +262522,31 @@ index 000000000000..2238fbfe9e99 + return (kbase_is_region_invalid(reg) || kbase_is_region_free(reg)); +} + -+int kbase_remove_va_region(struct kbase_va_region *reg); -+static inline void kbase_region_refcnt_free(struct kbase_va_region *reg) ++/** ++ * kbase_is_region_shrinkable - Check if a region is "shrinkable". ++ * A shrinkable regions is a region for which its backing pages (reg->gpu_alloc->pages) ++ * can be freed at any point, even though the kbase_va_region structure itself ++ * may have been refcounted. ++ * Regions that aren't on a shrinker, but could be shrunk at any point in future ++ * without warning are still considered "shrinkable" (e.g. Active JIT allocs) ++ * ++ * @reg: Pointer to region ++ * ++ * Return: true if the region is "shrinkable", false if not. ++ */ ++static inline bool kbase_is_region_shrinkable(struct kbase_va_region *reg) ++{ ++ return (reg->flags & KBASE_REG_DONT_NEED) || (reg->flags & KBASE_REG_ACTIVE_JIT_ALLOC); ++} ++ ++void kbase_remove_va_region(struct kbase_device *kbdev, ++ struct kbase_va_region *reg); ++static inline void kbase_region_refcnt_free(struct kbase_device *kbdev, ++ struct kbase_va_region *reg) +{ + /* If region was mapped then remove va region*/ + if (reg->start_pfn) -+ kbase_remove_va_region(reg); ++ kbase_remove_va_region(kbdev, reg); + + /* To detect use-after-free in debug builds */ + KBASE_DEBUG_CODE(reg->flags |= KBASE_REG_FREE); @@ -227086,14 +262556,12 @@ index 000000000000..2238fbfe9e99 +static inline struct kbase_va_region *kbase_va_region_alloc_get( + struct kbase_context *kctx, struct kbase_va_region *region) +{ -+ lockdep_assert_held(&kctx->reg_lock); ++ WARN_ON(!kbase_refcount_read(®ion->va_refcnt)); ++ WARN_ON(kbase_refcount_read(®ion->va_refcnt) == INT_MAX); + -+ WARN_ON(!region->va_refcnt); -+ -+ /* non-atomic as kctx->reg_lock is held */ -+ dev_dbg(kctx->kbdev->dev, "va_refcnt %d before get %p\n", -+ region->va_refcnt, (void *)region); -+ region->va_refcnt++; ++ dev_dbg(kctx->kbdev->dev, "va_refcnt %d before get %pK\n", ++ kbase_refcount_read(®ion->va_refcnt), (void *)region); ++ kbase_refcount_inc(®ion->va_refcnt); + + return region; +} @@ -227101,21 +262569,67 @@ index 000000000000..2238fbfe9e99 +static inline struct kbase_va_region *kbase_va_region_alloc_put( + struct kbase_context *kctx, struct kbase_va_region *region) +{ -+ lockdep_assert_held(&kctx->reg_lock); -+ -+ WARN_ON(region->va_refcnt <= 0); ++ WARN_ON(kbase_refcount_read(®ion->va_refcnt) <= 0); + WARN_ON(region->flags & KBASE_REG_FREE); + -+ /* non-atomic as kctx->reg_lock is held */ -+ region->va_refcnt--; -+ dev_dbg(kctx->kbdev->dev, "va_refcnt %d after put %p\n", -+ region->va_refcnt, (void *)region); -+ if (!region->va_refcnt) -+ kbase_region_refcnt_free(region); ++ if (kbase_refcount_dec_and_test(®ion->va_refcnt)) ++ kbase_region_refcnt_free(kctx->kbdev, region); ++ else ++ dev_dbg(kctx->kbdev->dev, "va_refcnt %d after put %pK\n", ++ kbase_refcount_read(®ion->va_refcnt), (void *)region); + + return NULL; +} + ++/** ++ * kbase_va_region_is_no_user_free - Check if user free is forbidden for the region. ++ * A region that must not be freed by userspace indicates that it is owned by some other ++ * kbase subsystem, for example tiler heaps, JIT memory or CSF queues. ++ * Such regions must not be shrunk (i.e. have their backing pages freed), except by the ++ * current owner. ++ * Hence, callers cannot rely on this check alone to determine if a region might be shrunk ++ * by any part of kbase. Instead they should use kbase_is_region_shrinkable(). ++ * ++ * @region: Pointer to region. ++ * ++ * Return: true if userspace cannot free the region, false if userspace can free the region. ++ */ ++static inline bool kbase_va_region_is_no_user_free(struct kbase_va_region *region) ++{ ++ return atomic_read(®ion->no_user_free_count) > 0; ++} ++ ++/** ++ * kbase_va_region_no_user_free_inc - Increment "no user free" count for a region. ++ * Calling this function will prevent the region to be shrunk by parts of kbase that ++ * don't own the region (as long as the count stays above zero). Refer to ++ * kbase_va_region_is_no_user_free() for more information. ++ * ++ * @region: Pointer to region (not shrinkable). ++ * ++ * Return: the pointer to the region passed as argument. ++ */ ++static inline void kbase_va_region_no_user_free_inc(struct kbase_va_region *region) ++{ ++ WARN_ON(kbase_is_region_shrinkable(region)); ++ WARN_ON(atomic_read(®ion->no_user_free_count) == INT_MAX); ++ ++ /* non-atomic as kctx->reg_lock is held */ ++ atomic_inc(®ion->no_user_free_count); ++} ++ ++/** ++ * kbase_va_region_no_user_free_dec - Decrement "no user free" count for a region. ++ * ++ * @region: Pointer to region (not shrinkable). ++ */ ++static inline void kbase_va_region_no_user_free_dec(struct kbase_va_region *region) ++{ ++ WARN_ON(!kbase_va_region_is_no_user_free(region)); ++ ++ atomic_dec(®ion->no_user_free_count); ++} ++ +/* Common functions */ +static inline struct tagged_addr *kbase_get_cpu_phy_pages( + struct kbase_va_region *reg) @@ -227200,6 +262714,7 @@ index 000000000000..2238fbfe9e99 + + kref_init(&alloc->kref); + atomic_set(&alloc->gpu_mappings, 0); ++ atomic_set(&alloc->kernel_mappings, 0); + alloc->nents = 0; + alloc->pages = (void *)(alloc + 1); + INIT_LIST_HEAD(&alloc->mappings); @@ -227328,12 +262843,9 @@ index 000000000000..2238fbfe9e99 + * + * Return: 0 on success, negative -errno on error + */ -+int kbase_mem_pool_init(struct kbase_mem_pool *pool, -+ const struct kbase_mem_pool_config *config, -+ unsigned int order, -+ int group_id, -+ struct kbase_device *kbdev, -+ struct kbase_mem_pool *next_pool); ++int kbase_mem_pool_init(struct kbase_mem_pool *pool, const struct kbase_mem_pool_config *config, ++ unsigned int order, int group_id, struct kbase_device *kbdev, ++ struct kbase_mem_pool *next_pool); + +/** + * kbase_mem_pool_term - Destroy a memory pool @@ -227413,6 +262925,9 @@ index 000000000000..2238fbfe9e99 + * @pages: Pointer to array where the physical address of the allocated + * pages will be stored. + * @partial_allowed: If fewer pages allocated is allowed ++ * @page_owner: Pointer to the task that created the Kbase context for which ++ * the pages are being allocated. It can be NULL if the pages ++ * won't be associated with any Kbase context. + * + * Like kbase_mem_pool_alloc() but optimized for allocating many pages. + * @@ -227429,7 +262944,8 @@ index 000000000000..2238fbfe9e99 + * this lock, it should use kbase_mem_pool_alloc_pages_locked() instead. + */ +int kbase_mem_pool_alloc_pages(struct kbase_mem_pool *pool, size_t nr_4k_pages, -+ struct tagged_addr *pages, bool partial_allowed); ++ struct tagged_addr *pages, bool partial_allowed, ++ struct task_struct *page_owner); + +/** + * kbase_mem_pool_alloc_pages_locked - Allocate pages from memory pool @@ -227541,13 +263057,17 @@ index 000000000000..2238fbfe9e99 + * kbase_mem_pool_grow - Grow the pool + * @pool: Memory pool to grow + * @nr_to_grow: Number of pages to add to the pool ++ * @page_owner: Pointer to the task that created the Kbase context for which ++ * the memory pool is being grown. It can be NULL if the pages ++ * to be allocated won't be associated with any Kbase context. + * + * Adds @nr_to_grow pages to the pool. Note that this may cause the pool to + * become larger than the maximum size specified. + * -+ * Returns: 0 on success, -ENOMEM if unable to allocate sufficent pages ++ * Return: 0 on success, -ENOMEM if unable to allocate sufficent pages + */ -+int kbase_mem_pool_grow(struct kbase_mem_pool *pool, size_t nr_to_grow); ++int kbase_mem_pool_grow(struct kbase_mem_pool *pool, size_t nr_to_grow, ++ struct task_struct *page_owner); + +/** + * kbase_mem_pool_trim - Grow or shrink the pool to a new size @@ -227581,6 +263101,16 @@ index 000000000000..2238fbfe9e99 +struct page *kbase_mem_alloc_page(struct kbase_mem_pool *pool); + +/** ++ * kbase_mem_pool_free_page - Free a page from a memory pool. ++ * @pool: Memory pool to free a page from ++ * @p: Page to free ++ * ++ * This will free any associated data stored for the page and release ++ * the page back to the kernel. ++ */ ++void kbase_mem_pool_free_page(struct kbase_mem_pool *pool, struct page *p); ++ ++/** + * kbase_region_tracker_init - Initialize the region tracker data structure + * @kctx: kbase context + * @@ -227627,9 +263157,9 @@ index 000000000000..2238fbfe9e99 +/** + * kbase_region_tracker_term_rbtree - Free memory for a region tracker + * -+ * This will free all the regions within the region tracker -+ * + * @rbtree: Region tracker tree root ++ * ++ * This will free all the regions within the region tracker + */ +void kbase_region_tracker_term_rbtree(struct rb_root *rbtree); + @@ -227639,17 +263169,22 @@ index 000000000000..2238fbfe9e99 + struct rb_root *rbtree, u64 gpu_addr); + +/** -+ * @brief Check that a pointer is actually a valid region. ++ * kbase_region_tracker_find_region_base_address - Check that a pointer is ++ * actually a valid region. ++ * @kctx: kbase context containing the region ++ * @gpu_addr: pointer to check + * + * Must be called with context lock held. ++ * ++ * Return: pointer to the valid region on success, NULL otherwise + */ +struct kbase_va_region *kbase_region_tracker_find_region_base_address( + struct kbase_context *kctx, u64 gpu_addr); +struct kbase_va_region *kbase_find_region_base_address(struct rb_root *rbtree, + u64 gpu_addr); + -+struct kbase_va_region *kbase_alloc_free_region(struct rb_root *rbtree, -+ u64 start_pfn, size_t nr_pages, int zone); ++struct kbase_va_region *kbase_alloc_free_region(struct kbase_device *kbdev, struct rb_root *rbtree, ++ u64 start_pfn, size_t nr_pages, int zone); +void kbase_free_alloced_region(struct kbase_va_region *reg); +int kbase_add_va_region(struct kbase_context *kctx, struct kbase_va_region *reg, + u64 addr, size_t nr_pages, size_t align); @@ -227660,6 +263195,32 @@ index 000000000000..2238fbfe9e99 +bool kbase_check_alloc_flags(unsigned long flags); +bool kbase_check_import_flags(unsigned long flags); + ++static inline bool kbase_import_size_is_valid(struct kbase_device *kbdev, u64 va_pages) ++{ ++ if (va_pages > KBASE_MEM_ALLOC_MAX_SIZE) { ++ dev_dbg( ++ kbdev->dev, ++ "Import attempted with va_pages==%lld larger than KBASE_MEM_ALLOC_MAX_SIZE!", ++ (unsigned long long)va_pages); ++ return false; ++ } ++ ++ return true; ++} ++ ++static inline bool kbase_alias_size_is_valid(struct kbase_device *kbdev, u64 va_pages) ++{ ++ if (va_pages > KBASE_MEM_ALLOC_MAX_SIZE) { ++ dev_dbg( ++ kbdev->dev, ++ "Alias attempted with va_pages==%lld larger than KBASE_MEM_ALLOC_MAX_SIZE!", ++ (unsigned long long)va_pages); ++ return false; ++ } ++ ++ return true; ++} ++ +/** + * kbase_check_alloc_sizes - check user space sizes parameters for an + * allocation @@ -227668,7 +263229,7 @@ index 000000000000..2238fbfe9e99 + * @flags: The flags passed from user space + * @va_pages: The size of the requested region, in pages. + * @commit_pages: Number of pages to commit initially. -+ * @extent: Number of pages to grow by on GPU page fault and/or alignment ++ * @extension: Number of pages to grow by on GPU page fault and/or alignment + * (depending on flags) + * + * Makes checks on the size parameters passed in from user space for a memory @@ -227677,7 +263238,7 @@ index 000000000000..2238fbfe9e99 + * Return: 0 if sizes are valid for these flags, negative error code otherwise + */ +int kbase_check_alloc_sizes(struct kbase_context *kctx, unsigned long flags, -+ u64 va_pages, u64 commit_pages, u64 extent); ++ u64 va_pages, u64 commit_pages, u64 extension); + +/** + * kbase_update_region_flags - Convert user space flags to kernel region flags @@ -227694,22 +263255,86 @@ index 000000000000..2238fbfe9e99 +int kbase_update_region_flags(struct kbase_context *kctx, + struct kbase_va_region *reg, unsigned long flags); + ++/** ++ * kbase_gpu_vm_lock() - Acquire the per-context region list lock ++ * @kctx: KBase context ++ * ++ * Care must be taken when making an allocation whilst holding this lock, because of interaction ++ * with the Kernel's OoM-killer and use of this lock in &vm_operations_struct close() handlers. ++ * ++ * If this lock is taken during a syscall, and/or the allocation is 'small' then it is safe to use. ++ * ++ * If the caller is not in a syscall, and the allocation is 'large', then it must not hold this ++ * lock. ++ * ++ * This is because the kernel OoM killer might target the process corresponding to that same kbase ++ * context, and attempt to call the context's close() handlers for its open VMAs. This is safe if ++ * the allocating caller is in a syscall, because the VMA close() handlers are delayed until all ++ * syscalls have finished (noting that no new syscalls can start as the remaining user threads will ++ * have been killed too), and so there is no possibility of contention between the thread ++ * allocating with this lock held, and the VMA close() handler. ++ * ++ * However, outside of a syscall (e.g. a kworker or other kthread), one of kbase's VMA close() ++ * handlers (kbase_cpu_vm_close()) also takes this lock, and so prevents the process from being ++ * killed until the caller of the function allocating memory has released this lock. On subsequent ++ * retries for allocating a page, the OoM killer would be re-invoked but skips over the process ++ * stuck in its close() handler. ++ * ++ * Also because the caller is not in a syscall, the page allocation code in the kernel is not aware ++ * that the allocation is being done on behalf of another process, and so does not realize that ++ * process has received a kill signal due to an OoM, and so will continually retry with the OoM ++ * killer until enough memory has been released, or until all other killable processes have been ++ * killed (at which point the kernel halts with a panic). ++ * ++ * However, if the allocation outside of a syscall is small enough to be satisfied by killing ++ * another process, then the allocation completes, the caller releases this lock, and ++ * kbase_cpu_vm_close() can unblock and allow the process to be killed. ++ * ++ * Hence, this is effectively a deadlock with kbase_cpu_vm_close(), except that if the memory ++ * allocation is small enough the deadlock can be resolved. For that reason, such a memory deadlock ++ * is NOT discovered with CONFIG_PROVE_LOCKING. ++ * ++ * If this may be called outside of a syscall, consider moving allocations outside of this lock, or ++ * use __GFP_NORETRY for such allocations (which will allow direct-reclaim attempts, but will ++ * prevent OoM kills to satisfy the allocation, and will just fail the allocation instead). ++ */ +void kbase_gpu_vm_lock(struct kbase_context *kctx); ++ ++/** ++ * kbase_gpu_vm_unlock() - Release the per-context region list lock ++ * @kctx: KBase context ++ */ +void kbase_gpu_vm_unlock(struct kbase_context *kctx); + +int kbase_alloc_phy_pages(struct kbase_va_region *reg, size_t vsize, size_t size); + +/** -+ * @brief Register region and map it on the GPU. ++ * kbase_gpu_mmap - Register region and map it on the GPU. ++ * ++ * @kctx: kbase context containing the region ++ * @reg: the region to add ++ * @addr: the address to insert the region at ++ * @nr_pages: the number of pages in the region ++ * @align: the minimum alignment in pages ++ * @mmu_sync_info: Indicates whether this call is synchronous wrt MMU ops. + * + * Call kbase_add_va_region() and map the region on the GPU. ++ * ++ * Return: 0 on success, error code otherwise. + */ -+int kbase_gpu_mmap(struct kbase_context *kctx, struct kbase_va_region *reg, u64 addr, size_t nr_pages, size_t align); ++int kbase_gpu_mmap(struct kbase_context *kctx, struct kbase_va_region *reg, ++ u64 addr, size_t nr_pages, size_t align, ++ enum kbase_caller_mmu_sync_info mmu_sync_info); + +/** -+ * @brief Remove the region from the GPU and unregister it. ++ * kbase_gpu_munmap - Remove the region from the GPU and unregister it. ++ * ++ * @kctx: KBase context ++ * @reg: The region to remove + * + * Must be called with context lock held. ++ * ++ * Return: 0 on success, error code otherwise. + */ +int kbase_gpu_munmap(struct kbase_context *kctx, struct kbase_va_region *reg); + @@ -227717,13 +263342,13 @@ index 000000000000..2238fbfe9e99 + * kbase_mmu_update - Configure an address space on the GPU to the specified + * MMU tables + * -+ * The caller has the following locking conditions: -+ * - It must hold kbase_device->mmu_hw_mutex -+ * - It must hold the hwaccess_lock -+ * + * @kbdev: Kbase device structure + * @mmut: The set of MMU tables to be configured on the address space + * @as_nr: The address space to be configured ++ * ++ * The caller has the following locking conditions: ++ * - It must hold kbase_device->mmu_hw_mutex ++ * - It must hold the hwaccess_lock + */ +void kbase_mmu_update(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, + int as_nr); @@ -227756,9 +263381,13 @@ index 000000000000..2238fbfe9e99 + +void kbase_mmu_interrupt(struct kbase_device *kbdev, u32 irq_stat); + ++#if defined(CONFIG_MALI_VECTOR_DUMP) +/** + * kbase_mmu_dump() - Dump the MMU tables to a buffer. + * ++ * @kctx: The kbase context to dump ++ * @nr_pages: The number of pages to allocate for the buffer. ++ * + * This function allocates a buffer (of @c nr_pages pages) to hold a dump + * of the MMU tables and fills it. If the buffer is too small + * then the return value will be NULL. @@ -227768,13 +263397,11 @@ index 000000000000..2238fbfe9e99 + * The buffer returned should be freed with @ref vfree when it is no longer + * required. + * -+ * @kctx: The kbase context to dump -+ * @nr_pages: The number of pages to allocate for the buffer. -+ * + * Return: The address of the buffer containing the MMU dump or NULL on error + * (including if the @c nr_pages is too small) + */ +void *kbase_mmu_dump(struct kbase_context *kctx, int nr_pages); ++#endif + +/** + * kbase_sync_now - Perform cache maintenance on a memory region @@ -227800,11 +263427,11 @@ index 000000000000..2238fbfe9e99 + * kbasep_os_process_page_usage_update() - Update the memory allocation + * counters for the current process. + * -+ * OS specific call to updates the current memory allocation counters -+ * for the current process with the supplied delta. -+ * + * @kctx: The kbase context + * @pages: The desired delta to apply to the memory usage counters. ++ * ++ * OS specific call to updates the current memory allocation counters ++ * for the current process with the supplied delta. + */ + +void kbasep_os_process_page_usage_update(struct kbase_context *kctx, int pages); @@ -227813,11 +263440,11 @@ index 000000000000..2238fbfe9e99 + * kbase_process_page_usage_inc() - Add to the memory allocation counters for + * the current process + * -+ * OS specific call to add to the current memory allocation counters for -+ * the current process by the supplied amount. -+ * + * @kctx: The kernel base context used for the allocation. + * @pages: The desired delta to apply to the memory usage counters. ++ * ++ * OS specific call to add to the current memory allocation counters for ++ * the current process by the supplied amount. + */ + +static inline void kbase_process_page_usage_inc(struct kbase_context *kctx, int pages) @@ -227829,11 +263456,11 @@ index 000000000000..2238fbfe9e99 + * kbase_process_page_usage_dec() - Subtract from the memory allocation + * counters for the current process. + * -+ * OS specific call to subtract from the current memory allocation counters -+ * for the current process by the supplied amount. -+ * + * @kctx: The kernel base context used for the allocation. + * @pages: The desired delta to apply to the memory usage counters. ++ * ++ * OS specific call to subtract from the current memory allocation counters ++ * for the current process by the supplied amount. + */ + +static inline void kbase_process_page_usage_dec(struct kbase_context *kctx, int pages) @@ -227845,16 +263472,16 @@ index 000000000000..2238fbfe9e99 + * kbasep_find_enclosing_cpu_mapping_offset() - Find the offset of the CPU + * mapping of a memory allocation containing a given address range + * -+ * Searches for a CPU mapping of any part of any region that fully encloses the -+ * CPU virtual address range specified by @uaddr and @size. Returns a failure -+ * indication if only part of the address range lies within a CPU mapping. -+ * + * @kctx: The kernel base context used for the allocation. + * @uaddr: Start of the CPU virtual address range. + * @size: Size of the CPU virtual address range (in bytes). + * @offset: The offset from the start of the allocation to the specified CPU + * virtual address. + * ++ * Searches for a CPU mapping of any part of any region that fully encloses the ++ * CPU virtual address range specified by @uaddr and @size. Returns a failure ++ * indication if only part of the address range lies within a CPU mapping. ++ * + * Return: 0 if offset was obtained successfully. Error code otherwise. + */ +int kbasep_find_enclosing_cpu_mapping_offset( @@ -227866,13 +263493,6 @@ index 000000000000..2238fbfe9e99 + * the start of GPU virtual memory region which encloses @gpu_addr for the + * @size length in bytes + * -+ * Searches for the memory region in GPU virtual memory space which contains -+ * the region defined by the @gpu_addr and @size, where @gpu_addr is the -+ * beginning and @size the length in bytes of the provided region. If found, -+ * the location of the start address of the GPU virtual memory region is -+ * passed in @start pointer and the location of the offset of the region into -+ * the GPU virtual memory region is passed in @offset pointer. -+ * + * @kctx: The kernel base context within which the memory is searched. + * @gpu_addr: GPU virtual address for which the region is sought; defines + * the beginning of the provided region. @@ -227882,6 +263502,15 @@ index 000000000000..2238fbfe9e99 + * the found GPU virtual memory region is. + * @offset: Pointer to the location where the offset of @gpu_addr into + * the found GPU virtual memory region is. ++ * ++ * Searches for the memory region in GPU virtual memory space which contains ++ * the region defined by the @gpu_addr and @size, where @gpu_addr is the ++ * beginning and @size the length in bytes of the provided region. If found, ++ * the location of the start address of the GPU virtual memory region is ++ * passed in @start pointer and the location of the offset of the region into ++ * the GPU virtual memory region is passed in @offset pointer. ++ * ++ * Return: 0 on success, error code otherwise. + */ +int kbasep_find_enclosing_gpu_mapping_start_and_offset( + struct kbase_context *kctx, @@ -227892,15 +263521,21 @@ index 000000000000..2238fbfe9e99 + * @alloc: allocation object to add pages to + * @nr_pages_requested: number of physical pages to allocate + * -+ * Allocates \a nr_pages_requested and updates the alloc object. ++ * Allocates @nr_pages_requested and updates the alloc object. + * -+ * Return: 0 if all pages have been successfully allocated. Error code otherwise ++ * Note: if kbase_gpu_vm_lock() is to be held around this function to ensure thread-safe updating ++ * of @alloc, then refer to the documentation of kbase_gpu_vm_lock() about the requirements of ++ * either calling during a syscall, or ensuring the allocation is small. These requirements prevent ++ * an effective deadlock between the kernel's OoM killer and kbase's VMA close() handlers, which ++ * could take kbase_gpu_vm_lock() too. + * -+ * Note : The caller must not hold vm_lock, as this could cause a deadlock if -+ * the kernel OoM killer runs. If the caller must allocate pages while holding -+ * this lock, it should use kbase_mem_pool_alloc_pages_locked() instead. ++ * If the requirements of kbase_gpu_vm_lock() cannot be satisfied when calling this function, but ++ * @alloc must still be updated in a thread-safe way, then instead use ++ * kbase_alloc_phy_pages_helper_locked() and restructure callers into the sequence outlined there. + * + * This function cannot be used from interrupt context ++ * ++ * Return: 0 if all pages have been successfully allocated. Error code otherwise + */ +int kbase_alloc_phy_pages_helper(struct kbase_mem_phy_alloc *alloc, + size_t nr_pages_requested); @@ -227910,17 +263545,19 @@ index 000000000000..2238fbfe9e99 + * @alloc: allocation object to add pages to + * @pool: Memory pool to allocate from + * @nr_pages_requested: number of physical pages to allocate -+ * @prealloc_sa: Information about the partial allocation if the amount -+ * of memory requested is not a multiple of 2MB. One -+ * instance of struct kbase_sub_alloc must be allocated by -+ * the caller iff CONFIG_MALI_2MB_ALLOC is enabled. + * -+ * Allocates \a nr_pages_requested and updates the alloc object. This function -+ * does not allocate new pages from the kernel, and therefore will never trigger -+ * the OoM killer. Therefore, it can be run while the vm_lock is held. ++ * @prealloc_sa: Information about the partial allocation if the amount of memory requested ++ * is not a multiple of 2MB. One instance of struct kbase_sub_alloc must be ++ * allocated by the caller if kbdev->pagesize_2mb is enabled. + * -+ * As new pages can not be allocated, the caller must ensure there are -+ * sufficient pages in the pool. Usage of this function should look like : ++ * Allocates @nr_pages_requested and updates the alloc object. This function does not allocate new ++ * pages from the kernel, and therefore will never trigger the OoM killer. Therefore, it can be ++ * called whilst a thread operating outside of a syscall has held the region list lock ++ * (kbase_gpu_vm_lock()), as it will not cause an effective deadlock with VMA close() handlers used ++ * by the OoM killer. ++ * ++ * As new pages can not be allocated, the caller must ensure there are sufficient pages in the ++ * pool. Usage of this function should look like : + * + * kbase_gpu_vm_lock(kctx); + * kbase_mem_pool_lock(pool) @@ -227933,24 +263570,24 @@ index 000000000000..2238fbfe9e99 + * } + * kbase_alloc_phy_pages_helper_locked(pool) + * kbase_mem_pool_unlock(pool) -+ * Perform other processing that requires vm_lock... ++ * // Perform other processing that requires vm_lock... + * kbase_gpu_vm_unlock(kctx); + * -+ * This ensures that the pool can be grown to the required size and that the -+ * allocation can complete without another thread using the newly grown pages. ++ * This ensures that the pool can be grown to the required size and that the allocation can ++ * complete without another thread using the newly grown pages. + * -+ * If CONFIG_MALI_2MB_ALLOC is defined and the allocation is >= 2MB, then -+ * @pool must be alloc->imported.native.kctx->lp_mem_pool. Otherwise it must be -+ * alloc->imported.native.kctx->mem_pool. -+ * @prealloc_sa is used to manage the non-2MB sub-allocation. It has to be -+ * pre-allocated because we must not sleep (due to the usage of kmalloc()) -+ * whilst holding pool->pool_lock. -+ * @prealloc_sa shall be set to NULL if it has been consumed by this function -+ * to indicate that the caller must not free it. ++ * If kbdev->pagesize_2mb is enabled and the allocation is >= 2MB, then @pool must be one of the ++ * pools from alloc->imported.native.kctx->mem_pools.large[]. Otherwise it must be one of the ++ * mempools from alloc->imported.native.kctx->mem_pools.small[]. + * -+ * Return: Pointer to array of allocated pages. NULL on failure. ++ * @prealloc_sa is used to manage the non-2MB sub-allocation. It has to be pre-allocated because we ++ * must not sleep (due to the usage of kmalloc()) whilst holding pool->pool_lock. @prealloc_sa ++ * shall be set to NULL if it has been consumed by this function to indicate that the caller no ++ * longer owns it and should not access it further. + * -+ * Note : Caller must hold pool->pool_lock ++ * Note: Caller must hold @pool->pool_lock ++ * ++ * Return: Pointer to array of allocated pages. NULL on failure. + */ +struct tagged_addr *kbase_alloc_phy_pages_helper_locked( + struct kbase_mem_phy_alloc *alloc, struct kbase_mem_pool *pool, @@ -227960,11 +263597,11 @@ index 000000000000..2238fbfe9e99 +/** + * kbase_free_phy_pages_helper() - Free physical pages. + * -+ * Frees \a nr_pages and updates the alloc object. -+ * + * @alloc: allocation object to free pages from + * @nr_pages_to_free: number of physical pages to free + * ++ * Free @nr_pages_to_free pages and updates the alloc object. ++ * + * Return: 0 on success, otherwise a negative error code + */ +int kbase_free_phy_pages_helper(struct kbase_mem_phy_alloc *alloc, size_t nr_pages_to_free); @@ -227989,14 +263626,15 @@ index 000000000000..2238fbfe9e99 + struct kbase_mem_pool *pool, struct tagged_addr *pages, + size_t nr_pages_to_free); + -+static inline void kbase_set_dma_addr(struct page *p, dma_addr_t dma_addr) ++static inline void kbase_set_dma_addr_as_priv(struct page *p, dma_addr_t dma_addr) +{ + SetPagePrivate(p); + if (sizeof(dma_addr_t) > sizeof(p->private)) { + /* on 32-bit ARM with LPAE dma_addr_t becomes larger, but the + * private field stays the same. So we have to be clever and + * use the fact that we only store DMA addresses of whole pages, -+ * so the low bits should be zero */ ++ * so the low bits should be zero ++ */ + KBASE_DEBUG_ASSERT(!(dma_addr & (PAGE_SIZE - 1))); + set_page_private(p, dma_addr >> PAGE_SHIFT); + } else { @@ -228004,7 +263642,7 @@ index 000000000000..2238fbfe9e99 + } +} + -+static inline dma_addr_t kbase_dma_addr(struct page *p) ++static inline dma_addr_t kbase_dma_addr_as_priv(struct page *p) +{ + if (sizeof(dma_addr_t) > sizeof(p->private)) + return ((dma_addr_t)page_private(p)) << PAGE_SHIFT; @@ -228012,11 +263650,34 @@ index 000000000000..2238fbfe9e99 + return (dma_addr_t)page_private(p); +} + -+static inline void kbase_clear_dma_addr(struct page *p) ++static inline void kbase_clear_dma_addr_as_priv(struct page *p) +{ + ClearPagePrivate(p); +} + ++static inline struct kbase_page_metadata *kbase_page_private(struct page *p) ++{ ++ return (struct kbase_page_metadata *)page_private(p); ++} ++ ++static inline dma_addr_t kbase_dma_addr(struct page *p) ++{ ++ if (kbase_page_migration_enabled) ++ return kbase_page_private(p)->dma_addr; ++ ++ return kbase_dma_addr_as_priv(p); ++} ++ ++static inline dma_addr_t kbase_dma_addr_from_tagged(struct tagged_addr tagged_pa) ++{ ++ phys_addr_t pa = as_phys_addr_t(tagged_pa); ++ struct page *page = pfn_to_page(PFN_DOWN(pa)); ++ dma_addr_t dma_addr = ++ is_huge(tagged_pa) ? kbase_dma_addr_as_priv(page) : kbase_dma_addr(page); ++ ++ return dma_addr; ++} ++ +/** + * kbase_flush_mmu_wqs() - Flush MMU workqueues. + * @kbdev: Device pointer. @@ -228048,7 +263709,7 @@ index 000000000000..2238fbfe9e99 +void kbase_sync_single_for_cpu(struct kbase_device *kbdev, dma_addr_t handle, + size_t size, enum dma_data_direction dir); + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) +/** + * kbase_jit_debugfs_init - Add per context debugfs entry for JIT. + * @kctx: kbase context @@ -228060,7 +263721,7 @@ index 000000000000..2238fbfe9e99 + * kbase_jit_init - Initialize the JIT memory pool management + * @kctx: kbase context + * -+ * Returns zero on success or negative error number on failure. ++ * Return: zero on success or negative error number on failure. + */ +int kbase_jit_init(struct kbase_context *kctx); + @@ -228175,8 +263836,8 @@ index 000000000000..2238fbfe9e99 + unsigned int flags); + +/** -+ * jit_trim_necessary_pages() - calculate and trim the least pages possible to -+ * satisfy a new JIT allocation ++ * kbase_jit_trim_necessary_pages() - calculate and trim the least pages ++ * possible to satisfy a new JIT allocation + * + * @kctx: Pointer to the kbase context + * @needed_pages: Number of JIT physical pages by which trimming is requested. @@ -228298,11 +263959,11 @@ index 000000000000..2238fbfe9e99 +/** + * kbase_has_exec_va_zone - EXEC_VA zone predicate + * ++ * @kctx: kbase context ++ * + * Determine whether an EXEC_VA zone has been created for the GPU address space + * of the given kbase context. + * -+ * @kctx: kbase context -+ * + * Return: True if the kbase context has an EXEC_VA zone. + */ +bool kbase_has_exec_va_zone(struct kbase_context *kctx); @@ -228310,25 +263971,38 @@ index 000000000000..2238fbfe9e99 +/** + * kbase_map_external_resource - Map an external resource to the GPU. + * @kctx: kbase context. -+ * @reg: The region to map. ++ * @reg: External resource to map. + * @locked_mm: The mm_struct which has been locked for this operation. + * -+ * Return: The physical allocation which backs the region on success or NULL -+ * on failure. ++ * On successful mapping, the VA region and the gpu_alloc refcounts will be ++ * increased, making it safe to use and store both values directly. ++ * ++ * Return: Zero on success, or negative error code. + */ -+struct kbase_mem_phy_alloc *kbase_map_external_resource( -+ struct kbase_context *kctx, struct kbase_va_region *reg, -+ struct mm_struct *locked_mm); ++int kbase_map_external_resource(struct kbase_context *kctx, struct kbase_va_region *reg, ++ struct mm_struct *locked_mm); + +/** + * kbase_unmap_external_resource - Unmap an external resource from the GPU. + * @kctx: kbase context. -+ * @reg: The region to unmap or NULL if it has already been released. -+ * @alloc: The physical allocation being unmapped. ++ * @reg: VA region corresponding to external resource ++ * ++ * On successful unmapping, the VA region and the gpu_alloc refcounts will ++ * be decreased. If the refcount reaches zero, both @reg and the corresponding ++ * allocation may be freed, so using them after returning from this function ++ * requires the caller to explicitly check their state. + */ -+void kbase_unmap_external_resource(struct kbase_context *kctx, -+ struct kbase_va_region *reg, struct kbase_mem_phy_alloc *alloc); ++void kbase_unmap_external_resource(struct kbase_context *kctx, struct kbase_va_region *reg); + ++/** ++ * kbase_unpin_user_buf_page - Unpin a page of a user buffer. ++ * @page: page to unpin ++ * ++ * The caller must have ensured that there are no CPU mappings for @page (as ++ * might be created from the struct kbase_mem_phy_alloc that tracks @page), and ++ * that userspace will not be able to recreate the CPU mappings again. ++ */ ++void kbase_unpin_user_buf_page(struct page *page); + +/** + * kbase_jd_user_buf_pin_pages - Pin the pages of a user buffer. @@ -228348,7 +264022,7 @@ index 000000000000..2238fbfe9e99 + * kbase_sticky_resource_init - Initialize sticky resource management. + * @kctx: kbase context + * -+ * Returns zero on success or negative error number on failure. ++ * Return: zero on success or negative error number on failure. + */ +int kbase_sticky_resource_init(struct kbase_context *kctx); + @@ -228410,7 +264084,7 @@ index 000000000000..2238fbfe9e99 +} + +/** -+ * kbase_mem_pool_lock - Release a memory pool ++ * kbase_mem_pool_unlock - Release a memory pool + * @pool: Memory pool to lock + */ +static inline void kbase_mem_pool_unlock(struct kbase_mem_pool *pool) @@ -228470,7 +264144,7 @@ index 000000000000..2238fbfe9e99 + * manage the shared interface segment of MCU firmware address space. + * @kbdev: Pointer to the kbase device + * -+ * Returns zero on success or negative error number on failure. ++ * Return: zero on success or negative error number on failure. + */ +int kbase_mcu_shared_interface_region_tracker_init(struct kbase_device *kbdev); + @@ -228489,7 +264163,7 @@ index 000000000000..2238fbfe9e99 + * + * Map a dma-buf on the GPU. The mappings are reference counted. + * -+ * Returns 0 on success, or a negative error code. ++ * Return: 0 on success, or a negative error code. + */ +int kbase_mem_umm_map(struct kbase_context *kctx, + struct kbase_va_region *reg); @@ -228509,7 +264183,7 @@ index 000000000000..2238fbfe9e99 + * @alloc must be a valid physical allocation of type + * KBASE_MEM_TYPE_IMPORTED_UMM that was previously mapped by + * kbase_mem_umm_map(). The dma-buf attachment referenced by @alloc will -+ * release it's mapping reference, and if the refcount reaches 0, also be be ++ * release it's mapping reference, and if the refcount reaches 0, also be + * unmapped, regardless of the value of @reg. + */ +void kbase_mem_umm_unmap(struct kbase_context *kctx, @@ -228555,21 +264229,156 @@ index 000000000000..2238fbfe9e99 + void *src_page, size_t *to_copy, unsigned int nr_pages, + unsigned int *target_page_nr, size_t offset); + ++/** ++ * kbase_reg_zone_end_pfn - return the end Page Frame Number of @zone ++ * @zone: zone to query ++ * ++ * Return: The end of the zone corresponding to @zone ++ */ ++static inline u64 kbase_reg_zone_end_pfn(struct kbase_reg_zone *zone) ++{ ++ return zone->base_pfn + zone->va_size_pages; ++} ++ ++/** ++ * kbase_ctx_reg_zone_init - initialize a zone in @kctx ++ * @kctx: Pointer to kbase context ++ * @zone_bits: A KBASE_REG_ZONE_<...> to initialize ++ * @base_pfn: Page Frame Number in GPU virtual address space for the start of ++ * the Zone ++ * @va_size_pages: Size of the Zone in pages ++ */ ++static inline void kbase_ctx_reg_zone_init(struct kbase_context *kctx, ++ unsigned long zone_bits, ++ u64 base_pfn, u64 va_size_pages) ++{ ++ struct kbase_reg_zone *zone; ++ ++ lockdep_assert_held(&kctx->reg_lock); ++ WARN_ON(!kbase_is_ctx_reg_zone(zone_bits)); ++ ++ zone = &kctx->reg_zone[KBASE_REG_ZONE_IDX(zone_bits)]; ++ *zone = (struct kbase_reg_zone){ ++ .base_pfn = base_pfn, .va_size_pages = va_size_pages, ++ }; ++} ++ ++/** ++ * kbase_ctx_reg_zone_get_nolock - get a zone from @kctx where the caller does ++ * not have @kctx 's region lock ++ * @kctx: Pointer to kbase context ++ * @zone_bits: A KBASE_REG_ZONE_<...> to retrieve ++ * ++ * This should only be used in performance-critical paths where the code is ++ * resilient to a race with the zone changing. ++ * ++ * Return: The zone corresponding to @zone_bits ++ */ ++static inline struct kbase_reg_zone * ++kbase_ctx_reg_zone_get_nolock(struct kbase_context *kctx, ++ unsigned long zone_bits) ++{ ++ WARN_ON(!kbase_is_ctx_reg_zone(zone_bits)); ++ ++ return &kctx->reg_zone[KBASE_REG_ZONE_IDX(zone_bits)]; ++} ++ ++/** ++ * kbase_ctx_reg_zone_get - get a zone from @kctx ++ * @kctx: Pointer to kbase context ++ * @zone_bits: A KBASE_REG_ZONE_<...> to retrieve ++ * ++ * The get is not refcounted - there is no corresponding 'put' operation ++ * ++ * Return: The zone corresponding to @zone_bits ++ */ ++static inline struct kbase_reg_zone * ++kbase_ctx_reg_zone_get(struct kbase_context *kctx, unsigned long zone_bits) ++{ ++ lockdep_assert_held(&kctx->reg_lock); ++ WARN_ON(!kbase_is_ctx_reg_zone(zone_bits)); ++ ++ return &kctx->reg_zone[KBASE_REG_ZONE_IDX(zone_bits)]; ++} ++ ++/** ++ * kbase_mem_allow_alloc - Check if allocation of GPU memory is allowed ++ * @kctx: Pointer to kbase context ++ * ++ * Don't allow the allocation of GPU memory if the ioctl has been issued ++ * from the forked child process using the mali device file fd inherited from ++ * the parent process. ++ * ++ * Return: true if allocation is allowed. ++ */ ++static inline bool kbase_mem_allow_alloc(struct kbase_context *kctx) ++{ ++ return (kctx->process_mm == current->mm); ++} ++ ++/** ++ * kbase_mem_mmgrab - Wrapper function to take reference on mm_struct of current process ++ */ ++static inline void kbase_mem_mmgrab(void) ++{ ++ /* This merely takes a reference on the memory descriptor structure ++ * i.e. mm_struct of current process and not on its address space and ++ * so won't block the freeing of address space on process exit. ++ */ ++#if KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE ++ atomic_inc(¤t->mm->mm_count); ++#else ++ mmgrab(current->mm); ++#endif ++} ++ ++/** ++ * kbase_mem_group_id_get - Get group ID from flags ++ * @flags: Flags to pass to base_mem_alloc ++ * ++ * This inline function extracts the encoded group ID from flags ++ * and converts it into numeric value (0~15). ++ * ++ * Return: group ID(0~15) extracted from the parameter ++ */ ++static inline int kbase_mem_group_id_get(base_mem_alloc_flags flags) ++{ ++ KBASE_DEBUG_ASSERT((flags & ~BASE_MEM_FLAGS_INPUT_MASK) == 0); ++ return (int)BASE_MEM_GROUP_ID_GET(flags); ++} ++ ++/** ++ * kbase_mem_group_id_set - Set group ID into base_mem_alloc_flags ++ * @id: group ID(0~15) you want to encode ++ * ++ * This inline function encodes specific group ID into base_mem_alloc_flags. ++ * Parameter 'id' should lie in-between 0 to 15. ++ * ++ * Return: base_mem_alloc_flags with the group ID (id) encoded ++ * ++ * The return value can be combined with other flags against base_mem_alloc ++ * to identify a specific memory group. ++ */ ++static inline base_mem_alloc_flags kbase_mem_group_id_set(int id) ++{ ++ return BASE_MEM_GROUP_ID_SET(id); ++} +#endif /* _KBASE_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c new file mode 100755 -index 000000000000..99b5b852667e +index 000000000..f1251a4ed --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c -@@ -0,0 +1,3425 @@ +@@ -0,0 +1,3831 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -228580,15 +264389,10 @@ index 000000000000..99b5b852667e + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/** -+ * @file mali_kbase_mem_linux.c -+ * Base kernel memory APIs, Linux implementation. ++ * DOC: Base kernel memory APIs, Linux implementation. + */ + +#include @@ -228599,22 +264403,21 @@ index 000000000000..99b5b852667e +#include +#include +#include -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) && \ -+ (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) -+#include -+#endif /* LINUX_VERSION_CODE >= 3.5.0 && < 4.8.0 */ +#include +#include +#include +#include -+ ++#include ++#include ++#include +#include +#include +#include -+#include ++#include +#include +#include +#include ++#include + +#if ((KERNEL_VERSION(5, 3, 0) <= LINUX_VERSION_CODE) || \ + (KERNEL_VERSION(5, 0, 0) > LINUX_VERSION_CODE)) @@ -228654,23 +264457,34 @@ index 000000000000..99b5b852667e +#define IR_THRESHOLD_STEPS (256u) + +#if MALI_USE_CSF -+static int kbase_csf_cpu_mmap_user_reg_page(struct kbase_context *kctx, -+ struct vm_area_struct *vma); -+static int kbase_csf_cpu_mmap_user_io_pages(struct kbase_context *kctx, -+ struct vm_area_struct *vma); ++static int kbase_csf_cpu_mmap_user_reg_page(struct kbase_context *kctx, struct vm_area_struct *vma); ++static int kbase_csf_cpu_mmap_user_io_pages(struct kbase_context *kctx, struct vm_area_struct *vma); +#endif + -+static int kbase_vmap_phy_pages(struct kbase_context *kctx, -+ struct kbase_va_region *reg, u64 offset_bytes, size_t size, -+ struct kbase_vmap_struct *map); ++static int kbase_vmap_phy_pages(struct kbase_context *kctx, struct kbase_va_region *reg, ++ u64 offset_bytes, size_t size, struct kbase_vmap_struct *map, ++ kbase_vmap_flag vmap_flags); +static void kbase_vunmap_phy_pages(struct kbase_context *kctx, + struct kbase_vmap_struct *map); + +static int kbase_tracking_page_setup(struct kbase_context *kctx, struct vm_area_struct *vma); + -+static int kbase_mem_shrink_gpu_mapping(struct kbase_context *kctx, -+ struct kbase_va_region *reg, -+ u64 new_pages, u64 old_pages); ++static bool is_process_exiting(struct vm_area_struct *vma) ++{ ++ /* PF_EXITING flag can't be reliably used here for the detection ++ * of process exit, as 'mm_users' counter could still be non-zero ++ * when all threads of the process have exited. Later when the ++ * thread (which took a reference on the 'mm' of process that ++ * exited) drops it reference, the vm_ops->close method would be ++ * called for all the vmas (owned by 'mm' of process that exited) ++ * but the PF_EXITING flag may not be neccessarily set for the ++ * thread at that time. ++ */ ++ if (atomic_read(&vma->vm_mm->mm_users)) ++ return false; ++ ++ return true; ++} + +/* Retrieve the associated region pointer if the GPU address corresponds to + * one of the event memory pages. The enclosing region, if found, shouldn't @@ -228752,20 +264566,12 @@ index 000000000000..99b5b852667e + reg->cpu_alloc->type != KBASE_MEM_TYPE_NATIVE) + return -EINVAL; + -+ if (size > (KBASE_PERMANENTLY_MAPPED_MEM_LIMIT_PAGES - -+ atomic_read(&kctx->permanent_mapped_pages))) { -+ dev_warn(kctx->kbdev->dev, "Request for %llu more pages mem needing a permanent mapping would breach limit %lu, currently at %d pages", -+ (u64)size, -+ KBASE_PERMANENTLY_MAPPED_MEM_LIMIT_PAGES, -+ atomic_read(&kctx->permanent_mapped_pages)); -+ return -ENOMEM; -+ } -+ + kern_mapping = kzalloc(sizeof(*kern_mapping), GFP_KERNEL); + if (!kern_mapping) + return -ENOMEM; + -+ err = kbase_vmap_phy_pages(kctx, reg, 0u, size_bytes, kern_mapping); ++ err = kbase_vmap_phy_pages(kctx, reg, 0u, size_bytes, kern_mapping, ++ KBASE_VMAP_FLAG_PERMANENT_MAP_ACCOUNTING); + if (err < 0) + goto vmap_fail; + @@ -228773,7 +264579,6 @@ index 000000000000..99b5b852667e + reg->flags &= ~KBASE_REG_GROWABLE; + + reg->cpu_alloc->permanent_map = kern_mapping; -+ atomic_add(size, &kctx->permanent_mapped_pages); + + return 0; +vmap_fail: @@ -228789,13 +264594,6 @@ index 000000000000..99b5b852667e + kfree(alloc->permanent_map); + + alloc->permanent_map = NULL; -+ -+ /* Mappings are only done on cpu_alloc, so don't need to worry about -+ * this being reduced a second time if a separate gpu_alloc is -+ * freed -+ */ -+ WARN_ON(alloc->nents > atomic_read(&kctx->permanent_mapped_pages)); -+ atomic_sub(alloc->nents, &kctx->permanent_mapped_pages); +} + +void *kbase_phy_alloc_mapping_get(struct kbase_context *kctx, @@ -228859,9 +264657,9 @@ index 000000000000..99b5b852667e + */ +} + -+struct kbase_va_region *kbase_mem_alloc(struct kbase_context *kctx, -+ u64 va_pages, u64 commit_pages, u64 extent, u64 *flags, -+ u64 *gpu_va) ++struct kbase_va_region *kbase_mem_alloc(struct kbase_context *kctx, u64 va_pages, u64 commit_pages, ++ u64 extension, u64 *flags, u64 *gpu_va, ++ enum kbase_caller_mmu_sync_info mmu_sync_info) +{ + int zone; + struct kbase_va_region *reg; @@ -228873,28 +264671,31 @@ index 000000000000..99b5b852667e + KBASE_DEBUG_ASSERT(gpu_va); + + dev = kctx->kbdev->dev; -+ dev_dbg(dev, "Allocating %lld va_pages, %lld commit_pages, %lld extent, 0x%llX flags\n", -+ va_pages, commit_pages, extent, *flags); ++ dev_dbg(dev, ++ "Allocating %lld va_pages, %lld commit_pages, %lld extension, 0x%llX flags\n", ++ va_pages, commit_pages, extension, *flags); + +#if MALI_USE_CSF -+ *gpu_va = 0; /* return 0 on failure */ ++ if (!(*flags & BASE_MEM_FIXED)) ++ *gpu_va = 0; /* return 0 on failure */ +#else + if (!(*flags & BASE_MEM_FLAG_MAP_FIXED)) + *gpu_va = 0; /* return 0 on failure */ ++#endif + else -+ dev_err(dev, ++ dev_dbg(dev, + "Keeping requested GPU VA of 0x%llx\n", + (unsigned long long)*gpu_va); -+#endif + + if (!kbase_check_alloc_flags(*flags)) { + dev_warn(dev, -+ "kbase_mem_alloc called with bad flags (%llx)", ++ "%s called with bad flags (%llx)", ++ __func__, + (unsigned long long)*flags); + goto bad_flags; + } + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) + if (unlikely(kbase_ctx_flag(kctx, KCTX_INFINITE_CACHE))) { + /* Mask coherency flags if infinite cache is enabled to prevent + * the skipping of syncs from BASE side. @@ -228911,7 +264712,8 @@ index 000000000000..99b5b852667e + } + if ((*flags & BASE_MEM_COHERENT_SYSTEM_REQUIRED) != 0 && + !kbase_device_is_cpu_coherent(kctx->kbdev)) { -+ dev_warn(dev, "kbase_mem_alloc call required coherent mem when unavailable"); ++ dev_warn(dev, "%s call required coherent mem when unavailable", ++ __func__); + goto bad_flags; + } + if ((*flags & BASE_MEM_COHERENT_SYSTEM) != 0 && @@ -228920,7 +264722,8 @@ index 000000000000..99b5b852667e + *flags &= ~BASE_MEM_COHERENT_SYSTEM; + } + -+ if (kbase_check_alloc_sizes(kctx, *flags, va_pages, commit_pages, extent)) ++ if (kbase_check_alloc_sizes(kctx, *flags, va_pages, commit_pages, ++ extension)) + goto bad_sizes; + +#ifdef CONFIG_MALI_MEMORY_FULLY_BACKED @@ -228933,7 +264736,20 @@ index 000000000000..99b5b852667e + if (*flags & BASE_MEM_SAME_VA) { + rbtree = &kctx->reg_rbtree_same; + zone = KBASE_REG_ZONE_SAME_VA; -+ } else if ((*flags & BASE_MEM_PROT_GPU_EX) && kbase_has_exec_va_zone(kctx)) { ++ } ++#if MALI_USE_CSF ++ /* fixed va_zone always exists */ ++ else if (*flags & (BASE_MEM_FIXED | BASE_MEM_FIXABLE)) { ++ if (*flags & BASE_MEM_PROT_GPU_EX) { ++ rbtree = &kctx->reg_rbtree_exec_fixed; ++ zone = KBASE_REG_ZONE_EXEC_FIXED_VA; ++ } else { ++ rbtree = &kctx->reg_rbtree_fixed; ++ zone = KBASE_REG_ZONE_FIXED_VA; ++ } ++ } ++#endif ++ else if ((*flags & BASE_MEM_PROT_GPU_EX) && kbase_has_exec_va_zone(kctx)) { + rbtree = &kctx->reg_rbtree_exec; + zone = KBASE_REG_ZONE_EXEC_VA; + } else { @@ -228941,8 +264757,7 @@ index 000000000000..99b5b852667e + zone = KBASE_REG_ZONE_CUSTOM_VA; + } + -+ reg = kbase_alloc_free_region(rbtree, PFN_DOWN(*gpu_va), -+ va_pages, zone); ++ reg = kbase_alloc_free_region(kctx->kbdev, rbtree, PFN_DOWN(*gpu_va), va_pages, zone); + + if (!reg) { + dev_err(dev, "Failed to allocate free region"); @@ -228953,7 +264768,7 @@ index 000000000000..99b5b852667e + goto invalid_flags; + + if (kbase_reg_prepare_native(reg, kctx, -+ base_mem_group_id_get(*flags)) != 0) { ++ kbase_mem_group_id_get(*flags)) != 0) { + dev_err(dev, "Failed to prepare region"); + goto prepare_failed; + } @@ -228977,15 +264792,16 @@ index 000000000000..99b5b852667e + reg->threshold_pages = 0; + + if (*flags & BASE_MEM_GROW_ON_GPF) { -+ /* kbase_check_alloc_sizes() already checks extent is valid for -+ * assigning to reg->extent */ -+ reg->extent = extent; ++ /* kbase_check_alloc_sizes() already checks extension is valid for ++ * assigning to reg->extension ++ */ ++ reg->extension = extension; +#if !MALI_USE_CSF + } else if (*flags & BASE_MEM_TILER_ALIGN_TOP) { -+ reg->extent = extent; ++ reg->extension = extension; +#endif /* !MALI_USE_CSF */ + } else { -+ reg->extent = 0; ++ reg->extension = 0; + } + + if (kbase_alloc_phy_pages(reg, va_pages, commit_pages) != 0) { @@ -229012,14 +264828,6 @@ index 000000000000..99b5b852667e + } + } + -+#if MALI_USE_CSF -+ if (reg->flags & KBASE_REG_CSF_EVENT) { -+ WARN_ON(!(*flags & BASE_MEM_SAME_VA)); -+ -+ kbase_link_event_mem_page(kctx, reg); -+ } -+#endif -+ + /* mmap needed to setup VA? */ + if (*flags & BASE_MEM_SAME_VA) { + unsigned long cookie, cookie_nr; @@ -229042,7 +264850,26 @@ index 000000000000..99b5b852667e + + *gpu_va = (u64) cookie; + } else /* we control the VA */ { -+ if (kbase_gpu_mmap(kctx, reg, *gpu_va, va_pages, 1) != 0) { ++ size_t align = 1; ++ ++ if (kctx->kbdev->pagesize_2mb) { ++ /* If there's enough (> 33 bits) of GPU VA space, align to 2MB ++ * boundaries. The similar condition is used for mapping from ++ * the SAME_VA zone inside kbase_context_get_unmapped_area(). ++ */ ++ if (kctx->kbdev->gpu_props.mmu.va_bits > 33) { ++ if (va_pages >= (SZ_2M / SZ_4K)) ++ align = (SZ_2M / SZ_4K); ++ } ++ if (*gpu_va) ++ align = 1; ++#if !MALI_USE_CSF ++ if (reg->flags & KBASE_REG_TILER_ALIGN_TOP) ++ align = 1; ++#endif /* !MALI_USE_CSF */ ++ } ++ if (kbase_gpu_mmap(kctx, reg, *gpu_va, va_pages, align, ++ mmu_sync_info) != 0) { + dev_warn(dev, "Failed to map memory on GPU"); + kbase_gpu_vm_unlock(kctx); + goto no_mmap; @@ -229063,17 +264890,18 @@ index 000000000000..99b5b852667e +#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ + + kbase_gpu_vm_unlock(kctx); ++ ++#if MALI_USE_CSF ++ if (*flags & BASE_MEM_FIXABLE) ++ atomic64_inc(&kctx->num_fixable_allocs); ++ else if (*flags & BASE_MEM_FIXED) ++ atomic64_inc(&kctx->num_fixed_allocs); ++#endif ++ + return reg; + +no_mmap: +no_cookie: -+#if MALI_USE_CSF -+ if (reg->flags & KBASE_REG_CSF_EVENT) { -+ kbase_gpu_vm_lock(kctx); -+ kbase_unlink_event_mem_page(kctx, reg); -+ kbase_gpu_vm_unlock(kctx); -+ } -+#endif +no_kern_mapping: +no_mem: +#if MALI_JIT_PRESSURE_LIMIT_BASE @@ -229180,11 +265008,18 @@ index 000000000000..99b5b852667e +#if MALI_USE_CSF + if (KBASE_REG_CSF_EVENT & reg->flags) + *out |= BASE_MEM_CSF_EVENT; ++ if (((KBASE_REG_ZONE_MASK & reg->flags) == KBASE_REG_ZONE_FIXED_VA) || ++ ((KBASE_REG_ZONE_MASK & reg->flags) == KBASE_REG_ZONE_EXEC_FIXED_VA)) { ++ if (KBASE_REG_FIXED_ADDRESS & reg->flags) ++ *out |= BASE_MEM_FIXED; ++ else ++ *out |= BASE_MEM_FIXABLE; ++ } +#endif + if (KBASE_REG_GPU_VA_SAME_4GB_PAGE & reg->flags) + *out |= BASE_MEM_GPU_VA_SAME_4GB_PAGE; + -+ *out |= base_mem_group_id_set(reg->cpu_alloc->group_id); ++ *out |= kbase_mem_group_id_set(reg->cpu_alloc->group_id); + + WARN(*out & ~BASE_MEM_FLAGS_QUERYABLE, + "BASE_MEM_FLAGS_QUERYABLE needs updating\n"); @@ -229209,25 +265044,36 @@ index 000000000000..99b5b852667e + * @s: Shrinker + * @sc: Shrinker control + * -+ * Return: Number of pages which can be freed. ++ * Return: Number of pages which can be freed or SHRINK_EMPTY if no page remains. + */ +static +unsigned long kbase_mem_evictable_reclaim_count_objects(struct shrinker *s, + struct shrink_control *sc) +{ -+ struct kbase_context *kctx; -+ struct kbase_mem_phy_alloc *alloc; -+ unsigned long pages = 0; ++ struct kbase_context *kctx = container_of(s, struct kbase_context, reclaim); ++ int evict_nents = atomic_read(&kctx->evict_nents); ++ unsigned long nr_freeable_items; + -+ kctx = container_of(s, struct kbase_context, reclaim); ++ WARN((sc->gfp_mask & __GFP_ATOMIC), ++ "Shrinkers cannot be called for GFP_ATOMIC allocations. Check kernel mm for problems. gfp_mask==%x\n", ++ sc->gfp_mask); ++ WARN(in_atomic(), ++ "Shrinker called in atomic context. The caller must use GFP_ATOMIC or similar, then Shrinkers must not be called. gfp_mask==%x\n", ++ sc->gfp_mask); + -+ mutex_lock(&kctx->jit_evict_lock); ++ if (unlikely(evict_nents < 0)) { ++ dev_err(kctx->kbdev->dev, "invalid evict_nents(%d)", evict_nents); ++ nr_freeable_items = 0; ++ } else { ++ nr_freeable_items = evict_nents; ++ } + -+ list_for_each_entry(alloc, &kctx->evict_list, evict_node) -+ pages += alloc->nents; ++#if KERNEL_VERSION(4, 19, 0) <= LINUX_VERSION_CODE ++ if (nr_freeable_items == 0) ++ nr_freeable_items = SHRINK_EMPTY; ++#endif + -+ mutex_unlock(&kctx->jit_evict_lock); -+ return pages; ++ return nr_freeable_items; +} + +/** @@ -229236,8 +265082,8 @@ index 000000000000..99b5b852667e + * @s: Shrinker + * @sc: Shrinker control + * -+ * Return: Number of pages freed (can be less then requested) or -1 if the -+ * shrinker failed to free pages in its pool. ++ * Return: Number of pages freed (can be less then requested) or ++ * SHRINK_STOP if reclaim isn't possible. + * + * Note: + * This function accesses region structures without taking the region lock, @@ -229259,22 +265105,21 @@ index 000000000000..99b5b852667e + unsigned long freed = 0; + + kctx = container_of(s, struct kbase_context, reclaim); ++ + mutex_lock(&kctx->jit_evict_lock); + + list_for_each_entry_safe(alloc, tmp, &kctx->evict_list, evict_node) { + int err; + ++ if (!alloc->reg) ++ continue; ++ + err = kbase_mem_shrink_gpu_mapping(kctx, alloc->reg, + 0, alloc->nents); -+ if (err != 0) { -+ /* -+ * Failed to remove GPU mapping, tell the shrinker -+ * to stop trying to shrink our slab even though we -+ * have pages in it. -+ */ -+ freed = -1; -+ goto out_unlock; -+ } ++ ++ /* Failed to remove GPU mapping, proceed to next one. */ ++ if (err != 0) ++ continue; + + /* + * Update alloc->evicted before freeing the backing so the @@ -229285,6 +265130,7 @@ index 000000000000..99b5b852667e + + kbase_free_phy_pages_helper(alloc, alloc->evicted); + freed += alloc->evicted; ++ WARN_ON(atomic_sub_return(alloc->evicted, &kctx->evict_nents) < 0); + list_del_init(&alloc->evict_node); + + /* @@ -229297,42 +265143,31 @@ index 000000000000..99b5b852667e + if (freed > sc->nr_to_scan) + break; + } -+out_unlock: ++ + mutex_unlock(&kctx->jit_evict_lock); + + return freed; +} + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) -+static int kbase_mem_evictable_reclaim_shrink(struct shrinker *s, -+ struct shrink_control *sc) -+{ -+ if (sc->nr_to_scan == 0) -+ return kbase_mem_evictable_reclaim_count_objects(s, sc); -+ -+ return kbase_mem_evictable_reclaim_scan_objects(s, sc); -+} -+#endif -+ +int kbase_mem_evictable_init(struct kbase_context *kctx) +{ + INIT_LIST_HEAD(&kctx->evict_list); + mutex_init(&kctx->jit_evict_lock); + -+ /* Register shrinker */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) -+ kctx->reclaim.shrink = kbase_mem_evictable_reclaim_shrink; -+#else ++ atomic_set(&kctx->evict_nents, 0); ++ + kctx->reclaim.count_objects = kbase_mem_evictable_reclaim_count_objects; + kctx->reclaim.scan_objects = kbase_mem_evictable_reclaim_scan_objects; -+#endif + kctx->reclaim.seeks = DEFAULT_SEEKS; + /* Kernel versions prior to 3.1 : -+ * struct shrinker does not define batch */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) ++ * struct shrinker does not define batch ++ */ + kctx->reclaim.batch = 0; -+#endif ++#if KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE + register_shrinker(&kctx->reclaim); ++#else ++ register_shrinker(&kctx->reclaim, "mali-mem"); ++#endif + return 0; +} + @@ -229396,6 +265231,9 @@ index 000000000000..99b5b852667e + + lockdep_assert_held(&kctx->reg_lock); + ++ /* Memory is in the process of transitioning to the shrinker, and ++ * should ignore migration attempts ++ */ + kbase_mem_shrink_cpu_mapping(kctx, gpu_alloc->reg, + 0, gpu_alloc->nents); + @@ -229403,11 +265241,17 @@ index 000000000000..99b5b852667e + /* This allocation can't already be on a list. */ + WARN_ON(!list_empty(&gpu_alloc->evict_node)); + -+ /* -+ * Add the allocation to the eviction list, after this point the shrink ++ /* Add the allocation to the eviction list, after this point the shrink + * can reclaim it. + */ + list_add(&gpu_alloc->evict_node, &kctx->evict_list); ++ atomic_add(gpu_alloc->nents, &kctx->evict_nents); ++ ++ /* Indicate to page migration that the memory can be reclaimed by the shrinker. ++ */ ++ if (kbase_page_migration_enabled) ++ kbase_set_phy_alloc_page_status(gpu_alloc, NOT_MOVABLE); ++ + mutex_unlock(&kctx->jit_evict_lock); + kbase_mem_evictable_mark_reclaim(gpu_alloc); + @@ -229420,6 +265264,11 @@ index 000000000000..99b5b852667e + struct kbase_context *kctx = gpu_alloc->imported.native.kctx; + int err = 0; + ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; ++ + lockdep_assert_held(&kctx->reg_lock); + + mutex_lock(&kctx->jit_evict_lock); @@ -229427,6 +265276,7 @@ index 000000000000..99b5b852667e + * First remove the allocation from the eviction list as it's no + * longer eligible for eviction. + */ ++ WARN_ON(atomic_sub_return(gpu_alloc->nents, &kctx->evict_nents) < 0); + list_del_init(&gpu_alloc->evict_node); + mutex_unlock(&kctx->jit_evict_lock); + @@ -229448,11 +265298,20 @@ index 000000000000..99b5b852667e + * pre-eviction size. + */ + if (!err) -+ err = kbase_mem_grow_gpu_mapping(kctx, -+ gpu_alloc->reg, -+ gpu_alloc->evicted, 0); ++ err = kbase_mem_grow_gpu_mapping( ++ kctx, gpu_alloc->reg, ++ gpu_alloc->evicted, 0, mmu_sync_info); + + gpu_alloc->evicted = 0; ++ ++ /* Since the allocation is no longer evictable, and we ensure that ++ * it grows back to its pre-eviction size, we will consider the ++ * state of it to be ALLOCATED_MAPPED, as that is the only state ++ * in which a physical allocation could transition to NOT_MOVABLE ++ * from. ++ */ ++ if (kbase_page_migration_enabled) ++ kbase_set_phy_alloc_page_status(gpu_alloc, ALLOCATED_MAPPED); + } + } + @@ -229505,14 +265364,31 @@ index 000000000000..99b5b852667e + if (kbase_is_region_invalid_or_free(reg)) + goto out_unlock; + ++ /* There is no use case to support MEM_FLAGS_CHANGE ioctl for allocations ++ * that have NO_USER_FREE flag set, to mark them as evictable/reclaimable. ++ * This would usually include JIT allocations, Tiler heap related allocations ++ * & GPU queue ringbuffer and none of them needs to be explicitly marked ++ * as evictable by Userspace. ++ */ ++ if (kbase_va_region_is_no_user_free(reg)) ++ goto out_unlock; ++ + /* Is the region being transitioning between not needed and needed? */ + prev_needed = (KBASE_REG_DONT_NEED & reg->flags) == KBASE_REG_DONT_NEED; + new_needed = (BASE_MEM_DONT_NEED & flags) == BASE_MEM_DONT_NEED; + if (prev_needed != new_needed) { -+ /* Aliased allocations can't be made ephemeral */ ++ /* Aliased allocations can't be shrunk as the code doesn't ++ * support looking up: ++ * - all physical pages assigned to different GPU VAs ++ * - CPU mappings for the physical pages at different vm_pgoff ++ * (==GPU VA) locations. ++ */ + if (atomic_read(®->cpu_alloc->gpu_mappings) > 1) + goto out_unlock; + ++ if (atomic_read(®->cpu_alloc->kernel_mappings) > 0) ++ goto out_unlock; ++ + if (new_needed) { + /* Only native allocations can be marked not needed */ + if (reg->cpu_alloc->type != KBASE_MEM_TYPE_NATIVE) { @@ -229606,7 +265482,7 @@ index 000000000000..99b5b852667e + struct kbase_va_region *reg, enum kbase_sync_type sync_fn) +{ + int ret = -EINVAL; -+ struct dma_buf *dma_buf; ++ struct dma_buf __maybe_unused *dma_buf; + enum dma_data_direction dir = DMA_BIDIRECTIONAL; + + lockdep_assert_held(&kctx->reg_lock); @@ -229650,19 +265526,7 @@ index 000000000000..99b5b852667e + ret = 0; + } +#else -+ /* Though the below version check could be superfluous depending upon the version condition -+ * used for enabling KBASE_MEM_ION_SYNC_WORKAROUND, we still keep this check here to allow -+ * ease of modification for non-ION systems or systems where ION has been patched. -+ */ -+#if KERNEL_VERSION(4, 6, 0) > LINUX_VERSION_CODE && !defined(CONFIG_CHROMEOS) -+ dma_buf_end_cpu_access(dma_buf, -+ 0, dma_buf->size, -+ dir); -+ ret = 0; -+#else -+ ret = dma_buf_end_cpu_access(dma_buf, -+ dir); -+#endif ++ ret = dma_buf_end_cpu_access(dma_buf, dir); +#endif /* KBASE_MEM_ION_SYNC_WORKAROUND */ + break; + case KBASE_SYNC_TO_CPU: @@ -229679,14 +265543,10 @@ index 000000000000..99b5b852667e + ret = 0; + } +#else -+ ret = dma_buf_begin_cpu_access(dma_buf, -+#if KERNEL_VERSION(4, 6, 0) > LINUX_VERSION_CODE && !defined(CONFIG_CHROMEOS) -+ 0, dma_buf->size, -+#endif -+ dir); ++ ret = dma_buf_begin_cpu_access(dma_buf, dir); +#endif /* KBASE_MEM_ION_SYNC_WORKAROUND */ + break; -+ }; ++ } + + if (unlikely(ret)) + dev_warn(kctx->kbdev->dev, @@ -229802,6 +265662,11 @@ index 000000000000..99b5b852667e + struct kbase_mem_phy_alloc *alloc; + unsigned long gwt_mask = ~0; + ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; ++ + lockdep_assert_held(&kctx->reg_lock); + + alloc = reg->gpu_alloc; @@ -229828,14 +265693,11 @@ index 000000000000..99b5b852667e + gwt_mask = ~KBASE_REG_GPU_WR; +#endif + -+ err = kbase_mmu_insert_pages(kctx->kbdev, -+ &kctx->mmu, -+ reg->start_pfn, -+ kbase_get_gpu_phy_pages(reg), -+ kbase_reg_current_backed_size(reg), -+ reg->flags & gwt_mask, -+ kctx->as_nr, -+ alloc->group_id); ++ err = kbase_mmu_insert_imported_pages(kctx->kbdev, &kctx->mmu, reg->start_pfn, ++ kbase_get_gpu_phy_pages(reg), ++ kbase_reg_current_backed_size(reg), ++ reg->flags & gwt_mask, kctx->as_nr, alloc->group_id, ++ mmu_sync_info, NULL); + if (err) + goto bad_insert; + @@ -229848,13 +265710,11 @@ index 000000000000..99b5b852667e + * Assume alloc->nents is the number of actual pages in the + * dma-buf memory. + */ -+ err = kbase_mmu_insert_single_page(kctx, -+ reg->start_pfn + alloc->nents, -+ kctx->aliasing_sink_page, -+ reg->nr_pages - alloc->nents, -+ (reg->flags | KBASE_REG_GPU_RD) & -+ ~KBASE_REG_GPU_WR, -+ KBASE_MEM_GROUP_SINK); ++ err = kbase_mmu_insert_single_imported_page( ++ kctx, reg->start_pfn + alloc->nents, kctx->aliasing_sink_page, ++ reg->nr_pages - alloc->nents, ++ (reg->flags | KBASE_REG_GPU_RD) & ~KBASE_REG_GPU_WR, KBASE_MEM_GROUP_SINK, ++ mmu_sync_info); + if (err) + goto bad_pad_insert; + } @@ -229862,11 +265722,8 @@ index 000000000000..99b5b852667e + return 0; + +bad_pad_insert: -+ kbase_mmu_teardown_pages(kctx->kbdev, -+ &kctx->mmu, -+ reg->start_pfn, -+ alloc->nents, -+ kctx->as_nr); ++ kbase_mmu_teardown_pages(kctx->kbdev, &kctx->mmu, reg->start_pfn, alloc->pages, ++ alloc->nents, alloc->nents, kctx->as_nr, true); +bad_insert: + kbase_mem_umm_unmap_attachment(kctx, alloc); +bad_map_attachment: @@ -229894,11 +265751,9 @@ index 000000000000..99b5b852667e + if (!kbase_is_region_invalid_or_free(reg) && reg->gpu_alloc == alloc) { + int err; + -+ err = kbase_mmu_teardown_pages(kctx->kbdev, -+ &kctx->mmu, -+ reg->start_pfn, -+ reg->nr_pages, -+ kctx->as_nr); ++ err = kbase_mmu_teardown_pages(kctx->kbdev, &kctx->mmu, reg->start_pfn, ++ alloc->pages, reg->nr_pages, reg->nr_pages, ++ kctx->as_nr, true); + WARN_ON(err); + } + @@ -229970,6 +265825,9 @@ index 000000000000..99b5b852667e + return NULL; + } + ++ if (!kbase_import_size_is_valid(kctx->kbdev, *va_pages)) ++ return NULL; ++ + /* ignore SAME_VA */ + *flags &= ~BASE_MEM_SAME_VA; + @@ -229990,23 +265848,21 @@ index 000000000000..99b5b852667e + if (*flags & BASE_MEM_IMPORT_SYNC_ON_MAP_UNMAP) + need_sync = true; + -+#ifdef CONFIG_64BIT -+ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { ++ if (!kbase_ctx_compat_mode(kctx)) { + /* + * 64-bit tasks require us to reserve VA on the CPU that we use + * on the GPU. + */ + shared_zone = true; + } -+#endif + + if (shared_zone) { + *flags |= BASE_MEM_NEED_MMAP; -+ reg = kbase_alloc_free_region(&kctx->reg_rbtree_same, -+ 0, *va_pages, KBASE_REG_ZONE_SAME_VA); ++ reg = kbase_alloc_free_region(kctx->kbdev, &kctx->reg_rbtree_same, 0, *va_pages, ++ KBASE_REG_ZONE_SAME_VA); + } else { -+ reg = kbase_alloc_free_region(&kctx->reg_rbtree_custom, -+ 0, *va_pages, KBASE_REG_ZONE_CUSTOM_VA); ++ reg = kbase_alloc_free_region(kctx->kbdev, &kctx->reg_rbtree_custom, 0, *va_pages, ++ KBASE_REG_ZONE_CUSTOM_VA); + } + + if (!reg) { @@ -230047,7 +265903,7 @@ index 000000000000..99b5b852667e + reg->gpu_alloc->imported.umm.current_mapping_usage_count = 0; + reg->gpu_alloc->imported.umm.need_sync = need_sync; + reg->gpu_alloc->imported.umm.kctx = kctx; -+ reg->extent = 0; ++ reg->extension = 0; + + if (!IS_ENABLED(CONFIG_MALI_DMA_BUF_MAP_ON_DEMAND)) { + int err; @@ -230091,7 +265947,7 @@ index 000000000000..99b5b852667e + struct kbase_context *kctx, unsigned long address, + unsigned long size, u64 *va_pages, u64 *flags) +{ -+ long i; ++ long i, dma_mapped_pages; + struct kbase_va_region *reg; + struct rb_root *rbtree; + long faulted_pages; @@ -230100,6 +265956,9 @@ index 000000000000..99b5b852667e + u32 cache_line_alignment = kbase_get_cache_line_alignment(kctx->kbdev); + struct kbase_alloc_import_user_buf *user_buf; + struct page **pages = NULL; ++ struct tagged_addr *pa; ++ struct device *dev; ++ int write; + + /* Flag supported only for dma-buf imported memory */ + if (*flags & BASE_MEM_IMPORT_SYNC_ON_MAP_UNMAP) @@ -230136,21 +265995,22 @@ index 000000000000..99b5b852667e + /* 64-bit address range is the max */ + goto bad_size; + ++ if (!kbase_import_size_is_valid(kctx->kbdev, *va_pages)) ++ goto bad_size; ++ + /* SAME_VA generally not supported with imported memory (no known use cases) */ + *flags &= ~BASE_MEM_SAME_VA; + + if (*flags & BASE_MEM_IMPORT_SHARED) + shared_zone = true; + -+#ifdef CONFIG_64BIT -+ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { ++ if (!kbase_ctx_compat_mode(kctx)) { + /* + * 64-bit tasks require us to reserve VA on the CPU that we use + * on the GPU. + */ + shared_zone = true; + } -+#endif + + if (shared_zone) { + *flags |= BASE_MEM_NEED_MMAP; @@ -230159,7 +266019,7 @@ index 000000000000..99b5b852667e + } else + rbtree = &kctx->reg_rbtree_custom; + -+ reg = kbase_alloc_free_region(rbtree, 0, *va_pages, zone); ++ reg = kbase_alloc_free_region(kctx->kbdev, rbtree, 0, *va_pages, zone); + + if (!reg) + goto no_region; @@ -230185,11 +266045,7 @@ index 000000000000..99b5b852667e + user_buf->address = address; + user_buf->nr_pages = *va_pages; + user_buf->mm = current->mm; -+#if KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE -+ atomic_inc(¤t->mm->mm_count); -+#else -+ mmgrab(current->mm); -+#endif ++ kbase_mem_mmgrab(); + if (reg->gpu_alloc->properties & KBASE_MEM_PHY_ALLOC_LARGE) + user_buf->pages = vmalloc(*va_pages * sizeof(struct page *)); + else @@ -230213,22 +266069,23 @@ index 000000000000..99b5b852667e + + down_read(kbase_mem_get_process_mmap_lock()); + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ faulted_pages = get_user_pages(current, current->mm, address, *va_pages, -+#if KERNEL_VERSION(4, 4, 168) <= LINUX_VERSION_CODE && \ -+KERNEL_VERSION(4, 5, 0) > LINUX_VERSION_CODE -+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, -+ pages, NULL); -+#else -+ reg->flags & KBASE_REG_GPU_WR, 0, pages, NULL); -+#endif -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ write = reg->flags & (KBASE_REG_CPU_WR | KBASE_REG_GPU_WR); ++ ++#if KERNEL_VERSION(5, 9, 0) > LINUX_VERSION_CODE + faulted_pages = get_user_pages(address, *va_pages, -+ reg->flags & KBASE_REG_GPU_WR, 0, pages, NULL); ++ write ? FOLL_WRITE : 0, pages, NULL); +#else -+ faulted_pages = get_user_pages(address, *va_pages, -+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, -+ pages, NULL); ++ /* pin_user_pages function cannot be called with pages param NULL. ++ * get_user_pages function will be used instead because it is safe to be ++ * used with NULL pages param as long as it doesn't have FOLL_GET flag. ++ */ ++ if (pages != NULL) { ++ faulted_pages = ++ pin_user_pages(address, *va_pages, write ? FOLL_WRITE : 0, pages, NULL); ++ } else { ++ faulted_pages = ++ get_user_pages(address, *va_pages, write ? FOLL_WRITE : 0, pages, NULL); ++ } +#endif + + up_read(kbase_mem_get_process_mmap_lock()); @@ -230237,33 +266094,46 @@ index 000000000000..99b5b852667e + goto fault_mismatch; + + reg->gpu_alloc->nents = 0; -+ reg->extent = 0; ++ reg->extension = 0; + -+ if (pages) { -+ struct device *dev = kctx->kbdev->dev; -+ unsigned long local_size = user_buf->size; -+ unsigned long offset = user_buf->address & ~PAGE_MASK; -+ struct tagged_addr *pa = kbase_get_gpu_phy_pages(reg); ++ pa = kbase_get_gpu_phy_pages(reg); ++ dev = kctx->kbdev->dev; + ++ if (pages) { + /* Top bit signifies that this was pinned on import */ + user_buf->current_mapping_usage_count |= PINNED_ON_IMPORT; + ++ /* Manual CPU cache synchronization. ++ * ++ * The driver disables automatic CPU cache synchronization because the ++ * memory pages that enclose the imported region may also contain ++ * sub-regions which are not imported and that are allocated and used ++ * by the user process. This may be the case of memory at the beginning ++ * of the first page and at the end of the last page. Automatic CPU cache ++ * synchronization would force some operations on those memory allocations, ++ * unbeknown to the user process: in particular, a CPU cache invalidate ++ * upon unmapping would destroy the content of dirty CPU caches and cause ++ * the user process to lose CPU writes to the non-imported sub-regions. ++ * ++ * When the GPU claims ownership of the imported memory buffer, it shall ++ * commit CPU writes for the whole of all pages that enclose the imported ++ * region, otherwise the initial content of memory would be wrong. ++ */ + for (i = 0; i < faulted_pages; i++) { + dma_addr_t dma_addr; -+ unsigned long min; -+ -+ min = MIN(PAGE_SIZE - offset, local_size); -+ dma_addr = dma_map_page(dev, pages[i], -+ offset, min, -+ DMA_BIDIRECTIONAL); ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++ dma_addr = dma_map_page(dev, pages[i], 0, PAGE_SIZE, DMA_BIDIRECTIONAL); ++#else ++ dma_addr = dma_map_page_attrs(dev, pages[i], 0, PAGE_SIZE, ++ DMA_BIDIRECTIONAL, DMA_ATTR_SKIP_CPU_SYNC); ++#endif + if (dma_mapping_error(dev, dma_addr)) + goto unwind_dma_map; + + user_buf->dma_addrs[i] = dma_addr; + pa[i] = as_tagged(page_to_phys(pages[i])); + -+ local_size -= min; -+ offset = 0; ++ dma_sync_single_for_device(dev, dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); + } + + reg->gpu_alloc->nents = faulted_pages; @@ -230272,15 +266142,32 @@ index 000000000000..99b5b852667e + return reg; + +unwind_dma_map: -+ while (i--) { -+ dma_unmap_page(kctx->kbdev->dev, -+ user_buf->dma_addrs[i], -+ PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_mapped_pages = i; ++ /* Run the unmap loop in the same order as map loop, and perform again ++ * CPU cache synchronization to re-write the content of dirty CPU caches ++ * to memory. This precautionary measure is kept here to keep this code ++ * aligned with kbase_jd_user_buf_map() to allow for a potential refactor ++ * in the future. ++ */ ++ for (i = 0; i < dma_mapped_pages; i++) { ++ dma_addr_t dma_addr = user_buf->dma_addrs[i]; ++ ++ dma_sync_single_for_device(dev, dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) ++ dma_unmap_page(dev, dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++#else ++ dma_unmap_page_attrs(dev, dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL, ++ DMA_ATTR_SKIP_CPU_SYNC); ++#endif + } +fault_mismatch: + if (pages) { ++ /* In this case, the region was not yet in the region tracker, ++ * and so there are no CPU mappings to remove before we unpin ++ * the page ++ */ + for (i = 0; i < faulted_pages; i++) -+ put_page(pages[i]); ++ kbase_unpin_user_buf_page(pages[i]); + } +no_page_array: +invalid_flags: @@ -230291,7 +266178,6 @@ index 000000000000..99b5b852667e +no_region: +bad_size: + return NULL; -+ +} + + @@ -230303,6 +266189,12 @@ index 000000000000..99b5b852667e + u64 gpu_va; + size_t i; + bool coherent; ++ uint64_t max_stride; ++ ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; + + KBASE_DEBUG_ASSERT(kctx); + KBASE_DEBUG_ASSERT(flags); @@ -230316,7 +266208,8 @@ index 000000000000..99b5b852667e + + if (!(*flags & (BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR))) { + dev_warn(kctx->kbdev->dev, -+ "kbase_mem_alias called with bad flags (%llx)", ++ "%s called with bad flags (%llx)", ++ __func__, + (unsigned long long)*flags); + goto bad_flags; + } @@ -230329,6 +266222,11 @@ index 000000000000..99b5b852667e + if (!nents) + goto bad_nents; + ++ max_stride = div64_u64(U64_MAX, nents); ++ ++ if (stride > max_stride) ++ goto bad_size; ++ + if ((nents * stride) > (U64_MAX / PAGE_SIZE)) + /* 64-bit address range is the max */ + goto bad_size; @@ -230336,21 +266234,19 @@ index 000000000000..99b5b852667e + /* calculate the number of pages this alias will cover */ + *num_pages = nents * stride; + -+#ifdef CONFIG_64BIT -+ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { ++ if (!kbase_alias_size_is_valid(kctx->kbdev, *num_pages)) ++ goto bad_size; ++ ++ if (!kbase_ctx_compat_mode(kctx)) { + /* 64-bit tasks must MMAP anyway, but not expose this address to -+ * clients */ ++ * clients ++ */ + *flags |= BASE_MEM_NEED_MMAP; -+ reg = kbase_alloc_free_region(&kctx->reg_rbtree_same, 0, -+ *num_pages, -+ KBASE_REG_ZONE_SAME_VA); ++ reg = kbase_alloc_free_region(kctx->kbdev, &kctx->reg_rbtree_same, 0, *num_pages, ++ KBASE_REG_ZONE_SAME_VA); + } else { -+#else -+ if (1) { -+#endif -+ reg = kbase_alloc_free_region(&kctx->reg_rbtree_custom, -+ 0, *num_pages, -+ KBASE_REG_ZONE_CUSTOM_VA); ++ reg = kbase_alloc_free_region(kctx->kbdev, &kctx->reg_rbtree_custom, 0, *num_pages, ++ KBASE_REG_ZONE_CUSTOM_VA); + } + + if (!reg) @@ -230385,7 +266281,8 @@ index 000000000000..99b5b852667e + goto bad_handle; /* must be > 0 */ + if (ai[i].length > stride) + goto bad_handle; /* can't be larger than the -+ stride */ ++ * stride ++ */ + reg->gpu_alloc->imported.alias.aliased[i].length = ai[i].length; + } else { + struct kbase_va_region *aliasing_reg; @@ -230398,8 +266295,17 @@ index 000000000000..99b5b852667e + /* validate found region */ + if (kbase_is_region_invalid_or_free(aliasing_reg)) + goto bad_handle; /* Not found/already free */ -+ if (aliasing_reg->flags & KBASE_REG_DONT_NEED) ++ if (kbase_is_region_shrinkable(aliasing_reg)) + goto bad_handle; /* Ephemeral region */ ++ if (kbase_va_region_is_no_user_free(aliasing_reg)) ++ goto bad_handle; /* JIT regions can't be ++ * aliased. NO_USER_FREE flag ++ * covers the entire lifetime ++ * of JIT regions. The other ++ * types of regions covered ++ * by this flag also shall ++ * not be aliased. ++ */ + if (!(aliasing_reg->flags & KBASE_REG_GPU_CACHED)) + goto bad_handle; /* GPU uncached memory */ + if (!aliasing_reg->gpu_alloc) @@ -230407,16 +266313,18 @@ index 000000000000..99b5b852667e + if (aliasing_reg->gpu_alloc->type != KBASE_MEM_TYPE_NATIVE) + goto bad_handle; /* Not a native alloc */ + if (coherent != ((aliasing_reg->flags & KBASE_REG_SHARE_BOTH) != 0)) -+ goto bad_handle; -+ /* Non-coherent memory cannot alias -+ coherent memory, and vice versa.*/ ++ goto bad_handle; /* Non-coherent memory cannot ++ * alias coherent memory, and ++ * vice versa. ++ */ + + /* check size against stride */ + if (!ai[i].length) + goto bad_handle; /* must be > 0 */ + if (ai[i].length > stride) + goto bad_handle; /* can't be larger than the -+ stride */ ++ * stride ++ */ + + alloc = aliasing_reg->gpu_alloc; + @@ -230429,11 +266337,22 @@ index 000000000000..99b5b852667e + reg->gpu_alloc->imported.alias.aliased[i].alloc = kbase_mem_phy_alloc_get(alloc); + reg->gpu_alloc->imported.alias.aliased[i].length = ai[i].length; + reg->gpu_alloc->imported.alias.aliased[i].offset = ai[i].offset; ++ ++ /* Ensure the underlying alloc is marked as being ++ * mapped at >1 different GPU VA immediately, even ++ * though mapping might not happen until later. ++ * ++ * Otherwise, we would (incorrectly) allow shrinking of ++ * the source region (aliasing_reg) and so freeing the ++ * physical pages (without freeing the entire alloc) ++ * whilst we still hold an implicit reference on those ++ * physical pages. ++ */ ++ kbase_mem_phy_alloc_gpu_mapped(alloc); + } + } + -+#ifdef CONFIG_64BIT -+ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { ++ if (!kbase_ctx_compat_mode(kctx)) { + /* Bind to a cookie */ + if (bitmap_empty(kctx->cookies, BITS_PER_LONG)) { + dev_err(kctx->kbdev->dev, "No cookies available for allocation!"); @@ -230448,11 +266367,10 @@ index 000000000000..99b5b852667e + /* relocate to correct base */ + gpu_va += PFN_DOWN(BASE_MEM_COOKIE_BASE); + gpu_va <<= PAGE_SHIFT; -+ } else /* we control the VA */ { -+#else -+ if (1) { -+#endif -+ if (kbase_gpu_mmap(kctx, reg, 0, *num_pages, 1) != 0) { ++ } else { ++ /* we control the VA */ ++ if (kbase_gpu_mmap(kctx, reg, 0, *num_pages, 1, ++ mmu_sync_info) != 0) { + dev_warn(kctx->kbdev->dev, "Failed to map memory on GPU"); + goto no_mmap; + } @@ -230467,11 +266385,13 @@ index 000000000000..99b5b852667e + + return gpu_va; + -+#ifdef CONFIG_64BIT +no_cookie: -+#endif +no_mmap: +bad_handle: ++ /* Marking the source allocs as not being mapped on the GPU and putting ++ * them is handled by putting reg's allocs, so no rollback of those ++ * actions is done here. ++ */ + kbase_gpu_vm_unlock(kctx); +no_aliased_array: +invalid_flags: @@ -230493,6 +266413,11 @@ index 000000000000..99b5b852667e +{ + struct kbase_va_region *reg; + ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; ++ + KBASE_DEBUG_ASSERT(kctx); + KBASE_DEBUG_ASSERT(gpu_va); + KBASE_DEBUG_ASSERT(va_pages); @@ -230504,7 +266429,8 @@ index 000000000000..99b5b852667e + + if (!kbase_check_import_flags(*flags)) { + dev_warn(kctx->kbdev->dev, -+ "kbase_mem_import called with bad flags (%llx)", ++ "%s called with bad flags (%llx)", ++ __func__, + (unsigned long long)*flags); + goto bad_flags; + } @@ -230517,7 +266443,8 @@ index 000000000000..99b5b852667e + if ((*flags & BASE_MEM_COHERENT_SYSTEM_REQUIRED) != 0 && + !kbase_device_is_cpu_coherent(kctx->kbdev)) { + dev_warn(kctx->kbdev->dev, -+ "kbase_mem_import call required coherent mem when unavailable"); ++ "%s call required coherent mem when unavailable", ++ __func__); + goto bad_flags; + } + if ((*flags & BASE_MEM_COHERENT_SYSTEM) != 0 && @@ -230525,7 +266452,10 @@ index 000000000000..99b5b852667e + /* Remove COHERENT_SYSTEM flag if coherent mem is unavailable */ + *flags &= ~BASE_MEM_COHERENT_SYSTEM; + } -+ ++ if (((*flags & BASE_MEM_CACHED_CPU) == 0) && (type == BASE_MEM_IMPORT_TYPE_USER_BUFFER)) { ++ dev_warn(kctx->kbdev->dev, "USER_BUFFER must be CPU cached"); ++ goto bad_flags; ++ } + if ((padding != 0) && (type != BASE_MEM_IMPORT_TYPE_UMM)) { + dev_warn(kctx->kbdev->dev, + "padding is only supported for UMM"); @@ -230551,7 +266481,7 @@ index 000000000000..99b5b852667e + sizeof(user_buffer))) { + reg = NULL; + } else { -+#ifdef CONFIG_COMPAT ++#if IS_ENABLED(CONFIG_COMPAT) + if (kbase_ctx_flag(kctx, KCTX_COMPAT)) + uptr = compat_ptr(user_buffer.ptr); + else @@ -230592,7 +266522,8 @@ index 000000000000..99b5b852667e + + } else if (*flags & KBASE_MEM_IMPORT_HAVE_PAGES) { + /* we control the VA, mmap now to the GPU */ -+ if (kbase_gpu_mmap(kctx, reg, 0, *va_pages, 1) != 0) ++ if (kbase_gpu_mmap(kctx, reg, 0, *va_pages, 1, mmu_sync_info) != ++ 0) + goto no_gpu_va; + /* return real GPU VA */ + *gpu_va = reg->start_pfn << PAGE_SHIFT; @@ -230626,8 +266557,9 @@ index 000000000000..99b5b852667e +} + +int kbase_mem_grow_gpu_mapping(struct kbase_context *kctx, -+ struct kbase_va_region *reg, -+ u64 new_pages, u64 old_pages) ++ struct kbase_va_region *reg, u64 new_pages, ++ u64 old_pages, ++ enum kbase_caller_mmu_sync_info mmu_sync_info) +{ + struct tagged_addr *phy_pages; + u64 delta = new_pages - old_pages; @@ -230637,9 +266569,9 @@ index 000000000000..99b5b852667e + + /* Map the new pages into the GPU */ + phy_pages = kbase_get_gpu_phy_pages(reg); -+ ret = kbase_mmu_insert_pages(kctx->kbdev, &kctx->mmu, -+ reg->start_pfn + old_pages, phy_pages + old_pages, delta, -+ reg->flags, kctx->as_nr, reg->gpu_alloc->group_id); ++ ret = kbase_mmu_insert_pages(kctx->kbdev, &kctx->mmu, reg->start_pfn + old_pages, ++ phy_pages + old_pages, delta, reg->flags, kctx->as_nr, ++ reg->gpu_alloc->group_id, mmu_sync_info, reg, false); + + return ret; +} @@ -230659,28 +266591,16 @@ index 000000000000..99b5b852667e + (old_pages - new_pages)<gpu_alloc; + int ret = 0; + -+ ret = kbase_mmu_teardown_pages(kctx->kbdev, &kctx->mmu, -+ reg->start_pfn + new_pages, delta, kctx->as_nr); ++ ret = kbase_mmu_teardown_pages(kctx->kbdev, &kctx->mmu, reg->start_pfn + new_pages, ++ alloc->pages + new_pages, delta, delta, kctx->as_nr, false); + + return ret; +} @@ -230693,6 +266613,11 @@ index 000000000000..99b5b852667e + struct kbase_va_region *reg; + bool read_locked = false; + ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; ++ + KBASE_DEBUG_ASSERT(kctx); + KBASE_DEBUG_ASSERT(gpu_addr != 0); + @@ -230725,11 +266650,25 @@ index 000000000000..99b5b852667e + if (new_pages > reg->nr_pages) + goto out_unlock; + -+ /* can't be mapped more than once on the GPU */ ++ /* Can't shrink when physical pages are mapped to different GPU ++ * VAs. The code doesn't support looking up: ++ * - all physical pages assigned to different GPU VAs ++ * - CPU mappings for the physical pages at different vm_pgoff ++ * (==GPU VA) locations. ++ * ++ * Note that for Native allocs mapped at multiple GPU VAs, growth of ++ * such allocs is not a supported use-case. ++ */ + if (atomic_read(®->gpu_alloc->gpu_mappings) > 1) + goto out_unlock; -+ /* can't grow regions which are ephemeral */ -+ if (reg->flags & KBASE_REG_DONT_NEED) ++ ++ if (atomic_read(®->cpu_alloc->kernel_mappings) > 0) ++ goto out_unlock; ++ ++ if (kbase_is_region_shrinkable(reg)) ++ goto out_unlock; ++ ++ if (kbase_va_region_is_no_user_free(reg)) + goto out_unlock; + +#ifdef CONFIG_MALI_MEMORY_FULLY_BACKED @@ -230773,8 +266712,8 @@ index 000000000000..99b5b852667e + /* No update required for CPU mappings, that's done on fault. */ + + /* Update GPU mapping. */ -+ res = kbase_mem_grow_gpu_mapping(kctx, reg, -+ new_pages, old_pages); ++ res = kbase_mem_grow_gpu_mapping(kctx, reg, new_pages, ++ old_pages, mmu_sync_info); + + /* On error free the new pages */ + if (res) { @@ -230802,7 +266741,7 @@ index 000000000000..99b5b852667e +} + +int kbase_mem_shrink(struct kbase_context *const kctx, -+ struct kbase_va_region *const reg, u64 const new_pages) ++ struct kbase_va_region *const reg, u64 new_pages) +{ + u64 delta, old_pages; + int err; @@ -230832,6 +266771,19 @@ index 000000000000..99b5b852667e + kbase_free_phy_pages_helper(reg->cpu_alloc, delta); + if (reg->cpu_alloc != reg->gpu_alloc) + kbase_free_phy_pages_helper(reg->gpu_alloc, delta); ++ ++ if (kctx->kbdev->pagesize_2mb) { ++ if (kbase_reg_current_backed_size(reg) > new_pages) { ++ old_pages = new_pages; ++ new_pages = kbase_reg_current_backed_size(reg); ++ ++ /* Update GPU mapping. */ ++ err = kbase_mem_grow_gpu_mapping(kctx, reg, new_pages, old_pages, ++ CALLER_MMU_ASYNC); ++ } ++ } else { ++ WARN_ON(kbase_reg_current_backed_size(reg) != new_pages); ++ } + } + + return err; @@ -230870,7 +266822,7 @@ index 000000000000..99b5b852667e + /* Avoid freeing memory on the process death which results in + * GPU Page Fault. Memory will be freed in kbase_destroy_context + */ -+ if (!(current->flags & PF_EXITING)) ++ if (!is_process_exiting(vma)) + kbase_mem_free_region(map->kctx, map->region); + } + @@ -231027,11 +266979,7 @@ index 000000000000..99b5b852667e + * See MIDBASE-1057 + */ + -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)) + vma->vm_flags |= VM_DONTCOPY | VM_DONTDUMP | VM_DONTEXPAND | VM_IO; -+#else -+ vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED | VM_IO; -+#endif + vma->vm_ops = &kbase_vm_ops; + vma->vm_private_data = map; + @@ -231106,7 +267054,6 @@ index 000000000000..99b5b852667e + while (kbase_jit_evict(kctx)) + ; +} -+#endif + +static int kbase_mmu_dump_mmap(struct kbase_context *kctx, + struct vm_area_struct *vma, @@ -231119,13 +267066,13 @@ index 000000000000..99b5b852667e + size_t size; + int err = 0; + -+ dev_dbg(kctx->kbdev->dev, "in kbase_mmu_dump_mmap\n"); ++ lockdep_assert_held(&kctx->reg_lock); ++ ++ dev_dbg(kctx->kbdev->dev, "%s\n", __func__); + size = (vma->vm_end - vma->vm_start); + nr_pages = size >> PAGE_SHIFT; + -+#ifdef CONFIG_MALI_VECTOR_DUMP + kbase_free_unused_jit_allocations(kctx); -+#endif + + kaddr = kbase_mmu_dump(kctx, nr_pages); + @@ -231134,8 +267081,8 @@ index 000000000000..99b5b852667e + goto out; + } + -+ new_reg = kbase_alloc_free_region(&kctx->reg_rbtree_same, 0, nr_pages, -+ KBASE_REG_ZONE_SAME_VA); ++ new_reg = kbase_alloc_free_region(kctx->kbdev, &kctx->reg_rbtree_same, 0, nr_pages, ++ KBASE_REG_ZONE_SAME_VA); + if (!new_reg) { + err = -ENOMEM; + WARN_ON(1); @@ -231164,7 +267111,7 @@ index 000000000000..99b5b852667e + *kmap_addr = kaddr; + *reg = new_reg; + -+ dev_dbg(kctx->kbdev->dev, "kbase_mmu_dump_mmap done\n"); ++ dev_dbg(kctx->kbdev->dev, "%s done\n", __func__); + return 0; + +out_no_alloc: @@ -231173,7 +267120,7 @@ index 000000000000..99b5b852667e +out: + return err; +} -+ ++#endif + +void kbase_os_mem_map_lock(struct kbase_context *kctx) +{ @@ -231193,13 +267140,18 @@ index 000000000000..99b5b852667e + size_t *nr_pages, size_t *aligned_offset) + +{ -+ int cookie = vma->vm_pgoff - PFN_DOWN(BASE_MEM_COOKIE_BASE); ++ unsigned int cookie = vma->vm_pgoff - PFN_DOWN(BASE_MEM_COOKIE_BASE); + struct kbase_va_region *reg; + int err = 0; + ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; ++ + *aligned_offset = 0; + -+ dev_dbg(kctx->kbdev->dev, "in kbasep_reg_mmap\n"); ++ dev_dbg(kctx->kbdev->dev, "%s\n", __func__); + + /* SAME_VA stuff, fetch the right region */ + reg = kctx->pending_regions[cookie]; @@ -231212,7 +267164,8 @@ index 000000000000..99b5b852667e + /* incorrect mmap size */ + /* leave the cookie for a potential later + * mapping, or to be reclaimed later when the -+ * context is freed */ ++ * context is freed ++ */ + err = -ENOMEM; + goto out; + } @@ -231228,9 +267181,8 @@ index 000000000000..99b5b852667e + + /* adjust down nr_pages to what we have physically */ + *nr_pages = kbase_reg_current_backed_size(reg); -+ + if (kbase_gpu_mmap(kctx, reg, vma->vm_start + *aligned_offset, -+ reg->nr_pages, 1) != 0) { ++ reg->nr_pages, 1, mmu_sync_info) != 0) { + dev_err(kctx->kbdev->dev, "%s:%d\n", __FILE__, __LINE__); + /* Unable to map in GPU space. */ + WARN_ON(1); @@ -231241,6 +267193,11 @@ index 000000000000..99b5b852667e + kctx->pending_regions[cookie] = NULL; + bitmap_set(kctx->cookies, cookie, 1); + ++#if MALI_USE_CSF ++ if (reg->flags & KBASE_REG_CSF_EVENT) ++ kbase_link_event_mem_page(kctx, reg); ++#endif ++ + /* + * Overwrite the offset with the region start_pfn, so we effectively + * map from offset 0 in the region. However subtract the aligned @@ -231250,7 +267207,7 @@ index 000000000000..99b5b852667e + vma->vm_pgoff = reg->start_pfn - ((*aligned_offset)>>PAGE_SHIFT); +out: + *regm = reg; -+ dev_dbg(kctx->kbdev->dev, "kbasep_reg_mmap done\n"); ++ dev_dbg(kctx->kbdev->dev, "%s done\n", __func__); + + return err; +} @@ -231260,7 +267217,7 @@ index 000000000000..99b5b852667e +{ + struct kbase_va_region *reg = NULL; + void *kaddr = NULL; -+ size_t nr_pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; ++ size_t nr_pages = vma_pages(vma); + int err = 0; + int free_on_close = 0; + struct device *dev = kctx->kbdev->dev; @@ -231273,7 +267230,7 @@ index 000000000000..99b5b852667e + if (!(vma->vm_flags & VM_WRITE)) + vma->vm_flags &= ~VM_MAYWRITE; + -+ if (0 == nr_pages) { ++ if (nr_pages == 0) { + err = -EINVAL; + goto out; + } @@ -231291,16 +267248,10 @@ index 000000000000..99b5b852667e + goto out_unlock; + } + -+ /* if not the MTP, verify that the MTP has been mapped */ -+ rcu_read_lock(); -+ /* catches both when the special page isn't present or -+ * when we've forked */ -+ if (rcu_dereference(kctx->process_mm) != current->mm) { ++ if (!kbase_mem_allow_alloc(kctx)) { + err = -EINVAL; -+ rcu_read_unlock(); + goto out_unlock; + } -+ rcu_read_unlock(); + + switch (vma->vm_pgoff) { + case PFN_DOWN(BASEP_MEM_INVALID_HANDLE): @@ -231309,13 +267260,19 @@ index 000000000000..99b5b852667e + err = -EINVAL; + goto out_unlock; + case PFN_DOWN(BASE_MEM_MMU_DUMP_HANDLE): ++#if defined(CONFIG_MALI_VECTOR_DUMP) + /* MMU dump */ + err = kbase_mmu_dump_mmap(kctx, vma, ®, &kaddr); -+ if (0 != err) ++ if (err != 0) + goto out_unlock; + /* free the region on munmap */ + free_on_close = 1; + break; ++#else ++ /* Illegal handle for direct map */ ++ err = -EINVAL; ++ goto out_unlock; ++#endif /* defined(CONFIG_MALI_VECTOR_DUMP) */ +#if MALI_USE_CSF + case PFN_DOWN(BASEP_MEM_CSF_USER_REG_PAGE_HANDLE): + kbase_gpu_vm_unlock(kctx); @@ -231334,7 +267291,7 @@ index 000000000000..99b5b852667e + PFN_DOWN(BASE_MEM_FIRST_FREE_ADDRESS) - 1: { + err = kbasep_reg_mmap(kctx, vma, ®, &nr_pages, + &aligned_offset); -+ if (0 != err) ++ if (err != 0) + goto out_unlock; + /* free the region on munmap */ + free_on_close = 1; @@ -231386,8 +267343,7 @@ index 000000000000..99b5b852667e + dev_warn(dev, "mmap aliased: invalid params!\n"); + goto out_unlock; + } -+ } -+ else if (reg->cpu_alloc->nents < ++ } else if (reg->cpu_alloc->nents < + (vma->vm_pgoff - reg->start_pfn + nr_pages)) { + /* limit what we map to the amount currently backed */ + if ((vma->vm_pgoff - reg->start_pfn) >= reg->cpu_alloc->nents) @@ -231404,13 +267360,26 @@ index 000000000000..99b5b852667e + + err = kbase_cpu_mmap(kctx, reg, vma, kaddr, nr_pages, aligned_offset, + free_on_close); -+ ++#if defined(CONFIG_MALI_VECTOR_DUMP) + if (vma->vm_pgoff == PFN_DOWN(BASE_MEM_MMU_DUMP_HANDLE)) { + /* MMU dump - userspace should now have a reference on -+ * the pages, so we can now free the kernel mapping */ ++ * the pages, so we can now free the kernel mapping ++ */ + vfree(kaddr); ++ /* CPU mapping of GPU allocations have GPU VA as the vm_pgoff ++ * and that is used to shrink the mapping when the commit size ++ * is reduced. So vm_pgoff for CPU mapping created to get the ++ * snapshot of GPU page tables shall not match with any GPU VA. ++ * That can be ensured by setting vm_pgoff as vma->vm_start ++ * because, ++ * - GPU VA of any SAME_VA allocation cannot match with ++ * vma->vm_start, as CPU VAs are unique. ++ * - GPU VA of CUSTOM_VA allocations are outside the CPU ++ * virtual address space. ++ */ ++ vma->vm_pgoff = PFN_DOWN(vma->vm_start); + } -+ ++#endif /* defined(CONFIG_MALI_VECTOR_DUMP) */ +out_unlock: + kbase_gpu_vm_unlock(kctx); +out: @@ -231452,9 +267421,102 @@ index 000000000000..99b5b852667e + } +} + -+static int kbase_vmap_phy_pages(struct kbase_context *kctx, -+ struct kbase_va_region *reg, u64 offset_bytes, size_t size, -+ struct kbase_vmap_struct *map) ++/** ++ * kbase_vmap_phy_pages_migrate_count_increment - Increment VMAP count for ++ * array of physical pages ++ * ++ * @pages: Array of pages. ++ * @page_count: Number of pages. ++ * @flags: Region flags. ++ * ++ * This function is supposed to be called only if page migration support ++ * is enabled in the driver. ++ * ++ * The counter of kernel CPU mappings of the physical pages involved in a ++ * mapping operation is incremented by 1. Errors are handled by making pages ++ * not movable. Permanent kernel mappings will be marked as not movable, too. ++ */ ++static void kbase_vmap_phy_pages_migrate_count_increment(struct tagged_addr *pages, ++ size_t page_count, unsigned long flags) ++{ ++ size_t i; ++ ++ for (i = 0; i < page_count; i++) { ++ struct page *p = as_page(pages[i]); ++ struct kbase_page_metadata *page_md = kbase_page_private(p); ++ ++ /* Skip the 4KB page that is part of a large page, as the large page is ++ * excluded from the migration process. ++ */ ++ if (is_huge(pages[i]) || is_partial(pages[i])) ++ continue; ++ ++ spin_lock(&page_md->migrate_lock); ++ /* Mark permanent kernel mappings as NOT_MOVABLE because they're likely ++ * to stay mapped for a long time. However, keep on counting the number ++ * of mappings even for them: they don't represent an exception for the ++ * vmap_count. ++ * ++ * At the same time, errors need to be handled if a client tries to add ++ * too many mappings, hence a page may end up in the NOT_MOVABLE state ++ * anyway even if it's not a permanent kernel mapping. ++ */ ++ if (flags & KBASE_REG_PERMANENT_KERNEL_MAPPING) ++ page_md->status = PAGE_STATUS_SET(page_md->status, (u8)NOT_MOVABLE); ++ if (page_md->vmap_count < U8_MAX) ++ page_md->vmap_count++; ++ else ++ page_md->status = PAGE_STATUS_SET(page_md->status, (u8)NOT_MOVABLE); ++ spin_unlock(&page_md->migrate_lock); ++ } ++} ++ ++/** ++ * kbase_vunmap_phy_pages_migrate_count_decrement - Decrement VMAP count for ++ * array of physical pages ++ * ++ * @pages: Array of pages. ++ * @page_count: Number of pages. ++ * ++ * This function is supposed to be called only if page migration support ++ * is enabled in the driver. ++ * ++ * The counter of kernel CPU mappings of the physical pages involved in a ++ * mapping operation is decremented by 1. Errors are handled by making pages ++ * not movable. ++ */ ++static void kbase_vunmap_phy_pages_migrate_count_decrement(struct tagged_addr *pages, ++ size_t page_count) ++{ ++ size_t i; ++ ++ for (i = 0; i < page_count; i++) { ++ struct page *p = as_page(pages[i]); ++ struct kbase_page_metadata *page_md = kbase_page_private(p); ++ ++ /* Skip the 4KB page that is part of a large page, as the large page is ++ * excluded from the migration process. ++ */ ++ if (is_huge(pages[i]) || is_partial(pages[i])) ++ continue; ++ ++ spin_lock(&page_md->migrate_lock); ++ /* Decrement the number of mappings for all kinds of pages, including ++ * pages which are NOT_MOVABLE (e.g. permanent kernel mappings). ++ * However, errors still need to be handled if a client tries to remove ++ * more mappings than created. ++ */ ++ if (page_md->vmap_count == 0) ++ page_md->status = PAGE_STATUS_SET(page_md->status, (u8)NOT_MOVABLE); ++ else ++ page_md->vmap_count--; ++ spin_unlock(&page_md->migrate_lock); ++ } ++} ++ ++static int kbase_vmap_phy_pages(struct kbase_context *kctx, struct kbase_va_region *reg, ++ u64 offset_bytes, size_t size, struct kbase_vmap_struct *map, ++ kbase_vmap_flag vmap_flags) +{ + unsigned long page_index; + unsigned int offset_in_page = offset_bytes & ~PAGE_MASK; @@ -231465,6 +267527,12 @@ index 000000000000..99b5b852667e + pgprot_t prot; + size_t i; + ++ if (WARN_ON(vmap_flags & ~KBASE_VMAP_INPUT_FLAGS)) ++ return -EINVAL; ++ ++ if (WARN_ON(kbase_is_region_invalid_or_free(reg))) ++ return -EINVAL; ++ + if (!size || !map || !reg->cpu_alloc || !reg->gpu_alloc) + return -EINVAL; + @@ -231481,6 +267549,17 @@ index 000000000000..99b5b852667e + if (page_index + page_count > kbase_reg_current_backed_size(reg)) + return -ENOMEM; + ++ if ((vmap_flags & KBASE_VMAP_FLAG_PERMANENT_MAP_ACCOUNTING) && ++ (page_count > (KBASE_PERMANENTLY_MAPPED_MEM_LIMIT_PAGES - ++ atomic_read(&kctx->permanent_mapped_pages)))) { ++ dev_warn( ++ kctx->kbdev->dev, ++ "Request for %llu more pages mem needing a permanent mapping would breach limit %lu, currently at %d pages", ++ (u64)page_count, KBASE_PERMANENTLY_MAPPED_MEM_LIMIT_PAGES, ++ atomic_read(&kctx->permanent_mapped_pages)); ++ return -ENOMEM; ++ } ++ + if (reg->flags & KBASE_REG_DONT_NEED) + return -EINVAL; + @@ -231503,10 +267582,17 @@ index 000000000000..99b5b852667e + + /* Note: enforcing a RO prot_request onto prot is not done, since: + * - CPU-arch-specific integration required -+ * - kbase_vmap() requires no access checks to be made/enforced */ -+ ++ * - kbase_vmap() requires no access checks to be made/enforced ++ */ + cpu_addr = vmap(pages, page_count, VM_MAP, prot); + ++ /* If page migration is enabled, increment the number of VMA mappings ++ * of all physical pages. In case of errors, e.g. too many mappings, ++ * make the page not movable to prevent trouble. ++ */ ++ if (kbase_page_migration_enabled && !kbase_mem_is_imported(reg->gpu_alloc->type)) ++ kbase_vmap_phy_pages_migrate_count_increment(page_array, page_count, reg->flags); ++ + kfree(pages); + + if (!cpu_addr) @@ -231519,60 +267605,79 @@ index 000000000000..99b5b852667e + map->gpu_pages = &kbase_get_gpu_phy_pages(reg)[page_index]; + map->addr = (void *)((uintptr_t)cpu_addr + offset_in_page); + map->size = size; -+ map->sync_needed = ((reg->flags & KBASE_REG_CPU_CACHED) != 0) && -+ !kbase_mem_is_imported(map->gpu_alloc->type); ++ map->flags = vmap_flags; ++ if ((reg->flags & KBASE_REG_CPU_CACHED) && !kbase_mem_is_imported(map->gpu_alloc->type)) ++ map->flags |= KBASE_VMAP_FLAG_SYNC_NEEDED; + -+ if (map->sync_needed) ++ if (map->flags & KBASE_VMAP_FLAG_SYNC_NEEDED) + kbase_sync_mem_regions(kctx, map, KBASE_SYNC_TO_CPU); + ++ if (vmap_flags & KBASE_VMAP_FLAG_PERMANENT_MAP_ACCOUNTING) ++ atomic_add(page_count, &kctx->permanent_mapped_pages); ++ ++ kbase_mem_phy_alloc_kernel_mapped(reg->cpu_alloc); ++ + return 0; +} + -+void *kbase_vmap_prot(struct kbase_context *kctx, u64 gpu_addr, size_t size, -+ unsigned long prot_request, struct kbase_vmap_struct *map) ++void *kbase_vmap_reg(struct kbase_context *kctx, struct kbase_va_region *reg, u64 gpu_addr, ++ size_t size, unsigned long prot_request, struct kbase_vmap_struct *map, ++ kbase_vmap_flag vmap_flags) +{ -+ struct kbase_va_region *reg; -+ void *addr = NULL; + u64 offset_bytes; + struct kbase_mem_phy_alloc *cpu_alloc; + struct kbase_mem_phy_alloc *gpu_alloc; + int err; + -+ kbase_gpu_vm_lock(kctx); ++ lockdep_assert_held(&kctx->reg_lock); + -+ reg = kbase_region_tracker_find_region_enclosing_address(kctx, -+ gpu_addr); -+ if (kbase_is_region_invalid_or_free(reg)) -+ goto out_unlock; ++ if (WARN_ON(kbase_is_region_invalid_or_free(reg))) ++ return NULL; + + /* check access permissions can be satisfied + * Intended only for checking KBASE_REG_{CPU,GPU}_{RD,WR} + */ + if ((reg->flags & prot_request) != prot_request) -+ goto out_unlock; ++ return NULL; + + offset_bytes = gpu_addr - (reg->start_pfn << PAGE_SHIFT); + cpu_alloc = kbase_mem_phy_alloc_get(reg->cpu_alloc); + gpu_alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); + -+ err = kbase_vmap_phy_pages(kctx, reg, offset_bytes, size, map); ++ err = kbase_vmap_phy_pages(kctx, reg, offset_bytes, size, map, vmap_flags); + if (err < 0) + goto fail_vmap_phy_pages; + -+ addr = map->addr; -+ -+out_unlock: -+ kbase_gpu_vm_unlock(kctx); -+ return addr; ++ return map->addr; + +fail_vmap_phy_pages: -+ kbase_gpu_vm_unlock(kctx); + kbase_mem_phy_alloc_put(cpu_alloc); + kbase_mem_phy_alloc_put(gpu_alloc); -+ + return NULL; +} + ++void *kbase_vmap_prot(struct kbase_context *kctx, u64 gpu_addr, size_t size, ++ unsigned long prot_request, struct kbase_vmap_struct *map) ++{ ++ struct kbase_va_region *reg; ++ void *addr = NULL; ++ ++ kbase_gpu_vm_lock(kctx); ++ ++ reg = kbase_region_tracker_find_region_enclosing_address(kctx, gpu_addr); ++ if (kbase_is_region_invalid_or_free(reg)) ++ goto out_unlock; ++ ++ if (reg->gpu_alloc->type != KBASE_MEM_TYPE_NATIVE) ++ goto out_unlock; ++ ++ addr = kbase_vmap_reg(kctx, reg, gpu_addr, size, prot_request, map, 0u); ++ ++out_unlock: ++ kbase_gpu_vm_unlock(kctx); ++ return addr; ++} ++ +void *kbase_vmap(struct kbase_context *kctx, u64 gpu_addr, size_t size, + struct kbase_vmap_struct *map) +{ @@ -231580,7 +267685,8 @@ index 000000000000..99b5b852667e + * be made. + * + * As mentioned in kbase_vmap_prot() this means that a kernel-side -+ * CPU-RO mapping is not enforced to allow this to work */ ++ * CPU-RO mapping is not enforced to allow this to work ++ */ + return kbase_vmap_prot(kctx, gpu_addr, size, 0u, map); +} +KBASE_EXPORT_TEST_API(kbase_vmap); @@ -231589,17 +267695,37 @@ index 000000000000..99b5b852667e + struct kbase_vmap_struct *map) +{ + void *addr = (void *)((uintptr_t)map->addr & PAGE_MASK); ++ + vunmap(addr); + -+ if (map->sync_needed) ++ /* If page migration is enabled, decrement the number of VMA mappings ++ * for all physical pages. Now is a good time to do it because references ++ * haven't been released yet. ++ */ ++ if (kbase_page_migration_enabled && !kbase_mem_is_imported(map->gpu_alloc->type)) { ++ const size_t page_count = PFN_UP(map->offset_in_page + map->size); ++ struct tagged_addr *pages_array = map->cpu_pages; ++ ++ kbase_vunmap_phy_pages_migrate_count_decrement(pages_array, page_count); ++ } ++ ++ if (map->flags & KBASE_VMAP_FLAG_SYNC_NEEDED) + kbase_sync_mem_regions(kctx, map, KBASE_SYNC_TO_DEVICE); ++ if (map->flags & KBASE_VMAP_FLAG_PERMANENT_MAP_ACCOUNTING) { ++ size_t page_count = PFN_UP(map->offset_in_page + map->size); ++ ++ WARN_ON(page_count > atomic_read(&kctx->permanent_mapped_pages)); ++ atomic_sub(page_count, &kctx->permanent_mapped_pages); ++ } ++ ++ kbase_mem_phy_alloc_kernel_unmapped(map->cpu_alloc); + + map->offset_in_page = 0; + map->cpu_pages = NULL; + map->gpu_pages = NULL; + map->addr = NULL; + map->size = 0; -+ map->sync_needed = false; ++ map->flags = 0; +} + +void kbase_vunmap(struct kbase_context *kctx, struct kbase_vmap_struct *map) @@ -231612,7 +267738,7 @@ index 000000000000..99b5b852667e + +static void kbasep_add_mm_counter(struct mm_struct *mm, int member, long value) +{ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)) ++#if (KERNEL_VERSION(4, 19, 0) <= LINUX_VERSION_CODE) + /* To avoid the build breakage due to an unexported kernel symbol + * 'mm_trace_rss_stat' from later kernels, i.e. from V4.19.0 onwards, + * we inline here the equivalent of 'add_mm_counter()' from linux @@ -231626,83 +267752,29 @@ index 000000000000..99b5b852667e + +void kbasep_os_process_page_usage_update(struct kbase_context *kctx, int pages) +{ -+ struct mm_struct *mm; ++ struct mm_struct *mm = kctx->process_mm; + -+ rcu_read_lock(); -+ mm = rcu_dereference(kctx->process_mm); -+ if (mm) { -+ atomic_add(pages, &kctx->nonmapped_pages); -+#ifdef SPLIT_RSS_COUNTING -+ kbasep_add_mm_counter(mm, MM_FILEPAGES, pages); -+#else -+ spin_lock(&mm->page_table_lock); -+ kbasep_add_mm_counter(mm, MM_FILEPAGES, pages); -+ spin_unlock(&mm->page_table_lock); -+#endif -+ } -+ rcu_read_unlock(); -+} -+ -+static void kbasep_os_process_page_usage_drain(struct kbase_context *kctx) -+{ -+ int pages; -+ struct mm_struct *mm; -+ -+ spin_lock(&kctx->mm_update_lock); -+ mm = rcu_dereference_protected(kctx->process_mm, lockdep_is_held(&kctx->mm_update_lock)); -+ if (!mm) { -+ spin_unlock(&kctx->mm_update_lock); ++ if (unlikely(!mm)) + return; -+ } -+ -+ rcu_assign_pointer(kctx->process_mm, NULL); -+ spin_unlock(&kctx->mm_update_lock); -+ synchronize_rcu(); + -+ pages = atomic_xchg(&kctx->nonmapped_pages, 0); ++ atomic_add(pages, &kctx->nonmapped_pages); +#ifdef SPLIT_RSS_COUNTING -+ kbasep_add_mm_counter(mm, MM_FILEPAGES, -pages); ++ kbasep_add_mm_counter(mm, MM_FILEPAGES, pages); +#else + spin_lock(&mm->page_table_lock); -+ kbasep_add_mm_counter(mm, MM_FILEPAGES, -pages); ++ kbasep_add_mm_counter(mm, MM_FILEPAGES, pages); + spin_unlock(&mm->page_table_lock); +#endif +} + -+static void kbase_special_vm_close(struct vm_area_struct *vma) -+{ -+ struct kbase_context *kctx; -+ -+ kctx = vma->vm_private_data; -+ kbasep_os_process_page_usage_drain(kctx); -+} -+ -+static const struct vm_operations_struct kbase_vm_special_ops = { -+ .close = kbase_special_vm_close, -+}; -+ +static int kbase_tracking_page_setup(struct kbase_context *kctx, struct vm_area_struct *vma) +{ -+ /* check that this is the only tracking page */ -+ spin_lock(&kctx->mm_update_lock); -+ if (rcu_dereference_protected(kctx->process_mm, lockdep_is_held(&kctx->mm_update_lock))) { -+ spin_unlock(&kctx->mm_update_lock); -+ return -EFAULT; -+ } -+ -+ rcu_assign_pointer(kctx->process_mm, current->mm); -+ -+ spin_unlock(&kctx->mm_update_lock); ++ if (vma_pages(vma) != 1) ++ return -EINVAL; + + /* no real access */ + vma->vm_flags &= ~(VM_READ | VM_MAYREAD | VM_WRITE | VM_MAYWRITE | VM_EXEC | VM_MAYEXEC); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)) + vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND | VM_DONTDUMP | VM_IO; -+#else -+ vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED | VM_IO; -+#endif -+ vma->vm_ops = &kbase_vm_special_ops; -+ vma->vm_private_data = kctx; + + return 0; +} @@ -231717,17 +267789,37 @@ index 000000000000..99b5b852667e + * assigned one, otherwise a dummy page. Always return the + * dummy page in no mali builds. + */ -+ if ((queue->doorbell_nr == KBASEP_USER_DB_NR_INVALID) || -+ IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI)) ++#if IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ return PFN_DOWN(as_phys_addr_t(kbdev->csf.dummy_db_page)); ++#else ++ if (queue->doorbell_nr == KBASEP_USER_DB_NR_INVALID) + return PFN_DOWN(as_phys_addr_t(kbdev->csf.dummy_db_page)); -+ ++#endif + return (PFN_DOWN(kbdev->reg_start + CSF_HW_DOORBELL_PAGE_OFFSET + + (u64)queue->doorbell_nr * CSF_HW_DOORBELL_PAGE_SIZE)); +} + ++static int ++#if (KERNEL_VERSION(5, 13, 0) <= LINUX_VERSION_CODE || \ ++ KERNEL_VERSION(5, 11, 0) > LINUX_VERSION_CODE) ++kbase_csf_user_io_pages_vm_mremap(struct vm_area_struct *vma) ++#else ++kbase_csf_user_io_pages_vm_mremap(struct vm_area_struct *vma, unsigned long flags) ++#endif ++{ ++ pr_debug("Unexpected call to mremap method for User IO pages mapping vma\n"); ++ return -EINVAL; ++} ++ ++static int kbase_csf_user_io_pages_vm_split(struct vm_area_struct *vma, unsigned long addr) ++{ ++ pr_debug("Unexpected call to split method for User IO pages mapping vma\n"); ++ return -EINVAL; ++} ++ +static void kbase_csf_user_io_pages_vm_open(struct vm_area_struct *vma) +{ -+ WARN(1, "Unexpected attempt to clone private vma\n"); ++ pr_debug("Unexpected call to the open method for User IO pages mapping vma\n"); + vma->vm_private_data = NULL; +} + @@ -231735,16 +267827,34 @@ index 000000000000..99b5b852667e +{ + struct kbase_queue *queue = vma->vm_private_data; + struct kbase_context *kctx; ++ struct kbase_device *kbdev; ++ int err; ++ bool reset_prevented = false; + -+ if (WARN_ON(!queue)) ++ if (!queue) { ++ pr_debug("Close method called for the new User IO pages mapping vma\n"); + return; ++ } + + kctx = queue->kctx; ++ kbdev = kctx->kbdev; ++ ++ err = kbase_reset_gpu_prevent_and_wait(kbdev); ++ if (err) ++ dev_warn( ++ kbdev->dev, ++ "Unsuccessful GPU reset detected when unbinding queue (csi_index=%d), attempting to unbind regardless", ++ queue->csi_index); ++ else ++ reset_prevented = true; + + mutex_lock(&kctx->csf.lock); -+ kbase_csf_queue_unbind(queue); ++ kbase_csf_queue_unbind(queue, is_process_exiting(vma)); + mutex_unlock(&kctx->csf.lock); + ++ if (reset_prevented) ++ kbase_reset_gpu_allow(kbdev); ++ + /* Now as the vma is closed, drop the reference on mali device file */ + fput(kctx->filp); +} @@ -231768,24 +267878,21 @@ index 000000000000..99b5b852667e + struct memory_group_manager_device *mgm_dev; + + /* Few sanity checks up front */ -+ if ((nr_pages != BASEP_QUEUE_NR_MMAP_USER_PAGES) || -+ (vma->vm_pgoff != queue->db_file_offset)) ++ if (!queue || (nr_pages != BASEP_QUEUE_NR_MMAP_USER_PAGES) || ++ (vma->vm_pgoff != queue->db_file_offset)) { ++ pr_warn("Unexpected CPU page fault on User IO pages mapping for process %s tgid %d pid %d\n", ++ current->comm, current->tgid, current->pid); + return VM_FAULT_SIGBUS; ++ } + -+ mutex_lock(&queue->kctx->csf.lock); + kbdev = queue->kctx->kbdev; + mgm_dev = kbdev->mgm_dev; + ++ mutex_lock(&kbdev->csf.reg_lock); ++ + /* Always map the doorbell page as uncached */ + doorbell_pgprot = pgprot_device(vma->vm_page_prot); + -+#if ((KERNEL_VERSION(4, 4, 147) >= LINUX_VERSION_CODE) || \ -+ ((KERNEL_VERSION(4, 6, 0) > LINUX_VERSION_CODE) && \ -+ (KERNEL_VERSION(4, 5, 0) <= LINUX_VERSION_CODE))) -+ vma->vm_page_prot = doorbell_pgprot; -+ input_page_pgprot = doorbell_pgprot; -+ output_page_pgprot = doorbell_pgprot; -+#else + if (kbdev->system_coherency == COHERENCY_NONE) { + input_page_pgprot = pgprot_writecombine(vma->vm_page_prot); + output_page_pgprot = pgprot_writecombine(vma->vm_page_prot); @@ -231793,7 +267900,6 @@ index 000000000000..99b5b852667e + input_page_pgprot = vma->vm_page_prot; + output_page_pgprot = vma->vm_page_prot; + } -+#endif + + doorbell_cpu_addr = vma->vm_start; + @@ -231802,12 +267908,10 @@ index 000000000000..99b5b852667e +#else + if (vmf->address == doorbell_cpu_addr) { +#endif -+ mutex_lock(&kbdev->csf.reg_lock); + doorbell_page_pfn = get_queue_doorbell_pfn(kbdev, queue); + ret = mgm_dev->ops.mgm_vmf_insert_pfn_prot(mgm_dev, + KBASE_MEM_GROUP_CSF_IO, vma, doorbell_cpu_addr, + doorbell_page_pfn, doorbell_pgprot); -+ mutex_unlock(&kbdev->csf.reg_lock); + } else { + /* Map the Input page */ + input_cpu_addr = doorbell_cpu_addr + PAGE_SIZE; @@ -231827,13 +267931,19 @@ index 000000000000..99b5b852667e + } + +exit: -+ mutex_unlock(&queue->kctx->csf.lock); ++ mutex_unlock(&kbdev->csf.reg_lock); + return ret; +} + +static const struct vm_operations_struct kbase_csf_user_io_pages_vm_ops = { + .open = kbase_csf_user_io_pages_vm_open, + .close = kbase_csf_user_io_pages_vm_close, ++#if KERNEL_VERSION(5, 11, 0) <= LINUX_VERSION_CODE ++ .may_split = kbase_csf_user_io_pages_vm_split, ++#else ++ .split = kbase_csf_user_io_pages_vm_split, ++#endif ++ .mremap = kbase_csf_user_io_pages_vm_mremap, + .fault = kbase_csf_user_io_pages_vm_fault +}; + @@ -231846,7 +267956,7 @@ index 000000000000..99b5b852667e +{ + unsigned long cookie = + vma->vm_pgoff - PFN_DOWN(BASEP_MEM_CSF_USER_IO_PAGES_HANDLE); -+ size_t nr_pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; ++ size_t nr_pages = vma_pages(vma); + struct kbase_queue *queue; + int err = 0; + @@ -231879,11 +267989,7 @@ index 000000000000..99b5b852667e + if (err) + goto map_failed; + -+#if (KERNEL_VERSION(3, 7, 0) <= LINUX_VERSION_CODE) + vma->vm_flags |= VM_DONTCOPY | VM_DONTDUMP | VM_DONTEXPAND | VM_IO; -+#else -+ vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED | VM_IO; -+#endif + /* TODO use VM_MIXEDMAP, since it is more appropriate as both types of + * memory with and without "struct page" backing are being inserted here. + * Hw Doorbell pages comes from the device register area so kernel does @@ -231906,18 +268012,86 @@ index 000000000000..99b5b852667e + return 0; + +map_failed: -+ kbase_csf_queue_unbind(queue); ++ /* The queue cannot have got to KBASE_CSF_QUEUE_BOUND state if we ++ * reached here, so safe to use a variant of unbind that only works on ++ * stopped queues ++ * ++ * This is so we don't enter the CSF scheduler from this path. ++ */ ++ kbase_csf_queue_unbind_stopped(queue); + + return err; +} + ++/** ++ * kbase_csf_user_reg_vm_open - VMA open function for the USER page ++ * ++ * @vma: Pointer to the struct containing information about ++ * the userspace mapping of USER page. ++ * Note: ++ * This function isn't expected to be called. If called (i.e> mremap), ++ * set private_data as NULL to indicate to close() and fault() functions. ++ */ ++static void kbase_csf_user_reg_vm_open(struct vm_area_struct *vma) ++{ ++ pr_debug("Unexpected call to the open method for USER register mapping"); ++ vma->vm_private_data = NULL; ++} ++ ++/** ++ * kbase_csf_user_reg_vm_close - VMA close function for the USER page ++ * ++ * @vma: Pointer to the struct containing information about ++ * the userspace mapping of USER page. ++ */ +static void kbase_csf_user_reg_vm_close(struct vm_area_struct *vma) +{ + struct kbase_context *kctx = vma->vm_private_data; ++ struct kbase_device *kbdev; + -+ WARN_ON(!kctx->csf.user_reg_vma); ++ if (unlikely(!kctx)) { ++ pr_debug("Close function called for the unexpected mapping"); ++ return; ++ } ++ ++ kbdev = kctx->kbdev; ++ ++ if (unlikely(!kctx->csf.user_reg.vma)) ++ dev_warn(kbdev->dev, "user_reg VMA pointer unexpectedly NULL for ctx %d_%d", ++ kctx->tgid, kctx->id); ++ ++ mutex_lock(&kbdev->csf.reg_lock); ++ list_del_init(&kctx->csf.user_reg.link); ++ mutex_unlock(&kbdev->csf.reg_lock); + -+ kctx->csf.user_reg_vma = NULL; ++ kctx->csf.user_reg.vma = NULL; ++ ++ /* Now as the VMA is closed, drop the reference on mali device file */ ++ fput(kctx->filp); ++} ++ ++/** ++ * kbase_csf_user_reg_vm_mremap - VMA mremap function for the USER page ++ * ++ * @vma: Pointer to the struct containing information about ++ * the userspace mapping of USER page. ++ * ++ * Return: -EINVAL ++ * ++ * Note: ++ * User space must not attempt mremap on USER page mapping. ++ * This function will return an error to fail the attempt. ++ */ ++static int ++#if ((KERNEL_VERSION(5, 13, 0) <= LINUX_VERSION_CODE) || \ ++ (KERNEL_VERSION(5, 11, 0) > LINUX_VERSION_CODE)) ++kbase_csf_user_reg_vm_mremap(struct vm_area_struct *vma) ++#else ++kbase_csf_user_reg_vm_mremap(struct vm_area_struct *vma, unsigned long flags) ++#endif ++{ ++ pr_debug("Unexpected call to mremap method for USER page mapping vma\n"); ++ return -EINVAL; +} + +#if (KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE) @@ -231930,26 +268104,52 @@ index 000000000000..99b5b852667e + struct vm_area_struct *vma = vmf->vma; +#endif + struct kbase_context *kctx = vma->vm_private_data; -+ struct kbase_device *kbdev = kctx->kbdev; -+ unsigned long pfn = PFN_DOWN(kbdev->reg_start + USER_BASE); ++ struct kbase_device *kbdev; ++ struct memory_group_manager_device *mgm_dev; ++ unsigned long pfn; + size_t nr_pages = PFN_DOWN(vma->vm_end - vma->vm_start); ++ vm_fault_t ret = VM_FAULT_SIGBUS; ++ unsigned long flags; + + /* Few sanity checks up front */ -+ if (WARN_ON(nr_pages != 1) || -+ WARN_ON(vma != kctx->csf.user_reg_vma) || -+ WARN_ON(vma->vm_pgoff != -+ PFN_DOWN(BASEP_MEM_CSF_USER_REG_PAGE_HANDLE))) ++ ++ if (!kctx || (nr_pages != 1) || (vma != kctx->csf.user_reg.vma) || ++ (vma->vm_pgoff != kctx->csf.user_reg.file_offset)) { ++ pr_err("Unexpected CPU page fault on USER page mapping for process %s tgid %d pid %d\n", ++ current->comm, current->tgid, current->pid); + return VM_FAULT_SIGBUS; ++ } + -+ /* TODO: check PM state here and don't map in the actual register page -+ * if GPU is powered down or is about to be powered down. ++ kbdev = kctx->kbdev; ++ mgm_dev = kbdev->mgm_dev; ++ pfn = PFN_DOWN(kbdev->reg_start + USER_BASE); ++ ++ mutex_lock(&kbdev->csf.reg_lock); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ /* Dummy page will be mapped during GPU off. ++ * ++ * In no mail builds, always map in the dummy page. + */ ++ if (IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) || !kbdev->pm.backend.gpu_powered) ++ pfn = PFN_DOWN(as_phys_addr_t(kbdev->csf.user_reg.dummy_page)); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ list_move_tail(&kctx->csf.user_reg.link, &kbdev->csf.user_reg.list); ++ ret = mgm_dev->ops.mgm_vmf_insert_pfn_prot(mgm_dev, ++ KBASE_MEM_GROUP_CSF_FW, vma, ++ vma->vm_start, pfn, ++ vma->vm_page_prot); ++ ++ mutex_unlock(&kbdev->csf.reg_lock); + -+ return vmf_insert_pfn_prot(vma, vma->vm_start, pfn, vma->vm_page_prot); ++ return ret; +} + +static const struct vm_operations_struct kbase_csf_user_reg_vm_ops = { ++ .open = kbase_csf_user_reg_vm_open, + .close = kbase_csf_user_reg_vm_close, ++ .mremap = kbase_csf_user_reg_vm_mremap, + .fault = kbase_csf_user_reg_vm_fault +}; + @@ -231957,9 +268157,10 @@ index 000000000000..99b5b852667e + struct vm_area_struct *vma) +{ + size_t nr_pages = PFN_DOWN(vma->vm_end - vma->vm_start); ++ struct kbase_device *kbdev = kctx->kbdev; + + /* Few sanity checks */ -+ if (kctx->csf.user_reg_vma) ++ if (kctx->csf.user_reg.vma) + return -EBUSY; + + if (nr_pages != 1) @@ -231978,8 +268179,21 @@ index 000000000000..99b5b852667e + */ + vma->vm_flags |= VM_PFNMAP; + -+ kctx->csf.user_reg_vma = vma; ++ kctx->csf.user_reg.vma = vma; ++ ++ mutex_lock(&kbdev->csf.reg_lock); ++ kctx->csf.user_reg.file_offset = kbdev->csf.user_reg.file_offset++; ++ mutex_unlock(&kbdev->csf.reg_lock); ++ ++ /* Make VMA point to the special internal file, but don't drop the ++ * reference on mali device file (that would be done later when the ++ * VMA is closed). ++ */ ++ vma->vm_file = kctx->kbdev->csf.user_reg.filp; ++ get_file(vma->vm_file); + ++ /* Also adjust the vm_pgoff */ ++ vma->vm_pgoff = kctx->csf.user_reg.file_offset; + vma->vm_ops = &kbase_csf_user_reg_vm_ops; + vma->vm_private_data = kctx; + @@ -231989,18 +268203,19 @@ index 000000000000..99b5b852667e +#endif /* MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h new file mode 100755 -index 000000000000..85e030ab751a +index 000000000..6dda44b9f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h -@@ -0,0 +1,478 @@ +@@ -0,0 +1,533 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2010, 2012-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010, 2012-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -232011,21 +268226,16 @@ index 000000000000..85e030ab751a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/** -+ * @file mali_kbase_mem_linux.h -+ * Base kernel memory APIs, Linux implementation. ++ * DOC: Base kernel memory APIs, Linux implementation. + */ + +#ifndef _KBASE_MEM_LINUX_H_ +#define _KBASE_MEM_LINUX_H_ + -+/** A HWC dump mapping */ ++/* A HWC dump mapping */ +struct kbase_hwc_dma_mapping { + void *cpu_va; + dma_addr_t dma_pa; @@ -232038,18 +268248,20 @@ index 000000000000..85e030ab751a + * @kctx: The kernel context + * @va_pages: The number of pages of virtual address space to reserve + * @commit_pages: The number of physical pages to allocate upfront -+ * @extent: The number of extra pages to allocate on each GPU fault which ++ * @extension: The number of extra pages to allocate on each GPU fault which + * grows the region. + * @flags: bitmask of BASE_MEM_* flags to convey special requirements & + * properties for the new allocation. + * @gpu_va: Start address of the memory region which was allocated from GPU -+ * virtual address space. ++ * virtual address space. If the BASE_MEM_FLAG_MAP_FIXED is set ++ * then this parameter shall be provided by the caller. ++ * @mmu_sync_info: Indicates whether this call is synchronous wrt MMU ops. + * + * Return: 0 on success or error code + */ -+struct kbase_va_region *kbase_mem_alloc(struct kbase_context *kctx, -+ u64 va_pages, u64 commit_pages, u64 extent, u64 *flags, -+ u64 *gpu_va); ++struct kbase_va_region *kbase_mem_alloc(struct kbase_context *kctx, u64 va_pages, u64 commit_pages, ++ u64 extension, u64 *flags, u64 *gpu_va, ++ enum kbase_caller_mmu_sync_info mmu_sync_info); + +/** + * kbase_mem_query - Query properties of a GPU memory region @@ -232168,6 +268380,7 @@ index 000000000000..85e030ab751a + * @reg: The GPU region + * @new_pages: The number of pages after the grow + * @old_pages: The number of pages before the grow ++ * @mmu_sync_info: Indicates whether this call is synchronous wrt MMU ops. + * + * Return: 0 on success, -errno on error. + * @@ -232177,8 +268390,9 @@ index 000000000000..85e030ab751a + * Note: Caller must be holding the region lock. + */ +int kbase_mem_grow_gpu_mapping(struct kbase_context *kctx, -+ struct kbase_va_region *reg, -+ u64 new_pages, u64 old_pages); ++ struct kbase_va_region *reg, u64 new_pages, ++ u64 old_pages, ++ enum kbase_caller_mmu_sync_info mmu_sync_info); + +/** + * kbase_mem_evictable_make - Make a physical allocation eligible for eviction @@ -232212,6 +268426,26 @@ index 000000000000..85e030ab751a + */ +bool kbase_mem_evictable_unmake(struct kbase_mem_phy_alloc *alloc); + ++typedef unsigned int kbase_vmap_flag; ++ ++/* Sync operations are needed on beginning and ending of access to kernel-mapped GPU memory. ++ * ++ * This is internal to the struct kbase_vmap_struct and should not be passed in by callers of ++ * kbase_vmap-related functions. ++ */ ++#define KBASE_VMAP_FLAG_SYNC_NEEDED (((kbase_vmap_flag)1) << 0) ++ ++/* Permanently mapped memory accounting (including enforcing limits) should be done on the ++ * kernel-mapped GPU memory. ++ * ++ * This should be used if the kernel mapping is going to live for a potentially long time, for ++ * example if it will persist after the caller has returned. ++ */ ++#define KBASE_VMAP_FLAG_PERMANENT_MAP_ACCOUNTING (((kbase_vmap_flag)1) << 1) ++ ++/* Set of flags that can be passed into kbase_vmap-related functions */ ++#define KBASE_VMAP_INPUT_FLAGS (KBASE_VMAP_FLAG_PERMANENT_MAP_ACCOUNTING) ++ +struct kbase_vmap_struct { + off_t offset_in_page; + struct kbase_mem_phy_alloc *cpu_alloc; @@ -232220,9 +268454,55 @@ index 000000000000..85e030ab751a + struct tagged_addr *gpu_pages; + void *addr; + size_t size; -+ bool sync_needed; ++ kbase_vmap_flag flags; +}; + ++/** ++ * kbase_mem_shrink_gpu_mapping - Shrink the GPU mapping of an allocation ++ * @kctx: Context the region belongs to ++ * @reg: The GPU region or NULL if there isn't one ++ * @new_pages: The number of pages after the shrink ++ * @old_pages: The number of pages before the shrink ++ * ++ * Return: 0 on success, negative -errno on error ++ * ++ * Unmap the shrunk pages from the GPU mapping. Note that the size of the region ++ * itself is unmodified as we still need to reserve the VA, only the page tables ++ * will be modified by this function. ++ */ ++int kbase_mem_shrink_gpu_mapping(struct kbase_context *kctx, struct kbase_va_region *reg, ++ u64 new_pages, u64 old_pages); ++ ++/** ++ * kbase_vmap_reg - Map part of an existing region into the kernel safely, only if the requested ++ * access permissions are supported ++ * @kctx: Context @reg belongs to ++ * @reg: The GPU region to map part of ++ * @gpu_addr: Start address of VA range to map, which must be within @reg ++ * @size: Size of VA range, which when added to @gpu_addr must be within @reg ++ * @prot_request: Flags indicating how the caller will then access the memory ++ * @map: Structure to be given to kbase_vunmap() on freeing ++ * @vmap_flags: Flags of type kbase_vmap_flag ++ * ++ * Return: Kernel-accessible CPU pointer to the VA range, or NULL on error ++ * ++ * Variant of kbase_vmap_prot() that can be used given an existing region. ++ * ++ * The caller must satisfy one of the following for @reg: ++ * * It must have been obtained by finding it on the region tracker, and the region lock must not ++ * have been released in the mean time. ++ * * Or, it must have been refcounted with a call to kbase_va_region_alloc_get(), and the region ++ * lock is now held again. ++ * * Or, @reg has had NO_USER_FREE set at creation time or under the region lock, and the ++ * region lock is now held again. ++ * ++ * The acceptable @vmap_flags are those in %KBASE_VMAP_INPUT_FLAGS. ++ * ++ * Refer to kbase_vmap_prot() for more information on the operation of this function. ++ */ ++void *kbase_vmap_reg(struct kbase_context *kctx, struct kbase_va_region *reg, u64 gpu_addr, ++ size_t size, unsigned long prot_request, struct kbase_vmap_struct *map, ++ kbase_vmap_flag vmap_flags); + +/** + * kbase_vmap_prot - Map a GPU VA range into the kernel safely, only if the @@ -232253,7 +268533,7 @@ index 000000000000..85e030ab751a + * The checks are also there to help catch access errors on memory where + * security is not a concern: imported memory that is always RW, and memory + * that was allocated and owned by the process attached to @kctx. In this case, -+ * it helps to identify memory that was was mapped with the wrong access type. ++ * it helps to identify memory that was mapped with the wrong access type. + * + * Note: KBASE_REG_GPU_{RD,WR} flags are currently supported for legacy cases + * where either the security of memory is solely dependent on those flags, or @@ -232421,12 +268701,12 @@ index 000000000000..85e030ab751a +/** + * kbase_get_cache_line_alignment - Return cache line alignment + * ++ * @kbdev: Device pointer. ++ * + * Helper function to return the maximum cache line alignment considering + * both CPU and GPU cache sizes. + * + * Return: CPU and GPU cache line alignment, in bytes. -+ * -+ * @kbdev: Device pointer. + */ +u32 kbase_get_cache_line_alignment(struct kbase_device *kbdev); + @@ -232434,18 +268714,7 @@ index 000000000000..85e030ab751a +static inline vm_fault_t vmf_insert_pfn_prot(struct vm_area_struct *vma, + unsigned long addr, unsigned long pfn, pgprot_t pgprot) +{ -+ int err; -+ -+#if ((KERNEL_VERSION(4, 4, 147) >= LINUX_VERSION_CODE) || \ -+ ((KERNEL_VERSION(4, 6, 0) > LINUX_VERSION_CODE) && \ -+ (KERNEL_VERSION(4, 5, 0) <= LINUX_VERSION_CODE))) -+ if (pgprot_val(pgprot) != pgprot_val(vma->vm_page_prot)) -+ return VM_FAULT_SIGBUS; -+ -+ err = vm_insert_pfn(vma, addr, pfn); -+#else -+ err = vm_insert_pfn_prot(vma, addr, pfn, pgprot); -+#endif ++ int err = vm_insert_pfn_prot(vma, addr, pfn, pgprot); + + if (unlikely(err == -ENOMEM)) + return VM_FAULT_OOM; @@ -232463,28 +268732,29 @@ index 000000000000..85e030ab751a + */ +static inline struct rw_semaphore *kbase_mem_get_process_mmap_lock(void) +{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) ++#if KERNEL_VERSION(5, 8, 0) > LINUX_VERSION_CODE + return ¤t->mm->mmap_sem; -+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) */ ++#else /* KERNEL_VERSION(5, 8, 0) > LINUX_VERSION_CODE */ + return ¤t->mm->mmap_lock; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) */ ++#endif /* KERNEL_VERSION(5, 8, 0) > LINUX_VERSION_CODE */ +} + +#endif /* _KBASE_MEM_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h new file mode 100755 -index 000000000000..70116030f233 +index 000000000..5a1bb16cc --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h -@@ -0,0 +1,166 @@ +@@ -0,0 +1,179 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2012-2014,2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2014, 2016-2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -232495,12 +268765,8 @@ index 000000000000..70116030f233 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +#ifndef _KBASE_MEM_LOWLEVEL_H +#define _KBASE_MEM_LOWLEVEL_H + @@ -232510,9 +268776,7 @@ index 000000000000..70116030f233 + +#include + -+/** -+ * @brief Flags for kbase_phy_allocator_pages_alloc -+ */ ++/* Flags for kbase_phy_allocator_pages_alloc */ +#define KBASE_PHY_PAGES_FLAG_DEFAULT (0) /** Default allocation flag */ +#define KBASE_PHY_PAGES_FLAG_CLEAR (1 << 0) /** Clear the pages after allocation */ +#define KBASE_PHY_PAGES_FLAG_POISON (1 << 1) /** Fill the memory with a poison value */ @@ -232532,6 +268796,8 @@ index 000000000000..70116030f233 +#define HUGE_HEAD (1u << 1) +#define FROM_PARTIAL (1u << 2) + ++#define NUM_4K_PAGES_IN_2MB_PAGE (SZ_2M / SZ_4K) ++ +/* + * Note: if macro for converting physical address to page is not defined + * in the kernel itself, it is defined hereby. This is to avoid build errors @@ -232642,21 +268908,799 @@ index 000000000000..70116030f233 + return t.tagged_addr & FROM_PARTIAL; +} + ++/** ++ * index_in_large_page() - Get index of a 4KB page within a 2MB page which ++ * wasn't split to be used partially. ++ * ++ * @t: Tagged physical address of the physical 4KB page that lies within ++ * the large (or 2 MB) physical page. ++ * ++ * Return: Index of the 4KB page within a 2MB page ++ */ ++static inline unsigned int index_in_large_page(struct tagged_addr t) ++{ ++ WARN_ON(!is_huge(t)); ++ ++ return (PFN_DOWN(as_phys_addr_t(t)) & (NUM_4K_PAGES_IN_2MB_PAGE - 1)); ++} ++ +#endif /* _KBASE_LOWLEVEL_H */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.c +new file mode 100644 +index 000000000..737f7da55 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.c +@@ -0,0 +1,641 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2022-2023 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++/** ++ * DOC: Base kernel page migration implementation. ++ */ ++#include ++ ++#include ++#include ++#include ++ ++/* Global integer used to determine if module parameter value has been ++ * provided and if page migration feature is enabled. ++ * Feature is disabled on all platforms by default. ++ */ ++int kbase_page_migration_enabled; ++module_param(kbase_page_migration_enabled, int, 0444); ++KBASE_EXPORT_TEST_API(kbase_page_migration_enabled); ++ ++#if (KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE) ++static const struct movable_operations movable_ops; ++#endif ++ ++bool kbase_alloc_page_metadata(struct kbase_device *kbdev, struct page *p, dma_addr_t dma_addr, ++ u8 group_id) ++{ ++ struct kbase_page_metadata *page_md = ++ kzalloc(sizeof(struct kbase_page_metadata), GFP_KERNEL); ++ ++ if (!page_md) ++ return false; ++ ++ SetPagePrivate(p); ++ set_page_private(p, (unsigned long)page_md); ++ page_md->dma_addr = dma_addr; ++ page_md->status = PAGE_STATUS_SET(page_md->status, (u8)ALLOCATE_IN_PROGRESS); ++ page_md->vmap_count = 0; ++ page_md->group_id = group_id; ++ spin_lock_init(&page_md->migrate_lock); ++ ++ lock_page(p); ++#if (KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE) ++ __SetPageMovable(p, &movable_ops); ++ page_md->status = PAGE_MOVABLE_SET(page_md->status); ++#else ++ /* In some corner cases, the driver may attempt to allocate memory pages ++ * even before the device file is open and the mapping for address space ++ * operations is created. In that case, it is impossible to assign address ++ * space operations to memory pages: simply pretend that they are movable, ++ * even if they are not. ++ * ++ * The page will go through all state transitions but it will never be ++ * actually considered movable by the kernel. This is due to the fact that ++ * the page cannot be marked as NOT_MOVABLE upon creation, otherwise the ++ * memory pool will always refuse to add it to the pool and schedule ++ * a worker thread to free it later. ++ * ++ * Page metadata may seem redundant in this case, but they are not, ++ * because memory pools expect metadata to be present when page migration ++ * is enabled and because the pages may always return to memory pools and ++ * gain the movable property later on in their life cycle. ++ */ ++ if (kbdev->mem_migrate.inode && kbdev->mem_migrate.inode->i_mapping) { ++ __SetPageMovable(p, kbdev->mem_migrate.inode->i_mapping); ++ page_md->status = PAGE_MOVABLE_SET(page_md->status); ++ } ++#endif ++ unlock_page(p); ++ ++ return true; ++} ++ ++static void kbase_free_page_metadata(struct kbase_device *kbdev, struct page *p, u8 *group_id) ++{ ++ struct device *const dev = kbdev->dev; ++ struct kbase_page_metadata *page_md; ++ dma_addr_t dma_addr; ++ ++ page_md = kbase_page_private(p); ++ if (!page_md) ++ return; ++ ++ if (group_id) ++ *group_id = page_md->group_id; ++ dma_addr = kbase_dma_addr(p); ++ dma_unmap_page(dev, dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ ++ kfree(page_md); ++ set_page_private(p, 0); ++ ClearPagePrivate(p); ++} ++ ++static void kbase_free_pages_worker(struct work_struct *work) ++{ ++ struct kbase_mem_migrate *mem_migrate = ++ container_of(work, struct kbase_mem_migrate, free_pages_work); ++ struct kbase_device *kbdev = container_of(mem_migrate, struct kbase_device, mem_migrate); ++ struct page *p, *tmp; ++ struct kbase_page_metadata *page_md; ++ LIST_HEAD(free_list); ++ ++ spin_lock(&mem_migrate->free_pages_lock); ++ list_splice_init(&mem_migrate->free_pages_list, &free_list); ++ spin_unlock(&mem_migrate->free_pages_lock); ++ ++ list_for_each_entry_safe(p, tmp, &free_list, lru) { ++ u8 group_id = 0; ++ list_del_init(&p->lru); ++ ++ lock_page(p); ++ page_md = kbase_page_private(p); ++ if (IS_PAGE_MOVABLE(page_md->status)) { ++ __ClearPageMovable(p); ++ page_md->status = PAGE_MOVABLE_CLEAR(page_md->status); ++ } ++ unlock_page(p); ++ ++ kbase_free_page_metadata(kbdev, p, &group_id); ++ kbdev->mgm_dev->ops.mgm_free_page(kbdev->mgm_dev, group_id, p, 0); ++ } ++} ++ ++void kbase_free_page_later(struct kbase_device *kbdev, struct page *p) ++{ ++ struct kbase_mem_migrate *mem_migrate = &kbdev->mem_migrate; ++ ++ spin_lock(&mem_migrate->free_pages_lock); ++ list_add(&p->lru, &mem_migrate->free_pages_list); ++ spin_unlock(&mem_migrate->free_pages_lock); ++} ++ ++/** ++ * kbasep_migrate_page_pt_mapped - Migrate a memory page that is mapped ++ * in a PGD of kbase_mmu_table. ++ * ++ * @old_page: Existing PGD page to remove ++ * @new_page: Destination for migrating the existing PGD page to ++ * ++ * Replace an existing PGD page with a new page by migrating its content. More specifically: ++ * the new page shall replace the existing PGD page in the MMU page table. Before returning, ++ * the new page shall be set as movable and not isolated, while the old page shall lose ++ * the movable property. The meta data attached to the PGD page is transferred to the ++ * new (replacement) page. ++ * ++ * Return: 0 on migration success, or -EAGAIN for a later retry. Otherwise it's a failure ++ * and the migration is aborted. ++ */ ++static int kbasep_migrate_page_pt_mapped(struct page *old_page, struct page *new_page) ++{ ++ struct kbase_page_metadata *page_md = kbase_page_private(old_page); ++ struct kbase_context *kctx = page_md->data.pt_mapped.mmut->kctx; ++ struct kbase_device *kbdev = kctx->kbdev; ++ dma_addr_t old_dma_addr = page_md->dma_addr; ++ dma_addr_t new_dma_addr; ++ int ret; ++ ++ /* Create a new dma map for the new page */ ++ new_dma_addr = dma_map_page(kbdev->dev, new_page, 0, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ if (dma_mapping_error(kbdev->dev, new_dma_addr)) ++ return -ENOMEM; ++ ++ /* Lock context to protect access to the page in physical allocation. ++ * This blocks the CPU page fault handler from remapping pages. ++ * Only MCU's mmut is device wide, i.e. no corresponding kctx. ++ */ ++ kbase_gpu_vm_lock(kctx); ++ ++ ret = kbase_mmu_migrate_page( ++ as_tagged(page_to_phys(old_page)), as_tagged(page_to_phys(new_page)), old_dma_addr, ++ new_dma_addr, PGD_VPFN_LEVEL_GET_LEVEL(page_md->data.pt_mapped.pgd_vpfn_level)); ++ ++ if (ret == 0) { ++ dma_unmap_page(kbdev->dev, old_dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ __ClearPageMovable(old_page); ++ page_md->status = PAGE_MOVABLE_CLEAR(page_md->status); ++ ClearPagePrivate(old_page); ++ put_page(old_page); ++ ++ page_md = kbase_page_private(new_page); ++#if (KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE) ++ __SetPageMovable(new_page, &movable_ops); ++ page_md->status = PAGE_MOVABLE_SET(page_md->status); ++#else ++ if (kbdev->mem_migrate.inode->i_mapping) { ++ __SetPageMovable(new_page, kbdev->mem_migrate.inode->i_mapping); ++ page_md->status = PAGE_MOVABLE_SET(page_md->status); ++ } ++#endif ++ SetPagePrivate(new_page); ++ get_page(new_page); ++ } else ++ dma_unmap_page(kbdev->dev, new_dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ ++ /* Page fault handler for CPU mapping unblocked. */ ++ kbase_gpu_vm_unlock(kctx); ++ ++ return ret; ++} ++ ++/* ++ * kbasep_migrate_page_allocated_mapped - Migrate a memory page that is both ++ * allocated and mapped. ++ * ++ * @old_page: Page to remove. ++ * @new_page: Page to add. ++ * ++ * Replace an old page with a new page by migrating its content and all its ++ * CPU and GPU mappings. More specifically: the new page shall replace the ++ * old page in the MMU page table, as well as in the page array of the physical ++ * allocation, which is used to create CPU mappings. Before returning, the new ++ * page shall be set as movable and not isolated, while the old page shall lose ++ * the movable property. ++ */ ++static int kbasep_migrate_page_allocated_mapped(struct page *old_page, struct page *new_page) ++{ ++ struct kbase_page_metadata *page_md = kbase_page_private(old_page); ++ struct kbase_context *kctx = page_md->data.mapped.mmut->kctx; ++ dma_addr_t old_dma_addr, new_dma_addr; ++ int ret; ++ ++ old_dma_addr = page_md->dma_addr; ++ new_dma_addr = dma_map_page(kctx->kbdev->dev, new_page, 0, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ if (dma_mapping_error(kctx->kbdev->dev, new_dma_addr)) ++ return -ENOMEM; ++ ++ /* Lock context to protect access to array of pages in physical allocation. ++ * This blocks the CPU page fault handler from remapping pages. ++ */ ++ kbase_gpu_vm_lock(kctx); ++ ++ /* Unmap the old physical range. */ ++ unmap_mapping_range(kctx->filp->f_inode->i_mapping, page_md->data.mapped.vpfn << PAGE_SHIFT, ++ PAGE_SIZE, 1); ++ ++ ret = kbase_mmu_migrate_page(as_tagged(page_to_phys(old_page)), ++ as_tagged(page_to_phys(new_page)), old_dma_addr, new_dma_addr, ++ MIDGARD_MMU_BOTTOMLEVEL); ++ ++ if (ret == 0) { ++ dma_unmap_page(kctx->kbdev->dev, old_dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ ++ SetPagePrivate(new_page); ++ get_page(new_page); ++ ++ /* Clear PG_movable from the old page and release reference. */ ++ ClearPagePrivate(old_page); ++ __ClearPageMovable(old_page); ++ page_md->status = PAGE_MOVABLE_CLEAR(page_md->status); ++ put_page(old_page); ++ ++ page_md = kbase_page_private(new_page); ++ /* Set PG_movable to the new page. */ ++#if (KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE) ++ __SetPageMovable(new_page, &movable_ops); ++ page_md->status = PAGE_MOVABLE_SET(page_md->status); ++#else ++ if (kctx->kbdev->mem_migrate.inode->i_mapping) { ++ __SetPageMovable(new_page, kctx->kbdev->mem_migrate.inode->i_mapping); ++ page_md->status = PAGE_MOVABLE_SET(page_md->status); ++ } ++#endif ++ } else ++ dma_unmap_page(kctx->kbdev->dev, new_dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ ++ /* Page fault handler for CPU mapping unblocked. */ ++ kbase_gpu_vm_unlock(kctx); ++ ++ return ret; ++} ++ ++/** ++ * kbase_page_isolate - Isolate a page for migration. ++ * ++ * @p: Pointer of the page struct of page to isolate. ++ * @mode: LRU Isolation modes. ++ * ++ * Callback function for Linux to isolate a page and prepare it for migration. ++ * ++ * Return: true on success, false otherwise. ++ */ ++static bool kbase_page_isolate(struct page *p, isolate_mode_t mode) ++{ ++ bool status_mem_pool = false; ++ struct kbase_mem_pool *mem_pool = NULL; ++ struct kbase_page_metadata *page_md = kbase_page_private(p); ++ ++ CSTD_UNUSED(mode); ++ ++ if (!page_md || !IS_PAGE_MOVABLE(page_md->status)) ++ return false; ++ ++ if (!spin_trylock(&page_md->migrate_lock)) ++ return false; ++ ++ if (WARN_ON(IS_PAGE_ISOLATED(page_md->status))) { ++ spin_unlock(&page_md->migrate_lock); ++ return false; ++ } ++ ++ switch (PAGE_STATUS_GET(page_md->status)) { ++ case MEM_POOL: ++ /* Prepare to remove page from memory pool later only if pool is not ++ * in the process of termination. ++ */ ++ mem_pool = page_md->data.mem_pool.pool; ++ status_mem_pool = true; ++ preempt_disable(); ++ atomic_inc(&mem_pool->isolation_in_progress_cnt); ++ break; ++ case ALLOCATED_MAPPED: ++ /* Mark the page into isolated state, but only if it has no ++ * kernel CPU mappings ++ */ ++ if (page_md->vmap_count == 0) ++ page_md->status = PAGE_ISOLATE_SET(page_md->status, 1); ++ break; ++ case PT_MAPPED: ++ /* Mark the page into isolated state. */ ++ page_md->status = PAGE_ISOLATE_SET(page_md->status, 1); ++ break; ++ case SPILL_IN_PROGRESS: ++ case ALLOCATE_IN_PROGRESS: ++ case FREE_IN_PROGRESS: ++ break; ++ case NOT_MOVABLE: ++ /* Opportunistically clear the movable property for these pages */ ++ __ClearPageMovable(p); ++ page_md->status = PAGE_MOVABLE_CLEAR(page_md->status); ++ break; ++ default: ++ /* State should always fall in one of the previous cases! ++ * Also notice that FREE_ISOLATED_IN_PROGRESS or ++ * FREE_PT_ISOLATED_IN_PROGRESS is impossible because ++ * that state only applies to pages that are already isolated. ++ */ ++ page_md->status = PAGE_ISOLATE_SET(page_md->status, 0); ++ break; ++ } ++ ++ spin_unlock(&page_md->migrate_lock); ++ ++ /* If the page is still in the memory pool: try to remove it. This will fail ++ * if pool lock is taken which could mean page no longer exists in pool. ++ */ ++ if (status_mem_pool) { ++ if (!spin_trylock(&mem_pool->pool_lock)) { ++ atomic_dec(&mem_pool->isolation_in_progress_cnt); ++ preempt_enable(); ++ return false; ++ } ++ ++ spin_lock(&page_md->migrate_lock); ++ /* Check status again to ensure page has not been removed from memory pool. */ ++ if (PAGE_STATUS_GET(page_md->status) == MEM_POOL) { ++ page_md->status = PAGE_ISOLATE_SET(page_md->status, 1); ++ list_del_init(&p->lru); ++ mem_pool->cur_size--; ++ } ++ spin_unlock(&page_md->migrate_lock); ++ spin_unlock(&mem_pool->pool_lock); ++ atomic_dec(&mem_pool->isolation_in_progress_cnt); ++ preempt_enable(); ++ } ++ ++ return IS_PAGE_ISOLATED(page_md->status); ++} ++ ++/** ++ * kbase_page_migrate - Migrate content of old page to new page provided. ++ * ++ * @mapping: Pointer to address_space struct associated with pages. ++ * @new_page: Pointer to the page struct of new page. ++ * @old_page: Pointer to the page struct of old page. ++ * @mode: Mode to determine if migration will be synchronised. ++ * ++ * Callback function for Linux to migrate the content of the old page to the ++ * new page provided. ++ * ++ * Return: 0 on success, error code otherwise. ++ */ ++#if (KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE) ++static int kbase_page_migrate(struct address_space *mapping, struct page *new_page, ++ struct page *old_page, enum migrate_mode mode) ++#else ++static int kbase_page_migrate(struct page *new_page, struct page *old_page, enum migrate_mode mode) ++#endif ++{ ++ int err = 0; ++ bool status_mem_pool = false; ++ bool status_free_pt_isolated_in_progress = false; ++ bool status_free_isolated_in_progress = false; ++ bool status_pt_mapped = false; ++ bool status_mapped = false; ++ bool status_not_movable = false; ++ struct kbase_page_metadata *page_md = kbase_page_private(old_page); ++ struct kbase_device *kbdev = NULL; ++ ++#if (KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE) ++ CSTD_UNUSED(mapping); ++#endif ++ CSTD_UNUSED(mode); ++ ++ if (!page_md || !IS_PAGE_MOVABLE(page_md->status)) ++ return -EINVAL; ++ ++ if (!spin_trylock(&page_md->migrate_lock)) ++ return -EAGAIN; ++ ++ if (WARN_ON(!IS_PAGE_ISOLATED(page_md->status))) { ++ spin_unlock(&page_md->migrate_lock); ++ return -EINVAL; ++ } ++ ++ switch (PAGE_STATUS_GET(page_md->status)) { ++ case MEM_POOL: ++ status_mem_pool = true; ++ kbdev = page_md->data.mem_pool.kbdev; ++ break; ++ case ALLOCATED_MAPPED: ++ status_mapped = true; ++ break; ++ case PT_MAPPED: ++ status_pt_mapped = true; ++ break; ++ case FREE_ISOLATED_IN_PROGRESS: ++ status_free_isolated_in_progress = true; ++ kbdev = page_md->data.free_isolated.kbdev; ++ break; ++ case FREE_PT_ISOLATED_IN_PROGRESS: ++ status_free_pt_isolated_in_progress = true; ++ kbdev = page_md->data.free_pt_isolated.kbdev; ++ break; ++ case NOT_MOVABLE: ++ status_not_movable = true; ++ break; ++ default: ++ /* State should always fall in one of the previous cases! */ ++ err = -EAGAIN; ++ break; ++ } ++ ++ spin_unlock(&page_md->migrate_lock); ++ ++ if (status_mem_pool || status_free_isolated_in_progress || ++ status_free_pt_isolated_in_progress) { ++ struct kbase_mem_migrate *mem_migrate = &kbdev->mem_migrate; ++ ++ kbase_free_page_metadata(kbdev, old_page, NULL); ++ __ClearPageMovable(old_page); ++ page_md->status = PAGE_MOVABLE_CLEAR(page_md->status); ++ put_page(old_page); ++ ++ /* Just free new page to avoid lock contention. */ ++ INIT_LIST_HEAD(&new_page->lru); ++ get_page(new_page); ++ set_page_private(new_page, 0); ++ kbase_free_page_later(kbdev, new_page); ++ queue_work(mem_migrate->free_pages_workq, &mem_migrate->free_pages_work); ++ } else if (status_not_movable) { ++ err = -EINVAL; ++ } else if (status_mapped) { ++ err = kbasep_migrate_page_allocated_mapped(old_page, new_page); ++ } else if (status_pt_mapped) { ++ err = kbasep_migrate_page_pt_mapped(old_page, new_page); ++ } ++ ++ /* While we want to preserve the movability of pages for which we return ++ * EAGAIN, according to the kernel docs, movable pages for which a critical ++ * error is returned are called putback on, which may not be what we ++ * expect. ++ */ ++ if (err < 0 && err != -EAGAIN) { ++ __ClearPageMovable(old_page); ++ page_md->status = PAGE_MOVABLE_CLEAR(page_md->status); ++ } ++ ++ return err; ++} ++ ++/** ++ * kbase_page_putback - Return isolated page back to kbase. ++ * ++ * @p: Pointer of the page struct of page. ++ * ++ * Callback function for Linux to return isolated page back to kbase. This ++ * will only be called for a page that has been isolated but failed to ++ * migrate. This function will put back the given page to the state it was ++ * in before it was isolated. ++ */ ++static void kbase_page_putback(struct page *p) ++{ ++ bool status_mem_pool = false; ++ bool status_free_isolated_in_progress = false; ++ bool status_free_pt_isolated_in_progress = false; ++ struct kbase_page_metadata *page_md = kbase_page_private(p); ++ struct kbase_device *kbdev = NULL; ++ ++ /* If we don't have page metadata, the page may not belong to the ++ * driver or may already have been freed, and there's nothing we can do ++ */ ++ if (!page_md) ++ return; ++ ++ spin_lock(&page_md->migrate_lock); ++ ++ if (WARN_ON(!IS_PAGE_ISOLATED(page_md->status))) { ++ spin_unlock(&page_md->migrate_lock); ++ return; ++ } ++ ++ switch (PAGE_STATUS_GET(page_md->status)) { ++ case MEM_POOL: ++ status_mem_pool = true; ++ kbdev = page_md->data.mem_pool.kbdev; ++ break; ++ case ALLOCATED_MAPPED: ++ page_md->status = PAGE_ISOLATE_SET(page_md->status, 0); ++ break; ++ case PT_MAPPED: ++ case NOT_MOVABLE: ++ /* Pages should no longer be isolated if they are in a stable state ++ * and used by the driver. ++ */ ++ page_md->status = PAGE_ISOLATE_SET(page_md->status, 0); ++ break; ++ case FREE_ISOLATED_IN_PROGRESS: ++ status_free_isolated_in_progress = true; ++ kbdev = page_md->data.free_isolated.kbdev; ++ break; ++ case FREE_PT_ISOLATED_IN_PROGRESS: ++ status_free_pt_isolated_in_progress = true; ++ kbdev = page_md->data.free_pt_isolated.kbdev; ++ break; ++ default: ++ /* State should always fall in one of the previous cases! */ ++ break; ++ } ++ ++ spin_unlock(&page_md->migrate_lock); ++ ++ /* If page was in a memory pool then just free it to avoid lock contention. The ++ * same is also true to status_free_pt_isolated_in_progress. ++ */ ++ if (status_mem_pool || status_free_isolated_in_progress || ++ status_free_pt_isolated_in_progress) { ++ __ClearPageMovable(p); ++ page_md->status = PAGE_MOVABLE_CLEAR(page_md->status); ++ ++ if (!WARN_ON_ONCE(!kbdev)) { ++ struct kbase_mem_migrate *mem_migrate = &kbdev->mem_migrate; ++ ++ kbase_free_page_later(kbdev, p); ++ queue_work(mem_migrate->free_pages_workq, &mem_migrate->free_pages_work); ++ } ++ } ++} ++ ++#if (KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE) ++static const struct movable_operations movable_ops = { ++ .isolate_page = kbase_page_isolate, ++ .migrate_page = kbase_page_migrate, ++ .putback_page = kbase_page_putback, ++}; ++#else ++static const struct address_space_operations kbase_address_space_ops = { ++ .isolate_page = kbase_page_isolate, ++ .migratepage = kbase_page_migrate, ++ .putback_page = kbase_page_putback, ++}; ++#endif ++ ++#if (KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE) ++void kbase_mem_migrate_set_address_space_ops(struct kbase_device *kbdev, struct file *const filp) ++{ ++ mutex_lock(&kbdev->fw_load_lock); ++ ++ if (filp) { ++ filp->f_inode->i_mapping->a_ops = &kbase_address_space_ops; ++ ++ if (!kbdev->mem_migrate.inode) { ++ kbdev->mem_migrate.inode = filp->f_inode; ++ /* This reference count increment is balanced by iput() ++ * upon termination. ++ */ ++ atomic_inc(&filp->f_inode->i_count); ++ } else { ++ WARN_ON(kbdev->mem_migrate.inode != filp->f_inode); ++ } ++ } ++ ++ mutex_unlock(&kbdev->fw_load_lock); ++} ++#endif ++ ++void kbase_mem_migrate_init(struct kbase_device *kbdev) ++{ ++ struct kbase_mem_migrate *mem_migrate = &kbdev->mem_migrate; ++ ++ if (kbase_page_migration_enabled < 0) ++ kbase_page_migration_enabled = 0; ++ ++ spin_lock_init(&mem_migrate->free_pages_lock); ++ INIT_LIST_HEAD(&mem_migrate->free_pages_list); ++ ++#if (KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE) ++ mem_migrate->inode = NULL; ++#endif ++ mem_migrate->free_pages_workq = ++ alloc_workqueue("free_pages_workq", WQ_UNBOUND | WQ_MEM_RECLAIM, 1); ++ INIT_WORK(&mem_migrate->free_pages_work, kbase_free_pages_worker); ++} ++ ++void kbase_mem_migrate_term(struct kbase_device *kbdev) ++{ ++ struct kbase_mem_migrate *mem_migrate = &kbdev->mem_migrate; ++ ++ if (mem_migrate->free_pages_workq) ++ destroy_workqueue(mem_migrate->free_pages_workq); ++#if (KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE) ++ iput(mem_migrate->inode); ++#endif ++} +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.h +new file mode 100644 +index 000000000..76bbc999e +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.h +@@ -0,0 +1,108 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2022-2023 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++/** ++ * DOC: Base kernel page migration implementation. ++ */ ++ ++#define PAGE_STATUS_MASK ((u8)0x3F) ++#define PAGE_STATUS_GET(status) (status & PAGE_STATUS_MASK) ++#define PAGE_STATUS_SET(status, value) ((status & ~PAGE_STATUS_MASK) | (value & PAGE_STATUS_MASK)) ++ ++#define PAGE_ISOLATE_SHIFT (7) ++#define PAGE_ISOLATE_MASK ((u8)1 << PAGE_ISOLATE_SHIFT) ++#define PAGE_ISOLATE_SET(status, value) \ ++ ((status & ~PAGE_ISOLATE_MASK) | (value << PAGE_ISOLATE_SHIFT)) ++#define IS_PAGE_ISOLATED(status) ((bool)(status & PAGE_ISOLATE_MASK)) ++ ++#define PAGE_MOVABLE_SHIFT (6) ++#define PAGE_MOVABLE_MASK ((u8)1 << PAGE_MOVABLE_SHIFT) ++#define PAGE_MOVABLE_CLEAR(status) ((status) & ~PAGE_MOVABLE_MASK) ++#define PAGE_MOVABLE_SET(status) (status | PAGE_MOVABLE_MASK) ++ ++#define IS_PAGE_MOVABLE(status) ((bool)(status & PAGE_MOVABLE_MASK)) ++ ++/* Global integer used to determine if module parameter value has been ++ * provided and if page migration feature is enabled. ++ */ ++extern int kbase_page_migration_enabled; ++ ++/** ++ * kbase_alloc_page_metadata - Allocate and initialize page metadata ++ * @kbdev: Pointer to kbase device. ++ * @p: Page to assign metadata to. ++ * @dma_addr: DMA address mapped to paged. ++ * @group_id: Memory group ID associated with the entity that is ++ * allocating the page metadata. ++ * ++ * This will allocate memory for the page's metadata, initialize it and ++ * assign a reference to the page's private field. Importantly, once ++ * the metadata is set and ready this function will mark the page as ++ * movable. ++ * ++ * Return: true if successful or false otherwise. ++ */ ++bool kbase_alloc_page_metadata(struct kbase_device *kbdev, struct page *p, dma_addr_t dma_addr, ++ u8 group_id); ++ ++/** ++ * kbase_free_page_later - Defer freeing of given page. ++ * @kbdev: Pointer to kbase device ++ * @p: Page to free ++ * ++ * This will add given page to a list of pages which will be freed at ++ * a later time. ++ */ ++void kbase_free_page_later(struct kbase_device *kbdev, struct page *p); ++ ++#if (KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE) ++/* ++ * kbase_mem_migrate_set_address_space_ops - Set address space operations ++ * ++ * @kbdev: Pointer to object representing an instance of GPU platform device. ++ * @filp: Pointer to the struct file corresponding to device file ++ * /dev/malixx instance, passed to the file's open method. ++ * ++ * Assign address space operations to the given file struct @filp and ++ * add a reference to @kbdev. ++ */ ++void kbase_mem_migrate_set_address_space_ops(struct kbase_device *kbdev, struct file *const filp); ++#endif ++ ++/* ++ * kbase_mem_migrate_init - Initialise kbase page migration ++ * ++ * @kbdev: Pointer to kbase device ++ * ++ * Enables page migration by default based on GPU and setup work queue to ++ * defer freeing pages during page migration callbacks. ++ */ ++void kbase_mem_migrate_init(struct kbase_device *kbdev); ++ ++/* ++ * kbase_mem_migrate_term - Terminate kbase page migration ++ * ++ * @kbdev: Pointer to kbase device ++ * ++ * This will flush any work left to free pages from page migration ++ * and destroy workqueue associated. ++ */ ++void kbase_mem_migrate_term(struct kbase_device *kbdev); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c new file mode 100755 -index 000000000000..0723e32e2003 +index 000000000..fa8f34d86 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c -@@ -0,0 +1,856 @@ +@@ -0,0 +1,1029 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2015-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2015-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -232667,18 +269711,22 @@ index 000000000000..0723e32e2003 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include +#include ++#include +#include +#include +#include +#include +#include +#include ++#if KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE ++#include ++#else ++#include ++#endif + +#define pool_dbg(pool, format, ...) \ + dev_dbg(pool->kbdev->dev, "%s-pool [%zu/%zu]: " format, \ @@ -232690,6 +269738,47 @@ index 000000000000..0723e32e2003 +#define NOT_DIRTY false +#define NOT_RECLAIMED false + ++/** ++ * can_alloc_page() - Check if the current thread can allocate a physical page ++ * ++ * @pool: Pointer to the memory pool. ++ * @page_owner: Pointer to the task/process that created the Kbase context ++ * for which a page needs to be allocated. It can be NULL if ++ * the page won't be associated with Kbase context. ++ * @alloc_from_kthread: Flag indicating that the current thread is a kernel thread. ++ * ++ * This function checks if the current thread is a kernel thread and can make a ++ * request to kernel to allocate a physical page. If the kernel thread is allocating ++ * a page for the Kbase context and the process that created the context is exiting ++ * or is being killed, then there is no point in doing a page allocation. ++ * ++ * The check done by the function is particularly helpful when the system is running ++ * low on memory. When a page is allocated from the context of a kernel thread, OoM ++ * killer doesn't consider the kernel thread for killing and kernel keeps retrying ++ * to allocate the page as long as the OoM killer is able to kill processes. ++ * The check allows kernel thread to quickly exit the page allocation loop once OoM ++ * killer has initiated the killing of @page_owner, thereby unblocking the context ++ * termination for @page_owner and freeing of GPU memory allocated by it. This helps ++ * in preventing the kernel panic and also limits the number of innocent processes ++ * that get killed. ++ * ++ * Return: true if the page can be allocated otherwise false. ++ */ ++static inline bool can_alloc_page(struct kbase_mem_pool *pool, struct task_struct *page_owner, ++ const bool alloc_from_kthread) ++{ ++ if (likely(!alloc_from_kthread || !page_owner)) ++ return true; ++ ++ if ((page_owner->flags & PF_EXITING) || fatal_signal_pending(page_owner)) { ++ dev_info(pool->kbdev->dev, "%s : Process %s/%d exiting", ++ __func__, page_owner->comm, task_pid_nr(page_owner)); ++ return false; ++ } ++ ++ return true; ++} ++ +static size_t kbase_mem_pool_capacity(struct kbase_mem_pool *pool) +{ + ssize_t max_size = kbase_mem_pool_max_size(pool); @@ -232708,13 +269797,58 @@ index 000000000000..0723e32e2003 + return kbase_mem_pool_size(pool) == 0; +} + ++static bool set_pool_new_page_metadata(struct kbase_mem_pool *pool, struct page *p, ++ struct list_head *page_list, size_t *list_size) ++{ ++ struct kbase_page_metadata *page_md = kbase_page_private(p); ++ bool not_movable = false; ++ ++ lockdep_assert_held(&pool->pool_lock); ++ ++ /* Free the page instead of adding it to the pool if it's not movable. ++ * Only update page status and add the page to the memory pool if ++ * it is not isolated. ++ */ ++ spin_lock(&page_md->migrate_lock); ++ if (PAGE_STATUS_GET(page_md->status) == (u8)NOT_MOVABLE) { ++ not_movable = true; ++ } else if (!WARN_ON_ONCE(IS_PAGE_ISOLATED(page_md->status))) { ++ page_md->status = PAGE_STATUS_SET(page_md->status, (u8)MEM_POOL); ++ page_md->data.mem_pool.pool = pool; ++ page_md->data.mem_pool.kbdev = pool->kbdev; ++ list_add(&p->lru, page_list); ++ (*list_size)++; ++ } ++ spin_unlock(&page_md->migrate_lock); ++ ++ if (not_movable) { ++ kbase_free_page_later(pool->kbdev, p); ++ pool_dbg(pool, "skipping a not movable page\n"); ++ } ++ ++ return not_movable; ++} ++ +static void kbase_mem_pool_add_locked(struct kbase_mem_pool *pool, + struct page *p) +{ ++ bool queue_work_to_free = false; ++ + lockdep_assert_held(&pool->pool_lock); + -+ list_add(&p->lru, &pool->page_list); -+ pool->cur_size++; ++ if (!pool->order && kbase_page_migration_enabled) { ++ if (set_pool_new_page_metadata(pool, p, &pool->page_list, &pool->cur_size)) ++ queue_work_to_free = true; ++ } else { ++ list_add(&p->lru, &pool->page_list); ++ pool->cur_size++; ++ } ++ ++ if (queue_work_to_free) { ++ struct kbase_mem_migrate *mem_migrate = &pool->kbdev->mem_migrate; ++ ++ queue_work(mem_migrate->free_pages_workq, &mem_migrate->free_pages_work); ++ } + + pool_dbg(pool, "added page\n"); +} @@ -232729,10 +269863,28 @@ index 000000000000..0723e32e2003 +static void kbase_mem_pool_add_list_locked(struct kbase_mem_pool *pool, + struct list_head *page_list, size_t nr_pages) +{ ++ bool queue_work_to_free = false; ++ + lockdep_assert_held(&pool->pool_lock); + -+ list_splice(page_list, &pool->page_list); -+ pool->cur_size += nr_pages; ++ if (!pool->order && kbase_page_migration_enabled) { ++ struct page *p, *tmp; ++ ++ list_for_each_entry_safe(p, tmp, page_list, lru) { ++ list_del_init(&p->lru); ++ if (set_pool_new_page_metadata(pool, p, &pool->page_list, &pool->cur_size)) ++ queue_work_to_free = true; ++ } ++ } else { ++ list_splice(page_list, &pool->page_list); ++ pool->cur_size += nr_pages; ++ } ++ ++ if (queue_work_to_free) { ++ struct kbase_mem_migrate *mem_migrate = &pool->kbdev->mem_migrate; ++ ++ queue_work(mem_migrate->free_pages_workq, &mem_migrate->free_pages_work); ++ } + + pool_dbg(pool, "added %zu pages\n", nr_pages); +} @@ -232745,7 +269897,8 @@ index 000000000000..0723e32e2003 + kbase_mem_pool_unlock(pool); +} + -+static struct page *kbase_mem_pool_remove_locked(struct kbase_mem_pool *pool) ++static struct page *kbase_mem_pool_remove_locked(struct kbase_mem_pool *pool, ++ enum kbase_page_status status) +{ + struct page *p; + @@ -232755,6 +269908,16 @@ index 000000000000..0723e32e2003 + return NULL; + + p = list_first_entry(&pool->page_list, struct page, lru); ++ ++ if (!pool->order && kbase_page_migration_enabled) { ++ struct kbase_page_metadata *page_md = kbase_page_private(p); ++ ++ spin_lock(&page_md->migrate_lock); ++ WARN_ON(PAGE_STATUS_GET(page_md->status) != (u8)MEM_POOL); ++ page_md->status = PAGE_STATUS_SET(page_md->status, (u8)status); ++ spin_unlock(&page_md->migrate_lock); ++ } ++ + list_del_init(&p->lru); + pool->cur_size--; + @@ -232763,12 +269926,13 @@ index 000000000000..0723e32e2003 + return p; +} + -+static struct page *kbase_mem_pool_remove(struct kbase_mem_pool *pool) ++static struct page *kbase_mem_pool_remove(struct kbase_mem_pool *pool, ++ enum kbase_page_status status) +{ + struct page *p; + + kbase_mem_pool_lock(pool); -+ p = kbase_mem_pool_remove_locked(pool); ++ p = kbase_mem_pool_remove_locked(pool, status); + kbase_mem_pool_unlock(pool); + + return p; @@ -232778,8 +269942,9 @@ index 000000000000..0723e32e2003 + struct page *p) +{ + struct device *dev = pool->kbdev->dev; -+ dma_sync_single_for_device(dev, kbase_dma_addr(p), -+ (PAGE_SIZE << pool->order), DMA_BIDIRECTIONAL); ++ dma_addr_t dma_addr = pool->order ? kbase_dma_addr_as_priv(p) : kbase_dma_addr(p); ++ ++ dma_sync_single_for_device(dev, dma_addr, (PAGE_SIZE << pool->order), DMA_BIDIRECTIONAL); +} + +static void kbase_mem_pool_zero_page(struct kbase_mem_pool *pool, @@ -232805,23 +269970,17 @@ index 000000000000..0723e32e2003 +struct page *kbase_mem_alloc_page(struct kbase_mem_pool *pool) +{ + struct page *p; -+ gfp_t gfp; ++ gfp_t gfp = __GFP_ZERO; + struct kbase_device *const kbdev = pool->kbdev; + struct device *const dev = kbdev->dev; + dma_addr_t dma_addr; + int i; + -+#if defined(CONFIG_ARM) && !defined(CONFIG_HAVE_DMA_ATTRS) && \ -+ LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) -+ /* DMA cache sync fails for HIGHMEM before 3.5 on ARM */ -+ gfp = GFP_USER | __GFP_ZERO; -+#else -+ gfp = GFP_HIGHUSER | __GFP_ZERO; -+#endif -+ + /* don't warn on higher order failures */ + if (pool->order) -+ gfp |= __GFP_NOWARN; ++ gfp |= GFP_HIGHUSER | __GFP_NOWARN; ++ else ++ gfp |= kbase_page_migration_enabled ? GFP_HIGHUSER_MOVABLE : GFP_HIGHUSER; + + p = kbdev->mgm_dev->ops.mgm_alloc_page(kbdev->mgm_dev, + pool->group_id, gfp, pool->order); @@ -232837,30 +269996,59 @@ index 000000000000..0723e32e2003 + return NULL; + } + -+ WARN_ON(dma_addr != page_to_phys(p)); -+ for (i = 0; i < (1u << pool->order); i++) -+ kbase_set_dma_addr(p+i, dma_addr + PAGE_SIZE * i); ++ /* Setup page metadata for 4KB pages when page migration is enabled */ ++ if (!pool->order && kbase_page_migration_enabled) { ++ INIT_LIST_HEAD(&p->lru); ++ if (!kbase_alloc_page_metadata(kbdev, p, dma_addr, pool->group_id)) { ++ dma_unmap_page(dev, dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ kbdev->mgm_dev->ops.mgm_free_page(kbdev->mgm_dev, pool->group_id, p, ++ pool->order); ++ return NULL; ++ } ++ } else { ++ WARN_ON(dma_addr != page_to_phys(p)); ++ for (i = 0; i < (1u << pool->order); i++) ++ kbase_set_dma_addr_as_priv(p + i, dma_addr + PAGE_SIZE * i); ++ } + + return p; +} + -+static void kbase_mem_pool_free_page(struct kbase_mem_pool *pool, -+ struct page *p) ++static void enqueue_free_pool_pages_work(struct kbase_mem_pool *pool) +{ -+ struct kbase_device *const kbdev = pool->kbdev; -+ struct device *const dev = kbdev->dev; -+ dma_addr_t dma_addr = kbase_dma_addr(p); -+ int i; ++ struct kbase_mem_migrate *mem_migrate = &pool->kbdev->mem_migrate; + -+ dma_unmap_page(dev, dma_addr, (PAGE_SIZE << pool->order), -+ DMA_BIDIRECTIONAL); -+ for (i = 0; i < (1u << pool->order); i++) -+ kbase_clear_dma_addr(p+i); ++ if (!pool->order && kbase_page_migration_enabled) ++ queue_work(mem_migrate->free_pages_workq, &mem_migrate->free_pages_work); ++} + -+ kbdev->mgm_dev->ops.mgm_free_page(kbdev->mgm_dev, -+ pool->group_id, p, pool->order); ++void kbase_mem_pool_free_page(struct kbase_mem_pool *pool, struct page *p) ++{ ++ struct kbase_device *kbdev; + -+ pool_dbg(pool, "freed page to kernel\n"); ++ if (WARN_ON(!pool)) ++ return; ++ if (WARN_ON(!p)) ++ return; ++ ++ kbdev = pool->kbdev; ++ ++ if (!pool->order && kbase_page_migration_enabled) { ++ kbase_free_page_later(kbdev, p); ++ pool_dbg(pool, "page to be freed to kernel later\n"); ++ } else { ++ int i; ++ dma_addr_t dma_addr = kbase_dma_addr_as_priv(p); ++ ++ for (i = 0; i < (1u << pool->order); i++) ++ kbase_clear_dma_addr_as_priv(p + i); ++ ++ dma_unmap_page(kbdev->dev, dma_addr, (PAGE_SIZE << pool->order), DMA_BIDIRECTIONAL); ++ ++ kbdev->mgm_dev->ops.mgm_free_page(kbdev->mgm_dev, pool->group_id, p, pool->order); ++ ++ pool_dbg(pool, "freed page to kernel\n"); ++ } +} + +static size_t kbase_mem_pool_shrink_locked(struct kbase_mem_pool *pool, @@ -232872,10 +270060,13 @@ index 000000000000..0723e32e2003 + lockdep_assert_held(&pool->pool_lock); + + for (i = 0; i < nr_to_shrink && !kbase_mem_pool_is_empty(pool); i++) { -+ p = kbase_mem_pool_remove_locked(pool); ++ p = kbase_mem_pool_remove_locked(pool, FREE_IN_PROGRESS); + kbase_mem_pool_free_page(pool, p); + } + ++ /* Freeing of pages will be deferred when page migration is enabled. */ ++ enqueue_free_pool_pages_work(pool); ++ + return i; +} + @@ -232891,11 +270082,12 @@ index 000000000000..0723e32e2003 + return nr_freed; +} + -+int kbase_mem_pool_grow(struct kbase_mem_pool *pool, -+ size_t nr_to_grow) ++int kbase_mem_pool_grow(struct kbase_mem_pool *pool, size_t nr_to_grow, ++ struct task_struct *page_owner) +{ + struct page *p; + size_t i; ++ const bool alloc_from_kthread = !!(current->flags & PF_KTHREAD); + + kbase_mem_pool_lock(pool); + @@ -232910,6 +270102,9 @@ index 000000000000..0723e32e2003 + } + kbase_mem_pool_unlock(pool); + ++ if (unlikely(!can_alloc_page(pool, page_owner, alloc_from_kthread))) ++ return -ENOMEM; ++ + p = kbase_mem_alloc_page(pool); + if (!p) { + kbase_mem_pool_lock(pool); @@ -232927,6 +270122,7 @@ index 000000000000..0723e32e2003 + + return 0; +} ++KBASE_EXPORT_TEST_API(kbase_mem_pool_grow); + +void kbase_mem_pool_trim(struct kbase_mem_pool *pool, size_t new_size) +{ @@ -232941,7 +270137,7 @@ index 000000000000..0723e32e2003 + if (new_size < cur_size) + kbase_mem_pool_shrink(pool, cur_size - new_size); + else if (new_size > cur_size) -+ err = kbase_mem_pool_grow(pool, new_size - cur_size); ++ err = kbase_mem_pool_grow(pool, new_size - cur_size, NULL); + + if (err) { + size_t grown_size = kbase_mem_pool_size(pool); @@ -232969,7 +270165,7 @@ index 000000000000..0723e32e2003 + + kbase_mem_pool_unlock(pool); +} -+ ++KBASE_EXPORT_TEST_API(kbase_mem_pool_set_max_size); + +static unsigned long kbase_mem_pool_reclaim_count_objects(struct shrinker *s, + struct shrink_control *sc) @@ -232982,6 +270178,9 @@ index 000000000000..0723e32e2003 + kbase_mem_pool_lock(pool); + if (pool->dont_reclaim && !pool->dying) { + kbase_mem_pool_unlock(pool); ++ /* Tell shrinker to skip reclaim ++ * even though freeable pages are available ++ */ + return 0; + } + pool_size = kbase_mem_pool_size(pool); @@ -233001,7 +270200,10 @@ index 000000000000..0723e32e2003 + kbase_mem_pool_lock(pool); + if (pool->dont_reclaim && !pool->dying) { + kbase_mem_pool_unlock(pool); -+ return 0; ++ /* Tell shrinker that reclaim can't be made and ++ * do not attempt again for this reclaim context. ++ */ ++ return SHRINK_STOP; + } + + pool_dbg(pool, "reclaim scan %ld:\n", sc->nr_to_scan); @@ -233015,23 +270217,9 @@ index 000000000000..0723e32e2003 + return freed; +} + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) -+static int kbase_mem_pool_reclaim_shrink(struct shrinker *s, -+ struct shrink_control *sc) -+{ -+ if (sc->nr_to_scan == 0) -+ return kbase_mem_pool_reclaim_count_objects(s, sc); -+ -+ return kbase_mem_pool_reclaim_scan_objects(s, sc); -+} -+#endif -+ -+int kbase_mem_pool_init(struct kbase_mem_pool *pool, -+ const struct kbase_mem_pool_config *config, -+ unsigned int order, -+ int group_id, -+ struct kbase_device *kbdev, -+ struct kbase_mem_pool *next_pool) ++int kbase_mem_pool_init(struct kbase_mem_pool *pool, const struct kbase_mem_pool_config *config, ++ unsigned int order, int group_id, struct kbase_device *kbdev, ++ struct kbase_mem_pool *next_pool) +{ + if (WARN_ON(group_id < 0) || + WARN_ON(group_id >= MEMORY_GROUP_MANAGER_NR_GROUPS)) { @@ -233045,29 +270233,29 @@ index 000000000000..0723e32e2003 + pool->kbdev = kbdev; + pool->next_pool = next_pool; + pool->dying = false; ++ atomic_set(&pool->isolation_in_progress_cnt, 0); + + spin_lock_init(&pool->pool_lock); + INIT_LIST_HEAD(&pool->page_list); + -+ /* Register shrinker */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) -+ pool->reclaim.shrink = kbase_mem_pool_reclaim_shrink; -+#else + pool->reclaim.count_objects = kbase_mem_pool_reclaim_count_objects; + pool->reclaim.scan_objects = kbase_mem_pool_reclaim_scan_objects; -+#endif + pool->reclaim.seeks = DEFAULT_SEEKS; + /* Kernel versions prior to 3.1 : -+ * struct shrinker does not define batch */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) ++ * struct shrinker does not define batch ++ */ + pool->reclaim.batch = 0; -+#endif ++#if KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE + register_shrinker(&pool->reclaim); ++#else ++ register_shrinker(&pool->reclaim, "mali-mem-pool"); ++#endif + + pool_dbg(pool, "initialized\n"); + + return 0; +} ++KBASE_EXPORT_TEST_API(kbase_mem_pool_init); + +void kbase_mem_pool_mark_dying(struct kbase_mem_pool *pool) +{ @@ -233099,15 +270287,17 @@ index 000000000000..0723e32e2003 + + /* Zero pages first without holding the next_pool lock */ + for (i = 0; i < nr_to_spill; i++) { -+ p = kbase_mem_pool_remove_locked(pool); -+ list_add(&p->lru, &spill_list); ++ p = kbase_mem_pool_remove_locked(pool, SPILL_IN_PROGRESS); ++ if (p) ++ list_add(&p->lru, &spill_list); + } + } + + while (!kbase_mem_pool_is_empty(pool)) { + /* Free remaining pages to kernel */ -+ p = kbase_mem_pool_remove_locked(pool); -+ list_add(&p->lru, &free_list); ++ p = kbase_mem_pool_remove_locked(pool, FREE_IN_PROGRESS); ++ if (p) ++ list_add(&p->lru, &free_list); + } + + kbase_mem_pool_unlock(pool); @@ -233127,8 +270317,18 @@ index 000000000000..0723e32e2003 + kbase_mem_pool_free_page(pool, p); + } + ++ /* Freeing of pages will be deferred when page migration is enabled. */ ++ enqueue_free_pool_pages_work(pool); ++ ++ /* Before returning wait to make sure there are no pages undergoing page isolation ++ * which will require reference to this pool. ++ */ ++ while (atomic_read(&pool->isolation_in_progress_cnt)) ++ cpu_relax(); ++ + pool_dbg(pool, "terminated\n"); +} ++KBASE_EXPORT_TEST_API(kbase_mem_pool_term); + +struct page *kbase_mem_pool_alloc(struct kbase_mem_pool *pool) +{ @@ -233136,7 +270336,7 @@ index 000000000000..0723e32e2003 + + do { + pool_dbg(pool, "alloc()\n"); -+ p = kbase_mem_pool_remove(pool); ++ p = kbase_mem_pool_remove(pool, ALLOCATE_IN_PROGRESS); + + if (p) + return p; @@ -233149,17 +270349,10 @@ index 000000000000..0723e32e2003 + +struct page *kbase_mem_pool_alloc_locked(struct kbase_mem_pool *pool) +{ -+ struct page *p; -+ + lockdep_assert_held(&pool->pool_lock); + + pool_dbg(pool, "alloc_locked()\n"); -+ p = kbase_mem_pool_remove_locked(pool); -+ -+ if (p) -+ return p; -+ -+ return NULL; ++ return kbase_mem_pool_remove_locked(pool, ALLOCATE_IN_PROGRESS); +} + +void kbase_mem_pool_free(struct kbase_mem_pool *pool, struct page *p, @@ -233181,6 +270374,8 @@ index 000000000000..0723e32e2003 + } else { + /* Free page */ + kbase_mem_pool_free_page(pool, p); ++ /* Freeing of pages will be deferred when page migration is enabled. */ ++ enqueue_free_pool_pages_work(pool); + } +} + @@ -233200,17 +270395,21 @@ index 000000000000..0723e32e2003 + } else { + /* Free page */ + kbase_mem_pool_free_page(pool, p); ++ /* Freeing of pages will be deferred when page migration is enabled. */ ++ enqueue_free_pool_pages_work(pool); + } +} + +int kbase_mem_pool_alloc_pages(struct kbase_mem_pool *pool, size_t nr_4k_pages, -+ struct tagged_addr *pages, bool partial_allowed) ++ struct tagged_addr *pages, bool partial_allowed, ++ struct task_struct *page_owner) +{ + struct page *p; + size_t nr_from_pool; + size_t i = 0; + int err = -ENOMEM; + size_t nr_pages_internal; ++ const bool alloc_from_kthread = !!(current->flags & PF_KTHREAD); + + nr_pages_internal = nr_4k_pages / (1u << (pool->order)); + @@ -233223,9 +270422,12 @@ index 000000000000..0723e32e2003 + /* Get pages from this pool */ + kbase_mem_pool_lock(pool); + nr_from_pool = min(nr_pages_internal, kbase_mem_pool_size(pool)); ++ + while (nr_from_pool--) { + int j; -+ p = kbase_mem_pool_remove_locked(pool); ++ ++ p = kbase_mem_pool_remove_locked(pool, ALLOCATE_IN_PROGRESS); ++ + if (pool->order) { + pages[i++] = as_tagged_tag(page_to_phys(p), + HUGE_HEAD | HUGE_PAGE); @@ -233241,8 +270443,8 @@ index 000000000000..0723e32e2003 + + if (i != nr_4k_pages && pool->next_pool) { + /* Allocate via next pool */ -+ err = kbase_mem_pool_alloc_pages(pool->next_pool, -+ nr_4k_pages - i, pages + i, partial_allowed); ++ err = kbase_mem_pool_alloc_pages(pool->next_pool, nr_4k_pages - i, pages + i, ++ partial_allowed, page_owner); + + if (err < 0) + goto err_rollback; @@ -233251,6 +270453,9 @@ index 000000000000..0723e32e2003 + } else { + /* Get any remaining pages from kernel */ + while (i != nr_4k_pages) { ++ if (unlikely(!can_alloc_page(pool, page_owner, alloc_from_kthread))) ++ goto err_rollback; ++ + p = kbase_mem_alloc_page(pool); + if (!p) { + if (partial_allowed) @@ -233313,7 +270518,7 @@ index 000000000000..0723e32e2003 + for (i = 0; i < nr_pages_internal; i++) { + int j; + -+ p = kbase_mem_pool_remove_locked(pool); ++ p = kbase_mem_pool_remove_locked(pool, ALLOCATE_IN_PROGRESS); + if (pool->order) { + *pages++ = as_tagged_tag(page_to_phys(p), + HUGE_HEAD | HUGE_PAGE); @@ -233420,6 +270625,7 @@ index 000000000000..0723e32e2003 + size_t nr_to_pool; + LIST_HEAD(to_pool_list); + size_t i = 0; ++ bool pages_released = false; + + pool_dbg(pool, "free_pages(%zu):\n", nr_pages); + @@ -233452,13 +270658,17 @@ index 000000000000..0723e32e2003 + pages[i] = as_tagged(0); + continue; + } -+ + p = as_page(pages[i]); + + kbase_mem_pool_free_page(pool, p); + pages[i] = as_tagged(0); ++ pages_released = true; + } + ++ /* Freeing of pages will be deferred when page migration is enabled. */ ++ if (pages_released) ++ enqueue_free_pool_pages_work(pool); ++ + pool_dbg(pool, "free_pages(%zu) done\n", nr_pages); +} + @@ -233471,6 +270681,7 @@ index 000000000000..0723e32e2003 + size_t nr_to_pool; + LIST_HEAD(to_pool_list); + size_t i = 0; ++ bool pages_released = false; + + lockdep_assert_held(&pool->pool_lock); + @@ -233481,8 +270692,8 @@ index 000000000000..0723e32e2003 + nr_to_pool = kbase_mem_pool_capacity(pool); + nr_to_pool = min(nr_pages, nr_to_pool); + -+ kbase_mem_pool_add_array_locked(pool, nr_pages, pages, false, -+ dirty); ++ kbase_mem_pool_add_array_locked(pool, nr_to_pool, pages, false, ++ dirty); + + i += nr_to_pool; + } @@ -233501,24 +270712,30 @@ index 000000000000..0723e32e2003 + + kbase_mem_pool_free_page(pool, p); + pages[i] = as_tagged(0); ++ pages_released = true; + } + ++ /* Freeing of pages will be deferred when page migration is enabled. */ ++ if (pages_released) ++ enqueue_free_pool_pages_work(pool); ++ + pool_dbg(pool, "free_pages_locked(%zu) done\n", nr_pages); +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c new file mode 100755 -index 000000000000..5879fdf85b1d +index 000000000..3b1b2bae1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c -@@ -0,0 +1,191 @@ +@@ -0,0 +1,184 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -233529,8 +270746,6 @@ index 000000000000..5879fdf85b1d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -233682,13 +270897,7 @@ index 000000000000..5879fdf85b1d +void kbase_mem_pool_debugfs_init(struct dentry *parent, + struct kbase_context *kctx) +{ -+ /* prevent unprivileged use of debug file in old kernel version */ -+#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE) -+ /* only for newer kernel version debug file system is safe */ + const mode_t mode = 0644; -+#else -+ const mode_t mode = 0600; -+#endif + + debugfs_create_file("mem_pool_size", mode, parent, + &kctx->mem_pools.small, &kbase_mem_pool_debugfs_fops); @@ -233704,18 +270913,19 @@ index 000000000000..5879fdf85b1d +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h new file mode 100755 -index 000000000000..2932945b3185 +index 000000000..207b58536 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h -@@ -0,0 +1,123 @@ +@@ -0,0 +1,122 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -233726,8 +270936,6 @@ index 000000000000..2932945b3185 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_MEM_POOL_DEBUGFS_H_ @@ -233833,18 +271041,19 @@ index 000000000000..2932945b3185 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c new file mode 100755 -index 000000000000..aa2554805b5b +index 000000000..49c4b041e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c -@@ -0,0 +1,115 @@ +@@ -0,0 +1,107 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -233855,8 +271064,6 @@ index 000000000000..aa2554805b5b + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -233883,29 +271090,22 @@ index 000000000000..aa2554805b5b + } +} + -+int kbase_mem_pool_group_init( -+ struct kbase_mem_pool_group *const mem_pools, -+ struct kbase_device *const kbdev, -+ const struct kbase_mem_pool_group_config *const configs, -+ struct kbase_mem_pool_group *next_pools) ++int kbase_mem_pool_group_init(struct kbase_mem_pool_group *const mem_pools, ++ struct kbase_device *const kbdev, ++ const struct kbase_mem_pool_group_config *const configs, ++ struct kbase_mem_pool_group *next_pools) +{ + int gid, err = 0; + + for (gid = 0; gid < MEMORY_GROUP_MANAGER_NR_GROUPS; ++gid) { -+ err = kbase_mem_pool_init(&mem_pools->small[gid], -+ &configs->small[gid], -+ KBASE_MEM_POOL_4KB_PAGE_TABLE_ORDER, -+ gid, -+ kbdev, -+ next_pools ? &next_pools->small[gid] : NULL); ++ err = kbase_mem_pool_init(&mem_pools->small[gid], &configs->small[gid], ++ KBASE_MEM_POOL_4KB_PAGE_TABLE_ORDER, gid, kbdev, ++ next_pools ? &next_pools->small[gid] : NULL); + + if (!err) { -+ err = kbase_mem_pool_init(&mem_pools->large[gid], -+ &configs->large[gid], -+ KBASE_MEM_POOL_2MB_PAGE_TABLE_ORDER, -+ gid, -+ kbdev, -+ next_pools ? &next_pools->large[gid] : NULL); ++ err = kbase_mem_pool_init(&mem_pools->large[gid], &configs->large[gid], ++ KBASE_MEM_POOL_2MB_PAGE_TABLE_ORDER, gid, kbdev, ++ next_pools ? &next_pools->large[gid] : NULL); + if (err) + kbase_mem_pool_term(&mem_pools->small[gid]); + } @@ -233954,18 +271154,19 @@ index 000000000000..aa2554805b5b +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h new file mode 100755 -index 000000000000..0484f5940ad1 +index 000000000..fe8ce7752 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h -@@ -0,0 +1,92 @@ +@@ -0,0 +1,114 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -233976,8 +271177,6 @@ index 000000000000..0484f5940ad1 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_MEM_POOL_GROUP_H_ @@ -233986,16 +271185,40 @@ index 000000000000..0484f5940ad1 +#include + +/** -+ * kbase_mem_pool_group_config_init - Set the initial configuration for a -+ * set of memory pools ++ * kbase_mem_pool_group_select() - Select the memory pool to use. ++ * ++ * @kbdev: Device pointer. ++ * @mem_group_id: Physical memory group ID to use. ++ * @is_small_page: Flag used to select between the small and ++ * large memory pool. ++ * ++ * Return: A pointer to the selected memory pool. ++ */ ++static inline struct kbase_mem_pool *kbase_mem_pool_group_select( ++ struct kbase_device *kbdev, u32 mem_group_id, bool is_small_page) ++{ ++ if (WARN_ON(unlikely(kbdev == NULL))) ++ return NULL; ++ ++ WARN_ON(mem_group_id > BASE_MEM_GROUP_COUNT); ++ ++ if (is_small_page) ++ return &kbdev->mem_pools.small[mem_group_id]; ++ ++ return &kbdev->mem_pools.large[mem_group_id]; ++} ++ ++/** ++ * kbase_mem_pool_group_config_set_max_size - Set the initial configuration for ++ * a set of memory pools ++ * ++ * @configs: Initial configuration for the set of memory pools ++ * @max_size: Maximum number of free 4 KiB pages each pool can hold + * + * This function sets the initial configuration for every memory pool so that + * the maximum amount of free memory that each pool can hold is identical. + * The equivalent number of 2 MiB pages is calculated automatically for the + * purpose of configuring the large page pools. -+ * -+ * @configs: Initial configuration for the set of memory pools -+ * @max_size: Maximum number of free 4 KiB pages each pool can hold + */ +void kbase_mem_pool_group_config_set_max_size( + struct kbase_mem_pool_group_config *configs, size_t max_size); @@ -234003,6 +271226,12 @@ index 000000000000..0484f5940ad1 +/** + * kbase_mem_pool_group_init - Initialize a set of memory pools + * ++ * @mem_pools: Set of memory pools to initialize ++ * @kbdev: Kbase device where memory is used ++ * @configs: Initial configuration for the set of memory pools ++ * @next_pools: Set of memory pools from which to allocate memory if there ++ * is no free memory in one of the @mem_pools ++ * + * Initializes a complete set of physical memory pools. Memory pools are used to + * allow efficient reallocation of previously-freed physical pages. A pair of + * memory pools is initialized for each physical memory group: one for 4 KiB @@ -234015,55 +271244,49 @@ index 000000000000..0484f5940ad1 + * is full in @mem_pools. Pages are zeroed before they spill over to another + * pool, to prevent leaking information between applications. + * -+ * @mem_pools: Set of memory pools to initialize -+ * @kbdev: Kbase device where memory is used -+ * @configs: Initial configuration for the set of memory pools -+ * @next_pools: Set of memory pools from which to allocate memory if there -+ * is no free memory in one of the @mem_pools -+ * + * Return: 0 on success, otherwise a negative error code + */ -+int kbase_mem_pool_group_init(struct kbase_mem_pool_group *mem_pools, -+ struct kbase_device *kbdev, -+ const struct kbase_mem_pool_group_config *configs, -+ struct kbase_mem_pool_group *next_pools); ++int kbase_mem_pool_group_init(struct kbase_mem_pool_group *mem_pools, struct kbase_device *kbdev, ++ const struct kbase_mem_pool_group_config *configs, ++ struct kbase_mem_pool_group *next_pools); + +/** -+ * kbase_mem_pool_group_term - Mark a set of memory pools as dying ++ * kbase_mem_pool_group_mark_dying - Mark a set of memory pools as dying ++ * ++ * @mem_pools: Set of memory pools to mark + * + * Marks a complete set of physical memory pools previously initialized by + * @kbase_mem_pool_group_init as dying. This will cause any ongoing allocation + * operations (eg growing on page fault) to be terminated. -+ * -+ * @mem_pools: Set of memory pools to mark + */ +void kbase_mem_pool_group_mark_dying(struct kbase_mem_pool_group *mem_pools); + +/** + * kbase_mem_pool_group_term - Terminate a set of memory pools + * ++ * @mem_pools: Set of memory pools to terminate ++ * + * Terminates a complete set of physical memory pools previously initialized by + * @kbase_mem_pool_group_init. -+ * -+ * @mem_pools: Set of memory pools to terminate + */ +void kbase_mem_pool_group_term(struct kbase_mem_pool_group *mem_pools); + +#endif /* _KBASE_MEM_POOL_GROUP_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c new file mode 100755 -index 000000000000..85723f825054 +index 000000000..9317023b7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c -@@ -0,0 +1,134 @@ +@@ -0,0 +1,131 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2012-2017, 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2017, 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -234074,23 +271297,23 @@ index 000000000000..85723f825054 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) + -+/** Show callback for the @c mem_profile debugfs file. ++/** ++ * kbasep_mem_profile_seq_show - Show callback for the @c mem_profile debugfs file. ++ * ++ * @sfile: The debugfs entry ++ * @data: Data associated with the entry + * + * This function is called to get the contents of the @c mem_profile debugfs + * file. This is a report of current memory usage and distribution in userspace. + * -+ * @param sfile The debugfs entry -+ * @param data Data associated with the entry -+ * -+ * @return 0 if it successfully prints data in debugfs entry file, non-zero otherwise ++ * Return: 0 if it successfully prints data in debugfs entry file, non-zero ++ * otherwise + */ +static int kbasep_mem_profile_seq_show(struct seq_file *sfile, void *data) +{ @@ -234126,11 +271349,7 @@ index 000000000000..85723f825054 +int kbasep_mem_profile_debugfs_insert(struct kbase_context *kctx, char *data, + size_t size) +{ -+#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE) + const mode_t mode = 0444; -+#else -+ const mode_t mode = 0400; -+#endif + int err = 0; + + mutex_lock(&kctx->mem_profile_lock); @@ -234141,9 +271360,9 @@ index 000000000000..85723f825054 + if (!kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED)) { + if (IS_ERR_OR_NULL(kctx->kctx_dentry)) { + err = -ENOMEM; -+ } else if (!debugfs_create_file("mem_profile", mode, -+ kctx->kctx_dentry, kctx, -+ &kbasep_mem_profile_debugfs_fops)) { ++ } else if (IS_ERR_OR_NULL(debugfs_create_file("mem_profile", ++ mode, kctx->kctx_dentry, kctx, ++ &kbasep_mem_profile_debugfs_fops))) { + err = -EAGAIN; + } else { + kbase_ctx_flag_set(kctx, @@ -234192,18 +271411,19 @@ index 000000000000..85723f825054 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h new file mode 100755 -index 000000000000..1462247c3bca +index 000000000..c30fca665 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h @@ -0,0 +1,64 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2016, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -234214,15 +271434,10 @@ index 000000000000..1462247c3bca + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/** -+ * @file mali_kbase_mem_profile_debugfs.h -+ * Header file for mem profiles entries in debugfs ++ * DOC: Header file for mem profiles entries in debugfs + * + */ + @@ -234233,12 +271448,20 @@ index 000000000000..1462247c3bca +#include + +/** -+ * @brief Remove entry from Mali memory profile debugfs ++ * kbasep_mem_profile_debugfs_remove - Remove entry from Mali memory profile debugfs ++ * ++ * @kctx: The context whose debugfs file @p data should be removed from + */ +void kbasep_mem_profile_debugfs_remove(struct kbase_context *kctx); + +/** -+ * @brief Insert @p data to the debugfs file so it can be read by userspace ++ * kbasep_mem_profile_debugfs_insert - Insert @p data to the debugfs file ++ * so it can be read by userspace ++ * ++ * @kctx: The context whose debugfs file @p data should be inserted to ++ * @data: A NULL-terminated string to be inserted to the debugfs file, ++ * without the trailing new line character ++ * @size: The length of the @p data string + * + * The function takes ownership of @p data and frees it later when new data + * is inserted. @@ -234246,12 +271469,8 @@ index 000000000000..1462247c3bca + * If the debugfs entry corresponding to the @p kctx doesn't exist, + * an attempt will be made to create it. + * -+ * @param kctx The context whose debugfs file @p data should be inserted to -+ * @param data A NULL-terminated string to be inserted to the debugfs file, -+ * without the trailing new line character -+ * @param size The length of the @p data string -+ * @return 0 if @p data inserted correctly -+ * -EAGAIN in case of error ++ * Return: 0 if @p data inserted correctly, -EAGAIN in case of error ++ * + * @post @ref mem_profile_initialized will be set to @c true + * the first time this function succeeds. + */ @@ -234260,65 +271479,21 @@ index 000000000000..1462247c3bca + +#endif /*_KBASE_MEM_PROFILE_DEBUGFS_H*/ + -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h -new file mode 100755 -index 000000000000..d55cc854c415 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h -@@ -0,0 +1,39 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014, 2018-2019 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+/** -+ * @file mali_kbase_mem_profile_debugfs_buf_size.h -+ * Header file for the size of the buffer to accumulate the histogram report text in -+ */ -+ -+#ifndef _KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_ -+#define _KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_ -+ -+/** -+ * The size of the buffer to accumulate the histogram report text in -+ * @see @ref CCTXP_HIST_BUF_SIZE_MAX_LENGTH_REPORT -+ */ -+#define KBASE_MEM_PROFILE_MAX_BUF_SIZE \ -+ ((size_t) (64 + ((80 + (56 * 64)) * 53) + 56)) -+ -+#endif /*_KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_*/ -+ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h b/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h new file mode 100755 -index 000000000000..72acadfae993 +index 000000000..951079d11 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h -@@ -0,0 +1,219 @@ +@@ -0,0 +1,229 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -234329,8 +271504,6 @@ index 000000000000..72acadfae993 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* THIS FILE IS AUTOGENERATED BY mali_trace_generator.py. @@ -234341,7 +271514,7 @@ index 000000000000..72acadfae993 + +#include "mali_kbase_mipe_proto.h" + -+/** ++/* + * This header generates MIPE tracepoint declaration BLOB at + * compile time. + * @@ -234353,14 +271526,14 @@ index 000000000000..72acadfae993 + * defined. See documentation below: + */ + -+/** ++/* + * The name of the variable where the result BLOB will be stored. + */ +#if !defined(MIPE_HEADER_BLOB_VAR_NAME) +#error "MIPE_HEADER_BLOB_VAR_NAME must be defined!" +#endif + -+/** ++/* + * A compiler attribute for the BLOB variable. + * + * e.g. __attribute__((section("my_section"))) @@ -234371,7 +271544,18 @@ index 000000000000..72acadfae993 +#define MIPE_HEADER_BLOB_VAR_ATTRIBUTE +#endif + -+/** ++/* ++ * A compiler attribute for packing structures ++ * ++ * e.g. __packed ++ * ++ * Default value is __attribute__((__packed__)) ++ */ ++#if !defined(MIPE_HEADER_PACKED_ATTRIBUTE) ++#define MIPE_HEADER_PACKED_ATTRIBUTE __attribute__((__packed__)) ++#endif ++ ++/* + * MIPE stream id. + * + * See enum tl_stream_id. @@ -234380,7 +271564,7 @@ index 000000000000..72acadfae993 +#error "MIPE_HEADER_STREAM_ID must be defined!" +#endif + -+/** ++/* + * MIPE packet class. + * + * See enum tl_packet_class. @@ -234389,7 +271573,7 @@ index 000000000000..72acadfae993 +#error "MIPE_HEADER_PKT_CLASS must be defined!" +#endif + -+/** ++/* + * The list of tracepoints to process. + * + * It should be defined as follows: @@ -234401,21 +271585,21 @@ index 000000000000..72acadfae993 + * + * Where the first argument is tracepoints name, the second + * argument is a short tracepoint description, the third argument -+ * argument types (see MIPE documentation), and the fourth argument ++ * types (see MIPE documentation), and the fourth argument + * is comma separated argument names. + */ +#if !defined(MIPE_HEADER_TRACEPOINT_LIST) +#error "MIPE_HEADER_TRACEPOINT_LIST must be defined!" +#endif + -+/** ++/* + * The number of entries in MIPE_HEADER_TRACEPOINT_LIST. + */ +#if !defined(MIPE_HEADER_TRACEPOINT_LIST_SIZE) +#error "MIPE_HEADER_TRACEPOINT_LIST_SIZE must be defined!" +#endif + -+/** ++/* + * The list of enums to process. + * + * It should be defined as follows: @@ -234432,7 +271616,7 @@ index 000000000000..72acadfae993 + */ +#if defined(MIPE_HEADER_ENUM_LIST) + -+/** ++/* + * Tracepoint message ID used for enums declaration. + */ +#if !defined(MIPE_HEADER_ENUM_MSG_ID) @@ -234443,7 +271627,7 @@ index 000000000000..72acadfae993 +#define MIPE_HEADER_ENUM_LIST +#endif + -+/** ++/* + * The MIPE tracepoint declaration BLOB. + */ +const struct @@ -234464,7 +271648,7 @@ index 000000000000..72acadfae993 + char _arg_types[sizeof(arg_types)]; \ + u32 _size_arg_names; \ + char _arg_names[sizeof(arg_names)]; \ -+ } __attribute__ ((__packed__)) __ ## name; ++ } MIPE_HEADER_PACKED_ATTRIBUTE __ ## name; + +#define ENUM_DESC(arg_name, value) \ + struct { \ @@ -234474,13 +271658,13 @@ index 000000000000..72acadfae993 + u32 _value; \ + u32 _value_str_len; \ + char _value_str[sizeof(#value)]; \ -+ } __attribute__ ((__packed__)) __ ## arg_name ## _ ## value; ++ } MIPE_HEADER_PACKED_ATTRIBUTE __ ## arg_name ## _ ## value; + + MIPE_HEADER_TRACEPOINT_LIST + MIPE_HEADER_ENUM_LIST +#undef TRACEPOINT_DESC +#undef ENUM_DESC -+} __attribute__((packed)) MIPE_HEADER_BLOB_VAR_NAME MIPE_HEADER_BLOB_VAR_ATTRIBUTE = { ++} MIPE_HEADER_PACKED_ATTRIBUTE MIPE_HEADER_BLOB_VAR_NAME MIPE_HEADER_BLOB_VAR_ATTRIBUTE = { + ._mipe_w0 = MIPE_PACKET_HEADER_W0( + TL_PACKET_FAMILY_TL, + MIPE_HEADER_PKT_CLASS, @@ -234532,18 +271716,19 @@ index 000000000000..72acadfae993 +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h b/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h new file mode 100755 -index 000000000000..54667cfc6304 +index 000000000..c35ee61ce --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h -@@ -0,0 +1,127 @@ +@@ -0,0 +1,126 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -234554,8 +271739,6 @@ index 000000000000..54667cfc6304 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* THIS FILE IS AUTOGENERATED BY mali_trace_generator.py. @@ -234665,18 +271848,19 @@ index 000000000000..54667cfc6304 +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c new file mode 100755 -index 000000000000..38ae46e0ddf1 +index 000000000..10a7f506b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c -@@ -0,0 +1,153 @@ +@@ -0,0 +1,177 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -234687,8 +271871,6 @@ index 000000000000..38ae46e0ddf1 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -234812,6 +271994,30 @@ index 000000000000..38ae46e0ddf1 + return pte; +} + ++/** ++ * kbase_native_mgm_pte_to_original_pte - Native method to undo changes done in ++ * kbase_native_mgm_update_gpu_pte() ++ * ++ * @mgm_dev: The memory group manager the request is being made through. ++ * @group_id: A physical memory group ID, which must be valid but is not used. ++ * Its valid range is 0 .. MEMORY_GROUP_MANAGER_NR_GROUPS-1. ++ * @mmu_level: The level of the MMU page table where the page is getting mapped. ++ * @pte: The prepared page table entry. ++ * ++ * This function simply returns the @pte without modification. ++ * ++ * Return: A GPU page table entry to be stored in a page table. ++ */ ++static u64 kbase_native_mgm_pte_to_original_pte(struct memory_group_manager_device *mgm_dev, ++ int group_id, int mmu_level, u64 pte) ++{ ++ CSTD_UNUSED(mgm_dev); ++ CSTD_UNUSED(group_id); ++ CSTD_UNUSED(mmu_level); ++ ++ return pte; ++} ++ +struct memory_group_manager_device kbase_native_mgm_dev = { + .ops = { + .mgm_alloc_page = kbase_native_mgm_alloc, @@ -234819,23 +272025,25 @@ index 000000000000..38ae46e0ddf1 + .mgm_get_import_memory_id = NULL, + .mgm_vmf_insert_pfn_prot = kbase_native_mgm_vmf_insert_pfn_prot, + .mgm_update_gpu_pte = kbase_native_mgm_update_gpu_pte, ++ .mgm_pte_to_original_pte = kbase_native_mgm_pte_to_original_pte, + }, + .data = NULL +}; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h new file mode 100755 -index 000000000000..431b1f4cb5db +index 000000000..1eae2fcf9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h -@@ -0,0 +1,39 @@ +@@ -0,0 +1,38 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -234846,8 +272054,6 @@ index 000000000000..431b1f4cb5db + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_NATIVE_MGM_H_ @@ -234855,7 +272061,7 @@ index 000000000000..431b1f4cb5db + +#include + -+/** ++/* + * kbase_native_mgm_dev - Native memory group manager device + * + * An implementation of the memory group manager interface that is intended for @@ -234867,20 +272073,689 @@ index 000000000000..431b1f4cb5db +extern struct memory_group_manager_device kbase_native_mgm_dev; + +#endif /* _KBASE_NATIVE_MGM_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pbha.c b/drivers/gpu/arm/bifrost/mali_kbase_pbha.c +new file mode 100644 +index 000000000..b65f9e7b5 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha.c +@@ -0,0 +1,306 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#include "mali_kbase_pbha.h" ++ ++#include ++#include ++#define DTB_SET_SIZE 2 ++ ++static bool read_setting_valid(unsigned int id, unsigned int read_setting) ++{ ++ switch (id) { ++ /* Valid ID - fall through all */ ++ case SYSC_ALLOC_ID_R_OTHER: ++ case SYSC_ALLOC_ID_R_CSF: ++ case SYSC_ALLOC_ID_R_MMU: ++ case SYSC_ALLOC_ID_R_TILER_VERT: ++ case SYSC_ALLOC_ID_R_TILER_PTR: ++ case SYSC_ALLOC_ID_R_TILER_INDEX: ++ case SYSC_ALLOC_ID_R_TILER_OTHER: ++ case SYSC_ALLOC_ID_R_IC: ++ case SYSC_ALLOC_ID_R_ATTR: ++ case SYSC_ALLOC_ID_R_SCM: ++ case SYSC_ALLOC_ID_R_FSDC: ++ case SYSC_ALLOC_ID_R_VL: ++ case SYSC_ALLOC_ID_R_PLR: ++ case SYSC_ALLOC_ID_R_TEX: ++ case SYSC_ALLOC_ID_R_LSC: ++ switch (read_setting) { ++ /* Valid setting value - fall through all */ ++ case SYSC_ALLOC_L2_ALLOC: ++ case SYSC_ALLOC_NEVER_ALLOC: ++ case SYSC_ALLOC_ALWAYS_ALLOC: ++ case SYSC_ALLOC_PTL_ALLOC: ++ case SYSC_ALLOC_L2_PTL_ALLOC: ++ return true; ++ default: ++ return false; ++ } ++ default: ++ return false; ++ } ++ ++ /* Unreachable */ ++ return false; ++} ++ ++static bool write_setting_valid(unsigned int id, unsigned int write_setting) ++{ ++ switch (id) { ++ /* Valid ID - fall through all */ ++ case SYSC_ALLOC_ID_W_OTHER: ++ case SYSC_ALLOC_ID_W_CSF: ++ case SYSC_ALLOC_ID_W_PCB: ++ case SYSC_ALLOC_ID_W_TILER_PTR: ++ case SYSC_ALLOC_ID_W_TILER_VERT_PLIST: ++ case SYSC_ALLOC_ID_W_TILER_OTHER: ++ case SYSC_ALLOC_ID_W_L2_EVICT: ++ case SYSC_ALLOC_ID_W_L2_FLUSH: ++ case SYSC_ALLOC_ID_W_TIB_COLOR: ++ case SYSC_ALLOC_ID_W_TIB_COLOR_AFBCH: ++ case SYSC_ALLOC_ID_W_TIB_COLOR_AFBCB: ++ case SYSC_ALLOC_ID_W_TIB_CRC: ++ case SYSC_ALLOC_ID_W_TIB_DS: ++ case SYSC_ALLOC_ID_W_TIB_DS_AFBCH: ++ case SYSC_ALLOC_ID_W_TIB_DS_AFBCB: ++ case SYSC_ALLOC_ID_W_LSC: ++ switch (write_setting) { ++ /* Valid setting value - fall through all */ ++ case SYSC_ALLOC_L2_ALLOC: ++ case SYSC_ALLOC_NEVER_ALLOC: ++ case SYSC_ALLOC_ALWAYS_ALLOC: ++ case SYSC_ALLOC_PTL_ALLOC: ++ case SYSC_ALLOC_L2_PTL_ALLOC: ++ return true; ++ default: ++ return false; ++ } ++ default: ++ return false; ++ } ++ ++ /* Unreachable */ ++ return false; ++} ++ ++/* Private structure to be returned as setting validity status */ ++struct settings_status { ++ /* specifies whether id and either one of settings is valid */ ++ bool overall; ++ /* specifies whether read setting is valid */ ++ bool read; ++ /* specifies whether write setting is valid*/ ++ bool write; ++}; ++ ++static struct settings_status settings_valid(unsigned int id, unsigned int read_setting, ++ unsigned int write_setting) ++{ ++ struct settings_status valid = { .overall = (id < SYSC_ALLOC_COUNT * sizeof(u32)) }; ++ ++ if (valid.overall) { ++ valid.read = read_setting_valid(id, read_setting); ++ valid.write = write_setting_valid(id, write_setting); ++ valid.overall = valid.read || valid.write; ++ } ++ ++ return valid; ++} ++ ++bool kbasep_pbha_supported(struct kbase_device *kbdev) ++{ ++ const u32 arch_maj_rev = ++ ARCH_MAJOR_REV_REG(kbdev->gpu_props.props.raw_props.gpu_id); ++ ++ return (arch_maj_rev >= GPU_ID2_ARCH_MAJOR_REV_MAKE(11, 3)); ++} ++ ++int kbase_pbha_record_settings(struct kbase_device *kbdev, bool runtime, ++ unsigned int id, unsigned int read_setting, ++ unsigned int write_setting) ++{ ++ struct settings_status const valid = settings_valid(id, read_setting, write_setting); ++ ++ if (valid.overall) { ++ unsigned int const sysc_alloc_num = id / sizeof(u32); ++ u32 modified_reg; ++ ++ if (runtime) { ++ int i; ++ ++ kbase_pm_context_active(kbdev); ++ /* Ensure host copy of SYSC_ALLOC is up to date */ ++ for (i = 0; i < SYSC_ALLOC_COUNT; i++) ++ kbdev->sysc_alloc[i] = kbase_reg_read( ++ kbdev, GPU_CONTROL_REG(SYSC_ALLOC(i))); ++ kbase_pm_context_idle(kbdev); ++ } ++ ++ modified_reg = kbdev->sysc_alloc[sysc_alloc_num]; ++ ++ switch (id % sizeof(u32)) { ++ case 0: ++ modified_reg = valid.read ? SYSC_ALLOC_R_SYSC_ALLOC0_SET(modified_reg, ++ read_setting) : ++ modified_reg; ++ modified_reg = valid.write ? SYSC_ALLOC_W_SYSC_ALLOC0_SET(modified_reg, ++ write_setting) : ++ modified_reg; ++ break; ++ case 1: ++ modified_reg = valid.read ? SYSC_ALLOC_R_SYSC_ALLOC1_SET(modified_reg, ++ read_setting) : ++ modified_reg; ++ modified_reg = valid.write ? SYSC_ALLOC_W_SYSC_ALLOC1_SET(modified_reg, ++ write_setting) : ++ modified_reg; ++ break; ++ case 2: ++ modified_reg = valid.read ? SYSC_ALLOC_R_SYSC_ALLOC2_SET(modified_reg, ++ read_setting) : ++ modified_reg; ++ modified_reg = valid.write ? SYSC_ALLOC_W_SYSC_ALLOC2_SET(modified_reg, ++ write_setting) : ++ modified_reg; ++ break; ++ case 3: ++ modified_reg = valid.read ? SYSC_ALLOC_R_SYSC_ALLOC3_SET(modified_reg, ++ read_setting) : ++ modified_reg; ++ modified_reg = valid.write ? SYSC_ALLOC_W_SYSC_ALLOC3_SET(modified_reg, ++ write_setting) : ++ modified_reg; ++ break; ++ } ++ ++ kbdev->sysc_alloc[sysc_alloc_num] = modified_reg; ++ } ++ ++ return valid.overall ? 0 : -EINVAL; ++} ++ ++void kbase_pbha_write_settings(struct kbase_device *kbdev) ++{ ++ if (kbasep_pbha_supported(kbdev)) { ++ int i; ++ ++ for (i = 0; i < SYSC_ALLOC_COUNT; ++i) ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(SYSC_ALLOC(i)), ++ kbdev->sysc_alloc[i]); ++ } ++} ++ ++static int kbase_pbha_read_int_id_override_property(struct kbase_device *kbdev, ++ const struct device_node *pbha_node) ++{ ++ u32 dtb_data[SYSC_ALLOC_COUNT * sizeof(u32) * DTB_SET_SIZE]; ++ int sz, i; ++ bool valid = true; ++ ++ sz = of_property_count_elems_of_size(pbha_node, "int_id_override", ++ sizeof(u32)); ++ if (sz <= 0 || (sz % DTB_SET_SIZE != 0)) { ++ dev_err(kbdev->dev, "Bad DTB format: pbha.int_id_override\n"); ++ return -EINVAL; ++ } ++ if (of_property_read_u32_array(pbha_node, "int_id_override", dtb_data, ++ sz) != 0) { ++ dev_err(kbdev->dev, ++ "Failed to read DTB pbha.int_id_override\n"); ++ return -EINVAL; ++ } ++ ++ for (i = 0; valid && i < sz; i = i + DTB_SET_SIZE) { ++ unsigned int rdset = ++ SYSC_ALLOC_R_SYSC_ALLOC0_GET(dtb_data[i + 1]); ++ unsigned int wrset = ++ SYSC_ALLOC_W_SYSC_ALLOC0_GET(dtb_data[i + 1]); ++ valid = valid && ++ (kbase_pbha_record_settings(kbdev, false, dtb_data[i], ++ rdset, wrset) == 0); ++ if (valid) ++ dev_info(kbdev->dev, ++ "pbha.int_id_override 0x%x r0x%x w0x%x\n", ++ dtb_data[i], rdset, wrset); ++ } ++ if (i != sz || (!valid)) { ++ dev_err(kbdev->dev, ++ "Failed recording DTB data (pbha.int_id_override)\n"); ++ return -EINVAL; ++ } ++ return 0; ++} ++ ++#if MALI_USE_CSF ++static int kbase_pbha_read_propagate_bits_property(struct kbase_device *kbdev, ++ const struct device_node *pbha_node) ++{ ++ u32 bits; ++ int err; ++ ++ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PBHA_HWU)) ++ return 0; ++ ++ err = of_property_read_u32(pbha_node, "propagate_bits", &bits); ++ ++ if (err < 0) { ++ if (err != -EINVAL) { ++ dev_err(kbdev->dev, ++ "DTB value for propagate_bits is improperly formed (err=%d)\n", ++ err); ++ return err; ++ } ++ } ++ ++ if (bits > (L2_CONFIG_PBHA_HWU_MASK >> L2_CONFIG_PBHA_HWU_SHIFT)) { ++ dev_err(kbdev->dev, "Bad DTB value for propagate_bits: 0x%x\n", bits); ++ return -EINVAL; ++ } ++ ++ kbdev->pbha_propagate_bits = bits; ++ return 0; ++} ++#endif ++ ++int kbase_pbha_read_dtb(struct kbase_device *kbdev) ++{ ++ const struct device_node *pbha_node; ++ int err; ++ ++ if (!kbasep_pbha_supported(kbdev)) ++ return 0; ++ ++ pbha_node = of_get_child_by_name(kbdev->dev->of_node, "pbha"); ++ if (!pbha_node) ++ return 0; ++ ++ err = kbase_pbha_read_int_id_override_property(kbdev, pbha_node); ++ ++#if MALI_USE_CSF ++ if (err < 0) ++ return err; ++ ++ err = kbase_pbha_read_propagate_bits_property(kbdev, pbha_node); ++#endif ++ ++ return err; ++} +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pbha.h b/drivers/gpu/arm/bifrost/mali_kbase_pbha.h +new file mode 100644 +index 000000000..79632194c +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha.h +@@ -0,0 +1,77 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#ifndef _KBASE_PBHA_H ++#define _KBASE_PBHA_H ++ ++#include ++ ++/** ++ * kbasep_pbha_supported - check whether PBHA registers are ++ * available ++ * ++ * @kbdev: Device pointer ++ * ++ * Should only be used in mali_kbase_pbha* files - thus the ++ * kbase[p] prefix. ++ * ++ * Return: True if pbha is supported, false otherwise ++ */ ++bool kbasep_pbha_supported(struct kbase_device *kbdev); ++ ++/** ++ * kbase_pbha_record_settings - record PBHA settings to be applied when ++ * L2 is powered down ++ * ++ * @kbdev: Device pointer ++ * @runtime: true if it's called at runtime and false if it's called on init. ++ * @id: memory access source ID ++ * @read_setting: Read setting ++ * @write_setting: Write setting ++ * ++ * Return: 0 on success, otherwise error code. ++ */ ++int kbase_pbha_record_settings(struct kbase_device *kbdev, bool runtime, ++ unsigned int id, unsigned int read_setting, ++ unsigned int write_setting); ++ ++/** ++ * kbase_pbha_write_settings - write recorded PBHA settings to GPU ++ * registers ++ * ++ * @kbdev: Device pointer ++ * ++ * Only valid to call this function when L2 is powered down, otherwise ++ * this will not affect PBHA settings. ++ */ ++void kbase_pbha_write_settings(struct kbase_device *kbdev); ++ ++/** ++ * kbase_pbha_read_dtb - read PBHA settings from DTB and record it to be ++ * applied when L2 is powered down ++ * ++ * @kbdev: Device pointer ++ * ++ * Return: 0 on success, otherwise error code. ++ */ ++int kbase_pbha_read_dtb(struct kbase_device *kbdev); ++ ++#endif /* _KBASE_PBHA_H */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.c +new file mode 100644 +index 000000000..1cc29c700 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.c +@@ -0,0 +1,227 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#include "mali_kbase_pbha_debugfs.h" ++#include "mali_kbase_pbha.h" ++#include ++#include ++#include ++ ++#if MALI_USE_CSF ++#include "backend/gpu/mali_kbase_pm_internal.h" ++#endif ++ ++static int int_id_overrides_show(struct seq_file *sfile, void *data) ++{ ++ struct kbase_device *kbdev = sfile->private; ++ int i; ++ ++ kbase_pm_context_active(kbdev); ++ ++ /* Minimal header for readability */ ++ seq_puts(sfile, "// R W\n"); ++ for (i = 0; i < SYSC_ALLOC_COUNT; ++i) { ++ int j; ++ u32 reg = kbase_reg_read(kbdev, GPU_CONTROL_REG(SYSC_ALLOC(i))); ++ ++ for (j = 0; j < sizeof(u32); ++j) { ++ u8 r_val; ++ u8 w_val; ++ ++ switch (j) { ++ case 0: ++ r_val = SYSC_ALLOC_R_SYSC_ALLOC0_GET(reg); ++ w_val = SYSC_ALLOC_W_SYSC_ALLOC0_GET(reg); ++ break; ++ case 1: ++ r_val = SYSC_ALLOC_R_SYSC_ALLOC1_GET(reg); ++ w_val = SYSC_ALLOC_W_SYSC_ALLOC1_GET(reg); ++ break; ++ case 2: ++ r_val = SYSC_ALLOC_R_SYSC_ALLOC2_GET(reg); ++ w_val = SYSC_ALLOC_W_SYSC_ALLOC2_GET(reg); ++ break; ++ case 3: ++ r_val = SYSC_ALLOC_R_SYSC_ALLOC3_GET(reg); ++ w_val = SYSC_ALLOC_W_SYSC_ALLOC3_GET(reg); ++ break; ++ } ++ seq_printf(sfile, "%2zu 0x%x 0x%x\n", ++ (i * sizeof(u32)) + j, r_val, w_val); ++ } ++ } ++ kbase_pm_context_idle(kbdev); ++ ++ return 0; ++} ++ ++static ssize_t int_id_overrides_write(struct file *file, ++ const char __user *ubuf, size_t count, ++ loff_t *ppos) ++{ ++ struct seq_file *sfile = file->private_data; ++ struct kbase_device *kbdev = sfile->private; ++ char raw_str[128]; ++ unsigned int id; ++ unsigned int r_val; ++ unsigned int w_val; ++ ++ if (count >= sizeof(raw_str)) ++ return -E2BIG; ++ if (copy_from_user(raw_str, ubuf, count)) ++ return -EINVAL; ++ raw_str[count] = '\0'; ++ ++ if (sscanf(raw_str, "%u %x %x", &id, &r_val, &w_val) != 3) ++ return -EINVAL; ++ ++ if (kbase_pbha_record_settings(kbdev, true, id, r_val, w_val)) ++ return -EINVAL; ++ ++ /* This is a debugfs config write, so reset GPU such that changes take effect ASAP */ ++ kbase_pm_context_active(kbdev); ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_NONE)) ++ kbase_reset_gpu(kbdev); ++ kbase_pm_context_idle(kbdev); ++ ++ return count; ++} ++ ++static int int_id_overrides_open(struct inode *in, struct file *file) ++{ ++ return single_open(file, int_id_overrides_show, in->i_private); ++} ++ ++#if MALI_USE_CSF ++/** ++ * propagate_bits_show - Read PBHA bits from L2_CONFIG out to debugfs. ++ * ++ * @sfile: The debugfs entry. ++ * @data: Data associated with the entry. ++ * ++ * Return: 0 in all cases. ++ */ ++static int propagate_bits_show(struct seq_file *sfile, void *data) ++{ ++ struct kbase_device *kbdev = sfile->private; ++ u32 l2_config_val; ++ ++ kbase_csf_scheduler_pm_active(kbdev); ++ kbase_pm_wait_for_l2_powered(kbdev); ++ l2_config_val = L2_CONFIG_PBHA_HWU_GET(kbase_reg_read(kbdev, GPU_CONTROL_REG(L2_CONFIG))); ++ kbase_csf_scheduler_pm_idle(kbdev); ++ ++ seq_printf(sfile, "PBHA Propagate Bits: 0x%x\n", l2_config_val); ++ return 0; ++} ++ ++static int propagate_bits_open(struct inode *in, struct file *file) ++{ ++ return single_open(file, propagate_bits_show, in->i_private); ++} ++ ++/** ++ * propagate_bits_write - Write input value from debugfs to PBHA bits of L2_CONFIG register. ++ * ++ * @file: Pointer to file struct of debugfs node. ++ * @ubuf: Pointer to user buffer with value to be written. ++ * @count: Size of user buffer. ++ * @ppos: Not used. ++ * ++ * Return: Size of buffer passed in when successful, but error code E2BIG/EINVAL otherwise. ++ */ ++static ssize_t propagate_bits_write(struct file *file, const char __user *ubuf, size_t count, ++ loff_t *ppos) ++{ ++ struct seq_file *sfile = file->private_data; ++ struct kbase_device *kbdev = sfile->private; ++ /* 32 characters should be enough for the input string in any base */ ++ char raw_str[32]; ++ unsigned long propagate_bits; ++ ++ if (count >= sizeof(raw_str)) ++ return -E2BIG; ++ if (copy_from_user(raw_str, ubuf, count)) ++ return -EINVAL; ++ raw_str[count] = '\0'; ++ if (kstrtoul(raw_str, 0, &propagate_bits)) ++ return -EINVAL; ++ ++ /* Check propagate_bits input argument does not ++ * exceed the maximum size of the propagate_bits mask. ++ */ ++ if (propagate_bits > (L2_CONFIG_PBHA_HWU_MASK >> L2_CONFIG_PBHA_HWU_SHIFT)) ++ return -EINVAL; ++ /* Cast to u8 is safe as check is done already to ensure size is within ++ * correct limits. ++ */ ++ kbdev->pbha_propagate_bits = (u8)propagate_bits; ++ ++ /* GPU Reset will set new values in L2 config */ ++ if (kbase_prepare_to_reset_gpu(kbdev, RESET_FLAGS_NONE)) { ++ kbase_reset_gpu(kbdev); ++ kbase_reset_gpu_wait(kbdev); ++ } ++ ++ return count; ++} ++ ++static const struct file_operations pbha_propagate_bits_fops = { ++ .owner = THIS_MODULE, ++ .open = propagate_bits_open, ++ .read = seq_read, ++ .write = propagate_bits_write, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++#endif /* MALI_USE_CSF */ ++ ++static const struct file_operations pbha_int_id_overrides_fops = { ++ .owner = THIS_MODULE, ++ .open = int_id_overrides_open, ++ .read = seq_read, ++ .write = int_id_overrides_write, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++ ++void kbase_pbha_debugfs_init(struct kbase_device *kbdev) ++{ ++ if (kbasep_pbha_supported(kbdev)) { ++ const mode_t mode = 0644; ++ struct dentry *debugfs_pbha_dir = debugfs_create_dir( ++ "pbha", kbdev->mali_debugfs_directory); ++ ++ if (IS_ERR_OR_NULL(debugfs_pbha_dir)) { ++ dev_err(kbdev->dev, ++ "Couldn't create mali debugfs page-based hardware attributes directory\n"); ++ return; ++ } ++ ++ debugfs_create_file("int_id_overrides", mode, debugfs_pbha_dir, ++ kbdev, &pbha_int_id_overrides_fops); ++#if MALI_USE_CSF ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PBHA_HWU)) ++ debugfs_create_file("propagate_bits", mode, debugfs_pbha_dir, kbdev, ++ &pbha_propagate_bits_fops); ++#endif /* MALI_USE_CSF */ ++ } ++} +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.h +new file mode 100644 +index 000000000..508ecdff9 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.h +@@ -0,0 +1,34 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#ifndef _KBASE_PBHA_DEBUGFS_H ++#define _KBASE_PBHA_DEBUGFS_H ++ ++#include ++ ++/** ++ * kbase_pbha_debugfs_init - Initialize pbha debugfs directory ++ * ++ * @kbdev: Device pointer ++ */ ++void kbase_pbha_debugfs_init(struct kbase_device *kbdev); ++ ++#endif /* _KBASE_PBHA_DEBUGFS_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c b/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c new file mode 100755 -index 000000000000..fbb090e6c21f +index 000000000..265c676f1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c -@@ -0,0 +1,124 @@ +@@ -0,0 +1,119 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2011-2014, 2016-2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2014, 2016-2017, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -234891,8 +272766,6 @@ index 000000000000..fbb090e6c21f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -234901,7 +272774,6 @@ index 000000000000..fbb090e6c21f +#include +#include + -+ +/* + * This file is included only for type definitions and functions belonging to + * specific platform folders. Do not add dependencies with symbols that are @@ -234909,21 +272781,21 @@ index 000000000000..fbb090e6c21f + */ +#include + ++#ifndef CONFIG_OF ++ +#define PLATFORM_CONFIG_RESOURCE_COUNT 4 -+#define PLATFORM_CONFIG_IRQ_RES_COUNT 3 + +static struct platform_device *mali_device; + -+#ifndef CONFIG_OF +/** -+ * @brief Convert data in struct kbase_io_resources struct to Linux-specific resources ++ * kbasep_config_parse_io_resources - Convert data in struct kbase_io_resources ++ * struct to Linux-specific resources ++ * @io_resources: Input IO resource data ++ * @linux_resources: Pointer to output array of Linux resource structures + * + * Function converts data in struct kbase_io_resources struct to an array of Linux resource structures. Note that function + * assumes that size of linux_resource array is at least PLATFORM_CONFIG_RESOURCE_COUNT. + * Resources are put in fixed order: I/O memory region, job IRQ, MMU IRQ, GPU IRQ. -+ * -+ * @param[in] io_resource Input IO resource data -+ * @param[out] linux_resources Pointer to output array of Linux resource structures + */ +static void kbasep_config_parse_io_resources(const struct kbase_io_resources *io_resources, struct resource *const linux_resources) +{ @@ -234950,14 +272822,11 @@ index 000000000000..fbb090e6c21f + linux_resources[3].end = io_resources->gpu_irq_number; + linux_resources[3].flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL; +} -+#endif /* CONFIG_OF */ + +int kbase_platform_register(void) +{ + struct kbase_platform_config *config; -+#ifndef CONFIG_OF + struct resource resources[PLATFORM_CONFIG_RESOURCE_COUNT]; -+#endif + int err; + + config = kbase_get_platform_config(); /* declared in midgard/mali_kbase_config.h but defined in platform folder */ @@ -234970,7 +272839,6 @@ index 000000000000..fbb090e6c21f + if (mali_device == NULL) + return -ENOMEM; + -+#ifndef CONFIG_OF + kbasep_config_parse_io_resources(config->io_resources, resources); + err = platform_device_add_resources(mali_device, resources, PLATFORM_CONFIG_RESOURCE_COUNT); + if (err) { @@ -234978,7 +272846,6 @@ index 000000000000..fbb090e6c21f + mali_device = NULL; + return err; + } -+#endif /* CONFIG_OF */ + + err = platform_device_add(mali_device); + if (err) { @@ -234997,20 +272864,23 @@ index 000000000000..fbb090e6c21f + platform_device_unregister(mali_device); +} +EXPORT_SYMBOL(kbase_platform_unregister); ++ ++#endif /* CONFIG_OF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pm.c b/drivers/gpu/arm/bifrost/mali_kbase_pm.c new file mode 100755 -index 000000000000..630ab1550045 +index 000000000..62a132816 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pm.c -@@ -0,0 +1,292 @@ +@@ -0,0 +1,311 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -235021,30 +272891,26 @@ index 000000000000..630ab1550045 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/** -+ * @file mali_kbase_pm.c -+ * Base kernel power management APIs ++ * DOC: Base kernel power management APIs + */ + +#include +#include +#include -+#include ++#include ++#include + +#include -+#include ++#include + +#ifdef CONFIG_MALI_ARBITER_SUPPORT +#include +#endif /* CONFIG_MALI_ARBITER_SUPPORT */ + -+#include ++#include + +int kbase_pm_powerup(struct kbase_device *kbdev, unsigned int flags) +{ @@ -235085,13 +272951,13 @@ index 000000000000..630ab1550045 + case KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE: + if (kbdev->pm.active_count != 0) + break; -+ /* FALLTHROUGH */ ++ fallthrough; + case KBASE_PM_SUSPEND_HANDLER_DONT_INCREASE: + kbase_pm_unlock(kbdev); + return 1; + + case KBASE_PM_SUSPEND_HANDLER_NOT_POSSIBLE: -+ /* FALLTHROUGH */ ++ fallthrough; + default: + KBASE_DEBUG_ASSERT_MSG(false, "unreachable"); + break; @@ -235152,14 +273018,15 @@ index 000000000000..630ab1550045 + +KBASE_EXPORT_TEST_API(kbase_pm_context_idle); + -+void kbase_pm_driver_suspend(struct kbase_device *kbdev) ++int kbase_pm_driver_suspend(struct kbase_device *kbdev) +{ + KBASE_DEBUG_ASSERT(kbdev); + -+ /* Suspend vinstr. This blocks until the vinstr worker and timer are -+ * no longer running. ++ /* Suspend HW counter intermediaries. This blocks until workers and timers ++ * are no longer running. + */ + kbase_vinstr_suspend(kbdev->vinstr_ctx); ++ kbase_kinstr_prfcnt_suspend(kbdev->kinstr_prfcnt_ctx); + + /* Disable GPU hardware counters. + * This call will block until counters are disabled. @@ -235169,7 +273036,7 @@ index 000000000000..630ab1550045 + mutex_lock(&kbdev->pm.lock); + if (WARN_ON(kbase_pm_is_suspending(kbdev))) { + mutex_unlock(&kbdev->pm.lock); -+ return; ++ return 0; + } + kbdev->pm.suspending = true; + mutex_unlock(&kbdev->pm.lock); @@ -235196,10 +273063,16 @@ index 000000000000..630ab1550045 + +#if !MALI_USE_CSF + /* Suspend job scheduler and associated components, so that it releases all -+ * the PM active count references */ ++ * the PM active count references ++ */ + kbasep_js_suspend(kbdev); +#else -+ kbase_csf_scheduler_pm_suspend(kbdev); ++ if (kbase_csf_scheduler_pm_suspend(kbdev)) { ++ mutex_lock(&kbdev->pm.lock); ++ kbdev->pm.suspending = false; ++ mutex_unlock(&kbdev->pm.lock); ++ return -1; ++ } +#endif + + /* Wait for the active count to reach zero. This is not the same as @@ -235215,7 +273088,12 @@ index 000000000000..630ab1550045 + /* NOTE: We synchronize with anything that was just finishing a + * kbase_pm_context_idle() call by locking the pm.lock below + */ -+ kbase_hwaccess_pm_suspend(kbdev); ++ if (kbase_hwaccess_pm_suspend(kbdev)) { ++ mutex_lock(&kbdev->pm.lock); ++ kbdev->pm.suspending = false; ++ mutex_unlock(&kbdev->pm.lock); ++ return -1; ++ } + +#ifdef CONFIG_MALI_ARBITER_SUPPORT + if (kbdev->arb.arb_if) { @@ -235224,6 +273102,8 @@ index 000000000000..630ab1550045 + mutex_unlock(&kbdev->pm.arb_vm_state->vm_state_lock); + } +#endif /* CONFIG_MALI_ARBITER_SUPPORT */ ++ ++ return 0; +} + +void kbase_pm_driver_resume(struct kbase_device *kbdev, bool arb_gpu_start) @@ -235254,8 +273134,6 @@ index 000000000000..630ab1550045 + * atoms + */ + kbasep_js_resume(kbdev); -+#else -+ kbase_csf_scheduler_pm_resume(kbdev); +#endif + + /* Matching idle call, to power off the GPU/cores if we didn't actually @@ -235264,24 +273142,34 @@ index 000000000000..630ab1550045 + kbase_pm_context_idle(kbdev); + + /* Re-enable GPU hardware counters */ ++#if MALI_USE_CSF ++ kbase_csf_scheduler_spin_lock(kbdev, &flags); ++ kbase_hwcnt_context_enable(kbdev->hwcnt_gpu_ctx); ++ kbase_csf_scheduler_spin_unlock(kbdev, flags); ++#else + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + kbase_hwcnt_context_enable(kbdev->hwcnt_gpu_ctx); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++#endif + -+ /* Resume vinstr */ ++ /* Resume HW counters intermediaries. */ + kbase_vinstr_resume(kbdev->vinstr_ctx); ++ kbase_kinstr_prfcnt_resume(kbdev->kinstr_prfcnt_ctx); +} + -+void kbase_pm_suspend(struct kbase_device *kbdev) ++int kbase_pm_suspend(struct kbase_device *kbdev) +{ ++ int result = 0; +#ifdef CONFIG_MALI_ARBITER_SUPPORT + if (kbdev->arb.arb_if) + kbase_arbiter_pm_vm_event(kbdev, KBASE_VM_OS_SUSPEND_EVENT); + else -+ kbase_pm_driver_suspend(kbdev); ++ result = kbase_pm_driver_suspend(kbdev); +#else -+ kbase_pm_driver_suspend(kbdev); ++ result = kbase_pm_driver_suspend(kbdev); +#endif /* CONFIG_MALI_ARBITER_SUPPORT */ ++ ++ return result; +} + +void kbase_pm_resume(struct kbase_device *kbdev) @@ -235297,18 +273185,19 @@ index 000000000000..630ab1550045 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pm.h b/drivers/gpu/arm/bifrost/mali_kbase_pm.h new file mode 100755 -index 000000000000..13565186c11f +index 000000000..4bb90a4f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pm.h -@@ -0,0 +1,251 @@ +@@ -0,0 +1,257 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -235319,15 +273208,10 @@ index 000000000000..13565186c11f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +/** -+ * @file mali_kbase_pm.h -+ * Power management API definitions ++ * DOC: Power management API definitions + */ + +#ifndef _KBASE_PM_H_ @@ -235346,48 +273230,55 @@ index 000000000000..13565186c11f +#define PM_NO_RESET 0x04 +#endif + -+/** Initialize the power management framework. -+ * -+ * Must be called before any other power management function ++/** ++ * kbase_pm_init - Initialize the power management framework. + * -+ * @param kbdev The kbase device structure for the device ++ * @kbdev: The kbase device structure for the device + * (must be a valid pointer) + * -+ * @return 0 if the power management framework was successfully initialized. ++ * Must be called before any other power management function ++ * ++ * Return: 0 if the power management framework was successfully initialized. + */ +int kbase_pm_init(struct kbase_device *kbdev); + -+/** Power up GPU after all modules have been initialized and interrupt handlers installed. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) ++/** ++ * kbase_pm_powerup - Power up GPU after all modules have been initialized ++ * and interrupt handlers installed. + * -+ * @param flags Flags to pass on to kbase_pm_init_hw ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @flags: Flags to pass on to kbase_pm_init_hw + * -+ * @return 0 if powerup was successful. ++ * Return: 0 if powerup was successful. + */ +int kbase_pm_powerup(struct kbase_device *kbdev, unsigned int flags); + +/** -+ * Halt the power management framework. ++ * kbase_pm_halt - Halt the power management framework. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * + * Should ensure that no new interrupts are generated, + * but allow any currently running interrupt handlers to complete successfully. + * The GPU is forced off by the time this function returns, regardless of + * whether or not the active power policy asks for the GPU to be powered off. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) + */ +void kbase_pm_halt(struct kbase_device *kbdev); + -+/** Terminate the power management framework. ++/** ++ * kbase_pm_term - Terminate the power management framework. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * No power management functions may be called after this + * (except @ref kbase_pm_init) -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) + */ +void kbase_pm_term(struct kbase_device *kbdev); + -+/** Increment the count of active contexts. ++/** ++ * kbase_pm_context_active - Increment the count of active contexts. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * This function should be called when a context is about to submit a job. + * It informs the active power policy that the GPU is going to be in use shortly @@ -235401,8 +273292,6 @@ index 000000000000..13565186c11f + * @note a Suspend is only visible to Kernel threads; user-space threads in a + * syscall cannot witness a suspend, because they are frozen before the suspend + * begins. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) + */ +void kbase_pm_context_active(struct kbase_device *kbdev); + @@ -235430,7 +273319,11 @@ index 000000000000..13565186c11f +#endif /* CONFIG_MALI_ARBITER_SUPPORT */ +}; + -+/** Suspend 'safe' variant of kbase_pm_context_active() ++/** ++ * kbase_pm_context_active_handle_suspend - Suspend 'safe' variant of kbase_pm_context_active() ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @suspend_handler: The handler code for how to handle a suspend that might occur + * + * If a suspend is in progress, this allows for various different ways of + * handling the suspend. Refer to @ref enum kbase_pm_suspend_handler for details. @@ -235440,20 +273333,18 @@ index 000000000000..13565186c11f + * indicates a failure, the caller must abort whatever operation it was + * attempting, and potentially queue it up for after the OS has resumed. + * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) -+ * @param suspend_handler The handler code for how to handle a suspend that might occur -+ * @return zero Indicates success -+ * @return non-zero Indicates failure due to the system being suspending/suspended. ++ * Return: 0 on success, non-zero othrewise. + */ +int kbase_pm_context_active_handle_suspend(struct kbase_device *kbdev, enum kbase_pm_suspend_handler suspend_handler); + -+/** Decrement the reference count of active contexts. ++/** ++ * kbase_pm_context_idle - Decrement the reference count of active contexts. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * This function should be called when a context becomes idle. + * After this call the GPU may be turned off by the power policy so the calling + * code should ensure that it does not access the GPU's registers. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) + */ +void kbase_pm_context_idle(struct kbase_device *kbdev); + @@ -235462,8 +273353,10 @@ index 000000000000..13565186c11f + */ + +/** -+ * Suspend the GPU and prevent any further register accesses to it from Kernel -+ * threads. ++ * kbase_pm_suspend - Suspend the GPU and prevent any further register accesses ++ * to it from Kernel threads. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * This is called in response to an OS suspend event, and calls into the various + * kbase components to complete the suspend. @@ -235472,20 +273365,20 @@ index 000000000000..13565186c11f + * by the OS before we suspend. Otherwise, an IOCTL could occur that powers up + * the GPU e.g. via atom submission. + * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) ++ * Return: 0 on success. + */ -+void kbase_pm_suspend(struct kbase_device *kbdev); ++int kbase_pm_suspend(struct kbase_device *kbdev); + +/** -+ * Resume the GPU, allow register accesses to it, and resume running atoms on -+ * the GPU. ++ * kbase_pm_resume - Resume the GPU, allow register accesses to it, ++ * and resume running atoms on the GPU. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * This is called in response to an OS resume event, and calls into the various + * kbase components to complete the resume. + * + * Also called when using VM arbiter, when GPU access has been granted. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) + */ +void kbase_pm_resume(struct kbase_device *kbdev); + @@ -235502,8 +273395,7 @@ index 000000000000..13565186c11f + +/** + * kbase_pm_driver_suspend() - Put GPU and driver in suspend state -+ * @param kbdev The kbase device structure for the device -+ * (must be a valid pointer) ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * + * Suspend the GPU and prevent any further register accesses to it from Kernel + * threads. @@ -235517,13 +273409,15 @@ index 000000000000..13565186c11f + * @note the mechanisms used here rely on all user-space threads being frozen + * by the OS before we suspend. Otherwise, an IOCTL could occur that powers up + * the GPU e.g. via atom submission. ++ * ++ * Return: 0 on success. + */ -+void kbase_pm_driver_suspend(struct kbase_device *kbdev); ++int kbase_pm_driver_suspend(struct kbase_device *kbdev); + +/** + * kbase_pm_driver_resume() - Put GPU and driver in resume -+ * @param kbdev The kbase device structure for the device -+ * (must be a valid pointer) ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @arb_gpu_start: Arbiter has notified we can use GPU + * + * Resume the GPU, allow register accesses to it, and resume running atoms on + * the GPU. @@ -235552,20 +273446,84 @@ index 000000000000..13565186c11f +#endif /* CONFIG_MALI_ARBITER_SUPPORT */ + +#endif /* _KBASE_PM_H_ */ +diff --git a/drivers/gpu/arm/bifrost/mali_kbase_refcount_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_refcount_defs.h +new file mode 100644 +index 000000000..c517a2d2a +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/mali_kbase_refcount_defs.h +@@ -0,0 +1,57 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2023 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++#ifndef _KBASE_REFCOUNT_DEFS_H_ ++#define _KBASE_REFCOUNT_DEFS_H_ ++ ++/* ++ * The Refcount API is available from 4.11 onwards ++ * This file hides the compatibility issues with this for the rest the driver ++ */ ++ ++#include ++#include ++ ++#if (KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE) ++ ++#define kbase_refcount_t atomic_t ++#define kbase_refcount_read(x) atomic_read(x) ++#define kbase_refcount_set(x, v) atomic_set(x, v) ++#define kbase_refcount_dec_and_test(x) atomic_dec_and_test(x) ++#define kbase_refcount_dec(x) atomic_dec(x) ++#define kbase_refcount_inc_not_zero(x) atomic_inc_not_zero(x) ++#define kbase_refcount_inc(x) atomic_inc(x) ++ ++#else ++ ++#include ++ ++#define kbase_refcount_t refcount_t ++#define kbase_refcount_read(x) refcount_read(x) ++#define kbase_refcount_set(x, v) refcount_set(x, v) ++#define kbase_refcount_dec_and_test(x) refcount_dec_and_test(x) ++#define kbase_refcount_dec(x) refcount_dec(x) ++#define kbase_refcount_inc_not_zero(x) refcount_inc_not_zero(x) ++#define kbase_refcount_inc(x) refcount_inc(x) ++ ++#endif /* (KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE) */ ++ ++#endif /* _KBASE_REFCOUNT_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c new file mode 100755 -index 000000000000..7b86c58440db +index 000000000..147082c15 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c -@@ -0,0 +1,245 @@ +@@ -0,0 +1,239 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014, 2016, 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2016, 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -235576,14 +273534,12 @@ index 000000000000..7b86c58440db + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include "mali_kbase.h" +#include "mali_kbase_regs_history_debugfs.h" + -+#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_BIFROST_NO_MALI) ++#if defined(CONFIG_DEBUG_FS) && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) + +#include + @@ -235597,7 +273553,7 @@ index 000000000000..7b86c58440db + * If resizing fails for any reason (e.g., could not allocate memory, invalid + * buffer size) then the original buffer will be kept intact. + * -+ * @return 0 if the buffer was resized, failure otherwise ++ * Return: 0 if the buffer was resized, failure otherwise + */ +static int kbase_io_history_resize(struct kbase_io_history *h, u16 new_size) +{ @@ -235678,7 +273634,7 @@ index 000000000000..7b86c58440db +void kbase_io_history_dump(struct kbase_device *kbdev) +{ + struct kbase_io_history *const h = &kbdev->io_history; -+ u16 i; ++ size_t i; + size_t iters; + unsigned long flags; + @@ -235696,7 +273652,7 @@ index 000000000000..7b86c58440db + &h->buf[(h->count - iters + i) % h->size]; + char const access = (io->addr & 1) ? 'w' : 'r'; + -+ dev_err(kbdev->dev, "%6i: %c: reg 0x%016lx val %08x\n", i, ++ dev_err(kbdev->dev, "%6zu: %c: reg 0x%016lx val %08x\n", i, + access, (unsigned long)(io->addr & ~0x1), io->value); + } + @@ -235719,12 +273675,8 @@ index 000000000000..7b86c58440db + return kbase_io_history_resize(h, (u16)val); +} + -+ -+DEFINE_SIMPLE_ATTRIBUTE(regs_history_size_fops, -+ regs_history_size_get, -+ regs_history_size_set, -+ "%llu\n"); -+ ++DEFINE_DEBUGFS_ATTRIBUTE(regs_history_size_fops, regs_history_size_get, regs_history_size_set, ++ "%llu\n"); + +/** + * regs_history_show - show callback for the register access history file. @@ -235734,13 +273686,12 @@ index 000000000000..7b86c58440db + * + * This function is called to dump all recent accesses to the GPU registers. + * -+ * @return 0 if successfully prints data in debugfs entry file, failure -+ * otherwise ++ * Return: 0 if successfully prints data in debugfs entry file, failure otherwise + */ +static int regs_history_show(struct seq_file *sfile, void *data) +{ + struct kbase_io_history *const h = sfile->private; -+ u16 i; ++ size_t i; + size_t iters; + unsigned long flags; + @@ -235759,8 +273710,8 @@ index 000000000000..7b86c58440db + &h->buf[(h->count - iters + i) % h->size]; + char const access = (io->addr & 1) ? 'w' : 'r'; + -+ seq_printf(sfile, "%6i: %c: reg 0x%016lx val %08x\n", i, access, -+ (unsigned long)(io->addr & ~0x1), io->value); ++ seq_printf(sfile, "%6zu: %c: reg 0x%016lx val %08x\n", i, ++ access, (unsigned long)(io->addr & ~0x1), io->value); + } + + spin_unlock_irqrestore(&h->lock, flags); @@ -235775,7 +273726,7 @@ index 000000000000..7b86c58440db + * @in: &struct inode pointer + * @file: &struct file pointer + * -+ * @return file descriptor ++ * Return: file descriptor + */ +static int regs_history_open(struct inode *in, struct file *file) +{ @@ -235792,31 +273743,32 @@ index 000000000000..7b86c58440db + +void kbasep_regs_history_debugfs_init(struct kbase_device *kbdev) +{ -+ debugfs_create_bool("regs_history_enabled", S_IRUGO | S_IWUSR, ++ debugfs_create_bool("regs_history_enabled", 0644, + kbdev->mali_debugfs_directory, + &kbdev->io_history.enabled); -+ debugfs_create_file("regs_history_size", S_IRUGO | S_IWUSR, ++ debugfs_create_file("regs_history_size", 0644, + kbdev->mali_debugfs_directory, + &kbdev->io_history, ®s_history_size_fops); -+ debugfs_create_file("regs_history", S_IRUGO, ++ debugfs_create_file("regs_history", 0444, + kbdev->mali_debugfs_directory, &kbdev->io_history, + ®s_history_fops); +} -+#endif /* defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_BIFROST_NO_MALI) */ ++#endif /* defined(CONFIG_DEBUG_FS) && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h new file mode 100755 -index 000000000000..200c0c2d8de8 +index 000000000..ae327dd79 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h -@@ -0,0 +1,85 @@ +@@ -0,0 +1,84 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014, 2016, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2016, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -235827,12 +273779,10 @@ index 000000000000..200c0c2d8de8 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** -+ * Header file for register access history support via debugfs ++ * DOC: Header file for register access history support via debugfs + * + * This interface is made available via /sys/kernel/debug/mali#/regs_history*. + * @@ -235848,7 +273798,7 @@ index 000000000000..200c0c2d8de8 + +struct kbase_device; + -+#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_BIFROST_NO_MALI) ++#if defined(CONFIG_DEBUG_FS) && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) + +/** + * kbase_io_history_init - initialize data struct for register access history @@ -235856,7 +273806,7 @@ index 000000000000..200c0c2d8de8 + * @h: The register history to initialize + * @n: The number of register accesses that the buffer could hold + * -+ * @return 0 if successfully initialized, failure otherwise ++ * Return: 0 if successfully initialized, failure otherwise + */ +int kbase_io_history_init(struct kbase_io_history *h, u16 n); + @@ -235881,9 +273831,9 @@ index 000000000000..200c0c2d8de8 + */ +void kbasep_regs_history_debugfs_init(struct kbase_device *kbdev); + -+#else /* defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_BIFROST_NO_MALI) */ ++#else /* !defined(CONFIG_DEBUG_FS) || IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ + -+#define kbase_io_history_init(...) ((int)0) ++#define kbase_io_history_init(...) (0) + +#define kbase_io_history_term CSTD_NOP + @@ -235891,23 +273841,24 @@ index 000000000000..200c0c2d8de8 + +#define kbasep_regs_history_debugfs_init CSTD_NOP + -+#endif /* defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_BIFROST_NO_MALI) */ ++#endif /* defined(CONFIG_DEBUG_FS) && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ + +#endif /*_KBASE_REGS_HISTORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h b/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h new file mode 100755 -index 000000000000..61bbb0b48490 +index 000000000..48ea9954b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h -@@ -0,0 +1,129 @@ +@@ -0,0 +1,277 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -235918,16 +273869,144 @@ index 000000000000..61bbb0b48490 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_RESET_GPU_H_ +#define _KBASE_RESET_GPU_H_ + +/** ++ * kbase_reset_gpu_prevent_and_wait - Prevent GPU resets from starting whilst ++ * the current thread is accessing the GPU, ++ * and wait for any in-flight reset to ++ * finish. ++ * @kbdev: Device pointer ++ * ++ * This should be used when a potential access to the HW is going to be made ++ * from a non-atomic context. ++ * ++ * It will wait for any in-flight reset to finish before returning. Hence, ++ * correct lock ordering must be observed with respect to the calling thread ++ * and the reset worker thread. ++ * ++ * This does not synchronize general access to the HW, and so multiple threads ++ * can prevent GPU reset concurrently, whilst not being serialized. This is ++ * advantageous as the threads can make this call at points where they do not ++ * know for sure yet whether they will indeed access the GPU (for example, to ++ * respect lock ordering), without unnecessarily blocking others. ++ * ++ * Threads must still use other synchronization to ensure they access the HW ++ * consistently, at a point where they are certain it needs to be accessed. ++ * ++ * On success, ensure that when access to the GPU by the caller thread has ++ * finished, that it calls kbase_reset_gpu_allow() again to allow resets to ++ * happen. ++ * ++ * This may return a failure in cases such as a previous failure to reset the ++ * GPU within a reasonable time. If that happens, the GPU might be ++ * non-operational and the caller should not attempt any further access. ++ * ++ * Note: ++ * For atomic context, instead check kbase_reset_gpu_is_active(). ++ * ++ * Return: 0 on success, or negative error code on failure. ++ */ ++int kbase_reset_gpu_prevent_and_wait(struct kbase_device *kbdev); ++ ++/** ++ * kbase_reset_gpu_try_prevent - Attempt to prevent GPU resets from starting ++ * whilst the current thread is accessing the ++ * GPU, unless a reset is already in progress. ++ * @kbdev: Device pointer ++ * ++ * Similar to kbase_reset_gpu_prevent_and_wait(), but it does not wait for an ++ * existing reset to complete. This can be used on codepaths that the Reset ++ * worker waits on, where use of kbase_reset_gpu_prevent_and_wait() would ++ * otherwise deadlock. ++ * ++ * Instead, a reset that is currently happening will cause this function to ++ * return an error code indicating that, and further resets will not have been ++ * prevented. ++ * ++ * In such cases, the caller must check for -EAGAIN, and take similar actions ++ * as for handling reset in atomic context. That is, they must cancel any ++ * actions that depended on reset being prevented, possibly deferring them ++ * until after the reset. ++ * ++ * Otherwise a successful return means that the caller can continue its actions ++ * safely in the knowledge that reset is prevented, and the reset worker will ++ * correctly wait instead of deadlocking against this thread. ++ * ++ * On success, ensure that when access to the GPU by the caller thread has ++ * finished, that it calls kbase_reset_gpu_allow() again to allow resets to ++ * happen. ++ * ++ * Refer to kbase_reset_gpu_prevent_and_wait() for more information. ++ * ++ * Return: 0 on success. -EAGAIN if a reset is currently happening. Other ++ * negative error codes on failure, where -ENOMEM indicates that GPU reset ++ * had failed. ++ */ ++int kbase_reset_gpu_try_prevent(struct kbase_device *kbdev); ++ ++/** ++ * kbase_reset_gpu_allow - Allow GPU resets to happen again after having been ++ * previously prevented. ++ * @kbdev: Device pointer ++ * ++ * This should be used when a potential access to the HW has finished from a ++ * non-atomic context. ++ * ++ * It must be used from the same thread that originally made a previously call ++ * to kbase_reset_gpu_prevent_and_wait(). It must not be deferred to another ++ * thread. ++ */ ++void kbase_reset_gpu_allow(struct kbase_device *kbdev); ++ ++/** ++ * kbase_reset_gpu_assert_prevented - Make debugging checks that GPU reset is ++ * currently prevented by the current ++ * thread. ++ * @kbdev: Device pointer ++ * ++ * Make debugging checks that the current thread has made a call to ++ * kbase_reset_gpu_prevent_and_wait(), but has yet to make a subsequent call to ++ * kbase_reset_gpu_allow(). ++ * ++ * CONFIG_LOCKDEP is required to prove that reset is indeed ++ * prevented. Otherwise only limited debugging checks can be made. ++ */ ++void kbase_reset_gpu_assert_prevented(struct kbase_device *kbdev); ++ ++/** ++ * kbase_reset_gpu_assert_failed_or_prevented - Make debugging checks that ++ * either GPU reset previously ++ * failed, or is currently ++ * prevented. ++ * ++ * @kbdev: Device pointer ++ * ++ * As with kbase_reset_gpu_assert_prevented(), but also allow for paths where ++ * reset was not prevented due to a failure, yet we still need to execute the ++ * cleanup code following. ++ * ++ * Cleanup code following this call must handle any inconsistent state modified ++ * by the failed GPU reset, and must timeout any blocking operations instead of ++ * waiting forever. ++ */ ++void kbase_reset_gpu_assert_failed_or_prevented(struct kbase_device *kbdev); ++ ++/** ++ * RESET_FLAGS_NONE - Flags for kbase_prepare_to_reset_gpu ++ */ ++#define RESET_FLAGS_NONE (0U) ++ ++/* This reset should be treated as an unrecoverable error by HW counter logic */ ++#define RESET_FLAGS_HWC_UNRECOVERABLE_ERROR ((unsigned int)(1 << 0)) ++ ++/** + * kbase_prepare_to_reset_gpu_locked - Prepare for resetting the GPU. + * @kbdev: Device pointer ++ * @flags: Bitfield indicating impact of reset (see flag defines) + * + * Caller is expected to hold the kbdev->hwaccess_lock. + * @@ -235936,18 +274015,20 @@ index 000000000000..61bbb0b48490 + * - false - Another thread is performing a reset, kbase_reset_gpu should + * not be called. + */ -+bool kbase_prepare_to_reset_gpu_locked(struct kbase_device *kbdev); ++bool kbase_prepare_to_reset_gpu_locked(struct kbase_device *kbdev, ++ unsigned int flags); + +/** + * kbase_prepare_to_reset_gpu - Prepare for resetting the GPU. + * @kbdev: Device pointer ++ * @flags: Bitfield indicating impact of reset (see flag defines) + * + * Return: a boolean which should be interpreted as follows: + * - true - Prepared for reset, kbase_reset_gpu should be called. + * - false - Another thread is performing a reset, kbase_reset_gpu should + * not be called. + */ -+bool kbase_prepare_to_reset_gpu(struct kbase_device *kbdev); ++bool kbase_prepare_to_reset_gpu(struct kbase_device *kbdev, unsigned int flags); + +/** + * kbase_reset_gpu - Reset the GPU @@ -235997,12 +274078,29 @@ index 000000000000..61bbb0b48490 + * kbase_reset_gpu_is_active - Reports if the GPU is being reset + * @kbdev: Device pointer + * -+ * Return: True if the GPU is in the process of being reset (or if the reset of -+ * GPU failed, not applicable to Job Manager GPUs). ++ * Any changes made to the HW when this returns true may be lost, overwritten ++ * or corrupted. ++ * ++ * Note that unless appropriate locks are held when using this function, the ++ * state could change immediately afterwards. ++ * ++ * Return: True if the GPU is in the process of being reset. + */ +bool kbase_reset_gpu_is_active(struct kbase_device *kbdev); + +/** ++ * kbase_reset_gpu_not_pending - Reports if the GPU reset isn't pending ++ * ++ * @kbdev: Device pointer ++ * ++ * Note that unless appropriate locks are held when using this function, the ++ * state could change immediately afterwards. ++ * ++ * Return: True if the GPU reset isn't pending. ++ */ ++bool kbase_reset_gpu_is_not_pending(struct kbase_device *kbdev); ++ ++/** + * kbase_reset_gpu_wait - Wait for a GPU reset to complete + * @kbdev: Device pointer + * @@ -236031,18 +274129,19 @@ index 000000000000..61bbb0b48490 +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_smc.c b/drivers/gpu/arm/bifrost/mali_kbase_smc.c new file mode 100755 -index 000000000000..b5c7b1289846 +index 000000000..abbe8d56d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_smc.c -@@ -0,0 +1,91 @@ +@@ -0,0 +1,90 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2015, 2018, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2015, 2018, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -236053,11 +274152,9 @@ index 000000000000..b5c7b1289846 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#ifdef CONFIG_ARM64 ++#if IS_ENABLED(CONFIG_ARM64) + +#include +#include @@ -236128,18 +274225,19 @@ index 000000000000..b5c7b1289846 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_smc.h b/drivers/gpu/arm/bifrost/mali_kbase_smc.h new file mode 100755 -index 000000000000..221eb21a8c7f +index 000000000..40a348388 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_smc.h -@@ -0,0 +1,72 @@ +@@ -0,0 +1,69 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2015 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2015, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -236150,16 +274248,12 @@ index 000000000000..221eb21a8c7f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +#ifndef _KBASE_SMC_H_ +#define _KBASE_SMC_H_ + -+#ifdef CONFIG_ARM64 ++#if IS_ENABLED(CONFIG_ARM64) + +#include + @@ -236173,31 +274267,31 @@ index 000000000000..221eb21a8c7f + + +/** -+ * kbase_invoke_smc_fid - Perform a secure monitor call -+ * @fid: The SMC function to call, see SMC Calling convention. -+ * @arg0: First argument to the SMC. -+ * @arg1: Second argument to the SMC. -+ * @arg2: Third argument to the SMC. -+ * -+ * See SMC Calling Convention for details. -+ * -+ * Return: the return value from the SMC. -+ */ ++ * kbase_invoke_smc_fid - Perform a secure monitor call ++ * @fid: The SMC function to call, see SMC Calling convention. ++ * @arg0: First argument to the SMC. ++ * @arg1: Second argument to the SMC. ++ * @arg2: Third argument to the SMC. ++ * ++ * See SMC Calling Convention for details. ++ * ++ * Return: the return value from the SMC. ++ */ +u64 kbase_invoke_smc_fid(u32 fid, u64 arg0, u64 arg1, u64 arg2); + +/** -+ * kbase_invoke_smc_fid - Perform a secure monitor call -+ * @oen: Owning Entity number (SIP, STD etc). -+ * @function_number: The function number within the OEN. -+ * @smc64: use SMC64 calling convention instead of SMC32. -+ * @arg0: First argument to the SMC. -+ * @arg1: Second argument to the SMC. -+ * @arg2: Third argument to the SMC. -+ * -+ * See SMC Calling Convention for details. -+ * -+ * Return: the return value from the SMC call. -+ */ ++ * kbase_invoke_smc - Perform a secure monitor call ++ * @oen: Owning Entity number (SIP, STD etc). ++ * @function_number: The function number within the OEN. ++ * @smc64: use SMC64 calling convention instead of SMC32. ++ * @arg0: First argument to the SMC. ++ * @arg1: Second argument to the SMC. ++ * @arg2: Third argument to the SMC. ++ * ++ * See SMC Calling Convention for details. ++ * ++ * Return: the return value from the SMC call. ++ */ +u64 kbase_invoke_smc(u32 oen, u16 function_number, bool smc64, + u64 arg0, u64 arg1, u64 arg2); + @@ -236206,18 +274300,19 @@ index 000000000000..221eb21a8c7f +#endif /* _KBASE_SMC_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c b/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c new file mode 100755 -index 000000000000..c164719b3d7b +index 000000000..a9312a0c4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c -@@ -0,0 +1,1805 @@ +@@ -0,0 +1,1770 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2011-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -236228,21 +274323,17 @@ index 000000000000..c164719b3d7b + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +#include + +#include +#include -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#if IS_ENABLED(CONFIG_SYNC_FILE) +#include +#endif +#include -+#include ++#include +#include +#include +#include @@ -236257,9 +274348,7 @@ index 000000000000..c164719b3d7b + +#if !MALI_USE_CSF +/** -+ * @file mali_kbase_softjobs.c -+ * -+ * This file implements the logic behind software only jobs that are ++ * DOC: This file implements the logic behind software only jobs that are + * executed within the driver rather than being handed over to the GPU. + */ + @@ -236290,7 +274379,7 @@ index 000000000000..c164719b3d7b + /* Record the start time of this atom so we could cancel it at + * the right time. + */ -+ katom->start_timestamp = ktime_get(); ++ katom->start_timestamp = ktime_get_raw(); + + /* Add the atom to the waiting list before the timer is + * (re)started to make sure that it gets processed. @@ -236312,7 +274401,8 @@ index 000000000000..c164719b3d7b + unsigned char *mapped_evt; + struct kbase_vmap_struct map; + -+ mapped_evt = kbase_vmap(kctx, evt, sizeof(*mapped_evt), &map); ++ mapped_evt = kbase_vmap_prot(kctx, evt, sizeof(*mapped_evt), ++ KBASE_REG_CPU_RD, &map); + if (!mapped_evt) + return -EFAULT; + @@ -236333,7 +274423,8 @@ index 000000000000..c164719b3d7b + (new_status != BASE_JD_SOFT_EVENT_RESET)) + return -EINVAL; + -+ mapped_evt = kbase_vmap(kctx, evt, sizeof(*mapped_evt), &map); ++ mapped_evt = kbase_vmap_prot(kctx, evt, sizeof(*mapped_evt), ++ KBASE_REG_CPU_WR, &map); + if (!mapped_evt) + return -EFAULT; + @@ -236350,7 +274441,7 @@ index 000000000000..c164719b3d7b + void *user_result; + struct timespec64 ts; + struct base_dump_cpu_gpu_counters data; -+ u64 system_time; ++ u64 system_time = 0ULL; + u64 cycle_counter; + u64 jc = katom->jc; + struct kbase_context *kctx = katom->kctx; @@ -236360,7 +274451,11 @@ index 000000000000..c164719b3d7b + + /* Take the PM active reference as late as possible - otherwise, it could + * delay suspend until we process the atom (which may be at the end of a -+ * long chain of dependencies */ ++ * long chain of dependencies ++ */ ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ atomic_inc(&kctx->kbdev->pm.gpu_users_waiting); ++#endif /* CONFIG_MALI_ARBITER_SUPPORT */ + pm_active_err = kbase_pm_context_active_handle_suspend(kctx->kbdev, KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE); + if (pm_active_err) { + struct kbasep_js_device_data *js_devdata = &kctx->kbdev->js_data; @@ -236378,6 +274473,10 @@ index 000000000000..c164719b3d7b + + return pm_active_err; + } ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ else ++ atomic_dec(&kctx->kbdev->pm.gpu_users_waiting); ++#endif /* CONFIG_MALI_ARBITER_SUPPORT */ + + kbase_backend_get_gpu_time(kctx->kbdev, &cycle_counter, &system_time, + &ts); @@ -236395,7 +274494,8 @@ index 000000000000..c164719b3d7b + /* GPU_WR access is checked on the range for returning the result to + * userspace for the following reasons: + * - security, this is currently how imported user bufs are checked. -+ * - userspace ddk guaranteed to assume region was mapped as GPU_WR */ ++ * - userspace ddk guaranteed to assume region was mapped as GPU_WR ++ */ + user_result = kbase_vmap_prot(kctx, jc, sizeof(data), KBASE_REG_GPU_WR, &map); + if (!user_result) + return 0; @@ -236410,7 +274510,7 @@ index 000000000000..c164719b3d7b + return 0; +} + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#if IS_ENABLED(CONFIG_SYNC_FILE) +/* Called by the explicit fence mechanism when a fence wait has completed */ +void kbase_soft_event_wait_callback(struct kbase_jd_atom *katom) +{ @@ -236419,7 +274519,7 @@ index 000000000000..c164719b3d7b + mutex_lock(&kctx->jctx.lock); + kbasep_remove_waiting_soft_job(katom); + kbase_finish_soft_job(katom); -+ if (jd_done_nolock(katom, NULL)) ++ if (kbase_jd_done_nolock(katom, true)) + kbase_js_sched_all(kctx->kbdev); + mutex_unlock(&kctx->jctx.lock); +} @@ -236433,7 +274533,7 @@ index 000000000000..c164719b3d7b + int resched; + + mutex_lock(&kctx->jctx.lock); -+ resched = jd_done_nolock(katom, NULL); ++ resched = kbase_jd_done_nolock(katom, true); + mutex_unlock(&kctx->jctx.lock); + + if (resched) @@ -236506,12 +274606,12 @@ index 000000000000..c164719b3d7b + + if (!kbase_sync_fence_in_info_get(dep, &info)) { + dev_warn(dev, -+ "\tVictim trigger atom %d fence [%p] %s: %s\n", ++ "\tVictim trigger atom %d fence [%pK] %s: %s\n", + kbase_jd_atom_id(kctx, dep), + info.fence, + info.name, + kbase_sync_status_string(info.status)); -+ } ++ } + } + + kbase_fence_debug_check_atom(dep); @@ -236535,11 +274635,11 @@ index 000000000000..c164719b3d7b + return; + } + -+ dev_warn(dev, "ctx %d_%d: Atom %d still waiting for fence [%p] after %dms\n", ++ dev_warn(dev, "ctx %d_%d: Atom %d still waiting for fence [%pK] after %dms\n", + kctx->tgid, kctx->id, + kbase_jd_atom_id(kctx, katom), + info.fence, timeout_ms); -+ dev_warn(dev, "\tGuilty fence [%p] %s: %s\n", ++ dev_warn(dev, "\tGuilty fence [%pK] %s: %s\n", + info.fence, info.name, + kbase_sync_status_string(info.status)); + @@ -236594,7 +274694,7 @@ index 000000000000..c164719b3d7b + soft_job_timeout); + u32 timeout_ms = (u32)atomic_read( + &kctx->kbdev->js_data.soft_job_timeout_ms); -+ ktime_t cur_time = ktime_get(); ++ ktime_t cur_time = ktime_get_raw(); + bool restarting = false; + unsigned long lflags; + struct list_head *entry, *tmp; @@ -236704,10 +274804,11 @@ index 000000000000..c164719b3d7b +static void kbasep_soft_event_cancel_job(struct kbase_jd_atom *katom) +{ + katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ if (jd_done_nolock(katom, NULL)) ++ if (kbase_jd_done_nolock(katom, true)) + kbase_js_sched_all(katom->kctx->kbdev); +} + ++#if IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST +static void kbase_debug_copy_finish(struct kbase_jd_atom *katom) +{ + struct kbase_debug_copy_buffer *buffers = katom->softjob_data; @@ -236879,8 +274980,8 @@ index 000000000000..c164719b3d7b + case KBASE_MEM_TYPE_IMPORTED_USER_BUF: + { + struct kbase_mem_phy_alloc *alloc = reg->gpu_alloc; -+ unsigned long nr_pages = -+ alloc->imported.user_buf.nr_pages; ++ const unsigned long nr_pages = alloc->imported.user_buf.nr_pages; ++ const unsigned long start = alloc->imported.user_buf.address; + + if (alloc->imported.user_buf.mm != current->mm) { + ret = -EINVAL; @@ -236892,11 +274993,9 @@ index 000000000000..c164719b3d7b + ret = -ENOMEM; + goto out_unlock; + } -+ -+ ret = get_user_pages_fast( -+ alloc->imported.user_buf.address, -+ nr_pages, 0, -+ buffers[i].extres_pages); ++ kbase_gpu_vm_unlock(katom->kctx); ++ ret = get_user_pages_fast(start, nr_pages, 0, buffers[i].extres_pages); ++ kbase_gpu_vm_lock(katom->kctx); + if (ret != nr_pages) { + /* Adjust number of pages, so that we only + * attempt to release pages in the array that we @@ -236927,15 +275026,15 @@ index 000000000000..c164719b3d7b + +out_cleanup: + /* Frees allocated memory for kbase_debug_copy_job struct, including -+ * members, and sets jc to 0 */ ++ * members, and sets jc to 0 ++ */ + kbase_debug_copy_finish(katom); + kfree(user_buffers); + + return ret; +} -+#endif /* !MALI_USE_CSF */ + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE +static void *dma_buf_kmap_page(struct kbase_mem_phy_alloc *gpu_alloc, + unsigned long page_num, struct page **page) +{ @@ -236965,8 +275064,18 @@ index 000000000000..c164719b3d7b +} +#endif + -+int kbase_mem_copy_from_extres(struct kbase_context *kctx, -+ struct kbase_debug_copy_buffer *buf_data) ++/** ++ * kbase_mem_copy_from_extres() - Copy from external resources. ++ * ++ * @kctx: kbase context within which the copying is to take place. ++ * @buf_data: Pointer to the information about external resources: ++ * pages pertaining to the external resource, number of ++ * pages to copy. ++ * ++ * Return: 0 on success, error code otherwise. ++ */ ++static int kbase_mem_copy_from_extres(struct kbase_context *kctx, ++ struct kbase_debug_copy_buffer *buf_data) +{ + unsigned int i; + unsigned int target_page_nr = 0; @@ -237015,17 +275124,13 @@ index 000000000000..c164719b3d7b + + dma_to_copy = min(dma_buf->size, + (size_t)(buf_data->nr_extres_pages * PAGE_SIZE)); -+ ret = dma_buf_begin_cpu_access(dma_buf, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) && !defined(CONFIG_CHROMEOS) -+ 0, dma_to_copy, -+#endif -+ DMA_FROM_DEVICE); ++ ret = dma_buf_begin_cpu_access(dma_buf, DMA_FROM_DEVICE); + if (ret) + goto out_unlock; + + for (i = 0; i < dma_to_copy/PAGE_SIZE && + target_page_nr < buf_data->nr_pages; i++) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE + struct page *pg; + void *extres_page = dma_buf_kmap_page(gpu_alloc, i, &pg); +#else @@ -237037,20 +275142,16 @@ index 000000000000..c164719b3d7b + buf_data->nr_pages, + &target_page_nr, offset); + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE + kunmap(pg); +#else + dma_buf_kunmap(dma_buf, i, extres_page); +#endif + if (ret) -+ goto out_unlock; ++ break; + } + } -+ dma_buf_end_cpu_access(dma_buf, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) && !defined(CONFIG_CHROMEOS) -+ 0, dma_to_copy, -+#endif -+ DMA_FROM_DEVICE); ++ dma_buf_end_cpu_access(dma_buf, DMA_FROM_DEVICE); + break; + } + default: @@ -237061,7 +275162,6 @@ index 000000000000..c164719b3d7b + return ret; +} + -+#if !MALI_USE_CSF +static int kbase_debug_copy(struct kbase_jd_atom *katom) +{ + struct kbase_debug_copy_buffer *buffers = katom->softjob_data; @@ -237079,6 +275179,7 @@ index 000000000000..c164719b3d7b + + return 0; +} ++#endif /* IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST */ +#endif /* !MALI_USE_CSF */ + +#define KBASEP_JIT_ALLOC_GPU_ADDR_ALIGNMENT ((u32)0x7) @@ -237138,31 +275239,6 @@ index 000000000000..c164719b3d7b + +#if !MALI_USE_CSF + -+#if (KERNEL_VERSION(3, 18, 63) > LINUX_VERSION_CODE) -+#define offsetofend(TYPE, MEMBER) \ -+ (offsetof(TYPE, MEMBER) + sizeof(((TYPE *)0)->MEMBER)) -+#endif -+ -+/* -+ * Sizes of user data to copy for each just-in-time memory interface version -+ * -+ * In interface version 2 onwards this is the same as the struct size, allowing -+ * copying of arrays of structures from userspace. -+ * -+ * In interface version 1 the structure size was variable, and hence arrays of -+ * structures cannot be supported easily, and were not a feature present in -+ * version 1 anyway. -+ */ -+static const size_t jit_info_copy_size_for_jit_version[] = { -+ /* in jit_version 1, the structure did not have any end padding, hence -+ * it could be a different size on 32 and 64-bit clients. We therefore -+ * do not copy past the last member -+ */ -+ [1] = offsetofend(struct base_jit_alloc_info_10_2, id), -+ [2] = sizeof(struct base_jit_alloc_info_11_5), -+ [3] = sizeof(struct base_jit_alloc_info) -+}; -+ +static int kbase_jit_allocate_prepare(struct kbase_jd_atom *katom) +{ + __user u8 *data = (__user u8 *)(uintptr_t) katom->jc; @@ -237172,18 +275248,18 @@ index 000000000000..c164719b3d7b + u32 count; + int ret; + u32 i; -+ size_t jit_info_user_copy_size; + -+ WARN_ON(kctx->jit_version >= -+ ARRAY_SIZE(jit_info_copy_size_for_jit_version)); -+ jit_info_user_copy_size = -+ jit_info_copy_size_for_jit_version[kctx->jit_version]; -+ WARN_ON(jit_info_user_copy_size > sizeof(*info)); ++ if (!kbase_mem_allow_alloc(kctx)) { ++ dev_dbg(kbdev->dev, "Invalid attempt to allocate JIT memory by %s/%d for ctx %d_%d", ++ current->comm, current->pid, kctx->tgid, kctx->id); ++ ret = -EINVAL; ++ goto fail; ++ } + + /* For backwards compatibility, and to prevent reading more than 1 jit + * info struct on jit version 1 + */ -+ if (katom->nr_extres == 0 || kctx->jit_version == 1) ++ if (katom->nr_extres == 0) + katom->nr_extres = 1; + count = katom->nr_extres; + @@ -237203,25 +275279,19 @@ index 000000000000..c164719b3d7b + + katom->softjob_data = info; + -+ for (i = 0; i < count; i++, info++, data += jit_info_user_copy_size) { -+ if (copy_from_user(info, data, jit_info_user_copy_size) != 0) { ++ for (i = 0; i < count; i++, info++, data += sizeof(*info)) { ++ if (copy_from_user(info, data, sizeof(*info)) != 0) { + ret = -EINVAL; + goto free_info; + } -+ /* Clear any remaining bytes when user struct is smaller than -+ * kernel struct. For jit version 1, this also clears the -+ * padding bytes -+ */ -+ memset(((u8 *)info) + jit_info_user_copy_size, 0, -+ sizeof(*info) - jit_info_user_copy_size); + + ret = kbasep_jit_alloc_validate(kctx, info); + if (ret) + goto free_info; -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_JITALLOCINFO(kbdev, katom, -+ info->va_pages, info->commit_pages, info->extent, -+ info->id, info->bin_id, info->max_allocations, -+ info->flags, info->usage_id); ++ KBASE_TLSTREAM_TL_ATTRIB_ATOM_JITALLOCINFO( ++ kbdev, katom, info->va_pages, info->commit_pages, ++ info->extension, info->id, info->bin_id, ++ info->max_allocations, info->flags, info->usage_id); + } + + katom->jit_blocked = false; @@ -237236,7 +275306,7 @@ index 000000000000..c164719b3d7b + * though the region is valid it doesn't represent the + * same thing it used to. + * -+ * Complete validation of va_pages, commit_pages and extent ++ * Complete validation of va_pages, commit_pages and extension + * isn't done here as it will be done during the call to + * kbase_mem_alloc. + */ @@ -237312,7 +275382,7 @@ index 000000000000..c164719b3d7b + } + +#if MALI_JIT_PRESSURE_LIMIT_BASE -+ /** ++ /* + * If this is the only JIT_ALLOC atom in-flight or if JIT pressure limit + * is disabled at the context scope, then bypass JIT pressure limit + * logic in kbase_jit_allocate(). @@ -237415,8 +275485,8 @@ index 000000000000..c164719b3d7b + * Write the address of the JIT allocation to the user provided + * GPU allocation. + */ -+ ptr = kbase_vmap(kctx, info->gpu_alloc_addr, sizeof(*ptr), -+ &mapping); ++ ptr = kbase_vmap_prot(kctx, info->gpu_alloc_addr, sizeof(*ptr), ++ KBASE_REG_CPU_WR, &mapping); + if (!ptr) { + /* + * Leave the allocations "live" as the JIT free atom @@ -237440,10 +275510,10 @@ index 000000000000..c164719b3d7b + MIDGARD_MMU_BOTTOMLEVEL, kctx->jit_group_id); +#endif + -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_JIT(kbdev, katom, -+ info->gpu_alloc_addr, new_addr, info->flags, -+ entry_mmu_flags, info->id, info->commit_pages, -+ info->extent, info->va_pages); ++ KBASE_TLSTREAM_TL_ATTRIB_ATOM_JIT( ++ kbdev, katom, info->gpu_alloc_addr, new_addr, ++ info->flags, entry_mmu_flags, info->id, ++ info->commit_pages, info->extension, info->va_pages); + kbase_vunmap(kctx, &mapping); + + kbase_trace_jit_report_gpu_mem(kctx, reg, @@ -237565,7 +275635,7 @@ index 000000000000..c164719b3d7b + + mutex_lock(&kctx->jctx.lock); + kbase_finish_soft_job(katom); -+ resched = jd_done_nolock(katom, NULL); ++ resched = kbase_jd_done_nolock(katom, true); + mutex_unlock(&kctx->jctx.lock); + + if (resched) @@ -237605,9 +275675,8 @@ index 000000000000..c164719b3d7b + lockdep_assert_held(&kctx->jctx.lock); + + ids = kbase_jit_free_get_ids(katom); -+ if (WARN_ON(ids == NULL)) { ++ if (WARN_ON(ids == NULL)) + return; -+ } + + /* Remove this atom from the jit_atoms_head list */ + list_del(&katom->jit_node); @@ -237641,41 +275710,27 @@ index 000000000000..c164719b3d7b + struct base_external_resource_list *ext_res; + u64 count = 0; + size_t copy_size; -+ int ret; + + user_ext_res = (__user struct base_external_resource_list *) + (uintptr_t) katom->jc; + + /* Fail the job if there is no info structure */ -+ if (!user_ext_res) { -+ ret = -EINVAL; -+ goto fail; -+ } ++ if (!user_ext_res) ++ return -EINVAL; + -+ if (copy_from_user(&count, &user_ext_res->count, sizeof(u64)) != 0) { -+ ret = -EINVAL; -+ goto fail; -+ } ++ if (copy_from_user(&count, &user_ext_res->count, sizeof(u64)) != 0) ++ return -EINVAL; + + /* Is the number of external resources in range? */ -+ if (!count || count > BASE_EXT_RES_COUNT_MAX) { -+ ret = -EINVAL; -+ goto fail; -+ } ++ if (!count || count > BASE_EXT_RES_COUNT_MAX) ++ return -EINVAL; + + /* Copy the information for safe access and future storage */ + copy_size = sizeof(*ext_res); + copy_size += sizeof(struct base_external_resource) * (count - 1); -+ ext_res = kzalloc(copy_size, GFP_KERNEL); -+ if (!ext_res) { -+ ret = -ENOMEM; -+ goto fail; -+ } -+ -+ if (copy_from_user(ext_res, user_ext_res, copy_size) != 0) { -+ ret = -EINVAL; -+ goto free_info; -+ } ++ ext_res = memdup_user(user_ext_res, copy_size); ++ if (IS_ERR(ext_res)) ++ return PTR_ERR(ext_res); + + /* + * Overwrite the count with the first value incase it was changed @@ -237686,11 +275741,6 @@ index 000000000000..c164719b3d7b + katom->softjob_data = ext_res; + + return 0; -+ -+free_info: -+ kfree(ext_res); -+fail: -+ return ret; +} + +static void kbase_ext_res_process(struct kbase_jd_atom *katom, bool map) @@ -237714,10 +275764,11 @@ index 000000000000..c164719b3d7b + if (!kbase_sticky_resource_acquire(katom->kctx, + gpu_addr)) + goto failed_loop; -+ } else ++ } else { + if (!kbase_sticky_resource_release_force(katom->kctx, NULL, + gpu_addr)) + failed = true; ++ } + } + + /* @@ -237777,7 +275828,7 @@ index 000000000000..c164719b3d7b + ret = kbase_dump_cpu_gpu_time(katom); + break; + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#if IS_ENABLED(CONFIG_SYNC_FILE) + case BASE_JD_REQ_SOFT_FENCE_TRIGGER: + katom->event_code = kbase_sync_fence_out_trigger(katom, + katom->event_code == BASE_JD_EVENT_DONE ? @@ -237806,6 +275857,7 @@ index 000000000000..c164719b3d7b + case BASE_JD_REQ_SOFT_EVENT_RESET: + kbasep_soft_event_update_locked(katom, BASE_JD_SOFT_EVENT_RESET); + break; ++#if IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST + case BASE_JD_REQ_SOFT_DEBUG_COPY: + { + int res = kbase_debug_copy(katom); @@ -237814,6 +275866,7 @@ index 000000000000..c164719b3d7b + katom->event_code = BASE_JD_EVENT_JOB_INVALID; + break; + } ++#endif /* IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST */ + case BASE_JD_REQ_SOFT_JIT_ALLOC: + ret = kbase_jit_allocate_process(katom); + break; @@ -237837,7 +275890,7 @@ index 000000000000..c164719b3d7b +void kbase_cancel_soft_job(struct kbase_jd_atom *katom) +{ + switch (katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#if IS_ENABLED(CONFIG_SYNC_FILE) + case BASE_JD_REQ_SOFT_FENCE_WAIT: + kbase_sync_fence_in_cancel_wait(katom); + break; @@ -237860,13 +275913,15 @@ index 000000000000..c164719b3d7b + return -EINVAL; + } + break; -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#if IS_ENABLED(CONFIG_SYNC_FILE) + case BASE_JD_REQ_SOFT_FENCE_TRIGGER: + { + struct base_fence fence; + int fd; + -+ if (0 != copy_from_user(&fence, (__user void *)(uintptr_t) katom->jc, sizeof(fence))) ++ if (copy_from_user(&fence, ++ (__user void *)(uintptr_t)katom->jc, ++ sizeof(fence)) != 0) + return -EINVAL; + + fd = kbase_sync_fence_out_create(katom, @@ -237875,9 +275930,15 @@ index 000000000000..c164719b3d7b + return -EINVAL; + + fence.basep.fd = fd; -+ if (0 != copy_to_user((__user void *)(uintptr_t) katom->jc, &fence, sizeof(fence))) { ++ if (copy_to_user((__user void *)(uintptr_t)katom->jc, ++ &fence, sizeof(fence)) != 0) { + kbase_sync_fence_out_remove(katom); -+ kbase_sync_fence_close_fd(fd); ++ /* fd should have been closed here, but there's ++ * no good way of doing that. Since ++ * copy_to_user() very rarely fails, and the fd ++ * will get closed on process termination this ++ * won't be a problem. ++ */ + fence.basep.fd = -EINVAL; + return -EINVAL; + } @@ -237888,7 +275949,9 @@ index 000000000000..c164719b3d7b + struct base_fence fence; + int ret; + -+ if (0 != copy_from_user(&fence, (__user void *)(uintptr_t) katom->jc, sizeof(fence))) ++ if (copy_from_user(&fence, ++ (__user void *)(uintptr_t)katom->jc, ++ sizeof(fence)) != 0) + return -EINVAL; + + /* Get a reference to the fence object */ @@ -237896,20 +275959,9 @@ index 000000000000..c164719b3d7b + fence.basep.fd); + if (ret < 0) + return ret; -+ -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ /* -+ * Set KCTX_NO_IMPLICIT_FENCE in the context the first -+ * time a soft fence wait job is observed. This will -+ * prevent the implicit dma-buf fence to conflict with -+ * the Android native sync fences. -+ */ -+ if (!kbase_ctx_flag(katom->kctx, KCTX_NO_IMPLICIT_SYNC)) -+ kbase_ctx_flag_set(katom->kctx, KCTX_NO_IMPLICIT_SYNC); -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ + } + break; -+#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ ++#endif /* CONFIG_SYNC_FILE */ + case BASE_JD_REQ_SOFT_JIT_ALLOC: + return kbase_jit_allocate_prepare(katom); + case BASE_JD_REQ_SOFT_JIT_FREE: @@ -237920,8 +275972,10 @@ index 000000000000..c164719b3d7b + if (katom->jc == 0) + return -EINVAL; + break; ++#if IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST + case BASE_JD_REQ_SOFT_DEBUG_COPY: + return kbase_debug_copy_prepare(katom); ++#endif /* IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST */ + case BASE_JD_REQ_SOFT_EXT_RES_MAP: + return kbase_ext_res_prepare(katom); + case BASE_JD_REQ_SOFT_EXT_RES_UNMAP: @@ -237942,7 +275996,7 @@ index 000000000000..c164719b3d7b + case BASE_JD_REQ_SOFT_DUMP_CPU_GPU_TIME: + /* Nothing to do */ + break; -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#if IS_ENABLED(CONFIG_SYNC_FILE) + case BASE_JD_REQ_SOFT_FENCE_TRIGGER: + /* If fence has not yet been signaled, do it now */ + kbase_sync_fence_out_trigger(katom, katom->event_code == @@ -237952,10 +276006,12 @@ index 000000000000..c164719b3d7b + /* Release katom's reference to fence object */ + kbase_sync_fence_in_remove(katom); + break; -+#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ ++#endif /* CONFIG_SYNC_FILE */ ++#if IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST + case BASE_JD_REQ_SOFT_DEBUG_COPY: + kbase_debug_copy_finish(katom); + break; ++#endif /* IS_ENABLED(CONFIG_MALI_VECTOR_DUMP) || MALI_UNIT_TEST */ + case BASE_JD_REQ_SOFT_JIT_ALLOC: + kbase_jit_allocate_finish(katom); + break; @@ -238006,7 +276062,10 @@ index 000000000000..c164719b3d7b + + if (kbase_process_soft_job(katom_iter) == 0) { + kbase_finish_soft_job(katom_iter); -+ resched |= jd_done_nolock(katom_iter, NULL); ++ resched |= kbase_jd_done_nolock(katom_iter, true); ++#ifdef CONFIG_MALI_ARBITER_SUPPORT ++ atomic_dec(&kbdev->pm.gpu_users_waiting); ++#endif /* CONFIG_MALI_ARBITER_SUPPORT */ + } + mutex_unlock(&kctx->jctx.lock); + } @@ -238017,18 +276076,19 @@ index 000000000000..c164719b3d7b +#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_strings.c b/drivers/gpu/arm/bifrost/mali_kbase_strings.c new file mode 100755 -index 000000000000..22caa4a6d814 +index 000000000..84784be6f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_strings.c @@ -0,0 +1,28 @@ -+ /* ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* + * -+ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2016, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -238039,9 +276099,8 @@ index 000000000000..22caa4a6d814 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ ++ +#include "mali_kbase_strings.h" + +#define KBASE_DRV_NAME "mali" @@ -238051,18 +276110,19 @@ index 000000000000..22caa4a6d814 +const char kbase_timeline_name[] = KBASE_TIMELINE_NAME; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_strings.h b/drivers/gpu/arm/bifrost/mali_kbase_strings.h new file mode 100755 -index 000000000000..d2f1825314fe +index 000000000..c3f94f926 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_strings.h -@@ -0,0 +1,24 @@ +@@ -0,0 +1,23 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2016, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -238073,26 +276133,25 @@ index 000000000000..d2f1825314fe + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +extern const char kbase_drv_name[]; +extern const char kbase_timeline_name[]; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync.h b/drivers/gpu/arm/bifrost/mali_kbase_sync.h new file mode 100755 -index 000000000000..4e5ab3ca557a +index 000000000..3d2053bee --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync.h -@@ -0,0 +1,231 @@ +@@ -0,0 +1,216 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2012-2016, 2018-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2016, 2018-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -238103,14 +276162,10 @@ index 000000000000..4e5ab3ca557a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** -+ * @file mali_kbase_sync.h -+ * -+ * This file contains our internal "API" for explicit fences. ++ * DOC: This file contains our internal "API" for explicit fences. + * It hides the implementation details of the actual explicit fence mechanism + * used (Android fences or sync file with DMA fences). + */ @@ -238118,11 +276173,9 @@ index 000000000000..4e5ab3ca557a +#ifndef MALI_KBASE_SYNC_H +#define MALI_KBASE_SYNC_H + ++#include +#include -+#ifdef CONFIG_SYNC -+#include -+#endif -+#ifdef CONFIG_SYNC_FILE ++#if IS_ENABLED(CONFIG_SYNC_FILE) +#include "mali_kbase_fence_defs.h" +#include +#endif @@ -238155,41 +276208,43 @@ index 000000000000..4e5ab3ca557a + * - dup to add a ref + * - close to remove a ref + * -+ * return: 0 on success, < 0 on error ++ * Return: 0 on success, < 0 on error + */ +int kbase_sync_fence_stream_create(const char *name, int *const out_fd); + +#if !MALI_USE_CSF +/** -+ * kbase_sync_fence_out_create Create an explicit output fence to specified atom ++ * kbase_sync_fence_out_create - Create an explicit output fence to specified atom ++ * + * @katom: Atom to assign the new explicit fence to + * @stream_fd: File descriptor for stream object to create fence on + * -+ * return: Valid file descriptor to fence or < 0 on error ++ * Return: Valid file descriptor to fence or < 0 on error + */ +int kbase_sync_fence_out_create(struct kbase_jd_atom *katom, int stream_fd); + +/** -+ * kbase_sync_fence_in_from_fd() Assigns an existing fence to specified atom ++ * kbase_sync_fence_in_from_fd() - Assigns an existing fence to specified atom + * @katom: Atom to assign the existing explicit fence to + * @fd: File descriptor to an existing fence + * + * Assigns an explicit input fence to atom. + * This can later be waited for by calling @kbase_sync_fence_in_wait + * -+ * return: 0 on success, < 0 on error ++ * Return: 0 on success, < 0 on error + */ +int kbase_sync_fence_in_from_fd(struct kbase_jd_atom *katom, int fd); +#endif /* !MALI_USE_CSF */ + +/** + * kbase_sync_fence_validate() - Validate a fd to be a valid fence ++ * + * @fd: File descriptor to check + * + * This function is only usable to catch unintentional user errors early, + * it does not stop malicious code changing the fd after this function returns. + * -+ * return 0: if fd is for a valid fence, < 0 if invalid ++ * Return: 0 if fd is for a valid fence, < 0 if invalid + */ +int kbase_sync_fence_validate(int fd); + @@ -238201,7 +276256,7 @@ index 000000000000..4e5ab3ca557a + * + * Signal output fence attached on katom and remove the fence from the atom. + * -+ * return: The "next" event code for atom, typically JOB_CANCELLED or EVENT_DONE ++ * Return: The "next" event code for atom, typically JOB_CANCELLED or EVENT_DONE + */ +enum base_jd_event_code +kbase_sync_fence_out_trigger(struct kbase_jd_atom *katom, int result); @@ -238216,7 +276271,7 @@ index 000000000000..4e5ab3ca557a + * If the fence isn't already signaled, then this kbase_sync framework will + * take responsibility to continue the processing once the fence is signaled. + * -+ * return: 0 if already signaled, otherwise 1 ++ * Return: 0 if already signaled, otherwise 1 + */ +int kbase_sync_fence_in_wait(struct kbase_jd_atom *katom); + @@ -238246,26 +276301,13 @@ index 000000000000..4e5ab3ca557a +void kbase_sync_fence_out_remove(struct kbase_jd_atom *katom); +#endif /* !MALI_USE_CSF */ + -+/** -+ * kbase_sync_fence_close_fd() - Close a file descriptor representing a fence -+ * @fd: File descriptor to close -+ */ -+static inline void kbase_sync_fence_close_fd(int fd) -+{ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0) -+ ksys_close(fd); -+#else -+ sys_close(fd); -+#endif -+} -+ +#if !MALI_USE_CSF +/** + * kbase_sync_fence_in_info_get() - Retrieves information about input fence + * @katom: Atom to get fence information from + * @info: Struct to be filled with fence information + * -+ * return: 0 on success, < 0 on error ++ * Return: 0 on success, < 0 on error + */ +int kbase_sync_fence_in_info_get(struct kbase_jd_atom *katom, + struct kbase_sync_fence_info *info); @@ -238275,13 +276317,13 @@ index 000000000000..4e5ab3ca557a + * @katom: Atom to get fence information from + * @info: Struct to be filled with fence information + * -+ * return: 0 on success, < 0 on error ++ * Return: 0 on success, < 0 on error + */ +int kbase_sync_fence_out_info_get(struct kbase_jd_atom *katom, + struct kbase_sync_fence_info *info); +#endif /* !MALI_USE_CSF */ + -+#if defined(CONFIG_SYNC_FILE) ++#if IS_ENABLED(CONFIG_SYNC_FILE) +#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) +void kbase_sync_fence_info_get(struct fence *fence, + struct kbase_sync_fence_info *info); @@ -238295,7 +276337,7 @@ index 000000000000..4e5ab3ca557a + * kbase_sync_status_string() - Get string matching @status + * @status: Value of fence status. + * -+ * return: Pointer to string describing @status. ++ * Return: Pointer to string describing @status. + */ +const char *kbase_sync_status_string(int status); + @@ -238308,7 +276350,8 @@ index 000000000000..4e5ab3ca557a + +#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG +/** -+ * kbase_sync_fence_in_dump() Trigger a debug dump of atoms input fence state ++ * kbase_sync_fence_in_dump() - Trigger a debug dump of atoms input fence state ++ * + * @katom: Atom to trigger fence debug dump for + */ +void kbase_sync_fence_in_dump(struct kbase_jd_atom *katom); @@ -238316,568 +276359,21 @@ index 000000000000..4e5ab3ca557a +#endif /* !MALI_USE_CSF */ + +#endif /* MALI_KBASE_SYNC_H */ -diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync_android.c b/drivers/gpu/arm/bifrost/mali_kbase_sync_android.c -new file mode 100755 -index 000000000000..41f740a7bc8c ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_android.c -@@ -0,0 +1,542 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+/* -+ * Code for supporting explicit Android fences (CONFIG_SYNC) -+ * Known to be good for kernels 4.5 and earlier. -+ * Replaced with CONFIG_SYNC_FILE for 4.9 and later kernels -+ * (see mali_kbase_sync_file.c) -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "sync.h" -+#include -+#include -+ -+struct mali_sync_timeline { -+ struct sync_timeline timeline; -+ atomic_t counter; -+ atomic_t signaled; -+}; -+ -+struct mali_sync_pt { -+ struct sync_pt pt; -+ int order; -+ int result; -+}; -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) -+/* For backwards compatibility with kernels before 3.17. After 3.17 -+ * sync_pt_parent is included in the kernel. */ -+static inline struct sync_timeline *sync_pt_parent(struct sync_pt *pt) -+{ -+ return pt->parent; -+} -+#endif -+ -+static struct mali_sync_timeline *to_mali_sync_timeline( -+ struct sync_timeline *timeline) -+{ -+ return container_of(timeline, struct mali_sync_timeline, timeline); -+} -+ -+static struct mali_sync_pt *to_mali_sync_pt(struct sync_pt *pt) -+{ -+ return container_of(pt, struct mali_sync_pt, pt); -+} -+ -+static struct sync_pt *timeline_dup(struct sync_pt *pt) -+{ -+ struct mali_sync_pt *mpt = to_mali_sync_pt(pt); -+ struct mali_sync_pt *new_mpt; -+ struct sync_pt *new_pt = sync_pt_create(sync_pt_parent(pt), -+ sizeof(struct mali_sync_pt)); -+ -+ if (!new_pt) -+ return NULL; -+ -+ new_mpt = to_mali_sync_pt(new_pt); -+ new_mpt->order = mpt->order; -+ new_mpt->result = mpt->result; -+ -+ return new_pt; -+} -+ -+static int timeline_has_signaled(struct sync_pt *pt) -+{ -+ struct mali_sync_pt *mpt = to_mali_sync_pt(pt); -+ struct mali_sync_timeline *mtl = to_mali_sync_timeline( -+ sync_pt_parent(pt)); -+ int result = mpt->result; -+ -+ int diff = atomic_read(&mtl->signaled) - mpt->order; -+ -+ if (diff >= 0) -+ return (result < 0) ? result : 1; -+ -+ return 0; -+} -+ -+static int timeline_compare(struct sync_pt *a, struct sync_pt *b) -+{ -+ struct mali_sync_pt *ma = container_of(a, struct mali_sync_pt, pt); -+ struct mali_sync_pt *mb = container_of(b, struct mali_sync_pt, pt); -+ -+ int diff = ma->order - mb->order; -+ -+ if (diff == 0) -+ return 0; -+ -+ return (diff < 0) ? -1 : 1; -+} -+ -+static void timeline_value_str(struct sync_timeline *timeline, char *str, -+ int size) -+{ -+ struct mali_sync_timeline *mtl = to_mali_sync_timeline(timeline); -+ -+ snprintf(str, size, "%d", atomic_read(&mtl->signaled)); -+} -+ -+static void pt_value_str(struct sync_pt *pt, char *str, int size) -+{ -+ struct mali_sync_pt *mpt = to_mali_sync_pt(pt); -+ -+ snprintf(str, size, "%d(%d)", mpt->order, mpt->result); -+} -+ -+static struct sync_timeline_ops mali_timeline_ops = { -+ .driver_name = "Mali", -+ .dup = timeline_dup, -+ .has_signaled = timeline_has_signaled, -+ .compare = timeline_compare, -+ .timeline_value_str = timeline_value_str, -+ .pt_value_str = pt_value_str, -+}; -+ -+/* Allocates a timeline for Mali -+ * -+ * One timeline should be allocated per API context. -+ */ -+static struct sync_timeline *mali_sync_timeline_alloc(const char *name) -+{ -+ struct sync_timeline *tl; -+ struct mali_sync_timeline *mtl; -+ -+ tl = sync_timeline_create(&mali_timeline_ops, -+ sizeof(struct mali_sync_timeline), name); -+ if (!tl) -+ return NULL; -+ -+ /* Set the counter in our private struct */ -+ mtl = to_mali_sync_timeline(tl); -+ atomic_set(&mtl->counter, 0); -+ atomic_set(&mtl->signaled, 0); -+ -+ return tl; -+} -+ -+static int kbase_stream_close(struct inode *inode, struct file *file) -+{ -+ struct sync_timeline *tl; -+ -+ tl = (struct sync_timeline *)file->private_data; -+ sync_timeline_destroy(tl); -+ return 0; -+} -+ -+static const struct file_operations stream_fops = { -+ .owner = THIS_MODULE, -+ .release = kbase_stream_close, -+}; -+ -+int kbase_sync_fence_stream_create(const char *name, int *const out_fd) -+{ -+ struct sync_timeline *tl; -+ -+ if (!out_fd) -+ return -EINVAL; -+ -+ tl = mali_sync_timeline_alloc(name); -+ if (!tl) -+ return -EINVAL; -+ -+ *out_fd = anon_inode_getfd(name, &stream_fops, tl, O_RDONLY|O_CLOEXEC); -+ -+ if (*out_fd < 0) { -+ sync_timeline_destroy(tl); -+ return -EINVAL; -+ } -+ -+ return 0; -+} -+ -+/* Allocates a sync point within the timeline. -+ * -+ * The timeline must be the one allocated by kbase_sync_timeline_alloc -+ * -+ * Sync points must be triggered in *exactly* the same order as they are -+ * allocated. -+ */ -+static struct sync_pt *kbase_sync_pt_alloc(struct sync_timeline *parent) -+{ -+ struct sync_pt *pt = sync_pt_create(parent, -+ sizeof(struct mali_sync_pt)); -+ struct mali_sync_timeline *mtl = to_mali_sync_timeline(parent); -+ struct mali_sync_pt *mpt; -+ -+ if (!pt) -+ return NULL; -+ -+ mpt = to_mali_sync_pt(pt); -+ mpt->order = atomic_inc_return(&mtl->counter); -+ mpt->result = 0; -+ -+ return pt; -+} -+ -+int kbase_sync_fence_out_create(struct kbase_jd_atom *katom, int tl_fd) -+{ -+ struct sync_timeline *tl; -+ struct sync_pt *pt; -+ struct sync_fence *fence; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0) -+ struct files_struct *files; -+ struct fdtable *fdt; -+#endif -+ int fd; -+ struct file *tl_file; -+ -+ tl_file = fget(tl_fd); -+ if (tl_file == NULL) -+ return -EBADF; -+ -+ if (tl_file->f_op != &stream_fops) { -+ fd = -EBADF; -+ goto out; -+ } -+ -+ tl = tl_file->private_data; -+ -+ pt = kbase_sync_pt_alloc(tl); -+ if (!pt) { -+ fd = -EFAULT; -+ goto out; -+ } -+ -+ fence = sync_fence_create("mali_fence", pt); -+ if (!fence) { -+ sync_pt_free(pt); -+ fd = -EFAULT; -+ goto out; -+ } -+ -+ /* from here the fence owns the sync_pt */ -+ -+ /* create a fd representing the fence */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) -+ fd = get_unused_fd_flags(O_RDWR | O_CLOEXEC); -+ if (fd < 0) { -+ sync_fence_put(fence); -+ goto out; -+ } -+#else -+ fd = get_unused_fd(); -+ if (fd < 0) { -+ sync_fence_put(fence); -+ goto out; -+ } -+ -+ files = current->files; -+ spin_lock(&files->file_lock); -+ fdt = files_fdtable(files); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) -+ __set_close_on_exec(fd, fdt); -+#else -+ FD_SET(fd, fdt->close_on_exec); -+#endif -+ spin_unlock(&files->file_lock); -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) */ -+ -+ /* bind fence to the new fd */ -+ sync_fence_install(fence, fd); -+ -+ katom->fence = sync_fence_fdget(fd); -+ if (katom->fence == NULL) { -+ /* The only way the fence can be NULL is if userspace closed it -+ * for us, so we don't need to clear it up */ -+ fd = -EINVAL; -+ goto out; -+ } -+ -+out: -+ fput(tl_file); -+ -+ return fd; -+} -+ -+int kbase_sync_fence_in_from_fd(struct kbase_jd_atom *katom, int fd) -+{ -+ katom->fence = sync_fence_fdget(fd); -+ return katom->fence ? 0 : -ENOENT; -+} -+ -+int kbase_sync_fence_validate(int fd) -+{ -+ struct sync_fence *fence; -+ -+ fence = sync_fence_fdget(fd); -+ if (!fence) -+ return -EINVAL; -+ -+ sync_fence_put(fence); -+ return 0; -+} -+ -+/* Returns true if the specified timeline is allocated by Mali */ -+static int kbase_sync_timeline_is_ours(struct sync_timeline *timeline) -+{ -+ return timeline->ops == &mali_timeline_ops; -+} -+ -+/* Signals a particular sync point -+ * -+ * Sync points must be triggered in *exactly* the same order as they are -+ * allocated. -+ * -+ * If they are signaled in the wrong order then a message will be printed in -+ * debug builds and otherwise attempts to signal order sync_pts will be ignored. -+ * -+ * result can be negative to indicate error, any other value is interpreted as -+ * success. -+ */ -+static void kbase_sync_signal_pt(struct sync_pt *pt, int result) -+{ -+ struct mali_sync_pt *mpt = to_mali_sync_pt(pt); -+ struct mali_sync_timeline *mtl = to_mali_sync_timeline( -+ sync_pt_parent(pt)); -+ int signaled; -+ int diff; -+ -+ mpt->result = result; -+ -+ do { -+ signaled = atomic_read(&mtl->signaled); -+ -+ diff = signaled - mpt->order; -+ -+ if (diff > 0) { -+ /* The timeline is already at or ahead of this point. -+ * This should not happen unless userspace has been -+ * signaling fences out of order, so warn but don't -+ * violate the sync_pt API. -+ * The warning is only in debug builds to prevent -+ * a malicious user being able to spam dmesg. -+ */ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ pr_err("Fences were triggered in a different order to allocation!"); -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+ return; -+ } -+ } while (atomic_cmpxchg(&mtl->signaled, -+ signaled, mpt->order) != signaled); -+} -+ -+enum base_jd_event_code -+kbase_sync_fence_out_trigger(struct kbase_jd_atom *katom, int result) -+{ -+ struct sync_pt *pt; -+ struct sync_timeline *timeline; -+ -+ if (!katom->fence) -+ return BASE_JD_EVENT_JOB_CANCELLED; -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) -+ if (!list_is_singular(&katom->fence->pt_list_head)) { -+#else -+ if (katom->fence->num_fences != 1) { -+#endif -+ /* Not exactly one item in the list - so it didn't (directly) -+ * come from us */ -+ return BASE_JD_EVENT_JOB_CANCELLED; -+ } -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) -+ pt = list_first_entry(&katom->fence->pt_list_head, -+ struct sync_pt, pt_list); -+#else -+ pt = container_of(katom->fence->cbs[0].sync_pt, struct sync_pt, base); -+#endif -+ timeline = sync_pt_parent(pt); -+ -+ if (!kbase_sync_timeline_is_ours(timeline)) { -+ /* Fence has a sync_pt which isn't ours! */ -+ return BASE_JD_EVENT_JOB_CANCELLED; -+ } -+ -+ kbase_sync_signal_pt(pt, result); -+ -+ sync_timeline_signal(timeline); -+ -+ kbase_sync_fence_out_remove(katom); -+ -+ return (result < 0) ? BASE_JD_EVENT_JOB_CANCELLED : BASE_JD_EVENT_DONE; -+} -+ -+static inline int kbase_fence_get_status(struct sync_fence *fence) -+{ -+ if (!fence) -+ return -ENOENT; -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) -+ return fence->status; -+#else -+ return atomic_read(&fence->status); -+#endif -+} -+ -+static void kbase_fence_wait_callback(struct sync_fence *fence, -+ struct sync_fence_waiter *waiter) -+{ -+ struct kbase_jd_atom *katom = container_of(waiter, -+ struct kbase_jd_atom, sync_waiter); -+ struct kbase_context *kctx = katom->kctx; -+ -+ /* Propagate the fence status to the atom. -+ * If negative then cancel this atom and its dependencies. -+ */ -+ if (kbase_fence_get_status(fence) < 0) -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ -+ /* To prevent a potential deadlock we schedule the work onto the -+ * job_done_wq workqueue -+ * -+ * The issue is that we may signal the timeline while holding -+ * kctx->jctx.lock and the callbacks are run synchronously from -+ * sync_timeline_signal. So we simply defer the work. -+ */ -+ -+ INIT_WORK(&katom->work, kbase_sync_fence_wait_worker); -+ queue_work(kctx->jctx.job_done_wq, &katom->work); -+} -+ -+int kbase_sync_fence_in_wait(struct kbase_jd_atom *katom) -+{ -+ int ret; -+ -+ sync_fence_waiter_init(&katom->sync_waiter, kbase_fence_wait_callback); -+ -+ ret = sync_fence_wait_async(katom->fence, &katom->sync_waiter); -+ -+ if (ret == 1) { -+ /* Already signaled */ -+ return 0; -+ } -+ -+ if (ret < 0) { -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ /* We should cause the dependent jobs in the bag to be failed, -+ * to do this we schedule the work queue to complete this job */ -+ INIT_WORK(&katom->work, kbase_sync_fence_wait_worker); -+ queue_work(katom->kctx->jctx.job_done_wq, &katom->work); -+ } -+ -+ return 1; -+} -+ -+void kbase_sync_fence_in_cancel_wait(struct kbase_jd_atom *katom) -+{ -+ if (sync_fence_cancel_async(katom->fence, &katom->sync_waiter) != 0) { -+ /* The wait wasn't cancelled - leave the cleanup for -+ * kbase_fence_wait_callback */ -+ return; -+ } -+ -+ /* Wait was cancelled - zap the atoms */ -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ -+ kbasep_remove_waiting_soft_job(katom); -+ kbase_finish_soft_job(katom); -+ -+ if (jd_done_nolock(katom, NULL)) -+ kbase_js_sched_all(katom->kctx->kbdev); -+} -+ -+void kbase_sync_fence_out_remove(struct kbase_jd_atom *katom) -+{ -+ if (katom->fence) { -+ sync_fence_put(katom->fence); -+ katom->fence = NULL; -+ } -+} -+ -+void kbase_sync_fence_in_remove(struct kbase_jd_atom *katom) -+{ -+ if (katom->fence) { -+ sync_fence_put(katom->fence); -+ katom->fence = NULL; -+ } -+} -+ -+int kbase_sync_fence_in_info_get(struct kbase_jd_atom *katom, -+ struct kbase_sync_fence_info *info) -+{ -+ if (!katom->fence) -+ return -ENOENT; -+ -+ info->fence = katom->fence; -+ info->status = kbase_fence_get_status(katom->fence); -+ strlcpy(info->name, katom->fence->name, sizeof(info->name)); -+ -+ return 0; -+} -+ -+int kbase_sync_fence_out_info_get(struct kbase_jd_atom *katom, -+ struct kbase_sync_fence_info *info) -+{ -+ if (!katom->fence) -+ return -ENOENT; -+ -+ info->fence = katom->fence; -+ info->status = kbase_fence_get_status(katom->fence); -+ strlcpy(info->name, katom->fence->name, sizeof(info->name)); -+ -+ return 0; -+} -+ -+#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG -+void kbase_sync_fence_in_dump(struct kbase_jd_atom *katom) -+{ -+ /* Dump out the full state of all the Android sync fences. -+ * The function sync_dump() isn't exported to modules, so force -+ * sync_fence_wait() to time out to trigger sync_dump(). -+ */ -+ if (katom->fence) -+ sync_fence_wait(katom->fence, 1); -+} -+#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c b/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c new file mode 100755 -index 000000000000..866894bd0f94 +index 000000000..5ee7fc3ce --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c -@@ -0,0 +1,51 @@ +@@ -0,0 +1,50 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2012-2016, 2018-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2016, 2018-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -238888,12 +276384,10 @@ index 000000000000..866894bd0f94 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* -+ * @file mali_kbase_sync_common.c ++ * @file + * + * Common code for our explicit fence functionality + */ @@ -238923,18 +276417,19 @@ index 000000000000..866894bd0f94 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c b/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c new file mode 100755 -index 000000000000..271873b9fe29 +index 000000000..9360324cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c -@@ -0,0 +1,372 @@ +@@ -0,0 +1,409 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2012-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -238945,15 +276440,10 @@ index 000000000000..271873b9fe29 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* + * Code for supporting explicit Linux fences (CONFIG_SYNC_FILE) -+ * Introduced in kernel 4.9. -+ * Android explicit fences (CONFIG_SYNC) can be used for older kernels -+ * (see mali_kbase_sync_android.c) + */ + +#include @@ -238991,7 +276481,7 @@ index 000000000000..271873b9fe29 +#if !MALI_USE_CSF +int kbase_sync_fence_out_create(struct kbase_jd_atom *katom, int stream_fd) +{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) + struct fence *fence; +#else + struct dma_fence *fence; @@ -239036,16 +276526,19 @@ index 000000000000..271873b9fe29 + +int kbase_sync_fence_in_from_fd(struct kbase_jd_atom *katom, int fd) +{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) + struct fence *fence = sync_file_get_fence(fd); +#else + struct dma_fence *fence = sync_file_get_fence(fd); +#endif + ++ lockdep_assert_held(&katom->kctx->jctx.lock); ++ + if (!fence) + return -ENOENT; + + kbase_fence_fence_in_set(katom, fence); ++ katom->dma_fence.fence_cb_added = false; + + return 0; +} @@ -239053,7 +276546,7 @@ index 000000000000..271873b9fe29 + +int kbase_sync_fence_validate(int fd) +{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) + struct fence *fence = sync_file_get_fence(fd); +#else + struct dma_fence *fence = sync_file_get_fence(fd); @@ -239089,7 +276582,7 @@ index 000000000000..271873b9fe29 + return (result != 0) ? BASE_JD_EVENT_JOB_CANCELLED : BASE_JD_EVENT_DONE; +} + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) +static void kbase_fence_wait_callback(struct fence *fence, + struct fence_cb *cb) +#else @@ -239097,93 +276590,113 @@ index 000000000000..271873b9fe29 + struct dma_fence_cb *cb) +#endif +{ -+ struct kbase_fence_cb *kcb = container_of(cb, -+ struct kbase_fence_cb, -+ fence_cb); -+ struct kbase_jd_atom *katom = kcb->katom; ++ struct kbase_jd_atom *katom = container_of(cb, struct kbase_jd_atom, ++ dma_fence.fence_cb); + struct kbase_context *kctx = katom->kctx; + + /* Cancel atom if fence is erroneous */ ++ if (dma_fence_is_signaled(katom->dma_fence.fence_in) && +#if (KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE || \ + (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE && \ + KERNEL_VERSION(4, 9, 68) <= LINUX_VERSION_CODE)) -+ if (dma_fence_is_signaled(kcb->fence) && kcb->fence->error < 0) ++ katom->dma_fence.fence_in->error < 0) +#else -+ if (dma_fence_is_signaled(kcb->fence) && kcb->fence->status < 0) ++ katom->dma_fence.fence_in->status < 0) +#endif + katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; + -+ if (kbase_fence_dep_count_dec_and_test(katom)) { -+ /* We take responsibility of handling this */ -+ kbase_fence_dep_count_set(katom, -1); + -+ /* To prevent a potential deadlock we schedule the work onto the -+ * job_done_wq workqueue -+ * -+ * The issue is that we may signal the timeline while holding -+ * kctx->jctx.lock and the callbacks are run synchronously from -+ * sync_timeline_signal. So we simply defer the work. -+ */ -+ INIT_WORK(&katom->work, kbase_sync_fence_wait_worker); -+ queue_work(kctx->jctx.job_done_wq, &katom->work); -+ } ++ /* To prevent a potential deadlock we schedule the work onto the ++ * job_done_wq workqueue ++ * ++ * The issue is that we may signal the timeline while holding ++ * kctx->jctx.lock and the callbacks are run synchronously from ++ * sync_timeline_signal. So we simply defer the work. ++ */ ++ INIT_WORK(&katom->work, kbase_sync_fence_wait_worker); ++ queue_work(kctx->jctx.job_done_wq, &katom->work); +} + +int kbase_sync_fence_in_wait(struct kbase_jd_atom *katom) +{ + int err; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) + struct fence *fence; +#else + struct dma_fence *fence; +#endif + -+ fence = kbase_fence_in_get(katom); ++ lockdep_assert_held(&katom->kctx->jctx.lock); ++ ++ fence = katom->dma_fence.fence_in; + if (!fence) + return 0; /* no input fence to wait for, good to go! */ + -+ kbase_fence_dep_count_set(katom, 1); ++ err = dma_fence_add_callback(fence, &katom->dma_fence.fence_cb, ++ kbase_fence_wait_callback); ++ if (err == -ENOENT) { ++ int fence_status = dma_fence_get_status(fence); + -+ err = kbase_fence_add_callback(katom, fence, kbase_fence_wait_callback); ++ if (fence_status == 1) { ++ /* Fence is already signaled with no error. The completion ++ * for FENCE_WAIT softjob can be done right away. ++ */ ++ return 0; ++ } + -+ kbase_fence_put(fence); ++ /* Fence shouldn't be in not signaled state */ ++ if (!fence_status) { ++ struct kbase_sync_fence_info info; + -+ if (likely(!err)) { -+ /* Test if the callbacks are already triggered */ -+ if (kbase_fence_dep_count_dec_and_test(katom)) { -+ kbase_fence_free_callbacks(katom); -+ kbase_fence_dep_count_set(katom, -1); -+ return 0; /* Already signaled, good to go right now */ ++ kbase_sync_fence_in_info_get(katom, &info); ++ ++ dev_warn(katom->kctx->kbdev->dev, ++ "Unexpected status for fence %s of ctx:%d_%d atom:%d", ++ info.name, katom->kctx->tgid, katom->kctx->id, ++ kbase_jd_atom_id(katom->kctx, katom)); + } + -+ /* Callback installed, so we just need to wait for it... */ -+ } else { -+ /* Failure */ -+ kbase_fence_free_callbacks(katom); -+ kbase_fence_dep_count_set(katom, -1); ++ /* If fence is signaled with an error, then the FENCE_WAIT softjob is ++ * considered to be failed. ++ */ ++ } + ++ if (unlikely(err)) { ++ /* We should cause the dependent jobs in the bag to be failed. */ + katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; + -+ /* We should cause the dependent jobs in the bag to be failed, -+ * to do this we schedule the work queue to complete this job */ -+ -+ INIT_WORK(&katom->work, kbase_sync_fence_wait_worker); -+ queue_work(katom->kctx->jctx.job_done_wq, &katom->work); ++ /* The completion for FENCE_WAIT softjob can be done right away. */ ++ return 0; + } + -+ return 1; /* completion to be done later by callback/worker */ ++ /* Callback was successfully installed */ ++ katom->dma_fence.fence_cb_added = true; ++ ++ /* Completion to be done later by callback/worker */ ++ return 1; +} + +void kbase_sync_fence_in_cancel_wait(struct kbase_jd_atom *katom) +{ -+ if (!kbase_fence_free_callbacks(katom)) { -+ /* The wait wasn't cancelled - -+ * leave the cleanup for kbase_fence_wait_callback */ -+ return; -+ } ++ lockdep_assert_held(&katom->kctx->jctx.lock); + -+ /* Take responsibility of completion */ -+ kbase_fence_dep_count_set(katom, -1); ++ if (katom->dma_fence.fence_cb_added) { ++ if (!dma_fence_remove_callback(katom->dma_fence.fence_in, ++ &katom->dma_fence.fence_cb)) { ++ /* The callback is already removed so leave the cleanup ++ * for kbase_fence_wait_callback. ++ */ ++ return; ++ } ++ } else { ++ struct kbase_sync_fence_info info; ++ ++ kbase_sync_fence_in_info_get(katom, &info); ++ dev_warn(katom->kctx->kbdev->dev, ++ "Callback was not added earlier for fence %s of ctx:%d_%d atom:%d", ++ info.name, katom->kctx->tgid, katom->kctx->id, ++ kbase_jd_atom_id(katom->kctx, katom)); ++ } + + /* Wait was cancelled - zap the atoms */ + katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; @@ -239191,7 +276704,7 @@ index 000000000000..271873b9fe29 + kbasep_remove_waiting_soft_job(katom); + kbase_finish_soft_job(katom); + -+ if (jd_done_nolock(katom, NULL)) ++ if (kbase_jd_done_nolock(katom, true)) + kbase_js_sched_all(katom->kctx->kbdev); +} + @@ -239202,8 +276715,29 @@ index 000000000000..271873b9fe29 + +void kbase_sync_fence_in_remove(struct kbase_jd_atom *katom) +{ -+ kbase_fence_free_callbacks(katom); ++ lockdep_assert_held(&katom->kctx->jctx.lock); ++ ++ if (katom->dma_fence.fence_cb_added) { ++ bool removed = dma_fence_remove_callback(katom->dma_fence.fence_in, ++ &katom->dma_fence.fence_cb); ++ ++ /* Here it is expected that the callback should have already been removed ++ * previously either by kbase_sync_fence_in_cancel_wait() or when the fence ++ * was signaled and kbase_sync_fence_wait_worker() was called. ++ */ ++ if (removed) { ++ struct kbase_sync_fence_info info; ++ ++ kbase_sync_fence_in_info_get(katom, &info); ++ dev_warn(katom->kctx->kbdev->dev, ++ "Callback was not removed earlier for fence %s of ctx:%d_%d atom:%d", ++ info.name, katom->kctx->tgid, katom->kctx->id, ++ kbase_jd_atom_id(katom->kctx, katom)); ++ } ++ } ++ + kbase_fence_in_remove(katom); ++ katom->dma_fence.fence_cb_added = false; +} +#endif /* !MALI_USE_CSF */ + @@ -239217,7 +276751,7 @@ index 000000000000..271873b9fe29 +{ + info->fence = fence; + -+ /* translate into CONFIG_SYNC status: ++ /* Translate into the following status, with support for error handling: + * < 0 : error + * 0 : active + * 1 : signaled @@ -239238,10 +276772,7 @@ index 000000000000..271873b9fe29 + info->status = 0; /* still active (unsignaled) */ + } + -+#if (KERNEL_VERSION(4, 8, 0) > LINUX_VERSION_CODE) -+ scnprintf(info->name, sizeof(info->name), "%u#%u", -+ fence->context, fence->seqno); -+#elif (KERNEL_VERSION(5, 1, 0) > LINUX_VERSION_CODE) ++#if (KERNEL_VERSION(5, 1, 0) > LINUX_VERSION_CODE) + scnprintf(info->name, sizeof(info->name), "%llu#%u", + fence->context, fence->seqno); +#else @@ -239254,7 +276785,7 @@ index 000000000000..271873b9fe29 +int kbase_sync_fence_in_info_get(struct kbase_jd_atom *katom, + struct kbase_sync_fence_info *info) +{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) + struct fence *fence; +#else + struct dma_fence *fence; @@ -239274,7 +276805,7 @@ index 000000000000..271873b9fe29 +int kbase_sync_fence_out_info_get(struct kbase_jd_atom *katom, + struct kbase_sync_fence_info *info) +{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) + struct fence *fence; +#else + struct dma_fence *fence; @@ -239301,18 +276832,19 @@ index 000000000000..271873b9fe29 +#endif /* !MALI_USE_CSF*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c new file mode 100755 -index 000000000000..7669895b3c5d +index 000000000..7df7d79b6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c -@@ -0,0 +1,227 @@ +@@ -0,0 +1,225 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -239323,8 +276855,6 @@ index 000000000000..7669895b3c5d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -239359,6 +276889,8 @@ index 000000000000..7669895b3c5d + * rb_tree is maintained at kbase_device level and kbase_process level + * by passing the root of kbase_device or kbase_process we can remove + * the node from the tree. ++ * ++ * Return: true on success. + */ +static bool kbase_delete_dma_buf_mapping(struct kbase_context *kctx, + struct dma_buf *dma_buf, @@ -239408,6 +276940,8 @@ index 000000000000..7669895b3c5d + * of all unique dma_buf's mapped to gpu memory. So when attach any + * dma_buf add it the rb_tree's. To add the unique mapping we need + * check if the mapping is not a duplicate and then add them. ++ * ++ * Return: true on success + */ +static bool kbase_capture_dma_buf_mapping(struct kbase_context *kctx, + struct dma_buf *dma_buf, @@ -239434,31 +276968,31 @@ index 000000000000..7669895b3c5d + } + + if (unique_buf_imported) { -+ struct kbase_dma_buf *buf_node = -+ kzalloc(sizeof(*buf_node), GFP_KERNEL); ++ struct kbase_dma_buf *new_buf_node = ++ kzalloc(sizeof(*new_buf_node), GFP_KERNEL); + -+ if (buf_node == NULL) { ++ if (new_buf_node == NULL) { + dev_err(kctx->kbdev->dev, "Error allocating memory for kbase_dma_buf\n"); + /* Dont account for it if we fail to allocate memory */ + unique_buf_imported = false; + } else { + struct rb_node **new = &(root->rb_node), *parent = NULL; + -+ buf_node->dma_buf = dma_buf; -+ buf_node->import_count = 1; ++ new_buf_node->dma_buf = dma_buf; ++ new_buf_node->import_count = 1; + while (*new) { -+ struct kbase_dma_buf *node; ++ struct kbase_dma_buf *new_node; + + parent = *new; -+ node = rb_entry(parent, struct kbase_dma_buf, -+ dma_buf_node); -+ if (dma_buf < node->dma_buf) ++ new_node = rb_entry(parent, struct kbase_dma_buf, ++ dma_buf_node); ++ if (dma_buf < new_node->dma_buf) + new = &(*new)->rb_left; + else + new = &(*new)->rb_right; + } -+ rb_link_node(&buf_node->dma_buf_node, parent, new); -+ rb_insert_color(&buf_node->dma_buf_node, root); ++ rb_link_node(&new_buf_node->dma_buf_node, parent, new); ++ rb_insert_color(&new_buf_node->dma_buf_node, root); + } + } else if (!WARN_ON(!buf_node)) { + buf_node->import_count++; @@ -239527,25 +277061,21 @@ index 000000000000..7669895b3c5d + + mutex_unlock(&kbdev->dma_buf_lock); +} -+ -+#if !defined(CONFIG_TRACE_GPU_MEM) && !MALI_CUSTOMER_RELEASE -+#define CREATE_TRACE_POINTS -+#include "mali_gpu_mem_trace.h" -+#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h new file mode 100755 -index 000000000000..7e95956f3132 +index 000000000..fd871fcb3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h -@@ -0,0 +1,103 @@ +@@ -0,0 +1,100 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -239556,17 +277086,13 @@ index 000000000000..7e95956f3132 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_TRACE_GPU_MEM_H_ +#define _KBASE_TRACE_GPU_MEM_H_ + -+#ifdef CONFIG_TRACE_GPU_MEM ++#if IS_ENABLED(CONFIG_TRACE_GPU_MEM) +#include -+#elif !MALI_CUSTOMER_RELEASE -+#include "mali_gpu_mem_trace.h" +#endif + +#define DEVICE_TGID ((u32) 0U) @@ -239574,9 +277100,9 @@ index 000000000000..7e95956f3132 +static void kbase_trace_gpu_mem_usage(struct kbase_device *kbdev, + struct kbase_context *kctx) +{ ++#if IS_ENABLED(CONFIG_TRACE_GPU_MEM) + lockdep_assert_held(&kbdev->gpu_mem_usage_lock); + -+#if defined(CONFIG_TRACE_GPU_MEM) || !MALI_CUSTOMER_RELEASE + trace_gpu_mem_total(kbdev->id, DEVICE_TGID, + kbdev->total_gpu_pages << PAGE_SHIFT); + @@ -239643,18 +277169,19 @@ index 000000000000..7e95956f3132 +#endif /* _KBASE_TRACE_GPU_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_utility.h b/drivers/gpu/arm/bifrost/mali_kbase_utility.h new file mode 100755 -index 000000000000..8d4f044376a9 +index 000000000..2dad49b59 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_utility.h -@@ -0,0 +1,55 @@ +@@ -0,0 +1,52 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2012-2013, 2015, 2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2013, 2015, 2018, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -239665,12 +277192,8 @@ index 000000000000..8d4f044376a9 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +#ifndef _KBASE_UTILITY_H +#define _KBASE_UTILITY_H + @@ -239681,7 +277204,7 @@ index 000000000000..8d4f044376a9 +static inline void kbase_timer_setup(struct timer_list *timer, + void (*callback)(struct timer_list *timer)) +{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) ++#if KERNEL_VERSION(4, 14, 0) > LINUX_VERSION_CODE + setup_timer(timer, (void (*)(unsigned long)) callback, + (unsigned long) timer); +#else @@ -239704,18 +277227,19 @@ index 000000000000..8d4f044376a9 +#endif /* _KBASE_UTILITY_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c new file mode 100755 -index 000000000000..3b0e2d6855ce +index 000000000..d770913e9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c -@@ -0,0 +1,1083 @@ +@@ -0,0 +1,1132 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2011-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -239726,16 +277250,15 @@ index 000000000000..3b0e2d6855ce + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include "mali_kbase_vinstr.h" -+#include "mali_kbase_hwcnt_virtualizer.h" -+#include "mali_kbase_hwcnt_types.h" -+#include "mali_kbase_hwcnt_reader.h" -+#include "mali_kbase_hwcnt_gpu.h" -+#include "mali_kbase_ioctl.h" ++#include "hwcnt/mali_kbase_hwcnt_virtualizer.h" ++#include "hwcnt/mali_kbase_hwcnt_types.h" ++#include ++#include "hwcnt/mali_kbase_hwcnt_gpu.h" ++#include "hwcnt/mali_kbase_hwcnt_gpu_narrow.h" ++#include +#include "mali_malisw.h" +#include "mali_kbase_debug.h" + @@ -239743,12 +277266,19 @@ index 000000000000..3b0e2d6855ce +#include +#include +#include ++#include +#include +#include +#include +#include ++#include +#include + ++/* Explicitly include epoll header for old kernels. Not required from 4.16. */ ++#if KERNEL_VERSION(4, 16, 0) > LINUX_VERSION_CODE ++#include ++#endif ++ +/* Hwcnt reader API version */ +#define HWCNT_READER_API 1 + @@ -239763,6 +277293,10 @@ index 000000000000..3b0e2d6855ce + * counters. + * @hvirt: Hardware counter virtualizer used by vinstr. + * @metadata: Hardware counter metadata provided by virtualizer. ++ * @metadata_user: API compatible hardware counter metadata provided by vinstr. ++ * For compatibility with the user driver interface, this ++ * contains a narrowed version of the HWCNT metadata limited ++ * to 64 entries per block of 32 bits each. + * @lock: Lock protecting all vinstr state. + * @suspend_count: Suspend reference count. If non-zero, timer and worker are + * prevented from being re-scheduled. @@ -239774,6 +277308,7 @@ index 000000000000..3b0e2d6855ce +struct kbase_vinstr_context { + struct kbase_hwcnt_virtualizer *hvirt; + const struct kbase_hwcnt_metadata *metadata; ++ const struct kbase_hwcnt_metadata_narrow *metadata_user; + struct mutex lock; + size_t suspend_count; + size_t client_count; @@ -239794,8 +277329,8 @@ index 000000000000..3b0e2d6855ce + * occur. If 0, not a periodic client. + * @enable_map: Counters enable map. + * @tmp_buf: Temporary buffer to use before handing dump to client. -+ * @dump_bufs: Array of dump buffers allocated by this client. -+ * @dump_bufs_meta: Metadata of dump buffers. ++ * @dump_bufs: Array of narrow dump buffers allocated by this client. ++ * @dump_bufs_meta: Metadata of hwcnt reader client buffers. + * @meta_idx: Index of metadata being accessed by userspace. + * @read_idx: Index of buffer read by userspace. + * @write_idx: Index of buffer being written by dump worker. @@ -239809,7 +277344,7 @@ index 000000000000..3b0e2d6855ce + u32 dump_interval_ns; + struct kbase_hwcnt_enable_map enable_map; + struct kbase_hwcnt_dump_buffer tmp_buf; -+ struct kbase_hwcnt_dump_buffer_array dump_bufs; ++ struct kbase_hwcnt_dump_buffer_narrow_array dump_bufs; + struct kbase_hwcnt_reader_metadata *dump_bufs_meta; + atomic_t meta_idx; + atomic_t read_idx; @@ -239817,9 +277352,7 @@ index 000000000000..3b0e2d6855ce + wait_queue_head_t waitq; +}; + -+static unsigned int kbasep_vinstr_hwcnt_reader_poll( -+ struct file *filp, -+ poll_table *wait); ++static __poll_t kbasep_vinstr_hwcnt_reader_poll(struct file *filp, poll_table *wait); + +static long kbasep_vinstr_hwcnt_reader_ioctl( + struct file *filp, @@ -239895,7 +277428,7 @@ index 000000000000..3b0e2d6855ce + unsigned int write_idx; + unsigned int read_idx; + struct kbase_hwcnt_dump_buffer *tmp_buf; -+ struct kbase_hwcnt_dump_buffer *dump_buf; ++ struct kbase_hwcnt_dump_buffer_narrow *dump_buf; + struct kbase_hwcnt_reader_metadata *meta; + u8 clk_cnt; + @@ -239927,9 +277460,12 @@ index 000000000000..3b0e2d6855ce + /* Copy the temp buffer to the userspace visible buffer. The strict + * variant will explicitly zero any non-enabled counters to ensure + * nothing except exactly what the user asked for is made visible. ++ * ++ * A narrow copy is required since virtualizer has a bigger buffer ++ * but user only needs part of it. + */ -+ kbase_hwcnt_dump_buffer_copy_strict( -+ dump_buf, tmp_buf, &vcli->enable_map); ++ kbase_hwcnt_dump_buffer_copy_strict_narrow(dump_buf, tmp_buf, ++ &vcli->enable_map); + + clk_cnt = vcli->vctx->metadata->clk_cnt; + @@ -240058,6 +277594,8 @@ index 000000000000..3b0e2d6855ce + * kbasep_vinstr_dump_timer() - Dump timer that schedules the dump worker for + * execution as soon as possible. + * @timer: Timer structure. ++ * ++ * Return: HRTIMER_NORESTART always. + */ +static enum hrtimer_restart kbasep_vinstr_dump_timer(struct hrtimer *timer) +{ @@ -240069,11 +277607,7 @@ index 000000000000..3b0e2d6855ce + * cancelled, and the worker itself won't reschedule this timer if + * suspend_count != 0. + */ -+#if KERNEL_VERSION(3, 16, 0) > LINUX_VERSION_CODE -+ queue_work(system_wq, &vctx->dump_work); -+#else -+ queue_work(system_highpri_wq, &vctx->dump_work); -+#endif ++ kbase_hwcnt_virtualizer_queue_work(vctx->hvirt, &vctx->dump_work); + return HRTIMER_NORESTART; +} + @@ -240088,7 +277622,7 @@ index 000000000000..3b0e2d6855ce + + kbase_hwcnt_virtualizer_client_destroy(vcli->hvcli); + kfree(vcli->dump_bufs_meta); -+ kbase_hwcnt_dump_buffer_array_free(&vcli->dump_bufs); ++ kbase_hwcnt_dump_buffer_narrow_array_free(&vcli->dump_bufs); + kbase_hwcnt_dump_buffer_free(&vcli->tmp_buf); + kbase_hwcnt_enable_map_free(&vcli->enable_map); + kfree(vcli); @@ -240099,7 +277633,7 @@ index 000000000000..3b0e2d6855ce + * the vinstr context. + * @vctx: Non-NULL pointer to vinstr context. + * @setup: Non-NULL pointer to hardware counter ioctl setup structure. -+ * setup->buffer_count must not be 0. ++ * setup->buffer_count must not be 0 and must be a power of 2. + * @out_vcli: Non-NULL pointer to where created client will be stored on + * success. + * @@ -240117,6 +277651,7 @@ index 000000000000..3b0e2d6855ce + WARN_ON(!vctx); + WARN_ON(!setup); + WARN_ON(setup->buffer_count == 0); ++ WARN_ON(!is_power_of_2(setup->buffer_count)); + + vcli = kzalloc(sizeof(*vcli), GFP_KERNEL); + if (!vcli) @@ -240135,6 +277670,9 @@ index 000000000000..3b0e2d6855ce + phys_em.mmu_l2_bm = setup->mmu_l2_bm; + kbase_hwcnt_gpu_enable_map_from_physical(&vcli->enable_map, &phys_em); + ++ /* Use virtualizer's metadata to alloc tmp buffer which interacts with ++ * the HWC virtualizer. ++ */ + errcode = kbase_hwcnt_dump_buffer_alloc(vctx->metadata, &vcli->tmp_buf); + if (errcode) + goto error; @@ -240142,8 +277680,11 @@ index 000000000000..3b0e2d6855ce + /* Enable all the available clk_enable_map. */ + vcli->enable_map.clk_enable_map = (1ull << vctx->metadata->clk_cnt) - 1; + -+ errcode = kbase_hwcnt_dump_buffer_array_alloc( -+ vctx->metadata, setup->buffer_count, &vcli->dump_bufs); ++ /* Use vinstr's narrowed metadata to alloc narrow dump buffers which ++ * interact with clients. ++ */ ++ errcode = kbase_hwcnt_dump_buffer_narrow_array_alloc( ++ vctx->metadata_user, setup->buffer_count, &vcli->dump_bufs); + if (errcode) + goto error; + @@ -240171,6 +277712,7 @@ index 000000000000..3b0e2d6855ce + struct kbase_hwcnt_virtualizer *hvirt, + struct kbase_vinstr_context **out_vctx) +{ ++ int errcode; + struct kbase_vinstr_context *vctx; + const struct kbase_hwcnt_metadata *metadata; + @@ -240187,6 +277729,10 @@ index 000000000000..3b0e2d6855ce + + vctx->hvirt = hvirt; + vctx->metadata = metadata; ++ errcode = kbase_hwcnt_gpu_metadata_narrow_create(&vctx->metadata_user, ++ metadata); ++ if (errcode) ++ goto err_metadata_create; + + mutex_init(&vctx->lock); + INIT_LIST_HEAD(&vctx->clients); @@ -240196,6 +277742,11 @@ index 000000000000..3b0e2d6855ce + + *out_vctx = vctx; + return 0; ++ ++err_metadata_create: ++ kfree(vctx); ++ ++ return errcode; +} + +void kbase_vinstr_term(struct kbase_vinstr_context *vctx) @@ -240203,8 +277754,6 @@ index 000000000000..3b0e2d6855ce + if (!vctx) + return; + -+ cancel_work_sync(&vctx->dump_work); -+ + /* Non-zero client count implies client leak */ + if (WARN_ON(vctx->client_count != 0)) { + struct kbase_vinstr_client *pos, *n; @@ -240216,6 +277765,9 @@ index 000000000000..3b0e2d6855ce + } + } + ++ cancel_work_sync(&vctx->dump_work); ++ kbase_hwcnt_gpu_metadata_narrow_destroy(vctx->metadata_user); ++ + WARN_ON(vctx->client_count != 0); + kfree(vctx); +} @@ -240275,11 +277827,8 @@ index 000000000000..3b0e2d6855ce + } + + if (has_periodic_clients) -+#if KERNEL_VERSION(3, 16, 0) > LINUX_VERSION_CODE -+ queue_work(system_wq, &vctx->dump_work); -+#else -+ queue_work(system_highpri_wq, &vctx->dump_work); -+#endif ++ kbase_hwcnt_virtualizer_queue_work( ++ vctx->hvirt, &vctx->dump_work); + } + } + @@ -240296,7 +277845,8 @@ index 000000000000..3b0e2d6855ce + + if (!vctx || !setup || + (setup->buffer_count == 0) || -+ (setup->buffer_count > MAX_BUFFER_COUNT)) ++ (setup->buffer_count > MAX_BUFFER_COUNT) || ++ !is_power_of_2(setup->buffer_count)) + return -EINVAL; + + errcode = kbasep_vinstr_client_create(vctx, setup, &vcli); @@ -240429,7 +277979,9 @@ index 000000000000..3b0e2d6855ce + if (unlikely(copy_to_user(buffer, meta, min_size))) + return -EFAULT; + -+ atomic_inc(&cli->meta_idx); ++ /* Compare exchange meta idx to protect against concurrent getters */ ++ if (meta_idx != atomic_cmpxchg(&cli->meta_idx, meta_idx, meta_idx + 1)) ++ return -EBUSY; + + return 0; +} @@ -240501,7 +278053,13 @@ index 000000000000..3b0e2d6855ce + goto out; + } + -+ atomic_inc(&cli->read_idx); ++ /* Compare exchange read idx to protect against concurrent putters */ ++ if (read_idx != ++ atomic_cmpxchg(&cli->read_idx, read_idx, read_idx + 1)) { ++ ret = -EPERM; ++ goto out; ++ } ++ +out: + if (unlikely(kbuf != stack_kbuf)) + kfree(kbuf); @@ -240533,11 +278091,8 @@ index 000000000000..3b0e2d6855ce + * worker is already queued. + */ + if ((interval != 0) && (cli->vctx->suspend_count == 0)) -+#if KERNEL_VERSION(3, 16, 0) > LINUX_VERSION_CODE -+ queue_work(system_wq, &cli->vctx->dump_work); -+#else -+ queue_work(system_highpri_wq, &cli->vctx->dump_work); -+#endif ++ kbase_hwcnt_virtualizer_queue_work(cli->vctx->hvirt, ++ &cli->vctx->dump_work); + + mutex_unlock(&cli->vctx->lock); + @@ -240597,22 +278152,24 @@ index 000000000000..3b0e2d6855ce +} + +/** -+ * The hwcnt reader's ioctl command - get API version. ++ * kbasep_vinstr_hwcnt_reader_ioctl_get_api_version() - get API version ioctl ++ * command. + * @cli: The non-NULL pointer to the client + * @arg: Command's argument. + * @size: Size of arg. + * -+ * @return 0 on success, else error code. ++ * Return: 0 on success, else error code. + */ +static long kbasep_vinstr_hwcnt_reader_ioctl_get_api_version( + struct kbase_vinstr_client *cli, unsigned long arg, size_t size) +{ + long ret = -EINVAL; -+ u8 clk_cnt = cli->vctx->metadata->clk_cnt; + + if (size == sizeof(u32)) { + ret = put_user(HWCNT_READER_API, (u32 __user *)arg); + } else if (size == sizeof(struct kbase_hwcnt_reader_api_version)) { ++ u8 clk_cnt = cli->vctx->metadata->clk_cnt; ++ unsigned long bytes = 0; + struct kbase_hwcnt_reader_api_version api_version = { + .version = HWCNT_READER_API, + .features = KBASE_HWCNT_READER_API_VERSION_NO_FEATURE, @@ -240625,8 +278182,16 @@ index 000000000000..3b0e2d6855ce + api_version.features |= + KBASE_HWCNT_READER_API_VERSION_FEATURE_CYCLES_SHADER_CORES; + -+ ret = copy_to_user( ++ bytes = copy_to_user( + (void __user *)arg, &api_version, sizeof(api_version)); ++ ++ /* copy_to_user returns zero in case of success. ++ * If it fails, it returns the number of bytes that could NOT be copied ++ */ ++ if (bytes == 0) ++ ret = 0; ++ else ++ ret = -EFAULT; + } + return ret; +} @@ -240664,9 +278229,8 @@ index 000000000000..3b0e2d6855ce + cli, (u32 __user *)arg); + break; + case _IOC_NR(KBASE_HWCNT_READER_GET_BUFFER_SIZE): -+ rcode = put_user( -+ (u32)cli->vctx->metadata->dump_buf_bytes, -+ (u32 __user *)arg); ++ rcode = put_user((u32)cli->vctx->metadata_user->dump_buf_bytes, ++ (u32 __user *)arg); + break; + case _IOC_NR(KBASE_HWCNT_READER_DUMP): + rcode = kbasep_vinstr_hwcnt_reader_ioctl_dump(cli); @@ -240708,26 +278272,25 @@ index 000000000000..3b0e2d6855ce + * @filp: Non-NULL pointer to file structure. + * @wait: Non-NULL pointer to poll table. + * -+ * Return: POLLIN if data can be read without blocking, 0 if data can not be -+ * read without blocking, else error code. ++ * Return: EPOLLIN | EPOLLRDNORM if data can be read without blocking, 0 if ++ * data can not be read without blocking, else EPOLLHUP | EPOLLERR. + */ -+static unsigned int kbasep_vinstr_hwcnt_reader_poll( -+ struct file *filp, -+ poll_table *wait) ++static __poll_t kbasep_vinstr_hwcnt_reader_poll(struct file *filp, poll_table *wait) +{ + struct kbase_vinstr_client *cli; + + if (!filp || !wait) -+ return -EINVAL; ++ return EPOLLHUP | EPOLLERR; + + cli = filp->private_data; + if (!cli) -+ return -EINVAL; ++ return EPOLLHUP | EPOLLERR; + + poll_wait(filp, &cli->waitq, wait); + if (kbasep_vinstr_hwcnt_reader_buffer_ready(cli)) -+ return POLLIN; -+ return 0; ++ return EPOLLIN | EPOLLRDNORM; ++ ++ return (__poll_t)0; +} + +/** @@ -240752,7 +278315,16 @@ index 000000000000..3b0e2d6855ce + return -EINVAL; + + vm_size = vma->vm_end - vma->vm_start; -+ size = cli->dump_bufs.buf_cnt * cli->vctx->metadata->dump_buf_bytes; ++ ++ /* The mapping is allowed to span the entirety of the page allocation, ++ * not just the chunk where the dump buffers are allocated. ++ * This accommodates the corner case where the combined size of the ++ * dump buffers is smaller than a single page. ++ * This does not pose a security risk as the pages are zeroed on ++ * allocation, and anything out of bounds of the dump buffers is never ++ * written to. ++ */ ++ size = (1ull << cli->dump_bufs.page_order) * PAGE_SIZE; + + if (vma->vm_pgoff > (size >> PAGE_SHIFT)) + return -EINVAL; @@ -240793,18 +278365,19 @@ index 000000000000..3b0e2d6855ce +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h new file mode 100755 -index 000000000000..81d315f95567 +index 000000000..6747ec70a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h -@@ -0,0 +1,91 @@ +@@ -0,0 +1,90 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2015-2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2015-2018, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -240815,8 +278388,6 @@ index 000000000000..81d315f95567 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* @@ -240890,18 +278461,19 @@ index 000000000000..81d315f95567 +#endif /* _KBASE_VINSTR_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_linux_trace.h b/drivers/gpu/arm/bifrost/mali_linux_trace.h new file mode 100755 -index 000000000000..be812f62c862 +index 000000000..52f17390c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_linux_trace.h -@@ -0,0 +1,552 @@ +@@ -0,0 +1,547 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2011-2016, 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2016, 2018-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -240912,8 +278484,6 @@ index 000000000000..be812f62c862 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#undef TRACE_SYSTEM @@ -240927,7 +278497,7 @@ index 000000000000..be812f62c862 +#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) +#define MALI_JOB_SLOTS_EVENT_CHANGED + -+/** ++/* + * mali_job_slots_event - Reports change of job slot status. + * @gpu_id: Kbase device id + * @event_id: ORed together bitfields representing a type of event, @@ -241244,10 +278814,7 @@ index 000000000000..be812f62c862 +#endif /* MALI_JIT_PRESSURE_LIMIT_BASE */ +#endif /* !MALI_USE_CSF */ + -+#if (KERNEL_VERSION(4, 1, 0) <= LINUX_VERSION_CODE) +TRACE_DEFINE_ENUM(KBASE_JIT_REPORT_ON_ALLOC_OR_FREE); -+#endif -+ +#if MALI_JIT_PRESSURE_LIMIT_BASE +/* trace_mali_jit_report_pressure + * @@ -241289,7 +278856,6 @@ index 000000000000..be812f62c862 +/* Enum of sysgraph message IDs */ +enum sysgraph_msg { + SGR_ARRIVE, -+ SGR_DEP_RES, + SGR_SUBMIT, + SGR_COMPLETE, + SGR_POST, @@ -241317,7 +278883,7 @@ index 000000000000..be812f62c862 + __entry->message = message; + __entry->atom_id = atom_id; + ), -+ TP_printk("msg=%u proc_id=%u, param1=%d\n", __entry->message, ++ TP_printk("msg=%u proc_id=%u, param1=%d", __entry->message, + __entry->proc_id, __entry->atom_id) +); + @@ -241343,7 +278909,7 @@ index 000000000000..be812f62c862 + __entry->atom_id = atom_id; + __entry->js = js; + ), -+ TP_printk("msg=%u proc_id=%u, param1=%d, param2=%d\n", ++ TP_printk("msg=%u proc_id=%u, param1=%d, param2=%d", + __entry->message, __entry->proc_id, + __entry->atom_id, __entry->js) +); @@ -241432,7 +278998,7 @@ index 000000000000..be812f62c862 + TP_printk("freed_pages=%zu", __entry->freed_pages) +); + -+#include "mali_kbase_debug_linux_ktrace.h" ++#include "debug/mali_kbase_debug_linux_ktrace.h" + +#endif /* _TRACE_MALI_H */ + @@ -241448,18 +279014,19 @@ index 000000000000..be812f62c862 +#include diff --git a/drivers/gpu/arm/bifrost/mali_malisw.h b/drivers/gpu/arm/bifrost/mali_malisw.h new file mode 100755 -index 000000000000..3a4db10bdb3d +index 000000000..d9db189e8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_malisw.h -@@ -0,0 +1,109 @@ +@@ -0,0 +1,108 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2015, 2018 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2015, 2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -241470,11 +279037,9 @@ index 000000000000..3a4db10bdb3d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+/** ++/* + * Kernel-wide include for common macros and types. + */ + @@ -241482,26 +279047,11 @@ index 000000000000..3a4db10bdb3d +#define _MALISW_H_ + +#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) -+#define U8_MAX ((u8)~0U) -+#define S8_MAX ((s8)(U8_MAX>>1)) -+#define S8_MIN ((s8)(-S8_MAX - 1)) -+#define U16_MAX ((u16)~0U) -+#define S16_MAX ((s16)(U16_MAX>>1)) -+#define S16_MIN ((s16)(-S16_MAX - 1)) -+#define U32_MAX ((u32)~0U) -+#define S32_MAX ((s32)(U32_MAX>>1)) -+#define S32_MIN ((s32)(-S32_MAX - 1)) -+#define U64_MAX ((u64)~0ULL) -+#define S64_MAX ((s64)(U64_MAX>>1)) -+#define S64_MIN ((s64)(-S64_MAX - 1)) -+#endif /* LINUX_VERSION_CODE */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) -+#define SIZE_MAX (~(size_t)0) -+#endif /* LINUX_VERSION_CODE */ + +/** + * MIN - Return the lesser of two values. ++ * @x: value1 ++ * @y: value2 + * + * As a macro it may evaluate its arguments more than once. + * Refer to MAX macro for more details @@ -241509,7 +279059,9 @@ index 000000000000..3a4db10bdb3d +#define MIN(x, y) ((x) < (y) ? (x) : (y)) + +/** -+ * MAX - Return the greater of two values. ++ * MAX - Return the greater of two values. ++ * @x: value1 ++ * @y: value2 + * + * As a macro it may evaluate its arguments more than once. + * If called on the same two arguments as MIN it is guaranteed to return @@ -241521,24 +279073,28 @@ index 000000000000..3a4db10bdb3d +#define MAX(x, y) ((x) < (y) ? (y) : (x)) + +/** -+ * @hideinitializer -+ * Function-like macro for suppressing unused variable warnings. Where possible -+ * such variables should be removed; this macro is present for cases where we -+ * much support API backwards compatibility. ++ * CSTD_UNUSED - Function-like macro for suppressing unused variable warnings. ++ * ++ * @x: unused variable ++ * ++ * Where possible such variables should be removed; this macro is present for ++ * cases where we much support API backwards compatibility. + */ +#define CSTD_UNUSED(x) ((void)(x)) + +/** -+ * @hideinitializer -+ * Function-like macro for use where "no behavior" is desired. This is useful -+ * when compile time macros turn a function-like macro in to a no-op, but -+ * where having no statement is otherwise invalid. ++ * CSTD_NOP - Function-like macro for use where "no behavior" is desired. ++ * @...: no-op ++ * ++ * This is useful when compile time macros turn a function-like macro in to a ++ * no-op, but where having no statement is otherwise invalid. + */ +#define CSTD_NOP(...) ((void)#__VA_ARGS__) + +/** -+ * @hideinitializer -+ * Function-like macro for stringizing a single level macro. ++ * CSTD_STR1 - Function-like macro for stringizing a single level macro. ++ * @x: macro's value ++ * + * @code + * #define MY_MACRO 32 + * CSTD_STR1( MY_MACRO ) @@ -241548,10 +279104,11 @@ index 000000000000..3a4db10bdb3d +#define CSTD_STR1(x) #x + +/** -+ * @hideinitializer -+ * Function-like macro for stringizing a macro's value. This should not be used -+ * if the macro is defined in a way which may have no value; use the -+ * alternative @c CSTD_STR2N macro should be used instead. ++ * CSTD_STR2 - Function-like macro for stringizing a macro's value. ++ * @x: macro's value ++ * ++ * This should not be used if the macro is defined in a way which may have no ++ * value; use the alternative @c CSTD_STR2N macro should be used instead. + * @code + * #define MY_MACRO 32 + * CSTD_STR2( MY_MACRO ) @@ -241560,21 +279117,30 @@ index 000000000000..3a4db10bdb3d + */ +#define CSTD_STR2(x) CSTD_STR1(x) + ++ #ifndef fallthrough ++ #define fallthrough __fallthrough ++ #endif /* fallthrough */ ++ ++#ifndef __fallthrough ++#define __fallthrough __attribute__((fallthrough)) ++#endif /* __fallthrough */ ++ +#endif /* _MALISW_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c new file mode 100755 -index 000000000000..b6fb5a094fab +index 000000000..1db3abe2f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c -@@ -0,0 +1,27 @@ +@@ -0,0 +1,26 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -241585,8 +279151,6 @@ index 000000000000..b6fb5a094fab + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* Create the trace point if not configured in kernel */ @@ -241596,18 +279160,19 @@ index 000000000000..b6fb5a094fab +#endif diff --git a/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h new file mode 100755 -index 000000000000..3b90ae437db9 +index 000000000..f156650a4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h -@@ -0,0 +1,69 @@ +@@ -0,0 +1,68 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -241618,8 +279183,6 @@ index 000000000000..3b90ae437db9 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _TRACE_POWER_GPU_FREQUENCY_MALI @@ -241645,8 +279208,8 @@ index 000000000000..3b90ae437db9 + TP_ARGS(state, gpu_id), + + TP_STRUCT__entry( -+ __field( u32, state ) -+ __field( u32, gpu_id ) ++ __field(u32, state) ++ __field(u32, gpu_id) + ), + + TP_fast_assign( @@ -241669,110 +279232,57 @@ index 000000000000..3b90ae437db9 + +/* This part must be outside protection */ +#include -diff --git a/drivers/gpu/arm/bifrost/mali_uk.h b/drivers/gpu/arm/bifrost/mali_uk.h -new file mode 100755 -index 000000000000..701f3909042f +diff --git a/drivers/gpu/arm/bifrost/mmu/Kbuild b/drivers/gpu/arm/bifrost/mmu/Kbuild +new file mode 100644 +index 000000000..416432397 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/mali_uk.h -@@ -0,0 +1,84 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010, 2012-2015, 2018 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+ -+ -+/** -+ * @file mali_uk.h -+ * Types and definitions that are common across OSs for both the user -+ * and kernel side of the User-Kernel interface. -+ */ -+ -+#ifndef _UK_H_ -+#define _UK_H_ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+/** -+ * @addtogroup base_api -+ * @{ -+ */ -+ -+/** -+ * @defgroup uk_api User-Kernel Interface API -+ * -+ * The User-Kernel Interface abstracts the communication mechanism between the user and kernel-side code of device -+ * drivers developed as part of the Midgard DDK. Currently that includes the Base driver. -+ * -+ * It exposes an OS independent API to user-side code (UKU) which routes functions calls to an OS-independent -+ * kernel-side API (UKK) via an OS-specific communication mechanism. -+ * -+ * This API is internal to the Midgard DDK and is not exposed to any applications. -+ * -+ * @{ -+ */ -+ -+/** -+ * These are identifiers for kernel-side drivers implementing a UK interface, aka UKK clients. The -+ * UK module maps this to an OS specific device name, e.g. "gpu_base" -> "GPU0:". Specify this -+ * identifier to select a UKK client to the uku_open() function. -+ * -+ * When a new UKK client driver is created a new identifier needs to be added to the uk_client_id -+ * enumeration and the uku_open() implemenation for the various OS ports need to be updated to -+ * provide a mapping of the identifier to the OS specific device name. -+ * -+ */ -+enum uk_client_id { -+ /** -+ * Value used to identify the Base driver UK client. -+ */ -+ UK_CLIENT_MALI_T600_BASE, -+ -+ /** The number of uk clients supported. This must be the last member of the enum */ -+ UK_CLIENT_COUNT -+}; -+ -+/** @} end group uk_api */ ++++ b/drivers/gpu/arm/bifrost/mmu/Kbuild +@@ -0,0 +1,30 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++# ++# (C) COPYRIGHT 2021 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU license. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, you can access it online at ++# http://www.gnu.org/licenses/gpl-2.0.html. ++# ++# + -+/** @} *//* end group base_api */ ++bifrost_kbase-y += \ ++ mmu/mali_kbase_mmu.o \ ++ mmu/mali_kbase_mmu_hw_direct.o \ ++ mmu/mali_kbase_mmu_mode_aarch64.o + -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+#endif /* _UK_H_ */ ++ifeq ($(CONFIG_MALI_CSF_SUPPORT),y) ++ bifrost_kbase-y += mmu/backend/mali_kbase_mmu_csf.o ++else ++ bifrost_kbase-y += mmu/backend/mali_kbase_mmu_jm.o ++endif diff --git a/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c new file mode 100755 -index 000000000000..1d106999228a +index 000000000..4cac7876f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c -@@ -0,0 +1,532 @@ +@@ -0,0 +1,572 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -241783,21 +279293,18 @@ index 000000000000..1d106999228a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** -+ * Base kernel MMU management specific for CSF GPU. ++ * DOC: Base kernel MMU management specific for CSF GPU. + */ + +#include +#include +#include -+#include +#include +#include -+#include "../mali_kbase_mmu_internal.h" ++#include + +void kbase_mmu_get_as_setup(struct kbase_mmu_table *mmut, + struct kbase_mmu_setup * const setup) @@ -241837,17 +279344,35 @@ index 000000000000..1d106999228a +static void submit_work_pagefault(struct kbase_device *kbdev, u32 as_nr, + struct kbase_fault *fault) +{ ++ unsigned long flags; + struct kbase_as *const as = &kbdev->as[as_nr]; ++ struct kbase_context *kctx; + -+ as->pf_data = (struct kbase_fault) { -+ .status = fault->status, -+ .addr = fault->addr, -+ }; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kctx = kbase_ctx_sched_as_to_ctx_nolock(kbdev, as_nr); + -+ if (kbase_ctx_sched_as_to_ctx_refcount(kbdev, as_nr)) { -+ WARN_ON(!queue_work(as->pf_wq, &as->work_pagefault)); -+ atomic_inc(&kbdev->faults_pending); ++ if (kctx) { ++ kbase_ctx_sched_retain_ctx_refcount(kctx); ++ ++ as->pf_data = (struct kbase_fault) { ++ .status = fault->status, ++ .addr = fault->addr, ++ }; ++ ++ /* ++ * A page fault work item could already be pending for the ++ * context's address space, when the page fault occurs for ++ * MCU's address space. ++ */ ++ if (!queue_work(as->pf_wq, &as->work_pagefault)) { ++ dev_dbg(kbdev->dev, ++ "Page fault is already pending for as %u", as_nr); ++ kbase_ctx_sched_release_ctx(kctx); ++ } else { ++ atomic_inc(&kbdev->faults_pending); ++ } + } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} + +void kbase_mmu_report_mcu_as_fault_and_reset(struct kbase_device *kbdev, @@ -241872,14 +279397,17 @@ index 000000000000..1d106999228a + access_type, kbase_gpu_access_type_name(fault->status), + source_id); + ++ kbase_debug_csf_fault_notify(kbdev, NULL, DF_GPU_PAGE_FAULT); ++ + /* Report MMU fault for all address spaces (except MCU_AS_NR) */ + for (as_no = 1; as_no < kbdev->nr_hw_address_spaces; as_no++) -+ if (kbase_ctx_sched_as_to_ctx(kbdev, as_no)) -+ submit_work_pagefault(kbdev, as_no, fault); ++ submit_work_pagefault(kbdev, as_no, fault); + + /* GPU reset is required to recover */ -+ if (kbase_prepare_to_reset_gpu(kbdev)) ++ if (kbase_prepare_to_reset_gpu(kbdev, ++ RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) + kbase_reset_gpu(kbdev); ++ +} +KBASE_EXPORT_TEST_API(kbase_mmu_report_mcu_as_fault_and_reset); + @@ -241898,17 +279426,18 @@ index 000000000000..1d106999228a + "true" : "false"; + int as_no = as->number; + unsigned long flags; ++ const uintptr_t fault_addr = fault->addr; + + /* terminal fault, print info about the fault */ + dev_err(kbdev->dev, -+ "GPU bus fault in AS%d at VA 0x%016llX\n" -+ "VA_VALID: %s\n" ++ "GPU bus fault in AS%d at PA %pK\n" ++ "PA_VALID: %s\n" + "raw fault status: 0x%X\n" + "exception type 0x%X: %s\n" + "access type 0x%X: %s\n" + "source id 0x%X\n" + "pid: %d\n", -+ as_no, fault->addr, ++ as_no, (void *)fault_addr, + addr_valid, + status, + exception_type, kbase_gpu_exception_name(exception_type), @@ -241937,9 +279466,10 @@ index 000000000000..1d106999228a + kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), + GPU_COMMAND_CLEAR_FAULT); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ +} + -+/** ++/* + * The caller must ensure it's retained the ctx to prevent it from being + * scheduled out whilst it's being worked on. + */ @@ -241998,6 +279528,7 @@ index 000000000000..1d106999228a + mutex_unlock(&kbdev->mmu_hw_mutex); + /* AS transaction end */ + ++ kbase_debug_csf_fault_notify(kbdev, kctx, DF_GPU_PAGE_FAULT); + /* Switching to UNMAPPED mode above would have enabled the firmware to + * recover from the fault (if the memory access was made by firmware) + * and it can then respond to CSG termination requests to be sent now. @@ -242011,6 +279542,7 @@ index 000000000000..1d106999228a + KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED); + kbase_mmu_hw_enable_fault(kbdev, as, + KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED); ++ +} + +/** @@ -242232,6 +279764,15 @@ index 000000000000..1d106999228a + kbase_csf_ctx_handle_fault(kctx, fault); + kbase_ctx_sched_release_ctx_lock(kctx); + ++ /* A work for GPU fault is complete. ++ * Till reaching here, no further GPU fault will be reported. ++ * Now clear the GPU fault to allow next GPU fault interrupt report. ++ */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), ++ GPU_COMMAND_CLEAR_FAULT); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ + atomic_dec(&kbdev->faults_pending); +} + @@ -242250,18 +279791,25 @@ index 000000000000..1d106999228a +{ + unsigned long flags; + struct kbase_as *const as = &kbdev->as[as_nr]; ++ struct kbase_context *kctx; + + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ as->gf_data = (struct kbase_fault) { ++ kctx = kbase_ctx_sched_as_to_ctx_nolock(kbdev, as_nr); ++ ++ if (kctx) { ++ kbase_ctx_sched_retain_ctx_refcount(kctx); ++ ++ as->gf_data = (struct kbase_fault) { + .status = status, + .addr = address, -+ }; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ }; + -+ if (kbase_ctx_sched_as_to_ctx_refcount(kbdev, as_nr)) { -+ WARN_ON(!queue_work(as->pf_wq, &as->work_gpufault)); -+ atomic_inc(&kbdev->faults_pending); ++ if (WARN_ON(!queue_work(as->pf_wq, &as->work_gpufault))) ++ kbase_ctx_sched_release_ctx(kctx); ++ else ++ atomic_inc(&kbdev->faults_pending); + } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} + +void kbase_mmu_gpu_fault_interrupt(struct kbase_device *kbdev, u32 status, @@ -242280,14 +279828,15 @@ index 000000000000..1d106999228a +} +KBASE_EXPORT_TEST_API(kbase_mmu_gpu_fault_interrupt); + -+int kbase_mmu_as_init(struct kbase_device *kbdev, int i) ++int kbase_mmu_as_init(struct kbase_device *kbdev, unsigned int i) +{ + kbdev->as[i].number = i; + kbdev->as[i].bf_data.addr = 0ULL; + kbdev->as[i].pf_data.addr = 0ULL; + kbdev->as[i].gf_data.addr = 0ULL; ++ kbdev->as[i].is_unresponsive = false; + -+ kbdev->as[i].pf_wq = alloc_workqueue("mali_mmu%d", 0, 1, i); ++ kbdev->as[i].pf_wq = alloc_workqueue("mali_mmu%d", WQ_UNBOUND, 1, i); + if (!kbdev->as[i].pf_wq) + return -ENOMEM; + @@ -242299,18 +279848,19 @@ index 000000000000..1d106999228a +} diff --git a/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c new file mode 100755 -index 000000000000..b0187a46b733 +index 000000000..d716ce006 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c -@@ -0,0 +1,440 @@ +@@ -0,0 +1,442 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -242321,12 +279871,10 @@ index 000000000000..b0187a46b733 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** -+ * Base kernel MMU management specific for Job Manager GPU. ++ * DOC: Base kernel MMU management specific for Job Manager GPU. + */ + +#include @@ -242334,7 +279882,7 @@ index 000000000000..b0187a46b733 +#include +#include +#include -+#include "../mali_kbase_mmu_internal.h" ++#include + +void kbase_mmu_get_as_setup(struct kbase_mmu_table *mmut, + struct kbase_mmu_setup * const setup) @@ -242369,15 +279917,16 @@ index 000000000000..b0187a46b733 + u32 const exception_data = (status >> 8) & 0xFFFFFF; + int const as_no = as->number; + unsigned long flags; ++ const uintptr_t fault_addr = fault->addr; + + /* terminal fault, print info about the fault */ + dev_err(kbdev->dev, -+ "GPU bus fault in AS%d at VA 0x%016llX\n" ++ "GPU bus fault in AS%d at PA %pK\n" + "raw fault status: 0x%X\n" + "exception type 0x%X: %s\n" + "exception data 0x%X\n" + "pid: %d\n", -+ as_no, fault->addr, ++ as_no, (void *)fault_addr, + status, + exception_type, kbase_gpu_exception_name(exception_type), + exception_data, @@ -242400,9 +279949,10 @@ index 000000000000..b0187a46b733 + KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED); + kbase_mmu_hw_enable_fault(kbdev, as, + KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED); ++ +} + -+/** ++/* + * The caller must ensure it's retained the ctx to prevent it from being + * scheduled out whilst it's being worked on. + */ @@ -242449,6 +279999,7 @@ index 000000000000..b0187a46b733 + kctx->pid); + + /* hardware counters dump fault handling */ ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + if ((kbdev->hwcnt.kctx) && (kbdev->hwcnt.kctx->as_nr == as_no) && + (kbdev->hwcnt.backend.state == + KBASE_INSTR_STATE_DUMPING)) { @@ -242457,6 +280008,7 @@ index 000000000000..b0187a46b733 + kbdev->hwcnt.addr_bytes))) + kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_FAULT; + } ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); + + /* Stop the kctx from submitting more jobs and cause it to be scheduled + * out/rescheduled - this will occur on releasing the context's refcount @@ -242489,6 +280041,7 @@ index 000000000000..b0187a46b733 + KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED); + kbase_mmu_hw_enable_fault(kbdev, as, + KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED); ++ +} + +/** @@ -242505,10 +280058,12 @@ index 000000000000..b0187a46b733 + struct kbase_context *kctx, struct kbase_as *as, + struct kbase_fault *fault) +{ ++ unsigned long flags; ++ + lockdep_assert_held(&kbdev->hwaccess_lock); + + dev_dbg(kbdev->dev, -+ "Entering %s kctx %p, as %p\n", ++ "Entering %s kctx %pK, as %pK\n", + __func__, (void *)kctx, (void *)as); + + if (!kctx) { @@ -242542,11 +280097,13 @@ index 000000000000..b0187a46b733 + * hw counters dumping in progress, signal the + * other thread that it failed + */ ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + if ((kbdev->hwcnt.kctx == kctx) && + (kbdev->hwcnt.backend.state == + KBASE_INSTR_STATE_DUMPING)) -+ kbdev->hwcnt.backend.state = -+ KBASE_INSTR_STATE_FAULT; ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_FAULT; ++ ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); + + /* + * Stop the kctx from submitting more jobs and cause it @@ -242555,14 +280112,10 @@ index 000000000000..b0187a46b733 + */ + kbasep_js_clear_submit_allowed(js_devdata, kctx); + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) -+ dev_warn(kbdev->dev, -+ "Bus error in AS%d at VA=0x%016llx, IPA=0x%016llx\n", -+ as->number, fault->addr, -+ fault->extra_addr); -+ else -+ dev_warn(kbdev->dev, "Bus error in AS%d at 0x%016llx\n", -+ as->number, fault->addr); ++ dev_warn(kbdev->dev, ++ "Bus error in AS%d at VA=0x%016llx, IPA=0x%016llx\n", ++ as->number, fault->addr, ++ fault->extra_addr); + + /* + * We need to switch to UNMAPPED mode - but we do this in a @@ -242576,7 +280129,7 @@ index 000000000000..b0187a46b733 + } + + dev_dbg(kbdev->dev, -+ "Leaving %s kctx %p, as %p\n", ++ "Leaving %s kctx %pK, as %pK\n", + __func__, (void *)kctx, (void *)as); +} + @@ -242630,7 +280183,7 @@ index 000000000000..b0187a46b733 + + while (bf_bits | pf_bits) { + struct kbase_as *as; -+ int as_no; ++ unsigned int as_no; + struct kbase_context *kctx; + struct kbase_fault *fault; + @@ -242675,14 +280228,11 @@ index 000000000000..b0187a46b733 + /* record the fault status */ + fault->status = kbase_reg_read(kbdev, MMU_AS_REG(as_no, + AS_FAULTSTATUS)); -+ -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) { -+ fault->extra_addr = kbase_reg_read(kbdev, -+ MMU_AS_REG(as_no, AS_FAULTEXTRA_HI)); -+ fault->extra_addr <<= 32; -+ fault->extra_addr |= kbase_reg_read(kbdev, -+ MMU_AS_REG(as_no, AS_FAULTEXTRA_LO)); -+ } ++ fault->extra_addr = kbase_reg_read(kbdev, ++ MMU_AS_REG(as_no, AS_FAULTEXTRA_HI)); ++ fault->extra_addr <<= 32; ++ fault->extra_addr |= kbase_reg_read(kbdev, ++ MMU_AS_REG(as_no, AS_FAULTEXTRA_LO)); + + if (kbase_as_has_bus_fault(as, fault)) { + /* Mark bus fault as handled. @@ -242723,18 +280273,19 @@ index 000000000000..b0187a46b733 + struct kbase_va_region *const reg) +{ + dev_dbg(kctx->kbdev->dev, -+ "Switching to incremental rendering for region %p\n", ++ "Switching to incremental rendering for region %pK\n", + (void *)reg); + return kbase_job_slot_softstop_start_rp(kctx, reg); +} + -+int kbase_mmu_as_init(struct kbase_device *kbdev, int i) ++int kbase_mmu_as_init(struct kbase_device *kbdev, unsigned int i) +{ + kbdev->as[i].number = i; + kbdev->as[i].bf_data.addr = 0ULL; + kbdev->as[i].pf_data.addr = 0ULL; ++ kbdev->as[i].is_unresponsive = false; + -+ kbdev->as[i].pf_wq = alloc_workqueue("mali_mmu%d", 0, 1, i); ++ kbdev->as[i].pf_wq = alloc_workqueue("mali_mmu%u", 0, 1, i); + if (!kbdev->as[i].pf_wq) + return -ENOMEM; + @@ -242745,18 +280296,19 @@ index 000000000000..b0187a46b733 +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c new file mode 100755 -index 000000000000..a5cda009426d +index 000000000..d6d3fcdee --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c -@@ -0,0 +1,2275 @@ +@@ -0,0 +1,3889 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -242767,93 +280319,327 @@ index 000000000000..a5cda009426d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** -+ * @file mali_kbase_mmu.c -+ * Base kernel MMU management. ++ * DOC: Base kernel MMU management. + */ + +#include +#include ++#include +#include +#include +#include +#include -+#include ++#include +#include +#include +#include +#include +#include -+#include -+#include +#include +#include +#include +#include +#include +#include ++#include ++#if !MALI_USE_CSF ++#include ++#endif + +#include -+#define KBASE_MMU_PAGE_ENTRIES 512 ++#include ++ ++/* Threshold used to decide whether to flush full caches or just a physical range */ ++#define KBASE_PA_RANGE_THRESHOLD_NR_PAGES 20 ++#define MGM_DEFAULT_PTE_GROUP (0) ++ ++/* Macro to convert updated PDGs to flags indicating levels skip in flush */ ++#define pgd_level_to_skip_flush(dirty_pgds) (~(dirty_pgds) & 0xF) ++ ++/* Small wrapper function to factor out GPU-dependent context releasing */ ++static void release_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx) ++{ ++#if MALI_USE_CSF ++ CSTD_UNUSED(kbdev); ++ kbase_ctx_sched_release_ctx_lock(kctx); ++#else /* MALI_USE_CSF */ ++ kbasep_js_runpool_release_ctx(kbdev, kctx); ++#endif /* MALI_USE_CSF */ ++} ++ ++static void mmu_hw_operation_begin(struct kbase_device *kbdev) ++{ ++#if !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++#if MALI_USE_CSF ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_GPU2019_3878)) { ++ unsigned long flags; ++ ++ lockdep_assert_held(&kbdev->mmu_hw_mutex); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ WARN_ON_ONCE(kbdev->mmu_hw_operation_in_progress); ++ kbdev->mmu_hw_operation_in_progress = true; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } ++#endif /* MALI_USE_CSF */ ++#endif /* !CONFIG_MALI_BIFROST_NO_MALI */ ++} ++ ++static void mmu_hw_operation_end(struct kbase_device *kbdev) ++{ ++#if !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++#if MALI_USE_CSF ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_GPU2019_3878)) { ++ unsigned long flags; ++ ++ lockdep_assert_held(&kbdev->mmu_hw_mutex); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ WARN_ON_ONCE(!kbdev->mmu_hw_operation_in_progress); ++ kbdev->mmu_hw_operation_in_progress = false; ++ /* Invoke the PM state machine, the L2 power off may have been ++ * skipped due to the MMU command. ++ */ ++ kbase_pm_update_state(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } ++#endif /* MALI_USE_CSF */ ++#endif /* !CONFIG_MALI_BIFROST_NO_MALI */ ++} + +/** -+ * kbase_mmu_flush_invalidate() - Flush and invalidate the GPU caches. -+ * @kctx: The KBase context. -+ * @vpfn: The virtual page frame number to start the flush on. -+ * @nr: The number of pages to flush. -+ * @sync: Set if the operation should be synchronous or not. ++ * mmu_flush_cache_on_gpu_ctrl() - Check if cache flush needs to be done ++ * through GPU_CONTROL interface. + * -+ * Issue a cache flush + invalidate to the GPU caches and invalidate the TLBs. ++ * @kbdev: kbase device to check GPU model ID on. + * -+ * If sync is not set then transactions still in flight when the flush is issued -+ * may use the old page tables and the data they write will not be written out -+ * to memory, this function returns after the flush has been issued but -+ * before all accesses which might effect the flushed region have completed. ++ * This function returns whether a cache flush for page table update should ++ * run through GPU_CONTROL interface or MMU_AS_CONTROL interface. + * -+ * If sync is set then accesses in the flushed region will be drained -+ * before data is flush and invalidated through L1, L2 and into memory, -+ * after which point this function will return. ++ * Return: True if cache flush should be done on GPU command. + */ -+static void kbase_mmu_flush_invalidate(struct kbase_context *kctx, -+ u64 vpfn, size_t nr, bool sync); ++static bool mmu_flush_cache_on_gpu_ctrl(struct kbase_device *kbdev) ++{ ++ uint32_t const arch_maj_cur = (kbdev->gpu_props.props.raw_props.gpu_id & ++ GPU_ID2_ARCH_MAJOR) >> ++ GPU_ID2_ARCH_MAJOR_SHIFT; ++ ++ return arch_maj_cur > 11; ++} + +/** -+ * kbase_mmu_flush_invalidate_no_ctx() - Flush and invalidate the GPU caches. -+ * @kbdev: Device pointer. -+ * @vpfn: The virtual page frame number to start the flush on. -+ * @nr: The number of pages to flush. -+ * @sync: Set if the operation should be synchronous or not. -+ * @as_nr: GPU address space number for which flush + invalidate is required. ++ * mmu_flush_pa_range() - Flush physical address range ++ * ++ * @kbdev: kbase device to issue the MMU operation on. ++ * @phys: Starting address of the physical range to start the operation on. ++ * @nr_bytes: Number of bytes to work on. ++ * @op: Type of cache flush operation to perform. + * -+ * This is used for MMU tables which do not belong to a user space context. ++ * Issue a cache flush physical range command. + */ -+static void kbase_mmu_flush_invalidate_no_ctx(struct kbase_device *kbdev, -+ u64 vpfn, size_t nr, bool sync, int as_nr); ++#if MALI_USE_CSF ++static void mmu_flush_pa_range(struct kbase_device *kbdev, phys_addr_t phys, size_t nr_bytes, ++ enum kbase_mmu_op_type op) ++{ ++ u32 flush_op; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ /* Translate operation to command */ ++ if (op == KBASE_MMU_OP_FLUSH_PT) ++ flush_op = GPU_COMMAND_FLUSH_PA_RANGE_CLN_INV_L2; ++ else if (op == KBASE_MMU_OP_FLUSH_MEM) ++ flush_op = GPU_COMMAND_FLUSH_PA_RANGE_CLN_INV_L2_LSC; ++ else { ++ dev_warn(kbdev->dev, "Invalid flush request (op = %d)", op); ++ return; ++ } ++ ++ if (kbase_gpu_cache_flush_pa_range_and_busy_wait(kbdev, phys, nr_bytes, flush_op)) ++ dev_err(kbdev->dev, "Flush for physical address range did not complete"); ++} ++#endif + +/** -+ * kbase_mmu_sync_pgd - sync page directory to memory -+ * @kbdev: Device pointer. -+ * @handle: Address of DMA region. -+ * @size: Size of the region to sync. ++ * mmu_invalidate() - Perform an invalidate operation on MMU caches. ++ * @kbdev: The Kbase device. ++ * @kctx: The Kbase context. ++ * @as_nr: GPU address space number for which invalidate is required. ++ * @op_param: Non-NULL pointer to struct containing information about the MMU ++ * operation to perform. + * -+ * This should be called after each page directory update. ++ * Perform an MMU invalidate operation on a particual address space ++ * by issuing a UNLOCK command. + */ ++static void mmu_invalidate(struct kbase_device *kbdev, struct kbase_context *kctx, int as_nr, ++ const struct kbase_mmu_hw_op_param *op_param) ++{ ++ unsigned long flags; + -+static void kbase_mmu_sync_pgd(struct kbase_device *kbdev, -+ dma_addr_t handle, size_t size) ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ++ if (kbdev->pm.backend.gpu_powered && (!kctx || kctx->as_nr >= 0)) { ++ as_nr = kctx ? kctx->as_nr : as_nr; ++ if (kbase_mmu_hw_do_unlock(kbdev, &kbdev->as[as_nr], op_param)) ++ dev_err(kbdev->dev, ++ "Invalidate after GPU page table update did not complete"); ++ } ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++} ++ ++/* Perform a flush/invalidate on a particular address space ++ */ ++static void mmu_flush_invalidate_as(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param) +{ -+ /* If page table is not coherent then ensure the gpu can read ++ unsigned long flags; ++ ++ /* AS transaction begin */ ++ mutex_lock(&kbdev->mmu_hw_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ++ if (kbdev->pm.backend.gpu_powered && (kbase_mmu_hw_do_flush_locked(kbdev, as, op_param))) ++ dev_err(kbdev->dev, "Flush for GPU page table update did not complete"); ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++ /* AS transaction end */ ++} ++ ++/** ++ * mmu_flush_invalidate() - Perform a flush operation on GPU caches. ++ * @kbdev: The Kbase device. ++ * @kctx: The Kbase context. ++ * @as_nr: GPU address space number for which flush + invalidate is required. ++ * @op_param: Non-NULL pointer to struct containing information about the MMU ++ * operation to perform. ++ * ++ * This function performs the cache flush operation described by @op_param. ++ * The function retains a reference to the given @kctx and releases it ++ * after performing the flush operation. ++ * ++ * If operation is set to KBASE_MMU_OP_FLUSH_PT then this function will issue ++ * a cache flush + invalidate to the L2 caches and invalidate the TLBs. ++ * ++ * If operation is set to KBASE_MMU_OP_FLUSH_MEM then this function will issue ++ * a cache flush + invalidate to the L2 and GPU Load/Store caches as well as ++ * invalidating the TLBs. ++ */ ++static void mmu_flush_invalidate(struct kbase_device *kbdev, struct kbase_context *kctx, int as_nr, ++ const struct kbase_mmu_hw_op_param *op_param) ++{ ++ bool ctx_is_in_runpool; ++ ++ /* Early out if there is nothing to do */ ++ if (op_param->nr == 0) ++ return; ++ ++ /* If no context is provided then MMU operation is performed on address ++ * space which does not belong to user space context. Otherwise, retain ++ * refcount to context provided and release after flush operation. ++ */ ++ if (!kctx) { ++ mmu_flush_invalidate_as(kbdev, &kbdev->as[as_nr], op_param); ++ } else { ++#if !MALI_USE_CSF ++ mutex_lock(&kbdev->js_data.queue_mutex); ++ ctx_is_in_runpool = kbase_ctx_sched_inc_refcount(kctx); ++ mutex_unlock(&kbdev->js_data.queue_mutex); ++#else ++ ctx_is_in_runpool = kbase_ctx_sched_inc_refcount_if_as_valid(kctx); ++#endif /* !MALI_USE_CSF */ ++ ++ if (ctx_is_in_runpool) { ++ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); ++ ++ mmu_flush_invalidate_as(kbdev, &kbdev->as[kctx->as_nr], op_param); ++ ++ release_ctx(kbdev, kctx); ++ } ++ } ++} ++ ++/** ++ * mmu_flush_invalidate_on_gpu_ctrl() - Perform a flush operation on GPU caches via ++ * the GPU_CONTROL interface ++ * @kbdev: The Kbase device. ++ * @kctx: The Kbase context. ++ * @as_nr: GPU address space number for which flush + invalidate is required. ++ * @op_param: Non-NULL pointer to struct containing information about the MMU ++ * operation to perform. ++ * ++ * Perform a flush/invalidate on a particular address space via the GPU_CONTROL ++ * interface. ++ */ ++static void mmu_flush_invalidate_on_gpu_ctrl(struct kbase_device *kbdev, struct kbase_context *kctx, ++ int as_nr, const struct kbase_mmu_hw_op_param *op_param) ++{ ++ unsigned long flags; ++ ++ /* AS transaction begin */ ++ mutex_lock(&kbdev->mmu_hw_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ++ if (kbdev->pm.backend.gpu_powered && (!kctx || kctx->as_nr >= 0)) { ++ as_nr = kctx ? kctx->as_nr : as_nr; ++ if (kbase_mmu_hw_do_flush_on_gpu_ctrl(kbdev, &kbdev->as[as_nr], op_param)) ++ dev_err(kbdev->dev, "Flush for GPU page table update did not complete"); ++ } ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++} ++ ++static void kbase_mmu_sync_pgd_gpu(struct kbase_device *kbdev, struct kbase_context *kctx, ++ phys_addr_t phys, size_t size, ++ enum kbase_mmu_op_type flush_op) ++{ ++ kbase_mmu_flush_pa_range(kbdev, kctx, phys, size, flush_op); ++} ++ ++static void kbase_mmu_sync_pgd_cpu(struct kbase_device *kbdev, dma_addr_t handle, size_t size) ++{ ++ /* In non-coherent system, ensure the GPU can read + * the pages from memory + */ -+ if (kbdev->system_coherency != COHERENCY_ACE) ++ if (kbdev->system_coherency == COHERENCY_NONE) + dma_sync_single_for_device(kbdev->dev, handle, size, + DMA_TO_DEVICE); +} + ++/** ++ * kbase_mmu_sync_pgd() - sync page directory to memory when needed. ++ * @kbdev: Device pointer. ++ * @kctx: Context pointer. ++ * @phys: Starting physical address of the destination region. ++ * @handle: Address of DMA region. ++ * @size: Size of the region to sync. ++ * @flush_op: MMU cache flush operation to perform on the physical address ++ * range, if GPU control is available. ++ * ++ * This function is called whenever the association between a virtual address ++ * range and a physical address range changes, because a mapping is created or ++ * destroyed. ++ * One of the effects of this operation is performing an MMU cache flush ++ * operation only on the physical address range affected by this function, if ++ * GPU control is available. ++ * ++ * This should be called after each page directory update. ++ */ ++static void kbase_mmu_sync_pgd(struct kbase_device *kbdev, struct kbase_context *kctx, ++ phys_addr_t phys, dma_addr_t handle, size_t size, ++ enum kbase_mmu_op_type flush_op) ++{ ++ ++ kbase_mmu_sync_pgd_cpu(kbdev, handle, size); ++ kbase_mmu_sync_pgd_gpu(kbdev, kctx, phys, size, flush_op); ++} ++ +/* + * Definitions: + * - PGD: Page Directory. @@ -242863,14 +280649,159 @@ index 000000000000..a5cda009426d + * a 4kB physical page. + */ + -+static int kbase_mmu_update_pages_no_flush(struct kbase_context *kctx, u64 vpfn, -+ struct tagged_addr *phys, size_t nr, -+ unsigned long flags, int group_id); ++static int kbase_mmu_update_pages_no_flush(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ u64 vpfn, struct tagged_addr *phys, size_t nr, ++ unsigned long flags, int group_id, u64 *dirty_pgds); ++ ++/** ++ * kbase_mmu_update_and_free_parent_pgds() - Update number of valid entries and ++ * free memory of the page directories ++ * ++ * @kbdev: Device pointer. ++ * @mmut: GPU MMU page table. ++ * @pgds: Physical addresses of page directories to be freed. ++ * @vpfn: The virtual page frame number. ++ * @level: The level of MMU page table. ++ * @flush_op: The type of MMU flush operation to perform. ++ * @dirty_pgds: Flags to track every level where a PGD has been updated. ++ */ ++static void kbase_mmu_update_and_free_parent_pgds(struct kbase_device *kbdev, ++ struct kbase_mmu_table *mmut, phys_addr_t *pgds, ++ u64 vpfn, int level, ++ enum kbase_mmu_op_type flush_op, u64 *dirty_pgds); ++ ++static void kbase_mmu_account_freed_pgd(struct kbase_device *kbdev, struct kbase_mmu_table *mmut) ++{ ++ atomic_sub(1, &kbdev->memdev.used_pages); ++ ++ /* If MMU tables belong to a context then pages will have been accounted ++ * against it, so we must decrement the usage counts here. ++ */ ++ if (mmut->kctx) { ++ kbase_process_page_usage_dec(mmut->kctx, 1); ++ atomic_sub(1, &mmut->kctx->used_pages); ++ } ++ ++ kbase_trace_gpu_mem_usage_dec(kbdev, mmut->kctx, 1); ++} ++ ++static bool kbase_mmu_handle_isolated_pgd_page(struct kbase_device *kbdev, ++ struct kbase_mmu_table *mmut, ++ struct page *p) ++{ ++ struct kbase_page_metadata *page_md = kbase_page_private(p); ++ bool page_is_isolated = false; ++ ++ lockdep_assert_held(&mmut->mmu_lock); ++ ++ if (!kbase_page_migration_enabled) ++ return false; ++ ++ spin_lock(&page_md->migrate_lock); ++ if (PAGE_STATUS_GET(page_md->status) == PT_MAPPED) { ++ WARN_ON_ONCE(!mmut->kctx); ++ if (IS_PAGE_ISOLATED(page_md->status)) { ++ page_md->status = PAGE_STATUS_SET(page_md->status, ++ FREE_PT_ISOLATED_IN_PROGRESS); ++ page_md->data.free_pt_isolated.kbdev = kbdev; ++ page_is_isolated = true; ++ } else { ++ page_md->status = ++ PAGE_STATUS_SET(page_md->status, FREE_IN_PROGRESS); ++ } ++ } else { ++ WARN_ON_ONCE(mmut->kctx); ++ WARN_ON_ONCE(PAGE_STATUS_GET(page_md->status) != NOT_MOVABLE); ++ } ++ spin_unlock(&page_md->migrate_lock); ++ ++ if (unlikely(page_is_isolated)) { ++ /* Do the CPU cache flush and accounting here for the isolated ++ * PGD page, which is done inside kbase_mmu_free_pgd() for the ++ * PGD page that did not get isolated. ++ */ ++ dma_sync_single_for_device(kbdev->dev, kbase_dma_addr(p), PAGE_SIZE, ++ DMA_BIDIRECTIONAL); ++ kbase_mmu_account_freed_pgd(kbdev, mmut); ++ } ++ ++ return page_is_isolated; ++} ++ ++/** ++ * kbase_mmu_free_pgd() - Free memory of the page directory ++ * ++ * @kbdev: Device pointer. ++ * @mmut: GPU MMU page table. ++ * @pgd: Physical address of page directory to be freed. ++ * ++ * This function is supposed to be called with mmu_lock held and after ++ * ensuring that GPU won't be able to access the page. ++ */ ++static void kbase_mmu_free_pgd(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ phys_addr_t pgd) ++{ ++ struct page *p; ++ bool page_is_isolated = false; ++ ++ lockdep_assert_held(&mmut->mmu_lock); ++ ++ p = pfn_to_page(PFN_DOWN(pgd)); ++ page_is_isolated = kbase_mmu_handle_isolated_pgd_page(kbdev, mmut, p); ++ ++ if (likely(!page_is_isolated)) { ++ kbase_mem_pool_free(&kbdev->mem_pools.small[mmut->group_id], p, true); ++ kbase_mmu_account_freed_pgd(kbdev, mmut); ++ } ++} ++ ++/** ++ * kbase_mmu_free_pgds_list() - Free the PGD pages present in the list ++ * ++ * @kbdev: Device pointer. ++ * @mmut: GPU MMU page table. ++ * ++ * This function will call kbase_mmu_free_pgd() on each page directory page ++ * present in the list of free PGDs inside @mmut. ++ * ++ * The function is supposed to be called after the GPU cache and MMU TLB has ++ * been invalidated post the teardown loop. ++ * ++ * The mmu_lock shall be held prior to calling the function. ++ */ ++static void kbase_mmu_free_pgds_list(struct kbase_device *kbdev, struct kbase_mmu_table *mmut) ++{ ++ size_t i; ++ ++ lockdep_assert_held(&mmut->mmu_lock); ++ ++ for (i = 0; i < mmut->scratch_mem.free_pgds.head_index; i++) ++ kbase_mmu_free_pgd(kbdev, mmut, page_to_phys(mmut->scratch_mem.free_pgds.pgds[i])); ++ ++ mmut->scratch_mem.free_pgds.head_index = 0; ++} ++ ++static void kbase_mmu_add_to_free_pgds_list(struct kbase_mmu_table *mmut, struct page *p) ++{ ++ lockdep_assert_held(&mmut->mmu_lock); ++ ++ if (WARN_ON_ONCE(mmut->scratch_mem.free_pgds.head_index > (MAX_FREE_PGDS - 1))) ++ return; ++ ++ mmut->scratch_mem.free_pgds.pgds[mmut->scratch_mem.free_pgds.head_index++] = p; ++} ++ ++static inline void kbase_mmu_reset_free_pgds_list(struct kbase_mmu_table *mmut) ++{ ++ lockdep_assert_held(&mmut->mmu_lock); ++ ++ mmut->scratch_mem.free_pgds.head_index = 0; ++} + +/** + * reg_grow_calc_extra_pages() - Calculate the number of backed pages to add to + * a region on a GPU page fault -+ * ++ * @kbdev: KBase device + * @reg: The region that will be backed with more pages + * @fault_rel_pfn: PFN of the fault relative to the start of the region + * @@ -242886,20 +280817,21 @@ index 000000000000..a5cda009426d +static size_t reg_grow_calc_extra_pages(struct kbase_device *kbdev, + struct kbase_va_region *reg, size_t fault_rel_pfn) +{ -+ size_t multiple = reg->extent; ++ size_t multiple = reg->extension; + size_t reg_current_size = kbase_reg_current_backed_size(reg); + size_t minimum_extra = fault_rel_pfn - reg_current_size + 1; + size_t remainder; + + if (!multiple) { -+ dev_warn(kbdev->dev, -+ "VA Region 0x%llx extent was 0, allocator needs to set this properly for KBASE_REG_PF_GROW\n", ++ dev_warn( ++ kbdev->dev, ++ "VA Region 0x%llx extension was 0, allocator needs to set this properly for KBASE_REG_PF_GROW", + ((unsigned long long)reg->start_pfn) << PAGE_SHIFT); + return minimum_extra; + } + + /* Calculate the remainder to subtract from minimum_extra to make it -+ * the desired (rounded down) multiple of the extent. ++ * the desired (rounded down) multiple of the extension. + * Depending on reg's flags, the base used for calculating multiples is + * different + */ @@ -242946,35 +280878,83 @@ index 000000000000..a5cda009426d +} + +#ifdef CONFIG_MALI_CINSTR_GWT -+static void kbase_gpu_mmu_handle_write_faulting_as( -+ struct kbase_device *kbdev, -+ struct kbase_as *faulting_as, -+ u64 start_pfn, size_t nr, u32 op) ++static void kbase_gpu_mmu_handle_write_faulting_as(struct kbase_device *kbdev, ++ struct kbase_as *faulting_as, ++ u64 start_pfn, size_t nr, ++ u32 kctx_id, u64 dirty_pgds) +{ ++ /* Calls to this function are inherently synchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_SYNC; ++ struct kbase_mmu_hw_op_param op_param; ++ int ret = 0; ++ + mutex_lock(&kbdev->mmu_hw_mutex); + + kbase_mmu_hw_clear_fault(kbdev, faulting_as, + KBASE_MMU_FAULT_TYPE_PAGE); -+ kbase_mmu_hw_do_operation(kbdev, faulting_as, start_pfn, -+ nr, op, 1); ++ ++ /* flush L2 and unlock the VA (resumes the MMU) */ ++ op_param.vpfn = start_pfn; ++ op_param.nr = nr; ++ op_param.op = KBASE_MMU_OP_FLUSH_PT; ++ op_param.kctx_id = kctx_id; ++ op_param.mmu_sync_info = mmu_sync_info; ++ if (mmu_flush_cache_on_gpu_ctrl(kbdev)) { ++ unsigned long irq_flags; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, irq_flags); ++ op_param.flush_skip_levels = ++ pgd_level_to_skip_flush(dirty_pgds); ++ ret = kbase_mmu_hw_do_flush_on_gpu_ctrl(kbdev, faulting_as, &op_param); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, irq_flags); ++ } else { ++ mmu_hw_operation_begin(kbdev); ++ ret = kbase_mmu_hw_do_flush(kbdev, faulting_as, &op_param); ++ mmu_hw_operation_end(kbdev); ++ } + + mutex_unlock(&kbdev->mmu_hw_mutex); + ++ if (ret) ++ dev_err(kbdev->dev, ++ "Flush for GPU page fault due to write access did not complete"); ++ + kbase_mmu_hw_enable_fault(kbdev, faulting_as, + KBASE_MMU_FAULT_TYPE_PAGE); +} + ++static void set_gwt_element_page_addr_and_size( ++ struct kbasep_gwt_list_element *element, ++ u64 fault_page_addr, struct tagged_addr fault_phys) ++{ ++ u64 fault_pfn = fault_page_addr >> PAGE_SHIFT; ++ unsigned int vindex = fault_pfn & (NUM_4K_PAGES_IN_2MB_PAGE - 1); ++ ++ /* If the fault address lies within a 2MB page, then consider ++ * the whole 2MB page for dumping to avoid incomplete dumps. ++ */ ++ if (is_huge(fault_phys) && (vindex == index_in_large_page(fault_phys))) { ++ element->page_addr = fault_page_addr & ~(SZ_2M - 1); ++ element->num_pages = NUM_4K_PAGES_IN_2MB_PAGE; ++ } else { ++ element->page_addr = fault_page_addr; ++ element->num_pages = 1; ++ } ++} ++ +static void kbase_gpu_mmu_handle_write_fault(struct kbase_context *kctx, + struct kbase_as *faulting_as) +{ + struct kbasep_gwt_list_element *pos; + struct kbase_va_region *region; + struct kbase_device *kbdev; ++ struct tagged_addr *fault_phys_addr; + struct kbase_fault *fault; + u64 fault_pfn, pfn_offset; -+ u32 op; -+ int ret; + int as_no; ++ u64 dirty_pgds = 0; + + as_no = faulting_as->number; + kbdev = container_of(faulting_as, struct kbase_device, as[as_no]); @@ -243002,15 +280982,18 @@ index 000000000000..a5cda009426d + return; + } + ++ pfn_offset = fault_pfn - region->start_pfn; ++ fault_phys_addr = &kbase_get_gpu_phy_pages(region)[pfn_offset]; ++ + /* Capture addresses of faulting write location + * for job dumping if write tracking is enabled. + */ + if (kctx->gwt_enabled) { -+ u64 page_addr = fault->addr & PAGE_MASK; ++ u64 fault_page_addr = fault->addr & PAGE_MASK; + bool found = false; + /* Check if this write was already handled. */ + list_for_each_entry(pos, &kctx->gwt_current_list, link) { -+ if (page_addr == pos->page_addr) { ++ if (fault_page_addr == pos->page_addr) { + found = true; + break; + } @@ -243020,8 +281003,8 @@ index 000000000000..a5cda009426d + pos = kmalloc(sizeof(*pos), GFP_KERNEL); + if (pos) { + pos->region = region; -+ pos->page_addr = page_addr; -+ pos->num_pages = 1; ++ set_gwt_element_page_addr_and_size(pos, ++ fault_page_addr, *fault_phys_addr); + list_add(&pos->link, &kctx->gwt_current_list); + } else { + dev_warn(kbdev->dev, "kmalloc failure"); @@ -243029,17 +281012,12 @@ index 000000000000..a5cda009426d + } + } + -+ pfn_offset = fault_pfn - region->start_pfn; + /* Now make this faulting page writable to GPU. */ -+ ret = kbase_mmu_update_pages_no_flush(kctx, fault_pfn, -+ &kbase_get_gpu_phy_pages(region)[pfn_offset], -+ 1, region->flags, region->gpu_alloc->group_id); -+ -+ /* flush L2 and unlock the VA (resumes the MMU) */ -+ op = AS_COMMAND_FLUSH_PT; ++ kbase_mmu_update_pages_no_flush(kbdev, &kctx->mmu, fault_pfn, fault_phys_addr, 1, ++ region->flags, region->gpu_alloc->group_id, &dirty_pgds); + -+ kbase_gpu_mmu_handle_write_faulting_as(kbdev, faulting_as, -+ fault_pfn, 1, op); ++ kbase_gpu_mmu_handle_write_faulting_as(kbdev, faulting_as, fault_pfn, 1, ++ kctx->id, dirty_pgds); + + kbase_gpu_vm_unlock(kctx); +} @@ -243070,31 +281048,68 @@ index 000000000000..a5cda009426d +} +#endif + -+#define MAX_POOL_LEVEL 2 ++/** ++ * estimate_pool_space_required - Determine how much a pool should be grown by to support a future ++ * allocation ++ * @pool: The memory pool to check, including its linked pools ++ * @pages_required: Number of 4KiB pages require for the pool to support a future allocation ++ * ++ * The value returned is accounting for the size of @pool and the size of each memory pool linked to ++ * @pool. Hence, the caller should use @pool and (if not already satisfied) all its linked pools to ++ * allocate from. ++ * ++ * Note: this is only an estimate, because even during the calculation the memory pool(s) involved ++ * can be updated to be larger or smaller. Hence, the result is only a guide as to whether an ++ * allocation could succeed, or an estimate of the correct amount to grow the pool by. The caller ++ * should keep attempting an allocation and then re-growing with a new value queried form this ++ * function until the allocation succeeds. ++ * ++ * Return: an estimate of the amount of extra 4KiB pages in @pool that are required to satisfy an ++ * allocation, or 0 if @pool (including its linked pools) is likely to already satisfy the ++ * allocation. ++ */ ++static size_t estimate_pool_space_required(struct kbase_mem_pool *pool, const size_t pages_required) ++{ ++ size_t pages_still_required; ++ ++ for (pages_still_required = pages_required; pool != NULL && pages_still_required; ++ pool = pool->next_pool) { ++ size_t pool_size_4k; ++ ++ kbase_mem_pool_lock(pool); ++ ++ pool_size_4k = kbase_mem_pool_size(pool) << pool->order; ++ if (pool_size_4k >= pages_still_required) ++ pages_still_required = 0; ++ else ++ pages_still_required -= pool_size_4k; ++ ++ kbase_mem_pool_unlock(pool); ++ } ++ return pages_still_required; ++} + +/** + * page_fault_try_alloc - Try to allocate memory from a context pool + * @kctx: Context pointer + * @region: Region to grow -+ * @new_pages: Number of 4 kB pages to allocate -+ * @pages_to_grow: Pointer to variable to store number of outstanding pages on -+ * failure. This can be either 4 kB or 2 MB pages, depending on -+ * the number of pages requested. -+ * @grow_2mb_pool: Pointer to variable to store which pool needs to grow - true -+ * for 2 MB, false for 4 kB. ++ * @new_pages: Number of 4 KiB pages to allocate ++ * @pages_to_grow: Pointer to variable to store number of outstanding pages on failure. This can be ++ * either 4 KiB or 2 MiB pages, depending on the number of pages requested. ++ * @grow_2mb_pool: Pointer to variable to store which pool needs to grow - true for 2 MiB, false for ++ * 4 KiB. + * @prealloc_sas: Pointer to kbase_sub_alloc structures + * -+ * This function will try to allocate as many pages as possible from the context -+ * pool, then if required will try to allocate the remaining pages from the -+ * device pool. ++ * This function will try to allocate as many pages as possible from the context pool, then if ++ * required will try to allocate the remaining pages from the device pool. + * -+ * This function will not allocate any new memory beyond that that is already -+ * present in the context or device pools. This is because it is intended to be -+ * called with the vm_lock held, which could cause recursive locking if the -+ * allocation caused the out-of-memory killer to run. ++ * This function will not allocate any new memory beyond that is already present in the context or ++ * device pools. This is because it is intended to be called whilst the thread has acquired the ++ * region list lock with kbase_gpu_vm_lock(), and a large enough memory allocation whilst that is ++ * held could invoke the OoM killer and cause an effective deadlock with kbase_cpu_vm_close(). + * -+ * If 2 MB pages are enabled and new_pages is >= 2 MB then pages_to_grow will be -+ * a count of 2 MB pages, otherwise it will be a count of 4 kB pages. ++ * If 2 MiB pages are enabled and new_pages is >= 2 MiB then pages_to_grow will be a count of 2 MiB ++ * pages, otherwise it will be a count of 4 KiB pages. + * + * Return: true if successful, false on failure + */ @@ -243103,13 +281118,15 @@ index 000000000000..a5cda009426d + int *pages_to_grow, bool *grow_2mb_pool, + struct kbase_sub_alloc **prealloc_sas) +{ -+ struct tagged_addr *gpu_pages[MAX_POOL_LEVEL] = {NULL}; -+ struct tagged_addr *cpu_pages[MAX_POOL_LEVEL] = {NULL}; -+ size_t pages_alloced[MAX_POOL_LEVEL] = {0}; ++ size_t total_gpu_pages_alloced = 0; ++ size_t total_cpu_pages_alloced = 0; + struct kbase_mem_pool *pool, *root_pool; -+ int pool_level = 0; + bool alloc_failed = false; + size_t pages_still_required; ++ size_t total_mempools_free_4k = 0; ++ ++ lockdep_assert_held(&kctx->reg_lock); ++ lockdep_assert_held(&kctx->mem_partials_lock); + + if (WARN_ON(region->gpu_alloc->group_id >= + MEMORY_GROUP_MANAGER_NR_GROUPS)) { @@ -243118,42 +281135,21 @@ index 000000000000..a5cda009426d + return false; + } + -+#ifdef CONFIG_MALI_2MB_ALLOC -+ if (new_pages >= (SZ_2M / SZ_4K)) { ++ if (kctx->kbdev->pagesize_2mb && new_pages >= (SZ_2M / SZ_4K)) { + root_pool = &kctx->mem_pools.large[region->gpu_alloc->group_id]; + *grow_2mb_pool = true; + } else { -+#endif + root_pool = &kctx->mem_pools.small[region->gpu_alloc->group_id]; + *grow_2mb_pool = false; -+#ifdef CONFIG_MALI_2MB_ALLOC + } -+#endif + + if (region->gpu_alloc != region->cpu_alloc) + new_pages *= 2; + -+ pages_still_required = new_pages; -+ + /* Determine how many pages are in the pools before trying to allocate. + * Don't attempt to allocate & free if the allocation can't succeed. + */ -+ for (pool = root_pool; pool != NULL; pool = pool->next_pool) { -+ size_t pool_size_4k; -+ -+ kbase_mem_pool_lock(pool); -+ -+ pool_size_4k = kbase_mem_pool_size(pool) << pool->order; -+ if (pool_size_4k >= pages_still_required) -+ pages_still_required = 0; -+ else -+ pages_still_required -= pool_size_4k; -+ -+ kbase_mem_pool_unlock(pool); -+ -+ if (!pages_still_required) -+ break; -+ } ++ pages_still_required = estimate_pool_space_required(root_pool, new_pages); + + if (pages_still_required) { + /* Insufficient pages in pools. Don't try to allocate - just @@ -243164,11 +281160,11 @@ index 000000000000..a5cda009426d + return false; + } + -+ /* Since we've dropped the pool locks, the amount of memory in the pools -+ * may change between the above check and the actual allocation. ++ /* Since we're not holding any of the mempool locks, the amount of memory in the pools may ++ * change between the above estimate and the actual allocation. + */ -+ pool = root_pool; -+ for (pool_level = 0; pool_level < MAX_POOL_LEVEL; pool_level++) { ++ pages_still_required = new_pages; ++ for (pool = root_pool; pool != NULL && pages_still_required; pool = pool->next_pool) { + size_t pool_size_4k; + size_t pages_to_alloc_4k; + size_t pages_to_alloc_4k_per_alloc; @@ -243177,94 +281173,92 @@ index 000000000000..a5cda009426d + + /* Allocate as much as possible from this pool*/ + pool_size_4k = kbase_mem_pool_size(pool) << pool->order; -+ pages_to_alloc_4k = MIN(new_pages, pool_size_4k); ++ total_mempools_free_4k += pool_size_4k; ++ pages_to_alloc_4k = MIN(pages_still_required, pool_size_4k); + if (region->gpu_alloc == region->cpu_alloc) + pages_to_alloc_4k_per_alloc = pages_to_alloc_4k; + else + pages_to_alloc_4k_per_alloc = pages_to_alloc_4k >> 1; + -+ pages_alloced[pool_level] = pages_to_alloc_4k; + if (pages_to_alloc_4k) { -+ gpu_pages[pool_level] = -+ kbase_alloc_phy_pages_helper_locked( -+ region->gpu_alloc, pool, -+ pages_to_alloc_4k_per_alloc, -+ &prealloc_sas[0]); ++ struct tagged_addr *gpu_pages = ++ kbase_alloc_phy_pages_helper_locked(region->gpu_alloc, pool, ++ pages_to_alloc_4k_per_alloc, ++ &prealloc_sas[0]); + -+ if (!gpu_pages[pool_level]) { ++ if (!gpu_pages) + alloc_failed = true; -+ } else if (region->gpu_alloc != region->cpu_alloc) { -+ cpu_pages[pool_level] = -+ kbase_alloc_phy_pages_helper_locked( -+ region->cpu_alloc, pool, -+ pages_to_alloc_4k_per_alloc, -+ &prealloc_sas[1]); -+ -+ if (!cpu_pages[pool_level]) ++ else ++ total_gpu_pages_alloced += pages_to_alloc_4k_per_alloc; ++ ++ if (!alloc_failed && region->gpu_alloc != region->cpu_alloc) { ++ struct tagged_addr *cpu_pages = kbase_alloc_phy_pages_helper_locked( ++ region->cpu_alloc, pool, pages_to_alloc_4k_per_alloc, ++ &prealloc_sas[1]); ++ ++ if (!cpu_pages) + alloc_failed = true; ++ else ++ total_cpu_pages_alloced += pages_to_alloc_4k_per_alloc; + } + } + + kbase_mem_pool_unlock(pool); + + if (alloc_failed) { -+ WARN_ON(!new_pages); -+ WARN_ON(pages_to_alloc_4k >= new_pages); -+ WARN_ON(pages_to_alloc_4k_per_alloc >= new_pages); ++ WARN_ON(!pages_still_required); ++ WARN_ON(pages_to_alloc_4k >= pages_still_required); ++ WARN_ON(pages_to_alloc_4k_per_alloc >= pages_still_required); + break; + } + -+ new_pages -= pages_to_alloc_4k; -+ -+ if (!new_pages) -+ break; -+ -+ pool = pool->next_pool; -+ if (!pool) -+ break; ++ pages_still_required -= pages_to_alloc_4k; + } + -+ if (new_pages) { -+ /* Allocation was unsuccessful */ -+ int max_pool_level = pool_level; -+ -+ pool = root_pool; -+ -+ /* Free memory allocated so far */ -+ for (pool_level = 0; pool_level <= max_pool_level; -+ pool_level++) { -+ kbase_mem_pool_lock(pool); ++ if (pages_still_required) { ++ /* Allocation was unsuccessful. We have dropped the mem_pool lock after allocation, ++ * so must in any case use kbase_free_phy_pages_helper() rather than ++ * kbase_free_phy_pages_helper_locked() ++ */ ++ if (total_gpu_pages_alloced > 0) ++ kbase_free_phy_pages_helper(region->gpu_alloc, total_gpu_pages_alloced); ++ if (region->gpu_alloc != region->cpu_alloc && total_cpu_pages_alloced > 0) ++ kbase_free_phy_pages_helper(region->cpu_alloc, total_cpu_pages_alloced); + -+ if (region->gpu_alloc != region->cpu_alloc) { -+ if (pages_alloced[pool_level] && -+ cpu_pages[pool_level]) -+ kbase_free_phy_pages_helper_locked( -+ region->cpu_alloc, -+ pool, cpu_pages[pool_level], -+ pages_alloced[pool_level]); ++ if (alloc_failed) { ++ /* Note that in allocating from the above memory pools, we always ensure ++ * never to request more than is available in each pool with the pool's ++ * lock held. Hence failing to allocate in such situations would be unusual ++ * and we should cancel the growth instead (as re-growing the memory pool ++ * might not fix the situation) ++ */ ++ dev_warn( ++ kctx->kbdev->dev, ++ "Page allocation failure of %zu pages: managed %zu pages, mempool (inc linked pools) had %zu pages available", ++ new_pages, total_gpu_pages_alloced + total_cpu_pages_alloced, ++ total_mempools_free_4k); ++ *pages_to_grow = 0; ++ } else { ++ /* Tell the caller to try to grow the memory pool ++ * ++ * Freeing pages above may have spilled or returned them to the OS, so we ++ * have to take into account how many are still in the pool before giving a ++ * new estimate for growth required of the pool. We can just re-estimate a ++ * new value. ++ */ ++ pages_still_required = estimate_pool_space_required(root_pool, new_pages); ++ if (pages_still_required) { ++ *pages_to_grow = pages_still_required; ++ } else { ++ /* It's possible another thread could've grown the pool to be just ++ * big enough after we rolled back the allocation. Request at least ++ * one more page to ensure the caller doesn't fail the growth by ++ * conflating it with the alloc_failed case above ++ */ ++ *pages_to_grow = 1u; + } -+ -+ if (pages_alloced[pool_level] && gpu_pages[pool_level]) -+ kbase_free_phy_pages_helper_locked( -+ region->gpu_alloc, -+ pool, gpu_pages[pool_level], -+ pages_alloced[pool_level]); -+ -+ kbase_mem_pool_unlock(pool); -+ -+ pool = pool->next_pool; + } + -+ /* -+ * If the allocation failed despite there being enough memory in -+ * the pool, then just fail. Otherwise, try to grow the memory -+ * pool. -+ */ -+ if (alloc_failed) -+ *pages_to_grow = 0; -+ else -+ *pages_to_grow = new_pages; -+ + return false; + } + @@ -243274,18 +281268,6 @@ index 000000000000..a5cda009426d + return true; +} + -+/* Small wrapper function to factor out GPU-dependent context releasing */ -+static void release_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx) -+{ -+#if MALI_USE_CSF -+ CSTD_UNUSED(kbdev); -+ kbase_ctx_sched_release_ctx_lock(kctx); -+#else /* MALI_USE_CSF */ -+ kbasep_js_runpool_release_ctx(kbdev, kctx); -+#endif /* MALI_USE_CSF */ -+} -+ +void kbase_mmu_page_fault_worker(struct work_struct *data) +{ + u64 fault_pfn; @@ -243309,15 +281291,19 @@ index 000000000000..a5cda009426d + size_t pages_trimmed = 0; +#endif + ++ /* Calls to this function are inherently synchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_SYNC; ++ + faulting_as = container_of(data, struct kbase_as, work_pagefault); + fault = &faulting_as->pf_data; + fault_pfn = fault->addr >> PAGE_SHIFT; + as_no = faulting_as->number; + + kbdev = container_of(faulting_as, struct kbase_device, as[as_no]); -+ dev_dbg(kbdev->dev, -+ "Entering %s %p, fault_pfn %lld, as_no %d\n", -+ __func__, (void *)data, fault_pfn, as_no); ++ dev_dbg(kbdev->dev, "Entering %s %pK, fault_pfn %lld, as_no %d", __func__, (void *)data, ++ fault_pfn, as_no); + + /* Grab the context that was already refcounted in kbase_mmu_interrupt() + * Therefore, it cannot be scheduled out of this AS until we explicitly @@ -243340,8 +281326,7 @@ index 000000000000..a5cda009426d +#ifdef CONFIG_MALI_ARBITER_SUPPORT + /* check if we still have GPU */ + if (unlikely(kbase_is_gpu_removed(kbdev))) { -+ dev_dbg(kbdev->dev, -+ "%s: GPU has been removed\n", __func__); ++ dev_dbg(kbdev->dev, "%s: GPU has been removed", __func__); + goto fault_done; + } +#endif @@ -243389,21 +281374,13 @@ index 000000000000..a5cda009426d + goto fault_done; + + case AS_FAULTSTATUS_EXCEPTION_CODE_ADDRESS_SIZE_FAULT: -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Address size fault", fault); -+ else -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Unknown fault code", fault); ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Address size fault", fault); + goto fault_done; + + case AS_FAULTSTATUS_EXCEPTION_CODE_MEMORY_ATTRIBUTES_FAULT: -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Memory attributes fault", fault); -+ else -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Unknown fault code", fault); ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Memory attributes fault", fault); + goto fault_done; + + default: @@ -243412,20 +281389,24 @@ index 000000000000..a5cda009426d + goto fault_done; + } + -+#ifdef CONFIG_MALI_2MB_ALLOC -+ /* Preallocate memory for the sub-allocation structs if necessary */ -+ for (i = 0; i != ARRAY_SIZE(prealloc_sas); ++i) { -+ prealloc_sas[i] = kmalloc(sizeof(*prealloc_sas[i]), GFP_KERNEL); -+ if (!prealloc_sas[i]) { -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Failed pre-allocating memory for sub-allocations' metadata", -+ fault); -+ goto fault_done; ++page_fault_retry: ++ if (kbdev->pagesize_2mb) { ++ /* Preallocate (or re-allocate) memory for the sub-allocation structs if necessary */ ++ for (i = 0; i != ARRAY_SIZE(prealloc_sas); ++i) { ++ if (!prealloc_sas[i]) { ++ prealloc_sas[i] = kmalloc(sizeof(*prealloc_sas[i]), GFP_KERNEL); ++ ++ if (!prealloc_sas[i]) { ++ kbase_mmu_report_fault_and_kill( ++ kctx, faulting_as, ++ "Failed pre-allocating memory for sub-allocations' metadata", ++ fault); ++ goto fault_done; ++ } ++ } + } + } -+#endif /* CONFIG_MALI_2MB_ALLOC */ + -+page_fault_retry: + /* so we have a translation fault, + * let's see if it is for growable memory + */ @@ -243469,6 +281450,10 @@ index 000000000000..a5cda009426d + goto fault_done; + } + ++ if (AS_FAULTSTATUS_ACCESS_TYPE_GET(fault_status) == ++ AS_FAULTSTATUS_ACCESS_TYPE_READ) ++ dev_warn(kbdev->dev, "Grow on pagefault while reading"); ++ + /* find the size we need to grow it by + * we know the result fit in a size_t due to + * kbase_region_tracker_find_region_enclosing_address @@ -243479,6 +281464,8 @@ index 000000000000..a5cda009426d + current_backed_size = kbase_reg_current_backed_size(region); + + if (fault_rel_pfn < current_backed_size) { ++ struct kbase_mmu_hw_op_param op_param; ++ + dev_dbg(kbdev->dev, + "Page fault @ 0x%llx in allocated region 0x%llx-0x%llx of growable TMEM: Ignoring", + fault->addr, region->start_pfn, @@ -243497,8 +281484,29 @@ index 000000000000..a5cda009426d + * transaction (which should cause the other page fault to be + * raised again). + */ -+ kbase_mmu_hw_do_operation(kbdev, faulting_as, 0, 0, -+ AS_COMMAND_UNLOCK, 1); ++ op_param.mmu_sync_info = mmu_sync_info; ++ op_param.kctx_id = kctx->id; ++ if (!mmu_flush_cache_on_gpu_ctrl(kbdev)) { ++ mmu_hw_operation_begin(kbdev); ++ err = kbase_mmu_hw_do_unlock_no_addr(kbdev, faulting_as, ++ &op_param); ++ mmu_hw_operation_end(kbdev); ++ } else { ++ /* Can safely skip the invalidate for all levels in case ++ * of duplicate page faults. ++ */ ++ op_param.flush_skip_levels = 0xF; ++ op_param.vpfn = fault_pfn; ++ op_param.nr = 1; ++ err = kbase_mmu_hw_do_unlock(kbdev, faulting_as, ++ &op_param); ++ } ++ ++ if (err) { ++ dev_err(kbdev->dev, ++ "Invalidation for MMU did not complete on handling page fault @ 0x%llx", ++ fault->addr); ++ } + + mutex_unlock(&kbdev->mmu_hw_mutex); + @@ -243513,18 +281521,41 @@ index 000000000000..a5cda009426d + + /* cap to max vsize */ + new_pages = min(new_pages, region->nr_pages - current_backed_size); -+ dev_dbg(kctx->kbdev->dev, "Allocate %zu pages on page fault\n", -+ new_pages); ++ dev_dbg(kctx->kbdev->dev, "Allocate %zu pages on page fault", new_pages); + + if (new_pages == 0) { ++ struct kbase_mmu_hw_op_param op_param; ++ + mutex_lock(&kbdev->mmu_hw_mutex); + + /* Duplicate of a fault we've already handled, nothing to do */ + kbase_mmu_hw_clear_fault(kbdev, faulting_as, + KBASE_MMU_FAULT_TYPE_PAGE); ++ + /* See comment [1] about UNLOCK usage */ -+ kbase_mmu_hw_do_operation(kbdev, faulting_as, 0, 0, -+ AS_COMMAND_UNLOCK, 1); ++ op_param.mmu_sync_info = mmu_sync_info; ++ op_param.kctx_id = kctx->id; ++ if (!mmu_flush_cache_on_gpu_ctrl(kbdev)) { ++ mmu_hw_operation_begin(kbdev); ++ err = kbase_mmu_hw_do_unlock_no_addr(kbdev, faulting_as, ++ &op_param); ++ mmu_hw_operation_end(kbdev); ++ } else { ++ /* Can safely skip the invalidate for all levels in case ++ * of duplicate page faults. ++ */ ++ op_param.flush_skip_levels = 0xF; ++ op_param.vpfn = fault_pfn; ++ op_param.nr = 1; ++ err = kbase_mmu_hw_do_unlock(kbdev, faulting_as, ++ &op_param); ++ } ++ ++ if (err) { ++ dev_err(kbdev->dev, ++ "Invalidation for MMU did not complete on handling page fault @ 0x%llx", ++ fault->addr); ++ } + + mutex_unlock(&kbdev->mmu_hw_mutex); + @@ -243549,8 +281580,9 @@ index 000000000000..a5cda009426d + spin_unlock(&kctx->mem_partials_lock); + + if (grown) { ++ u64 dirty_pgds = 0; + u64 pfn_offset; -+ u32 op; ++ struct kbase_mmu_hw_op_param op_param; + + /* alloc success */ + WARN_ON(kbase_reg_current_backed_size(region) > @@ -243566,10 +281598,10 @@ index 000000000000..a5cda009426d + * so the no_flush version of insert_pages is used which allows + * us to unlock the MMU as we see fit. + */ -+ err = kbase_mmu_insert_pages_no_flush(kbdev, &kctx->mmu, -+ region->start_pfn + pfn_offset, -+ &kbase_get_gpu_phy_pages(region)[pfn_offset], -+ new_pages, region->flags, region->gpu_alloc->group_id); ++ err = kbase_mmu_insert_pages_no_flush( ++ kbdev, &kctx->mmu, region->start_pfn + pfn_offset, ++ &kbase_get_gpu_phy_pages(region)[pfn_offset], new_pages, region->flags, ++ region->gpu_alloc->group_id, &dirty_pgds, region, false); + if (err) { + kbase_free_phy_pages_helper(region->gpu_alloc, + new_pages); @@ -243588,23 +281620,18 @@ index 000000000000..a5cda009426d + (u64)new_pages); + trace_mali_mmu_page_fault_grow(region, fault, new_pages); + -+#if MALI_INCREMENTAL_RENDERING ++#if MALI_INCREMENTAL_RENDERING_JM + /* Switch to incremental rendering if we have nearly run out of + * memory in a JIT memory allocation. + */ + if (region->threshold_pages && + kbase_reg_current_backed_size(region) > + region->threshold_pages) { -+ -+ dev_dbg(kctx->kbdev->dev, -+ "%zu pages exceeded IR threshold %zu\n", -+ new_pages + current_backed_size, -+ region->threshold_pages); ++ dev_dbg(kctx->kbdev->dev, "%zu pages exceeded IR threshold %zu", ++ new_pages + current_backed_size, region->threshold_pages); + + if (kbase_mmu_switch_to_ir(kctx, region) >= 0) { -+ dev_dbg(kctx->kbdev->dev, -+ "Get region %p for IR\n", -+ (void *)region); ++ dev_dbg(kctx->kbdev->dev, "Get region %pK for IR", (void *)region); + kbase_va_region_alloc_get(kctx, region); + } + } @@ -243613,9 +281640,6 @@ index 000000000000..a5cda009426d + /* AS transaction begin */ + mutex_lock(&kbdev->mmu_hw_mutex); + -+ /* flush L2 and unlock the VA (resumes the MMU) */ -+ op = AS_COMMAND_FLUSH_PT; -+ + /* clear MMU interrupt - this needs to be done after updating + * the page tables but before issuing a FLUSH command. The + * FLUSH cmd has a side effect that it restarts stalled memory @@ -243627,9 +281651,30 @@ index 000000000000..a5cda009426d + kbase_mmu_hw_clear_fault(kbdev, faulting_as, + KBASE_MMU_FAULT_TYPE_PAGE); + -+ kbase_mmu_hw_do_operation(kbdev, faulting_as, -+ fault->addr >> PAGE_SHIFT, -+ new_pages, op, 1); ++ op_param.vpfn = region->start_pfn + pfn_offset; ++ op_param.nr = new_pages; ++ op_param.op = KBASE_MMU_OP_FLUSH_PT; ++ op_param.kctx_id = kctx->id; ++ op_param.mmu_sync_info = mmu_sync_info; ++ if (mmu_flush_cache_on_gpu_ctrl(kbdev)) { ++ /* Unlock to invalidate the TLB (and resume the MMU) */ ++ op_param.flush_skip_levels = ++ pgd_level_to_skip_flush(dirty_pgds); ++ err = kbase_mmu_hw_do_unlock(kbdev, faulting_as, ++ &op_param); ++ } else { ++ /* flush L2 and unlock the VA (resumes the MMU) */ ++ mmu_hw_operation_begin(kbdev); ++ err = kbase_mmu_hw_do_flush(kbdev, faulting_as, ++ &op_param); ++ mmu_hw_operation_end(kbdev); ++ } ++ ++ if (err) { ++ dev_err(kbdev->dev, ++ "Flush for GPU page table update did not complete on handling page fault @ 0x%llx", ++ fault->addr); ++ } + + mutex_unlock(&kbdev->mmu_hw_mutex); + /* AS transaction end */ @@ -243674,8 +281719,7 @@ index 000000000000..a5cda009426d + * Otherwise fail the allocation. + */ + if (pages_to_grow > 0) { -+#ifdef CONFIG_MALI_2MB_ALLOC -+ if (grow_2mb_pool) { ++ if (kbdev->pagesize_2mb && grow_2mb_pool) { + /* Round page requirement up to nearest 2 MB */ + struct kbase_mem_pool *const lp_mem_pool = + &kctx->mem_pools.large[ @@ -243686,25 +281730,22 @@ index 000000000000..a5cda009426d + >> lp_mem_pool->order; + + ret = kbase_mem_pool_grow(lp_mem_pool, -+ pages_to_grow); ++ pages_to_grow, kctx->task); + } else { -+#endif + struct kbase_mem_pool *const mem_pool = + &kctx->mem_pools.small[ + region->gpu_alloc->group_id]; + + ret = kbase_mem_pool_grow(mem_pool, -+ pages_to_grow); -+#ifdef CONFIG_MALI_2MB_ALLOC ++ pages_to_grow, kctx->task); + } -+#endif + } + if (ret < 0) { + /* failed to extend, handle as a normal PF */ + kbase_mmu_report_fault_and_kill(kctx, faulting_as, + "Page allocation failure", fault); + } else { -+ dev_dbg(kbdev->dev, "Try again after pool_grow\n"); ++ dev_dbg(kbdev->dev, "Try again after pool_grow"); + goto page_fault_retry; + } + } @@ -243731,24 +281772,26 @@ index 000000000000..a5cda009426d + release_ctx(kbdev, kctx); + + atomic_dec(&kbdev->faults_pending); -+ dev_dbg(kbdev->dev, "Leaving page_fault_worker %p\n", (void *)data); ++ dev_dbg(kbdev->dev, "Leaving page_fault_worker %pK", (void *)data); +} + +static phys_addr_t kbase_mmu_alloc_pgd(struct kbase_device *kbdev, + struct kbase_mmu_table *mmut) +{ + u64 *page; -+ int i; + struct page *p; ++ phys_addr_t pgd; + + p = kbase_mem_pool_alloc(&kbdev->mem_pools.small[mmut->group_id]); + if (!p) -+ return 0; ++ return KBASE_MMU_INVALID_PGD_ADDRESS; + + page = kmap(p); + if (page == NULL) + goto alloc_free; + ++ pgd = page_to_phys(p); ++ + /* If the MMU tables belong to a context then account the memory usage + * to that context, otherwise the MMU tables are device wide and are + * only accounted to the device. @@ -243769,34 +281812,43 @@ index 000000000000..a5cda009426d + + kbase_trace_gpu_mem_usage_inc(kbdev, mmut->kctx, 1); + -+ for (i = 0; i < KBASE_MMU_PAGE_ENTRIES; i++) -+ kbdev->mmu_mode->entry_invalidate(&page[i]); ++ kbdev->mmu_mode->entries_invalidate(page, KBASE_MMU_PAGE_ENTRIES); + -+ kbase_mmu_sync_pgd(kbdev, kbase_dma_addr(p), PAGE_SIZE); ++ /* As this page is newly created, therefore there is no content to ++ * clean or invalidate in the GPU caches. ++ */ ++ kbase_mmu_sync_pgd_cpu(kbdev, kbase_dma_addr(p), PAGE_SIZE); + + kunmap(p); -+ return page_to_phys(p); ++ return pgd; + +alloc_free: -+ kbase_mem_pool_free(&kbdev->mem_pools.small[mmut->group_id], p, -+ false); ++ kbase_mem_pool_free(&kbdev->mem_pools.small[mmut->group_id], p, false); + -+ return 0; ++ return KBASE_MMU_INVALID_PGD_ADDRESS; +} + -+/* Given PGD PFN for level N, return PGD PFN for level N+1, allocating the -+ * new table from the pool if needed and possible ++/** ++ * mmu_get_next_pgd() - Given PGD PFN for level N, return PGD PFN for level N+1 ++ * ++ * @kbdev: Device pointer. ++ * @mmut: GPU MMU page table. ++ * @pgd: Physical addresse of level N page directory. ++ * @vpfn: The virtual page frame number. ++ * @level: The level of MMU page table (N). ++ * ++ * Return: ++ * * 0 - OK ++ * * -EFAULT - level N+1 PGD does not exist ++ * * -EINVAL - kmap() failed for level N PGD PFN + */ -+static int mmu_get_next_pgd(struct kbase_device *kbdev, -+ struct kbase_mmu_table *mmut, -+ phys_addr_t *pgd, u64 vpfn, int level) ++static int mmu_get_next_pgd(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ phys_addr_t *pgd, u64 vpfn, int level) +{ + u64 *page; + phys_addr_t target_pgd; + struct page *p; + -+ KBASE_DEBUG_ASSERT(*pgd); -+ + lockdep_assert_held(&mmut->mmu_lock); + + /* @@ -243809,25 +281861,19 @@ index 000000000000..a5cda009426d + p = pfn_to_page(PFN_DOWN(*pgd)); + page = kmap(p); + if (page == NULL) { -+ dev_warn(kbdev->dev, "%s: kmap failure\n", __func__); ++ dev_err(kbdev->dev, "%s: kmap failure", __func__); + return -EINVAL; + } + -+ target_pgd = kbdev->mmu_mode->pte_to_phy_addr(page[vpfn]); -+ -+ if (!target_pgd) { -+ target_pgd = kbase_mmu_alloc_pgd(kbdev, mmut); -+ if (!target_pgd) { -+ dev_dbg(kbdev->dev, "%s: kbase_mmu_alloc_pgd failure\n", -+ __func__); -+ kunmap(p); -+ return -ENOMEM; -+ } -+ -+ kbdev->mmu_mode->entry_set_pte(&page[vpfn], target_pgd); -+ -+ kbase_mmu_sync_pgd(kbdev, kbase_dma_addr(p), PAGE_SIZE); -+ /* Rely on the caller to update the address space flags. */ ++ if (!kbdev->mmu_mode->pte_is_valid(page[vpfn], level)) { ++ dev_dbg(kbdev->dev, "%s: invalid PTE at level %d vpfn 0x%llx", __func__, level, ++ vpfn); ++ kunmap(p); ++ return -EFAULT; ++ } else { ++ target_pgd = kbdev->mmu_mode->pte_to_phy_addr( ++ kbdev->mgm_dev->ops.mgm_pte_to_original_pte( ++ kbdev->mgm_dev, MGM_DEFAULT_PTE_GROUP, level, page[vpfn])); + } + + kunmap(p); @@ -243836,14 +281882,69 @@ index 000000000000..a5cda009426d + return 0; +} + ++/** ++ * mmu_get_lowest_valid_pgd() - Find a valid PGD at or closest to in_level ++ * ++ * @kbdev: Device pointer. ++ * @mmut: GPU MMU page table. ++ * @vpfn: The virtual page frame number. ++ * @in_level: The level of MMU page table (N). ++ * @out_level: Set to the level of the lowest valid PGD found on success. ++ * Invalid on error. ++ * @out_pgd: Set to the lowest valid PGD found on success. ++ * Invalid on error. ++ * ++ * Does a page table walk starting from top level (L0) to in_level to find a valid PGD at or ++ * closest to in_level ++ * ++ * Terminology: ++ * Level-0 = Top-level = highest ++ * Level-3 = Bottom-level = lowest ++ * ++ * Return: ++ * * 0 - OK ++ * * -EINVAL - kmap() failed during page table walk. ++ */ ++static int mmu_get_lowest_valid_pgd(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ u64 vpfn, int in_level, int *out_level, phys_addr_t *out_pgd) ++{ ++ phys_addr_t pgd; ++ int l; ++ int err = 0; ++ ++ lockdep_assert_held(&mmut->mmu_lock); ++ pgd = mmut->pgd; ++ ++ for (l = MIDGARD_MMU_TOPLEVEL; l < in_level; l++) { ++ err = mmu_get_next_pgd(kbdev, mmut, &pgd, vpfn, l); ++ ++ /* Handle failure condition */ ++ if (err) { ++ dev_dbg(kbdev->dev, ++ "%s: mmu_get_next_pgd() failed to find a valid pgd at level %d", ++ __func__, l + 1); ++ break; ++ } ++ } ++ ++ *out_pgd = pgd; ++ *out_level = l; ++ ++ /* -EFAULT indicates that pgd param was valid but the next pgd entry at vpfn was invalid. ++ * This implies that we have found the lowest valid pgd. Reset the error code. ++ */ ++ if (err == -EFAULT) ++ err = 0; ++ ++ return err; ++} ++ +/* -+ * Returns the PGD for the specified level of translation ++ * On success, sets out_pgd to the PGD for the specified level of translation ++ * Returns -EFAULT if a valid PGD is not found + */ -+static int mmu_get_pgd_at_level(struct kbase_device *kbdev, -+ struct kbase_mmu_table *mmut, -+ u64 vpfn, -+ int level, -+ phys_addr_t *out_pgd) ++static int mmu_get_pgd_at_level(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, u64 vpfn, ++ int level, phys_addr_t *out_pgd) +{ + phys_addr_t pgd; + int l; @@ -243855,9 +281956,9 @@ index 000000000000..a5cda009426d + int err = mmu_get_next_pgd(kbdev, mmut, &pgd, vpfn, l); + /* Handle failure condition */ + if (err) { -+ dev_dbg(kbdev->dev, -+ "%s: mmu_get_next_pgd failure at level %d\n", -+ __func__, l); ++ dev_err(kbdev->dev, ++ "%s: mmu_get_next_pgd() failed to find a valid pgd at level %d", ++ __func__, l + 1); + return err; + } + } @@ -243867,20 +281968,11 @@ index 000000000000..a5cda009426d + return 0; +} + -+static int mmu_get_bottom_pgd(struct kbase_device *kbdev, -+ struct kbase_mmu_table *mmut, -+ u64 vpfn, -+ phys_addr_t *out_pgd) -+{ -+ return mmu_get_pgd_at_level(kbdev, mmut, vpfn, MIDGARD_MMU_BOTTOMLEVEL, -+ out_pgd); -+} -+ +static void mmu_insert_pages_failure_recovery(struct kbase_device *kbdev, -+ struct kbase_mmu_table *mmut, -+ u64 from_vpfn, u64 to_vpfn) ++ struct kbase_mmu_table *mmut, u64 from_vpfn, ++ u64 to_vpfn, u64 *dirty_pgds, ++ struct tagged_addr *phys, bool ignore_page_migration) +{ -+ phys_addr_t pgd; + u64 vpfn = from_vpfn; + struct kbase_mmu_mode const *mmu_mode; + @@ -243891,30 +281983,36 @@ index 000000000000..a5cda009426d + lockdep_assert_held(&mmut->mmu_lock); + + mmu_mode = kbdev->mmu_mode; ++ kbase_mmu_reset_free_pgds_list(mmut); + + while (vpfn < to_vpfn) { -+ unsigned int i; + unsigned int idx = vpfn & 0x1FF; + unsigned int count = KBASE_MMU_PAGE_ENTRIES - idx; + unsigned int pcount = 0; + unsigned int left = to_vpfn - vpfn; + int level; + u64 *page; ++ phys_addr_t pgds[MIDGARD_MMU_BOTTOMLEVEL + 1]; ++ phys_addr_t pgd = mmut->pgd; ++ struct page *p = phys_to_page(pgd); ++ ++ register unsigned int num_of_valid_entries; + + if (count > left) + count = left; + + /* need to check if this is a 2MB page or a 4kB */ -+ pgd = mmut->pgd; -+ + for (level = MIDGARD_MMU_TOPLEVEL; + level <= MIDGARD_MMU_BOTTOMLEVEL; level++) { + idx = (vpfn >> ((3 - level) * 9)) & 0x1FF; -+ page = kmap(phys_to_page(pgd)); ++ pgds[level] = pgd; ++ page = kmap(p); + if (mmu_mode->ate_is_valid(page[idx], level)) + break; /* keep the mapping */ -+ kunmap(phys_to_page(pgd)); -+ pgd = mmu_mode->pte_to_phy_addr(page[idx]); ++ kunmap(p); ++ pgd = mmu_mode->pte_to_phy_addr(kbdev->mgm_dev->ops.mgm_pte_to_original_pte( ++ kbdev->mgm_dev, MGM_DEFAULT_PTE_GROUP, level, page[idx])); ++ p = phys_to_page(pgd); + } + + switch (level) { @@ -243927,49 +282025,311 @@ index 000000000000..a5cda009426d + pcount = count; + break; + default: -+ dev_warn(kbdev->dev, "%sNo support for ATEs at level %d\n", -+ __func__, level); ++ dev_warn(kbdev->dev, "%sNo support for ATEs at level %d", __func__, level); + goto next; + } + ++ if (dirty_pgds && pcount > 0) ++ *dirty_pgds |= 1ULL << level; ++ ++ num_of_valid_entries = mmu_mode->get_num_valid_entries(page); ++ if (WARN_ON_ONCE(num_of_valid_entries < pcount)) ++ num_of_valid_entries = 0; ++ else ++ num_of_valid_entries -= pcount; ++ + /* Invalidate the entries we added */ -+ for (i = 0; i < pcount; i++) -+ mmu_mode->entry_invalidate(&page[idx + i]); ++ mmu_mode->entries_invalidate(&page[idx], pcount); ++ ++ if (!num_of_valid_entries) { ++ kunmap(p); ++ ++ kbase_mmu_add_to_free_pgds_list(mmut, p); ++ ++ kbase_mmu_update_and_free_parent_pgds(kbdev, mmut, pgds, vpfn, level, ++ KBASE_MMU_OP_NONE, dirty_pgds); ++ vpfn += count; ++ continue; ++ } + -+ kbase_mmu_sync_pgd(kbdev, -+ kbase_dma_addr(phys_to_page(pgd)) + 8 * idx, -+ 8 * pcount); -+ kunmap(phys_to_page(pgd)); ++ mmu_mode->set_num_valid_entries(page, num_of_valid_entries); + ++ /* MMU cache flush strategy is NONE because GPU cache maintenance is ++ * going to be done by the caller ++ */ ++ kbase_mmu_sync_pgd(kbdev, mmut->kctx, pgd + (idx * sizeof(u64)), ++ kbase_dma_addr(p) + sizeof(u64) * idx, sizeof(u64) * pcount, ++ KBASE_MMU_OP_NONE); ++ kunmap(p); +next: + vpfn += count; + } ++ ++ /* If page migration is enabled: the only way to recover from failure ++ * is to mark all pages as not movable. It is not predictable what's ++ * going to happen to these pages at this stage. They might return ++ * movable once they are returned to a memory pool. ++ */ ++ if (kbase_page_migration_enabled && !ignore_page_migration && phys) { ++ const u64 num_pages = to_vpfn - from_vpfn + 1; ++ u64 i; ++ ++ for (i = 0; i < num_pages; i++) { ++ struct page *phys_page = as_page(phys[i]); ++ struct kbase_page_metadata *page_md = kbase_page_private(phys_page); ++ ++ if (page_md) { ++ spin_lock(&page_md->migrate_lock); ++ page_md->status = PAGE_STATUS_SET(page_md->status, (u8)NOT_MOVABLE); ++ spin_unlock(&page_md->migrate_lock); ++ } ++ } ++ } +} + -+/* -+ * Map the single page 'phys' 'nr' of times, starting at GPU PFN 'vpfn' ++static void mmu_flush_invalidate_insert_pages(struct kbase_device *kbdev, ++ struct kbase_mmu_table *mmut, const u64 vpfn, ++ size_t nr, u64 dirty_pgds, ++ enum kbase_caller_mmu_sync_info mmu_sync_info, ++ bool insert_pages_failed) ++{ ++ struct kbase_mmu_hw_op_param op_param; ++ int as_nr = 0; ++ ++ op_param.vpfn = vpfn; ++ op_param.nr = nr; ++ op_param.op = KBASE_MMU_OP_FLUSH_PT; ++ op_param.mmu_sync_info = mmu_sync_info; ++ op_param.kctx_id = mmut->kctx ? mmut->kctx->id : 0xFFFFFFFF; ++ op_param.flush_skip_levels = pgd_level_to_skip_flush(dirty_pgds); ++ ++#if MALI_USE_CSF ++ as_nr = mmut->kctx ? mmut->kctx->as_nr : MCU_AS_NR; ++#else ++ WARN_ON(!mmut->kctx); ++#endif ++ ++ /* MMU cache flush strategy depends on whether GPU control commands for ++ * flushing physical address ranges are supported. The new physical pages ++ * are not present in GPU caches therefore they don't need any cache ++ * maintenance, but PGDs in the page table may or may not be created anew. ++ * ++ * Operations that affect the whole GPU cache shall only be done if it's ++ * impossible to update physical ranges. ++ * ++ * On GPUs where flushing by physical address range is supported, ++ * full cache flush is done when an error occurs during ++ * insert_pages() to keep the error handling simpler. ++ */ ++ if (mmu_flush_cache_on_gpu_ctrl(kbdev) && !insert_pages_failed) ++ mmu_invalidate(kbdev, mmut->kctx, as_nr, &op_param); ++ else ++ mmu_flush_invalidate(kbdev, mmut->kctx, as_nr, &op_param); ++} ++ ++/** ++ * update_parent_pgds() - Updates the page table from bottom level towards ++ * the top level to insert a new ATE ++ * ++ * @kbdev: Device pointer. ++ * @mmut: GPU MMU page table. ++ * @cur_level: The level of MMU page table where the ATE needs to be added. ++ * The bottom PGD level. ++ * @insert_level: The level of MMU page table where the chain of newly allocated ++ * PGDs needs to be linked-in/inserted. ++ * The top-most PDG level to be updated. ++ * @insert_vpfn: The virtual page frame number for the ATE. ++ * @pgds_to_insert: Ptr to an array (size MIDGARD_MMU_BOTTOMLEVEL+1) that contains ++ * the physical addresses of newly allocated PGDs from index ++ * insert_level+1 to cur_level, and an existing PGD at index ++ * insert_level. ++ * ++ * The newly allocated PGDs are linked from the bottom level up and inserted into the PGD ++ * at insert_level which already exists in the MMU Page Tables.Migration status is also ++ * updated for all the newly allocated PGD pages. ++ * ++ * Return: ++ * * 0 - OK ++ * * -EFAULT - level N+1 PGD does not exist ++ * * -EINVAL - kmap() failed for level N PGD PFN + */ -+int kbase_mmu_insert_single_page(struct kbase_context *kctx, u64 vpfn, -+ struct tagged_addr phys, size_t nr, -+ unsigned long flags, int const group_id) ++static int update_parent_pgds(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ int cur_level, int insert_level, u64 insert_vpfn, ++ phys_addr_t *pgds_to_insert) ++{ ++ int pgd_index; ++ int err = 0; ++ ++ /* Add a PTE for the new PGD page at pgd_index into the parent PGD at (pgd_index-1) ++ * Loop runs from the bottom-most to the top-most level so that all entries in the chain ++ * are valid when they are inserted into the MMU Page table via the insert_level PGD. ++ */ ++ for (pgd_index = cur_level; pgd_index > insert_level; pgd_index--) { ++ int parent_index = pgd_index - 1; ++ phys_addr_t parent_pgd = pgds_to_insert[parent_index]; ++ unsigned int current_valid_entries; ++ u64 pte; ++ phys_addr_t target_pgd = pgds_to_insert[pgd_index]; ++ u64 parent_vpfn = (insert_vpfn >> ((3 - parent_index) * 9)) & 0x1FF; ++ struct page *parent_page = pfn_to_page(PFN_DOWN(parent_pgd)); ++ u64 *parent_page_va; ++ ++ if (WARN_ON_ONCE(target_pgd == KBASE_MMU_INVALID_PGD_ADDRESS)) { ++ err = -EFAULT; ++ goto failure_recovery; ++ } ++ ++ parent_page_va = kmap(parent_page); ++ if (unlikely(parent_page_va == NULL)) { ++ dev_err(kbdev->dev, "%s: kmap failure", __func__); ++ err = -EINVAL; ++ goto failure_recovery; ++ } ++ ++ current_valid_entries = kbdev->mmu_mode->get_num_valid_entries(parent_page_va); ++ ++ kbdev->mmu_mode->entry_set_pte(&pte, target_pgd); ++ parent_page_va[parent_vpfn] = kbdev->mgm_dev->ops.mgm_update_gpu_pte( ++ kbdev->mgm_dev, MGM_DEFAULT_PTE_GROUP, parent_index, pte); ++ kbdev->mmu_mode->set_num_valid_entries(parent_page_va, current_valid_entries + 1); ++ kunmap(parent_page); ++ ++ if (parent_index != insert_level) { ++ /* Newly allocated PGDs */ ++ kbase_mmu_sync_pgd_cpu( ++ kbdev, kbase_dma_addr(parent_page) + (parent_vpfn * sizeof(u64)), ++ sizeof(u64)); ++ } else { ++ /* A new valid entry is added to an existing PGD. Perform the ++ * invalidate operation for GPU cache as it could be having a ++ * cacheline that contains the entry (in an invalid form). ++ */ ++ kbase_mmu_sync_pgd( ++ kbdev, mmut->kctx, parent_pgd + (parent_vpfn * sizeof(u64)), ++ kbase_dma_addr(parent_page) + (parent_vpfn * sizeof(u64)), ++ sizeof(u64), KBASE_MMU_OP_FLUSH_PT); ++ } ++ ++ /* Update the new target_pgd page to its stable state */ ++ if (kbase_page_migration_enabled) { ++ struct kbase_page_metadata *page_md = ++ kbase_page_private(phys_to_page(target_pgd)); ++ ++ spin_lock(&page_md->migrate_lock); ++ ++ WARN_ON_ONCE(PAGE_STATUS_GET(page_md->status) != ALLOCATE_IN_PROGRESS || ++ IS_PAGE_ISOLATED(page_md->status)); ++ ++ if (mmut->kctx) { ++ page_md->status = PAGE_STATUS_SET(page_md->status, PT_MAPPED); ++ page_md->data.pt_mapped.mmut = mmut; ++ page_md->data.pt_mapped.pgd_vpfn_level = ++ PGD_VPFN_LEVEL_SET(insert_vpfn, parent_index); ++ } else { ++ page_md->status = PAGE_STATUS_SET(page_md->status, NOT_MOVABLE); ++ } ++ ++ spin_unlock(&page_md->migrate_lock); ++ } ++ } ++ ++ return 0; ++ ++failure_recovery: ++ /* Cleanup PTEs from PGDs. The Parent PGD in the loop above is just "PGD" here */ ++ for (; pgd_index < cur_level; pgd_index++) { ++ phys_addr_t pgd = pgds_to_insert[pgd_index]; ++ struct page *pgd_page = pfn_to_page(PFN_DOWN(pgd)); ++ u64 *pgd_page_va = kmap(pgd_page); ++ u64 vpfn = (insert_vpfn >> ((3 - pgd_index) * 9)) & 0x1FF; ++ ++ kbdev->mmu_mode->entries_invalidate(&pgd_page_va[vpfn], 1); ++ kunmap(pgd_page); ++ } ++ ++ return err; ++} ++ ++/** ++ * mmu_insert_alloc_pgds() - allocate memory for PGDs from level_low to ++ * level_high (inclusive) ++ * ++ * @kbdev: Device pointer. ++ * @mmut: GPU MMU page table. ++ * @level_low: The lower bound for the levels for which the PGD allocs are required ++ * @level_high: The higher bound for the levels for which the PGD allocs are required ++ * @new_pgds: Ptr to an array (size MIDGARD_MMU_BOTTOMLEVEL+1) to write the ++ * newly allocated PGD addresses to. ++ * ++ * Numerically, level_low < level_high, not to be confused with top level and ++ * bottom level concepts for MMU PGDs. They are only used as low and high bounds ++ * in an incrementing for-loop. ++ * ++ * Return: ++ * * 0 - OK ++ * * -ENOMEM - allocation failed for a PGD. ++ */ ++static int mmu_insert_alloc_pgds(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ phys_addr_t *new_pgds, int level_low, int level_high) ++{ ++ int err = 0; ++ int i; ++ ++ lockdep_assert_held(&mmut->mmu_lock); ++ ++ for (i = level_low; i <= level_high; i++) { ++ do { ++ new_pgds[i] = kbase_mmu_alloc_pgd(kbdev, mmut); ++ if (new_pgds[i] != KBASE_MMU_INVALID_PGD_ADDRESS) ++ break; ++ ++ mutex_unlock(&mmut->mmu_lock); ++ err = kbase_mem_pool_grow(&kbdev->mem_pools.small[mmut->group_id], ++ level_high, NULL); ++ mutex_lock(&mmut->mmu_lock); ++ if (err) { ++ dev_err(kbdev->dev, "%s: kbase_mem_pool_grow() returned error %d", ++ __func__, err); ++ ++ /* Free all PGDs allocated in previous successful iterations ++ * from (i-1) to level_low ++ */ ++ for (i = (i - 1); i >= level_low; i--) { ++ if (new_pgds[i] != KBASE_MMU_INVALID_PGD_ADDRESS) ++ kbase_mmu_free_pgd(kbdev, mmut, new_pgds[i]); ++ } ++ ++ return err; ++ } ++ } while (1); ++ } ++ ++ return 0; ++} ++ ++int kbase_mmu_insert_single_page(struct kbase_context *kctx, u64 start_vpfn, ++ struct tagged_addr phys, size_t nr, unsigned long flags, ++ int const group_id, enum kbase_caller_mmu_sync_info mmu_sync_info, ++ bool ignore_page_migration) +{ + phys_addr_t pgd; + u64 *pgd_page; -+ /* In case the insert_single_page only partially completes -+ * we need to be able to recover -+ */ -+ bool recover_required = false; -+ u64 start_vpfn = vpfn; -+ size_t recover_count = 0; ++ u64 insert_vpfn = start_vpfn; + size_t remain = nr; + int err; + struct kbase_device *kbdev; ++ u64 dirty_pgds = 0; ++ unsigned int i; ++ phys_addr_t new_pgds[MIDGARD_MMU_BOTTOMLEVEL + 1]; ++ enum kbase_mmu_op_type flush_op; ++ struct kbase_mmu_table *mmut = &kctx->mmu; ++ int l, cur_level, insert_level; + + if (WARN_ON(kctx == NULL)) + return -EINVAL; + + /* 64-bit address range is the max */ -+ KBASE_DEBUG_ASSERT(vpfn <= (U64_MAX / PAGE_SIZE)); ++ KBASE_DEBUG_ASSERT(start_vpfn <= (U64_MAX / PAGE_SIZE)); + + kbdev = kctx->kbdev; + @@ -243977,72 +282337,87 @@ index 000000000000..a5cda009426d + if (nr == 0) + return 0; + -+ mutex_lock(&kctx->mmu.mmu_lock); ++ /* If page migration is enabled, pages involved in multiple GPU mappings ++ * are always treated as not movable. ++ */ ++ if (kbase_page_migration_enabled && !ignore_page_migration) { ++ struct page *phys_page = as_page(phys); ++ struct kbase_page_metadata *page_md = kbase_page_private(phys_page); ++ ++ if (page_md) { ++ spin_lock(&page_md->migrate_lock); ++ page_md->status = PAGE_STATUS_SET(page_md->status, (u8)NOT_MOVABLE); ++ spin_unlock(&page_md->migrate_lock); ++ } ++ } ++ ++ mutex_lock(&mmut->mmu_lock); + + while (remain) { -+ unsigned int i; -+ unsigned int index = vpfn & 0x1FF; -+ unsigned int count = KBASE_MMU_PAGE_ENTRIES - index; ++ unsigned int vindex = insert_vpfn & 0x1FF; ++ unsigned int count = KBASE_MMU_PAGE_ENTRIES - vindex; + struct page *p; ++ register unsigned int num_of_valid_entries; ++ bool newly_created_pgd = false; + + if (count > remain) + count = remain; + ++ cur_level = MIDGARD_MMU_BOTTOMLEVEL; ++ insert_level = cur_level; ++ + /* -+ * Repeatedly calling mmu_get_bottom_pte() is clearly ++ * Repeatedly calling mmu_get_lowest_valid_pgd() is clearly + * suboptimal. We don't have to re-parse the whole tree + * each time (just cache the l0-l2 sequence). + * On the other hand, it's only a gain when we map more than + * 256 pages at once (on average). Do we really care? + */ -+ do { -+ err = mmu_get_bottom_pgd(kbdev, &kctx->mmu, -+ vpfn, &pgd); -+ if (err != -ENOMEM) -+ break; -+ /* Fill the memory pool with enough pages for -+ * the page walk to succeed -+ */ -+ mutex_unlock(&kctx->mmu.mmu_lock); -+ err = kbase_mem_pool_grow( -+ &kbdev->mem_pools.small[ -+ kctx->mmu.group_id], -+ MIDGARD_MMU_BOTTOMLEVEL); -+ mutex_lock(&kctx->mmu.mmu_lock); -+ } while (!err); ++ /* insert_level < cur_level if there's no valid PGD for cur_level and insert_vpn */ ++ err = mmu_get_lowest_valid_pgd(kbdev, mmut, insert_vpfn, cur_level, &insert_level, ++ &pgd); ++ + if (err) { -+ dev_warn(kbdev->dev, "kbase_mmu_insert_pages: mmu_get_bottom_pgd failure\n"); -+ if (recover_required) { -+ /* Invalidate the pages we have partially -+ * completed -+ */ -+ mmu_insert_pages_failure_recovery(kbdev, -+ &kctx->mmu, -+ start_vpfn, -+ start_vpfn + recover_count); -+ } ++ dev_err(kbdev->dev, "%s: mmu_get_lowest_valid_pgd() returned error %d", ++ __func__, err); + goto fail_unlock; + } + ++ /* No valid pgd at cur_level */ ++ if (insert_level != cur_level) { ++ /* Allocate new pgds for all missing levels from the required level ++ * down to the lowest valid pgd at insert_level ++ */ ++ err = mmu_insert_alloc_pgds(kbdev, mmut, new_pgds, (insert_level + 1), ++ cur_level); ++ if (err) ++ goto fail_unlock; ++ ++ newly_created_pgd = true; ++ ++ new_pgds[insert_level] = pgd; ++ ++ /* If we didn't find an existing valid pgd at cur_level, ++ * we've now allocated one. The ATE in the next step should ++ * be inserted in this newly allocated pgd. ++ */ ++ pgd = new_pgds[cur_level]; ++ } ++ + p = pfn_to_page(PFN_DOWN(pgd)); + pgd_page = kmap(p); + if (!pgd_page) { -+ dev_warn(kbdev->dev, "kbase_mmu_insert_pages: kmap failure\n"); -+ if (recover_required) { -+ /* Invalidate the pages we have partially -+ * completed -+ */ -+ mmu_insert_pages_failure_recovery(kbdev, -+ &kctx->mmu, -+ start_vpfn, -+ start_vpfn + recover_count); -+ } ++ dev_err(kbdev->dev, "%s: kmap failure", __func__); + err = -ENOMEM; -+ goto fail_unlock; ++ ++ goto fail_unlock_free_pgds; + } + ++ num_of_valid_entries = ++ kbdev->mmu_mode->get_num_valid_entries(pgd_page); ++ + for (i = 0; i < count; i++) { -+ unsigned int ofs = index + i; ++ unsigned int ofs = vindex + i; + + /* Fail if the current page is a valid ATE entry */ + KBASE_DEBUG_ASSERT(0 == (pgd_page[ofs] & 1UL)); @@ -244051,52 +282426,167 @@ index 000000000000..a5cda009426d + phys, flags, MIDGARD_MMU_BOTTOMLEVEL, group_id); + } + -+ vpfn += count; -+ remain -= count; ++ kbdev->mmu_mode->set_num_valid_entries( ++ pgd_page, num_of_valid_entries + count); + -+ kbase_mmu_sync_pgd(kbdev, -+ kbase_dma_addr(p) + (index * sizeof(u64)), -+ count * sizeof(u64)); ++ dirty_pgds |= 1ULL << (newly_created_pgd ? insert_level : MIDGARD_MMU_BOTTOMLEVEL); + -+ kunmap(p); -+ /* We have started modifying the page table. -+ * If further pages need inserting and fail we need to undo what -+ * has already taken place ++ /* MMU cache flush operation here will depend on whether bottom level ++ * PGD is newly created or not. ++ * ++ * If bottom level PGD is newly created then no GPU cache maintenance is ++ * required as the PGD will not exist in GPU cache. Otherwise GPU cache ++ * maintenance is required for existing PGD. + */ -+ recover_required = true; -+ recover_count += count; ++ flush_op = newly_created_pgd ? KBASE_MMU_OP_NONE : KBASE_MMU_OP_FLUSH_PT; ++ ++ kbase_mmu_sync_pgd(kbdev, kctx, pgd + (vindex * sizeof(u64)), ++ kbase_dma_addr(p) + (vindex * sizeof(u64)), count * sizeof(u64), ++ flush_op); ++ ++ if (newly_created_pgd) { ++ err = update_parent_pgds(kbdev, mmut, cur_level, insert_level, insert_vpfn, ++ new_pgds); ++ if (err) { ++ dev_err(kbdev->dev, "%s: update_parent_pgds() failed (%d)", ++ __func__, err); ++ ++ kbdev->mmu_mode->entries_invalidate(&pgd_page[vindex], count); ++ ++ kunmap(p); ++ goto fail_unlock_free_pgds; ++ } ++ } ++ ++ insert_vpfn += count; ++ remain -= count; ++ kunmap(p); + } -+ mutex_unlock(&kctx->mmu.mmu_lock); -+ kbase_mmu_flush_invalidate(kctx, start_vpfn, nr, false); ++ ++ mutex_unlock(&mmut->mmu_lock); ++ ++ mmu_flush_invalidate_insert_pages(kbdev, mmut, start_vpfn, nr, dirty_pgds, mmu_sync_info, ++ false); ++ + return 0; + ++fail_unlock_free_pgds: ++ /* Free the pgds allocated by us from insert_level+1 to bottom level */ ++ for (l = cur_level; l > insert_level; l--) ++ kbase_mmu_free_pgd(kbdev, mmut, new_pgds[l]); ++ +fail_unlock: -+ mutex_unlock(&kctx->mmu.mmu_lock); -+ kbase_mmu_flush_invalidate(kctx, start_vpfn, nr, false); ++ if (insert_vpfn != start_vpfn) { ++ /* Invalidate the pages we have partially completed */ ++ mmu_insert_pages_failure_recovery(kbdev, mmut, start_vpfn, insert_vpfn, &dirty_pgds, ++ NULL, true); ++ } ++ ++ mmu_flush_invalidate_insert_pages(kbdev, mmut, start_vpfn, nr, dirty_pgds, mmu_sync_info, ++ true); ++ kbase_mmu_free_pgds_list(kbdev, mmut); ++ mutex_unlock(&mmut->mmu_lock); ++ + return err; +} + -+static inline void cleanup_empty_pte(struct kbase_device *kbdev, -+ struct kbase_mmu_table *mmut, u64 *pte) ++int kbase_mmu_insert_single_imported_page(struct kbase_context *kctx, u64 vpfn, ++ struct tagged_addr phys, size_t nr, unsigned long flags, ++ int const group_id, ++ enum kbase_caller_mmu_sync_info mmu_sync_info) ++{ ++ /* The aliasing sink page has metadata and shall be moved to NOT_MOVABLE. */ ++ return kbase_mmu_insert_single_page(kctx, vpfn, phys, nr, flags, group_id, mmu_sync_info, ++ false); ++} ++ ++int kbase_mmu_insert_single_aliased_page(struct kbase_context *kctx, u64 vpfn, ++ struct tagged_addr phys, size_t nr, unsigned long flags, ++ int const group_id, ++ enum kbase_caller_mmu_sync_info mmu_sync_info) ++{ ++ /* The aliasing sink page has metadata and shall be moved to NOT_MOVABLE. */ ++ return kbase_mmu_insert_single_page(kctx, vpfn, phys, nr, flags, group_id, mmu_sync_info, ++ false); ++} ++ ++static void kbase_mmu_progress_migration_on_insert(struct tagged_addr phys, ++ struct kbase_va_region *reg, ++ struct kbase_mmu_table *mmut, const u64 vpfn) +{ -+ phys_addr_t tmp_pgd; -+ struct page *tmp_p; ++ struct page *phys_page = as_page(phys); ++ struct kbase_page_metadata *page_md = kbase_page_private(phys_page); + -+ tmp_pgd = kbdev->mmu_mode->pte_to_phy_addr(*pte); -+ tmp_p = phys_to_page(tmp_pgd); -+ kbase_mem_pool_free(&kbdev->mem_pools.small[mmut->group_id], -+ tmp_p, false); ++ spin_lock(&page_md->migrate_lock); + -+ /* If the MMU tables belong to a context then we accounted the memory -+ * usage to that context, so decrement here. ++ /* If no GPU va region is given: the metadata provided are ++ * invalid. ++ * ++ * If the page is already allocated and mapped: this is ++ * an additional GPU mapping, probably to create a memory ++ * alias, which means it is no longer possible to migrate ++ * the page easily because tracking all the GPU mappings ++ * would be too costly. ++ * ++ * In any case: the page becomes not movable. It is kept ++ * alive, but attempts to migrate it will fail. The page ++ * will be freed if it is still not movable when it returns ++ * to a memory pool. Notice that the movable flag is not ++ * cleared because that would require taking the page lock. + */ -+ if (mmut->kctx) { -+ kbase_process_page_usage_dec(mmut->kctx, 1); -+ atomic_sub(1, &mmut->kctx->used_pages); ++ if (!reg || PAGE_STATUS_GET(page_md->status) == (u8)ALLOCATED_MAPPED) { ++ page_md->status = PAGE_STATUS_SET(page_md->status, (u8)NOT_MOVABLE); ++ } else if (PAGE_STATUS_GET(page_md->status) == (u8)ALLOCATE_IN_PROGRESS) { ++ page_md->status = PAGE_STATUS_SET(page_md->status, (u8)ALLOCATED_MAPPED); ++ page_md->data.mapped.reg = reg; ++ page_md->data.mapped.mmut = mmut; ++ page_md->data.mapped.vpfn = vpfn; + } -+ atomic_sub(1, &kbdev->memdev.used_pages); + -+ kbase_trace_gpu_mem_usage_dec(kbdev, mmut->kctx, 1); ++ spin_unlock(&page_md->migrate_lock); ++} ++ ++static void kbase_mmu_progress_migration_on_teardown(struct kbase_device *kbdev, ++ struct tagged_addr *phys, size_t requested_nr) ++{ ++ size_t i; ++ ++ for (i = 0; i < requested_nr; i++) { ++ struct page *phys_page = as_page(phys[i]); ++ struct kbase_page_metadata *page_md = kbase_page_private(phys_page); ++ ++ /* Skip the 4KB page that is part of a large page, as the large page is ++ * excluded from the migration process. ++ */ ++ if (is_huge(phys[i]) || is_partial(phys[i])) ++ continue; ++ ++ if (page_md) { ++ u8 status; ++ ++ spin_lock(&page_md->migrate_lock); ++ status = PAGE_STATUS_GET(page_md->status); ++ ++ if (status == ALLOCATED_MAPPED) { ++ if (IS_PAGE_ISOLATED(page_md->status)) { ++ page_md->status = PAGE_STATUS_SET( ++ page_md->status, (u8)FREE_ISOLATED_IN_PROGRESS); ++ page_md->data.free_isolated.kbdev = kbdev; ++ /* At this point, we still have a reference ++ * to the page via its page migration metadata, ++ * and any page with the FREE_ISOLATED_IN_PROGRESS ++ * status will subsequently be freed in either ++ * kbase_page_migrate() or kbase_page_putback() ++ */ ++ phys[i] = as_tagged(0); ++ } else ++ page_md->status = PAGE_STATUS_SET(page_md->status, ++ (u8)FREE_IN_PROGRESS); ++ } ++ ++ spin_unlock(&page_md->migrate_lock); ++ } ++ } +} + +u64 kbase_mmu_create_ate(struct kbase_device *const kbdev, @@ -244110,12 +282600,10 @@ index 000000000000..a5cda009426d + group_id, level, entry); +} + -+int kbase_mmu_insert_pages_no_flush(struct kbase_device *kbdev, -+ struct kbase_mmu_table *mmut, -+ const u64 start_vpfn, -+ struct tagged_addr *phys, size_t nr, -+ unsigned long flags, -+ int const group_id) ++int kbase_mmu_insert_pages_no_flush(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ const u64 start_vpfn, struct tagged_addr *phys, size_t nr, ++ unsigned long flags, int const group_id, u64 *dirty_pgds, ++ struct kbase_va_region *reg, bool ignore_page_migration) +{ + phys_addr_t pgd; + u64 *pgd_page; @@ -244123,6 +282611,9 @@ index 000000000000..a5cda009426d + size_t remain = nr; + int err; + struct kbase_mmu_mode const *mmu_mode; ++ unsigned int i; ++ phys_addr_t new_pgds[MIDGARD_MMU_BOTTOMLEVEL + 1]; ++ int l, cur_level, insert_level; + + /* Note that 0 is a valid start_vpfn */ + /* 64-bit address range is the max */ @@ -244137,11 +282628,12 @@ index 000000000000..a5cda009426d + mutex_lock(&mmut->mmu_lock); + + while (remain) { -+ unsigned int i; + unsigned int vindex = insert_vpfn & 0x1FF; + unsigned int count = KBASE_MMU_PAGE_ENTRIES - vindex; + struct page *p; -+ int cur_level; ++ register unsigned int num_of_valid_entries; ++ bool newly_created_pgd = false; ++ enum kbase_mmu_op_type flush_op; + + if (count > remain) + count = remain; @@ -244151,65 +282643,64 @@ index 000000000000..a5cda009426d + else + cur_level = MIDGARD_MMU_BOTTOMLEVEL; + ++ insert_level = cur_level; ++ + /* -+ * Repeatedly calling mmu_get_pgd_at_level() is clearly ++ * Repeatedly calling mmu_get_lowest_valid_pgd() is clearly + * suboptimal. We don't have to re-parse the whole tree + * each time (just cache the l0-l2 sequence). + * On the other hand, it's only a gain when we map more than + * 256 pages at once (on average). Do we really care? + */ -+ do { -+ err = mmu_get_pgd_at_level(kbdev, mmut, insert_vpfn, -+ cur_level, &pgd); -+ if (err != -ENOMEM) -+ break; -+ /* Fill the memory pool with enough pages for -+ * the page walk to succeed -+ */ -+ mutex_unlock(&mmut->mmu_lock); -+ err = kbase_mem_pool_grow( -+ &kbdev->mem_pools.small[mmut->group_id], -+ cur_level); -+ mutex_lock(&mmut->mmu_lock); -+ } while (!err); ++ /* insert_level < cur_level if there's no valid PGD for cur_level and insert_vpn */ ++ err = mmu_get_lowest_valid_pgd(kbdev, mmut, insert_vpfn, cur_level, &insert_level, ++ &pgd); + + if (err) { -+ dev_warn(kbdev->dev, -+ "%s: mmu_get_bottom_pgd failure\n", __func__); -+ if (insert_vpfn != start_vpfn) { -+ /* Invalidate the pages we have partially -+ * completed -+ */ -+ mmu_insert_pages_failure_recovery(kbdev, -+ mmut, start_vpfn, insert_vpfn); -+ } ++ dev_err(kbdev->dev, "%s: mmu_get_lowest_valid_pgd() returned error %d", ++ __func__, err); + goto fail_unlock; + } + ++ /* No valid pgd at cur_level */ ++ if (insert_level != cur_level) { ++ /* Allocate new pgds for all missing levels from the required level ++ * down to the lowest valid pgd at insert_level ++ */ ++ err = mmu_insert_alloc_pgds(kbdev, mmut, new_pgds, (insert_level + 1), ++ cur_level); ++ if (err) ++ goto fail_unlock; ++ ++ newly_created_pgd = true; ++ ++ new_pgds[insert_level] = pgd; ++ ++ /* If we didn't find an existing valid pgd at cur_level, ++ * we've now allocated one. The ATE in the next step should ++ * be inserted in this newly allocated pgd. ++ */ ++ pgd = new_pgds[cur_level]; ++ } ++ + p = pfn_to_page(PFN_DOWN(pgd)); + pgd_page = kmap(p); + if (!pgd_page) { -+ dev_warn(kbdev->dev, "%s: kmap failure\n", -+ __func__); -+ if (insert_vpfn != start_vpfn) { -+ /* Invalidate the pages we have partially -+ * completed -+ */ -+ mmu_insert_pages_failure_recovery(kbdev, -+ mmut, start_vpfn, insert_vpfn); -+ } ++ dev_err(kbdev->dev, "%s: kmap failure", __func__); + err = -ENOMEM; -+ goto fail_unlock; ++ ++ goto fail_unlock_free_pgds; + } + ++ num_of_valid_entries = ++ mmu_mode->get_num_valid_entries(pgd_page); ++ + if (cur_level == MIDGARD_MMU_LEVEL(2)) { + int level_index = (insert_vpfn >> 9) & 0x1FF; -+ u64 *target = &pgd_page[level_index]; ++ pgd_page[level_index] = ++ kbase_mmu_create_ate(kbdev, *phys, flags, cur_level, group_id); + -+ if (mmu_mode->pte_is_valid(*target, cur_level)) -+ cleanup_empty_pte(kbdev, mmut, target); -+ *target = kbase_mmu_create_ate(kbdev, *phys, flags, -+ cur_level, group_id); ++ num_of_valid_entries++; + } else { + for (i = 0; i < count; i++) { + unsigned int ofs = vindex + i; @@ -244226,24 +282717,77 @@ index 000000000000..a5cda009426d + + *target = kbase_mmu_create_ate(kbdev, + phys[i], flags, cur_level, group_id); ++ ++ /* If page migration is enabled, this is the right time ++ * to update the status of the page. ++ */ ++ if (kbase_page_migration_enabled && !ignore_page_migration && ++ !is_huge(phys[i]) && !is_partial(phys[i])) ++ kbase_mmu_progress_migration_on_insert(phys[i], reg, mmut, ++ insert_vpfn + i); ++ } ++ num_of_valid_entries += count; ++ } ++ ++ mmu_mode->set_num_valid_entries(pgd_page, num_of_valid_entries); ++ ++ if (dirty_pgds) ++ *dirty_pgds |= 1ULL << (newly_created_pgd ? insert_level : cur_level); ++ ++ /* MMU cache flush operation here will depend on whether bottom level ++ * PGD is newly created or not. ++ * ++ * If bottom level PGD is newly created then no GPU cache maintenance is ++ * required as the PGD will not exist in GPU cache. Otherwise GPU cache ++ * maintenance is required for existing PGD. ++ */ ++ flush_op = newly_created_pgd ? KBASE_MMU_OP_NONE : KBASE_MMU_OP_FLUSH_PT; ++ ++ kbase_mmu_sync_pgd(kbdev, mmut->kctx, pgd + (vindex * sizeof(u64)), ++ kbase_dma_addr(p) + (vindex * sizeof(u64)), count * sizeof(u64), ++ flush_op); ++ ++ if (newly_created_pgd) { ++ err = update_parent_pgds(kbdev, mmut, cur_level, insert_level, insert_vpfn, ++ new_pgds); ++ if (err) { ++ dev_err(kbdev->dev, "%s: update_parent_pgds() failed (%d)", ++ __func__, err); ++ ++ kbdev->mmu_mode->entries_invalidate(&pgd_page[vindex], count); ++ ++ kunmap(p); ++ goto fail_unlock_free_pgds; + } + } + + phys += count; + insert_vpfn += count; + remain -= count; -+ -+ kbase_mmu_sync_pgd(kbdev, -+ kbase_dma_addr(p) + (vindex * sizeof(u64)), -+ count * sizeof(u64)); -+ + kunmap(p); + } + -+ err = 0; ++ mutex_unlock(&mmut->mmu_lock); ++ ++ return 0; ++ ++fail_unlock_free_pgds: ++ /* Free the pgds allocated by us from insert_level+1 to bottom level */ ++ for (l = cur_level; l > insert_level; l--) ++ kbase_mmu_free_pgd(kbdev, mmut, new_pgds[l]); + +fail_unlock: ++ if (insert_vpfn != start_vpfn) { ++ /* Invalidate the pages we have partially completed */ ++ mmu_insert_pages_failure_recovery(kbdev, mmut, start_vpfn, insert_vpfn, dirty_pgds, ++ phys, ignore_page_migration); ++ } ++ ++ mmu_flush_invalidate_insert_pages(kbdev, mmut, start_vpfn, nr, ++ dirty_pgds ? *dirty_pgds : 0xF, CALLER_MMU_ASYNC, true); ++ kbase_mmu_free_pgds_list(kbdev, mmut); + mutex_unlock(&mmut->mmu_lock); ++ + return err; +} + @@ -244251,147 +282795,80 @@ index 000000000000..a5cda009426d + * Map 'nr' pages pointed to by 'phys' at GPU PFN 'vpfn' for GPU address space + * number 'as_nr'. + */ -+int kbase_mmu_insert_pages(struct kbase_device *kbdev, -+ struct kbase_mmu_table *mmut, u64 vpfn, -+ struct tagged_addr *phys, size_t nr, -+ unsigned long flags, int as_nr, int const group_id) ++int kbase_mmu_insert_pages(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, u64 vpfn, ++ struct tagged_addr *phys, size_t nr, unsigned long flags, int as_nr, ++ int const group_id, enum kbase_caller_mmu_sync_info mmu_sync_info, ++ struct kbase_va_region *reg, bool ignore_page_migration) +{ + int err; ++ u64 dirty_pgds = 0; + -+ err = kbase_mmu_insert_pages_no_flush(kbdev, mmut, vpfn, -+ phys, nr, flags, group_id); ++ /* Early out if there is nothing to do */ ++ if (nr == 0) ++ return 0; + -+ if (mmut->kctx) -+ kbase_mmu_flush_invalidate(mmut->kctx, vpfn, nr, false); -+ else -+ kbase_mmu_flush_invalidate_no_ctx(kbdev, vpfn, nr, false, -+ as_nr); ++ err = kbase_mmu_insert_pages_no_flush(kbdev, mmut, vpfn, phys, nr, flags, group_id, ++ &dirty_pgds, reg, ignore_page_migration); ++ if (err) ++ return err; + -+ return err; ++ mmu_flush_invalidate_insert_pages(kbdev, mmut, vpfn, nr, dirty_pgds, mmu_sync_info, false); ++ ++ return 0; +} + +KBASE_EXPORT_TEST_API(kbase_mmu_insert_pages); + -+/** -+ * kbase_mmu_flush_invalidate_noretain() - Flush and invalidate the GPU caches -+ * without retaining the kbase context. -+ * @kctx: The KBase context. -+ * @vpfn: The virtual page frame number to start the flush on. -+ * @nr: The number of pages to flush. -+ * @sync: Set if the operation should be synchronous or not. -+ * -+ * As per kbase_mmu_flush_invalidate but doesn't retain the kctx or do any -+ * other locking. -+ */ -+static void kbase_mmu_flush_invalidate_noretain(struct kbase_context *kctx, -+ u64 vpfn, size_t nr, bool sync) ++int kbase_mmu_insert_imported_pages(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ u64 vpfn, struct tagged_addr *phys, size_t nr, ++ unsigned long flags, int as_nr, int const group_id, ++ enum kbase_caller_mmu_sync_info mmu_sync_info, ++ struct kbase_va_region *reg) +{ -+ struct kbase_device *kbdev = kctx->kbdev; + int err; -+ u32 op; ++ u64 dirty_pgds = 0; + + /* Early out if there is nothing to do */ + if (nr == 0) -+ return; ++ return 0; + -+ if (sync) -+ op = AS_COMMAND_FLUSH_MEM; -+ else -+ op = AS_COMMAND_FLUSH_PT; ++ /* Imported allocations don't have metadata and therefore always ignore the ++ * page migration logic. ++ */ ++ err = kbase_mmu_insert_pages_no_flush(kbdev, mmut, vpfn, phys, nr, flags, group_id, ++ &dirty_pgds, reg, true); ++ if (err) ++ return err; + -+ err = kbase_mmu_hw_do_operation(kbdev, -+ &kbdev->as[kctx->as_nr], -+ vpfn, nr, op, 0); -+ if (err) { -+ /* Flush failed to complete, assume the -+ * GPU has hung and perform a reset to recover -+ */ -+ dev_err(kbdev->dev, "Flush for GPU page table update did not complete. Issuing GPU soft-reset to recover\n"); ++ mmu_flush_invalidate_insert_pages(kbdev, mmut, vpfn, nr, dirty_pgds, mmu_sync_info, false); + -+ if (kbase_prepare_to_reset_gpu_locked(kbdev)) -+ kbase_reset_gpu_locked(kbdev); -+ } ++ return 0; +} + -+/* Perform a flush/invalidate on a particular address space -+ */ -+static void kbase_mmu_flush_invalidate_as(struct kbase_device *kbdev, -+ struct kbase_as *as, -+ u64 vpfn, size_t nr, bool sync) ++int kbase_mmu_insert_aliased_pages(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ u64 vpfn, struct tagged_addr *phys, size_t nr, ++ unsigned long flags, int as_nr, int const group_id, ++ enum kbase_caller_mmu_sync_info mmu_sync_info, ++ struct kbase_va_region *reg) +{ + int err; -+ u32 op; -+ -+ if (kbase_pm_context_active_handle_suspend(kbdev, -+ KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE)) { -+ /* GPU is off so there's no need to perform flush/invalidate */ -+ return; -+ } -+ -+ /* AS transaction begin */ -+ mutex_lock(&kbdev->mmu_hw_mutex); -+ -+ if (sync) -+ op = AS_COMMAND_FLUSH_MEM; -+ else -+ op = AS_COMMAND_FLUSH_PT; -+ -+ err = kbase_mmu_hw_do_operation(kbdev, -+ as, vpfn, nr, op, 0); -+ -+ if (err) { -+ /* Flush failed to complete, assume the GPU has hung and -+ * perform a reset to recover -+ */ -+ dev_err(kbdev->dev, "Flush for GPU page table update did not complete. Issueing GPU soft-reset to recover\n"); -+ -+ if (kbase_prepare_to_reset_gpu(kbdev)) -+ kbase_reset_gpu(kbdev); -+ } -+ -+ mutex_unlock(&kbdev->mmu_hw_mutex); -+ /* AS transaction end */ -+ -+ kbase_pm_context_idle(kbdev); -+} -+ -+static void kbase_mmu_flush_invalidate_no_ctx(struct kbase_device *kbdev, -+ u64 vpfn, size_t nr, bool sync, int as_nr) -+{ -+ /* Skip if there is nothing to do */ -+ if (nr) { -+ kbase_mmu_flush_invalidate_as(kbdev, &kbdev->as[as_nr], vpfn, -+ nr, sync); -+ } -+} -+ -+static void kbase_mmu_flush_invalidate(struct kbase_context *kctx, -+ u64 vpfn, size_t nr, bool sync) -+{ -+ struct kbase_device *kbdev; -+ bool ctx_is_in_runpool; ++ u64 dirty_pgds = 0; + + /* Early out if there is nothing to do */ + if (nr == 0) -+ return; -+ -+ kbdev = kctx->kbdev; -+#if !MALI_USE_CSF -+ mutex_lock(&kbdev->js_data.queue_mutex); -+#endif /* !MALI_USE_CSF */ -+ ctx_is_in_runpool = kbase_ctx_sched_inc_refcount(kctx); -+#if !MALI_USE_CSF -+ mutex_unlock(&kbdev->js_data.queue_mutex); -+#endif /* !MALI_USE_CSF */ ++ return 0; + -+ if (ctx_is_in_runpool) { -+ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); ++ /* Memory aliases are always built on top of existing allocations, ++ * therefore the state of physical pages shall be updated. ++ */ ++ err = kbase_mmu_insert_pages_no_flush(kbdev, mmut, vpfn, phys, nr, flags, group_id, ++ &dirty_pgds, reg, false); ++ if (err) ++ return err; + -+ kbase_mmu_flush_invalidate_as(kbdev, &kbdev->as[kctx->as_nr], -+ vpfn, nr, sync); ++ mmu_flush_invalidate_insert_pages(kbdev, mmut, vpfn, nr, dirty_pgds, mmu_sync_info, false); + -+ release_ctx(kbdev, kctx); -+ } ++ return 0; +} + +void kbase_mmu_update(struct kbase_device *kbdev, @@ -244416,6 +282893,14 @@ index 000000000000..a5cda009426d + +void kbase_mmu_disable(struct kbase_context *kctx) +{ ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; ++ struct kbase_device *kbdev = kctx->kbdev; ++ struct kbase_mmu_hw_op_param op_param = { 0 }; ++ int lock_err, flush_err; ++ + /* ASSERT that the context has a valid as_nr, which is only the case + * when it's scheduled in. + * @@ -244424,70 +282909,203 @@ index 000000000000..a5cda009426d + KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); + + lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ lockdep_assert_held(&kctx->kbdev->mmu_hw_mutex); + -+ /* -+ * The address space is being disabled, drain all knowledge of it out -+ * from the caches as pages and page tables might be freed after this. -+ * -+ * The job scheduler code will already be holding the locks and context -+ * so just do the flush. ++ op_param.vpfn = 0; ++ op_param.nr = ~0; ++ op_param.op = KBASE_MMU_OP_FLUSH_MEM; ++ op_param.kctx_id = kctx->id; ++ op_param.mmu_sync_info = mmu_sync_info; ++ ++#if MALI_USE_CSF ++ /* 0xF value used to prevent skipping of any levels when flushing */ ++ if (mmu_flush_cache_on_gpu_ctrl(kbdev)) ++ op_param.flush_skip_levels = pgd_level_to_skip_flush(0xF); ++#endif ++ ++ /* lock MMU to prevent existing jobs on GPU from executing while the AS is ++ * not yet disabled + */ -+ kbase_mmu_flush_invalidate_noretain(kctx, 0, ~0, true); ++ lock_err = kbase_mmu_hw_do_lock(kbdev, &kbdev->as[kctx->as_nr], &op_param); ++ if (lock_err) ++ dev_err(kbdev->dev, "Failed to lock AS %d for ctx %d_%d", kctx->as_nr, kctx->tgid, ++ kctx->id); + -+ kctx->kbdev->mmu_mode->disable_as(kctx->kbdev, kctx->as_nr); ++ /* Issue the flush command only when L2 cache is in stable power on state. ++ * Any other state for L2 cache implies that shader cores are powered off, ++ * which in turn implies there is no execution happening on the GPU. ++ */ ++ if (kbdev->pm.backend.l2_state == KBASE_L2_ON) { ++ flush_err = kbase_gpu_cache_flush_and_busy_wait(kbdev, ++ GPU_COMMAND_CACHE_CLN_INV_L2_LSC); ++ if (flush_err) ++ dev_err(kbdev->dev, ++ "Failed to flush GPU cache when disabling AS %d for ctx %d_%d", ++ kctx->as_nr, kctx->tgid, kctx->id); ++ } ++ kbdev->mmu_mode->disable_as(kbdev, kctx->as_nr); ++ ++ if (!lock_err) { ++ /* unlock the MMU to allow it to resume */ ++ lock_err = ++ kbase_mmu_hw_do_unlock_no_addr(kbdev, &kbdev->as[kctx->as_nr], &op_param); ++ if (lock_err) ++ dev_err(kbdev->dev, "Failed to unlock AS %d for ctx %d_%d", kctx->as_nr, ++ kctx->tgid, kctx->id); ++ } ++ ++#if !MALI_USE_CSF ++ /* ++ * JM GPUs has some L1 read only caches that need to be invalidated ++ * with START_FLUSH configuration. Purge the MMU disabled kctx from ++ * the slot_rb tracking field so such invalidation is performed when ++ * a new katom is executed on the affected slots. ++ */ ++ kbase_backend_slot_kctx_purge_locked(kbdev, kctx); ++#endif +} +KBASE_EXPORT_TEST_API(kbase_mmu_disable); + -+/* -+ * We actually only discard the ATE, and not the page table -+ * pages. There is a potential DoS here, as we'll leak memory by -+ * having PTEs that are potentially unused. Will require physical -+ * page accounting, so MMU pages are part of the process allocation. ++static void kbase_mmu_update_and_free_parent_pgds(struct kbase_device *kbdev, ++ struct kbase_mmu_table *mmut, phys_addr_t *pgds, ++ u64 vpfn, int level, ++ enum kbase_mmu_op_type flush_op, u64 *dirty_pgds) ++{ ++ int current_level; ++ ++ lockdep_assert_held(&mmut->mmu_lock); ++ ++ for (current_level = level - 1; current_level >= MIDGARD_MMU_LEVEL(0); ++ current_level--) { ++ phys_addr_t current_pgd = pgds[current_level]; ++ struct page *p = phys_to_page(current_pgd); ++ u64 *current_page = kmap(p); ++ unsigned int current_valid_entries = ++ kbdev->mmu_mode->get_num_valid_entries(current_page); ++ int index = (vpfn >> ((3 - current_level) * 9)) & 0x1FF; ++ ++ /* We need to track every level that needs updating */ ++ if (dirty_pgds) ++ *dirty_pgds |= 1ULL << current_level; ++ ++ kbdev->mmu_mode->entries_invalidate(¤t_page[index], 1); ++ if (current_valid_entries == 1 && ++ current_level != MIDGARD_MMU_LEVEL(0)) { ++ kunmap(p); ++ ++ /* Ensure the cacheline containing the last valid entry ++ * of PGD is invalidated from the GPU cache, before the ++ * PGD page is freed. ++ */ ++ kbase_mmu_sync_pgd_gpu(kbdev, mmut->kctx, ++ current_pgd + (index * sizeof(u64)), ++ sizeof(u64), flush_op); ++ ++ kbase_mmu_add_to_free_pgds_list(mmut, p); ++ } else { ++ current_valid_entries--; ++ ++ kbdev->mmu_mode->set_num_valid_entries( ++ current_page, current_valid_entries); ++ ++ kunmap(p); ++ ++ kbase_mmu_sync_pgd(kbdev, mmut->kctx, current_pgd + (index * sizeof(u64)), ++ kbase_dma_addr(p) + (index * sizeof(u64)), sizeof(u64), ++ flush_op); ++ break; ++ } ++ } ++} ++ ++/** ++ * mmu_flush_invalidate_teardown_pages() - Perform flush operation after unmapping pages. + * -+ * IMPORTANT: This uses kbasep_js_runpool_release_ctx() when the context is -+ * currently scheduled into the runpool, and so potentially uses a lot of locks. -+ * These locks must be taken in the correct order with respect to others -+ * already held by the caller. Refer to kbasep_js_runpool_release_ctx() for more -+ * information. ++ * @kbdev: Pointer to kbase device. ++ * @kctx: Pointer to kbase context. ++ * @as_nr: Address space number, for GPU cache maintenance operations ++ * that happen outside a specific kbase context. ++ * @phys: Array of physical pages to flush. ++ * @phys_page_nr: Number of physical pages to flush. ++ * @op_param: Non-NULL pointer to struct containing information about the flush ++ * operation to perform. ++ * ++ * This function will do one of three things: ++ * 1. Invalidate the MMU caches, followed by a partial GPU cache flush of the ++ * individual pages that were unmapped if feature is supported on GPU. ++ * 2. Perform a full GPU cache flush through the GPU_CONTROL interface if feature is ++ * supported on GPU or, ++ * 3. Perform a full GPU cache flush through the MMU_CONTROL interface. ++ * ++ * When performing a partial GPU cache flush, the number of physical ++ * pages does not have to be identical to the number of virtual pages on the MMU, ++ * to support a single physical address flush for an aliased page. + */ -+int kbase_mmu_teardown_pages(struct kbase_device *kbdev, -+ struct kbase_mmu_table *mmut, u64 vpfn, size_t nr, int as_nr) ++static void mmu_flush_invalidate_teardown_pages(struct kbase_device *kbdev, ++ struct kbase_context *kctx, int as_nr, ++ struct tagged_addr *phys, size_t phys_page_nr, ++ struct kbase_mmu_hw_op_param *op_param) +{ -+ phys_addr_t pgd; -+ u64 start_vpfn = vpfn; -+ size_t requested_nr = nr; -+ struct kbase_mmu_mode const *mmu_mode; -+ int err = -EFAULT; ++ if (!mmu_flush_cache_on_gpu_ctrl(kbdev)) { ++ /* Full cache flush through the MMU_COMMAND */ ++ mmu_flush_invalidate(kbdev, kctx, as_nr, op_param); ++ } else if (op_param->op == KBASE_MMU_OP_FLUSH_MEM) { ++ /* Full cache flush through the GPU_CONTROL */ ++ mmu_flush_invalidate_on_gpu_ctrl(kbdev, kctx, as_nr, op_param); ++ } ++#if MALI_USE_CSF ++ else { ++ /* Partial GPU cache flush with MMU cache invalidation */ ++ unsigned long irq_flags; ++ unsigned int i; ++ bool flush_done = false; + -+ if (nr == 0) { -+ /* early out if nothing to do */ -+ return 0; ++ mmu_invalidate(kbdev, kctx, as_nr, op_param); ++ ++ for (i = 0; !flush_done && i < phys_page_nr; i++) { ++ spin_lock_irqsave(&kbdev->hwaccess_lock, irq_flags); ++ if (kbdev->pm.backend.gpu_powered && (!kctx || kctx->as_nr >= 0)) ++ mmu_flush_pa_range(kbdev, as_phys_addr_t(phys[i]), PAGE_SIZE, ++ KBASE_MMU_OP_FLUSH_MEM); ++ else ++ flush_done = true; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, irq_flags); ++ } + } ++#endif ++} + -+ mutex_lock(&mmut->mmu_lock); ++static int kbase_mmu_teardown_pgd_pages(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ u64 vpfn, size_t nr, u64 *dirty_pgds, ++ struct list_head *free_pgds_list, ++ enum kbase_mmu_op_type flush_op) ++{ ++ struct kbase_mmu_mode const *mmu_mode = kbdev->mmu_mode; + -+ mmu_mode = kbdev->mmu_mode; ++ lockdep_assert_held(&mmut->mmu_lock); ++ kbase_mmu_reset_free_pgds_list(mmut); + + while (nr) { -+ unsigned int i; + unsigned int index = vpfn & 0x1FF; + unsigned int count = KBASE_MMU_PAGE_ENTRIES - index; + unsigned int pcount; + int level; + u64 *page; ++ phys_addr_t pgds[MIDGARD_MMU_BOTTOMLEVEL + 1]; ++ register unsigned int num_of_valid_entries; ++ phys_addr_t pgd = mmut->pgd; ++ struct page *p = phys_to_page(pgd); + + if (count > nr) + count = nr; + -+ /* need to check if this is a 2MB or a 4kB page */ -+ pgd = mmut->pgd; -+ ++ /* need to check if this is a 2MB page or a 4kB */ + for (level = MIDGARD_MMU_TOPLEVEL; + level <= MIDGARD_MMU_BOTTOMLEVEL; level++) { + phys_addr_t next_pgd; + + index = (vpfn >> ((3 - level) * 9)) & 0x1FF; -+ page = kmap(phys_to_page(pgd)); ++ page = kmap(p); + if (mmu_mode->ate_is_valid(page[index], level)) + break; /* keep the mapping */ + else if (!mmu_mode->pte_is_valid(page[index], level)) { @@ -244510,27 +283128,31 @@ index 000000000000..a5cda009426d + count = nr; + goto next; + } -+ next_pgd = mmu_mode->pte_to_phy_addr(page[index]); -+ kunmap(phys_to_page(pgd)); ++ next_pgd = mmu_mode->pte_to_phy_addr( ++ kbdev->mgm_dev->ops.mgm_pte_to_original_pte( ++ kbdev->mgm_dev, MGM_DEFAULT_PTE_GROUP, level, page[index])); ++ kunmap(p); ++ pgds[level] = pgd; + pgd = next_pgd; ++ p = phys_to_page(pgd); + } + + switch (level) { + case MIDGARD_MMU_LEVEL(0): + case MIDGARD_MMU_LEVEL(1): -+ dev_warn(kbdev->dev, -+ "%s: No support for ATEs at level %d\n", -+ __func__, level); -+ kunmap(phys_to_page(pgd)); ++ dev_warn(kbdev->dev, "%s: No support for ATEs at level %d", __func__, ++ level); ++ kunmap(p); + goto out; + case MIDGARD_MMU_LEVEL(2): + /* can only teardown if count >= 512 */ + if (count >= 512) { + pcount = 1; + } else { -+ dev_warn(kbdev->dev, -+ "%s: limiting teardown as it tries to do a partial 2MB teardown, need 512, but have %d to tear down\n", -+ __func__, count); ++ dev_warn( ++ kbdev->dev, ++ "%s: limiting teardown as it tries to do a partial 2MB teardown, need 512, but have %d to tear down", ++ __func__, count); + pcount = 0; + } + break; @@ -244539,72 +283161,177 @@ index 000000000000..a5cda009426d + pcount = count; + break; + default: -+ dev_err(kbdev->dev, -+ "%s: found non-mapped memory, early out\n", -+ __func__); ++ dev_err(kbdev->dev, "%s: found non-mapped memory, early out", __func__); + vpfn += count; + nr -= count; + continue; + } + ++ if (pcount > 0) ++ *dirty_pgds |= 1ULL << level; ++ ++ num_of_valid_entries = mmu_mode->get_num_valid_entries(page); ++ if (WARN_ON_ONCE(num_of_valid_entries < pcount)) ++ num_of_valid_entries = 0; ++ else ++ num_of_valid_entries -= pcount; ++ + /* Invalidate the entries we added */ -+ for (i = 0; i < pcount; i++) -+ mmu_mode->entry_invalidate(&page[index + i]); ++ mmu_mode->entries_invalidate(&page[index], pcount); ++ ++ if (!num_of_valid_entries) { ++ kunmap(p); ++ ++ /* Ensure the cacheline(s) containing the last valid entries ++ * of PGD is invalidated from the GPU cache, before the ++ * PGD page is freed. ++ */ ++ kbase_mmu_sync_pgd_gpu(kbdev, mmut->kctx, ++ pgd + (index * sizeof(u64)), ++ pcount * sizeof(u64), flush_op); ++ ++ kbase_mmu_add_to_free_pgds_list(mmut, p); + -+ kbase_mmu_sync_pgd(kbdev, -+ kbase_dma_addr(phys_to_page(pgd)) + -+ 8 * index, 8*pcount); ++ kbase_mmu_update_and_free_parent_pgds(kbdev, mmut, pgds, vpfn, level, ++ flush_op, dirty_pgds); + ++ vpfn += count; ++ nr -= count; ++ continue; ++ } ++ ++ mmu_mode->set_num_valid_entries(page, num_of_valid_entries); ++ ++ kbase_mmu_sync_pgd(kbdev, mmut->kctx, pgd + (index * sizeof(u64)), ++ kbase_dma_addr(p) + (index * sizeof(u64)), pcount * sizeof(u64), ++ flush_op); +next: -+ kunmap(phys_to_page(pgd)); ++ kunmap(p); + vpfn += count; + nr -= count; + } -+ err = 0; +out: -+ mutex_unlock(&mmut->mmu_lock); ++ return 0; ++} + -+ if (mmut->kctx) -+ kbase_mmu_flush_invalidate(mmut->kctx, start_vpfn, requested_nr, -+ true); -+ else -+ kbase_mmu_flush_invalidate_no_ctx(kbdev, start_vpfn, requested_nr, -+ true, as_nr); ++int kbase_mmu_teardown_pages(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, u64 vpfn, ++ struct tagged_addr *phys, size_t nr_phys_pages, size_t nr_virt_pages, ++ int as_nr, bool ignore_page_migration) ++{ ++ u64 start_vpfn = vpfn; ++ enum kbase_mmu_op_type flush_op = KBASE_MMU_OP_NONE; ++ struct kbase_mmu_hw_op_param op_param; ++ int err = -EFAULT; ++ u64 dirty_pgds = 0; ++ LIST_HEAD(free_pgds_list); ++ ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; ++ ++ /* This function performs two operations: MMU maintenance and flushing ++ * the caches. To ensure internal consistency between the caches and the ++ * MMU, it does not make sense to be able to flush only the physical pages ++ * from the cache and keep the PTE, nor does it make sense to use this ++ * function to remove a PTE and keep the physical pages in the cache. ++ * ++ * However, we have legitimate cases where we can try to tear down a mapping ++ * with zero virtual and zero physical pages, so we must have the following ++ * behaviour: ++ * - if both physical and virtual page counts are zero, return early ++ * - if either physical and virtual page counts are zero, return early ++ * - if there are fewer physical pages than virtual pages, return -EINVAL ++ */ ++ if (unlikely(nr_virt_pages == 0 || nr_phys_pages == 0)) ++ return 0; ++ ++ if (unlikely(nr_virt_pages < nr_phys_pages)) ++ return -EINVAL; ++ ++ /* MMU cache flush strategy depends on the number of pages to unmap. In both cases ++ * the operation is invalidate but the granularity of cache maintenance may change ++ * according to the situation. ++ * ++ * If GPU control command operations are present and the number of pages is "small", ++ * then the optimal strategy is flushing on the physical address range of the pages ++ * which are affected by the operation. That implies both the PGDs which are modified ++ * or removed from the page table and the physical pages which are freed from memory. ++ * ++ * Otherwise, there's no alternative to invalidating the whole GPU cache. ++ */ ++ if (mmu_flush_cache_on_gpu_ctrl(kbdev) && phys && ++ nr_phys_pages <= KBASE_PA_RANGE_THRESHOLD_NR_PAGES) ++ flush_op = KBASE_MMU_OP_FLUSH_PT; ++ ++ mutex_lock(&mmut->mmu_lock); ++ ++ err = kbase_mmu_teardown_pgd_pages(kbdev, mmut, vpfn, nr_virt_pages, &dirty_pgds, ++ &free_pgds_list, flush_op); ++ ++ /* Set up MMU operation parameters. See above about MMU cache flush strategy. */ ++ op_param = (struct kbase_mmu_hw_op_param){ ++ .vpfn = start_vpfn, ++ .nr = nr_virt_pages, ++ .mmu_sync_info = mmu_sync_info, ++ .kctx_id = mmut->kctx ? mmut->kctx->id : 0xFFFFFFFF, ++ .op = (flush_op == KBASE_MMU_OP_FLUSH_PT) ? KBASE_MMU_OP_FLUSH_PT : ++ KBASE_MMU_OP_FLUSH_MEM, ++ .flush_skip_levels = pgd_level_to_skip_flush(dirty_pgds), ++ }; ++ mmu_flush_invalidate_teardown_pages(kbdev, mmut->kctx, as_nr, phys, nr_phys_pages, ++ &op_param); ++ ++ /* If page migration is enabled: the status of all physical pages involved ++ * shall be updated, unless they are not movable. Their status shall be ++ * updated before releasing the lock to protect against concurrent ++ * requests to migrate the pages, if they have been isolated. ++ */ ++ if (kbase_page_migration_enabled && phys && !ignore_page_migration) ++ kbase_mmu_progress_migration_on_teardown(kbdev, phys, nr_phys_pages); ++ ++ kbase_mmu_free_pgds_list(kbdev, mmut); ++ ++ mutex_unlock(&mmut->mmu_lock); + + return err; +} -+ +KBASE_EXPORT_TEST_API(kbase_mmu_teardown_pages); + +/** -+ * kbase_mmu_update_pages_no_flush() - Update page table entries on the GPU -+ * -+ * This will update page table entries that already exist on the GPU based on -+ * the new flags that are passed. It is used as a response to the changes of -+ * the memory attributes ++ * kbase_mmu_update_pages_no_flush() - Update phy pages and attributes data in GPU ++ * page table entries + * -+ * The caller is responsible for validating the memory attributes -+ * -+ * @kctx: Kbase context ++ * @kbdev: Pointer to kbase device. ++ * @mmut: The involved MMU table + * @vpfn: Virtual PFN (Page Frame Number) of the first page to update -+ * @phys: Tagged physical addresses of the physical pages to replace the -+ * current mappings ++ * @phys: Pointer to the array of tagged physical addresses of the physical ++ * pages that are pointed to by the page table entries (that need to ++ * be updated). The pointer should be within the reg->gpu_alloc->pages ++ * array. + * @nr: Number of pages to update + * @flags: Flags + * @group_id: The physical memory group in which the page was allocated. + * Valid range is 0..(MEMORY_GROUP_MANAGER_NR_GROUPS-1). ++ * @dirty_pgds: Flags to track every level where a PGD has been updated. ++ * ++ * This will update page table entries that already exist on the GPU based on ++ * new flags and replace any existing phy pages that are passed (the PGD pages ++ * remain unchanged). It is used as a response to the changes of phys as well ++ * as the the memory attributes. ++ * ++ * The caller is responsible for validating the memory attributes. ++ * ++ * Return: 0 if the attributes data in page table entries were updated ++ * successfully, otherwise an error code. + */ -+static int kbase_mmu_update_pages_no_flush(struct kbase_context *kctx, u64 vpfn, -+ struct tagged_addr *phys, size_t nr, -+ unsigned long flags, int const group_id) ++static int kbase_mmu_update_pages_no_flush(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ u64 vpfn, struct tagged_addr *phys, size_t nr, ++ unsigned long flags, int const group_id, u64 *dirty_pgds) +{ + phys_addr_t pgd; + u64 *pgd_page; + int err; -+ struct kbase_device *kbdev; -+ -+ if (WARN_ON(kctx == NULL)) -+ return -EINVAL; + + KBASE_DEBUG_ASSERT(vpfn <= (U64_MAX / PAGE_SIZE)); + @@ -244612,139 +283339,550 @@ index 000000000000..a5cda009426d + if (nr == 0) + return 0; + -+ mutex_lock(&kctx->mmu.mmu_lock); -+ -+ kbdev = kctx->kbdev; ++ mutex_lock(&mmut->mmu_lock); + + while (nr) { + unsigned int i; + unsigned int index = vpfn & 0x1FF; + size_t count = KBASE_MMU_PAGE_ENTRIES - index; + struct page *p; ++ register unsigned int num_of_valid_entries; ++ int cur_level = MIDGARD_MMU_BOTTOMLEVEL; + + if (count > nr) + count = nr; + -+ do { -+ err = mmu_get_bottom_pgd(kbdev, &kctx->mmu, -+ vpfn, &pgd); -+ if (err != -ENOMEM) -+ break; -+ /* Fill the memory pool with enough pages for -+ * the page walk to succeed -+ */ -+ mutex_unlock(&kctx->mmu.mmu_lock); -+ err = kbase_mem_pool_grow( -+ &kbdev->mem_pools.small[ -+ kctx->mmu.group_id], -+ MIDGARD_MMU_BOTTOMLEVEL); -+ mutex_lock(&kctx->mmu.mmu_lock); -+ } while (!err); -+ if (err) { -+ dev_warn(kbdev->dev, -+ "mmu_get_bottom_pgd failure\n"); ++ if (is_huge(*phys) && (index == index_in_large_page(*phys))) ++ cur_level = MIDGARD_MMU_LEVEL(2); ++ ++ err = mmu_get_pgd_at_level(kbdev, mmut, vpfn, cur_level, &pgd); ++ if (WARN_ON(err)) + goto fail_unlock; -+ } + + p = pfn_to_page(PFN_DOWN(pgd)); + pgd_page = kmap(p); + if (!pgd_page) { -+ dev_warn(kbdev->dev, "kmap failure\n"); ++ dev_warn(kbdev->dev, "kmap failure on update_pages"); + err = -ENOMEM; + goto fail_unlock; + } + -+ for (i = 0; i < count; i++) -+ pgd_page[index + i] = kbase_mmu_create_ate(kbdev, -+ phys[i], flags, MIDGARD_MMU_BOTTOMLEVEL, -+ group_id); ++ num_of_valid_entries = ++ kbdev->mmu_mode->get_num_valid_entries(pgd_page); ++ ++ if (cur_level == MIDGARD_MMU_LEVEL(2)) { ++ int level_index = (vpfn >> 9) & 0x1FF; ++ struct tagged_addr *target_phys = ++ phys - index_in_large_page(*phys); ++ ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ WARN_ON_ONCE(!kbdev->mmu_mode->ate_is_valid( ++ pgd_page[level_index], MIDGARD_MMU_LEVEL(2))); ++#endif ++ pgd_page[level_index] = kbase_mmu_create_ate(kbdev, ++ *target_phys, flags, MIDGARD_MMU_LEVEL(2), ++ group_id); ++ kbase_mmu_sync_pgd(kbdev, mmut->kctx, pgd + (level_index * sizeof(u64)), ++ kbase_dma_addr(p) + (level_index * sizeof(u64)), ++ sizeof(u64), KBASE_MMU_OP_NONE); ++ } else { ++ for (i = 0; i < count; i++) { ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ WARN_ON_ONCE(!kbdev->mmu_mode->ate_is_valid( ++ pgd_page[index + i], ++ MIDGARD_MMU_BOTTOMLEVEL)); ++#endif ++ pgd_page[index + i] = kbase_mmu_create_ate(kbdev, ++ phys[i], flags, MIDGARD_MMU_BOTTOMLEVEL, ++ group_id); ++ } ++ ++ /* MMU cache flush strategy is NONE because GPU cache maintenance ++ * will be done by the caller. ++ */ ++ kbase_mmu_sync_pgd(kbdev, mmut->kctx, pgd + (index * sizeof(u64)), ++ kbase_dma_addr(p) + (index * sizeof(u64)), ++ count * sizeof(u64), KBASE_MMU_OP_NONE); ++ } ++ ++ kbdev->mmu_mode->set_num_valid_entries(pgd_page, ++ num_of_valid_entries); ++ ++ if (dirty_pgds && count > 0) ++ *dirty_pgds |= 1ULL << cur_level; + + phys += count; + vpfn += count; + nr -= count; + -+ kbase_mmu_sync_pgd(kbdev, -+ kbase_dma_addr(p) + (index * sizeof(u64)), -+ count * sizeof(u64)); -+ -+ kunmap(pfn_to_page(PFN_DOWN(pgd))); ++ kunmap(p); + } + -+ mutex_unlock(&kctx->mmu.mmu_lock); ++ mutex_unlock(&mmut->mmu_lock); + return 0; + +fail_unlock: -+ mutex_unlock(&kctx->mmu.mmu_lock); ++ mutex_unlock(&mmut->mmu_lock); + return err; +} + -+int kbase_mmu_update_pages(struct kbase_context *kctx, u64 vpfn, -+ struct tagged_addr *phys, size_t nr, -+ unsigned long flags, int const group_id) ++static int kbase_mmu_update_pages_common(struct kbase_device *kbdev, struct kbase_context *kctx, ++ u64 vpfn, struct tagged_addr *phys, size_t nr, ++ unsigned long flags, int const group_id) +{ + int err; ++ struct kbase_mmu_hw_op_param op_param; ++ u64 dirty_pgds = 0; ++ struct kbase_mmu_table *mmut; ++ /* Calls to this function are inherently asynchronous, with respect to ++ * MMU operations. ++ */ ++ const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; ++ int as_nr; ++ ++#if !MALI_USE_CSF ++ if (unlikely(kctx == NULL)) ++ return -EINVAL; ++ ++ as_nr = kctx->as_nr; ++ mmut = &kctx->mmu; ++#else ++ if (kctx) { ++ mmut = &kctx->mmu; ++ as_nr = kctx->as_nr; ++ } else { ++ mmut = &kbdev->csf.mcu_mmu; ++ as_nr = MCU_AS_NR; ++ } ++#endif ++ ++ err = kbase_mmu_update_pages_no_flush(kbdev, mmut, vpfn, phys, nr, flags, group_id, ++ &dirty_pgds); ++ ++ op_param = (const struct kbase_mmu_hw_op_param){ ++ .vpfn = vpfn, ++ .nr = nr, ++ .op = KBASE_MMU_OP_FLUSH_MEM, ++ .kctx_id = kctx ? kctx->id : 0xFFFFFFFF, ++ .mmu_sync_info = mmu_sync_info, ++ .flush_skip_levels = pgd_level_to_skip_flush(dirty_pgds), ++ }; ++ ++ if (mmu_flush_cache_on_gpu_ctrl(kbdev)) ++ mmu_flush_invalidate_on_gpu_ctrl(kbdev, kctx, as_nr, &op_param); ++ else ++ mmu_flush_invalidate(kbdev, kctx, as_nr, &op_param); + -+ err = kbase_mmu_update_pages_no_flush(kctx, vpfn, phys, nr, flags, -+ group_id); -+ kbase_mmu_flush_invalidate(kctx, vpfn, nr, true); + return err; +} + -+static void mmu_teardown_level(struct kbase_device *kbdev, -+ struct kbase_mmu_table *mmut, phys_addr_t pgd, -+ int level, u64 *pgd_page_buffer) ++int kbase_mmu_update_pages(struct kbase_context *kctx, u64 vpfn, struct tagged_addr *phys, ++ size_t nr, unsigned long flags, int const group_id) ++{ ++ if (unlikely(kctx == NULL)) ++ return -EINVAL; ++ ++ return kbase_mmu_update_pages_common(kctx->kbdev, kctx, vpfn, phys, nr, flags, group_id); ++} ++ ++#if MALI_USE_CSF ++int kbase_mmu_update_csf_mcu_pages(struct kbase_device *kbdev, u64 vpfn, struct tagged_addr *phys, ++ size_t nr, unsigned long flags, int const group_id) ++{ ++ return kbase_mmu_update_pages_common(kbdev, NULL, vpfn, phys, nr, flags, group_id); ++} ++#endif /* MALI_USE_CSF */ ++ ++static void mmu_page_migration_transaction_begin(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ WARN_ON_ONCE(kbdev->mmu_page_migrate_in_progress); ++ kbdev->mmu_page_migrate_in_progress = true; ++} ++ ++static void mmu_page_migration_transaction_end(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ WARN_ON_ONCE(!kbdev->mmu_page_migrate_in_progress); ++ kbdev->mmu_page_migrate_in_progress = false; ++ /* Invoke the PM state machine, as the MMU page migration session ++ * may have deferred a transition in L2 state machine. ++ */ ++ kbase_pm_update_state(kbdev); ++} ++ ++int kbase_mmu_migrate_page(struct tagged_addr old_phys, struct tagged_addr new_phys, ++ dma_addr_t old_dma_addr, dma_addr_t new_dma_addr, int level) ++{ ++ struct kbase_page_metadata *page_md = kbase_page_private(as_page(old_phys)); ++ struct kbase_mmu_hw_op_param op_param; ++ struct kbase_mmu_table *mmut = (level == MIDGARD_MMU_BOTTOMLEVEL) ? ++ page_md->data.mapped.mmut : ++ page_md->data.pt_mapped.mmut; ++ struct kbase_device *kbdev; ++ phys_addr_t pgd; ++ u64 *old_page, *new_page, *pgd_page, *target, vpfn; ++ int index, check_state, ret = 0; ++ unsigned long hwaccess_flags = 0; ++ unsigned int num_of_valid_entries; ++ u8 vmap_count = 0; ++ ++ /* Due to the hard binding of mmu_command_instr with kctx_id via kbase_mmu_hw_op_param, ++ * here we skip the no kctx case, which is only used with MCU's mmut. ++ */ ++ if (!mmut->kctx) ++ return -EINVAL; ++ ++ if (level > MIDGARD_MMU_BOTTOMLEVEL) ++ return -EINVAL; ++ else if (level == MIDGARD_MMU_BOTTOMLEVEL) ++ vpfn = page_md->data.mapped.vpfn; ++ else ++ vpfn = PGD_VPFN_LEVEL_GET_VPFN(page_md->data.pt_mapped.pgd_vpfn_level); ++ ++ kbdev = mmut->kctx->kbdev; ++ index = (vpfn >> ((3 - level) * 9)) & 0x1FF; ++ ++ /* Create all mappings before copying content. ++ * This is done as early as possible because is the only operation that may ++ * fail. It is possible to do this before taking any locks because the ++ * pages to migrate are not going to change and even the parent PGD is not ++ * going to be affected by any other concurrent operation, since the page ++ * has been isolated before migration and therefore it cannot disappear in ++ * the middle of this function. ++ */ ++ old_page = kmap(as_page(old_phys)); ++ if (!old_page) { ++ dev_warn(kbdev->dev, "%s: kmap failure for old page.", __func__); ++ ret = -EINVAL; ++ goto old_page_map_error; ++ } ++ ++ new_page = kmap(as_page(new_phys)); ++ if (!new_page) { ++ dev_warn(kbdev->dev, "%s: kmap failure for new page.", __func__); ++ ret = -EINVAL; ++ goto new_page_map_error; ++ } ++ ++ /* GPU cache maintenance affects both memory content and page table, ++ * but at two different stages. A single virtual memory page is affected ++ * by the migration. ++ * ++ * Notice that the MMU maintenance is done in the following steps: ++ * ++ * 1) The MMU region is locked without performing any other operation. ++ * This lock must cover the entire migration process, in order to ++ * prevent any GPU access to the virtual page whose physical page ++ * is being migrated. ++ * 2) Immediately after locking: the MMU region content is flushed via ++ * GPU control while the lock is taken and without unlocking. ++ * The region must stay locked for the duration of the whole page ++ * migration procedure. ++ * This is necessary to make sure that pending writes to the old page ++ * are finalized before copying content to the new page. ++ * 3) Before unlocking: changes to the page table are flushed. ++ * Finer-grained GPU control operations are used if possible, otherwise ++ * the whole GPU cache shall be flushed again. ++ * This is necessary to make sure that the GPU accesses the new page ++ * after migration. ++ * 4) The MMU region is unlocked. ++ */ ++#define PGD_VPFN_MASK(level) (~((((u64)1) << ((3 - level) * 9)) - 1)) ++ op_param.mmu_sync_info = CALLER_MMU_ASYNC; ++ op_param.kctx_id = mmut->kctx->id; ++ op_param.vpfn = vpfn & PGD_VPFN_MASK(level); ++ op_param.nr = 1 << ((3 - level) * 9); ++ op_param.op = KBASE_MMU_OP_FLUSH_PT; ++ /* When level is not MIDGARD_MMU_BOTTOMLEVEL, it is assumed PGD page migration */ ++ op_param.flush_skip_levels = (level == MIDGARD_MMU_BOTTOMLEVEL) ? ++ pgd_level_to_skip_flush(1ULL << level) : ++ pgd_level_to_skip_flush(3ULL << level); ++ ++ mutex_lock(&mmut->mmu_lock); ++ ++ /* The state was evaluated before entering this function, but it could ++ * have changed before the mmu_lock was taken. However, the state ++ * transitions which are possible at this point are only two, and in both ++ * cases it is a stable state progressing to a "free in progress" state. ++ * ++ * After taking the mmu_lock the state can no longer change: read it again ++ * and make sure that it hasn't changed before continuing. ++ */ ++ spin_lock(&page_md->migrate_lock); ++ check_state = PAGE_STATUS_GET(page_md->status); ++ if (level == MIDGARD_MMU_BOTTOMLEVEL) ++ vmap_count = page_md->vmap_count; ++ spin_unlock(&page_md->migrate_lock); ++ ++ if (level == MIDGARD_MMU_BOTTOMLEVEL) { ++ if (check_state != ALLOCATED_MAPPED) { ++ dev_dbg(kbdev->dev, ++ "%s: state changed to %d (was %d), abort page migration", __func__, ++ check_state, ALLOCATED_MAPPED); ++ ret = -EAGAIN; ++ goto page_state_change_out; ++ } else if (vmap_count > 0) { ++ dev_dbg(kbdev->dev, "%s: page was multi-mapped, abort page migration", ++ __func__); ++ ret = -EAGAIN; ++ goto page_state_change_out; ++ } ++ } else { ++ if (check_state != PT_MAPPED) { ++ dev_dbg(kbdev->dev, ++ "%s: state changed to %d (was %d), abort PGD page migration", ++ __func__, check_state, PT_MAPPED); ++ WARN_ON_ONCE(check_state != FREE_PT_ISOLATED_IN_PROGRESS); ++ ret = -EAGAIN; ++ goto page_state_change_out; ++ } ++ } ++ ++ ret = mmu_get_pgd_at_level(kbdev, mmut, vpfn, level, &pgd); ++ if (ret) { ++ dev_err(kbdev->dev, "%s: failed to find PGD for old page.", __func__); ++ goto get_pgd_at_level_error; ++ } ++ ++ pgd_page = kmap(phys_to_page(pgd)); ++ if (!pgd_page) { ++ dev_warn(kbdev->dev, "%s: kmap failure for PGD page.", __func__); ++ ret = -EINVAL; ++ goto pgd_page_map_error; ++ } ++ ++ mutex_lock(&kbdev->pm.lock); ++ mutex_lock(&kbdev->mmu_hw_mutex); ++ ++ /* Lock MMU region and flush GPU cache by using GPU control, ++ * in order to keep MMU region locked. ++ */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, hwaccess_flags); ++ if (unlikely(!kbase_pm_l2_allow_mmu_page_migration(kbdev))) { ++ /* Defer the migration as L2 is in a transitional phase */ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, hwaccess_flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++ mutex_unlock(&kbdev->pm.lock); ++ dev_dbg(kbdev->dev, "%s: L2 in transtion, abort PGD page migration", __func__); ++ ret = -EAGAIN; ++ goto l2_state_defer_out; ++ } ++ /* Prevent transitional phases in L2 by starting the transaction */ ++ mmu_page_migration_transaction_begin(kbdev); ++ if (kbdev->pm.backend.gpu_powered && mmut->kctx->as_nr >= 0) { ++ int as_nr = mmut->kctx->as_nr; ++ struct kbase_as *as = &kbdev->as[as_nr]; ++ ++ ret = kbase_mmu_hw_do_lock(kbdev, as, &op_param); ++ if (!ret) { ++ ret = kbase_gpu_cache_flush_and_busy_wait( ++ kbdev, GPU_COMMAND_CACHE_CLN_INV_L2_LSC); ++ } ++ if (ret) ++ mmu_page_migration_transaction_end(kbdev); ++ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, hwaccess_flags); ++ ++ if (ret < 0) { ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++ mutex_unlock(&kbdev->pm.lock); ++ dev_err(kbdev->dev, "%s: failed to lock MMU region or flush GPU cache", __func__); ++ goto undo_mappings; ++ } ++ ++ /* Copy memory content. ++ * ++ * It is necessary to claim the ownership of the DMA buffer for the old ++ * page before performing the copy, to make sure of reading a consistent ++ * version of its content, before copying. After the copy, ownership of ++ * the DMA buffer for the new page is given to the GPU in order to make ++ * the content visible to potential GPU access that may happen as soon as ++ * this function releases the lock on the MMU region. ++ */ ++ dma_sync_single_for_cpu(kbdev->dev, old_dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ memcpy(new_page, old_page, PAGE_SIZE); ++ dma_sync_single_for_device(kbdev->dev, new_dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ ++ /* Remap GPU virtual page. ++ * ++ * This code rests on the assumption that page migration is only enabled ++ * for 4 kB pages, that necessarily live in the bottom level of the MMU ++ * page table. For this reason, the PGD level tells us inequivocably ++ * whether the page being migrated is a "content page" or another PGD ++ * of the page table: ++ * ++ * - Bottom level implies ATE (Address Translation Entry) ++ * - Any other level implies PTE (Page Table Entry) ++ * ++ * The current implementation doesn't handle the case of a level 0 PGD, ++ * that is: the root PGD of the page table. ++ */ ++ target = &pgd_page[index]; ++ ++ /* Certain entries of a page table page encode the count of valid entries ++ * present in that page. So need to save & restore the count information ++ * when updating the PTE/ATE to point to the new page. ++ */ ++ num_of_valid_entries = kbdev->mmu_mode->get_num_valid_entries(pgd_page); ++ ++ if (level == MIDGARD_MMU_BOTTOMLEVEL) { ++ WARN_ON_ONCE((*target & 1UL) == 0); ++ *target = ++ kbase_mmu_create_ate(kbdev, new_phys, page_md->data.mapped.reg->flags, ++ level, page_md->data.mapped.reg->gpu_alloc->group_id); ++ } else { ++ u64 managed_pte; ++ ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ /* The PTE should be pointing to the page being migrated */ ++ WARN_ON_ONCE(as_phys_addr_t(old_phys) != kbdev->mmu_mode->pte_to_phy_addr( ++ kbdev->mgm_dev->ops.mgm_pte_to_original_pte( ++ kbdev->mgm_dev, MGM_DEFAULT_PTE_GROUP, level, pgd_page[index]))); ++#endif ++ kbdev->mmu_mode->entry_set_pte(&managed_pte, as_phys_addr_t(new_phys)); ++ *target = kbdev->mgm_dev->ops.mgm_update_gpu_pte( ++ kbdev->mgm_dev, MGM_DEFAULT_PTE_GROUP, level, managed_pte); ++ } ++ ++ kbdev->mmu_mode->set_num_valid_entries(pgd_page, num_of_valid_entries); ++ ++ /* This function always updates a single entry inside an existing PGD, ++ * therefore cache maintenance is necessary and affects a single entry. ++ */ ++ kbase_mmu_sync_pgd(kbdev, mmut->kctx, pgd + (index * sizeof(u64)), ++ kbase_dma_addr(phys_to_page(pgd)) + (index * sizeof(u64)), sizeof(u64), ++ KBASE_MMU_OP_FLUSH_PT); ++ ++ /* Unlock MMU region. ++ * ++ * Notice that GPUs which don't issue flush commands via GPU control ++ * still need an additional GPU cache flush here, this time only ++ * for the page table, because the function call above to sync PGDs ++ * won't have any effect on them. ++ */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, hwaccess_flags); ++ if (kbdev->pm.backend.gpu_powered && mmut->kctx->as_nr >= 0) { ++ int as_nr = mmut->kctx->as_nr; ++ struct kbase_as *as = &kbdev->as[as_nr]; ++ ++ if (mmu_flush_cache_on_gpu_ctrl(kbdev)) { ++ ret = kbase_mmu_hw_do_unlock(kbdev, as, &op_param); ++ } else { ++ ret = kbase_gpu_cache_flush_and_busy_wait(kbdev, ++ GPU_COMMAND_CACHE_CLN_INV_L2); ++ if (!ret) ++ ret = kbase_mmu_hw_do_unlock_no_addr(kbdev, as, &op_param); ++ } ++ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, hwaccess_flags); ++ /* Releasing locks before checking the migration transaction error state */ ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++ mutex_unlock(&kbdev->pm.lock); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, hwaccess_flags); ++ /* Release the transition prevention in L2 by ending the transaction */ ++ mmu_page_migration_transaction_end(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, hwaccess_flags); ++ ++ /* Checking the final migration transaction error state */ ++ if (ret < 0) { ++ dev_err(kbdev->dev, "%s: failed to unlock MMU region.", __func__); ++ goto undo_mappings; ++ } ++ ++ /* Undertaking metadata transfer, while we are holding the mmu_lock */ ++ spin_lock(&page_md->migrate_lock); ++ if (level == MIDGARD_MMU_BOTTOMLEVEL) { ++ size_t page_array_index = ++ page_md->data.mapped.vpfn - page_md->data.mapped.reg->start_pfn; ++ ++ WARN_ON(PAGE_STATUS_GET(page_md->status) != ALLOCATED_MAPPED); ++ ++ /* Replace page in array of pages of the physical allocation. */ ++ page_md->data.mapped.reg->gpu_alloc->pages[page_array_index] = new_phys; ++ } ++ /* Update the new page dma_addr with the transferred metadata from the old_page */ ++ page_md->dma_addr = new_dma_addr; ++ page_md->status = PAGE_ISOLATE_SET(page_md->status, 0); ++ spin_unlock(&page_md->migrate_lock); ++ set_page_private(as_page(new_phys), (unsigned long)page_md); ++ /* Old page metatdata pointer cleared as it now owned by the new page */ ++ set_page_private(as_page(old_phys), 0); ++ ++l2_state_defer_out: ++ kunmap(phys_to_page(pgd)); ++pgd_page_map_error: ++get_pgd_at_level_error: ++page_state_change_out: ++ mutex_unlock(&mmut->mmu_lock); ++ ++ kunmap(as_page(new_phys)); ++new_page_map_error: ++ kunmap(as_page(old_phys)); ++old_page_map_error: ++ return ret; ++ ++undo_mappings: ++ /* Unlock the MMU table and undo mappings. */ ++ mutex_unlock(&mmut->mmu_lock); ++ kunmap(phys_to_page(pgd)); ++ kunmap(as_page(new_phys)); ++ kunmap(as_page(old_phys)); ++ ++ return ret; ++} ++ ++static void mmu_teardown_level(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ phys_addr_t pgd, unsigned int level) +{ -+ phys_addr_t target_pgd; -+ struct page *p; + u64 *pgd_page; + int i; -+ struct kbase_mmu_mode const *mmu_mode; ++ struct memory_group_manager_device *mgm_dev = kbdev->mgm_dev; ++ struct kbase_mmu_mode const *mmu_mode = kbdev->mmu_mode; ++ u64 *pgd_page_buffer = NULL; ++ struct page *p = phys_to_page(pgd); + + lockdep_assert_held(&mmut->mmu_lock); + -+ pgd_page = kmap_atomic(pfn_to_page(PFN_DOWN(pgd))); ++ pgd_page = kmap_atomic(p); + /* kmap_atomic should NEVER fail. */ -+ if (WARN_ON(pgd_page == NULL)) ++ if (WARN_ON_ONCE(pgd_page == NULL)) + return; -+ /* Copy the page to our preallocated buffer so that we can minimize -+ * kmap_atomic usage ++ if (level < MIDGARD_MMU_BOTTOMLEVEL) { ++ /* Copy the page to our preallocated buffer so that we can minimize ++ * kmap_atomic usage ++ */ ++ pgd_page_buffer = mmut->scratch_mem.teardown_pages.levels[level]; ++ memcpy(pgd_page_buffer, pgd_page, PAGE_SIZE); ++ } ++ ++ /* When page migration is enabled, kbase_region_tracker_term() would ensure ++ * there are no pages left mapped on the GPU for a context. Hence the count ++ * of valid entries is expected to be zero here. + */ -+ memcpy(pgd_page_buffer, pgd_page, PAGE_SIZE); ++ if (kbase_page_migration_enabled && mmut->kctx) ++ WARN_ON_ONCE(kbdev->mmu_mode->get_num_valid_entries(pgd_page)); ++ /* Invalidate page after copying */ ++ mmu_mode->entries_invalidate(pgd_page, KBASE_MMU_PAGE_ENTRIES); + kunmap_atomic(pgd_page); + pgd_page = pgd_page_buffer; + -+ mmu_mode = kbdev->mmu_mode; -+ -+ for (i = 0; i < KBASE_MMU_PAGE_ENTRIES; i++) { -+ target_pgd = mmu_mode->pte_to_phy_addr(pgd_page[i]); -+ -+ if (target_pgd) { ++ if (level < MIDGARD_MMU_BOTTOMLEVEL) { ++ for (i = 0; i < KBASE_MMU_PAGE_ENTRIES; i++) { + if (mmu_mode->pte_is_valid(pgd_page[i], level)) { -+ mmu_teardown_level(kbdev, mmut, -+ target_pgd, -+ level + 1, -+ pgd_page_buffer + -+ (PAGE_SIZE / sizeof(u64))); ++ phys_addr_t target_pgd = mmu_mode->pte_to_phy_addr( ++ mgm_dev->ops.mgm_pte_to_original_pte(mgm_dev, ++ MGM_DEFAULT_PTE_GROUP, ++ level, pgd_page[i])); ++ ++ mmu_teardown_level(kbdev, mmut, target_pgd, level + 1); + } + } + } + -+ p = pfn_to_page(PFN_DOWN(pgd)); -+ -+ kbase_mem_pool_free(&kbdev->mem_pools.small[mmut->group_id], -+ p, true); -+ -+ atomic_sub(1, &kbdev->memdev.used_pages); -+ -+ /* If MMU tables belong to a context then pages will have been accounted -+ * against it, so we must decrement the usage counts here. -+ */ -+ if (mmut->kctx) { -+ kbase_process_page_usage_dec(mmut->kctx, 1); -+ atomic_sub(1, &mmut->kctx->used_pages); -+ } -+ -+ kbase_trace_gpu_mem_usage_dec(kbdev, mmut->kctx, 1); ++ kbase_mmu_free_pgd(kbdev, mmut, pgd); +} + +int kbase_mmu_init(struct kbase_device *const kbdev, @@ -244755,27 +283893,26 @@ index 000000000000..a5cda009426d + WARN_ON(group_id < 0)) + return -EINVAL; + ++ compiletime_assert(KBASE_MEM_ALLOC_MAX_SIZE <= (((8ull << 30) >> PAGE_SHIFT)), ++ "List of free PGDs may not be large enough."); ++ compiletime_assert(MAX_PAGES_FOR_FREE_PGDS >= MIDGARD_MMU_BOTTOMLEVEL, ++ "Array of MMU levels is not large enough."); ++ + mmut->group_id = group_id; + mutex_init(&mmut->mmu_lock); + mmut->kctx = kctx; ++ mmut->pgd = KBASE_MMU_INVALID_PGD_ADDRESS; + -+ /* Preallocate MMU depth of four pages for mmu_teardown_level to use */ -+ mmut->mmu_teardown_pages = kmalloc(PAGE_SIZE * 4, GFP_KERNEL); -+ -+ if (mmut->mmu_teardown_pages == NULL) -+ return -ENOMEM; -+ -+ mmut->pgd = 0; + /* We allocate pages into the kbdev memory pool, then + * kbase_mmu_alloc_pgd will allocate out of that pool. This is done to + * avoid allocations from the kernel happening with the lock held. + */ -+ while (!mmut->pgd) { ++ while (mmut->pgd == KBASE_MMU_INVALID_PGD_ADDRESS) { + int err; + + err = kbase_mem_pool_grow( + &kbdev->mem_pools.small[mmut->group_id], -+ MIDGARD_MMU_BOTTOMLEVEL); ++ MIDGARD_MMU_BOTTOMLEVEL, kctx ? kctx->task : NULL); + if (err) { + kbase_mmu_term(kbdev, mmut); + return -ENOMEM; @@ -244791,25 +283928,43 @@ index 000000000000..a5cda009426d + +void kbase_mmu_term(struct kbase_device *kbdev, struct kbase_mmu_table *mmut) +{ -+ if (mmut->pgd) { ++ WARN((mmut->kctx) && (mmut->kctx->as_nr != KBASEP_AS_NR_INVALID), ++ "kctx-%d_%d must first be scheduled out to flush GPU caches+tlbs before tearing down MMU tables", ++ mmut->kctx->tgid, mmut->kctx->id); ++ ++ if (mmut->pgd != KBASE_MMU_INVALID_PGD_ADDRESS) { + mutex_lock(&mmut->mmu_lock); -+ mmu_teardown_level(kbdev, mmut, mmut->pgd, MIDGARD_MMU_TOPLEVEL, -+ mmut->mmu_teardown_pages); ++ mmu_teardown_level(kbdev, mmut, mmut->pgd, MIDGARD_MMU_TOPLEVEL); + mutex_unlock(&mmut->mmu_lock); + + if (mmut->kctx) + KBASE_TLSTREAM_AUX_PAGESALLOC(kbdev, mmut->kctx->id, 0); + } + -+ kfree(mmut->mmu_teardown_pages); + mutex_destroy(&mmut->mmu_lock); +} + -+void kbase_mmu_as_term(struct kbase_device *kbdev, int i) ++void kbase_mmu_as_term(struct kbase_device *kbdev, unsigned int i) +{ + destroy_workqueue(kbdev->as[i].pf_wq); +} + ++void kbase_mmu_flush_pa_range(struct kbase_device *kbdev, struct kbase_context *kctx, ++ phys_addr_t phys, size_t size, ++ enum kbase_mmu_op_type flush_op) ++{ ++#if MALI_USE_CSF ++ unsigned long irq_flags; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, irq_flags); ++ if (mmu_flush_cache_on_gpu_ctrl(kbdev) && (flush_op != KBASE_MMU_OP_NONE) && ++ kbdev->pm.backend.gpu_powered && (!kctx || kctx->as_nr >= 0)) ++ mmu_flush_pa_range(kbdev, phys, size, KBASE_MMU_OP_FLUSH_PT); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, irq_flags); ++#endif ++} ++ ++#ifdef CONFIG_MALI_VECTOR_DUMP +static size_t kbasep_mmu_dump_level(struct kbase_context *kctx, phys_addr_t pgd, + int level, char ** const buffer, size_t *size_left) +{ @@ -244830,7 +283985,7 @@ index 000000000000..a5cda009426d + + pgd_page = kmap(pfn_to_page(PFN_DOWN(pgd))); + if (!pgd_page) { -+ dev_warn(kbdev->dev, "%s: kmap failure\n", __func__); ++ dev_warn(kbdev->dev, "%s: kmap failure", __func__); + return 0; + } + @@ -244855,7 +284010,9 @@ index 000000000000..a5cda009426d + for (i = 0; i < KBASE_MMU_PAGE_ENTRIES; i++) { + if (mmu_mode->pte_is_valid(pgd_page[i], level)) { + target_pgd = mmu_mode->pte_to_phy_addr( -+ pgd_page[i]); ++ kbdev->mgm_dev->ops.mgm_pte_to_original_pte( ++ kbdev->mgm_dev, MGM_DEFAULT_PTE_GROUP, ++ level, pgd_page[i])); + + dump_size = kbasep_mmu_dump_level(kctx, + target_pgd, level + 1, @@ -244949,6 +284106,7 @@ index 000000000000..a5cda009426d + return NULL; +} +KBASE_EXPORT_TEST_API(kbase_mmu_dump); ++#endif /* CONFIG_MALI_VECTOR_DUMP */ + +void kbase_mmu_bus_fault_worker(struct work_struct *data) +{ @@ -244981,8 +284139,7 @@ index 000000000000..a5cda009426d +#ifdef CONFIG_MALI_ARBITER_SUPPORT + /* check if we still have GPU */ + if (unlikely(kbase_is_gpu_removed(kbdev))) { -+ dev_dbg(kbdev->dev, -+ "%s: GPU has been removed\n", __func__); ++ dev_dbg(kbdev->dev, "%s: GPU has been removed", __func__); + release_ctx(kbdev, kctx); + atomic_dec(&kbdev->faults_pending); + return; @@ -245000,6 +284157,13 @@ index 000000000000..a5cda009426d + + } + ++#if MALI_USE_CSF ++ /* Before the GPU power off, wait is done for the completion of ++ * in-flight MMU fault work items. So GPU is expected to remain ++ * powered up whilst the bus fault handling is being done. ++ */ ++ kbase_gpu_report_bus_fault_and_kill(kctx, faulting_as, fault); ++#else + /* NOTE: If GPU already powered off for suspend, + * we don't need to switch to unmapped + */ @@ -245008,6 +284172,7 @@ index 000000000000..a5cda009426d + kbase_gpu_report_bus_fault_and_kill(kctx, faulting_as, fault); + kbase_pm_context_idle(kbdev); + } ++#endif + + release_ctx(kbdev, kctx); + @@ -245026,18 +284191,19 @@ index 000000000000..a5cda009426d +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h new file mode 100755 -index 000000000000..f2613e881dac +index 000000000..699b1f340 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h -@@ -0,0 +1,156 @@ +@@ -0,0 +1,341 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -245048,42 +284214,86 @@ index 000000000000..f2613e881dac + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_MMU_H_ +#define _KBASE_MMU_H_ + ++#include ++ ++#define KBASE_MMU_PAGE_ENTRIES 512 ++#define KBASE_MMU_INVALID_PGD_ADDRESS (~(phys_addr_t)0) ++ ++struct kbase_context; ++struct kbase_mmu_table; ++struct kbase_va_region; ++ +/** -+ * kbase_mmu_as_init() - Initialising GPU address space object. ++ * enum kbase_caller_mmu_sync_info - MMU-synchronous caller info. ++ * A pointer to this type is passed down from the outer-most callers in the kbase ++ * module - where the information resides as to the synchronous / asynchronous ++ * nature of the call flow, with respect to MMU operations. ie - does the call flow relate to ++ * existing GPU work does it come from requests (like ioctl) from user-space, power management, ++ * etc. + * -+ * This is called from device probe to initialise an address space object -+ * of the device. ++ * @CALLER_MMU_UNSET_SYNCHRONICITY: default value must be invalid to avoid accidental choice ++ * of a 'valid' value ++ * @CALLER_MMU_SYNC: Arbitrary value for 'synchronous that isn't easy to choose by accident ++ * @CALLER_MMU_ASYNC: Also hard to choose by accident ++ */ ++enum kbase_caller_mmu_sync_info { ++ CALLER_MMU_UNSET_SYNCHRONICITY, ++ CALLER_MMU_SYNC = 0x02, ++ CALLER_MMU_ASYNC ++}; ++ ++/** ++ * enum kbase_mmu_op_type - enum for MMU operations ++ * @KBASE_MMU_OP_NONE: To help catch uninitialized struct ++ * @KBASE_MMU_OP_FIRST: The lower boundary of enum ++ * @KBASE_MMU_OP_LOCK: Lock memory region ++ * @KBASE_MMU_OP_UNLOCK: Unlock memory region ++ * @KBASE_MMU_OP_FLUSH_PT: Flush page table (CLN+INV L2 only) ++ * @KBASE_MMU_OP_FLUSH_MEM: Flush memory (CLN+INV L2+LSC) ++ * @KBASE_MMU_OP_COUNT: The upper boundary of enum ++ */ ++enum kbase_mmu_op_type { ++ KBASE_MMU_OP_NONE = 0, /* Must be zero */ ++ KBASE_MMU_OP_FIRST, /* Must be the first non-zero op */ ++ KBASE_MMU_OP_LOCK = KBASE_MMU_OP_FIRST, ++ KBASE_MMU_OP_UNLOCK, ++ KBASE_MMU_OP_FLUSH_PT, ++ KBASE_MMU_OP_FLUSH_MEM, ++ KBASE_MMU_OP_COUNT /* Must be the last in enum */ ++}; ++ ++/** ++ * kbase_mmu_as_init() - Initialising GPU address space object. + * + * @kbdev: The kbase device structure for the device (must be a valid pointer). + * @i: Array index of address space object. + * ++ * This is called from device probe to initialise an address space object ++ * of the device. ++ * + * Return: 0 on success and non-zero value on failure. + */ -+int kbase_mmu_as_init(struct kbase_device *kbdev, int i); ++int kbase_mmu_as_init(struct kbase_device *kbdev, unsigned int i); + +/** + * kbase_mmu_as_term() - Terminate address space object. + * -+ * This is called upon device termination to destroy -+ * the address space object of the device. -+ * + * @kbdev: The kbase device structure for the device (must be a valid pointer). + * @i: Array index of address space object. ++ * ++ * This is called upon device termination to destroy ++ * the address space object of the device. + */ -+void kbase_mmu_as_term(struct kbase_device *kbdev, int i); ++void kbase_mmu_as_term(struct kbase_device *kbdev, unsigned int i); + +/** + * kbase_mmu_init - Initialise an object representing GPU page tables + * -+ * The structure should be terminated using kbase_mmu_term() -+ * + * @kbdev: Instance of GPU platform device, allocated from the probe method. + * @mmut: GPU page tables to be initialized. + * @kctx: Optional kbase context, may be NULL if this set of MMU tables @@ -245091,6 +284301,8 @@ index 000000000000..f2613e881dac + * @group_id: The physical group ID from which to allocate GPU page tables. + * Valid range is 0..(MEMORY_GROUP_MANAGER_NR_GROUPS-1). + * ++ * The structure should be terminated using kbase_mmu_term() ++ * + * Return: 0 if successful, otherwise a negative error code. + */ +int kbase_mmu_init(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, @@ -245099,20 +284311,20 @@ index 000000000000..f2613e881dac +/** + * kbase_mmu_interrupt - Process an MMU interrupt. + * -+ * Process the MMU interrupt that was reported by the &kbase_device. -+ * + * @kbdev: Pointer to the kbase device for which the interrupt happened. + * @irq_stat: Value of the MMU_IRQ_STATUS register. ++ * ++ * Process the MMU interrupt that was reported by the &kbase_device. + */ +void kbase_mmu_interrupt(struct kbase_device *kbdev, u32 irq_stat); + +/** + * kbase_mmu_term - Terminate an object representing GPU page tables + * -+ * This will free any page tables that have been allocated -+ * + * @kbdev: Instance of GPU platform device, allocated from the probe method. + * @mmut: GPU page tables to be destroyed. ++ * ++ * This will free any page tables that have been allocated + */ +void kbase_mmu_term(struct kbase_device *kbdev, struct kbase_mmu_table *mmut); + @@ -245136,36 +284348,155 @@ index 000000000000..f2613e881dac +u64 kbase_mmu_create_ate(struct kbase_device *kbdev, + struct tagged_addr phy, unsigned long flags, int level, int group_id); + -+int kbase_mmu_insert_pages_no_flush(struct kbase_device *kbdev, -+ struct kbase_mmu_table *mmut, -+ const u64 start_vpfn, -+ struct tagged_addr *phys, size_t nr, -+ unsigned long flags, int group_id); -+int kbase_mmu_insert_pages(struct kbase_device *kbdev, -+ struct kbase_mmu_table *mmut, u64 vpfn, -+ struct tagged_addr *phys, size_t nr, -+ unsigned long flags, int as_nr, int group_id); -+int kbase_mmu_insert_single_page(struct kbase_context *kctx, u64 vpfn, -+ struct tagged_addr phys, size_t nr, -+ unsigned long flags, int group_id); ++int kbase_mmu_insert_pages_no_flush(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ u64 vpfn, struct tagged_addr *phys, size_t nr, ++ unsigned long flags, int group_id, u64 *dirty_pgds, ++ struct kbase_va_region *reg, bool ignore_page_migration); ++int kbase_mmu_insert_pages(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, u64 vpfn, ++ struct tagged_addr *phys, size_t nr, unsigned long flags, int as_nr, ++ int group_id, enum kbase_caller_mmu_sync_info mmu_sync_info, ++ struct kbase_va_region *reg, bool ignore_page_migration); ++int kbase_mmu_insert_imported_pages(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ u64 vpfn, struct tagged_addr *phys, size_t nr, ++ unsigned long flags, int as_nr, int group_id, ++ enum kbase_caller_mmu_sync_info mmu_sync_info, ++ struct kbase_va_region *reg); ++int kbase_mmu_insert_aliased_pages(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, ++ u64 vpfn, struct tagged_addr *phys, size_t nr, ++ unsigned long flags, int as_nr, int group_id, ++ enum kbase_caller_mmu_sync_info mmu_sync_info, ++ struct kbase_va_region *reg); ++int kbase_mmu_insert_single_page(struct kbase_context *kctx, u64 vpfn, struct tagged_addr phys, ++ size_t nr, unsigned long flags, int group_id, ++ enum kbase_caller_mmu_sync_info mmu_sync_info, ++ bool ignore_page_migration); ++int kbase_mmu_insert_single_imported_page(struct kbase_context *kctx, u64 vpfn, ++ struct tagged_addr phys, size_t nr, unsigned long flags, ++ int group_id, ++ enum kbase_caller_mmu_sync_info mmu_sync_info); ++int kbase_mmu_insert_single_aliased_page(struct kbase_context *kctx, u64 vpfn, ++ struct tagged_addr phys, size_t nr, unsigned long flags, ++ int group_id, ++ enum kbase_caller_mmu_sync_info mmu_sync_info); ++ ++/** ++ * kbase_mmu_teardown_pages - Remove GPU virtual addresses from the MMU page table ++ * ++ * @kbdev: Pointer to kbase device. ++ * @mmut: Pointer to GPU MMU page table. ++ * @vpfn: Start page frame number of the GPU virtual pages to unmap. ++ * @phys: Array of physical pages currently mapped to the virtual ++ * pages to unmap, or NULL. This is used for GPU cache maintenance ++ * and page migration support. ++ * @nr_phys_pages: Number of physical pages to flush. ++ * @nr_virt_pages: Number of virtual pages whose PTEs should be destroyed. ++ * @as_nr: Address space number, for GPU cache maintenance operations ++ * that happen outside a specific kbase context. ++ * @ignore_page_migration: Whether page migration metadata should be ignored. ++ * ++ * We actually discard the ATE and free the page table pages if no valid entries ++ * exist in PGD. ++ * ++ * IMPORTANT: This uses kbasep_js_runpool_release_ctx() when the context is ++ * currently scheduled into the runpool, and so potentially uses a lot of locks. ++ * These locks must be taken in the correct order with respect to others ++ * already held by the caller. Refer to kbasep_js_runpool_release_ctx() for more ++ * information. ++ * ++ * The @p phys pointer to physical pages is not necessary for unmapping virtual memory, ++ * but it is used for fine-grained GPU cache maintenance. If @p phys is NULL, ++ * GPU cache maintenance will be done as usual, that is invalidating the whole GPU caches ++ * instead of specific physical address ranges. ++ * ++ * Return: 0 on success, otherwise an error code. ++ */ ++int kbase_mmu_teardown_pages(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, u64 vpfn, ++ struct tagged_addr *phys, size_t nr_phys_pages, size_t nr_virt_pages, ++ int as_nr, bool ignore_page_migration); + -+int kbase_mmu_teardown_pages(struct kbase_device *kbdev, -+ struct kbase_mmu_table *mmut, u64 vpfn, -+ size_t nr, int as_nr); +int kbase_mmu_update_pages(struct kbase_context *kctx, u64 vpfn, + struct tagged_addr *phys, size_t nr, + unsigned long flags, int const group_id); ++#if MALI_USE_CSF ++/** ++ * kbase_mmu_update_csf_mcu_pages - Update MCU mappings with changes of phys and flags ++ * ++ * @kbdev: Pointer to kbase device. ++ * @vpfn: Virtual PFN (Page Frame Number) of the first page to update ++ * @phys: Pointer to the array of tagged physical addresses of the physical ++ * pages that are pointed to by the page table entries (that need to ++ * be updated). ++ * @nr: Number of pages to update ++ * @flags: Flags ++ * @group_id: The physical memory group in which the page was allocated. ++ * Valid range is 0..(MEMORY_GROUP_MANAGER_NR_GROUPS-1). ++ * ++ * Return: 0 on success, otherwise an error code. ++ */ ++int kbase_mmu_update_csf_mcu_pages(struct kbase_device *kbdev, u64 vpfn, struct tagged_addr *phys, ++ size_t nr, unsigned long flags, int const group_id); ++#endif + +/** -+ * kbase_mmu_bus_fault_interrupt - Process a bus fault interrupt. ++ * kbase_mmu_migrate_page - Migrate GPU mappings and content between memory pages + * -+ * Process the bus fault interrupt that was reported for a particular GPU -+ * address space. ++ * @old_phys: Old physical page to be replaced. ++ * @new_phys: New physical page used to replace old physical page. ++ * @old_dma_addr: DMA address of the old page. ++ * @new_dma_addr: DMA address of the new page. ++ * @level: MMU page table level of the provided PGD. ++ * ++ * The page migration process is made of 2 big steps: ++ * ++ * 1) Copy the content of the old page to the new page. ++ * 2) Remap the virtual page, that is: replace either the ATE (if the old page ++ * was a regular page) or the PTE (if the old page was used as a PGD) in the ++ * MMU page table with the new page. ++ * ++ * During the process, the MMU region is locked to prevent GPU access to the ++ * virtual memory page that is being remapped. ++ * ++ * Before copying the content of the old page to the new page and while the ++ * MMU region is locked, a GPU cache flush is performed to make sure that ++ * pending GPU writes are finalized to the old page before copying. ++ * That is necessary because otherwise there's a risk that GPU writes might ++ * be finalized to the old page, and not new page, after migration. ++ * The MMU region is unlocked only at the end of the migration operation. ++ * ++ * Return: 0 on success, otherwise an error code. ++ */ ++int kbase_mmu_migrate_page(struct tagged_addr old_phys, struct tagged_addr new_phys, ++ dma_addr_t old_dma_addr, dma_addr_t new_dma_addr, int level); ++ ++/** ++ * kbase_mmu_flush_pa_range() - Flush physical address range from the GPU caches ++ * ++ * @kbdev: Instance of GPU platform device, allocated from the probe method. ++ * @kctx: Pointer to kbase context, it can be NULL if the physical address ++ * range is not associated with User created context. ++ * @phys: Starting address of the physical range to start the operation on. ++ * @size: Number of bytes to work on. ++ * @flush_op: Type of cache flush operation to perform. ++ * ++ * Issue a cache flush physical range command. This function won't perform any ++ * flush if the GPU doesn't support FLUSH_PA_RANGE command. The flush would be ++ * performed only if the context has a JASID assigned to it. ++ * This function is basically a wrapper for kbase_gpu_cache_flush_pa_range_and_busy_wait(). ++ */ ++void kbase_mmu_flush_pa_range(struct kbase_device *kbdev, struct kbase_context *kctx, ++ phys_addr_t phys, size_t size, ++ enum kbase_mmu_op_type flush_op); ++ ++/** ++ * kbase_mmu_bus_fault_interrupt - Process a bus fault interrupt. + * + * @kbdev: Pointer to the kbase device for which bus fault was reported. + * @status: Value of the GPU_FAULTSTATUS register. + * @as_nr: GPU address space for which the bus fault occurred. + * ++ * Process the bus fault interrupt that was reported for a particular GPU ++ * address space. ++ * + * Return: zero if the operation was successful, non-zero otherwise. + */ +int kbase_mmu_bus_fault_interrupt(struct kbase_device *kbdev, u32 status, @@ -245173,6 +284504,7 @@ index 000000000000..f2613e881dac + +/** + * kbase_mmu_gpu_fault_interrupt() - Report a GPU fault. ++ * + * @kbdev: Kbase device pointer + * @status: GPU fault status + * @as_nr: Faulty address space @@ -245185,21 +284517,40 @@ index 000000000000..f2613e881dac +void kbase_mmu_gpu_fault_interrupt(struct kbase_device *kbdev, u32 status, + u32 as_nr, u64 address, bool as_valid); + ++/** ++ * kbase_context_mmu_group_id_get - Decode a memory group ID from ++ * base_context_create_flags ++ * ++ * @flags: Bitmask of flags to pass to base_context_init. ++ * ++ * Memory allocated for GPU page tables will come from the returned group. ++ * ++ * Return: Physical memory group ID. Valid range is 0..(BASE_MEM_GROUP_COUNT-1). ++ */ ++static inline int ++kbase_context_mmu_group_id_get(base_context_create_flags const flags) ++{ ++ KBASE_DEBUG_ASSERT(flags == ++ (flags & BASEP_CONTEXT_CREATE_ALLOWED_FLAGS)); ++ return (int)BASE_CONTEXT_MMU_GROUP_ID_GET(flags); ++} ++ +#endif /* _KBASE_MMU_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h new file mode 100755 -index 000000000000..e6eef86d7ac0 +index 000000000..50d2ea5d0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h -@@ -0,0 +1,107 @@ +@@ -0,0 +1,214 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2015, 2018-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2015, 2018-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -245210,8 +284561,6 @@ index 000000000000..e6eef86d7ac0 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** @@ -245226,6 +284575,8 @@ index 000000000000..e6eef86d7ac0 +#ifndef _KBASE_MMU_HW_H_ +#define _KBASE_MMU_HW_H_ + ++#include "mali_kbase_mmu.h" ++ +/* Forward declarations */ +struct kbase_device; +struct kbase_as; @@ -245233,6 +284584,11 @@ index 000000000000..e6eef86d7ac0 + +/** + * enum kbase_mmu_fault_type - MMU fault type descriptor. ++ * @KBASE_MMU_FAULT_TYPE_UNKNOWN: unknown fault ++ * @KBASE_MMU_FAULT_TYPE_PAGE: page fault ++ * @KBASE_MMU_FAULT_TYPE_BUS: nus fault ++ * @KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED: page_unexpected fault ++ * @KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED: bus_unexpected fault + */ +enum kbase_mmu_fault_type { + KBASE_MMU_FAULT_TYPE_UNKNOWN = 0, @@ -245243,6 +284599,25 @@ index 000000000000..e6eef86d7ac0 +}; + +/** ++ * struct kbase_mmu_hw_op_param - parameters for kbase_mmu_hw_do_* functions ++ * @vpfn: MMU Virtual Page Frame Number to start the operation on. ++ * @nr: Number of pages to work on. ++ * @op: Operation type (written to ASn_COMMAND). ++ * @kctx_id: Kernel context ID for MMU command tracepoint. ++ * @mmu_sync_info: Indicates whether this call is synchronous wrt MMU ops. ++ * @flush_skip_levels: Page table levels to skip flushing. (Only ++ * applicable if GPU supports feature) ++ */ ++struct kbase_mmu_hw_op_param { ++ u64 vpfn; ++ u32 nr; ++ enum kbase_mmu_op_type op; ++ u32 kctx_id; ++ enum kbase_caller_mmu_sync_info mmu_sync_info; ++ u64 flush_skip_levels; ++}; ++ ++/** + * kbase_mmu_hw_configure - Configure an address space for use. + * @kbdev: kbase device to configure. + * @as: address space to configure. @@ -245254,23 +284629,105 @@ index 000000000000..e6eef86d7ac0 + struct kbase_as *as); + +/** -+ * kbase_mmu_hw_do_operation - Issue an operation to the MMU. -+ * @kbdev: kbase device to issue the MMU operation on. -+ * @as: address space to issue the MMU operation on. -+ * @vpfn: MMU Virtual Page Frame Number to start the operation on. -+ * @nr: Number of pages to work on. -+ * @type: Operation type (written to ASn_COMMAND). -+ * @handling_irq: Is this operation being called during the handling -+ * of an interrupt? ++ * kbase_mmu_hw_do_lock - Issue LOCK command to the MMU and program ++ * the LOCKADDR register. + * -+ * Issue an operation (MMU invalidate, MMU flush, etc) on the address space that -+ * is associated with the provided kbase_context over the specified range ++ * @kbdev: Kbase device to issue the MMU operation on. ++ * @as: Address space to issue the MMU operation on. ++ * @op_param: Pointer to struct containing information about the MMU ++ * operation to perform. ++ * ++ * hwaccess_lock needs to be held when calling this function. + * -+ * Return: Zero if the operation was successful, non-zero otherwise. ++ * Return: 0 if issuing the command was successful, otherwise an error code. + */ -+int kbase_mmu_hw_do_operation(struct kbase_device *kbdev, struct kbase_as *as, -+ u64 vpfn, u32 nr, u32 type, -+ unsigned int handling_irq); ++int kbase_mmu_hw_do_lock(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param); ++ ++/** ++ * kbase_mmu_hw_do_unlock_no_addr - Issue UNLOCK command to the MMU without ++ * programming the LOCKADDR register and wait ++ * for it to complete before returning. ++ * ++ * @kbdev: Kbase device to issue the MMU operation on. ++ * @as: Address space to issue the MMU operation on. ++ * @op_param: Pointer to struct containing information about the MMU ++ * operation to perform. ++ * ++ * This function should be called for GPU where GPU command is used to flush ++ * the cache(s) instead of MMU command. ++ * ++ * Return: 0 if issuing the command was successful, otherwise an error code. ++ */ ++int kbase_mmu_hw_do_unlock_no_addr(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param); ++ ++/** ++ * kbase_mmu_hw_do_unlock - Issue UNLOCK command to the MMU and wait for it ++ * to complete before returning. ++ * ++ * @kbdev: Kbase device to issue the MMU operation on. ++ * @as: Address space to issue the MMU operation on. ++ * @op_param: Pointer to struct containing information about the MMU ++ * operation to perform. ++ * ++ * Return: 0 if issuing the command was successful, otherwise an error code. ++ */ ++int kbase_mmu_hw_do_unlock(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param); ++/** ++ * kbase_mmu_hw_do_flush - Issue a flush operation to the MMU. ++ * ++ * @kbdev: Kbase device to issue the MMU operation on. ++ * @as: Address space to issue the MMU operation on. ++ * @op_param: Pointer to struct containing information about the MMU ++ * operation to perform. ++ * ++ * Issue a flush operation on the address space as per the information ++ * specified inside @op_param. This function should not be called for ++ * GPUs where MMU command to flush the cache(s) is deprecated. ++ * mmu_hw_mutex needs to be held when calling this function. ++ * ++ * Return: 0 if the operation was successful, non-zero otherwise. ++ */ ++int kbase_mmu_hw_do_flush(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param); ++ ++/** ++ * kbase_mmu_hw_do_flush_locked - Issue a flush operation to the MMU. ++ * ++ * @kbdev: Kbase device to issue the MMU operation on. ++ * @as: Address space to issue the MMU operation on. ++ * @op_param: Pointer to struct containing information about the MMU ++ * operation to perform. ++ * ++ * Issue a flush operation on the address space as per the information ++ * specified inside @op_param. This function should not be called for ++ * GPUs where MMU command to flush the cache(s) is deprecated. ++ * Both mmu_hw_mutex and hwaccess_lock need to be held when calling this ++ * function. ++ * ++ * Return: 0 if the operation was successful, non-zero otherwise. ++ */ ++int kbase_mmu_hw_do_flush_locked(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param); ++ ++/** ++ * kbase_mmu_hw_do_flush_on_gpu_ctrl - Issue a flush operation to the MMU. ++ * ++ * @kbdev: Kbase device to issue the MMU operation on. ++ * @as: Address space to issue the MMU operation on. ++ * @op_param: Pointer to struct containing information about the MMU ++ * operation to perform. ++ * ++ * Issue a flush operation on the address space as per the information ++ * specified inside @op_param. GPU command is used to flush the cache(s) ++ * instead of the MMU command. ++ * ++ * Return: 0 if the operation was successful, non-zero otherwise. ++ */ ++int kbase_mmu_hw_do_flush_on_gpu_ctrl(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param); + +/** + * kbase_mmu_hw_clear_fault - Clear a fault that has been previously reported by @@ -245301,18 +284758,19 @@ index 000000000000..e6eef86d7ac0 +#endif /* _KBASE_MMU_HW_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c new file mode 100755 -index 000000000000..a820ab24ac05 +index 000000000..3f6da35d8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c -@@ -0,0 +1,274 @@ +@@ -0,0 +1,699 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -245323,148 +284781,333 @@ index 000000000000..a820ab24ac05 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + ++#include +#include +#include ++#include +#include ++#include +#include +#include -+#include -+#include ++#include ++ ++#if MALI_USE_CSF ++/** ++ * mmu_has_flush_skip_pgd_levels() - Check if the GPU has the feature ++ * AS_LOCKADDR_FLUSH_SKIP_LEVELS ++ * ++ * @gpu_props: GPU properties for the GPU instance. ++ * ++ * This function returns whether a cache flush can apply the skip flags of ++ * AS_LOCKADDR_FLUSH_SKIP_LEVELS. ++ * ++ * Return: True if cache flush has the said feature. ++ */ ++static bool mmu_has_flush_skip_pgd_levels(struct kbase_gpu_props const *gpu_props) ++{ ++ u32 const signature = ++ gpu_props->props.raw_props.gpu_id & (GPU_ID2_ARCH_MAJOR | GPU_ID2_ARCH_REV); ++ ++ return signature >= (u32)GPU_ID2_PRODUCT_MAKE(12, 0, 4, 0); ++} ++#endif + +/** + * lock_region() - Generate lockaddr to lock memory region in MMU -+ * @pfn: Starting page frame number of the region to lock -+ * @num_pages: Number of pages to lock. It must be greater than 0. -+ * @lockaddr: Address and size of memory region to lock ++ * ++ * @gpu_props: GPU properties for finding the MMU lock region size. ++ * @lockaddr: Address and size of memory region to lock. ++ * @op_param: Pointer to a struct containing the starting page frame number of ++ * the region to lock, the number of pages to lock and page table ++ * levels to skip when flushing (if supported). + * + * The lockaddr value is a combination of the starting address and + * the size of the region that encompasses all the memory pages to lock. + * -+ * The size is expressed as a logarithm: it is represented in a way -+ * that is compatible with the HW specification and it also determines -+ * how many of the lowest bits of the address are cleared. ++ * Bits 5:0 are used to represent the size, which must be a power of 2. ++ * The smallest amount of memory to be locked corresponds to 32 kB, ++ * i.e. 8 memory pages, because a MMU cache line is made of 64 bytes ++ * and every page table entry is 8 bytes. Therefore it is not possible ++ * to lock less than 8 memory pages at a time. ++ * ++ * The size is expressed as a logarithm minus one: ++ * - A value of 14 is thus interpreted as log(32 kB) = 15, where 32 kB ++ * is the smallest possible size. ++ * - Likewise, a value of 47 is interpreted as log(256 TB) = 48, where 256 TB ++ * is the largest possible size (implementation defined value according ++ * to the HW spec). ++ * ++ * Bits 11:6 are reserved. ++ * ++ * Bits 63:12 are used to represent the base address of the region to lock. ++ * Only the upper bits of the address are used; lowest bits are cleared ++ * to avoid confusion. ++ * ++ * The address is aligned to a multiple of the region size. This has profound ++ * implications on the region size itself: often the MMU will lock a region ++ * larger than the given number of pages, because the lock region cannot start ++ * from any arbitrary address. + * + * Return: 0 if success, or an error code on failure. + */ -+static int lock_region(u64 pfn, u32 num_pages, u64 *lockaddr) ++static int lock_region(struct kbase_gpu_props const *gpu_props, u64 *lockaddr, ++ const struct kbase_mmu_hw_op_param *op_param) +{ -+ const u64 lockaddr_base = pfn << PAGE_SHIFT; -+ u64 lockaddr_size_log2, region_frame_number_start, -+ region_frame_number_end; ++ const u64 lockaddr_base = op_param->vpfn << PAGE_SHIFT; ++ const u64 lockaddr_end = ((op_param->vpfn + op_param->nr) << PAGE_SHIFT) - 1; ++ u64 lockaddr_size_log2; + -+ if (num_pages == 0) ++ if (op_param->nr == 0) + return -EINVAL; + -+ /* The size is expressed as a logarithm and should take into account -+ * the possibility that some pages might spill into the next region. ++ /* The MMU lock region is a self-aligned region whose size ++ * is a power of 2 and that contains both start and end ++ * of the address range determined by pfn and num_pages. ++ * The size of the MMU lock region can be defined as the ++ * largest divisor that yields the same result when both ++ * start and end addresses are divided by it. ++ * ++ * For instance: pfn=0x4F000 num_pages=2 describe the ++ * address range between 0x4F000 and 0x50FFF. It is only ++ * 2 memory pages. However there isn't a single lock region ++ * of 8 kB that encompasses both addresses because 0x4F000 ++ * would fall into the [0x4E000, 0x4FFFF] region while ++ * 0x50000 would fall into the [0x50000, 0x51FFF] region. ++ * The minimum lock region size that includes the entire ++ * address range is 128 kB, and the region would be ++ * [0x40000, 0x5FFFF]. ++ * ++ * The region size can be found by comparing the desired ++ * start and end addresses and finding the highest bit ++ * that differs. The smallest naturally aligned region ++ * must include this bit change, hence the desired region ++ * starts with this bit (and subsequent bits) set to 0 ++ * and ends with the bit (and subsequent bits) set to 1. ++ * ++ * In the example above: 0x4F000 ^ 0x50FFF = 0x1FFFF ++ * therefore the highest bit that differs is bit #16 ++ * and the region size (as a logarithm) is 16 + 1 = 17, i.e. 128 kB. + */ -+ lockaddr_size_log2 = fls(num_pages) + PAGE_SHIFT - 1; -+ -+ /* Round up if the number of pages is not a power of 2. */ -+ if (num_pages != ((u32)1 << (lockaddr_size_log2 - PAGE_SHIFT))) -+ lockaddr_size_log2 += 1; -+ -+ /* Round up if some memory pages spill into the next region. */ -+ region_frame_number_start = pfn >> (lockaddr_size_log2 - PAGE_SHIFT); -+ region_frame_number_end = -+ (pfn + num_pages - 1) >> (lockaddr_size_log2 - PAGE_SHIFT); -+ -+ if (region_frame_number_start < region_frame_number_end) -+ lockaddr_size_log2 += 1; -+ -+ /* Represent the size according to the HW specification. */ -+ lockaddr_size_log2 = MAX(lockaddr_size_log2, -+ KBASE_LOCK_REGION_MIN_SIZE_LOG2); ++ lockaddr_size_log2 = fls64(lockaddr_base ^ lockaddr_end); + ++ /* Cap the size against minimum and maximum values allowed. */ + if (lockaddr_size_log2 > KBASE_LOCK_REGION_MAX_SIZE_LOG2) + return -EINVAL; + -+ /* The lowest bits are cleared and then set to size - 1 to represent -+ * the size in a way that is compatible with the HW specification. ++ lockaddr_size_log2 = ++ MAX(lockaddr_size_log2, kbase_get_lock_region_min_size_log2(gpu_props)); ++ ++ /* Represent the result in a way that is compatible with HW spec. ++ * ++ * Upper bits are used for the base address, whose lower bits ++ * are cleared to avoid confusion because they are going to be ignored ++ * by the MMU anyway, since lock regions shall be aligned with ++ * a multiple of their size and cannot start from any address. ++ * ++ * Lower bits are used for the size, which is represented as ++ * logarithm minus one of the actual size. + */ + *lockaddr = lockaddr_base & ~((1ull << lockaddr_size_log2) - 1); + *lockaddr |= lockaddr_size_log2 - 1; + ++#if MALI_USE_CSF ++ if (mmu_has_flush_skip_pgd_levels(gpu_props)) ++ *lockaddr = ++ AS_LOCKADDR_FLUSH_SKIP_LEVELS_SET(*lockaddr, op_param->flush_skip_levels); ++#endif ++ + return 0; +} + -+static int wait_ready(struct kbase_device *kbdev, -+ unsigned int as_nr) ++/** ++ * wait_ready() - Wait for previously issued MMU command to complete. ++ * ++ * @kbdev: Kbase device to wait for a MMU command to complete. ++ * @as_nr: Address space to wait for a MMU command to complete. ++ * ++ * Reset GPU if the wait for previously issued command fails. ++ * ++ * Return: 0 on successful completion. negative error on failure. ++ */ ++static int wait_ready(struct kbase_device *kbdev, unsigned int as_nr) +{ -+ unsigned int max_loops = KBASE_AS_INACTIVE_MAX_LOOPS; -+ u32 val = kbase_reg_read(kbdev, MMU_AS_REG(as_nr, AS_STATUS)); ++ const ktime_t wait_loop_start = ktime_get_raw(); ++ const u32 mmu_as_inactive_wait_time_ms = kbdev->mmu_as_inactive_wait_time_ms; ++ s64 diff; + -+ /* Wait for the MMU status to indicate there is no active command, in -+ * case one is pending. Do not log remaining register accesses. -+ */ -+ while (--max_loops && (val & AS_STATUS_AS_ACTIVE)) -+ val = kbase_reg_read(kbdev, MMU_AS_REG(as_nr, AS_STATUS)); ++ if (unlikely(kbdev->as[as_nr].is_unresponsive)) ++ return -EBUSY; + -+ if (max_loops == 0) { -+ dev_err(kbdev->dev, "AS_ACTIVE bit stuck, might be caused by slow/unstable GPU clock or possible faulty FPGA connector\n"); -+ return -1; -+ } ++ do { ++ unsigned int i; + -+ /* If waiting in loop was performed, log last read value. */ -+ if (KBASE_AS_INACTIVE_MAX_LOOPS - 1 > max_loops) -+ kbase_reg_read(kbdev, MMU_AS_REG(as_nr, AS_STATUS)); ++ for (i = 0; i < 1000; i++) { ++ /* Wait for the MMU status to indicate there is no active command */ ++ if (!(kbase_reg_read(kbdev, MMU_AS_REG(as_nr, AS_STATUS)) & ++ AS_STATUS_AS_ACTIVE)) ++ return 0; ++ } + -+ return 0; ++ diff = ktime_to_ms(ktime_sub(ktime_get_raw(), wait_loop_start)); ++ } while (diff < mmu_as_inactive_wait_time_ms); ++ ++ dev_err(kbdev->dev, ++ "AS_ACTIVE bit stuck for as %u. Might be caused by unstable GPU clk/pwr or faulty system", ++ as_nr); ++ kbdev->as[as_nr].is_unresponsive = true; ++ if (kbase_prepare_to_reset_gpu_locked(kbdev, RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) ++ kbase_reset_gpu_locked(kbdev); ++ ++ return -ETIMEDOUT; +} + +static int write_cmd(struct kbase_device *kbdev, int as_nr, u32 cmd) +{ -+ int status; -+ + /* write AS_COMMAND when MMU is ready to accept another command */ -+ status = wait_ready(kbdev, as_nr); -+ if (status == 0) ++ const int status = wait_ready(kbdev, as_nr); ++ ++ if (likely(status == 0)) + kbase_reg_write(kbdev, MMU_AS_REG(as_nr, AS_COMMAND), cmd); ++ else if (status == -EBUSY) { ++ dev_dbg(kbdev->dev, ++ "Skipped the wait for AS_ACTIVE bit for as %u, before sending MMU command %u", ++ as_nr, cmd); ++ } else { ++ dev_err(kbdev->dev, ++ "Wait for AS_ACTIVE bit failed for as %u, before sending MMU command %u", ++ as_nr, cmd); ++ } + + return status; +} + ++#if MALI_USE_CSF && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++static int wait_cores_power_trans_complete(struct kbase_device *kbdev) ++{ ++#define WAIT_TIMEOUT 1000 /* 1ms timeout */ ++#define DELAY_TIME_IN_US 1 ++ const int max_iterations = WAIT_TIMEOUT; ++ int loop; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ for (loop = 0; loop < max_iterations; loop++) { ++ u32 lo = ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(SHADER_PWRTRANS_LO)); ++ u32 hi = ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(SHADER_PWRTRANS_HI)); ++ ++ if (!lo && !hi) ++ break; ++ ++ udelay(DELAY_TIME_IN_US); ++ } ++ ++ if (loop == max_iterations) { ++ dev_warn(kbdev->dev, "SHADER_PWRTRANS set for too long"); ++ return -ETIMEDOUT; ++ } ++ ++ return 0; ++} ++ ++/** ++ * apply_hw_issue_GPU2019_3901_wa - Apply WA for the HW issue GPU2019_3901 ++ * ++ * @kbdev: Kbase device to issue the MMU operation on. ++ * @mmu_cmd: Pointer to the variable contain the value of MMU command ++ * that needs to be sent to flush the L2 cache and do an ++ * implicit unlock. ++ * @as_nr: Address space number for which MMU command needs to be ++ * sent. ++ * ++ * This function ensures that the flush of LSC is not missed for the pages that ++ * were unmapped from the GPU, due to the power down transition of shader cores. ++ * ++ * Return: 0 if the WA was successfully applied, non-zero otherwise. ++ */ ++static int apply_hw_issue_GPU2019_3901_wa(struct kbase_device *kbdev, u32 *mmu_cmd, ++ unsigned int as_nr) ++{ ++ int ret = 0; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ /* Check if L2 is OFF. The cores also must be OFF if L2 is not up, so ++ * the workaround can be safely skipped. ++ */ ++ if (kbdev->pm.backend.l2_state != KBASE_L2_OFF) { ++ if (*mmu_cmd != AS_COMMAND_FLUSH_MEM) { ++ dev_warn(kbdev->dev, ++ "Unexpected mmu command received"); ++ return -EINVAL; ++ } ++ ++ /* Wait for the LOCK MMU command to complete, issued by the caller */ ++ ret = wait_ready(kbdev, as_nr); ++ if (unlikely(ret)) ++ return ret; ++ ++ ret = kbase_gpu_cache_flush_and_busy_wait(kbdev, ++ GPU_COMMAND_CACHE_CLN_INV_LSC); ++ if (unlikely(ret)) ++ return ret; ++ ++ ret = wait_cores_power_trans_complete(kbdev); ++ if (unlikely(ret)) { ++ if (kbase_prepare_to_reset_gpu_locked(kbdev, ++ RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) ++ kbase_reset_gpu_locked(kbdev); ++ return ret; ++ } ++ ++ /* As LSC is guaranteed to have been flushed we can use FLUSH_PT ++ * MMU command to only flush the L2. ++ */ ++ *mmu_cmd = AS_COMMAND_FLUSH_PT; ++ } ++ ++ return ret; ++} ++#endif ++ +void kbase_mmu_hw_configure(struct kbase_device *kbdev, struct kbase_as *as) +{ + struct kbase_mmu_setup *current_setup = &as->current_setup; + u64 transcfg = 0; + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) { -+ transcfg = current_setup->transcfg; ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ lockdep_assert_held(&kbdev->mmu_hw_mutex); + -+ /* Set flag AS_TRANSCFG_PTW_MEMATTR_WRITE_BACK -+ * Clear PTW_MEMATTR bits -+ */ -+ transcfg &= ~AS_TRANSCFG_PTW_MEMATTR_MASK; -+ /* Enable correct PTW_MEMATTR bits */ -+ transcfg |= AS_TRANSCFG_PTW_MEMATTR_WRITE_BACK; -+ /* Ensure page-tables reads use read-allocate cache-policy in -+ * the L2 -+ */ -+ transcfg |= AS_TRANSCFG_R_ALLOCATE; ++ transcfg = current_setup->transcfg; + -+ if (kbdev->system_coherency == COHERENCY_ACE) { -+ /* Set flag AS_TRANSCFG_PTW_SH_OS (outer shareable) -+ * Clear PTW_SH bits -+ */ -+ transcfg = (transcfg & ~AS_TRANSCFG_PTW_SH_MASK); -+ /* Enable correct PTW_SH bits */ -+ transcfg = (transcfg | AS_TRANSCFG_PTW_SH_OS); -+ } ++ /* Set flag AS_TRANSCFG_PTW_MEMATTR_WRITE_BACK ++ * Clear PTW_MEMATTR bits ++ */ ++ transcfg &= ~AS_TRANSCFG_PTW_MEMATTR_MASK; ++ /* Enable correct PTW_MEMATTR bits */ ++ transcfg |= AS_TRANSCFG_PTW_MEMATTR_WRITE_BACK; ++ /* Ensure page-tables reads use read-allocate cache-policy in ++ * the L2 ++ */ ++ transcfg |= AS_TRANSCFG_R_ALLOCATE; + -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSCFG_LO), -+ transcfg); -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSCFG_HI), -+ (transcfg >> 32) & 0xFFFFFFFFUL); -+ } else { -+ if (kbdev->system_coherency == COHERENCY_ACE) -+ current_setup->transtab |= AS_TRANSTAB_LPAE_SHARE_OUTER; ++ if (kbdev->system_coherency != COHERENCY_NONE) { ++ /* Set flag AS_TRANSCFG_PTW_SH_OS (outer shareable) ++ * Clear PTW_SH bits ++ */ ++ transcfg = (transcfg & ~AS_TRANSCFG_PTW_SH_MASK); ++ /* Enable correct PTW_SH bits */ ++ transcfg = (transcfg | AS_TRANSCFG_PTW_SH_OS); + } + ++ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSCFG_LO), ++ transcfg); ++ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSCFG_HI), ++ (transcfg >> 32) & 0xFFFFFFFFUL); ++ + kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSTAB_LO), + current_setup->transtab & 0xFFFFFFFFUL); + kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSTAB_HI), @@ -245481,45 +285124,284 @@ index 000000000000..a820ab24ac05 + transcfg); + + write_cmd(kbdev, as->number, AS_COMMAND_UPDATE); ++#if MALI_USE_CSF ++ /* Wait for UPDATE command to complete */ ++ wait_ready(kbdev, as->number); ++#endif +} + -+int kbase_mmu_hw_do_operation(struct kbase_device *kbdev, struct kbase_as *as, -+ u64 vpfn, u32 nr, u32 op, -+ unsigned int handling_irq) ++/** ++ * mmu_command_instr - Record an MMU command for instrumentation purposes. ++ * ++ * @kbdev: Kbase device used to issue MMU operation on. ++ * @kctx_id: Kernel context ID for MMU command tracepoint. ++ * @cmd: Command issued to the MMU. ++ * @lock_addr: Address of memory region locked for the operation. ++ * @mmu_sync_info: Indicates whether this call is synchronous wrt MMU ops. ++ */ ++static void mmu_command_instr(struct kbase_device *kbdev, u32 kctx_id, u32 cmd, u64 lock_addr, ++ enum kbase_caller_mmu_sync_info mmu_sync_info) ++{ ++ u64 lock_addr_base = AS_LOCKADDR_LOCKADDR_BASE_GET(lock_addr); ++ u32 lock_addr_size = AS_LOCKADDR_LOCKADDR_SIZE_GET(lock_addr); ++ ++ bool is_mmu_synchronous = (mmu_sync_info == CALLER_MMU_SYNC); ++ ++ KBASE_TLSTREAM_AUX_MMU_COMMAND(kbdev, kctx_id, cmd, is_mmu_synchronous, lock_addr_base, ++ lock_addr_size); ++} ++ ++/* Helper function to program the LOCKADDR register before LOCK/UNLOCK command ++ * is issued. ++ */ ++static int mmu_hw_set_lock_addr(struct kbase_device *kbdev, int as_nr, u64 *lock_addr, ++ const struct kbase_mmu_hw_op_param *op_param) +{ + int ret; + -+ lockdep_assert_held(&kbdev->mmu_hw_mutex); ++ ret = lock_region(&kbdev->gpu_props, lock_addr, op_param); + -+ if (op == AS_COMMAND_UNLOCK) { -+ /* Unlock doesn't require a lock first */ -+ ret = write_cmd(kbdev, as->number, AS_COMMAND_UNLOCK); -+ } else { -+ u64 lock_addr; ++ if (!ret) { ++ /* Set the region that needs to be updated */ ++ kbase_reg_write(kbdev, MMU_AS_REG(as_nr, AS_LOCKADDR_LO), ++ *lock_addr & 0xFFFFFFFFUL); ++ kbase_reg_write(kbdev, MMU_AS_REG(as_nr, AS_LOCKADDR_HI), ++ (*lock_addr >> 32) & 0xFFFFFFFFUL); ++ } ++ return ret; ++} ++ ++/** ++ * mmu_hw_do_lock_no_wait - Issue LOCK command to the MMU and return without ++ * waiting for it's completion. ++ * ++ * @kbdev: Kbase device to issue the MMU operation on. ++ * @as: Address space to issue the MMU operation on. ++ * @lock_addr: Address of memory region locked for this operation. ++ * @op_param: Pointer to a struct containing information about the MMU operation. ++ * ++ * Return: 0 if issuing the command was successful, otherwise an error code. ++ */ ++static int mmu_hw_do_lock_no_wait(struct kbase_device *kbdev, struct kbase_as *as, u64 *lock_addr, ++ const struct kbase_mmu_hw_op_param *op_param) ++{ ++ int ret; + -+ ret = lock_region(vpfn, nr, &lock_addr); ++ ret = mmu_hw_set_lock_addr(kbdev, as->number, lock_addr, op_param); + -+ if (!ret) { -+ /* Lock the region that needs to be updated */ -+ kbase_reg_write(kbdev, -+ MMU_AS_REG(as->number, AS_LOCKADDR_LO), -+ lock_addr & 0xFFFFFFFFUL); -+ kbase_reg_write(kbdev, -+ MMU_AS_REG(as->number, AS_LOCKADDR_HI), -+ (lock_addr >> 32) & 0xFFFFFFFFUL); -+ write_cmd(kbdev, as->number, AS_COMMAND_LOCK); ++ if (likely(!ret)) ++ ret = write_cmd(kbdev, as->number, AS_COMMAND_LOCK); ++ ++ return ret; ++} ++ ++/** ++ * mmu_hw_do_lock - Issue LOCK command to the MMU and wait for its completion. ++ * ++ * @kbdev: Kbase device to issue the MMU operation on. ++ * @as: Address space to issue the MMU operation on. ++ * @op_param: Pointer to a struct containing information about the MMU operation. ++ * ++ * Return: 0 if issuing the LOCK command was successful, otherwise an error code. ++ */ ++static int mmu_hw_do_lock(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param) ++{ ++ int ret; ++ u64 lock_addr = 0x0; ++ ++ if (WARN_ON(kbdev == NULL) || WARN_ON(as == NULL)) ++ return -EINVAL; ++ ++ ret = mmu_hw_do_lock_no_wait(kbdev, as, &lock_addr, op_param); ++ ++ if (!ret) ++ ret = wait_ready(kbdev, as->number); ++ ++ if (!ret) ++ mmu_command_instr(kbdev, op_param->kctx_id, AS_COMMAND_LOCK, lock_addr, ++ op_param->mmu_sync_info); ++ ++ return ret; ++} ++ ++int kbase_mmu_hw_do_lock(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ return mmu_hw_do_lock(kbdev, as, op_param); ++} ++ ++int kbase_mmu_hw_do_unlock_no_addr(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param) ++{ ++ int ret = 0; ++ ++ if (WARN_ON(kbdev == NULL) || WARN_ON(as == NULL)) ++ return -EINVAL; ++ ++ ret = write_cmd(kbdev, as->number, AS_COMMAND_UNLOCK); ++ ++ /* Wait for UNLOCK command to complete */ ++ if (likely(!ret)) ++ ret = wait_ready(kbdev, as->number); ++ ++ if (likely(!ret)) { ++ u64 lock_addr = 0x0; ++ /* read MMU_AS_CONTROL.LOCKADDR register */ ++ lock_addr |= (u64)kbase_reg_read(kbdev, MMU_AS_REG(as->number, AS_LOCKADDR_HI)) ++ << 32; ++ lock_addr |= (u64)kbase_reg_read(kbdev, MMU_AS_REG(as->number, AS_LOCKADDR_LO)); ++ ++ mmu_command_instr(kbdev, op_param->kctx_id, AS_COMMAND_UNLOCK, ++ lock_addr, op_param->mmu_sync_info); ++ } ++ ++ return ret; ++} ++ ++int kbase_mmu_hw_do_unlock(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param) ++{ ++ int ret = 0; ++ u64 lock_addr = 0x0; ++ ++ if (WARN_ON(kbdev == NULL) || WARN_ON(as == NULL)) ++ return -EINVAL; ++ ++ ret = mmu_hw_set_lock_addr(kbdev, as->number, &lock_addr, op_param); ++ ++ if (!ret) ++ ret = kbase_mmu_hw_do_unlock_no_addr(kbdev, as, ++ op_param); + -+ /* Run the MMU operation */ -+ write_cmd(kbdev, as->number, op); ++ return ret; ++} ++ ++/** ++ * mmu_hw_do_flush - Flush MMU and wait for its completion. ++ * ++ * @kbdev: Kbase device to issue the MMU operation on. ++ * @as: Address space to issue the MMU operation on. ++ * @op_param: Pointer to a struct containing information about the MMU operation. ++ * @hwaccess_locked: Flag to indicate if the lock has been held. ++ * ++ * Return: 0 if flushing MMU was successful, otherwise an error code. ++ */ ++static int mmu_hw_do_flush(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param, bool hwaccess_locked) ++{ ++ int ret; ++ u64 lock_addr = 0x0; ++ u32 mmu_cmd = AS_COMMAND_FLUSH_MEM; ++ ++ if (WARN_ON(kbdev == NULL) || WARN_ON(as == NULL)) ++ return -EINVAL; ++ ++ /* MMU operations can be either FLUSH_PT or FLUSH_MEM, anything else at ++ * this point would be unexpected. ++ */ ++ if (op_param->op != KBASE_MMU_OP_FLUSH_PT && ++ op_param->op != KBASE_MMU_OP_FLUSH_MEM) { ++ dev_err(kbdev->dev, "Unexpected flush operation received"); ++ return -EINVAL; ++ } ++ ++ lockdep_assert_held(&kbdev->mmu_hw_mutex); ++ ++ if (op_param->op == KBASE_MMU_OP_FLUSH_PT) ++ mmu_cmd = AS_COMMAND_FLUSH_PT; ++ ++ /* Lock the region that needs to be updated */ ++ ret = mmu_hw_do_lock_no_wait(kbdev, as, &lock_addr, op_param); ++ if (ret) ++ return ret; ++ ++#if MALI_USE_CSF && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) ++ /* WA for the BASE_HW_ISSUE_GPU2019_3901. */ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_GPU2019_3901) && ++ mmu_cmd == AS_COMMAND_FLUSH_MEM) { ++ if (!hwaccess_locked) { ++ unsigned long flags = 0; + -+ /* Wait for the flush to complete */ -+ ret = wait_ready(kbdev, as->number); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ret = apply_hw_issue_GPU2019_3901_wa(kbdev, &mmu_cmd, as->number); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } else { ++ ret = apply_hw_issue_GPU2019_3901_wa(kbdev, &mmu_cmd, as->number); + } ++ ++ if (ret) ++ return ret; + } ++#endif ++ ++ ret = write_cmd(kbdev, as->number, mmu_cmd); ++ ++ /* Wait for the command to complete */ ++ if (likely(!ret)) ++ ret = wait_ready(kbdev, as->number); ++ ++ if (likely(!ret)) ++ mmu_command_instr(kbdev, op_param->kctx_id, mmu_cmd, lock_addr, ++ op_param->mmu_sync_info); + + return ret; +} + ++int kbase_mmu_hw_do_flush_locked(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ return mmu_hw_do_flush(kbdev, as, op_param, true); ++} ++ ++int kbase_mmu_hw_do_flush(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param) ++{ ++ return mmu_hw_do_flush(kbdev, as, op_param, false); ++} ++ ++int kbase_mmu_hw_do_flush_on_gpu_ctrl(struct kbase_device *kbdev, struct kbase_as *as, ++ const struct kbase_mmu_hw_op_param *op_param) ++{ ++ int ret, ret2; ++ u32 gpu_cmd = GPU_COMMAND_CACHE_CLN_INV_L2_LSC; ++ ++ if (WARN_ON(kbdev == NULL) || WARN_ON(as == NULL)) ++ return -EINVAL; ++ ++ /* MMU operations can be either FLUSH_PT or FLUSH_MEM, anything else at ++ * this point would be unexpected. ++ */ ++ if (op_param->op != KBASE_MMU_OP_FLUSH_PT && ++ op_param->op != KBASE_MMU_OP_FLUSH_MEM) { ++ dev_err(kbdev->dev, "Unexpected flush operation received"); ++ return -EINVAL; ++ } ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ lockdep_assert_held(&kbdev->mmu_hw_mutex); ++ ++ if (op_param->op == KBASE_MMU_OP_FLUSH_PT) ++ gpu_cmd = GPU_COMMAND_CACHE_CLN_INV_L2; ++ ++ /* 1. Issue MMU_AS_CONTROL.COMMAND.LOCK operation. */ ++ ret = mmu_hw_do_lock(kbdev, as, op_param); ++ if (ret) ++ return ret; ++ ++ /* 2. Issue GPU_CONTROL.COMMAND.FLUSH_CACHES operation */ ++ ret = kbase_gpu_cache_flush_and_busy_wait(kbdev, gpu_cmd); ++ ++ /* 3. Issue MMU_AS_CONTROL.COMMAND.UNLOCK operation. */ ++ ret2 = kbase_mmu_hw_do_unlock_no_addr(kbdev, as, op_param); ++ ++ return ret ?: ret2; ++} ++ +void kbase_mmu_hw_clear_fault(struct kbase_device *kbdev, struct kbase_as *as, + enum kbase_mmu_fault_type type) +{ @@ -245581,18 +285463,19 @@ index 000000000000..a820ab24ac05 +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h new file mode 100755 -index 000000000000..8ecb14d72327 +index 000000000..9d7ce4856 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h -@@ -0,0 +1,73 @@ +@@ -0,0 +1,72 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -245603,8 +285486,6 @@ index 000000000000..8ecb14d72327 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KBASE_MMU_INTERNAL_H_ @@ -245638,7 +285519,7 @@ index 000000000000..8ecb14d72327 + * Used to switch to incremental rendering if we have nearly run out of + * virtual address space in a growable memory region. + * -+ * Return 0 if successful, otherwise a negative error code. ++ * Return: 0 if successful, otherwise a negative error code. + */ +int kbase_mmu_switch_to_ir(struct kbase_context *kctx, + struct kbase_va_region *reg); @@ -245660,18 +285541,19 @@ index 000000000000..8ecb14d72327 +#endif /* _KBASE_MMU_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c new file mode 100755 -index 000000000000..02493e9b2621 +index 000000000..f2c627482 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c -@@ -0,0 +1,200 @@ +@@ -0,0 +1,219 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2010-2014, 2016-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2014, 2016-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -245682,8 +285564,6 @@ index 000000000000..02493e9b2621 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include "mali_kbase.h" @@ -245702,37 +285582,20 @@ index 000000000000..02493e9b2621 +#define ENTRY_IS_INVAL 2ULL +#define ENTRY_IS_PTE 3ULL + -+#define ENTRY_ATTR_BITS (7ULL << 2) /* bits 4:2 */ +#define ENTRY_ACCESS_RW (1ULL << 6) /* bits 6:7 */ +#define ENTRY_ACCESS_RO (3ULL << 6) -+#define ENTRY_SHARE_BITS (3ULL << 8) /* bits 9:8 */ +#define ENTRY_ACCESS_BIT (1ULL << 10) +#define ENTRY_NX_BIT (1ULL << 54) + ++#define UNUSED_BIT_POSITION_IN_PAGE_DESCRIPTOR (55) ++#define VALID_ENTRY_MASK ((u64)0xF << UNUSED_BIT_POSITION_IN_PAGE_DESCRIPTOR) ++ +/* Helper Function to perform assignment of page table entries, to + * ensure the use of strd, which is required on LPAE systems. + */ +static inline void page_table_entry_set(u64 *pte, u64 phy) +{ -+#if KERNEL_VERSION(3, 18, 13) <= LINUX_VERSION_CODE + WRITE_ONCE(*pte, phy); -+#else -+#ifdef CONFIG_64BIT -+ barrier(); -+ *pte = phy; -+ barrier(); -+#elif defined(CONFIG_ARM) -+ barrier(); -+ asm volatile("ldrd r0, [%1]\n\t" -+ "strd r0, %0\n\t" -+ : "=m" (*pte) -+ : "r" (&phy) -+ : "r0", "r1"); -+ barrier(); -+#else -+#error "64-bit atomic write must be implemented for your architecture" -+#endif -+#endif +} + +static void mmu_update(struct kbase_device *kbdev, struct kbase_mmu_table *mmut, @@ -245770,6 +285633,7 @@ index 000000000000..02493e9b2621 + if (!(entry & 1)) + return 0; + ++ entry &= ~VALID_ENTRY_MASK; + return entry & ~0xFFF; +} + @@ -245836,268 +285700,84 @@ index 000000000000..02493e9b2621 + ENTRY_ACCESS_BIT | ENTRY_IS_ATE_L02); +} + -+static void entry_set_pte(u64 *entry, phys_addr_t phy) -+{ -+ page_table_entry_set(entry, (phy & PAGE_MASK) | -+ ENTRY_ACCESS_BIT | ENTRY_IS_PTE); -+} -+ -+static void entry_invalidate(u64 *entry) -+{ -+ page_table_entry_set(entry, ENTRY_IS_INVAL); -+} -+ -+static struct kbase_mmu_mode const aarch64_mode = { -+ .update = mmu_update, -+ .get_as_setup = kbase_mmu_get_as_setup, -+ .disable_as = mmu_disable_as, -+ .pte_to_phy_addr = pte_to_phy_addr, -+ .ate_is_valid = ate_is_valid, -+ .pte_is_valid = pte_is_valid, -+ .entry_set_ate = entry_set_ate, -+ .entry_set_pte = entry_set_pte, -+ .entry_invalidate = entry_invalidate, -+ .flags = KBASE_MMU_MODE_HAS_NON_CACHEABLE -+}; -+ -+struct kbase_mmu_mode const *kbase_mmu_mode_get_aarch64(void) -+{ -+ return &aarch64_mode; -+} -diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_lpae.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_lpae.c -new file mode 100755 -index 000000000000..91a2d7ac4dcb ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_lpae.c -@@ -0,0 +1,215 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2019 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, you can access it online at -+ * http://www.gnu.org/licenses/gpl-2.0.html. -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ * -+ */ -+ -+ -+#include "mali_kbase.h" -+#include -+#include "mali_kbase_defs.h" -+ -+#define ENTRY_TYPE_MASK 3ULL -+#define ENTRY_IS_ATE 1ULL -+#define ENTRY_IS_INVAL 2ULL -+#define ENTRY_IS_PTE 3ULL -+ -+#define ENTRY_ATTR_BITS (7ULL << 2) /* bits 4:2 */ -+#define ENTRY_RD_BIT (1ULL << 6) -+#define ENTRY_WR_BIT (1ULL << 7) -+#define ENTRY_SHARE_BITS (3ULL << 8) /* bits 9:8 */ -+#define ENTRY_ACCESS_BIT (1ULL << 10) -+#define ENTRY_NX_BIT (1ULL << 54) -+ -+#define ENTRY_FLAGS_MASK (ENTRY_ATTR_BITS | ENTRY_RD_BIT | ENTRY_WR_BIT | \ -+ ENTRY_SHARE_BITS | ENTRY_ACCESS_BIT | ENTRY_NX_BIT) -+ -+/* Helper Function to perform assignment of page table entries, to -+ * ensure the use of strd, which is required on LPAE systems. -+ */ -+static inline void page_table_entry_set(u64 *pte, u64 phy) -+{ -+#if KERNEL_VERSION(3, 18, 13) <= LINUX_VERSION_CODE -+ WRITE_ONCE(*pte, phy); -+#else -+#ifdef CONFIG_64BIT -+ barrier(); -+ *pte = phy; -+ barrier(); -+#elif defined(CONFIG_ARM) -+ barrier(); -+ asm volatile("ldrd r0, [%1]\n\t" -+ "strd r0, %0\n\t" -+ : "=m" (*pte) -+ : "r" (&phy) -+ : "r0", "r1"); -+ barrier(); -+#else -+#error "64-bit atomic write must be implemented for your architecture" -+#endif -+#endif -+} -+ -+static void mmu_get_as_setup(struct kbase_mmu_table *mmut, -+ struct kbase_mmu_setup * const setup) -+{ -+ /* Set up the required caching policies at the correct indices -+ * in the memattr register. -+ */ -+ setup->memattr = -+ (AS_MEMATTR_LPAE_IMPL_DEF_CACHE_POLICY << -+ (AS_MEMATTR_INDEX_IMPL_DEF_CACHE_POLICY * 8)) | -+ (AS_MEMATTR_LPAE_FORCE_TO_CACHE_ALL << -+ (AS_MEMATTR_INDEX_FORCE_TO_CACHE_ALL * 8)) | -+ (AS_MEMATTR_LPAE_WRITE_ALLOC << -+ (AS_MEMATTR_INDEX_WRITE_ALLOC * 8)) | -+ (AS_MEMATTR_LPAE_OUTER_IMPL_DEF << -+ (AS_MEMATTR_INDEX_OUTER_IMPL_DEF * 8)) | -+ (AS_MEMATTR_LPAE_OUTER_WA << -+ (AS_MEMATTR_INDEX_OUTER_WA * 8)) | -+ 0; /* The other indices are unused for now */ -+ -+ setup->transtab = ((u64)mmut->pgd & -+ ((0xFFFFFFFFULL << 32) | AS_TRANSTAB_LPAE_ADDR_SPACE_MASK)) | -+ AS_TRANSTAB_LPAE_ADRMODE_TABLE | -+ AS_TRANSTAB_LPAE_READ_INNER; -+ -+ setup->transcfg = 0; -+} -+ -+static void mmu_update(struct kbase_device *kbdev, -+ struct kbase_mmu_table *mmut, -+ int as_nr) -+{ -+ struct kbase_as *as; -+ struct kbase_mmu_setup *current_setup; -+ -+ if (WARN_ON(as_nr == KBASEP_AS_NR_INVALID)) -+ return; -+ -+ as = &kbdev->as[as_nr]; -+ current_setup = &as->current_setup; -+ -+ mmu_get_as_setup(mmut, current_setup); -+ -+ /* Apply the address space setting */ -+ kbase_mmu_hw_configure(kbdev, as); -+} -+ -+static void mmu_disable_as(struct kbase_device *kbdev, int as_nr) -+{ -+ struct kbase_as * const as = &kbdev->as[as_nr]; -+ struct kbase_mmu_setup * const current_setup = &as->current_setup; -+ -+ current_setup->transtab = AS_TRANSTAB_LPAE_ADRMODE_UNMAPPED; -+ -+ /* Apply the address space setting */ -+ kbase_mmu_hw_configure(kbdev, as); -+} -+ -+static phys_addr_t pte_to_phy_addr(u64 entry) ++static unsigned int get_num_valid_entries(u64 *pgd) +{ -+ if (!(entry & 1)) -+ return 0; -+ -+ return entry & ~0xFFF; -+} ++ register unsigned int num_of_valid_entries; + -+static int ate_is_valid(u64 ate, int const level) -+{ -+ return ((ate & ENTRY_TYPE_MASK) == ENTRY_IS_ATE); -+} ++ num_of_valid_entries = ++ (unsigned int)((pgd[2] & VALID_ENTRY_MASK) >> ++ (UNUSED_BIT_POSITION_IN_PAGE_DESCRIPTOR - 8)); ++ num_of_valid_entries |= ++ (unsigned int)((pgd[1] & VALID_ENTRY_MASK) >> ++ (UNUSED_BIT_POSITION_IN_PAGE_DESCRIPTOR - 4)); ++ num_of_valid_entries |= ++ (unsigned int)((pgd[0] & VALID_ENTRY_MASK) >> ++ (UNUSED_BIT_POSITION_IN_PAGE_DESCRIPTOR)); + -+static int pte_is_valid(u64 pte, int const level) -+{ -+ return ((pte & ENTRY_TYPE_MASK) == ENTRY_IS_PTE); ++ return num_of_valid_entries; +} + -+/* -+ * Map KBASE_REG flags to MMU flags -+ */ -+static u64 get_mmu_flags(unsigned long flags) ++static void set_num_valid_entries(u64 *pgd, unsigned int num_of_valid_entries) +{ -+ u64 mmu_flags; -+ unsigned long memattr_idx; ++ WARN_ON_ONCE(num_of_valid_entries > KBASE_MMU_PAGE_ENTRIES); + -+ memattr_idx = KBASE_REG_MEMATTR_VALUE(flags); -+ if (WARN(memattr_idx == AS_MEMATTR_INDEX_NON_CACHEABLE, -+ "Legacy Mode MMU cannot honor GPU non-cachable memory, will use default instead\n")) -+ memattr_idx = AS_MEMATTR_INDEX_DEFAULT; -+ /* store mem_attr index as 4:2, noting that: -+ * - macro called above ensures 3 bits already -+ * - all AS_MEMATTR_INDEX_<...> macros only use 3 bits -+ */ -+ mmu_flags = memattr_idx << 2; -+ -+ /* write perm if requested */ -+ mmu_flags |= (flags & KBASE_REG_GPU_WR) ? ENTRY_WR_BIT : 0; -+ /* read perm if requested */ -+ mmu_flags |= (flags & KBASE_REG_GPU_RD) ? ENTRY_RD_BIT : 0; -+ /* nx if requested */ -+ mmu_flags |= (flags & KBASE_REG_GPU_NX) ? ENTRY_NX_BIT : 0; -+ -+ if (flags & KBASE_REG_SHARE_BOTH) { -+ /* inner and outer shareable */ -+ mmu_flags |= SHARE_BOTH_BITS; -+ } else if (flags & KBASE_REG_SHARE_IN) { -+ /* inner shareable coherency */ -+ mmu_flags |= SHARE_INNER_BITS; -+ } ++ pgd[0] &= ~VALID_ENTRY_MASK; ++ pgd[0] |= ((u64)(num_of_valid_entries & 0xF) ++ << UNUSED_BIT_POSITION_IN_PAGE_DESCRIPTOR); + -+ return mmu_flags; -+} ++ pgd[1] &= ~VALID_ENTRY_MASK; ++ pgd[1] |= ((u64)((num_of_valid_entries >> 4) & 0xF) ++ << UNUSED_BIT_POSITION_IN_PAGE_DESCRIPTOR); + -+static void entry_set_ate(u64 *entry, -+ struct tagged_addr phy, -+ unsigned long flags, -+ int const level) -+{ -+ page_table_entry_set(entry, as_phys_addr_t(phy) | get_mmu_flags(flags) | -+ ENTRY_IS_ATE); ++ pgd[2] &= ~VALID_ENTRY_MASK; ++ pgd[2] |= ((u64)((num_of_valid_entries >> 8) & 0xF) ++ << UNUSED_BIT_POSITION_IN_PAGE_DESCRIPTOR); +} + +static void entry_set_pte(u64 *entry, phys_addr_t phy) +{ -+ page_table_entry_set(entry, (phy & ~0xFFF) | ENTRY_IS_PTE); ++ page_table_entry_set(entry, (phy & PAGE_MASK) | ENTRY_ACCESS_BIT | ENTRY_IS_PTE); +} + -+static void entry_invalidate(u64 *entry) ++static void entries_invalidate(u64 *entry, u32 count) +{ -+ page_table_entry_set(entry, ENTRY_IS_INVAL); -+} ++ u32 i; + -+static struct kbase_mmu_mode const lpae_mode = { -+ .update = mmu_update, -+ .get_as_setup = mmu_get_as_setup, -+ .disable_as = mmu_disable_as, -+ .pte_to_phy_addr = pte_to_phy_addr, -+ .ate_is_valid = ate_is_valid, -+ .pte_is_valid = pte_is_valid, -+ .entry_set_ate = entry_set_ate, -+ .entry_set_pte = entry_set_pte, -+ .entry_invalidate = entry_invalidate, -+ .flags = 0 -+}; ++ for (i = 0; i < count; i++) ++ page_table_entry_set(entry + i, ENTRY_IS_INVAL); ++} ++ ++static const struct kbase_mmu_mode aarch64_mode = { .update = mmu_update, ++ .get_as_setup = kbase_mmu_get_as_setup, ++ .disable_as = mmu_disable_as, ++ .pte_to_phy_addr = pte_to_phy_addr, ++ .ate_is_valid = ate_is_valid, ++ .pte_is_valid = pte_is_valid, ++ .entry_set_ate = entry_set_ate, ++ .entry_set_pte = entry_set_pte, ++ .entries_invalidate = entries_invalidate, ++ .get_num_valid_entries = get_num_valid_entries, ++ .set_num_valid_entries = set_num_valid_entries, ++ .flags = KBASE_MMU_MODE_HAS_NON_CACHEABLE }; + -+struct kbase_mmu_mode const *kbase_mmu_mode_get_lpae(void) ++struct kbase_mmu_mode const *kbase_mmu_mode_get_aarch64(void) +{ -+ return &lpae_mode; ++ return &aarch64_mode; +} diff --git a/drivers/gpu/arm/bifrost/platform/Kconfig b/drivers/gpu/arm/bifrost/platform/Kconfig new file mode 100755 -index 000000000000..ef9fb963ecf5 +index 000000000..3e1bd235b --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/Kconfig -@@ -0,0 +1,30 @@ +@@ -0,0 +1,26 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2012-2013, 2017 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2012-2013, 2017, 2021 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -246108,32 +285788,28 @@ index 000000000000..ef9fb963ecf5 +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+ -+ +# Add your platform specific Kconfig file here +# -+# "drivers/gpu/arm/midgard/platform/xxx/Kconfig" ++# "drivers/gpu/arm/bifrost/platform/xxx/Kconfig" +# +# Where xxx is the platform name is the name set in MALI_PLATFORM_NAME +# -+ diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild b/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild new file mode 100755 -index 000000000000..78343c0570d1 +index 000000000..60a52d80f --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild -@@ -0,0 +1,25 @@ +@@ -0,0 +1,24 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2012-2017, 2020 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2012-2017, 2020-2021 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -246144,28 +285820,27 @@ index 000000000000..78343c0570d1 +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+mali_kbase-y += \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_config_devicetree.o \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_runtime_pm.o \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_clk_rate_trace.o ++bifrost_kbase-y += \ ++ platform/$(MALI_PLATFORM_DIR)/mali_kbase_config_devicetree.o \ ++ platform/$(MALI_PLATFORM_DIR)/mali_kbase_runtime_pm.o \ ++ platform/$(MALI_PLATFORM_DIR)/mali_kbase_clk_rate_trace.o diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c new file mode 100755 -index 000000000000..11a8b77dca06 +index 000000000..4bcd5854d --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c -@@ -0,0 +1,68 @@ +@@ -0,0 +1,105 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2015, 2017-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2015, 2017-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -246176,8 +285851,6 @@ index 000000000000..11a8b77dca06 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -246185,18 +285858,45 @@ index 000000000000..11a8b77dca06 +#include +#include "mali_kbase_config_platform.h" + ++#if MALI_USE_CSF ++#include ++#endif ++ +static void *enumerate_gpu_clk(struct kbase_device *kbdev, + unsigned int index) +{ + if (index >= kbdev->nr_clocks) + return NULL; + ++#if MALI_USE_CSF ++ if (of_machine_is_compatible("arm,juno")) ++ WARN_ON(kbdev->nr_clocks != 1); ++#endif ++ + return kbdev->clocks[index]; +} + +static unsigned long get_gpu_clk_rate(struct kbase_device *kbdev, + void *gpu_clk_handle) +{ ++#if MALI_USE_CSF ++ /* On Juno fpga platforms, the GPU clock rate is reported as 600 MHZ at ++ * the boot time. Then after the first call to kbase_devfreq_target() ++ * the clock rate is reported as 450 MHZ and the frequency does not ++ * change after that. But the actual frequency at which GPU operates ++ * is always 50 MHz, which is equal to the frequency of system counter ++ * and HW counters also increment at the same rate. ++ * DVFS, which is a client of kbase_ipa_control, needs normalization of ++ * GPU_ACTIVE counter to calculate the time for which GPU has been busy. ++ * So for the correct normalization need to return the system counter ++ * frequency value. ++ * This is a reasonable workaround as the frequency value remains same ++ * throughout. It can be removed after GPUCORE-25693. ++ */ ++ if (of_machine_is_compatible("arm,juno")) ++ return arch_timer_get_cntfrq(); ++#endif ++ + return clk_get_rate((struct clk *)gpu_clk_handle); +} + @@ -246211,12 +285911,23 @@ index 000000000000..11a8b77dca06 + sizeof(((struct kbase_gpu_clk_notifier_data *)0)->gpu_clk_handle), + "mismatch in the size of clk member"); + ++#if MALI_USE_CSF ++ /* Frequency is fixed on Juno platforms */ ++ if (of_machine_is_compatible("arm,juno")) ++ return 0; ++#endif ++ + return clk_notifier_register((struct clk *)gpu_clk_handle, nb); +} + +static void gpu_clk_notifier_unregister(struct kbase_device *kbdev, + void *gpu_clk_handle, struct notifier_block *nb) +{ ++#if MALI_USE_CSF ++ if (of_machine_is_compatible("arm,juno")) ++ return; ++#endif ++ + clk_notifier_unregister((struct clk *)gpu_clk_handle, nb); +} + @@ -246228,18 +285939,19 @@ index 000000000000..11a8b77dca06 +}; diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c new file mode 100755 -index 000000000000..ccefddf882fd +index 000000000..a0b4a434e --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c -@@ -0,0 +1,41 @@ +@@ -0,0 +1,53 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2015, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2015, 2017, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -246250,11 +285962,11 @@ index 000000000000..ccefddf882fd + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + ++#include +#include ++#include + +static struct kbase_platform_config dummy_platform_config; + @@ -246273,20 +285985,32 @@ index 000000000000..ccefddf882fd +{ +} +#endif ++ ++#ifdef CONFIG_MALI_BIFROST_DVFS ++#if MALI_USE_CSF ++int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation) ++#else ++int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share, u32 util_cl_share[2]) ++#endif ++{ ++ return 1; ++} ++#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h new file mode 100755 -index 000000000000..2137b425c1ab +index 000000000..584a7217d --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h -@@ -0,0 +1,49 @@ +@@ -0,0 +1,47 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2017, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2017, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -246297,12 +286021,10 @@ index 000000000000..2137b425c1ab + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** -+ * Power management configuration ++ * POWER_MANAGEMENT_CALLBACKS - Power management configuration + * + * Attached value: pointer to @ref kbase_pm_callback_conf + * Default value: See @ref kbase_pm_callback_conf @@ -246310,7 +286032,7 @@ index 000000000000..2137b425c1ab +#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) + +/** -+ * Platform specific configuration functions ++ * PLATFORM_FUNCS - Platform specific configuration functions + * + * Attached value: pointer to @ref kbase_platform_funcs_conf + * Default value: See @ref kbase_platform_funcs_conf @@ -246321,27 +286043,27 @@ index 000000000000..2137b425c1ab + +extern struct kbase_pm_callback_conf pm_callbacks; +extern struct kbase_clk_rate_trace_op_conf clk_rate_trace_ops; -+ +/** -+ * Autosuspend delay ++ * AUTO_SUSPEND_DELAY - Autosuspend delay + * + * The delay time (in milliseconds) to be used for autosuspend + */ +#define AUTO_SUSPEND_DELAY (100) diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c new file mode 100755 -index 000000000000..8772edb56f73 +index 000000000..2687bee96 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c -@@ -0,0 +1,185 @@ +@@ -0,0 +1,298 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2015, 2017-2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2015-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -246352,16 +286074,16 @@ index 000000000000..8772edb56f73 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include +#include ++#include +#include +#include +#include +#include ++ +#include "mali_kbase_config_platform.h" + +static void enable_gpu_power_control(struct kbase_device *kbdev) @@ -246407,18 +286129,32 @@ index 000000000000..8772edb56f73 + WARN_ON(regulator_disable(kbdev->regulators[i])); + } +#endif ++ +} + +static int pm_callback_power_on(struct kbase_device *kbdev) +{ + int ret = 1; /* Assume GPU has been powered off */ + int error; ++ unsigned long flags; + -+ dev_dbg(kbdev->dev, "pm_callback_power_on %p\n", -+ (void *)kbdev->dev->pm_domain); ++ dev_dbg(kbdev->dev, "%s %pK\n", __func__, (void *)kbdev->dev->pm_domain); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ WARN_ON(kbdev->pm.backend.gpu_powered); ++#if MALI_USE_CSF ++ if (likely(kbdev->csf.firmware_inited)) { ++ WARN_ON(!kbdev->pm.active_count); ++ WARN_ON(kbdev->pm.runtime_active); ++ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + + enable_gpu_power_control(kbdev); ++ CSTD_UNUSED(error); ++#else ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + ++#ifdef KBASE_PM_RUNTIME + error = pm_runtime_get_sync(kbdev->dev); + if (error == 1) { + /* @@ -246427,30 +286163,106 @@ index 000000000000..8772edb56f73 + */ + ret = 0; + } -+ + dev_dbg(kbdev->dev, "pm_runtime_get_sync returned %d\n", error); ++#else ++ enable_gpu_power_control(kbdev); ++#endif /* KBASE_PM_RUNTIME */ ++ ++#endif /* MALI_USE_CSF */ + + return ret; +} + +static void pm_callback_power_off(struct kbase_device *kbdev) +{ -+ dev_dbg(kbdev->dev, "pm_callback_power_off\n"); ++ unsigned long flags; ++ ++ dev_dbg(kbdev->dev, "%s\n", __func__); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ WARN_ON(kbdev->pm.backend.gpu_powered); ++#if MALI_USE_CSF ++ if (likely(kbdev->csf.firmware_inited)) { ++#ifdef CONFIG_MALI_BIFROST_DEBUG ++ WARN_ON(kbase_csf_scheduler_get_nr_active_csgs(kbdev)); ++#endif ++ WARN_ON(kbdev->pm.backend.mcu_state != KBASE_MCU_OFF); ++ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + ++ /* Power down the GPU immediately */ ++ disable_gpu_power_control(kbdev); ++#else /* MALI_USE_CSF */ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++#ifdef KBASE_PM_RUNTIME + pm_runtime_mark_last_busy(kbdev->dev); + pm_runtime_put_autosuspend(kbdev->dev); -+ -+#ifndef KBASE_PM_RUNTIME ++#else ++ /* Power down the GPU immediately as runtime PM is disabled */ + disable_gpu_power_control(kbdev); +#endif ++#endif /* MALI_USE_CSF */ ++} ++ ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++static void pm_callback_runtime_gpu_active(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ int error; ++ ++ lockdep_assert_held(&kbdev->pm.lock); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ WARN_ON(!kbdev->pm.backend.gpu_powered); ++ WARN_ON(!kbdev->pm.active_count); ++ WARN_ON(kbdev->pm.runtime_active); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ if (pm_runtime_status_suspended(kbdev->dev)) { ++ error = pm_runtime_get_sync(kbdev->dev); ++ dev_dbg(kbdev->dev, "pm_runtime_get_sync returned %d", error); ++ } else { ++ /* Call the async version here, otherwise there could be ++ * a deadlock if the runtime suspend operation is ongoing. ++ * Caller would have taken the kbdev->pm.lock and/or the ++ * scheduler lock, and the runtime suspend callback function ++ * will also try to acquire the same lock(s). ++ */ ++ error = pm_runtime_get(kbdev->dev); ++ dev_dbg(kbdev->dev, "pm_runtime_get returned %d", error); ++ } ++ ++ kbdev->pm.runtime_active = true; ++} ++ ++static void pm_callback_runtime_gpu_idle(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ ++ lockdep_assert_held(&kbdev->pm.lock); ++ ++ dev_dbg(kbdev->dev, "%s", __func__); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ WARN_ON(!kbdev->pm.backend.gpu_powered); ++ WARN_ON(kbdev->pm.backend.l2_state != KBASE_L2_OFF); ++ WARN_ON(kbdev->pm.active_count); ++ WARN_ON(!kbdev->pm.runtime_active); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ pm_runtime_mark_last_busy(kbdev->dev); ++ pm_runtime_put_autosuspend(kbdev->dev); ++ kbdev->pm.runtime_active = false; +} ++#endif + +#ifdef KBASE_PM_RUNTIME +static int kbase_device_runtime_init(struct kbase_device *kbdev) +{ + int ret = 0; + -+ dev_dbg(kbdev->dev, "kbase_device_runtime_init\n"); ++ dev_dbg(kbdev->dev, "%s\n", __func__); + + pm_runtime_set_autosuspend_delay(kbdev->dev, AUTO_SUSPEND_DELAY); + pm_runtime_use_autosuspend(kbdev->dev); @@ -246460,7 +286272,12 @@ index 000000000000..8772edb56f73 + + if (!pm_runtime_enabled(kbdev->dev)) { + dev_warn(kbdev->dev, "pm_runtime not enabled"); -+ ret = -ENOSYS; ++ ret = -EINVAL; ++ } else if (atomic_read(&kbdev->dev->power.usage_count)) { ++ dev_warn(kbdev->dev, ++ "%s: Device runtime usage count unexpectedly non zero %d", ++ __func__, atomic_read(&kbdev->dev->power.usage_count)); ++ ret = -EINVAL; + } + + return ret; @@ -246468,24 +286285,34 @@ index 000000000000..8772edb56f73 + +static void kbase_device_runtime_disable(struct kbase_device *kbdev) +{ -+ dev_dbg(kbdev->dev, "kbase_device_runtime_disable\n"); ++ dev_dbg(kbdev->dev, "%s\n", __func__); ++ ++ if (atomic_read(&kbdev->dev->power.usage_count)) ++ dev_warn(kbdev->dev, ++ "%s: Device runtime usage count unexpectedly non zero %d", ++ __func__, atomic_read(&kbdev->dev->power.usage_count)); ++ + pm_runtime_disable(kbdev->dev); +} -+#endif ++#endif /* KBASE_PM_RUNTIME */ + +static int pm_callback_runtime_on(struct kbase_device *kbdev) +{ -+ dev_dbg(kbdev->dev, "pm_callback_runtime_on\n"); ++ dev_dbg(kbdev->dev, "%s\n", __func__); + ++#if !MALI_USE_CSF + enable_gpu_power_control(kbdev); ++#endif + return 0; +} + +static void pm_callback_runtime_off(struct kbase_device *kbdev) +{ -+ dev_dbg(kbdev->dev, "pm_callback_runtime_off\n"); ++ dev_dbg(kbdev->dev, "%s\n", __func__); + ++#if !MALI_USE_CSF + disable_gpu_power_control(kbdev); ++#endif +} + +static void pm_callback_resume(struct kbase_device *kbdev) @@ -246500,6 +286327,7 @@ index 000000000000..8772edb56f73 + pm_callback_runtime_off(kbdev); +} + ++ +struct kbase_pm_callback_conf pm_callbacks = { + .power_on_callback = pm_callback_power_on, + .power_off_callback = pm_callback_power_off, @@ -246516,142 +286344,557 @@ index 000000000000..8772edb56f73 + .power_runtime_on_callback = NULL, + .power_runtime_off_callback = NULL, +#endif /* KBASE_PM_RUNTIME */ -+}; + -+ -diff --git a/drivers/gpu/arm/bifrost/platform/rk/Kbuild b/drivers/gpu/arm/bifrost/platform/rk/Kbuild -new file mode 100755 -index 000000000000..7cc6c59d969f ++#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) ++ .power_runtime_gpu_idle_callback = pm_callback_runtime_gpu_idle, ++ .power_runtime_gpu_active_callback = pm_callback_runtime_gpu_active, ++#else ++ .power_runtime_gpu_idle_callback = NULL, ++ .power_runtime_gpu_active_callback = NULL, ++#endif ++}; +diff --git a/drivers/gpu/arm/bifrost/platform/meson/Kbuild b/drivers/gpu/arm/bifrost/platform/meson/Kbuild +new file mode 100644 +index 000000000..9b3de96ba --- /dev/null -+++ b/drivers/gpu/arm/bifrost/platform/rk/Kbuild -@@ -0,0 +1,17 @@ ++++ b/drivers/gpu/arm/bifrost/platform/meson/Kbuild +@@ -0,0 +1,23 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2012-2013 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2012-2017, 2019-2021 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, you can access it online at ++# http://www.gnu.org/licenses/gpl-2.0.html. +# +# + +bifrost_kbase-y += \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_config_rk.o \ -+ -diff --git a/drivers/gpu/arm/bifrost/platform/rk/custom_log.h b/drivers/gpu/arm/bifrost/platform/rk/custom_log.h -new file mode 100755 -index 000000000000..5de70ee13d25 ++ platform/$(MALI_PLATFORM_DIR)/mali_kbase_config_meson.o \ ++ platform/$(MALI_PLATFORM_DIR)/mali_kbase_runtime_pm.o +diff --git a/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_meson.c b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_meson.c +new file mode 100644 +index 000000000..7b896b602 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/platform/rk/custom_log.h -@@ -0,0 +1,192 @@ ++++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_meson.c +@@ -0,0 +1,53 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* -+ * (C) COPYRIGHT RockChip Limited. All rights reserved. ++ * ++ * (C) COPYRIGHT 2015, 2017, 2019, 2021, 2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * + */ + -+#ifndef __CUSTOM_LOG_H__ -+#define __CUSTOM_LOG_H__ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* ----------------------------------------------------------------------------- -+ * Include Files -+ * ----------------------------------------------------------------------------- -+ */ -+#include -+#include ++#include ++#include ++#include + -+/* ----------------------------------------------------------------------------- -+ * Macros Definition -+ * ----------------------------------------------------------------------------- -+ */ ++static struct kbase_platform_config dummy_platform_config; + -+/** 若下列 macro 有被定义, æ‰ ä½¿èƒ½ log 输出. */ -+/* #define ENABLE_DEBUG_LOG */ ++struct kbase_platform_config *kbase_get_platform_config(void) ++{ ++ return &dummy_platform_config; ++} + -+/*----------------------------------------------------------------------------*/ ++#ifndef CONFIG_OF ++int kbase_platform_register(void) ++{ ++ return 0; ++} + -+#ifdef ENABLE_VERBOSE_LOG -+/** Verbose log. */ -+#define V(fmt, args...) \ -+ pr_debug("V : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ -+ "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) -+#else -+#define V(...) ((void)0) ++void kbase_platform_unregister(void) ++{ ++} +#endif + -+#ifdef ENABLE_DEBUG_LOG -+/** Debug log. */ -+#define D(fmt, args...) \ -+ pr_info("D : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ -+ "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) ++#ifdef CONFIG_MALI_BIFROST_DVFS ++#if MALI_USE_CSF ++int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation) +#else -+#define D(...) ((void)0) ++int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share, u32 util_cl_share[2]) +#endif ++{ ++ return 1; ++} ++#endif /* CONFIG_MALI_BIFROST_DVFS */ +diff --git a/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_platform.h +new file mode 100644 +index 000000000..06279e2f6 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_platform.h +@@ -0,0 +1,45 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2014-2017, 2019-2021 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+#define I(fmt, args...) \ -+ pr_info("I : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ -+ "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) -+ -+#define W(fmt, args...) \ -+ pr_warn("W : [File] : %s; [Line] : %d; [Func] : %s(); " \ -+ fmt "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) ++/** ++ * Power management configuration ++ * ++ * Attached value: pointer to @ref kbase_pm_callback_conf ++ * Default value: See @ref kbase_pm_callback_conf ++ */ ++#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) + -+#define E(fmt, args...) \ -+ pr_err("E : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ -+ "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) ++/** ++ * Platform specific configuration functions ++ * ++ * Attached value: pointer to @ref kbase_platform_funcs_conf ++ * Default value: See @ref kbase_platform_funcs_conf ++ */ ++#define PLATFORM_FUNCS (NULL) + -+/*-------------------------------------------------------*/ ++extern struct kbase_pm_callback_conf pm_callbacks; + -+/** 使用 D(), 以å进制的形å¼æ‰“å°å˜é‡ 'var' çš„ value. */ -+#define D_DEC(var) D(#var " = %d.", var) ++/** ++ * Autosuspend delay ++ * ++ * The delay time (in milliseconds) to be used for autosuspend ++ */ ++#define AUTO_SUSPEND_DELAY (100) +diff --git a/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_runtime_pm.c b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_runtime_pm.c +new file mode 100644 +index 000000000..910d4b4fd +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_runtime_pm.c +@@ -0,0 +1,265 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2015, 2017-2022 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ + -+#define E_DEC(var) E(#var " = %d.", var) ++#include ++#include ++#include + -+/** 使用 D(), 以å六进制的形å¼æ‰“å°å˜é‡ 'var' çš„ value. */ -+#define D_HEX(var) D(#var " = 0x%x.", var) ++#include ++#include ++#include ++#include ++#include ++#include + -+#define E_HEX(var) E(#var " = 0x%x.", var) ++#include "mali_kbase_config_platform.h" + -+/** -+ * 使用 D(), 以å六进制的形å¼, -+ * 打å°æŒ‡é’ˆç±»åž‹å˜é‡ 'ptr' çš„ value. -+ */ -+#define D_PTR(ptr) D(#ptr " = %p.", ptr) + -+#define E_PTR(ptr) E(#ptr " = %p.", ptr) ++static struct reset_control **resets; ++static int nr_resets; + -+/** 使用 D(), æ‰“å° char 字串. */ ++static int resets_init(struct kbase_device *kbdev) ++{ ++ struct device_node *np; ++ int i; ++ int err = 0; ++ ++ np = kbdev->dev->of_node; ++ ++ nr_resets = of_count_phandle_with_args(np, "resets", "#reset-cells"); ++ if (nr_resets <= 0) { ++ dev_err(kbdev->dev, "Failed to get GPU resets from dtb\n"); ++ return nr_resets; ++ } ++ ++ resets = devm_kcalloc(kbdev->dev, nr_resets, sizeof(*resets), ++ GFP_KERNEL); ++ if (!resets) ++ return -ENOMEM; ++ ++ for (i = 0; i < nr_resets; ++i) { ++ resets[i] = devm_reset_control_get_exclusive_by_index( ++ kbdev->dev, i); ++ if (IS_ERR(resets[i])) { ++ err = PTR_ERR(resets[i]); ++ nr_resets = i; ++ break; ++ } ++ } ++ ++ return err; ++} ++ ++static int pm_callback_soft_reset(struct kbase_device *kbdev) ++{ ++ int ret, i; ++ ++ if (!resets) { ++ ret = resets_init(kbdev); ++ if (ret) ++ return ret; ++ } ++ ++ for (i = 0; i < nr_resets; ++i) ++ reset_control_assert(resets[i]); ++ ++ udelay(10); ++ ++ for (i = 0; i < nr_resets; ++i) ++ reset_control_deassert(resets[i]); ++ ++ udelay(10); ++ ++ /* Override Power Management Settings, values from manufacturer's defaults */ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PWR_KEY), 0x2968A819); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PWR_OVERRIDE1), ++ 0xfff | (0x20 << 16)); ++ ++ /* ++ * RESET_COMPLETED interrupt will be raised, so continue with ++ * the normal soft reset procedure ++ */ ++ return 0; ++} ++ ++static void enable_gpu_power_control(struct kbase_device *kbdev) ++{ ++ unsigned int i; ++ ++#if defined(CONFIG_REGULATOR) ++ for (i = 0; i < kbdev->nr_regulators; i++) { ++ if (WARN_ON(kbdev->regulators[i] == NULL)) ++ ; ++ else if (!regulator_is_enabled(kbdev->regulators[i])) ++ WARN_ON(regulator_enable(kbdev->regulators[i])); ++ } ++#endif ++ ++ for (i = 0; i < kbdev->nr_clocks; i++) { ++ if (WARN_ON(kbdev->clocks[i] == NULL)) ++ ; ++ else if (!__clk_is_enabled(kbdev->clocks[i])) ++ WARN_ON(clk_prepare_enable(kbdev->clocks[i])); ++ } ++} ++ ++static void disable_gpu_power_control(struct kbase_device *kbdev) ++{ ++ unsigned int i; ++ ++ for (i = 0; i < kbdev->nr_clocks; i++) { ++ if (WARN_ON(kbdev->clocks[i] == NULL)) ++ ; ++ else if (__clk_is_enabled(kbdev->clocks[i])) { ++ clk_disable_unprepare(kbdev->clocks[i]); ++ WARN_ON(__clk_is_enabled(kbdev->clocks[i])); ++ } ++ } ++ ++#if defined(CONFIG_REGULATOR) ++ for (i = 0; i < kbdev->nr_regulators; i++) { ++ if (WARN_ON(kbdev->regulators[i] == NULL)) ++ ; ++ else if (regulator_is_enabled(kbdev->regulators[i])) ++ WARN_ON(regulator_disable(kbdev->regulators[i])); ++ } ++#endif ++} ++ ++static int pm_callback_power_on(struct kbase_device *kbdev) ++{ ++ int ret = 1; /* Assume GPU has been powered off */ ++ int error; ++ ++ dev_dbg(kbdev->dev, "%s %pK\n", __func__, (void *)kbdev->dev->pm_domain); ++ ++#ifdef KBASE_PM_RUNTIME ++ error = pm_runtime_get_sync(kbdev->dev); ++ if (error == 1) { ++ /* ++ * Let core know that the chip has not been ++ * powered off, so we can save on re-initialization. ++ */ ++ ret = 0; ++ } ++ dev_dbg(kbdev->dev, "pm_runtime_get_sync returned %d\n", error); ++#else ++ enable_gpu_power_control(kbdev); ++#endif ++ ++ return ret; ++} ++ ++static void pm_callback_power_off(struct kbase_device *kbdev) ++{ ++ dev_dbg(kbdev->dev, "%s\n", __func__); ++ ++#ifdef KBASE_PM_RUNTIME ++ pm_runtime_mark_last_busy(kbdev->dev); ++ pm_runtime_put_autosuspend(kbdev->dev); ++#else ++ /* Power down the GPU immediately as runtime PM is disabled */ ++ disable_gpu_power_control(kbdev); ++#endif ++} ++ ++#ifdef KBASE_PM_RUNTIME ++static int kbase_device_runtime_init(struct kbase_device *kbdev) ++{ ++ int ret = 0; ++ ++ dev_dbg(kbdev->dev, "%s\n", __func__); ++ ++ pm_runtime_set_autosuspend_delay(kbdev->dev, AUTO_SUSPEND_DELAY); ++ pm_runtime_use_autosuspend(kbdev->dev); ++ ++ pm_runtime_set_active(kbdev->dev); ++ pm_runtime_enable(kbdev->dev); ++ ++ if (!pm_runtime_enabled(kbdev->dev)) { ++ dev_warn(kbdev->dev, "pm_runtime not enabled"); ++ ret = -EINVAL; ++ } else if (atomic_read(&kbdev->dev->power.usage_count)) { ++ dev_warn(kbdev->dev, "%s: Device runtime usage count unexpectedly non zero %d", ++ __func__, atomic_read(&kbdev->dev->power.usage_count)); ++ ret = -EINVAL; ++ } ++ ++ return ret; ++} ++ ++static void kbase_device_runtime_disable(struct kbase_device *kbdev) ++{ ++ dev_dbg(kbdev->dev, "%s\n", __func__); ++ ++ if (atomic_read(&kbdev->dev->power.usage_count)) ++ dev_warn(kbdev->dev, "%s: Device runtime usage count unexpectedly non zero %d", ++ __func__, atomic_read(&kbdev->dev->power.usage_count)); ++ ++ pm_runtime_disable(kbdev->dev); ++} ++#endif /* KBASE_PM_RUNTIME */ ++ ++static int pm_callback_runtime_on(struct kbase_device *kbdev) ++{ ++ dev_dbg(kbdev->dev, "%s\n", __func__); ++ ++ enable_gpu_power_control(kbdev); ++ return 0; ++} ++ ++static void pm_callback_runtime_off(struct kbase_device *kbdev) ++{ ++ dev_dbg(kbdev->dev, "%s\n", __func__); ++ ++ disable_gpu_power_control(kbdev); ++} ++ ++static void pm_callback_resume(struct kbase_device *kbdev) ++{ ++ int ret = pm_callback_runtime_on(kbdev); ++ ++ WARN_ON(ret); ++} ++ ++static void pm_callback_suspend(struct kbase_device *kbdev) ++{ ++ pm_callback_runtime_off(kbdev); ++} ++ ++struct kbase_pm_callback_conf pm_callbacks = { ++ .power_on_callback = pm_callback_power_on, ++ .power_off_callback = pm_callback_power_off, ++ .power_suspend_callback = pm_callback_suspend, ++ .power_resume_callback = pm_callback_resume, ++ .soft_reset_callback = pm_callback_soft_reset, ++#ifdef KBASE_PM_RUNTIME ++ .power_runtime_init_callback = kbase_device_runtime_init, ++ .power_runtime_term_callback = kbase_device_runtime_disable, ++ .power_runtime_on_callback = pm_callback_runtime_on, ++ .power_runtime_off_callback = pm_callback_runtime_off, ++#else /* KBASE_PM_RUNTIME */ ++ .power_runtime_init_callback = NULL, ++ .power_runtime_term_callback = NULL, ++ .power_runtime_on_callback = NULL, ++ .power_runtime_off_callback = NULL, ++#endif /* KBASE_PM_RUNTIME */ ++}; +diff --git a/drivers/gpu/arm/bifrost/platform/rk/Kbuild b/drivers/gpu/arm/bifrost/platform/rk/Kbuild +new file mode 100755 +index 000000000..a1e78cfc4 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/platform/rk/Kbuild +@@ -0,0 +1,16 @@ ++# ++# (C) COPYRIGHT 2012-2013 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# ++ ++bifrost_kbase-y += \ ++ platform/$(MALI_PLATFORM_DIR)/mali_kbase_config_rk.o +diff --git a/drivers/gpu/arm/bifrost/platform/rk/custom_log.h b/drivers/gpu/arm/bifrost/platform/rk/custom_log.h +new file mode 100755 +index 000000000..5de70ee13 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/platform/rk/custom_log.h +@@ -0,0 +1,192 @@ ++/* ++ * (C) COPYRIGHT RockChip Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ */ ++ ++#ifndef __CUSTOM_LOG_H__ ++#define __CUSTOM_LOG_H__ ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* ----------------------------------------------------------------------------- ++ * Include Files ++ * ----------------------------------------------------------------------------- ++ */ ++#include ++#include ++ ++/* ----------------------------------------------------------------------------- ++ * Macros Definition ++ * ----------------------------------------------------------------------------- ++ */ ++ ++/** 若下列 macro 有被定义, æ‰ ä½¿èƒ½ log 输出. */ ++/* #define ENABLE_DEBUG_LOG */ ++ ++/*----------------------------------------------------------------------------*/ ++ ++#ifdef ENABLE_VERBOSE_LOG ++/** Verbose log. */ ++#define V(fmt, args...) \ ++ pr_debug("V : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ ++ "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) ++#else ++#define V(...) ((void)0) ++#endif ++ ++#ifdef ENABLE_DEBUG_LOG ++/** Debug log. */ ++#define D(fmt, args...) \ ++ pr_info("D : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ ++ "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) ++#else ++#define D(...) ((void)0) ++#endif ++ ++#define I(fmt, args...) \ ++ pr_info("I : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ ++ "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) ++ ++#define W(fmt, args...) \ ++ pr_warn("W : [File] : %s; [Line] : %d; [Func] : %s(); " \ ++ fmt "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) ++ ++#define E(fmt, args...) \ ++ pr_err("E : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ ++ "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) ++ ++/*-------------------------------------------------------*/ ++ ++/** 使用 D(), 以å进制的形å¼æ‰“å°å˜é‡ 'var' çš„ value. */ ++#define D_DEC(var) D(#var " = %d.", var) ++ ++#define E_DEC(var) E(#var " = %d.", var) ++ ++/** 使用 D(), 以å六进制的形å¼æ‰“å°å˜é‡ 'var' çš„ value. */ ++#define D_HEX(var) D(#var " = 0x%x.", var) ++ ++#define E_HEX(var) E(#var " = 0x%x.", var) ++ ++/** ++ * 使用 D(), 以å六进制的形å¼, ++ * 打å°æŒ‡é’ˆç±»åž‹å˜é‡ 'ptr' çš„ value. ++ */ ++#define D_PTR(ptr) D(#ptr " = %p.", ptr) ++ ++#define E_PTR(ptr) E(#ptr " = %p.", ptr) ++ ++/** 使用 D(), æ‰“å° char 字串. */ +#define D_STR(p_str) \ +do { \ + if (!p_str) { \ @@ -246742,10 +286985,10 @@ index 000000000000..5de70ee13d25 +#endif /* __CUSTOM_LOG_H__ */ diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h new file mode 100755 -index 000000000000..07c5b6f8a760 +index 000000000..a2c93fa69 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h -@@ -0,0 +1,88 @@ +@@ -0,0 +1,93 @@ +/* + * + * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. @@ -246834,12 +287077,17 @@ index 000000000000..07c5b6f8a760 + */ +#define SECURE_CALLBACKS (NULL) + ++#define CLK_RATE_TRACE_OPS (&clk_rate_trace_ops) ++extern struct kbase_clk_rate_trace_op_conf clk_rate_trace_ops; ++ ++int kbase_platform_rk_init_opp_table(struct kbase_device *kbdev); ++int kbase_platform_rk_enable_regulator(struct kbase_device *kbdev); diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c new file mode 100755 -index 000000000000..e73ef450d135 +index 000000000..c32526a86 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c -@@ -0,0 +1,459 @@ +@@ -0,0 +1,692 @@ +/* + * (C) COPYRIGHT RockChip Limited. All rights reserved. + * @@ -246855,20 +287103,32 @@ index 000000000000..e73ef450d135 +#include +#include +#include ++#include +#include +#include + ++#if MALI_USE_CSF ++#include ++#endif ++ ++#include +#include +#include +#include +#include ++#include +#include ++#include +#include +#include +#include ++#include + ++#include "mali_kbase_config_platform.h" +#include "mali_kbase_rk.h" + ++#define POWER_DOWN_FREQ 200000000 ++ +/** + * @file mali_kbase_config_rk.c + * 对 platform_config_of_rk 的具体实现. @@ -246887,6 +287147,13 @@ index 000000000000..e73ef450d135 + */ + +/*---------------------------------------------------------------------------*/ ++#ifndef CONFIG_MALI_BIFROST_DEVFREQ ++static inline void kbase_pm_get_dvfs_metrics(struct kbase_device *kbdev, ++ struct kbasep_pm_metrics *last, ++ struct kbasep_pm_metrics *diff) ++{ ++} ++#endif + +#ifdef CONFIG_REGULATOR +static int rk_pm_enable_regulator(struct kbase_device *kbdev); @@ -246918,20 +287185,32 @@ index 000000000000..e73ef450d135 + container_of(to_delayed_work(work), struct rk_context, work); + struct kbase_device *kbdev = platform->kbdev; + ++ mutex_lock(&platform->lock); ++ + if (!platform->is_powered) { + D("mali_dev is already powered off."); ++ mutex_unlock(&platform->lock); + return; + } + ++ rockchip_monitor_volt_adjust_lock(kbdev->mdev_info); + if (pm_runtime_enabled(kbdev->dev)) { + D("to put_sync_suspend mali_dev."); + pm_runtime_put_sync_suspend(kbdev->dev); + } ++ rockchip_monitor_volt_adjust_unlock(kbdev->mdev_info); + -+ rk_pm_disable_regulator(kbdev); ++ rk_pm_disable_clk(kbdev); ++ ++ if (pm_runtime_suspended(kbdev->dev)) { ++ rk_pm_disable_regulator(kbdev); ++ platform->is_regulator_on = false; ++ } + + platform->is_powered = false; + wake_unlock(&platform->wake_lock); ++ ++ mutex_unlock(&platform->lock); +} + +static int kbase_platform_rk_init(struct kbase_device *kbdev) @@ -246974,6 +287253,8 @@ index 000000000000..e73ef450d135 + kbdev->platform_context = (void *)platform; + pm_runtime_enable(kbdev->dev); + ++ mutex_init(&platform->lock); ++ + return 0; + +err_sysfs_files: @@ -247011,11 +287292,39 @@ index 000000000000..e73ef450d135 + +static int rk_pm_callback_runtime_on(struct kbase_device *kbdev) +{ ++ struct rockchip_opp_info *opp_info = &kbdev->opp_info; ++ int ret = 0; ++ ++ if (!kbdev->current_nominal_freq) ++ return 0; ++ ++ ret = clk_bulk_prepare_enable(opp_info->num_clks, opp_info->clks); ++ if (ret) { ++ dev_err(kbdev->dev, "failed to enable opp clks\n"); ++ return ret; ++ } ++ if (opp_info->data && opp_info->data->set_read_margin) ++ opp_info->data->set_read_margin(kbdev->dev, opp_info, ++ opp_info->target_rm); ++ if (opp_info->scmi_clk) { ++ if (clk_set_rate(opp_info->scmi_clk, ++ kbdev->current_nominal_freq)) ++ dev_err(kbdev->dev, "failed to restore clk rate\n"); ++ } ++ clk_bulk_disable_unprepare(opp_info->num_clks, opp_info->clks); ++ + return 0; +} + +static void rk_pm_callback_runtime_off(struct kbase_device *kbdev) +{ ++ struct rockchip_opp_info *opp_info = &kbdev->opp_info; ++ ++ if (opp_info->scmi_clk) { ++ if (clk_set_rate(opp_info->scmi_clk, POWER_DOWN_FREQ)) ++ dev_err(kbdev->dev, "failed to set power down rate\n"); ++ } ++ opp_info->current_rm = UINT_MAX; +} + +static int rk_pm_callback_power_on(struct kbase_device *kbdev) @@ -247026,24 +287335,33 @@ index 000000000000..e73ef450d135 + + cancel_delayed_work_sync(&platform->work); + -+ err = rk_pm_enable_clk(kbdev); -+ if (err) { -+ E("failed to enable clk: %d", err); -+ return err; -+ } ++ mutex_lock(&platform->lock); + + if (platform->is_powered) { + D("mali_device is already powered."); -+ return 0; ++ ret = 0; ++ goto out; + } + + /* we must enable vdd_gpu before pd_gpu_in_chip. */ -+ err = rk_pm_enable_regulator(kbdev); ++ if (!platform->is_regulator_on) { ++ err = rk_pm_enable_regulator(kbdev); ++ if (err) { ++ E("fail to enable regulator, err : %d.", err); ++ ret = err; ++ goto out; ++ } ++ platform->is_regulator_on = true; ++ } ++ ++ err = rk_pm_enable_clk(kbdev); + if (err) { -+ E("fail to enable regulator, err : %d.", err); -+ return err; ++ E("failed to enable clk: %d", err); ++ ret = err; ++ goto out; + } + ++ rockchip_monitor_volt_adjust_lock(kbdev->mdev_info); + /* è‹¥ mali_dev çš„ runtime_pm 是 enabled çš„, 则... */ + if (pm_runtime_enabled(kbdev->dev)) { + D("to resume mali_dev syncly."); @@ -247053,16 +287371,20 @@ index 000000000000..e73ef450d135 + err = pm_runtime_get_sync(kbdev->dev); + if (err < 0) { + E("failed to runtime resume device: %d.", err); -+ return err; ++ ret = err; ++ goto out; + } else if (err == 1) { /* runtime_pm_status is still active */ + D("chip has NOT been powered off, no need to re-init."); + ret = 0; + } + } ++ rockchip_monitor_volt_adjust_unlock(kbdev->mdev_info); + + platform->is_powered = true; + wake_lock(&platform->wake_lock); + ++out: ++ mutex_unlock(&platform->lock); + return ret; +} + @@ -247070,17 +287392,18 @@ index 000000000000..e73ef450d135 +{ + struct rk_context *platform = get_rk_context(kbdev); + -+ rk_pm_disable_clk(kbdev); ++ D("enter"); ++ + queue_delayed_work(platform->power_off_wq, &platform->work, + msecs_to_jiffies(platform->delay_ms)); +} + -+int rk_kbase_device_runtime_init(struct kbase_device *kbdev) ++static int rk_kbase_device_runtime_init(struct kbase_device *kbdev) +{ + return 0; +} + -+void rk_kbase_device_runtime_disable(struct kbase_device *kbdev) ++static void rk_kbase_device_runtime_disable(struct kbase_device *kbdev) +{ +} + @@ -247100,20 +287423,6 @@ index 000000000000..e73ef450d135 +#endif /* CONFIG_PM */ +}; + -+int kbase_platform_early_init(void) -+{ -+ /* Nothing needed at this stage */ -+ return 0; -+} -+ -+/*---------------------------------------------------------------------------*/ -+ -+void kbase_platform_rk_shutdown(struct kbase_device *kbdev) -+{ -+ I("to make vdd_gpu enabled for turning off pd_gpu in pm_framework."); -+ rk_pm_enable_regulator(kbdev); -+} -+ +/*---------------------------------------------------------------------------*/ + +#ifdef CONFIG_REGULATOR @@ -247240,7 +287549,7 @@ index 000000000000..e73ef450d135 + unsigned long period_in_us = platform->utilisation_period * 1000; + u32 utilisation; + struct kbasep_pm_metrics metrics_when_start; -+ struct kbasep_pm_metrics metrics_diff; /* between start and end. */ ++ struct kbasep_pm_metrics metrics_diff = {}; /* between start and end. */ + u32 total_time = 0; + u32 busy_time = 0; + @@ -247294,17 +287603,189 @@ index 000000000000..e73ef450d135 + device_remove_file(dev, &dev_attr_utilisation); +} + ++static int rk3588_gpu_get_soc_info(struct device *dev, struct device_node *np, ++ int *bin, int *process) ++{ ++ int ret = 0; ++ u8 value = 0; ++ ++ if (!bin) ++ return 0; ++ ++ if (of_property_match_string(np, "nvmem-cell-names", ++ "specification_serial_number") >= 0) { ++ ret = rockchip_nvmem_cell_read_u8(np, ++ "specification_serial_number", ++ &value); ++ if (ret) { ++ dev_err(dev, ++ "Failed to get specification_serial_number\n"); ++ return ret; ++ } ++ /* RK3588M */ ++ if (value == 0xd) ++ *bin = 1; ++ /* RK3588J */ ++ else if (value == 0xa) ++ *bin = 2; ++ } ++ if (*bin < 0) ++ *bin = 0; ++ dev_info(dev, "bin=%d\n", *bin); ++ ++ return ret; ++} ++ ++static int rk3588_gpu_set_soc_info(struct device *dev, struct device_node *np, ++ int bin, int process, int volt_sel) ++{ ++ struct opp_table *opp_table; ++ u32 supported_hw[2]; ++ ++ if (volt_sel < 0) ++ return 0; ++ if (bin < 0) ++ bin = 0; ++ ++ if (!of_property_read_bool(np, "rockchip,supported-hw")) ++ return 0; ++ ++ /* SoC Version */ ++ supported_hw[0] = BIT(bin); ++ /* Speed Grade */ ++ supported_hw[1] = BIT(volt_sel); ++ opp_table = dev_pm_opp_set_supported_hw(dev, supported_hw, 2); ++ if (IS_ERR(opp_table)) { ++ dev_err(dev, "failed to set supported opp\n"); ++ return PTR_ERR(opp_table); ++ } ++ ++ return 0; ++} ++ ++static int rk3588_gpu_set_read_margin(struct device *dev, ++ struct rockchip_opp_info *opp_info, ++ u32 rm) ++{ ++ int ret = 0; ++ u32 val; ++ ++ if (!opp_info->grf || !opp_info->volt_rm_tbl) ++ return 0; ++ if (rm == opp_info->current_rm || rm == UINT_MAX) ++ return 0; ++ ++ dev_dbg(dev, "set rm to %d\n", rm); ++ ++ ret = regmap_read(opp_info->grf, 0x24, &val); ++ if (ret < 0) { ++ dev_err(dev, "failed to get rm from 0x24\n"); ++ return ret; ++ } ++ val &= ~0x1c; ++ regmap_write(opp_info->grf, 0x24, val | (rm << 2)); ++ ++ ret = regmap_read(opp_info->grf, 0x28, &val); ++ if (ret < 0) { ++ dev_err(dev, "failed to get rm from 0x28\n"); ++ return ret; ++ } ++ val &= ~0x1c; ++ regmap_write(opp_info->grf, 0x28, val | (rm << 2)); ++ ++ opp_info->current_rm = rm; ++ ++ return 0; ++} ++ ++static const struct rockchip_opp_data rk3588_gpu_opp_data = { ++ .get_soc_info = rk3588_gpu_get_soc_info, ++ .set_soc_info = rk3588_gpu_set_soc_info, ++ .set_read_margin = rk3588_gpu_set_read_margin, ++}; ++ ++static const struct of_device_id rockchip_mali_of_match[] = { ++ { ++ .compatible = "rockchip,rk3588", ++ .data = (void *)&rk3588_gpu_opp_data, ++ }, ++ {}, ++}; ++ +int kbase_platform_rk_init_opp_table(struct kbase_device *kbdev) +{ -+ return rockchip_init_opp_table(kbdev->dev, NULL, ++ rockchip_get_opp_data(rockchip_mali_of_match, &kbdev->opp_info); ++ ++ return rockchip_init_opp_table(kbdev->dev, &kbdev->opp_info, + "gpu_leakage", "mali"); +} ++ ++int kbase_platform_rk_enable_regulator(struct kbase_device *kbdev) ++{ ++ struct rk_context *platform = get_rk_context(kbdev); ++ int err = 0; ++ ++ if (!platform->is_regulator_on) { ++ err = rk_pm_enable_regulator(kbdev); ++ if (err) { ++ E("fail to enable regulator, err : %d.", err); ++ return err; ++ } ++ platform->is_regulator_on = true; ++ } ++ ++ return 0; ++} ++ ++/*---------------------------------------------------------------------------*/ ++ ++static void *enumerate_gpu_clk(struct kbase_device *kbdev, ++ unsigned int index) ++{ ++ if (index >= kbdev->nr_clocks) ++ return NULL; ++ ++ return kbdev->clocks[index]; ++} ++ ++static unsigned long get_gpu_clk_rate(struct kbase_device *kbdev, ++ void *gpu_clk_handle) ++{ ++ return clk_get_rate((struct clk *)gpu_clk_handle); ++} ++ ++static int gpu_clk_notifier_register(struct kbase_device *kbdev, ++ void *gpu_clk_handle, struct notifier_block *nb) ++{ ++ compiletime_assert(offsetof(struct clk_notifier_data, clk) == ++ offsetof(struct kbase_gpu_clk_notifier_data, gpu_clk_handle), ++ "mismatch in the offset of clk member"); ++ ++ compiletime_assert(sizeof(((struct clk_notifier_data *)0)->clk) == ++ sizeof(((struct kbase_gpu_clk_notifier_data *)0)->gpu_clk_handle), ++ "mismatch in the size of clk member"); ++ ++ return clk_notifier_register((struct clk *)gpu_clk_handle, nb); ++} ++ ++static void gpu_clk_notifier_unregister(struct kbase_device *kbdev, ++ void *gpu_clk_handle, struct notifier_block *nb) ++{ ++ clk_notifier_unregister((struct clk *)gpu_clk_handle, nb); ++} ++ ++struct kbase_clk_rate_trace_op_conf clk_rate_trace_ops = { ++ .get_gpu_clk_rate = get_gpu_clk_rate, ++ .enumerate_gpu_clk = enumerate_gpu_clk, ++ .gpu_clk_notifier_register = gpu_clk_notifier_register, ++ .gpu_clk_notifier_unregister = gpu_clk_notifier_unregister, ++}; diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h new file mode 100755 -index 000000000000..6eab25014d21 +index 000000000..0a42559df --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h -@@ -0,0 +1,62 @@ +@@ -0,0 +1,67 @@ +/* drivers/gpu/t6xx/kbase/src/platform/rk/mali_kbase_platform.h + * Rockchip SoC Mali-Midgard platform-dependent codes + * @@ -247340,6 +287821,8 @@ index 000000000000..6eab25014d21 + */ + bool is_powered; + ++ bool is_regulator_on; ++ + struct kbase_device *kbdev; + + struct workqueue_struct *power_off_wq; @@ -247355,6 +287838,9 @@ index 000000000000..6eab25014d21 + + /* debug only, the period in ms to count gpu_utilisation. */ + unsigned int utilisation_period; ++ ++ /* to protect operations on 'is_powered' and clks, pd, vd of gpu. */ ++ struct mutex lock; +}; + +/*---------------------------------------------------------------------------*/ @@ -247369,17 +287855,18 @@ index 000000000000..6eab25014d21 + diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild new file mode 100755 -index 000000000000..6780e4c9433b +index 000000000..e1398fde3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild -@@ -0,0 +1,24 @@ +@@ -0,0 +1,23 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2012-2013, 2016-2017 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2012-2013, 2016-2017, 2020-2021 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -247390,27 +287877,26 @@ index 000000000000..6780e4c9433b +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+mali_kbase-y += \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_config_vexpress.o \ -+ mali_kbase_platform_fake.o ++bifrost_kbase-y += \ ++ platform/$(MALI_PLATFORM_DIR)/mali_kbase_config_vexpress.o \ ++ mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h new file mode 100755 -index 000000000000..fac3cd52182f +index 000000000..28f453161 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h -@@ -0,0 +1,39 @@ +@@ -0,0 +1,38 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2017, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -247421,12 +287907,10 @@ index 000000000000..fac3cd52182f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** -+ * Power management configuration ++ * POWER_MANAGEMENT_CALLBACKS - Power management configuration + * + * Attached value: pointer to @ref kbase_pm_callback_conf + * Default value: See @ref kbase_pm_callback_conf @@ -247434,7 +287918,7 @@ index 000000000000..fac3cd52182f +#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) + +/** -+ * Platform specific configuration functions ++ * PLATFORM_FUNCS - Platform specific configuration functions + * + * Attached value: pointer to @ref kbase_platform_funcs_conf + * Default value: See @ref kbase_platform_funcs_conf @@ -247444,18 +287928,19 @@ index 000000000000..fac3cd52182f +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000000..d165ce262814 +index 000000000..8add708d0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c -@@ -0,0 +1,69 @@ +@@ -0,0 +1,79 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2017, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -247466,18 +287951,16 @@ index 000000000000..d165ce262814 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +#include +#include +#include +#include +#include "mali_kbase_config_platform.h" + ++#include ++ +#ifndef CONFIG_OF +static struct kbase_io_resources io_resources = { + .job_irq_number = 68, @@ -247517,19 +288000,31 @@ index 000000000000..d165ce262814 +{ + return &versatile_platform_config; +} ++ ++#ifdef CONFIG_MALI_BIFROST_DVFS ++#if MALI_USE_CSF ++int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation) ++#else ++int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share, u32 util_cl_share[2]) ++#endif ++{ ++ return 1; ++} ++#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild new file mode 100755 -index 000000000000..51b408efd48a +index 000000000..e1398fde3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild -@@ -0,0 +1,24 @@ +@@ -0,0 +1,23 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2012-2013, 2016-2017, 2020-2021 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -247540,27 +288035,26 @@ index 000000000000..51b408efd48a +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+mali_kbase-y += \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_config_vexpress.o \ -+ mali_kbase_platform_fake.o ++bifrost_kbase-y += \ ++ platform/$(MALI_PLATFORM_DIR)/mali_kbase_config_vexpress.o \ ++ mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h new file mode 100755 -index 000000000000..fac3cd52182f +index 000000000..28f453161 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h -@@ -0,0 +1,39 @@ +@@ -0,0 +1,38 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2017, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -247571,12 +288065,10 @@ index 000000000000..fac3cd52182f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** -+ * Power management configuration ++ * POWER_MANAGEMENT_CALLBACKS - Power management configuration + * + * Attached value: pointer to @ref kbase_pm_callback_conf + * Default value: See @ref kbase_pm_callback_conf @@ -247584,7 +288076,7 @@ index 000000000000..fac3cd52182f +#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) + +/** -+ * Platform specific configuration functions ++ * PLATFORM_FUNCS - Platform specific configuration functions + * + * Attached value: pointer to @ref kbase_platform_funcs_conf + * Default value: See @ref kbase_platform_funcs_conf @@ -247594,18 +288086,19 @@ index 000000000000..fac3cd52182f +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000000..efca0a5b3493 +index 000000000..835b7587c --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c -@@ -0,0 +1,65 @@ +@@ -0,0 +1,77 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2011-2014, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2014, 2017, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -247616,8 +288109,6 @@ index 000000000000..efca0a5b3493 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -247625,6 +288116,8 @@ index 000000000000..efca0a5b3493 +#include +#include + ++#include ++ +#ifndef CONFIG_OF +static struct kbase_io_resources io_resources = { + .job_irq_number = 68, @@ -247663,19 +288156,31 @@ index 000000000000..efca0a5b3493 +{ + return &versatile_platform_config; +} ++ ++#ifdef CONFIG_MALI_BIFROST_DVFS ++#if MALI_USE_CSF ++int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation) ++#else ++int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share, u32 util_cl_share[2]) ++#endif ++{ ++ return 1; ++} ++#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild new file mode 100755 -index 000000000000..e07709c9b1a5 +index 000000000..10f7dc8cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild -@@ -0,0 +1,25 @@ +@@ -0,0 +1,24 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2012-2013, 2016-2017 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2012-2013, 2016-2017, 2021 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -247686,28 +288191,27 @@ index 000000000000..e07709c9b1a5 +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+mali_kbase-y += \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_config_vexpress.o \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_cpu_vexpress.o \ -+ mali_kbase_platform_fake.o ++bifrost_kbase-y += \ ++ platform/$(MALI_PLATFORM_DIR)/mali_kbase_config_vexpress.o \ ++ platform/$(MALI_PLATFORM_DIR)/mali_kbase_cpu_vexpress.o \ ++ mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h new file mode 100755 -index 000000000000..fac3cd52182f +index 000000000..28f453161 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h -@@ -0,0 +1,39 @@ +@@ -0,0 +1,38 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2017, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -247718,12 +288222,10 @@ index 000000000000..fac3cd52182f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/** -+ * Power management configuration ++ * POWER_MANAGEMENT_CALLBACKS - Power management configuration + * + * Attached value: pointer to @ref kbase_pm_callback_conf + * Default value: See @ref kbase_pm_callback_conf @@ -247731,7 +288233,7 @@ index 000000000000..fac3cd52182f +#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) + +/** -+ * Platform specific configuration functions ++ * PLATFORM_FUNCS - Platform specific configuration functions + * + * Attached value: pointer to @ref kbase_platform_funcs_conf + * Default value: See @ref kbase_platform_funcs_conf @@ -247741,18 +288243,19 @@ index 000000000000..fac3cd52182f +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000000..b6714b95b776 +index 000000000..8be30fb25 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c -@@ -0,0 +1,67 @@ +@@ -0,0 +1,77 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2011-2014, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2014, 2017, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -247763,17 +288266,15 @@ index 000000000000..b6714b95b776 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+ -+ +#include +#include +#include +#include + ++#include ++ +#ifndef CONFIG_OF +static struct kbase_io_resources io_resources = { + .job_irq_number = 75, @@ -247812,20 +288313,32 @@ index 000000000000..b6714b95b776 +{ + return &versatile_platform_config; +} ++ ++#ifdef CONFIG_MALI_BIFROST_DVFS ++#if MALI_USE_CSF ++int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation) ++#else ++int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share, u32 util_cl_share[2]) ++#endif ++{ ++ return 1; ++} ++#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/protected_mode_switcher.h b/drivers/gpu/arm/bifrost/protected_mode_switcher.h new file mode 100755 -index 000000000000..8778d812aea0 +index 000000000..9dd9253c7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/protected_mode_switcher.h -@@ -0,0 +1,69 @@ +@@ -0,0 +1,56 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2017, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -247836,8 +288349,6 @@ index 000000000000..8778d812aea0 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _PROTECTED_MODE_SWITCH_H_ @@ -247848,35 +288359,23 @@ index 000000000000..8778d812aea0 +/** + * struct protected_mode_ops - Callbacks for protected mode switch operations + * -+ * @protected_mode_enable: Callback to enable protected mode for device ++ * @protected_mode_enable: Callback to enable protected mode for device, and ++ * reset device ++ * Returns 0 on success, non-zero on error + * @protected_mode_disable: Callback to disable protected mode for device ++ * Returns 0 on success, non-zero on error + */ +struct protected_mode_ops { -+ /** -+ * protected_mode_enable() - Enable protected mode on device -+ * @dev: The struct device -+ * -+ * Return: 0 on success, non-zero on error -+ */ + int (*protected_mode_enable)( + struct protected_mode_device *protected_dev); -+ -+ /** -+ * protected_mode_disable() - Disable protected mode on device, and -+ * reset device -+ * @dev: The struct device -+ * -+ * Return: 0 on success, non-zero on error -+ */ + int (*protected_mode_disable)( + struct protected_mode_device *protected_dev); +}; + +/** + * struct protected_mode_device - Device structure for protected mode devices -+ * -+ * @ops - Callbacks associated with this device -+ * @data - Pointer to device private data ++ * @ops: Callbacks associated with this device ++ * @data: Pointer to device private data + * + * This structure should be registered with the platform device using + * platform_set_drvdata(). @@ -247889,17 +288388,18 @@ index 000000000000..8778d812aea0 +#endif /* _PROTECTED_MODE_SWITCH_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/Kbuild b/drivers/gpu/arm/bifrost/tests/Kbuild new file mode 100755 -index 000000000000..c26bef780781 +index 000000000..38e4dd4d7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Kbuild -@@ -0,0 +1,24 @@ +@@ -0,0 +1,31 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2017, 2020 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2017, 2020-2022 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -247910,26 +288410,33 @@ index 000000000000..c26bef780781 +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + ++ccflags-y += -I$(src)/include \ ++ -I$(src) ++ ++subdir-ccflags-y += -I$(src)/include \ ++ -I$(src) ++ +obj-$(CONFIG_MALI_KUTF) += kutf/ -+obj-$(CONFIG_MALI_IRQ_LATENCY) += mali_kutf_irq_test/ -+obj-$(CONFIG_MALI_CLK_RATE_TRACE_PORTAL) += mali_kutf_clk_rate_trace/kernel/ ++obj-$(CONFIG_MALI_KUTF_IRQ_TEST) += mali_kutf_irq_test/ ++obj-$(CONFIG_MALI_KUTF_CLK_RATE_TRACE) += mali_kutf_clk_rate_trace/kernel/ ++obj-$(CONFIG_MALI_KUTF_MGM_INTEGRATION) += mali_kutf_mgm_integration_test/ ++ diff --git a/drivers/gpu/arm/bifrost/tests/Kconfig b/drivers/gpu/arm/bifrost/tests/Kconfig new file mode 100755 -index 000000000000..83a4d7764a50 +index 000000000..e9fe22771 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Kconfig -@@ -0,0 +1,24 @@ +@@ -0,0 +1,69 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2017, 2020 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2017, 2020-2022 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -247940,71 +288447,124 @@ index 000000000000..83a4d7764a50 +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+source "drivers/gpu/arm/midgard/tests/kutf/Kconfig" -+source "drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig" -+source "drivers/gpu/arm/midgard/tests/mali_kutf_clk_rate_trace/kernel/Kconfig" -diff --git a/drivers/gpu/arm/bifrost/tests/Mconfig b/drivers/gpu/arm/bifrost/tests/Mconfig -new file mode 100755 -index 000000000000..bba96b3d9e48 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/tests/Mconfig -@@ -0,0 +1,38 @@ -+# -+# (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# ++menuconfig MALI_KUTF ++ bool "Build Mali Kernel Unit Test Framework modules" ++ depends on MALI_BIFROST && MALI_BIFROST_DEBUG ++ default y if MALI_BIFROST_DEBUG ++ help ++ This option will build the Mali testing framework modules. + -+config UNIT_TEST_KERNEL_MODULES -+ bool -+ default y if UNIT_TEST_CODE && BUILD_KERNEL_MODULES -+ default n ++ Modules: ++ - kutf.ko ++ - kutf_test.ko + -+config BUILD_IPA_TESTS -+ bool -+ default y if UNIT_TEST_KERNEL_MODULES && MALI_BIFROST_DEVFREQ -+ default n ++config MALI_KUTF_IRQ_TEST ++ bool "Build Mali KUTF IRQ test module" ++ depends on MALI_KUTF ++ default y ++ help ++ This option will build the IRQ latency measurement test module. ++ It can determine the latency of the Mali GPU IRQ on your system. + -+config BUILD_IPA_UNIT_TESTS -+ bool -+ default y if NO_MALI && BUILD_IPA_TESTS -+ default n ++ Modules: ++ - mali_kutf_irq_test.ko + -+config BUILD_CSF_TESTS -+ bool -+ default y if UNIT_TEST_KERNEL_MODULES && GPU_HAS_CSF -+ default n ++config MALI_KUTF_CLK_RATE_TRACE ++ bool "Build Mali KUTF Clock rate trace test module" ++ depends on MALI_KUTF ++ default y ++ help ++ This option will build the clock rate trace portal test module. ++ It can test the clocks integration into the platform and exercise some ++ basic trace test in the system. + -+config BUILD_ARBIF_TESTS -+ bool -+ default y if UNIT_TEST_KERNEL_MODULES && MALI_ARBITER_SUPPORT -+ default n ++ Modules: ++ - mali_kutf_clk_rate_trace_test_portal.ko ++ ++config MALI_KUTF_MGM_INTEGRATION_TEST ++ bool "Build Mali KUTF MGM integration test module" ++ depends on MALI_KUTF ++ default y ++ help ++ This option will build the MGM integration test module. ++ It can test the implementation of PTE translation for specific ++ group ids. ++ ++ Modules: ++ - mali_kutf_mgm_integration_test.ko + ++ ++comment "Enable MALI_BIFROST_DEBUG for KUTF modules support" ++ depends on MALI_BIFROST && !MALI_BIFROST_DEBUG && MALI_KUTF +diff --git a/drivers/gpu/arm/bifrost/tests/build.bp b/drivers/gpu/arm/bifrost/tests/build.bp +new file mode 100644 +index 000000000..5581ba934 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/tests/build.bp +@@ -0,0 +1,46 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * ++ * (C) COPYRIGHT 2021-2023 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++ ++bob_defaults { ++ name: "kernel_test_includes", ++ local_include_dirs: [ ++ "include", ++ "./../../", ++ "./../", ++ "./", ++ ], ++} ++ ++bob_defaults { ++ name: "kernel_test_configs", ++ mali_kutf: { ++ kbuild_options: ["CONFIG_MALI_KUTF=y"], ++ }, ++ unit_test_kernel_modules: { ++ kbuild_options: ["CONFIG_UNIT_TEST_KERNEL_MODULES=y"], ++ }, ++} ++ ++bob_defaults { ++ name: "kernel_unit_tests", ++ add_to_alias: ["unit_tests"], ++ srcs: [".*_unit_test/"], ++} diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h new file mode 100755 -index 000000000000..858b9c38b49a +index 000000000..3f68efa42 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h -@@ -0,0 +1,85 @@ +@@ -0,0 +1,109 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2017, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2017, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -248015,8 +288575,6 @@ index 000000000000..858b9c38b49a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KERNEL_UTF_HELPERS_H_ @@ -248031,6 +288589,7 @@ index 000000000000..858b9c38b49a + */ + +#include ++#include + +/** + * kutf_helper_pending_input() - Check any pending lines sent by user space @@ -248081,21 +288640,46 @@ index 000000000000..858b9c38b49a + */ +void kutf_helper_input_enqueue_end_of_data(struct kutf_context *context); + ++/** ++ * kutf_helper_ignore_dmesg() - Write message in dmesg to instruct parser ++ * to ignore errors, until the counterpart ++ * is written to dmesg to stop ignoring errors. ++ * @dev: Device pointer to write to dmesg using. ++ * ++ * This function writes "Start ignoring dmesg warnings" to dmesg, which ++ * the parser will read and not log any errors. Only to be used in cases where ++ * we expect an error to be produced in dmesg but that we do not want to be ++ * flagged as an error. ++ */ ++void kutf_helper_ignore_dmesg(struct device *dev); ++ ++/** ++ * kutf_helper_stop_ignoring_dmesg() - Write message in dmesg to instruct parser ++ * to stop ignoring errors. ++ * @dev: Device pointer to write to dmesg using. ++ * ++ * This function writes "Stop ignoring dmesg warnings" to dmesg, which ++ * the parser will read and continue to log any errors. Counterpart to ++ * kutf_helper_ignore_dmesg(). ++ */ ++void kutf_helper_stop_ignoring_dmesg(struct device *dev); ++ +#endif /* _KERNEL_UTF_HELPERS_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h new file mode 100755 -index 000000000000..3b1300e1ce6f +index 000000000..e147cbb90 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h -@@ -0,0 +1,179 @@ +@@ -0,0 +1,184 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2017, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -248106,8 +288690,6 @@ index 000000000000..3b1300e1ce6f + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KERNEL_UTF_HELPERS_USER_H_ @@ -248153,7 +288735,8 @@ index 000000000000..3b1300e1ce6f + * unrecoverable) + * + * Positive values indicate correct access but invalid parsing (can be -+ * recovered from assuming data in the future is correct) */ ++ * recovered from assuming data in the future is correct) ++ */ +enum kutf_helper_err { + /* No error - must be zero */ + KUTF_HELPER_ERR_NONE = 0, @@ -248161,14 +288744,16 @@ index 000000000000..3b1300e1ce6f + KUTF_HELPER_ERR_INVALID_NAME, + /* Named value parsing of string or u64 type encountered extra + * characters after the value (after the last digit for a u64 type or -+ * after the string end delimiter for string type) */ ++ * after the string end delimiter for string type) ++ */ + KUTF_HELPER_ERR_CHARS_AFTER_VAL, + /* Named value parsing of string type couldn't find the string end + * delimiter. + * + * This cannot be encountered when the NAME="value" message exceeds the + * textbuf's maximum line length, because such messages are not checked -+ * for an end string delimiter */ ++ * for an end string delimiter ++ */ + KUTF_HELPER_ERR_NO_END_DELIMITER, + /* Named value didn't parse as any of the known types */ + KUTF_HELPER_ERR_INVALID_VALUE, @@ -248212,7 +288797,8 @@ index 000000000000..3b1300e1ce6f + * + * Any failure will be logged on the suite's current test fixture + * -+ * Returns 0 on success, non-zero on failure */ ++ * Returns 0 on success, non-zero on failure ++ */ +int kutf_helper_send_named_str(struct kutf_context *context, + const char *val_name, const char *val_str); + @@ -248228,7 +288814,8 @@ index 000000000000..3b1300e1ce6f + * + * Returns 0 on success. Negative value on failure to receive from the 'run' + * file, positive value indicates an enum kutf_helper_err value for correct -+ * reception of data but invalid parsing */ ++ * reception of data but invalid parsing ++ */ +int kutf_helper_receive_named_val( + struct kutf_context *context, + struct kutf_helper_named_val *named_val); @@ -248255,7 +288842,8 @@ index 000000000000..3b1300e1ce6f + * - return value will be 0 to indicate success + * + * The rationale behind this is that we'd prefer to continue the rest of the -+ * test with failures propagated, rather than hitting a timeout */ ++ * test with failures propagated, rather than hitting a timeout ++ */ +int kutf_helper_receive_check_val( + struct kutf_helper_named_val *named_val, + struct kutf_context *context, @@ -248269,18 +288857,19 @@ index 000000000000..3b1300e1ce6f +#endif /* _KERNEL_UTF_HELPERS_USER_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h new file mode 100755 -index 000000000000..988559de1edf +index 000000000..5d4d96ef3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h -@@ -0,0 +1,73 @@ +@@ -0,0 +1,72 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2017, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -248291,8 +288880,6 @@ index 000000000000..988559de1edf + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KERNEL_UTF_MEM_H_ @@ -248348,18 +288935,19 @@ index 000000000000..988559de1edf +#endif /* _KERNEL_UTF_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h new file mode 100755 -index 000000000000..49ebeb4ec546 +index 000000000..2fb1a47a5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h -@@ -0,0 +1,181 @@ +@@ -0,0 +1,180 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2017, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -248370,8 +288958,6 @@ index 000000000000..49ebeb4ec546 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KERNEL_UTF_RESULTSET_H_ @@ -248535,18 +289121,19 @@ index 000000000000..49ebeb4ec546 +#endif /* _KERNEL_UTF_RESULTSET_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h new file mode 100755 -index 000000000000..8d75f506f9eb +index 000000000..9e459c556 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h -@@ -0,0 +1,569 @@ +@@ -0,0 +1,571 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2017, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -248557,8 +289144,6 @@ index 000000000000..8d75f506f9eb + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KERNEL_UTF_SUITE_H_ @@ -248585,36 +289170,36 @@ index 000000000000..8d75f506f9eb +#define KUTF_MAX_LINE_LENGTH (1024u) + +/** -+ * Pseudo-flag indicating an absence of any specified test class. Note that -+ * tests should not be annotated with this constant as it is simply a zero ++ * KUTF_F_TEST_NONE - Pseudo-flag indicating an absence of any specified test class. ++ * Note that tests should not be annotated with this constant as it is simply a zero + * value; tests without a more specific class must be marked with the flag + * KUTF_F_TEST_GENERIC. + */ +#define KUTF_F_TEST_NONE ((unsigned int)(0)) + +/** -+ * Class indicating this test is a smoke test. ++ * KUTF_F_TEST_SMOKETEST - Class indicating this test is a smoke test. + * A given set of smoke tests should be quick to run, enabling rapid turn-around + * of "regress-on-commit" test runs. + */ +#define KUTF_F_TEST_SMOKETEST ((unsigned int)(1 << 1)) + +/** -+ * Class indicating this test is a performance test. ++ * KUTF_F_TEST_PERFORMANCE - Class indicating this test is a performance test. + * These tests typically produce a performance metric, such as "time to run" or + * "frames per second", + */ +#define KUTF_F_TEST_PERFORMANCE ((unsigned int)(1 << 2)) + +/** -+ * Class indicating that this test is a deprecated test. ++ * KUTF_F_TEST_DEPRECATED - Class indicating that this test is a deprecated test. + * These tests have typically been replaced by an alternative test which is + * more efficient, or has better coverage. + */ +#define KUTF_F_TEST_DEPRECATED ((unsigned int)(1 << 3)) + +/** -+ * Class indicating that this test is a known failure. ++ * KUTF_F_TEST_EXPECTED_FAILURE - Class indicating that this test is a known failure. + * These tests have typically been run and failed, but marking them as a known + * failure means it is easier to triage results. + * @@ -248625,68 +289210,69 @@ index 000000000000..8d75f506f9eb +#define KUTF_F_TEST_EXPECTED_FAILURE ((unsigned int)(1 << 4)) + +/** -+ * Class indicating that this test is a generic test, which is not a member of -+ * a more specific test class. Tests which are not created with a specific set ++ * KUTF_F_TEST_GENERIC - Class indicating that this test is a generic test, ++ * which is not a member of a more specific test class. ++ * Tests which are not created with a specific set + * of filter flags by the user are assigned this test class by default. + */ +#define KUTF_F_TEST_GENERIC ((unsigned int)(1 << 5)) + +/** -+ * Class indicating this test is a resource allocation failure test. ++ * KUTF_F_TEST_RESFAIL - Class indicating this test is a resource allocation failure test. + * A resource allocation failure test will test that an error code is + * correctly propagated when an allocation fails. + */ +#define KUTF_F_TEST_RESFAIL ((unsigned int)(1 << 6)) + +/** -+ * Additional flag indicating that this test is an expected failure when -+ * run in resource failure mode. These tests are never run when running -+ * the low resource mode. ++ * KUTF_F_TEST_EXPECTED_FAILURE_RF - Additional flag indicating that this test ++ * is an expected failure when run in resource failure mode. ++ * These tests are never run when running the low resource mode. + */ +#define KUTF_F_TEST_EXPECTED_FAILURE_RF ((unsigned int)(1 << 7)) + +/** -+ * Flag reserved for user-defined filter zero. ++ * KUTF_F_TEST_USER_0 - Flag reserved for user-defined filter zero. + */ +#define KUTF_F_TEST_USER_0 ((unsigned int)(1 << 24)) + +/** -+ * Flag reserved for user-defined filter one. ++ * KUTF_F_TEST_USER_1 - Flag reserved for user-defined filter one. + */ +#define KUTF_F_TEST_USER_1 ((unsigned int)(1 << 25)) + +/** -+ * Flag reserved for user-defined filter two. ++ * KUTF_F_TEST_USER_2 - Flag reserved for user-defined filter two. + */ +#define KUTF_F_TEST_USER_2 ((unsigned int)(1 << 26)) + +/** -+ * Flag reserved for user-defined filter three. ++ * KUTF_F_TEST_USER_3 - Flag reserved for user-defined filter three. + */ +#define KUTF_F_TEST_USER_3 ((unsigned int)(1 << 27)) + +/** -+ * Flag reserved for user-defined filter four. ++ * KUTF_F_TEST_USER_4 - Flag reserved for user-defined filter four. + */ +#define KUTF_F_TEST_USER_4 ((unsigned int)(1 << 28)) + +/** -+ * Flag reserved for user-defined filter five. ++ * KUTF_F_TEST_USER_5 - Flag reserved for user-defined filter five. + */ +#define KUTF_F_TEST_USER_5 ((unsigned int)(1 << 29)) + +/** -+ * Flag reserved for user-defined filter six. ++ * KUTF_F_TEST_USER_6 - Flag reserved for user-defined filter six. + */ +#define KUTF_F_TEST_USER_6 ((unsigned int)(1 << 30)) + +/** -+ * Flag reserved for user-defined filter seven. ++ * KUTF_F_TEST_USER_7 - Flag reserved for user-defined filter seven. + */ +#define KUTF_F_TEST_USER_7 ((unsigned int)(1 << 31)) + +/** -+ * Pseudo-flag indicating that all test classes should be executed. ++ * KUTF_F_TEST_ALL - Pseudo-flag indicating that all test classes should be executed. + */ +#define KUTF_F_TEST_ALL ((unsigned int)(0xFFFFFFFFU)) + @@ -248805,9 +289391,10 @@ index 000000000000..8d75f506f9eb + struct list_head test_list; +}; + -+/* ============================================================================ -+ Application functions -+============================================================================ */ ++/** =========================================================================== ++ * Application functions ++ * ============================================================================ ++ */ + +/** + * kutf_create_application() - Create an in kernel test application. @@ -248825,9 +289412,10 @@ index 000000000000..8d75f506f9eb + */ +void kutf_destroy_application(struct kutf_application *app); + -+/* ============================================================================ -+ Suite functions -+============================================================================ */ ++/**============================================================================ ++ * Suite functions ++ * ============================================================================ ++ */ + +/** + * kutf_create_suite() - Create a kernel test suite. @@ -248957,10 +289545,10 @@ index 000000000000..8d75f506f9eb + unsigned int filters, + union kutf_callback_data test_data); + -+ -+/* ============================================================================ -+ Test functions -+============================================================================ */ ++/** =========================================================================== ++ * Test functions ++ * ============================================================================ ++ */ +/** + * kutf_test_log_result_external() - Log a result which has been created + * externally into a in a standard form @@ -249110,18 +289698,19 @@ index 000000000000..8d75f506f9eb +#endif /* _KERNEL_UTF_SUITE_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h new file mode 100755 -index 000000000000..25b8285500d7 +index 000000000..f6e758b80 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h @@ -0,0 +1,60 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2017, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -249132,8 +289721,6 @@ index 000000000000..25b8285500d7 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KERNEL_UTF_UTILS_H_ @@ -249150,8 +289737,8 @@ index 000000000000..25b8285500d7 +#include + +/** -+ * Maximum size of the message strings within kernel UTF, messages longer then -+ * this will be truncated. ++ * KUTF_MAX_DSPRINTF_LEN - Maximum size of the message strings within ++ * kernel UTF, messages longer then this will be truncated. + */ +#define KUTF_MAX_DSPRINTF_LEN 1024 + @@ -249171,88 +289758,24 @@ index 000000000000..25b8285500d7 + * Return: Returns pointer to allocated string, or NULL on error. + */ +const char *kutf_dsprintf(struct kutf_mempool *pool, -+ const char *fmt, ...); ++ const char *fmt, ...) __printf(2, 3); ++ + +#endif /* _KERNEL_UTF_UTILS_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/kutf/Kbuild b/drivers/gpu/arm/bifrost/tests/kutf/Kbuild new file mode 100755 -index 000000000000..2531d41ca28d +index 000000000..c4790bc66 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/Kbuild -@@ -0,0 +1,26 @@ -+# -+# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, you can access it online at -+# http://www.gnu.org/licenses/gpl-2.0.html. -+# -+# SPDX-License-Identifier: GPL-2.0 -+# -+# -+ -+ccflags-y += -I$(src)/../include -+ -+obj-$(CONFIG_MALI_KUTF) += kutf.o -+ -+kutf-y := kutf_mem.o kutf_resultset.o kutf_suite.o kutf_utils.o kutf_helpers.o kutf_helpers_user.o -diff --git a/drivers/gpu/arm/bifrost/tests/kutf/Kconfig b/drivers/gpu/arm/bifrost/tests/kutf/Kconfig -new file mode 100755 -index 000000000000..0cdb474c06a3 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/tests/kutf/Kconfig -@@ -0,0 +1,28 @@ -+# -+# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, you can access it online at -+# http://www.gnu.org/licenses/gpl-2.0.html. -+# -+# SPDX-License-Identifier: GPL-2.0 -+# -+# -+ -+ -+config MALI_KUTF -+ tristate "Mali Kernel Unit Test Framework" -+ default m -+ help -+ Enables MALI testing framework. To compile it as a module, -+ choose M here - this will generate a single module called kutf. -diff --git a/drivers/gpu/arm/bifrost/tests/kutf/Makefile b/drivers/gpu/arm/bifrost/tests/kutf/Makefile -new file mode 100755 -index 000000000000..d848e8774bd0 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/tests/kutf/Makefile -@@ -0,0 +1,35 @@ +@@ -0,0 +1,31 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2017, 2020-2021 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -249263,50 +289786,52 @@ index 000000000000..d848e8774bd0 +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+# linux build system bootstrap for out-of-tree module -+ -+# default to building for the host -+ARCH ?= $(shell uname -m) ++ifeq ($(CONFIG_MALI_KUTF),y) ++obj-m += kutf.o + -+ifeq ($(KDIR),) -+$(error Must specify KDIR to point to the kernel to target)) ++kutf-y := \ ++ kutf_mem.o \ ++ kutf_resultset.o \ ++ kutf_suite.o \ ++ kutf_utils.o \ ++ kutf_helpers.o \ ++ kutf_helpers_user.o +endif -+ -+all: -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) $(SCONS_CONFIGS) EXTRA_CFLAGS=-I$(CURDIR)/../include modules -+ -+clean: -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean diff --git a/drivers/gpu/arm/bifrost/tests/kutf/build.bp b/drivers/gpu/arm/bifrost/tests/kutf/build.bp new file mode 100755 -index 000000000000..32eab143e669 +index 000000000..89edae9c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/build.bp -@@ -0,0 +1,36 @@ +@@ -0,0 +1,42 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * + */ + +bob_kernel_module { + name: "kutf", + defaults: [ -+ "kernel_defaults", -+ "kutf_includes", ++ "mali_kbase_shared_config_defaults", ++ "kernel_test_configs", ++ "kernel_test_includes", + ], + srcs: [ + "Kbuild", @@ -249317,26 +289842,26 @@ index 000000000000..32eab143e669 + "kutf_suite.c", + "kutf_utils.c", + ], -+ kbuild_options: ["CONFIG_MALI_KUTF=m"], + enabled: false, -+ base_build_kutf: { ++ mali_kutf: { + enabled: true, + }, +} diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c new file mode 100755 -index 000000000000..4463b04792f5 +index 000000000..42736195e --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c -@@ -0,0 +1,131 @@ +@@ -0,0 +1,141 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2017, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2017, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -249347,13 +289872,10 @@ index 000000000000..4463b04792f5 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* Kernel UTF test helpers */ +#include -+ +#include +#include +#include @@ -249460,20 +289982,33 @@ index 000000000000..4463b04792f5 +{ + kutf_helper_input_enqueue(context, NULL, 0); +} ++ ++void kutf_helper_ignore_dmesg(struct device *dev) ++{ ++ dev_info(dev, "KUTF: Start ignoring dmesg warnings\n"); ++} ++EXPORT_SYMBOL(kutf_helper_ignore_dmesg); ++ ++void kutf_helper_stop_ignoring_dmesg(struct device *dev) ++{ ++ dev_info(dev, "KUTF: Stop ignoring dmesg warnings\n"); ++} ++EXPORT_SYMBOL(kutf_helper_stop_ignoring_dmesg); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c new file mode 100755 -index 000000000000..108fa82d9b21 +index 000000000..c4e294325 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c -@@ -0,0 +1,468 @@ +@@ -0,0 +1,474 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2017, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -249484,8 +290019,6 @@ index 000000000000..108fa82d9b21 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* Kernel UTF test helpers that mirror those for kutf-userside */ @@ -249497,7 +290030,7 @@ index 000000000000..108fa82d9b21 +#include +#include + -+const char *valtype_names[] = { ++static const char *const valtype_names[] = { + "INVALID", + "U64", + "STR", @@ -249510,7 +290043,8 @@ index 000000000000..108fa82d9b21 + * a) "<0 comparison on unsigned type" warning - if we did both upper + * and lower bound check + * b) incorrect range checking if it was a signed type - if we did -+ * upper bound check only */ ++ * upper bound check only ++ */ + unsigned int type_idx = (unsigned int)valtype; + + if (type_idx >= (unsigned int)KUTF_HELPER_VALTYPE_COUNT) @@ -249522,7 +290056,8 @@ index 000000000000..108fa82d9b21 +/* Check up to str_len chars of val_str to see if it's a valid value name: + * + * - Has between 1 and KUTF_HELPER_MAX_VAL_NAME_LEN characters before the \0 terminator -+ * - And, each char is in the character set [A-Z0-9_] */ ++ * - And, each char is in the character set [A-Z0-9_] ++ */ +static int validate_val_name(const char *val_str, int str_len) +{ + int i = 0; @@ -249555,7 +290090,8 @@ index 000000000000..108fa82d9b21 + * e.g. "str" + * + * That is, before any '\\', '\n' or '"' characters. This is so we don't have -+ * to escape the string */ ++ * to escape the string ++ */ +static int find_quoted_string_valid_len(const char *str) +{ + char *ptr; @@ -249675,7 +290211,8 @@ index 000000000000..108fa82d9b21 + str_buf_sz = val_name_len + start_delim_len + val_str_len + end_delim_len + 1; + + /* Using kmalloc() here instead of mempool since we know we need to free -+ * before we return */ ++ * before we return ++ */ + str_buf = kmalloc(str_buf_sz, GFP_KERNEL); + if (!str_buf) { + errmsg = kutf_dsprintf(&context->fixture_pool, @@ -249686,7 +290223,8 @@ index 000000000000..108fa82d9b21 + copy_ptr = str_buf; + + /* Manually copy each string component instead of snprintf because -+ * val_str may need to end early, and less error path handling */ ++ * val_str may need to end early, and less error path handling ++ */ + + /* name */ + memcpy(copy_ptr, val_name, val_name_len); @@ -249799,7 +290337,8 @@ index 000000000000..108fa82d9b21 + /* possibly a number value - strtoull will parse it */ + err = kstrtoull(recv_str, 0, &u64val); + /* unlike userspace can't get an end ptr, but if kstrtoull() -+ * reads characters after the number it'll report -EINVAL */ ++ * reads characters after the number it'll report -EINVAL ++ */ + if (!err) { + int len_remain = strnlen(recv_str, recv_sz); + @@ -249831,7 +290370,7 @@ index 000000000000..108fa82d9b21 + named_val->u.val_str = strval; + break; + default: -+ pr_err("Unreachable, fix kutf_helper_receive_named_val\n"); ++ pr_err("Unreachable, fix %s\n", __func__); + /* Coding error, report as though 'run' file failed */ + return -EINVAL; + } @@ -249867,7 +290406,8 @@ index 000000000000..108fa82d9b21 + goto out_fail_and_fixup; + } + -+ if (strcmp(named_val->val_name, expect_val_name) != 0) { ++ if (named_val->val_name != NULL && ++ strcmp(named_val->val_name, expect_val_name) != 0) { + const char *msg = kutf_dsprintf(&context->fixture_pool, + "Expecting to receive value named '%s' but got '%s'", + expect_val_name, named_val->val_name); @@ -249936,18 +290476,19 @@ index 000000000000..108fa82d9b21 +EXPORT_SYMBOL(kutf_helper_output_named_val); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c new file mode 100755 -index 000000000000..fd98beaeb84a +index 000000000..716970abb --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c -@@ -0,0 +1,108 @@ +@@ -0,0 +1,107 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2017, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -249958,8 +290499,6 @@ index 000000000000..fd98beaeb84a + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* Kernel UTF memory management functions */ @@ -250050,18 +290589,19 @@ index 000000000000..fd98beaeb84a +EXPORT_SYMBOL(kutf_mempool_alloc); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c new file mode 100755 -index 000000000000..94ecfa4421e1 +index 000000000..3a7ade283 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c -@@ -0,0 +1,164 @@ +@@ -0,0 +1,163 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2017, 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -250072,8 +290612,6 @@ index 000000000000..94ecfa4421e1 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* Kernel UTF result management functions */ @@ -250146,7 +290684,7 @@ index 000000000000..94ecfa4421e1 +void kutf_destroy_result_set(struct kutf_result_set *set) +{ + if (!list_empty(&set->results)) -+ pr_err("kutf_destroy_result_set: Unread results from test\n"); ++ pr_err("%s: Unread results from test\n", __func__); + + kfree(set); +} @@ -250220,18 +290758,19 @@ index 000000000000..94ecfa4421e1 +} diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c new file mode 100755 -index 000000000000..9dc6e2b4bad4 +index 000000000..4468066f1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c -@@ -0,0 +1,1224 @@ +@@ -0,0 +1,1216 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014, 2017-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2017-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -250242,12 +290781,11 @@ index 000000000000..9dc6e2b4bad4 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* Kernel UTF suite, test and fixture management including user to kernel -+ * interaction */ ++ * interaction ++ */ + +#include +#include @@ -250332,22 +290870,16 @@ index 000000000000..9dc6e2b4bad4 + enum kutf_result_status result; +}; + -+struct kutf_convert_table kutf_convert[] = { -+#define ADD_UTF_RESULT(_name) \ -+{ \ -+ #_name, \ -+ _name, \ -+}, -+ADD_UTF_RESULT(KUTF_RESULT_BENCHMARK) -+ADD_UTF_RESULT(KUTF_RESULT_SKIP) -+ADD_UTF_RESULT(KUTF_RESULT_UNKNOWN) -+ADD_UTF_RESULT(KUTF_RESULT_PASS) -+ADD_UTF_RESULT(KUTF_RESULT_DEBUG) -+ADD_UTF_RESULT(KUTF_RESULT_INFO) -+ADD_UTF_RESULT(KUTF_RESULT_WARN) -+ADD_UTF_RESULT(KUTF_RESULT_FAIL) -+ADD_UTF_RESULT(KUTF_RESULT_FATAL) -+ADD_UTF_RESULT(KUTF_RESULT_ABORT) ++static const struct kutf_convert_table kutf_convert[] = { ++#define ADD_UTF_RESULT(_name) \ ++ { \ ++#_name, _name, \ ++ } ++ ADD_UTF_RESULT(KUTF_RESULT_BENCHMARK), ADD_UTF_RESULT(KUTF_RESULT_SKIP), ++ ADD_UTF_RESULT(KUTF_RESULT_UNKNOWN), ADD_UTF_RESULT(KUTF_RESULT_PASS), ++ ADD_UTF_RESULT(KUTF_RESULT_DEBUG), ADD_UTF_RESULT(KUTF_RESULT_INFO), ++ ADD_UTF_RESULT(KUTF_RESULT_WARN), ADD_UTF_RESULT(KUTF_RESULT_FAIL), ++ ADD_UTF_RESULT(KUTF_RESULT_FATAL), ADD_UTF_RESULT(KUTF_RESULT_ABORT), +}; + +#define UTF_CONVERT_SIZE (ARRAY_SIZE(kutf_convert)) @@ -250417,8 +290949,7 @@ index 000000000000..9dc6e2b4bad4 + * + * Return: 1 if test result was successfully converted to string, 0 otherwise + */ -+static int kutf_result_to_string(char **result_str, -+ enum kutf_result_status result) ++static int kutf_result_to_string(const char **result_str, enum kutf_result_status result) +{ + int i; + int ret = 0; @@ -250545,7 +291076,8 @@ index 000000000000..9dc6e2b4bad4 +} + +/** -+ * kutf_debugfs_run_open() Debugfs open callback for the "run" entry. ++ * kutf_debugfs_run_open() - Debugfs open callback for the "run" entry. ++ * + * @inode: inode of the opened file + * @file: Opened file to read from + * @@ -250607,7 +291139,7 @@ index 000000000000..9dc6e2b4bad4 + struct kutf_result *res; + unsigned long bytes_not_copied; + ssize_t bytes_copied = 0; -+ char *kutf_str_ptr = NULL; ++ const char *kutf_str_ptr = NULL; + size_t kutf_str_len = 0; + size_t message_len = 0; + char separator = ':'; @@ -250719,7 +291251,7 @@ index 000000000000..9dc6e2b4bad4 +} + +/** -+ * kutf_debugfs_run_write() Debugfs write callback for the "run" entry. ++ * kutf_debugfs_run_write() - Debugfs write callback for the "run" entry. + * @file: Opened file to write to + * @buf: User buffer to read the data from + * @len: Amount of data to write @@ -250808,31 +291340,27 @@ index 000000000000..9dc6e2b4bad4 + + snprintf(name, sizeof(name), "%d", fixture_index); + test_fix->dir = debugfs_create_dir(name, test_func->dir); -+ if (!test_func->dir) { ++ if (IS_ERR_OR_NULL(test_func->dir)) { + pr_err("Failed to create debugfs directory when adding fixture\n"); + /* Might not be the right error, we don't get it passed back to us */ + err = -EEXIST; + goto fail_dir; + } + -+ tmp = debugfs_create_file("type", S_IROTH, test_fix->dir, "fixture\n", ++ tmp = debugfs_create_file("type", 0004, test_fix->dir, "fixture\n", + &kutf_debugfs_const_string_ops); -+ if (!tmp) { ++ if (IS_ERR_OR_NULL(tmp)) { + pr_err("Failed to create debugfs file \"type\" when adding fixture\n"); + /* Might not be the right error, we don't get it passed back to us */ + err = -EEXIST; + goto fail_file; + } + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) + tmp = debugfs_create_file_unsafe( -+#else -+ tmp = debugfs_create_file( -+#endif + "run", 0600, test_fix->dir, + test_fix, + &kutf_debugfs_run_ops); -+ if (!tmp) { ++ if (IS_ERR_OR_NULL(tmp)) { + pr_err("Failed to create debugfs file \"run\" when adding fixture\n"); + /* Might not be the right error, we don't get it passed back to us */ + err = -EEXIST; @@ -250860,7 +291388,7 @@ index 000000000000..9dc6e2b4bad4 + kfree(test_fix); +} + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) ++#if KERNEL_VERSION(5, 5, 0) <= LINUX_VERSION_CODE +/* Adapting to the upstream debugfs_create_x32() change */ +static int ktufp_u32_get(void *data, u64 *val) +{ @@ -250892,39 +291420,39 @@ index 000000000000..9dc6e2b4bad4 + INIT_LIST_HEAD(&test_func->variant_list); + + test_func->dir = debugfs_create_dir(name, suite->dir); -+ if (!test_func->dir) { ++ if (IS_ERR_OR_NULL(test_func->dir)) { + pr_err("Failed to create debugfs directory when adding test %s\n", name); + goto fail_dir; + } + -+ tmp = debugfs_create_file("type", S_IROTH, test_func->dir, "test\n", ++ tmp = debugfs_create_file("type", 0004, test_func->dir, "test\n", + &kutf_debugfs_const_string_ops); -+ if (!tmp) { ++ if (IS_ERR_OR_NULL(tmp)) { + pr_err("Failed to create debugfs file \"type\" when adding test %s\n", name); + goto fail_file; + } + + test_func->filters = filters; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) -+ tmp = debugfs_create_file_unsafe("filters", S_IROTH, test_func->dir, ++#if KERNEL_VERSION(5, 5, 0) <= LINUX_VERSION_CODE ++ tmp = debugfs_create_file_unsafe("filters", 0004, test_func->dir, + &test_func->filters, &kutfp_fops_x32_ro); +#else -+ tmp = debugfs_create_x32("filters", S_IROTH, test_func->dir, ++ tmp = debugfs_create_x32("filters", 0004, test_func->dir, + &test_func->filters); +#endif -+ if (!tmp) { ++ if (IS_ERR_OR_NULL(tmp)) { + pr_err("Failed to create debugfs file \"filters\" when adding test %s\n", name); + goto fail_file; + } + + test_func->test_id = id; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) -+ debugfs_create_u32("test_id", S_IROTH, test_func->dir, -+ &test_func->test_id); ++#if KERNEL_VERSION(5, 5, 0) <= LINUX_VERSION_CODE ++ debugfs_create_u32("test_id", 0004, test_func->dir, ++ &test_func->test_id); +#else -+ tmp = debugfs_create_u32("test_id", S_IROTH, test_func->dir, ++ tmp = debugfs_create_u32("test_id", 0004, test_func->dir, + &test_func->test_id); -+ if (!tmp) { ++ if (IS_ERR_OR_NULL(tmp)) { + pr_err("Failed to create debugfs file \"test_id\" when adding test %s\n", name); + goto fail_file; + } @@ -250992,7 +291520,7 @@ index 000000000000..9dc6e2b4bad4 +EXPORT_SYMBOL(kutf_add_test); + +/** -+ * kutf_remove_test(): Remove a previously added test function. ++ * kutf_remove_test() - Remove a previously added test function. + * @test_func: Test function + */ +static void kutf_remove_test(struct kutf_test_function *test_func) @@ -251031,14 +291559,14 @@ index 000000000000..9dc6e2b4bad4 + } + + suite->dir = debugfs_create_dir(name, app->dir); -+ if (!suite->dir) { ++ if (IS_ERR_OR_NULL(suite->dir)) { + pr_err("Failed to create debugfs directory when adding test %s\n", name); + goto fail_debugfs; + } + -+ tmp = debugfs_create_file("type", S_IROTH, suite->dir, "suite\n", ++ tmp = debugfs_create_file("type", 0004, suite->dir, "suite\n", + &kutf_debugfs_const_string_ops); -+ if (!tmp) { ++ if (IS_ERR_OR_NULL(tmp)) { + pr_err("Failed to create debugfs file \"type\" when adding test %s\n", name); + goto fail_file; + } @@ -251139,14 +291667,14 @@ index 000000000000..9dc6e2b4bad4 + } + + app->dir = debugfs_create_dir(name, base_dir); -+ if (!app->dir) { ++ if (IS_ERR_OR_NULL(app->dir)) { + pr_err("Failed to create debugfs direcotry when creating application %s\n", name); + goto fail_debugfs; + } + -+ tmp = debugfs_create_file("type", S_IROTH, app->dir, "application\n", ++ tmp = debugfs_create_file("type", 0004, app->dir, "application\n", + &kutf_debugfs_const_string_ops); -+ if (!tmp) { ++ if (IS_ERR_OR_NULL(tmp)) { + pr_err("Failed to create debugfs file \"type\" when creating application %s\n", name); + goto fail_file; + } @@ -251384,12 +291912,13 @@ index 000000000000..9dc6e2b4bad4 +} +EXPORT_SYMBOL(kutf_test_abort); + -+#ifdef CONFIG_DEBUG_FS ++#if IS_ENABLED(CONFIG_DEBUG_FS) + +/** + * init_kutf_core() - Module entry point. -+ * + * Create the base entry point in debugfs. ++ * ++ * Return: 0 on success, error code otherwise. + */ +static int __init init_kutf_core(void) +{ @@ -251398,7 +291927,7 @@ index 000000000000..9dc6e2b4bad4 + return -ENOMEM; + + base_dir = debugfs_create_dir("kutf_tests", NULL); -+ if (!base_dir) { ++ if (IS_ERR_OR_NULL(base_dir)) { + destroy_workqueue(kutf_workq); + kutf_workq = NULL; + return -ENOMEM; @@ -251423,9 +291952,10 @@ index 000000000000..9dc6e2b4bad4 +#else /* CONFIG_DEBUG_FS */ + +/** -+ * init_kutf_core() - Module entry point. ++ * init_kutf_core - Module entry point ++ * Stub for when build against a kernel without debugfs support. + * -+ * Stub for when build against a kernel without debugfs support ++ * Return: -ENODEV + */ +static int __init init_kutf_core(void) +{ @@ -251450,18 +291980,19 @@ index 000000000000..9dc6e2b4bad4 +module_exit(exit_kutf_core); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c new file mode 100755 -index 000000000000..7f5ac517fdb4 +index 000000000..21f5fadcc --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c -@@ -0,0 +1,76 @@ +@@ -0,0 +1,75 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014, 2017, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -251472,8 +292003,6 @@ index 000000000000..7f5ac517fdb4 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* Kernel UTF utility functions */ @@ -251488,7 +292017,7 @@ index 000000000000..7f5ac517fdb4 + +static char tmp_buffer[KUTF_MAX_DSPRINTF_LEN]; + -+DEFINE_MUTEX(buffer_lock); ++static DEFINE_MUTEX(buffer_lock); + +const char *kutf_dsprintf(struct kutf_mempool *pool, + const char *fmt, ...) @@ -251504,12 +292033,12 @@ index 000000000000..7f5ac517fdb4 + va_end(args); + + if (len < 0) { -+ pr_err("kutf_dsprintf: Bad format dsprintf format %s\n", fmt); ++ pr_err("%s: Bad format dsprintf format %s\n", __func__, fmt); + goto fail_format; + } + + if (len >= sizeof(tmp_buffer)) { -+ pr_warn("kutf_dsprintf: Truncated dsprintf message %s\n", fmt); ++ pr_warn("%s: Truncated dsprintf message %s\n", __func__, fmt); + size = sizeof(tmp_buffer); + } else { + size = len + 1; @@ -251532,85 +292061,18 @@ index 000000000000..7f5ac517fdb4 +EXPORT_SYMBOL(kutf_dsprintf); diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild new file mode 100755 -index 000000000000..f5565d30f9cf +index 000000000..027bc27c9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild -@@ -0,0 +1,26 @@ -+# -+# (C) COPYRIGHT 2020 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, you can access it online at -+# http://www.gnu.org/licenses/gpl-2.0.html. -+# -+# SPDX-License-Identifier: GPL-2.0 -+# -+# -+ -+ccflags-y += -I$(src)/../include -I$(src)/../../../ -I$(src)/../../ -I$(src)/../../backend/gpu -I$(srctree)/drivers/staging/android -+ -+obj-$(CONFIG_MALI_CLK_RATE_TRACE_PORTAL) += mali_kutf_clk_rate_trace_test_portal.o -+ -+mali_kutf_clk_rate_trace_test_portal-y := mali_kutf_clk_rate_trace_test.o -diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kconfig b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kconfig -new file mode 100755 -index 000000000000..8196e4cc6b37 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kconfig -@@ -0,0 +1,30 @@ -+# -+# (C) COPYRIGHT 2020 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, you can access it online at -+# http://www.gnu.org/licenses/gpl-2.0.html. -+# -+# SPDX-License-Identifier: GPL-2.0 -+# -+# -+ -+config CONFIG_MALI_CLK_RATE_TRACE_PORTAL -+ tristate "Mali GPU Clock Trace Test portal" -+ depends on MALI_BIFROST && MALI_BIFROST_DEBUG && MALI_KUTF -+ default m -+ help -+ This option will build a test module mali_kutf_clk_rate_trace_test_portal -+ that can test the clocks integration into the platform and exercise some -+ basic trace test in the system. Choosing M here will generate a single -+ module called mali_kutf_clk_rate_trace_test_portal. -diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Makefile b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Makefile -new file mode 100755 -index 000000000000..71c78b84830c ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Makefile -@@ -0,0 +1,57 @@ +@@ -0,0 +1,25 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -251621,100 +292083,77 @@ index 000000000000..71c78b84830c +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+ifneq ($(KERNELRELEASE),) ++ifeq ($(CONFIG_MALI_KUTF_CLK_RATE_TRACE),y) ++obj-m += mali_kutf_clk_rate_trace_test_portal.o + -+ccflags-y := \ -+ -DMALI_UNIT_TEST=$(MALI_UNIT_TEST) \ -+ -DMALI_CUSTOMER_RELEASE=$(MALI_CUSTOMER_RELEASE) \ -+ -I$(src)/../../include \ -+ -I$(src)/../../../../../../../include \ -+ -I$(src)/../../../../ \ -+ -I$(src)/../../../ \ -+ -I$(src)/../../../backend/gpu \ -+ -I$(src)/../../../debug \ -+ -I$(src)/../../../debug/backend \ -+ -I$(src)/ \ -+ -I$(srctree)/drivers/staging/android \ -+ -I$(srctree)/include/linux -+ -+obj-m := mali_kutf_clk_rate_trace_test_portal.o +mali_kutf_clk_rate_trace_test_portal-y := mali_kutf_clk_rate_trace_test.o -+ -+else -+# linux build system bootstrap for out-of-tree module -+ -+# default to building for the host -+ARCH ?= $(shell uname -m) -+ -+ifeq ($(KDIR),) -+$(error Must specify KDIR to point to the kernel to target)) -+endif -+ -+all: -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) KBUILD_EXTRA_SYMBOLS="$(CURDIR)/../../kutf/Module.symvers $(CURDIR)/../../../Module.symvers" modules -+ -+clean: -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean -+ +endif diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp new file mode 100755 -index 000000000000..0cc2904db542 +index 000000000..225ad69c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp -@@ -0,0 +1,34 @@ +@@ -0,0 +1,43 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * ++ * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. + */ + +bob_kernel_module { + name: "mali_kutf_clk_rate_trace_test_portal", + defaults: [ + "mali_kbase_shared_config_defaults", ++ "kernel_test_configs", + "kernel_test_includes", + ], + srcs: [ -+ "../mali_kutf_clk_rate_trace_test.h", -+ "Makefile", ++ "Kbuild", + "mali_kutf_clk_rate_trace_test.c", ++ "../mali_kutf_clk_rate_trace_test.h", + ], + extra_symbols: [ + "mali_kbase", + "kutf", + ], + enabled: false, -+ base_build_kutf: { ++ mali_kutf_clk_rate_trace: { ++ kbuild_options: ["CONFIG_MALI_KUTF_CLK_RATE_TRACE=y"], + enabled: true, -+ kbuild_options: ["CONFIG_MALI_CLK_RATE_TRACE_PORTAL=m"], + }, +} diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c new file mode 100755 -index 000000000000..d74a278bffa7 +index 000000000..a6f54b61d --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c -@@ -0,0 +1,890 @@ +@@ -0,0 +1,965 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -251725,8 +292164,6 @@ index 000000000000..d74a278bffa7 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -251742,9 +292179,9 @@ index 000000000000..d74a278bffa7 +#include +#endif +#include "mali_kbase.h" -+#include "mali_kbase_irq_internal.h" -+#include "mali_kbase_pm_internal.h" -+#include "mali_kbase_clk_rate_trace_mgr.h" ++#include "backend/gpu/mali_kbase_irq_internal.h" ++#include "backend/gpu/mali_kbase_pm_internal.h" ++#include "backend/gpu/mali_kbase_clk_rate_trace_mgr.h" + +#include +#include @@ -251756,7 +292193,7 @@ index 000000000000..d74a278bffa7 +#define MINOR_FOR_FIRST_KBASE_DEV (-1) + +/* KUTF test application pointer for this test */ -+struct kutf_application *kutf_app; ++static struct kutf_application *kutf_app; + +enum portal_server_state { + PORTAL_STATE_NO_CLK, @@ -251823,21 +292260,22 @@ index 000000000000..d74a278bffa7 + const char *name; +}; + -+struct kbasep_cmd_name_pair kbasep_portal_cmd_name_map[] = { -+ {PORTAL_CMD_GET_CLK_RATE_MGR, GET_CLK_RATE_MGR}, -+ {PORTAL_CMD_GET_CLK_RATE_TRACE, GET_CLK_RATE_TRACE}, -+ {PORTAL_CMD_GET_TRACE_SNAPSHOT, GET_TRACE_SNAPSHOT}, -+ {PORTAL_CMD_INC_PM_CTX_CNT, INC_PM_CTX_CNT}, -+ {PORTAL_CMD_DEC_PM_CTX_CNT, DEC_PM_CTX_CNT}, -+ {PORTAL_CMD_CLOSE_PORTAL, CLOSE_PORTAL}, -+ {PORTAL_CMD_INVOKE_NOTIFY_42KHZ, INVOKE_NOTIFY_42KHZ}, -+ }; ++static const struct kbasep_cmd_name_pair kbasep_portal_cmd_name_map[] = { ++ { PORTAL_CMD_GET_PLATFORM, GET_PLATFORM }, ++ { PORTAL_CMD_GET_CLK_RATE_MGR, GET_CLK_RATE_MGR }, ++ { PORTAL_CMD_GET_CLK_RATE_TRACE, GET_CLK_RATE_TRACE }, ++ { PORTAL_CMD_GET_TRACE_SNAPSHOT, GET_TRACE_SNAPSHOT }, ++ { PORTAL_CMD_INC_PM_CTX_CNT, INC_PM_CTX_CNT }, ++ { PORTAL_CMD_DEC_PM_CTX_CNT, DEC_PM_CTX_CNT }, ++ { PORTAL_CMD_CLOSE_PORTAL, CLOSE_PORTAL }, ++ { PORTAL_CMD_INVOKE_NOTIFY_42KHZ, INVOKE_NOTIFY_42KHZ }, ++}; + +/* Global pointer for the kutf_portal_trace_write() to use. When + * this pointer is engaged, new requests for create fixture will fail + * hence limiting the use of the portal at any time to a singleton. + */ -+struct kutf_clk_rate_trace_fixture_data *g_ptr_portal_data; ++static struct kutf_clk_rate_trace_fixture_data *g_ptr_portal_data; + +#define PORTAL_MSG_LEN (KUTF_MAX_LINE_LENGTH - MAX_REPLY_NAME_LEN) +static char portal_msg_buf[PORTAL_MSG_LEN]; @@ -251847,8 +292285,16 @@ index 000000000000..d74a278bffa7 + u32 index, u32 new_rate) +{ + struct clk_trace_snapshot *snapshot; -+ struct kutf_clk_rate_trace_fixture_data *data = container_of( -+ listener, struct kutf_clk_rate_trace_fixture_data, listener); ++ struct kutf_clk_rate_trace_fixture_data *data; ++ ++ if (listener == NULL) { ++ pr_err("%s - index: %u, new_rate: %u, listener is NULL\n", ++ __func__, index, new_rate); ++ return; ++ } ++ ++ data = container_of(listener, struct kutf_clk_rate_trace_fixture_data, ++ listener); + + lockdep_assert_held(&data->kbdev->pm.clk_rtm.lock); + @@ -251890,14 +292336,13 @@ index 000000000000..d74a278bffa7 + + if (WARN_ON(data->pm_ctx_cnt > 0)) + return; -+ -+ kbase_pm_context_idle(data->kbdev); +#if !MALI_USE_CSF + kbase_pm_release_gpu_cycle_counter(data->kbdev); +#endif ++ kbase_pm_context_idle(data->kbdev); +} + -+static char const *kutf_clk_trace_do_change_pm_ctx(struct kutf_context *context, ++static const char *kutf_clk_trace_do_change_pm_ctx(struct kutf_context *context, + struct clk_trace_portal_input *cmd) +{ + struct kutf_clk_rate_trace_fixture_data *data = context->fixture; @@ -251934,7 +292379,7 @@ index 000000000000..d74a278bffa7 + return errmsg; +} + -+static char const *kutf_clk_trace_do_get_rate(struct kutf_context *context, ++static const char *kutf_clk_trace_do_get_rate(struct kutf_context *context, + struct clk_trace_portal_input *cmd) +{ + struct kutf_clk_rate_trace_fixture_data *data = context->fixture; @@ -251995,8 +292440,10 @@ index 000000000000..d74a278bffa7 + * current snapshot record, and the start of the next one. The response + * message contains the current snapshot record, with each clock's + * data sequentially placed inside (array marker) [ ]. ++ * ++ * Return: generated string + */ -+static char const *kutf_clk_trace_do_get_snapshot(struct kutf_context *context, ++static const char *kutf_clk_trace_do_get_snapshot(struct kutf_context *context, + struct clk_trace_portal_input *cmd) +{ + struct kutf_clk_rate_trace_fixture_data *data = context->fixture; @@ -252053,8 +292500,10 @@ index 000000000000..d74a278bffa7 + * + * Invokes frequency change notification callbacks with a fake + * GPU frequency 42 kHz for the top clock domain. ++ * ++ * Return: generated string + */ -+static char const *kutf_clk_trace_do_invoke_notify_42k( ++static const char *kutf_clk_trace_do_invoke_notify_42k( + struct kutf_context *context, + struct clk_trace_portal_input *cmd) +{ @@ -252094,7 +292543,7 @@ index 000000000000..d74a278bffa7 + return errmsg; +} + -+static char const *kutf_clk_trace_do_close_portal(struct kutf_context *context, ++static const char *kutf_clk_trace_do_close_portal(struct kutf_context *context, + struct clk_trace_portal_input *cmd) +{ + struct kutf_clk_rate_trace_fixture_data *data = context->fixture; @@ -252118,6 +292567,63 @@ index 000000000000..d74a278bffa7 + return errmsg; +} + ++/** ++ * kutf_clk_trace_do_get_platform() - Gets platform information ++ * @context: KUTF context ++ * @cmd: The decoded portal input request ++ * ++ * Checks the gpu node in the device tree to see if arbitration is enabled ++ * If so determines device tree whether platform is PV or PTM ++ * ++ * Return: A string to indicate the platform (PV/PTM/GPU/UNKNOWN) ++ */ ++static const char *kutf_clk_trace_do_get_platform( ++ struct kutf_context *context, ++ struct clk_trace_portal_input *cmd) ++{ ++ int seq = cmd->cmd_input.u.val_u64 & 0xFF; ++ char const *errmsg = NULL; ++ const void *arbiter_if_node = NULL; ++ const void *power_node = NULL; ++ const char *platform = "GPU"; ++#if defined(CONFIG_MALI_ARBITER_SUPPORT) && defined(CONFIG_OF) ++ struct kutf_clk_rate_trace_fixture_data *data = context->fixture; ++ ++ arbiter_if_node = ++ of_get_property(data->kbdev->dev->of_node, "arbiter_if", NULL); ++#endif ++ if (arbiter_if_node) { ++ power_node = of_find_compatible_node(NULL, NULL, ++ "arm,mali-gpu-power"); ++ if (power_node) { ++ platform = "PV"; ++ } else { ++ power_node = of_find_compatible_node(NULL, NULL, ++ "arm,mali-ptm"); ++ if (power_node) ++ platform = "PTM"; ++ else ++ platform = "UNKNOWN"; ++ } ++ } else { ++ platform = "GPU"; ++ } ++ ++ pr_debug("%s - platform is %s\n", __func__, platform); ++ snprintf(portal_msg_buf, PORTAL_MSG_LEN, ++ "{SEQ:%d, PLATFORM:%s}", seq, platform); ++ ++ WARN_ON(cmd->portal_cmd != PORTAL_CMD_GET_PLATFORM); ++ ++ if (kutf_helper_send_named_str(context, "ACK", portal_msg_buf)) { ++ pr_warn("Error in sending ack for " CLOSE_PORTAL "reuquest\n"); ++ errmsg = kutf_dsprintf(&context->fixture_pool, ++ "Error in sending ack for " GET_PLATFORM "request"); ++ } ++ ++ return errmsg; ++} ++ +static bool kutf_clk_trace_dequeue_portal_cmd(struct kutf_context *context, + struct clk_trace_portal_input *cmd) +{ @@ -252171,8 +292677,11 @@ index 000000000000..d74a278bffa7 + WARN_ON(cmd->portal_cmd == PORTAL_CMD_INVALID); + + switch (cmd->portal_cmd) { ++ case PORTAL_CMD_GET_PLATFORM: ++ errmsg = kutf_clk_trace_do_get_platform(context, cmd); ++ break; + case PORTAL_CMD_GET_CLK_RATE_MGR: -+ /* Fall through */ ++ fallthrough; + case PORTAL_CMD_GET_CLK_RATE_TRACE: + errmsg = kutf_clk_trace_do_get_rate(context, cmd); + break; @@ -252180,7 +292689,7 @@ index 000000000000..d74a278bffa7 + errmsg = kutf_clk_trace_do_get_snapshot(context, cmd); + break; + case PORTAL_CMD_INC_PM_CTX_CNT: -+ /* Fall through */ ++ fallthrough; + case PORTAL_CMD_DEC_PM_CTX_CNT: + errmsg = kutf_clk_trace_do_change_pm_ctx(context, cmd); + break; @@ -252212,6 +292721,8 @@ index 000000000000..d74a278bffa7 + * + * This function deal with an erroneous input request, and respond with + * a proper 'NACK' message. ++ * ++ * Return: 0 on success, non-zero on failure + */ +static int kutf_clk_trace_do_nack_response(struct kutf_context *context, + struct clk_trace_portal_input *cmd) @@ -252255,7 +292766,7 @@ index 000000000000..d74a278bffa7 + * 3). If the GPU active transition occurs following 2), there + * must be rate change event from tracing. + */ -+void kutf_clk_trace_barebone_check(struct kutf_context *context) ++static void kutf_clk_trace_barebone_check(struct kutf_context *context) +{ + struct kutf_clk_rate_trace_fixture_data *data = context->fixture; + struct kbase_device *kbdev = data->kbdev; @@ -252323,7 +292834,7 @@ index 000000000000..d74a278bffa7 + kutf_clk_trace_flag_result(context, KUTF_RESULT_FAIL, msg); + else if (!data->total_update_cnt) { + msg = kutf_dsprintf(&context->fixture_pool, -+ "No trace update seen during the test!"); ++ "No trace update seen during the test!"); + kutf_clk_trace_flag_result(context, KUTF_RESULT_WARN, msg); + } +} @@ -252333,7 +292844,7 @@ index 000000000000..d74a278bffa7 + return (cmd->named_val_err == -EBUSY); +} + -+void kutf_clk_trace_no_clks_dummy(struct kutf_context *context) ++static void kutf_clk_trace_no_clks_dummy(struct kutf_context *context) +{ + struct clk_trace_portal_input cmd; + unsigned long timeout = jiffies + HZ * 2; @@ -252461,14 +292972,14 @@ index 000000000000..d74a278bffa7 + if (!data) + return NULL; + -+ *data = (const struct kutf_clk_rate_trace_fixture_data) { 0 }; ++ memset(data, 0, sizeof(*data)); + pr_debug("Hooking up the test portal to kbdev clk rate trace\n"); + spin_lock(&kbdev->pm.clk_rtm.lock); + + if (g_ptr_portal_data != NULL) { + pr_warn("Test portal is already in use, run aborted\n"); -+ kutf_test_fail(context, "Portal allows single session only"); + spin_unlock(&kbdev->pm.clk_rtm.lock); ++ kutf_test_fail(context, "Portal allows single session only"); + return NULL; + } + @@ -252513,8 +293024,8 @@ index 000000000000..d74a278bffa7 +} + +/** -+ * Destroy fixture data previously created by -+ * mali_kutf_clk_rate_trace_create_fixture. ++ * mali_kutf_clk_rate_trace_remove_fixture - Destroy fixture data previously created by ++ * mali_kutf_clk_rate_trace_create_fixture. + * + * @context: KUTF context. + */ @@ -252538,12 +293049,14 @@ index 000000000000..d74a278bffa7 + +/** + * mali_kutf_clk_rate_trace_test_module_init() - Entry point for test mdoule. ++ * ++ * Return: 0 on success, error code otherwise + */ -+int mali_kutf_clk_rate_trace_test_module_init(void) ++static int __init mali_kutf_clk_rate_trace_test_module_init(void) +{ + struct kutf_suite *suite; + unsigned int filters; -+ union kutf_callback_data suite_data = { 0 }; ++ union kutf_callback_data suite_data = { NULL }; + + pr_debug("Creating app\n"); + @@ -252585,7 +293098,7 @@ index 000000000000..d74a278bffa7 + * mali_kutf_clk_rate_trace_test_module_exit() - Module exit point for this + * test. + */ -+void mali_kutf_clk_rate_trace_test_module_exit(void) ++static void __exit mali_kutf_clk_rate_trace_test_module_exit(void) +{ + pr_debug("Exit start\n"); + kutf_destroy_application(kutf_app); @@ -252599,18 +293112,19 @@ index 000000000000..d74a278bffa7 +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h new file mode 100755 -index 000000000000..f46afd5086bd +index 000000000..a716b9f70 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h -@@ -0,0 +1,148 @@ +@@ -0,0 +1,154 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -252621,8 +293135,6 @@ index 000000000000..f46afd5086bd + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#ifndef _KUTF_CLK_RATE_TRACE_TEST_H_ @@ -252636,6 +293148,8 @@ index 000000000000..f46afd5086bd + * enum kbasep_clk_rate_trace_req - request command to the clock rate trace + * service portal. + * ++ * @PORTAL_CMD_GET_PLATFORM: Request the platform that the tests are ++ * to be run on. + * @PORTAL_CMD_GET_CLK_RATE_MGR: Request the clock trace manager internal + * data record. On a positive acknowledgement + * the prevailing clock rates and the GPU idle @@ -252679,6 +293193,7 @@ index 000000000000..f46afd5086bd + */ +/* PORTAL_CMD_INVALID must be the last one, serving the size */ +enum kbasep_clk_rate_trace_req { ++ PORTAL_CMD_GET_PLATFORM, + PORTAL_CMD_GET_CLK_RATE_MGR, + PORTAL_CMD_GET_CLK_RATE_TRACE, + PORTAL_CMD_GET_TRACE_SNAPSHOT, @@ -252691,8 +293206,10 @@ index 000000000000..f46afd5086bd +}; + +/** -+ * Portal service request command names. The portal request consists of a kutf -+ * named u64-value. For those above enumerated PORTAL_CMD, the names defined ++ * DOC: Portal service request command names. ++ * ++ * The portal request consists of a kutf named u64-value. ++ * For those above enumerated PORTAL_CMD, the names defined + * here are used to mark the name and then followed with a sequence number + * value. Example (manual script here for illustration): + * exec 5<>run # open the portal kutf run as fd-5 @@ -252727,6 +293244,7 @@ index 000000000000..f46afd5086bd + * Note, at the close, PM_CTX_CNT is 1. The PM_CTX_CNT will internally be + * dropped down to 0 as part of the portal close clean up. + */ ++#define GET_PLATFORM "GET_PLATFORM" +#define GET_CLK_RATE_MGR "GET_CLK_RATE_MGR" +#define GET_CLK_RATE_TRACE "GET_CLK_RATE_TRACE" +#define GET_TRACE_SNAPSHOT "GET_TRACE_SNAPSHOT" @@ -252736,9 +293254,10 @@ index 000000000000..f46afd5086bd +#define INVOKE_NOTIFY_42KHZ "INVOKE_NOTIFY_42KHZ" + +/** -+ * Portal service response tag names. The response consists of a kutf -+ * named string-value. In case of a 'NACK' (negative acknowledgement), it -+ * can be one of the two formats: ++ * DOC: Portal service response tag names. ++ * ++ * The response consists of a kutf named string-value. ++ * In case of a 'NACK' (negative acknowledgment), it can be one of the two formats: + * 1. NACK="{SEQ:2, MSG:xyzed}" # NACK on command with sequence tag-2. + * Note, the portal has received a valid name and valid sequence number + * but can't carry-out the request, reason in the MSG field. @@ -252753,17 +293272,18 @@ index 000000000000..f46afd5086bd +#endif /* _KUTF_CLK_RATE_TRACE_TEST_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild new file mode 100755 -index 000000000000..ca8c51273b4c +index 000000000..213d6d5ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild -@@ -0,0 +1,26 @@ +@@ -0,0 +1,25 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# -+# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++# (C) COPYRIGHT 2017, 2020-2021 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the +# GNU General Public License version 2 as published by the Free Software +# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. ++# of such GNU license. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -252774,125 +293294,37 @@ index 000000000000..ca8c51273b4c +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# -+# SPDX-License-Identifier: GPL-2.0 -+# +# + -+ccflags-y += -I$(src)/../include -I$(src)/../../../ -I$(src)/../../ -I$(src)/../../backend/gpu -I$(srctree)/drivers/staging/android -+ -+obj-$(CONFIG_MALI_IRQ_LATENCY) += mali_kutf_irq_test.o ++ifeq ($(CONFIG_MALI_KUTF_IRQ_TEST),y) ++obj-m += mali_kutf_irq_test.o + +mali_kutf_irq_test-y := mali_kutf_irq_test_main.o -diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kconfig b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kconfig -new file mode 100755 -index 000000000000..78283307713d ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kconfig -@@ -0,0 +1,29 @@ -+# -+# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, you can access it online at -+# http://www.gnu.org/licenses/gpl-2.0.html. -+# -+# SPDX-License-Identifier: GPL-2.0 -+# -+# -+ -+config MALI_IRQ_LATENCY -+ tristate "Mali GPU IRQ latency measurement" -+ depends on MALI_BIFROST && MALI_BIFROST_DEBUG && MALI_KUTF -+ default m -+ help -+ This option will build a test module mali_kutf_irq_test that -+ can determine the latency of the Mali GPU IRQ on your system. -+ Choosing M here will generate a single module called mali_kutf_irq_test. -diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Makefile b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Makefile -new file mode 100755 -index 000000000000..bc4d654a90ca ---- /dev/null -+++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Makefile -@@ -0,0 +1,51 @@ -+# -+# (C) COPYRIGHT 2015, 2017-2018, 2020 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, you can access it online at -+# http://www.gnu.org/licenses/gpl-2.0.html. -+# -+# SPDX-License-Identifier: GPL-2.0 -+# -+# -+ -+# linux build system bootstrap for out-of-tree module -+ -+# default to building for the host -+ARCH ?= $(shell uname -m) -+ -+ifeq ($(KDIR),) -+$(error Must specify KDIR to point to the kernel to target)) +endif -+ -+TEST_CCFLAGS := \ -+ -DMALI_UNIT_TEST=$(MALI_UNIT_TEST) \ -+ -DMALI_CUSTOMER_RELEASE=$(MALI_CUSTOMER_RELEASE) \ -+ -DMALI_USE_CSF=$(MALI_USE_CSF) \ -+ $(SCONS_CFLAGS) \ -+ -I$(CURDIR)/../include \ -+ -I$(CURDIR)/../../../../../../include \ -+ -I$(CURDIR)/../../../ \ -+ -I$(CURDIR)/../../ \ -+ -I$(CURDIR)/../../backend/gpu \ -+ -I$(CURDIR)/../../debug \ -+ -I$(CURDIR)/../../debug/backend \ -+ -I$(CURDIR)/ \ -+ -I$(srctree)/drivers/staging/android \ -+ -I$(srctree)/include/linux -+ -+all: -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) $(SCONS_CONFIGS) EXTRA_CFLAGS="$(TEST_CCFLAGS)" KBUILD_EXTRA_SYMBOLS="$(CURDIR)/../kutf/Module.symvers $(CURDIR)/../../Module.symvers" modules -+ -+clean: -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp new file mode 100755 -index 000000000000..90efdcf9ad9c +index 000000000..155875b9d --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp -@@ -0,0 +1,35 @@ +@@ -0,0 +1,42 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2018-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2018-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. + * + */ + @@ -252900,6 +293332,7 @@ index 000000000000..90efdcf9ad9c + name: "mali_kutf_irq_test", + defaults: [ + "mali_kbase_shared_config_defaults", ++ "kernel_test_configs", + "kernel_test_includes", + ], + srcs: [ @@ -252911,25 +293344,26 @@ index 000000000000..90efdcf9ad9c + "kutf", + ], + enabled: false, -+ base_build_kutf: { ++ mali_kutf_irq_test: { ++ kbuild_options: ["CONFIG_MALI_KUTF_IRQ_TEST=y"], + enabled: true, -+ kbuild_options: ["CONFIG_MALI_IRQ_LATENCY=m"], + }, +} diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c new file mode 100755 -index 000000000000..5f27c3a7e9b2 +index 000000000..f2a014d9b --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c -@@ -0,0 +1,278 @@ +@@ -0,0 +1,283 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2016-2018, 2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2016-2018, 2020-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -252940,8 +293374,6 @@ index 000000000000..5f27c3a7e9b2 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include @@ -252949,8 +293381,9 @@ index 000000000000..5f27c3a7e9b2 +#include + +#include "mali_kbase.h" -+#include -+#include ++#include ++#include ++#include + +#include +#include @@ -252964,10 +293397,10 @@ index 000000000000..5f27c3a7e9b2 + */ + +/* KUTF test application pointer for this test */ -+struct kutf_application *irq_app; ++static struct kutf_application *irq_app; + +/** -+ * struct kutf_irq_fixture data - test fixture used by the test functions. ++ * struct kutf_irq_fixture_data - test fixture used by the test functions. + * @kbdev: kbase device for the GPU. + * + */ @@ -252975,8 +293408,6 @@ index 000000000000..5f27c3a7e9b2 + struct kbase_device *kbdev; +}; + -+#define SEC_TO_NANO(s) ((s)*1000000000LL) -+ +/* ID for the GPU IRQ */ +#define GPU_IRQ_HANDLER 2 + @@ -253136,6 +293567,11 @@ index 000000000000..5f27c3a7e9b2 + average_time += irq_time - start_time; + + udelay(10); ++ /* Sleep for a ms, every 10000 iterations, to avoid misleading warning ++ * of CPU softlockup when all GPU IRQs keep going to the same CPU. ++ */ ++ if (!(i % 10000)) ++ msleep(1); + } + + /* Go back to default handler */ @@ -253158,15 +293594,17 @@ index 000000000000..5f27c3a7e9b2 +} + +/** -+ * Module entry point for this test. ++ * mali_kutf_irq_test_main_init - Module entry point for this test. ++ * ++ * Return: 0 on success, error code otherwise + */ -+int mali_kutf_irq_test_main_init(void) ++static int __init mali_kutf_irq_test_main_init(void) +{ + struct kutf_suite *suite; + + irq_app = kutf_create_application("irq"); + -+ if (NULL == irq_app) { ++ if (irq_app == NULL) { + pr_warn("Creation of test application failed!\n"); + return -ENOMEM; + } @@ -253175,7 +293613,7 @@ index 000000000000..5f27c3a7e9b2 + 1, mali_kutf_irq_default_create_fixture, + mali_kutf_irq_default_remove_fixture); + -+ if (NULL == suite) { ++ if (suite == NULL) { + pr_warn("Creation of test suite failed!\n"); + kutf_destroy_application(irq_app); + return -ENOMEM; @@ -253187,9 +293625,9 @@ index 000000000000..5f27c3a7e9b2 +} + +/** -+ * Module exit point for this test. ++ * mali_kutf_irq_test_main_exit - Module exit point for this test. + */ -+void mali_kutf_irq_test_main_exit(void) ++static void __exit mali_kutf_irq_test_main_exit(void) +{ + kutf_destroy_application(irq_app); +} @@ -253200,20 +293638,52 @@ index 000000000000..5f27c3a7e9b2 +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("ARM Ltd."); +MODULE_VERSION("1.0"); -diff --git a/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c b/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c -new file mode 100755 -index 000000000000..cd90ea0ec285 +diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/Kbuild b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/Kbuild +new file mode 100644 +index 000000000..e9bff98b8 --- /dev/null -+++ b/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c -@@ -0,0 +1,368 @@ ++++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/Kbuild +@@ -0,0 +1,25 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++# ++# (C) COPYRIGHT 2022 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU license. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, you can access it online at ++# http://www.gnu.org/licenses/gpl-2.0.html. ++# ++# ++ ++ifeq ($(CONFIG_MALI_KUTF_MGM_INTEGRATION_TEST),y) ++obj-m += mali_kutf_mgm_integration_test.o ++ ++mali_kutf_mgm_integration_test-y := mali_kutf_mgm_integration_test_main.o ++endif +diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/build.bp b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/build.bp +new file mode 100644 +index 000000000..8b995f8a0 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/build.bp +@@ -0,0 +1,41 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -253224,9 +293694,278 @@ index 000000000000..cd90ea0ec285 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 ++ */ ++bob_kernel_module { ++ name: "mali_kutf_mgm_integration_test", ++ defaults: [ ++ "mali_kbase_shared_config_defaults", ++ "kernel_test_configs", ++ "kernel_test_includes", ++ ], ++ srcs: [ ++ "Kbuild", ++ "mali_kutf_mgm_integration_test_main.c", ++ ], ++ extra_symbols: [ ++ "mali_kbase", ++ "kutf", ++ ], ++ enabled: false, ++ mali_kutf_mgm_integration_test: { ++ kbuild_options: ["CONFIG_MALI_KUTF_MGM_INTEGRATION_TEST=y"], ++ enabled: true, ++ }, ++} +diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/mali_kutf_mgm_integration_test_main.c b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/mali_kutf_mgm_integration_test_main.c +new file mode 100644 +index 000000000..5a42bd675 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/mali_kutf_mgm_integration_test_main.c +@@ -0,0 +1,210 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++/* ++ * ++ * (C) COPYRIGHT 2022 ARM Limited. All rights reserved. + * -+ *//* ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, you can access it online at ++ * http://www.gnu.org/licenses/gpl-2.0.html. ++ * ++ */ ++#include ++#include "mali_kbase.h" ++#include ++#include ++#include ++#include ++ ++#define MINOR_FOR_FIRST_KBASE_DEV (-1) ++ ++#define BASE_MEM_GROUP_COUNT (16) ++#define PA_MAX ((1ULL << 48) - 1) ++#define PA_START_BIT 12 ++#define ENTRY_ACCESS_BIT (1ULL << 10) ++ ++#define ENTRY_IS_ATE_L3 3ULL ++#define ENTRY_IS_ATE_L02 1ULL ++ ++#define MGM_INTEGRATION_SUITE_NAME "mgm_integration" ++#define MGM_INTEGRATION_PTE_TRANSLATION "pte_translation" ++ ++static char msg_buf[KUTF_MAX_LINE_LENGTH]; ++ ++/* KUTF test application pointer for this test */ ++struct kutf_application *mgm_app; ++ ++/** ++ * struct kutf_mgm_fixture_data - test fixture used by test functions ++ * @kbdev: kbase device for the GPU. ++ * @group_id: Memory group ID to test based on fixture index. ++ */ ++struct kutf_mgm_fixture_data { ++ struct kbase_device *kbdev; ++ int group_id; ++}; ++ ++/** ++ * mali_kutf_mgm_pte_translation_test() - Tests forward and reverse translation ++ * of PTE by the MGM module ++ * @context: KUTF context within which to perform the test. ++ * ++ * This test creates PTEs with physical addresses in the range ++ * 0x0000-0xFFFFFFFFF000 and tests that mgm_update_gpu_pte() returns a different ++ * PTE and mgm_pte_to_original_pte() returns the original PTE. This is tested ++ * at MMU level 2 and 3 as mgm_update_gpu_pte() is called for ATEs only. ++ * ++ * This test is run for a specific group_id depending on the fixture_id. ++ */ ++static void mali_kutf_mgm_pte_translation_test(struct kutf_context *context) ++{ ++ struct kutf_mgm_fixture_data *data = context->fixture; ++ struct kbase_device *kbdev = data->kbdev; ++ struct memory_group_manager_device *mgm_dev = kbdev->mgm_dev; ++ u64 addr; ++ ++ for (addr = 1 << (PA_START_BIT - 1); addr <= PA_MAX; addr <<= 1) { ++ /* Mask 1 << 11 by ~0xFFF to get 0x0000 at first iteration */ ++ phys_addr_t pa = addr; ++ u8 mmu_level; ++ ++ /* Test MMU level 3 and 2 (2MB pages) only */ ++ for (mmu_level = MIDGARD_MMU_LEVEL(2); mmu_level <= MIDGARD_MMU_LEVEL(3); ++ mmu_level++) { ++ u64 translated_pte; ++ u64 returned_pte; ++ u64 original_pte; ++ ++ if (mmu_level == MIDGARD_MMU_LEVEL(3)) ++ original_pte = ++ (pa & PAGE_MASK) | ENTRY_ACCESS_BIT | ENTRY_IS_ATE_L3; ++ else ++ original_pte = ++ (pa & PAGE_MASK) | ENTRY_ACCESS_BIT | ENTRY_IS_ATE_L02; ++ ++ dev_dbg(kbdev->dev, "Testing group_id=%u, mmu_level=%u, pte=0x%llx\n", ++ data->group_id, mmu_level, original_pte); ++ ++ translated_pte = mgm_dev->ops.mgm_update_gpu_pte(mgm_dev, data->group_id, ++ mmu_level, original_pte); ++ if (translated_pte == original_pte) { ++ snprintf( ++ msg_buf, sizeof(msg_buf), ++ "PTE unchanged. translated_pte (0x%llx) == original_pte (0x%llx) for mmu_level=%u, group_id=%d", ++ translated_pte, original_pte, mmu_level, data->group_id); ++ kutf_test_fail(context, msg_buf); ++ return; ++ } ++ ++ returned_pte = mgm_dev->ops.mgm_pte_to_original_pte( ++ mgm_dev, data->group_id, mmu_level, translated_pte); ++ dev_dbg(kbdev->dev, "\treturned_pte=%llx\n", returned_pte); ++ ++ if (returned_pte != original_pte) { ++ snprintf( ++ msg_buf, sizeof(msg_buf), ++ "Original PTE not returned. returned_pte (0x%llx) != origin al_pte (0x%llx) for mmu_level=%u, group_id=%d", ++ returned_pte, original_pte, mmu_level, data->group_id); ++ kutf_test_fail(context, msg_buf); ++ return; ++ } ++ } ++ } ++ snprintf(msg_buf, sizeof(msg_buf), "Translation passed for group_id=%d", data->group_id); ++ kutf_test_pass(context, msg_buf); ++} ++ ++/** ++ * mali_kutf_mgm_integration_create_fixture() - Creates the fixture data ++ * required for all tests in the mgm integration suite. ++ * @context: KUTF context. ++ * ++ * Return: Fixture data created on success or NULL on failure ++ */ ++static void *mali_kutf_mgm_integration_create_fixture(struct kutf_context *context) ++{ ++ struct kutf_mgm_fixture_data *data; ++ struct kbase_device *kbdev; ++ ++ pr_debug("Finding kbase device\n"); ++ kbdev = kbase_find_device(MINOR_FOR_FIRST_KBASE_DEV); ++ if (kbdev == NULL) { ++ kutf_test_fail(context, "Failed to find kbase device"); ++ return NULL; ++ } ++ pr_debug("Creating fixture\n"); ++ ++ data = kutf_mempool_alloc(&context->fixture_pool, sizeof(struct kutf_mgm_fixture_data)); ++ if (!data) ++ return NULL; ++ data->kbdev = kbdev; ++ data->group_id = context->fixture_index; ++ ++ pr_debug("Fixture created\n"); ++ return data; ++} ++ ++/** ++ * mali_kutf_mgm_integration_remove_fixture() - Destroy fixture data previously ++ * created by mali_kutf_mgm_integration_create_fixture. ++ * @context: KUTF context. ++ */ ++static void mali_kutf_mgm_integration_remove_fixture(struct kutf_context *context) ++{ ++ struct kutf_mgm_fixture_data *data = context->fixture; ++ struct kbase_device *kbdev = data->kbdev; ++ ++ kbase_release_device(kbdev); ++} ++ ++/** ++ * mali_kutf_mgm_integration_test_main_init() - Module entry point for this test. ++ * ++ * Return: 0 on success, error code on failure. ++ */ ++static int __init mali_kutf_mgm_integration_test_main_init(void) ++{ ++ struct kutf_suite *suite; ++ ++ mgm_app = kutf_create_application("mgm"); ++ ++ if (mgm_app == NULL) { ++ pr_warn("Creation of mgm KUTF app failed!\n"); ++ return -ENOMEM; ++ } ++ suite = kutf_create_suite(mgm_app, MGM_INTEGRATION_SUITE_NAME, BASE_MEM_GROUP_COUNT, ++ mali_kutf_mgm_integration_create_fixture, ++ mali_kutf_mgm_integration_remove_fixture); ++ if (suite == NULL) { ++ pr_warn("Creation of %s suite failed!\n", MGM_INTEGRATION_SUITE_NAME); ++ kutf_destroy_application(mgm_app); ++ return -ENOMEM; ++ } ++ kutf_add_test(suite, 0x0, MGM_INTEGRATION_PTE_TRANSLATION, ++ mali_kutf_mgm_pte_translation_test); ++ return 0; ++} ++ ++/** ++ * mali_kutf_mgm_integration_test_main_exit() - Module exit point for this test. ++ */ ++static void __exit mali_kutf_mgm_integration_test_main_exit(void) ++{ ++ kutf_destroy_application(mgm_app); ++} ++ ++module_init(mali_kutf_mgm_integration_test_main_init); ++module_exit(mali_kutf_mgm_integration_test_main_exit); ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("ARM Ltd."); ++MODULE_VERSION("1.0"); +diff --git a/drivers/gpu/arm/bifrost/thirdparty/Kbuild b/drivers/gpu/arm/bifrost/thirdparty/Kbuild +new file mode 100644 +index 000000000..558be077d +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/thirdparty/Kbuild +@@ -0,0 +1,21 @@ ++# SPDX-License-Identifier: GPL-2.0 ++# ++# (C) COPYRIGHT 2021 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU license. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, you can access it online at ++# http://www.gnu.org/licenses/gpl-2.0.html. ++# ++# ++ ++bifrost_kbase-y += thirdparty/mali_kbase_mmap.o +diff --git a/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c b/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c +new file mode 100755 +index 000000000..1e636b9a7 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c +@@ -0,0 +1,420 @@ ++/* + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms @@ -253238,7 +293977,8 @@ index 000000000000..cd90ea0ec285 + */ + +#include "linux/mman.h" -+#include "../mali_kbase.h" ++#include ++#include + +/* mali_kbase_mmap.c + * @@ -253318,7 +294058,6 @@ index 000000000000..cd90ea0ec285 + if ((*gap_end < info->low_limit) || (*gap_end < gap_start)) + return false; + -+ + return true; +} + @@ -253355,11 +294094,12 @@ index 000000000000..cd90ea0ec285 + * + * Return: address of the found gap end (high limit) if area is found; + * -ENOMEM if search is unsuccessful -+*/ ++ */ + +static unsigned long kbase_unmapped_area_topdown(struct vm_unmapped_area_info + *info, bool is_shader_code, bool is_same_4gb_page) +{ ++#if (KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE) + struct mm_struct *mm = current->mm; + struct vm_area_struct *vma; + unsigned long length, low_limit, high_limit, gap_start, gap_end; @@ -253417,7 +294157,8 @@ index 000000000000..cd90ea0ec285 + return -ENOMEM; + if (gap_start <= high_limit && gap_end - gap_start >= length) { + /* We found a suitable gap. Clip it with the original -+ * high_limit. */ ++ * high_limit. ++ */ + if (gap_end > info->high_limit) + gap_end = info->high_limit; + @@ -253452,7 +294193,37 @@ index 000000000000..cd90ea0ec285 + } + } + } ++#else ++ unsigned long length, high_limit, gap_start, gap_end; + ++ MA_STATE(mas, ¤t->mm->mm_mt, 0, 0); ++ /* Adjust search length to account for worst case alignment overhead */ ++ length = info->length + info->align_mask; ++ if (length < info->length) ++ return -ENOMEM; ++ ++ /* ++ * Adjust search limits by the desired length. ++ * See implementation comment at top of unmapped_area(). ++ */ ++ gap_end = info->high_limit; ++ if (gap_end < length) ++ return -ENOMEM; ++ high_limit = gap_end - length; ++ ++ if (info->low_limit > high_limit) ++ return -ENOMEM; ++ ++ while (true) { ++ if (mas_empty_area_rev(&mas, info->low_limit, info->high_limit - 1, length)) ++ return -ENOMEM; ++ gap_end = mas.last + 1; ++ gap_start = mas.min; ++ ++ if (align_and_check(&gap_end, gap_start, info, is_shader_code, is_same_4gb_page)) ++ return gap_end; ++ } ++#endif + return -ENOMEM; +} + @@ -253469,8 +294240,13 @@ index 000000000000..cd90ea0ec285 + struct vm_unmapped_area_info info; + unsigned long align_offset = 0; + unsigned long align_mask = 0; ++#if (KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE) ++ unsigned long high_limit = arch_get_mmap_base(addr, mm->mmap_base); ++ unsigned long low_limit = max_t(unsigned long, PAGE_SIZE, kbase_mmap_min_addr); ++#else + unsigned long high_limit = mm->mmap_base; + unsigned long low_limit = PAGE_SIZE; ++#endif + int cpu_va_bits = BITS_PER_LONG; + int gpu_pc_bits = + kctx->kbdev->gpu_props.props.core_props.log2_program_counter_size; @@ -253478,19 +294254,45 @@ index 000000000000..cd90ea0ec285 + bool is_same_4gb_page = false; + unsigned long ret; + ++ /* the 'nolock' form is used here: ++ * - the base_pfn of the SAME_VA zone does not change ++ * - in normal use, va_size_pages is constant once the first allocation ++ * begins ++ * ++ * However, in abnormal use this function could be processing whilst ++ * another new zone is being setup in a different thread (e.g. to ++ * borrow part of the SAME_VA zone). In the worst case, this path may ++ * witness a higher SAME_VA end_pfn than the code setting up the new ++ * zone. ++ * ++ * This is safe because once we reach the main allocation functions, ++ * we'll see the updated SAME_VA end_pfn and will determine that there ++ * is no free region at the address found originally by too large a ++ * same_va_end_addr here, and will fail the allocation gracefully. ++ */ ++ struct kbase_reg_zone *zone = ++ kbase_ctx_reg_zone_get_nolock(kctx, KBASE_REG_ZONE_SAME_VA); ++ u64 same_va_end_addr = kbase_reg_zone_end_pfn(zone) << PAGE_SHIFT; ++#if (KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE) ++ const unsigned long mmap_end = arch_get_mmap_end(addr, len, flags); ++ ++ /* requested length too big for entire address space */ ++ if (len > mmap_end - kbase_mmap_min_addr) ++ return -ENOMEM; ++#endif ++ + /* err on fixed address */ + if ((flags & MAP_FIXED) || addr) + return -EINVAL; + -+#ifdef CONFIG_64BIT ++#if IS_ENABLED(CONFIG_64BIT) + /* too big? */ + if (len > TASK_SIZE - SZ_2M) + return -ENOMEM; + + if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { -+ -+ high_limit = min_t(unsigned long, mm->mmap_base, -+ (kctx->same_va_end << PAGE_SHIFT)); ++ high_limit = ++ min_t(unsigned long, high_limit, same_va_end_addr); + + /* If there's enough (> 33 bits) of GPU VA space, align + * to 2MB boundaries. @@ -253509,41 +294311,45 @@ index 000000000000..cd90ea0ec285 +#endif /* CONFIG_64BIT */ + if ((PFN_DOWN(BASE_MEM_COOKIE_BASE) <= pgoff) && + (PFN_DOWN(BASE_MEM_FIRST_FREE_ADDRESS) > pgoff)) { -+ int cookie = pgoff - PFN_DOWN(BASE_MEM_COOKIE_BASE); -+ struct kbase_va_region *reg; ++ int cookie = pgoff - PFN_DOWN(BASE_MEM_COOKIE_BASE); ++ struct kbase_va_region *reg; + -+ /* Need to hold gpu vm lock when using reg */ -+ kbase_gpu_vm_lock(kctx); -+ reg = kctx->pending_regions[cookie]; -+ if (!reg) { -+ kbase_gpu_vm_unlock(kctx); -+ return -EINVAL; ++ /* Need to hold gpu vm lock when using reg */ ++ kbase_gpu_vm_lock(kctx); ++ reg = kctx->pending_regions[cookie]; ++ if (!reg) { ++ kbase_gpu_vm_unlock(kctx); ++ return -EINVAL; ++ } ++ if (!(reg->flags & KBASE_REG_GPU_NX)) { ++ if (cpu_va_bits > gpu_pc_bits) { ++ align_offset = 1ULL << gpu_pc_bits; ++ align_mask = align_offset - 1; ++ is_shader_code = true; + } -+ if (!(reg->flags & KBASE_REG_GPU_NX)) { -+ if (cpu_va_bits > gpu_pc_bits) { -+ align_offset = 1ULL << gpu_pc_bits; -+ align_mask = align_offset - 1; -+ is_shader_code = true; -+ } +#if !MALI_USE_CSF -+ } else if (reg->flags & KBASE_REG_TILER_ALIGN_TOP) { -+ unsigned long extent_bytes = -+ (unsigned long)(reg->extent << PAGE_SHIFT); -+ /* kbase_check_alloc_sizes() already satisfies -+ * these checks, but they're here to avoid -+ * maintenance hazards due to the assumptions -+ * involved */ -+ WARN_ON(reg->extent > (ULONG_MAX >> PAGE_SHIFT)); -+ WARN_ON(reg->initial_commit > (ULONG_MAX >> PAGE_SHIFT)); -+ WARN_ON(!is_power_of_2(extent_bytes)); -+ align_mask = extent_bytes - 1; -+ align_offset = -+ extent_bytes - (reg->initial_commit << PAGE_SHIFT); ++ } else if (reg->flags & KBASE_REG_TILER_ALIGN_TOP) { ++ unsigned long extension_bytes = ++ (unsigned long)(reg->extension ++ << PAGE_SHIFT); ++ /* kbase_check_alloc_sizes() already satisfies ++ * these checks, but they're here to avoid ++ * maintenance hazards due to the assumptions ++ * involved ++ */ ++ WARN_ON(reg->extension > ++ (ULONG_MAX >> PAGE_SHIFT)); ++ WARN_ON(reg->initial_commit > (ULONG_MAX >> PAGE_SHIFT)); ++ WARN_ON(!is_power_of_2(extension_bytes)); ++ align_mask = extension_bytes - 1; ++ align_offset = ++ extension_bytes - ++ (reg->initial_commit << PAGE_SHIFT); +#endif /* !MALI_USE_CSF */ -+ } else if (reg->flags & KBASE_REG_GPU_VA_SAME_4GB_PAGE) { -+ is_same_4gb_page = true; -+ } -+ kbase_gpu_vm_unlock(kctx); ++ } else if (reg->flags & KBASE_REG_GPU_VA_SAME_4GB_PAGE) { ++ is_same_4gb_page = true; ++ } ++ kbase_gpu_vm_unlock(kctx); +#ifndef CONFIG_64BIT + } else { + return current->mm->get_unmapped_area( @@ -253562,11 +294368,16 @@ index 000000000000..cd90ea0ec285 + is_same_4gb_page); + + if (IS_ERR_VALUE(ret) && high_limit == mm->mmap_base && -+ high_limit < (kctx->same_va_end << PAGE_SHIFT)) { ++ high_limit < same_va_end_addr) { ++#if (KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE) ++ /* Retry above TASK_UNMAPPED_BASE */ ++ info.low_limit = TASK_UNMAPPED_BASE; ++ info.high_limit = min_t(u64, mmap_end, same_va_end_addr); ++#else + /* Retry above mmap_base */ + info.low_limit = mm->mmap_base; -+ info.high_limit = min_t(u64, TASK_SIZE, -+ (kctx->same_va_end << PAGE_SHIFT)); ++ info.high_limit = min_t(u64, TASK_SIZE, same_va_end_addr); ++#endif + + ret = kbase_unmapped_area_topdown(&info, is_shader_code, + is_same_4gb_page); @@ -253574,20 +294385,59 @@ index 000000000000..cd90ea0ec285 + + return ret; +} +diff --git a/drivers/gpu/arm/bifrost/tl/Kbuild b/drivers/gpu/arm/bifrost/tl/Kbuild +new file mode 100644 +index 000000000..1c684d489 +--- /dev/null ++++ b/drivers/gpu/arm/bifrost/tl/Kbuild +@@ -0,0 +1,32 @@ ++# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note ++# ++# (C) COPYRIGHT 2022 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU license. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, you can access it online at ++# http://www.gnu.org/licenses/gpl-2.0.html. ++# ++# ++ ++bifrost_kbase-y += \ ++ tl/mali_kbase_timeline.o \ ++ tl/mali_kbase_timeline_io.o \ ++ tl/mali_kbase_tlstream.o \ ++ tl/mali_kbase_tracepoints.o ++ ++ ++ifeq ($(CONFIG_MALI_CSF_SUPPORT),y) ++ bifrost_kbase-y += tl/backend/mali_kbase_timeline_csf.o ++else ++ bifrost_kbase-y += tl/backend/mali_kbase_timeline_jm.o ++endif diff --git a/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c new file mode 100755 -index 000000000000..abaa6bb12b9d +index 000000000..a6062f170 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c -@@ -0,0 +1,172 @@ +@@ -0,0 +1,190 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -253598,16 +294448,16 @@ index 000000000000..abaa6bb12b9d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include "../mali_kbase_tracepoints.h" -+#include "../mali_kbase_timeline.h" -+#include "../mali_kbase_timeline_priv.h" ++#include ++#include ++#include + +#include + ++#define GPU_FEATURES_CROSS_STREAM_SYNC_MASK (1ull << 3ull) ++ +void kbase_create_timeline_objects(struct kbase_device *kbdev) +{ + unsigned int as_nr; @@ -253616,6 +294466,21 @@ index 000000000000..abaa6bb12b9d + struct kbase_timeline *timeline = kbdev->timeline; + struct kbase_tlstream *summary = + &kbdev->timeline->streams[TL_STREAM_TYPE_OBJ_SUMMARY]; ++ u32 const kbdev_has_cross_stream_sync = ++ (kbdev->gpu_props.props.raw_props.gpu_features & ++ GPU_FEATURES_CROSS_STREAM_SYNC_MASK) ? ++ 1 : ++ 0; ++ u32 const arch_maj = (kbdev->gpu_props.props.raw_props.gpu_id & ++ GPU_ID2_ARCH_MAJOR) >> ++ GPU_ID2_ARCH_MAJOR_SHIFT; ++ u32 const num_sb_entries = arch_maj >= 11 ? 16 : 8; ++ u32 const supports_gpu_sleep = ++#ifdef KBASE_PM_RUNTIME ++ kbdev->pm.backend.gpu_sleep_supported; ++#else ++ false; ++#endif /* KBASE_PM_RUNTIME */ + + /* Summarize the Address Space objects. */ + for (as_nr = 0; as_nr < kbdev->nr_hw_address_spaces; as_nr++) @@ -253634,15 +294499,16 @@ index 000000000000..abaa6bb12b9d + kbdev); + + /* Trace the creation of a new kbase device and set its properties. */ -+ __kbase_tlstream_tl_kbase_new_device(summary, -+ kbdev->gpu_props.props.raw_props.gpu_id, -+ kbdev->gpu_props.num_cores, kbdev->csf.global_iface.group_num, -+ kbdev->nr_hw_address_spaces); ++ __kbase_tlstream_tl_kbase_new_device(summary, kbdev->gpu_props.props.raw_props.gpu_id, ++ kbdev->gpu_props.num_cores, ++ kbdev->csf.global_iface.group_num, ++ kbdev->nr_hw_address_spaces, num_sb_entries, ++ kbdev_has_cross_stream_sync, supports_gpu_sleep); + + /* Lock the context list, to ensure no changes to the list are made + * while we're summarizing the contexts and their contents. + */ -+ mutex_lock(&kbdev->kctx_list_lock); ++ mutex_lock(&timeline->tl_kctx_list_lock); + + /* Hold the scheduler lock while we emit the current state + * We also need to continue holding the lock until after the first body @@ -253657,9 +294523,10 @@ index 000000000000..abaa6bb12b9d + kbdev->csf.scheduler.csg_slots[slot_i].resident_group; + + if (group) -+ __kbase_tlstream_tl_kbase_device_program_csg(summary, ++ __kbase_tlstream_tl_kbase_device_program_csg( ++ summary, + kbdev->gpu_props.props.raw_props.gpu_id, -+ group->handle, slot_i); ++ group->kctx->id, group->handle, slot_i, 0); + } + + /* Reset body stream buffers while holding the kctx lock. @@ -253672,7 +294539,7 @@ index 000000000000..abaa6bb12b9d + mutex_unlock(&kbdev->csf.scheduler.lock); + + /* For each context in the device... */ -+ list_for_each_entry(kctx, &kbdev->kctx_list, kctx_list_link) { ++ list_for_each_entry(kctx, &timeline->tl_kctx_list, tl_kctx_list_node) { + size_t i; + struct kbase_tlstream *body = + &timeline->streams[TL_STREAM_TYPE_OBJ]; @@ -253728,7 +294595,7 @@ index 000000000000..abaa6bb12b9d + + if (kcpu_queue) + __kbase_tlstream_tl_kbase_new_kcpuqueue( -+ body, kcpu_queue, kcpu_queue->kctx->id, ++ body, kcpu_queue, kcpu_queue->id, kcpu_queue->kctx->id, + kcpu_queue->num_pending_cmds); + } + @@ -253742,9 +294609,9 @@ index 000000000000..abaa6bb12b9d + * this iteration of the loop, so will start to correctly update + * the object model state. + */ -+ }; ++ } + -+ mutex_unlock(&kbdev->kctx_list_lock); ++ mutex_unlock(&timeline->tl_kctx_list_lock); + + /* Static object are placed into summary packet that needs to be + * transmitted first. Flush all streams to make it available to @@ -253754,18 +294621,19 @@ index 000000000000..abaa6bb12b9d +} diff --git a/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c new file mode 100755 -index 000000000000..c368ac7288da +index 000000000..9ba89f59f --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c -@@ -0,0 +1,97 @@ +@@ -0,0 +1,96 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -253776,13 +294644,11 @@ index 000000000000..c368ac7288da + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + -+#include "../mali_kbase_tracepoints.h" -+#include "../mali_kbase_timeline.h" -+#include "../mali_kbase_timeline_priv.h" ++#include ++#include ++#include + +#include + @@ -253826,16 +294692,16 @@ index 000000000000..c368ac7288da + /* Lock the context list, to ensure no changes to the list are made + * while we're summarizing the contexts and their contents. + */ -+ mutex_lock(&kbdev->kctx_list_lock); ++ mutex_lock(&timeline->tl_kctx_list_lock); + + /* For each context in the device... */ -+ list_for_each_entry(kctx, &kbdev->kctx_list, kctx_list_link) { ++ list_for_each_entry(kctx, &timeline->tl_kctx_list, tl_kctx_list_node) { + /* Summarize the context itself */ + __kbase_tlstream_tl_new_ctx(summary, + kctx, + kctx->id, + (u32)(kctx->tgid)); -+ }; ++ } + + /* Reset body stream buffers while holding the kctx lock. + * This ensures we can't fire both summary and normal tracepoints for @@ -253847,7 +294713,7 @@ index 000000000000..c368ac7288da + */ + kbase_timeline_streams_body_reset(timeline); + -+ mutex_unlock(&kbdev->kctx_list_lock); ++ mutex_unlock(&timeline->tl_kctx_list_lock); + + /* Static object are placed into summary packet that needs to be + * transmitted first. Flush all streams to make it available to @@ -253855,21 +294721,21 @@ index 000000000000..c368ac7288da + */ + kbase_timeline_streams_flush(timeline); +} -\ No newline at end of file diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c new file mode 100755 -index 000000000000..8d8834fdcda6 +index 000000000..9ed59633c --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c -@@ -0,0 +1,308 @@ +@@ -0,0 +1,412 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2015-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2015-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -253880,8 +294746,6 @@ index 000000000000..8d8834fdcda6 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include "mali_kbase_timeline.h" @@ -253889,9 +294753,6 @@ index 000000000000..8d8834fdcda6 +#include "mali_kbase_tracepoints.h" + +#include -+#include -+ -+#include +#include +#include +#include @@ -253900,7 +294761,7 @@ index 000000000000..8d8834fdcda6 +#include +#include +#include -+ ++#include + +/* The period of autoflush checker execution in milliseconds. */ +#define AUTOFLUSH_INTERVAL 1000 /* ms */ @@ -253980,7 +294841,7 @@ index 000000000000..8d8834fdcda6 + if (!timeline || !timeline_flags) + return -EINVAL; + -+ result = kzalloc(sizeof(*result), GFP_KERNEL); ++ result = vzalloc(sizeof(*result)); + if (!result) + return -ENOMEM; + @@ -253992,6 +294853,10 @@ index 000000000000..8d8834fdcda6 + kbase_tlstream_init(&result->streams[i], i, + &result->event_queue); + ++ /* Initialize the kctx list */ ++ mutex_init(&result->tl_kctx_list_lock); ++ INIT_LIST_HEAD(&result->tl_kctx_list); ++ + /* Initialize autoflush timer. */ + atomic_set(&result->autoflush_timer_active, 0); + kbase_timer_setup(&result->autoflush_timer, @@ -254018,10 +294883,12 @@ index 000000000000..8d8834fdcda6 + kbase_csf_tl_reader_term(&timeline->csf_tl_reader); +#endif + ++ WARN_ON(!list_empty(&timeline->tl_kctx_list)); ++ + for (i = (enum tl_stream_type)0; i < TL_STREAM_TYPE_COUNT; i++) + kbase_tlstream_term(&timeline->streams[i]); + -+ kfree(timeline); ++ vfree(timeline); +} + +#ifdef CONFIG_MALI_BIFROST_DEVFREQ @@ -254036,108 +294903,142 @@ index 000000000000..8d8834fdcda6 + unsigned long cur_freq = 0; + + mutex_lock(&devfreq->lock); -+#if KERNEL_VERSION(4, 3, 0) > LINUX_VERSION_CODE -+ cur_freq = kbdev->current_nominal_freq; -+#else + cur_freq = devfreq->last_status.current_frequency; -+#endif + KBASE_TLSTREAM_AUX_DEVFREQ_TARGET(kbdev, (u64)cur_freq); + mutex_unlock(&devfreq->lock); + } +} +#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ + -+int kbase_timeline_io_acquire(struct kbase_device *kbdev, u32 flags) ++int kbase_timeline_acquire(struct kbase_device *kbdev, u32 flags) +{ -+ int ret; ++ int err = 0; + u32 timeline_flags = TLSTREAM_ENABLED | flags; -+ struct kbase_timeline *timeline = kbdev->timeline; ++ struct kbase_timeline *timeline; ++ int rcode; + -+ if (!atomic_cmpxchg(timeline->timeline_flags, 0, timeline_flags)) { -+ int rcode; ++ if (WARN_ON(!kbdev) || WARN_ON(flags & ~BASE_TLSTREAM_FLAGS_MASK)) ++ return -EINVAL; ++ ++ timeline = kbdev->timeline; ++ if (WARN_ON(!timeline)) ++ return -EFAULT; ++ ++ if (atomic_cmpxchg(timeline->timeline_flags, 0, timeline_flags)) ++ return -EBUSY; + +#if MALI_USE_CSF -+ if (flags & BASE_TLSTREAM_ENABLE_CSFFW_TRACEPOINTS) { -+ ret = kbase_csf_tl_reader_start( -+ &timeline->csf_tl_reader, kbdev); -+ if (ret) -+ { -+ atomic_set(timeline->timeline_flags, 0); -+ return ret; -+ } -+ } -+#endif -+ ret = anon_inode_getfd( -+ "[mali_tlstream]", -+ &kbasep_tlstream_fops, -+ timeline, -+ O_RDONLY | O_CLOEXEC); -+ if (ret < 0) { ++ if (flags & BASE_TLSTREAM_ENABLE_CSFFW_TRACEPOINTS) { ++ err = kbase_csf_tl_reader_start(&timeline->csf_tl_reader, kbdev); ++ if (err) { + atomic_set(timeline->timeline_flags, 0); -+#if MALI_USE_CSF -+ kbase_csf_tl_reader_stop(&timeline->csf_tl_reader); -+#endif -+ return ret; ++ return err; + } ++ } ++#endif + -+ /* Reset and initialize header streams. */ -+ kbase_tlstream_reset( -+ &timeline->streams[TL_STREAM_TYPE_OBJ_SUMMARY]); -+ -+ timeline->obj_header_btc = obj_desc_header_size; -+ timeline->aux_header_btc = aux_desc_header_size; ++ /* Reset and initialize header streams. */ ++ kbase_tlstream_reset(&timeline->streams[TL_STREAM_TYPE_OBJ_SUMMARY]); + -+ /* Start autoflush timer. */ -+ atomic_set(&timeline->autoflush_timer_active, 1); -+ rcode = mod_timer( -+ &timeline->autoflush_timer, -+ jiffies + msecs_to_jiffies(AUTOFLUSH_INTERVAL)); -+ CSTD_UNUSED(rcode); ++ timeline->obj_header_btc = obj_desc_header_size; ++ timeline->aux_header_btc = aux_desc_header_size; + +#if !MALI_USE_CSF -+ /* If job dumping is enabled, readjust the software event's -+ * timeout as the default value of 3 seconds is often -+ * insufficient. -+ */ -+ if (flags & BASE_TLSTREAM_JOB_DUMPING_ENABLED) { -+ dev_info(kbdev->dev, -+ "Job dumping is enabled, readjusting the software event's timeout\n"); -+ atomic_set(&kbdev->js_data.soft_job_timeout_ms, -+ 1800000); -+ } ++ /* If job dumping is enabled, readjust the software event's ++ * timeout as the default value of 3 seconds is often ++ * insufficient. ++ */ ++ if (flags & BASE_TLSTREAM_JOB_DUMPING_ENABLED) { ++ dev_info(kbdev->dev, ++ "Job dumping is enabled, readjusting the software event's timeout\n"); ++ atomic_set(&kbdev->js_data.soft_job_timeout_ms, 1800000); ++ } +#endif /* !MALI_USE_CSF */ + -+ /* Summary stream was cleared during acquire. -+ * Create static timeline objects that will be -+ * read by client. -+ */ -+ kbase_create_timeline_objects(kbdev); ++ /* Summary stream was cleared during acquire. ++ * Create static timeline objects that will be ++ * read by client. ++ */ ++ kbase_create_timeline_objects(kbdev); + +#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+ /* Devfreq target tracepoints are only fired when the target -+ * changes, so we won't know the current target unless we -+ * send it now. -+ */ -+ kbase_tlstream_current_devfreq_target(kbdev); ++ /* Devfreq target tracepoints are only fired when the target ++ * changes, so we won't know the current target unless we ++ * send it now. ++ */ ++ kbase_tlstream_current_devfreq_target(kbdev); +#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ + -+ } else { -+ ret = -EBUSY; -+ } ++ /* Start the autoflush timer. ++ * We must do this after creating timeline objects to ensure we ++ * don't auto-flush the streams which will be reset during the ++ * summarization process. ++ */ ++ atomic_set(&timeline->autoflush_timer_active, 1); ++ rcode = mod_timer(&timeline->autoflush_timer, ++ jiffies + msecs_to_jiffies(AUTOFLUSH_INTERVAL)); ++ CSTD_UNUSED(rcode); + -+ return ret; ++ timeline->last_acquire_time = ktime_get_raw(); ++ ++ return err; +} + -+void kbase_timeline_streams_flush(struct kbase_timeline *timeline) ++void kbase_timeline_release(struct kbase_timeline *timeline) ++{ ++ ktime_t elapsed_time; ++ s64 elapsed_time_ms, time_to_sleep; ++ ++ if (WARN_ON(!timeline) || WARN_ON(!atomic_read(timeline->timeline_flags))) ++ return; ++ ++ /* Get the amount of time passed since the timeline was acquired and ensure ++ * we sleep for long enough such that it has been at least ++ * TIMELINE_HYSTERESIS_TIMEOUT_MS amount of time between acquire and release. ++ * This prevents userspace from spamming acquire and release too quickly. ++ */ ++ elapsed_time = ktime_sub(ktime_get_raw(), timeline->last_acquire_time); ++ elapsed_time_ms = ktime_to_ms(elapsed_time); ++ time_to_sleep = (elapsed_time_ms < 0 ? TIMELINE_HYSTERESIS_TIMEOUT_MS : ++ TIMELINE_HYSTERESIS_TIMEOUT_MS - elapsed_time_ms); ++ if (time_to_sleep > 0) ++ msleep_interruptible(time_to_sleep); ++ ++#if MALI_USE_CSF ++ kbase_csf_tl_reader_stop(&timeline->csf_tl_reader); ++#endif ++ ++ /* Stop autoflush timer before releasing access to streams. */ ++ atomic_set(&timeline->autoflush_timer_active, 0); ++ del_timer_sync(&timeline->autoflush_timer); ++ ++ atomic_set(timeline->timeline_flags, 0); ++} ++ ++int kbase_timeline_streams_flush(struct kbase_timeline *timeline) +{ + enum tl_stream_type stype; ++ bool has_bytes = false; ++ size_t nbytes = 0; ++ ++ if (WARN_ON(!timeline)) ++ return -EINVAL; + +#if MALI_USE_CSF -+ kbase_csf_tl_reader_flush_buffer(&timeline->csf_tl_reader); ++ { ++ int ret = kbase_csf_tl_reader_flush_buffer(&timeline->csf_tl_reader); ++ ++ if (ret > 0) ++ has_bytes = true; ++ } +#endif + -+ for (stype = 0; stype < TL_STREAM_TYPE_COUNT; stype++) -+ kbase_tlstream_flush_stream(&timeline->streams[stype]); ++ for (stype = 0; stype < TL_STREAM_TYPE_COUNT; stype++) { ++ nbytes = kbase_tlstream_flush_stream(&timeline->streams[stype]); ++ if (nbytes > 0) ++ has_bytes = true; ++ } ++ return has_bytes ? 0 : -EIO; +} + +void kbase_timeline_streams_body_reset(struct kbase_timeline *timeline) @@ -254152,6 +295053,74 @@ index 000000000000..8d8834fdcda6 +#endif +} + ++void kbase_timeline_pre_kbase_context_destroy(struct kbase_context *kctx) ++{ ++ struct kbase_device *const kbdev = kctx->kbdev; ++ struct kbase_timeline *timeline = kbdev->timeline; ++ ++ /* Remove the context from the list to ensure we don't try and ++ * summarize a context that is being destroyed. ++ * ++ * It's unsafe to try and summarize a context being destroyed as the ++ * locks we might normally attempt to acquire, and the data structures ++ * we would normally attempt to traverse could already be destroyed. ++ * ++ * In the case where the tlstream is acquired between this pre destroy ++ * call and the post destroy call, we will get a context destroy ++ * tracepoint without the corresponding context create tracepoint, ++ * but this will not affect the correctness of the object model. ++ */ ++ mutex_lock(&timeline->tl_kctx_list_lock); ++ list_del_init(&kctx->tl_kctx_list_node); ++ mutex_unlock(&timeline->tl_kctx_list_lock); ++} ++ ++void kbase_timeline_post_kbase_context_create(struct kbase_context *kctx) ++{ ++ struct kbase_device *const kbdev = kctx->kbdev; ++ struct kbase_timeline *timeline = kbdev->timeline; ++ ++ /* On context create, add the context to the list to ensure it is ++ * summarized when timeline is acquired ++ */ ++ mutex_lock(&timeline->tl_kctx_list_lock); ++ ++ list_add(&kctx->tl_kctx_list_node, &timeline->tl_kctx_list); ++ ++ /* Fire the tracepoints with the lock held to ensure the tracepoints ++ * are either fired before or after the summarization, ++ * never in parallel with it. If fired in parallel, we could get ++ * duplicate creation tracepoints. ++ */ ++#if MALI_USE_CSF ++ KBASE_TLSTREAM_TL_KBASE_NEW_CTX( ++ kbdev, kctx->id, kbdev->gpu_props.props.raw_props.gpu_id); ++#endif ++ /* Trace with the AOM tracepoint even in CSF for dumping */ ++ KBASE_TLSTREAM_TL_NEW_CTX(kbdev, kctx, kctx->id, 0); ++ ++ mutex_unlock(&timeline->tl_kctx_list_lock); ++} ++ ++void kbase_timeline_post_kbase_context_destroy(struct kbase_context *kctx) ++{ ++ struct kbase_device *const kbdev = kctx->kbdev; ++ ++ /* Trace with the AOM tracepoint even in CSF for dumping */ ++ KBASE_TLSTREAM_TL_DEL_CTX(kbdev, kctx); ++#if MALI_USE_CSF ++ KBASE_TLSTREAM_TL_KBASE_DEL_CTX(kbdev, kctx->id); ++#endif ++ ++ /* Flush the timeline stream, so the user can see the termination ++ * tracepoints being fired. ++ * The "if" statement below is for optimization. It is safe to call ++ * kbase_timeline_streams_flush when timeline is disabled. ++ */ ++ if (atomic_read(&kbdev->timeline_flags) != 0) ++ kbase_timeline_streams_flush(kbdev->timeline); ++} ++ +#if MALI_UNIT_TEST +void kbase_timeline_stats(struct kbase_timeline *timeline, + u32 *bytes_collected, u32 *bytes_generated) @@ -254172,18 +295141,19 @@ index 000000000000..8d8834fdcda6 +#endif /* MALI_UNIT_TEST */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h new file mode 100755 -index 000000000000..cd48411b45cf +index 000000000..62be6c64c --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h -@@ -0,0 +1,121 @@ +@@ -0,0 +1,128 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2015-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2015-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -254194,8 +295164,6 @@ index 000000000000..cd48411b45cf + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#if !defined(_KBASE_TIMELINE_H) @@ -254248,44 +295216,44 @@ index 000000000000..cd48411b45cf + * @timeline: Timeline instance + * + * Function will flush pending data in all timeline streams. ++ * ++ * Return: Zero on success, errno on failure. + */ -+void kbase_timeline_streams_flush(struct kbase_timeline *timeline); ++int kbase_timeline_streams_flush(struct kbase_timeline *timeline); + +/** + * kbase_timeline_streams_body_reset - reset timeline body streams. ++ * @timeline: Timeline instance + * + * Function will discard pending data in all timeline body streams. -+ * @timeline: Timeline instance + */ +void kbase_timeline_streams_body_reset(struct kbase_timeline *timeline); + -+#if MALI_UNIT_TEST +/** -+ * kbase_timeline_test - start timeline stream data generator -+ * @kbdev: Kernel common context -+ * @tpw_count: Number of trace point writers in each context -+ * @msg_delay: Time delay in milliseconds between trace points written by one -+ * writer -+ * @msg_count: Number of trace points written by one writer -+ * @aux_msg: If non-zero aux messages will be included ++ * kbase_timeline_post_kbase_context_create - Inform timeline that a new KBase ++ * Context has been created. ++ * @kctx: KBase Context ++ */ ++void kbase_timeline_post_kbase_context_create(struct kbase_context *kctx); ++ ++/** ++ * kbase_timeline_pre_kbase_context_destroy - Inform timeline that a KBase ++ * Context is about to be destroyed. ++ * @kctx: KBase Context ++ */ ++void kbase_timeline_pre_kbase_context_destroy(struct kbase_context *kctx); ++ ++/** ++ * kbase_timeline_post_kbase_context_destroy - Inform timeline that a KBase ++ * Context has been destroyed. ++ * @kctx: KBase Context + * -+ * This test starts a requested number of asynchronous writers in both IRQ and -+ * thread context. Each writer will generate required number of test -+ * tracepoints (tracepoints with embedded information about writer that -+ * should be verified by user space reader). Tracepoints will be emitted in -+ * all timeline body streams. If aux_msg is non-zero writer will also -+ * generate not testable tracepoints (tracepoints without information about -+ * writer). These tracepoints are used to check correctness of remaining -+ * timeline message generating functions. Writer will wait requested time -+ * between generating another set of messages. This call blocks until all -+ * writers finish. ++ * Should be called immediately before the memory is freed, and the context ID ++ * and kbdev pointer should still be valid. + */ -+void kbase_timeline_test( -+ struct kbase_device *kbdev, -+ unsigned int tpw_count, -+ unsigned int msg_delay, -+ unsigned int msg_count, -+ int aux_msg); ++void kbase_timeline_post_kbase_context_destroy(struct kbase_context *kctx); ++ ++#if MALI_UNIT_TEST + +/** + * kbase_timeline_stats - read timeline stream statistics @@ -254296,21 +295264,30 @@ index 000000000000..cd48411b45cf +void kbase_timeline_stats(struct kbase_timeline *timeline, u32 *bytes_collected, u32 *bytes_generated); +#endif /* MALI_UNIT_TEST */ + ++/** ++ * kbase_timeline_io_debugfs_init - Add a debugfs entry for reading timeline stream data ++ * ++ * @kbdev: An instance of the GPU platform device, allocated from the probe ++ * method of the driver. ++ */ ++void kbase_timeline_io_debugfs_init(struct kbase_device *kbdev); ++ +#endif /* _KBASE_TIMELINE_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c new file mode 100755 -index 000000000000..724f5fa23725 +index 000000000..ae570064e --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c -@@ -0,0 +1,362 @@ +@@ -0,0 +1,465 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -254321,35 +295298,86 @@ index 000000000000..724f5fa23725 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include "mali_kbase_timeline_priv.h" +#include "mali_kbase_tlstream.h" +#include "mali_kbase_tracepoints.h" ++#include "mali_kbase_timeline.h" ++ ++#include + +#include ++#include ++#include ++ ++/* Explicitly include epoll header for old kernels. Not required from 4.16. */ ++#if KERNEL_VERSION(4, 16, 0) > LINUX_VERSION_CODE ++#include ++#endif ++ ++static int kbase_unprivileged_global_profiling; ++ ++/** ++ * kbase_unprivileged_global_profiling_set - set permissions for unprivileged processes ++ * ++ * @val: String containing value to set. Only strings representing positive ++ * integers are accepted as valid; any non-positive integer (including 0) ++ * is rejected. ++ * @kp: Module parameter associated with this method. ++ * ++ * This method can only be used to enable permissions for unprivileged processes, ++ * if they are disabled: for this reason, the only values which are accepted are ++ * strings representing positive integers. Since it's impossible to disable ++ * permissions once they're set, any integer which is non-positive is rejected, ++ * including 0. ++ * ++ * Return: 0 if success, otherwise error code. ++ */ ++static int kbase_unprivileged_global_profiling_set(const char *val, const struct kernel_param *kp) ++{ ++ int new_val; ++ int ret = kstrtoint(val, 0, &new_val); ++ ++ if (ret == 0) { ++ if (new_val < 1) ++ return -EINVAL; ++ ++ kbase_unprivileged_global_profiling = 1; ++ } ++ ++ return ret; ++} ++ ++static const struct kernel_param_ops kbase_global_unprivileged_profiling_ops = { ++ .get = param_get_int, ++ .set = kbase_unprivileged_global_profiling_set, ++}; ++ ++module_param_cb(kbase_unprivileged_global_profiling, &kbase_global_unprivileged_profiling_ops, ++ &kbase_unprivileged_global_profiling, 0600); + +/* The timeline stream file operations functions. */ -+static ssize_t kbasep_timeline_io_read( -+ struct file *filp, -+ char __user *buffer, -+ size_t size, -+ loff_t *f_pos); -+static unsigned int kbasep_timeline_io_poll(struct file *filp, poll_table *wait); ++static ssize_t kbasep_timeline_io_read(struct file *filp, char __user *buffer, ++ size_t size, loff_t *f_pos); ++static __poll_t kbasep_timeline_io_poll(struct file *filp, poll_table *wait); +static int kbasep_timeline_io_release(struct inode *inode, struct file *filp); ++static int kbasep_timeline_io_fsync(struct file *filp, loff_t start, loff_t end, ++ int datasync); + -+/* The timeline stream file operations structure. */ -+const struct file_operations kbasep_tlstream_fops = { -+ .owner = THIS_MODULE, -+ .release = kbasep_timeline_io_release, -+ .read = kbasep_timeline_io_read, -+ .poll = kbasep_timeline_io_poll, -+}; ++static bool timeline_is_permitted(void) ++{ ++#if KERNEL_VERSION(5, 8, 0) <= LINUX_VERSION_CODE ++ return kbase_unprivileged_global_profiling || perfmon_capable(); ++#else ++ return kbase_unprivileged_global_profiling || capable(CAP_SYS_ADMIN); ++#endif ++} + +/** -+ * kbasep_timeline_io_packet_pending - check timeline streams for pending packets ++ * kbasep_timeline_io_packet_pending - check timeline streams for pending ++ * packets ++ * + * @timeline: Timeline instance + * @ready_stream: Pointer to variable where stream will be placed + * @rb_idx_raw: Pointer to variable where read buffer index will be placed @@ -254361,10 +295389,10 @@ index 000000000000..724f5fa23725 + * + * Return: non-zero if any of timeline streams has at last one packet ready + */ -+static int kbasep_timeline_io_packet_pending( -+ struct kbase_timeline *timeline, -+ struct kbase_tlstream **ready_stream, -+ unsigned int *rb_idx_raw) ++static int ++kbasep_timeline_io_packet_pending(struct kbase_timeline *timeline, ++ struct kbase_tlstream **ready_stream, ++ unsigned int *rb_idx_raw) +{ + enum tl_stream_type i; + @@ -254383,27 +295411,24 @@ index 000000000000..724f5fa23725 + *ready_stream = stream; + return 1; + } -+ + } + + return 0; +} + +/** -+ * kbasep_timeline_has_header_data() - -+ * check timeline headers for pending packets ++ * kbasep_timeline_has_header_data() - check timeline headers for pending ++ * packets + * + * @timeline: Timeline instance + * + * Return: non-zero if any of timeline headers has at last one packet ready. + */ -+static int kbasep_timeline_has_header_data( -+ struct kbase_timeline *timeline) ++static int kbasep_timeline_has_header_data(struct kbase_timeline *timeline) +{ -+ return timeline->obj_header_btc -+ || timeline->aux_header_btc ++ return timeline->obj_header_btc || timeline->aux_header_btc +#if MALI_USE_CSF -+ || timeline->csf_tl_reader.tl_header.btc ++ || timeline->csf_tl_reader.tl_header.btc +#endif + ; +} @@ -254419,13 +295444,11 @@ index 000000000000..724f5fa23725 + * @hdr_size: Header size. + * @hdr_btc: Pointer to the remaining number of bytes to copy. + * -+ * Returns: 0 if success, -1 otherwise. ++ * Return: 0 if success, -1 otherwise. + */ -+static inline int copy_stream_header( -+ char __user *buffer, size_t size, ssize_t *copy_len, -+ const char *hdr, -+ size_t hdr_size, -+ size_t *hdr_btc) ++static inline int copy_stream_header(char __user *buffer, size_t size, ++ ssize_t *copy_len, const char *hdr, ++ size_t hdr_size, size_t *hdr_btc) +{ + const size_t offset = hdr_size - *hdr_btc; + const size_t copy_size = MIN(size - *copy_len, *hdr_btc); @@ -254446,7 +295469,8 @@ index 000000000000..724f5fa23725 +} + +/** -+ * kbasep_timeline_copy_header - copy timeline headers to the user ++ * kbasep_timeline_copy_headers - copy timeline headers to the user ++ * + * @timeline: Timeline instance + * @buffer: Pointer to the buffer provided by user + * @size: Maximum amount of data that can be stored in the buffer @@ -254457,38 +295481,32 @@ index 000000000000..724f5fa23725 + * to the user, and if so, sends them. copy_len is respectively + * updated. + * -+ * Returns: 0 if success, -1 if copy_to_user has failed. ++ * Return: 0 if success, -1 if copy_to_user has failed. + */ -+static inline int kbasep_timeline_copy_headers( -+ struct kbase_timeline *timeline, -+ char __user *buffer, -+ size_t size, -+ ssize_t *copy_len) ++static inline int kbasep_timeline_copy_headers(struct kbase_timeline *timeline, ++ char __user *buffer, size_t size, ++ ssize_t *copy_len) +{ -+ if (copy_stream_header(buffer, size, copy_len, -+ obj_desc_header, -+ obj_desc_header_size, -+ &timeline->obj_header_btc)) ++ if (copy_stream_header(buffer, size, copy_len, obj_desc_header, ++ obj_desc_header_size, &timeline->obj_header_btc)) + return -1; + -+ if (copy_stream_header(buffer, size, copy_len, -+ aux_desc_header, -+ aux_desc_header_size, -+ &timeline->aux_header_btc)) ++ if (copy_stream_header(buffer, size, copy_len, aux_desc_header, ++ aux_desc_header_size, &timeline->aux_header_btc)) + return -1; +#if MALI_USE_CSF + if (copy_stream_header(buffer, size, copy_len, -+ timeline->csf_tl_reader.tl_header.data, -+ timeline->csf_tl_reader.tl_header.size, -+ &timeline->csf_tl_reader.tl_header.btc)) ++ timeline->csf_tl_reader.tl_header.data, ++ timeline->csf_tl_reader.tl_header.size, ++ &timeline->csf_tl_reader.tl_header.btc)) + return -1; +#endif + return 0; +} + -+ +/** + * kbasep_timeline_io_read - copy data from streams to buffer provided by user ++ * + * @filp: Pointer to file structure + * @buffer: Pointer to the buffer provided by user + * @size: Maximum amount of data that can be stored in the buffer @@ -254496,11 +295514,8 @@ index 000000000000..724f5fa23725 + * + * Return: number of bytes stored in the buffer + */ -+static ssize_t kbasep_timeline_io_read( -+ struct file *filp, -+ char __user *buffer, -+ size_t size, -+ loff_t *f_pos) ++static ssize_t kbasep_timeline_io_read(struct file *filp, char __user *buffer, ++ size_t size, loff_t *f_pos) +{ + ssize_t copy_len = 0; + struct kbase_timeline *timeline; @@ -254511,25 +295526,25 @@ index 000000000000..724f5fa23725 + if (WARN_ON(!filp->private_data)) + return -EFAULT; + -+ timeline = (struct kbase_timeline *) filp->private_data; ++ timeline = (struct kbase_timeline *)filp->private_data; + + if (!buffer) + return -EINVAL; + -+ if ((*f_pos < 0) || (size < PACKET_SIZE)) ++ if (*f_pos < 0) + return -EINVAL; + + mutex_lock(&timeline->reader_lock); + + while (copy_len < size) { + struct kbase_tlstream *stream = NULL; -+ unsigned int rb_idx_raw = 0; -+ unsigned int wb_idx_raw; -+ unsigned int rb_idx; -+ size_t rb_size; ++ unsigned int rb_idx_raw = 0; ++ unsigned int wb_idx_raw; ++ unsigned int rb_idx; ++ size_t rb_size; + -+ if (kbasep_timeline_copy_headers( -+ timeline, buffer, size, ©_len)) { ++ if (kbasep_timeline_copy_headers(timeline, buffer, size, ++ ©_len)) { + copy_len = -EFAULT; + break; + } @@ -254541,17 +295556,13 @@ index 000000000000..724f5fa23725 + */ + if (copy_len > 0) { + if (!kbasep_timeline_io_packet_pending( -+ timeline, -+ &stream, -+ &rb_idx_raw)) ++ timeline, &stream, &rb_idx_raw)) + break; + } else { + if (wait_event_interruptible( -+ timeline->event_queue, -+ kbasep_timeline_io_packet_pending( -+ timeline, -+ &stream, -+ &rb_idx_raw))) { ++ timeline->event_queue, ++ kbasep_timeline_io_packet_pending( ++ timeline, &stream, &rb_idx_raw))) { + copy_len = -ERESTARTSYS; + break; + } @@ -254569,10 +295580,8 @@ index 000000000000..724f5fa23725 + rb_size = atomic_read(&stream->buffer[rb_idx].size); + if (rb_size > size - copy_len) + break; -+ if (copy_to_user( -+ &buffer[copy_len], -+ stream->buffer[rb_idx].data, -+ rb_size)) { ++ if (copy_to_user(&buffer[copy_len], stream->buffer[rb_idx].data, ++ rb_size)) { + copy_len = -EFAULT; + break; + } @@ -254609,76 +295618,147 @@ index 000000000000..724f5fa23725 + * kbasep_timeline_io_poll - poll timeline stream for packets + * @filp: Pointer to file structure + * @wait: Pointer to poll table -+ * Return: POLLIN if data can be read without blocking, otherwise zero ++ * ++ * Return: EPOLLIN | EPOLLRDNORM if data can be read without blocking, ++ * otherwise zero, or EPOLLHUP | EPOLLERR on error. + */ -+static unsigned int kbasep_timeline_io_poll(struct file *filp, poll_table *wait) ++static __poll_t kbasep_timeline_io_poll(struct file *filp, poll_table *wait) +{ + struct kbase_tlstream *stream; -+ unsigned int rb_idx; ++ unsigned int rb_idx; + struct kbase_timeline *timeline; + + KBASE_DEBUG_ASSERT(filp); + KBASE_DEBUG_ASSERT(wait); + + if (WARN_ON(!filp->private_data)) -+ return -EFAULT; ++ return EPOLLHUP | EPOLLERR; + -+ timeline = (struct kbase_timeline *) filp->private_data; ++ timeline = (struct kbase_timeline *)filp->private_data; + + /* If there are header bytes to copy, read will not block */ + if (kbasep_timeline_has_header_data(timeline)) -+ return POLLIN; ++ return EPOLLIN | EPOLLRDNORM; + + poll_wait(filp, &timeline->event_queue, wait); + if (kbasep_timeline_io_packet_pending(timeline, &stream, &rb_idx)) -+ return POLLIN; -+ return 0; ++ return EPOLLIN | EPOLLRDNORM; ++ ++ return (__poll_t)0; ++} ++ ++int kbase_timeline_io_acquire(struct kbase_device *kbdev, u32 flags) ++{ ++ /* The timeline stream file operations structure. */ ++ static const struct file_operations kbasep_tlstream_fops = { ++ .owner = THIS_MODULE, ++ .release = kbasep_timeline_io_release, ++ .read = kbasep_timeline_io_read, ++ .poll = kbasep_timeline_io_poll, ++ .fsync = kbasep_timeline_io_fsync, ++ }; ++ int err; ++ ++ if (!timeline_is_permitted()) ++ return -EPERM; ++ ++ if (WARN_ON(!kbdev) || (flags & ~BASE_TLSTREAM_FLAGS_MASK)) ++ return -EINVAL; ++ ++ err = kbase_timeline_acquire(kbdev, flags); ++ if (err) ++ return err; ++ ++ err = anon_inode_getfd("[mali_tlstream]", &kbasep_tlstream_fops, kbdev->timeline, ++ O_RDONLY | O_CLOEXEC); ++ if (err < 0) ++ kbase_timeline_release(kbdev->timeline); ++ ++ return err; ++} ++ ++#if IS_ENABLED(CONFIG_DEBUG_FS) ++static int kbasep_timeline_io_open(struct inode *in, struct file *file) ++{ ++ struct kbase_device *const kbdev = in->i_private; ++ ++ if (WARN_ON(!kbdev)) ++ return -EFAULT; ++ ++ file->private_data = kbdev->timeline; ++ return kbase_timeline_acquire(kbdev, BASE_TLSTREAM_FLAGS_MASK & ++ ~BASE_TLSTREAM_JOB_DUMPING_ENABLED); +} + ++void kbase_timeline_io_debugfs_init(struct kbase_device *const kbdev) ++{ ++ static const struct file_operations kbasep_tlstream_debugfs_fops = { ++ .owner = THIS_MODULE, ++ .open = kbasep_timeline_io_open, ++ .release = kbasep_timeline_io_release, ++ .read = kbasep_timeline_io_read, ++ .poll = kbasep_timeline_io_poll, ++ .fsync = kbasep_timeline_io_fsync, ++ }; ++ struct dentry *file; ++ ++ if (WARN_ON(!kbdev) || WARN_ON(IS_ERR_OR_NULL(kbdev->mali_debugfs_directory))) ++ return; ++ ++ file = debugfs_create_file("tlstream", 0400, kbdev->mali_debugfs_directory, kbdev, ++ &kbasep_tlstream_debugfs_fops); ++ ++ if (IS_ERR_OR_NULL(file)) ++ dev_warn(kbdev->dev, "Unable to create timeline debugfs entry"); ++} ++#else ++/* ++ * Stub function for when debugfs is disabled ++ */ ++void kbase_timeline_io_debugfs_init(struct kbase_device *const kbdev) ++{ ++} ++#endif ++ +/** + * kbasep_timeline_io_release - release timeline stream descriptor + * @inode: Pointer to inode structure + * @filp: Pointer to file structure + * -+ * Return always return zero ++ * Return: always return zero + */ +static int kbasep_timeline_io_release(struct inode *inode, struct file *filp) +{ -+ struct kbase_timeline *timeline; -+ -+ KBASE_DEBUG_ASSERT(inode); -+ KBASE_DEBUG_ASSERT(filp); -+ KBASE_DEBUG_ASSERT(filp->private_data); -+ + CSTD_UNUSED(inode); + -+ timeline = (struct kbase_timeline *) filp->private_data; -+ -+#if MALI_USE_CSF -+ kbase_csf_tl_reader_stop(&timeline->csf_tl_reader); -+#endif ++ kbase_timeline_release(filp->private_data); ++ return 0; ++} + -+ /* Stop autoflush timer before releasing access to streams. */ -+ atomic_set(&timeline->autoflush_timer_active, 0); -+ del_timer_sync(&timeline->autoflush_timer); ++static int kbasep_timeline_io_fsync(struct file *filp, loff_t start, loff_t end, ++ int datasync) ++{ ++ CSTD_UNUSED(start); ++ CSTD_UNUSED(end); ++ CSTD_UNUSED(datasync); + -+ atomic_set(timeline->timeline_flags, 0); -+ return 0; ++ return kbase_timeline_streams_flush(filp->private_data); +} diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h new file mode 100755 -index 000000000000..35eec467af90 +index 000000000..de30bccc7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h -@@ -0,0 +1,73 @@ +@@ -0,0 +1,103 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -254689,8 +295769,6 @@ index 000000000000..35eec467af90 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#if !defined(_KBASE_TIMELINE_PRIV_H) @@ -254708,9 +295786,16 @@ index 000000000000..35eec467af90 +#include +#include + ++/* The minimum amount of time timeline must be acquired for before release is ++ * allowed, to prevent DoS attacks. ++ */ ++#define TIMELINE_HYSTERESIS_TIMEOUT_MS ((s64)500) ++ +/** + * struct kbase_timeline - timeline state structure + * @streams: The timeline streams generated by kernel ++ * @tl_kctx_list: List of contexts for timeline. ++ * @tl_kctx_list_lock: Lock to protect @tl_kctx_list. + * @autoflush_timer: Autoflush timer + * @autoflush_timer_active: If non-zero autoflush timer is active + * @reader_lock: Reader lock. Only one reader is allowed to @@ -254718,12 +295803,16 @@ index 000000000000..35eec467af90 + * @event_queue: Timeline stream event queue + * @bytes_collected: Number of bytes read by user + * @timeline_flags: Zero, if timeline is disabled. Timeline stream flags -+ * otherwise. See kbase_timeline_io_acquire(). ++ * otherwise. See kbase_timeline_acquire(). + * @obj_header_btc: Remaining bytes to copy for the object stream header + * @aux_header_btc: Remaining bytes to copy for the aux stream header ++ * @last_acquire_time: The time at which timeline was last acquired. ++ * @csf_tl_reader: CSFFW timeline reader + */ +struct kbase_timeline { + struct kbase_tlstream streams[TL_STREAM_TYPE_COUNT]; ++ struct list_head tl_kctx_list; ++ struct mutex tl_kctx_list_lock; + struct timer_list autoflush_timer; + atomic_t autoflush_timer_active; + struct mutex reader_lock; @@ -254734,30 +295823,51 @@ index 000000000000..35eec467af90 + atomic_t *timeline_flags; + size_t obj_header_btc; + size_t aux_header_btc; ++ ktime_t last_acquire_time; +#if MALI_USE_CSF + struct kbase_csf_tl_reader csf_tl_reader; +#endif +}; + -+extern const struct file_operations kbasep_tlstream_fops; -+ +void kbase_create_timeline_objects(struct kbase_device *kbdev); + ++/** ++ * kbase_timeline_acquire - acquire timeline for a userspace client. ++ * @kbdev: An instance of the GPU platform device, allocated from the probe ++ * method of the driver. ++ * @flags: Timeline stream flags ++ * ++ * Each timeline instance can be acquired by only one userspace client at a time. ++ * ++ * Return: Zero on success, error number on failure (e.g. if already acquired). ++ */ ++int kbase_timeline_acquire(struct kbase_device *kbdev, u32 flags); ++ ++/** ++ * kbase_timeline_release - release timeline for a userspace client. ++ * @timeline: Timeline instance to be stopped. It must be previously acquired ++ * with kbase_timeline_acquire(). ++ * ++ * Releasing the timeline instance allows it to be acquired by another userspace client. ++ */ ++void kbase_timeline_release(struct kbase_timeline *timeline); ++ +#endif /* _KBASE_TIMELINE_PRIV_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h new file mode 100755 -index 000000000000..3e378279cf2c +index 000000000..b6aaadedc --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h -@@ -0,0 +1,125 @@ +@@ -0,0 +1,123 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -254768,8 +295878,6 @@ index 000000000000..3e378279cf2c + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#if !defined(_KBASE_TL_SERIALIZE_H) @@ -254785,13 +295893,13 @@ index 000000000000..3e378279cf2c +/** + * kbasep_serialize_bytes - serialize bytes to the message buffer + * -+ * Serialize bytes as is using memcpy() -+ * + * @buffer: Message buffer + * @pos: Message buffer offset + * @bytes: Bytes to serialize + * @len: Length of bytes array + * ++ * Serialize bytes as if using memcpy(). ++ * + * Return: updated position in the buffer + */ +static inline size_t kbasep_serialize_bytes( @@ -254811,14 +295919,14 @@ index 000000000000..3e378279cf2c +/** + * kbasep_serialize_string - serialize string to the message buffer + * -+ * String is serialized as 4 bytes for string size, -+ * then string content and then null terminator. -+ * + * @buffer: Message buffer + * @pos: Message buffer offset + * @string: String to serialize + * @max_write_size: Number of bytes that can be stored in buffer + * ++ * String is serialized as 4 bytes for string size, ++ * then string content and then null terminator. ++ * + * Return: updated position in the buffer + */ +static inline size_t kbasep_serialize_string( @@ -254837,7 +295945,7 @@ index 000000000000..3e378279cf2c + KBASE_DEBUG_ASSERT(max_write_size >= sizeof(string_len) + sizeof(char)); + max_write_size -= sizeof(string_len); + -+ string_len = strlcpy( ++ string_len = strscpy( + &buffer[pos + sizeof(string_len)], + string, + max_write_size); @@ -254855,12 +295963,12 @@ index 000000000000..3e378279cf2c +/** + * kbasep_serialize_timestamp - serialize timestamp to the message buffer + * -+ * Get current timestamp using kbasep_get_timestamp() -+ * and serialize it as 64 bit unsigned integer. -+ * + * @buffer: Message buffer + * @pos: Message buffer offset + * ++ * Get current timestamp using kbasep_get_timestamp() ++ * and serialize it as 64 bit unsigned integer. ++ * + * Return: updated position in the buffer + */ +static inline size_t kbasep_serialize_timestamp(void *buffer, size_t pos) @@ -254874,21 +295982,21 @@ index 000000000000..3e378279cf2c + ×tamp, sizeof(timestamp)); +} +#endif /* _KBASE_TL_SERIALIZE_H */ -+ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c new file mode 100755 -index 000000000000..f4239cfafb9d +index 000000000..47059deb4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c -@@ -0,0 +1,306 @@ +@@ -0,0 +1,313 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2015-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2015-2021 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -254899,8 +296007,6 @@ index 000000000000..f4239cfafb9d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#include "mali_kbase_tlstream.h" @@ -254940,20 +296046,19 @@ index 000000000000..f4239cfafb9d + * @numbered: non-zero if the stream is numbered + * + * Function updates mutable part of packet header in the given buffer. -+ * Note that value of data_size must not including size of the header. ++ * Note that value of data_size must not include size of the header. + */ +static void kbasep_packet_header_update( + char *buffer, + size_t data_size, + int numbered) +{ -+ u32 word0; + u32 word1 = MIPE_PACKET_HEADER_W1((u32)data_size, !!numbered); + + KBASE_DEBUG_ASSERT(buffer); -+ CSTD_UNUSED(word0); + -+ memcpy(&buffer[sizeof(word0)], &word1, sizeof(word1)); ++ /* we copy the contents of word1 to its respective position in the buffer */ ++ memcpy(&buffer[sizeof(u32)], &word1, sizeof(word1)); +} + +/** @@ -255032,12 +296137,12 @@ index 000000000000..f4239cfafb9d + unsigned int i; + + KBASE_DEBUG_ASSERT(stream); -+ KBASE_DEBUG_ASSERT(TL_STREAM_TYPE_COUNT > stream_type); ++ KBASE_DEBUG_ASSERT(stream_type < TL_STREAM_TYPE_COUNT); + + spin_lock_init(&stream->lock); + + /* All packets carrying tracepoints shall be numbered. */ -+ if (TL_PACKET_TYPE_BODY == tl_stream_cfg[stream_type].pkt_type) ++ if (tl_stream_cfg[stream_type].pkt_type == TL_PACKET_TYPE_BODY) + stream->numbered = 1; + else + stream->numbered = 0; @@ -255065,7 +296170,7 @@ index 000000000000..f4239cfafb9d +} + +/** -+ * kbase_tlstream_msgbuf_submit - submit packet to user space ++ * kbasep_tlstream_msgbuf_submit - submit packet to user space + * @stream: Pointer to the stream structure + * @wb_idx_raw: Write buffer index + * @wb_size: Length of data stored in the current buffer @@ -255100,7 +296205,8 @@ index 000000000000..f4239cfafb9d + + /* Increasing write buffer index will expose this packet to the reader. + * As stream->lock is not taken on reader side we must make sure memory -+ * is updated correctly before this will happen. */ ++ * is updated correctly before this will happen. ++ */ + smp_wmb(); + atomic_inc(&stream->wbi); + @@ -255134,7 +296240,7 @@ index 000000000000..f4239cfafb9d + wb_size = atomic_read(&stream->buffer[wb_idx].size); + + /* Select next buffer if data will not fit into current one. */ -+ if (PACKET_SIZE < wb_size + msg_size) { ++ if (wb_size + msg_size > PACKET_SIZE) { + wb_size = kbasep_tlstream_msgbuf_submit( + stream, wb_idx_raw, wb_size); + wb_idx = (wb_idx_raw + 1) % PACKET_COUNT; @@ -255160,7 +296266,7 @@ index 000000000000..f4239cfafb9d + spin_unlock_irqrestore(&stream->lock, flags); +} + -+void kbase_tlstream_flush_stream( ++size_t kbase_tlstream_flush_stream( + struct kbase_tlstream *stream) +{ + unsigned long flags; @@ -255169,6 +296275,7 @@ index 000000000000..f4239cfafb9d + size_t wb_size; + size_t min_size = PACKET_HEADER_SIZE; + ++ + if (stream->numbered) + min_size += PACKET_NUMBER_SIZE; + @@ -255183,24 +296290,32 @@ index 000000000000..f4239cfafb9d + stream, wb_idx_raw, wb_size); + wb_idx = (wb_idx_raw + 1) % PACKET_COUNT; + atomic_set(&stream->buffer[wb_idx].size, wb_size); ++ } else { ++ /* we return that there is no bytes to be read.*/ ++ /* Timeline io fsync will use this info the decide whether ++ * fsync should return an error ++ */ ++ wb_size = 0; + } ++ + spin_unlock_irqrestore(&stream->lock, flags); ++ return wb_size; +} -+ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h new file mode 100755 -index 000000000000..faf88d676b5d +index 000000000..c1428495b --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h -@@ -0,0 +1,169 @@ +@@ -0,0 +1,168 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2015-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2015-2022 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -255211,8 +296326,6 @@ index 000000000000..faf88d676b5d + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +#if !defined(_KBASE_TLSTREAM_H) @@ -255223,22 +296336,20 @@ index 000000000000..faf88d676b5d +#include + +/* The maximum size of a single packet used by timeline. */ -+#define PACKET_SIZE 4096 /* bytes */ ++#define PACKET_SIZE 4096 /* bytes */ + +/* The number of packets used by one timeline stream. */ -+#if defined(CONFIG_MALI_JOB_DUMP) || defined(CONFIG_MALI_VECTOR_DUMP) -+ #define PACKET_COUNT 64 -+#else -+ #define PACKET_COUNT 32 -+#endif ++#define PACKET_COUNT 128 + +/* The maximum expected length of string in tracepoint descriptor. */ -+#define STRLEN_MAX 64 /* bytes */ ++#define STRLEN_MAX 64 /* bytes */ + +/** + * struct kbase_tlstream - timeline stream structure + * @lock: Message order lock + * @buffer: Array of buffers ++ * @buffer.size: Number of bytes in buffer ++ * @buffer.data: Buffer's data + * @wbi: Write buffer index + * @rbi: Read buffer index + * @numbered: If non-zero stream's packets are sequentially numbered @@ -255271,8 +296382,8 @@ index 000000000000..faf88d676b5d + spinlock_t lock; + + struct { -+ atomic_t size; /* number of bytes in buffer */ -+ char data[PACKET_SIZE]; /* buffer's data */ ++ atomic_t size; ++ char data[PACKET_SIZE]; + } buffer[PACKET_COUNT]; + + atomic_t wbi; @@ -255357,25 +296468,28 @@ index 000000000000..faf88d676b5d + * @stream: Pointer to the stream structure + * + * Flush pending data in the timeline stream. ++ * ++ * Return: Number of bytes available flushed and available to be read ++ * + */ -+void kbase_tlstream_flush_stream(struct kbase_tlstream *stream); ++size_t kbase_tlstream_flush_stream(struct kbase_tlstream *stream); + +#endif /* _KBASE_TLSTREAM_H */ -+ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c new file mode 100755 -index 000000000000..de76fa57051e +index 000000000..f62c75583 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c -@@ -0,0 +1,2974 @@ +@@ -0,0 +1,4223 @@ ++// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -255386,12 +296500,10 @@ index 000000000000..de76fa57051e + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* -+ * THIS FILE IS AUTOGENERATED BY mali_trace_generator.py. ++ * THIS FILE IS AUTOGENERATED BY generate_tracepoints.py. + * DO NOT EDIT. + */ + @@ -255401,7 +296513,7 @@ index 000000000000..de76fa57051e + +/* clang-format off */ + -+/* Message ids of trace events that are recorded in the timeline stream. */ ++/* Message ids of trace events that are recorded in the obj stream. */ +enum tl_msg_id_obj { + KBASE_TL_NEW_CTX, + KBASE_TL_NEW_GPU, @@ -255423,10 +296535,6 @@ index 000000000000..de76fa57051e + KBASE_TL_RET_ATOM_AS, + KBASE_TL_NRET_ATOM_AS, + KBASE_TL_ATTRIB_ATOM_CONFIG, -+ KBASE_TL_ATTRIB_ATOM_PRIORITY, -+ KBASE_TL_ATTRIB_ATOM_STATE, -+ KBASE_TL_ATTRIB_ATOM_PRIORITIZED, -+ KBASE_TL_ATTRIB_ATOM_JIT, + KBASE_TL_JIT_USEDPAGES, + KBASE_TL_ATTRIB_ATOM_JITALLOCINFO, + KBASE_TL_ATTRIB_ATOM_JITFREEINFO, @@ -255440,10 +296548,31 @@ index 000000000000..de76fa57051e + KBASE_TL_ARBITER_STARTED, + KBASE_TL_ARBITER_STOP_REQUESTED, + KBASE_TL_ARBITER_STOPPED, ++ KBASE_TL_ARBITER_REQUESTED, + KBASE_JD_GPU_SOFT_RESET, ++ KBASE_JD_TILER_HEAP_CHUNK_ALLOC, ++ KBASE_TL_JS_SCHED_START, ++ KBASE_TL_JS_SCHED_END, ++ KBASE_TL_JD_SUBMIT_ATOM_START, ++ KBASE_TL_JD_SUBMIT_ATOM_END, ++ KBASE_TL_JD_DONE_NO_LOCK_START, ++ KBASE_TL_JD_DONE_NO_LOCK_END, ++ KBASE_TL_JD_DONE_START, ++ KBASE_TL_JD_DONE_END, ++ KBASE_TL_JD_ATOM_COMPLETE, ++ KBASE_TL_RUN_ATOM_START, ++ KBASE_TL_RUN_ATOM_END, ++ KBASE_TL_ATTRIB_ATOM_PRIORITY, ++ KBASE_TL_ATTRIB_ATOM_STATE, ++ KBASE_TL_ATTRIB_ATOM_PRIORITIZED, ++ KBASE_TL_ATTRIB_ATOM_JIT, + KBASE_TL_KBASE_NEW_DEVICE, ++ KBASE_TL_KBASE_GPUCMDQUEUE_KICK, + KBASE_TL_KBASE_DEVICE_PROGRAM_CSG, + KBASE_TL_KBASE_DEVICE_DEPROGRAM_CSG, ++ KBASE_TL_KBASE_DEVICE_HALTING_CSG, ++ KBASE_TL_KBASE_DEVICE_SUSPEND_CSG, ++ KBASE_TL_KBASE_DEVICE_CSG_IDLE, + KBASE_TL_KBASE_NEW_CTX, + KBASE_TL_KBASE_DEL_CTX, + KBASE_TL_KBASE_CTX_ASSIGN_AS, @@ -255454,6 +296583,8 @@ index 000000000000..de76fa57051e + KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_FENCE_WAIT, + KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT, + KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET, ++ KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT_OPERATION, ++ KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET_OPERATION, + KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_MAP_IMPORT, + KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT, + KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT_FORCE, @@ -255463,6 +296594,8 @@ index 000000000000..de76fa57051e + KBASE_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_ENQUEUE_JIT_FREE, + KBASE_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_ENQUEUE_JIT_FREE, + KBASE_TL_KBASE_ARRAY_END_KCPUQUEUE_ENQUEUE_JIT_FREE, ++ KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_ERROR_BARRIER, ++ KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_GROUP_SUSPEND, + KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_START, + KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_END, + KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_START, @@ -255470,6 +296603,9 @@ index 000000000000..de76fa57051e + KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_START, + KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_END, + KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET, ++ KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_OPERATION_START, ++ KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_OPERATION_END, ++ KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET_OPERATION, + KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_START, + KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_END, + KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_START, @@ -255484,27 +296620,20 @@ index 000000000000..de76fa57051e + KBASE_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_EXECUTE_JIT_FREE_END, + KBASE_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_FREE_END, + KBASE_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_FREE_END, -+ KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_ERRORBARRIER, ++ KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_ERROR_BARRIER, ++ KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_GROUP_SUSPEND_START, ++ KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_GROUP_SUSPEND_END, ++ KBASE_TL_KBASE_CSFFW_FW_RELOADING, ++ KBASE_TL_KBASE_CSFFW_FW_ENABLING, ++ KBASE_TL_KBASE_CSFFW_FW_REQUEST_SLEEP, ++ KBASE_TL_KBASE_CSFFW_FW_REQUEST_WAKEUP, ++ KBASE_TL_KBASE_CSFFW_FW_REQUEST_HALT, ++ KBASE_TL_KBASE_CSFFW_FW_DISABLING, ++ KBASE_TL_KBASE_CSFFW_FW_OFF, + KBASE_TL_KBASE_CSFFW_TLSTREAM_OVERFLOW, -+ KBASE_TL_KBASE_CSFFW_RESET, + KBASE_OBJ_MSG_COUNT, +}; + -+/* Message ids of trace events that are recorded in the auxiliary stream. */ -+enum tl_msg_id_aux { -+ KBASE_AUX_PM_STATE, -+ KBASE_AUX_PAGEFAULT, -+ KBASE_AUX_PAGESALLOC, -+ KBASE_AUX_DEVFREQ_TARGET, -+ KBASE_AUX_PROTECTED_ENTER_START, -+ KBASE_AUX_PROTECTED_ENTER_END, -+ KBASE_AUX_PROTECTED_LEAVE_START, -+ KBASE_AUX_PROTECTED_LEAVE_END, -+ KBASE_AUX_JIT_STATS, -+ KBASE_AUX_EVENT_JOB_SLOT, -+ KBASE_AUX_MSG_COUNT, -+}; -+ +#define OBJ_TP_LIST \ + TRACEPOINT_DESC(KBASE_TL_NEW_CTX, \ + "object ctx is created", \ @@ -255586,22 +296715,6 @@ index 000000000000..de76fa57051e + "atom job slot attributes", \ + "@pLLI", \ + "atom,descriptor,affinity,config") \ -+ TRACEPOINT_DESC(KBASE_TL_ATTRIB_ATOM_PRIORITY, \ -+ "atom priority", \ -+ "@pI", \ -+ "atom,prio") \ -+ TRACEPOINT_DESC(KBASE_TL_ATTRIB_ATOM_STATE, \ -+ "atom state", \ -+ "@pI", \ -+ "atom,state") \ -+ TRACEPOINT_DESC(KBASE_TL_ATTRIB_ATOM_PRIORITIZED, \ -+ "atom caused priority change", \ -+ "@p", \ -+ "atom") \ -+ TRACEPOINT_DESC(KBASE_TL_ATTRIB_ATOM_JIT, \ -+ "jit done for atom", \ -+ "@pLLILILLL", \ -+ "atom,edit_addr,new_addr,jit_flags,mem_flags,j_id,com_pgs,extent,va_pgs") \ + TRACEPOINT_DESC(KBASE_TL_JIT_USEDPAGES, \ + "used pages for jit", \ + "@LI", \ @@ -255654,22 +296767,106 @@ index 000000000000..de76fa57051e + "Driver has stopped using gpu", \ + "@p", \ + "gpu") \ ++ TRACEPOINT_DESC(KBASE_TL_ARBITER_REQUESTED, \ ++ "Driver has requested the arbiter for gpu access", \ ++ "@p", \ ++ "gpu") \ + TRACEPOINT_DESC(KBASE_JD_GPU_SOFT_RESET, \ + "gpu soft reset", \ + "@p", \ + "gpu") \ ++ TRACEPOINT_DESC(KBASE_JD_TILER_HEAP_CHUNK_ALLOC, \ ++ "Tiler Heap Chunk Allocation", \ ++ "@ILL", \ ++ "ctx_nr,heap_id,chunk_va") \ ++ TRACEPOINT_DESC(KBASE_TL_JS_SCHED_START, \ ++ "Scheduling starts", \ ++ "@I", \ ++ "dummy") \ ++ TRACEPOINT_DESC(KBASE_TL_JS_SCHED_END, \ ++ "Scheduling ends", \ ++ "@I", \ ++ "dummy") \ ++ TRACEPOINT_DESC(KBASE_TL_JD_SUBMIT_ATOM_START, \ ++ "Submitting an atom starts", \ ++ "@p", \ ++ "atom") \ ++ TRACEPOINT_DESC(KBASE_TL_JD_SUBMIT_ATOM_END, \ ++ "Submitting an atom ends", \ ++ "@p", \ ++ "atom") \ ++ TRACEPOINT_DESC(KBASE_TL_JD_DONE_NO_LOCK_START, \ ++ "Within function kbase_jd_done_nolock", \ ++ "@p", \ ++ "atom") \ ++ TRACEPOINT_DESC(KBASE_TL_JD_DONE_NO_LOCK_END, \ ++ "Within function kbase_jd_done_nolock - end", \ ++ "@p", \ ++ "atom") \ ++ TRACEPOINT_DESC(KBASE_TL_JD_DONE_START, \ ++ "Start of kbase_jd_done", \ ++ "@p", \ ++ "atom") \ ++ TRACEPOINT_DESC(KBASE_TL_JD_DONE_END, \ ++ "End of kbase_jd_done", \ ++ "@p", \ ++ "atom") \ ++ TRACEPOINT_DESC(KBASE_TL_JD_ATOM_COMPLETE, \ ++ "Atom marked complete", \ ++ "@p", \ ++ "atom") \ ++ TRACEPOINT_DESC(KBASE_TL_RUN_ATOM_START, \ ++ "Running of atom starts", \ ++ "@pI", \ ++ "atom,atom_nr") \ ++ TRACEPOINT_DESC(KBASE_TL_RUN_ATOM_END, \ ++ "Running of atom ends", \ ++ "@pI", \ ++ "atom,atom_nr") \ ++ TRACEPOINT_DESC(KBASE_TL_ATTRIB_ATOM_PRIORITY, \ ++ "atom priority", \ ++ "@pI", \ ++ "atom,prio") \ ++ TRACEPOINT_DESC(KBASE_TL_ATTRIB_ATOM_STATE, \ ++ "atom state", \ ++ "@pI", \ ++ "atom,state") \ ++ TRACEPOINT_DESC(KBASE_TL_ATTRIB_ATOM_PRIORITIZED, \ ++ "atom caused priority change", \ ++ "@p", \ ++ "atom") \ ++ TRACEPOINT_DESC(KBASE_TL_ATTRIB_ATOM_JIT, \ ++ "jit done for atom", \ ++ "@pLLILILLL", \ ++ "atom,edit_addr,new_addr,jit_flags,mem_flags,j_id,com_pgs,extent,va_pgs") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_NEW_DEVICE, \ + "New KBase Device", \ -+ "@IIII", \ -+ "kbase_device_id,kbase_device_gpu_core_count,kbase_device_max_num_csgs,kbase_device_as_count") \ ++ "@IIIIIII", \ ++ "kbase_device_id,kbase_device_gpu_core_count,kbase_device_max_num_csgs,kbase_device_as_count,kbase_device_sb_entry_count,kbase_device_has_cross_stream_sync,kbase_device_supports_gpu_sleep") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_GPUCMDQUEUE_KICK, \ ++ "Kernel receives a request to process new GPU queue instructions", \ ++ "@IL", \ ++ "kernel_ctx_id,buffer_gpu_addr") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_DEVICE_PROGRAM_CSG, \ + "CSG is programmed to a slot", \ -+ "@III", \ -+ "kbase_device_id,gpu_cmdq_grp_handle,kbase_device_csg_slot_index") \ ++ "@IIIII", \ ++ "kbase_device_id,kernel_ctx_id,gpu_cmdq_grp_handle,kbase_device_csg_slot_index,kbase_device_csg_slot_resuming") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_DEVICE_DEPROGRAM_CSG, \ + "CSG is deprogrammed from a slot", \ + "@II", \ + "kbase_device_id,kbase_device_csg_slot_index") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_DEVICE_HALTING_CSG, \ ++ "CSG is halting", \ ++ "@III", \ ++ "kbase_device_id,kbase_device_csg_slot_index,kbase_device_csg_slot_suspending") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_DEVICE_SUSPEND_CSG, \ ++ "CSG is suspended", \ ++ "@II", \ ++ "kbase_device_id,kbase_device_csg_slot_index") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_DEVICE_CSG_IDLE, \ ++ "KBase device is notified that CSG is idle.", \ ++ "@II", \ ++ "kbase_device_id,kbase_device_csg_slot_index") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_NEW_CTX, \ + "New KBase Context", \ + "@II", \ @@ -255688,8 +296885,8 @@ index 000000000000..de76fa57051e + "kernel_ctx_id") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_NEW_KCPUQUEUE, \ + "New KCPU Queue", \ -+ "@pII", \ -+ "kcpu_queue,kernel_ctx_id,kcpuq_num_pending_cmds") \ ++ "@pIII", \ ++ "kcpu_queue,kcpu_queue_id,kernel_ctx_id,kcpuq_num_pending_cmds") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_DEL_KCPUQUEUE, \ + "Delete KCPU Queue", \ + "@p", \ @@ -255704,12 +296901,20 @@ index 000000000000..de76fa57051e + "kcpu_queue,fence") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT, \ + "KCPU Queue enqueues Wait on Cross Queue Sync Object", \ -+ "@pLI", \ -+ "kcpu_queue,cqs_obj_gpu_addr,cqs_obj_compare_value") \ ++ "@pLII", \ ++ "kcpu_queue,cqs_obj_gpu_addr,compare_value,inherit_error") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET, \ + "KCPU Queue enqueues Set on Cross Queue Sync Object", \ + "@pL", \ + "kcpu_queue,cqs_obj_gpu_addr") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT_OPERATION, \ ++ "KCPU Queue enqueues Wait Operation on Cross Queue Sync Object", \ ++ "@pLLIII", \ ++ "kcpu_queue,cqs_obj_gpu_addr,compare_value,condition,data_type,inherit_error") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET_OPERATION, \ ++ "KCPU Queue enqueues Set Operation on Cross Queue Sync Object", \ ++ "@pLLII", \ ++ "kcpu_queue,cqs_obj_gpu_addr,value,operation,data_type") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_MAP_IMPORT, \ + "KCPU Queue enqueues Map Import", \ + "@pL", \ @@ -255746,58 +296951,78 @@ index 000000000000..de76fa57051e + "End array of KCPU Queue enqueues JIT Free", \ + "@p", \ + "kcpu_queue") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_ERROR_BARRIER, \ ++ "KCPU Queue enqueues Error Barrier", \ ++ "@p", \ ++ "kcpu_queue") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_GROUP_SUSPEND, \ ++ "KCPU Queue enqueues Group Suspend", \ ++ "@ppI", \ ++ "kcpu_queue,group_suspend_buf,gpu_cmdq_grp_handle") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_START, \ + "KCPU Queue starts a Signal on Fence", \ + "@p", \ + "kcpu_queue") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_END, \ + "KCPU Queue ends a Signal on Fence", \ -+ "@p", \ -+ "kcpu_queue") \ ++ "@pI", \ ++ "kcpu_queue,execute_error") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_START, \ + "KCPU Queue starts a Wait on Fence", \ + "@p", \ + "kcpu_queue") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_END, \ + "KCPU Queue ends a Wait on Fence", \ -+ "@p", \ -+ "kcpu_queue") \ ++ "@pI", \ ++ "kcpu_queue,execute_error") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_START, \ -+ "KCPU Queue starts a Wait on an array of Cross Queue Sync Objects", \ ++ "KCPU Queue starts a Wait on Cross Queue Sync Object", \ + "@p", \ + "kcpu_queue") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_END, \ -+ "KCPU Queue ends a Wait on an array of Cross Queue Sync Objects", \ -+ "@p", \ -+ "kcpu_queue") \ ++ "KCPU Queue ends a Wait on Cross Queue Sync Object", \ ++ "@pI", \ ++ "kcpu_queue,execute_error") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET, \ -+ "KCPU Queue executes a Set on an array of Cross Queue Sync Objects", \ ++ "KCPU Queue executes a Set on Cross Queue Sync Object", \ ++ "@pI", \ ++ "kcpu_queue,execute_error") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_OPERATION_START, \ ++ "KCPU Queue starts a Wait Operation on Cross Queue Sync Object", \ + "@p", \ + "kcpu_queue") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_OPERATION_END, \ ++ "KCPU Queue ends a Wait Operation on Cross Queue Sync Object", \ ++ "@pI", \ ++ "kcpu_queue,execute_error") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET_OPERATION, \ ++ "KCPU Queue executes a Set Operation on Cross Queue Sync Object", \ ++ "@pI", \ ++ "kcpu_queue,execute_error") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_START, \ + "KCPU Queue starts a Map Import", \ + "@p", \ + "kcpu_queue") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_END, \ + "KCPU Queue ends a Map Import", \ -+ "@p", \ -+ "kcpu_queue") \ ++ "@pI", \ ++ "kcpu_queue,execute_error") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_START, \ + "KCPU Queue starts an Unmap Import", \ + "@p", \ + "kcpu_queue") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_END, \ + "KCPU Queue ends an Unmap Import", \ -+ "@p", \ -+ "kcpu_queue") \ ++ "@pI", \ ++ "kcpu_queue,execute_error") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_FORCE_START, \ + "KCPU Queue starts an Unmap Import ignoring reference count", \ + "@p", \ + "kcpu_queue") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_FORCE_END, \ + "KCPU Queue ends an Unmap Import ignoring reference count", \ -+ "@p", \ -+ "kcpu_queue") \ ++ "@pI", \ ++ "kcpu_queue,execute_error") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_ALLOC_START, \ + "KCPU Queue starts an array of JIT Allocs", \ + "@p", \ @@ -255808,8 +297033,8 @@ index 000000000000..de76fa57051e + "kcpu_queue") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_ALLOC_END, \ + "Array item of KCPU Queue ends an array of JIT Allocs", \ -+ "@pLL", \ -+ "kcpu_queue,jit_alloc_gpu_alloc_addr,jit_alloc_mmu_flags") \ ++ "@pILL", \ ++ "kcpu_queue,execute_error,jit_alloc_gpu_alloc_addr,jit_alloc_mmu_flags") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_ALLOC_END, \ + "End array of KCPU Queue ends an array of JIT Allocs", \ + "@p", \ @@ -255824,36 +297049,85 @@ index 000000000000..de76fa57051e + "kcpu_queue") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_FREE_END, \ + "Array item of KCPU Queue ends an array of JIT Frees", \ -+ "@pL", \ -+ "kcpu_queue,jit_free_pages_used") \ ++ "@pIL", \ ++ "kcpu_queue,execute_error,jit_free_pages_used") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_FREE_END, \ + "End array of KCPU Queue ends an array of JIT Frees", \ + "@p", \ + "kcpu_queue") \ -+ TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_ERRORBARRIER, \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_ERROR_BARRIER, \ + "KCPU Queue executes an Error Barrier", \ + "@p", \ + "kcpu_queue") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_GROUP_SUSPEND_START, \ ++ "KCPU Queue starts a group suspend", \ ++ "@p", \ ++ "kcpu_queue") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_GROUP_SUSPEND_END, \ ++ "KCPU Queue ends a group suspend", \ ++ "@pI", \ ++ "kcpu_queue,execute_error") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_CSFFW_FW_RELOADING, \ ++ "CSF FW is being reloaded", \ ++ "@L", \ ++ "csffw_cycle") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_CSFFW_FW_ENABLING, \ ++ "CSF FW is being enabled", \ ++ "@L", \ ++ "csffw_cycle") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_CSFFW_FW_REQUEST_SLEEP, \ ++ "CSF FW sleep is requested", \ ++ "@L", \ ++ "csffw_cycle") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_CSFFW_FW_REQUEST_WAKEUP, \ ++ "CSF FW wake up is requested", \ ++ "@L", \ ++ "csffw_cycle") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_CSFFW_FW_REQUEST_HALT, \ ++ "CSF FW halt is requested", \ ++ "@L", \ ++ "csffw_cycle") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_CSFFW_FW_DISABLING, \ ++ "CSF FW is being disabled", \ ++ "@L", \ ++ "csffw_cycle") \ ++ TRACEPOINT_DESC(KBASE_TL_KBASE_CSFFW_FW_OFF, \ ++ "CSF FW is off", \ ++ "@L", \ ++ "csffw_cycle") \ + TRACEPOINT_DESC(KBASE_TL_KBASE_CSFFW_TLSTREAM_OVERFLOW, \ + "An overflow has happened with the CSFFW Timeline stream", \ + "@LL", \ -+ "csffw_timestamp,csffw_cycle") \ -+ TRACEPOINT_DESC(KBASE_TL_KBASE_CSFFW_RESET, \ -+ "A reset has happened with the CSFFW", \ -+ "@L", \ -+ "csffw_cycle") \ ++ "csffw_timestamp,csffw_cycle") + -+#define MIPE_HEADER_BLOB_VAR_NAME __obj_desc_header -+#define MIPE_HEADER_STREAM_ID TL_STREAM_ID_KERNEL -+#define MIPE_HEADER_PKT_CLASS TL_PACKET_CLASS_OBJ -+#define MIPE_HEADER_TRACEPOINT_LIST OBJ_TP_LIST -+#define MIPE_HEADER_TRACEPOINT_LIST_SIZE KBASE_OBJ_MSG_COUNT ++#define MIPE_HEADER_BLOB_VAR_NAME __obj_desc_header ++#define MIPE_HEADER_STREAM_ID TL_STREAM_ID_KERNEL ++#define MIPE_HEADER_PKT_CLASS TL_PACKET_CLASS_OBJ ++#define MIPE_HEADER_TRACEPOINT_LIST OBJ_TP_LIST ++#define MIPE_HEADER_TRACEPOINT_LIST_SIZE KBASE_OBJ_MSG_COUNT + +#include "mali_kbase_mipe_gen_header.h" + +const char *obj_desc_header = (const char *) &__obj_desc_header; +const size_t obj_desc_header_size = sizeof(__obj_desc_header); + ++/* Message ids of trace events that are recorded in the aux stream. */ ++enum tl_msg_id_aux { ++ KBASE_AUX_PM_STATE, ++ KBASE_AUX_PAGEFAULT, ++ KBASE_AUX_PAGESALLOC, ++ KBASE_AUX_DEVFREQ_TARGET, ++ KBASE_AUX_JIT_STATS, ++ KBASE_AUX_TILER_HEAP_STATS, ++ KBASE_AUX_EVENT_JOB_SLOT, ++ KBASE_AUX_PROTECTED_ENTER_START, ++ KBASE_AUX_PROTECTED_ENTER_END, ++ KBASE_AUX_MMU_COMMAND, ++ KBASE_AUX_PROTECTED_LEAVE_START, ++ KBASE_AUX_PROTECTED_LEAVE_END, ++ KBASE_AUX_MSG_COUNT, ++}; ++ +#define AUX_TP_LIST \ + TRACEPOINT_DESC(KBASE_AUX_PM_STATE, \ + "PM state", \ @@ -255871,6 +297145,18 @@ index 000000000000..de76fa57051e + "New device frequency target", \ + "@L", \ + "target_freq") \ ++ TRACEPOINT_DESC(KBASE_AUX_JIT_STATS, \ ++ "per-bin JIT statistics", \ ++ "@IIIIII", \ ++ "ctx_nr,bid,max_allocs,allocs,va_pages,ph_pages") \ ++ TRACEPOINT_DESC(KBASE_AUX_TILER_HEAP_STATS, \ ++ "Tiler Heap statistics", \ ++ "@ILIIIIIII", \ ++ "ctx_nr,heap_id,va_pages,ph_pages,max_chunks,chunk_size,chunk_count,target_in_flight,nr_in_flight") \ ++ TRACEPOINT_DESC(KBASE_AUX_EVENT_JOB_SLOT, \ ++ "event on a given job slot", \ ++ "@pIII", \ ++ "ctx,slot_nr,atom_nr,event") \ + TRACEPOINT_DESC(KBASE_AUX_PROTECTED_ENTER_START, \ + "enter protected mode start", \ + "@p", \ @@ -255879,6 +297165,10 @@ index 000000000000..de76fa57051e + "enter protected mode end", \ + "@p", \ + "gpu") \ ++ TRACEPOINT_DESC(KBASE_AUX_MMU_COMMAND, \ ++ "mmu commands with synchronicity info", \ ++ "@IIILI", \ ++ "kernel_ctx_id,mmu_cmd_id,mmu_synchronicity,mmu_lock_addr,mmu_lock_page_num") \ + TRACEPOINT_DESC(KBASE_AUX_PROTECTED_LEAVE_START, \ + "leave protected mode start", \ + "@p", \ @@ -255886,21 +297176,13 @@ index 000000000000..de76fa57051e + TRACEPOINT_DESC(KBASE_AUX_PROTECTED_LEAVE_END, \ + "leave protected mode end", \ + "@p", \ -+ "gpu") \ -+ TRACEPOINT_DESC(KBASE_AUX_JIT_STATS, \ -+ "per-bin JIT statistics", \ -+ "@IIIIII", \ -+ "ctx_nr,bid,max_allocs,allocs,va_pages,ph_pages") \ -+ TRACEPOINT_DESC(KBASE_AUX_EVENT_JOB_SLOT, \ -+ "event on a given job slot", \ -+ "@pIII", \ -+ "ctx,slot_nr,atom_nr,event") \ ++ "gpu") + -+#define MIPE_HEADER_BLOB_VAR_NAME __aux_desc_header -+#define MIPE_HEADER_STREAM_ID TL_STREAM_ID_KERNEL -+#define MIPE_HEADER_PKT_CLASS TL_PACKET_CLASS_AUX -+#define MIPE_HEADER_TRACEPOINT_LIST AUX_TP_LIST -+#define MIPE_HEADER_TRACEPOINT_LIST_SIZE KBASE_AUX_MSG_COUNT ++#define MIPE_HEADER_BLOB_VAR_NAME __aux_desc_header ++#define MIPE_HEADER_STREAM_ID TL_STREAM_ID_KERNEL ++#define MIPE_HEADER_PKT_CLASS TL_PACKET_CLASS_AUX ++#define MIPE_HEADER_TRACEPOINT_LIST AUX_TP_LIST ++#define MIPE_HEADER_TRACEPOINT_LIST_SIZE KBASE_AUX_MSG_COUNT + +#include "mali_kbase_mipe_gen_header.h" + @@ -255911,7 +297193,8 @@ index 000000000000..de76fa57051e + struct kbase_tlstream *stream, + const void *ctx, + u32 ctx_nr, -+ u32 tgid) ++ u32 tgid ++) +{ + const u32 msg_id = KBASE_TL_NEW_CTX; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -255941,7 +297224,8 @@ index 000000000000..de76fa57051e + struct kbase_tlstream *stream, + const void *gpu, + u32 gpu_id, -+ u32 core_count) ++ u32 core_count ++) +{ + const u32 msg_id = KBASE_TL_NEW_GPU; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -255971,7 +297255,8 @@ index 000000000000..de76fa57051e + struct kbase_tlstream *stream, + const void *lpu, + u32 lpu_nr, -+ u32 lpu_fn) ++ u32 lpu_fn ++) +{ + const u32 msg_id = KBASE_TL_NEW_LPU; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256000,7 +297285,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_new_atom( + struct kbase_tlstream *stream, + const void *atom, -+ u32 atom_nr) ++ u32 atom_nr ++) +{ + const u32 msg_id = KBASE_TL_NEW_ATOM; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256026,7 +297312,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_new_as( + struct kbase_tlstream *stream, + const void *address_space, -+ u32 as_nr) ++ u32 as_nr ++) +{ + const u32 msg_id = KBASE_TL_NEW_AS; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256051,7 +297338,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_del_ctx( + struct kbase_tlstream *stream, -+ const void *ctx) ++ const void *ctx ++) +{ + const u32 msg_id = KBASE_TL_DEL_CTX; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256073,7 +297361,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_del_atom( + struct kbase_tlstream *stream, -+ const void *atom) ++ const void *atom ++) +{ + const u32 msg_id = KBASE_TL_DEL_ATOM; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256096,7 +297385,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_lifelink_lpu_gpu( + struct kbase_tlstream *stream, + const void *lpu, -+ const void *gpu) ++ const void *gpu ++) +{ + const u32 msg_id = KBASE_TL_LIFELINK_LPU_GPU; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256122,7 +297412,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_lifelink_as_gpu( + struct kbase_tlstream *stream, + const void *address_space, -+ const void *gpu) ++ const void *gpu ++) +{ + const u32 msg_id = KBASE_TL_LIFELINK_AS_GPU; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256148,7 +297439,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_ret_ctx_lpu( + struct kbase_tlstream *stream, + const void *ctx, -+ const void *lpu) ++ const void *lpu ++) +{ + const u32 msg_id = KBASE_TL_RET_CTX_LPU; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256174,7 +297466,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_ret_atom_ctx( + struct kbase_tlstream *stream, + const void *atom, -+ const void *ctx) ++ const void *ctx ++) +{ + const u32 msg_id = KBASE_TL_RET_ATOM_CTX; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256201,15 +297494,16 @@ index 000000000000..de76fa57051e + struct kbase_tlstream *stream, + const void *atom, + const void *lpu, -+ const char *attrib_match_list) ++ const char *attrib_match_list ++) +{ + const u32 msg_id = KBASE_TL_RET_ATOM_LPU; -+ const size_t s0 = sizeof(u32) + sizeof(char) ++ const size_t s2 = sizeof(u32) + sizeof(char) + + strnlen(attrib_match_list, STRLEN_MAX); + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(atom) + + sizeof(lpu) -+ + s0 ++ + s2 + ; + char *buffer; + unsigned long acq_flags; @@ -256224,7 +297518,7 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, + pos, &lpu, sizeof(lpu)); + pos = kbasep_serialize_string(buffer, -+ pos, attrib_match_list, s0); ++ pos, attrib_match_list, s2); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} @@ -256232,7 +297526,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_nret_ctx_lpu( + struct kbase_tlstream *stream, + const void *ctx, -+ const void *lpu) ++ const void *lpu ++) +{ + const u32 msg_id = KBASE_TL_NRET_CTX_LPU; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256258,7 +297553,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_nret_atom_ctx( + struct kbase_tlstream *stream, + const void *atom, -+ const void *ctx) ++ const void *ctx ++) +{ + const u32 msg_id = KBASE_TL_NRET_ATOM_CTX; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256284,7 +297580,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_nret_atom_lpu( + struct kbase_tlstream *stream, + const void *atom, -+ const void *lpu) ++ const void *lpu ++) +{ + const u32 msg_id = KBASE_TL_NRET_ATOM_LPU; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256310,7 +297607,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_ret_as_ctx( + struct kbase_tlstream *stream, + const void *address_space, -+ const void *ctx) ++ const void *ctx ++) +{ + const u32 msg_id = KBASE_TL_RET_AS_CTX; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256336,7 +297634,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_nret_as_ctx( + struct kbase_tlstream *stream, + const void *address_space, -+ const void *ctx) ++ const void *ctx ++) +{ + const u32 msg_id = KBASE_TL_NRET_AS_CTX; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256362,7 +297661,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_ret_atom_as( + struct kbase_tlstream *stream, + const void *atom, -+ const void *address_space) ++ const void *address_space ++) +{ + const u32 msg_id = KBASE_TL_RET_ATOM_AS; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256388,7 +297688,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_nret_atom_as( + struct kbase_tlstream *stream, + const void *atom, -+ const void *address_space) ++ const void *address_space ++) +{ + const u32 msg_id = KBASE_TL_NRET_ATOM_AS; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256416,7 +297717,8 @@ index 000000000000..de76fa57051e + const void *atom, + u64 descriptor, + u64 affinity, -+ u32 config) ++ u32 config ++) +{ + const u32 msg_id = KBASE_TL_ATTRIB_ATOM_CONFIG; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256445,138 +297747,11 @@ index 000000000000..de76fa57051e + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + -+void __kbase_tlstream_tl_attrib_atom_priority( -+ struct kbase_tlstream *stream, -+ const void *atom, -+ u32 prio) -+{ -+ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_PRIORITY; -+ const size_t msg_size = sizeof(msg_id) + sizeof(u64) -+ + sizeof(atom) -+ + sizeof(prio) -+ ; -+ char *buffer; -+ unsigned long acq_flags; -+ size_t pos = 0; -+ -+ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); -+ -+ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_serialize_timestamp(buffer, pos); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &atom, sizeof(atom)); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &prio, sizeof(prio)); -+ -+ kbase_tlstream_msgbuf_release(stream, acq_flags); -+} -+ -+void __kbase_tlstream_tl_attrib_atom_state( -+ struct kbase_tlstream *stream, -+ const void *atom, -+ u32 state) -+{ -+ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_STATE; -+ const size_t msg_size = sizeof(msg_id) + sizeof(u64) -+ + sizeof(atom) -+ + sizeof(state) -+ ; -+ char *buffer; -+ unsigned long acq_flags; -+ size_t pos = 0; -+ -+ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); -+ -+ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_serialize_timestamp(buffer, pos); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &atom, sizeof(atom)); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &state, sizeof(state)); -+ -+ kbase_tlstream_msgbuf_release(stream, acq_flags); -+} -+ -+void __kbase_tlstream_tl_attrib_atom_prioritized( -+ struct kbase_tlstream *stream, -+ const void *atom) -+{ -+ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_PRIORITIZED; -+ const size_t msg_size = sizeof(msg_id) + sizeof(u64) -+ + sizeof(atom) -+ ; -+ char *buffer; -+ unsigned long acq_flags; -+ size_t pos = 0; -+ -+ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); -+ -+ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_serialize_timestamp(buffer, pos); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &atom, sizeof(atom)); -+ -+ kbase_tlstream_msgbuf_release(stream, acq_flags); -+} -+ -+void __kbase_tlstream_tl_attrib_atom_jit( -+ struct kbase_tlstream *stream, -+ const void *atom, -+ u64 edit_addr, -+ u64 new_addr, -+ u32 jit_flags, -+ u64 mem_flags, -+ u32 j_id, -+ u64 com_pgs, -+ u64 extent, -+ u64 va_pgs) -+{ -+ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_JIT; -+ const size_t msg_size = sizeof(msg_id) + sizeof(u64) -+ + sizeof(atom) -+ + sizeof(edit_addr) -+ + sizeof(new_addr) -+ + sizeof(jit_flags) -+ + sizeof(mem_flags) -+ + sizeof(j_id) -+ + sizeof(com_pgs) -+ + sizeof(extent) -+ + sizeof(va_pgs) -+ ; -+ char *buffer; -+ unsigned long acq_flags; -+ size_t pos = 0; -+ -+ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); -+ -+ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_serialize_timestamp(buffer, pos); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &atom, sizeof(atom)); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &edit_addr, sizeof(edit_addr)); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &new_addr, sizeof(new_addr)); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &jit_flags, sizeof(jit_flags)); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &mem_flags, sizeof(mem_flags)); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &j_id, sizeof(j_id)); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &com_pgs, sizeof(com_pgs)); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &extent, sizeof(extent)); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &va_pgs, sizeof(va_pgs)); -+ -+ kbase_tlstream_msgbuf_release(stream, acq_flags); -+} -+ +void __kbase_tlstream_tl_jit_usedpages( + struct kbase_tlstream *stream, + u64 used_pages, -+ u32 j_id) ++ u32 j_id ++) +{ + const u32 msg_id = KBASE_TL_JIT_USEDPAGES; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256609,7 +297784,8 @@ index 000000000000..de76fa57051e + u32 bin_id, + u32 max_allocs, + u32 jit_flags, -+ u32 usg_id) ++ u32 usg_id ++) +{ + const u32 msg_id = KBASE_TL_ATTRIB_ATOM_JITALLOCINFO; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256656,7 +297832,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_attrib_atom_jitfreeinfo( + struct kbase_tlstream *stream, + const void *atom, -+ u32 j_id) ++ u32 j_id ++) +{ + const u32 msg_id = KBASE_TL_ATTRIB_ATOM_JITFREEINFO; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256684,7 +297861,8 @@ index 000000000000..de76fa57051e + const void *address_space, + u64 transtab, + u64 memattr, -+ u64 transcfg) ++ u64 transcfg ++) +{ + const u32 msg_id = KBASE_TL_ATTRIB_AS_CONFIG; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256715,7 +297893,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_event_lpu_softstop( + struct kbase_tlstream *stream, -+ const void *lpu) ++ const void *lpu ++) +{ + const u32 msg_id = KBASE_TL_EVENT_LPU_SOFTSTOP; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256737,7 +297916,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_event_atom_softstop_ex( + struct kbase_tlstream *stream, -+ const void *atom) ++ const void *atom ++) +{ + const u32 msg_id = KBASE_TL_EVENT_ATOM_SOFTSTOP_EX; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256759,7 +297939,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_event_atom_softstop_issue( + struct kbase_tlstream *stream, -+ const void *atom) ++ const void *atom ++) +{ + const u32 msg_id = KBASE_TL_EVENT_ATOM_SOFTSTOP_ISSUE; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256781,7 +297962,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_event_atom_softjob_start( + struct kbase_tlstream *stream, -+ const void *atom) ++ const void *atom ++) +{ + const u32 msg_id = KBASE_TL_EVENT_ATOM_SOFTJOB_START; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256803,7 +297985,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_event_atom_softjob_end( + struct kbase_tlstream *stream, -+ const void *atom) ++ const void *atom ++) +{ + const u32 msg_id = KBASE_TL_EVENT_ATOM_SOFTJOB_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256825,7 +298008,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_arbiter_granted( + struct kbase_tlstream *stream, -+ const void *gpu) ++ const void *gpu ++) +{ + const u32 msg_id = KBASE_TL_ARBITER_GRANTED; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256847,7 +298031,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_arbiter_started( + struct kbase_tlstream *stream, -+ const void *gpu) ++ const void *gpu ++) +{ + const u32 msg_id = KBASE_TL_ARBITER_STARTED; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256869,7 +298054,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_arbiter_stop_requested( + struct kbase_tlstream *stream, -+ const void *gpu) ++ const void *gpu ++) +{ + const u32 msg_id = KBASE_TL_ARBITER_STOP_REQUESTED; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256891,7 +298077,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_arbiter_stopped( + struct kbase_tlstream *stream, -+ const void *gpu) ++ const void *gpu ++) +{ + const u32 msg_id = KBASE_TL_ARBITER_STOPPED; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -256911,11 +298098,12 @@ index 000000000000..de76fa57051e + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + -+void __kbase_tlstream_jd_gpu_soft_reset( ++void __kbase_tlstream_tl_arbiter_requested( + struct kbase_tlstream *stream, -+ const void *gpu) ++ const void *gpu ++) +{ -+ const u32 msg_id = KBASE_JD_GPU_SOFT_RESET; ++ const u32 msg_id = KBASE_TL_ARBITER_REQUESTED; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(gpu) + ; @@ -256933,15 +298121,14 @@ index 000000000000..de76fa57051e + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + -+void __kbase_tlstream_aux_pm_state( ++void __kbase_tlstream_jd_gpu_soft_reset( + struct kbase_tlstream *stream, -+ u32 core_type, -+ u64 core_state_bitset) ++ const void *gpu ++) +{ -+ const u32 msg_id = KBASE_AUX_PM_STATE; ++ const u32 msg_id = KBASE_JD_GPU_SOFT_RESET; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) -+ + sizeof(core_type) -+ + sizeof(core_state_bitset) ++ + sizeof(gpu) + ; + char *buffer; + unsigned long acq_flags; @@ -256952,24 +298139,23 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &core_type, sizeof(core_type)); -+ pos = kbasep_serialize_bytes(buffer, -+ pos, &core_state_bitset, sizeof(core_state_bitset)); ++ pos, &gpu, sizeof(gpu)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + -+void __kbase_tlstream_aux_pagefault( ++void __kbase_tlstream_jd_tiler_heap_chunk_alloc( + struct kbase_tlstream *stream, + u32 ctx_nr, -+ u32 as_nr, -+ u64 page_cnt_change) ++ u64 heap_id, ++ u64 chunk_va ++) +{ -+ const u32 msg_id = KBASE_AUX_PAGEFAULT; ++ const u32 msg_id = KBASE_JD_TILER_HEAP_CHUNK_ALLOC; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(ctx_nr) -+ + sizeof(as_nr) -+ + sizeof(page_cnt_change) ++ + sizeof(heap_id) ++ + sizeof(chunk_va) + ; + char *buffer; + unsigned long acq_flags; @@ -256982,22 +298168,21 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, + pos, &ctx_nr, sizeof(ctx_nr)); + pos = kbasep_serialize_bytes(buffer, -+ pos, &as_nr, sizeof(as_nr)); ++ pos, &heap_id, sizeof(heap_id)); + pos = kbasep_serialize_bytes(buffer, -+ pos, &page_cnt_change, sizeof(page_cnt_change)); ++ pos, &chunk_va, sizeof(chunk_va)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + -+void __kbase_tlstream_aux_pagesalloc( ++void __kbase_tlstream_tl_js_sched_start( + struct kbase_tlstream *stream, -+ u32 ctx_nr, -+ u64 page_cnt) ++ u32 dummy ++) +{ -+ const u32 msg_id = KBASE_AUX_PAGESALLOC; ++ const u32 msg_id = KBASE_TL_JS_SCHED_START; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) -+ + sizeof(ctx_nr) -+ + sizeof(page_cnt) ++ + sizeof(dummy) + ; + char *buffer; + unsigned long acq_flags; @@ -257008,20 +298193,42 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &ctx_nr, sizeof(ctx_nr)); ++ pos, &dummy, sizeof(dummy)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_js_sched_end( ++ struct kbase_tlstream *stream, ++ u32 dummy ++) ++{ ++ const u32 msg_id = KBASE_TL_JS_SCHED_END; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(dummy) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &page_cnt, sizeof(page_cnt)); ++ pos, &dummy, sizeof(dummy)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + -+void __kbase_tlstream_aux_devfreq_target( ++void __kbase_tlstream_tl_jd_submit_atom_start( + struct kbase_tlstream *stream, -+ u64 target_freq) ++ const void *atom ++) +{ -+ const u32 msg_id = KBASE_AUX_DEVFREQ_TARGET; ++ const u32 msg_id = KBASE_TL_JD_SUBMIT_ATOM_START; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) -+ + sizeof(target_freq) ++ + sizeof(atom) + ; + char *buffer; + unsigned long acq_flags; @@ -257032,18 +298239,19 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &target_freq, sizeof(target_freq)); ++ pos, &atom, sizeof(atom)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + -+void __kbase_tlstream_aux_protected_enter_start( ++void __kbase_tlstream_tl_jd_submit_atom_end( + struct kbase_tlstream *stream, -+ const void *gpu) ++ const void *atom ++) +{ -+ const u32 msg_id = KBASE_AUX_PROTECTED_ENTER_START; ++ const u32 msg_id = KBASE_TL_JD_SUBMIT_ATOM_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) -+ + sizeof(gpu) ++ + sizeof(atom) + ; + char *buffer; + unsigned long acq_flags; @@ -257054,18 +298262,19 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &gpu, sizeof(gpu)); ++ pos, &atom, sizeof(atom)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + -+void __kbase_tlstream_aux_protected_enter_end( ++void __kbase_tlstream_tl_jd_done_no_lock_start( + struct kbase_tlstream *stream, -+ const void *gpu) ++ const void *atom ++) +{ -+ const u32 msg_id = KBASE_AUX_PROTECTED_ENTER_END; ++ const u32 msg_id = KBASE_TL_JD_DONE_NO_LOCK_START; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) -+ + sizeof(gpu) ++ + sizeof(atom) + ; + char *buffer; + unsigned long acq_flags; @@ -257076,18 +298285,19 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &gpu, sizeof(gpu)); ++ pos, &atom, sizeof(atom)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + -+void __kbase_tlstream_aux_protected_leave_start( ++void __kbase_tlstream_tl_jd_done_no_lock_end( + struct kbase_tlstream *stream, -+ const void *gpu) ++ const void *atom ++) +{ -+ const u32 msg_id = KBASE_AUX_PROTECTED_LEAVE_START; ++ const u32 msg_id = KBASE_TL_JD_DONE_NO_LOCK_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) -+ + sizeof(gpu) ++ + sizeof(atom) + ; + char *buffer; + unsigned long acq_flags; @@ -257098,18 +298308,19 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &gpu, sizeof(gpu)); ++ pos, &atom, sizeof(atom)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + -+void __kbase_tlstream_aux_protected_leave_end( ++void __kbase_tlstream_tl_jd_done_start( + struct kbase_tlstream *stream, -+ const void *gpu) ++ const void *atom ++) +{ -+ const u32 msg_id = KBASE_AUX_PROTECTED_LEAVE_END; ++ const u32 msg_id = KBASE_TL_JD_DONE_START; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) -+ + sizeof(gpu) ++ + sizeof(atom) + ; + char *buffer; + unsigned long acq_flags; @@ -257120,28 +298331,19 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &gpu, sizeof(gpu)); ++ pos, &atom, sizeof(atom)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + -+void __kbase_tlstream_aux_jit_stats( ++void __kbase_tlstream_tl_jd_done_end( + struct kbase_tlstream *stream, -+ u32 ctx_nr, -+ u32 bid, -+ u32 max_allocs, -+ u32 allocs, -+ u32 va_pages, -+ u32 ph_pages) ++ const void *atom ++) +{ -+ const u32 msg_id = KBASE_AUX_JIT_STATS; ++ const u32 msg_id = KBASE_TL_JD_DONE_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) -+ + sizeof(ctx_nr) -+ + sizeof(bid) -+ + sizeof(max_allocs) -+ + sizeof(allocs) -+ + sizeof(va_pages) -+ + sizeof(ph_pages) ++ + sizeof(atom) + ; + char *buffer; + unsigned long acq_flags; @@ -257152,34 +298354,98 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &ctx_nr, sizeof(ctx_nr)); ++ pos, &atom, sizeof(atom)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_jd_atom_complete( ++ struct kbase_tlstream *stream, ++ const void *atom ++) ++{ ++ const u32 msg_id = KBASE_TL_JD_ATOM_COMPLETE; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(atom) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &bid, sizeof(bid)); ++ pos, &atom, sizeof(atom)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_run_atom_start( ++ struct kbase_tlstream *stream, ++ const void *atom, ++ u32 atom_nr ++) ++{ ++ const u32 msg_id = KBASE_TL_RUN_ATOM_START; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(atom) ++ + sizeof(atom_nr) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &max_allocs, sizeof(max_allocs)); ++ pos, &atom, sizeof(atom)); + pos = kbasep_serialize_bytes(buffer, -+ pos, &allocs, sizeof(allocs)); ++ pos, &atom_nr, sizeof(atom_nr)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_run_atom_end( ++ struct kbase_tlstream *stream, ++ const void *atom, ++ u32 atom_nr ++) ++{ ++ const u32 msg_id = KBASE_TL_RUN_ATOM_END; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(atom) ++ + sizeof(atom_nr) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &va_pages, sizeof(va_pages)); ++ pos, &atom, sizeof(atom)); + pos = kbasep_serialize_bytes(buffer, -+ pos, &ph_pages, sizeof(ph_pages)); ++ pos, &atom_nr, sizeof(atom_nr)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + -+void __kbase_tlstream_aux_event_job_slot( ++void __kbase_tlstream_tl_attrib_atom_priority( + struct kbase_tlstream *stream, -+ const void *ctx, -+ u32 slot_nr, -+ u32 atom_nr, -+ u32 event) ++ const void *atom, ++ u32 prio ++) +{ -+ const u32 msg_id = KBASE_AUX_EVENT_JOB_SLOT; ++ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_PRIORITY; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) -+ + sizeof(ctx) -+ + sizeof(slot_nr) -+ + sizeof(atom_nr) -+ + sizeof(event) ++ + sizeof(atom) ++ + sizeof(prio) + ; + char *buffer; + unsigned long acq_flags; @@ -257190,13 +298456,114 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &ctx, sizeof(ctx)); ++ pos, &atom, sizeof(atom)); + pos = kbasep_serialize_bytes(buffer, -+ pos, &slot_nr, sizeof(slot_nr)); ++ pos, &prio, sizeof(prio)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_attrib_atom_state( ++ struct kbase_tlstream *stream, ++ const void *atom, ++ u32 state ++) ++{ ++ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_STATE; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(atom) ++ + sizeof(state) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &atom_nr, sizeof(atom_nr)); ++ pos, &atom, sizeof(atom)); + pos = kbasep_serialize_bytes(buffer, -+ pos, &event, sizeof(event)); ++ pos, &state, sizeof(state)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_attrib_atom_prioritized( ++ struct kbase_tlstream *stream, ++ const void *atom ++) ++{ ++ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_PRIORITIZED; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(atom) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &atom, sizeof(atom)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_attrib_atom_jit( ++ struct kbase_tlstream *stream, ++ const void *atom, ++ u64 edit_addr, ++ u64 new_addr, ++ u32 jit_flags, ++ u64 mem_flags, ++ u32 j_id, ++ u64 com_pgs, ++ u64 extent, ++ u64 va_pgs ++) ++{ ++ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_JIT; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(atom) ++ + sizeof(edit_addr) ++ + sizeof(new_addr) ++ + sizeof(jit_flags) ++ + sizeof(mem_flags) ++ + sizeof(j_id) ++ + sizeof(com_pgs) ++ + sizeof(extent) ++ + sizeof(va_pgs) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &atom, sizeof(atom)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &edit_addr, sizeof(edit_addr)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &new_addr, sizeof(new_addr)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &jit_flags, sizeof(jit_flags)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &mem_flags, sizeof(mem_flags)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &j_id, sizeof(j_id)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &com_pgs, sizeof(com_pgs)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &extent, sizeof(extent)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &va_pgs, sizeof(va_pgs)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} @@ -257206,7 +298573,11 @@ index 000000000000..de76fa57051e + u32 kbase_device_id, + u32 kbase_device_gpu_core_count, + u32 kbase_device_max_num_csgs, -+ u32 kbase_device_as_count) ++ u32 kbase_device_as_count, ++ u32 kbase_device_sb_entry_count, ++ u32 kbase_device_has_cross_stream_sync, ++ u32 kbase_device_supports_gpu_sleep ++) +{ + const u32 msg_id = KBASE_TL_KBASE_NEW_DEVICE; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257214,6 +298585,9 @@ index 000000000000..de76fa57051e + + sizeof(kbase_device_gpu_core_count) + + sizeof(kbase_device_max_num_csgs) + + sizeof(kbase_device_as_count) ++ + sizeof(kbase_device_sb_entry_count) ++ + sizeof(kbase_device_has_cross_stream_sync) ++ + sizeof(kbase_device_supports_gpu_sleep) + ; + char *buffer; + unsigned long acq_flags; @@ -257231,6 +298605,39 @@ index 000000000000..de76fa57051e + pos, &kbase_device_max_num_csgs, sizeof(kbase_device_max_num_csgs)); + pos = kbasep_serialize_bytes(buffer, + pos, &kbase_device_as_count, sizeof(kbase_device_as_count)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kbase_device_sb_entry_count, sizeof(kbase_device_sb_entry_count)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kbase_device_has_cross_stream_sync, sizeof(kbase_device_has_cross_stream_sync)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kbase_device_supports_gpu_sleep, sizeof(kbase_device_supports_gpu_sleep)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_gpucmdqueue_kick( ++ struct kbase_tlstream *stream, ++ u32 kernel_ctx_id, ++ u64 buffer_gpu_addr ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_GPUCMDQUEUE_KICK; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(kernel_ctx_id) ++ + sizeof(buffer_gpu_addr) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kernel_ctx_id, sizeof(kernel_ctx_id)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &buffer_gpu_addr, sizeof(buffer_gpu_addr)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} @@ -257238,14 +298645,19 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_kbase_device_program_csg( + struct kbase_tlstream *stream, + u32 kbase_device_id, ++ u32 kernel_ctx_id, + u32 gpu_cmdq_grp_handle, -+ u32 kbase_device_csg_slot_index) ++ u32 kbase_device_csg_slot_index, ++ u32 kbase_device_csg_slot_resuming ++) +{ + const u32 msg_id = KBASE_TL_KBASE_DEVICE_PROGRAM_CSG; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(kbase_device_id) ++ + sizeof(kernel_ctx_id) + + sizeof(gpu_cmdq_grp_handle) + + sizeof(kbase_device_csg_slot_index) ++ + sizeof(kbase_device_csg_slot_resuming) + ; + char *buffer; + unsigned long acq_flags; @@ -257258,9 +298670,13 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, + pos, &kbase_device_id, sizeof(kbase_device_id)); + pos = kbasep_serialize_bytes(buffer, ++ pos, &kernel_ctx_id, sizeof(kernel_ctx_id)); ++ pos = kbasep_serialize_bytes(buffer, + pos, &gpu_cmdq_grp_handle, sizeof(gpu_cmdq_grp_handle)); + pos = kbasep_serialize_bytes(buffer, + pos, &kbase_device_csg_slot_index, sizeof(kbase_device_csg_slot_index)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kbase_device_csg_slot_resuming, sizeof(kbase_device_csg_slot_resuming)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} @@ -257268,7 +298684,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_kbase_device_deprogram_csg( + struct kbase_tlstream *stream, + u32 kbase_device_id, -+ u32 kbase_device_csg_slot_index) ++ u32 kbase_device_csg_slot_index ++) +{ + const u32 msg_id = KBASE_TL_KBASE_DEVICE_DEPROGRAM_CSG; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257291,10 +298708,96 @@ index 000000000000..de76fa57051e + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + ++void __kbase_tlstream_tl_kbase_device_halting_csg( ++ struct kbase_tlstream *stream, ++ u32 kbase_device_id, ++ u32 kbase_device_csg_slot_index, ++ u32 kbase_device_csg_slot_suspending ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_DEVICE_HALTING_CSG; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(kbase_device_id) ++ + sizeof(kbase_device_csg_slot_index) ++ + sizeof(kbase_device_csg_slot_suspending) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kbase_device_id, sizeof(kbase_device_id)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kbase_device_csg_slot_index, sizeof(kbase_device_csg_slot_index)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kbase_device_csg_slot_suspending, sizeof(kbase_device_csg_slot_suspending)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_device_suspend_csg( ++ struct kbase_tlstream *stream, ++ u32 kbase_device_id, ++ u32 kbase_device_csg_slot_index ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_DEVICE_SUSPEND_CSG; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(kbase_device_id) ++ + sizeof(kbase_device_csg_slot_index) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kbase_device_id, sizeof(kbase_device_id)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kbase_device_csg_slot_index, sizeof(kbase_device_csg_slot_index)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_device_csg_idle( ++ struct kbase_tlstream *stream, ++ u32 kbase_device_id, ++ u32 kbase_device_csg_slot_index ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_DEVICE_CSG_IDLE; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(kbase_device_id) ++ + sizeof(kbase_device_csg_slot_index) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kbase_device_id, sizeof(kbase_device_id)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kbase_device_csg_slot_index, sizeof(kbase_device_csg_slot_index)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ +void __kbase_tlstream_tl_kbase_new_ctx( + struct kbase_tlstream *stream, + u32 kernel_ctx_id, -+ u32 kbase_device_id) ++ u32 kbase_device_id ++) +{ + const u32 msg_id = KBASE_TL_KBASE_NEW_CTX; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257319,7 +298822,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_del_ctx( + struct kbase_tlstream *stream, -+ u32 kernel_ctx_id) ++ u32 kernel_ctx_id ++) +{ + const u32 msg_id = KBASE_TL_KBASE_DEL_CTX; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257342,7 +298846,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_kbase_ctx_assign_as( + struct kbase_tlstream *stream, + u32 kernel_ctx_id, -+ u32 kbase_device_as_index) ++ u32 kbase_device_as_index ++) +{ + const u32 msg_id = KBASE_TL_KBASE_CTX_ASSIGN_AS; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257367,7 +298872,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_ctx_unassign_as( + struct kbase_tlstream *stream, -+ u32 kernel_ctx_id) ++ u32 kernel_ctx_id ++) +{ + const u32 msg_id = KBASE_TL_KBASE_CTX_UNASSIGN_AS; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257390,12 +298896,15 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_kbase_new_kcpuqueue( + struct kbase_tlstream *stream, + const void *kcpu_queue, ++ u32 kcpu_queue_id, + u32 kernel_ctx_id, -+ u32 kcpuq_num_pending_cmds) ++ u32 kcpuq_num_pending_cmds ++) +{ + const u32 msg_id = KBASE_TL_KBASE_NEW_KCPUQUEUE; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(kcpu_queue) ++ + sizeof(kcpu_queue_id) + + sizeof(kernel_ctx_id) + + sizeof(kcpuq_num_pending_cmds) + ; @@ -257410,6 +298919,8 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, + pos, &kcpu_queue, sizeof(kcpu_queue)); + pos = kbasep_serialize_bytes(buffer, ++ pos, &kcpu_queue_id, sizeof(kcpu_queue_id)); ++ pos = kbasep_serialize_bytes(buffer, + pos, &kernel_ctx_id, sizeof(kernel_ctx_id)); + pos = kbasep_serialize_bytes(buffer, + pos, &kcpuq_num_pending_cmds, sizeof(kcpuq_num_pending_cmds)); @@ -257419,7 +298930,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_del_kcpuqueue( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_DEL_KCPUQUEUE; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257442,7 +298954,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_fence_signal( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ const void *fence) ++ const void *fence ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_FENCE_SIGNAL; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257468,7 +298981,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_fence_wait( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ const void *fence) ++ const void *fence ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_FENCE_WAIT; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257495,13 +299009,16 @@ index 000000000000..de76fa57051e + struct kbase_tlstream *stream, + const void *kcpu_queue, + u64 cqs_obj_gpu_addr, -+ u32 cqs_obj_compare_value) ++ u32 compare_value, ++ u32 inherit_error ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(kcpu_queue) + + sizeof(cqs_obj_gpu_addr) -+ + sizeof(cqs_obj_compare_value) ++ + sizeof(compare_value) ++ + sizeof(inherit_error) + ; + char *buffer; + unsigned long acq_flags; @@ -257516,7 +299033,9 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, + pos, &cqs_obj_gpu_addr, sizeof(cqs_obj_gpu_addr)); + pos = kbasep_serialize_bytes(buffer, -+ pos, &cqs_obj_compare_value, sizeof(cqs_obj_compare_value)); ++ pos, &compare_value, sizeof(compare_value)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &inherit_error, sizeof(inherit_error)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} @@ -257524,7 +299043,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_cqs_set( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ u64 cqs_obj_gpu_addr) ++ u64 cqs_obj_gpu_addr ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257547,10 +299067,93 @@ index 000000000000..de76fa57051e + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + ++void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_cqs_wait_operation( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue, ++ u64 cqs_obj_gpu_addr, ++ u64 compare_value, ++ u32 condition, ++ u32 data_type, ++ u32 inherit_error ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT_OPERATION; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(kcpu_queue) ++ + sizeof(cqs_obj_gpu_addr) ++ + sizeof(compare_value) ++ + sizeof(condition) ++ + sizeof(data_type) ++ + sizeof(inherit_error) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kcpu_queue, sizeof(kcpu_queue)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &cqs_obj_gpu_addr, sizeof(cqs_obj_gpu_addr)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &compare_value, sizeof(compare_value)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &condition, sizeof(condition)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &data_type, sizeof(data_type)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &inherit_error, sizeof(inherit_error)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_cqs_set_operation( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue, ++ u64 cqs_obj_gpu_addr, ++ u64 value, ++ u32 operation, ++ u32 data_type ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET_OPERATION; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(kcpu_queue) ++ + sizeof(cqs_obj_gpu_addr) ++ + sizeof(value) ++ + sizeof(operation) ++ + sizeof(data_type) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kcpu_queue, sizeof(kcpu_queue)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &cqs_obj_gpu_addr, sizeof(cqs_obj_gpu_addr)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &value, sizeof(value)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &operation, sizeof(operation)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &data_type, sizeof(data_type)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_map_import( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ u64 map_import_buf_gpu_addr) ++ u64 map_import_buf_gpu_addr ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_MAP_IMPORT; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257576,7 +299179,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_unmap_import( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ u64 map_import_buf_gpu_addr) ++ u64 map_import_buf_gpu_addr ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257602,7 +299206,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_unmap_import_force( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ u64 map_import_buf_gpu_addr) ++ u64 map_import_buf_gpu_addr ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT_FORCE; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257627,7 +299232,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_array_begin_kcpuqueue_enqueue_jit_alloc( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_ENQUEUE_JIT_ALLOC; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257658,7 +299264,8 @@ index 000000000000..de76fa57051e + u32 jit_alloc_bin_id, + u32 jit_alloc_max_allocations, + u32 jit_alloc_flags, -+ u32 jit_alloc_usage_id) ++ u32 jit_alloc_usage_id ++) +{ + const u32 msg_id = KBASE_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_ENQUEUE_JIT_ALLOC; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257707,7 +299314,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_array_end_kcpuqueue_enqueue_jit_alloc( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_ARRAY_END_KCPUQUEUE_ENQUEUE_JIT_ALLOC; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257729,7 +299337,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_array_begin_kcpuqueue_enqueue_jit_free( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_ENQUEUE_JIT_FREE; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257752,7 +299361,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_kbase_array_item_kcpuqueue_enqueue_jit_free( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ u32 jit_alloc_jit_id) ++ u32 jit_alloc_jit_id ++) +{ + const u32 msg_id = KBASE_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_ENQUEUE_JIT_FREE; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257777,7 +299387,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_array_end_kcpuqueue_enqueue_jit_free( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_ARRAY_END_KCPUQUEUE_ENQUEUE_JIT_FREE; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257797,9 +299408,64 @@ index 000000000000..de76fa57051e + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + ++void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_error_barrier( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_ERROR_BARRIER; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(kcpu_queue) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kcpu_queue, sizeof(kcpu_queue)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_group_suspend( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue, ++ const void *group_suspend_buf, ++ u32 gpu_cmdq_grp_handle ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_ENQUEUE_GROUP_SUSPEND; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(kcpu_queue) ++ + sizeof(group_suspend_buf) ++ + sizeof(gpu_cmdq_grp_handle) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kcpu_queue, sizeof(kcpu_queue)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &group_suspend_buf, sizeof(group_suspend_buf)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &gpu_cmdq_grp_handle, sizeof(gpu_cmdq_grp_handle)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_fence_signal_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_START; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257821,11 +299487,14 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_fence_signal_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue, ++ u32 execute_error ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(kcpu_queue) ++ + sizeof(execute_error) + ; + char *buffer; + unsigned long acq_flags; @@ -257837,13 +299506,16 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, + pos, &kcpu_queue, sizeof(kcpu_queue)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &execute_error, sizeof(execute_error)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_fence_wait_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_START; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257865,11 +299537,14 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_fence_wait_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue, ++ u32 execute_error ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(kcpu_queue) ++ + sizeof(execute_error) + ; + char *buffer; + unsigned long acq_flags; @@ -257881,13 +299556,16 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, + pos, &kcpu_queue, sizeof(kcpu_queue)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &execute_error, sizeof(execute_error)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_wait_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_START; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257909,11 +299587,14 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_wait_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue, ++ u32 execute_error ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(kcpu_queue) ++ + sizeof(execute_error) + ; + char *buffer; + unsigned long acq_flags; @@ -257925,17 +299606,22 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, + pos, &kcpu_queue, sizeof(kcpu_queue)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &execute_error, sizeof(execute_error)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_set( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue, ++ u32 execute_error ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(kcpu_queue) ++ + sizeof(execute_error) + ; + char *buffer; + unsigned long acq_flags; @@ -257947,13 +299633,93 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, + pos, &kcpu_queue, sizeof(kcpu_queue)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &execute_error, sizeof(execute_error)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_wait_operation_start( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_OPERATION_START; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(kcpu_queue) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kcpu_queue, sizeof(kcpu_queue)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_wait_operation_end( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue, ++ u32 execute_error ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_OPERATION_END; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(kcpu_queue) ++ + sizeof(execute_error) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kcpu_queue, sizeof(kcpu_queue)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &execute_error, sizeof(execute_error)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_set_operation( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue, ++ u32 execute_error ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET_OPERATION; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(kcpu_queue) ++ + sizeof(execute_error) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kcpu_queue, sizeof(kcpu_queue)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &execute_error, sizeof(execute_error)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_map_import_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_START; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -257975,11 +299741,14 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_map_import_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue, ++ u32 execute_error ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(kcpu_queue) ++ + sizeof(execute_error) + ; + char *buffer; + unsigned long acq_flags; @@ -257991,13 +299760,16 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, + pos, &kcpu_queue, sizeof(kcpu_queue)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &execute_error, sizeof(execute_error)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_unmap_import_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_START; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -258019,11 +299791,14 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_unmap_import_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue, ++ u32 execute_error ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(kcpu_queue) ++ + sizeof(execute_error) + ; + char *buffer; + unsigned long acq_flags; @@ -258035,13 +299810,16 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, + pos, &kcpu_queue, sizeof(kcpu_queue)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &execute_error, sizeof(execute_error)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_unmap_import_force_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_FORCE_START; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -258063,11 +299841,14 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_unmap_import_force_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue, ++ u32 execute_error ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_FORCE_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(kcpu_queue) ++ + sizeof(execute_error) + ; + char *buffer; + unsigned long acq_flags; @@ -258079,13 +299860,16 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, + pos, &kcpu_queue, sizeof(kcpu_queue)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &execute_error, sizeof(execute_error)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_jit_alloc_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_ALLOC_START; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -258107,7 +299891,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_array_begin_kcpuqueue_execute_jit_alloc_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_EXECUTE_JIT_ALLOC_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -258130,12 +299915,15 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_kbase_array_item_kcpuqueue_execute_jit_alloc_end( + struct kbase_tlstream *stream, + const void *kcpu_queue, ++ u32 execute_error, + u64 jit_alloc_gpu_alloc_addr, -+ u64 jit_alloc_mmu_flags) ++ u64 jit_alloc_mmu_flags ++) +{ + const u32 msg_id = KBASE_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_ALLOC_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(kcpu_queue) ++ + sizeof(execute_error) + + sizeof(jit_alloc_gpu_alloc_addr) + + sizeof(jit_alloc_mmu_flags) + ; @@ -258150,6 +299938,8 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, + pos, &kcpu_queue, sizeof(kcpu_queue)); + pos = kbasep_serialize_bytes(buffer, ++ pos, &execute_error, sizeof(execute_error)); ++ pos = kbasep_serialize_bytes(buffer, + pos, &jit_alloc_gpu_alloc_addr, sizeof(jit_alloc_gpu_alloc_addr)); + pos = kbasep_serialize_bytes(buffer, + pos, &jit_alloc_mmu_flags, sizeof(jit_alloc_mmu_flags)); @@ -258159,7 +299949,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_array_end_kcpuqueue_execute_jit_alloc_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_ALLOC_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -258181,7 +299972,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_jit_free_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_FREE_START; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -258203,7 +299995,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_array_begin_kcpuqueue_execute_jit_free_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_EXECUTE_JIT_FREE_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -258226,11 +300019,14 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_kbase_array_item_kcpuqueue_execute_jit_free_end( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ u64 jit_free_pages_used) ++ u32 execute_error, ++ u64 jit_free_pages_used ++) +{ + const u32 msg_id = KBASE_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_FREE_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(kcpu_queue) ++ + sizeof(execute_error) + + sizeof(jit_free_pages_used) + ; + char *buffer; @@ -258244,6 +300040,8 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, + pos, &kcpu_queue, sizeof(kcpu_queue)); + pos = kbasep_serialize_bytes(buffer, ++ pos, &execute_error, sizeof(execute_error)); ++ pos = kbasep_serialize_bytes(buffer, + pos, &jit_free_pages_used, sizeof(jit_free_pages_used)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); @@ -258251,7 +300049,8 @@ index 000000000000..de76fa57051e + +void __kbase_tlstream_tl_kbase_array_end_kcpuqueue_execute_jit_free_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue ++) +{ + const u32 msg_id = KBASE_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_FREE_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -258271,13 +300070,62 @@ index 000000000000..de76fa57051e + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + -+void __kbase_tlstream_tl_kbase_kcpuqueue_execute_errorbarrier( ++void __kbase_tlstream_tl_kbase_kcpuqueue_execute_error_barrier( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_ERROR_BARRIER; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(kcpu_queue) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kcpu_queue, sizeof(kcpu_queue)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_execute_group_suspend_start( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_GROUP_SUSPEND_START; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(kcpu_queue) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kcpu_queue, sizeof(kcpu_queue)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_execute_group_suspend_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue) ++ const void *kcpu_queue, ++ u32 execute_error ++) +{ -+ const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_ERRORBARRIER; ++ const u32 msg_id = KBASE_TL_KBASE_KCPUQUEUE_EXECUTE_GROUP_SUSPEND_END; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) + + sizeof(kcpu_queue) ++ + sizeof(execute_error) + ; + char *buffer; + unsigned long acq_flags; @@ -258289,6 +300137,169 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, + pos, &kcpu_queue, sizeof(kcpu_queue)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &execute_error, sizeof(execute_error)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_csffw_fw_reloading( ++ struct kbase_tlstream *stream, ++ u64 csffw_cycle ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_CSFFW_FW_RELOADING; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(csffw_cycle) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &csffw_cycle, sizeof(csffw_cycle)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_csffw_fw_enabling( ++ struct kbase_tlstream *stream, ++ u64 csffw_cycle ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_CSFFW_FW_ENABLING; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(csffw_cycle) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &csffw_cycle, sizeof(csffw_cycle)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_csffw_fw_request_sleep( ++ struct kbase_tlstream *stream, ++ u64 csffw_cycle ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_CSFFW_FW_REQUEST_SLEEP; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(csffw_cycle) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &csffw_cycle, sizeof(csffw_cycle)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_csffw_fw_request_wakeup( ++ struct kbase_tlstream *stream, ++ u64 csffw_cycle ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_CSFFW_FW_REQUEST_WAKEUP; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(csffw_cycle) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &csffw_cycle, sizeof(csffw_cycle)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_csffw_fw_request_halt( ++ struct kbase_tlstream *stream, ++ u64 csffw_cycle ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_CSFFW_FW_REQUEST_HALT; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(csffw_cycle) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &csffw_cycle, sizeof(csffw_cycle)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_csffw_fw_disabling( ++ struct kbase_tlstream *stream, ++ u64 csffw_cycle ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_CSFFW_FW_DISABLING; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(csffw_cycle) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &csffw_cycle, sizeof(csffw_cycle)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_tl_kbase_csffw_fw_off( ++ struct kbase_tlstream *stream, ++ u64 csffw_cycle ++) ++{ ++ const u32 msg_id = KBASE_TL_KBASE_CSFFW_FW_OFF; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(csffw_cycle) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &csffw_cycle, sizeof(csffw_cycle)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} @@ -258296,7 +300307,8 @@ index 000000000000..de76fa57051e +void __kbase_tlstream_tl_kbase_csffw_tlstream_overflow( + struct kbase_tlstream *stream, + u64 csffw_timestamp, -+ u64 csffw_cycle) ++ u64 csffw_cycle ++) +{ + const u32 msg_id = KBASE_TL_KBASE_CSFFW_TLSTREAM_OVERFLOW; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) @@ -258319,13 +300331,16 @@ index 000000000000..de76fa57051e + kbase_tlstream_msgbuf_release(stream, acq_flags); +} + -+void __kbase_tlstream_tl_kbase_csffw_reset( ++void __kbase_tlstream_aux_pm_state( + struct kbase_tlstream *stream, -+ u64 csffw_cycle) ++ u32 core_type, ++ u64 core_state_bitset ++) +{ -+ const u32 msg_id = KBASE_TL_KBASE_CSFFW_RESET; ++ const u32 msg_id = KBASE_AUX_PM_STATE; + const size_t msg_size = sizeof(msg_id) + sizeof(u64) -+ + sizeof(csffw_cycle) ++ + sizeof(core_type) ++ + sizeof(core_state_bitset) + ; + char *buffer; + unsigned long acq_flags; @@ -258336,7 +300351,354 @@ index 000000000000..de76fa57051e + pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); + pos = kbasep_serialize_timestamp(buffer, pos); + pos = kbasep_serialize_bytes(buffer, -+ pos, &csffw_cycle, sizeof(csffw_cycle)); ++ pos, &core_type, sizeof(core_type)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &core_state_bitset, sizeof(core_state_bitset)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_aux_pagefault( ++ struct kbase_tlstream *stream, ++ u32 ctx_nr, ++ u32 as_nr, ++ u64 page_cnt_change ++) ++{ ++ const u32 msg_id = KBASE_AUX_PAGEFAULT; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(ctx_nr) ++ + sizeof(as_nr) ++ + sizeof(page_cnt_change) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &ctx_nr, sizeof(ctx_nr)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &as_nr, sizeof(as_nr)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &page_cnt_change, sizeof(page_cnt_change)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_aux_pagesalloc( ++ struct kbase_tlstream *stream, ++ u32 ctx_nr, ++ u64 page_cnt ++) ++{ ++ const u32 msg_id = KBASE_AUX_PAGESALLOC; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(ctx_nr) ++ + sizeof(page_cnt) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &ctx_nr, sizeof(ctx_nr)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &page_cnt, sizeof(page_cnt)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_aux_devfreq_target( ++ struct kbase_tlstream *stream, ++ u64 target_freq ++) ++{ ++ const u32 msg_id = KBASE_AUX_DEVFREQ_TARGET; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(target_freq) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &target_freq, sizeof(target_freq)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_aux_jit_stats( ++ struct kbase_tlstream *stream, ++ u32 ctx_nr, ++ u32 bid, ++ u32 max_allocs, ++ u32 allocs, ++ u32 va_pages, ++ u32 ph_pages ++) ++{ ++ const u32 msg_id = KBASE_AUX_JIT_STATS; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(ctx_nr) ++ + sizeof(bid) ++ + sizeof(max_allocs) ++ + sizeof(allocs) ++ + sizeof(va_pages) ++ + sizeof(ph_pages) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &ctx_nr, sizeof(ctx_nr)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &bid, sizeof(bid)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &max_allocs, sizeof(max_allocs)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &allocs, sizeof(allocs)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &va_pages, sizeof(va_pages)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &ph_pages, sizeof(ph_pages)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_aux_tiler_heap_stats( ++ struct kbase_tlstream *stream, ++ u32 ctx_nr, ++ u64 heap_id, ++ u32 va_pages, ++ u32 ph_pages, ++ u32 max_chunks, ++ u32 chunk_size, ++ u32 chunk_count, ++ u32 target_in_flight, ++ u32 nr_in_flight ++) ++{ ++ const u32 msg_id = KBASE_AUX_TILER_HEAP_STATS; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(ctx_nr) ++ + sizeof(heap_id) ++ + sizeof(va_pages) ++ + sizeof(ph_pages) ++ + sizeof(max_chunks) ++ + sizeof(chunk_size) ++ + sizeof(chunk_count) ++ + sizeof(target_in_flight) ++ + sizeof(nr_in_flight) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &ctx_nr, sizeof(ctx_nr)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &heap_id, sizeof(heap_id)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &va_pages, sizeof(va_pages)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &ph_pages, sizeof(ph_pages)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &max_chunks, sizeof(max_chunks)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &chunk_size, sizeof(chunk_size)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &chunk_count, sizeof(chunk_count)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &target_in_flight, sizeof(target_in_flight)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &nr_in_flight, sizeof(nr_in_flight)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_aux_event_job_slot( ++ struct kbase_tlstream *stream, ++ const void *ctx, ++ u32 slot_nr, ++ u32 atom_nr, ++ u32 event ++) ++{ ++ const u32 msg_id = KBASE_AUX_EVENT_JOB_SLOT; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(ctx) ++ + sizeof(slot_nr) ++ + sizeof(atom_nr) ++ + sizeof(event) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &ctx, sizeof(ctx)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &slot_nr, sizeof(slot_nr)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &atom_nr, sizeof(atom_nr)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &event, sizeof(event)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_aux_protected_enter_start( ++ struct kbase_tlstream *stream, ++ const void *gpu ++) ++{ ++ const u32 msg_id = KBASE_AUX_PROTECTED_ENTER_START; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(gpu) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &gpu, sizeof(gpu)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_aux_protected_enter_end( ++ struct kbase_tlstream *stream, ++ const void *gpu ++) ++{ ++ const u32 msg_id = KBASE_AUX_PROTECTED_ENTER_END; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(gpu) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &gpu, sizeof(gpu)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_aux_mmu_command( ++ struct kbase_tlstream *stream, ++ u32 kernel_ctx_id, ++ u32 mmu_cmd_id, ++ u32 mmu_synchronicity, ++ u64 mmu_lock_addr, ++ u32 mmu_lock_page_num ++) ++{ ++ const u32 msg_id = KBASE_AUX_MMU_COMMAND; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(kernel_ctx_id) ++ + sizeof(mmu_cmd_id) ++ + sizeof(mmu_synchronicity) ++ + sizeof(mmu_lock_addr) ++ + sizeof(mmu_lock_page_num) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &kernel_ctx_id, sizeof(kernel_ctx_id)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &mmu_cmd_id, sizeof(mmu_cmd_id)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &mmu_synchronicity, sizeof(mmu_synchronicity)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &mmu_lock_addr, sizeof(mmu_lock_addr)); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &mmu_lock_page_num, sizeof(mmu_lock_page_num)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_aux_protected_leave_start( ++ struct kbase_tlstream *stream, ++ const void *gpu ++) ++{ ++ const u32 msg_id = KBASE_AUX_PROTECTED_LEAVE_START; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(gpu) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &gpu, sizeof(gpu)); ++ ++ kbase_tlstream_msgbuf_release(stream, acq_flags); ++} ++ ++void __kbase_tlstream_aux_protected_leave_end( ++ struct kbase_tlstream *stream, ++ const void *gpu ++) ++{ ++ const u32 msg_id = KBASE_AUX_PROTECTED_LEAVE_END; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) ++ + sizeof(gpu) ++ ; ++ char *buffer; ++ unsigned long acq_flags; ++ size_t pos = 0; ++ ++ buffer = kbase_tlstream_msgbuf_acquire(stream, msg_size, &acq_flags); ++ ++ pos = kbasep_serialize_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_serialize_timestamp(buffer, pos); ++ pos = kbasep_serialize_bytes(buffer, ++ pos, &gpu, sizeof(gpu)); + + kbase_tlstream_msgbuf_release(stream, acq_flags); +} @@ -258344,18 +300706,19 @@ index 000000000000..de76fa57051e +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h new file mode 100755 -index 000000000000..5651f0a0fc57 +index 000000000..06e4ca4a6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h -@@ -0,0 +1,2926 @@ +@@ -0,0 +1,4382 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * -+ * (C) COPYRIGHT 2010-2020 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2023 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * of such GNU license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -258366,12 +300729,10 @@ index 000000000000..5651f0a0fc57 + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * -+ * SPDX-License-Identifier: GPL-2.0 -+ * + */ + +/* -+ * THIS FILE IS AUTOGENERATED BY mali_trace_generator.py. ++ * THIS FILE IS AUTOGENERATED BY generate_tracepoints.py. + * DO NOT EDIT. + */ + @@ -258428,118 +300789,138 @@ index 000000000000..5651f0a0fc57 +#define TL_JS_EVENT_STOP GATOR_JOB_SLOT_STOP +#define TL_JS_EVENT_SOFT_STOP GATOR_JOB_SLOT_SOFT_STOPPED + -+#define TLSTREAM_ENABLED (1 << 31) ++#define TLSTREAM_ENABLED (1u << 31) + +void __kbase_tlstream_tl_new_ctx( + struct kbase_tlstream *stream, + const void *ctx, + u32 ctx_nr, -+ u32 tgid); ++ u32 tgid ++); ++ +void __kbase_tlstream_tl_new_gpu( + struct kbase_tlstream *stream, + const void *gpu, + u32 gpu_id, -+ u32 core_count); ++ u32 core_count ++); ++ +void __kbase_tlstream_tl_new_lpu( + struct kbase_tlstream *stream, + const void *lpu, + u32 lpu_nr, -+ u32 lpu_fn); ++ u32 lpu_fn ++); ++ +void __kbase_tlstream_tl_new_atom( + struct kbase_tlstream *stream, + const void *atom, -+ u32 atom_nr); ++ u32 atom_nr ++); ++ +void __kbase_tlstream_tl_new_as( + struct kbase_tlstream *stream, + const void *address_space, -+ u32 as_nr); ++ u32 as_nr ++); ++ +void __kbase_tlstream_tl_del_ctx( + struct kbase_tlstream *stream, -+ const void *ctx); ++ const void *ctx ++); ++ +void __kbase_tlstream_tl_del_atom( + struct kbase_tlstream *stream, -+ const void *atom); ++ const void *atom ++); ++ +void __kbase_tlstream_tl_lifelink_lpu_gpu( + struct kbase_tlstream *stream, + const void *lpu, -+ const void *gpu); ++ const void *gpu ++); ++ +void __kbase_tlstream_tl_lifelink_as_gpu( + struct kbase_tlstream *stream, + const void *address_space, -+ const void *gpu); ++ const void *gpu ++); ++ +void __kbase_tlstream_tl_ret_ctx_lpu( + struct kbase_tlstream *stream, + const void *ctx, -+ const void *lpu); ++ const void *lpu ++); ++ +void __kbase_tlstream_tl_ret_atom_ctx( + struct kbase_tlstream *stream, + const void *atom, -+ const void *ctx); ++ const void *ctx ++); ++ +void __kbase_tlstream_tl_ret_atom_lpu( + struct kbase_tlstream *stream, + const void *atom, + const void *lpu, -+ const char *attrib_match_list); ++ const char *attrib_match_list ++); ++ +void __kbase_tlstream_tl_nret_ctx_lpu( + struct kbase_tlstream *stream, + const void *ctx, -+ const void *lpu); ++ const void *lpu ++); ++ +void __kbase_tlstream_tl_nret_atom_ctx( + struct kbase_tlstream *stream, + const void *atom, -+ const void *ctx); ++ const void *ctx ++); ++ +void __kbase_tlstream_tl_nret_atom_lpu( + struct kbase_tlstream *stream, + const void *atom, -+ const void *lpu); ++ const void *lpu ++); ++ +void __kbase_tlstream_tl_ret_as_ctx( + struct kbase_tlstream *stream, + const void *address_space, -+ const void *ctx); ++ const void *ctx ++); ++ +void __kbase_tlstream_tl_nret_as_ctx( + struct kbase_tlstream *stream, + const void *address_space, -+ const void *ctx); ++ const void *ctx ++); ++ +void __kbase_tlstream_tl_ret_atom_as( + struct kbase_tlstream *stream, + const void *atom, -+ const void *address_space); ++ const void *address_space ++); ++ +void __kbase_tlstream_tl_nret_atom_as( + struct kbase_tlstream *stream, + const void *atom, -+ const void *address_space); ++ const void *address_space ++); ++ +void __kbase_tlstream_tl_attrib_atom_config( + struct kbase_tlstream *stream, + const void *atom, + u64 descriptor, + u64 affinity, -+ u32 config); -+void __kbase_tlstream_tl_attrib_atom_priority( -+ struct kbase_tlstream *stream, -+ const void *atom, -+ u32 prio); -+void __kbase_tlstream_tl_attrib_atom_state( -+ struct kbase_tlstream *stream, -+ const void *atom, -+ u32 state); -+void __kbase_tlstream_tl_attrib_atom_prioritized( -+ struct kbase_tlstream *stream, -+ const void *atom); -+void __kbase_tlstream_tl_attrib_atom_jit( -+ struct kbase_tlstream *stream, -+ const void *atom, -+ u64 edit_addr, -+ u64 new_addr, -+ u32 jit_flags, -+ u64 mem_flags, -+ u32 j_id, -+ u64 com_pgs, -+ u64 extent, -+ u64 va_pgs); ++ u32 config ++); ++ +void __kbase_tlstream_tl_jit_usedpages( + struct kbase_tlstream *stream, + u64 used_pages, -+ u32 j_id); ++ u32 j_id ++); ++ +void __kbase_tlstream_tl_attrib_atom_jitallocinfo( + struct kbase_tlstream *stream, + const void *atom, @@ -258550,158 +300931,326 @@ index 000000000000..5651f0a0fc57 + u32 bin_id, + u32 max_allocs, + u32 jit_flags, -+ u32 usg_id); ++ u32 usg_id ++); ++ +void __kbase_tlstream_tl_attrib_atom_jitfreeinfo( + struct kbase_tlstream *stream, + const void *atom, -+ u32 j_id); ++ u32 j_id ++); ++ +void __kbase_tlstream_tl_attrib_as_config( + struct kbase_tlstream *stream, + const void *address_space, + u64 transtab, + u64 memattr, -+ u64 transcfg); ++ u64 transcfg ++); ++ +void __kbase_tlstream_tl_event_lpu_softstop( + struct kbase_tlstream *stream, -+ const void *lpu); ++ const void *lpu ++); ++ +void __kbase_tlstream_tl_event_atom_softstop_ex( + struct kbase_tlstream *stream, -+ const void *atom); ++ const void *atom ++); ++ +void __kbase_tlstream_tl_event_atom_softstop_issue( + struct kbase_tlstream *stream, -+ const void *atom); ++ const void *atom ++); ++ +void __kbase_tlstream_tl_event_atom_softjob_start( + struct kbase_tlstream *stream, -+ const void *atom); ++ const void *atom ++); ++ +void __kbase_tlstream_tl_event_atom_softjob_end( + struct kbase_tlstream *stream, -+ const void *atom); ++ const void *atom ++); ++ +void __kbase_tlstream_tl_arbiter_granted( + struct kbase_tlstream *stream, -+ const void *gpu); ++ const void *gpu ++); ++ +void __kbase_tlstream_tl_arbiter_started( + struct kbase_tlstream *stream, -+ const void *gpu); ++ const void *gpu ++); ++ +void __kbase_tlstream_tl_arbiter_stop_requested( + struct kbase_tlstream *stream, -+ const void *gpu); ++ const void *gpu ++); ++ +void __kbase_tlstream_tl_arbiter_stopped( + struct kbase_tlstream *stream, -+ const void *gpu); -+void __kbase_tlstream_jd_gpu_soft_reset( ++ const void *gpu ++); ++ ++void __kbase_tlstream_tl_arbiter_requested( + struct kbase_tlstream *stream, -+ const void *gpu); -+void __kbase_tlstream_aux_pm_state( ++ const void *gpu ++); ++ ++void __kbase_tlstream_jd_gpu_soft_reset( + struct kbase_tlstream *stream, -+ u32 core_type, -+ u64 core_state_bitset); -+void __kbase_tlstream_aux_pagefault( ++ const void *gpu ++); ++ ++void __kbase_tlstream_jd_tiler_heap_chunk_alloc( + struct kbase_tlstream *stream, + u32 ctx_nr, -+ u32 as_nr, -+ u64 page_cnt_change); -+void __kbase_tlstream_aux_pagesalloc( ++ u64 heap_id, ++ u64 chunk_va ++); ++ ++void __kbase_tlstream_tl_js_sched_start( + struct kbase_tlstream *stream, -+ u32 ctx_nr, -+ u64 page_cnt); -+void __kbase_tlstream_aux_devfreq_target( ++ u32 dummy ++); ++ ++void __kbase_tlstream_tl_js_sched_end( + struct kbase_tlstream *stream, -+ u64 target_freq); -+void __kbase_tlstream_aux_protected_enter_start( ++ u32 dummy ++); ++ ++void __kbase_tlstream_tl_jd_submit_atom_start( + struct kbase_tlstream *stream, -+ const void *gpu); -+void __kbase_tlstream_aux_protected_enter_end( ++ const void *atom ++); ++ ++void __kbase_tlstream_tl_jd_submit_atom_end( + struct kbase_tlstream *stream, -+ const void *gpu); -+void __kbase_tlstream_aux_protected_leave_start( ++ const void *atom ++); ++ ++void __kbase_tlstream_tl_jd_done_no_lock_start( + struct kbase_tlstream *stream, -+ const void *gpu); -+void __kbase_tlstream_aux_protected_leave_end( ++ const void *atom ++); ++ ++void __kbase_tlstream_tl_jd_done_no_lock_end( + struct kbase_tlstream *stream, -+ const void *gpu); -+void __kbase_tlstream_aux_jit_stats( ++ const void *atom ++); ++ ++void __kbase_tlstream_tl_jd_done_start( + struct kbase_tlstream *stream, -+ u32 ctx_nr, -+ u32 bid, -+ u32 max_allocs, -+ u32 allocs, -+ u32 va_pages, -+ u32 ph_pages); -+void __kbase_tlstream_aux_event_job_slot( ++ const void *atom ++); ++ ++void __kbase_tlstream_tl_jd_done_end( + struct kbase_tlstream *stream, -+ const void *ctx, -+ u32 slot_nr, -+ u32 atom_nr, -+ u32 event); ++ const void *atom ++); ++ ++void __kbase_tlstream_tl_jd_atom_complete( ++ struct kbase_tlstream *stream, ++ const void *atom ++); ++ ++void __kbase_tlstream_tl_run_atom_start( ++ struct kbase_tlstream *stream, ++ const void *atom, ++ u32 atom_nr ++); ++ ++void __kbase_tlstream_tl_run_atom_end( ++ struct kbase_tlstream *stream, ++ const void *atom, ++ u32 atom_nr ++); ++ ++void __kbase_tlstream_tl_attrib_atom_priority( ++ struct kbase_tlstream *stream, ++ const void *atom, ++ u32 prio ++); ++ ++void __kbase_tlstream_tl_attrib_atom_state( ++ struct kbase_tlstream *stream, ++ const void *atom, ++ u32 state ++); ++ ++void __kbase_tlstream_tl_attrib_atom_prioritized( ++ struct kbase_tlstream *stream, ++ const void *atom ++); ++ ++void __kbase_tlstream_tl_attrib_atom_jit( ++ struct kbase_tlstream *stream, ++ const void *atom, ++ u64 edit_addr, ++ u64 new_addr, ++ u32 jit_flags, ++ u64 mem_flags, ++ u32 j_id, ++ u64 com_pgs, ++ u64 extent, ++ u64 va_pgs ++); ++ +void __kbase_tlstream_tl_kbase_new_device( + struct kbase_tlstream *stream, + u32 kbase_device_id, + u32 kbase_device_gpu_core_count, + u32 kbase_device_max_num_csgs, -+ u32 kbase_device_as_count); ++ u32 kbase_device_as_count, ++ u32 kbase_device_sb_entry_count, ++ u32 kbase_device_has_cross_stream_sync, ++ u32 kbase_device_supports_gpu_sleep ++); ++ ++void __kbase_tlstream_tl_kbase_gpucmdqueue_kick( ++ struct kbase_tlstream *stream, ++ u32 kernel_ctx_id, ++ u64 buffer_gpu_addr ++); ++ +void __kbase_tlstream_tl_kbase_device_program_csg( + struct kbase_tlstream *stream, + u32 kbase_device_id, ++ u32 kernel_ctx_id, + u32 gpu_cmdq_grp_handle, -+ u32 kbase_device_csg_slot_index); ++ u32 kbase_device_csg_slot_index, ++ u32 kbase_device_csg_slot_resuming ++); ++ +void __kbase_tlstream_tl_kbase_device_deprogram_csg( + struct kbase_tlstream *stream, + u32 kbase_device_id, -+ u32 kbase_device_csg_slot_index); ++ u32 kbase_device_csg_slot_index ++); ++ ++void __kbase_tlstream_tl_kbase_device_halting_csg( ++ struct kbase_tlstream *stream, ++ u32 kbase_device_id, ++ u32 kbase_device_csg_slot_index, ++ u32 kbase_device_csg_slot_suspending ++); ++ ++void __kbase_tlstream_tl_kbase_device_suspend_csg( ++ struct kbase_tlstream *stream, ++ u32 kbase_device_id, ++ u32 kbase_device_csg_slot_index ++); ++ ++void __kbase_tlstream_tl_kbase_device_csg_idle( ++ struct kbase_tlstream *stream, ++ u32 kbase_device_id, ++ u32 kbase_device_csg_slot_index ++); ++ +void __kbase_tlstream_tl_kbase_new_ctx( + struct kbase_tlstream *stream, + u32 kernel_ctx_id, -+ u32 kbase_device_id); ++ u32 kbase_device_id ++); ++ +void __kbase_tlstream_tl_kbase_del_ctx( + struct kbase_tlstream *stream, -+ u32 kernel_ctx_id); ++ u32 kernel_ctx_id ++); ++ +void __kbase_tlstream_tl_kbase_ctx_assign_as( + struct kbase_tlstream *stream, + u32 kernel_ctx_id, -+ u32 kbase_device_as_index); ++ u32 kbase_device_as_index ++); ++ +void __kbase_tlstream_tl_kbase_ctx_unassign_as( + struct kbase_tlstream *stream, -+ u32 kernel_ctx_id); ++ u32 kernel_ctx_id ++); ++ +void __kbase_tlstream_tl_kbase_new_kcpuqueue( + struct kbase_tlstream *stream, + const void *kcpu_queue, ++ u32 kcpu_queue_id, + u32 kernel_ctx_id, -+ u32 kcpuq_num_pending_cmds); ++ u32 kcpuq_num_pending_cmds ++); ++ +void __kbase_tlstream_tl_kbase_del_kcpuqueue( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_fence_signal( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ const void *fence); ++ const void *fence ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_fence_wait( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ const void *fence); ++ const void *fence ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_cqs_wait( + struct kbase_tlstream *stream, + const void *kcpu_queue, + u64 cqs_obj_gpu_addr, -+ u32 cqs_obj_compare_value); ++ u32 compare_value, ++ u32 inherit_error ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_cqs_set( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ u64 cqs_obj_gpu_addr); ++ u64 cqs_obj_gpu_addr ++); ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_cqs_wait_operation( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue, ++ u64 cqs_obj_gpu_addr, ++ u64 compare_value, ++ u32 condition, ++ u32 data_type, ++ u32 inherit_error ++); ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_cqs_set_operation( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue, ++ u64 cqs_obj_gpu_addr, ++ u64 value, ++ u32 operation, ++ u32 data_type ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_map_import( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ u64 map_import_buf_gpu_addr); ++ u64 map_import_buf_gpu_addr ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_unmap_import( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ u64 map_import_buf_gpu_addr); ++ u64 map_import_buf_gpu_addr ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_unmap_import_force( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ u64 map_import_buf_gpu_addr); ++ u64 map_import_buf_gpu_addr ++); ++ +void __kbase_tlstream_tl_kbase_array_begin_kcpuqueue_enqueue_jit_alloc( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_array_item_kcpuqueue_enqueue_jit_alloc( + struct kbase_tlstream *stream, + const void *kcpu_queue, @@ -258713,102 +301262,321 @@ index 000000000000..5651f0a0fc57 + u32 jit_alloc_bin_id, + u32 jit_alloc_max_allocations, + u32 jit_alloc_flags, -+ u32 jit_alloc_usage_id); ++ u32 jit_alloc_usage_id ++); ++ +void __kbase_tlstream_tl_kbase_array_end_kcpuqueue_enqueue_jit_alloc( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_array_begin_kcpuqueue_enqueue_jit_free( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_array_item_kcpuqueue_enqueue_jit_free( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ u32 jit_alloc_jit_id); ++ u32 jit_alloc_jit_id ++); ++ +void __kbase_tlstream_tl_kbase_array_end_kcpuqueue_enqueue_jit_free( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_error_barrier( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue ++); ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_group_suspend( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue, ++ const void *group_suspend_buf, ++ u32 gpu_cmdq_grp_handle ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_fence_signal_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_fence_signal_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue, ++ u32 execute_error ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_fence_wait_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_fence_wait_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue, ++ u32 execute_error ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_wait_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_wait_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue, ++ u32 execute_error ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_set( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue, ++ u32 execute_error ++); ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_wait_operation_start( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue ++); ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_wait_operation_end( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue, ++ u32 execute_error ++); ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_set_operation( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue, ++ u32 execute_error ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_map_import_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_map_import_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue, ++ u32 execute_error ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_unmap_import_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_unmap_import_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue, ++ u32 execute_error ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_unmap_import_force_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_unmap_import_force_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue, ++ u32 execute_error ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_jit_alloc_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_array_begin_kcpuqueue_execute_jit_alloc_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_array_item_kcpuqueue_execute_jit_alloc_end( + struct kbase_tlstream *stream, + const void *kcpu_queue, ++ u32 execute_error, + u64 jit_alloc_gpu_alloc_addr, -+ u64 jit_alloc_mmu_flags); ++ u64 jit_alloc_mmu_flags ++); ++ +void __kbase_tlstream_tl_kbase_array_end_kcpuqueue_execute_jit_alloc_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_kcpuqueue_execute_jit_free_start( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_array_begin_kcpuqueue_execute_jit_free_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ const void *kcpu_queue ++); ++ +void __kbase_tlstream_tl_kbase_array_item_kcpuqueue_execute_jit_free_end( + struct kbase_tlstream *stream, + const void *kcpu_queue, -+ u64 jit_free_pages_used); ++ u32 execute_error, ++ u64 jit_free_pages_used ++); ++ +void __kbase_tlstream_tl_kbase_array_end_kcpuqueue_execute_jit_free_end( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); -+void __kbase_tlstream_tl_kbase_kcpuqueue_execute_errorbarrier( ++ const void *kcpu_queue ++); ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_execute_error_barrier( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue ++); ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_execute_group_suspend_start( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue ++); ++ ++void __kbase_tlstream_tl_kbase_kcpuqueue_execute_group_suspend_end( ++ struct kbase_tlstream *stream, ++ const void *kcpu_queue, ++ u32 execute_error ++); ++ ++void __kbase_tlstream_tl_kbase_csffw_fw_reloading( ++ struct kbase_tlstream *stream, ++ u64 csffw_cycle ++); ++ ++void __kbase_tlstream_tl_kbase_csffw_fw_enabling( ++ struct kbase_tlstream *stream, ++ u64 csffw_cycle ++); ++ ++void __kbase_tlstream_tl_kbase_csffw_fw_request_sleep( ++ struct kbase_tlstream *stream, ++ u64 csffw_cycle ++); ++ ++void __kbase_tlstream_tl_kbase_csffw_fw_request_wakeup( ++ struct kbase_tlstream *stream, ++ u64 csffw_cycle ++); ++ ++void __kbase_tlstream_tl_kbase_csffw_fw_request_halt( ++ struct kbase_tlstream *stream, ++ u64 csffw_cycle ++); ++ ++void __kbase_tlstream_tl_kbase_csffw_fw_disabling( ++ struct kbase_tlstream *stream, ++ u64 csffw_cycle ++); ++ ++void __kbase_tlstream_tl_kbase_csffw_fw_off( + struct kbase_tlstream *stream, -+ const void *kcpu_queue); ++ u64 csffw_cycle ++); ++ +void __kbase_tlstream_tl_kbase_csffw_tlstream_overflow( + struct kbase_tlstream *stream, + u64 csffw_timestamp, -+ u64 csffw_cycle); -+void __kbase_tlstream_tl_kbase_csffw_reset( ++ u64 csffw_cycle ++); ++ ++void __kbase_tlstream_aux_pm_state( ++ struct kbase_tlstream *stream, ++ u32 core_type, ++ u64 core_state_bitset ++); ++ ++void __kbase_tlstream_aux_pagefault( ++ struct kbase_tlstream *stream, ++ u32 ctx_nr, ++ u32 as_nr, ++ u64 page_cnt_change ++); ++ ++void __kbase_tlstream_aux_pagesalloc( ++ struct kbase_tlstream *stream, ++ u32 ctx_nr, ++ u64 page_cnt ++); ++ ++void __kbase_tlstream_aux_devfreq_target( ++ struct kbase_tlstream *stream, ++ u64 target_freq ++); ++ ++void __kbase_tlstream_aux_jit_stats( ++ struct kbase_tlstream *stream, ++ u32 ctx_nr, ++ u32 bid, ++ u32 max_allocs, ++ u32 allocs, ++ u32 va_pages, ++ u32 ph_pages ++); ++ ++void __kbase_tlstream_aux_tiler_heap_stats( ++ struct kbase_tlstream *stream, ++ u32 ctx_nr, ++ u64 heap_id, ++ u32 va_pages, ++ u32 ph_pages, ++ u32 max_chunks, ++ u32 chunk_size, ++ u32 chunk_count, ++ u32 target_in_flight, ++ u32 nr_in_flight ++); ++ ++void __kbase_tlstream_aux_event_job_slot( ++ struct kbase_tlstream *stream, ++ const void *ctx, ++ u32 slot_nr, ++ u32 atom_nr, ++ u32 event ++); ++ ++void __kbase_tlstream_aux_protected_enter_start( ++ struct kbase_tlstream *stream, ++ const void *gpu ++); ++ ++void __kbase_tlstream_aux_protected_enter_end( ++ struct kbase_tlstream *stream, ++ const void *gpu ++); ++ ++void __kbase_tlstream_aux_mmu_command( ++ struct kbase_tlstream *stream, ++ u32 kernel_ctx_id, ++ u32 mmu_cmd_id, ++ u32 mmu_synchronicity, ++ u64 mmu_lock_addr, ++ u32 mmu_lock_page_num ++); ++ ++void __kbase_tlstream_aux_protected_leave_start( ++ struct kbase_tlstream *stream, ++ const void *gpu ++); ++ ++void __kbase_tlstream_aux_protected_leave_end( + struct kbase_tlstream *stream, -+ u64 csffw_cycle); ++ const void *gpu ++); + +struct kbase_tlstream; + +/** -+ * KBASE_TLSTREAM_TL_NEW_CTX - -+ * object ctx is created ++ * KBASE_TLSTREAM_TL_NEW_CTX - object ctx is created + * + * @kbdev: Kbase device + * @ctx: Name of the context object @@ -258826,12 +301594,14 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_new_ctx( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ ctx, ctx_nr, tgid); \ ++ ctx, \ ++ ctx_nr, \ ++ tgid \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_NEW_GPU - -+ * object gpu is created ++ * KBASE_TLSTREAM_TL_NEW_GPU - object gpu is created + * + * @kbdev: Kbase device + * @gpu: Name of the GPU object @@ -258849,12 +301619,14 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_new_gpu( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ gpu, gpu_id, core_count); \ ++ gpu, \ ++ gpu_id, \ ++ core_count \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_NEW_LPU - -+ * object lpu is created ++ * KBASE_TLSTREAM_TL_NEW_LPU - object lpu is created + * + * @kbdev: Kbase device + * @lpu: Name of the Logical Processing Unit object @@ -258872,12 +301644,14 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_new_lpu( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ lpu, lpu_nr, lpu_fn); \ ++ lpu, \ ++ lpu_nr, \ ++ lpu_fn \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_NEW_ATOM - -+ * object atom is created ++ * KBASE_TLSTREAM_TL_NEW_ATOM - object atom is created + * + * @kbdev: Kbase device + * @atom: Atom identifier @@ -258893,12 +301667,13 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_new_atom( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom, atom_nr); \ ++ atom, \ ++ atom_nr \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_NEW_AS - -+ * address space object is created ++ * KBASE_TLSTREAM_TL_NEW_AS - address space object is created + * + * @kbdev: Kbase device + * @address_space: Name of the address space object @@ -258914,12 +301689,13 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_new_as( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ address_space, as_nr); \ ++ address_space, \ ++ as_nr \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_DEL_CTX - -+ * context is destroyed ++ * KBASE_TLSTREAM_TL_DEL_CTX - context is destroyed + * + * @kbdev: Kbase device + * @ctx: Name of the context object @@ -258933,12 +301709,12 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_del_ctx( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ ctx); \ ++ ctx \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_DEL_ATOM - -+ * atom is destroyed ++ * KBASE_TLSTREAM_TL_DEL_ATOM - atom is destroyed + * + * @kbdev: Kbase device + * @atom: Atom identifier @@ -258952,12 +301728,12 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_del_atom( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom); \ ++ atom \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_LIFELINK_LPU_GPU - -+ * lpu is deleted with gpu ++ * KBASE_TLSTREAM_TL_LIFELINK_LPU_GPU - lpu is deleted with gpu + * + * @kbdev: Kbase device + * @lpu: Name of the Logical Processing Unit object @@ -258973,12 +301749,13 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_lifelink_lpu_gpu( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ lpu, gpu); \ ++ lpu, \ ++ gpu \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_LIFELINK_AS_GPU - -+ * address space is deleted with gpu ++ * KBASE_TLSTREAM_TL_LIFELINK_AS_GPU - address space is deleted with gpu + * + * @kbdev: Kbase device + * @address_space: Name of the address space object @@ -258994,12 +301771,13 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_lifelink_as_gpu( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ address_space, gpu); \ ++ address_space, \ ++ gpu \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_RET_CTX_LPU - -+ * context is retained by lpu ++ * KBASE_TLSTREAM_TL_RET_CTX_LPU - context is retained by lpu + * + * @kbdev: Kbase device + * @ctx: Name of the context object @@ -259015,12 +301793,13 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_ret_ctx_lpu( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ ctx, lpu); \ ++ ctx, \ ++ lpu \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_RET_ATOM_CTX - -+ * atom is retained by context ++ * KBASE_TLSTREAM_TL_RET_ATOM_CTX - atom is retained by context + * + * @kbdev: Kbase device + * @atom: Atom identifier @@ -259036,12 +301815,13 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_ret_atom_ctx( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom, ctx); \ ++ atom, \ ++ ctx \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_RET_ATOM_LPU - -+ * atom is retained by lpu ++ * KBASE_TLSTREAM_TL_RET_ATOM_LPU - atom is retained by lpu + * + * @kbdev: Kbase device + * @atom: Atom identifier @@ -259059,12 +301839,14 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_ret_atom_lpu( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom, lpu, attrib_match_list); \ ++ atom, \ ++ lpu, \ ++ attrib_match_list \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_NRET_CTX_LPU - -+ * context is released by lpu ++ * KBASE_TLSTREAM_TL_NRET_CTX_LPU - context is released by lpu + * + * @kbdev: Kbase device + * @ctx: Name of the context object @@ -259080,12 +301862,13 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_nret_ctx_lpu( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ ctx, lpu); \ ++ ctx, \ ++ lpu \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_NRET_ATOM_CTX - -+ * atom is released by context ++ * KBASE_TLSTREAM_TL_NRET_ATOM_CTX - atom is released by context + * + * @kbdev: Kbase device + * @atom: Atom identifier @@ -259101,12 +301884,13 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_nret_atom_ctx( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom, ctx); \ ++ atom, \ ++ ctx \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_NRET_ATOM_LPU - -+ * atom is released by lpu ++ * KBASE_TLSTREAM_TL_NRET_ATOM_LPU - atom is released by lpu + * + * @kbdev: Kbase device + * @atom: Atom identifier @@ -259122,12 +301906,13 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_nret_atom_lpu( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom, lpu); \ ++ atom, \ ++ lpu \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_RET_AS_CTX - -+ * address space is retained by context ++ * KBASE_TLSTREAM_TL_RET_AS_CTX - address space is retained by context + * + * @kbdev: Kbase device + * @address_space: Name of the address space object @@ -259143,12 +301928,13 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_ret_as_ctx( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ address_space, ctx); \ ++ address_space, \ ++ ctx \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_NRET_AS_CTX - -+ * address space is released by context ++ * KBASE_TLSTREAM_TL_NRET_AS_CTX - address space is released by context + * + * @kbdev: Kbase device + * @address_space: Name of the address space object @@ -259164,12 +301950,13 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_nret_as_ctx( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ address_space, ctx); \ ++ address_space, \ ++ ctx \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_RET_ATOM_AS - -+ * atom is retained by address space ++ * KBASE_TLSTREAM_TL_RET_ATOM_AS - atom is retained by address space + * + * @kbdev: Kbase device + * @atom: Atom identifier @@ -259185,12 +301972,13 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_ret_atom_as( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom, address_space); \ ++ atom, \ ++ address_space \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_NRET_ATOM_AS - -+ * atom is released by address space ++ * KBASE_TLSTREAM_TL_NRET_ATOM_AS - atom is released by address space + * + * @kbdev: Kbase device + * @atom: Atom identifier @@ -259206,12 +301994,13 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_nret_atom_as( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom, address_space); \ ++ atom, \ ++ address_space \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_CONFIG - -+ * atom job slot attributes ++ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_CONFIG - atom job slot attributes + * + * @kbdev: Kbase device + * @atom: Atom identifier @@ -259231,117 +302020,19 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_attrib_atom_config( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom, descriptor, affinity, config); \ -+ } while (0) -+ -+/** -+ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY - -+ * atom priority -+ * -+ * @kbdev: Kbase device -+ * @atom: Atom identifier -+ * @prio: Atom priority -+ */ -+#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY( \ -+ kbdev, \ -+ atom, \ -+ prio \ -+ ) \ -+ do { \ -+ int enabled = atomic_read(&kbdev->timeline_flags); \ -+ if (enabled & BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS) \ -+ __kbase_tlstream_tl_attrib_atom_priority( \ -+ __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom, prio); \ -+ } while (0) -+ -+/** -+ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE - -+ * atom state -+ * -+ * @kbdev: Kbase device -+ * @atom: Atom identifier -+ * @state: Atom state -+ */ -+#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE( \ -+ kbdev, \ -+ atom, \ -+ state \ -+ ) \ -+ do { \ -+ int enabled = atomic_read(&kbdev->timeline_flags); \ -+ if (enabled & BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS) \ -+ __kbase_tlstream_tl_attrib_atom_state( \ -+ __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom, state); \ -+ } while (0) -+ -+/** -+ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITIZED - -+ * atom caused priority change -+ * -+ * @kbdev: Kbase device -+ * @atom: Atom identifier -+ */ -+#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITIZED( \ -+ kbdev, \ -+ atom \ -+ ) \ -+ do { \ -+ int enabled = atomic_read(&kbdev->timeline_flags); \ -+ if (enabled & BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS) \ -+ __kbase_tlstream_tl_attrib_atom_prioritized( \ -+ __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom); \ -+ } while (0) -+ -+/** -+ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_JIT - -+ * jit done for atom -+ * -+ * @kbdev: Kbase device -+ * @atom: Atom identifier -+ * @edit_addr: Address edited by jit -+ * @new_addr: Address placed into the edited location -+ * @jit_flags: Flags specifying the special requirements for -+ * the JIT allocation. -+ * @mem_flags: Flags defining the properties of a memory region -+ * @j_id: Unique ID provided by the caller, this is used -+ * to pair allocation and free requests. -+ * @com_pgs: The minimum number of physical pages which -+ * should back the allocation. -+ * @extent: Granularity of physical pages to grow the -+ * allocation by during a fault. -+ * @va_pgs: The minimum number of virtual pages required -+ */ -+#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_JIT( \ -+ kbdev, \ -+ atom, \ -+ edit_addr, \ -+ new_addr, \ -+ jit_flags, \ -+ mem_flags, \ -+ j_id, \ -+ com_pgs, \ -+ extent, \ -+ va_pgs \ -+ ) \ -+ do { \ -+ int enabled = atomic_read(&kbdev->timeline_flags); \ -+ if (enabled & BASE_TLSTREAM_JOB_DUMPING_ENABLED) \ -+ __kbase_tlstream_tl_attrib_atom_jit( \ -+ __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom, edit_addr, new_addr, jit_flags, mem_flags, j_id, com_pgs, extent, va_pgs); \ ++ atom, \ ++ descriptor, \ ++ affinity, \ ++ config \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_JIT_USEDPAGES - -+ * used pages for jit ++ * KBASE_TLSTREAM_TL_JIT_USEDPAGES - used pages for jit + * + * @kbdev: Kbase device + * @used_pages: Number of pages used for jit -+ * @j_id: Unique ID provided by the caller, this is used -+ * to pair allocation and free requests. ++ * @j_id: Unique ID provided by the caller, this is used to pair allocation and free requests. + */ +#define KBASE_TLSTREAM_TL_JIT_USEDPAGES( \ + kbdev, \ @@ -259353,28 +302044,23 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_jit_usedpages( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ used_pages, j_id); \ ++ used_pages, \ ++ j_id \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_JITALLOCINFO - -+ * Information about JIT allocations ++ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_JITALLOCINFO - Information about JIT allocations + * + * @kbdev: Kbase device + * @atom: Atom identifier + * @va_pgs: The minimum number of virtual pages required -+ * @com_pgs: The minimum number of physical pages which -+ * should back the allocation. -+ * @extent: Granularity of physical pages to grow the -+ * allocation by during a fault. -+ * @j_id: Unique ID provided by the caller, this is used -+ * to pair allocation and free requests. -+ * @bin_id: The JIT allocation bin, used in conjunction with -+ * max_allocations to limit the number of each -+ * type of JIT allocation. ++ * @com_pgs: The minimum number of physical pages which should back the allocation. ++ * @extent: Granularity of physical pages to grow the allocation by during a fault. ++ * @j_id: Unique ID provided by the caller, this is used to pair allocation and free requests. ++ * @bin_id: The JIT allocation bin, used in conjunction with max_allocations to limit the number of each type of JIT allocation. + * @max_allocs: Maximum allocations allowed in this bin. -+ * @jit_flags: Flags specifying the special requirements for -+ * the JIT allocation. ++ * @jit_flags: Flags specifying the special requirements for the JIT allocation. + * @usg_id: A hint about which allocation should be reused. + */ +#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_JITALLOCINFO( \ @@ -259394,17 +302080,24 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_attrib_atom_jitallocinfo( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom, va_pgs, com_pgs, extent, j_id, bin_id, max_allocs, jit_flags, usg_id); \ ++ atom, \ ++ va_pgs, \ ++ com_pgs, \ ++ extent, \ ++ j_id, \ ++ bin_id, \ ++ max_allocs, \ ++ jit_flags, \ ++ usg_id \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_JITFREEINFO - -+ * Information about JIT frees ++ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_JITFREEINFO - Information about JIT frees + * + * @kbdev: Kbase device + * @atom: Atom identifier -+ * @j_id: Unique ID provided by the caller, this is used -+ * to pair allocation and free requests. ++ * @j_id: Unique ID provided by the caller, this is used to pair allocation and free requests. + */ +#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_JITFREEINFO( \ + kbdev, \ @@ -259416,12 +302109,13 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_attrib_atom_jitfreeinfo( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom, j_id); \ ++ atom, \ ++ j_id \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_ATTRIB_AS_CONFIG - -+ * address space attributes ++ * KBASE_TLSTREAM_TL_ATTRIB_AS_CONFIG - address space attributes + * + * @kbdev: Kbase device + * @address_space: Name of the address space object @@ -259441,12 +302135,15 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_attrib_as_config( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ address_space, transtab, memattr, transcfg); \ ++ address_space, \ ++ transtab, \ ++ memattr, \ ++ transcfg \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_EVENT_LPU_SOFTSTOP - -+ * softstop event on given lpu ++ * KBASE_TLSTREAM_TL_EVENT_LPU_SOFTSTOP - softstop event on given lpu + * + * @kbdev: Kbase device + * @lpu: Name of the Logical Processing Unit object @@ -259460,12 +302157,12 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_event_lpu_softstop( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ lpu); \ ++ lpu \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_EX - -+ * atom softstopped ++ * KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_EX - atom softstopped + * + * @kbdev: Kbase device + * @atom: Atom identifier @@ -259479,12 +302176,12 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_event_atom_softstop_ex( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom); \ ++ atom \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_ISSUE - -+ * atom softstop issued ++ * KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_ISSUE - atom softstop issued + * + * @kbdev: Kbase device + * @atom: Atom identifier @@ -259498,12 +302195,12 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_event_atom_softstop_issue( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom); \ ++ atom \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTJOB_START - -+ * atom soft job has started ++ * KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTJOB_START - atom soft job has started + * + * @kbdev: Kbase device + * @atom: Atom identifier @@ -259517,12 +302214,12 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_event_atom_softjob_start( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom); \ ++ atom \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTJOB_END - -+ * atom soft job has completed ++ * KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTJOB_END - atom soft job has completed + * + * @kbdev: Kbase device + * @atom: Atom identifier @@ -259536,12 +302233,12 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_event_atom_softjob_end( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ atom); \ ++ atom \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_ARBITER_GRANTED - -+ * Arbiter has granted gpu access ++ * KBASE_TLSTREAM_TL_ARBITER_GRANTED - Arbiter has granted gpu access + * + * @kbdev: Kbase device + * @gpu: Name of the GPU object @@ -259555,12 +302252,12 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_arbiter_granted( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ gpu); \ ++ gpu \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_ARBITER_STARTED - -+ * Driver is running again and able to process jobs ++ * KBASE_TLSTREAM_TL_ARBITER_STARTED - Driver is running again and able to process jobs + * + * @kbdev: Kbase device + * @gpu: Name of the GPU object @@ -259574,12 +302271,12 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_arbiter_started( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ gpu); \ ++ gpu \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_ARBITER_STOP_REQUESTED - -+ * Arbiter has requested driver to stop using gpu ++ * KBASE_TLSTREAM_TL_ARBITER_STOP_REQUESTED - Arbiter has requested driver to stop using gpu + * + * @kbdev: Kbase device + * @gpu: Name of the GPU object @@ -259593,12 +302290,12 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_arbiter_stop_requested( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ gpu); \ ++ gpu \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_ARBITER_STOPPED - -+ * Driver has stopped using gpu ++ * KBASE_TLSTREAM_TL_ARBITER_STOPPED - Driver has stopped using gpu + * + * @kbdev: Kbase device + * @gpu: Name of the GPU object @@ -259612,252 +302309,405 @@ index 000000000000..5651f0a0fc57 + if (enabled & TLSTREAM_ENABLED) \ + __kbase_tlstream_tl_arbiter_stopped( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ gpu); \ ++ gpu \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_JD_GPU_SOFT_RESET - -+ * gpu soft reset ++ * KBASE_TLSTREAM_TL_ARBITER_REQUESTED - Driver has requested the arbiter for gpu access + * + * @kbdev: Kbase device + * @gpu: Name of the GPU object + */ -+#define KBASE_TLSTREAM_JD_GPU_SOFT_RESET( \ ++#define KBASE_TLSTREAM_TL_ARBITER_REQUESTED( \ + kbdev, \ + gpu \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & TLSTREAM_ENABLED) \ -+ __kbase_tlstream_jd_gpu_soft_reset( \ ++ __kbase_tlstream_tl_arbiter_requested( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ gpu); \ ++ gpu \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_AUX_PM_STATE - -+ * PM state ++ * KBASE_TLSTREAM_JD_GPU_SOFT_RESET - gpu soft reset + * + * @kbdev: Kbase device -+ * @core_type: Core type (shader, tiler, l2 cache, l3 cache) -+ * @core_state_bitset: 64bits bitmask reporting power state of the cores -+ * (1-ON, 0-OFF) ++ * @gpu: Name of the GPU object + */ -+#define KBASE_TLSTREAM_AUX_PM_STATE( \ ++#define KBASE_TLSTREAM_JD_GPU_SOFT_RESET( \ + kbdev, \ -+ core_type, \ -+ core_state_bitset \ ++ gpu \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & TLSTREAM_ENABLED) \ -+ __kbase_tlstream_aux_pm_state( \ -+ __TL_DISPATCH_STREAM(kbdev, aux), \ -+ core_type, core_state_bitset); \ ++ __kbase_tlstream_jd_gpu_soft_reset( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ gpu \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_AUX_PAGEFAULT - -+ * Page fault ++ * KBASE_TLSTREAM_JD_TILER_HEAP_CHUNK_ALLOC - Tiler Heap Chunk Allocation + * + * @kbdev: Kbase device + * @ctx_nr: Kernel context number -+ * @as_nr: Address space number -+ * @page_cnt_change: Number of pages to be added ++ * @heap_id: Unique id used to represent a heap under a context ++ * @chunk_va: Virtual start address of tiler heap chunk + */ -+#define KBASE_TLSTREAM_AUX_PAGEFAULT( \ ++#define KBASE_TLSTREAM_JD_TILER_HEAP_CHUNK_ALLOC( \ + kbdev, \ + ctx_nr, \ -+ as_nr, \ -+ page_cnt_change \ ++ heap_id, \ ++ chunk_va \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & TLSTREAM_ENABLED) \ -+ __kbase_tlstream_aux_pagefault( \ -+ __TL_DISPATCH_STREAM(kbdev, aux), \ -+ ctx_nr, as_nr, page_cnt_change); \ ++ __kbase_tlstream_jd_tiler_heap_chunk_alloc( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ ctx_nr, \ ++ heap_id, \ ++ chunk_va \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_AUX_PAGESALLOC - -+ * Total alloc pages change ++ * KBASE_TLSTREAM_TL_JS_SCHED_START - Scheduling starts + * + * @kbdev: Kbase device -+ * @ctx_nr: Kernel context number -+ * @page_cnt: Number of pages used by the context ++ * @dummy: dummy argument + */ -+#define KBASE_TLSTREAM_AUX_PAGESALLOC( \ ++#define KBASE_TLSTREAM_TL_JS_SCHED_START( \ + kbdev, \ -+ ctx_nr, \ -+ page_cnt \ ++ dummy \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & TLSTREAM_ENABLED) \ -+ __kbase_tlstream_aux_pagesalloc( \ -+ __TL_DISPATCH_STREAM(kbdev, aux), \ -+ ctx_nr, page_cnt); \ ++ __kbase_tlstream_tl_js_sched_start( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ dummy \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_AUX_DEVFREQ_TARGET - -+ * New device frequency target ++ * KBASE_TLSTREAM_TL_JS_SCHED_END - Scheduling ends + * + * @kbdev: Kbase device -+ * @target_freq: New target frequency ++ * @dummy: dummy argument + */ -+#define KBASE_TLSTREAM_AUX_DEVFREQ_TARGET( \ ++#define KBASE_TLSTREAM_TL_JS_SCHED_END( \ + kbdev, \ -+ target_freq \ ++ dummy \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & TLSTREAM_ENABLED) \ -+ __kbase_tlstream_aux_devfreq_target( \ -+ __TL_DISPATCH_STREAM(kbdev, aux), \ -+ target_freq); \ ++ __kbase_tlstream_tl_js_sched_end( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ dummy \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_AUX_PROTECTED_ENTER_START - -+ * enter protected mode start ++ * KBASE_TLSTREAM_TL_JD_SUBMIT_ATOM_START - Submitting an atom starts + * + * @kbdev: Kbase device -+ * @gpu: Name of the GPU object ++ * @atom: Atom identifier + */ -+#define KBASE_TLSTREAM_AUX_PROTECTED_ENTER_START( \ ++#define KBASE_TLSTREAM_TL_JD_SUBMIT_ATOM_START( \ + kbdev, \ -+ gpu \ ++ atom \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ -+ if (enabled & BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS) \ -+ __kbase_tlstream_aux_protected_enter_start( \ -+ __TL_DISPATCH_STREAM(kbdev, aux), \ -+ gpu); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_tl_jd_submit_atom_start( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ atom \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_AUX_PROTECTED_ENTER_END - -+ * enter protected mode end ++ * KBASE_TLSTREAM_TL_JD_SUBMIT_ATOM_END - Submitting an atom ends + * + * @kbdev: Kbase device -+ * @gpu: Name of the GPU object ++ * @atom: Atom identifier + */ -+#define KBASE_TLSTREAM_AUX_PROTECTED_ENTER_END( \ ++#define KBASE_TLSTREAM_TL_JD_SUBMIT_ATOM_END( \ + kbdev, \ -+ gpu \ ++ atom \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ -+ if (enabled & BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS) \ -+ __kbase_tlstream_aux_protected_enter_end( \ -+ __TL_DISPATCH_STREAM(kbdev, aux), \ -+ gpu); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_tl_jd_submit_atom_end( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ atom \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_START - -+ * leave protected mode start ++ * KBASE_TLSTREAM_TL_JD_DONE_NO_LOCK_START - Within function kbase_jd_done_nolock + * + * @kbdev: Kbase device -+ * @gpu: Name of the GPU object ++ * @atom: Atom identifier + */ -+#define KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_START( \ ++#define KBASE_TLSTREAM_TL_JD_DONE_NO_LOCK_START( \ + kbdev, \ -+ gpu \ ++ atom \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ -+ if (enabled & BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS) \ -+ __kbase_tlstream_aux_protected_leave_start( \ -+ __TL_DISPATCH_STREAM(kbdev, aux), \ -+ gpu); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_tl_jd_done_no_lock_start( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ atom \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_END - -+ * leave protected mode end ++ * KBASE_TLSTREAM_TL_JD_DONE_NO_LOCK_END - Within function kbase_jd_done_nolock - end + * + * @kbdev: Kbase device -+ * @gpu: Name of the GPU object ++ * @atom: Atom identifier + */ -+#define KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_END( \ ++#define KBASE_TLSTREAM_TL_JD_DONE_NO_LOCK_END( \ + kbdev, \ -+ gpu \ ++ atom \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ -+ if (enabled & BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS) \ -+ __kbase_tlstream_aux_protected_leave_end( \ -+ __TL_DISPATCH_STREAM(kbdev, aux), \ -+ gpu); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_tl_jd_done_no_lock_end( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ atom \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_AUX_JIT_STATS - -+ * per-bin JIT statistics ++ * KBASE_TLSTREAM_TL_JD_DONE_START - Start of kbase_jd_done + * + * @kbdev: Kbase device -+ * @ctx_nr: Kernel context number -+ * @bid: JIT bin id -+ * @max_allocs: Maximum allocations allowed in this bin. -+ * @allocs: Number of active allocations in this bin -+ * @va_pages: Number of virtual pages allocated in this bin -+ * @ph_pages: Number of physical pages allocated in this bin ++ * @atom: Atom identifier + */ -+#define KBASE_TLSTREAM_AUX_JIT_STATS( \ ++#define KBASE_TLSTREAM_TL_JD_DONE_START( \ + kbdev, \ -+ ctx_nr, \ -+ bid, \ -+ max_allocs, \ -+ allocs, \ -+ va_pages, \ -+ ph_pages \ ++ atom \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & TLSTREAM_ENABLED) \ -+ __kbase_tlstream_aux_jit_stats( \ -+ __TL_DISPATCH_STREAM(kbdev, aux), \ -+ ctx_nr, bid, max_allocs, allocs, va_pages, ph_pages); \ ++ __kbase_tlstream_tl_jd_done_start( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ atom \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_AUX_EVENT_JOB_SLOT - -+ * event on a given job slot ++ * KBASE_TLSTREAM_TL_JD_DONE_END - End of kbase_jd_done + * + * @kbdev: Kbase device -+ * @ctx: Name of the context object -+ * @slot_nr: Job slot number ++ * @atom: Atom identifier ++ */ ++#define KBASE_TLSTREAM_TL_JD_DONE_END( \ ++ kbdev, \ ++ atom \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_tl_jd_done_end( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ atom \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_TL_JD_ATOM_COMPLETE - Atom marked complete ++ * ++ * @kbdev: Kbase device ++ * @atom: Atom identifier ++ */ ++#define KBASE_TLSTREAM_TL_JD_ATOM_COMPLETE( \ ++ kbdev, \ ++ atom \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_tl_jd_atom_complete( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ atom \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_TL_RUN_ATOM_START - Running of atom starts ++ * ++ * @kbdev: Kbase device ++ * @atom: Atom identifier + * @atom_nr: Sequential number of an atom -+ * @event: Event type. One of TL_JS_EVENT values + */ -+#define KBASE_TLSTREAM_AUX_EVENT_JOB_SLOT( \ ++#define KBASE_TLSTREAM_TL_RUN_ATOM_START( \ + kbdev, \ -+ ctx, \ -+ slot_nr, \ -+ atom_nr, \ -+ event \ ++ atom, \ ++ atom_nr \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & TLSTREAM_ENABLED) \ -+ __kbase_tlstream_aux_event_job_slot( \ -+ __TL_DISPATCH_STREAM(kbdev, aux), \ -+ ctx, slot_nr, atom_nr, event); \ ++ __kbase_tlstream_tl_run_atom_start( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ atom, \ ++ atom_nr \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_TL_RUN_ATOM_END - Running of atom ends ++ * ++ * @kbdev: Kbase device ++ * @atom: Atom identifier ++ * @atom_nr: Sequential number of an atom ++ */ ++#define KBASE_TLSTREAM_TL_RUN_ATOM_END( \ ++ kbdev, \ ++ atom, \ ++ atom_nr \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_tl_run_atom_end( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ atom, \ ++ atom_nr \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY - atom priority ++ * ++ * @kbdev: Kbase device ++ * @atom: Atom identifier ++ * @prio: Atom priority ++ */ ++#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY( \ ++ kbdev, \ ++ atom, \ ++ prio \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS) \ ++ __kbase_tlstream_tl_attrib_atom_priority( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ atom, \ ++ prio \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE - atom state ++ * ++ * @kbdev: Kbase device ++ * @atom: Atom identifier ++ * @state: Atom state ++ */ ++#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE( \ ++ kbdev, \ ++ atom, \ ++ state \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS) \ ++ __kbase_tlstream_tl_attrib_atom_state( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ atom, \ ++ state \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITIZED - atom caused priority change ++ * ++ * @kbdev: Kbase device ++ * @atom: Atom identifier ++ */ ++#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITIZED( \ ++ kbdev, \ ++ atom \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS) \ ++ __kbase_tlstream_tl_attrib_atom_prioritized( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ atom \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_JIT - jit done for atom ++ * ++ * @kbdev: Kbase device ++ * @atom: Atom identifier ++ * @edit_addr: Address edited by jit ++ * @new_addr: Address placed into the edited location ++ * @jit_flags: Flags specifying the special requirements for the JIT allocation. ++ * @mem_flags: Flags defining the properties of a memory region ++ * @j_id: Unique ID provided by the caller, this is used to pair allocation and free requests. ++ * @com_pgs: The minimum number of physical pages which should back the allocation. ++ * @extent: Granularity of physical pages to grow the allocation by during a fault. ++ * @va_pgs: The minimum number of virtual pages required ++ */ ++#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_JIT( \ ++ kbdev, \ ++ atom, \ ++ edit_addr, \ ++ new_addr, \ ++ jit_flags, \ ++ mem_flags, \ ++ j_id, \ ++ com_pgs, \ ++ extent, \ ++ va_pgs \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_JOB_DUMPING_ENABLED) \ ++ __kbase_tlstream_tl_attrib_atom_jit( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ atom, \ ++ edit_addr, \ ++ new_addr, \ ++ jit_flags, \ ++ mem_flags, \ ++ j_id, \ ++ com_pgs, \ ++ extent, \ ++ va_pgs \ ++ ); \ + } while (0) + +/** -+ * KBASE_TLSTREAM_TL_KBASE_NEW_DEVICE - -+ * New KBase Device ++ * KBASE_TLSTREAM_TL_KBASE_NEW_DEVICE - New KBase Device + * + * @kbdev: Kbase device -+ * @kbase_device_id: The id of the physical hardware ++ * @kbase_device_id: The ID of the physical hardware + * @kbase_device_gpu_core_count: The number of gpu cores in the physical hardware + * @kbase_device_max_num_csgs: The max number of CSGs the physical hardware supports + * @kbase_device_as_count: The number of address spaces the physical hardware has available ++ * @kbase_device_sb_entry_count: The number of entries each scoreboard set in the physical hardware has available ++ * @kbase_device_has_cross_stream_sync: Whether cross-stream synchronization is supported ++ * @kbase_device_supports_gpu_sleep: Whether GPU sleep is supported + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_NEW_DEVICE( \ @@ -259865,14 +302715,24 @@ index 000000000000..5651f0a0fc57 + kbase_device_id, \ + kbase_device_gpu_core_count, \ + kbase_device_max_num_csgs, \ -+ kbase_device_as_count \ ++ kbase_device_as_count, \ ++ kbase_device_sb_entry_count, \ ++ kbase_device_has_cross_stream_sync, \ ++ kbase_device_supports_gpu_sleep \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_new_device( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kbase_device_id, kbase_device_gpu_core_count, kbase_device_max_num_csgs, kbase_device_as_count); \ ++ kbase_device_id, \ ++ kbase_device_gpu_core_count, \ ++ kbase_device_max_num_csgs, \ ++ kbase_device_as_count, \ ++ kbase_device_sb_entry_count, \ ++ kbase_device_has_cross_stream_sync, \ ++ kbase_device_supports_gpu_sleep \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_NEW_DEVICE( \ @@ -259880,51 +302740,94 @@ index 000000000000..5651f0a0fc57 + kbase_device_id, \ + kbase_device_gpu_core_count, \ + kbase_device_max_num_csgs, \ -+ kbase_device_as_count \ ++ kbase_device_as_count, \ ++ kbase_device_sb_entry_count, \ ++ kbase_device_has_cross_stream_sync, \ ++ kbase_device_supports_gpu_sleep \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_GPUCMDQUEUE_KICK - Kernel receives a request to process new GPU queue instructions ++ * ++ * @kbdev: Kbase device ++ * @kernel_ctx_id: Unique ID for the KBase Context ++ * @buffer_gpu_addr: Address of the GPU queue's command buffer ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_GPUCMDQUEUE_KICK( \ ++ kbdev, \ ++ kernel_ctx_id, \ ++ buffer_gpu_addr \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_gpucmdqueue_kick( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ kernel_ctx_id, \ ++ buffer_gpu_addr \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_GPUCMDQUEUE_KICK( \ ++ kbdev, \ ++ kernel_ctx_id, \ ++ buffer_gpu_addr \ + ) \ + do { } while (0) +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_DEVICE_PROGRAM_CSG - -+ * CSG is programmed to a slot ++ * KBASE_TLSTREAM_TL_KBASE_DEVICE_PROGRAM_CSG - CSG is programmed to a slot + * + * @kbdev: Kbase device -+ * @kbase_device_id: The id of the physical hardware ++ * @kbase_device_id: The ID of the physical hardware ++ * @kernel_ctx_id: Unique ID for the KBase Context + * @gpu_cmdq_grp_handle: GPU Command Queue Group handle which will match userspace + * @kbase_device_csg_slot_index: The index of the slot in the scheduler being programmed ++ * @kbase_device_csg_slot_resuming: Whether the csg is being resumed + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_DEVICE_PROGRAM_CSG( \ + kbdev, \ + kbase_device_id, \ ++ kernel_ctx_id, \ + gpu_cmdq_grp_handle, \ -+ kbase_device_csg_slot_index \ ++ kbase_device_csg_slot_index, \ ++ kbase_device_csg_slot_resuming \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_device_program_csg( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kbase_device_id, gpu_cmdq_grp_handle, kbase_device_csg_slot_index); \ ++ kbase_device_id, \ ++ kernel_ctx_id, \ ++ gpu_cmdq_grp_handle, \ ++ kbase_device_csg_slot_index, \ ++ kbase_device_csg_slot_resuming \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_DEVICE_PROGRAM_CSG( \ + kbdev, \ + kbase_device_id, \ ++ kernel_ctx_id, \ + gpu_cmdq_grp_handle, \ -+ kbase_device_csg_slot_index \ ++ kbase_device_csg_slot_index, \ ++ kbase_device_csg_slot_resuming \ + ) \ + do { } while (0) +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_DEVICE_DEPROGRAM_CSG - -+ * CSG is deprogrammed from a slot ++ * KBASE_TLSTREAM_TL_KBASE_DEVICE_DEPROGRAM_CSG - CSG is deprogrammed from a slot + * + * @kbdev: Kbase device -+ * @kbase_device_id: The id of the physical hardware -+ * @kbase_device_csg_slot_index: The index of the slot in the scheduler being programmed ++ * @kbase_device_id: The ID of the physical hardware ++ * @kbase_device_csg_slot_index: The index of the slot in the scheduler whose CSG is being deprogrammed + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_DEVICE_DEPROGRAM_CSG( \ @@ -259937,7 +302840,9 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_device_deprogram_csg( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kbase_device_id, kbase_device_csg_slot_index); \ ++ kbase_device_id, \ ++ kbase_device_csg_slot_index \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_DEVICE_DEPROGRAM_CSG( \ @@ -259949,12 +302854,108 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_NEW_CTX - -+ * New KBase Context ++ * KBASE_TLSTREAM_TL_KBASE_DEVICE_HALTING_CSG - CSG is halting ++ * ++ * @kbdev: Kbase device ++ * @kbase_device_id: The ID of the physical hardware ++ * @kbase_device_csg_slot_index: The index of the slot in the scheduler whose CSG is being halted ++ * @kbase_device_csg_slot_suspending: Whether the csg is being suspended ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_DEVICE_HALTING_CSG( \ ++ kbdev, \ ++ kbase_device_id, \ ++ kbase_device_csg_slot_index, \ ++ kbase_device_csg_slot_suspending \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_device_halting_csg( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ kbase_device_id, \ ++ kbase_device_csg_slot_index, \ ++ kbase_device_csg_slot_suspending \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_DEVICE_HALTING_CSG( \ ++ kbdev, \ ++ kbase_device_id, \ ++ kbase_device_csg_slot_index, \ ++ kbase_device_csg_slot_suspending \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_DEVICE_SUSPEND_CSG - CSG is suspended ++ * ++ * @kbdev: Kbase device ++ * @kbase_device_id: The ID of the physical hardware ++ * @kbase_device_csg_slot_index: The index of the slot in the scheduler whose CSG is being suspended ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_DEVICE_SUSPEND_CSG( \ ++ kbdev, \ ++ kbase_device_id, \ ++ kbase_device_csg_slot_index \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_device_suspend_csg( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ kbase_device_id, \ ++ kbase_device_csg_slot_index \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_DEVICE_SUSPEND_CSG( \ ++ kbdev, \ ++ kbase_device_id, \ ++ kbase_device_csg_slot_index \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_DEVICE_CSG_IDLE - KBase device is notified that CSG is idle. ++ * ++ * @kbdev: Kbase device ++ * @kbase_device_id: The ID of the physical hardware ++ * @kbase_device_csg_slot_index: The index of the slot in the scheduler whose CSG for which we are receiving an idle notification ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_DEVICE_CSG_IDLE( \ ++ kbdev, \ ++ kbase_device_id, \ ++ kbase_device_csg_slot_index \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_device_csg_idle( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ kbase_device_id, \ ++ kbase_device_csg_slot_index \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_DEVICE_CSG_IDLE( \ ++ kbdev, \ ++ kbase_device_id, \ ++ kbase_device_csg_slot_index \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_NEW_CTX - New KBase Context + * + * @kbdev: Kbase device + * @kernel_ctx_id: Unique ID for the KBase Context -+ * @kbase_device_id: The id of the physical hardware ++ * @kbase_device_id: The ID of the physical hardware + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_NEW_CTX( \ @@ -259967,7 +302968,9 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_new_ctx( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kernel_ctx_id, kbase_device_id); \ ++ kernel_ctx_id, \ ++ kbase_device_id \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_NEW_CTX( \ @@ -259979,8 +302982,7 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_DEL_CTX - -+ * Delete KBase Context ++ * KBASE_TLSTREAM_TL_KBASE_DEL_CTX - Delete KBase Context + * + * @kbdev: Kbase device + * @kernel_ctx_id: Unique ID for the KBase Context @@ -259995,7 +302997,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_del_ctx( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kernel_ctx_id); \ ++ kernel_ctx_id \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_DEL_CTX( \ @@ -260006,8 +303009,7 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_CTX_ASSIGN_AS - -+ * Address Space is assigned to a KBase context ++ * KBASE_TLSTREAM_TL_KBASE_CTX_ASSIGN_AS - Address Space is assigned to a KBase context + * + * @kbdev: Kbase device + * @kernel_ctx_id: Unique ID for the KBase Context @@ -260024,7 +303026,9 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_ctx_assign_as( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kernel_ctx_id, kbase_device_as_index); \ ++ kernel_ctx_id, \ ++ kbase_device_as_index \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_CTX_ASSIGN_AS( \ @@ -260036,8 +303040,7 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_CTX_UNASSIGN_AS - -+ * Address Space is unassigned from a KBase context ++ * KBASE_TLSTREAM_TL_KBASE_CTX_UNASSIGN_AS - Address Space is unassigned from a KBase context + * + * @kbdev: Kbase device + * @kernel_ctx_id: Unique ID for the KBase Context @@ -260052,7 +303055,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_ctx_unassign_as( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kernel_ctx_id); \ ++ kernel_ctx_id \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_CTX_UNASSIGN_AS( \ @@ -260063,19 +303067,19 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_NEW_KCPUQUEUE - -+ * New KCPU Queue ++ * KBASE_TLSTREAM_TL_KBASE_NEW_KCPUQUEUE - New KCPU Queue + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue ++ * @kcpu_queue_id: KCPU queue ID + * @kernel_ctx_id: Unique ID for the KBase Context -+ * @kcpuq_num_pending_cmds: Number of commands already enqueued -+ * in the KCPU queue ++ * @kcpuq_num_pending_cmds: Number of commands already enqueued in the KCPU queue + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_NEW_KCPUQUEUE( \ + kbdev, \ + kcpu_queue, \ ++ kcpu_queue_id, \ + kernel_ctx_id, \ + kcpuq_num_pending_cmds \ + ) \ @@ -260084,12 +303088,17 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_new_kcpuqueue( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue, kernel_ctx_id, kcpuq_num_pending_cmds); \ ++ kcpu_queue, \ ++ kcpu_queue_id, \ ++ kernel_ctx_id, \ ++ kcpuq_num_pending_cmds \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_NEW_KCPUQUEUE( \ + kbdev, \ + kcpu_queue, \ ++ kcpu_queue_id, \ + kernel_ctx_id, \ + kcpuq_num_pending_cmds \ + ) \ @@ -260097,8 +303106,7 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_DEL_KCPUQUEUE - -+ * Delete KCPU Queue ++ * KBASE_TLSTREAM_TL_KBASE_DEL_KCPUQUEUE - Delete KCPU Queue + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260113,7 +303121,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_del_kcpuqueue( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_DEL_KCPUQUEUE( \ @@ -260124,8 +303133,7 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_FENCE_SIGNAL - -+ * KCPU Queue enqueues Signal on Fence ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_FENCE_SIGNAL - KCPU Queue enqueues Signal on Fence + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260142,7 +303150,9 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_fence_signal( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue, fence); \ ++ kcpu_queue, \ ++ fence \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_FENCE_SIGNAL( \ @@ -260154,8 +303164,7 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_FENCE_WAIT - -+ * KCPU Queue enqueues Wait on Fence ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_FENCE_WAIT - KCPU Queue enqueues Wait on Fence + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260172,7 +303181,9 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_fence_wait( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue, fence); \ ++ kcpu_queue, \ ++ fence \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_FENCE_WAIT( \ @@ -260184,46 +303195,50 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT - -+ * KCPU Queue enqueues Wait on Cross Queue Sync Object ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT - KCPU Queue enqueues Wait on Cross Queue Sync Object + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue -+ * @cqs_obj_gpu_addr: CQS Object GPU ptr -+ * @cqs_obj_compare_value: Semaphore value that should be exceeded -+ * for the WAIT to pass ++ * @cqs_obj_gpu_addr: CQS Object GPU pointer ++ * @compare_value: Semaphore value that should be exceeded for the WAIT to pass ++ * @inherit_error: Flag which indicates if the CQS object error state should be inherited by the queue + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT( \ + kbdev, \ + kcpu_queue, \ + cqs_obj_gpu_addr, \ -+ cqs_obj_compare_value \ ++ compare_value, \ ++ inherit_error \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_cqs_wait( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue, cqs_obj_gpu_addr, cqs_obj_compare_value); \ ++ kcpu_queue, \ ++ cqs_obj_gpu_addr, \ ++ compare_value, \ ++ inherit_error \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT( \ + kbdev, \ + kcpu_queue, \ + cqs_obj_gpu_addr, \ -+ cqs_obj_compare_value \ ++ compare_value, \ ++ inherit_error \ + ) \ + do { } while (0) +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET - -+ * KCPU Queue enqueues Set on Cross Queue Sync Object ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET - KCPU Queue enqueues Set on Cross Queue Sync Object + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue -+ * @cqs_obj_gpu_addr: CQS Object GPU ptr ++ * @cqs_obj_gpu_addr: CQS Object GPU pointer + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET( \ @@ -260236,7 +303251,9 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_cqs_set( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue, cqs_obj_gpu_addr); \ ++ kcpu_queue, \ ++ cqs_obj_gpu_addr \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET( \ @@ -260248,12 +303265,101 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_MAP_IMPORT - -+ * KCPU Queue enqueues Map Import ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT_OPERATION - KCPU Queue enqueues Wait Operation on Cross Queue Sync Object ++ * ++ * @kbdev: Kbase device ++ * @kcpu_queue: KCPU queue ++ * @cqs_obj_gpu_addr: CQS Object GPU pointer ++ * @compare_value: Value that should be compared to semaphore value for the WAIT to pass ++ * @condition: Condition for unblocking WAITs on Timeline Cross Queue Sync Object (e.g. greater than, less or equal) ++ * @data_type: Data type of a CQS Object's value ++ * @inherit_error: Flag which indicates if the CQS object error state should be inherited by the queue ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT_OPERATION( \ ++ kbdev, \ ++ kcpu_queue, \ ++ cqs_obj_gpu_addr, \ ++ compare_value, \ ++ condition, \ ++ data_type, \ ++ inherit_error \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_cqs_wait_operation( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ kcpu_queue, \ ++ cqs_obj_gpu_addr, \ ++ compare_value, \ ++ condition, \ ++ data_type, \ ++ inherit_error \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_WAIT_OPERATION( \ ++ kbdev, \ ++ kcpu_queue, \ ++ cqs_obj_gpu_addr, \ ++ compare_value, \ ++ condition, \ ++ data_type, \ ++ inherit_error \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET_OPERATION - KCPU Queue enqueues Set Operation on Cross Queue Sync Object ++ * ++ * @kbdev: Kbase device ++ * @kcpu_queue: KCPU queue ++ * @cqs_obj_gpu_addr: CQS Object GPU pointer ++ * @value: Value that will be set or added to semaphore ++ * @operation: Operation type performed on semaphore value (SET or ADD) ++ * @data_type: Data type of a CQS Object's value ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET_OPERATION( \ ++ kbdev, \ ++ kcpu_queue, \ ++ cqs_obj_gpu_addr, \ ++ value, \ ++ operation, \ ++ data_type \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_cqs_set_operation( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ kcpu_queue, \ ++ cqs_obj_gpu_addr, \ ++ value, \ ++ operation, \ ++ data_type \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_CQS_SET_OPERATION( \ ++ kbdev, \ ++ kcpu_queue, \ ++ cqs_obj_gpu_addr, \ ++ value, \ ++ operation, \ ++ data_type \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_MAP_IMPORT - KCPU Queue enqueues Map Import + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue -+ * @map_import_buf_gpu_addr: Map import buffer GPU ptr ++ * @map_import_buf_gpu_addr: Map import buffer GPU pointer + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_MAP_IMPORT( \ @@ -260266,7 +303372,9 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_map_import( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue, map_import_buf_gpu_addr); \ ++ kcpu_queue, \ ++ map_import_buf_gpu_addr \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_MAP_IMPORT( \ @@ -260278,12 +303386,11 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT - -+ * KCPU Queue enqueues Unmap Import ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT - KCPU Queue enqueues Unmap Import + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue -+ * @map_import_buf_gpu_addr: Map import buffer GPU ptr ++ * @map_import_buf_gpu_addr: Map import buffer GPU pointer + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT( \ @@ -260296,7 +303403,9 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_unmap_import( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue, map_import_buf_gpu_addr); \ ++ kcpu_queue, \ ++ map_import_buf_gpu_addr \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT( \ @@ -260308,12 +303417,11 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT_FORCE - -+ * KCPU Queue enqueues Unmap Import ignoring reference count ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT_FORCE - KCPU Queue enqueues Unmap Import ignoring reference count + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue -+ * @map_import_buf_gpu_addr: Map import buffer GPU ptr ++ * @map_import_buf_gpu_addr: Map import buffer GPU pointer + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT_FORCE( \ @@ -260326,7 +303434,9 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_unmap_import_force( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue, map_import_buf_gpu_addr); \ ++ kcpu_queue, \ ++ map_import_buf_gpu_addr \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_UNMAP_IMPORT_FORCE( \ @@ -260338,8 +303448,7 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_ENQUEUE_JIT_ALLOC - -+ * Begin array of KCPU Queue enqueues JIT Alloc ++ * KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_ENQUEUE_JIT_ALLOC - Begin array of KCPU Queue enqueues JIT Alloc + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260354,7 +303463,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_array_begin_kcpuqueue_enqueue_jit_alloc( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_ENQUEUE_JIT_ALLOC( \ @@ -260365,30 +303475,19 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_ENQUEUE_JIT_ALLOC - -+ * Array item of KCPU Queue enqueues JIT Alloc ++ * KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_ENQUEUE_JIT_ALLOC - Array item of KCPU Queue enqueues JIT Alloc + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue -+ * @jit_alloc_gpu_alloc_addr_dest: The GPU virtual address to write -+ * the JIT allocated GPU virtual address to ++ * @jit_alloc_gpu_alloc_addr_dest: The GPU virtual address to write the JIT allocated GPU virtual address to + * @jit_alloc_va_pages: The minimum number of virtual pages required -+ * @jit_alloc_commit_pages: The minimum number of physical pages which -+ * should back the allocation -+ * @jit_alloc_extent: Granularity of physical pages to grow the allocation -+ * by during a fault -+ * @jit_alloc_jit_id: Unique ID provided by the caller, this is used -+ * to pair allocation and free requests. Zero is not a valid value -+ * @jit_alloc_bin_id: The JIT allocation bin, used in conjunction with -+ * max_allocations to limit the number of each type of JIT allocation -+ * @jit_alloc_max_allocations: The maximum number of allocations -+ * allowed within the bin specified by bin_id. Should be the same for all -+ * JIT allocations within the same bin. -+ * @jit_alloc_flags: Flags specifying the special requirements for the -+ * JIT allocation -+ * @jit_alloc_usage_id: A hint about which allocation should be -+ * reused. The kernel should attempt to use a previous allocation with the same -+ * usage_id ++ * @jit_alloc_commit_pages: The minimum number of physical pages which should back the allocation ++ * @jit_alloc_extent: Granularity of physical pages to grow the allocation by during a fault ++ * @jit_alloc_jit_id: Unique ID provided by the caller, this is used to pair allocation and free requests. Zero is not a valid value ++ * @jit_alloc_bin_id: The JIT allocation bin, used in conjunction with max_allocations to limit the number of each type of JIT allocation ++ * @jit_alloc_max_allocations: The maximum number of allocations allowed within the bin specified by bin_id. Should be the same for all JIT allocations within the same bin. ++ * @jit_alloc_flags: Flags specifying the special requirements for the JIT allocation ++ * @jit_alloc_usage_id: A hint about which allocation should be reused. The kernel should attempt to use a previous allocation with the same usage_id + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_ENQUEUE_JIT_ALLOC( \ @@ -260409,7 +303508,17 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_array_item_kcpuqueue_enqueue_jit_alloc( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue, jit_alloc_gpu_alloc_addr_dest, jit_alloc_va_pages, jit_alloc_commit_pages, jit_alloc_extent, jit_alloc_jit_id, jit_alloc_bin_id, jit_alloc_max_allocations, jit_alloc_flags, jit_alloc_usage_id); \ ++ kcpu_queue, \ ++ jit_alloc_gpu_alloc_addr_dest, \ ++ jit_alloc_va_pages, \ ++ jit_alloc_commit_pages, \ ++ jit_alloc_extent, \ ++ jit_alloc_jit_id, \ ++ jit_alloc_bin_id, \ ++ jit_alloc_max_allocations, \ ++ jit_alloc_flags, \ ++ jit_alloc_usage_id \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_ENQUEUE_JIT_ALLOC( \ @@ -260429,8 +303538,7 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_ENQUEUE_JIT_ALLOC - -+ * End array of KCPU Queue enqueues JIT Alloc ++ * KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_ENQUEUE_JIT_ALLOC - End array of KCPU Queue enqueues JIT Alloc + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260445,7 +303553,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_array_end_kcpuqueue_enqueue_jit_alloc( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_ENQUEUE_JIT_ALLOC( \ @@ -260456,8 +303565,7 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_ENQUEUE_JIT_FREE - -+ * Begin array of KCPU Queue enqueues JIT Free ++ * KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_ENQUEUE_JIT_FREE - Begin array of KCPU Queue enqueues JIT Free + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260472,7 +303580,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_array_begin_kcpuqueue_enqueue_jit_free( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_ENQUEUE_JIT_FREE( \ @@ -260483,13 +303592,11 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_ENQUEUE_JIT_FREE - -+ * Array item of KCPU Queue enqueues JIT Free ++ * KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_ENQUEUE_JIT_FREE - Array item of KCPU Queue enqueues JIT Free + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue -+ * @jit_alloc_jit_id: Unique ID provided by the caller, this is used -+ * to pair allocation and free requests. Zero is not a valid value ++ * @jit_alloc_jit_id: Unique ID provided by the caller, this is used to pair allocation and free requests. Zero is not a valid value + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_ENQUEUE_JIT_FREE( \ @@ -260502,7 +303609,9 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_array_item_kcpuqueue_enqueue_jit_free( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue, jit_alloc_jit_id); \ ++ kcpu_queue, \ ++ jit_alloc_jit_id \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_ENQUEUE_JIT_FREE( \ @@ -260514,8 +303623,7 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_ENQUEUE_JIT_FREE - -+ * End array of KCPU Queue enqueues JIT Free ++ * KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_ENQUEUE_JIT_FREE - End array of KCPU Queue enqueues JIT Free + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260530,7 +303638,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_array_end_kcpuqueue_enqueue_jit_free( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_ENQUEUE_JIT_FREE( \ @@ -260541,8 +303650,69 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_START - -+ * KCPU Queue starts a Signal on Fence ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_ERROR_BARRIER - KCPU Queue enqueues Error Barrier ++ * ++ * @kbdev: Kbase device ++ * @kcpu_queue: KCPU queue ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_ERROR_BARRIER( \ ++ kbdev, \ ++ kcpu_queue \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_error_barrier( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ kcpu_queue \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_ERROR_BARRIER( \ ++ kbdev, \ ++ kcpu_queue \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_GROUP_SUSPEND - KCPU Queue enqueues Group Suspend ++ * ++ * @kbdev: Kbase device ++ * @kcpu_queue: KCPU queue ++ * @group_suspend_buf: Pointer to the suspend buffer structure ++ * @gpu_cmdq_grp_handle: GPU Command Queue Group handle which will match userspace ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_GROUP_SUSPEND( \ ++ kbdev, \ ++ kcpu_queue, \ ++ group_suspend_buf, \ ++ gpu_cmdq_grp_handle \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_kcpuqueue_enqueue_group_suspend( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ kcpu_queue, \ ++ group_suspend_buf, \ ++ gpu_cmdq_grp_handle \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_ENQUEUE_GROUP_SUSPEND( \ ++ kbdev, \ ++ kcpu_queue, \ ++ group_suspend_buf, \ ++ gpu_cmdq_grp_handle \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_START - KCPU Queue starts a Signal on Fence + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260557,7 +303727,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_fence_signal_start( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_START( \ @@ -260568,35 +303739,38 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_END - -+ * KCPU Queue ends a Signal on Fence ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_END - KCPU Queue ends a Signal on Fence + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue ++ * @execute_error: Non-zero error code if KCPU Queue item completed with error, else zero + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_END( \ + kbdev, \ -+ kcpu_queue \ ++ kcpu_queue, \ ++ execute_error \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_fence_signal_end( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue, \ ++ execute_error \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_SIGNAL_END( \ + kbdev, \ -+ kcpu_queue \ ++ kcpu_queue, \ ++ execute_error \ + ) \ + do { } while (0) +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_START - -+ * KCPU Queue starts a Wait on Fence ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_START - KCPU Queue starts a Wait on Fence + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260611,7 +303785,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_fence_wait_start( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_START( \ @@ -260622,35 +303797,38 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_END - -+ * KCPU Queue ends a Wait on Fence ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_END - KCPU Queue ends a Wait on Fence + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue ++ * @execute_error: Non-zero error code if KCPU Queue item completed with error, else zero + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_END( \ + kbdev, \ -+ kcpu_queue \ ++ kcpu_queue, \ ++ execute_error \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_fence_wait_end( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue, \ ++ execute_error \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_FENCE_WAIT_END( \ + kbdev, \ -+ kcpu_queue \ ++ kcpu_queue, \ ++ execute_error \ + ) \ + do { } while (0) +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_START - -+ * KCPU Queue starts a Wait on an array of Cross Queue Sync Objects ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_START - KCPU Queue starts a Wait on Cross Queue Sync Object + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260665,7 +303843,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_wait_start( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_START( \ @@ -260676,62 +303855,158 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_END - -+ * KCPU Queue ends a Wait on an array of Cross Queue Sync Objects ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_END - KCPU Queue ends a Wait on Cross Queue Sync Object + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue ++ * @execute_error: Non-zero error code if KCPU Queue item completed with error, else zero + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_END( \ + kbdev, \ -+ kcpu_queue \ ++ kcpu_queue, \ ++ execute_error \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_wait_end( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue, \ ++ execute_error \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_END( \ + kbdev, \ -+ kcpu_queue \ ++ kcpu_queue, \ ++ execute_error \ + ) \ + do { } while (0) +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET - -+ * KCPU Queue executes a Set on an array of Cross Queue Sync Objects ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET - KCPU Queue executes a Set on Cross Queue Sync Object + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue ++ * @execute_error: Non-zero error code if KCPU Queue item completed with error, else zero + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET( \ + kbdev, \ -+ kcpu_queue \ ++ kcpu_queue, \ ++ execute_error \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_set( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue, \ ++ execute_error \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET( \ + kbdev, \ ++ kcpu_queue, \ ++ execute_error \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_OPERATION_START - KCPU Queue starts a Wait Operation on Cross Queue Sync Object ++ * ++ * @kbdev: Kbase device ++ * @kcpu_queue: KCPU queue ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_OPERATION_START( \ ++ kbdev, \ ++ kcpu_queue \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_wait_operation_start( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ kcpu_queue \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_OPERATION_START( \ ++ kbdev, \ + kcpu_queue \ + ) \ + do { } while (0) +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_START - -+ * KCPU Queue starts a Map Import ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_OPERATION_END - KCPU Queue ends a Wait Operation on Cross Queue Sync Object ++ * ++ * @kbdev: Kbase device ++ * @kcpu_queue: KCPU queue ++ * @execute_error: Non-zero error code if KCPU Queue item completed with error, else zero ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_OPERATION_END( \ ++ kbdev, \ ++ kcpu_queue, \ ++ execute_error \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_wait_operation_end( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ kcpu_queue, \ ++ execute_error \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_WAIT_OPERATION_END( \ ++ kbdev, \ ++ kcpu_queue, \ ++ execute_error \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET_OPERATION - KCPU Queue executes a Set Operation on Cross Queue Sync Object ++ * ++ * @kbdev: Kbase device ++ * @kcpu_queue: KCPU queue ++ * @execute_error: Non-zero error code if KCPU Queue item completed with error, else zero ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET_OPERATION( \ ++ kbdev, \ ++ kcpu_queue, \ ++ execute_error \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_kcpuqueue_execute_cqs_set_operation( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ kcpu_queue, \ ++ execute_error \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_CQS_SET_OPERATION( \ ++ kbdev, \ ++ kcpu_queue, \ ++ execute_error \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_START - KCPU Queue starts a Map Import + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260746,7 +304021,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_map_import_start( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_START( \ @@ -260757,35 +304033,38 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_END - -+ * KCPU Queue ends a Map Import ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_END - KCPU Queue ends a Map Import + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue ++ * @execute_error: Non-zero error code if KCPU Queue item completed with error, else zero + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_END( \ + kbdev, \ -+ kcpu_queue \ ++ kcpu_queue, \ ++ execute_error \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_map_import_end( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue, \ ++ execute_error \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_MAP_IMPORT_END( \ + kbdev, \ -+ kcpu_queue \ ++ kcpu_queue, \ ++ execute_error \ + ) \ + do { } while (0) +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_START - -+ * KCPU Queue starts an Unmap Import ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_START - KCPU Queue starts an Unmap Import + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260800,7 +304079,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_unmap_import_start( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_START( \ @@ -260811,35 +304091,38 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_END - -+ * KCPU Queue ends an Unmap Import ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_END - KCPU Queue ends an Unmap Import + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue ++ * @execute_error: Non-zero error code if KCPU Queue item completed with error, else zero + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_END( \ + kbdev, \ -+ kcpu_queue \ ++ kcpu_queue, \ ++ execute_error \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_unmap_import_end( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue, \ ++ execute_error \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_END( \ + kbdev, \ -+ kcpu_queue \ ++ kcpu_queue, \ ++ execute_error \ + ) \ + do { } while (0) +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_FORCE_START - -+ * KCPU Queue starts an Unmap Import ignoring reference count ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_FORCE_START - KCPU Queue starts an Unmap Import ignoring reference count + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260854,7 +304137,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_unmap_import_force_start( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_FORCE_START( \ @@ -260865,35 +304149,38 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_FORCE_END - -+ * KCPU Queue ends an Unmap Import ignoring reference count ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_FORCE_END - KCPU Queue ends an Unmap Import ignoring reference count + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue ++ * @execute_error: Non-zero error code if KCPU Queue item completed with error, else zero + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_FORCE_END( \ + kbdev, \ -+ kcpu_queue \ ++ kcpu_queue, \ ++ execute_error \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_unmap_import_force_end( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue, \ ++ execute_error \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_UNMAP_IMPORT_FORCE_END( \ + kbdev, \ -+ kcpu_queue \ ++ kcpu_queue, \ ++ execute_error \ + ) \ + do { } while (0) +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_ALLOC_START - -+ * KCPU Queue starts an array of JIT Allocs ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_ALLOC_START - KCPU Queue starts an array of JIT Allocs + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260908,7 +304195,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_jit_alloc_start( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_ALLOC_START( \ @@ -260919,8 +304207,7 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_EXECUTE_JIT_ALLOC_END - -+ * Begin array of KCPU Queue ends an array of JIT Allocs ++ * KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_EXECUTE_JIT_ALLOC_END - Begin array of KCPU Queue ends an array of JIT Allocs + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260935,7 +304222,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_array_begin_kcpuqueue_execute_jit_alloc_end( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_EXECUTE_JIT_ALLOC_END( \ @@ -260946,11 +304234,11 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_ALLOC_END - -+ * Array item of KCPU Queue ends an array of JIT Allocs ++ * KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_ALLOC_END - Array item of KCPU Queue ends an array of JIT Allocs + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue ++ * @execute_error: Non-zero error code if KCPU Queue item completed with error, else zero + * @jit_alloc_gpu_alloc_addr: The JIT allocated GPU virtual address + * @jit_alloc_mmu_flags: The MMU flags for the JIT allocation + */ @@ -260958,6 +304246,7 @@ index 000000000000..5651f0a0fc57 +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_ALLOC_END( \ + kbdev, \ + kcpu_queue, \ ++ execute_error, \ + jit_alloc_gpu_alloc_addr, \ + jit_alloc_mmu_flags \ + ) \ @@ -260966,12 +304255,17 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_array_item_kcpuqueue_execute_jit_alloc_end( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue, jit_alloc_gpu_alloc_addr, jit_alloc_mmu_flags); \ ++ kcpu_queue, \ ++ execute_error, \ ++ jit_alloc_gpu_alloc_addr, \ ++ jit_alloc_mmu_flags \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_ALLOC_END( \ + kbdev, \ + kcpu_queue, \ ++ execute_error, \ + jit_alloc_gpu_alloc_addr, \ + jit_alloc_mmu_flags \ + ) \ @@ -260979,8 +304273,7 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_ALLOC_END - -+ * End array of KCPU Queue ends an array of JIT Allocs ++ * KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_ALLOC_END - End array of KCPU Queue ends an array of JIT Allocs + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -260995,7 +304288,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_array_end_kcpuqueue_execute_jit_alloc_end( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_ALLOC_END( \ @@ -261006,8 +304300,7 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_FREE_START - -+ * KCPU Queue starts an array of JIT Frees ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_FREE_START - KCPU Queue starts an array of JIT Frees + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -261022,7 +304315,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_kcpuqueue_execute_jit_free_start( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_JIT_FREE_START( \ @@ -261033,8 +304327,7 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_EXECUTE_JIT_FREE_END - -+ * Begin array of KCPU Queue ends an array of JIT Frees ++ * KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_EXECUTE_JIT_FREE_END - Begin array of KCPU Queue ends an array of JIT Frees + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -261049,7 +304342,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_array_begin_kcpuqueue_execute_jit_free_end( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_BEGIN_KCPUQUEUE_EXECUTE_JIT_FREE_END( \ @@ -261060,18 +304354,18 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_FREE_END - -+ * Array item of KCPU Queue ends an array of JIT Frees ++ * KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_FREE_END - Array item of KCPU Queue ends an array of JIT Frees + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue -+ * @jit_free_pages_used: The actual number of pages used by the JIT -+ * allocation ++ * @execute_error: Non-zero error code if KCPU Queue item completed with error, else zero ++ * @jit_free_pages_used: The actual number of pages used by the JIT allocation + */ +#if MALI_USE_CSF +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_FREE_END( \ + kbdev, \ + kcpu_queue, \ ++ execute_error, \ + jit_free_pages_used \ + ) \ + do { \ @@ -261079,20 +304373,23 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_array_item_kcpuqueue_execute_jit_free_end( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue, jit_free_pages_used); \ ++ kcpu_queue, \ ++ execute_error, \ ++ jit_free_pages_used \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_ITEM_KCPUQUEUE_EXECUTE_JIT_FREE_END( \ + kbdev, \ + kcpu_queue, \ ++ execute_error, \ + jit_free_pages_used \ + ) \ + do { } while (0) +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_FREE_END - -+ * End array of KCPU Queue ends an array of JIT Frees ++ * KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_FREE_END - End array of KCPU Queue ends an array of JIT Frees + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue @@ -261107,7 +304404,8 @@ index 000000000000..5651f0a0fc57 + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ + __kbase_tlstream_tl_kbase_array_end_kcpuqueue_execute_jit_free_end( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else +#define KBASE_TLSTREAM_TL_KBASE_ARRAY_END_KCPUQUEUE_EXECUTE_JIT_FREE_END( \ @@ -261118,26 +304416,26 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_ERRORBARRIER - -+ * KCPU Queue executes an Error Barrier ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_ERROR_BARRIER - KCPU Queue executes an Error Barrier + * + * @kbdev: Kbase device + * @kcpu_queue: KCPU queue + */ +#if MALI_USE_CSF -+#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_ERRORBARRIER( \ ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_ERROR_BARRIER( \ + kbdev, \ + kcpu_queue \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ -+ __kbase_tlstream_tl_kbase_kcpuqueue_execute_errorbarrier( \ ++ __kbase_tlstream_tl_kbase_kcpuqueue_execute_error_barrier( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ kcpu_queue); \ ++ kcpu_queue \ ++ ); \ + } while (0) +#else -+#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_ERRORBARRIER( \ ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_ERROR_BARRIER( \ + kbdev, \ + kcpu_queue \ + ) \ @@ -261145,62 +304443,582 @@ index 000000000000..5651f0a0fc57 +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_CSFFW_TLSTREAM_OVERFLOW - -+ * An overflow has happened with the CSFFW Timeline stream ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_GROUP_SUSPEND_START - KCPU Queue starts a group suspend ++ * ++ * @kbdev: Kbase device ++ * @kcpu_queue: KCPU queue ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_GROUP_SUSPEND_START( \ ++ kbdev, \ ++ kcpu_queue \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_kcpuqueue_execute_group_suspend_start( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ kcpu_queue \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_GROUP_SUSPEND_START( \ ++ kbdev, \ ++ kcpu_queue \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_GROUP_SUSPEND_END - KCPU Queue ends a group suspend ++ * ++ * @kbdev: Kbase device ++ * @kcpu_queue: KCPU queue ++ * @execute_error: Non-zero error code if KCPU Queue item completed with error, else zero ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_GROUP_SUSPEND_END( \ ++ kbdev, \ ++ kcpu_queue, \ ++ execute_error \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSF_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_kcpuqueue_execute_group_suspend_end( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ kcpu_queue, \ ++ execute_error \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_KCPUQUEUE_EXECUTE_GROUP_SUSPEND_END( \ ++ kbdev, \ ++ kcpu_queue, \ ++ execute_error \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_RELOADING - CSF FW is being reloaded + * + * @kbdev: Kbase device -+ * @csffw_timestamp: Timestamp of a CSFFW event + * @csffw_cycle: Cycle number of a CSFFW event + */ +#if MALI_USE_CSF -+#define KBASE_TLSTREAM_TL_KBASE_CSFFW_TLSTREAM_OVERFLOW( \ ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_RELOADING( \ + kbdev, \ -+ csffw_timestamp, \ + csffw_cycle \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & BASE_TLSTREAM_ENABLE_CSFFW_TRACEPOINTS) \ -+ __kbase_tlstream_tl_kbase_csffw_tlstream_overflow( \ ++ __kbase_tlstream_tl_kbase_csffw_fw_reloading( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ csffw_timestamp, csffw_cycle); \ ++ csffw_cycle \ ++ ); \ + } while (0) +#else -+#define KBASE_TLSTREAM_TL_KBASE_CSFFW_TLSTREAM_OVERFLOW( \ ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_RELOADING( \ ++ kbdev, \ ++ csffw_cycle \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_ENABLING - CSF FW is being enabled ++ * ++ * @kbdev: Kbase device ++ * @csffw_cycle: Cycle number of a CSFFW event ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_ENABLING( \ ++ kbdev, \ ++ csffw_cycle \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSFFW_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_csffw_fw_enabling( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ csffw_cycle \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_ENABLING( \ ++ kbdev, \ ++ csffw_cycle \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_REQUEST_SLEEP - CSF FW sleep is requested ++ * ++ * @kbdev: Kbase device ++ * @csffw_cycle: Cycle number of a CSFFW event ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_REQUEST_SLEEP( \ ++ kbdev, \ ++ csffw_cycle \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSFFW_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_csffw_fw_request_sleep( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ csffw_cycle \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_REQUEST_SLEEP( \ ++ kbdev, \ ++ csffw_cycle \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_REQUEST_WAKEUP - CSF FW wake up is requested ++ * ++ * @kbdev: Kbase device ++ * @csffw_cycle: Cycle number of a CSFFW event ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_REQUEST_WAKEUP( \ ++ kbdev, \ ++ csffw_cycle \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSFFW_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_csffw_fw_request_wakeup( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ csffw_cycle \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_REQUEST_WAKEUP( \ ++ kbdev, \ ++ csffw_cycle \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_REQUEST_HALT - CSF FW halt is requested ++ * ++ * @kbdev: Kbase device ++ * @csffw_cycle: Cycle number of a CSFFW event ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_REQUEST_HALT( \ ++ kbdev, \ ++ csffw_cycle \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSFFW_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_csffw_fw_request_halt( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ csffw_cycle \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_REQUEST_HALT( \ ++ kbdev, \ ++ csffw_cycle \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_DISABLING - CSF FW is being disabled ++ * ++ * @kbdev: Kbase device ++ * @csffw_cycle: Cycle number of a CSFFW event ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_DISABLING( \ ++ kbdev, \ ++ csffw_cycle \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSFFW_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_csffw_fw_disabling( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ csffw_cycle \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_DISABLING( \ ++ kbdev, \ ++ csffw_cycle \ ++ ) \ ++ do { } while (0) ++#endif /* MALI_USE_CSF */ ++ ++/** ++ * KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_OFF - CSF FW is off ++ * ++ * @kbdev: Kbase device ++ * @csffw_cycle: Cycle number of a CSFFW event ++ */ ++#if MALI_USE_CSF ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_OFF( \ ++ kbdev, \ ++ csffw_cycle \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_CSFFW_TRACEPOINTS) \ ++ __kbase_tlstream_tl_kbase_csffw_fw_off( \ ++ __TL_DISPATCH_STREAM(kbdev, obj), \ ++ csffw_cycle \ ++ ); \ ++ } while (0) ++#else ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_FW_OFF( \ + kbdev, \ -+ csffw_timestamp, \ + csffw_cycle \ + ) \ + do { } while (0) +#endif /* MALI_USE_CSF */ + +/** -+ * KBASE_TLSTREAM_TL_KBASE_CSFFW_RESET - -+ * A reset has happened with the CSFFW ++ * KBASE_TLSTREAM_TL_KBASE_CSFFW_TLSTREAM_OVERFLOW - An overflow has happened with the CSFFW Timeline stream + * + * @kbdev: Kbase device ++ * @csffw_timestamp: Timestamp of a CSFFW event + * @csffw_cycle: Cycle number of a CSFFW event + */ +#if MALI_USE_CSF -+#define KBASE_TLSTREAM_TL_KBASE_CSFFW_RESET( \ ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_TLSTREAM_OVERFLOW( \ + kbdev, \ ++ csffw_timestamp, \ + csffw_cycle \ + ) \ + do { \ + int enabled = atomic_read(&kbdev->timeline_flags); \ + if (enabled & BASE_TLSTREAM_ENABLE_CSFFW_TRACEPOINTS) \ -+ __kbase_tlstream_tl_kbase_csffw_reset( \ ++ __kbase_tlstream_tl_kbase_csffw_tlstream_overflow( \ + __TL_DISPATCH_STREAM(kbdev, obj), \ -+ csffw_cycle); \ ++ csffw_timestamp, \ ++ csffw_cycle \ ++ ); \ + } while (0) +#else -+#define KBASE_TLSTREAM_TL_KBASE_CSFFW_RESET( \ ++#define KBASE_TLSTREAM_TL_KBASE_CSFFW_TLSTREAM_OVERFLOW( \ + kbdev, \ ++ csffw_timestamp, \ + csffw_cycle \ + ) \ + do { } while (0) +#endif /* MALI_USE_CSF */ + ++/** ++ * KBASE_TLSTREAM_AUX_PM_STATE - PM state ++ * ++ * @kbdev: Kbase device ++ * @core_type: Core type (shader, tiler, l2 cache, l3 cache) ++ * @core_state_bitset: 64bits bitmask reporting power state of the cores (1-ON, 0-OFF) ++ */ ++#define KBASE_TLSTREAM_AUX_PM_STATE( \ ++ kbdev, \ ++ core_type, \ ++ core_state_bitset \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_aux_pm_state( \ ++ __TL_DISPATCH_STREAM(kbdev, aux), \ ++ core_type, \ ++ core_state_bitset \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_AUX_PAGEFAULT - Page fault ++ * ++ * @kbdev: Kbase device ++ * @ctx_nr: Kernel context number ++ * @as_nr: Address space number ++ * @page_cnt_change: Number of pages to be added ++ */ ++#define KBASE_TLSTREAM_AUX_PAGEFAULT( \ ++ kbdev, \ ++ ctx_nr, \ ++ as_nr, \ ++ page_cnt_change \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_aux_pagefault( \ ++ __TL_DISPATCH_STREAM(kbdev, aux), \ ++ ctx_nr, \ ++ as_nr, \ ++ page_cnt_change \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_AUX_PAGESALLOC - Total alloc pages change ++ * ++ * @kbdev: Kbase device ++ * @ctx_nr: Kernel context number ++ * @page_cnt: Number of pages used by the context ++ */ ++#define KBASE_TLSTREAM_AUX_PAGESALLOC( \ ++ kbdev, \ ++ ctx_nr, \ ++ page_cnt \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_aux_pagesalloc( \ ++ __TL_DISPATCH_STREAM(kbdev, aux), \ ++ ctx_nr, \ ++ page_cnt \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_AUX_DEVFREQ_TARGET - New device frequency target ++ * ++ * @kbdev: Kbase device ++ * @target_freq: New target frequency ++ */ ++#define KBASE_TLSTREAM_AUX_DEVFREQ_TARGET( \ ++ kbdev, \ ++ target_freq \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_aux_devfreq_target( \ ++ __TL_DISPATCH_STREAM(kbdev, aux), \ ++ target_freq \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_AUX_JIT_STATS - per-bin JIT statistics ++ * ++ * @kbdev: Kbase device ++ * @ctx_nr: Kernel context number ++ * @bid: JIT bin id ++ * @max_allocs: Maximum allocations allowed in this bin. ++ * @allocs: Number of active allocations in this bin ++ * @va_pages: Number of virtual pages allocated in this bin ++ * @ph_pages: Number of physical pages allocated in this bin ++ */ ++#define KBASE_TLSTREAM_AUX_JIT_STATS( \ ++ kbdev, \ ++ ctx_nr, \ ++ bid, \ ++ max_allocs, \ ++ allocs, \ ++ va_pages, \ ++ ph_pages \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_aux_jit_stats( \ ++ __TL_DISPATCH_STREAM(kbdev, aux), \ ++ ctx_nr, \ ++ bid, \ ++ max_allocs, \ ++ allocs, \ ++ va_pages, \ ++ ph_pages \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_AUX_TILER_HEAP_STATS - Tiler Heap statistics ++ * ++ * @kbdev: Kbase device ++ * @ctx_nr: Kernel context number ++ * @heap_id: Unique id used to represent a heap under a context ++ * @va_pages: Number of virtual pages allocated in this bin ++ * @ph_pages: Number of physical pages allocated in this bin ++ * @max_chunks: The maximum number of chunks that the heap should be allowed to use ++ * @chunk_size: Size of each chunk in tiler heap, in bytes ++ * @chunk_count: The number of chunks currently allocated in the tiler heap ++ * @target_in_flight: Number of render-passes that the driver should attempt to keep in flight for which allocation of new chunks is allowed ++ * @nr_in_flight: Number of render-passes that are in flight ++ */ ++#define KBASE_TLSTREAM_AUX_TILER_HEAP_STATS( \ ++ kbdev, \ ++ ctx_nr, \ ++ heap_id, \ ++ va_pages, \ ++ ph_pages, \ ++ max_chunks, \ ++ chunk_size, \ ++ chunk_count, \ ++ target_in_flight, \ ++ nr_in_flight \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_aux_tiler_heap_stats( \ ++ __TL_DISPATCH_STREAM(kbdev, aux), \ ++ ctx_nr, \ ++ heap_id, \ ++ va_pages, \ ++ ph_pages, \ ++ max_chunks, \ ++ chunk_size, \ ++ chunk_count, \ ++ target_in_flight, \ ++ nr_in_flight \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_AUX_EVENT_JOB_SLOT - event on a given job slot ++ * ++ * @kbdev: Kbase device ++ * @ctx: Name of the context object ++ * @slot_nr: Job slot number ++ * @atom_nr: Sequential number of an atom ++ * @event: Event type. One of TL_JS_EVENT values ++ */ ++#define KBASE_TLSTREAM_AUX_EVENT_JOB_SLOT( \ ++ kbdev, \ ++ ctx, \ ++ slot_nr, \ ++ atom_nr, \ ++ event \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_aux_event_job_slot( \ ++ __TL_DISPATCH_STREAM(kbdev, aux), \ ++ ctx, \ ++ slot_nr, \ ++ atom_nr, \ ++ event \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_AUX_PROTECTED_ENTER_START - enter protected mode start ++ * ++ * @kbdev: Kbase device ++ * @gpu: Name of the GPU object ++ */ ++#define KBASE_TLSTREAM_AUX_PROTECTED_ENTER_START( \ ++ kbdev, \ ++ gpu \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_aux_protected_enter_start( \ ++ __TL_DISPATCH_STREAM(kbdev, aux), \ ++ gpu \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_AUX_PROTECTED_ENTER_END - enter protected mode end ++ * ++ * @kbdev: Kbase device ++ * @gpu: Name of the GPU object ++ */ ++#define KBASE_TLSTREAM_AUX_PROTECTED_ENTER_END( \ ++ kbdev, \ ++ gpu \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_aux_protected_enter_end( \ ++ __TL_DISPATCH_STREAM(kbdev, aux), \ ++ gpu \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_AUX_MMU_COMMAND - mmu commands with synchronicity info ++ * ++ * @kbdev: Kbase device ++ * @kernel_ctx_id: Unique ID for the KBase Context ++ * @mmu_cmd_id: MMU Command ID (e.g AS_COMMAND_UPDATE) ++ * @mmu_synchronicity: Indicates whether the command is related to current running job that needs to be resolved to make it progress (synchronous, e.g. grow on page fault, JIT) or not (asynchronous, e.g. IOCTL calls from user-space). This param will be 0 if it is an asynchronous operation. ++ * @mmu_lock_addr: start address of regions to be locked/unlocked/invalidated ++ * @mmu_lock_page_num: number of pages to be locked/unlocked/invalidated ++ */ ++#define KBASE_TLSTREAM_AUX_MMU_COMMAND( \ ++ kbdev, \ ++ kernel_ctx_id, \ ++ mmu_cmd_id, \ ++ mmu_synchronicity, \ ++ mmu_lock_addr, \ ++ mmu_lock_page_num \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_aux_mmu_command( \ ++ __TL_DISPATCH_STREAM(kbdev, aux), \ ++ kernel_ctx_id, \ ++ mmu_cmd_id, \ ++ mmu_synchronicity, \ ++ mmu_lock_addr, \ ++ mmu_lock_page_num \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_START - leave protected mode start ++ * ++ * @kbdev: Kbase device ++ * @gpu: Name of the GPU object ++ */ ++#define KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_START( \ ++ kbdev, \ ++ gpu \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS) \ ++ __kbase_tlstream_aux_protected_leave_start( \ ++ __TL_DISPATCH_STREAM(kbdev, aux), \ ++ gpu \ ++ ); \ ++ } while (0) ++ ++/** ++ * KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_END - leave protected mode end ++ * ++ * @kbdev: Kbase device ++ * @gpu: Name of the GPU object ++ */ ++#define KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_END( \ ++ kbdev, \ ++ gpu \ ++ ) \ ++ do { \ ++ int enabled = atomic_read(&kbdev->timeline_flags); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS) \ ++ __kbase_tlstream_aux_protected_leave_end( \ ++ __TL_DISPATCH_STREAM(kbdev, aux), \ ++ gpu \ ++ ); \ ++ } while (0) + +/* Gator tracepoints are hooked into TLSTREAM interface. + * When the following tracepoints are called, corresponding @@ -261274,61791 +305092,54819 @@ index 000000000000..5651f0a0fc57 + +/* clang-format on */ +#endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/Kbuild b/drivers/gpu/arm/bifrost_for_linux/Kbuild +diff --git a/drivers/gpu/arm/mali400/.gitignore b/drivers/gpu/arm/mali400/.gitignore new file mode 100755 -index 000000000000..531b92126b98 +index 000000000..d91c8078a --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/Kbuild -@@ -0,0 +1,172 @@ -+# -+# (C) COPYRIGHT 2012-2016, 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. ++++ b/drivers/gpu/arm/mali400/.gitignore +@@ -0,0 +1 @@ ++./mali/__malidrv_build_info.c +diff --git a/drivers/gpu/arm/mali400/Kbuild b/drivers/gpu/arm/mali400/Kbuild +new file mode 100755 +index 000000000..dbb7ad3e5 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/Kbuild +@@ -0,0 +1,2 @@ ++# SPDX-License-Identifier: GPL-2.0 ++obj-y += mali/ +diff --git a/drivers/gpu/arm/mali400/mali/.gitignore b/drivers/gpu/arm/mali400/mali/.gitignore +new file mode 100755 +index 000000000..6b1a3ed27 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/.gitignore +@@ -0,0 +1 @@ ++__malidrv_build_info.c +diff --git a/drivers/gpu/arm/mali400/mali/Kbuild b/drivers/gpu/arm/mali400/mali/Kbuild +new file mode 100755 +index 000000000..7390ab758 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/Kbuild +@@ -0,0 +1,254 @@ +# ++# Copyright (C) 2010-2011 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++# as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained from Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + -+# Driver version string which is returned to userspace via an ioctl -+MALI_RELEASE_NAME ?= "r8p0-01rel0" ++# This file is called by the Linux build system. + -+# Paths required for build -+KBASE_PATH = $(src) -+KBASE_PLATFORM_PATH = $(KBASE_PATH)/platform_dummy -+UMP_PATH = $(src)/../../../base ++# make $(src) as absolute path if it isn't already, by prefixing $(srctree) ++src:=$(if $(patsubst /%,,$(src)),$(srctree)/$(src),$(src)) + -+ifeq ($(CONFIG_MALI_BIFROST_ERROR_INJECT),y) -+MALI_ERROR_INJECT_ON = 1 -+endif ++# set up defaults if not defined by the user ++TIMESTAMP ?= default ++OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB ?= 16 ++USING_GPU_UTILIZATION ?= 1 ++PROFILING_SKIP_PP_JOBS ?= 0 ++PROFILING_SKIP_PP_AND_GP_JOBS ?= 0 ++MALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP ?= 0 ++MALI_PP_SCHEDULER_KEEP_SUB_JOB_STARTS_ALIGNED ?= 0 ++MALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP_BETWEEN_APPS ?= 0 ++MALI_UPPER_HALF_SCHEDULING ?= 1 ++MALI_ENABLE_CPU_CYCLES ?= 0 ++MALI_PLATFORM ?= rk + -+# Set up defaults if not defined by build system -+MALI_CUSTOMER_RELEASE ?= 1 -+MALI_UNIT_TEST ?= 0 -+MALI_KERNEL_TEST_API ?= 0 -+MALI_ERROR_INJECT_ON ?= 0 -+MALI_MOCK_TEST ?= 0 -+MALI_COVERAGE ?= 0 -+MALI_INSTRUMENTATION_LEVEL ?= 0 -+CONFIG_MALI_PLATFORM_NAME ?= "devicetree" -+# This workaround is for what seems to be a compiler bug we observed in -+# GCC 4.7 on AOSP 4.3. The bug caused an intermittent failure compiling -+# the "_Pragma" syntax, where an error message is returned: -+# -+# "internal compiler error: unspellable token PRAGMA" -+# -+# This regression has thus far only been seen on the GCC 4.7 compiler bundled -+# with AOSP 4.3.0. So this makefile, intended for in-tree kernel builds -+# which are not known to be used with AOSP, is hardcoded to disable the -+# workaround, i.e. set the define to 0. -+MALI_GCC_WORKAROUND_MIDCOM_4598 ?= 0 ++# For customer releases the Linux Device Drivers will be provided as ARM proprietary and GPL releases: ++# The ARM proprietary product will only include the license/proprietary directory ++# The GPL product will only include the license/gpl directory ++ccflags-y += -I$(src)/linux/license/gpl + -+# Set up our defines, which will be passed to gcc -+DEFINES = \ -+ -DMALI_CUSTOMER_RELEASE=$(MALI_CUSTOMER_RELEASE) \ -+ -DMALI_KERNEL_TEST_API=$(MALI_KERNEL_TEST_API) \ -+ -DMALI_UNIT_TEST=$(MALI_UNIT_TEST) \ -+ -DMALI_ERROR_INJECT_ON=$(MALI_ERROR_INJECT_ON) \ -+ -DMALI_MOCK_TEST=$(MALI_MOCK_TEST) \ -+ -DMALI_COVERAGE=$(MALI_COVERAGE) \ -+ -DMALI_INSTRUMENTATION_LEVEL=$(MALI_INSTRUMENTATION_LEVEL) \ -+ -DMALI_RELEASE_NAME=\"$(MALI_RELEASE_NAME)\" \ -+ -DMALI_GCC_WORKAROUND_MIDCOM_4598=$(MALI_GCC_WORKAROUND_MIDCOM_4598) + -+ifeq ($(KBUILD_EXTMOD),) -+# in-tree -+DEFINES +=-DMALI_KBASE_PLATFORM_PATH=../../$(src)/platform/$(CONFIG_MALI_PLATFORM_NAME) -+else -+# out-of-tree -+DEFINES +=-DMALI_KBASE_PLATFORM_PATH=$(src)/platform/$(CONFIG_MALI_PLATFORM_NAME) ++ifeq ($(USING_GPU_UTILIZATION), 1) ++ ifeq ($(USING_DVFS), 1) ++ $(error USING_GPU_UTILIZATION conflict with USING_DVFS you can read the Integration Guide to choose which one do you need) ++ endif +endif + -+DEFINES += -I$(srctree)/drivers/staging/android ++ifneq ($(MALI_PLATFORM),) ++ EXTRA_DEFINES += -DMALI_FAKE_PLATFORM_DEVICE=1 ++ #MALI_PLATFORM_FILES = $(wildcard platform/$(MALI_PLATFORM)/*.c) ++ mali-y += \ ++ platform/$(MALI_PLATFORM)/rk.o ++endif + -+# Use our defines when compiling -+ccflags-y += $(DEFINES) -I$(KBASE_PATH) -I$(KBASE_PLATFORM_PATH) -I$(UMP_PATH) -I$(srctree)/include/linux -+subdir-ccflags-y += $(DEFINES) -I$(KBASE_PATH) -I$(KBASE_PLATFORM_PATH) -I$(OSK_PATH) -I$(UMP_PATH) -I$(srctree)/include/linux ++ifeq ($(MALI_PLATFORM_FILES),) ++ifeq ($(CONFIG_ARCH_EXYNOS4),y) ++EXTRA_DEFINES += -DMALI_FAKE_PLATFORM_DEVICE=1 ++export MALI_PLATFORM=exynos4 ++export MALI_PLATFORM_FILES_BUILDIN = $(notdir $(wildcard $(src)/platform/$(MALI_PLATFORM)/*.c)) ++export MALI_PLATFORM_FILES_ADD_PREFIX = $(addprefix platform/$(MALI_PLATFORM)/,$(MALI_PLATFORM_FILES_BUILDIN)) ++endif ++endif + -+SRC := \ -+ mali_kbase_device.c \ -+ mali_kbase_cache_policy.c \ -+ mali_kbase_mem.c \ -+ mali_kbase_mmu.c \ -+ mali_kbase_ctx_sched.c \ -+ mali_kbase_jd.c \ -+ mali_kbase_jd_debugfs.c \ -+ mali_kbase_jm.c \ -+ mali_kbase_gpuprops.c \ -+ mali_kbase_js.c \ -+ mali_kbase_js_ctx_attr.c \ -+ mali_kbase_event.c \ -+ mali_kbase_context.c \ -+ mali_kbase_pm.c \ -+ mali_kbase_config.c \ -+ mali_kbase_vinstr.c \ -+ mali_kbase_softjobs.c \ -+ mali_kbase_10969_workaround.c \ -+ mali_kbase_hw.c \ -+ mali_kbase_utility.c \ -+ mali_kbase_debug.c \ -+ mali_kbase_trace_timeline.c \ -+ mali_kbase_gpu_memory_debugfs.c \ -+ mali_kbase_mem_linux.c \ -+ mali_kbase_core_linux.c \ -+ mali_kbase_replay.c \ -+ mali_kbase_mem_profile_debugfs.c \ -+ mali_kbase_mmu_mode_lpae.c \ -+ mali_kbase_mmu_mode_aarch64.c \ -+ mali_kbase_disjoint_events.c \ -+ mali_kbase_gator_api.c \ -+ mali_kbase_debug_mem_view.c \ -+ mali_kbase_debug_job_fault.c \ -+ mali_kbase_smc.c \ -+ mali_kbase_mem_pool.c \ -+ mali_kbase_mem_pool_debugfs.c \ -+ mali_kbase_tlstream.c \ -+ mali_kbase_strings.c \ -+ mali_kbase_as_fault_debugfs.c \ -+ mali_kbase_regs_history_debugfs.c ++mali-y += \ ++ linux/mali_osk_atomics.o \ ++ linux/mali_osk_irq.o \ ++ linux/mali_osk_wq.o \ ++ linux/mali_osk_locks.o \ ++ linux/mali_osk_wait_queue.o \ ++ linux/mali_osk_low_level_mem.o \ ++ linux/mali_osk_math.o \ ++ linux/mali_osk_memory.o \ ++ linux/mali_osk_misc.o \ ++ linux/mali_osk_mali.o \ ++ linux/mali_osk_notification.o \ ++ linux/mali_osk_time.o \ ++ linux/mali_osk_timers.o \ ++ linux/mali_osk_bitmap.o ++ ++mali-y += linux/mali_memory.o linux/mali_memory_os_alloc.o ++mali-y += linux/mali_memory_external.o ++mali-y += linux/mali_memory_block_alloc.o ++mali-y += linux/mali_memory_swap_alloc.o + ++mali-y += \ ++ linux/mali_memory_manager.o \ ++ linux/mali_memory_virtual.o \ ++ linux/mali_memory_util.o \ ++ linux/mali_memory_cow.o \ ++ linux/mali_memory_defer_bind.o + ++mali-y += \ ++ linux/mali_ukk_mem.o \ ++ linux/mali_ukk_gp.o \ ++ linux/mali_ukk_pp.o \ ++ linux/mali_ukk_core.o \ ++ linux/mali_ukk_soft_job.o \ ++ linux/mali_ukk_timeline.o + ++mali-$(CONFIG_MALI_DEVFREQ) += \ ++ linux/mali_devfreq.o \ ++ common/mali_pm_metrics.o + -+ifeq ($(MALI_UNIT_TEST),1) -+ SRC += mali_kbase_tlstream_test.c ++# Source files which always are included in a build ++mali-y += \ ++ common/mali_kernel_core.o \ ++ linux/mali_kernel_linux.o \ ++ common/mali_session.o \ ++ linux/mali_device_pause_resume.o \ ++ common/mali_kernel_vsync.o \ ++ linux/mali_ukk_vsync.o \ ++ linux/mali_kernel_sysfs.o \ ++ common/mali_mmu.o \ ++ common/mali_mmu_page_directory.o \ ++ common/mali_mem_validation.o \ ++ common/mali_hw_core.o \ ++ common/mali_gp.o \ ++ common/mali_pp.o \ ++ common/mali_pp_job.o \ ++ common/mali_gp_job.o \ ++ common/mali_soft_job.o \ ++ common/mali_scheduler.o \ ++ common/mali_executor.o \ ++ common/mali_group.o \ ++ common/mali_dlbu.o \ ++ common/mali_broadcast.o \ ++ common/mali_pm.o \ ++ common/mali_pmu.o \ ++ common/mali_user_settings_db.o \ ++ common/mali_kernel_utilization.o \ ++ common/mali_control_timer.o \ ++ common/mali_l2_cache.o \ ++ common/mali_timeline.o \ ++ common/mali_timeline_fence_wait.o \ ++ common/mali_timeline_sync_fence.o \ ++ common/mali_spinlock_reentrant.o \ ++ common/mali_pm_domain.o \ ++ linux/mali_osk_pm.o \ ++ linux/mali_pmu_power_up_down.o \ ++ __malidrv_build_info.o ++ ++ifneq ($(wildcard $(src)/linux/mali_slp_global_lock.c),) ++ mali-y += linux/mali_slp_global_lock.o +endif + -+ifeq ($(MALI_CUSTOMER_RELEASE),0) -+ SRC += mali_kbase_regs_dump_debugfs.c ++ifneq ($(MALI_PLATFORM_FILES),) ++ mali-y += $(MALI_PLATFORM_FILES:.c=.o) +endif + ++ifneq ($(MALI_PLATFORM_FILES_ADD_PREFIX),) ++ mali-y += $(MALI_PLATFORM_FILES_ADD_PREFIX:.c=.o) ++endif + -+ccflags-y += -I$(KBASE_PATH) ++mali-$(CONFIG_MALI400_PROFILING) += linux/mali_ukk_profiling.o ++mali-$(CONFIG_MALI400_PROFILING) += linux/mali_osk_profiling.o + -+# Tell the Linux build system from which .o file to create the kernel module -+obj-$(CONFIG_MALI_BIFROST) += bifrost_kbase.o ++mali-$(CONFIG_MALI400_INTERNAL_PROFILING) += linux/mali_profiling_internal.o timestamp-$(TIMESTAMP)/mali_timestamp.o ++ccflags-$(CONFIG_MALI400_INTERNAL_PROFILING) += -I$(src)/timestamp-$(TIMESTAMP) + -+# Tell the Linux build system to enable building of our .c files -+bifrost_kbase-y := $(SRC:.c=.o) ++mali-$(CONFIG_DMA_SHARED_BUFFER) += linux/mali_memory_dma_buf.o ++mali-$(CONFIG_DMA_SHARED_BUFFER) += linux/mali_memory_secure.o ++mali-$(CONFIG_SYNC) += linux/mali_sync.o ++mali-$(CONFIG_SYNC) += linux/mali_internal_sync.o ++mali-$(CONFIG_SYNC_FILE) += linux/mali_sync.o ++mali-$(CONFIG_SYNC_FILE) += linux/mali_internal_sync.o ++mali-$(CONFIG_MALI_DMA_BUF_FENCE) += linux/mali_dma_fence.o ++ccflags-$(CONFIG_SYNC) += -Idrivers/staging/android ++ccflags-$(CONFIG_SYNC_FILE) += -Idrivers/staging/android + -+# Kconfig passes in the name with quotes for in-tree builds - remove them. -+platform_name := $(shell echo $(CONFIG_MALI_PLATFORM_NAME)) -+MALI_PLATFORM_DIR := platform/$(platform_name) -+ccflags-y += -I$(src)/$(MALI_PLATFORM_DIR) -+include $(src)/$(MALI_PLATFORM_DIR)/Kbuild ++mali-$(CONFIG_MALI400_UMP) += linux/mali_memory_ump.o + -+ifeq ($(CONFIG_MALI_BIFROST_DEVFREQ),y) -+ ifeq ($(CONFIG_DEVFREQ_THERMAL),y) -+ include $(src)/ipa/Kbuild -+ endif -+endif ++mali-$(CONFIG_MALI_DVFS) += common/mali_dvfs_policy.o + -+bifrost_kbase-$(CONFIG_MALI_BIFROST_DMA_FENCE) += \ -+ mali_kbase_dma_fence.o \ -+ mali_kbase_fence.o -+bifrost_kbase-$(CONFIG_SYNC) += \ -+ mali_kbase_sync_android.o \ -+ mali_kbase_sync_common.o -+bifrost_kbase-$(CONFIG_SYNC_FILE) += \ -+ mali_kbase_sync_file.o \ -+ mali_kbase_sync_common.o \ -+ mali_kbase_fence.o ++# Tell the Linux build system from which .o file to create the kernel module ++obj-$(CONFIG_MALI400) := mali.o + -+ifeq ($(MALI_MOCK_TEST),1) -+# Test functionality -+bifrost_kbase-y += tests/internal/src/mock/mali_kbase_pm_driver_mock.o -+endif ++ccflags-y += $(EXTRA_DEFINES) + -+include $(src)/backend/gpu/Kbuild -+bifrost_kbase-y += $(BACKEND:.c=.o) ++# Set up our defines, which will be passed to gcc ++ccflags-y += -DMALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP=$(MALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP) ++ccflags-y += -DMALI_PP_SCHEDULER_KEEP_SUB_JOB_STARTS_ALIGNED=$(MALI_PP_SCHEDULER_KEEP_SUB_JOB_STARTS_ALIGNED) ++ccflags-y += -DMALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP_BETWEEN_APPS=$(MALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP_BETWEEN_APPS) ++ccflags-y += -DMALI_STATE_TRACKING=1 ++ccflags-y += -DMALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB=$(OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB) ++ccflags-y += -DUSING_GPU_UTILIZATION=$(USING_GPU_UTILIZATION) ++ccflags-y += -DMALI_ENABLE_CPU_CYCLES=$(MALI_ENABLE_CPU_CYCLES) + ++ifeq ($(MALI_UPPER_HALF_SCHEDULING),1) ++ ccflags-y += -DMALI_UPPER_HALF_SCHEDULING ++endif + -+ccflags-y += -I$(src)/backend/gpu -+subdir-ccflags-y += -I$(src)/backend/gpu ++#build-in include path is different ++ifeq ($(MALI_PLATFORM_FILES),) ++ccflags-$(CONFIG_MALI400_UMP) += -I$(src)/../ump/include/ ++else ++ccflags-$(CONFIG_MALI400_UMP) += -I$(src)/../../ump/include/ump ++endif ++ccflags-$(CONFIG_MALI400_DEBUG) += -DDEBUG + -+# For kutf and mali_kutf_irq_latency_test -+obj-$(CONFIG_MALI_KUTF) += tests/ -diff --git a/drivers/gpu/arm/bifrost_for_linux/Kconfig b/drivers/gpu/arm/bifrost_for_linux/Kconfig -new file mode 100755 -index 000000000000..e78b634031ee ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/Kconfig -@@ -0,0 +1,196 @@ -+# -+# (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++# Use our defines when compiling ++ccflags-y += -I$(src) -I$(src)/include -I$(src)/common -I$(src)/linux -I$(src)/platform -Wno-date-time + ++# Get subversion revision number, fall back to only ${MALI_RELEASE_NAME} if no svn info is available ++MALI_RELEASE_NAME=$(shell cat $(src)/.version 2> /dev/null) + ++SVN_INFO = (cd $(src); svn info 2>/dev/null) + -+menuconfig MALI_BIFROST -+ tristate "Mali Bifrost series support (Linux only)" -+ default n -+ help -+ Enable this option to build support for a ARM Mali Bifrost GPU. ++ifneq ($(shell $(SVN_INFO) 2>/dev/null),) ++# SVN detected ++SVN_REV := $(shell $(SVN_INFO) | grep '^Revision: '| sed -e 's/^Revision: //' 2>/dev/null) ++DRIVER_REV := $(MALI_RELEASE_NAME)-r$(SVN_REV) ++CHANGE_DATE := $(shell $(SVN_INFO) | grep '^Last Changed Date: ' | cut -d: -f2- | cut -b2-) ++CHANGED_REVISION := $(shell $(SVN_INFO) | grep '^Last Changed Rev: ' | cut -d: -f2- | cut -b2-) ++REPO_URL := $(shell $(SVN_INFO) | grep '^URL: ' | cut -d: -f2- | cut -b2-) + -+ To compile this driver as a module, choose M here: -+ this will generate a single module, called mali_kbase. ++else # SVN ++# GIT_REV := $(shell cd $(src); git describe --always 2>/dev/null) ++ifneq ($(GIT_REV),) ++# Git detected ++DRIVER_REV := $(MALI_RELEASE_NAME)-$(GIT_REV) ++CHANGE_DATE := $(shell cd $(src); git log -1 --format="%ci") ++CHANGED_REVISION := $(GIT_REV) ++REPO_URL := $(shell cd $(src); git describe --all --always 2>/dev/null) + -+config MALI_BIFROST_GATOR_SUPPORT -+ bool "Streamline support via Gator" -+ depends on MALI_BIFROST -+ default n -+ help -+ Adds diagnostic support for use with the ARM Streamline Performance Analyzer. -+ You will need the Gator device driver already loaded before loading this driver when enabling -+ Streamline debug support. -+ This is a legacy interface required by older versions of Streamline. ++else # Git ++# No Git or SVN detected ++DRIVER_REV := $(MALI_RELEASE_NAME) ++CHANGE_DATE := $(MALI_RELEASE_NAME) ++CHANGED_REVISION := $(MALI_RELEASE_NAME) ++endif ++endif + -+config MALI_BIFROST_DVFS -+ bool "Enable legacy DVFS" -+ depends on MALI_BIFROST && !MALI_BIFROST_DEVFREQ -+ default n -+ help -+ Choose this option to enable legacy DVFS in the Mali Midgard DDK. ++ccflags-y += -DSVN_REV_STRING=\"$(DRIVER_REV)\" + -+config MALI_BIFROST_ENABLE_TRACE -+ bool "Enable kbase tracing" -+ depends on MALI_BIFROST -+ default n -+ help -+ Enables tracing in kbase. Trace log available through -+ the "mali_trace" debugfs file, when the CONFIG_DEBUG_FS is enabled ++VERSION_STRINGS := ++VERSION_STRINGS += API_VERSION=$(shell cd $(src); grep "\#define _MALI_API_VERSION" $(FILES_PREFIX)include/linux/mali/mali_utgard_uk_types.h | cut -d' ' -f 3 ) ++VERSION_STRINGS += REPO_URL=$(REPO_URL) ++VERSION_STRINGS += REVISION=$(DRIVER_REV) ++VERSION_STRINGS += CHANGED_REVISION=$(CHANGED_REVISION) ++VERSION_STRINGS += CHANGE_DATE=$(CHANGE_DATE) ++VERSION_STRINGS += BUILD_DATE=$(shell date) ++ifdef CONFIG_MALI400_DEBUG ++VERSION_STRINGS += BUILD=debug ++else ++VERSION_STRINGS += BUILD=release ++endif ++VERSION_STRINGS += TARGET_PLATFORM=$(TARGET_PLATFORM) ++VERSION_STRINGS += MALI_PLATFORM=$(MALI_PLATFORM) ++VERSION_STRINGS += KDIR=$(KDIR) ++VERSION_STRINGS += OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB=$(OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB) ++VERSION_STRINGS += USING_UMP=$(CONFIG_MALI400_UMP) ++VERSION_STRINGS += USING_PROFILING=$(CONFIG_MALI400_PROFILING) ++VERSION_STRINGS += USING_INTERNAL_PROFILING=$(CONFIG_MALI400_INTERNAL_PROFILING) ++VERSION_STRINGS += USING_GPU_UTILIZATION=$(USING_GPU_UTILIZATION) ++VERSION_STRINGS += USING_DVFS=$(CONFIG_MALI_DVFS) ++VERSION_STRINGS += USING_DMA_BUF_FENCE = $(CONFIG_MALI_DMA_BUF_FENCE) ++VERSION_STRINGS += MALI_UPPER_HALF_SCHEDULING=$(MALI_UPPER_HALF_SCHEDULING) + -+config MALI_BIFROST_DEVFREQ -+ bool "devfreq support for Mali" -+ depends on MALI_BIFROST && PM_DEVFREQ ++# Create file with Mali driver configuration ++$(src)/__malidrv_build_info.c: ++ @echo 'const char *__malidrv_build_info(void) { return "malidrv: $(VERSION_STRINGS)";}' > $(src)/__malidrv_build_info.c +diff --git a/drivers/gpu/arm/mali400/mali/Kconfig b/drivers/gpu/arm/mali400/mali/Kconfig +new file mode 100755 +index 000000000..082919d91 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/Kconfig +@@ -0,0 +1,119 @@ ++# SPDX-License-Identifier: GPL-2.0 ++config MALI400 ++ tristate "Mali-300/400/450 support" ++ depends on ARM || ARM64 ++ select DMA_SHARED_BUFFER + help -+ Support devfreq for Mali. ++ This enables support for the ARM Mali-300, Mali-400, and Mali-450 ++ GPUs. + -+ Using the devfreq framework and, by default, the simpleondemand -+ governor, the frequency of Mali will be dynamically selected from the -+ available OPPs. ++ To compile this driver as a module, choose M here: the module will be ++ called mali. + -+config MALI_BIFROST_DMA_FENCE -+ bool "DMA_BUF fence support for Mali" -+ depends on MALI_BIFROST && !KDS -+ default n ++config MALI450 ++ bool "Enable Mali-450 support" ++ depends on MALI400 + help -+ Support DMA_BUF fences for Mali. -+ -+ This option should only be enabled if KDS is not present and -+ the Linux Kernel has built in support for DMA_BUF fences. ++ This enables support for Mali-450 specific features. + -+config MALI_PLATFORM_NAME -+ depends on MALI_BIFROST -+ string "Platform name" -+ default "devicetree" ++config MALI470 ++ bool "Enable Mali-470 support" ++ depends on MALI400 + help -+ Enter the name of the desired platform configuration directory to -+ include in the build. 'platform/$(MALI_PLATFORM_NAME)/Kbuild' must -+ exist. -+ -+# MALI_BIFROST_EXPERT configuration options ++ This enables support for Mali-470 specific features. + -+menuconfig MALI_BIFROST_EXPERT -+ depends on MALI_BIFROST -+ bool "Enable Expert Settings" -+ default n ++config MALI400_DEBUG ++ bool "Enable debug in Mali driver" ++ depends on MALI400 + help -+ Enabling this option and modifying the default settings may produce a driver with performance or -+ other limitations. ++ This enabled extra debug checks and messages in the Mali driver. + -+config MALI_CORESTACK -+ bool "Support controlling power to the GPU core stack" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT -+ default n ++config MALI400_PROFILING ++ bool "Enable Mali profiling" ++ depends on MALI400 ++ select TRACEPOINTS ++ default y + help -+ Enabling this feature on supported GPUs will let the driver powering -+ on/off the GPU core stack independently without involving the Power -+ Domain Controller. This should only be enabled on platforms which -+ integration of the PDC to the Mali GPU is known to be problematic. -+ This feature is currently only supported on t-Six and t-HEx GPUs. -+ -+ If unsure, say N. ++ This enables gator profiling of Mali GPU events. + -+config MALI_BIFROST_PRFCNT_SET_SECONDARY -+ bool "Use secondary set of performance counters" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++config MALI400_INTERNAL_PROFILING ++ bool "Enable internal Mali profiling API" ++ depends on MALI400_PROFILING + default n + help -+ Select this option to use secondary set of performance counters. Kernel -+ features that depend on an access to the primary set of counters may -+ become unavailable. Enabling this option will prevent power management -+ from working optimally and may cause instrumentation tools to return -+ bogus results. -+ -+ If unsure, say N. ++ This enables the internal legacy Mali profiling API. + -+config MALI_BIFROST_DEBUG -+ bool "Debug build" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT -+ default n ++config MALI400_UMP ++ bool "Enable UMP support" ++ depends on MALI400 + help -+ Select this option for increased checking and reporting of errors. ++ This enables support for the UMP memory sharing API in the Mali driver. + -+config MALI_BIFROST_FENCE_DEBUG -+ bool "Debug sync fence usage" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT && (SYNC || SYNC_FILE) -+ default y if MALI_BIFROST_DEBUG ++config MALI_DVFS ++ bool "Enable Mali dynamically frequency change" ++ depends on MALI400 && !MALI_DEVFREQ ++ default y + help -+ Select this option to enable additional checking and reporting on the -+ use of sync fences in the Mali driver. -+ -+ This will add a 3s timeout to all sync fence waits in the Mali -+ driver, so that when work for Mali has been waiting on a sync fence -+ for a long time a debug message will be printed, detailing what fence -+ is causing the block, and which dependent Mali atoms are blocked as a -+ result of this. -+ -+ The timeout can be changed at runtime through the js_soft_timeout -+ device attribute, where the timeout is specified in milliseconds. ++ This enables support for dynamic change frequency of Mali with the goal of lowering power consumption. + -+config MALI_BIFROST_NO_MALI -+ bool "No Mali" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT -+ default n ++config MALI_DMA_BUF_MAP_ON_ATTACH ++ bool "Map dma-buf attachments on attach" ++ depends on MALI400 && DMA_SHARED_BUFFER ++ default y + help -+ This can be used to test the driver in a simulated environment -+ whereby the hardware is not physically present. If the hardware is physically -+ present it will not be used. This can be used to test the majority of the -+ driver without needing actual hardware or for software benchmarking. -+ All calls to the simulated hardware will complete immediately as if the hardware -+ completed the task. ++ This makes the Mali driver map dma-buf attachments after doing ++ attach. If this is not set the dma-buf attachments will be mapped for ++ every time the GPU need to access the buffer. + -+config MALI_BIFROST_ERROR_INJECT -+ bool "Error injection" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT && MALI_BIFROST_NO_MALI ++ Mapping for each access can cause lower performance. ++ ++config MALI_SHARED_INTERRUPTS ++ bool "Support for shared interrupts" ++ depends on MALI400 + default n + help -+ Enables insertion of errors to test module failure and recovery mechanisms. ++ Adds functionality required to properly support shared interrupts. Without this support, ++ the device driver will fail during insmod if it detects shared interrupts. This also ++ works when the GPU is not using shared interrupts, but might have a slight performance ++ impact. + -+config MALI_BIFROST_TRACE_TIMELINE -+ bool "Timeline tracing" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++config MALI_PMU_PARALLEL_POWER_UP ++ bool "Power up Mali PMU domains in parallel" ++ depends on MALI400 + default n + help -+ Enables timeline tracing through the kernel tracepoint system. ++ This makes the Mali driver power up all PMU power domains in parallel, instead of ++ powering up domains one by one, with a slight delay in between. Powering on all power ++ domains at the same time may cause peak currents higher than what some systems can handle. ++ These systems must not enable this option. + -+config MALI_BIFROST_SYSTEM_TRACE -+ bool "Enable system event tracing support" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++config MALI_DT ++ bool "Using device tree to initialize module" ++ depends on MALI400 && OF + default n + help -+ Choose this option to enable system trace events for each -+ kbase event. This is typically used for debugging but has -+ minimal overhead when not in use. Enable only if you know what -+ you are doing. ++ This enable the Mali driver to choose the device tree path to get platform resoures ++ and disable the old config method. Mali driver could run on the platform which the ++ device tree is enabled in kernel and corresponding hardware description is implemented ++ properly in device DTS file. + -+config MALI_2MB_ALLOC -+ bool "Attempt to allocate 2MB pages" -+ depends on MALI_BIFROST && MALI_BIFROST_EXPERT ++config MALI_DEVFREQ ++ bool "Using devfreq to tuning frequency" ++ depends on MALI400 && PM_DEVFREQ ++ select DEVFREQ_GOV_SIMPLE_ONDEMAND + default n + help -+ Rather than allocating all GPU memory page-by-page, attempt to -+ allocate 2MB pages from the kernel. This reduces TLB pressure and -+ helps to prevent memory fragmentation. ++ Support devfreq for Mali. + -+ If in doubt, say N ++ Using the devfreq framework and, by default, the simpleondemand ++ governor, the frequency of Mali will be dynamically selected from the ++ available OPPs. + -+config MALI_PWRSOFT_765 -+ bool "PWRSOFT-765 ticket" ++config MALI_QUIET ++ bool "Make Mali driver very quiet" ++ depends on MALI400 && !MALI400_DEBUG + default n + help -+ PWRSOFT-765 fixes devfreq cooling devices issues. However, they are -+ not merged in mainline kernel yet. So this define helps to guard those -+ parts of the code. ++ This forces the Mali driver to never print any messages. + -+source "drivers/gpu/arm/bifrost/platform/Kconfig" -+# source "drivers/gpu/arm/bifrost/tests/Kconfig" -diff --git a/drivers/gpu/arm/bifrost_for_linux/Makefile b/drivers/gpu/arm/bifrost_for_linux/Makefile ++ If unsure, say N. +diff --git a/drivers/gpu/arm/mali400/mali/Makefile b/drivers/gpu/arm/mali400/mali/Makefile new file mode 100755 -index 000000000000..26522d566dd0 +index 000000000..0b91321a5 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/Makefile -@@ -0,0 +1,42 @@ -+# -+# (C) COPYRIGHT 2010-2016, 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. ++++ b/drivers/gpu/arm/mali400/mali/Makefile +@@ -0,0 +1,206 @@ +# ++# Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++# as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained from Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + ++USE_UMPV2=0 ++USING_PROFILING ?= 1 ++USING_INTERNAL_PROFILING ?= 0 ++USING_DVFS ?= 1 ++USING_DMA_BUF_FENCE ?= 0 ++MALI_HEATMAPS_ENABLED ?= 0 ++MALI_DMA_BUF_MAP_ON_ATTACH ?= 1 ++MALI_PMU_PARALLEL_POWER_UP ?= 0 ++USING_DT ?= 0 ++MALI_MEM_SWAP_TRACKING ?= 0 ++USING_DEVFREQ ?= 0 ++ ++# The Makefile sets up "arch" based on the CONFIG, creates the version info ++# string and the __malidrv_build_info.c file, and then call the Linux build ++# system to actually build the driver. After that point the Kbuild file takes ++# over. + ++# set up defaults if not defined by the user ++ARCH ?= arm + -+KDIR ?= /lib/modules/$(shell uname -r)/build ++OSKOS=linux ++FILES_PREFIX= + -+BUSLOG_PATH_RELATIVE = $(CURDIR)/../../../.. -+UMP_PATH_RELATIVE = $(CURDIR)/../../../base/ump -+KBASE_PATH_RELATIVE = $(CURDIR) -+KDS_PATH_RELATIVE = $(CURDIR)/../../../.. -+EXTRA_SYMBOLS = $(UMP_PATH_RELATIVE)/src/Module.symvers ++check_cc2 = \ ++ $(shell if $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ ++ then \ ++ echo "$(2)"; \ ++ else \ ++ echo "$(3)"; \ ++ fi ;) + -+ifeq ($(MALI_UNIT_TEST), 1) -+ EXTRA_SYMBOLS += $(KBASE_PATH_RELATIVE)/tests/internal/src/kernel_assert_module/linux/Module.symvers ++# This conditional makefile exports the global definition ARM_INTERNAL_BUILD. Customer releases will not include arm_internal.mak ++-include ../../../arm_internal.mak ++ ++# Give warning of old config parameters are used ++ifneq ($(CONFIG),) ++$(warning "You have specified the CONFIG variable which is no longer in used. Use TARGET_PLATFORM instead.") +endif + -+ifeq ($(CONFIG_MALI_FPGA_BUS_LOGGER),y) -+#Add bus logger symbols -+EXTRA_SYMBOLS += $(BUSLOG_PATH_RELATIVE)/drivers/base/bus_logger/Module.symvers ++ifneq ($(CPU),) ++$(warning "You have specified the CPU variable which is no longer in used. Use TARGET_PLATFORM instead.") +endif + -+# GPL driver supports KDS -+EXTRA_SYMBOLS += $(KDS_PATH_RELATIVE)/drivers/base/kds/Module.symvers ++# Include the mapping between TARGET_PLATFORM and KDIR + MALI_PLATFORM ++-include MALI_CONFIGURATION ++export KDIR ?= $(KDIR-$(TARGET_PLATFORM)) ++export MALI_PLATFORM ?= $(MALI_PLATFORM-$(TARGET_PLATFORM)) + -+# we get the symbols from modules using KBUILD_EXTRA_SYMBOLS to prevent warnings about unknown functions -+all: -+ $(MAKE) -C $(KDIR) M=$(CURDIR) EXTRA_CFLAGS="-I$(CURDIR)/../../../../include -I$(CURDIR)/../../../../tests/include $(SCONS_CFLAGS)" $(SCONS_CONFIGS) KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" modules ++ifneq ($(TARGET_PLATFORM),) ++ifeq ($(MALI_PLATFORM),) ++$(error "Invalid TARGET_PLATFORM: $(TARGET_PLATFORM)") ++endif ++endif + -+clean: -+ $(MAKE) -C $(KDIR) M=$(CURDIR) clean -diff --git a/drivers/gpu/arm/bifrost_for_linux/Makefile.kbase b/drivers/gpu/arm/bifrost_for_linux/Makefile.kbase -new file mode 100755 -index 000000000000..2bef9c25eaeb ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/Makefile.kbase -@@ -0,0 +1,17 @@ -+# -+# (C) COPYRIGHT 2010 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++# validate lookup result ++ifeq ($(KDIR),) ++$(error No KDIR found for platform $(TARGET_PLATFORM)) ++endif + ++ifeq ($(USING_GPU_UTILIZATION), 1) ++ ifeq ($(USING_DVFS), 1) ++ $(error USING_GPU_UTILIZATION conflict with USING_DVFS you can read the Integration Guide to choose which one do you need) ++ endif ++endif + -+EXTRA_CFLAGS += -I$(ROOT) -I$(KBASE_PATH) -I$(OSK_PATH)/src/linux/include -I$(KBASE_PATH)/platform_$(PLATFORM) ++ifeq ($(USING_UMP),1) ++export CONFIG_MALI400_UMP=y ++export EXTRA_DEFINES += -DCONFIG_MALI400_UMP=1 ++ifeq ($(USE_UMPV2),1) ++UMP_SYMVERS_FILE ?= ../umpv2/Module.symvers ++else ++UMP_SYMVERS_FILE ?= ../ump/Module.symvers ++endif ++KBUILD_EXTRA_SYMBOLS = $(realpath $(UMP_SYMVERS_FILE)) ++$(warning $(KBUILD_EXTRA_SYMBOLS)) ++endif + -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/Kbuild b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/Kbuild -new file mode 100755 -index 000000000000..5eeba1b14710 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/Kbuild -@@ -0,0 +1,60 @@ -+# -+# (C) COPYRIGHT 2014,2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++# Define host system directory ++KDIR-$(shell uname -m):=/lib/modules/$(shell uname -r)/build + ++include $(KDIR)/.config + -+BACKEND += \ -+ backend/gpu/mali_kbase_cache_policy_backend.c \ -+ backend/gpu/mali_kbase_device_hw.c \ -+ backend/gpu/mali_kbase_gpu.c \ -+ backend/gpu/mali_kbase_gpuprops_backend.c \ -+ backend/gpu/mali_kbase_debug_job_fault_backend.c \ -+ backend/gpu/mali_kbase_irq_linux.c \ -+ backend/gpu/mali_kbase_instr_backend.c \ -+ backend/gpu/mali_kbase_jm_as.c \ -+ backend/gpu/mali_kbase_jm_hw.c \ -+ backend/gpu/mali_kbase_jm_rb.c \ -+ backend/gpu/mali_kbase_js_affinity.c \ -+ backend/gpu/mali_kbase_js_backend.c \ -+ backend/gpu/mali_kbase_mmu_hw_direct.c \ -+ backend/gpu/mali_kbase_pm_backend.c \ -+ backend/gpu/mali_kbase_pm_driver.c \ -+ backend/gpu/mali_kbase_pm_metrics.c \ -+ backend/gpu/mali_kbase_pm_ca.c \ -+ backend/gpu/mali_kbase_pm_ca_fixed.c \ -+ backend/gpu/mali_kbase_pm_always_on.c \ -+ backend/gpu/mali_kbase_pm_coarse_demand.c \ -+ backend/gpu/mali_kbase_pm_demand.c \ -+ backend/gpu/mali_kbase_pm_policy.c \ -+ backend/gpu/mali_kbase_time.c ++ifeq ($(ARCH), arm) ++# when compiling for ARM we're cross compiling ++export CROSS_COMPILE ?= $(call check_cc2, arm-linux-gnueabi-gcc, arm-linux-gnueabi-, arm-none-linux-gnueabi-) ++endif + -+ifeq ($(MALI_CUSTOMER_RELEASE),0) -+BACKEND += \ -+ backend/gpu/mali_kbase_pm_ca_random.c \ -+ backend/gpu/mali_kbase_pm_demand_always_powered.c \ -+ backend/gpu/mali_kbase_pm_fast_start.c ++# report detected/selected settings ++ifdef ARM_INTERNAL_BUILD ++$(warning TARGET_PLATFORM $(TARGET_PLATFORM)) ++$(warning KDIR $(KDIR)) ++$(warning MALI_PLATFORM $(MALI_PLATFORM)) +endif + -+ifeq ($(CONFIG_MALI_BIFROST_DEVFREQ),y) -+BACKEND += \ -+ backend/gpu/mali_kbase_devfreq.c \ -+ backend/gpu/mali_kbase_pm_ca_devfreq.c ++# Set up build config ++export CONFIG_MALI400=m ++export CONFIG_MALI450=y ++export CONFIG_MALI470=y ++ ++export EXTRA_DEFINES += -DCONFIG_MALI400=1 ++export EXTRA_DEFINES += -DCONFIG_MALI450=1 ++export EXTRA_DEFINES += -DCONFIG_MALI470=1 ++ ++ifneq ($(MALI_PLATFORM),) ++export EXTRA_DEFINES += -DMALI_FAKE_PLATFORM_DEVICE=1 ++export MALI_PLATFORM_FILES = $(wildcard platform/$(MALI_PLATFORM)/*.c) +endif + -+ifeq ($(CONFIG_MALI_BIFROST_NO_MALI),y) -+ # Dummy model -+ BACKEND += backend/gpu/mali_kbase_model_dummy.c -+ BACKEND += backend/gpu/mali_kbase_model_linux.c -+ # HW error simulation -+ BACKEND += backend/gpu/mali_kbase_model_error_generator.c ++ifeq ($(USING_PROFILING),1) ++ifeq ($(CONFIG_TRACEPOINTS),) ++$(warning CONFIG_TRACEPOINTS required for profiling) ++else ++export CONFIG_MALI400_PROFILING=y ++export EXTRA_DEFINES += -DCONFIG_MALI400_PROFILING=1 ++ifeq ($(USING_INTERNAL_PROFILING),1) ++export CONFIG_MALI400_INTERNAL_PROFILING=y ++export EXTRA_DEFINES += -DCONFIG_MALI400_INTERNAL_PROFILING=1 ++endif ++ifeq ($(MALI_HEATMAPS_ENABLED),1) ++export MALI_HEATMAPS_ENABLED=y ++export EXTRA_DEFINES += -DCONFIG_MALI400_HEATMAPS_ENABLED ++endif ++endif +endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_backend_config.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_backend_config.h -new file mode 100755 -index 000000000000..c8ae87eb84a2 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_backend_config.h -@@ -0,0 +1,29 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ + ++ifeq ($(MALI_DMA_BUF_MAP_ON_ATTACH),1) ++export CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH=y ++export EXTRA_DEFINES += -DCONFIG_MALI_DMA_BUF_MAP_ON_ATTACH ++endif + ++ifeq ($(MALI_SHARED_INTERRUPTS),1) ++export CONFIG_MALI_SHARED_INTERRUPTS=y ++export EXTRA_DEFINES += -DCONFIG_MALI_SHARED_INTERRUPTS ++endif + -+/* -+ * Backend specific configuration -+ */ ++ifeq ($(USING_DVFS),1) ++export CONFIG_MALI_DVFS=y ++export EXTRA_DEFINES += -DCONFIG_MALI_DVFS ++endif + -+#ifndef _KBASE_BACKEND_CONFIG_H_ -+#define _KBASE_BACKEND_CONFIG_H_ ++ifeq ($(USING_DMA_BUF_FENCE),1) ++export CONFIG_MALI_DMA_BUF_FENCE=y ++export EXTRA_DEFINES += -DCONFIG_MALI_DMA_BUF_FENCE ++endif + -+/* Enable GPU reset API */ -+#define KBASE_GPU_RESET_EN 1 ++ifeq ($(MALI_PMU_PARALLEL_POWER_UP),1) ++export CONFIG_MALI_PMU_PARALLEL_POWER_UP=y ++export EXTRA_DEFINES += -DCONFIG_MALI_PMU_PARALLEL_POWER_UP ++endif + -+#endif /* _KBASE_BACKEND_CONFIG_H_ */ ++ifdef CONFIG_OF ++ifeq ($(USING_DT),1) ++export CONFIG_MALI_DT=y ++export EXTRA_DEFINES += -DCONFIG_MALI_DT ++endif ++endif + -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_cache_policy_backend.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_cache_policy_backend.c -new file mode 100755 -index 000000000000..fef9a2cb743e ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_cache_policy_backend.c -@@ -0,0 +1,29 @@ -+/* -+ * -+ * (C) COPYRIGHT 2015-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ifeq ($(USING_DEVFREQ), 1) ++ifdef CONFIG_PM_DEVFREQ ++export CONFIG_MALI_DEVFREQ=y ++export EXTRA_DEFINES += -DCONFIG_MALI_DEVFREQ=1 ++else ++$(warning "You want to support DEVFREQ but kernel didn't support DEVFREQ.") ++endif ++endif + ++ifneq ($(BUILD),release) ++# Debug ++export CONFIG_MALI400_DEBUG=y ++else ++# Release ++ifeq ($(MALI_QUIET),1) ++export CONFIG_MALI_QUIET=y ++export EXTRA_DEFINES += -DCONFIG_MALI_QUIET ++endif ++endif + ++ifeq ($(MALI_SKIP_JOBS),1) ++EXTRA_DEFINES += -DPROFILING_SKIP_PP_JOBS=1 -DPROFILING_SKIP_GP_JOBS=1 ++endif + -+#include "backend/gpu/mali_kbase_cache_policy_backend.h" -+#include ++ifeq ($(MALI_MEM_SWAP_TRACKING),1) ++EXTRA_DEFINES += -DMALI_MEM_SWAP_TRACKING=1 ++endif + -+void kbase_cache_set_coherency_mode(struct kbase_device *kbdev, -+ u32 mode) -+{ -+ kbdev->current_gpu_coherency_mode = mode; ++all: $(UMP_SYMVERS_FILE) ++ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) modules ++ @rm $(FILES_PREFIX)__malidrv_build_info.c $(FILES_PREFIX)__malidrv_build_info.o + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_COHERENCY_REG)) -+ kbase_reg_write(kbdev, COHERENCY_ENABLE, mode, NULL); -+} ++clean: ++ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean ++ ++kernelrelease: ++ $(MAKE) ARCH=$(ARCH) -C $(KDIR) kernelrelease + -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_cache_policy_backend.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_cache_policy_backend.h ++export CONFIG KBUILD_EXTRA_SYMBOLS +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c new file mode 100755 -index 000000000000..fe9869109a82 +index 000000000..79a418c36 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_cache_policy_backend.h -@@ -0,0 +1,34 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c +@@ -0,0 +1,142 @@ +/* -+ * -+ * (C) COPYRIGHT 2015-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include "mali_broadcast.h" ++#include "mali_kernel_common.h" ++#include "mali_osk.h" + ++#define MALI_BROADCAST_REGISTER_SIZE 0x1000 ++#define MALI_BROADCAST_REG_BROADCAST_MASK 0x0 ++#define MALI_BROADCAST_REG_INTERRUPT_MASK 0x4 + ++struct mali_bcast_unit { ++ struct mali_hw_core hw_core; ++ u32 current_mask; ++}; + -+#ifndef _KBASE_CACHE_POLICY_BACKEND_H_ -+#define _KBASE_CACHE_POLICY_BACKEND_H_ -+ -+#include "mali_kbase.h" -+#include "mali_base_kernel.h" ++struct mali_bcast_unit *mali_bcast_unit_create(const _mali_osk_resource_t *resource) ++{ ++ struct mali_bcast_unit *bcast_unit = NULL; + -+/** -+ * kbase_cache_set_coherency_mode() - Sets the system coherency mode -+ * in the GPU. -+ * @kbdev: Device pointer -+ * @mode: Coherency mode. COHERENCY_ACE/ACE_LITE -+ */ -+void kbase_cache_set_coherency_mode(struct kbase_device *kbdev, -+ u32 mode); ++ MALI_DEBUG_ASSERT_POINTER(resource); ++ MALI_DEBUG_PRINT(2, ("Broadcast: Creating Mali Broadcast unit: %s\n", ++ resource->description)); + -+#endif /* _KBASE_CACHE_POLICY_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_debug_job_fault_backend.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_debug_job_fault_backend.c -new file mode 100755 -index 000000000000..7851ea6466c7 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_debug_job_fault_backend.c -@@ -0,0 +1,157 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ bcast_unit = _mali_osk_malloc(sizeof(struct mali_bcast_unit)); ++ if (NULL == bcast_unit) { ++ MALI_PRINT_ERROR(("Broadcast: Failed to allocate memory for Broadcast unit\n")); ++ return NULL; ++ } + ++ if (_MALI_OSK_ERR_OK == mali_hw_core_create(&bcast_unit->hw_core, ++ resource, MALI_BROADCAST_REGISTER_SIZE)) { ++ bcast_unit->current_mask = 0; ++ mali_bcast_reset(bcast_unit); + ++ return bcast_unit; ++ } else { ++ MALI_PRINT_ERROR(("Broadcast: Failed map broadcast unit\n")); ++ } + -+#include -+#include -+#include "mali_kbase_debug_job_fault.h" ++ _mali_osk_free(bcast_unit); + -+#ifdef CONFIG_DEBUG_FS ++ return NULL; ++} + -+/*GPU_CONTROL_REG(r)*/ -+static int gpu_control_reg_snapshot[] = { -+ GPU_ID, -+ SHADER_READY_LO, -+ SHADER_READY_HI, -+ TILER_READY_LO, -+ TILER_READY_HI, -+ L2_READY_LO, -+ L2_READY_HI -+}; ++void mali_bcast_unit_delete(struct mali_bcast_unit *bcast_unit) ++{ ++ MALI_DEBUG_ASSERT_POINTER(bcast_unit); ++ mali_hw_core_delete(&bcast_unit->hw_core); ++ _mali_osk_free(bcast_unit); ++} + -+/* JOB_CONTROL_REG(r) */ -+static int job_control_reg_snapshot[] = { -+ JOB_IRQ_MASK, -+ JOB_IRQ_STATUS -+}; ++/* Call this function to add the @group's id into bcast mask ++ * Note: redundant calling this function with same @group ++ * doesn't make any difference as calling it once ++ */ ++void mali_bcast_add_group(struct mali_bcast_unit *bcast_unit, ++ struct mali_group *group) ++{ ++ u32 bcast_id; ++ u32 broadcast_mask; + -+/* JOB_SLOT_REG(n,r) */ -+static int job_slot_reg_snapshot[] = { -+ JS_HEAD_LO, -+ JS_HEAD_HI, -+ JS_TAIL_LO, -+ JS_TAIL_HI, -+ JS_AFFINITY_LO, -+ JS_AFFINITY_HI, -+ JS_CONFIG, -+ JS_STATUS, -+ JS_HEAD_NEXT_LO, -+ JS_HEAD_NEXT_HI, -+ JS_AFFINITY_NEXT_LO, -+ JS_AFFINITY_NEXT_HI, -+ JS_CONFIG_NEXT -+}; ++ MALI_DEBUG_ASSERT_POINTER(bcast_unit); ++ MALI_DEBUG_ASSERT_POINTER(group); + -+/*MMU_REG(r)*/ -+static int mmu_reg_snapshot[] = { -+ MMU_IRQ_MASK, -+ MMU_IRQ_STATUS -+}; ++ bcast_id = mali_pp_core_get_bcast_id(mali_group_get_pp_core(group)); + -+/* MMU_AS_REG(n,r) */ -+static int as_reg_snapshot[] = { -+ AS_TRANSTAB_LO, -+ AS_TRANSTAB_HI, -+ AS_MEMATTR_LO, -+ AS_MEMATTR_HI, -+ AS_FAULTSTATUS, -+ AS_FAULTADDRESS_LO, -+ AS_FAULTADDRESS_HI, -+ AS_STATUS -+}; ++ broadcast_mask = bcast_unit->current_mask; + -+bool kbase_debug_job_fault_reg_snapshot_init(struct kbase_context *kctx, -+ int reg_range) -+{ -+ int i, j; -+ int offset = 0; -+ int slot_number; -+ int as_number; ++ broadcast_mask |= (bcast_id); /* add PP core to broadcast */ ++ broadcast_mask |= (bcast_id << 16); /* add MMU to broadcast */ + -+ if (kctx->reg_dump == NULL) -+ return false; ++ /* store mask so we can restore on reset */ ++ bcast_unit->current_mask = broadcast_mask; ++} + -+ slot_number = kctx->kbdev->gpu_props.num_job_slots; -+ as_number = kctx->kbdev->gpu_props.num_address_spaces; ++/* Call this function to remove @group's id from bcast mask ++ * Note: redundant calling this function with same @group ++ * doesn't make any difference as calling it once ++ */ ++void mali_bcast_remove_group(struct mali_bcast_unit *bcast_unit, ++ struct mali_group *group) ++{ ++ u32 bcast_id; ++ u32 broadcast_mask; + -+ /* get the GPU control registers*/ -+ for (i = 0; i < sizeof(gpu_control_reg_snapshot)/4; i++) { -+ kctx->reg_dump[offset] = -+ GPU_CONTROL_REG(gpu_control_reg_snapshot[i]); -+ offset += 2; -+ } ++ MALI_DEBUG_ASSERT_POINTER(bcast_unit); ++ MALI_DEBUG_ASSERT_POINTER(group); + -+ /* get the Job control registers*/ -+ for (i = 0; i < sizeof(job_control_reg_snapshot)/4; i++) { -+ kctx->reg_dump[offset] = -+ JOB_CONTROL_REG(job_control_reg_snapshot[i]); -+ offset += 2; -+ } ++ bcast_id = mali_pp_core_get_bcast_id(mali_group_get_pp_core(group)); + -+ /* get the Job Slot registers*/ -+ for (j = 0; j < slot_number; j++) { -+ for (i = 0; i < sizeof(job_slot_reg_snapshot)/4; i++) { -+ kctx->reg_dump[offset] = -+ JOB_SLOT_REG(j, job_slot_reg_snapshot[i]); -+ offset += 2; -+ } -+ } ++ broadcast_mask = bcast_unit->current_mask; + -+ /* get the MMU registers*/ -+ for (i = 0; i < sizeof(mmu_reg_snapshot)/4; i++) { -+ kctx->reg_dump[offset] = MMU_REG(mmu_reg_snapshot[i]); -+ offset += 2; -+ } ++ broadcast_mask &= ~((bcast_id << 16) | bcast_id); + -+ /* get the Address space registers*/ -+ for (j = 0; j < as_number; j++) { -+ for (i = 0; i < sizeof(as_reg_snapshot)/4; i++) { -+ kctx->reg_dump[offset] = -+ MMU_AS_REG(j, as_reg_snapshot[i]); -+ offset += 2; -+ } -+ } ++ /* store mask so we can restore on reset */ ++ bcast_unit->current_mask = broadcast_mask; ++} + -+ WARN_ON(offset >= (reg_range*2/4)); ++void mali_bcast_reset(struct mali_bcast_unit *bcast_unit) ++{ ++ MALI_DEBUG_ASSERT_POINTER(bcast_unit); + -+ /* set the termination flag*/ -+ kctx->reg_dump[offset] = REGISTER_DUMP_TERMINATION_FLAG; -+ kctx->reg_dump[offset + 1] = REGISTER_DUMP_TERMINATION_FLAG; ++ MALI_DEBUG_PRINT(4, ++ ("Broadcast: setting mask 0x%08X + 0x%08X (reset)\n", ++ bcast_unit->current_mask, ++ bcast_unit->current_mask & 0xFF)); + -+ dev_dbg(kctx->kbdev->dev, "kbase_job_fault_reg_snapshot_init:%d\n", -+ offset); ++ /* set broadcast mask */ ++ mali_hw_core_register_write(&bcast_unit->hw_core, ++ MALI_BROADCAST_REG_BROADCAST_MASK, ++ bcast_unit->current_mask); + -+ return true; ++ /* set IRQ override mask */ ++ mali_hw_core_register_write(&bcast_unit->hw_core, ++ MALI_BROADCAST_REG_INTERRUPT_MASK, ++ bcast_unit->current_mask & 0xFF); +} + -+bool kbase_job_fault_get_reg_snapshot(struct kbase_context *kctx) ++void mali_bcast_disable(struct mali_bcast_unit *bcast_unit) +{ -+ int offset = 0; -+ -+ if (kctx->reg_dump == NULL) -+ return false; ++ MALI_DEBUG_ASSERT_POINTER(bcast_unit); + -+ while (kctx->reg_dump[offset] != REGISTER_DUMP_TERMINATION_FLAG) { -+ kctx->reg_dump[offset+1] = -+ kbase_reg_read(kctx->kbdev, -+ kctx->reg_dump[offset], NULL); -+ offset += 2; -+ } -+ return true; -+} ++ MALI_DEBUG_PRINT(4, ("Broadcast: setting mask 0x0 + 0x0 (disable)\n")); + ++ /* set broadcast mask */ ++ mali_hw_core_register_write(&bcast_unit->hw_core, ++ MALI_BROADCAST_REG_BROADCAST_MASK, ++ 0x0); + -+#endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_devfreq.c ++ /* set IRQ override mask */ ++ mali_hw_core_register_write(&bcast_unit->hw_core, ++ MALI_BROADCAST_REG_INTERRUPT_MASK, ++ 0x0); ++} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h new file mode 100755 -index 000000000000..003af36d8fe2 +index 000000000..0475b7171 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_devfreq.c -@@ -0,0 +1,495 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h +@@ -0,0 +1,57 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_BROADCAST_H__ ++#define __MALI_BROADCAST_H__ + ++/* ++ * Interface for the broadcast unit on Mali-450. ++ * ++ * - Represents up to 8 × (MMU + PP) pairs. ++ * - Supports dynamically changing which (MMU + PP) pairs receive the broadcast by ++ * setting a mask. ++ */ + -+#include -+#include -+#include -+#include ++#include "mali_hw_core.h" ++#include "mali_group.h" + -+#include -+#include -+#include -+#ifdef CONFIG_DEVFREQ_THERMAL -+#include -+#endif ++struct mali_bcast_unit; + -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) -+#include -+#else /* Linux >= 3.13 */ -+/* In 3.13 the OPP include header file, types, and functions were all -+ * renamed. Use the old filename for the include, and define the new names to -+ * the old, when an old kernel is detected. -+ */ -+#include -+#define dev_pm_opp opp -+#define dev_pm_opp_get_voltage opp_get_voltage -+#define dev_pm_opp_get_opp_count opp_get_opp_count -+#define dev_pm_opp_find_freq_ceil opp_find_freq_ceil -+#define dev_pm_opp_find_freq_floor opp_find_freq_floor -+#endif /* Linux >= 3.13 */ ++struct mali_bcast_unit *mali_bcast_unit_create(const _mali_osk_resource_t *resource); ++void mali_bcast_unit_delete(struct mali_bcast_unit *bcast_unit); + -+#include -+#include -+#include ++/* Add a group to the list of (MMU + PP) pairs broadcasts go out to. */ ++void mali_bcast_add_group(struct mali_bcast_unit *bcast_unit, struct mali_group *group); + -+static struct devfreq_simple_ondemand_data ondemand_data; ++/* Remove a group to the list of (MMU + PP) pairs broadcasts go out to. */ ++void mali_bcast_remove_group(struct mali_bcast_unit *bcast_unit, struct mali_group *group); + -+static struct monitor_dev_profile mali_mdevp = { -+ .type = MONITOR_TPYE_DEV, -+ .low_temp_adjust = rockchip_monitor_dev_low_temp_adjust, -+ .high_temp_adjust = rockchip_monitor_dev_high_temp_adjust, -+}; ++/* Re-set cached mask. This needs to be called after having been suspended. */ ++void mali_bcast_reset(struct mali_bcast_unit *bcast_unit); + +/** -+ * opp_translate - Translate nominal OPP frequency from devicetree into real -+ * frequency and core mask -+ * @kbdev: Device pointer -+ * @freq: Nominal frequency -+ * @core_mask: Pointer to u64 to store core mask to ++ * Disable broadcast unit + * -+ * Return: Real target frequency ++ * mali_bcast_enable must be called to re-enable the unit. Cores may not be ++ * added or removed when the unit is disabled. ++ */ ++void mali_bcast_disable(struct mali_bcast_unit *bcast_unit); ++ ++/** ++ * Re-enable broadcast unit + * -+ * This function will only perform translation if an operating-points-v2-mali -+ * table is present in devicetree. If one is not present then it will return an -+ * untranslated frequency and all cores enabled. ++ * This resets the masks to include the cores present when mali_bcast_disable was called. + */ -+static unsigned long opp_translate(struct kbase_device *kbdev, -+ unsigned long freq, u64 *core_mask) ++MALI_STATIC_INLINE void mali_bcast_enable(struct mali_bcast_unit *bcast_unit) +{ -+ int i; ++ mali_bcast_reset(bcast_unit); ++} + -+ for (i = 0; i < kbdev->num_opps; i++) { -+ if (kbdev->opp_table[i].opp_freq == freq) { -+ *core_mask = kbdev->opp_table[i].core_mask; -+ return kbdev->opp_table[i].real_freq; -+ } -+ } ++#endif /* __MALI_BROADCAST_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c +new file mode 100755 +index 000000000..5bed27a8c +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c +@@ -0,0 +1,139 @@ ++/* ++ * Copyright (C) 2010-2012, 2014-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ /* Failed to find OPP - return all cores enabled & nominal frequency */ -+ *core_mask = kbdev->gpu_props.props.raw_props.shader_present; ++#include "mali_kernel_utilization.h" ++#include "mali_osk.h" ++#include "mali_osk_mali.h" ++#include "mali_kernel_common.h" ++#include "mali_session.h" ++#include "mali_dvfs_policy.h" ++#include "mali_control_timer.h" + -+ return freq; ++static u64 period_start_time = 0; ++ ++/** .KP : mali_control_timer */ ++static _mali_osk_timer_t *mali_control_timer = NULL; ++static mali_bool timer_running = MALI_FALSE; ++ ++/** ++ * period_of_notifying_mali_utilization_to_platform_dependent_part, ++ * ms 为å•ä½. ++ */ ++static u32 mali_control_timeout = 20; ++ ++void mali_control_timer_add(u32 timeout)/* 'timeout' : 以 ms 为å•ä½. */ ++{ ++ _mali_osk_timer_add(mali_control_timer, _mali_osk_time_mstoticks(timeout)); +} + -+static int -+kbase_devfreq_target(struct device *dev, unsigned long *target_freq, u32 flags) ++void mali_control_timer_mod(u32 timeout_in_ms) +{ -+ struct kbase_device *kbdev = dev_get_drvdata(dev); -+ struct dev_pm_opp *opp; -+ unsigned long nominal_freq; -+ unsigned long freq = 0; -+ unsigned long voltage; -+ int err; -+ u64 core_mask; ++ _mali_osk_timer_mod(mali_control_timer, _mali_osk_time_mstoticks(timeout_in_ms)); ++} + -+ freq = *target_freq; ++static void mali_control_timer_callback(void *arg) ++{ ++ if (mali_utilization_enabled()) { ++ struct mali_gpu_utilization_data *util_data = NULL; ++ u64 time_period = 0; ++ mali_bool need_add_timer = MALI_TRUE; + -+ opp = devfreq_recommended_opp(dev, &freq, flags); -+ if (IS_ERR(opp)) { -+ dev_err(dev, "Failed to get opp (%ld)\n", PTR_ERR(opp)); -+ return PTR_ERR(opp); -+ } -+ voltage = dev_pm_opp_get_voltage(opp); -+ dev_pm_opp_put(opp); ++ /* Calculate gpu utilization */ ++ util_data = mali_utilization_calculate(&period_start_time, &time_period, &need_add_timer); + -+ nominal_freq = freq; -+ /* -+ * Only update if there is a change of frequency -+ */ -+ if (kbdev->current_nominal_freq == nominal_freq) { -+ *target_freq = nominal_freq; -+#ifdef CONFIG_REGULATOR -+ if (kbdev->current_voltage == voltage) -+ return 0; -+ err = regulator_set_voltage(kbdev->regulator, voltage, INT_MAX); -+ if (err) { -+ dev_err(dev, "Failed to set voltage (%d)\n", err); -+ return err; -+ } -+ kbdev->current_voltage = voltage; ++ if (util_data) { ++#if defined(CONFIG_MALI_DVFS) ++ mali_dvfs_policy_realize(util_data, time_period); ++#else ++ mali_utilization_platform_realize(util_data); +#endif -+ return 0; -+ } + -+ freq = opp_translate(kbdev, nominal_freq, &core_mask); -+#ifdef CONFIG_REGULATOR -+ if (kbdev->regulator && kbdev->current_voltage != voltage -+ && kbdev->current_freq < freq) { -+ err = regulator_set_voltage(kbdev->regulator, voltage, INT_MAX); -+ if (err) { -+ dev_err(dev, "Failed to increase voltage (%d)\n", err); -+ return err; ++ if (MALI_TRUE == timer_running) ++ if (MALI_TRUE == need_add_timer) { ++ mali_control_timer_mod(mali_control_timeout); ++ } + } + } -+#endif ++} + -+ err = clk_set_rate(kbdev->clock, freq); -+ if (err) { -+ dev_err(dev, "Failed to set clock %lu (target %lu)\n", -+ freq, *target_freq); -+ return err; -+ } ++/* Init a timer (for now it is used for GPU utilization and dvfs) */ ++_mali_osk_errcode_t mali_control_timer_init(void) ++{ ++ _mali_osk_device_data data; + -+#ifdef CONFIG_REGULATOR -+ if (kbdev->regulator && kbdev->current_voltage != voltage -+ && kbdev->current_freq > freq) { -+ err = regulator_set_voltage(kbdev->regulator, voltage, INT_MAX); -+ if (err) { -+ dev_err(dev, "Failed to decrease voltage (%d)\n", err); -+ return err; ++ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { ++ /* Use device specific settings (if defined) */ ++ if (0 != data.control_interval) { ++ mali_control_timeout = data.control_interval; ++ MALI_DEBUG_PRINT(2, ("Mali GPU Timer: %u\n", mali_control_timeout)); + } + } -+#endif -+ -+ if (kbdev->pm.backend.ca_current_policy->id == -+ KBASE_PM_CA_POLICY_ID_DEVFREQ) -+ kbase_devfreq_set_core_mask(kbdev, core_mask); -+ -+ *target_freq = nominal_freq; -+ kbdev->current_voltage = voltage; -+ kbdev->current_nominal_freq = nominal_freq; -+ kbdev->current_freq = freq; -+ kbdev->current_core_mask = core_mask; -+ if (kbdev->devfreq) -+ kbdev->devfreq->last_status.current_frequency = nominal_freq; + -+ KBASE_TLSTREAM_AUX_DEVFREQ_TARGET((u64)nominal_freq); -+ -+ kbase_pm_reset_dvfs_utilisation(kbdev); ++ mali_control_timer = _mali_osk_timer_init(mali_control_timer_callback); ++ if (NULL == mali_control_timer) { ++ return _MALI_OSK_ERR_FAULT; ++ } ++ _mali_osk_timer_setcallback(mali_control_timer, mali_control_timer_callback, NULL); + -+ return err; ++ return _MALI_OSK_ERR_OK; +} + -+static int -+kbase_devfreq_cur_freq(struct device *dev, unsigned long *freq) ++void mali_control_timer_term(void) +{ -+ struct kbase_device *kbdev = dev_get_drvdata(dev); -+ -+ *freq = kbdev->current_nominal_freq; -+ -+ return 0; ++ if (NULL != mali_control_timer) { ++ _mali_osk_timer_del(mali_control_timer); ++ timer_running = MALI_FALSE; ++ _mali_osk_timer_term(mali_control_timer); ++ mali_control_timer = NULL; ++ } +} + -+static int -+kbase_devfreq_status(struct device *dev, struct devfreq_dev_status *stat) ++mali_bool mali_control_timer_resume(u64 time_now) +{ -+ struct kbase_device *kbdev = dev_get_drvdata(dev); -+ -+ kbase_pm_get_dvfs_utilisation(kbdev, -+ &stat->total_time, &stat->busy_time); ++ mali_utilization_data_assert_locked(); + -+ stat->private_data = NULL; ++ if (timer_running != MALI_TRUE) { ++ timer_running = MALI_TRUE; + -+ return 0; -+} ++ period_start_time = time_now; + -+static int kbase_devfreq_init_freq_table(struct kbase_device *kbdev, -+ struct devfreq_dev_profile *dp) -+{ -+ int count; -+ int i = 0; -+ unsigned long freq; -+ struct dev_pm_opp *opp; ++ mali_utilization_reset(); + -+ count = dev_pm_opp_get_opp_count(kbdev->dev); -+ if (count < 0) { -+ return count; ++ return MALI_TRUE; + } + -+ dp->freq_table = kmalloc_array(count, sizeof(dp->freq_table[0]), -+ GFP_KERNEL); -+ if (!dp->freq_table) -+ return -ENOMEM; -+ -+ for (i = 0, freq = ULONG_MAX; i < count; i++, freq--) { -+ opp = dev_pm_opp_find_freq_floor(kbdev->dev, &freq); -+ if (IS_ERR(opp)) -+ break; -+ dev_pm_opp_put(opp); ++ return MALI_FALSE; ++} + -+ dp->freq_table[i] = freq; ++void mali_control_timer_pause(void) ++{ ++ mali_utilization_data_assert_locked(); ++ if (timer_running == MALI_TRUE) { ++ timer_running = MALI_FALSE; + } ++} + -+ if (count != i) -+ dev_warn(kbdev->dev, "Unable to enumerate all OPPs (%d!=%d\n", -+ count, i); ++void mali_control_timer_suspend(mali_bool suspend) ++{ ++ mali_utilization_data_lock(); + -+ dp->max_state = i; ++ if (timer_running == MALI_TRUE) { ++ timer_running = MALI_FALSE; + -+ return 0; ++ mali_utilization_data_unlock(); ++ ++ if (suspend == MALI_TRUE) { ++ _mali_osk_timer_del(mali_control_timer); ++ mali_utilization_reset(); ++ } ++ } else { ++ mali_utilization_data_unlock(); ++ } +} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h +new file mode 100755 +index 000000000..c9e6e058e +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h +@@ -0,0 +1,30 @@ ++/* ++ * Copyright (C) 2010-2012, 2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+static void kbase_devfreq_term_freq_table(struct kbase_device *kbdev) -+{ -+ struct devfreq_dev_profile *dp = kbdev->devfreq->profile; ++#ifndef __MALI_CONTROL_TIMER_H__ ++#define __MALI_CONTROL_TIMER_H__ + -+ kfree(dp->freq_table); -+} ++#include "mali_osk.h" + -+static void kbase_devfreq_exit(struct device *dev) -+{ -+ struct kbase_device *kbdev = dev_get_drvdata(dev); ++_mali_osk_errcode_t mali_control_timer_init(void); + -+ kbase_devfreq_term_freq_table(kbdev); -+} ++void mali_control_timer_term(void); + -+static int kbase_devfreq_init_core_mask_table(struct kbase_device *kbdev) -+{ -+ struct device_node *opp_node = of_parse_phandle(kbdev->dev->of_node, -+ "operating-points-v2", 0); -+ struct device_node *node; -+ int i = 0; -+ int count; ++mali_bool mali_control_timer_resume(u64 time_now); + -+ if (!opp_node) -+ return 0; -+ if (!of_device_is_compatible(opp_node, "operating-points-v2-mali")) -+ return 0; ++void mali_control_timer_suspend(mali_bool suspend); ++void mali_control_timer_pause(void); + -+ count = dev_pm_opp_get_opp_count(kbdev->dev); -+ kbdev->opp_table = kmalloc_array(count, -+ sizeof(struct kbase_devfreq_opp), GFP_KERNEL); -+ if (!kbdev->opp_table) -+ return -ENOMEM; ++void mali_control_timer_add(u32 timeout); + -+ for_each_available_child_of_node(opp_node, node) { -+ u64 core_mask; -+ u64 opp_freq, real_freq; -+ const void *core_count_p; ++void mali_control_timer_mod(u32 timeout_in_ms); + -+ if (of_property_read_u64(node, "opp-hz", &opp_freq)) { -+ dev_warn(kbdev->dev, "OPP is missing required opp-hz property\n"); -+ continue; -+ } -+ if (of_property_read_u64(node, "opp-hz-real", &real_freq)) -+ real_freq = opp_freq; -+ if (of_property_read_u64(node, "opp-core-mask", &core_mask)) -+ core_mask = -+ kbdev->gpu_props.props.raw_props.shader_present; -+ core_count_p = of_get_property(node, "opp-core-count", NULL); -+ if (core_count_p) { -+ u64 remaining_core_mask = -+ kbdev->gpu_props.props.raw_props.shader_present; -+ int core_count = be32_to_cpup(core_count_p); ++#endif /* __MALI_CONTROL_TIMER_H__ */ + -+ core_mask = 0; +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c +new file mode 100755 +index 000000000..99b7f3607 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c +@@ -0,0 +1,213 @@ ++/* ++ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ for (; core_count > 0; core_count--) { -+ int core = ffs(remaining_core_mask); ++#include "mali_dlbu.h" ++#include "mali_memory.h" ++#include "mali_pp.h" ++#include "mali_group.h" ++#include "mali_osk.h" ++#include "mali_hw_core.h" + -+ if (!core) { -+ dev_err(kbdev->dev, "OPP has more cores than GPU\n"); -+ return -ENODEV; -+ } ++/** ++ * Size of DLBU registers in bytes ++ */ ++#define MALI_DLBU_SIZE 0x400 + -+ core_mask |= (1ull << (core-1)); -+ remaining_core_mask &= ~(1ull << (core-1)); -+ } -+ } ++mali_dma_addr mali_dlbu_phys_addr = 0; ++static mali_io_address mali_dlbu_cpu_addr = NULL; + -+ if (!core_mask) { -+ dev_err(kbdev->dev, "OPP has invalid core mask of 0\n"); -+ return -ENODEV; -+ } ++/** ++ * DLBU register numbers ++ * Used in the register read/write routines. ++ * See the hardware documentation for more information about each register ++ */ ++typedef enum mali_dlbu_register { ++ MALI_DLBU_REGISTER_MASTER_TLLIST_PHYS_ADDR = 0x0000, /**< Master tile list physical base address; ++ 31:12 Physical address to the page used for the DLBU ++ 0 DLBU enable - set this bit to 1 enables the AXI bus ++ between PPs and L2s, setting to 0 disables the router and ++ no further transactions are sent to DLBU */ ++ MALI_DLBU_REGISTER_MASTER_TLLIST_VADDR = 0x0004, /**< Master tile list virtual base address; ++ 31:12 Virtual address to the page used for the DLBU */ ++ MALI_DLBU_REGISTER_TLLIST_VBASEADDR = 0x0008, /**< Tile list virtual base address; ++ 31:12 Virtual address to the tile list. This address is used when ++ calculating the call address sent to PP.*/ ++ MALI_DLBU_REGISTER_FB_DIM = 0x000C, /**< Framebuffer dimension; ++ 23:16 Number of tiles in Y direction-1 ++ 7:0 Number of tiles in X direction-1 */ ++ MALI_DLBU_REGISTER_TLLIST_CONF = 0x0010, /**< Tile list configuration; ++ 29:28 select the size of each allocated block: 0=128 bytes, 1=256, 2=512, 3=1024 ++ 21:16 2^n number of tiles to be binned to one tile list in Y direction ++ 5:0 2^n number of tiles to be binned to one tile list in X direction */ ++ MALI_DLBU_REGISTER_START_TILE_POS = 0x0014, /**< Start tile positions; ++ 31:24 start position in Y direction for group 1 ++ 23:16 start position in X direction for group 1 ++ 15:8 start position in Y direction for group 0 ++ 7:0 start position in X direction for group 0 */ ++ MALI_DLBU_REGISTER_PP_ENABLE_MASK = 0x0018, /**< PP enable mask; ++ 7 enable PP7 for load balancing ++ 6 enable PP6 for load balancing ++ 5 enable PP5 for load balancing ++ 4 enable PP4 for load balancing ++ 3 enable PP3 for load balancing ++ 2 enable PP2 for load balancing ++ 1 enable PP1 for load balancing ++ 0 enable PP0 for load balancing */ ++} mali_dlbu_register; + -+ kbdev->opp_table[i].opp_freq = opp_freq; -+ kbdev->opp_table[i].real_freq = real_freq; -+ kbdev->opp_table[i].core_mask = core_mask; ++typedef enum { ++ PP0ENABLE = 0, ++ PP1ENABLE, ++ PP2ENABLE, ++ PP3ENABLE, ++ PP4ENABLE, ++ PP5ENABLE, ++ PP6ENABLE, ++ PP7ENABLE ++} mali_dlbu_pp_enable; + -+ dev_info(kbdev->dev, "OPP %d : opp_freq=%llu real_freq=%llu core_mask=%llx\n", -+ i, opp_freq, real_freq, core_mask); ++struct mali_dlbu_core { ++ struct mali_hw_core hw_core; /**< Common for all HW cores */ ++ u32 pp_cores_mask; /**< This is a mask for the PP cores whose operation will be controlled by LBU ++ see MALI_DLBU_REGISTER_PP_ENABLE_MASK register */ ++}; + -+ i++; -+ } ++_mali_osk_errcode_t mali_dlbu_initialize(void) ++{ ++ MALI_DEBUG_PRINT(2, ("Mali DLBU: Initializing\n")); + -+ kbdev->num_opps = i; ++ if (_MALI_OSK_ERR_OK == ++ mali_mmu_get_table_page(&mali_dlbu_phys_addr, ++ &mali_dlbu_cpu_addr)) { ++ return _MALI_OSK_ERR_OK; ++ } + -+ return 0; ++ return _MALI_OSK_ERR_FAULT; +} + -+static unsigned long kbase_devfreq_get_static_power(struct devfreq *devfreq, -+ unsigned long voltage) ++void mali_dlbu_terminate(void) +{ -+ struct device *dev = devfreq->dev.parent; -+ struct kbase_device *kbdev = dev_get_drvdata(dev); ++ MALI_DEBUG_PRINT(3, ("Mali DLBU: terminating\n")); + -+ return rockchip_ipa_get_static_power(kbdev->model_data, voltage); ++ if (0 != mali_dlbu_phys_addr && 0 != mali_dlbu_cpu_addr) { ++ mali_mmu_release_table_page(mali_dlbu_phys_addr, ++ mali_dlbu_cpu_addr); ++ mali_dlbu_phys_addr = 0; ++ mali_dlbu_cpu_addr = 0; ++ } +} + -+static struct devfreq_cooling_power kbase_cooling_power = { -+ .get_static_power = &kbase_devfreq_get_static_power, -+}; -+ -+int kbase_devfreq_init(struct kbase_device *kbdev) ++struct mali_dlbu_core *mali_dlbu_create(const _mali_osk_resource_t *resource) +{ -+ struct device_node *np = kbdev->dev->of_node; -+ struct devfreq_dev_profile *dp; -+ struct dev_pm_opp *opp; -+ unsigned long opp_rate; -+ int err; ++ struct mali_dlbu_core *core = NULL; + -+ if (!kbdev->clock) { -+ dev_err(kbdev->dev, "Clock not available for devfreq\n"); -+ return -ENODEV; ++ MALI_DEBUG_PRINT(2, ("Mali DLBU: Creating Mali dynamic load balancing unit: %s\n", resource->description)); ++ ++ core = _mali_osk_malloc(sizeof(struct mali_dlbu_core)); ++ if (NULL != core) { ++ if (_MALI_OSK_ERR_OK == mali_hw_core_create(&core->hw_core, resource, MALI_DLBU_SIZE)) { ++ core->pp_cores_mask = 0; ++ if (_MALI_OSK_ERR_OK == mali_dlbu_reset(core)) { ++ return core; ++ } ++ MALI_PRINT_ERROR(("Failed to reset DLBU %s\n", core->hw_core.description)); ++ mali_hw_core_delete(&core->hw_core); ++ } ++ ++ _mali_osk_free(core); ++ } else { ++ MALI_PRINT_ERROR(("Mali DLBU: Failed to allocate memory for DLBU core\n")); + } + -+ kbdev->current_freq = clk_get_rate(kbdev->clock); -+ kbdev->current_nominal_freq = kbdev->current_freq; ++ return NULL; ++} + -+ dp = &kbdev->devfreq_profile; ++void mali_dlbu_delete(struct mali_dlbu_core *dlbu) ++{ ++ MALI_DEBUG_ASSERT_POINTER(dlbu); ++ mali_hw_core_delete(&dlbu->hw_core); ++ _mali_osk_free(dlbu); ++} + -+ dp->initial_freq = kbdev->current_freq; -+ dp->polling_ms = 100; -+ dp->target = kbase_devfreq_target; -+ dp->get_dev_status = kbase_devfreq_status; -+ dp->get_cur_freq = kbase_devfreq_cur_freq; -+ dp->exit = kbase_devfreq_exit; ++_mali_osk_errcode_t mali_dlbu_reset(struct mali_dlbu_core *dlbu) ++{ ++ u32 dlbu_registers[7]; ++ _mali_osk_errcode_t err = _MALI_OSK_ERR_FAULT; ++ MALI_DEBUG_ASSERT_POINTER(dlbu); + -+ if (kbase_devfreq_init_freq_table(kbdev, dp)) -+ return -EFAULT; ++ MALI_DEBUG_PRINT(4, ("Mali DLBU: mali_dlbu_reset: %s\n", dlbu->hw_core.description)); + -+ err = kbase_devfreq_init_core_mask_table(kbdev); -+ if (err) -+ return err; -+ of_property_read_u32(np, "upthreshold", -+ &ondemand_data.upthreshold); -+ of_property_read_u32(np, "downdifferential", -+ &ondemand_data.downdifferential); -+ kbdev->devfreq = devfreq_add_device(kbdev->dev, dp, -+ "simple_ondemand", &ondemand_data); -+ if (IS_ERR(kbdev->devfreq)) { -+ kbase_devfreq_term_freq_table(kbdev); -+ return PTR_ERR(kbdev->devfreq); -+ } ++ dlbu_registers[0] = mali_dlbu_phys_addr | 1; /* bit 0 enables the whole core */ ++ dlbu_registers[1] = MALI_DLBU_VIRT_ADDR; ++ dlbu_registers[2] = 0; ++ dlbu_registers[3] = 0; ++ dlbu_registers[4] = 0; ++ dlbu_registers[5] = 0; ++ dlbu_registers[6] = dlbu->pp_cores_mask; + -+ /* devfreq_add_device only copies a few of kbdev->dev's fields, so -+ * set drvdata explicitly so IPA models can access kbdev. */ -+ dev_set_drvdata(&kbdev->devfreq->dev, kbdev); ++ /* write reset values to core registers */ ++ mali_hw_core_register_write_array_relaxed(&dlbu->hw_core, MALI_DLBU_REGISTER_MASTER_TLLIST_PHYS_ADDR, dlbu_registers, 7); + -+ err = devfreq_register_opp_notifier(kbdev->dev, kbdev->devfreq); -+ if (err) { -+ dev_err(kbdev->dev, -+ "Failed to register OPP notifier (%d)\n", err); -+ goto opp_notifier_failed; -+ } ++ err = _MALI_OSK_ERR_OK; + -+ opp_rate = kbdev->current_freq; -+ opp = devfreq_recommended_opp(kbdev->dev, &opp_rate, 0); -+ if (!IS_ERR(opp)) -+ dev_pm_opp_put(opp); -+ kbdev->devfreq->last_status.current_frequency = opp_rate; ++ return err; ++} + -+ mali_mdevp.data = kbdev->devfreq; -+ kbdev->mdev_info = rockchip_system_monitor_register(kbdev->dev, -+ &mali_mdevp); -+ if (IS_ERR(kbdev->mdev_info)) { -+ dev_dbg(kbdev->dev, "without system monitor\n"); -+ kbdev->mdev_info = NULL; -+ } -+#ifdef CONFIG_DEVFREQ_THERMAL -+ if (of_find_compatible_node(kbdev->dev->of_node, NULL, -+ "simple-power-model")) { -+ of_property_read_u32(kbdev->dev->of_node, -+ "dynamic-power-coefficient", -+ (u32 *)&kbase_dcp->dyn_power_coeff); -+ kbdev->model_data = rockchip_ipa_power_model_init(kbdev->dev, -+ "gpu_leakage"); -+ if (IS_ERR_OR_NULL(kbdev->model_data)) { -+ kbdev->model_data = NULL; -+ dev_err(kbdev->dev, "failed to initialize power model\n"); -+ } else if (kbdev->model_data->dynamic_coefficient) { -+ kbase_dcp->dyn_power_coeff = -+ kbdev->model_data->dynamic_coefficient; -+ } -+ if (!kbase_dcp->dyn_power_coeff) { -+ dev_err(kbdev->dev, "failed to get dynamic-coefficient\n"); -+ err = -EINVAL; -+ goto cooling_failed; -+ } ++void mali_dlbu_update_mask(struct mali_dlbu_core *dlbu) ++{ ++ MALI_DEBUG_ASSERT_POINTER(dlbu); + -+ kbdev->devfreq_cooling = -+ of_devfreq_cooling_register_power(kbdev->dev->of_node, -+ kbdev->devfreq, -+ kbase_dcp); -+ if (IS_ERR(kbdev->devfreq_cooling)) { -+ dev_err(kbdev->dev, "failed to register cooling device\n"); -+ err = PTR_ERR(kbdev->devfreq_cooling); -+ goto cooling_failed; -+ } -+ } else { -+ err = kbase_ipa_init(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "IPA initialization failed\n"); -+ goto cooling_failed; -+ } ++ mali_hw_core_register_write(&dlbu->hw_core, MALI_DLBU_REGISTER_PP_ENABLE_MASK, dlbu->pp_cores_mask); ++} + -+ kbdev->devfreq_cooling = of_devfreq_cooling_register_power( -+ kbdev->dev->of_node, -+ kbdev->devfreq, -+ &kbase_ipa_power_model_ops); -+ if (IS_ERR(kbdev->devfreq_cooling)) { -+ err = PTR_ERR(kbdev->devfreq_cooling); -+ dev_err(kbdev->dev, -+ "Failed to register cooling device (%d)\n", -+ err); -+ goto cooling_failed; -+ } -+ } -+#endif ++void mali_dlbu_add_group(struct mali_dlbu_core *dlbu, struct mali_group *group) ++{ ++ struct mali_pp_core *pp_core; ++ u32 bcast_id; + -+ return 0; ++ MALI_DEBUG_ASSERT_POINTER(dlbu); ++ MALI_DEBUG_ASSERT_POINTER(group); + -+#ifdef CONFIG_DEVFREQ_THERMAL -+cooling_failed: -+ devfreq_unregister_opp_notifier(kbdev->dev, kbdev->devfreq); -+#endif /* CONFIG_DEVFREQ_THERMAL */ -+opp_notifier_failed: -+ if (devfreq_remove_device(kbdev->devfreq)) -+ dev_err(kbdev->dev, "Failed to terminate devfreq (%d)\n", err); -+ else -+ kbdev->devfreq = NULL; ++ pp_core = mali_group_get_pp_core(group); ++ bcast_id = mali_pp_core_get_bcast_id(pp_core); + -+ return err; ++ dlbu->pp_cores_mask |= bcast_id; ++ MALI_DEBUG_PRINT(3, ("Mali DLBU: Adding core[%d] New mask= 0x%02x\n", bcast_id , dlbu->pp_cores_mask)); +} + -+void kbase_devfreq_term(struct kbase_device *kbdev) ++/* Remove a group from the DLBU */ ++void mali_dlbu_remove_group(struct mali_dlbu_core *dlbu, struct mali_group *group) +{ -+ int err; ++ struct mali_pp_core *pp_core; ++ u32 bcast_id; + -+ dev_dbg(kbdev->dev, "Term Mali devfreq\n"); ++ MALI_DEBUG_ASSERT_POINTER(dlbu); ++ MALI_DEBUG_ASSERT_POINTER(group); + -+ rockchip_system_monitor_unregister(kbdev->mdev_info); -+#ifdef CONFIG_DEVFREQ_THERMAL -+ if (kbdev->devfreq_cooling) -+ devfreq_cooling_unregister(kbdev->devfreq_cooling); ++ pp_core = mali_group_get_pp_core(group); ++ bcast_id = mali_pp_core_get_bcast_id(pp_core); + -+ if (!kbdev->model_data) -+ kbase_ipa_term(kbdev); -+ kfree(kbdev->model_data); -+#endif ++ dlbu->pp_cores_mask &= ~bcast_id; ++ MALI_DEBUG_PRINT(3, ("Mali DLBU: Removing core[%d] New mask= 0x%02x\n", bcast_id, dlbu->pp_cores_mask)); ++} + -+ devfreq_unregister_opp_notifier(kbdev->dev, kbdev->devfreq); ++/* Configure the DLBU for \a job. This needs to be done before the job is started on the groups in the DLBU. */ ++void mali_dlbu_config_job(struct mali_dlbu_core *dlbu, struct mali_pp_job *job) ++{ ++ u32 *registers; ++ MALI_DEBUG_ASSERT(job); ++ registers = mali_pp_job_get_dlbu_registers(job); ++ MALI_DEBUG_PRINT(4, ("Mali DLBU: Starting job\n")); + -+ err = devfreq_remove_device(kbdev->devfreq); -+ if (err) -+ dev_err(kbdev->dev, "Failed to terminate devfreq (%d)\n", err); -+ else -+ kbdev->devfreq = NULL; ++ /* Writing 4 registers: ++ * DLBU registers except the first two (written once at DLBU initialisation / reset) and the PP_ENABLE_MASK register */ ++ mali_hw_core_register_write_array_relaxed(&dlbu->hw_core, MALI_DLBU_REGISTER_TLLIST_VBASEADDR, registers, 4); + -+ kfree(kbdev->opp_table); +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_devfreq.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_devfreq.h +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h new file mode 100755 -index 000000000000..7bcc350f3006 +index 000000000..a7ecf4147 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_devfreq.h -@@ -0,0 +1,25 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h +@@ -0,0 +1,45 @@ +/* -+ * -+ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_DLBU_H__ ++#define __MALI_DLBU_H__ + ++#define MALI_DLBU_VIRT_ADDR 0xFFF00000 /* master tile virtual address fixed at this value and mapped into every session */ + -+#ifndef _BASE_DEVFREQ_H_ -+#define _BASE_DEVFREQ_H_ ++#include "mali_osk.h" + -+int kbase_devfreq_init(struct kbase_device *kbdev); -+void kbase_devfreq_term(struct kbase_device *kbdev); -+int kbase_platform_rk_init_opp_table(struct kbase_device *kbdev); ++struct mali_pp_job; ++struct mali_group; ++struct mali_dlbu_core; + -+#endif /* _BASE_DEVFREQ_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_device_hw.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_device_hw.c -new file mode 100755 -index 000000000000..17f253308ffc ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_device_hw.c -@@ -0,0 +1,255 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++extern mali_dma_addr mali_dlbu_phys_addr; ++ ++_mali_osk_errcode_t mali_dlbu_initialize(void); ++void mali_dlbu_terminate(void); + ++struct mali_dlbu_core *mali_dlbu_create(const _mali_osk_resource_t *resource); ++void mali_dlbu_delete(struct mali_dlbu_core *dlbu); + ++_mali_osk_errcode_t mali_dlbu_reset(struct mali_dlbu_core *dlbu); + ++void mali_dlbu_add_group(struct mali_dlbu_core *dlbu, struct mali_group *group); ++void mali_dlbu_remove_group(struct mali_dlbu_core *dlbu, struct mali_group *group); + -+/* ++/** @brief Called to update HW after DLBU state changed + * ++ * This function must be called after \a mali_dlbu_add_group or \a ++ * mali_dlbu_remove_group to write the updated mask to hardware, unless the ++ * same is accomplished by calling \a mali_dlbu_reset. + */ -+#include -+#include -+#include -+ -+#include ++void mali_dlbu_update_mask(struct mali_dlbu_core *dlbu); + -+#if !defined(CONFIG_MALI_BIFROST_NO_MALI) ++void mali_dlbu_config_job(struct mali_dlbu_core *dlbu, struct mali_pp_job *job); + ++#endif /* __MALI_DLBU_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c +new file mode 100755 +index 000000000..55b21a410 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c +@@ -0,0 +1,308 @@ ++/* ++ * Copyright (C) 2010-2012, 2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+#ifdef CONFIG_DEBUG_FS ++#include ++#include "mali_kernel_common.h" ++#include "mali_scheduler.h" ++#include "mali_dvfs_policy.h" ++#include "mali_osk_mali.h" ++#include "mali_osk_profiling.h" + ++#define CLOCK_TUNING_TIME_DEBUG 0 + -+int kbase_io_history_resize(struct kbase_io_history *h, u16 new_size) -+{ -+ struct kbase_io_access *old_buf; -+ struct kbase_io_access *new_buf; -+ unsigned long flags; ++#define MAX_PERFORMANCE_VALUE 256 ++#define MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(percent) ((int) ((percent)*(MAX_PERFORMANCE_VALUE)/100.0 + 0.5)) + -+ if (!new_size) -+ goto out_err; /* The new size must not be 0 */ ++/** The max fps the same as display vsync default 60, can set by module insert parameter */ ++int mali_max_system_fps = 60; ++/** A lower limit on their desired FPS default 58, can set by module insert parameter */ ++int mali_desired_fps = 58; + -+ new_buf = vmalloc(new_size * sizeof(*h->buf)); -+ if (!new_buf) -+ goto out_err; ++static int mali_fps_step1 = 0; ++static int mali_fps_step2 = 0; + -+ spin_lock_irqsave(&h->lock, flags); ++static int clock_step = -1; ++static int cur_clk_step = -1; ++static struct mali_gpu_clock *gpu_clk = NULL; + -+ old_buf = h->buf; ++/*Function prototype */ ++static int (*mali_gpu_set_freq)(int) = NULL; ++static int (*mali_gpu_get_freq)(void) = NULL; + -+ /* Note: we won't bother with copying the old data over. The dumping -+ * logic wouldn't work properly as it relies on 'count' both as a -+ * counter and as an index to the buffer which would have changed with -+ * the new array. This is a corner case that we don't need to support. -+ */ -+ h->count = 0; -+ h->size = new_size; -+ h->buf = new_buf; ++static mali_bool mali_dvfs_enabled = MALI_FALSE; + -+ spin_unlock_irqrestore(&h->lock, flags); ++#define NUMBER_OF_NANOSECONDS_PER_SECOND 1000000000ULL ++static u32 calculate_window_render_fps(u64 time_period) ++{ ++ u32 max_window_number; ++ u64 tmp; ++ u64 max = time_period; ++ u32 leading_zeroes; ++ u32 shift_val; ++ u32 time_period_shift; ++ u32 max_window_number_shift; ++ u32 ret_val; + -+ vfree(old_buf); ++ max_window_number = mali_session_max_window_num(); + -+ return 0; ++ /* To avoid float division, extend the dividend to ns unit */ ++ tmp = (u64)max_window_number * NUMBER_OF_NANOSECONDS_PER_SECOND; ++ if (tmp > time_period) { ++ max = tmp; ++ } + -+out_err: -+ return -1; -+} ++ /* ++ * We may have 64-bit values, a dividend or a divisor or both ++ * To avoid dependencies to a 64-bit divider, we shift down the two values ++ * equally first. ++ */ ++ leading_zeroes = _mali_osk_clz((u32)(max >> 32)); ++ shift_val = 32 - leading_zeroes; + ++ time_period_shift = (u32)(time_period >> shift_val); ++ max_window_number_shift = (u32)(tmp >> shift_val); + -+int kbase_io_history_init(struct kbase_io_history *h, u16 n) -+{ -+ h->enabled = false; -+ spin_lock_init(&h->lock); -+ h->count = 0; -+ h->size = 0; -+ h->buf = NULL; -+ if (kbase_io_history_resize(h, n)) -+ return -1; ++ ret_val = max_window_number_shift / time_period_shift; + -+ return 0; ++ return ret_val; +} + -+ -+void kbase_io_history_term(struct kbase_io_history *h) ++static bool mali_pickup_closest_avail_clock(int target_clock_mhz, mali_bool pick_clock_up) +{ -+ vfree(h->buf); -+ h->buf = NULL; -+} -+ ++ int i = 0; ++ bool clock_changed = false; + -+/* kbase_io_history_add - add new entry to the register access history -+ * -+ * @h: Pointer to the history data structure -+ * @addr: Register address -+ * @value: The value that is either read from or written to the register -+ * @write: 1 if it's a register write, 0 if it's a read -+ */ -+static void kbase_io_history_add(struct kbase_io_history *h, -+ void __iomem const *addr, u32 value, u8 write) -+{ -+ struct kbase_io_access *io; -+ unsigned long flags; ++ /* Round up the closest available frequency step for target_clock_hz */ ++ for (i = 0; i < gpu_clk->num_of_steps; i++) { ++ /* Find the first item > target_clock_hz */ ++ if (((int)(gpu_clk->item[i].clock) - target_clock_mhz) > 0) { ++ break; ++ } ++ } + -+ spin_lock_irqsave(&h->lock, flags); ++ /* If the target clock greater than the maximum clock just pick the maximum one*/ ++ if (i == gpu_clk->num_of_steps) { ++ i = gpu_clk->num_of_steps - 1; ++ } else { ++ if ((!pick_clock_up) && (i > 0)) { ++ i = i - 1; ++ } ++ } + -+ io = &h->buf[h->count % h->size]; -+ io->addr = (uintptr_t)addr | write; -+ io->value = value; -+ ++h->count; -+ /* If count overflows, move the index by the buffer size so the entire -+ * buffer will still be dumped later */ -+ if (unlikely(!h->count)) -+ h->count = h->size; ++ clock_step = i; ++ if (cur_clk_step != clock_step) { ++ clock_changed = true; ++ } + -+ spin_unlock_irqrestore(&h->lock, flags); ++ return clock_changed; +} + -+ -+void kbase_io_history_dump(struct kbase_device *kbdev) ++void mali_dvfs_policy_realize(struct mali_gpu_utilization_data *data, u64 time_period) +{ -+ struct kbase_io_history *const h = &kbdev->io_history; -+ u16 i; -+ size_t iters; -+ unsigned long flags; ++ int under_perform_boundary_value = 0; ++ int over_perform_boundary_value = 0; ++ int current_fps = 0; ++ int current_gpu_util = 0; ++ bool clock_changed = false; ++#if CLOCK_TUNING_TIME_DEBUG ++ struct timeval start; ++ struct timeval stop; ++ unsigned int elapse_time; ++ do_gettimeofday(&start); ++#endif ++ u32 window_render_fps; + -+ if (!unlikely(h->enabled)) ++ if (NULL == gpu_clk) { ++ MALI_DEBUG_PRINT(2, ("Enable DVFS but patform doesn't Support freq change. \n")); + return; ++ } + -+ spin_lock_irqsave(&h->lock, flags); ++ window_render_fps = calculate_window_render_fps(time_period); + -+ dev_err(kbdev->dev, "Register IO History:"); -+ iters = (h->size > h->count) ? h->count : h->size; -+ dev_err(kbdev->dev, "Last %zu register accesses of %zu total:\n", iters, -+ h->count); -+ for (i = 0; i < iters; ++i) { -+ struct kbase_io_access *io = -+ &h->buf[(h->count - iters + i) % h->size]; -+ char const access = (io->addr & 1) ? 'w' : 'r'; ++ current_fps = window_render_fps; ++ current_gpu_util = data->utilization_gpu; + -+ dev_err(kbdev->dev, "%6i: %c: reg 0x%p val %08x\n", i, access, -+ (void *)(io->addr & ~0x1), io->value); ++ /* Get the specific under_perform_boundary_value and over_perform_boundary_value */ ++ if ((mali_desired_fps <= current_fps) && (current_fps < mali_max_system_fps)) { ++ under_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(90); ++ over_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(70); ++ } else if ((mali_fps_step1 <= current_fps) && (current_fps < mali_desired_fps)) { ++ under_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(55); ++ over_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(35); ++ } else if ((mali_fps_step2 <= current_fps) && (current_fps < mali_fps_step1)) { ++ under_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(70); ++ over_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(50); ++ } else { ++ under_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(55); ++ over_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(35); + } + -+ spin_unlock_irqrestore(&h->lock, flags); -+} -+ -+ -+#endif /* CONFIG_DEBUG_FS */ ++ MALI_DEBUG_PRINT(5, ("Using ARM power policy: gpu util = %d \n", current_gpu_util)); ++ MALI_DEBUG_PRINT(5, ("Using ARM power policy: under_perform = %d, over_perform = %d \n", under_perform_boundary_value, over_perform_boundary_value)); ++ MALI_DEBUG_PRINT(5, ("Using ARM power policy: render fps = %d, pressure render fps = %d \n", current_fps, window_render_fps)); + ++ /* Get current clock value */ ++ cur_clk_step = mali_gpu_get_freq(); + -+void kbase_reg_write(struct kbase_device *kbdev, u16 offset, u32 value, -+ struct kbase_context *kctx) -+{ -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_powered); -+ KBASE_DEBUG_ASSERT(kctx == NULL || kctx->as_nr != KBASEP_AS_NR_INVALID); -+ KBASE_DEBUG_ASSERT(kbdev->dev != NULL); ++ /* Consider offscreen */ ++ if (0 == current_fps) { ++ /* GP or PP under perform, need to give full power */ ++ if (current_gpu_util > over_perform_boundary_value) { ++ if (cur_clk_step != gpu_clk->num_of_steps - 1) { ++ clock_changed = true; ++ clock_step = gpu_clk->num_of_steps - 1; ++ } ++ } + -+ writel(value, kbdev->reg + offset); ++ /* If GPU is idle, use lowest power */ ++ if (0 == current_gpu_util) { ++ if (cur_clk_step != 0) { ++ clock_changed = true; ++ clock_step = 0; ++ } ++ } + -+#ifdef CONFIG_DEBUG_FS -+ if (unlikely(kbdev->io_history.enabled)) -+ kbase_io_history_add(&kbdev->io_history, kbdev->reg + offset, -+ value, 1); -+#endif /* CONFIG_DEBUG_FS */ -+ dev_dbg(kbdev->dev, "w: reg %04x val %08x", offset, value); ++ goto real_setting; ++ } + -+ if (kctx && kctx->jctx.tb) -+ kbase_device_trace_register_access(kctx, REG_WRITE, offset, -+ value); -+} ++ /* 2. Calculate target clock if the GPU clock can be tuned */ ++ if (-1 != cur_clk_step) { ++ int target_clk_mhz = -1; ++ mali_bool pick_clock_up = MALI_TRUE; + -+KBASE_EXPORT_TEST_API(kbase_reg_write); ++ if (current_gpu_util > under_perform_boundary_value) { ++ /* when under perform, need to consider the fps part */ ++ target_clk_mhz = gpu_clk->item[cur_clk_step].clock * current_gpu_util * mali_desired_fps / under_perform_boundary_value / current_fps; ++ pick_clock_up = MALI_TRUE; ++ } else if (current_gpu_util < over_perform_boundary_value) { ++ /* when over perform, did't need to consider fps, system didn't want to reach desired fps */ ++ target_clk_mhz = gpu_clk->item[cur_clk_step].clock * current_gpu_util / under_perform_boundary_value; ++ pick_clock_up = MALI_FALSE; ++ } + -+u32 kbase_reg_read(struct kbase_device *kbdev, u16 offset, -+ struct kbase_context *kctx) -+{ -+ u32 val; -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_powered); -+ KBASE_DEBUG_ASSERT(kctx == NULL || kctx->as_nr != KBASEP_AS_NR_INVALID); -+ KBASE_DEBUG_ASSERT(kbdev->dev != NULL); ++ if (-1 != target_clk_mhz) { ++ clock_changed = mali_pickup_closest_avail_clock(target_clk_mhz, pick_clock_up); ++ } ++ } + -+ val = readl(kbdev->reg + offset); ++real_setting: ++ if (clock_changed) { ++ mali_gpu_set_freq(clock_step); + -+#ifdef CONFIG_DEBUG_FS -+ if (unlikely(kbdev->io_history.enabled)) -+ kbase_io_history_add(&kbdev->io_history, kbdev->reg + offset, -+ val, 0); -+#endif /* CONFIG_DEBUG_FS */ -+ dev_dbg(kbdev->dev, "r: reg %04x val %08x", offset, val); ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_EVENT_CHANNEL_GPU | ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, ++ gpu_clk->item[clock_step].clock, ++ gpu_clk->item[clock_step].vol / 1000, ++ 0, 0, 0); ++ } + -+ if (kctx && kctx->jctx.tb) -+ kbase_device_trace_register_access(kctx, REG_READ, offset, val); -+ return val; ++#if CLOCK_TUNING_TIME_DEBUG ++ do_gettimeofday(&stop); ++ ++ elapse_time = timeval_to_ns(&stop) - timeval_to_ns(&start); ++ MALI_DEBUG_PRINT(2, ("Using ARM power policy: eclapse time = %d\n", elapse_time)); ++#endif +} + -+KBASE_EXPORT_TEST_API(kbase_reg_read); -+#endif /* !defined(CONFIG_MALI_BIFROST_NO_MALI) */ ++_mali_osk_errcode_t mali_dvfs_policy_init(void) ++{ ++ _mali_osk_device_data data; ++ _mali_osk_errcode_t err = _MALI_OSK_ERR_OK; + -+/** -+ * kbase_report_gpu_fault - Report a GPU fault. -+ * @kbdev: Kbase device pointer -+ * @multiple: Zero if only GPU_FAULT was raised, non-zero if MULTIPLE_GPU_FAULTS -+ * was also set -+ * -+ * This function is called from the interrupt handler when a GPU fault occurs. -+ * It reports the details of the fault using dev_warn(). ++ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { ++ if ((NULL != data.get_clock_info) && (NULL != data.set_freq) && (NULL != data.get_freq)) { ++ MALI_DEBUG_PRINT(2, ("Mali DVFS init: using arm dvfs policy \n")); ++ ++ ++ mali_fps_step1 = mali_max_system_fps / 3; ++ mali_fps_step2 = mali_max_system_fps / 5; ++ ++ data.get_clock_info(&gpu_clk); ++ ++ if (gpu_clk != NULL) { ++#ifdef DEBUG ++ int i; ++ for (i = 0; i < gpu_clk->num_of_steps; i++) { ++ MALI_DEBUG_PRINT(5, ("mali gpu clock info: step%d clock(%d)Hz,vol(%d) \n", ++ i, gpu_clk->item[i].clock, gpu_clk->item[i].vol)); ++ } ++#endif ++ } else { ++ MALI_DEBUG_PRINT(2, ("Mali DVFS init: platform didn't define enough info for ddk to do DVFS \n")); ++ } ++ ++ mali_gpu_get_freq = data.get_freq; ++ mali_gpu_set_freq = data.set_freq; ++ ++ if ((NULL != gpu_clk) && (gpu_clk->num_of_steps > 0) ++ && (NULL != mali_gpu_get_freq) && (NULL != mali_gpu_set_freq)) { ++ mali_dvfs_enabled = MALI_TRUE; ++ } ++ } else { ++ MALI_DEBUG_PRINT(2, ("Mali DVFS init: platform function callback incomplete, need check mali_gpu_device_data in platform .\n")); ++ } ++ } else { ++ err = _MALI_OSK_ERR_FAULT; ++ MALI_DEBUG_PRINT(2, ("Mali DVFS init: get platform data error .\n")); ++ } ++ ++ return err; ++} ++ ++/* ++ * Always give full power when start a new period, ++ * if mali dvfs enabled, for performance consideration + */ -+static void kbase_report_gpu_fault(struct kbase_device *kbdev, int multiple) ++void mali_dvfs_policy_new_period(void) +{ -+ u32 status; -+ u64 address; ++ /* Always give full power when start a new period */ ++ unsigned int cur_clk_step = 0; + -+ status = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_FAULTSTATUS), NULL); -+ address = (u64) kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(GPU_FAULTADDRESS_HI), NULL) << 32; -+ address |= kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(GPU_FAULTADDRESS_LO), NULL); ++ cur_clk_step = mali_gpu_get_freq(); + -+ dev_warn(kbdev->dev, "GPU Fault 0x%08x (%s) at 0x%016llx", -+ status & 0xFF, -+ kbase_exception_name(kbdev, status), -+ address); -+ if (multiple) -+ dev_warn(kbdev->dev, "There were multiple GPU faults - some have not been reported\n"); ++ if (cur_clk_step != (gpu_clk->num_of_steps - 1)) { ++ mali_gpu_set_freq(gpu_clk->num_of_steps - 1); ++ ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_EVENT_CHANNEL_GPU | ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, gpu_clk->item[gpu_clk->num_of_steps - 1].clock, ++ gpu_clk->item[gpu_clk->num_of_steps - 1].vol / 1000, 0, 0, 0); ++ } +} + -+void kbase_gpu_interrupt(struct kbase_device *kbdev, u32 val) ++mali_bool mali_dvfs_policy_enabled(void) +{ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_IRQ, NULL, NULL, 0u, val); -+ if (val & GPU_FAULT) -+ kbase_report_gpu_fault(kbdev, val & MULTIPLE_GPU_FAULTS); -+ -+ if (val & RESET_COMPLETED) -+ kbase_pm_reset_done(kbdev); ++ return mali_dvfs_enabled; ++} + -+ if (val & PRFCNT_SAMPLE_COMPLETED) -+ kbase_instr_hwcnt_sample_done(kbdev); ++#if defined(CONFIG_MALI400_PROFILING) ++void mali_get_current_gpu_clk_item(struct mali_gpu_clk_item *clk_item) ++{ ++ if (mali_platform_device != NULL) { + -+ if (val & CLEAN_CACHES_COMPLETED) -+ kbase_clean_caches_done(kbdev); ++ struct mali_gpu_device_data *device_data = NULL; ++ device_data = (struct mali_gpu_device_data *)mali_platform_device->dev.platform_data; + -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_IRQ_CLEAR, NULL, NULL, 0u, val); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), val, NULL); ++ if ((NULL != device_data->get_clock_info) && (NULL != device_data->get_freq)) { + -+ /* kbase_pm_check_transitions must be called after the IRQ has been -+ * cleared. This is because it might trigger further power transitions -+ * and we don't want to miss the interrupt raised to notify us that -+ * these further transitions have finished. -+ */ -+ if (val & POWER_CHANGED_ALL) -+ kbase_pm_power_changed(kbdev); ++ int cur_clk_step = device_data->get_freq(); ++ struct mali_gpu_clock *mali_gpu_clk = NULL; + -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_IRQ_DONE, NULL, NULL, 0u, val); ++ device_data->get_clock_info(&mali_gpu_clk); ++ clk_item->clock = mali_gpu_clk->item[cur_clk_step].clock; ++ clk_item->vol = mali_gpu_clk->item[cur_clk_step].vol; ++ } else { ++ MALI_DEBUG_PRINT(2, ("Mali GPU Utilization: platform function callback incomplete, need check mali_gpu_device_data in platform .\n")); ++ } ++ } +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_device_internal.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_device_internal.h ++#endif ++ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h new file mode 100755 -index 000000000000..5b20445932fb +index 000000000..662348c4e --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_device_internal.h -@@ -0,0 +1,67 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h +@@ -0,0 +1,34 @@ +/* -+ * -+ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2012, 2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_DVFS_POLICY_H__ ++#define __MALI_DVFS_POLICY_H__ + ++#ifdef __cplusplus ++extern "C" { ++#endif + ++void mali_dvfs_policy_realize(struct mali_gpu_utilization_data *data, u64 time_period); + ++_mali_osk_errcode_t mali_dvfs_policy_init(void); + -+/* -+ * Backend-specific HW access device APIs -+ */ -+ -+#ifndef _KBASE_DEVICE_INTERNAL_H_ -+#define _KBASE_DEVICE_INTERNAL_H_ -+ -+/** -+ * kbase_reg_write - write to GPU register -+ * @kbdev: Kbase device pointer -+ * @offset: Offset of register -+ * @value: Value to write -+ * @kctx: Kbase context pointer. May be NULL -+ * -+ * Caller must ensure the GPU is powered (@kbdev->pm.gpu_powered != false). If -+ * @kctx is not NULL then the caller must ensure it is scheduled (@kctx->as_nr -+ * != KBASEP_AS_NR_INVALID). -+ */ -+void kbase_reg_write(struct kbase_device *kbdev, u16 offset, u32 value, -+ struct kbase_context *kctx); ++void mali_dvfs_policy_new_period(void); + -+/** -+ * kbase_reg_read - read from GPU register -+ * @kbdev: Kbase device pointer -+ * @offset: Offset of register -+ * @kctx: Kbase context pointer. May be NULL -+ * -+ * Caller must ensure the GPU is powered (@kbdev->pm.gpu_powered != false). If -+ * @kctx is not NULL then the caller must ensure it is scheduled (@kctx->as_nr -+ * != KBASEP_AS_NR_INVALID). -+ * -+ * Return: Value in desired register -+ */ -+u32 kbase_reg_read(struct kbase_device *kbdev, u16 offset, -+ struct kbase_context *kctx); ++mali_bool mali_dvfs_policy_enabled(void); + ++#if defined(CONFIG_MALI400_PROFILING) ++void mali_get_current_gpu_clk_item(struct mali_gpu_clk_item *clk_item); ++#endif + -+/** -+ * kbase_gpu_interrupt - GPU interrupt handler -+ * @kbdev: Kbase device pointer -+ * @val: The value of the GPU IRQ status register which triggered the call -+ * -+ * This function is called from the interrupt handler when a GPU irq is to be -+ * handled. -+ */ -+void kbase_gpu_interrupt(struct kbase_device *kbdev, u32 val); ++#ifdef __cplusplus ++} ++#endif + -+#endif /* _KBASE_DEVICE_INTERNAL_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_gpu.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_gpu.c ++#endif/* __MALI_DVFS_POLICY_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_executor.c b/drivers/gpu/arm/mali400/mali/common/mali_executor.c new file mode 100755 -index 000000000000..a7c3a77d8ac8 +index 000000000..0cf1ec0b0 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_gpu.c -@@ -0,0 +1,123 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.c +@@ -0,0 +1,2707 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include "mali_executor.h" ++#include "mali_scheduler.h" ++#include "mali_kernel_common.h" ++#include "mali_kernel_core.h" ++#include "mali_osk.h" ++#include "mali_osk_list.h" ++#include "mali_pp.h" ++#include "mali_pp_job.h" ++#include "mali_group.h" ++#include "mali_pm.h" ++#include "mali_timeline.h" ++#include "mali_osk_profiling.h" ++#include "mali_session.h" ++#include "mali_osk_mali.h" + -+ ++/*Add for voltage scan function*/ ++extern u32 mali_group_error; + +/* -+ * Register-based HW access backend APIs ++ * If dma_buf with map on demand is used, we defer job deletion and job queue ++ * if in atomic context, since both might sleep. + */ -+#include -+#include -+#include -+#include -+#include -+#include ++#if defined(CONFIG_DMA_SHARED_BUFFER) && !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) ++#define MALI_EXECUTOR_USE_DEFERRED_PP_JOB_DELETE 1 ++#define MALI_EXECUTOR_USE_DEFERRED_PP_JOB_QUEUE 1 ++#endif /* !defined(CONFIG_DMA_SHARED_BUFFER) && !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) */ + -+int kbase_backend_early_init(struct kbase_device *kbdev) -+{ -+ int err; ++/* ++ * ---------- static type definitions (structs, enums, etc) ---------- ++ */ + -+ err = kbasep_platform_device_init(kbdev); -+ if (err) -+ return err; ++enum mali_executor_state_t { ++ EXEC_STATE_NOT_PRESENT, /* Virtual group on Mali-300/400 (do not use) */ ++ EXEC_STATE_DISABLED, /* Disabled by core scaling (do not use) */ ++ EXEC_STATE_EMPTY, /* No child groups for virtual group (do not use) */ ++ EXEC_STATE_INACTIVE, /* Can be used, but must be activate first */ ++ EXEC_STATE_IDLE, /* Active and ready to be used */ ++ EXEC_STATE_WORKING, /* Executing a job */ ++}; + -+ /* Ensure we can access the GPU registers */ -+ kbase_pm_register_access_enable(kbdev); ++/* ++ * ---------- global variables (exported due to inline functions) ---------- ++ */ + -+ /* Find out GPU properties based on the GPU feature registers */ -+ kbase_gpuprops_set(kbdev); ++/* Lock for this module (protecting all HW access except L2 caches) */ ++_mali_osk_spinlock_irq_t *mali_executor_lock_obj = NULL; + -+ /* We're done accessing the GPU registers for now. */ -+ kbase_pm_register_access_disable(kbdev); ++mali_bool mali_executor_hints[MALI_EXECUTOR_HINT_MAX]; + -+ err = kbase_install_interrupts(kbdev); -+ if (err) -+ goto fail_interrupts; ++/* ++ * ---------- static variables ---------- ++ */ + -+ err = kbase_hwaccess_pm_init(kbdev); -+ if (err) -+ goto fail_pm; ++/* Used to defer job scheduling */ ++static _mali_osk_wq_work_t *executor_wq_high_pri = NULL; + -+ return 0; ++/* Store version from GP and PP (user space wants to know this) */ ++static u32 pp_version = 0; ++static u32 gp_version = 0; + -+fail_pm: -+ kbase_release_interrupts(kbdev); -+fail_interrupts: -+ kbasep_platform_device_term(kbdev); ++/* List of physical PP groups which are disabled by some external source */ ++static _MALI_OSK_LIST_HEAD_STATIC_INIT(group_list_disabled); ++static u32 group_list_disabled_count = 0; + -+ return err; -+} ++/* List of groups which can be used, but activate first */ ++static _MALI_OSK_LIST_HEAD_STATIC_INIT(group_list_inactive); ++static u32 group_list_inactive_count = 0; + -+void kbase_backend_early_term(struct kbase_device *kbdev) -+{ -+ kbase_hwaccess_pm_term(kbdev); -+ kbase_release_interrupts(kbdev); -+ kbasep_platform_device_term(kbdev); -+} ++/* List of groups which are active and ready to be used */ ++static _MALI_OSK_LIST_HEAD_STATIC_INIT(group_list_idle); ++static u32 group_list_idle_count = 0; + -+int kbase_backend_late_init(struct kbase_device *kbdev) -+{ -+ int err; ++/* List of groups which are executing a job */ ++static _MALI_OSK_LIST_HEAD_STATIC_INIT(group_list_working); ++static u32 group_list_working_count = 0; + -+ err = kbase_hwaccess_pm_powerup(kbdev, PM_HW_ISSUES_DETECT); -+ if (err) -+ return err; ++/* Virtual group (if any) */ ++static struct mali_group *virtual_group = NULL; + -+ err = kbase_backend_timer_init(kbdev); -+ if (err) -+ goto fail_timer; ++/* Virtual group state is tracked with a state variable instead of 4 lists */ ++static enum mali_executor_state_t virtual_group_state = EXEC_STATE_NOT_PRESENT; + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+#ifndef CONFIG_MALI_BIFROST_NO_MALI -+ if (kbasep_common_test_interrupt_handlers(kbdev) != 0) { -+ dev_err(kbdev->dev, "Interrupt assigment check failed.\n"); -+ err = -EINVAL; -+ goto fail_interrupt_test; -+ } -+#endif /* !CONFIG_MALI_BIFROST_NO_MALI */ -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++/* GP group */ ++static struct mali_group *gp_group = NULL; + -+ err = kbase_job_slot_init(kbdev); -+ if (err) -+ goto fail_job_slot; ++/* GP group state is tracked with a state variable instead of 4 lists */ ++static enum mali_executor_state_t gp_group_state = EXEC_STATE_NOT_PRESENT; + -+ init_waitqueue_head(&kbdev->hwaccess.backend.reset_wait); ++static u32 gp_returned_cookie = 0; + -+ return 0; ++/* Total number of physical PP cores present */ ++static u32 num_physical_pp_cores_total = 0; + -+fail_job_slot: ++/* Number of physical cores which are enabled */ ++static u32 num_physical_pp_cores_enabled = 0; + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+#ifndef CONFIG_MALI_BIFROST_NO_MALI -+fail_interrupt_test: -+#endif /* !CONFIG_MALI_BIFROST_NO_MALI */ -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++/* Enable or disable core scaling */ ++static mali_bool core_scaling_enabled = MALI_TRUE; + -+ kbase_backend_timer_term(kbdev); -+fail_timer: -+ kbase_hwaccess_pm_halt(kbdev); ++/* Variables to allow safe pausing of the scheduler */ ++static _mali_osk_wait_queue_t *executor_working_wait_queue = NULL; ++static u32 pause_count = 0; + -+ return err; -+} ++/* PP cores haven't been enabled because of some pp cores haven't been disabled. */ ++static int core_scaling_delay_up_mask[MALI_MAX_NUMBER_OF_DOMAINS] = { 0 }; + -+void kbase_backend_late_term(struct kbase_device *kbdev) -+{ -+ kbase_job_slot_halt(kbdev); -+ kbase_job_slot_term(kbdev); -+ kbase_backend_timer_term(kbdev); -+ kbase_hwaccess_pm_halt(kbdev); -+} ++/* Variables used to implement notify pp core changes to userspace when core scaling ++ * is finished in mali_executor_complete_group() function. */ ++static _mali_osk_wq_work_t *executor_wq_notify_core_change = NULL; ++static _mali_osk_wait_queue_t *executor_notify_core_change_wait_queue = NULL; + -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_gpuprops_backend.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_gpuprops_backend.c -new file mode 100755 -index 000000000000..b395325b556b ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_gpuprops_backend.c -@@ -0,0 +1,110 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * ---------- Forward declaration of static functions ---------- + */ ++static mali_bool mali_executor_is_suspended(void *data); ++static mali_bool mali_executor_is_working(void); ++static void mali_executor_disable_empty_virtual(void); ++static mali_bool mali_executor_physical_rejoin_virtual(struct mali_group *group); ++static mali_bool mali_executor_has_virtual_group(void); ++static mali_bool mali_executor_virtual_group_is_usable(void); ++static void mali_executor_schedule(void); ++static void mali_executor_wq_schedule(void *arg); ++static void mali_executor_send_gp_oom_to_user(struct mali_gp_job *job); ++static void mali_executor_complete_group(struct mali_group *group, ++ mali_bool success, ++ struct mali_gp_job **gp_job_done, ++ struct mali_pp_job **pp_job_done); ++static void mali_executor_change_state_pp_physical(struct mali_group *group, ++ _mali_osk_list_t *old_list, ++ u32 *old_count, ++ _mali_osk_list_t *new_list, ++ u32 *new_count); ++static mali_bool mali_executor_group_is_in_state(struct mali_group *group, ++ enum mali_executor_state_t state); + -+ -+ -+ ++static void mali_executor_group_enable_internal(struct mali_group *group); ++static void mali_executor_group_disable_internal(struct mali_group *group); ++static void mali_executor_core_scale(unsigned int target_core_nr); ++static void mali_executor_core_scale_in_group_complete(struct mali_group *group); ++static void mali_executor_notify_core_change(u32 num_cores); ++static void mali_executor_wq_notify_core_change(void *arg); ++static void mali_executor_change_group_status_disabled(struct mali_group *group); ++static mali_bool mali_executor_deactivate_list_idle(mali_bool deactivate_idle_group); ++static void mali_executor_set_state_pp_physical(struct mali_group *group, ++ _mali_osk_list_t *new_list, ++ u32 *new_count); + +/* -+ * Base kernel property query backend APIs ++ * ---------- Actual implementation ---------- + */ + -+#include -+#include -+#include -+#include -+ -+void kbase_backend_gpuprops_get(struct kbase_device *kbdev, -+ struct kbase_gpuprops_regdump *regdump) ++_mali_osk_errcode_t mali_executor_initialize(void) +{ -+ int i; -+ -+ /* Fill regdump with the content of the relevant registers */ -+ regdump->gpu_id = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_ID), NULL); -+ -+ regdump->l2_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(L2_FEATURES), NULL); -+ regdump->suspend_size = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(SUSPEND_SIZE), NULL); -+ regdump->tiler_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(TILER_FEATURES), NULL); -+ regdump->mem_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(MEM_FEATURES), NULL); -+ regdump->mmu_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(MMU_FEATURES), NULL); -+ regdump->as_present = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(AS_PRESENT), NULL); -+ regdump->js_present = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(JS_PRESENT), NULL); -+ -+ for (i = 0; i < GPU_MAX_JOB_SLOTS; i++) -+ regdump->js_features[i] = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(JS_FEATURES_REG(i)), NULL); -+ -+ for (i = 0; i < BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS; i++) -+ regdump->texture_features[i] = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(TEXTURE_FEATURES_REG(i)), NULL); ++ mali_executor_lock_obj = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_ORDERED, _MALI_OSK_LOCK_ORDER_EXECUTOR); ++ if (NULL == mali_executor_lock_obj) { ++ mali_executor_terminate(); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ regdump->thread_max_threads = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(THREAD_MAX_THREADS), NULL); -+ regdump->thread_max_workgroup_size = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(THREAD_MAX_WORKGROUP_SIZE), -+ NULL); -+ regdump->thread_max_barrier_size = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(THREAD_MAX_BARRIER_SIZE), NULL); -+ regdump->thread_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(THREAD_FEATURES), NULL); ++ executor_wq_high_pri = _mali_osk_wq_create_work_high_pri(mali_executor_wq_schedule, NULL); ++ if (NULL == executor_wq_high_pri) { ++ mali_executor_terminate(); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ regdump->shader_present_lo = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(SHADER_PRESENT_LO), NULL); -+ regdump->shader_present_hi = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(SHADER_PRESENT_HI), NULL); ++ executor_working_wait_queue = _mali_osk_wait_queue_init(); ++ if (NULL == executor_working_wait_queue) { ++ mali_executor_terminate(); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ regdump->tiler_present_lo = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(TILER_PRESENT_LO), NULL); -+ regdump->tiler_present_hi = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(TILER_PRESENT_HI), NULL); ++ executor_wq_notify_core_change = _mali_osk_wq_create_work(mali_executor_wq_notify_core_change, NULL); ++ if (NULL == executor_wq_notify_core_change) { ++ mali_executor_terminate(); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ regdump->l2_present_lo = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(L2_PRESENT_LO), NULL); -+ regdump->l2_present_hi = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(L2_PRESENT_HI), NULL); ++ executor_notify_core_change_wait_queue = _mali_osk_wait_queue_init(); ++ if (NULL == executor_notify_core_change_wait_queue) { ++ mali_executor_terminate(); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ regdump->stack_present_lo = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(STACK_PRESENT_LO), NULL); -+ regdump->stack_present_hi = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(STACK_PRESENT_HI), NULL); ++ return _MALI_OSK_ERR_OK; +} + -+void kbase_backend_gpuprops_get_features(struct kbase_device *kbdev, -+ struct kbase_gpuprops_regdump *regdump) ++void mali_executor_terminate(void) +{ -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_COHERENCY_REG)) { -+ /* Ensure we can access the GPU registers */ -+ kbase_pm_register_access_enable(kbdev); ++ if (NULL != executor_notify_core_change_wait_queue) { ++ _mali_osk_wait_queue_term(executor_notify_core_change_wait_queue); ++ executor_notify_core_change_wait_queue = NULL; ++ } + -+ regdump->coherency_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(COHERENCY_FEATURES), NULL); ++ if (NULL != executor_wq_notify_core_change) { ++ _mali_osk_wq_delete_work(executor_wq_notify_core_change); ++ executor_wq_notify_core_change = NULL; ++ } + -+ /* We're done accessing the GPU registers for now. */ -+ kbase_pm_register_access_disable(kbdev); -+ } else { -+ /* Pre COHERENCY_FEATURES we only supported ACE_LITE */ -+ regdump->coherency_features = -+ COHERENCY_FEATURE_BIT(COHERENCY_NONE) | -+ COHERENCY_FEATURE_BIT(COHERENCY_ACE_LITE); ++ if (NULL != executor_working_wait_queue) { ++ _mali_osk_wait_queue_term(executor_working_wait_queue); ++ executor_working_wait_queue = NULL; ++ } ++ ++ if (NULL != executor_wq_high_pri) { ++ _mali_osk_wq_delete_work(executor_wq_high_pri); ++ executor_wq_high_pri = NULL; ++ } ++ ++ if (NULL != mali_executor_lock_obj) { ++ _mali_osk_spinlock_irq_term(mali_executor_lock_obj); ++ mali_executor_lock_obj = NULL; + } +} + -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_backend.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_backend.c -new file mode 100755 -index 000000000000..8084d054cc5b ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_backend.c -@@ -0,0 +1,492 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++void mali_executor_populate(void) ++{ ++ u32 num_groups; ++ u32 i; + ++ num_groups = mali_group_get_glob_num_groups(); + ++ /* Do we have a virtual group? */ ++ for (i = 0; i < num_groups; i++) { ++ struct mali_group *group = mali_group_get_glob_group(i); + ++ if (mali_group_is_virtual(group)) { ++ virtual_group = group; ++ virtual_group_state = EXEC_STATE_INACTIVE; ++ break; ++ } ++ } + ++ /* Find all the available physical GP and PP cores */ ++ for (i = 0; i < num_groups; i++) { ++ struct mali_group *group = mali_group_get_glob_group(i); + -+/* -+ * GPU backend instrumentation APIs. -+ */ ++ if (NULL != group) { ++ struct mali_pp_core *pp_core = mali_group_get_pp_core(group); ++ struct mali_gp_core *gp_core = mali_group_get_gp_core(group); + -+#include -+#include -+#include -+#include -+#include -+#include ++ if (!mali_group_is_virtual(group)) { ++ if (NULL != pp_core) { ++ if (0 == pp_version) { ++ /* Retrieve PP version from the first available PP core */ ++ pp_version = mali_pp_core_get_version(pp_core); ++ } + -+/** -+ * kbasep_instr_hwcnt_cacheclean - Issue Cache Clean & Invalidate command to -+ * hardware -+ * -+ * @kbdev: Kbase device -+ */ -+static void kbasep_instr_hwcnt_cacheclean(struct kbase_device *kbdev) -+{ -+ unsigned long flags; -+ unsigned long pm_flags; -+ u32 irq_mask; ++ if (NULL != virtual_group) { ++ mali_executor_lock(); ++ mali_group_add_group(virtual_group, group); ++ mali_executor_unlock(); ++ } else { ++ _mali_osk_list_add(&group->executor_list, &group_list_inactive); ++ group_list_inactive_count++; ++ } + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == -+ KBASE_INSTR_STATE_REQUEST_CLEAN); ++ num_physical_pp_cores_total++; ++ } else { ++ MALI_DEBUG_ASSERT_POINTER(gp_core); + -+ /* Enable interrupt */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); -+ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), NULL); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), -+ irq_mask | CLEAN_CACHES_COMPLETED, NULL); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); ++ if (0 == gp_version) { ++ /* Retrieve GP version */ ++ gp_version = mali_gp_core_get_version(gp_core); ++ } + -+ /* clean&invalidate the caches so we're sure the mmu tables for the dump -+ * buffer is valid */ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_CLEAN_INV_CACHES, NULL, NULL, 0u, 0); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_CLEAN_INV_CACHES, NULL); -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_CLEANING; ++ gp_group = group; ++ gp_group_state = EXEC_STATE_INACTIVE; ++ } + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ } ++ } ++ } ++ ++ num_physical_pp_cores_enabled = num_physical_pp_cores_total; +} + -+int kbase_instr_hwcnt_enable_internal(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ struct kbase_uk_hwcnt_setup *setup) ++void mali_executor_depopulate(void) +{ -+ unsigned long flags, pm_flags; -+ int err = -EINVAL; -+ u32 irq_mask; -+ int ret; -+ u64 shader_cores_needed; -+ u32 prfcnt_config; ++ struct mali_group *group; ++ struct mali_group *temp; + -+ shader_cores_needed = kbase_pm_get_present_cores(kbdev, -+ KBASE_PM_CORE_SHADER); ++ MALI_DEBUG_ASSERT(EXEC_STATE_WORKING != gp_group_state); + -+ /* alignment failure */ -+ if ((setup->dump_buffer == 0ULL) || (setup->dump_buffer & (2048 - 1))) -+ goto out_err; ++ if (NULL != gp_group) { ++ mali_group_delete(gp_group); ++ gp_group = NULL; ++ } + -+ /* Override core availability policy to ensure all cores are available -+ */ -+ kbase_pm_ca_instr_enable(kbdev); ++ MALI_DEBUG_ASSERT(EXEC_STATE_WORKING != virtual_group_state); + -+ /* Request the cores early on synchronously - we'll release them on any -+ * errors (e.g. instrumentation already active) */ -+ kbase_pm_request_cores_sync(kbdev, true, shader_cores_needed); ++ if (NULL != virtual_group) { ++ mali_group_delete(virtual_group); ++ virtual_group = NULL; ++ } + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ MALI_DEBUG_ASSERT(_mali_osk_list_empty(&group_list_working)); + -+ if (kbdev->hwcnt.backend.state != KBASE_INSTR_STATE_DISABLED) { -+ /* Instrumentation is already enabled */ -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ goto out_unrequest_cores; ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_idle, struct mali_group, executor_list) { ++ mali_group_delete(group); + } + -+ /* Enable interrupt */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); -+ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), NULL); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), irq_mask | -+ PRFCNT_SAMPLE_COMPLETED, NULL); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_inactive, struct mali_group, executor_list) { ++ mali_group_delete(group); ++ } + -+ /* In use, this context is the owner */ -+ kbdev->hwcnt.kctx = kctx; -+ /* Remember the dump address so we can reprogram it later */ -+ kbdev->hwcnt.addr = setup->dump_buffer; ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_disabled, struct mali_group, executor_list) { ++ mali_group_delete(group); ++ } ++} + -+ /* Request the clean */ -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_REQUEST_CLEAN; -+ kbdev->hwcnt.backend.triggered = 0; -+ /* Clean&invalidate the caches so we're sure the mmu tables for the dump -+ * buffer is valid */ -+ ret = queue_work(kbdev->hwcnt.backend.cache_clean_wq, -+ &kbdev->hwcnt.backend.cache_clean_work); -+ KBASE_DEBUG_ASSERT(ret); ++void mali_executor_suspend(void) ++{ ++ mali_executor_lock(); + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ /* Increment the pause_count so that no more jobs will be scheduled */ ++ pause_count++; + -+ /* Wait for cacheclean to complete */ -+ wait_event(kbdev->hwcnt.backend.wait, -+ kbdev->hwcnt.backend.triggered != 0); ++ mali_executor_unlock(); + -+ KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == -+ KBASE_INSTR_STATE_IDLE); ++ _mali_osk_wait_queue_wait_event(executor_working_wait_queue, ++ mali_executor_is_suspended, NULL); + -+ kbase_pm_request_l2_caches(kbdev); ++ /* ++ * mali_executor_complete_XX() leaves jobs in idle state. ++ * deactivate option is used when we are going to power down ++ * the entire GPU (OS suspend) and want a consistent SW vs HW ++ * state. ++ */ ++ mali_executor_lock(); + -+ /* Configure */ -+ prfcnt_config = kctx->as_nr << PRFCNT_CONFIG_AS_SHIFT; -+#ifdef CONFIG_MALI_BIFROST_PRFCNT_SET_SECONDARY -+ { -+ u32 gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ u32 product_id = (gpu_id & GPU_ID_VERSION_PRODUCT_ID) -+ >> GPU_ID_VERSION_PRODUCT_ID_SHIFT; -+ int arch_v6 = GPU_ID_IS_NEW_FORMAT(product_id); ++ mali_executor_deactivate_list_idle(MALI_TRUE); + -+ if (arch_v6) -+ prfcnt_config |= 1 << PRFCNT_CONFIG_SETSELECT_SHIFT; ++ /* ++ * The following steps are used to deactive all of activated ++ * (MALI_GROUP_STATE_ACTIVE) and activating (MALI_GROUP ++ * _STAET_ACTIVATION_PENDING) groups, to make sure the variable ++ * pd_mask_wanted is equal with 0. */ ++ if (MALI_GROUP_STATE_INACTIVE != mali_group_get_state(gp_group)) { ++ gp_group_state = EXEC_STATE_INACTIVE; ++ mali_group_deactivate(gp_group); + } -+#endif + -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_CONFIG), -+ prfcnt_config | PRFCNT_CONFIG_MODE_OFF, kctx); ++ if (mali_executor_has_virtual_group()) { ++ if (MALI_GROUP_STATE_INACTIVE ++ != mali_group_get_state(virtual_group)) { ++ virtual_group_state = EXEC_STATE_INACTIVE; ++ mali_group_deactivate(virtual_group); ++ } ++ } + -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_LO), -+ setup->dump_buffer & 0xFFFFFFFF, kctx); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_HI), -+ setup->dump_buffer >> 32, kctx); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_JM_EN), -+ setup->jm_bm, kctx); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_SHADER_EN), -+ setup->shader_bm, kctx); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_MMU_L2_EN), -+ setup->mmu_l2_bm, kctx); -+ /* Due to PRLAM-8186 we need to disable the Tiler before we enable the -+ * HW counter dump. */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8186)) -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_TILER_EN), 0, -+ kctx); -+ else -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_TILER_EN), -+ setup->tiler_bm, kctx); ++ if (0 < group_list_inactive_count) { ++ struct mali_group *group; ++ struct mali_group *temp; + -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_CONFIG), -+ prfcnt_config | PRFCNT_CONFIG_MODE_MANUAL, kctx); ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, ++ &group_list_inactive, ++ struct mali_group, executor_list) { ++ if (MALI_GROUP_STATE_ACTIVATION_PENDING ++ == mali_group_get_state(group)) { ++ mali_group_deactivate(group); ++ } + -+ /* If HW has PRLAM-8186 we can now re-enable the tiler HW counters dump -+ */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8186)) -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_TILER_EN), -+ setup->tiler_bm, kctx); ++ /* ++ * On mali-450 platform, we may have physical group in the group inactive ++ * list, and its state is MALI_GROUP_STATE_ACTIVATION_PENDING, so we only ++ * deactivate it is not enough, we still also need add it back to virtual group. ++ * And now, virtual group must be in INACTIVE state, so it's safe to add ++ * physical group to virtual group at this point. ++ */ ++ if (NULL != virtual_group) { ++ _mali_osk_list_delinit(&group->executor_list); ++ group_list_inactive_count--; + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ mali_group_add_group(virtual_group, group); ++ } ++ } ++ } + -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; -+ kbdev->hwcnt.backend.triggered = 1; -+ wake_up(&kbdev->hwcnt.backend.wait); ++ mali_executor_unlock(); ++} + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++void mali_executor_resume(void) ++{ ++ mali_executor_lock(); + -+ err = 0; ++ /* Decrement pause_count to allow scheduling again (if it reaches 0) */ ++ pause_count--; ++ if (0 == pause_count) { ++ mali_executor_schedule(); ++ } + -+ dev_dbg(kbdev->dev, "HW counters dumping set-up for context %p", kctx); -+ return err; -+ out_unrequest_cores: -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_pm_unrequest_cores(kbdev, true, shader_cores_needed); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ out_err: -+ return err; ++ mali_executor_unlock(); +} + -+int kbase_instr_hwcnt_disable_internal(struct kbase_context *kctx) ++u32 mali_executor_get_num_cores_total(void) +{ -+ unsigned long flags, pm_flags; -+ int err = -EINVAL; -+ u32 irq_mask; -+ struct kbase_device *kbdev = kctx->kbdev; ++ return num_physical_pp_cores_total; ++} + -+ while (1) { -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++u32 mali_executor_get_num_cores_enabled(void) ++{ ++ return num_physical_pp_cores_enabled; ++} + -+ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_DISABLED) { -+ /* Instrumentation is not enabled */ -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ goto out; -+ } ++struct mali_pp_core *mali_executor_get_virtual_pp(void) ++{ ++ MALI_DEBUG_ASSERT_POINTER(virtual_group); ++ MALI_DEBUG_ASSERT_POINTER(virtual_group->pp_core); ++ return virtual_group->pp_core; ++} + -+ if (kbdev->hwcnt.kctx != kctx) { -+ /* Instrumentation has been setup for another context */ -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ goto out; -+ } ++struct mali_group *mali_executor_get_virtual_group(void) ++{ ++ return virtual_group; ++} + -+ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_IDLE) -+ break; ++void mali_executor_zap_all_active(struct mali_session_data *session) ++{ ++ struct mali_group *group; ++ struct mali_group *temp; ++ mali_bool ret; + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ mali_executor_lock(); + -+ /* Ongoing dump/setup - wait for its completion */ -+ wait_event(kbdev->hwcnt.backend.wait, -+ kbdev->hwcnt.backend.triggered != 0); -+ } ++ /* ++ * This function is a bit complicated because ++ * mali_group_zap_session() can fail. This only happens because the ++ * group is in an unhandled page fault status. ++ * We need to make sure this page fault is handled before we return, ++ * so that we know every single outstanding MMU transactions have ++ * completed. This will allow caller to safely remove physical pages ++ * when we have returned. ++ */ + -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_DISABLED; -+ kbdev->hwcnt.backend.triggered = 0; ++ MALI_DEBUG_ASSERT(NULL != gp_group); ++ ret = mali_group_zap_session(gp_group, session); ++ if (MALI_FALSE == ret) { ++ struct mali_gp_job *gp_job = NULL; + -+ /* Disable interrupt */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); -+ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), NULL); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), -+ irq_mask & ~PRFCNT_SAMPLE_COMPLETED, NULL); ++ mali_executor_complete_group(gp_group, MALI_FALSE, &gp_job, NULL); + -+ /* Disable the counters */ -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_CONFIG), 0, kctx); ++ MALI_DEBUG_ASSERT_POINTER(gp_job); + -+ kbdev->hwcnt.kctx = NULL; -+ kbdev->hwcnt.addr = 0ULL; ++ /* GP job completed, make sure it is freed */ ++ mali_scheduler_complete_gp_job(gp_job, MALI_FALSE, ++ MALI_TRUE, MALI_TRUE); ++ } + -+ kbase_pm_ca_instr_disable(kbdev); ++ if (mali_executor_has_virtual_group()) { ++ ret = mali_group_zap_session(virtual_group, session); ++ if (MALI_FALSE == ret) { ++ struct mali_pp_job *pp_job = NULL; + -+ kbase_pm_unrequest_cores(kbdev, true, -+ kbase_pm_get_present_cores(kbdev, KBASE_PM_CORE_SHADER)); ++ mali_executor_complete_group(virtual_group, MALI_FALSE, NULL, &pp_job); + -+ kbase_pm_release_l2_caches(kbdev); ++ if (NULL != pp_job) { ++ /* PP job completed, make sure it is freed */ ++ mali_scheduler_complete_pp_job(pp_job, 0, ++ MALI_FALSE, MALI_TRUE); ++ } ++ } ++ } + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_working, ++ struct mali_group, executor_list) { ++ ret = mali_group_zap_session(group, session); ++ if (MALI_FALSE == ret) { ++ ret = mali_group_zap_session(group, session); ++ if (MALI_FALSE == ret) { ++ struct mali_pp_job *pp_job = NULL; + -+ dev_dbg(kbdev->dev, "HW counters dumping disabled for context %p", -+ kctx); ++ mali_executor_complete_group(group, MALI_FALSE, NULL, &pp_job); + -+ err = 0; ++ if (NULL != pp_job) { ++ /* PP job completed, free it */ ++ mali_scheduler_complete_pp_job(pp_job, ++ 0, MALI_FALSE, ++ MALI_TRUE); ++ } ++ } ++ } ++ } + -+ out: -+ return err; ++ mali_executor_unlock(); +} + -+int kbase_instr_hwcnt_request_dump(struct kbase_context *kctx) ++void mali_executor_schedule_from_mask(mali_scheduler_mask mask, mali_bool deferred_schedule) +{ -+ unsigned long flags; -+ int err = -EINVAL; -+ struct kbase_device *kbdev = kctx->kbdev; ++ if (MALI_SCHEDULER_MASK_EMPTY != mask) { ++ if (MALI_TRUE == deferred_schedule) { ++ _mali_osk_wq_schedule_work_high_pri(executor_wq_high_pri); ++ } else { ++ /* Schedule from this thread*/ ++ mali_executor_lock(); ++ mali_executor_schedule(); ++ mali_executor_unlock(); ++ } ++ } ++} + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++_mali_osk_errcode_t mali_executor_interrupt_gp(struct mali_group *group, ++ mali_bool in_upper_half) ++{ ++ enum mali_interrupt_result int_result; ++ mali_bool time_out = MALI_FALSE; + -+ if (kbdev->hwcnt.kctx != kctx) { -+ /* The instrumentation has been setup for another context */ -+ goto unlock; ++ MALI_DEBUG_PRINT(4, ("Executor: GP interrupt from %s in %s half\n", ++ mali_group_core_description(group), ++ in_upper_half ? "upper" : "bottom")); ++ ++ mali_executor_lock(); ++ if (!mali_group_is_working(group)) { ++ /* Not working, so nothing to do */ ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; + } + -+ if (kbdev->hwcnt.backend.state != KBASE_INSTR_STATE_IDLE) { -+ /* HW counters are disabled or another dump is ongoing, or we're -+ * resetting */ -+ goto unlock; ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(mali_group_is_working(group)); ++ ++ if (mali_group_has_timed_out(group)) { ++ int_result = MALI_INTERRUPT_RESULT_ERROR; ++ time_out = MALI_TRUE; ++ MALI_PRINT(("Executor GP: Job %d Timeout on %s\n", ++ mali_gp_job_get_id(group->gp_running_job), ++ mali_group_core_description(group))); ++ } else { ++ int_result = mali_group_get_interrupt_result_gp(group); ++ if (MALI_INTERRUPT_RESULT_NONE == int_result) { ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; ++ } + } + -+ kbdev->hwcnt.backend.triggered = 0; ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ if (MALI_INTERRUPT_RESULT_NONE == int_result) { ++ /* No interrupts signalled, so nothing to do */ ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; ++ } ++#else ++ MALI_DEBUG_ASSERT(MALI_INTERRUPT_RESULT_NONE != int_result); ++#endif + -+ /* Mark that we're dumping - the PF handler can signal that we faulted -+ */ -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_DUMPING; ++ mali_group_mask_all_interrupts_gp(group); + -+ /* Reconfigure the dump address */ -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_LO), -+ kbdev->hwcnt.addr & 0xFFFFFFFF, NULL); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_HI), -+ kbdev->hwcnt.addr >> 32, NULL); ++ if (MALI_INTERRUPT_RESULT_SUCCESS_VS == int_result) { ++ if (mali_group_gp_is_active(group)) { ++ /* Only VS completed so far, while PLBU is still active */ + -+ /* Start dumping */ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_PRFCNT_SAMPLE, NULL, NULL, -+ kbdev->hwcnt.addr, 0); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_PRFCNT_SAMPLE, kctx); ++ /* Enable all but the current interrupt */ ++ mali_group_enable_interrupts_gp(group, int_result); + -+ dev_dbg(kbdev->dev, "HW counters dumping done for context %p", kctx); ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_OK; ++ } ++ } else if (MALI_INTERRUPT_RESULT_SUCCESS_PLBU == int_result) { ++ if (mali_group_gp_is_active(group)) { ++ /* Only PLBU completed so far, while VS is still active */ + -+ err = 0; ++ /* Enable all but the current interrupt */ ++ mali_group_enable_interrupts_gp(group, int_result); + -+ unlock: -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ return err; -+} -+KBASE_EXPORT_SYMBOL(kbase_instr_hwcnt_request_dump); ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_OK; ++ } ++ } else if (MALI_INTERRUPT_RESULT_OOM == int_result) { ++ struct mali_gp_job *job = mali_group_get_running_gp_job(group); + -+bool kbase_instr_hwcnt_dump_complete(struct kbase_context *kctx, -+ bool * const success) -+{ -+ unsigned long flags; -+ bool complete = false; -+ struct kbase_device *kbdev = kctx->kbdev; ++ /* PLBU out of mem */ ++ MALI_DEBUG_PRINT(3, ("Executor: PLBU needs more heap memory\n")); + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++#if defined(CONFIG_MALI400_PROFILING) ++ /* Give group a chance to generate a SUSPEND event */ ++ mali_group_oom(group); ++#endif + -+ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_IDLE) { -+ *success = true; -+ complete = true; -+ } else if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_FAULT) { -+ *success = false; -+ complete = true; -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; ++ /* ++ * no need to hold interrupt raised while ++ * waiting for more memory. ++ */ ++ mali_executor_send_gp_oom_to_user(job); ++ ++ mali_executor_unlock(); ++ ++ return _MALI_OSK_ERR_OK; + } + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ /*Add for voltage scan function*/ ++ if (MALI_INTERRUPT_RESULT_ERROR == int_result) ++ mali_group_error++; + -+ return complete; -+} -+KBASE_EXPORT_SYMBOL(kbase_instr_hwcnt_dump_complete); ++ /* We should now have a real interrupt to handle */ + -+void kbasep_cache_clean_worker(struct work_struct *data) -+{ -+ struct kbase_device *kbdev; -+ unsigned long flags; ++ MALI_DEBUG_PRINT(4, ("Executor: Group %s completed with %s\n", ++ mali_group_core_description(group), ++ (MALI_INTERRUPT_RESULT_ERROR == int_result) ? ++ "ERROR" : "success")); + -+ kbdev = container_of(data, struct kbase_device, -+ hwcnt.backend.cache_clean_work); ++ if (in_upper_half && MALI_INTERRUPT_RESULT_ERROR == int_result) { ++ /* Don't bother to do processing of errors in upper half */ ++ mali_executor_unlock(); + -+ mutex_lock(&kbdev->cacheclean_lock); -+ kbasep_instr_hwcnt_cacheclean(kbdev); ++ if (MALI_FALSE == time_out) { ++ mali_group_schedule_bottom_half_gp(group); ++ } ++ } else { ++ struct mali_gp_job *job; ++ mali_bool success; + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ /* Wait for our condition, and any reset to complete */ -+ while (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_CLEANING) { -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ wait_event(kbdev->hwcnt.backend.cache_clean_wait, -+ kbdev->hwcnt.backend.state != -+ KBASE_INSTR_STATE_CLEANING); -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ } -+ KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == -+ KBASE_INSTR_STATE_CLEANED); ++ /* ++ if (MALI_TRUE == time_out) { ++ mali_group_dump_status(group); ++ } ++ */ + -+ /* All finished and idle */ -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; -+ kbdev->hwcnt.backend.triggered = 1; -+ wake_up(&kbdev->hwcnt.backend.wait); ++ success = (int_result != MALI_INTERRUPT_RESULT_ERROR) ? ++ MALI_TRUE : MALI_FALSE; + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ mutex_unlock(&kbdev->cacheclean_lock); -+} ++ mali_executor_complete_group(group, success, &job, NULL); + -+void kbase_instr_hwcnt_sample_done(struct kbase_device *kbdev) -+{ -+ unsigned long flags; ++ mali_executor_unlock(); + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ /* GP jobs always fully complete */ ++ MALI_DEBUG_ASSERT(NULL != job); + -+ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_FAULT) { -+ kbdev->hwcnt.backend.triggered = 1; -+ wake_up(&kbdev->hwcnt.backend.wait); -+ } else if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_DUMPING) { -+ int ret; -+ /* Always clean and invalidate the cache after a successful dump -+ */ -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_REQUEST_CLEAN; -+ ret = queue_work(kbdev->hwcnt.backend.cache_clean_wq, -+ &kbdev->hwcnt.backend.cache_clean_work); -+ KBASE_DEBUG_ASSERT(ret); ++ /* This will notify user space and close the job object */ ++ mali_scheduler_complete_gp_job(job, success, ++ MALI_TRUE, MALI_TRUE); + } + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ return _MALI_OSK_ERR_OK; +} + -+void kbase_clean_caches_done(struct kbase_device *kbdev) ++_mali_osk_errcode_t mali_executor_interrupt_pp(struct mali_group *group, ++ mali_bool in_upper_half) +{ -+ u32 irq_mask; -+ -+ if (kbdev->hwcnt.backend.state != KBASE_INSTR_STATE_DISABLED) { -+ unsigned long flags; -+ unsigned long pm_flags; ++ enum mali_interrupt_result int_result; ++ mali_bool time_out = MALI_FALSE; + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ /* Disable interrupt */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); -+ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), -+ NULL); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), -+ irq_mask & ~CLEAN_CACHES_COMPLETED, NULL); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); ++ MALI_DEBUG_PRINT(4, ("Executor: PP interrupt from %s in %s half\n", ++ mali_group_core_description(group), ++ in_upper_half ? "upper" : "bottom")); + -+ /* Wakeup... */ -+ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_CLEANING) { -+ /* Only wake if we weren't resetting */ -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_CLEANED; -+ wake_up(&kbdev->hwcnt.backend.cache_clean_wait); -+ } ++ mali_executor_lock(); + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ if (!mali_group_is_working(group)) { ++ /* Not working, so nothing to do */ ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; + } -+} -+ -+int kbase_instr_hwcnt_wait_for_dump(struct kbase_context *kctx) -+{ -+ struct kbase_device *kbdev = kctx->kbdev; -+ unsigned long flags; -+ int err; -+ -+ /* Wait for dump & cacheclean to complete */ -+ wait_event(kbdev->hwcnt.backend.wait, -+ kbdev->hwcnt.backend.triggered != 0); + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ if (in_upper_half) { ++ if (mali_group_is_in_virtual(group)) { ++ /* Child groups should never handle PP interrupts */ ++ MALI_DEBUG_ASSERT(!mali_group_has_timed_out(group)); ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ } ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(mali_group_is_working(group)); ++ MALI_DEBUG_ASSERT(!mali_group_is_in_virtual(group)); + -+ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_FAULT) { -+ err = -EINVAL; -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; ++ if (mali_group_has_timed_out(group)) { ++ int_result = MALI_INTERRUPT_RESULT_ERROR; ++ time_out = MALI_TRUE; ++ MALI_PRINT(("Executor PP: Job %d Timeout on %s\n", ++ mali_pp_job_get_id(group->pp_running_job), ++ mali_group_core_description(group))); + } else { -+ /* Dump done */ -+ KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == -+ KBASE_INSTR_STATE_IDLE); -+ err = 0; ++ int_result = mali_group_get_interrupt_result_pp(group); ++ if (MALI_INTERRUPT_RESULT_NONE == int_result) { ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; ++ } + } + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ if (MALI_INTERRUPT_RESULT_NONE == int_result) { ++ /* No interrupts signalled, so nothing to do */ ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; ++ } else if (MALI_INTERRUPT_RESULT_SUCCESS == int_result) { ++ if (mali_group_is_virtual(group) && mali_group_pp_is_active(group)) { ++ /* Some child groups are still working, so nothing to do right now */ ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ } ++#else ++ MALI_DEBUG_ASSERT(MALI_INTERRUPT_RESULT_NONE != int_result); ++#endif + -+ return err; -+} ++ /*Add voltage scan function*/ + -+int kbase_instr_hwcnt_clear(struct kbase_context *kctx) -+{ -+ unsigned long flags; -+ int err = -EINVAL; -+ struct kbase_device *kbdev = kctx->kbdev; ++ if (MALI_INTERRUPT_RESULT_ERROR == int_result) ++ mali_group_error++; + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ /* We should now have a real interrupt to handle */ + -+ /* Check it's the context previously set up and we're not already -+ * dumping */ -+ if (kbdev->hwcnt.kctx != kctx || kbdev->hwcnt.backend.state != -+ KBASE_INSTR_STATE_IDLE) -+ goto out; ++ MALI_DEBUG_PRINT(4, ("Executor: Group %s completed with %s\n", ++ mali_group_core_description(group), ++ (MALI_INTERRUPT_RESULT_ERROR == int_result) ? ++ "ERROR" : "success")); + -+ /* Clear the counters */ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_PRFCNT_CLEAR, NULL, NULL, 0u, 0); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_PRFCNT_CLEAR, kctx); ++ if (in_upper_half && MALI_INTERRUPT_RESULT_ERROR == int_result) { ++ /* Don't bother to do processing of errors in upper half */ ++ mali_group_mask_all_interrupts_pp(group); ++ mali_executor_unlock(); + -+ err = 0; ++ if (MALI_FALSE == time_out) { ++ mali_group_schedule_bottom_half_pp(group); ++ } ++ } else { ++ struct mali_pp_job *job = NULL; ++ mali_bool success; + -+out: -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ return err; -+} -+KBASE_EXPORT_SYMBOL(kbase_instr_hwcnt_clear); ++ if (MALI_TRUE == time_out) { ++ mali_group_dump_status(group); ++ } + -+int kbase_instr_backend_init(struct kbase_device *kbdev) -+{ -+ int ret = 0; ++ success = (int_result == MALI_INTERRUPT_RESULT_SUCCESS) ? ++ MALI_TRUE : MALI_FALSE; + -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_DISABLED; ++ mali_executor_complete_group(group, success, NULL, &job); + -+ init_waitqueue_head(&kbdev->hwcnt.backend.wait); -+ init_waitqueue_head(&kbdev->hwcnt.backend.cache_clean_wait); -+ INIT_WORK(&kbdev->hwcnt.backend.cache_clean_work, -+ kbasep_cache_clean_worker); -+ kbdev->hwcnt.backend.triggered = 0; ++ mali_executor_unlock(); + -+ kbdev->hwcnt.backend.cache_clean_wq = -+ alloc_workqueue("Mali cache cleaning workqueue", 0, 1); -+ if (NULL == kbdev->hwcnt.backend.cache_clean_wq) -+ ret = -EINVAL; ++ if (NULL != job) { ++ /* Notify user space and close the job object */ ++ mali_scheduler_complete_pp_job(job, ++ num_physical_pp_cores_total, ++ MALI_TRUE, MALI_TRUE); ++ } ++ } + -+ return ret; ++ return _MALI_OSK_ERR_OK; +} + -+void kbase_instr_backend_term(struct kbase_device *kbdev) ++_mali_osk_errcode_t mali_executor_interrupt_mmu(struct mali_group *group, ++ mali_bool in_upper_half) +{ -+ destroy_workqueue(kbdev->hwcnt.backend.cache_clean_wq); -+} ++ enum mali_interrupt_result int_result; + -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_defs.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_defs.h -new file mode 100755 -index 000000000000..4794672da8f0 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_defs.h -@@ -0,0 +1,58 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014, 2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ MALI_DEBUG_PRINT(4, ("Executor: MMU interrupt from %s in %s half\n", ++ mali_group_core_description(group), ++ in_upper_half ? "upper" : "bottom")); + ++ mali_executor_lock(); ++ if (!mali_group_is_working(group)) { ++ /* Not working, so nothing to do */ ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; ++ } + ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(mali_group_is_working(group)); + -+/* -+ * Backend-specific instrumentation definitions -+ */ ++ int_result = mali_group_get_interrupt_result_mmu(group); ++ if (MALI_INTERRUPT_RESULT_NONE == int_result) { ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+#ifndef _KBASE_INSTR_DEFS_H_ -+#define _KBASE_INSTR_DEFS_H_ ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ if (MALI_INTERRUPT_RESULT_NONE == int_result) { ++ /* No interrupts signalled, so nothing to do */ ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; ++ } ++#else ++ MALI_DEBUG_ASSERT(MALI_INTERRUPT_RESULT_ERROR == int_result); ++#endif + -+/* -+ * Instrumentation State Machine States -+ */ -+enum kbase_instr_state { -+ /* State where instrumentation is not active */ -+ KBASE_INSTR_STATE_DISABLED = 0, -+ /* State machine is active and ready for a command. */ -+ KBASE_INSTR_STATE_IDLE, -+ /* Hardware is currently dumping a frame. */ -+ KBASE_INSTR_STATE_DUMPING, -+ /* We've requested a clean to occur on a workqueue */ -+ KBASE_INSTR_STATE_REQUEST_CLEAN, -+ /* Hardware is currently cleaning and invalidating caches. */ -+ KBASE_INSTR_STATE_CLEANING, -+ /* Cache clean completed, and either a) a dump is complete, or -+ * b) instrumentation can now be setup. */ -+ KBASE_INSTR_STATE_CLEANED, -+ /* An error has occured during DUMPING (page fault). */ -+ KBASE_INSTR_STATE_FAULT -+}; ++ /* We should now have a real interrupt to handle */ + -+/* Structure used for instrumentation and HW counters dumping */ -+struct kbase_instr_backend { -+ wait_queue_head_t wait; -+ int triggered; ++ if (in_upper_half) { ++ /* Don't bother to do processing of errors in upper half */ + -+ enum kbase_instr_state state; -+ wait_queue_head_t cache_clean_wait; -+ struct workqueue_struct *cache_clean_wq; -+ struct work_struct cache_clean_work; -+}; ++ struct mali_group *parent = group->parent_group; + -+#endif /* _KBASE_INSTR_DEFS_H_ */ ++ mali_mmu_mask_all_interrupts(group->mmu); + -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_internal.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_internal.h -new file mode 100755 -index 000000000000..e96aeae786e1 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_internal.h -@@ -0,0 +1,45 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ mali_executor_unlock(); + ++ if (NULL == parent) { ++ mali_group_schedule_bottom_half_mmu(group); ++ } else { ++ mali_group_schedule_bottom_half_mmu(parent); ++ } + ++ } else { ++ struct mali_gp_job *gp_job = NULL; ++ struct mali_pp_job *pp_job = NULL; + ++#ifdef DEBUG + ++ u32 fault_address = mali_mmu_get_page_fault_addr(group->mmu); ++ u32 status = mali_mmu_get_status(group->mmu); ++ MALI_DEBUG_PRINT(2, ("Executor: Mali page fault detected at 0x%x from bus id %d of type %s on %s\n", ++ (void *)(uintptr_t)fault_address, ++ (status >> 6) & 0x1F, ++ (status & 32) ? "write" : "read", ++ group->mmu->hw_core.description)); ++ MALI_DEBUG_PRINT(3, ("Executor: MMU rawstat = 0x%08X, MMU status = 0x%08X\n", ++ mali_mmu_get_rawstat(group->mmu), status)); ++ mali_mmu_pagedir_diag(mali_session_get_page_directory(group->session), fault_address); ++#endif + -+/* -+ * Backend-specific HW access instrumentation APIs -+ */ ++ mali_executor_complete_group(group, MALI_FALSE, &gp_job, &pp_job); + -+#ifndef _KBASE_INSTR_INTERNAL_H_ -+#define _KBASE_INSTR_INTERNAL_H_ ++ mali_executor_unlock(); + -+/** -+ * kbasep_cache_clean_worker() - Workqueue for handling cache cleaning -+ * @data: a &struct work_struct -+ */ -+void kbasep_cache_clean_worker(struct work_struct *data); ++ if (NULL != gp_job) { ++ MALI_DEBUG_ASSERT(NULL == pp_job); + -+/** -+ * kbase_clean_caches_done() - Cache clean interrupt received -+ * @kbdev: Kbase device -+ */ -+void kbase_clean_caches_done(struct kbase_device *kbdev); ++ /* Notify user space and close the job object */ ++ mali_scheduler_complete_gp_job(gp_job, MALI_FALSE, ++ MALI_TRUE, MALI_TRUE); ++ } else if (NULL != pp_job) { ++ MALI_DEBUG_ASSERT(NULL == gp_job); + -+/** -+ * kbase_instr_hwcnt_sample_done() - Dump complete interrupt received -+ * @kbdev: Kbase device -+ */ -+void kbase_instr_hwcnt_sample_done(struct kbase_device *kbdev); ++ /* Notify user space and close the job object */ ++ mali_scheduler_complete_pp_job(pp_job, ++ num_physical_pp_cores_total, ++ MALI_TRUE, MALI_TRUE); ++ } ++ } + -+#endif /* _KBASE_INSTR_INTERNAL_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_irq_internal.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_irq_internal.h -new file mode 100755 -index 000000000000..8781561e73d0 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_irq_internal.h -@@ -0,0 +1,39 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ return _MALI_OSK_ERR_OK; ++} + ++void mali_executor_group_power_up(struct mali_group *groups[], u32 num_groups) ++{ ++ u32 i; ++ mali_bool child_groups_activated = MALI_FALSE; ++ mali_bool do_schedule = MALI_FALSE; ++#if defined(DEBUG) ++ u32 num_activated = 0; ++#endif + ++ MALI_DEBUG_ASSERT_POINTER(groups); ++ MALI_DEBUG_ASSERT(0 < num_groups); + -+/* -+ * Backend specific IRQ APIs -+ */ ++ mali_executor_lock(); + -+#ifndef _KBASE_IRQ_INTERNAL_H_ -+#define _KBASE_IRQ_INTERNAL_H_ ++ MALI_DEBUG_PRINT(3, ("Executor: powering up %u groups\n", num_groups)); + -+int kbase_install_interrupts(struct kbase_device *kbdev); ++ for (i = 0; i < num_groups; i++) { ++ MALI_DEBUG_PRINT(3, ("Executor: powering up group %s\n", ++ mali_group_core_description(groups[i]))); + -+void kbase_release_interrupts(struct kbase_device *kbdev); ++ mali_group_power_up(groups[i]); + -+/** -+ * kbase_synchronize_irqs - Ensure that all IRQ handlers have completed -+ * execution -+ * @kbdev: The kbase device -+ */ -+void kbase_synchronize_irqs(struct kbase_device *kbdev); ++ if ((MALI_GROUP_STATE_ACTIVATION_PENDING != mali_group_get_state(groups[i]) || ++ (MALI_TRUE != mali_executor_group_is_in_state(groups[i], EXEC_STATE_INACTIVE)))) { ++ /* nothing more to do for this group */ ++ continue; ++ } + -+int kbasep_common_test_interrupt_handlers( -+ struct kbase_device * const kbdev); ++ MALI_DEBUG_PRINT(3, ("Executor: activating group %s\n", ++ mali_group_core_description(groups[i]))); + -+#endif /* _KBASE_IRQ_INTERNAL_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_irq_linux.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_irq_linux.c -new file mode 100755 -index 000000000000..d0666c86cf59 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_irq_linux.c -@@ -0,0 +1,469 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++#if defined(DEBUG) ++ num_activated++; ++#endif + ++ if (mali_group_is_in_virtual(groups[i])) { ++ /* ++ * At least one child group of virtual group is powered on. ++ */ ++ child_groups_activated = MALI_TRUE; ++ } else if (MALI_FALSE == mali_group_is_virtual(groups[i])) { ++ /* Set gp and pp not in virtual to active. */ ++ mali_group_set_active(groups[i]); ++ } + ++ /* Move group from inactive to idle list */ ++ if (groups[i] == gp_group) { ++ MALI_DEBUG_ASSERT(EXEC_STATE_INACTIVE == ++ gp_group_state); ++ gp_group_state = EXEC_STATE_IDLE; ++ } else if (MALI_FALSE == mali_group_is_in_virtual(groups[i]) ++ && MALI_FALSE == mali_group_is_virtual(groups[i])) { ++ MALI_DEBUG_ASSERT(MALI_TRUE == mali_executor_group_is_in_state(groups[i], ++ EXEC_STATE_INACTIVE)); + -+#include -+#include -+#include ++ mali_executor_change_state_pp_physical(groups[i], ++ &group_list_inactive, ++ &group_list_inactive_count, ++ &group_list_idle, ++ &group_list_idle_count); ++ } + -+#include ++ do_schedule = MALI_TRUE; ++ } + -+#if !defined(CONFIG_MALI_BIFROST_NO_MALI) ++ if (mali_executor_has_virtual_group() && ++ MALI_TRUE == child_groups_activated && ++ MALI_GROUP_STATE_ACTIVATION_PENDING == ++ mali_group_get_state(virtual_group)) { ++ /* ++ * Try to active virtual group while it may be not sucessful every time, ++ * because there is one situation that not all of child groups are powered on ++ * in one time and virtual group is in activation pending state. ++ */ ++ if (mali_group_set_active(virtual_group)) { ++ /* Move group from inactive to idle */ ++ MALI_DEBUG_ASSERT(EXEC_STATE_INACTIVE == ++ virtual_group_state); ++ virtual_group_state = EXEC_STATE_IDLE; + -+/* GPU IRQ Tags */ -+#define JOB_IRQ_TAG 0 -+#define MMU_IRQ_TAG 1 -+#define GPU_IRQ_TAG 2 ++ MALI_DEBUG_PRINT(3, ("Executor: powering up %u groups completed, %u physical activated, 1 virtual activated.\n", num_groups, num_activated)); ++ } else { ++ MALI_DEBUG_PRINT(3, ("Executor: powering up %u groups completed, %u physical activated\n", num_groups, num_activated)); ++ } ++ } else { ++ MALI_DEBUG_PRINT(3, ("Executor: powering up %u groups completed, %u physical activated\n", num_groups, num_activated)); ++ } + -+static void *kbase_tag(void *ptr, u32 tag) -+{ -+ return (void *)(((uintptr_t) ptr) | tag); -+} ++ if (MALI_TRUE == do_schedule) { ++ /* Trigger a schedule */ ++ mali_executor_schedule(); ++ } + -+static void *kbase_untag(void *ptr) -+{ -+ return (void *)(((uintptr_t) ptr) & ~3); ++ mali_executor_unlock(); +} + -+static irqreturn_t kbase_job_irq_handler(int irq, void *data) ++void mali_executor_group_power_down(struct mali_group *groups[], ++ u32 num_groups) +{ -+ unsigned long flags; -+ struct kbase_device *kbdev = kbase_untag(data); -+ u32 val; ++ u32 i; + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); ++ MALI_DEBUG_ASSERT_POINTER(groups); ++ MALI_DEBUG_ASSERT(0 < num_groups); + -+ if (!kbdev->pm.backend.gpu_powered) { -+ /* GPU is turned off - IRQ is not for us */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, -+ flags); -+ return IRQ_NONE; -+ } ++ mali_executor_lock(); + -+ val = kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_STATUS), NULL); ++ MALI_DEBUG_PRINT(3, ("Executor: powering down %u groups\n", num_groups)); + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ if (!kbdev->pm.backend.driver_ready_for_irqs) -+ dev_warn(kbdev->dev, "%s: irq %d irqstatus 0x%x before driver is ready\n", -+ __func__, irq, val); -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); ++ for (i = 0; i < num_groups; i++) { ++ /* Groups must be either disabled or inactive. while for virtual group, ++ * it maybe in empty state, because when we meet pm_runtime_suspend, ++ * virtual group could be powered off, and before we acquire mali_executor_lock, ++ * we must release mali_pm_state_lock, if there is a new physical job was queued, ++ * all of physical groups in virtual group could be pulled out, so we only can ++ * powered down an empty virtual group. Those physical groups will be powered ++ * up in following pm_runtime_resume callback function. ++ */ ++ MALI_DEBUG_ASSERT(mali_executor_group_is_in_state(groups[i], ++ EXEC_STATE_DISABLED) || ++ mali_executor_group_is_in_state(groups[i], ++ EXEC_STATE_INACTIVE) || ++ mali_executor_group_is_in_state(groups[i], ++ EXEC_STATE_EMPTY)); + -+ if (!val) -+ return IRQ_NONE; ++ MALI_DEBUG_PRINT(3, ("Executor: powering down group %s\n", ++ mali_group_core_description(groups[i]))); + -+ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); ++ mali_group_power_down(groups[i]); ++ } + -+ kbase_job_done(kbdev, val); ++ MALI_DEBUG_PRINT(3, ("Executor: powering down %u groups completed\n", num_groups)); + -+ return IRQ_HANDLED; ++ mali_executor_unlock(); +} + -+KBASE_EXPORT_TEST_API(kbase_job_irq_handler); -+ -+static irqreturn_t kbase_mmu_irq_handler(int irq, void *data) ++void mali_executor_abort_session(struct mali_session_data *session) +{ -+ unsigned long flags; -+ struct kbase_device *kbdev = kbase_untag(data); -+ u32 val; ++ struct mali_group *group; ++ struct mali_group *tmp_group; + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); ++ MALI_DEBUG_ASSERT_POINTER(session); ++ MALI_DEBUG_ASSERT(session->is_aborting); + -+ if (!kbdev->pm.backend.gpu_powered) { -+ /* GPU is turned off - IRQ is not for us */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, -+ flags); -+ return IRQ_NONE; -+ } ++ MALI_DEBUG_PRINT(3, ++ ("Executor: Aborting all jobs from session 0x%08X.\n", ++ session)); + -+ atomic_inc(&kbdev->faults_pending); ++ mali_executor_lock(); + -+ val = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_STATUS), NULL); ++ if (mali_group_get_session(gp_group) == session) { ++ if (EXEC_STATE_WORKING == gp_group_state) { ++ struct mali_gp_job *gp_job = NULL; + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ if (!kbdev->pm.backend.driver_ready_for_irqs) -+ dev_warn(kbdev->dev, "%s: irq %d irqstatus 0x%x before driver is ready\n", -+ __func__, irq, val); -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); ++ mali_executor_complete_group(gp_group, MALI_FALSE, &gp_job, NULL); + -+ if (!val) { -+ atomic_dec(&kbdev->faults_pending); -+ return IRQ_NONE; -+ } ++ MALI_DEBUG_ASSERT_POINTER(gp_job); + -+ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); ++ /* GP job completed, make sure it is freed */ ++ mali_scheduler_complete_gp_job(gp_job, MALI_FALSE, ++ MALI_FALSE, MALI_TRUE); ++ } else { ++ /* Same session, but not working, so just clear it */ ++ mali_group_clear_session(gp_group); ++ } ++ } + -+ kbase_mmu_interrupt(kbdev, val); ++ if (mali_executor_has_virtual_group()) { ++ if (EXEC_STATE_WORKING == virtual_group_state ++ && mali_group_get_session(virtual_group) == session) { ++ struct mali_pp_job *pp_job = NULL; + -+ atomic_dec(&kbdev->faults_pending); ++ mali_executor_complete_group(virtual_group, MALI_FALSE, NULL, &pp_job); + -+ return IRQ_HANDLED; -+} ++ if (NULL != pp_job) { ++ /* PP job completed, make sure it is freed */ ++ mali_scheduler_complete_pp_job(pp_job, 0, ++ MALI_FALSE, MALI_TRUE); ++ } ++ } ++ } + -+static irqreturn_t kbase_gpu_irq_handler(int irq, void *data) -+{ -+ unsigned long flags; -+ struct kbase_device *kbdev = kbase_untag(data); -+ u32 val; ++ _MALI_OSK_LIST_FOREACHENTRY(group, tmp_group, &group_list_working, ++ struct mali_group, executor_list) { ++ if (mali_group_get_session(group) == session) { ++ struct mali_pp_job *pp_job = NULL; + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); ++ mali_executor_complete_group(group, MALI_FALSE, NULL, &pp_job); + -+ if (!kbdev->pm.backend.gpu_powered) { -+ /* GPU is turned off - IRQ is not for us */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, -+ flags); -+ return IRQ_NONE; ++ if (NULL != pp_job) { ++ /* PP job completed, make sure it is freed */ ++ mali_scheduler_complete_pp_job(pp_job, 0, ++ MALI_FALSE, MALI_TRUE); ++ } ++ } + } + -+ val = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_STATUS), NULL); -+ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ if (!kbdev->pm.backend.driver_ready_for_irqs) -+ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x before driver is ready\n", -+ __func__, irq, val); -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); -+ -+ if (!val) -+ return IRQ_NONE; ++ _MALI_OSK_LIST_FOREACHENTRY(group, tmp_group, &group_list_idle, struct mali_group, executor_list) { ++ mali_group_clear_session(group); ++ } + -+ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); ++ _MALI_OSK_LIST_FOREACHENTRY(group, tmp_group, &group_list_inactive, struct mali_group, executor_list) { ++ mali_group_clear_session(group); ++ } + -+ kbase_gpu_interrupt(kbdev, val); ++ _MALI_OSK_LIST_FOREACHENTRY(group, tmp_group, &group_list_disabled, struct mali_group, executor_list) { ++ mali_group_clear_session(group); ++ } + -+ return IRQ_HANDLED; ++ mali_executor_unlock(); +} + -+KBASE_EXPORT_TEST_API(kbase_gpu_irq_handler); -+ -+static irq_handler_t kbase_handler_table[] = { -+ [JOB_IRQ_TAG] = kbase_job_irq_handler, -+ [MMU_IRQ_TAG] = kbase_mmu_irq_handler, -+ [GPU_IRQ_TAG] = kbase_gpu_irq_handler, -+}; + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+#define JOB_IRQ_HANDLER JOB_IRQ_TAG -+#define MMU_IRQ_HANDLER MMU_IRQ_TAG -+#define GPU_IRQ_HANDLER GPU_IRQ_TAG ++void mali_executor_core_scaling_enable(void) ++{ ++ /* PS: Core scaling is by default enabled */ ++ core_scaling_enabled = MALI_TRUE; ++} + -+/** -+ * kbase_set_custom_irq_handler - Set a custom IRQ handler -+ * @kbdev: Device for which the handler is to be registered -+ * @custom_handler: Handler to be registered -+ * @irq_type: Interrupt type -+ * -+ * Registers given interrupt handler for requested interrupt type -+ * In the case where irq handler is not specified, the default handler shall be -+ * registered -+ * -+ * Return: 0 case success, error code otherwise -+ */ -+int kbase_set_custom_irq_handler(struct kbase_device *kbdev, -+ irq_handler_t custom_handler, -+ int irq_type) ++void mali_executor_core_scaling_disable(void) +{ -+ int result = 0; -+ irq_handler_t requested_irq_handler = NULL; ++ core_scaling_enabled = MALI_FALSE; ++} + -+ KBASE_DEBUG_ASSERT((JOB_IRQ_HANDLER <= irq_type) && -+ (GPU_IRQ_HANDLER >= irq_type)); ++mali_bool mali_executor_core_scaling_is_enabled(void) ++{ ++ return core_scaling_enabled; ++} + -+ /* Release previous handler */ -+ if (kbdev->irqs[irq_type].irq) -+ free_irq(kbdev->irqs[irq_type].irq, kbase_tag(kbdev, irq_type)); ++void mali_executor_group_enable(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); + -+ requested_irq_handler = (NULL != custom_handler) ? custom_handler : -+ kbase_handler_table[irq_type]; ++ mali_executor_lock(); + -+ if (0 != request_irq(kbdev->irqs[irq_type].irq, -+ requested_irq_handler, -+ kbdev->irqs[irq_type].flags | IRQF_SHARED, -+ dev_name(kbdev->dev), kbase_tag(kbdev, irq_type))) { -+ result = -EINVAL; -+ dev_err(kbdev->dev, "Can't request interrupt %d (index %d)\n", -+ kbdev->irqs[irq_type].irq, irq_type); -+#ifdef CONFIG_SPARSE_IRQ -+ dev_err(kbdev->dev, "You have CONFIG_SPARSE_IRQ support enabled - is the interrupt number correct for this configuration?\n"); -+#endif /* CONFIG_SPARSE_IRQ */ ++ if ((NULL != mali_group_get_gp_core(group) || NULL != mali_group_get_pp_core(group)) ++ && (mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED))) { ++ mali_executor_group_enable_internal(group); + } + -+ return result; -+} -+ -+KBASE_EXPORT_TEST_API(kbase_set_custom_irq_handler); -+ -+/* test correct interrupt assigment and reception by cpu */ -+struct kbasep_irq_test { -+ struct hrtimer timer; -+ wait_queue_head_t wait; -+ int triggered; -+ u32 timeout; -+}; -+ -+static struct kbasep_irq_test kbasep_irq_test_data; ++ mali_executor_schedule(); ++ mali_executor_unlock(); + -+#define IRQ_TEST_TIMEOUT 500 ++ _mali_osk_wq_schedule_work(executor_wq_notify_core_change); ++} + -+static irqreturn_t kbase_job_irq_test_handler(int irq, void *data) ++/* ++ * If a physical group is inactive or idle, we should disable it immediately, ++ * if group is in virtual, and virtual group is idle, disable given physical group in it. ++ */ ++void mali_executor_group_disable(struct mali_group *group) +{ -+ unsigned long flags; -+ struct kbase_device *kbdev = kbase_untag(data); -+ u32 val; ++ MALI_DEBUG_ASSERT_POINTER(group); + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); ++ mali_executor_lock(); + -+ if (!kbdev->pm.backend.gpu_powered) { -+ /* GPU is turned off - IRQ is not for us */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, -+ flags); -+ return IRQ_NONE; ++ if ((NULL != mali_group_get_gp_core(group) || NULL != mali_group_get_pp_core(group)) ++ && (!mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED))) { ++ mali_executor_group_disable_internal(group); + } + -+ val = kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_STATUS), NULL); ++ mali_executor_schedule(); ++ mali_executor_unlock(); + -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); ++ _mali_osk_wq_schedule_work(executor_wq_notify_core_change); ++} + -+ if (!val) -+ return IRQ_NONE; ++mali_bool mali_executor_group_is_disabled(struct mali_group *group) ++{ ++ /* NB: This function is not optimized for time critical usage */ + -+ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); ++ mali_bool ret; + -+ kbasep_irq_test_data.triggered = 1; -+ wake_up(&kbasep_irq_test_data.wait); ++ MALI_DEBUG_ASSERT_POINTER(group); + -+ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_CLEAR), val, NULL); ++ mali_executor_lock(); ++ ret = mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED); ++ mali_executor_unlock(); + -+ return IRQ_HANDLED; ++ return ret; +} + -+static irqreturn_t kbase_mmu_irq_test_handler(int irq, void *data) ++int mali_executor_set_perf_level(unsigned int target_core_nr, mali_bool override) +{ -+ unsigned long flags; -+ struct kbase_device *kbdev = kbase_untag(data); -+ u32 val; ++ if (target_core_nr == num_physical_pp_cores_enabled) return 0; ++ if (MALI_FALSE == core_scaling_enabled && MALI_FALSE == override) return -EPERM; ++ if (target_core_nr > num_physical_pp_cores_total) return -EINVAL; ++ if (0 == target_core_nr) return -EINVAL; + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); ++ mali_executor_core_scale(target_core_nr); + -+ if (!kbdev->pm.backend.gpu_powered) { -+ /* GPU is turned off - IRQ is not for us */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, -+ flags); -+ return IRQ_NONE; -+ } ++ _mali_osk_wq_schedule_work(executor_wq_notify_core_change); + -+ val = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_STATUS), NULL); ++ return 0; ++} + -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); ++#if MALI_STATE_TRACKING ++u32 mali_executor_dump_state(char *buf, u32 size) ++{ ++ int n = 0; ++ struct mali_group *group; ++ struct mali_group *temp; + -+ if (!val) -+ return IRQ_NONE; -+ -+ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); ++ mali_executor_lock(); + -+ kbasep_irq_test_data.triggered = 1; -+ wake_up(&kbasep_irq_test_data.wait); ++ switch (gp_group_state) { ++ case EXEC_STATE_INACTIVE: ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "GP group is in state INACTIVE\n"); ++ break; ++ case EXEC_STATE_IDLE: ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "GP group is in state IDLE\n"); ++ break; ++ case EXEC_STATE_WORKING: ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "GP group is in state WORKING\n"); ++ break; ++ default: ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "GP group is in unknown/illegal state %u\n", ++ gp_group_state); ++ break; ++ } + -+ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_CLEAR), val, NULL); ++ n += mali_group_dump_state(gp_group, buf + n, size - n); + -+ return IRQ_HANDLED; -+} ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "Physical PP groups in WORKING state (count = %u):\n", ++ group_list_working_count); + -+static enum hrtimer_restart kbasep_test_interrupt_timeout(struct hrtimer *timer) -+{ -+ struct kbasep_irq_test *test_data = container_of(timer, -+ struct kbasep_irq_test, timer); ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_working, struct mali_group, executor_list) { ++ n += mali_group_dump_state(group, buf + n, size - n); ++ } + -+ test_data->timeout = 1; -+ test_data->triggered = 1; -+ wake_up(&test_data->wait); -+ return HRTIMER_NORESTART; -+} ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "Physical PP groups in IDLE state (count = %u):\n", ++ group_list_idle_count); + -+static int kbasep_common_test_interrupt( -+ struct kbase_device * const kbdev, u32 tag) -+{ -+ int err = 0; -+ irq_handler_t test_handler; ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_idle, struct mali_group, executor_list) { ++ n += mali_group_dump_state(group, buf + n, size - n); ++ } + -+ u32 old_mask_val; -+ u16 mask_offset; -+ u16 rawstat_offset; ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "Physical PP groups in INACTIVE state (count = %u):\n", ++ group_list_inactive_count); + -+ switch (tag) { -+ case JOB_IRQ_TAG: -+ test_handler = kbase_job_irq_test_handler; -+ rawstat_offset = JOB_CONTROL_REG(JOB_IRQ_RAWSTAT); -+ mask_offset = JOB_CONTROL_REG(JOB_IRQ_MASK); -+ break; -+ case MMU_IRQ_TAG: -+ test_handler = kbase_mmu_irq_test_handler; -+ rawstat_offset = MMU_REG(MMU_IRQ_RAWSTAT); -+ mask_offset = MMU_REG(MMU_IRQ_MASK); -+ break; -+ case GPU_IRQ_TAG: -+ /* already tested by pm_driver - bail out */ -+ default: -+ return 0; ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_inactive, struct mali_group, executor_list) { ++ n += mali_group_dump_state(group, buf + n, size - n); + } + -+ /* store old mask */ -+ old_mask_val = kbase_reg_read(kbdev, mask_offset, NULL); -+ /* mask interrupts */ -+ kbase_reg_write(kbdev, mask_offset, 0x0, NULL); ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "Physical PP groups in DISABLED state (count = %u):\n", ++ group_list_disabled_count); + -+ if (kbdev->irqs[tag].irq) { -+ /* release original handler and install test handler */ -+ if (kbase_set_custom_irq_handler(kbdev, test_handler, tag) != 0) { -+ err = -EINVAL; -+ } else { -+ kbasep_irq_test_data.timeout = 0; -+ hrtimer_init(&kbasep_irq_test_data.timer, -+ CLOCK_MONOTONIC, HRTIMER_MODE_REL); -+ kbasep_irq_test_data.timer.function = -+ kbasep_test_interrupt_timeout; ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_disabled, struct mali_group, executor_list) { ++ n += mali_group_dump_state(group, buf + n, size - n); ++ } + -+ /* trigger interrupt */ -+ kbase_reg_write(kbdev, mask_offset, 0x1, NULL); -+ kbase_reg_write(kbdev, rawstat_offset, 0x1, NULL); ++ if (mali_executor_has_virtual_group()) { ++ switch (virtual_group_state) { ++ case EXEC_STATE_EMPTY: ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "Virtual PP group is in state EMPTY\n"); ++ break; ++ case EXEC_STATE_INACTIVE: ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "Virtual PP group is in state INACTIVE\n"); ++ break; ++ case EXEC_STATE_IDLE: ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "Virtual PP group is in state IDLE\n"); ++ break; ++ case EXEC_STATE_WORKING: ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "Virtual PP group is in state WORKING\n"); ++ break; ++ default: ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "Virtual PP group is in unknown/illegal state %u\n", ++ virtual_group_state); ++ break; ++ } + -+ hrtimer_start(&kbasep_irq_test_data.timer, -+ HR_TIMER_DELAY_MSEC(IRQ_TEST_TIMEOUT), -+ HRTIMER_MODE_REL); ++ n += mali_group_dump_state(virtual_group, buf + n, size - n); ++ } + -+ wait_event(kbasep_irq_test_data.wait, -+ kbasep_irq_test_data.triggered != 0); ++ mali_executor_unlock(); + -+ if (kbasep_irq_test_data.timeout != 0) { -+ dev_err(kbdev->dev, "Interrupt %d (index %d) didn't reach CPU.\n", -+ kbdev->irqs[tag].irq, tag); -+ err = -EINVAL; -+ } else { -+ dev_dbg(kbdev->dev, "Interrupt %d (index %d) reached CPU.\n", -+ kbdev->irqs[tag].irq, tag); -+ } ++ n += _mali_osk_snprintf(buf + n, size - n, "\n"); + -+ hrtimer_cancel(&kbasep_irq_test_data.timer); -+ kbasep_irq_test_data.triggered = 0; ++ return n; ++} ++#endif + -+ /* mask interrupts */ -+ kbase_reg_write(kbdev, mask_offset, 0x0, NULL); ++_mali_osk_errcode_t _mali_ukk_get_pp_number_of_cores(_mali_uk_get_pp_number_of_cores_s *args) ++{ ++ MALI_DEBUG_ASSERT_POINTER(args); ++ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); ++ args->number_of_total_cores = num_physical_pp_cores_total; ++ args->number_of_enabled_cores = num_physical_pp_cores_enabled; ++ return _MALI_OSK_ERR_OK; ++} + -+ /* release test handler */ -+ free_irq(kbdev->irqs[tag].irq, kbase_tag(kbdev, tag)); -+ } ++_mali_osk_errcode_t _mali_ukk_get_pp_core_version(_mali_uk_get_pp_core_version_s *args) ++{ ++ MALI_DEBUG_ASSERT_POINTER(args); ++ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); ++ args->version = pp_version; ++ return _MALI_OSK_ERR_OK; ++} + -+ /* restore original interrupt */ -+ if (request_irq(kbdev->irqs[tag].irq, kbase_handler_table[tag], -+ kbdev->irqs[tag].flags | IRQF_SHARED, -+ dev_name(kbdev->dev), kbase_tag(kbdev, tag))) { -+ dev_err(kbdev->dev, "Can't restore original interrupt %d (index %d)\n", -+ kbdev->irqs[tag].irq, tag); -+ err = -EINVAL; -+ } -+ } -+ /* restore old mask */ -+ kbase_reg_write(kbdev, mask_offset, old_mask_val, NULL); ++_mali_osk_errcode_t _mali_ukk_get_gp_number_of_cores(_mali_uk_get_gp_number_of_cores_s *args) ++{ ++ MALI_DEBUG_ASSERT_POINTER(args); ++ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); ++ args->number_of_cores = 1; ++ return _MALI_OSK_ERR_OK; ++} + -+ return err; ++_mali_osk_errcode_t _mali_ukk_get_gp_core_version(_mali_uk_get_gp_core_version_s *args) ++{ ++ MALI_DEBUG_ASSERT_POINTER(args); ++ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); ++ args->version = gp_version; ++ return _MALI_OSK_ERR_OK; +} + -+int kbasep_common_test_interrupt_handlers( -+ struct kbase_device * const kbdev) ++_mali_osk_errcode_t _mali_ukk_gp_suspend_response(_mali_uk_gp_suspend_response_s *args) +{ -+ int err; ++ struct mali_session_data *session; ++ struct mali_gp_job *job; + -+ init_waitqueue_head(&kbasep_irq_test_data.wait); -+ kbasep_irq_test_data.triggered = 0; ++ MALI_DEBUG_ASSERT_POINTER(args); ++ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); + -+ /* A suspend won't happen during startup/insmod */ -+ kbase_pm_context_active(kbdev); ++ session = (struct mali_session_data *)(uintptr_t)args->ctx; + -+ err = kbasep_common_test_interrupt(kbdev, JOB_IRQ_TAG); -+ if (err) { -+ dev_err(kbdev->dev, "Interrupt JOB_IRQ didn't reach CPU. Check interrupt assignments.\n"); -+ goto out; -+ } ++ if (_MALIGP_JOB_RESUME_WITH_NEW_HEAP == args->code) { ++ _mali_osk_notification_t *new_notification = NULL; + -+ err = kbasep_common_test_interrupt(kbdev, MMU_IRQ_TAG); -+ if (err) { -+ dev_err(kbdev->dev, "Interrupt MMU_IRQ didn't reach CPU. Check interrupt assignments.\n"); -+ goto out; -+ } ++ new_notification = _mali_osk_notification_create( ++ _MALI_NOTIFICATION_GP_STALLED, ++ sizeof(_mali_uk_gp_job_suspended_s)); + -+ dev_dbg(kbdev->dev, "Interrupts are correctly assigned.\n"); ++ if (NULL != new_notification) { ++ MALI_DEBUG_PRINT(3, ("Executor: Resuming job %u with new heap; 0x%08X - 0x%08X\n", ++ args->cookie, args->arguments[0], args->arguments[1])); + -+ out: -+ kbase_pm_context_idle(kbdev); ++ mali_executor_lock(); + -+ return err; -+} -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++ /* Resume the job in question if it is still running */ ++ job = mali_group_get_running_gp_job(gp_group); ++ if (NULL != job && ++ args->cookie == mali_gp_job_get_id(job) && ++ session == mali_gp_job_get_session(job)) { ++ /* ++ * Correct job is running, resume with new heap ++ */ + -+int kbase_install_interrupts(struct kbase_device *kbdev) -+{ -+ u32 nr = ARRAY_SIZE(kbase_handler_table); -+ int err; -+ u32 i; ++ mali_gp_job_set_oom_notification(job, ++ new_notification); + -+ for (i = 0; i < nr; i++) { -+ err = request_irq(kbdev->irqs[i].irq, kbase_handler_table[i], -+ kbdev->irqs[i].flags | IRQF_SHARED, -+ dev_name(kbdev->dev), -+ kbase_tag(kbdev, i)); -+ if (err) { -+ dev_err(kbdev->dev, "Can't request interrupt %d (index %d)\n", -+ kbdev->irqs[i].irq, i); -+#ifdef CONFIG_SPARSE_IRQ -+ dev_err(kbdev->dev, "You have CONFIG_SPARSE_IRQ support enabled - is the interrupt number correct for this configuration?\n"); -+#endif /* CONFIG_SPARSE_IRQ */ -+ goto release; ++ /* This will also re-enable interrupts */ ++ mali_group_resume_gp_with_new_heap(gp_group, ++ args->cookie, ++ args->arguments[0], ++ args->arguments[1]); ++ ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_OK; ++ } else { ++ MALI_DEBUG_PRINT(2, ("Executor: Unable to resume gp job becasue gp time out or any other unexpected reason!\n")); ++ ++ _mali_osk_notification_delete(new_notification); ++ ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ } else { ++ MALI_PRINT_ERROR(("Executor: Failed to allocate notification object. Will abort GP job.\n")); + } ++ } else { ++ MALI_DEBUG_PRINT(2, ("Executor: Aborting job %u, no new heap provided\n", args->cookie)); + } + -+ return 0; ++ mali_executor_lock(); + -+ release: -+ while (i-- > 0) -+ free_irq(kbdev->irqs[i].irq, kbase_tag(kbdev, i)); ++ /* Abort the job in question if it is still running */ ++ job = mali_group_get_running_gp_job(gp_group); ++ if (NULL != job && ++ args->cookie == mali_gp_job_get_id(job) && ++ session == mali_gp_job_get_session(job)) { ++ /* Correct job is still running */ ++ struct mali_gp_job *job_done = NULL; + -+ return err; -+} ++ mali_executor_complete_group(gp_group, MALI_FALSE, &job_done, NULL); + -+void kbase_release_interrupts(struct kbase_device *kbdev) -+{ -+ u32 nr = ARRAY_SIZE(kbase_handler_table); -+ u32 i; ++ /* The same job should have completed */ ++ MALI_DEBUG_ASSERT(job_done == job); + -+ for (i = 0; i < nr; i++) { -+ if (kbdev->irqs[i].irq) -+ free_irq(kbdev->irqs[i].irq, kbase_tag(kbdev, i)); ++ /* GP job completed, make sure it is freed */ ++ mali_scheduler_complete_gp_job(job_done, MALI_FALSE, ++ MALI_TRUE, MALI_TRUE); + } -+} -+ -+void kbase_synchronize_irqs(struct kbase_device *kbdev) -+{ -+ u32 nr = ARRAY_SIZE(kbase_handler_table); -+ u32 i; + -+ for (i = 0; i < nr; i++) { -+ if (kbdev->irqs[i].irq) -+ synchronize_irq(kbdev->irqs[i].irq); -+ } ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; +} + -+#endif /* !defined(CONFIG_MALI_BIFROST_NO_MALI) */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_as.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_as.c -new file mode 100755 -index 000000000000..c660c80341f4 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_as.c -@@ -0,0 +1,235 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ + +/* -+ * Register backend context / address space management ++ * ---------- Implementation of static functions ---------- + */ + -+#include -+#include -+#include -+ -+/** -+ * assign_and_activate_kctx_addr_space - Assign an AS to a context -+ * @kbdev: Kbase device -+ * @kctx: Kbase context -+ * @current_as: Address Space to assign -+ * -+ * Assign an Address Space (AS) to a context, and add the context to the Policy. -+ * -+ * This includes -+ * setting up the global runpool_irq structure and the context on the AS, -+ * Activating the MMU on the AS, -+ * Allowing jobs to be submitted on the AS. -+ * -+ * Context: -+ * kbasep_js_kctx_info.jsctx_mutex held, -+ * kbasep_js_device_data.runpool_mutex held, -+ * AS transaction mutex held, -+ * Runpool IRQ lock held -+ */ -+static void assign_and_activate_kctx_addr_space(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ struct kbase_as *current_as) ++void mali_executor_lock(void) +{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ -+ lockdep_assert_held(&kctx->jctx.sched_info.ctx.jsctx_mutex); -+ lockdep_assert_held(&js_devdata->runpool_mutex); -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ /* Attribute handling */ -+ kbasep_js_ctx_attr_runpool_retain_ctx(kbdev, kctx); -+ -+ /* Allow it to run jobs */ -+ kbasep_js_set_submit_allowed(js_devdata, kctx); -+ -+ kbase_js_runpool_inc_context_count(kbdev, kctx); ++ _mali_osk_spinlock_irq_lock(mali_executor_lock_obj); ++ MALI_DEBUG_PRINT(5, ("Executor: lock taken\n")); +} + -+bool kbase_backend_use_ctx_sched(struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++void mali_executor_unlock(void) +{ -+ int i; -+ -+ if (kbdev->hwaccess.active_kctx == kctx) { -+ /* Context is already active */ -+ return true; -+ } -+ -+ for (i = 0; i < kbdev->nr_hw_address_spaces; i++) { -+ if (kbdev->as_to_kctx[i] == kctx) { -+ /* Context already has ASID - mark as active */ -+ return true; -+ } -+ } -+ -+ /* Context does not have address space assigned */ -+ return false; ++ MALI_DEBUG_PRINT(5, ("Executor: Releasing lock\n")); ++ _mali_osk_spinlock_irq_unlock(mali_executor_lock_obj); +} + -+void kbase_backend_release_ctx_irq(struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++static mali_bool mali_executor_is_suspended(void *data) +{ -+ int as_nr = kctx->as_nr; ++ mali_bool ret; + -+ if (as_nr == KBASEP_AS_NR_INVALID) { -+ WARN(1, "Attempting to release context without ASID\n"); -+ return; -+ } ++ /* This callback does not use the data pointer. */ ++ MALI_IGNORE(data); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ mali_executor_lock(); + -+ if (atomic_read(&kctx->refcount) != 1) { -+ WARN(1, "Attempting to release active ASID\n"); -+ return; -+ } ++ ret = pause_count > 0 && !mali_executor_is_working(); + -+ kbasep_js_clear_submit_allowed(&kbdev->js_data, kctx); ++ mali_executor_unlock(); + -+ kbase_ctx_sched_release_ctx(kctx); -+ kbase_js_runpool_dec_context_count(kbdev, kctx); ++ return ret; +} + -+void kbase_backend_release_ctx_noirq(struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++static mali_bool mali_executor_is_working(void) +{ ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ ++ return (0 != group_list_working_count || ++ EXEC_STATE_WORKING == gp_group_state || ++ EXEC_STATE_WORKING == virtual_group_state); +} + -+int kbase_backend_find_and_release_free_address_space( -+ struct kbase_device *kbdev, struct kbase_context *kctx) ++static void mali_executor_disable_empty_virtual(void) +{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ unsigned long flags; -+ int i; ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(virtual_group_state != EXEC_STATE_EMPTY); ++ MALI_DEBUG_ASSERT(virtual_group_state != EXEC_STATE_WORKING); + -+ js_devdata = &kbdev->js_data; -+ js_kctx_info = &kctx->jctx.sched_info; ++ if (mali_group_is_empty(virtual_group)) { ++ virtual_group_state = EXEC_STATE_EMPTY; ++ } ++} + -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_lock(&js_devdata->runpool_mutex); ++static mali_bool mali_executor_physical_rejoin_virtual(struct mali_group *group) ++{ ++ mali_bool trigger_pm_update = MALI_FALSE; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ MALI_DEBUG_ASSERT_POINTER(group); ++ /* Only rejoining after job has completed (still active) */ ++ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_ACTIVE == ++ mali_group_get_state(group)); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(MALI_TRUE == mali_executor_has_virtual_group()); ++ MALI_DEBUG_ASSERT(MALI_FALSE == mali_group_is_virtual(group)); + -+ for (i = 0; i < kbdev->nr_hw_address_spaces; i++) { -+ struct kbasep_js_kctx_info *as_js_kctx_info; -+ struct kbase_context *as_kctx; ++ /* Make sure group and virtual group have same status */ + -+ as_kctx = kbdev->as_to_kctx[i]; -+ as_js_kctx_info = &as_kctx->jctx.sched_info; ++ if (MALI_GROUP_STATE_INACTIVE == mali_group_get_state(virtual_group)) { ++ if (mali_group_deactivate(group)) { ++ trigger_pm_update = MALI_TRUE; ++ } + -+ /* Don't release privileged or active contexts, or contexts with -+ * jobs running. -+ * Note that a context will have at least 1 reference (which -+ * was previously taken by kbasep_js_schedule_ctx()) until -+ * descheduled. ++ if (virtual_group_state == EXEC_STATE_EMPTY) { ++ virtual_group_state = EXEC_STATE_INACTIVE; ++ } ++ } else if (MALI_GROUP_STATE_ACTIVATION_PENDING == ++ mali_group_get_state(virtual_group)) { ++ /* ++ * Activation is pending for virtual group, leave ++ * this child group as active. + */ -+ if (as_kctx && !kbase_ctx_flag(as_kctx, KCTX_PRIVILEGED) && -+ atomic_read(&as_kctx->refcount) == 1) { -+ if (!kbasep_js_runpool_retain_ctx_nolock(kbdev, -+ as_kctx)) { -+ WARN(1, "Failed to retain active context\n"); ++ if (virtual_group_state == EXEC_STATE_EMPTY) { ++ virtual_group_state = EXEC_STATE_INACTIVE; ++ } ++ } else { ++ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_ACTIVE == ++ mali_group_get_state(virtual_group)); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, -+ flags); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ if (virtual_group_state == EXEC_STATE_EMPTY) { ++ virtual_group_state = EXEC_STATE_IDLE; ++ } ++ } + -+ return KBASEP_AS_NR_INVALID; -+ } ++ /* Remove group from idle list */ ++ MALI_DEBUG_ASSERT(mali_executor_group_is_in_state(group, ++ EXEC_STATE_IDLE)); ++ _mali_osk_list_delinit(&group->executor_list); ++ group_list_idle_count--; + -+ kbasep_js_clear_submit_allowed(js_devdata, as_kctx); ++ /* ++ * And finally rejoin the virtual group ++ * group will start working on same job as virtual_group, ++ * if virtual_group is working on a job ++ */ ++ mali_group_add_group(virtual_group, group); + -+ /* Drop and retake locks to take the jsctx_mutex on the -+ * context we're about to release without violating lock -+ * ordering -+ */ -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ return trigger_pm_update; ++} + ++static mali_bool mali_executor_has_virtual_group(void) ++{ ++#if (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) ++ return (NULL != virtual_group) ? MALI_TRUE : MALI_FALSE; ++#else ++ return MALI_FALSE; ++#endif /* (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) */ ++} + -+ /* Release context from address space */ -+ mutex_lock(&as_js_kctx_info->ctx.jsctx_mutex); -+ mutex_lock(&js_devdata->runpool_mutex); ++static mali_bool mali_executor_virtual_group_is_usable(void) ++{ ++#if (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ return ((EXEC_STATE_INACTIVE == virtual_group_state || ++ EXEC_STATE_IDLE == virtual_group_state) && (virtual_group->state != MALI_GROUP_STATE_ACTIVATION_PENDING)) ? ++ MALI_TRUE : MALI_FALSE; ++#else ++ return MALI_FALSE; ++#endif /* (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) */ ++} + -+ kbasep_js_runpool_release_ctx_nolock(kbdev, as_kctx); ++static mali_bool mali_executor_tackle_gp_bound(void) ++{ ++ struct mali_pp_job *job; + -+ if (!kbase_ctx_flag(as_kctx, KCTX_SCHEDULED)) { -+ kbasep_js_runpool_requeue_or_kill_ctx(kbdev, -+ as_kctx, -+ true); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ mutex_unlock(&js_devdata->runpool_mutex); -+ mutex_unlock(&as_js_kctx_info->ctx.jsctx_mutex); ++ job = mali_scheduler_job_pp_physical_peek(); + -+ return i; -+ } ++ if (NULL != job && MALI_TRUE == mali_is_mali400()) { ++ if (0 < group_list_working_count && ++ mali_pp_job_is_large_and_unstarted(job)) { ++ return MALI_TRUE; ++ } ++ } + -+ /* Context was retained while locks were dropped, -+ * continue looking for free AS */ ++ return MALI_FALSE; ++} + -+ mutex_unlock(&js_devdata->runpool_mutex); -+ mutex_unlock(&as_js_kctx_info->ctx.jsctx_mutex); ++static mali_bool mali_executor_schedule_is_early_out(mali_bool *gpu_secure_mode_is_needed) ++{ ++ struct mali_pp_job *next_pp_job_to_start = NULL; ++ struct mali_group *group; ++ struct mali_group *tmp_group; ++ struct mali_pp_job *physical_pp_job_working = NULL; ++ struct mali_pp_job *virtual_pp_job_working = NULL; ++ mali_bool gpu_working_in_protected_mode = MALI_FALSE; ++ mali_bool gpu_working_in_non_protected_mode = MALI_FALSE; + -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_lock(&js_devdata->runpool_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ } -+ } ++ MALI_DEBUG_ASSERT_LOCK_HELD(mali_scheduler_lock_obj); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ *gpu_secure_mode_is_needed = MALI_FALSE; + -+ mutex_unlock(&js_devdata->runpool_mutex); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ /* Check if the gpu secure mode is supported, exit if not.*/ ++ if (MALI_FALSE == _mali_osk_gpu_secure_mode_is_supported()) { ++ return MALI_FALSE; ++ } + -+ return KBASEP_AS_NR_INVALID; -+} ++ /* Check if need to set gpu secure mode for the next pp job, ++ * get the next pp job that will be scheduled if exist. ++ */ ++ next_pp_job_to_start = mali_scheduler_job_pp_next(); + -+bool kbase_backend_use_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int as_nr) -+{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbase_as *new_address_space = NULL; ++ /* Check current pp physical/virtual running job is protected job or not if exist.*/ ++ _MALI_OSK_LIST_FOREACHENTRY(group, tmp_group, &group_list_working, ++ struct mali_group, executor_list) { ++ physical_pp_job_working = group->pp_running_job; ++ break; ++ } + -+ js_devdata = &kbdev->js_data; ++ if (EXEC_STATE_WORKING == virtual_group_state) { ++ virtual_pp_job_working = virtual_group->pp_running_job; ++ } + -+ if (kbdev->hwaccess.active_kctx == kctx) { -+ WARN(1, "Context is already scheduled in\n"); -+ return false; ++ if (NULL != physical_pp_job_working) { ++ if (MALI_TRUE == mali_pp_job_is_protected_job(physical_pp_job_working)) { ++ gpu_working_in_protected_mode = MALI_TRUE; ++ } else { ++ gpu_working_in_non_protected_mode = MALI_TRUE; ++ } ++ } else if (NULL != virtual_pp_job_working) { ++ if (MALI_TRUE == mali_pp_job_is_protected_job(virtual_pp_job_working)) { ++ gpu_working_in_protected_mode = MALI_TRUE; ++ } else { ++ gpu_working_in_non_protected_mode = MALI_TRUE; ++ } ++ } else if (EXEC_STATE_WORKING == gp_group_state) { ++ gpu_working_in_non_protected_mode = MALI_TRUE; + } + -+ new_address_space = &kbdev->as[as_nr]; ++ /* If the next pp job is the protected pp job.*/ ++ if ((NULL != next_pp_job_to_start) && MALI_TRUE == mali_pp_job_is_protected_job(next_pp_job_to_start)) { ++ /* if gp is working or any non-protected pp job is working now, unable to schedule protected pp job. */ ++ if (MALI_TRUE == gpu_working_in_non_protected_mode) ++ return MALI_TRUE; + -+ lockdep_assert_held(&js_devdata->runpool_mutex); -+ lockdep_assert_held(&kbdev->mmu_hw_mutex); -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ *gpu_secure_mode_is_needed = MALI_TRUE; ++ return MALI_FALSE; + -+ assign_and_activate_kctx_addr_space(kbdev, kctx, new_address_space); ++ } + -+ if (kbase_ctx_flag(kctx, KCTX_PRIVILEGED)) { -+ /* We need to retain it to keep the corresponding address space -+ */ -+ kbasep_js_runpool_retain_ctx_nolock(kbdev, kctx); ++ if (MALI_TRUE == gpu_working_in_protected_mode) { ++ /* Unable to schedule non-protected pp job/gp job if exist protected pp running jobs*/ ++ return MALI_TRUE; + } + -+ return true; ++ return MALI_FALSE; +} -+ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_defs.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_defs.h -new file mode 100755 -index 000000000000..08a7400e66d5 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_defs.h -@@ -0,0 +1,123 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * This is where jobs are actually started. + */ ++static void mali_executor_schedule(void) ++{ ++ u32 i; ++ u32 num_physical_needed = 0; ++ u32 num_physical_to_process = 0; ++ mali_bool trigger_pm_update = MALI_FALSE; ++ mali_bool deactivate_idle_group = MALI_TRUE; ++ mali_bool gpu_secure_mode_is_needed = MALI_FALSE; ++ mali_bool is_gpu_secure_mode = MALI_FALSE; ++ /* Physical groups + jobs to start in this function */ ++ struct mali_group *groups_to_start[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS]; ++ struct mali_pp_job *jobs_to_start[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS]; ++ u32 sub_jobs_to_start[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS]; ++ int num_jobs_to_start = 0; + ++ /* Virtual job to start in this function */ ++ struct mali_pp_job *virtual_job_to_start = NULL; + ++ /* GP job to start in this function */ ++ struct mali_gp_job *gp_job_to_start = NULL; + ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+/* -+ * Register-based HW access backend specific definitions -+ */ ++ if (pause_count > 0) { ++ /* Execution is suspended, don't schedule any jobs. */ ++ return; ++ } + -+#ifndef _KBASE_HWACCESS_GPU_DEFS_H_ -+#define _KBASE_HWACCESS_GPU_DEFS_H_ ++ /* Lock needed in order to safely handle the job queues */ ++ mali_scheduler_lock(); + -+/* SLOT_RB_SIZE must be < 256 */ -+#define SLOT_RB_SIZE 2 -+#define SLOT_RB_MASK (SLOT_RB_SIZE - 1) ++ /* 1. Check the schedule if need to early out. */ ++ if (MALI_TRUE == mali_executor_schedule_is_early_out(&gpu_secure_mode_is_needed)) { ++ mali_scheduler_unlock(); ++ return; ++ } + -+/** -+ * struct rb_entry - Ringbuffer entry -+ * @katom: Atom associated with this entry -+ */ -+struct rb_entry { -+ struct kbase_jd_atom *katom; -+}; ++ /* 2. Activate gp firstly if have gp job queued. */ ++ if ((EXEC_STATE_INACTIVE == gp_group_state) ++ && (0 < mali_scheduler_job_gp_count()) ++ && (gpu_secure_mode_is_needed == MALI_FALSE)) { + -+/** -+ * struct slot_rb - Slot ringbuffer -+ * @entries: Ringbuffer entries -+ * @last_context: The last context to submit a job on this slot -+ * @read_idx: Current read index of buffer -+ * @write_idx: Current write index of buffer -+ * @job_chain_flag: Flag used to implement jobchain disambiguation -+ */ -+struct slot_rb { -+ struct rb_entry entries[SLOT_RB_SIZE]; ++ enum mali_group_state state = ++ mali_group_activate(gp_group); ++ if (MALI_GROUP_STATE_ACTIVE == state) { ++ /* Set GP group state to idle */ ++ gp_group_state = EXEC_STATE_IDLE; ++ } else { ++ trigger_pm_update = MALI_TRUE; ++ } ++ } + -+ struct kbase_context *last_context; ++ /* 3. Prepare as many physical groups as needed/possible */ + -+ u8 read_idx; -+ u8 write_idx; ++ num_physical_needed = mali_scheduler_job_physical_head_count(gpu_secure_mode_is_needed); + -+ u8 job_chain_flag; -+}; ++ /* On mali-450 platform, we don't need to enter in this block frequently. */ ++ if (0 < num_physical_needed) { + -+/** -+ * struct kbase_backend_data - GPU backend specific data for HW access layer -+ * @slot_rb: Slot ringbuffers -+ * @rmu_workaround_flag: When PRLAM-8987 is present, this flag determines -+ * whether slots 0/1 or slot 2 are currently being -+ * pulled from -+ * @scheduling_timer: The timer tick used for rescheduling jobs -+ * @timer_running: Is the timer running? The runpool_mutex must be -+ * held whilst modifying this. -+ * @suspend_timer: Is the timer suspended? Set when a suspend -+ * occurs and cleared on resume. The runpool_mutex -+ * must be held whilst modifying this. -+ * @reset_gpu: Set to a KBASE_RESET_xxx value (see comments) -+ * @reset_workq: Work queue for performing the reset -+ * @reset_work: Work item for performing the reset -+ * @reset_wait: Wait event signalled when the reset is complete -+ * @reset_timer: Timeout for soft-stops before the reset -+ * @timeouts_updated: Have timeout values just been updated? -+ * -+ * The hwaccess_lock (a spinlock) must be held when accessing this structure -+ */ -+struct kbase_backend_data { -+ struct slot_rb slot_rb[BASE_JM_MAX_NR_SLOTS]; ++ if (num_physical_needed <= group_list_idle_count) { ++ /* We have enough groups on idle list already */ ++ num_physical_to_process = num_physical_needed; ++ num_physical_needed = 0; ++ } else { ++ /* We need to get a hold of some more groups */ ++ num_physical_to_process = group_list_idle_count; ++ num_physical_needed -= group_list_idle_count; ++ } + -+ bool rmu_workaround_flag; ++ if (0 < num_physical_needed) { + -+ struct hrtimer scheduling_timer; ++ /* 3.1. Activate groups which are inactive */ + -+ bool timer_running; -+ bool suspend_timer; ++ struct mali_group *group; ++ struct mali_group *temp; + -+ atomic_t reset_gpu; ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_inactive, ++ struct mali_group, executor_list) { ++ enum mali_group_state state = ++ mali_group_activate(group); ++ if (MALI_GROUP_STATE_ACTIVE == state) { ++ /* Move from inactive to idle */ ++ mali_executor_change_state_pp_physical(group, ++ &group_list_inactive, ++ &group_list_inactive_count, ++ &group_list_idle, ++ &group_list_idle_count); ++ num_physical_to_process++; ++ } else { ++ trigger_pm_update = MALI_TRUE; ++ } + -+/* The GPU reset isn't pending */ -+#define KBASE_RESET_GPU_NOT_PENDING 0 -+/* kbase_prepare_to_reset_gpu has been called */ -+#define KBASE_RESET_GPU_PREPARED 1 -+/* kbase_reset_gpu has been called - the reset will now definitely happen -+ * within the timeout period */ -+#define KBASE_RESET_GPU_COMMITTED 2 -+/* The GPU reset process is currently occuring (timeout has expired or -+ * kbasep_try_reset_gpu_early was called) */ -+#define KBASE_RESET_GPU_HAPPENING 3 -+/* Reset the GPU silently, used when resetting the GPU as part of normal -+ * behavior (e.g. when exiting protected mode). */ -+#define KBASE_RESET_GPU_SILENT 4 -+ struct workqueue_struct *reset_workq; -+ struct work_struct reset_work; -+ wait_queue_head_t reset_wait; -+ struct hrtimer reset_timer; ++ num_physical_needed--; ++ if (0 == num_physical_needed) { ++ /* We have activated all the groups we need */ ++ break; ++ } ++ } ++ } + -+ bool timeouts_updated; -+}; ++ if (mali_executor_virtual_group_is_usable()) { + -+/** -+ * struct kbase_jd_atom_backend - GPU backend specific katom data -+ */ -+struct kbase_jd_atom_backend { -+}; ++ /* ++ * 3.2. And finally, steal and activate groups ++ * from virtual group if we need even more ++ */ ++ while (0 < num_physical_needed) { ++ struct mali_group *group; + -+/** -+ * struct kbase_context_backend - GPU backend specific context data -+ */ -+struct kbase_context_backend { -+}; ++ group = mali_group_acquire_group(virtual_group); ++ if (NULL != group) { ++ enum mali_group_state state; + -+#endif /* _KBASE_HWACCESS_GPU_DEFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_hw.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_hw.c -new file mode 100755 -index 000000000000..cbca5eac82f1 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_hw.c -@@ -0,0 +1,1512 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ mali_executor_disable_empty_virtual(); + ++ state = mali_group_activate(group); ++ if (MALI_GROUP_STATE_ACTIVE == state) { ++ /* Group is ready, add to idle list */ ++ _mali_osk_list_add( ++ &group->executor_list, ++ &group_list_idle); ++ group_list_idle_count++; ++ num_physical_to_process++; ++ } else { ++ /* ++ * Group is not ready yet, ++ * add to inactive list ++ */ ++ _mali_osk_list_add( ++ &group->executor_list, ++ &group_list_inactive); ++ group_list_inactive_count++; + ++ trigger_pm_update = MALI_TRUE; ++ } ++ num_physical_needed--; ++ } else { ++ /* ++ * We could not get enough groups ++ * from the virtual group. ++ */ ++ break; ++ } ++ } ++ } + -+/* -+ * Base kernel job manager APIs -+ */ ++ /* 3.3. Assign physical jobs to groups */ + -+#include -+#include -+#include -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++ if (0 < num_physical_to_process) { ++ struct mali_group *group; ++ struct mali_group *temp; + -+#define beenthere(kctx, f, a...) \ -+ dev_dbg(kctx->kbdev->dev, "%s:" f, __func__, ##a) ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_idle, ++ struct mali_group, executor_list) { ++ struct mali_pp_job *job = NULL; ++ u32 sub_job = MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS; + -+#if KBASE_GPU_RESET_EN -+static void kbasep_try_reset_gpu_early(struct kbase_device *kbdev); -+static void kbasep_reset_timeout_worker(struct work_struct *data); -+static enum hrtimer_restart kbasep_reset_timer_callback(struct hrtimer *timer); -+#endif /* KBASE_GPU_RESET_EN */ ++ MALI_DEBUG_ASSERT(num_jobs_to_start < ++ MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS); + -+static inline int kbasep_jm_is_js_free(struct kbase_device *kbdev, int js, -+ struct kbase_context *kctx) -+{ -+ return !kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_COMMAND_NEXT), kctx); -+} ++ MALI_DEBUG_ASSERT(0 < ++ mali_scheduler_job_physical_head_count(gpu_secure_mode_is_needed)); + -+void kbase_job_hw_submit(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, -+ int js) -+{ -+ struct kbase_context *kctx; -+ u32 cfg; -+ u64 jc_head = katom->jc; ++ /* If the next pp job is non-protected, check if gp bound now. */ ++ if ((MALI_FALSE == gpu_secure_mode_is_needed) ++ && (mali_executor_hint_is_enabled(MALI_EXECUTOR_HINT_GP_BOUND)) ++ && (MALI_TRUE == mali_executor_tackle_gp_bound())) { ++ /* ++ * We're gp bound, ++ * don't start this right now. ++ */ ++ deactivate_idle_group = MALI_FALSE; ++ num_physical_to_process = 0; ++ break; ++ } + -+ KBASE_DEBUG_ASSERT(kbdev); -+ KBASE_DEBUG_ASSERT(katom); ++ job = mali_scheduler_job_pp_physical_get( ++ &sub_job); + -+ kctx = katom->kctx; ++ if (MALI_FALSE == gpu_secure_mode_is_needed) { ++ MALI_DEBUG_ASSERT(MALI_FALSE == mali_pp_job_is_protected_job(job)); ++ } else { ++ MALI_DEBUG_ASSERT(MALI_TRUE == mali_pp_job_is_protected_job(job)); ++ } + -+ /* Command register must be available */ -+ KBASE_DEBUG_ASSERT(kbasep_jm_is_js_free(kbdev, js, kctx)); -+ /* Affinity is not violating */ -+ kbase_js_debug_log_current_affinities(kbdev); -+ KBASE_DEBUG_ASSERT(!kbase_js_affinity_would_violate(kbdev, js, -+ katom->affinity)); ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT(sub_job <= MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS); + -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_LO), -+ jc_head & 0xFFFFFFFF, kctx); -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_HI), -+ jc_head >> 32, kctx); ++ /* Put job + group on list of jobs to start later on */ + -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_AFFINITY_NEXT_LO), -+ katom->affinity & 0xFFFFFFFF, kctx); -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_AFFINITY_NEXT_HI), -+ katom->affinity >> 32, kctx); ++ groups_to_start[num_jobs_to_start] = group; ++ jobs_to_start[num_jobs_to_start] = job; ++ sub_jobs_to_start[num_jobs_to_start] = sub_job; ++ num_jobs_to_start++; + -+ /* start MMU, medium priority, cache clean/flush on end, clean/flush on -+ * start */ -+ cfg = kctx->as_nr; ++ /* Move group from idle to working */ ++ mali_executor_change_state_pp_physical(group, ++ &group_list_idle, ++ &group_list_idle_count, ++ &group_list_working, ++ &group_list_working_count); + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_FLUSH_REDUCTION) && -+ !(kbdev->serialize_jobs & KBASE_SERIALIZE_RESET)) -+ cfg |= JS_CONFIG_ENABLE_FLUSH_REDUCTION; ++ num_physical_to_process--; ++ if (0 == num_physical_to_process) { ++ /* Got all we needed */ ++ break; ++ } ++ } ++ } ++ } + -+ if (0 != (katom->core_req & BASE_JD_REQ_SKIP_CACHE_START)) -+ cfg |= JS_CONFIG_START_FLUSH_NO_ACTION; -+ else -+ cfg |= JS_CONFIG_START_FLUSH_CLEAN_INVALIDATE; ++ /* 4. Deactivate idle pp group , must put deactive here before active vitual group ++ * for cover case first only has physical job in normal queue but group inactive, ++ * so delay the job start go to active group, when group activated, ++ * call scheduler again, but now if we get high queue virtual job, ++ * we will do nothing in schedule cause executor schedule stop ++ */ + -+ if (0 != (katom->core_req & BASE_JD_REQ_SKIP_CACHE_END) && -+ !(kbdev->serialize_jobs & KBASE_SERIALIZE_RESET)) -+ cfg |= JS_CONFIG_END_FLUSH_NO_ACTION; -+ else -+ cfg |= JS_CONFIG_END_FLUSH_CLEAN_INVALIDATE; ++ if (MALI_TRUE == mali_executor_deactivate_list_idle(deactivate_idle_group ++ && (!mali_timeline_has_physical_pp_job()))) { ++ trigger_pm_update = MALI_TRUE; ++ } + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10649)) -+ cfg |= JS_CONFIG_START_MMU; ++ /* 5. Activate virtual group, if needed */ ++ if (EXEC_STATE_INACTIVE == virtual_group_state && ++ MALI_TRUE == mali_scheduler_job_next_is_virtual()) { ++ struct mali_pp_job *virtual_job = mali_scheduler_job_pp_virtual_peek(); ++ if ((MALI_FALSE == gpu_secure_mode_is_needed && MALI_FALSE == mali_pp_job_is_protected_job(virtual_job)) ++ || (MALI_TRUE == gpu_secure_mode_is_needed && MALI_TRUE == mali_pp_job_is_protected_job(virtual_job))) { ++ enum mali_group_state state = ++ mali_group_activate(virtual_group); ++ if (MALI_GROUP_STATE_ACTIVE == state) { ++ /* Set virtual group state to idle */ ++ virtual_group_state = EXEC_STATE_IDLE; ++ } else { ++ trigger_pm_update = MALI_TRUE; ++ } ++ } ++ } + -+ cfg |= JS_CONFIG_THREAD_PRI(8); ++ /* 6. To power up group asap, trigger pm update only when no need to swith the gpu mode. */ + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_MODE) && -+ (katom->atom_flags & KBASE_KATOM_FLAG_PROTECTED)) -+ cfg |= JS_CONFIG_DISABLE_DESCRIPTOR_WR_BK; ++ is_gpu_secure_mode = _mali_osk_gpu_secure_mode_is_enabled(); + -+ if (kbase_hw_has_feature(kbdev, -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION)) { -+ if (!kbdev->hwaccess.backend.slot_rb[js].job_chain_flag) { -+ cfg |= JS_CONFIG_JOB_CHAIN_FLAG; -+ katom->atom_flags |= KBASE_KATOM_FLAGS_JOBCHAIN; -+ kbdev->hwaccess.backend.slot_rb[js].job_chain_flag = -+ true; -+ } else { -+ katom->atom_flags &= ~KBASE_KATOM_FLAGS_JOBCHAIN; -+ kbdev->hwaccess.backend.slot_rb[js].job_chain_flag = -+ false; ++ if ((MALI_FALSE == gpu_secure_mode_is_needed && MALI_FALSE == is_gpu_secure_mode) ++ || (MALI_TRUE == gpu_secure_mode_is_needed && MALI_TRUE == is_gpu_secure_mode)) { ++ if (MALI_TRUE == trigger_pm_update) { ++ trigger_pm_update = MALI_FALSE; ++ mali_pm_update_async(); + } + } + -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_CONFIG_NEXT), cfg, kctx); ++ /* 7. Assign jobs to idle virtual group (or deactivate if no job) */ + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_FLUSH_REDUCTION)) -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_FLUSH_ID_NEXT), -+ katom->flush_id, kctx); ++ if (EXEC_STATE_IDLE == virtual_group_state) { ++ if (MALI_TRUE == mali_scheduler_job_next_is_virtual()) { ++ struct mali_pp_job *virtual_job = mali_scheduler_job_pp_virtual_peek(); ++ if ((MALI_FALSE == gpu_secure_mode_is_needed && MALI_FALSE == mali_pp_job_is_protected_job(virtual_job)) ++ || (MALI_TRUE == gpu_secure_mode_is_needed && MALI_TRUE == mali_pp_job_is_protected_job(virtual_job))) { ++ virtual_job_to_start = ++ mali_scheduler_job_pp_virtual_get(); ++ virtual_group_state = EXEC_STATE_WORKING; ++ } ++ } else if (!mali_timeline_has_virtual_pp_job()) { ++ virtual_group_state = EXEC_STATE_INACTIVE; + -+ /* Write an approximate start timestamp. -+ * It's approximate because there might be a job in the HEAD register. -+ */ -+ katom->start_timestamp = ktime_get(); ++ if (mali_group_deactivate(virtual_group)) { ++ trigger_pm_update = MALI_TRUE; ++ } ++ } ++ } + -+ /* GO ! */ -+ dev_dbg(kbdev->dev, "JS: Submitting atom %p from ctx %p to js[%d] with head=0x%llx, affinity=0x%llx", -+ katom, kctx, js, jc_head, katom->affinity); ++ /* 8. Assign job to idle GP group (or deactivate if no job) */ + -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, JM_SUBMIT, kctx, katom, jc_head, js, -+ (u32) katom->affinity); ++ if (EXEC_STATE_IDLE == gp_group_state && MALI_FALSE == gpu_secure_mode_is_needed) { ++ if (0 < mali_scheduler_job_gp_count()) { ++ gp_job_to_start = mali_scheduler_job_gp_get(); ++ gp_group_state = EXEC_STATE_WORKING; ++ } else if (!mali_timeline_has_gp_job()) { ++ gp_group_state = EXEC_STATE_INACTIVE; ++ if (mali_group_deactivate(gp_group)) { ++ trigger_pm_update = MALI_TRUE; ++ } ++ } ++ } + -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+ kbase_trace_mali_job_slots_event( -+ GATOR_MAKE_EVENT(GATOR_JOB_SLOT_START, js), -+ kctx, kbase_jd_atom_id(kctx, katom)); -+#endif -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_CONFIG(katom, jc_head, -+ katom->affinity, cfg); -+ KBASE_TLSTREAM_TL_RET_CTX_LPU( -+ kctx, -+ &kbdev->gpu_props.props.raw_props.js_features[ -+ katom->slot_nr]); -+ KBASE_TLSTREAM_TL_RET_ATOM_AS(katom, &kbdev->as[kctx->as_nr]); -+ KBASE_TLSTREAM_TL_RET_ATOM_LPU( -+ katom, -+ &kbdev->gpu_props.props.raw_props.js_features[js], -+ "ctx_nr,atom_nr"); -+#ifdef CONFIG_GPU_TRACEPOINTS -+ if (!kbase_backend_nr_atoms_submitted(kbdev, js)) { -+ /* If this is the only job on the slot, trace it as starting */ -+ char js_string[16]; ++ /* 9. We no longer need the schedule/queue lock */ + -+ trace_gpu_sched_switch( -+ kbasep_make_job_slot_string(js, js_string, -+ sizeof(js_string)), -+ ktime_to_ns(katom->start_timestamp), -+ (u32)katom->kctx->id, 0, katom->work_id); -+ kbdev->hwaccess.backend.slot_rb[js].last_context = katom->kctx; ++ mali_scheduler_unlock(); ++ ++ /* 10. start jobs */ ++ if (NULL != virtual_job_to_start) { ++ MALI_DEBUG_ASSERT(!mali_group_pp_is_active(virtual_group)); ++ mali_group_start_pp_job(virtual_group, ++ virtual_job_to_start, 0, is_gpu_secure_mode); + } -+#endif -+ kbase_timeline_job_slot_submit(kbdev, kctx, katom, js); + -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_COMMAND_NEXT), -+ JS_COMMAND_START, katom->kctx); -+} ++ for (i = 0; i < num_jobs_to_start; i++) { ++ MALI_DEBUG_ASSERT(!mali_group_pp_is_active( ++ groups_to_start[i])); ++ mali_group_start_pp_job(groups_to_start[i], ++ jobs_to_start[i], ++ sub_jobs_to_start[i], is_gpu_secure_mode); ++ } + -+/** -+ * kbasep_job_slot_update_head_start_timestamp - Update timestamp -+ * @kbdev: kbase device -+ * @js: job slot -+ * @end_timestamp: timestamp -+ * -+ * Update the start_timestamp of the job currently in the HEAD, based on the -+ * fact that we got an IRQ for the previous set of completed jobs. -+ * -+ * The estimate also takes into account the time the job was submitted, to -+ * work out the best estimate (which might still result in an over-estimate to -+ * the calculated time spent) -+ */ -+static void kbasep_job_slot_update_head_start_timestamp( -+ struct kbase_device *kbdev, -+ int js, -+ ktime_t end_timestamp) -+{ -+ if (kbase_backend_nr_atoms_on_slot(kbdev, js) > 0) { -+ struct kbase_jd_atom *katom; -+ ktime_t timestamp_diff; -+ /* The atom in the HEAD */ -+ katom = kbase_gpu_inspect(kbdev, js, 0); ++ MALI_DEBUG_ASSERT_POINTER(gp_group); + -+ KBASE_DEBUG_ASSERT(katom != NULL); ++ if (NULL != gp_job_to_start) { ++ MALI_DEBUG_ASSERT(!mali_group_gp_is_active(gp_group)); ++ mali_group_start_gp_job(gp_group, gp_job_to_start, is_gpu_secure_mode); ++ } + -+ timestamp_diff = ktime_sub(end_timestamp, -+ katom->start_timestamp); -+ if (ktime_to_ns(timestamp_diff) >= 0) { -+ /* Only update the timestamp if it's a better estimate -+ * than what's currently stored. This is because our -+ * estimate that accounts for the throttle time may be -+ * too much of an overestimate */ -+ katom->start_timestamp = end_timestamp; -+ } ++ /* 11. Trigger any pending PM updates */ ++ if (MALI_TRUE == trigger_pm_update) { ++ mali_pm_update_async(); + } +} + -+/** -+ * kbasep_trace_tl_event_lpu_softstop - Call event_lpu_softstop timeline -+ * tracepoint -+ * @kbdev: kbase device -+ * @js: job slot -+ * -+ * Make a tracepoint call to the instrumentation module informing that -+ * softstop happened on given lpu (job slot). -+ */ -+static void kbasep_trace_tl_event_lpu_softstop(struct kbase_device *kbdev, -+ int js) ++/* Handler for deferred schedule requests */ ++static void mali_executor_wq_schedule(void *arg) +{ -+ KBASE_TLSTREAM_TL_EVENT_LPU_SOFTSTOP( -+ &kbdev->gpu_props.props.raw_props.js_features[js]); ++ MALI_IGNORE(arg); ++ mali_executor_lock(); ++ mali_executor_schedule(); ++ mali_executor_unlock(); +} + -+void kbase_job_done(struct kbase_device *kbdev, u32 done) ++static void mali_executor_send_gp_oom_to_user(struct mali_gp_job *job) +{ -+ unsigned long flags; -+ int i; -+ u32 count = 0; -+ ktime_t end_timestamp = ktime_get(); -+ struct kbasep_js_device_data *js_devdata; ++ _mali_uk_gp_job_suspended_s *jobres; ++ _mali_osk_notification_t *notification; + -+ KBASE_DEBUG_ASSERT(kbdev); -+ js_devdata = &kbdev->js_data; ++ notification = mali_gp_job_get_oom_notification(job); + -+ KBASE_TRACE_ADD(kbdev, JM_IRQ, NULL, NULL, 0, done); ++ /* ++ * Remember the id we send to user space, so we have something to ++ * verify when we get a response ++ */ ++ gp_returned_cookie = mali_gp_job_get_id(job); + -+ memset(&kbdev->slot_submit_count_irq[0], 0, -+ sizeof(kbdev->slot_submit_count_irq)); ++ jobres = (_mali_uk_gp_job_suspended_s *)notification->result_buffer; ++ jobres->user_job_ptr = mali_gp_job_get_user_id(job); ++ jobres->cookie = gp_returned_cookie; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ mali_session_send_notification(mali_gp_job_get_session(job), ++ notification); ++} ++static struct mali_gp_job *mali_executor_complete_gp(struct mali_group *group, ++ mali_bool success) ++{ ++ struct mali_gp_job *job; + -+ while (done) { -+ u32 failed = done >> 16; ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ /* treat failed slots as finished slots */ -+ u32 finished = (done & 0xFFFF) | failed; ++ /* Extracts the needed HW status from core and reset */ ++ job = mali_group_complete_gp(group, success); + -+ /* Note: This is inherently unfair, as we always check -+ * for lower numbered interrupts before the higher -+ * numbered ones.*/ -+ i = ffs(finished) - 1; -+ KBASE_DEBUG_ASSERT(i >= 0); ++ MALI_DEBUG_ASSERT_POINTER(job); + -+ do { -+ int nr_done; -+ u32 active; -+ u32 completion_code = BASE_JD_EVENT_DONE;/* assume OK */ -+ u64 job_tail = 0; ++ /* Core is now ready to go into idle list */ ++ gp_group_state = EXEC_STATE_IDLE; + -+ if (failed & (1u << i)) { -+ /* read out the job slot status code if the job -+ * slot reported failure */ -+ completion_code = kbase_reg_read(kbdev, -+ JOB_SLOT_REG(i, JS_STATUS), NULL); ++ /* This will potentially queue more GP and PP jobs */ ++ mali_timeline_tracker_release(&job->tracker); + -+ switch (completion_code) { -+ case BASE_JD_EVENT_STOPPED: -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+ kbase_trace_mali_job_slots_event( -+ GATOR_MAKE_EVENT( -+ GATOR_JOB_SLOT_SOFT_STOPPED, i), -+ NULL, 0); -+#endif ++ /* Signal PP job */ ++ mali_gp_job_signal_pp_tracker(job, success); + -+ kbasep_trace_tl_event_lpu_softstop( -+ kbdev, i); ++ return job; ++} + -+ /* Soft-stopped job - read the value of -+ * JS_TAIL so that the job chain can -+ * be resumed */ -+ job_tail = (u64)kbase_reg_read(kbdev, -+ JOB_SLOT_REG(i, JS_TAIL_LO), -+ NULL) | -+ ((u64)kbase_reg_read(kbdev, -+ JOB_SLOT_REG(i, JS_TAIL_HI), -+ NULL) << 32); -+ break; -+ case BASE_JD_EVENT_NOT_STARTED: -+ /* PRLAM-10673 can cause a TERMINATED -+ * job to come back as NOT_STARTED, but -+ * the error interrupt helps us detect -+ * it */ -+ completion_code = -+ BASE_JD_EVENT_TERMINATED; -+ /* fall through */ -+ default: -+ dev_warn(kbdev->dev, "error detected from slot %d, job status 0x%08x (%s)", -+ i, completion_code, -+ kbase_exception_name -+ (kbdev, -+ completion_code)); -+ } ++static struct mali_pp_job *mali_executor_complete_pp(struct mali_group *group, ++ mali_bool success) ++{ ++ struct mali_pp_job *job; ++ u32 sub_job; ++ mali_bool job_is_done; + -+ kbase_gpu_irq_evict(kbdev, i); -+ } ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_CLEAR), -+ done & ((1 << i) | (1 << (i + 16))), -+ NULL); -+ active = kbase_reg_read(kbdev, -+ JOB_CONTROL_REG(JOB_IRQ_JS_STATE), -+ NULL); ++ /* Extracts the needed HW status from core and reset */ ++ job = mali_group_complete_pp(group, success, &sub_job); + -+ if (((active >> i) & 1) == 0 && -+ (((done >> (i + 16)) & 1) == 0)) { -+ /* There is a potential race we must work -+ * around: -+ * -+ * 1. A job slot has a job in both current and -+ * next registers -+ * 2. The job in current completes -+ * successfully, the IRQ handler reads -+ * RAWSTAT and calls this function with the -+ * relevant bit set in "done" -+ * 3. The job in the next registers becomes the -+ * current job on the GPU -+ * 4. Sometime before the JOB_IRQ_CLEAR line -+ * above the job on the GPU _fails_ -+ * 5. The IRQ_CLEAR clears the done bit but not -+ * the failed bit. This atomically sets -+ * JOB_IRQ_JS_STATE. However since both jobs -+ * have now completed the relevant bits for -+ * the slot are set to 0. -+ * -+ * If we now did nothing then we'd incorrectly -+ * assume that _both_ jobs had completed -+ * successfully (since we haven't yet observed -+ * the fail bit being set in RAWSTAT). -+ * -+ * So at this point if there are no active jobs -+ * left we check to see if RAWSTAT has a failure -+ * bit set for the job slot. If it does we know -+ * that there has been a new failure that we -+ * didn't previously know about, so we make sure -+ * that we record this in active (but we wait -+ * for the next loop to deal with it). -+ * -+ * If we were handling a job failure (i.e. done -+ * has the relevant high bit set) then we know -+ * that the value read back from -+ * JOB_IRQ_JS_STATE is the correct number of -+ * remaining jobs because the failed job will -+ * have prevented any futher jobs from starting -+ * execution. -+ */ -+ u32 rawstat = kbase_reg_read(kbdev, -+ JOB_CONTROL_REG(JOB_IRQ_RAWSTAT), NULL); ++ MALI_DEBUG_ASSERT_POINTER(job); + -+ if ((rawstat >> (i + 16)) & 1) { -+ /* There is a failed job that we've -+ * missed - add it back to active */ -+ active |= (1u << i); -+ } -+ } ++ /* Core is now ready to go into idle list */ ++ if (mali_group_is_virtual(group)) { ++ virtual_group_state = EXEC_STATE_IDLE; ++ } else { ++ /* Move from working to idle state */ ++ mali_executor_change_state_pp_physical(group, ++ &group_list_working, ++ &group_list_working_count, ++ &group_list_idle, ++ &group_list_idle_count); ++ } + -+ dev_dbg(kbdev->dev, "Job ended with status 0x%08X\n", -+ completion_code); ++ /* It is the executor module which owns the jobs themselves by now */ ++ mali_pp_job_mark_sub_job_completed(job, success); ++ job_is_done = mali_pp_job_is_complete(job); + -+ nr_done = kbase_backend_nr_atoms_submitted(kbdev, i); -+ nr_done -= (active >> i) & 1; -+ nr_done -= (active >> (i + 16)) & 1; ++ if (job_is_done) { ++ /* This will potentially queue more GP and PP jobs */ ++ mali_timeline_tracker_release(&job->tracker); ++ } + -+ if (nr_done <= 0) { -+ dev_warn(kbdev->dev, "Spurious interrupt on slot %d", -+ i); ++ return job; ++} + -+ goto spurious; -+ } ++static void mali_executor_complete_group(struct mali_group *group, ++ mali_bool success, ++ struct mali_gp_job **gp_job_done, ++ struct mali_pp_job **pp_job_done) ++{ ++ struct mali_gp_core *gp_core = mali_group_get_gp_core(group); ++ struct mali_pp_core *pp_core = mali_group_get_pp_core(group); ++ struct mali_gp_job *gp_job = NULL; ++ struct mali_pp_job *pp_job = NULL; ++ mali_bool pp_job_is_done = MALI_TRUE; + -+ count += nr_done; ++ if (NULL != gp_core) { ++ gp_job = mali_executor_complete_gp(group, success); ++ } else { ++ MALI_DEBUG_ASSERT_POINTER(pp_core); ++ MALI_IGNORE(pp_core); ++ pp_job = mali_executor_complete_pp(group, success); + -+ while (nr_done) { -+ if (nr_done == 1) { -+ kbase_gpu_complete_hw(kbdev, i, -+ completion_code, -+ job_tail, -+ &end_timestamp); -+ kbase_jm_try_kick_all(kbdev); -+ } else { -+ /* More than one job has completed. -+ * Since this is not the last job being -+ * reported this time it must have -+ * passed. This is because the hardware -+ * will not allow further jobs in a job -+ * slot to complete until the failed job -+ * is cleared from the IRQ status. -+ */ -+ kbase_gpu_complete_hw(kbdev, i, -+ BASE_JD_EVENT_DONE, -+ 0, -+ &end_timestamp); -+ } -+ nr_done--; -+ } -+ spurious: -+ done = kbase_reg_read(kbdev, -+ JOB_CONTROL_REG(JOB_IRQ_RAWSTAT), NULL); ++ pp_job_is_done = mali_pp_job_is_complete(pp_job); ++ } + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10883)) { -+ /* Workaround for missing interrupt caused by -+ * PRLAM-10883 */ -+ if (((active >> i) & 1) && (0 == -+ kbase_reg_read(kbdev, -+ JOB_SLOT_REG(i, -+ JS_STATUS), NULL))) { -+ /* Force job slot to be processed again -+ */ -+ done |= (1u << i); -+ } -+ } ++ if (pause_count > 0) { ++ /* Execution has been suspended */ + -+ failed = done >> 16; -+ finished = (done & 0xFFFF) | failed; -+ if (done) -+ end_timestamp = ktime_get(); -+ } while (finished & (1 << i)); ++ if (!mali_executor_is_working()) { ++ /* Last job completed, wake up sleepers */ ++ _mali_osk_wait_queue_wake_up( ++ executor_working_wait_queue); ++ } ++ } else if (MALI_TRUE == mali_group_disable_requested(group)) { ++ mali_executor_core_scale_in_group_complete(group); + -+ kbasep_job_slot_update_head_start_timestamp(kbdev, i, -+ end_timestamp); ++ mali_executor_schedule(); ++ } else { ++ /* try to schedule new jobs */ ++ mali_executor_schedule(); + } + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+#if KBASE_GPU_RESET_EN -+ if (atomic_read(&kbdev->hwaccess.backend.reset_gpu) == -+ KBASE_RESET_GPU_COMMITTED) { -+ /* If we're trying to reset the GPU then we might be able to do -+ * it early (without waiting for a timeout) because some jobs -+ * have completed -+ */ -+ kbasep_try_reset_gpu_early(kbdev); ++ if (NULL != gp_job) { ++ MALI_DEBUG_ASSERT_POINTER(gp_job_done); ++ *gp_job_done = gp_job; ++ } else if (pp_job_is_done) { ++ MALI_DEBUG_ASSERT_POINTER(pp_job); ++ MALI_DEBUG_ASSERT_POINTER(pp_job_done); ++ *pp_job_done = pp_job; + } -+#endif /* KBASE_GPU_RESET_EN */ -+ KBASE_TRACE_ADD(kbdev, JM_IRQ_END, NULL, NULL, 0, count); +} -+KBASE_EXPORT_TEST_API(kbase_job_done); + -+static bool kbasep_soft_stop_allowed(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) ++static void mali_executor_change_state_pp_physical(struct mali_group *group, ++ _mali_osk_list_t *old_list, ++ u32 *old_count, ++ _mali_osk_list_t *new_list, ++ u32 *new_count) +{ -+ bool soft_stops_allowed = true; ++ /* ++ * It's a bit more complicated to change the state for the physical PP ++ * groups since their state is determined by the list they are on. ++ */ ++#if defined(DEBUG) ++ mali_bool found = MALI_FALSE; ++ struct mali_group *group_iter; ++ struct mali_group *temp; ++ u32 old_counted = 0; ++ u32 new_counted = 0; + -+ if (kbase_jd_katom_is_protected(katom)) { -+ soft_stops_allowed = false; -+ } else if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8408)) { -+ if ((katom->core_req & BASE_JD_REQ_T) != 0) -+ soft_stops_allowed = false; ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(old_list); ++ MALI_DEBUG_ASSERT_POINTER(old_count); ++ MALI_DEBUG_ASSERT_POINTER(new_list); ++ MALI_DEBUG_ASSERT_POINTER(new_count); ++ ++ /* ++ * Verify that group is present on old list, ++ * and that the count is correct ++ */ ++ ++ _MALI_OSK_LIST_FOREACHENTRY(group_iter, temp, old_list, ++ struct mali_group, executor_list) { ++ old_counted++; ++ if (group == group_iter) { ++ found = MALI_TRUE; ++ } + } -+ return soft_stops_allowed; ++ ++ _MALI_OSK_LIST_FOREACHENTRY(group_iter, temp, new_list, ++ struct mali_group, executor_list) { ++ new_counted++; ++ } ++ ++ if (MALI_FALSE == found) { ++ if (old_list == &group_list_idle) { ++ MALI_DEBUG_PRINT(1, (" old Group list is idle,")); ++ } else if (old_list == &group_list_inactive) { ++ MALI_DEBUG_PRINT(1, (" old Group list is inactive,")); ++ } else if (old_list == &group_list_working) { ++ MALI_DEBUG_PRINT(1, (" old Group list is working,")); ++ } else if (old_list == &group_list_disabled) { ++ MALI_DEBUG_PRINT(1, (" old Group list is disable,")); ++ } ++ ++ if (MALI_TRUE == mali_executor_group_is_in_state(group, EXEC_STATE_WORKING)) { ++ MALI_DEBUG_PRINT(1, (" group in working \n")); ++ } else if (MALI_TRUE == mali_executor_group_is_in_state(group, EXEC_STATE_INACTIVE)) { ++ MALI_DEBUG_PRINT(1, (" group in inactive \n")); ++ } else if (MALI_TRUE == mali_executor_group_is_in_state(group, EXEC_STATE_IDLE)) { ++ MALI_DEBUG_PRINT(1, (" group in idle \n")); ++ } else if (MALI_TRUE == mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED)) { ++ MALI_DEBUG_PRINT(1, (" but group in disabled \n")); ++ } ++ } ++ ++ MALI_DEBUG_ASSERT(MALI_TRUE == found); ++ MALI_DEBUG_ASSERT(0 < (*old_count)); ++ MALI_DEBUG_ASSERT((*old_count) == old_counted); ++ MALI_DEBUG_ASSERT((*new_count) == new_counted); ++#endif ++ ++ _mali_osk_list_move(&group->executor_list, new_list); ++ (*old_count)--; ++ (*new_count)++; +} + -+static bool kbasep_hard_stop_allowed(struct kbase_device *kbdev, -+ base_jd_core_req core_reqs) ++static void mali_executor_set_state_pp_physical(struct mali_group *group, ++ _mali_osk_list_t *new_list, ++ u32 *new_count) +{ -+ bool hard_stops_allowed = true; ++ _mali_osk_list_add(&group->executor_list, new_list); ++ (*new_count)++; ++} + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8394)) { -+ if ((core_reqs & BASE_JD_REQ_T) != 0) -+ hard_stops_allowed = false; ++static mali_bool mali_executor_group_is_in_state(struct mali_group *group, ++ enum mali_executor_state_t state) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ ++ if (gp_group == group) { ++ if (gp_group_state == state) { ++ return MALI_TRUE; ++ } ++ } else if (virtual_group == group || mali_group_is_in_virtual(group)) { ++ if (virtual_group_state == state) { ++ return MALI_TRUE; ++ } ++ } else { ++ /* Physical PP group */ ++ struct mali_group *group_iter; ++ struct mali_group *temp; ++ _mali_osk_list_t *list; ++ ++ if (EXEC_STATE_DISABLED == state) { ++ list = &group_list_disabled; ++ } else if (EXEC_STATE_INACTIVE == state) { ++ list = &group_list_inactive; ++ } else if (EXEC_STATE_IDLE == state) { ++ list = &group_list_idle; ++ } else { ++ MALI_DEBUG_ASSERT(EXEC_STATE_WORKING == state); ++ list = &group_list_working; ++ } ++ ++ _MALI_OSK_LIST_FOREACHENTRY(group_iter, temp, list, ++ struct mali_group, executor_list) { ++ if (group_iter == group) { ++ return MALI_TRUE; ++ } ++ } + } -+ return hard_stops_allowed; ++ ++ /* group not in correct state */ ++ return MALI_FALSE; +} + -+void kbasep_job_slot_soft_or_hard_stop_do_action(struct kbase_device *kbdev, -+ int js, -+ u32 action, -+ base_jd_core_req core_reqs, -+ struct kbase_jd_atom *target_katom) ++static void mali_executor_group_enable_internal(struct mali_group *group) +{ -+ struct kbase_context *kctx = target_katom->kctx; -+#if KBASE_TRACE_ENABLE -+ u32 status_reg_before; -+ u64 job_in_head_before; -+ u32 status_reg_after; ++ MALI_DEBUG_ASSERT(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED)); + -+ KBASE_DEBUG_ASSERT(!(action & (~JS_COMMAND_MASK))); ++ /* Put into inactive state (== "lowest" enabled state) */ ++ if (group == gp_group) { ++ MALI_DEBUG_ASSERT(EXEC_STATE_DISABLED == gp_group_state); ++ gp_group_state = EXEC_STATE_INACTIVE; ++ } else { ++ mali_executor_change_state_pp_physical(group, ++ &group_list_disabled, ++ &group_list_disabled_count, ++ &group_list_inactive, ++ &group_list_inactive_count); + -+ /* Check the head pointer */ -+ job_in_head_before = ((u64) kbase_reg_read(kbdev, -+ JOB_SLOT_REG(js, JS_HEAD_LO), NULL)) -+ | (((u64) kbase_reg_read(kbdev, -+ JOB_SLOT_REG(js, JS_HEAD_HI), NULL)) -+ << 32); -+ status_reg_before = kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_STATUS), -+ NULL); -+#endif ++ ++num_physical_pp_cores_enabled; ++ MALI_DEBUG_PRINT(4, ("Enabling group id %d \n", group->pp_core->core_id)); ++ } + -+ if (action == JS_COMMAND_SOFT_STOP) { -+ bool soft_stop_allowed = kbasep_soft_stop_allowed(kbdev, -+ target_katom); ++ if (MALI_GROUP_STATE_ACTIVE == mali_group_activate(group)) { ++ MALI_DEBUG_ASSERT(MALI_TRUE == mali_group_power_is_on(group)); + -+ if (!soft_stop_allowed) { -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ dev_dbg(kbdev->dev, -+ "Attempt made to soft-stop a job that cannot be soft-stopped. core_reqs = 0x%X", -+ (unsigned int)core_reqs); -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+ return; ++ /* Move from inactive to idle */ ++ if (group == gp_group) { ++ gp_group_state = EXEC_STATE_IDLE; ++ } else { ++ mali_executor_change_state_pp_physical(group, ++ &group_list_inactive, ++ &group_list_inactive_count, ++ &group_list_idle, ++ &group_list_idle_count); ++ ++ if (mali_executor_has_virtual_group()) { ++ if (mali_executor_physical_rejoin_virtual(group)) { ++ mali_pm_update_async(); ++ } ++ } + } ++ } else { ++ mali_pm_update_async(); ++ } ++} + -+ /* We are about to issue a soft stop, so mark the atom as having -+ * been soft stopped */ -+ target_katom->atom_flags |= KBASE_KATOM_FLAG_BEEN_SOFT_STOPPPED; ++static void mali_executor_group_disable_internal(struct mali_group *group) ++{ ++ mali_bool working; + -+ /* Mark the point where we issue the soft-stop command */ -+ KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_ISSUE(target_katom); ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(!mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED)); + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8316)) { -+ int i; ++ working = mali_executor_group_is_in_state(group, EXEC_STATE_WORKING); ++ if (MALI_TRUE == working) { ++ /** Group to be disabled once it completes current work, ++ * when virtual group completes, also check child groups for this flag */ ++ mali_group_set_disable_request(group, MALI_TRUE); ++ return; ++ } + -+ for (i = 0; -+ i < kbase_backend_nr_atoms_submitted(kbdev, js); -+ i++) { -+ struct kbase_jd_atom *katom; ++ /* Put into disabled state */ ++ if (group == gp_group) { ++ /* GP group */ ++ MALI_DEBUG_ASSERT(EXEC_STATE_WORKING != gp_group_state); ++ gp_group_state = EXEC_STATE_DISABLED; ++ } else { ++ if (mali_group_is_in_virtual(group)) { ++ /* A child group of virtual group. move the specific group from virtual group */ ++ MALI_DEBUG_ASSERT(EXEC_STATE_WORKING != virtual_group_state); + -+ katom = kbase_gpu_inspect(kbdev, js, i); ++ mali_executor_set_state_pp_physical(group, ++ &group_list_disabled, ++ &group_list_disabled_count); + -+ KBASE_DEBUG_ASSERT(katom); ++ mali_group_remove_group(virtual_group, group); ++ mali_executor_disable_empty_virtual(); ++ } else { ++ mali_executor_change_group_status_disabled(group); ++ } + -+ /* For HW_ISSUE_8316, only 'bad' jobs attacking -+ * the system can cause this issue: normally, -+ * all memory should be allocated in multiples -+ * of 4 pages, and growable memory should be -+ * changed size in multiples of 4 pages. -+ * -+ * Whilst such 'bad' jobs can be cleared by a -+ * GPU reset, the locking up of a uTLB entry -+ * caused by the bad job could also stall other -+ * ASs, meaning that other ASs' jobs don't -+ * complete in the 'grace' period before the -+ * reset. We don't want to lose other ASs' jobs -+ * when they would normally complete fine, so we -+ * must 'poke' the MMU regularly to help other -+ * ASs complete */ -+ kbase_as_poking_timer_retain_atom( -+ kbdev, katom->kctx, katom); -+ } ++ --num_physical_pp_cores_enabled; ++ MALI_DEBUG_PRINT(4, ("Disabling group id %d \n", group->pp_core->core_id)); ++ } ++ ++ if (MALI_GROUP_STATE_INACTIVE != group->state) { ++ if (MALI_TRUE == mali_group_deactivate(group)) { ++ mali_pm_update_async(); + } ++ } ++} + -+ if (kbase_hw_has_feature( -+ kbdev, -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION)) { -+ action = (target_katom->atom_flags & -+ KBASE_KATOM_FLAGS_JOBCHAIN) ? -+ JS_COMMAND_SOFT_STOP_1 : -+ JS_COMMAND_SOFT_STOP_0; ++static void mali_executor_notify_core_change(u32 num_cores) ++{ ++ mali_bool done = MALI_FALSE; ++ ++ if (mali_is_mali450() || mali_is_mali470()) { ++ return; ++ } ++ ++ /* ++ * This function gets a bit complicated because we can't hold the session lock while ++ * allocating notification objects. ++ */ ++ while (!done) { ++ u32 i; ++ u32 num_sessions_alloc; ++ u32 num_sessions_with_lock; ++ u32 used_notification_objects = 0; ++ _mali_osk_notification_t **notobjs; ++ ++ /* Pre allocate the number of notifications objects we need right now (might change after lock has been taken) */ ++ num_sessions_alloc = mali_session_get_count(); ++ if (0 == num_sessions_alloc) { ++ /* No sessions to report to */ ++ return; + } -+ } else if (action == JS_COMMAND_HARD_STOP) { -+ bool hard_stop_allowed = kbasep_hard_stop_allowed(kbdev, -+ core_reqs); + -+ if (!hard_stop_allowed) { -+ /* Jobs can be hard-stopped for the following reasons: -+ * * CFS decides the job has been running too long (and -+ * soft-stop has not occurred). In this case the GPU -+ * will be reset by CFS if the job remains on the -+ * GPU. -+ * -+ * * The context is destroyed, kbase_jd_zap_context -+ * will attempt to hard-stop the job. However it also -+ * has a watchdog which will cause the GPU to be -+ * reset if the job remains on the GPU. -+ * -+ * * An (unhandled) MMU fault occurred. As long as -+ * BASE_HW_ISSUE_8245 is defined then the GPU will be -+ * reset. -+ * -+ * All three cases result in the GPU being reset if the -+ * hard-stop fails, so it is safe to just return and -+ * ignore the hard-stop request. -+ */ -+ dev_warn(kbdev->dev, -+ "Attempt made to hard-stop a job that cannot be hard-stopped. core_reqs = 0x%X", -+ (unsigned int)core_reqs); ++ notobjs = (_mali_osk_notification_t **)_mali_osk_malloc(sizeof(_mali_osk_notification_t *) * num_sessions_alloc); ++ if (NULL == notobjs) { ++ MALI_PRINT_ERROR(("Failed to notify user space session about num PP core change (alloc failure)\n")); ++ /* there is probably no point in trying again, system must be really low on memory and probably unusable now anyway */ + return; + } -+ target_katom->atom_flags |= KBASE_KATOM_FLAG_BEEN_HARD_STOPPED; + -+ if (kbase_hw_has_feature( -+ kbdev, -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION)) { -+ action = (target_katom->atom_flags & -+ KBASE_KATOM_FLAGS_JOBCHAIN) ? -+ JS_COMMAND_HARD_STOP_1 : -+ JS_COMMAND_HARD_STOP_0; ++ for (i = 0; i < num_sessions_alloc; i++) { ++ notobjs[i] = _mali_osk_notification_create(_MALI_NOTIFICATION_PP_NUM_CORE_CHANGE, sizeof(_mali_uk_pp_num_cores_changed_s)); ++ if (NULL != notobjs[i]) { ++ _mali_uk_pp_num_cores_changed_s *data = notobjs[i]->result_buffer; ++ data->number_of_enabled_cores = num_cores; ++ } else { ++ MALI_PRINT_ERROR(("Failed to notify user space session about num PP core change (alloc failure %u)\n", i)); ++ } + } -+ } + -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_COMMAND), action, kctx); ++ mali_session_lock(); + -+#if KBASE_TRACE_ENABLE -+ status_reg_after = kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_STATUS), -+ NULL); -+ if (status_reg_after == BASE_JD_EVENT_ACTIVE) { -+ struct kbase_jd_atom *head; -+ struct kbase_context *head_kctx; ++ /* number of sessions will not change while we hold the lock */ ++ num_sessions_with_lock = mali_session_get_count(); + -+ head = kbase_gpu_inspect(kbdev, js, 0); -+ head_kctx = head->kctx; ++ if (num_sessions_alloc >= num_sessions_with_lock) { ++ /* We have allocated enough notification objects for all the sessions atm */ ++ struct mali_session_data *session, *tmp; ++ MALI_SESSION_FOREACH(session, tmp, link) { ++ MALI_DEBUG_ASSERT(used_notification_objects < num_sessions_alloc); ++ if (NULL != notobjs[used_notification_objects]) { ++ mali_session_send_notification(session, notobjs[used_notification_objects]); ++ notobjs[used_notification_objects] = NULL; /* Don't track this notification object any more */ ++ } ++ used_notification_objects++; ++ } ++ done = MALI_TRUE; ++ } + -+ if (status_reg_before == BASE_JD_EVENT_ACTIVE) -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_CHECK_HEAD, head_kctx, -+ head, job_in_head_before, js); -+ else -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_CHECK_HEAD, NULL, NULL, -+ 0, js); ++ mali_session_unlock(); + -+ switch (action) { -+ case JS_COMMAND_SOFT_STOP: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP, head_kctx, -+ head, head->jc, js); -+ break; -+ case JS_COMMAND_SOFT_STOP_0: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP_0, head_kctx, -+ head, head->jc, js); -+ break; -+ case JS_COMMAND_SOFT_STOP_1: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP_1, head_kctx, -+ head, head->jc, js); -+ break; -+ case JS_COMMAND_HARD_STOP: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP, head_kctx, -+ head, head->jc, js); -+ break; -+ case JS_COMMAND_HARD_STOP_0: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP_0, head_kctx, -+ head, head->jc, js); -+ break; -+ case JS_COMMAND_HARD_STOP_1: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP_1, head_kctx, -+ head, head->jc, js); -+ break; -+ default: -+ BUG(); -+ break; ++ /* Delete any remaining/unused notification objects */ ++ for (; used_notification_objects < num_sessions_alloc; used_notification_objects++) { ++ if (NULL != notobjs[used_notification_objects]) { ++ _mali_osk_notification_delete(notobjs[used_notification_objects]); ++ } + } -+ } else { -+ if (status_reg_before == BASE_JD_EVENT_ACTIVE) -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_CHECK_HEAD, NULL, NULL, -+ job_in_head_before, js); -+ else -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_CHECK_HEAD, NULL, NULL, -+ 0, js); + -+ switch (action) { -+ case JS_COMMAND_SOFT_STOP: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP, NULL, NULL, 0, -+ js); -+ break; -+ case JS_COMMAND_SOFT_STOP_0: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP_0, NULL, NULL, -+ 0, js); -+ break; -+ case JS_COMMAND_SOFT_STOP_1: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP_1, NULL, NULL, -+ 0, js); -+ break; -+ case JS_COMMAND_HARD_STOP: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP, NULL, NULL, 0, -+ js); -+ break; -+ case JS_COMMAND_HARD_STOP_0: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP_0, NULL, NULL, -+ 0, js); -+ break; -+ case JS_COMMAND_HARD_STOP_1: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP_1, NULL, NULL, -+ 0, js); -+ break; -+ default: -+ BUG(); -+ break; -+ } ++ _mali_osk_free(notobjs); + } -+#endif +} + -+void kbase_backend_jm_kill_jobs_from_kctx(struct kbase_context *kctx) ++static mali_bool mali_executor_core_scaling_is_done(void *data) +{ -+ unsigned long flags; -+ struct kbase_device *kbdev; -+ int i; ++ u32 i; ++ u32 num_groups; ++ mali_bool ret = MALI_TRUE; + -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ kbdev = kctx->kbdev; -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ MALI_IGNORE(data); + -+ /* Cancel any remaining running jobs for this kctx */ -+ mutex_lock(&kctx->jctx.lock); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ mali_executor_lock(); + -+ /* Invalidate all jobs in context, to prevent re-submitting */ -+ for (i = 0; i < BASE_JD_ATOM_COUNT; i++) { -+ if (!work_pending(&kctx->jctx.atoms[i].work)) -+ kctx->jctx.atoms[i].event_code = -+ BASE_JD_EVENT_JOB_CANCELLED; -+ } ++ num_groups = mali_group_get_glob_num_groups(); + -+ for (i = 0; i < kbdev->gpu_props.num_job_slots; i++) -+ kbase_job_slot_hardstop(kctx, i, NULL); ++ for (i = 0; i < num_groups; i++) { ++ struct mali_group *group = mali_group_get_glob_group(i); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kctx->jctx.lock); ++ if (NULL != group) { ++ if (MALI_TRUE == group->disable_requested && NULL != mali_group_get_pp_core(group)) { ++ ret = MALI_FALSE; ++ break; ++ } ++ } ++ } ++ mali_executor_unlock(); ++ ++ return ret; +} + -+void kbase_job_slot_ctx_priority_check_locked(struct kbase_context *kctx, -+ struct kbase_jd_atom *target_katom) ++static void mali_executor_wq_notify_core_change(void *arg) +{ -+ struct kbase_device *kbdev; -+ int js = target_katom->slot_nr; -+ int priority = target_katom->sched_priority; -+ int i; -+ bool stop_sent = false; ++ MALI_IGNORE(arg); + -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ kbdev = kctx->kbdev; -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ if (mali_is_mali450() || mali_is_mali470()) { ++ return; ++ } + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ _mali_osk_wait_queue_wait_event(executor_notify_core_change_wait_queue, ++ mali_executor_core_scaling_is_done, NULL); + -+ for (i = 0; i < kbase_backend_nr_atoms_on_slot(kbdev, js); i++) { -+ struct kbase_jd_atom *katom; ++ mali_executor_notify_core_change(num_physical_pp_cores_enabled); ++} + -+ katom = kbase_gpu_inspect(kbdev, js, i); -+ if (!katom) -+ continue; ++/** ++ * Clear all disable request from the _last_ core scaling behavior. ++ */ ++static void mali_executor_core_scaling_reset(void) ++{ ++ u32 i; ++ u32 num_groups; + -+ if (katom->kctx != kctx) -+ continue; ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ if (katom->sched_priority > priority) { -+ if (!stop_sent) -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY_CHANGE( -+ target_katom); ++ num_groups = mali_group_get_glob_num_groups(); + -+ kbase_job_slot_softstop(kbdev, js, katom); -+ stop_sent = true; ++ for (i = 0; i < num_groups; i++) { ++ struct mali_group *group = mali_group_get_glob_group(i); ++ ++ if (NULL != group) { ++ group->disable_requested = MALI_FALSE; + } + } -+} + -+struct zap_reset_data { -+ /* The stages are: -+ * 1. The timer has never been called -+ * 2. The zap has timed out, all slots are soft-stopped - the GPU reset -+ * will happen. The GPU has been reset when -+ * kbdev->hwaccess.backend.reset_waitq is signalled -+ * -+ * (-1 - The timer has been cancelled) -+ */ -+ int stage; -+ struct kbase_device *kbdev; -+ struct hrtimer timer; -+ spinlock_t lock; /* protects updates to stage member */ -+}; ++ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { ++ core_scaling_delay_up_mask[i] = 0; ++ } ++} + -+static enum hrtimer_restart zap_timeout_callback(struct hrtimer *timer) ++static void mali_executor_core_scale(unsigned int target_core_nr) +{ -+ struct zap_reset_data *reset_data = container_of(timer, -+ struct zap_reset_data, timer); -+ struct kbase_device *kbdev = reset_data->kbdev; -+ unsigned long flags; ++ int current_core_scaling_mask[MALI_MAX_NUMBER_OF_DOMAINS] = { 0 }; ++ int target_core_scaling_mask[MALI_MAX_NUMBER_OF_DOMAINS] = { 0 }; ++ int i; + -+ spin_lock_irqsave(&reset_data->lock, flags); ++ MALI_DEBUG_ASSERT(0 < target_core_nr); ++ MALI_DEBUG_ASSERT(num_physical_pp_cores_total >= target_core_nr); + -+ if (reset_data->stage == -1) -+ goto out; ++ mali_executor_lock(); + -+#if KBASE_GPU_RESET_EN -+ if (kbase_prepare_to_reset_gpu(kbdev)) { -+ dev_err(kbdev->dev, "Issueing GPU soft-reset because jobs failed to be killed (within %d ms) as part of context termination (e.g. process exit)\n", -+ ZAP_TIMEOUT); -+ kbase_reset_gpu(kbdev); ++ if (target_core_nr < num_physical_pp_cores_enabled) { ++ MALI_DEBUG_PRINT(2, ("Requesting %d cores: disabling %d cores\n", target_core_nr, num_physical_pp_cores_enabled - target_core_nr)); ++ } else { ++ MALI_DEBUG_PRINT(2, ("Requesting %d cores: enabling %d cores\n", target_core_nr, target_core_nr - num_physical_pp_cores_enabled)); + } -+#endif /* KBASE_GPU_RESET_EN */ -+ reset_data->stage = 2; + -+ out: -+ spin_unlock_irqrestore(&reset_data->lock, flags); -+ -+ return HRTIMER_NORESTART; -+} ++ /* When a new core scaling request is comming, we should remove the un-doing ++ * part of the last core scaling request. It's safe because we have only one ++ * lock(executor lock) protection. */ ++ mali_executor_core_scaling_reset(); + -+void kbase_jm_wait_for_zero_jobs(struct kbase_context *kctx) -+{ -+ struct kbase_device *kbdev = kctx->kbdev; -+ struct zap_reset_data reset_data; -+ unsigned long flags; ++ mali_pm_get_best_power_cost_mask(num_physical_pp_cores_enabled, current_core_scaling_mask); ++ mali_pm_get_best_power_cost_mask(target_core_nr, target_core_scaling_mask); + -+ hrtimer_init_on_stack(&reset_data.timer, CLOCK_MONOTONIC, -+ HRTIMER_MODE_REL); -+ reset_data.timer.function = zap_timeout_callback; ++ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { ++ target_core_scaling_mask[i] = target_core_scaling_mask[i] - current_core_scaling_mask[i]; ++ MALI_DEBUG_PRINT(5, ("target_core_scaling_mask[%d] = %d\n", i, target_core_scaling_mask[i])); ++ } + -+ spin_lock_init(&reset_data.lock); ++ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { ++ if (0 > target_core_scaling_mask[i]) { ++ struct mali_pm_domain *domain; + -+ reset_data.kbdev = kbdev; -+ reset_data.stage = 1; ++ domain = mali_pm_domain_get_from_index(i); + -+ hrtimer_start(&reset_data.timer, HR_TIMER_DELAY_MSEC(ZAP_TIMEOUT), -+ HRTIMER_MODE_REL); ++ /* Domain is valid and has pp cores */ ++ if ((NULL != domain) && !(_mali_osk_list_empty(&domain->group_list))) { ++ struct mali_group *group; ++ struct mali_group *temp; + -+ /* Wait for all jobs to finish, and for the context to be not-scheduled -+ * (due to kbase_job_zap_context(), we also guarentee it's not in the JS -+ * policy queue either */ -+ wait_event(kctx->jctx.zero_jobs_wait, kctx->jctx.job_nr == 0); -+ wait_event(kctx->jctx.sched_info.ctx.is_scheduled_wait, -+ !kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &domain->group_list, struct mali_group, pm_domain_list) { ++ if (NULL != mali_group_get_pp_core(group) && (!mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED)) ++ && (!mali_group_is_virtual(group))) { ++ mali_executor_group_disable_internal(group); ++ target_core_scaling_mask[i]++; ++ if ((0 == target_core_scaling_mask[i])) { ++ break; ++ } + -+ spin_lock_irqsave(&reset_data.lock, flags); -+ if (reset_data.stage == 1) { -+ /* The timer hasn't run yet - so cancel it */ -+ reset_data.stage = -1; ++ } ++ } ++ } ++ } + } -+ spin_unlock_irqrestore(&reset_data.lock, flags); -+ -+ hrtimer_cancel(&reset_data.timer); + -+ if (reset_data.stage == 2) { -+ /* The reset has already started. -+ * Wait for the reset to complete ++ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { ++ /** ++ * Target_core_scaling_mask[i] is bigger than 0, ++ * means we need to enable some pp cores in ++ * this domain whose domain index is i. + */ -+ wait_event(kbdev->hwaccess.backend.reset_wait, -+ atomic_read(&kbdev->hwaccess.backend.reset_gpu) -+ == KBASE_RESET_GPU_NOT_PENDING); -+ } -+ destroy_hrtimer_on_stack(&reset_data.timer); ++ if (0 < target_core_scaling_mask[i]) { ++ struct mali_pm_domain *domain; + -+ dev_dbg(kbdev->dev, "Zap: Finished Context %p", kctx); ++ if (num_physical_pp_cores_enabled >= target_core_nr) { ++ break; ++ } + -+ /* Ensure that the signallers of the waitqs have finished */ -+ mutex_lock(&kctx->jctx.lock); -+ mutex_lock(&kctx->jctx.sched_info.ctx.jsctx_mutex); -+ mutex_unlock(&kctx->jctx.sched_info.ctx.jsctx_mutex); -+ mutex_unlock(&kctx->jctx.lock); -+} ++ domain = mali_pm_domain_get_from_index(i); + -+u32 kbase_backend_get_current_flush_id(struct kbase_device *kbdev) -+{ -+ u32 flush_id = 0; ++ /* Domain is valid and has pp cores */ ++ if ((NULL != domain) && !(_mali_osk_list_empty(&domain->group_list))) { ++ struct mali_group *group; ++ struct mali_group *temp; + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_FLUSH_REDUCTION)) { -+ mutex_lock(&kbdev->pm.lock); -+ if (kbdev->pm.backend.gpu_powered) -+ flush_id = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(LATEST_FLUSH), NULL); -+ mutex_unlock(&kbdev->pm.lock); ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &domain->group_list, struct mali_group, pm_domain_list) { ++ if (NULL != mali_group_get_pp_core(group) && mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED) ++ && (!mali_group_is_virtual(group))) { ++ mali_executor_group_enable_internal(group); ++ target_core_scaling_mask[i]--; ++ ++ if ((0 == target_core_scaling_mask[i]) || num_physical_pp_cores_enabled == target_core_nr) { ++ break; ++ } ++ } ++ } ++ } ++ } + } + -+ return flush_id; ++ /** ++ * Here, we may still have some pp cores not been enabled because of some ++ * pp cores need to be disabled are still in working state. ++ */ ++ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { ++ if (0 < target_core_scaling_mask[i]) { ++ core_scaling_delay_up_mask[i] = target_core_scaling_mask[i]; ++ } ++ } ++ ++ mali_executor_schedule(); ++ mali_executor_unlock(); +} + -+int kbase_job_slot_init(struct kbase_device *kbdev) ++static void mali_executor_core_scale_in_group_complete(struct mali_group *group) +{ -+#if KBASE_GPU_RESET_EN -+ kbdev->hwaccess.backend.reset_workq = alloc_workqueue( -+ "Mali reset workqueue", 0, 1); -+ if (NULL == kbdev->hwaccess.backend.reset_workq) -+ return -EINVAL; -+ -+ KBASE_DEBUG_ASSERT(0 == -+ object_is_on_stack(&kbdev->hwaccess.backend.reset_work)); -+ INIT_WORK(&kbdev->hwaccess.backend.reset_work, -+ kbasep_reset_timeout_worker); -+ -+ hrtimer_init(&kbdev->hwaccess.backend.reset_timer, CLOCK_MONOTONIC, -+ HRTIMER_MODE_REL); -+ kbdev->hwaccess.backend.reset_timer.function = -+ kbasep_reset_timer_callback; -+#endif ++ int num_pp_cores_disabled = 0; ++ int num_pp_cores_to_enable = 0; ++ int i; + -+ return 0; -+} -+KBASE_EXPORT_TEST_API(kbase_job_slot_init); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(MALI_TRUE == mali_group_disable_requested(group)); + -+void kbase_job_slot_halt(struct kbase_device *kbdev) -+{ -+ CSTD_UNUSED(kbdev); -+} ++ /* Disable child group of virtual group */ ++ if (mali_group_is_virtual(group)) { ++ struct mali_group *child; ++ struct mali_group *temp; + -+void kbase_job_slot_term(struct kbase_device *kbdev) -+{ -+#if KBASE_GPU_RESET_EN -+ destroy_workqueue(kbdev->hwaccess.backend.reset_workq); -+#endif -+} -+KBASE_EXPORT_TEST_API(kbase_job_slot_term); ++ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { ++ if (MALI_TRUE == mali_group_disable_requested(child)) { ++ mali_group_set_disable_request(child, MALI_FALSE); ++ mali_executor_group_disable_internal(child); ++ num_pp_cores_disabled++; ++ } ++ } ++ mali_group_set_disable_request(group, MALI_FALSE); ++ } else { ++ mali_executor_group_disable_internal(group); ++ mali_group_set_disable_request(group, MALI_FALSE); ++ if (NULL != mali_group_get_pp_core(group)) { ++ num_pp_cores_disabled++; ++ } ++ } + -+#if KBASE_GPU_RESET_EN -+/** -+ * kbasep_check_for_afbc_on_slot() - Check whether AFBC is in use on this slot -+ * @kbdev: kbase device pointer -+ * @kctx: context to check against -+ * @js: slot to check -+ * @target_katom: An atom to check, or NULL if all atoms from @kctx on -+ * slot @js should be checked -+ * -+ * This checks are based upon parameters that would normally be passed to -+ * kbase_job_slot_hardstop(). -+ * -+ * In the event of @target_katom being NULL, this will check the last jobs that -+ * are likely to be running on the slot to see if a) they belong to kctx, and -+ * so would be stopped, and b) whether they have AFBC -+ * -+ * In that case, It's guaranteed that a job currently executing on the HW with -+ * AFBC will be detected. However, this is a conservative check because it also -+ * detects jobs that have just completed too. -+ * -+ * Return: true when hard-stop _might_ stop an afbc atom, else false. -+ */ -+static bool kbasep_check_for_afbc_on_slot(struct kbase_device *kbdev, -+ struct kbase_context *kctx, int js, -+ struct kbase_jd_atom *target_katom) -+{ -+ bool ret = false; -+ int i; ++ num_pp_cores_to_enable = num_pp_cores_disabled; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { ++ if (0 < core_scaling_delay_up_mask[i]) { ++ struct mali_pm_domain *domain; + -+ /* When we have an atom the decision can be made straight away. */ -+ if (target_katom) -+ return !!(target_katom->core_req & BASE_JD_REQ_FS_AFBC); ++ if (0 == num_pp_cores_to_enable) { ++ break; ++ } + -+ /* Otherwise, we must chweck the hardware to see if it has atoms from -+ * this context with AFBC. */ -+ for (i = 0; i < kbase_backend_nr_atoms_on_slot(kbdev, js); i++) { -+ struct kbase_jd_atom *katom; ++ domain = mali_pm_domain_get_from_index(i); + -+ katom = kbase_gpu_inspect(kbdev, js, i); -+ if (!katom) -+ continue; ++ /* Domain is valid and has pp cores */ ++ if ((NULL != domain) && !(_mali_osk_list_empty(&domain->group_list))) { ++ struct mali_group *disabled_group; ++ struct mali_group *temp; + -+ /* Ignore atoms from other contexts, they won't be stopped when -+ * we use this for checking if we should hard-stop them */ -+ if (katom->kctx != kctx) -+ continue; ++ _MALI_OSK_LIST_FOREACHENTRY(disabled_group, temp, &domain->group_list, struct mali_group, pm_domain_list) { ++ if (NULL != mali_group_get_pp_core(disabled_group) && mali_executor_group_is_in_state(disabled_group, EXEC_STATE_DISABLED)) { ++ mali_executor_group_enable_internal(disabled_group); ++ core_scaling_delay_up_mask[i]--; ++ num_pp_cores_to_enable--; + -+ /* An atom on this slot and this context: check for AFBC */ -+ if (katom->core_req & BASE_JD_REQ_FS_AFBC) { -+ ret = true; -+ break; ++ if ((0 == core_scaling_delay_up_mask[i]) || 0 == num_pp_cores_to_enable) { ++ break; ++ } ++ } ++ } ++ } + } + } + -+ return ret; -+} -+#endif /* KBASE_GPU_RESET_EN */ -+ -+/** -+ * kbase_job_slot_softstop_swflags - Soft-stop a job with flags -+ * @kbdev: The kbase device -+ * @js: The job slot to soft-stop -+ * @target_katom: The job that should be soft-stopped (or NULL for any job) -+ * @sw_flags: Flags to pass in about the soft-stop -+ * -+ * Context: -+ * The job slot lock must be held when calling this function. -+ * The job slot must not already be in the process of being soft-stopped. -+ * -+ * Soft-stop the specified job slot, with extra information about the stop -+ * -+ * Where possible any job in the next register is evicted before the soft-stop. -+ */ -+void kbase_job_slot_softstop_swflags(struct kbase_device *kbdev, int js, -+ struct kbase_jd_atom *target_katom, u32 sw_flags) -+{ -+ KBASE_DEBUG_ASSERT(!(sw_flags & JS_COMMAND_MASK)); -+ kbase_backend_soft_hard_stop_slot(kbdev, NULL, js, target_katom, -+ JS_COMMAND_SOFT_STOP | sw_flags); ++ _mali_osk_wait_queue_wake_up(executor_notify_core_change_wait_queue); +} + -+/** -+ * kbase_job_slot_softstop - Soft-stop the specified job slot -+ * @kbdev: The kbase device -+ * @js: The job slot to soft-stop -+ * @target_katom: The job that should be soft-stopped (or NULL for any job) -+ * Context: -+ * The job slot lock must be held when calling this function. -+ * The job slot must not already be in the process of being soft-stopped. -+ * -+ * Where possible any job in the next register is evicted before the soft-stop. -+ */ -+void kbase_job_slot_softstop(struct kbase_device *kbdev, int js, -+ struct kbase_jd_atom *target_katom) ++static void mali_executor_change_group_status_disabled(struct mali_group *group) +{ -+ kbase_job_slot_softstop_swflags(kbdev, js, target_katom, 0u); -+} ++ /* Physical PP group */ ++ mali_bool idle; + -+/** -+ * kbase_job_slot_hardstop - Hard-stop the specified job slot -+ * @kctx: The kbase context that contains the job(s) that should -+ * be hard-stopped -+ * @js: The job slot to hard-stop -+ * @target_katom: The job that should be hard-stopped (or NULL for all -+ * jobs from the context) -+ * Context: -+ * The job slot lock must be held when calling this function. -+ */ -+void kbase_job_slot_hardstop(struct kbase_context *kctx, int js, -+ struct kbase_jd_atom *target_katom) -+{ -+ struct kbase_device *kbdev = kctx->kbdev; -+ bool stopped; -+#if KBASE_GPU_RESET_EN -+ /* We make the check for AFBC before evicting/stopping atoms. Note -+ * that no other thread can modify the slots whilst we have the -+ * hwaccess_lock. */ -+ int needs_workaround_for_afbc = -+ kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_T76X_3542) -+ && kbasep_check_for_afbc_on_slot(kbdev, kctx, js, -+ target_katom); -+#endif ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ stopped = kbase_backend_soft_hard_stop_slot(kbdev, kctx, js, -+ target_katom, -+ JS_COMMAND_HARD_STOP); -+#if KBASE_GPU_RESET_EN -+ if (stopped && (kbase_hw_has_issue(kctx->kbdev, BASE_HW_ISSUE_8401) || -+ kbase_hw_has_issue(kctx->kbdev, BASE_HW_ISSUE_9510) || -+ needs_workaround_for_afbc)) { -+ /* MIDBASE-2916 if a fragment job with AFBC encoding is -+ * hardstopped, ensure to do a soft reset also in order to -+ * clear the GPU status. -+ * Workaround for HW issue 8401 has an issue,so after -+ * hard-stopping just reset the GPU. This will ensure that the -+ * jobs leave the GPU.*/ -+ if (kbase_prepare_to_reset_gpu_locked(kbdev)) { -+ dev_err(kbdev->dev, "Issueing GPU soft-reset after hard stopping due to hardware issue"); -+ kbase_reset_gpu_locked(kbdev); -+ } ++ idle = mali_executor_group_is_in_state(group, EXEC_STATE_IDLE); ++ if (MALI_TRUE == idle) { ++ mali_executor_change_state_pp_physical(group, ++ &group_list_idle, ++ &group_list_idle_count, ++ &group_list_disabled, ++ &group_list_disabled_count); ++ } else { ++ mali_executor_change_state_pp_physical(group, ++ &group_list_inactive, ++ &group_list_inactive_count, ++ &group_list_disabled, ++ &group_list_disabled_count); + } -+#endif +} + -+/** -+ * kbase_job_check_enter_disjoint - potentiall enter disjoint mode -+ * @kbdev: kbase device -+ * @action: the event which has occurred -+ * @core_reqs: core requirements of the atom -+ * @target_katom: the atom which is being affected -+ * -+ * For a certain soft/hard-stop action, work out whether to enter disjoint -+ * state. -+ * -+ * This does not register multiple disjoint events if the atom has already -+ * started a disjoint period -+ * -+ * @core_reqs can be supplied as 0 if the atom had not started on the hardware -+ * (and so a 'real' soft/hard-stop was not required, but it still interrupted -+ * flow, perhaps on another context) -+ * -+ * kbase_job_check_leave_disjoint() should be used to end the disjoint -+ * state when the soft/hard-stop action is complete -+ */ -+void kbase_job_check_enter_disjoint(struct kbase_device *kbdev, u32 action, -+ base_jd_core_req core_reqs, struct kbase_jd_atom *target_katom) ++static mali_bool mali_executor_deactivate_list_idle(mali_bool deactivate_idle_group) +{ -+ u32 hw_action = action & JS_COMMAND_MASK; ++ mali_bool trigger_pm_update = MALI_FALSE; + -+ /* For hard-stop, don't enter if hard-stop not allowed */ -+ if (hw_action == JS_COMMAND_HARD_STOP && -+ !kbasep_hard_stop_allowed(kbdev, core_reqs)) -+ return; ++ if (group_list_idle_count > 0) { ++ if (mali_executor_has_virtual_group()) { + -+ /* For soft-stop, don't enter if soft-stop not allowed, or isn't -+ * causing disjoint */ -+ if (hw_action == JS_COMMAND_SOFT_STOP && -+ !(kbasep_soft_stop_allowed(kbdev, target_katom) && -+ (action & JS_COMMAND_SW_CAUSES_DISJOINT))) -+ return; ++ /* Rejoin virtual group on Mali-450 */ + -+ /* Nothing to do if already logged disjoint state on this atom */ -+ if (target_katom->atom_flags & KBASE_KATOM_FLAG_IN_DISJOINT) -+ return; ++ struct mali_group *group; ++ struct mali_group *temp; + -+ target_katom->atom_flags |= KBASE_KATOM_FLAG_IN_DISJOINT; -+ kbase_disjoint_state_up(kbdev); -+} ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, ++ &group_list_idle, ++ struct mali_group, executor_list) { ++ if (mali_executor_physical_rejoin_virtual( ++ group)) { ++ trigger_pm_update = MALI_TRUE; ++ } ++ } ++ } else if (deactivate_idle_group) { ++ struct mali_group *group; ++ struct mali_group *temp; + -+/** -+ * kbase_job_check_enter_disjoint - potentially leave disjoint state -+ * @kbdev: kbase device -+ * @target_katom: atom which is finishing -+ * -+ * Work out whether to leave disjoint state when finishing an atom that was -+ * originated by kbase_job_check_enter_disjoint(). -+ */ -+void kbase_job_check_leave_disjoint(struct kbase_device *kbdev, -+ struct kbase_jd_atom *target_katom) -+{ -+ if (target_katom->atom_flags & KBASE_KATOM_FLAG_IN_DISJOINT) { -+ target_katom->atom_flags &= ~KBASE_KATOM_FLAG_IN_DISJOINT; -+ kbase_disjoint_state_down(kbdev); ++ /* Deactivate group on Mali-300/400 */ ++ ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, ++ &group_list_idle, ++ struct mali_group, executor_list) { ++ if (mali_group_deactivate(group)) { ++ trigger_pm_update = MALI_TRUE; ++ } ++ ++ /* Move from idle to inactive */ ++ mali_executor_change_state_pp_physical(group, ++ &group_list_idle, ++ &group_list_idle_count, ++ &group_list_inactive, ++ &group_list_inactive_count); ++ } ++ } + } -+} + ++ return trigger_pm_update; ++} + -+#if KBASE_GPU_RESET_EN -+static void kbase_debug_dump_registers(struct kbase_device *kbdev) ++void mali_executor_running_status_print(void) +{ -+ int i; ++ struct mali_group *group = NULL; ++ struct mali_group *temp = NULL; + -+ kbase_io_history_dump(kbdev); ++ MALI_PRINT(("GP running job: %p\n", gp_group->gp_running_job)); ++ if ((gp_group->gp_core) && (gp_group->is_working)) { ++ mali_group_dump_status(gp_group); ++ } ++ MALI_PRINT(("Physical PP groups in WORKING state (count = %u):\n", group_list_working_count)); ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_working, struct mali_group, executor_list) { ++ MALI_PRINT(("PP running job: %p, subjob %d \n", group->pp_running_job, group->pp_running_sub_job)); ++ mali_group_dump_status(group); ++ } ++ MALI_PRINT(("Physical PP groups in INACTIVE state (count = %u):\n", group_list_inactive_count)); ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_inactive, struct mali_group, executor_list) { ++ MALI_PRINT(("\tPP status %d, SW power: %s\n", group->state, group->power_is_on ? "On" : "Off")); ++ MALI_PRINT(("\tPP #%d: %s\n", group->pp_core->core_id, group->pp_core->hw_core.description)); ++ } ++ MALI_PRINT(("Physical PP groups in IDLE state (count = %u):\n", group_list_idle_count)); ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_idle, struct mali_group, executor_list) { ++ MALI_PRINT(("\tPP status %d, SW power: %s\n", group->state, group->power_is_on ? "On" : "Off")); ++ MALI_PRINT(("\tPP #%d: %s\n", group->pp_core->core_id, group->pp_core->hw_core.description)); ++ } ++ MALI_PRINT(("Physical PP groups in DISABLED state (count = %u):\n", group_list_disabled_count)); ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_disabled, struct mali_group, executor_list) { ++ MALI_PRINT(("\tPP status %d, SW power: %s\n", group->state, group->power_is_on ? "On" : "Off")); ++ MALI_PRINT(("\tPP #%d: %s\n", group->pp_core->core_id, group->pp_core->hw_core.description)); ++ } + -+ dev_err(kbdev->dev, "Register state:"); -+ dev_err(kbdev->dev, " GPU_IRQ_RAWSTAT=0x%08x GPU_STATUS=0x%08x", -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_RAWSTAT), NULL), -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_STATUS), NULL)); -+ dev_err(kbdev->dev, " JOB_IRQ_RAWSTAT=0x%08x JOB_IRQ_JS_STATE=0x%08x", -+ kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_RAWSTAT), NULL), -+ kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_JS_STATE), NULL)); -+ for (i = 0; i < 3; i++) { -+ dev_err(kbdev->dev, " JS%d_STATUS=0x%08x JS%d_HEAD_LO=0x%08x", -+ i, kbase_reg_read(kbdev, JOB_SLOT_REG(i, JS_STATUS), -+ NULL), -+ i, kbase_reg_read(kbdev, JOB_SLOT_REG(i, JS_HEAD_LO), -+ NULL)); ++ if (mali_executor_has_virtual_group()) { ++ MALI_PRINT(("Virtual group running job: %p\n", virtual_group->pp_running_job)); ++ MALI_PRINT(("Virtual group status: %d\n", virtual_group_state)); ++ MALI_PRINT(("Virtual group->status: %d\n", virtual_group->state)); ++ MALI_PRINT(("\tSW power: %s\n", virtual_group->power_is_on ? "On" : "Off")); ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &virtual_group->group_list, ++ struct mali_group, group_list) { ++ int i = 0; ++ MALI_PRINT(("\tchild group(%s) running job: %p\n", group->pp_core->hw_core.description, group->pp_running_job)); ++ MALI_PRINT(("\tchild group(%s)->status: %d\n", group->pp_core->hw_core.description, group->state)); ++ MALI_PRINT(("\tchild group(%s) SW power: %s\n", group->pp_core->hw_core.description, group->power_is_on ? "On" : "Off")); ++ if (group->pm_domain) { ++ MALI_PRINT(("\tPower domain: id %u\n", mali_pm_domain_get_id(group->pm_domain))); ++ MALI_PRINT(("\tMask:0x%04x \n", mali_pm_domain_get_mask(group->pm_domain))); ++ MALI_PRINT(("\tUse-count:%u \n", mali_pm_domain_get_use_count(group->pm_domain))); ++ MALI_PRINT(("\tCurrent power status:%s \n", (mali_pm_domain_get_mask(group->pm_domain)& mali_pm_get_current_mask()) ? "On" : "Off")); ++ MALI_PRINT(("\tWanted power status:%s \n", (mali_pm_domain_get_mask(group->pm_domain)& mali_pm_get_wanted_mask()) ? "On" : "Off")); ++ } ++ ++ for (i = 0; i < 2; i++) { ++ if (NULL != group->l2_cache_core[i]) { ++ struct mali_pm_domain *domain; ++ domain = mali_l2_cache_get_pm_domain(group->l2_cache_core[i]); ++ MALI_PRINT(("\t L2(index %d) group SW power: %s\n", i, group->l2_cache_core[i]->power_is_on ? "On" : "Off")); ++ if (domain) { ++ MALI_PRINT(("\tL2 Power domain: id %u\n", mali_pm_domain_get_id(domain))); ++ MALI_PRINT(("\tL2 Mask:0x%04x \n", mali_pm_domain_get_mask(domain))); ++ MALI_PRINT(("\tL2 Use-count:%u \n", mali_pm_domain_get_use_count(domain))); ++ MALI_PRINT(("\tL2 Current power status:%s \n", (mali_pm_domain_get_mask(domain) & mali_pm_get_current_mask()) ? "On" : "Off")); ++ MALI_PRINT(("\tL2 Wanted power status:%s \n", (mali_pm_domain_get_mask(domain) & mali_pm_get_wanted_mask()) ? "On" : "Off")); ++ } ++ } ++ } ++ } ++ if (EXEC_STATE_WORKING == virtual_group_state) { ++ mali_group_dump_status(virtual_group); ++ } + } -+ dev_err(kbdev->dev, " MMU_IRQ_RAWSTAT=0x%08x GPU_FAULTSTATUS=0x%08x", -+ kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_RAWSTAT), NULL), -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_FAULTSTATUS), NULL)); -+ dev_err(kbdev->dev, " GPU_IRQ_MASK=0x%08x JOB_IRQ_MASK=0x%08x MMU_IRQ_MASK=0x%08x", -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), NULL), -+ kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_MASK), NULL), -+ kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_MASK), NULL)); -+ dev_err(kbdev->dev, " PWR_OVERRIDE0=0x%08x PWR_OVERRIDE1=0x%08x", -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(PWR_OVERRIDE0), NULL), -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(PWR_OVERRIDE1), NULL)); -+ dev_err(kbdev->dev, " SHADER_CONFIG=0x%08x L2_MMU_CONFIG=0x%08x", -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(SHADER_CONFIG), NULL), -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(L2_MMU_CONFIG), NULL)); -+ dev_err(kbdev->dev, " TILER_CONFIG=0x%08x JM_CONFIG=0x%08x", -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(TILER_CONFIG), NULL), -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(JM_CONFIG), NULL)); +} + -+static void kbasep_reset_timeout_worker(struct work_struct *data) ++void mali_executor_status_dump(void) +{ -+ unsigned long flags; -+ struct kbase_device *kbdev; -+ ktime_t end_timestamp = ktime_get(); -+ struct kbasep_js_device_data *js_devdata; -+ bool try_schedule = false; -+ bool silent = false; -+ u32 max_loops = KBASE_CLEAN_CACHE_MAX_LOOPS; -+ -+ KBASE_DEBUG_ASSERT(data); -+ -+ kbdev = container_of(data, struct kbase_device, -+ hwaccess.backend.reset_work); ++ mali_executor_lock(); ++ mali_scheduler_lock(); + -+ KBASE_DEBUG_ASSERT(kbdev); -+ js_devdata = &kbdev->js_data; ++ /* print schedule queue status */ ++ mali_scheduler_gp_pp_job_queue_print(); + -+ if (atomic_read(&kbdev->hwaccess.backend.reset_gpu) == -+ KBASE_RESET_GPU_SILENT) -+ silent = true; ++ mali_scheduler_unlock(); ++ mali_executor_unlock(); ++} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_executor.h b/drivers/gpu/arm/mali400/mali/common/mali_executor.h +new file mode 100755 +index 000000000..4224d6a6c +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.h +@@ -0,0 +1,102 @@ ++/* ++ * Copyright (C) 2012, 2014-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ KBASE_TRACE_ADD(kbdev, JM_BEGIN_RESET_WORKER, NULL, NULL, 0u, 0); ++#ifndef __MALI_EXECUTOR_H__ ++#define __MALI_EXECUTOR_H__ + -+ /* Suspend vinstr. -+ * This call will block until vinstr is suspended. */ -+ kbase_vinstr_suspend(kbdev->vinstr_ctx); ++#include "mali_osk.h" ++#include "mali_scheduler_types.h" ++#include "mali_kernel_common.h" + -+ /* Make sure the timer has completed - this cannot be done from -+ * interrupt context, so this cannot be done within -+ * kbasep_try_reset_gpu_early. */ -+ hrtimer_cancel(&kbdev->hwaccess.backend.reset_timer); ++typedef enum { ++ MALI_EXECUTOR_HINT_GP_BOUND = 0 ++#define MALI_EXECUTOR_HINT_MAX 1 ++} mali_executor_hint; + -+ if (kbase_pm_context_active_handle_suspend(kbdev, -+ KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE)) { -+ /* This would re-activate the GPU. Since it's already idle, -+ * there's no need to reset it */ -+ atomic_set(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_NOT_PENDING); -+ kbase_disjoint_state_down(kbdev); -+ wake_up(&kbdev->hwaccess.backend.reset_wait); -+ kbase_vinstr_resume(kbdev->vinstr_ctx); -+ return; -+ } ++extern mali_bool mali_executor_hints[MALI_EXECUTOR_HINT_MAX]; + -+ KBASE_DEBUG_ASSERT(kbdev->irq_reset_flush == false); ++/* forward declare struct instead of using include */ ++struct mali_session_data; ++struct mali_group; ++struct mali_pp_core; + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ spin_lock(&kbdev->hwaccess_lock); -+ spin_lock(&kbdev->mmu_mask_change); -+ /* We're about to flush out the IRQs and their bottom half's */ -+ kbdev->irq_reset_flush = true; ++extern _mali_osk_spinlock_irq_t *mali_executor_lock_obj; + -+ /* Disable IRQ to avoid IRQ handlers to kick in after releasing the -+ * spinlock; this also clears any outstanding interrupts */ -+ kbase_pm_disable_interrupts_nolock(kbdev); ++#define MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD() MALI_DEBUG_ASSERT_LOCK_HELD(mali_executor_lock_obj); + -+ spin_unlock(&kbdev->mmu_mask_change); -+ spin_unlock(&kbdev->hwaccess_lock); -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++_mali_osk_errcode_t mali_executor_initialize(void); ++void mali_executor_terminate(void); + -+ /* Ensure that any IRQ handlers have finished -+ * Must be done without any locks IRQ handlers will take */ -+ kbase_synchronize_irqs(kbdev); ++void mali_executor_populate(void); ++void mali_executor_depopulate(void); + -+ /* Flush out any in-flight work items */ -+ kbase_flush_mmu_wqs(kbdev); ++void mali_executor_suspend(void); ++void mali_executor_resume(void); + -+ /* The flush has completed so reset the active indicator */ -+ kbdev->irq_reset_flush = false; ++u32 mali_executor_get_num_cores_total(void); ++u32 mali_executor_get_num_cores_enabled(void); ++struct mali_pp_core *mali_executor_get_virtual_pp(void); ++struct mali_group *mali_executor_get_virtual_group(void); + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TMIX_8463)) { -+ /* Ensure that L2 is not transitioning when we send the reset -+ * command */ -+ while (--max_loops && kbase_pm_get_trans_cores(kbdev, -+ KBASE_PM_CORE_L2)) -+ ; ++void mali_executor_zap_all_active(struct mali_session_data *session); + -+ WARN(!max_loops, "L2 power transition timed out while trying to reset\n"); -+ } ++/** ++ * Schedule GP and PP according to bitmask. ++ * ++ * @param mask A scheduling bitmask. ++ * @param deferred_schedule MALI_TRUE if schedule should be deferred, MALI_FALSE if not. ++ */ ++void mali_executor_schedule_from_mask(mali_scheduler_mask mask, mali_bool deferred_schedule); + -+ mutex_lock(&kbdev->pm.lock); -+ /* We hold the pm lock, so there ought to be a current policy */ -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.pm_current_policy); ++_mali_osk_errcode_t mali_executor_interrupt_gp(struct mali_group *group, mali_bool in_upper_half); ++_mali_osk_errcode_t mali_executor_interrupt_pp(struct mali_group *group, mali_bool in_upper_half); ++_mali_osk_errcode_t mali_executor_interrupt_mmu(struct mali_group *group, mali_bool in_upper_half); ++void mali_executor_group_power_up(struct mali_group *groups[], u32 num_groups); ++void mali_executor_group_power_down(struct mali_group *groups[], u32 num_groups); + -+ /* All slot have been soft-stopped and we've waited -+ * SOFT_STOP_RESET_TIMEOUT for the slots to clear, at this point we -+ * assume that anything that is still left on the GPU is stuck there and -+ * we'll kill it when we reset the GPU */ ++void mali_executor_abort_session(struct mali_session_data *session); + -+ if (!silent) -+ dev_err(kbdev->dev, "Resetting GPU (allowing up to %d ms)", -+ RESET_TIMEOUT); ++void mali_executor_core_scaling_enable(void); ++void mali_executor_core_scaling_disable(void); ++mali_bool mali_executor_core_scaling_is_enabled(void); + -+ /* Output the state of some interesting registers to help in the -+ * debugging of GPU resets */ -+ if (!silent) -+ kbase_debug_dump_registers(kbdev); ++void mali_executor_group_enable(struct mali_group *group); ++void mali_executor_group_disable(struct mali_group *group); ++mali_bool mali_executor_group_is_disabled(struct mali_group *group); + -+ /* Complete any jobs that were still on the GPU */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbdev->protected_mode = false; -+ kbase_backend_reset(kbdev, &end_timestamp); -+ kbase_pm_metrics_update(kbdev, NULL); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++int mali_executor_set_perf_level(unsigned int target_core_nr, mali_bool override); + -+ /* Reset the GPU */ -+ kbase_pm_init_hw(kbdev, 0); ++#if MALI_STATE_TRACKING ++u32 mali_executor_dump_state(char *buf, u32 size); ++#endif + -+ mutex_unlock(&kbdev->pm.lock); ++MALI_STATIC_INLINE void mali_executor_hint_enable(mali_executor_hint hint) ++{ ++ MALI_DEBUG_ASSERT(hint < MALI_EXECUTOR_HINT_MAX); ++ mali_executor_hints[hint] = MALI_TRUE; ++} + -+ mutex_lock(&js_devdata->runpool_mutex); ++MALI_STATIC_INLINE void mali_executor_hint_disable(mali_executor_hint hint) ++{ ++ MALI_DEBUG_ASSERT(hint < MALI_EXECUTOR_HINT_MAX); ++ mali_executor_hints[hint] = MALI_FALSE; ++} + -+ mutex_lock(&kbdev->mmu_hw_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_ctx_sched_restore_all_as(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kbdev->mmu_hw_mutex); ++MALI_STATIC_INLINE mali_bool mali_executor_hint_is_enabled(mali_executor_hint hint) ++{ ++ MALI_DEBUG_ASSERT(hint < MALI_EXECUTOR_HINT_MAX); ++ return mali_executor_hints[hint]; ++} + -+ kbase_pm_enable_interrupts(kbdev); ++void mali_executor_running_status_print(void); ++void mali_executor_status_dump(void); ++void mali_executor_lock(void); ++void mali_executor_unlock(void); ++#endif /* __MALI_EXECUTOR_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp.c b/drivers/gpu/arm/mali400/mali/common/mali_gp.c +new file mode 100755 +index 000000000..7d3d4aff7 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.c +@@ -0,0 +1,357 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ atomic_set(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_NOT_PENDING); ++#include "mali_gp.h" ++#include "mali_hw_core.h" ++#include "mali_group.h" ++#include "mali_osk.h" ++#include "regs/mali_gp_regs.h" ++#include "mali_kernel_common.h" ++#include "mali_kernel_core.h" ++#if defined(CONFIG_MALI400_PROFILING) ++#include "mali_osk_profiling.h" ++#endif + -+ kbase_disjoint_state_down(kbdev); ++static struct mali_gp_core *mali_global_gp_core = NULL; + -+ wake_up(&kbdev->hwaccess.backend.reset_wait); -+ if (!silent) -+ dev_err(kbdev->dev, "Reset complete"); ++/* Interrupt handlers */ ++static void mali_gp_irq_probe_trigger(void *data); ++static _mali_osk_errcode_t mali_gp_irq_probe_ack(void *data); + -+ if (js_devdata->nr_contexts_pullable > 0 && !kbdev->poweroff_pending) -+ try_schedule = true; ++struct mali_gp_core *mali_gp_create(const _mali_osk_resource_t *resource, struct mali_group *group) ++{ ++ struct mali_gp_core *core = NULL; + -+ mutex_unlock(&js_devdata->runpool_mutex); ++ MALI_DEBUG_ASSERT(NULL == mali_global_gp_core); ++ MALI_DEBUG_PRINT(2, ("Mali GP: Creating Mali GP core: %s\n", resource->description)); + -+ mutex_lock(&kbdev->pm.lock); ++ core = _mali_osk_malloc(sizeof(struct mali_gp_core)); ++ if (NULL != core) { ++ if (_MALI_OSK_ERR_OK == mali_hw_core_create(&core->hw_core, resource, MALIGP2_REGISTER_ADDRESS_SPACE_SIZE)) { ++ _mali_osk_errcode_t ret; + -+ /* Find out what cores are required now */ -+ kbase_pm_update_cores_state(kbdev); ++ ret = mali_gp_reset(core); + -+ /* Synchronously request and wait for those cores, because if -+ * instrumentation is enabled it would need them immediately. */ -+ kbase_pm_check_transitions_sync(kbdev); ++ if (_MALI_OSK_ERR_OK == ret) { ++ ret = mali_group_add_gp_core(group, core); ++ if (_MALI_OSK_ERR_OK == ret) { ++ /* Setup IRQ handlers (which will do IRQ probing if needed) */ ++ core->irq = _mali_osk_irq_init(resource->irq, ++ mali_group_upper_half_gp, ++ group, ++ mali_gp_irq_probe_trigger, ++ mali_gp_irq_probe_ack, ++ core, ++ resource->description); ++ if (NULL != core->irq) { ++ MALI_DEBUG_PRINT(4, ("Mali GP: set global gp core from 0x%08X to 0x%08X\n", mali_global_gp_core, core)); ++ mali_global_gp_core = core; + -+ mutex_unlock(&kbdev->pm.lock); ++ return core; ++ } else { ++ MALI_PRINT_ERROR(("Mali GP: Failed to setup interrupt handlers for GP core %s\n", core->hw_core.description)); ++ } ++ mali_group_remove_gp_core(group); ++ } else { ++ MALI_PRINT_ERROR(("Mali GP: Failed to add core %s to group\n", core->hw_core.description)); ++ } ++ } ++ mali_hw_core_delete(&core->hw_core); ++ } + -+ /* Try submitting some jobs to restart processing */ -+ if (try_schedule) { -+ KBASE_TRACE_ADD(kbdev, JM_SUBMIT_AFTER_RESET, NULL, NULL, 0u, -+ 0); -+ kbase_js_sched_all(kbdev); ++ _mali_osk_free(core); ++ } else { ++ MALI_PRINT_ERROR(("Failed to allocate memory for GP core\n")); + } + -+ /* Process any pending slot updates */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_backend_slot_update(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ return NULL; ++} + -+ kbase_pm_context_idle(kbdev); ++void mali_gp_delete(struct mali_gp_core *core) ++{ ++ MALI_DEBUG_ASSERT_POINTER(core); + -+ /* Release vinstr */ -+ kbase_vinstr_resume(kbdev->vinstr_ctx); ++ _mali_osk_irq_term(core->irq); ++ mali_hw_core_delete(&core->hw_core); ++ mali_global_gp_core = NULL; ++ _mali_osk_free(core); ++} + -+ KBASE_TRACE_ADD(kbdev, JM_END_RESET_WORKER, NULL, NULL, 0u, 0); ++void mali_gp_stop_bus(struct mali_gp_core *core) ++{ ++ MALI_DEBUG_ASSERT_POINTER(core); ++ ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_CMD, MALIGP2_REG_VAL_CMD_STOP_BUS); +} + -+static enum hrtimer_restart kbasep_reset_timer_callback(struct hrtimer *timer) ++_mali_osk_errcode_t mali_gp_stop_bus_wait(struct mali_gp_core *core) +{ -+ struct kbase_device *kbdev = container_of(timer, struct kbase_device, -+ hwaccess.backend.reset_timer); ++ int i; + -+ KBASE_DEBUG_ASSERT(kbdev); ++ MALI_DEBUG_ASSERT_POINTER(core); + -+ /* Reset still pending? */ -+ if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_COMMITTED, KBASE_RESET_GPU_HAPPENING) == -+ KBASE_RESET_GPU_COMMITTED) -+ queue_work(kbdev->hwaccess.backend.reset_workq, -+ &kbdev->hwaccess.backend.reset_work); ++ /* Send the stop bus command. */ ++ mali_gp_stop_bus(core); + -+ return HRTIMER_NORESTART; -+} ++ /* Wait for bus to be stopped */ ++ for (i = 0; i < MALI_REG_POLL_COUNT_SLOW; i++) { ++ if (mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_STATUS) & MALIGP2_REG_VAL_STATUS_BUS_STOPPED) { ++ break; ++ } ++ } + -+/* -+ * If all jobs are evicted from the GPU then we can reset the GPU -+ * immediately instead of waiting for the timeout to elapse -+ */ ++ if (MALI_REG_POLL_COUNT_SLOW == i) { ++ MALI_PRINT_ERROR(("Mali GP: Failed to stop bus on %s\n", core->hw_core.description)); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ return _MALI_OSK_ERR_OK; ++} + -+static void kbasep_try_reset_gpu_early_locked(struct kbase_device *kbdev) ++void mali_gp_hard_reset(struct mali_gp_core *core) +{ ++ const u32 reset_wait_target_register = MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_LIMIT; ++ const u32 reset_invalid_value = 0xC0FFE000; ++ const u32 reset_check_value = 0xC01A0000; ++ const u32 reset_default_value = 0; + int i; -+ int pending_jobs = 0; + -+ KBASE_DEBUG_ASSERT(kbdev); ++ MALI_DEBUG_ASSERT_POINTER(core); ++ MALI_DEBUG_PRINT(4, ("Mali GP: Hard reset of core %s\n", core->hw_core.description)); + -+ /* Count the number of jobs */ -+ for (i = 0; i < kbdev->gpu_props.num_job_slots; i++) -+ pending_jobs += kbase_backend_nr_atoms_submitted(kbdev, i); ++ mali_hw_core_register_write(&core->hw_core, reset_wait_target_register, reset_invalid_value); + -+ if (pending_jobs > 0) { -+ /* There are still jobs on the GPU - wait */ -+ return; -+ } ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_CMD, MALIGP2_REG_VAL_CMD_RESET); + -+ /* To prevent getting incorrect registers when dumping failed job, -+ * skip early reset. -+ */ -+ if (kbdev->job_fault_debug != false) -+ return; ++ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; i++) { ++ mali_hw_core_register_write(&core->hw_core, reset_wait_target_register, reset_check_value); ++ if (reset_check_value == mali_hw_core_register_read(&core->hw_core, reset_wait_target_register)) { ++ break; ++ } ++ } + -+ /* Check that the reset has been committed to (i.e. kbase_reset_gpu has -+ * been called), and that no other thread beat this thread to starting -+ * the reset */ -+ if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_COMMITTED, KBASE_RESET_GPU_HAPPENING) != -+ KBASE_RESET_GPU_COMMITTED) { -+ /* Reset has already occurred */ -+ return; ++ if (MALI_REG_POLL_COUNT_FAST == i) { ++ MALI_PRINT_ERROR(("Mali GP: The hard reset loop didn't work, unable to recover\n")); + } + -+ queue_work(kbdev->hwaccess.backend.reset_workq, -+ &kbdev->hwaccess.backend.reset_work); ++ mali_hw_core_register_write(&core->hw_core, reset_wait_target_register, reset_default_value); /* set it back to the default */ ++ /* Re-enable interrupts */ ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_CLEAR, MALIGP2_REG_VAL_IRQ_MASK_ALL); ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_MASK, MALIGP2_REG_VAL_IRQ_MASK_USED); ++ +} + -+static void kbasep_try_reset_gpu_early(struct kbase_device *kbdev) ++void mali_gp_reset_async(struct mali_gp_core *core) +{ -+ unsigned long flags; ++ MALI_DEBUG_ASSERT_POINTER(core); ++ ++ MALI_DEBUG_PRINT(4, ("Mali GP: Reset of core %s\n", core->hw_core.description)); ++ ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_MASK, 0); /* disable the IRQs */ ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_CLEAR, MALI400GP_REG_VAL_IRQ_RESET_COMPLETED); ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_CMD, MALI400GP_REG_VAL_CMD_SOFT_RESET); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbasep_try_reset_gpu_early_locked(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} + -+/** -+ * kbase_prepare_to_reset_gpu_locked - Prepare for resetting the GPU -+ * @kbdev: kbase device -+ * -+ * This function just soft-stops all the slots to ensure that as many jobs as -+ * possible are saved. -+ * -+ * Return: -+ * The function returns a boolean which should be interpreted as follows: -+ * true - Prepared for reset, kbase_reset_gpu_locked should be called. -+ * false - Another thread is performing a reset, kbase_reset_gpu should -+ * not be called. -+ */ -+bool kbase_prepare_to_reset_gpu_locked(struct kbase_device *kbdev) ++_mali_osk_errcode_t mali_gp_reset_wait(struct mali_gp_core *core) +{ + int i; ++ u32 rawstat = 0; + -+ KBASE_DEBUG_ASSERT(kbdev); ++ MALI_DEBUG_ASSERT_POINTER(core); + -+ if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_NOT_PENDING, -+ KBASE_RESET_GPU_PREPARED) != -+ KBASE_RESET_GPU_NOT_PENDING) { -+ /* Some other thread is already resetting the GPU */ -+ return false; ++ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; i++) { ++ rawstat = mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_RAWSTAT); ++ if (rawstat & MALI400GP_REG_VAL_IRQ_RESET_COMPLETED) { ++ break; ++ } + } + -+ kbase_disjoint_state_up(kbdev); ++ if (i == MALI_REG_POLL_COUNT_FAST) { ++ MALI_PRINT_ERROR(("Mali GP: Failed to reset core %s, rawstat: 0x%08x\n", ++ core->hw_core.description, rawstat)); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ for (i = 0; i < kbdev->gpu_props.num_job_slots; i++) -+ kbase_job_slot_softstop(kbdev, i, NULL); ++ /* Re-enable interrupts */ ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_CLEAR, MALIGP2_REG_VAL_IRQ_MASK_ALL); ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_MASK, MALIGP2_REG_VAL_IRQ_MASK_USED); + -+ return true; ++ return _MALI_OSK_ERR_OK; +} + -+bool kbase_prepare_to_reset_gpu(struct kbase_device *kbdev) ++_mali_osk_errcode_t mali_gp_reset(struct mali_gp_core *core) +{ -+ unsigned long flags; -+ bool ret; -+ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ ret = kbase_prepare_to_reset_gpu_locked(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ -+ return ret; ++ mali_gp_reset_async(core); ++ return mali_gp_reset_wait(core); +} -+KBASE_EXPORT_TEST_API(kbase_prepare_to_reset_gpu); + -+/* -+ * This function should be called after kbase_prepare_to_reset_gpu if it -+ * returns true. It should never be called without a corresponding call to -+ * kbase_prepare_to_reset_gpu. -+ * -+ * After this function is called (or not called if kbase_prepare_to_reset_gpu -+ * returned false), the caller should wait for -+ * kbdev->hwaccess.backend.reset_waitq to be signalled to know when the reset -+ * has completed. -+ */ -+void kbase_reset_gpu(struct kbase_device *kbdev) ++void mali_gp_job_start(struct mali_gp_core *core, struct mali_gp_job *job) +{ -+ KBASE_DEBUG_ASSERT(kbdev); ++ u32 startcmd = 0; ++ u32 *frame_registers = mali_gp_job_get_frame_registers(job); ++ u32 counter_src0 = mali_gp_job_get_perf_counter_src0(job); ++ u32 counter_src1 = mali_gp_job_get_perf_counter_src1(job); + -+ /* Note this is an assert/atomic_set because it is a software issue for -+ * a race to be occuring here */ -+ KBASE_DEBUG_ASSERT(atomic_read(&kbdev->hwaccess.backend.reset_gpu) == -+ KBASE_RESET_GPU_PREPARED); -+ atomic_set(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_COMMITTED); ++ MALI_DEBUG_ASSERT_POINTER(core); + -+ dev_err(kbdev->dev, "Preparing to soft-reset GPU: Waiting (upto %d ms) for all jobs to complete soft-stop\n", -+ kbdev->reset_timeout_ms); ++ if (mali_gp_job_has_vs_job(job)) { ++ startcmd |= (u32) MALIGP2_REG_VAL_CMD_START_VS; ++ } + -+ hrtimer_start(&kbdev->hwaccess.backend.reset_timer, -+ HR_TIMER_DELAY_MSEC(kbdev->reset_timeout_ms), -+ HRTIMER_MODE_REL); ++ if (mali_gp_job_has_plbu_job(job)) { ++ startcmd |= (u32) MALIGP2_REG_VAL_CMD_START_PLBU; ++ } + -+ /* Try resetting early */ -+ kbasep_try_reset_gpu_early(kbdev); -+} -+KBASE_EXPORT_TEST_API(kbase_reset_gpu); ++ MALI_DEBUG_ASSERT(0 != startcmd); + -+void kbase_reset_gpu_locked(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev); ++ mali_hw_core_register_write_array_relaxed(&core->hw_core, MALIGP2_REG_ADDR_MGMT_VSCL_START_ADDR, frame_registers, MALIGP2_NUM_REGS_FRAME); + -+ /* Note this is an assert/atomic_set because it is a software issue for -+ * a race to be occuring here */ -+ KBASE_DEBUG_ASSERT(atomic_read(&kbdev->hwaccess.backend.reset_gpu) == -+ KBASE_RESET_GPU_PREPARED); -+ atomic_set(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_COMMITTED); ++ if (MALI_HW_CORE_NO_COUNTER != counter_src0) { ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_SRC, counter_src0); ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_ENABLE, MALIGP2_REG_VAL_PERF_CNT_ENABLE); ++ } ++ if (MALI_HW_CORE_NO_COUNTER != counter_src1) { ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PERF_CNT_1_SRC, counter_src1); ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PERF_CNT_1_ENABLE, MALIGP2_REG_VAL_PERF_CNT_ENABLE); ++ } + -+ dev_err(kbdev->dev, "Preparing to soft-reset GPU: Waiting (upto %d ms) for all jobs to complete soft-stop\n", -+ kbdev->reset_timeout_ms); -+ hrtimer_start(&kbdev->hwaccess.backend.reset_timer, -+ HR_TIMER_DELAY_MSEC(kbdev->reset_timeout_ms), -+ HRTIMER_MODE_REL); ++ MALI_DEBUG_PRINT(3, ("Mali GP: Starting job (0x%08x) on core %s with command 0x%08X\n", job, core->hw_core.description, startcmd)); + -+ /* Try resetting early */ -+ kbasep_try_reset_gpu_early_locked(kbdev); -+} ++ mali_hw_core_register_write_relaxed(&core->hw_core, MALIGP2_REG_ADDR_MGMT_CMD, MALIGP2_REG_VAL_CMD_UPDATE_PLBU_ALLOC); + -+void kbase_reset_gpu_silent(struct kbase_device *kbdev) -+{ -+ if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_NOT_PENDING, -+ KBASE_RESET_GPU_SILENT) != -+ KBASE_RESET_GPU_NOT_PENDING) { -+ /* Some other thread is already resetting the GPU */ -+ return; -+ } ++ /* Barrier to make sure the previous register write is finished */ ++ _mali_osk_write_mem_barrier(); + -+ kbase_disjoint_state_up(kbdev); ++ /* This is the command that starts the core. ++ * ++ * Don't actually run the job if PROFILING_SKIP_PP_JOBS are set, just ++ * force core to assert the completion interrupt. ++ */ ++#if !defined(PROFILING_SKIP_GP_JOBS) ++ mali_hw_core_register_write_relaxed(&core->hw_core, MALIGP2_REG_ADDR_MGMT_CMD, startcmd); ++#else ++ { ++ u32 bits = 0; + -+ queue_work(kbdev->hwaccess.backend.reset_workq, -+ &kbdev->hwaccess.backend.reset_work); -+} ++ if (mali_gp_job_has_vs_job(job)) ++ bits = MALIGP2_REG_VAL_IRQ_VS_END_CMD_LST; ++ if (mali_gp_job_has_plbu_job(job)) ++ bits |= MALIGP2_REG_VAL_IRQ_PLBU_END_CMD_LST; + -+bool kbase_reset_gpu_active(struct kbase_device *kbdev) -+{ -+ if (atomic_read(&kbdev->hwaccess.backend.reset_gpu) == -+ KBASE_RESET_GPU_NOT_PENDING) -+ return false; ++ mali_hw_core_register_write_relaxed(&core->hw_core, ++ MALIGP2_REG_ADDR_MGMT_INT_RAWSTAT, bits); ++ } ++#endif + -+ return true; ++ /* Barrier to make sure the previous register write is finished */ ++ _mali_osk_write_mem_barrier(); +} -+#endif /* KBASE_GPU_RESET_EN */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_internal.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_internal.h -new file mode 100755 -index 000000000000..1f382b3c1af4 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_internal.h -@@ -0,0 +1,164 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ + ++void mali_gp_resume_with_new_heap(struct mali_gp_core *core, u32 start_addr, u32 end_addr) ++{ ++ u32 irq_readout; + ++ MALI_DEBUG_ASSERT_POINTER(core); + ++ irq_readout = mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_RAWSTAT); + ++ if (irq_readout & MALIGP2_REG_VAL_IRQ_PLBU_OUT_OF_MEM) { ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_CLEAR, (MALIGP2_REG_VAL_IRQ_PLBU_OUT_OF_MEM | MALIGP2_REG_VAL_IRQ_HANG)); ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_MASK, MALIGP2_REG_VAL_IRQ_MASK_USED); /* re-enable interrupts */ ++ mali_hw_core_register_write_relaxed(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PLBU_ALLOC_START_ADDR, start_addr); ++ mali_hw_core_register_write_relaxed(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PLBU_ALLOC_END_ADDR, end_addr); + -+/* -+ * Job Manager backend-specific low-level APIs. -+ */ ++ MALI_DEBUG_PRINT(3, ("Mali GP: Resuming job\n")); + -+#ifndef _KBASE_JM_HWACCESS_H_ -+#define _KBASE_JM_HWACCESS_H_ ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_CMD, MALIGP2_REG_VAL_CMD_UPDATE_PLBU_ALLOC); ++ _mali_osk_write_mem_barrier(); ++ } ++ /* ++ * else: core has been reset between PLBU_OUT_OF_MEM interrupt and this new heap response. ++ * A timeout or a page fault on Mali-200 PP core can cause this behaviour. ++ */ ++} + -+#include -+#include -+#include ++u32 mali_gp_core_get_version(struct mali_gp_core *core) ++{ ++ MALI_DEBUG_ASSERT_POINTER(core); ++ return mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_VERSION); ++} + -+#include ++struct mali_gp_core *mali_gp_get_global_gp_core(void) ++{ ++ return mali_global_gp_core; ++} + -+/** -+ * kbase_job_submit_nolock() - Submit a job to a certain job-slot -+ * @kbdev: Device pointer -+ * @katom: Atom to submit -+ * @js: Job slot to submit on -+ * -+ * The caller must check kbasep_jm_is_submit_slots_free() != false before -+ * calling this. -+ * -+ * The following locking conditions are made on the caller: -+ * - it must hold the hwaccess_lock -+ */ -+void kbase_job_submit_nolock(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, int js); ++/* ------------- interrupt handling below ------------------ */ ++static void mali_gp_irq_probe_trigger(void *data) ++{ ++ struct mali_gp_core *core = (struct mali_gp_core *)data; + -+/** -+ * kbase_job_done_slot() - Complete the head job on a particular job-slot -+ * @kbdev: Device pointer -+ * @s: Job slot -+ * @completion_code: Completion code of job reported by GPU -+ * @job_tail: Job tail address reported by GPU -+ * @end_timestamp: Timestamp of job completion -+ */ -+void kbase_job_done_slot(struct kbase_device *kbdev, int s, u32 completion_code, -+ u64 job_tail, ktime_t *end_timestamp); ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_MASK, MALIGP2_REG_VAL_IRQ_MASK_USED); ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_RAWSTAT, MALIGP2_REG_VAL_IRQ_AXI_BUS_ERROR); ++ _mali_osk_mem_barrier(); ++} + -+#ifdef CONFIG_GPU_TRACEPOINTS -+static inline char *kbasep_make_job_slot_string(int js, char *js_string, -+ size_t js_size) ++static _mali_osk_errcode_t mali_gp_irq_probe_ack(void *data) +{ -+ snprintf(js_string, js_size, "job_slot_%i", js); -+ return js_string; ++ struct mali_gp_core *core = (struct mali_gp_core *)data; ++ u32 irq_readout; ++ ++ irq_readout = mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_STAT); ++ if (MALIGP2_REG_VAL_IRQ_AXI_BUS_ERROR & irq_readout) { ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_CLEAR, MALIGP2_REG_VAL_IRQ_AXI_BUS_ERROR); ++ _mali_osk_mem_barrier(); ++ return _MALI_OSK_ERR_OK; ++ } ++ ++ return _MALI_OSK_ERR_FAULT; +} -+#endif + -+/** -+ * kbase_job_hw_submit() - Submit a job to the GPU -+ * @kbdev: Device pointer -+ * @katom: Atom to submit -+ * @js: Job slot to submit on -+ * -+ * The caller must check kbasep_jm_is_submit_slots_free() != false before -+ * calling this. -+ * -+ * The following locking conditions are made on the caller: -+ * - it must hold the hwaccess_lock -+ */ -+void kbase_job_hw_submit(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, -+ int js); ++/* ------ local helper functions below --------- */ ++#if MALI_STATE_TRACKING ++u32 mali_gp_dump_state(struct mali_gp_core *core, char *buf, u32 size) ++{ ++ int n = 0; + -+/** -+ * kbasep_job_slot_soft_or_hard_stop_do_action() - Perform a soft or hard stop -+ * on the specified atom -+ * @kbdev: Device pointer -+ * @js: Job slot to stop on -+ * @action: The action to perform, either JSn_COMMAND_HARD_STOP or -+ * JSn_COMMAND_SOFT_STOP -+ * @core_reqs: Core requirements of atom to stop -+ * @target_katom: Atom to stop -+ * -+ * The following locking conditions are made on the caller: -+ * - it must hold the hwaccess_lock -+ */ -+void kbasep_job_slot_soft_or_hard_stop_do_action(struct kbase_device *kbdev, -+ int js, -+ u32 action, -+ base_jd_core_req core_reqs, -+ struct kbase_jd_atom *target_katom); ++ n += _mali_osk_snprintf(buf + n, size - n, "\tGP: %s\n", core->hw_core.description); + -+/** -+ * kbase_backend_soft_hard_stop_slot() - Soft or hard stop jobs on a given job -+ * slot belonging to a given context. -+ * @kbdev: Device pointer -+ * @kctx: Context pointer. May be NULL -+ * @katom: Specific atom to stop. May be NULL -+ * @js: Job slot to hard stop -+ * @action: The action to perform, either JSn_COMMAND_HARD_STOP or -+ * JSn_COMMAND_SOFT_STOP -+ * -+ * If no context is provided then all jobs on the slot will be soft or hard -+ * stopped. -+ * -+ * If a katom is provided then only that specific atom will be stopped. In this -+ * case the kctx parameter is ignored. -+ * -+ * Jobs that are on the slot but are not yet on the GPU will be unpulled and -+ * returned to the job scheduler. -+ * -+ * Return: true if an atom was stopped, false otherwise -+ */ -+bool kbase_backend_soft_hard_stop_slot(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js, -+ struct kbase_jd_atom *katom, -+ u32 action); ++ return n; ++} ++#endif + -+/** -+ * kbase_job_slot_init - Initialise job slot framework -+ * @kbdev: Device pointer -+ * -+ * Called on driver initialisation -+ * -+ * Return: 0 on success -+ */ -+int kbase_job_slot_init(struct kbase_device *kbdev); ++void mali_gp_update_performance_counters(struct mali_gp_core *core, struct mali_gp_job *job) ++{ ++ u32 val0 = 0; ++ u32 val1 = 0; ++ u32 counter_src0 = mali_gp_job_get_perf_counter_src0(job); ++ u32 counter_src1 = mali_gp_job_get_perf_counter_src1(job); + -+/** -+ * kbase_job_slot_halt - Halt the job slot framework -+ * @kbdev: Device pointer -+ * -+ * Should prevent any further job slot processing -+ */ -+void kbase_job_slot_halt(struct kbase_device *kbdev); ++ if (MALI_HW_CORE_NO_COUNTER != counter_src0) { ++ val0 = mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_VALUE); ++ mali_gp_job_set_perf_counter_value0(job, val0); + -+/** -+ * kbase_job_slot_term - Terminate job slot framework -+ * @kbdev: Device pointer -+ * -+ * Called on driver termination -+ */ -+void kbase_job_slot_term(struct kbase_device *kbdev); ++#if defined(CONFIG_MALI400_PROFILING) ++ _mali_osk_profiling_report_hw_counter(COUNTER_VP_0_C0, val0); ++ _mali_osk_profiling_record_global_counters(COUNTER_VP_0_C0, val0); ++#endif + -+/** -+ * kbase_gpu_cacheclean - Cause a GPU cache clean & flush -+ * @kbdev: Device pointer -+ * -+ * Caller must not be in IRQ context -+ */ -+void kbase_gpu_cacheclean(struct kbase_device *kbdev); ++ } + -+#endif /* _KBASE_JM_HWACCESS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_rb.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_rb.c ++ if (MALI_HW_CORE_NO_COUNTER != counter_src1) { ++ val1 = mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PERF_CNT_1_VALUE); ++ mali_gp_job_set_perf_counter_value1(job, val1); ++ ++#if defined(CONFIG_MALI400_PROFILING) ++ _mali_osk_profiling_report_hw_counter(COUNTER_VP_0_C1, val1); ++ _mali_osk_profiling_record_global_counters(COUNTER_VP_0_C1, val1); ++#endif ++ } ++} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp.h b/drivers/gpu/arm/mali400/mali/common/mali_gp.h new file mode 100755 -index 000000000000..a41e7b5b7afb +index 000000000..3156310f2 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_rb.c -@@ -0,0 +1,1947 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.h +@@ -0,0 +1,127 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2011-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_GP_H__ ++#define __MALI_GP_H__ + ++#include "mali_osk.h" ++#include "mali_gp_job.h" ++#include "mali_hw_core.h" ++#include "regs/mali_gp_regs.h" + ++struct mali_group; + -+/* -+ * Register-based HW access backend specific APIs ++/** ++ * Definition of the GP core struct ++ * Used to track a GP core in the system. + */ ++struct mali_gp_core { ++ struct mali_hw_core hw_core; /**< Common for all HW cores */ ++ _mali_osk_irq_t *irq; /**< IRQ handler */ ++}; + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++_mali_osk_errcode_t mali_gp_initialize(void); ++void mali_gp_terminate(void); + -+/* Return whether the specified ringbuffer is empty. HW access lock must be -+ * held */ -+#define SLOT_RB_EMPTY(rb) (rb->write_idx == rb->read_idx) -+/* Return number of atoms currently in the specified ringbuffer. HW access lock -+ * must be held */ -+#define SLOT_RB_ENTRIES(rb) (int)(s8)(rb->write_idx - rb->read_idx) ++struct mali_gp_core *mali_gp_create(const _mali_osk_resource_t *resource, struct mali_group *group); ++void mali_gp_delete(struct mali_gp_core *core); + -+static void kbase_gpu_release_atom(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, -+ ktime_t *end_timestamp); ++void mali_gp_stop_bus(struct mali_gp_core *core); ++_mali_osk_errcode_t mali_gp_stop_bus_wait(struct mali_gp_core *core); ++void mali_gp_reset_async(struct mali_gp_core *core); ++_mali_osk_errcode_t mali_gp_reset_wait(struct mali_gp_core *core); ++void mali_gp_hard_reset(struct mali_gp_core *core); ++_mali_osk_errcode_t mali_gp_reset(struct mali_gp_core *core); + -+/** -+ * kbase_gpu_enqueue_atom - Enqueue an atom in the HW access ringbuffer -+ * @kbdev: Device pointer -+ * @katom: Atom to enqueue -+ * -+ * Context: Caller must hold the HW access lock -+ */ -+static void kbase_gpu_enqueue_atom(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) -+{ -+ struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[katom->slot_nr]; ++void mali_gp_job_start(struct mali_gp_core *core, struct mali_gp_job *job); ++void mali_gp_resume_with_new_heap(struct mali_gp_core *core, u32 start_addr, u32 end_addr); + -+ WARN_ON(SLOT_RB_ENTRIES(rb) >= SLOT_RB_SIZE); ++u32 mali_gp_core_get_version(struct mali_gp_core *core); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++struct mali_gp_core *mali_gp_get_global_gp_core(void); + -+ rb->entries[rb->write_idx & SLOT_RB_MASK].katom = katom; -+ rb->write_idx++; ++#if MALI_STATE_TRACKING ++u32 mali_gp_dump_state(struct mali_gp_core *core, char *buf, u32 size); ++#endif + -+ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_WAITING_BLOCKED; ++void mali_gp_update_performance_counters(struct mali_gp_core *core, struct mali_gp_job *job); ++ ++MALI_STATIC_INLINE const char *mali_gp_core_description(struct mali_gp_core *core) ++{ ++ return core->hw_core.description; +} + -+/** -+ * kbase_gpu_dequeue_atom - Remove an atom from the HW access ringbuffer, once -+ * it has been completed -+ * @kbdev: Device pointer -+ * @js: Job slot to remove atom from -+ * @end_timestamp: Pointer to timestamp of atom completion. May be NULL, in -+ * which case current time will be used. -+ * -+ * Context: Caller must hold the HW access lock -+ * -+ * Return: Atom removed from ringbuffer -+ */ -+static struct kbase_jd_atom *kbase_gpu_dequeue_atom(struct kbase_device *kbdev, -+ int js, -+ ktime_t *end_timestamp) ++MALI_STATIC_INLINE enum mali_interrupt_result mali_gp_get_interrupt_result(struct mali_gp_core *core) +{ -+ struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[js]; -+ struct kbase_jd_atom *katom; ++ u32 stat_used = mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_STAT) & ++ MALIGP2_REG_VAL_IRQ_MASK_USED; + -+ if (SLOT_RB_EMPTY(rb)) { -+ WARN(1, "GPU ringbuffer unexpectedly empty\n"); -+ return NULL; ++ if (0 == stat_used) { ++ return MALI_INTERRUPT_RESULT_NONE; ++ } else if ((MALIGP2_REG_VAL_IRQ_VS_END_CMD_LST | ++ MALIGP2_REG_VAL_IRQ_PLBU_END_CMD_LST) == stat_used) { ++ return MALI_INTERRUPT_RESULT_SUCCESS; ++ } else if (MALIGP2_REG_VAL_IRQ_VS_END_CMD_LST == stat_used) { ++ return MALI_INTERRUPT_RESULT_SUCCESS_VS; ++ } else if (MALIGP2_REG_VAL_IRQ_PLBU_END_CMD_LST == stat_used) { ++ return MALI_INTERRUPT_RESULT_SUCCESS_PLBU; ++ } else if (MALIGP2_REG_VAL_IRQ_PLBU_OUT_OF_MEM & stat_used) { ++ return MALI_INTERRUPT_RESULT_OOM; + } + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ return MALI_INTERRUPT_RESULT_ERROR; ++} + -+ katom = rb->entries[rb->read_idx & SLOT_RB_MASK].katom; ++MALI_STATIC_INLINE u32 mali_gp_get_rawstat(struct mali_gp_core *core) ++{ ++ MALI_DEBUG_ASSERT_POINTER(core); ++ return mali_hw_core_register_read(&core->hw_core, ++ MALIGP2_REG_ADDR_MGMT_INT_RAWSTAT); ++} + -+ kbase_gpu_release_atom(kbdev, katom, end_timestamp); ++MALI_STATIC_INLINE u32 mali_gp_is_active(struct mali_gp_core *core) ++{ ++ u32 status = mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_STATUS); ++ return (status & MALIGP2_REG_VAL_STATUS_MASK_ACTIVE) ? MALI_TRUE : MALI_FALSE; ++} + -+ rb->read_idx++; ++MALI_STATIC_INLINE void mali_gp_mask_all_interrupts(struct mali_gp_core *core) ++{ ++ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_MASK, MALIGP2_REG_VAL_IRQ_MASK_NONE); ++} + -+ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB; ++MALI_STATIC_INLINE void mali_gp_enable_interrupts(struct mali_gp_core *core, enum mali_interrupt_result exceptions) ++{ ++ /* Enable all interrupts, except those specified in exceptions */ ++ u32 value; + -+ kbase_js_debug_log_current_affinities(kbdev); ++ if (MALI_INTERRUPT_RESULT_SUCCESS_VS == exceptions) { ++ /* Enable all used except VS complete */ ++ value = MALIGP2_REG_VAL_IRQ_MASK_USED & ++ ~MALIGP2_REG_VAL_IRQ_VS_END_CMD_LST; ++ } else { ++ MALI_DEBUG_ASSERT(MALI_INTERRUPT_RESULT_SUCCESS_PLBU == ++ exceptions); ++ /* Enable all used except PLBU complete */ ++ value = MALIGP2_REG_VAL_IRQ_MASK_USED & ++ ~MALIGP2_REG_VAL_IRQ_PLBU_END_CMD_LST; ++ } + -+ return katom; ++ mali_hw_core_register_write(&core->hw_core, ++ MALIGP2_REG_ADDR_MGMT_INT_MASK, ++ value); +} + -+struct kbase_jd_atom *kbase_gpu_inspect(struct kbase_device *kbdev, int js, -+ int idx) ++MALI_STATIC_INLINE u32 mali_gp_read_plbu_alloc_start_addr(struct mali_gp_core *core) +{ -+ struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[js]; ++ return mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PLBU_ALLOC_START_ADDR); ++} + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++#endif /* __MALI_GP_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c +new file mode 100755 +index 000000000..5d4d9f253 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c +@@ -0,0 +1,306 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ if ((SLOT_RB_ENTRIES(rb) - 1) < idx) -+ return NULL; /* idx out of range */ ++#include "mali_gp_job.h" ++#include "mali_osk.h" ++#include "mali_osk_list.h" ++#include "mali_uk_types.h" ++#include "mali_memory_virtual.h" ++#include "mali_memory_defer_bind.h" + -+ return rb->entries[(rb->read_idx + idx) & SLOT_RB_MASK].katom; -+} ++static u32 gp_counter_src0 = MALI_HW_CORE_NO_COUNTER; /**< Performance counter 0, MALI_HW_CORE_NO_COUNTER for disabled */ ++static u32 gp_counter_src1 = MALI_HW_CORE_NO_COUNTER; /**< Performance counter 1, MALI_HW_CORE_NO_COUNTER for disabled */ ++static void _mali_gp_del_varying_allocations(struct mali_gp_job *job); + -+struct kbase_jd_atom *kbase_backend_inspect_head(struct kbase_device *kbdev, -+ int js) ++ ++static int _mali_gp_add_varying_allocations(struct mali_session_data *session, ++ struct mali_gp_job *job, ++ u32 *alloc, ++ u32 num) +{ -+ return kbase_gpu_inspect(kbdev, js, 0); ++ int i = 0; ++ struct mali_gp_allocation_node *alloc_node; ++ mali_mem_allocation *mali_alloc = NULL; ++ struct mali_vma_node *mali_vma_node = NULL; ++ ++ for (i = 0 ; i < num ; i++) { ++ MALI_DEBUG_ASSERT(alloc[i]); ++ alloc_node = _mali_osk_calloc(1, sizeof(struct mali_gp_allocation_node)); ++ if (alloc_node) { ++ INIT_LIST_HEAD(&alloc_node->node); ++ /* find mali allocation structure by vaddress*/ ++ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, alloc[i], 0); ++ ++ if (likely(mali_vma_node)) { ++ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); ++ MALI_DEBUG_ASSERT(alloc[i] == mali_vma_node->vm_node.start); ++ } else { ++ MALI_DEBUG_PRINT(1, ("ERROE!_mali_gp_add_varying_allocations,can't find allocation %d by address =0x%x, num=%d\n", i, alloc[i], num)); ++ _mali_osk_free(alloc_node); ++ goto fail; ++ } ++ alloc_node->alloc = mali_alloc; ++ /* add to gp job varying alloc list*/ ++ list_move(&alloc_node->node, &job->varying_alloc); ++ } else ++ goto fail; ++ } ++ ++ return 0; ++fail: ++ MALI_DEBUG_PRINT(1, ("ERROE!_mali_gp_add_varying_allocations,failed to alloc memory!\n")); ++ _mali_gp_del_varying_allocations(job); ++ return -1; +} + -+struct kbase_jd_atom *kbase_backend_inspect_tail(struct kbase_device *kbdev, -+ int js) -+{ -+ struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[js]; + -+ if (SLOT_RB_EMPTY(rb)) -+ return NULL; ++static void _mali_gp_del_varying_allocations(struct mali_gp_job *job) ++{ ++ struct mali_gp_allocation_node *alloc_node, *tmp_node; + -+ return rb->entries[(rb->write_idx - 1) & SLOT_RB_MASK].katom; ++ list_for_each_entry_safe(alloc_node, tmp_node, &job->varying_alloc, node) { ++ list_del(&alloc_node->node); ++ kfree(alloc_node); ++ } ++ INIT_LIST_HEAD(&job->varying_alloc); +} + -+/** -+ * kbase_gpu_atoms_submitted - Inspect whether a slot has any atoms currently -+ * on the GPU -+ * @kbdev: Device pointer -+ * @js: Job slot to inspect -+ * -+ * Return: true if there are atoms on the GPU for slot js, -+ * false otherwise -+ */ -+static bool kbase_gpu_atoms_submitted(struct kbase_device *kbdev, int js) ++struct mali_gp_job *mali_gp_job_create(struct mali_session_data *session, _mali_uk_gp_start_job_s *uargs, u32 id, struct mali_timeline_tracker *pp_tracker) +{ -+ int i; ++ struct mali_gp_job *job; ++ u32 perf_counter_flag; ++ u32 __user *memory_list = NULL; ++ struct mali_gp_allocation_node *alloc_node, *tmp_node; ++ _mali_uk_gp_start_job_s copy_of_uargs; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ job = _mali_osk_calloc(1, sizeof(struct mali_gp_job)); ++ if (NULL != job) { ++ job->finished_notification = _mali_osk_notification_create(_MALI_NOTIFICATION_GP_FINISHED, sizeof(_mali_uk_gp_job_finished_s)); ++ if (NULL == job->finished_notification) { ++ goto fail3; ++ } + -+ for (i = 0; i < SLOT_RB_SIZE; i++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, i); ++ job->oom_notification = _mali_osk_notification_create(_MALI_NOTIFICATION_GP_STALLED, sizeof(_mali_uk_gp_job_suspended_s)); ++ if (NULL == job->oom_notification) { ++ goto fail2; ++ } + -+ if (!katom) -+ return false; -+ if (katom->gpu_rb_state == KBASE_ATOM_GPU_RB_SUBMITTED || -+ katom->gpu_rb_state == KBASE_ATOM_GPU_RB_READY) -+ return true; -+ } ++ if (0 != _mali_osk_copy_from_user(&job->uargs, uargs, sizeof(_mali_uk_gp_start_job_s))) { ++ goto fail1; ++ } + -+ return false; -+} ++ perf_counter_flag = mali_gp_job_get_perf_counter_flag(job); + -+/** -+ * kbase_gpu_atoms_submitted_any() - Inspect whether there are any atoms -+ * currently on the GPU -+ * @kbdev: Device pointer -+ * -+ * Return: true if there are any atoms on the GPU, false otherwise -+ */ -+static bool kbase_gpu_atoms_submitted_any(struct kbase_device *kbdev) -+{ -+ int js; -+ int i; ++ /* case when no counters came from user space ++ * so pass the debugfs / DS-5 provided global ones to the job object */ ++ if (!((perf_counter_flag & _MALI_PERFORMANCE_COUNTER_FLAG_SRC0_ENABLE) || ++ (perf_counter_flag & _MALI_PERFORMANCE_COUNTER_FLAG_SRC1_ENABLE))) { ++ mali_gp_job_set_perf_counter_src0(job, mali_gp_job_get_gp_counter_src0()); ++ mali_gp_job_set_perf_counter_src1(job, mali_gp_job_get_gp_counter_src1()); ++ } + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ _mali_osk_list_init(&job->list); ++ job->session = session; ++ job->id = id; ++ job->heap_current_addr = job->uargs.frame_registers[4]; ++ job->perf_counter_value0 = 0; ++ job->perf_counter_value1 = 0; ++ job->pid = _mali_osk_get_pid(); ++ job->tid = _mali_osk_get_tid(); + -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ for (i = 0; i < SLOT_RB_SIZE; i++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, i); + -+ if (katom && katom->gpu_rb_state == KBASE_ATOM_GPU_RB_SUBMITTED) -+ return true; ++ INIT_LIST_HEAD(&job->varying_alloc); ++ INIT_LIST_HEAD(&job->vary_todo); ++ job->dmem = NULL; ++ ++ if (job->uargs.deferred_mem_num > session->allocation_mgr.mali_allocation_num) { ++ MALI_PRINT_ERROR(("Mali GP job: The number of varying buffer to defer bind is invalid !\n")); ++ goto fail1; + } -+ } -+ return false; -+} + -+int kbase_backend_nr_atoms_submitted(struct kbase_device *kbdev, int js) -+{ -+ int nr = 0; -+ int i; ++ /* add varying allocation list*/ ++ if (job->uargs.deferred_mem_num > 0) { ++ /* copy varying list from user space*/ ++ job->varying_list = _mali_osk_calloc(1, sizeof(u32) * job->uargs.deferred_mem_num); ++ if (!job->varying_list) { ++ MALI_PRINT_ERROR(("Mali GP job: allocate varying_list failed varying_alloc_num = %d !\n", job->uargs.deferred_mem_num)); ++ goto fail1; ++ } + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ if (0 != _mali_osk_copy_from_user(©_of_uargs, uargs, sizeof(_mali_uk_gp_start_job_s))) { ++ goto fail1; ++ } ++ memory_list = (u32 __user *)(uintptr_t)copy_of_uargs.deferred_mem_list; + -+ for (i = 0; i < SLOT_RB_SIZE; i++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, i); ++ if (0 != _mali_osk_copy_from_user(job->varying_list, memory_list, sizeof(u32) * job->uargs.deferred_mem_num)) { ++ MALI_PRINT_ERROR(("Mali GP job: Failed to copy varying list from user space!\n")); ++ goto fail; ++ } + -+ if (katom && (katom->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_SUBMITTED)) -+ nr++; -+ } ++ if (unlikely(_mali_gp_add_varying_allocations(session, job, job->varying_list, ++ job->uargs.deferred_mem_num))) { ++ MALI_PRINT_ERROR(("Mali GP job: _mali_gp_add_varying_allocations failed!\n")); ++ goto fail; ++ } + -+ return nr; -+} ++ /* do preparetion for each allocation */ ++ list_for_each_entry_safe(alloc_node, tmp_node, &job->varying_alloc, node) { ++ if (unlikely(_MALI_OSK_ERR_OK != mali_mem_defer_bind_allocation_prepare(alloc_node->alloc, &job->vary_todo, &job->required_varying_memsize))) { ++ MALI_PRINT_ERROR(("Mali GP job: mali_mem_defer_bind_allocation_prepare failed!\n")); ++ goto fail; ++ } ++ } + -+int kbase_backend_nr_atoms_on_slot(struct kbase_device *kbdev, int js) -+{ -+ int nr = 0; -+ int i; ++ _mali_gp_del_varying_allocations(job); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ /* bind varying here, to avoid memory latency issue. */ ++ { ++ struct mali_defer_mem_block dmem_block; + -+ for (i = 0; i < SLOT_RB_SIZE; i++) { -+ if (kbase_gpu_inspect(kbdev, js, i)) -+ nr++; ++ INIT_LIST_HEAD(&dmem_block.free_pages); ++ atomic_set(&dmem_block.num_free_pages, 0); ++ ++ if (mali_mem_prepare_mem_for_job(job, &dmem_block)) { ++ MALI_PRINT_ERROR(("Mali GP job: mali_mem_prepare_mem_for_job failed!\n")); ++ goto fail; ++ } ++ if (_MALI_OSK_ERR_OK != mali_mem_defer_bind(job, &dmem_block)) { ++ MALI_PRINT_ERROR(("gp job create, mali_mem_defer_bind failed! GP %x fail!", job)); ++ goto fail; ++ } ++ } ++ ++ if (job->uargs.varying_memsize > MALI_UK_BIG_VARYING_SIZE) { ++ job->big_job = 1; ++ } ++ } ++ job->pp_tracker = pp_tracker; ++ if (NULL != job->pp_tracker) { ++ /* Take a reference on PP job's tracker that will be released when the GP ++ job is done. */ ++ mali_timeline_system_tracker_get(session->timeline_system, pp_tracker); ++ } ++ ++ mali_timeline_tracker_init(&job->tracker, MALI_TIMELINE_TRACKER_GP, NULL, job); ++ mali_timeline_fence_copy_uk_fence(&(job->tracker.fence), &(job->uargs.fence)); ++ ++ return job; ++ } else { ++ MALI_PRINT_ERROR(("Mali GP job: _mali_osk_calloc failed!\n")); ++ return NULL; + } + -+ return nr; ++ ++fail: ++ _mali_osk_free(job->varying_list); ++ /* Handle allocate fail here, free all varying node */ ++ { ++ struct mali_backend_bind_list *bkn, *bkn_tmp; ++ list_for_each_entry_safe(bkn, bkn_tmp , &job->vary_todo, node) { ++ list_del(&bkn->node); ++ _mali_osk_free(bkn); ++ } ++ } ++fail1: ++ _mali_osk_notification_delete(job->oom_notification); ++fail2: ++ _mali_osk_notification_delete(job->finished_notification); ++fail3: ++ _mali_osk_free(job); ++ return NULL; +} + -+static int kbase_gpu_nr_atoms_on_slot_min(struct kbase_device *kbdev, int js, -+ enum kbase_atom_gpu_rb_state min_rb_state) ++void mali_gp_job_delete(struct mali_gp_job *job) +{ -+ int nr = 0; -+ int i; ++ struct mali_backend_bind_list *bkn, *bkn_tmp; ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT(NULL == job->pp_tracker); ++ MALI_DEBUG_ASSERT(_mali_osk_list_empty(&job->list)); ++ _mali_osk_free(job->varying_list); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ /* Handle allocate fail here, free all varying node */ ++ list_for_each_entry_safe(bkn, bkn_tmp , &job->vary_todo, node) { ++ list_del(&bkn->node); ++ _mali_osk_free(bkn); ++ } + -+ for (i = 0; i < SLOT_RB_SIZE; i++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, i); ++ mali_mem_defer_dmem_free(job); + -+ if (katom && (katom->gpu_rb_state >= min_rb_state)) -+ nr++; ++ /* de-allocate the pre-allocated oom notifications */ ++ if (NULL != job->oom_notification) { ++ _mali_osk_notification_delete(job->oom_notification); ++ job->oom_notification = NULL; ++ } ++ if (NULL != job->finished_notification) { ++ _mali_osk_notification_delete(job->finished_notification); ++ job->finished_notification = NULL; + } + -+ return nr; ++ _mali_osk_free(job); +} + -+/** -+ * check_secure_atom - Check if the given atom is in the given secure state and -+ * has a ringbuffer state of at least -+ * KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION -+ * @katom: Atom pointer -+ * @secure: Desired secure state -+ * -+ * Return: true if atom is in the given state, false otherwise -+ */ -+static bool check_secure_atom(struct kbase_jd_atom *katom, bool secure) ++void mali_gp_job_list_add(struct mali_gp_job *job, _mali_osk_list_t *list) +{ -+ if (katom->gpu_rb_state >= -+ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION && -+ ((kbase_jd_katom_is_protected(katom) && secure) || -+ (!kbase_jd_katom_is_protected(katom) && !secure))) -+ return true; ++ struct mali_gp_job *iter; ++ struct mali_gp_job *tmp; + -+ return false; -+} ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); + -+/** -+ * kbase_gpu_check_secure_atoms - Check if there are any atoms in the given -+ * secure state in the ringbuffers of at least -+ * state -+ * KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE -+ * @kbdev: Device pointer -+ * @secure: Desired secure state -+ * -+ * Return: true if any atoms are in the given state, false otherwise -+ */ -+static bool kbase_gpu_check_secure_atoms(struct kbase_device *kbdev, -+ bool secure) -+{ -+ int js, i; ++ /* Find position in list/queue where job should be added. */ ++ _MALI_OSK_LIST_FOREACHENTRY_REVERSE(iter, tmp, list, ++ struct mali_gp_job, list) { + -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ for (i = 0; i < SLOT_RB_SIZE; i++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, -+ js, i); ++ /* A span is used to handle job ID wrapping. */ ++ bool job_is_after = (mali_gp_job_get_id(job) - ++ mali_gp_job_get_id(iter)) < ++ MALI_SCHEDULER_JOB_ID_SPAN; + -+ if (katom) { -+ if (check_secure_atom(katom, secure)) -+ return true; -+ } ++ if (job_is_after) { ++ break; + } + } + -+ return false; ++ _mali_osk_list_add(&job->list, &iter->list); +} + -+int kbase_backend_slot_free(struct kbase_device *kbdev, int js) ++u32 mali_gp_job_get_gp_counter_src0(void) +{ -+ if (atomic_read(&kbdev->hwaccess.backend.reset_gpu) != -+ KBASE_RESET_GPU_NOT_PENDING) { -+ /* The GPU is being reset - so prevent submission */ -+ return 0; -+ } -+ -+ return SLOT_RB_SIZE - kbase_backend_nr_atoms_on_slot(kbdev, js); ++ return gp_counter_src0; +} + ++void mali_gp_job_set_gp_counter_src0(u32 counter) ++{ ++ gp_counter_src0 = counter; ++} + -+static void kbasep_js_job_check_deref_cores(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom); -+ -+static bool kbasep_js_job_check_ref_cores(struct kbase_device *kbdev, -+ int js, -+ struct kbase_jd_atom *katom) ++u32 mali_gp_job_get_gp_counter_src1(void) +{ -+ /* The most recently checked affinity. Having this at this scope allows -+ * us to guarantee that we've checked the affinity in this function -+ * call. -+ */ -+ u64 recently_chosen_affinity = 0; -+ bool chosen_affinity = false; -+ bool retry; ++ return gp_counter_src1; ++} + -+ do { -+ retry = false; ++void mali_gp_job_set_gp_counter_src1(u32 counter) ++{ ++ gp_counter_src1 = counter; ++} + -+ /* NOTE: The following uses a number of FALLTHROUGHs to optimize -+ * the calls to this function. Ending of the function is -+ * indicated by BREAK OUT */ -+ switch (katom->coreref_state) { -+ /* State when job is first attempted to be run */ -+ case KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED: -+ KBASE_DEBUG_ASSERT(katom->affinity == 0); ++mali_scheduler_mask mali_gp_job_signal_pp_tracker(struct mali_gp_job *job, mali_bool success) ++{ ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; + -+ /* Compute affinity */ -+ if (false == kbase_js_choose_affinity( -+ &recently_chosen_affinity, kbdev, katom, -+ js)) { -+ /* No cores are currently available */ -+ /* *** BREAK OUT: No state transition *** */ -+ break; -+ } ++ MALI_DEBUG_ASSERT_POINTER(job); + -+ chosen_affinity = true; ++ if (NULL != job->pp_tracker) { ++ schedule_mask |= mali_timeline_system_tracker_put(job->session->timeline_system, job->pp_tracker, MALI_FALSE == success); ++ job->pp_tracker = NULL; ++ } + -+ /* Request the cores */ -+ kbase_pm_request_cores(kbdev, -+ katom->core_req & BASE_JD_REQ_T, -+ recently_chosen_affinity); ++ return schedule_mask; ++} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h +new file mode 100755 +index 000000000..b84333f9f +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h +@@ -0,0 +1,324 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ katom->affinity = recently_chosen_affinity; ++#ifndef __MALI_GP_JOB_H__ ++#define __MALI_GP_JOB_H__ + -+ /* Proceed to next state */ -+ katom->coreref_state = -+ KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES; ++#include "mali_osk.h" ++#include "mali_osk_list.h" ++#include "mali_uk_types.h" ++#include "mali_session.h" ++#include "mali_timeline.h" ++#include "mali_scheduler_types.h" ++#include "mali_scheduler.h" ++#include "mali_executor.h" ++#include "mali_timeline.h" + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++struct mali_defer_mem; ++/** ++ * This structure represents a GP job ++ * ++ * The GP job object itself is not protected by any single lock, ++ * but relies on other locks instead (scheduler, executor and timeline lock). ++ * Think of the job object as moving between these sub systems through-out ++ * its lifetime. Different part of the GP job struct is used by different ++ * subsystems. Accessor functions ensure that correct lock is taken. ++ * Do NOT access any data members directly from outside this module! ++ */ ++struct mali_gp_job { ++ /* ++ * These members are typically only set at creation, ++ * and only read later on. ++ * They do not require any lock protection. ++ */ ++ _mali_uk_gp_start_job_s uargs; /**< Arguments from user space */ ++ struct mali_session_data *session; /**< Session which submitted this job */ ++ u32 pid; /**< Process ID of submitting process */ ++ u32 tid; /**< Thread ID of submitting thread */ ++ u32 id; /**< Identifier for this job in kernel space (sequential numbering) */ ++ u32 cache_order; /**< Cache order used for L2 cache flushing (sequential numbering) */ ++ struct mali_timeline_tracker tracker; /**< Timeline tracker for this job */ ++ struct mali_timeline_tracker *pp_tracker; /**< Pointer to Timeline tracker for PP job that depends on this job. */ ++ _mali_osk_notification_t *finished_notification; /**< Notification sent back to userspace on job complete */ + -+ case KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES: -+ { -+ enum kbase_pm_cores_ready cores_ready; ++ /* ++ * These members are used by the scheduler, ++ * protected by scheduler lock ++ */ ++ _mali_osk_list_t list; /**< Used to link jobs together in the scheduler queue */ + -+ KBASE_DEBUG_ASSERT(katom->affinity != 0 || -+ (katom->core_req & BASE_JD_REQ_T)); ++ /* ++ * These members are used by the executor and/or group, ++ * protected by executor lock ++ */ ++ _mali_osk_notification_t *oom_notification; /**< Notification sent back to userspace on OOM */ + -+ cores_ready = kbase_pm_register_inuse_cores( -+ kbdev, -+ katom->core_req & BASE_JD_REQ_T, -+ katom->affinity); -+ if (cores_ready == KBASE_NEW_AFFINITY) { -+ /* Affinity no longer valid - return to -+ * previous state */ -+ kbasep_js_job_check_deref_cores(kbdev, -+ katom); -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, -+ JS_CORE_REF_REGISTER_INUSE_FAILED, -+ katom->kctx, katom, -+ katom->jc, js, -+ (u32) katom->affinity); -+ /* *** BREAK OUT: Return to previous -+ * state, retry *** */ -+ retry = true; -+ break; -+ } -+ if (cores_ready == KBASE_CORES_NOT_READY) { -+ /* Stay in this state and return, to -+ * retry at this state later */ -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, -+ JS_CORE_REF_REGISTER_INUSE_FAILED, -+ katom->kctx, katom, -+ katom->jc, js, -+ (u32) katom->affinity); -+ /* *** BREAK OUT: No state transition -+ * *** */ -+ break; -+ } -+ /* Proceed to next state */ -+ katom->coreref_state = -+ KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY; -+ } -+ -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ -+ -+ case KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY: -+ KBASE_DEBUG_ASSERT(katom->affinity != 0 || -+ (katom->core_req & BASE_JD_REQ_T)); -+ -+ /* Optimize out choosing the affinity twice in the same -+ * function call */ -+ if (chosen_affinity == false) { -+ /* See if the affinity changed since a previous -+ * call. */ -+ if (false == kbase_js_choose_affinity( -+ &recently_chosen_affinity, -+ kbdev, katom, js)) { -+ /* No cores are currently available */ -+ kbasep_js_job_check_deref_cores(kbdev, -+ katom); -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, -+ JS_CORE_REF_REQUEST_ON_RECHECK_FAILED, -+ katom->kctx, katom, -+ katom->jc, js, -+ (u32) recently_chosen_affinity); -+ /* *** BREAK OUT: Transition to lower -+ * state *** */ -+ break; -+ } -+ chosen_affinity = true; -+ } -+ -+ /* Now see if this requires a different set of cores */ -+ if (recently_chosen_affinity != katom->affinity) { -+ enum kbase_pm_cores_ready cores_ready; -+ -+ kbase_pm_request_cores(kbdev, -+ katom->core_req & BASE_JD_REQ_T, -+ recently_chosen_affinity); -+ -+ /* Register new cores whilst we still hold the -+ * old ones, to minimize power transitions */ -+ cores_ready = -+ kbase_pm_register_inuse_cores(kbdev, -+ katom->core_req & BASE_JD_REQ_T, -+ recently_chosen_affinity); -+ kbasep_js_job_check_deref_cores(kbdev, katom); -+ -+ /* Fixup the state that was reduced by -+ * deref_cores: */ -+ katom->coreref_state = -+ KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY; -+ katom->affinity = recently_chosen_affinity; -+ if (cores_ready == KBASE_NEW_AFFINITY) { -+ /* Affinity no longer valid - return to -+ * previous state */ -+ katom->coreref_state = -+ KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES; -+ -+ kbasep_js_job_check_deref_cores(kbdev, -+ katom); -+ -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, -+ JS_CORE_REF_REGISTER_INUSE_FAILED, -+ katom->kctx, katom, -+ katom->jc, js, -+ (u32) katom->affinity); -+ /* *** BREAK OUT: Return to previous -+ * state, retry *** */ -+ retry = true; -+ break; -+ } -+ /* Now might be waiting for powerup again, with -+ * a new affinity */ -+ if (cores_ready == KBASE_CORES_NOT_READY) { -+ /* Return to previous state */ -+ katom->coreref_state = -+ KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES; -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, -+ JS_CORE_REF_REGISTER_ON_RECHECK_FAILED, -+ katom->kctx, katom, -+ katom->jc, js, -+ (u32) katom->affinity); -+ /* *** BREAK OUT: Transition to lower -+ * state *** */ -+ break; -+ } -+ } -+ /* Proceed to next state */ -+ katom->coreref_state = -+ KBASE_ATOM_COREREF_STATE_CHECK_AFFINITY_VIOLATIONS; -+ -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ -+ case KBASE_ATOM_COREREF_STATE_CHECK_AFFINITY_VIOLATIONS: -+ KBASE_DEBUG_ASSERT(katom->affinity != 0 || -+ (katom->core_req & BASE_JD_REQ_T)); -+ KBASE_DEBUG_ASSERT(katom->affinity == -+ recently_chosen_affinity); ++ /* ++ * Set by executor/group on job completion, read by scheduler when ++ * returning job to user. Hold executor lock when setting, ++ * no lock needed when reading ++ */ ++ u32 heap_current_addr; /**< Holds the current HEAP address when the job has completed */ ++ u32 perf_counter_value0; /**< Value of performance counter 0 (to be returned to user space) */ ++ u32 perf_counter_value1; /**< Value of performance counter 1 (to be returned to user space) */ ++ struct mali_defer_mem *dmem; /** < used for defer bind to store dmem info */ ++ struct list_head varying_alloc; /**< hold the list of varying allocations */ ++ u32 bind_flag; /** < flag for deferbind*/ ++ u32 *varying_list; /**< varying memory list need to to defer bind*/ ++ struct list_head vary_todo; /**< list of backend list need to do defer bind*/ ++ u32 required_varying_memsize; /** < size of varying memory to reallocate*/ ++ u32 big_job; /** < if the gp job have large varying output and may take long time*/ ++}; + -+ /* Note: this is where the caller must've taken the -+ * hwaccess_lock */ ++#define MALI_DEFER_BIND_MEMORY_PREPARED (0x1 << 0) ++#define MALI_DEFER_BIND_MEMORY_BINDED (0x1 << 2) + -+ /* Check for affinity violations - if there are any, -+ * then we just ask the caller to requeue and try again -+ * later */ -+ if (kbase_js_affinity_would_violate(kbdev, js, -+ katom->affinity) != false) { -+ /* Return to previous state */ -+ katom->coreref_state = -+ KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY; -+ /* *** BREAK OUT: Transition to lower state *** -+ */ -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, -+ JS_CORE_REF_AFFINITY_WOULD_VIOLATE, -+ katom->kctx, katom, katom->jc, js, -+ (u32) katom->affinity); -+ break; -+ } ++struct mali_gp_allocation_node { ++ struct list_head node; ++ mali_mem_allocation *alloc; ++}; + -+ /* No affinity violations would result, so the cores are -+ * ready */ -+ katom->coreref_state = KBASE_ATOM_COREREF_STATE_READY; -+ /* *** BREAK OUT: Cores Ready *** */ -+ break; ++struct mali_gp_job *mali_gp_job_create(struct mali_session_data *session, _mali_uk_gp_start_job_s *uargs, u32 id, struct mali_timeline_tracker *pp_tracker); ++void mali_gp_job_delete(struct mali_gp_job *job); + -+ default: -+ KBASE_DEBUG_ASSERT_MSG(false, -+ "Unhandled kbase_atom_coreref_state %d", -+ katom->coreref_state); -+ break; -+ } -+ } while (retry != false); ++u32 mali_gp_job_get_gp_counter_src0(void); ++void mali_gp_job_set_gp_counter_src0(u32 counter); ++u32 mali_gp_job_get_gp_counter_src1(void); ++void mali_gp_job_set_gp_counter_src1(u32 counter); + -+ return (katom->coreref_state == KBASE_ATOM_COREREF_STATE_READY); ++MALI_STATIC_INLINE u32 mali_gp_job_get_id(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return (NULL == job) ? 0 : job->id; +} + -+static void kbasep_js_job_check_deref_cores(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) ++MALI_STATIC_INLINE void mali_gp_job_set_cache_order(struct mali_gp_job *job, ++ u32 cache_order) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(katom != NULL); ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ job->cache_order = cache_order; ++} + -+ switch (katom->coreref_state) { -+ case KBASE_ATOM_COREREF_STATE_READY: -+ /* State where atom was submitted to the HW - just proceed to -+ * power-down */ -+ KBASE_DEBUG_ASSERT(katom->affinity != 0 || -+ (katom->core_req & BASE_JD_REQ_T)); ++MALI_STATIC_INLINE u32 mali_gp_job_get_cache_order(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return (NULL == job) ? 0 : job->cache_order; ++} + -+ /* *** FALLTHROUGH *** */ ++MALI_STATIC_INLINE u64 mali_gp_job_get_user_id(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.user_job_ptr; ++} + -+ case KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY: -+ /* State where cores were registered */ -+ KBASE_DEBUG_ASSERT(katom->affinity != 0 || -+ (katom->core_req & BASE_JD_REQ_T)); -+ kbase_pm_release_cores(kbdev, katom->core_req & BASE_JD_REQ_T, -+ katom->affinity); ++MALI_STATIC_INLINE u32 mali_gp_job_get_frame_builder_id(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.frame_builder_id; ++} + -+ break; ++MALI_STATIC_INLINE u32 mali_gp_job_get_flush_id(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.flush_id; ++} + -+ case KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES: -+ /* State where cores were requested, but not registered */ -+ KBASE_DEBUG_ASSERT(katom->affinity != 0 || -+ (katom->core_req & BASE_JD_REQ_T)); -+ kbase_pm_unrequest_cores(kbdev, katom->core_req & BASE_JD_REQ_T, -+ katom->affinity); -+ break; ++MALI_STATIC_INLINE u32 mali_gp_job_get_pid(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->pid; ++} + -+ case KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED: -+ /* Initial state - nothing required */ -+ KBASE_DEBUG_ASSERT(katom->affinity == 0); -+ break; ++MALI_STATIC_INLINE u32 mali_gp_job_get_tid(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->tid; ++} + -+ default: -+ KBASE_DEBUG_ASSERT_MSG(false, -+ "Unhandled coreref_state: %d", -+ katom->coreref_state); -+ break; -+ } ++MALI_STATIC_INLINE u32 *mali_gp_job_get_frame_registers(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.frame_registers; ++} + -+ katom->affinity = 0; -+ katom->coreref_state = KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED; ++MALI_STATIC_INLINE struct mali_session_data *mali_gp_job_get_session(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->session; +} + -+static void kbasep_js_job_check_deref_cores_nokatom(struct kbase_device *kbdev, -+ base_jd_core_req core_req, u64 affinity, -+ enum kbase_atom_coreref_state coreref_state) ++MALI_STATIC_INLINE mali_bool mali_gp_job_has_vs_job(struct mali_gp_job *job) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return (job->uargs.frame_registers[0] != job->uargs.frame_registers[1]) ? MALI_TRUE : MALI_FALSE; ++} + -+ switch (coreref_state) { -+ case KBASE_ATOM_COREREF_STATE_READY: -+ /* State where atom was submitted to the HW - just proceed to -+ * power-down */ -+ KBASE_DEBUG_ASSERT(affinity != 0 || -+ (core_req & BASE_JD_REQ_T)); ++MALI_STATIC_INLINE mali_bool mali_gp_job_has_plbu_job(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return (job->uargs.frame_registers[2] != job->uargs.frame_registers[3]) ? MALI_TRUE : MALI_FALSE; ++} + -+ /* *** FALLTHROUGH *** */ ++MALI_STATIC_INLINE u32 mali_gp_job_get_current_heap_addr(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->heap_current_addr; ++} + -+ case KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY: -+ /* State where cores were registered */ -+ KBASE_DEBUG_ASSERT(affinity != 0 || -+ (core_req & BASE_JD_REQ_T)); -+ kbase_pm_release_cores(kbdev, core_req & BASE_JD_REQ_T, -+ affinity); ++MALI_STATIC_INLINE void mali_gp_job_set_current_heap_addr(struct mali_gp_job *job, u32 heap_addr) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ job->heap_current_addr = heap_addr; ++} + -+ break; ++MALI_STATIC_INLINE u32 mali_gp_job_get_perf_counter_flag(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.perf_counter_flag; ++} + -+ case KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES: -+ /* State where cores were requested, but not registered */ -+ KBASE_DEBUG_ASSERT(affinity != 0 || -+ (core_req & BASE_JD_REQ_T)); -+ kbase_pm_unrequest_cores(kbdev, core_req & BASE_JD_REQ_T, -+ affinity); -+ break; ++MALI_STATIC_INLINE u32 mali_gp_job_get_perf_counter_src0(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.perf_counter_src0; ++} + -+ case KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED: -+ /* Initial state - nothing required */ -+ KBASE_DEBUG_ASSERT(affinity == 0); -+ break; ++MALI_STATIC_INLINE u32 mali_gp_job_get_perf_counter_src1(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.perf_counter_src1; ++} + -+ default: -+ KBASE_DEBUG_ASSERT_MSG(false, -+ "Unhandled coreref_state: %d", -+ coreref_state); -+ break; -+ } ++MALI_STATIC_INLINE u32 mali_gp_job_get_perf_counter_value0(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->perf_counter_value0; +} + -+static void kbase_gpu_release_atom(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, -+ ktime_t *end_timestamp) ++MALI_STATIC_INLINE u32 mali_gp_job_get_perf_counter_value1(struct mali_gp_job *job) +{ -+ struct kbase_context *kctx = katom->kctx; ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->perf_counter_value1; ++} + -+ switch (katom->gpu_rb_state) { -+ case KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB: -+ /* Should be impossible */ -+ WARN(1, "Attempting to release atom not in ringbuffer\n"); -+ break; ++MALI_STATIC_INLINE void mali_gp_job_set_perf_counter_src0(struct mali_gp_job *job, u32 src) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ job->uargs.perf_counter_src0 = src; ++} + -+ case KBASE_ATOM_GPU_RB_SUBMITTED: -+ /* Inform power management at start/finish of atom so it can -+ * update its GPU utilisation metrics. Mark atom as not -+ * submitted beforehand. */ -+ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_READY; -+ kbase_pm_metrics_update(kbdev, end_timestamp); ++MALI_STATIC_INLINE void mali_gp_job_set_perf_counter_src1(struct mali_gp_job *job, u32 src) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ job->uargs.perf_counter_src1 = src; ++} + -+ if (katom->core_req & BASE_JD_REQ_PERMON) -+ kbase_pm_release_gpu_cycle_counter_nolock(kbdev); -+ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ ++MALI_STATIC_INLINE void mali_gp_job_set_perf_counter_value0(struct mali_gp_job *job, u32 value) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ job->perf_counter_value0 = value; ++} + -+ KBASE_TLSTREAM_TL_NRET_ATOM_LPU(katom, -+ &kbdev->gpu_props.props.raw_props.js_features -+ [katom->slot_nr]); -+ KBASE_TLSTREAM_TL_NRET_ATOM_AS(katom, &kbdev->as[kctx->as_nr]); -+ KBASE_TLSTREAM_TL_NRET_CTX_LPU(kctx, -+ &kbdev->gpu_props.props.raw_props.js_features -+ [katom->slot_nr]); ++MALI_STATIC_INLINE void mali_gp_job_set_perf_counter_value1(struct mali_gp_job *job, u32 value) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ job->perf_counter_value1 = value; ++} + -+ case KBASE_ATOM_GPU_RB_READY: -+ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ ++void mali_gp_job_list_add(struct mali_gp_job *job, _mali_osk_list_t *list); + -+ case KBASE_ATOM_GPU_RB_WAITING_AFFINITY: -+ kbase_js_affinity_release_slot_cores(kbdev, katom->slot_nr, -+ katom->affinity); -+ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ ++MALI_STATIC_INLINE void mali_gp_job_list_move(struct mali_gp_job *job, ++ _mali_osk_list_t *list) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(!_mali_osk_list_empty(&job->list)); ++ _mali_osk_list_move(&job->list, list); ++} + -+ case KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE: -+ break; ++MALI_STATIC_INLINE void mali_gp_job_list_remove(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ _mali_osk_list_delinit(&job->list); ++} + -+ case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION: -+ if (katom->protected_state.enter != -+ KBASE_ATOM_ENTER_PROTECTED_CHECK || -+ katom->protected_state.exit != -+ KBASE_ATOM_EXIT_PROTECTED_CHECK) -+ kbdev->protected_mode_transition = false; ++MALI_STATIC_INLINE _mali_osk_notification_t * ++mali_gp_job_get_finished_notification(struct mali_gp_job *job) ++{ ++ _mali_osk_notification_t *notification; + -+ if (kbase_jd_katom_is_protected(katom) && -+ (katom->protected_state.enter == -+ KBASE_ATOM_ENTER_PROTECTED_IDLE_L2)) { -+ kbase_vinstr_resume(kbdev->vinstr_ctx); ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_POINTER(job->finished_notification); + -+ /* Go back to configured model for IPA */ -+ kbase_ipa_model_use_configured_locked(kbdev); -+ } ++ notification = job->finished_notification; ++ job->finished_notification = NULL; + ++ return notification; ++} + -+ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ ++MALI_STATIC_INLINE _mali_osk_notification_t *mali_gp_job_get_oom_notification( ++ struct mali_gp_job *job) ++{ ++ _mali_osk_notification_t *notification; + -+ case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV: -+ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT_POINTER(job->oom_notification); + -+ case KBASE_ATOM_GPU_RB_WAITING_BLOCKED: -+ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ ++ notification = job->oom_notification; ++ job->oom_notification = NULL; + -+ case KBASE_ATOM_GPU_RB_RETURN_TO_JS: -+ break; -+ } ++ return notification; ++} + -+ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_WAITING_BLOCKED; -+ katom->protected_state.exit = KBASE_ATOM_EXIT_PROTECTED_CHECK; ++MALI_STATIC_INLINE void mali_gp_job_set_oom_notification( ++ struct mali_gp_job *job, ++ _mali_osk_notification_t *notification) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(NULL == job->oom_notification); ++ job->oom_notification = notification; +} + -+static void kbase_gpu_mark_atom_for_return(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) ++MALI_STATIC_INLINE struct mali_timeline_tracker *mali_gp_job_get_tracker( ++ struct mali_gp_job *job) +{ -+ kbase_gpu_release_atom(kbdev, katom, NULL); -+ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_RETURN_TO_JS; ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return &(job->tracker); +} + -+static inline bool kbase_gpu_rmu_workaround(struct kbase_device *kbdev, int js) ++ ++MALI_STATIC_INLINE u32 *mali_gp_job_get_timeline_point_ptr( ++ struct mali_gp_job *job) +{ -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; -+ bool slot_busy[3]; ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return (u32 __user *)(uintptr_t)job->uargs.timeline_point_ptr; ++} + -+ if (!kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987)) -+ return true; -+ slot_busy[0] = kbase_gpu_nr_atoms_on_slot_min(kbdev, 0, -+ KBASE_ATOM_GPU_RB_WAITING_AFFINITY); -+ slot_busy[1] = kbase_gpu_nr_atoms_on_slot_min(kbdev, 1, -+ KBASE_ATOM_GPU_RB_WAITING_AFFINITY); -+ slot_busy[2] = kbase_gpu_nr_atoms_on_slot_min(kbdev, 2, -+ KBASE_ATOM_GPU_RB_WAITING_AFFINITY); + -+ if ((js == 2 && !(slot_busy[0] || slot_busy[1])) || -+ (js != 2 && !slot_busy[2])) -+ return true; ++/** ++ * Release reference on tracker for PP job that depends on this GP job. ++ * ++ * @note If GP job has a reference on tracker, this function MUST be called before the GP job is ++ * deleted. ++ * ++ * @param job GP job that is done. ++ * @param success MALI_TRUE if job completed successfully, MALI_FALSE if not. ++ * @return A scheduling bitmask indicating whether scheduling needs to be done. ++ */ ++mali_scheduler_mask mali_gp_job_signal_pp_tracker(struct mali_gp_job *job, mali_bool success); + -+ /* Don't submit slot 2 atom while GPU has jobs on slots 0/1 */ -+ if (js == 2 && (kbase_gpu_atoms_submitted(kbdev, 0) || -+ kbase_gpu_atoms_submitted(kbdev, 1) || -+ backend->rmu_workaround_flag)) -+ return false; ++#endif /* __MALI_GP_JOB_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_group.c b/drivers/gpu/arm/mali400/mali/common/mali_group.c +new file mode 100755 +index 000000000..47979a2f1 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_group.c +@@ -0,0 +1,1875 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include "mali_kernel_common.h" ++#include "mali_group.h" ++#include "mali_osk.h" ++#include "mali_l2_cache.h" ++#include "mali_gp.h" ++#include "mali_pp.h" ++#include "mali_mmu.h" ++#include "mali_dlbu.h" ++#include "mali_broadcast.h" ++#include "mali_scheduler.h" ++#include "mali_osk_profiling.h" ++#include "mali_osk_mali.h" ++#include "mali_pm_domain.h" ++#include "mali_pm.h" ++#include "mali_executor.h" + -+ /* Don't submit slot 0/1 atom while GPU has jobs on slot 2 */ -+ if (js != 2 && (kbase_gpu_atoms_submitted(kbdev, 2) || -+ !backend->rmu_workaround_flag)) -+ return false; ++#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) ++#include ++#include ++#endif + -+ backend->rmu_workaround_flag = !backend->rmu_workaround_flag; ++#define MALI_MAX_NUM_DOMAIN_REFS (MALI_MAX_NUMBER_OF_GROUPS * 2) + -+ return true; -+} ++#if defined(CONFIG_MALI400_PROFILING) ++static void mali_group_report_l2_cache_counters_per_core(struct mali_group *group, u32 core_num); ++#endif /* #if defined(CONFIG_MALI400_PROFILING) */ + -+/** -+ * other_slots_busy - Determine if any job slots other than @js are currently -+ * running atoms -+ * @kbdev: Device pointer -+ * @js: Job slot -+ * -+ * Return: true if any slots other than @js are busy, false otherwise -+ */ -+static inline bool other_slots_busy(struct kbase_device *kbdev, int js) -+{ -+ int slot; ++static struct mali_group *mali_global_groups[MALI_MAX_NUMBER_OF_GROUPS] = { NULL, }; ++static u32 mali_global_num_groups = 0; + -+ for (slot = 0; slot < kbdev->gpu_props.num_job_slots; slot++) { -+ if (slot == js) -+ continue; ++/* SW timer for job execution */ ++int mali_max_job_runtime = MALI_MAX_JOB_RUNTIME_DEFAULT; + -+ if (kbase_gpu_nr_atoms_on_slot_min(kbdev, slot, -+ KBASE_ATOM_GPU_RB_SUBMITTED)) -+ return true; -+ } ++/* local helper functions */ ++static void mali_group_bottom_half_mmu(void *data); ++static void mali_group_bottom_half_gp(void *data); ++static void mali_group_bottom_half_pp(void *data); ++static void mali_group_timeout(void *data); ++static void mali_group_reset_pp(struct mali_group *group); ++static void mali_group_reset_mmu(struct mali_group *group); + -+ return false; -+} ++static void mali_group_activate_page_directory(struct mali_group *group, struct mali_session_data *session, mali_bool is_reload); ++static void mali_group_recovery_reset(struct mali_group *group); + -+static inline bool kbase_gpu_in_protected_mode(struct kbase_device *kbdev) ++struct mali_group *mali_group_create(struct mali_l2_cache_core *core, ++ struct mali_dlbu_core *dlbu, ++ struct mali_bcast_unit *bcast, ++ u32 domain_index) +{ -+ return kbdev->protected_mode; -+} ++ struct mali_group *group = NULL; + -+static int kbase_gpu_protected_mode_enter(struct kbase_device *kbdev) -+{ -+ int err = -EINVAL; ++ if (mali_global_num_groups >= MALI_MAX_NUMBER_OF_GROUPS) { ++ MALI_PRINT_ERROR(("Mali group: Too many group objects created\n")); ++ return NULL; ++ } + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ group = _mali_osk_calloc(1, sizeof(struct mali_group)); ++ if (NULL != group) { ++ group->timeout_timer = _mali_osk_timer_init(mali_group_timeout); ++ if (NULL != group->timeout_timer) { ++ _mali_osk_timer_setcallback(group->timeout_timer, mali_group_timeout, (void *)group); + -+ WARN_ONCE(!kbdev->protected_ops, -+ "Cannot enter protected mode: protected callbacks not specified.\n"); ++ group->l2_cache_core[0] = core; ++ _mali_osk_list_init(&group->group_list); ++ _mali_osk_list_init(&group->executor_list); ++ _mali_osk_list_init(&group->pm_domain_list); ++ group->bcast_core = bcast; ++ group->dlbu_core = dlbu; + -+ /* -+ * When entering into protected mode, we must ensure that the -+ * GPU is not operating in coherent mode as well. This is to -+ * ensure that no protected memory can be leaked. -+ */ -+ if (kbdev->system_coherency == COHERENCY_ACE) -+ kbase_cache_set_coherency_mode(kbdev, COHERENCY_ACE_LITE); ++ /* register this object as a part of the correct power domain */ ++ if ((NULL != core) || (NULL != dlbu) || (NULL != bcast)) ++ group->pm_domain = mali_pm_register_group(domain_index, group); + -+ if (kbdev->protected_ops) { -+ /* Switch GPU to protected mode */ -+ err = kbdev->protected_ops->protected_mode_enable( -+ kbdev->protected_dev); ++ mali_global_groups[mali_global_num_groups] = group; ++ mali_global_num_groups++; + -+ if (err) -+ dev_warn(kbdev->dev, "Failed to enable protected mode: %d\n", -+ err); -+ else -+ kbdev->protected_mode = true; ++ return group; ++ } ++ _mali_osk_free(group); + } + -+ return err; ++ return NULL; +} + -+static int kbase_gpu_protected_mode_reset(struct kbase_device *kbdev) ++void mali_group_delete(struct mali_group *group) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ u32 i; + -+ WARN_ONCE(!kbdev->protected_ops, -+ "Cannot exit protected mode: protected callbacks not specified.\n"); ++ MALI_DEBUG_PRINT(4, ("Deleting group %s\n", ++ mali_group_core_description(group))); + -+ if (!kbdev->protected_ops) -+ return -EINVAL; ++ MALI_DEBUG_ASSERT(NULL == group->parent_group); ++ MALI_DEBUG_ASSERT((MALI_GROUP_STATE_INACTIVE == group->state) || ((MALI_GROUP_STATE_ACTIVATION_PENDING == group->state))); + -+ /* The protected mode disable callback will be called as part of reset -+ */ -+ kbase_reset_gpu_silent(kbdev); ++ /* Delete the resources that this group owns */ ++ if (NULL != group->gp_core) { ++ mali_gp_delete(group->gp_core); ++ } + -+ return 0; -+} ++ if (NULL != group->pp_core) { ++ mali_pp_delete(group->pp_core); ++ } + -+static int kbase_jm_enter_protected_mode(struct kbase_device *kbdev, -+ struct kbase_jd_atom **katom, int idx, int js) -+{ -+ int err = 0; ++ if (NULL != group->mmu) { ++ mali_mmu_delete(group->mmu); ++ } + -+ switch (katom[idx]->protected_state.enter) { -+ case KBASE_ATOM_ENTER_PROTECTED_CHECK: -+ KBASE_TLSTREAM_AUX_PROTECTED_ENTER_START(kbdev); -+ /* The checks in KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV -+ * should ensure that we are not already transitiong, and that -+ * there are no atoms currently on the GPU. */ -+ WARN_ON(kbdev->protected_mode_transition); -+ WARN_ON(kbase_gpu_atoms_submitted_any(kbdev)); ++ if (mali_group_is_virtual(group)) { ++ /* Remove all groups from virtual group */ ++ struct mali_group *child; ++ struct mali_group *temp; + -+ kbdev->protected_mode_transition = true; -+ katom[idx]->protected_state.enter = -+ KBASE_ATOM_ENTER_PROTECTED_VINSTR; ++ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { ++ child->parent_group = NULL; ++ mali_group_delete(child); ++ } + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++ mali_dlbu_delete(group->dlbu_core); + -+ case KBASE_ATOM_ENTER_PROTECTED_VINSTR: -+ if (kbase_vinstr_try_suspend(kbdev->vinstr_ctx) < 0) { -+ /* -+ * We can't switch now because -+ * the vinstr core state switch -+ * is not done yet. -+ */ -+ return -EAGAIN; ++ if (NULL != group->bcast_core) { ++ mali_bcast_unit_delete(group->bcast_core); + } ++ } + -+ /* Use generic model for IPA in protected mode */ -+ kbase_ipa_model_use_fallback_locked(kbdev); ++ for (i = 0; i < mali_global_num_groups; i++) { ++ if (mali_global_groups[i] == group) { ++ mali_global_groups[i] = NULL; ++ mali_global_num_groups--; + -+ /* Once reaching this point GPU must be -+ * switched to protected mode or vinstr -+ * re-enabled. */ ++ if (i != mali_global_num_groups) { ++ /* We removed a group from the middle of the array -- move the last ++ * group to the current position to close the gap */ ++ mali_global_groups[i] = mali_global_groups[mali_global_num_groups]; ++ mali_global_groups[mali_global_num_groups] = NULL; ++ } + -+ /* -+ * Not in correct mode, begin protected mode switch. -+ * Entering protected mode requires us to power down the L2, -+ * and drop out of fully coherent mode. -+ */ -+ katom[idx]->protected_state.enter = -+ KBASE_ATOM_ENTER_PROTECTED_IDLE_L2; ++ break; ++ } ++ } + -+ kbase_pm_update_cores_state_nolock(kbdev); ++ if (NULL != group->timeout_timer) { ++ _mali_osk_timer_del(group->timeout_timer); ++ _mali_osk_timer_term(group->timeout_timer); ++ } + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++ if (NULL != group->bottom_half_work_mmu) { ++ _mali_osk_wq_delete_work(group->bottom_half_work_mmu); ++ } + -+ case KBASE_ATOM_ENTER_PROTECTED_IDLE_L2: -+ /* Avoid unnecessary waiting on non-ACE platforms. */ -+ if (kbdev->current_gpu_coherency_mode == COHERENCY_ACE) { -+ if (kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_L2) || -+ kbase_pm_get_trans_cores(kbdev, KBASE_PM_CORE_L2)) { -+ /* -+ * The L2 is still powered, wait for all the users to -+ * finish with it before doing the actual reset. -+ */ -+ return -EAGAIN; -+ } -+ } ++ if (NULL != group->bottom_half_work_gp) { ++ _mali_osk_wq_delete_work(group->bottom_half_work_gp); ++ } + -+ katom[idx]->protected_state.enter = -+ KBASE_ATOM_ENTER_PROTECTED_FINISHED; ++ if (NULL != group->bottom_half_work_pp) { ++ _mali_osk_wq_delete_work(group->bottom_half_work_pp); ++ } + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++ _mali_osk_free(group); ++} + -+ case KBASE_ATOM_ENTER_PROTECTED_FINISHED: ++_mali_osk_errcode_t mali_group_add_mmu_core(struct mali_group *group, struct mali_mmu_core *mmu_core) ++{ ++ /* This group object now owns the MMU core object */ ++ group->mmu = mmu_core; ++ group->bottom_half_work_mmu = _mali_osk_wq_create_work(mali_group_bottom_half_mmu, group); ++ if (NULL == group->bottom_half_work_mmu) { ++ return _MALI_OSK_ERR_FAULT; ++ } ++ return _MALI_OSK_ERR_OK; ++} + -+ /* No jobs running, so we can switch GPU mode right now. */ -+ err = kbase_gpu_protected_mode_enter(kbdev); ++void mali_group_remove_mmu_core(struct mali_group *group) ++{ ++ /* This group object no longer owns the MMU core object */ ++ group->mmu = NULL; ++ if (NULL != group->bottom_half_work_mmu) { ++ _mali_osk_wq_delete_work(group->bottom_half_work_mmu); ++ } ++} + -+ /* -+ * Regardless of result, we are no longer transitioning -+ * the GPU. -+ */ -+ kbdev->protected_mode_transition = false; -+ KBASE_TLSTREAM_AUX_PROTECTED_ENTER_END(kbdev); -+ if (err) { -+ /* -+ * Failed to switch into protected mode, resume -+ * vinstr core and fail atom. -+ */ -+ kbase_vinstr_resume(kbdev->vinstr_ctx); -+ katom[idx]->event_code = BASE_JD_EVENT_JOB_INVALID; -+ kbase_gpu_mark_atom_for_return(kbdev, katom[idx]); -+ /* Only return if head atom or previous atom -+ * already removed - as atoms must be returned -+ * in order. */ -+ if (idx == 0 || katom[0]->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { -+ kbase_gpu_dequeue_atom(kbdev, js, NULL); -+ kbase_jm_return_atom_to_js(kbdev, katom[idx]); -+ } ++_mali_osk_errcode_t mali_group_add_gp_core(struct mali_group *group, struct mali_gp_core *gp_core) ++{ ++ /* This group object now owns the GP core object */ ++ group->gp_core = gp_core; ++ group->bottom_half_work_gp = _mali_osk_wq_create_work(mali_group_bottom_half_gp, group); ++ if (NULL == group->bottom_half_work_gp) { ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ /* Go back to configured model for IPA */ -+ kbase_ipa_model_use_configured_locked(kbdev); ++ return _MALI_OSK_ERR_OK; ++} + -+ return -EINVAL; -+ } ++void mali_group_remove_gp_core(struct mali_group *group) ++{ ++ /* This group object no longer owns the GP core object */ ++ group->gp_core = NULL; ++ if (NULL != group->bottom_half_work_gp) { ++ _mali_osk_wq_delete_work(group->bottom_half_work_gp); ++ } ++} + -+ /* Protected mode sanity checks. */ -+ KBASE_DEBUG_ASSERT_MSG( -+ kbase_jd_katom_is_protected(katom[idx]) == -+ kbase_gpu_in_protected_mode(kbdev), -+ "Protected mode of atom (%d) doesn't match protected mode of GPU (%d)", -+ kbase_jd_katom_is_protected(katom[idx]), -+ kbase_gpu_in_protected_mode(kbdev)); -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_READY; ++_mali_osk_errcode_t mali_group_add_pp_core(struct mali_group *group, struct mali_pp_core *pp_core) ++{ ++ /* This group object now owns the PP core object */ ++ group->pp_core = pp_core; ++ group->bottom_half_work_pp = _mali_osk_wq_create_work(mali_group_bottom_half_pp, group); ++ if (NULL == group->bottom_half_work_pp) { ++ return _MALI_OSK_ERR_FAULT; + } ++ return _MALI_OSK_ERR_OK; ++} + -+ return 0; ++void mali_group_remove_pp_core(struct mali_group *group) ++{ ++ /* This group object no longer owns the PP core object */ ++ group->pp_core = NULL; ++ if (NULL != group->bottom_half_work_pp) { ++ _mali_osk_wq_delete_work(group->bottom_half_work_pp); ++ } +} + -+static int kbase_jm_exit_protected_mode(struct kbase_device *kbdev, -+ struct kbase_jd_atom **katom, int idx, int js) ++enum mali_group_state mali_group_activate(struct mali_group *group) +{ -+ int err = 0; ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + ++ MALI_DEBUG_PRINT(4, ("Group: Activating group %s\n", ++ mali_group_core_description(group))); + -+ switch (katom[idx]->protected_state.exit) { -+ case KBASE_ATOM_EXIT_PROTECTED_CHECK: -+ KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_START(kbdev); -+ /* The checks in KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV -+ * should ensure that we are not already transitiong, and that -+ * there are no atoms currently on the GPU. */ -+ WARN_ON(kbdev->protected_mode_transition); -+ WARN_ON(kbase_gpu_atoms_submitted_any(kbdev)); ++ if (MALI_GROUP_STATE_INACTIVE == group->state) { ++ /* Group is inactive, get PM refs in order to power up */ + + /* -+ * Exiting protected mode requires a reset, but first the L2 -+ * needs to be powered down to ensure it's not active when the -+ * reset is issued. ++ * We'll take a maximum of 2 power domain references pr group, ++ * one for the group itself, and one for it's L2 cache. + */ -+ katom[idx]->protected_state.exit = -+ KBASE_ATOM_EXIT_PROTECTED_IDLE_L2; -+ -+ kbdev->protected_mode_transition = true; -+ kbase_pm_update_cores_state_nolock(kbdev); ++ struct mali_pm_domain *domains[MALI_MAX_NUM_DOMAIN_REFS]; ++ struct mali_group *groups[MALI_MAX_NUM_DOMAIN_REFS]; ++ u32 num_domains = 0; ++ mali_bool all_groups_on; + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ -+ case KBASE_ATOM_EXIT_PROTECTED_IDLE_L2: -+ if (kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_L2) || -+ kbase_pm_get_trans_cores(kbdev, KBASE_PM_CORE_L2)) { ++ /* Deal with child groups first */ ++ if (mali_group_is_virtual(group)) { + /* -+ * The L2 is still powered, wait for all the users to -+ * finish with it before doing the actual reset. ++ * The virtual group might have 0, 1 or 2 L2s in ++ * its l2_cache_core array, but we ignore these and ++ * let the child groups take the needed L2 cache ref ++ * on behalf of the virtual group. ++ * In other words; The L2 refs are taken in pair with ++ * the physical group which the L2 is attached to. + */ -+ return -EAGAIN; -+ } -+ katom[idx]->protected_state.exit = -+ KBASE_ATOM_EXIT_PROTECTED_RESET; ++ struct mali_group *child; ++ struct mali_group *temp; + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++ /* ++ * Child group is inactive, get PM ++ * refs in order to power up. ++ */ ++ _MALI_OSK_LIST_FOREACHENTRY(child, temp, ++ &group->group_list, ++ struct mali_group, group_list) { ++ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_INACTIVE ++ == child->state); + -+ case KBASE_ATOM_EXIT_PROTECTED_RESET: -+ /* Issue the reset to the GPU */ -+ err = kbase_gpu_protected_mode_reset(kbdev); ++ child->state = MALI_GROUP_STATE_ACTIVATION_PENDING; + -+ if (err) { -+ kbdev->protected_mode_transition = false; ++ MALI_DEBUG_ASSERT_POINTER( ++ child->pm_domain); ++ domains[num_domains] = child->pm_domain; ++ groups[num_domains] = child; ++ num_domains++; + -+ /* Failed to exit protected mode, fail atom */ -+ katom[idx]->event_code = BASE_JD_EVENT_JOB_INVALID; -+ kbase_gpu_mark_atom_for_return(kbdev, katom[idx]); -+ /* Only return if head atom or previous atom -+ * already removed - as atoms must be returned -+ * in order */ -+ if (idx == 0 || katom[0]->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { -+ kbase_gpu_dequeue_atom(kbdev, js, NULL); -+ kbase_jm_return_atom_to_js(kbdev, katom[idx]); ++ /* ++ * Take L2 domain ref for child group. ++ */ ++ MALI_DEBUG_ASSERT(MALI_MAX_NUM_DOMAIN_REFS ++ > num_domains); ++ domains[num_domains] = mali_l2_cache_get_pm_domain( ++ child->l2_cache_core[0]); ++ groups[num_domains] = NULL; ++ MALI_DEBUG_ASSERT(NULL == ++ child->l2_cache_core[1]); ++ num_domains++; + } ++ } else { ++ /* Take L2 domain ref for physical groups. */ ++ MALI_DEBUG_ASSERT(MALI_MAX_NUM_DOMAIN_REFS > ++ num_domains); + -+ kbase_vinstr_resume(kbdev->vinstr_ctx); ++ domains[num_domains] = mali_l2_cache_get_pm_domain( ++ group->l2_cache_core[0]); ++ groups[num_domains] = NULL; ++ MALI_DEBUG_ASSERT(NULL == group->l2_cache_core[1]); ++ num_domains++; ++ } + -+ /* Use generic model for IPA in protected mode */ -+ kbase_ipa_model_use_fallback_locked(kbdev); ++ /* Do the group itself last (it's dependencies first) */ + -+ return -EINVAL; -+ } ++ group->state = MALI_GROUP_STATE_ACTIVATION_PENDING; + -+ katom[idx]->protected_state.exit = -+ KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT; ++ MALI_DEBUG_ASSERT_POINTER(group->pm_domain); ++ domains[num_domains] = group->pm_domain; ++ groups[num_domains] = group; ++ num_domains++; + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++ all_groups_on = mali_pm_get_domain_refs(domains, groups, ++ num_domains); + -+ case KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT: -+ /* A GPU reset is issued when exiting protected mode. Once the -+ * reset is done all atoms' state will also be reset. For this -+ * reason, if the atom is still in this state we can safely -+ * say that the reset has not completed i.e., we have not -+ * finished exiting protected mode yet. ++ /* ++ * Complete activation for group, include ++ * virtual group or physical group. + */ -+ return -EAGAIN; ++ if (MALI_TRUE == all_groups_on) { ++ ++ mali_group_set_active(group); ++ } ++ } else if (MALI_GROUP_STATE_ACTIVE == group->state) { ++ /* Already active */ ++ MALI_DEBUG_ASSERT(MALI_TRUE == group->power_is_on); ++ } else { ++ /* ++ * Activation already pending, group->power_is_on could ++ * be both true or false. We need to wait for power up ++ * notification anyway. ++ */ ++ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_ACTIVATION_PENDING ++ == group->state); + } + -+ return 0; ++ MALI_DEBUG_PRINT(4, ("Group: group %s activation result: %s\n", ++ mali_group_core_description(group), ++ MALI_GROUP_STATE_ACTIVE == group->state ? ++ "ACTIVE" : "PENDING")); ++ ++ return group->state; +} + -+void kbase_backend_slot_update(struct kbase_device *kbdev) ++mali_bool mali_group_set_active(struct mali_group *group) +{ -+ int js; ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_ACTIVATION_PENDING == group->state); ++ MALI_DEBUG_ASSERT(MALI_TRUE == group->power_is_on); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ MALI_DEBUG_PRINT(4, ("Group: Activation completed for %s\n", ++ mali_group_core_description(group))); + -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ struct kbase_jd_atom *katom[2]; -+ int idx; ++ if (mali_group_is_virtual(group)) { ++ struct mali_group *child; ++ struct mali_group *temp; + -+ katom[0] = kbase_gpu_inspect(kbdev, js, 0); -+ katom[1] = kbase_gpu_inspect(kbdev, js, 1); -+ WARN_ON(katom[1] && !katom[0]); ++ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, ++ struct mali_group, group_list) { ++ if (MALI_TRUE != child->power_is_on) { ++ return MALI_FALSE; ++ } + -+ for (idx = 0; idx < SLOT_RB_SIZE; idx++) { -+ bool cores_ready; -+ int ret; ++ child->state = MALI_GROUP_STATE_ACTIVE; ++ } + -+ if (!katom[idx]) -+ continue; ++ mali_group_reset(group); ++ } + -+ switch (katom[idx]->gpu_rb_state) { -+ case KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB: -+ /* Should be impossible */ -+ WARN(1, "Attempting to update atom not in ringbuffer\n"); -+ break; ++ /* Go to ACTIVE state */ ++ group->state = MALI_GROUP_STATE_ACTIVE; + -+ case KBASE_ATOM_GPU_RB_WAITING_BLOCKED: -+ if (katom[idx]->atom_flags & -+ KBASE_KATOM_FLAG_X_DEP_BLOCKED) -+ break; ++ return MALI_TRUE; ++} + -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV; ++mali_bool mali_group_deactivate(struct mali_group *group) ++{ ++ struct mali_pm_domain *domains[MALI_MAX_NUM_DOMAIN_REFS]; ++ u32 num_domains = 0; ++ mali_bool power_down = MALI_FALSE; + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_INACTIVE != group->state); + -+ case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV: -+ if (kbase_gpu_check_secure_atoms(kbdev, -+ !kbase_jd_katom_is_protected( -+ katom[idx]))) -+ break; ++ MALI_DEBUG_PRINT(3, ("Group: Deactivating group %s\n", ++ mali_group_core_description(group))); + -+ if ((idx == 1) && (kbase_jd_katom_is_protected( -+ katom[0]) != -+ kbase_jd_katom_is_protected( -+ katom[1]))) -+ break; ++ group->state = MALI_GROUP_STATE_INACTIVE; + -+ if (kbdev->protected_mode_transition) -+ break; ++ MALI_DEBUG_ASSERT_POINTER(group->pm_domain); ++ domains[num_domains] = group->pm_domain; ++ num_domains++; + -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION; ++ if (mali_group_is_virtual(group)) { ++ /* Release refs for all child groups */ ++ struct mali_group *child; ++ struct mali_group *temp; + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++ _MALI_OSK_LIST_FOREACHENTRY(child, temp, ++ &group->group_list, ++ struct mali_group, group_list) { ++ child->state = MALI_GROUP_STATE_INACTIVE; + -+ case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION: ++ MALI_DEBUG_ASSERT_POINTER(child->pm_domain); ++ domains[num_domains] = child->pm_domain; ++ num_domains++; + -+ /* -+ * Exiting protected mode must be done before -+ * the references on the cores are taken as -+ * a power down the L2 is required which -+ * can't happen after the references for this -+ * atom are taken. -+ */ ++ /* Release L2 cache domain for child groups */ ++ MALI_DEBUG_ASSERT(MALI_MAX_NUM_DOMAIN_REFS > ++ num_domains); ++ domains[num_domains] = mali_l2_cache_get_pm_domain( ++ child->l2_cache_core[0]); ++ MALI_DEBUG_ASSERT(NULL == child->l2_cache_core[1]); ++ num_domains++; ++ } + -+ if (!kbase_gpu_in_protected_mode(kbdev) && -+ kbase_jd_katom_is_protected(katom[idx])) { -+ /* Atom needs to transition into protected mode. */ -+ ret = kbase_jm_enter_protected_mode(kbdev, -+ katom, idx, js); -+ if (ret) -+ break; -+ } else if (kbase_gpu_in_protected_mode(kbdev) && -+ !kbase_jd_katom_is_protected(katom[idx])) { -+ /* Atom needs to transition out of protected mode. */ -+ ret = kbase_jm_exit_protected_mode(kbdev, -+ katom, idx, js); -+ if (ret) -+ break; -+ } -+ katom[idx]->protected_state.exit = -+ KBASE_ATOM_EXIT_PROTECTED_CHECK; ++ /* ++ * Must do mali_group_power_down() steps right here for ++ * virtual group, because virtual group itself is likely to ++ * stay powered on, however child groups are now very likely ++ * to be powered off (and thus lose their state). ++ */ + -+ /* Atom needs no protected mode transition. */ ++ mali_group_clear_session(group); ++ /* ++ * Disable the broadcast unit (clear it's mask). ++ * This is needed in case the GPU isn't actually ++ * powered down at this point and groups are ++ * removed from an inactive virtual group. ++ * If not, then the broadcast unit will intercept ++ * their interrupts! ++ */ ++ mali_bcast_disable(group->bcast_core); ++ } else { ++ /* Release L2 cache domain for physical groups */ ++ MALI_DEBUG_ASSERT(MALI_MAX_NUM_DOMAIN_REFS > ++ num_domains); ++ domains[num_domains] = mali_l2_cache_get_pm_domain( ++ group->l2_cache_core[0]); ++ MALI_DEBUG_ASSERT(NULL == group->l2_cache_core[1]); ++ num_domains++; ++ } + -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE; ++ power_down = mali_pm_put_domain_refs(domains, num_domains); + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++ return power_down; ++} + -+ case KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE: -+ if (katom[idx]->will_fail_event_code) { -+ kbase_gpu_mark_atom_for_return(kbdev, -+ katom[idx]); -+ /* Set EVENT_DONE so this atom will be -+ completed, not unpulled. */ -+ katom[idx]->event_code = -+ BASE_JD_EVENT_DONE; -+ /* Only return if head atom or previous -+ * atom already removed - as atoms must -+ * be returned in order. */ -+ if (idx == 0 || katom[0]->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { -+ kbase_gpu_dequeue_atom(kbdev, js, NULL); -+ kbase_jm_return_atom_to_js(kbdev, katom[idx]); -+ } -+ break; -+ } ++void mali_group_power_up(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ cores_ready = -+ kbasep_js_job_check_ref_cores(kbdev, js, -+ katom[idx]); ++ MALI_DEBUG_PRINT(3, ("Group: Power up for %s\n", ++ mali_group_core_description(group))); + -+ if (katom[idx]->event_code == -+ BASE_JD_EVENT_PM_EVENT) { -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_RETURN_TO_JS; -+ break; -+ } ++ group->power_is_on = MALI_TRUE; + -+ if (!cores_ready) -+ break; ++ if (MALI_FALSE == mali_group_is_virtual(group) ++ && MALI_FALSE == mali_group_is_in_virtual(group)) { ++ mali_group_reset(group); ++ } + -+ kbase_js_affinity_retain_slot_cores(kbdev, js, -+ katom[idx]->affinity); -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_WAITING_AFFINITY; ++ /* ++ * When we just acquire only one physical group form virt group, ++ * we should remove the bcast&dlbu mask from virt group and ++ * reset bcast and dlbu core, although part of pp cores in virt ++ * group maybe not be powered on. ++ */ ++ if (MALI_TRUE == mali_group_is_virtual(group)) { ++ mali_bcast_reset(group->bcast_core); ++ mali_dlbu_update_mask(group->dlbu_core); ++ } ++} + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++void mali_group_power_down(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT(MALI_TRUE == group->power_is_on); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ case KBASE_ATOM_GPU_RB_WAITING_AFFINITY: -+ if (!kbase_gpu_rmu_workaround(kbdev, js)) -+ break; ++ MALI_DEBUG_PRINT(3, ("Group: Power down for %s\n", ++ mali_group_core_description(group))); + -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_READY; ++ group->power_is_on = MALI_FALSE; + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++ if (mali_group_is_virtual(group)) { ++ /* ++ * What we do for physical jobs in this function should ++ * already have been done in mali_group_deactivate() ++ * for virtual group. ++ */ ++ MALI_DEBUG_ASSERT(NULL == group->session); ++ } else { ++ mali_group_clear_session(group); ++ } ++} + -+ case KBASE_ATOM_GPU_RB_READY: ++MALI_DEBUG_CODE(static void mali_group_print_virtual(struct mali_group *vgroup) ++{ ++ u32 i; ++ struct mali_group *group; ++ struct mali_group *temp; + -+ if (idx == 1) { -+ /* Only submit if head atom or previous -+ * atom already submitted */ -+ if ((katom[0]->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_SUBMITTED && -+ katom[0]->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB)) -+ break; ++ MALI_DEBUG_PRINT(4, ("Virtual group %s (%p)\n", ++ mali_group_core_description(vgroup), ++ vgroup)); ++ MALI_DEBUG_PRINT(4, ("l2_cache_core[0] = %p, ref = %d\n", vgroup->l2_cache_core[0], vgroup->l2_cache_core_ref_count[0])); ++ MALI_DEBUG_PRINT(4, ("l2_cache_core[1] = %p, ref = %d\n", vgroup->l2_cache_core[1], vgroup->l2_cache_core_ref_count[1])); + -+ /* If intra-slot serialization in use -+ * then don't submit atom to NEXT slot -+ */ -+ if (kbdev->serialize_jobs & -+ KBASE_SERIALIZE_INTRA_SLOT) -+ break; -+ } ++ i = 0; ++ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &vgroup->group_list, struct mali_group, group_list) { ++ MALI_DEBUG_PRINT(4, ("[%d] %s (%p), l2_cache_core[0] = %p\n", ++ i, mali_group_core_description(group), ++ group, group->l2_cache_core[0])); ++ i++; ++ } ++}) + -+ /* If inter-slot serialization in use then don't -+ * submit atom if any other slots are in use */ -+ if ((kbdev->serialize_jobs & -+ KBASE_SERIALIZE_INTER_SLOT) && -+ other_slots_busy(kbdev, js)) -+ break; ++static void mali_group_dump_core_status(struct mali_group *group) ++{ ++ u32 i; + -+ if ((kbdev->serialize_jobs & -+ KBASE_SERIALIZE_RESET) && -+ kbase_reset_gpu_active(kbdev)) -+ break; ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT(NULL != group->gp_core || (NULL != group->pp_core && !mali_group_is_virtual(group))); + -+ /* Check if this job needs the cycle counter -+ * enabled before submission */ -+ if (katom[idx]->core_req & BASE_JD_REQ_PERMON) -+ kbase_pm_request_gpu_cycle_counter_l2_is_on( -+ kbdev); ++ if (NULL != group->gp_core) { ++ MALI_PRINT(("Dump Group %s\n", group->gp_core->hw_core.description)); + -+ kbase_job_hw_submit(kbdev, katom[idx], js); -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_SUBMITTED; ++ for (i = 0; i < 0xA8; i += 0x10) { ++ MALI_PRINT(("0x%04x: 0x%08x 0x%08x 0x%08x 0x%08x\n", i, mali_hw_core_register_read(&group->gp_core->hw_core, i), ++ mali_hw_core_register_read(&group->gp_core->hw_core, i + 4), ++ mali_hw_core_register_read(&group->gp_core->hw_core, i + 8), ++ mali_hw_core_register_read(&group->gp_core->hw_core, i + 12))); ++ } + -+ /* Inform power management at start/finish of -+ * atom so it can update its GPU utilisation -+ * metrics. */ -+ kbase_pm_metrics_update(kbdev, -+ &katom[idx]->start_timestamp); + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++ } else { ++ MALI_PRINT(("Dump Group %s\n", group->pp_core->hw_core.description)); + -+ case KBASE_ATOM_GPU_RB_SUBMITTED: -+ /* Atom submitted to HW, nothing else to do */ -+ break; ++ for (i = 0; i < 0x5c; i += 0x10) { ++ MALI_PRINT(("0x%04x: 0x%08x 0x%08x 0x%08x 0x%08x\n", i, mali_hw_core_register_read(&group->pp_core->hw_core, i), ++ mali_hw_core_register_read(&group->pp_core->hw_core, i + 4), ++ mali_hw_core_register_read(&group->pp_core->hw_core, i + 8), ++ mali_hw_core_register_read(&group->pp_core->hw_core, i + 12))); ++ } + -+ case KBASE_ATOM_GPU_RB_RETURN_TO_JS: -+ /* Only return if head atom or previous atom -+ * already removed - as atoms must be returned -+ * in order */ -+ if (idx == 0 || katom[0]->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { -+ kbase_gpu_dequeue_atom(kbdev, js, NULL); -+ kbase_jm_return_atom_to_js(kbdev, -+ katom[idx]); -+ } -+ break; -+ } ++ /* Ignore some minor registers */ ++ for (i = 0x1000; i < 0x1068; i += 0x10) { ++ MALI_PRINT(("0x%04x: 0x%08x 0x%08x 0x%08x 0x%08x\n", i, mali_hw_core_register_read(&group->pp_core->hw_core, i), ++ mali_hw_core_register_read(&group->pp_core->hw_core, i + 4), ++ mali_hw_core_register_read(&group->pp_core->hw_core, i + 8), ++ mali_hw_core_register_read(&group->pp_core->hw_core, i + 12))); + } + } + -+ /* Warn if PRLAM-8987 affinity restrictions are violated */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987)) -+ WARN_ON((kbase_gpu_atoms_submitted(kbdev, 0) || -+ kbase_gpu_atoms_submitted(kbdev, 1)) && -+ kbase_gpu_atoms_submitted(kbdev, 2)); ++ MALI_PRINT(("Dump Group MMU\n")); ++ for (i = 0; i < 0x24; i += 0x10) { ++ MALI_PRINT(("0x%04x: 0x%08x 0x%08x 0x%08x 0x%08x\n", i, mali_hw_core_register_read(&group->mmu->hw_core, i), ++ mali_hw_core_register_read(&group->mmu->hw_core, i + 4), ++ mali_hw_core_register_read(&group->mmu->hw_core, i + 8), ++ mali_hw_core_register_read(&group->mmu->hw_core, i + 12))); ++ } +} + + -+void kbase_backend_run_atom(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) ++/** ++ * @Dump group status ++ */ ++void mali_group_dump_status(struct mali_group *group) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ kbase_gpu_enqueue_atom(kbdev, katom); -+ kbase_backend_slot_update(kbdev); -+} ++ MALI_DEBUG_ASSERT_POINTER(group); + -+#define HAS_DEP(katom) (katom->pre_dep || katom->atom_flags & \ -+ (KBASE_KATOM_FLAG_X_DEP_BLOCKED | KBASE_KATOM_FLAG_FAIL_BLOCKER)) ++ if (mali_group_is_virtual(group)) { ++ struct mali_group *group_c; ++ struct mali_group *temp; ++ _MALI_OSK_LIST_FOREACHENTRY(group_c, temp, &group->group_list, struct mali_group, group_list) { ++ mali_group_dump_core_status(group_c); ++ } ++ } else { ++ mali_group_dump_core_status(group); ++ } ++} + -+bool kbase_gpu_irq_evict(struct kbase_device *kbdev, int js) ++/** ++ * @brief Add child group to virtual group parent ++ */ ++void mali_group_add_group(struct mali_group *parent, struct mali_group *child) +{ -+ struct kbase_jd_atom *katom; -+ struct kbase_jd_atom *next_katom; ++ mali_bool found; ++ u32 i; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ MALI_DEBUG_PRINT(3, ("Adding group %s to virtual group %s\n", ++ mali_group_core_description(child), ++ mali_group_core_description(parent))); + -+ katom = kbase_gpu_inspect(kbdev, js, 0); -+ next_katom = kbase_gpu_inspect(kbdev, js, 1); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(mali_group_is_virtual(parent)); ++ MALI_DEBUG_ASSERT(!mali_group_is_virtual(child)); ++ MALI_DEBUG_ASSERT(NULL == child->parent_group); + -+ if (next_katom && katom->kctx == next_katom->kctx && -+ next_katom->gpu_rb_state == KBASE_ATOM_GPU_RB_SUBMITTED && -+ HAS_DEP(next_katom) && -+ (kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_LO), NULL) -+ != 0 || -+ kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_HI), NULL) -+ != 0)) { -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_COMMAND_NEXT), -+ JS_COMMAND_NOP, NULL); -+ next_katom->gpu_rb_state = KBASE_ATOM_GPU_RB_READY; ++ _mali_osk_list_addtail(&child->group_list, &parent->group_list); + -+ KBASE_TLSTREAM_TL_NRET_ATOM_LPU(katom, -+ &kbdev->gpu_props.props.raw_props.js_features -+ [katom->slot_nr]); -+ KBASE_TLSTREAM_TL_NRET_ATOM_AS(katom, &kbdev->as -+ [katom->kctx->as_nr]); -+ KBASE_TLSTREAM_TL_NRET_CTX_LPU(katom->kctx, -+ &kbdev->gpu_props.props.raw_props.js_features -+ [katom->slot_nr]); ++ child->parent_group = parent; + -+ return true; ++ MALI_DEBUG_ASSERT_POINTER(child->l2_cache_core[0]); ++ ++ MALI_DEBUG_PRINT(4, ("parent->l2_cache_core: [0] = %p, [1] = %p\n", parent->l2_cache_core[0], parent->l2_cache_core[1])); ++ MALI_DEBUG_PRINT(4, ("child->l2_cache_core: [0] = %p, [1] = %p\n", child->l2_cache_core[0], child->l2_cache_core[1])); ++ ++ /* Keep track of the L2 cache cores of child groups */ ++ found = MALI_FALSE; ++ for (i = 0; i < 2; i++) { ++ if (parent->l2_cache_core[i] == child->l2_cache_core[0]) { ++ MALI_DEBUG_ASSERT(parent->l2_cache_core_ref_count[i] > 0); ++ parent->l2_cache_core_ref_count[i]++; ++ found = MALI_TRUE; ++ } + } + -+ return false; -+} ++ if (!found) { ++ /* First time we see this L2 cache, add it to our list */ ++ i = (NULL == parent->l2_cache_core[0]) ? 0 : 1; + -+void kbase_gpu_complete_hw(struct kbase_device *kbdev, int js, -+ u32 completion_code, -+ u64 job_tail, -+ ktime_t *end_timestamp) -+{ -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, 0); -+ struct kbase_context *kctx = katom->kctx; ++ MALI_DEBUG_PRINT(4, ("First time we see l2_cache %p. Adding to [%d] = %p\n", child->l2_cache_core[0], i, parent->l2_cache_core[i])); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ MALI_DEBUG_ASSERT(NULL == parent->l2_cache_core[i]); + -+ /* -+ * When a hard-stop is followed close after a soft-stop, the completion -+ * code may be set to STOPPED, even though the job is terminated -+ */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TMIX_8438)) { -+ if (completion_code == BASE_JD_EVENT_STOPPED && -+ (katom->atom_flags & -+ KBASE_KATOM_FLAG_BEEN_HARD_STOPPED)) { -+ completion_code = BASE_JD_EVENT_TERMINATED; -+ } ++ parent->l2_cache_core[i] = child->l2_cache_core[0]; ++ parent->l2_cache_core_ref_count[i]++; + } + -+ if ((kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_6787) || (katom->core_req & -+ BASE_JD_REQ_SKIP_CACHE_END)) && -+ completion_code != BASE_JD_EVENT_DONE && -+ !(completion_code & BASE_JD_SW_EVENT)) { -+ /* When a job chain fails, on a T60x or when -+ * BASE_JD_REQ_SKIP_CACHE_END is set, the GPU cache is not -+ * flushed. To prevent future evictions causing possible memory -+ * corruption we need to flush the cache manually before any -+ * affected memory gets reused. */ -+ katom->need_cache_flush_cores_retained = katom->affinity; -+ kbase_pm_request_cores(kbdev, false, katom->affinity); -+ } else if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10676)) { -+ if (kbdev->gpu_props.num_core_groups > 1 && -+ !(katom->affinity & -+ kbdev->gpu_props.props.coherency_info.group[0].core_mask -+ ) && -+ (katom->affinity & -+ kbdev->gpu_props.props.coherency_info.group[1].core_mask -+ )) { -+ dev_info(kbdev->dev, "JD: Flushing cache due to PRLAM-10676\n"); -+ katom->need_cache_flush_cores_retained = -+ katom->affinity; -+ kbase_pm_request_cores(kbdev, false, -+ katom->affinity); ++ /* Update Broadcast Unit and DLBU */ ++ mali_bcast_add_group(parent->bcast_core, child); ++ mali_dlbu_add_group(parent->dlbu_core, child); ++ ++ if (MALI_TRUE == parent->power_is_on) { ++ mali_bcast_reset(parent->bcast_core); ++ mali_dlbu_update_mask(parent->dlbu_core); ++ } ++ ++ if (MALI_TRUE == child->power_is_on) { ++ if (NULL == parent->session) { ++ if (NULL != child->session) { ++ /* ++ * Parent has no session, so clear ++ * child session as well. ++ */ ++ mali_mmu_activate_empty_page_directory(child->mmu); ++ } ++ } else { ++ if (parent->session == child->session) { ++ /* We already have same session as parent, ++ * so a simple zap should be enough. ++ */ ++ mali_mmu_zap_tlb(child->mmu); ++ } else { ++ /* ++ * Parent has a different session, so we must ++ * switch to that sessions page table ++ */ ++ mali_mmu_activate_page_directory(child->mmu, mali_session_get_page_directory(parent->session)); ++ } ++ ++ /* It is the parent which keeps the session from now on */ ++ child->session = NULL; + } ++ } else { ++ /* should have been cleared when child was powered down */ ++ MALI_DEBUG_ASSERT(NULL == child->session); + } + -+ katom = kbase_gpu_dequeue_atom(kbdev, js, end_timestamp); -+ kbase_timeline_job_slot_done(kbdev, katom->kctx, katom, js, 0); ++ /* Start job on child when parent is active */ ++ if (NULL != parent->pp_running_job) { ++ struct mali_pp_job *job = parent->pp_running_job; + -+ if (completion_code == BASE_JD_EVENT_STOPPED) { -+ struct kbase_jd_atom *next_katom = kbase_gpu_inspect(kbdev, js, -+ 0); ++ MALI_DEBUG_PRINT(3, ("Group %x joining running job %d on virtual group %x\n", ++ child, mali_pp_job_get_id(job), parent)); + -+ /* -+ * Dequeue next atom from ringbuffers on same slot if required. -+ * This atom will already have been removed from the NEXT -+ * registers by kbase_gpu_soft_hard_stop_slot(), to ensure that -+ * the atoms on this slot are returned in the correct order. -+ */ -+ if (next_katom && katom->kctx == next_katom->kctx && -+ next_katom->sched_priority == -+ katom->sched_priority) { -+ kbase_gpu_dequeue_atom(kbdev, js, end_timestamp); -+ kbase_jm_return_atom_to_js(kbdev, next_katom); ++ /* Only allowed to add active child to an active parent */ ++ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_ACTIVE == parent->state); ++ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_ACTIVE == child->state); ++ ++ mali_pp_job_start(child->pp_core, job, mali_pp_core_get_id(child->pp_core), MALI_TRUE); ++ ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(child->pp_core)) | ++ MALI_PROFILING_EVENT_REASON_SINGLE_HW_FLUSH, ++ mali_pp_job_get_frame_builder_id(job), mali_pp_job_get_flush_id(job), 0, 0, 0); ++ ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | ++ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(child->pp_core)) | ++ MALI_PROFILING_EVENT_REASON_START_STOP_HW_VIRTUAL, ++ mali_pp_job_get_pid(job), mali_pp_job_get_tid(job), 0, 0, 0); ++#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) ++ if (child->pp_core) { ++ trace_gpu_sched_switch( ++ mali_pp_core_description(child->pp_core), ++ sched_clock(), mali_pp_job_get_tid(job), ++ 0, mali_pp_job_get_id(job)); + } -+ } else if (completion_code != BASE_JD_EVENT_DONE) { -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ int i; ++#endif + -+#if KBASE_TRACE_DUMP_ON_JOB_SLOT_ERROR != 0 -+ KBASE_TRACE_DUMP(kbdev); ++#if defined(CONFIG_MALI400_PROFILING) ++ trace_mali_core_active(mali_pp_job_get_pid(job), 1 /* active */, 0 /* PP */, mali_pp_core_get_id(child->pp_core), ++ mali_pp_job_get_frame_builder_id(job), mali_pp_job_get_flush_id(job)); +#endif -+ kbasep_js_clear_submit_allowed(js_devdata, katom->kctx); ++ } + -+ /* -+ * Remove all atoms on the same context from ringbuffers. This -+ * will not remove atoms that are already on the GPU, as these -+ * are guaranteed not to have fail dependencies on the failed -+ * atom. -+ */ -+ for (i = 0; i < kbdev->gpu_props.num_job_slots; i++) { -+ struct kbase_jd_atom *katom_idx0 = -+ kbase_gpu_inspect(kbdev, i, 0); -+ struct kbase_jd_atom *katom_idx1 = -+ kbase_gpu_inspect(kbdev, i, 1); ++ MALI_DEBUG_CODE(mali_group_print_virtual(parent);) ++} + -+ if (katom_idx0 && katom_idx0->kctx == katom->kctx && -+ HAS_DEP(katom_idx0) && -+ katom_idx0->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_SUBMITTED) { -+ /* Dequeue katom_idx0 from ringbuffer */ -+ kbase_gpu_dequeue_atom(kbdev, i, end_timestamp); ++/** ++ * @brief Remove child group from virtual group parent ++ */ ++void mali_group_remove_group(struct mali_group *parent, struct mali_group *child) ++{ ++ u32 i; + -+ if (katom_idx1 && -+ katom_idx1->kctx == katom->kctx -+ && HAS_DEP(katom_idx1) && -+ katom_idx0->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_SUBMITTED) { -+ /* Dequeue katom_idx1 from ringbuffer */ -+ kbase_gpu_dequeue_atom(kbdev, i, -+ end_timestamp); ++ MALI_DEBUG_PRINT(3, ("Removing group %s from virtual group %s\n", ++ mali_group_core_description(child), ++ mali_group_core_description(parent))); + -+ katom_idx1->event_code = -+ BASE_JD_EVENT_STOPPED; -+ kbase_jm_return_atom_to_js(kbdev, -+ katom_idx1); -+ } -+ katom_idx0->event_code = BASE_JD_EVENT_STOPPED; -+ kbase_jm_return_atom_to_js(kbdev, katom_idx0); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(mali_group_is_virtual(parent)); ++ MALI_DEBUG_ASSERT(!mali_group_is_virtual(child)); ++ MALI_DEBUG_ASSERT(parent == child->parent_group); + -+ } else if (katom_idx1 && -+ katom_idx1->kctx == katom->kctx && -+ HAS_DEP(katom_idx1) && -+ katom_idx1->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_SUBMITTED) { -+ /* Can not dequeue this atom yet - will be -+ * dequeued when atom at idx0 completes */ -+ katom_idx1->event_code = BASE_JD_EVENT_STOPPED; -+ kbase_gpu_mark_atom_for_return(kbdev, -+ katom_idx1); -+ } -+ } -+ } ++ /* Update Broadcast Unit and DLBU */ ++ mali_bcast_remove_group(parent->bcast_core, child); ++ mali_dlbu_remove_group(parent->dlbu_core, child); + -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, JM_JOB_DONE, kctx, katom, katom->jc, -+ js, completion_code); ++ if (MALI_TRUE == parent->power_is_on) { ++ mali_bcast_reset(parent->bcast_core); ++ mali_dlbu_update_mask(parent->dlbu_core); ++ } + -+ if (job_tail != 0 && job_tail != katom->jc) { -+ bool was_updated = (job_tail != katom->jc); ++ child->session = parent->session; ++ child->parent_group = NULL; + -+ /* Some of the job has been executed, so we update the job chain -+ * address to where we should resume from */ -+ katom->jc = job_tail; -+ if (was_updated) -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_UPDATE_HEAD, katom->kctx, -+ katom, job_tail, js); ++ _mali_osk_list_delinit(&child->group_list); ++ if (_mali_osk_list_empty(&parent->group_list)) { ++ parent->session = NULL; + } + -+ /* Only update the event code for jobs that weren't cancelled */ -+ if (katom->event_code != BASE_JD_EVENT_JOB_CANCELLED) -+ katom->event_code = (base_jd_event_code)completion_code; ++ /* Keep track of the L2 cache cores of child groups */ ++ i = (child->l2_cache_core[0] == parent->l2_cache_core[0]) ? 0 : 1; + -+ kbase_device_trace_register_access(kctx, REG_WRITE, -+ JOB_CONTROL_REG(JOB_IRQ_CLEAR), -+ 1 << js); ++ MALI_DEBUG_ASSERT(child->l2_cache_core[0] == parent->l2_cache_core[i]); + -+ /* Complete the job, and start new ones -+ * -+ * Also defer remaining work onto the workqueue: -+ * - Re-queue Soft-stopped jobs -+ * - For any other jobs, queue the job back into the dependency system -+ * - Schedule out the parent context if necessary, and schedule a new -+ * one in. -+ */ -+#ifdef CONFIG_GPU_TRACEPOINTS -+ { -+ /* The atom in the HEAD */ -+ struct kbase_jd_atom *next_katom = kbase_gpu_inspect(kbdev, js, -+ 0); ++ parent->l2_cache_core_ref_count[i]--; ++ if (parent->l2_cache_core_ref_count[i] == 0) { ++ parent->l2_cache_core[i] = NULL; ++ } + -+ if (next_katom && next_katom->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_SUBMITTED) { -+ char js_string[16]; ++ MALI_DEBUG_CODE(mali_group_print_virtual(parent)); ++} + -+ trace_gpu_sched_switch(kbasep_make_job_slot_string(js, -+ js_string, -+ sizeof(js_string)), -+ ktime_to_ns(*end_timestamp), -+ (u32)next_katom->kctx->id, 0, -+ next_katom->work_id); -+ kbdev->hwaccess.backend.slot_rb[js].last_context = -+ next_katom->kctx; -+ } else { -+ char js_string[16]; ++struct mali_group *mali_group_acquire_group(struct mali_group *parent) ++{ ++ struct mali_group *child = NULL; + -+ trace_gpu_sched_switch(kbasep_make_job_slot_string(js, -+ js_string, -+ sizeof(js_string)), -+ ktime_to_ns(ktime_get()), 0, 0, -+ 0); -+ kbdev->hwaccess.backend.slot_rb[js].last_context = 0; ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(mali_group_is_virtual(parent)); ++ ++ if (!_mali_osk_list_empty(&parent->group_list)) { ++ child = _MALI_OSK_LIST_ENTRY(parent->group_list.prev, struct mali_group, group_list); ++ mali_group_remove_group(parent, child); ++ } ++ ++ if (NULL != child) { ++ if (MALI_GROUP_STATE_ACTIVE != parent->state ++ && MALI_TRUE == child->power_is_on) { ++ mali_group_reset(child); + } + } -+#endif + -+ if (kbdev->serialize_jobs & KBASE_SERIALIZE_RESET) -+ kbase_reset_gpu_silent(kbdev); ++ return child; ++} + -+ if (completion_code == BASE_JD_EVENT_STOPPED) -+ katom = kbase_jm_return_atom_to_js(kbdev, katom); -+ else -+ katom = kbase_jm_complete(kbdev, katom, end_timestamp); ++void mali_group_reset(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(NULL == group->gp_running_job); ++ MALI_DEBUG_ASSERT(NULL == group->pp_running_job); + -+ if (katom) { -+ /* Cross-slot dependency has now become runnable. Try to submit -+ * it. */ ++ MALI_DEBUG_PRINT(3, ("Group: reset of %s\n", ++ mali_group_core_description(group))); + -+ /* Check if there are lower priority jobs to soft stop */ -+ kbase_job_slot_ctx_priority_check_locked(kctx, katom); ++ if (NULL != group->dlbu_core) { ++ mali_dlbu_reset(group->dlbu_core); ++ } + -+ kbase_jm_try_kick(kbdev, 1 << katom->slot_nr); ++ if (NULL != group->bcast_core) { ++ mali_bcast_reset(group->bcast_core); + } + -+ /* Job completion may have unblocked other atoms. Try to update all job -+ * slots */ -+ kbase_backend_slot_update(kbdev); ++ MALI_DEBUG_ASSERT(NULL != group->mmu); ++ mali_group_reset_mmu(group); ++ ++ if (NULL != group->gp_core) { ++ MALI_DEBUG_ASSERT(NULL == group->pp_core); ++ mali_gp_reset(group->gp_core); ++ } else { ++ MALI_DEBUG_ASSERT(NULL != group->pp_core); ++ mali_group_reset_pp(group); ++ } +} + -+void kbase_backend_reset(struct kbase_device *kbdev, ktime_t *end_timestamp) ++void mali_group_start_gp_job(struct mali_group *group, struct mali_gp_job *job, mali_bool gpu_secure_mode_pre_enabled) +{ -+ int js; ++ struct mali_session_data *session; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ /* Reset should always take the GPU out of protected mode */ -+ WARN_ON(kbase_gpu_in_protected_mode(kbdev)); ++ MALI_DEBUG_PRINT(3, ("Group: Starting GP job 0x%08X on group %s\n", ++ job, ++ mali_group_core_description(group))); + -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ int atom_idx = 0; -+ int idx; ++ session = mali_gp_job_get_session(job); + -+ for (idx = 0; idx < SLOT_RB_SIZE; idx++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, -+ js, atom_idx); -+ bool keep_in_jm_rb = false; ++ MALI_DEBUG_ASSERT_POINTER(group->l2_cache_core[0]); ++ mali_l2_cache_invalidate_conditional(group->l2_cache_core[0], mali_gp_job_get_cache_order(job)); + -+ if (!katom) -+ break; -+ if (katom->protected_state.exit == -+ KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT) -+ { -+ KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_END(kbdev); ++ /* Reset GPU and disable gpu secure mode if needed. */ ++ if (MALI_TRUE == _mali_osk_gpu_secure_mode_is_enabled()) { ++ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); ++ _mali_osk_gpu_reset_and_secure_mode_disable(); ++ /* Need to disable the pmu interrupt mask register */ ++ if (NULL != pmu) { ++ mali_pmu_reset(pmu); ++ } ++ } + -+ kbase_vinstr_resume(kbdev->vinstr_ctx); ++ /* Reload mmu page table if needed */ ++ if (MALI_TRUE == gpu_secure_mode_pre_enabled) { ++ mali_group_reset(group); ++ mali_group_activate_page_directory(group, session, MALI_TRUE); ++ } else { ++ mali_group_activate_page_directory(group, session, MALI_FALSE); ++ } + -+ /* protected mode sanity checks */ -+ KBASE_DEBUG_ASSERT_MSG( -+ kbase_jd_katom_is_protected(katom) == kbase_gpu_in_protected_mode(kbdev), -+ "Protected mode of atom (%d) doesn't match protected mode of GPU (%d)", -+ kbase_jd_katom_is_protected(katom), kbase_gpu_in_protected_mode(kbdev)); -+ KBASE_DEBUG_ASSERT_MSG( -+ (kbase_jd_katom_is_protected(katom) && js == 0) || -+ !kbase_jd_katom_is_protected(katom), -+ "Protected atom on JS%d not supported", js); -+ } -+ if (katom->gpu_rb_state < KBASE_ATOM_GPU_RB_SUBMITTED) -+ keep_in_jm_rb = true; ++ mali_gp_job_start(group->gp_core, job); + -+ kbase_gpu_release_atom(kbdev, katom, NULL); ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_MAKE_EVENT_CHANNEL_GP(0) | ++ MALI_PROFILING_EVENT_REASON_SINGLE_HW_FLUSH, ++ mali_gp_job_get_frame_builder_id(job), mali_gp_job_get_flush_id(job), 0, 0, 0); ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | ++ MALI_PROFILING_MAKE_EVENT_CHANNEL_GP(0), ++ mali_gp_job_get_pid(job), mali_gp_job_get_tid(job), 0, 0, 0); + -+ /* -+ * If the atom wasn't on HW when the reset was issued -+ * then leave it in the RB and next time we're kicked -+ * it will be processed again from the starting state. -+ */ -+ if (keep_in_jm_rb) { -+ kbasep_js_job_check_deref_cores(kbdev, katom); -+ katom->coreref_state = KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED; -+ katom->affinity = 0; -+ katom->protected_state.exit = KBASE_ATOM_EXIT_PROTECTED_CHECK; -+ /* As the atom was not removed, increment the -+ * index so that we read the correct atom in the -+ * next iteration. */ -+ atom_idx++; -+ continue; -+ } ++#if defined(CONFIG_MALI400_PROFILING) ++ trace_mali_core_active(mali_gp_job_get_pid(job), 1 /* active */, 1 /* GP */, 0 /* core */, ++ mali_gp_job_get_frame_builder_id(job), mali_gp_job_get_flush_id(job)); ++#endif + -+ /* -+ * The atom was on the HW when the reset was issued -+ * all we can do is fail the atom. -+ */ -+ kbase_gpu_dequeue_atom(kbdev, js, NULL); -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ kbase_jm_complete(kbdev, katom, end_timestamp); -+ } ++#if defined(CONFIG_MALI400_PROFILING) ++ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[0])) && ++ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[0]))) { ++ mali_group_report_l2_cache_counters_per_core(group, 0); + } ++#endif /* #if defined(CONFIG_MALI400_PROFILING) */ + -+ kbdev->protected_mode_transition = false; -+} ++#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) ++ if (group->gp_core) { ++ trace_gpu_sched_switch(mali_gp_core_description(group->gp_core), ++ sched_clock(), mali_gp_job_get_tid(job), ++ 0, mali_gp_job_get_id(job)); ++ } ++#endif + -+static inline void kbase_gpu_stop_atom(struct kbase_device *kbdev, -+ int js, -+ struct kbase_jd_atom *katom, -+ u32 action) -+{ -+ u32 hw_action = action & JS_COMMAND_MASK; ++ group->gp_running_job = job; ++ group->is_working = MALI_TRUE; + -+ kbase_job_check_enter_disjoint(kbdev, action, katom->core_req, katom); -+ kbasep_job_slot_soft_or_hard_stop_do_action(kbdev, js, hw_action, -+ katom->core_req, katom); -+ katom->kctx->blocked_js[js][katom->sched_priority] = true; ++ /* Setup SW timer and record start time */ ++ group->start_time = _mali_osk_time_tickcount(); ++ _mali_osk_timer_mod(group->timeout_timer, _mali_osk_time_mstoticks(mali_max_job_runtime)); ++ ++ MALI_DEBUG_PRINT(4, ("Group: Started GP job 0x%08X on group %s at %u\n", ++ job, ++ mali_group_core_description(group), ++ group->start_time)); +} + -+static inline void kbase_gpu_remove_atom(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, -+ u32 action, -+ bool disjoint) ++/* Used to set all the registers except frame renderer list address and fragment shader stack address ++ * It means the caller must set these two registers properly before calling this function ++ */ ++void mali_group_start_pp_job(struct mali_group *group, struct mali_pp_job *job, u32 sub_job, mali_bool gpu_secure_mode_pre_enabled) +{ -+ katom->event_code = BASE_JD_EVENT_REMOVED_FROM_NEXT; -+ kbase_gpu_mark_atom_for_return(kbdev, katom); -+ katom->kctx->blocked_js[katom->slot_nr][katom->sched_priority] = true; ++ struct mali_session_data *session; + -+ if (disjoint) -+ kbase_job_check_enter_disjoint(kbdev, action, katom->core_req, -+ katom); -+} ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+static int should_stop_x_dep_slot(struct kbase_jd_atom *katom) -+{ -+ if (katom->x_post_dep) { -+ struct kbase_jd_atom *dep_atom = katom->x_post_dep; ++ MALI_DEBUG_PRINT(3, ("Group: Starting PP job 0x%08X part %u/%u on group %s\n", ++ job, sub_job + 1, ++ mali_pp_job_get_sub_job_count(job), ++ mali_group_core_description(group))); + -+ if (dep_atom->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB && -+ dep_atom->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_RETURN_TO_JS) -+ return dep_atom->slot_nr; -+ } -+ return -1; -+} ++ session = mali_pp_job_get_session(job); + -+static void kbase_job_evicted(struct kbase_jd_atom *katom) -+{ -+ kbase_timeline_job_slot_done(katom->kctx->kbdev, katom->kctx, katom, -+ katom->slot_nr, KBASE_JS_ATOM_DONE_EVICTED_FROM_NEXT); -+} ++ if (NULL != group->l2_cache_core[0]) { ++ mali_l2_cache_invalidate_conditional(group->l2_cache_core[0], mali_pp_job_get_cache_order(job)); ++ } + -+bool kbase_backend_soft_hard_stop_slot(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js, -+ struct kbase_jd_atom *katom, -+ u32 action) -+{ -+ struct kbase_jd_atom *katom_idx0; -+ struct kbase_jd_atom *katom_idx1; ++ if (NULL != group->l2_cache_core[1]) { ++ mali_l2_cache_invalidate_conditional(group->l2_cache_core[1], mali_pp_job_get_cache_order(job)); ++ } + -+ bool katom_idx0_valid, katom_idx1_valid; ++ /* Reset GPU and change gpu secure mode if needed. */ ++ if (MALI_TRUE == mali_pp_job_is_protected_job(job) && MALI_FALSE == _mali_osk_gpu_secure_mode_is_enabled()) { ++ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); ++ _mali_osk_gpu_reset_and_secure_mode_enable(); ++ /* Need to disable the pmu interrupt mask register */ ++ if (NULL != pmu) { ++ mali_pmu_reset(pmu); ++ } ++ } else if (MALI_FALSE == mali_pp_job_is_protected_job(job) && MALI_TRUE == _mali_osk_gpu_secure_mode_is_enabled()) { ++ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); ++ _mali_osk_gpu_reset_and_secure_mode_disable(); ++ /* Need to disable the pmu interrupt mask register */ ++ if (NULL != pmu) { ++ mali_pmu_reset(pmu); ++ } ++ } + -+ bool ret = false; ++ /* Reload the mmu page table if needed */ ++ if ((MALI_TRUE == mali_pp_job_is_protected_job(job) && MALI_FALSE == gpu_secure_mode_pre_enabled) ++ || (MALI_FALSE == mali_pp_job_is_protected_job(job) && MALI_TRUE == gpu_secure_mode_pre_enabled)) { ++ mali_group_reset(group); ++ mali_group_activate_page_directory(group, session, MALI_TRUE); ++ } else { ++ mali_group_activate_page_directory(group, session, MALI_FALSE); ++ } + -+ int stop_x_dep_idx0 = -1, stop_x_dep_idx1 = -1; -+ int prio_idx0 = 0, prio_idx1 = 0; ++ if (mali_group_is_virtual(group)) { ++ struct mali_group *child; ++ struct mali_group *temp; ++ u32 core_num = 0; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ MALI_DEBUG_ASSERT(mali_pp_job_is_virtual(job)); + -+ katom_idx0 = kbase_gpu_inspect(kbdev, js, 0); -+ katom_idx1 = kbase_gpu_inspect(kbdev, js, 1); ++ /* Configure DLBU for the job */ ++ mali_dlbu_config_job(group->dlbu_core, job); + -+ if (katom_idx0) -+ prio_idx0 = katom_idx0->sched_priority; -+ if (katom_idx1) -+ prio_idx1 = katom_idx1->sched_priority; ++ /* Write stack address for each child group */ ++ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { ++ mali_pp_write_addr_stack(child->pp_core, job); ++ core_num++; ++ } + -+ if (katom) { -+ katom_idx0_valid = (katom_idx0 == katom); -+ /* If idx0 is to be removed and idx1 is on the same context, -+ * then idx1 must also be removed otherwise the atoms might be -+ * returned out of order */ -+ if (katom_idx1) -+ katom_idx1_valid = (katom_idx1 == katom) || -+ (katom_idx0_valid && -+ (katom_idx0->kctx == -+ katom_idx1->kctx)); -+ else -+ katom_idx1_valid = false; ++ mali_pp_job_start(group->pp_core, job, sub_job, MALI_FALSE); + } else { -+ katom_idx0_valid = (katom_idx0 && -+ (!kctx || katom_idx0->kctx == kctx)); -+ katom_idx1_valid = (katom_idx1 && -+ (!kctx || katom_idx1->kctx == kctx) && -+ prio_idx0 == prio_idx1); ++ mali_pp_job_start(group->pp_core, job, sub_job, MALI_FALSE); + } + -+ if (katom_idx0_valid) -+ stop_x_dep_idx0 = should_stop_x_dep_slot(katom_idx0); -+ if (katom_idx1_valid) -+ stop_x_dep_idx1 = should_stop_x_dep_slot(katom_idx1); ++ /* if the group is virtual, loop through physical groups which belong to this group ++ * and call profiling events for its cores as virtual */ ++ if (MALI_TRUE == mali_group_is_virtual(group)) { ++ struct mali_group *child; ++ struct mali_group *temp; + -+ if (katom_idx0_valid) { -+ if (katom_idx0->gpu_rb_state != KBASE_ATOM_GPU_RB_SUBMITTED) { -+ /* Simple case - just dequeue and return */ -+ kbase_gpu_dequeue_atom(kbdev, js, NULL); -+ if (katom_idx1_valid) { -+ kbase_gpu_dequeue_atom(kbdev, js, NULL); -+ katom_idx1->event_code = -+ BASE_JD_EVENT_REMOVED_FROM_NEXT; -+ kbase_jm_return_atom_to_js(kbdev, katom_idx1); -+ katom_idx1->kctx->blocked_js[js][prio_idx1] = -+ true; -+ } ++ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(child->pp_core)) | ++ MALI_PROFILING_EVENT_REASON_SINGLE_HW_FLUSH, ++ mali_pp_job_get_frame_builder_id(job), mali_pp_job_get_flush_id(job), 0, 0, 0); + -+ katom_idx0->event_code = -+ BASE_JD_EVENT_REMOVED_FROM_NEXT; -+ kbase_jm_return_atom_to_js(kbdev, katom_idx0); -+ katom_idx0->kctx->blocked_js[js][prio_idx0] = true; -+ } else { -+ /* katom_idx0 is on GPU */ -+ if (katom_idx1 && katom_idx1->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_SUBMITTED) { -+ /* katom_idx0 and katom_idx1 are on GPU */ ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | ++ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(child->pp_core)) | ++ MALI_PROFILING_EVENT_REASON_START_STOP_HW_VIRTUAL, ++ mali_pp_job_get_pid(job), mali_pp_job_get_tid(job), 0, 0, 0); + -+ if (kbase_reg_read(kbdev, JOB_SLOT_REG(js, -+ JS_COMMAND_NEXT), NULL) == 0) { -+ /* idx0 has already completed - stop -+ * idx1 if needed*/ -+ if (katom_idx1_valid) { -+ kbase_gpu_stop_atom(kbdev, js, -+ katom_idx1, -+ action); -+ ret = true; -+ } -+ } else { -+ /* idx1 is in NEXT registers - attempt -+ * to remove */ -+ kbase_reg_write(kbdev, -+ JOB_SLOT_REG(js, -+ JS_COMMAND_NEXT), -+ JS_COMMAND_NOP, NULL); -+ -+ if (kbase_reg_read(kbdev, -+ JOB_SLOT_REG(js, -+ JS_HEAD_NEXT_LO), NULL) -+ != 0 || -+ kbase_reg_read(kbdev, -+ JOB_SLOT_REG(js, -+ JS_HEAD_NEXT_HI), NULL) -+ != 0) { -+ /* idx1 removed successfully, -+ * will be handled in IRQ */ -+ kbase_job_evicted(katom_idx1); -+ kbase_gpu_remove_atom(kbdev, -+ katom_idx1, -+ action, true); -+ stop_x_dep_idx1 = -+ should_stop_x_dep_slot(katom_idx1); -+ -+ /* stop idx0 if still on GPU */ -+ kbase_gpu_stop_atom(kbdev, js, -+ katom_idx0, -+ action); -+ ret = true; -+ } else if (katom_idx1_valid) { -+ /* idx0 has already completed, -+ * stop idx1 if needed */ -+ kbase_gpu_stop_atom(kbdev, js, -+ katom_idx1, -+ action); -+ ret = true; -+ } -+ } -+ } else if (katom_idx1_valid) { -+ /* idx1 not on GPU but must be dequeued*/ ++#if defined(CONFIG_MALI400_PROFILING) ++ trace_mali_core_active(mali_pp_job_get_pid(job), 1 /* active */, 0 /* PP */, mali_pp_core_get_id(child->pp_core), ++ mali_pp_job_get_frame_builder_id(job), mali_pp_job_get_flush_id(job)); ++#endif ++ } + -+ /* idx1 will be handled in IRQ */ -+ kbase_gpu_remove_atom(kbdev, katom_idx1, action, -+ false); -+ /* stop idx0 */ -+ /* This will be repeated for anything removed -+ * from the next registers, since their normal -+ * flow was also interrupted, and this function -+ * might not enter disjoint state e.g. if we -+ * don't actually do a hard stop on the head -+ * atom */ -+ kbase_gpu_stop_atom(kbdev, js, katom_idx0, -+ action); -+ ret = true; -+ } else { -+ /* no atom in idx1 */ -+ /* just stop idx0 */ -+ kbase_gpu_stop_atom(kbdev, js, katom_idx0, -+ action); -+ ret = true; ++#if defined(CONFIG_MALI400_PROFILING) ++ if (0 != group->l2_cache_core_ref_count[0]) { ++ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[0])) && ++ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[0]))) { ++ mali_group_report_l2_cache_counters_per_core(group, mali_l2_cache_get_id(group->l2_cache_core[0])); + } + } -+ } else if (katom_idx1_valid) { -+ if (katom_idx1->gpu_rb_state != KBASE_ATOM_GPU_RB_SUBMITTED) { -+ /* Mark for return */ -+ /* idx1 will be returned once idx0 completes */ -+ kbase_gpu_remove_atom(kbdev, katom_idx1, action, -+ false); -+ } else { -+ /* idx1 is on GPU */ -+ if (kbase_reg_read(kbdev, JOB_SLOT_REG(js, -+ JS_COMMAND_NEXT), NULL) == 0) { -+ /* idx0 has already completed - stop idx1 */ -+ kbase_gpu_stop_atom(kbdev, js, katom_idx1, -+ action); -+ ret = true; -+ } else { -+ /* idx1 is in NEXT registers - attempt to -+ * remove */ -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, -+ JS_COMMAND_NEXT), -+ JS_COMMAND_NOP, NULL); -+ -+ if (kbase_reg_read(kbdev, JOB_SLOT_REG(js, -+ JS_HEAD_NEXT_LO), NULL) != 0 || -+ kbase_reg_read(kbdev, JOB_SLOT_REG(js, -+ JS_HEAD_NEXT_HI), NULL) != 0) { -+ /* idx1 removed successfully, will be -+ * handled in IRQ once idx0 completes */ -+ kbase_job_evicted(katom_idx1); -+ kbase_gpu_remove_atom(kbdev, katom_idx1, -+ action, -+ false); -+ } else { -+ /* idx0 has already completed - stop -+ * idx1 */ -+ kbase_gpu_stop_atom(kbdev, js, -+ katom_idx1, -+ action); -+ ret = true; -+ } ++ if (0 != group->l2_cache_core_ref_count[1]) { ++ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[1])) && ++ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[1]))) { ++ mali_group_report_l2_cache_counters_per_core(group, mali_l2_cache_get_id(group->l2_cache_core[1])); + } + } ++#endif /* #if defined(CONFIG_MALI400_PROFILING) */ ++ ++ } else { /* group is physical - call profiling events for physical cores */ ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(group->pp_core)) | ++ MALI_PROFILING_EVENT_REASON_SINGLE_HW_FLUSH, ++ mali_pp_job_get_frame_builder_id(job), mali_pp_job_get_flush_id(job), 0, 0, 0); ++ ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | ++ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(group->pp_core)) | ++ MALI_PROFILING_EVENT_REASON_START_STOP_HW_PHYSICAL, ++ mali_pp_job_get_pid(job), mali_pp_job_get_tid(job), 0, 0, 0); ++ ++#if defined(CONFIG_MALI400_PROFILING) ++ trace_mali_core_active(mali_pp_job_get_pid(job), 1 /* active */, 0 /* PP */, mali_pp_core_get_id(group->pp_core), ++ mali_pp_job_get_frame_builder_id(job), mali_pp_job_get_flush_id(job)); ++#endif ++ ++#if defined(CONFIG_MALI400_PROFILING) ++ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[0])) && ++ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[0]))) { ++ mali_group_report_l2_cache_counters_per_core(group, mali_l2_cache_get_id(group->l2_cache_core[0])); ++ } ++#endif /* #if defined(CONFIG_MALI400_PROFILING) */ + } + ++#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) ++ if (group->pp_core) { ++ trace_gpu_sched_switch(mali_pp_core_description(group->pp_core), ++ sched_clock(), mali_pp_job_get_tid(job), ++ 0, mali_pp_job_get_id(job)); ++ } ++#endif + -+ if (stop_x_dep_idx0 != -1) -+ kbase_backend_soft_hard_stop_slot(kbdev, kctx, stop_x_dep_idx0, -+ NULL, action); ++ group->pp_running_job = job; ++ group->pp_running_sub_job = sub_job; ++ group->is_working = MALI_TRUE; + -+ if (stop_x_dep_idx1 != -1) -+ kbase_backend_soft_hard_stop_slot(kbdev, kctx, stop_x_dep_idx1, -+ NULL, action); ++ /* Setup SW timer and record start time */ ++ group->start_time = _mali_osk_time_tickcount(); ++ _mali_osk_timer_mod(group->timeout_timer, _mali_osk_time_mstoticks(mali_max_job_runtime)); ++ ++ MALI_DEBUG_PRINT(4, ("Group: Started PP job 0x%08X part %u/%u on group %s at %u\n", ++ job, sub_job + 1, ++ mali_pp_job_get_sub_job_count(job), ++ mali_group_core_description(group), ++ group->start_time)); + -+ return ret; +} + -+void kbase_gpu_cacheclean(struct kbase_device *kbdev) ++void mali_group_resume_gp_with_new_heap(struct mali_group *group, u32 job_id, u32 start_addr, u32 end_addr) +{ -+ /* Limit the number of loops to avoid a hang if the interrupt is missed -+ */ -+ u32 max_loops = KBASE_CLEAN_CACHE_MAX_LOOPS; ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ mutex_lock(&kbdev->cacheclean_lock); ++ MALI_DEBUG_ASSERT_POINTER(group->l2_cache_core[0]); ++ mali_l2_cache_invalidate(group->l2_cache_core[0]); + -+ /* use GPU_COMMAND completion solution */ -+ /* clean & invalidate the caches */ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_CLEAN_INV_CACHES, NULL, NULL, 0u, 0); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_CLEAN_INV_CACHES, NULL); ++ mali_mmu_zap_tlb_without_stall(group->mmu); + -+ /* wait for cache flush to complete before continuing */ -+ while (--max_loops && -+ (kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_RAWSTAT), NULL) & -+ CLEAN_CACHES_COMPLETED) == 0) -+ ; ++ mali_gp_resume_with_new_heap(group->gp_core, start_addr, end_addr); + -+ /* clear the CLEAN_CACHES_COMPLETED irq */ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_IRQ_CLEAR, NULL, NULL, 0u, -+ CLEAN_CACHES_COMPLETED); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), -+ CLEAN_CACHES_COMPLETED, NULL); -+ KBASE_DEBUG_ASSERT_MSG(kbdev->hwcnt.backend.state != -+ KBASE_INSTR_STATE_CLEANING, -+ "Instrumentation code was cleaning caches, but Job Management code cleared their IRQ - Instrumentation code will now hang."); ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_RESUME | ++ MALI_PROFILING_MAKE_EVENT_CHANNEL_GP(0), ++ 0, 0, 0, 0, 0); + -+ mutex_unlock(&kbdev->cacheclean_lock); ++#if defined(CONFIG_MALI400_PROFILING) ++ trace_mali_core_active(mali_gp_job_get_pid(group->gp_running_job), 1 /* active */, 1 /* GP */, 0 /* core */, ++ mali_gp_job_get_frame_builder_id(group->gp_running_job), mali_gp_job_get_flush_id(group->gp_running_job)); ++#endif +} + -+void kbase_backend_cacheclean(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) ++static void mali_group_reset_mmu(struct mali_group *group) +{ -+ if (katom->need_cache_flush_cores_retained) { -+ unsigned long flags; ++ struct mali_group *child; ++ struct mali_group *temp; ++ _mali_osk_errcode_t err; + -+ kbase_gpu_cacheclean(kbdev); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_pm_unrequest_cores(kbdev, false, -+ katom->need_cache_flush_cores_retained); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ katom->need_cache_flush_cores_retained = 0; ++ if (!mali_group_is_virtual(group)) { ++ /* This is a physical group or an idle virtual group -- simply wait for ++ * the reset to complete. */ ++ err = mali_mmu_reset(group->mmu); ++ MALI_DEBUG_ASSERT(_MALI_OSK_ERR_OK == err); ++ } else { /* virtual group */ ++ /* Loop through all members of this virtual group and wait ++ * until they are done resetting. ++ */ ++ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { ++ err = mali_mmu_reset(child->mmu); ++ MALI_DEBUG_ASSERT(_MALI_OSK_ERR_OK == err); ++ } + } +} + -+void kbase_backend_complete_wq(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) ++static void mali_group_reset_pp(struct mali_group *group) +{ -+ /* -+ * If cache flush required due to HW workaround then perform the flush -+ * now -+ */ -+ kbase_backend_cacheclean(kbdev, katom); ++ struct mali_group *child; ++ struct mali_group *temp; + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10969) && -+ (katom->core_req & BASE_JD_REQ_FS) && -+ katom->event_code == BASE_JD_EVENT_TILE_RANGE_FAULT && -+ (katom->atom_flags & KBASE_KATOM_FLAG_BEEN_SOFT_STOPPPED) && -+ !(katom->atom_flags & KBASE_KATOM_FLAGS_RERUN)) { -+ dev_dbg(kbdev->dev, "Soft-stopped fragment shader job got a TILE_RANGE_FAULT. Possible HW issue, trying SW workaround\n"); -+ if (kbasep_10969_workaround_clamp_coordinates(katom)) { -+ /* The job had a TILE_RANGE_FAULT after was soft-stopped -+ * Due to an HW issue we try to execute the job again. -+ */ -+ dev_dbg(kbdev->dev, -+ "Clamping has been executed, try to rerun the job\n" -+ ); -+ katom->event_code = BASE_JD_EVENT_STOPPED; -+ katom->atom_flags |= KBASE_KATOM_FLAGS_RERUN; ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ ++ mali_pp_reset_async(group->pp_core); ++ ++ if (!mali_group_is_virtual(group) || NULL == group->pp_running_job) { ++ /* This is a physical group or an idle virtual group -- simply wait for ++ * the reset to complete. */ ++ mali_pp_reset_wait(group->pp_core); ++ } else { ++ /* Loop through all members of this virtual group and wait until they ++ * are done resetting. ++ */ ++ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { ++ mali_pp_reset_wait(child->pp_core); + } + } -+ -+ /* Clear the coreref_state now - while check_deref_cores() may not have -+ * been called yet, the caller will have taken a copy of this field. If -+ * this is not done, then if the atom is re-scheduled (following a soft -+ * stop) then the core reference would not be retaken. */ -+ katom->coreref_state = KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED; -+ katom->affinity = 0; +} + -+void kbase_backend_complete_wq_post_sched(struct kbase_device *kbdev, -+ base_jd_core_req core_req, u64 affinity, -+ enum kbase_atom_coreref_state coreref_state) ++struct mali_pp_job *mali_group_complete_pp(struct mali_group *group, mali_bool success, u32 *sub_job) +{ -+ unsigned long flags; ++ struct mali_pp_job *pp_job_to_return; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbasep_js_job_check_deref_cores_nokatom(kbdev, core_req, affinity, -+ coreref_state); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->pp_core); ++ MALI_DEBUG_ASSERT_POINTER(group->pp_running_job); ++ MALI_DEBUG_ASSERT_POINTER(sub_job); ++ MALI_DEBUG_ASSERT(MALI_TRUE == group->is_working); + -+ if (!kbdev->pm.active_count) { -+ mutex_lock(&kbdev->js_data.runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); -+ kbase_pm_update_active(kbdev); -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&kbdev->js_data.runpool_mutex); -+ } -+} ++ /* Stop/clear the timeout timer. */ ++ _mali_osk_timer_del_async(group->timeout_timer); + -+void kbase_gpu_dump_slots(struct kbase_device *kbdev) -+{ -+ unsigned long flags; -+ int js; ++ if (NULL != group->pp_running_job) { + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ /* Deal with HW counters and profiling */ + -+ dev_info(kbdev->dev, "kbase_gpu_dump_slots:\n"); ++ if (MALI_TRUE == mali_group_is_virtual(group)) { ++ struct mali_group *child; ++ struct mali_group *temp; + -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ int idx; ++ /* update performance counters from each physical pp core within this virtual group */ ++ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { ++ mali_pp_update_performance_counters(group->pp_core, child->pp_core, group->pp_running_job, mali_pp_core_get_id(child->pp_core)); ++ } + -+ for (idx = 0; idx < SLOT_RB_SIZE; idx++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, -+ js, -+ idx); ++#if defined(CONFIG_MALI400_PROFILING) ++ /* send profiling data per physical core */ ++ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | ++ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(child->pp_core)) | ++ MALI_PROFILING_EVENT_REASON_START_STOP_HW_VIRTUAL, ++ mali_pp_job_get_perf_counter_value0(group->pp_running_job, mali_pp_core_get_id(child->pp_core)), ++ mali_pp_job_get_perf_counter_value1(group->pp_running_job, mali_pp_core_get_id(child->pp_core)), ++ mali_pp_job_get_perf_counter_src0(group->pp_running_job, group->pp_running_sub_job) | (mali_pp_job_get_perf_counter_src1(group->pp_running_job, group->pp_running_sub_job) << 8), ++ 0, 0); + -+ if (katom) -+ dev_info(kbdev->dev, -+ " js%d idx%d : katom=%p gpu_rb_state=%d\n", -+ js, idx, katom, katom->gpu_rb_state); -+ else -+ dev_info(kbdev->dev, " js%d idx%d : empty\n", -+ js, idx); ++ trace_mali_core_active(mali_pp_job_get_pid(group->pp_running_job), ++ 0 /* active */, 0 /* PP */, mali_pp_core_get_id(child->pp_core), ++ mali_pp_job_get_frame_builder_id(group->pp_running_job), ++ mali_pp_job_get_flush_id(group->pp_running_job)); ++ } ++ if (0 != group->l2_cache_core_ref_count[0]) { ++ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[0])) && ++ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[0]))) { ++ mali_group_report_l2_cache_counters_per_core(group, mali_l2_cache_get_id(group->l2_cache_core[0])); ++ } ++ } ++ if (0 != group->l2_cache_core_ref_count[1]) { ++ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[1])) && ++ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[1]))) { ++ mali_group_report_l2_cache_counters_per_core(group, mali_l2_cache_get_id(group->l2_cache_core[1])); ++ } ++ } ++ ++#endif ++ } else { ++ /* update performance counters for a physical group's pp core */ ++ mali_pp_update_performance_counters(group->pp_core, group->pp_core, group->pp_running_job, group->pp_running_sub_job); ++ ++#if defined(CONFIG_MALI400_PROFILING) ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | ++ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(group->pp_core)) | ++ MALI_PROFILING_EVENT_REASON_START_STOP_HW_PHYSICAL, ++ mali_pp_job_get_perf_counter_value0(group->pp_running_job, group->pp_running_sub_job), ++ mali_pp_job_get_perf_counter_value1(group->pp_running_job, group->pp_running_sub_job), ++ mali_pp_job_get_perf_counter_src0(group->pp_running_job, group->pp_running_sub_job) | (mali_pp_job_get_perf_counter_src1(group->pp_running_job, group->pp_running_sub_job) << 8), ++ 0, 0); ++ ++ trace_mali_core_active(mali_pp_job_get_pid(group->pp_running_job), ++ 0 /* active */, 0 /* PP */, mali_pp_core_get_id(group->pp_core), ++ mali_pp_job_get_frame_builder_id(group->pp_running_job), ++ mali_pp_job_get_flush_id(group->pp_running_job)); ++ ++ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[0])) && ++ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[0]))) { ++ mali_group_report_l2_cache_counters_per_core(group, mali_l2_cache_get_id(group->l2_cache_core[0])); ++ } ++#endif ++ } ++ ++#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) ++ if (group->gp_core) { ++ trace_gpu_sched_switch( ++ mali_gp_core_description(group->gp_core), ++ sched_clock(), 0, 0, 0); + } ++#endif ++ + } + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+} ++ if (success) { ++ /* Only do soft reset for successful jobs, a full recovery ++ * reset will be done for failed jobs. */ ++ mali_pp_reset_async(group->pp_core); ++ } + ++ pp_job_to_return = group->pp_running_job; ++ group->pp_running_job = NULL; ++ group->is_working = MALI_FALSE; ++ *sub_job = group->pp_running_sub_job; + ++ if (!success) { ++ MALI_DEBUG_PRINT(2, ("Mali group: Executing recovery reset due to job failure\n")); ++ mali_group_recovery_reset(group); ++ } else if (_MALI_OSK_ERR_OK != mali_pp_reset_wait(group->pp_core)) { ++ MALI_PRINT_ERROR(("Mali group: Executing recovery reset due to reset failure\n")); ++ mali_group_recovery_reset(group); ++ } + -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_rb.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_rb.h -new file mode 100755 -index 000000000000..1e0e05ad3ea4 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_rb.h -@@ -0,0 +1,76 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ return pp_job_to_return; ++} + ++struct mali_gp_job *mali_group_complete_gp(struct mali_group *group, mali_bool success) ++{ ++ struct mali_gp_job *gp_job_to_return; + ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->gp_core); ++ MALI_DEBUG_ASSERT_POINTER(group->gp_running_job); ++ MALI_DEBUG_ASSERT(MALI_TRUE == group->is_working); + ++ /* Stop/clear the timeout timer. */ ++ _mali_osk_timer_del_async(group->timeout_timer); + -+/* -+ * Register-based HW access backend specific APIs -+ */ ++ if (NULL != group->gp_running_job) { ++ mali_gp_update_performance_counters(group->gp_core, group->gp_running_job); + -+#ifndef _KBASE_HWACCESS_GPU_H_ -+#define _KBASE_HWACCESS_GPU_H_ ++#if defined(CONFIG_MALI400_PROFILING) ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | MALI_PROFILING_MAKE_EVENT_CHANNEL_GP(0), ++ mali_gp_job_get_perf_counter_value0(group->gp_running_job), ++ mali_gp_job_get_perf_counter_value1(group->gp_running_job), ++ mali_gp_job_get_perf_counter_src0(group->gp_running_job) | (mali_gp_job_get_perf_counter_src1(group->gp_running_job) << 8), ++ 0, 0); + -+#include ++ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[0])) && ++ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[0]))) ++ mali_group_report_l2_cache_counters_per_core(group, 0); ++#endif + -+/** -+ * kbase_gpu_irq_evict - Evict an atom from a NEXT slot -+ * -+ * @kbdev: Device pointer -+ * @js: Job slot to evict from -+ * -+ * Evict the atom in the NEXT slot for the specified job slot. This function is -+ * called from the job complete IRQ handler when the previous job has failed. -+ * -+ * Return: true if job evicted from NEXT registers, false otherwise -+ */ -+bool kbase_gpu_irq_evict(struct kbase_device *kbdev, int js); ++#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) ++ if (group->pp_core) { ++ trace_gpu_sched_switch( ++ mali_pp_core_description(group->pp_core), ++ sched_clock(), 0, 0, 0); ++ } ++#endif + -+/** -+ * kbase_gpu_complete_hw - Complete an atom on job slot js -+ * -+ * @kbdev: Device pointer -+ * @js: Job slot that has completed -+ * @completion_code: Event code from job that has completed -+ * @job_tail: The tail address from the hardware if the job has partially -+ * completed -+ * @end_timestamp: Time of completion -+ */ -+void kbase_gpu_complete_hw(struct kbase_device *kbdev, int js, -+ u32 completion_code, -+ u64 job_tail, -+ ktime_t *end_timestamp); ++#if defined(CONFIG_MALI400_PROFILING) ++ trace_mali_core_active(mali_gp_job_get_pid(group->gp_running_job), 0 /* active */, 1 /* GP */, 0 /* core */, ++ mali_gp_job_get_frame_builder_id(group->gp_running_job), mali_gp_job_get_flush_id(group->gp_running_job)); ++#endif + -+/** -+ * kbase_gpu_inspect - Inspect the contents of the HW access ringbuffer -+ * -+ * @kbdev: Device pointer -+ * @js: Job slot to inspect -+ * @idx: Index into ringbuffer. 0 is the job currently running on -+ * the slot, 1 is the job waiting, all other values are invalid. -+ * Return: The atom at that position in the ringbuffer -+ * or NULL if no atom present -+ */ -+struct kbase_jd_atom *kbase_gpu_inspect(struct kbase_device *kbdev, int js, -+ int idx); ++ mali_gp_job_set_current_heap_addr(group->gp_running_job, ++ mali_gp_read_plbu_alloc_start_addr(group->gp_core)); ++ } + -+/** -+ * kbase_gpu_dump_slots - Print the contents of the slot ringbuffers -+ * -+ * @kbdev: Device pointer -+ */ -+void kbase_gpu_dump_slots(struct kbase_device *kbdev); ++ if (success) { ++ /* Only do soft reset for successful jobs, a full recovery ++ * reset will be done for failed jobs. */ ++ mali_gp_reset_async(group->gp_core); ++ } + -+#endif /* _KBASE_HWACCESS_GPU_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_affinity.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_affinity.c -new file mode 100755 -index 000000000000..54d8ddd80097 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_affinity.c -@@ -0,0 +1,303 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ gp_job_to_return = group->gp_running_job; ++ group->gp_running_job = NULL; ++ group->is_working = MALI_FALSE; + ++ if (!success) { ++ MALI_DEBUG_PRINT(2, ("Mali group: Executing recovery reset due to job failure\n")); ++ mali_group_recovery_reset(group); ++ } else if (_MALI_OSK_ERR_OK != mali_gp_reset_wait(group->gp_core)) { ++ MALI_PRINT_ERROR(("Mali group: Executing recovery reset due to reset failure\n")); ++ mali_group_recovery_reset(group); ++ } + ++ return gp_job_to_return; ++} + ++struct mali_group *mali_group_get_glob_group(u32 index) ++{ ++ if (mali_global_num_groups > index) { ++ return mali_global_groups[index]; ++ } + ++ return NULL; ++} + -+/* -+ * Base kernel affinity manager APIs -+ */ ++u32 mali_group_get_glob_num_groups(void) ++{ ++ return mali_global_num_groups; ++} + -+#include -+#include "mali_kbase_js_affinity.h" -+#include "mali_kbase_hw.h" ++static void mali_group_activate_page_directory(struct mali_group *group, struct mali_session_data *session, mali_bool is_reload) ++{ ++ MALI_DEBUG_PRINT(5, ("Mali group: Activating page directory 0x%08X from session 0x%08X on group %s\n", ++ mali_session_get_page_directory(session), session, ++ mali_group_core_description(group))); + -+#include ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + ++ if (group->session != session || MALI_TRUE == is_reload) { ++ /* Different session than last time, so we need to do some work */ ++ MALI_DEBUG_PRINT(5, ("Mali group: Activate session: %08x previous: %08x on group %s\n", ++ session, group->session, ++ mali_group_core_description(group))); ++ mali_mmu_activate_page_directory(group->mmu, mali_session_get_page_directory(session)); ++ group->session = session; ++ } else { ++ /* Same session as last time, so no work required */ ++ MALI_DEBUG_PRINT(4, ("Mali group: Activate existing session 0x%08X on group %s\n", ++ session->page_directory, ++ mali_group_core_description(group))); ++ mali_mmu_zap_tlb_without_stall(group->mmu); ++ } ++} + -+bool kbase_js_can_run_job_on_slot_no_lock(struct kbase_device *kbdev, -+ int js) ++static void mali_group_recovery_reset(struct mali_group *group) +{ -+ /* -+ * Here are the reasons for using job slot 2: -+ * - BASE_HW_ISSUE_8987 (which is entirely used for that purpose) -+ * - In absence of the above, then: -+ * - Atoms with BASE_JD_REQ_COHERENT_GROUP -+ * - But, only when there aren't contexts with -+ * KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES, because the atoms that run on -+ * all cores on slot 1 could be blocked by those using a coherent group -+ * on slot 2 -+ * - And, only when you actually have 2 or more coregroups - if you -+ * only have 1 coregroup, then having jobs for slot 2 implies they'd -+ * also be for slot 1, meaning you'll get interference from them. Jobs -+ * able to run on slot 2 could also block jobs that can only run on -+ * slot 1 (tiler jobs) -+ */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987)) -+ return true; ++ _mali_osk_errcode_t err; + -+ if (js != 2) -+ return true; ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ /* Only deal with js==2 now: */ -+ if (kbdev->gpu_props.num_core_groups > 1) { -+ /* Only use slot 2 in the 2+ coregroup case */ -+ if (kbasep_js_ctx_attr_is_attr_on_runpool(kbdev, -+ KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES) == -+ false) { -+ /* ...But only when we *don't* have atoms that run on -+ * all cores */ ++ /* Stop cores, bus stop */ ++ if (NULL != group->pp_core) { ++ mali_pp_stop_bus(group->pp_core); ++ } else { ++ mali_gp_stop_bus(group->gp_core); ++ } + -+ /* No specific check for BASE_JD_REQ_COHERENT_GROUP -+ * atoms - the policy will sort that out */ -+ return true; ++ /* Flush MMU and clear page fault (if any) */ ++ mali_mmu_activate_fault_flush_page_directory(group->mmu); ++ mali_mmu_page_fault_done(group->mmu); ++ ++ /* Wait for cores to stop bus, then do a hard reset on them */ ++ if (NULL != group->pp_core) { ++ if (mali_group_is_virtual(group)) { ++ struct mali_group *child, *temp; ++ ++ /* Disable the broadcast unit while we do reset directly on the member cores. */ ++ mali_bcast_disable(group->bcast_core); ++ ++ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { ++ mali_pp_stop_bus_wait(child->pp_core); ++ mali_pp_hard_reset(child->pp_core); ++ } ++ ++ mali_bcast_enable(group->bcast_core); ++ } else { ++ mali_pp_stop_bus_wait(group->pp_core); ++ mali_pp_hard_reset(group->pp_core); + } ++ } else { ++ mali_gp_stop_bus_wait(group->gp_core); ++ mali_gp_hard_reset(group->gp_core); + } + -+ /* Above checks failed mean we shouldn't use slot 2 */ -+ return false; ++ /* Reset MMU */ ++ err = mali_mmu_reset(group->mmu); ++ MALI_DEBUG_ASSERT(_MALI_OSK_ERR_OK == err); ++ MALI_IGNORE(err); ++ ++ group->session = NULL; +} + -+/* -+ * As long as it has been decided to have a deeper modification of -+ * what job scheduler, power manager and affinity manager will -+ * implement, this function is just an intermediate step that -+ * assumes: -+ * - all working cores will be powered on when this is called. -+ * - largest current configuration is 2 core groups. -+ * - It has been decided not to have hardcoded values so the low -+ * and high cores in a core split will be evently distributed. -+ * - Odd combinations of core requirements have been filtered out -+ * and do not get to this function (e.g. CS+T+NSS is not -+ * supported here). -+ * - This function is frequently called and can be optimized, -+ * (see notes in loops), but as the functionallity will likely -+ * be modified, optimization has not been addressed. -+*/ -+bool kbase_js_choose_affinity(u64 * const affinity, -+ struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, int js) ++#if MALI_STATE_TRACKING ++u32 mali_group_dump_state(struct mali_group *group, char *buf, u32 size) +{ -+ base_jd_core_req core_req = katom->core_req; -+ unsigned int num_core_groups = kbdev->gpu_props.num_core_groups; -+ u64 core_availability_mask; ++ int n = 0; ++ int i; ++ struct mali_group *child; ++ struct mali_group *temp; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ if (mali_group_is_virtual(group)) { ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "Virtual PP Group: %p\n", group); ++ } else if (mali_group_is_in_virtual(group)) { ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "Child PP Group: %p\n", group); ++ } else if (NULL != group->pp_core) { ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "Physical PP Group: %p\n", group); ++ } else { ++ MALI_DEBUG_ASSERT_POINTER(group->gp_core); ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "GP Group: %p\n", group); ++ } + -+ core_availability_mask = kbase_pm_ca_get_core_mask(kbdev); ++ switch (group->state) { ++ case MALI_GROUP_STATE_INACTIVE: ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\tstate: INACTIVE\n"); ++ break; ++ case MALI_GROUP_STATE_ACTIVATION_PENDING: ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\tstate: ACTIVATION_PENDING\n"); ++ break; ++ case MALI_GROUP_STATE_ACTIVE: ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\tstate: MALI_GROUP_STATE_ACTIVE\n"); ++ break; ++ default: ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\tstate: UNKNOWN (%d)\n", group->state); ++ MALI_DEBUG_ASSERT(0); ++ break; ++ } + -+ /* -+ * If no cores are currently available (core availability policy is -+ * transitioning) then fail. -+ */ -+ if (0 == core_availability_mask) { -+ *affinity = 0; -+ return false; ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\tSW power: %s\n", ++ group->power_is_on ? "On" : "Off"); ++ ++ n += mali_pm_dump_state_domain(group->pm_domain, buf + n, size - n); ++ ++ for (i = 0; i < 2; i++) { ++ if (NULL != group->l2_cache_core[i]) { ++ struct mali_pm_domain *domain; ++ domain = mali_l2_cache_get_pm_domain( ++ group->l2_cache_core[i]); ++ n += mali_pm_dump_state_domain(domain, ++ buf + n, size - n); ++ } + } + -+ KBASE_DEBUG_ASSERT(js >= 0); ++ if (group->gp_core) { ++ n += mali_gp_dump_state(group->gp_core, buf + n, size - n); ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\tGP running job: %p\n", group->gp_running_job); ++ } + -+ if ((core_req & (BASE_JD_REQ_FS | BASE_JD_REQ_CS | BASE_JD_REQ_T)) == -+ BASE_JD_REQ_T) { -+ /* If the hardware supports XAFFINITY then we'll only enable -+ * the tiler (which is the default so this is a no-op), -+ * otherwise enable shader core 0. */ -+ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_XAFFINITY)) -+ *affinity = 1; -+ else -+ *affinity = 0; ++ if (group->pp_core) { ++ n += mali_pp_dump_state(group->pp_core, buf + n, size - n); ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\tPP running job: %p, subjob %d \n", ++ group->pp_running_job, ++ group->pp_running_sub_job); ++ } + -+ return true; ++ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, ++ struct mali_group, group_list) { ++ n += mali_group_dump_state(child, buf + n, size - n); + } + -+ if (1 == kbdev->gpu_props.num_cores) { -+ /* trivial case only one core, nothing to do */ -+ *affinity = core_availability_mask & -+ kbdev->pm.debug_core_mask[js]; ++ return n; ++} ++#endif ++ ++_mali_osk_errcode_t mali_group_upper_half_mmu(void *data) ++{ ++ struct mali_group *group = (struct mali_group *)data; ++ _mali_osk_errcode_t ret; ++ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->mmu); ++ ++#if defined(CONFIG_MALI400_PROFILING) && defined (CONFIG_TRACEPOINTS) ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ mali_executor_lock(); ++ if (!mali_group_is_working(group)) { ++ /* Not working, so nothing to do */ ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; ++ } ++#endif ++ if (NULL != group->gp_core) { ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, ++ 0, 0, /* No pid and tid for interrupt handler */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP_MMU(0), ++ mali_mmu_get_rawstat(group->mmu), 0); + } else { -+ if ((core_req & (BASE_JD_REQ_COHERENT_GROUP | -+ BASE_JD_REQ_SPECIFIC_COHERENT_GROUP))) { -+ if (js == 0 || num_core_groups == 1) { -+ /* js[0] and single-core-group systems just get -+ * the first core group */ -+ *affinity = -+ kbdev->gpu_props.props.coherency_info.group[0].core_mask -+ & core_availability_mask & -+ kbdev->pm.debug_core_mask[js]; -+ } else { -+ /* js[1], js[2] use core groups 0, 1 for -+ * dual-core-group systems */ -+ u32 core_group_idx = ((u32) js) - 1; ++ MALI_DEBUG_ASSERT_POINTER(group->pp_core); ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, ++ 0, 0, /* No pid and tid for interrupt handler */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP_MMU( ++ mali_pp_core_get_id(group->pp_core)), ++ mali_mmu_get_rawstat(group->mmu), 0); ++ } ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ mali_executor_unlock(); ++#endif ++#endif + -+ KBASE_DEBUG_ASSERT(core_group_idx < -+ num_core_groups); -+ *affinity = -+ kbdev->gpu_props.props.coherency_info.group[core_group_idx].core_mask -+ & core_availability_mask & -+ kbdev->pm.debug_core_mask[js]; ++ ret = mali_executor_interrupt_mmu(group, MALI_TRUE); + -+ /* If the job is specifically targeting core -+ * group 1 and the core availability policy is -+ * keeping that core group off, then fail */ -+ if (*affinity == 0 && core_group_idx == 1 && -+ kbdev->pm.backend.cg1_disabled -+ == true) -+ katom->event_code = -+ BASE_JD_EVENT_PM_EVENT; -+ } ++#if defined(CONFIG_MALI400_PROFILING) && defined (CONFIG_TRACEPOINTS) ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ mali_executor_lock(); ++ if (!mali_group_is_working(group) && (!mali_group_power_is_on(group))) { ++ /* group complete and on job shedule on it, it already power off */ ++ if (NULL != group->gp_core) { ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, ++ 0, 0, /* No pid and tid for interrupt handler */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP_MMU(0), ++ 0xFFFFFFFF, 0); + } else { -+ /* All cores are available when no core split is -+ * required */ -+ *affinity = core_availability_mask & -+ kbdev->pm.debug_core_mask[js]; ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, ++ 0, 0, /* No pid and tid for interrupt handler */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP_MMU( ++ mali_pp_core_get_id(group->pp_core)), ++ 0xFFFFFFFF, 0); + } -+ } + -+ /* -+ * If no cores are currently available in the desired core group(s) -+ * (core availability policy is transitioning) then fail. -+ */ -+ if (*affinity == 0) -+ return false; ++ mali_executor_unlock(); ++ return ret; ++ } ++#endif + -+ /* Enable core 0 if tiler required for hardware without XAFFINITY -+ * support (notes above) */ -+ if (core_req & BASE_JD_REQ_T) { -+ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_XAFFINITY)) -+ *affinity = *affinity | 1; ++ if (NULL != group->gp_core) { ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, ++ 0, 0, /* No pid and tid for interrupt handler */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP_MMU(0), ++ mali_mmu_get_rawstat(group->mmu), 0); ++ } else { ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, ++ 0, 0, /* No pid and tid for interrupt handler */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP_MMU( ++ mali_pp_core_get_id(group->pp_core)), ++ mali_mmu_get_rawstat(group->mmu), 0); + } ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ mali_executor_unlock(); ++#endif ++#endif + -+ return true; ++ return ret; +} + -+static inline bool kbase_js_affinity_is_violating( -+ struct kbase_device *kbdev, -+ u64 *affinities) ++static void mali_group_bottom_half_mmu(void *data) +{ -+ /* This implementation checks whether the two slots involved in Generic -+ * thread creation have intersecting affinity. This is due to micro- -+ * architectural issues where a job in slot A targetting cores used by -+ * slot B could prevent the job in slot B from making progress until the -+ * job in slot A has completed. -+ */ -+ u64 affinity_set_left; -+ u64 affinity_set_right; -+ u64 intersection; ++ struct mali_group *group = (struct mali_group *)data; + -+ KBASE_DEBUG_ASSERT(affinities != NULL); ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->mmu); + -+ affinity_set_left = affinities[1]; ++ if (NULL != group->gp_core) { ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, ++ 0, _mali_osk_get_tid(), /* pid and tid */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP_MMU(0), ++ mali_mmu_get_rawstat(group->mmu), 0); ++ } else { ++ MALI_DEBUG_ASSERT_POINTER(group->pp_core); ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, ++ 0, _mali_osk_get_tid(), /* pid and tid */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP_MMU( ++ mali_pp_core_get_id(group->pp_core)), ++ mali_mmu_get_rawstat(group->mmu), 0); ++ } + -+ affinity_set_right = affinities[2]; ++ mali_executor_interrupt_mmu(group, MALI_FALSE); + -+ /* A violation occurs when any bit in the left_set is also in the -+ * right_set */ -+ intersection = affinity_set_left & affinity_set_right; ++ if (NULL != group->gp_core) { ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, ++ 0, _mali_osk_get_tid(), /* pid and tid */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP_MMU(0), ++ mali_mmu_get_rawstat(group->mmu), 0); ++ } else { ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, ++ 0, _mali_osk_get_tid(), /* pid and tid */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP_MMU( ++ mali_pp_core_get_id(group->pp_core)), ++ mali_mmu_get_rawstat(group->mmu), 0); ++ } ++} + -+ return (bool) (intersection != (u64) 0u); ++_mali_osk_errcode_t mali_group_upper_half_gp(void *data) ++{ ++ struct mali_group *group = (struct mali_group *)data; ++ _mali_osk_errcode_t ret; ++ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->gp_core); ++ MALI_DEBUG_ASSERT_POINTER(group->mmu); ++ ++#if defined(CONFIG_MALI400_PROFILING) && defined (CONFIG_TRACEPOINTS) ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ mali_executor_lock(); ++ if (!mali_group_is_working(group)) { ++ /* Not working, so nothing to do */ ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; ++ } ++#endif ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, ++ 0, 0, /* No pid and tid for interrupt handler */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP(0), ++ mali_gp_get_rawstat(group->gp_core), 0); ++ ++ MALI_DEBUG_PRINT(4, ("Group: Interrupt 0x%08X from %s\n", ++ mali_gp_get_rawstat(group->gp_core), ++ mali_group_core_description(group))); ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ mali_executor_unlock(); ++#endif ++#endif ++ ret = mali_executor_interrupt_gp(group, MALI_TRUE); ++ ++#if defined(CONFIG_MALI400_PROFILING) && defined (CONFIG_TRACEPOINTS) ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ mali_executor_lock(); ++ if (!mali_group_is_working(group) && (!mali_group_power_is_on(group))) { ++ /* group complete and on job shedule on it, it already power off */ ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, ++ 0, 0, /* No pid and tid for interrupt handler */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP(0), ++ 0xFFFFFFFF, 0); ++ mali_executor_unlock(); ++ return ret; ++ } ++#endif ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, ++ 0, 0, /* No pid and tid for interrupt handler */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP(0), ++ mali_gp_get_rawstat(group->gp_core), 0); ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ mali_executor_unlock(); ++#endif ++#endif ++ return ret; +} + -+bool kbase_js_affinity_would_violate(struct kbase_device *kbdev, int js, -+ u64 affinity) ++static void mali_group_bottom_half_gp(void *data) +{ -+ struct kbasep_js_device_data *js_devdata; -+ u64 new_affinities[BASE_JM_MAX_NR_SLOTS]; ++ struct mali_group *group = (struct mali_group *)data; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(js < BASE_JM_MAX_NR_SLOTS); -+ js_devdata = &kbdev->js_data; ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->gp_core); ++ MALI_DEBUG_ASSERT_POINTER(group->mmu); + -+ memcpy(new_affinities, js_devdata->runpool_irq.slot_affinities, -+ sizeof(js_devdata->runpool_irq.slot_affinities)); ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, ++ 0, _mali_osk_get_tid(), /* pid and tid */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP(0), ++ mali_gp_get_rawstat(group->gp_core), 0); + -+ new_affinities[js] |= affinity; ++ mali_executor_interrupt_gp(group, MALI_FALSE); + -+ return kbase_js_affinity_is_violating(kbdev, new_affinities); ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, ++ 0, _mali_osk_get_tid(), /* pid and tid */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP(0), ++ mali_gp_get_rawstat(group->gp_core), 0); +} + -+void kbase_js_affinity_retain_slot_cores(struct kbase_device *kbdev, int js, -+ u64 affinity) ++_mali_osk_errcode_t mali_group_upper_half_pp(void *data) +{ -+ struct kbasep_js_device_data *js_devdata; -+ u64 cores; ++ struct mali_group *group = (struct mali_group *)data; ++ _mali_osk_errcode_t ret; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(js < BASE_JM_MAX_NR_SLOTS); -+ js_devdata = &kbdev->js_data; ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->pp_core); ++ MALI_DEBUG_ASSERT_POINTER(group->mmu); + -+ KBASE_DEBUG_ASSERT(kbase_js_affinity_would_violate(kbdev, js, affinity) -+ == false); ++#if defined(CONFIG_MALI400_PROFILING) && defined (CONFIG_TRACEPOINTS) ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ mali_executor_lock(); ++ if (!mali_group_is_working(group)) { ++ /* Not working, so nothing to do */ ++ mali_executor_unlock(); ++ return _MALI_OSK_ERR_FAULT; ++ } ++#endif + -+ cores = affinity; -+ while (cores) { -+ int bitnum = fls64(cores) - 1; -+ u64 bit = 1ULL << bitnum; -+ s8 cnt; ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, ++ 0, 0, /* No pid and tid for interrupt handler */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP( ++ mali_pp_core_get_id(group->pp_core)), ++ mali_pp_get_rawstat(group->pp_core), 0); + -+ cnt = -+ ++(js_devdata->runpool_irq.slot_affinity_refcount[js][bitnum]); ++ MALI_DEBUG_PRINT(4, ("Group: Interrupt 0x%08X from %s\n", ++ mali_pp_get_rawstat(group->pp_core), ++ mali_group_core_description(group))); ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ mali_executor_unlock(); ++#endif ++#endif + -+ if (cnt == 1) -+ js_devdata->runpool_irq.slot_affinities[js] |= bit; ++ ret = mali_executor_interrupt_pp(group, MALI_TRUE); + -+ cores &= ~bit; ++#if defined(CONFIG_MALI400_PROFILING) && defined (CONFIG_TRACEPOINTS) ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ mali_executor_lock(); ++ if (!mali_group_is_working(group) && (!mali_group_power_is_on(group))) { ++ /* group complete and on job shedule on it, it already power off */ ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, ++ 0, 0, /* No pid and tid for interrupt handler */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP( ++ mali_pp_core_get_id(group->pp_core)), ++ 0xFFFFFFFF, 0); ++ mali_executor_unlock(); ++ return ret; + } ++#endif ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, ++ 0, 0, /* No pid and tid for interrupt handler */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP( ++ mali_pp_core_get_id(group->pp_core)), ++ mali_pp_get_rawstat(group->pp_core), 0); ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ mali_executor_unlock(); ++#endif ++#endif ++ return ret; +} + -+void kbase_js_affinity_release_slot_cores(struct kbase_device *kbdev, int js, -+ u64 affinity) ++static void mali_group_bottom_half_pp(void *data) +{ -+ struct kbasep_js_device_data *js_devdata; -+ u64 cores; ++ struct mali_group *group = (struct mali_group *)data; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(js < BASE_JM_MAX_NR_SLOTS); -+ js_devdata = &kbdev->js_data; ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->pp_core); ++ MALI_DEBUG_ASSERT_POINTER(group->mmu); + -+ cores = affinity; -+ while (cores) { -+ int bitnum = fls64(cores) - 1; -+ u64 bit = 1ULL << bitnum; -+ s8 cnt; ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, ++ 0, _mali_osk_get_tid(), /* pid and tid */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP( ++ mali_pp_core_get_id(group->pp_core)), ++ mali_pp_get_rawstat(group->pp_core), 0); + -+ KBASE_DEBUG_ASSERT( -+ js_devdata->runpool_irq.slot_affinity_refcount[js][bitnum] > 0); ++ mali_executor_interrupt_pp(group, MALI_FALSE); + -+ cnt = -+ --(js_devdata->runpool_irq.slot_affinity_refcount[js][bitnum]); ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, ++ 0, _mali_osk_get_tid(), /* pid and tid */ ++ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP( ++ mali_pp_core_get_id(group->pp_core)), ++ mali_pp_get_rawstat(group->pp_core), 0); ++} + -+ if (0 == cnt) -+ js_devdata->runpool_irq.slot_affinities[js] &= ~bit; ++static void mali_group_timeout(void *data) ++{ ++ struct mali_group *group = (struct mali_group *)data; ++ MALI_DEBUG_ASSERT_POINTER(group); + -+ cores &= ~bit; ++ MALI_DEBUG_PRINT(2, ("Group: timeout handler for %s at %u\n", ++ mali_group_core_description(group), ++ _mali_osk_time_tickcount())); ++ ++ if (NULL != group->gp_core) { ++ mali_group_schedule_bottom_half_gp(group); ++ } else { ++ MALI_DEBUG_ASSERT_POINTER(group->pp_core); ++ mali_group_schedule_bottom_half_pp(group); + } +} + -+#if KBASE_TRACE_ENABLE -+void kbase_js_debug_log_current_affinities(struct kbase_device *kbdev) ++mali_bool mali_group_zap_session(struct mali_group *group, ++ struct mali_session_data *session) +{ -+ struct kbasep_js_device_data *js_devdata; -+ int slot_nr; ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(session); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ js_devdata = &kbdev->js_data; ++ if (group->session != session) { ++ /* not running from this session */ ++ return MALI_TRUE; /* success */ ++ } + -+ for (slot_nr = 0; slot_nr < 3; ++slot_nr) -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, JS_AFFINITY_CURRENT, NULL, -+ NULL, 0u, slot_nr, -+ (u32) js_devdata->runpool_irq.slot_affinities[slot_nr]); ++ if (group->is_working) { ++ /* The Zap also does the stall and disable_stall */ ++ mali_bool zap_success = mali_mmu_zap_tlb(group->mmu); ++ return zap_success; ++ } else { ++ /* Just remove the session instead of zapping */ ++ mali_group_clear_session(group); ++ return MALI_TRUE; /* success */ ++ } +} -+#endif /* KBASE_TRACE_ENABLE */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_affinity.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_affinity.h -new file mode 100755 -index 000000000000..35d9781ae092 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_affinity.h -@@ -0,0 +1,129 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ + ++#if defined(CONFIG_MALI400_PROFILING) ++static void mali_group_report_l2_cache_counters_per_core(struct mali_group *group, u32 core_num) ++{ ++ u32 source0 = 0; ++ u32 value0 = 0; ++ u32 source1 = 0; ++ u32 value1 = 0; ++ u32 profiling_channel = 0; + ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + ++ switch (core_num) { ++ case 0: ++ profiling_channel = MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_EVENT_CHANNEL_GPU | ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_L20_COUNTERS; ++ break; ++ case 1: ++ profiling_channel = MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_EVENT_CHANNEL_GPU | ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_L21_COUNTERS; ++ break; ++ case 2: ++ profiling_channel = MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_EVENT_CHANNEL_GPU | ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_L22_COUNTERS; ++ break; ++ default: ++ profiling_channel = MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_EVENT_CHANNEL_GPU | ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_L20_COUNTERS; ++ break; ++ } + ++ if (0 == core_num) { ++ mali_l2_cache_core_get_counter_values(group->l2_cache_core[0], &source0, &value0, &source1, &value1); ++ } ++ if (1 == core_num) { ++ if (1 == mali_l2_cache_get_id(group->l2_cache_core[0])) { ++ mali_l2_cache_core_get_counter_values(group->l2_cache_core[0], &source0, &value0, &source1, &value1); ++ } else if (1 == mali_l2_cache_get_id(group->l2_cache_core[1])) { ++ mali_l2_cache_core_get_counter_values(group->l2_cache_core[1], &source0, &value0, &source1, &value1); ++ } ++ } ++ if (2 == core_num) { ++ if (2 == mali_l2_cache_get_id(group->l2_cache_core[0])) { ++ mali_l2_cache_core_get_counter_values(group->l2_cache_core[0], &source0, &value0, &source1, &value1); ++ } else if (2 == mali_l2_cache_get_id(group->l2_cache_core[1])) { ++ mali_l2_cache_core_get_counter_values(group->l2_cache_core[1], &source0, &value0, &source1, &value1); ++ } ++ } + ++ _mali_osk_profiling_add_event(profiling_channel, source1 << 8 | source0, value0, value1, 0, 0); ++} ++#endif /* #if defined(CONFIG_MALI400_PROFILING) */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_group.h b/drivers/gpu/arm/mali400/mali/common/mali_group.h +new file mode 100755 +index 000000000..32481e4a6 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_group.h +@@ -0,0 +1,460 @@ +/* -+ * Affinity Manager internal APIs. ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + -+#ifndef _KBASE_JS_AFFINITY_H_ -+#define _KBASE_JS_AFFINITY_H_ ++#ifndef __MALI_GROUP_H__ ++#define __MALI_GROUP_H__ + -+/** -+ * kbase_js_can_run_job_on_slot_no_lock - Decide whether it is possible to -+ * submit a job to a particular job slot in the current status -+ * -+ * @kbdev: The kbase device structure of the device -+ * @js: Job slot number to check for allowance -+ * -+ * Will check if submitting to the given job slot is allowed in the current -+ * status. For example using job slot 2 while in soft-stoppable state and only -+ * having 1 coregroup is not allowed by the policy. This function should be -+ * called prior to submitting a job to a slot to make sure policy rules are not -+ * violated. -+ * -+ * The following locking conditions are made on the caller -+ * - it must hold hwaccess_lock -+ */ -+bool kbase_js_can_run_job_on_slot_no_lock(struct kbase_device *kbdev, int js); ++#include "mali_osk.h" ++#include "mali_l2_cache.h" ++#include "mali_mmu.h" ++#include "mali_gp.h" ++#include "mali_pp.h" ++#include "mali_session.h" ++#include "mali_osk_profiling.h" + +/** -+ * kbase_js_choose_affinity - Compute affinity for a given job. -+ * -+ * @affinity: Affinity bitmap computed -+ * @kbdev: The kbase device structure of the device -+ * @katom: Job chain of which affinity is going to be found -+ * @js: Slot the job chain is being submitted -+ * -+ * Currently assumes an all-on/all-off power management policy. -+ * Also assumes there is at least one core with tiler available. -+ * -+ * Returns true if a valid affinity was chosen, false if -+ * no cores were available. ++ * @brief Default max runtime [ms] for a core job - used by timeout timers + */ -+bool kbase_js_choose_affinity(u64 * const affinity, -+ struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, -+ int js); ++#define MALI_MAX_JOB_RUNTIME_DEFAULT 5000 + -+/** -+ * kbase_js_affinity_would_violate - Determine whether a proposed affinity on -+ * job slot @js would cause a violation of affinity restrictions. -+ * -+ * @kbdev: Kbase device structure -+ * @js: The job slot to test -+ * @affinity: The affinity mask to test -+ * -+ * The following locks must be held by the caller -+ * - hwaccess_lock -+ * -+ * Return: true if the affinity would violate the restrictions -+ */ -+bool kbase_js_affinity_would_violate(struct kbase_device *kbdev, int js, -+ u64 affinity); ++extern int mali_max_job_runtime; + -+/** -+ * kbase_js_affinity_retain_slot_cores - Affinity tracking: retain cores used by -+ * a slot -+ * -+ * @kbdev: Kbase device structure -+ * @js: The job slot retaining the cores -+ * @affinity: The cores to retain -+ * -+ * The following locks must be held by the caller -+ * - hwaccess_lock -+ */ -+void kbase_js_affinity_retain_slot_cores(struct kbase_device *kbdev, int js, -+ u64 affinity); ++#define MALI_MAX_NUMBER_OF_GROUPS 10 ++#define MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS 8 + -+/** -+ * kbase_js_affinity_release_slot_cores - Affinity tracking: release cores used -+ * by a slot -+ * -+ * @kbdev: Kbase device structure -+ * @js: Job slot -+ * @affinity: Bit mask of core to be released -+ * -+ * Cores must be released as soon as a job is dequeued from a slot's 'submit -+ * slots', and before another job is submitted to those slots. Otherwise, the -+ * refcount could exceed the maximum number submittable to a slot, -+ * %BASE_JM_SUBMIT_SLOTS. -+ * -+ * The following locks must be held by the caller -+ * - hwaccess_lock -+ */ -+void kbase_js_affinity_release_slot_cores(struct kbase_device *kbdev, int js, -+ u64 affinity); ++enum mali_group_state { ++ MALI_GROUP_STATE_INACTIVE, ++ MALI_GROUP_STATE_ACTIVATION_PENDING, ++ MALI_GROUP_STATE_ACTIVE, ++}; + +/** -+ * kbase_js_debug_log_current_affinities - log the current affinities -+ * -+ * @kbdev: Kbase device structure -+ * -+ * Output to the Trace log the current tracked affinities on all slots ++ * The structure represents a render group ++ * A render group is defined by all the cores that share the same Mali MMU + */ -+#if KBASE_TRACE_ENABLE -+void kbase_js_debug_log_current_affinities(struct kbase_device *kbdev); -+#else /* KBASE_TRACE_ENABLE */ -+static inline void -+kbase_js_debug_log_current_affinities(struct kbase_device *kbdev) -+{ -+} -+#endif /* KBASE_TRACE_ENABLE */ + -+#endif /* _KBASE_JS_AFFINITY_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_backend.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_backend.c -new file mode 100755 -index 000000000000..d392fa2a85d9 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_backend.c -@@ -0,0 +1,356 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++struct mali_group { ++ struct mali_mmu_core *mmu; ++ struct mali_session_data *session; + ++ enum mali_group_state state; ++ mali_bool power_is_on; + ++ mali_bool is_working; ++ unsigned long start_time; /* in ticks */ + ++ struct mali_gp_core *gp_core; ++ struct mali_gp_job *gp_running_job; + -+/* -+ * Register-based HW access backend specific job scheduler APIs -+ */ ++ struct mali_pp_core *pp_core; ++ struct mali_pp_job *pp_running_job; ++ u32 pp_running_sub_job; + -+#include -+#include -+#include -+#include ++ struct mali_pm_domain *pm_domain; + -+/* -+ * Define for when dumping is enabled. -+ * This should not be based on the instrumentation level as whether dumping is -+ * enabled for a particular level is down to the integrator. However this is -+ * being used for now as otherwise the cinstr headers would be needed. -+ */ -+#define CINSTR_DUMPING_ENABLED (2 == MALI_INSTRUMENTATION_LEVEL) ++ struct mali_l2_cache_core *l2_cache_core[2]; ++ u32 l2_cache_core_ref_count[2]; + -+/* -+ * Hold the runpool_mutex for this -+ */ -+static inline bool timer_callback_should_run(struct kbase_device *kbdev) -+{ -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; -+ s8 nr_running_ctxs; ++ /* Parent virtual group (if any) */ ++ struct mali_group *parent_group; + -+ lockdep_assert_held(&kbdev->js_data.runpool_mutex); ++ struct mali_dlbu_core *dlbu_core; ++ struct mali_bcast_unit *bcast_core; + -+ /* Timer must stop if we are suspending */ -+ if (backend->suspend_timer) -+ return false; ++ /* Used for working groups which needs to be disabled */ ++ mali_bool disable_requested; + -+ /* nr_contexts_pullable is updated with the runpool_mutex. However, the -+ * locking in the caller gives us a barrier that ensures -+ * nr_contexts_pullable is up-to-date for reading */ -+ nr_running_ctxs = atomic_read(&kbdev->js_data.nr_contexts_runnable); ++ /* Used by group to link child groups (for virtual group) */ ++ _mali_osk_list_t group_list; + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ if (kbdev->js_data.softstop_always) { -+ /* Debug support for allowing soft-stop on a single context */ -+ return true; -+ } -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++ /* Used by executor module in order to link groups of same state */ ++ _mali_osk_list_t executor_list; + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_9435)) { -+ /* Timeouts would have to be 4x longer (due to micro- -+ * architectural design) to support OpenCL conformance tests, so -+ * only run the timer when there's: -+ * - 2 or more CL contexts -+ * - 1 or more GLES contexts -+ * -+ * NOTE: We will treat a context that has both Compute and Non- -+ * Compute jobs will be treated as an OpenCL context (hence, we -+ * don't check KBASEP_JS_CTX_ATTR_NON_COMPUTE). -+ */ -+ { -+ s8 nr_compute_ctxs = -+ kbasep_js_ctx_attr_count_on_runpool(kbdev, -+ KBASEP_JS_CTX_ATTR_COMPUTE); -+ s8 nr_noncompute_ctxs = nr_running_ctxs - -+ nr_compute_ctxs; ++ /* Used by PM domains to link groups of same domain */ ++ _mali_osk_list_t pm_domain_list; + -+ return (bool) (nr_compute_ctxs >= 2 || -+ nr_noncompute_ctxs > 0); -+ } -+ } else { -+ /* Run the timer callback whenever you have at least 1 context -+ */ -+ return (bool) (nr_running_ctxs > 0); -+ } -+} ++ _mali_osk_wq_work_t *bottom_half_work_mmu; ++ _mali_osk_wq_work_t *bottom_half_work_gp; ++ _mali_osk_wq_work_t *bottom_half_work_pp; + -+static enum hrtimer_restart timer_callback(struct hrtimer *timer) -+{ -+ unsigned long flags; -+ struct kbase_device *kbdev; -+ struct kbasep_js_device_data *js_devdata; -+ struct kbase_backend_data *backend; -+ int s; -+ bool reset_needed = false; ++ _mali_osk_timer_t *timeout_timer; ++}; + -+ KBASE_DEBUG_ASSERT(timer != NULL); ++/** @brief Create a new Mali group object ++ * ++ * @return A pointer to a new group object ++ */ ++struct mali_group *mali_group_create(struct mali_l2_cache_core *core, ++ struct mali_dlbu_core *dlbu, ++ struct mali_bcast_unit *bcast, ++ u32 domain_index); + -+ backend = container_of(timer, struct kbase_backend_data, -+ scheduling_timer); -+ kbdev = container_of(backend, struct kbase_device, hwaccess.backend); -+ js_devdata = &kbdev->js_data; ++void mali_group_dump_status(struct mali_group *group); + -+ /* Loop through the slots */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ for (s = 0; s < kbdev->gpu_props.num_job_slots; s++) { -+ struct kbase_jd_atom *atom = NULL; ++void mali_group_delete(struct mali_group *group); + -+ if (kbase_backend_nr_atoms_on_slot(kbdev, s) > 0) { -+ atom = kbase_gpu_inspect(kbdev, s, 0); -+ KBASE_DEBUG_ASSERT(atom != NULL); -+ } ++_mali_osk_errcode_t mali_group_add_mmu_core(struct mali_group *group, ++ struct mali_mmu_core *mmu_core); ++void mali_group_remove_mmu_core(struct mali_group *group); + -+ if (atom != NULL) { -+ /* The current version of the model doesn't support -+ * Soft-Stop */ -+ if (!kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_5736)) { -+ u32 ticks = atom->ticks++; ++_mali_osk_errcode_t mali_group_add_gp_core(struct mali_group *group, ++ struct mali_gp_core *gp_core); ++void mali_group_remove_gp_core(struct mali_group *group); + -+#if !CINSTR_DUMPING_ENABLED -+ u32 soft_stop_ticks, hard_stop_ticks, -+ gpu_reset_ticks; -+ if (atom->core_req & BASE_JD_REQ_ONLY_COMPUTE) { -+ soft_stop_ticks = -+ js_devdata->soft_stop_ticks_cl; -+ hard_stop_ticks = -+ js_devdata->hard_stop_ticks_cl; -+ gpu_reset_ticks = -+ js_devdata->gpu_reset_ticks_cl; -+ } else { -+ soft_stop_ticks = -+ js_devdata->soft_stop_ticks; -+ hard_stop_ticks = -+ js_devdata->hard_stop_ticks_ss; -+ gpu_reset_ticks = -+ js_devdata->gpu_reset_ticks_ss; -+ } ++_mali_osk_errcode_t mali_group_add_pp_core(struct mali_group *group, ++ struct mali_pp_core *pp_core); ++void mali_group_remove_pp_core(struct mali_group *group); + -+ /* If timeouts have been changed then ensure -+ * that atom tick count is not greater than the -+ * new soft_stop timeout. This ensures that -+ * atoms do not miss any of the timeouts due to -+ * races between this worker and the thread -+ * changing the timeouts. */ -+ if (backend->timeouts_updated && -+ ticks > soft_stop_ticks) -+ ticks = atom->ticks = soft_stop_ticks; ++MALI_STATIC_INLINE const char *mali_group_core_description( ++ struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ if (NULL != group->pp_core) { ++ return mali_pp_core_description(group->pp_core); ++ } else { ++ MALI_DEBUG_ASSERT_POINTER(group->gp_core); ++ return mali_gp_core_description(group->gp_core); ++ } ++} + -+ /* Job is Soft-Stoppable */ -+ if (ticks == soft_stop_ticks) { -+ int disjoint_threshold = -+ KBASE_DISJOINT_STATE_INTERLEAVED_CONTEXT_COUNT_THRESHOLD; -+ u32 softstop_flags = 0u; -+ /* Job has been scheduled for at least -+ * js_devdata->soft_stop_ticks ticks. -+ * Soft stop the slot so we can run -+ * other jobs. -+ */ -+ dev_dbg(kbdev->dev, "Soft-stop"); -+#if !KBASE_DISABLE_SCHEDULING_SOFT_STOPS -+ /* nr_user_contexts_running is updated -+ * with the runpool_mutex, but we can't -+ * take that here. -+ * -+ * However, if it's about to be -+ * increased then the new context can't -+ * run any jobs until they take the -+ * hwaccess_lock, so it's OK to observe -+ * the older value. -+ * -+ * Similarly, if it's about to be -+ * decreased, the last job from another -+ * context has already finished, so it's -+ * not too bad that we observe the older -+ * value and register a disjoint event -+ * when we try soft-stopping */ -+ if (js_devdata->nr_user_contexts_running -+ >= disjoint_threshold) -+ softstop_flags |= -+ JS_COMMAND_SW_CAUSES_DISJOINT; ++MALI_STATIC_INLINE mali_bool mali_group_is_virtual(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); + -+ kbase_job_slot_softstop_swflags(kbdev, -+ s, atom, softstop_flags); -+#endif -+ } else if (ticks == hard_stop_ticks) { -+ /* Job has been scheduled for at least -+ * js_devdata->hard_stop_ticks_ss ticks. -+ * It should have been soft-stopped by -+ * now. Hard stop the slot. -+ */ -+#if !KBASE_DISABLE_SCHEDULING_HARD_STOPS -+ int ms = -+ js_devdata->scheduling_period_ns -+ / 1000000u; -+ dev_warn(kbdev->dev, "JS: Job Hard-Stopped (took more than %lu ticks at %lu ms/tick)", -+ (unsigned long)ticks, -+ (unsigned long)ms); -+ kbase_job_slot_hardstop(atom->kctx, s, -+ atom); -+#endif -+ } else if (ticks == gpu_reset_ticks) { -+ /* Job has been scheduled for at least -+ * js_devdata->gpu_reset_ticks_ss ticks. -+ * It should have left the GPU by now. -+ * Signal that the GPU needs to be -+ * reset. -+ */ -+ reset_needed = true; -+ } -+#else /* !CINSTR_DUMPING_ENABLED */ -+ /* NOTE: During CINSTR_DUMPING_ENABLED, we use -+ * the alternate timeouts, which makes the hard- -+ * stop and GPU reset timeout much longer. We -+ * also ensure that we don't soft-stop at all. -+ */ -+ if (ticks == js_devdata->soft_stop_ticks) { -+ /* Job has been scheduled for at least -+ * js_devdata->soft_stop_ticks. We do -+ * not soft-stop during -+ * CINSTR_DUMPING_ENABLED, however. -+ */ -+ dev_dbg(kbdev->dev, "Soft-stop"); -+ } else if (ticks == -+ js_devdata->hard_stop_ticks_dumping) { -+ /* Job has been scheduled for at least -+ * js_devdata->hard_stop_ticks_dumping -+ * ticks. Hard stop the slot. -+ */ -+#if !KBASE_DISABLE_SCHEDULING_HARD_STOPS -+ int ms = -+ js_devdata->scheduling_period_ns -+ / 1000000u; -+ dev_warn(kbdev->dev, "JS: Job Hard-Stopped (took more than %lu ticks at %lu ms/tick)", -+ (unsigned long)ticks, -+ (unsigned long)ms); -+ kbase_job_slot_hardstop(atom->kctx, s, -+ atom); ++#if (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) ++ return (NULL != group->dlbu_core); ++#else ++ return MALI_FALSE; +#endif -+ } else if (ticks == -+ js_devdata->gpu_reset_ticks_dumping) { -+ /* Job has been scheduled for at least -+ * js_devdata->gpu_reset_ticks_dumping -+ * ticks. It should have left the GPU by -+ * now. Signal that the GPU needs to be -+ * reset. -+ */ -+ reset_needed = true; -+ } -+#endif /* !CINSTR_DUMPING_ENABLED */ -+ } -+ } -+ } -+#if KBASE_GPU_RESET_EN -+ if (reset_needed) { -+ dev_err(kbdev->dev, "JS: Job has been on the GPU for too long (JS_RESET_TICKS_SS/DUMPING timeout hit). Issueing GPU soft-reset to resolve."); ++} + -+ if (kbase_prepare_to_reset_gpu_locked(kbdev)) -+ kbase_reset_gpu_locked(kbdev); -+ } -+#endif /* KBASE_GPU_RESET_EN */ -+ /* the timer is re-issued if there is contexts in the run-pool */ ++/** @brief Check if a group is a part of a virtual group or not ++ */ ++MALI_STATIC_INLINE mali_bool mali_group_is_in_virtual(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ if (backend->timer_running) -+ hrtimer_start(&backend->scheduling_timer, -+ HR_TIMER_DELAY_NSEC(js_devdata->scheduling_period_ns), -+ HRTIMER_MODE_REL); ++#if (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) ++ return (NULL != group->parent_group) ? MALI_TRUE : MALI_FALSE; ++#else ++ return MALI_FALSE; ++#endif ++} + -+ backend->timeouts_updated = false; ++/** @brief Reset group ++ * ++ * This function will reset the entire group, ++ * including all the cores present in the group. ++ * ++ * @param group Pointer to the group to reset ++ */ ++void mali_group_reset(struct mali_group *group); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++MALI_STATIC_INLINE struct mali_session_data *mali_group_get_session( ++ struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ return HRTIMER_NORESTART; ++ return group->session; +} + -+void kbase_backend_ctx_count_changed(struct kbase_device *kbdev) ++MALI_STATIC_INLINE void mali_group_clear_session(struct mali_group *group) +{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; -+ unsigned long flags; -+ -+ lockdep_assert_held(&js_devdata->runpool_mutex); -+ -+ if (!timer_callback_should_run(kbdev)) { -+ /* Take spinlock to force synchronisation with timer */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ backend->timer_running = false; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ /* From now on, return value of timer_callback_should_run() will -+ * also cause the timer to not requeue itself. Its return value -+ * cannot change, because it depends on variables updated with -+ * the runpool_mutex held, which the caller of this must also -+ * hold */ -+ hrtimer_cancel(&backend->scheduling_timer); -+ } -+ -+ if (timer_callback_should_run(kbdev) && !backend->timer_running) { -+ /* Take spinlock to force synchronisation with timer */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ backend->timer_running = true; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ hrtimer_start(&backend->scheduling_timer, -+ HR_TIMER_DELAY_NSEC(js_devdata->scheduling_period_ns), -+ HRTIMER_MODE_REL); ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ KBASE_TRACE_ADD(kbdev, JS_POLICY_TIMER_START, NULL, NULL, 0u, -+ 0u); ++ if (NULL != group->session) { ++ mali_mmu_activate_empty_page_directory(group->mmu); ++ group->session = NULL; + } +} + -+int kbase_backend_timer_init(struct kbase_device *kbdev) -+{ -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; ++enum mali_group_state mali_group_activate(struct mali_group *group); + -+ hrtimer_init(&backend->scheduling_timer, CLOCK_MONOTONIC, -+ HRTIMER_MODE_REL); -+ backend->scheduling_timer.function = timer_callback; ++/* ++ * Change state from ACTIVATION_PENDING to ACTIVE ++ * For virtual group, all childs need to be ACTIVE first ++ */ ++mali_bool mali_group_set_active(struct mali_group *group); + -+ backend->timer_running = false; ++/* ++ * @return MALI_TRUE means one or more domains can now be powered off, ++ * and caller should call either mali_pm_update_async() or ++ * mali_pm_update_sync() in order to do so. ++ */ ++mali_bool mali_group_deactivate(struct mali_group *group); + -+ return 0; ++MALI_STATIC_INLINE enum mali_group_state mali_group_get_state(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ return group->state; +} + -+void kbase_backend_timer_term(struct kbase_device *kbdev) ++MALI_STATIC_INLINE mali_bool mali_group_power_is_on(struct mali_group *group) +{ -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; -+ -+ hrtimer_cancel(&backend->scheduling_timer); ++ MALI_DEBUG_ASSERT_POINTER(group); ++ return group->power_is_on; +} + -+void kbase_backend_timer_suspend(struct kbase_device *kbdev) -+{ -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; ++void mali_group_power_up(struct mali_group *group); ++void mali_group_power_down(struct mali_group *group); + -+ backend->suspend_timer = true; ++MALI_STATIC_INLINE void mali_group_set_disable_request( ++ struct mali_group *group, mali_bool disable) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ group->disable_requested = disable; + -+ kbase_backend_ctx_count_changed(kbdev); ++ /** ++ * When one of child group's disable_requeset is set TRUE, then ++ * the disable_request of parent group should also be set to TRUE. ++ * While, the disable_request of parent group should only be set to FALSE ++ * only when all of its child group's disable_request are set to FALSE. ++ */ ++ if (NULL != group->parent_group && MALI_TRUE == disable) { ++ group->parent_group->disable_requested = disable; ++ } +} + -+void kbase_backend_timer_resume(struct kbase_device *kbdev) ++MALI_STATIC_INLINE mali_bool mali_group_disable_requested( ++ struct mali_group *group) +{ -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ return group->disable_requested; ++} + -+ backend->suspend_timer = false; ++/** @brief Virtual groups */ ++void mali_group_add_group(struct mali_group *parent, struct mali_group *child); ++struct mali_group *mali_group_acquire_group(struct mali_group *parent); ++void mali_group_remove_group(struct mali_group *parent, struct mali_group *child); + -+ kbase_backend_ctx_count_changed(kbdev); ++/** @brief Checks if the group is working. ++ */ ++MALI_STATIC_INLINE mali_bool mali_group_is_working(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ if (mali_group_is_in_virtual(group)) { ++ struct mali_group *tmp_group = mali_executor_get_virtual_group(); ++ return tmp_group->is_working; ++ } ++ return group->is_working; +} + -+void kbase_backend_timeouts_changed(struct kbase_device *kbdev) ++MALI_STATIC_INLINE struct mali_gp_job *mali_group_get_running_gp_job(struct mali_group *group) +{ -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; -+ -+ backend->timeouts_updated = true; ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ return group->gp_running_job; +} + -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_internal.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_internal.h -new file mode 100755 -index 000000000000..3f53779c6747 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_internal.h -@@ -0,0 +1,69 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++/** @brief Zap MMU TLB on all groups + * ++ * Zap TLB on group if \a session is active. + */ ++mali_bool mali_group_zap_session(struct mali_group *group, ++ struct mali_session_data *session); + -+ -+ -+ -+/* -+ * Register-based HW access backend specific job scheduler APIs -+ */ -+ -+#ifndef _KBASE_JS_BACKEND_H_ -+#define _KBASE_JS_BACKEND_H_ -+ -+/** -+ * kbase_backend_timer_init() - Initialise the JS scheduling timer -+ * @kbdev: Device pointer -+ * -+ * This function should be called at driver initialisation -+ * -+ * Return: 0 on success ++/** @brief Get pointer to GP core object + */ -+int kbase_backend_timer_init(struct kbase_device *kbdev); ++MALI_STATIC_INLINE struct mali_gp_core *mali_group_get_gp_core(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ return group->gp_core; ++} + -+/** -+ * kbase_backend_timer_term() - Terminate the JS scheduling timer -+ * @kbdev: Device pointer -+ * -+ * This function should be called at driver termination ++/** @brief Get pointer to PP core object + */ -+void kbase_backend_timer_term(struct kbase_device *kbdev); ++MALI_STATIC_INLINE struct mali_pp_core *mali_group_get_pp_core(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ return group->pp_core; ++} + -+/** -+ * kbase_backend_timer_suspend - Suspend is happening, stop the JS scheduling -+ * timer -+ * @kbdev: Device pointer -+ * -+ * This function should be called on suspend, after the active count has reached -+ * zero. This is required as the timer may have been started on job submission -+ * to the job scheduler, but before jobs are submitted to the GPU. -+ * -+ * Caller must hold runpool_mutex. ++/** @brief Start GP job + */ -+void kbase_backend_timer_suspend(struct kbase_device *kbdev); ++void mali_group_start_gp_job(struct mali_group *group, struct mali_gp_job *job, mali_bool gpu_secure_mode_pre_enabled); + -+/** -+ * kbase_backend_timer_resume - Resume is happening, re-evaluate the JS -+ * scheduling timer -+ * @kbdev: Device pointer -+ * -+ * This function should be called on resume. Note that is is not guaranteed to -+ * re-start the timer, only evalute whether it should be re-started. -+ * -+ * Caller must hold runpool_mutex. -+ */ -+void kbase_backend_timer_resume(struct kbase_device *kbdev); ++void mali_group_start_pp_job(struct mali_group *group, struct mali_pp_job *job, u32 sub_job, mali_bool gpu_secure_mode_pre_enabled); + -+#endif /* _KBASE_JS_BACKEND_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_mmu_hw_direct.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_mmu_hw_direct.c -new file mode 100755 -index 000000000000..aa1817c8bca9 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_mmu_hw_direct.c -@@ -0,0 +1,401 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++/** @brief Start virtual group Job on a virtual group ++*/ ++void mali_group_start_job_on_virtual(struct mali_group *group, struct mali_pp_job *job, u32 first_subjob, u32 last_subjob); + + ++/** @brief Start a subjob from a particular on a specific PP group ++*/ ++void mali_group_start_job_on_group(struct mali_group *group, struct mali_pp_job *job, u32 subjob); + -+#include + -+#include -+#include -+#include -+#include -+#include -+#include ++/** @brief remove all the unused groups in tmp_unused group list, so that the group is in consistent status. ++ */ ++void mali_group_non_dlbu_job_done_virtual(struct mali_group *group); + -+static inline u64 lock_region(struct kbase_device *kbdev, u64 pfn, -+ u32 num_pages) -+{ -+ u64 region; + -+ /* can't lock a zero sized range */ -+ KBASE_DEBUG_ASSERT(num_pages); ++/** @brief Resume GP job that suspended waiting for more heap memory ++ */ ++void mali_group_resume_gp_with_new_heap(struct mali_group *group, u32 job_id, u32 start_addr, u32 end_addr); + -+ region = pfn << PAGE_SHIFT; -+ /* -+ * fls returns (given the ASSERT above): -+ * 1 .. 32 -+ * -+ * 10 + fls(num_pages) -+ * results in the range (11 .. 42) -+ */ ++MALI_STATIC_INLINE enum mali_interrupt_result mali_group_get_interrupt_result_gp(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->gp_core); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ return mali_gp_get_interrupt_result(group->gp_core); ++} + -+ /* gracefully handle num_pages being zero */ -+ if (0 == num_pages) { -+ region |= 11; -+ } else { -+ u8 region_width; ++MALI_STATIC_INLINE enum mali_interrupt_result mali_group_get_interrupt_result_pp(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->pp_core); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ return mali_pp_get_interrupt_result(group->pp_core); ++} + -+ region_width = 10 + fls(num_pages); -+ if (num_pages != (1ul << (region_width - 11))) { -+ /* not pow2, so must go up to the next pow2 */ -+ region_width += 1; -+ } -+ KBASE_DEBUG_ASSERT(region_width <= KBASE_LOCK_REGION_MAX_SIZE); -+ KBASE_DEBUG_ASSERT(region_width >= KBASE_LOCK_REGION_MIN_SIZE); -+ region |= region_width; -+ } ++MALI_STATIC_INLINE enum mali_interrupt_result mali_group_get_interrupt_result_mmu(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->mmu); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ return mali_mmu_get_interrupt_result(group->mmu); ++} + -+ return region; ++MALI_STATIC_INLINE mali_bool mali_group_gp_is_active(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->gp_core); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ return mali_gp_is_active(group->gp_core); +} + -+static int wait_ready(struct kbase_device *kbdev, -+ unsigned int as_nr, struct kbase_context *kctx) ++MALI_STATIC_INLINE mali_bool mali_group_pp_is_active(struct mali_group *group) +{ -+ unsigned int max_loops = KBASE_AS_INACTIVE_MAX_LOOPS; -+ u32 val = kbase_reg_read(kbdev, MMU_AS_REG(as_nr, AS_STATUS), kctx); ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->pp_core); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ return mali_pp_is_active(group->pp_core); ++} + -+ /* Wait for the MMU status to indicate there is no active command, in -+ * case one is pending. Do not log remaining register accesses. */ -+ while (--max_loops && (val & AS_STATUS_AS_ACTIVE)) -+ val = kbase_reg_read(kbdev, MMU_AS_REG(as_nr, AS_STATUS), NULL); ++MALI_STATIC_INLINE mali_bool mali_group_has_timed_out(struct mali_group *group) ++{ ++ unsigned long time_cost; ++ struct mali_group *tmp_group = group; + -+ if (max_loops == 0) { -+ dev_err(kbdev->dev, "AS_ACTIVE bit stuck\n"); -+ return -1; -+ } ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ /* If waiting in loop was performed, log last read value. */ -+ if (KBASE_AS_INACTIVE_MAX_LOOPS - 1 > max_loops) -+ kbase_reg_read(kbdev, MMU_AS_REG(as_nr, AS_STATUS), kctx); ++ /* if the group is in virtual need to use virtual_group's start time */ ++ if (mali_group_is_in_virtual(group)) { ++ tmp_group = mali_executor_get_virtual_group(); ++ } + -+ return 0; ++ time_cost = _mali_osk_time_tickcount() - tmp_group->start_time; ++ if (_mali_osk_time_mstoticks(mali_max_job_runtime) <= time_cost) { ++ /* ++ * current tick is at or after timeout end time, ++ * so this is a valid timeout ++ */ ++ return MALI_TRUE; ++ } else { ++ /* ++ * Not a valid timeout. A HW interrupt probably beat ++ * us to it, and the timer wasn't properly deleted ++ * (async deletion used due to atomic context). ++ */ ++ return MALI_FALSE; ++ } +} + -+static int write_cmd(struct kbase_device *kbdev, int as_nr, u32 cmd, -+ struct kbase_context *kctx) ++MALI_STATIC_INLINE void mali_group_mask_all_interrupts_gp(struct mali_group *group) +{ -+ int status; -+ -+ /* write AS_COMMAND when MMU is ready to accept another command */ -+ status = wait_ready(kbdev, as_nr, kctx); -+ if (status == 0) -+ kbase_reg_write(kbdev, MMU_AS_REG(as_nr, AS_COMMAND), cmd, -+ kctx); -+ -+ return status; ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->gp_core); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ return mali_gp_mask_all_interrupts(group->gp_core); +} + -+static void validate_protected_page_fault(struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++MALI_STATIC_INLINE void mali_group_mask_all_interrupts_pp(struct mali_group *group) +{ -+ /* GPUs which support (native) protected mode shall not report page -+ * fault addresses unless it has protected debug mode and protected -+ * debug mode is turned on */ -+ u32 protected_debug_mode = 0; -+ -+ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_MODE)) -+ return; -+ -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_DEBUG_MODE)) { -+ protected_debug_mode = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(GPU_STATUS), -+ kctx) & GPU_DBGEN; -+ } ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->pp_core); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ return mali_pp_mask_all_interrupts(group->pp_core); ++} + -+ if (!protected_debug_mode) { -+ /* fault_addr should never be reported in protected mode. -+ * However, we just continue by printing an error message */ -+ dev_err(kbdev->dev, "Fault address reported in protected mode\n"); -+ } ++MALI_STATIC_INLINE void mali_group_enable_interrupts_gp( ++ struct mali_group *group, ++ enum mali_interrupt_result exceptions) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->gp_core); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ mali_gp_enable_interrupts(group->gp_core, exceptions); +} + -+void kbase_mmu_interrupt(struct kbase_device *kbdev, u32 irq_stat) ++MALI_STATIC_INLINE void mali_group_schedule_bottom_half_gp(struct mali_group *group) +{ -+ const int num_as = 16; -+ const int busfault_shift = MMU_PAGE_FAULT_FLAGS; -+ const int pf_shift = 0; -+ const unsigned long as_bit_mask = (1UL << num_as) - 1; -+ unsigned long flags; -+ u32 new_mask; -+ u32 tmp; ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->gp_core); ++ _mali_osk_wq_schedule_work(group->bottom_half_work_gp); ++} + -+ /* bus faults */ -+ u32 bf_bits = (irq_stat >> busfault_shift) & as_bit_mask; -+ /* page faults (note: Ignore ASes with both pf and bf) */ -+ u32 pf_bits = ((irq_stat >> pf_shift) & as_bit_mask) & ~bf_bits; + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); ++MALI_STATIC_INLINE void mali_group_schedule_bottom_half_pp(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->pp_core); ++ _mali_osk_wq_schedule_work(group->bottom_half_work_pp); ++} + -+ /* remember current mask */ -+ spin_lock_irqsave(&kbdev->mmu_mask_change, flags); -+ new_mask = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_MASK), NULL); -+ /* mask interrupts for now */ -+ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_MASK), 0, NULL); -+ spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); ++MALI_STATIC_INLINE void mali_group_schedule_bottom_half_mmu(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT_POINTER(group->mmu); ++ _mali_osk_wq_schedule_work(group->bottom_half_work_mmu); ++} + -+ while (bf_bits | pf_bits) { -+ struct kbase_as *as; -+ int as_no; -+ struct kbase_context *kctx; ++struct mali_pp_job *mali_group_complete_pp(struct mali_group *group, mali_bool success, u32 *sub_job); + -+ /* -+ * the while logic ensures we have a bit set, no need to check -+ * for not-found here -+ */ -+ as_no = ffs(bf_bits | pf_bits) - 1; -+ as = &kbdev->as[as_no]; ++struct mali_gp_job *mali_group_complete_gp(struct mali_group *group, mali_bool success); + -+ /* -+ * Refcount the kctx ASAP - it shouldn't disappear anyway, since -+ * Bus/Page faults _should_ only occur whilst jobs are running, -+ * and a job causing the Bus/Page fault shouldn't complete until -+ * the MMU is updated -+ */ -+ kctx = kbasep_js_runpool_lookup_ctx(kbdev, as_no); ++#if defined(CONFIG_MALI400_PROFILING) ++MALI_STATIC_INLINE void mali_group_oom(struct mali_group *group) ++{ ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SUSPEND | ++ MALI_PROFILING_MAKE_EVENT_CHANNEL_GP(0), ++ 0, 0, 0, 0, 0); ++} ++#endif + ++struct mali_group *mali_group_get_glob_group(u32 index); ++u32 mali_group_get_glob_num_groups(void); + -+ /* find faulting address */ -+ as->fault_addr = kbase_reg_read(kbdev, -+ MMU_AS_REG(as_no, -+ AS_FAULTADDRESS_HI), -+ kctx); -+ as->fault_addr <<= 32; -+ as->fault_addr |= kbase_reg_read(kbdev, -+ MMU_AS_REG(as_no, -+ AS_FAULTADDRESS_LO), -+ kctx); ++u32 mali_group_dump_state(struct mali_group *group, char *buf, u32 size); + -+ /* Mark the fault protected or not */ -+ as->protected_mode = kbdev->protected_mode; + -+ if (kbdev->protected_mode && as->fault_addr) -+ { -+ /* check if address reporting is allowed */ -+ validate_protected_page_fault(kbdev, kctx); -+ } ++_mali_osk_errcode_t mali_group_upper_half_mmu(void *data); ++_mali_osk_errcode_t mali_group_upper_half_gp(void *data); ++_mali_osk_errcode_t mali_group_upper_half_pp(void *data); + -+ /* report the fault to debugfs */ -+ kbase_as_fault_debugfs_new(kbdev, as_no); ++MALI_STATIC_INLINE mali_bool mali_group_is_empty(struct mali_group *group) ++{ ++ MALI_DEBUG_ASSERT_POINTER(group); ++ MALI_DEBUG_ASSERT(mali_group_is_virtual(group)); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ return _mali_osk_list_empty(&group->group_list); ++} + -+ /* record the fault status */ -+ as->fault_status = kbase_reg_read(kbdev, -+ MMU_AS_REG(as_no, -+ AS_FAULTSTATUS), -+ kctx); ++#endif /* __MALI_GROUP_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c +new file mode 100755 +index 000000000..a813816e9 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c +@@ -0,0 +1,47 @@ ++/* ++ * Copyright (C) 2011-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ /* find the fault type */ -+ as->fault_type = (bf_bits & (1 << as_no)) ? -+ KBASE_MMU_FAULT_TYPE_BUS : -+ KBASE_MMU_FAULT_TYPE_PAGE; ++#include "mali_hw_core.h" ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_osk_mali.h" + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) { -+ as->fault_extra_addr = kbase_reg_read(kbdev, -+ MMU_AS_REG(as_no, AS_FAULTEXTRA_HI), -+ kctx); -+ as->fault_extra_addr <<= 32; -+ as->fault_extra_addr |= kbase_reg_read(kbdev, -+ MMU_AS_REG(as_no, AS_FAULTEXTRA_LO), -+ kctx); -+ } ++_mali_osk_errcode_t mali_hw_core_create(struct mali_hw_core *core, const _mali_osk_resource_t *resource, u32 reg_size) ++{ ++ core->phys_addr = resource->base; ++ core->phys_offset = resource->base - _mali_osk_resource_base_address(); ++ core->description = resource->description; ++ core->size = reg_size; + -+ if (kbase_as_has_bus_fault(as)) { -+ /* Mark bus fault as handled. -+ * Note that a bus fault is processed first in case -+ * where both a bus fault and page fault occur. -+ */ -+ bf_bits &= ~(1UL << as_no); ++ MALI_DEBUG_ASSERT(core->phys_offset < core->phys_addr); + -+ /* remove the queued BF (and PF) from the mask */ -+ new_mask &= ~(MMU_BUS_ERROR(as_no) | -+ MMU_PAGE_FAULT(as_no)); ++ if (_MALI_OSK_ERR_OK == _mali_osk_mem_reqregion(core->phys_addr, core->size, core->description)) { ++ core->mapped_registers = _mali_osk_mem_mapioregion(core->phys_addr, core->size, core->description); ++ if (NULL != core->mapped_registers) { ++ return _MALI_OSK_ERR_OK; + } else { -+ /* Mark page fault as handled */ -+ pf_bits &= ~(1UL << as_no); -+ -+ /* remove the queued PF from the mask */ -+ new_mask &= ~MMU_PAGE_FAULT(as_no); ++ MALI_PRINT_ERROR(("Failed to map memory region for core %s at phys_addr 0x%08X\n", core->description, core->phys_addr)); + } -+ -+ /* Process the interrupt for this address space */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_mmu_interrupt_process(kbdev, kctx, as); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ _mali_osk_mem_unreqregion(core->phys_addr, core->size); ++ } else { ++ MALI_PRINT_ERROR(("Failed to request memory region for core %s at phys_addr 0x%08X\n", core->description, core->phys_addr)); + } + -+ /* reenable interrupts */ -+ spin_lock_irqsave(&kbdev->mmu_mask_change, flags); -+ tmp = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_MASK), NULL); -+ new_mask |= tmp; -+ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_MASK), new_mask, NULL); -+ spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); ++ return _MALI_OSK_ERR_FAULT; +} + -+void kbase_mmu_hw_configure(struct kbase_device *kbdev, struct kbase_as *as, -+ struct kbase_context *kctx) ++void mali_hw_core_delete(struct mali_hw_core *core) +{ -+ struct kbase_mmu_setup *current_setup = &as->current_setup; -+ u32 transcfg = 0; -+ -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) { -+ transcfg = current_setup->transcfg & 0xFFFFFFFFUL; ++ if (NULL != core->mapped_registers) { ++ _mali_osk_mem_unmapioregion(core->phys_addr, core->size, core->mapped_registers); ++ core->mapped_registers = NULL; ++ } ++ _mali_osk_mem_unreqregion(core->phys_addr, core->size); ++} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h +new file mode 100755 +index 000000000..38d96e240 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h +@@ -0,0 +1,111 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ /* Set flag AS_TRANSCFG_PTW_MEMATTR_WRITE_BACK */ -+ /* Clear PTW_MEMATTR bits */ -+ transcfg &= ~AS_TRANSCFG_PTW_MEMATTR_MASK; -+ /* Enable correct PTW_MEMATTR bits */ -+ transcfg |= AS_TRANSCFG_PTW_MEMATTR_WRITE_BACK; ++#ifndef __MALI_HW_CORE_H__ ++#define __MALI_HW_CORE_H__ + -+ if (kbdev->system_coherency == COHERENCY_ACE) { -+ /* Set flag AS_TRANSCFG_PTW_SH_OS (outer shareable) */ -+ /* Clear PTW_SH bits */ -+ transcfg = (transcfg & ~AS_TRANSCFG_PTW_SH_MASK); -+ /* Enable correct PTW_SH bits */ -+ transcfg = (transcfg | AS_TRANSCFG_PTW_SH_OS); -+ } ++#include "mali_osk.h" ++#include "mali_kernel_common.h" + -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSCFG_LO), -+ transcfg, kctx); -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSCFG_HI), -+ (current_setup->transcfg >> 32) & 0xFFFFFFFFUL, -+ kctx); -+ } else { -+ if (kbdev->system_coherency == COHERENCY_ACE) -+ current_setup->transtab |= AS_TRANSTAB_LPAE_SHARE_OUTER; -+ } ++/** ++ * The common parts for all Mali HW cores (GP, PP, MMU, L2 and PMU) ++ * This struct is embedded inside all core specific structs. ++ */ ++struct mali_hw_core { ++ uintptr_t phys_addr; /**< Physical address of the registers */ ++ u32 phys_offset; /**< Offset from start of Mali to registers */ ++ u32 size; /**< Size of registers */ ++ mali_io_address mapped_registers; /**< Virtual mapping of the registers */ ++ const char *description; /**< Name of unit (as specified in device configuration) */ ++}; + -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSTAB_LO), -+ current_setup->transtab & 0xFFFFFFFFUL, kctx); -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSTAB_HI), -+ (current_setup->transtab >> 32) & 0xFFFFFFFFUL, kctx); ++#define MALI_REG_POLL_COUNT_FAST 1000000 ++#define MALI_REG_POLL_COUNT_SLOW 1000000 + -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_MEMATTR_LO), -+ current_setup->memattr & 0xFFFFFFFFUL, kctx); -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_MEMATTR_HI), -+ (current_setup->memattr >> 32) & 0xFFFFFFFFUL, kctx); ++/* ++ * GP and PP core translate their int_stat/rawstat into one of these ++ */ ++enum mali_interrupt_result { ++ MALI_INTERRUPT_RESULT_NONE, ++ MALI_INTERRUPT_RESULT_SUCCESS, ++ MALI_INTERRUPT_RESULT_SUCCESS_VS, ++ MALI_INTERRUPT_RESULT_SUCCESS_PLBU, ++ MALI_INTERRUPT_RESULT_OOM, ++ MALI_INTERRUPT_RESULT_ERROR ++}; + -+ KBASE_TLSTREAM_TL_ATTRIB_AS_CONFIG(as, -+ current_setup->transtab, -+ current_setup->memattr, -+ transcfg); ++_mali_osk_errcode_t mali_hw_core_create(struct mali_hw_core *core, const _mali_osk_resource_t *resource, u32 reg_size); ++void mali_hw_core_delete(struct mali_hw_core *core); + -+ write_cmd(kbdev, as->number, AS_COMMAND_UPDATE, kctx); ++MALI_STATIC_INLINE u32 mali_hw_core_register_read(struct mali_hw_core *core, u32 relative_address) ++{ ++ u32 read_val; ++ read_val = _mali_osk_mem_ioread32(core->mapped_registers, relative_address); ++ MALI_DEBUG_PRINT(6, ("register_read for core %s, relative addr=0x%04X, val=0x%08X\n", ++ core->description, relative_address, read_val)); ++ return read_val; +} + -+int kbase_mmu_hw_do_operation(struct kbase_device *kbdev, struct kbase_as *as, -+ struct kbase_context *kctx, u64 vpfn, u32 nr, u32 op, -+ unsigned int handling_irq) ++MALI_STATIC_INLINE void mali_hw_core_register_write_relaxed(struct mali_hw_core *core, u32 relative_address, u32 new_val) +{ -+ int ret; -+ -+ lockdep_assert_held(&kbdev->mmu_hw_mutex); -+ -+ if (op == AS_COMMAND_UNLOCK) { -+ /* Unlock doesn't require a lock first */ -+ ret = write_cmd(kbdev, as->number, AS_COMMAND_UNLOCK, kctx); -+ } else { -+ u64 lock_addr = lock_region(kbdev, vpfn, nr); -+ -+ /* Lock the region that needs to be updated */ -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_LOCKADDR_LO), -+ lock_addr & 0xFFFFFFFFUL, kctx); -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_LOCKADDR_HI), -+ (lock_addr >> 32) & 0xFFFFFFFFUL, kctx); -+ write_cmd(kbdev, as->number, AS_COMMAND_LOCK, kctx); -+ -+ /* Run the MMU operation */ -+ write_cmd(kbdev, as->number, op, kctx); -+ -+ /* Wait for the flush to complete */ -+ ret = wait_ready(kbdev, as->number, kctx); ++ MALI_DEBUG_PRINT(6, ("register_write_relaxed for core %s, relative addr=0x%04X, val=0x%08X\n", ++ core->description, relative_address, new_val)); ++ _mali_osk_mem_iowrite32_relaxed(core->mapped_registers, relative_address, new_val); ++} + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_9630)) { -+ /* Issue an UNLOCK command to ensure that valid page -+ tables are re-read by the GPU after an update. -+ Note that, the FLUSH command should perform all the -+ actions necessary, however the bus logs show that if -+ multiple page faults occur within an 8 page region -+ the MMU does not always re-read the updated page -+ table entries for later faults or is only partially -+ read, it subsequently raises the page fault IRQ for -+ the same addresses, the unlock ensures that the MMU -+ cache is flushed, so updates can be re-read. As the -+ region is now unlocked we need to issue 2 UNLOCK -+ commands in order to flush the MMU/uTLB, -+ see PRLAM-8812. -+ */ -+ write_cmd(kbdev, as->number, AS_COMMAND_UNLOCK, kctx); -+ write_cmd(kbdev, as->number, AS_COMMAND_UNLOCK, kctx); -+ } ++/* Conditionally write a register. ++ * The register will only be written if the new value is different from the old_value. ++ * If the new value is different, the old value will also be updated */ ++MALI_STATIC_INLINE void mali_hw_core_register_write_relaxed_conditional(struct mali_hw_core *core, u32 relative_address, u32 new_val, const u32 old_val) ++{ ++ MALI_DEBUG_PRINT(6, ("register_write_relaxed for core %s, relative addr=0x%04X, val=0x%08X\n", ++ core->description, relative_address, new_val)); ++ if (old_val != new_val) { ++ _mali_osk_mem_iowrite32_relaxed(core->mapped_registers, relative_address, new_val); + } -+ -+ return ret; +} + -+void kbase_mmu_hw_clear_fault(struct kbase_device *kbdev, struct kbase_as *as, -+ struct kbase_context *kctx, enum kbase_mmu_fault_type type) ++MALI_STATIC_INLINE void mali_hw_core_register_write(struct mali_hw_core *core, u32 relative_address, u32 new_val) +{ -+ unsigned long flags; -+ u32 pf_bf_mask; -+ -+ spin_lock_irqsave(&kbdev->mmu_mask_change, flags); -+ -+ /* -+ * A reset is in-flight and we're flushing the IRQ + bottom half -+ * so don't update anything as it could race with the reset code. -+ */ -+ if (kbdev->irq_reset_flush) -+ goto unlock; -+ -+ /* Clear the page (and bus fault IRQ as well in case one occurred) */ -+ pf_bf_mask = MMU_PAGE_FAULT(as->number); -+ if (type == KBASE_MMU_FAULT_TYPE_BUS || -+ type == KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED) -+ pf_bf_mask |= MMU_BUS_ERROR(as->number); -+ -+ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_CLEAR), pf_bf_mask, kctx); -+ -+unlock: -+ spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); ++ MALI_DEBUG_PRINT(6, ("register_write for core %s, relative addr=0x%04X, val=0x%08X\n", ++ core->description, relative_address, new_val)); ++ _mali_osk_mem_iowrite32(core->mapped_registers, relative_address, new_val); +} + -+void kbase_mmu_hw_enable_fault(struct kbase_device *kbdev, struct kbase_as *as, -+ struct kbase_context *kctx, enum kbase_mmu_fault_type type) ++MALI_STATIC_INLINE void mali_hw_core_register_write_array_relaxed(struct mali_hw_core *core, u32 relative_address, u32 *write_array, u32 nr_of_regs) +{ -+ unsigned long flags; -+ u32 irq_mask; -+ -+ /* Enable the page fault IRQ (and bus fault IRQ as well in case one -+ * occurred) */ -+ spin_lock_irqsave(&kbdev->mmu_mask_change, flags); -+ -+ /* -+ * A reset is in-flight and we're flushing the IRQ + bottom half -+ * so don't update anything as it could race with the reset code. -+ */ -+ if (kbdev->irq_reset_flush) -+ goto unlock; -+ -+ irq_mask = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_MASK), kctx) | -+ MMU_PAGE_FAULT(as->number); ++ u32 i; ++ MALI_DEBUG_PRINT(6, ("register_write_array: for core %s, relative addr=0x%04X, nr of regs=%u\n", ++ core->description, relative_address, nr_of_regs)); + -+ if (type == KBASE_MMU_FAULT_TYPE_BUS || -+ type == KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED) -+ irq_mask |= MMU_BUS_ERROR(as->number); ++ /* Do not use burst writes against the registers */ ++ for (i = 0; i < nr_of_regs; i++) { ++ mali_hw_core_register_write_relaxed(core, relative_address + i * 4, write_array[i]); ++ } ++} + -+ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_MASK), irq_mask, kctx); ++/* Conditionally write a set of registers. ++ * The register will only be written if the new value is different from the old_value. ++ * If the new value is different, the old value will also be updated */ ++MALI_STATIC_INLINE void mali_hw_core_register_write_array_relaxed_conditional(struct mali_hw_core *core, u32 relative_address, u32 *write_array, u32 nr_of_regs, const u32 *old_array) ++{ ++ u32 i; ++ MALI_DEBUG_PRINT(6, ("register_write_array: for core %s, relative addr=0x%04X, nr of regs=%u\n", ++ core->description, relative_address, nr_of_regs)); + -+unlock: -+ spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); ++ /* Do not use burst writes against the registers */ ++ for (i = 0; i < nr_of_regs; i++) { ++ if (old_array[i] != write_array[i]) { ++ mali_hw_core_register_write_relaxed(core, relative_address + i * 4, write_array[i]); ++ } ++ } +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_mmu_hw_direct.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_mmu_hw_direct.h ++ ++#endif /* __MALI_HW_CORE_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h new file mode 100755 -index 000000000000..c02253c6acc3 +index 000000000..6a8f0f011 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_mmu_hw_direct.h -@@ -0,0 +1,42 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h +@@ -0,0 +1,181 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010, 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_KERNEL_COMMON_H__ ++#define __MALI_KERNEL_COMMON_H__ + ++#include "mali_osk.h" + -+/* -+ * Interface file for the direct implementation for MMU hardware access ++/* Make sure debug is defined when it should be */ ++#ifndef DEBUG ++#if defined(_DEBUG) ++#define DEBUG ++#endif ++#endif ++ ++/* The file include several useful macros for error checking, debugging and printing. ++ * - MALI_PRINTF(...) Do not use this function: Will be included in Release builds. ++ * - MALI_DEBUG_PRINT(nr, (X) ) Prints the second argument if nr<=MALI_DEBUG_LEVEL. ++ * - MALI_DEBUG_ERROR( (X) ) Prints an errortext, a source trace, and the given error message. ++ * - MALI_DEBUG_ASSERT(exp,(X)) If the asserted expr is false, the program will exit. ++ * - MALI_DEBUG_ASSERT_POINTER(pointer) Triggers if the pointer is a zero pointer. ++ * - MALI_DEBUG_CODE( X ) The code inside the macro is only compiled in Debug builds. + * -+ * Direct MMU hardware interface ++ * The (X) means that you must add an extra parenthesis around the argumentlist. + * -+ * This module provides the interface(s) that are required by the direct -+ * register access implementation of the MMU hardware interface ++ * The printf function: MALI_PRINTF(...) is routed to _mali_osk_debugmsg ++ * ++ * Suggested range for the DEBUG-LEVEL is [1:6] where ++ * [1:2] Is messages with highest priority, indicate possible errors. ++ * [3:4] Is messages with medium priority, output important variables. ++ * [5:6] Is messages with low priority, used during extensive debugging. + */ + -+#ifndef _MALI_KBASE_MMU_HW_DIRECT_H_ -+#define _MALI_KBASE_MMU_HW_DIRECT_H_ -+ -+#include ++/** ++* Fundamental error macro. Reports an error code. This is abstracted to allow us to ++* easily switch to a different error reporting method if we want, and also to allow ++* us to search for error returns easily. ++* ++* Note no closing semicolon - this is supplied in typical usage: ++* ++* MALI_ERROR(MALI_ERROR_OUT_OF_MEMORY); ++*/ ++#define MALI_ERROR(error_code) return (error_code) + +/** -+ * kbase_mmu_interrupt - Process an MMU interrupt. -+ * -+ * Process the MMU interrupt that was reported by the &kbase_device. ++ * Basic error macro, to indicate success. ++ * Note no closing semicolon - this is supplied in typical usage: + * -+ * @kbdev: kbase context to clear the fault from. -+ * @irq_stat: Value of the MMU_IRQ_STATUS register ++ * MALI_SUCCESS; + */ -+void kbase_mmu_interrupt(struct kbase_device *kbdev, u32 irq_stat); ++#define MALI_SUCCESS MALI_ERROR(_MALI_OSK_ERR_OK) + -+#endif /* _MALI_KBASE_MMU_HW_DIRECT_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_always_on.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_always_on.c -new file mode 100755 -index 000000000000..0614348e935a ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_always_on.c -@@ -0,0 +1,63 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++/** ++ * Basic error macro. This checks whether the given condition is true, and if not returns ++ * from this function with the supplied error code. This is a macro so that we can override it ++ * for stress testing. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * Note that this uses the do-while-0 wrapping to ensure that we don't get problems with dangling ++ * else clauses. Note also no closing semicolon - this is supplied in typical usage: + * ++ * MALI_CHECK((p!=NULL), ERROR_NO_OBJECT); + */ ++#define MALI_CHECK(condition, error_code) do { if(!(condition)) MALI_ERROR(error_code); } while(0) + -+ -+ -+ -+ -+/* -+ * "Always on" power management policy ++/** ++ * Error propagation macro. If the expression given is anything other than ++ * _MALI_OSK_NO_ERROR, then the value is returned from the enclosing function ++ * as an error code. This effectively acts as a guard clause, and propagates ++ * error values up the call stack. This uses a temporary value to ensure that ++ * the error expression is not evaluated twice. ++ * If the counter for forcing a failure has been set using _mali_force_error, ++ * this error will be returned without evaluating the expression in ++ * MALI_CHECK_NO_ERROR + */ ++#define MALI_CHECK_NO_ERROR(expression) \ ++ do { _mali_osk_errcode_t _check_no_error_result=(expression); \ ++ if(_check_no_error_result != _MALI_OSK_ERR_OK) \ ++ MALI_ERROR(_check_no_error_result); \ ++ } while(0) + -+#include -+#include -+ -+static u64 always_on_get_core_mask(struct kbase_device *kbdev) -+{ -+ return kbdev->gpu_props.props.raw_props.shader_present; -+} -+ -+static bool always_on_get_core_active(struct kbase_device *kbdev) -+{ -+ return true; -+} -+ -+static void always_on_init(struct kbase_device *kbdev) -+{ -+ CSTD_UNUSED(kbdev); -+} -+ -+static void always_on_term(struct kbase_device *kbdev) -+{ -+ CSTD_UNUSED(kbdev); -+} ++/** ++ * Pointer check macro. Checks non-null pointer. ++ */ ++#define MALI_CHECK_NON_NULL(pointer, error_code) MALI_CHECK( ((pointer)!=NULL), (error_code) ) + -+/* -+ * The struct kbase_pm_policy structure for the demand power policy. ++/** ++ * Error macro with goto. This checks whether the given condition is true, and if not jumps ++ * to the specified label using a goto. The label must therefore be local to the function in ++ * which this macro appears. This is most usually used to execute some clean-up code before ++ * exiting with a call to ERROR. + * -+ * This is the static structure that defines the demand power policy's callback -+ * and name. ++ * Like the other macros, this is a macro to allow us to override the condition if we wish, ++ * e.g. to force an error during stress testing. + */ -+const struct kbase_pm_policy kbase_pm_always_on_policy_ops = { -+ "always_on", /* name */ -+ always_on_init, /* init */ -+ always_on_term, /* term */ -+ always_on_get_core_mask, /* get_core_mask */ -+ always_on_get_core_active, /* get_core_active */ -+ 0u, /* flags */ -+ KBASE_PM_POLICY_ID_ALWAYS_ON, /* id */ -+}; -+ -+KBASE_EXPORT_TEST_API(kbase_pm_always_on_policy_ops); -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_always_on.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_always_on.h -new file mode 100755 -index 000000000000..f9d244b01bc2 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_always_on.h -@@ -0,0 +1,77 @@ ++#define MALI_CHECK_GOTO(condition, label) do { if(!(condition)) goto label; } while(0) + -+/* -+ * -+ * (C) COPYRIGHT 2011-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++/** ++ * Explicitly ignore a parameter passed into a function, to suppress compiler warnings. ++ * Should only be used with parameter names. + */ ++#define MALI_IGNORE(x) x=x + ++#if defined(CONFIG_MALI_QUIET) ++#define MALI_PRINTF(args) ++#else ++#define MALI_PRINTF(args) _mali_osk_dbgmsg args; ++#endif + ++#define MALI_PRINT_ERROR(args) do{ \ ++ MALI_PRINTF(("Mali: ERR: %s\n" ,__FILE__)); \ ++ MALI_PRINTF((" %s()%4d\n ", __FUNCTION__, __LINE__)) ; \ ++ MALI_PRINTF(args); \ ++ MALI_PRINTF(("\n")); \ ++ } while(0) + ++#define MALI_PRINT(args) do{ \ ++ MALI_PRINTF(("Mali: ")); \ ++ MALI_PRINTF(args); \ ++ } while (0) + ++#ifdef DEBUG ++#ifndef mali_debug_level ++extern int mali_debug_level; ++#endif + -+/* -+ * "Always on" power management policy -+ */ ++#define MALI_DEBUG_CODE(code) code ++#define MALI_DEBUG_PRINT(level, args) do { \ ++ if((level) <= mali_debug_level)\ ++ {MALI_PRINTF(("Mali<" #level ">: ")); MALI_PRINTF(args); } \ ++ } while (0) + -+#ifndef MALI_KBASE_PM_ALWAYS_ON_H -+#define MALI_KBASE_PM_ALWAYS_ON_H ++#define MALI_DEBUG_PRINT_ERROR(args) MALI_PRINT_ERROR(args) + -+/** -+ * DOC: -+ * The "Always on" power management policy has the following -+ * characteristics: -+ * -+ * - When KBase indicates that the GPU will be powered up, but we don't yet -+ * know which Job Chains are to be run: -+ * All Shader Cores are powered up, regardless of whether or not they will -+ * be needed later. -+ * -+ * - When KBase indicates that a set of Shader Cores are needed to submit the -+ * currently queued Job Chains: -+ * All Shader Cores are kept powered, regardless of whether or not they will -+ * be needed -+ * -+ * - When KBase indicates that the GPU need not be powered: -+ * The Shader Cores are kept powered, regardless of whether or not they will -+ * be needed. The GPU itself is also kept powered, even though it is not -+ * needed. -+ * -+ * This policy is automatically overridden during system suspend: the desired -+ * core state is ignored, and the cores are forced off regardless of what the -+ * policy requests. After resuming from suspend, new changes to the desired -+ * core state made by the policy are honored. -+ * -+ * Note: -+ * -+ * - KBase indicates the GPU will be powered up when it has a User Process that -+ * has just started to submit Job Chains. -+ * -+ * - KBase indicates the GPU need not be powered when all the Job Chains from -+ * User Processes have finished, and it is waiting for a User Process to -+ * submit some more Job Chains. -+ */ ++#define MALI_DEBUG_PRINT_IF(level,condition,args) \ ++ if((condition)&&((level) <= mali_debug_level))\ ++ {MALI_PRINTF(("Mali<" #level ">: ")); MALI_PRINTF(args); } ++ ++#define MALI_DEBUG_PRINT_ELSE(level, args)\ ++ else if((level) <= mali_debug_level)\ ++ { MALI_PRINTF(("Mali<" #level ">: ")); MALI_PRINTF(args); } + +/** -+ * struct kbasep_pm_policy_always_on - Private struct for policy instance data -+ * @dummy: unused dummy variable -+ * -+ * This contains data that is private to the particular power policy that is -+ * active. ++ * @note these variants of DEBUG ASSERTS will cause a debugger breakpoint ++ * to be entered (see _mali_osk_break() ). An alternative would be to call ++ * _mali_osk_abort(), on OSs that support it. + */ -+struct kbasep_pm_policy_always_on { -+ int dummy; -+}; ++#define MALI_DEBUG_PRINT_ASSERT(condition, args) do {if( !(condition)) { MALI_PRINT_ERROR(args); _mali_osk_break(); } } while(0) ++#define MALI_DEBUG_ASSERT_POINTER(pointer) do {if( (pointer)== NULL) {MALI_PRINT_ERROR(("NULL pointer " #pointer)); _mali_osk_break();} } while(0) ++#define MALI_DEBUG_ASSERT(condition) do {if( !(condition)) {MALI_PRINT_ERROR(("ASSERT failed: " #condition )); _mali_osk_break();} } while(0) + -+extern const struct kbase_pm_policy kbase_pm_always_on_policy_ops; ++#else /* DEBUG */ + -+#endif /* MALI_KBASE_PM_ALWAYS_ON_H */ ++#define MALI_DEBUG_CODE(code) ++#define MALI_DEBUG_PRINT(string,args) do {} while(0) ++#define MALI_DEBUG_PRINT_ERROR(args) do {} while(0) ++#define MALI_DEBUG_PRINT_IF(level,condition,args) do {} while(0) ++#define MALI_DEBUG_PRINT_ELSE(level,condition,args) do {} while(0) ++#define MALI_DEBUG_PRINT_ASSERT(condition,args) do {} while(0) ++#define MALI_DEBUG_ASSERT_POINTER(pointer) do {} while(0) ++#define MALI_DEBUG_ASSERT(condition) do {} while(0) ++ ++#endif /* DEBUG */ ++ ++/** ++ * variables from user space cannot be dereferenced from kernel space; tagging them ++ * with __user allows the GCC compiler to generate a warning. Other compilers may ++ * not support this so we define it here as an empty macro if the compiler doesn't ++ * define it. ++ */ ++#ifndef __user ++#define __user ++#endif + -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_backend.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_backend.c ++#endif /* __MALI_KERNEL_COMMON_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c new file mode 100755 -index 000000000000..cd8932650ed5 +index 000000000..87f97b710 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_backend.c -@@ -0,0 +1,478 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c +@@ -0,0 +1,1349 @@ +/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include "mali_kernel_common.h" ++#include "mali_session.h" ++#include "mali_osk.h" ++#include "mali_osk_mali.h" ++#include "mali_ukk.h" ++#include "mali_kernel_core.h" ++#include "mali_memory.h" ++#include "mali_mem_validation.h" ++#include "mali_mmu.h" ++#include "mali_mmu_page_directory.h" ++#include "mali_dlbu.h" ++#include "mali_broadcast.h" ++#include "mali_gp.h" ++#include "mali_pp.h" ++#include "mali_executor.h" ++#include "mali_pp_job.h" ++#include "mali_group.h" ++#include "mali_pm.h" ++#include "mali_pmu.h" ++#include "mali_scheduler.h" ++#include "mali_kernel_utilization.h" ++#include "mali_l2_cache.h" ++#include "mali_timeline.h" ++#include "mali_soft_job.h" ++#include "mali_pm_domain.h" ++#if defined(CONFIG_MALI400_PROFILING) ++#include "mali_osk_profiling.h" ++#endif ++#if defined(CONFIG_MALI400_INTERNAL_PROFILING) ++#include "mali_profiling_internal.h" ++#endif ++#include "mali_control_timer.h" ++#include "mali_dvfs_policy.h" ++#include ++#include ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++#include ++#else ++#include ++#endif ++#endif + ++#define MALI_SHARED_MEMORY_DEFAULT_SIZE 0xffffffff + ++/* Mali GPU memory. Real values come from module parameter or from device specific data */ ++unsigned int mali_dedicated_mem_start = 0; ++unsigned int mali_dedicated_mem_size = 0; + -+/* -+ * GPU backend implementation of base kernel power management APIs -+ */ ++/* Default shared memory size is set to 4G. */ ++unsigned int mali_shared_mem_size = MALI_SHARED_MEMORY_DEFAULT_SIZE; + -+#include -+#include -+#include ++/* Frame buffer memory to be accessible by Mali GPU */ ++int mali_fb_start = 0; ++int mali_fb_size = 0; + -+#include -+#include -+#include -+#include -+#include ++/* Mali max job runtime */ ++extern int mali_max_job_runtime; + -+static void kbase_pm_gpu_poweroff_wait_wq(struct work_struct *data); ++/** Start profiling from module load? */ ++int mali_boot_profiling = 0; + -+void kbase_pm_register_access_enable(struct kbase_device *kbdev) -+{ -+ struct kbase_pm_callback_conf *callbacks; ++/** Limits for the number of PP cores behind each L2 cache. */ ++int mali_max_pp_cores_group_1 = 0xFF; ++int mali_max_pp_cores_group_2 = 0xFF; + -+ callbacks = (struct kbase_pm_callback_conf *)POWER_MANAGEMENT_CALLBACKS; ++int mali_inited_pp_cores_group_1 = 0; ++int mali_inited_pp_cores_group_2 = 0; + -+ if (callbacks) -+ callbacks->power_on_callback(kbdev); ++static _mali_product_id_t global_product_id = _MALI_PRODUCT_ID_UNKNOWN; ++static uintptr_t global_gpu_base_address = 0; ++static u32 global_gpu_major_version = 0; ++static u32 global_gpu_minor_version = 0; + -+ kbdev->pm.backend.gpu_powered = true; -+} ++mali_bool mali_gpu_class_is_mali450 = MALI_FALSE; ++mali_bool mali_gpu_class_is_mali470 = MALI_FALSE; + -+void kbase_pm_register_access_disable(struct kbase_device *kbdev) ++static _mali_osk_errcode_t mali_set_global_gpu_base_address(void) +{ -+ struct kbase_pm_callback_conf *callbacks; ++ _mali_osk_errcode_t err = _MALI_OSK_ERR_OK; + -+ callbacks = (struct kbase_pm_callback_conf *)POWER_MANAGEMENT_CALLBACKS; ++ global_gpu_base_address = _mali_osk_resource_base_address(); ++ if (0 == global_gpu_base_address) { ++ err = _MALI_OSK_ERR_ITEM_NOT_FOUND; ++ } + -+ if (callbacks) -+ callbacks->power_off_callback(kbdev); ++ return err; ++} + -+ kbdev->pm.backend.gpu_powered = false; ++static u32 mali_get_bcast_id(_mali_osk_resource_t *resource_pp) ++{ ++ switch (resource_pp->base - global_gpu_base_address) { ++ case 0x08000: ++ case 0x20000: /* fall-through for aliased mapping */ ++ return 0x01; ++ case 0x0A000: ++ case 0x22000: /* fall-through for aliased mapping */ ++ return 0x02; ++ case 0x0C000: ++ case 0x24000: /* fall-through for aliased mapping */ ++ return 0x04; ++ case 0x0E000: ++ case 0x26000: /* fall-through for aliased mapping */ ++ return 0x08; ++ case 0x28000: ++ return 0x10; ++ case 0x2A000: ++ return 0x20; ++ case 0x2C000: ++ return 0x40; ++ case 0x2E000: ++ return 0x80; ++ default: ++ return 0; ++ } +} + -+int kbase_hwaccess_pm_init(struct kbase_device *kbdev) ++static _mali_osk_errcode_t mali_parse_product_info(void) +{ -+ int ret = 0; -+ struct kbase_pm_callback_conf *callbacks; ++ _mali_osk_resource_t first_pp_resource; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ /* Find the first PP core resource (again) */ ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI_OFFSET_PP0, &first_pp_resource)) { ++ /* Create a dummy PP object for this core so that we can read the version register */ ++ struct mali_group *group = mali_group_create(NULL, NULL, NULL, MALI_DOMAIN_INDEX_PP0); ++ if (NULL != group) { ++ struct mali_pp_core *pp_core = mali_pp_create(&first_pp_resource, group, MALI_FALSE, mali_get_bcast_id(&first_pp_resource)); ++ if (NULL != pp_core) { ++ u32 pp_version; + -+ mutex_init(&kbdev->pm.lock); ++ pp_version = mali_pp_core_get_version(pp_core); + -+ kbdev->pm.backend.gpu_poweroff_wait_wq = alloc_workqueue("kbase_pm_poweroff_wait", -+ WQ_HIGHPRI | WQ_UNBOUND, 1); -+ if (!kbdev->pm.backend.gpu_poweroff_wait_wq) -+ return -ENOMEM; ++ mali_group_delete(group); + -+ INIT_WORK(&kbdev->pm.backend.gpu_poweroff_wait_work, -+ kbase_pm_gpu_poweroff_wait_wq); ++ global_gpu_major_version = (pp_version >> 8) & 0xFF; ++ global_gpu_minor_version = pp_version & 0xFF; + -+ kbdev->pm.backend.gpu_powered = false; -+ kbdev->pm.suspending = false; -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ kbdev->pm.backend.driver_ready_for_irqs = false; -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+ kbdev->pm.backend.gpu_in_desired_state = true; -+ init_waitqueue_head(&kbdev->pm.backend.gpu_in_desired_state_wait); ++ switch (pp_version >> 16) { ++ case MALI200_PP_PRODUCT_ID: ++ global_product_id = _MALI_PRODUCT_ID_MALI200; ++ MALI_DEBUG_PRINT(2, ("Found Mali GPU Mali-200 r%up%u\n", global_gpu_major_version, global_gpu_minor_version)); ++ MALI_PRINT_ERROR(("Mali-200 is not supported by this driver.\n")); ++ _mali_osk_abort(); ++ break; ++ case MALI300_PP_PRODUCT_ID: ++ global_product_id = _MALI_PRODUCT_ID_MALI300; ++ MALI_DEBUG_PRINT(2, ("Found Mali GPU Mali-300 r%up%u\n", global_gpu_major_version, global_gpu_minor_version)); ++ break; ++ case MALI400_PP_PRODUCT_ID: ++ global_product_id = _MALI_PRODUCT_ID_MALI400; ++ MALI_DEBUG_PRINT(2, ("Found Mali GPU Mali-400 MP r%up%u\n", global_gpu_major_version, global_gpu_minor_version)); ++ break; ++ case MALI450_PP_PRODUCT_ID: ++ global_product_id = _MALI_PRODUCT_ID_MALI450; ++ MALI_DEBUG_PRINT(2, ("Found Mali GPU Mali-450 MP r%up%u\n", global_gpu_major_version, global_gpu_minor_version)); ++ break; ++ case MALI470_PP_PRODUCT_ID: ++ global_product_id = _MALI_PRODUCT_ID_MALI470; ++ MALI_DEBUG_PRINT(2, ("Found Mali GPU Mali-470 MP r%up%u\n", global_gpu_major_version, global_gpu_minor_version)); ++ break; ++ default: ++ MALI_DEBUG_PRINT(2, ("Found unknown Mali GPU (r%up%u)\n", global_gpu_major_version, global_gpu_minor_version)); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ callbacks = (struct kbase_pm_callback_conf *)POWER_MANAGEMENT_CALLBACKS; -+ if (callbacks) { -+ kbdev->pm.backend.callback_power_on = -+ callbacks->power_on_callback; -+ kbdev->pm.backend.callback_power_off = -+ callbacks->power_off_callback; -+ kbdev->pm.backend.callback_power_suspend = -+ callbacks->power_suspend_callback; -+ kbdev->pm.backend.callback_power_resume = -+ callbacks->power_resume_callback; -+ kbdev->pm.callback_power_runtime_init = -+ callbacks->power_runtime_init_callback; -+ kbdev->pm.callback_power_runtime_term = -+ callbacks->power_runtime_term_callback; -+ kbdev->pm.backend.callback_power_runtime_on = -+ callbacks->power_runtime_on_callback; -+ kbdev->pm.backend.callback_power_runtime_off = -+ callbacks->power_runtime_off_callback; -+ kbdev->pm.backend.callback_power_runtime_idle = -+ callbacks->power_runtime_idle_callback; ++ return _MALI_OSK_ERR_OK; ++ } else { ++ MALI_PRINT_ERROR(("Failed to create initial PP object\n")); ++ } ++ } else { ++ MALI_PRINT_ERROR(("Failed to create initial group object\n")); ++ } + } else { -+ kbdev->pm.backend.callback_power_on = NULL; -+ kbdev->pm.backend.callback_power_off = NULL; -+ kbdev->pm.backend.callback_power_suspend = NULL; -+ kbdev->pm.backend.callback_power_resume = NULL; -+ kbdev->pm.callback_power_runtime_init = NULL; -+ kbdev->pm.callback_power_runtime_term = NULL; -+ kbdev->pm.backend.callback_power_runtime_on = NULL; -+ kbdev->pm.backend.callback_power_runtime_off = NULL; -+ kbdev->pm.backend.callback_power_runtime_idle = NULL; ++ MALI_PRINT_ERROR(("First PP core not specified in config file\n")); + } + -+ /* Initialise the metrics subsystem */ -+ ret = kbasep_pm_metrics_init(kbdev); -+ if (ret) -+ return ret; ++ return _MALI_OSK_ERR_FAULT; ++} + -+ init_waitqueue_head(&kbdev->pm.backend.l2_powered_wait); -+ kbdev->pm.backend.l2_powered = 0; ++static void mali_delete_groups(void) ++{ ++ struct mali_group *group; + -+ init_waitqueue_head(&kbdev->pm.backend.reset_done_wait); -+ kbdev->pm.backend.reset_done = false; ++ group = mali_group_get_glob_group(0); ++ while (NULL != group) { ++ mali_group_delete(group); ++ group = mali_group_get_glob_group(0); ++ } + -+ init_waitqueue_head(&kbdev->pm.zero_active_count_wait); -+ kbdev->pm.active_count = 0; ++ MALI_DEBUG_ASSERT(0 == mali_group_get_glob_num_groups()); ++} + -+ spin_lock_init(&kbdev->pm.backend.gpu_cycle_counter_requests_lock); -+ spin_lock_init(&kbdev->pm.backend.gpu_powered_lock); ++static void mali_delete_l2_cache_cores(void) ++{ ++ struct mali_l2_cache_core *l2; + -+ init_waitqueue_head(&kbdev->pm.backend.poweroff_wait); ++ l2 = mali_l2_cache_core_get_glob_l2_core(0); ++ while (NULL != l2) { ++ mali_l2_cache_delete(l2); ++ l2 = mali_l2_cache_core_get_glob_l2_core(0); ++ } + -+ if (kbase_pm_ca_init(kbdev) != 0) -+ goto workq_fail; ++ MALI_DEBUG_ASSERT(0 == mali_l2_cache_core_get_glob_num_l2_cores()); ++} + -+ if (kbase_pm_policy_init(kbdev) != 0) -+ goto pm_policy_fail; ++static struct mali_l2_cache_core *mali_create_l2_cache_core(_mali_osk_resource_t *resource, u32 domain_index) ++{ ++ struct mali_l2_cache_core *l2_cache = NULL; + -+ return 0; ++ if (NULL != resource) { + -+pm_policy_fail: -+ kbase_pm_ca_term(kbdev); -+workq_fail: -+ kbasep_pm_metrics_term(kbdev); -+ return -EINVAL; ++ MALI_DEBUG_PRINT(3, ("Found L2 cache %s\n", resource->description)); ++ ++ l2_cache = mali_l2_cache_create(resource, domain_index); ++ if (NULL == l2_cache) { ++ MALI_PRINT_ERROR(("Failed to create L2 cache object\n")); ++ return NULL; ++ } ++ } ++ MALI_DEBUG_PRINT(3, ("Created L2 cache core object\n")); ++ ++ return l2_cache; +} + -+void kbase_pm_do_poweron(struct kbase_device *kbdev, bool is_resume) ++static _mali_osk_errcode_t mali_parse_config_l2_cache(void) +{ -+ lockdep_assert_held(&kbdev->pm.lock); ++ struct mali_l2_cache_core *l2_cache = NULL; + -+ /* Turn clocks and interrupts on - no-op if we haven't done a previous -+ * kbase_pm_clock_off() */ -+ kbase_pm_clock_on(kbdev, is_resume); ++ if (mali_is_mali400()) { ++ _mali_osk_resource_t l2_resource; ++ if (_MALI_OSK_ERR_OK != _mali_osk_resource_find(MALI400_OFFSET_L2_CACHE0, &l2_resource)) { ++ MALI_DEBUG_PRINT(3, ("Did not find required Mali L2 cache in config file\n")); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ /* Update core status as required by the policy */ -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, -+ SW_FLOW_PM_CHECKTRANS_PM_DO_POWERON_START); -+ kbase_pm_update_cores_state(kbdev); -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, -+ SW_FLOW_PM_CHECKTRANS_PM_DO_POWERON_END); ++ l2_cache = mali_create_l2_cache_core(&l2_resource, MALI_DOMAIN_INDEX_L20); ++ if (NULL == l2_cache) { ++ return _MALI_OSK_ERR_FAULT; ++ } ++ } else if (mali_is_mali450()) { ++ /* ++ * L2 for GP at 0x10000 ++ * L2 for PP0-3 at 0x01000 ++ * L2 for PP4-7 at 0x11000 (optional) ++ */ + -+ /* NOTE: We don't wait to reach the desired state, since running atoms -+ * will wait for that state to be reached anyway */ -+} ++ _mali_osk_resource_t l2_gp_resource; ++ _mali_osk_resource_t l2_pp_grp0_resource; ++ _mali_osk_resource_t l2_pp_grp1_resource; + -+static void kbase_pm_gpu_poweroff_wait_wq(struct work_struct *data) -+{ -+ struct kbase_device *kbdev = container_of(data, struct kbase_device, -+ pm.backend.gpu_poweroff_wait_work); -+ struct kbase_pm_device_data *pm = &kbdev->pm; -+ struct kbase_pm_backend_data *backend = &pm->backend; -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ unsigned long flags; ++ /* Make cluster for GP's L2 */ ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI450_OFFSET_L2_CACHE0, &l2_gp_resource)) { ++ MALI_DEBUG_PRINT(3, ("Creating Mali-450 L2 cache core for GP\n")); ++ l2_cache = mali_create_l2_cache_core(&l2_gp_resource, MALI_DOMAIN_INDEX_L20); ++ if (NULL == l2_cache) { ++ return _MALI_OSK_ERR_FAULT; ++ } ++ } else { ++ MALI_DEBUG_PRINT(3, ("Did not find required Mali L2 cache for GP in config file\n")); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+#if !PLATFORM_POWER_DOWN_ONLY -+ /* Wait for power transitions to complete. We do this with no locks held -+ * so that we don't deadlock with any pending workqueues */ -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, -+ SW_FLOW_PM_CHECKTRANS_PM_DO_POWEROFF_START); -+ kbase_pm_check_transitions_sync(kbdev); -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, -+ SW_FLOW_PM_CHECKTRANS_PM_DO_POWEROFF_END); -+#endif /* !PLATFORM_POWER_DOWN_ONLY */ ++ /* Find corresponding l2 domain */ ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI450_OFFSET_L2_CACHE1, &l2_pp_grp0_resource)) { ++ MALI_DEBUG_PRINT(3, ("Creating Mali-450 L2 cache core for PP group 0\n")); ++ l2_cache = mali_create_l2_cache_core(&l2_pp_grp0_resource, MALI_DOMAIN_INDEX_L21); ++ if (NULL == l2_cache) { ++ return _MALI_OSK_ERR_FAULT; ++ } ++ } else { ++ MALI_DEBUG_PRINT(3, ("Did not find required Mali L2 cache for PP group 0 in config file\n")); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); ++ /* Second PP core group is optional, don't fail if we don't find it */ ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI450_OFFSET_L2_CACHE2, &l2_pp_grp1_resource)) { ++ MALI_DEBUG_PRINT(3, ("Creating Mali-450 L2 cache core for PP group 1\n")); ++ l2_cache = mali_create_l2_cache_core(&l2_pp_grp1_resource, MALI_DOMAIN_INDEX_L22); ++ if (NULL == l2_cache) { ++ return _MALI_OSK_ERR_FAULT; ++ } ++ } ++ } else if (mali_is_mali470()) { ++ _mali_osk_resource_t l2c1_resource; + -+#if PLATFORM_POWER_DOWN_ONLY -+ if (kbdev->pm.backend.gpu_powered) { -+ if (kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_L2)) { -+ /* If L2 cache is powered then we must flush it before -+ * we power off the GPU. Normally this would have been -+ * handled when the L2 was powered off. */ -+ kbase_gpu_cacheclean(kbdev); ++ /* Make cluster for L2C1 */ ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI470_OFFSET_L2_CACHE1, &l2c1_resource)) { ++ MALI_DEBUG_PRINT(3, ("Creating Mali-470 L2 cache 1\n")); ++ l2_cache = mali_create_l2_cache_core(&l2c1_resource, MALI_DOMAIN_INDEX_L21); ++ if (NULL == l2_cache) { ++ return _MALI_OSK_ERR_FAULT; ++ } ++ } else { ++ MALI_DEBUG_PRINT(3, ("Did not find required Mali L2 cache for L2C1\n")); ++ return _MALI_OSK_ERR_FAULT; + } + } -+#endif /* PLATFORM_POWER_DOWN_ONLY */ + -+ if (!backend->poweron_required) { -+#if !PLATFORM_POWER_DOWN_ONLY -+ unsigned long flags; ++ return _MALI_OSK_ERR_OK; ++} + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ WARN_ON(kbdev->l2_available_bitmap || -+ kbdev->shader_available_bitmap || -+ kbdev->tiler_available_bitmap); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+#endif /* !PLATFORM_POWER_DOWN_ONLY */ ++static struct mali_group *mali_create_group(struct mali_l2_cache_core *cache, ++ _mali_osk_resource_t *resource_mmu, ++ _mali_osk_resource_t *resource_gp, ++ _mali_osk_resource_t *resource_pp, ++ u32 domain_index) ++{ ++ struct mali_mmu_core *mmu; ++ struct mali_group *group; + -+ /* Consume any change-state events */ -+ kbase_timeline_pm_check_handle_event(kbdev, -+ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED); ++ MALI_DEBUG_PRINT(3, ("Starting new group for MMU %s\n", resource_mmu->description)); + -+ /* Disable interrupts and turn the clock off */ -+ if (!kbase_pm_clock_off(kbdev, backend->poweroff_is_suspend)) { -+ /* -+ * Page/bus faults are pending, must drop locks to -+ * process. Interrupts are disabled so no more faults -+ * should be generated at this point. -+ */ -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ kbase_flush_mmu_wqs(kbdev); -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); ++ /* Create the group object */ ++ group = mali_group_create(cache, NULL, NULL, domain_index); ++ if (NULL == group) { ++ MALI_PRINT_ERROR(("Failed to create group object for MMU %s\n", resource_mmu->description)); ++ return NULL; ++ } + -+ /* Turn off clock now that fault have been handled. We -+ * dropped locks so poweron_required may have changed - -+ * power back on if this is the case.*/ -+ if (backend->poweron_required) -+ kbase_pm_clock_on(kbdev, false); -+ else -+ WARN_ON(!kbase_pm_clock_off(kbdev, -+ backend->poweroff_is_suspend)); -+ } ++ /* Create the MMU object inside group */ ++ mmu = mali_mmu_create(resource_mmu, group, MALI_FALSE); ++ if (NULL == mmu) { ++ MALI_PRINT_ERROR(("Failed to create MMU object\n")); ++ mali_group_delete(group); ++ return NULL; + } + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ backend->poweroff_wait_in_progress = false; -+ if (backend->poweron_required) { -+ backend->poweron_required = false; -+ kbase_pm_update_cores_state_nolock(kbdev); -+ kbase_backend_slot_update(kbdev); ++ if (NULL != resource_gp) { ++ /* Create the GP core object inside this group */ ++ struct mali_gp_core *gp_core = mali_gp_create(resource_gp, group); ++ if (NULL == gp_core) { ++ /* No need to clean up now, as we will clean up everything linked in from the cluster when we fail this function */ ++ MALI_PRINT_ERROR(("Failed to create GP object\n")); ++ mali_group_delete(group); ++ return NULL; ++ } + } -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); ++ if (NULL != resource_pp) { ++ struct mali_pp_core *pp_core; + -+ wake_up(&kbdev->pm.backend.poweroff_wait); ++ /* Create the PP core object inside this group */ ++ pp_core = mali_pp_create(resource_pp, group, MALI_FALSE, mali_get_bcast_id(resource_pp)); ++ if (NULL == pp_core) { ++ /* No need to clean up now, as we will clean up everything linked in from the cluster when we fail this function */ ++ MALI_PRINT_ERROR(("Failed to create PP object\n")); ++ mali_group_delete(group); ++ return NULL; ++ } ++ } ++ ++ return group; +} + -+void kbase_pm_do_poweroff(struct kbase_device *kbdev, bool is_suspend) ++static _mali_osk_errcode_t mali_create_virtual_group(_mali_osk_resource_t *resource_mmu_pp_bcast, ++ _mali_osk_resource_t *resource_pp_bcast, ++ _mali_osk_resource_t *resource_dlbu, ++ _mali_osk_resource_t *resource_bcast) +{ -+ unsigned long flags; ++ struct mali_mmu_core *mmu_pp_bcast_core; ++ struct mali_pp_core *pp_bcast_core; ++ struct mali_dlbu_core *dlbu_core; ++ struct mali_bcast_unit *bcast_core; ++ struct mali_group *group; + -+ lockdep_assert_held(&kbdev->pm.lock); ++ MALI_DEBUG_PRINT(2, ("Starting new virtual group for MMU PP broadcast core %s\n", resource_mmu_pp_bcast->description)); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ if (!kbdev->pm.backend.poweroff_wait_in_progress) { -+ /* Force all cores off */ -+ kbdev->pm.backend.desired_shader_state = 0; -+ kbdev->pm.backend.desired_tiler_state = 0; ++ /* Create the DLBU core object */ ++ dlbu_core = mali_dlbu_create(resource_dlbu); ++ if (NULL == dlbu_core) { ++ MALI_PRINT_ERROR(("Failed to create DLBU object \n")); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ /* Force all cores to be unavailable, in the situation where -+ * transitions are in progress for some cores but not others, -+ * and kbase_pm_check_transitions_nolock can not immediately -+ * power off the cores */ -+ kbdev->shader_available_bitmap = 0; -+ kbdev->tiler_available_bitmap = 0; -+ kbdev->l2_available_bitmap = 0; ++ /* Create the Broadcast unit core */ ++ bcast_core = mali_bcast_unit_create(resource_bcast); ++ if (NULL == bcast_core) { ++ MALI_PRINT_ERROR(("Failed to create Broadcast unit object!\n")); ++ mali_dlbu_delete(dlbu_core); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ kbdev->pm.backend.poweroff_wait_in_progress = true; -+ kbdev->pm.backend.poweroff_is_suspend = is_suspend; ++ /* Create the group object */ ++#if defined(DEBUG) ++ /* Get a physical PP group to temporarily add to broadcast unit. IRQ ++ * verification needs a physical group in the broadcast unit to test ++ * the broadcast unit interrupt line. */ ++ { ++ struct mali_group *phys_group = NULL; ++ int i; ++ for (i = 0; i < mali_group_get_glob_num_groups(); i++) { ++ phys_group = mali_group_get_glob_group(i); ++ if (NULL != mali_group_get_pp_core(phys_group)) break; ++ } ++ MALI_DEBUG_ASSERT(NULL != mali_group_get_pp_core(phys_group)); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ /*Kick off wq here. Callers will have to wait*/ -+ queue_work(kbdev->pm.backend.gpu_poweroff_wait_wq, -+ &kbdev->pm.backend.gpu_poweroff_wait_work); -+ } else { -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ /* Add the group temporarily to the broadcast, and update the ++ * broadcast HW. Since the HW is not updated when removing the ++ * group the IRQ check will work when the virtual PP is created ++ * later. ++ * ++ * When the virtual group gets populated, the actually used ++ * groups will be added to the broadcast unit and the HW will ++ * be updated. ++ */ ++ mali_bcast_add_group(bcast_core, phys_group); ++ mali_bcast_reset(bcast_core); ++ mali_bcast_remove_group(bcast_core, phys_group); ++ } ++#endif /* DEBUG */ ++ group = mali_group_create(NULL, dlbu_core, bcast_core, MALI_DOMAIN_INDEX_DUMMY); ++ if (NULL == group) { ++ MALI_PRINT_ERROR(("Failed to create group object for MMU PP broadcast core %s\n", resource_mmu_pp_bcast->description)); ++ mali_bcast_unit_delete(bcast_core); ++ mali_dlbu_delete(dlbu_core); ++ return _MALI_OSK_ERR_FAULT; + } -+} + -+static bool is_poweroff_in_progress(struct kbase_device *kbdev) -+{ -+ bool ret; -+ unsigned long flags; ++ /* Create the MMU object inside group */ ++ mmu_pp_bcast_core = mali_mmu_create(resource_mmu_pp_bcast, group, MALI_TRUE); ++ if (NULL == mmu_pp_bcast_core) { ++ MALI_PRINT_ERROR(("Failed to create MMU PP broadcast object\n")); ++ mali_group_delete(group); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ ret = (kbdev->pm.backend.poweroff_wait_in_progress == false); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ /* Create the PP core object inside this group */ ++ pp_bcast_core = mali_pp_create(resource_pp_bcast, group, MALI_TRUE, 0); ++ if (NULL == pp_bcast_core) { ++ /* No need to clean up now, as we will clean up everything linked in from the cluster when we fail this function */ ++ MALI_PRINT_ERROR(("Failed to create PP object\n")); ++ mali_group_delete(group); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ return ret; ++ return _MALI_OSK_ERR_OK; +} + -+void kbase_pm_wait_for_poweroff_complete(struct kbase_device *kbdev) ++static _mali_osk_errcode_t mali_parse_config_groups(void) +{ -+ wait_event_killable(kbdev->pm.backend.poweroff_wait, -+ is_poweroff_in_progress(kbdev)); -+} ++ struct mali_group *group; ++ int cluster_id_gp = 0; ++ int cluster_id_pp_grp0 = 0; ++ int cluster_id_pp_grp1 = 0; ++ int i; + -+int kbase_hwaccess_pm_powerup(struct kbase_device *kbdev, -+ unsigned int flags) -+{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ unsigned long irq_flags; -+ int ret; ++ _mali_osk_resource_t resource_gp; ++ _mali_osk_resource_t resource_gp_mmu; ++ _mali_osk_resource_t resource_pp[8]; ++ _mali_osk_resource_t resource_pp_mmu[8]; ++ _mali_osk_resource_t resource_pp_mmu_bcast; ++ _mali_osk_resource_t resource_pp_bcast; ++ _mali_osk_resource_t resource_dlbu; ++ _mali_osk_resource_t resource_bcast; ++ _mali_osk_errcode_t resource_gp_found; ++ _mali_osk_errcode_t resource_gp_mmu_found; ++ _mali_osk_errcode_t resource_pp_found[8]; ++ _mali_osk_errcode_t resource_pp_mmu_found[8]; ++ _mali_osk_errcode_t resource_pp_mmu_bcast_found; ++ _mali_osk_errcode_t resource_pp_bcast_found; ++ _mali_osk_errcode_t resource_dlbu_found; ++ _mali_osk_errcode_t resource_bcast_found; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ if (!(mali_is_mali400() || mali_is_mali450() || mali_is_mali470())) { ++ /* No known HW core */ ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); ++ if (MALI_MAX_JOB_RUNTIME_DEFAULT == mali_max_job_runtime) { ++ /* Group settings are not overridden by module parameters, so use device settings */ ++ _mali_osk_device_data data = { 0, }; + -+ /* A suspend won't happen during startup/insmod */ -+ KBASE_DEBUG_ASSERT(!kbase_pm_is_suspending(kbdev)); ++ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { ++ /* Use device specific settings (if defined) */ ++ if (0 != data.max_job_runtime) { ++ mali_max_job_runtime = data.max_job_runtime; ++ } ++ } ++ } + -+ /* Power up the GPU, don't enable IRQs as we are not ready to receive -+ * them. */ -+ ret = kbase_pm_init_hw(kbdev, flags); -+ if (ret) { -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ return ret; ++ if (mali_is_mali450()) { ++ /* Mali-450 have separate L2s for GP, and PP core group(s) */ ++ cluster_id_pp_grp0 = 1; ++ cluster_id_pp_grp1 = 2; + } + -+ kbasep_pm_init_core_use_bitmaps(kbdev); ++ resource_gp_found = _mali_osk_resource_find(MALI_OFFSET_GP, &resource_gp); ++ resource_gp_mmu_found = _mali_osk_resource_find(MALI_OFFSET_GP_MMU, &resource_gp_mmu); ++ resource_pp_found[0] = _mali_osk_resource_find(MALI_OFFSET_PP0, &(resource_pp[0])); ++ resource_pp_found[1] = _mali_osk_resource_find(MALI_OFFSET_PP1, &(resource_pp[1])); ++ resource_pp_found[2] = _mali_osk_resource_find(MALI_OFFSET_PP2, &(resource_pp[2])); ++ resource_pp_found[3] = _mali_osk_resource_find(MALI_OFFSET_PP3, &(resource_pp[3])); ++ resource_pp_found[4] = _mali_osk_resource_find(MALI_OFFSET_PP4, &(resource_pp[4])); ++ resource_pp_found[5] = _mali_osk_resource_find(MALI_OFFSET_PP5, &(resource_pp[5])); ++ resource_pp_found[6] = _mali_osk_resource_find(MALI_OFFSET_PP6, &(resource_pp[6])); ++ resource_pp_found[7] = _mali_osk_resource_find(MALI_OFFSET_PP7, &(resource_pp[7])); ++ resource_pp_mmu_found[0] = _mali_osk_resource_find(MALI_OFFSET_PP0_MMU, &(resource_pp_mmu[0])); ++ resource_pp_mmu_found[1] = _mali_osk_resource_find(MALI_OFFSET_PP1_MMU, &(resource_pp_mmu[1])); ++ resource_pp_mmu_found[2] = _mali_osk_resource_find(MALI_OFFSET_PP2_MMU, &(resource_pp_mmu[2])); ++ resource_pp_mmu_found[3] = _mali_osk_resource_find(MALI_OFFSET_PP3_MMU, &(resource_pp_mmu[3])); ++ resource_pp_mmu_found[4] = _mali_osk_resource_find(MALI_OFFSET_PP4_MMU, &(resource_pp_mmu[4])); ++ resource_pp_mmu_found[5] = _mali_osk_resource_find(MALI_OFFSET_PP5_MMU, &(resource_pp_mmu[5])); ++ resource_pp_mmu_found[6] = _mali_osk_resource_find(MALI_OFFSET_PP6_MMU, &(resource_pp_mmu[6])); ++ resource_pp_mmu_found[7] = _mali_osk_resource_find(MALI_OFFSET_PP7_MMU, &(resource_pp_mmu[7])); + -+ kbdev->pm.debug_core_mask_all = kbdev->pm.debug_core_mask[0] = -+ kbdev->pm.debug_core_mask[1] = -+ kbdev->pm.debug_core_mask[2] = -+ kbdev->gpu_props.props.raw_props.shader_present; + -+ /* Pretend the GPU is active to prevent a power policy turning the GPU -+ * cores off */ -+ kbdev->pm.active_count = 1; ++ if (mali_is_mali450() || mali_is_mali470()) { ++ resource_bcast_found = _mali_osk_resource_find(MALI_OFFSET_BCAST, &resource_bcast); ++ resource_dlbu_found = _mali_osk_resource_find(MALI_OFFSET_DLBU, &resource_dlbu); ++ resource_pp_mmu_bcast_found = _mali_osk_resource_find(MALI_OFFSET_PP_BCAST_MMU, &resource_pp_mmu_bcast); ++ resource_pp_bcast_found = _mali_osk_resource_find(MALI_OFFSET_PP_BCAST, &resource_pp_bcast); + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_cycle_counter_requests_lock, -+ irq_flags); -+ /* Ensure cycle counter is off */ -+ kbdev->pm.backend.gpu_cycle_counter_requests = 0; -+ spin_unlock_irqrestore( -+ &kbdev->pm.backend.gpu_cycle_counter_requests_lock, -+ irq_flags); ++ if (_MALI_OSK_ERR_OK != resource_bcast_found || ++ _MALI_OSK_ERR_OK != resource_dlbu_found || ++ _MALI_OSK_ERR_OK != resource_pp_mmu_bcast_found || ++ _MALI_OSK_ERR_OK != resource_pp_bcast_found) { ++ /* Missing mandatory core(s) for Mali-450 or Mali-470 */ ++ MALI_DEBUG_PRINT(2, ("Missing mandatory resources, Mali-450 needs DLBU, Broadcast unit, virtual PP core and virtual MMU\n")); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ } + -+ /* We are ready to receive IRQ's now as power policy is set up, so -+ * enable them now. */ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, irq_flags); -+ kbdev->pm.backend.driver_ready_for_irqs = true; -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, irq_flags); -+#endif -+ kbase_pm_enable_interrupts(kbdev); ++ if (_MALI_OSK_ERR_OK != resource_gp_found || ++ _MALI_OSK_ERR_OK != resource_gp_mmu_found || ++ _MALI_OSK_ERR_OK != resource_pp_found[0] || ++ _MALI_OSK_ERR_OK != resource_pp_mmu_found[0]) { ++ /* Missing mandatory core(s) */ ++ MALI_DEBUG_PRINT(2, ("Missing mandatory resource, need at least one GP and one PP, both with a separate MMU\n")); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ /* Turn on the GPU and any cores needed by the policy */ -+ kbase_pm_do_poweron(kbdev, false); -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); ++ MALI_DEBUG_ASSERT(1 <= mali_l2_cache_core_get_glob_num_l2_cores()); ++ group = mali_create_group(mali_l2_cache_core_get_glob_l2_core(cluster_id_gp), &resource_gp_mmu, &resource_gp, NULL, MALI_DOMAIN_INDEX_GP); ++ if (NULL == group) { ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ /* Idle the GPU and/or cores, if the policy wants it to */ -+ kbase_pm_context_idle(kbdev); ++ /* Create group for first (and mandatory) PP core */ ++ MALI_DEBUG_ASSERT(mali_l2_cache_core_get_glob_num_l2_cores() >= (cluster_id_pp_grp0 + 1)); /* >= 1 on Mali-300 and Mali-400, >= 2 on Mali-450 */ ++ group = mali_create_group(mali_l2_cache_core_get_glob_l2_core(cluster_id_pp_grp0), &resource_pp_mmu[0], NULL, &resource_pp[0], MALI_DOMAIN_INDEX_PP0); ++ if (NULL == group) { ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ return 0; -+} ++ mali_inited_pp_cores_group_1++; + -+void kbase_hwaccess_pm_halt(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ /* Create groups for rest of the cores in the first PP core group */ ++ for (i = 1; i < 4; i++) { /* First half of the PP cores belong to first core group */ ++ if (mali_inited_pp_cores_group_1 < mali_max_pp_cores_group_1) { ++ if (_MALI_OSK_ERR_OK == resource_pp_found[i] && _MALI_OSK_ERR_OK == resource_pp_mmu_found[i]) { ++ group = mali_create_group(mali_l2_cache_core_get_glob_l2_core(cluster_id_pp_grp0), &resource_pp_mmu[i], NULL, &resource_pp[i], MALI_DOMAIN_INDEX_PP0 + i); ++ if (NULL == group) { ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ mutex_lock(&kbdev->pm.lock); -+ kbase_pm_cancel_deferred_poweroff(kbdev); -+ kbase_pm_do_poweroff(kbdev, false); -+ mutex_unlock(&kbdev->pm.lock); -+} ++ mali_inited_pp_cores_group_1++; ++ } ++ } ++ } + -+KBASE_EXPORT_TEST_API(kbase_hwaccess_pm_halt); ++ /* Create groups for cores in the second PP core group */ ++ for (i = 4; i < 8; i++) { /* Second half of the PP cores belong to second core group */ ++ if (mali_inited_pp_cores_group_2 < mali_max_pp_cores_group_2) { ++ if (_MALI_OSK_ERR_OK == resource_pp_found[i] && _MALI_OSK_ERR_OK == resource_pp_mmu_found[i]) { ++ MALI_DEBUG_ASSERT(mali_l2_cache_core_get_glob_num_l2_cores() >= 2); /* Only Mali-450 have a second core group */ ++ group = mali_create_group(mali_l2_cache_core_get_glob_l2_core(cluster_id_pp_grp1), &resource_pp_mmu[i], NULL, &resource_pp[i], MALI_DOMAIN_INDEX_PP0 + i); ++ if (NULL == group) { ++ return _MALI_OSK_ERR_FAULT; ++ } + -+void kbase_hwaccess_pm_term(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kbdev->pm.active_count == 0); -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_cycle_counter_requests == 0); ++ mali_inited_pp_cores_group_2++; ++ } ++ } ++ } + -+ /* Free any resources the policy allocated */ -+ kbase_pm_policy_term(kbdev); -+ kbase_pm_ca_term(kbdev); ++ if (mali_is_mali450() || mali_is_mali470()) { ++ _mali_osk_errcode_t err = mali_create_virtual_group(&resource_pp_mmu_bcast, &resource_pp_bcast, &resource_dlbu, &resource_bcast); ++ if (_MALI_OSK_ERR_OK != err) { ++ return err; ++ } ++ } + -+ /* Shut down the metrics subsystem */ -+ kbasep_pm_metrics_term(kbdev); ++ mali_max_pp_cores_group_1 = mali_inited_pp_cores_group_1; ++ mali_max_pp_cores_group_2 = mali_inited_pp_cores_group_2; ++ MALI_DEBUG_PRINT(2, ("%d+%d PP cores initialized\n", mali_inited_pp_cores_group_1, mali_inited_pp_cores_group_2)); + -+ destroy_workqueue(kbdev->pm.backend.gpu_poweroff_wait_wq); ++ return _MALI_OSK_ERR_OK; +} + -+void kbase_pm_power_changed(struct kbase_device *kbdev) ++static _mali_osk_errcode_t mali_check_shared_interrupts(void) +{ -+ bool cores_are_available; -+ unsigned long flags; -+ -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, -+ SW_FLOW_PM_CHECKTRANS_GPU_INTERRUPT_START); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ cores_are_available = kbase_pm_check_transitions_nolock(kbdev); -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, -+ SW_FLOW_PM_CHECKTRANS_GPU_INTERRUPT_END); -+ -+ if (cores_are_available) { -+ /* Log timelining information that a change in state has -+ * completed */ -+ kbase_timeline_pm_handle_event(kbdev, -+ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED); -+ -+ kbase_backend_slot_update(kbdev); ++#if !defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ if (MALI_TRUE == _mali_osk_shared_interrupts()) { ++ MALI_PRINT_ERROR(("Shared interrupts detected, but driver support is not enabled\n")); ++ return _MALI_OSK_ERR_FAULT; + } -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+} -+ -+void kbase_pm_set_debug_core_mask(struct kbase_device *kbdev, -+ u64 new_core_mask_js0, u64 new_core_mask_js1, -+ u64 new_core_mask_js2) -+{ -+ kbdev->pm.debug_core_mask[0] = new_core_mask_js0; -+ kbdev->pm.debug_core_mask[1] = new_core_mask_js1; -+ kbdev->pm.debug_core_mask[2] = new_core_mask_js2; -+ kbdev->pm.debug_core_mask_all = new_core_mask_js0 | new_core_mask_js1 | -+ new_core_mask_js2; ++#endif /* !defined(CONFIG_MALI_SHARED_INTERRUPTS) */ + -+ kbase_pm_update_cores_state_nolock(kbdev); ++ /* It is OK to compile support for shared interrupts even if Mali is not using it. */ ++ return _MALI_OSK_ERR_OK; +} + -+void kbase_hwaccess_pm_gpu_active(struct kbase_device *kbdev) ++static _mali_osk_errcode_t mali_parse_config_pmu(void) +{ -+ kbase_pm_update_active(kbdev); -+} ++ _mali_osk_resource_t resource_pmu; + -+void kbase_hwaccess_pm_gpu_idle(struct kbase_device *kbdev) -+{ -+ kbase_pm_update_active(kbdev); -+} ++ MALI_DEBUG_ASSERT(0 != global_gpu_base_address); + -+void kbase_hwaccess_pm_suspend(struct kbase_device *kbdev) -+{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI_OFFSET_PMU, &resource_pmu)) { ++ struct mali_pmu_core *pmu; + -+ /* Force power off the GPU and all cores (regardless of policy), only -+ * after the PM active count reaches zero (otherwise, we risk turning it -+ * off prematurely) */ -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); ++ pmu = mali_pmu_create(&resource_pmu); ++ if (NULL == pmu) { ++ MALI_PRINT_ERROR(("Failed to create PMU\n")); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ } + -+ kbase_pm_cancel_deferred_poweroff(kbdev); -+ kbase_pm_do_poweroff(kbdev, true); ++ /* It's ok if the PMU doesn't exist */ ++ return _MALI_OSK_ERR_OK; ++} + -+ kbase_backend_timer_suspend(kbdev); ++static _mali_osk_errcode_t mali_parse_config_memory(void) ++{ ++ _mali_osk_device_data data = { 0, }; ++ _mali_osk_errcode_t ret; + -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); ++ /* The priority of setting the value of mali_shared_mem_size, ++ * mali_dedicated_mem_start and mali_dedicated_mem_size: ++ * 1. module parameter; ++ * 2. platform data; ++ * 3. default value; ++ **/ ++ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { ++ /* Memory settings are not overridden by module parameters, so use device settings */ ++ if (0 == mali_dedicated_mem_start && 0 == mali_dedicated_mem_size) { ++ /* Use device specific settings (if defined) */ ++ mali_dedicated_mem_start = data.dedicated_mem_start; ++ mali_dedicated_mem_size = data.dedicated_mem_size; ++ } + -+ kbase_pm_wait_for_poweroff_complete(kbdev); -+} ++ if (MALI_SHARED_MEMORY_DEFAULT_SIZE == mali_shared_mem_size && ++ 0 != data.shared_mem_size) { ++ mali_shared_mem_size = data.shared_mem_size; ++ } ++ } + -+void kbase_hwaccess_pm_resume(struct kbase_device *kbdev) -+{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ if (0 < mali_dedicated_mem_size && 0 != mali_dedicated_mem_start) { ++ MALI_DEBUG_PRINT(2, ("Mali memory settings (dedicated: 0x%08X@0x%08X)\n", ++ mali_dedicated_mem_size, mali_dedicated_mem_start)); + -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); ++ /* Dedicated memory */ ++ ret = mali_memory_core_resource_dedicated_memory(mali_dedicated_mem_start, mali_dedicated_mem_size); ++ if (_MALI_OSK_ERR_OK != ret) { ++ MALI_PRINT_ERROR(("Failed to register dedicated memory\n")); ++ mali_memory_terminate(); ++ return ret; ++ } ++ } + -+ kbdev->pm.suspending = false; -+ kbase_pm_do_poweron(kbdev, true); ++ if (0 < mali_shared_mem_size) { ++ MALI_DEBUG_PRINT(2, ("Mali memory settings (shared: 0x%08X)\n", mali_shared_mem_size)); + -+ kbase_backend_timer_resume(kbdev); ++ /* Shared OS memory */ ++ ret = mali_memory_core_resource_os_memory(mali_shared_mem_size); ++ if (_MALI_OSK_ERR_OK != ret) { ++ MALI_PRINT_ERROR(("Failed to register shared OS memory\n")); ++ mali_memory_terminate(); ++ return ret; ++ } ++ } + -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca.c -new file mode 100755 -index 000000000000..c17db8be8877 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca.c -@@ -0,0 +1,182 @@ -+/* -+ * -+ * (C) COPYRIGHT 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ if (0 == mali_fb_start && 0 == mali_fb_size) { ++ /* Frame buffer settings are not overridden by module parameters, so use device settings */ ++ _mali_osk_device_data data = { 0, }; + ++ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { ++ /* Use device specific settings (if defined) */ ++ mali_fb_start = data.fb_start; ++ mali_fb_size = data.fb_size; ++ } + ++ MALI_DEBUG_PRINT(2, ("Using device defined frame buffer settings (0x%08X@0x%08X)\n", ++ mali_fb_size, mali_fb_start)); ++ } else { ++ MALI_DEBUG_PRINT(2, ("Using module defined frame buffer settings (0x%08X@0x%08X)\n", ++ mali_fb_size, mali_fb_start)); ++ } + -+/* -+ * Base kernel core availability APIs -+ */ ++ if (0 != mali_fb_size) { ++ /* Register frame buffer */ ++ ret = mali_mem_validation_add_range(mali_fb_start, mali_fb_size); ++ if (_MALI_OSK_ERR_OK != ret) { ++ MALI_PRINT_ERROR(("Failed to register frame buffer memory region\n")); ++ mali_memory_terminate(); ++ return ret; ++ } ++ } + -+#include -+#include -+#include ++ return _MALI_OSK_ERR_OK; ++} + -+static const struct kbase_pm_ca_policy *const policy_list[] = { -+ &kbase_pm_ca_fixed_policy_ops, -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+ &kbase_pm_ca_devfreq_policy_ops, -+#endif -+#if !MALI_CUSTOMER_RELEASE -+ &kbase_pm_ca_random_policy_ops -+#endif -+}; ++static void mali_detect_gpu_class(void) ++{ ++ if (_mali_osk_identify_gpu_resource() == 0x450) ++ mali_gpu_class_is_mali450 = MALI_TRUE; + -+/** -+ * POLICY_COUNT - The number of policies available in the system. -+ * -+ * This is derived from the number of functions listed in policy_list. -+ */ -+#define POLICY_COUNT (sizeof(policy_list)/sizeof(*policy_list)) ++ if (_mali_osk_identify_gpu_resource() == 0x470) ++ mali_gpu_class_is_mali470 = MALI_TRUE; ++} + -+int kbase_pm_ca_init(struct kbase_device *kbdev) ++static _mali_osk_errcode_t mali_init_hw_reset(void) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++#if (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) ++ _mali_osk_resource_t resource_bcast; + -+ kbdev->pm.backend.ca_current_policy = policy_list[0]; ++ /* Ensure broadcast unit is in a good state before we start creating ++ * groups and cores. ++ */ ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI_OFFSET_BCAST, &resource_bcast)) { ++ struct mali_bcast_unit *bcast_core; + -+ kbdev->pm.backend.ca_current_policy->init(kbdev); ++ bcast_core = mali_bcast_unit_create(&resource_bcast); ++ if (NULL == bcast_core) { ++ MALI_PRINT_ERROR(("Failed to create Broadcast unit object!\n")); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ mali_bcast_unit_delete(bcast_core); ++ } ++#endif /* (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) */ + -+ return 0; ++ return _MALI_OSK_ERR_OK; +} + -+void kbase_pm_ca_term(struct kbase_device *kbdev) ++_mali_osk_errcode_t mali_initialize_subsystems(void) +{ -+ kbdev->pm.backend.ca_current_policy->term(kbdev); -+} ++ _mali_osk_errcode_t err; + -+int kbase_pm_ca_list_policies(const struct kbase_pm_ca_policy * const **list) -+{ -+ if (!list) -+ return POLICY_COUNT; ++#ifdef CONFIG_MALI_DT ++ err = _mali_osk_resource_initialize(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_terminate_subsystems(); ++ return err; ++ } ++#endif + -+ *list = policy_list; ++ mali_pp_job_initialize(); + -+ return POLICY_COUNT; -+} ++ err = mali_timeline_initialize(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_terminate_subsystems(); ++ return err; ++ } ++ ++ err = mali_session_initialize(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_terminate_subsystems(); ++ return err; ++ } + -+KBASE_EXPORT_TEST_API(kbase_pm_ca_list_policies); ++ /*Try to init gpu secure mode */ ++ _mali_osk_gpu_secure_mode_init(); + -+const struct kbase_pm_ca_policy -+*kbase_pm_ca_get_policy(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++#if defined(CONFIG_MALI400_PROFILING) ++ err = _mali_osk_profiling_init(mali_boot_profiling ? MALI_TRUE : MALI_FALSE); ++ if (_MALI_OSK_ERR_OK != err) { ++ /* No biggie if we weren't able to initialize the profiling */ ++ MALI_PRINT_ERROR(("Failed to initialize profiling, feature will be unavailable\n")); ++ } ++#endif + -+ return kbdev->pm.backend.ca_current_policy; -+} ++ err = mali_memory_initialize(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_terminate_subsystems(); ++ return err; ++ } + -+KBASE_EXPORT_TEST_API(kbase_pm_ca_get_policy); ++ err = mali_executor_initialize(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_terminate_subsystems(); ++ return err; ++ } + -+void kbase_pm_ca_set_policy(struct kbase_device *kbdev, -+ const struct kbase_pm_ca_policy *new_policy) -+{ -+ const struct kbase_pm_ca_policy *old_policy; -+ unsigned long flags; ++ err = mali_scheduler_initialize(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_terminate_subsystems(); ++ return err; ++ } + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(new_policy != NULL); ++ /* Configure memory early, needed by mali_mmu_initialize. */ ++ err = mali_parse_config_memory(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_terminate_subsystems(); ++ return err; ++ } + -+ KBASE_TRACE_ADD(kbdev, PM_CA_SET_POLICY, NULL, NULL, 0u, -+ new_policy->id); ++ err = mali_set_global_gpu_base_address(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_terminate_subsystems(); ++ return err; ++ } + -+ /* During a policy change we pretend the GPU is active */ -+ /* A suspend won't happen here, because we're in a syscall from a -+ * userspace thread */ -+ kbase_pm_context_active(kbdev); ++ /* Detect GPU class (uses L2 cache count) */ ++ mali_detect_gpu_class(); + -+ mutex_lock(&kbdev->pm.lock); ++ err = mali_check_shared_interrupts(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_terminate_subsystems(); ++ return err; ++ } + -+ /* Remove the policy to prevent IRQ handlers from working on it */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ old_policy = kbdev->pm.backend.ca_current_policy; -+ kbdev->pm.backend.ca_current_policy = NULL; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ /* Initialize the MALI PMU (will not touch HW!) */ ++ err = mali_parse_config_pmu(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_terminate_subsystems(); ++ return err; ++ } + -+ if (old_policy->term) -+ old_policy->term(kbdev); ++ /* Initialize the power management module */ ++ err = mali_pm_initialize(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_terminate_subsystems(); ++ return err; ++ } + -+ if (new_policy->init) -+ new_policy->init(kbdev); ++ /* Make sure the entire GPU stays on for the rest of this function */ ++ mali_pm_init_begin(); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbdev->pm.backend.ca_current_policy = new_policy; ++ /* Ensure HW is in a good state before starting to access cores. */ ++ err = mali_init_hw_reset(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_terminate_subsystems(); ++ return err; ++ } + -+ /* If any core power state changes were previously attempted, but -+ * couldn't be made because the policy was changing (current_policy was -+ * NULL), then re-try them here. */ -+ kbase_pm_update_cores_state_nolock(kbdev); ++ /* Detect which Mali GPU we are dealing with */ ++ err = mali_parse_product_info(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_pm_init_end(); ++ mali_terminate_subsystems(); ++ return err; ++ } + -+ kbdev->pm.backend.ca_current_policy->update_core_status(kbdev, -+ kbdev->shader_ready_bitmap, -+ kbdev->shader_transitioning_bitmap); ++ /* The global_product_id is now populated with the correct Mali GPU */ + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ /* Start configuring the actual Mali hardware. */ + -+ mutex_unlock(&kbdev->pm.lock); ++ err = mali_mmu_initialize(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_pm_init_end(); ++ mali_terminate_subsystems(); ++ return err; ++ } + -+ /* Now the policy change is finished, we release our fake context active -+ * reference */ -+ kbase_pm_context_idle(kbdev); -+} ++ if (mali_is_mali450() || mali_is_mali470()) { ++ err = mali_dlbu_initialize(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_pm_init_end(); ++ mali_terminate_subsystems(); ++ return err; ++ } ++ } + -+KBASE_EXPORT_TEST_API(kbase_pm_ca_set_policy); ++ err = mali_parse_config_l2_cache(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_pm_init_end(); ++ mali_terminate_subsystems(); ++ return err; ++ } + -+u64 kbase_pm_ca_get_core_mask(struct kbase_device *kbdev) -+{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ err = mali_parse_config_groups(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_pm_init_end(); ++ mali_terminate_subsystems(); ++ return err; ++ } + -+ /* All cores must be enabled when instrumentation is in use */ -+ if (kbdev->pm.backend.instr_enabled) -+ return kbdev->gpu_props.props.raw_props.shader_present & -+ kbdev->pm.debug_core_mask_all; ++ /* Move groups into executor */ ++ mali_executor_populate(); + -+ if (kbdev->pm.backend.ca_current_policy == NULL) -+ return kbdev->gpu_props.props.raw_props.shader_present & -+ kbdev->pm.debug_core_mask_all; ++ /* Need call after all group has assigned a domain */ ++ mali_pm_power_cost_setup(); + -+ return kbdev->pm.backend.ca_current_policy->get_core_mask(kbdev) & -+ kbdev->pm.debug_core_mask_all; -+} ++ /* Initialize the GPU timer */ ++ err = mali_control_timer_init(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_pm_init_end(); ++ mali_terminate_subsystems(); ++ return err; ++ } + -+KBASE_EXPORT_TEST_API(kbase_pm_ca_get_core_mask); ++ /* Initialize the GPU utilization tracking */ ++ err = mali_utilization_init(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_pm_init_end(); ++ mali_terminate_subsystems(); ++ return err; ++ } + -+void kbase_pm_ca_update_core_status(struct kbase_device *kbdev, u64 cores_ready, -+ u64 cores_transitioning) -+{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++#if defined(CONFIG_MALI_DVFS) ++ err = mali_dvfs_policy_init(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_pm_init_end(); ++ mali_terminate_subsystems(); ++ return err; ++ } ++#endif + -+ if (kbdev->pm.backend.ca_current_policy != NULL) -+ kbdev->pm.backend.ca_current_policy->update_core_status(kbdev, -+ cores_ready, -+ cores_transitioning); ++ /* Allowing the system to be turned off */ ++ mali_pm_init_end(); ++ ++ return _MALI_OSK_ERR_OK; /* all ok */ +} + -+void kbase_pm_ca_instr_enable(struct kbase_device *kbdev) ++void mali_terminate_subsystems(void) +{ -+ unsigned long flags; ++ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbdev->pm.backend.instr_enabled = true; ++ MALI_DEBUG_PRINT(2, ("terminate_subsystems() called\n")); + -+ kbase_pm_update_cores_state_nolock(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+} ++ mali_utilization_term(); ++ mali_control_timer_term(); + -+void kbase_pm_ca_instr_disable(struct kbase_device *kbdev) -+{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ kbdev->pm.backend.instr_enabled = false; ++ mali_executor_depopulate(); ++ mali_delete_groups(); /* Delete groups not added to executor */ ++ mali_executor_terminate(); + -+ kbase_pm_update_cores_state_nolock(kbdev); -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca.h -new file mode 100755 -index 000000000000..ee9e751f2d79 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca.h -@@ -0,0 +1,92 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ mali_scheduler_terminate(); ++ mali_pp_job_terminate(); ++ mali_delete_l2_cache_cores(); ++ mali_mmu_terminate(); + ++ if (mali_is_mali450() || mali_is_mali470()) { ++ mali_dlbu_terminate(); ++ } + ++ mali_pm_terminate(); + -+/* -+ * Base kernel core availability APIs -+ */ ++ if (NULL != pmu) { ++ mali_pmu_delete(pmu); ++ } + -+#ifndef _KBASE_PM_CA_H_ -+#define _KBASE_PM_CA_H_ ++#if defined(CONFIG_MALI400_PROFILING) ++ _mali_osk_profiling_term(); ++#endif + -+/** -+ * kbase_pm_ca_init - Initialize core availability framework -+ * -+ * Must be called before calling any other core availability function -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * Return: 0 if the core availability framework was successfully initialized, -+ * -errno otherwise -+ */ -+int kbase_pm_ca_init(struct kbase_device *kbdev); ++ _mali_osk_gpu_secure_mode_deinit(); + -+/** -+ * kbase_pm_ca_term - Terminate core availability framework -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_ca_term(struct kbase_device *kbdev); ++ mali_memory_terminate(); + -+/** -+ * kbase_pm_ca_get_core_mask - Get currently available shaders core mask -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * Returns a mask of the currently available shader cores. -+ * Calls into the core availability policy -+ * -+ * Return: The bit mask of available cores -+ */ -+u64 kbase_pm_ca_get_core_mask(struct kbase_device *kbdev); ++ mali_session_terminate(); + -+/** -+ * kbase_pm_ca_update_core_status - Update core status -+ * -+ * @kbdev: The kbase device structure for the device (must be -+ * a valid pointer) -+ * @cores_ready: The bit mask of cores ready for job submission -+ * @cores_transitioning: The bit mask of cores that are transitioning power -+ * state -+ * -+ * Update core availability policy with current core power status -+ * -+ * Calls into the core availability policy -+ */ -+void kbase_pm_ca_update_core_status(struct kbase_device *kbdev, u64 cores_ready, -+ u64 cores_transitioning); ++ mali_timeline_terminate(); + -+/** -+ * kbase_pm_ca_instr_enable - Enable override for instrumentation -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * This overrides the output of the core availability policy, ensuring that all -+ * cores are available -+ */ -+void kbase_pm_ca_instr_enable(struct kbase_device *kbdev); ++ global_gpu_base_address = 0; ++} + -+/** -+ * kbase_pm_ca_instr_disable - Disable override for instrumentation -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * This disables any previously enabled override, and resumes normal policy -+ * functionality -+ */ -+void kbase_pm_ca_instr_disable(struct kbase_device *kbdev); ++_mali_product_id_t mali_kernel_core_get_product_id(void) ++{ ++ return global_product_id; ++} + -+#endif /* _KBASE_PM_CA_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_devfreq.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_devfreq.c -new file mode 100755 -index 000000000000..66bf660cffb6 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_devfreq.c -@@ -0,0 +1,129 @@ -+/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++u32 mali_kernel_core_get_gpu_major_version(void) ++{ ++ return global_gpu_major_version; ++} + ++u32 mali_kernel_core_get_gpu_minor_version(void) ++{ ++ return global_gpu_minor_version; ++} + ++_mali_osk_errcode_t _mali_ukk_get_api_version(_mali_uk_get_api_version_s *args) ++{ ++ MALI_DEBUG_ASSERT_POINTER(args); ++ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); + -+/* -+ * A core availability policy implementing core mask selection from devfreq OPPs -+ * -+ */ ++ /* check compatability */ ++ if (args->version == _MALI_UK_API_VERSION) { ++ args->compatible = 1; ++ } else { ++ args->compatible = 0; ++ } + -+#include -+#include -+#include -+#include ++ args->version = _MALI_UK_API_VERSION; /* report our version */ + -+void kbase_devfreq_set_core_mask(struct kbase_device *kbdev, u64 core_mask) ++ /* success regardless of being compatible or not */ ++ MALI_SUCCESS; ++} ++ ++_mali_osk_errcode_t _mali_ukk_get_api_version_v2(_mali_uk_get_api_version_v2_s *args) +{ -+ struct kbasep_pm_ca_policy_devfreq *data = -+ &kbdev->pm.backend.ca_policy_data.devfreq; -+ unsigned long flags; ++ MALI_DEBUG_ASSERT_POINTER(args); ++ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ /* check compatability */ ++ if (args->version == _MALI_UK_API_VERSION) { ++ args->compatible = 1; ++ } else { ++ args->compatible = 0; ++ } + -+ data->cores_desired = core_mask; ++ args->version = _MALI_UK_API_VERSION; /* report our version */ + -+ /* Disable any cores that are now unwanted */ -+ data->cores_enabled &= data->cores_desired; ++ /* success regardless of being compatible or not */ ++ return _MALI_OSK_ERR_OK; ++} + -+ kbdev->pm.backend.ca_in_transition = true; ++_mali_osk_errcode_t _mali_ukk_wait_for_notification(_mali_uk_wait_for_notification_s *args) ++{ ++ _mali_osk_errcode_t err; ++ _mali_osk_notification_t *notification; ++ _mali_osk_notification_queue_t *queue; ++ struct mali_session_data *session; + -+ /* If there are no cores to be powered off then power on desired cores -+ */ -+ if (!(data->cores_used & ~data->cores_desired)) { -+ data->cores_enabled = data->cores_desired; -+ kbdev->pm.backend.ca_in_transition = false; ++ /* check input */ ++ MALI_DEBUG_ASSERT_POINTER(args); ++ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); ++ ++ session = (struct mali_session_data *)(uintptr_t)args->ctx; ++ queue = session->ioctl_queue; ++ ++ /* if the queue does not exist we're currently shutting down */ ++ if (NULL == queue) { ++ MALI_DEBUG_PRINT(1, ("No notification queue registered with the session. Asking userspace to stop querying\n")); ++ args->type = _MALI_NOTIFICATION_CORE_SHUTDOWN_IN_PROGRESS; ++ return _MALI_OSK_ERR_OK; + } + -+ kbase_pm_update_cores_state_nolock(kbdev); ++ /* receive a notification, might sleep */ ++ err = _mali_osk_notification_queue_receive(queue, ¬ification); ++ if (_MALI_OSK_ERR_OK != err) { ++ MALI_ERROR(err); /* errcode returned, pass on to caller */ ++ } + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ /* copy the buffer to the user */ ++ args->type = (_mali_uk_notification_type)notification->notification_type; ++ _mali_osk_memcpy(&args->data, notification->result_buffer, notification->result_buffer_size); + -+ dev_dbg(kbdev->dev, "Devfreq policy : new core mask=%llX %llX\n", -+ data->cores_desired, data->cores_enabled); ++ /* finished with the notification */ ++ _mali_osk_notification_delete(notification); ++ ++ return _MALI_OSK_ERR_OK; /* all ok */ +} + -+static void devfreq_init(struct kbase_device *kbdev) ++_mali_osk_errcode_t _mali_ukk_post_notification(_mali_uk_post_notification_s *args) +{ -+ struct kbasep_pm_ca_policy_devfreq *data = -+ &kbdev->pm.backend.ca_policy_data.devfreq; ++ _mali_osk_notification_t *notification; ++ _mali_osk_notification_queue_t *queue; ++ struct mali_session_data *session; + -+ if (kbdev->current_core_mask) { -+ data->cores_enabled = kbdev->current_core_mask; -+ data->cores_desired = kbdev->current_core_mask; -+ } else { -+ data->cores_enabled = -+ kbdev->gpu_props.props.raw_props.shader_present; -+ data->cores_desired = -+ kbdev->gpu_props.props.raw_props.shader_present; ++ /* check input */ ++ MALI_DEBUG_ASSERT_POINTER(args); ++ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); ++ ++ session = (struct mali_session_data *)(uintptr_t)args->ctx; ++ queue = session->ioctl_queue; ++ ++ /* if the queue does not exist we're currently shutting down */ ++ if (NULL == queue) { ++ MALI_DEBUG_PRINT(1, ("No notification queue registered with the session. Asking userspace to stop querying\n")); ++ return _MALI_OSK_ERR_OK; + } -+ data->cores_used = 0; -+ kbdev->pm.backend.ca_in_transition = false; ++ ++ notification = _mali_osk_notification_create(args->type, 0); ++ if (NULL == notification) { ++ MALI_PRINT_ERROR(("Failed to create notification object\n")); ++ return _MALI_OSK_ERR_NOMEM; ++ } ++ ++ _mali_osk_notification_queue_send(queue, notification); ++ ++ return _MALI_OSK_ERR_OK; /* all ok */ +} + -+static void devfreq_term(struct kbase_device *kbdev) ++_mali_osk_errcode_t _mali_ukk_pending_submit(_mali_uk_pending_submit_s *args) +{ ++ wait_queue_head_t *queue; ++ ++ /* check input */ ++ MALI_DEBUG_ASSERT_POINTER(args); ++ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); ++ ++ queue = mali_session_get_wait_queue(); ++ ++ /* check pending big job number, might sleep if larger than MAX allowed number */ ++ if (wait_event_interruptible(*queue, MALI_MAX_PENDING_BIG_JOB > mali_scheduler_job_gp_big_job_count())) { ++ return _MALI_OSK_ERR_RESTARTSYSCALL; ++ } ++ ++ return _MALI_OSK_ERR_OK; /* all ok */ +} + -+static u64 devfreq_get_core_mask(struct kbase_device *kbdev) ++ ++_mali_osk_errcode_t _mali_ukk_request_high_priority(_mali_uk_request_high_priority_s *args) +{ -+ return kbdev->pm.backend.ca_policy_data.devfreq.cores_enabled; ++ struct mali_session_data *session; ++ ++ MALI_DEBUG_ASSERT_POINTER(args); ++ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); ++ ++ session = (struct mali_session_data *)(uintptr_t)args->ctx; ++ ++ if (!session->use_high_priority_job_queue) { ++ session->use_high_priority_job_queue = MALI_TRUE; ++ MALI_DEBUG_PRINT(2, ("Session 0x%08X with pid %d was granted higher priority.\n", session, _mali_osk_get_pid())); ++ } ++ ++ return _MALI_OSK_ERR_OK; +} + -+static void devfreq_update_core_status(struct kbase_device *kbdev, -+ u64 cores_ready, -+ u64 cores_transitioning) ++_mali_osk_errcode_t _mali_ukk_open(void **context) +{ -+ struct kbasep_pm_ca_policy_devfreq *data = -+ &kbdev->pm.backend.ca_policy_data.devfreq; -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ u32 i; ++ struct mali_session_data *session; + -+ data->cores_used = cores_ready | cores_transitioning; ++ /* allocated struct to track this session */ ++ session = (struct mali_session_data *)_mali_osk_calloc(1, sizeof(struct mali_session_data)); ++ MALI_CHECK_NON_NULL(session, _MALI_OSK_ERR_NOMEM); + -+ /* If in desired state then clear transition flag */ -+ if (data->cores_enabled == data->cores_desired) -+ kbdev->pm.backend.ca_in_transition = false; ++ MALI_DEBUG_PRINT(3, ("Session starting\n")); + -+ /* If all undesired cores are now off then power on desired cores. -+ * The direct comparison against cores_enabled limits potential -+ * recursion to one level */ -+ if (!(data->cores_used & ~data->cores_desired) && -+ data->cores_enabled != data->cores_desired) { -+ data->cores_enabled = data->cores_desired; ++ /* create a response queue for this session */ ++ session->ioctl_queue = _mali_osk_notification_queue_init(); ++ if (NULL == session->ioctl_queue) { ++ goto err; ++ } + -+ kbase_pm_update_cores_state_nolock(kbdev); ++ /*create a wait queue for this session */ ++ session->wait_queue = _mali_osk_wait_queue_init(); ++ if (NULL == session->wait_queue) { ++ goto err_wait_queue; ++ } + -+ kbdev->pm.backend.ca_in_transition = false; ++ session->page_directory = mali_mmu_pagedir_alloc(); ++ if (NULL == session->page_directory) { ++ goto err_mmu; + } -+} + -+/* -+ * The struct kbase_pm_ca_policy structure for the devfreq core availability -+ * policy. -+ * -+ * This is the static structure that defines the devfreq core availability power -+ * policy's callback and name. -+ */ -+const struct kbase_pm_ca_policy kbase_pm_ca_devfreq_policy_ops = { -+ "devfreq", /* name */ -+ devfreq_init, /* init */ -+ devfreq_term, /* term */ -+ devfreq_get_core_mask, /* get_core_mask */ -+ devfreq_update_core_status, /* update_core_status */ -+ 0u, /* flags */ -+ KBASE_PM_CA_POLICY_ID_DEVFREQ, /* id */ -+}; ++ if (_MALI_OSK_ERR_OK != mali_mmu_pagedir_map(session->page_directory, MALI_DLBU_VIRT_ADDR, _MALI_OSK_MALI_PAGE_SIZE)) { ++ MALI_PRINT_ERROR(("Failed to map DLBU page into session\n")); ++ goto err_mmu; ++ } + -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_devfreq.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_devfreq.h -new file mode 100755 -index 000000000000..7ab3cd4d8460 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_devfreq.h -@@ -0,0 +1,55 @@ -+/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ if (0 != mali_dlbu_phys_addr) { ++ mali_mmu_pagedir_update(session->page_directory, MALI_DLBU_VIRT_ADDR, mali_dlbu_phys_addr, ++ _MALI_OSK_MALI_PAGE_SIZE, MALI_MMU_FLAGS_DEFAULT); ++ } + ++ if (_MALI_OSK_ERR_OK != mali_memory_session_begin(session)) { ++ goto err_session; ++ } + ++ /* Create soft system. */ ++ session->soft_job_system = mali_soft_job_system_create(session); ++ if (NULL == session->soft_job_system) { ++ goto err_soft; ++ } + -+/* -+ * A core availability policy for use with devfreq, where core masks are -+ * associated with OPPs. -+ */ ++ /* Initialize the dma fence context.*/ ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ session->fence_context = dma_fence_context_alloc(1); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) ++ session->fence_context = fence_context_alloc(1); ++ _mali_osk_atomic_init(&session->fence_seqno, 0); ++#else ++ MALI_PRINT_ERROR(("The kernel version not support dma fence!\n")); ++ goto err_time_line; ++#endif ++#endif + -+#ifndef MALI_KBASE_PM_CA_DEVFREQ_H -+#define MALI_KBASE_PM_CA_DEVFREQ_H ++ /* Create timeline system. */ ++ session->timeline_system = mali_timeline_system_create(session); ++ if (NULL == session->timeline_system) { ++ goto err_time_line; ++ } + -+/** -+ * struct kbasep_pm_ca_policy_devfreq - Private structure for devfreq ca policy -+ * -+ * This contains data that is private to the devfreq core availability -+ * policy. -+ * -+ * @cores_desired: Cores that the policy wants to be available -+ * @cores_enabled: Cores that the policy is currently returning as available -+ * @cores_used: Cores currently powered or transitioning -+ */ -+struct kbasep_pm_ca_policy_devfreq { -+ u64 cores_desired; -+ u64 cores_enabled; -+ u64 cores_used; -+}; ++#if defined(CONFIG_MALI_DVFS) ++ _mali_osk_atomic_init(&session->number_of_window_jobs, 0); ++#endif + -+extern const struct kbase_pm_ca_policy kbase_pm_ca_devfreq_policy_ops; ++ _mali_osk_atomic_init(&session->number_of_pp_jobs, 0); + -+/** -+ * kbase_devfreq_set_core_mask - Set core mask for policy to use -+ * @kbdev: Device pointer -+ * @core_mask: New core mask -+ * -+ * The new core mask will have immediate effect if the GPU is powered, or will -+ * take effect when it is next powered on. -+ */ -+void kbase_devfreq_set_core_mask(struct kbase_device *kbdev, u64 core_mask); ++ session->use_high_priority_job_queue = MALI_FALSE; + -+#endif /* MALI_KBASE_PM_CA_DEVFREQ_H */ ++ /* Initialize list of PP jobs on this session. */ ++ _MALI_OSK_INIT_LIST_HEAD(&session->pp_job_list); + -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_fixed.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_fixed.c -new file mode 100755 -index 000000000000..864612d31f9b ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_fixed.c -@@ -0,0 +1,65 @@ -+/* -+ * -+ * (C) COPYRIGHT 2013-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ /* Initialize the pp_job_fb_lookup_list array used to quickly lookup jobs from a given frame builder */ ++ for (i = 0; i < MALI_PP_JOB_FB_LOOKUP_LIST_SIZE; ++i) { ++ _MALI_OSK_INIT_LIST_HEAD(&session->pp_job_fb_lookup_list[i]); ++ } + ++ session->pid = _mali_osk_get_pid(); ++ session->comm = _mali_osk_get_comm(); ++ session->max_mali_mem_allocated_size = 0; ++ for (i = 0; i < MALI_MEM_TYPE_MAX; i ++) { ++ atomic_set(&session->mali_mem_array[i], 0); ++ } ++ atomic_set(&session->mali_mem_allocated_pages, 0); ++ *context = (void *)session; + ++ /* Add session to the list of all sessions. */ ++ mali_session_add(session); + -+/* -+ * A power policy implementing fixed core availability -+ */ ++ MALI_DEBUG_PRINT(3, ("Session started\n")); ++ return _MALI_OSK_ERR_OK; + -+#include -+#include ++err_time_line: ++ mali_soft_job_system_destroy(session->soft_job_system); ++err_soft: ++ mali_memory_session_end(session); ++err_session: ++ mali_mmu_pagedir_free(session->page_directory); ++err_mmu: ++ _mali_osk_wait_queue_term(session->wait_queue); ++err_wait_queue: ++ _mali_osk_notification_queue_term(session->ioctl_queue); ++err: ++ _mali_osk_free(session); ++ MALI_ERROR(_MALI_OSK_ERR_NOMEM); + -+static void fixed_init(struct kbase_device *kbdev) -+{ -+ kbdev->pm.backend.ca_in_transition = false; +} + -+static void fixed_term(struct kbase_device *kbdev) -+{ -+ CSTD_UNUSED(kbdev); -+} ++#if defined(DEBUG) ++/* parameter used for debug */ ++extern u32 num_pm_runtime_resume; ++extern u32 num_pm_updates; ++extern u32 num_pm_updates_up; ++extern u32 num_pm_updates_down; ++#endif + -+static u64 fixed_get_core_mask(struct kbase_device *kbdev) ++_mali_osk_errcode_t _mali_ukk_close(void **context) +{ -+ return kbdev->gpu_props.props.raw_props.shader_present; -+} ++ struct mali_session_data *session; ++ MALI_CHECK_NON_NULL(context, _MALI_OSK_ERR_INVALID_ARGS); ++ session = (struct mali_session_data *)*context; + -+static void fixed_update_core_status(struct kbase_device *kbdev, -+ u64 cores_ready, -+ u64 cores_transitioning) -+{ -+ CSTD_UNUSED(kbdev); -+ CSTD_UNUSED(cores_ready); -+ CSTD_UNUSED(cores_transitioning); -+} ++ MALI_DEBUG_PRINT(3, ("Session ending\n")); + -+/* -+ * The struct kbase_pm_policy structure for the fixed power policy. -+ * -+ * This is the static structure that defines the fixed power policy's callback -+ * and name. -+ */ -+const struct kbase_pm_ca_policy kbase_pm_ca_fixed_policy_ops = { -+ "fixed", /* name */ -+ fixed_init, /* init */ -+ fixed_term, /* term */ -+ fixed_get_core_mask, /* get_core_mask */ -+ fixed_update_core_status, /* update_core_status */ -+ 0u, /* flags */ -+ KBASE_PM_CA_POLICY_ID_FIXED, /* id */ -+}; ++ MALI_DEBUG_ASSERT_POINTER(session->soft_job_system); ++ MALI_DEBUG_ASSERT_POINTER(session->timeline_system); + -+KBASE_EXPORT_TEST_API(kbase_pm_ca_fixed_policy_ops); -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_fixed.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_fixed.h -new file mode 100755 -index 000000000000..a763155cb703 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_fixed.h -@@ -0,0 +1,40 @@ -+/* -+ * -+ * (C) COPYRIGHT 2013-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ /* Remove session from list of all sessions. */ ++ mali_session_remove(session); + ++ /* This flag is used to prevent queueing of jobs due to activation. */ ++ session->is_aborting = MALI_TRUE; + ++ /* Stop the soft job timer. */ ++ mali_timeline_system_stop_timer(session->timeline_system); + -+/* -+ * A power policy implementing fixed core availability -+ */ ++ /* Abort queued jobs */ ++ mali_scheduler_abort_session(session); + -+#ifndef MALI_KBASE_PM_CA_FIXED_H -+#define MALI_KBASE_PM_CA_FIXED_H ++ /* Abort executing jobs */ ++ mali_executor_abort_session(session); + -+/** -+ * struct kbasep_pm_ca_policy_fixed - Private structure for policy instance data -+ * -+ * @dummy: Dummy member - no state is needed -+ * -+ * This contains data that is private to the particular power policy that is -+ * active. -+ */ -+struct kbasep_pm_ca_policy_fixed { -+ int dummy; -+}; ++ /* Abort the soft job system. */ ++ mali_soft_job_system_abort(session->soft_job_system); + -+extern const struct kbase_pm_ca_policy kbase_pm_ca_fixed_policy_ops; ++ /* Force execution of all pending bottom half processing for GP and PP. */ ++ _mali_osk_wq_flush(); + -+#endif /* MALI_KBASE_PM_CA_FIXED_H */ ++ /* The session PP list should now be empty. */ ++ MALI_DEBUG_ASSERT(_mali_osk_list_empty(&session->pp_job_list)); ++ ++ /* At this point the GP and PP scheduler no longer has any jobs queued or running from this ++ * session, and all soft jobs in the soft job system has been destroyed. */ ++ ++ /* Any trackers left in the timeline system are directly or indirectly waiting on external ++ * sync fences. Cancel all sync fence waiters to trigger activation of all remaining ++ * trackers. This call will sleep until all timelines are empty. */ ++ mali_timeline_system_abort(session->timeline_system); ++ ++ /* Flush pending work. ++ * Needed to make sure all bottom half processing related to this ++ * session has been completed, before we free internal data structures. ++ */ ++ _mali_osk_wq_flush(); ++ ++ /* Destroy timeline system. */ ++ mali_timeline_system_destroy(session->timeline_system); ++ session->timeline_system = NULL; ++ ++ /* Destroy soft system. */ ++ mali_soft_job_system_destroy(session->soft_job_system); ++ session->soft_job_system = NULL; ++ ++ /*Wait for the session job lists become empty.*/ ++ _mali_osk_wait_queue_wait_event(session->wait_queue, mali_session_pp_job_is_empty, (void *) session); ++ ++ /* Free remaining memory allocated to this session */ ++ mali_memory_session_end(session); ++ ++#if defined(CONFIG_MALI_DVFS) ++ _mali_osk_atomic_term(&session->number_of_window_jobs); ++#endif ++ ++#if defined(CONFIG_MALI400_PROFILING) ++ _mali_osk_profiling_stop_sampling(session->pid); ++#endif ++ ++ /* Free session data structures */ ++ mali_mmu_pagedir_unmap(session->page_directory, MALI_DLBU_VIRT_ADDR, _MALI_OSK_MALI_PAGE_SIZE); ++ mali_mmu_pagedir_free(session->page_directory); ++ _mali_osk_wait_queue_term(session->wait_queue); ++ _mali_osk_notification_queue_term(session->ioctl_queue); ++ _mali_osk_free(session); + -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_coarse_demand.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_coarse_demand.c ++ *context = NULL; ++ ++ MALI_DEBUG_PRINT(3, ("Session has ended\n")); ++ ++#if defined(DEBUG) ++ MALI_DEBUG_PRINT(3, ("Stats: # runtime resumes: %u\n", num_pm_runtime_resume)); ++ MALI_DEBUG_PRINT(3, (" # PM updates: .... %u (up %u, down %u)\n", num_pm_updates, num_pm_updates_up, num_pm_updates_down)); ++ ++ num_pm_runtime_resume = 0; ++ num_pm_updates = 0; ++ num_pm_updates_up = 0; ++ num_pm_updates_down = 0; ++#endif ++ ++ return _MALI_OSK_ERR_OK;; ++} ++ ++#if MALI_STATE_TRACKING ++u32 _mali_kernel_core_dump_state(char *buf, u32 size) ++{ ++ int n = 0; /* Number of bytes written to buf */ ++ ++ n += mali_scheduler_dump_state(buf + n, size - n); ++ n += mali_executor_dump_state(buf + n, size - n); ++ ++ return n; ++} ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h new file mode 100755 -index 000000000000..f891fa225a89 +index 000000000..c471fc955 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_coarse_demand.c -@@ -0,0 +1,70 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h +@@ -0,0 +1,57 @@ +/* -+ * -+ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_KERNEL_CORE_H__ ++#define __MALI_KERNEL_CORE_H__ + ++#include "mali_osk.h" + ++typedef enum { ++ _MALI_PRODUCT_ID_UNKNOWN, ++ _MALI_PRODUCT_ID_MALI200, ++ _MALI_PRODUCT_ID_MALI300, ++ _MALI_PRODUCT_ID_MALI400, ++ _MALI_PRODUCT_ID_MALI450, ++ _MALI_PRODUCT_ID_MALI470, ++} _mali_product_id_t; + ++extern mali_bool mali_gpu_class_is_mali450; ++extern mali_bool mali_gpu_class_is_mali470; + -+/* -+ * "Coarse Demand" power management policy -+ */ ++_mali_osk_errcode_t mali_initialize_subsystems(void); + -+#include -+#include ++void mali_terminate_subsystems(void); + -+static u64 coarse_demand_get_core_mask(struct kbase_device *kbdev) -+{ -+ if (kbdev->pm.active_count == 0) -+ return 0; ++_mali_product_id_t mali_kernel_core_get_product_id(void); + -+ return kbdev->gpu_props.props.raw_props.shader_present; -+} ++u32 mali_kernel_core_get_gpu_major_version(void); + -+static bool coarse_demand_get_core_active(struct kbase_device *kbdev) -+{ -+ if (0 == kbdev->pm.active_count && !(kbdev->shader_needed_bitmap | -+ kbdev->shader_inuse_bitmap) && !kbdev->tiler_needed_cnt -+ && !kbdev->tiler_inuse_cnt) -+ return false; ++u32 mali_kernel_core_get_gpu_minor_version(void); + -+ return true; -+} ++u32 _mali_kernel_core_dump_state(char *buf, u32 size); + -+static void coarse_demand_init(struct kbase_device *kbdev) ++MALI_STATIC_INLINE mali_bool mali_is_mali470(void) +{ -+ CSTD_UNUSED(kbdev); ++ return mali_gpu_class_is_mali470; +} + -+static void coarse_demand_term(struct kbase_device *kbdev) ++MALI_STATIC_INLINE mali_bool mali_is_mali450(void) +{ -+ CSTD_UNUSED(kbdev); ++ return mali_gpu_class_is_mali450; +} + -+/* The struct kbase_pm_policy structure for the demand power policy. -+ * -+ * This is the static structure that defines the demand power policy's callback -+ * and name. -+ */ -+const struct kbase_pm_policy kbase_pm_coarse_demand_policy_ops = { -+ "coarse_demand", /* name */ -+ coarse_demand_init, /* init */ -+ coarse_demand_term, /* term */ -+ coarse_demand_get_core_mask, /* get_core_mask */ -+ coarse_demand_get_core_active, /* get_core_active */ -+ 0u, /* flags */ -+ KBASE_PM_POLICY_ID_COARSE_DEMAND, /* id */ -+}; ++MALI_STATIC_INLINE mali_bool mali_is_mali400(void) ++{ ++ if (mali_gpu_class_is_mali450 || mali_gpu_class_is_mali470) ++ return MALI_FALSE; + -+KBASE_EXPORT_TEST_API(kbase_pm_coarse_demand_policy_ops); -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_coarse_demand.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_coarse_demand.h ++ return MALI_TRUE; ++} ++#endif /* __MALI_KERNEL_CORE_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c new file mode 100755 -index 000000000000..749d305eee9a +index 000000000..d1b8dc3b0 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_coarse_demand.h -@@ -0,0 +1,64 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c +@@ -0,0 +1,440 @@ +/* -+ * -+ * (C) COPYRIGHT 2012-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include "mali_kernel_utilization.h" ++#include "mali_osk.h" ++#include "mali_osk_mali.h" ++#include "mali_kernel_common.h" ++#include "mali_session.h" ++#include "mali_scheduler.h" + ++#include "mali_executor.h" ++#include "mali_dvfs_policy.h" ++#include "mali_control_timer.h" + ++/* Thresholds for GP bound detection. */ ++#define MALI_GP_BOUND_GP_UTILIZATION_THRESHOLD 240 ++#define MALI_GP_BOUND_PP_UTILIZATION_THRESHOLD 250 + ++static _mali_osk_spinlock_irq_t *utilization_data_lock; + -+/* -+ * "Coarse Demand" power management policy -+ */ ++static u32 num_running_gp_cores = 0; ++static u32 num_running_pp_cores = 0; + -+#ifndef MALI_KBASE_PM_COARSE_DEMAND_H -+#define MALI_KBASE_PM_COARSE_DEMAND_H ++static u64 work_start_time_gpu = 0; ++static u64 work_start_time_gp = 0; ++static u64 work_start_time_pp = 0; ++static u64 accumulated_work_time_gpu = 0; ++static u64 accumulated_work_time_gp = 0; ++static u64 accumulated_work_time_pp = 0; + -+/** -+ * DOC: -+ * The "Coarse" demand power management policy has the following -+ * characteristics: -+ * - When KBase indicates that the GPU will be powered up, but we don't yet -+ * know which Job Chains are to be run: -+ * - All Shader Cores are powered up, regardless of whether or not they will -+ * be needed later. -+ * - When KBase indicates that a set of Shader Cores are needed to submit the -+ * currently queued Job Chains: -+ * - All Shader Cores are kept powered, regardless of whether or not they will -+ * be needed -+ * - When KBase indicates that the GPU need not be powered: -+ * - The Shader Cores are powered off, and the GPU itself is powered off too. -+ * -+ * @note: -+ * - KBase indicates the GPU will be powered up when it has a User Process that -+ * has just started to submit Job Chains. -+ * - KBase indicates the GPU need not be powered when all the Job Chains from -+ * User Processes have finished, and it is waiting for a User Process to -+ * submit some more Job Chains. -+ */ ++static u32 last_utilization_gpu = 0 ; ++static u32 last_utilization_gp = 0 ; ++static u32 last_utilization_pp = 0 ; + -+/** -+ * struct kbasep_pm_policy_coarse_demand - Private structure for coarse demand -+ * policy -+ * -+ * This contains data that is private to the coarse demand power policy. -+ * -+ * @dummy: Dummy member - no state needed -+ */ -+struct kbasep_pm_policy_coarse_demand { -+ int dummy; -+}; ++void (*mali_utilization_callback)(struct mali_gpu_utilization_data *data) = NULL; + -+extern const struct kbase_pm_policy kbase_pm_coarse_demand_policy_ops; ++/* Define the first timer control timer timeout in milliseconds */ ++static u32 mali_control_first_timeout = 100; ++static struct mali_gpu_utilization_data mali_util_data = {0, }; + -+#endif /* MALI_KBASE_PM_COARSE_DEMAND_H */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_defs.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_defs.h -new file mode 100755 -index 000000000000..564fbda1116a ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_defs.h -@@ -0,0 +1,519 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++struct mali_gpu_utilization_data *mali_utilization_calculate(u64 *start_time, u64 *time_period, mali_bool *need_add_timer) ++{ ++ u64 time_now; ++ u32 leading_zeroes; ++ u32 shift_val; ++ u32 work_normalized_gpu; ++ u32 work_normalized_gp; ++ u32 work_normalized_pp; ++ u32 period_normalized; ++ u32 utilization_gpu; ++ u32 utilization_gp; ++ u32 utilization_pp; + ++ mali_utilization_data_lock(); + ++ time_now = _mali_osk_time_get_ns(); + -+/* -+ * Backend-specific Power Manager definitions -+ */ ++ *time_period = time_now - *start_time; + -+#ifndef _KBASE_PM_HWACCESS_DEFS_H_ -+#define _KBASE_PM_HWACCESS_DEFS_H_ ++ if (accumulated_work_time_gpu == 0 && work_start_time_gpu == 0) { ++ mali_control_timer_pause(); ++ /* ++ * No work done for this period ++ * - No need to reschedule timer ++ * - Report zero usage ++ */ ++ last_utilization_gpu = 0; ++ last_utilization_gp = 0; ++ last_utilization_pp = 0; + -+#include "mali_kbase_pm_ca_fixed.h" -+#include "mali_kbase_pm_ca_devfreq.h" -+#if !MALI_CUSTOMER_RELEASE -+#include "mali_kbase_pm_ca_random.h" -+#endif ++ mali_util_data.utilization_gpu = last_utilization_gpu; ++ mali_util_data.utilization_gp = last_utilization_gp; ++ mali_util_data.utilization_pp = last_utilization_pp; + -+#include "mali_kbase_pm_always_on.h" -+#include "mali_kbase_pm_coarse_demand.h" -+#include "mali_kbase_pm_demand.h" -+#if !MALI_CUSTOMER_RELEASE -+#include "mali_kbase_pm_demand_always_powered.h" -+#include "mali_kbase_pm_fast_start.h" -+#endif ++ mali_utilization_data_unlock(); + -+/* Forward definition - see mali_kbase.h */ -+struct kbase_device; -+struct kbase_jd_atom; ++ *need_add_timer = MALI_FALSE; + -+/** -+ * enum kbase_pm_core_type - The types of core in a GPU. -+ * -+ * These enumerated values are used in calls to -+ * - kbase_pm_get_present_cores() -+ * - kbase_pm_get_active_cores() -+ * - kbase_pm_get_trans_cores() -+ * - kbase_pm_get_ready_cores(). -+ * -+ * They specify which type of core should be acted on. These values are set in -+ * a manner that allows core_type_to_reg() function to be simpler and more -+ * efficient. -+ * -+ * @KBASE_PM_CORE_L2: The L2 cache -+ * @KBASE_PM_CORE_SHADER: Shader cores -+ * @KBASE_PM_CORE_TILER: Tiler cores -+ * @KBASE_PM_CORE_STACK: Core stacks -+ */ -+enum kbase_pm_core_type { -+ KBASE_PM_CORE_L2 = L2_PRESENT_LO, -+ KBASE_PM_CORE_SHADER = SHADER_PRESENT_LO, -+ KBASE_PM_CORE_TILER = TILER_PRESENT_LO, -+ KBASE_PM_CORE_STACK = STACK_PRESENT_LO -+}; ++ mali_executor_hint_disable(MALI_EXECUTOR_HINT_GP_BOUND); + -+/** -+ * struct kbasep_pm_metrics_data - Metrics data collected for use by the power -+ * management framework. -+ * -+ * @time_period_start: time at which busy/idle measurements started -+ * @time_busy: number of ns the GPU was busy executing jobs since the -+ * @time_period_start timestamp. -+ * @time_idle: number of ns since time_period_start the GPU was not executing -+ * jobs since the @time_period_start timestamp. -+ * @prev_busy: busy time in ns of previous time period. -+ * Updated when metrics are reset. -+ * @prev_idle: idle time in ns of previous time period -+ * Updated when metrics are reset. -+ * @gpu_active: true when the GPU is executing jobs. false when -+ * not. Updated when the job scheduler informs us a job in submitted -+ * or removed from a GPU slot. -+ * @busy_cl: number of ns the GPU was busy executing CL jobs. Note that -+ * if two CL jobs were active for 400ns, this value would be updated -+ * with 800. -+ * @busy_gl: number of ns the GPU was busy executing GL jobs. Note that -+ * if two GL jobs were active for 400ns, this value would be updated -+ * with 800. -+ * @active_cl_ctx: number of CL jobs active on the GPU. Array is per-device. -+ * @active_gl_ctx: number of GL jobs active on the GPU. Array is per-slot. As -+ * GL jobs never run on slot 2 this slot is not recorded. -+ * @lock: spinlock protecting the kbasep_pm_metrics_data structure -+ * @timer: timer to regularly make DVFS decisions based on the power -+ * management metrics. -+ * @timer_active: boolean indicating @timer is running -+ * @platform_data: pointer to data controlled by platform specific code -+ * @kbdev: pointer to kbase device for which metrics are collected -+ * -+ */ -+struct kbasep_pm_metrics_data { -+ ktime_t time_period_start; -+ u32 time_busy; -+ u32 time_idle; -+ u32 prev_busy; -+ u32 prev_idle; -+ bool gpu_active; -+ u32 busy_cl[2]; -+ u32 busy_gl; -+ u32 active_cl_ctx[2]; -+ u32 active_gl_ctx[2]; /* GL jobs can only run on 2 of the 3 job slots */ -+ spinlock_t lock; ++ MALI_DEBUG_PRINT(4, ("last_utilization_gpu = %d \n", last_utilization_gpu)); ++ MALI_DEBUG_PRINT(4, ("last_utilization_gp = %d \n", last_utilization_gp)); ++ MALI_DEBUG_PRINT(4, ("last_utilization_pp = %d \n", last_utilization_pp)); + -+#ifdef CONFIG_MALI_BIFROST_DVFS -+ struct hrtimer timer; -+ bool timer_active; -+#endif ++ return &mali_util_data; ++ } + -+ void *platform_data; -+ struct kbase_device *kbdev; -+}; ++ /* If we are currently busy, update working period up to now */ ++ if (work_start_time_gpu != 0) { ++ accumulated_work_time_gpu += (time_now - work_start_time_gpu); ++ work_start_time_gpu = time_now; + -+union kbase_pm_policy_data { -+ struct kbasep_pm_policy_always_on always_on; -+ struct kbasep_pm_policy_coarse_demand coarse_demand; -+ struct kbasep_pm_policy_demand demand; -+#if !MALI_CUSTOMER_RELEASE -+ struct kbasep_pm_policy_demand_always_powered demand_always_powered; -+ struct kbasep_pm_policy_fast_start fast_start; -+#endif -+}; ++ /* GP and/or PP will also be busy if the GPU is busy at this point */ + -+union kbase_pm_ca_policy_data { -+ struct kbasep_pm_ca_policy_fixed fixed; -+ struct kbasep_pm_ca_policy_devfreq devfreq; -+#if !MALI_CUSTOMER_RELEASE -+ struct kbasep_pm_ca_policy_random random; -+#endif -+}; ++ if (work_start_time_gp != 0) { ++ accumulated_work_time_gp += (time_now - work_start_time_gp); ++ work_start_time_gp = time_now; ++ } + -+/** -+ * struct kbase_pm_backend_data - Data stored per device for power management. -+ * -+ * This structure contains data for the power management framework. There is one -+ * instance of this structure per device in the system. -+ * -+ * @ca_current_policy: The policy that is currently actively controlling core -+ * availability. -+ * @pm_current_policy: The policy that is currently actively controlling the -+ * power state. -+ * @ca_policy_data: Private data for current CA policy -+ * @pm_policy_data: Private data for current PM policy -+ * @ca_in_transition: Flag indicating when core availability policy is -+ * transitioning cores. The core availability policy must -+ * set this when a change in core availability is occurring. -+ * power_change_lock must be held when accessing this. -+ * @reset_done: Flag when a reset is complete -+ * @reset_done_wait: Wait queue to wait for changes to @reset_done -+ * @l2_powered_wait: Wait queue for whether the l2 cache has been powered as -+ * requested -+ * @l2_powered: State indicating whether all the l2 caches are powered. -+ * Non-zero indicates they're *all* powered -+ * Zero indicates that some (or all) are not powered -+ * @gpu_cycle_counter_requests: The reference count of active gpu cycle counter -+ * users -+ * @gpu_cycle_counter_requests_lock: Lock to protect @gpu_cycle_counter_requests -+ * @desired_shader_state: A bit mask identifying the shader cores that the -+ * power policy would like to be on. The current state -+ * of the cores may be different, but there should be -+ * transitions in progress that will eventually achieve -+ * this state (assuming that the policy doesn't change -+ * its mind in the mean time). -+ * @powering_on_shader_state: A bit mask indicating which shader cores are -+ * currently in a power-on transition -+ * @desired_tiler_state: A bit mask identifying the tiler cores that the power -+ * policy would like to be on. See @desired_shader_state -+ * @powering_on_tiler_state: A bit mask indicating which tiler core are -+ * currently in a power-on transition -+ * @powering_on_l2_state: A bit mask indicating which l2-caches are currently -+ * in a power-on transition -+ * @powering_on_stack_state: A bit mask indicating which core stacks are -+ * currently in a power-on transition -+ * @gpu_in_desired_state: This flag is set if the GPU is powered as requested -+ * by the desired_xxx_state variables -+ * @gpu_in_desired_state_wait: Wait queue set when @gpu_in_desired_state != 0 -+ * @gpu_powered: Set to true when the GPU is powered and register -+ * accesses are possible, false otherwise -+ * @instr_enabled: Set to true when instrumentation is enabled, -+ * false otherwise -+ * @cg1_disabled: Set if the policy wants to keep the second core group -+ * powered off -+ * @driver_ready_for_irqs: Debug state indicating whether sufficient -+ * initialization of the driver has occurred to handle -+ * IRQs -+ * @gpu_powered_lock: Spinlock that must be held when writing @gpu_powered or -+ * accessing @driver_ready_for_irqs -+ * @metrics: Structure to hold metrics for the GPU -+ * @gpu_poweroff_pending: number of poweroff timer ticks until the GPU is -+ * powered off -+ * @shader_poweroff_pending_time: number of poweroff timer ticks until shaders -+ * and/or timers are powered off -+ * @gpu_poweroff_timer: Timer for powering off GPU -+ * @gpu_poweroff_wq: Workqueue to power off GPU on when timer fires -+ * @gpu_poweroff_work: Workitem used on @gpu_poweroff_wq -+ * @shader_poweroff_pending: Bit mask of shaders to be powered off on next -+ * timer callback -+ * @tiler_poweroff_pending: Bit mask of tilers to be powered off on next timer -+ * callback -+ * @poweroff_timer_needed: true if the poweroff timer is currently required, -+ * false otherwise -+ * @poweroff_timer_running: true if the poweroff timer is currently running, -+ * false otherwise -+ * power_change_lock should be held when accessing, -+ * unless there is no way the timer can be running (eg -+ * hrtimer_cancel() was called immediately before) -+ * @poweroff_wait_in_progress: true if a wait for GPU power off is in progress. -+ * hwaccess_lock must be held when accessing -+ * @poweron_required: true if a GPU power on is required. Should only be set -+ * when poweroff_wait_in_progress is true, and therefore the -+ * GPU can not immediately be powered on. pm.lock must be -+ * held when accessing -+ * @poweroff_is_suspend: true if the GPU is being powered off due to a suspend -+ * request. pm.lock must be held when accessing -+ * @gpu_poweroff_wait_wq: workqueue for waiting for GPU to power off -+ * @gpu_poweroff_wait_work: work item for use with @gpu_poweroff_wait_wq -+ * @poweroff_wait: waitqueue for waiting for @gpu_poweroff_wait_work to complete -+ * @callback_power_on: Callback when the GPU needs to be turned on. See -+ * &struct kbase_pm_callback_conf -+ * @callback_power_off: Callback when the GPU may be turned off. See -+ * &struct kbase_pm_callback_conf -+ * @callback_power_suspend: Callback when a suspend occurs and the GPU needs to -+ * be turned off. See &struct kbase_pm_callback_conf -+ * @callback_power_resume: Callback when a resume occurs and the GPU needs to -+ * be turned on. See &struct kbase_pm_callback_conf -+ * @callback_power_runtime_on: Callback when the GPU needs to be turned on. See -+ * &struct kbase_pm_callback_conf -+ * @callback_power_runtime_off: Callback when the GPU may be turned off. See -+ * &struct kbase_pm_callback_conf -+ * @callback_power_runtime_idle: Optional callback when the GPU may be idle. See -+ * &struct kbase_pm_callback_conf -+ * -+ * Note: -+ * During an IRQ, @ca_current_policy or @pm_current_policy can be NULL when the -+ * policy is being changed with kbase_pm_ca_set_policy() or -+ * kbase_pm_set_policy(). The change is protected under -+ * kbase_device.pm.power_change_lock. Direct access to this -+ * from IRQ context must therefore check for NULL. If NULL, then -+ * kbase_pm_ca_set_policy() or kbase_pm_set_policy() will re-issue the policy -+ * functions that would have been done under IRQ. -+ */ -+struct kbase_pm_backend_data { -+ const struct kbase_pm_ca_policy *ca_current_policy; -+ const struct kbase_pm_policy *pm_current_policy; -+ union kbase_pm_ca_policy_data ca_policy_data; -+ union kbase_pm_policy_data pm_policy_data; -+ bool ca_in_transition; -+ bool reset_done; -+ wait_queue_head_t reset_done_wait; -+ wait_queue_head_t l2_powered_wait; -+ int l2_powered; -+ int gpu_cycle_counter_requests; -+ spinlock_t gpu_cycle_counter_requests_lock; ++ if (work_start_time_pp != 0) { ++ accumulated_work_time_pp += (time_now - work_start_time_pp); ++ work_start_time_pp = time_now; ++ } ++ } + -+ u64 desired_shader_state; -+ u64 powering_on_shader_state; -+ u64 desired_tiler_state; -+ u64 powering_on_tiler_state; -+ u64 powering_on_l2_state; -+#ifdef CONFIG_MALI_CORESTACK -+ u64 powering_on_stack_state; -+#endif /* CONFIG_MALI_CORESTACK */ ++ /* ++ * We have two 64-bit values, a dividend and a divisor. ++ * To avoid dependencies to a 64-bit divider, we shift down the two values ++ * equally first. ++ * We shift the dividend up and possibly the divisor down, making the result X in 256. ++ */ + -+ bool gpu_in_desired_state; -+ wait_queue_head_t gpu_in_desired_state_wait; ++ /* Shift the 64-bit values down so they fit inside a 32-bit integer */ ++ leading_zeroes = _mali_osk_clz((u32)(*time_period >> 32)); ++ shift_val = 32 - leading_zeroes; ++ work_normalized_gpu = (u32)(accumulated_work_time_gpu >> shift_val); ++ work_normalized_gp = (u32)(accumulated_work_time_gp >> shift_val); ++ work_normalized_pp = (u32)(accumulated_work_time_pp >> shift_val); ++ period_normalized = (u32)(*time_period >> shift_val); + -+ bool gpu_powered; ++ /* ++ * Now, we should report the usage in parts of 256 ++ * this means we must shift up the dividend or down the divisor by 8 ++ * (we could do a combination, but we just use one for simplicity, ++ * but the end result should be good enough anyway) ++ */ ++ if (period_normalized > 0x00FFFFFF) { ++ /* The divisor is so big that it is safe to shift it down */ ++ period_normalized >>= 8; ++ } else { ++ /* ++ * The divisor is so small that we can shift up the dividend, without loosing any data. ++ * (dividend is always smaller than the divisor) ++ */ ++ work_normalized_gpu <<= 8; ++ work_normalized_gp <<= 8; ++ work_normalized_pp <<= 8; ++ } + -+ bool instr_enabled; ++ utilization_gpu = work_normalized_gpu / period_normalized; ++ utilization_gp = work_normalized_gp / period_normalized; ++ utilization_pp = work_normalized_pp / period_normalized; + -+ bool cg1_disabled; ++ last_utilization_gpu = utilization_gpu; ++ last_utilization_gp = utilization_gp; ++ last_utilization_pp = utilization_pp; + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ bool driver_ready_for_irqs; -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++ if ((MALI_GP_BOUND_GP_UTILIZATION_THRESHOLD < last_utilization_gp) && ++ (MALI_GP_BOUND_PP_UTILIZATION_THRESHOLD > last_utilization_pp)) { ++ mali_executor_hint_enable(MALI_EXECUTOR_HINT_GP_BOUND); ++ } else { ++ mali_executor_hint_disable(MALI_EXECUTOR_HINT_GP_BOUND); ++ } + -+ spinlock_t gpu_powered_lock; ++ /* starting a new period */ ++ accumulated_work_time_gpu = 0; ++ accumulated_work_time_gp = 0; ++ accumulated_work_time_pp = 0; + ++ *start_time = time_now; + -+ struct kbasep_pm_metrics_data metrics; ++ mali_util_data.utilization_gp = last_utilization_gp; ++ mali_util_data.utilization_gpu = last_utilization_gpu; ++ mali_util_data.utilization_pp = last_utilization_pp; + -+ int gpu_poweroff_pending; -+ int shader_poweroff_pending_time; ++ mali_utilization_data_unlock(); + -+ struct hrtimer gpu_poweroff_timer; -+ struct workqueue_struct *gpu_poweroff_wq; -+ struct work_struct gpu_poweroff_work; ++ *need_add_timer = MALI_TRUE; + -+ u64 shader_poweroff_pending; -+ u64 tiler_poweroff_pending; ++ MALI_DEBUG_PRINT(4, ("last_utilization_gpu = %d \n", last_utilization_gpu)); ++ MALI_DEBUG_PRINT(4, ("last_utilization_gp = %d \n", last_utilization_gp)); ++ MALI_DEBUG_PRINT(4, ("last_utilization_pp = %d \n", last_utilization_pp)); + -+ bool poweroff_timer_needed; -+ bool poweroff_timer_running; ++ return &mali_util_data; ++} + -+ bool poweroff_wait_in_progress; -+ bool poweron_required; -+ bool poweroff_is_suspend; ++_mali_osk_errcode_t mali_utilization_init(void) ++{ ++#if USING_GPU_UTILIZATION ++ _mali_osk_device_data data; + -+ struct workqueue_struct *gpu_poweroff_wait_wq; -+ struct work_struct gpu_poweroff_wait_work; ++ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { ++ if (NULL != data.utilization_callback) { ++ mali_utilization_callback = data.utilization_callback; ++ MALI_DEBUG_PRINT(2, ("Mali GPU Utilization: Utilization handler installed \n")); ++ } ++ } ++#endif /* defined(USING_GPU_UTILIZATION) */ + -+ wait_queue_head_t poweroff_wait; ++ if (NULL == mali_utilization_callback) { ++ MALI_DEBUG_PRINT(2, ("Mali GPU Utilization: No platform utilization handler installed\n")); ++ } + -+ int (*callback_power_on)(struct kbase_device *kbdev); -+ void (*callback_power_off)(struct kbase_device *kbdev); -+ void (*callback_power_suspend)(struct kbase_device *kbdev); -+ void (*callback_power_resume)(struct kbase_device *kbdev); -+ int (*callback_power_runtime_on)(struct kbase_device *kbdev); -+ void (*callback_power_runtime_off)(struct kbase_device *kbdev); -+ int (*callback_power_runtime_idle)(struct kbase_device *kbdev); -+}; ++ utilization_data_lock = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_ORDERED, _MALI_OSK_LOCK_ORDER_UTILIZATION); ++ if (NULL == utilization_data_lock) { ++ return _MALI_OSK_ERR_FAULT; ++ } + ++ num_running_gp_cores = 0; ++ num_running_pp_cores = 0; + -+/* List of policy IDs */ -+enum kbase_pm_policy_id { -+ KBASE_PM_POLICY_ID_DEMAND = 1, -+ KBASE_PM_POLICY_ID_ALWAYS_ON, -+ KBASE_PM_POLICY_ID_COARSE_DEMAND, -+#if !MALI_CUSTOMER_RELEASE -+ KBASE_PM_POLICY_ID_DEMAND_ALWAYS_POWERED, -+ KBASE_PM_POLICY_ID_FAST_START -+#endif -+}; ++ return _MALI_OSK_ERR_OK; ++} + -+typedef u32 kbase_pm_policy_flags; ++void mali_utilization_term(void) ++{ ++ if (NULL != utilization_data_lock) { ++ _mali_osk_spinlock_irq_term(utilization_data_lock); ++ } ++} + -+/** -+ * struct kbase_pm_policy - Power policy structure. -+ * -+ * Each power policy exposes a (static) instance of this structure which -+ * contains function pointers to the policy's methods. -+ * -+ * @name: The name of this policy -+ * @init: Function called when the policy is selected -+ * @term: Function called when the policy is unselected -+ * @get_core_mask: Function called to get the current shader core mask -+ * @get_core_active: Function called to get the current overall GPU power -+ * state -+ * @flags: Field indicating flags for this policy -+ * @id: Field indicating an ID for this policy. This is not -+ * necessarily the same as its index in the list returned -+ * by kbase_pm_list_policies(). -+ * It is used purely for debugging. -+ */ -+struct kbase_pm_policy { -+ char *name; ++void mali_utilization_gp_start(void) ++{ ++ mali_utilization_data_lock(); + -+ /** -+ * Function called when the policy is selected -+ * -+ * This should initialize the kbdev->pm.pm_policy_data structure. It -+ * should not attempt to make any changes to hardware state. -+ * -+ * It is undefined what state the cores are in when the function is -+ * called. -+ * -+ * @kbdev: The kbase device structure for the device (must be a -+ * valid pointer) -+ */ -+ void (*init)(struct kbase_device *kbdev); ++ ++num_running_gp_cores; ++ if (1 == num_running_gp_cores) { ++ u64 time_now = _mali_osk_time_get_ns(); + -+ /** -+ * Function called when the policy is unselected. -+ * -+ * @kbdev: The kbase device structure for the device (must be a -+ * valid pointer) -+ */ -+ void (*term)(struct kbase_device *kbdev); ++ /* First GP core started, consider GP busy from now and onwards */ ++ work_start_time_gp = time_now; + -+ /** -+ * Function called to get the current shader core mask -+ * -+ * The returned mask should meet or exceed (kbdev->shader_needed_bitmap -+ * | kbdev->shader_inuse_bitmap). -+ * -+ * @kbdev: The kbase device structure for the device (must be a -+ * valid pointer) -+ * -+ * Return: The mask of shader cores to be powered -+ */ -+ u64 (*get_core_mask)(struct kbase_device *kbdev); ++ if (0 == num_running_pp_cores) { ++ mali_bool is_resume = MALI_FALSE; ++ /* ++ * There are no PP cores running, so this is also the point ++ * at which we consider the GPU to be busy as well. ++ */ ++ work_start_time_gpu = time_now; + -+ /** -+ * Function called to get the current overall GPU power state -+ * -+ * This function should consider the state of kbdev->pm.active_count. If -+ * this count is greater than 0 then there is at least one active -+ * context on the device and the GPU should be powered. If it is equal -+ * to 0 then there are no active contexts and the GPU could be powered -+ * off if desired. -+ * -+ * @kbdev: The kbase device structure for the device (must be a -+ * valid pointer) -+ * -+ * Return: true if the GPU should be powered, false otherwise -+ */ -+ bool (*get_core_active)(struct kbase_device *kbdev); ++ is_resume = mali_control_timer_resume(time_now); + -+ kbase_pm_policy_flags flags; -+ enum kbase_pm_policy_id id; -+}; ++ mali_utilization_data_unlock(); + ++ if (is_resume) { ++ /* Do some policy in new period for performance consideration */ ++#if defined(CONFIG_MALI_DVFS) ++ /* Clear session->number_of_window_jobs, prepare parameter for dvfs */ ++ mali_session_max_window_num(); ++ if (0 == last_utilization_gpu) { ++ /* ++ * for mali_dev_pause is called in set clock, ++ * so each time we change clock, we will set clock to ++ * highest step even if under down clock case, ++ * it is not nessesary, so we only set the clock under ++ * last time utilization equal 0, we stop the timer then ++ * start the GPU again case ++ */ ++ mali_dvfs_policy_new_period(); ++ } ++#endif ++ /* ++ * First timeout using short interval for power consideration ++ * because we give full power in the new period, but if the ++ * job loading is light, finish in 10ms, the other time all keep ++ * in high freq it will wast time. ++ */ ++ mali_control_timer_add(mali_control_first_timeout); ++ } ++ } else { ++ mali_utilization_data_unlock(); ++ } + -+enum kbase_pm_ca_policy_id { -+ KBASE_PM_CA_POLICY_ID_FIXED = 1, -+ KBASE_PM_CA_POLICY_ID_DEVFREQ, -+ KBASE_PM_CA_POLICY_ID_RANDOM -+}; ++ } else { ++ /* Nothing to do */ ++ mali_utilization_data_unlock(); ++ } ++} + -+typedef u32 kbase_pm_ca_policy_flags; ++void mali_utilization_pp_start(void) ++{ ++ mali_utilization_data_lock(); + -+/** -+ * Maximum length of a CA policy names -+ */ -+#define KBASE_PM_CA_MAX_POLICY_NAME_LEN 15 ++ ++num_running_pp_cores; ++ if (1 == num_running_pp_cores) { ++ u64 time_now = _mali_osk_time_get_ns(); + -+/** -+ * struct kbase_pm_ca_policy - Core availability policy structure. -+ * -+ * Each core availability policy exposes a (static) instance of this structure -+ * which contains function pointers to the policy's methods. -+ * -+ * @name: The name of this policy -+ * @init: Function called when the policy is selected -+ * @term: Function called when the policy is unselected -+ * @get_core_mask: Function called to get the current shader core -+ * availability mask -+ * @update_core_status: Function called to update the current core status -+ * @flags: Field indicating flags for this policy -+ * @id: Field indicating an ID for this policy. This is not -+ * necessarily the same as its index in the list returned -+ * by kbase_pm_list_policies(). -+ * It is used purely for debugging. -+ */ -+struct kbase_pm_ca_policy { -+ char name[KBASE_PM_CA_MAX_POLICY_NAME_LEN + 1]; ++ /* First PP core started, consider PP busy from now and onwards */ ++ work_start_time_pp = time_now; + -+ /** -+ * Function called when the policy is selected -+ * -+ * This should initialize the kbdev->pm.ca_policy_data structure. It -+ * should not attempt to make any changes to hardware state. -+ * -+ * It is undefined what state the cores are in when the function is -+ * called. -+ * -+ * @kbdev The kbase device structure for the device (must be a -+ * valid pointer) -+ */ -+ void (*init)(struct kbase_device *kbdev); ++ if (0 == num_running_gp_cores) { ++ mali_bool is_resume = MALI_FALSE; ++ /* ++ * There are no GP cores running, so this is also the point ++ * at which we consider the GPU to be busy as well. ++ */ ++ work_start_time_gpu = time_now; + -+ /** -+ * Function called when the policy is unselected. -+ * -+ * @kbdev The kbase device structure for the device (must be a -+ * valid pointer) -+ */ -+ void (*term)(struct kbase_device *kbdev); ++ /* Start a new period if stoped */ ++ is_resume = mali_control_timer_resume(time_now); + -+ /** -+ * Function called to get the current shader core availability mask -+ * -+ * When a change in core availability is occurring, the policy must set -+ * kbdev->pm.ca_in_transition to true. This is to indicate that -+ * reporting changes in power state cannot be optimized out, even if -+ * kbdev->pm.desired_shader_state remains unchanged. This must be done -+ * by any functions internal to the Core Availability Policy that change -+ * the return value of kbase_pm_ca_policy::get_core_mask. -+ * -+ * @kbdev The kbase device structure for the device (must be a -+ * valid pointer) -+ * -+ * Return: The current core availability mask -+ */ -+ u64 (*get_core_mask)(struct kbase_device *kbdev); ++ mali_utilization_data_unlock(); + -+ /** -+ * Function called to update the current core status -+ * -+ * If none of the cores in core group 0 are ready or transitioning, then -+ * the policy must ensure that the next call to get_core_mask does not -+ * return 0 for all cores in core group 0. It is an error to disable -+ * core group 0 through the core availability policy. -+ * -+ * When a change in core availability has finished, the policy must set -+ * kbdev->pm.ca_in_transition to false. This is to indicate that -+ * changes in power state can once again be optimized out when -+ * kbdev->pm.desired_shader_state is unchanged. -+ * -+ * @kbdev: The kbase device structure for the device -+ * (must be a valid pointer) -+ * @cores_ready: The mask of cores currently powered and -+ * ready to run jobs -+ * @cores_transitioning: The mask of cores currently transitioning -+ * power state -+ */ -+ void (*update_core_status)(struct kbase_device *kbdev, u64 cores_ready, -+ u64 cores_transitioning); ++ if (is_resume) { ++#if defined(CONFIG_MALI_DVFS) ++ /* Clear session->number_of_window_jobs, prepare parameter for dvfs */ ++ mali_session_max_window_num(); ++ if (0 == last_utilization_gpu) { ++ /* ++ * for mali_dev_pause is called in set clock, ++ * so each time we change clock, we will set clock to ++ * highest step even if under down clock case, ++ * it is not nessesary, so we only set the clock under ++ * last time utilization equal 0, we stop the timer then ++ * start the GPU again case ++ */ ++ mali_dvfs_policy_new_period(); ++ } ++#endif + -+ kbase_pm_ca_policy_flags flags; ++ /* ++ * First timeout using short interval for power consideration ++ * because we give full power in the new period, but if the ++ * job loading is light, finish in 10ms, the other time all keep ++ * in high freq it will wast time. ++ */ ++ mali_control_timer_add(mali_control_first_timeout); ++ } ++ } else { ++ mali_utilization_data_unlock(); ++ } ++ } else { ++ /* Nothing to do */ ++ mali_utilization_data_unlock(); ++ } ++} + -+ /** -+ * Field indicating an ID for this policy. This is not necessarily the -+ * same as its index in the list returned by kbase_pm_list_policies(). -+ * It is used purely for debugging. -+ */ -+ enum kbase_pm_ca_policy_id id; -+}; ++void mali_utilization_gp_end(void) ++{ ++ mali_utilization_data_lock(); + -+#endif /* _KBASE_PM_HWACCESS_DEFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_demand.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_demand.c -new file mode 100755 -index 000000000000..81322fd0dd17 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_demand.c -@@ -0,0 +1,73 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ --num_running_gp_cores; ++ if (0 == num_running_gp_cores) { ++ u64 time_now = _mali_osk_time_get_ns(); + ++ /* Last GP core ended, consider GP idle from now and onwards */ ++ accumulated_work_time_gp += (time_now - work_start_time_gp); ++ work_start_time_gp = 0; + ++ if (0 == num_running_pp_cores) { ++ /* ++ * There are no PP cores running, so this is also the point ++ * at which we consider the GPU to be idle as well. ++ */ ++ accumulated_work_time_gpu += (time_now - work_start_time_gpu); ++ work_start_time_gpu = 0; ++ } ++ } + ++ mali_utilization_data_unlock(); ++} + ++void mali_utilization_pp_end(void) ++{ ++ mali_utilization_data_lock(); + -+/* -+ * A simple demand based power management policy -+ */ ++ --num_running_pp_cores; ++ if (0 == num_running_pp_cores) { ++ u64 time_now = _mali_osk_time_get_ns(); + -+#include -+#include ++ /* Last PP core ended, consider PP idle from now and onwards */ ++ accumulated_work_time_pp += (time_now - work_start_time_pp); ++ work_start_time_pp = 0; + -+static u64 demand_get_core_mask(struct kbase_device *kbdev) ++ if (0 == num_running_gp_cores) { ++ /* ++ * There are no GP cores running, so this is also the point ++ * at which we consider the GPU to be idle as well. ++ */ ++ accumulated_work_time_gpu += (time_now - work_start_time_gpu); ++ work_start_time_gpu = 0; ++ } ++ } ++ ++ mali_utilization_data_unlock(); ++} ++ ++mali_bool mali_utilization_enabled(void) +{ -+ u64 desired = kbdev->shader_needed_bitmap | kbdev->shader_inuse_bitmap; ++#if defined(CONFIG_MALI_DVFS) ++ return mali_dvfs_policy_enabled(); ++#else ++ return (NULL != mali_utilization_callback); ++#endif /* defined(CONFIG_MALI_DVFS) */ ++} + -+ if (0 == kbdev->pm.active_count) -+ return 0; ++void mali_utilization_platform_realize(struct mali_gpu_utilization_data *util_data) ++{ ++ MALI_DEBUG_ASSERT_POINTER(mali_utilization_callback); + -+ return desired; ++ mali_utilization_callback(util_data); +} + -+static bool demand_get_core_active(struct kbase_device *kbdev) ++void mali_utilization_reset(void) +{ -+ if (0 == kbdev->pm.active_count && !(kbdev->shader_needed_bitmap | -+ kbdev->shader_inuse_bitmap) && !kbdev->tiler_needed_cnt -+ && !kbdev->tiler_inuse_cnt) -+ return false; ++ accumulated_work_time_gpu = 0; ++ accumulated_work_time_gp = 0; ++ accumulated_work_time_pp = 0; + -+ return true; ++ last_utilization_gpu = 0; ++ last_utilization_gp = 0; ++ last_utilization_pp = 0; +} + -+static void demand_init(struct kbase_device *kbdev) ++void mali_utilization_data_lock(void) +{ -+ CSTD_UNUSED(kbdev); ++ _mali_osk_spinlock_irq_lock(utilization_data_lock); +} + -+static void demand_term(struct kbase_device *kbdev) ++void mali_utilization_data_unlock(void) +{ -+ CSTD_UNUSED(kbdev); ++ _mali_osk_spinlock_irq_unlock(utilization_data_lock); +} + -+/* -+ * The struct kbase_pm_policy structure for the demand power policy. -+ * -+ * This is the static structure that defines the demand power policy's callback -+ * and name. -+ */ -+const struct kbase_pm_policy kbase_pm_demand_policy_ops = { -+ "demand", /* name */ -+ demand_init, /* init */ -+ demand_term, /* term */ -+ demand_get_core_mask, /* get_core_mask */ -+ demand_get_core_active, /* get_core_active */ -+ 0u, /* flags */ -+ KBASE_PM_POLICY_ID_DEMAND, /* id */ -+}; ++void mali_utilization_data_assert_locked(void) ++{ ++ MALI_DEBUG_ASSERT_LOCK_HELD(utilization_data_lock); ++} + -+KBASE_EXPORT_TEST_API(kbase_pm_demand_policy_ops); -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_demand.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_demand.h ++u32 _mali_ukk_utilization_gp_pp(void) ++{ ++ return last_utilization_gpu; ++} ++ ++u32 _mali_ukk_utilization_gp(void) ++{ ++ return last_utilization_gp; ++} ++ ++u32 _mali_ukk_utilization_pp(void) ++{ ++ return last_utilization_pp; ++} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h new file mode 100755 -index 000000000000..c0c84b6e9189 +index 000000000..06f585dcb --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_demand.h -@@ -0,0 +1,64 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h +@@ -0,0 +1,72 @@ +/* -+ * -+ * (C) COPYRIGHT 2011-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_KERNEL_UTILIZATION_H__ ++#define __MALI_KERNEL_UTILIZATION_H__ + ++#include ++#include "mali_osk.h" + ++/** ++ * Initialize/start the Mali GPU utilization metrics reporting. ++ * ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ */ ++_mali_osk_errcode_t mali_utilization_init(void); + -+ -+/* -+ * A simple demand based power management policy ++/** ++ * Terminate the Mali GPU utilization metrics reporting + */ ++void mali_utilization_term(void); + -+#ifndef MALI_KBASE_PM_DEMAND_H -+#define MALI_KBASE_PM_DEMAND_H ++/** ++ * Check if Mali utilization is enabled ++ */ ++mali_bool mali_utilization_enabled(void); + +/** -+ * DOC: Demand power management policy -+ * -+ * The demand power management policy has the following characteristics: -+ * - When KBase indicates that the GPU will be powered up, but we don't yet -+ * know which Job Chains are to be run: -+ * - The Shader Cores are not powered up -+ * -+ * - When KBase indicates that a set of Shader Cores are needed to submit the -+ * currently queued Job Chains: -+ * - Only those Shader Cores are powered up -+ * -+ * - When KBase indicates that the GPU need not be powered: -+ * - The Shader Cores are powered off, and the GPU itself is powered off too. -+ * -+ * Note: -+ * - KBase indicates the GPU will be powered up when it has a User Process that -+ * has just started to submit Job Chains. -+ * -+ * - KBase indicates the GPU need not be powered when all the Job Chains from -+ * User Processes have finished, and it is waiting for a User Process to -+ * submit some more Job Chains. ++ * Should be called when a job is about to execute a GP job + */ ++void mali_utilization_gp_start(void); + +/** -+ * struct kbasep_pm_policy_demand - Private structure for policy instance data -+ * -+ * @dummy: No state is needed, a dummy variable -+ * -+ * This contains data that is private to the demand power policy. ++ * Should be called when a job has completed executing a GP job + */ -+struct kbasep_pm_policy_demand { -+ int dummy; -+}; ++void mali_utilization_gp_end(void); + -+extern const struct kbase_pm_policy kbase_pm_demand_policy_ops; ++/** ++ * Should be called when a job is about to execute a PP job ++ */ ++void mali_utilization_pp_start(void); + -+#endif /* MALI_KBASE_PM_DEMAND_H */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_driver.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_driver.c -new file mode 100755 -index 000000000000..707f71a79a77 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_driver.c -@@ -0,0 +1,1672 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++/** ++ * Should be called when a job has completed executing a PP job + */ ++void mali_utilization_pp_end(void); + ++/** ++ * Should be called to calcution the GPU utilization ++ */ ++struct mali_gpu_utilization_data *mali_utilization_calculate(u64 *start_time, u64 *time_period, mali_bool *need_add_timer); + ++_mali_osk_spinlock_irq_t *mali_utilization_get_lock(void); + ++void mali_utilization_platform_realize(struct mali_gpu_utilization_data *util_data); + ++void mali_utilization_data_lock(void); + -+/* -+ * Base kernel Power Management hardware control -+ */ ++void mali_utilization_data_unlock(void); + -+#include -+#include -+#include -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++void mali_utilization_data_assert_locked(void); + -+#include ++void mali_utilization_reset(void); + -+#if MALI_MOCK_TEST -+#define MOCKABLE(function) function##_original -+#else -+#define MOCKABLE(function) function -+#endif /* MALI_MOCK_TEST */ + -+/** -+ * enum kbasep_pm_action - Actions that can be performed on a core. -+ * -+ * This enumeration is private to the file. Its values are set to allow -+ * core_type_to_reg() function, which decodes this enumeration, to be simpler -+ * and more efficient. -+ * -+ * @ACTION_PRESENT: The cores that are present -+ * @ACTION_READY: The cores that are ready -+ * @ACTION_PWRON: Power on the cores specified -+ * @ACTION_PWROFF: Power off the cores specified -+ * @ACTION_PWRTRANS: The cores that are transitioning -+ * @ACTION_PWRACTIVE: The cores that are active ++#endif /* __MALI_KERNEL_UTILIZATION_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c +new file mode 100755 +index 000000000..dd44e5e7f +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c +@@ -0,0 +1,45 @@ ++/* ++ * Copyright (C) 2011-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+enum kbasep_pm_action { -+ ACTION_PRESENT = 0, -+ ACTION_READY = (SHADER_READY_LO - SHADER_PRESENT_LO), -+ ACTION_PWRON = (SHADER_PWRON_LO - SHADER_PRESENT_LO), -+ ACTION_PWROFF = (SHADER_PWROFF_LO - SHADER_PRESENT_LO), -+ ACTION_PWRTRANS = (SHADER_PWRTRANS_LO - SHADER_PRESENT_LO), -+ ACTION_PWRACTIVE = (SHADER_PWRACTIVE_LO - SHADER_PRESENT_LO) -+}; -+ -+static u64 kbase_pm_get_state( -+ struct kbase_device *kbdev, -+ enum kbase_pm_core_type core_type, -+ enum kbasep_pm_action action); + -+/** -+ * core_type_to_reg - Decode a core type and action to a register. -+ * -+ * Given a core type (defined by kbase_pm_core_type) and an action (defined -+ * by kbasep_pm_action) this function will return the register offset that -+ * will perform the action on the core type. The register returned is the _LO -+ * register and an offset must be applied to use the _HI register. -+ * -+ * @core_type: The type of core -+ * @action: The type of action -+ * -+ * Return: The register offset of the _LO register that performs an action of -+ * type @action on a core of type @core_type. -+ */ -+static u32 core_type_to_reg(enum kbase_pm_core_type core_type, -+ enum kbasep_pm_action action) -+{ -+#ifdef CONFIG_MALI_CORESTACK -+ if (core_type == KBASE_PM_CORE_STACK) { -+ switch (action) { -+ case ACTION_PRESENT: -+ return STACK_PRESENT_LO; -+ case ACTION_READY: -+ return STACK_READY_LO; -+ case ACTION_PWRON: -+ return STACK_PWRON_LO; -+ case ACTION_PWROFF: -+ return STACK_PWROFF_LO; -+ case ACTION_PWRTRANS: -+ return STACK_PWRTRANS_LO; -+ default: -+ BUG(); -+ } -+ } -+#endif /* CONFIG_MALI_CORESTACK */ ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_ukk.h" + -+ return (u32)core_type + (u32)action; -+} ++#include "mali_osk_profiling.h" + -+#ifdef CONFIG_ARM64 -+static void mali_cci_flush_l2(struct kbase_device *kbdev) ++_mali_osk_errcode_t _mali_ukk_vsync_event_report(_mali_uk_vsync_event_report_s *args) +{ -+ const u32 mask = CLEAN_CACHES_COMPLETED | RESET_COMPLETED; -+ u32 loops = KBASE_CLEAN_CACHE_MAX_LOOPS; -+ u32 raw; ++ _mali_uk_vsync_event event = (_mali_uk_vsync_event)args->event; ++ MALI_IGNORE(event); /* event is not used for release code, and that is OK */ + + /* -+ * Note that we don't take the cache flush mutex here since -+ * we expect to be the last user of the L2, all other L2 users -+ * would have dropped their references, to initiate L2 power -+ * down, L2 power down being the only valid place for this -+ * to be called from. ++ * Manually generate user space events in kernel space. ++ * This saves user space from calling kernel space twice in this case. ++ * We just need to remember to add pid and tid manually. + */ ++ if (event == _MALI_UK_VSYNC_EVENT_BEGIN_WAIT) { ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SUSPEND | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_VSYNC, ++ _mali_osk_get_pid(), _mali_osk_get_tid(), 0, 0, 0); ++ } + -+ kbase_reg_write(kbdev, -+ GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_CLEAN_INV_CACHES, -+ NULL); ++ if (event == _MALI_UK_VSYNC_EVENT_END_WAIT) { ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_RESUME | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_VSYNC, ++ _mali_osk_get_pid(), _mali_osk_get_tid(), 0, 0, 0); ++ } + -+ raw = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(GPU_IRQ_RAWSTAT), -+ NULL); + -+ /* Wait for cache flush to complete before continuing, exit on -+ * gpu resets or loop expiry. */ -+ while (((raw & mask) == 0) && --loops) { -+ raw = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(GPU_IRQ_RAWSTAT), -+ NULL); -+ } ++ MALI_DEBUG_PRINT(4, ("Received VSYNC event: %d\n", event)); ++ MALI_SUCCESS; +} -+#endif + -+/** -+ * kbase_pm_invoke - Invokes an action on a core set -+ * -+ * This function performs the action given by @action on a set of cores of a -+ * type given by @core_type. It is a static function used by -+ * kbase_pm_transition_core_type() -+ * -+ * @kbdev: The kbase device structure of the device -+ * @core_type: The type of core that the action should be performed on -+ * @cores: A bit mask of cores to perform the action on (low 32 bits) -+ * @action: The action to perform on the cores +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c +new file mode 100755 +index 000000000..fe33f561b +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c +@@ -0,0 +1,534 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+static void kbase_pm_invoke(struct kbase_device *kbdev, -+ enum kbase_pm_core_type core_type, -+ u64 cores, -+ enum kbasep_pm_action action) -+{ -+ u32 reg; -+ u32 lo = cores & 0xFFFFFFFF; -+ u32 hi = (cores >> 32) & 0xFFFFFFFF; ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_l2_cache.h" ++#include "mali_hw_core.h" ++#include "mali_scheduler.h" ++#include "mali_pm.h" ++#include "mali_pm_domain.h" + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++/** ++ * Size of the Mali L2 cache registers in bytes ++ */ ++#define MALI400_L2_CACHE_REGISTERS_SIZE 0x30 + -+ reg = core_type_to_reg(core_type, action); ++/** ++ * Mali L2 cache register numbers ++ * Used in the register read/write routines. ++ * See the hardware documentation for more information about each register ++ */ ++typedef enum mali_l2_cache_register { ++ MALI400_L2_CACHE_REGISTER_SIZE = 0x0004, ++ MALI400_L2_CACHE_REGISTER_STATUS = 0x0008, ++ /*unused = 0x000C */ ++ MALI400_L2_CACHE_REGISTER_COMMAND = 0x0010, ++ MALI400_L2_CACHE_REGISTER_CLEAR_PAGE = 0x0014, ++ MALI400_L2_CACHE_REGISTER_MAX_READS = 0x0018, ++ MALI400_L2_CACHE_REGISTER_ENABLE = 0x001C, ++ MALI400_L2_CACHE_REGISTER_PERFCNT_SRC0 = 0x0020, ++ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL0 = 0x0024, ++ MALI400_L2_CACHE_REGISTER_PERFCNT_SRC1 = 0x0028, ++ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL1 = 0x002C, ++} mali_l2_cache_register; + -+ KBASE_DEBUG_ASSERT(reg); -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+ if (cores) { -+ if (action == ACTION_PWRON) -+ kbase_trace_mali_pm_power_on(core_type, cores); -+ else if (action == ACTION_PWROFF) -+ kbase_trace_mali_pm_power_off(core_type, cores); -+ } -+#endif ++/** ++ * Mali L2 cache commands ++ * These are the commands that can be sent to the Mali L2 cache unit ++ */ ++typedef enum mali_l2_cache_command { ++ MALI400_L2_CACHE_COMMAND_CLEAR_ALL = 0x01, ++} mali_l2_cache_command; + -+ if (cores) { -+ u64 state = kbase_pm_get_state(kbdev, core_type, ACTION_READY); -+ -+ if (action == ACTION_PWRON) -+ state |= cores; -+ else if (action == ACTION_PWROFF) -+ state &= ~cores; -+ KBASE_TLSTREAM_AUX_PM_STATE(core_type, state); -+ } -+ -+ /* Tracing */ -+ if (cores) { -+ if (action == ACTION_PWRON) -+ switch (core_type) { -+ case KBASE_PM_CORE_SHADER: -+ KBASE_TRACE_ADD(kbdev, PM_PWRON, NULL, NULL, 0u, -+ lo); -+ break; -+ case KBASE_PM_CORE_TILER: -+ KBASE_TRACE_ADD(kbdev, PM_PWRON_TILER, NULL, -+ NULL, 0u, lo); -+ break; -+ case KBASE_PM_CORE_L2: -+ KBASE_TRACE_ADD(kbdev, PM_PWRON_L2, NULL, NULL, -+ 0u, lo); -+ break; -+ default: -+ break; -+ } -+ else if (action == ACTION_PWROFF) -+ switch (core_type) { -+ case KBASE_PM_CORE_SHADER: -+ KBASE_TRACE_ADD(kbdev, PM_PWROFF, NULL, NULL, -+ 0u, lo); -+ break; -+ case KBASE_PM_CORE_TILER: -+ KBASE_TRACE_ADD(kbdev, PM_PWROFF_TILER, NULL, -+ NULL, 0u, lo); -+ break; -+ case KBASE_PM_CORE_L2: -+ KBASE_TRACE_ADD(kbdev, PM_PWROFF_L2, NULL, NULL, -+ 0u, lo); -+ /* disable snoops before L2 is turned off */ -+ kbase_pm_cache_snoop_disable(kbdev); -+ break; -+ default: -+ break; -+ } -+ } -+ -+ if (lo != 0) -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(reg), lo, NULL); -+ -+ if (hi != 0) -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(reg + 4), hi, NULL); -+} ++/** ++ * Mali L2 cache commands ++ * These are the commands that can be sent to the Mali L2 cache unit ++ */ ++typedef enum mali_l2_cache_enable { ++ MALI400_L2_CACHE_ENABLE_DEFAULT = 0x0, /* Default */ ++ MALI400_L2_CACHE_ENABLE_ACCESS = 0x01, ++ MALI400_L2_CACHE_ENABLE_READ_ALLOCATE = 0x02, ++} mali_l2_cache_enable; + +/** -+ * kbase_pm_get_state - Get information about a core set -+ * -+ * This function gets information (chosen by @action) about a set of cores of -+ * a type given by @core_type. It is a static function used by -+ * kbase_pm_get_active_cores(), kbase_pm_get_trans_cores() and -+ * kbase_pm_get_ready_cores(). -+ * -+ * @kbdev: The kbase device structure of the device -+ * @core_type: The type of core that the should be queried -+ * @action: The property of the cores to query -+ * -+ * Return: A bit mask specifying the state of the cores ++ * Mali L2 cache status bits + */ -+static u64 kbase_pm_get_state(struct kbase_device *kbdev, -+ enum kbase_pm_core_type core_type, -+ enum kbasep_pm_action action) -+{ -+ u32 reg; -+ u32 lo, hi; -+ -+ reg = core_type_to_reg(core_type, action); -+ -+ KBASE_DEBUG_ASSERT(reg); -+ -+ lo = kbase_reg_read(kbdev, GPU_CONTROL_REG(reg), NULL); -+ hi = kbase_reg_read(kbdev, GPU_CONTROL_REG(reg + 4), NULL); ++typedef enum mali_l2_cache_status { ++ MALI400_L2_CACHE_STATUS_COMMAND_BUSY = 0x01, ++ MALI400_L2_CACHE_STATUS_DATA_BUSY = 0x02, ++} mali_l2_cache_status; + -+ return (((u64) hi) << 32) | ((u64) lo); -+} ++#define MALI400_L2_MAX_READS_NOT_SET -1 + -+void kbasep_pm_init_core_use_bitmaps(struct kbase_device *kbdev) -+{ -+ kbdev->shader_inuse_bitmap = 0; -+ kbdev->shader_needed_bitmap = 0; -+ kbdev->shader_available_bitmap = 0; -+ kbdev->tiler_available_bitmap = 0; -+ kbdev->l2_users_count = 0; -+ kbdev->l2_available_bitmap = 0; -+ kbdev->tiler_needed_cnt = 0; -+ kbdev->tiler_inuse_cnt = 0; ++static struct mali_l2_cache_core * ++ mali_global_l2s[MALI_MAX_NUMBER_OF_L2_CACHE_CORES] = { NULL, }; ++static u32 mali_global_num_l2s = 0; + -+ memset(kbdev->shader_needed_cnt, 0, sizeof(kbdev->shader_needed_cnt)); -+} ++int mali_l2_max_reads = MALI400_L2_MAX_READS_NOT_SET; + -+/** -+ * kbase_pm_get_present_cores - Get the cores that are present -+ * -+ * @kbdev: Kbase device -+ * @type: The type of cores to query -+ * -+ * Return: Bitmask of the cores that are present -+ */ -+u64 kbase_pm_get_present_cores(struct kbase_device *kbdev, -+ enum kbase_pm_core_type type) -+{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ switch (type) { -+ case KBASE_PM_CORE_L2: -+ return kbdev->gpu_props.props.raw_props.l2_present; -+ case KBASE_PM_CORE_SHADER: -+ return kbdev->gpu_props.props.raw_props.shader_present; -+ case KBASE_PM_CORE_TILER: -+ return kbdev->gpu_props.props.raw_props.tiler_present; -+#ifdef CONFIG_MALI_CORESTACK -+ case KBASE_PM_CORE_STACK: -+ return kbdev->gpu_props.props.raw_props.stack_present; -+#endif /* CONFIG_MALI_CORESTACK */ -+ default: -+ break; -+ } -+ KBASE_DEBUG_ASSERT(0); ++/* Local helper functions */ + -+ return 0; -+} ++static void mali_l2_cache_reset(struct mali_l2_cache_core *cache); + -+KBASE_EXPORT_TEST_API(kbase_pm_get_present_cores); ++static _mali_osk_errcode_t mali_l2_cache_send_command( ++ struct mali_l2_cache_core *cache, u32 reg, u32 val); + -+/** -+ * kbase_pm_get_active_cores - Get the cores that are "active" -+ * (busy processing work) -+ * -+ * @kbdev: Kbase device -+ * @type: The type of cores to query -+ * -+ * Return: Bitmask of cores that are active -+ */ -+u64 kbase_pm_get_active_cores(struct kbase_device *kbdev, -+ enum kbase_pm_core_type type) ++static void mali_l2_cache_lock(struct mali_l2_cache_core *cache) +{ -+ return kbase_pm_get_state(kbdev, type, ACTION_PWRACTIVE); ++ MALI_DEBUG_ASSERT_POINTER(cache); ++ _mali_osk_spinlock_irq_lock(cache->lock); +} + -+KBASE_EXPORT_TEST_API(kbase_pm_get_active_cores); -+ -+/** -+ * kbase_pm_get_trans_cores - Get the cores that are transitioning between -+ * power states -+ * -+ * @kbdev: Kbase device -+ * @type: The type of cores to query -+ * -+ * Return: Bitmask of cores that are transitioning -+ */ -+u64 kbase_pm_get_trans_cores(struct kbase_device *kbdev, -+ enum kbase_pm_core_type type) ++static void mali_l2_cache_unlock(struct mali_l2_cache_core *cache) +{ -+ return kbase_pm_get_state(kbdev, type, ACTION_PWRTRANS); ++ MALI_DEBUG_ASSERT_POINTER(cache); ++ _mali_osk_spinlock_irq_unlock(cache->lock); +} + -+KBASE_EXPORT_TEST_API(kbase_pm_get_trans_cores); ++/* Implementation of the L2 cache interface */ + -+/** -+ * kbase_pm_get_ready_cores - Get the cores that are powered on -+ * -+ * @kbdev: Kbase device -+ * @type: The type of cores to query -+ * -+ * Return: Bitmask of cores that are ready (powered on) -+ */ -+u64 kbase_pm_get_ready_cores(struct kbase_device *kbdev, -+ enum kbase_pm_core_type type) ++struct mali_l2_cache_core *mali_l2_cache_create( ++ _mali_osk_resource_t *resource, u32 domain_index) +{ -+ u64 result; ++ struct mali_l2_cache_core *cache = NULL; ++#if defined(DEBUG) ++ u32 cache_size; ++#endif + -+ result = kbase_pm_get_state(kbdev, type, ACTION_READY); ++ MALI_DEBUG_PRINT(4, ("Mali L2 cache: Creating Mali L2 cache: %s\n", ++ resource->description)); + -+ switch (type) { -+ case KBASE_PM_CORE_SHADER: -+ KBASE_TRACE_ADD(kbdev, PM_CORES_POWERED, NULL, NULL, 0u, -+ (u32) result); -+ break; -+ case KBASE_PM_CORE_TILER: -+ KBASE_TRACE_ADD(kbdev, PM_CORES_POWERED_TILER, NULL, NULL, 0u, -+ (u32) result); -+ break; -+ case KBASE_PM_CORE_L2: -+ KBASE_TRACE_ADD(kbdev, PM_CORES_POWERED_L2, NULL, NULL, 0u, -+ (u32) result); -+ break; -+ default: -+ break; ++ if (mali_global_num_l2s >= MALI_MAX_NUMBER_OF_L2_CACHE_CORES) { ++ MALI_PRINT_ERROR(("Mali L2 cache: Too many L2 caches\n")); ++ return NULL; + } + -+ return result; -+} -+ -+KBASE_EXPORT_TEST_API(kbase_pm_get_ready_cores); -+ -+/** -+ * kbase_pm_transition_core_type - Perform power transitions for a particular -+ * core type. -+ * -+ * This function will perform any available power transitions to make the actual -+ * hardware state closer to the desired state. If a core is currently -+ * transitioning then changes to the power state of that call cannot be made -+ * until the transition has finished. Cores which are not present in the -+ * hardware are ignored if they are specified in the desired_state bitmask, -+ * however the return value will always be 0 in this case. -+ * -+ * @kbdev: The kbase device -+ * @type: The core type to perform transitions for -+ * @desired_state: A bit mask of the desired state of the cores -+ * @in_use: A bit mask of the cores that are currently running -+ * jobs. These cores have to be kept powered up because -+ * there are jobs running (or about to run) on them. -+ * @available: Receives a bit mask of the cores that the job -+ * scheduler can use to submit jobs to. May be NULL if -+ * this is not needed. -+ * @powering_on: Bit mask to update with cores that are -+ * transitioning to a power-on state. -+ * -+ * Return: true if the desired state has been reached, false otherwise -+ */ -+static bool kbase_pm_transition_core_type(struct kbase_device *kbdev, -+ enum kbase_pm_core_type type, -+ u64 desired_state, -+ u64 in_use, -+ u64 * const available, -+ u64 *powering_on) -+{ -+ u64 present; -+ u64 ready; -+ u64 trans; -+ u64 powerup; -+ u64 powerdown; -+ u64 powering_on_trans; -+ u64 desired_state_in_use; -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ /* Get current state */ -+ present = kbase_pm_get_present_cores(kbdev, type); -+ trans = kbase_pm_get_trans_cores(kbdev, type); -+ ready = kbase_pm_get_ready_cores(kbdev, type); -+ /* mask off ready from trans in case transitions finished between the -+ * register reads */ -+ trans &= ~ready; -+ -+ if (trans) /* Do not progress if any cores are transitioning */ -+ return false; ++ cache = _mali_osk_malloc(sizeof(struct mali_l2_cache_core)); ++ if (NULL == cache) { ++ MALI_PRINT_ERROR(("Mali L2 cache: Failed to allocate memory for L2 cache core\n")); ++ return NULL; ++ } + -+ powering_on_trans = trans & *powering_on; -+ *powering_on = powering_on_trans; ++ cache->core_id = mali_global_num_l2s; ++ cache->counter_src0 = MALI_HW_CORE_NO_COUNTER; ++ cache->counter_src1 = MALI_HW_CORE_NO_COUNTER; ++ cache->counter_value0_base = 0; ++ cache->counter_value1_base = 0; ++ cache->pm_domain = NULL; ++ cache->power_is_on = MALI_FALSE; ++ cache->last_invalidated_id = 0; + -+ if (available != NULL) -+ *available = (ready | powering_on_trans) & desired_state; ++ if (_MALI_OSK_ERR_OK != mali_hw_core_create(&cache->hw_core, ++ resource, MALI400_L2_CACHE_REGISTERS_SIZE)) { ++ _mali_osk_free(cache); ++ return NULL; ++ } + -+ /* Update desired state to include the in-use cores. These have to be -+ * kept powered up because there are jobs running or about to run on -+ * these cores -+ */ -+ desired_state_in_use = desired_state | in_use; ++#if defined(DEBUG) ++ cache_size = mali_hw_core_register_read(&cache->hw_core, ++ MALI400_L2_CACHE_REGISTER_SIZE); ++ MALI_DEBUG_PRINT(2, ("Mali L2 cache: Created %s: % 3uK, %u-way, % 2ubyte cache line, % 3ubit external bus\n", ++ resource->description, ++ 1 << (((cache_size >> 16) & 0xff) - 10), ++ 1 << ((cache_size >> 8) & 0xff), ++ 1 << (cache_size & 0xff), ++ 1 << ((cache_size >> 24) & 0xff))); ++#endif + -+ /* Update state of whether l2 caches are powered */ -+ if (type == KBASE_PM_CORE_L2) { -+ if ((ready == present) && (desired_state_in_use == ready) && -+ (trans == 0)) { -+ /* All are ready, none will be turned off, and none are -+ * transitioning */ -+ kbdev->pm.backend.l2_powered = 1; -+ /* -+ * Ensure snoops are enabled after L2 is powered up, -+ * note that kbase keeps track of the snoop state, so -+ * safe to repeatedly call. -+ */ -+ kbase_pm_cache_snoop_enable(kbdev); -+ if (kbdev->l2_users_count > 0) { -+ /* Notify any registered l2 cache users -+ * (optimized out when no users waiting) */ -+ wake_up(&kbdev->pm.backend.l2_powered_wait); -+ } -+ } else -+ kbdev->pm.backend.l2_powered = 0; ++ cache->lock = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_ORDERED, ++ _MALI_OSK_LOCK_ORDER_L2); ++ if (NULL == cache->lock) { ++ MALI_PRINT_ERROR(("Mali L2 cache: Failed to create counter lock for L2 cache core %s\n", ++ cache->hw_core.description)); ++ mali_hw_core_delete(&cache->hw_core); ++ _mali_osk_free(cache); ++ return NULL; + } + -+ if (desired_state == ready && (trans == 0)) -+ return true; ++ /* register with correct power domain */ ++ cache->pm_domain = mali_pm_register_l2_cache( ++ domain_index, cache); + -+ /* Restrict the cores to those that are actually present */ -+ powerup = desired_state_in_use & present; -+ powerdown = (~desired_state_in_use) & present; ++ mali_global_l2s[mali_global_num_l2s] = cache; ++ mali_global_num_l2s++; + -+ /* Restrict to cores that are not already in the desired state */ -+ powerup &= ~ready; -+ powerdown &= ready; ++ return cache; ++} + -+ /* Don't transition any cores that are already transitioning, except for -+ * Mali cores that support the following case: -+ * -+ * If the SHADER_PWRON or TILER_PWRON registers are written to turn on -+ * a core that is currently transitioning to power off, then this is -+ * remembered and the shader core is automatically powered up again once -+ * the original transition completes. Once the automatic power on is -+ * complete any job scheduled on the shader core should start. -+ */ -+ powerdown &= ~trans; ++void mali_l2_cache_delete(struct mali_l2_cache_core *cache) ++{ ++ u32 i; ++ for (i = 0; i < mali_global_num_l2s; i++) { ++ if (mali_global_l2s[i] != cache) { ++ continue; ++ } + -+ if (kbase_hw_has_feature(kbdev, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS)) -+ if (KBASE_PM_CORE_SHADER == type || KBASE_PM_CORE_TILER == type) -+ trans = powering_on_trans; /* for exception cases, only -+ * mask off cores in power on -+ * transitions */ ++ mali_global_l2s[i] = NULL; ++ mali_global_num_l2s--; + -+ powerup &= ~trans; ++ if (i == mali_global_num_l2s) { ++ /* Removed last element, nothing more to do */ ++ break; ++ } + -+ /* Perform transitions if any */ -+ kbase_pm_invoke(kbdev, type, powerup, ACTION_PWRON); -+#if !PLATFORM_POWER_DOWN_ONLY -+ kbase_pm_invoke(kbdev, type, powerdown, ACTION_PWROFF); -+#endif ++ /* ++ * We removed a l2 cache from the middle of the array, ++ * so move the last l2 cache to current position ++ */ ++ mali_global_l2s[i] = mali_global_l2s[mali_global_num_l2s]; ++ mali_global_l2s[mali_global_num_l2s] = NULL; + -+ /* Recalculate cores transitioning on, and re-evaluate our state */ -+ powering_on_trans |= powerup; -+ *powering_on = powering_on_trans; -+ if (available != NULL) -+ *available = (ready | powering_on_trans) & desired_state; ++ /* All good */ ++ break; ++ } + -+ return false; ++ _mali_osk_spinlock_irq_term(cache->lock); ++ mali_hw_core_delete(&cache->hw_core); ++ _mali_osk_free(cache); +} + -+KBASE_EXPORT_TEST_API(kbase_pm_transition_core_type); -+ -+/** -+ * get_desired_cache_status - Determine which caches should be on for a -+ * particular core state -+ * -+ * This function takes a bit mask of the present caches and the cores (or -+ * caches) that are attached to the caches that will be powered. It then -+ * computes which caches should be turned on to allow the cores requested to be -+ * powered up. -+ * -+ * @present: The bit mask of present caches -+ * @cores_powered: A bit mask of cores (or L2 caches) that are desired to -+ * be powered -+ * @tilers_powered: The bit mask of tilers that are desired to be powered -+ * -+ * Return: A bit mask of the caches that should be turned on -+ */ -+static u64 get_desired_cache_status(u64 present, u64 cores_powered, -+ u64 tilers_powered) ++void mali_l2_cache_power_up(struct mali_l2_cache_core *cache) +{ -+ u64 desired = 0; -+ -+ while (present) { -+ /* Find out which is the highest set bit */ -+ u64 bit = fls64(present) - 1; -+ u64 bit_mask = 1ull << bit; -+ /* Create a mask which has all bits from 'bit' upwards set */ -+ -+ u64 mask = ~(bit_mask - 1); ++ MALI_DEBUG_ASSERT_POINTER(cache); + -+ /* If there are any cores powered at this bit or above (that -+ * haven't previously been processed) then we need this core on -+ */ -+ if (cores_powered & mask) -+ desired |= bit_mask; ++ mali_l2_cache_lock(cache); + -+ /* Remove bits from cores_powered and present */ -+ cores_powered &= ~mask; -+ present &= ~bit_mask; -+ } ++ mali_l2_cache_reset(cache); + -+ /* Power up the required L2(s) for the tiler */ -+ if (tilers_powered) -+ desired |= 1; ++ if ((1 << MALI_DOMAIN_INDEX_DUMMY) != cache->pm_domain->pmu_mask) ++ MALI_DEBUG_ASSERT(MALI_FALSE == cache->power_is_on); ++ cache->power_is_on = MALI_TRUE; + -+ return desired; ++ mali_l2_cache_unlock(cache); +} + -+KBASE_EXPORT_TEST_API(get_desired_cache_status); -+ -+#ifdef CONFIG_MALI_CORESTACK -+u64 kbase_pm_core_stack_mask(u64 cores) ++void mali_l2_cache_power_down(struct mali_l2_cache_core *cache) +{ -+ u64 stack_mask = 0; -+ size_t const MAX_CORE_ID = 31; -+ size_t const NUM_CORES_PER_STACK = 4; -+ size_t i; ++ MALI_DEBUG_ASSERT_POINTER(cache); + -+ for (i = 0; i <= MAX_CORE_ID; ++i) { -+ if (test_bit(i, (unsigned long *)&cores)) { -+ /* Every core which ID >= 16 is filled to stacks 4-7 -+ * instead of 0-3 */ -+ size_t const stack_num = (i > 16) ? -+ (i % NUM_CORES_PER_STACK) + 4 : -+ (i % NUM_CORES_PER_STACK); -+ set_bit(stack_num, (unsigned long *)&stack_mask); -+ } -+ } ++ mali_l2_cache_lock(cache); + -+ return stack_mask; -+} -+#endif /* CONFIG_MALI_CORESTACK */ ++ MALI_DEBUG_ASSERT(MALI_TRUE == cache->power_is_on); + -+bool -+MOCKABLE(kbase_pm_check_transitions_nolock) (struct kbase_device *kbdev) -+{ -+ bool cores_are_available = false; -+ bool in_desired_state = true; -+ u64 desired_l2_state; -+#ifdef CONFIG_MALI_CORESTACK -+ u64 desired_stack_state; -+ u64 stacks_powered; -+#endif /* CONFIG_MALI_CORESTACK */ -+ u64 cores_powered; -+ u64 tilers_powered; -+ u64 tiler_available_bitmap; -+ u64 tiler_transitioning_bitmap; -+ u64 shader_available_bitmap; -+ u64 shader_ready_bitmap; -+ u64 shader_transitioning_bitmap; -+ u64 l2_available_bitmap; -+ u64 prev_l2_available_bitmap; -+ u64 l2_inuse_bitmap; ++ /* ++ * The HW counters will start from zero again when we resume, ++ * but we should report counters as always increasing. ++ * Take a copy of the HW values now in order to add this to ++ * the values we report after being powered up. ++ * ++ * The physical power off of the L2 cache might be outside our ++ * own control (e.g. runtime PM). That is why we must manually ++ * set set the counter value to zero as well. ++ */ + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ if (cache->counter_src0 != MALI_HW_CORE_NO_COUNTER) { ++ cache->counter_value0_base += mali_hw_core_register_read( ++ &cache->hw_core, ++ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL0); ++ mali_hw_core_register_write(&cache->hw_core, ++ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL0, 0); ++ } + -+ spin_lock(&kbdev->pm.backend.gpu_powered_lock); -+ if (kbdev->pm.backend.gpu_powered == false) { -+ spin_unlock(&kbdev->pm.backend.gpu_powered_lock); -+ if (kbdev->pm.backend.desired_shader_state == 0 && -+ kbdev->pm.backend.desired_tiler_state == 0) -+ return true; -+ return false; ++ if (cache->counter_src1 != MALI_HW_CORE_NO_COUNTER) { ++ cache->counter_value1_base += mali_hw_core_register_read( ++ &cache->hw_core, ++ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL1); ++ mali_hw_core_register_write(&cache->hw_core, ++ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL1, 0); + } + -+ /* Trace that a change-state is being requested, and that it took -+ * (effectively) no time to start it. This is useful for counting how -+ * many state changes occurred, in a way that's backwards-compatible -+ * with processing the trace data */ -+ kbase_timeline_pm_send_event(kbdev, -+ KBASE_TIMELINE_PM_EVENT_CHANGE_GPU_STATE); -+ kbase_timeline_pm_handle_event(kbdev, -+ KBASE_TIMELINE_PM_EVENT_CHANGE_GPU_STATE); + -+ /* If any cores are already powered then, we must keep the caches on */ -+ shader_transitioning_bitmap = kbase_pm_get_trans_cores(kbdev, -+ KBASE_PM_CORE_SHADER); -+ cores_powered = kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_SHADER); -+ cores_powered |= kbdev->pm.backend.desired_shader_state; ++ cache->power_is_on = MALI_FALSE; + -+#ifdef CONFIG_MALI_CORESTACK -+ /* Work out which core stacks want to be powered */ -+ desired_stack_state = kbase_pm_core_stack_mask(cores_powered); -+ stacks_powered = kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_STACK) | -+ desired_stack_state; -+#endif /* CONFIG_MALI_CORESTACK */ ++ mali_l2_cache_unlock(cache); ++} + -+ /* Work out which tilers want to be powered */ -+ tiler_transitioning_bitmap = kbase_pm_get_trans_cores(kbdev, -+ KBASE_PM_CORE_TILER); -+ tilers_powered = kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_TILER); -+ tilers_powered |= kbdev->pm.backend.desired_tiler_state; ++void mali_l2_cache_core_set_counter_src( ++ struct mali_l2_cache_core *cache, u32 source_id, u32 counter) ++{ ++ u32 reg_offset_src; ++ u32 reg_offset_val; + -+ /* If there are l2 cache users registered, keep all l2s powered even if -+ * all other cores are off. */ -+ if (kbdev->l2_users_count > 0) -+ cores_powered |= kbdev->gpu_props.props.raw_props.l2_present; ++ MALI_DEBUG_ASSERT_POINTER(cache); ++ MALI_DEBUG_ASSERT(source_id >= 0 && source_id <= 1); + -+ desired_l2_state = get_desired_cache_status( -+ kbdev->gpu_props.props.raw_props.l2_present, -+ cores_powered, tilers_powered); ++ mali_l2_cache_lock(cache); + -+ l2_inuse_bitmap = get_desired_cache_status( -+ kbdev->gpu_props.props.raw_props.l2_present, -+ cores_powered | shader_transitioning_bitmap, -+ tilers_powered | tiler_transitioning_bitmap); ++ if (0 == source_id) { ++ /* start counting from 0 */ ++ cache->counter_value0_base = 0; ++ cache->counter_src0 = counter; ++ reg_offset_src = MALI400_L2_CACHE_REGISTER_PERFCNT_SRC0; ++ reg_offset_val = MALI400_L2_CACHE_REGISTER_PERFCNT_VAL0; ++ } else { ++ /* start counting from 0 */ ++ cache->counter_value1_base = 0; ++ cache->counter_src1 = counter; ++ reg_offset_src = MALI400_L2_CACHE_REGISTER_PERFCNT_SRC1; ++ reg_offset_val = MALI400_L2_CACHE_REGISTER_PERFCNT_VAL1; ++ } + -+#ifdef CONFIG_MALI_CORESTACK -+ if (stacks_powered) -+ desired_l2_state |= 1; -+#endif /* CONFIG_MALI_CORESTACK */ ++ if (cache->power_is_on) { ++ u32 hw_src; + -+ /* If any l2 cache is on, then enable l2 #0, for use by job manager */ -+ if (0 != desired_l2_state) -+ desired_l2_state |= 1; ++ if (MALI_HW_CORE_NO_COUNTER != counter) { ++ hw_src = counter; ++ } else { ++ hw_src = 0; /* disable value for HW */ ++ } + -+ prev_l2_available_bitmap = kbdev->l2_available_bitmap; -+ in_desired_state &= kbase_pm_transition_core_type(kbdev, -+ KBASE_PM_CORE_L2, desired_l2_state, l2_inuse_bitmap, -+ &l2_available_bitmap, -+ &kbdev->pm.backend.powering_on_l2_state); ++ /* Set counter src */ ++ mali_hw_core_register_write(&cache->hw_core, ++ reg_offset_src, hw_src); + -+ if (kbdev->l2_available_bitmap != l2_available_bitmap) -+ KBASE_TIMELINE_POWER_L2(kbdev, l2_available_bitmap); ++ /* Make sure the HW starts counting from 0 again */ ++ mali_hw_core_register_write(&cache->hw_core, ++ reg_offset_val, 0); ++ } + -+ kbdev->l2_available_bitmap = l2_available_bitmap; ++ mali_l2_cache_unlock(cache); ++} + ++void mali_l2_cache_core_get_counter_values( ++ struct mali_l2_cache_core *cache, ++ u32 *src0, u32 *value0, u32 *src1, u32 *value1) ++{ ++ MALI_DEBUG_ASSERT_POINTER(cache); ++ MALI_DEBUG_ASSERT(NULL != src0); ++ MALI_DEBUG_ASSERT(NULL != value0); ++ MALI_DEBUG_ASSERT(NULL != src1); ++ MALI_DEBUG_ASSERT(NULL != value1); + -+#ifdef CONFIG_MALI_CORESTACK -+ if (in_desired_state) { -+ in_desired_state &= kbase_pm_transition_core_type(kbdev, -+ KBASE_PM_CORE_STACK, desired_stack_state, 0, -+ &kbdev->stack_available_bitmap, -+ &kbdev->pm.backend.powering_on_stack_state); -+ } -+#endif /* CONFIG_MALI_CORESTACK */ ++ mali_l2_cache_lock(cache); + -+ if (in_desired_state) { -+ in_desired_state &= kbase_pm_transition_core_type(kbdev, -+ KBASE_PM_CORE_TILER, -+ kbdev->pm.backend.desired_tiler_state, -+ 0, &tiler_available_bitmap, -+ &kbdev->pm.backend.powering_on_tiler_state); -+ in_desired_state &= kbase_pm_transition_core_type(kbdev, -+ KBASE_PM_CORE_SHADER, -+ kbdev->pm.backend.desired_shader_state, -+ kbdev->shader_inuse_bitmap, -+ &shader_available_bitmap, -+ &kbdev->pm.backend.powering_on_shader_state); ++ *src0 = cache->counter_src0; ++ *src1 = cache->counter_src1; + -+ if (kbdev->shader_available_bitmap != shader_available_bitmap) { -+ KBASE_TRACE_ADD(kbdev, PM_CORES_CHANGE_AVAILABLE, NULL, -+ NULL, 0u, -+ (u32) shader_available_bitmap); -+ KBASE_TIMELINE_POWER_SHADER(kbdev, -+ shader_available_bitmap); ++ if (cache->counter_src0 != MALI_HW_CORE_NO_COUNTER) { ++ if (MALI_TRUE == cache->power_is_on) { ++ *value0 = mali_hw_core_register_read(&cache->hw_core, ++ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL0); ++ } else { ++ *value0 = 0; + } + -+ kbdev->shader_available_bitmap = shader_available_bitmap; ++ /* Add base offset value (in case we have been power off) */ ++ *value0 += cache->counter_value0_base; ++ } + -+ if (kbdev->tiler_available_bitmap != tiler_available_bitmap) { -+ KBASE_TRACE_ADD(kbdev, PM_CORES_CHANGE_AVAILABLE_TILER, -+ NULL, NULL, 0u, -+ (u32) tiler_available_bitmap); -+ KBASE_TIMELINE_POWER_TILER(kbdev, -+ tiler_available_bitmap); ++ if (cache->counter_src1 != MALI_HW_CORE_NO_COUNTER) { ++ if (MALI_TRUE == cache->power_is_on) { ++ *value1 = mali_hw_core_register_read(&cache->hw_core, ++ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL1); ++ } else { ++ *value1 = 0; + } + -+ kbdev->tiler_available_bitmap = tiler_available_bitmap; -+ -+ } else if ((l2_available_bitmap & -+ kbdev->gpu_props.props.raw_props.tiler_present) != -+ kbdev->gpu_props.props.raw_props.tiler_present) { -+ tiler_available_bitmap = 0; ++ /* Add base offset value (in case we have been power off) */ ++ *value1 += cache->counter_value1_base; ++ } + -+ if (kbdev->tiler_available_bitmap != tiler_available_bitmap) -+ KBASE_TIMELINE_POWER_TILER(kbdev, -+ tiler_available_bitmap); ++ mali_l2_cache_unlock(cache); ++} + -+ kbdev->tiler_available_bitmap = tiler_available_bitmap; ++struct mali_l2_cache_core *mali_l2_cache_core_get_glob_l2_core(u32 index) ++{ ++ if (mali_global_num_l2s > index) { ++ return mali_global_l2s[index]; + } + -+ /* State updated for slow-path waiters */ -+ kbdev->pm.backend.gpu_in_desired_state = in_desired_state; -+ -+ shader_ready_bitmap = kbase_pm_get_ready_cores(kbdev, -+ KBASE_PM_CORE_SHADER); -+ shader_transitioning_bitmap = kbase_pm_get_trans_cores(kbdev, -+ KBASE_PM_CORE_SHADER); ++ return NULL; ++} + -+ /* Determine whether the cores are now available (even if the set of -+ * available cores is empty). Note that they can be available even if -+ * we've not finished transitioning to the desired state */ -+ if ((kbdev->shader_available_bitmap & -+ kbdev->pm.backend.desired_shader_state) -+ == kbdev->pm.backend.desired_shader_state && -+ (kbdev->tiler_available_bitmap & -+ kbdev->pm.backend.desired_tiler_state) -+ == kbdev->pm.backend.desired_tiler_state) { -+ cores_are_available = true; ++u32 mali_l2_cache_core_get_glob_num_l2_cores(void) ++{ ++ return mali_global_num_l2s; ++} + -+ KBASE_TRACE_ADD(kbdev, PM_CORES_AVAILABLE, NULL, NULL, 0u, -+ (u32)(kbdev->shader_available_bitmap & -+ kbdev->pm.backend.desired_shader_state)); -+ KBASE_TRACE_ADD(kbdev, PM_CORES_AVAILABLE_TILER, NULL, NULL, 0u, -+ (u32)(kbdev->tiler_available_bitmap & -+ kbdev->pm.backend.desired_tiler_state)); ++void mali_l2_cache_invalidate(struct mali_l2_cache_core *cache) ++{ ++ MALI_DEBUG_ASSERT_POINTER(cache); + -+ /* Log timelining information about handling events that power -+ * up cores, to match up either with immediate submission either -+ * because cores already available, or from PM IRQ */ -+ if (!in_desired_state) -+ kbase_timeline_pm_send_event(kbdev, -+ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED); ++ if (NULL == cache) { ++ return; + } + -+ if (in_desired_state) { -+ KBASE_DEBUG_ASSERT(cores_are_available); -+ -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+ kbase_trace_mali_pm_status(KBASE_PM_CORE_L2, -+ kbase_pm_get_ready_cores(kbdev, -+ KBASE_PM_CORE_L2)); -+ kbase_trace_mali_pm_status(KBASE_PM_CORE_SHADER, -+ kbase_pm_get_ready_cores(kbdev, -+ KBASE_PM_CORE_SHADER)); -+ kbase_trace_mali_pm_status(KBASE_PM_CORE_TILER, -+ kbase_pm_get_ready_cores(kbdev, -+ KBASE_PM_CORE_TILER)); -+#ifdef CONFIG_MALI_CORESTACK -+ kbase_trace_mali_pm_status(KBASE_PM_CORE_STACK, -+ kbase_pm_get_ready_cores(kbdev, -+ KBASE_PM_CORE_STACK)); -+#endif /* CONFIG_MALI_CORESTACK */ -+#endif ++ mali_l2_cache_lock(cache); + -+ KBASE_TLSTREAM_AUX_PM_STATE( -+ KBASE_PM_CORE_L2, -+ kbase_pm_get_ready_cores( -+ kbdev, KBASE_PM_CORE_L2)); -+ KBASE_TLSTREAM_AUX_PM_STATE( -+ KBASE_PM_CORE_SHADER, -+ kbase_pm_get_ready_cores( -+ kbdev, KBASE_PM_CORE_SHADER)); -+ KBASE_TLSTREAM_AUX_PM_STATE( -+ KBASE_PM_CORE_TILER, -+ kbase_pm_get_ready_cores( -+ kbdev, -+ KBASE_PM_CORE_TILER)); -+#ifdef CONFIG_MALI_CORESTACK -+ KBASE_TLSTREAM_AUX_PM_STATE( -+ KBASE_PM_CORE_STACK, -+ kbase_pm_get_ready_cores( -+ kbdev, -+ KBASE_PM_CORE_STACK)); -+#endif /* CONFIG_MALI_CORESTACK */ ++ cache->last_invalidated_id = mali_scheduler_get_new_cache_order(); ++ mali_l2_cache_send_command(cache, MALI400_L2_CACHE_REGISTER_COMMAND, ++ MALI400_L2_CACHE_COMMAND_CLEAR_ALL); + -+ KBASE_TRACE_ADD(kbdev, PM_DESIRED_REACHED, NULL, NULL, -+ kbdev->pm.backend.gpu_in_desired_state, -+ (u32)kbdev->pm.backend.desired_shader_state); -+ KBASE_TRACE_ADD(kbdev, PM_DESIRED_REACHED_TILER, NULL, NULL, 0u, -+ (u32)kbdev->pm.backend.desired_tiler_state); ++ mali_l2_cache_unlock(cache); ++} + -+ /* Log timelining information for synchronous waiters */ -+ kbase_timeline_pm_send_event(kbdev, -+ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED); -+ /* Wake slow-path waiters. Job scheduler does not use this. */ -+ KBASE_TRACE_ADD(kbdev, PM_WAKE_WAITERS, NULL, NULL, 0u, 0); ++void mali_l2_cache_invalidate_conditional( ++ struct mali_l2_cache_core *cache, u32 id) ++{ ++ MALI_DEBUG_ASSERT_POINTER(cache); + -+ wake_up(&kbdev->pm.backend.gpu_in_desired_state_wait); ++ if (NULL == cache) { ++ return; + } + -+ spin_unlock(&kbdev->pm.backend.gpu_powered_lock); ++ /* ++ * If the last cache invalidation was done by a job with a higher id we ++ * don't have to flush. Since user space will store jobs w/ their ++ * corresponding memory in sequence (first job #0, then job #1, ...), ++ * we don't have to flush for job n-1 if job n has already invalidated ++ * the cache since we know for sure that job n-1's memory was already ++ * written when job n was started. ++ */ + -+ /* kbase_pm_ca_update_core_status can cause one-level recursion into -+ * this function, so it must only be called once all changes to kbdev -+ * have been committed, and after the gpu_powered_lock has been -+ * dropped. */ -+ if (kbdev->shader_ready_bitmap != shader_ready_bitmap || -+ kbdev->shader_transitioning_bitmap != shader_transitioning_bitmap) { -+ kbdev->shader_ready_bitmap = shader_ready_bitmap; -+ kbdev->shader_transitioning_bitmap = -+ shader_transitioning_bitmap; ++ mali_l2_cache_lock(cache); + -+ kbase_pm_ca_update_core_status(kbdev, shader_ready_bitmap, -+ shader_transitioning_bitmap); ++ if (((s32)id) > ((s32)cache->last_invalidated_id)) { ++ /* Set latest invalidated id to current "point in time" */ ++ cache->last_invalidated_id = ++ mali_scheduler_get_new_cache_order(); ++ mali_l2_cache_send_command(cache, ++ MALI400_L2_CACHE_REGISTER_COMMAND, ++ MALI400_L2_CACHE_COMMAND_CLEAR_ALL); + } + -+ /* The core availability policy is not allowed to keep core group 0 -+ * turned off (unless it was changing the l2 power state) */ -+ if (!((shader_ready_bitmap | shader_transitioning_bitmap) & -+ kbdev->gpu_props.props.coherency_info.group[0].core_mask) && -+ (prev_l2_available_bitmap == desired_l2_state) && -+ !(kbase_pm_ca_get_core_mask(kbdev) & -+ kbdev->gpu_props.props.coherency_info.group[0].core_mask)) -+ BUG(); -+ -+ /* The core availability policy is allowed to keep core group 1 off, -+ * but all jobs specifically targeting CG1 must fail */ -+ if (!((shader_ready_bitmap | shader_transitioning_bitmap) & -+ kbdev->gpu_props.props.coherency_info.group[1].core_mask) && -+ !(kbase_pm_ca_get_core_mask(kbdev) & -+ kbdev->gpu_props.props.coherency_info.group[1].core_mask)) -+ kbdev->pm.backend.cg1_disabled = true; -+ else -+ kbdev->pm.backend.cg1_disabled = false; -+ -+ return cores_are_available; ++ mali_l2_cache_unlock(cache); +} -+KBASE_EXPORT_TEST_API(kbase_pm_check_transitions_nolock); -+ -+/* Timeout for kbase_pm_check_transitions_sync when wait_event_killable has -+ * aborted due to a fatal signal. If the time spent waiting has exceeded this -+ * threshold then there is most likely a hardware issue. */ -+#define PM_TIMEOUT (5*HZ) /* 5s */ + -+void kbase_pm_check_transitions_sync(struct kbase_device *kbdev) ++void mali_l2_cache_invalidate_all(void) +{ -+ unsigned long flags; -+ unsigned long timeout; -+ bool cores_are_available; -+ int ret; ++ u32 i; ++ for (i = 0; i < mali_global_num_l2s; i++) { ++ struct mali_l2_cache_core *cache = mali_global_l2s[i]; ++ _mali_osk_errcode_t ret; + -+ /* Force the transition to be checked and reported - the cores may be -+ * 'available' (for job submission) but not fully powered up. */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ MALI_DEBUG_ASSERT_POINTER(cache); + -+ cores_are_available = kbase_pm_check_transitions_nolock(kbdev); ++ mali_l2_cache_lock(cache); + -+ /* Don't need 'cores_are_available', because we don't return anything */ -+ CSTD_UNUSED(cores_are_available); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ if (MALI_TRUE != cache->power_is_on) { ++ mali_l2_cache_unlock(cache); ++ continue; ++ } + -+ timeout = jiffies + PM_TIMEOUT; ++ cache->last_invalidated_id = ++ mali_scheduler_get_new_cache_order(); + -+ /* Wait for cores */ -+ ret = wait_event_killable(kbdev->pm.backend.gpu_in_desired_state_wait, -+ kbdev->pm.backend.gpu_in_desired_state); ++ ret = mali_l2_cache_send_command(cache, ++ MALI400_L2_CACHE_REGISTER_COMMAND, ++ MALI400_L2_CACHE_COMMAND_CLEAR_ALL); ++ if (_MALI_OSK_ERR_OK != ret) { ++ MALI_PRINT_ERROR(("Failed to invalidate cache\n")); ++ } + -+ if (ret < 0 && time_after(jiffies, timeout)) { -+ dev_err(kbdev->dev, "Power transition timed out unexpectedly\n"); -+ dev_err(kbdev->dev, "Desired state :\n"); -+ dev_err(kbdev->dev, "\tShader=%016llx\n", -+ kbdev->pm.backend.desired_shader_state); -+ dev_err(kbdev->dev, "\tTiler =%016llx\n", -+ kbdev->pm.backend.desired_tiler_state); -+ dev_err(kbdev->dev, "Current state :\n"); -+ dev_err(kbdev->dev, "\tShader=%08x%08x\n", -+ kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(SHADER_READY_HI), NULL), -+ kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(SHADER_READY_LO), -+ NULL)); -+ dev_err(kbdev->dev, "\tTiler =%08x%08x\n", -+ kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(TILER_READY_HI), NULL), -+ kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(TILER_READY_LO), NULL)); -+ dev_err(kbdev->dev, "\tL2 =%08x%08x\n", -+ kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(L2_READY_HI), NULL), -+ kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(L2_READY_LO), NULL)); -+ dev_err(kbdev->dev, "Cores transitioning :\n"); -+ dev_err(kbdev->dev, "\tShader=%08x%08x\n", -+ kbase_reg_read(kbdev, GPU_CONTROL_REG( -+ SHADER_PWRTRANS_HI), NULL), -+ kbase_reg_read(kbdev, GPU_CONTROL_REG( -+ SHADER_PWRTRANS_LO), NULL)); -+ dev_err(kbdev->dev, "\tTiler =%08x%08x\n", -+ kbase_reg_read(kbdev, GPU_CONTROL_REG( -+ TILER_PWRTRANS_HI), NULL), -+ kbase_reg_read(kbdev, GPU_CONTROL_REG( -+ TILER_PWRTRANS_LO), NULL)); -+ dev_err(kbdev->dev, "\tL2 =%08x%08x\n", -+ kbase_reg_read(kbdev, GPU_CONTROL_REG( -+ L2_PWRTRANS_HI), NULL), -+ kbase_reg_read(kbdev, GPU_CONTROL_REG( -+ L2_PWRTRANS_LO), NULL)); -+#if KBASE_GPU_RESET_EN -+ dev_err(kbdev->dev, "Sending reset to GPU - all running jobs will be lost\n"); -+ if (kbase_prepare_to_reset_gpu(kbdev)) -+ kbase_reset_gpu(kbdev); -+#endif /* KBASE_GPU_RESET_EN */ -+ } else { -+ /* Log timelining information that a change in state has -+ * completed */ -+ kbase_timeline_pm_handle_event(kbdev, -+ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED); ++ mali_l2_cache_unlock(cache); + } +} -+KBASE_EXPORT_TEST_API(kbase_pm_check_transitions_sync); + -+void kbase_pm_enable_interrupts(struct kbase_device *kbdev) ++void mali_l2_cache_invalidate_all_pages(u32 *pages, u32 num_pages) +{ -+ unsigned long flags; -+ -+ KBASE_DEBUG_ASSERT(NULL != kbdev); -+ /* -+ * Clear all interrupts, -+ * and unmask them all. -+ */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), GPU_IRQ_REG_ALL, -+ NULL); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), GPU_IRQ_REG_ALL, -+ NULL); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ u32 i; ++ for (i = 0; i < mali_global_num_l2s; i++) { ++ struct mali_l2_cache_core *cache = mali_global_l2s[i]; ++ u32 j; + -+ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_CLEAR), 0xFFFFFFFF, -+ NULL); -+ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_MASK), 0xFFFFFFFF, NULL); ++ MALI_DEBUG_ASSERT_POINTER(cache); + -+ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_CLEAR), 0xFFFFFFFF, NULL); -+ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_MASK), 0xFFFFFFFF, NULL); -+} ++ mali_l2_cache_lock(cache); + -+KBASE_EXPORT_TEST_API(kbase_pm_enable_interrupts); ++ if (MALI_TRUE != cache->power_is_on) { ++ mali_l2_cache_unlock(cache); ++ continue; ++ } + -+void kbase_pm_disable_interrupts_nolock(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(NULL != kbdev); -+ /* -+ * Mask all interrupts, -+ * and clear them all. -+ */ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ for (j = 0; j < num_pages; j++) { ++ _mali_osk_errcode_t ret; + -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), 0, NULL); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), GPU_IRQ_REG_ALL, -+ NULL); -+ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_MASK), 0, NULL); -+ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_CLEAR), 0xFFFFFFFF, -+ NULL); ++ ret = mali_l2_cache_send_command(cache, ++ MALI400_L2_CACHE_REGISTER_CLEAR_PAGE, ++ pages[j]); ++ if (_MALI_OSK_ERR_OK != ret) { ++ MALI_PRINT_ERROR(("Failed to invalidate cache (page)\n")); ++ } ++ } + -+ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_MASK), 0, NULL); -+ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_CLEAR), 0xFFFFFFFF, NULL); ++ mali_l2_cache_unlock(cache); ++ } +} + -+void kbase_pm_disable_interrupts(struct kbase_device *kbdev) ++/* -------- local helper functions below -------- */ ++ ++static void mali_l2_cache_reset(struct mali_l2_cache_core *cache) +{ -+ unsigned long flags; ++ MALI_DEBUG_ASSERT_POINTER(cache); ++ MALI_DEBUG_ASSERT_LOCK_HELD(cache->lock); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_pm_disable_interrupts_nolock(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+} ++ /* Invalidate cache (just to keep it in a known state at startup) */ ++ mali_l2_cache_send_command(cache, MALI400_L2_CACHE_REGISTER_COMMAND, ++ MALI400_L2_CACHE_COMMAND_CLEAR_ALL); + -+KBASE_EXPORT_TEST_API(kbase_pm_disable_interrupts); ++ /* Enable cache */ ++ mali_hw_core_register_write(&cache->hw_core, ++ MALI400_L2_CACHE_REGISTER_ENABLE, ++ (u32)MALI400_L2_CACHE_ENABLE_ACCESS | ++ (u32)MALI400_L2_CACHE_ENABLE_READ_ALLOCATE); + ++ if (MALI400_L2_MAX_READS_NOT_SET != mali_l2_max_reads) { ++ mali_hw_core_register_write(&cache->hw_core, ++ MALI400_L2_CACHE_REGISTER_MAX_READS, ++ (u32)mali_l2_max_reads); ++ } + -+/* -+ * pmu layout: -+ * 0x0000: PMU TAG (RO) (0xCAFECAFE) -+ * 0x0004: PMU VERSION ID (RO) (0x00000000) -+ * 0x0008: CLOCK ENABLE (RW) (31:1 SBZ, 0 CLOCK STATE) -+ */ -+void kbase_pm_clock_on(struct kbase_device *kbdev, bool is_resume) -+{ -+ bool reset_required = is_resume; -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ unsigned long flags; ++ /* Restart any performance counters (if enabled) */ ++ if (cache->counter_src0 != MALI_HW_CORE_NO_COUNTER) { + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); -+ lockdep_assert_held(&js_devdata->runpool_mutex); -+ lockdep_assert_held(&kbdev->pm.lock); ++ mali_hw_core_register_write(&cache->hw_core, ++ MALI400_L2_CACHE_REGISTER_PERFCNT_SRC0, ++ cache->counter_src0); ++ } + -+ if (kbdev->pm.backend.gpu_powered) { -+ /* Already turned on */ -+ if (kbdev->poweroff_pending) -+ kbase_pm_enable_interrupts(kbdev); -+ kbdev->poweroff_pending = false; -+ KBASE_DEBUG_ASSERT(!is_resume); -+ return; ++ if (cache->counter_src1 != MALI_HW_CORE_NO_COUNTER) { ++ mali_hw_core_register_write(&cache->hw_core, ++ MALI400_L2_CACHE_REGISTER_PERFCNT_SRC1, ++ cache->counter_src1); + } ++} + -+ kbdev->poweroff_pending = false; ++static _mali_osk_errcode_t mali_l2_cache_send_command( ++ struct mali_l2_cache_core *cache, u32 reg, u32 val) ++{ ++ int i = 0; ++ const int loop_count = 100000; + -+ KBASE_TRACE_ADD(kbdev, PM_GPU_ON, NULL, NULL, 0u, 0u); ++ MALI_DEBUG_ASSERT_POINTER(cache); ++ MALI_DEBUG_ASSERT_LOCK_HELD(cache->lock); + -+ if (is_resume && kbdev->pm.backend.callback_power_resume) { -+ kbdev->pm.backend.callback_power_resume(kbdev); -+ return; -+ } else if (kbdev->pm.backend.callback_power_on) { -+ kbdev->pm.backend.callback_power_on(kbdev); -+ /* If your platform properly keeps the GPU state you may use the -+ * return value of the callback_power_on function to -+ * conditionally reset the GPU on power up. Currently we are -+ * conservative and always reset the GPU. */ -+ reset_required = true; ++ /* ++ * First, wait for L2 cache command handler to go idle. ++ * (Commands received while processing another command will be ignored) ++ */ ++ for (i = 0; i < loop_count; i++) { ++ if (!(mali_hw_core_register_read(&cache->hw_core, ++ MALI400_L2_CACHE_REGISTER_STATUS) & ++ (u32)MALI400_L2_CACHE_STATUS_COMMAND_BUSY)) { ++ break; ++ } + } + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); -+ kbdev->pm.backend.gpu_powered = true; -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); -+ -+ if (reset_required) { -+ /* GPU state was lost, reset GPU to ensure it is in a -+ * consistent state */ -+ kbase_pm_init_hw(kbdev, PM_ENABLE_IRQS); ++ if (i == loop_count) { ++ MALI_DEBUG_PRINT(1, ("Mali L2 cache: aborting wait for command interface to go idle\n")); ++ return _MALI_OSK_ERR_FAULT; + } + -+ mutex_lock(&kbdev->mmu_hw_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_ctx_sched_restore_all_as(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kbdev->mmu_hw_mutex); ++ /* then issue the command */ ++ mali_hw_core_register_write(&cache->hw_core, reg, val); + -+ /* Lastly, enable the interrupts */ -+ kbase_pm_enable_interrupts(kbdev); ++ return _MALI_OSK_ERR_OK; +} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h +new file mode 100755 +index 000000000..c48a88440 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h +@@ -0,0 +1,124 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+KBASE_EXPORT_TEST_API(kbase_pm_clock_on); -+ -+bool kbase_pm_clock_off(struct kbase_device *kbdev, bool is_suspend) -+{ -+ unsigned long flags; ++#ifndef __MALI_KERNEL_L2_CACHE_H__ ++#define __MALI_KERNEL_L2_CACHE_H__ + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); -+ lockdep_assert_held(&kbdev->pm.lock); ++#include "mali_osk.h" ++#include "mali_hw_core.h" + -+ /* ASSERT that the cores should now be unavailable. No lock needed. */ -+ KBASE_DEBUG_ASSERT(kbdev->shader_available_bitmap == 0u); ++#define MALI_MAX_NUMBER_OF_L2_CACHE_CORES 3 ++/* Maximum 1 GP and 4 PP for an L2 cache core (Mali-400 MP4) */ ++#define MALI_MAX_NUMBER_OF_GROUPS_PER_L2_CACHE 5 + -+ kbdev->poweroff_pending = true; ++/** ++ * Definition of the L2 cache core struct ++ * Used to track a L2 cache unit in the system. ++ * Contains information about the mapping of the registers ++ */ ++struct mali_l2_cache_core { ++ /* Common HW core functionality */ ++ struct mali_hw_core hw_core; + -+ if (!kbdev->pm.backend.gpu_powered) { -+ /* Already turned off */ -+ if (is_suspend && kbdev->pm.backend.callback_power_suspend) -+ kbdev->pm.backend.callback_power_suspend(kbdev); -+ return true; -+ } ++ /* Synchronize L2 cache access */ ++ _mali_osk_spinlock_irq_t *lock; + -+ KBASE_TRACE_ADD(kbdev, PM_GPU_OFF, NULL, NULL, 0u, 0u); ++ /* Unique core ID */ ++ u32 core_id; + -+ /* Disable interrupts. This also clears any outstanding interrupts */ -+ kbase_pm_disable_interrupts(kbdev); -+ /* Ensure that any IRQ handlers have finished */ -+ kbase_synchronize_irqs(kbdev); ++ /* The power domain this L2 cache belongs to */ ++ struct mali_pm_domain *pm_domain; + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); ++ /* MALI_TRUE if power is on for this L2 cache */ ++ mali_bool power_is_on; + -+ if (atomic_read(&kbdev->faults_pending)) { -+ /* Page/bus faults are still being processed. The GPU can not -+ * be powered off until they have completed */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, -+ flags); -+ return false; -+ } ++ /* A "timestamp" to avoid unnecessary flushes */ ++ u32 last_invalidated_id; + -+ kbase_pm_cache_snoop_disable(kbdev); ++ /* Performance counter 0, MALI_HW_CORE_NO_COUNTER for disabled */ ++ u32 counter_src0; + -+ /* The GPU power may be turned off from this point */ -+ kbdev->pm.backend.gpu_powered = false; -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); ++ /* Performance counter 1, MALI_HW_CORE_NO_COUNTER for disabled */ ++ u32 counter_src1; + -+ if (is_suspend && kbdev->pm.backend.callback_power_suspend) -+ kbdev->pm.backend.callback_power_suspend(kbdev); -+ else if (kbdev->pm.backend.callback_power_off) -+ kbdev->pm.backend.callback_power_off(kbdev); -+ return true; -+} ++ /* ++ * Performance counter 0 value base/offset ++ * (allows accumulative reporting even after power off) ++ */ ++ u32 counter_value0_base; + -+KBASE_EXPORT_TEST_API(kbase_pm_clock_off); ++ /* ++ * Performance counter 0 value base/offset ++ * (allows accumulative reporting even after power off) ++ */ ++ u32 counter_value1_base; + -+struct kbasep_reset_timeout_data { -+ struct hrtimer timer; -+ bool timed_out; -+ struct kbase_device *kbdev; ++ /* Used by PM domains to link L2 caches of same domain */ ++ _mali_osk_list_t pm_domain_list; +}; + -+void kbase_pm_reset_done(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ kbdev->pm.backend.reset_done = true; -+ wake_up(&kbdev->pm.backend.reset_done_wait); -+} ++_mali_osk_errcode_t mali_l2_cache_initialize(void); ++void mali_l2_cache_terminate(void); + -+/** -+ * kbase_pm_wait_for_reset - Wait for a reset to happen -+ * -+ * Wait for the %RESET_COMPLETED IRQ to occur, then reset the waiting state. -+ * -+ * @kbdev: Kbase device -+ */ -+static void kbase_pm_wait_for_reset(struct kbase_device *kbdev) -+{ -+ lockdep_assert_held(&kbdev->pm.lock); ++struct mali_l2_cache_core *mali_l2_cache_create( ++ _mali_osk_resource_t *resource, u32 domain_index); ++void mali_l2_cache_delete(struct mali_l2_cache_core *cache); + -+ wait_event(kbdev->pm.backend.reset_done_wait, -+ (kbdev->pm.backend.reset_done)); -+ kbdev->pm.backend.reset_done = false; ++MALI_STATIC_INLINE u32 mali_l2_cache_get_id(struct mali_l2_cache_core *cache) ++{ ++ MALI_DEBUG_ASSERT_POINTER(cache); ++ return cache->core_id; +} + -+KBASE_EXPORT_TEST_API(kbase_pm_reset_done); -+ -+static enum hrtimer_restart kbasep_reset_timeout(struct hrtimer *timer) ++MALI_STATIC_INLINE struct mali_pm_domain *mali_l2_cache_get_pm_domain( ++ struct mali_l2_cache_core *cache) +{ -+ struct kbasep_reset_timeout_data *rtdata = -+ container_of(timer, struct kbasep_reset_timeout_data, timer); ++ MALI_DEBUG_ASSERT_POINTER(cache); ++ return cache->pm_domain; ++} + -+ rtdata->timed_out = 1; ++void mali_l2_cache_power_up(struct mali_l2_cache_core *cache); ++void mali_l2_cache_power_down(struct mali_l2_cache_core *cache); + -+ /* Set the wait queue to wake up kbase_pm_init_hw even though the reset -+ * hasn't completed */ -+ kbase_pm_reset_done(rtdata->kbdev); ++void mali_l2_cache_core_set_counter_src( ++ struct mali_l2_cache_core *cache, u32 source_id, u32 counter); + -+ return HRTIMER_NORESTART; ++MALI_STATIC_INLINE u32 mali_l2_cache_core_get_counter_src0( ++ struct mali_l2_cache_core *cache) ++{ ++ MALI_DEBUG_ASSERT_POINTER(cache); ++ return cache->counter_src0; +} + -+static void kbase_pm_hw_issues_detect(struct kbase_device *kbdev) ++MALI_STATIC_INLINE u32 mali_l2_cache_core_get_counter_src1( ++ struct mali_l2_cache_core *cache) +{ -+ struct device_node *np = kbdev->dev->of_node; -+ u32 jm_values[4]; -+ const u32 gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ const u32 prod_id = (gpu_id & GPU_ID_VERSION_PRODUCT_ID) >> -+ GPU_ID_VERSION_PRODUCT_ID_SHIFT; -+ const u32 major = (gpu_id & GPU_ID_VERSION_MAJOR) >> -+ GPU_ID_VERSION_MAJOR_SHIFT; -+ -+ kbdev->hw_quirks_sc = 0; -+ -+ /* Needed due to MIDBASE-1494: LS_PAUSEBUFFER_DISABLE. See PRLAM-8443. -+ * and needed due to MIDGLES-3539. See PRLAM-11035 */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8443) || -+ kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_11035)) -+ kbdev->hw_quirks_sc |= SC_LS_PAUSEBUFFER_DISABLE; ++ MALI_DEBUG_ASSERT_POINTER(cache); ++ return cache->counter_src1; ++} + -+ /* Needed due to MIDBASE-2054: SDC_DISABLE_OQ_DISCARD. See PRLAM-10327. -+ */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10327)) -+ kbdev->hw_quirks_sc |= SC_SDC_DISABLE_OQ_DISCARD; ++void mali_l2_cache_core_get_counter_values( ++ struct mali_l2_cache_core *cache, ++ u32 *src0, u32 *value0, u32 *src1, u32 *value1); + -+#ifdef CONFIG_MALI_BIFROST_PRFCNT_SET_SECONDARY -+ /* Enable alternative hardware counter selection if configured. */ -+ if (!GPU_ID_IS_NEW_FORMAT(prod_id)) -+ kbdev->hw_quirks_sc |= SC_ALT_COUNTERS; -+#endif ++struct mali_l2_cache_core *mali_l2_cache_core_get_glob_l2_core(u32 index); ++u32 mali_l2_cache_core_get_glob_num_l2_cores(void); + -+ /* Needed due to MIDBASE-2795. ENABLE_TEXGRD_FLAGS. See PRLAM-10797. */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10797)) -+ kbdev->hw_quirks_sc |= SC_ENABLE_TEXGRD_FLAGS; ++struct mali_group *mali_l2_cache_get_group( ++ struct mali_l2_cache_core *cache, u32 index); + -+ if (!kbase_hw_has_issue(kbdev, GPUCORE_1619)) { -+ if (prod_id < 0x750 || prod_id == 0x6956) /* T60x, T62x, T72x */ -+ kbdev->hw_quirks_sc |= SC_LS_ATTR_CHECK_DISABLE; -+ else if (prod_id >= 0x750 && prod_id <= 0x880) /* T76x, T8xx */ -+ kbdev->hw_quirks_sc |= SC_LS_ALLOW_ATTR_TYPES; -+ } ++void mali_l2_cache_invalidate(struct mali_l2_cache_core *cache); ++void mali_l2_cache_invalidate_conditional( ++ struct mali_l2_cache_core *cache, u32 id); + -+ if (!kbdev->hw_quirks_sc) -+ kbdev->hw_quirks_sc = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(SHADER_CONFIG), NULL); ++void mali_l2_cache_invalidate_all(void); ++void mali_l2_cache_invalidate_all_pages(u32 *pages, u32 num_pages); + -+ kbdev->hw_quirks_tiler = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(TILER_CONFIG), NULL); ++#endif /* __MALI_KERNEL_L2_CACHE_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c +new file mode 100755 +index 000000000..eb95998f1 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c +@@ -0,0 +1,68 @@ ++/* ++ * Copyright (C) 2011-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ /* Set tiler clock gate override if required */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_T76X_3953)) -+ kbdev->hw_quirks_tiler |= TC_CLOCK_GATE_OVERRIDE; ++#include "mali_mem_validation.h" ++#include "mali_osk.h" ++#include "mali_kernel_common.h" + -+ /* Limit the GPU bus bandwidth if the platform needs this. */ -+ kbdev->hw_quirks_mmu = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(L2_MMU_CONFIG), NULL); ++#define MALI_INVALID_MEM_ADDR 0xFFFFFFFF + -+ /* Limit read ID width for AXI */ -+ kbdev->hw_quirks_mmu &= ~(L2_MMU_CONFIG_LIMIT_EXTERNAL_READS); -+ kbdev->hw_quirks_mmu |= (DEFAULT_ARID_LIMIT & 0x3) << -+ L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_SHIFT; ++typedef struct { ++ u32 phys_base; /**< Mali physical base of the memory, page aligned */ ++ u32 size; /**< size in bytes of the memory, multiple of page size */ ++} _mali_mem_validation_t; + -+ /* Limit write ID width for AXI */ -+ kbdev->hw_quirks_mmu &= ~(L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES); -+ kbdev->hw_quirks_mmu |= (DEFAULT_AWID_LIMIT & 0x3) << -+ L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_SHIFT; ++static _mali_mem_validation_t mali_mem_validator = { MALI_INVALID_MEM_ADDR, MALI_INVALID_MEM_ADDR }; + -+ if (kbdev->system_coherency == COHERENCY_ACE) { -+ /* Allow memory configuration disparity to be ignored, we -+ * optimize the use of shared memory and thus we expect -+ * some disparity in the memory configuration */ -+ kbdev->hw_quirks_mmu |= L2_MMU_CONFIG_ALLOW_SNOOP_DISPARITY; ++_mali_osk_errcode_t mali_mem_validation_add_range(u32 start, u32 size) ++{ ++ /* Check that no other MEM_VALIDATION resources exist */ ++ if (MALI_INVALID_MEM_ADDR != mali_mem_validator.phys_base) { ++ MALI_PRINT_ERROR(("Failed to add frame buffer memory; another range is already specified\n")); ++ return _MALI_OSK_ERR_FAULT; + } + -+ kbdev->hw_quirks_jm = 0; -+ /* Only for T86x/T88x-based products after r2p0 */ -+ if (prod_id >= 0x860 && prod_id <= 0x880 && major >= 2) { -+ -+ if (of_property_read_u32_array(np, -+ "jm_config", -+ &jm_values[0], -+ ARRAY_SIZE(jm_values))) { -+ /* Entry not in device tree, use defaults */ -+ jm_values[0] = 0; -+ jm_values[1] = 0; -+ jm_values[2] = 0; -+ jm_values[3] = JM_MAX_JOB_THROTTLE_LIMIT; -+ } -+ -+ /* Limit throttle limit to 6 bits*/ -+ if (jm_values[3] > JM_MAX_JOB_THROTTLE_LIMIT) { -+ dev_dbg(kbdev->dev, "JOB_THROTTLE_LIMIT supplied in device tree is too large. Limiting to MAX (63)."); -+ jm_values[3] = JM_MAX_JOB_THROTTLE_LIMIT; -+ } -+ -+ /* Aggregate to one integer. */ -+ kbdev->hw_quirks_jm |= (jm_values[0] ? -+ JM_TIMESTAMP_OVERRIDE : 0); -+ kbdev->hw_quirks_jm |= (jm_values[1] ? -+ JM_CLOCK_GATE_OVERRIDE : 0); -+ kbdev->hw_quirks_jm |= (jm_values[2] ? -+ JM_JOB_THROTTLE_ENABLE : 0); -+ kbdev->hw_quirks_jm |= (jm_values[3] << -+ JM_JOB_THROTTLE_LIMIT_SHIFT); ++ /* Check restrictions on page alignment */ ++ if ((0 != (start & (~_MALI_OSK_CPU_PAGE_MASK))) || ++ (0 != (size & (~_MALI_OSK_CPU_PAGE_MASK)))) { ++ MALI_PRINT_ERROR(("Failed to add frame buffer memory; incorrect alignment\n")); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ } else if (GPU_ID_IS_NEW_FORMAT(prod_id) && -+ (GPU_ID2_MODEL_MATCH_VALUE(prod_id) == -+ GPU_ID2_PRODUCT_TMIX)) { -+ /* Only for tMIx */ -+ u32 coherency_features; ++ mali_mem_validator.phys_base = start; ++ mali_mem_validator.size = size; ++ MALI_DEBUG_PRINT(2, ("Memory Validator installed for Mali physical address base=0x%08X, size=0x%08X\n", ++ mali_mem_validator.phys_base, mali_mem_validator.size)); + -+ coherency_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(COHERENCY_FEATURES), NULL); ++ return _MALI_OSK_ERR_OK; ++} + -+ /* (COHERENCY_ACE_LITE | COHERENCY_ACE) was incorrectly -+ * documented for tMIx so force correct value here. -+ */ -+ if (coherency_features == -+ COHERENCY_FEATURE_BIT(COHERENCY_ACE)) { -+ kbdev->hw_quirks_jm |= -+ (COHERENCY_ACE_LITE | COHERENCY_ACE) << -+ JM_FORCE_COHERENCY_FEATURES_SHIFT; ++_mali_osk_errcode_t mali_mem_validation_check(u32 phys_addr, u32 size) ++{ ++#if 0 ++ if (phys_addr < (phys_addr + size)) { /* Don't allow overflow (or zero size) */ ++ if ((0 == (phys_addr & (~_MALI_OSK_CPU_PAGE_MASK))) && ++ (0 == (size & (~_MALI_OSK_CPU_PAGE_MASK)))) { ++ if ((phys_addr >= mali_mem_validator.phys_base) && ++ ((phys_addr + (size - 1)) >= mali_mem_validator.phys_base) && ++ (phys_addr <= (mali_mem_validator.phys_base + (mali_mem_validator.size - 1))) && ++ ((phys_addr + (size - 1)) <= (mali_mem_validator.phys_base + (mali_mem_validator.size - 1)))) { ++ MALI_DEBUG_PRINT(3, ("Accepted range 0x%08X + size 0x%08X (= 0x%08X)\n", phys_addr, size, (phys_addr + size - 1))); ++ return _MALI_OSK_ERR_OK; ++ } + } + } + ++ MALI_PRINT_ERROR(("MALI PHYSICAL RANGE VALIDATION ERROR: The range supplied was: phys_base=0x%08X, size=0x%08X\n", phys_addr, size)); + -+ if (!kbdev->hw_quirks_jm) -+ kbdev->hw_quirks_jm = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(JM_CONFIG), NULL); -+ -+#ifdef CONFIG_MALI_CORESTACK -+#define MANUAL_POWER_CONTROL ((u32)(1 << 8)) -+ kbdev->hw_quirks_jm |= MANUAL_POWER_CONTROL; -+#endif /* CONFIG_MALI_CORESTACK */ ++ return _MALI_OSK_ERR_FAULT; ++#endif ++ return _MALI_OSK_ERR_OK; +} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h +new file mode 100755 +index 000000000..05013f46f +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h +@@ -0,0 +1,19 @@ ++/* ++ * Copyright (C) 2011-2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+static void kbase_pm_hw_issues_apply(struct kbase_device *kbdev) -+{ -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(SHADER_CONFIG), -+ kbdev->hw_quirks_sc, NULL); ++#ifndef __MALI_MEM_VALIDATION_H__ ++#define __MALI_MEM_VALIDATION_H__ + -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(TILER_CONFIG), -+ kbdev->hw_quirks_tiler, NULL); ++#include "mali_osk.h" + -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(L2_MMU_CONFIG), -+ kbdev->hw_quirks_mmu, NULL); ++_mali_osk_errcode_t mali_mem_validation_add_range(u32 start, u32 size); ++_mali_osk_errcode_t mali_mem_validation_check(u32 phys_addr, u32 size); + -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(JM_CONFIG), -+ kbdev->hw_quirks_jm, NULL); ++#endif /* __MALI_MEM_VALIDATION_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu.c b/drivers/gpu/arm/mali400/mali/common/mali_mmu.c +new file mode 100755 +index 000000000..b82486fa6 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.c +@@ -0,0 +1,433 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+} ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_osk_list.h" ++#include "mali_ukk.h" + -+void kbase_pm_cache_snoop_enable(struct kbase_device *kbdev) -+{ -+ if ((kbdev->current_gpu_coherency_mode == COHERENCY_ACE) && -+ !kbdev->cci_snoop_enabled) { -+#ifdef CONFIG_ARM64 -+ if (kbdev->snoop_enable_smc != 0) -+ kbase_invoke_smc_fid(kbdev->snoop_enable_smc, 0, 0, 0); -+#endif /* CONFIG_ARM64 */ -+ dev_dbg(kbdev->dev, "MALI - CCI Snoops - Enabled\n"); -+ kbdev->cci_snoop_enabled = true; -+ } -+} ++#include "mali_mmu.h" ++#include "mali_hw_core.h" ++#include "mali_group.h" ++#include "mali_mmu_page_directory.h" + -+void kbase_pm_cache_snoop_disable(struct kbase_device *kbdev) -+{ -+ if (kbdev->cci_snoop_enabled) { -+#ifdef CONFIG_ARM64 -+ if (kbdev->snoop_disable_smc != 0) { -+ mali_cci_flush_l2(kbdev); -+ kbase_invoke_smc_fid(kbdev->snoop_disable_smc, 0, 0, 0); -+ } -+#endif /* CONFIG_ARM64 */ -+ dev_dbg(kbdev->dev, "MALI - CCI Snoops Disabled\n"); -+ kbdev->cci_snoop_enabled = false; -+ } -+} ++/** ++ * Size of the MMU registers in bytes ++ */ ++#define MALI_MMU_REGISTERS_SIZE 0x24 + -+static int kbase_pm_do_reset(struct kbase_device *kbdev) -+{ -+ struct kbasep_reset_timeout_data rtdata; ++/** ++ * MMU commands ++ * These are the commands that can be sent ++ * to the MMU unit. ++ */ ++typedef enum mali_mmu_command { ++ MALI_MMU_COMMAND_ENABLE_PAGING = 0x00, /**< Enable paging (memory translation) */ ++ MALI_MMU_COMMAND_DISABLE_PAGING = 0x01, /**< Disable paging (memory translation) */ ++ MALI_MMU_COMMAND_ENABLE_STALL = 0x02, /**< Enable stall on page fault */ ++ MALI_MMU_COMMAND_DISABLE_STALL = 0x03, /**< Disable stall on page fault */ ++ MALI_MMU_COMMAND_ZAP_CACHE = 0x04, /**< Zap the entire page table cache */ ++ MALI_MMU_COMMAND_PAGE_FAULT_DONE = 0x05, /**< Page fault processed */ ++ MALI_MMU_COMMAND_HARD_RESET = 0x06 /**< Reset the MMU back to power-on settings */ ++} mali_mmu_command; + -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_SOFT_RESET, NULL, NULL, 0u, 0); ++static void mali_mmu_probe_trigger(void *data); ++static _mali_osk_errcode_t mali_mmu_probe_ack(void *data); + -+ KBASE_TLSTREAM_JD_GPU_SOFT_RESET(kbdev); ++MALI_STATIC_INLINE _mali_osk_errcode_t mali_mmu_raw_reset(struct mali_mmu_core *mmu); + -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_SOFT_RESET, NULL); ++/* page fault queue flush helper pages ++ * note that the mapping pointers are currently unused outside of the initialization functions */ ++static mali_dma_addr mali_page_fault_flush_page_directory = MALI_INVALID_PAGE; ++static mali_io_address mali_page_fault_flush_page_directory_mapping = NULL; ++static mali_dma_addr mali_page_fault_flush_page_table = MALI_INVALID_PAGE; ++static mali_io_address mali_page_fault_flush_page_table_mapping = NULL; ++static mali_dma_addr mali_page_fault_flush_data_page = MALI_INVALID_PAGE; ++static mali_io_address mali_page_fault_flush_data_page_mapping = NULL; + -+ /* Unmask the reset complete interrupt only */ -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), RESET_COMPLETED, -+ NULL); ++/* an empty page directory (no address valid) which is active on any MMU not currently marked as in use */ ++static mali_dma_addr mali_empty_page_directory_phys = MALI_INVALID_PAGE; ++static mali_io_address mali_empty_page_directory_virt = NULL; + -+ /* Initialize a structure for tracking the status of the reset */ -+ rtdata.kbdev = kbdev; -+ rtdata.timed_out = 0; + -+ /* Create a timer to use as a timeout on the reset */ -+ hrtimer_init_on_stack(&rtdata.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); -+ rtdata.timer.function = kbasep_reset_timeout; ++_mali_osk_errcode_t mali_mmu_initialize(void) ++{ ++ /* allocate the helper pages */ ++ mali_empty_page_directory_phys = mali_allocate_empty_page(&mali_empty_page_directory_virt); ++ if (0 == mali_empty_page_directory_phys) { ++ MALI_DEBUG_PRINT_ERROR(("Mali MMU: Could not allocate empty page directory.\n")); ++ mali_empty_page_directory_phys = MALI_INVALID_PAGE; ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ hrtimer_start(&rtdata.timer, HR_TIMER_DELAY_MSEC(RESET_TIMEOUT), -+ HRTIMER_MODE_REL); ++ if (_MALI_OSK_ERR_OK != mali_create_fault_flush_pages(&mali_page_fault_flush_page_directory, ++ &mali_page_fault_flush_page_directory_mapping, ++ &mali_page_fault_flush_page_table, ++ &mali_page_fault_flush_page_table_mapping, ++ &mali_page_fault_flush_data_page, ++ &mali_page_fault_flush_data_page_mapping)) { ++ MALI_DEBUG_PRINT_ERROR(("Mali MMU: Could not allocate fault flush pages\n")); ++ mali_free_empty_page(mali_empty_page_directory_phys, mali_empty_page_directory_virt); ++ mali_empty_page_directory_phys = MALI_INVALID_PAGE; ++ mali_empty_page_directory_virt = NULL; ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ /* Wait for the RESET_COMPLETED interrupt to be raised */ -+ kbase_pm_wait_for_reset(kbdev); ++ return _MALI_OSK_ERR_OK; ++} + -+ if (rtdata.timed_out == 0) { -+ /* GPU has been reset */ -+ hrtimer_cancel(&rtdata.timer); -+ destroy_hrtimer_on_stack(&rtdata.timer); -+ return 0; -+ } ++void mali_mmu_terminate(void) ++{ ++ MALI_DEBUG_PRINT(3, ("Mali MMU: terminating\n")); + -+ /* No interrupt has been received - check if the RAWSTAT register says -+ * the reset has completed */ -+ if (kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_RAWSTAT), NULL) & -+ RESET_COMPLETED) { -+ /* The interrupt is set in the RAWSTAT; this suggests that the -+ * interrupts are not getting to the CPU */ -+ dev_err(kbdev->dev, "Reset interrupt didn't reach CPU. Check interrupt assignments.\n"); -+ /* If interrupts aren't working we can't continue. */ -+ destroy_hrtimer_on_stack(&rtdata.timer); -+ return -EINVAL; -+ } ++ /* Free global helper pages */ ++ mali_free_empty_page(mali_empty_page_directory_phys, mali_empty_page_directory_virt); ++ mali_empty_page_directory_phys = MALI_INVALID_PAGE; ++ mali_empty_page_directory_virt = NULL; + -+ /* The GPU doesn't seem to be responding to the reset so try a hard -+ * reset */ -+ dev_err(kbdev->dev, "Failed to soft-reset GPU (timed out after %d ms), now attempting a hard reset\n", -+ RESET_TIMEOUT); -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_HARD_RESET, NULL, NULL, 0u, 0); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_HARD_RESET, NULL); ++ /* Free the page fault flush pages */ ++ mali_destroy_fault_flush_pages(&mali_page_fault_flush_page_directory, ++ &mali_page_fault_flush_page_directory_mapping, ++ &mali_page_fault_flush_page_table, ++ &mali_page_fault_flush_page_table_mapping, ++ &mali_page_fault_flush_data_page, ++ &mali_page_fault_flush_data_page_mapping); ++} + -+ /* Restart the timer to wait for the hard reset to complete */ -+ rtdata.timed_out = 0; ++struct mali_mmu_core *mali_mmu_create(_mali_osk_resource_t *resource, struct mali_group *group, mali_bool is_virtual) ++{ ++ struct mali_mmu_core *mmu = NULL; + -+ hrtimer_start(&rtdata.timer, HR_TIMER_DELAY_MSEC(RESET_TIMEOUT), -+ HRTIMER_MODE_REL); ++ MALI_DEBUG_ASSERT_POINTER(resource); + -+ /* Wait for the RESET_COMPLETED interrupt to be raised */ -+ kbase_pm_wait_for_reset(kbdev); ++ MALI_DEBUG_PRINT(2, ("Mali MMU: Creating Mali MMU: %s\n", resource->description)); + -+ if (rtdata.timed_out == 0) { -+ /* GPU has been reset */ -+ hrtimer_cancel(&rtdata.timer); -+ destroy_hrtimer_on_stack(&rtdata.timer); -+ return 0; -+ } ++ mmu = _mali_osk_calloc(1, sizeof(struct mali_mmu_core)); ++ if (NULL != mmu) { ++ if (_MALI_OSK_ERR_OK == mali_hw_core_create(&mmu->hw_core, resource, MALI_MMU_REGISTERS_SIZE)) { ++ if (_MALI_OSK_ERR_OK == mali_group_add_mmu_core(group, mmu)) { ++ if (is_virtual) { ++ /* Skip reset and IRQ setup for virtual MMU */ ++ return mmu; ++ } + -+ destroy_hrtimer_on_stack(&rtdata.timer); ++ if (_MALI_OSK_ERR_OK == mali_mmu_reset(mmu)) { ++ /* Setup IRQ handlers (which will do IRQ probing if needed) */ ++ mmu->irq = _mali_osk_irq_init(resource->irq, ++ mali_group_upper_half_mmu, ++ group, ++ mali_mmu_probe_trigger, ++ mali_mmu_probe_ack, ++ mmu, ++ resource->description); ++ if (NULL != mmu->irq) { ++ return mmu; ++ } else { ++ MALI_PRINT_ERROR(("Mali MMU: Failed to setup interrupt handlers for MMU %s\n", mmu->hw_core.description)); ++ } ++ } ++ mali_group_remove_mmu_core(group); ++ } else { ++ MALI_PRINT_ERROR(("Mali MMU: Failed to add core %s to group\n", mmu->hw_core.description)); ++ } ++ mali_hw_core_delete(&mmu->hw_core); ++ } + -+ dev_err(kbdev->dev, "Failed to hard-reset the GPU (timed out after %d ms)\n", -+ RESET_TIMEOUT); ++ _mali_osk_free(mmu); ++ } else { ++ MALI_PRINT_ERROR(("Failed to allocate memory for MMU\n")); ++ } + -+ return -EINVAL; ++ return NULL; +} + -+static int kbasep_protected_mode_enable(struct protected_mode_device *pdev) ++void mali_mmu_delete(struct mali_mmu_core *mmu) +{ -+ struct kbase_device *kbdev = pdev->data; ++ if (NULL != mmu->irq) { ++ _mali_osk_irq_term(mmu->irq); ++ } + -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_SET_PROTECTED_MODE, NULL); -+ return 0; ++ mali_hw_core_delete(&mmu->hw_core); ++ _mali_osk_free(mmu); +} + -+static int kbasep_protected_mode_disable(struct protected_mode_device *pdev) ++static void mali_mmu_enable_paging(struct mali_mmu_core *mmu) +{ -+ struct kbase_device *kbdev = pdev->data; ++ int i; + -+ lockdep_assert_held(&kbdev->pm.lock); ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_ENABLE_PAGING); + -+ return kbase_pm_do_reset(kbdev); ++ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; ++i) { ++ if (mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS) & MALI_MMU_STATUS_BIT_PAGING_ENABLED) { ++ break; ++ } ++ } ++ if (MALI_REG_POLL_COUNT_FAST == i) { ++ MALI_PRINT_ERROR(("Enable paging request failed, MMU status is 0x%08X\n", mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS))); ++ } +} + -+struct protected_mode_ops kbase_native_protected_ops = { -+ .protected_mode_enable = kbasep_protected_mode_enable, -+ .protected_mode_disable = kbasep_protected_mode_disable -+}; -+ -+int kbase_pm_init_hw(struct kbase_device *kbdev, unsigned int flags) ++/** ++ * Issues the enable stall command to the MMU and waits for HW to complete the request ++ * @param mmu The MMU to enable paging for ++ * @return MALI_TRUE if HW stall was successfully engaged, otherwise MALI_FALSE (req timed out) ++ */ ++static mali_bool mali_mmu_enable_stall(struct mali_mmu_core *mmu) +{ -+ unsigned long irq_flags; -+ int err; -+ bool resume_vinstr = false; ++ int i; ++ u32 mmu_status = mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS); + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); -+ lockdep_assert_held(&kbdev->pm.lock); ++ if (0 == (mmu_status & MALI_MMU_STATUS_BIT_PAGING_ENABLED)) { ++ MALI_DEBUG_PRINT(4, ("MMU stall is implicit when Paging is not enabled.\n")); ++ return MALI_TRUE; ++ } + -+ /* Ensure the clock is on before attempting to access the hardware */ -+ if (!kbdev->pm.backend.gpu_powered) { -+ if (kbdev->pm.backend.callback_power_on) -+ kbdev->pm.backend.callback_power_on(kbdev); ++ if (mmu_status & MALI_MMU_STATUS_BIT_PAGE_FAULT_ACTIVE) { ++ MALI_DEBUG_PRINT(3, ("Aborting MMU stall request since it is in pagefault state.\n")); ++ return MALI_FALSE; ++ } + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, -+ irq_flags); -+ kbdev->pm.backend.gpu_powered = true; -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, -+ irq_flags); ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_ENABLE_STALL); ++ ++ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; ++i) { ++ mmu_status = mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS); ++ if (mmu_status & MALI_MMU_STATUS_BIT_PAGE_FAULT_ACTIVE) { ++ break; ++ } ++ if ((mmu_status & MALI_MMU_STATUS_BIT_STALL_ACTIVE) && (0 == (mmu_status & MALI_MMU_STATUS_BIT_STALL_NOT_ACTIVE))) { ++ break; ++ } ++ if (0 == (mmu_status & (MALI_MMU_STATUS_BIT_PAGING_ENABLED))) { ++ break; ++ } ++ } ++ if (MALI_REG_POLL_COUNT_FAST == i) { ++ MALI_DEBUG_PRINT(2, ("Enable stall request failed, MMU status is 0x%08X\n", mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS))); ++ return MALI_FALSE; + } + -+ /* Ensure interrupts are off to begin with, this also clears any -+ * outstanding interrupts */ -+ kbase_pm_disable_interrupts(kbdev); -+ /* Ensure cache snoops are disabled before reset. */ -+ kbase_pm_cache_snoop_disable(kbdev); -+ /* Prepare for the soft-reset */ -+ kbdev->pm.backend.reset_done = false; ++ if (mmu_status & MALI_MMU_STATUS_BIT_PAGE_FAULT_ACTIVE) { ++ MALI_DEBUG_PRINT(2, ("Aborting MMU stall request since it has a pagefault.\n")); ++ return MALI_FALSE; ++ } + -+ /* The cores should be made unavailable due to the reset */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, irq_flags); -+ if (kbdev->shader_available_bitmap != 0u) -+ KBASE_TRACE_ADD(kbdev, PM_CORES_CHANGE_AVAILABLE, NULL, -+ NULL, 0u, (u32)0u); -+ if (kbdev->tiler_available_bitmap != 0u) -+ KBASE_TRACE_ADD(kbdev, PM_CORES_CHANGE_AVAILABLE_TILER, -+ NULL, NULL, 0u, (u32)0u); -+ kbdev->shader_available_bitmap = 0u; -+ kbdev->tiler_available_bitmap = 0u; -+ kbdev->l2_available_bitmap = 0u; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, irq_flags); ++ return MALI_TRUE; ++} + -+ /* Soft reset the GPU */ -+ if (kbdev->protected_mode_support) -+ err = kbdev->protected_ops->protected_mode_disable( -+ kbdev->protected_dev); -+ else -+ err = kbase_pm_do_reset(kbdev); ++/** ++ * Issues the disable stall command to the MMU and waits for HW to complete the request ++ * @param mmu The MMU to enable paging for ++ */ ++static void mali_mmu_disable_stall(struct mali_mmu_core *mmu) ++{ ++ int i; ++ u32 mmu_status = mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, irq_flags); -+ if (kbdev->protected_mode) -+ resume_vinstr = true; -+ kbdev->protected_mode = false; -+ kbase_ipa_model_use_configured_locked(kbdev); ++ if (0 == (mmu_status & MALI_MMU_STATUS_BIT_PAGING_ENABLED)) { ++ MALI_DEBUG_PRINT(3, ("MMU disable skipped since it was not enabled.\n")); ++ return; ++ } ++ if (mmu_status & MALI_MMU_STATUS_BIT_PAGE_FAULT_ACTIVE) { ++ MALI_DEBUG_PRINT(2, ("Aborting MMU disable stall request since it is in pagefault state.\n")); ++ return; ++ } + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, irq_flags); ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_DISABLE_STALL); + -+ if (err) -+ goto exit; ++ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; ++i) { ++ u32 status = mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS); ++ if (0 == (status & MALI_MMU_STATUS_BIT_STALL_ACTIVE)) { ++ break; ++ } ++ if (status & MALI_MMU_STATUS_BIT_PAGE_FAULT_ACTIVE) { ++ break; ++ } ++ if (0 == (mmu_status & MALI_MMU_STATUS_BIT_PAGING_ENABLED)) { ++ break; ++ } ++ } ++ if (MALI_REG_POLL_COUNT_FAST == i) MALI_DEBUG_PRINT(1, ("Disable stall request failed, MMU status is 0x%08X\n", mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS))); ++} + -+ if (flags & PM_HW_ISSUES_DETECT) -+ kbase_pm_hw_issues_detect(kbdev); ++void mali_mmu_page_fault_done(struct mali_mmu_core *mmu) ++{ ++ MALI_DEBUG_PRINT(4, ("Mali MMU: %s: Leaving page fault mode\n", mmu->hw_core.description)); ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_PAGE_FAULT_DONE); ++} + -+ kbase_pm_hw_issues_apply(kbdev); -+ kbase_cache_set_coherency_mode(kbdev, kbdev->system_coherency); ++MALI_STATIC_INLINE _mali_osk_errcode_t mali_mmu_raw_reset(struct mali_mmu_core *mmu) ++{ ++ int i; + -+ /* Sanity check protected mode was left after reset */ -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_MODE)) { -+ u32 gpu_status = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(GPU_STATUS), NULL); ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_DTE_ADDR, 0xCAFEBABE); ++ MALI_DEBUG_ASSERT(0xCAFEB000 == mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_DTE_ADDR)); ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_HARD_RESET); + -+ WARN_ON(gpu_status & GPU_STATUS_PROTECTED_MODE_ACTIVE); ++ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; ++i) { ++ if (mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_DTE_ADDR) == 0) { ++ break; ++ } ++ } ++ if (MALI_REG_POLL_COUNT_FAST == i) { ++ MALI_PRINT_ERROR(("Reset request failed, MMU status is 0x%08X\n", mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS))); ++ return _MALI_OSK_ERR_FAULT; + } + -+ /* If cycle counter was in use re-enable it, enable_irqs will only be -+ * false when called from kbase_pm_powerup */ -+ if (kbdev->pm.backend.gpu_cycle_counter_requests && -+ (flags & PM_ENABLE_IRQS)) { -+ /* enable interrupts as the L2 may have to be powered on */ -+ kbase_pm_enable_interrupts(kbdev); -+ kbase_pm_request_l2_caches(kbdev); -+ -+ /* Re-enable the counters if we need to */ -+ spin_lock_irqsave( -+ &kbdev->pm.backend.gpu_cycle_counter_requests_lock, -+ irq_flags); -+ if (kbdev->pm.backend.gpu_cycle_counter_requests) -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_CYCLE_COUNT_START, NULL); -+ spin_unlock_irqrestore( -+ &kbdev->pm.backend.gpu_cycle_counter_requests_lock, -+ irq_flags); ++ return _MALI_OSK_ERR_OK; ++} + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, irq_flags); -+ kbase_pm_release_l2_caches(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, irq_flags); ++_mali_osk_errcode_t mali_mmu_reset(struct mali_mmu_core *mmu) ++{ ++ _mali_osk_errcode_t err = _MALI_OSK_ERR_FAULT; ++ mali_bool stall_success; ++ MALI_DEBUG_ASSERT_POINTER(mmu); + -+ kbase_pm_disable_interrupts(kbdev); ++ stall_success = mali_mmu_enable_stall(mmu); ++ if (!stall_success) { ++ err = _MALI_OSK_ERR_BUSY; + } + -+ if (flags & PM_ENABLE_IRQS) -+ kbase_pm_enable_interrupts(kbdev); ++ MALI_DEBUG_PRINT(3, ("Mali MMU: mali_kernel_mmu_reset: %s\n", mmu->hw_core.description)); + -+exit: -+ /* If GPU is leaving protected mode resume vinstr operation. */ -+ if (kbdev->vinstr_ctx && resume_vinstr) -+ kbase_vinstr_resume(kbdev->vinstr_ctx); ++ if (_MALI_OSK_ERR_OK == mali_mmu_raw_reset(mmu)) { ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_INT_MASK, MALI_MMU_INTERRUPT_PAGE_FAULT | MALI_MMU_INTERRUPT_READ_BUS_ERROR); ++ /* no session is active, so just activate the empty page directory */ ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_DTE_ADDR, mali_empty_page_directory_phys); ++ mali_mmu_enable_paging(mmu); ++ err = _MALI_OSK_ERR_OK; ++ } ++ mali_mmu_disable_stall(mmu); + + return err; +} + -+/** -+ * kbase_pm_request_gpu_cycle_counter_do_request - Request cycle counters -+ * -+ * Increase the count of cycle counter users and turn the cycle counters on if -+ * they were previously off -+ * -+ * This function is designed to be called by -+ * kbase_pm_request_gpu_cycle_counter() or -+ * kbase_pm_request_gpu_cycle_counter_l2_is_on() only -+ * -+ * When this function is called the l2 cache must be on and the l2 cache users -+ * count must have been incremented by a call to ( -+ * kbase_pm_request_l2_caches() or kbase_pm_request_l2_caches_l2_on() ) -+ * -+ * @kbdev: The kbase device structure of the device -+ */ -+static void -+kbase_pm_request_gpu_cycle_counter_do_request(struct kbase_device *kbdev) ++mali_bool mali_mmu_zap_tlb(struct mali_mmu_core *mmu) +{ -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_cycle_counter_requests_lock, -+ flags); ++ mali_bool stall_success = mali_mmu_enable_stall(mmu); + -+ ++kbdev->pm.backend.gpu_cycle_counter_requests; ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_ZAP_CACHE); + -+ if (1 == kbdev->pm.backend.gpu_cycle_counter_requests) -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_CYCLE_COUNT_START, NULL); ++ if (MALI_FALSE == stall_success) { ++ /* False means that it is in Pagefault state. Not possible to disable_stall then */ ++ return MALI_FALSE; ++ } + -+ spin_unlock_irqrestore( -+ &kbdev->pm.backend.gpu_cycle_counter_requests_lock, -+ flags); ++ mali_mmu_disable_stall(mmu); ++ return MALI_TRUE; +} + -+void kbase_pm_request_gpu_cycle_counter(struct kbase_device *kbdev) ++void mali_mmu_zap_tlb_without_stall(struct mali_mmu_core *mmu) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_powered); -+ -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_cycle_counter_requests < -+ INT_MAX); ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_ZAP_CACHE); ++} + -+ kbase_pm_request_l2_caches(kbdev); + -+ kbase_pm_request_gpu_cycle_counter_do_request(kbdev); ++void mali_mmu_invalidate_page(struct mali_mmu_core *mmu, u32 mali_address) ++{ ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_ZAP_ONE_LINE, MALI_MMU_PDE_ENTRY(mali_address)); +} + -+KBASE_EXPORT_TEST_API(kbase_pm_request_gpu_cycle_counter); -+ -+void kbase_pm_request_gpu_cycle_counter_l2_is_on(struct kbase_device *kbdev) ++static void mali_mmu_activate_address_space(struct mali_mmu_core *mmu, u32 page_directory) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ /* The MMU must be in stalled or page fault mode, for this writing to work */ ++ MALI_DEBUG_ASSERT(0 != (mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS) ++ & (MALI_MMU_STATUS_BIT_STALL_ACTIVE | MALI_MMU_STATUS_BIT_PAGE_FAULT_ACTIVE))); ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_DTE_ADDR, page_directory); ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_ZAP_CACHE); + -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_powered); ++} + -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_cycle_counter_requests < -+ INT_MAX); ++void mali_mmu_activate_page_directory(struct mali_mmu_core *mmu, struct mali_page_directory *pagedir) ++{ ++ mali_bool stall_success; ++ MALI_DEBUG_ASSERT_POINTER(mmu); + -+ kbase_pm_request_l2_caches_l2_is_on(kbdev); ++ MALI_DEBUG_PRINT(5, ("Asked to activate page directory 0x%x on MMU %s\n", pagedir, mmu->hw_core.description)); + -+ kbase_pm_request_gpu_cycle_counter_do_request(kbdev); ++ stall_success = mali_mmu_enable_stall(mmu); ++ MALI_DEBUG_ASSERT(stall_success); ++ MALI_IGNORE(stall_success); ++ mali_mmu_activate_address_space(mmu, pagedir->page_directory); ++ mali_mmu_disable_stall(mmu); +} + -+KBASE_EXPORT_TEST_API(kbase_pm_request_gpu_cycle_counter_l2_is_on); -+ -+void kbase_pm_release_gpu_cycle_counter_nolock(struct kbase_device *kbdev) ++void mali_mmu_activate_empty_page_directory(struct mali_mmu_core *mmu) +{ -+ unsigned long flags; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ mali_bool stall_success; + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_cycle_counter_requests_lock, -+ flags); ++ MALI_DEBUG_ASSERT_POINTER(mmu); ++ MALI_DEBUG_PRINT(3, ("Activating the empty page directory on MMU %s\n", mmu->hw_core.description)); + -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_cycle_counter_requests > 0); ++ stall_success = mali_mmu_enable_stall(mmu); + -+ --kbdev->pm.backend.gpu_cycle_counter_requests; ++ /* This function can only be called when the core is idle, so it could not fail. */ ++ MALI_DEBUG_ASSERT(stall_success); ++ MALI_IGNORE(stall_success); + -+ if (0 == kbdev->pm.backend.gpu_cycle_counter_requests) -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_CYCLE_COUNT_STOP, NULL); ++ mali_mmu_activate_address_space(mmu, mali_empty_page_directory_phys); ++ mali_mmu_disable_stall(mmu); ++} + -+ spin_unlock_irqrestore( -+ &kbdev->pm.backend.gpu_cycle_counter_requests_lock, -+ flags); ++void mali_mmu_activate_fault_flush_page_directory(struct mali_mmu_core *mmu) ++{ ++ mali_bool stall_success; ++ MALI_DEBUG_ASSERT_POINTER(mmu); + -+ kbase_pm_release_l2_caches(kbdev); ++ MALI_DEBUG_PRINT(3, ("Activating the page fault flush page directory on MMU %s\n", mmu->hw_core.description)); ++ stall_success = mali_mmu_enable_stall(mmu); ++ /* This function is expect to fail the stalling, since it might be in PageFault mode when it is called */ ++ mali_mmu_activate_address_space(mmu, mali_page_fault_flush_page_directory); ++ if (MALI_TRUE == stall_success) mali_mmu_disable_stall(mmu); +} + -+void kbase_pm_release_gpu_cycle_counter(struct kbase_device *kbdev) ++/* Is called when we want the mmu to give an interrupt */ ++static void mali_mmu_probe_trigger(void *data) +{ -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ struct mali_mmu_core *mmu = (struct mali_mmu_core *)data; ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_INT_RAWSTAT, MALI_MMU_INTERRUPT_PAGE_FAULT | MALI_MMU_INTERRUPT_READ_BUS_ERROR); ++} + -+ kbase_pm_release_gpu_cycle_counter_nolock(kbdev); ++/* Is called when the irq probe wants the mmu to acknowledge an interrupt from the hw */ ++static _mali_osk_errcode_t mali_mmu_probe_ack(void *data) ++{ ++ struct mali_mmu_core *mmu = (struct mali_mmu_core *)data; ++ u32 int_stat; + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+} -+ -+KBASE_EXPORT_TEST_API(kbase_pm_release_gpu_cycle_counter); -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_internal.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_internal.h -new file mode 100755 -index 000000000000..9fbe094541c5 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_internal.h -@@ -0,0 +1,548 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ int_stat = mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_INT_STATUS); + ++ MALI_DEBUG_PRINT(2, ("mali_mmu_probe_irq_acknowledge: intstat 0x%x\n", int_stat)); ++ if (int_stat & MALI_MMU_INTERRUPT_PAGE_FAULT) { ++ MALI_DEBUG_PRINT(2, ("Probe: Page fault detect: PASSED\n")); ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_INT_CLEAR, MALI_MMU_INTERRUPT_PAGE_FAULT); ++ } else { ++ MALI_DEBUG_PRINT(1, ("Probe: Page fault detect: FAILED\n")); ++ } + ++ if (int_stat & MALI_MMU_INTERRUPT_READ_BUS_ERROR) { ++ MALI_DEBUG_PRINT(2, ("Probe: Bus read error detect: PASSED\n")); ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_INT_CLEAR, MALI_MMU_INTERRUPT_READ_BUS_ERROR); ++ } else { ++ MALI_DEBUG_PRINT(1, ("Probe: Bus read error detect: FAILED\n")); ++ } + ++ if ((int_stat & (MALI_MMU_INTERRUPT_PAGE_FAULT | MALI_MMU_INTERRUPT_READ_BUS_ERROR)) == ++ (MALI_MMU_INTERRUPT_PAGE_FAULT | MALI_MMU_INTERRUPT_READ_BUS_ERROR)) { ++ return _MALI_OSK_ERR_OK; ++ } + ++ return _MALI_OSK_ERR_FAULT; ++} + ++#if 0 ++void mali_mmu_print_state(struct mali_mmu_core *mmu) ++{ ++ MALI_DEBUG_PRINT(2, ("MMU: State of %s is 0x%08x\n", mmu->hw_core.description, mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS))); ++} ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu.h b/drivers/gpu/arm/mali400/mali/common/mali_mmu.h +new file mode 100755 +index 000000000..6ed48585f +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.h +@@ -0,0 +1,124 @@ +/* -+ * Power management API definitions used internally by GPU backend ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + -+#ifndef _KBASE_BACKEND_PM_INTERNAL_H_ -+#define _KBASE_BACKEND_PM_INTERNAL_H_ -+ -+#include -+ -+#include "mali_kbase_pm_ca.h" -+#include "mali_kbase_pm_policy.h" -+ -+ -+/** -+ * kbase_pm_dev_idle - The GPU is idle. -+ * -+ * The OS may choose to turn off idle devices -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_dev_idle(struct kbase_device *kbdev); ++#ifndef __MALI_MMU_H__ ++#define __MALI_MMU_H__ + -+/** -+ * kbase_pm_dev_activate - The GPU is active. -+ * -+ * The OS should avoid opportunistically turning off the GPU while it is active -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_dev_activate(struct kbase_device *kbdev); ++#include "mali_osk.h" ++#include "mali_mmu_page_directory.h" ++#include "mali_hw_core.h" + -+/** -+ * kbase_pm_get_present_cores - Get details of the cores that are present in -+ * the device. -+ * -+ * This function can be called by the active power policy to return a bitmask of -+ * the cores (of a specified type) present in the GPU device and also a count of -+ * the number of cores. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid -+ * pointer) -+ * @type: The type of core (see the enum kbase_pm_core_type enumeration) -+ * -+ * Return: The bit mask of cores present -+ */ -+u64 kbase_pm_get_present_cores(struct kbase_device *kbdev, -+ enum kbase_pm_core_type type); ++/* Forward declaration from mali_group.h */ ++struct mali_group; + +/** -+ * kbase_pm_get_active_cores - Get details of the cores that are currently -+ * active in the device. -+ * -+ * This function can be called by the active power policy to return a bitmask of -+ * the cores (of a specified type) that are actively processing work (i.e. -+ * turned on *and* busy). -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * @type: The type of core (see the enum kbase_pm_core_type enumeration) -+ * -+ * Return: The bit mask of active cores ++ * MMU register numbers ++ * Used in the register read/write routines. ++ * See the hardware documentation for more information about each register + */ -+u64 kbase_pm_get_active_cores(struct kbase_device *kbdev, -+ enum kbase_pm_core_type type); ++typedef enum mali_mmu_register { ++ MALI_MMU_REGISTER_DTE_ADDR = 0x0000, /**< Current Page Directory Pointer */ ++ MALI_MMU_REGISTER_STATUS = 0x0004, /**< Status of the MMU */ ++ MALI_MMU_REGISTER_COMMAND = 0x0008, /**< Command register, used to control the MMU */ ++ MALI_MMU_REGISTER_PAGE_FAULT_ADDR = 0x000C, /**< Logical address of the last page fault */ ++ MALI_MMU_REGISTER_ZAP_ONE_LINE = 0x010, /**< Used to invalidate the mapping of a single page from the MMU */ ++ MALI_MMU_REGISTER_INT_RAWSTAT = 0x0014, /**< Raw interrupt status, all interrupts visible */ ++ MALI_MMU_REGISTER_INT_CLEAR = 0x0018, /**< Indicate to the MMU that the interrupt has been received */ ++ MALI_MMU_REGISTER_INT_MASK = 0x001C, /**< Enable/disable types of interrupts */ ++ MALI_MMU_REGISTER_INT_STATUS = 0x0020 /**< Interrupt status based on the mask */ ++} mali_mmu_register; + +/** -+ * kbase_pm_get_trans_cores - Get details of the cores that are currently -+ * transitioning between power states. -+ * -+ * This function can be called by the active power policy to return a bitmask of -+ * the cores (of a specified type) that are currently transitioning between -+ * power states. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * @type: The type of core (see the enum kbase_pm_core_type enumeration) -+ * -+ * Return: The bit mask of transitioning cores ++ * MMU interrupt register bits ++ * Each cause of the interrupt is reported ++ * through the (raw) interrupt status registers. ++ * Multiple interrupts can be pending, so multiple bits ++ * can be set at once. + */ -+u64 kbase_pm_get_trans_cores(struct kbase_device *kbdev, -+ enum kbase_pm_core_type type); ++typedef enum mali_mmu_interrupt { ++ MALI_MMU_INTERRUPT_PAGE_FAULT = 0x01, /**< A page fault occured */ ++ MALI_MMU_INTERRUPT_READ_BUS_ERROR = 0x02 /**< A bus read error occured */ ++} mali_mmu_interrupt; + -+/** -+ * kbase_pm_get_ready_cores - Get details of the cores that are currently -+ * powered and ready for jobs. -+ * -+ * This function can be called by the active power policy to return a bitmask of -+ * the cores (of a specified type) that are powered and ready for jobs (they may -+ * or may not be currently executing jobs). -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * @type: The type of core (see the enum kbase_pm_core_type enumeration) -+ * -+ * Return: The bit mask of ready cores -+ */ -+u64 kbase_pm_get_ready_cores(struct kbase_device *kbdev, -+ enum kbase_pm_core_type type); ++typedef enum mali_mmu_status_bits { ++ MALI_MMU_STATUS_BIT_PAGING_ENABLED = 1 << 0, ++ MALI_MMU_STATUS_BIT_PAGE_FAULT_ACTIVE = 1 << 1, ++ MALI_MMU_STATUS_BIT_STALL_ACTIVE = 1 << 2, ++ MALI_MMU_STATUS_BIT_IDLE = 1 << 3, ++ MALI_MMU_STATUS_BIT_REPLAY_BUFFER_EMPTY = 1 << 4, ++ MALI_MMU_STATUS_BIT_PAGE_FAULT_IS_WRITE = 1 << 5, ++ MALI_MMU_STATUS_BIT_STALL_NOT_ACTIVE = 1 << 31, ++} mali_mmu_status_bits; + +/** -+ * kbase_pm_clock_on - Turn the clock for the device on, and enable device -+ * interrupts. -+ * -+ * This function can be used by a power policy to turn the clock for the GPU on. -+ * It should be modified during integration to perform the necessary actions to -+ * ensure that the GPU is fully powered and clocked. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid -+ * pointer) -+ * @is_resume: true if clock on due to resume after suspend, false otherwise ++ * Definition of the MMU struct ++ * Used to track a MMU unit in the system. ++ * Contains information about the mapping of the registers + */ -+void kbase_pm_clock_on(struct kbase_device *kbdev, bool is_resume); ++struct mali_mmu_core { ++ struct mali_hw_core hw_core; /**< Common for all HW cores */ ++ _mali_osk_irq_t *irq; /**< IRQ handler */ ++}; + -+/** -+ * kbase_pm_clock_off - Disable device interrupts, and turn the clock for the -+ * device off. -+ * -+ * This function can be used by a power policy to turn the clock for the GPU -+ * off. It should be modified during integration to perform the necessary -+ * actions to turn the clock off (if this is possible in the integration). -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid -+ * pointer) -+ * @is_suspend: true if clock off due to suspend, false otherwise -+ * -+ * Return: true if clock was turned off, or -+ * false if clock can not be turned off due to pending page/bus fault -+ * workers. Caller must flush MMU workqueues and retry -+ */ -+bool kbase_pm_clock_off(struct kbase_device *kbdev, bool is_suspend); ++_mali_osk_errcode_t mali_mmu_initialize(void); + -+/** -+ * kbase_pm_enable_interrupts - Enable interrupts on the device. -+ * -+ * Interrupts are also enabled after a call to kbase_pm_clock_on(). -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_enable_interrupts(struct kbase_device *kbdev); ++void mali_mmu_terminate(void); + -+/** -+ * kbase_pm_disable_interrupts - Disable interrupts on the device. -+ * -+ * This prevents delivery of Power Management interrupts to the CPU so that -+ * kbase_pm_check_transitions_nolock() will not be called from the IRQ handler -+ * until kbase_pm_enable_interrupts() or kbase_pm_clock_on() is called. -+ * -+ * Interrupts are also disabled after a call to kbase_pm_clock_off(). -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_disable_interrupts(struct kbase_device *kbdev); ++struct mali_mmu_core *mali_mmu_create(_mali_osk_resource_t *resource, struct mali_group *group, mali_bool is_virtual); ++void mali_mmu_delete(struct mali_mmu_core *mmu); + -+/** -+ * kbase_pm_disable_interrupts_nolock - Version of kbase_pm_disable_interrupts() -+ * that does not take the hwaccess_lock -+ * -+ * Caller must hold the hwaccess_lock. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_disable_interrupts_nolock(struct kbase_device *kbdev); ++_mali_osk_errcode_t mali_mmu_reset(struct mali_mmu_core *mmu); ++mali_bool mali_mmu_zap_tlb(struct mali_mmu_core *mmu); ++void mali_mmu_zap_tlb_without_stall(struct mali_mmu_core *mmu); ++void mali_mmu_invalidate_page(struct mali_mmu_core *mmu, u32 mali_address); + -+/** -+ * kbase_pm_init_hw - Initialize the hardware. -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * @flags: Flags specifying the type of PM init -+ * -+ * This function checks the GPU ID register to ensure that the GPU is supported -+ * by the driver and performs a reset on the device so that it is in a known -+ * state before the device is used. -+ * -+ * Return: 0 if the device is supported and successfully reset. -+ */ -+int kbase_pm_init_hw(struct kbase_device *kbdev, unsigned int flags); ++void mali_mmu_activate_page_directory(struct mali_mmu_core *mmu, struct mali_page_directory *pagedir); ++void mali_mmu_activate_empty_page_directory(struct mali_mmu_core *mmu); ++void mali_mmu_activate_fault_flush_page_directory(struct mali_mmu_core *mmu); + -+/** -+ * kbase_pm_reset_done - The GPU has been reset successfully. -+ * -+ * This function must be called by the GPU interrupt handler when the -+ * RESET_COMPLETED bit is set. It signals to the power management initialization -+ * code that the GPU has been successfully reset. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_reset_done(struct kbase_device *kbdev); ++void mali_mmu_page_fault_done(struct mali_mmu_core *mmu); + ++MALI_STATIC_INLINE enum mali_interrupt_result mali_mmu_get_interrupt_result(struct mali_mmu_core *mmu) ++{ ++ u32 rawstat_used = mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_INT_RAWSTAT); ++ if (0 == rawstat_used) { ++ return MALI_INTERRUPT_RESULT_NONE; ++ } + -+/** -+ * kbase_pm_check_transitions_nolock - Check if there are any power transitions -+ * to make, and if so start them. -+ * -+ * This function will check the desired_xx_state members of -+ * struct kbase_pm_device_data and the actual status of the hardware to see if -+ * any power transitions can be made at this time to make the hardware state -+ * closer to the state desired by the power policy. -+ * -+ * The return value can be used to check whether all the desired cores are -+ * available, and so whether it's worth submitting a job (e.g. from a Power -+ * Management IRQ). -+ * -+ * Note that this still returns true when desired_xx_state has no -+ * cores. That is: of the no cores desired, none were *un*available. In -+ * this case, the caller may still need to try submitting jobs. This is because -+ * the Core Availability Policy might have taken us to an intermediate state -+ * where no cores are powered, before powering on more cores (e.g. for core -+ * rotation) -+ * -+ * The caller must hold kbase_device.pm.power_change_lock -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * Return: non-zero when all desired cores are available. That is, -+ * it's worthwhile for the caller to submit a job. -+ * false otherwise -+ */ -+bool kbase_pm_check_transitions_nolock(struct kbase_device *kbdev); ++ return MALI_INTERRUPT_RESULT_ERROR; ++} + -+/** -+ * kbase_pm_check_transitions_sync - Synchronous and locking variant of -+ * kbase_pm_check_transitions_nolock() -+ * -+ * On returning, the desired state at the time of the call will have been met. -+ * -+ * There is nothing to stop the core being switched off by calls to -+ * kbase_pm_release_cores() or kbase_pm_unrequest_cores(). Therefore, the -+ * caller must have already made a call to -+ * kbase_pm_request_cores()/kbase_pm_request_cores_sync() previously. -+ * -+ * The usual use-case for this is to ensure cores are 'READY' after performing -+ * a GPU Reset. -+ * -+ * Unlike kbase_pm_check_transitions_nolock(), the caller must not hold -+ * kbase_device.pm.power_change_lock, because this function will take that -+ * lock itself. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_check_transitions_sync(struct kbase_device *kbdev); + -+/** -+ * kbase_pm_update_cores_state_nolock - Variant of kbase_pm_update_cores_state() -+ * where the caller must hold -+ * kbase_device.pm.power_change_lock -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_update_cores_state_nolock(struct kbase_device *kbdev); ++MALI_STATIC_INLINE u32 mali_mmu_get_int_status(struct mali_mmu_core *mmu) ++{ ++ return mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_INT_STATUS); ++} + -+/** -+ * kbase_pm_update_cores_state - Update the desired state of shader cores from -+ * the Power Policy, and begin any power -+ * transitions. -+ * -+ * This function will update the desired_xx_state members of -+ * struct kbase_pm_device_data by calling into the current Power Policy. It will -+ * then begin power transitions to make the hardware acheive the desired shader -+ * core state. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_update_cores_state(struct kbase_device *kbdev); ++MALI_STATIC_INLINE u32 mali_mmu_get_rawstat(struct mali_mmu_core *mmu) ++{ ++ return mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_INT_RAWSTAT); ++} + -+/** -+ * kbase_pm_cancel_deferred_poweroff - Cancel any pending requests to power off -+ * the GPU and/or shader cores. -+ * -+ * This should be called by any functions which directly power off the GPU. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_cancel_deferred_poweroff(struct kbase_device *kbdev); ++MALI_STATIC_INLINE void mali_mmu_mask_all_interrupts(struct mali_mmu_core *mmu) ++{ ++ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_INT_MASK, 0); ++} + -+/** -+ * kbasep_pm_init_core_use_bitmaps - Initialise data tracking the required -+ * and used cores. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbasep_pm_init_core_use_bitmaps(struct kbase_device *kbdev); ++MALI_STATIC_INLINE u32 mali_mmu_get_status(struct mali_mmu_core *mmu) ++{ ++ return mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS); ++} + -+/** -+ * kbasep_pm_metrics_init - Initialize the metrics gathering framework. -+ * -+ * This must be called before other metric gathering APIs are called. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * Return: 0 on success, error code on error -+ */ -+int kbasep_pm_metrics_init(struct kbase_device *kbdev); ++MALI_STATIC_INLINE u32 mali_mmu_get_page_fault_addr(struct mali_mmu_core *mmu) ++{ ++ return mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_PAGE_FAULT_ADDR); ++} + -+/** -+ * kbasep_pm_metrics_term - Terminate the metrics gathering framework. -+ * -+ * This must be called when metric gathering is no longer required. It is an -+ * error to call any metrics gathering function (other than -+ * kbasep_pm_metrics_init()) after calling this function. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++#endif /* __MALI_MMU_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c +new file mode 100755 +index 000000000..9ad3e8970 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c +@@ -0,0 +1,495 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+void kbasep_pm_metrics_term(struct kbase_device *kbdev); + -+/** -+ * kbase_pm_report_vsync - Function to be called by the frame buffer driver to -+ * update the vsync metric. -+ * -+ * This function should be called by the frame buffer driver to update whether -+ * the system is hitting the vsync target or not. buffer_updated should be true -+ * if the vsync corresponded with a new frame being displayed, otherwise it -+ * should be false. This function does not need to be called every vsync, but -+ * only when the value of @buffer_updated differs from a previous call. -+ * -+ * @kbdev: The kbase device structure for the device (must be a -+ * valid pointer) -+ * @buffer_updated: True if the buffer has been updated on this VSync, -+ * false otherwise -+ */ -+void kbase_pm_report_vsync(struct kbase_device *kbdev, int buffer_updated); ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_ukk.h" ++#include "mali_uk_types.h" ++#include "mali_mmu_page_directory.h" ++#include "mali_memory.h" ++#include "mali_l2_cache.h" + -+/** -+ * kbase_pm_get_dvfs_action - Determine whether the DVFS system should change -+ * the clock speed of the GPU. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * This function should be called regularly by the DVFS system to check whether -+ * the clock speed of the GPU needs updating. -+ */ -+void kbase_pm_get_dvfs_action(struct kbase_device *kbdev); ++static _mali_osk_errcode_t fill_page(mali_io_address mapping, u32 data); + -+/** -+ * kbase_pm_request_gpu_cycle_counter - Mark that the GPU cycle counter is -+ * needed -+ * -+ * If the caller is the first caller then the GPU cycle counters will be enabled -+ * along with the l2 cache -+ * -+ * The GPU must be powered when calling this function (i.e. -+ * kbase_pm_context_active() must have been called). -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_request_gpu_cycle_counter(struct kbase_device *kbdev); ++u32 mali_allocate_empty_page(mali_io_address *virt_addr) ++{ ++ _mali_osk_errcode_t err; ++ mali_io_address mapping; ++ mali_dma_addr address; + -+/** -+ * kbase_pm_request_gpu_cycle_counter_l2_is_on - Mark GPU cycle counter is -+ * needed (l2 cache already on) -+ * -+ * This is a version of the above function -+ * (kbase_pm_request_gpu_cycle_counter()) suitable for being called when the -+ * l2 cache is known to be on and assured to be on until the subsequent call of -+ * kbase_pm_release_gpu_cycle_counter() such as when a job is submitted. It does -+ * not sleep and can be called from atomic functions. -+ * -+ * The GPU must be powered when calling this function (i.e. -+ * kbase_pm_context_active() must have been called) and the l2 cache must be -+ * powered on. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_request_gpu_cycle_counter_l2_is_on(struct kbase_device *kbdev); ++ if (_MALI_OSK_ERR_OK != mali_mmu_get_table_page(&address, &mapping)) { ++ /* Allocation failed */ ++ MALI_DEBUG_PRINT(2, ("Mali MMU: Failed to get table page for empty pgdir\n")); ++ return 0; ++ } + -+/** -+ * kbase_pm_release_gpu_cycle_counter - Mark that the GPU cycle counter is no -+ * longer in use -+ * -+ * If the caller is the last caller then the GPU cycle counters will be -+ * disabled. A request must have been made before a call to this. -+ * -+ * Caller must not hold the hwaccess_lock, as it will be taken in this function. -+ * If the caller is already holding this lock then -+ * kbase_pm_release_gpu_cycle_counter_nolock() must be used instead. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_release_gpu_cycle_counter(struct kbase_device *kbdev); ++ MALI_DEBUG_ASSERT_POINTER(mapping); + -+/** -+ * kbase_pm_release_gpu_cycle_counter_nolock - Version of kbase_pm_release_gpu_cycle_counter() -+ * that does not take hwaccess_lock -+ * -+ * Caller must hold the hwaccess_lock. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_release_gpu_cycle_counter_nolock(struct kbase_device *kbdev); ++ err = fill_page(mapping, 0); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_mmu_release_table_page(address, mapping); ++ MALI_DEBUG_PRINT(2, ("Mali MMU: Failed to zero page\n")); ++ return 0; ++ } + -+/** -+ * kbase_pm_wait_for_poweroff_complete - Wait for the poweroff workqueue to -+ * complete -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_wait_for_poweroff_complete(struct kbase_device *kbdev); ++ *virt_addr = mapping; ++ return address; ++} + -+/** -+ * kbase_pm_register_access_enable - Enable access to GPU registers -+ * -+ * Enables access to the GPU registers before power management has powered up -+ * the GPU with kbase_pm_powerup(). -+ * -+ * Access to registers should be done using kbase_os_reg_read()/write() at this -+ * stage, not kbase_reg_read()/write(). -+ * -+ * This results in the power management callbacks provided in the driver -+ * configuration to get called to turn on power and/or clocks to the GPU. See -+ * kbase_pm_callback_conf. -+ * -+ * This should only be used before power management is powered up with -+ * kbase_pm_powerup() -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_register_access_enable(struct kbase_device *kbdev); ++void mali_free_empty_page(mali_dma_addr address, mali_io_address virt_addr) ++{ ++ if (MALI_INVALID_PAGE != address) { ++ mali_mmu_release_table_page(address, virt_addr); ++ } ++} + -+/** -+ * kbase_pm_register_access_disable - Disable early register access -+ * -+ * Disables access to the GPU registers enabled earlier by a call to -+ * kbase_pm_register_access_enable(). -+ * -+ * This results in the power management callbacks provided in the driver -+ * configuration to get called to turn off power and/or clocks to the GPU. See -+ * kbase_pm_callback_conf -+ * -+ * This should only be used before power management is powered up with -+ * kbase_pm_powerup() -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_register_access_disable(struct kbase_device *kbdev); ++_mali_osk_errcode_t mali_create_fault_flush_pages(mali_dma_addr *page_directory, ++ mali_io_address *page_directory_mapping, ++ mali_dma_addr *page_table, mali_io_address *page_table_mapping, ++ mali_dma_addr *data_page, mali_io_address *data_page_mapping) ++{ ++ _mali_osk_errcode_t err; + -+/* NOTE: kbase_pm_is_suspending is in mali_kbase.h, because it is an inline -+ * function */ ++ err = mali_mmu_get_table_page(data_page, data_page_mapping); ++ if (_MALI_OSK_ERR_OK == err) { ++ err = mali_mmu_get_table_page(page_table, page_table_mapping); ++ if (_MALI_OSK_ERR_OK == err) { ++ err = mali_mmu_get_table_page(page_directory, page_directory_mapping); ++ if (_MALI_OSK_ERR_OK == err) { ++ fill_page(*data_page_mapping, 0); ++ fill_page(*page_table_mapping, *data_page | MALI_MMU_FLAGS_DEFAULT); ++ fill_page(*page_directory_mapping, *page_table | MALI_MMU_FLAGS_PRESENT); ++ MALI_SUCCESS; ++ } ++ mali_mmu_release_table_page(*page_table, *page_table_mapping); ++ *page_table = MALI_INVALID_PAGE; ++ } ++ mali_mmu_release_table_page(*data_page, *data_page_mapping); ++ *data_page = MALI_INVALID_PAGE; ++ } ++ return err; ++} + -+/** -+ * kbase_pm_metrics_is_active - Check if the power management metrics -+ * collection is active. -+ * -+ * Note that this returns if the power management metrics collection was -+ * active at the time of calling, it is possible that after the call the metrics -+ * collection enable may have changed state. -+ * -+ * The caller must handle the consequence that the state may have changed. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * Return: true if metrics collection was active else false. -+ */ -+bool kbase_pm_metrics_is_active(struct kbase_device *kbdev); ++void mali_destroy_fault_flush_pages( ++ mali_dma_addr *page_directory, mali_io_address *page_directory_mapping, ++ mali_dma_addr *page_table, mali_io_address *page_table_mapping, ++ mali_dma_addr *data_page, mali_io_address *data_page_mapping) ++{ ++ if (MALI_INVALID_PAGE != *page_directory) { ++ mali_mmu_release_table_page(*page_directory, *page_directory_mapping); ++ *page_directory = MALI_INVALID_PAGE; ++ *page_directory_mapping = NULL; ++ } + -+/** -+ * kbase_pm_do_poweron - Power on the GPU, and any cores that are requested. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid -+ * pointer) -+ * @is_resume: true if power on due to resume after suspend, -+ * false otherwise -+ */ -+void kbase_pm_do_poweron(struct kbase_device *kbdev, bool is_resume); ++ if (MALI_INVALID_PAGE != *page_table) { ++ mali_mmu_release_table_page(*page_table, *page_table_mapping); ++ *page_table = MALI_INVALID_PAGE; ++ *page_table_mapping = NULL; ++ } + -+/** -+ * kbase_pm_do_poweroff - Power off the GPU, and any cores that have been -+ * requested. -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid -+ * pointer) -+ * @is_suspend: true if power off due to suspend, -+ * false otherwise -+ */ -+void kbase_pm_do_poweroff(struct kbase_device *kbdev, bool is_suspend); ++ if (MALI_INVALID_PAGE != *data_page) { ++ mali_mmu_release_table_page(*data_page, *data_page_mapping); ++ *data_page = MALI_INVALID_PAGE; ++ *data_page_mapping = NULL; ++ } ++} + -+#if defined(CONFIG_MALI_BIFROST_DEVFREQ) || defined(CONFIG_MALI_BIFROST_DVFS) -+void kbase_pm_get_dvfs_utilisation(struct kbase_device *kbdev, -+ unsigned long *total, unsigned long *busy); -+void kbase_pm_reset_dvfs_utilisation(struct kbase_device *kbdev); -+#endif /* defined(CONFIG_MALI_BIFROST_DEVFREQ) || defined(CONFIG_MALI_BIFROST_DVFS) */ ++static _mali_osk_errcode_t fill_page(mali_io_address mapping, u32 data) ++{ ++ int i; ++ MALI_DEBUG_ASSERT_POINTER(mapping); + -+#ifdef CONFIG_MALI_BIFROST_DVFS ++ for (i = 0; i < MALI_MMU_PAGE_SIZE / 4; i++) { ++ _mali_osk_mem_iowrite32_relaxed(mapping, i * sizeof(u32), data); ++ } ++ _mali_osk_mem_barrier(); ++ MALI_SUCCESS; ++} + -+/** -+ * kbase_platform_dvfs_event - Report utilisation to DVFS code -+ * -+ * Function provided by platform specific code when DVFS is enabled to allow -+ * the power management metrics system to report utilisation. -+ * -+ * @kbdev: The kbase device structure for the device (must be a -+ * valid pointer) -+ * @utilisation: The current calculated utilisation by the metrics system. -+ * @util_gl_share: The current calculated gl share of utilisation. -+ * @util_cl_share: The current calculated cl share of utilisation per core -+ * group. -+ * Return: Returns 0 on failure and non zero on success. -+ */ ++_mali_osk_errcode_t mali_mmu_pagedir_map(struct mali_page_directory *pagedir, u32 mali_address, u32 size) ++{ ++ const int first_pde = MALI_MMU_PDE_ENTRY(mali_address); ++ const int last_pde = MALI_MMU_PDE_ENTRY(mali_address + size - 1); ++ _mali_osk_errcode_t err; ++ mali_io_address pde_mapping; ++ mali_dma_addr pde_phys; ++ int i, page_count; ++ u32 start_address; ++ if (last_pde < first_pde) ++ return _MALI_OSK_ERR_INVALID_ARGS; + -+int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, -+ u32 util_gl_share, u32 util_cl_share[2]); -+#endif ++ for (i = first_pde; i <= last_pde; i++) { ++ if (0 == (_mali_osk_mem_ioread32(pagedir->page_directory_mapped, ++ i * sizeof(u32)) & MALI_MMU_FLAGS_PRESENT)) { ++ /* Page table not present */ ++ MALI_DEBUG_ASSERT(0 == pagedir->page_entries_usage_count[i]); ++ MALI_DEBUG_ASSERT(NULL == pagedir->page_entries_mapped[i]); + -+void kbase_pm_power_changed(struct kbase_device *kbdev); ++ err = mali_mmu_get_table_page(&pde_phys, &pde_mapping); ++ if (_MALI_OSK_ERR_OK != err) { ++ MALI_PRINT_ERROR(("Failed to allocate page table page.\n")); ++ return err; ++ } ++ pagedir->page_entries_mapped[i] = pde_mapping; + -+/** -+ * kbase_pm_metrics_update - Inform the metrics system that an atom is either -+ * about to be run or has just completed. -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * @now: Pointer to the timestamp of the change, or NULL to use current time -+ * -+ * Caller must hold hwaccess_lock -+ */ -+void kbase_pm_metrics_update(struct kbase_device *kbdev, -+ ktime_t *now); ++ /* Update PDE, mark as present */ ++ _mali_osk_mem_iowrite32_relaxed(pagedir->page_directory_mapped, i * sizeof(u32), ++ pde_phys | MALI_MMU_FLAGS_PRESENT); + -+/** -+ * kbase_pm_cache_snoop_enable - Allow CPU snoops on the GPU -+ * If the GPU does not have coherency this is a no-op -+ * @kbdev: Device pointer -+ * -+ * This function should be called after L2 power up. -+ */ ++ MALI_DEBUG_ASSERT(0 == pagedir->page_entries_usage_count[i]); ++ } + -+void kbase_pm_cache_snoop_enable(struct kbase_device *kbdev); ++ if (first_pde == last_pde) { ++ pagedir->page_entries_usage_count[i] += size / MALI_MMU_PAGE_SIZE; ++ } else if (i == first_pde) { ++ start_address = i * MALI_MMU_VIRTUAL_PAGE_SIZE; ++ page_count = (start_address + MALI_MMU_VIRTUAL_PAGE_SIZE - mali_address) / MALI_MMU_PAGE_SIZE; ++ pagedir->page_entries_usage_count[i] += page_count; ++ } else if (i == last_pde) { ++ start_address = i * MALI_MMU_VIRTUAL_PAGE_SIZE; ++ page_count = (mali_address + size - start_address) / MALI_MMU_PAGE_SIZE; ++ pagedir->page_entries_usage_count[i] += page_count; ++ } else { ++ pagedir->page_entries_usage_count[i] = 1024; ++ } ++ } ++ _mali_osk_write_mem_barrier(); + -+/** -+ * kbase_pm_cache_snoop_disable - Prevent CPU snoops on the GPU -+ * If the GPU does not have coherency this is a no-op -+ * @kbdev: Device pointer -+ * -+ * This function should be called before L2 power off. -+ */ -+void kbase_pm_cache_snoop_disable(struct kbase_device *kbdev); ++ return _MALI_OSK_ERR_OK; ++} + -+#endif /* _KBASE_BACKEND_PM_INTERNAL_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_metrics.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_metrics.c -new file mode 100755 -index 000000000000..ba13bcd8b291 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_metrics.c -@@ -0,0 +1,401 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++MALI_STATIC_INLINE void mali_mmu_zero_pte(mali_io_address page_table, u32 mali_address, u32 size) ++{ ++ int i; ++ const int first_pte = MALI_MMU_PTE_ENTRY(mali_address); ++ const int last_pte = MALI_MMU_PTE_ENTRY(mali_address + size - 1); + ++ for (i = first_pte; i <= last_pte; i++) { ++ _mali_osk_mem_iowrite32_relaxed(page_table, i * sizeof(u32), 0); ++ } ++} + ++static u32 mali_page_directory_get_phys_address(struct mali_page_directory *pagedir, u32 index) ++{ ++ return (_mali_osk_mem_ioread32(pagedir->page_directory_mapped, ++ index * sizeof(u32)) & ~MALI_MMU_FLAGS_MASK); ++} + + ++_mali_osk_errcode_t mali_mmu_pagedir_unmap(struct mali_page_directory *pagedir, u32 mali_address, u32 size) ++{ ++ const int first_pde = MALI_MMU_PDE_ENTRY(mali_address); ++ const int last_pde = MALI_MMU_PDE_ENTRY(mali_address + size - 1); ++ u32 left = size; ++ int i; ++ mali_bool pd_changed = MALI_FALSE; ++ u32 pages_to_invalidate[3]; /* hard-coded to 3: max two pages from the PT level plus max one page from PD level */ ++ u32 num_pages_inv = 0; ++ mali_bool invalidate_all = MALI_FALSE; /* safety mechanism in case page_entries_usage_count is unreliable */ + -+/* -+ * Metrics for power management -+ */ ++ /* For all page directory entries in range. */ ++ for (i = first_pde; i <= last_pde; i++) { ++ u32 size_in_pde, offset; + -+#include -+#include -+#include -+#include ++ MALI_DEBUG_ASSERT_POINTER(pagedir->page_entries_mapped[i]); ++ MALI_DEBUG_ASSERT(0 != pagedir->page_entries_usage_count[i]); + -+/* When VSync is being hit aim for utilisation between 70-90% */ -+#define KBASE_PM_VSYNC_MIN_UTILISATION 70 -+#define KBASE_PM_VSYNC_MAX_UTILISATION 90 -+/* Otherwise aim for 10-40% */ -+#define KBASE_PM_NO_VSYNC_MIN_UTILISATION 10 -+#define KBASE_PM_NO_VSYNC_MAX_UTILISATION 40 ++ /* Offset into page table, 0 if mali_address is 4MiB aligned */ ++ offset = (mali_address & (MALI_MMU_VIRTUAL_PAGE_SIZE - 1)); ++ if (left < MALI_MMU_VIRTUAL_PAGE_SIZE - offset) { ++ size_in_pde = left; ++ } else { ++ size_in_pde = MALI_MMU_VIRTUAL_PAGE_SIZE - offset; ++ } + -+/* Shift used for kbasep_pm_metrics_data.time_busy/idle - units of (1 << 8) ns -+ * This gives a maximum period between samples of 2^(32+8)/100 ns = slightly -+ * under 11s. Exceeding this will cause overflow */ -+#define KBASE_PM_TIME_SHIFT 8 ++ pagedir->page_entries_usage_count[i] -= size_in_pde / MALI_MMU_PAGE_SIZE; + -+/* Maximum time between sampling of utilization data, without resetting the -+ * counters. */ -+#define MALI_UTILIZATION_MAX_PERIOD 100000 /* ns = 100ms */ ++ /* If entire page table is unused, free it */ ++ if (0 == pagedir->page_entries_usage_count[i]) { ++ u32 page_phys; ++ void *page_virt; ++ MALI_DEBUG_PRINT(4, ("Releasing page table as this is the last reference\n")); ++ /* last reference removed, no need to zero out each PTE */ + -+#ifdef CONFIG_MALI_BIFROST_DVFS -+static enum hrtimer_restart dvfs_callback(struct hrtimer *timer) -+{ -+ unsigned long flags; -+ struct kbasep_pm_metrics_data *metrics; ++ page_phys = MALI_MMU_ENTRY_ADDRESS(_mali_osk_mem_ioread32(pagedir->page_directory_mapped, i * sizeof(u32))); ++ page_virt = pagedir->page_entries_mapped[i]; ++ pagedir->page_entries_mapped[i] = NULL; ++ _mali_osk_mem_iowrite32_relaxed(pagedir->page_directory_mapped, i * sizeof(u32), 0); + -+ KBASE_DEBUG_ASSERT(timer != NULL); ++ mali_mmu_release_table_page(page_phys, page_virt); ++ pd_changed = MALI_TRUE; ++ } else { ++ MALI_DEBUG_ASSERT(num_pages_inv < 2); ++ if (num_pages_inv < 2) { ++ pages_to_invalidate[num_pages_inv] = mali_page_directory_get_phys_address(pagedir, i); ++ num_pages_inv++; ++ } else { ++ invalidate_all = MALI_TRUE; ++ } + -+ metrics = container_of(timer, struct kbasep_pm_metrics_data, timer); -+ kbase_pm_get_dvfs_action(metrics->kbdev); ++ /* If part of the page table is still in use, zero the relevant PTEs */ ++ mali_mmu_zero_pte(pagedir->page_entries_mapped[i], mali_address, size_in_pde); ++ } + -+ spin_lock_irqsave(&metrics->lock, flags); ++ left -= size_in_pde; ++ mali_address += size_in_pde; ++ } ++ _mali_osk_write_mem_barrier(); + -+ if (metrics->timer_active) -+ hrtimer_start(timer, -+ HR_TIMER_DELAY_MSEC(metrics->kbdev->pm.dvfs_period), -+ HRTIMER_MODE_REL); ++ /* L2 pages invalidation */ ++ if (MALI_TRUE == pd_changed) { ++ MALI_DEBUG_ASSERT(num_pages_inv < 3); ++ if (num_pages_inv < 3) { ++ pages_to_invalidate[num_pages_inv] = pagedir->page_directory; ++ num_pages_inv++; ++ } else { ++ invalidate_all = MALI_TRUE; ++ } ++ } + -+ spin_unlock_irqrestore(&metrics->lock, flags); ++ if (invalidate_all) { ++ mali_l2_cache_invalidate_all(); ++ } else { ++ mali_l2_cache_invalidate_all_pages(pages_to_invalidate, num_pages_inv); ++ } + -+ return HRTIMER_NORESTART; ++ MALI_SUCCESS; +} -+#endif /* CONFIG_MALI_BIFROST_DVFS */ + -+int kbasep_pm_metrics_init(struct kbase_device *kbdev) ++struct mali_page_directory *mali_mmu_pagedir_alloc(void) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ -+ kbdev->pm.backend.metrics.kbdev = kbdev; ++ struct mali_page_directory *pagedir; ++ _mali_osk_errcode_t err; ++ mali_dma_addr phys; + -+ kbdev->pm.backend.metrics.time_period_start = ktime_get(); -+ kbdev->pm.backend.metrics.time_busy = 0; -+ kbdev->pm.backend.metrics.time_idle = 0; -+ kbdev->pm.backend.metrics.prev_busy = 0; -+ kbdev->pm.backend.metrics.prev_idle = 0; -+ kbdev->pm.backend.metrics.gpu_active = false; -+ kbdev->pm.backend.metrics.active_cl_ctx[0] = 0; -+ kbdev->pm.backend.metrics.active_cl_ctx[1] = 0; -+ kbdev->pm.backend.metrics.active_gl_ctx[0] = 0; -+ kbdev->pm.backend.metrics.active_gl_ctx[1] = 0; -+ kbdev->pm.backend.metrics.busy_cl[0] = 0; -+ kbdev->pm.backend.metrics.busy_cl[1] = 0; -+ kbdev->pm.backend.metrics.busy_gl = 0; ++ pagedir = _mali_osk_calloc(1, sizeof(struct mali_page_directory)); ++ if (NULL == pagedir) { ++ return NULL; ++ } + -+ spin_lock_init(&kbdev->pm.backend.metrics.lock); ++ err = mali_mmu_get_table_page(&phys, &pagedir->page_directory_mapped); ++ if (_MALI_OSK_ERR_OK != err) { ++ _mali_osk_free(pagedir); ++ return NULL; ++ } + -+#ifdef CONFIG_MALI_BIFROST_DVFS -+ kbdev->pm.backend.metrics.timer_active = true; -+ hrtimer_init(&kbdev->pm.backend.metrics.timer, CLOCK_MONOTONIC, -+ HRTIMER_MODE_REL); -+ kbdev->pm.backend.metrics.timer.function = dvfs_callback; ++ pagedir->page_directory = (u32)phys; + -+ hrtimer_start(&kbdev->pm.backend.metrics.timer, -+ HR_TIMER_DELAY_MSEC(kbdev->pm.dvfs_period), -+ HRTIMER_MODE_REL); -+#endif /* CONFIG_MALI_BIFROST_DVFS */ ++ /* Zero page directory */ ++ fill_page(pagedir->page_directory_mapped, 0); + -+ return 0; ++ return pagedir; +} + -+KBASE_EXPORT_TEST_API(kbasep_pm_metrics_init); -+ -+void kbasep_pm_metrics_term(struct kbase_device *kbdev) ++void mali_mmu_pagedir_free(struct mali_page_directory *pagedir) +{ -+#ifdef CONFIG_MALI_BIFROST_DVFS -+ unsigned long flags; ++ const int num_page_table_entries = sizeof(pagedir->page_entries_mapped) / sizeof(pagedir->page_entries_mapped[0]); ++ int i; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ /* Free referenced page tables and zero PDEs. */ ++ for (i = 0; i < num_page_table_entries; i++) { ++ if (pagedir->page_directory_mapped && (_mali_osk_mem_ioread32( ++ pagedir->page_directory_mapped, ++ sizeof(u32)*i) & MALI_MMU_FLAGS_PRESENT)) { ++ mali_dma_addr phys = _mali_osk_mem_ioread32(pagedir->page_directory_mapped, ++ i * sizeof(u32)) & ~MALI_MMU_FLAGS_MASK; ++ _mali_osk_mem_iowrite32_relaxed(pagedir->page_directory_mapped, i * sizeof(u32), 0); ++ mali_mmu_release_table_page(phys, pagedir->page_entries_mapped[i]); ++ } ++ } ++ _mali_osk_write_mem_barrier(); + -+ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); -+ kbdev->pm.backend.metrics.timer_active = false; -+ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); ++ /* Free the page directory page. */ ++ mali_mmu_release_table_page(pagedir->page_directory, pagedir->page_directory_mapped); + -+ hrtimer_cancel(&kbdev->pm.backend.metrics.timer); -+#endif /* CONFIG_MALI_BIFROST_DVFS */ ++ _mali_osk_free(pagedir); +} + -+KBASE_EXPORT_TEST_API(kbasep_pm_metrics_term); + -+/* caller needs to hold kbdev->pm.backend.metrics.lock before calling this -+ * function -+ */ -+static void kbase_pm_get_dvfs_utilisation_calc(struct kbase_device *kbdev, -+ ktime_t now) ++void mali_mmu_pagedir_update(struct mali_page_directory *pagedir, u32 mali_address, ++ mali_dma_addr phys_address, u32 size, u32 permission_bits) +{ -+ ktime_t diff; -+ -+ lockdep_assert_held(&kbdev->pm.backend.metrics.lock); -+ -+ diff = ktime_sub(now, kbdev->pm.backend.metrics.time_period_start); -+ if (ktime_to_ns(diff) < 0) -+ return; -+ -+ if (kbdev->pm.backend.metrics.gpu_active) { -+ u32 ns_time = (u32) (ktime_to_ns(diff) >> KBASE_PM_TIME_SHIFT); ++ u32 end_address = mali_address + size; ++ u32 mali_phys = (u32)phys_address; + -+ kbdev->pm.backend.metrics.time_busy += ns_time; -+ if (kbdev->pm.backend.metrics.active_cl_ctx[0]) -+ kbdev->pm.backend.metrics.busy_cl[0] += ns_time; -+ if (kbdev->pm.backend.metrics.active_cl_ctx[1]) -+ kbdev->pm.backend.metrics.busy_cl[1] += ns_time; -+ if (kbdev->pm.backend.metrics.active_gl_ctx[0]) -+ kbdev->pm.backend.metrics.busy_gl += ns_time; -+ if (kbdev->pm.backend.metrics.active_gl_ctx[1]) -+ kbdev->pm.backend.metrics.busy_gl += ns_time; -+ } else { -+ kbdev->pm.backend.metrics.time_idle += (u32) (ktime_to_ns(diff) -+ >> KBASE_PM_TIME_SHIFT); ++ /* Map physical pages into MMU page tables */ ++ for (; mali_address < end_address; mali_address += MALI_MMU_PAGE_SIZE, mali_phys += MALI_MMU_PAGE_SIZE) { ++ MALI_DEBUG_ASSERT_POINTER(pagedir->page_entries_mapped[MALI_MMU_PDE_ENTRY(mali_address)]); ++ _mali_osk_mem_iowrite32_relaxed(pagedir->page_entries_mapped[MALI_MMU_PDE_ENTRY(mali_address)], ++ MALI_MMU_PTE_ENTRY(mali_address) * sizeof(u32), ++ mali_phys | permission_bits); + } -+ -+ kbdev->pm.backend.metrics.time_period_start = now; +} + -+#if defined(CONFIG_MALI_BIFROST_DEVFREQ) || defined(CONFIG_MALI_BIFROST_DVFS) -+/* Caller needs to hold kbdev->pm.backend.metrics.lock before calling this -+ * function. -+ */ -+static void kbase_pm_reset_dvfs_utilisation_unlocked(struct kbase_device *kbdev, -+ ktime_t now) ++void mali_mmu_pagedir_diag(struct mali_page_directory *pagedir, u32 fault_addr) +{ -+ /* Store previous value */ -+ kbdev->pm.backend.metrics.prev_idle = -+ kbdev->pm.backend.metrics.time_idle; -+ kbdev->pm.backend.metrics.prev_busy = -+ kbdev->pm.backend.metrics.time_busy; ++#if defined(DEBUG) ++ u32 pde_index, pte_index; ++ u32 pde, pte; + -+ /* Reset current values */ -+ kbdev->pm.backend.metrics.time_period_start = now; -+ kbdev->pm.backend.metrics.time_idle = 0; -+ kbdev->pm.backend.metrics.time_busy = 0; -+ kbdev->pm.backend.metrics.busy_cl[0] = 0; -+ kbdev->pm.backend.metrics.busy_cl[1] = 0; -+ kbdev->pm.backend.metrics.busy_gl = 0; -+} ++ pde_index = MALI_MMU_PDE_ENTRY(fault_addr); ++ pte_index = MALI_MMU_PTE_ENTRY(fault_addr); + -+void kbase_pm_reset_dvfs_utilisation(struct kbase_device *kbdev) -+{ -+ unsigned long flags; + -+ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); -+ kbase_pm_reset_dvfs_utilisation_unlocked(kbdev, ktime_get()); -+ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); -+} ++ pde = _mali_osk_mem_ioread32(pagedir->page_directory_mapped, ++ pde_index * sizeof(u32)); + -+void kbase_pm_get_dvfs_utilisation(struct kbase_device *kbdev, -+ unsigned long *total_out, unsigned long *busy_out) -+{ -+ ktime_t now = ktime_get(); -+ unsigned long flags, busy, total; + -+ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); -+ kbase_pm_get_dvfs_utilisation_calc(kbdev, now); ++ if (pde & MALI_MMU_FLAGS_PRESENT) { ++ u32 pte_addr = MALI_MMU_ENTRY_ADDRESS(pde); + -+ busy = kbdev->pm.backend.metrics.time_busy; -+ total = busy + kbdev->pm.backend.metrics.time_idle; ++ pte = _mali_osk_mem_ioread32(pagedir->page_entries_mapped[pde_index], ++ pte_index * sizeof(u32)); + -+ /* Reset stats if older than MALI_UTILIZATION_MAX_PERIOD (default -+ * 100ms) */ -+ if (total >= MALI_UTILIZATION_MAX_PERIOD) { -+ kbase_pm_reset_dvfs_utilisation_unlocked(kbdev, now); -+ } else if (total < (MALI_UTILIZATION_MAX_PERIOD / 2)) { -+ total += kbdev->pm.backend.metrics.prev_idle + -+ kbdev->pm.backend.metrics.prev_busy; -+ busy += kbdev->pm.backend.metrics.prev_busy; ++ MALI_DEBUG_PRINT(2, ("\tMMU: %08x: Page table present: %08x\n" ++ "\t\tPTE: %08x, page %08x is %s\n", ++ fault_addr, pte_addr, pte, ++ MALI_MMU_ENTRY_ADDRESS(pte), ++ pte & MALI_MMU_FLAGS_DEFAULT ? "rw" : "not present")); ++ } else { ++ MALI_DEBUG_PRINT(2, ("\tMMU: %08x: Page table not present: %08x\n", ++ fault_addr, pde)); + } -+ -+ *total_out = total; -+ *busy_out = busy; -+ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); -+} ++#else ++ MALI_IGNORE(pagedir); ++ MALI_IGNORE(fault_addr); +#endif ++} + -+#ifdef CONFIG_MALI_BIFROST_DVFS ++/* For instrumented */ ++struct dump_info { ++ u32 buffer_left; ++ u32 register_writes_size; ++ u32 page_table_dump_size; ++ u32 *buffer; ++}; + -+/* caller needs to hold kbdev->pm.backend.metrics.lock before calling this -+ * function -+ */ -+int kbase_pm_get_dvfs_utilisation_old(struct kbase_device *kbdev, -+ int *util_gl_share, -+ int util_cl_share[2], -+ ktime_t now) ++static _mali_osk_errcode_t writereg(u32 where, u32 what, const char *comment, struct dump_info *info) +{ -+ int utilisation; -+ int busy; -+ -+ kbase_pm_get_dvfs_utilisation_calc(kbdev, now); ++ if (NULL != info) { ++ info->register_writes_size += sizeof(u32) * 2; /* two 32-bit words */ + -+ if (kbdev->pm.backend.metrics.time_idle + -+ kbdev->pm.backend.metrics.time_busy == 0) { -+ /* No data - so we return NOP */ -+ utilisation = -1; -+ if (util_gl_share) -+ *util_gl_share = -1; -+ if (util_cl_share) { -+ util_cl_share[0] = -1; -+ util_cl_share[1] = -1; -+ } -+ goto out; -+ } ++ if (NULL != info->buffer) { ++ /* check that we have enough space */ ++ if (info->buffer_left < sizeof(u32) * 2) MALI_ERROR(_MALI_OSK_ERR_NOMEM); + -+ utilisation = (100 * kbdev->pm.backend.metrics.time_busy) / -+ (kbdev->pm.backend.metrics.time_idle + -+ kbdev->pm.backend.metrics.time_busy); ++ *info->buffer = where; ++ info->buffer++; + -+ busy = kbdev->pm.backend.metrics.busy_gl + -+ kbdev->pm.backend.metrics.busy_cl[0] + -+ kbdev->pm.backend.metrics.busy_cl[1]; ++ *info->buffer = what; ++ info->buffer++; + -+ if (busy != 0) { -+ if (util_gl_share) -+ *util_gl_share = -+ (100 * kbdev->pm.backend.metrics.busy_gl) / -+ busy; -+ if (util_cl_share) { -+ util_cl_share[0] = -+ (100 * kbdev->pm.backend.metrics.busy_cl[0]) / -+ busy; -+ util_cl_share[1] = -+ (100 * kbdev->pm.backend.metrics.busy_cl[1]) / -+ busy; -+ } -+ } else { -+ if (util_gl_share) -+ *util_gl_share = -1; -+ if (util_cl_share) { -+ util_cl_share[0] = -1; -+ util_cl_share[1] = -1; ++ info->buffer_left -= sizeof(u32) * 2; + } + } + -+out: -+ return utilisation; ++ MALI_SUCCESS; +} + -+void kbase_pm_get_dvfs_action(struct kbase_device *kbdev) ++static _mali_osk_errcode_t mali_mmu_dump_page(mali_io_address page, u32 phys_addr, struct dump_info *info) +{ -+ unsigned long flags; -+ int utilisation, util_gl_share; -+ int util_cl_share[2]; -+ ktime_t now; ++ if (NULL != info) { ++ /* 4096 for the page and 4 bytes for the address */ ++ const u32 page_size_in_elements = MALI_MMU_PAGE_SIZE / 4; ++ const u32 page_size_in_bytes = MALI_MMU_PAGE_SIZE; ++ const u32 dump_size_in_bytes = MALI_MMU_PAGE_SIZE + 4; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ info->page_table_dump_size += dump_size_in_bytes; + -+ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); ++ if (NULL != info->buffer) { ++ if (info->buffer_left < dump_size_in_bytes) MALI_ERROR(_MALI_OSK_ERR_NOMEM); + -+ now = ktime_get(); ++ *info->buffer = phys_addr; ++ info->buffer++; + -+ utilisation = kbase_pm_get_dvfs_utilisation_old(kbdev, &util_gl_share, -+ util_cl_share, now); ++ _mali_osk_memcpy(info->buffer, page, page_size_in_bytes); ++ info->buffer += page_size_in_elements; + -+ if (utilisation < 0 || util_gl_share < 0 || util_cl_share[0] < 0 || -+ util_cl_share[1] < 0) { -+ utilisation = 0; -+ util_gl_share = 0; -+ util_cl_share[0] = 0; -+ util_cl_share[1] = 0; -+ goto out; ++ info->buffer_left -= dump_size_in_bytes; ++ } + } + -+out: -+#ifdef CONFIG_MALI_BIFROST_DVFS -+ kbase_platform_dvfs_event(kbdev, utilisation, util_gl_share, -+ util_cl_share); -+#endif /*CONFIG_MALI_BIFROST_DVFS */ -+ -+ kbase_pm_reset_dvfs_utilisation_unlocked(kbdev, now); -+ -+ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); ++ MALI_SUCCESS; +} + -+bool kbase_pm_metrics_is_active(struct kbase_device *kbdev) ++static _mali_osk_errcode_t dump_mmu_page_table(struct mali_page_directory *pagedir, struct dump_info *info) +{ -+ bool isactive; -+ unsigned long flags; ++ MALI_DEBUG_ASSERT_POINTER(pagedir); ++ MALI_DEBUG_ASSERT_POINTER(info); + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ if (NULL != pagedir->page_directory_mapped) { ++ int i; + -+ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); -+ isactive = kbdev->pm.backend.metrics.timer_active; -+ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); ++ MALI_CHECK_NO_ERROR( ++ mali_mmu_dump_page(pagedir->page_directory_mapped, pagedir->page_directory, info) ++ ); + -+ return isactive; -+} -+KBASE_EXPORT_TEST_API(kbase_pm_metrics_is_active); ++ for (i = 0; i < 1024; i++) { ++ if (NULL != pagedir->page_entries_mapped[i]) { ++ MALI_CHECK_NO_ERROR( ++ mali_mmu_dump_page(pagedir->page_entries_mapped[i], ++ _mali_osk_mem_ioread32(pagedir->page_directory_mapped, ++ i * sizeof(u32)) & ~MALI_MMU_FLAGS_MASK, info) ++ ); ++ } ++ } ++ } + -+#endif /* CONFIG_MALI_BIFROST_DVFS */ ++ MALI_SUCCESS; ++} + -+/** -+ * kbase_pm_metrics_active_calc - Update PM active counts based on currently -+ * running atoms -+ * @kbdev: Device pointer -+ * -+ * The caller must hold kbdev->pm.backend.metrics.lock -+ */ -+static void kbase_pm_metrics_active_calc(struct kbase_device *kbdev) ++static _mali_osk_errcode_t dump_mmu_registers(struct mali_page_directory *pagedir, struct dump_info *info) +{ -+ int js; -+ -+ lockdep_assert_held(&kbdev->pm.backend.metrics.lock); -+ -+ kbdev->pm.backend.metrics.active_gl_ctx[0] = 0; -+ kbdev->pm.backend.metrics.active_gl_ctx[1] = 0; -+ kbdev->pm.backend.metrics.active_cl_ctx[0] = 0; -+ kbdev->pm.backend.metrics.active_cl_ctx[1] = 0; -+ kbdev->pm.backend.metrics.gpu_active = false; ++ MALI_CHECK_NO_ERROR(writereg(0x00000000, pagedir->page_directory, ++ "set the page directory address", info)); ++ MALI_CHECK_NO_ERROR(writereg(0x00000008, 4, "zap???", info)); ++ MALI_CHECK_NO_ERROR(writereg(0x00000008, 0, "enable paging", info)); ++ MALI_SUCCESS; ++} + -+ for (js = 0; js < BASE_JM_MAX_NR_SLOTS; js++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, 0); ++_mali_osk_errcode_t _mali_ukk_query_mmu_page_table_dump_size(_mali_uk_query_mmu_page_table_dump_size_s *args) ++{ ++ struct dump_info info = { 0, 0, 0, NULL }; ++ struct mali_session_data *session_data; + -+ /* Head atom may have just completed, so if it isn't running -+ * then try the next atom */ -+ if (katom && katom->gpu_rb_state != KBASE_ATOM_GPU_RB_SUBMITTED) -+ katom = kbase_gpu_inspect(kbdev, js, 1); ++ session_data = (struct mali_session_data *)(uintptr_t)(args->ctx); ++ MALI_DEBUG_ASSERT_POINTER(session_data); ++ MALI_DEBUG_ASSERT_POINTER(args); + -+ if (katom && katom->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_SUBMITTED) { -+ if (katom->core_req & BASE_JD_REQ_ONLY_COMPUTE) { -+ int device_nr = (katom->core_req & -+ BASE_JD_REQ_SPECIFIC_COHERENT_GROUP) -+ ? katom->device_nr : 0; -+ if (!WARN_ON(device_nr >= 2)) -+ kbdev->pm.backend.metrics. -+ active_cl_ctx[device_nr] = 1; -+ } else { -+ /* Slot 2 should not be running non-compute -+ * atoms */ -+ if (!WARN_ON(js >= 2)) -+ kbdev->pm.backend.metrics. -+ active_gl_ctx[js] = 1; -+ } -+ kbdev->pm.backend.metrics.gpu_active = true; -+ } -+ } ++ MALI_CHECK_NO_ERROR(dump_mmu_registers(session_data->page_directory, &info)); ++ MALI_CHECK_NO_ERROR(dump_mmu_page_table(session_data->page_directory, &info)); ++ args->size = info.register_writes_size + info.page_table_dump_size; ++ MALI_SUCCESS; +} + -+/* called when job is submitted to or removed from a GPU slot */ -+void kbase_pm_metrics_update(struct kbase_device *kbdev, ktime_t *timestamp) ++_mali_osk_errcode_t _mali_ukk_dump_mmu_page_table(_mali_uk_dump_mmu_page_table_s *args) +{ -+ unsigned long flags; -+ ktime_t now; ++ struct dump_info info = { 0, 0, 0, NULL }; ++ struct mali_session_data *session_data; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ MALI_DEBUG_ASSERT_POINTER(args); + -+ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); ++ session_data = (struct mali_session_data *)(uintptr_t)(args->ctx); ++ MALI_DEBUG_ASSERT_POINTER(session_data); + -+ if (!timestamp) { -+ now = ktime_get(); -+ timestamp = &now; -+ } ++ info.buffer_left = args->size; ++ info.buffer = (u32 *)(uintptr_t)args->buffer; + -+ /* Track how long CL and/or GL jobs have been busy for */ -+ kbase_pm_get_dvfs_utilisation_calc(kbdev, *timestamp); ++ args->register_writes = (uintptr_t)info.buffer; ++ MALI_CHECK_NO_ERROR(dump_mmu_registers(session_data->page_directory, &info)); + -+ kbase_pm_metrics_active_calc(kbdev); ++ args->page_table_dump = (uintptr_t)info.buffer; ++ MALI_CHECK_NO_ERROR(dump_mmu_page_table(session_data->page_directory, &info)); + -+ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); ++ args->register_writes_size = info.register_writes_size; ++ args->page_table_dump_size = info.page_table_dump_size; ++ ++ MALI_SUCCESS; +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_policy.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_policy.c +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h new file mode 100755 -index 000000000000..b98c68d9a42a +index 000000000..3fdf07210 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_policy.c -@@ -0,0 +1,973 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h +@@ -0,0 +1,110 @@ +/* -+ * -+ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2011-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_MMU_PAGE_DIRECTORY_H__ ++#define __MALI_MMU_PAGE_DIRECTORY_H__ + ++#include "mali_osk.h" + -+/* -+ * Power policy API implementations ++/** ++ * Size of an MMU page in bytes + */ ++#define MALI_MMU_PAGE_SIZE 0x1000 + -+#include -+#include -+#include -+#include -+#include -+ -+static const struct kbase_pm_policy *const policy_list[] = { -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+ &kbase_pm_always_on_policy_ops, -+ &kbase_pm_demand_policy_ops, -+ &kbase_pm_coarse_demand_policy_ops, -+#if !MALI_CUSTOMER_RELEASE -+ &kbase_pm_demand_always_powered_policy_ops, -+ &kbase_pm_fast_start_policy_ops, -+#endif -+#else /* CONFIG_MALI_BIFROST_NO_MALI */ -+#if !PLATFORM_POWER_DOWN_ONLY -+ &kbase_pm_demand_policy_ops, -+#endif /* !PLATFORM_POWER_DOWN_ONLY */ -+ &kbase_pm_coarse_demand_policy_ops, -+ &kbase_pm_always_on_policy_ops, -+#if !MALI_CUSTOMER_RELEASE -+#if !PLATFORM_POWER_DOWN_ONLY -+ &kbase_pm_demand_always_powered_policy_ops, -+ &kbase_pm_fast_start_policy_ops, -+#endif /* !PLATFORM_POWER_DOWN_ONLY */ -+#endif -+#endif /* CONFIG_MALI_BIFROST_NO_MALI */ -+}; -+ -+/* The number of policies available in the system. -+ * This is derived from the number of functions listed in policy_get_functions. ++/* ++ * Size of the address space referenced by a page table page + */ -+#define POLICY_COUNT (sizeof(policy_list)/sizeof(*policy_list)) ++#define MALI_MMU_VIRTUAL_PAGE_SIZE 0x400000 /* 4 MiB */ + ++/** ++ * Page directory index from address ++ * Calculates the page directory index from the given address ++ */ ++#define MALI_MMU_PDE_ENTRY(address) (((address)>>22) & 0x03FF) + -+/* Function IDs for looking up Timeline Trace codes in -+ * kbase_pm_change_state_trace_code */ -+enum kbase_pm_func_id { -+ KBASE_PM_FUNC_ID_REQUEST_CORES_START, -+ KBASE_PM_FUNC_ID_REQUEST_CORES_END, -+ KBASE_PM_FUNC_ID_RELEASE_CORES_START, -+ KBASE_PM_FUNC_ID_RELEASE_CORES_END, -+ /* Note: kbase_pm_unrequest_cores() is on the slow path, and we neither -+ * expect to hit it nor tend to hit it very much anyway. We can detect -+ * whether we need more instrumentation by a difference between -+ * PM_CHECKTRANS events and PM_SEND/HANDLE_EVENT. */ ++/** ++ * Page table index from address ++ * Calculates the page table index from the given address ++ */ ++#define MALI_MMU_PTE_ENTRY(address) (((address)>>12) & 0x03FF) + -+ /* Must be the last */ -+ KBASE_PM_FUNC_ID_COUNT -+}; ++/** ++ * Extract the memory address from an PDE/PTE entry ++ */ ++#define MALI_MMU_ENTRY_ADDRESS(value) ((value) & 0xFFFFFC00) + ++#define MALI_INVALID_PAGE ((u32)(~0)) + -+/* State changes during request/unrequest/release-ing cores */ -+enum { -+ KBASE_PM_CHANGE_STATE_SHADER = (1u << 0), -+ KBASE_PM_CHANGE_STATE_TILER = (1u << 1), ++/** ++ * ++ */ ++typedef enum mali_mmu_entry_flags { ++ MALI_MMU_FLAGS_PRESENT = 0x01, ++ MALI_MMU_FLAGS_READ_PERMISSION = 0x02, ++ MALI_MMU_FLAGS_WRITE_PERMISSION = 0x04, ++ MALI_MMU_FLAGS_OVERRIDE_CACHE = 0x8, ++ MALI_MMU_FLAGS_WRITE_CACHEABLE = 0x10, ++ MALI_MMU_FLAGS_WRITE_ALLOCATE = 0x20, ++ MALI_MMU_FLAGS_WRITE_BUFFERABLE = 0x40, ++ MALI_MMU_FLAGS_READ_CACHEABLE = 0x80, ++ MALI_MMU_FLAGS_READ_ALLOCATE = 0x100, ++ MALI_MMU_FLAGS_MASK = 0x1FF, ++} mali_mmu_entry_flags; + -+ /* These two must be last */ -+ KBASE_PM_CHANGE_STATE_MASK = (KBASE_PM_CHANGE_STATE_TILER | -+ KBASE_PM_CHANGE_STATE_SHADER), -+ KBASE_PM_CHANGE_STATE_COUNT = KBASE_PM_CHANGE_STATE_MASK + 1 -+}; -+typedef u32 kbase_pm_change_state; + ++#define MALI_MMU_FLAGS_FORCE_GP_READ_ALLOCATE ( \ ++ MALI_MMU_FLAGS_PRESENT | \ ++ MALI_MMU_FLAGS_READ_PERMISSION | \ ++ MALI_MMU_FLAGS_WRITE_PERMISSION | \ ++ MALI_MMU_FLAGS_OVERRIDE_CACHE | \ ++ MALI_MMU_FLAGS_WRITE_CACHEABLE | \ ++ MALI_MMU_FLAGS_WRITE_BUFFERABLE | \ ++ MALI_MMU_FLAGS_READ_CACHEABLE | \ ++ MALI_MMU_FLAGS_READ_ALLOCATE ) + -+#ifdef CONFIG_MALI_BIFROST_TRACE_TIMELINE -+/* Timeline Trace code lookups for each function */ -+static u32 kbase_pm_change_state_trace_code[KBASE_PM_FUNC_ID_COUNT] -+ [KBASE_PM_CHANGE_STATE_COUNT] = { -+ /* kbase_pm_request_cores */ -+ [KBASE_PM_FUNC_ID_REQUEST_CORES_START][0] = 0, -+ [KBASE_PM_FUNC_ID_REQUEST_CORES_START][KBASE_PM_CHANGE_STATE_SHADER] = -+ SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_START, -+ [KBASE_PM_FUNC_ID_REQUEST_CORES_START][KBASE_PM_CHANGE_STATE_TILER] = -+ SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_TILER_START, -+ [KBASE_PM_FUNC_ID_REQUEST_CORES_START][KBASE_PM_CHANGE_STATE_SHADER | -+ KBASE_PM_CHANGE_STATE_TILER] = -+ SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_TILER_START, ++#define MALI_MMU_FLAGS_DEFAULT ( \ ++ MALI_MMU_FLAGS_PRESENT | \ ++ MALI_MMU_FLAGS_READ_PERMISSION | \ ++ MALI_MMU_FLAGS_WRITE_PERMISSION ) + -+ [KBASE_PM_FUNC_ID_REQUEST_CORES_END][0] = 0, -+ [KBASE_PM_FUNC_ID_REQUEST_CORES_END][KBASE_PM_CHANGE_STATE_SHADER] = -+ SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_END, -+ [KBASE_PM_FUNC_ID_REQUEST_CORES_END][KBASE_PM_CHANGE_STATE_TILER] = -+ SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_TILER_END, -+ [KBASE_PM_FUNC_ID_REQUEST_CORES_END][KBASE_PM_CHANGE_STATE_SHADER | -+ KBASE_PM_CHANGE_STATE_TILER] = -+ SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_TILER_END, + -+ /* kbase_pm_release_cores */ -+ [KBASE_PM_FUNC_ID_RELEASE_CORES_START][0] = 0, -+ [KBASE_PM_FUNC_ID_RELEASE_CORES_START][KBASE_PM_CHANGE_STATE_SHADER] = -+ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_START, -+ [KBASE_PM_FUNC_ID_RELEASE_CORES_START][KBASE_PM_CHANGE_STATE_TILER] = -+ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_TILER_START, -+ [KBASE_PM_FUNC_ID_RELEASE_CORES_START][KBASE_PM_CHANGE_STATE_SHADER | -+ KBASE_PM_CHANGE_STATE_TILER] = -+ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_TILER_START, ++struct mali_page_directory { ++ u32 page_directory; /**< Physical address of the memory session's page directory */ ++ mali_io_address page_directory_mapped; /**< Pointer to the mapped version of the page directory into the kernel's address space */ + -+ [KBASE_PM_FUNC_ID_RELEASE_CORES_END][0] = 0, -+ [KBASE_PM_FUNC_ID_RELEASE_CORES_END][KBASE_PM_CHANGE_STATE_SHADER] = -+ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_END, -+ [KBASE_PM_FUNC_ID_RELEASE_CORES_END][KBASE_PM_CHANGE_STATE_TILER] = -+ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_TILER_END, -+ [KBASE_PM_FUNC_ID_RELEASE_CORES_END][KBASE_PM_CHANGE_STATE_SHADER | -+ KBASE_PM_CHANGE_STATE_TILER] = -+ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_TILER_END ++ mali_io_address page_entries_mapped[1024]; /**< Pointers to the page tables which exists in the page directory mapped into the kernel's address space */ ++ u32 page_entries_usage_count[1024]; /**< Tracks usage count of the page table pages, so they can be releases on the last reference */ +}; + -+static inline void kbase_timeline_pm_cores_func(struct kbase_device *kbdev, -+ enum kbase_pm_func_id func_id, -+ kbase_pm_change_state state) -+{ -+ int trace_code; ++/* Map Mali virtual address space (i.e. ensure page tables exist for the virtual range) */ ++_mali_osk_errcode_t mali_mmu_pagedir_map(struct mali_page_directory *pagedir, u32 mali_address, u32 size); ++_mali_osk_errcode_t mali_mmu_pagedir_unmap(struct mali_page_directory *pagedir, u32 mali_address, u32 size); + -+ KBASE_DEBUG_ASSERT(func_id >= 0 && func_id < KBASE_PM_FUNC_ID_COUNT); -+ KBASE_DEBUG_ASSERT(state != 0 && (state & KBASE_PM_CHANGE_STATE_MASK) == -+ state); ++/* Back virtual address space with actual pages. Assumes input is contiguous and 4k aligned. */ ++void mali_mmu_pagedir_update(struct mali_page_directory *pagedir, u32 mali_address, ++ mali_dma_addr phys_address, u32 size, u32 permission_bits); + -+ trace_code = kbase_pm_change_state_trace_code[func_id][state]; -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, trace_code); -+} ++u32 mali_allocate_empty_page(mali_io_address *virtual); ++void mali_free_empty_page(mali_dma_addr address, mali_io_address virt_addr); ++_mali_osk_errcode_t mali_create_fault_flush_pages(mali_dma_addr *page_directory, ++ mali_io_address *page_directory_mapping, ++ mali_dma_addr *page_table, mali_io_address *page_table_mapping, ++ mali_dma_addr *data_page, mali_io_address *data_page_mapping); ++void mali_destroy_fault_flush_pages( ++ mali_dma_addr *page_directory, mali_io_address *page_directory_mapping, ++ mali_dma_addr *page_table, mali_io_address *page_table_mapping, ++ mali_dma_addr *data_page, mali_io_address *data_page_mapping); + -+#else /* CONFIG_MALI_BIFROST_TRACE_TIMELINE */ -+static inline void kbase_timeline_pm_cores_func(struct kbase_device *kbdev, -+ enum kbase_pm_func_id func_id, kbase_pm_change_state state) -+{ -+} ++struct mali_page_directory *mali_mmu_pagedir_alloc(void); ++void mali_mmu_pagedir_free(struct mali_page_directory *pagedir); + -+#endif /* CONFIG_MALI_BIFROST_TRACE_TIMELINE */ ++void mali_mmu_pagedir_diag(struct mali_page_directory *pagedir, u32 fault_addr); + -+/** -+ * kbasep_pm_do_poweroff_cores - Process a poweroff request and power down any -+ * requested shader cores -+ * @kbdev: Device pointer ++#endif /* __MALI_MMU_PAGE_DIRECTORY_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk.h b/drivers/gpu/arm/mali400/mali/common/mali_osk.h +new file mode 100755 +index 000000000..9ade362d6 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_osk.h +@@ -0,0 +1,1389 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+static void kbasep_pm_do_poweroff_cores(struct kbase_device *kbdev) -+{ -+ u64 prev_shader_state = kbdev->pm.backend.desired_shader_state; -+ u64 prev_tiler_state = kbdev->pm.backend.desired_tiler_state; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++/** ++ * @file mali_osk.h ++ * Defines the OS abstraction layer for the kernel device driver (OSK) ++ */ + -+ kbdev->pm.backend.desired_shader_state &= -+ ~kbdev->pm.backend.shader_poweroff_pending; -+ kbdev->pm.backend.desired_tiler_state &= -+ ~kbdev->pm.backend.tiler_poweroff_pending; ++#ifndef __MALI_OSK_H__ ++#define __MALI_OSK_H__ + -+ kbdev->pm.backend.shader_poweroff_pending = 0; -+ kbdev->pm.backend.tiler_poweroff_pending = 0; ++#include ++#include "mali_osk_types.h" ++#include "mali_osk_specific.h" /* include any per-os specifics */ ++#include "mali_osk_locks.h" + -+ if (prev_shader_state != kbdev->pm.backend.desired_shader_state || -+ prev_tiler_state != -+ kbdev->pm.backend.desired_tiler_state || -+ kbdev->pm.backend.ca_in_transition) { -+ bool cores_are_available; ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, -+ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_DEFERRED_START); -+ cores_are_available = kbase_pm_check_transitions_nolock(kbdev); -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, -+ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_DEFERRED_END); ++/** ++ * @addtogroup uddapi Unified Device Driver (UDD) APIs ++ * ++ * @{ ++ */ + -+ /* Don't need 'cores_are_available', -+ * because we don't return anything */ -+ CSTD_UNUSED(cores_are_available); -+ } -+} ++/** ++ * @addtogroup oskapi UDD OS Abstraction for Kernel-side (OSK) APIs ++ * ++ * @{ ++ */ + -+static enum hrtimer_restart -+kbasep_pm_do_gpu_poweroff_callback(struct hrtimer *timer) -+{ -+ struct kbase_device *kbdev; -+ unsigned long flags; ++/** @addtogroup _mali_osk_lock OSK Mutual Exclusion Locks ++ * @{ */ + -+ kbdev = container_of(timer, struct kbase_device, -+ pm.backend.gpu_poweroff_timer); ++#ifdef DEBUG ++/** @brief Macro for asserting that the current thread holds a given lock ++ */ ++#define MALI_DEBUG_ASSERT_LOCK_HELD(l) MALI_DEBUG_ASSERT(_mali_osk_lock_get_owner((_mali_osk_lock_debug_t *)l) == _mali_osk_get_tid()); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++/** @brief returns a lock's owner (thread id) if debugging is enabled ++ */ ++#else ++#define MALI_DEBUG_ASSERT_LOCK_HELD(l) do {} while(0) ++#endif + -+ /* It is safe for this call to do nothing if the work item is already -+ * queued. The worker function will read the must up-to-date state of -+ * kbdev->pm.backend.gpu_poweroff_pending under lock. -+ * -+ * If a state change occurs while the worker function is processing, -+ * this call will succeed as a work item can be requeued once it has -+ * started processing. -+ */ -+ if (kbdev->pm.backend.gpu_poweroff_pending) -+ queue_work(kbdev->pm.backend.gpu_poweroff_wq, -+ &kbdev->pm.backend.gpu_poweroff_work); ++#define _mali_osk_ctxprintf seq_printf + -+ if (kbdev->pm.backend.shader_poweroff_pending || -+ kbdev->pm.backend.tiler_poweroff_pending) { -+ kbdev->pm.backend.shader_poweroff_pending_time--; ++/** @} */ /* end group _mali_osk_lock */ + -+ KBASE_DEBUG_ASSERT( -+ kbdev->pm.backend.shader_poweroff_pending_time -+ >= 0); ++/** @addtogroup _mali_osk_miscellaneous ++ * @{ */ + -+ if (!kbdev->pm.backend.shader_poweroff_pending_time) -+ kbasep_pm_do_poweroff_cores(kbdev); -+ } ++/** @brief Find the containing structure of another structure ++ * ++ * This is the reverse of the operation 'offsetof'. This means that the ++ * following condition is satisfied: ++ * ++ * ptr == _MALI_OSK_CONTAINER_OF( &ptr->member, type, member ) ++ * ++ * When ptr is of type 'type'. ++ * ++ * Its purpose it to recover a larger structure that has wrapped a smaller one. ++ * ++ * @note no type or memory checking occurs to ensure that a wrapper structure ++ * does in fact exist, and that it is being recovered with respect to the ++ * correct member. ++ * ++ * @param ptr the pointer to the member that is contained within the larger ++ * structure ++ * @param type the type of the structure that contains the member ++ * @param member the name of the member in the structure that ptr points to. ++ * @return a pointer to a \a type object which contains \a member, as pointed ++ * to by \a ptr. ++ */ ++#define _MALI_OSK_CONTAINER_OF(ptr, type, member) \ ++ ((type *)( ((char *)ptr) - offsetof(type,member) )) + -+ if (kbdev->pm.backend.poweroff_timer_needed) { -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++/** @addtogroup _mali_osk_wq ++ * @{ */ + -+ hrtimer_add_expires(timer, kbdev->pm.gpu_poweroff_time); ++/** @brief Initialize work queues (for deferred work) ++ * ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ */ ++_mali_osk_errcode_t _mali_osk_wq_init(void); + -+ return HRTIMER_RESTART; -+ } ++/** @brief Terminate work queues (for deferred work) ++ */ ++void _mali_osk_wq_term(void); + -+ kbdev->pm.backend.poweroff_timer_running = false; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++/** @brief Create work in the work queue ++ * ++ * Creates a work object which can be scheduled in the work queue. When ++ * scheduled, \a handler will be called with \a data as the argument. ++ * ++ * Refer to \ref _mali_osk_wq_schedule_work() for details on how work ++ * is scheduled in the queue. ++ * ++ * The returned pointer must be freed with \ref _mali_osk_wq_delete_work() ++ * when no longer needed. ++ */ ++_mali_osk_wq_work_t *_mali_osk_wq_create_work(_mali_osk_wq_work_handler_t handler, void *data); + -+ return HRTIMER_NORESTART; -+} ++/** @brief A high priority version of \a _mali_osk_wq_create_work() ++ * ++ * Creates a work object which can be scheduled in the high priority work queue. ++ * ++ * This is unfortunately needed to get low latency scheduling of the Mali cores. Normally we would ++ * schedule the next job in hw_irq or tasklet, but often we can't since we need to synchronously map ++ * and unmap shared memory when a job is connected to external fences (timelines). And this requires ++ * taking a mutex. ++ * ++ * We do signal a lot of other (low priority) work also as part of the job being finished, and if we ++ * don't set this Mali scheduling thread as high priority, we see that the CPU scheduler often runs ++ * random things instead of starting the next GPU job when the GPU is idle. So setting the gpu ++ * scheduler to high priority does give a visually more responsive system. ++ * ++ * Start the high priority work with: \a _mali_osk_wq_schedule_work_high_pri() ++ */ ++_mali_osk_wq_work_t *_mali_osk_wq_create_work_high_pri(_mali_osk_wq_work_handler_t handler, void *data); + -+static void kbasep_pm_do_gpu_poweroff_wq(struct work_struct *data) -+{ -+ unsigned long flags; -+ struct kbase_device *kbdev; -+ bool do_poweroff = false; ++/** @brief Delete a work object ++ * ++ * This will flush the work queue to ensure that the work handler will not ++ * be called after deletion. ++ */ ++void _mali_osk_wq_delete_work(_mali_osk_wq_work_t *work); + -+ kbdev = container_of(data, struct kbase_device, -+ pm.backend.gpu_poweroff_work); ++/** @brief Delete a work object ++ * ++ * This will NOT flush the work queue, so only call this if you are sure that the work handler will ++ * not be called after deletion. ++ */ ++void _mali_osk_wq_delete_work_nonflush(_mali_osk_wq_work_t *work); + -+ mutex_lock(&kbdev->pm.lock); ++/** @brief Cause a queued, deferred call of the work handler ++ * ++ * _mali_osk_wq_schedule_work provides a mechanism for enqueuing deferred calls ++ * to the work handler. After calling \ref _mali_osk_wq_schedule_work(), the ++ * work handler will be scheduled to run at some point in the future. ++ * ++ * Typically this is called by the IRQ upper-half to defer further processing of ++ * IRQ-related work to the IRQ bottom-half handler. This is necessary for work ++ * that cannot be done in an IRQ context by the IRQ upper-half handler. Timer ++ * callbacks also use this mechanism, because they are treated as though they ++ * operate in an IRQ context. Refer to \ref _mali_osk_timer_t for more ++ * information. ++ * ++ * Code that operates in a kernel-process context (with no IRQ context ++ * restrictions) may also enqueue deferred calls to the IRQ bottom-half. The ++ * advantage over direct calling is that deferred calling allows the caller and ++ * IRQ bottom half to hold the same mutex, with a guarantee that they will not ++ * deadlock just by using this mechanism. ++ * ++ * _mali_osk_wq_schedule_work() places deferred call requests on a queue, to ++ * allow for more than one thread to make a deferred call. Therfore, if it is ++ * called 'K' times, then the IRQ bottom-half will be scheduled 'K' times too. ++ * 'K' is a number that is implementation-specific. ++ * ++ * _mali_osk_wq_schedule_work() is guaranteed to not block on: ++ * - enqueuing a deferred call request. ++ * - the completion of the work handler. ++ * ++ * This is to prevent deadlock. For example, if _mali_osk_wq_schedule_work() ++ * blocked, then it would cause a deadlock when the following two conditions ++ * hold: ++ * - The work handler callback (of type _mali_osk_wq_work_handler_t) locks ++ * a mutex ++ * - And, at the same time, the caller of _mali_osk_wq_schedule_work() also ++ * holds the same mutex ++ * ++ * @note care must be taken to not overflow the queue that ++ * _mali_osk_wq_schedule_work() operates on. Code must be structured to ++ * ensure that the number of requests made to the queue is bounded. Otherwise, ++ * work will be lost. ++ * ++ * The queue that _mali_osk_wq_schedule_work implements is a FIFO of N-writer, ++ * 1-reader type. The writers are the callers of _mali_osk_wq_schedule_work ++ * (all OSK-registered IRQ upper-half handlers in the system, watchdog timers, ++ * callers from a Kernel-process context). The reader is a single thread that ++ * handles all OSK-registered work. ++ * ++ * @param work a pointer to the _mali_osk_wq_work_t object corresponding to the ++ * work to begin processing. ++ */ ++void _mali_osk_wq_schedule_work(_mali_osk_wq_work_t *work); + -+ if (kbdev->pm.backend.gpu_poweroff_pending == 0) { -+ mutex_unlock(&kbdev->pm.lock); -+ return; -+ } ++/** @brief Cause a queued, deferred call of the high priority work handler ++ * ++ * Function is the same as \a _mali_osk_wq_schedule_work() with the only ++ * difference that it runs in a high (real time) priority on the system. ++ * ++ * Should only be used as a substitue for doing the same work in interrupts. ++ * ++ * This is allowed to sleep, but the work should be small since it will block ++ * all other applications. ++*/ ++void _mali_osk_wq_schedule_work_high_pri(_mali_osk_wq_work_t *work); + -+ kbdev->pm.backend.gpu_poweroff_pending--; ++/** @brief Flush the work queue ++ * ++ * This will flush the OSK work queue, ensuring all work in the queue has ++ * completed before returning. ++ * ++ * Since this blocks on the completion of work in the work-queue, the ++ * caller of this function \b must \b not hold any mutexes that are taken by ++ * any registered work handler. To do so may cause a deadlock. ++ * ++ */ ++void _mali_osk_wq_flush(void); + -+ if (kbdev->pm.backend.gpu_poweroff_pending > 0) { -+ mutex_unlock(&kbdev->pm.lock); -+ return; -+ } ++/** @brief Create work in the delayed work queue ++ * ++ * Creates a work object which can be scheduled in the work queue. When ++ * scheduled, a timer will be start and the \a handler will be called with ++ * \a data as the argument when timer out ++ * ++ * Refer to \ref _mali_osk_wq_delayed_schedule_work() for details on how work ++ * is scheduled in the queue. ++ * ++ * The returned pointer must be freed with \ref _mali_osk_wq_delayed_delete_work_nonflush() ++ * when no longer needed. ++ */ ++_mali_osk_wq_delayed_work_t *_mali_osk_wq_delayed_create_work(_mali_osk_wq_work_handler_t handler, void *data); + -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_poweroff_pending == 0); ++/** @brief Delete a work object ++ * ++ * This will NOT flush the work queue, so only call this if you are sure that the work handler will ++ * not be called after deletion. ++ */ ++void _mali_osk_wq_delayed_delete_work_nonflush(_mali_osk_wq_delayed_work_t *work); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++/** @brief Cancel a delayed work without waiting for it to finish ++ * ++ * Note that the \a work callback function may still be running on return from ++ * _mali_osk_wq_delayed_cancel_work_async(). ++ * ++ * @param work The delayed work to be cancelled ++ */ ++void _mali_osk_wq_delayed_cancel_work_async(_mali_osk_wq_delayed_work_t *work); + -+ /* Only power off the GPU if a request is still pending */ -+ if (!kbdev->pm.backend.pm_current_policy->get_core_active(kbdev)) -+ do_poweroff = true; ++/** @brief Cancel a delayed work and wait for it to finish ++ * ++ * When this function returns, the \a work was either cancelled or it finished running. ++ * ++ * @param work The delayed work to be cancelled ++ */ ++void _mali_osk_wq_delayed_cancel_work_sync(_mali_osk_wq_delayed_work_t *work); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++/** @brief Put \a work task in global workqueue after delay ++ * ++ * After waiting for a given time this puts a job in the kernel-global ++ * workqueue. ++ * ++ * If \a work was already on a queue, this function will return without doing anything ++ * ++ * @param work job to be done ++ * @param delay number of jiffies to wait or 0 for immediate execution ++ */ ++void _mali_osk_wq_delayed_schedule_work(_mali_osk_wq_delayed_work_t *work, u32 delay); + -+ if (do_poweroff) { -+ kbdev->pm.backend.poweroff_timer_needed = false; -+ hrtimer_cancel(&kbdev->pm.backend.gpu_poweroff_timer); -+ kbdev->pm.backend.poweroff_timer_running = false; ++/** @} */ /* end group _mali_osk_wq */ + -+ /* Power off the GPU */ -+ kbase_pm_do_poweroff(kbdev, false); -+ } + -+ mutex_unlock(&kbdev->pm.lock); -+} ++/** @addtogroup _mali_osk_irq ++ * @{ */ + -+int kbase_pm_policy_init(struct kbase_device *kbdev) -+{ -+ struct workqueue_struct *wq; ++/** @brief Initialize IRQ handling for a resource ++ * ++ * Registers an interrupt handler \a uhandler for the given IRQ number \a irqnum. ++ * \a data will be passed as argument to the handler when an interrupt occurs. ++ * ++ * If \a irqnum is -1, _mali_osk_irq_init will probe for the IRQ number using ++ * the supplied \a trigger_func and \a ack_func. These functions will also ++ * receive \a data as their argument. ++ * ++ * @param irqnum The IRQ number that the resource uses, as seen by the CPU. ++ * The value -1 has a special meaning which indicates the use of probing, and ++ * trigger_func and ack_func must be non-NULL. ++ * @param uhandler The interrupt handler, corresponding to a ISR handler for ++ * the resource ++ * @param int_data resource specific data, which will be passed to uhandler ++ * @param trigger_func Optional: a function to trigger the resource's irq, to ++ * probe for the interrupt. Use NULL if irqnum != -1. ++ * @param ack_func Optional: a function to acknowledge the resource's irq, to ++ * probe for the interrupt. Use NULL if irqnum != -1. ++ * @param probe_data resource-specific data, which will be passed to ++ * (if present) trigger_func and ack_func ++ * @param description textual description of the IRQ resource. ++ * @return on success, a pointer to a _mali_osk_irq_t object, which represents ++ * the IRQ handling on this resource. NULL on failure. ++ */ ++_mali_osk_irq_t *_mali_osk_irq_init(u32 irqnum, _mali_osk_irq_uhandler_t uhandler, void *int_data, _mali_osk_irq_trigger_t trigger_func, _mali_osk_irq_ack_t ack_func, void *probe_data, const char *description); + -+ wq = alloc_workqueue("kbase_pm_do_poweroff", -+ WQ_HIGHPRI | WQ_UNBOUND, 1); -+ if (!wq) -+ return -ENOMEM; ++/** @brief Terminate IRQ handling on a resource. ++ * ++ * This will disable the interrupt from the device, and then waits for any ++ * currently executing IRQ handlers to complete. ++ * ++ * @note If work is deferred to an IRQ bottom-half handler through ++ * \ref _mali_osk_wq_schedule_work(), be sure to flush any remaining work ++ * with \ref _mali_osk_wq_flush() or (implicitly) with \ref _mali_osk_wq_delete_work() ++ * ++ * @param irq a pointer to the _mali_osk_irq_t object corresponding to the ++ * resource whose IRQ handling is to be terminated. ++ */ ++void _mali_osk_irq_term(_mali_osk_irq_t *irq); + -+ kbdev->pm.backend.gpu_poweroff_wq = wq; -+ INIT_WORK(&kbdev->pm.backend.gpu_poweroff_work, -+ kbasep_pm_do_gpu_poweroff_wq); -+ hrtimer_init(&kbdev->pm.backend.gpu_poweroff_timer, -+ CLOCK_MONOTONIC, HRTIMER_MODE_REL); -+ kbdev->pm.backend.gpu_poweroff_timer.function = -+ kbasep_pm_do_gpu_poweroff_callback; -+ kbdev->pm.backend.pm_current_policy = policy_list[0]; -+ kbdev->pm.backend.pm_current_policy->init(kbdev); -+ kbdev->pm.gpu_poweroff_time = -+ HR_TIMER_DELAY_NSEC(DEFAULT_PM_GPU_POWEROFF_TICK_NS); -+ kbdev->pm.poweroff_shader_ticks = DEFAULT_PM_POWEROFF_TICK_SHADER; -+ kbdev->pm.poweroff_gpu_ticks = DEFAULT_PM_POWEROFF_TICK_GPU; ++/** @} */ /* end group _mali_osk_irq */ + -+ return 0; -+} + -+void kbase_pm_policy_term(struct kbase_device *kbdev) -+{ -+ kbdev->pm.backend.pm_current_policy->term(kbdev); -+ destroy_workqueue(kbdev->pm.backend.gpu_poweroff_wq); -+} ++/** @addtogroup _mali_osk_atomic ++ * @{ */ + -+void kbase_pm_cancel_deferred_poweroff(struct kbase_device *kbdev) -+{ -+ unsigned long flags; ++/** @brief Decrement an atomic counter ++ * ++ * @note It is an error to decrement the counter beyond -(1<<23) ++ * ++ * @param atom pointer to an atomic counter */ ++void _mali_osk_atomic_dec(_mali_osk_atomic_t *atom); + -+ lockdep_assert_held(&kbdev->pm.lock); ++/** @brief Decrement an atomic counter, return new value ++ * ++ * @param atom pointer to an atomic counter ++ * @return The new value, after decrement */ ++u32 _mali_osk_atomic_dec_return(_mali_osk_atomic_t *atom); + -+ kbdev->pm.backend.poweroff_timer_needed = false; -+ hrtimer_cancel(&kbdev->pm.backend.gpu_poweroff_timer); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbdev->pm.backend.poweroff_timer_running = false; ++/** @brief Increment an atomic counter ++ * ++ * @note It is an error to increment the counter beyond (1<<23)-1 ++ * ++ * @param atom pointer to an atomic counter */ ++void _mali_osk_atomic_inc(_mali_osk_atomic_t *atom); + -+ /* If wq is already running but is held off by pm.lock, make sure it has -+ * no effect */ -+ kbdev->pm.backend.gpu_poweroff_pending = 0; ++/** @brief Increment an atomic counter, return new value ++ * ++ * @param atom pointer to an atomic counter */ ++u32 _mali_osk_atomic_inc_return(_mali_osk_atomic_t *atom); + -+ kbdev->pm.backend.shader_poweroff_pending = 0; -+ kbdev->pm.backend.tiler_poweroff_pending = 0; -+ kbdev->pm.backend.shader_poweroff_pending_time = 0; ++/** @brief Initialize an atomic counter ++ * ++ * @note the parameter required is a u32, and so signed integers should be ++ * cast to u32. ++ * ++ * @param atom pointer to an atomic counter ++ * @param val the value to initialize the atomic counter. ++ */ ++void _mali_osk_atomic_init(_mali_osk_atomic_t *atom, u32 val); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+} ++/** @brief Read a value from an atomic counter ++ * ++ * This can only be safely used to determine the value of the counter when it ++ * is guaranteed that other threads will not be modifying the counter. This ++ * makes its usefulness limited. ++ * ++ * @param atom pointer to an atomic counter ++ */ ++u32 _mali_osk_atomic_read(_mali_osk_atomic_t *atom); + -+void kbase_pm_update_active(struct kbase_device *kbdev) -+{ -+ struct kbase_pm_device_data *pm = &kbdev->pm; -+ struct kbase_pm_backend_data *backend = &pm->backend; -+ unsigned long flags; -+ bool active; ++/** @brief Terminate an atomic counter ++ * ++ * @param atom pointer to an atomic counter ++ */ ++void _mali_osk_atomic_term(_mali_osk_atomic_t *atom); + -+ lockdep_assert_held(&pm->lock); ++/** @brief Assign a new val to atomic counter, and return the old atomic counter ++ * ++ * @param atom pointer to an atomic counter ++ * @param val the new value assign to the atomic counter ++ * @return the old value of the atomic counter ++ */ ++u32 _mali_osk_atomic_xchg(_mali_osk_atomic_t *atom, u32 val); ++/** @} */ /* end group _mali_osk_atomic */ + -+ /* pm_current_policy will never be NULL while pm.lock is held */ -+ KBASE_DEBUG_ASSERT(backend->pm_current_policy); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++/** @defgroup _mali_osk_memory OSK Memory Allocation ++ * @{ */ + -+ active = backend->pm_current_policy->get_core_active(kbdev); ++/** @brief Allocate zero-initialized memory. ++ * ++ * Returns a buffer capable of containing at least \a n elements of \a size ++ * bytes each. The buffer is initialized to zero. ++ * ++ * If there is a need for a bigger block of memory (16KB or bigger), then ++ * consider to use _mali_osk_vmalloc() instead, as this function might ++ * map down to a OS function with size limitations. ++ * ++ * The buffer is suitably aligned for storage and subsequent access of every ++ * type that the compiler supports. Therefore, the pointer to the start of the ++ * buffer may be cast into any pointer type, and be subsequently accessed from ++ * such a pointer, without loss of information. ++ * ++ * When the buffer is no longer in use, it must be freed with _mali_osk_free(). ++ * Failure to do so will cause a memory leak. ++ * ++ * @note Most toolchains supply memory allocation functions that meet the ++ * compiler's alignment requirements. ++ * ++ * @param n Number of elements to allocate ++ * @param size Size of each element ++ * @return On success, the zero-initialized buffer allocated. NULL on failure ++ */ ++void *_mali_osk_calloc(u32 n, u32 size); + -+ if (active) { -+ if (backend->gpu_poweroff_pending) { -+ /* Cancel any pending power off request */ -+ backend->gpu_poweroff_pending = 0; -+ -+ /* If a request was pending then the GPU was still -+ * powered, so no need to continue */ -+ if (!kbdev->poweroff_pending) { -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, -+ flags); -+ return; -+ } -+ } -+ -+ if (!backend->poweroff_timer_running && !backend->gpu_powered && -+ (pm->poweroff_gpu_ticks || -+ pm->poweroff_shader_ticks)) { -+ backend->poweroff_timer_needed = true; -+ backend->poweroff_timer_running = true; -+ hrtimer_start(&backend->gpu_poweroff_timer, -+ pm->gpu_poweroff_time, -+ HRTIMER_MODE_REL); -+ } -+ -+ /* Power on the GPU and any cores requested by the policy */ -+ if (pm->backend.poweroff_wait_in_progress) { -+ pm->backend.poweron_required = true; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ } else { -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ kbase_pm_do_poweron(kbdev, false); -+ } -+ } else { -+ /* It is an error for the power policy to power off the GPU -+ * when there are contexts active */ -+ KBASE_DEBUG_ASSERT(pm->active_count == 0); ++/** @brief Allocate memory. ++ * ++ * Returns a buffer capable of containing at least \a size bytes. The ++ * contents of the buffer are undefined. ++ * ++ * If there is a need for a bigger block of memory (16KB or bigger), then ++ * consider to use _mali_osk_vmalloc() instead, as this function might ++ * map down to a OS function with size limitations. ++ * ++ * The buffer is suitably aligned for storage and subsequent access of every ++ * type that the compiler supports. Therefore, the pointer to the start of the ++ * buffer may be cast into any pointer type, and be subsequently accessed from ++ * such a pointer, without loss of information. ++ * ++ * When the buffer is no longer in use, it must be freed with _mali_osk_free(). ++ * Failure to do so will cause a memory leak. ++ * ++ * @note Most toolchains supply memory allocation functions that meet the ++ * compiler's alignment requirements. ++ * ++ * Remember to free memory using _mali_osk_free(). ++ * @param size Number of bytes to allocate ++ * @return On success, the buffer allocated. NULL on failure. ++ */ ++void *_mali_osk_malloc(u32 size); + -+ if (backend->shader_poweroff_pending || -+ backend->tiler_poweroff_pending) { -+ backend->shader_poweroff_pending = 0; -+ backend->tiler_poweroff_pending = 0; -+ backend->shader_poweroff_pending_time = 0; -+ } ++/** @brief Free memory. ++ * ++ * Reclaims the buffer pointed to by the parameter \a ptr for the system. ++ * All memory returned from _mali_osk_malloc() and _mali_osk_calloc() ++ * must be freed before the application exits. Otherwise, ++ * a memory leak will occur. ++ * ++ * Memory must be freed once. It is an error to free the same non-NULL pointer ++ * more than once. ++ * ++ * It is legal to free the NULL pointer. ++ * ++ * @param ptr Pointer to buffer to free ++ */ ++void _mali_osk_free(void *ptr); + -+ /* Request power off */ -+ if (pm->backend.gpu_powered) { -+ if (pm->poweroff_gpu_ticks) { -+ backend->gpu_poweroff_pending = -+ pm->poweroff_gpu_ticks; -+ backend->poweroff_timer_needed = true; -+ if (!backend->poweroff_timer_running) { -+ /* Start timer if not running (eg if -+ * power policy has been changed from -+ * always_on to something else). This -+ * will ensure the GPU is actually -+ * powered off */ -+ backend->poweroff_timer_running -+ = true; -+ hrtimer_start( -+ &backend->gpu_poweroff_timer, -+ pm->gpu_poweroff_time, -+ HRTIMER_MODE_REL); -+ } -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, -+ flags); -+ } else { -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, -+ flags); ++/** @brief Allocate memory. ++ * ++ * Returns a buffer capable of containing at least \a size bytes. The ++ * contents of the buffer are undefined. ++ * ++ * This function is potentially slower than _mali_osk_malloc() and _mali_osk_calloc(), ++ * but do support bigger sizes. ++ * ++ * The buffer is suitably aligned for storage and subsequent access of every ++ * type that the compiler supports. Therefore, the pointer to the start of the ++ * buffer may be cast into any pointer type, and be subsequently accessed from ++ * such a pointer, without loss of information. ++ * ++ * When the buffer is no longer in use, it must be freed with _mali_osk_free(). ++ * Failure to do so will cause a memory leak. ++ * ++ * @note Most toolchains supply memory allocation functions that meet the ++ * compiler's alignment requirements. ++ * ++ * Remember to free memory using _mali_osk_free(). ++ * @param size Number of bytes to allocate ++ * @return On success, the buffer allocated. NULL on failure. ++ */ ++void *_mali_osk_valloc(u32 size); + -+ /* Power off the GPU immediately */ -+ kbase_pm_do_poweroff(kbdev, false); -+ } -+ } else { -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ } -+ } -+} ++/** @brief Free memory. ++ * ++ * Reclaims the buffer pointed to by the parameter \a ptr for the system. ++ * All memory returned from _mali_osk_valloc() must be freed before the ++ * application exits. Otherwise a memory leak will occur. ++ * ++ * Memory must be freed once. It is an error to free the same non-NULL pointer ++ * more than once. ++ * ++ * It is legal to free the NULL pointer. ++ * ++ * @param ptr Pointer to buffer to free ++ */ ++void _mali_osk_vfree(void *ptr); + -+void kbase_pm_update_cores_state_nolock(struct kbase_device *kbdev) -+{ -+ u64 desired_bitmap; -+ u64 desired_tiler_bitmap; -+ bool cores_are_available; -+ bool do_poweroff = false; ++/** @brief Copies memory. ++ * ++ * Copies the \a len bytes from the buffer pointed by the parameter \a src ++ * directly to the buffer pointed by \a dst. ++ * ++ * It is an error for \a src to overlap \a dst anywhere in \a len bytes. ++ * ++ * @param dst Pointer to the destination array where the content is to be ++ * copied. ++ * @param src Pointer to the source of data to be copied. ++ * @param len Number of bytes to copy. ++ * @return \a dst is always passed through unmodified. ++ */ ++void *_mali_osk_memcpy(void *dst, const void *src, u32 len); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++/** @brief Fills memory. ++ * ++ * Sets the first \a n bytes of the block of memory pointed to by \a s to ++ * the specified value ++ * @param s Pointer to the block of memory to fill. ++ * @param c Value to be set, passed as u32. Only the 8 Least Significant Bits (LSB) ++ * are used. ++ * @param n Number of bytes to be set to the value. ++ * @return \a s is always passed through unmodified ++ */ ++void *_mali_osk_memset(void *s, u32 c, u32 n); ++/** @} */ /* end group _mali_osk_memory */ + -+ if (kbdev->pm.backend.pm_current_policy == NULL) -+ return; -+ if (kbdev->pm.backend.poweroff_wait_in_progress) -+ return; + -+ if (kbdev->protected_mode_transition && !kbdev->shader_needed_bitmap && -+ !kbdev->shader_inuse_bitmap && !kbdev->tiler_needed_cnt -+ && !kbdev->tiler_inuse_cnt) { -+ /* We are trying to change in/out of protected mode - force all -+ * cores off so that the L2 powers down */ -+ desired_bitmap = 0; -+ desired_tiler_bitmap = 0; -+ } else { -+ desired_bitmap = -+ kbdev->pm.backend.pm_current_policy->get_core_mask(kbdev); -+ desired_bitmap &= kbase_pm_ca_get_core_mask(kbdev); ++/** @brief Checks the amount of memory allocated ++ * ++ * Checks that not more than \a max_allocated bytes are allocated. ++ * ++ * Some OS bring up an interactive out of memory dialogue when the ++ * system runs out of memory. This can stall non-interactive ++ * apps (e.g. automated test runs). This function can be used to ++ * not trigger the OOM dialogue by keeping allocations ++ * within a certain limit. ++ * ++ * @return MALI_TRUE when \a max_allocated bytes are not in use yet. MALI_FALSE ++ * when at least \a max_allocated bytes are in use. ++ */ ++mali_bool _mali_osk_mem_check_allocated(u32 max_allocated); + -+ if (kbdev->tiler_needed_cnt > 0 || kbdev->tiler_inuse_cnt > 0) -+ desired_tiler_bitmap = 1; -+ else -+ desired_tiler_bitmap = 0; + -+ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_XAFFINITY)) { -+ /* Unless XAFFINITY is supported, enable core 0 if tiler -+ * required, regardless of core availability */ -+ if (kbdev->tiler_needed_cnt > 0 || -+ kbdev->tiler_inuse_cnt > 0) -+ desired_bitmap |= 1; -+ } -+ } ++/** @addtogroup _mali_osk_low_level_memory ++ * @{ */ + -+ if (kbdev->pm.backend.desired_shader_state != desired_bitmap) -+ KBASE_TRACE_ADD(kbdev, PM_CORES_CHANGE_DESIRED, NULL, NULL, 0u, -+ (u32)desired_bitmap); -+ /* Are any cores being powered on? */ -+ if (~kbdev->pm.backend.desired_shader_state & desired_bitmap || -+ ~kbdev->pm.backend.desired_tiler_state & desired_tiler_bitmap || -+ kbdev->pm.backend.ca_in_transition) { -+ /* Check if we are powering off any cores before updating shader -+ * state */ -+ if (kbdev->pm.backend.desired_shader_state & ~desired_bitmap || -+ kbdev->pm.backend.desired_tiler_state & -+ ~desired_tiler_bitmap) { -+ /* Start timer to power off cores */ -+ kbdev->pm.backend.shader_poweroff_pending |= -+ (kbdev->pm.backend.desired_shader_state & -+ ~desired_bitmap); -+ kbdev->pm.backend.tiler_poweroff_pending |= -+ (kbdev->pm.backend.desired_tiler_state & -+ ~desired_tiler_bitmap); ++/** @brief Issue a memory barrier ++ * ++ * This defines an arbitrary memory barrier operation, which forces an ordering constraint ++ * on memory read and write operations. ++ */ ++void _mali_osk_mem_barrier(void); + -+ if (kbdev->pm.poweroff_shader_ticks && -+ !kbdev->protected_mode_transition) -+ kbdev->pm.backend.shader_poweroff_pending_time = -+ kbdev->pm.poweroff_shader_ticks; -+ else -+ do_poweroff = true; -+ } ++/** @brief Issue a write memory barrier ++ * ++ * This defines an write memory barrier operation which forces an ordering constraint ++ * on memory write operations. ++ */ ++void _mali_osk_write_mem_barrier(void); + -+ kbdev->pm.backend.desired_shader_state = desired_bitmap; -+ kbdev->pm.backend.desired_tiler_state = desired_tiler_bitmap; ++/** @brief Map a physically contiguous region into kernel space ++ * ++ * This is primarily used for mapping in registers from resources, and Mali-MMU ++ * page tables. The mapping is only visable from kernel-space. ++ * ++ * Access has to go through _mali_osk_mem_ioread32 and _mali_osk_mem_iowrite32 ++ * ++ * @param phys CPU-physical base address of the memory to map in. This must ++ * be aligned to the system's page size, which is assumed to be 4K. ++ * @param size the number of bytes of physically contiguous address space to ++ * map in ++ * @param description A textual description of the memory being mapped in. ++ * @return On success, a Mali IO address through which the mapped-in ++ * memory/registers can be accessed. NULL on failure. ++ */ ++mali_io_address _mali_osk_mem_mapioregion(uintptr_t phys, u32 size, const char *description); + -+ /* If any cores are being powered on, transition immediately */ -+ cores_are_available = kbase_pm_check_transitions_nolock(kbdev); -+ } else if (kbdev->pm.backend.desired_shader_state & ~desired_bitmap || -+ kbdev->pm.backend.desired_tiler_state & -+ ~desired_tiler_bitmap) { -+ /* Start timer to power off cores */ -+ kbdev->pm.backend.shader_poweroff_pending |= -+ (kbdev->pm.backend.desired_shader_state & -+ ~desired_bitmap); -+ kbdev->pm.backend.tiler_poweroff_pending |= -+ (kbdev->pm.backend.desired_tiler_state & -+ ~desired_tiler_bitmap); -+ if (kbdev->pm.poweroff_shader_ticks && -+ !kbdev->protected_mode_transition) -+ kbdev->pm.backend.shader_poweroff_pending_time = -+ kbdev->pm.poweroff_shader_ticks; -+ else -+ kbasep_pm_do_poweroff_cores(kbdev); -+ } else if (kbdev->pm.active_count == 0 && desired_bitmap != 0 && -+ desired_tiler_bitmap != 0 && -+ kbdev->pm.backend.poweroff_timer_needed) { -+ /* If power policy is keeping cores on despite there being no -+ * active contexts then disable poweroff timer as it isn't -+ * required. -+ * Only reset poweroff_timer_needed if we're not in the middle -+ * of the power off callback */ -+ kbdev->pm.backend.poweroff_timer_needed = false; -+ } ++/** @brief Unmap a physically contiguous address range from kernel space. ++ * ++ * The address range should be one previously mapped in through ++ * _mali_osk_mem_mapioregion. ++ * ++ * It is a programming error to do (but not limited to) the following: ++ * - attempt an unmap twice ++ * - unmap only part of a range obtained through _mali_osk_mem_mapioregion ++ * - unmap more than the range obtained through _mali_osk_mem_mapioregion ++ * - unmap an address range that was not successfully mapped using ++ * _mali_osk_mem_mapioregion ++ * - provide a mapping that does not map to phys. ++ * ++ * @param phys CPU-physical base address of the memory that was originally ++ * mapped in. This must be aligned to the system's page size, which is assumed ++ * to be 4K ++ * @param size The number of bytes that were originally mapped in. ++ * @param mapping The Mali IO address through which the mapping is ++ * accessed. ++ */ ++void _mali_osk_mem_unmapioregion(uintptr_t phys, u32 size, mali_io_address mapping); + -+ /* Ensure timer does not power off wanted cores and make sure to power -+ * off unwanted cores */ -+ if (kbdev->pm.backend.shader_poweroff_pending || -+ kbdev->pm.backend.tiler_poweroff_pending) { -+ kbdev->pm.backend.shader_poweroff_pending &= -+ ~(kbdev->pm.backend.desired_shader_state & -+ desired_bitmap); -+ kbdev->pm.backend.tiler_poweroff_pending &= -+ ~(kbdev->pm.backend.desired_tiler_state & -+ desired_tiler_bitmap); ++/** @brief Allocate and Map a physically contiguous region into kernel space ++ * ++ * This is used for allocating physically contiguous regions (such as Mali-MMU ++ * page tables) and mapping them into kernel space. The mapping is only ++ * visible from kernel-space. ++ * ++ * The alignment of the returned memory is guaranteed to be at least ++ * _MALI_OSK_CPU_PAGE_SIZE. ++ * ++ * Access must go through _mali_osk_mem_ioread32 and _mali_osk_mem_iowrite32 ++ * ++ * @note This function is primarily to provide support for OSs that are ++ * incapable of separating the tasks 'allocate physically contiguous memory' ++ * and 'map it into kernel space' ++ * ++ * @param[out] phys CPU-physical base address of memory that was allocated. ++ * (*phys) will be guaranteed to be aligned to at least ++ * _MALI_OSK_CPU_PAGE_SIZE on success. ++ * ++ * @param[in] size the number of bytes of physically contiguous memory to ++ * allocate. This must be a multiple of _MALI_OSK_CPU_PAGE_SIZE. ++ * ++ * @return On success, a Mali IO address through which the mapped-in ++ * memory/registers can be accessed. NULL on failure, and (*phys) is unmodified. ++ */ ++mali_io_address _mali_osk_mem_allocioregion(u32 *phys, u32 size); + -+ if (!kbdev->pm.backend.shader_poweroff_pending && -+ !kbdev->pm.backend.tiler_poweroff_pending) -+ kbdev->pm.backend.shader_poweroff_pending_time = 0; -+ } ++/** @brief Free a physically contiguous address range from kernel space. ++ * ++ * The address range should be one previously mapped in through ++ * _mali_osk_mem_allocioregion. ++ * ++ * It is a programming error to do (but not limited to) the following: ++ * - attempt a free twice on the same ioregion ++ * - free only part of a range obtained through _mali_osk_mem_allocioregion ++ * - free more than the range obtained through _mali_osk_mem_allocioregion ++ * - free an address range that was not successfully mapped using ++ * _mali_osk_mem_allocioregion ++ * - provide a mapping that does not map to phys. ++ * ++ * @param phys CPU-physical base address of the memory that was originally ++ * mapped in, which was aligned to _MALI_OSK_CPU_PAGE_SIZE. ++ * @param size The number of bytes that were originally mapped in, which was ++ * a multiple of _MALI_OSK_CPU_PAGE_SIZE. ++ * @param mapping The Mali IO address through which the mapping is ++ * accessed. ++ */ ++void _mali_osk_mem_freeioregion(u32 phys, u32 size, mali_io_address mapping); + -+ /* Shader poweroff is deferred to the end of the function, to eliminate -+ * issues caused by the core availability policy recursing into this -+ * function */ -+ if (do_poweroff) -+ kbasep_pm_do_poweroff_cores(kbdev); ++/** @brief Request a region of physically contiguous memory ++ * ++ * This is used to ensure exclusive access to a region of physically contigous ++ * memory. ++ * ++ * It is acceptable to implement this as a stub. However, it is then the job ++ * of the System Integrator to ensure that no other device driver will be using ++ * the physical address ranges used by Mali, while the Mali device driver is ++ * loaded. ++ * ++ * @param phys CPU-physical base address of the memory to request. This must ++ * be aligned to the system's page size, which is assumed to be 4K. ++ * @param size the number of bytes of physically contiguous address space to ++ * request. ++ * @param description A textual description of the memory being requested. ++ * @return _MALI_OSK_ERR_OK on success. Otherwise, a suitable ++ * _mali_osk_errcode_t on failure. ++ */ ++_mali_osk_errcode_t _mali_osk_mem_reqregion(uintptr_t phys, u32 size, const char *description); + -+ /* Don't need 'cores_are_available', because we don't return anything */ -+ CSTD_UNUSED(cores_are_available); -+} ++/** @brief Un-request a region of physically contiguous memory ++ * ++ * This is used to release a regious of physically contiguous memory previously ++ * requested through _mali_osk_mem_reqregion, so that other device drivers may ++ * use it. This will be called at time of Mali device driver termination. ++ * ++ * It is a programming error to attempt to: ++ * - unrequest a region twice ++ * - unrequest only part of a range obtained through _mali_osk_mem_reqregion ++ * - unrequest more than the range obtained through _mali_osk_mem_reqregion ++ * - unrequest an address range that was not successfully requested using ++ * _mali_osk_mem_reqregion ++ * ++ * @param phys CPU-physical base address of the memory to un-request. This must ++ * be aligned to the system's page size, which is assumed to be 4K ++ * @param size the number of bytes of physically contiguous address space to ++ * un-request. ++ */ ++void _mali_osk_mem_unreqregion(uintptr_t phys, u32 size); + -+void kbase_pm_update_cores_state(struct kbase_device *kbdev) -+{ -+ unsigned long flags; ++/** @brief Read from a location currently mapped in through ++ * _mali_osk_mem_mapioregion ++ * ++ * This reads a 32-bit word from a 32-bit aligned location. It is a programming ++ * error to provide unaligned locations, or to read from memory that is not ++ * mapped in, or not mapped through either _mali_osk_mem_mapioregion() or ++ * _mali_osk_mem_allocioregion(). ++ * ++ * @param mapping Mali IO address to read from ++ * @param offset Byte offset from the given IO address to operate on, must be a multiple of 4 ++ * @return the 32-bit word from the specified location. ++ */ ++u32 _mali_osk_mem_ioread32(volatile mali_io_address mapping, u32 offset); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++/** @brief Write to a location currently mapped in through ++ * _mali_osk_mem_mapioregion without memory barriers ++ * ++ * This write a 32-bit word to a 32-bit aligned location without using memory barrier. ++ * It is a programming error to provide unaligned locations, or to write to memory that is not ++ * mapped in, or not mapped through either _mali_osk_mem_mapioregion() or ++ * _mali_osk_mem_allocioregion(). ++ * ++ * @param mapping Mali IO address to write to ++ * @param offset Byte offset from the given IO address to operate on, must be a multiple of 4 ++ * @param val the 32-bit word to write. ++ */ ++void _mali_osk_mem_iowrite32_relaxed(volatile mali_io_address addr, u32 offset, u32 val); + -+ kbase_pm_update_cores_state_nolock(kbdev); ++/** @brief Write to a location currently mapped in through ++ * _mali_osk_mem_mapioregion with write memory barrier ++ * ++ * This write a 32-bit word to a 32-bit aligned location. It is a programming ++ * error to provide unaligned locations, or to write to memory that is not ++ * mapped in, or not mapped through either _mali_osk_mem_mapioregion() or ++ * _mali_osk_mem_allocioregion(). ++ * ++ * @param mapping Mali IO address to write to ++ * @param offset Byte offset from the given IO address to operate on, must be a multiple of 4 ++ * @param val the 32-bit word to write. ++ */ ++void _mali_osk_mem_iowrite32(volatile mali_io_address mapping, u32 offset, u32 val); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+} ++/** @brief Flush all CPU caches ++ * ++ * This should only be implemented if flushing of the cache is required for ++ * memory mapped in through _mali_osk_mem_mapregion. ++ */ ++void _mali_osk_cache_flushall(void); + -+int kbase_pm_list_policies(const struct kbase_pm_policy * const **list) -+{ -+ if (!list) -+ return POLICY_COUNT; ++/** @brief Flush any caches necessary for the CPU and MALI to have the same view of a range of uncached mapped memory ++ * ++ * This should only be implemented if your OS doesn't do a full cache flush (inner & outer) ++ * after allocating uncached mapped memory. ++ * ++ * Some OS do not perform a full cache flush (including all outer caches) for uncached mapped memory. ++ * They zero the memory through a cached mapping, then flush the inner caches but not the outer caches. ++ * This is required for MALI to have the correct view of the memory. ++ */ ++void _mali_osk_cache_ensure_uncached_range_flushed(void *uncached_mapping, u32 offset, u32 size); + -+ *list = policy_list; ++/** @brief Safely copy as much data as possible from src to dest ++ * ++ * Do not crash if src or dest isn't available. ++ * ++ * @param dest Destination buffer (limited to user space mapped Mali memory) ++ * @param src Source buffer ++ * @param size Number of bytes to copy ++ * @return Number of bytes actually copied ++ */ ++u32 _mali_osk_mem_write_safe(void *dest, const void *src, u32 size); + -+ return POLICY_COUNT; -+} ++/** @} */ /* end group _mali_osk_low_level_memory */ + -+KBASE_EXPORT_TEST_API(kbase_pm_list_policies); + -+const struct kbase_pm_policy *kbase_pm_get_policy(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++/** @addtogroup _mali_osk_notification ++ * ++ * User space notification framework ++ * ++ * Communication with user space of asynchronous events is performed through a ++ * synchronous call to the \ref u_k_api. ++ * ++ * Since the events are asynchronous, the events have to be queued until a ++ * synchronous U/K API call can be made by user-space. A U/K API call might also ++ * be received before any event has happened. Therefore the notifications the ++ * different subsystems wants to send to user space has to be queued for later ++ * reception, or a U/K API call has to be blocked until an event has occured. ++ * ++ * Typical uses of notifications are after running of jobs on the hardware or ++ * when changes to the system is detected that needs to be relayed to user ++ * space. ++ * ++ * After an event has occured user space has to be notified using some kind of ++ * message. The notification framework supports sending messages to waiting ++ * threads or queueing of messages until a U/K API call is made. ++ * ++ * The notification queue is a FIFO. There are no restrictions on the numbers ++ * of readers or writers in the queue. ++ * ++ * A message contains what user space needs to identifiy how to handle an ++ * event. This includes a type field and a possible type specific payload. ++ * ++ * A notification to user space is represented by a ++ * \ref _mali_osk_notification_t object. A sender gets hold of such an object ++ * using _mali_osk_notification_create(). The buffer given by the ++ * _mali_osk_notification_t::result_buffer field in the object is used to store ++ * any type specific data. The other fields are internal to the queue system ++ * and should not be touched. ++ * ++ * @{ */ + -+ return kbdev->pm.backend.pm_current_policy; -+} ++/** @brief Create a notification object ++ * ++ * Returns a notification object which can be added to the queue of ++ * notifications pending for user space transfer. ++ * ++ * The implementation will initialize all members of the ++ * \ref _mali_osk_notification_t object. In particular, the ++ * _mali_osk_notification_t::result_buffer member will be initialized to point ++ * to \a size bytes of storage, and that storage will be suitably aligned for ++ * storage of any structure. That is, the created buffer meets the same ++ * requirements as _mali_osk_malloc(). ++ * ++ * The notification object must be deleted when not in use. Use ++ * _mali_osk_notification_delete() for deleting it. ++ * ++ * @note You \b must \b not call _mali_osk_free() on a \ref _mali_osk_notification_t, ++ * object, or on a _mali_osk_notification_t::result_buffer. You must only use ++ * _mali_osk_notification_delete() to free the resources assocaited with a ++ * \ref _mali_osk_notification_t object. ++ * ++ * @param type The notification type ++ * @param size The size of the type specific buffer to send ++ * @return Pointer to a notification object with a suitable buffer, or NULL on error. ++ */ ++_mali_osk_notification_t *_mali_osk_notification_create(u32 type, u32 size); + -+KBASE_EXPORT_TEST_API(kbase_pm_get_policy); ++/** @brief Delete a notification object ++ * ++ * This must be called to reclaim the resources of a notification object. This ++ * includes: ++ * - The _mali_osk_notification_t::result_buffer ++ * - The \ref _mali_osk_notification_t itself. ++ * ++ * A notification object \b must \b not be used after it has been deleted by ++ * _mali_osk_notification_delete(). ++ * ++ * In addition, the notification object may not be deleted while it is in a ++ * queue. That is, if it has been placed on a queue with ++ * _mali_osk_notification_queue_send(), then it must not be deleted until ++ * it has been received by a call to _mali_osk_notification_queue_receive(). ++ * Otherwise, the queue may be corrupted. ++ * ++ * @param object the notification object to delete. ++ */ ++void _mali_osk_notification_delete(_mali_osk_notification_t *object); + -+void kbase_pm_set_policy(struct kbase_device *kbdev, -+ const struct kbase_pm_policy *new_policy) -+{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ const struct kbase_pm_policy *old_policy; -+ unsigned long flags; ++/** @brief Create a notification queue ++ * ++ * Creates a notification queue which can be used to queue messages for user ++ * delivery and get queued messages from ++ * ++ * The queue is a FIFO, and has no restrictions on the numbers of readers or ++ * writers. ++ * ++ * When the queue is no longer in use, it must be terminated with ++ * \ref _mali_osk_notification_queue_term(). Failure to do so will result in a ++ * memory leak. ++ * ++ * @return Pointer to a new notification queue or NULL on error. ++ */ ++_mali_osk_notification_queue_t *_mali_osk_notification_queue_init(void); + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(new_policy != NULL); ++/** @brief Destroy a notification queue ++ * ++ * Destroys a notification queue and frees associated resources from the queue. ++ * ++ * A notification queue \b must \b not be destroyed in the following cases: ++ * - while there are \ref _mali_osk_notification_t objects in the queue. ++ * - while there are writers currently acting upon the queue. That is, while ++ * a thread is currently calling \ref _mali_osk_notification_queue_send() on ++ * the queue, or while a thread may call ++ * \ref _mali_osk_notification_queue_send() on the queue in the future. ++ * - while there are readers currently waiting upon the queue. That is, while ++ * a thread is currently calling \ref _mali_osk_notification_queue_receive() on ++ * the queue, or while a thread may call ++ * \ref _mali_osk_notification_queue_receive() on the queue in the future. ++ * ++ * Therefore, all \ref _mali_osk_notification_t objects must be flushed and ++ * deleted by the code that makes use of the notification queues, since only ++ * they know the structure of the _mali_osk_notification_t::result_buffer ++ * (even if it may only be a flat sturcture). ++ * ++ * @note Since the queue is a FIFO, the code using notification queues may ++ * create its own 'flush' type of notification, to assist in flushing the ++ * queue. ++ * ++ * Once the queue has been destroyed, it must not be used again. ++ * ++ * @param queue The queue to destroy ++ */ ++void _mali_osk_notification_queue_term(_mali_osk_notification_queue_t *queue); + -+ KBASE_TRACE_ADD(kbdev, PM_SET_POLICY, NULL, NULL, 0u, new_policy->id); ++/** @brief Schedule notification for delivery ++ * ++ * When a \ref _mali_osk_notification_t object has been created successfully ++ * and set up, it may be added to the queue of objects waiting for user space ++ * transfer. ++ * ++ * The sending will not block if the queue is full. ++ * ++ * A \ref _mali_osk_notification_t object \b must \b not be put on two different ++ * queues at the same time, or enqueued twice onto a single queue before ++ * reception. However, it is acceptable for it to be requeued \em after reception ++ * from a call to _mali_osk_notification_queue_receive(), even onto the same queue. ++ * ++ * Again, requeuing must also not enqueue onto two different queues at the same ++ * time, or enqueue onto the same queue twice before reception. ++ * ++ * @param queue The notification queue to add this notification to ++ * @param object The entry to add ++ */ ++void _mali_osk_notification_queue_send(_mali_osk_notification_queue_t *queue, _mali_osk_notification_t *object); + -+ /* During a policy change we pretend the GPU is active */ -+ /* A suspend won't happen here, because we're in a syscall from a -+ * userspace thread */ -+ kbase_pm_context_active(kbdev); ++/** @brief Receive a notification from a queue ++ * ++ * Receives a single notification from the given queue. ++ * ++ * If no notifciations are ready the thread will sleep until one becomes ready. ++ * Therefore, notifications may not be received into an ++ * IRQ or 'atomic' context (that is, a context where sleeping is disallowed). ++ * ++ * @param queue The queue to receive from ++ * @param result Pointer to storage of a pointer of type ++ * \ref _mali_osk_notification_t*. \a result will be written to such that the ++ * expression \a (*result) will evaluate to a pointer to a valid ++ * \ref _mali_osk_notification_t object, or NULL if none were received. ++ * @return _MALI_OSK_ERR_OK on success. _MALI_OSK_ERR_RESTARTSYSCALL if the sleep was interrupted. ++ */ ++_mali_osk_errcode_t _mali_osk_notification_queue_receive(_mali_osk_notification_queue_t *queue, _mali_osk_notification_t **result); + -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); ++/** @brief Dequeues a notification from a queue ++ * ++ * Receives a single notification from the given queue. ++ * ++ * If no notifciations are ready the function call will return an error code. ++ * ++ * @param queue The queue to receive from ++ * @param result Pointer to storage of a pointer of type ++ * \ref _mali_osk_notification_t*. \a result will be written to such that the ++ * expression \a (*result) will evaluate to a pointer to a valid ++ * \ref _mali_osk_notification_t object, or NULL if none were received. ++ * @return _MALI_OSK_ERR_OK on success, _MALI_OSK_ERR_ITEM_NOT_FOUND if queue was empty. ++ */ ++_mali_osk_errcode_t _mali_osk_notification_queue_dequeue(_mali_osk_notification_queue_t *queue, _mali_osk_notification_t **result); + -+ /* Remove the policy to prevent IRQ handlers from working on it */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ old_policy = kbdev->pm.backend.pm_current_policy; -+ kbdev->pm.backend.pm_current_policy = NULL; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++/** @} */ /* end group _mali_osk_notification */ + -+ KBASE_TRACE_ADD(kbdev, PM_CURRENT_POLICY_TERM, NULL, NULL, 0u, -+ old_policy->id); -+ if (old_policy->term) -+ old_policy->term(kbdev); + -+ KBASE_TRACE_ADD(kbdev, PM_CURRENT_POLICY_INIT, NULL, NULL, 0u, -+ new_policy->id); -+ if (new_policy->init) -+ new_policy->init(kbdev); ++/** @addtogroup _mali_osk_timer ++ * ++ * Timers use the OS's representation of time, which are 'ticks'. This is to ++ * prevent aliasing problems between the internal timer time, and the time ++ * asked for. ++ * ++ * @{ */ + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbdev->pm.backend.pm_current_policy = new_policy; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++/** @brief Initialize a timer ++ * ++ * Allocates resources for a new timer, and initializes them. This does not ++ * start the timer. ++ * ++ * @return a pointer to the allocated timer object, or NULL on failure. ++ */ ++_mali_osk_timer_t *_mali_osk_timer_init(_mali_osk_timer_callback_t callback); + -+ /* If any core power state changes were previously attempted, but -+ * couldn't be made because the policy was changing (current_policy was -+ * NULL), then re-try them here. */ -+ kbase_pm_update_active(kbdev); -+ kbase_pm_update_cores_state(kbdev); ++/** @brief Start a timer ++ * ++ * It is an error to start a timer without setting the callback via ++ * _mali_osk_timer_setcallback(). ++ * ++ * It is an error to use this to start an already started timer. ++ * ++ * The timer will expire in \a ticks_to_expire ticks, at which point, the ++ * callback function will be invoked with the callback-specific data, ++ * as registered by _mali_osk_timer_setcallback(). ++ * ++ * @param tim the timer to start ++ * @param ticks_to_expire the amount of time in ticks for the timer to run ++ * before triggering. ++ */ ++void _mali_osk_timer_add(_mali_osk_timer_t *tim, unsigned long ticks_to_expire); + -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); ++/** @brief Modify a timer ++ * ++ * Set the relative time at which a timer will expire, and start it if it is ++ * stopped. If \a ticks_to_expire 0 the timer fires immediately. ++ * ++ * It is an error to modify a timer without setting the callback via ++ * _mali_osk_timer_setcallback(). ++ * ++ * The timer will expire at \a ticks_to_expire from the time of the call, at ++ * which point, the callback function will be invoked with the ++ * callback-specific data, as set by _mali_osk_timer_setcallback(). ++ * ++ * @param tim the timer to modify, and start if necessary ++ * @param ticks_to_expire the \em absolute time in ticks at which this timer ++ * should trigger. ++ * ++ */ ++void _mali_osk_timer_mod(_mali_osk_timer_t *tim, unsigned long ticks_to_expire); + -+ /* Now the policy change is finished, we release our fake context active -+ * reference */ -+ kbase_pm_context_idle(kbdev); -+} ++/** @brief Stop a timer, and block on its completion. ++ * ++ * Stop the timer. When the function returns, it is guaranteed that the timer's ++ * callback will not be running on any CPU core. ++ * ++ * Since stoping the timer blocks on compeletion of the callback, the callback ++ * may not obtain any mutexes that the caller holds. Otherwise, a deadlock will ++ * occur. ++ * ++ * @note While the callback itself is guaranteed to not be running, work ++ * enqueued on the work-queue by the timer (with ++ * \ref _mali_osk_wq_schedule_work()) may still run. The timer callback and ++ * work handler must take this into account. ++ * ++ * It is legal to stop an already stopped timer. ++ * ++ * @param tim the timer to stop. ++ * ++ */ ++void _mali_osk_timer_del(_mali_osk_timer_t *tim); + -+KBASE_EXPORT_TEST_API(kbase_pm_set_policy); ++/** @brief Stop a timer. ++ * ++ * Stop the timer. When the function returns, the timer's callback may still be ++ * running on any CPU core. ++ * ++ * It is legal to stop an already stopped timer. ++ * ++ * @param tim the timer to stop. ++ */ ++void _mali_osk_timer_del_async(_mali_osk_timer_t *tim); + -+/* Check whether a state change has finished, and trace it as completed */ -+static void -+kbase_pm_trace_check_and_finish_state_change(struct kbase_device *kbdev) -+{ -+ if ((kbdev->shader_available_bitmap & -+ kbdev->pm.backend.desired_shader_state) -+ == kbdev->pm.backend.desired_shader_state && -+ (kbdev->tiler_available_bitmap & -+ kbdev->pm.backend.desired_tiler_state) -+ == kbdev->pm.backend.desired_tiler_state) -+ kbase_timeline_pm_check_handle_event(kbdev, -+ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED); -+} ++/** @brief Check if timer is pending. ++ * ++ * Check if timer is active. ++ * ++ * @param tim the timer to check ++ * @return MALI_TRUE if time is active, MALI_FALSE if it is not active ++ */ ++mali_bool _mali_osk_timer_pending(_mali_osk_timer_t *tim); + -+void kbase_pm_request_cores(struct kbase_device *kbdev, -+ bool tiler_required, u64 shader_cores) -+{ -+ u64 cores; ++/** @brief Set a timer's callback parameters. ++ * ++ * This must be called at least once before a timer is started/modified. ++ * ++ * After a timer has been stopped or expires, the callback remains set. This ++ * means that restarting the timer will call the same function with the same ++ * parameters on expiry. ++ * ++ * @param tim the timer to set callback on. ++ * @param callback Function to call when timer expires ++ * @param data Function-specific data to supply to the function on expiry. ++ */ ++void _mali_osk_timer_setcallback(_mali_osk_timer_t *tim, _mali_osk_timer_callback_t callback, void *data); + -+ kbase_pm_change_state change_gpu_state = 0u; ++/** @brief Terminate a timer, and deallocate resources. ++ * ++ * The timer must first be stopped by calling _mali_osk_timer_del(). ++ * ++ * It is a programming error for _mali_osk_timer_term() to be called on: ++ * - timer that is currently running ++ * - a timer that is currently executing its callback. ++ * ++ * @param tim the timer to deallocate. ++ */ ++void _mali_osk_timer_term(_mali_osk_timer_t *tim); ++/** @} */ /* end group _mali_osk_timer */ + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++/** @defgroup _mali_osk_time OSK Time functions ++ * ++ * \ref _mali_osk_time use the OS's representation of time, which are ++ * 'ticks'. This is to prevent aliasing problems between the internal timer ++ * time, and the time asked for. ++ * ++ * OS tick time is measured as a u32. The time stored in a u32 may either be ++ * an absolute time, or a time delta between two events. Whilst it is valid to ++ * use math opeartors to \em change the tick value represented as a u32, it ++ * is often only meaningful to do such operations on time deltas, rather than ++ * on absolute time. However, it is meaningful to add/subtract time deltas to ++ * absolute times. ++ * ++ * Conversion between tick time and milliseconds (ms) may not be loss-less, ++ * and are \em implementation \em depenedant. ++ * ++ * Code use OS time must take this into account, since: ++ * - a small OS time may (or may not) be rounded ++ * - a large time may (or may not) overflow ++ * ++ * @{ */ + -+ cores = shader_cores; -+ while (cores) { -+ int bitnum = fls64(cores) - 1; -+ u64 bit = 1ULL << bitnum; ++/** @brief Return whether ticka occurs after or at the same time as tickb ++ * ++ * Systems where ticks can wrap must handle that. ++ * ++ * @param ticka ticka ++ * @param tickb tickb ++ * @return MALI_TRUE if ticka represents a time that occurs at or after tickb. ++ */ ++mali_bool _mali_osk_time_after_eq(unsigned long ticka, unsigned long tickb); + -+ /* It should be almost impossible for this to overflow. It would -+ * require 2^32 atoms to request a particular core, which would -+ * require 2^24 contexts to submit. This would require an amount -+ * of memory that is impossible on a 32-bit system and extremely -+ * unlikely on a 64-bit system. */ -+ int cnt = ++kbdev->shader_needed_cnt[bitnum]; ++/** @brief Convert milliseconds to OS 'ticks' ++ * ++ * @param ms time interval in milliseconds ++ * @return the corresponding time interval in OS ticks. ++ */ ++unsigned long _mali_osk_time_mstoticks(u32 ms); + -+ if (1 == cnt) { -+ kbdev->shader_needed_bitmap |= bit; -+ change_gpu_state |= KBASE_PM_CHANGE_STATE_SHADER; -+ } ++/** @brief Convert OS 'ticks' to milliseconds ++ * ++ * @param ticks time interval in OS ticks. ++ * @return the corresponding time interval in milliseconds ++ */ ++u32 _mali_osk_time_tickstoms(unsigned long ticks); + -+ cores &= ~bit; -+ } + -+ if (tiler_required) { -+ int cnt = ++kbdev->tiler_needed_cnt; ++/** @brief Get the current time in OS 'ticks'. ++ * @return the current time in OS 'ticks'. ++ */ ++unsigned long _mali_osk_time_tickcount(void); + -+ if (1 == cnt) -+ change_gpu_state |= KBASE_PM_CHANGE_STATE_TILER; ++/** @brief Cause a microsecond delay ++ * ++ * The delay will have microsecond resolution, and is necessary for correct ++ * operation of the driver. At worst, the delay will be \b at least \a usecs ++ * microseconds, and so may be (significantly) more. ++ * ++ * This function may be implemented as a busy-wait, which is the most sensible ++ * implementation. On OSs where there are situations in which a thread must not ++ * sleep, this is definitely implemented as a busy-wait. ++ * ++ * @param usecs the number of microseconds to wait for. ++ */ ++void _mali_osk_time_ubusydelay(u32 usecs); + -+ KBASE_DEBUG_ASSERT(kbdev->tiler_needed_cnt != 0); -+ } ++/** @brief Return time in nano seconds, since any given reference. ++ * ++ * @return Time in nano seconds ++ */ ++u64 _mali_osk_time_get_ns(void); + -+ if (change_gpu_state) { -+ KBASE_TRACE_ADD(kbdev, PM_REQUEST_CHANGE_SHADER_NEEDED, NULL, -+ NULL, 0u, (u32) kbdev->shader_needed_bitmap); ++/** @brief Return time in nano seconds, since boot time. ++ * ++ * @return Time in nano seconds ++ */ ++u64 _mali_osk_boot_time_get_ns(void); + -+ kbase_timeline_pm_cores_func(kbdev, -+ KBASE_PM_FUNC_ID_REQUEST_CORES_START, -+ change_gpu_state); -+ kbase_pm_update_cores_state_nolock(kbdev); -+ kbase_timeline_pm_cores_func(kbdev, -+ KBASE_PM_FUNC_ID_REQUEST_CORES_END, -+ change_gpu_state); -+ } -+} ++/** @} */ /* end group _mali_osk_time */ + -+KBASE_EXPORT_TEST_API(kbase_pm_request_cores); ++/** @defgroup _mali_osk_math OSK Math ++ * @{ */ + -+void kbase_pm_unrequest_cores(struct kbase_device *kbdev, -+ bool tiler_required, u64 shader_cores) -+{ -+ kbase_pm_change_state change_gpu_state = 0u; ++/** @brief Count Leading Zeros (Little-endian) ++ * ++ * @note This function must be implemented to support the reference ++ * implementation of _mali_osk_find_first_zero_bit, as defined in ++ * mali_osk_bitops.h. ++ * ++ * @param val 32-bit words to count leading zeros on ++ * @return the number of leading zeros. ++ */ ++u32 _mali_osk_clz(u32 val); + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++/** @brief find last (most-significant) bit set ++ * ++ * @param val 32-bit words to count last bit set on ++ * @return last bit set. ++ */ ++u32 _mali_osk_fls(u32 val); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++/** @} */ /* end group _mali_osk_math */ + -+ while (shader_cores) { -+ int bitnum = fls64(shader_cores) - 1; -+ u64 bit = 1ULL << bitnum; -+ int cnt; ++/** @addtogroup _mali_osk_wait_queue OSK Wait Queue functionality ++ * @{ */ + -+ KBASE_DEBUG_ASSERT(kbdev->shader_needed_cnt[bitnum] > 0); ++/** @brief Initialize an empty Wait Queue */ ++_mali_osk_wait_queue_t *_mali_osk_wait_queue_init(void); + -+ cnt = --kbdev->shader_needed_cnt[bitnum]; ++/** @brief Sleep if condition is false ++ * ++ * @param queue the queue to use ++ * @param condition function pointer to a boolean function ++ * @param data data parameter for condition function ++ * ++ * Put thread to sleep if the given \a condition function returns false. When ++ * being asked to wake up again, the condition will be re-checked and the ++ * thread only woken up if the condition is now true. ++ */ ++void _mali_osk_wait_queue_wait_event(_mali_osk_wait_queue_t *queue, mali_bool(*condition)(void *), void *data); + -+ if (0 == cnt) { -+ kbdev->shader_needed_bitmap &= ~bit; ++/** @brief Sleep if condition is false ++ * ++ * @param queue the queue to use ++ * @param condition function pointer to a boolean function ++ * @param data data parameter for condition function ++ * @param timeout timeout in ms ++ * ++ * Put thread to sleep if the given \a condition function returns false. When ++ * being asked to wake up again, the condition will be re-checked and the ++ * thread only woken up if the condition is now true. Will return if time ++ * exceeds timeout. ++ */ ++void _mali_osk_wait_queue_wait_event_timeout(_mali_osk_wait_queue_t *queue, mali_bool(*condition)(void *), void *data, u32 timeout); + -+ change_gpu_state |= KBASE_PM_CHANGE_STATE_SHADER; -+ } ++/** @brief Wake up all threads in wait queue if their respective conditions are ++ * true ++ * ++ * @param queue the queue whose threads should be woken up ++ * ++ * Wake up all threads in wait queue \a queue whose condition is now true. ++ */ ++void _mali_osk_wait_queue_wake_up(_mali_osk_wait_queue_t *queue); + -+ shader_cores &= ~bit; -+ } ++/** @brief terminate a wait queue ++ * ++ * @param queue the queue to terminate. ++ */ ++void _mali_osk_wait_queue_term(_mali_osk_wait_queue_t *queue); ++/** @} */ /* end group _mali_osk_wait_queue */ + -+ if (tiler_required) { -+ int cnt; + -+ KBASE_DEBUG_ASSERT(kbdev->tiler_needed_cnt > 0); ++/** @addtogroup _mali_osk_miscellaneous ++ * @{ */ + -+ cnt = --kbdev->tiler_needed_cnt; ++/** @brief Output a device driver debug message. ++ * ++ * The interpretation of \a fmt is the same as the \c format parameter in ++ * _mali_osu_vsnprintf(). ++ * ++ * @param fmt a _mali_osu_vsnprintf() style format string ++ * @param ... a variable-number of parameters suitable for \a fmt ++ */ ++void _mali_osk_dbgmsg(const char *fmt, ...); + -+ if (0 == cnt) -+ change_gpu_state |= KBASE_PM_CHANGE_STATE_TILER; -+ } ++/** @brief Print fmt into buf. ++ * ++ * The interpretation of \a fmt is the same as the \c format parameter in ++ * _mali_osu_vsnprintf(). ++ * ++ * @param buf a pointer to the result buffer ++ * @param size the total number of bytes allowed to write to \a buf ++ * @param fmt a _mali_osu_vsnprintf() style format string ++ * @param ... a variable-number of parameters suitable for \a fmt ++ * @return The number of bytes written to \a buf ++ */ ++u32 _mali_osk_snprintf(char *buf, u32 size, const char *fmt, ...); + -+ if (change_gpu_state) { -+ KBASE_TRACE_ADD(kbdev, PM_UNREQUEST_CHANGE_SHADER_NEEDED, NULL, -+ NULL, 0u, (u32) kbdev->shader_needed_bitmap); ++/** @brief Abnormal process abort. ++ * ++ * Terminates the caller-process if this function is called. ++ * ++ * This function will be called from Debug assert-macros in mali_kernel_common.h. ++ * ++ * This function will never return - because to continue from a Debug assert ++ * could cause even more problems, and hinder debugging of the initial problem. ++ * ++ * This function is only used in Debug builds, and is not used in Release builds. ++ */ ++void _mali_osk_abort(void); + -+ kbase_pm_update_cores_state_nolock(kbdev); ++/** @brief Sets breakpoint at point where function is called. ++ * ++ * This function will be called from Debug assert-macros in mali_kernel_common.h, ++ * to assist in debugging. If debugging at this level is not required, then this ++ * function may be implemented as a stub. ++ * ++ * This function is only used in Debug builds, and is not used in Release builds. ++ */ ++void _mali_osk_break(void); + -+ /* Trace that any state change effectively completes immediately -+ * - no-one will wait on the state change */ -+ kbase_pm_trace_check_and_finish_state_change(kbdev); -+ } -+} ++/** @brief Return an identificator for calling process. ++ * ++ * @return Identificator for calling process. ++ */ ++u32 _mali_osk_get_pid(void); + -+KBASE_EXPORT_TEST_API(kbase_pm_unrequest_cores); ++/** @brief Return an name for calling process. ++ * ++ * @return name for calling process. ++ */ ++char *_mali_osk_get_comm(void); + -+enum kbase_pm_cores_ready -+kbase_pm_register_inuse_cores(struct kbase_device *kbdev, -+ bool tiler_required, u64 shader_cores) -+{ -+ u64 prev_shader_needed; /* Just for tracing */ -+ u64 prev_shader_inuse; /* Just for tracing */ ++/** @brief Return an identificator for calling thread. ++ * ++ * @return Identificator for calling thread. ++ */ ++u32 _mali_osk_get_tid(void); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ prev_shader_needed = kbdev->shader_needed_bitmap; -+ prev_shader_inuse = kbdev->shader_inuse_bitmap; ++/** @brief Take a reference to the power manager system for the Mali device (synchronously). ++ * ++ * When function returns successfully, Mali is ON. ++ * ++ * @note Call \a _mali_osk_pm_dev_ref_put() to release this reference. ++ */ ++_mali_osk_errcode_t _mali_osk_pm_dev_ref_get_sync(void); + -+ /* If desired_shader_state does not contain the requested cores, then -+ * power management is not attempting to powering those cores (most -+ * likely due to core availability policy) and a new job affinity must -+ * be chosen */ -+ if ((kbdev->pm.backend.desired_shader_state & shader_cores) != -+ shader_cores) { -+ return (kbdev->pm.backend.poweroff_wait_in_progress || -+ kbdev->pm.backend.pm_current_policy == NULL) ? -+ KBASE_CORES_NOT_READY : KBASE_NEW_AFFINITY; -+ } ++/** @brief Take a reference to the external power manager system for the Mali device (asynchronously). ++ * ++ * Mali might not yet be on after this function as returned. ++ * Please use \a _mali_osk_pm_dev_barrier() or \a _mali_osk_pm_dev_ref_get_sync() ++ * to wait for Mali to be powered on. ++ * ++ * @note Call \a _mali_osk_pm_dev_ref_dec() to release this reference. ++ */ ++_mali_osk_errcode_t _mali_osk_pm_dev_ref_get_async(void); + -+ if ((kbdev->shader_available_bitmap & shader_cores) != shader_cores || -+ (tiler_required && !kbdev->tiler_available_bitmap)) { -+ /* Trace ongoing core transition */ -+ kbase_timeline_pm_l2_transition_start(kbdev); -+ return KBASE_CORES_NOT_READY; -+ } ++/** @brief Release the reference to the external power manger system for the Mali device. ++ * ++ * When reference count reach zero, the cores can be off. ++ * ++ * @note This must be used to release references taken with ++ * \a _mali_osk_pm_dev_ref_get_sync() or \a _mali_osk_pm_dev_ref_get_sync(). ++ */ ++void _mali_osk_pm_dev_ref_put(void); + -+ /* If we started to trace a state change, then trace it has being -+ * finished by now, at the very latest */ -+ kbase_pm_trace_check_and_finish_state_change(kbdev); -+ /* Trace core transition done */ -+ kbase_timeline_pm_l2_transition_done(kbdev); ++/** @brief Block until pending PM operations are done ++ */ ++void _mali_osk_pm_dev_barrier(void); + -+ while (shader_cores) { -+ int bitnum = fls64(shader_cores) - 1; -+ u64 bit = 1ULL << bitnum; -+ int cnt; ++/** @} */ /* end group _mali_osk_miscellaneous */ + -+ KBASE_DEBUG_ASSERT(kbdev->shader_needed_cnt[bitnum] > 0); ++/** @defgroup _mali_osk_bitmap OSK Bitmap ++ * @{ */ + -+ cnt = --kbdev->shader_needed_cnt[bitnum]; ++/** @brief Allocate a unique number from the bitmap object. ++ * ++ * @param bitmap Initialized bitmap object. ++ * @return An unique existence in the bitmap object. ++ */ ++u32 _mali_osk_bitmap_alloc(struct _mali_osk_bitmap *bitmap); + -+ if (0 == cnt) -+ kbdev->shader_needed_bitmap &= ~bit; ++/** @brief Free a interger to the bitmap object. ++ * ++ * @param bitmap Initialized bitmap object. ++ * @param obj An number allocated from bitmap object. ++ */ ++void _mali_osk_bitmap_free(struct _mali_osk_bitmap *bitmap, u32 obj); + -+ /* shader_inuse_cnt should not overflow because there can only -+ * be a very limited number of jobs on the h/w at one time */ ++/** @brief Allocate continuous number from the bitmap object. ++ * ++ * @param bitmap Initialized bitmap object. ++ * @return start number of the continuous number block. ++ */ ++u32 _mali_osk_bitmap_alloc_range(struct _mali_osk_bitmap *bitmap, int cnt); + -+ kbdev->shader_inuse_cnt[bitnum]++; -+ kbdev->shader_inuse_bitmap |= bit; ++/** @brief Free a block of continuous number block to the bitmap object. ++ * ++ * @param bitmap Initialized bitmap object. ++ * @param obj Start number. ++ * @param cnt The size of the continuous number block. ++ */ ++void _mali_osk_bitmap_free_range(struct _mali_osk_bitmap *bitmap, u32 obj, int cnt); + -+ shader_cores &= ~bit; -+ } ++/** @brief Available count could be used to allocate in the given bitmap object. ++ * ++ */ ++u32 _mali_osk_bitmap_avail(struct _mali_osk_bitmap *bitmap); + -+ if (tiler_required) { -+ KBASE_DEBUG_ASSERT(kbdev->tiler_needed_cnt > 0); ++/** @brief Initialize an bitmap object.. ++ * ++ * @param bitmap An poiter of uninitialized bitmap object. ++ * @param num Size of thei bitmap object and decide the memory size allocated. ++ * @param reserve start number used to allocate. ++ */ ++int _mali_osk_bitmap_init(struct _mali_osk_bitmap *bitmap, u32 num, u32 reserve); + -+ --kbdev->tiler_needed_cnt; ++/** @brief Free the given bitmap object. ++ * ++ * @param bitmap Initialized bitmap object. ++ */ ++void _mali_osk_bitmap_term(struct _mali_osk_bitmap *bitmap); ++/** @} */ /* end group _mali_osk_bitmap */ + -+ kbdev->tiler_inuse_cnt++; ++/** @} */ /* end group osuapi */ + -+ KBASE_DEBUG_ASSERT(kbdev->tiler_inuse_cnt != 0); -+ } ++/** @} */ /* end group uddapi */ + -+ if (prev_shader_needed != kbdev->shader_needed_bitmap) -+ KBASE_TRACE_ADD(kbdev, PM_REGISTER_CHANGE_SHADER_NEEDED, NULL, -+ NULL, 0u, (u32) kbdev->shader_needed_bitmap); + -+ if (prev_shader_inuse != kbdev->shader_inuse_bitmap) -+ KBASE_TRACE_ADD(kbdev, PM_REGISTER_CHANGE_SHADER_INUSE, NULL, -+ NULL, 0u, (u32) kbdev->shader_inuse_bitmap); + -+ return KBASE_CORES_READY; ++#ifdef __cplusplus +} ++#endif + -+KBASE_EXPORT_TEST_API(kbase_pm_register_inuse_cores); ++/* Check standard inlines */ ++#ifndef MALI_STATIC_INLINE ++#error MALI_STATIC_INLINE not defined on your OS ++#endif + -+void kbase_pm_release_cores(struct kbase_device *kbdev, -+ bool tiler_required, u64 shader_cores) -+{ -+ kbase_pm_change_state change_gpu_state = 0u; ++#ifndef MALI_NON_STATIC_INLINE ++#error MALI_NON_STATIC_INLINE not defined on your OS ++#endif + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++#endif /* __MALI_OSK_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h +new file mode 100755 +index 000000000..bb1831753 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h +@@ -0,0 +1,162 @@ ++/* ++ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++/** ++ * @file mali_osk_bitops.h ++ * Implementation of the OS abstraction layer for the kernel device driver ++ */ + -+ while (shader_cores) { -+ int bitnum = fls64(shader_cores) - 1; -+ u64 bit = 1ULL << bitnum; -+ int cnt; ++#ifndef __MALI_OSK_BITOPS_H__ ++#define __MALI_OSK_BITOPS_H__ + -+ KBASE_DEBUG_ASSERT(kbdev->shader_inuse_cnt[bitnum] > 0); ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ cnt = --kbdev->shader_inuse_cnt[bitnum]; ++MALI_STATIC_INLINE void _mali_internal_clear_bit(u32 bit, u32 *addr) ++{ ++ MALI_DEBUG_ASSERT(bit < 32); ++ MALI_DEBUG_ASSERT(NULL != addr); + -+ if (0 == cnt) { -+ kbdev->shader_inuse_bitmap &= ~bit; -+ change_gpu_state |= KBASE_PM_CHANGE_STATE_SHADER; -+ } ++ (*addr) &= ~(1 << bit); ++} + -+ shader_cores &= ~bit; -+ } ++MALI_STATIC_INLINE void _mali_internal_set_bit(u32 bit, u32 *addr) ++{ ++ MALI_DEBUG_ASSERT(bit < 32); ++ MALI_DEBUG_ASSERT(NULL != addr); + -+ if (tiler_required) { -+ int cnt; ++ (*addr) |= (1 << bit); ++} + -+ KBASE_DEBUG_ASSERT(kbdev->tiler_inuse_cnt > 0); ++MALI_STATIC_INLINE u32 _mali_internal_test_bit(u32 bit, u32 value) ++{ ++ MALI_DEBUG_ASSERT(bit < 32); ++ return value & (1 << bit); ++} + -+ cnt = --kbdev->tiler_inuse_cnt; ++MALI_STATIC_INLINE int _mali_internal_find_first_zero_bit(u32 value) ++{ ++ u32 inverted; ++ u32 negated; ++ u32 isolated; ++ u32 leading_zeros; + -+ if (0 == cnt) -+ change_gpu_state |= KBASE_PM_CHANGE_STATE_TILER; -+ } ++ /* Begin with xxx...x0yyy...y, where ys are 1, number of ys is in range 0..31 */ ++ inverted = ~value; /* zzz...z1000...0 */ ++ /* Using count_trailing_zeros on inverted value - ++ * See ARM System Developers Guide for details of count_trailing_zeros */ + -+ if (change_gpu_state) { -+ KBASE_TRACE_ADD(kbdev, PM_RELEASE_CHANGE_SHADER_INUSE, NULL, -+ NULL, 0u, (u32) kbdev->shader_inuse_bitmap); ++ /* Isolate the zero: it is preceeded by a run of 1s, so add 1 to it */ ++ negated = (u32) - inverted ; /* -a == ~a + 1 (mod 2^n) for n-bit numbers */ ++ /* negated = xxx...x1000...0 */ + -+ kbase_timeline_pm_cores_func(kbdev, -+ KBASE_PM_FUNC_ID_RELEASE_CORES_START, -+ change_gpu_state); -+ kbase_pm_update_cores_state_nolock(kbdev); -+ kbase_timeline_pm_cores_func(kbdev, -+ KBASE_PM_FUNC_ID_RELEASE_CORES_END, -+ change_gpu_state); ++ isolated = negated & inverted ; /* xxx...x1000...0 & zzz...z1000...0, zs are ~xs */ ++ /* And so the first zero bit is in the same position as the 1 == number of 1s that preceeded it ++ * Note that the output is zero if value was all 1s */ + -+ /* Trace that any state change completed immediately */ -+ kbase_pm_trace_check_and_finish_state_change(kbdev); -+ } ++ leading_zeros = _mali_osk_clz(isolated); ++ ++ return 31 - leading_zeros; +} + -+KBASE_EXPORT_TEST_API(kbase_pm_release_cores); + -+void kbase_pm_request_cores_sync(struct kbase_device *kbdev, -+ bool tiler_required, -+ u64 shader_cores) -+{ -+ unsigned long flags; ++/** @defgroup _mali_osk_bitops OSK Non-atomic Bit-operations ++ * @{ */ + -+ kbase_pm_wait_for_poweroff_complete(kbdev); ++/** ++ * These bit-operations do not work atomically, and so locks must be used if ++ * atomicity is required. ++ * ++ * Reference implementations for Little Endian are provided, and so it should ++ * not normally be necessary to re-implement these. Efficient bit-twiddling ++ * techniques are used where possible, implemented in portable C. ++ * ++ * Note that these reference implementations rely on _mali_osk_clz() being ++ * implemented. ++ */ + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_pm_request_cores(kbdev, tiler_required, shader_cores); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++/** @brief Clear a bit in a sequence of 32-bit words ++ * @param nr bit number to clear, starting from the (Little-endian) least ++ * significant bit ++ * @param addr starting point for counting. ++ */ ++MALI_STATIC_INLINE void _mali_osk_clear_nonatomic_bit(u32 nr, u32 *addr) ++{ ++ addr += nr >> 5; /* find the correct word */ ++ nr = nr & ((1 << 5) - 1); /* The bit number within the word */ + -+ kbase_pm_check_transitions_sync(kbdev); ++ _mali_internal_clear_bit(nr, addr); +} + -+KBASE_EXPORT_TEST_API(kbase_pm_request_cores_sync); -+ -+void kbase_pm_request_l2_caches(struct kbase_device *kbdev) ++/** @brief Set a bit in a sequence of 32-bit words ++ * @param nr bit number to set, starting from the (Little-endian) least ++ * significant bit ++ * @param addr starting point for counting. ++ */ ++MALI_STATIC_INLINE void _mali_osk_set_nonatomic_bit(u32 nr, u32 *addr) +{ -+ unsigned long flags; -+ u32 prior_l2_users_count; -+ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ -+ prior_l2_users_count = kbdev->l2_users_count++; -+ -+ KBASE_DEBUG_ASSERT(kbdev->l2_users_count != 0); -+ -+ /* if the GPU is reset while the l2 is on, l2 will be off but -+ * prior_l2_users_count will be > 0. l2_available_bitmap will have been -+ * set to 0 though by kbase_pm_init_hw */ -+ if (!prior_l2_users_count || !kbdev->l2_available_bitmap) -+ kbase_pm_check_transitions_nolock(kbdev); -+ -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ wait_event(kbdev->pm.backend.l2_powered_wait, -+ kbdev->pm.backend.l2_powered == 1); ++ addr += nr >> 5; /* find the correct word */ ++ nr = nr & ((1 << 5) - 1); /* The bit number within the word */ + -+ /* Trace that any state change completed immediately */ -+ kbase_pm_trace_check_and_finish_state_change(kbdev); ++ _mali_internal_set_bit(nr, addr); +} + -+KBASE_EXPORT_TEST_API(kbase_pm_request_l2_caches); -+ -+void kbase_pm_request_l2_caches_l2_is_on(struct kbase_device *kbdev) ++/** @brief Test a bit in a sequence of 32-bit words ++ * @param nr bit number to test, starting from the (Little-endian) least ++ * significant bit ++ * @param addr starting point for counting. ++ * @return zero if bit was clear, non-zero if set. Do not rely on the return ++ * value being related to the actual word under test. ++ */ ++MALI_STATIC_INLINE u32 _mali_osk_test_bit(u32 nr, u32 *addr) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ addr += nr >> 5; /* find the correct word */ ++ nr = nr & ((1 << 5) - 1); /* The bit number within the word */ + -+ kbdev->l2_users_count++; ++ return _mali_internal_test_bit(nr, *addr); +} + -+KBASE_EXPORT_TEST_API(kbase_pm_request_l2_caches_l2_is_on); -+ -+void kbase_pm_release_l2_caches(struct kbase_device *kbdev) ++/* Return maxbit if not found */ ++/** @brief Find the first zero bit in a sequence of 32-bit words ++ * @param addr starting point for search. ++ * @param maxbit the maximum number of bits to search ++ * @return the number of the first zero bit found, or maxbit if none were found ++ * in the specified range. ++ */ ++MALI_STATIC_INLINE u32 _mali_osk_find_first_zero_bit(const u32 *addr, u32 maxbit) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ u32 total; + -+ KBASE_DEBUG_ASSERT(kbdev->l2_users_count > 0); ++ for (total = 0; total < maxbit; total += 32, ++addr) { ++ int result; ++ result = _mali_internal_find_first_zero_bit(*addr); + -+ --kbdev->l2_users_count; ++ /* non-negative signifies the bit was found */ ++ if (result >= 0) { ++ total += (u32)result; ++ break; ++ } ++ } + -+ if (!kbdev->l2_users_count) { -+ kbase_pm_check_transitions_nolock(kbdev); -+ /* Trace that any state change completed immediately */ -+ kbase_pm_trace_check_and_finish_state_change(kbdev); ++ /* Now check if we reached maxbit or above */ ++ if (total >= maxbit) { ++ total = maxbit; + } ++ ++ return total; /* either the found bit nr, or maxbit if not found */ ++} ++/** @} */ /* end group _mali_osk_bitops */ ++ ++#ifdef __cplusplus +} ++#endif + -+KBASE_EXPORT_TEST_API(kbase_pm_release_l2_caches); -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_policy.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_policy.h ++#endif /* __MALI_OSK_BITOPS_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h new file mode 100755 -index 000000000000..611a90e66e65 +index 000000000..9af2d7d4d --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_policy.h -@@ -0,0 +1,227 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h +@@ -0,0 +1,273 @@ +/* -+ * -+ * (C) COPYRIGHT 2010-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++/** ++ * @file mali_osk_list.h ++ * Implementation of the OS abstraction layer for the kernel device driver ++ */ + ++#ifndef __MALI_OSK_LIST_H__ ++#define __MALI_OSK_LIST_H__ + -+/* -+ * Power policy API definitions -+ */ ++#include "mali_osk.h" ++#include "mali_kernel_common.h" + -+#ifndef _KBASE_PM_POLICY_H_ -+#define _KBASE_PM_POLICY_H_ ++#ifdef __cplusplus ++extern "C" { ++#endif + -+/** -+ * kbase_pm_policy_init - Initialize power policy framework -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * Must be called before calling any other policy function -+ * -+ * Return: 0 if the power policy framework was successfully -+ * initialized, -errno otherwise. -+ */ -+int kbase_pm_policy_init(struct kbase_device *kbdev); ++MALI_STATIC_INLINE void __mali_osk_list_add(_mali_osk_list_t *new_entry, _mali_osk_list_t *prev, _mali_osk_list_t *next) ++{ ++ next->prev = new_entry; ++ new_entry->next = next; ++ new_entry->prev = prev; ++ prev->next = new_entry; ++} + -+/** -+ * kbase_pm_policy_term - Terminate power policy framework -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_policy_term(struct kbase_device *kbdev); ++MALI_STATIC_INLINE void __mali_osk_list_del(_mali_osk_list_t *prev, _mali_osk_list_t *next) ++{ ++ next->prev = prev; ++ prev->next = next; ++} + -+/** -+ * kbase_pm_update_active - Update the active power state of the GPU -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * Calls into the current power policy -+ */ -+void kbase_pm_update_active(struct kbase_device *kbdev); ++/** @addtogroup _mali_osk_list OSK Doubly-Linked Circular Lists ++ * @{ */ + -+/** -+ * kbase_pm_update_cores - Update the desired core state of the GPU -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++/** Reference implementations of Doubly-linked Circular Lists are provided. ++ * There is often no need to re-implement these. + * -+ * Calls into the current power policy -+ */ -+void kbase_pm_update_cores(struct kbase_device *kbdev); ++ * @note The implementation may differ subtly from any lists the OS provides. ++ * For this reason, these lists should not be mixed with OS-specific lists ++ * inside the OSK/UKK implementation. */ + ++/** @brief Initialize a list to be a head of an empty list ++ * @param exp the list to initialize. */ ++#define _MALI_OSK_INIT_LIST_HEAD(exp) _mali_osk_list_init(exp) + -+enum kbase_pm_cores_ready { -+ KBASE_CORES_NOT_READY = 0, -+ KBASE_NEW_AFFINITY = 1, -+ KBASE_CORES_READY = 2 -+}; ++/** @brief Define a list variable, which is uninitialized. ++ * @param exp the name of the variable that the list will be defined as. */ ++#define _MALI_OSK_LIST_HEAD(exp) _mali_osk_list_t exp + ++/** @brief Define a list variable, which is initialized. ++ * @param exp the name of the variable that the list will be defined as. */ ++#define _MALI_OSK_LIST_HEAD_STATIC_INIT(exp) _mali_osk_list_t exp = { &exp, &exp } + -+/** -+ * kbase_pm_request_cores_sync - Synchronous variant of kbase_pm_request_cores() ++/** @brief Initialize a list element. + * -+ * @kbdev: The kbase device structure for the device -+ * @tiler_required: true if the tiler is required, false otherwise -+ * @shader_cores: A bitmask of shader cores which are necessary for the job ++ * All list elements must be initialized before use. + * -+ * When this function returns, the @shader_cores will be in the READY state. ++ * Do not use on any list element that is present in a list without using ++ * _mali_osk_list_del first, otherwise this will break the list. + * -+ * This is safe variant of kbase_pm_check_transitions_sync(): it handles the -+ * work of ensuring the requested cores will remain powered until a matching -+ * call to kbase_pm_unrequest_cores()/kbase_pm_release_cores() (as appropriate) -+ * is made. ++ * @param list the list element to initialize + */ -+void kbase_pm_request_cores_sync(struct kbase_device *kbdev, -+ bool tiler_required, u64 shader_cores); ++MALI_STATIC_INLINE void _mali_osk_list_init(_mali_osk_list_t *list) ++{ ++ list->next = list; ++ list->prev = list; ++} + -+/** -+ * kbase_pm_request_cores - Mark one or more cores as being required -+ * for jobs to be submitted -+ * -+ * @kbdev: The kbase device structure for the device -+ * @tiler_required: true if the tiler is required, false otherwise -+ * @shader_cores: A bitmask of shader cores which are necessary for the job ++/** @brief Insert a single list element after an entry in a list + * -+ * This function is called by the job scheduler to mark one or more cores as -+ * being required to submit jobs that are ready to run. ++ * As an example, if this is inserted to the head of a list, then this becomes ++ * the first element of the list. + * -+ * The cores requested are reference counted and a subsequent call to -+ * kbase_pm_register_inuse_cores() or kbase_pm_unrequest_cores() should be -+ * made to dereference the cores as being 'needed'. ++ * Do not use to move list elements from one list to another, as it will break ++ * the originating list. + * -+ * The active power policy will meet or exceed the requirements of the -+ * requested cores in the system. Any core transitions needed will be begun -+ * immediately, but they might not complete/the cores might not be available -+ * until a Power Management IRQ. + * -+ * Return: 0 if the cores were successfully requested, or -errno otherwise. ++ * @param newlist the list element to insert ++ * @param list the list in which to insert. The new element will be the next ++ * entry in this list + */ -+void kbase_pm_request_cores(struct kbase_device *kbdev, -+ bool tiler_required, u64 shader_cores); ++MALI_STATIC_INLINE void _mali_osk_list_add(_mali_osk_list_t *new_entry, _mali_osk_list_t *list) ++{ ++ __mali_osk_list_add(new_entry, list, list->next); ++} + -+/** -+ * kbase_pm_unrequest_cores - Unmark one or more cores as being required for -+ * jobs to be submitted. -+ * -+ * @kbdev: The kbase device structure for the device -+ * @tiler_required: true if the tiler is required, false otherwise -+ * @shader_cores: A bitmask of shader cores (as given to -+ * kbase_pm_request_cores() ) ++/** @brief Insert a single list element before an entry in a list + * -+ * This function undoes the effect of kbase_pm_request_cores(). It should be -+ * used when a job is not going to be submitted to the hardware (e.g. the job is -+ * cancelled before it is enqueued). ++ * As an example, if this is inserted to the head of a list, then this becomes ++ * the last element of the list. + * -+ * The active power policy will meet or exceed the requirements of the -+ * requested cores in the system. Any core transitions needed will be begun -+ * immediately, but they might not complete until a Power Management IRQ. ++ * Do not use to move list elements from one list to another, as it will break ++ * the originating list. + * -+ * The policy may use this as an indication that it can power down cores. ++ * @param newlist the list element to insert ++ * @param list the list in which to insert. The new element will be the previous ++ * entry in this list + */ -+void kbase_pm_unrequest_cores(struct kbase_device *kbdev, -+ bool tiler_required, u64 shader_cores); ++MALI_STATIC_INLINE void _mali_osk_list_addtail(_mali_osk_list_t *new_entry, _mali_osk_list_t *list) ++{ ++ __mali_osk_list_add(new_entry, list->prev, list); ++} + -+/** -+ * kbase_pm_register_inuse_cores - Register a set of cores as in use by a job -+ * -+ * @kbdev: The kbase device structure for the device -+ * @tiler_required: true if the tiler is required, false otherwise -+ * @shader_cores: A bitmask of shader cores (as given to -+ * kbase_pm_request_cores() ) -+ * -+ * This function should be called after kbase_pm_request_cores() when the job -+ * is about to be submitted to the hardware. It will check that the necessary -+ * cores are available and if so update the 'needed' and 'inuse' bitmasks to -+ * reflect that the job is now committed to being run. ++/** @brief Remove a single element from a list + * -+ * If the necessary cores are not currently available then the function will -+ * return %KBASE_CORES_NOT_READY and have no effect. ++ * The element will no longer be present in the list. The removed list element ++ * will be uninitialized, and so should not be traversed. It must be ++ * initialized before further use. + * -+ * Return: %KBASE_CORES_NOT_READY if the cores are not immediately ready, ++ * @param list the list element to remove. ++ */ ++MALI_STATIC_INLINE void _mali_osk_list_del(_mali_osk_list_t *list) ++{ ++ __mali_osk_list_del(list->prev, list->next); ++} ++ ++/** @brief Remove a single element from a list, and re-initialize it + * -+ * %KBASE_NEW_AFFINITY if the affinity requested is not allowed, ++ * The element will no longer be present in the list. The removed list element ++ * will initialized, and so can be used as normal. + * -+ * %KBASE_CORES_READY if the cores requested are already available ++ * @param list the list element to remove and initialize. + */ -+enum kbase_pm_cores_ready kbase_pm_register_inuse_cores( -+ struct kbase_device *kbdev, -+ bool tiler_required, -+ u64 shader_cores); ++MALI_STATIC_INLINE void _mali_osk_list_delinit(_mali_osk_list_t *list) ++{ ++ __mali_osk_list_del(list->prev, list->next); ++ _mali_osk_list_init(list); ++} + -+/** -+ * kbase_pm_release_cores - Release cores after a job has run ++/** @brief Determine whether a list is empty. + * -+ * @kbdev: The kbase device structure for the device -+ * @tiler_required: true if the tiler is required, false otherwise -+ * @shader_cores: A bitmask of shader cores (as given to -+ * kbase_pm_register_inuse_cores() ) ++ * An empty list is one that contains a single element that points to itself. + * -+ * This function should be called when a job has finished running on the -+ * hardware. A call to kbase_pm_register_inuse_cores() must have previously -+ * occurred. The reference counts of the specified cores will be decremented -+ * which may cause the bitmask of 'inuse' cores to be reduced. The power policy -+ * may then turn off any cores which are no longer 'inuse'. ++ * @param list the list to check. ++ * @return non-zero if the list is empty, and zero otherwise. + */ -+void kbase_pm_release_cores(struct kbase_device *kbdev, -+ bool tiler_required, u64 shader_cores); ++MALI_STATIC_INLINE mali_bool _mali_osk_list_empty(_mali_osk_list_t *list) ++{ ++ return list->next == list; ++} + -+/** -+ * kbase_pm_request_l2_caches - Request l2 caches ++/** @brief Move a list element from one list to another. + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * The list element must be initialized. + * -+ * Request the use of l2 caches for all core groups, power up, wait and prevent -+ * the power manager from powering down the l2 caches. ++ * As an example, moving a list item to the head of a new list causes this item ++ * to be the first element in the new list. + * -+ * This tells the power management that the caches should be powered up, and -+ * they should remain powered, irrespective of the usage of shader cores. This -+ * does not return until the l2 caches are powered up. ++ * @param move the list element to move ++ * @param list the new list into which the element will be inserted, as the next ++ * element in the list. ++ */ ++MALI_STATIC_INLINE void _mali_osk_list_move(_mali_osk_list_t *move_entry, _mali_osk_list_t *list) ++{ ++ __mali_osk_list_del(move_entry->prev, move_entry->next); ++ _mali_osk_list_add(move_entry, list); ++} ++ ++/** @brief Move an entire list + * -+ * The caller must call kbase_pm_release_l2_caches() when they are finished -+ * to allow normal power management of the l2 caches to resume. ++ * The list element must be initialized. + * -+ * This should only be used when power management is active. ++ * Allows you to move a list from one list head to another list head ++ * ++ * @param old_list The existing list head ++ * @param new_list The new list head (must be an empty list) + */ -+void kbase_pm_request_l2_caches(struct kbase_device *kbdev); ++MALI_STATIC_INLINE void _mali_osk_list_move_list(_mali_osk_list_t *old_list, _mali_osk_list_t *new_list) ++{ ++ MALI_DEBUG_ASSERT(_mali_osk_list_empty(new_list)); ++ if (!_mali_osk_list_empty(old_list)) { ++ new_list->next = old_list->next; ++ new_list->prev = old_list->prev; ++ new_list->next->prev = new_list; ++ new_list->prev->next = new_list; ++ old_list->next = old_list; ++ old_list->prev = old_list; ++ } ++} + -+/** -+ * kbase_pm_request_l2_caches_l2_is_on - Request l2 caches but don't power on ++/** @brief Find the containing structure of a list + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * When traversing a list, this is used to recover the containing structure, ++ * given that is contains a _mali_osk_list_t member. + * -+ * Increment the count of l2 users but do not attempt to power on the l2 ++ * Each list must be of structures of one type, and must link the same members ++ * together, otherwise it will not be possible to correctly recover the ++ * sturctures that the lists link. + * -+ * It is the callers responsibility to ensure that the l2 is already powered up -+ * and to eventually call kbase_pm_release_l2_caches() ++ * @note no type or memory checking occurs to ensure that a structure does in ++ * fact exist for the list entry, and that it is being recovered with respect ++ * to the correct list member. ++ * ++ * @param ptr the pointer to the _mali_osk_list_t member in this structure ++ * @param type the type of the structure that contains the member ++ * @param member the member of the structure that ptr points to. ++ * @return a pointer to a \a type object which contains the _mali_osk_list_t ++ * \a member, as pointed to by the _mali_osk_list_t \a *ptr. + */ -+void kbase_pm_request_l2_caches_l2_is_on(struct kbase_device *kbdev); ++#define _MALI_OSK_LIST_ENTRY(ptr, type, member) \ ++ _MALI_OSK_CONTAINER_OF(ptr, type, member) + -+/** -+ * kbase_pm_request_l2_caches - Release l2 caches ++/** @brief Enumerate a list safely + * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * With this macro, lists can be enumerated in a 'safe' manner. That is, ++ * entries can be deleted from the list without causing an error during ++ * enumeration. To achieve this, a 'temporary' pointer is required, which must ++ * be provided to the macro. + * -+ * Release the use of l2 caches for all core groups and allow the power manager -+ * to power them down when necessary. ++ * Use it like a 'for()', 'while()' or 'do()' construct, and so it must be ++ * followed by a statement or compound-statement which will be executed for ++ * each list entry. + * -+ * This tells the power management that the caches can be powered down if -+ * necessary, with respect to the usage of shader cores. ++ * Upon loop completion, providing that an early out was not taken in the ++ * loop body, then it is guaranteed that ptr->member == list, even if the loop ++ * body never executed. + * -+ * The caller must have called kbase_pm_request_l2_caches() prior to a call -+ * to this. ++ * @param ptr a pointer to an object of type 'type', which points to the ++ * structure that contains the currently enumerated list entry. ++ * @param tmp a pointer to an object of type 'type', which must not be used ++ * inside the list-execution statement. ++ * @param list a pointer to a _mali_osk_list_t, from which enumeration will ++ * begin ++ * @param type the type of the structure that contains the _mali_osk_list_t ++ * member that is part of the list to be enumerated. ++ * @param member the _mali_osk_list_t member of the structure that is part of ++ * the list to be enumerated. ++ */ ++#define _MALI_OSK_LIST_FOREACHENTRY(ptr, tmp, list, type, member) \ ++ for (ptr = _MALI_OSK_LIST_ENTRY((list)->next, type, member), \ ++ tmp = _MALI_OSK_LIST_ENTRY(ptr->member.next, type, member); \ ++ &ptr->member != (list); \ ++ ptr = tmp, \ ++ tmp = _MALI_OSK_LIST_ENTRY(tmp->member.next, type, member)) ++ ++/** @brief Enumerate a list in reverse order safely + * -+ * This should only be used when power management is active. ++ * This macro is identical to @ref _MALI_OSK_LIST_FOREACHENTRY, except that ++ * entries are enumerated in reverse order. ++ * ++ * @param ptr a pointer to an object of type 'type', which points to the ++ * structure that contains the currently enumerated list entry. ++ * @param tmp a pointer to an object of type 'type', which must not be used ++ * inside the list-execution statement. ++ * @param list a pointer to a _mali_osk_list_t, from which enumeration will ++ * begin ++ * @param type the type of the structure that contains the _mali_osk_list_t ++ * member that is part of the list to be enumerated. ++ * @param member the _mali_osk_list_t member of the structure that is part of ++ * the list to be enumerated. + */ -+void kbase_pm_release_l2_caches(struct kbase_device *kbdev); ++#define _MALI_OSK_LIST_FOREACHENTRY_REVERSE(ptr, tmp, list, type, member) \ ++ for (ptr = _MALI_OSK_LIST_ENTRY((list)->prev, type, member), \ ++ tmp = _MALI_OSK_LIST_ENTRY(ptr->member.prev, type, member); \ ++ &ptr->member != (list); \ ++ ptr = tmp, \ ++ tmp = _MALI_OSK_LIST_ENTRY(tmp->member.prev, type, member)) + -+#endif /* _KBASE_PM_POLICY_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_time.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_time.c ++/** @} */ /* end group _mali_osk_list */ ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* __MALI_OSK_LIST_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h new file mode 100755 -index 000000000000..0068e1091f4c +index 000000000..a4c1618e9 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_time.c -@@ -0,0 +1,103 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h +@@ -0,0 +1,155 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++/** ++ * @file mali_osk_mali.h ++ * Defines the OS abstraction layer which is specific for the Mali kernel device driver (OSK) ++ */ + ++#ifndef __MALI_OSK_MALI_H__ ++#define __MALI_OSK_MALI_H__ + -+#include -+#include -+#include -+#include ++#include ++#include + -+void kbase_backend_get_gpu_time(struct kbase_device *kbdev, u64 *cycle_counter, -+ u64 *system_time, struct timespec *ts) -+{ -+ u32 hi1, hi2; ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ kbase_pm_request_gpu_cycle_counter(kbdev); ++#ifdef CONFIG_MALI_DEVFREQ ++struct mali_device { ++ struct device *dev; ++#ifdef CONFIG_HAVE_CLK ++ struct clk *clock; ++ struct clk_bulk_data *clks; ++ int num_clks; ++#endif ++#ifdef CONFIG_REGULATOR ++ struct regulator *regulator; ++ struct opp_table *opp_table; ++#endif ++#ifdef CONFIG_PM_DEVFREQ ++ struct devfreq_dev_profile devfreq_profile; ++ struct devfreq *devfreq; ++ unsigned long current_freq; ++ unsigned long current_voltage; ++ struct monitor_dev_info *mdev_info; ++#ifdef CONFIG_DEVFREQ_THERMAL ++ struct thermal_cooling_device *devfreq_cooling; ++#endif ++#endif ++ struct mali_pm_metrics_data mali_metrics; ++}; ++#endif + -+ /* Read hi, lo, hi to ensure that overflow from lo to hi is handled -+ * correctly */ -+ do { -+ hi1 = kbase_reg_read(kbdev, GPU_CONTROL_REG(CYCLE_COUNT_HI), -+ NULL); -+ *cycle_counter = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(CYCLE_COUNT_LO), NULL); -+ hi2 = kbase_reg_read(kbdev, GPU_CONTROL_REG(CYCLE_COUNT_HI), -+ NULL); -+ *cycle_counter |= (((u64) hi1) << 32); -+ } while (hi1 != hi2); ++/** @addtogroup _mali_osk_miscellaneous ++ * @{ */ + -+ /* Read hi, lo, hi to ensure that overflow from lo to hi is handled -+ * correctly */ -+ do { -+ hi1 = kbase_reg_read(kbdev, GPU_CONTROL_REG(TIMESTAMP_HI), -+ NULL); -+ *system_time = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(TIMESTAMP_LO), NULL); -+ hi2 = kbase_reg_read(kbdev, GPU_CONTROL_REG(TIMESTAMP_HI), -+ NULL); -+ *system_time |= (((u64) hi1) << 32); -+ } while (hi1 != hi2); ++/** @brief Struct with device specific configuration data ++ */ ++typedef struct mali_gpu_device_data _mali_osk_device_data; + -+ /* Record the CPU's idea of current time */ -+ getrawmonotonic(ts); ++#ifdef CONFIG_MALI_DT ++/** @brief Initialize those device resources when we use device tree ++ * ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ */ ++_mali_osk_errcode_t _mali_osk_resource_initialize(void); ++#endif + -+ kbase_pm_release_gpu_cycle_counter(kbdev); -+} ++/** @brief Find Mali GPU HW resource ++ * ++ * @param addr Address of Mali GPU resource to find ++ * @param res Storage for resource information if resource is found. ++ * @return _MALI_OSK_ERR_OK on success, _MALI_OSK_ERR_ITEM_NOT_FOUND if resource is not found ++ */ ++_mali_osk_errcode_t _mali_osk_resource_find(u32 addr, _mali_osk_resource_t *res); + -+/** -+ * kbase_wait_write_flush - Wait for GPU write flush -+ * @kctx: Context pointer ++ ++/** @brief Find Mali GPU HW base address + * -+ * Wait 1000 GPU clock cycles. This delay is known to give the GPU time to flush -+ * its write buffer. ++ * @return 0 if resources are found, otherwise the Mali GPU component with lowest address. ++ */ ++uintptr_t _mali_osk_resource_base_address(void); ++ ++/** @brief Find the specific GPU resource. + * -+ * Only in use for BASE_HW_ISSUE_6367 ++ * @return value ++ * 0x400 if Mali 400 specific GPU resource identified ++ * 0x450 if Mali 450 specific GPU resource identified ++ * 0x470 if Mali 470 specific GPU resource identified + * -+ * Note : If GPU resets occur then the counters are reset to zero, the delay may -+ * not be as expected. + */ -+#ifndef CONFIG_MALI_BIFROST_NO_MALI -+void kbase_wait_write_flush(struct kbase_context *kctx) -+{ -+ u32 base_count = 0; -+ -+ /* -+ * The caller must be holding onto the kctx or the call is from -+ * userspace. -+ */ -+ kbase_pm_context_active(kctx->kbdev); -+ kbase_pm_request_gpu_cycle_counter(kctx->kbdev); ++u32 _mali_osk_identify_gpu_resource(void); + -+ while (true) { -+ u32 new_count; ++/** @brief Retrieve the Mali GPU specific data ++ * ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ */ ++_mali_osk_errcode_t _mali_osk_device_data_get(_mali_osk_device_data *data); + -+ new_count = kbase_reg_read(kctx->kbdev, -+ GPU_CONTROL_REG(CYCLE_COUNT_LO), NULL); -+ /* First time around, just store the count. */ -+ if (base_count == 0) { -+ base_count = new_count; -+ continue; -+ } ++/** @brief Find the pmu domain config from device data. ++ * ++ * @param domain_config_array used to store pmu domain config found in device data. ++ * @param array_size is the size of array domain_config_array. ++ */ ++void _mali_osk_device_data_pmu_config_get(u16 *domain_config_array, int array_size); + -+ /* No need to handle wrapping, unsigned maths works for this. */ -+ if ((new_count - base_count) > 1000) -+ break; -+ } ++/** @brief Get Mali PMU switch delay ++ * ++ *@return pmu switch delay if it is configured ++ */ ++u32 _mali_osk_get_pmu_switch_delay(void); + -+ kbase_pm_release_gpu_cycle_counter(kctx->kbdev); -+ kbase_pm_context_idle(kctx->kbdev); ++/** @brief Determines if Mali GPU has been configured with shared interrupts. ++ * ++ * @return MALI_TRUE if shared interrupts, MALI_FALSE if not. ++ */ ++mali_bool _mali_osk_shared_interrupts(void); ++ ++/** @brief Initialize the gpu secure mode. ++ * The gpu secure mode will initially be in a disabled state. ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ */ ++_mali_osk_errcode_t _mali_osk_gpu_secure_mode_init(void); ++ ++/** @brief Deinitialize the gpu secure mode. ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ */ ++_mali_osk_errcode_t _mali_osk_gpu_secure_mode_deinit(void); ++ ++/** @brief Reset GPU and enable the gpu secure mode. ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ */ ++_mali_osk_errcode_t _mali_osk_gpu_reset_and_secure_mode_enable(void); ++ ++/** @brief Reset GPU and disable the gpu secure mode. ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ */ ++_mali_osk_errcode_t _mali_osk_gpu_reset_and_secure_mode_disable(void); ++ ++/** @brief Check if the gpu secure mode has been enabled. ++ * @return MALI_TRUE if enabled, otherwise MALI_FALSE. ++ */ ++mali_bool _mali_osk_gpu_secure_mode_is_enabled(void); ++ ++/** @brief Check if the gpu secure mode is supported. ++ * @return MALI_TRUE if supported, otherwise MALI_FALSE. ++ */ ++mali_bool _mali_osk_gpu_secure_mode_is_supported(void); ++ ++ ++/** @} */ /* end group _mali_osk_miscellaneous */ ++ ++#ifdef __cplusplus +} -+#endif /* CONFIG_MALI_BIFROST_NO_MALI */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_time.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_time.h ++#endif ++ ++#endif /* __MALI_OSK_MALI_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h new file mode 100755 -index 000000000000..0559b2f7097d +index 000000000..6e4583db1 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_time.h -@@ -0,0 +1,52 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h +@@ -0,0 +1,146 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ ++#ifndef __MALI_OSK_PROFILING_H__ ++#define __MALI_OSK_PROFILING_H__ ++ ++#if defined(CONFIG_MALI400_PROFILING) && defined (CONFIG_TRACEPOINTS) ++ ++#include "mali_linux_trace.h" ++#include "mali_profiling_events.h" ++#include "mali_profiling_gator_api.h" ++ ++#define MALI_PROFILING_MAX_BUFFER_ENTRIES 1048576 ++ ++#define MALI_PROFILING_NO_HW_COUNTER = ((u32)-1) ++ ++/** @defgroup _mali_osk_profiling External profiling connectivity ++ * @{ */ ++ ++/** ++ * Initialize the profiling module. ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ */ ++_mali_osk_errcode_t _mali_osk_profiling_init(mali_bool auto_start); ++ +/* ++ * Terminate the profiling module. ++ */ ++void _mali_osk_profiling_term(void); ++ ++/** ++ * Stop the profile sampling operation. ++ */ ++void _mali_osk_profiling_stop_sampling(u32 pid); ++ ++/** ++ * Start recording profiling data + * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * The specified limit will determine how large the capture buffer is. ++ * MALI_PROFILING_MAX_BUFFER_ENTRIES determines the maximum size allowed by the device driver. + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * @param limit The desired maximum number of events to record on input, the actual maximum on output. ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ */ ++_mali_osk_errcode_t _mali_osk_profiling_start(u32 *limit); ++ ++/** ++ * Add an profiling event + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * @param event_id The event identificator. ++ * @param data0 First data parameter, depending on event_id specified. ++ * @param data1 Second data parameter, depending on event_id specified. ++ * @param data2 Third data parameter, depending on event_id specified. ++ * @param data3 Fourth data parameter, depending on event_id specified. ++ * @param data4 Fifth data parameter, depending on event_id specified. ++ */ ++void _mali_osk_profiling_add_event(u32 event_id, u32 data0, u32 data1, u32 data2, u32 data3, u32 data4); ++ ++/** ++ * Report a hardware counter event. + * ++ * @param counter_id The ID of the counter. ++ * @param value The value of the counter. + */ + ++/* Call Linux tracepoint directly */ ++#define _mali_osk_profiling_report_hw_counter(counter_id, value) trace_mali_hw_counter(counter_id, value) ++ ++/** ++ * Report SW counters ++ * ++ * @param counters array of counter values ++ */ ++void _mali_osk_profiling_report_sw_counters(u32 *counters); + ++void _mali_osk_profiling_record_global_counters(int counter_id, u32 value); + -+#ifndef _KBASE_BACKEND_TIME_H_ -+#define _KBASE_BACKEND_TIME_H_ ++/** ++ * Stop recording profiling data ++ * ++ * @param count Returns the number of recorded events. ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ */ ++_mali_osk_errcode_t _mali_osk_profiling_stop(u32 *count); + +/** -+ * kbase_backend_get_gpu_time() - Get current GPU time -+ * @kbdev: Device pointer -+ * @cycle_counter: Pointer to u64 to store cycle counter in -+ * @system_time: Pointer to u64 to store system time in -+ * @ts: Pointer to struct timespec to store current monotonic -+ * time in ++ * Retrieves the number of events that can be retrieved ++ * ++ * @return The number of recorded events that can be retrieved. + */ -+void kbase_backend_get_gpu_time(struct kbase_device *kbdev, u64 *cycle_counter, -+ u64 *system_time, struct timespec *ts); ++u32 _mali_osk_profiling_get_count(void); + +/** -+ * kbase_wait_write_flush() - Wait for GPU write flush -+ * @kctx: Context pointer ++ * Retrieve an event + * -+ * Wait 1000 GPU clock cycles. This delay is known to give the GPU time to flush -+ * its write buffer. ++ * @param index Event index (start with 0 and continue until this function fails to retrieve all events) ++ * @param timestamp The timestamp for the retrieved event will be stored here. ++ * @param event_id The event ID for the retrieved event will be stored here. ++ * @param data The 5 data values for the retrieved event will be stored here. ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ */ ++_mali_osk_errcode_t _mali_osk_profiling_get_event(u32 index, u64 *timestamp, u32 *event_id, u32 data[5]); ++ ++/** ++ * Clear the recorded buffer. + * -+ * If GPU resets occur then the counters are reset to zero, the delay may not be -+ * as expected. ++ * This is needed in order to start another recording. + * -+ * This function is only in use for BASE_HW_ISSUE_6367 ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. + */ -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+static inline void kbase_wait_write_flush(struct kbase_context *kctx) -+{ -+} -+#else -+void kbase_wait_write_flush(struct kbase_context *kctx); -+#endif -+ -+#endif /* _KBASE_BACKEND_TIME_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/docs/Doxyfile b/drivers/gpu/arm/bifrost_for_linux/docs/Doxyfile -new file mode 100755 -index 000000000000..35ff2f1ce4a0 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/docs/Doxyfile -@@ -0,0 +1,126 @@ -+# -+# (C) COPYRIGHT 2011-2013, 2015 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++_mali_osk_errcode_t _mali_osk_profiling_clear(void); + ++/** ++ * Checks if a recording of profiling data is in progress ++ * ++ * @return MALI_TRUE if recording of profiling data is in progress, MALI_FALSE if not ++ */ ++mali_bool _mali_osk_profiling_is_recording(void); + ++/** ++ * Checks if profiling data is available for retrival ++ * ++ * @return MALI_TRUE if profiling data is avaiable, MALI_FALSE if not ++ */ ++mali_bool _mali_osk_profiling_have_recording(void); + -+############################################################################## ++/** @} */ /* end group _mali_osk_profiling */ + -+# This file contains per-module Doxygen configuration. Please do not add -+# extra settings to this file without consulting all stakeholders, as they -+# may cause override project-wide settings. -+# -+# Additionally, when defining aliases, macros, sections etc, use the module -+# name as a prefix e.g. gles_my_alias. ++#else /* defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_TRACEPOINTS) */ + -+############################################################################## ++/* Dummy add_event, for when profiling is disabled. */ + -+@INCLUDE = ../../bldsys/Doxyfile_common ++#define _mali_osk_profiling_add_event(event_id, data0, data1, data2, data3, data4) + -+# The INPUT tag can be used to specify the files and/or directories that contain -+# documented source files. You may enter file names like "myfile.cpp" or -+# directories like "/usr/src/myproject". Separate the files or directories -+# with spaces. ++#endif /* defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_TRACEPOINTS) */ + -+INPUT += ../../kernel/drivers/gpu/arm/midgard/ ++#endif /* __MALI_OSK_PROFILING_H__ */ + -+############################################################################## -+# Everything below here is optional, and in most cases not required -+############################################################################## + -+# This tag can be used to specify a number of aliases that acts -+# as commands in the documentation. An alias has the form "name=value". -+# For example adding "sideeffect=\par Side Effects:\n" will allow you to -+# put the command \sideeffect (or @sideeffect) in the documentation, which -+# will result in a user-defined paragraph with heading "Side Effects:". -+# You can put \n's in the value part of an alias to insert newlines. +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h +new file mode 100755 +index 000000000..b6fa94ce1 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h +@@ -0,0 +1,471 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ALIASES += ++/** ++ * @file mali_osk_types.h ++ * Defines types of the OS abstraction layer for the kernel device driver (OSK) ++ */ + -+# The ENABLED_SECTIONS tag can be used to enable conditional -+# documentation sections, marked by \if sectionname ... \endif. ++#ifndef __MALI_OSK_TYPES_H__ ++#define __MALI_OSK_TYPES_H__ + -+ENABLED_SECTIONS += ++#ifdef __cplusplus ++extern "C" { ++#endif + -+# If the value of the INPUT tag contains directories, you can use the -+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -+# and *.h) to filter out the source-files in the directories. If left -+# blank the following patterns are tested: -+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 ++/** ++ * @addtogroup uddapi Unified Device Driver (UDD) APIs ++ * ++ * @{ ++ */ + -+FILE_PATTERNS += ++/** ++ * @addtogroup oskapi UDD OS Abstraction for Kernel-side (OSK) APIs ++ * ++ * @{ ++ */ + -+# The EXCLUDE tag can be used to specify files and/or directories that should -+# excluded from the INPUT source files. This way you can easily exclude a -+# subdirectory from a directory tree whose root is specified with the INPUT tag. -+EXCLUDE += ../../kernel/drivers/gpu/arm/midgard/platform ../../kernel/drivers/gpu/arm/midgard/platform_dummy ../../kernel/drivers/gpu/arm/midgard/scripts ../../kernel/drivers/gpu/arm/midgard/tests ../../kernel/drivers/gpu/arm/midgard/Makefile ../../kernel/drivers/gpu/arm/midgard/Makefile.kbase ../../kernel/drivers/gpu/arm/midgard/Kbuild ../../kernel/drivers/gpu/arm/midgard/Kconfig ../../kernel/drivers/gpu/arm/midgard/sconscript ../../kernel/drivers/gpu/arm/midgard/docs ../../kernel/drivers/gpu/arm/midgard/pm_test_script.sh ../../kernel/drivers/gpu/arm/midgard/mali_uk.h ../../kernel/drivers/gpu/arm/midgard/Makefile ++/** @defgroup _mali_osk_miscellaneous OSK Miscellaneous functions, constants and types ++ * @{ */ + ++/* Define integer types used by OSK. Note: these currently clash with Linux so we only define them if not defined already */ ++#ifndef __KERNEL__ ++typedef unsigned char u8; ++typedef signed char s8; ++typedef unsigned short u16; ++typedef signed short s16; ++typedef unsigned int u32; ++typedef signed int s32; ++typedef unsigned long long u64; ++#define BITS_PER_LONG (sizeof(long)*8) ++#else ++/* Ensure Linux types u32, etc. are defined */ ++#include ++#endif + -+# If the value of the INPUT tag contains directories, you can use the -+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -+# certain files from those directories. Note that the wildcards are matched -+# against the file with absolute path, so to exclude all test directories -+# for example use the pattern */test/* ++/** @brief Mali Boolean type which uses MALI_TRUE and MALI_FALSE ++ */ ++typedef unsigned long mali_bool; + -+EXCLUDE_PATTERNS += ++#ifndef MALI_TRUE ++#define MALI_TRUE ((mali_bool)1) ++#endif + -+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -+# (namespaces, classes, functions, etc.) that should be excluded from the -+# output. The symbol name can be a fully qualified name, a word, or if the -+# wildcard * is used, a substring. Examples: ANamespace, AClass, -+# AClass::ANamespace, ANamespace::*Test ++#ifndef MALI_FALSE ++#define MALI_FALSE ((mali_bool)0) ++#endif + -+EXCLUDE_SYMBOLS += ++#define MALI_HW_CORE_NO_COUNTER ((u32)-1) + -+# The EXAMPLE_PATH tag can be used to specify one or more files or -+# directories that contain example code fragments that are included (see -+# the \include command). + -+EXAMPLE_PATH += ++#define MALI_S32_MAX 0x7fffffff + -+# The IMAGE_PATH tag can be used to specify one or more files or -+# directories that contain image that are included in the documentation (see -+# the \image command). ++/** ++ * @brief OSK Error codes ++ * ++ * Each OS may use its own set of error codes, and may require that the ++ * User/Kernel interface take certain error code. This means that the common ++ * error codes need to be sufficiently rich to pass the correct error code ++ * thorugh from the OSK to U/K layer, across all OSs. ++ * ++ * The result is that some error codes will appear redundant on some OSs. ++ * Under all OSs, the OSK layer must translate native OS error codes to ++ * _mali_osk_errcode_t codes. Similarly, the U/K layer must translate from ++ * _mali_osk_errcode_t codes to native OS error codes. ++ */ ++typedef enum { ++ _MALI_OSK_ERR_OK = 0, /**< Success. */ ++ _MALI_OSK_ERR_FAULT = -1, /**< General non-success */ ++ _MALI_OSK_ERR_INVALID_FUNC = -2, /**< Invalid function requested through User/Kernel interface (e.g. bad IOCTL number) */ ++ _MALI_OSK_ERR_INVALID_ARGS = -3, /**< Invalid arguments passed through User/Kernel interface */ ++ _MALI_OSK_ERR_NOMEM = -4, /**< Insufficient memory */ ++ _MALI_OSK_ERR_TIMEOUT = -5, /**< Timeout occurred */ ++ _MALI_OSK_ERR_RESTARTSYSCALL = -6, /**< Special: On certain OSs, must report when an interruptable mutex is interrupted. Ignore otherwise. */ ++ _MALI_OSK_ERR_ITEM_NOT_FOUND = -7, /**< Table Lookup failed */ ++ _MALI_OSK_ERR_BUSY = -8, /**< Device/operation is busy. Try again later */ ++ _MALI_OSK_ERR_UNSUPPORTED = -9, /**< Optional part of the interface used, and is unsupported */ ++} _mali_osk_errcode_t; + -+IMAGE_PATH += ++/** @} */ /* end group _mali_osk_miscellaneous */ + -+# The INCLUDE_PATH tag can be used to specify one or more directories that -+# contain include files that are not input files but should be processed by -+# the preprocessor. ++/** @defgroup _mali_osk_wq OSK work queues ++ * @{ */ + -+INCLUDE_PATH += ++/** @brief Private type for work objects */ ++typedef struct _mali_osk_wq_work_s _mali_osk_wq_work_t; ++typedef struct _mali_osk_wq_delayed_work_s _mali_osk_wq_delayed_work_t; + -+# The PREDEFINED tag can be used to specify one or more macro names that -+# are defined before the preprocessor is started (similar to the -D option of -+# gcc). The argument of the tag is a list of macros of the form: name -+# or name=definition (no spaces). If the definition and the = are -+# omitted =1 is assumed. To prevent a macro definition from being -+# undefined via #undef or recursively expanded use the := operator -+# instead of the = operator. ++/** @brief Work queue handler function ++ * ++ * This function type is called when the work is scheduled by the work queue, ++ * e.g. as an IRQ bottom-half handler. ++ * ++ * Refer to \ref _mali_osk_wq_schedule_work() for more information on the ++ * work-queue and work handlers. ++ * ++ * @param arg resource-specific data ++ */ ++typedef void (*_mali_osk_wq_work_handler_t)(void *arg); + -+PREDEFINED += ++/* @} */ /* end group _mali_osk_wq */ + -+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -+# this tag can be used to specify a list of macro names that should be expanded. -+# The macro definition that is found in the sources will be used. -+# Use the PREDEFINED tag if you want to use a different macro definition. ++/** @defgroup _mali_osk_irq OSK IRQ handling ++ * @{ */ + -+EXPAND_AS_DEFINED += ++/** @brief Private type for IRQ handling objects */ ++typedef struct _mali_osk_irq_t_struct _mali_osk_irq_t; + -+# The DOTFILE_DIRS tag can be used to specify one or more directories that -+# contain dot files that are included in the documentation (see the -+# \dotfile command). ++/** @brief Optional function to trigger an irq from a resource ++ * ++ * This function is implemented by the common layer to allow probing of a resource's IRQ. ++ * @param arg resource-specific data */ ++typedef void (*_mali_osk_irq_trigger_t)(void *arg); + -+DOTFILE_DIRS += ../../kernel/drivers/gpu/arm/midgard/docs ++/** @brief Optional function to acknowledge an irq from a resource ++ * ++ * This function is implemented by the common layer to allow probing of a resource's IRQ. ++ * @param arg resource-specific data ++ * @return _MALI_OSK_ERR_OK if the IRQ was successful, or a suitable _mali_osk_errcode_t on failure. */ ++typedef _mali_osk_errcode_t (*_mali_osk_irq_ack_t)(void *arg); + -diff --git a/drivers/gpu/arm/bifrost_for_linux/docs/policy_operation_diagram.dot b/drivers/gpu/arm/bifrost_for_linux/docs/policy_operation_diagram.dot -new file mode 100755 -index 000000000000..7ae05c2f8ded ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/docs/policy_operation_diagram.dot -@@ -0,0 +1,112 @@ -+/* ++/** @brief IRQ 'upper-half' handler callback. + * -+ * (C) COPYRIGHT 2010 ARM Limited. All rights reserved. ++ * This function is implemented by the common layer to do the initial handling of a ++ * resource's IRQ. This maps on to the concept of an ISR that does the minimum ++ * work necessary before handing off to an IST. + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * The communication of the resource-specific data from the ISR to the IST is ++ * handled by the OSK implementation. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * On most systems, the IRQ upper-half handler executes in IRQ context. ++ * Therefore, the system may have restrictions about what can be done in this ++ * context ++ * ++ * If an IRQ upper-half handler requires more work to be done than can be ++ * acheived in an IRQ context, then it may defer the work with ++ * _mali_osk_wq_schedule_work(). Refer to \ref _mali_osk_wq_create_work() for ++ * more information. + * ++ * @param arg resource-specific data ++ * @return _MALI_OSK_ERR_OK if the IRQ was correctly handled, or a suitable ++ * _mali_osk_errcode_t otherwise. + */ ++typedef _mali_osk_errcode_t (*_mali_osk_irq_uhandler_t)(void *arg); + + ++/** @} */ /* end group _mali_osk_irq */ + + ++/** @defgroup _mali_osk_atomic OSK Atomic counters ++ * @{ */ + -+digraph policy_objects_diagram { -+ rankdir=LR; -+ size="12,8"; -+ compound=true; -+ -+ node [ shape = box ]; -+ -+ subgraph cluster_policy_queues { -+ low_queue [ shape=record label = "LowP | {ctx_lo | ... | ctx_i | ... | ctx_hi}" ]; -+ queues_middle_sep [ label="" shape=plaintext width=0 height=0 ]; ++/** @brief Public type of atomic counters ++ * ++ * This is public for allocation on stack. On systems that support it, this is just a single 32-bit value. ++ * On others, it could be encapsulating an object stored elsewhere. ++ * ++ * Regardless of implementation, the \ref _mali_osk_atomic functions \b must be used ++ * for all accesses to the variable's value, even if atomicity is not required. ++ * Do not access u.val or u.obj directly. ++ */ ++typedef struct { ++ union { ++ u32 val; ++ void *obj; ++ } u; ++} _mali_osk_atomic_t; ++/** @} */ /* end group _mali_osk_atomic */ + -+ rt_queue [ shape=record label = "RT | {ctx_lo | ... | ctx_j | ... | ctx_hi}" ]; + -+ label = "Policy's Queue(s)"; -+ } ++/** @defgroup _mali_osk_lock OSK Mutual Exclusion Locks ++ * @{ */ + -+ call_enqueue [ shape=plaintext label="enqueue_ctx()" ]; + -+ { -+ rank=same; -+ ordering=out; -+ call_dequeue [ shape=plaintext label="dequeue_head_ctx()\n+ runpool_add_ctx()" ]; -+ call_ctxfinish [ shape=plaintext label="runpool_remove_ctx()" ]; ++/** @brief OSK Mutual Exclusion Lock ordered list ++ * ++ * This lists the various types of locks in the system and is used to check ++ * that locks are taken in the correct order. ++ * ++ * - Holding more than one lock of the same order at the same time is not ++ * allowed. ++ * - Taking a lock of a lower order than the highest-order lock currently held ++ * is not allowed. ++ * ++ */ ++typedef enum { ++ /* || Locks || */ ++ /* || must be || */ ++ /* _||_ taken in _||_ */ ++ /* \ / this \ / */ ++ /* \/ order! \/ */ + -+ call_ctxdone [ shape=plaintext label="don't requeue;\n/* ctx has no more jobs */" ]; -+ } ++ _MALI_OSK_LOCK_ORDER_FIRST = 0, + -+ subgraph cluster_runpool { ++ _MALI_OSK_LOCK_ORDER_SESSIONS, ++ _MALI_OSK_LOCK_ORDER_MEM_SESSION, ++ _MALI_OSK_LOCK_ORDER_MEM_INFO, ++ _MALI_OSK_LOCK_ORDER_MEM_PT_CACHE, ++ _MALI_OSK_LOCK_ORDER_DESCRIPTOR_MAP, ++ _MALI_OSK_LOCK_ORDER_PM_EXECUTION, ++ _MALI_OSK_LOCK_ORDER_EXECUTOR, ++ _MALI_OSK_LOCK_ORDER_TIMELINE_SYSTEM, ++ _MALI_OSK_LOCK_ORDER_SCHEDULER, ++ _MALI_OSK_LOCK_ORDER_SCHEDULER_DEFERRED, ++ _MALI_OSK_LOCK_ORDER_PROFILING, ++ _MALI_OSK_LOCK_ORDER_L2, ++ _MALI_OSK_LOCK_ORDER_L2_COMMAND, ++ _MALI_OSK_LOCK_ORDER_UTILIZATION, ++ _MALI_OSK_LOCK_ORDER_SESSION_PENDING_JOBS, ++ _MALI_OSK_LOCK_ORDER_PM_STATE, + -+ as0 [ width=2 height = 0.25 label="AS0: Job_1, ..., Job_n" ]; -+ as1 [ width=2 height = 0.25 label="AS1: Job_1, ..., Job_m" ]; -+ as2 [ width=2 height = 0.25 label="AS2: Job_1, ..., Job_p" ]; -+ as3 [ width=2 height = 0.25 label="AS3: Job_1, ..., Job_q" ]; ++ _MALI_OSK_LOCK_ORDER_LAST, ++} _mali_osk_lock_order_t; + -+ label = "Policy's Run Pool"; -+ } + -+ { -+ rank=same; -+ call_jdequeue [ shape=plaintext label="dequeue_job()" ]; -+ sstop_dotfixup [ shape=plaintext label="" width=0 height=0 ]; -+ } ++/** @brief OSK Mutual Exclusion Lock flags type ++ * ++ * - Any lock can use the order parameter. ++ */ ++typedef enum { ++ _MALI_OSK_LOCKFLAG_UNORDERED = 0x1, /**< Indicate that the order of this lock should not be checked */ ++ _MALI_OSK_LOCKFLAG_ORDERED = 0x2, ++ /** @enum _mali_osk_lock_flags_t ++ * ++ * Flags from 0x10000--0x80000000 are RESERVED for User-mode */ + -+ { -+ rank=same; -+ ordering=out; -+ sstop [ shape=ellipse label="SS-Timer expires" ] -+ jobslots [ shape=record label="Jobslots: | <0>js[0] | <1>js[1] | <2>js[2]" ]; ++} _mali_osk_lock_flags_t; + -+ irq [ label="IRQ" shape=ellipse ]; ++/** @brief Mutual Exclusion Lock Mode Optimization hint ++ * ++ * The lock mode is used to implement the read/write locking of locks when we call ++ * functions _mali_osk_mutex_rw_init/wait/signal/term/. In this case, the RO mode can ++ * be used to allow multiple concurrent readers, but no writers. The RW mode is used for ++ * writers, and so will wait for all readers to release the lock (if any present). ++ * Further readers and writers will wait until the writer releases the lock. ++ * ++ * The mode is purely an optimization hint: for example, it is permissible for ++ * all locks to behave in RW mode, regardless of that supplied. ++ * ++ * It is an error to attempt to use locks in anything other that RW mode when ++ * call functions _mali_osk_mutex_rw_wait/signal(). ++ * ++ */ ++typedef enum { ++ _MALI_OSK_LOCKMODE_UNDEF = -1, /**< Undefined lock mode. For internal use only */ ++ _MALI_OSK_LOCKMODE_RW = 0x0, /**< Read-write mode, default. All readers and writers are mutually-exclusive */ ++ _MALI_OSK_LOCKMODE_RO, /**< Read-only mode, to support multiple concurrent readers, but mutual exclusion in the presence of writers. */ ++ /** @enum _mali_osk_lock_mode_t ++ * ++ * Lock modes 0x40--0x7F are RESERVED for User-mode */ ++} _mali_osk_lock_mode_t; + -+ job_finish [ shape=plaintext label="don't requeue;\n/* job done */" ]; -+ } ++/** @brief Private types for Mutual Exclusion lock objects */ ++typedef struct _mali_osk_lock_debug_s _mali_osk_lock_debug_t; ++typedef struct _mali_osk_spinlock_s _mali_osk_spinlock_t; ++typedef struct _mali_osk_spinlock_irq_s _mali_osk_spinlock_irq_t; ++typedef struct _mali_osk_mutex_s _mali_osk_mutex_t; ++typedef struct _mali_osk_mutex_rw_s _mali_osk_mutex_rw_t; + -+ hstop [ shape=ellipse label="HS-Timer expires" ] ++/** @} */ /* end group _mali_osk_lock */ + -+ /* -+ * Edges -+ */ ++/** @defgroup _mali_osk_low_level_memory OSK Low-level Memory Operations ++ * @{ */ + -+ call_enqueue -> queues_middle_sep [ lhead=cluster_policy_queues ]; ++/** ++ * @brief Private data type for use in IO accesses to/from devices. ++ * ++ * This represents some range that is accessible from the device. Examples ++ * include: ++ * - Device Registers, which could be readable and/or writeable. ++ * - Memory that the device has access to, for storing configuration structures. ++ * ++ * Access to this range must be made through the _mali_osk_mem_ioread32() and ++ * _mali_osk_mem_iowrite32() functions. ++ */ ++typedef struct _mali_io_address *mali_io_address; + -+ low_queue:qr -> call_dequeue:w; -+ rt_queue:qr -> call_dequeue:w; ++/** @defgroup _MALI_OSK_CPU_PAGE CPU Physical page size macros. ++ * ++ * The order of the page size is supplied for ++ * ease of use by algorithms that might require it, since it is easier to know ++ * it ahead of time rather than calculating it. ++ * ++ * The Mali Page Mask macro masks off the lower bits of a physical address to ++ * give the start address of the page for that physical address. ++ * ++ * @note The Mali device driver code is designed for systems with 4KB page size. ++ * Changing these macros will not make the entire Mali device driver work with ++ * page sizes other than 4KB. ++ * ++ * @note The CPU Physical Page Size has been assumed to be the same as the Mali ++ * Physical Page Size. ++ * ++ * @{ ++ */ + -+ call_dequeue -> as1 [lhead=cluster_runpool]; ++/** CPU Page Order, as log to base 2 of the Page size. @see _MALI_OSK_CPU_PAGE_SIZE */ ++#define _MALI_OSK_CPU_PAGE_ORDER ((u32)12) ++/** CPU Page Size, in bytes. */ ++#define _MALI_OSK_CPU_PAGE_SIZE (((u32)1) << (_MALI_OSK_CPU_PAGE_ORDER)) ++/** CPU Page Mask, which masks off the offset within a page */ ++#define _MALI_OSK_CPU_PAGE_MASK (~((((u32)1) << (_MALI_OSK_CPU_PAGE_ORDER)) - ((u32)1))) ++/** @} */ /* end of group _MALI_OSK_CPU_PAGE */ + -+ as1->call_jdequeue [ltail=cluster_runpool]; -+ call_jdequeue->jobslots:0; -+ call_jdequeue->sstop_dotfixup [ arrowhead=none]; -+ sstop_dotfixup->sstop [label="Spawn SS-Timer"]; -+ sstop->jobslots [label="SoftStop"]; -+ sstop->hstop [label="Spawn HS-Timer"]; -+ hstop->jobslots:ne [label="HardStop"]; ++/** @defgroup _MALI_OSK_MALI_PAGE Mali Physical Page size macros ++ * ++ * Mali Physical page size macros. The order of the page size is supplied for ++ * ease of use by algorithms that might require it, since it is easier to know ++ * it ahead of time rather than calculating it. ++ * ++ * The Mali Page Mask macro masks off the lower bits of a physical address to ++ * give the start address of the page for that physical address. ++ * ++ * @note The Mali device driver code is designed for systems with 4KB page size. ++ * Changing these macros will not make the entire Mali device driver work with ++ * page sizes other than 4KB. ++ * ++ * @note The Mali Physical Page Size has been assumed to be the same as the CPU ++ * Physical Page Size. ++ * ++ * @{ ++ */ + ++/** Mali Page Order, as log to base 2 of the Page size. @see _MALI_OSK_MALI_PAGE_SIZE */ ++#define _MALI_OSK_MALI_PAGE_ORDER PAGE_SHIFT ++/** Mali Page Size, in bytes. */ ++#define _MALI_OSK_MALI_PAGE_SIZE PAGE_SIZE ++/** Mali Page Mask, which masks off the offset within a page */ ++#define _MALI_OSK_MALI_PAGE_MASK PAGE_MASK ++/** @} */ /* end of group _MALI_OSK_MALI_PAGE*/ + -+ as3->call_ctxfinish:ne [ ltail=cluster_runpool ]; -+ call_ctxfinish:sw->rt_queue:qm [ lhead=cluster_policy_queues label="enqueue_ctx()\n/* ctx still has jobs */" ]; ++/** @brief flags for mapping a user-accessible memory range ++ * ++ * Where a function with prefix '_mali_osk_mem_mapregion' accepts flags as one ++ * of the function parameters, it will use one of these. These allow per-page ++ * control over mappings. Compare with the mali_memory_allocation_flag type, ++ * which acts over an entire range ++ * ++ * These may be OR'd together with bitwise OR (|), but must be cast back into ++ * the type after OR'ing. ++ */ ++typedef enum { ++ _MALI_OSK_MEM_MAPREGION_FLAG_OS_ALLOCATED_PHYSADDR = 0x1, /**< Physical address is OS Allocated */ ++} _mali_osk_mem_mapregion_flags_t; ++/** @} */ /* end group _mali_osk_low_level_memory */ + -+ call_ctxfinish->call_ctxdone [constraint=false]; ++/** @defgroup _mali_osk_notification OSK Notification Queues ++ * @{ */ + -+ call_ctxdone->call_enqueue [weight=0.1 labeldistance=20.0 labelangle=0.0 taillabel="Job submitted to the ctx" style=dotted constraint=false]; ++/** @brief Private type for notification queue objects */ ++typedef struct _mali_osk_notification_queue_t_struct _mali_osk_notification_queue_t; + ++/** @brief Public notification data object type */ ++typedef struct _mali_osk_notification_t_struct { ++ u32 notification_type; /**< The notification type */ ++ u32 result_buffer_size; /**< Size of the result buffer to copy to user space */ ++ void *result_buffer; /**< Buffer containing any type specific data */ ++} _mali_osk_notification_t; + -+ { -+ jobslots->irq [constraint=false]; ++/** @} */ /* end group _mali_osk_notification */ + -+ irq->job_finish [constraint=false]; -+ } + -+ irq->as2 [lhead=cluster_runpool label="requeue_job()\n/* timeslice expired */" ]; ++/** @defgroup _mali_osk_timer OSK Timer Callbacks ++ * @{ */ + -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/docs/policy_overview.dot b/drivers/gpu/arm/bifrost_for_linux/docs/policy_overview.dot -new file mode 100755 -index 000000000000..159b993b7d61 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/docs/policy_overview.dot -@@ -0,0 +1,63 @@ -+/* ++/** @brief Function to call when a timer expires + * -+ * (C) COPYRIGHT 2010 ARM Limited. All rights reserved. ++ * When a timer expires, this function is called. Note that on many systems, ++ * a timer callback will be executed in IRQ context. Therefore, restrictions ++ * may apply on what can be done inside the timer callback. + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * If a timer requires more work to be done than can be acheived in an IRQ ++ * context, then it may defer the work with a work-queue. For example, it may ++ * use \ref _mali_osk_wq_schedule_work() to make use of a bottom-half handler ++ * to carry out the remaining work. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * Stopping the timer with \ref _mali_osk_timer_del() blocks on compeletion of ++ * the callback. Therefore, the callback may not obtain any mutexes also held ++ * by any callers of _mali_osk_timer_del(). Otherwise, a deadlock may occur. + * -+ */ -+ ++ * @param arg Function-specific data */ ++typedef void (*_mali_osk_timer_callback_t)(void *arg); + ++/** @brief Private type for Timer Callback Objects */ ++typedef struct _mali_osk_timer_t_struct _mali_osk_timer_t; ++/** @} */ /* end group _mali_osk_timer */ + + ++/** @addtogroup _mali_osk_list OSK Doubly-Linked Circular Lists ++ * @{ */ + -+digraph policy_objects_diagram { -+ rankdir=LR -+ size="6,6" -+ compound=true; ++/** @brief Public List objects. ++ * ++ * To use, add a _mali_osk_list_t member to the structure that may become part ++ * of a list. When traversing the _mali_osk_list_t objects, use the ++ * _MALI_OSK_CONTAINER_OF() macro to recover the structure from its ++ *_mali_osk_list_t member ++ * ++ * Each structure may have multiple _mali_osk_list_t members, so that the ++ * structure is part of multiple lists. When traversing lists, ensure that the ++ * correct _mali_osk_list_t member is used, because type-checking will be ++ * lost by the compiler. ++ */ ++typedef struct _mali_osk_list_s { ++ struct _mali_osk_list_s *next; ++ struct _mali_osk_list_s *prev; ++} _mali_osk_list_t; ++/** @} */ /* end group _mali_osk_list */ + -+ node [ shape = box ]; ++/** @addtogroup _mali_osk_miscellaneous ++ * @{ */ + -+ call_enqueue [ shape=plaintext label="enqueue ctx" ]; ++/** @brief resource description struct ++ * ++ * Platform independent representation of a Mali HW resource ++ */ ++typedef struct _mali_osk_resource { ++ const char *description; /**< short description of the resource */ ++ uintptr_t base; /**< Physical base address of the resource, as seen by Mali resources. */ ++ const char *irq_name; /**< Name of irq belong to this resource */ ++ u32 irq; /**< IRQ number delivered to the CPU, or -1 to tell the driver to probe for it (if possible) */ ++} _mali_osk_resource_t; ++/** @} */ /* end group _mali_osk_miscellaneous */ + ++/** @defgroup _mali_osk_wait_queue OSK Wait Queue functionality ++ * @{ */ ++/** @brief Private type for wait queue objects */ ++typedef struct _mali_osk_wait_queue_t_struct _mali_osk_wait_queue_t; ++/** @} */ /* end group _mali_osk_wait_queue */ + -+ policy_queue [ label="Policy's Queue" ]; ++/** @} */ /* end group osuapi */ + -+ { -+ rank=same; -+ runpool [ label="Policy's Run Pool" ]; ++/** @} */ /* end group uddapi */ + -+ ctx_finish [ label="ctx finished" ]; -+ } ++/** @brief Mali print ctx type which uses seq_file ++ */ ++typedef struct seq_file _mali_osk_print_ctx; + -+ { -+ rank=same; -+ jobslots [ shape=record label="Jobslots: | <0>js[0] | <1>js[1] | <2>js[2]" ]; ++#define _MALI_OSK_BITMAP_INVALIDATE_INDEX -1 + -+ job_finish [ label="Job finished" ]; -+ } ++typedef struct _mali_osk_bitmap { ++ u32 reserve; ++ u32 last; ++ u32 max; ++ u32 avail; ++ _mali_osk_spinlock_t *lock; ++ unsigned long *table; ++} _mali_osk_bitmap_t; + + ++#ifdef __cplusplus ++} ++#endif + -+ /* -+ * Edges -+ */ ++#endif /* __MALI_OSK_TYPES_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm.c b/drivers/gpu/arm/mali400/mali/common/mali_pm.c +new file mode 100755 +index 000000000..3989a33ae +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.c +@@ -0,0 +1,1362 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ call_enqueue -> policy_queue; ++#include "mali_pm.h" ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_osk_mali.h" ++#include "mali_scheduler.h" ++#include "mali_group.h" ++#include "mali_pm_domain.h" ++#include "mali_pmu.h" + -+ policy_queue->runpool [label="dequeue ctx" weight=0.1]; -+ runpool->policy_queue [label="requeue ctx" weight=0.1]; ++#include "mali_executor.h" ++#include "mali_control_timer.h" + -+ runpool->ctx_finish [ style=dotted ]; ++#if defined(DEBUG) ++u32 num_pm_runtime_resume = 0; ++u32 num_pm_updates = 0; ++u32 num_pm_updates_up = 0; ++u32 num_pm_updates_down = 0; ++#endif + -+ runpool->jobslots [label="dequeue job" weight=0.1]; -+ jobslots->runpool [label="requeue job" weight=0.1]; ++#define MALI_PM_DOMAIN_DUMMY_MASK (1 << MALI_DOMAIN_INDEX_DUMMY) + -+ jobslots->job_finish [ style=dotted ]; -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/Kbuild b/drivers/gpu/arm/bifrost_for_linux/ipa/Kbuild -new file mode 100755 -index 000000000000..0776428fce4f ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/ipa/Kbuild -@@ -0,0 +1,27 @@ -+# -+# (C) COPYRIGHT 2016-2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++/* lock protecting power state (including pm_domains) */ ++static _mali_osk_spinlock_irq_t *pm_lock_state = NULL; + ++/* the wanted domain mask (protected by pm_lock_state) */ ++static u32 pd_mask_wanted = 0; + -+bifrost_kbase-y += \ -+ ipa/mali_kbase_ipa_simple.o \ -+ ipa/mali_kbase_ipa.o ++/* used to deferring the actual power changes */ ++static _mali_osk_wq_work_t *pm_work = NULL; + -+bifrost_kbase-$(CONFIG_DEBUG_FS) += ipa/mali_kbase_ipa_debugfs.o ++/* lock protecting power change execution */ ++static _mali_osk_mutex_t *pm_lock_exec = NULL; + -+ifneq ($(wildcard $(srctree)/$(src)/ipa/mali_kbase_ipa_vinstr_g71.c),) -+ bifrost_kbase-y += \ -+ ipa/mali_kbase_ipa_vinstr_g71.o \ -+ ipa/mali_kbase_ipa_vinstr_common.o ++/* PMU domains which are actually powered on (protected by pm_lock_exec) */ ++static u32 pmu_mask_current = 0; + -+endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa.c b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa.c -new file mode 100755 -index 000000000000..d6332b55e970 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa.c -@@ -0,0 +1,580 @@ +/* -+ * -+ * (C) COPYRIGHT 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * domains which marked as powered on (protected by pm_lock_exec) ++ * This can be different from pmu_mask_current right after GPU power on ++ * if the PMU domains default to powered up. + */ ++static u32 pd_mask_current = 0; + ++static u16 domain_config[MALI_MAX_NUMBER_OF_DOMAINS] = { ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 1 << MALI_DOMAIN_INDEX_DUMMY ++}; + -+#include -+#include -+#include -+#include "mali_kbase.h" -+#include "mali_kbase_ipa.h" -+#include "mali_kbase_ipa_debugfs.h" -+#include "mali_kbase_ipa_simple.h" ++/* The relative core power cost */ ++#define MALI_GP_COST 3 ++#define MALI_PP_COST 6 ++#define MALI_L2_COST 1 + -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)) -+#include ++/* ++ *We have MALI_MAX_NUMBER_OF_PP_PHYSICAL_CORES + 1 rows in this matrix ++ *because we mush store the mask of different pp cores: 0, 1, 2, 3, 4, 5, 6, 7, 8. ++ */ ++static int mali_pm_domain_power_cost_result[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS + 1][MALI_MAX_NUMBER_OF_DOMAINS]; ++/* ++ * Keep track of runtime PM state, so that we know ++ * how to resume during OS resume. ++ */ ++#ifdef CONFIG_PM_RUNTIME ++static mali_bool mali_pm_runtime_active = MALI_FALSE; +#else -+#include -+#define dev_pm_opp_find_freq_exact opp_find_freq_exact -+#define dev_pm_opp_get_voltage opp_get_voltage -+#define dev_pm_opp opp ++/* when kernel don't enable PM_RUNTIME, set the flag always true, ++ * for GPU will not power off by runtime */ ++static mali_bool mali_pm_runtime_active = MALI_TRUE; +#endif + -+#define KBASE_IPA_FALLBACK_MODEL_NAME "mali-simple-power-model" -+#define KBASE_IPA_G71_MODEL_NAME "mali-g71-power-model" -+ -+static struct kbase_ipa_model_ops *kbase_ipa_all_model_ops[] = { -+ &kbase_simple_ipa_model_ops, -+ &kbase_g71_ipa_model_ops -+}; ++static void mali_pm_state_lock(void); ++static void mali_pm_state_unlock(void); ++static _mali_osk_errcode_t mali_pm_create_pm_domains(void); ++static void mali_pm_set_pmu_domain_config(void); ++static u32 mali_pm_get_registered_cores_mask(void); ++static void mali_pm_update_sync_internal(void); ++static mali_bool mali_pm_common_suspend(void); ++static void mali_pm_update_work(void *data); ++#if defined(DEBUG) ++const char *mali_pm_mask_to_string(u32 mask); ++const char *mali_pm_group_stats_to_string(void); ++#endif + -+int kbase_ipa_model_recalculate(struct kbase_ipa_model *model) ++_mali_osk_errcode_t mali_pm_initialize(void) +{ -+ int err = 0; -+ -+ lockdep_assert_held(&model->kbdev->ipa.lock); ++ _mali_osk_errcode_t err; ++ struct mali_pmu_core *pmu; + -+ if (model->ops->recalculate) { -+ err = model->ops->recalculate(model); -+ if (err) { -+ dev_err(model->kbdev->dev, -+ "recalculation of power model %s returned error %d\n", -+ model->ops->name, err); -+ } ++ pm_lock_state = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_ORDERED, ++ _MALI_OSK_LOCK_ORDER_PM_STATE); ++ if (NULL == pm_lock_state) { ++ mali_pm_terminate(); ++ return _MALI_OSK_ERR_FAULT; + } + -+ return err; -+} -+ -+static struct kbase_ipa_model_ops *kbase_ipa_model_ops_find(struct kbase_device *kbdev, -+ const char *name) -+{ -+ int i; -+ -+ for (i = 0; i < ARRAY_SIZE(kbase_ipa_all_model_ops); ++i) { -+ struct kbase_ipa_model_ops *ops = kbase_ipa_all_model_ops[i]; ++ pm_lock_exec = _mali_osk_mutex_init(_MALI_OSK_LOCKFLAG_ORDERED, ++ _MALI_OSK_LOCK_ORDER_PM_STATE); ++ if (NULL == pm_lock_exec) { ++ mali_pm_terminate(); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ if (!strcmp(ops->name, name)) -+ return ops; ++ pm_work = _mali_osk_wq_create_work(mali_pm_update_work, NULL); ++ if (NULL == pm_work) { ++ mali_pm_terminate(); ++ return _MALI_OSK_ERR_FAULT; + } + -+ dev_err(kbdev->dev, "power model \'%s\' not found\n", name); ++ pmu = mali_pmu_get_global_pmu_core(); ++ if (NULL != pmu) { ++ /* ++ * We have a Mali PMU, set the correct domain ++ * configuration (default or custom) ++ */ + -+ return NULL; -+} ++ u32 registered_cores_mask; + -+void kbase_ipa_model_use_fallback_locked(struct kbase_device *kbdev) -+{ -+ atomic_set(&kbdev->ipa_use_configured_model, false); -+} ++ mali_pm_set_pmu_domain_config(); + -+void kbase_ipa_model_use_configured_locked(struct kbase_device *kbdev) -+{ -+ atomic_set(&kbdev->ipa_use_configured_model, true); -+} ++ registered_cores_mask = mali_pm_get_registered_cores_mask(); ++ mali_pmu_set_registered_cores_mask(pmu, registered_cores_mask); + -+const char *kbase_ipa_model_name_from_id(u32 gpu_id) -+{ -+ const u32 prod_id = (gpu_id & GPU_ID_VERSION_PRODUCT_ID) >> -+ GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++ MALI_DEBUG_ASSERT(0 == pd_mask_wanted); ++ } + -+ if (GPU_ID_IS_NEW_FORMAT(prod_id)) { -+ switch (GPU_ID2_MODEL_MATCH_VALUE(prod_id)) { -+ case GPU_ID2_PRODUCT_TMIX: -+ return KBASE_IPA_G71_MODEL_NAME; -+ default: -+ return KBASE_IPA_FALLBACK_MODEL_NAME; -+ } ++ /* Create all power domains needed (at least one dummy domain) */ ++ err = mali_pm_create_pm_domains(); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_pm_terminate(); ++ return err; + } + -+ return KBASE_IPA_FALLBACK_MODEL_NAME; ++ return _MALI_OSK_ERR_OK; +} + -+static struct device_node *get_model_dt_node(struct kbase_ipa_model *model) ++void mali_pm_terminate(void) +{ -+ struct device_node *model_dt_node; -+ char compat_string[64]; ++ if (NULL != pm_work) { ++ _mali_osk_wq_delete_work(pm_work); ++ pm_work = NULL; ++ } + -+ snprintf(compat_string, sizeof(compat_string), "arm,%s", -+ model->ops->name); ++ mali_pm_domain_terminate(); + -+ model_dt_node = of_find_compatible_node(model->kbdev->dev->of_node, -+ NULL, compat_string); -+ if (!model_dt_node && !model->missing_dt_node_warning) { -+ dev_warn(model->kbdev->dev, -+ "Couldn't find power_model DT node matching \'%s\'\n", -+ compat_string); -+ model->missing_dt_node_warning = true; ++ if (NULL != pm_lock_exec) { ++ _mali_osk_mutex_term(pm_lock_exec); ++ pm_lock_exec = NULL; + } + -+ return model_dt_node; ++ if (NULL != pm_lock_state) { ++ _mali_osk_spinlock_irq_term(pm_lock_state); ++ pm_lock_state = NULL; ++ } +} + -+int kbase_ipa_model_add_param_s32(struct kbase_ipa_model *model, -+ const char *name, s32 *addr, -+ size_t num_elems, bool dt_required) ++struct mali_pm_domain *mali_pm_register_l2_cache(u32 domain_index, ++ struct mali_l2_cache_core *l2_cache) +{ -+ int err, i; -+ struct device_node *model_dt_node = get_model_dt_node(model); -+ char *origin; -+ -+ err = of_property_read_u32_array(model_dt_node, name, addr, num_elems); ++ struct mali_pm_domain *domain; + -+ if (err && dt_required) { -+ memset(addr, 0, sizeof(s32) * num_elems); -+ dev_warn(model->kbdev->dev, -+ "Error %d, no DT entry: %s.%s = %zu*[0]\n", -+ err, model->ops->name, name, num_elems); -+ origin = "zero"; -+ } else if (err && !dt_required) { -+ origin = "default"; -+ } else /* !err */ { -+ origin = "DT"; ++ domain = mali_pm_domain_get_from_mask(domain_config[domain_index]); ++ if (NULL == domain) { ++ MALI_DEBUG_ASSERT(0 == domain_config[domain_index]); ++ domain = mali_pm_domain_get_from_index( ++ MALI_DOMAIN_INDEX_DUMMY); ++ domain_config[domain_index] = MALI_PM_DOMAIN_DUMMY_MASK; ++ } else { ++ MALI_DEBUG_ASSERT(0 != domain_config[domain_index]); + } + -+ /* Create a unique debugfs entry for each element */ -+ for (i = 0; i < num_elems; ++i) { -+ char elem_name[32]; -+ -+ if (num_elems == 1) -+ snprintf(elem_name, sizeof(elem_name), "%s", name); -+ else -+ snprintf(elem_name, sizeof(elem_name), "%s.%d", -+ name, i); ++ MALI_DEBUG_ASSERT(NULL != domain); + -+ dev_dbg(model->kbdev->dev, "%s.%s = %d (%s)\n", -+ model->ops->name, elem_name, addr[i], origin); ++ mali_pm_domain_add_l2_cache(domain, l2_cache); + -+ err = kbase_ipa_model_param_add(model, elem_name, -+ &addr[i], sizeof(s32), -+ PARAM_TYPE_S32); -+ if (err) -+ goto exit; -+ } -+exit: -+ return err; ++ return domain; /* return the actual domain this was registered in */ +} + -+int kbase_ipa_model_add_param_string(struct kbase_ipa_model *model, -+ const char *name, char *addr, -+ size_t size, bool dt_required) ++struct mali_pm_domain *mali_pm_register_group(u32 domain_index, ++ struct mali_group *group) +{ -+ int err; -+ struct device_node *model_dt_node = get_model_dt_node(model); -+ const char *string_prop_value; -+ char *origin; ++ struct mali_pm_domain *domain; + -+ err = of_property_read_string(model_dt_node, name, -+ &string_prop_value); -+ if (err && dt_required) { -+ strncpy(addr, "", size - 1); -+ dev_warn(model->kbdev->dev, -+ "Error %d, no DT entry: %s.%s = \'%s\'\n", -+ err, model->ops->name, name, addr); -+ err = 0; -+ origin = "zero"; -+ } else if (err && !dt_required) { -+ origin = "default"; -+ } else /* !err */ { -+ strncpy(addr, string_prop_value, size - 1); -+ origin = "DT"; ++ domain = mali_pm_domain_get_from_mask(domain_config[domain_index]); ++ if (NULL == domain) { ++ MALI_DEBUG_ASSERT(0 == domain_config[domain_index]); ++ domain = mali_pm_domain_get_from_index( ++ MALI_DOMAIN_INDEX_DUMMY); ++ domain_config[domain_index] = MALI_PM_DOMAIN_DUMMY_MASK; ++ } else { ++ MALI_DEBUG_ASSERT(0 != domain_config[domain_index]); + } + -+ addr[size - 1] = '\0'; -+ -+ dev_dbg(model->kbdev->dev, "%s.%s = \'%s\' (%s)\n", -+ model->ops->name, name, string_prop_value, origin); ++ MALI_DEBUG_ASSERT(NULL != domain); + -+ err = kbase_ipa_model_param_add(model, name, addr, size, -+ PARAM_TYPE_STRING); ++ mali_pm_domain_add_group(domain, group); + -+ return err; ++ return domain; /* return the actual domain this was registered in */ +} + -+void kbase_ipa_term_model(struct kbase_ipa_model *model) ++mali_bool mali_pm_get_domain_refs(struct mali_pm_domain **domains, ++ struct mali_group **groups, ++ u32 num_domains) +{ -+ if (!model) -+ return; ++ mali_bool ret = MALI_TRUE; /* Assume all is powered on instantly */ ++ u32 i; + -+ lockdep_assert_held(&model->kbdev->ipa.lock); ++ mali_pm_state_lock(); + -+ if (model->ops->term) -+ model->ops->term(model); ++ for (i = 0; i < num_domains; i++) { ++ MALI_DEBUG_ASSERT_POINTER(domains[i]); ++ pd_mask_wanted |= mali_pm_domain_ref_get(domains[i]); ++ if (MALI_FALSE == mali_pm_domain_power_is_on(domains[i])) { ++ /* ++ * Tell caller that the corresponding group ++ * was not already powered on. ++ */ ++ ret = MALI_FALSE; ++ } else { ++ /* ++ * There is a time gap between we power on the domain and ++ * set the power state of the corresponding groups to be on. ++ */ ++ if (NULL != groups[i] && ++ MALI_FALSE == mali_group_power_is_on(groups[i])) { ++ ret = MALI_FALSE; ++ } ++ } ++ } + -+ kbase_ipa_model_param_free_all(model); ++ MALI_DEBUG_PRINT(3, ("PM: wanted domain mask = 0x%08X (get refs)\n", pd_mask_wanted)); + -+ kfree(model); ++ mali_pm_state_unlock(); ++ ++ return ret; +} -+KBASE_EXPORT_TEST_API(kbase_ipa_term_model); + -+struct kbase_ipa_model *kbase_ipa_init_model(struct kbase_device *kbdev, -+ struct kbase_ipa_model_ops *ops) ++mali_bool mali_pm_put_domain_refs(struct mali_pm_domain **domains, ++ u32 num_domains) +{ -+ struct kbase_ipa_model *model; -+ int err; ++ u32 mask = 0; ++ mali_bool ret; ++ u32 i; + -+ lockdep_assert_held(&kbdev->ipa.lock); ++ mali_pm_state_lock(); + -+ if (!ops || !ops->name) -+ return NULL; ++ for (i = 0; i < num_domains; i++) { ++ MALI_DEBUG_ASSERT_POINTER(domains[i]); ++ mask |= mali_pm_domain_ref_put(domains[i]); ++ } + -+ model = kzalloc(sizeof(struct kbase_ipa_model), GFP_KERNEL); -+ if (!model) -+ return NULL; ++ if (0 == mask) { ++ /* return false, all domains should still stay on */ ++ ret = MALI_FALSE; ++ } else { ++ /* Assert that we are dealing with a change */ ++ MALI_DEBUG_ASSERT((pd_mask_wanted & mask) == mask); + -+ model->kbdev = kbdev; -+ model->ops = ops; -+ INIT_LIST_HEAD(&model->params); ++ /* Update our desired domain mask */ ++ pd_mask_wanted &= ~mask; + -+ err = model->ops->init(model); -+ if (err) { -+ dev_err(kbdev->dev, -+ "init of power model \'%s\' returned error %d\n", -+ ops->name, err); -+ kfree(model); -+ return NULL; ++ /* return true; one or more domains can now be powered down */ ++ ret = MALI_TRUE; + } + -+ err = kbase_ipa_model_recalculate(model); -+ if (err) { -+ kbase_ipa_term_model(model); -+ return NULL; -+ } ++ MALI_DEBUG_PRINT(3, ("PM: wanted domain mask = 0x%08X (put refs)\n", pd_mask_wanted)); + -+ return model; ++ mali_pm_state_unlock(); ++ ++ return ret; +} -+KBASE_EXPORT_TEST_API(kbase_ipa_init_model); + -+static void kbase_ipa_term_locked(struct kbase_device *kbdev) ++void mali_pm_init_begin(void) +{ -+ lockdep_assert_held(&kbdev->ipa.lock); ++ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); + -+ /* Clean up the models */ -+ if (kbdev->ipa.configured_model != kbdev->ipa.fallback_model) -+ kbase_ipa_term_model(kbdev->ipa.configured_model); -+ kbase_ipa_term_model(kbdev->ipa.fallback_model); ++ _mali_osk_pm_dev_ref_get_sync(); + -+ kbdev->ipa.configured_model = NULL; -+ kbdev->ipa.fallback_model = NULL; ++ /* Ensure all PMU domains are on */ ++ if (NULL != pmu) { ++ mali_pmu_power_up_all(pmu); ++ } +} + -+int kbase_ipa_init(struct kbase_device *kbdev) ++void mali_pm_init_end(void) +{ ++ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); + -+ const char *model_name; -+ struct kbase_ipa_model_ops *ops; -+ struct kbase_ipa_model *default_model = NULL; -+ int err; ++ /* Ensure all PMU domains are off */ ++ if (NULL != pmu) { ++ mali_pmu_power_down_all(pmu); ++ } + -+ mutex_init(&kbdev->ipa.lock); -+ /* -+ * Lock during init to avoid warnings from lockdep_assert_held (there -+ * shouldn't be any concurrent access yet). -+ */ -+ mutex_lock(&kbdev->ipa.lock); ++ _mali_osk_pm_dev_ref_put(); ++} + -+ /* The simple IPA model must *always* be present.*/ -+ ops = kbase_ipa_model_ops_find(kbdev, KBASE_IPA_FALLBACK_MODEL_NAME); ++void mali_pm_update_sync(void) ++{ ++ mali_pm_exec_lock(); + -+ if (!ops->do_utilization_scaling_in_framework) { -+ dev_err(kbdev->dev, -+ "Fallback IPA model %s should not account for utilization\n", -+ ops->name); -+ err = -EINVAL; -+ goto end; ++ if (MALI_TRUE == mali_pm_runtime_active) { ++ /* ++ * Only update if GPU is powered on. ++ * Deactivation of the last group will result in both a ++ * deferred runtime PM suspend operation and ++ * deferred execution of this function. ++ * mali_pm_runtime_active will be false if runtime PM ++ * executed first and thus the GPU is now fully powered off. ++ */ ++ mali_pm_update_sync_internal(); + } + -+ default_model = kbase_ipa_init_model(kbdev, ops); -+ if (!default_model) { -+ err = -EINVAL; -+ goto end; -+ } ++ mali_pm_exec_unlock(); ++} + -+ kbdev->ipa.fallback_model = default_model; -+ err = of_property_read_string(kbdev->dev->of_node, -+ "ipa-model", -+ &model_name); -+ if (err) { -+ /* Attempt to load a match from GPU-ID */ -+ u32 gpu_id; ++void mali_pm_update_async(void) ++{ ++ _mali_osk_wq_schedule_work(pm_work); ++} + -+ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ model_name = kbase_ipa_model_name_from_id(gpu_id); -+ dev_dbg(kbdev->dev, -+ "Inferring model from GPU ID 0x%x: \'%s\'\n", -+ gpu_id, model_name); -+ err = 0; -+ } else { -+ dev_dbg(kbdev->dev, -+ "Using ipa-model parameter from DT: \'%s\'\n", -+ model_name); -+ } ++void mali_pm_os_suspend(mali_bool os_suspend) ++{ ++ int ret; + -+ if (strcmp(KBASE_IPA_FALLBACK_MODEL_NAME, model_name) != 0) { -+ ops = kbase_ipa_model_ops_find(kbdev, model_name); -+ kbdev->ipa.configured_model = kbase_ipa_init_model(kbdev, ops); -+ if (!kbdev->ipa.configured_model) { -+ err = -EINVAL; -+ goto end; -+ } -+ } else { -+ kbdev->ipa.configured_model = default_model; ++ MALI_DEBUG_PRINT(3, ("Mali PM: OS suspend\n")); ++ ++ /* Suspend execution of all jobs, and go to inactive state */ ++ mali_executor_suspend(); ++ ++ if (os_suspend) { ++ mali_control_timer_suspend(MALI_TRUE); + } + -+ kbase_ipa_model_use_configured_locked(kbdev); ++ mali_pm_exec_lock(); + -+end: -+ if (err) -+ kbase_ipa_term_locked(kbdev); -+ else -+ dev_info(kbdev->dev, -+ "Using configured power model %s, and fallback %s\n", -+ kbdev->ipa.configured_model->ops->name, -+ kbdev->ipa.fallback_model->ops->name); ++ ret = mali_pm_common_suspend(); + -+ mutex_unlock(&kbdev->ipa.lock); -+ return err; -+} -+KBASE_EXPORT_TEST_API(kbase_ipa_init); ++ MALI_DEBUG_ASSERT(MALI_TRUE == ret); ++ MALI_IGNORE(ret); + -+void kbase_ipa_term(struct kbase_device *kbdev) -+{ -+ mutex_lock(&kbdev->ipa.lock); -+ kbase_ipa_term_locked(kbdev); -+ mutex_unlock(&kbdev->ipa.lock); ++ mali_pm_exec_unlock(); +} -+KBASE_EXPORT_TEST_API(kbase_ipa_term); + -+/** -+ * kbase_scale_dynamic_power() - Scale a dynamic power coefficient to an OPP -+ * @c: Dynamic model coefficient, in pW/(Hz V^2). Should be in range -+ * 0 < c < 2^26 to prevent overflow. -+ * @freq: Frequency, in Hz. Range: 2^23 < freq < 2^30 (~8MHz to ~1GHz) -+ * @voltage: Voltage, in mV. Range: 2^9 < voltage < 2^13 (~0.5V to ~8V) -+ * -+ * Keep a record of the approximate range of each value at every stage of the -+ * calculation, to ensure we don't overflow. This makes heavy use of the -+ * approximations 1000 = 2^10 and 1000000 = 2^20, but does the actual -+ * calculations in decimal for increased accuracy. -+ * -+ * Return: Power consumption, in mW. Range: 0 < p < 2^13 (0W to ~8W) -+ */ -+static u32 kbase_scale_dynamic_power(const u32 c, const u32 freq, -+ const u32 voltage) ++void mali_pm_os_resume(void) +{ -+ /* Range: 2^8 < v2 < 2^16 m(V^2) */ -+ const u32 v2 = (voltage * voltage) / 1000; -+ -+ /* Range: 2^3 < f_MHz < 2^10 MHz */ -+ const u32 f_MHz = freq / 1000000; ++ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); + -+ /* Range: 2^11 < v2f_big < 2^26 kHz V^2 */ -+ const u32 v2f_big = v2 * f_MHz; ++ MALI_DEBUG_PRINT(3, ("Mali PM: OS resume\n")); + -+ /* Range: 2^1 < v2f < 2^16 MHz V^2 */ -+ const u32 v2f = v2f_big / 1000; ++ mali_pm_exec_lock(); + -+ /* Range (working backwards from next line): 0 < v2fc < 2^23 uW. -+ * Must be < 2^42 to avoid overflowing the return value. */ -+ const u64 v2fc = (u64) c * (u64) v2f; ++#if defined(DEBUG) ++ mali_pm_state_lock(); + -+ /* Range: 0 < v2fc / 1000 < 2^13 mW */ -+ return v2fc / 1000; -+} ++ /* Assert that things are as we left them in os_suspend(). */ ++ MALI_DEBUG_ASSERT(0 == pd_mask_wanted); ++ MALI_DEBUG_ASSERT(0 == pd_mask_current); ++ MALI_DEBUG_ASSERT(0 == pmu_mask_current); + -+/** -+ * kbase_scale_static_power() - Scale a static power coefficient to an OPP -+ * @c: Static model coefficient, in uW/V^3. Should be in range -+ * 0 < c < 2^32 to prevent overflow. -+ * @voltage: Voltage, in mV. Range: 2^9 < voltage < 2^13 (~0.5V to ~8V) -+ * -+ * Return: Power consumption, in mW. Range: 0 < p < 2^13 (0W to ~8W) -+ */ -+u32 kbase_scale_static_power(const u32 c, const u32 voltage) -+{ -+ /* Range: 2^8 < v2 < 2^16 m(V^2) */ -+ const u32 v2 = (voltage * voltage) / 1000; ++ MALI_DEBUG_ASSERT(MALI_TRUE == mali_pm_domain_all_unused()); + -+ /* Range: 2^17 < v3_big < 2^29 m(V^2) mV */ -+ const u32 v3_big = v2 * voltage; ++ mali_pm_state_unlock(); ++#endif + -+ /* Range: 2^7 < v3 < 2^19 m(V^3) */ -+ const u32 v3 = v3_big / 1000; ++ if (MALI_TRUE == mali_pm_runtime_active) { ++ /* Runtime PM was active, so reset PMU */ ++ if (NULL != pmu) { ++ mali_pmu_reset(pmu); ++ pmu_mask_current = mali_pmu_get_mask(pmu); + -+ /* -+ * Range (working backwards from next line): 0 < v3c_big < 2^33 nW. -+ * The result should be < 2^52 to avoid overflowing the return value. -+ */ -+ const u64 v3c_big = (u64) c * (u64) v3; ++ MALI_DEBUG_PRINT(3, ("Mali PM: OS resume 0x%x \n", pmu_mask_current)); ++ } + -+ /* Range: 0 < v3c_big / 1000000 < 2^13 mW */ -+ return v3c_big / 1000000; -+} ++ mali_pm_update_sync_internal(); ++ } + -+static struct kbase_ipa_model *get_current_model(struct kbase_device *kbdev) -+{ -+ lockdep_assert_held(&kbdev->ipa.lock); ++ mali_pm_exec_unlock(); + -+ if (atomic_read(&kbdev->ipa_use_configured_model)) -+ return kbdev->ipa.configured_model; -+ else -+ return kbdev->ipa.fallback_model; ++ /* Start executing jobs again */ ++ mali_executor_resume(); +} + -+static u32 get_static_power_locked(struct kbase_device *kbdev, -+ struct kbase_ipa_model *model, -+ unsigned long voltage) ++mali_bool mali_pm_runtime_suspend(void) +{ -+ u32 power = 0; -+ int err; -+ u32 power_coeff; ++ mali_bool ret; + -+ lockdep_assert_held(&model->kbdev->ipa.lock); ++ MALI_DEBUG_PRINT(3, ("Mali PM: Runtime suspend\n")); + -+ if (!model->ops->get_static_coeff) -+ model = kbdev->ipa.fallback_model; ++ mali_pm_exec_lock(); + -+ if (model->ops->get_static_coeff) { -+ err = model->ops->get_static_coeff(model, &power_coeff); -+ if (!err) -+ power = kbase_scale_static_power(power_coeff, -+ (u32) voltage); ++ /* ++ * Put SW state directly into "off" state, and do not bother to power ++ * down each power domain, because entire GPU will be powered off ++ * when we return. ++ * For runtime PM suspend, in contrast to OS suspend, there is a race ++ * between this function and the mali_pm_update_sync_internal(), which ++ * is fine... ++ */ ++ ret = mali_pm_common_suspend(); ++ if (MALI_TRUE == ret) { ++ mali_pm_runtime_active = MALI_FALSE; ++ } else { ++ /* ++ * Process the "power up" instead, ++ * which could have been "lost" ++ */ ++ mali_pm_update_sync_internal(); + } + -+ return power; ++ mali_pm_exec_unlock(); ++ ++ return ret; +} + -+#ifdef CONFIG_MALI_PWRSOFT_765 -+static unsigned long kbase_get_static_power(struct devfreq *df, -+ unsigned long voltage) -+#else -+static unsigned long kbase_get_static_power(unsigned long voltage) -+#endif ++void mali_pm_runtime_resume(void) +{ -+ struct kbase_ipa_model *model; -+ u32 power = 0; -+#ifdef CONFIG_MALI_PWRSOFT_765 -+ struct kbase_device *kbdev = dev_get_drvdata(&df->dev); -+#else -+ struct kbase_device *kbdev = kbase_find_device(-1); -+#endif ++ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); + -+ mutex_lock(&kbdev->ipa.lock); ++ mali_pm_exec_lock(); + -+ model = get_current_model(kbdev); -+ power = get_static_power_locked(kbdev, model, voltage); ++ mali_pm_runtime_active = MALI_TRUE; + -+ mutex_unlock(&kbdev->ipa.lock); ++#if defined(DEBUG) ++ ++num_pm_runtime_resume; + -+#ifndef CONFIG_MALI_PWRSOFT_765 -+ kbase_release_device(kbdev); ++ mali_pm_state_lock(); ++ ++ /* ++ * Assert that things are as we left them in runtime_suspend(), ++ * except for pd_mask_wanted which normally will be the reason we ++ * got here (job queued => domains wanted) ++ */ ++ MALI_DEBUG_ASSERT(0 == pd_mask_current); ++ MALI_DEBUG_ASSERT(0 == pmu_mask_current); ++ ++ mali_pm_state_unlock(); +#endif + -+ return power; ++ if (NULL != pmu) { ++ mali_pmu_reset(pmu); ++ pmu_mask_current = mali_pmu_get_mask(pmu); ++ MALI_DEBUG_PRINT(3, ("Mali PM: Runtime resume 0x%x \n", pmu_mask_current)); ++ } ++ ++ /* ++ * Normally we are resumed because a job has just been queued. ++ * pd_mask_wanted should thus be != 0. ++ * It is however possible for others to take a Mali Runtime PM ref ++ * without having a job queued. ++ * We should however always call mali_pm_update_sync_internal(), ++ * because this will take care of any potential mismatch between ++ * pmu_mask_current and pd_mask_current. ++ */ ++ mali_pm_update_sync_internal(); ++ ++ mali_pm_exec_unlock(); +} + -+#ifdef CONFIG_MALI_PWRSOFT_765 -+static unsigned long kbase_get_dynamic_power(struct devfreq *df, -+ unsigned long freq, -+ unsigned long voltage) -+#else -+static unsigned long kbase_get_dynamic_power(unsigned long freq, -+ unsigned long voltage) -+#endif ++#if MALI_STATE_TRACKING ++u32 mali_pm_dump_state_domain(struct mali_pm_domain *domain, ++ char *buf, u32 size) +{ -+ struct kbase_ipa_model *model; -+ u32 power_coeff = 0, power = 0; -+ int err = 0; -+#ifdef CONFIG_MALI_PWRSOFT_765 -+ struct kbase_device *kbdev = dev_get_drvdata(&df->dev); -+#else -+ struct kbase_device *kbdev = kbase_find_device(-1); -+#endif ++ int n = 0; + -+ mutex_lock(&kbdev->ipa.lock); ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\tPower domain: id %u\n", ++ mali_pm_domain_get_id(domain)); + -+ model = kbdev->ipa.fallback_model; ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\t\tMask: 0x%04x\n", ++ mali_pm_domain_get_mask(domain)); + -+ err = model->ops->get_dynamic_coeff(model, &power_coeff, freq); ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\t\tUse count: %u\n", ++ mali_pm_domain_get_use_count(domain)); + -+ if (!err) -+ power = kbase_scale_dynamic_power(power_coeff, freq, voltage); -+ else -+ dev_err_ratelimited(kbdev->dev, -+ "Model %s returned error code %d\n", -+ model->ops->name, err); ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\t\tCurrent power state: %s\n", ++ (mali_pm_domain_get_mask(domain) & pd_mask_current) ? ++ "On" : "Off"); + -+ mutex_unlock(&kbdev->ipa.lock); ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\t\tWanted power state: %s\n", ++ (mali_pm_domain_get_mask(domain) & pd_mask_wanted) ? ++ "On" : "Off"); + -+#ifndef CONFIG_MALI_PWRSOFT_765 -+ kbase_release_device(kbdev); ++ return n; ++} +#endif + -+ return power; ++static void mali_pm_state_lock(void) ++{ ++ _mali_osk_spinlock_irq_lock(pm_lock_state); +} + -+int kbase_get_real_power(struct devfreq *df, u32 *power, -+ unsigned long freq, -+ unsigned long voltage) ++static void mali_pm_state_unlock(void) +{ -+ struct kbase_ipa_model *model; -+ u32 power_coeff = 0; -+ int err = 0; -+ struct kbase_device *kbdev = dev_get_drvdata(&df->dev); ++ _mali_osk_spinlock_irq_unlock(pm_lock_state); ++} + -+ mutex_lock(&kbdev->ipa.lock); ++void mali_pm_exec_lock(void) ++{ ++ _mali_osk_mutex_wait(pm_lock_exec); ++} + -+ model = get_current_model(kbdev); ++void mali_pm_exec_unlock(void) ++{ ++ _mali_osk_mutex_signal(pm_lock_exec); ++} + -+ err = model->ops->get_dynamic_coeff(model, &power_coeff, freq); ++static void mali_pm_domain_power_up(u32 power_up_mask, ++ struct mali_group *groups_up[MALI_MAX_NUMBER_OF_GROUPS], ++ u32 *num_groups_up, ++ struct mali_l2_cache_core *l2_up[MALI_MAX_NUMBER_OF_L2_CACHE_CORES], ++ u32 *num_l2_up) ++{ ++ u32 domain_bit; ++ u32 notify_mask = power_up_mask; + -+ /* If we switch to protected model between get_current_model() and -+ * get_dynamic_coeff(), counter reading could fail. If that happens -+ * (unlikely, but possible), revert to the fallback model. */ -+ if (err && model != kbdev->ipa.fallback_model) { -+ model = kbdev->ipa.fallback_model; -+ err = model->ops->get_dynamic_coeff(model, &power_coeff, freq); -+ } ++ MALI_DEBUG_ASSERT(0 != power_up_mask); ++ MALI_DEBUG_ASSERT_POINTER(groups_up); ++ MALI_DEBUG_ASSERT_POINTER(num_groups_up); ++ MALI_DEBUG_ASSERT(0 == *num_groups_up); ++ MALI_DEBUG_ASSERT_POINTER(l2_up); ++ MALI_DEBUG_ASSERT_POINTER(num_l2_up); ++ MALI_DEBUG_ASSERT(0 == *num_l2_up); + -+ if (err) -+ goto exit_unlock; ++ MALI_DEBUG_ASSERT_LOCK_HELD(pm_lock_exec); ++ MALI_DEBUG_ASSERT_LOCK_HELD(pm_lock_state); + -+ *power = kbase_scale_dynamic_power(power_coeff, freq, voltage); ++ MALI_DEBUG_PRINT(5, ++ ("PM update: Powering up domains: . [%s]\n", ++ mali_pm_mask_to_string(power_up_mask))); + -+ if (model->ops->do_utilization_scaling_in_framework) { -+ struct devfreq_dev_status *status = &df->last_status; -+ unsigned long total_time = max(status->total_time, 1ul); -+ u64 busy_time = min(status->busy_time, total_time); ++ pd_mask_current |= power_up_mask; + -+ *power = ((u64) *power * (u64) busy_time) / total_time; -+ } ++ domain_bit = _mali_osk_fls(notify_mask); ++ while (0 != domain_bit) { ++ u32 domain_id = domain_bit - 1; ++ struct mali_pm_domain *domain = ++ mali_pm_domain_get_from_index( ++ domain_id); ++ struct mali_l2_cache_core *l2_cache; ++ struct mali_l2_cache_core *l2_cache_tmp; ++ struct mali_group *group; ++ struct mali_group *group_tmp; + -+ *power += get_static_power_locked(kbdev, model, voltage); ++ /* Mark domain as powered up */ ++ mali_pm_domain_set_power_on(domain, MALI_TRUE); + -+exit_unlock: -+ mutex_unlock(&kbdev->ipa.lock); ++ /* ++ * Make a note of the L2 and/or group(s) to notify ++ * (need to release the PM state lock before doing so) ++ */ + -+ return err; ++ _MALI_OSK_LIST_FOREACHENTRY(l2_cache, ++ l2_cache_tmp, ++ mali_pm_domain_get_l2_cache_list( ++ domain), ++ struct mali_l2_cache_core, ++ pm_domain_list) { ++ MALI_DEBUG_ASSERT(*num_l2_up < ++ MALI_MAX_NUMBER_OF_L2_CACHE_CORES); ++ l2_up[*num_l2_up] = l2_cache; ++ (*num_l2_up)++; ++ } ++ ++ _MALI_OSK_LIST_FOREACHENTRY(group, ++ group_tmp, ++ mali_pm_domain_get_group_list(domain), ++ struct mali_group, ++ pm_domain_list) { ++ MALI_DEBUG_ASSERT(*num_groups_up < ++ MALI_MAX_NUMBER_OF_GROUPS); ++ groups_up[*num_groups_up] = group; ++ ++ (*num_groups_up)++; ++ } ++ ++ /* Remove current bit and find next */ ++ notify_mask &= ~(1 << (domain_id)); ++ domain_bit = _mali_osk_fls(notify_mask); ++ } +} -+KBASE_EXPORT_TEST_API(kbase_get_real_power); ++static void mali_pm_domain_power_down(u32 power_down_mask, ++ struct mali_group *groups_down[MALI_MAX_NUMBER_OF_GROUPS], ++ u32 *num_groups_down, ++ struct mali_l2_cache_core *l2_down[MALI_MAX_NUMBER_OF_L2_CACHE_CORES], ++ u32 *num_l2_down) ++{ ++ u32 domain_bit; ++ u32 notify_mask = power_down_mask; + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) -+struct devfreq_cooling_ops kbase_ipa_power_model_ops = { -+#else -+struct devfreq_cooling_power kbase_ipa_power_model_ops = { -+#endif -+ .get_static_power = &kbase_get_static_power, -+ .get_dynamic_power = &kbase_get_dynamic_power, -+}; -+KBASE_EXPORT_TEST_API(kbase_ipa_power_model_ops); -diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa.h -new file mode 100755 -index 000000000000..67478fe911ea ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa.h -@@ -0,0 +1,165 @@ -+/* -+ * -+ * (C) COPYRIGHT 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ MALI_DEBUG_ASSERT(0 != power_down_mask); ++ MALI_DEBUG_ASSERT_POINTER(groups_down); ++ MALI_DEBUG_ASSERT_POINTER(num_groups_down); ++ MALI_DEBUG_ASSERT(0 == *num_groups_down); ++ MALI_DEBUG_ASSERT_POINTER(l2_down); ++ MALI_DEBUG_ASSERT_POINTER(num_l2_down); ++ MALI_DEBUG_ASSERT(0 == *num_l2_down); + ++ MALI_DEBUG_ASSERT_LOCK_HELD(pm_lock_exec); ++ MALI_DEBUG_ASSERT_LOCK_HELD(pm_lock_state); + ++ MALI_DEBUG_PRINT(5, ++ ("PM update: Powering down domains: [%s]\n", ++ mali_pm_mask_to_string(power_down_mask))); + -+#ifndef _KBASE_IPA_H_ -+#define _KBASE_IPA_H_ ++ pd_mask_current &= ~power_down_mask; + -+#if defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) ++ domain_bit = _mali_osk_fls(notify_mask); ++ while (0 != domain_bit) { ++ u32 domain_id = domain_bit - 1; ++ struct mali_pm_domain *domain = ++ mali_pm_domain_get_from_index(domain_id); ++ struct mali_l2_cache_core *l2_cache; ++ struct mali_l2_cache_core *l2_cache_tmp; ++ struct mali_group *group; ++ struct mali_group *group_tmp; + -+struct devfreq; ++ /* Mark domain as powered down */ ++ mali_pm_domain_set_power_on(domain, MALI_FALSE); + -+struct kbase_ipa_model { -+ struct list_head link; -+ struct kbase_device *kbdev; -+ void *model_data; -+ struct kbase_ipa_model_ops *ops; -+ struct list_head params; -+ bool missing_dt_node_warning; -+}; ++ /* ++ * Make a note of the L2s and/or groups to notify ++ * (need to release the PM state lock before doing so) ++ */ + -+/** -+ * kbase_ipa_model_add_param_s32 - Add an integer model parameter -+ * @model: pointer to IPA model -+ * @name: name of corresponding debugfs entry -+ * @addr: address where the value is stored -+ * @num_elems: number of elements (1 if not an array) -+ * @dt_required: if false, a corresponding devicetree entry is not required, -+ * and the current value will be used. If true, a warning is -+ * output and the data is zeroed -+ * -+ * Return: 0 on success, or an error code -+ */ -+int kbase_ipa_model_add_param_s32(struct kbase_ipa_model *model, -+ const char *name, s32 *addr, -+ size_t num_elems, bool dt_required); ++ _MALI_OSK_LIST_FOREACHENTRY(l2_cache, ++ l2_cache_tmp, ++ mali_pm_domain_get_l2_cache_list(domain), ++ struct mali_l2_cache_core, ++ pm_domain_list) { ++ MALI_DEBUG_ASSERT(*num_l2_down < ++ MALI_MAX_NUMBER_OF_L2_CACHE_CORES); ++ l2_down[*num_l2_down] = l2_cache; ++ (*num_l2_down)++; ++ } + -+/** -+ * kbase_ipa_model_add_param_string - Add a string model parameter -+ * @model: pointer to IPA model -+ * @name: name of corresponding debugfs entry -+ * @addr: address where the value is stored -+ * @size: size, in bytes, of the value storage (so the maximum string -+ * length is size - 1) -+ * @dt_required: if false, a corresponding devicetree entry is not required, -+ * and the current value will be used. If true, a warning is -+ * output and the data is zeroed -+ * -+ * Return: 0 on success, or an error code -+ */ -+int kbase_ipa_model_add_param_string(struct kbase_ipa_model *model, -+ const char *name, char *addr, -+ size_t size, bool dt_required); ++ _MALI_OSK_LIST_FOREACHENTRY(group, ++ group_tmp, ++ mali_pm_domain_get_group_list(domain), ++ struct mali_group, ++ pm_domain_list) { ++ MALI_DEBUG_ASSERT(*num_groups_down < ++ MALI_MAX_NUMBER_OF_GROUPS); ++ groups_down[*num_groups_down] = group; ++ (*num_groups_down)++; ++ } + -+struct kbase_ipa_model_ops { -+ char *name; -+ /* The init, recalculate and term ops on the default model are always -+ * called. However, all the other models are only invoked if the model -+ * is selected in the device tree. Otherwise they are never -+ * initialized. Additional resources can be acquired by models in -+ * init(), however they must be terminated in the term(). -+ */ -+ int (*init)(struct kbase_ipa_model *model); -+ /* Called immediately after init(), or when a parameter is changed, so -+ * that any coefficients derived from model parameters can be -+ * recalculated. */ -+ int (*recalculate)(struct kbase_ipa_model *model); -+ void (*term)(struct kbase_ipa_model *model); -+ /* -+ * get_dynamic_coeff() - calculate dynamic power coefficient -+ * @model: pointer to model -+ * @coeffp: pointer to return value location -+ * @current_freq: frequency the GPU has been running at for the -+ * previous sampling period. -+ * -+ * Calculate a dynamic power coefficient, with units pW/(Hz V^2), which -+ * is then scaled by the IPA framework according to the current OPP's -+ * frequency and voltage. -+ * -+ * Return: 0 on success, or an error code. -+ */ -+ int (*get_dynamic_coeff)(struct kbase_ipa_model *model, u32 *coeffp, -+ u32 current_freq); ++ /* Remove current bit and find next */ ++ notify_mask &= ~(1 << (domain_id)); ++ domain_bit = _mali_osk_fls(notify_mask); ++ } ++} ++ ++/* ++ * Execute pending power domain changes ++ * pm_lock_exec lock must be taken by caller. ++ */ ++static void mali_pm_update_sync_internal(void) ++{ + /* -+ * get_static_coeff() - calculate static power coefficient -+ * @model: pointer to model -+ * @coeffp: pointer to return value location -+ * -+ * Calculate a static power coefficient, with units uW/(V^3), which is -+ * scaled by the IPA framework according to the current OPP's voltage. ++ * This should only be called in non-atomic context ++ * (normally as deferred work) + * -+ * Return: 0 on success, or an error code. ++ * Look at the pending power domain changes, and execute these. ++ * Make sure group and schedulers are notified about changes. + */ -+ int (*get_static_coeff)(struct kbase_ipa_model *model, u32 *coeffp); -+ /* If false, the model's get_dynamic_coeff() method accounts for how -+ * long the GPU was active over the sample period. If true, the -+ * framework will scale the calculated power according to the -+ * utilization stats recorded by devfreq in get_real_power(). */ -+ bool do_utilization_scaling_in_framework; -+}; -+ -+/* Models can be registered only in the platform's platform_init_func call */ -+int kbase_ipa_model_ops_register(struct kbase_device *kbdev, -+ struct kbase_ipa_model_ops *new_model_ops); -+struct kbase_ipa_model *kbase_ipa_get_model(struct kbase_device *kbdev, -+ const char *name); + -+int kbase_ipa_init(struct kbase_device *kbdev); -+void kbase_ipa_term(struct kbase_device *kbdev); -+void kbase_ipa_model_use_fallback_locked(struct kbase_device *kbdev); -+void kbase_ipa_model_use_configured_locked(struct kbase_device *kbdev); -+int kbase_ipa_model_recalculate(struct kbase_ipa_model *model); -+struct kbase_ipa_model *kbase_ipa_init_model(struct kbase_device *kbdev, -+ struct kbase_ipa_model_ops *ops); -+void kbase_ipa_term_model(struct kbase_ipa_model *model); ++ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); + -+extern struct kbase_ipa_model_ops kbase_g71_ipa_model_ops; ++ u32 power_down_mask; ++ u32 power_up_mask; + -+#if MALI_UNIT_TEST -+/** -+ * kbase_get_real_power() - get the real power consumption of the GPU -+ * @df: dynamic voltage and frequency scaling information for the GPU. -+ * @power: where to store the power consumption, in mW. -+ * @freq: a frequency, in HZ. -+ * @voltage: a voltage, in mV. -+ * -+ * This function is only exposed for use by unit tests. The returned value -+ * incorporates both static and dynamic power consumption. -+ * -+ * Return: 0 on success, or an error code. -+ */ -+int kbase_get_real_power(struct devfreq *df, u32 *power, -+ unsigned long freq, -+ unsigned long voltage); -+#endif /* MALI_UNIT_TEST */ ++ MALI_DEBUG_ASSERT_LOCK_HELD(pm_lock_exec); + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) -+extern struct devfreq_cooling_ops kbase_ipa_power_model_ops; -+#else -+extern struct devfreq_cooling_power kbase_ipa_power_model_ops; ++#if defined(DEBUG) ++ ++num_pm_updates; +#endif + -+#else /* !(defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL)) */ ++ /* Hold PM state lock while we look at (and obey) the wanted state */ ++ mali_pm_state_lock(); + -+static inline void kbase_ipa_model_use_fallback_locked(struct kbase_device *kbdev) -+{ } ++ MALI_DEBUG_PRINT(5, ("PM update pre: Wanted domain mask: .. [%s]\n", ++ mali_pm_mask_to_string(pd_mask_wanted))); ++ MALI_DEBUG_PRINT(5, ("PM update pre: Current domain mask: . [%s]\n", ++ mali_pm_mask_to_string(pd_mask_current))); ++ MALI_DEBUG_PRINT(5, ("PM update pre: Current PMU mask: .... [%s]\n", ++ mali_pm_mask_to_string(pmu_mask_current))); ++ MALI_DEBUG_PRINT(5, ("PM update pre: Group power stats: ... <%s>\n", ++ mali_pm_group_stats_to_string())); + -+static inline void kbase_ipa_model_use_configured_locked(struct kbase_device *kbdev) -+{ } ++ /* Figure out which cores we need to power on */ ++ power_up_mask = pd_mask_wanted & ++ (pd_mask_wanted ^ pd_mask_current); + -+#endif /* (defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL)) */ ++ if (0 != power_up_mask) { ++ u32 power_up_mask_pmu; ++ struct mali_group *groups_up[MALI_MAX_NUMBER_OF_GROUPS]; ++ u32 num_groups_up = 0; ++ struct mali_l2_cache_core * ++ l2_up[MALI_MAX_NUMBER_OF_L2_CACHE_CORES]; ++ u32 num_l2_up = 0; ++ u32 i; + ++#if defined(DEBUG) ++ ++num_pm_updates_up; +#endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_debugfs.c b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_debugfs.c -new file mode 100755 -index 000000000000..eafc14009ddc ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_debugfs.c -@@ -0,0 +1,219 @@ -+/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ + ++ /* ++ * Make sure dummy/global domain is always included when ++ * powering up, since this is controlled by runtime PM, ++ * and device power is on at this stage. ++ */ ++ power_up_mask |= MALI_PM_DOMAIN_DUMMY_MASK; + -+#include -+#include -+#include ++ /* Power up only real PMU domains */ ++ power_up_mask_pmu = power_up_mask & ~MALI_PM_DOMAIN_DUMMY_MASK; + -+#include "mali_kbase.h" -+#include "mali_kbase_ipa.h" -+#include "mali_kbase_ipa_debugfs.h" ++ /* But not those that happen to be powered on already */ ++ power_up_mask_pmu &= (power_up_mask ^ pmu_mask_current) & ++ power_up_mask; + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)) -+#define DEFINE_DEBUGFS_ATTRIBUTE DEFINE_SIMPLE_ATTRIBUTE -+#endif ++ if (0 != power_up_mask_pmu) { ++ MALI_DEBUG_ASSERT(NULL != pmu); ++ pmu_mask_current |= power_up_mask_pmu; ++ mali_pmu_power_up(pmu, power_up_mask_pmu); ++ } + -+struct kbase_ipa_model_param { -+ char *name; -+ union { -+ void *voidp; -+ s32 *s32p; -+ char *str; -+ } addr; -+ size_t size; -+ enum kbase_ipa_model_param_type type; -+ struct kbase_ipa_model *model; -+ struct list_head link; -+}; ++ /* ++ * Put the domains themselves in power up state. ++ * We get the groups and L2s to notify in return. ++ */ ++ mali_pm_domain_power_up(power_up_mask, ++ groups_up, &num_groups_up, ++ l2_up, &num_l2_up); + -+static int param_int_get(void *data, u64 *val) -+{ -+ struct kbase_ipa_model_param *param = data; ++ /* Need to unlock PM state lock before notifying L2 + groups */ ++ mali_pm_state_unlock(); + -+ mutex_lock(¶m->model->kbdev->ipa.lock); -+ *(s64 *) val = *param->addr.s32p; -+ mutex_unlock(¶m->model->kbdev->ipa.lock); ++ /* Notify each L2 cache that we have be powered up */ ++ for (i = 0; i < num_l2_up; i++) { ++ mali_l2_cache_power_up(l2_up[i]); ++ } + -+ return 0; -+} ++ /* ++ * Tell execution module about all the groups we have ++ * powered up. Groups will be notified as a result of this. ++ */ ++ mali_executor_group_power_up(groups_up, num_groups_up); + -+static int param_int_set(void *data, u64 val) -+{ -+ struct kbase_ipa_model_param *param = data; -+ struct kbase_ipa_model *model = param->model; -+ s64 sval = (s64) val; -+ int err = 0; ++ /* Lock state again before checking for power down */ ++ mali_pm_state_lock(); ++ } + -+ if (sval < S32_MIN || sval > S32_MAX) -+ return -ERANGE; ++ /* Figure out which cores we need to power off */ ++ power_down_mask = pd_mask_current & ++ (pd_mask_wanted ^ pd_mask_current); + -+ mutex_lock(¶m->model->kbdev->ipa.lock); -+ *param->addr.s32p = val; -+ err = kbase_ipa_model_recalculate(model); -+ mutex_unlock(¶m->model->kbdev->ipa.lock); ++ /* ++ * Never power down the dummy/global domain here. This is to be done ++ * from a suspend request (since this domain is only physicall powered ++ * down at that point) ++ */ ++ power_down_mask &= ~MALI_PM_DOMAIN_DUMMY_MASK; + -+ return err; -+} ++ if (0 != power_down_mask) { ++ u32 power_down_mask_pmu; ++ struct mali_group *groups_down[MALI_MAX_NUMBER_OF_GROUPS]; ++ u32 num_groups_down = 0; ++ struct mali_l2_cache_core * ++ l2_down[MALI_MAX_NUMBER_OF_L2_CACHE_CORES]; ++ u32 num_l2_down = 0; ++ u32 i; + -+DEFINE_DEBUGFS_ATTRIBUTE(fops_s32, param_int_get, param_int_set, "%lld\n"); ++#if defined(DEBUG) ++ ++num_pm_updates_down; ++#endif + -+static ssize_t param_string_get(struct file *file, char __user *user_buf, -+ size_t count, loff_t *ppos) ++ /* ++ * Put the domains themselves in power down state. ++ * We get the groups and L2s to notify in return. ++ */ ++ mali_pm_domain_power_down(power_down_mask, ++ groups_down, &num_groups_down, ++ l2_down, &num_l2_down); ++ ++ /* Need to unlock PM state lock before notifying L2 + groups */ ++ mali_pm_state_unlock(); ++ ++ /* ++ * Tell execution module about all the groups we will be ++ * powering down. Groups will be notified as a result of this. ++ */ ++ if (0 < num_groups_down) { ++ mali_executor_group_power_down(groups_down, num_groups_down); ++ } ++ ++ /* Notify each L2 cache that we will be powering down */ ++ for (i = 0; i < num_l2_down; i++) { ++ mali_l2_cache_power_down(l2_down[i]); ++ } ++ ++ /* ++ * Power down only PMU domains which should not stay on ++ * Some domains might for instance currently be incorrectly ++ * powered up if default domain power state is all on. ++ */ ++ power_down_mask_pmu = pmu_mask_current & (~pd_mask_current); ++ ++ if (0 != power_down_mask_pmu) { ++ MALI_DEBUG_ASSERT(NULL != pmu); ++ pmu_mask_current &= ~power_down_mask_pmu; ++ mali_pmu_power_down(pmu, power_down_mask_pmu); ++ ++ } ++ } else { ++ /* ++ * Power down only PMU domains which should not stay on ++ * Some domains might for instance currently be incorrectly ++ * powered up if default domain power state is all on. ++ */ ++ u32 power_down_mask_pmu; ++ ++ /* No need for state lock since we'll only update PMU */ ++ mali_pm_state_unlock(); ++ ++ power_down_mask_pmu = pmu_mask_current & (~pd_mask_current); ++ ++ if (0 != power_down_mask_pmu) { ++ MALI_DEBUG_ASSERT(NULL != pmu); ++ pmu_mask_current &= ~power_down_mask_pmu; ++ mali_pmu_power_down(pmu, power_down_mask_pmu); ++ } ++ } ++ ++ MALI_DEBUG_PRINT(5, ("PM update post: Current domain mask: . [%s]\n", ++ mali_pm_mask_to_string(pd_mask_current))); ++ MALI_DEBUG_PRINT(5, ("PM update post: Current PMU mask: .... [%s]\n", ++ mali_pm_mask_to_string(pmu_mask_current))); ++ MALI_DEBUG_PRINT(5, ("PM update post: Group power stats: ... <%s>\n", ++ mali_pm_group_stats_to_string())); ++} ++ ++static mali_bool mali_pm_common_suspend(void) +{ -+ struct kbase_ipa_model_param *param = file->private_data; -+ ssize_t ret; -+ size_t len; ++ mali_pm_state_lock(); + -+ mutex_lock(¶m->model->kbdev->ipa.lock); -+ len = strnlen(param->addr.str, param->size - 1) + 1; -+ ret = simple_read_from_buffer(user_buf, count, ppos, -+ param->addr.str, len); -+ mutex_unlock(¶m->model->kbdev->ipa.lock); ++ if (0 != pd_mask_wanted) { ++ MALI_DEBUG_PRINT(5, ("PM: Aborting suspend operation\n\n\n")); ++ mali_pm_state_unlock(); ++ return MALI_FALSE; ++ } + -+ return ret; ++ MALI_DEBUG_PRINT(5, ("PM suspend pre: Wanted domain mask: .. [%s]\n", ++ mali_pm_mask_to_string(pd_mask_wanted))); ++ MALI_DEBUG_PRINT(5, ("PM suspend pre: Current domain mask: . [%s]\n", ++ mali_pm_mask_to_string(pd_mask_current))); ++ MALI_DEBUG_PRINT(5, ("PM suspend pre: Current PMU mask: .... [%s]\n", ++ mali_pm_mask_to_string(pmu_mask_current))); ++ MALI_DEBUG_PRINT(5, ("PM suspend pre: Group power stats: ... <%s>\n", ++ mali_pm_group_stats_to_string())); ++ ++ if (0 != pd_mask_current) { ++ /* ++ * We have still some domains powered on. ++ * It is for instance very normal that at least the ++ * dummy/global domain is marked as powered on at this point. ++ * (because it is physically powered on until this function ++ * returns) ++ */ ++ ++ struct mali_group *groups_down[MALI_MAX_NUMBER_OF_GROUPS]; ++ u32 num_groups_down = 0; ++ struct mali_l2_cache_core * ++ l2_down[MALI_MAX_NUMBER_OF_L2_CACHE_CORES]; ++ u32 num_l2_down = 0; ++ u32 i; ++ ++ /* ++ * Put the domains themselves in power down state. ++ * We get the groups and L2s to notify in return. ++ */ ++ mali_pm_domain_power_down(pd_mask_current, ++ groups_down, ++ &num_groups_down, ++ l2_down, ++ &num_l2_down); ++ ++ MALI_DEBUG_ASSERT(0 == pd_mask_current); ++ MALI_DEBUG_ASSERT(MALI_TRUE == mali_pm_domain_all_unused()); ++ ++ /* Need to unlock PM state lock before notifying L2 + groups */ ++ mali_pm_state_unlock(); ++ ++ /* ++ * Tell execution module about all the groups we will be ++ * powering down. Groups will be notified as a result of this. ++ */ ++ if (0 < num_groups_down) { ++ mali_executor_group_power_down(groups_down, num_groups_down); ++ } ++ ++ /* Notify each L2 cache that we will be powering down */ ++ for (i = 0; i < num_l2_down; i++) { ++ mali_l2_cache_power_down(l2_down[i]); ++ } ++ ++ pmu_mask_current = 0; ++ } else { ++ MALI_DEBUG_ASSERT(0 == pmu_mask_current); ++ ++ MALI_DEBUG_ASSERT(MALI_TRUE == mali_pm_domain_all_unused()); ++ ++ mali_pm_state_unlock(); ++ } ++ ++ MALI_DEBUG_PRINT(5, ("PM suspend post: Current domain mask: [%s]\n", ++ mali_pm_mask_to_string(pd_mask_current))); ++ MALI_DEBUG_PRINT(5, ("PM suspend post: Current PMU mask: ... [%s]\n", ++ mali_pm_mask_to_string(pmu_mask_current))); ++ MALI_DEBUG_PRINT(5, ("PM suspend post: Group power stats: .. <%s>\n", ++ mali_pm_group_stats_to_string())); ++ ++ return MALI_TRUE; +} + -+static ssize_t param_string_set(struct file *file, const char __user *user_buf, -+ size_t count, loff_t *ppos) ++static void mali_pm_update_work(void *data) +{ -+ struct kbase_ipa_model_param *param = file->private_data; -+ struct kbase_ipa_model *model = param->model; -+ ssize_t ret = count; -+ size_t buf_size; -+ int err; ++ MALI_IGNORE(data); ++ mali_pm_update_sync(); ++} + -+ mutex_lock(&model->kbdev->ipa.lock); ++static _mali_osk_errcode_t mali_pm_create_pm_domains(void) ++{ ++ int i; + -+ if (count > param->size) { -+ ret = -EINVAL; -+ goto end; ++ /* Create all domains (including dummy domain) */ ++ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { ++ if (0x0 == domain_config[i]) continue; ++ ++ if (NULL == mali_pm_domain_create(domain_config[i])) { ++ return _MALI_OSK_ERR_NOMEM; ++ } + } + -+ buf_size = min(param->size - 1, count); -+ if (copy_from_user(param->addr.str, user_buf, buf_size)) { -+ ret = -EFAULT; -+ goto end; ++ return _MALI_OSK_ERR_OK; ++} ++ ++static void mali_pm_set_default_pm_domain_config(void) ++{ ++ MALI_DEBUG_ASSERT(0 != _mali_osk_resource_base_address()); ++ ++ /* GP core */ ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( ++ MALI_OFFSET_GP, NULL)) { ++ domain_config[MALI_DOMAIN_INDEX_GP] = 0x01; + } + -+ param->addr.str[buf_size] = '\0'; ++ /* PP0 - PP3 core */ ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( ++ MALI_OFFSET_PP0, NULL)) { ++ if (mali_is_mali400()) { ++ domain_config[MALI_DOMAIN_INDEX_PP0] = 0x01 << 2; ++ } else if (mali_is_mali450()) { ++ domain_config[MALI_DOMAIN_INDEX_PP0] = 0x01 << 1; ++ } else if (mali_is_mali470()) { ++ domain_config[MALI_DOMAIN_INDEX_PP0] = 0x01 << 0; ++ } ++ } + -+ err = kbase_ipa_model_recalculate(model); -+ if (err < 0) -+ ret = err; ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( ++ MALI_OFFSET_PP1, NULL)) { ++ if (mali_is_mali400()) { ++ domain_config[MALI_DOMAIN_INDEX_PP1] = 0x01 << 3; ++ } else if (mali_is_mali450()) { ++ domain_config[MALI_DOMAIN_INDEX_PP1] = 0x01 << 2; ++ } else if (mali_is_mali470()) { ++ domain_config[MALI_DOMAIN_INDEX_PP1] = 0x01 << 1; ++ } ++ } + -+end: -+ mutex_unlock(&model->kbdev->ipa.lock); ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( ++ MALI_OFFSET_PP2, NULL)) { ++ if (mali_is_mali400()) { ++ domain_config[MALI_DOMAIN_INDEX_PP2] = 0x01 << 4; ++ } else if (mali_is_mali450()) { ++ domain_config[MALI_DOMAIN_INDEX_PP2] = 0x01 << 2; ++ } else if (mali_is_mali470()) { ++ domain_config[MALI_DOMAIN_INDEX_PP2] = 0x01 << 1; ++ } ++ } + -+ return ret; -+} ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( ++ MALI_OFFSET_PP3, NULL)) { ++ if (mali_is_mali400()) { ++ domain_config[MALI_DOMAIN_INDEX_PP3] = 0x01 << 5; ++ } else if (mali_is_mali450()) { ++ domain_config[MALI_DOMAIN_INDEX_PP3] = 0x01 << 2; ++ } else if (mali_is_mali470()) { ++ domain_config[MALI_DOMAIN_INDEX_PP3] = 0x01 << 1; ++ } ++ } + -+static const struct file_operations fops_string = { -+ .read = param_string_get, -+ .write = param_string_set, -+ .open = simple_open, -+ .llseek = default_llseek, -+}; ++ /* PP4 - PP7 */ ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( ++ MALI_OFFSET_PP4, NULL)) { ++ domain_config[MALI_DOMAIN_INDEX_PP4] = 0x01 << 3; ++ } + -+int kbase_ipa_model_param_add(struct kbase_ipa_model *model, const char *name, -+ void *addr, size_t size, -+ enum kbase_ipa_model_param_type type) -+{ -+ struct kbase_ipa_model_param *param; ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( ++ MALI_OFFSET_PP5, NULL)) { ++ domain_config[MALI_DOMAIN_INDEX_PP5] = 0x01 << 3; ++ } + -+ param = kzalloc(sizeof(*param), GFP_KERNEL); ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( ++ MALI_OFFSET_PP6, NULL)) { ++ domain_config[MALI_DOMAIN_INDEX_PP6] = 0x01 << 3; ++ } + -+ if (!param) -+ return -ENOMEM; ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( ++ MALI_OFFSET_PP7, NULL)) { ++ domain_config[MALI_DOMAIN_INDEX_PP7] = 0x01 << 3; ++ } + -+ /* 'name' is stack-allocated for array elements, so copy it into -+ * heap-allocated storage */ -+ param->name = kstrdup(name, GFP_KERNEL); -+ param->addr.voidp = addr; -+ param->size = size; -+ param->type = type; -+ param->model = model; ++ /* L2gp/L2PP0/L2PP4 */ ++ if (mali_is_mali400()) { ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( ++ MALI400_OFFSET_L2_CACHE0, NULL)) { ++ domain_config[MALI_DOMAIN_INDEX_L20] = 0x01 << 1; ++ } ++ } else if (mali_is_mali450()) { ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( ++ MALI450_OFFSET_L2_CACHE0, NULL)) { ++ domain_config[MALI_DOMAIN_INDEX_L20] = 0x01 << 0; ++ } + -+ list_add(¶m->link, &model->params); ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( ++ MALI450_OFFSET_L2_CACHE1, NULL)) { ++ domain_config[MALI_DOMAIN_INDEX_L21] = 0x01 << 1; ++ } + -+ return 0; ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( ++ MALI450_OFFSET_L2_CACHE2, NULL)) { ++ domain_config[MALI_DOMAIN_INDEX_L22] = 0x01 << 3; ++ } ++ } else if (mali_is_mali470()) { ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( ++ MALI470_OFFSET_L2_CACHE1, NULL)) { ++ domain_config[MALI_DOMAIN_INDEX_L21] = 0x01 << 0; ++ } ++ } +} + -+void kbase_ipa_model_param_free_all(struct kbase_ipa_model *model) ++static u32 mali_pm_get_registered_cores_mask(void) +{ -+ struct kbase_ipa_model_param *param_p, *param_n; ++ int i = 0; ++ u32 mask = 0; + -+ list_for_each_entry_safe(param_p, param_n, &model->params, link) { -+ list_del(¶m_p->link); -+ kfree(param_p->name); -+ kfree(param_p); ++ for (i = 0; i < MALI_DOMAIN_INDEX_DUMMY; i++) { ++ mask |= domain_config[i]; + } ++ ++ return mask; +} + -+static void kbase_ipa_model_debugfs_init(struct kbase_ipa_model *model) ++static void mali_pm_set_pmu_domain_config(void) +{ -+ struct list_head *it; -+ struct dentry *dir; -+ -+ lockdep_assert_held(&model->kbdev->ipa.lock); ++ int i = 0; + -+ dir = debugfs_create_dir(model->ops->name, -+ model->kbdev->mali_debugfs_directory); ++ _mali_osk_device_data_pmu_config_get(domain_config, MALI_MAX_NUMBER_OF_DOMAINS - 1); + -+ if (!dir) { -+ dev_err(model->kbdev->dev, -+ "Couldn't create mali debugfs %s directory", -+ model->ops->name); -+ return; ++ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS - 1; i++) { ++ if (0 != domain_config[i]) { ++ MALI_DEBUG_PRINT(2, ("Using customer pmu config:\n")); ++ break; ++ } + } + -+ list_for_each(it, &model->params) { -+ struct kbase_ipa_model_param *param = -+ list_entry(it, -+ struct kbase_ipa_model_param, -+ link); -+ const struct file_operations *fops = NULL; ++ if (MALI_MAX_NUMBER_OF_DOMAINS - 1 == i) { ++ MALI_DEBUG_PRINT(2, ("Using hw detect pmu config:\n")); ++ mali_pm_set_default_pm_domain_config(); ++ } + -+ switch (param->type) { -+ case PARAM_TYPE_S32: -+ fops = &fops_s32; -+ break; -+ case PARAM_TYPE_STRING: -+ fops = &fops_string; -+ break; ++ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS - 1; i++) { ++ if (domain_config[i]) { ++ MALI_DEBUG_PRINT(2, ("domain_config[%d] = 0x%x \n", i, domain_config[i])); + } ++ } ++ /* Can't override dummy domain mask */ ++ domain_config[MALI_DOMAIN_INDEX_DUMMY] = ++ 1 << MALI_DOMAIN_INDEX_DUMMY; ++} + -+ if (unlikely(!fops)) { -+ dev_err(model->kbdev->dev, -+ "Type not set for %s parameter %s\n", -+ model->ops->name, param->name); ++#if defined(DEBUG) ++const char *mali_pm_mask_to_string(u32 mask) ++{ ++ static char bit_str[MALI_MAX_NUMBER_OF_DOMAINS + 1]; ++ int bit; ++ int str_pos = 0; ++ ++ /* Must be protected by lock since we use shared string buffer */ ++ if (NULL != pm_lock_exec) { ++ MALI_DEBUG_ASSERT_LOCK_HELD(pm_lock_exec); ++ } ++ ++ for (bit = MALI_MAX_NUMBER_OF_DOMAINS - 1; bit >= 0; bit--) { ++ if (mask & (1 << bit)) { ++ bit_str[str_pos] = 'X'; + } else { -+ debugfs_create_file(param->name, S_IRUGO | S_IWUSR, -+ dir, param, fops); ++ bit_str[str_pos] = '-'; + } ++ str_pos++; + } ++ ++ bit_str[MALI_MAX_NUMBER_OF_DOMAINS] = '\0'; ++ ++ return bit_str; +} + -+void kbase_ipa_debugfs_init(struct kbase_device *kbdev) ++const char *mali_pm_group_stats_to_string(void) +{ -+ mutex_lock(&kbdev->ipa.lock); ++ static char bit_str[MALI_MAX_NUMBER_OF_GROUPS + 1]; ++ u32 num_groups = mali_group_get_glob_num_groups(); ++ u32 i; + -+ if (kbdev->ipa.configured_model != kbdev->ipa.fallback_model) -+ kbase_ipa_model_debugfs_init(kbdev->ipa.configured_model); -+ kbase_ipa_model_debugfs_init(kbdev->ipa.fallback_model); ++ /* Must be protected by lock since we use shared string buffer */ ++ if (NULL != pm_lock_exec) { ++ MALI_DEBUG_ASSERT_LOCK_HELD(pm_lock_exec); ++ } + -+ mutex_unlock(&kbdev->ipa.lock); ++ for (i = 0; i < num_groups && i < MALI_MAX_NUMBER_OF_GROUPS; i++) { ++ struct mali_group *group; ++ ++ group = mali_group_get_glob_group(i); ++ ++ if (MALI_TRUE == mali_group_power_is_on(group)) { ++ bit_str[i] = 'X'; ++ } else { ++ bit_str[i] = '-'; ++ } ++ } ++ ++ bit_str[i] = '\0'; ++ ++ return bit_str; +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_debugfs.h b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_debugfs.h -new file mode 100755 -index 000000000000..ec06e2096f94 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_debugfs.h -@@ -0,0 +1,49 @@ ++#endif ++ +/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * num_pp is the number of PP cores which will be powered on given this mask ++ * cost is the total power cost of cores which will be powered on given this mask + */ ++static void mali_pm_stat_from_mask(u32 mask, u32 *num_pp, u32 *cost) ++{ ++ u32 i; + ++ /* loop through all cores */ ++ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { ++ if (!(domain_config[i] & mask)) { ++ continue; ++ } + ++ switch (i) { ++ case MALI_DOMAIN_INDEX_GP: ++ *cost += MALI_GP_COST; + -+#ifndef _KBASE_IPA_DEBUGFS_H_ -+#define _KBASE_IPA_DEBUGFS_H_ ++ break; ++ case MALI_DOMAIN_INDEX_PP0: /* Fall through */ ++ case MALI_DOMAIN_INDEX_PP1: /* Fall through */ ++ case MALI_DOMAIN_INDEX_PP2: /* Fall through */ ++ case MALI_DOMAIN_INDEX_PP3: ++ if (mali_is_mali400()) { ++ if ((domain_config[MALI_DOMAIN_INDEX_L20] & mask) ++ || (domain_config[MALI_DOMAIN_INDEX_DUMMY] ++ == domain_config[MALI_DOMAIN_INDEX_L20])) { ++ *num_pp += 1; ++ } ++ } else { ++ if ((domain_config[MALI_DOMAIN_INDEX_L21] & mask) ++ || (domain_config[MALI_DOMAIN_INDEX_DUMMY] ++ == domain_config[MALI_DOMAIN_INDEX_L21])) { ++ *num_pp += 1; ++ } ++ } + -+enum kbase_ipa_model_param_type { -+ PARAM_TYPE_S32 = 1, -+ PARAM_TYPE_STRING, -+}; ++ *cost += MALI_PP_COST; ++ break; ++ case MALI_DOMAIN_INDEX_PP4: /* Fall through */ ++ case MALI_DOMAIN_INDEX_PP5: /* Fall through */ ++ case MALI_DOMAIN_INDEX_PP6: /* Fall through */ ++ case MALI_DOMAIN_INDEX_PP7: ++ MALI_DEBUG_ASSERT(mali_is_mali450()); + -+#ifdef CONFIG_DEBUG_FS ++ if ((domain_config[MALI_DOMAIN_INDEX_L22] & mask) ++ || (domain_config[MALI_DOMAIN_INDEX_DUMMY] ++ == domain_config[MALI_DOMAIN_INDEX_L22])) { ++ *num_pp += 1; ++ } + -+void kbase_ipa_debugfs_init(struct kbase_device *kbdev); -+int kbase_ipa_model_param_add(struct kbase_ipa_model *model, const char *name, -+ void *addr, size_t size, -+ enum kbase_ipa_model_param_type type); -+void kbase_ipa_model_param_free_all(struct kbase_ipa_model *model); ++ *cost += MALI_PP_COST; ++ break; ++ case MALI_DOMAIN_INDEX_L20: /* Fall through */ ++ case MALI_DOMAIN_INDEX_L21: /* Fall through */ ++ case MALI_DOMAIN_INDEX_L22: ++ *cost += MALI_L2_COST; + -+#else /* CONFIG_DEBUG_FS */ ++ break; ++ } ++ } ++} + -+static inline int kbase_ipa_model_param_add(struct kbase_ipa_model *model, -+ const char *name, void *addr, -+ size_t size, -+ enum kbase_ipa_model_param_type type) ++void mali_pm_power_cost_setup(void) +{ -+ return 0; -+} ++ /* ++ * Two parallel arrays which store the best domain mask and its cost ++ * The index is the number of PP cores, E.g. Index 0 is for 1 PP option, ++ * might have mask 0x2 and with cost of 1, lower cost is better ++ */ ++ u32 best_mask[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS] = { 0 }; ++ u32 best_cost[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS] = { 0 }; ++ /* Array cores_in_domain is used to store the total pp cores in each pm domain. */ ++ u32 cores_in_domain[MALI_MAX_NUMBER_OF_DOMAINS] = { 0 }; ++ /* Domain_count is used to represent the max domain we have.*/ ++ u32 max_domain_mask = 0; ++ u32 max_domain_id = 0; ++ u32 always_on_pp_cores = 0; + -+static inline void kbase_ipa_model_param_free_all(struct kbase_ipa_model *model) -+{ } ++ u32 num_pp, cost, mask; ++ u32 i, j , k; + -+#endif /* CONFIG_DEBUG_FS */ ++ /* Initialize statistics */ ++ for (i = 0; i < MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS; i++) { ++ best_mask[i] = 0; ++ best_cost[i] = 0xFFFFFFFF; /* lower cost is better */ ++ } + -+#endif /* _KBASE_IPA_DEBUGFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_simple.c b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_simple.c -new file mode 100755 -index 000000000000..b35cea451765 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_simple.c -@@ -0,0 +1,327 @@ -+/* -+ * -+ * (C) COPYRIGHT 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ for (i = 0; i < MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS + 1; i++) { ++ for (j = 0; j < MALI_MAX_NUMBER_OF_DOMAINS; j++) { ++ mali_pm_domain_power_cost_result[i][j] = 0; ++ } ++ } + ++ /* Caculate number of pp cores of a given domain config. */ ++ for (i = MALI_DOMAIN_INDEX_PP0; i <= MALI_DOMAIN_INDEX_PP7; i++) { ++ if (0 < domain_config[i]) { ++ /* Get the max domain mask value used to caculate power cost ++ * and we don't count in always on pp cores. */ ++ if (MALI_PM_DOMAIN_DUMMY_MASK != domain_config[i] ++ && max_domain_mask < domain_config[i]) { ++ max_domain_mask = domain_config[i]; ++ } + ++ if (MALI_PM_DOMAIN_DUMMY_MASK == domain_config[i]) { ++ always_on_pp_cores++; ++ } ++ } ++ } ++ max_domain_id = _mali_osk_fls(max_domain_mask); + -+#include -+#include -+#ifdef CONFIG_DEVFREQ_THERMAL -+#include -+#endif -+#include -+#include -+#include ++ /* ++ * Try all combinations of power domains and check how many PP cores ++ * they have and their power cost. ++ */ ++ for (mask = 0; mask < (1 << max_domain_id); mask++) { ++ num_pp = 0; ++ cost = 0; + -+#include "mali_kbase.h" -+#include "mali_kbase_defs.h" -+#include "mali_kbase_ipa_simple.h" -+#include "mali_kbase_ipa_debugfs.h" ++ mali_pm_stat_from_mask(mask, &num_pp, &cost); + -+#if MALI_UNIT_TEST ++ /* This mask is usable for all MP1 up to num_pp PP cores, check statistics for all */ ++ for (i = 0; i < num_pp; i++) { ++ if (best_cost[i] >= cost) { ++ best_cost[i] = cost; ++ best_mask[i] = mask; ++ } ++ } ++ } + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) -+static unsigned long dummy_temp; ++ /* ++ * If we want to enable x pp cores, if x is less than number of always_on pp cores, ++ * all of pp cores we will enable must be always_on pp cores. ++ */ ++ for (i = 0; i < mali_executor_get_num_cores_total(); i++) { ++ if (i < always_on_pp_cores) { ++ mali_pm_domain_power_cost_result[i + 1][MALI_MAX_NUMBER_OF_DOMAINS - 1] ++ = i + 1; ++ } else { ++ mali_pm_domain_power_cost_result[i + 1][MALI_MAX_NUMBER_OF_DOMAINS - 1] ++ = always_on_pp_cores; ++ } ++ } + -+static int kbase_simple_power_model_get_dummy_temp( -+ struct thermal_zone_device *tz, -+ unsigned long *temp) -+{ -+ *temp = READ_ONCE(dummy_temp); -+ return 0; -+} ++ /* In this loop, variable i represent for the number of non-always on pp cores we want to enabled. */ ++ for (i = 0; i < (mali_executor_get_num_cores_total() - always_on_pp_cores); i++) { ++ if (best_mask[i] == 0) { ++ /* This MP variant is not available */ ++ continue; ++ } + -+#else -+static int dummy_temp; ++ for (j = 0; j < MALI_MAX_NUMBER_OF_DOMAINS; j++) { ++ cores_in_domain[j] = 0; ++ } + -+static int kbase_simple_power_model_get_dummy_temp( -+ struct thermal_zone_device *tz, -+ int *dummy_temp) ++ for (j = MALI_DOMAIN_INDEX_PP0; j <= MALI_DOMAIN_INDEX_PP7; j++) { ++ if (0 < domain_config[j] ++ && (MALI_PM_DOMAIN_DUMMY_MASK != domain_config[i])) { ++ cores_in_domain[_mali_osk_fls(domain_config[j]) - 1]++; ++ } ++ } ++ ++ /* In this loop, j represent for the number we have already enabled.*/ ++ for (j = 0; j <= i;) { ++ /* j used to visit all of domain to get the number of pp cores remained in it. */ ++ for (k = 0; k < max_domain_id; k++) { ++ /* If domain k in best_mask[i] is enabled and this domain has extra pp cores, ++ * we know we must pick at least one pp core from this domain. ++ * And then we move to next enabled pm domain. */ ++ if ((best_mask[i] & (0x1 << k)) && (0 < cores_in_domain[k])) { ++ cores_in_domain[k]--; ++ mali_pm_domain_power_cost_result[always_on_pp_cores + i + 1][k]++; ++ j++; ++ if (j > i) { ++ break; ++ } ++ } ++ } ++ } ++ } ++} ++ ++/* ++ * When we are doing core scaling, ++ * this function is called to return the best mask to ++ * achieve the best pp group power cost. ++ */ ++void mali_pm_get_best_power_cost_mask(int num_requested, int *dst) +{ -+ *temp = READ_ONCE(dummy_temp); -+ return 0; ++ MALI_DEBUG_ASSERT((mali_executor_get_num_cores_total() >= num_requested) && (0 <= num_requested)); ++ ++ _mali_osk_memcpy(dst, mali_pm_domain_power_cost_result[num_requested], MALI_MAX_NUMBER_OF_DOMAINS * sizeof(int)); +} -+#endif + -+/* Intercept calls to the kernel function using a macro */ -+#ifdef thermal_zone_get_temp -+#undef thermal_zone_get_temp -+#endif -+#define thermal_zone_get_temp(tz, temp) \ -+ kbase_simple_power_model_get_dummy_temp(tz, temp) ++u32 mali_pm_get_current_mask(void) ++{ ++ return pd_mask_current; ++} + -+void kbase_simple_power_model_set_dummy_temp(int temp) ++u32 mali_pm_get_wanted_mask(void) +{ -+ WRITE_ONCE(dummy_temp, temp); ++ return pd_mask_wanted; +} -+KBASE_EXPORT_TEST_API(kbase_simple_power_model_set_dummy_temp); +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm.h b/drivers/gpu/arm/mali400/mali/common/mali_pm.h +new file mode 100755 +index 000000000..dac69958e +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.h +@@ -0,0 +1,91 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+#endif /* MALI_UNIT_TEST */ ++#ifndef __MALI_PM_H__ ++#define __MALI_PM_H__ ++ ++#include "mali_osk.h" ++#include "mali_pm_domain.h" + ++#define MALI_DOMAIN_INDEX_GP 0 ++#define MALI_DOMAIN_INDEX_PP0 1 ++#define MALI_DOMAIN_INDEX_PP1 2 ++#define MALI_DOMAIN_INDEX_PP2 3 ++#define MALI_DOMAIN_INDEX_PP3 4 ++#define MALI_DOMAIN_INDEX_PP4 5 ++#define MALI_DOMAIN_INDEX_PP5 6 ++#define MALI_DOMAIN_INDEX_PP6 7 ++#define MALI_DOMAIN_INDEX_PP7 8 ++#define MALI_DOMAIN_INDEX_L20 9 ++#define MALI_DOMAIN_INDEX_L21 10 ++#define MALI_DOMAIN_INDEX_L22 11 +/* -+ * This model is primarily designed for the Juno platform. It may not be -+ * suitable for other platforms. The additional resources in this model -+ * should preferably be minimal, as this model is rarely used when a dynamic -+ * model is available. ++ * The dummy domain is used when there is no physical power domain ++ * (e.g. no PMU or always on cores) + */ ++#define MALI_DOMAIN_INDEX_DUMMY 12 ++#define MALI_MAX_NUMBER_OF_DOMAINS 13 + +/** -+ * struct kbase_ipa_model_simple_data - IPA context per device -+ * @dynamic_coefficient: dynamic coefficient of the model -+ * @static_coefficient: static coefficient of the model -+ * @ts: Thermal scaling coefficients of the model -+ * @tz_name: Thermal zone name -+ * @gpu_tz: thermal zone device -+ * @poll_temperature_thread: Handle for temperature polling thread -+ * @current_temperature: Most recent value of polled temperature -+ * @temperature_poll_interval_ms: How often temperature should be checked, in ms ++ * Initialize the Mali PM module ++ * ++ * PM module covers Mali PM core, PM domains and Mali PMU + */ -+ -+struct kbase_ipa_model_simple_data { -+ u32 dynamic_coefficient; -+ u32 static_coefficient; -+ s32 ts[4]; -+ char tz_name[16]; -+ struct thermal_zone_device *gpu_tz; -+ struct task_struct *poll_temperature_thread; -+ int current_temperature; -+ int temperature_poll_interval_ms; -+}; -+#define FALLBACK_STATIC_TEMPERATURE 55000 ++_mali_osk_errcode_t mali_pm_initialize(void); + +/** -+ * calculate_temp_scaling_factor() - Calculate temperature scaling coefficient -+ * @ts: Signed coefficients, in order t^0 to t^3, with units Deg^-N -+ * @t: Temperature, in mDeg C. Range: -2^17 < t < 2^17 -+ * -+ * Scale the temperature according to a cubic polynomial whose coefficients are -+ * provided in the device tree. The result is used to scale the static power -+ * coefficient, where 1000000 means no change. -+ * -+ * Return: Temperature scaling factor. Range 0 <= ret <= 10,000,000. ++ * Terminate the Mali PM module + */ -+static u32 calculate_temp_scaling_factor(s32 ts[4], s64 t) -+{ -+ /* Range: -2^24 < t2 < 2^24 m(Deg^2) */ -+ const s64 t2 = (t * t) / 1000; ++void mali_pm_terminate(void); + -+ /* Range: -2^31 < t3 < 2^31 m(Deg^3) */ -+ const s64 t3 = (t * t2) / 1000; ++void mali_pm_exec_lock(void); ++void mali_pm_exec_unlock(void); + -+ /* -+ * Sum the parts. t^[1-3] are in m(Deg^N), but the coefficients are in -+ * Deg^-N, so we need to multiply the last coefficient by 1000. -+ * Range: -2^63 < res_big < 2^63 -+ */ -+ const s64 res_big = ts[3] * t3 /* +/- 2^62 */ -+ + ts[2] * t2 /* +/- 2^55 */ -+ + ts[1] * t /* +/- 2^48 */ -+ + ts[0] * 1000; /* +/- 2^41 */ + -+ /* Range: -2^60 < res_unclamped < 2^60 */ -+ s64 res_unclamped = res_big / 1000; ++struct mali_pm_domain *mali_pm_register_l2_cache(u32 domain_index, ++ struct mali_l2_cache_core *l2_cache); ++struct mali_pm_domain *mali_pm_register_group(u32 domain_index, ++ struct mali_group *group); + -+ /* Clamp to range of 0x to 10x the static power */ -+ return clamp(res_unclamped, (s64) 0, (s64) 10000000); -+} ++mali_bool mali_pm_get_domain_refs(struct mali_pm_domain **domains, ++ struct mali_group **groups, ++ u32 num_domains); ++mali_bool mali_pm_put_domain_refs(struct mali_pm_domain **domains, ++ u32 num_domains); + -+/* We can't call thermal_zone_get_temp() directly in model_static_coeff(), -+ * because we don't know if tz->lock is held in the same thread. So poll it in -+ * a separate thread to get around this. */ -+static int poll_temperature(void *data) -+{ -+ struct kbase_ipa_model_simple_data *model_data = -+ (struct kbase_ipa_model_simple_data *) data; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) -+ unsigned long temp; -+#else -+ int temp; ++void mali_pm_init_begin(void); ++void mali_pm_init_end(void); ++ ++void mali_pm_update_sync(void); ++void mali_pm_update_async(void); ++ ++/* Callback functions for system power management */ ++void mali_pm_os_suspend(mali_bool os_suspend); ++void mali_pm_os_resume(void); ++ ++mali_bool mali_pm_runtime_suspend(void); ++void mali_pm_runtime_resume(void); ++ ++#if MALI_STATE_TRACKING ++u32 mali_pm_dump_state_domain(struct mali_pm_domain *domain, ++ char *buf, u32 size); +#endif + -+ set_freezable(); ++void mali_pm_power_cost_setup(void); + -+ while (!kthread_should_stop()) { -+ struct thermal_zone_device *tz = READ_ONCE(model_data->gpu_tz); ++void mali_pm_get_best_power_cost_mask(int num_requested, int *dst); + -+ if (tz) { -+ int ret; ++#if defined(DEBUG) ++const char *mali_pm_mask_to_string(u32 mask); ++#endif + -+ ret = thermal_zone_get_temp(tz, &temp); -+ if (ret) { -+ pr_warn_ratelimited("Error reading temperature for gpu thermal zone: %d\n", -+ ret); -+ temp = FALLBACK_STATIC_TEMPERATURE; -+ } -+ } else { -+ temp = FALLBACK_STATIC_TEMPERATURE; -+ } ++u32 mali_pm_get_current_mask(void); ++u32 mali_pm_get_wanted_mask(void); ++#endif /* __MALI_PM_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c +new file mode 100755 +index 000000000..8290f7d88 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c +@@ -0,0 +1,209 @@ ++/* ++ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ WRITE_ONCE(model_data->current_temperature, temp); ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_pm_domain.h" ++#include "mali_pmu.h" ++#include "mali_group.h" ++#include "mali_pm.h" + -+ msleep_interruptible(READ_ONCE(model_data->temperature_poll_interval_ms)); ++static struct mali_pm_domain *mali_pm_domains[MALI_MAX_NUMBER_OF_DOMAINS] = ++{ NULL, }; + -+ try_to_freeze(); -+ } ++void mali_pm_domain_initialize(void) ++{ ++ /* Domains will be initialized/created on demand */ ++} + -+ return 0; ++void mali_pm_domain_terminate(void) ++{ ++ int i; ++ ++ /* Delete all domains that has been created */ ++ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { ++ mali_pm_domain_delete(mali_pm_domains[i]); ++ mali_pm_domains[i] = NULL; ++ } +} + -+static int model_static_coeff(struct kbase_ipa_model *model, u32 *coeffp) ++struct mali_pm_domain *mali_pm_domain_create(u32 pmu_mask) +{ -+ u32 temp_scaling_factor; -+ struct kbase_ipa_model_simple_data *model_data = -+ (struct kbase_ipa_model_simple_data *) model->model_data; -+ u64 coeff_big; -+ int temp; ++ struct mali_pm_domain *domain = NULL; ++ u32 domain_id = 0; + -+ temp = READ_ONCE(model_data->current_temperature); ++ domain = mali_pm_domain_get_from_mask(pmu_mask); ++ if (NULL != domain) return domain; + -+ /* Range: 0 <= temp_scaling_factor < 2^24 */ -+ temp_scaling_factor = calculate_temp_scaling_factor(model_data->ts, -+ temp); ++ MALI_DEBUG_PRINT(2, ++ ("Mali PM domain: Creating Mali PM domain (mask=0x%08X)\n", ++ pmu_mask)); + -+ /* -+ * Range: 0 <= coeff_big < 2^52 to avoid overflowing *coeffp. This -+ * means static_coefficient must be in range -+ * 0 <= static_coefficient < 2^28. -+ */ -+ coeff_big = (u64) model_data->static_coefficient * (u64) temp_scaling_factor; -+ *coeffp = coeff_big / 1000000; ++ domain = (struct mali_pm_domain *)_mali_osk_malloc( ++ sizeof(struct mali_pm_domain)); ++ if (NULL != domain) { ++ domain->power_is_on = MALI_FALSE; ++ domain->pmu_mask = pmu_mask; ++ domain->use_count = 0; ++ _mali_osk_list_init(&domain->group_list); ++ _mali_osk_list_init(&domain->l2_cache_list); + -+ return 0; ++ domain_id = _mali_osk_fls(pmu_mask) - 1; ++ /* Verify the domain_id */ ++ MALI_DEBUG_ASSERT(MALI_MAX_NUMBER_OF_DOMAINS > domain_id); ++ /* Verify that pmu_mask only one bit is set */ ++ MALI_DEBUG_ASSERT((1 << domain_id) == pmu_mask); ++ mali_pm_domains[domain_id] = domain; ++ ++ return domain; ++ } else { ++ MALI_DEBUG_PRINT_ERROR(("Unable to create PM domain\n")); ++ } ++ ++ return NULL; +} + -+static int model_dynamic_coeff(struct kbase_ipa_model *model, u32 *coeffp, -+ u32 current_freq) ++void mali_pm_domain_delete(struct mali_pm_domain *domain) +{ -+ struct kbase_ipa_model_simple_data *model_data = -+ (struct kbase_ipa_model_simple_data *) model->model_data; ++ if (NULL == domain) { ++ return; ++ } + -+ *coeffp = model_data->dynamic_coefficient; ++ _mali_osk_list_delinit(&domain->group_list); ++ _mali_osk_list_delinit(&domain->l2_cache_list); + -+ return 0; ++ _mali_osk_free(domain); +} + -+static int add_params(struct kbase_ipa_model *model) ++void mali_pm_domain_add_group(struct mali_pm_domain *domain, ++ struct mali_group *group) +{ -+ int err = 0; -+ struct kbase_ipa_model_simple_data *model_data = -+ (struct kbase_ipa_model_simple_data *)model->model_data; ++ MALI_DEBUG_ASSERT_POINTER(domain); ++ MALI_DEBUG_ASSERT_POINTER(group); + -+ err = kbase_ipa_model_add_param_s32(model, "static-coefficient", -+ &model_data->static_coefficient, -+ 1, true); -+ if (err) -+ goto end; ++ /* ++ * Use addtail because virtual group is created last and it needs ++ * to be at the end of the list (in order to be activated after ++ * all children. ++ */ ++ _mali_osk_list_addtail(&group->pm_domain_list, &domain->group_list); ++} + -+ err = kbase_ipa_model_add_param_s32(model, "dynamic-coefficient", -+ &model_data->dynamic_coefficient, -+ 1, true); -+ if (err) -+ goto end; ++void mali_pm_domain_add_l2_cache(struct mali_pm_domain *domain, ++ struct mali_l2_cache_core *l2_cache) ++{ ++ MALI_DEBUG_ASSERT_POINTER(domain); ++ MALI_DEBUG_ASSERT_POINTER(l2_cache); ++ _mali_osk_list_add(&l2_cache->pm_domain_list, &domain->l2_cache_list); ++} + -+ err = kbase_ipa_model_add_param_s32(model, "ts", -+ model_data->ts, 4, true); -+ if (err) -+ goto end; ++struct mali_pm_domain *mali_pm_domain_get_from_mask(u32 mask) ++{ ++ u32 id = 0; + -+ err = kbase_ipa_model_add_param_string(model, "thermal-zone", -+ model_data->tz_name, -+ sizeof(model_data->tz_name), true); -+ if (err) -+ goto end; ++ if (0 == mask) { ++ return NULL; ++ } + -+ model_data->temperature_poll_interval_ms = 200; -+ err = kbase_ipa_model_add_param_s32(model, "temp-poll-interval-ms", -+ &model_data->temperature_poll_interval_ms, -+ 1, false); ++ id = _mali_osk_fls(mask) - 1; + -+end: -+ return err; ++ MALI_DEBUG_ASSERT(MALI_MAX_NUMBER_OF_DOMAINS > id); ++ /* Verify that pmu_mask only one bit is set */ ++ MALI_DEBUG_ASSERT((1 << id) == mask); ++ ++ return mali_pm_domains[id]; +} + -+static int kbase_simple_power_model_init(struct kbase_ipa_model *model) ++struct mali_pm_domain *mali_pm_domain_get_from_index(u32 id) +{ -+ int err; -+ struct kbase_ipa_model_simple_data *model_data; ++ MALI_DEBUG_ASSERT(MALI_MAX_NUMBER_OF_DOMAINS > id); + -+ model_data = kzalloc(sizeof(struct kbase_ipa_model_simple_data), -+ GFP_KERNEL); -+ if (!model_data) -+ return -ENOMEM; ++ return mali_pm_domains[id]; ++} + -+ model->model_data = (void *) model_data; ++u32 mali_pm_domain_ref_get(struct mali_pm_domain *domain) ++{ ++ MALI_DEBUG_ASSERT_POINTER(domain); + -+ model_data->current_temperature = FALLBACK_STATIC_TEMPERATURE; -+ model_data->poll_temperature_thread = kthread_run(poll_temperature, -+ (void *) model_data, -+ "mali-simple-power-model-temp-poll"); -+ if (IS_ERR(model_data->poll_temperature_thread)) { -+ kfree(model_data); -+ return PTR_ERR(model_data->poll_temperature_thread); ++ if (0 == domain->use_count) { ++ _mali_osk_pm_dev_ref_get_async(); + } + -+ err = add_params(model); -+ if (err) { -+ kbase_ipa_model_param_free_all(model); -+ kthread_stop(model_data->poll_temperature_thread); -+ kfree(model_data); -+ } ++ ++domain->use_count; ++ MALI_DEBUG_PRINT(4, ("PM domain %p: ref_get, use_count => %u\n", domain, domain->use_count)); + -+ return err; ++ /* Return our mask so caller can check this against wanted mask */ ++ return domain->pmu_mask; +} + -+static int kbase_simple_power_model_recalculate(struct kbase_ipa_model *model) ++u32 mali_pm_domain_ref_put(struct mali_pm_domain *domain) +{ -+ struct kbase_ipa_model_simple_data *model_data = -+ (struct kbase_ipa_model_simple_data *)model->model_data; -+ struct thermal_zone_device *tz; ++ MALI_DEBUG_ASSERT_POINTER(domain); + -+ if (!strnlen(model_data->tz_name, sizeof(model_data->tz_name))) { -+ tz = NULL; -+ } else { -+ tz = thermal_zone_get_zone_by_name(model_data->tz_name); ++ --domain->use_count; ++ MALI_DEBUG_PRINT(4, ("PM domain %p: ref_put, use_count => %u\n", domain, domain->use_count)); + -+ if (IS_ERR_OR_NULL(tz)) { -+ pr_warn_ratelimited("Error %ld getting thermal zone \'%s\', not yet ready?\n", -+ PTR_ERR(tz), model_data->tz_name); -+ tz = NULL; -+ return -EPROBE_DEFER; -+ } ++ if (0 == domain->use_count) { ++ _mali_osk_pm_dev_ref_put(); + } + -+ WRITE_ONCE(model_data->gpu_tz, tz); -+ -+ return 0; ++ /* ++ * Return the PMU mask which now could be be powered down ++ * (the bit for this domain). ++ * This is the responsibility of the caller (mali_pm) ++ */ ++ return (0 == domain->use_count ? domain->pmu_mask : 0); +} + -+static void kbase_simple_power_model_term(struct kbase_ipa_model *model) ++#if MALI_STATE_TRACKING ++u32 mali_pm_domain_get_id(struct mali_pm_domain *domain) +{ -+ struct kbase_ipa_model_simple_data *model_data = -+ (struct kbase_ipa_model_simple_data *)model->model_data; ++ u32 id = 0; + -+ kthread_stop(model_data->poll_temperature_thread); ++ MALI_DEBUG_ASSERT_POINTER(domain); ++ MALI_DEBUG_ASSERT(0 != domain->pmu_mask); + -+ kfree(model_data); ++ id = _mali_osk_fls(domain->pmu_mask) - 1; ++ ++ MALI_DEBUG_ASSERT(MALI_MAX_NUMBER_OF_DOMAINS > id); ++ /* Verify that pmu_mask only one bit is set */ ++ MALI_DEBUG_ASSERT((1 << id) == domain->pmu_mask); ++ /* Verify that we have stored the domain at right id/index */ ++ MALI_DEBUG_ASSERT(domain == mali_pm_domains[id]); ++ ++ return id; +} ++#endif + -+struct kbase_ipa_model_ops kbase_simple_ipa_model_ops = { -+ .name = "mali-simple-power-model", -+ .init = &kbase_simple_power_model_init, -+ .recalculate = &kbase_simple_power_model_recalculate, -+ .term = &kbase_simple_power_model_term, -+ .get_dynamic_coeff = &model_dynamic_coeff, -+ .get_static_coeff = &model_static_coeff, -+ .do_utilization_scaling_in_framework = true, -+}; -diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_simple.h b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_simple.h ++#if defined(DEBUG) ++mali_bool mali_pm_domain_all_unused(void) ++{ ++ int i; ++ ++ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { ++ if (NULL == mali_pm_domains[i]) { ++ /* Nothing to check */ ++ continue; ++ } ++ ++ if (MALI_TRUE == mali_pm_domains[i]->power_is_on) { ++ /* Not ready for suspend! */ ++ return MALI_FALSE; ++ } ++ ++ if (0 != mali_pm_domains[i]->use_count) { ++ /* Not ready for suspend! */ ++ return MALI_FALSE; ++ } ++ } ++ ++ return MALI_TRUE; ++} ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h new file mode 100755 -index 000000000000..23cd55f5867d +index 000000000..5776abe39 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_simple.h -@@ -0,0 +1,40 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h +@@ -0,0 +1,104 @@ +/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_PM_DOMAIN_H__ ++#define __MALI_PM_DOMAIN_H__ + ++#include "mali_kernel_common.h" ++#include "mali_osk.h" + -+#ifndef _KBASE_IPA_SIMPLE_H_ -+#define _KBASE_IPA_SIMPLE_H_ -+ -+#if defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) ++#include "mali_l2_cache.h" ++#include "mali_group.h" ++#include "mali_pmu.h" + -+extern struct kbase_ipa_model_ops kbase_simple_ipa_model_ops; ++/* Instances are protected by PM state lock */ ++struct mali_pm_domain { ++ mali_bool power_is_on; ++ s32 use_count; ++ u32 pmu_mask; + -+#if MALI_UNIT_TEST -+/** -+ * kbase_simple_power_model_set_dummy_temp() - set a dummy temperature value -+ * @temp: Temperature of the thermal zone, in millidegrees celsius. -+ * -+ * This is only intended for use in unit tests, to ensure that the temperature -+ * values used by the simple power model are predictable. Deterministic -+ * behavior is necessary to allow validation of the static power values -+ * computed by this model. -+ */ -+void kbase_simple_power_model_set_dummy_temp(int temp); -+#endif /* MALI_UNIT_TEST */ ++ /* Zero or more groups can belong to this domain */ ++ _mali_osk_list_t group_list; + -+#endif /* (defined(CONFIG_MALI_BIFROST_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL)) */ ++ /* Zero or more L2 caches can belong to this domain */ ++ _mali_osk_list_t l2_cache_list; ++}; + -+#endif /* _KBASE_IPA_SIMPLE_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_common.c b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_common.c -new file mode 100755 -index 000000000000..b3d480030c2b ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_common.c -@@ -0,0 +1,217 @@ -+/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ + ++void mali_pm_domain_initialize(void); ++void mali_pm_domain_terminate(void); + ++struct mali_pm_domain *mali_pm_domain_create(u32 pmu_mask); ++void mali_pm_domain_delete(struct mali_pm_domain *domain); + -+#include "mali_kbase_ipa_vinstr_common.h" ++void mali_pm_domain_add_l2_cache( ++ struct mali_pm_domain *domain, ++ struct mali_l2_cache_core *l2_cache); ++void mali_pm_domain_add_group(struct mali_pm_domain *domain, ++ struct mali_group *group); + -+#if MALI_UNIT_TEST -+static ktime_t dummy_time; ++struct mali_pm_domain *mali_pm_domain_get_from_mask(u32 mask); ++struct mali_pm_domain *mali_pm_domain_get_from_index(u32 id); + -+/* Intercept calls to the kernel function using a macro */ -+#ifdef ktime_get -+#undef ktime_get -+#endif -+#define ktime_get() (READ_ONCE(dummy_time)) ++/* Ref counting */ ++u32 mali_pm_domain_ref_get(struct mali_pm_domain *domain); ++u32 mali_pm_domain_ref_put(struct mali_pm_domain *domain); + -+void kbase_ipa_set_dummy_time(ktime_t t) ++MALI_STATIC_INLINE _mali_osk_list_t *mali_pm_domain_get_group_list( ++ struct mali_pm_domain *domain) +{ -+ WRITE_ONCE(dummy_time, t); ++ MALI_DEBUG_ASSERT_POINTER(domain); ++ return &domain->group_list; +} -+KBASE_EXPORT_TEST_API(kbase_ipa_set_dummy_time); -+ -+#endif /* MALI_UNIT_TEST */ + -+/** -+ * read_hwcnt() - read a counter value -+ * @model_data: pointer to model data -+ * @offset: offset, in bytes, into vinstr buffer -+ * -+ * Return: A 32-bit counter value. Range: 0 < value < 2^27 (worst case would be -+ * incrementing every cycle over a ~100ms sample period at a high frequency, -+ * e.g. 1 GHz: 2^30 * 0.1seconds ~= 2^27. -+ */ -+static inline u32 kbase_ipa_read_hwcnt( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ u32 offset) ++MALI_STATIC_INLINE _mali_osk_list_t *mali_pm_domain_get_l2_cache_list( ++ struct mali_pm_domain *domain) +{ -+ u8 *p = model_data->vinstr_buffer; ++ MALI_DEBUG_ASSERT_POINTER(domain); ++ return &domain->l2_cache_list; ++} + -+ return *(u32 *)&p[offset]; ++MALI_STATIC_INLINE mali_bool mali_pm_domain_power_is_on( ++ struct mali_pm_domain *domain) ++{ ++ MALI_DEBUG_ASSERT_POINTER(domain); ++ return domain->power_is_on; +} + -+static inline s64 kbase_ipa_add_saturate(s64 a, s64 b) ++MALI_STATIC_INLINE void mali_pm_domain_set_power_on( ++ struct mali_pm_domain *domain, ++ mali_bool power_is_on) +{ -+ if (S64_MAX - a < b) -+ return S64_MAX; -+ return a + b; ++ MALI_DEBUG_ASSERT_POINTER(domain); ++ domain->power_is_on = power_is_on; +} + -+s64 kbase_ipa_sum_all_shader_cores( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ s32 coeff, u32 counter) ++MALI_STATIC_INLINE u32 mali_pm_domain_get_use_count( ++ struct mali_pm_domain *domain) +{ -+ struct kbase_device *kbdev = model_data->kbdev; -+ u64 core_mask; -+ u32 base = 0; -+ s64 ret = 0; ++ MALI_DEBUG_ASSERT_POINTER(domain); ++ return domain->use_count; ++} + -+ core_mask = kbdev->gpu_props.props.coherency_info.group[0].core_mask; -+ while (core_mask != 0ull) { -+ if ((core_mask & 1ull) != 0ull) { -+ /* 0 < counter_value < 2^27 */ -+ u32 counter_value = kbase_ipa_read_hwcnt(model_data, -+ base + counter); ++#if MALI_STATE_TRACKING ++u32 mali_pm_domain_get_id(struct mali_pm_domain *domain); + -+ /* 0 < ret < 2^27 * max_num_cores = 2^32 */ -+ ret = kbase_ipa_add_saturate(ret, counter_value); -+ } -+ base += KBASE_IPA_NR_BYTES_PER_BLOCK; -+ core_mask >>= 1; -+ } ++MALI_STATIC_INLINE u32 mali_pm_domain_get_mask(struct mali_pm_domain *domain) ++{ ++ MALI_DEBUG_ASSERT_POINTER(domain); ++ return domain->pmu_mask; ++} ++#endif + -+ /* Range: -2^54 < ret < 2^54 */ -+ ret *= coeff; ++#if defined(DEBUG) ++mali_bool mali_pm_domain_all_unused(void); ++#endif + -+ return ret / 1000000; -+} ++#endif /* __MALI_PM_DOMAIN_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c +new file mode 100755 +index 000000000..cf7482323 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c +@@ -0,0 +1,255 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include "mali_pm_metrics.h" ++#include "mali_osk_locks.h" ++#include "mali_osk_mali.h" ++#include + -+s64 kbase_ipa_single_counter( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ s32 coeff, u32 counter) ++#define MALI_PM_TIME_SHIFT 0 ++#define MALI_UTILIZATION_MAX_PERIOD 80000000/* ns = 100ms */ ++ ++_mali_osk_errcode_t mali_pm_metrics_init(struct mali_device *mdev) +{ -+ /* Range: 0 < counter_value < 2^27 */ -+ const u32 counter_value = kbase_ipa_read_hwcnt(model_data, counter); ++ int i = 0; + -+ /* Range: -2^49 < ret < 2^49 */ -+ const s64 multiplied = (s64) counter_value * (s64) coeff; ++ MALI_DEBUG_ASSERT(mdev != NULL); + -+ /* Range: -2^29 < return < 2^29 */ -+ return multiplied / 1000000; -+} ++ mdev->mali_metrics.time_period_start = ktime_get(); ++ mdev->mali_metrics.time_period_start_gp = mdev->mali_metrics.time_period_start; ++ mdev->mali_metrics.time_period_start_pp = mdev->mali_metrics.time_period_start; + -+int kbase_ipa_attach_vinstr(struct kbase_ipa_model_vinstr_data *model_data) -+{ -+ struct kbase_device *kbdev = model_data->kbdev; -+ struct kbase_uk_hwcnt_reader_setup setup; -+ size_t dump_size; ++ mdev->mali_metrics.time_busy = 0; ++ mdev->mali_metrics.time_idle = 0; ++ mdev->mali_metrics.prev_busy = 0; ++ mdev->mali_metrics.prev_idle = 0; ++ mdev->mali_metrics.num_running_gp_cores = 0; ++ mdev->mali_metrics.num_running_pp_cores = 0; ++ mdev->mali_metrics.time_busy_gp = 0; ++ mdev->mali_metrics.time_idle_gp = 0; + -+ dump_size = kbase_vinstr_dump_size(kbdev); -+ model_data->vinstr_buffer = kzalloc(dump_size, GFP_KERNEL); -+ if (!model_data->vinstr_buffer) { -+ dev_err(kbdev->dev, "Failed to allocate IPA dump buffer"); -+ return -1; ++ for (i = 0; i < MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS; i++) { ++ mdev->mali_metrics.time_busy_pp[i] = 0; ++ mdev->mali_metrics.time_idle_pp[i] = 0; + } ++ mdev->mali_metrics.gpu_active = MALI_FALSE; + -+ setup.jm_bm = ~0u; -+ setup.shader_bm = ~0u; -+ setup.tiler_bm = ~0u; -+ setup.mmu_l2_bm = ~0u; -+ model_data->vinstr_cli = kbase_vinstr_hwcnt_kernel_setup(kbdev->vinstr_ctx, -+ &setup, model_data->vinstr_buffer); -+ if (!model_data->vinstr_cli) { -+ dev_err(kbdev->dev, "Failed to register IPA with vinstr core"); -+ kfree(model_data->vinstr_buffer); -+ model_data->vinstr_buffer = NULL; -+ return -1; ++ mdev->mali_metrics.lock = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_UNORDERED, _MALI_OSK_LOCK_ORDER_FIRST); ++ if (NULL == mdev->mali_metrics.lock) { ++ return _MALI_OSK_ERR_NOMEM; + } + -+ model_data->last_sample_read_time = ktime_get(); -+ kbase_vinstr_hwc_clear(model_data->vinstr_cli); ++ return _MALI_OSK_ERR_OK; ++} + -+ return 0; ++void mali_pm_metrics_term(struct mali_device *mdev) ++{ ++ _mali_osk_spinlock_irq_term(mdev->mali_metrics.lock); +} + -+void kbase_ipa_detach_vinstr(struct kbase_ipa_model_vinstr_data *model_data) ++/*caller needs to hold mdev->mali_metrics.lock before calling this function*/ ++void mali_pm_record_job_status(struct mali_device *mdev) +{ -+ if (model_data->vinstr_cli) -+ kbase_vinstr_detach_client(model_data->vinstr_cli); -+ model_data->vinstr_cli = NULL; -+ kfree(model_data->vinstr_buffer); -+ model_data->vinstr_buffer = NULL; ++ ktime_t now; ++ ktime_t diff; ++ u64 ns_time; ++ ++ MALI_DEBUG_ASSERT(mdev != NULL); ++ ++ now = ktime_get(); ++ diff = ktime_sub(now, mdev->mali_metrics.time_period_start); ++ ++ ns_time = (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); ++ mdev->mali_metrics.time_busy += ns_time; ++ mdev->mali_metrics.time_period_start = now; +} + -+int kbase_ipa_vinstr_dynamic_coeff(struct kbase_ipa_model *model, u32 *coeffp, -+ u32 current_freq) ++void mali_pm_record_gpu_idle(mali_bool is_gp) +{ -+ struct kbase_ipa_model_vinstr_data *model_data = -+ (struct kbase_ipa_model_vinstr_data *)model->model_data; -+ s64 energy = 0; -+ size_t i; -+ ktime_t now = ktime_get(); -+ ktime_t time_since_last_sample = -+ ktime_sub(now, model_data->last_sample_read_time); -+ /* Range: 2^0 < time_since_last_sample_ms < 2^10 (1-1000ms) */ -+ s64 time_since_last_sample_ms = ktime_to_ms(time_since_last_sample); -+ u64 coeff = 0; -+ u64 num_cycles; -+ int err = 0; ++ ktime_t now; ++ ktime_t diff; ++ u64 ns_time; ++ struct mali_device *mdev = dev_get_drvdata(&mali_platform_device->dev); + -+ err = kbase_vinstr_hwc_dump(model_data->vinstr_cli, -+ BASE_HWCNT_READER_EVENT_MANUAL); -+ if (err) -+ goto err0; ++ MALI_DEBUG_ASSERT(mdev != NULL); + -+ model_data->last_sample_read_time = now; ++ _mali_osk_spinlock_irq_lock(mdev->mali_metrics.lock); ++ now = ktime_get(); + -+ /* Range of 'energy' is +/- 2^34 * number of IPA groups, so around -+ * -2^38 < energy < 2^38 */ -+ for (i = 0; i < model_data->groups_def_num; i++) { -+ const struct kbase_ipa_group *group = &model_data->groups_def[i]; -+ s32 coeff, group_energy; ++ if (MALI_TRUE == is_gp) { ++ --mdev->mali_metrics.num_running_gp_cores; ++ if (0 == mdev->mali_metrics.num_running_gp_cores) { ++ diff = ktime_sub(now, mdev->mali_metrics.time_period_start_gp); ++ ns_time = (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); ++ mdev->mali_metrics.time_busy_gp += ns_time; ++ mdev->mali_metrics.time_period_start_gp = now; + -+ coeff = model_data->group_values[i]; -+ group_energy = group->op(model_data, coeff, group->counter); ++ if (0 == mdev->mali_metrics.num_running_pp_cores) { ++ MALI_DEBUG_ASSERT(mdev->mali_metrics.gpu_active == MALI_TRUE); ++ diff = ktime_sub(now, mdev->mali_metrics.time_period_start); ++ ns_time = (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); ++ mdev->mali_metrics.time_busy += ns_time; ++ mdev->mali_metrics.time_period_start = now; ++ mdev->mali_metrics.gpu_active = MALI_FALSE; ++ } ++ } ++ } else { ++ --mdev->mali_metrics.num_running_pp_cores; ++ if (0 == mdev->mali_metrics.num_running_pp_cores) { ++ diff = ktime_sub(now, mdev->mali_metrics.time_period_start_pp); ++ ns_time = (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); ++ mdev->mali_metrics.time_busy_pp[0] += ns_time; ++ mdev->mali_metrics.time_period_start_pp = now; + -+ energy = kbase_ipa_add_saturate(energy, group_energy); ++ if (0 == mdev->mali_metrics.num_running_gp_cores) { ++ MALI_DEBUG_ASSERT(mdev->mali_metrics.gpu_active == MALI_TRUE); ++ diff = ktime_sub(now, mdev->mali_metrics.time_period_start); ++ ns_time = (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); ++ mdev->mali_metrics.time_busy += ns_time; ++ mdev->mali_metrics.time_period_start = now; ++ mdev->mali_metrics.gpu_active = MALI_FALSE; ++ } ++ } + } + -+ /* Range: 0 <= coeff < 2^38 */ -+ if (energy > 0) -+ coeff = energy; ++ _mali_osk_spinlock_irq_unlock(mdev->mali_metrics.lock); ++} ++ ++void mali_pm_record_gpu_active(mali_bool is_gp) ++{ ++ ktime_t now; ++ ktime_t diff; ++ struct mali_device *mdev = dev_get_drvdata(&mali_platform_device->dev); + -+ /* Scale by user-specified factor and divide by 1000. But actually -+ * cancel the division out, because we want the num_cycles in KHz and -+ * don't want to lose precision. */ ++ MALI_DEBUG_ASSERT(mdev != NULL); + -+ /* Range: 0 < coeff < 2^53 */ -+ coeff = coeff * model_data->scaling_factor; ++ _mali_osk_spinlock_irq_lock(mdev->mali_metrics.lock); ++ now = ktime_get(); + -+ if (time_since_last_sample_ms == 0) { -+ time_since_last_sample_ms = 1; -+ } else if (time_since_last_sample_ms < 0) { -+ err = -ERANGE; -+ goto err0; ++ if (MALI_TRUE == is_gp) { ++ mdev->mali_metrics.num_running_gp_cores++; ++ if (1 == mdev->mali_metrics.num_running_gp_cores) { ++ diff = ktime_sub(now, mdev->mali_metrics.time_period_start_gp); ++ mdev->mali_metrics.time_idle_gp += (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); ++ mdev->mali_metrics.time_period_start_gp = now; ++ if (0 == mdev->mali_metrics.num_running_pp_cores) { ++ MALI_DEBUG_ASSERT(mdev->mali_metrics.gpu_active == MALI_FALSE); ++ diff = ktime_sub(now, mdev->mali_metrics.time_period_start); ++ mdev->mali_metrics.time_idle += (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); ++ mdev->mali_metrics.time_period_start = now; ++ mdev->mali_metrics.gpu_active = MALI_TRUE; ++ } ++ } else { ++ MALI_DEBUG_ASSERT(mdev->mali_metrics.gpu_active == MALI_TRUE); ++ } ++ } else { ++ mdev->mali_metrics.num_running_pp_cores++; ++ if (1 == mdev->mali_metrics.num_running_pp_cores) { ++ diff = ktime_sub(now, mdev->mali_metrics.time_period_start_pp); ++ mdev->mali_metrics.time_idle_pp[0] += (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); ++ mdev->mali_metrics.time_period_start_pp = now; ++ if (0 == mdev->mali_metrics.num_running_gp_cores) { ++ MALI_DEBUG_ASSERT(mdev->mali_metrics.gpu_active == MALI_FALSE); ++ diff = ktime_sub(now, mdev->mali_metrics.time_period_start); ++ mdev->mali_metrics.time_idle += (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); ++ mdev->mali_metrics.time_period_start = now; ++ mdev->mali_metrics.gpu_active = MALI_TRUE; ++ } ++ } else { ++ MALI_DEBUG_ASSERT(mdev->mali_metrics.gpu_active == MALI_TRUE); ++ } + } + -+ /* Range: 2^20 < num_cycles < 2^40 mCycles */ -+ num_cycles = (u64) current_freq * (u64) time_since_last_sample_ms; -+ /* Range: 2^10 < num_cycles < 2^30 Cycles */ -+ num_cycles /= 1000000; ++ _mali_osk_spinlock_irq_unlock(mdev->mali_metrics.lock); ++} + -+ /* num_cycles should never be 0 in _normal_ usage (because we expect -+ * frequencies on the order of MHz and >10ms polling intervals), but -+ * protect against divide-by-zero anyway. */ -+ if (num_cycles == 0) -+ num_cycles = 1; + -+ /* Range: 0 < coeff < 2^43 */ -+ coeff = div_u64(coeff, num_cycles); ++/*caller needs to hold mdev->mali_metrics.lock before calling this function*/ ++static void mali_pm_get_dvfs_utilisation_calc(struct mali_device *mdev, ktime_t now) ++{ ++ ktime_t diff; + -+err0: -+ /* Clamp to a sensible range - 2^16 gives about 14W at 400MHz/750mV */ -+ *coeffp = clamp(coeff, (u64) 0, (u64) 1 << 16); -+ return err; -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_common.h b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_common.h -new file mode 100755 -index 000000000000..25b36c8e3089 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_common.h -@@ -0,0 +1,161 @@ -+/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ MALI_DEBUG_ASSERT(mdev != NULL); + ++ diff = ktime_sub(now, mdev->mali_metrics.time_period_start); + ++ if (mdev->mali_metrics.gpu_active) { ++ mdev->mali_metrics.time_busy += (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); ++ } else { ++ mdev->mali_metrics.time_idle += (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); ++ } ++} + -+#ifndef _KBASE_IPA_VINSTR_COMMON_H_ -+#define _KBASE_IPA_VINSTR_COMMON_H_ ++/* Caller needs to hold mdev->mali_metrics.lock before calling this function. */ ++static void mali_pm_reset_dvfs_utilisation_unlocked(struct mali_device *mdev, ktime_t now) ++{ ++ /* Store previous value */ ++ mdev->mali_metrics.prev_idle = mdev->mali_metrics.time_idle; ++ mdev->mali_metrics.prev_busy = mdev->mali_metrics.time_busy; + -+#include "mali_kbase.h" ++ /* Reset current values */ ++ mdev->mali_metrics.time_period_start = now; ++ mdev->mali_metrics.time_period_start_gp = now; ++ mdev->mali_metrics.time_period_start_pp = now; ++ mdev->mali_metrics.time_idle = 0; ++ mdev->mali_metrics.time_busy = 0; + -+/* Maximum length for the name of an IPA group. */ -+#define KBASE_IPA_MAX_GROUP_NAME_LEN 15 ++ mdev->mali_metrics.time_busy_gp = 0; ++ mdev->mali_metrics.time_idle_gp = 0; ++ mdev->mali_metrics.time_busy_pp[0] = 0; ++ mdev->mali_metrics.time_idle_pp[0] = 0; ++} + -+/* Maximum number of IPA groups for an IPA model. */ -+#define KBASE_IPA_MAX_GROUP_DEF_NUM 16 ++void mali_pm_reset_dvfs_utilisation(struct mali_device *mdev) ++{ ++ _mali_osk_spinlock_irq_lock(mdev->mali_metrics.lock); ++ mali_pm_reset_dvfs_utilisation_unlocked(mdev, ktime_get()); ++ _mali_osk_spinlock_irq_unlock(mdev->mali_metrics.lock); ++} + -+/* Number of bytes per hardware counter in a vinstr_buffer. */ -+#define KBASE_IPA_NR_BYTES_PER_CNT 4 ++void mali_pm_get_dvfs_utilisation(struct mali_device *mdev, ++ unsigned long *total_out, unsigned long *busy_out) ++{ ++ ktime_t now = ktime_get(); ++ u64 busy = 0; ++ u64 total = 0; + -+/* Number of hardware counters per block in a vinstr_buffer. */ -+#define KBASE_IPA_NR_CNT_PER_BLOCK 64 ++ _mali_osk_spinlock_irq_lock(mdev->mali_metrics.lock); + -+/* Number of bytes per block in a vinstr_buffer. */ -+#define KBASE_IPA_NR_BYTES_PER_BLOCK \ -+ (KBASE_IPA_NR_CNT_PER_BLOCK * KBASE_IPA_NR_BYTES_PER_CNT) ++ mali_pm_get_dvfs_utilisation_calc(mdev, now); + ++ busy = mdev->mali_metrics.time_busy; ++ total = busy + mdev->mali_metrics.time_idle; + ++ /* Reset stats if older than MALI_UTILIZATION_MAX_PERIOD (default ++ * 100ms) */ ++ if (total >= MALI_UTILIZATION_MAX_PERIOD) { ++ mali_pm_reset_dvfs_utilisation_unlocked(mdev, now); ++ } else if (total < (MALI_UTILIZATION_MAX_PERIOD / 2)) { ++ total += mdev->mali_metrics.prev_idle + ++ mdev->mali_metrics.prev_busy; ++ busy += mdev->mali_metrics.prev_busy; ++ } + -+/** -+ * struct kbase_ipa_model_vinstr_data - IPA context per device -+ * @kbdev: pointer to kbase device -+ * @groups_def: Array of IPA groups. -+ * @groups_def_num: Number of elements in the array of IPA groups. -+ * @vinstr_cli: vinstr client handle -+ * @vinstr_buffer: buffer to dump hardware counters onto -+ * @last_sample_read_time: timestamp of last vinstr buffer read -+ * @scaling_factor: user-specified power scaling factor. This is -+ * interpreted as a fraction where the denominator is -+ * 1000. Range approx 0.0-32.0: -+ * 0 < scaling_factor < 2^15 -+ */ -+struct kbase_ipa_model_vinstr_data { -+ struct kbase_device *kbdev; -+ s32 group_values[KBASE_IPA_MAX_GROUP_DEF_NUM]; -+ const struct kbase_ipa_group *groups_def; -+ size_t groups_def_num; -+ struct kbase_vinstr_client *vinstr_cli; -+ void *vinstr_buffer; -+ ktime_t last_sample_read_time; -+ s32 scaling_factor; -+}; ++ *total_out = (unsigned long)total; ++ *busy_out = (unsigned long)busy; ++ _mali_osk_spinlock_irq_unlock(mdev->mali_metrics.lock); ++} + -+/** -+ * struct ipa_group - represents a single IPA group -+ * @name: name of the IPA group -+ * @default_value: default value of coefficient for IPA group. -+ * Coefficients are interpreted as fractions where the -+ * denominator is 1000000. -+ * @op: which operation to be performed on the counter values -+ * @counter: counter used to calculate energy for IPA group -+ */ -+struct kbase_ipa_group { -+ char name[KBASE_IPA_MAX_GROUP_NAME_LEN + 1]; -+ s32 default_value; -+ s64 (*op)(struct kbase_ipa_model_vinstr_data *, s32, u32); -+ u32 counter; -+}; ++void mali_pm_metrics_spin_lock(void) ++{ ++ struct mali_device *mdev = dev_get_drvdata(&mali_platform_device->dev); ++ _mali_osk_spinlock_irq_lock(mdev->mali_metrics.lock); ++} + ++void mali_pm_metrics_spin_unlock(void) ++{ ++ struct mali_device *mdev = dev_get_drvdata(&mali_platform_device->dev); ++ _mali_osk_spinlock_irq_unlock(mdev->mali_metrics.lock); ++} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h +new file mode 100755 +index 000000000..2b136b0de +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h +@@ -0,0 +1,74 @@ +/* -+ * sum_all_shader_cores() - sum a counter over all cores -+ * @model_data pointer to model data -+ * @coeff model coefficient. Unity is ~2^20, so range approx -+ * +/- 4.0: -2^22 < coeff < 2^22 -+ -+ * Calculate energy estimation based on hardware counter `counter' -+ * across all shader cores. -+ * -+ * Return: Sum of counter values. Range: -2^34 < ret < 2^34 ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+s64 kbase_ipa_sum_all_shader_cores( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ s32 coeff, u32 counter); + -+/* -+ * sum_single_counter() - sum a single counter -+ * @model_data pointer to model data -+ * @coeff model coefficient. Unity is ~2^20, so range approx -+ * +/- 4.0: -2^22 < coeff < 2^22 ++#ifndef __MALI_PM_METRICS_H__ ++#define __MALI_PM_METRICS_H__ + -+ * Calculate energy estimation based on hardware counter `counter'. -+ * -+ * Return: Counter value. Range: -2^34 < ret < 2^34 ++#ifdef CONFIG_MALI_DEVFREQ ++#include "mali_osk_locks.h" ++#include "mali_group.h" ++ ++struct mali_device; ++ ++/** ++ * Metrics data collected for use by the power management framework. + */ -+s64 kbase_ipa_single_counter( -+ struct kbase_ipa_model_vinstr_data *model_data, -+ s32 coeff, u32 counter); ++struct mali_pm_metrics_data { ++ ktime_t time_period_start; ++ u64 time_busy; ++ u64 time_idle; ++ u64 prev_busy; ++ u64 prev_idle; ++ u32 num_running_gp_cores; ++ u32 num_running_pp_cores; ++ ktime_t time_period_start_gp; ++ u64 time_busy_gp; ++ u64 time_idle_gp; ++ ktime_t time_period_start_pp; ++ u64 time_busy_pp[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS]; ++ u64 time_idle_pp[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS]; ++ mali_bool gpu_active; ++ _mali_osk_spinlock_irq_t *lock; ++}; + -+/* -+ * attach_vinstr() - attach a vinstr_buffer to an IPA model. -+ * @model_data pointer to model data -+ * -+ * Attach a vinstr_buffer to an IPA model. The vinstr_buffer -+ * allows access to the hardware counters used to calculate -+ * energy consumption. ++/** ++ * Initialize/start the Mali GPU pm_metrics metrics reporting. + * -+ * Return: 0 on success, or an error code. ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. + */ -+int kbase_ipa_attach_vinstr(struct kbase_ipa_model_vinstr_data *model_data); ++_mali_osk_errcode_t mali_pm_metrics_init(struct mali_device *mdev); + -+/* -+ * detach_vinstr() - detach a vinstr_buffer from an IPA model. -+ * @model_data pointer to model data -+ * -+ * Detach a vinstr_buffer from an IPA model. ++/** ++ * Terminate the Mali GPU pm_metrics metrics reporting + */ -+void kbase_ipa_detach_vinstr(struct kbase_ipa_model_vinstr_data *model_data); ++void mali_pm_metrics_term(struct mali_device *mdev); + +/** -+ * kbase_ipa_vinstr_dynamic_coeff() - calculate dynamic power based on HW counters -+ * @model: pointer to instantiated model -+ * @coeffp: pointer to location where calculated power, in -+ * pW/(Hz V^2), is stored. -+ * @current_freq: frequency the GPU has been running at over the sample -+ * period. In Hz. Range: 10 MHz < 1GHz, -+ * 2^20 < current_freq < 2^30 -+ * -+ * This is a GPU-agnostic implementation of the get_dynamic_coeff() -+ * function of an IPA model. It relies on the model being populated -+ * with GPU-specific attributes at initialization time. -+ * -+ * Return: 0 on success, or an error code. ++ * Should be called when a job is about to execute a GPU job + */ -+int kbase_ipa_vinstr_dynamic_coeff(struct kbase_ipa_model *model, u32 *coeffp, -+ u32 current_freq); ++void mali_pm_record_gpu_active(mali_bool is_gp); + -+#if MALI_UNIT_TEST +/** -+ * kbase_ipa_set_dummy_time() - set a dummy monotonic time value -+ * @t: a monotonic time value -+ * -+ * This is only intended for use in unit tests, to ensure that the kernel time -+ * values used by a power model are predictable. Deterministic behavior is -+ * necessary to allow validation of the dynamic power values computed by the -+ * model. ++ * Should be called when a job is finished + */ -+void kbase_ipa_set_dummy_time(ktime_t t); -+#endif /* MALI_UNIT_TEST */ ++void mali_pm_record_gpu_idle(mali_bool is_gp); ++ ++void mali_pm_reset_dvfs_utilisation(struct mali_device *mdev); + -+#endif /* _KBASE_IPA_VINSTR_COMMON_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_g71.c b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_g71.c ++void mali_pm_get_dvfs_utilisation(struct mali_device *mdev, unsigned long *total_out, unsigned long *busy_out); ++ ++void mali_pm_metrics_spin_lock(void); ++ ++void mali_pm_metrics_spin_unlock(void); ++#else ++void mali_pm_record_gpu_idle(mali_bool is_gp) {} ++void mali_pm_record_gpu_active(mali_bool is_gp) {} ++#endif ++#endif /* __MALI_PM_METRICS_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pmu.c b/drivers/gpu/arm/mali400/mali/common/mali_pmu.c new file mode 100755 -index 000000000000..81f6fddbd79b +index 000000000..6f0af59f6 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_g71.c -@@ -0,0 +1,136 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.c +@@ -0,0 +1,270 @@ +/* -+ * -+ * (C) COPYRIGHT 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++/** ++ * @file mali_pmu.c ++ * Mali driver functions for Mali 400 PMU hardware ++ */ ++#include "mali_hw_core.h" ++#include "mali_pmu.h" ++#include "mali_pp.h" ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_pm.h" ++#include "mali_osk_mali.h" + -+#include ++struct mali_pmu_core *mali_global_pmu_core = NULL; + -+#include "mali_kbase_ipa_vinstr_common.h" -+#include "mali_kbase.h" -+#include "mali_kbase_ipa_debugfs.h" ++static _mali_osk_errcode_t mali_pmu_wait_for_command_finish( ++ struct mali_pmu_core *pmu); + ++struct mali_pmu_core *mali_pmu_create(_mali_osk_resource_t *resource) ++{ ++ struct mali_pmu_core *pmu; + -+#define JM_BASE (0 * KBASE_IPA_NR_BYTES_PER_BLOCK) -+#define TILER_BASE (1 * KBASE_IPA_NR_BYTES_PER_BLOCK) -+#define MMU_BASE (2 * KBASE_IPA_NR_BYTES_PER_BLOCK) -+#define SC0_BASE (3 * KBASE_IPA_NR_BYTES_PER_BLOCK) ++ MALI_DEBUG_ASSERT(NULL == mali_global_pmu_core); ++ MALI_DEBUG_PRINT(2, ("Mali PMU: Creating Mali PMU core\n")); + -+#define GPU_ACTIVE (JM_BASE + KBASE_IPA_NR_BYTES_PER_CNT * 6) -+#define TILER_ACTIVE (TILER_BASE + KBASE_IPA_NR_BYTES_PER_CNT * 45) -+#define L2_ANY_LOOKUP (MMU_BASE + KBASE_IPA_NR_BYTES_PER_CNT * 25) -+#define FRAG_ACTIVE (SC0_BASE + KBASE_IPA_NR_BYTES_PER_CNT * 4) -+#define EXEC_CORE_ACTIVE (SC0_BASE + KBASE_IPA_NR_BYTES_PER_CNT * 26) -+#define EXEC_INSTR_COUNT (SC0_BASE + KBASE_IPA_NR_BYTES_PER_CNT * 28) -+#define TEX_COORD_ISSUE (SC0_BASE + KBASE_IPA_NR_BYTES_PER_CNT * 40) -+#define VARY_SLOT_32 (SC0_BASE + KBASE_IPA_NR_BYTES_PER_CNT * 50) -+#define VARY_SLOT_16 (SC0_BASE + KBASE_IPA_NR_BYTES_PER_CNT * 51) -+#define BEATS_RD_LSC (SC0_BASE + KBASE_IPA_NR_BYTES_PER_CNT * 56) -+#define BEATS_WR_LSC (SC0_BASE + KBASE_IPA_NR_BYTES_PER_CNT * 61) -+#define BEATS_WR_TIB (SC0_BASE + KBASE_IPA_NR_BYTES_PER_CNT * 62) ++ pmu = (struct mali_pmu_core *)_mali_osk_malloc( ++ sizeof(struct mali_pmu_core)); ++ if (NULL != pmu) { ++ pmu->registered_cores_mask = 0; /* to be set later */ + -+static const struct kbase_ipa_group ipa_groups_def[] = { -+ { -+ .name = "l2_access", -+ .default_value = 526300, -+ .op = kbase_ipa_single_counter, -+ .counter = L2_ANY_LOOKUP, -+ }, -+ { -+ .name = "exec_instr_count", -+ .default_value = 301100, -+ .op = kbase_ipa_sum_all_shader_cores, -+ .counter = EXEC_INSTR_COUNT, -+ }, -+ { -+ .name = "tex_issue", -+ .default_value = 197400, -+ .op = kbase_ipa_sum_all_shader_cores, -+ .counter = TEX_COORD_ISSUE, -+ }, -+ { -+ .name = "tile_wb", -+ .default_value = -156400, -+ .op = kbase_ipa_sum_all_shader_cores, -+ .counter = BEATS_WR_TIB, -+ }, -+ { -+ .name = "gpu_active", -+ .default_value = 115800, -+ .op = kbase_ipa_single_counter, -+ .counter = GPU_ACTIVE, -+ }, -+}; ++ if (_MALI_OSK_ERR_OK == mali_hw_core_create(&pmu->hw_core, ++ resource, PMU_REGISTER_ADDRESS_SPACE_SIZE)) { + -+static int kbase_g71_power_model_init(struct kbase_ipa_model *model) -+{ -+ int i, err = 0; -+ struct kbase_ipa_model_vinstr_data *model_data; ++ pmu->switch_delay = _mali_osk_get_pmu_switch_delay(); + -+ model_data = kzalloc(sizeof(*model_data), GFP_KERNEL); -+ if (!model_data) -+ return -ENOMEM; ++ mali_global_pmu_core = pmu; + -+ model_data->kbdev = model->kbdev; -+ model_data->groups_def = ipa_groups_def; -+ BUILD_BUG_ON(ARRAY_SIZE(ipa_groups_def) > KBASE_IPA_MAX_GROUP_DEF_NUM); -+ model_data->groups_def_num = ARRAY_SIZE(ipa_groups_def); ++ return pmu; ++ } ++ _mali_osk_free(pmu); ++ } + -+ model->model_data = (void *) model_data; ++ return NULL; ++} + -+ for (i = 0; i < ARRAY_SIZE(ipa_groups_def); ++i) { -+ const struct kbase_ipa_group *group = &ipa_groups_def[i]; ++void mali_pmu_delete(struct mali_pmu_core *pmu) ++{ ++ MALI_DEBUG_ASSERT_POINTER(pmu); ++ MALI_DEBUG_ASSERT(pmu == mali_global_pmu_core); + -+ model_data->group_values[i] = group->default_value; -+ err = kbase_ipa_model_add_param_s32(model, group->name, -+ &model_data->group_values[i], -+ 1, false); -+ if (err) -+ goto exit; -+ } ++ MALI_DEBUG_PRINT(2, ("Mali PMU: Deleting Mali PMU core\n")); + -+ model_data->scaling_factor = 15000; -+ err = kbase_ipa_model_add_param_s32(model, "scale", -+ &model_data->scaling_factor, -+ 1, false); -+ if (err) -+ goto exit; ++ mali_global_pmu_core = NULL; + -+ err = kbase_ipa_attach_vinstr(model_data); ++ mali_hw_core_delete(&pmu->hw_core); ++ _mali_osk_free(pmu); ++} + -+exit: -+ if (err) { -+ kbase_ipa_model_param_free_all(model); -+ kfree(model_data); -+ } -+ return err; ++void mali_pmu_set_registered_cores_mask(struct mali_pmu_core *pmu, u32 mask) ++{ ++ pmu->registered_cores_mask = mask; +} + -+static void kbase_g71_power_model_term(struct kbase_ipa_model *model) ++void mali_pmu_reset(struct mali_pmu_core *pmu) +{ -+ struct kbase_ipa_model_vinstr_data *model_data = -+ (struct kbase_ipa_model_vinstr_data *)model->model_data; ++ MALI_DEBUG_ASSERT_POINTER(pmu); ++ MALI_DEBUG_ASSERT(pmu->registered_cores_mask != 0); + -+ kbase_ipa_detach_vinstr(model_data); -+ kfree(model_data); ++ /* Setup the desired defaults */ ++ mali_hw_core_register_write_relaxed(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_INT_MASK, 0); ++ mali_hw_core_register_write_relaxed(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_SW_DELAY, pmu->switch_delay); +} + ++void mali_pmu_power_up_all(struct mali_pmu_core *pmu) ++{ ++ u32 stat; + -+struct kbase_ipa_model_ops kbase_g71_ipa_model_ops = { -+ .name = "mali-g71-power-model", -+ .init = kbase_g71_power_model_init, -+ .term = kbase_g71_power_model_term, -+ .get_dynamic_coeff = kbase_ipa_vinstr_dynamic_coeff, -+ .do_utilization_scaling_in_framework = false, -+}; -+KBASE_EXPORT_TEST_API(kbase_g71_ipa_model_ops); -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_base_hwconfig_features.h b/drivers/gpu/arm/bifrost_for_linux/mali_base_hwconfig_features.h -new file mode 100755 -index 000000000000..219586d4d2da ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_base_hwconfig_features.h -@@ -0,0 +1,282 @@ -+/* -+ * -+ * (C) COPYRIGHT 2015-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ MALI_DEBUG_ASSERT_POINTER(pmu); ++ MALI_DEBUG_ASSERT(pmu->registered_cores_mask != 0); + ++ mali_pm_exec_lock(); + ++ mali_pmu_reset(pmu); + -+/* AUTOMATICALLY GENERATED FILE. If you want to amend the issues/features, -+ * please update base/tools/hwconfig_generator/hwc_{issues,features}.py -+ * For more information see base/tools/hwconfig_generator/README -+ */ ++ /* Now simply power up the domains which are marked as powered down */ ++ stat = mali_hw_core_register_read(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_STATUS); ++ mali_pmu_power_up(pmu, stat); + -+#ifndef _BASE_HWCONFIG_FEATURES_H_ -+#define _BASE_HWCONFIG_FEATURES_H_ ++ mali_pm_exec_unlock(); ++} + -+enum base_hw_feature { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_33BIT_VA, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_OPTIMIZED_COVERAGE_MASK, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_WORKGROUP_ROUND_MULTIPLE_OF_4, -+ BASE_HW_FEATURE_IMAGES_IN_FRAGMENT_SHADERS, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_V4, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_AARCH64_MMU, -+ BASE_HW_FEATURE_TLS_HASHING, -+ BASE_HW_FEATURE_END -+}; ++void mali_pmu_power_down_all(struct mali_pmu_core *pmu) ++{ ++ u32 stat; + -+static const enum base_hw_feature base_hw_features_generic[] = { -+ BASE_HW_FEATURE_END -+}; ++ MALI_DEBUG_ASSERT_POINTER(pmu); ++ MALI_DEBUG_ASSERT(pmu->registered_cores_mask != 0); + -+static const enum base_hw_feature base_hw_features_t60x[] = { -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_V4, -+ BASE_HW_FEATURE_END -+}; ++ mali_pm_exec_lock(); + -+static const enum base_hw_feature base_hw_features_t62x[] = { -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_V4, -+ BASE_HW_FEATURE_END -+}; ++ /* Now simply power down the domains which are marked as powered up */ ++ stat = mali_hw_core_register_read(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_STATUS); ++ mali_pmu_power_down(pmu, (~stat) & pmu->registered_cores_mask); + -+static const enum base_hw_feature base_hw_features_t72x[] = { -+ BASE_HW_FEATURE_33BIT_VA, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_OPTIMIZED_COVERAGE_MASK, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_WORKGROUP_ROUND_MULTIPLE_OF_4, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_V4, -+ BASE_HW_FEATURE_END -+}; ++ mali_pm_exec_unlock(); ++} + -+static const enum base_hw_feature base_hw_features_t76x[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_END -+}; ++_mali_osk_errcode_t mali_pmu_power_down(struct mali_pmu_core *pmu, u32 mask) ++{ ++ u32 stat; ++ _mali_osk_errcode_t err; + -+static const enum base_hw_feature base_hw_features_tFxx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_END -+}; ++ MALI_DEBUG_ASSERT_POINTER(pmu); ++ MALI_DEBUG_ASSERT(pmu->registered_cores_mask != 0); ++ MALI_DEBUG_ASSERT(mask <= pmu->registered_cores_mask); ++ MALI_DEBUG_ASSERT(0 == (mali_hw_core_register_read(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_INT_RAWSTAT) & ++ PMU_REG_VAL_IRQ)); + -+static const enum base_hw_feature base_hw_features_t83x[] = { -+ BASE_HW_FEATURE_33BIT_VA, -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_END -+}; ++ MALI_DEBUG_PRINT(3, ++ ("PMU power down: ...................... [%s]\n", ++ mali_pm_mask_to_string(mask))); + -+static const enum base_hw_feature base_hw_features_t82x[] = { -+ BASE_HW_FEATURE_33BIT_VA, -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_END -+}; ++ stat = mali_hw_core_register_read(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_STATUS); + -+static const enum base_hw_feature base_hw_features_tMIx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_END -+}; ++ /* ++ * Assert that we are not powering down domains which are already ++ * powered down. ++ */ ++ MALI_DEBUG_ASSERT(0 == (stat & mask)); + -+static const enum base_hw_feature base_hw_features_tHEx[] = { -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_MODE, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_END -+}; ++ mask &= ~(0x1 << MALI_DOMAIN_INDEX_DUMMY); + -+static const enum base_hw_feature base_hw_features_tSIx[] = { -+ BASE_HW_FEATURE_33BIT_VA, -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_MODE, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_END -+}; ++ if (0 == mask || 0 == ((~stat) & mask)) return _MALI_OSK_ERR_OK; + -+static const enum base_hw_feature base_hw_features_tDVx[] = { -+ BASE_HW_FEATURE_33BIT_VA, -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, -+ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, -+ BASE_HW_FEATURE_XAFFINITY, -+ BASE_HW_FEATURE_WARPING, -+ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, -+ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, -+ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, -+ BASE_HW_FEATURE_BRNDOUT_CC, -+ BASE_HW_FEATURE_BRNDOUT_KILL, -+ BASE_HW_FEATURE_LD_ST_LEA_TEX, -+ BASE_HW_FEATURE_LD_ST_TILEBUFFER, -+ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, -+ BASE_HW_FEATURE_MRT, -+ BASE_HW_FEATURE_MSAA_16X, -+ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, -+ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, -+ BASE_HW_FEATURE_T7XX_PAIRING_RULES, -+ BASE_HW_FEATURE_TEST4_DATUM_MODE, -+ BASE_HW_FEATURE_FLUSH_REDUCTION, -+ BASE_HW_FEATURE_PROTECTED_MODE, -+ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, -+ BASE_HW_FEATURE_COHERENCY_REG, -+ BASE_HW_FEATURE_END -+}; ++ mali_hw_core_register_write(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_POWER_DOWN, mask); + ++ /* ++ * Do not wait for interrupt on Mali-300/400 if all domains are ++ * powered off by our power down command, because the HW will simply ++ * not generate an interrupt in this case. ++ */ ++ if (mali_is_mali450() || mali_is_mali470() || pmu->registered_cores_mask != (mask | stat)) { ++ err = mali_pmu_wait_for_command_finish(pmu); ++ if (_MALI_OSK_ERR_OK != err) { ++ return err; ++ } ++ } else { ++ mali_hw_core_register_write(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_INT_CLEAR, PMU_REG_VAL_IRQ); ++ } + ++#if defined(DEBUG) ++ /* Verify power status of domains after power down */ ++ stat = mali_hw_core_register_read(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_STATUS); ++ MALI_DEBUG_ASSERT(mask == (stat & mask)); ++#endif + ++ return _MALI_OSK_ERR_OK; ++} + ++_mali_osk_errcode_t mali_pmu_power_up(struct mali_pmu_core *pmu, u32 mask) ++{ ++ u32 stat; ++ _mali_osk_errcode_t err; ++#if !defined(CONFIG_MALI_PMU_PARALLEL_POWER_UP) ++ u32 current_domain; ++#endif + -+#endif /* _BASE_HWCONFIG_FEATURES_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_base_hwconfig_issues.h b/drivers/gpu/arm/bifrost_for_linux/mali_base_hwconfig_issues.h ++ MALI_DEBUG_ASSERT_POINTER(pmu); ++ MALI_DEBUG_ASSERT(pmu->registered_cores_mask != 0); ++ MALI_DEBUG_ASSERT(mask <= pmu->registered_cores_mask); ++ MALI_DEBUG_ASSERT(0 == (mali_hw_core_register_read(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_INT_RAWSTAT) & ++ PMU_REG_VAL_IRQ)); ++ ++ MALI_DEBUG_PRINT(3, ++ ("PMU power up: ........................ [%s]\n", ++ mali_pm_mask_to_string(mask))); ++ ++ stat = mali_hw_core_register_read(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_STATUS); ++ stat &= pmu->registered_cores_mask; ++ ++ mask &= ~(0x1 << MALI_DOMAIN_INDEX_DUMMY); ++ if (0 == mask || 0 == (stat & mask)) return _MALI_OSK_ERR_OK; ++ ++ /* ++ * Assert that we are only powering up domains which are currently ++ * powered down. ++ */ ++ MALI_DEBUG_ASSERT(mask == (stat & mask)); ++ ++#if defined(CONFIG_MALI_PMU_PARALLEL_POWER_UP) ++ mali_hw_core_register_write(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_POWER_UP, mask); ++ ++ err = mali_pmu_wait_for_command_finish(pmu); ++ if (_MALI_OSK_ERR_OK != err) { ++ return err; ++ } ++#else ++ for (current_domain = 1; ++ current_domain <= pmu->registered_cores_mask; ++ current_domain <<= 1) { ++ if (current_domain & mask & stat) { ++ mali_hw_core_register_write(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_POWER_UP, ++ current_domain); ++ ++ err = mali_pmu_wait_for_command_finish(pmu); ++ if (_MALI_OSK_ERR_OK != err) { ++ return err; ++ } ++ } ++ } ++#endif ++ ++#if defined(DEBUG) ++ /* Verify power status of domains after power up */ ++ stat = mali_hw_core_register_read(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_STATUS); ++ MALI_DEBUG_ASSERT(0 == (stat & mask)); ++#endif /* defined(DEBUG) */ ++ ++ return _MALI_OSK_ERR_OK; ++} ++ ++static _mali_osk_errcode_t mali_pmu_wait_for_command_finish( ++ struct mali_pmu_core *pmu) ++{ ++ u32 rawstat; ++ u32 timeout = MALI_REG_POLL_COUNT_SLOW; ++ ++ MALI_DEBUG_ASSERT(pmu); ++ ++ /* Wait for the command to complete */ ++ do { ++ rawstat = mali_hw_core_register_read(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_INT_RAWSTAT); ++ --timeout; ++ } while (0 == (rawstat & PMU_REG_VAL_IRQ) && 0 < timeout); ++ ++ MALI_DEBUG_ASSERT(0 < timeout); ++ ++ if (0 == timeout) { ++ return _MALI_OSK_ERR_TIMEOUT; ++ } ++ ++ mali_hw_core_register_write(&pmu->hw_core, ++ PMU_REG_ADDR_MGMT_INT_CLEAR, PMU_REG_VAL_IRQ); ++ ++ return _MALI_OSK_ERR_OK; ++} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pmu.h b/drivers/gpu/arm/mali400/mali/common/mali_pmu.h new file mode 100755 -index 000000000000..1c5ee496ac85 +index 000000000..5b856240f --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_base_hwconfig_issues.h -@@ -0,0 +1,1126 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.h +@@ -0,0 +1,123 @@ +/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ ++/** ++ * @file mali_platform.h ++ * Platform specific Mali driver functions ++ */ ++ ++#ifndef __MALI_PMU_H__ ++#define __MALI_PMU_H__ ++ ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_hw_core.h" ++ ++/** @brief MALI inbuilt PMU hardware info and PMU hardware has knowledge of cores power mask ++ */ ++struct mali_pmu_core { ++ struct mali_hw_core hw_core; ++ u32 registered_cores_mask; ++ u32 switch_delay; ++}; ++ ++/** @brief Register layout for hardware PMU ++ */ ++typedef enum { ++ PMU_REG_ADDR_MGMT_POWER_UP = 0x00, /*< Power up register */ ++ PMU_REG_ADDR_MGMT_POWER_DOWN = 0x04, /*< Power down register */ ++ PMU_REG_ADDR_MGMT_STATUS = 0x08, /*< Core sleep status register */ ++ PMU_REG_ADDR_MGMT_INT_MASK = 0x0C, /*< Interrupt mask register */ ++ PMU_REG_ADDR_MGMT_INT_RAWSTAT = 0x10, /*< Interrupt raw status register */ ++ PMU_REG_ADDR_MGMT_INT_CLEAR = 0x18, /*< Interrupt clear register */ ++ PMU_REG_ADDR_MGMT_SW_DELAY = 0x1C, /*< Switch delay register */ ++ PMU_REGISTER_ADDRESS_SPACE_SIZE = 0x28, /*< Size of register space */ ++} pmu_reg_addr_mgmt_addr; ++ ++#define PMU_REG_VAL_IRQ 1 ++ ++extern struct mali_pmu_core *mali_global_pmu_core; ++ ++/** @brief Initialisation of MALI PMU + * -+ * (C) COPYRIGHT 2015-2017 ARM Limited. All rights reserved. ++ * This is called from entry point of the driver in order to create and intialize the PMU resource + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * @param resource it will be a pointer to a PMU resource ++ * @param number_of_pp_cores Number of found PP resources in configuration ++ * @param number_of_l2_caches Number of found L2 cache resources in configuration ++ * @return The created PMU object, or NULL in case of failure. ++ */ ++struct mali_pmu_core *mali_pmu_create(_mali_osk_resource_t *resource); ++ ++/** @brief It deallocates the PMU resource + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * This is called on the exit of the driver to terminate the PMU resource + * ++ * @param pmu Pointer to PMU core object to delete + */ ++void mali_pmu_delete(struct mali_pmu_core *pmu); + ++/** @brief Set registered cores mask ++ * ++ * @param pmu Pointer to PMU core object ++ * @param mask All available/valid domain bits ++ */ ++void mali_pmu_set_registered_cores_mask(struct mali_pmu_core *pmu, u32 mask); + ++/** @brief Retrieves the Mali PMU core object (if any) ++ * ++ * @return The Mali PMU object, or NULL if no PMU exists. ++ */ ++MALI_STATIC_INLINE struct mali_pmu_core *mali_pmu_get_global_pmu_core(void) ++{ ++ return mali_global_pmu_core; ++} + -+/* AUTOMATICALLY GENERATED FILE. If you want to amend the issues/features, -+ * please update base/tools/hwconfig_generator/hwc_{issues,features}.py -+ * For more information see base/tools/hwconfig_generator/README ++/** @brief Reset PMU core ++ * ++ * @param pmu Pointer to PMU core object to reset + */ ++void mali_pmu_reset(struct mali_pmu_core *pmu); + -+#ifndef _BASE_HWCONFIG_ISSUES_H_ -+#define _BASE_HWCONFIG_ISSUES_H_ ++void mali_pmu_power_up_all(struct mali_pmu_core *pmu); + -+enum base_hw_issue { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_6367, -+ BASE_HW_ISSUE_6398, -+ BASE_HW_ISSUE_6402, -+ BASE_HW_ISSUE_6787, -+ BASE_HW_ISSUE_7027, -+ BASE_HW_ISSUE_7144, -+ BASE_HW_ISSUE_7304, -+ BASE_HW_ISSUE_8073, -+ BASE_HW_ISSUE_8186, -+ BASE_HW_ISSUE_8215, -+ BASE_HW_ISSUE_8245, -+ BASE_HW_ISSUE_8250, -+ BASE_HW_ISSUE_8260, -+ BASE_HW_ISSUE_8280, -+ BASE_HW_ISSUE_8316, -+ BASE_HW_ISSUE_8381, -+ BASE_HW_ISSUE_8394, -+ BASE_HW_ISSUE_8401, -+ BASE_HW_ISSUE_8408, -+ BASE_HW_ISSUE_8443, -+ BASE_HW_ISSUE_8456, -+ BASE_HW_ISSUE_8564, -+ BASE_HW_ISSUE_8634, -+ BASE_HW_ISSUE_8778, -+ BASE_HW_ISSUE_8791, -+ BASE_HW_ISSUE_8833, -+ BASE_HW_ISSUE_8879, -+ BASE_HW_ISSUE_8896, -+ BASE_HW_ISSUE_8975, -+ BASE_HW_ISSUE_8986, -+ BASE_HW_ISSUE_8987, -+ BASE_HW_ISSUE_9010, -+ BASE_HW_ISSUE_9418, -+ BASE_HW_ISSUE_9423, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_9510, -+ BASE_HW_ISSUE_9566, -+ BASE_HW_ISSUE_9630, -+ BASE_HW_ISSUE_10127, -+ BASE_HW_ISSUE_10327, -+ BASE_HW_ISSUE_10410, -+ BASE_HW_ISSUE_10471, -+ BASE_HW_ISSUE_10472, -+ BASE_HW_ISSUE_10487, -+ BASE_HW_ISSUE_10607, -+ BASE_HW_ISSUE_10632, -+ BASE_HW_ISSUE_10649, -+ BASE_HW_ISSUE_10676, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_10684, -+ BASE_HW_ISSUE_10797, -+ BASE_HW_ISSUE_10817, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10931, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_10959, -+ BASE_HW_ISSUE_10969, -+ BASE_HW_ISSUE_10984, -+ BASE_HW_ISSUE_10995, -+ BASE_HW_ISSUE_11012, -+ BASE_HW_ISSUE_11020, -+ BASE_HW_ISSUE_11024, -+ BASE_HW_ISSUE_11035, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T720_1386, -+ BASE_HW_ISSUE_T76X_26, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3542, -+ BASE_HW_ISSUE_T76X_3556, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3960, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_T76X_3966, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_7940, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TMIX_8138, -+ BASE_HW_ISSUE_TMIX_8206, -+ BASE_HW_ISSUE_TMIX_8343, -+ BASE_HW_ISSUE_TMIX_8463, -+ BASE_HW_ISSUE_TMIX_8456, -+ GPUCORE_1619, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++void mali_pmu_power_down_all(struct mali_pmu_core *pmu); + -+static const enum base_hw_issue base_hw_issues_generic[] = { -+ BASE_HW_ISSUE_END -+}; ++/** @brief Returns a mask of the currently powered up domains ++ * ++ * @param pmu Pointer to PMU core object ++ */ ++MALI_STATIC_INLINE u32 mali_pmu_get_mask(struct mali_pmu_core *pmu) ++{ ++ u32 stat = mali_hw_core_register_read(&pmu->hw_core, PMU_REG_ADDR_MGMT_STATUS); ++ return ((~stat) & pmu->registered_cores_mask); ++} + -+static const enum base_hw_issue base_hw_issues_t60x_r0p0_15dev0[] = { -+ BASE_HW_ISSUE_6367, -+ BASE_HW_ISSUE_6398, -+ BASE_HW_ISSUE_6402, -+ BASE_HW_ISSUE_6787, -+ BASE_HW_ISSUE_7027, -+ BASE_HW_ISSUE_7144, -+ BASE_HW_ISSUE_7304, -+ BASE_HW_ISSUE_8073, -+ BASE_HW_ISSUE_8186, -+ BASE_HW_ISSUE_8215, -+ BASE_HW_ISSUE_8245, -+ BASE_HW_ISSUE_8250, -+ BASE_HW_ISSUE_8260, -+ BASE_HW_ISSUE_8280, -+ BASE_HW_ISSUE_8316, -+ BASE_HW_ISSUE_8381, -+ BASE_HW_ISSUE_8394, -+ BASE_HW_ISSUE_8401, -+ BASE_HW_ISSUE_8408, -+ BASE_HW_ISSUE_8443, -+ BASE_HW_ISSUE_8456, -+ BASE_HW_ISSUE_8564, -+ BASE_HW_ISSUE_8634, -+ BASE_HW_ISSUE_8778, -+ BASE_HW_ISSUE_8791, -+ BASE_HW_ISSUE_8833, -+ BASE_HW_ISSUE_8896, -+ BASE_HW_ISSUE_8975, -+ BASE_HW_ISSUE_8986, -+ BASE_HW_ISSUE_8987, -+ BASE_HW_ISSUE_9010, -+ BASE_HW_ISSUE_9418, -+ BASE_HW_ISSUE_9423, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_9510, -+ BASE_HW_ISSUE_9566, -+ BASE_HW_ISSUE_9630, -+ BASE_HW_ISSUE_10410, -+ BASE_HW_ISSUE_10471, -+ BASE_HW_ISSUE_10472, -+ BASE_HW_ISSUE_10487, -+ BASE_HW_ISSUE_10607, -+ BASE_HW_ISSUE_10632, -+ BASE_HW_ISSUE_10649, -+ BASE_HW_ISSUE_10676, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_10684, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10931, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_10969, -+ BASE_HW_ISSUE_10984, -+ BASE_HW_ISSUE_10995, -+ BASE_HW_ISSUE_11012, -+ BASE_HW_ISSUE_11020, -+ BASE_HW_ISSUE_11035, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_3964, -+ GPUCORE_1619, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++/** @brief MALI GPU power down using MALI in-built PMU ++ * ++ * Called to power down the specified cores. ++ * ++ * @param pmu Pointer to PMU core object to power down ++ * @param mask Mask specifying which power domains to power down ++ * @return _MALI_OSK_ERR_OK on success otherwise, a suitable _mali_osk_errcode_t error. ++ */ ++_mali_osk_errcode_t mali_pmu_power_down(struct mali_pmu_core *pmu, u32 mask); + -+static const enum base_hw_issue base_hw_issues_t60x_r0p0_eac[] = { -+ BASE_HW_ISSUE_6367, -+ BASE_HW_ISSUE_6402, -+ BASE_HW_ISSUE_6787, -+ BASE_HW_ISSUE_7027, -+ BASE_HW_ISSUE_7304, -+ BASE_HW_ISSUE_8408, -+ BASE_HW_ISSUE_8564, -+ BASE_HW_ISSUE_8778, -+ BASE_HW_ISSUE_8975, -+ BASE_HW_ISSUE_9010, -+ BASE_HW_ISSUE_9418, -+ BASE_HW_ISSUE_9423, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_9510, -+ BASE_HW_ISSUE_10410, -+ BASE_HW_ISSUE_10471, -+ BASE_HW_ISSUE_10472, -+ BASE_HW_ISSUE_10487, -+ BASE_HW_ISSUE_10607, -+ BASE_HW_ISSUE_10632, -+ BASE_HW_ISSUE_10649, -+ BASE_HW_ISSUE_10676, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_10684, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10931, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_10969, -+ BASE_HW_ISSUE_11012, -+ BASE_HW_ISSUE_11020, -+ BASE_HW_ISSUE_11035, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++/** @brief MALI GPU power up using MALI in-built PMU ++ * ++ * Called to power up the specified cores. ++ * ++ * @param pmu Pointer to PMU core object to power up ++ * @param mask Mask specifying which power domains to power up ++ * @return _MALI_OSK_ERR_OK on success otherwise, a suitable _mali_osk_errcode_t error. ++ */ ++_mali_osk_errcode_t mali_pmu_power_up(struct mali_pmu_core *pmu, u32 mask); + -+static const enum base_hw_issue base_hw_issues_t60x_r0p1[] = { -+ BASE_HW_ISSUE_6367, -+ BASE_HW_ISSUE_6402, -+ BASE_HW_ISSUE_6787, -+ BASE_HW_ISSUE_7027, -+ BASE_HW_ISSUE_7304, -+ BASE_HW_ISSUE_8408, -+ BASE_HW_ISSUE_8564, -+ BASE_HW_ISSUE_8778, -+ BASE_HW_ISSUE_8975, -+ BASE_HW_ISSUE_9010, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_9510, -+ BASE_HW_ISSUE_10410, -+ BASE_HW_ISSUE_10471, -+ BASE_HW_ISSUE_10472, -+ BASE_HW_ISSUE_10487, -+ BASE_HW_ISSUE_10607, -+ BASE_HW_ISSUE_10632, -+ BASE_HW_ISSUE_10649, -+ BASE_HW_ISSUE_10676, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_10684, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10931, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11012, -+ BASE_HW_ISSUE_11020, -+ BASE_HW_ISSUE_11035, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++#endif /* __MALI_PMU_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp.c b/drivers/gpu/arm/mali400/mali/common/mali_pp.c +new file mode 100755 +index 000000000..2dd8b8766 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.c +@@ -0,0 +1,502 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+static const enum base_hw_issue base_hw_issues_t62x_r0p1[] = { -+ BASE_HW_ISSUE_6402, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10127, -+ BASE_HW_ISSUE_10327, -+ BASE_HW_ISSUE_10410, -+ BASE_HW_ISSUE_10471, -+ BASE_HW_ISSUE_10472, -+ BASE_HW_ISSUE_10487, -+ BASE_HW_ISSUE_10607, -+ BASE_HW_ISSUE_10632, -+ BASE_HW_ISSUE_10649, -+ BASE_HW_ISSUE_10676, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_10684, -+ BASE_HW_ISSUE_10817, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10931, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_10959, -+ BASE_HW_ISSUE_11012, -+ BASE_HW_ISSUE_11020, -+ BASE_HW_ISSUE_11024, -+ BASE_HW_ISSUE_11035, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++#include "mali_pp_job.h" ++#include "mali_pp.h" ++#include "mali_hw_core.h" ++#include "mali_group.h" ++#include "regs/mali_200_regs.h" ++#include "mali_kernel_common.h" ++#include "mali_kernel_core.h" + -+static const enum base_hw_issue base_hw_issues_t62x_r1p0[] = { -+ BASE_HW_ISSUE_6402, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10471, -+ BASE_HW_ISSUE_10472, -+ BASE_HW_ISSUE_10649, -+ BASE_HW_ISSUE_10684, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10931, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_10959, -+ BASE_HW_ISSUE_11012, -+ BASE_HW_ISSUE_11020, -+ BASE_HW_ISSUE_11024, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++#if defined(CONFIG_MALI400_PROFILING) ++#include "mali_osk_profiling.h" ++#endif + -+static const enum base_hw_issue base_hw_issues_t62x_r1p1[] = { -+ BASE_HW_ISSUE_6402, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10471, -+ BASE_HW_ISSUE_10472, -+ BASE_HW_ISSUE_10649, -+ BASE_HW_ISSUE_10684, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10931, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_10959, -+ BASE_HW_ISSUE_11012, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++/* Number of frame registers on Mali-200 */ ++#define MALI_PP_MALI200_NUM_FRAME_REGISTERS ((0x04C/4)+1) ++/* Number of frame registers on Mali-300 and later */ ++#define MALI_PP_MALI400_NUM_FRAME_REGISTERS ((0x058/4)+1) + -+static const enum base_hw_issue base_hw_issues_t76x_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11020, -+ BASE_HW_ISSUE_11024, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_26, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3542, -+ BASE_HW_ISSUE_T76X_3556, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3960, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_T76X_3966, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++static struct mali_pp_core *mali_global_pp_cores[MALI_MAX_NUMBER_OF_PP_CORES] = { NULL }; ++static u32 mali_global_num_pp_cores = 0; + -+static const enum base_hw_issue base_hw_issues_t76x_r0p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11020, -+ BASE_HW_ISSUE_11024, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_26, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3542, -+ BASE_HW_ISSUE_T76X_3556, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3960, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_T76X_3966, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++/* Interrupt handlers */ ++static void mali_pp_irq_probe_trigger(void *data); ++static _mali_osk_errcode_t mali_pp_irq_probe_ack(void *data); + -+static const enum base_hw_issue base_hw_issues_t76x_r0p1_50rel0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_26, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3542, -+ BASE_HW_ISSUE_T76X_3556, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3960, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_T76X_3966, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++struct mali_pp_core *mali_pp_create(const _mali_osk_resource_t *resource, struct mali_group *group, mali_bool is_virtual, u32 bcast_id) ++{ ++ struct mali_pp_core *core = NULL; + -+static const enum base_hw_issue base_hw_issues_t76x_r0p2[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11020, -+ BASE_HW_ISSUE_11024, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_26, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3542, -+ BASE_HW_ISSUE_T76X_3556, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3960, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_T76X_3966, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ MALI_DEBUG_PRINT(2, ("Mali PP: Creating Mali PP core: %s\n", resource->description)); ++ MALI_DEBUG_PRINT(2, ("Mali PP: Base address of PP core: 0x%x\n", resource->base)); + -+static const enum base_hw_issue base_hw_issues_t76x_r0p3[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_26, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3542, -+ BASE_HW_ISSUE_T76X_3556, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3960, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_T76X_3966, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ if (mali_global_num_pp_cores >= MALI_MAX_NUMBER_OF_PP_CORES) { ++ MALI_PRINT_ERROR(("Mali PP: Too many PP core objects created\n")); ++ return NULL; ++ } + -+static const enum base_hw_issue base_hw_issues_t76x_r1p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3960, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_T76X_3966, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ core = _mali_osk_calloc(1, sizeof(struct mali_pp_core)); ++ if (NULL != core) { ++ core->core_id = mali_global_num_pp_cores; ++ core->bcast_id = bcast_id; + -+static const enum base_hw_issue base_hw_issues_t72x_r0p0[] = { -+ BASE_HW_ISSUE_6402, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10471, -+ BASE_HW_ISSUE_10649, -+ BASE_HW_ISSUE_10684, -+ BASE_HW_ISSUE_10797, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ if (_MALI_OSK_ERR_OK == mali_hw_core_create(&core->hw_core, resource, MALI200_REG_SIZEOF_REGISTER_BANK)) { ++ _mali_osk_errcode_t ret; + -+static const enum base_hw_issue base_hw_issues_t72x_r1p0[] = { -+ BASE_HW_ISSUE_6402, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10471, -+ BASE_HW_ISSUE_10649, -+ BASE_HW_ISSUE_10684, -+ BASE_HW_ISSUE_10797, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T720_1386, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ if (!is_virtual) { ++ ret = mali_pp_reset(core); ++ } else { ++ ret = _MALI_OSK_ERR_OK; ++ } + -+static const enum base_hw_issue base_hw_issues_t72x_r1p1[] = { -+ BASE_HW_ISSUE_6402, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10471, -+ BASE_HW_ISSUE_10649, -+ BASE_HW_ISSUE_10684, -+ BASE_HW_ISSUE_10797, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T720_1386, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ if (_MALI_OSK_ERR_OK == ret) { ++ ret = mali_group_add_pp_core(group, core); ++ if (_MALI_OSK_ERR_OK == ret) { ++ /* Setup IRQ handlers (which will do IRQ probing if needed) */ ++ MALI_DEBUG_ASSERT(!is_virtual || -1 != resource->irq); + -+static const enum base_hw_issue base_hw_issues_model_t72x[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_6402, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10471, -+ BASE_HW_ISSUE_10649, -+ BASE_HW_ISSUE_10797, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3964, -+ GPUCORE_1619, -+ BASE_HW_ISSUE_END -+}; ++ core->irq = _mali_osk_irq_init(resource->irq, ++ mali_group_upper_half_pp, ++ group, ++ mali_pp_irq_probe_trigger, ++ mali_pp_irq_probe_ack, ++ core, ++ resource->description); ++ if (NULL != core->irq) { ++ mali_global_pp_cores[mali_global_num_pp_cores] = core; ++ mali_global_num_pp_cores++; + -+static const enum base_hw_issue base_hw_issues_model_t76x[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_11020, -+ BASE_HW_ISSUE_11024, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ GPUCORE_1619, -+ BASE_HW_ISSUE_END -+}; ++ return core; ++ } else { ++ MALI_PRINT_ERROR(("Mali PP: Failed to setup interrupt handlers for PP core %s\n", core->hw_core.description)); ++ } ++ mali_group_remove_pp_core(group); ++ } else { ++ MALI_PRINT_ERROR(("Mali PP: Failed to add core %s to group\n", core->hw_core.description)); ++ } ++ } ++ mali_hw_core_delete(&core->hw_core); ++ } + -+static const enum base_hw_issue base_hw_issues_model_t60x[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_6402, -+ BASE_HW_ISSUE_8778, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10472, -+ BASE_HW_ISSUE_10649, -+ BASE_HW_ISSUE_10931, -+ BASE_HW_ISSUE_11012, -+ BASE_HW_ISSUE_11020, -+ BASE_HW_ISSUE_11024, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3964, -+ GPUCORE_1619, -+ BASE_HW_ISSUE_END -+}; ++ _mali_osk_free(core); ++ } else { ++ MALI_PRINT_ERROR(("Mali PP: Failed to allocate memory for PP core\n")); ++ } + -+static const enum base_hw_issue base_hw_issues_model_t62x[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_6402, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10472, -+ BASE_HW_ISSUE_10649, -+ BASE_HW_ISSUE_10931, -+ BASE_HW_ISSUE_11012, -+ BASE_HW_ISSUE_11020, -+ BASE_HW_ISSUE_11024, -+ BASE_HW_ISSUE_11042, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3964, -+ GPUCORE_1619, -+ BASE_HW_ISSUE_END -+}; ++ return NULL; ++} + -+static const enum base_hw_issue base_hw_issues_tFRx_r0p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3960, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_T76X_3966, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++void mali_pp_delete(struct mali_pp_core *core) ++{ ++ u32 i; + -+static const enum base_hw_issue base_hw_issues_tFRx_r0p2[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_T76X_3966, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ MALI_DEBUG_ASSERT_POINTER(core); + -+static const enum base_hw_issue base_hw_issues_tFRx_r1p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3966, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ _mali_osk_irq_term(core->irq); ++ mali_hw_core_delete(&core->hw_core); + -+static const enum base_hw_issue base_hw_issues_tFRx_r2p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3966, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ /* Remove core from global list */ ++ for (i = 0; i < mali_global_num_pp_cores; i++) { ++ if (mali_global_pp_cores[i] == core) { ++ mali_global_pp_cores[i] = NULL; ++ mali_global_num_pp_cores--; + -+static const enum base_hw_issue base_hw_issues_model_tFRx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ GPUCORE_1619, -+ BASE_HW_ISSUE_END -+}; ++ if (i != mali_global_num_pp_cores) { ++ /* We removed a PP core from the middle of the array -- move the last ++ * PP core to the current position to close the gap */ ++ mali_global_pp_cores[i] = mali_global_pp_cores[mali_global_num_pp_cores]; ++ mali_global_pp_cores[mali_global_num_pp_cores] = NULL; ++ } + -+static const enum base_hw_issue base_hw_issues_t86x_r0p2[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_T76X_3966, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ break; ++ } ++ } + -+static const enum base_hw_issue base_hw_issues_t86x_r1p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3966, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ _mali_osk_free(core); ++} + -+static const enum base_hw_issue base_hw_issues_t86x_r2p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3966, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++void mali_pp_stop_bus(struct mali_pp_core *core) ++{ ++ MALI_DEBUG_ASSERT_POINTER(core); ++ /* Will only send the stop bus command, and not wait for it to complete */ ++ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_CTRL_MGMT, MALI200_REG_VAL_CTRL_MGMT_STOP_BUS); ++} + -+static const enum base_hw_issue base_hw_issues_model_t86x[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ GPUCORE_1619, -+ BASE_HW_ISSUE_END -+}; ++_mali_osk_errcode_t mali_pp_stop_bus_wait(struct mali_pp_core *core) ++{ ++ int i; + -+static const enum base_hw_issue base_hw_issues_t83x_r0p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T720_1386, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3960, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ MALI_DEBUG_ASSERT_POINTER(core); + -+static const enum base_hw_issue base_hw_issues_t83x_r1p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T720_1386, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3960, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ /* Send the stop bus command. */ ++ mali_pp_stop_bus(core); + -+static const enum base_hw_issue base_hw_issues_model_t83x[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ GPUCORE_1619, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ /* Wait for bus to be stopped */ ++ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; i++) { ++ if (mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_STATUS) & MALI200_REG_VAL_STATUS_BUS_STOPPED) ++ break; ++ } + -+static const enum base_hw_issue base_hw_issues_t82x_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T720_1386, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3960, -+ BASE_HW_ISSUE_T76X_3964, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ if (MALI_REG_POLL_COUNT_FAST == i) { ++ MALI_PRINT_ERROR(("Mali PP: Failed to stop bus on %s. Status: 0x%08x\n", core->hw_core.description, mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_STATUS))); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ return _MALI_OSK_ERR_OK; ++} + -+static const enum base_hw_issue base_hw_issues_t82x_r0p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T720_1386, -+ BASE_HW_ISSUE_T76X_1909, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3960, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END ++/* Frame register reset values. ++ * Taken from the Mali400 TRM, 3.6. Pixel processor control register summary */ ++static const u32 mali_frame_registers_reset_values[_MALI_PP_MAX_FRAME_REGISTERS] = { ++ 0x0, /* Renderer List Address Register */ ++ 0x0, /* Renderer State Word Base Address Register */ ++ 0x0, /* Renderer Vertex Base Register */ ++ 0x2, /* Feature Enable Register */ ++ 0x0, /* Z Clear Value Register */ ++ 0x0, /* Stencil Clear Value Register */ ++ 0x0, /* ABGR Clear Value 0 Register */ ++ 0x0, /* ABGR Clear Value 1 Register */ ++ 0x0, /* ABGR Clear Value 2 Register */ ++ 0x0, /* ABGR Clear Value 3 Register */ ++ 0x0, /* Bounding Box Left Right Register */ ++ 0x0, /* Bounding Box Bottom Register */ ++ 0x0, /* FS Stack Address Register */ ++ 0x0, /* FS Stack Size and Initial Value Register */ ++ 0x0, /* Reserved */ ++ 0x0, /* Reserved */ ++ 0x0, /* Origin Offset X Register */ ++ 0x0, /* Origin Offset Y Register */ ++ 0x75, /* Subpixel Specifier Register */ ++ 0x0, /* Tiebreak mode Register */ ++ 0x0, /* Polygon List Format Register */ ++ 0x0, /* Scaling Register */ ++ 0x0 /* Tilebuffer configuration Register */ +}; + -+static const enum base_hw_issue base_hw_issues_t82x_r1p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10821, -+ BASE_HW_ISSUE_10883, -+ BASE_HW_ISSUE_10946, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T720_1386, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_T76X_3960, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END ++/* WBx register reset values */ ++static const u32 mali_wb_registers_reset_values[_MALI_PP_MAX_WB_REGISTERS] = { ++ 0x0, /* WBx Source Select Register */ ++ 0x0, /* WBx Target Address Register */ ++ 0x0, /* WBx Target Pixel Format Register */ ++ 0x0, /* WBx Target AA Format Register */ ++ 0x0, /* WBx Target Layout */ ++ 0x0, /* WBx Target Scanline Length */ ++ 0x0, /* WBx Target Flags Register */ ++ 0x0, /* WBx MRT Enable Register */ ++ 0x0, /* WBx MRT Offset Register */ ++ 0x0, /* WBx Global Test Enable Register */ ++ 0x0, /* WBx Global Test Reference Value Register */ ++ 0x0 /* WBx Global Test Compare Function Register */ +}; + -+static const enum base_hw_issue base_hw_issues_model_t82x[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_11051, -+ BASE_HW_ISSUE_T76X_1963, -+ BASE_HW_ISSUE_T76X_3086, -+ BASE_HW_ISSUE_T76X_3700, -+ BASE_HW_ISSUE_T76X_3793, -+ BASE_HW_ISSUE_T76X_3979, -+ BASE_HW_ISSUE_TMIX_7891, -+ GPUCORE_1619, -+ BASE_HW_ISSUE_END -+}; ++/* Performance Counter 0 Enable Register reset value */ ++static const u32 mali_perf_cnt_enable_reset_value = 0; + -+static const enum base_hw_issue base_hw_issues_tMIx_r0p0_05dev0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_T76X_3953, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TMIX_8138, -+ BASE_HW_ISSUE_TMIX_8206, -+ BASE_HW_ISSUE_TMIX_8343, -+ BASE_HW_ISSUE_TMIX_8463, -+ BASE_HW_ISSUE_TMIX_8456, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++_mali_osk_errcode_t mali_pp_hard_reset(struct mali_pp_core *core) ++{ ++ /* Bus must be stopped before calling this function */ ++ const u32 reset_wait_target_register = MALI200_REG_ADDR_MGMT_PERF_CNT_0_LIMIT; ++ const u32 reset_invalid_value = 0xC0FFE000; ++ const u32 reset_check_value = 0xC01A0000; ++ int i; + -+static const enum base_hw_issue base_hw_issues_tMIx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_7940, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TMIX_8138, -+ BASE_HW_ISSUE_TMIX_8206, -+ BASE_HW_ISSUE_TMIX_8343, -+ BASE_HW_ISSUE_TMIX_8463, -+ BASE_HW_ISSUE_TMIX_8456, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ MALI_DEBUG_ASSERT_POINTER(core); ++ MALI_DEBUG_PRINT(2, ("Mali PP: Hard reset of core %s\n", core->hw_core.description)); + -+static const enum base_hw_issue base_hw_issues_tMIx_r0p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_7940, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TMIX_8138, -+ BASE_HW_ISSUE_TMIX_8206, -+ BASE_HW_ISSUE_TMIX_8343, -+ BASE_HW_ISSUE_TMIX_8463, -+ BASE_HW_ISSUE_TMIX_8456, -+ BASE_HW_ISSUE_TMIX_8438, -+ BASE_HW_ISSUE_END -+}; ++ /* Set register to a bogus value. The register will be used to detect when reset is complete */ ++ mali_hw_core_register_write_relaxed(&core->hw_core, reset_wait_target_register, reset_invalid_value); ++ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK, MALI200_REG_VAL_IRQ_MASK_NONE); + -+static const enum base_hw_issue base_hw_issues_model_tMIx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_7940, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TMIX_8138, -+ BASE_HW_ISSUE_TMIX_8206, -+ BASE_HW_ISSUE_TMIX_8343, -+ BASE_HW_ISSUE_TMIX_8456, -+ BASE_HW_ISSUE_END -+}; ++ /* Force core to reset */ ++ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_CTRL_MGMT, MALI200_REG_VAL_CTRL_MGMT_FORCE_RESET); + -+static const enum base_hw_issue base_hw_issues_tHEx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_END -+}; ++ /* Wait for reset to be complete */ ++ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; i++) { ++ mali_hw_core_register_write(&core->hw_core, reset_wait_target_register, reset_check_value); ++ if (reset_check_value == mali_hw_core_register_read(&core->hw_core, reset_wait_target_register)) { ++ break; ++ } ++ } + -+static const enum base_hw_issue base_hw_issues_tHEx_r0p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_END -+}; ++ if (MALI_REG_POLL_COUNT_FAST == i) { ++ MALI_PRINT_ERROR(("Mali PP: The hard reset loop didn't work, unable to recover\n")); ++ } + -+static const enum base_hw_issue base_hw_issues_tHEx_r0p2[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_END -+}; ++ mali_hw_core_register_write(&core->hw_core, reset_wait_target_register, 0x00000000); /* set it back to the default */ ++ /* Re-enable interrupts */ ++ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_CLEAR, MALI200_REG_VAL_IRQ_MASK_ALL); ++ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK, MALI200_REG_VAL_IRQ_MASK_USED); + -+static const enum base_hw_issue base_hw_issues_tHEx_r0p3[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_10682, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_END -+}; ++ return _MALI_OSK_ERR_OK; ++} + -+static const enum base_hw_issue base_hw_issues_model_tHEx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_7891, -+ BASE_HW_ISSUE_TMIX_8042, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_END -+}; ++void mali_pp_reset_async(struct mali_pp_core *core) ++{ ++ MALI_DEBUG_ASSERT_POINTER(core); + -+static const enum base_hw_issue base_hw_issues_tSIx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_END -+}; ++ MALI_DEBUG_PRINT(4, ("Mali PP: Reset of core %s\n", core->hw_core.description)); + -+static const enum base_hw_issue base_hw_issues_tSIx_r0p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_END -+}; ++ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK, 0); /* disable the IRQs */ ++ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_RAWSTAT, MALI200_REG_VAL_IRQ_MASK_ALL); ++ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_CTRL_MGMT, MALI400PP_REG_VAL_CTRL_MGMT_SOFT_RESET); ++} + -+static const enum base_hw_issue base_hw_issues_tSIx_r1p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_END -+}; ++_mali_osk_errcode_t mali_pp_reset_wait(struct mali_pp_core *core) ++{ ++ int i; ++ u32 rawstat = 0; + -+static const enum base_hw_issue base_hw_issues_tSIx_r1p1[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_END -+}; ++ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; i++) { ++ u32 status = mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_STATUS); ++ if (!(status & MALI200_REG_VAL_STATUS_RENDERING_ACTIVE)) { ++ rawstat = mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_RAWSTAT); ++ if (rawstat == MALI400PP_REG_VAL_IRQ_RESET_COMPLETED) { ++ break; ++ } ++ } ++ } + -+static const enum base_hw_issue base_hw_issues_model_tSIx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_END -+}; ++ if (i == MALI_REG_POLL_COUNT_FAST) { ++ MALI_PRINT_ERROR(("Mali PP: Failed to reset core %s, rawstat: 0x%08x\n", ++ core->hw_core.description, rawstat)); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+static const enum base_hw_issue base_hw_issues_tDVx_r0p0[] = { -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_11054, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_END -+}; ++ /* Re-enable interrupts */ ++ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_CLEAR, MALI200_REG_VAL_IRQ_MASK_ALL); ++ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK, MALI200_REG_VAL_IRQ_MASK_USED); + -+static const enum base_hw_issue base_hw_issues_model_tDVx[] = { -+ BASE_HW_ISSUE_5736, -+ BASE_HW_ISSUE_9435, -+ BASE_HW_ISSUE_TMIX_8133, -+ BASE_HW_ISSUE_TSIX_1116, -+ BASE_HW_ISSUE_END -+}; ++ return _MALI_OSK_ERR_OK; ++} + ++_mali_osk_errcode_t mali_pp_reset(struct mali_pp_core *core) ++{ ++ mali_pp_reset_async(core); ++ return mali_pp_reset_wait(core); ++} + ++void mali_pp_job_start(struct mali_pp_core *core, struct mali_pp_job *job, u32 sub_job, mali_bool restart_virtual) ++{ ++ u32 relative_address; ++ u32 start_index; ++ u32 nr_of_regs; ++ u32 *frame_registers = mali_pp_job_get_frame_registers(job); ++ u32 *wb0_registers = mali_pp_job_get_wb0_registers(job); ++ u32 *wb1_registers = mali_pp_job_get_wb1_registers(job); ++ u32 *wb2_registers = mali_pp_job_get_wb2_registers(job); ++ u32 counter_src0 = mali_pp_job_get_perf_counter_src0(job, sub_job); ++ u32 counter_src1 = mali_pp_job_get_perf_counter_src1(job, sub_job); + ++ MALI_DEBUG_ASSERT_POINTER(core); + ++ /* Write frame registers */ + ++ /* ++ * There are two frame registers which are different for each sub job: ++ * 1. The Renderer List Address Register (MALI200_REG_ADDR_FRAME) ++ * 2. The FS Stack Address Register (MALI200_REG_ADDR_STACK) ++ */ ++ mali_hw_core_register_write_relaxed_conditional(&core->hw_core, MALI200_REG_ADDR_FRAME, mali_pp_job_get_addr_frame(job, sub_job), mali_frame_registers_reset_values[MALI200_REG_ADDR_FRAME / sizeof(u32)]); + ++ /* For virtual jobs, the stack address shouldn't be broadcast but written individually */ ++ if (!mali_pp_job_is_virtual(job) || restart_virtual) { ++ mali_hw_core_register_write_relaxed_conditional(&core->hw_core, MALI200_REG_ADDR_STACK, mali_pp_job_get_addr_stack(job, sub_job), mali_frame_registers_reset_values[MALI200_REG_ADDR_STACK / sizeof(u32)]); ++ } + ++ /* Write registers between MALI200_REG_ADDR_FRAME and MALI200_REG_ADDR_STACK */ ++ relative_address = MALI200_REG_ADDR_RSW; ++ start_index = MALI200_REG_ADDR_RSW / sizeof(u32); ++ nr_of_regs = (MALI200_REG_ADDR_STACK - MALI200_REG_ADDR_RSW) / sizeof(u32); + ++ mali_hw_core_register_write_array_relaxed_conditional(&core->hw_core, ++ relative_address, &frame_registers[start_index], ++ nr_of_regs, &mali_frame_registers_reset_values[start_index]); + -+#endif /* _BASE_HWCONFIG_ISSUES_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_base_kernel.h b/drivers/gpu/arm/bifrost_for_linux/mali_base_kernel.h -new file mode 100755 -index 000000000000..6f5c68e288cd ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_base_kernel.h -@@ -0,0 +1,1822 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ /* MALI200_REG_ADDR_STACK_SIZE */ ++ relative_address = MALI200_REG_ADDR_STACK_SIZE; ++ start_index = MALI200_REG_ADDR_STACK_SIZE / sizeof(u32); + ++ mali_hw_core_register_write_relaxed_conditional(&core->hw_core, ++ relative_address, frame_registers[start_index], ++ mali_frame_registers_reset_values[start_index]); + ++ /* Skip 2 reserved registers */ + ++ /* Write remaining registers */ ++ relative_address = MALI200_REG_ADDR_ORIGIN_OFFSET_X; ++ start_index = MALI200_REG_ADDR_ORIGIN_OFFSET_X / sizeof(u32); ++ nr_of_regs = MALI_PP_MALI400_NUM_FRAME_REGISTERS - MALI200_REG_ADDR_ORIGIN_OFFSET_X / sizeof(u32); + ++ mali_hw_core_register_write_array_relaxed_conditional(&core->hw_core, ++ relative_address, &frame_registers[start_index], ++ nr_of_regs, &mali_frame_registers_reset_values[start_index]); + -+/* -+ * Base structures shared with the kernel. -+ */ ++ /* Write WBx registers */ ++ if (wb0_registers[0]) { /* M200_WB0_REG_SOURCE_SELECT register */ ++ mali_hw_core_register_write_array_relaxed_conditional(&core->hw_core, MALI200_REG_ADDR_WB0, wb0_registers, _MALI_PP_MAX_WB_REGISTERS, mali_wb_registers_reset_values); ++ } + -+#ifndef _BASE_KERNEL_H_ -+#define _BASE_KERNEL_H_ ++ if (wb1_registers[0]) { /* M200_WB1_REG_SOURCE_SELECT register */ ++ mali_hw_core_register_write_array_relaxed_conditional(&core->hw_core, MALI200_REG_ADDR_WB1, wb1_registers, _MALI_PP_MAX_WB_REGISTERS, mali_wb_registers_reset_values); ++ } + -+/* Support UK10_2 IOCTLS */ -+#define BASE_LEGACY_UK10_2_SUPPORT 1 ++ if (wb2_registers[0]) { /* M200_WB2_REG_SOURCE_SELECT register */ ++ mali_hw_core_register_write_array_relaxed_conditional(&core->hw_core, MALI200_REG_ADDR_WB2, wb2_registers, _MALI_PP_MAX_WB_REGISTERS, mali_wb_registers_reset_values); ++ } + -+/* Support UK10_4 IOCTLS */ -+#define BASE_LEGACY_UK10_4_SUPPORT 1 ++ if (MALI_HW_CORE_NO_COUNTER != counter_src0) { ++ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_0_SRC, counter_src0); ++ mali_hw_core_register_write_relaxed_conditional(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_0_ENABLE, MALI200_REG_VAL_PERF_CNT_ENABLE, mali_perf_cnt_enable_reset_value); ++ } ++ if (MALI_HW_CORE_NO_COUNTER != counter_src1) { ++ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_1_SRC, counter_src1); ++ mali_hw_core_register_write_relaxed_conditional(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_1_ENABLE, MALI200_REG_VAL_PERF_CNT_ENABLE, mali_perf_cnt_enable_reset_value); ++ } + -+typedef struct base_mem_handle { -+ struct { -+ u64 handle; -+ } basep; -+} base_mem_handle; ++#ifdef CONFIG_MALI400_HEATMAPS_ENABLED ++ if (job->uargs.perf_counter_flag & _MALI_PERFORMANCE_COUNTER_FLAG_HEATMAP_ENABLE) { ++ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_MGMT_PERFMON_CONTR, ((job->uargs.tilesx & 0x3FF) << 16) | 1); ++ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_MGMT_PERFMON_BASE, job->uargs.heatmap_mem & 0xFFFFFFF8); ++ } ++#endif /* CONFIG_MALI400_HEATMAPS_ENABLED */ + -+#include "mali_base_mem_priv.h" -+#include "mali_kbase_profiling_gator_api.h" -+#include "mali_midg_coherency.h" -+#include "mali_kbase_gpu_id.h" ++ MALI_DEBUG_PRINT(3, ("Mali PP: Starting job 0x%08X part %u/%u on PP core %s\n", job, sub_job + 1, mali_pp_job_get_sub_job_count(job), core->hw_core.description)); + -+/* -+ * Dependency stuff, keep it private for now. May want to expose it if -+ * we decide to make the number of semaphores a configurable -+ * option. -+ */ -+#define BASE_JD_ATOM_COUNT 256 ++ /* Adding barrier to make sure all rester writes are finished */ ++ _mali_osk_write_mem_barrier(); + -+/* Set/reset values for a software event */ -+#define BASE_JD_SOFT_EVENT_SET ((unsigned char)1) -+#define BASE_JD_SOFT_EVENT_RESET ((unsigned char)0) ++ /* This is the command that starts the core. ++ * ++ * Don't actually run the job if PROFILING_SKIP_PP_JOBS are set, just ++ * force core to assert the completion interrupt. ++ */ ++#if !defined(PROFILING_SKIP_PP_JOBS) ++ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_MGMT_CTRL_MGMT, MALI200_REG_VAL_CTRL_MGMT_START_RENDERING); ++#else ++ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_RAWSTAT, MALI200_REG_VAL_IRQ_END_OF_FRAME); ++#endif + -+#define BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS 3 ++ /* Adding barrier to make sure previous rester writes is finished */ ++ _mali_osk_write_mem_barrier(); ++} + -+#define BASE_MAX_COHERENT_GROUPS 16 ++u32 mali_pp_core_get_version(struct mali_pp_core *core) ++{ ++ MALI_DEBUG_ASSERT_POINTER(core); ++ return mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_VERSION); ++} + -+#if defined CDBG_ASSERT -+#define LOCAL_ASSERT CDBG_ASSERT -+#elif defined KBASE_DEBUG_ASSERT -+#define LOCAL_ASSERT KBASE_DEBUG_ASSERT -+#else -+#error assert macro not defined! -+#endif ++struct mali_pp_core *mali_pp_get_global_pp_core(u32 index) ++{ ++ if (mali_global_num_pp_cores > index) { ++ return mali_global_pp_cores[index]; ++ } + -+#if defined PAGE_MASK -+#define LOCAL_PAGE_LSB ~PAGE_MASK -+#else -+#include ++ return NULL; ++} + -+#if defined OSU_CONFIG_CPU_PAGE_SIZE_LOG2 -+#define LOCAL_PAGE_LSB ((1ul << OSU_CONFIG_CPU_PAGE_SIZE_LOG2) - 1) -+#else -+#error Failed to find page size -+#endif -+#endif ++u32 mali_pp_get_glob_num_pp_cores(void) ++{ ++ return mali_global_num_pp_cores; ++} + -+/** -+ * @addtogroup base_user_api User-side Base APIs -+ * @{ -+ */ ++/* ------------- interrupt handling below ------------------ */ ++static void mali_pp_irq_probe_trigger(void *data) ++{ ++ struct mali_pp_core *core = (struct mali_pp_core *)data; ++ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK, MALI200_REG_VAL_IRQ_MASK_USED); ++ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_RAWSTAT, MALI200_REG_VAL_IRQ_BUS_ERROR); ++ _mali_osk_mem_barrier(); ++} + -+/** -+ * @addtogroup base_user_api_memory User-side Base Memory APIs -+ * @{ -+ */ ++static _mali_osk_errcode_t mali_pp_irq_probe_ack(void *data) ++{ ++ struct mali_pp_core *core = (struct mali_pp_core *)data; ++ u32 irq_readout; + -+/** -+ * typedef base_mem_alloc_flags - Memory allocation, access/hint flags. -+ * -+ * A combination of MEM_PROT/MEM_HINT flags must be passed to each allocator -+ * in order to determine the best cache policy. Some combinations are -+ * of course invalid (e.g. MEM_PROT_CPU_WR | MEM_HINT_CPU_RD), -+ * which defines a write-only region on the CPU side, which is -+ * heavily read by the CPU... -+ * Other flags are only meaningful to a particular allocator. -+ * More flags can be added to this list, as long as they don't clash -+ * (see BASE_MEM_FLAGS_NR_BITS for the number of the first free bit). -+ */ -+typedef u32 base_mem_alloc_flags; ++ irq_readout = mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_STATUS); ++ if (MALI200_REG_VAL_IRQ_BUS_ERROR & irq_readout) { ++ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_CLEAR, MALI200_REG_VAL_IRQ_BUS_ERROR); ++ _mali_osk_mem_barrier(); ++ return _MALI_OSK_ERR_OK; ++ } + -+/* Memory allocation, access/hint flags. -+ * -+ * See base_mem_alloc_flags. -+ */ ++ return _MALI_OSK_ERR_FAULT; ++} + -+/* IN */ -+/* Read access CPU side -+ */ -+#define BASE_MEM_PROT_CPU_RD ((base_mem_alloc_flags)1 << 0) + -+/* Write access CPU side -+ */ -+#define BASE_MEM_PROT_CPU_WR ((base_mem_alloc_flags)1 << 1) ++#if 0 ++static void mali_pp_print_registers(struct mali_pp_core *core) ++{ ++ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_VERSION = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_VERSION))); ++ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_CURRENT_REND_LIST_ADDR = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_CURRENT_REND_LIST_ADDR))); ++ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_STATUS = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_STATUS))); ++ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_INT_RAWSTAT = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_RAWSTAT))); ++ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_INT_MASK = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK))); ++ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_INT_STATUS = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_STATUS))); ++ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_BUS_ERROR_STATUS = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_BUS_ERROR_STATUS))); ++ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_PERF_CNT_0_ENABLE = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_0_ENABLE))); ++ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_PERF_CNT_0_SRC = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_0_SRC))); ++ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_PERF_CNT_0_VALUE = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_0_VALUE))); ++ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_PERF_CNT_1_ENABLE = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_1_ENABLE))); ++ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_PERF_CNT_1_SRC = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_1_SRC))); ++ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_PERF_CNT_1_VALUE = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_1_VALUE))); ++} ++#endif + -+/* Read access GPU side -+ */ -+#define BASE_MEM_PROT_GPU_RD ((base_mem_alloc_flags)1 << 2) ++#if 0 ++void mali_pp_print_state(struct mali_pp_core *core) ++{ ++ MALI_DEBUG_PRINT(2, ("Mali PP: State: 0x%08x\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_STATUS))); ++} ++#endif + -+/* Write access GPU side -+ */ -+#define BASE_MEM_PROT_GPU_WR ((base_mem_alloc_flags)1 << 3) ++void mali_pp_update_performance_counters(struct mali_pp_core *parent, struct mali_pp_core *child, struct mali_pp_job *job, u32 subjob) ++{ ++ u32 val0 = 0; ++ u32 val1 = 0; ++ u32 counter_src0 = mali_pp_job_get_perf_counter_src0(job, subjob); ++ u32 counter_src1 = mali_pp_job_get_perf_counter_src1(job, subjob); ++#if defined(CONFIG_MALI400_PROFILING) ++ int counter_index = COUNTER_FP_0_C0 + (2 * child->core_id); ++#endif + -+/* Execute allowed on the GPU side -+ */ -+#define BASE_MEM_PROT_GPU_EX ((base_mem_alloc_flags)1 << 4) ++ if (MALI_HW_CORE_NO_COUNTER != counter_src0) { ++ val0 = mali_hw_core_register_read(&child->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_0_VALUE); ++ mali_pp_job_set_perf_counter_value0(job, subjob, val0); + -+ /* BASE_MEM_HINT flags have been removed, but their values are reserved -+ * for backwards compatibility with older user-space drivers. The values -+ * can be re-used once support for r5p0 user-space drivers is removed, -+ * presumably in r7p0. -+ * -+ * RESERVED: (1U << 5) -+ * RESERVED: (1U << 6) -+ * RESERVED: (1U << 7) -+ * RESERVED: (1U << 8) -+ */ ++#if defined(CONFIG_MALI400_PROFILING) ++ _mali_osk_profiling_report_hw_counter(counter_index, val0); ++ _mali_osk_profiling_record_global_counters(counter_index, val0); ++#endif ++ } + -+/* Grow backing store on GPU Page Fault -+ */ -+#define BASE_MEM_GROW_ON_GPF ((base_mem_alloc_flags)1 << 9) ++ if (MALI_HW_CORE_NO_COUNTER != counter_src1) { ++ val1 = mali_hw_core_register_read(&child->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_1_VALUE); ++ mali_pp_job_set_perf_counter_value1(job, subjob, val1); + -+/* Page coherence Outer shareable, if available -+ */ -+#define BASE_MEM_COHERENT_SYSTEM ((base_mem_alloc_flags)1 << 10) ++#if defined(CONFIG_MALI400_PROFILING) ++ _mali_osk_profiling_report_hw_counter(counter_index + 1, val1); ++ _mali_osk_profiling_record_global_counters(counter_index + 1, val1); ++#endif ++ } ++} + -+/* Page coherence Inner shareable -+ */ -+#define BASE_MEM_COHERENT_LOCAL ((base_mem_alloc_flags)1 << 11) ++#if MALI_STATE_TRACKING ++u32 mali_pp_dump_state(struct mali_pp_core *core, char *buf, u32 size) ++{ ++ int n = 0; + -+/* Should be cached on the CPU -+ */ -+#define BASE_MEM_CACHED_CPU ((base_mem_alloc_flags)1 << 12) ++ n += _mali_osk_snprintf(buf + n, size - n, "\tPP #%d: %s\n", core->core_id, core->hw_core.description); + -+/* IN/OUT */ -+/* Must have same VA on both the GPU and the CPU ++ return n; ++} ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp.h b/drivers/gpu/arm/mali400/mali/common/mali_pp.h +new file mode 100755 +index 000000000..f98b29866 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.h +@@ -0,0 +1,138 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+#define BASE_MEM_SAME_VA ((base_mem_alloc_flags)1 << 13) + -+/* OUT */ -+/* Must call mmap to acquire a GPU address for the alloc -+ */ -+#define BASE_MEM_NEED_MMAP ((base_mem_alloc_flags)1 << 14) ++#ifndef __MALI_PP_H__ ++#define __MALI_PP_H__ + -+/* IN */ -+/* Page coherence Outer shareable, required. -+ */ -+#define BASE_MEM_COHERENT_SYSTEM_REQUIRED ((base_mem_alloc_flags)1 << 15) ++#include "mali_osk.h" ++#include "mali_pp_job.h" ++#include "mali_hw_core.h" + -+/* Secure memory -+ */ -+#define BASE_MEM_SECURE ((base_mem_alloc_flags)1 << 16) ++struct mali_group; + -+/* Not needed physical memory -+ */ -+#define BASE_MEM_DONT_NEED ((base_mem_alloc_flags)1 << 17) ++#define MALI_MAX_NUMBER_OF_PP_CORES 9 + -+/* Must use shared CPU/GPU zone (SAME_VA zone) but doesn't require the -+ * addresses to be the same ++/** ++ * Definition of the PP core struct ++ * Used to track a PP core in the system. + */ -+#define BASE_MEM_IMPORT_SHARED ((base_mem_alloc_flags)1 << 18) ++struct mali_pp_core { ++ struct mali_hw_core hw_core; /**< Common for all HW cores */ ++ _mali_osk_irq_t *irq; /**< IRQ handler */ ++ u32 core_id; /**< Unique core ID */ ++ u32 bcast_id; /**< The "flag" value used by the Mali-450 broadcast and DLBU unit */ ++}; + -+/** -+ * Bit 19 is reserved. -+ * -+ * Do not remove, use the next unreserved bit for new flags -+ **/ -+#define BASE_MEM_RESERVED_BIT_19 ((base_mem_alloc_flags)1 << 19) ++_mali_osk_errcode_t mali_pp_initialize(void); ++void mali_pp_terminate(void); + -+/* Number of bits used as flags for base memory management -+ * -+ * Must be kept in sync with the base_mem_alloc_flags flags -+ */ -+#define BASE_MEM_FLAGS_NR_BITS 20 ++struct mali_pp_core *mali_pp_create(const _mali_osk_resource_t *resource, struct mali_group *group, mali_bool is_virtual, u32 bcast_id); ++void mali_pp_delete(struct mali_pp_core *core); + -+/* A mask for all output bits, excluding IN/OUT bits. -+ */ -+#define BASE_MEM_FLAGS_OUTPUT_MASK BASE_MEM_NEED_MMAP ++void mali_pp_stop_bus(struct mali_pp_core *core); ++_mali_osk_errcode_t mali_pp_stop_bus_wait(struct mali_pp_core *core); ++void mali_pp_reset_async(struct mali_pp_core *core); ++_mali_osk_errcode_t mali_pp_reset_wait(struct mali_pp_core *core); ++_mali_osk_errcode_t mali_pp_reset(struct mali_pp_core *core); ++_mali_osk_errcode_t mali_pp_hard_reset(struct mali_pp_core *core); + -+/* A mask for all input bits, including IN/OUT bits. -+ */ -+#define BASE_MEM_FLAGS_INPUT_MASK \ -+ (((1 << BASE_MEM_FLAGS_NR_BITS) - 1) & ~BASE_MEM_FLAGS_OUTPUT_MASK) ++void mali_pp_job_start(struct mali_pp_core *core, struct mali_pp_job *job, u32 sub_job, mali_bool restart_virtual); + -+/* A mask for all the flags which are modifiable via the base_mem_set_flags -+ * interface. -+ */ -+#define BASE_MEM_FLAGS_MODIFIABLE \ -+ (BASE_MEM_DONT_NEED | BASE_MEM_COHERENT_SYSTEM | \ -+ BASE_MEM_COHERENT_LOCAL) ++u32 mali_pp_core_get_version(struct mali_pp_core *core); + -+/** -+ * enum base_mem_import_type - Memory types supported by @a base_mem_import -+ * -+ * @BASE_MEM_IMPORT_TYPE_INVALID: Invalid type -+ * @BASE_MEM_IMPORT_TYPE_UMP: UMP import. Handle type is ump_secure_id. -+ * @BASE_MEM_IMPORT_TYPE_UMM: UMM import. Handle type is a file descriptor (int) -+ * @BASE_MEM_IMPORT_TYPE_USER_BUFFER: User buffer import. Handle is a -+ * base_mem_import_user_buffer -+ * -+ * Each type defines what the supported handle type is. -+ * -+ * If any new type is added here ARM must be contacted -+ * to allocate a numeric value for it. -+ * Do not just add a new type without synchronizing with ARM -+ * as future releases from ARM might include other new types -+ * which could clash with your custom types. -+ */ -+typedef enum base_mem_import_type { -+ BASE_MEM_IMPORT_TYPE_INVALID = 0, -+ BASE_MEM_IMPORT_TYPE_UMP = 1, -+ BASE_MEM_IMPORT_TYPE_UMM = 2, -+ BASE_MEM_IMPORT_TYPE_USER_BUFFER = 3 -+} base_mem_import_type; ++MALI_STATIC_INLINE u32 mali_pp_core_get_id(struct mali_pp_core *core) ++{ ++ MALI_DEBUG_ASSERT_POINTER(core); ++ return core->core_id; ++} ++ ++MALI_STATIC_INLINE u32 mali_pp_core_get_bcast_id(struct mali_pp_core *core) ++{ ++ MALI_DEBUG_ASSERT_POINTER(core); ++ return core->bcast_id; ++} ++ ++struct mali_pp_core *mali_pp_get_global_pp_core(u32 index); ++u32 mali_pp_get_glob_num_pp_cores(void); ++ ++/* Debug */ ++u32 mali_pp_dump_state(struct mali_pp_core *core, char *buf, u32 size); + +/** -+ * struct base_mem_import_user_buffer - Handle of an imported user buffer ++ * Put instrumented HW counters from the core(s) to the job object (if enabled) + * -+ * @ptr: address of imported user buffer -+ * @length: length of imported user buffer in bytes ++ * parent and child is always the same, except for virtual jobs on Mali-450. ++ * In this case, the counters will be enabled on the virtual core (parent), ++ * but values need to be read from the child cores. + * -+ * This structure is used to represent a handle of an imported user buffer. ++ * @param parent The core used to see if the counters was enabled ++ * @param child The core to actually read the values from ++ * @job Job object to update with counter values (if enabled) ++ * @subjob Which subjob the counters are applicable for (core ID for virtual jobs) + */ ++void mali_pp_update_performance_counters(struct mali_pp_core *parent, struct mali_pp_core *child, struct mali_pp_job *job, u32 subjob); + -+struct base_mem_import_user_buffer { -+ u64 ptr; -+ u64 length; -+}; ++MALI_STATIC_INLINE const char *mali_pp_core_description(struct mali_pp_core *core) ++{ ++ return core->hw_core.description; ++} + -+/** -+ * @brief Invalid memory handle. -+ * -+ * Return value from functions returning @ref base_mem_handle on error. -+ * -+ * @warning @ref base_mem_handle_new_invalid must be used instead of this macro -+ * in C++ code or other situations where compound literals cannot be used. -+ */ -+#define BASE_MEM_INVALID_HANDLE ((base_mem_handle) { {BASEP_MEM_INVALID_HANDLE} }) ++MALI_STATIC_INLINE enum mali_interrupt_result mali_pp_get_interrupt_result(struct mali_pp_core *core) ++{ ++ u32 rawstat_used = mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_RAWSTAT) & ++ MALI200_REG_VAL_IRQ_MASK_USED; ++ if (0 == rawstat_used) { ++ return MALI_INTERRUPT_RESULT_NONE; ++ } else if (MALI200_REG_VAL_IRQ_END_OF_FRAME == rawstat_used) { ++ return MALI_INTERRUPT_RESULT_SUCCESS; ++ } + -+/** -+ * @brief Special write-alloc memory handle. -+ * -+ * A special handle is used to represent a region where a special page is mapped -+ * with a write-alloc cache setup, typically used when the write result of the -+ * GPU isn't needed, but the GPU must write anyway. -+ * -+ * @warning @ref base_mem_handle_new_write_alloc must be used instead of this macro -+ * in C++ code or other situations where compound literals cannot be used. -+ */ -+#define BASE_MEM_WRITE_ALLOC_PAGES_HANDLE ((base_mem_handle) { {BASEP_MEM_WRITE_ALLOC_PAGES_HANDLE} }) ++ return MALI_INTERRUPT_RESULT_ERROR; ++} + -+#define BASEP_MEM_INVALID_HANDLE (0ull << 12) -+#define BASE_MEM_MMU_DUMP_HANDLE (1ull << 12) -+#define BASE_MEM_TRACE_BUFFER_HANDLE (2ull << 12) -+#define BASE_MEM_MAP_TRACKING_HANDLE (3ull << 12) -+#define BASEP_MEM_WRITE_ALLOC_PAGES_HANDLE (4ull << 12) -+/* reserved handles ..-64< for future special handles */ -+#define BASE_MEM_COOKIE_BASE (64ul << 12) -+#define BASE_MEM_FIRST_FREE_ADDRESS ((BITS_PER_LONG << 12) + \ -+ BASE_MEM_COOKIE_BASE) ++MALI_STATIC_INLINE u32 mali_pp_get_rawstat(struct mali_pp_core *core) ++{ ++ MALI_DEBUG_ASSERT_POINTER(core); ++ return mali_hw_core_register_read(&core->hw_core, ++ MALI200_REG_ADDR_MGMT_INT_RAWSTAT); ++} + -+/* Mask to detect 4GB boundary alignment */ -+#define BASE_MEM_MASK_4GB 0xfffff000UL + ++MALI_STATIC_INLINE u32 mali_pp_is_active(struct mali_pp_core *core) ++{ ++ u32 status = mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_STATUS); ++ return (status & MALI200_REG_VAL_STATUS_RENDERING_ACTIVE) ? MALI_TRUE : MALI_FALSE; ++} + -+/* Bit mask of cookies used for for memory allocation setup */ -+#define KBASE_COOKIE_MASK ~1UL /* bit 0 is reserved */ ++MALI_STATIC_INLINE void mali_pp_mask_all_interrupts(struct mali_pp_core *core) ++{ ++ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK, MALI200_REG_VAL_IRQ_MASK_NONE); ++} + ++MALI_STATIC_INLINE void mali_pp_enable_interrupts(struct mali_pp_core *core) ++{ ++ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK, MALI200_REG_VAL_IRQ_MASK_USED); ++} + -+/** -+ * @brief Result codes of changing the size of the backing store allocated to a tmem region -+ */ -+typedef enum base_backing_threshold_status { -+ BASE_BACKING_THRESHOLD_OK = 0, /**< Resize successful */ -+ BASE_BACKING_THRESHOLD_ERROR_OOM = -2, /**< Increase failed due to an out-of-memory condition */ -+ BASE_BACKING_THRESHOLD_ERROR_INVALID_ARGUMENTS = -4 /**< Invalid arguments (not tmem, illegal size request, etc.) */ -+} base_backing_threshold_status; ++MALI_STATIC_INLINE void mali_pp_write_addr_renderer_list(struct mali_pp_core *core, ++ struct mali_pp_job *job, u32 subjob) ++{ ++ u32 addr = mali_pp_job_get_addr_frame(job, subjob); ++ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_FRAME, addr); ++} + -+/** -+ * @addtogroup base_user_api_memory_defered User-side Base Defered Memory Coherency APIs -+ * @{ -+ */ + -+/** -+ * @brief a basic memory operation (sync-set). -+ * -+ * The content of this structure is private, and should only be used -+ * by the accessors. ++MALI_STATIC_INLINE void mali_pp_write_addr_stack(struct mali_pp_core *core, struct mali_pp_job *job) ++{ ++ u32 addr = mali_pp_job_get_addr_stack(job, core->core_id); ++ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_STACK, addr); ++} ++ ++#endif /* __MALI_PP_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c +new file mode 100755 +index 000000000..b0216d4c1 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c +@@ -0,0 +1,316 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+typedef struct base_syncset { -+ struct basep_syncset basep_sset; -+} base_syncset; + -+/** @} end group base_user_api_memory_defered */ ++#include "mali_pp.h" ++#include "mali_pp_job.h" ++#include "mali_osk.h" ++#include "mali_osk_list.h" ++#include "mali_kernel_common.h" ++#include "mali_uk_types.h" ++#include "mali_executor.h" ++#if defined(CONFIG_DMA_SHARED_BUFFER) && !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) ++#include "linux/mali_memory_dma_buf.h" ++#endif ++#include "mali_memory_swap_alloc.h" ++#include "mali_scheduler.h" + -+/** -+ * Handle to represent imported memory object. -+ * Simple opague handle to imported memory, can't be used -+ * with anything but base_external_resource_init to bind to an atom. -+ */ -+typedef struct base_import_handle { -+ struct { -+ u64 handle; -+ } basep; -+} base_import_handle; ++static u32 pp_counter_src0 = MALI_HW_CORE_NO_COUNTER; /**< Performance counter 0, MALI_HW_CORE_NO_COUNTER for disabled */ ++static u32 pp_counter_src1 = MALI_HW_CORE_NO_COUNTER; /**< Performance counter 1, MALI_HW_CORE_NO_COUNTER for disabled */ ++static _mali_osk_atomic_t pp_counter_per_sub_job_count; /**< Number of values in the two arrays which is != MALI_HW_CORE_NO_COUNTER */ ++static u32 pp_counter_per_sub_job_src0[_MALI_PP_MAX_SUB_JOBS] = { MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER }; ++static u32 pp_counter_per_sub_job_src1[_MALI_PP_MAX_SUB_JOBS] = { MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER }; + -+/** @} end group base_user_api_memory */ ++void mali_pp_job_initialize(void) ++{ ++ _mali_osk_atomic_init(&pp_counter_per_sub_job_count, 0); ++} + -+/** -+ * @addtogroup base_user_api_job_dispatch User-side Base Job Dispatcher APIs -+ * @{ -+ */ ++void mali_pp_job_terminate(void) ++{ ++ _mali_osk_atomic_term(&pp_counter_per_sub_job_count); ++} + -+typedef int platform_fence_type; -+#define INVALID_PLATFORM_FENCE ((platform_fence_type)-1) ++struct mali_pp_job *mali_pp_job_create(struct mali_session_data *session, ++ _mali_uk_pp_start_job_s __user *uargs, u32 id) ++{ ++ struct mali_pp_job *job; ++ u32 perf_counter_flag; + -+/** -+ * Base stream handle. -+ * -+ * References an underlying base stream object. -+ */ -+typedef struct base_stream { -+ struct { -+ int fd; -+ } basep; -+} base_stream; ++ job = _mali_osk_calloc(1, sizeof(struct mali_pp_job)); ++ if (NULL != job) { ++ ++ _mali_osk_list_init(&job->list); ++ _mali_osk_list_init(&job->session_fb_lookup_list); ++ _mali_osk_atomic_inc(&session->number_of_pp_jobs); + -+/** -+ * Base fence handle. -+ * -+ * References an underlying base fence object. -+ */ -+typedef struct base_fence { -+ struct { -+ int fd; -+ int stream_fd; -+ } basep; -+} base_fence; ++ if (0 != _mali_osk_copy_from_user(&job->uargs, uargs, sizeof(_mali_uk_pp_start_job_s))) { ++ goto fail; ++ } + -+/** -+ * @brief Per-job data -+ * -+ * This structure is used to store per-job data, and is completely unused -+ * by the Base driver. It can be used to store things such as callback -+ * function pointer, data to handle job completion. It is guaranteed to be -+ * untouched by the Base driver. -+ */ -+typedef struct base_jd_udata { -+ u64 blob[2]; /**< per-job data array */ -+} base_jd_udata; ++ if (job->uargs.num_cores > _MALI_PP_MAX_SUB_JOBS) { ++ MALI_PRINT_ERROR(("Mali PP job: Too many sub jobs specified in job object\n")); ++ goto fail; ++ } + -+/** -+ * @brief Memory aliasing info -+ * -+ * Describes a memory handle to be aliased. -+ * A subset of the handle can be chosen for aliasing, given an offset and a -+ * length. -+ * A special handle BASE_MEM_WRITE_ALLOC_PAGES_HANDLE is used to represent a -+ * region where a special page is mapped with a write-alloc cache setup, -+ * typically used when the write result of the GPU isn't needed, but the GPU -+ * must write anyway. -+ * -+ * Offset and length are specified in pages. -+ * Offset must be within the size of the handle. -+ * Offset+length must not overrun the size of the handle. -+ * -+ * @handle Handle to alias, can be BASE_MEM_WRITE_ALLOC_PAGES_HANDLE -+ * @offset Offset within the handle to start aliasing from, in pages. -+ * Not used with BASE_MEM_WRITE_ALLOC_PAGES_HANDLE. -+ * @length Length to alias, in pages. For BASE_MEM_WRITE_ALLOC_PAGES_HANDLE -+ * specifies the number of times the special page is needed. -+ */ -+struct base_mem_aliasing_info { -+ base_mem_handle handle; -+ u64 offset; -+ u64 length; -+}; ++ if (!mali_pp_job_use_no_notification(job)) { ++ job->finished_notification = _mali_osk_notification_create(_MALI_NOTIFICATION_PP_FINISHED, sizeof(_mali_uk_pp_job_finished_s)); ++ if (NULL == job->finished_notification) goto fail; ++ } + -+/** -+ * struct base_jit_alloc_info - Structure which describes a JIT allocation -+ * request. -+ * @gpu_alloc_addr: The GPU virtual address to write the JIT -+ * allocated GPU virtual address to. -+ * @va_pages: The minimum number of virtual pages required. -+ * @commit_pages: The minimum number of physical pages which -+ * should back the allocation. -+ * @extent: Granularity of physical pages to grow the -+ * allocation by during a fault. -+ * @id: Unique ID provided by the caller, this is used -+ * to pair allocation and free requests. -+ * Zero is not a valid value. -+ */ -+struct base_jit_alloc_info { -+ u64 gpu_alloc_addr; -+ u64 va_pages; -+ u64 commit_pages; -+ u64 extent; -+ u8 id; -+}; ++ perf_counter_flag = mali_pp_job_get_perf_counter_flag(job); + -+/** -+ * @brief Job dependency type. -+ * -+ * A flags field will be inserted into the atom structure to specify whether a dependency is a data or -+ * ordering dependency (by putting it before/after 'core_req' in the structure it should be possible to add without -+ * changing the structure size). -+ * When the flag is set for a particular dependency to signal that it is an ordering only dependency then -+ * errors will not be propagated. -+ */ -+typedef u8 base_jd_dep_type; ++ /* case when no counters came from user space ++ * so pass the debugfs / DS-5 provided global ones to the job object */ ++ if (!((perf_counter_flag & _MALI_PERFORMANCE_COUNTER_FLAG_SRC0_ENABLE) || ++ (perf_counter_flag & _MALI_PERFORMANCE_COUNTER_FLAG_SRC1_ENABLE))) { ++ u32 sub_job_count = _mali_osk_atomic_read(&pp_counter_per_sub_job_count); + ++ /* These counters apply for all virtual jobs, and where no per sub job counter is specified */ ++ job->uargs.perf_counter_src0 = pp_counter_src0; ++ job->uargs.perf_counter_src1 = pp_counter_src1; + -+#define BASE_JD_DEP_TYPE_INVALID (0) /**< Invalid dependency */ -+#define BASE_JD_DEP_TYPE_DATA (1U << 0) /**< Data dependency */ -+#define BASE_JD_DEP_TYPE_ORDER (1U << 1) /**< Order dependency */ ++ /* We only copy the per sub job array if it is enabled with at least one counter */ ++ if (0 < sub_job_count) { ++ job->perf_counter_per_sub_job_count = sub_job_count; ++ _mali_osk_memcpy(job->perf_counter_per_sub_job_src0, pp_counter_per_sub_job_src0, sizeof(pp_counter_per_sub_job_src0)); ++ _mali_osk_memcpy(job->perf_counter_per_sub_job_src1, pp_counter_per_sub_job_src1, sizeof(pp_counter_per_sub_job_src1)); ++ } ++ } + -+/** -+ * @brief Job chain hardware requirements. -+ * -+ * A job chain must specify what GPU features it needs to allow the -+ * driver to schedule the job correctly. By not specifying the -+ * correct settings can/will cause an early job termination. Multiple -+ * values can be ORed together to specify multiple requirements. -+ * Special case is ::BASE_JD_REQ_DEP, which is used to express complex -+ * dependencies, and that doesn't execute anything on the hardware. -+ */ -+typedef u32 base_jd_core_req; ++ job->session = session; ++ job->id = id; + -+/* Requirements that come from the HW */ ++ job->sub_jobs_num = job->uargs.num_cores ? job->uargs.num_cores : 1; ++ job->pid = _mali_osk_get_pid(); ++ job->tid = _mali_osk_get_tid(); + -+/** -+ * No requirement, dependency only -+ */ -+#define BASE_JD_REQ_DEP ((base_jd_core_req)0) ++ _mali_osk_atomic_init(&job->sub_jobs_completed, 0); ++ _mali_osk_atomic_init(&job->sub_job_errors, 0); ++ job->swap_status = MALI_NO_SWAP_IN; ++ job->user_notification = MALI_FALSE; ++ job->num_pp_cores_in_virtual = 0; + -+/** -+ * Requires fragment shaders -+ */ -+#define BASE_JD_REQ_FS ((base_jd_core_req)1 << 0) ++ if (job->uargs.num_memory_cookies > session->allocation_mgr.mali_allocation_num) { ++ MALI_PRINT_ERROR(("Mali PP job: The number of memory cookies is invalid !\n")); ++ goto fail; ++ } + -+/** -+ * Requires compute shaders -+ * This covers any of the following Midgard Job types: -+ * - Vertex Shader Job -+ * - Geometry Shader Job -+ * - An actual Compute Shader Job -+ * -+ * Compare this with @ref BASE_JD_REQ_ONLY_COMPUTE, which specifies that the -+ * job is specifically just the "Compute Shader" job type, and not the "Vertex -+ * Shader" nor the "Geometry Shader" job type. -+ */ -+#define BASE_JD_REQ_CS ((base_jd_core_req)1 << 1) -+#define BASE_JD_REQ_T ((base_jd_core_req)1 << 2) /**< Requires tiling */ -+#define BASE_JD_REQ_CF ((base_jd_core_req)1 << 3) /**< Requires cache flushes */ -+#define BASE_JD_REQ_V ((base_jd_core_req)1 << 4) /**< Requires value writeback */ ++ if (job->uargs.num_memory_cookies > 0) { ++ u32 size; ++ u32 __user *memory_cookies = (u32 __user *)(uintptr_t)job->uargs.memory_cookies; + -+/* SW-only requirements - the HW does not expose these as part of the job slot capabilities */ ++ size = sizeof(*memory_cookies) * (job->uargs.num_memory_cookies); + -+/* Requires fragment job with AFBC encoding */ -+#define BASE_JD_REQ_FS_AFBC ((base_jd_core_req)1 << 13) ++ job->memory_cookies = _mali_osk_malloc(size); ++ if (NULL == job->memory_cookies) { ++ MALI_PRINT_ERROR(("Mali PP job: Failed to allocate %d bytes of memory cookies!\n", size)); ++ goto fail; ++ } + -+/** -+ * SW-only requirement: coalesce completion events. -+ * If this bit is set then completion of this atom will not cause an event to -+ * be sent to userspace, whether successful or not; completion events will be -+ * deferred until an atom completes which does not have this bit set. -+ * -+ * This bit may not be used in combination with BASE_JD_REQ_EXTERNAL_RESOURCES. -+ */ -+#define BASE_JD_REQ_EVENT_COALESCE ((base_jd_core_req)1 << 5) ++ if (0 != _mali_osk_copy_from_user(job->memory_cookies, memory_cookies, size)) { ++ MALI_PRINT_ERROR(("Mali PP job: Failed to copy %d bytes of memory cookies from user!\n", size)); ++ goto fail; ++ } ++ } + -+/** -+ * SW Only requirement: the job chain requires a coherent core group. We don't -+ * mind which coherent core group is used. -+ */ -+#define BASE_JD_REQ_COHERENT_GROUP ((base_jd_core_req)1 << 6) ++ if (_MALI_OSK_ERR_OK != mali_pp_job_check(job)) { ++ /* Not a valid job. */ ++ goto fail; ++ } + -+/** -+ * SW Only requirement: The performance counters should be enabled only when -+ * they are needed, to reduce power consumption. -+ */ ++ mali_timeline_tracker_init(&job->tracker, MALI_TIMELINE_TRACKER_PP, NULL, job); ++ mali_timeline_fence_copy_uk_fence(&(job->tracker.fence), &(job->uargs.fence)); + -+#define BASE_JD_REQ_PERMON ((base_jd_core_req)1 << 7) ++ mali_mem_swap_in_pages(job); + -+/** -+ * SW Only requirement: External resources are referenced by this atom. -+ * When external resources are referenced no syncsets can be bundled with the atom -+ * but should instead be part of a NULL jobs inserted into the dependency tree. -+ * The first pre_dep object must be configured for the external resouces to use, -+ * the second pre_dep object can be used to create other dependencies. -+ * -+ * This bit may not be used in combination with BASE_JD_REQ_EVENT_COALESCE. -+ */ -+#define BASE_JD_REQ_EXTERNAL_RESOURCES ((base_jd_core_req)1 << 8) ++ return job; ++ } + -+/** -+ * SW Only requirement: Software defined job. Jobs with this bit set will not be submitted -+ * to the hardware but will cause some action to happen within the driver -+ */ -+#define BASE_JD_REQ_SOFT_JOB ((base_jd_core_req)1 << 9) ++fail: ++ if (NULL != job) { ++ mali_pp_job_delete(job); ++ } + -+#define BASE_JD_REQ_SOFT_DUMP_CPU_GPU_TIME (BASE_JD_REQ_SOFT_JOB | 0x1) -+#define BASE_JD_REQ_SOFT_FENCE_TRIGGER (BASE_JD_REQ_SOFT_JOB | 0x2) -+#define BASE_JD_REQ_SOFT_FENCE_WAIT (BASE_JD_REQ_SOFT_JOB | 0x3) ++ return NULL; ++} + -+/** -+ * SW Only requirement : Replay job. -+ * -+ * If the preceding job fails, the replay job will cause the jobs specified in -+ * the list of base_jd_replay_payload pointed to by the jc pointer to be -+ * replayed. -+ * -+ * A replay job will only cause jobs to be replayed up to BASEP_JD_REPLAY_LIMIT -+ * times. If a job fails more than BASEP_JD_REPLAY_LIMIT times then the replay -+ * job is failed, as well as any following dependencies. -+ * -+ * The replayed jobs will require a number of atom IDs. If there are not enough -+ * free atom IDs then the replay job will fail. -+ * -+ * If the preceding job does not fail, then the replay job is returned as -+ * completed. -+ * -+ * The replayed jobs will never be returned to userspace. The preceding failed -+ * job will be returned to userspace as failed; the status of this job should -+ * be ignored. Completion should be determined by the status of the replay soft -+ * job. -+ * -+ * In order for the jobs to be replayed, the job headers will have to be -+ * modified. The Status field will be reset to NOT_STARTED. If the Job Type -+ * field indicates a Vertex Shader Job then it will be changed to Null Job. -+ * -+ * The replayed jobs have the following assumptions : -+ * -+ * - No external resources. Any required external resources will be held by the -+ * replay atom. -+ * - Pre-dependencies are created based on job order. -+ * - Atom numbers are automatically assigned. -+ * - device_nr is set to 0. This is not relevant as -+ * BASE_JD_REQ_SPECIFIC_COHERENT_GROUP should not be set. -+ * - Priority is inherited from the replay job. -+ */ -+#define BASE_JD_REQ_SOFT_REPLAY (BASE_JD_REQ_SOFT_JOB | 0x4) -+/** -+ * SW only requirement: event wait/trigger job. -+ * -+ * - BASE_JD_REQ_SOFT_EVENT_WAIT: this job will block until the event is set. -+ * - BASE_JD_REQ_SOFT_EVENT_SET: this job sets the event, thus unblocks the -+ * other waiting jobs. It completes immediately. -+ * - BASE_JD_REQ_SOFT_EVENT_RESET: this job resets the event, making it -+ * possible for other jobs to wait upon. It completes immediately. -+ */ -+#define BASE_JD_REQ_SOFT_EVENT_WAIT (BASE_JD_REQ_SOFT_JOB | 0x5) -+#define BASE_JD_REQ_SOFT_EVENT_SET (BASE_JD_REQ_SOFT_JOB | 0x6) -+#define BASE_JD_REQ_SOFT_EVENT_RESET (BASE_JD_REQ_SOFT_JOB | 0x7) ++void mali_pp_job_delete(struct mali_pp_job *job) ++{ ++ struct mali_session_data *session; + -+#define BASE_JD_REQ_SOFT_DEBUG_COPY (BASE_JD_REQ_SOFT_JOB | 0x8) ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT(_mali_osk_list_empty(&job->list)); ++ MALI_DEBUG_ASSERT(_mali_osk_list_empty(&job->session_fb_lookup_list)); + -+/** -+ * SW only requirement: Just In Time allocation -+ * -+ * This job requests a JIT allocation based on the request in the -+ * @base_jit_alloc_info structure which is passed via the jc element of -+ * the atom. -+ * -+ * It should be noted that the id entry in @base_jit_alloc_info must not -+ * be reused until it has been released via @BASE_JD_REQ_SOFT_JIT_FREE. -+ * -+ * Should this soft job fail it is expected that a @BASE_JD_REQ_SOFT_JIT_FREE -+ * soft job to free the JIT allocation is still made. -+ * -+ * The job will complete immediately. -+ */ -+#define BASE_JD_REQ_SOFT_JIT_ALLOC (BASE_JD_REQ_SOFT_JOB | 0x9) -+/** -+ * SW only requirement: Just In Time free -+ * -+ * This job requests a JIT allocation created by @BASE_JD_REQ_SOFT_JIT_ALLOC -+ * to be freed. The ID of the JIT allocation is passed via the jc element of -+ * the atom. -+ * -+ * The job will complete immediately. -+ */ -+#define BASE_JD_REQ_SOFT_JIT_FREE (BASE_JD_REQ_SOFT_JOB | 0xa) ++ session = mali_pp_job_get_session(job); ++ MALI_DEBUG_ASSERT_POINTER(session); + -+/** -+ * SW only requirement: Map external resource -+ * -+ * This job requests external resource(s) are mapped once the dependencies -+ * of the job have been satisfied. The list of external resources are -+ * passed via the jc element of the atom which is a pointer to a -+ * @base_external_resource_list. -+ */ -+#define BASE_JD_REQ_SOFT_EXT_RES_MAP (BASE_JD_REQ_SOFT_JOB | 0xb) -+/** -+ * SW only requirement: Unmap external resource -+ * -+ * This job requests external resource(s) are unmapped once the dependencies -+ * of the job has been satisfied. The list of external resources are -+ * passed via the jc element of the atom which is a pointer to a -+ * @base_external_resource_list. -+ */ -+#define BASE_JD_REQ_SOFT_EXT_RES_UNMAP (BASE_JD_REQ_SOFT_JOB | 0xc) ++ if (NULL != job->memory_cookies) { ++#if defined(CONFIG_DMA_SHARED_BUFFER) && !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) ++ /* Unmap buffers attached to job */ ++ mali_dma_buf_unmap_job(job); ++#endif ++ if (MALI_NO_SWAP_IN != job->swap_status) { ++ mali_mem_swap_out_pages(job); ++ } + -+/** -+ * HW Requirement: Requires Compute shaders (but not Vertex or Geometry Shaders) -+ * -+ * This indicates that the Job Chain contains Midgard Jobs of the 'Compute Shaders' type. -+ * -+ * In contrast to @ref BASE_JD_REQ_CS, this does \b not indicate that the Job -+ * Chain contains 'Geometry Shader' or 'Vertex Shader' jobs. -+ */ -+#define BASE_JD_REQ_ONLY_COMPUTE ((base_jd_core_req)1 << 10) ++ _mali_osk_free(job->memory_cookies); ++ } + -+/** -+ * HW Requirement: Use the base_jd_atom::device_nr field to specify a -+ * particular core group -+ * -+ * If both @ref BASE_JD_REQ_COHERENT_GROUP and this flag are set, this flag takes priority -+ * -+ * This is only guaranteed to work for @ref BASE_JD_REQ_ONLY_COMPUTE atoms. -+ * -+ * If the core availability policy is keeping the required core group turned off, then -+ * the job will fail with a @ref BASE_JD_EVENT_PM_EVENT error code. -+ */ -+#define BASE_JD_REQ_SPECIFIC_COHERENT_GROUP ((base_jd_core_req)1 << 11) ++ if (job->user_notification) { ++ mali_scheduler_return_pp_job_to_user(job, ++ job->num_pp_cores_in_virtual); ++ } + -+/** -+ * SW Flag: If this bit is set then the successful completion of this atom -+ * will not cause an event to be sent to userspace -+ */ -+#define BASE_JD_REQ_EVENT_ONLY_ON_FAILURE ((base_jd_core_req)1 << 12) ++ if (NULL != job->finished_notification) { ++ _mali_osk_notification_delete(job->finished_notification); ++ } + -+/** -+ * SW Flag: If this bit is set then completion of this atom will not cause an -+ * event to be sent to userspace, whether successful or not. -+ */ -+#define BASEP_JD_REQ_EVENT_NEVER ((base_jd_core_req)1 << 14) ++ _mali_osk_atomic_term(&job->sub_jobs_completed); ++ _mali_osk_atomic_term(&job->sub_job_errors); ++ _mali_osk_atomic_dec(&session->number_of_pp_jobs); ++ _mali_osk_free(job); + -+/** -+ * SW Flag: Skip GPU cache clean and invalidation before starting a GPU job. -+ * -+ * If this bit is set then the GPU's cache will not be cleaned and invalidated -+ * until a GPU job starts which does not have this bit set or a job completes -+ * which does not have the @ref BASE_JD_REQ_SKIP_CACHE_END bit set. Do not use if -+ * the CPU may have written to memory addressed by the job since the last job -+ * without this bit set was submitted. -+ */ -+#define BASE_JD_REQ_SKIP_CACHE_START ((base_jd_core_req)1 << 15) ++ _mali_osk_wait_queue_wake_up(session->wait_queue); ++} + -+/** -+ * SW Flag: Skip GPU cache clean and invalidation after a GPU job completes. -+ * -+ * If this bit is set then the GPU's cache will not be cleaned and invalidated -+ * until a GPU job completes which does not have this bit set or a job starts -+ * which does not have the @ref BASE_JD_REQ_SKIP_CACHE_START bti set. Do not use if -+ * the CPU may read from or partially overwrite memory addressed by the job -+ * before the next job without this bit set completes. -+ */ -+#define BASE_JD_REQ_SKIP_CACHE_END ((base_jd_core_req)1 << 16) ++void mali_pp_job_list_add(struct mali_pp_job *job, _mali_osk_list_t *list) ++{ ++ struct mali_pp_job *iter; ++ struct mali_pp_job *tmp; + -+/** -+ * These requirement bits are currently unused in base_jd_core_req -+ */ -+#define BASEP_JD_REQ_RESERVED \ -+ (~(BASE_JD_REQ_ATOM_TYPE | BASE_JD_REQ_EXTERNAL_RESOURCES | \ -+ BASE_JD_REQ_EVENT_ONLY_ON_FAILURE | BASEP_JD_REQ_EVENT_NEVER | \ -+ BASE_JD_REQ_EVENT_COALESCE | \ -+ BASE_JD_REQ_COHERENT_GROUP | BASE_JD_REQ_SPECIFIC_COHERENT_GROUP | \ -+ BASE_JD_REQ_FS_AFBC | BASE_JD_REQ_PERMON | \ -+ BASE_JD_REQ_SKIP_CACHE_START | BASE_JD_REQ_SKIP_CACHE_END)) ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); + -+/** -+ * Mask of all bits in base_jd_core_req that control the type of the atom. -+ * -+ * This allows dependency only atoms to have flags set -+ */ -+#define BASE_JD_REQ_ATOM_TYPE \ -+ (BASE_JD_REQ_FS | BASE_JD_REQ_CS | BASE_JD_REQ_T | BASE_JD_REQ_CF | \ -+ BASE_JD_REQ_V | BASE_JD_REQ_SOFT_JOB | BASE_JD_REQ_ONLY_COMPUTE) ++ /* Find position in list/queue where job should be added. */ ++ _MALI_OSK_LIST_FOREACHENTRY_REVERSE(iter, tmp, list, ++ struct mali_pp_job, list) { ++ /* job should be started after iter if iter is in progress. */ ++ if (0 < iter->sub_jobs_started) { ++ break; ++ } + -+/** -+ * Mask of all bits in base_jd_core_req that control the type of a soft job. -+ */ -+#define BASE_JD_REQ_SOFT_JOB_TYPE (BASE_JD_REQ_SOFT_JOB | 0x1f) ++ /* ++ * job should be started after iter if it has a higher ++ * job id. A span is used to handle job id wrapping. ++ */ ++ if ((mali_pp_job_get_id(job) - ++ mali_pp_job_get_id(iter)) < ++ MALI_SCHEDULER_JOB_ID_SPAN) { ++ break; ++ } ++ } + -+/* -+ * Returns non-zero value if core requirements passed define a soft job or -+ * a dependency only job. -+ */ -+#define BASE_JD_REQ_SOFT_JOB_OR_DEP(core_req) \ -+ ((core_req & BASE_JD_REQ_SOFT_JOB) || \ -+ (core_req & BASE_JD_REQ_ATOM_TYPE) == BASE_JD_REQ_DEP) ++ _mali_osk_list_add(&job->list, &iter->list); ++} + -+/** -+ * @brief States to model state machine processed by kbasep_js_job_check_ref_cores(), which -+ * handles retaining cores for power management and affinity management. -+ * -+ * The state @ref KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY prevents an attack -+ * where lots of atoms could be submitted before powerup, and each has an -+ * affinity chosen that causes other atoms to have an affinity -+ * violation. Whilst the affinity was not causing violations at the time it -+ * was chosen, it could cause violations thereafter. For example, 1000 jobs -+ * could have had their affinity chosen during the powerup time, so any of -+ * those 1000 jobs could cause an affinity violation later on. -+ * -+ * The attack would otherwise occur because other atoms/contexts have to wait for: -+ * -# the currently running atoms (which are causing the violation) to -+ * finish -+ * -# and, the atoms that had their affinity chosen during powerup to -+ * finish. These are run preferentially because they don't cause a -+ * violation, but instead continue to cause the violation in others. -+ * -# or, the attacker is scheduled out (which might not happen for just 2 -+ * contexts) -+ * -+ * By re-choosing the affinity (which is designed to avoid violations at the -+ * time it's chosen), we break condition (2) of the wait, which minimizes the -+ * problem to just waiting for current jobs to finish (which can be bounded if -+ * the Job Scheduling Policy has a timer). -+ */ -+enum kbase_atom_coreref_state { -+ /** Starting state: No affinity chosen, and cores must be requested. kbase_jd_atom::affinity==0 */ -+ KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED, -+ /** Cores requested, but waiting for them to be powered. Requested cores given by kbase_jd_atom::affinity */ -+ KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES, -+ /** Cores given by kbase_jd_atom::affinity are powered, but affinity might be out-of-date, so must recheck */ -+ KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY, -+ /** Cores given by kbase_jd_atom::affinity are powered, and affinity is up-to-date, but must check for violations */ -+ KBASE_ATOM_COREREF_STATE_CHECK_AFFINITY_VIOLATIONS, -+ /** Cores are powered, kbase_jd_atom::affinity up-to-date, no affinity violations: atom can be submitted to HW */ -+ KBASE_ATOM_COREREF_STATE_READY -+}; + -+/* -+ * Base Atom priority -+ * -+ * Only certain priority levels are actually implemented, as specified by the -+ * BASE_JD_PRIO_<...> definitions below. It is undefined to use a priority -+ * level that is not one of those defined below. -+ * -+ * Priority levels only affect scheduling between atoms of the same type within -+ * a base context, and only after the atoms have had dependencies resolved. -+ * Fragment atoms does not affect non-frament atoms with lower priorities, and -+ * the other way around. For example, a low priority atom that has had its -+ * dependencies resolved might run before a higher priority atom that has not -+ * had its dependencies resolved. -+ * -+ * The scheduling between base contexts/processes and between atoms from -+ * different base contexts/processes is unaffected by atom priority. -+ * -+ * The atoms are scheduled as follows with respect to their priorities: -+ * - Let atoms 'X' and 'Y' be for the same job slot who have dependencies -+ * resolved, and atom 'X' has a higher priority than atom 'Y' -+ * - If atom 'Y' is currently running on the HW, then it is interrupted to -+ * allow atom 'X' to run soon after -+ * - If instead neither atom 'Y' nor atom 'X' are running, then when choosing -+ * the next atom to run, atom 'X' will always be chosen instead of atom 'Y' -+ * - Any two atoms that have the same priority could run in any order with -+ * respect to each other. That is, there is no ordering constraint between -+ * atoms of the same priority. -+ */ -+typedef u8 base_jd_prio; ++u32 mali_pp_job_get_perf_counter_src0(struct mali_pp_job *job, u32 sub_job) ++{ ++ /* Virtual jobs always use the global job counter (or if there are per sub job counters at all) */ ++ if (mali_pp_job_is_virtual(job) || 0 == job->perf_counter_per_sub_job_count) { ++ return job->uargs.perf_counter_src0; ++ } + -+/* Medium atom priority. This is a priority higher than BASE_JD_PRIO_LOW */ -+#define BASE_JD_PRIO_MEDIUM ((base_jd_prio)0) -+/* High atom priority. This is a priority higher than BASE_JD_PRIO_MEDIUM and -+ * BASE_JD_PRIO_LOW */ -+#define BASE_JD_PRIO_HIGH ((base_jd_prio)1) -+/* Low atom priority. */ -+#define BASE_JD_PRIO_LOW ((base_jd_prio)2) ++ /* Use per sub job counter if enabled... */ ++ if (MALI_HW_CORE_NO_COUNTER != job->perf_counter_per_sub_job_src0[sub_job]) { ++ return job->perf_counter_per_sub_job_src0[sub_job]; ++ } + -+/* Count of the number of priority levels. This itself is not a valid -+ * base_jd_prio setting */ -+#define BASE_JD_NR_PRIO_LEVELS 3 ++ /* ...else default to global job counter */ ++ return job->uargs.perf_counter_src0; ++} + -+enum kbase_jd_atom_state { -+ /** Atom is not used */ -+ KBASE_JD_ATOM_STATE_UNUSED, -+ /** Atom is queued in JD */ -+ KBASE_JD_ATOM_STATE_QUEUED, -+ /** Atom has been given to JS (is runnable/running) */ -+ KBASE_JD_ATOM_STATE_IN_JS, -+ /** Atom has been completed, but not yet handed back to job dispatcher -+ * for dependency resolution */ -+ KBASE_JD_ATOM_STATE_HW_COMPLETED, -+ /** Atom has been completed, but not yet handed back to userspace */ -+ KBASE_JD_ATOM_STATE_COMPLETED -+}; ++u32 mali_pp_job_get_perf_counter_src1(struct mali_pp_job *job, u32 sub_job) ++{ ++ /* Virtual jobs always use the global job counter (or if there are per sub job counters at all) */ ++ if (mali_pp_job_is_virtual(job) || 0 == job->perf_counter_per_sub_job_count) { ++ /* Virtual jobs always use the global job counter */ ++ return job->uargs.perf_counter_src1; ++ } + -+typedef u8 base_atom_id; /**< Type big enough to store an atom number in */ ++ /* Use per sub job counter if enabled... */ ++ if (MALI_HW_CORE_NO_COUNTER != job->perf_counter_per_sub_job_src1[sub_job]) { ++ return job->perf_counter_per_sub_job_src1[sub_job]; ++ } + -+struct base_dependency { -+ base_atom_id atom_id; /**< An atom number */ -+ base_jd_dep_type dependency_type; /**< Dependency type */ -+}; ++ /* ...else default to global job counter */ ++ return job->uargs.perf_counter_src1; ++} + -+/* This structure has changed since UK 10.2 for which base_jd_core_req was a u16 value. -+ * In order to keep the size of the structure same, padding field has been adjusted -+ * accordingly and core_req field of a u32 type (to which UK 10.3 base_jd_core_req defines) -+ * is added at the end of the structure. Place in the structure previously occupied by u16 core_req -+ * is kept but renamed to compat_core_req and as such it can be used in ioctl call for job submission -+ * as long as UK 10.2 legacy is supported. Once when this support ends, this field can be left -+ * for possible future use. */ -+typedef struct base_jd_atom_v2 { -+ u64 jc; /**< job-chain GPU address */ -+ struct base_jd_udata udata; /**< user data */ -+ u64 extres_list; /**< list of external resources */ -+ u16 nr_extres; /**< nr of external resources */ -+ u16 compat_core_req; /**< core requirements which correspond to the legacy support for UK 10.2 */ -+ struct base_dependency pre_dep[2]; /**< pre-dependencies, one need to use SETTER function to assign this field, -+ this is done in order to reduce possibility of improper assigment of a dependency field */ -+ base_atom_id atom_number; /**< unique number to identify the atom */ -+ base_jd_prio prio; /**< Atom priority. Refer to @ref base_jd_prio for more details */ -+ u8 device_nr; /**< coregroup when BASE_JD_REQ_SPECIFIC_COHERENT_GROUP specified */ -+ u8 padding[1]; -+ base_jd_core_req core_req; /**< core requirements */ -+} base_jd_atom_v2; ++void mali_pp_job_set_pp_counter_global_src0(u32 counter) ++{ ++ pp_counter_src0 = counter; ++} + -+typedef enum base_external_resource_access { -+ BASE_EXT_RES_ACCESS_SHARED, -+ BASE_EXT_RES_ACCESS_EXCLUSIVE -+} base_external_resource_access; ++void mali_pp_job_set_pp_counter_global_src1(u32 counter) ++{ ++ pp_counter_src1 = counter; ++} + -+typedef struct base_external_resource { -+ u64 ext_resource; -+} base_external_resource; ++void mali_pp_job_set_pp_counter_sub_job_src0(u32 sub_job, u32 counter) ++{ ++ MALI_DEBUG_ASSERT(sub_job < _MALI_PP_MAX_SUB_JOBS); + ++ if (MALI_HW_CORE_NO_COUNTER == pp_counter_per_sub_job_src0[sub_job]) { ++ /* increment count since existing counter was disabled */ ++ _mali_osk_atomic_inc(&pp_counter_per_sub_job_count); ++ } + -+/** -+ * The maximum number of external resources which can be mapped/unmapped -+ * in a single request. -+ */ -+#define BASE_EXT_RES_COUNT_MAX 10 ++ if (MALI_HW_CORE_NO_COUNTER == counter) { ++ /* decrement count since new counter is disabled */ ++ _mali_osk_atomic_dec(&pp_counter_per_sub_job_count); ++ } + -+/** -+ * struct base_external_resource_list - Structure which describes a list of -+ * external resources. -+ * @count: The number of resources. -+ * @ext_res: Array of external resources which is -+ * sized at allocation time. -+ */ -+struct base_external_resource_list { -+ u64 count; -+ struct base_external_resource ext_res[1]; -+}; ++ /* PS: A change from MALI_HW_CORE_NO_COUNTER to MALI_HW_CORE_NO_COUNTER will inc and dec, result will be 0 change */ + -+struct base_jd_debug_copy_buffer { -+ u64 address; -+ u64 size; -+ struct base_external_resource extres; -+}; ++ pp_counter_per_sub_job_src0[sub_job] = counter; ++} + -+/** -+ * @brief Setter for a dependency structure -+ * -+ * @param[in] dep The kbase jd atom dependency to be initialized. -+ * @param id The atom_id to be assigned. -+ * @param dep_type The dep_type to be assigned. -+ * -+ */ -+static inline void base_jd_atom_dep_set(struct base_dependency *dep, -+ base_atom_id id, base_jd_dep_type dep_type) ++void mali_pp_job_set_pp_counter_sub_job_src1(u32 sub_job, u32 counter) +{ -+ LOCAL_ASSERT(dep != NULL); ++ MALI_DEBUG_ASSERT(sub_job < _MALI_PP_MAX_SUB_JOBS); + -+ /* -+ * make sure we don't set not allowed combinations -+ * of atom_id/dependency_type. -+ */ -+ LOCAL_ASSERT((id == 0 && dep_type == BASE_JD_DEP_TYPE_INVALID) || -+ (id > 0 && dep_type != BASE_JD_DEP_TYPE_INVALID)); ++ if (MALI_HW_CORE_NO_COUNTER == pp_counter_per_sub_job_src1[sub_job]) { ++ /* increment count since existing counter was disabled */ ++ _mali_osk_atomic_inc(&pp_counter_per_sub_job_count); ++ } + -+ dep->atom_id = id; -+ dep->dependency_type = dep_type; -+} ++ if (MALI_HW_CORE_NO_COUNTER == counter) { ++ /* decrement count since new counter is disabled */ ++ _mali_osk_atomic_dec(&pp_counter_per_sub_job_count); ++ } + -+/** -+ * @brief Make a copy of a dependency structure -+ * -+ * @param[in,out] dep The kbase jd atom dependency to be written. -+ * @param[in] from The dependency to make a copy from. -+ * -+ */ -+static inline void base_jd_atom_dep_copy(struct base_dependency *dep, -+ const struct base_dependency *from) -+{ -+ LOCAL_ASSERT(dep != NULL); ++ /* PS: A change from MALI_HW_CORE_NO_COUNTER to MALI_HW_CORE_NO_COUNTER will inc and dec, result will be 0 change */ + -+ base_jd_atom_dep_set(dep, from->atom_id, from->dependency_type); ++ pp_counter_per_sub_job_src1[sub_job] = counter; +} + -+/** -+ * @brief Soft-atom fence trigger setup. -+ * -+ * Sets up an atom to be a SW-only atom signaling a fence -+ * when it reaches the run state. -+ * -+ * Using the existing base dependency system the fence can -+ * be set to trigger when a GPU job has finished. -+ * -+ * The base fence object must not be terminated until the atom -+ * has been submitted to @ref base_jd_submit and @ref base_jd_submit -+ * has returned. -+ * -+ * @a fence must be a valid fence set up with @a base_fence_init. -+ * Calling this function with a uninitialized fence results in undefined behavior. -+ * -+ * @param[out] atom A pre-allocated atom to configure as a fence trigger SW atom -+ * @param[in] fence The base fence object to trigger. -+ * -+ * @pre @p fence must reference a @ref base_fence successfully initialized by -+ * calling @ref base_fence_init. -+ * @pre @p fence was @e not initialized by calling @ref base_fence_import, nor -+ * is it associated with a fence-trigger job that was already submitted -+ * by calling @ref base_jd_submit. -+ * @post @p atom can be submitted by calling @ref base_jd_submit. -+ */ -+static inline void base_jd_fence_trigger_setup_v2(struct base_jd_atom_v2 *atom, struct base_fence *fence) ++u32 mali_pp_job_get_pp_counter_global_src0(void) +{ -+ LOCAL_ASSERT(atom); -+ LOCAL_ASSERT(fence); -+ LOCAL_ASSERT(fence->basep.fd == INVALID_PLATFORM_FENCE); -+ LOCAL_ASSERT(fence->basep.stream_fd >= 0); -+ atom->jc = (uintptr_t) fence; -+ atom->core_req = BASE_JD_REQ_SOFT_FENCE_TRIGGER; ++ return pp_counter_src0; +} + -+/** -+ * @brief Soft-atom fence wait setup. -+ * -+ * Sets up an atom to be a SW-only atom waiting on a fence. -+ * When the fence becomes triggered the atom becomes runnable -+ * and completes immediately. -+ * -+ * Using the existing base dependency system the fence can -+ * be set to block a GPU job until it has been triggered. -+ * -+ * The base fence object must not be terminated until the atom -+ * has been submitted to @ref base_jd_submit and -+ * @ref base_jd_submit has returned. -+ * -+ * @param[out] atom A pre-allocated atom to configure as a fence wait SW atom -+ * @param[in] fence The base fence object to wait on -+ * -+ * @pre @p fence must reference a @ref base_fence successfully initialized by -+ * calling @ref base_fence_import, or it must be associated with a -+ * fence-trigger job that was already submitted by calling -+ * @ref base_jd_submit. -+ * @post @p atom can be submitted by calling @ref base_jd_submit. -+ */ -+static inline void base_jd_fence_wait_setup_v2(struct base_jd_atom_v2 *atom, struct base_fence *fence) ++u32 mali_pp_job_get_pp_counter_global_src1(void) +{ -+ LOCAL_ASSERT(atom); -+ LOCAL_ASSERT(fence); -+ LOCAL_ASSERT(fence->basep.fd >= 0); -+ atom->jc = (uintptr_t) fence; -+ atom->core_req = BASE_JD_REQ_SOFT_FENCE_WAIT; ++ return pp_counter_src1; +} + -+/** -+ * @brief External resource info initialization. -+ * -+ * Sets up an external resource object to reference -+ * a memory allocation and the type of access requested. -+ * -+ * @param[in] res The resource object to initialize -+ * @param handle The handle to the imported memory object, must be -+ * obtained by calling @ref base_mem_as_import_handle(). -+ * @param access The type of access requested -+ */ -+static inline void base_external_resource_init(struct base_external_resource *res, struct base_import_handle handle, base_external_resource_access access) ++u32 mali_pp_job_get_pp_counter_sub_job_src0(u32 sub_job) +{ -+ u64 address; ++ MALI_DEBUG_ASSERT(sub_job < _MALI_PP_MAX_SUB_JOBS); ++ return pp_counter_per_sub_job_src0[sub_job]; ++} + -+ address = handle.basep.handle; ++u32 mali_pp_job_get_pp_counter_sub_job_src1(u32 sub_job) ++{ ++ MALI_DEBUG_ASSERT(sub_job < _MALI_PP_MAX_SUB_JOBS); ++ return pp_counter_per_sub_job_src1[sub_job]; ++} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h +new file mode 100755 +index 000000000..d0331f398 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h +@@ -0,0 +1,594 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ LOCAL_ASSERT(res != NULL); -+ LOCAL_ASSERT(0 == (address & LOCAL_PAGE_LSB)); -+ LOCAL_ASSERT(access == BASE_EXT_RES_ACCESS_SHARED || access == BASE_EXT_RES_ACCESS_EXCLUSIVE); ++#ifndef __MALI_PP_JOB_H__ ++#define __MALI_PP_JOB_H__ + -+ res->ext_resource = address | (access & LOCAL_PAGE_LSB); -+} ++#include "mali_osk.h" ++#include "mali_osk_list.h" ++#include "mali_uk_types.h" ++#include "mali_session.h" ++#include "mali_kernel_common.h" ++#include "regs/mali_200_regs.h" ++#include "mali_kernel_core.h" ++#include "mali_dlbu.h" ++#include "mali_timeline.h" ++#include "mali_scheduler.h" ++#include "mali_executor.h" ++#if defined(CONFIG_DMA_SHARED_BUFFER) && !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) ++#include "linux/mali_memory_dma_buf.h" ++#endif ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++#include "linux/mali_dma_fence.h" ++#endif + -+/** -+ * @brief Job chain event code bits -+ * Defines the bits used to create ::base_jd_event_code -+ */ -+enum { -+ BASE_JD_SW_EVENT_KERNEL = (1u << 15), /**< Kernel side event */ -+ BASE_JD_SW_EVENT = (1u << 14), /**< SW defined event */ -+ BASE_JD_SW_EVENT_SUCCESS = (1u << 13), /**< Event idicates success (SW events only) */ -+ BASE_JD_SW_EVENT_JOB = (0u << 11), /**< Job related event */ -+ BASE_JD_SW_EVENT_BAG = (1u << 11), /**< Bag related event */ -+ BASE_JD_SW_EVENT_INFO = (2u << 11), /**< Misc/info event */ -+ BASE_JD_SW_EVENT_RESERVED = (3u << 11), /**< Reserved event type */ -+ BASE_JD_SW_EVENT_TYPE_MASK = (3u << 11) /**< Mask to extract the type from an event code */ -+}; ++typedef enum pp_job_status { ++ MALI_NO_SWAP_IN, ++ MALI_SWAP_IN_FAIL, ++ MALI_SWAP_IN_SUCC, ++} pp_job_status; + +/** -+ * @brief Job chain event codes -+ * -+ * HW and low-level SW events are represented by event codes. -+ * The status of jobs which succeeded are also represented by -+ * an event code (see ::BASE_JD_EVENT_DONE). -+ * Events are usually reported as part of a ::base_jd_event. -+ * -+ * The event codes are encoded in the following way: -+ * @li 10:0 - subtype -+ * @li 12:11 - type -+ * @li 13 - SW success (only valid if the SW bit is set) -+ * @li 14 - SW event (HW event if not set) -+ * @li 15 - Kernel event (should never be seen in userspace) -+ * -+ * Events are split up into ranges as follows: -+ * - BASE_JD_EVENT_RANGE_\_START -+ * - BASE_JD_EVENT_RANGE_\_END -+ * -+ * \a code is in \'s range when: -+ * - BASE_JD_EVENT_RANGE_\_START <= code < BASE_JD_EVENT_RANGE_\_END -+ * -+ * Ranges can be asserted for adjacency by testing that the END of the previous -+ * is equal to the START of the next. This is useful for optimizing some tests -+ * for range. ++ * This structure represents a PP job, including all sub jobs. + * -+ * A limitation is that the last member of this enum must explicitly be handled -+ * (with an assert-unreachable statement) in switch statements that use -+ * variables of this type. Otherwise, the compiler warns that we have not -+ * handled that enum value. ++ * The PP job object itself is not protected by any single lock, ++ * but relies on other locks instead (scheduler, executor and timeline lock). ++ * Think of the job object as moving between these sub systems through-out ++ * its lifetime. Different part of the PP job struct is used by different ++ * subsystems. Accessor functions ensure that correct lock is taken. ++ * Do NOT access any data members directly from outside this module! + */ -+typedef enum base_jd_event_code { -+ /* HW defined exceptions */ -+ -+ /** Start of HW Non-fault status codes -+ * -+ * @note Obscurely, BASE_JD_EVENT_TERMINATED indicates a real fault, -+ * because the job was hard-stopped ++struct mali_pp_job { ++ /* ++ * These members are typically only set at creation, ++ * and only read later on. ++ * They do not require any lock protection. + */ -+ BASE_JD_EVENT_RANGE_HW_NONFAULT_START = 0, ++ _mali_uk_pp_start_job_s uargs; /**< Arguments from user space */ ++ struct mali_session_data *session; /**< Session which submitted this job */ ++ u32 pid; /**< Process ID of submitting process */ ++ u32 tid; /**< Thread ID of submitting thread */ ++ u32 id; /**< Identifier for this job in kernel space (sequential numbering) */ ++ u32 cache_order; /**< Cache order used for L2 cache flushing (sequential numbering) */ ++ struct mali_timeline_tracker tracker; /**< Timeline tracker for this job */ ++ _mali_osk_notification_t *finished_notification; /**< Notification sent back to userspace on job complete */ ++ u32 perf_counter_per_sub_job_count; /**< Number of values in the two arrays which is != MALI_HW_CORE_NO_COUNTER */ ++ u32 perf_counter_per_sub_job_src0[_MALI_PP_MAX_SUB_JOBS]; /**< Per sub job counters src0 */ ++ u32 perf_counter_per_sub_job_src1[_MALI_PP_MAX_SUB_JOBS]; /**< Per sub job counters src1 */ ++ u32 sub_jobs_num; /**< Number of subjobs; set to 1 for Mali-450 if DLBU is used, otherwise equals number of PP cores */ + -+ /* non-fatal exceptions */ -+ BASE_JD_EVENT_NOT_STARTED = 0x00, /**< Can't be seen by userspace, treated as 'previous job done' */ -+ BASE_JD_EVENT_DONE = 0x01, -+ BASE_JD_EVENT_STOPPED = 0x03, /**< Can't be seen by userspace, becomes TERMINATED, DONE or JOB_CANCELLED */ -+ BASE_JD_EVENT_TERMINATED = 0x04, /**< This is actually a fault status code - the job was hard stopped */ -+ BASE_JD_EVENT_ACTIVE = 0x08, /**< Can't be seen by userspace, jobs only returned on complete/fail/cancel */ ++ pp_job_status swap_status; /**< Used to track each PP job swap status, if fail, we need to drop them in scheduler part */ ++ mali_bool user_notification; /**< When we deferred delete PP job, we need to judge if we need to send job finish notification to user space */ ++ u32 num_pp_cores_in_virtual; /**< How many PP cores we have when job finished */ + -+ /** End of HW Non-fault status codes -+ * -+ * @note Obscurely, BASE_JD_EVENT_TERMINATED indicates a real fault, -+ * because the job was hard-stopped ++ /* ++ * These members are used by both scheduler and executor. ++ * They are "protected" by atomic operations. + */ -+ BASE_JD_EVENT_RANGE_HW_NONFAULT_END = 0x40, ++ _mali_osk_atomic_t sub_jobs_completed; /**< Number of completed sub-jobs in this superjob */ ++ _mali_osk_atomic_t sub_job_errors; /**< Bitfield with errors (errors for each single sub-job is or'ed together) */ + -+ /** Start of HW fault and SW Error status codes */ -+ BASE_JD_EVENT_RANGE_HW_FAULT_OR_SW_ERROR_START = 0x40, ++ /* ++ * These members are used by scheduler, but only when no one else ++ * knows about this job object but the working function. ++ * No lock is thus needed for these. ++ */ ++ u32 *memory_cookies; /**< Memory cookies attached to job */ + -+ /* job exceptions */ -+ BASE_JD_EVENT_JOB_CONFIG_FAULT = 0x40, -+ BASE_JD_EVENT_JOB_POWER_FAULT = 0x41, -+ BASE_JD_EVENT_JOB_READ_FAULT = 0x42, -+ BASE_JD_EVENT_JOB_WRITE_FAULT = 0x43, -+ BASE_JD_EVENT_JOB_AFFINITY_FAULT = 0x44, -+ BASE_JD_EVENT_JOB_BUS_FAULT = 0x48, -+ BASE_JD_EVENT_INSTR_INVALID_PC = 0x50, -+ BASE_JD_EVENT_INSTR_INVALID_ENC = 0x51, -+ BASE_JD_EVENT_INSTR_TYPE_MISMATCH = 0x52, -+ BASE_JD_EVENT_INSTR_OPERAND_FAULT = 0x53, -+ BASE_JD_EVENT_INSTR_TLS_FAULT = 0x54, -+ BASE_JD_EVENT_INSTR_BARRIER_FAULT = 0x55, -+ BASE_JD_EVENT_INSTR_ALIGN_FAULT = 0x56, -+ BASE_JD_EVENT_DATA_INVALID_FAULT = 0x58, -+ BASE_JD_EVENT_TILE_RANGE_FAULT = 0x59, -+ BASE_JD_EVENT_STATE_FAULT = 0x5A, -+ BASE_JD_EVENT_OUT_OF_MEMORY = 0x60, -+ BASE_JD_EVENT_UNKNOWN = 0x7F, ++ /* ++ * These members are used by the scheduler, ++ * protected by scheduler lock ++ */ ++ _mali_osk_list_t list; /**< Used to link jobs together in the scheduler queue */ ++ _mali_osk_list_t session_fb_lookup_list; /**< Used to link jobs together from the same frame builder in the session */ + -+ /* GPU exceptions */ -+ BASE_JD_EVENT_DELAYED_BUS_FAULT = 0x80, -+ BASE_JD_EVENT_SHAREABILITY_FAULT = 0x88, ++ u32 sub_jobs_started; /**< Total number of sub-jobs started (always started in ascending order) */ + -+ /* MMU exceptions */ -+ BASE_JD_EVENT_TRANSLATION_FAULT_LEVEL1 = 0xC1, -+ BASE_JD_EVENT_TRANSLATION_FAULT_LEVEL2 = 0xC2, -+ BASE_JD_EVENT_TRANSLATION_FAULT_LEVEL3 = 0xC3, -+ BASE_JD_EVENT_TRANSLATION_FAULT_LEVEL4 = 0xC4, -+ BASE_JD_EVENT_PERMISSION_FAULT = 0xC8, -+ BASE_JD_EVENT_TRANSTAB_BUS_FAULT_LEVEL1 = 0xD1, -+ BASE_JD_EVENT_TRANSTAB_BUS_FAULT_LEVEL2 = 0xD2, -+ BASE_JD_EVENT_TRANSTAB_BUS_FAULT_LEVEL3 = 0xD3, -+ BASE_JD_EVENT_TRANSTAB_BUS_FAULT_LEVEL4 = 0xD4, -+ BASE_JD_EVENT_ACCESS_FLAG = 0xD8, ++ /* ++ * Set by executor/group on job completion, read by scheduler when ++ * returning job to user. Hold executor lock when setting, ++ * no lock needed when reading ++ */ ++ u32 perf_counter_value0[_MALI_PP_MAX_SUB_JOBS]; /**< Value of performance counter 0 (to be returned to user space), one for each sub job */ ++ u32 perf_counter_value1[_MALI_PP_MAX_SUB_JOBS]; /**< Value of performance counter 1 (to be returned to user space), one for each sub job */ + -+ /* SW defined exceptions */ -+ BASE_JD_EVENT_MEM_GROWTH_FAILED = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x000, -+ BASE_JD_EVENT_TIMED_OUT = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x001, -+ BASE_JD_EVENT_JOB_CANCELLED = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x002, -+ BASE_JD_EVENT_JOB_INVALID = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x003, -+ BASE_JD_EVENT_PM_EVENT = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x004, -+ BASE_JD_EVENT_FORCE_REPLAY = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x005, ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++ struct mali_dma_fence_context dma_fence_context; /**< The mali dma fence context to record dma fence waiters that this job wait for */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ struct dma_fence *rendered_dma_fence; /**< the new dma fence link to this job */ ++#else ++ struct fence *rendered_dma_fence; /**< the new dma fence link to this job */ ++#endif ++#endif ++}; + -+ BASE_JD_EVENT_BAG_INVALID = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_BAG | 0x003, ++void mali_pp_job_initialize(void); ++void mali_pp_job_terminate(void); + -+ /** End of HW fault and SW Error status codes */ -+ BASE_JD_EVENT_RANGE_HW_FAULT_OR_SW_ERROR_END = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_RESERVED | 0x3FF, ++struct mali_pp_job *mali_pp_job_create(struct mali_session_data *session, _mali_uk_pp_start_job_s *uargs, u32 id); ++void mali_pp_job_delete(struct mali_pp_job *job); + -+ /** Start of SW Success status codes */ -+ BASE_JD_EVENT_RANGE_SW_SUCCESS_START = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_SUCCESS | 0x000, ++u32 mali_pp_job_get_perf_counter_src0(struct mali_pp_job *job, u32 sub_job); ++u32 mali_pp_job_get_perf_counter_src1(struct mali_pp_job *job, u32 sub_job); + -+ BASE_JD_EVENT_PROGRESS_REPORT = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_SUCCESS | BASE_JD_SW_EVENT_JOB | 0x000, -+ BASE_JD_EVENT_BAG_DONE = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_SUCCESS | BASE_JD_SW_EVENT_BAG | 0x000, -+ BASE_JD_EVENT_DRV_TERMINATED = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_SUCCESS | BASE_JD_SW_EVENT_INFO | 0x000, ++void mali_pp_job_set_pp_counter_global_src0(u32 counter); ++void mali_pp_job_set_pp_counter_global_src1(u32 counter); ++void mali_pp_job_set_pp_counter_sub_job_src0(u32 sub_job, u32 counter); ++void mali_pp_job_set_pp_counter_sub_job_src1(u32 sub_job, u32 counter); + -+ /** End of SW Success status codes */ -+ BASE_JD_EVENT_RANGE_SW_SUCCESS_END = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_SUCCESS | BASE_JD_SW_EVENT_RESERVED | 0x3FF, ++u32 mali_pp_job_get_pp_counter_global_src0(void); ++u32 mali_pp_job_get_pp_counter_global_src1(void); ++u32 mali_pp_job_get_pp_counter_sub_job_src0(u32 sub_job); ++u32 mali_pp_job_get_pp_counter_sub_job_src1(u32 sub_job); + -+ /** Start of Kernel-only status codes. Such codes are never returned to user-space */ -+ BASE_JD_EVENT_RANGE_KERNEL_ONLY_START = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_KERNEL | 0x000, -+ BASE_JD_EVENT_REMOVED_FROM_NEXT = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_KERNEL | BASE_JD_SW_EVENT_JOB | 0x000, ++MALI_STATIC_INLINE u32 mali_pp_job_get_id(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return (NULL == job) ? 0 : job->id; ++} + -+ /** End of Kernel-only status codes. */ -+ BASE_JD_EVENT_RANGE_KERNEL_ONLY_END = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_KERNEL | BASE_JD_SW_EVENT_RESERVED | 0x3FF -+} base_jd_event_code; ++MALI_STATIC_INLINE void mali_pp_job_set_cache_order(struct mali_pp_job *job, ++ u32 cache_order) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ job->cache_order = cache_order; ++} + -+/** -+ * @brief Event reporting structure -+ * -+ * This structure is used by the kernel driver to report information -+ * about GPU events. The can either be HW-specific events or low-level -+ * SW events, such as job-chain completion. -+ * -+ * The event code contains an event type field which can be extracted -+ * by ANDing with ::BASE_JD_SW_EVENT_TYPE_MASK. -+ * -+ * Based on the event type base_jd_event::data holds: -+ * @li ::BASE_JD_SW_EVENT_JOB : the offset in the ring-buffer for the completed -+ * job-chain -+ * @li ::BASE_JD_SW_EVENT_BAG : The address of the ::base_jd_bag that has -+ * been completed (ie all contained job-chains have been completed). -+ * @li ::BASE_JD_SW_EVENT_INFO : base_jd_event::data not used -+ */ -+typedef struct base_jd_event_v2 { -+ base_jd_event_code event_code; /**< event code */ -+ base_atom_id atom_number; /**< the atom number that has completed */ -+ struct base_jd_udata udata; /**< user data */ -+} base_jd_event_v2; ++MALI_STATIC_INLINE u32 mali_pp_job_get_cache_order(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return (NULL == job) ? 0 : job->cache_order; ++} + -+/** -+ * @brief Structure for BASE_JD_REQ_SOFT_DUMP_CPU_GPU_COUNTERS jobs. -+ * -+ * This structure is stored into the memory pointed to by the @c jc field -+ * of @ref base_jd_atom. -+ * -+ * It must not occupy the same CPU cache line(s) as any neighboring data. -+ * This is to avoid cases where access to pages containing the structure -+ * is shared between cached and un-cached memory regions, which would -+ * cause memory corruption. -+ */ ++MALI_STATIC_INLINE u64 mali_pp_job_get_user_id(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.user_job_ptr; ++} + -+typedef struct base_dump_cpu_gpu_counters { -+ u64 system_time; -+ u64 cycle_counter; -+ u64 sec; -+ u32 usec; -+ u8 padding[36]; -+} base_dump_cpu_gpu_counters; ++MALI_STATIC_INLINE u32 mali_pp_job_get_frame_builder_id(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.frame_builder_id; ++} + -+/** @} end group base_user_api_job_dispatch */ ++MALI_STATIC_INLINE u32 mali_pp_job_get_flush_id(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.flush_id; ++} + -+#define GPU_MAX_JOB_SLOTS 16 ++MALI_STATIC_INLINE u32 mali_pp_job_get_pid(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->pid; ++} + -+/** -+ * @page page_base_user_api_gpuprops User-side Base GPU Property Query API -+ * -+ * The User-side Base GPU Property Query API encapsulates two -+ * sub-modules: -+ * -+ * - @ref base_user_api_gpuprops_dyn "Dynamic GPU Properties" -+ * - @ref base_plat_config_gpuprops "Base Platform Config GPU Properties" -+ * -+ * There is a related third module outside of Base, which is owned by the MIDG -+ * module: -+ * - @ref gpu_props_static "Midgard Compile-time GPU Properties" -+ * -+ * Base only deals with properties that vary between different Midgard -+ * implementations - the Dynamic GPU properties and the Platform Config -+ * properties. -+ * -+ * For properties that are constant for the Midgard Architecture, refer to the -+ * MIDG module. However, we will discuss their relevance here just to -+ * provide background information. -+ * -+ * @section sec_base_user_api_gpuprops_about About the GPU Properties in Base and MIDG modules -+ * -+ * The compile-time properties (Platform Config, Midgard Compile-time -+ * properties) are exposed as pre-processor macros. -+ * -+ * Complementing the compile-time properties are the Dynamic GPU -+ * Properties, which act as a conduit for the Midgard Configuration -+ * Discovery. -+ * -+ * In general, the dynamic properties are present to verify that the platform -+ * has been configured correctly with the right set of Platform Config -+ * Compile-time Properties. -+ * -+ * As a consistent guide across the entire DDK, the choice for dynamic or -+ * compile-time should consider the following, in order: -+ * -# Can the code be written so that it doesn't need to know the -+ * implementation limits at all? -+ * -# If you need the limits, get the information from the Dynamic Property -+ * lookup. This should be done once as you fetch the context, and then cached -+ * as part of the context data structure, so it's cheap to access. -+ * -# If there's a clear and arguable inefficiency in using Dynamic Properties, -+ * then use a Compile-Time Property (Platform Config, or Midgard Compile-time -+ * property). Examples of where this might be sensible follow: -+ * - Part of a critical inner-loop -+ * - Frequent re-use throughout the driver, causing significant extra load -+ * instructions or control flow that would be worthwhile optimizing out. -+ * -+ * We cannot provide an exhaustive set of examples, neither can we provide a -+ * rule for every possible situation. Use common sense, and think about: what -+ * the rest of the driver will be doing; how the compiler might represent the -+ * value if it is a compile-time constant; whether an OEM shipping multiple -+ * devices would benefit much more from a single DDK binary, instead of -+ * insignificant micro-optimizations. -+ * -+ * @section sec_base_user_api_gpuprops_dyn Dynamic GPU Properties -+ * -+ * Dynamic GPU properties are presented in two sets: -+ * -# the commonly used properties in @ref base_gpu_props, which have been -+ * unpacked from GPU register bitfields. -+ * -# The full set of raw, unprocessed properties in @ref gpu_raw_gpu_props -+ * (also a member of @ref base_gpu_props). All of these are presented in -+ * the packed form, as presented by the GPU registers themselves. -+ * -+ * @usecase The raw properties in @ref gpu_raw_gpu_props are necessary to -+ * allow a user of the Mali Tools (e.g. PAT) to determine "Why is this device -+ * behaving differently?". In this case, all information about the -+ * configuration is potentially useful, but it does not need to be processed -+ * by the driver. Instead, the raw registers can be processed by the Mali -+ * Tools software on the host PC. -+ * -+ * The properties returned extend the Midgard Configuration Discovery -+ * registers. For example, GPU clock speed is not specified in the Midgard -+ * Architecture, but is necessary for OpenCL's clGetDeviceInfo() function. -+ * -+ * The GPU properties are obtained by a call to -+ * _mali_base_get_gpu_props(). This simply returns a pointer to a const -+ * base_gpu_props structure. It is constant for the life of a base -+ * context. Multiple calls to _mali_base_get_gpu_props() to a base context -+ * return the same pointer to a constant structure. This avoids cache pollution -+ * of the common data. -+ * -+ * This pointer must not be freed, because it does not point to the start of a -+ * region allocated by the memory allocator; instead, just close the @ref -+ * base_context. -+ * -+ * -+ * @section sec_base_user_api_gpuprops_config Platform Config Compile-time Properties -+ * -+ * The Platform Config File sets up gpu properties that are specific to a -+ * certain platform. Properties that are 'Implementation Defined' in the -+ * Midgard Architecture spec are placed here. -+ * -+ * @note Reference configurations are provided for Midgard Implementations, such as -+ * the Mali-T600 family. The customer need not repeat this information, and can select one of -+ * these reference configurations. For example, VA_BITS, PA_BITS and the -+ * maximum number of samples per pixel might vary between Midgard Implementations, but -+ * \b not for platforms using the Mali-T604. This information is placed in -+ * the reference configuration files. -+ * -+ * The System Integrator creates the following structure: -+ * - platform_XYZ -+ * - platform_XYZ/plat -+ * - platform_XYZ/plat/plat_config.h -+ * -+ * They then edit plat_config.h, using the example plat_config.h files as a -+ * guide. -+ * -+ * At the very least, the customer must set @ref CONFIG_GPU_CORE_TYPE, and will -+ * receive a helpful \#error message if they do not do this correctly. This -+ * selects the Reference Configuration for the Midgard Implementation. The rationale -+ * behind this decision (against asking the customer to write \#include -+ * in their plat_config.h) is as follows: -+ * - This mechanism 'looks' like a regular config file (such as Linux's -+ * .config) -+ * - It is difficult to get wrong in a way that will produce strange build -+ * errors: -+ * - They need not know where the mali_t600.h, other_midg_gpu.h etc. files are stored - and -+ * so they won't accidentally pick another file with 'mali_t600' in its name -+ * - When the build doesn't work, the System Integrator may think the DDK is -+ * doesn't work, and attempt to fix it themselves: -+ * - For the @ref CONFIG_GPU_CORE_TYPE mechanism, the only way to get past the -+ * error is to set @ref CONFIG_GPU_CORE_TYPE, and this is what the \#error tells -+ * you. -+ * - For a \#include mechanism, checks must still be made elsewhere, which the -+ * System Integrator may try working around by setting \#defines (such as -+ * VA_BITS) themselves in their plat_config.h. In the worst case, they may -+ * set the prevention-mechanism \#define of -+ * "A_CORRECT_MIDGARD_CORE_WAS_CHOSEN". -+ * - In this case, they would believe they are on the right track, because -+ * the build progresses with their fix, but with errors elsewhere. -+ * -+ * However, there is nothing to prevent the customer using \#include to organize -+ * their own configurations files hierarchically. -+ * -+ * The mechanism for the header file processing is as follows: -+ * -+ * @dot -+ digraph plat_config_mechanism { -+ rankdir=BT -+ size="6,6" ++MALI_STATIC_INLINE u32 mali_pp_job_get_tid(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->tid; ++} + -+ "mali_base.h"; -+ "gpu/mali_gpu.h"; ++MALI_STATIC_INLINE u32 *mali_pp_job_get_frame_registers(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.frame_registers; ++} + -+ node [ shape=box ]; -+ { -+ rank = same; ordering = out; ++MALI_STATIC_INLINE u32 *mali_pp_job_get_dlbu_registers(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.dlbu_registers; ++} + -+ "gpu/mali_gpu_props.h"; -+ "base/midg_gpus/mali_t600.h"; -+ "base/midg_gpus/other_midg_gpu.h"; -+ } -+ { rank = same; "plat/plat_config.h"; } -+ { -+ rank = same; -+ "gpu/mali_gpu.h" [ shape=box ]; -+ gpu_chooser [ label="" style="invisible" width=0 height=0 fixedsize=true ]; -+ select_gpu [ label="Mali-T600 | Other\n(select_gpu.h)" shape=polygon,sides=4,distortion=0.25 width=3.3 height=0.99 fixedsize=true ] ; -+ } -+ node [ shape=box ]; -+ { rank = same; "plat/plat_config.h"; } -+ { rank = same; "mali_base.h"; } ++MALI_STATIC_INLINE mali_bool mali_pp_job_is_virtual(struct mali_pp_job *job) ++{ ++#if (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return (0 == job->uargs.num_cores) ? MALI_TRUE : MALI_FALSE; ++#else ++ return MALI_FALSE; ++#endif ++} + -+ "mali_base.h" -> "gpu/mali_gpu.h" -> "gpu/mali_gpu_props.h"; -+ "mali_base.h" -> "plat/plat_config.h" ; -+ "mali_base.h" -> select_gpu ; ++MALI_STATIC_INLINE u32 mali_pp_job_get_addr_frame(struct mali_pp_job *job, u32 sub_job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); + -+ "plat/plat_config.h" -> gpu_chooser [style="dotted,bold" dir=none weight=4] ; -+ gpu_chooser -> select_gpu [style="dotted,bold"] ; ++ if (mali_pp_job_is_virtual(job)) { ++ return MALI_DLBU_VIRT_ADDR; ++ } else if (0 == sub_job) { ++ return job->uargs.frame_registers[MALI200_REG_ADDR_FRAME / sizeof(u32)]; ++ } else if (sub_job < _MALI_PP_MAX_SUB_JOBS) { ++ return job->uargs.frame_registers_addr_frame[sub_job - 1]; ++ } + -+ select_gpu -> "base/midg_gpus/mali_t600.h" ; -+ select_gpu -> "base/midg_gpus/other_midg_gpu.h" ; -+ } -+ @enddot -+ * -+ * -+ * @section sec_base_user_api_gpuprops_kernel Kernel Operation -+ * -+ * During Base Context Create time, user-side makes a single kernel call: -+ * - A call to fill user memory with GPU information structures -+ * -+ * The kernel-side will fill the provided the entire processed @ref base_gpu_props -+ * structure, because this information is required in both -+ * user and kernel side; it does not make sense to decode it twice. -+ * -+ * Coherency groups must be derived from the bitmasks, but this can be done -+ * kernel side, and just once at kernel startup: Coherency groups must already -+ * be known kernel-side, to support chains that specify a 'Only Coherent Group' -+ * SW requirement, or 'Only Coherent Group with Tiler' SW requirement. -+ * -+ * @section sec_base_user_api_gpuprops_cocalc Coherency Group calculation -+ * Creation of the coherent group data is done at device-driver startup, and so -+ * is one-time. This will most likely involve a loop with CLZ, shifting, and -+ * bit clearing on the L2_PRESENT mask, depending on whether the -+ * system is L2 Coherent. The number of shader cores is done by a -+ * population count, since faulty cores may be disabled during production, -+ * producing a non-contiguous mask. -+ * -+ * The memory requirements for this algorithm can be determined either by a u64 -+ * population count on the L2_PRESENT mask (a LUT helper already is -+ * required for the above), or simple assumption that there can be no more than -+ * 16 coherent groups, since core groups are typically 4 cores. -+ */ ++ return 0; ++} + -+/** -+ * @addtogroup base_user_api_gpuprops User-side Base GPU Property Query APIs -+ * @{ -+ */ ++MALI_STATIC_INLINE u32 mali_pp_job_get_addr_stack(struct mali_pp_job *job, u32 sub_job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); + -+/** -+ * @addtogroup base_user_api_gpuprops_dyn Dynamic HW Properties -+ * @{ -+ */ ++ if (0 == sub_job) { ++ return job->uargs.frame_registers[MALI200_REG_ADDR_STACK / sizeof(u32)]; ++ } else if (sub_job < _MALI_PP_MAX_SUB_JOBS) { ++ return job->uargs.frame_registers_addr_stack[sub_job - 1]; ++ } + -+#define BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS 3 ++ return 0; ++} + -+#define BASE_MAX_COHERENT_GROUPS 16 ++void mali_pp_job_list_add(struct mali_pp_job *job, _mali_osk_list_t *list); + -+struct mali_base_gpu_core_props { -+ /** -+ * Product specific value. -+ */ -+ u32 product_id; ++MALI_STATIC_INLINE void mali_pp_job_list_addtail(struct mali_pp_job *job, ++ _mali_osk_list_t *list) ++{ ++ _mali_osk_list_addtail(&job->list, list); ++} + -+ /** -+ * Status of the GPU release. -+ * No defined values, but starts at 0 and increases by one for each -+ * release status (alpha, beta, EAC, etc.). -+ * 4 bit values (0-15). -+ */ -+ u16 version_status; ++MALI_STATIC_INLINE void mali_pp_job_list_move(struct mali_pp_job *job, ++ _mali_osk_list_t *list) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(!_mali_osk_list_empty(&job->list)); ++ _mali_osk_list_move(&job->list, list); ++} + -+ /** -+ * Minor release number of the GPU. "P" part of an "RnPn" release number. -+ * 8 bit values (0-255). -+ */ -+ u16 minor_revision; ++MALI_STATIC_INLINE void mali_pp_job_list_remove(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ _mali_osk_list_delinit(&job->list); ++} + -+ /** -+ * Major release number of the GPU. "R" part of an "RnPn" release number. -+ * 4 bit values (0-15). -+ */ -+ u16 major_revision; ++MALI_STATIC_INLINE u32 *mali_pp_job_get_wb0_registers(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.wb0_registers; ++} + -+ u16 padding; ++MALI_STATIC_INLINE u32 *mali_pp_job_get_wb1_registers(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.wb1_registers; ++} + -+ /** -+ * This property is deprecated since it has not contained the real current -+ * value of GPU clock speed. It is kept here only for backwards compatibility. -+ * For the new ioctl interface, it is ignored and is treated as a padding -+ * to keep the structure of the same size and retain the placement of its -+ * members. -+ */ -+ u32 gpu_speed_mhz; ++MALI_STATIC_INLINE u32 *mali_pp_job_get_wb2_registers(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.wb2_registers; ++} + -+ /** -+ * @usecase GPU clock max/min speed is required for computing best/worst case -+ * in tasks as job scheduling ant irq_throttling. (It is not specified in the -+ * Midgard Architecture). -+ * Also, GPU clock max speed is used for OpenCL's clGetDeviceInfo() function. -+ */ -+ u32 gpu_freq_khz_max; -+ u32 gpu_freq_khz_min; ++MALI_STATIC_INLINE u32 mali_pp_job_get_wb0_source_addr(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.wb0_registers[MALI200_REG_ADDR_WB_SOURCE_ADDR / sizeof(u32)]; ++} + -+ /** -+ * Size of the shader program counter, in bits. -+ */ -+ u32 log2_program_counter_size; ++MALI_STATIC_INLINE u32 mali_pp_job_get_wb1_source_addr(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.wb1_registers[MALI200_REG_ADDR_WB_SOURCE_ADDR / sizeof(u32)]; ++} + -+ /** -+ * TEXTURE_FEATURES_x registers, as exposed by the GPU. This is a -+ * bitpattern where a set bit indicates that the format is supported. -+ * -+ * Before using a texture format, it is recommended that the corresponding -+ * bit be checked. -+ */ -+ u32 texture_features[BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS]; ++MALI_STATIC_INLINE u32 mali_pp_job_get_wb2_source_addr(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.wb2_registers[MALI200_REG_ADDR_WB_SOURCE_ADDR / sizeof(u32)]; ++} + -+ /** -+ * Theoretical maximum memory available to the GPU. It is unlikely that a -+ * client will be able to allocate all of this memory for their own -+ * purposes, but this at least provides an upper bound on the memory -+ * available to the GPU. -+ * -+ * This is required for OpenCL's clGetDeviceInfo() call when -+ * CL_DEVICE_GLOBAL_MEM_SIZE is requested, for OpenCL GPU devices. The -+ * client will not be expecting to allocate anywhere near this value. -+ */ -+ u64 gpu_available_memory_size; -+}; ++MALI_STATIC_INLINE void mali_pp_job_disable_wb0(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ job->uargs.wb0_registers[MALI200_REG_ADDR_WB_SOURCE_SELECT] = 0; ++} + -+/** -+ * -+ * More information is possible - but associativity and bus width are not -+ * required by upper-level apis. -+ */ -+struct mali_base_gpu_l2_cache_props { -+ u8 log2_line_size; -+ u8 log2_cache_size; -+ u8 num_l2_slices; /* Number of L2C slices. 1 or higher */ -+ u8 padding[5]; -+}; ++MALI_STATIC_INLINE void mali_pp_job_disable_wb1(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ job->uargs.wb1_registers[MALI200_REG_ADDR_WB_SOURCE_SELECT] = 0; ++} + -+struct mali_base_gpu_tiler_props { -+ u32 bin_size_bytes; /* Max is 4*2^15 */ -+ u32 max_active_levels; /* Max is 2^15 */ -+}; ++MALI_STATIC_INLINE void mali_pp_job_disable_wb2(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ job->uargs.wb2_registers[MALI200_REG_ADDR_WB_SOURCE_SELECT] = 0; ++} + -+/** -+ * GPU threading system details. -+ */ -+struct mali_base_gpu_thread_props { -+ u32 max_threads; /* Max. number of threads per core */ -+ u32 max_workgroup_size; /* Max. number of threads per workgroup */ -+ u32 max_barrier_size; /* Max. number of threads that can synchronize on a simple barrier */ -+ u16 max_registers; /* Total size [1..65535] of the register file available per core. */ -+ u8 max_task_queue; /* Max. tasks [1..255] which may be sent to a core before it becomes blocked. */ -+ u8 max_thread_group_split; /* Max. allowed value [1..15] of the Thread Group Split field. */ -+ u8 impl_tech; /* 0 = Not specified, 1 = Silicon, 2 = FPGA, 3 = SW Model/Emulation */ -+ u8 padding[7]; -+}; ++MALI_STATIC_INLINE mali_bool mali_pp_job_all_writeback_unit_disabled(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); + -+/** -+ * @brief descriptor for a coherent group -+ * -+ * \c core_mask exposes all cores in that coherent group, and \c num_cores -+ * provides a cached population-count for that mask. -+ * -+ * @note Whilst all cores are exposed in the mask, not all may be available to -+ * the application, depending on the Kernel Power policy. -+ * -+ * @note if u64s must be 8-byte aligned, then this structure has 32-bits of wastage. -+ */ -+struct mali_base_gpu_coherent_group { -+ u64 core_mask; /**< Core restriction mask required for the group */ -+ u16 num_cores; /**< Number of cores in the group */ -+ u16 padding[3]; -+}; ++ if (job->uargs.wb0_registers[MALI200_REG_ADDR_WB_SOURCE_SELECT] || ++ job->uargs.wb1_registers[MALI200_REG_ADDR_WB_SOURCE_SELECT] || ++ job->uargs.wb2_registers[MALI200_REG_ADDR_WB_SOURCE_SELECT] ++ ) { ++ /* At least one output unit active */ ++ return MALI_FALSE; ++ } + -+/** -+ * @brief Coherency group information -+ * -+ * Note that the sizes of the members could be reduced. However, the \c group -+ * member might be 8-byte aligned to ensure the u64 core_mask is 8-byte -+ * aligned, thus leading to wastage if the other members sizes were reduced. -+ * -+ * The groups are sorted by core mask. The core masks are non-repeating and do -+ * not intersect. -+ */ -+struct mali_base_gpu_coherent_group_info { -+ u32 num_groups; ++ /* All outputs are disabled - we can abort the job */ ++ return MALI_TRUE; ++} + -+ /** -+ * Number of core groups (coherent or not) in the GPU. Equivalent to the number of L2 Caches. -+ * -+ * The GPU Counter dumping writes 2048 bytes per core group, regardless of -+ * whether the core groups are coherent or not. Hence this member is needed -+ * to calculate how much memory is required for dumping. -+ * -+ * @note Do not use it to work out how many valid elements are in the -+ * group[] member. Use num_groups instead. -+ */ -+ u32 num_core_groups; ++MALI_STATIC_INLINE void mali_pp_job_fb_lookup_add(struct mali_pp_job *job) ++{ ++ u32 fb_lookup_id; + -+ /** -+ * Coherency features of the memory, accessed by @ref gpu_mem_features -+ * methods -+ */ -+ u32 coherency; ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); + -+ u32 padding; ++ fb_lookup_id = MALI_PP_JOB_FB_LOOKUP_LIST_MASK & job->uargs.frame_builder_id; + -+ /** -+ * Descriptors of coherent groups -+ */ -+ struct mali_base_gpu_coherent_group group[BASE_MAX_COHERENT_GROUPS]; -+}; ++ MALI_DEBUG_ASSERT(MALI_PP_JOB_FB_LOOKUP_LIST_SIZE > fb_lookup_id); + -+/** -+ * A complete description of the GPU's Hardware Configuration Discovery -+ * registers. -+ * -+ * The information is presented inefficiently for access. For frequent access, -+ * the values should be better expressed in an unpacked form in the -+ * base_gpu_props structure. -+ * -+ * @usecase The raw properties in @ref gpu_raw_gpu_props are necessary to -+ * allow a user of the Mali Tools (e.g. PAT) to determine "Why is this device -+ * behaving differently?". In this case, all information about the -+ * configuration is potentially useful, but it does not need to be processed -+ * by the driver. Instead, the raw registers can be processed by the Mali -+ * Tools software on the host PC. -+ * -+ */ -+struct gpu_raw_gpu_props { -+ u64 shader_present; -+ u64 tiler_present; -+ u64 l2_present; -+ u64 stack_present; ++ _mali_osk_list_addtail(&job->session_fb_lookup_list, ++ &job->session->pp_job_fb_lookup_list[fb_lookup_id]); ++} + -+ u32 l2_features; -+ u32 suspend_size; /* API 8.2+ */ -+ u32 mem_features; -+ u32 mmu_features; ++MALI_STATIC_INLINE void mali_pp_job_fb_lookup_remove(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ _mali_osk_list_delinit(&job->session_fb_lookup_list); ++} + -+ u32 as_present; ++MALI_STATIC_INLINE struct mali_session_data *mali_pp_job_get_session(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->session; ++} + -+ u32 js_present; -+ u32 js_features[GPU_MAX_JOB_SLOTS]; -+ u32 tiler_features; -+ u32 texture_features[3]; ++MALI_STATIC_INLINE mali_bool mali_pp_job_has_started_sub_jobs(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ return (0 < job->sub_jobs_started) ? MALI_TRUE : MALI_FALSE; ++} + -+ u32 gpu_id; ++MALI_STATIC_INLINE mali_bool mali_pp_job_has_unstarted_sub_jobs(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ return (job->sub_jobs_started < job->sub_jobs_num) ? MALI_TRUE : MALI_FALSE; ++} + -+ u32 thread_max_threads; -+ u32 thread_max_workgroup_size; -+ u32 thread_max_barrier_size; -+ u32 thread_features; ++/* Function used when we are terminating a session with jobs. Return TRUE if it has a rendering job. ++ Makes sure that no new subjobs are started. */ ++MALI_STATIC_INLINE void mali_pp_job_mark_unstarted_failed(struct mali_pp_job *job) ++{ ++ u32 jobs_remaining; ++ u32 i; + -+ /* -+ * Note: This is the _selected_ coherency mode rather than the -+ * available modes as exposed in the coherency_features register. -+ */ -+ u32 coherency_mode; -+}; ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); + -+/** -+ * Return structure for _mali_base_get_gpu_props(). -+ * -+ * NOTE: the raw_props member in this data structure contains the register -+ * values from which the value of the other members are derived. The derived -+ * members exist to allow for efficient access and/or shielding the details -+ * of the layout of the registers. -+ * -+ */ -+typedef struct mali_base_gpu_props { -+ struct mali_base_gpu_core_props core_props; -+ struct mali_base_gpu_l2_cache_props l2_props; -+ u64 unused_1; /* keep for backwards compatibility */ -+ struct mali_base_gpu_tiler_props tiler_props; -+ struct mali_base_gpu_thread_props thread_props; ++ jobs_remaining = job->sub_jobs_num - job->sub_jobs_started; ++ job->sub_jobs_started += jobs_remaining; + -+ /** This member is large, likely to be 128 bytes */ -+ struct gpu_raw_gpu_props raw_props; ++ /* Not the most optimal way, but this is only used in error cases */ ++ for (i = 0; i < jobs_remaining; i++) { ++ _mali_osk_atomic_inc(&job->sub_jobs_completed); ++ _mali_osk_atomic_inc(&job->sub_job_errors); ++ } ++} + -+ /** This must be last member of the structure */ -+ struct mali_base_gpu_coherent_group_info coherency_info; -+} base_gpu_props; ++MALI_STATIC_INLINE mali_bool mali_pp_job_is_complete(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return (job->sub_jobs_num == ++ _mali_osk_atomic_read(&job->sub_jobs_completed)) ? ++ MALI_TRUE : MALI_FALSE; ++} + -+/** @} end group base_user_api_gpuprops_dyn */ ++MALI_STATIC_INLINE u32 mali_pp_job_get_first_unstarted_sub_job(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ return job->sub_jobs_started; ++} + -+/** @} end group base_user_api_gpuprops */ ++MALI_STATIC_INLINE u32 mali_pp_job_get_sub_job_count(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->sub_jobs_num; ++} + -+/** -+ * @addtogroup base_user_api_core User-side Base core APIs -+ * @{ -+ */ ++MALI_STATIC_INLINE u32 mali_pp_job_unstarted_sub_job_count(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(job->sub_jobs_num >= job->sub_jobs_started); ++ return (job->sub_jobs_num - job->sub_jobs_started); ++} + -+/** -+ * \enum base_context_create_flags -+ * -+ * Flags to pass to ::base_context_init. -+ * Flags can be ORed together to enable multiple things. -+ * -+ * These share the same space as BASEP_CONTEXT_FLAG_*, and so must -+ * not collide with them. -+ */ -+enum base_context_create_flags { -+ /** No flags set */ -+ BASE_CONTEXT_CREATE_FLAG_NONE = 0, ++MALI_STATIC_INLINE u32 mali_pp_job_num_memory_cookies(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.num_memory_cookies; ++} + -+ /** Base context is embedded in a cctx object (flag used for CINSTR software counter macros) */ -+ BASE_CONTEXT_CCTX_EMBEDDED = (1u << 0), ++MALI_STATIC_INLINE u32 mali_pp_job_get_memory_cookie( ++ struct mali_pp_job *job, u32 index) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT(index < job->uargs.num_memory_cookies); ++ MALI_DEBUG_ASSERT_POINTER(job->memory_cookies); ++ return job->memory_cookies[index]; ++} + -+ /** Base context is a 'System Monitor' context for Hardware counters. -+ * -+ * One important side effect of this is that job submission is disabled. */ -+ BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED = (1u << 1) -+}; ++MALI_STATIC_INLINE mali_bool mali_pp_job_needs_dma_buf_mapping(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); + -+/** -+ * Bitpattern describing the ::base_context_create_flags that can be passed to base_context_init() -+ */ -+#define BASE_CONTEXT_CREATE_ALLOWED_FLAGS \ -+ (((u32)BASE_CONTEXT_CCTX_EMBEDDED) | \ -+ ((u32)BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED)) ++ if (0 < job->uargs.num_memory_cookies) { ++ return MALI_TRUE; ++ } + -+/** -+ * Bitpattern describing the ::base_context_create_flags that can be passed to the kernel -+ */ -+#define BASE_CONTEXT_CREATE_KERNEL_FLAGS \ -+ ((u32)BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED) ++ return MALI_FALSE; ++} + -+/* -+ * Private flags used on the base context -+ * -+ * These start at bit 31, and run down to zero. -+ * -+ * They share the same space as @ref base_context_create_flags, and so must -+ * not collide with them. -+ */ -+/** Private flag tracking whether job descriptor dumping is disabled */ -+#define BASEP_CONTEXT_FLAG_JOB_DUMP_DISABLED ((u32)(1 << 31)) ++MALI_STATIC_INLINE void mali_pp_job_mark_sub_job_started(struct mali_pp_job *job, u32 sub_job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); + -+/** @} end group base_user_api_core */ ++ /* Assert that we are marking the "first unstarted sub job" as started */ ++ MALI_DEBUG_ASSERT(job->sub_jobs_started == sub_job); + -+/** @} end group base_user_api */ ++ job->sub_jobs_started++; ++} + -+/** -+ * @addtogroup base_plat_config_gpuprops Base Platform Config GPU Properties -+ * @{ -+ * -+ * C Pre-processor macros are exposed here to do with Platform -+ * Config. -+ * -+ * These include: -+ * - GPU Properties that are constant on a particular Midgard Family -+ * Implementation e.g. Maximum samples per pixel on Mali-T600. -+ * - General platform config for the GPU, such as the GPU major and minor -+ * revison. -+ */ ++MALI_STATIC_INLINE void mali_pp_job_mark_sub_job_completed(struct mali_pp_job *job, mali_bool success) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); + -+/** @} end group base_plat_config_gpuprops */ ++ _mali_osk_atomic_inc(&job->sub_jobs_completed); ++ if (MALI_FALSE == success) { ++ _mali_osk_atomic_inc(&job->sub_job_errors); ++ } ++} + -+/** -+ * @addtogroup base_api Base APIs -+ * @{ -+ */ ++MALI_STATIC_INLINE mali_bool mali_pp_job_was_success(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ if (0 == _mali_osk_atomic_read(&job->sub_job_errors)) { ++ return MALI_TRUE; ++ } ++ return MALI_FALSE; ++} + -+/** -+ * @brief The payload for a replay job. This must be in GPU memory. -+ */ -+typedef struct base_jd_replay_payload { -+ /** -+ * Pointer to the first entry in the base_jd_replay_jc list. These -+ * will be replayed in @b reverse order (so that extra ones can be added -+ * to the head in future soft jobs without affecting this soft job) -+ */ -+ u64 tiler_jc_list; ++MALI_STATIC_INLINE mali_bool mali_pp_job_use_no_notification( ++ struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return (job->uargs.flags & _MALI_PP_JOB_FLAG_NO_NOTIFICATION) ? ++ MALI_TRUE : MALI_FALSE; ++} + -+ /** -+ * Pointer to the fragment job chain. ++MALI_STATIC_INLINE mali_bool mali_pp_job_is_pilot_job(struct mali_pp_job *job) ++{ ++ /* ++ * A pilot job is currently identified as jobs which ++ * require no callback notification. + */ -+ u64 fragment_jc; ++ return mali_pp_job_use_no_notification(job); ++} + -+ /** -+ * Pointer to the tiler heap free FBD field to be modified. -+ */ -+ u64 tiler_heap_free; ++MALI_STATIC_INLINE _mali_osk_notification_t * ++mali_pp_job_get_finished_notification(struct mali_pp_job *job) ++{ ++ _mali_osk_notification_t *notification; + -+ /** -+ * Hierarchy mask for the replayed fragment jobs. May be zero. -+ */ -+ u16 fragment_hierarchy_mask; ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_POINTER(job->finished_notification); + -+ /** -+ * Hierarchy mask for the replayed tiler jobs. May be zero. -+ */ -+ u16 tiler_hierarchy_mask; ++ notification = job->finished_notification; ++ job->finished_notification = NULL; + -+ /** -+ * Default weight to be used for hierarchy levels not in the original -+ * mask. -+ */ -+ u32 hierarchy_default_weight; ++ return notification; ++} + -+ /** -+ * Core requirements for the tiler job chain -+ */ -+ base_jd_core_req tiler_core_req; ++MALI_STATIC_INLINE mali_bool mali_pp_job_is_window_surface( ++ struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return (job->uargs.flags & _MALI_PP_JOB_FLAG_IS_WINDOW_SURFACE) ++ ? MALI_TRUE : MALI_FALSE; ++} + -+ /** -+ * Core requirements for the fragment job chain -+ */ -+ base_jd_core_req fragment_core_req; -+} base_jd_replay_payload; ++MALI_STATIC_INLINE mali_bool mali_pp_job_is_protected_job(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return (job->uargs.flags & _MALI_PP_JOB_FLAG_PROTECTED) ++ ? MALI_TRUE : MALI_FALSE; ++} + -+#ifdef BASE_LEGACY_UK10_2_SUPPORT -+typedef struct base_jd_replay_payload_uk10_2 { -+ u64 tiler_jc_list; -+ u64 fragment_jc; -+ u64 tiler_heap_free; -+ u16 fragment_hierarchy_mask; -+ u16 tiler_hierarchy_mask; -+ u32 hierarchy_default_weight; -+ u16 tiler_core_req; -+ u16 fragment_core_req; -+ u8 padding[4]; -+} base_jd_replay_payload_uk10_2; -+#endif /* BASE_LEGACY_UK10_2_SUPPORT */ ++MALI_STATIC_INLINE u32 mali_pp_job_get_perf_counter_flag(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->uargs.perf_counter_flag; ++} + -+/** -+ * @brief An entry in the linked list of job chains to be replayed. This must -+ * be in GPU memory. -+ */ -+typedef struct base_jd_replay_jc { -+ /** -+ * Pointer to next entry in the list. A setting of NULL indicates the -+ * end of the list. -+ */ -+ u64 next; ++MALI_STATIC_INLINE u32 mali_pp_job_get_perf_counter_value0(struct mali_pp_job *job, u32 sub_job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->perf_counter_value0[sub_job]; ++} + -+ /** -+ * Pointer to the job chain. -+ */ -+ u64 jc; ++MALI_STATIC_INLINE u32 mali_pp_job_get_perf_counter_value1(struct mali_pp_job *job, u32 sub_job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return job->perf_counter_value1[sub_job]; ++} + -+} base_jd_replay_jc; ++MALI_STATIC_INLINE void mali_pp_job_set_perf_counter_value0(struct mali_pp_job *job, u32 sub_job, u32 value) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ job->perf_counter_value0[sub_job] = value; ++} + -+/* Maximum number of jobs allowed in a fragment chain in the payload of a -+ * replay job */ -+#define BASE_JD_REPLAY_F_CHAIN_JOB_LIMIT 256 ++MALI_STATIC_INLINE void mali_pp_job_set_perf_counter_value1(struct mali_pp_job *job, u32 sub_job, u32 value) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ job->perf_counter_value1[sub_job] = value; ++} + -+/** @} end group base_api */ ++MALI_STATIC_INLINE _mali_osk_errcode_t mali_pp_job_check(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ if (mali_pp_job_is_virtual(job) && job->sub_jobs_num != 1) { ++ return _MALI_OSK_ERR_FAULT; ++ } ++ return _MALI_OSK_ERR_OK; ++} + -+typedef struct base_profiling_controls { -+ u32 profiling_controls[FBDUMP_CONTROL_MAX]; -+} base_profiling_controls; ++/** ++ * Returns MALI_TRUE if this job has more than two sub jobs and all sub jobs are unstarted. ++ * ++ * @param job Job to check. ++ * @return MALI_TRUE if job has more than two sub jobs and all sub jobs are unstarted, MALI_FALSE if not. ++ */ ++MALI_STATIC_INLINE mali_bool mali_pp_job_is_large_and_unstarted(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ MALI_DEBUG_ASSERT(!mali_pp_job_is_virtual(job)); + -+/* Enable additional tracepoints for latency measurements (TL_ATOM_READY, -+ * TL_ATOM_DONE, TL_ATOM_PRIO_CHANGE, TL_ATOM_EVENT_POST) */ -+#define BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS (1 << 0) ++ return (0 == job->sub_jobs_started && 2 < job->sub_jobs_num); ++} + -+/* Indicate that job dumping is enabled. This could affect certain timers -+ * to account for the performance impact. */ -+#define BASE_TLSTREAM_JOB_DUMPING_ENABLED (1 << 1) ++/** ++ * Get PP job's Timeline tracker. ++ * ++ * @param job PP job. ++ * @return Pointer to Timeline tracker for the job. ++ */ ++MALI_STATIC_INLINE struct mali_timeline_tracker *mali_pp_job_get_tracker(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return &(job->tracker); ++} + -+#define BASE_TLSTREAM_FLAGS_MASK (BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS | \ -+ BASE_TLSTREAM_JOB_DUMPING_ENABLED) ++MALI_STATIC_INLINE u32 *mali_pp_job_get_timeline_point_ptr( ++ struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ return (u32 __user *)(uintptr_t)job->uargs.timeline_point_ptr; ++} + -+#endif /* _BASE_KERNEL_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_base_mem_priv.h b/drivers/gpu/arm/bifrost_for_linux/mali_base_mem_priv.h ++ ++#endif /* __MALI_PP_JOB_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c new file mode 100755 -index 000000000000..4a98a72cc37a +index 000000000..b5e6cfddb --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_base_mem_priv.h -@@ -0,0 +1,52 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c +@@ -0,0 +1,1548 @@ +/* -+ * -+ * (C) COPYRIGHT 2010-2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include "mali_scheduler.h" ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_osk_profiling.h" ++#include "mali_kernel_utilization.h" ++#include "mali_timeline.h" ++#include "mali_gp_job.h" ++#include "mali_pp_job.h" ++#include "mali_executor.h" ++#include "mali_group.h" ++#include ++#include ++#include "mali_pm_metrics.h" + ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++#include "mali_memory_dma_buf.h" ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++#include "mali_dma_fence.h" ++#include ++#endif ++#endif + -+ -+ -+#ifndef _BASE_MEM_PRIV_H_ -+#define _BASE_MEM_PRIV_H_ -+ -+#define BASE_SYNCSET_OP_MSYNC (1U << 0) -+#define BASE_SYNCSET_OP_CSYNC (1U << 1) -+ ++#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) ++#include ++#include ++#endif +/* -+ * This structure describe a basic memory coherency operation. -+ * It can either be: -+ * @li a sync from CPU to Memory: -+ * - type = ::BASE_SYNCSET_OP_MSYNC -+ * - mem_handle = a handle to the memory object on which the operation -+ * is taking place -+ * - user_addr = the address of the range to be synced -+ * - size = the amount of data to be synced, in bytes -+ * - offset is ignored. -+ * @li a sync from Memory to CPU: -+ * - type = ::BASE_SYNCSET_OP_CSYNC -+ * - mem_handle = a handle to the memory object on which the operation -+ * is taking place -+ * - user_addr = the address of the range to be synced -+ * - size = the amount of data to be synced, in bytes. -+ * - offset is ignored. ++ * ---------- static defines/constants ---------- + */ -+struct basep_syncset { -+ base_mem_handle mem_handle; -+ u64 user_addr; -+ u64 size; -+ u8 type; -+ u8 padding[7]; -+}; + ++/* ++ * If dma_buf with map on demand is used, we defer job queue ++ * if in atomic context, since both might sleep. ++ */ ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++#if !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) ++#define MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE 1 +#endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_base_vendor_specific_func.h b/drivers/gpu/arm/bifrost_for_linux/mali_base_vendor_specific_func.h -new file mode 100755 -index 000000000000..be454a216a39 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_base_vendor_specific_func.h -@@ -0,0 +1,24 @@ ++#endif ++ ++ +/* -+ * -+ * (C) COPYRIGHT 2010, 2012-2013, 2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * ---------- global variables (exported due to inline functions) ---------- + */ + ++/* Lock protecting this module */ ++_mali_osk_spinlock_irq_t *mali_scheduler_lock_obj = NULL; + ++/* Queue of jobs to be executed on the GP group */ ++struct mali_scheduler_job_queue job_queue_gp; + ++/* Queue of PP jobs */ ++struct mali_scheduler_job_queue job_queue_pp; + -+#ifndef _BASE_VENDOR_SPEC_FUNC_H_ -+#define _BASE_VENDOR_SPEC_FUNC_H_ ++_mali_osk_atomic_t mali_job_id_autonumber; ++_mali_osk_atomic_t mali_job_cache_order_autonumber; ++/* ++ * ---------- static variables ---------- ++ */ + -+int kbase_get_vendor_specific_cpu_clock_speed(u32 * const); ++_mali_osk_wq_work_t *scheduler_wq_pp_job_delete = NULL; ++_mali_osk_spinlock_irq_t *scheduler_pp_job_delete_lock = NULL; ++static _MALI_OSK_LIST_HEAD_STATIC_INIT(scheduler_pp_job_deletion_queue); ++ ++#if defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) ++static _mali_osk_wq_work_t *scheduler_wq_pp_job_queue = NULL; ++static _mali_osk_spinlock_irq_t *scheduler_pp_job_queue_lock = NULL; ++static _MALI_OSK_LIST_HEAD_STATIC_INIT(scheduler_pp_job_queue_list); ++#endif + -+#endif /*_BASE_VENDOR_SPEC_FUNC_H_*/ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase.h -new file mode 100755 -index 000000000000..1fe936ea6012 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase.h -@@ -0,0 +1,616 @@ +/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * ---------- Forward declaration of static functions ---------- + */ + ++static mali_timeline_point mali_scheduler_submit_gp_job( ++ struct mali_session_data *session, struct mali_gp_job *job); ++static _mali_osk_errcode_t mali_scheduler_submit_pp_job( ++ struct mali_session_data *session, struct mali_pp_job *job, mali_timeline_point *point); + ++static mali_bool mali_scheduler_queue_gp_job(struct mali_gp_job *job); ++static mali_bool mali_scheduler_queue_pp_job(struct mali_pp_job *job); + ++static void mali_scheduler_return_gp_job_to_user(struct mali_gp_job *job, ++ mali_bool success); + ++static void mali_scheduler_deferred_pp_job_delete(struct mali_pp_job *job); ++void mali_scheduler_do_pp_job_delete(void *arg); + -+#ifndef _KBASE_H_ -+#define _KBASE_H_ ++#if defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) ++static void mali_scheduler_deferred_pp_job_queue(struct mali_pp_job *job); ++static void mali_scheduler_do_pp_job_queue(void *arg); ++#endif /* defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) */ + -+#include ++/* ++ * ---------- Actual implementation ---------- ++ */ + -+#include ++_mali_osk_errcode_t mali_scheduler_initialize(void) ++{ ++ _mali_osk_atomic_init(&mali_job_id_autonumber, 0); ++ _mali_osk_atomic_init(&mali_job_cache_order_autonumber, 0); + -+#include ++ _MALI_OSK_INIT_LIST_HEAD(&job_queue_gp.normal_pri); ++ _MALI_OSK_INIT_LIST_HEAD(&job_queue_gp.high_pri); ++ job_queue_gp.depth = 0; ++ job_queue_gp.big_job_num = 0; + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)) -+#include -+#endif -+#include -+#include -+#include -+#include -+#include ++ _MALI_OSK_INIT_LIST_HEAD(&job_queue_pp.normal_pri); ++ _MALI_OSK_INIT_LIST_HEAD(&job_queue_pp.high_pri); ++ job_queue_pp.depth = 0; ++ job_queue_pp.big_job_num = 0; + -+#include "mali_base_kernel.h" -+#include -+#include ++ mali_scheduler_lock_obj = _mali_osk_spinlock_irq_init( ++ _MALI_OSK_LOCKFLAG_ORDERED, ++ _MALI_OSK_LOCK_ORDER_SCHEDULER); ++ if (NULL == mali_scheduler_lock_obj) { ++ mali_scheduler_terminate(); ++ } + -+/* -+ * Include mali_kbase_defs.h first as this provides types needed by other local -+ * header files. -+ */ -+#include "mali_kbase_defs.h" ++ scheduler_wq_pp_job_delete = _mali_osk_wq_create_work( ++ mali_scheduler_do_pp_job_delete, NULL); ++ if (NULL == scheduler_wq_pp_job_delete) { ++ mali_scheduler_terminate(); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+#include "mali_kbase_context.h" -+#include "mali_kbase_strings.h" -+#include "mali_kbase_mem_lowlevel.h" -+#include "mali_kbase_trace_timeline.h" -+#include "mali_kbase_js.h" -+#include "mali_kbase_mem.h" -+#include "mali_kbase_utility.h" -+#include "mali_kbase_gpu_memory_debugfs.h" -+#include "mali_kbase_mem_profile_debugfs.h" -+#include "mali_kbase_debug_job_fault.h" -+#include "mali_kbase_jd_debugfs.h" -+#include "mali_kbase_gpuprops.h" -+#include "mali_kbase_jm.h" -+#include "mali_kbase_vinstr.h" ++ scheduler_pp_job_delete_lock = _mali_osk_spinlock_irq_init( ++ _MALI_OSK_LOCKFLAG_ORDERED, ++ _MALI_OSK_LOCK_ORDER_SCHEDULER_DEFERRED); ++ if (NULL == scheduler_pp_job_delete_lock) { ++ mali_scheduler_terminate(); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+#include "ipa/mali_kbase_ipa.h" ++#if defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) ++ scheduler_wq_pp_job_queue = _mali_osk_wq_create_work( ++ mali_scheduler_do_pp_job_queue, NULL); ++ if (NULL == scheduler_wq_pp_job_queue) { ++ mali_scheduler_terminate(); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+#ifdef CONFIG_GPU_TRACEPOINTS -+#include -+#endif ++ scheduler_pp_job_queue_lock = _mali_osk_spinlock_irq_init( ++ _MALI_OSK_LOCKFLAG_ORDERED, ++ _MALI_OSK_LOCK_ORDER_SCHEDULER_DEFERRED); ++ if (NULL == scheduler_pp_job_queue_lock) { ++ mali_scheduler_terminate(); ++ return _MALI_OSK_ERR_FAULT; ++ } ++#endif /* defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) */ + -+#ifndef u64_to_user_ptr -+/* Introduced in Linux v4.6 */ -+#define u64_to_user_ptr(x) ((void __user *)(uintptr_t)x) -+#endif ++ return _MALI_OSK_ERR_OK; ++} + -+/* -+ * Kernel-side Base (KBase) APIs -+ */ ++void mali_scheduler_terminate(void) ++{ ++#if defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) ++ if (NULL != scheduler_pp_job_queue_lock) { ++ _mali_osk_spinlock_irq_term(scheduler_pp_job_queue_lock); ++ scheduler_pp_job_queue_lock = NULL; ++ } + -+struct kbase_device *kbase_device_alloc(void); -+/* -+* note: configuration attributes member of kbdev needs to have -+* been setup before calling kbase_device_init -+*/ ++ if (NULL != scheduler_wq_pp_job_queue) { ++ _mali_osk_wq_delete_work(scheduler_wq_pp_job_queue); ++ scheduler_wq_pp_job_queue = NULL; ++ } ++#endif /* defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) */ + -+/* -+* API to acquire device list semaphore and return pointer -+* to the device list head -+*/ -+const struct list_head *kbase_dev_list_get(void); -+/* API to release the device list semaphore */ -+void kbase_dev_list_put(const struct list_head *dev_list); ++ if (NULL != scheduler_pp_job_delete_lock) { ++ _mali_osk_spinlock_irq_term(scheduler_pp_job_delete_lock); ++ scheduler_pp_job_delete_lock = NULL; ++ } + -+int kbase_device_init(struct kbase_device * const kbdev); -+void kbase_device_term(struct kbase_device *kbdev); -+void kbase_device_free(struct kbase_device *kbdev); -+int kbase_device_has_feature(struct kbase_device *kbdev, u32 feature); ++ if (NULL != scheduler_wq_pp_job_delete) { ++ _mali_osk_wq_delete_work(scheduler_wq_pp_job_delete); ++ scheduler_wq_pp_job_delete = NULL; ++ } + -+/* Needed for gator integration and for reporting vsync information */ -+struct kbase_device *kbase_find_device(int minor); -+void kbase_release_device(struct kbase_device *kbdev); ++ if (NULL != mali_scheduler_lock_obj) { ++ _mali_osk_spinlock_irq_term(mali_scheduler_lock_obj); ++ mali_scheduler_lock_obj = NULL; ++ } + -+void kbase_set_profiling_control(struct kbase_device *kbdev, u32 control, u32 value); ++ _mali_osk_atomic_term(&mali_job_cache_order_autonumber); ++ _mali_osk_atomic_term(&mali_job_id_autonumber); ++} + -+struct kbase_context * -+kbase_create_context(struct kbase_device *kbdev, bool is_compat); -+void kbase_destroy_context(struct kbase_context *kctx); ++u32 mali_scheduler_job_physical_head_count(mali_bool gpu_mode_is_secure) ++{ ++ /* ++ * Count how many physical sub jobs are present from the head of queue ++ * until the first virtual job is present. ++ * Early out when we have reached maximum number of PP cores (8) ++ */ ++ u32 count = 0; ++ struct mali_pp_job *job; ++ struct mali_pp_job *temp; + -+int kbase_jd_init(struct kbase_context *kctx); -+void kbase_jd_exit(struct kbase_context *kctx); ++ /* Check for partially started normal pri jobs */ ++ if (!_mali_osk_list_empty(&job_queue_pp.normal_pri)) { ++ MALI_DEBUG_ASSERT(0 < job_queue_pp.depth); + -+/** -+ * kbase_jd_submit - Submit atoms to the job dispatcher -+ * -+ * @kctx: The kbase context to submit to -+ * @user_addr: The address in user space of the struct base_jd_atom_v2 array -+ * @nr_atoms: The number of atoms in the array -+ * @stride: sizeof(struct base_jd_atom_v2) -+ * @uk6_atom: true if the atoms are legacy atoms (struct base_jd_atom_v2_uk6) -+ * -+ * Return: 0 on success or error code -+ */ -+int kbase_jd_submit(struct kbase_context *kctx, -+ void __user *user_addr, u32 nr_atoms, u32 stride, -+ bool uk6_atom); ++ job = _MALI_OSK_LIST_ENTRY(job_queue_pp.normal_pri.next, ++ struct mali_pp_job, list); + -+/** -+ * kbase_jd_done_worker - Handle a job completion -+ * @data: a &struct work_struct -+ * -+ * This function requeues the job from the runpool (if it was soft-stopped or -+ * removed from NEXT registers). -+ * -+ * Removes it from the system if it finished/failed/was cancelled. -+ * -+ * Resolves dependencies to add dependent jobs to the context, potentially -+ * starting them if necessary (which may add more references to the context) -+ * -+ * Releases the reference to the context from the no-longer-running job. -+ * -+ * Handles retrying submission outside of IRQ context if it failed from within -+ * IRQ context. -+ */ -+void kbase_jd_done_worker(struct work_struct *data); ++ MALI_DEBUG_ASSERT_POINTER(job); + -+void kbase_jd_done(struct kbase_jd_atom *katom, int slot_nr, ktime_t *end_timestamp, -+ kbasep_js_atom_done_code done_code); -+void kbase_jd_cancel(struct kbase_device *kbdev, struct kbase_jd_atom *katom); -+void kbase_jd_zap_context(struct kbase_context *kctx); -+bool jd_done_nolock(struct kbase_jd_atom *katom, -+ struct list_head *completed_jobs_ctx); -+void kbase_jd_free_external_resources(struct kbase_jd_atom *katom); -+bool jd_submit_atom(struct kbase_context *kctx, -+ const struct base_jd_atom_v2 *user_atom, -+ struct kbase_jd_atom *katom); -+void kbase_jd_dep_clear_locked(struct kbase_jd_atom *katom); ++ if (MALI_TRUE == mali_pp_job_has_started_sub_jobs(job)) { ++ /* ++ * Remember; virtual jobs can't be queued and started ++ * at the same time, so this must be a physical job ++ */ ++ if ((MALI_FALSE == gpu_mode_is_secure && MALI_FALSE == mali_pp_job_is_protected_job(job)) ++ || (MALI_TRUE == gpu_mode_is_secure && MALI_TRUE == mali_pp_job_is_protected_job(job))) { + -+void kbase_job_done(struct kbase_device *kbdev, u32 done); ++ count += mali_pp_job_unstarted_sub_job_count(job); ++ if (MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS <= count) { ++ return MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS; ++ } ++ } ++ } ++ } + -+/** -+ * kbase_job_slot_ctx_priority_check_locked(): - Check for lower priority atoms -+ * and soft stop them -+ * @kctx: Pointer to context to check. -+ * @katom: Pointer to priority atom. -+ * -+ * Atoms from @kctx on the same job slot as @katom, which have lower priority -+ * than @katom will be soft stopped and put back in the queue, so that atoms -+ * with higher priority can run. -+ * -+ * The hwaccess_lock must be held when calling this function. -+ */ -+void kbase_job_slot_ctx_priority_check_locked(struct kbase_context *kctx, -+ struct kbase_jd_atom *katom); ++ _MALI_OSK_LIST_FOREACHENTRY(job, temp, &job_queue_pp.high_pri, ++ struct mali_pp_job, list) { ++ if ((MALI_FALSE == mali_pp_job_is_virtual(job)) ++ && ((MALI_FALSE == gpu_mode_is_secure && MALI_FALSE == mali_pp_job_is_protected_job(job)) ++ || (MALI_TRUE == gpu_mode_is_secure && MALI_TRUE == mali_pp_job_is_protected_job(job)))) { + -+void kbase_job_slot_softstop(struct kbase_device *kbdev, int js, -+ struct kbase_jd_atom *target_katom); -+void kbase_job_slot_softstop_swflags(struct kbase_device *kbdev, int js, -+ struct kbase_jd_atom *target_katom, u32 sw_flags); -+void kbase_job_slot_hardstop(struct kbase_context *kctx, int js, -+ struct kbase_jd_atom *target_katom); -+void kbase_job_check_enter_disjoint(struct kbase_device *kbdev, u32 action, -+ base_jd_core_req core_reqs, struct kbase_jd_atom *target_katom); -+void kbase_job_check_leave_disjoint(struct kbase_device *kbdev, -+ struct kbase_jd_atom *target_katom); ++ count += mali_pp_job_unstarted_sub_job_count(job); ++ if (MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS <= count) { ++ return MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS; ++ } ++ } else { ++ /* Came across a virtual job, so stop counting */ ++ return count; ++ } ++ } + -+void kbase_event_post(struct kbase_context *ctx, struct kbase_jd_atom *event); -+int kbase_event_dequeue(struct kbase_context *ctx, struct base_jd_event_v2 *uevent); -+int kbase_event_pending(struct kbase_context *ctx); -+int kbase_event_init(struct kbase_context *kctx); -+void kbase_event_close(struct kbase_context *kctx); -+void kbase_event_cleanup(struct kbase_context *kctx); -+void kbase_event_wakeup(struct kbase_context *kctx); ++ _MALI_OSK_LIST_FOREACHENTRY(job, temp, &job_queue_pp.normal_pri, ++ struct mali_pp_job, list) { ++ if ((MALI_FALSE == mali_pp_job_is_virtual(job)) ++ && (MALI_FALSE == mali_pp_job_has_started_sub_jobs(job)) ++ && ((MALI_FALSE == gpu_mode_is_secure && MALI_FALSE == mali_pp_job_is_protected_job(job)) ++ || (MALI_TRUE == gpu_mode_is_secure && MALI_TRUE == mali_pp_job_is_protected_job(job)))) { + -+int kbase_process_soft_job(struct kbase_jd_atom *katom); -+int kbase_prepare_soft_job(struct kbase_jd_atom *katom); -+void kbase_finish_soft_job(struct kbase_jd_atom *katom); -+void kbase_cancel_soft_job(struct kbase_jd_atom *katom); -+void kbase_resume_suspended_soft_jobs(struct kbase_device *kbdev); -+void kbasep_remove_waiting_soft_job(struct kbase_jd_atom *katom); -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+void kbase_soft_event_wait_callback(struct kbase_jd_atom *katom); -+#endif -+int kbase_soft_event_update(struct kbase_context *kctx, -+ u64 event, -+ unsigned char new_status); ++ count += mali_pp_job_unstarted_sub_job_count(job); ++ if (MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS <= count) { ++ return MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS; ++ } ++ } else { ++ /* Came across a virtual job, so stop counting */ ++ return count; ++ } ++ } ++ return count; ++} + -+bool kbase_replay_process(struct kbase_jd_atom *katom); ++struct mali_pp_job *mali_scheduler_job_pp_next(void) ++{ ++ struct mali_pp_job *job; ++ struct mali_pp_job *temp; + -+void kbasep_soft_job_timeout_worker(struct timer_list *t); -+void kbasep_complete_triggered_soft_events(struct kbase_context *kctx, u64 evt); ++ MALI_DEBUG_ASSERT_LOCK_HELD(mali_scheduler_lock_obj); + -+/* api used internally for register access. Contains validation and tracing */ -+void kbase_device_trace_register_access(struct kbase_context *kctx, enum kbase_reg_access_type type, u16 reg_offset, u32 reg_value); -+int kbase_device_trace_buffer_install( -+ struct kbase_context *kctx, u32 *tb, size_t size); -+void kbase_device_trace_buffer_uninstall(struct kbase_context *kctx); ++ /* Check for partially started normal pri jobs */ ++ if (!_mali_osk_list_empty(&job_queue_pp.normal_pri)) { ++ MALI_DEBUG_ASSERT(0 < job_queue_pp.depth); + -+/* api to be ported per OS, only need to do the raw register access */ -+void kbase_os_reg_write(struct kbase_device *kbdev, u16 offset, u32 value); -+u32 kbase_os_reg_read(struct kbase_device *kbdev, u16 offset); ++ job = _MALI_OSK_LIST_ENTRY(job_queue_pp.normal_pri.next, ++ struct mali_pp_job, list); + -+void kbasep_as_do_poke(struct work_struct *work); ++ MALI_DEBUG_ASSERT_POINTER(job); + -+/** Returns the name associated with a Mali exception code -+ * -+ * This function is called from the interrupt handler when a GPU fault occurs. -+ * It reports the details of the fault using KBASE_DEBUG_PRINT_WARN. -+ * -+ * @param[in] kbdev The kbase device that the GPU fault occurred from. -+ * @param[in] exception_code exception code -+ * @return name associated with the exception code -+ */ -+const char *kbase_exception_name(struct kbase_device *kbdev, -+ u32 exception_code); ++ if (MALI_TRUE == mali_pp_job_has_started_sub_jobs(job)) { ++ return job; ++ } ++ } + -+/** -+ * Check whether a system suspend is in progress, or has already been suspended -+ * -+ * The caller should ensure that either kbdev->pm.active_count_lock is held, or -+ * a dmb was executed recently (to ensure the value is most -+ * up-to-date). However, without a lock the value could change afterwards. -+ * -+ * @return false if a suspend is not in progress -+ * @return !=false otherwise -+ */ -+static inline bool kbase_pm_is_suspending(struct kbase_device *kbdev) -+{ -+ return kbdev->pm.suspending; ++ _MALI_OSK_LIST_FOREACHENTRY(job, temp, &job_queue_pp.high_pri, ++ struct mali_pp_job, list) { ++ return job; ++ } ++ ++ _MALI_OSK_LIST_FOREACHENTRY(job, temp, &job_queue_pp.normal_pri, ++ struct mali_pp_job, list) { ++ return job; ++ } ++ ++ return NULL; +} + -+/** -+ * Return the atom's ID, as was originally supplied by userspace in -+ * base_jd_atom_v2::atom_number -+ */ -+static inline int kbase_jd_atom_id(struct kbase_context *kctx, struct kbase_jd_atom *katom) ++mali_bool mali_scheduler_job_next_is_virtual(void) +{ -+ int result; ++ struct mali_pp_job *job; + -+ KBASE_DEBUG_ASSERT(kctx); -+ KBASE_DEBUG_ASSERT(katom); -+ KBASE_DEBUG_ASSERT(katom->kctx == kctx); ++ job = mali_scheduler_job_pp_virtual_peek(); ++ if (NULL != job) { ++ MALI_DEBUG_ASSERT(mali_pp_job_is_virtual(job)); + -+ result = katom - &kctx->jctx.atoms[0]; -+ KBASE_DEBUG_ASSERT(result >= 0 && result <= BASE_JD_ATOM_COUNT); -+ return result; ++ return MALI_TRUE; ++ } ++ ++ return MALI_FALSE; +} + -+/** -+ * kbase_jd_atom_from_id - Return the atom structure for the given atom ID -+ * @kctx: Context pointer -+ * @id: ID of atom to retrieve -+ * -+ * Return: Pointer to struct kbase_jd_atom associated with the supplied ID -+ */ -+static inline struct kbase_jd_atom *kbase_jd_atom_from_id( -+ struct kbase_context *kctx, int id) ++struct mali_gp_job *mali_scheduler_job_gp_get(void) +{ -+ return &kctx->jctx.atoms[id]; -+} ++ _mali_osk_list_t *queue; ++ struct mali_gp_job *job = NULL; + -+/** -+ * Initialize the disjoint state -+ * -+ * The disjoint event count and state are both set to zero. -+ * -+ * Disjoint functions usage: -+ * -+ * The disjoint event count should be incremented whenever a disjoint event occurs. -+ * -+ * There are several cases which are regarded as disjoint behavior. Rather than just increment -+ * the counter during disjoint events we also increment the counter when jobs may be affected -+ * by what the GPU is currently doing. To facilitate this we have the concept of disjoint state. -+ * -+ * Disjoint state is entered during GPU reset and for the entire time that an atom is replaying -+ * (as part of the replay workaround). Increasing the disjoint state also increases the count of -+ * disjoint events. -+ * -+ * The disjoint state is then used to increase the count of disjoint events during job submission -+ * and job completion. Any atom submitted or completed while the disjoint state is greater than -+ * zero is regarded as a disjoint event. -+ * -+ * The disjoint event counter is also incremented immediately whenever a job is soft stopped -+ * and during context creation. -+ * -+ * @param kbdev The kbase device -+ */ -+void kbase_disjoint_init(struct kbase_device *kbdev); ++ MALI_DEBUG_ASSERT_LOCK_HELD(mali_scheduler_lock_obj); ++ MALI_DEBUG_ASSERT(0 < job_queue_gp.depth); ++ MALI_DEBUG_ASSERT(job_queue_gp.big_job_num <= job_queue_gp.depth); + -+/** -+ * Increase the count of disjoint events -+ * called when a disjoint event has happened -+ * -+ * @param kbdev The kbase device -+ */ -+void kbase_disjoint_event(struct kbase_device *kbdev); ++ if (!_mali_osk_list_empty(&job_queue_gp.high_pri)) { ++ queue = &job_queue_gp.high_pri; ++ } else { ++ queue = &job_queue_gp.normal_pri; ++ MALI_DEBUG_ASSERT(!_mali_osk_list_empty(queue)); ++ } + -+/** -+ * Increase the count of disjoint events only if the GPU is in a disjoint state -+ * -+ * This should be called when something happens which could be disjoint if the GPU -+ * is in a disjoint state. The state refcount keeps track of this. -+ * -+ * @param kbdev The kbase device -+ */ -+void kbase_disjoint_event_potential(struct kbase_device *kbdev); ++ job = _MALI_OSK_LIST_ENTRY(queue->next, struct mali_gp_job, list); + -+/** -+ * Returns the count of disjoint events -+ * -+ * @param kbdev The kbase device -+ * @return the count of disjoint events -+ */ -+u32 kbase_disjoint_event_get(struct kbase_device *kbdev); ++ MALI_DEBUG_ASSERT_POINTER(job); + -+/** -+ * Increment the refcount state indicating that the GPU is in a disjoint state. -+ * -+ * Also Increment the disjoint event count (calls @ref kbase_disjoint_event) -+ * eventually after the disjoint state has completed @ref kbase_disjoint_state_down -+ * should be called -+ * -+ * @param kbdev The kbase device -+ */ -+void kbase_disjoint_state_up(struct kbase_device *kbdev); ++ mali_gp_job_list_remove(job); ++ job_queue_gp.depth--; ++ if (job->big_job) { ++ job_queue_gp.big_job_num --; ++ if (job_queue_gp.big_job_num < MALI_MAX_PENDING_BIG_JOB) { ++ /* wake up process */ ++ wait_queue_head_t *queue = mali_session_get_wait_queue(); ++ wake_up(queue); ++ } ++ } ++ return job; ++} + -+/** -+ * Decrement the refcount state -+ * -+ * Also Increment the disjoint event count (calls @ref kbase_disjoint_event) -+ * -+ * Called after @ref kbase_disjoint_state_up once the disjoint state is over -+ * -+ * @param kbdev The kbase device -+ */ -+void kbase_disjoint_state_down(struct kbase_device *kbdev); ++struct mali_pp_job *mali_scheduler_job_pp_physical_peek(void) ++{ ++ struct mali_pp_job *job = NULL; ++ struct mali_pp_job *tmp_job = NULL; + -+/** -+ * If a job is soft stopped and the number of contexts is >= this value -+ * it is reported as a disjoint event -+ */ -+#define KBASE_DISJOINT_STATE_INTERLEAVED_CONTEXT_COUNT_THRESHOLD 2 ++ MALI_DEBUG_ASSERT_LOCK_HELD(mali_scheduler_lock_obj); + -+#if !defined(UINT64_MAX) -+ #define UINT64_MAX ((uint64_t)0xFFFFFFFFFFFFFFFFULL) -+#endif ++ /* ++ * For PP jobs we favour partially started jobs in normal ++ * priority queue over unstarted jobs in high priority queue ++ */ + -+#if KBASE_TRACE_ENABLE -+void kbasep_trace_debugfs_init(struct kbase_device *kbdev); ++ if (!_mali_osk_list_empty(&job_queue_pp.normal_pri)) { ++ MALI_DEBUG_ASSERT(0 < job_queue_pp.depth); + -+#ifndef CONFIG_MALI_BIFROST_SYSTEM_TRACE -+/** Add trace values about a job-slot -+ * -+ * @note Any functions called through this macro will still be evaluated in -+ * Release builds (CONFIG_MALI_BIFROST_DEBUG not defined). Therefore, when KBASE_TRACE_ENABLE == 0 any -+ * functions called to get the parameters supplied to this macro must: -+ * - be static or static inline -+ * - must just return 0 and have no other statements present in the body. -+ */ -+#define KBASE_TRACE_ADD_SLOT(kbdev, code, ctx, katom, gpu_addr, jobslot) \ -+ kbasep_trace_add(kbdev, KBASE_TRACE_CODE(code), ctx, katom, gpu_addr, \ -+ KBASE_TRACE_FLAG_JOBSLOT, 0, jobslot, 0) ++ tmp_job = _MALI_OSK_LIST_ENTRY(job_queue_pp.normal_pri.next, ++ struct mali_pp_job, list); ++ MALI_DEBUG_ASSERT(NULL != tmp_job); + -+/** Add trace values about a job-slot, with info -+ * -+ * @note Any functions called through this macro will still be evaluated in -+ * Release builds (CONFIG_MALI_BIFROST_DEBUG not defined). Therefore, when KBASE_TRACE_ENABLE == 0 any -+ * functions called to get the parameters supplied to this macro must: -+ * - be static or static inline -+ * - must just return 0 and have no other statements present in the body. -+ */ -+#define KBASE_TRACE_ADD_SLOT_INFO(kbdev, code, ctx, katom, gpu_addr, jobslot, info_val) \ -+ kbasep_trace_add(kbdev, KBASE_TRACE_CODE(code), ctx, katom, gpu_addr, \ -+ KBASE_TRACE_FLAG_JOBSLOT, 0, jobslot, info_val) ++ if (MALI_FALSE == mali_pp_job_is_virtual(tmp_job)) { ++ job = tmp_job; ++ } ++ } + -+/** Add trace values about a ctx refcount -+ * -+ * @note Any functions called through this macro will still be evaluated in -+ * Release builds (CONFIG_MALI_BIFROST_DEBUG not defined). Therefore, when KBASE_TRACE_ENABLE == 0 any -+ * functions called to get the parameters supplied to this macro must: -+ * - be static or static inline -+ * - must just return 0 and have no other statements present in the body. -+ */ -+#define KBASE_TRACE_ADD_REFCOUNT(kbdev, code, ctx, katom, gpu_addr, refcount) \ -+ kbasep_trace_add(kbdev, KBASE_TRACE_CODE(code), ctx, katom, gpu_addr, \ -+ KBASE_TRACE_FLAG_REFCOUNT, refcount, 0, 0) -+/** Add trace values about a ctx refcount, and info -+ * -+ * @note Any functions called through this macro will still be evaluated in -+ * Release builds (CONFIG_MALI_BIFROST_DEBUG not defined). Therefore, when KBASE_TRACE_ENABLE == 0 any -+ * functions called to get the parameters supplied to this macro must: -+ * - be static or static inline -+ * - must just return 0 and have no other statements present in the body. -+ */ -+#define KBASE_TRACE_ADD_REFCOUNT_INFO(kbdev, code, ctx, katom, gpu_addr, refcount, info_val) \ -+ kbasep_trace_add(kbdev, KBASE_TRACE_CODE(code), ctx, katom, gpu_addr, \ -+ KBASE_TRACE_FLAG_REFCOUNT, refcount, 0, info_val) ++ if (NULL == job || ++ MALI_FALSE == mali_pp_job_has_started_sub_jobs(job)) { ++ /* ++ * There isn't a partially started job in normal queue, so ++ * look in high priority queue. ++ */ ++ if (!_mali_osk_list_empty(&job_queue_pp.high_pri)) { ++ MALI_DEBUG_ASSERT(0 < job_queue_pp.depth); + -+/** Add trace values (no slot or refcount) -+ * -+ * @note Any functions called through this macro will still be evaluated in -+ * Release builds (CONFIG_MALI_BIFROST_DEBUG not defined). Therefore, when KBASE_TRACE_ENABLE == 0 any -+ * functions called to get the parameters supplied to this macro must: -+ * - be static or static inline -+ * - must just return 0 and have no other statements present in the body. -+ */ -+#define KBASE_TRACE_ADD(kbdev, code, ctx, katom, gpu_addr, info_val) \ -+ kbasep_trace_add(kbdev, KBASE_TRACE_CODE(code), ctx, katom, gpu_addr, \ -+ 0, 0, 0, info_val) ++ tmp_job = _MALI_OSK_LIST_ENTRY(job_queue_pp.high_pri.next, ++ struct mali_pp_job, list); ++ MALI_DEBUG_ASSERT(NULL != tmp_job); + -+/** Clear the trace */ -+#define KBASE_TRACE_CLEAR(kbdev) \ -+ kbasep_trace_clear(kbdev) ++ if (MALI_FALSE == mali_pp_job_is_virtual(tmp_job)) { ++ job = tmp_job; ++ } ++ } ++ } + -+/** Dump the slot trace */ -+#define KBASE_TRACE_DUMP(kbdev) \ -+ kbasep_trace_dump(kbdev) ++ return job; ++} + -+/** PRIVATE - do not use directly. Use KBASE_TRACE_ADD() instead */ -+void kbasep_trace_add(struct kbase_device *kbdev, enum kbase_trace_code code, void *ctx, struct kbase_jd_atom *katom, u64 gpu_addr, u8 flags, int refcount, int jobslot, unsigned long info_val); -+/** PRIVATE - do not use directly. Use KBASE_TRACE_CLEAR() instead */ -+void kbasep_trace_clear(struct kbase_device *kbdev); -+#else /* #ifndef CONFIG_MALI_BIFROST_SYSTEM_TRACE */ -+/* Dispatch kbase trace events as system trace events */ -+#include -+#define KBASE_TRACE_ADD_SLOT(kbdev, code, ctx, katom, gpu_addr, jobslot)\ -+ trace_mali_##code(jobslot, 0) ++struct mali_pp_job *mali_scheduler_job_pp_virtual_peek(void) ++{ ++ struct mali_pp_job *job = NULL; ++ struct mali_pp_job *tmp_job = NULL; + -+#define KBASE_TRACE_ADD_SLOT_INFO(kbdev, code, ctx, katom, gpu_addr, jobslot, info_val)\ -+ trace_mali_##code(jobslot, info_val) ++ MALI_DEBUG_ASSERT_LOCK_HELD(mali_scheduler_lock_obj); + -+#define KBASE_TRACE_ADD_REFCOUNT(kbdev, code, ctx, katom, gpu_addr, refcount)\ -+ trace_mali_##code(refcount, 0) ++ if (!_mali_osk_list_empty(&job_queue_pp.high_pri)) { ++ MALI_DEBUG_ASSERT(0 < job_queue_pp.depth); + -+#define KBASE_TRACE_ADD_REFCOUNT_INFO(kbdev, code, ctx, katom, gpu_addr, refcount, info_val)\ -+ trace_mali_##code(refcount, info_val) ++ tmp_job = _MALI_OSK_LIST_ENTRY(job_queue_pp.high_pri.next, ++ struct mali_pp_job, list); + -+#define KBASE_TRACE_ADD(kbdev, code, ctx, katom, gpu_addr, info_val)\ -+ trace_mali_##code(gpu_addr, info_val) ++ if (MALI_TRUE == mali_pp_job_is_virtual(tmp_job)) { ++ job = tmp_job; ++ } ++ } + -+#define KBASE_TRACE_CLEAR(kbdev)\ -+ do {\ -+ CSTD_UNUSED(kbdev);\ -+ CSTD_NOP(0);\ -+ } while (0) -+#define KBASE_TRACE_DUMP(kbdev)\ -+ do {\ -+ CSTD_UNUSED(kbdev);\ -+ CSTD_NOP(0);\ -+ } while (0) ++ if (NULL == job) { ++ if (!_mali_osk_list_empty(&job_queue_pp.normal_pri)) { ++ MALI_DEBUG_ASSERT(0 < job_queue_pp.depth); + -+#endif /* #ifndef CONFIG_MALI_BIFROST_SYSTEM_TRACE */ -+#else -+#define KBASE_TRACE_ADD_SLOT(kbdev, code, ctx, katom, gpu_addr, jobslot)\ -+ do {\ -+ CSTD_UNUSED(kbdev);\ -+ CSTD_NOP(code);\ -+ CSTD_UNUSED(ctx);\ -+ CSTD_UNUSED(katom);\ -+ CSTD_UNUSED(gpu_addr);\ -+ CSTD_UNUSED(jobslot);\ -+ } while (0) ++ tmp_job = _MALI_OSK_LIST_ENTRY(job_queue_pp.normal_pri.next, ++ struct mali_pp_job, list); + -+#define KBASE_TRACE_ADD_SLOT_INFO(kbdev, code, ctx, katom, gpu_addr, jobslot, info_val)\ -+ do {\ -+ CSTD_UNUSED(kbdev);\ -+ CSTD_NOP(code);\ -+ CSTD_UNUSED(ctx);\ -+ CSTD_UNUSED(katom);\ -+ CSTD_UNUSED(gpu_addr);\ -+ CSTD_UNUSED(jobslot);\ -+ CSTD_UNUSED(info_val);\ -+ CSTD_NOP(0);\ -+ } while (0) ++ if (MALI_TRUE == mali_pp_job_is_virtual(tmp_job)) { ++ job = tmp_job; ++ } ++ } ++ } + -+#define KBASE_TRACE_ADD_REFCOUNT(kbdev, code, ctx, katom, gpu_addr, refcount)\ -+ do {\ -+ CSTD_UNUSED(kbdev);\ -+ CSTD_NOP(code);\ -+ CSTD_UNUSED(ctx);\ -+ CSTD_UNUSED(katom);\ -+ CSTD_UNUSED(gpu_addr);\ -+ CSTD_UNUSED(refcount);\ -+ CSTD_NOP(0);\ -+ } while (0) ++ return job; ++} + -+#define KBASE_TRACE_ADD_REFCOUNT_INFO(kbdev, code, ctx, katom, gpu_addr, refcount, info_val)\ -+ do {\ -+ CSTD_UNUSED(kbdev);\ -+ CSTD_NOP(code);\ -+ CSTD_UNUSED(ctx);\ -+ CSTD_UNUSED(katom);\ -+ CSTD_UNUSED(gpu_addr);\ -+ CSTD_UNUSED(info_val);\ -+ CSTD_NOP(0);\ -+ } while (0) ++struct mali_pp_job *mali_scheduler_job_pp_physical_get(u32 *sub_job) ++{ ++ struct mali_pp_job *job = mali_scheduler_job_pp_physical_peek(); + -+#define KBASE_TRACE_ADD(kbdev, code, subcode, ctx, katom, val)\ -+ do {\ -+ CSTD_UNUSED(kbdev);\ -+ CSTD_NOP(code);\ -+ CSTD_UNUSED(subcode);\ -+ CSTD_UNUSED(ctx);\ -+ CSTD_UNUSED(katom);\ -+ CSTD_UNUSED(val);\ -+ CSTD_NOP(0);\ -+ } while (0) ++ MALI_DEBUG_ASSERT(MALI_FALSE == mali_pp_job_is_virtual(job)); + -+#define KBASE_TRACE_CLEAR(kbdev)\ -+ do {\ -+ CSTD_UNUSED(kbdev);\ -+ CSTD_NOP(0);\ -+ } while (0) -+#define KBASE_TRACE_DUMP(kbdev)\ -+ do {\ -+ CSTD_UNUSED(kbdev);\ -+ CSTD_NOP(0);\ -+ } while (0) -+#endif /* KBASE_TRACE_ENABLE */ -+/** PRIVATE - do not use directly. Use KBASE_TRACE_DUMP() instead */ -+void kbasep_trace_dump(struct kbase_device *kbdev); ++ if (NULL != job) { ++ *sub_job = mali_pp_job_get_first_unstarted_sub_job(job); + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+/** -+ * kbase_set_driver_inactive - Force driver to go inactive -+ * @kbdev: Device pointer -+ * @inactive: true if driver should go inactive, false otherwise -+ * -+ * Forcing the driver inactive will cause all future IOCTLs to wait until the -+ * driver is made active again. This is intended solely for the use of tests -+ * which require that no jobs are running while the test executes. -+ */ -+void kbase_set_driver_inactive(struct kbase_device *kbdev, bool inactive); -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++ mali_pp_job_mark_sub_job_started(job, *sub_job); ++ if (MALI_FALSE == mali_pp_job_has_unstarted_sub_jobs(job)) { ++ /* Remove from queue when last sub job has been retrieved */ ++ mali_pp_job_list_remove(job); ++ } + ++ job_queue_pp.depth--; + -+#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_BIFROST_NO_MALI) ++ /* ++ * Job about to start so it is no longer be ++ * possible to discard WB ++ */ ++ mali_pp_job_fb_lookup_remove(job); ++ } + -+/* kbase_io_history_init - initialize data struct for register access history -+ * -+ * @kbdev The register history to initialize -+ * @n The number of register accesses that the buffer could hold -+ * -+ * @return 0 if successfully initialized, failure otherwise -+ */ -+int kbase_io_history_init(struct kbase_io_history *h, u16 n); ++ return job; ++} + -+/* kbase_io_history_term - uninit all resources for the register access history -+ * -+ * @h The register history to terminate -+ */ -+void kbase_io_history_term(struct kbase_io_history *h); ++struct mali_pp_job *mali_scheduler_job_pp_virtual_get(void) ++{ ++ struct mali_pp_job *job = mali_scheduler_job_pp_virtual_peek(); + -+/* kbase_io_history_dump - print the register history to the kernel ring buffer -+ * -+ * @kbdev Pointer to kbase_device containing the register history to dump -+ */ -+void kbase_io_history_dump(struct kbase_device *kbdev); ++ MALI_DEBUG_ASSERT(MALI_TRUE == mali_pp_job_is_virtual(job)); + -+/** -+ * kbase_io_history_resize - resize the register access history buffer. -+ * -+ * @h: Pointer to a valid register history to resize -+ * @new_size: Number of accesses the buffer could hold -+ * -+ * A successful resize will clear all recent register accesses. -+ * If resizing fails for any reason (e.g., could not allocate memory, invalid -+ * buffer size) then the original buffer will be kept intact. -+ * -+ * @return 0 if the buffer was resized, failure otherwise -+ */ -+int kbase_io_history_resize(struct kbase_io_history *h, u16 new_size); ++ if (NULL != job) { ++ MALI_DEBUG_ASSERT(0 == ++ mali_pp_job_get_first_unstarted_sub_job(job)); ++ MALI_DEBUG_ASSERT(1 == ++ mali_pp_job_get_sub_job_count(job)); + -+#else /* CONFIG_DEBUG_FS */ ++ mali_pp_job_mark_sub_job_started(job, 0); + -+#define kbase_io_history_init(...) ((int)0) ++ mali_pp_job_list_remove(job); + -+#define kbase_io_history_term CSTD_NOP ++ job_queue_pp.depth--; + -+#define kbase_io_history_dump CSTD_NOP ++ /* ++ * Job about to start so it is no longer be ++ * possible to discard WB ++ */ ++ mali_pp_job_fb_lookup_remove(job); ++ } + -+#define kbase_io_history_resize CSTD_NOP ++ return job; ++} + -+#endif /* CONFIG_DEBUG_FS */ ++mali_scheduler_mask mali_scheduler_activate_gp_job(struct mali_gp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); + ++ MALI_DEBUG_PRINT(4, ("Mali GP scheduler: Timeline activation for job %u (0x%08X).\n", ++ mali_gp_job_get_id(job), job)); + -+#endif ++ mali_scheduler_lock(); + ++ if (!mali_scheduler_queue_gp_job(job)) { ++ /* Failed to enqueue job, release job (with error) */ + ++ mali_scheduler_unlock(); + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_10969_workaround.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_10969_workaround.c -new file mode 100755 -index 000000000000..6b3559d93351 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_10969_workaround.c -@@ -0,0 +1,210 @@ -+/* -+ * -+ * (C) COPYRIGHT 2013-2015,2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ mali_timeline_tracker_release(mali_gp_job_get_tracker(job)); ++ mali_gp_job_signal_pp_tracker(job, MALI_FALSE); + ++ /* This will notify user space and close the job object */ ++ mali_scheduler_complete_gp_job(job, MALI_FALSE, ++ MALI_TRUE, MALI_FALSE); + -+#include -+#include -+#include ++ return MALI_SCHEDULER_MASK_EMPTY; ++ } + -+/* This function is used to solve an HW issue with single iterator GPUs. -+ * If a fragment job is soft-stopped on the edge of its bounding box, can happen that the -+ * restart index is out of bounds and the rerun causes a tile range fault. If this happens -+ * we try to clamp the restart index to a correct value and rerun the job. -+ */ -+/* Mask of X and Y coordinates for the coordinates words in the descriptors*/ -+#define X_COORDINATE_MASK 0x00000FFF -+#define Y_COORDINATE_MASK 0x0FFF0000 -+/* Max number of words needed from the fragment shader job descriptor */ -+#define JOB_HEADER_SIZE_IN_WORDS 10 -+#define JOB_HEADER_SIZE (JOB_HEADER_SIZE_IN_WORDS*sizeof(u32)) ++ mali_scheduler_unlock(); + -+/* Word 0: Status Word */ -+#define JOB_DESC_STATUS_WORD 0 -+/* Word 1: Restart Index */ -+#define JOB_DESC_RESTART_INDEX_WORD 1 -+/* Word 2: Fault address low word */ -+#define JOB_DESC_FAULT_ADDR_LOW_WORD 2 -+/* Word 8: Minimum Tile Coordinates */ -+#define FRAG_JOB_DESC_MIN_TILE_COORD_WORD 8 -+/* Word 9: Maximum Tile Coordinates */ -+#define FRAG_JOB_DESC_MAX_TILE_COORD_WORD 9 ++ return MALI_SCHEDULER_MASK_GP; ++} + -+int kbasep_10969_workaround_clamp_coordinates(struct kbase_jd_atom *katom) ++mali_scheduler_mask mali_scheduler_activate_pp_job(struct mali_pp_job *job) +{ -+ struct device *dev = katom->kctx->kbdev->dev; -+ u32 clamped = 0; -+ struct kbase_va_region *region; -+ struct tagged_addr *page_array; -+ u64 page_index; -+ u32 offset = katom->jc & (~PAGE_MASK); -+ u32 *page_1 = NULL; -+ u32 *page_2 = NULL; -+ u32 job_header[JOB_HEADER_SIZE_IN_WORDS]; -+ void *dst = job_header; -+ u32 minX, minY, maxX, maxY; -+ u32 restartX, restartY; -+ struct page *p; -+ u32 copy_size; -+ -+ dev_warn(dev, "Called TILE_RANGE_FAULT workaround clamping function.\n"); -+ if (!(katom->core_req & BASE_JD_REQ_FS)) -+ return 0; ++ MALI_DEBUG_ASSERT_POINTER(job); + -+ kbase_gpu_vm_lock(katom->kctx); -+ region = kbase_region_tracker_find_region_enclosing_address(katom->kctx, -+ katom->jc); -+ if (!region || (region->flags & KBASE_REG_FREE)) -+ goto out_unlock; ++ MALI_DEBUG_PRINT(4, ("Mali PP scheduler: Timeline activation for job %u (0x%08X).\n", ++ mali_pp_job_get_id(job), job)); + -+ page_array = kbase_get_cpu_phy_pages(region); -+ if (!page_array) -+ goto out_unlock; ++ if (MALI_TRUE == mali_timeline_tracker_activation_error( ++ mali_pp_job_get_tracker(job))) { ++ MALI_DEBUG_PRINT(3, ("Mali PP scheduler: Job %u (0x%08X) activated with error, aborting.\n", ++ mali_pp_job_get_id(job), job)); + -+ page_index = (katom->jc >> PAGE_SHIFT) - region->start_pfn; ++ mali_scheduler_lock(); ++ mali_pp_job_fb_lookup_remove(job); ++ mali_pp_job_mark_unstarted_failed(job); ++ mali_scheduler_unlock(); + -+ p = phys_to_page(as_phys_addr_t(page_array[page_index])); ++ mali_timeline_tracker_release(mali_pp_job_get_tracker(job)); + -+ /* we need the first 10 words of the fragment shader job descriptor. -+ * We need to check that the offset + 10 words is less that the page -+ * size otherwise we need to load the next page. -+ * page_size_overflow will be equal to 0 in case the whole descriptor -+ * is within the page > 0 otherwise. -+ */ -+ copy_size = MIN(PAGE_SIZE - offset, JOB_HEADER_SIZE); ++ /* This will notify user space and close the job object */ ++ mali_scheduler_complete_pp_job(job, 0, MALI_TRUE, MALI_FALSE); + -+ page_1 = kmap_atomic(p); ++ return MALI_SCHEDULER_MASK_EMPTY; ++ } + -+ /* page_1 is a u32 pointer, offset is expressed in bytes */ -+ page_1 += offset>>2; ++#if defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) ++ if (mali_pp_job_needs_dma_buf_mapping(job)) { ++ mali_scheduler_deferred_pp_job_queue(job); ++ return MALI_SCHEDULER_MASK_EMPTY; ++ } ++#endif /* defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) */ + -+ kbase_sync_single_for_cpu(katom->kctx->kbdev, -+ kbase_dma_addr(p) + offset, -+ copy_size, DMA_BIDIRECTIONAL); ++ mali_scheduler_lock(); + -+ memcpy(dst, page_1, copy_size); ++ if (!mali_scheduler_queue_pp_job(job)) { ++ /* Failed to enqueue job, release job (with error) */ ++ mali_pp_job_fb_lookup_remove(job); ++ mali_pp_job_mark_unstarted_failed(job); ++ mali_scheduler_unlock(); + -+ /* The data needed overflows page the dimension, -+ * need to map the subsequent page */ -+ if (copy_size < JOB_HEADER_SIZE) { -+ p = phys_to_page(as_phys_addr_t(page_array[page_index + 1])); -+ page_2 = kmap_atomic(p); ++ mali_timeline_tracker_release(mali_pp_job_get_tracker(job)); + -+ kbase_sync_single_for_cpu(katom->kctx->kbdev, -+ kbase_dma_addr(p), -+ JOB_HEADER_SIZE - copy_size, DMA_BIDIRECTIONAL); ++ /* This will notify user space and close the job object */ ++ mali_scheduler_complete_pp_job(job, 0, MALI_TRUE, MALI_FALSE); + -+ memcpy(dst + copy_size, page_2, JOB_HEADER_SIZE - copy_size); ++ return MALI_SCHEDULER_MASK_EMPTY; + } + -+ /* We managed to correctly map one or two pages (in case of overflow) */ -+ /* Get Bounding Box data and restart index from fault address low word */ -+ minX = job_header[FRAG_JOB_DESC_MIN_TILE_COORD_WORD] & X_COORDINATE_MASK; -+ minY = job_header[FRAG_JOB_DESC_MIN_TILE_COORD_WORD] & Y_COORDINATE_MASK; -+ maxX = job_header[FRAG_JOB_DESC_MAX_TILE_COORD_WORD] & X_COORDINATE_MASK; -+ maxY = job_header[FRAG_JOB_DESC_MAX_TILE_COORD_WORD] & Y_COORDINATE_MASK; -+ restartX = job_header[JOB_DESC_FAULT_ADDR_LOW_WORD] & X_COORDINATE_MASK; -+ restartY = job_header[JOB_DESC_FAULT_ADDR_LOW_WORD] & Y_COORDINATE_MASK; ++ mali_scheduler_unlock(); ++ return MALI_SCHEDULER_MASK_PP; ++} + -+ dev_warn(dev, "Before Clamping:\n" -+ "Jobstatus: %08x\n" -+ "restartIdx: %08x\n" -+ "Fault_addr_low: %08x\n" -+ "minCoordsX: %08x minCoordsY: %08x\n" -+ "maxCoordsX: %08x maxCoordsY: %08x\n", -+ job_header[JOB_DESC_STATUS_WORD], -+ job_header[JOB_DESC_RESTART_INDEX_WORD], -+ job_header[JOB_DESC_FAULT_ADDR_LOW_WORD], -+ minX, minY, -+ maxX, maxY); ++void mali_scheduler_complete_gp_job(struct mali_gp_job *job, ++ mali_bool success, ++ mali_bool user_notification, ++ mali_bool dequeued) ++{ ++ if (user_notification) { ++ mali_scheduler_return_gp_job_to_user(job, success); ++ } + -+ /* Set the restart index to the one which generated the fault*/ -+ job_header[JOB_DESC_RESTART_INDEX_WORD] = -+ job_header[JOB_DESC_FAULT_ADDR_LOW_WORD]; ++ if (dequeued) { ++ _mali_osk_pm_dev_ref_put(); + -+ if (restartX < minX) { -+ job_header[JOB_DESC_RESTART_INDEX_WORD] = (minX) | restartY; -+ dev_warn(dev, -+ "Clamping restart X index to minimum. %08x clamped to %08x\n", -+ restartX, minX); -+ clamped = 1; -+ } -+ if (restartY < minY) { -+ job_header[JOB_DESC_RESTART_INDEX_WORD] = (minY) | restartX; -+ dev_warn(dev, -+ "Clamping restart Y index to minimum. %08x clamped to %08x\n", -+ restartY, minY); -+ clamped = 1; -+ } -+ if (restartX > maxX) { -+ job_header[JOB_DESC_RESTART_INDEX_WORD] = (maxX) | restartY; -+ dev_warn(dev, -+ "Clamping restart X index to maximum. %08x clamped to %08x\n", -+ restartX, maxX); -+ clamped = 1; -+ } -+ if (restartY > maxY) { -+ job_header[JOB_DESC_RESTART_INDEX_WORD] = (maxY) | restartX; -+ dev_warn(dev, -+ "Clamping restart Y index to maximum. %08x clamped to %08x\n", -+ restartY, maxY); -+ clamped = 1; ++ if (mali_utilization_enabled()) { ++ mali_utilization_gp_end(); ++ } ++ mali_pm_record_gpu_idle(MALI_TRUE); + } + -+ if (clamped) { -+ /* Reset the fault address low word -+ * and set the job status to STOPPED */ -+ job_header[JOB_DESC_FAULT_ADDR_LOW_WORD] = 0x0; -+ job_header[JOB_DESC_STATUS_WORD] = BASE_JD_EVENT_STOPPED; -+ dev_warn(dev, "After Clamping:\n" -+ "Jobstatus: %08x\n" -+ "restartIdx: %08x\n" -+ "Fault_addr_low: %08x\n" -+ "minCoordsX: %08x minCoordsY: %08x\n" -+ "maxCoordsX: %08x maxCoordsY: %08x\n", -+ job_header[JOB_DESC_STATUS_WORD], -+ job_header[JOB_DESC_RESTART_INDEX_WORD], -+ job_header[JOB_DESC_FAULT_ADDR_LOW_WORD], -+ minX, minY, -+ maxX, maxY); ++ mali_gp_job_delete(job); ++} + -+ /* Flush CPU cache to update memory for future GPU reads*/ -+ memcpy(page_1, dst, copy_size); -+ p = phys_to_page(as_phys_addr_t(page_array[page_index])); ++void mali_scheduler_complete_pp_job(struct mali_pp_job *job, ++ u32 num_cores_in_virtual, ++ mali_bool user_notification, ++ mali_bool dequeued) ++{ ++ job->user_notification = user_notification; ++ job->num_pp_cores_in_virtual = num_cores_in_virtual; + -+ kbase_sync_single_for_device(katom->kctx->kbdev, -+ kbase_dma_addr(p) + offset, -+ copy_size, DMA_TO_DEVICE); ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++ if (NULL != job->rendered_dma_fence) ++ mali_dma_fence_signal_and_put(&job->rendered_dma_fence); ++#endif + -+ if (copy_size < JOB_HEADER_SIZE) { -+ memcpy(page_2, dst + copy_size, -+ JOB_HEADER_SIZE - copy_size); -+ p = phys_to_page(as_phys_addr_t(page_array[page_index + -+ 1])); ++ if (dequeued) { ++#if defined(CONFIG_MALI_DVFS) ++ if (mali_pp_job_is_window_surface(job)) { ++ struct mali_session_data *session; ++ session = mali_pp_job_get_session(job); ++ mali_session_inc_num_window_jobs(session); ++ } ++#endif ++ _mali_osk_pm_dev_ref_put(); + -+ kbase_sync_single_for_device(katom->kctx->kbdev, -+ kbase_dma_addr(p), -+ JOB_HEADER_SIZE - copy_size, -+ DMA_TO_DEVICE); ++ if (mali_utilization_enabled()) { ++ mali_utilization_pp_end(); + } ++ mali_pm_record_gpu_idle(MALI_FALSE); + } -+ if (copy_size < JOB_HEADER_SIZE) -+ kunmap_atomic(page_2); -+ -+ kunmap_atomic(page_1); + -+out_unlock: -+ kbase_gpu_vm_unlock(katom->kctx); -+ return clamped; ++ /* With ZRAM feature enabled, all pp jobs will be force to use deferred delete. */ ++ mali_scheduler_deferred_pp_job_delete(job); +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_10969_workaround.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_10969_workaround.h -new file mode 100755 -index 000000000000..099a29861672 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_10969_workaround.h -@@ -0,0 +1,23 @@ -+/* -+ * -+ * (C) COPYRIGHT 2013-2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ + ++void mali_scheduler_abort_session(struct mali_session_data *session) ++{ ++ struct mali_gp_job *gp_job; ++ struct mali_gp_job *gp_tmp; ++ struct mali_pp_job *pp_job; ++ struct mali_pp_job *pp_tmp; ++ _MALI_OSK_LIST_HEAD_STATIC_INIT(removed_jobs_gp); ++ _MALI_OSK_LIST_HEAD_STATIC_INIT(removed_jobs_pp); + ++ MALI_DEBUG_ASSERT_POINTER(session); ++ MALI_DEBUG_ASSERT(session->is_aborting); + -+#ifndef _KBASE_10969_WORKAROUND_ -+#define _KBASE_10969_WORKAROUND_ ++ MALI_DEBUG_PRINT(3, ("Mali scheduler: Aborting all queued jobs from session 0x%08X.\n", ++ session)); + -+int kbasep_10969_workaround_clamp_coordinates(struct kbase_jd_atom *katom); ++ mali_scheduler_lock(); + -+#endif /* _KBASE_10969_WORKAROUND_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_as_fault_debugfs.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_as_fault_debugfs.c -new file mode 100755 -index 000000000000..cc729d416858 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_as_fault_debugfs.c -@@ -0,0 +1,102 @@ -+/* -+ * -+ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ /* Remove from GP normal priority queue */ ++ _MALI_OSK_LIST_FOREACHENTRY(gp_job, gp_tmp, &job_queue_gp.normal_pri, ++ struct mali_gp_job, list) { ++ if (mali_gp_job_get_session(gp_job) == session) { ++ mali_gp_job_list_move(gp_job, &removed_jobs_gp); ++ job_queue_gp.depth--; ++ job_queue_gp.big_job_num -= gp_job->big_job ? 1 : 0; ++ } ++ } ++ ++ /* Remove from GP high priority queue */ ++ _MALI_OSK_LIST_FOREACHENTRY(gp_job, gp_tmp, &job_queue_gp.high_pri, ++ struct mali_gp_job, list) { ++ if (mali_gp_job_get_session(gp_job) == session) { ++ mali_gp_job_list_move(gp_job, &removed_jobs_gp); ++ job_queue_gp.depth--; ++ job_queue_gp.big_job_num -= gp_job->big_job ? 1 : 0; ++ } ++ } + ++ /* Remove from PP normal priority queue */ ++ _MALI_OSK_LIST_FOREACHENTRY(pp_job, pp_tmp, ++ &job_queue_pp.normal_pri, ++ struct mali_pp_job, list) { ++ if (mali_pp_job_get_session(pp_job) == session) { ++ mali_pp_job_fb_lookup_remove(pp_job); + ++ job_queue_pp.depth -= ++ mali_pp_job_unstarted_sub_job_count( ++ pp_job); ++ mali_pp_job_mark_unstarted_failed(pp_job); + -+#include ++ if (MALI_FALSE == mali_pp_job_has_unstarted_sub_jobs(pp_job)) { ++ if (mali_pp_job_is_complete(pp_job)) { ++ mali_pp_job_list_move(pp_job, ++ &removed_jobs_pp); ++ } else { ++ mali_pp_job_list_remove(pp_job); ++ } ++ } ++ } ++ } + -+#include -+#include ++ /* Remove from PP high priority queue */ ++ _MALI_OSK_LIST_FOREACHENTRY(pp_job, pp_tmp, ++ &job_queue_pp.high_pri, ++ struct mali_pp_job, list) { ++ if (mali_pp_job_get_session(pp_job) == session) { ++ mali_pp_job_fb_lookup_remove(pp_job); + -+#ifdef CONFIG_DEBUG_FS -+#ifdef CONFIG_MALI_BIFROST_DEBUG ++ job_queue_pp.depth -= ++ mali_pp_job_unstarted_sub_job_count( ++ pp_job); ++ mali_pp_job_mark_unstarted_failed(pp_job); + -+static int kbase_as_fault_read(struct seq_file *sfile, void *data) -+{ -+ uintptr_t as_no = (uintptr_t) sfile->private; ++ if (MALI_FALSE == mali_pp_job_has_unstarted_sub_jobs(pp_job)) { ++ if (mali_pp_job_is_complete(pp_job)) { ++ mali_pp_job_list_move(pp_job, ++ &removed_jobs_pp); ++ } else { ++ mali_pp_job_list_remove(pp_job); ++ } ++ } ++ } ++ } + -+ struct list_head *entry; -+ const struct list_head *kbdev_list; -+ struct kbase_device *kbdev = NULL; ++ /* ++ * Release scheduler lock so we can release trackers ++ * (which will potentially queue new jobs) ++ */ ++ mali_scheduler_unlock(); + -+ kbdev_list = kbase_dev_list_get(); ++ /* Release and complete all (non-running) found GP jobs */ ++ _MALI_OSK_LIST_FOREACHENTRY(gp_job, gp_tmp, &removed_jobs_gp, ++ struct mali_gp_job, list) { ++ mali_timeline_tracker_release(mali_gp_job_get_tracker(gp_job)); ++ mali_gp_job_signal_pp_tracker(gp_job, MALI_FALSE); ++ _mali_osk_list_delinit(&gp_job->list); ++ mali_scheduler_complete_gp_job(gp_job, ++ MALI_FALSE, MALI_FALSE, MALI_TRUE); ++ } + -+ list_for_each(entry, kbdev_list) { -+ kbdev = list_entry(entry, struct kbase_device, entry); ++ /* Release and complete non-running PP jobs */ ++ _MALI_OSK_LIST_FOREACHENTRY(pp_job, pp_tmp, &removed_jobs_pp, ++ struct mali_pp_job, list) { ++ mali_timeline_tracker_release(mali_pp_job_get_tracker(pp_job)); ++ _mali_osk_list_delinit(&pp_job->list); ++ mali_scheduler_complete_pp_job(pp_job, 0, ++ MALI_FALSE, MALI_TRUE); ++ } ++} + -+ if(kbdev->debugfs_as_read_bitmap & (1ULL << as_no)) { ++_mali_osk_errcode_t _mali_ukk_gp_start_job(void *ctx, ++ _mali_uk_gp_start_job_s *uargs) ++{ ++ struct mali_session_data *session; ++ struct mali_gp_job *job; ++ mali_timeline_point point; ++ u32 __user *point_ptr = NULL; + -+ /* don't show this one again until another fault occors */ -+ kbdev->debugfs_as_read_bitmap &= ~(1ULL << as_no); ++ MALI_DEBUG_ASSERT_POINTER(uargs); ++ MALI_DEBUG_ASSERT_POINTER(ctx); + -+ /* output the last page fault addr */ -+ seq_printf(sfile, "%llu\n", (u64) kbdev->as[as_no].fault_addr); -+ } ++ session = (struct mali_session_data *)(uintptr_t)ctx; + ++ job = mali_gp_job_create(session, uargs, mali_scheduler_get_new_id(), ++ NULL); ++ if (NULL == job) { ++ MALI_PRINT_ERROR(("Failed to create GP job.\n")); ++ return _MALI_OSK_ERR_NOMEM; + } + -+ kbase_dev_list_put(kbdev_list); ++ point_ptr = (u32 __user *)(uintptr_t)mali_gp_job_get_timeline_point_ptr(job); + -+ return 0; -+} ++ point = mali_scheduler_submit_gp_job(session, job); + -+static int kbase_as_fault_debugfs_open(struct inode *in, struct file *file) -+{ -+ return single_open(file, kbase_as_fault_read , in->i_private); ++ if (0 != _mali_osk_put_user(((u32) point), point_ptr)) { ++ /* ++ * Let user space know that something failed ++ * after the job was started. ++ */ ++ return _MALI_OSK_ERR_ITEM_NOT_FOUND; ++ } ++ ++ return _MALI_OSK_ERR_OK; +} + -+static const struct file_operations as_fault_fops = { -+ .open = kbase_as_fault_debugfs_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; ++_mali_osk_errcode_t _mali_ukk_pp_start_job(void *ctx, ++ _mali_uk_pp_start_job_s *uargs) ++{ ++ _mali_osk_errcode_t ret; ++ struct mali_session_data *session; ++ struct mali_pp_job *job; ++ mali_timeline_point point; ++ u32 __user *point_ptr = NULL; + -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+#endif /* CONFIG_DEBUG_FS */ ++ MALI_DEBUG_ASSERT_POINTER(uargs); ++ MALI_DEBUG_ASSERT_POINTER(ctx); + -+/* -+ * Initialize debugfs entry for each address space -+ */ -+void kbase_as_fault_debugfs_init(struct kbase_device *kbdev) -+{ -+#ifdef CONFIG_DEBUG_FS -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ uint i; -+ char as_name[64]; -+ struct dentry *debugfs_directory; ++ session = (struct mali_session_data *)(uintptr_t)ctx; + -+ kbdev->debugfs_as_read_bitmap = 0ULL; ++ job = mali_pp_job_create(session, uargs, mali_scheduler_get_new_id()); ++ if (NULL == job) { ++ MALI_PRINT_ERROR(("Failed to create PP job.\n")); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ KBASE_DEBUG_ASSERT(kbdev->nr_hw_address_spaces); -+ KBASE_DEBUG_ASSERT(sizeof(kbdev->as[0].fault_addr) == sizeof(u64)); ++ point_ptr = (u32 __user *)(uintptr_t)mali_pp_job_get_timeline_point_ptr(job); + -+ debugfs_directory = debugfs_create_dir("address_spaces", -+ kbdev->mali_debugfs_directory); ++ /* Submit PP job. */ ++ ret = mali_scheduler_submit_pp_job(session, job, &point); ++ job = NULL; + -+ if(debugfs_directory) { -+ for(i = 0; i < kbdev->nr_hw_address_spaces; i++) { -+ snprintf(as_name, ARRAY_SIZE(as_name), "as%u", i); -+ debugfs_create_file(as_name, S_IRUGO, -+ debugfs_directory, (void*) ((uintptr_t) i), &as_fault_fops); ++ if (_MALI_OSK_ERR_OK == ret) { ++ if (0 != _mali_osk_put_user(((u32) point), point_ptr)) { ++ /* ++ * Let user space know that something failed ++ * after the jobs were started. ++ */ ++ return _MALI_OSK_ERR_ITEM_NOT_FOUND; + } + } -+ else -+ dev_warn(kbdev->dev, "unable to create address_spaces debugfs directory"); + -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+#endif /* CONFIG_DEBUG_FS */ -+ return; ++ return ret; +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_as_fault_debugfs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_as_fault_debugfs.h -new file mode 100755 -index 000000000000..66387e1c3f6a ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_as_fault_debugfs.h -@@ -0,0 +1,45 @@ -+/* -+ * -+ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ + ++_mali_osk_errcode_t _mali_ukk_pp_and_gp_start_job(void *ctx, ++ _mali_uk_pp_and_gp_start_job_s *uargs) ++{ ++ _mali_osk_errcode_t ret; ++ struct mali_session_data *session; ++ _mali_uk_pp_and_gp_start_job_s kargs; ++ struct mali_pp_job *pp_job; ++ struct mali_gp_job *gp_job; ++ u32 __user *point_ptr = NULL; ++ mali_timeline_point point; ++ _mali_uk_pp_start_job_s __user *pp_args; ++ _mali_uk_gp_start_job_s __user *gp_args; + ++ MALI_DEBUG_ASSERT_POINTER(ctx); ++ MALI_DEBUG_ASSERT_POINTER(uargs); + -+#ifndef _KBASE_AS_FAULT_DEBUG_FS_H -+#define _KBASE_AS_FAULT_DEBUG_FS_H ++ session = (struct mali_session_data *) ctx; + -+/** -+ * kbase_as_fault_debugfs_init() - Add debugfs files for reporting page faults -+ * -+ * @kbdev: Pointer to kbase_device -+ */ -+void kbase_as_fault_debugfs_init(struct kbase_device *kbdev); ++ if (0 != _mali_osk_copy_from_user(&kargs, uargs, ++ sizeof(_mali_uk_pp_and_gp_start_job_s))) { ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+/** -+ * kbase_as_fault_debugfs_new() - make the last fault available on debugfs -+ * -+ * @kbdev: Pointer to kbase_device -+ * @as_no: The address space the fault occurred on -+ */ -+static inline void -+kbase_as_fault_debugfs_new(struct kbase_device *kbdev, int as_no) -+{ -+#ifdef CONFIG_DEBUG_FS -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ kbdev->debugfs_as_read_bitmap |= (1ULL << as_no); -+#endif /* CONFIG_DEBUG_FS */ -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+ return; -+} ++ pp_args = (_mali_uk_pp_start_job_s __user *)(uintptr_t)kargs.pp_args; ++ gp_args = (_mali_uk_gp_start_job_s __user *)(uintptr_t)kargs.gp_args; + -+#endif /*_KBASE_AS_FAULT_DEBUG_FS_H*/ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_cache_policy.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_cache_policy.c -new file mode 100755 -index 000000000000..1d11de67aa80 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_cache_policy.c -@@ -0,0 +1,54 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ pp_job = mali_pp_job_create(session, pp_args, ++ mali_scheduler_get_new_id()); ++ if (NULL == pp_job) { ++ MALI_PRINT_ERROR(("Failed to create PP job.\n")); ++ return _MALI_OSK_ERR_NOMEM; ++ } + ++ gp_job = mali_gp_job_create(session, gp_args, ++ mali_scheduler_get_new_id(), ++ mali_pp_job_get_tracker(pp_job)); ++ if (NULL == gp_job) { ++ MALI_PRINT_ERROR(("Failed to create GP job.\n")); ++ mali_pp_job_delete(pp_job); ++ return _MALI_OSK_ERR_NOMEM; ++ } + ++ point_ptr = (u32 __user *)(uintptr_t)mali_pp_job_get_timeline_point_ptr(pp_job); + ++ /* Submit GP job. */ ++ mali_scheduler_submit_gp_job(session, gp_job); ++ gp_job = NULL; + ++ /* Submit PP job. */ ++ ret = mali_scheduler_submit_pp_job(session, pp_job, &point); ++ pp_job = NULL; + -+/* -+ * Cache Policy API. -+ */ ++ if (_MALI_OSK_ERR_OK == ret) { ++ if (0 != _mali_osk_put_user(((u32) point), point_ptr)) { ++ /* ++ * Let user space know that something failed ++ * after the jobs were started. ++ */ ++ return _MALI_OSK_ERR_ITEM_NOT_FOUND; ++ } ++ } + -+#include "mali_kbase_cache_policy.h" ++ return ret; ++} + -+/* -+ * The output flags should be a combination of the following values: -+ * KBASE_REG_CPU_CACHED: CPU cache should be enabled. -+ */ -+u32 kbase_cache_enabled(u32 flags, u32 nr_pages) ++void _mali_ukk_pp_job_disable_wb(_mali_uk_pp_disable_wb_s *args) +{ -+ u32 cache_flags = 0; ++ struct mali_session_data *session; ++ struct mali_pp_job *job; ++ struct mali_pp_job *tmp; ++ u32 fb_lookup_id; + -+ CSTD_UNUSED(nr_pages); ++ MALI_DEBUG_ASSERT_POINTER(args); ++ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); + -+ if (flags & BASE_MEM_CACHED_CPU) -+ cache_flags |= KBASE_REG_CPU_CACHED; ++ session = (struct mali_session_data *)(uintptr_t)args->ctx; + -+ return cache_flags; -+} ++ fb_lookup_id = args->fb_id & MALI_PP_JOB_FB_LOOKUP_LIST_MASK; + ++ mali_scheduler_lock(); + -+void kbase_sync_single_for_device(struct kbase_device *kbdev, dma_addr_t handle, -+ size_t size, enum dma_data_direction dir) -+{ -+ dma_sync_single_for_device(kbdev->dev, handle, size, dir); -+} ++ /* Iterate over all jobs for given frame builder_id. */ ++ _MALI_OSK_LIST_FOREACHENTRY(job, tmp, ++ &session->pp_job_fb_lookup_list[fb_lookup_id], ++ struct mali_pp_job, session_fb_lookup_list) { ++ MALI_DEBUG_CODE(u32 disable_mask = 0); + ++ if (mali_pp_job_get_frame_builder_id(job) != ++ (u32) args->fb_id) { ++ MALI_DEBUG_PRINT(4, ("Mali PP scheduler: Disable WB mismatching FB.\n")); ++ continue; ++ } + -+void kbase_sync_single_for_cpu(struct kbase_device *kbdev, dma_addr_t handle, -+ size_t size, enum dma_data_direction dir) -+{ -+ dma_sync_single_for_cpu(kbdev->dev, handle, size, dir); -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_cache_policy.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_cache_policy.h -new file mode 100755 -index 000000000000..0c18bdb357b0 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_cache_policy.h -@@ -0,0 +1,45 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2013, 2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ MALI_DEBUG_CODE(disable_mask |= 0xD << (4 * 3)); + ++ if (mali_pp_job_get_wb0_source_addr(job) == args->wb0_memory) { ++ MALI_DEBUG_CODE(disable_mask |= 0x1 << (4 * 1)); ++ mali_pp_job_disable_wb0(job); ++ } + ++ if (mali_pp_job_get_wb1_source_addr(job) == args->wb1_memory) { ++ MALI_DEBUG_CODE(disable_mask |= 0x2 << (4 * 2)); ++ mali_pp_job_disable_wb1(job); ++ } + ++ if (mali_pp_job_get_wb2_source_addr(job) == args->wb2_memory) { ++ MALI_DEBUG_CODE(disable_mask |= 0x3 << (4 * 3)); ++ mali_pp_job_disable_wb2(job); ++ } ++ MALI_DEBUG_PRINT(3, ("Mali PP scheduler: Disable WB: 0x%X.\n", ++ disable_mask)); ++ } + ++ mali_scheduler_unlock(); ++} + -+/* -+ * Cache Policy API. -+ */ ++#if MALI_STATE_TRACKING ++u32 mali_scheduler_dump_state(char *buf, u32 size) ++{ ++ int n = 0; + -+#ifndef _KBASE_CACHE_POLICY_H_ -+#define _KBASE_CACHE_POLICY_H_ ++ n += _mali_osk_snprintf(buf + n, size - n, "GP queues\n"); ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\tQueue depth: %u\n", job_queue_gp.depth); ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\tNormal priority queue is %s\n", ++ _mali_osk_list_empty(&job_queue_gp.normal_pri) ? ++ "empty" : "not empty"); ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\tHigh priority queue is %s\n", ++ _mali_osk_list_empty(&job_queue_gp.high_pri) ? ++ "empty" : "not empty"); + -+#include "mali_kbase.h" -+#include "mali_base_kernel.h" ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "PP queues\n"); ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\tQueue depth: %u\n", job_queue_pp.depth); ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\tNormal priority queue is %s\n", ++ _mali_osk_list_empty(&job_queue_pp.normal_pri) ++ ? "empty" : "not empty"); ++ n += _mali_osk_snprintf(buf + n, size - n, ++ "\tHigh priority queue is %s\n", ++ _mali_osk_list_empty(&job_queue_pp.high_pri) ++ ? "empty" : "not empty"); + -+/** -+ * kbase_cache_enabled - Choose the cache policy for a specific region -+ * @flags: flags describing attributes of the region -+ * @nr_pages: total number of pages (backed or not) for the region -+ * -+ * Tells whether the CPU and GPU caches should be enabled or not for a specific -+ * region. -+ * This function can be modified to customize the cache policy depending on the -+ * flags and size of the region. -+ * -+ * Return: a combination of %KBASE_REG_CPU_CACHED and %KBASE_REG_GPU_CACHED -+ * depending on the cache policy -+ */ -+u32 kbase_cache_enabled(u32 flags, u32 nr_pages); ++ n += _mali_osk_snprintf(buf + n, size - n, "\n"); ++ ++ return n; ++} ++#endif + -+#endif /* _KBASE_CACHE_POLICY_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config.c -new file mode 100755 -index 000000000000..fb615ae02ead ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config.c -@@ -0,0 +1,51 @@ +/* -+ * -+ * (C) COPYRIGHT 2011-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * ---------- Implementation of static functions ---------- + */ + ++static mali_timeline_point mali_scheduler_submit_gp_job( ++ struct mali_session_data *session, struct mali_gp_job *job) ++{ ++ mali_timeline_point point; + ++ MALI_DEBUG_ASSERT_POINTER(session); ++ MALI_DEBUG_ASSERT_POINTER(job); + ++ /* Add job to Timeline system. */ ++ point = mali_timeline_system_add_tracker(session->timeline_system, ++ mali_gp_job_get_tracker(job), MALI_TIMELINE_GP); + ++ return point; ++} + -+#include -+#include -+#include ++static _mali_osk_errcode_t mali_scheduler_submit_pp_job( ++ struct mali_session_data *session, struct mali_pp_job *job, mali_timeline_point *point) + -+int kbasep_platform_device_init(struct kbase_device *kbdev) +{ -+ struct kbase_platform_funcs_conf *platform_funcs_p; ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_OK; + -+ platform_funcs_p = (struct kbase_platform_funcs_conf *)PLATFORM_FUNCS; -+ if (platform_funcs_p && platform_funcs_p->platform_init_func) -+ return platform_funcs_p->platform_init_func(kbdev); ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++ struct ww_acquire_ctx ww_actx; ++ u32 i; ++ u32 num_memory_cookies = 0; ++ struct reservation_object **reservation_object_list = NULL; ++ unsigned int num_reservation_object = 0; ++#endif + -+ return 0; -+} ++ MALI_DEBUG_ASSERT_POINTER(session); ++ MALI_DEBUG_ASSERT_POINTER(job); + -+void kbasep_platform_device_term(struct kbase_device *kbdev) -+{ -+ struct kbase_platform_funcs_conf *platform_funcs_p; ++ mali_scheduler_lock(); ++ /* ++ * Adding job to the lookup list used to quickly discard ++ * writeback units of queued jobs. ++ */ ++ mali_pp_job_fb_lookup_add(job); ++ mali_scheduler_unlock(); + -+ platform_funcs_p = (struct kbase_platform_funcs_conf *)PLATFORM_FUNCS; -+ if (platform_funcs_p && platform_funcs_p->platform_term_func) -+ platform_funcs_p->platform_term_func(kbdev); -+} ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) + -+int kbase_cpuprops_get_default_clock_speed(u32 * const clock_speed) -+{ -+ KBASE_DEBUG_ASSERT(NULL != clock_speed); ++ /* Allocate the reservation_object_list to list the dma reservation object of dependent dma buffer */ ++ num_memory_cookies = mali_pp_job_num_memory_cookies(job); ++ if (0 < num_memory_cookies) { ++ reservation_object_list = kzalloc(sizeof(struct reservation_object *) * num_memory_cookies, GFP_KERNEL); ++ if (NULL == reservation_object_list) { ++ MALI_PRINT_ERROR(("Failed to alloc the reservation object list.\n")); ++ ret = _MALI_OSK_ERR_NOMEM; ++ goto failed_to_alloc_reservation_object_list; ++ } ++ } + -+ *clock_speed = 100; -+ return 0; -+} ++ /* Add the dma reservation object into reservation_object_list*/ ++ for (i = 0; i < num_memory_cookies; i++) { ++ mali_mem_backend *mem_backend = NULL; ++ struct reservation_object *tmp_reservation_object = NULL; ++ u32 mali_addr = mali_pp_job_get_memory_cookie(job, i); + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config.h -new file mode 100755 -index 000000000000..212e3b14d96c ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config.h -@@ -0,0 +1,343 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ mem_backend = mali_mem_backend_struct_search(session, mali_addr); + ++ MALI_DEBUG_ASSERT_POINTER(mem_backend); + ++ if (NULL == mem_backend) { ++ MALI_PRINT_ERROR(("Failed to find the memory backend for memory cookie[%d].\n", i)); ++ goto failed_to_find_mem_backend; ++ } + ++ if (MALI_MEM_DMA_BUF != mem_backend->type) ++ continue; + ++ tmp_reservation_object = mem_backend->dma_buf.attachment->buf->resv; + -+/** -+ * @file mali_kbase_config.h -+ * Configuration API and Attributes for KBase -+ */ ++ if (NULL != tmp_reservation_object) { ++ mali_dma_fence_add_reservation_object_list(tmp_reservation_object, ++ reservation_object_list, &num_reservation_object); ++ } ++ } + -+#ifndef _KBASE_CONFIG_H_ -+#define _KBASE_CONFIG_H_ ++ /* ++ * Add the mali dma fence callback to wait for all dependent dma buf, ++ * and extend the timeline system to support dma fence, ++ * then create the new internal dma fence to replace all last dma fence for dependent dma buf. ++ */ ++ if (0 < num_reservation_object) { ++ int error; ++ int num_dma_fence_waiter = 0; ++ /* Create one new dma fence.*/ ++ job->rendered_dma_fence = mali_dma_fence_new(job->session->fence_context, ++ _mali_osk_atomic_inc_return(&job->session->fence_seqno)); + -+#include ++ if (NULL == job->rendered_dma_fence) { ++ MALI_PRINT_ERROR(("Failed to creat one new dma fence.\n")); ++ ret = _MALI_OSK_ERR_FAULT; ++ goto failed_to_create_dma_fence; ++ } + -+#include -+#include ++ /* In order to avoid deadlock, wait/wound mutex lock to lock all dma buffers*/ + -+/** -+ * @addtogroup base_api -+ * @{ -+ */ ++ error = mali_dma_fence_lock_reservation_object_list(reservation_object_list, ++ num_reservation_object, &ww_actx); + -+/** -+ * @addtogroup base_kbase_api -+ * @{ -+ */ ++ if (0 != error) { ++ MALI_PRINT_ERROR(("Failed to lock all reservation objects.\n")); ++ ret = _MALI_OSK_ERR_FAULT; ++ goto failed_to_lock_reservation_object_list; ++ } + -+/** -+ * @addtogroup kbase_config Configuration API and Attributes -+ * @{ -+ */ ++ mali_dma_fence_context_init(&job->dma_fence_context, ++ mali_timeline_dma_fence_callback, (void *)job); + -+#include ++ /* Add dma fence waiters and dma fence callback. */ ++ for (i = 0; i < num_reservation_object; i++) { ++ ret = mali_dma_fence_context_add_waiters(&job->dma_fence_context, reservation_object_list[i]); ++ if (_MALI_OSK_ERR_OK != ret) { ++ MALI_PRINT_ERROR(("Failed to add waiter into mali dma fence context.\n")); ++ goto failed_to_add_dma_fence_waiter; ++ } ++ } + -+/* Forward declaration of struct kbase_device */ -+struct kbase_device; ++ for (i = 0; i < num_reservation_object; i++) { ++ reservation_object_add_excl_fence(reservation_object_list[i], job->rendered_dma_fence); ++ } + -+/** -+ * kbase_platform_funcs_conf - Specifies platform init/term function pointers -+ * -+ * Specifies the functions pointers for platform specific initialization and -+ * termination. By default no functions are required. No additional platform -+ * specific control is necessary. -+ */ -+struct kbase_platform_funcs_conf { -+ /** -+ * platform_init_func - platform specific init function pointer -+ * @kbdev - kbase_device pointer -+ * -+ * Returns 0 on success, negative error code otherwise. -+ * -+ * Function pointer for platform specific initialization or NULL if no -+ * initialization function is required. At the point this the GPU is -+ * not active and its power and clocks are in unknown (platform specific -+ * state) as kbase doesn't yet have control of power and clocks. -+ * -+ * The platform specific private pointer kbase_device::platform_context -+ * can be accessed (and possibly initialized) in here. -+ */ -+ int (*platform_init_func)(struct kbase_device *kbdev); -+ /** -+ * platform_term_func - platform specific termination function pointer -+ * @kbdev - kbase_device pointer -+ * -+ * Function pointer for platform specific termination or NULL if no -+ * termination function is required. At the point this the GPU will be -+ * idle but still powered and clocked. -+ * -+ * The platform specific private pointer kbase_device::platform_context -+ * can be accessed (and possibly terminated) in here. -+ */ -+ void (*platform_term_func)(struct kbase_device *kbdev); -+}; ++ num_dma_fence_waiter = job->dma_fence_context.num_dma_fence_waiter; + -+/* -+ * @brief Specifies the callbacks for power management -+ * -+ * By default no callbacks will be made and the GPU must not be powered off. -+ */ -+struct kbase_pm_callback_conf { -+ /** Callback for when the GPU is idle and the power to it can be switched off. -+ * -+ * The system integrator can decide whether to either do nothing, just switch off -+ * the clocks to the GPU, or to completely power down the GPU. -+ * The platform specific private pointer kbase_device::platform_context can be accessed and modified in here. It is the -+ * platform \em callbacks responsibility to initialize and terminate this pointer if used (see @ref kbase_platform_funcs_conf). -+ */ -+ void (*power_off_callback)(struct kbase_device *kbdev); ++ /* Add job to Timeline system. */ ++ (*point) = mali_timeline_system_add_tracker(session->timeline_system, ++ mali_pp_job_get_tracker(job), MALI_TIMELINE_PP); + -+ /** Callback for when the GPU is about to become active and power must be supplied. -+ * -+ * This function must not return until the GPU is powered and clocked sufficiently for register access to -+ * succeed. The return value specifies whether the GPU was powered down since the call to power_off_callback. -+ * If the GPU state has been lost then this function must return 1, otherwise it should return 0. -+ * The platform specific private pointer kbase_device::platform_context can be accessed and modified in here. It is the -+ * platform \em callbacks responsibility to initialize and terminate this pointer if used (see @ref kbase_platform_funcs_conf). -+ * -+ * The return value of the first call to this function is ignored. -+ * -+ * @return 1 if the GPU state may have been lost, 0 otherwise. -+ */ -+ int (*power_on_callback)(struct kbase_device *kbdev); ++ if (0 != num_dma_fence_waiter) { ++ mali_dma_fence_context_dec_count(&job->dma_fence_context); ++ } + -+ /** Callback for when the system is requesting a suspend and GPU power -+ * must be switched off. -+ * -+ * Note that if this callback is present, then this may be called -+ * without a preceding call to power_off_callback. Therefore this -+ * callback must be able to take any action that might otherwise happen -+ * in power_off_callback. -+ * -+ * The platform specific private pointer kbase_device::platform_context -+ * can be accessed and modified in here. It is the platform \em -+ * callbacks responsibility to initialize and terminate this pointer if -+ * used (see @ref kbase_platform_funcs_conf). -+ */ -+ void (*power_suspend_callback)(struct kbase_device *kbdev); ++ /* Unlock all wait/wound mutex lock. */ ++ mali_dma_fence_unlock_reservation_object_list(reservation_object_list, ++ num_reservation_object, &ww_actx); ++ } else { ++ /* Add job to Timeline system. */ ++ (*point) = mali_timeline_system_add_tracker(session->timeline_system, ++ mali_pp_job_get_tracker(job), MALI_TIMELINE_PP); ++ } + -+ /** Callback for when the system is resuming from a suspend and GPU -+ * power must be switched on. -+ * -+ * Note that if this callback is present, then this may be called -+ * without a following call to power_on_callback. Therefore this -+ * callback must be able to take any action that might otherwise happen -+ * in power_on_callback. -+ * -+ * The platform specific private pointer kbase_device::platform_context -+ * can be accessed and modified in here. It is the platform \em -+ * callbacks responsibility to initialize and terminate this pointer if -+ * used (see @ref kbase_platform_funcs_conf). -+ */ -+ void (*power_resume_callback)(struct kbase_device *kbdev); ++ kfree(reservation_object_list); ++ return ret; ++#else ++ /* Add job to Timeline system. */ ++ (*point) = mali_timeline_system_add_tracker(session->timeline_system, ++ mali_pp_job_get_tracker(job), MALI_TIMELINE_PP); ++#endif + -+ /** Callback for handling runtime power management initialization. -+ * -+ * The runtime power management callbacks @ref power_runtime_off_callback and @ref power_runtime_on_callback -+ * will become active from calls made to the OS from within this function. -+ * The runtime calls can be triggered by calls from @ref power_off_callback and @ref power_on_callback. -+ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. -+ * -+ * @return 0 on success, else int error code. -+ */ -+ int (*power_runtime_init_callback)(struct kbase_device *kbdev); ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++failed_to_add_dma_fence_waiter: ++ mali_dma_fence_context_term(&job->dma_fence_context); ++ mali_dma_fence_unlock_reservation_object_list(reservation_object_list, ++ num_reservation_object, &ww_actx); ++failed_to_lock_reservation_object_list: ++ mali_dma_fence_signal_and_put(&job->rendered_dma_fence); ++failed_to_create_dma_fence: ++failed_to_find_mem_backend: ++ if (NULL != reservation_object_list) ++ kfree(reservation_object_list); ++failed_to_alloc_reservation_object_list: ++ mali_pp_job_fb_lookup_remove(job); ++#endif ++ return ret; ++} + -+ /** Callback for handling runtime power management termination. -+ * -+ * The runtime power management callbacks @ref power_runtime_off_callback and @ref power_runtime_on_callback -+ * should no longer be called by the OS on completion of this function. -+ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. -+ */ -+ void (*power_runtime_term_callback)(struct kbase_device *kbdev); ++static mali_bool mali_scheduler_queue_gp_job(struct mali_gp_job *job) ++{ ++ struct mali_session_data *session; ++ _mali_osk_list_t *queue; + -+ /** Callback for runtime power-off power management callback -+ * -+ * For linux this callback will be called by the kernel runtime_suspend callback. -+ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. -+ * -+ * @return 0 on success, else OS error code. -+ */ -+ void (*power_runtime_off_callback)(struct kbase_device *kbdev); ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ MALI_DEBUG_ASSERT_POINTER(job); + -+ /** Callback for runtime power-on power management callback -+ * -+ * For linux this callback will be called by the kernel runtime_resume callback. -+ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. -+ */ -+ int (*power_runtime_on_callback)(struct kbase_device *kbdev); ++ session = mali_gp_job_get_session(job); ++ MALI_DEBUG_ASSERT_POINTER(session); ++ ++ if (unlikely(session->is_aborting)) { ++ MALI_DEBUG_PRINT(4, ("Mali GP scheduler: Job %u (0x%08X) queued while session is aborting.\n", ++ mali_gp_job_get_id(job), job)); ++ return MALI_FALSE; /* job not queued */ ++ } ++ ++ mali_gp_job_set_cache_order(job, mali_scheduler_get_new_cache_order()); ++ ++ /* Determine which queue the job should be added to. */ ++ if (session->use_high_priority_job_queue) { ++ queue = &job_queue_gp.high_pri; ++ } else { ++ queue = &job_queue_gp.normal_pri; ++ } ++ ++ job_queue_gp.depth += 1; ++ job_queue_gp.big_job_num += (job->big_job) ? 1 : 0; ++ ++ /* Add job to queue (mali_gp_job_queue_add find correct place). */ ++ mali_gp_job_list_add(job, queue); + + /* -+ * Optional callback for checking if GPU can be suspended when idle -+ * -+ * This callback will be called by the runtime power management core -+ * when the reference count goes to 0 to provide notification that the -+ * GPU now seems idle. -+ * -+ * If this callback finds that the GPU can't be powered off, or handles -+ * suspend by powering off directly or queueing up a power off, a -+ * non-zero value must be returned to prevent the runtime PM core from -+ * also triggering a suspend. -+ * -+ * Returning 0 will cause the runtime PM core to conduct a regular -+ * autosuspend. -+ * -+ * This callback is optional and if not provided regular autosuspend -+ * will be triggered. -+ * -+ * Note: The Linux kernel must have CONFIG_PM_RUNTIME enabled to use -+ * this feature. -+ * -+ * Return 0 if GPU can be suspended, positive value if it can not be -+ * suspeneded by runtime PM, else OS error code ++ * We hold a PM reference for every job we hold queued (and running) ++ * It is important that we take this reference after job has been ++ * added the the queue so that any runtime resume could schedule this ++ * job right there and then. + */ -+ int (*power_runtime_idle_callback)(struct kbase_device *kbdev); -+}; ++ _mali_osk_pm_dev_ref_get_async(); + -+/** -+ * kbase_cpuprops_get_default_clock_speed - default for CPU_SPEED_FUNC -+ * @clock_speed - see kbase_cpu_clk_speed_func for details on the parameters -+ * -+ * Returns 0 on success, negative error code otherwise. -+ * -+ * Default implementation of CPU_SPEED_FUNC. This function sets clock_speed -+ * to 100, so will be an underestimate for any real system. -+ */ -+int kbase_cpuprops_get_default_clock_speed(u32 * const clock_speed); ++ if (mali_utilization_enabled()) { ++ /* ++ * We cheat a little bit by counting the GP as busy from the ++ * time a GP job is queued. This will be fine because we only ++ * loose the tiny idle gap between jobs, but we will instead ++ * get less utilization work to do (less locks taken) ++ */ ++ mali_utilization_gp_start(); ++ } + -+/** -+ * kbase_cpu_clk_speed_func - Type of the function pointer for CPU_SPEED_FUNC -+ * @param clock_speed - pointer to store the current CPU clock speed in MHz -+ * -+ * Returns 0 on success, otherwise negative error code. -+ * -+ * This is mainly used to implement OpenCL's clGetDeviceInfo(). -+ */ -+typedef int (*kbase_cpu_clk_speed_func) (u32 *clock_speed); ++ mali_pm_record_gpu_active(MALI_TRUE); + -+/** -+ * kbase_gpu_clk_speed_func - Type of the function pointer for GPU_SPEED_FUNC -+ * @param clock_speed - pointer to store the current GPU clock speed in MHz -+ * -+ * Returns 0 on success, otherwise negative error code. -+ * When an error is returned the caller assumes maximum GPU speed stored in -+ * gpu_freq_khz_max. -+ * -+ * If the system timer is not available then this function is required -+ * for the OpenCL queue profiling to return correct timing information. -+ * -+ */ -+typedef int (*kbase_gpu_clk_speed_func) (u32 *clock_speed); ++ /* Add profiling events for job enqueued */ ++ _mali_osk_profiling_add_event( ++ MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_GP_ENQUEUE, ++ mali_gp_job_get_pid(job), ++ mali_gp_job_get_tid(job), ++ mali_gp_job_get_frame_builder_id(job), ++ mali_gp_job_get_flush_id(job), ++ 0); + -+#ifdef CONFIG_OF -+struct kbase_platform_config { -+}; -+#else ++#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) ++ trace_gpu_job_enqueue(mali_gp_job_get_tid(job), ++ mali_gp_job_get_id(job), "GP"); ++#endif + -+/* -+ * @brief Specifies start and end of I/O memory region. -+ */ -+struct kbase_io_memory_region { -+ u64 start; -+ u64 end; -+}; ++ MALI_DEBUG_PRINT(3, ("Mali GP scheduler: Job %u (0x%08X) queued\n", ++ mali_gp_job_get_id(job), job)); + -+/* -+ * @brief Specifies I/O related resources like IRQs and memory region for I/O operations. -+ */ -+struct kbase_io_resources { -+ u32 job_irq_number; -+ u32 mmu_irq_number; -+ u32 gpu_irq_number; -+ struct kbase_io_memory_region io_memory_region; -+}; ++ return MALI_TRUE; /* job queued */ ++} + -+struct kbase_platform_config { -+ const struct kbase_io_resources *io_resources; -+}; ++static mali_bool mali_scheduler_queue_pp_job(struct mali_pp_job *job) ++{ ++ struct mali_session_data *session; ++ _mali_osk_list_t *queue = NULL; + -+#endif /* CONFIG_OF */ ++ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ MALI_DEBUG_ASSERT_POINTER(job); + -+/** -+ * @brief Gets the pointer to platform config. -+ * -+ * @return Pointer to the platform config -+ */ -+struct kbase_platform_config *kbase_get_platform_config(void); ++ session = mali_pp_job_get_session(job); ++ MALI_DEBUG_ASSERT_POINTER(session); + -+/** -+ * kbasep_platform_device_init: - Platform specific call to initialize hardware -+ * @kbdev: kbase device pointer -+ * -+ * Function calls a platform defined routine if specified in the configuration -+ * attributes. The routine can initialize any hardware and context state that -+ * is required for the GPU block to function. -+ * -+ * Return: 0 if no errors have been found in the config. -+ * Negative error code otherwise. -+ */ -+int kbasep_platform_device_init(struct kbase_device *kbdev); ++ if (unlikely(session->is_aborting)) { ++ MALI_DEBUG_PRINT(2, ("Mali PP scheduler: Job %u (0x%08X) queued while session is aborting.\n", ++ mali_pp_job_get_id(job), job)); ++ return MALI_FALSE; /* job not queued */ ++ } else if (unlikely(MALI_SWAP_IN_FAIL == job->swap_status)) { ++ MALI_DEBUG_PRINT(2, ("Mali PP scheduler: Job %u (0x%08X) queued while swap in failed.\n", ++ mali_pp_job_get_id(job), job)); ++ return MALI_FALSE; ++ } + -+/** -+ * kbasep_platform_device_term - Platform specific call to terminate hardware -+ * @kbdev: Kbase device pointer -+ * -+ * Function calls a platform defined routine if specified in the configuration -+ * attributes. The routine can destroy any platform specific context state and -+ * shut down any hardware functionality that are outside of the Power Management -+ * callbacks. -+ * -+ */ -+void kbasep_platform_device_term(struct kbase_device *kbdev); ++ mali_pp_job_set_cache_order(job, mali_scheduler_get_new_cache_order()); + ++ if (session->use_high_priority_job_queue) { ++ queue = &job_queue_pp.high_pri; ++ } else { ++ queue = &job_queue_pp.normal_pri; ++ } + -+/** -+ * kbase_platform_early_init - Early initialisation of the platform code -+ * -+ * This function will be called when the module is loaded to perform any -+ * early initialisation required by the platform code. Such as reading -+ * platform specific device tree entries for the GPU. -+ * -+ * Return: 0 for success, any other fail causes module initialisation to fail -+ */ -+int kbase_platform_early_init(void); ++ job_queue_pp.depth += ++ mali_pp_job_get_sub_job_count(job); + -+#ifndef CONFIG_OF -+/** -+ * kbase_platform_register - Register a platform device for the GPU -+ * -+ * This can be used to register a platform device on systems where device tree -+ * is not enabled and the platform initialisation code in the kernel doesn't -+ * create the GPU device. Where possible device tree should be used instead. -+ * -+ * Return: 0 for success, any other fail causes module initialisation to fail -+ */ -+int kbase_platform_register(void); ++ /* Add job to queue (mali_gp_job_queue_add find correct place). */ ++ mali_pp_job_list_add(job, queue); + -+/** -+ * kbase_platform_unregister - Unregister a fake platform device -+ * -+ * Unregister the platform device created with kbase_platform_register() -+ */ -+void kbase_platform_unregister(void); ++ /* ++ * We hold a PM reference for every job we hold queued (and running) ++ * It is important that we take this reference after job has been ++ * added the the queue so that any runtime resume could schedule this ++ * job right there and then. ++ */ ++ _mali_osk_pm_dev_ref_get_async(); ++ ++ if (mali_utilization_enabled()) { ++ /* ++ * We cheat a little bit by counting the PP as busy from the ++ * time a PP job is queued. This will be fine because we only ++ * loose the tiny idle gap between jobs, but we will instead ++ * get less utilization work to do (less locks taken) ++ */ ++ mali_utilization_pp_start(); ++ } ++ ++ mali_pm_record_gpu_active(MALI_FALSE); ++ ++ /* Add profiling events for job enqueued */ ++ _mali_osk_profiling_add_event( ++ MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_PP_ENQUEUE, ++ mali_pp_job_get_pid(job), ++ mali_pp_job_get_tid(job), ++ mali_pp_job_get_frame_builder_id(job), ++ mali_pp_job_get_flush_id(job), ++ 0); ++ ++#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) ++ trace_gpu_job_enqueue(mali_pp_job_get_tid(job), ++ mali_pp_job_get_id(job), "PP"); +#endif + -+ /** @} *//* end group kbase_config */ -+ /** @} *//* end group base_kbase_api */ -+ /** @} *//* end group base_api */ ++ MALI_DEBUG_PRINT(3, ("Mali PP scheduler: %s job %u (0x%08X) with %u parts queued.\n", ++ mali_pp_job_is_virtual(job) ++ ? "Virtual" : "Physical", ++ mali_pp_job_get_id(job), job, ++ mali_pp_job_get_sub_job_count(job))); + -+#endif /* _KBASE_CONFIG_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config_defaults.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config_defaults.h -new file mode 100755 -index 000000000000..69079e7d9680 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config_defaults.h -@@ -0,0 +1,226 @@ -+/* -+ * -+ * (C) COPYRIGHT 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ return MALI_TRUE; /* job queued */ ++} + ++static void mali_scheduler_return_gp_job_to_user(struct mali_gp_job *job, ++ mali_bool success) ++{ ++ _mali_uk_gp_job_finished_s *jobres; ++ struct mali_session_data *session; ++ _mali_osk_notification_t *notification; + ++ MALI_DEBUG_ASSERT_POINTER(job); + -+/** -+ * @file mali_kbase_config_defaults.h -+ * -+ * Default values for configuration settings -+ * -+ */ ++ session = mali_gp_job_get_session(job); ++ MALI_DEBUG_ASSERT_POINTER(session); + -+#ifndef _KBASE_CONFIG_DEFAULTS_H_ -+#define _KBASE_CONFIG_DEFAULTS_H_ ++ notification = mali_gp_job_get_finished_notification(job); ++ MALI_DEBUG_ASSERT_POINTER(notification); + -+/* Include mandatory definitions per platform */ -+#include ++ jobres = notification->result_buffer; ++ MALI_DEBUG_ASSERT_POINTER(jobres); + -+/** -+* Boolean indicating whether the driver is configured to be secure at -+* a potential loss of performance. -+* -+* This currently affects only r0p0-15dev0 HW and earlier. -+* -+* On r0p0-15dev0 HW and earlier, there are tradeoffs between security and -+* performance: -+* -+* - When this is set to true, the driver remains fully secure, -+* but potentially loses performance compared with setting this to -+* false. -+* - When set to false, the driver is open to certain security -+* attacks. -+* -+* From r0p0-00rel0 and onwards, there is no security loss by setting -+* this to false, and no performance loss by setting it to -+* true. -+*/ -+#define DEFAULT_SECURE_BUT_LOSS_OF_PERFORMANCE false ++ jobres->pending_big_job_num = mali_scheduler_job_gp_big_job_count(); + -+enum { -+ /** -+ * Use unrestricted Address ID width on the AXI bus. -+ */ -+ KBASE_AID_32 = 0x0, ++ jobres->user_job_ptr = mali_gp_job_get_user_id(job); ++ if (MALI_TRUE == success) { ++ jobres->status = _MALI_UK_JOB_STATUS_END_SUCCESS; ++ } else { ++ jobres->status = _MALI_UK_JOB_STATUS_END_UNKNOWN_ERR; ++ } ++ jobres->heap_current_addr = mali_gp_job_get_current_heap_addr(job); ++ jobres->perf_counter0 = mali_gp_job_get_perf_counter_value0(job); ++ jobres->perf_counter1 = mali_gp_job_get_perf_counter_value1(job); + -+ /** -+ * Restrict GPU to a half of maximum Address ID count. -+ * This will reduce performance, but reduce bus load due to GPU. -+ */ -+ KBASE_AID_16 = 0x3, ++ mali_session_send_notification(session, notification); ++} + -+ /** -+ * Restrict GPU to a quarter of maximum Address ID count. -+ * This will reduce performance, but reduce bus load due to GPU. -+ */ -+ KBASE_AID_8 = 0x2, ++void mali_scheduler_return_pp_job_to_user(struct mali_pp_job *job, ++ u32 num_cores_in_virtual) ++{ ++ u32 i; ++ u32 num_counters_to_copy; ++ _mali_uk_pp_job_finished_s *jobres; ++ struct mali_session_data *session; ++ _mali_osk_notification_t *notification; + -+ /** -+ * Restrict GPU to an eighth of maximum Address ID count. -+ * This will reduce performance, but reduce bus load due to GPU. -+ */ -+ KBASE_AID_4 = 0x1 -+}; ++ if (MALI_TRUE == mali_pp_job_use_no_notification(job)) { ++ return; ++ } + -+/** -+ * Default setting for read Address ID limiting on AXI bus. -+ * -+ * Attached value: u32 register value -+ * KBASE_AID_32 - use the full 32 IDs (5 ID bits) -+ * KBASE_AID_16 - use 16 IDs (4 ID bits) -+ * KBASE_AID_8 - use 8 IDs (3 ID bits) -+ * KBASE_AID_4 - use 4 IDs (2 ID bits) -+ * Default value: KBASE_AID_32 (no limit). Note hardware implementation -+ * may limit to a lower value. -+ */ -+#define DEFAULT_ARID_LIMIT KBASE_AID_32 ++ MALI_DEBUG_ASSERT_POINTER(job); + -+/** -+ * Default setting for write Address ID limiting on AXI. -+ * -+ * Attached value: u32 register value -+ * KBASE_AID_32 - use the full 32 IDs (5 ID bits) -+ * KBASE_AID_16 - use 16 IDs (4 ID bits) -+ * KBASE_AID_8 - use 8 IDs (3 ID bits) -+ * KBASE_AID_4 - use 4 IDs (2 ID bits) -+ * Default value: KBASE_AID_32 (no limit). Note hardware implementation -+ * may limit to a lower value. -+ */ -+#define DEFAULT_AWID_LIMIT KBASE_AID_32 ++ session = mali_pp_job_get_session(job); ++ MALI_DEBUG_ASSERT_POINTER(session); + -+/** -+ * Default UMP device mapping. A UMP_DEVICE__SHIFT value which -+ * defines which UMP device this GPU should be mapped to. -+ */ -+#define DEFAULT_UMP_GPU_DEVICE_SHIFT UMP_DEVICE_Z_SHIFT ++ notification = mali_pp_job_get_finished_notification(job); ++ MALI_DEBUG_ASSERT_POINTER(notification); + -+/* -+ * Default period for DVFS sampling -+ */ -+#define DEFAULT_PM_DVFS_PERIOD 100 /* 100ms */ ++ jobres = notification->result_buffer; ++ MALI_DEBUG_ASSERT_POINTER(jobres); + -+/* -+ * Power Management poweroff tick granuality. This is in nanoseconds to -+ * allow HR timer support. -+ * -+ * On each scheduling tick, the power manager core may decide to: -+ * -# Power off one or more shader cores -+ * -# Power off the entire GPU -+ */ -+#define DEFAULT_PM_GPU_POWEROFF_TICK_NS (400000) /* 400us */ ++ jobres->user_job_ptr = mali_pp_job_get_user_id(job); ++ if (MALI_TRUE == mali_pp_job_was_success(job)) { ++ jobres->status = _MALI_UK_JOB_STATUS_END_SUCCESS; ++ } else { ++ jobres->status = _MALI_UK_JOB_STATUS_END_UNKNOWN_ERR; ++ } + -+/* -+ * Power Manager number of ticks before shader cores are powered off -+ */ -+#define DEFAULT_PM_POWEROFF_TICK_SHADER (2) /* 400-800us */ ++ if (mali_pp_job_is_virtual(job)) { ++ num_counters_to_copy = num_cores_in_virtual; ++ } else { ++ num_counters_to_copy = mali_pp_job_get_sub_job_count(job); ++ } + -+/* -+ * Power Manager number of ticks before GPU is powered off -+ */ -+#define DEFAULT_PM_POWEROFF_TICK_GPU (2) /* 400-800us */ ++ for (i = 0; i < num_counters_to_copy; i++) { ++ jobres->perf_counter0[i] = ++ mali_pp_job_get_perf_counter_value0(job, i); ++ jobres->perf_counter1[i] = ++ mali_pp_job_get_perf_counter_value1(job, i); ++ jobres->perf_counter_src0 = ++ mali_pp_job_get_pp_counter_global_src0(); ++ jobres->perf_counter_src1 = ++ mali_pp_job_get_pp_counter_global_src1(); ++ } + -+/* -+ * Default scheduling tick granuality -+ */ -+#define DEFAULT_JS_SCHEDULING_PERIOD_NS (100000000u) /* 100ms */ ++ mali_session_send_notification(session, notification); ++} + -+/* -+ * Default minimum number of scheduling ticks before jobs are soft-stopped. -+ * -+ * This defines the time-slice for a job (which may be different from that of a -+ * context) -+ */ -+#define DEFAULT_JS_SOFT_STOP_TICKS (1) /* 100ms-200ms */ ++static void mali_scheduler_deferred_pp_job_delete(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); + -+/* -+ * Default minimum number of scheduling ticks before CL jobs are soft-stopped. -+ */ -+#define DEFAULT_JS_SOFT_STOP_TICKS_CL (1) /* 100ms-200ms */ ++ _mali_osk_spinlock_irq_lock(scheduler_pp_job_delete_lock); ++ mali_pp_job_list_addtail(job, &scheduler_pp_job_deletion_queue); ++ _mali_osk_spinlock_irq_unlock(scheduler_pp_job_delete_lock); + -+/* -+ * Default minimum number of scheduling ticks before jobs are hard-stopped -+ */ -+#define DEFAULT_JS_HARD_STOP_TICKS_SS (50) /* 5s */ -+#define DEFAULT_JS_HARD_STOP_TICKS_SS_8408 (300) /* 30s */ ++ _mali_osk_wq_schedule_work(scheduler_wq_pp_job_delete); ++} + -+/* -+ * Default minimum number of scheduling ticks before CL jobs are hard-stopped. -+ */ -+#define DEFAULT_JS_HARD_STOP_TICKS_CL (50) /* 5s */ ++void mali_scheduler_do_pp_job_delete(void *arg) ++{ ++ _MALI_OSK_LIST_HEAD_STATIC_INIT(list); ++ struct mali_pp_job *job; ++ struct mali_pp_job *tmp; + -+/* -+ * Default minimum number of scheduling ticks before jobs are hard-stopped -+ * during dumping -+ */ -+#define DEFAULT_JS_HARD_STOP_TICKS_DUMPING (15000) /* 1500s */ ++ MALI_IGNORE(arg); + -+/* -+ * Default timeout for some software jobs, after which the software event wait -+ * jobs will be cancelled. -+ */ -+#define DEFAULT_JS_SOFT_JOB_TIMEOUT (3000) /* 3s */ ++ /* ++ * Quickly "unhook" the jobs pending to be deleted, so we can release ++ * the lock before we start deleting the job objects ++ * (without any locks held) ++ */ ++ _mali_osk_spinlock_irq_lock(scheduler_pp_job_delete_lock); ++ _mali_osk_list_move_list(&scheduler_pp_job_deletion_queue, &list); ++ _mali_osk_spinlock_irq_unlock(scheduler_pp_job_delete_lock); + -+/* -+ * Default minimum number of scheduling ticks before the GPU is reset to clear a -+ * "stuck" job -+ */ -+#define DEFAULT_JS_RESET_TICKS_SS (55) /* 5.5s */ -+#define DEFAULT_JS_RESET_TICKS_SS_8408 (450) /* 45s */ ++ _MALI_OSK_LIST_FOREACHENTRY(job, tmp, &list, ++ struct mali_pp_job, list) { ++ _mali_osk_list_delinit(&job->list); + -+/* -+ * Default minimum number of scheduling ticks before the GPU is reset to clear a -+ * "stuck" CL job. -+ */ -+#define DEFAULT_JS_RESET_TICKS_CL (55) /* 5.5s */ ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++ mali_dma_fence_context_term(&job->dma_fence_context); ++#endif + -+/* -+ * Default minimum number of scheduling ticks before the GPU is reset to clear a -+ * "stuck" job during dumping. -+ */ -+#define DEFAULT_JS_RESET_TICKS_DUMPING (15020) /* 1502s */ ++ mali_pp_job_delete(job); /* delete the job object itself */ ++ } ++} + -+/* -+ * Default number of milliseconds given for other jobs on the GPU to be -+ * soft-stopped when the GPU needs to be reset. -+ */ -+#define DEFAULT_RESET_TIMEOUT_MS (3000) /* 3s */ ++#if defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) + -+/* -+ * Default timeslice that a context is scheduled in for, in nanoseconds. -+ * -+ * When a context has used up this amount of time across its jobs, it is -+ * scheduled out to let another run. -+ * -+ * @note the resolution is nanoseconds (ns) here, because that's the format -+ * often used by the OS. -+ */ -+#define DEFAULT_JS_CTX_TIMESLICE_NS (50000000) /* 50ms */ ++static void mali_scheduler_deferred_pp_job_queue(struct mali_pp_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); + -+/* -+ * Perform GPU power down using only platform specific code, skipping DDK power -+ * management. -+ * -+ * If this is non-zero then kbase will avoid powering down shader cores, the -+ * tiler, and the L2 cache, instead just powering down the entire GPU through -+ * platform specific code. This may be required for certain platform -+ * integrations. -+ * -+ * Note that as this prevents kbase from powering down shader cores, this limits -+ * the available power policies to coarse_demand and always_on. -+ */ -+#define PLATFORM_POWER_DOWN_ONLY (0) ++ _mali_osk_spinlock_irq_lock(scheduler_pp_job_queue_lock); ++ mali_pp_job_list_addtail(job, &scheduler_pp_job_queue_list); ++ _mali_osk_spinlock_irq_unlock(scheduler_pp_job_queue_lock); + -+#endif /* _KBASE_CONFIG_DEFAULTS_H_ */ ++ _mali_osk_wq_schedule_work(scheduler_wq_pp_job_queue); ++} + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_context.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_context.c -new file mode 100755 -index 000000000000..7a09aa26128e ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_context.c -@@ -0,0 +1,362 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++static void mali_scheduler_do_pp_job_queue(void *arg) ++{ ++ _MALI_OSK_LIST_HEAD_STATIC_INIT(list); ++ struct mali_pp_job *job; ++ struct mali_pp_job *tmp; ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; + ++ MALI_IGNORE(arg); + ++ /* ++ * Quickly "unhook" the jobs pending to be queued, so we can release ++ * the lock before we start queueing the job objects ++ * (without any locks held) ++ */ ++ _mali_osk_spinlock_irq_lock(scheduler_pp_job_queue_lock); ++ _mali_osk_list_move_list(&scheduler_pp_job_queue_list, &list); ++ _mali_osk_spinlock_irq_unlock(scheduler_pp_job_queue_lock); + ++ /* First loop through all jobs and do the pre-work (no locks needed) */ ++ _MALI_OSK_LIST_FOREACHENTRY(job, tmp, &list, ++ struct mali_pp_job, list) { ++ if (mali_pp_job_needs_dma_buf_mapping(job)) { ++ /* ++ * This operation could fail, but we continue anyway, ++ * because the worst that could happen is that this ++ * job will fail due to a Mali page fault. ++ */ ++ mali_dma_buf_map_job(job); ++ } ++ } + ++ mali_scheduler_lock(); + -+/* -+ * Base kernel context APIs -+ */ ++ /* Then loop through all jobs again to queue them (lock needed) */ ++ _MALI_OSK_LIST_FOREACHENTRY(job, tmp, &list, ++ struct mali_pp_job, list) { + -+#include -+#include -+#include -+#include -+#include ++ /* Remove from scheduler_pp_job_queue_list before queueing */ ++ mali_pp_job_list_remove(job); + -+/** -+ * kbase_create_context() - Create a kernel base context. -+ * @kbdev: Kbase device -+ * @is_compat: Force creation of a 32-bit context -+ * -+ * Allocate and init a kernel base context. -+ * -+ * Return: new kbase context -+ */ -+struct kbase_context * -+kbase_create_context(struct kbase_device *kbdev, bool is_compat) -+{ -+ struct kbase_context *kctx; -+ int err; -+ struct page *p; ++ if (mali_scheduler_queue_pp_job(job)) { ++ /* Job queued successfully */ ++ schedule_mask |= MALI_SCHEDULER_MASK_PP; ++ } else { ++ /* Failed to enqueue job, release job (with error) */ ++ mali_pp_job_fb_lookup_remove(job); ++ mali_pp_job_mark_unstarted_failed(job); + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ /* unlock scheduler in this uncommon case */ ++ mali_scheduler_unlock(); + -+ /* zero-inited as lot of code assume it's zero'ed out on create */ -+ kctx = vzalloc(sizeof(*kctx)); ++ schedule_mask |= mali_timeline_tracker_release( ++ mali_pp_job_get_tracker(job)); + -+ if (!kctx) -+ goto out; ++ /* Notify user space and close the job object */ ++ mali_scheduler_complete_pp_job(job, 0, MALI_TRUE, ++ MALI_FALSE); + -+ /* creating a context is considered a disjoint event */ -+ kbase_disjoint_event(kbdev); ++ mali_scheduler_lock(); ++ } ++ } + -+ kctx->kbdev = kbdev; -+ kctx->as_nr = KBASEP_AS_NR_INVALID; -+ atomic_set(&kctx->refcount, 0); -+ if (is_compat) -+ kbase_ctx_flag_set(kctx, KCTX_COMPAT); -+#ifdef CONFIG_MALI_BIFROST_TRACE_TIMELINE -+ kctx->timeline.owner_tgid = task_tgid_nr(current); -+#endif -+ atomic_set(&kctx->setup_complete, 0); -+ atomic_set(&kctx->setup_in_progress, 0); -+ spin_lock_init(&kctx->mm_update_lock); -+ kctx->process_mm = NULL; -+ atomic_set(&kctx->nonmapped_pages, 0); -+ kctx->slots_pullable = 0; -+ kctx->tgid = current->tgid; -+ kctx->pid = current->pid; ++ mali_scheduler_unlock(); + -+ err = kbase_mem_pool_init(&kctx->mem_pool, -+ kbdev->mem_pool_max_size_default, -+ KBASE_MEM_POOL_4KB_PAGE_TABLE_ORDER, -+ kctx->kbdev, -+ &kbdev->mem_pool); -+ if (err) -+ goto free_kctx; ++ /* Trigger scheduling of jobs */ ++ mali_executor_schedule_from_mask(schedule_mask, MALI_FALSE); ++} + -+ err = kbase_mem_pool_init(&kctx->lp_mem_pool, -+ (kbdev->mem_pool_max_size_default >> 9), -+ KBASE_MEM_POOL_2MB_PAGE_TABLE_ORDER, -+ kctx->kbdev, -+ &kbdev->lp_mem_pool); -+ if (err) -+ goto free_mem_pool; ++#endif /* defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) */ + -+ err = kbase_mem_evictable_init(kctx); -+ if (err) -+ goto free_both_pools; ++void mali_scheduler_gp_pp_job_queue_print(void) ++{ ++ struct mali_gp_job *gp_job = NULL; ++ struct mali_gp_job *tmp_gp_job = NULL; ++ struct mali_pp_job *pp_job = NULL; ++ struct mali_pp_job *tmp_pp_job = NULL; + -+ atomic_set(&kctx->used_pages, 0); ++ MALI_DEBUG_ASSERT_LOCK_HELD(mali_scheduler_lock_obj); ++ MALI_DEBUG_ASSERT_LOCK_HELD(mali_executor_lock_obj); + -+ err = kbase_jd_init(kctx); -+ if (err) -+ goto deinit_evictable; ++ /* dump job queup status */ ++ if ((0 == job_queue_gp.depth) && (0 == job_queue_pp.depth)) { ++ MALI_PRINT(("No GP&PP job in the job queue.\n")); ++ return; ++ } + -+ err = kbasep_js_kctx_init(kctx); -+ if (err) -+ goto free_jd; /* safe to call kbasep_js_kctx_term in this case */ ++ MALI_PRINT(("Total (%d) GP job in the job queue.\n", job_queue_gp.depth)); ++ if (job_queue_gp.depth > 0) { ++ if (!_mali_osk_list_empty(&job_queue_gp.high_pri)) { ++ _MALI_OSK_LIST_FOREACHENTRY(gp_job, tmp_gp_job, &job_queue_gp.high_pri, ++ struct mali_gp_job, list) { ++ MALI_PRINT(("GP job(%p) id = %d tid = %d pid = %d in the gp job high_pri queue\n", gp_job, gp_job->id, gp_job->tid, gp_job->pid)); ++ } ++ } + -+ err = kbase_event_init(kctx); -+ if (err) -+ goto free_jd; ++ if (!_mali_osk_list_empty(&job_queue_gp.normal_pri)) { ++ _MALI_OSK_LIST_FOREACHENTRY(gp_job, tmp_gp_job, &job_queue_gp.normal_pri, ++ struct mali_gp_job, list) { ++ MALI_PRINT(("GP job(%p) id = %d tid = %d pid = %d in the gp job normal_pri queue\n", gp_job, gp_job->id, gp_job->tid, gp_job->pid)); ++ } ++ } ++ } + -+ atomic_set(&kctx->drain_pending, 0); ++ MALI_PRINT(("Total (%d) PP job in the job queue.\n", job_queue_pp.depth)); ++ if (job_queue_pp.depth > 0) { ++ if (!_mali_osk_list_empty(&job_queue_pp.high_pri)) { ++ _MALI_OSK_LIST_FOREACHENTRY(pp_job, tmp_pp_job, &job_queue_pp.high_pri, ++ struct mali_pp_job, list) { ++ if (mali_pp_job_is_virtual(pp_job)) { ++ MALI_PRINT(("PP Virtual job(%p) id = %d tid = %d pid = %d in the pp job high_pri queue\n", pp_job, pp_job->id, pp_job->tid, pp_job->pid)); ++ } else { ++ MALI_PRINT(("PP Physical job(%p) id = %d tid = %d pid = %d in the pp job high_pri queue\n", pp_job, pp_job->id, pp_job->tid, pp_job->pid)); ++ } ++ } ++ } + -+ mutex_init(&kctx->reg_lock); ++ if (!_mali_osk_list_empty(&job_queue_pp.normal_pri)) { ++ _MALI_OSK_LIST_FOREACHENTRY(pp_job, tmp_pp_job, &job_queue_pp.normal_pri, ++ struct mali_pp_job, list) { ++ if (mali_pp_job_is_virtual(pp_job)) { ++ MALI_PRINT(("PP Virtual job(%p) id = %d tid = %d pid = %d in the pp job normal_pri queue\n", pp_job, pp_job->id, pp_job->tid, pp_job->pid)); ++ } else { ++ MALI_PRINT(("PP Physical job(%p) id = %d tid = %d pid = %d in the pp job normal_pri queue\n", pp_job, pp_job->id, pp_job->tid, pp_job->pid)); ++ } ++ } ++ } ++ } + -+ mutex_init(&kctx->mem_partials_lock); -+ INIT_LIST_HEAD(&kctx->mem_partials); ++ /* dump group running job status */ ++ mali_executor_running_status_print(); ++} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h +new file mode 100755 +index 000000000..de81a421e +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h +@@ -0,0 +1,131 @@ ++/* ++ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ INIT_LIST_HEAD(&kctx->waiting_soft_jobs); -+ spin_lock_init(&kctx->waiting_soft_jobs_lock); -+#ifdef CONFIG_KDS -+ INIT_LIST_HEAD(&kctx->waiting_kds_resource); -+#endif -+ err = kbase_dma_fence_init(kctx); -+ if (err) -+ goto free_event; ++#ifndef __MALI_SCHEDULER_H__ ++#define __MALI_SCHEDULER_H__ + -+ err = kbase_mmu_init(kctx); -+ if (err) -+ goto term_dma_fence; ++#include "mali_osk.h" ++#include "mali_osk_list.h" ++#include "mali_scheduler_types.h" ++#include "mali_session.h" + -+ do { -+ err = kbase_mem_pool_grow(&kctx->mem_pool, -+ MIDGARD_MMU_BOTTOMLEVEL); -+ if (err) -+ goto pgd_no_mem; ++struct mali_scheduler_job_queue { ++ _MALI_OSK_LIST_HEAD(normal_pri); /* Queued jobs with normal priority */ ++ _MALI_OSK_LIST_HEAD(high_pri); /* Queued jobs with high priority */ ++ u32 depth; /* Depth of combined queues. */ ++ u32 big_job_num; ++}; + -+ mutex_lock(&kctx->mmu_lock); -+ kctx->pgd = kbase_mmu_alloc_pgd(kctx); -+ mutex_unlock(&kctx->mmu_lock); -+ } while (!kctx->pgd); ++extern _mali_osk_spinlock_irq_t *mali_scheduler_lock_obj; + -+ p = kbase_mem_alloc_page(&kctx->mem_pool); -+ if (!p) -+ goto no_sink_page; -+ kctx->aliasing_sink_page = as_tagged(page_to_phys(p)); ++/* Queue of jobs to be executed on the GP group */ ++extern struct mali_scheduler_job_queue job_queue_gp; + -+ init_waitqueue_head(&kctx->event_queue); ++/* Queue of PP jobs */ ++extern struct mali_scheduler_job_queue job_queue_pp; + -+ kctx->cookies = KBASE_COOKIE_MASK; ++extern _mali_osk_atomic_t mali_job_id_autonumber; ++extern _mali_osk_atomic_t mali_job_cache_order_autonumber; + -+ /* Make sure page 0 is not used... */ -+ err = kbase_region_tracker_init(kctx); -+ if (err) -+ goto no_region_tracker; ++#define MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD() MALI_DEBUG_ASSERT_LOCK_HELD(mali_scheduler_lock_obj); + -+ err = kbase_sticky_resource_init(kctx); -+ if (err) -+ goto no_sticky; ++_mali_osk_errcode_t mali_scheduler_initialize(void); ++void mali_scheduler_terminate(void); + -+ err = kbase_jit_init(kctx); -+ if (err) -+ goto no_jit; -+#ifdef CONFIG_GPU_TRACEPOINTS -+ atomic_set(&kctx->jctx.work_id, 0); -+#endif -+#ifdef CONFIG_MALI_BIFROST_TRACE_TIMELINE -+ atomic_set(&kctx->timeline.jd_atoms_in_flight, 0); -+#endif ++MALI_STATIC_INLINE void mali_scheduler_lock(void) ++{ ++ _mali_osk_spinlock_irq_lock(mali_scheduler_lock_obj); ++ MALI_DEBUG_PRINT(5, ("Mali scheduler: scheduler lock taken.\n")); ++} + -+ kctx->id = atomic_add_return(1, &(kbdev->ctx_num)) - 1; ++MALI_STATIC_INLINE void mali_scheduler_unlock(void) ++{ ++ MALI_DEBUG_PRINT(5, ("Mali scheduler: Releasing scheduler lock.\n")); ++ _mali_osk_spinlock_irq_unlock(mali_scheduler_lock_obj); ++} + -+ mutex_init(&kctx->vinstr_cli_lock); ++MALI_STATIC_INLINE u32 mali_scheduler_job_gp_count(void) ++{ ++ return job_queue_gp.depth; ++} ++MALI_STATIC_INLINE u32 mali_scheduler_job_gp_big_job_count(void) ++{ ++ return job_queue_gp.big_job_num; ++} + -+ timer_setup(&kctx->soft_job_timeout, -+ kbasep_soft_job_timeout_worker, -+ 0); ++u32 mali_scheduler_job_physical_head_count(mali_bool gpu_mode_is_secure); + -+ return kctx; ++mali_bool mali_scheduler_job_next_is_virtual(void); ++struct mali_pp_job *mali_scheduler_job_pp_next(void); + -+no_jit: -+ kbase_gpu_vm_lock(kctx); -+ kbase_sticky_resource_term(kctx); -+ kbase_gpu_vm_unlock(kctx); -+no_sticky: -+ kbase_region_tracker_term(kctx); -+no_region_tracker: -+ kbase_mem_pool_free(&kctx->mem_pool, p, false); -+no_sink_page: -+ /* VM lock needed for the call to kbase_mmu_free_pgd */ -+ kbase_gpu_vm_lock(kctx); -+ kbase_mmu_free_pgd(kctx); -+ kbase_gpu_vm_unlock(kctx); -+pgd_no_mem: -+ kbase_mmu_term(kctx); -+term_dma_fence: -+ kbase_dma_fence_term(kctx); -+free_event: -+ kbase_event_cleanup(kctx); -+free_jd: -+ /* Safe to call this one even when didn't initialize (assuming kctx was sufficiently zeroed) */ -+ kbasep_js_kctx_term(kctx); -+ kbase_jd_exit(kctx); -+deinit_evictable: -+ kbase_mem_evictable_deinit(kctx); -+free_both_pools: -+ kbase_mem_pool_term(&kctx->lp_mem_pool); -+free_mem_pool: -+ kbase_mem_pool_term(&kctx->mem_pool); -+free_kctx: -+ vfree(kctx); -+out: -+ return NULL; ++struct mali_gp_job *mali_scheduler_job_gp_get(void); ++struct mali_pp_job *mali_scheduler_job_pp_physical_peek(void); ++struct mali_pp_job *mali_scheduler_job_pp_virtual_peek(void); ++struct mali_pp_job *mali_scheduler_job_pp_physical_get(u32 *sub_job); ++struct mali_pp_job *mali_scheduler_job_pp_virtual_get(void); ++ ++MALI_STATIC_INLINE u32 mali_scheduler_get_new_id(void) ++{ ++ return _mali_osk_atomic_inc_return(&mali_job_id_autonumber); +} -+KBASE_EXPORT_SYMBOL(kbase_create_context); + -+static void kbase_reg_pending_dtor(struct kbase_va_region *reg) ++MALI_STATIC_INLINE u32 mali_scheduler_get_new_cache_order(void) +{ -+ dev_dbg(reg->kctx->kbdev->dev, "Freeing pending unmapped region\n"); -+ kbase_mem_phy_alloc_put(reg->cpu_alloc); -+ kbase_mem_phy_alloc_put(reg->gpu_alloc); -+ kfree(reg); ++ return _mali_osk_atomic_inc_return(&mali_job_cache_order_autonumber); +} + +/** -+ * kbase_destroy_context - Destroy a kernel base context. -+ * @kctx: Context to destroy ++ * @brief Used by the Timeline system to queue a GP job. + * -+ * Calls kbase_destroy_os_context() to free OS specific structures. -+ * Will release all outstanding regions. ++ * @note @ref mali_executor_schedule_from_mask() should be called if this ++ * function returns non-zero. ++ * ++ * @param job The GP job that is being activated. ++ * ++ * @return A scheduling bitmask that can be used to decide if scheduling is ++ * necessary after this call. + */ -+void kbase_destroy_context(struct kbase_context *kctx) -+{ -+ struct kbase_device *kbdev; -+ int pages; -+ unsigned long pending_regions_to_clean; -+ unsigned long flags; -+ struct page *p; ++mali_scheduler_mask mali_scheduler_activate_gp_job(struct mali_gp_job *job); + -+ KBASE_DEBUG_ASSERT(NULL != kctx); ++/** ++ * @brief Used by the Timeline system to queue a PP job. ++ * ++ * @note @ref mali_executor_schedule_from_mask() should be called if this ++ * function returns non-zero. ++ * ++ * @param job The PP job that is being activated. ++ * ++ * @return A scheduling bitmask that can be used to decide if scheduling is ++ * necessary after this call. ++ */ ++mali_scheduler_mask mali_scheduler_activate_pp_job(struct mali_pp_job *job); + -+ kbdev = kctx->kbdev; -+ KBASE_DEBUG_ASSERT(NULL != kbdev); ++void mali_scheduler_complete_gp_job(struct mali_gp_job *job, ++ mali_bool success, ++ mali_bool user_notification, ++ mali_bool dequeued); + -+ KBASE_TRACE_ADD(kbdev, CORE_CTX_DESTROY, kctx, NULL, 0u, 0u); ++void mali_scheduler_complete_pp_job(struct mali_pp_job *job, ++ u32 num_cores_in_virtual, ++ mali_bool user_notification, ++ mali_bool dequeued); + -+ /* Ensure the core is powered up for the destroy process */ -+ /* A suspend won't happen here, because we're in a syscall from a userspace -+ * thread. */ -+ kbase_pm_context_active(kbdev); ++void mali_scheduler_abort_session(struct mali_session_data *session); + -+ kbase_jd_zap_context(kctx); ++void mali_scheduler_return_pp_job_to_user(struct mali_pp_job *job, ++ u32 num_cores_in_virtual); + -+#ifdef CONFIG_DEBUG_FS -+ /* Removing the rest of the debugfs entries here as we want to keep the -+ * atom debugfs interface alive until all atoms have completed. This -+ * is useful for debugging hung contexts. */ -+ debugfs_remove_recursive(kctx->kctx_dentry); ++#if MALI_STATE_TRACKING ++u32 mali_scheduler_dump_state(char *buf, u32 size); +#endif + -+ kbase_event_cleanup(kctx); ++void mali_scheduler_gp_pp_job_queue_print(void); + -+ /* -+ * JIT must be terminated before the code below as it must be called -+ * without the region lock being held. -+ * The code above ensures no new JIT allocations can be made by -+ * by the time we get to this point of context tear down. -+ */ -+ kbase_jit_term(kctx); ++#endif /* __MALI_SCHEDULER_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h b/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h +new file mode 100755 +index 000000000..ba1d71d01 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h +@@ -0,0 +1,29 @@ ++/* ++ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ kbase_gpu_vm_lock(kctx); ++#ifndef __MALI_SCHEDULER_TYPES_H__ ++#define __MALI_SCHEDULER_TYPES_H__ + -+ kbase_sticky_resource_term(kctx); ++#include "mali_osk.h" + -+ /* MMU is disabled as part of scheduling out the context */ -+ kbase_mmu_free_pgd(kctx); ++#define MALI_SCHEDULER_JOB_ID_SPAN 65535 + -+ /* drop the aliasing sink page now that it can't be mapped anymore */ -+ p = phys_to_page(as_phys_addr_t(kctx->aliasing_sink_page)); -+ kbase_mem_pool_free(&kctx->mem_pool, p, false); ++/** ++ * Bitmask used for defered scheduling of subsystems. ++ */ ++typedef u32 mali_scheduler_mask; + -+ /* free pending region setups */ -+ pending_regions_to_clean = (~kctx->cookies) & KBASE_COOKIE_MASK; -+ while (pending_regions_to_clean) { -+ unsigned int cookie = __ffs(pending_regions_to_clean); ++#define MALI_SCHEDULER_MASK_GP (1<<0) ++#define MALI_SCHEDULER_MASK_PP (1<<1) + -+ BUG_ON(!kctx->pending_regions[cookie]); ++#define MALI_SCHEDULER_MASK_EMPTY 0 ++#define MALI_SCHEDULER_MASK_ALL (MALI_SCHEDULER_MASK_GP | MALI_SCHEDULER_MASK_PP) + -+ kbase_reg_pending_dtor(kctx->pending_regions[cookie]); ++#endif /* __MALI_SCHEDULER_TYPES_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_session.c b/drivers/gpu/arm/mali400/mali/common/mali_session.c +new file mode 100755 +index 000000000..7504fb108 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_session.c +@@ -0,0 +1,155 @@ ++/* ++ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ kctx->pending_regions[cookie] = NULL; -+ pending_regions_to_clean &= ~(1UL << cookie); -+ } ++#include "mali_osk.h" ++#include "mali_osk_list.h" ++#include "mali_session.h" ++#include "mali_ukk.h" ++#ifdef MALI_MEM_SWAP_TRACKING ++#include "mali_memory_swap_alloc.h" ++#endif + -+ kbase_region_tracker_term(kctx); -+ kbase_gpu_vm_unlock(kctx); ++_MALI_OSK_LIST_HEAD(mali_sessions); ++static u32 mali_session_count = 0; + -+ /* Safe to call this one even when didn't initialize (assuming kctx was sufficiently zeroed) */ -+ kbasep_js_kctx_term(kctx); ++_mali_osk_spinlock_irq_t *mali_sessions_lock = NULL; ++wait_queue_head_t pending_queue; + -+ kbase_jd_exit(kctx); ++_mali_osk_errcode_t mali_session_initialize(void) ++{ ++ _MALI_OSK_INIT_LIST_HEAD(&mali_sessions); ++ /* init wait queue for big varying job */ ++ init_waitqueue_head(&pending_queue); + -+ kbase_pm_context_idle(kbdev); ++ mali_sessions_lock = _mali_osk_spinlock_irq_init( ++ _MALI_OSK_LOCKFLAG_ORDERED, ++ _MALI_OSK_LOCK_ORDER_SESSIONS); ++ if (NULL == mali_sessions_lock) { ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ kbase_dma_fence_term(kctx); ++ return _MALI_OSK_ERR_OK; ++} + -+ mutex_lock(&kbdev->mmu_hw_mutex); -+ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, flags); -+ kbase_ctx_sched_remove_ctx(kctx); -+ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kbdev->mmu_hw_mutex); ++void mali_session_terminate(void) ++{ ++ if (NULL != mali_sessions_lock) { ++ _mali_osk_spinlock_irq_term(mali_sessions_lock); ++ mali_sessions_lock = NULL; ++ } ++} + -+ kbase_mmu_term(kctx); ++void mali_session_add(struct mali_session_data *session) ++{ ++ mali_session_lock(); ++ _mali_osk_list_add(&session->link, &mali_sessions); ++ mali_session_count++; ++ mali_session_unlock(); ++} + -+ pages = atomic_read(&kctx->used_pages); -+ if (pages != 0) -+ dev_warn(kbdev->dev, "%s: %d pages in use!\n", __func__, pages); ++void mali_session_remove(struct mali_session_data *session) ++{ ++ mali_session_lock(); ++ _mali_osk_list_delinit(&session->link); ++ mali_session_count--; ++ mali_session_unlock(); ++} + -+ kbase_mem_evictable_deinit(kctx); -+ kbase_mem_pool_term(&kctx->mem_pool); -+ kbase_mem_pool_term(&kctx->lp_mem_pool); -+ WARN_ON(atomic_read(&kctx->nonmapped_pages) != 0); ++u32 mali_session_get_count(void) ++{ ++ return mali_session_count; ++} + -+ vfree(kctx); ++mali_bool mali_session_pp_job_is_empty(void *data) ++{ ++ struct mali_session_data *session = (struct mali_session_data *)data; ++ MALI_DEBUG_ASSERT_POINTER(session); ++ ++ if ( 0 == _mali_osk_atomic_read(&session->number_of_pp_jobs)) { ++ return MALI_TRUE; ++ } ++ return MALI_FALSE; +} -+KBASE_EXPORT_SYMBOL(kbase_destroy_context); + -+/** -+ * kbase_context_set_create_flags - Set creation flags on a context -+ * @kctx: Kbase context -+ * @flags: Flags to set -+ * -+ * Return: 0 on success -+ */ -+int kbase_context_set_create_flags(struct kbase_context *kctx, u32 flags) ++wait_queue_head_t *mali_session_get_wait_queue(void) +{ -+ int err = 0; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ unsigned long irq_flags; ++ return &pending_queue; ++} + -+ KBASE_DEBUG_ASSERT(NULL != kctx); ++/* ++ * Get the max completed window jobs from all active session, ++ * which will be used in window render frame per sec calculate ++ */ ++#if defined(CONFIG_MALI_DVFS) ++u32 mali_session_max_window_num(void) ++{ ++ struct mali_session_data *session, *tmp; ++ u32 max_window_num = 0; ++ u32 tmp_number = 0; + -+ js_kctx_info = &kctx->jctx.sched_info; ++ mali_session_lock(); + -+ /* Validate flags */ -+ if (flags != (flags & BASE_CONTEXT_CREATE_KERNEL_FLAGS)) { -+ err = -EINVAL; -+ goto out; ++ MALI_SESSION_FOREACH(session, tmp, link) { ++ tmp_number = _mali_osk_atomic_xchg( ++ &session->number_of_window_jobs, 0); ++ if (max_window_num < tmp_number) { ++ max_window_num = tmp_number; ++ } + } + -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); -+ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, irq_flags); ++ mali_session_unlock(); + -+ /* Translate the flags */ -+ if ((flags & BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED) == 0) -+ kbase_ctx_flag_clear(kctx, KCTX_SUBMIT_DISABLED); ++ return max_window_num; ++} ++#endif + -+ /* Latch the initial attributes into the Job Scheduler */ -+ kbasep_js_ctx_attr_set_initial_attrs(kctx->kbdev, kctx); ++void mali_session_memory_tracking(_mali_osk_print_ctx *print_ctx) ++{ ++ struct mali_session_data *session, *tmp; ++ u32 mali_mem_usage; ++ u32 total_mali_mem_size; ++#ifdef MALI_MEM_SWAP_TRACKING ++ u32 swap_pool_size; ++ u32 swap_unlock_size; ++#endif + -+ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, irq_flags); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); -+ out: -+ return err; ++ MALI_DEBUG_ASSERT_POINTER(print_ctx); ++ mali_session_lock(); ++ MALI_SESSION_FOREACH(session, tmp, link) { ++#ifdef MALI_MEM_SWAP_TRACKING ++ _mali_osk_ctxprintf(print_ctx, " %-25s %-10u %-10u %-15u %-15u %-10u %-10u %-10u\n", ++ session->comm, session->pid, ++ (atomic_read(&session->mali_mem_allocated_pages)) * _MALI_OSK_MALI_PAGE_SIZE, ++ (unsigned int)session->max_mali_mem_allocated_size, ++ (unsigned int)((atomic_read(&session->mali_mem_array[MALI_MEM_EXTERNAL])) * _MALI_OSK_MALI_PAGE_SIZE), ++ (unsigned int)((atomic_read(&session->mali_mem_array[MALI_MEM_UMP])) * _MALI_OSK_MALI_PAGE_SIZE), ++ (unsigned int)((atomic_read(&session->mali_mem_array[MALI_MEM_DMA_BUF])) * _MALI_OSK_MALI_PAGE_SIZE), ++ (unsigned int)((atomic_read(&session->mali_mem_array[MALI_MEM_SWAP])) * _MALI_OSK_MALI_PAGE_SIZE) ++ ); ++#else ++ _mali_osk_ctxprintf(print_ctx, " %-25s %-10u %-10u %-15u %-15u %-10u %-10u \n", ++ session->comm, session->pid, ++ (unsigned int)((atomic_read(&session->mali_mem_allocated_pages)) * _MALI_OSK_MALI_PAGE_SIZE), ++ (unsigned int)session->max_mali_mem_allocated_size, ++ (unsigned int)((atomic_read(&session->mali_mem_array[MALI_MEM_EXTERNAL])) * _MALI_OSK_MALI_PAGE_SIZE), ++ (unsigned int)((atomic_read(&session->mali_mem_array[MALI_MEM_UMP])) * _MALI_OSK_MALI_PAGE_SIZE), ++ (unsigned int)((atomic_read(&session->mali_mem_array[MALI_MEM_DMA_BUF])) * _MALI_OSK_MALI_PAGE_SIZE) ++ ); ++#endif ++ } ++ mali_session_unlock(); ++ mali_mem_usage = _mali_ukk_report_memory_usage(); ++ total_mali_mem_size = _mali_ukk_report_total_memory_size(); ++ _mali_osk_ctxprintf(print_ctx, "Mali mem usage: %u\nMali mem limit: %u\n", mali_mem_usage, total_mali_mem_size); ++#ifdef MALI_MEM_SWAP_TRACKING ++ mali_mem_swap_tracking(&swap_pool_size, &swap_unlock_size); ++ _mali_osk_ctxprintf(print_ctx, "Mali swap mem pool : %u\nMali swap mem unlock: %u\n", swap_pool_size, swap_unlock_size); ++#endif +} -+KBASE_EXPORT_SYMBOL(kbase_context_set_create_flags); -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_context.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_context.h +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_session.h b/drivers/gpu/arm/mali400/mali/common/mali_session.h new file mode 100755 -index 000000000000..a3f5bb0ce0da +index 000000000..da8b9927e --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_context.h -@@ -0,0 +1,90 @@ ++++ b/drivers/gpu/arm/mali400/mali/common/mali_session.h +@@ -0,0 +1,136 @@ +/* -+ * -+ * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_SESSION_H__ ++#define __MALI_SESSION_H__ + ++#include "mali_mmu_page_directory.h" ++#include "mali_osk.h" ++#include "mali_osk_list.h" ++#include "mali_memory_types.h" ++#include "mali_memory_manager.h" + -+#ifndef _KBASE_CONTEXT_H_ -+#define _KBASE_CONTEXT_H_ ++struct mali_timeline_system; ++struct mali_soft_system; + -+#include ++/* Number of frame builder job lists per session. */ ++#define MALI_PP_JOB_FB_LOOKUP_LIST_SIZE 16 ++#define MALI_PP_JOB_FB_LOOKUP_LIST_MASK (MALI_PP_JOB_FB_LOOKUP_LIST_SIZE - 1) ++/*Max pending big job allowed in kernel*/ ++#define MALI_MAX_PENDING_BIG_JOB (2) + ++struct mali_session_data { ++ _mali_osk_notification_queue_t *ioctl_queue; + -+int kbase_context_set_create_flags(struct kbase_context *kctx, u32 flags); ++ _mali_osk_wait_queue_t *wait_queue; /**The wait queue to wait for the number of pp job become 0.*/ + -+/** -+ * kbase_ctx_flag - Check if @flag is set on @kctx -+ * @kctx: Pointer to kbase context to check -+ * @flag: Flag to check -+ * -+ * Return: true if @flag is set on @kctx, false if not. -+ */ -+static inline bool kbase_ctx_flag(struct kbase_context *kctx, -+ enum kbase_context_flags flag) ++ _mali_osk_mutex_t *memory_lock; /**< Lock protecting the vm manipulation */ ++ _mali_osk_mutex_t *cow_lock; /** < Lock protecting the cow memory free manipulation */ ++#if 0 ++ _mali_osk_list_t memory_head; /**< Track all the memory allocated in this session, for freeing on abnormal termination */ ++#endif ++ struct mali_page_directory *page_directory; /**< MMU page directory for this session */ ++ ++ _MALI_OSK_LIST_HEAD(link); /**< Link for list of all sessions */ ++ _MALI_OSK_LIST_HEAD(pp_job_list); /**< List of all PP jobs on this session */ ++ ++#if defined(CONFIG_MALI_DVFS) ++ _mali_osk_atomic_t number_of_window_jobs; /**< Record the window jobs completed on this session in a period */ ++#endif ++ _mali_osk_atomic_t number_of_pp_jobs; /** < Record the pp jobs on this session */ ++ ++ _mali_osk_list_t pp_job_fb_lookup_list[MALI_PP_JOB_FB_LOOKUP_LIST_SIZE]; /**< List of PP job lists per frame builder id. Used to link jobs from same frame builder. */ ++ struct mali_soft_job_system *soft_job_system; /**< Soft job system for this session. */ ++ struct mali_timeline_system *timeline_system; /**< Timeline system for this session. */ ++ ++ mali_bool is_aborting; /**< MALI_TRUE if the session is aborting, MALI_FALSE if not. */ ++ mali_bool use_high_priority_job_queue; /**< If MALI_TRUE, jobs added from this session will use the high priority job queues. */ ++ u32 pid; ++ char *comm; ++ atomic_t mali_mem_array[MALI_MEM_TYPE_MAX]; /**< The array to record mem types' usage for this session. */ ++ atomic_t mali_mem_allocated_pages; /** The current allocated mali memory pages, which include mali os memory and mali dedicated memory.*/ ++ size_t max_mali_mem_allocated_size; /**< The past max mali memory allocated size, which include mali os memory and mali dedicated memory. */ ++ /* Added for new memroy system */ ++ struct mali_allocation_manager allocation_mgr; ++ ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++ u32 fence_context; /** < The execution dma fence context this fence is run on. */ ++ _mali_osk_atomic_t fence_seqno; /** < Alinear increasing sequence number for this dma fence context. */ ++#endif ++}; ++ ++_mali_osk_errcode_t mali_session_initialize(void); ++void mali_session_terminate(void); ++ ++/* List of all sessions. Actual list head in mali_kernel_core.c */ ++extern _mali_osk_list_t mali_sessions; ++/* Lock to protect modification and access to the mali_sessions list */ ++extern _mali_osk_spinlock_irq_t *mali_sessions_lock; ++ ++MALI_STATIC_INLINE void mali_session_lock(void) +{ -+ return atomic_read(&kctx->flags) & flag; ++ _mali_osk_spinlock_irq_lock(mali_sessions_lock); +} + -+/** -+ * kbase_ctx_flag_clear - Clear @flag on @kctx -+ * @kctx: Pointer to kbase context -+ * @flag: Flag to clear -+ * -+ * Clear the @flag on @kctx. This is done atomically, so other flags being -+ * cleared or set at the same time will be safe. -+ * -+ * Some flags have locking requirements, check the documentation for the -+ * respective flags. -+ */ -+static inline void kbase_ctx_flag_clear(struct kbase_context *kctx, -+ enum kbase_context_flags flag) ++MALI_STATIC_INLINE void mali_session_unlock(void) +{ -+#if KERNEL_VERSION(4, 3, 0) > LINUX_VERSION_CODE -+ /* -+ * Earlier kernel versions doesn't have atomic_andnot() or -+ * atomic_and(). atomic_clear_mask() was only available on some -+ * architectures and removed on arm in v3.13 on arm and arm64. -+ * -+ * Use a compare-exchange loop to clear the flag on pre 4.3 kernels, -+ * when atomic_andnot() becomes available. -+ */ -+ int old, new; ++ _mali_osk_spinlock_irq_unlock(mali_sessions_lock); ++} + -+ do { -+ old = atomic_read(&kctx->flags); -+ new = old & ~flag; ++void mali_session_add(struct mali_session_data *session); ++void mali_session_remove(struct mali_session_data *session); ++u32 mali_session_get_count(void); ++mali_bool mali_session_pp_job_is_empty(void *data); ++wait_queue_head_t *mali_session_get_wait_queue(void); + -+ } while (atomic_cmpxchg(&kctx->flags, old, new) != old); -+#else -+ atomic_andnot(flag, &kctx->flags); -+#endif ++#define MALI_SESSION_FOREACH(session, tmp, link) \ ++ _MALI_OSK_LIST_FOREACHENTRY(session, tmp, &mali_sessions, struct mali_session_data, link) ++ ++MALI_STATIC_INLINE struct mali_page_directory *mali_session_get_page_directory(struct mali_session_data *session) ++{ ++ return session->page_directory; +} + -+/** -+ * kbase_ctx_flag_set - Set @flag on @kctx -+ * @kctx: Pointer to kbase context -+ * @flag: Flag to clear -+ * -+ * Set the @flag on @kctx. This is done atomically, so other flags being -+ * cleared or set at the same time will be safe. -+ * -+ * Some flags have locking requirements, check the documentation for the -+ * respective flags. -+ */ -+static inline void kbase_ctx_flag_set(struct kbase_context *kctx, -+ enum kbase_context_flags flag) ++MALI_STATIC_INLINE void mali_session_memory_lock(struct mali_session_data *session) +{ -+ atomic_or(flag, &kctx->flags); ++ MALI_DEBUG_ASSERT_POINTER(session); ++ _mali_osk_mutex_wait(session->memory_lock); +} -+#endif /* _KBASE_CONTEXT_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_core_linux.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_core_linux.c -new file mode 100755 -index 000000000000..347fee2643bb ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_core_linux.c -@@ -0,0 +1,4971 @@ ++ ++MALI_STATIC_INLINE void mali_session_memory_unlock(struct mali_session_data *session) ++{ ++ MALI_DEBUG_ASSERT_POINTER(session); ++ _mali_osk_mutex_signal(session->memory_lock); ++} ++ ++MALI_STATIC_INLINE void mali_session_send_notification(struct mali_session_data *session, _mali_osk_notification_t *object) ++{ ++ _mali_osk_notification_queue_send(session->ioctl_queue, object); ++} ++ ++#if defined(CONFIG_MALI_DVFS) ++ ++MALI_STATIC_INLINE void mali_session_inc_num_window_jobs(struct mali_session_data *session) ++{ ++ MALI_DEBUG_ASSERT_POINTER(session); ++ _mali_osk_atomic_inc(&session->number_of_window_jobs); ++} ++ +/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Get the max completed window jobs from all active session, ++ * which will be used in window render frame per sec calculate + */ ++u32 mali_session_max_window_num(void); + ++#endif + ++void mali_session_memory_tracking(_mali_osk_print_ctx *print_ctx); + -+#include -+#include -+#include -+#include -+#include -+#include -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+#include -+#include -+#ifdef CONFIG_DEVFREQ_THERMAL -+#include -+#endif /* CONFIG_DEVFREQ_THERMAL */ -+#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+#include "mali_kbase_model_linux.h" -+#endif /* CONFIG_MALI_BIFROST_NO_MALI */ -+#include "mali_kbase_mem_profile_debugfs_buf_size.h" -+#include "mali_kbase_debug_mem_view.h" -+#include "mali_kbase_mem.h" -+#include "mali_kbase_mem_pool_debugfs.h" -+#if !MALI_CUSTOMER_RELEASE -+#include "mali_kbase_regs_dump_debugfs.h" -+#endif /* !MALI_CUSTOMER_RELEASE */ -+#include "mali_kbase_regs_history_debugfs.h" -+#include -+#include -+#include -+#include -+#include "mali_kbase_ioctl.h" ++#endif /* __MALI_SESSION_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c +new file mode 100755 +index 000000000..35cd830bc +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c +@@ -0,0 +1,438 @@ ++/* ++ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include /* is_compat_task */ -+#include -+#include -+#include -+#include -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+#include -+#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ -+#include -+#include ++#include "mali_soft_job.h" ++#include "mali_osk.h" ++#include "mali_timeline.h" ++#include "mali_session.h" ++#include "mali_kernel_common.h" ++#include "mali_uk_types.h" ++#include "mali_scheduler.h" ++#include "mali_executor.h" + -+#include ++MALI_STATIC_INLINE void mali_soft_job_system_lock(struct mali_soft_job_system *system) ++{ ++ MALI_DEBUG_ASSERT_POINTER(system); ++ _mali_osk_spinlock_irq_lock(system->lock); ++ MALI_DEBUG_PRINT(5, ("Mali Soft Job: soft system %p lock taken\n", system)); ++ MALI_DEBUG_ASSERT(0 == system->lock_owner); ++ MALI_DEBUG_CODE(system->lock_owner = _mali_osk_get_tid()); ++} + ++MALI_STATIC_INLINE void mali_soft_job_system_unlock(struct mali_soft_job_system *system) ++{ ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_PRINT(5, ("Mali Soft Job: releasing soft system %p lock\n", system)); ++ MALI_DEBUG_ASSERT(_mali_osk_get_tid() == system->lock_owner); ++ MALI_DEBUG_CODE(system->lock_owner = 0); ++ _mali_osk_spinlock_irq_unlock(system->lock); ++} + -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)) -+#include ++#if defined(DEBUG) ++MALI_STATIC_INLINE void mali_soft_job_system_assert_locked(struct mali_soft_job_system *system) ++{ ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT(_mali_osk_get_tid() == system->lock_owner); ++} ++#define MALI_ASSERT_SOFT_JOB_SYSTEM_LOCKED(system) mali_soft_job_system_assert_locked(system) +#else -+#include -+#endif ++#define MALI_ASSERT_SOFT_JOB_SYSTEM_LOCKED(system) ++#endif /* defined(DEBUG) */ + -+#include ++struct mali_soft_job_system *mali_soft_job_system_create(struct mali_session_data *session) ++{ ++ struct mali_soft_job_system *system; + -+#include ++ MALI_DEBUG_ASSERT_POINTER(session); + -+/* GPU IRQ Tags */ -+#define JOB_IRQ_TAG 0 -+#define MMU_IRQ_TAG 1 -+#define GPU_IRQ_TAG 2 ++ system = (struct mali_soft_job_system *) _mali_osk_calloc(1, sizeof(struct mali_soft_job_system)); ++ if (NULL == system) { ++ return NULL; ++ } + -+#if MALI_UNIT_TEST -+static struct kbase_exported_test_data shared_kernel_test_data; -+EXPORT_SYMBOL(shared_kernel_test_data); -+#endif /* MALI_UNIT_TEST */ ++ system->session = session; + -+static int kbase_dev_nr; ++ system->lock = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_ORDERED, _MALI_OSK_LOCK_ORDER_SCHEDULER); ++ if (NULL == system->lock) { ++ mali_soft_job_system_destroy(system); ++ return NULL; ++ } ++ system->lock_owner = 0; ++ system->last_job_id = 0; + -+static DEFINE_MUTEX(kbase_dev_list_lock); -+static LIST_HEAD(kbase_dev_list); ++ _MALI_OSK_INIT_LIST_HEAD(&(system->jobs_used)); + -+#define KERNEL_SIDE_DDK_VERSION_STRING "K:" MALI_RELEASE_NAME "(GPL)" -+static inline void __compile_time_asserts(void) -+{ -+ CSTD_COMPILE_TIME_ASSERT(sizeof(KERNEL_SIDE_DDK_VERSION_STRING) <= KBASE_GET_VERSION_BUFFER_SIZE); ++ return system; +} + -+static int kbase_api_handshake(struct kbase_context *kctx, -+ struct kbase_ioctl_version_check *version) ++void mali_soft_job_system_destroy(struct mali_soft_job_system *system) +{ -+ switch (version->major) { -+ case BASE_UK_VERSION_MAJOR: -+ /* set minor to be the lowest common */ -+ version->minor = min_t(int, BASE_UK_VERSION_MINOR, -+ (int)version->minor); -+ break; -+ default: -+ /* We return our actual version regardless if it -+ * matches the version returned by userspace - -+ * userspace can bail if it can't handle this -+ * version */ -+ version->major = BASE_UK_VERSION_MAJOR; -+ version->minor = BASE_UK_VERSION_MINOR; -+ break; -+ } ++ MALI_DEBUG_ASSERT_POINTER(system); + -+ /* save the proposed version number for later use */ -+ kctx->api_version = KBASE_API_VERSION(version->major, version->minor); ++ /* All jobs should be free at this point. */ ++ MALI_DEBUG_ASSERT(_mali_osk_list_empty(&(system->jobs_used))); + -+ return 0; ++ if (NULL != system) { ++ if (NULL != system->lock) { ++ _mali_osk_spinlock_irq_term(system->lock); ++ } ++ _mali_osk_free(system); ++ } +} + -+/** -+ * enum mali_error - Mali error codes shared with userspace -+ * -+ * This is subset of those common Mali errors that can be returned to userspace. -+ * Values of matching user and kernel space enumerators MUST be the same. -+ * MALI_ERROR_NONE is guaranteed to be 0. -+ * -+ * @MALI_ERROR_NONE: Success -+ * @MALI_ERROR_OUT_OF_GPU_MEMORY: Not used in the kernel driver -+ * @MALI_ERROR_OUT_OF_MEMORY: Memory allocation failure -+ * @MALI_ERROR_FUNCTION_FAILED: Generic error code -+ */ -+enum mali_error { -+ MALI_ERROR_NONE = 0, -+ MALI_ERROR_OUT_OF_GPU_MEMORY, -+ MALI_ERROR_OUT_OF_MEMORY, -+ MALI_ERROR_FUNCTION_FAILED, -+}; -+ -+enum { -+ inited_mem = (1u << 0), -+ inited_js = (1u << 1), -+ inited_pm_runtime_init = (1u << 2), -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+ inited_devfreq = (1u << 3), -+#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ -+ inited_tlstream = (1u << 4), -+ inited_backend_early = (1u << 5), -+ inited_backend_late = (1u << 6), -+ inited_device = (1u << 7), -+ inited_vinstr = (1u << 8), ++static void mali_soft_job_system_free_job(struct mali_soft_job_system *system, struct mali_soft_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_POINTER(system); + -+ inited_job_fault = (1u << 10), -+ inited_sysfs_group = (1u << 11), -+ inited_misc_register = (1u << 12), -+ inited_get_device = (1u << 13), -+ inited_dev_list = (1u << 14), -+ inited_debugfs = (1u << 15), -+ inited_gpu_device = (1u << 16), -+ inited_registers_map = (1u << 17), -+ inited_io_history = (1u << 18), -+ inited_power_control = (1u << 19), -+ inited_buslogger = (1u << 20), -+ inited_protected = (1u << 21), -+ inited_ctx_sched = (1u << 22) -+}; ++ mali_soft_job_system_lock(job->system); + ++ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_INVALID_ID != job->id); ++ MALI_DEBUG_ASSERT(system == job->system); + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+#define INACTIVE_WAIT_MS (5000) ++ _mali_osk_list_del(&(job->system_list)); + -+void kbase_set_driver_inactive(struct kbase_device *kbdev, bool inactive) -+{ -+ kbdev->driver_inactive = inactive; -+ wake_up(&kbdev->driver_inactive_wait); ++ mali_soft_job_system_unlock(job->system); + -+ /* Wait for any running IOCTLs to complete */ -+ if (inactive) -+ msleep(INACTIVE_WAIT_MS); ++ _mali_osk_free(job); +} -+KBASE_EXPORT_TEST_API(kbase_set_driver_inactive); -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ + -+/** -+ * kbase_legacy_dispatch - UKK dispatch function -+ * -+ * This is the dispatch function for the legacy UKK ioctl interface. No new -+ * ioctls should be added to this function, see kbase_ioctl instead. -+ * -+ * @kctx: The kernel context structure -+ * @args: Pointer to the data structure passed from/to user space -+ * @args_size: Size of the data structure -+ */ -+static int kbase_legacy_dispatch(struct kbase_context *kctx, -+ void * const args, u32 args_size) ++MALI_STATIC_INLINE struct mali_soft_job *mali_soft_job_system_lookup_job(struct mali_soft_job_system *system, u32 job_id) +{ -+ struct kbase_device *kbdev; -+ union uk_header *ukh = args; -+ u32 id; -+ int ret = 0; ++ struct mali_soft_job *job, *tmp; + -+ KBASE_DEBUG_ASSERT(ukh != NULL); ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_ASSERT_SOFT_JOB_SYSTEM_LOCKED(system); + -+ kbdev = kctx->kbdev; -+ id = ukh->id; -+ ukh->ret = MALI_ERROR_NONE; /* Be optimistic */ ++ _MALI_OSK_LIST_FOREACHENTRY(job, tmp, &system->jobs_used, struct mali_soft_job, system_list) { ++ if (job->id == job_id) ++ return job; ++ } + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ wait_event(kbdev->driver_inactive_wait, -+ kbdev->driver_inactive == false); -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++ return NULL; ++} + -+ if (UKP_FUNC_ID_CHECK_VERSION == id) { -+ struct uku_version_check_args *version_check; -+ struct kbase_ioctl_version_check version; ++void mali_soft_job_destroy(struct mali_soft_job *job) ++{ ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_POINTER(job->system); + -+ if (args_size != sizeof(struct uku_version_check_args)) { -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ return 0; -+ } -+ version_check = (struct uku_version_check_args *)args; -+ version.minor = version_check->minor; -+ version.major = version_check->major; ++ MALI_DEBUG_PRINT(4, ("Mali Soft Job: destroying soft job %u (0x%08X)\n", job->id, job)); + -+ kbase_api_handshake(kctx, &version); ++ if (NULL != job) { ++ if (0 < _mali_osk_atomic_dec_return(&job->refcount)) return; + -+ version_check->minor = version.minor; -+ version_check->major = version.major; -+ ukh->ret = MALI_ERROR_NONE; -+ return 0; -+ } ++ _mali_osk_atomic_term(&job->refcount); + -+ /* block calls until version handshake */ -+ if (kctx->api_version == 0) -+ return -EINVAL; ++ if (NULL != job->activated_notification) { ++ _mali_osk_notification_delete(job->activated_notification); ++ job->activated_notification = NULL; ++ } + -+ if (!atomic_read(&kctx->setup_complete)) { -+ struct kbase_uk_set_flags *kbase_set_flags; ++ mali_soft_job_system_free_job(job->system, job); ++ } ++} + -+ /* setup pending, try to signal that we'll do the setup, -+ * if setup was already in progress, err this call -+ */ -+ if (atomic_cmpxchg(&kctx->setup_in_progress, 0, 1) != 0) -+ return -EINVAL; ++struct mali_soft_job *mali_soft_job_create(struct mali_soft_job_system *system, mali_soft_job_type type, u64 user_job) ++{ ++ struct mali_soft_job *job; ++ _mali_osk_notification_t *notification = NULL; + -+ /* if unexpected call, will stay stuck in setup mode -+ * (is it the only call we accept?) -+ */ -+ if (id != KBASE_FUNC_SET_FLAGS) -+ return -EINVAL; ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT((MALI_SOFT_JOB_TYPE_USER_SIGNALED == type) || ++ (MALI_SOFT_JOB_TYPE_SELF_SIGNALED == type)); + -+ kbase_set_flags = (struct kbase_uk_set_flags *)args; ++ notification = _mali_osk_notification_create(_MALI_NOTIFICATION_SOFT_ACTIVATED, sizeof(_mali_uk_soft_job_activated_s)); ++ if (unlikely(NULL == notification)) { ++ MALI_PRINT_ERROR(("Mali Soft Job: failed to allocate notification")); ++ return NULL; ++ } + -+ /* if not matching the expected call, stay in setup mode */ -+ if (sizeof(*kbase_set_flags) != args_size) -+ goto bad_size; ++ job = _mali_osk_malloc(sizeof(struct mali_soft_job)); ++ if (unlikely(NULL == job)) { ++ MALI_DEBUG_PRINT(2, ("Mali Soft Job: system alloc job failed. \n")); ++ return NULL; ++ } + -+ /* if bad flags, will stay stuck in setup mode */ -+ if (kbase_context_set_create_flags(kctx, -+ kbase_set_flags->create_flags) != 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ mali_soft_job_system_lock(system); + -+ atomic_set(&kctx->setup_complete, 1); -+ return 0; -+ } ++ job->system = system; ++ job->id = system->last_job_id++; ++ job->state = MALI_SOFT_JOB_STATE_ALLOCATED; + -+ /* setup complete, perform normal operation */ -+ switch (id) { -+ case KBASE_FUNC_MEM_JIT_INIT: -+ { -+ struct kbase_uk_mem_jit_init *jit_init = args; ++ _mali_osk_list_add(&(job->system_list), &(system->jobs_used)); + -+ if (sizeof(*jit_init) != args_size) -+ goto bad_size; ++ job->type = type; ++ job->user_job = user_job; ++ job->activated = MALI_FALSE; + -+ if (kbase_region_tracker_init_jit(kctx, -+ jit_init->va_pages)) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ break; -+ } -+ case KBASE_FUNC_MEM_ALLOC: -+ { -+ struct kbase_uk_mem_alloc *mem = args; -+ struct kbase_va_region *reg; ++ job->activated_notification = notification; + -+ if (sizeof(*mem) != args_size) -+ goto bad_size; ++ _mali_osk_atomic_init(&job->refcount, 1); + -+#if defined(CONFIG_64BIT) -+ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { -+ /* force SAME_VA if a 64-bit client */ -+ mem->flags |= BASE_MEM_SAME_VA; -+ } -+#endif ++ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_ALLOCATED == job->state); ++ MALI_DEBUG_ASSERT(system == job->system); ++ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_INVALID_ID != job->id); + -+ reg = kbase_mem_alloc(kctx, mem->va_pages, -+ mem->commit_pages, mem->extent, -+ &mem->flags, &mem->gpu_va); -+ mem->va_alignment = 0; ++ mali_soft_job_system_unlock(system); + -+ if (!reg) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ break; -+ } -+ case KBASE_FUNC_MEM_IMPORT: { -+ struct kbase_uk_mem_import *mem_import = args; -+ void __user *phandle; ++ return job; ++} + -+ if (sizeof(*mem_import) != args_size) -+ goto bad_size; -+#ifdef CONFIG_COMPAT -+ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) -+ phandle = compat_ptr(mem_import->phandle); -+ else -+#endif -+ phandle = u64_to_user_ptr(mem_import->phandle); ++mali_timeline_point mali_soft_job_start(struct mali_soft_job *job, struct mali_timeline_fence *fence) ++{ ++ mali_timeline_point point; ++ struct mali_soft_job_system *system; + -+ if (mem_import->type == BASE_MEM_IMPORT_TYPE_INVALID) { -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ break; -+ } ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_POINTER(fence); + -+ if (kbase_mem_import(kctx, -+ (enum base_mem_import_type) -+ mem_import->type, -+ phandle, -+ 0, -+ &mem_import->gpu_va, -+ &mem_import->va_pages, -+ &mem_import->flags)) { -+ mem_import->type = BASE_MEM_IMPORT_TYPE_INVALID; -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ } -+ break; -+ } -+ case KBASE_FUNC_MEM_ALIAS: { -+ struct kbase_uk_mem_alias *alias = args; -+ struct base_mem_aliasing_info __user *user_ai; -+ struct base_mem_aliasing_info *ai; ++ MALI_DEBUG_ASSERT_POINTER(job->system); ++ system = job->system; + -+ if (sizeof(*alias) != args_size) -+ goto bad_size; ++ MALI_DEBUG_ASSERT_POINTER(system->session); ++ MALI_DEBUG_ASSERT_POINTER(system->session->timeline_system); + -+ if (alias->nents > 2048) { -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ break; -+ } -+ if (!alias->nents) { -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ break; -+ } ++ mali_soft_job_system_lock(system); + -+#ifdef CONFIG_COMPAT -+ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) -+ user_ai = compat_ptr(alias->ai); -+ else -+#endif -+ user_ai = u64_to_user_ptr(alias->ai); ++ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_ALLOCATED == job->state); ++ job->state = MALI_SOFT_JOB_STATE_STARTED; + -+ ai = vmalloc(sizeof(*ai) * alias->nents); ++ mali_soft_job_system_unlock(system); + -+ if (!ai) { -+ ukh->ret = MALI_ERROR_OUT_OF_MEMORY; -+ break; -+ } ++ MALI_DEBUG_PRINT(4, ("Mali Soft Job: starting soft job %u (0x%08X)\n", job->id, job)); + -+ if (copy_from_user(ai, user_ai, -+ sizeof(*ai) * alias->nents)) { -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ goto copy_failed; -+ } ++ mali_timeline_tracker_init(&job->tracker, MALI_TIMELINE_TRACKER_SOFT, fence, job); ++ point = mali_timeline_system_add_tracker(system->session->timeline_system, &job->tracker, MALI_TIMELINE_SOFT); + -+ alias->gpu_va = kbase_mem_alias(kctx, &alias->flags, -+ alias->stride, -+ alias->nents, ai, -+ &alias->va_pages); -+ if (!alias->gpu_va) { -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ goto no_alias; -+ } -+no_alias: -+copy_failed: -+ vfree(ai); -+ break; -+ } -+ case KBASE_FUNC_MEM_COMMIT: -+ { -+ struct kbase_uk_mem_commit *commit = args; -+ int ret; ++ return point; ++} + -+ if (sizeof(*commit) != args_size) -+ goto bad_size; ++static mali_bool mali_soft_job_is_activated(void *data) ++{ ++ struct mali_soft_job *job; + -+ ret = kbase_mem_commit(kctx, commit->gpu_addr, -+ commit->pages); ++ job = (struct mali_soft_job *) data; ++ MALI_DEBUG_ASSERT_POINTER(job); + -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ commit->result_subcode = -+ BASE_BACKING_THRESHOLD_ERROR_INVALID_ARGUMENTS; ++ return job->activated; ++} + -+ if (ret == 0) { -+ ukh->ret = MALI_ERROR_NONE; -+ commit->result_subcode = -+ BASE_BACKING_THRESHOLD_OK; -+ } else if (ret == -ENOMEM) { -+ commit->result_subcode = -+ BASE_BACKING_THRESHOLD_ERROR_OOM; -+ } ++_mali_osk_errcode_t mali_soft_job_system_signal_job(struct mali_soft_job_system *system, u32 job_id) ++{ ++ struct mali_soft_job *job; ++ struct mali_timeline_system *timeline_system; ++ mali_scheduler_mask schedule_mask; + -+ break; -+ } ++ MALI_DEBUG_ASSERT_POINTER(system); + -+ case KBASE_FUNC_MEM_QUERY: -+ { -+ struct kbase_uk_mem_query *query = args; ++ mali_soft_job_system_lock(system); + -+ if (sizeof(*query) != args_size) -+ goto bad_size; ++ job = mali_soft_job_system_lookup_job(system, job_id); + -+ if (kbase_mem_query(kctx, query->gpu_addr, -+ query->query, &query->value) != 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ else -+ ukh->ret = MALI_ERROR_NONE; -+ break; -+ } -+ break; ++ if ((NULL == job) || (MALI_SOFT_JOB_TYPE_USER_SIGNALED != job->type) ++ || !(MALI_SOFT_JOB_STATE_STARTED == job->state || MALI_SOFT_JOB_STATE_TIMED_OUT == job->state)) { ++ mali_soft_job_system_unlock(system); ++ MALI_PRINT_ERROR(("Mali Soft Job: invalid soft job id %u", job_id)); ++ return _MALI_OSK_ERR_ITEM_NOT_FOUND; ++ } + -+ case KBASE_FUNC_MEM_FLAGS_CHANGE: -+ { -+ struct kbase_uk_mem_flags_change *fc = args; ++ if (MALI_SOFT_JOB_STATE_TIMED_OUT == job->state) { ++ job->state = MALI_SOFT_JOB_STATE_SIGNALED; ++ mali_soft_job_system_unlock(system); + -+ if (sizeof(*fc) != args_size) -+ goto bad_size; ++ MALI_DEBUG_ASSERT(MALI_TRUE == job->activated); ++ MALI_DEBUG_PRINT(4, ("Mali Soft Job: soft job %u (0x%08X) was timed out\n", job->id, job)); ++ mali_soft_job_destroy(job); + -+ if (kbase_mem_flags_change(kctx, fc->gpu_va, -+ fc->flags, fc->mask) != 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ return _MALI_OSK_ERR_TIMEOUT; ++ } + -+ break; -+ } -+ case KBASE_FUNC_MEM_FREE: -+ { -+ struct kbase_uk_mem_free *mem = args; ++ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_STARTED == job->state); + -+ if (sizeof(*mem) != args_size) -+ goto bad_size; ++ job->state = MALI_SOFT_JOB_STATE_SIGNALED; ++ mali_soft_job_system_unlock(system); + -+ if (kbase_mem_free(kctx, mem->gpu_addr) != 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ break; -+ } ++ /* Since the job now is in signaled state, timeouts from the timeline system will be ++ * ignored, and it is not possible to signal this job again. */ + -+ case KBASE_FUNC_JOB_SUBMIT: -+ { -+ struct kbase_uk_job_submit *job = args; -+ char __user *user_buf; ++ timeline_system = system->session->timeline_system; ++ MALI_DEBUG_ASSERT_POINTER(timeline_system); + -+ if (sizeof(*job) != args_size) -+ goto bad_size; ++ /* Wait until activated. */ ++ _mali_osk_wait_queue_wait_event(timeline_system->wait_queue, mali_soft_job_is_activated, (void *) job); + -+#ifdef CONFIG_COMPAT -+ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) -+ user_buf = compat_ptr(job->addr); -+ else -+#endif -+ user_buf = u64_to_user_ptr(job->addr); ++ MALI_DEBUG_PRINT(4, ("Mali Soft Job: signaling soft job %u (0x%08X)\n", job->id, job)); + -+ if (kbase_jd_submit(kctx, user_buf, -+ job->nr_atoms, -+ job->stride, -+ false) != 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ break; -+ } ++ schedule_mask = mali_timeline_tracker_release(&job->tracker); ++ mali_executor_schedule_from_mask(schedule_mask, MALI_FALSE); + -+ case KBASE_FUNC_SYNC: -+ { -+ struct kbase_uk_sync_now *sn = args; ++ mali_soft_job_destroy(job); + -+ if (sizeof(*sn) != args_size) -+ goto bad_size; ++ return _MALI_OSK_ERR_OK; ++} + -+ if (kbase_sync_now(kctx, &sn->sset.basep_sset) != 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ break; -+ } ++static void mali_soft_job_send_activated_notification(struct mali_soft_job *job) ++{ ++ if (NULL != job->activated_notification) { ++ _mali_uk_soft_job_activated_s *res = job->activated_notification->result_buffer; ++ res->user_job = job->user_job; ++ mali_session_send_notification(job->system->session, job->activated_notification); ++ } ++ job->activated_notification = NULL; ++} + -+ case KBASE_FUNC_DISJOINT_QUERY: -+ { -+ struct kbase_uk_disjoint_query *dquery = args; ++mali_scheduler_mask mali_soft_job_system_activate_job(struct mali_soft_job *job) ++{ ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; + -+ if (sizeof(*dquery) != args_size) -+ goto bad_size; ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_POINTER(job->system); ++ MALI_DEBUG_ASSERT_POINTER(job->system->session); + -+ /* Get the disjointness counter value. */ -+ dquery->counter = kbase_disjoint_event_get(kctx->kbdev); -+ break; -+ } ++ MALI_DEBUG_PRINT(4, ("Mali Soft Job: Timeline activation for soft job %u (0x%08X).\n", job->id, job)); + -+ case KBASE_FUNC_POST_TERM: -+ { -+ kbase_event_close(kctx); -+ break; -+ } ++ mali_soft_job_system_lock(job->system); + -+ case KBASE_FUNC_HWCNT_SETUP: -+ { -+ struct kbase_uk_hwcnt_setup *setup = args; ++ if (unlikely(job->system->session->is_aborting)) { ++ MALI_DEBUG_PRINT(3, ("Mali Soft Job: Soft job %u (0x%08X) activated while session is aborting.\n", job->id, job)); + -+ if (sizeof(*setup) != args_size) -+ goto bad_size; ++ mali_soft_job_system_unlock(job->system); + -+ mutex_lock(&kctx->vinstr_cli_lock); -+ if (kbase_vinstr_legacy_hwc_setup(kbdev->vinstr_ctx, -+ &kctx->vinstr_cli, setup) != 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ mutex_unlock(&kctx->vinstr_cli_lock); -+ break; -+ } ++ /* Since we are in shutdown, we can ignore the scheduling bitmask. */ ++ mali_timeline_tracker_release(&job->tracker); ++ mali_soft_job_destroy(job); ++ return schedule_mask; ++ } + -+ case KBASE_FUNC_HWCNT_DUMP: -+ { -+ /* args ignored */ -+ mutex_lock(&kctx->vinstr_cli_lock); -+ if (kbase_vinstr_hwc_dump(kctx->vinstr_cli, -+ BASE_HWCNT_READER_EVENT_MANUAL) != 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ mutex_unlock(&kctx->vinstr_cli_lock); -+ break; -+ } ++ /* Send activated notification. */ ++ mali_soft_job_send_activated_notification(job); + -+ case KBASE_FUNC_HWCNT_CLEAR: -+ { -+ /* args ignored */ -+ mutex_lock(&kctx->vinstr_cli_lock); -+ if (kbase_vinstr_hwc_clear(kctx->vinstr_cli) != 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ mutex_unlock(&kctx->vinstr_cli_lock); -+ break; -+ } ++ /* Wake up sleeping signaler. */ ++ job->activated = MALI_TRUE; + -+ case KBASE_FUNC_HWCNT_READER_SETUP: -+ { -+ struct kbase_uk_hwcnt_reader_setup *setup = args; ++ /* If job type is self signaled, release tracker, move soft job to free list, and scheduler at once */ ++ if (MALI_SOFT_JOB_TYPE_SELF_SIGNALED == job->type) { ++ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_STARTED == job->state); + -+ if (sizeof(*setup) != args_size) -+ goto bad_size; ++ job->state = MALI_SOFT_JOB_STATE_SIGNALED; ++ mali_soft_job_system_unlock(job->system); + -+ mutex_lock(&kctx->vinstr_cli_lock); -+ if (kbase_vinstr_hwcnt_reader_setup(kbdev->vinstr_ctx, -+ setup) != 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ mutex_unlock(&kctx->vinstr_cli_lock); -+ break; -+ } ++ schedule_mask |= mali_timeline_tracker_release(&job->tracker); + -+ case KBASE_FUNC_GPU_PROPS_REG_DUMP: -+ { -+ struct kbase_uk_gpuprops *setup = args; ++ mali_soft_job_destroy(job); ++ } else { ++ _mali_osk_wait_queue_wake_up(job->tracker.system->wait_queue); + -+ if (sizeof(*setup) != args_size) -+ goto bad_size; ++ mali_soft_job_system_unlock(job->system); ++ } + -+ if (kbase_gpuprops_uk_get_props(kctx, setup) != 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ break; -+ } -+ case KBASE_FUNC_FIND_CPU_OFFSET: -+ { -+ struct kbase_uk_find_cpu_offset *find = args; ++ return schedule_mask; ++} + -+ if (sizeof(*find) != args_size) -+ goto bad_size; ++mali_scheduler_mask mali_soft_job_system_timeout_job(struct mali_soft_job *job) ++{ ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; + -+ if (find->gpu_addr & ~PAGE_MASK) { -+ dev_warn(kbdev->dev, "kbase_legacy_dispatch case KBASE_FUNC_FIND_CPU_OFFSET: find->gpu_addr: passed parameter is invalid"); -+ goto out_bad; -+ } ++ MALI_DEBUG_ASSERT_POINTER(job); ++ MALI_DEBUG_ASSERT_POINTER(job->system); ++ MALI_DEBUG_ASSERT_POINTER(job->system->session); ++ MALI_DEBUG_ASSERT(MALI_TRUE == job->activated); + -+ if (find->size > SIZE_MAX || find->cpu_addr > ULONG_MAX) { -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ } else { -+ int err; ++ MALI_DEBUG_PRINT(4, ("Mali Soft Job: Timeline timeout for soft job %u (0x%08X).\n", job->id, job)); + -+ err = kbasep_find_enclosing_cpu_mapping_offset( -+ kctx, -+ find->cpu_addr, -+ find->size, -+ &find->offset); ++ mali_soft_job_system_lock(job->system); + -+ if (err) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ } -+ break; -+ } -+ case KBASE_FUNC_GET_VERSION: -+ { -+ struct kbase_uk_get_ddk_version *get_version = (struct kbase_uk_get_ddk_version *)args; ++ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_STARTED == job->state || ++ MALI_SOFT_JOB_STATE_SIGNALED == job->state); + -+ if (sizeof(*get_version) != args_size) -+ goto bad_size; ++ if (unlikely(job->system->session->is_aborting)) { ++ /* The session is aborting. This job will be released and destroyed by @ref ++ * mali_soft_job_system_abort(). */ ++ mali_soft_job_system_unlock(job->system); + -+ /* version buffer size check is made in compile time assert */ -+ memcpy(get_version->version_buffer, KERNEL_SIDE_DDK_VERSION_STRING, sizeof(KERNEL_SIDE_DDK_VERSION_STRING)); -+ get_version->version_string_size = sizeof(KERNEL_SIDE_DDK_VERSION_STRING); -+ break; -+ } ++ return MALI_SCHEDULER_MASK_EMPTY; ++ } + -+ case KBASE_FUNC_STREAM_CREATE: -+ { -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ struct kbase_uk_stream_create *screate = (struct kbase_uk_stream_create *)args; ++ if (MALI_SOFT_JOB_STATE_STARTED != job->state) { ++ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_SIGNALED == job->state); + -+ if (sizeof(*screate) != args_size) -+ goto bad_size; ++ /* The job is about to be signaled, ignore timeout. */ ++ MALI_DEBUG_PRINT(4, ("Mali Soft Job: Timeout on soft job %u (0x%08X) in signaled state.\n", job->id, job)); ++ mali_soft_job_system_unlock(job->system); ++ return schedule_mask; ++ } + -+ if (strnlen(screate->name, sizeof(screate->name)) >= sizeof(screate->name)) { -+ /* not NULL terminated */ -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ break; -+ } ++ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_STARTED == job->state); + -+ if (kbase_sync_fence_stream_create(screate->name, -+ &screate->fd) != 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ else -+ ukh->ret = MALI_ERROR_NONE; -+#else /* CONFIG_SYNC || CONFIG_SYNC_FILE */ -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ -+ break; -+ } -+ case KBASE_FUNC_FENCE_VALIDATE: -+ { -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ struct kbase_uk_fence_validate *fence_validate = (struct kbase_uk_fence_validate *)args; ++ job->state = MALI_SOFT_JOB_STATE_TIMED_OUT; ++ _mali_osk_atomic_inc(&job->refcount); + -+ if (sizeof(*fence_validate) != args_size) -+ goto bad_size; ++ mali_soft_job_system_unlock(job->system); + -+ if (kbase_sync_fence_validate(fence_validate->fd) != 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ else -+ ukh->ret = MALI_ERROR_NONE; -+#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ -+ break; -+ } ++ schedule_mask = mali_timeline_tracker_release(&job->tracker); + -+ case KBASE_FUNC_SET_TEST_DATA: -+ { -+#if MALI_UNIT_TEST -+ struct kbase_uk_set_test_data *set_data = args; ++ mali_soft_job_destroy(job); + -+ shared_kernel_test_data = set_data->test_data; -+ shared_kernel_test_data.kctx = (uintptr_t)kctx; -+ shared_kernel_test_data.mm = (uintptr_t)current->mm; -+ ukh->ret = MALI_ERROR_NONE; -+#endif /* MALI_UNIT_TEST */ -+ break; -+ } ++ return schedule_mask; ++} + -+ case KBASE_FUNC_INJECT_ERROR: -+ { -+#ifdef CONFIG_MALI_BIFROST_ERROR_INJECT -+ unsigned long flags; -+ struct kbase_error_params params = ((struct kbase_uk_error_params *)args)->params; ++void mali_soft_job_system_abort(struct mali_soft_job_system *system) ++{ ++ struct mali_soft_job *job, *tmp; ++ _MALI_OSK_LIST_HEAD_STATIC_INIT(jobs); + -+ /*mutex lock */ -+ spin_lock_irqsave(&kbdev->reg_op_lock, flags); -+ if (job_atom_inject_error(¶ms) != 0) -+ ukh->ret = MALI_ERROR_OUT_OF_MEMORY; -+ else -+ ukh->ret = MALI_ERROR_NONE; -+ spin_unlock_irqrestore(&kbdev->reg_op_lock, flags); -+ /*mutex unlock */ -+#endif /* CONFIG_MALI_BIFROST_ERROR_INJECT */ -+ break; -+ } ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(system->session); ++ MALI_DEBUG_ASSERT(system->session->is_aborting); + -+ case KBASE_FUNC_MODEL_CONTROL: -+ { -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+ unsigned long flags; -+ struct kbase_model_control_params params = -+ ((struct kbase_uk_model_control_params *)args)->params; ++ MALI_DEBUG_PRINT(3, ("Mali Soft Job: Aborting soft job system for session 0x%08X.\n", system->session)); + -+ /*mutex lock */ -+ spin_lock_irqsave(&kbdev->reg_op_lock, flags); -+ if (gpu_model_control(kbdev->model, ¶ms) != 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ else -+ ukh->ret = MALI_ERROR_NONE; -+ spin_unlock_irqrestore(&kbdev->reg_op_lock, flags); -+ /*mutex unlock */ -+#endif /* CONFIG_MALI_BIFROST_NO_MALI */ -+ break; -+ } ++ mali_soft_job_system_lock(system); + -+ case KBASE_FUNC_GET_PROFILING_CONTROLS: -+ { -+ struct kbase_uk_profiling_controls *controls = -+ (struct kbase_uk_profiling_controls *)args; -+ u32 i; ++ _MALI_OSK_LIST_FOREACHENTRY(job, tmp, &system->jobs_used, struct mali_soft_job, system_list) { ++ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_STARTED == job->state || ++ MALI_SOFT_JOB_STATE_TIMED_OUT == job->state); + -+ if (sizeof(*controls) != args_size) -+ goto bad_size; ++ if (MALI_SOFT_JOB_STATE_STARTED == job->state) { ++ /* If the job has been activated, we have to release the tracker and destroy ++ * the job. If not, the tracker will be released and the job destroyed when ++ * it is activated. */ ++ if (MALI_TRUE == job->activated) { ++ MALI_DEBUG_PRINT(3, ("Mali Soft Job: Aborting unsignaled soft job %u (0x%08X).\n", job->id, job)); + -+ for (i = FBDUMP_CONTROL_MIN; i < FBDUMP_CONTROL_MAX; i++) -+ controls->profiling_controls[i] = -+ kbdev->kbase_profiling_controls[i]; ++ job->state = MALI_SOFT_JOB_STATE_SIGNALED; ++ _mali_osk_list_move(&job->system_list, &jobs); ++ } ++ } else if (MALI_SOFT_JOB_STATE_TIMED_OUT == job->state) { ++ MALI_DEBUG_PRINT(3, ("Mali Soft Job: Aborting timed out soft job %u (0x%08X).\n", job->id, job)); + -+ break; ++ /* We need to destroy this soft job. */ ++ _mali_osk_list_move(&job->system_list, &jobs); + } ++ } + -+ /* used only for testing purposes; these controls are to be set by gator through gator API */ -+ case KBASE_FUNC_SET_PROFILING_CONTROLS: -+ { -+ struct kbase_uk_profiling_controls *controls = -+ (struct kbase_uk_profiling_controls *)args; -+ u32 i; -+ -+ if (sizeof(*controls) != args_size) -+ goto bad_size; ++ mali_soft_job_system_unlock(system); + -+ for (i = FBDUMP_CONTROL_MIN; i < FBDUMP_CONTROL_MAX; i++) -+ _mali_profiling_control(i, controls->profiling_controls[i]); ++ /* Release and destroy jobs. */ ++ _MALI_OSK_LIST_FOREACHENTRY(job, tmp, &jobs, struct mali_soft_job, system_list) { ++ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_SIGNALED == job->state || ++ MALI_SOFT_JOB_STATE_TIMED_OUT == job->state); + -+ break; ++ if (MALI_SOFT_JOB_STATE_SIGNALED == job->state) { ++ mali_timeline_tracker_release(&job->tracker); + } + -+ case KBASE_FUNC_DEBUGFS_MEM_PROFILE_ADD: -+ { -+ struct kbase_uk_debugfs_mem_profile_add *add_data = -+ (struct kbase_uk_debugfs_mem_profile_add *)args; -+ char *buf; -+ char __user *user_buf; -+ -+ if (sizeof(*add_data) != args_size) -+ goto bad_size; -+ -+ if (add_data->len > KBASE_MEM_PROFILE_MAX_BUF_SIZE) { -+ dev_err(kbdev->dev, "buffer too big\n"); -+ goto out_bad; -+ } -+ -+#ifdef CONFIG_COMPAT -+ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) -+ user_buf = compat_ptr(add_data->buf); -+ else -+#endif -+ user_buf = u64_to_user_ptr(add_data->buf); ++ /* Move job back to used list before destroying. */ ++ _mali_osk_list_move(&job->system_list, &system->jobs_used); + -+ buf = kmalloc(add_data->len, GFP_KERNEL); -+ if (ZERO_OR_NULL_PTR(buf)) -+ goto out_bad; ++ mali_soft_job_destroy(job); ++ } ++} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h +new file mode 100755 +index 000000000..018ef4c52 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h +@@ -0,0 +1,190 @@ ++/* ++ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ if (0 != copy_from_user(buf, user_buf, add_data->len)) { -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ kfree(buf); -+ goto out_bad; -+ } ++#ifndef __MALI_SOFT_JOB_H__ ++#define __MALI_SOFT_JOB_H__ + -+ if (kbasep_mem_profile_debugfs_insert(kctx, buf, -+ add_data->len)) { -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ goto out_bad; -+ } ++#include "mali_osk.h" + -+ break; -+ } ++#include "mali_timeline.h" + -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+ case KBASE_FUNC_SET_PRFCNT_VALUES: -+ { ++struct mali_timeline_fence; ++struct mali_session_data; ++struct mali_soft_job; ++struct mali_soft_job_system; + -+ struct kbase_uk_prfcnt_values *params = -+ ((struct kbase_uk_prfcnt_values *)args); -+ gpu_model_set_dummy_prfcnt_sample(params->data, -+ params->size); ++/** ++ * Soft job types. ++ * ++ * Soft jobs of type MALI_SOFT_JOB_TYPE_USER_SIGNALED will only complete after activation if either ++ * they are signaled by user-space (@ref mali_soft_job_system_signaled_job) or if they are timed out ++ * by the Timeline system. ++ * Soft jobs of type MALI_SOFT_JOB_TYPE_SELF_SIGNALED will release job resource automatically ++ * in kernel when the job is activated. ++ */ ++typedef enum mali_soft_job_type { ++ MALI_SOFT_JOB_TYPE_SELF_SIGNALED, ++ MALI_SOFT_JOB_TYPE_USER_SIGNALED, ++} mali_soft_job_type; + -+ break; -+ } -+#endif /* CONFIG_MALI_BIFROST_NO_MALI */ -+#ifdef BASE_LEGACY_UK10_4_SUPPORT -+ case KBASE_FUNC_TLSTREAM_ACQUIRE_V10_4: -+ { -+ struct kbase_uk_tlstream_acquire_v10_4 *tlstream_acquire -+ = args; -+ int ret; ++/** ++ * Soft job state. ++ * ++ * mali_soft_job_system_start_job a job will first be allocated.The job's state set to MALI_SOFT_JOB_STATE_ALLOCATED. ++ * Once the job is added to the timeline system, the state changes to MALI_SOFT_JOB_STATE_STARTED. ++ * ++ * For soft jobs of type MALI_SOFT_JOB_TYPE_USER_SIGNALED the state is changed to ++ * MALI_SOFT_JOB_STATE_SIGNALED when @ref mali_soft_job_system_signal_job is called and the soft ++ * job's state is MALI_SOFT_JOB_STATE_STARTED or MALI_SOFT_JOB_STATE_TIMED_OUT. ++ * ++ * If a soft job of type MALI_SOFT_JOB_TYPE_USER_SIGNALED is timed out before being signaled, the ++ * state is changed to MALI_SOFT_JOB_STATE_TIMED_OUT. This can only happen to soft jobs in state ++ * MALI_SOFT_JOB_STATE_STARTED. ++ * ++ */ ++typedef enum mali_soft_job_state { ++ MALI_SOFT_JOB_STATE_ALLOCATED, ++ MALI_SOFT_JOB_STATE_STARTED, ++ MALI_SOFT_JOB_STATE_SIGNALED, ++ MALI_SOFT_JOB_STATE_TIMED_OUT, ++} mali_soft_job_state; + -+ if (sizeof(*tlstream_acquire) != args_size) -+ goto bad_size; ++#define MALI_SOFT_JOB_INVALID_ID ((u32) -1) + -+ ret = kbase_tlstream_acquire( -+ kctx, 0); -+ if (ret < 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ else -+ tlstream_acquire->fd = ret; -+ break; -+ } -+#endif /* BASE_LEGACY_UK10_4_SUPPORT */ -+ case KBASE_FUNC_TLSTREAM_ACQUIRE: -+ { -+ struct kbase_uk_tlstream_acquire *tlstream_acquire = -+ args; -+ int ret; ++/** ++ * Soft job struct. ++ * ++ * Soft job can be used to represent any kind of CPU work done in kernel-space. ++ */ ++typedef struct mali_soft_job { ++ mali_soft_job_type type; /**< Soft job type. Must be one of MALI_SOFT_JOB_TYPE_*. */ ++ u64 user_job; /**< Identifier for soft job in user space. */ ++ _mali_osk_atomic_t refcount; /**< Soft jobs are reference counted to prevent premature deletion. */ ++ struct mali_timeline_tracker tracker; /**< Timeline tracker for soft job. */ ++ mali_bool activated; /**< MALI_TRUE if the job has been activated, MALI_FALSE if not. */ ++ _mali_osk_notification_t *activated_notification; /**< Pre-allocated notification object for ACTIVATED_NOTIFICATION. */ + -+ if (sizeof(*tlstream_acquire) != args_size) -+ goto bad_size; ++ /* Protected by soft job system lock. */ ++ u32 id; /**< Used by user-space to find corresponding soft job in kernel-space. */ ++ mali_soft_job_state state; /**< State of soft job, must be one of MALI_SOFT_JOB_STATE_*. */ ++ struct mali_soft_job_system *system; /**< The soft job system this job is in. */ ++ _mali_osk_list_t system_list; /**< List element used by soft job system. */ ++} mali_soft_job; + -+ if (tlstream_acquire->flags & ~BASE_TLSTREAM_FLAGS_MASK) -+ goto out_bad; ++/** ++ * Per-session soft job system. ++ * ++ * The soft job system is used to manage all soft jobs that belongs to a session. ++ */ ++typedef struct mali_soft_job_system { ++ struct mali_session_data *session; /**< The session this soft job system belongs to. */ ++ _MALI_OSK_LIST_HEAD(jobs_used); /**< List of all allocated soft jobs. */ + -+ ret = kbase_tlstream_acquire( -+ kctx, tlstream_acquire->flags); -+ if (ret < 0) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; -+ else -+ tlstream_acquire->fd = ret; -+ break; -+ } -+ case KBASE_FUNC_TLSTREAM_FLUSH: -+ { -+ struct kbase_uk_tlstream_flush *tlstream_flush = -+ args; ++ _mali_osk_spinlock_irq_t *lock; /**< Lock used to protect soft job system and its soft jobs. */ ++ u32 lock_owner; /**< Contains tid of thread that locked the system or 0, if not locked. */ ++ u32 last_job_id; /**< Recored the last job id protected by lock. */ ++} mali_soft_job_system; + -+ if (sizeof(*tlstream_flush) != args_size) -+ goto bad_size; ++/** ++ * Create a soft job system. ++ * ++ * @param session The session this soft job system will belong to. ++ * @return The new soft job system, or NULL if unsuccessful. ++ */ ++struct mali_soft_job_system *mali_soft_job_system_create(struct mali_session_data *session); + -+ kbase_tlstream_flush_streams(); -+ break; -+ } -+#if MALI_UNIT_TEST -+ case KBASE_FUNC_TLSTREAM_TEST: -+ { -+ struct kbase_uk_tlstream_test *tlstream_test = args; ++/** ++ * Destroy a soft job system. ++ * ++ * @note The soft job must not have any started or activated jobs. Call @ref ++ * mali_soft_job_system_abort first. ++ * ++ * @param system The soft job system we are destroying. ++ */ ++void mali_soft_job_system_destroy(struct mali_soft_job_system *system); + -+ if (sizeof(*tlstream_test) != args_size) -+ goto bad_size; ++/** ++ * Create a soft job. ++ * ++ * @param system Soft job system to create soft job from. ++ * @param type Type of the soft job. ++ * @param user_job Identifier for soft job in user space. ++ * @return New soft job if successful, NULL if not. ++ */ ++struct mali_soft_job *mali_soft_job_create(struct mali_soft_job_system *system, mali_soft_job_type type, u64 user_job); + -+ kbase_tlstream_test( -+ tlstream_test->tpw_count, -+ tlstream_test->msg_delay, -+ tlstream_test->msg_count, -+ tlstream_test->aux_msg); -+ break; -+ } -+ case KBASE_FUNC_TLSTREAM_STATS: -+ { -+ struct kbase_uk_tlstream_stats *tlstream_stats = args; ++/** ++ * Destroy soft job. ++ * ++ * @param job Soft job to destroy. ++ */ ++void mali_soft_job_destroy(struct mali_soft_job *job); + -+ if (sizeof(*tlstream_stats) != args_size) -+ goto bad_size; ++/** ++ * Start a soft job. ++ * ++ * The soft job will be added to the Timeline system which will then activate it after all ++ * dependencies have been resolved. ++ * ++ * Create soft jobs with @ref mali_soft_job_create before starting them. ++ * ++ * @param job Soft job to start. ++ * @param fence Fence representing dependencies for this soft job. ++ * @return Point on soft job timeline. ++ */ ++mali_timeline_point mali_soft_job_start(struct mali_soft_job *job, struct mali_timeline_fence *fence); + -+ kbase_tlstream_stats( -+ &tlstream_stats->bytes_collected, -+ &tlstream_stats->bytes_generated); -+ break; -+ } -+#endif /* MALI_UNIT_TEST */ ++/** ++ * Use by user-space to signal that a soft job has completed. ++ * ++ * @note Only valid for soft jobs with type MALI_SOFT_JOB_TYPE_USER_SIGNALED. ++ * ++ * @note The soft job must be in state MALI_SOFT_JOB_STATE_STARTED for the signal to be successful. ++ * ++ * @note If the soft job was signaled successfully, or it received a time out, the soft job will be ++ * destroyed after this call and should no longer be used. ++ * ++ * @note This function will block until the soft job has been activated. ++ * ++ * @param system The soft job system the job was started in. ++ * @param job_id ID of soft job we are signaling. ++ * ++ * @return _MALI_OSK_ERR_ITEM_NOT_FOUND if the soft job ID was invalid, _MALI_OSK_ERR_TIMEOUT if the ++ * soft job was timed out or _MALI_OSK_ERR_OK if we successfully signaled the soft job. ++ */ ++_mali_osk_errcode_t mali_soft_job_system_signal_job(struct mali_soft_job_system *system, u32 job_id); + -+ case KBASE_FUNC_GET_CONTEXT_ID: -+ { -+ struct kbase_uk_context_id *info = args; ++/** ++ * Used by the Timeline system to activate a soft job. ++ * ++ * @param job The soft job that is being activated. ++ * @return A scheduling bitmask. ++ */ ++mali_scheduler_mask mali_soft_job_system_activate_job(struct mali_soft_job *job); + -+ info->id = kctx->id; -+ break; -+ } ++/** ++ * Used by the Timeline system to timeout a soft job. ++ * ++ * A soft job is timed out if it completes or is signaled later than MALI_TIMELINE_TIMEOUT_HZ after ++ * activation. ++ * ++ * @param job The soft job that is being timed out. ++ * @return A scheduling bitmask. ++ */ ++mali_scheduler_mask mali_soft_job_system_timeout_job(struct mali_soft_job *job); + -+ case KBASE_FUNC_SOFT_EVENT_UPDATE: -+ { -+ struct kbase_uk_soft_event_update *update = args; ++/** ++ * Used to cleanup activated soft jobs in the soft job system on session abort. ++ * ++ * @param system The soft job system that is being aborted. ++ */ ++void mali_soft_job_system_abort(struct mali_soft_job_system *system); + -+ if (sizeof(*update) != args_size) -+ goto bad_size; ++#endif /* __MALI_SOFT_JOB_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c +new file mode 100755 +index 000000000..f829e99f0 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c +@@ -0,0 +1,77 @@ ++/* ++ * Copyright (C) 2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ if (((update->new_status != BASE_JD_SOFT_EVENT_SET) && -+ (update->new_status != BASE_JD_SOFT_EVENT_RESET)) || -+ (update->flags != 0)) -+ goto out_bad; ++#include "mali_spinlock_reentrant.h" + -+ if (kbase_soft_event_update(kctx, update->evt, -+ update->new_status)) -+ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++#include "mali_osk.h" ++#include "mali_kernel_common.h" + -+ break; -+ } ++struct mali_spinlock_reentrant *mali_spinlock_reentrant_init(_mali_osk_lock_order_t lock_order) ++{ ++ struct mali_spinlock_reentrant *spinlock; + -+ default: -+ dev_err(kbdev->dev, "unknown ioctl %u\n", id); -+ goto out_bad; ++ spinlock = _mali_osk_calloc(1, sizeof(struct mali_spinlock_reentrant)); ++ if (NULL == spinlock) { ++ return NULL; + } + -+ return ret; ++ spinlock->lock = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_ORDERED, lock_order); ++ if (NULL == spinlock->lock) { ++ mali_spinlock_reentrant_term(spinlock); ++ return NULL; ++ } + -+ bad_size: -+ dev_err(kbdev->dev, "Wrong syscall size (%d) for %08x\n", args_size, id); -+ out_bad: -+ return -EINVAL; ++ return spinlock; +} + -+static struct kbase_device *to_kbase_device(struct device *dev) ++void mali_spinlock_reentrant_term(struct mali_spinlock_reentrant *spinlock) +{ -+ return dev_get_drvdata(dev); -+} ++ MALI_DEBUG_ASSERT_POINTER(spinlock); ++ MALI_DEBUG_ASSERT(0 == spinlock->counter && 0 == spinlock->owner); + -+static int assign_irqs(struct platform_device *pdev) -+{ -+ struct kbase_device *kbdev = to_kbase_device(&pdev->dev); -+ int i; ++ if (NULL != spinlock->lock) { ++ _mali_osk_spinlock_irq_term(spinlock->lock); ++ } + -+ if (!kbdev) -+ return -ENODEV; ++ _mali_osk_free(spinlock); ++} + -+ /* 3 IRQ resources */ -+ for (i = 0; i < 3; i++) { -+ struct resource *irq_res; -+ int irqtag; ++void mali_spinlock_reentrant_wait(struct mali_spinlock_reentrant *spinlock, u32 tid) ++{ ++ MALI_DEBUG_ASSERT_POINTER(spinlock); ++ MALI_DEBUG_ASSERT_POINTER(spinlock->lock); ++ MALI_DEBUG_ASSERT(0 != tid); + -+ irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, i); -+ if (!irq_res) { -+ dev_err(kbdev->dev, "No IRQ resource at index %d\n", i); -+ return -ENOENT; -+ } ++ MALI_DEBUG_PRINT(5, ("%s ^\n", __FUNCTION__)); + -+#ifdef CONFIG_OF -+ if (!strncmp(irq_res->name, "JOB", 4)) { -+ irqtag = JOB_IRQ_TAG; -+ } else if (!strncmp(irq_res->name, "MMU", 4)) { -+ irqtag = MMU_IRQ_TAG; -+ } else if (!strncmp(irq_res->name, "GPU", 4)) { -+ irqtag = GPU_IRQ_TAG; -+ } else { -+ dev_err(&pdev->dev, "Invalid irq res name: '%s'\n", -+ irq_res->name); -+ return -EINVAL; -+ } -+#else -+ irqtag = i; -+#endif /* CONFIG_OF */ -+ kbdev->irqs[irqtag].irq = irq_res->start; -+ kbdev->irqs[irqtag].flags = irq_res->flags & IRQF_TRIGGER_MASK; ++ if (tid != spinlock->owner) { ++ _mali_osk_spinlock_irq_lock(spinlock->lock); ++ MALI_DEBUG_ASSERT(0 == spinlock->owner && 0 == spinlock->counter); ++ spinlock->owner = tid; + } + -+ return 0; -+} ++ MALI_DEBUG_PRINT(5, ("%s v\n", __FUNCTION__)); + -+/* -+ * API to acquire device list mutex and -+ * return pointer to the device list head -+ */ -+const struct list_head *kbase_dev_list_get(void) -+{ -+ mutex_lock(&kbase_dev_list_lock); -+ return &kbase_dev_list; ++ ++spinlock->counter; +} -+KBASE_EXPORT_TEST_API(kbase_dev_list_get); + -+/* API to release the device list mutex */ -+void kbase_dev_list_put(const struct list_head *dev_list) ++void mali_spinlock_reentrant_signal(struct mali_spinlock_reentrant *spinlock, u32 tid) +{ -+ mutex_unlock(&kbase_dev_list_lock); ++ MALI_DEBUG_ASSERT_POINTER(spinlock); ++ MALI_DEBUG_ASSERT_POINTER(spinlock->lock); ++ MALI_DEBUG_ASSERT(0 != tid && tid == spinlock->owner); ++ ++ --spinlock->counter; ++ if (0 == spinlock->counter) { ++ spinlock->owner = 0; ++ MALI_DEBUG_PRINT(5, ("%s release last\n", __FUNCTION__)); ++ _mali_osk_spinlock_irq_unlock(spinlock->lock); ++ } +} -+KBASE_EXPORT_TEST_API(kbase_dev_list_put); +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h +new file mode 100755 +index 000000000..4d788ec1b +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h +@@ -0,0 +1,70 @@ ++/* ++ * Copyright (C) 2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+/* Find a particular kbase device (as specified by minor number), or find the "first" device if -1 is specified */ -+struct kbase_device *kbase_find_device(int minor) -+{ -+ struct kbase_device *kbdev = NULL; -+ struct list_head *entry; -+ const struct list_head *dev_list = kbase_dev_list_get(); ++#ifndef __MALI_SPINLOCK_REENTRANT_H__ ++#define __MALI_SPINLOCK_REENTRANT_H__ + -+ list_for_each(entry, dev_list) { -+ struct kbase_device *tmp; ++#include "mali_osk.h" ++#include "mali_kernel_common.h" + -+ tmp = list_entry(entry, struct kbase_device, entry); -+ if (tmp->mdev.minor == minor || minor == -1) { -+ kbdev = tmp; -+ get_device(kbdev->dev); -+ break; -+ } -+ } -+ kbase_dev_list_put(dev_list); ++/** ++ * Reentrant spinlock. ++ */ ++struct mali_spinlock_reentrant { ++ _mali_osk_spinlock_irq_t *lock; ++ u32 owner; ++ u32 counter; ++}; + -+ return kbdev; -+} -+EXPORT_SYMBOL(kbase_find_device); ++/** ++ * Create a new reentrant spinlock. ++ * ++ * @param lock_order Lock order. ++ * @return New reentrant spinlock. ++ */ ++struct mali_spinlock_reentrant *mali_spinlock_reentrant_init(_mali_osk_lock_order_t lock_order); + -+void kbase_release_device(struct kbase_device *kbdev) ++/** ++ * Terminate reentrant spinlock and free any associated resources. ++ * ++ * @param spinlock Reentrant spinlock to terminate. ++ */ ++void mali_spinlock_reentrant_term(struct mali_spinlock_reentrant *spinlock); ++ ++/** ++ * Wait for reentrant spinlock to be signaled. ++ * ++ * @param spinlock Reentrant spinlock. ++ * @param tid Thread ID. ++ */ ++void mali_spinlock_reentrant_wait(struct mali_spinlock_reentrant *spinlock, u32 tid); ++ ++/** ++ * Signal reentrant spinlock. ++ * ++ * @param spinlock Reentrant spinlock. ++ * @param tid Thread ID. ++ */ ++void mali_spinlock_reentrant_signal(struct mali_spinlock_reentrant *spinlock, u32 tid); ++ ++/** ++ * Check if thread is holding reentrant spinlock. ++ * ++ * @param spinlock Reentrant spinlock. ++ * @param tid Thread ID. ++ * @return MALI_TRUE if thread is holding spinlock, MALI_FALSE if not. ++ */ ++MALI_STATIC_INLINE mali_bool mali_spinlock_reentrant_is_held(struct mali_spinlock_reentrant *spinlock, u32 tid) +{ -+ put_device(kbdev->dev); ++ MALI_DEBUG_ASSERT_POINTER(spinlock->lock); ++ return (tid == spinlock->owner && 0 < spinlock->counter); +} -+EXPORT_SYMBOL(kbase_release_device); + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) && \ -+ !(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 28) && \ -+ LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)) ++#endif /* __MALI_SPINLOCK_REENTRANT_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c +new file mode 100755 +index 000000000..ffffee930 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c +@@ -0,0 +1,1964 @@ +/* -+ * Older versions, before v4.6, of the kernel doesn't have -+ * kstrtobool_from_user(), except longterm 4.4.y which had it added in 4.4.28 ++ * Copyright (C) 2013-2018 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+static int kstrtobool_from_user(const char __user *s, size_t count, bool *res) -+{ -+ char buf[32]; -+ -+ count = min(sizeof(buf), count); ++#include ++#include "mali_timeline.h" ++#include "mali_kernel_common.h" ++#include "mali_scheduler.h" ++#include "mali_soft_job.h" ++#include "mali_timeline_fence_wait.h" ++#include "mali_timeline_sync_fence.h" ++#include "mali_executor.h" ++#include "mali_pp_job.h" + -+ if (copy_from_user(buf, s, count)) -+ return -EFAULT; -+ buf[count] = '\0'; ++#define MALI_TIMELINE_SYSTEM_LOCKED(system) (mali_spinlock_reentrant_is_held((system)->spinlock, _mali_osk_get_tid())) + -+ return strtobool(buf, res); -+} ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++_mali_osk_wq_work_t *sync_fence_callback_work_t = NULL; ++_mali_osk_spinlock_irq_t *sync_fence_callback_list_lock = NULL; ++static _MALI_OSK_LIST_HEAD_STATIC_INIT(sync_fence_callback_queue); +#endif + -+static ssize_t write_ctx_infinite_cache(struct file *f, const char __user *ubuf, size_t size, loff_t *off) -+{ -+ struct kbase_context *kctx = f->private_data; -+ int err; -+ bool value; ++/* ++ * Following three elements are used to record how many ++ * gp, physical pp or virtual pp jobs are delayed in the whole ++ * timeline system, we can use these three value to decide ++ * if need to deactivate idle group. ++ */ ++_mali_osk_atomic_t gp_tracker_count; ++_mali_osk_atomic_t phy_pp_tracker_count; ++_mali_osk_atomic_t virt_pp_tracker_count; + -+ err = kstrtobool_from_user(ubuf, size, &value); -+ if (err) -+ return err; ++static mali_scheduler_mask mali_timeline_system_release_waiter(struct mali_timeline_system *system, ++ struct mali_timeline_waiter *waiter); + -+ if (value) -+ kbase_ctx_flag_set(kctx, KCTX_INFINITE_CACHE); -+ else -+ kbase_ctx_flag_clear(kctx, KCTX_INFINITE_CACHE); ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#include ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) ++#include ++#include ++#include + -+ return size; ++struct mali_deferred_fence_put_entry { ++ struct hlist_node list; ++ struct sync_fence *fence; ++}; ++ ++static HLIST_HEAD(mali_timeline_sync_fence_to_free_list); ++static DEFINE_SPINLOCK(mali_timeline_sync_fence_to_free_lock); ++ ++static void put_sync_fences(struct work_struct *ignore) ++{ ++ struct hlist_head list; ++ struct hlist_node *tmp, *pos; ++ unsigned long flags; ++ struct mali_deferred_fence_put_entry *o; ++ ++ spin_lock_irqsave(&mali_timeline_sync_fence_to_free_lock, flags); ++ hlist_move_list(&mali_timeline_sync_fence_to_free_list, &list); ++ spin_unlock_irqrestore(&mali_timeline_sync_fence_to_free_lock, flags); ++ ++ hlist_for_each_entry_safe(o, pos, tmp, &list, list) { ++ sync_fence_put(o->fence); ++ kfree(o); ++ } +} + -+static ssize_t read_ctx_infinite_cache(struct file *f, char __user *ubuf, size_t size, loff_t *off) ++static DECLARE_DELAYED_WORK(delayed_sync_fence_put, put_sync_fences); ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) */ ++ ++/* Callback that is called when a sync fence a tracker is waiting on is signaled. */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++static void mali_timeline_sync_fence_callback(struct sync_fence *sync_fence, struct sync_fence_waiter *sync_fence_waiter) ++#else ++static void mali_timeline_sync_fence_callback(struct mali_internal_sync_fence *sync_fence, struct mali_internal_sync_fence_waiter *sync_fence_waiter) ++#endif +{ -+ struct kbase_context *kctx = f->private_data; -+ char buf[32]; -+ int count; -+ bool value; ++ struct mali_timeline_tracker *tracker; + -+ value = kbase_ctx_flag(kctx, KCTX_INFINITE_CACHE); ++ MALI_IGNORE(sync_fence); ++ MALI_DEBUG_ASSERT_POINTER(sync_fence_waiter); + -+ count = scnprintf(buf, sizeof(buf), "%s\n", value ? "Y" : "N"); ++ tracker = _MALI_OSK_CONTAINER_OF(sync_fence_waiter, struct mali_timeline_tracker, sync_fence_waiter); ++ MALI_DEBUG_ASSERT_POINTER(tracker); + -+ return simple_read_from_buffer(ubuf, size, off, buf, count); ++ _mali_osk_spinlock_irq_lock(sync_fence_callback_list_lock); ++ _mali_osk_list_addtail(&tracker->sync_fence_signal_list, &sync_fence_callback_queue); ++ _mali_osk_spinlock_irq_unlock(sync_fence_callback_list_lock); ++ ++ _mali_osk_wq_schedule_work(sync_fence_callback_work_t); +} ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+static const struct file_operations kbase_infinite_cache_fops = { -+ .open = simple_open, -+ .write = write_ctx_infinite_cache, -+ .read = read_ctx_infinite_cache, -+}; ++static mali_scheduler_mask mali_timeline_tracker_time_out(struct mali_timeline_tracker *tracker) ++{ ++ MALI_DEBUG_ASSERT_POINTER(tracker); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_TRACKER_SOFT == tracker->type); + -+static int kbase_open(struct inode *inode, struct file *filp) ++ return mali_soft_job_system_timeout_job((struct mali_soft_job *) tracker->job); ++} ++ ++static void mali_timeline_timer_callback(void *data) +{ -+ struct kbase_device *kbdev = NULL; -+ struct kbase_context *kctx; -+ int ret = 0; -+#ifdef CONFIG_DEBUG_FS -+ char kctx_name[64]; -+#endif ++ struct mali_timeline_system *system; ++ struct mali_timeline_tracker *tracker; ++ struct mali_timeline *timeline; ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; ++ u32 tid = _mali_osk_get_tid(); + -+ kbdev = kbase_find_device(iminor(inode)); ++ timeline = (struct mali_timeline *) data; ++ MALI_DEBUG_ASSERT_POINTER(timeline); + -+ if (!kbdev) -+ return -ENODEV; ++ system = timeline->system; ++ MALI_DEBUG_ASSERT_POINTER(system); + -+ kctx = kbase_create_context(kbdev, is_compat_task()); -+ if (!kctx) { -+ ret = -ENOMEM; -+ goto out; ++ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ ++ if (!system->timer_enabled) { ++ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ return; + } + -+ init_waitqueue_head(&kctx->event_queue); -+ filp->private_data = kctx; -+ kctx->filp = filp; ++ tracker = timeline->tracker_tail; ++ timeline->timer_active = MALI_FALSE; + -+ if (kbdev->infinite_cache_active_default) -+ kbase_ctx_flag_set(kctx, KCTX_INFINITE_CACHE); ++ if (NULL != tracker && MALI_TRUE == tracker->timer_active) { ++ /* This is likely the delayed work that has been schedule out before cancelled. */ ++ if (MALI_TIMELINE_TIMEOUT_HZ > (_mali_osk_time_tickcount() - tracker->os_tick_activate)) { ++ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ return; ++ } + -+#ifdef CONFIG_DEBUG_FS -+ snprintf(kctx_name, 64, "%d_%d", kctx->tgid, kctx->id); ++ schedule_mask = mali_timeline_tracker_time_out(tracker); ++ tracker->timer_active = MALI_FALSE; ++ } else { ++ MALI_PRINT_ERROR(("Mali Timeline: Soft job timer callback without a waiting tracker.\n")); ++ } + -+ kctx->kctx_dentry = debugfs_create_dir(kctx_name, -+ kbdev->debugfs_ctx_directory); ++ mali_spinlock_reentrant_signal(system->spinlock, tid); + -+ if (IS_ERR_OR_NULL(kctx->kctx_dentry)) { -+ ret = -ENOMEM; -+ goto out; -+ } ++ mali_executor_schedule_from_mask(schedule_mask, MALI_FALSE); ++} + -+ debugfs_create_file("infinite_cache", 0644, kctx->kctx_dentry, -+ kctx, &kbase_infinite_cache_fops); ++void mali_timeline_system_stop_timer(struct mali_timeline_system *system) ++{ ++ u32 i; ++ u32 tid = _mali_osk_get_tid(); + -+ mutex_init(&kctx->mem_profile_lock); ++ MALI_DEBUG_ASSERT_POINTER(system); + -+ kbasep_jd_debugfs_ctx_init(kctx); -+ kbase_debug_mem_view_init(filp); ++ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ system->timer_enabled = MALI_FALSE; ++ mali_spinlock_reentrant_signal(system->spinlock, tid); + -+ kbase_debug_job_fault_context_init(kctx); ++ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { ++ struct mali_timeline *timeline = system->timelines[i]; + -+ kbase_mem_pool_debugfs_init(kctx->kctx_dentry, &kctx->mem_pool, &kctx->lp_mem_pool); ++ MALI_DEBUG_ASSERT_POINTER(timeline); + -+ kbase_jit_debugfs_init(kctx); -+#endif /* CONFIG_DEBUG_FS */ ++ if (NULL != timeline->delayed_work) { ++ _mali_osk_wq_delayed_cancel_work_sync(timeline->delayed_work); ++ timeline->timer_active = MALI_FALSE; ++ } ++ } ++} + -+ dev_dbg(kbdev->dev, "created base context\n"); ++static void mali_timeline_destroy(struct mali_timeline *timeline) ++{ ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ if (NULL != timeline) { ++ /* Assert that the timeline object has been properly cleaned up before destroying it. */ ++ MALI_DEBUG_ASSERT(timeline->point_oldest == timeline->point_next); ++ MALI_DEBUG_ASSERT(NULL == timeline->tracker_head); ++ MALI_DEBUG_ASSERT(NULL == timeline->tracker_tail); ++ MALI_DEBUG_ASSERT(NULL == timeline->waiter_head); ++ MALI_DEBUG_ASSERT(NULL == timeline->waiter_tail); ++ MALI_DEBUG_ASSERT(NULL != timeline->system); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_MAX > timeline->id); + -+ { -+ struct kbasep_kctx_list_element *element; ++ if (NULL != timeline->delayed_work) { ++ _mali_osk_wq_delayed_cancel_work_sync(timeline->delayed_work); ++ _mali_osk_wq_delayed_delete_work_nonflush(timeline->delayed_work); ++ } + -+ element = kzalloc(sizeof(*element), GFP_KERNEL); -+ if (element) { -+ mutex_lock(&kbdev->kctx_list_lock); -+ element->kctx = kctx; -+ list_add(&element->link, &kbdev->kctx_list); -+ KBASE_TLSTREAM_TL_NEW_CTX( -+ element->kctx, -+ element->kctx->id, -+ (u32)(element->kctx->tgid)); -+ mutex_unlock(&kbdev->kctx_list_lock); -+ } else { -+ /* we don't treat this as a fail - just warn about it */ -+ dev_warn(kbdev->dev, "couldn't add kctx to kctx_list\n"); ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ if (NULL != timeline->sync_tl) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ sync_timeline_destroy(timeline->sync_tl); ++#else ++ mali_internal_sync_timeline_destroy(timeline->sync_tl); ++#endif + } ++#else ++ _mali_osk_free(timeline); ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + } -+ return 0; -+ -+ out: -+ kbase_release_device(kbdev); -+ return ret; +} + -+static int kbase_release(struct inode *inode, struct file *filp) ++static struct mali_timeline *mali_timeline_create(struct mali_timeline_system *system, enum mali_timeline_id id) +{ -+ struct kbase_context *kctx = filp->private_data; -+ struct kbase_device *kbdev = kctx->kbdev; -+ struct kbasep_kctx_list_element *element, *tmp; -+ bool found_element = false; ++ struct mali_timeline *timeline; + -+ KBASE_TLSTREAM_TL_DEL_CTX(kctx); ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT(id < MALI_TIMELINE_MAX); + -+#ifdef CONFIG_DEBUG_FS -+ kbasep_mem_profile_debugfs_remove(kctx); -+ kbase_debug_job_fault_context_term(kctx); ++ timeline = (struct mali_timeline *) _mali_osk_calloc(1, sizeof(struct mali_timeline)); ++ if (NULL == timeline) { ++ return NULL; ++ } ++ ++ /* Initially the timeline is empty. */ ++#if defined(MALI_TIMELINE_DEBUG_START_POINT) ++ /* Start the timeline a bit before wrapping when debugging. */ ++ timeline->point_next = UINT_MAX - MALI_TIMELINE_MAX_POINT_SPAN - 128; ++#else ++ timeline->point_next = 1; +#endif ++ timeline->point_oldest = timeline->point_next; + -+ mutex_lock(&kbdev->kctx_list_lock); -+ list_for_each_entry_safe(element, tmp, &kbdev->kctx_list, link) { -+ if (element->kctx == kctx) { -+ list_del(&element->link); -+ kfree(element); -+ found_element = true; -+ } ++ /* The tracker and waiter lists will initially be empty. */ ++ ++ timeline->system = system; ++ timeline->id = id; ++ ++ timeline->delayed_work = _mali_osk_wq_delayed_create_work(mali_timeline_timer_callback, timeline); ++ if (NULL == timeline->delayed_work) { ++ mali_timeline_destroy(timeline); ++ return NULL; + } -+ mutex_unlock(&kbdev->kctx_list_lock); -+ if (!found_element) -+ dev_warn(kbdev->dev, "kctx not in kctx_list\n"); + -+ filp->private_data = NULL; ++ timeline->timer_active = MALI_FALSE; + -+ mutex_lock(&kctx->vinstr_cli_lock); -+ /* If this client was performing hwcnt dumping and did not explicitly -+ * detach itself, remove it from the vinstr core now */ -+ if (kctx->vinstr_cli) { -+ struct kbase_uk_hwcnt_setup setup; ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ { ++ char timeline_name[32]; + -+ setup.dump_buffer = 0llu; -+ kbase_vinstr_legacy_hwc_setup( -+ kbdev->vinstr_ctx, &kctx->vinstr_cli, &setup); -+ } -+ mutex_unlock(&kctx->vinstr_cli_lock); ++ switch (id) { ++ case MALI_TIMELINE_GP: ++ _mali_osk_snprintf(timeline_name, 32, "mali-%u-gp", _mali_osk_get_pid()); ++ break; ++ case MALI_TIMELINE_PP: ++ _mali_osk_snprintf(timeline_name, 32, "mali-%u-pp", _mali_osk_get_pid()); ++ break; ++ case MALI_TIMELINE_SOFT: ++ _mali_osk_snprintf(timeline_name, 32, "mali-%u-soft", _mali_osk_get_pid()); ++ break; ++ default: ++ MALI_PRINT_ERROR(("Mali Timeline: Invalid timeline id %d\n", id)); ++ mali_timeline_destroy(timeline); ++ return NULL; ++ } + -+ kbase_destroy_context(kctx); ++ timeline->destroyed = MALI_FALSE; + -+ dev_dbg(kbdev->dev, "deleted base context\n"); -+ kbase_release_device(kbdev); -+ return 0; -+} ++ timeline->sync_tl = mali_sync_timeline_create(timeline, timeline_name); ++ if (NULL == timeline->sync_tl) { ++ mali_timeline_destroy(timeline); ++ return NULL; ++ } + -+#define CALL_MAX_SIZE 536 ++ timeline->spinlock = mali_spinlock_reentrant_init(_MALI_OSK_LOCK_ORDER_TIMELINE_SYSTEM); ++ if (NULL == timeline->spinlock) { ++ mali_timeline_destroy(timeline); ++ return NULL; ++ } ++ } ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+static long kbase_legacy_ioctl(struct file *filp, unsigned int cmd, -+ unsigned long arg) ++ return timeline; ++} ++ ++static void mali_timeline_insert_tracker(struct mali_timeline *timeline, struct mali_timeline_tracker *tracker) +{ -+ u64 msg[(CALL_MAX_SIZE + 7) >> 3] = { 0xdeadbeefdeadbeefull }; /* alignment fixup */ -+ u32 size = _IOC_SIZE(cmd); -+ struct kbase_context *kctx = filp->private_data; ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ MALI_DEBUG_ASSERT_POINTER(tracker); + -+ if (size > CALL_MAX_SIZE) -+ return -ENOTTY; ++ if (mali_timeline_is_full(timeline)) { ++ /* Don't add tracker if timeline is full. */ ++ tracker->point = MALI_TIMELINE_NO_POINT; ++ return; ++ } + -+ if (0 != copy_from_user(&msg, (void __user *)arg, size)) { -+ dev_err(kctx->kbdev->dev, "failed to copy ioctl argument into kernel space\n"); -+ return -EFAULT; ++ tracker->timeline = timeline; ++ tracker->point = timeline->point_next; ++ ++ /* Find next available point. */ ++ timeline->point_next++; ++ if (MALI_TIMELINE_NO_POINT == timeline->point_next) { ++ timeline->point_next++; + } + -+ if (kbase_legacy_dispatch(kctx, &msg, size) != 0) -+ return -EFAULT; ++ MALI_DEBUG_ASSERT(!mali_timeline_is_empty(timeline)); + -+ if (0 != copy_to_user((void __user *)arg, &msg, size)) { -+ dev_err(kctx->kbdev->dev, "failed to copy results of UK call back to user space\n"); -+ return -EFAULT; ++ if (MALI_TIMELINE_TRACKER_GP == tracker->type) { ++ _mali_osk_atomic_inc(&gp_tracker_count); ++ } else if (MALI_TIMELINE_TRACKER_PP == tracker->type) { ++ if (mali_pp_job_is_virtual((struct mali_pp_job *)tracker->job)) { ++ _mali_osk_atomic_inc(&virt_pp_tracker_count); ++ } else { ++ _mali_osk_atomic_inc(&phy_pp_tracker_count); ++ } + } -+ return 0; -+} + -+static int kbase_api_set_flags(struct kbase_context *kctx, -+ struct kbase_ioctl_set_flags *flags) -+{ -+ int err; ++ /* Add tracker as new head on timeline's tracker list. */ ++ if (NULL == timeline->tracker_head) { ++ /* Tracker list is empty. */ ++ MALI_DEBUG_ASSERT(NULL == timeline->tracker_tail); + -+ /* setup pending, try to signal that we'll do the setup, -+ * if setup was already in progress, err this call -+ */ -+ if (atomic_cmpxchg(&kctx->setup_in_progress, 0, 1) != 0) -+ return -EINVAL; ++ timeline->tracker_tail = tracker; + -+ err = kbase_context_set_create_flags(kctx, flags->create_flags); -+ /* if bad flags, will stay stuck in setup mode */ -+ if (err) -+ return err; ++ MALI_DEBUG_ASSERT(NULL == tracker->timeline_next); ++ MALI_DEBUG_ASSERT(NULL == tracker->timeline_prev); ++ } else { ++ MALI_DEBUG_ASSERT(NULL == timeline->tracker_head->timeline_next); + -+ atomic_set(&kctx->setup_complete, 1); -+ return 0; -+} ++ tracker->timeline_prev = timeline->tracker_head; ++ timeline->tracker_head->timeline_next = tracker; + -+static int kbase_api_job_submit(struct kbase_context *kctx, -+ struct kbase_ioctl_job_submit *submit) -+{ -+ return kbase_jd_submit(kctx, u64_to_user_ptr(submit->addr), -+ submit->nr_atoms, -+ submit->stride, false); ++ MALI_DEBUG_ASSERT(NULL == tracker->timeline_next); ++ } ++ timeline->tracker_head = tracker; ++ ++ MALI_DEBUG_ASSERT(NULL == timeline->tracker_head->timeline_next); ++ MALI_DEBUG_ASSERT(NULL == timeline->tracker_tail->timeline_prev); +} + -+static int kbase_api_get_gpuprops(struct kbase_context *kctx, -+ struct kbase_ioctl_get_gpuprops *get_props) ++/* Inserting the waiter object into the given timeline */ ++static void mali_timeline_insert_waiter(struct mali_timeline *timeline, struct mali_timeline_waiter *waiter_new) +{ -+ struct kbase_gpu_props *kprops = &kctx->kbdev->gpu_props; -+ int err; ++ struct mali_timeline_waiter *waiter_prev; ++ struct mali_timeline_waiter *waiter_next; + -+ if (get_props->flags != 0) { -+ dev_err(kctx->kbdev->dev, "Unsupported flags to get_gpuprops"); -+ return -EINVAL; -+ } ++ /* Waiter time must be between timeline head and tail, and there must ++ * be less than MALI_TIMELINE_MAX_POINT_SPAN elements between */ ++ MALI_DEBUG_ASSERT((waiter_new->point - timeline->point_oldest) < MALI_TIMELINE_MAX_POINT_SPAN); ++ MALI_DEBUG_ASSERT((-waiter_new->point + timeline->point_next) < MALI_TIMELINE_MAX_POINT_SPAN); + -+ if (get_props->size == 0) -+ return kprops->prop_buffer_size; -+ if (get_props->size < kprops->prop_buffer_size) -+ return -EINVAL; ++ /* Finding out where to put this waiter, in the linked waiter list of the given timeline **/ ++ waiter_prev = timeline->waiter_head; /* Insert new after waiter_prev */ ++ waiter_next = NULL; /* Insert new before waiter_next */ + -+ err = copy_to_user(u64_to_user_ptr(get_props->buffer), -+ kprops->prop_buffer, -+ kprops->prop_buffer_size); -+ if (err) -+ return -EFAULT; -+ return kprops->prop_buffer_size; -+} ++ /* Iterating backwards from head (newest) to tail (oldest) until we ++ * find the correct spot to insert the new waiter */ ++ while (waiter_prev && mali_timeline_point_after(waiter_prev->point, waiter_new->point)) { ++ waiter_next = waiter_prev; ++ waiter_prev = waiter_prev->timeline_prev; ++ } + -+static int kbase_api_post_term(struct kbase_context *kctx) -+{ -+ kbase_event_close(kctx); -+ return 0; ++ if (NULL == waiter_prev && NULL == waiter_next) { ++ /* list is empty */ ++ timeline->waiter_head = waiter_new; ++ timeline->waiter_tail = waiter_new; ++ } else if (NULL == waiter_next) { ++ /* insert at head */ ++ waiter_new->timeline_prev = timeline->waiter_head; ++ timeline->waiter_head->timeline_next = waiter_new; ++ timeline->waiter_head = waiter_new; ++ } else if (NULL == waiter_prev) { ++ /* insert at tail */ ++ waiter_new->timeline_next = timeline->waiter_tail; ++ timeline->waiter_tail->timeline_prev = waiter_new; ++ timeline->waiter_tail = waiter_new; ++ } else { ++ /* insert between */ ++ waiter_new->timeline_next = waiter_next; ++ waiter_new->timeline_prev = waiter_prev; ++ waiter_next->timeline_prev = waiter_new; ++ waiter_prev->timeline_next = waiter_new; ++ } +} + -+static int kbase_api_mem_alloc(struct kbase_context *kctx, -+ union kbase_ioctl_mem_alloc *alloc) ++static void mali_timeline_update_delayed_work(struct mali_timeline *timeline) +{ -+ struct kbase_va_region *reg; -+ u64 flags = alloc->in.flags; -+ u64 gpu_va; ++ struct mali_timeline_system *system; ++ struct mali_timeline_tracker *oldest_tracker; + -+#if defined(CONFIG_64BIT) -+ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { -+ /* force SAME_VA if a 64-bit client */ -+ flags |= BASE_MEM_SAME_VA; -+ } -+#endif ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SOFT == timeline->id); + -+ reg = kbase_mem_alloc(kctx, alloc->in.va_pages, -+ alloc->in.commit_pages, -+ alloc->in.extent, -+ &flags, &gpu_va); ++ system = timeline->system; ++ MALI_DEBUG_ASSERT_POINTER(system); + -+ if (!reg) -+ return -ENOMEM; ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); + -+ alloc->out.flags = flags; -+ alloc->out.gpu_va = gpu_va; ++ /* Timer is disabled, early out. */ ++ if (!system->timer_enabled) return; + -+ return 0; ++ oldest_tracker = timeline->tracker_tail; ++ if (NULL != oldest_tracker && 0 == oldest_tracker->trigger_ref_count) { ++ if (MALI_FALSE == oldest_tracker->timer_active) { ++ if (MALI_TRUE == timeline->timer_active) { ++ _mali_osk_wq_delayed_cancel_work_async(timeline->delayed_work); ++ } ++ _mali_osk_wq_delayed_schedule_work(timeline->delayed_work, MALI_TIMELINE_TIMEOUT_HZ); ++ oldest_tracker->timer_active = MALI_TRUE; ++ timeline->timer_active = MALI_TRUE; ++ } ++ } else if (MALI_TRUE == timeline->timer_active) { ++ _mali_osk_wq_delayed_cancel_work_async(timeline->delayed_work); ++ timeline->timer_active = MALI_FALSE; ++ } +} + -+static int kbase_api_mem_query(struct kbase_context *kctx, -+ union kbase_ioctl_mem_query *query) ++static mali_scheduler_mask mali_timeline_update_oldest_point(struct mali_timeline *timeline) +{ -+ return kbase_mem_query(kctx, query->in.gpu_addr, -+ query->in.query, &query->out.value); -+} ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; + -+static int kbase_api_mem_free(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_free *free) -+{ -+ return kbase_mem_free(kctx, free->gpu_addr); -+} ++ MALI_DEBUG_ASSERT_POINTER(timeline); + -+static int kbase_api_hwcnt_reader_setup(struct kbase_context *kctx, -+ struct kbase_ioctl_hwcnt_reader_setup *setup) -+{ -+ int ret; -+ struct kbase_uk_hwcnt_reader_setup args = { -+ .buffer_count = setup->buffer_count, -+ .jm_bm = setup->jm_bm, -+ .shader_bm = setup->shader_bm, -+ .tiler_bm = setup->tiler_bm, -+ .mmu_l2_bm = setup->mmu_l2_bm -+ }; ++ MALI_DEBUG_CODE({ ++ struct mali_timeline_system *system = timeline->system; ++ MALI_DEBUG_ASSERT_POINTER(system); + -+ mutex_lock(&kctx->vinstr_cli_lock); -+ ret = kbase_vinstr_hwcnt_reader_setup(kctx->kbdev->vinstr_ctx, &args); -+ mutex_unlock(&kctx->vinstr_cli_lock); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++ }); + -+ if (ret) -+ return ret; -+ return args.fd; -+} ++ if (NULL != timeline->tracker_tail) { ++ /* Set oldest point to oldest tracker's point */ ++ timeline->point_oldest = timeline->tracker_tail->point; ++ } else { ++ /* No trackers, mark point list as empty */ ++ timeline->point_oldest = timeline->point_next; ++ } + -+static int kbase_api_hwcnt_enable(struct kbase_context *kctx, -+ struct kbase_ioctl_hwcnt_enable *enable) -+{ -+ int ret; -+ struct kbase_uk_hwcnt_setup args = { -+ .dump_buffer = enable->dump_buffer, -+ .jm_bm = enable->jm_bm, -+ .shader_bm = enable->shader_bm, -+ .tiler_bm = enable->tiler_bm, -+ .mmu_l2_bm = enable->mmu_l2_bm -+ }; ++ /* Release all waiters no longer on the timeline's point list. ++ * Releasing a waiter can trigger this function to be called again, so ++ * we do not store any pointers on stack. */ ++ while (NULL != timeline->waiter_tail) { ++ u32 waiter_time_relative; ++ u32 time_head_relative; ++ struct mali_timeline_waiter *waiter = timeline->waiter_tail; + -+ mutex_lock(&kctx->vinstr_cli_lock); -+ ret = kbase_vinstr_legacy_hwc_setup(kctx->kbdev->vinstr_ctx, -+ &kctx->vinstr_cli, &args); -+ mutex_unlock(&kctx->vinstr_cli_lock); ++ time_head_relative = timeline->point_next - timeline->point_oldest; ++ waiter_time_relative = waiter->point - timeline->point_oldest; + -+ return ret; -+} ++ if (waiter_time_relative < time_head_relative) { ++ /* This and all following waiters are on the point list, so we are done. */ ++ break; ++ } + -+static int kbase_api_hwcnt_dump(struct kbase_context *kctx) -+{ -+ int ret; ++ /* Remove waiter from timeline's waiter list. */ ++ if (NULL != waiter->timeline_next) { ++ waiter->timeline_next->timeline_prev = NULL; ++ } else { ++ /* This was the last waiter */ ++ timeline->waiter_head = NULL; ++ } ++ timeline->waiter_tail = waiter->timeline_next; + -+ mutex_lock(&kctx->vinstr_cli_lock); -+ ret = kbase_vinstr_hwc_dump(kctx->vinstr_cli, -+ BASE_HWCNT_READER_EVENT_MANUAL); -+ mutex_unlock(&kctx->vinstr_cli_lock); ++ /* Release waiter. This could activate a tracker, if this was ++ * the last waiter for the tracker. */ ++ schedule_mask |= mali_timeline_system_release_waiter(timeline->system, waiter); ++ } + -+ return ret; ++ return schedule_mask; +} + -+static int kbase_api_hwcnt_clear(struct kbase_context *kctx) ++static mali_scheduler_mask mali_timeline_release_with_depended_point(struct mali_timeline_tracker *tracker) +{ -+ int ret; ++ struct mali_timeline *timeline; ++ struct mali_timeline_waiter *waiter; ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; + -+ mutex_lock(&kctx->vinstr_cli_lock); -+ ret = kbase_vinstr_hwc_clear(kctx->vinstr_cli); -+ mutex_unlock(&kctx->vinstr_cli_lock); ++ timeline = tracker->timeline; ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SOFT == timeline->id); + -+ return ret; -+} ++ MALI_DEBUG_CODE({ ++ struct mali_timeline_system *system = timeline->system; ++ MALI_DEBUG_ASSERT_POINTER(system); + -+static int kbase_api_disjoint_query(struct kbase_context *kctx, -+ struct kbase_ioctl_disjoint_query *query) -+{ -+ query->counter = kbase_disjoint_event_get(kctx->kbdev); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++ }); + -+ return 0; -+} ++ /* Only release the waiter that wait for the tracker. */ ++ waiter = timeline->waiter_tail; ++ while (NULL != waiter) { ++ if (waiter->point == tracker->point) { + -+static int kbase_api_get_ddk_version(struct kbase_context *kctx, -+ struct kbase_ioctl_get_ddk_version *version) -+{ -+ int ret; -+ int len = sizeof(KERNEL_SIDE_DDK_VERSION_STRING); ++ struct mali_timeline_waiter *waiter_next; ++ struct mali_timeline_waiter *waiter_prev; + -+ if (version->version_buffer == 0) -+ return len; ++ waiter_next = waiter->timeline_next; ++ waiter_prev = waiter->timeline_prev; ++ waiter->timeline_next = NULL; ++ waiter->timeline_prev = NULL; + -+ if (version->size < len) -+ return -EOVERFLOW; ++ if (NULL != waiter_prev) { ++ waiter_prev->timeline_next = waiter_next; ++ } + -+ ret = copy_to_user(u64_to_user_ptr(version->version_buffer), -+ KERNEL_SIDE_DDK_VERSION_STRING, -+ sizeof(KERNEL_SIDE_DDK_VERSION_STRING)); ++ if (NULL != waiter_next) { ++ waiter_next->timeline_prev = waiter_prev; ++ } + -+ if (ret) -+ return -EFAULT; ++ if (waiter == timeline->waiter_tail) ++ timeline->waiter_tail = waiter_next; + -+ return len; -+} ++ if (waiter == timeline->waiter_head) ++ timeline->waiter_head = NULL; + -+static int kbase_api_mem_jit_init(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_jit_init *jit_init) -+{ -+ return kbase_region_tracker_init_jit(kctx, jit_init->va_pages); -+} ++ schedule_mask |= mali_timeline_system_release_waiter(timeline->system, waiter); ++ waiter = waiter_next; ++ }else { + -+static int kbase_api_mem_sync(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_sync *sync) -+{ -+ struct basep_syncset sset = { -+ .mem_handle.basep.handle = sync->handle, -+ .user_addr = sync->user_addr, -+ .size = sync->size, -+ .type = sync->type -+ }; ++ waiter = waiter->timeline_next; ++ } ++ } + -+ return kbase_sync_now(kctx, &sset); ++ return schedule_mask; +} + -+static int kbase_api_mem_find_cpu_offset(struct kbase_context *kctx, -+ union kbase_ioctl_mem_find_cpu_offset *find) ++void mali_timeline_tracker_init(struct mali_timeline_tracker *tracker, ++ mali_timeline_tracker_type type, ++ struct mali_timeline_fence *fence, ++ void *job) +{ -+ return kbasep_find_enclosing_cpu_mapping_offset( -+ kctx, -+ find->in.cpu_addr, -+ find->in.size, -+ &find->out.offset); -+} ++ MALI_DEBUG_ASSERT_POINTER(tracker); ++ MALI_DEBUG_ASSERT_POINTER(job); + -+static int kbase_api_get_context_id(struct kbase_context *kctx, -+ struct kbase_ioctl_get_context_id *info) -+{ -+ info->id = kctx->id; ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_TRACKER_MAX > type); + -+ return 0; -+} ++ /* Zero out all tracker members. */ ++ _mali_osk_memset(tracker, 0, sizeof(*tracker)); + -+static int kbase_api_tlstream_acquire(struct kbase_context *kctx, -+ struct kbase_ioctl_tlstream_acquire *acquire) -+{ -+ return kbase_tlstream_acquire(kctx, acquire->flags); -+} ++ tracker->type = type; ++ tracker->job = job; ++ tracker->trigger_ref_count = 1; /* Prevents any callback from trigging while adding it */ ++ tracker->os_tick_create = _mali_osk_time_tickcount(); ++ MALI_DEBUG_CODE(tracker->magic = MALI_TIMELINE_TRACKER_MAGIC); + -+static int kbase_api_tlstream_flush(struct kbase_context *kctx) -+{ -+ kbase_tlstream_flush_streams(); ++ tracker->activation_error = MALI_TIMELINE_ACTIVATION_ERROR_NONE; + -+ return 0; ++ /* Copy fence. */ ++ if (NULL != fence) { ++ _mali_osk_memcpy(&tracker->fence, fence, sizeof(struct mali_timeline_fence)); ++ } +} + -+static int kbase_api_mem_commit(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_commit *commit) ++mali_scheduler_mask mali_timeline_tracker_release(struct mali_timeline_tracker *tracker) +{ -+ return kbase_mem_commit(kctx, commit->gpu_addr, commit->pages); -+} ++ struct mali_timeline *timeline; ++ struct mali_timeline_system *system; ++ struct mali_timeline_tracker *tracker_next, *tracker_prev; ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; ++ u32 tid = _mali_osk_get_tid(); + -+static int kbase_api_mem_alias(struct kbase_context *kctx, -+ union kbase_ioctl_mem_alias *alias) -+{ -+ struct base_mem_aliasing_info *ai; -+ u64 flags; -+ int err; ++ /* Upon entry a group lock will be held, but not a scheduler lock. */ ++ MALI_DEBUG_ASSERT_POINTER(tracker); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_TRACKER_MAGIC == tracker->magic); + -+ if (alias->in.nents == 0 || alias->in.nents > 2048) -+ return -EINVAL; ++ /* Tracker should have been triggered */ ++ MALI_DEBUG_ASSERT(0 == tracker->trigger_ref_count); + -+ ai = vmalloc(sizeof(*ai) * alias->in.nents); -+ if (!ai) -+ return -ENOMEM; ++ /* All waiters should have been released at this point */ ++ MALI_DEBUG_ASSERT(NULL == tracker->waiter_head); ++ MALI_DEBUG_ASSERT(NULL == tracker->waiter_tail); + -+ err = copy_from_user(ai, -+ u64_to_user_ptr(alias->in.aliasing_info), -+ sizeof(*ai) * alias->in.nents); -+ if (err) { -+ vfree(ai); -+ return -EFAULT; ++ MALI_DEBUG_PRINT(3, ("Mali Timeline: releasing tracker for job 0x%08X\n", tracker->job)); ++ ++ timeline = tracker->timeline; ++ if (NULL == timeline) { ++ /* Tracker was not on a timeline, there is nothing to release. */ ++ return MALI_SCHEDULER_MASK_EMPTY; + } + -+ flags = alias->in.flags; ++ system = timeline->system; ++ MALI_DEBUG_ASSERT_POINTER(system); + -+ alias->out.gpu_va = kbase_mem_alias(kctx, &flags, -+ alias->in.stride, alias->in.nents, -+ ai, &alias->out.va_pages); ++ mali_spinlock_reentrant_wait(system->spinlock, tid); + -+ alias->out.flags = flags; ++ /* Tracker should still be on timeline */ ++ MALI_DEBUG_ASSERT(!mali_timeline_is_empty(timeline)); ++ MALI_DEBUG_ASSERT(mali_timeline_is_point_on(timeline, tracker->point)); + -+ vfree(ai); ++ /* Tracker is no longer valid. */ ++ MALI_DEBUG_CODE(tracker->magic = 0); + -+ if (alias->out.gpu_va == 0) -+ return -ENOMEM; ++ tracker_next = tracker->timeline_next; ++ tracker_prev = tracker->timeline_prev; ++ tracker->timeline_next = NULL; ++ tracker->timeline_prev = NULL; + -+ return 0; -+} ++ /* Removing tracker from timeline's tracker list */ ++ if (NULL == tracker_next) { ++ /* This tracker was the head */ ++ timeline->tracker_head = tracker_prev; ++ } else { ++ tracker_next->timeline_prev = tracker_prev; ++ } + -+static int kbase_api_mem_import(struct kbase_context *kctx, -+ union kbase_ioctl_mem_import *import) -+{ -+ int ret; -+ u64 flags = import->in.flags; ++ if (NULL == tracker_prev) { ++ /* This tracker was the tail */ ++ timeline->tracker_tail = tracker_next; ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++ /* Update the timeline's oldest time and release any waiters */ ++ schedule_mask |= mali_timeline_update_oldest_point(timeline); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++ } else { ++ tracker_prev->timeline_next = tracker_next; ++ if (MALI_TIMELINE_SOFT == tracker->timeline->id) { ++ /* Use the signaled soft tracker to release the depended soft waiter */ ++ schedule_mask |= mali_timeline_release_with_depended_point(tracker); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++ } ++ } + -+ ret = kbase_mem_import(kctx, -+ import->in.type, -+ u64_to_user_ptr(import->in.phandle), -+ import->in.padding, -+ &import->out.gpu_va, -+ &import->out.va_pages, -+ &flags); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); + -+ import->out.flags = flags; ++ /* Update delayed work only when it is the soft job timeline */ ++ if (MALI_TIMELINE_SOFT == tracker->timeline->id) { ++ mali_timeline_update_delayed_work(tracker->timeline); ++ } + -+ return ret; ++ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ ++ return schedule_mask; +} + -+static int kbase_api_mem_flags_change(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_flags_change *change) ++void mali_timeline_system_release_waiter_list(struct mali_timeline_system *system, ++ struct mali_timeline_waiter *tail, ++ struct mali_timeline_waiter *head) +{ -+ return kbase_mem_flags_change(kctx, change->gpu_va, -+ change->flags, change->mask); ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(head); ++ MALI_DEBUG_ASSERT_POINTER(tail); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++ ++ head->tracker_next = system->waiter_empty_list; ++ system->waiter_empty_list = tail; +} + -+static int kbase_api_stream_create(struct kbase_context *kctx, -+ struct kbase_ioctl_stream_create *stream) ++static mali_scheduler_mask mali_timeline_tracker_activate(struct mali_timeline_tracker *tracker) +{ -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ int fd, ret; ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; ++ struct mali_timeline_system *system; ++ struct mali_timeline *timeline; ++ u32 tid = _mali_osk_get_tid(); + -+ /* Name must be NULL-terminated and padded with NULLs, so check last -+ * character is NULL -+ */ -+ if (stream->name[sizeof(stream->name)-1] != 0) -+ return -EINVAL; ++ MALI_DEBUG_ASSERT_POINTER(tracker); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_TRACKER_MAGIC == tracker->magic); + -+ ret = kbase_sync_fence_stream_create(stream->name, &fd); ++ system = tracker->system; ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); + -+ if (ret) -+ return ret; -+ return fd; -+#else -+ return -ENOENT; -+#endif -+} ++ tracker->os_tick_activate = _mali_osk_time_tickcount(); + -+static int kbase_api_fence_validate(struct kbase_context *kctx, -+ struct kbase_ioctl_fence_validate *validate) -+{ ++ if (NULL != tracker->waiter_head) { ++ mali_timeline_system_release_waiter_list(system, tracker->waiter_tail, tracker->waiter_head); ++ tracker->waiter_head = NULL; ++ tracker->waiter_tail = NULL; ++ } ++ ++ switch (tracker->type) { ++ case MALI_TIMELINE_TRACKER_GP: ++ schedule_mask = mali_scheduler_activate_gp_job((struct mali_gp_job *) tracker->job); ++ ++ _mali_osk_atomic_dec(&gp_tracker_count); ++ break; ++ case MALI_TIMELINE_TRACKER_PP: ++ if (mali_pp_job_is_virtual((struct mali_pp_job *)tracker->job)) { ++ _mali_osk_atomic_dec(&virt_pp_tracker_count); ++ } else { ++ _mali_osk_atomic_dec(&phy_pp_tracker_count); ++ } ++ schedule_mask = mali_scheduler_activate_pp_job((struct mali_pp_job *) tracker->job); ++ break; ++ case MALI_TIMELINE_TRACKER_SOFT: ++ timeline = tracker->timeline; ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ ++ schedule_mask |= mali_soft_job_system_activate_job((struct mali_soft_job *) tracker->job); ++ ++ /* Start a soft timer to make sure the soft job be released in a limited time */ ++ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ mali_timeline_update_delayed_work(timeline); ++ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ break; ++ case MALI_TIMELINE_TRACKER_WAIT: ++ mali_timeline_fence_wait_activate((struct mali_timeline_fence_wait_tracker *) tracker->job); ++ break; ++ case MALI_TIMELINE_TRACKER_SYNC: +#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ return kbase_sync_fence_validate(validate->fd); ++ mali_timeline_sync_fence_activate((struct mali_timeline_sync_fence_tracker *) tracker->job); +#else -+ return -ENOENT; -+#endif ++ MALI_PRINT_ERROR(("Mali Timeline: sync tracker not supported\n", tracker->type)); ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ break; ++ default: ++ MALI_PRINT_ERROR(("Mali Timeline - Illegal tracker type: %d\n", tracker->type)); ++ break; ++ } ++ ++ return schedule_mask; +} + -+static int kbase_api_get_profiling_controls(struct kbase_context *kctx, -+ struct kbase_ioctl_get_profiling_controls *controls) ++void mali_timeline_system_tracker_get(struct mali_timeline_system *system, struct mali_timeline_tracker *tracker) +{ -+ int ret; ++ u32 tid = _mali_osk_get_tid(); + -+ if (controls->count > (FBDUMP_CONTROL_MAX - FBDUMP_CONTROL_MIN)) -+ return -EINVAL; ++ MALI_DEBUG_ASSERT_POINTER(tracker); ++ MALI_DEBUG_ASSERT_POINTER(system); + -+ ret = copy_to_user(u64_to_user_ptr(controls->buffer), -+ &kctx->kbdev->kbase_profiling_controls[ -+ FBDUMP_CONTROL_MIN], -+ controls->count * sizeof(u32)); ++ mali_spinlock_reentrant_wait(system->spinlock, tid); + -+ if (ret) -+ return -EFAULT; -+ return 0; ++ MALI_DEBUG_ASSERT(0 < tracker->trigger_ref_count); ++ tracker->trigger_ref_count++; ++ ++ mali_spinlock_reentrant_signal(system->spinlock, tid); +} + -+static int kbase_api_mem_profile_add(struct kbase_context *kctx, -+ struct kbase_ioctl_mem_profile_add *data) ++mali_scheduler_mask mali_timeline_system_tracker_put(struct mali_timeline_system *system, struct mali_timeline_tracker *tracker, mali_timeline_activation_error activation_error) +{ -+ char *buf; -+ int err; ++ u32 tid = _mali_osk_get_tid(); ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; + -+ if (data->len > KBASE_MEM_PROFILE_MAX_BUF_SIZE) { -+ dev_err(kctx->kbdev->dev, "mem_profile_add: buffer too big\n"); -+ return -EINVAL; -+ } ++ MALI_DEBUG_ASSERT_POINTER(tracker); ++ MALI_DEBUG_ASSERT_POINTER(system); + -+ buf = kmalloc(data->len, GFP_KERNEL); -+ if (ZERO_OR_NULL_PTR(buf)) -+ return -ENOMEM; ++ mali_spinlock_reentrant_wait(system->spinlock, tid); + -+ err = copy_from_user(buf, u64_to_user_ptr(data->buffer), -+ data->len); -+ if (err) { -+ kfree(buf); -+ return -EFAULT; -+ } ++ MALI_DEBUG_ASSERT(0 < tracker->trigger_ref_count); ++ tracker->trigger_ref_count--; + -+ return kbasep_mem_profile_debugfs_insert(kctx, buf, data->len); -+} ++ tracker->activation_error |= activation_error; + -+static int kbase_api_soft_event_update(struct kbase_context *kctx, -+ struct kbase_ioctl_soft_event_update *update) -+{ -+ if (update->flags != 0) -+ return -EINVAL; ++ if (0 == tracker->trigger_ref_count) { ++ schedule_mask |= mali_timeline_tracker_activate(tracker); ++ tracker = NULL; ++ } + -+ return kbase_soft_event_update(kctx, update->event, update->new_status); ++ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ ++ return schedule_mask; +} + -+#if MALI_UNIT_TEST -+static int kbase_api_tlstream_test(struct kbase_context *kctx, -+ struct kbase_ioctl_tlstream_test *test) ++void mali_timeline_fence_copy_uk_fence(struct mali_timeline_fence *fence, _mali_uk_fence_t *uk_fence) +{ -+ kbase_tlstream_test( -+ test->tpw_count, -+ test->msg_delay, -+ test->msg_count, -+ test->aux_msg); ++ u32 i; + -+ return 0; -+} ++ MALI_DEBUG_ASSERT_POINTER(fence); ++ MALI_DEBUG_ASSERT_POINTER(uk_fence); + -+static int kbase_api_tlstream_stats(struct kbase_context *kctx, -+ struct kbase_ioctl_tlstream_stats *stats) -+{ -+ kbase_tlstream_stats( -+ &stats->bytes_collected, -+ &stats->bytes_generated); ++ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { ++ fence->points[i] = uk_fence->points[i]; ++ } + -+ return 0; ++ fence->sync_fd = uk_fence->sync_fd; +} -+#endif /* MALI_UNIT_TEST */ + -+#define KBASE_HANDLE_IOCTL(cmd, function) \ -+ case cmd: \ -+ do { \ -+ BUILD_BUG_ON(_IOC_DIR(cmd) != _IOC_NONE); \ -+ return function(kctx); \ -+ } while (0) ++struct mali_timeline_system *mali_timeline_system_create(struct mali_session_data *session) ++{ ++ u32 i; ++ struct mali_timeline_system *system; + -+#define KBASE_HANDLE_IOCTL_IN(cmd, function, type) \ -+ case cmd: \ -+ do { \ -+ type param; \ -+ int err; \ -+ BUILD_BUG_ON(_IOC_DIR(cmd) != _IOC_WRITE); \ -+ BUILD_BUG_ON(sizeof(param) != _IOC_SIZE(cmd)); \ -+ err = copy_from_user(¶m, uarg, sizeof(param)); \ -+ if (err) \ -+ return -EFAULT; \ -+ return function(kctx, ¶m); \ -+ } while (0) ++ MALI_DEBUG_ASSERT_POINTER(session); ++ MALI_DEBUG_PRINT(4, ("Mali Timeline: creating timeline system\n")); + -+#define KBASE_HANDLE_IOCTL_OUT(cmd, function, type) \ -+ case cmd: \ -+ do { \ -+ type param; \ -+ int ret, err; \ -+ BUILD_BUG_ON(_IOC_DIR(cmd) != _IOC_READ); \ -+ BUILD_BUG_ON(sizeof(param) != _IOC_SIZE(cmd)); \ -+ ret = function(kctx, ¶m); \ -+ err = copy_to_user(uarg, ¶m, sizeof(param)); \ -+ if (err) \ -+ return -EFAULT; \ -+ return ret; \ -+ } while (0) ++ system = (struct mali_timeline_system *) _mali_osk_calloc(1, sizeof(struct mali_timeline_system)); ++ if (NULL == system) { ++ return NULL; ++ } + -+#define KBASE_HANDLE_IOCTL_INOUT(cmd, function, type) \ -+ case cmd: \ -+ do { \ -+ type param; \ -+ int ret, err; \ -+ BUILD_BUG_ON(_IOC_DIR(cmd) != (_IOC_WRITE|_IOC_READ)); \ -+ BUILD_BUG_ON(sizeof(param) != _IOC_SIZE(cmd)); \ -+ err = copy_from_user(¶m, uarg, sizeof(param)); \ -+ if (err) \ -+ return -EFAULT; \ -+ ret = function(kctx, ¶m); \ -+ err = copy_to_user(uarg, ¶m, sizeof(param)); \ -+ if (err) \ -+ return -EFAULT; \ -+ return ret; \ -+ } while (0) ++ system->spinlock = mali_spinlock_reentrant_init(_MALI_OSK_LOCK_ORDER_TIMELINE_SYSTEM); ++ if (NULL == system->spinlock) { ++ mali_timeline_system_destroy(system); ++ return NULL; ++ } + -+static long kbase_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) -+{ -+ struct kbase_context *kctx = filp->private_data; -+ struct kbase_device *kbdev = kctx->kbdev; -+ void __user *uarg = (void __user *)arg; ++ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { ++ system->timelines[i] = mali_timeline_create(system, (enum mali_timeline_id)i); ++ if (NULL == system->timelines[i]) { ++ mali_timeline_system_destroy(system); ++ return NULL; ++ } ++ } + -+ /* The UK ioctl values overflow the cmd field causing the type to be -+ * incremented -+ */ -+ if (_IOC_TYPE(cmd) == LINUX_UK_BASE_MAGIC+2) -+ return kbase_legacy_ioctl(filp, cmd, arg); ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ system->signaled_sync_tl = mali_sync_timeline_create(NULL, "mali-always-signaled"); ++ if (NULL == system->signaled_sync_tl) { ++ mali_timeline_system_destroy(system); ++ return NULL; ++ } ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+ /* The UK version check IOCTL doesn't overflow the cmd field, so is -+ * handled separately here -+ */ -+ if (cmd == _IOC(_IOC_READ|_IOC_WRITE, LINUX_UK_BASE_MAGIC, -+ UKP_FUNC_ID_CHECK_VERSION, -+ sizeof(struct uku_version_check_args))) -+ return kbase_legacy_ioctl(filp, cmd, arg); ++ system->waiter_empty_list = NULL; ++ system->session = session; ++ system->timer_enabled = MALI_TRUE; + -+ /* Only these ioctls are available until setup is complete */ -+ switch (cmd) { -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_VERSION_CHECK, -+ kbase_api_handshake, -+ struct kbase_ioctl_version_check); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_SET_FLAGS, -+ kbase_api_set_flags, -+ struct kbase_ioctl_set_flags); ++ system->wait_queue = _mali_osk_wait_queue_init(); ++ if (NULL == system->wait_queue) { ++ mali_timeline_system_destroy(system); ++ return NULL; + } + -+ /* Block call until version handshake and setup is complete */ -+ if (kctx->api_version == 0 || !atomic_read(&kctx->setup_complete)) -+ return -EINVAL; ++ return system; ++} + -+ /* Normal ioctls */ -+ switch (cmd) { -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_JOB_SUBMIT, -+ kbase_api_job_submit, -+ struct kbase_ioctl_job_submit); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_GET_GPUPROPS, -+ kbase_api_get_gpuprops, -+ struct kbase_ioctl_get_gpuprops); -+ KBASE_HANDLE_IOCTL(KBASE_IOCTL_POST_TERM, -+ kbase_api_post_term); -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_ALLOC, -+ kbase_api_mem_alloc, -+ union kbase_ioctl_mem_alloc); -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_QUERY, -+ kbase_api_mem_query, -+ union kbase_ioctl_mem_query); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_FREE, -+ kbase_api_mem_free, -+ struct kbase_ioctl_mem_free); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_HWCNT_READER_SETUP, -+ kbase_api_hwcnt_reader_setup, -+ struct kbase_ioctl_hwcnt_reader_setup); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_HWCNT_ENABLE, -+ kbase_api_hwcnt_enable, -+ struct kbase_ioctl_hwcnt_enable); -+ KBASE_HANDLE_IOCTL(KBASE_IOCTL_HWCNT_DUMP, -+ kbase_api_hwcnt_dump); -+ KBASE_HANDLE_IOCTL(KBASE_IOCTL_HWCNT_CLEAR, -+ kbase_api_hwcnt_clear); -+ KBASE_HANDLE_IOCTL_OUT(KBASE_IOCTL_DISJOINT_QUERY, -+ kbase_api_disjoint_query, -+ struct kbase_ioctl_disjoint_query); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_GET_DDK_VERSION, -+ kbase_api_get_ddk_version, -+ struct kbase_ioctl_get_ddk_version); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_JIT_INIT, -+ kbase_api_mem_jit_init, -+ struct kbase_ioctl_mem_jit_init); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_SYNC, -+ kbase_api_mem_sync, -+ struct kbase_ioctl_mem_sync); -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_FIND_CPU_OFFSET, -+ kbase_api_mem_find_cpu_offset, -+ union kbase_ioctl_mem_find_cpu_offset); -+ KBASE_HANDLE_IOCTL_OUT(KBASE_IOCTL_GET_CONTEXT_ID, -+ kbase_api_get_context_id, -+ struct kbase_ioctl_get_context_id); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_TLSTREAM_ACQUIRE, -+ kbase_api_tlstream_acquire, -+ struct kbase_ioctl_tlstream_acquire); -+ KBASE_HANDLE_IOCTL(KBASE_IOCTL_TLSTREAM_FLUSH, -+ kbase_api_tlstream_flush); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_COMMIT, -+ kbase_api_mem_commit, -+ struct kbase_ioctl_mem_commit); -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_ALIAS, -+ kbase_api_mem_alias, -+ union kbase_ioctl_mem_alias); -+ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_IMPORT, -+ kbase_api_mem_import, -+ union kbase_ioctl_mem_import); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_FLAGS_CHANGE, -+ kbase_api_mem_flags_change, -+ struct kbase_ioctl_mem_flags_change); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_STREAM_CREATE, -+ kbase_api_stream_create, -+ struct kbase_ioctl_stream_create); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_FENCE_VALIDATE, -+ kbase_api_fence_validate, -+ struct kbase_ioctl_fence_validate); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_GET_PROFILING_CONTROLS, -+ kbase_api_get_profiling_controls, -+ struct kbase_ioctl_get_profiling_controls); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_PROFILE_ADD, -+ kbase_api_mem_profile_add, -+ struct kbase_ioctl_mem_profile_add); -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_SOFT_EVENT_UPDATE, -+ kbase_api_soft_event_update, -+ struct kbase_ioctl_soft_event_update); -+ -+#if MALI_UNIT_TEST -+ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_TLSTREAM_TEST, -+ kbase_api_tlstream_test, -+ struct kbase_ioctl_tlstream_test); -+ KBASE_HANDLE_IOCTL_OUT(KBASE_IOCTL_TLSTREAM_STATS, -+ kbase_api_tlstream_stats, -+ struct kbase_ioctl_tlstream_stats); -+#endif -+ } ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ||defined(CONFIG_SYNC) ||defined(CONFIG_SYNC_FILE) ++/** ++ * Check if there are any trackers left on timeline. ++ * ++ * Used as a wait queue conditional. ++ * ++ * @param data Timeline. ++ * @return MALI_TRUE if there are no trackers on timeline, MALI_FALSE if not. ++ */ ++static mali_bool mali_timeline_has_no_trackers(void *data) ++{ ++ struct mali_timeline *timeline = (struct mali_timeline *) data; + -+ dev_warn(kbdev->dev, "Unknown ioctl 0x%x nr:%d", cmd, _IOC_NR(cmd)); ++ MALI_DEBUG_ASSERT_POINTER(timeline); + -+ return -ENOIOCTLCMD; ++ return mali_timeline_is_empty(timeline); +} -+ -+static ssize_t kbase_read(struct file *filp, char __user *buf, size_t count, loff_t *f_pos) ++#if defined(CONFIG_SYNC) ||defined(CONFIG_SYNC_FILE) ++/** ++ * Cancel sync fence waiters waited upon by trackers on all timelines. ++ * ++ * Will return after all timelines have no trackers left. ++ * ++ * @param system Timeline system. ++ */ ++static void mali_timeline_cancel_sync_fence_waiters(struct mali_timeline_system *system) +{ -+ struct kbase_context *kctx = filp->private_data; -+ struct base_jd_event_v2 uevent; -+ int out_count = 0; -+ -+ if (count < sizeof(uevent)) -+ return -ENOBUFS; -+ -+ do { -+ while (kbase_event_dequeue(kctx, &uevent)) { -+ if (out_count > 0) -+ goto out; ++ u32 i; ++ u32 tid = _mali_osk_get_tid(); ++ struct mali_timeline_tracker *tracker, *tracker_next; ++ _MALI_OSK_LIST_HEAD_STATIC_INIT(tracker_list); + -+ if (filp->f_flags & O_NONBLOCK) -+ return -EAGAIN; ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(system->session); ++ MALI_DEBUG_ASSERT(system->session->is_aborting); + -+ if (wait_event_interruptible(kctx->event_queue, -+ kbase_event_pending(kctx)) != 0) -+ return -ERESTARTSYS; -+ } -+ if (uevent.event_code == BASE_JD_EVENT_DRV_TERMINATED) { -+ if (out_count == 0) -+ return -EPIPE; -+ goto out; -+ } ++ mali_spinlock_reentrant_wait(system->spinlock, tid); + -+ if (copy_to_user(buf, &uevent, sizeof(uevent)) != 0) -+ return -EFAULT; ++ /* Cancel sync fence waiters. */ ++ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { ++ struct mali_timeline *timeline = system->timelines[i]; + -+ buf += sizeof(uevent); -+ out_count++; -+ count -= sizeof(uevent); -+ } while (count >= sizeof(uevent)); ++ MALI_DEBUG_ASSERT_POINTER(timeline); + -+ out: -+ return out_count * sizeof(uevent); -+} ++ tracker_next = timeline->tracker_tail; ++ while (NULL != tracker_next) { ++ tracker = tracker_next; ++ tracker_next = tracker->timeline_next; + -+static unsigned int kbase_poll(struct file *filp, poll_table *wait) -+{ -+ struct kbase_context *kctx = filp->private_data; ++ if (NULL == tracker->sync_fence) continue; + -+ poll_wait(filp, &kctx->event_queue, wait); -+ if (kbase_event_pending(kctx)) -+ return POLLIN | POLLRDNORM; ++ MALI_DEBUG_PRINT(3, ("Mali Timeline: Cancelling sync fence wait for tracker 0x%08X.\n", tracker)); + -+ return 0; -+} ++ /* Cancel sync fence waiter. */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ if (0 == sync_fence_cancel_async(tracker->sync_fence, &tracker->sync_fence_waiter)) { ++#else ++ if (0 == mali_internal_sync_fence_cancel_async(tracker->sync_fence, &tracker->sync_fence_waiter)) { ++#endif ++ /* Callback was not called, move tracker to local list. */ ++ _mali_osk_list_add(&tracker->sync_fence_cancel_list, &tracker_list); ++ } ++ } ++ } + -+void kbase_event_wakeup(struct kbase_context *kctx) -+{ -+ KBASE_DEBUG_ASSERT(kctx); ++ mali_spinlock_reentrant_signal(system->spinlock, tid); + -+ wake_up_interruptible(&kctx->event_queue); -+} ++ /* Manually call sync fence callback in order to release waiter and trigger activation of tracker. */ ++ _MALI_OSK_LIST_FOREACHENTRY(tracker, tracker_next, &tracker_list, struct mali_timeline_tracker, sync_fence_cancel_list) { ++ mali_timeline_sync_fence_callback(tracker->sync_fence, &tracker->sync_fence_waiter); ++ } + -+KBASE_EXPORT_TEST_API(kbase_event_wakeup); ++ /* Sleep until all sync fence callbacks are done and all timelines are empty. */ ++ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { ++ struct mali_timeline *timeline = system->timelines[i]; + -+static int kbase_check_flags(int flags) -+{ -+ /* Enforce that the driver keeps the O_CLOEXEC flag so that execve() always -+ * closes the file descriptor in a child process. -+ */ -+ if (0 == (flags & O_CLOEXEC)) -+ return -EINVAL; ++ MALI_DEBUG_ASSERT_POINTER(timeline); + -+ return 0; ++ _mali_osk_wait_queue_wait_event(system->wait_queue, mali_timeline_has_no_trackers, (void *) timeline); ++ } +} + ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+/** -+ * align_and_check - Align the specified pointer to the provided alignment and -+ * check that it is still in range. -+ * @gap_end: Highest possible start address for allocation (end of gap in -+ * address space) -+ * @gap_start: Start address of current memory area / gap in address space -+ * @info: vm_unmapped_area_info structure passed to caller, containing -+ * alignment, length and limits for the allocation -+ * @is_shader_code: True if the allocation is for shader code (which has -+ * additional alignment requirements) -+ * -+ * Return: true if gap_end is now aligned correctly and is still in range, -+ * false otherwise -+ */ -+static bool align_and_check(unsigned long *gap_end, unsigned long gap_start, -+ struct vm_unmapped_area_info *info, bool is_shader_code) ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++static void mali_timeline_cancel_dma_fence_waiters(struct mali_timeline_system *system) +{ -+ /* Compute highest gap address at the desired alignment */ -+ (*gap_end) -= info->length; -+ (*gap_end) -= (*gap_end - info->align_offset) & info->align_mask; -+ -+ if (is_shader_code) { -+ /* Check for 4GB boundary */ -+ if (0 == (*gap_end & BASE_MEM_MASK_4GB)) -+ (*gap_end) -= (info->align_offset ? info->align_offset : -+ info->length); -+ if (0 == ((*gap_end + info->length) & BASE_MEM_MASK_4GB)) -+ (*gap_end) -= (info->align_offset ? info->align_offset : -+ info->length); -+ -+ if (!(*gap_end & BASE_MEM_MASK_4GB) || !((*gap_end + -+ info->length) & BASE_MEM_MASK_4GB)) -+ return false; -+ } ++ u32 i, j; ++ u32 tid = _mali_osk_get_tid(); ++ struct mali_pp_job *pp_job = NULL; ++ struct mali_pp_job *next_pp_job = NULL; ++ struct mali_timeline *timeline = NULL; ++ struct mali_timeline_tracker *tracker, *tracker_next; ++ _MALI_OSK_LIST_HEAD_STATIC_INIT(pp_job_list); + ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(system->session); ++ MALI_DEBUG_ASSERT(system->session->is_aborting); + -+ if ((*gap_end < info->low_limit) || (*gap_end < gap_start)) -+ return false; ++ mali_spinlock_reentrant_wait(system->spinlock, tid); + ++ /* Cancel dma fence waiters. */ ++ timeline = system->timelines[MALI_TIMELINE_PP]; ++ MALI_DEBUG_ASSERT_POINTER(timeline); + -+ return true; -+} ++ tracker_next = timeline->tracker_tail; ++ while (NULL != tracker_next) { ++ mali_bool fence_is_signaled = MALI_TRUE; ++ tracker = tracker_next; ++ tracker_next = tracker->timeline_next; + -+/* The following function is taken from the kernel and just -+ * renamed. As it's not exported to modules we must copy-paste it here. -+ */ ++ if (NULL == tracker->waiter_dma_fence) continue; ++ pp_job = (struct mali_pp_job *)tracker->job; ++ MALI_DEBUG_ASSERT_POINTER(pp_job); ++ MALI_DEBUG_PRINT(3, ("Mali Timeline: Cancelling dma fence waiter for tracker 0x%08X.\n", tracker)); + -+static unsigned long kbase_unmapped_area_topdown(struct vm_unmapped_area_info -+ *info, bool is_shader_code) -+{ -+ struct mm_struct *mm = current->mm; -+ struct vm_area_struct *vma; -+ unsigned long length, low_limit, high_limit, gap_start, gap_end; ++ for (j = 0; j < pp_job->dma_fence_context.num_dma_fence_waiter; j++) { ++ if (pp_job->dma_fence_context.mali_dma_fence_waiters[j]) { ++ /* Cancel a previously callback from the fence. ++ * This function returns true if the callback is successfully removed, ++ * or false if the fence has already been signaled. ++ */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ bool ret = dma_fence_remove_callback(pp_job->dma_fence_context.mali_dma_fence_waiters[j]->fence, ++ &pp_job->dma_fence_context.mali_dma_fence_waiters[j]->base); + -+ /* Adjust search length to account for worst case alignment overhead */ -+ length = info->length + info->align_mask; -+ if (length < info->length) -+ return -ENOMEM; ++#else ++ bool ret = fence_remove_callback(pp_job->dma_fence_context.mali_dma_fence_waiters[j]->fence, ++ &pp_job->dma_fence_context.mali_dma_fence_waiters[j]->base); ++#endif ++ if (ret) { ++ fence_is_signaled = MALI_FALSE; ++ } ++ } ++ } + -+ /* -+ * Adjust search limits by the desired length. -+ * See implementation comment at top of unmapped_area(). -+ */ -+ gap_end = info->high_limit; -+ if (gap_end < length) -+ return -ENOMEM; -+ high_limit = gap_end - length; ++ /* Callbacks were not called, move pp job to local list. */ ++ if (MALI_FALSE == fence_is_signaled) ++ _mali_osk_list_add(&pp_job->list, &pp_job_list); ++ } + -+ if (info->low_limit > high_limit) -+ return -ENOMEM; -+ low_limit = info->low_limit + length; ++ mali_spinlock_reentrant_signal(system->spinlock, tid); + -+ /* Check highest gap, which does not precede any rbtree node */ -+ gap_start = mm->highest_vm_end; -+ if (gap_start <= high_limit) { -+ if (align_and_check(&gap_end, gap_start, info, is_shader_code)) -+ return gap_end; ++ /* Manually call dma fence callback in order to release waiter and trigger activation of tracker. */ ++ _MALI_OSK_LIST_FOREACHENTRY(pp_job, next_pp_job, &pp_job_list, struct mali_pp_job, list) { ++ mali_timeline_dma_fence_callback((void *)pp_job); + } + -+ /* Check if rbtree root looks promising */ -+ if (RB_EMPTY_ROOT(&mm->mm_rb)) -+ return -ENOMEM; -+ vma = rb_entry(mm->mm_rb.rb_node, struct vm_area_struct, vm_rb); -+ if (vma->rb_subtree_gap < length) -+ return -ENOMEM; ++ /* Sleep until all dma fence callbacks are done and all timelines are empty. */ ++ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { ++ struct mali_timeline *timeline = system->timelines[i]; ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ _mali_osk_wait_queue_wait_event(system->wait_queue, mali_timeline_has_no_trackers, (void *) timeline); ++ } ++} ++#endif ++#endif ++void mali_timeline_system_abort(struct mali_timeline_system *system) ++{ ++ MALI_DEBUG_CODE(u32 tid = _mali_osk_get_tid();); + -+ while (true) { -+ /* Visit right subtree if it looks promising */ -+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0; -+ if (gap_start <= high_limit && vma->vm_rb.rb_right) { -+ struct vm_area_struct *right = -+ rb_entry(vma->vm_rb.rb_right, -+ struct vm_area_struct, vm_rb); -+ if (right->rb_subtree_gap >= length) { -+ vma = right; -+ continue; -+ } -+ } ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(system->session); ++ MALI_DEBUG_ASSERT(system->session->is_aborting); + -+check_current: -+ /* Check if current node has a suitable gap */ -+ gap_end = vma->vm_start; -+ if (gap_end < low_limit) -+ return -ENOMEM; -+ if (gap_start <= high_limit && gap_end - gap_start >= length) { -+ /* We found a suitable gap. Clip it with the original -+ * high_limit. */ -+ if (gap_end > info->high_limit) -+ gap_end = info->high_limit; ++ MALI_DEBUG_PRINT(3, ("Mali Timeline: Aborting timeline system for session 0x%08X.\n", system->session)); + -+ if (align_and_check(&gap_end, gap_start, info, -+ is_shader_code)) -+ return gap_end; -+ } ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ mali_timeline_cancel_sync_fence_waiters(system); ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+ /* Visit left subtree if it looks promising */ -+ if (vma->vm_rb.rb_left) { -+ struct vm_area_struct *left = -+ rb_entry(vma->vm_rb.rb_left, -+ struct vm_area_struct, vm_rb); -+ if (left->rb_subtree_gap >= length) { -+ vma = left; -+ continue; -+ } -+ } ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++ mali_timeline_cancel_dma_fence_waiters(system); ++#endif + -+ /* Go back up the rbtree to find next candidate node */ -+ while (true) { -+ struct rb_node *prev = &vma->vm_rb; -+ if (!rb_parent(prev)) -+ return -ENOMEM; -+ vma = rb_entry(rb_parent(prev), -+ struct vm_area_struct, vm_rb); -+ if (prev == vma->vm_rb.rb_right) { -+ gap_start = vma->vm_prev ? -+ vma->vm_prev->vm_end : 0; -+ goto check_current; -+ } ++ /* Should not be any waiters or trackers left at this point. */ ++ MALI_DEBUG_CODE({ ++ u32 i; ++ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ for (i = 0; i < MALI_TIMELINE_MAX; ++i) ++ { ++ struct mali_timeline *timeline = system->timelines[i]; ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ MALI_DEBUG_ASSERT(timeline->point_oldest == timeline->point_next); ++ MALI_DEBUG_ASSERT(NULL == timeline->tracker_head); ++ MALI_DEBUG_ASSERT(NULL == timeline->tracker_tail); ++ MALI_DEBUG_ASSERT(NULL == timeline->waiter_head); ++ MALI_DEBUG_ASSERT(NULL == timeline->waiter_tail); + } -+ } -+ -+ return -ENOMEM; ++ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ }); +} + -+static unsigned long kbase_get_unmapped_area(struct file *filp, -+ const unsigned long addr, const unsigned long len, -+ const unsigned long pgoff, const unsigned long flags) ++void mali_timeline_system_destroy(struct mali_timeline_system *system) +{ -+ /* based on get_unmapped_area, but simplified slightly due to that some -+ * values are known in advance */ -+ struct kbase_context *kctx = filp->private_data; -+ struct mm_struct *mm = current->mm; -+ struct vm_unmapped_area_info info; -+ unsigned long align_offset = 0; -+ unsigned long align_mask = 0; -+ unsigned long high_limit = mm->mmap_base; -+ unsigned long low_limit = PAGE_SIZE; -+ int cpu_va_bits = BITS_PER_LONG; -+ int gpu_pc_bits = -+ kctx->kbdev->gpu_props.props.core_props.log2_program_counter_size; -+ bool is_shader_code = false; -+ unsigned long ret; ++ u32 i; ++ struct mali_timeline_waiter *waiter, *next; ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ u32 tid = _mali_osk_get_tid(); ++#endif + -+ /* err on fixed address */ -+ if ((flags & MAP_FIXED) || addr) -+ return -EINVAL; ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(system->session); + -+#ifdef CONFIG_64BIT -+ /* too big? */ -+ if (len > TASK_SIZE - SZ_2M) -+ return -ENOMEM; ++ MALI_DEBUG_PRINT(4, ("Mali Timeline: destroying timeline system\n")); + -+ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { ++ if (NULL != system) { + -+ if (kbase_hw_has_feature(kctx->kbdev, -+ BASE_HW_FEATURE_33BIT_VA)) { -+ high_limit = kctx->same_va_end << PAGE_SHIFT; -+ } else { -+ high_limit = min_t(unsigned long, mm->mmap_base, -+ (kctx->same_va_end << PAGE_SHIFT)); -+ if (len >= SZ_2M) { -+ align_offset = SZ_2M; -+ align_mask = SZ_2M - 1; -+ } ++ /* There should be no waiters left on this queue. */ ++ if (NULL != system->wait_queue) { ++ _mali_osk_wait_queue_term(system->wait_queue); ++ system->wait_queue = NULL; + } + -+ low_limit = SZ_2M; -+ } else { -+ cpu_va_bits = 32; -+ } -+#endif /* CONFIG_64BIT */ -+ if ((PFN_DOWN(BASE_MEM_COOKIE_BASE) <= pgoff) && -+ (PFN_DOWN(BASE_MEM_FIRST_FREE_ADDRESS) > pgoff)) { -+ int cookie = pgoff - PFN_DOWN(BASE_MEM_COOKIE_BASE); -+ -+ if (!kctx->pending_regions[cookie]) -+ return -EINVAL; ++ /* Free all waiters in empty list */ ++ waiter = system->waiter_empty_list; ++ while (NULL != waiter) { ++ next = waiter->tracker_next; ++ _mali_osk_free(waiter); ++ waiter = next; ++ } + -+ if (!(kctx->pending_regions[cookie]->flags & -+ KBASE_REG_GPU_NX)) { -+ if (cpu_va_bits > gpu_pc_bits) { -+ align_offset = 1ULL << gpu_pc_bits; -+ align_mask = align_offset - 1; -+ is_shader_code = true; -+ } -+ } -+#ifndef CONFIG_64BIT -+ } else { -+ return current->mm->get_unmapped_area(filp, addr, len, pgoff, -+ flags); ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ if (NULL != system->signaled_sync_tl) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ sync_timeline_destroy(system->signaled_sync_tl); ++#else ++ mali_internal_sync_timeline_destroy(system->signaled_sync_tl); +#endif -+ } ++ } + -+ info.flags = 0; -+ info.length = len; -+ info.low_limit = low_limit; -+ info.high_limit = high_limit; -+ info.align_offset = align_offset; -+ info.align_mask = align_mask; ++ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { ++ if ((NULL != system->timelines[i]) && (NULL != system->timelines[i]->spinlock)) { ++ mali_spinlock_reentrant_wait(system->timelines[i]->spinlock, tid); ++ system->timelines[i]->destroyed = MALI_TRUE; ++ mali_spinlock_reentrant_signal(system->timelines[i]->spinlock, tid); ++ } ++ } ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+ ret = kbase_unmapped_area_topdown(&info, is_shader_code); ++ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { ++ if (NULL != system->timelines[i]) { ++ mali_timeline_destroy(system->timelines[i]); ++ } ++ } + -+ if (IS_ERR_VALUE(ret) && high_limit == mm->mmap_base && -+ high_limit < (kctx->same_va_end << PAGE_SHIFT)) { -+ /* Retry above mmap_base */ -+ info.low_limit = mm->mmap_base; -+ info.high_limit = min_t(u64, TASK_SIZE, -+ (kctx->same_va_end << PAGE_SHIFT)); ++ if (NULL != system->spinlock) { ++ mali_spinlock_reentrant_term(system->spinlock); ++ } + -+ ret = kbase_unmapped_area_topdown(&info, is_shader_code); ++ _mali_osk_free(system); + } -+ -+ return ret; -+} -+ -+static const struct file_operations kbase_fops = { -+ .owner = THIS_MODULE, -+ .open = kbase_open, -+ .release = kbase_release, -+ .read = kbase_read, -+ .poll = kbase_poll, -+ .unlocked_ioctl = kbase_ioctl, -+ .compat_ioctl = kbase_ioctl, -+ .mmap = kbase_mmap, -+ .check_flags = kbase_check_flags, -+ .get_unmapped_area = kbase_get_unmapped_area, -+}; -+ -+#ifndef CONFIG_MALI_BIFROST_NO_MALI -+void kbase_os_reg_write(struct kbase_device *kbdev, u16 offset, u32 value) -+{ -+ writel(value, kbdev->reg + offset); -+} -+ -+u32 kbase_os_reg_read(struct kbase_device *kbdev, u16 offset) -+{ -+ return readl(kbdev->reg + offset); +} -+#endif /* !CONFIG_MALI_BIFROST_NO_MALI */ + +/** -+ * show_policy - Show callback for the power_policy sysfs file. -+ * -+ * This function is called to get the contents of the power_policy sysfs -+ * file. This is a list of the available policies with the currently active one -+ * surrounded by square brackets. -+ * -+ * @dev: The device this sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The output buffer for the sysfs file contents ++ * Find how many waiters are needed for a given fence. + * -+ * Return: The number of bytes output to @buf. ++ * @param fence The fence to check. ++ * @return Number of waiters needed for fence. + */ -+static ssize_t show_policy(struct device *dev, struct device_attribute *attr, char *const buf) ++static u32 mali_timeline_fence_num_waiters(struct mali_timeline_fence *fence) +{ -+ struct kbase_device *kbdev; -+ const struct kbase_pm_policy *current_policy; -+ const struct kbase_pm_policy *const *policy_list; -+ int policy_count; -+ int i; -+ ssize_t ret = 0; ++ u32 i, num_waiters = 0; + -+ kbdev = to_kbase_device(dev); ++ MALI_DEBUG_ASSERT_POINTER(fence); + -+ if (!kbdev) -+ return -ENODEV; ++ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { ++ if (MALI_TIMELINE_NO_POINT != fence->points[i]) { ++ ++num_waiters; ++ } ++ } + -+ current_policy = kbase_pm_get_policy(kbdev); ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ if (-1 != fence->sync_fd) ++num_waiters; ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+ policy_count = kbase_pm_list_policies(&policy_list); ++ return num_waiters; ++} + -+ for (i = 0; i < policy_count && ret < PAGE_SIZE; i++) { -+ if (policy_list[i] == current_policy) -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "[%s] ", policy_list[i]->name); -+ else -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s ", policy_list[i]->name); -+ } ++static struct mali_timeline_waiter *mali_timeline_system_get_zeroed_waiter(struct mali_timeline_system *system) ++{ ++ struct mali_timeline_waiter *waiter; + -+ if (ret < PAGE_SIZE - 1) { -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "\n"); -+ } else { -+ buf[PAGE_SIZE - 2] = '\n'; -+ buf[PAGE_SIZE - 1] = '\0'; -+ ret = PAGE_SIZE - 1; ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++ ++ waiter = system->waiter_empty_list; ++ if (NULL != waiter) { ++ /* Remove waiter from empty list and zero it */ ++ system->waiter_empty_list = waiter->tracker_next; ++ _mali_osk_memset(waiter, 0, sizeof(*waiter)); + } + -+ return ret; ++ /* Return NULL if list was empty. */ ++ return waiter; +} + -+/** -+ * set_policy - Store callback for the power_policy sysfs file. -+ * -+ * This function is called when the power_policy sysfs file is written to. -+ * It matches the requested policy against the available policies and if a -+ * matching policy is found calls kbase_pm_set_policy() to change the -+ * policy. -+ * -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes written to the sysfs file -+ * -+ * Return: @count if the function succeeded. An error code on failure. -+ */ -+static ssize_t set_policy(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) ++static void mali_timeline_system_allocate_waiters(struct mali_timeline_system *system, ++ struct mali_timeline_waiter **tail, ++ struct mali_timeline_waiter **head, ++ int max_num_waiters) +{ -+ struct kbase_device *kbdev; -+ const struct kbase_pm_policy *new_policy = NULL; -+ const struct kbase_pm_policy *const *policy_list; -+ int policy_count; -+ int i; -+ -+ kbdev = to_kbase_device(dev); ++ u32 i, tid = _mali_osk_get_tid(); ++ mali_bool do_alloc; ++ struct mali_timeline_waiter *waiter; + -+ if (!kbdev) -+ return -ENODEV; ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(tail); ++ MALI_DEBUG_ASSERT_POINTER(head); + -+ policy_count = kbase_pm_list_policies(&policy_list); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); + -+ for (i = 0; i < policy_count; i++) { -+ if (sysfs_streq(policy_list[i]->name, buf)) { -+ new_policy = policy_list[i]; -+ break; ++ *head = *tail = NULL; ++ do_alloc = MALI_FALSE; ++ i = 0; ++ while (i < max_num_waiters) { ++ if (MALI_FALSE == do_alloc) { ++ waiter = mali_timeline_system_get_zeroed_waiter(system); ++ if (NULL == waiter) { ++ do_alloc = MALI_TRUE; ++ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ continue; ++ } ++ } else { ++ waiter = _mali_osk_calloc(1, sizeof(struct mali_timeline_waiter)); ++ if (NULL == waiter) break; ++ } ++ ++i; ++ if (NULL == *tail) { ++ *tail = waiter; ++ *head = waiter; ++ } else { ++ (*head)->tracker_next = waiter; ++ *head = waiter; + } + } -+ -+ if (!new_policy) { -+ dev_err(dev, "power_policy: policy not found\n"); -+ return -EINVAL; ++ if (MALI_TRUE == do_alloc) { ++ mali_spinlock_reentrant_wait(system->spinlock, tid); + } -+ -+ kbase_pm_set_policy(kbdev, new_policy); -+ -+ return count; +} + -+/* -+ * The sysfs file power_policy. -+ * -+ * This is used for obtaining information about the available policies, -+ * determining which policy is currently active, and changing the active -+ * policy. -+ */ -+static DEVICE_ATTR(power_policy, S_IRUGO | S_IWUSR, show_policy, set_policy); -+ +/** -+ * show_ca_policy - Show callback for the core_availability_policy sysfs file. -+ * -+ * This function is called to get the contents of the core_availability_policy -+ * sysfs file. This is a list of the available policies with the currently -+ * active one surrounded by square brackets. ++ * Create waiters for the given tracker. The tracker is activated when all waiters are release. + * -+ * @dev: The device this sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The output buffer for the sysfs file contents ++ * @note Tracker can potentially be activated before this function returns. + * -+ * Return: The number of bytes output to @buf. ++ * @param system Timeline system. ++ * @param tracker Tracker we will create waiters for. ++ * @param waiter_tail List of pre-allocated waiters. ++ * @param waiter_head List of pre-allocated waiters. + */ -+static ssize_t show_ca_policy(struct device *dev, struct device_attribute *attr, char * const buf) ++static void mali_timeline_system_create_waiters_and_unlock(struct mali_timeline_system *system, ++ struct mali_timeline_tracker *tracker, ++ struct mali_timeline_waiter *waiter_tail, ++ struct mali_timeline_waiter *waiter_head) +{ -+ struct kbase_device *kbdev; -+ const struct kbase_pm_ca_policy *current_policy; -+ const struct kbase_pm_ca_policy *const *policy_list; -+ int policy_count; + int i; -+ ssize_t ret = 0; ++ u32 tid = _mali_osk_get_tid(); ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ struct sync_fence *sync_fence = NULL; ++#else ++ struct mali_internal_sync_fence *sync_fence = NULL; ++#endif ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+ kbdev = to_kbase_device(dev); ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(tracker); + -+ if (!kbdev) -+ return -ENODEV; ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); + -+ current_policy = kbase_pm_ca_get_policy(kbdev); ++ MALI_DEBUG_ASSERT(NULL == tracker->waiter_head); ++ MALI_DEBUG_ASSERT(NULL == tracker->waiter_tail); ++ MALI_DEBUG_ASSERT(NULL != tracker->job); + -+ policy_count = kbase_pm_ca_list_policies(&policy_list); ++ /* Creating waiter object for all the timelines the fence is put on. Inserting this waiter ++ * into the timelines sorted list of waiters */ ++ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { ++ mali_timeline_point point; ++ struct mali_timeline *timeline; ++ struct mali_timeline_waiter *waiter; + -+ for (i = 0; i < policy_count && ret < PAGE_SIZE; i++) { -+ if (policy_list[i] == current_policy) -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "[%s] ", policy_list[i]->name); -+ else -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s ", policy_list[i]->name); -+ } ++ /* Get point on current timeline from tracker's fence. */ ++ point = tracker->fence.points[i]; + -+ if (ret < PAGE_SIZE - 1) { -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "\n"); -+ } else { -+ buf[PAGE_SIZE - 2] = '\n'; -+ buf[PAGE_SIZE - 1] = '\0'; -+ ret = PAGE_SIZE - 1; -+ } ++ if (likely(MALI_TIMELINE_NO_POINT == point)) { ++ /* Fence contains no point on this timeline so we don't need a waiter. */ ++ continue; ++ } + -+ return ret; -+} ++ timeline = system->timelines[i]; ++ MALI_DEBUG_ASSERT_POINTER(timeline); + -+/** -+ * set_ca_policy - Store callback for the core_availability_policy sysfs file. -+ * -+ * This function is called when the core_availability_policy sysfs file is -+ * written to. It matches the requested policy against the available policies -+ * and if a matching policy is found calls kbase_pm_set_policy() to change -+ * the policy. -+ * -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes written to the sysfs file -+ * -+ * Return: @count if the function succeeded. An error code on failure. -+ */ -+static ssize_t set_ca_policy(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ const struct kbase_pm_ca_policy *new_policy = NULL; -+ const struct kbase_pm_ca_policy *const *policy_list; -+ int policy_count; -+ int i; ++ if (unlikely(!mali_timeline_is_point_valid(timeline, point))) { ++ MALI_PRINT_ERROR(("Mali Timeline: point %d is not valid (oldest=%d, next=%d)\n", ++ point, timeline->point_oldest, timeline->point_next)); ++ continue; ++ } + -+ kbdev = to_kbase_device(dev); ++ if (likely(mali_timeline_is_point_released(timeline, point))) { ++ /* Tracker representing the point has been released so we don't need a ++ * waiter. */ ++ continue; ++ } + -+ if (!kbdev) -+ return -ENODEV; ++ if ((MALI_TIMELINE_SOFT == timeline->id) && mali_timeline_is_tracker_released(timeline, point)) { ++ /* The tracker that the point related to has already been released, so no need to a waiter. */ ++ continue; ++ } + -+ policy_count = kbase_pm_ca_list_policies(&policy_list); ++ /* The point is on timeline. */ ++ MALI_DEBUG_ASSERT(mali_timeline_is_point_on(timeline, point)); + -+ for (i = 0; i < policy_count; i++) { -+ if (sysfs_streq(policy_list[i]->name, buf)) { -+ new_policy = policy_list[i]; -+ break; ++ /* Get a new zeroed waiter object. */ ++ if (likely(NULL != waiter_tail)) { ++ waiter = waiter_tail; ++ waiter_tail = waiter_tail->tracker_next; ++ } else { ++ MALI_PRINT_ERROR(("Mali Timeline: failed to allocate memory for waiter\n")); ++ continue; + } -+ } + -+ if (!new_policy) { -+ dev_err(dev, "core_availability_policy: policy not found\n"); -+ return -EINVAL; -+ } ++ /* Yanking the trigger ref count of the tracker. */ ++ tracker->trigger_ref_count++; + -+ kbase_pm_ca_set_policy(kbdev, new_policy); ++ waiter->point = point; ++ waiter->tracker = tracker; + -+ return count; -+} ++ /* Insert waiter on tracker's singly-linked waiter list. */ ++ if (NULL == tracker->waiter_head) { ++ /* list is empty */ ++ MALI_DEBUG_ASSERT(NULL == tracker->waiter_tail); ++ tracker->waiter_tail = waiter; ++ } else { ++ tracker->waiter_head->tracker_next = waiter; ++ } ++ tracker->waiter_head = waiter; + -+/* -+ * The sysfs file core_availability_policy -+ * -+ * This is used for obtaining information about the available policies, -+ * determining which policy is currently active, and changing the active -+ * policy. -+ */ -+static DEVICE_ATTR(core_availability_policy, S_IRUGO | S_IWUSR, show_ca_policy, set_ca_policy); ++ /* Add waiter to timeline. */ ++ mali_timeline_insert_waiter(timeline, waiter); ++ } ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ if (-1 != tracker->fence.sync_fd) { ++ int ret; ++ struct mali_timeline_waiter *waiter; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ sync_fence = sync_fence_fdget(tracker->fence.sync_fd); ++#else ++ sync_fence = mali_internal_sync_fence_fdget(tracker->fence.sync_fd); ++#endif ++ if (unlikely(NULL == sync_fence)) { ++ MALI_PRINT_ERROR(("Mali Timeline: failed to get sync fence from fd %d\n", tracker->fence.sync_fd)); ++ goto exit; ++ } + -+/* -+ * show_core_mask - Show callback for the core_mask sysfs file. -+ * -+ * This function is called to get the contents of the core_mask sysfs file. -+ * -+ * @dev: The device this sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The output buffer for the sysfs file contents -+ * -+ * Return: The number of bytes output to @buf. -+ */ -+static ssize_t show_core_mask(struct device *dev, struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ ssize_t ret = 0; ++ /* Check if we have a zeroed waiter object available. */ ++ if (unlikely(NULL == waiter_tail)) { ++ MALI_PRINT_ERROR(("Mali Timeline: failed to allocate memory for waiter\n")); ++ goto exit; ++ } + -+ kbdev = to_kbase_device(dev); ++ /* Start asynchronous wait that will release waiter when the fence is signaled. */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ sync_fence_waiter_init(&tracker->sync_fence_waiter, mali_timeline_sync_fence_callback); ++ ret = sync_fence_wait_async(sync_fence, &tracker->sync_fence_waiter); ++#else ++ mali_internal_sync_fence_waiter_init(&tracker->sync_fence_waiter, mali_timeline_sync_fence_callback); ++ ret = mali_internal_sync_fence_wait_async(sync_fence, &tracker->sync_fence_waiter); ++#endif ++ if (1 == ret) { ++ /* Fence already signaled, no waiter needed. */ ++ tracker->fence.sync_fd = -1; ++ goto exit; ++ } else if (0 != ret) { ++ MALI_PRINT_ERROR(("Mali Timeline: sync fence fd %d signaled with error %d\n", tracker->fence.sync_fd, ret)); ++ tracker->activation_error |= MALI_TIMELINE_ACTIVATION_ERROR_SYNC_BIT; ++ goto exit; ++ } + -+ if (!kbdev) -+ return -ENODEV; ++ /* Grab new zeroed waiter object. */ ++ waiter = waiter_tail; ++ waiter_tail = waiter_tail->tracker_next; + -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, -+ "Current core mask (JS0) : 0x%llX\n", -+ kbdev->pm.debug_core_mask[0]); -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, -+ "Current core mask (JS1) : 0x%llX\n", -+ kbdev->pm.debug_core_mask[1]); -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, -+ "Current core mask (JS2) : 0x%llX\n", -+ kbdev->pm.debug_core_mask[2]); -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, -+ "Available core mask : 0x%llX\n", -+ kbdev->gpu_props.props.raw_props.shader_present); ++ /* Increase the trigger ref count of the tracker. */ ++ tracker->trigger_ref_count++; + -+ return ret; -+} ++ waiter->point = MALI_TIMELINE_NO_POINT; ++ waiter->tracker = tracker; + -+/** -+ * set_core_mask - Store callback for the core_mask sysfs file. -+ * -+ * This function is called when the core_mask sysfs file is written to. -+ * -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes written to the sysfs file -+ * -+ * Return: @count if the function succeeded. An error code on failure. -+ */ -+static ssize_t set_core_mask(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ u64 new_core_mask[3]; -+ int items; ++ /* Insert waiter on tracker's singly-linked waiter list. */ ++ if (NULL == tracker->waiter_head) { ++ /* list is empty */ ++ MALI_DEBUG_ASSERT(NULL == tracker->waiter_tail); ++ tracker->waiter_tail = waiter; ++ } else { ++ tracker->waiter_head->tracker_next = waiter; ++ } ++ tracker->waiter_head = waiter; + -+ kbdev = to_kbase_device(dev); ++ /* Also store waiter in separate field for easy access by sync callback. */ ++ tracker->waiter_sync = waiter; + -+ if (!kbdev) -+ return -ENODEV; ++ /* Store the sync fence in tracker so we can retrieve in abort session, if needed. */ ++ tracker->sync_fence = sync_fence; + -+ items = sscanf(buf, "%llx %llx %llx", -+ &new_core_mask[0], &new_core_mask[1], -+ &new_core_mask[2]); ++ sync_fence = NULL; ++ } ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE)*/ ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++ if ((NULL != tracker->timeline) && (MALI_TIMELINE_PP == tracker->timeline->id)) { + -+ if (items == 1) -+ new_core_mask[1] = new_core_mask[2] = new_core_mask[0]; ++ struct mali_pp_job *job = (struct mali_pp_job *)tracker->job; + -+ if (items == 1 || items == 3) { -+ u64 shader_present = -+ kbdev->gpu_props.props.raw_props.shader_present; -+ u64 group0_core_mask = -+ kbdev->gpu_props.props.coherency_info.group[0]. -+ core_mask; ++ if (0 < job->dma_fence_context.num_dma_fence_waiter) { ++ struct mali_timeline_waiter *waiter; ++ /* Check if we have a zeroed waiter object available. */ ++ if (unlikely(NULL == waiter_tail)) { ++ MALI_PRINT_ERROR(("Mali Timeline: failed to allocate memory for waiter\n")); ++ goto exit; ++ } + -+ if ((new_core_mask[0] & shader_present) != new_core_mask[0] || -+ !(new_core_mask[0] & group0_core_mask) || -+ (new_core_mask[1] & shader_present) != -+ new_core_mask[1] || -+ !(new_core_mask[1] & group0_core_mask) || -+ (new_core_mask[2] & shader_present) != -+ new_core_mask[2] || -+ !(new_core_mask[2] & group0_core_mask)) { -+ dev_err(dev, "power_policy: invalid core specification\n"); -+ return -EINVAL; -+ } ++ /* Grab new zeroed waiter object. */ ++ waiter = waiter_tail; ++ waiter_tail = waiter_tail->tracker_next; + -+ if (kbdev->pm.debug_core_mask[0] != new_core_mask[0] || -+ kbdev->pm.debug_core_mask[1] != -+ new_core_mask[1] || -+ kbdev->pm.debug_core_mask[2] != -+ new_core_mask[2]) { -+ unsigned long flags; ++ /* Increase the trigger ref count of the tracker. */ ++ tracker->trigger_ref_count++; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ waiter->point = MALI_TIMELINE_NO_POINT; ++ waiter->tracker = tracker; + -+ kbase_pm_set_debug_core_mask(kbdev, new_core_mask[0], -+ new_core_mask[1], new_core_mask[2]); ++ /* Insert waiter on tracker's singly-linked waiter list. */ ++ if (NULL == tracker->waiter_head) { ++ /* list is empty */ ++ MALI_DEBUG_ASSERT(NULL == tracker->waiter_tail); ++ tracker->waiter_tail = waiter; ++ } else { ++ tracker->waiter_head->tracker_next = waiter; ++ } ++ tracker->waiter_head = waiter; + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ /* Also store waiter in separate field for easy access by sync callback. */ ++ tracker->waiter_dma_fence = waiter; + } -+ -+ return count; + } ++#endif /* defined(CONFIG_MALI_DMA_BUF_FENCE)*/ + -+ dev_err(kbdev->dev, "Couldn't process set_core_mask write operation.\n" -+ "Use format \n" -+ "or \n"); -+ return -EINVAL; -+} ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ||defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++exit: ++#endif /* defined(CONFIG_MALI_DMA_BUF_FENCE) || defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+/* -+ * The sysfs file core_mask. -+ * -+ * This is used to restrict shader core availability for debugging purposes. -+ * Reading it will show the current core mask and the mask of cores available. -+ * Writing to it will set the current core mask. -+ */ -+static DEVICE_ATTR(core_mask, S_IRUGO | S_IWUSR, show_core_mask, set_core_mask); ++ if (NULL != waiter_tail) { ++ mali_timeline_system_release_waiter_list(system, waiter_tail, waiter_head); ++ } + -+/** -+ * set_soft_job_timeout - Store callback for the soft_job_timeout sysfs -+ * file. -+ * -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The value written to the sysfs file. -+ * @count: The number of bytes written to the sysfs file. -+ * -+ * This allows setting the timeout for software jobs. Waiting soft event wait -+ * jobs will be cancelled after this period expires, while soft fence wait jobs -+ * will print debug information if the fence debug feature is enabled. -+ * -+ * This is expressed in milliseconds. -+ * -+ * Return: count if the function succeeded. An error code on failure. -+ */ -+static ssize_t set_soft_job_timeout(struct device *dev, -+ struct device_attribute *attr, -+ const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ int soft_job_timeout_ms; ++ /* Release the initial trigger ref count. */ ++ tracker->trigger_ref_count--; + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ /* If there were no waiters added to this tracker we activate immediately. */ ++ if (0 == tracker->trigger_ref_count) { ++ schedule_mask |= mali_timeline_tracker_activate(tracker); ++ } + -+ if ((kstrtoint(buf, 0, &soft_job_timeout_ms) != 0) || -+ (soft_job_timeout_ms <= 0)) -+ return -EINVAL; ++ mali_spinlock_reentrant_signal(system->spinlock, tid); + -+ atomic_set(&kbdev->js_data.soft_job_timeout_ms, -+ soft_job_timeout_ms); ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ if (NULL != sync_fence) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ sync_fence_put(sync_fence); ++#else ++ fput(sync_fence->file); ++#endif ++ } ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+ return count; ++ mali_executor_schedule_from_mask(schedule_mask, MALI_FALSE); +} + -+/** -+ * show_soft_job_timeout - Show callback for the soft_job_timeout sysfs -+ * file. -+ * -+ * This will return the timeout for the software jobs. -+ * -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer for the sysfs file contents. -+ * -+ * Return: The number of bytes output to buf. -+ */ -+static ssize_t show_soft_job_timeout(struct device *dev, -+ struct device_attribute *attr, -+ char * const buf) ++mali_timeline_point mali_timeline_system_add_tracker(struct mali_timeline_system *system, ++ struct mali_timeline_tracker *tracker, ++ enum mali_timeline_id timeline_id) +{ -+ struct kbase_device *kbdev; ++ int num_waiters = 0; ++ struct mali_timeline_waiter *waiter_tail, *waiter_head; ++ u32 tid = _mali_osk_get_tid(); + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ mali_timeline_point point = MALI_TIMELINE_NO_POINT; + -+ return scnprintf(buf, PAGE_SIZE, "%i\n", -+ atomic_read(&kbdev->js_data.soft_job_timeout_ms)); -+} ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(system->session); ++ MALI_DEBUG_ASSERT_POINTER(tracker); + -+static DEVICE_ATTR(soft_job_timeout, S_IRUGO | S_IWUSR, -+ show_soft_job_timeout, set_soft_job_timeout); ++ MALI_DEBUG_ASSERT(MALI_FALSE == system->session->is_aborting); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_TRACKER_MAX > tracker->type); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_TRACKER_MAGIC == tracker->magic); + -+static u32 timeout_ms_to_ticks(struct kbase_device *kbdev, long timeout_ms, -+ int default_ticks, u32 old_ticks) -+{ -+ if (timeout_ms > 0) { -+ u64 ticks = timeout_ms * 1000000ULL; -+ do_div(ticks, kbdev->js_data.scheduling_period_ns); -+ if (!ticks) -+ return 1; -+ return ticks; -+ } else if (timeout_ms < 0) { -+ return default_ticks; -+ } else { -+ return old_ticks; -+ } -+} ++ MALI_DEBUG_PRINT(4, ("Mali Timeline: adding tracker for job %p, timeline: %d\n", tracker->job, timeline_id)); + -+/** -+ * set_js_timeouts - Store callback for the js_timeouts sysfs file. -+ * -+ * This function is called to get the contents of the js_timeouts sysfs -+ * file. This file contains five values separated by whitespace. The values -+ * are basically the same as %JS_SOFT_STOP_TICKS, %JS_HARD_STOP_TICKS_SS, -+ * %JS_HARD_STOP_TICKS_DUMPING, %JS_RESET_TICKS_SS, %JS_RESET_TICKS_DUMPING -+ * configuration values (in that order), with the difference that the js_timeout -+ * values are expressed in MILLISECONDS. -+ * -+ * The js_timeouts sysfile file allows the current values in -+ * use by the job scheduler to get override. Note that a value needs to -+ * be other than 0 for it to override the current job scheduler value. -+ * -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes written to the sysfs file -+ * -+ * Return: @count if the function succeeded. An error code on failure. -+ */ -+static ssize_t set_js_timeouts(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ int items; -+ long js_soft_stop_ms; -+ long js_soft_stop_ms_cl; -+ long js_hard_stop_ms_ss; -+ long js_hard_stop_ms_cl; -+ long js_hard_stop_ms_dumping; -+ long js_reset_ms_ss; -+ long js_reset_ms_cl; -+ long js_reset_ms_dumping; ++ MALI_DEBUG_ASSERT(0 < tracker->trigger_ref_count); ++ tracker->system = system; + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ mali_spinlock_reentrant_wait(system->spinlock, tid); + -+ items = sscanf(buf, "%ld %ld %ld %ld %ld %ld %ld %ld", -+ &js_soft_stop_ms, &js_soft_stop_ms_cl, -+ &js_hard_stop_ms_ss, &js_hard_stop_ms_cl, -+ &js_hard_stop_ms_dumping, &js_reset_ms_ss, -+ &js_reset_ms_cl, &js_reset_ms_dumping); ++ num_waiters = mali_timeline_fence_num_waiters(&tracker->fence); + -+ if (items == 8) { -+ struct kbasep_js_device_data *js_data = &kbdev->js_data; -+ unsigned long flags; ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++ if (MALI_TIMELINE_PP == timeline_id) { ++ struct mali_pp_job *job = (struct mali_pp_job *)tracker->job; ++ if (0 < job->dma_fence_context.num_dma_fence_waiter) ++ num_waiters++; ++ } ++#endif + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ /* Allocate waiters. */ ++ mali_timeline_system_allocate_waiters(system, &waiter_tail, &waiter_head, num_waiters); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); + -+#define UPDATE_TIMEOUT(ticks_name, ms_name, default) do {\ -+ js_data->ticks_name = timeout_ms_to_ticks(kbdev, ms_name, \ -+ default, js_data->ticks_name); \ -+ dev_dbg(kbdev->dev, "Overriding " #ticks_name \ -+ " with %lu ticks (%lu ms)\n", \ -+ (unsigned long)js_data->ticks_name, \ -+ ms_name); \ -+ } while (0) ++ /* Add tracker to timeline. This will allocate a point for the tracker on the timeline. If ++ * timeline ID is MALI_TIMELINE_NONE the tracker will NOT be added to a timeline and the ++ * point will be MALI_TIMELINE_NO_POINT. ++ * ++ * NOTE: the tracker can fail to be added if the timeline is full. If this happens, the ++ * point will be MALI_TIMELINE_NO_POINT. */ ++ MALI_DEBUG_ASSERT(timeline_id < MALI_TIMELINE_MAX || timeline_id == MALI_TIMELINE_NONE); ++ if (likely(timeline_id < MALI_TIMELINE_MAX)) { ++ struct mali_timeline *timeline = system->timelines[timeline_id]; ++ mali_timeline_insert_tracker(timeline, tracker); ++ MALI_DEBUG_ASSERT(!mali_timeline_is_empty(timeline)); ++ } + -+ UPDATE_TIMEOUT(soft_stop_ticks, js_soft_stop_ms, -+ DEFAULT_JS_SOFT_STOP_TICKS); -+ UPDATE_TIMEOUT(soft_stop_ticks_cl, js_soft_stop_ms_cl, -+ DEFAULT_JS_SOFT_STOP_TICKS_CL); -+ UPDATE_TIMEOUT(hard_stop_ticks_ss, js_hard_stop_ms_ss, -+ kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8408) ? -+ DEFAULT_JS_HARD_STOP_TICKS_SS_8408 : -+ DEFAULT_JS_HARD_STOP_TICKS_SS); -+ UPDATE_TIMEOUT(hard_stop_ticks_cl, js_hard_stop_ms_cl, -+ DEFAULT_JS_HARD_STOP_TICKS_CL); -+ UPDATE_TIMEOUT(hard_stop_ticks_dumping, -+ js_hard_stop_ms_dumping, -+ DEFAULT_JS_HARD_STOP_TICKS_DUMPING); -+ UPDATE_TIMEOUT(gpu_reset_ticks_ss, js_reset_ms_ss, -+ kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8408) ? -+ DEFAULT_JS_RESET_TICKS_SS_8408 : -+ DEFAULT_JS_RESET_TICKS_SS); -+ UPDATE_TIMEOUT(gpu_reset_ticks_cl, js_reset_ms_cl, -+ DEFAULT_JS_RESET_TICKS_CL); -+ UPDATE_TIMEOUT(gpu_reset_ticks_dumping, js_reset_ms_dumping, -+ DEFAULT_JS_RESET_TICKS_DUMPING); ++ point = tracker->point; + -+ kbase_js_set_timeouts(kbdev); ++ /* Create waiters for tracker based on supplied fence. Each waiter will increase the ++ * trigger ref count. */ ++ mali_timeline_system_create_waiters_and_unlock(system, tracker, waiter_tail, waiter_head); ++ tracker = NULL; + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ /* At this point the tracker object might have been freed so we should no longer ++ * access it. */ + -+ return count; -+ } + -+ dev_err(kbdev->dev, "Couldn't process js_timeouts write operation.\n" -+ "Use format \n" -+ "Write 0 for no change, -1 to restore default timeout\n"); -+ return -EINVAL; ++ /* The tracker will always be activated after calling add_tracker, even if NO_POINT is ++ * returned. */ ++ return point; +} + -+static unsigned long get_js_timeout_in_ms( -+ u32 scheduling_period_ns, -+ u32 ticks) ++static mali_scheduler_mask mali_timeline_system_release_waiter(struct mali_timeline_system *system, ++ struct mali_timeline_waiter *waiter) +{ -+ u64 ms = (u64)ticks * scheduling_period_ns; ++ struct mali_timeline_tracker *tracker; ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; + -+ do_div(ms, 1000000UL); -+ return ms; -+} ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(waiter); + -+/** -+ * show_js_timeouts - Show callback for the js_timeouts sysfs file. -+ * -+ * This function is called to get the contents of the js_timeouts sysfs -+ * file. It returns the last set values written to the js_timeouts sysfs file. -+ * If the file didn't get written yet, the values will be current setting in -+ * use. -+ * @dev: The device this sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The output buffer for the sysfs file contents -+ * -+ * Return: The number of bytes output to @buf. -+ */ -+static ssize_t show_js_timeouts(struct device *dev, struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ ssize_t ret; -+ unsigned long js_soft_stop_ms; -+ unsigned long js_soft_stop_ms_cl; -+ unsigned long js_hard_stop_ms_ss; -+ unsigned long js_hard_stop_ms_cl; -+ unsigned long js_hard_stop_ms_dumping; -+ unsigned long js_reset_ms_ss; -+ unsigned long js_reset_ms_cl; -+ unsigned long js_reset_ms_dumping; -+ u32 scheduling_period_ns; ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ tracker = waiter->tracker; ++ MALI_DEBUG_ASSERT_POINTER(tracker); + -+ scheduling_period_ns = kbdev->js_data.scheduling_period_ns; ++ /* At this point the waiter has been removed from the timeline's waiter list, but it is ++ * still on the tracker's waiter list. All of the tracker's waiters will be released when ++ * the tracker is activated. */ + -+#define GET_TIMEOUT(name) get_js_timeout_in_ms(\ -+ scheduling_period_ns, \ -+ kbdev->js_data.name) ++ waiter->point = MALI_TIMELINE_NO_POINT; ++ waiter->tracker = NULL; + -+ js_soft_stop_ms = GET_TIMEOUT(soft_stop_ticks); -+ js_soft_stop_ms_cl = GET_TIMEOUT(soft_stop_ticks_cl); -+ js_hard_stop_ms_ss = GET_TIMEOUT(hard_stop_ticks_ss); -+ js_hard_stop_ms_cl = GET_TIMEOUT(hard_stop_ticks_cl); -+ js_hard_stop_ms_dumping = GET_TIMEOUT(hard_stop_ticks_dumping); -+ js_reset_ms_ss = GET_TIMEOUT(gpu_reset_ticks_ss); -+ js_reset_ms_cl = GET_TIMEOUT(gpu_reset_ticks_cl); -+ js_reset_ms_dumping = GET_TIMEOUT(gpu_reset_ticks_dumping); ++ tracker->trigger_ref_count--; ++ if (0 == tracker->trigger_ref_count) { ++ /* This was the last waiter; activate tracker */ ++ schedule_mask |= mali_timeline_tracker_activate(tracker); ++ tracker = NULL; ++ } + -+#undef GET_TIMEOUT ++ return schedule_mask; ++} + -+ ret = scnprintf(buf, PAGE_SIZE, "%lu %lu %lu %lu %lu %lu %lu %lu\n", -+ js_soft_stop_ms, js_soft_stop_ms_cl, -+ js_hard_stop_ms_ss, js_hard_stop_ms_cl, -+ js_hard_stop_ms_dumping, js_reset_ms_ss, -+ js_reset_ms_cl, js_reset_ms_dumping); ++mali_timeline_point mali_timeline_system_get_latest_point(struct mali_timeline_system *system, ++ enum mali_timeline_id timeline_id) ++{ ++ mali_timeline_point point; ++ struct mali_timeline *timeline; ++ u32 tid = _mali_osk_get_tid(); + -+ if (ret >= PAGE_SIZE) { -+ buf[PAGE_SIZE - 2] = '\n'; -+ buf[PAGE_SIZE - 1] = '\0'; -+ ret = PAGE_SIZE - 1; ++ MALI_DEBUG_ASSERT_POINTER(system); ++ ++ if (MALI_TIMELINE_MAX <= timeline_id) { ++ return MALI_TIMELINE_NO_POINT; + } + -+ return ret; -+} ++ mali_spinlock_reentrant_wait(system->spinlock, tid); + -+/* -+ * The sysfs file js_timeouts. -+ * -+ * This is used to override the current job scheduler values for -+ * JS_STOP_STOP_TICKS_SS -+ * JS_STOP_STOP_TICKS_CL -+ * JS_HARD_STOP_TICKS_SS -+ * JS_HARD_STOP_TICKS_CL -+ * JS_HARD_STOP_TICKS_DUMPING -+ * JS_RESET_TICKS_SS -+ * JS_RESET_TICKS_CL -+ * JS_RESET_TICKS_DUMPING. -+ */ -+static DEVICE_ATTR(js_timeouts, S_IRUGO | S_IWUSR, show_js_timeouts, set_js_timeouts); ++ timeline = system->timelines[timeline_id]; ++ MALI_DEBUG_ASSERT_POINTER(timeline); + -+static u32 get_new_js_timeout( -+ u32 old_period, -+ u32 old_ticks, -+ u32 new_scheduling_period_ns) -+{ -+ u64 ticks = (u64)old_period * (u64)old_ticks; -+ do_div(ticks, new_scheduling_period_ns); -+ return ticks?ticks:1; ++ point = MALI_TIMELINE_NO_POINT; ++ if (timeline->point_oldest != timeline->point_next) { ++ point = timeline->point_next - 1; ++ if (MALI_TIMELINE_NO_POINT == point) point--; ++ } ++ ++ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ ++ return point; +} + -+/** -+ * set_js_scheduling_period - Store callback for the js_scheduling_period sysfs -+ * file -+ * @dev: The device the sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes written to the sysfs file -+ * -+ * This function is called when the js_scheduling_period sysfs file is written -+ * to. It checks the data written, and if valid updates the js_scheduling_period -+ * value -+ * -+ * Return: @count if the function succeeded. An error code on failure. -+ */ -+static ssize_t set_js_scheduling_period(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++static void mali_timeline_do_sync_fence_callback(void *arg) +{ -+ struct kbase_device *kbdev; -+ int ret; -+ unsigned int js_scheduling_period; -+ u32 new_scheduling_period_ns; -+ u32 old_period; -+ struct kbasep_js_device_data *js_data; -+ unsigned long flags; ++ _MALI_OSK_LIST_HEAD_STATIC_INIT(list); ++ struct mali_timeline_tracker *tracker; ++ struct mali_timeline_tracker *tmp_tracker; ++ u32 tid = _mali_osk_get_tid(); + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ MALI_IGNORE(arg); + -+ js_data = &kbdev->js_data; ++ /* ++ * Quickly "unhook" the jobs pending to be deleted, so we can release ++ * the lock before we start deleting the job objects ++ * (without any locks held) ++ */ ++ _mali_osk_spinlock_irq_lock(sync_fence_callback_list_lock); ++ _mali_osk_list_move_list(&sync_fence_callback_queue, &list); ++ _mali_osk_spinlock_irq_unlock(sync_fence_callback_list_lock); + -+ ret = kstrtouint(buf, 0, &js_scheduling_period); -+ if (ret || !js_scheduling_period) { -+ dev_err(kbdev->dev, "Couldn't process js_scheduling_period write operation.\n" -+ "Use format \n"); -+ return -EINVAL; -+ } ++ _MALI_OSK_LIST_FOREACHENTRY(tracker, tmp_tracker, &list, ++ struct mali_timeline_tracker, sync_fence_signal_list) { ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; ++ mali_bool is_aborting = MALI_FALSE; ++ int fence_status = 0; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ struct sync_fence *sync_fence = NULL; ++#else ++ struct mali_internal_sync_fence *sync_fence = NULL; ++#endif ++ struct mali_timeline_system *system = NULL; ++ struct mali_timeline_waiter *waiter = NULL; + -+ new_scheduling_period_ns = js_scheduling_period * 1000000; ++ _mali_osk_list_delinit(&tracker->sync_fence_signal_list); + -+ /* Update scheduling timeouts */ -+ mutex_lock(&js_data->runpool_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ sync_fence = tracker->sync_fence; ++ MALI_DEBUG_ASSERT_POINTER(sync_fence); + -+ /* If no contexts have been scheduled since js_timeouts was last written -+ * to, the new timeouts might not have been latched yet. So check if an -+ * update is pending and use the new values if necessary. */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) ++ fence_status = sync_fence->status; ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ fence_status = atomic_read(&sync_fence->status); ++#else ++ fence_status = sync_fence->fence->ops->signaled(sync_fence->fence); ++#endif + -+ /* Use previous 'new' scheduling period as a base if present. */ -+ old_period = js_data->scheduling_period_ns; ++ system = tracker->system; ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(system->session); + -+#define SET_TIMEOUT(name) \ -+ (js_data->name = get_new_js_timeout(\ -+ old_period, \ -+ kbdev->js_data.name, \ -+ new_scheduling_period_ns)) ++ mali_spinlock_reentrant_wait(system->spinlock, tid); + -+ SET_TIMEOUT(soft_stop_ticks); -+ SET_TIMEOUT(soft_stop_ticks_cl); -+ SET_TIMEOUT(hard_stop_ticks_ss); -+ SET_TIMEOUT(hard_stop_ticks_cl); -+ SET_TIMEOUT(hard_stop_ticks_dumping); -+ SET_TIMEOUT(gpu_reset_ticks_ss); -+ SET_TIMEOUT(gpu_reset_ticks_cl); -+ SET_TIMEOUT(gpu_reset_ticks_dumping); ++ is_aborting = system->session->is_aborting; ++ if (!is_aborting && (0 > fence_status)) { ++ MALI_PRINT_ERROR(("Mali Timeline: sync fence fd %d signaled with error %d\n", tracker->fence.sync_fd, fence_status)); ++ tracker->activation_error |= MALI_TIMELINE_ACTIVATION_ERROR_SYNC_BIT; ++ } + -+#undef SET_TIMEOUT ++ waiter = tracker->waiter_sync; ++ MALI_DEBUG_ASSERT_POINTER(waiter); + -+ js_data->scheduling_period_ns = new_scheduling_period_ns; ++ tracker->sync_fence = NULL; ++ tracker->fence.sync_fd = -1; + -+ kbase_js_set_timeouts(kbdev); ++ schedule_mask |= mali_timeline_system_release_waiter(system, waiter); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&js_data->runpool_mutex); ++ /* If aborting, wake up sleepers that are waiting for sync fence callbacks to complete. */ ++ if (is_aborting) { ++ _mali_osk_wait_queue_wake_up(system->wait_queue); ++ } + -+ dev_dbg(kbdev->dev, "JS scheduling period: %dms\n", -+ js_scheduling_period); ++ mali_spinlock_reentrant_signal(system->spinlock, tid); + -+ return count; -+} ++ /* ++ * Older versions of Linux, before 3.5, doesn't support fput() in interrupt ++ * context. For those older kernels, allocate a list object and put the ++ * fence object on that and defer the call to sync_fence_put() to a workqueue. ++ */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) ++ { ++ struct mali_deferred_fence_put_entry *obj; + -+/** -+ * show_js_scheduling_period - Show callback for the js_scheduling_period sysfs -+ * entry. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the GPU information. -+ * -+ * This function is called to get the current period used for the JS scheduling -+ * period. -+ * -+ * Return: The number of bytes output to @buf. -+ */ -+static ssize_t show_js_scheduling_period(struct device *dev, -+ struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ u32 period; -+ ssize_t ret; ++ obj = kzalloc(sizeof(struct mali_deferred_fence_put_entry), GFP_ATOMIC); ++ if (obj) { ++ unsigned long flags; ++ mali_bool schedule = MALI_FALSE; + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ obj->fence = sync_fence; + -+ period = kbdev->js_data.scheduling_period_ns; ++ spin_lock_irqsave(&mali_timeline_sync_fence_to_free_lock, flags); ++ if (hlist_empty(&mali_timeline_sync_fence_to_free_list)) ++ schedule = MALI_TRUE; ++ hlist_add_head(&obj->list, &mali_timeline_sync_fence_to_free_list); ++ spin_unlock_irqrestore(&mali_timeline_sync_fence_to_free_lock, flags); + -+ ret = scnprintf(buf, PAGE_SIZE, "%d\n", -+ period / 1000000); ++ if (schedule) ++ schedule_delayed_work(&delayed_sync_fence_put, 0); ++ } ++ } ++#else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ sync_fence_put(sync_fence); ++#else ++ fput(sync_fence->file); ++#endif ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) */ + -+ return ret; ++ if (!is_aborting) { ++ mali_executor_schedule_from_mask(schedule_mask, MALI_TRUE); ++ } ++ } +} -+ -+static DEVICE_ATTR(js_scheduling_period, S_IRUGO | S_IWUSR, -+ show_js_scheduling_period, set_js_scheduling_period); -+ -+#if !MALI_CUSTOMER_RELEASE -+/** -+ * set_force_replay - Store callback for the force_replay sysfs file. -+ * -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes written to the sysfs file -+ * -+ * Return: @count if the function succeeded. An error code on failure. -+ */ -+static ssize_t set_force_replay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) ++#endif ++_mali_osk_errcode_t mali_timeline_initialize(void) +{ -+ struct kbase_device *kbdev; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ _mali_osk_atomic_init(&gp_tracker_count, 0); ++ _mali_osk_atomic_init(&phy_pp_tracker_count, 0); ++ _mali_osk_atomic_init(&virt_pp_tracker_count, 0); + -+ if (!strncmp("limit=", buf, MIN(6, count))) { -+ int force_replay_limit; -+ int items = sscanf(buf, "limit=%u", &force_replay_limit); ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ sync_fence_callback_list_lock = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_UNORDERED, _MALI_OSK_LOCK_ORDER_FIRST); ++ if (NULL == sync_fence_callback_list_lock) { ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ if (items == 1) { -+ kbdev->force_replay_random = false; -+ kbdev->force_replay_limit = force_replay_limit; -+ kbdev->force_replay_count = 0; ++ sync_fence_callback_work_t = _mali_osk_wq_create_work( ++ mali_timeline_do_sync_fence_callback, NULL); + -+ return count; -+ } -+ } else if (!strncmp("random_limit", buf, MIN(12, count))) { -+ kbdev->force_replay_random = true; -+ kbdev->force_replay_count = 0; ++ if (NULL == sync_fence_callback_work_t) { ++ return _MALI_OSK_ERR_FAULT; ++ } ++#endif ++ return _MALI_OSK_ERR_OK; ++} + -+ return count; -+ } else if (!strncmp("norandom_limit", buf, MIN(14, count))) { -+ kbdev->force_replay_random = false; -+ kbdev->force_replay_limit = KBASEP_FORCE_REPLAY_DISABLED; -+ kbdev->force_replay_count = 0; + -+ return count; -+ } else if (!strncmp("core_req=", buf, MIN(9, count))) { -+ unsigned int core_req; -+ int items = sscanf(buf, "core_req=%x", &core_req); ++void mali_timeline_terminate(void) ++{ ++ _mali_osk_atomic_term(&gp_tracker_count); ++ _mali_osk_atomic_term(&phy_pp_tracker_count); ++ _mali_osk_atomic_term(&virt_pp_tracker_count); + -+ if (items == 1) { -+ kbdev->force_replay_core_req = (base_jd_core_req)core_req; ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ if (NULL != sync_fence_callback_list_lock) { ++ _mali_osk_spinlock_irq_term(sync_fence_callback_list_lock); ++ sync_fence_callback_list_lock = NULL; ++ } + -+ return count; -+ } ++ if (NULL != sync_fence_callback_work_t) { ++ _mali_osk_wq_delete_work(sync_fence_callback_work_t); ++ sync_fence_callback_work_t = NULL; + } -+ dev_err(kbdev->dev, "Couldn't process force_replay write operation.\nPossible settings: limit=, random_limit, norandom_limit, core_req=\n"); -+ return -EINVAL; ++#endif +} + -+/** -+ * show_force_replay - Show callback for the force_replay sysfs file. -+ * -+ * This function is called to get the contents of the force_replay sysfs -+ * file. It returns the last set value written to the force_replay sysfs file. -+ * If the file didn't get written yet, the values will be 0. -+ * -+ * @dev: The device this sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The output buffer for the sysfs file contents -+ * -+ * Return: The number of bytes output to @buf. -+ */ -+static ssize_t show_force_replay(struct device *dev, -+ struct device_attribute *attr, char * const buf) ++#if defined(MALI_TIMELINE_DEBUG_FUNCTIONS) ++ ++static mali_bool is_waiting_on_timeline(struct mali_timeline_tracker *tracker, enum mali_timeline_id id) +{ -+ struct kbase_device *kbdev; -+ ssize_t ret; ++ struct mali_timeline *timeline; ++ struct mali_timeline_system *system; + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ MALI_DEBUG_ASSERT_POINTER(tracker); + -+ if (kbdev->force_replay_random) -+ ret = scnprintf(buf, PAGE_SIZE, -+ "limit=0\nrandom_limit\ncore_req=%x\n", -+ kbdev->force_replay_core_req); -+ else -+ ret = scnprintf(buf, PAGE_SIZE, -+ "limit=%u\nnorandom_limit\ncore_req=%x\n", -+ kbdev->force_replay_limit, -+ kbdev->force_replay_core_req); ++ MALI_DEBUG_ASSERT_POINTER(tracker->timeline); ++ timeline = tracker->timeline; + -+ if (ret >= PAGE_SIZE) { -+ buf[PAGE_SIZE - 2] = '\n'; -+ buf[PAGE_SIZE - 1] = '\0'; -+ ret = PAGE_SIZE - 1; ++ MALI_DEBUG_ASSERT_POINTER(timeline->system); ++ system = timeline->system; ++ ++ if (MALI_TIMELINE_MAX > id) { ++ if (MALI_TIMELINE_NO_POINT != tracker->fence.points[id]) { ++ return mali_timeline_is_point_on(system->timelines[id], tracker->fence.points[id]); ++ } else { ++ return MALI_FALSE; ++ } ++ } else { ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_NONE == id); ++ return MALI_FALSE; + } ++} + -+ return ret; ++static const char *timeline_id_to_string(enum mali_timeline_id id) ++{ ++ switch (id) { ++ case MALI_TIMELINE_GP: ++ return "GP"; ++ case MALI_TIMELINE_PP: ++ return "PP"; ++ case MALI_TIMELINE_SOFT: ++ return "SOFT"; ++ default: ++ return "NONE"; ++ } +} + -+/* -+ * The sysfs file force_replay. -+ */ -+static DEVICE_ATTR(force_replay, S_IRUGO | S_IWUSR, show_force_replay, -+ set_force_replay); -+#endif /* !MALI_CUSTOMER_RELEASE */ ++static const char *timeline_tracker_type_to_string(enum mali_timeline_tracker_type type) ++{ ++ switch (type) { ++ case MALI_TIMELINE_TRACKER_GP: ++ return "GP"; ++ case MALI_TIMELINE_TRACKER_PP: ++ return "PP"; ++ case MALI_TIMELINE_TRACKER_SOFT: ++ return "SOFT"; ++ case MALI_TIMELINE_TRACKER_WAIT: ++ return "WAIT"; ++ case MALI_TIMELINE_TRACKER_SYNC: ++ return "SYNC"; ++ default: ++ return "INVALID"; ++ } ++} + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+static ssize_t set_js_softstop_always(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) ++mali_timeline_tracker_state mali_timeline_debug_get_tracker_state(struct mali_timeline_tracker *tracker) +{ -+ struct kbase_device *kbdev; -+ int ret; -+ int softstop_always; ++ struct mali_timeline *timeline = NULL; + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ MALI_DEBUG_ASSERT_POINTER(tracker); ++ timeline = tracker->timeline; + -+ ret = kstrtoint(buf, 0, &softstop_always); -+ if (ret || ((softstop_always != 0) && (softstop_always != 1))) { -+ dev_err(kbdev->dev, "Couldn't process js_softstop_always write operation.\n" -+ "Use format \n"); -+ return -EINVAL; ++ if (0 != tracker->trigger_ref_count) { ++ return MALI_TIMELINE_TS_WAITING; + } + -+ kbdev->js_data.softstop_always = (bool) softstop_always; -+ dev_dbg(kbdev->dev, "Support for softstop on a single context: %s\n", -+ (kbdev->js_data.softstop_always) ? -+ "Enabled" : "Disabled"); -+ return count; ++ if (timeline && (timeline->tracker_tail == tracker || NULL != tracker->timeline_prev)) { ++ return MALI_TIMELINE_TS_ACTIVE; ++ } ++ ++ if (timeline && (MALI_TIMELINE_NO_POINT == tracker->point)) { ++ return MALI_TIMELINE_TS_INIT; ++ } ++ ++ return MALI_TIMELINE_TS_FINISH; +} + -+static ssize_t show_js_softstop_always(struct device *dev, -+ struct device_attribute *attr, char * const buf) ++void mali_timeline_debug_print_tracker(struct mali_timeline_tracker *tracker, _mali_osk_print_ctx *print_ctx) +{ -+ struct kbase_device *kbdev; -+ ssize_t ret; ++ const char *tracker_state = "IWAF"; ++ char state_char = 'I'; ++ char tracker_type[32] = {0}; + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ MALI_DEBUG_ASSERT_POINTER(tracker); + -+ ret = scnprintf(buf, PAGE_SIZE, "%d\n", kbdev->js_data.softstop_always); ++ state_char = *(tracker_state + mali_timeline_debug_get_tracker_state(tracker)); ++ _mali_osk_snprintf(tracker_type, sizeof(tracker_type), "%s", timeline_tracker_type_to_string(tracker->type)); ++ ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ if (0 != tracker->trigger_ref_count) { ++ if (print_ctx) ++ _mali_osk_ctxprintf(print_ctx, "TL: %s %u %c - ref_wait:%u [%s(%u),%s(%u),%s(%u), fd:%d, fence:(0x%08X)] job:(0x%08X)\n", ++ tracker_type, tracker->point, state_char, tracker->trigger_ref_count, ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_GP) ? "WaitGP" : " ", tracker->fence.points[0], ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_PP) ? "WaitPP" : " ", tracker->fence.points[1], ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_SOFT) ? "WaitSOFT" : " ", tracker->fence.points[2], ++ tracker->fence.sync_fd, (unsigned int)(uintptr_t)(tracker->sync_fence), (unsigned int)(uintptr_t)(tracker->job)); ++ else ++ MALI_DEBUG_PRINT(2, ("TL: %s %u %c - ref_wait:%u [%s(%u),%s(%u),%s(%u), fd:%d, fence:(0x%08X)] job:(0x%08X)\n", ++ tracker_type, tracker->point, state_char, tracker->trigger_ref_count, ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_GP) ? "WaitGP" : " ", tracker->fence.points[0], ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_PP) ? "WaitPP" : " ", tracker->fence.points[1], ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_SOFT) ? "WaitSOFT" : " ", tracker->fence.points[2], ++ tracker->fence.sync_fd, (unsigned int)(uintptr_t)(tracker->sync_fence), (unsigned int)(uintptr_t)(tracker->job))); ++ } else { ++ if (print_ctx) ++ _mali_osk_ctxprintf(print_ctx, "TL: %s %u %c fd:%d fence:(0x%08X) job:(0x%08X)\n", ++ tracker_type, tracker->point, state_char, ++ tracker->fence.sync_fd, (unsigned int)(uintptr_t)(tracker->sync_fence), (unsigned int)(uintptr_t)(tracker->job)); ++ else ++ MALI_DEBUG_PRINT(2, ("TL: %s %u %c fd:%d fence:(0x%08X) job:(0x%08X)\n", ++ tracker_type, tracker->point, state_char, ++ tracker->fence.sync_fd, (unsigned int)(uintptr_t)(tracker->sync_fence), (unsigned int)(uintptr_t)(tracker->job))); + -+ if (ret >= PAGE_SIZE) { -+ buf[PAGE_SIZE - 2] = '\n'; -+ buf[PAGE_SIZE - 1] = '\0'; -+ ret = PAGE_SIZE - 1; + } ++#else ++ if (0 != tracker->trigger_ref_count) { ++ if (print_ctx) ++ _mali_osk_ctxprintf(print_ctx, "TL: %s %u %c - ref_wait:%u [%s(%u),%s(%u),%s(%u)] job:(0x%08X)\n", ++ tracker_type, tracker->point, state_char, tracker->trigger_ref_count, ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_GP) ? "WaitGP" : " ", tracker->fence.points[0], ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_PP) ? "WaitPP" : " ", tracker->fence.points[1], ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_SOFT) ? "WaitSOFT" : " ", tracker->fence.points[2], ++ (unsigned int)(uintptr_t)(tracker->job)); ++ else ++ MALI_DEBUG_PRINT(2, ("TL: %s %u %c - ref_wait:%u [%s(%u),%s(%u),%s(%u)] job:(0x%08X)\n", ++ tracker_type, tracker->point, state_char, tracker->trigger_ref_count, ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_GP) ? "WaitGP" : " ", tracker->fence.points[0], ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_PP) ? "WaitPP" : " ", tracker->fence.points[1], ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_SOFT) ? "WaitSOFT" : " ", tracker->fence.points[2], ++ (unsigned int)(uintptr_t)(tracker->job))); ++ } else { ++ if (print_ctx) ++ _mali_osk_ctxprintf(print_ctx, "TL: %s %u %c job:(0x%08X)\n", ++ tracker_type, tracker->point, state_char, ++ (unsigned int)(uintptr_t)(tracker->job)); ++ else ++ MALI_DEBUG_PRINT(2, ("TL: %s %u %c job:(0x%08X)\n", ++ tracker_type, tracker->point, state_char, ++ (unsigned int)(uintptr_t)(tracker->job))); + -+ return ret; ++ } ++#endif +} + -+/* -+ * By default, soft-stops are disabled when only a single context is present. -+ * The ability to enable soft-stop when only a single context is present can be -+ * used for debug and unit-testing purposes. -+ * (see CL t6xx_stress_1 unit-test as an example whereby this feature is used.) -+ */ -+static DEVICE_ATTR(js_softstop_always, S_IRUGO | S_IWUSR, show_js_softstop_always, set_js_softstop_always); -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+typedef void (kbasep_debug_command_func) (struct kbase_device *); ++void mali_timeline_debug_print_timeline(struct mali_timeline *timeline, _mali_osk_print_ctx *print_ctx) ++{ ++ struct mali_timeline_tracker *tracker = NULL; + -+enum kbasep_debug_command_code { -+ KBASEP_DEBUG_COMMAND_DUMPTRACE, ++ MALI_DEBUG_ASSERT_POINTER(timeline); + -+ /* This must be the last enum */ -+ KBASEP_DEBUG_COMMAND_COUNT -+}; ++ tracker = timeline->tracker_tail; ++ while (NULL != tracker) { ++ mali_timeline_debug_print_tracker(tracker, print_ctx); ++ tracker = tracker->timeline_next; ++ } ++} + -+struct kbasep_debug_command { -+ char *str; -+ kbasep_debug_command_func *func; -+}; ++#if !(LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)) ++void mali_timeline_debug_direct_print_tracker(struct mali_timeline_tracker *tracker) ++{ ++ const char *tracker_state = "IWAF"; ++ char state_char = 'I'; ++ char tracker_type[32] = {0}; + -+/* Debug commands supported by the driver */ -+static const struct kbasep_debug_command debug_commands[] = { -+ { -+ .str = "dumptrace", -+ .func = &kbasep_trace_dump, -+ } -+}; ++ MALI_DEBUG_ASSERT_POINTER(tracker); + -+/** -+ * show_debug - Show callback for the debug_command sysfs file. -+ * -+ * This function is called to get the contents of the debug_command sysfs -+ * file. This is a list of the available debug commands, separated by newlines. -+ * -+ * @dev: The device this sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The output buffer for the sysfs file contents -+ * -+ * Return: The number of bytes output to @buf. -+ */ -+static ssize_t show_debug(struct device *dev, struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ int i; -+ ssize_t ret = 0; ++ state_char = *(tracker_state + mali_timeline_debug_get_tracker_state(tracker)); ++ _mali_osk_snprintf(tracker_type, sizeof(tracker_type), "%s", timeline_tracker_type_to_string(tracker->type)); + -+ kbdev = to_kbase_device(dev); ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ if (0 != tracker->trigger_ref_count) { ++ MALI_PRINT(("TL: %s %u %c - ref_wait:%u [%s(%u),%s(%u),%s(%u), fd:%d, fence:(0x%08X)] job:(0x%08X)\n", ++ tracker_type, tracker->point, state_char, tracker->trigger_ref_count, ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_GP) ? "WaitGP" : " ", tracker->fence.points[0], ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_PP) ? "WaitPP" : " ", tracker->fence.points[1], ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_SOFT) ? "WaitSOFT" : " ", tracker->fence.points[2], ++ tracker->fence.sync_fd, tracker->sync_fence, tracker->job)); ++ } else { ++ MALI_PRINT(("TL: %s %u %c fd:%d fence:(0x%08X) job:(0x%08X)\n", ++ tracker_type, tracker->point, state_char, ++ tracker->fence.sync_fd, tracker->sync_fence, tracker->job)); ++ } ++#else ++ if (0 != tracker->trigger_ref_count) { ++ MALI_PRINT(("TL: %s %u %c - ref_wait:%u [%s(%u),%s(%u),%s(%u)] job:(0x%08X)\n", ++ tracker_type, tracker->point, state_char, tracker->trigger_ref_count, ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_GP) ? "WaitGP" : " ", tracker->fence.points[0], ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_PP) ? "WaitPP" : " ", tracker->fence.points[1], ++ is_waiting_on_timeline(tracker, MALI_TIMELINE_SOFT) ? "WaitSOFT" : " ", tracker->fence.points[2], ++ tracker->job)); ++ } else { ++ MALI_PRINT(("TL: %s %u %c job:(0x%08X)\n", ++ tracker_type, tracker->point, state_char, ++ tracker->job)); ++ } ++#endif ++} + -+ if (!kbdev) -+ return -ENODEV; ++void mali_timeline_debug_direct_print_timeline(struct mali_timeline *timeline) ++{ ++ struct mali_timeline_tracker *tracker = NULL; + -+ for (i = 0; i < KBASEP_DEBUG_COMMAND_COUNT && ret < PAGE_SIZE; i++) -+ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s\n", debug_commands[i].str); ++ MALI_DEBUG_ASSERT_POINTER(timeline); + -+ if (ret >= PAGE_SIZE) { -+ buf[PAGE_SIZE - 2] = '\n'; -+ buf[PAGE_SIZE - 1] = '\0'; -+ ret = PAGE_SIZE - 1; ++ tracker = timeline->tracker_tail; ++ while (NULL != tracker) { ++ mali_timeline_debug_direct_print_tracker(tracker); ++ tracker = tracker->timeline_next; + } -+ -+ return ret; +} + -+/** -+ * issue_debug - Store callback for the debug_command sysfs file. -+ * -+ * This function is called when the debug_command sysfs file is written to. -+ * It matches the requested command against the available commands, and if -+ * a matching command is found calls the associated function from -+ * @debug_commands to issue the command. -+ * -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes written to the sysfs file -+ * -+ * Return: @count if the function succeeded. An error code on failure. -+ */ -+static ssize_t issue_debug(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) ++#endif ++ ++void mali_timeline_debug_print_system(struct mali_timeline_system *system, _mali_osk_print_ctx *print_ctx) +{ -+ struct kbase_device *kbdev; + int i; ++ int num_printed = 0; ++ u32 tid = _mali_osk_get_tid(); + -+ kbdev = to_kbase_device(dev); ++ MALI_DEBUG_ASSERT_POINTER(system); + -+ if (!kbdev) -+ return -ENODEV; ++ mali_spinlock_reentrant_wait(system->spinlock, tid); + -+ for (i = 0; i < KBASEP_DEBUG_COMMAND_COUNT; i++) { -+ if (sysfs_streq(debug_commands[i].str, buf)) { -+ debug_commands[i].func(kbdev); -+ return count; -+ } ++ /* Print all timelines */ ++ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { ++ struct mali_timeline *timeline = system->timelines[i]; ++ ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ ++ if (NULL == timeline->tracker_head) continue; ++ if (print_ctx) ++ _mali_osk_ctxprintf(print_ctx, "TL: Timeline %s:\n", ++ timeline_id_to_string((enum mali_timeline_id)i)); ++ else ++ MALI_DEBUG_PRINT(2, ("TL: Timeline %s: oldest (%u) next(%u)\n", ++ timeline_id_to_string((enum mali_timeline_id)i), timeline->point_oldest, timeline->point_next)); ++ ++ mali_timeline_debug_print_timeline(timeline, print_ctx); ++ num_printed++; + } + -+ /* Debug Command not found */ -+ dev_err(dev, "debug_command: command not known\n"); -+ return -EINVAL; ++ if (0 == num_printed) { ++ if (print_ctx) ++ _mali_osk_ctxprintf(print_ctx, "TL: All timelines empty\n"); ++ else ++ MALI_DEBUG_PRINT(2, ("TL: All timelines empty\n")); ++ } ++ ++ mali_spinlock_reentrant_signal(system->spinlock, tid); +} + -+/* The sysfs file debug_command. -+ * -+ * This is used to issue general debug commands to the device driver. -+ * Reading it will produce a list of debug commands, separated by newlines. -+ * Writing to it with one of those commands will issue said command. -+ */ -+static DEVICE_ATTR(debug_command, S_IRUGO | S_IWUSR, show_debug, issue_debug); -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++#endif /* defined(MALI_TIMELINE_DEBUG_FUNCTIONS) */ + -+/** -+ * kbase_show_gpuinfo - Show callback for the gpuinfo sysfs entry. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the GPU information. -+ * -+ * This function is called to get a description of the present Mali -+ * GPU via the gpuinfo sysfs entry. This includes the GPU family, the -+ * number of cores, the hardware version and the raw product id. For -+ * example -+ * -+ * Mali-T60x MP4 r0p0 0x6956 -+ * -+ * Return: The number of bytes output to @buf. -+ */ -+static ssize_t kbase_show_gpuinfo(struct device *dev, -+ struct device_attribute *attr, char *buf) ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++void mali_timeline_dma_fence_callback(void *pp_job_ptr) +{ -+ static const struct gpu_product_id_name { -+ unsigned id; -+ char *name; -+ } gpu_product_id_names[] = { -+ { .id = GPU_ID_PI_T60X, .name = "Mali-T60x" }, -+ { .id = GPU_ID_PI_T62X, .name = "Mali-T62x" }, -+ { .id = GPU_ID_PI_T72X, .name = "Mali-T72x" }, -+ { .id = GPU_ID_PI_T76X, .name = "Mali-T76x" }, -+ { .id = GPU_ID_PI_T82X, .name = "Mali-T82x" }, -+ { .id = GPU_ID_PI_T83X, .name = "Mali-T83x" }, -+ { .id = GPU_ID_PI_T86X, .name = "Mali-T86x" }, -+ { .id = GPU_ID_PI_TFRX, .name = "Mali-T88x" }, -+ { .id = GPU_ID2_PRODUCT_TMIX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-G71" }, -+ { .id = GPU_ID2_PRODUCT_THEX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-G72" }, -+ { .id = GPU_ID2_PRODUCT_TSIX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-G51" }, -+ { .id = GPU_ID2_PRODUCT_TDVX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ .name = "Mali-G31" }, -+ }; -+ const char *product_name = "(Unknown Mali GPU)"; -+ struct kbase_device *kbdev; -+ u32 gpu_id; -+ unsigned product_id, product_id_mask; -+ unsigned i; -+ bool is_new_format; ++ struct mali_timeline_system *system; ++ struct mali_timeline_waiter *waiter; ++ struct mali_timeline_tracker *tracker; ++ struct mali_pp_job *pp_job = (struct mali_pp_job *)pp_job_ptr; ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; ++ u32 tid = _mali_osk_get_tid(); ++ mali_bool is_aborting = MALI_FALSE; + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ MALI_DEBUG_ASSERT_POINTER(pp_job); + -+ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ product_id = gpu_id >> GPU_ID_VERSION_PRODUCT_ID_SHIFT; -+ is_new_format = GPU_ID_IS_NEW_FORMAT(product_id); -+ product_id_mask = -+ (is_new_format ? -+ GPU_ID2_PRODUCT_MODEL : -+ GPU_ID_VERSION_PRODUCT_ID) >> -+ GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++ tracker = &pp_job->tracker; ++ MALI_DEBUG_ASSERT_POINTER(tracker); + -+ for (i = 0; i < ARRAY_SIZE(gpu_product_id_names); ++i) { -+ const struct gpu_product_id_name *p = &gpu_product_id_names[i]; ++ system = tracker->system; ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(system->session); + -+ if ((GPU_ID_IS_NEW_FORMAT(p->id) == is_new_format) && -+ (p->id & product_id_mask) == -+ (product_id & product_id_mask)) { -+ product_name = p->name; -+ break; -+ } -+ } ++ mali_spinlock_reentrant_wait(system->spinlock, tid); + -+ return scnprintf(buf, PAGE_SIZE, "%s %d cores 2EE r%dp%d 0x%04X\n", -+ product_name, kbdev->gpu_props.num_cores, -+ (gpu_id & GPU_ID_VERSION_MAJOR) >> GPU_ID_VERSION_MAJOR_SHIFT, -+ (gpu_id & GPU_ID_VERSION_MINOR) >> GPU_ID_VERSION_MINOR_SHIFT, -+ product_id); -+} -+static DEVICE_ATTR(gpuinfo, S_IRUGO, kbase_show_gpuinfo, NULL); ++ waiter = tracker->waiter_dma_fence; ++ MALI_DEBUG_ASSERT_POINTER(waiter); + -+/** -+ * set_dvfs_period - Store callback for the dvfs_period sysfs file. -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes written to the sysfs file -+ * -+ * This function is called when the dvfs_period sysfs file is written to. It -+ * checks the data written, and if valid updates the DVFS period variable, -+ * -+ * Return: @count if the function succeeded. An error code on failure. -+ */ -+static ssize_t set_dvfs_period(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ int ret; -+ int dvfs_period; ++ schedule_mask |= mali_timeline_system_release_waiter(system, waiter); + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ is_aborting = system->session->is_aborting; + -+ ret = kstrtoint(buf, 0, &dvfs_period); -+ if (ret || dvfs_period <= 0) { -+ dev_err(kbdev->dev, "Couldn't process dvfs_period write operation.\n" -+ "Use format \n"); -+ return -EINVAL; ++ /* If aborting, wake up sleepers that are waiting for dma fence callbacks to complete. */ ++ if (is_aborting) { ++ _mali_osk_wait_queue_wake_up(system->wait_queue); + } + -+ kbdev->pm.dvfs_period = dvfs_period; -+ dev_dbg(kbdev->dev, "DVFS period: %dms\n", dvfs_period); ++ mali_spinlock_reentrant_signal(system->spinlock, tid); + -+ return count; ++ if (!is_aborting) { ++ mali_executor_schedule_from_mask(schedule_mask, MALI_TRUE); ++ } +} -+ -+/** -+ * show_dvfs_period - Show callback for the dvfs_period sysfs entry. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the GPU information. -+ * -+ * This function is called to get the current period used for the DVFS sample -+ * timer. -+ * -+ * Return: The number of bytes output to @buf. ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline.h +new file mode 100755 +index 000000000..3e8bfc8fb +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.h +@@ -0,0 +1,587 @@ ++/* ++ * Copyright (C) 2013-2018 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+static ssize_t show_dvfs_period(struct device *dev, -+ struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ ssize_t ret; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; + -+ ret = scnprintf(buf, PAGE_SIZE, "%d\n", kbdev->pm.dvfs_period); -+ -+ return ret; -+} ++#ifndef __MALI_TIMELINE_H__ ++#define __MALI_TIMELINE_H__ + -+static DEVICE_ATTR(dvfs_period, S_IRUGO | S_IWUSR, show_dvfs_period, -+ set_dvfs_period); ++#include "mali_osk.h" ++#include "mali_ukk.h" ++#include "mali_session.h" ++#include "mali_kernel_common.h" ++#include "mali_spinlock_reentrant.h" ++#include "mali_sync.h" ++#include "mali_scheduler_types.h" ++#include + +/** -+ * set_pm_poweroff - Store callback for the pm_poweroff sysfs file. -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes written to the sysfs file -+ * -+ * This function is called when the pm_poweroff sysfs file is written to. -+ * -+ * This file contains three values separated by whitespace. The values -+ * are gpu_poweroff_time (the period of the poweroff timer, in ns), -+ * poweroff_shader_ticks (the number of poweroff timer ticks before an idle -+ * shader is powered off), and poweroff_gpu_ticks (the number of poweroff timer -+ * ticks before the GPU is powered off), in that order. ++ * Soft job timeout. + * -+ * Return: @count if the function succeeded. An error code on failure. ++ * Soft jobs have to be signaled as complete after activation. Normally this is done by user space, ++ * but in order to guarantee that every soft job is completed, we also have a timer. + */ -+static ssize_t set_pm_poweroff(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ int items; -+ s64 gpu_poweroff_time; -+ int poweroff_shader_ticks, poweroff_gpu_ticks; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; -+ -+ items = sscanf(buf, "%llu %u %u", &gpu_poweroff_time, -+ &poweroff_shader_ticks, -+ &poweroff_gpu_ticks); -+ if (items != 3) { -+ dev_err(kbdev->dev, "Couldn't process pm_poweroff write operation.\n" -+ "Use format \n"); -+ return -EINVAL; -+ } -+ -+ kbdev->pm.gpu_poweroff_time = HR_TIMER_DELAY_NSEC(gpu_poweroff_time); -+ kbdev->pm.poweroff_shader_ticks = poweroff_shader_ticks; -+ kbdev->pm.poweroff_gpu_ticks = poweroff_gpu_ticks; -+ -+ return count; -+} ++#define MALI_TIMELINE_TIMEOUT_HZ ((unsigned long) (HZ * 3 / 2)) /* 1500 ms. */ + +/** -+ * show_pm_poweroff - Show callback for the pm_poweroff sysfs entry. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the GPU information. -+ * -+ * This function is called to get the current period used for the DVFS sample -+ * timer. -+ * -+ * Return: The number of bytes output to @buf. ++ * Timeline type. + */ -+static ssize_t show_pm_poweroff(struct device *dev, -+ struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ ssize_t ret; ++typedef enum mali_timeline_id { ++ MALI_TIMELINE_GP = MALI_UK_TIMELINE_GP, /**< GP job timeline. */ ++ MALI_TIMELINE_PP = MALI_UK_TIMELINE_PP, /**< PP job timeline. */ ++ MALI_TIMELINE_SOFT = MALI_UK_TIMELINE_SOFT, /**< Soft job timeline. */ ++ MALI_TIMELINE_MAX = MALI_UK_TIMELINE_MAX ++} mali_timeline_id; + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++/** ++ * Used by trackers that should not be added to a timeline (@ref mali_timeline_system_add_tracker). ++ */ ++#define MALI_TIMELINE_NONE MALI_TIMELINE_MAX + -+ ret = scnprintf(buf, PAGE_SIZE, "%llu %u %u\n", -+ ktime_to_ns(kbdev->pm.gpu_poweroff_time), -+ kbdev->pm.poweroff_shader_ticks, -+ kbdev->pm.poweroff_gpu_ticks); ++/** ++ * Tracker type. ++ */ ++typedef enum mali_timeline_tracker_type { ++ MALI_TIMELINE_TRACKER_GP = 0, /**< Tracker used by GP jobs. */ ++ MALI_TIMELINE_TRACKER_PP = 1, /**< Tracker used by PP jobs. */ ++ MALI_TIMELINE_TRACKER_SOFT = 2, /**< Tracker used by soft jobs. */ ++ MALI_TIMELINE_TRACKER_WAIT = 3, /**< Tracker used for fence wait. */ ++ MALI_TIMELINE_TRACKER_SYNC = 4, /**< Tracker used for sync fence. */ ++ MALI_TIMELINE_TRACKER_MAX = 5, ++} mali_timeline_tracker_type; + -+ return ret; -+} ++/** ++ * Tracker activation error. ++ */ ++typedef u32 mali_timeline_activation_error; ++#define MALI_TIMELINE_ACTIVATION_ERROR_NONE 0 ++#define MALI_TIMELINE_ACTIVATION_ERROR_SYNC_BIT (1<<1) ++#define MALI_TIMELINE_ACTIVATION_ERROR_FATAL_BIT (1<<0) + -+static DEVICE_ATTR(pm_poweroff, S_IRUGO | S_IWUSR, show_pm_poweroff, -+ set_pm_poweroff); ++/** ++ * Type used to represent a point on a timeline. ++ */ ++typedef u32 mali_timeline_point; + +/** -+ * set_reset_timeout - Store callback for the reset_timeout sysfs file. -+ * @dev: The device with sysfs file is for -+ * @attr: The attributes of the sysfs file -+ * @buf: The value written to the sysfs file -+ * @count: The number of bytes written to the sysfs file -+ * -+ * This function is called when the reset_timeout sysfs file is written to. It -+ * checks the data written, and if valid updates the reset timeout. -+ * -+ * Return: @count if the function succeeded. An error code on failure. ++ * Used to represent that no point on a timeline. + */ -+static ssize_t set_reset_timeout(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ int ret; -+ int reset_timeout; ++#define MALI_TIMELINE_NO_POINT ((mali_timeline_point) 0) + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++/** ++ * The maximum span of points on a timeline. A timeline will be considered full if the difference ++ * between the oldest and newest points is equal or larger to this value. ++ */ ++#define MALI_TIMELINE_MAX_POINT_SPAN 65536 + -+ ret = kstrtoint(buf, 0, &reset_timeout); -+ if (ret || reset_timeout <= 0) { -+ dev_err(kbdev->dev, "Couldn't process reset_timeout write operation.\n" -+ "Use format \n"); -+ return -EINVAL; -+ } ++/** ++ * Magic value used to assert on validity of trackers. ++ */ ++#define MALI_TIMELINE_TRACKER_MAGIC 0xabcdabcd + -+ kbdev->reset_timeout_ms = reset_timeout; -+ dev_dbg(kbdev->dev, "Reset timeout: %dms\n", reset_timeout); ++struct mali_timeline; ++struct mali_timeline_waiter; ++struct mali_timeline_tracker; + -+ return count; -+} ++/** ++ * Timeline fence. ++ */ ++struct mali_timeline_fence { ++ mali_timeline_point points[MALI_TIMELINE_MAX]; /**< For each timeline, a point or MALI_TIMELINE_NO_POINT. */ ++ s32 sync_fd; /**< A file descriptor representing a sync fence, or -1. */ ++}; + +/** -+ * show_reset_timeout - Show callback for the reset_timeout sysfs entry. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the GPU information. -+ * -+ * This function is called to get the current reset timeout. ++ * Timeline system. + * -+ * Return: The number of bytes output to @buf. ++ * The Timeline system has a set of timelines associated with a session. + */ -+static ssize_t show_reset_timeout(struct device *dev, -+ struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ ssize_t ret; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++struct mali_timeline_system { ++ struct mali_spinlock_reentrant *spinlock; /**< Spin lock protecting the timeline system */ ++ struct mali_timeline *timelines[MALI_TIMELINE_MAX]; /**< The timelines in this system */ + -+ ret = scnprintf(buf, PAGE_SIZE, "%d\n", kbdev->reset_timeout_ms); ++ /* Single-linked list of unused waiter objects. Uses the tracker_next field in tracker. */ ++ struct mali_timeline_waiter *waiter_empty_list; + -+ return ret; -+} ++ struct mali_session_data *session; /**< Session that owns this system. */ + -+static DEVICE_ATTR(reset_timeout, S_IRUGO | S_IWUSR, show_reset_timeout, -+ set_reset_timeout); ++ mali_bool timer_enabled; /**< Set to MALI_TRUE if soft job timer should be enabled, MALI_FALSE if not. */ + ++ _mali_osk_wait_queue_t *wait_queue; /**< Wait queue. */ + ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ struct sync_timeline *signaled_sync_tl; /**< Special sync timeline used to create pre-signaled sync fences */ ++#else ++ struct mali_internal_sync_timeline *signaled_sync_tl; /**< Special sync timeline used to create pre-signaled sync fences */ ++#endif ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++}; + -+static ssize_t show_mem_pool_size(struct device *dev, -+ struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ ssize_t ret; ++/** ++ * Timeline. Each Timeline system will have MALI_TIMELINE_MAX timelines. ++ */ ++struct mali_timeline { ++ mali_timeline_point point_next; /**< The next available point. */ ++ mali_timeline_point point_oldest; /**< The oldest point not released. */ + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ /* Double-linked list of trackers. Sorted in ascending order by tracker->time_number with ++ * tail pointing to the tracker with the oldest time. */ ++ struct mali_timeline_tracker *tracker_head; ++ struct mali_timeline_tracker *tracker_tail; + -+ ret = scnprintf(buf, PAGE_SIZE, "%zu\n", -+ kbase_mem_pool_size(&kbdev->mem_pool)); ++ /* Double-linked list of waiters. Sorted in ascending order by waiter->time_number_wait ++ * with tail pointing to the waiter with oldest wait time. */ ++ struct mali_timeline_waiter *waiter_head; ++ struct mali_timeline_waiter *waiter_tail; + -+ return ret; -+} ++ struct mali_timeline_system *system; /**< Timeline system this timeline belongs to. */ ++ enum mali_timeline_id id; /**< Timeline type. */ + -+static ssize_t set_mem_pool_size(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ size_t new_size; -+ int err; ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ struct sync_timeline *sync_tl; /**< Sync timeline that corresponds to this timeline. */ ++#else ++ struct mali_internal_sync_timeline *sync_tl; ++#endif ++ mali_bool destroyed; ++ struct mali_spinlock_reentrant *spinlock; /**< Spin lock protecting the timeline system */ ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ /* The following fields are used to time out soft job trackers. */ ++ _mali_osk_wq_delayed_work_t *delayed_work; ++ mali_bool timer_active; ++}; + -+ err = kstrtoul(buf, 0, (unsigned long *)&new_size); -+ if (err) -+ return err; ++/** ++ * Timeline waiter. ++ */ ++struct mali_timeline_waiter { ++ mali_timeline_point point; /**< Point on timeline we are waiting for to be released. */ ++ struct mali_timeline_tracker *tracker; /**< Tracker that is waiting. */ + -+ kbase_mem_pool_trim(&kbdev->mem_pool, new_size); ++ struct mali_timeline_waiter *timeline_next; /**< Next waiter on timeline's waiter list. */ ++ struct mali_timeline_waiter *timeline_prev; /**< Previous waiter on timeline's waiter list. */ + -+ return count; -+} ++ struct mali_timeline_waiter *tracker_next; /**< Next waiter on tracker's waiter list. */ ++}; + -+static DEVICE_ATTR(mem_pool_size, S_IRUGO | S_IWUSR, show_mem_pool_size, -+ set_mem_pool_size); ++/** ++ * Timeline tracker. ++ */ ++struct mali_timeline_tracker { ++ MALI_DEBUG_CODE(u32 magic); /**< Should always be MALI_TIMELINE_TRACKER_MAGIC for a valid tracker. */ + -+static ssize_t show_mem_pool_max_size(struct device *dev, -+ struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ ssize_t ret; ++ mali_timeline_point point; /**< Point on timeline for this tracker */ + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ struct mali_timeline_tracker *timeline_next; /**< Next tracker on timeline's tracker list */ ++ struct mali_timeline_tracker *timeline_prev; /**< Previous tracker on timeline's tracker list */ + -+ ret = scnprintf(buf, PAGE_SIZE, "%zu\n", -+ kbase_mem_pool_max_size(&kbdev->mem_pool)); ++ u32 trigger_ref_count; /**< When zero tracker will be activated */ ++ mali_timeline_activation_error activation_error; /**< Activation error. */ ++ struct mali_timeline_fence fence; /**< Fence used to create this tracker */ + -+ return ret; -+} ++ /* Single-linked list of waiters. Sorted in order of insertions with ++ * tail pointing to first waiter. */ ++ struct mali_timeline_waiter *waiter_head; ++ struct mali_timeline_waiter *waiter_tail; + -+static ssize_t set_mem_pool_max_size(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) -+{ -+ struct kbase_device *kbdev; -+ size_t new_max_size; -+ int err; ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ /* These are only used if the tracker is waiting on a sync fence. */ ++ struct mali_timeline_waiter *waiter_sync; /**< A direct pointer to timeline waiter representing sync fence. */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ struct sync_fence_waiter sync_fence_waiter; /**< Used to connect sync fence and tracker in sync fence wait callback. */ ++ struct sync_fence *sync_fence; /**< The sync fence this tracker is waiting on. */ ++#else ++ struct mali_internal_sync_fence_waiter sync_fence_waiter; /**< Used to connect sync fence and tracker in sync fence wait callback. */ ++ struct mali_internal_sync_fence *sync_fence; /**< The sync fence this tracker is waiting on. */ ++#endif ++ _mali_osk_list_t sync_fence_cancel_list; /**< List node used to cancel sync fence waiters. */ ++ _mali_osk_list_t sync_fence_signal_list; /** < List node used to singal sync fence callback function. */ + -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+ err = kstrtoul(buf, 0, (unsigned long *)&new_max_size); -+ if (err) -+ return -EINVAL; ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++ struct mali_timeline_waiter *waiter_dma_fence; /**< A direct pointer to timeline waiter representing dma fence. */ ++#endif + -+ kbase_mem_pool_set_max_size(&kbdev->mem_pool, new_max_size); ++ struct mali_timeline_system *system; /**< Timeline system. */ ++ struct mali_timeline *timeline; /**< Timeline, or NULL if not on a timeline. */ ++ enum mali_timeline_tracker_type type; /**< Type of tracker. */ ++ void *job; /**< Owner of tracker. */ + -+ return count; -+} ++ /* The following fields are used to time out soft job trackers. */ ++ unsigned long os_tick_create; ++ unsigned long os_tick_activate; ++ mali_bool timer_active; ++}; + -+static DEVICE_ATTR(mem_pool_max_size, S_IRUGO | S_IWUSR, show_mem_pool_max_size, -+ set_mem_pool_max_size); ++extern _mali_osk_atomic_t gp_tracker_count; ++extern _mali_osk_atomic_t phy_pp_tracker_count; ++extern _mali_osk_atomic_t virt_pp_tracker_count; + +/** -+ * show_lp_mem_pool_size - Show size of the large memory pages pool. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the pool size. ++ * What follows is a set of functions to check the state of a timeline and to determine where on a ++ * timeline a given point is. Most of these checks will translate the timeline so the oldest point ++ * on the timeline is aligned with zero. Remember that all of these calculation are done on ++ * unsigned integers. + * -+ * This function is called to get the number of large memory pages which currently populate the kbdev pool. ++ * The following example illustrates the three different states a point can be in. The timeline has ++ * been translated to put the oldest point at zero: + * -+ * Return: The number of bytes output to @buf. ++ * ++ * ++ * [ point is in forbidden zone ] ++ * 64k wide ++ * MALI_TIMELINE_MAX_POINT_SPAN ++ * ++ * [ point is on timeline ) ( point is released ] ++ * ++ * 0--------------------------##############################--------------------2^32 - 1 ++ * ^ ^ ++ * \ | ++ * oldest point on timeline | ++ * \ ++ * next point on timeline + */ -+static ssize_t show_lp_mem_pool_size(struct device *dev, -+ struct device_attribute *attr, char * const buf) -+{ -+ struct kbase_device *kbdev; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; -+ -+ return scnprintf(buf, PAGE_SIZE, "%zu\n", kbase_mem_pool_size(&kbdev->lp_mem_pool)); -+} + +/** -+ * set_lp_mem_pool_size - Set size of the large memory pages pool. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The value written to the sysfs file. -+ * @count: The number of bytes written to the sysfs file. ++ * Compare two timeline points + * -+ * This function is called to set the number of large memory pages which should populate the kbdev pool. -+ * This may cause existing pages to be removed from the pool, or new pages to be created and then added to the pool. ++ * Returns true if a is after b, false if a is before or equal to b. + * -+ * Return: @count if the function succeeded. An error code on failure. ++ * This funcion ignores MALI_TIMELINE_MAX_POINT_SPAN. Wrapping is supported and ++ * the result will be correct if the points is less then UINT_MAX/2 apart. ++ * ++ * @param a Point on timeline ++ * @param b Point on timeline ++ * @return MALI_TRUE if a is after b + */ -+static ssize_t set_lp_mem_pool_size(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) ++MALI_STATIC_INLINE mali_bool mali_timeline_point_after(mali_timeline_point a, mali_timeline_point b) +{ -+ struct kbase_device *kbdev; -+ unsigned long new_size; -+ int err; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; -+ -+ err = kstrtoul(buf, 0, &new_size); -+ if (err) -+ return err; -+ -+ kbase_mem_pool_trim(&kbdev->lp_mem_pool, new_size); -+ -+ return count; ++ return 0 > ((s32)b) - ((s32)a); +} + -+static DEVICE_ATTR(lp_mem_pool_size, S_IRUGO | S_IWUSR, show_lp_mem_pool_size, -+ set_lp_mem_pool_size); -+ +/** -+ * show_lp_mem_pool_max_size - Show maximum size of the large memory pages pool. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The output buffer to receive the pool size. -+ * -+ * This function is called to get the maximum number of large memory pages that the kbdev pool can possibly contain. ++ * Check if a point is on timeline. A point is on a timeline if it is greater than, or equal to, ++ * the oldest point, and less than the next point. + * -+ * Return: The number of bytes output to @buf. ++ * @param timeline Timeline. ++ * @param point Point on timeline. ++ * @return MALI_TRUE if point is on timeline, MALI_FALSE if not. + */ -+static ssize_t show_lp_mem_pool_max_size(struct device *dev, -+ struct device_attribute *attr, char * const buf) ++MALI_STATIC_INLINE mali_bool mali_timeline_is_point_on(struct mali_timeline *timeline, mali_timeline_point point) +{ -+ struct kbase_device *kbdev; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_NO_POINT != point); + -+ return scnprintf(buf, PAGE_SIZE, "%zu\n", kbase_mem_pool_max_size(&kbdev->lp_mem_pool)); ++ return (point - timeline->point_oldest) < (timeline->point_next - timeline->point_oldest); +} + +/** -+ * set_lp_mem_pool_max_size - Set maximum size of the large memory pages pool. -+ * @dev: The device this sysfs file is for. -+ * @attr: The attributes of the sysfs file. -+ * @buf: The value written to the sysfs file. -+ * @count: The number of bytes written to the sysfs file. -+ * -+ * This function is called to set the maximum number of large memory pages that the kbdev pool can possibly contain. ++ * Check if a point has been released. A point is released if it is older than the oldest point on ++ * the timeline, newer than the next point, and also not in the forbidden zone. + * -+ * Return: @count if the function succeeded. An error code on failure. ++ * @param timeline Timeline. ++ * @param point Point on timeline. ++ * @return MALI_TRUE if point has been release, MALI_FALSE if not. + */ -+static ssize_t set_lp_mem_pool_max_size(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t count) ++MALI_STATIC_INLINE mali_bool mali_timeline_is_point_released(struct mali_timeline *timeline, mali_timeline_point point) +{ -+ struct kbase_device *kbdev; -+ unsigned long new_max_size; -+ int err; -+ -+ kbdev = to_kbase_device(dev); -+ if (!kbdev) -+ return -ENODEV; ++ mali_timeline_point point_normalized; ++ mali_timeline_point next_normalized; + -+ err = kstrtoul(buf, 0, &new_max_size); -+ if (err) -+ return -EINVAL; ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_NO_POINT != point); + -+ kbase_mem_pool_set_max_size(&kbdev->lp_mem_pool, new_max_size); ++ point_normalized = point - timeline->point_oldest; ++ next_normalized = timeline->point_next - timeline->point_oldest; + -+ return count; ++ return point_normalized > (next_normalized + MALI_TIMELINE_MAX_POINT_SPAN); +} + -+static DEVICE_ATTR(lp_mem_pool_max_size, S_IRUGO | S_IWUSR, show_lp_mem_pool_max_size, -+ set_lp_mem_pool_max_size); -+ -+#ifdef CONFIG_DEBUG_FS -+ -+/* Number of entries in serialize_jobs_settings[] */ -+#define NR_SERIALIZE_JOBS_SETTINGS 5 -+/* Maximum string length in serialize_jobs_settings[].name */ -+#define MAX_SERIALIZE_JOBS_NAME_LEN 16 -+ -+static struct -+{ -+ char *name; -+ u8 setting; -+} serialize_jobs_settings[NR_SERIALIZE_JOBS_SETTINGS] = { -+ {"none", 0}, -+ {"intra-slot", KBASE_SERIALIZE_INTRA_SLOT}, -+ {"inter-slot", KBASE_SERIALIZE_INTER_SLOT}, -+ {"full", KBASE_SERIALIZE_INTRA_SLOT | KBASE_SERIALIZE_INTER_SLOT}, -+ {"full-reset", KBASE_SERIALIZE_INTRA_SLOT | KBASE_SERIALIZE_INTER_SLOT | -+ KBASE_SERIALIZE_RESET} -+}; -+ +/** -+ * kbasep_serialize_jobs_seq_show - Show callback for the serialize_jobs debugfs -+ * file -+ * @sfile: seq_file pointer -+ * @data: Private callback data -+ * -+ * This function is called to get the contents of the serialize_jobs debugfs -+ * file. This is a list of the available settings with the currently active one -+ * surrounded by square brackets. -+ * -+ * Return: 0 on success, or an error code on error ++ * Check if the tracker that the point relate to has been released. A point is released if the tracker is not on the timeline. ++ * @param timeline Timeline. ++ * @param point Point on timeline. ++ * @return MALI_TRUE if the tracker has been release, MALI_FALSE if not. + */ -+static int kbasep_serialize_jobs_seq_show(struct seq_file *sfile, void *data) ++MALI_STATIC_INLINE mali_bool mali_timeline_is_tracker_released(struct mali_timeline *timeline, mali_timeline_point point) +{ -+ struct kbase_device *kbdev = sfile->private; -+ int i; ++ struct mali_timeline_tracker *tracker; + -+ CSTD_UNUSED(data); ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_NO_POINT != point); + -+ for (i = 0; i < NR_SERIALIZE_JOBS_SETTINGS; i++) { -+ if (kbdev->serialize_jobs == serialize_jobs_settings[i].setting) -+ seq_printf(sfile, "[%s] ", -+ serialize_jobs_settings[i].name); -+ else -+ seq_printf(sfile, "%s ", -+ serialize_jobs_settings[i].name); -+ } ++ tracker = timeline->tracker_tail; + -+ seq_puts(sfile, "\n"); ++ while (NULL != tracker) { ++ if (point == tracker->point) ++ return MALI_FALSE; ++ tracker = tracker->timeline_next; ++ } + -+ return 0; ++ return MALI_TRUE; +} + +/** -+ * kbasep_serialize_jobs_debugfs_write - Store callback for the serialize_jobs -+ * debugfs file. -+ * @file: File pointer -+ * @ubuf: User buffer containing data to store -+ * @count: Number of bytes in user buffer -+ * @ppos: File position -+ * -+ * This function is called when the serialize_jobs debugfs file is written to. -+ * It matches the requested setting against the available settings and if a -+ * matching setting is found updates kbdev->serialize_jobs. ++ * Check if a point is valid. A point is valid if is on the timeline or has been released. + * -+ * Return: @count if the function succeeded. An error code on failure. ++ * @param timeline Timeline. ++ * @param point Point on timeline. ++ * @return MALI_TRUE if point is valid, MALI_FALSE if not. + */ -+static ssize_t kbasep_serialize_jobs_debugfs_write(struct file *file, -+ const char __user *ubuf, size_t count, loff_t *ppos) ++MALI_STATIC_INLINE mali_bool mali_timeline_is_point_valid(struct mali_timeline *timeline, mali_timeline_point point) +{ -+ struct seq_file *s = file->private_data; -+ struct kbase_device *kbdev = s->private; -+ char buf[MAX_SERIALIZE_JOBS_NAME_LEN]; -+ int i; -+ bool valid = false; -+ -+ CSTD_UNUSED(ppos); -+ -+ count = min_t(size_t, sizeof(buf) - 1, count); -+ if (copy_from_user(buf, ubuf, count)) -+ return -EFAULT; -+ -+ buf[count] = 0; -+ -+ for (i = 0; i < NR_SERIALIZE_JOBS_SETTINGS; i++) { -+ if (sysfs_streq(serialize_jobs_settings[i].name, buf)) { -+ kbdev->serialize_jobs = -+ serialize_jobs_settings[i].setting; -+ valid = true; -+ break; -+ } -+ } -+ -+ if (!valid) { -+ dev_err(kbdev->dev, "serialize_jobs: invalid setting\n"); -+ return -EINVAL; -+ } -+ -+ return count; ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ return mali_timeline_is_point_on(timeline, point) || mali_timeline_is_point_released(timeline, point); +} + +/** -+ * kbasep_serialize_jobs_debugfs_open - Open callback for the serialize_jobs -+ * debugfs file -+ * @in: inode pointer -+ * @file: file pointer ++ * Check if timeline is empty (has no points on it). A timeline is empty if next == oldest. + * -+ * Return: Zero on success, error code on failure ++ * @param timeline Timeline. ++ * @return MALI_TRUE if timeline is empty, MALI_FALSE if not. + */ -+static int kbasep_serialize_jobs_debugfs_open(struct inode *in, -+ struct file *file) ++MALI_STATIC_INLINE mali_bool mali_timeline_is_empty(struct mali_timeline *timeline) +{ -+ return single_open(file, kbasep_serialize_jobs_seq_show, in->i_private); ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ return timeline->point_next == timeline->point_oldest; +} + -+static const struct file_operations kbasep_serialize_jobs_debugfs_fops = { -+ .open = kbasep_serialize_jobs_debugfs_open, -+ .read = seq_read, -+ .write = kbasep_serialize_jobs_debugfs_write, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+#endif /* CONFIG_DEBUG_FS */ -+ -+static int kbasep_protected_mode_init(struct kbase_device *kbdev) ++/** ++ * Check if timeline is full. A valid timeline cannot span more than 64k points (@ref ++ * MALI_TIMELINE_MAX_POINT_SPAN). ++ * ++ * @param timeline Timeline. ++ * @return MALI_TRUE if timeline is full, MALI_FALSE if not. ++ */ ++MALI_STATIC_INLINE mali_bool mali_timeline_is_full(struct mali_timeline *timeline) +{ -+#ifdef CONFIG_OF -+ struct device_node *protected_node; -+ struct platform_device *pdev; -+ struct protected_mode_device *protected_dev; -+#endif -+ -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_MODE)) { -+ /* Use native protected ops */ -+ kbdev->protected_dev = kzalloc(sizeof(*kbdev->protected_dev), -+ GFP_KERNEL); -+ if (!kbdev->protected_dev) -+ return -ENOMEM; -+ kbdev->protected_dev->data = kbdev; -+ kbdev->protected_ops = &kbase_native_protected_ops; -+ kbdev->protected_mode_support = true; -+ return 0; -+ } -+ -+ kbdev->protected_mode_support = false; ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ return MALI_TIMELINE_MAX_POINT_SPAN <= (timeline->point_next - timeline->point_oldest); ++} + -+#ifdef CONFIG_OF -+ protected_node = of_parse_phandle(kbdev->dev->of_node, -+ "protected-mode-switcher", 0); ++/** ++ * Create a new timeline system. ++ * ++ * @param session The session this timeline system will belong to. ++ * @return New timeline system. ++ */ ++struct mali_timeline_system *mali_timeline_system_create(struct mali_session_data *session); + -+ if (!protected_node) -+ protected_node = of_parse_phandle(kbdev->dev->of_node, -+ "secure-mode-switcher", 0); ++/** ++ * Abort timeline system. ++ * ++ * This will release all pending waiters in the timeline system causing all trackers to be ++ * activated. ++ * ++ * @param system Timeline system to abort all jobs from. ++ */ ++void mali_timeline_system_abort(struct mali_timeline_system *system); + -+ if (!protected_node) { -+ /* If protected_node cannot be looked up then we assume -+ * protected mode is not supported on this platform. */ -+ dev_info(kbdev->dev, "Protected mode not available\n"); -+ return 0; -+ } ++/** ++ * Destroy an empty timeline system. ++ * ++ * @note @ref mali_timeline_system_abort() should be called prior to this function. ++ * ++ * @param system Timeline system to destroy. ++ */ ++void mali_timeline_system_destroy(struct mali_timeline_system *system); + -+ pdev = of_find_device_by_node(protected_node); -+ if (!pdev) -+ return -EINVAL; ++/** ++ * Stop the soft job timer. ++ * ++ * @param system Timeline system ++ */ ++void mali_timeline_system_stop_timer(struct mali_timeline_system *system); + -+ protected_dev = platform_get_drvdata(pdev); -+ if (!protected_dev) -+ return -EPROBE_DEFER; ++/** ++ * Add a tracker to a timeline system and optionally also on a timeline. ++ * ++ * Once added to the timeline system, the tracker is guaranteed to be activated. The tracker can be ++ * activated before this function returns. Thus, it is also possible that the tracker is released ++ * before this function returns, depending on the tracker type. ++ * ++ * @note Tracker must be initialized (@ref mali_timeline_tracker_init) before being added to the ++ * timeline system. ++ * ++ * @param system Timeline system the tracker will be added to. ++ * @param tracker The tracker to be added. ++ * @param timeline_id Id of the timeline the tracker will be added to, or ++ * MALI_TIMELINE_NONE if it should not be added on a timeline. ++ * @return Point on timeline identifying this tracker, or MALI_TIMELINE_NO_POINT if not on timeline. ++ */ ++mali_timeline_point mali_timeline_system_add_tracker(struct mali_timeline_system *system, ++ struct mali_timeline_tracker *tracker, ++ enum mali_timeline_id timeline_id); + -+ kbdev->protected_ops = &protected_dev->ops; -+ kbdev->protected_dev = protected_dev; ++/** ++ * Get latest point on timeline. ++ * ++ * @param system Timeline system. ++ * @param timeline_id Id of timeline to get latest point from. ++ * @return Latest point on timeline, or MALI_TIMELINE_NO_POINT if the timeline is empty. ++ */ ++mali_timeline_point mali_timeline_system_get_latest_point(struct mali_timeline_system *system, ++ enum mali_timeline_id timeline_id); + -+ if (kbdev->protected_ops) { -+ int err; ++/** ++ * Initialize tracker. ++ * ++ * Must be called before tracker is added to timeline system (@ref mali_timeline_system_add_tracker). ++ * ++ * @param tracker Tracker to initialize. ++ * @param type Type of tracker. ++ * @param fence Fence used to set up dependencies for tracker. ++ * @param job Pointer to job struct this tracker is associated with. ++ */ ++void mali_timeline_tracker_init(struct mali_timeline_tracker *tracker, ++ mali_timeline_tracker_type type, ++ struct mali_timeline_fence *fence, ++ void *job); + -+ /* Make sure protected mode is disabled on startup */ -+ mutex_lock(&kbdev->pm.lock); -+ err = kbdev->protected_ops->protected_mode_disable( -+ kbdev->protected_dev); -+ mutex_unlock(&kbdev->pm.lock); ++/** ++ * Grab trigger ref count on tracker. ++ * ++ * This will prevent tracker from being activated until the trigger ref count reaches zero. ++ * ++ * @note Tracker must have been initialized (@ref mali_timeline_tracker_init). ++ * ++ * @param system Timeline system. ++ * @param tracker Tracker. ++ */ ++void mali_timeline_system_tracker_get(struct mali_timeline_system *system, struct mali_timeline_tracker *tracker); + -+ /* protected_mode_disable() returns -EINVAL if not supported */ -+ kbdev->protected_mode_support = (err != -EINVAL); -+ } -+#endif -+ return 0; -+} ++/** ++ * Release trigger ref count on tracker. ++ * ++ * If the trigger ref count reaches zero, the tracker will be activated. ++ * ++ * @param system Timeline system. ++ * @param tracker Tracker. ++ * @param activation_error Error bitmask if activated with error, or MALI_TIMELINE_ACTIVATION_ERROR_NONE if no error. ++ * @return Scheduling bitmask. ++ */ ++mali_scheduler_mask mali_timeline_system_tracker_put(struct mali_timeline_system *system, struct mali_timeline_tracker *tracker, mali_timeline_activation_error activation_error); + -+static void kbasep_protected_mode_term(struct kbase_device *kbdev) -+{ -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_MODE)) -+ kfree(kbdev->protected_dev); -+} ++/** ++ * Release a tracker from the timeline system. ++ * ++ * This is used to signal that the job being tracker is finished, either due to normal circumstances ++ * (job complete/abort) or due to a timeout. ++ * ++ * We may need to schedule some subsystems after a tracker has been released and the returned ++ * bitmask will tell us if it is necessary. If the return value is non-zero, this value needs to be ++ * sent as an input parameter to @ref mali_scheduler_schedule_from_mask() to do the scheduling. ++ * ++ * @note Tracker must have been activated before being released. ++ * @warning Not calling @ref mali_scheduler_schedule_from_mask() after releasing a tracker can lead ++ * to a deadlock. ++ * ++ * @param tracker Tracker being released. ++ * @return Scheduling bitmask. ++ */ ++mali_scheduler_mask mali_timeline_tracker_release(struct mali_timeline_tracker *tracker); + -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+static int kbase_common_reg_map(struct kbase_device *kbdev) -+{ -+ return 0; -+} -+static void kbase_common_reg_unmap(struct kbase_device * const kbdev) ++MALI_STATIC_INLINE mali_bool mali_timeline_tracker_activation_error( ++ struct mali_timeline_tracker *tracker) +{ ++ MALI_DEBUG_ASSERT_POINTER(tracker); ++ return (MALI_TIMELINE_ACTIVATION_ERROR_FATAL_BIT & ++ tracker->activation_error) ? MALI_TRUE : MALI_FALSE; +} -+#else /* CONFIG_MALI_BIFROST_NO_MALI */ -+static int kbase_common_reg_map(struct kbase_device *kbdev) -+{ -+ int err = 0; -+ -+ if (!request_mem_region(kbdev->reg_start, kbdev->reg_size, dev_name(kbdev->dev))) { -+ dev_err(kbdev->dev, "Register window unavailable\n"); -+ err = -EIO; -+ goto out_region; -+ } + -+ kbdev->reg = ioremap(kbdev->reg_start, kbdev->reg_size); -+ if (!kbdev->reg) { -+ dev_err(kbdev->dev, "Can't remap register window\n"); -+ err = -EINVAL; -+ goto out_ioremap; -+ } ++/** ++ * Copy data from a UK fence to a Timeline fence. ++ * ++ * @param fence Timeline fence. ++ * @param uk_fence UK fence. ++ */ ++void mali_timeline_fence_copy_uk_fence(struct mali_timeline_fence *fence, _mali_uk_fence_t *uk_fence); + -+ return err; ++_mali_osk_errcode_t mali_timeline_initialize(void); + -+ out_ioremap: -+ release_mem_region(kbdev->reg_start, kbdev->reg_size); -+ out_region: -+ return err; -+} ++void mali_timeline_terminate(void); + -+static void kbase_common_reg_unmap(struct kbase_device * const kbdev) ++MALI_STATIC_INLINE mali_bool mali_timeline_has_gp_job(void) +{ -+ if (kbdev->reg) { -+ iounmap(kbdev->reg); -+ release_mem_region(kbdev->reg_start, kbdev->reg_size); -+ kbdev->reg = NULL; -+ kbdev->reg_start = 0; -+ kbdev->reg_size = 0; -+ } ++ return 0 < _mali_osk_atomic_read(&gp_tracker_count); +} -+#endif /* CONFIG_MALI_BIFROST_NO_MALI */ + -+static int registers_map(struct kbase_device * const kbdev) ++MALI_STATIC_INLINE mali_bool mali_timeline_has_physical_pp_job(void) +{ -+ -+ /* the first memory resource is the physical address of the GPU -+ * registers */ -+ struct platform_device *pdev = to_platform_device(kbdev->dev); -+ struct resource *reg_res; -+ int err; -+ -+ reg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ if (!reg_res) { -+ dev_err(kbdev->dev, "Invalid register resource\n"); -+ return -ENOENT; -+ } -+ -+ kbdev->reg_start = reg_res->start; -+ kbdev->reg_size = resource_size(reg_res); -+ -+ err = kbase_common_reg_map(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "Failed to map registers\n"); -+ return err; -+ } -+ -+ return 0; ++ return 0 < _mali_osk_atomic_read(&phy_pp_tracker_count); +} + -+static void registers_unmap(struct kbase_device *kbdev) ++MALI_STATIC_INLINE mali_bool mali_timeline_has_virtual_pp_job(void) +{ -+ kbase_common_reg_unmap(kbdev); ++ return 0 < _mali_osk_atomic_read(&virt_pp_tracker_count); +} + -+static int power_control_init(struct platform_device *pdev) -+{ -+ struct kbase_device *kbdev = to_kbase_device(&pdev->dev); -+ int err = 0; ++#if defined(DEBUG) ++#define MALI_TIMELINE_DEBUG_FUNCTIONS ++#endif /* DEBUG */ ++#if defined(MALI_TIMELINE_DEBUG_FUNCTIONS) + -+ if (!kbdev) -+ return -ENODEV; ++/** ++ * Tracker state. Used for debug printing. ++ */ ++typedef enum mali_timeline_tracker_state { ++ MALI_TIMELINE_TS_INIT = 0, ++ MALI_TIMELINE_TS_WAITING = 1, ++ MALI_TIMELINE_TS_ACTIVE = 2, ++ MALI_TIMELINE_TS_FINISH = 3, ++} mali_timeline_tracker_state; + -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) && defined(CONFIG_OF) \ -+ && defined(CONFIG_REGULATOR) -+ kbdev->regulator = regulator_get_optional(kbdev->dev, "mali"); -+ if (IS_ERR_OR_NULL(kbdev->regulator)) { -+ err = PTR_ERR(kbdev->regulator); -+ kbdev->regulator = NULL; -+ if (err == -EPROBE_DEFER) { -+ dev_err(&pdev->dev, "Failed to get regulator\n"); -+ return err; -+ } -+ dev_info(kbdev->dev, -+ "Continuing without Mali regulator control\n"); -+ /* Allow probe to continue without regulator */ -+ } -+#endif /* LINUX_VERSION_CODE >= 3, 12, 0 */ ++/** ++ * Get tracker state. ++ * ++ * @param tracker Tracker to check. ++ * @return State of tracker. ++ */ ++mali_timeline_tracker_state mali_timeline_debug_get_tracker_state(struct mali_timeline_tracker *tracker); + -+ kbdev->clock = clk_get(kbdev->dev, "clk_mali"); -+ if (IS_ERR_OR_NULL(kbdev->clock)) { -+ err = PTR_ERR(kbdev->clock); -+ kbdev->clock = NULL; -+ if (err == -EPROBE_DEFER) { -+ dev_err(&pdev->dev, "Failed to get clock\n"); -+ goto fail; -+ } -+ dev_info(kbdev->dev, "Continuing without Mali clock control\n"); -+ /* Allow probe to continue without clock. */ -+ } else { -+ err = clk_prepare(kbdev->clock); -+ if (err) { -+ dev_err(kbdev->dev, -+ "Failed to prepare and enable clock (%d)\n", -+ err); -+ goto fail; -+ } -+ } ++/** ++ * Print debug information about tracker. ++ * ++ * @param tracker Tracker to print. ++ */ ++void mali_timeline_debug_print_tracker(struct mali_timeline_tracker *tracker, _mali_osk_print_ctx *print_ctx); + -+ err = kbase_platform_rk_init_opp_table(kbdev); -+ if (err) -+ dev_err(kbdev->dev, "Failed to init_opp_table (%d)\n", err); ++/** ++ * Print debug information about timeline. ++ * ++ * @param timeline Timeline to print. ++ */ ++void mali_timeline_debug_print_timeline(struct mali_timeline *timeline, _mali_osk_print_ctx *print_ctx); + -+ return 0; ++#if !(LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)) ++void mali_timeline_debug_direct_print_tracker(struct mali_timeline_tracker *tracker); ++void mali_timeline_debug_direct_print_timeline(struct mali_timeline *timeline); ++#endif + -+fail: ++/** ++ * Print debug information about timeline system. ++ * ++ * @param system Timeline system to print. ++ */ ++void mali_timeline_debug_print_system(struct mali_timeline_system *system, _mali_osk_print_ctx *print_ctx); + -+if (kbdev->clock != NULL) { -+ clk_put(kbdev->clock); -+ kbdev->clock = NULL; -+} ++#endif /* defined(MALI_TIMELINE_DEBUG_FUNCTIONS) */ + -+#ifdef CONFIG_REGULATOR -+ if (NULL != kbdev->regulator) { -+ regulator_put(kbdev->regulator); -+ kbdev->regulator = NULL; -+ } ++#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++/** ++ * The timeline dma fence callback when dma fence signal. ++ * ++ * @param pp_job_ptr The pointer to pp job that link to the signaled dma fence. ++ */ ++void mali_timeline_dma_fence_callback(void *pp_job_ptr); +#endif + -+ return err; -+} ++#endif /* __MALI_TIMELINE_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c +new file mode 100755 +index 000000000..1ab13f509 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c +@@ -0,0 +1,218 @@ ++/* ++ * Copyright (C) 2013-2014, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include ++#include "mali_timeline_fence_wait.h" ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_spinlock_reentrant.h" + -+static void power_control_term(struct kbase_device *kbdev) ++/** ++ * Allocate a fence waiter tracker. ++ * ++ * @return New fence waiter if successful, NULL if not. ++ */ ++static struct mali_timeline_fence_wait_tracker *mali_timeline_fence_wait_tracker_alloc(void) +{ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) || \ -+ defined(LSK_OPPV2_BACKPORT) -+ dev_pm_opp_of_remove_table(kbdev->dev); -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) -+ of_free_opp_table(kbdev->dev); -+#endif -+ -+ if (kbdev->clock) { -+ clk_unprepare(kbdev->clock); -+ clk_put(kbdev->clock); -+ kbdev->clock = NULL; -+ } -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) && defined(CONFIG_OF) \ -+ && defined(CONFIG_REGULATOR) -+ if (kbdev->regulator) { -+ regulator_put(kbdev->regulator); -+ kbdev->regulator = NULL; -+ } -+#endif /* LINUX_VERSION_CODE >= 3, 12, 0 */ ++ return (struct mali_timeline_fence_wait_tracker *) _mali_osk_calloc(1, sizeof(struct mali_timeline_fence_wait_tracker)); +} + -+#ifdef CONFIG_DEBUG_FS -+ -+#if KBASE_GPU_RESET_EN -+#include -+ -+static void trigger_quirks_reload(struct kbase_device *kbdev) ++/** ++ * Free fence waiter tracker. ++ * ++ * @param wait Fence wait tracker to free. ++ */ ++static void mali_timeline_fence_wait_tracker_free(struct mali_timeline_fence_wait_tracker *wait) +{ -+ kbase_pm_context_active(kbdev); -+ if (kbase_prepare_to_reset_gpu(kbdev)) -+ kbase_reset_gpu(kbdev); -+ kbase_pm_context_idle(kbdev); ++ MALI_DEBUG_ASSERT_POINTER(wait); ++ _mali_osk_atomic_term(&wait->refcount); ++ _mali_osk_free(wait); +} + -+#define MAKE_QUIRK_ACCESSORS(type) \ -+static int type##_quirks_set(void *data, u64 val) \ -+{ \ -+ struct kbase_device *kbdev; \ -+ kbdev = (struct kbase_device *)data; \ -+ kbdev->hw_quirks_##type = (u32)val; \ -+ trigger_quirks_reload(kbdev); \ -+ return 0;\ -+} \ -+\ -+static int type##_quirks_get(void *data, u64 *val) \ -+{ \ -+ struct kbase_device *kbdev;\ -+ kbdev = (struct kbase_device *)data;\ -+ *val = kbdev->hw_quirks_##type;\ -+ return 0;\ -+} \ -+DEFINE_SIMPLE_ATTRIBUTE(fops_##type##_quirks, type##_quirks_get,\ -+ type##_quirks_set, "%llu\n") ++/** ++ * Check if fence wait tracker has been activated. Used as a wait queue condition. ++ * ++ * @param data Fence waiter. ++ * @return MALI_TRUE if tracker has been activated, MALI_FALSE if not. ++ */ ++static mali_bool mali_timeline_fence_wait_tracker_is_activated(void *data) ++{ ++ struct mali_timeline_fence_wait_tracker *wait; + -+MAKE_QUIRK_ACCESSORS(sc); -+MAKE_QUIRK_ACCESSORS(tiler); -+MAKE_QUIRK_ACCESSORS(mmu); -+MAKE_QUIRK_ACCESSORS(jm); ++ wait = (struct mali_timeline_fence_wait_tracker *) data; ++ MALI_DEBUG_ASSERT_POINTER(wait); + -+#endif /* KBASE_GPU_RESET_EN */ ++ return wait->activated; ++} + +/** -+ * debugfs_protected_debug_mode_read - "protected_debug_mode" debugfs read -+ * @file: File object to read is for -+ * @buf: User buffer to populate with data -+ * @len: Length of user buffer -+ * @ppos: Offset within file object -+ * -+ * Retrieves the current status of protected debug mode -+ * (0 = disabled, 1 = enabled) ++ * Check if fence has been signaled. + * -+ * Return: Number of bytes added to user buffer ++ * @param system Timeline system. ++ * @param fence Timeline fence. ++ * @return MALI_TRUE if fence is signaled, MALI_FALSE if not. + */ -+static ssize_t debugfs_protected_debug_mode_read(struct file *file, -+ char __user *buf, size_t len, loff_t *ppos) ++static mali_bool mali_timeline_fence_wait_check_status(struct mali_timeline_system *system, struct mali_timeline_fence *fence) +{ -+ struct kbase_device *kbdev = (struct kbase_device *)file->private_data; -+ u32 gpu_status; -+ ssize_t ret_val; ++ int i; ++ u32 tid = _mali_osk_get_tid(); ++ mali_bool ret = MALI_TRUE; ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ struct sync_fence *sync_fence = NULL; ++#else ++ struct mali_internal_sync_fence *sync_fence = NULL; ++#endif ++#endif + -+ kbase_pm_context_active(kbdev); -+ gpu_status = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_STATUS), NULL); -+ kbase_pm_context_idle(kbdev); ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(fence); + -+ if (gpu_status & GPU_DBGEN) -+ ret_val = simple_read_from_buffer(buf, len, ppos, "1\n", 2); -+ else -+ ret_val = simple_read_from_buffer(buf, len, ppos, "0\n", 2); ++ mali_spinlock_reentrant_wait(system->spinlock, tid); + -+ return ret_val; -+} ++ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { ++ struct mali_timeline *timeline; ++ mali_timeline_point point; + -+/* -+ * struct fops_protected_debug_mode - "protected_debug_mode" debugfs fops -+ * -+ * Contains the file operations for the "protected_debug_mode" debugfs file -+ */ -+static const struct file_operations fops_protected_debug_mode = { -+ .open = simple_open, -+ .read = debugfs_protected_debug_mode_read, -+ .llseek = default_llseek, -+}; ++ point = fence->points[i]; + -+static int kbase_device_debugfs_init(struct kbase_device *kbdev) -+{ -+ struct dentry *debugfs_ctx_defaults_directory; -+ int err; ++ if (likely(MALI_TIMELINE_NO_POINT == point)) { ++ /* Fence contains no point on this timeline. */ ++ continue; ++ } + -+ kbdev->mali_debugfs_directory = debugfs_create_dir(kbdev->devname, -+ NULL); -+ if (!kbdev->mali_debugfs_directory) { -+ dev_err(kbdev->dev, "Couldn't create mali debugfs directory\n"); -+ err = -ENOMEM; -+ goto out; ++ timeline = system->timelines[i]; ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ ++ if (unlikely(!mali_timeline_is_point_valid(timeline, point))) { ++ MALI_PRINT_ERROR(("Mali Timeline: point %d is not valid (oldest=%d, next=%d)\n", point, timeline->point_oldest, timeline->point_next)); ++ } ++ ++ if (!mali_timeline_is_point_released(timeline, point)) { ++ ret = MALI_FALSE; ++ goto exit; ++ } + } + -+ kbdev->debugfs_ctx_directory = debugfs_create_dir("ctx", -+ kbdev->mali_debugfs_directory); -+ if (!kbdev->debugfs_ctx_directory) { -+ dev_err(kbdev->dev, "Couldn't create mali debugfs ctx directory\n"); -+ err = -ENOMEM; -+ goto out; ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ if (-1 != fence->sync_fd) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ sync_fence = sync_fence_fdget(fence->sync_fd); ++#else ++ sync_fence = mali_internal_sync_fence_fdget(fence->sync_fd); ++#endif ++ if (likely(NULL != sync_fence)) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) ++ if (0 == sync_fence->status) { ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ if (0 < atomic_read(&sync_fence->status)) { ++#else ++ if (0 == sync_fence->fence->ops->signaled(sync_fence->fence)) { ++#endif ++ ret = MALI_FALSE; ++ ++ } else { ++ ret = MALI_TRUE; ++ } ++ } else { ++ MALI_PRINT_ERROR(("Mali Timeline: failed to get sync fence from fd %d\n", fence->sync_fd)); ++ } + } ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+ debugfs_ctx_defaults_directory = debugfs_create_dir("defaults", -+ kbdev->debugfs_ctx_directory); -+ if (!debugfs_ctx_defaults_directory) { -+ dev_err(kbdev->dev, "Couldn't create mali debugfs ctx defaults directory\n"); -+ err = -ENOMEM; -+ goto out; ++exit: ++ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ if (NULL != sync_fence) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ sync_fence_put(sync_fence); ++#else ++ fput(sync_fence->file); ++#endif + } ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+#if !MALI_CUSTOMER_RELEASE -+ kbasep_regs_dump_debugfs_init(kbdev); -+#endif /* !MALI_CUSTOMER_RELEASE */ -+ kbasep_regs_history_debugfs_init(kbdev); ++ return ret; ++} + -+ kbase_debug_job_fault_debugfs_init(kbdev); -+ kbasep_gpu_memory_debugfs_init(kbdev); -+ kbase_as_fault_debugfs_init(kbdev); -+#if KBASE_GPU_RESET_EN -+ /* fops_* variables created by invocations of macro -+ * MAKE_QUIRK_ACCESSORS() above. */ -+ debugfs_create_file("quirks_sc", 0644, -+ kbdev->mali_debugfs_directory, kbdev, -+ &fops_sc_quirks); -+ debugfs_create_file("quirks_tiler", 0644, -+ kbdev->mali_debugfs_directory, kbdev, -+ &fops_tiler_quirks); -+ debugfs_create_file("quirks_mmu", 0644, -+ kbdev->mali_debugfs_directory, kbdev, -+ &fops_mmu_quirks); -+ debugfs_create_file("quirks_jm", 0644, -+ kbdev->mali_debugfs_directory, kbdev, -+ &fops_jm_quirks); -+#endif /* KBASE_GPU_RESET_EN */ ++mali_bool mali_timeline_fence_wait(struct mali_timeline_system *system, struct mali_timeline_fence *fence, u32 timeout) ++{ ++ struct mali_timeline_fence_wait_tracker *wait; ++ mali_timeline_point point; ++ mali_bool ret; + -+ debugfs_create_bool("infinite_cache", 0644, -+ debugfs_ctx_defaults_directory, -+ &kbdev->infinite_cache_active_default); ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(fence); + -+ debugfs_create_size_t("mem_pool_max_size", 0644, -+ debugfs_ctx_defaults_directory, -+ &kbdev->mem_pool_max_size_default); ++ MALI_DEBUG_PRINT(4, ("Mali Timeline: wait on fence\n")); + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_DEBUG_MODE)) { -+ debugfs_create_file("protected_debug_mode", S_IRUGO, -+ kbdev->mali_debugfs_directory, kbdev, -+ &fops_protected_debug_mode); ++ if (MALI_TIMELINE_FENCE_WAIT_TIMEOUT_IMMEDIATELY == timeout) { ++ return mali_timeline_fence_wait_check_status(system, fence); + } + -+#if KBASE_TRACE_ENABLE -+ kbasep_trace_debugfs_init(kbdev); -+#endif /* KBASE_TRACE_ENABLE */ ++ wait = mali_timeline_fence_wait_tracker_alloc(); ++ if (unlikely(NULL == wait)) { ++ MALI_PRINT_ERROR(("Mali Timeline: failed to allocate data for fence wait\n")); ++ return MALI_FALSE; ++ } + -+#ifdef CONFIG_MALI_BIFROST_TRACE_TIMELINE -+ kbasep_trace_timeline_debugfs_init(kbdev); -+#endif /* CONFIG_MALI_BIFROST_TRACE_TIMELINE */ ++ wait->activated = MALI_FALSE; ++ wait->system = system; + -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+#ifdef CONFIG_DEVFREQ_THERMAL -+ if ((kbdev->inited_subsys & inited_devfreq) && !kbdev->model_data) -+ kbase_ipa_debugfs_init(kbdev); -+#endif /* CONFIG_DEVFREQ_THERMAL */ -+#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ ++ /* Initialize refcount to two references. The reference first will be released by this ++ * function after the wait is over. The second reference will be released when the tracker ++ * is activated. */ ++ _mali_osk_atomic_init(&wait->refcount, 2); + -+#ifdef CONFIG_DEBUG_FS -+ debugfs_create_file("serialize_jobs", S_IRUGO | S_IWUSR, -+ kbdev->mali_debugfs_directory, kbdev, -+ &kbasep_serialize_jobs_debugfs_fops); -+#endif /* CONFIG_DEBUG_FS */ ++ /* Add tracker to timeline system, but not to a timeline. */ ++ mali_timeline_tracker_init(&wait->tracker, MALI_TIMELINE_TRACKER_WAIT, fence, wait); ++ point = mali_timeline_system_add_tracker(system, &wait->tracker, MALI_TIMELINE_NONE); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_NO_POINT == point); ++ MALI_IGNORE(point); + -+ return 0; ++ /* Wait for the tracker to be activated or time out. */ ++ if (MALI_TIMELINE_FENCE_WAIT_TIMEOUT_NEVER == timeout) { ++ _mali_osk_wait_queue_wait_event(system->wait_queue, mali_timeline_fence_wait_tracker_is_activated, (void *) wait); ++ } else { ++ _mali_osk_wait_queue_wait_event_timeout(system->wait_queue, mali_timeline_fence_wait_tracker_is_activated, (void *) wait, timeout); ++ } + -+out: -+ debugfs_remove_recursive(kbdev->mali_debugfs_directory); -+ return err; -+} ++ ret = wait->activated; + -+static void kbase_device_debugfs_term(struct kbase_device *kbdev) -+{ -+ debugfs_remove_recursive(kbdev->mali_debugfs_directory); -+} ++ if (0 == _mali_osk_atomic_dec_return(&wait->refcount)) { ++ mali_timeline_fence_wait_tracker_free(wait); ++ } + -+#else /* CONFIG_DEBUG_FS */ -+static inline int kbase_device_debugfs_init(struct kbase_device *kbdev) -+{ -+ return 0; ++ return ret; +} + -+static inline void kbase_device_debugfs_term(struct kbase_device *kbdev) { } -+#endif /* CONFIG_DEBUG_FS */ -+ -+static void kbase_device_coherency_init(struct kbase_device *kbdev, -+ unsigned prod_id) ++void mali_timeline_fence_wait_activate(struct mali_timeline_fence_wait_tracker *wait) +{ -+#ifdef CONFIG_OF -+ u32 supported_coherency_bitmap = -+ kbdev->gpu_props.props.raw_props.coherency_mode; -+ const void *coherency_override_dts; -+ u32 override_coherency; -+ -+ /* Only for tMIx : -+ * (COHERENCY_ACE_LITE | COHERENCY_ACE) was incorrectly -+ * documented for tMIx so force correct value here. -+ */ -+ if (GPU_ID_IS_NEW_FORMAT(prod_id) && -+ (GPU_ID2_MODEL_MATCH_VALUE(prod_id) == -+ GPU_ID2_PRODUCT_TMIX)) -+ if (supported_coherency_bitmap == -+ COHERENCY_FEATURE_BIT(COHERENCY_ACE)) -+ supported_coherency_bitmap |= -+ COHERENCY_FEATURE_BIT(COHERENCY_ACE_LITE); -+ -+#endif /* CONFIG_OF */ ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; + -+ kbdev->system_coherency = COHERENCY_NONE; ++ MALI_DEBUG_ASSERT_POINTER(wait); ++ MALI_DEBUG_ASSERT_POINTER(wait->system); + -+ /* device tree may override the coherency */ -+#ifdef CONFIG_OF -+ coherency_override_dts = of_get_property(kbdev->dev->of_node, -+ "system-coherency", -+ NULL); -+ if (coherency_override_dts) { ++ MALI_DEBUG_PRINT(4, ("Mali Timeline: activation for fence wait tracker\n")); + -+ override_coherency = be32_to_cpup(coherency_override_dts); ++ MALI_DEBUG_ASSERT(MALI_FALSE == wait->activated); ++ wait->activated = MALI_TRUE; + -+ if ((override_coherency <= COHERENCY_NONE) && -+ (supported_coherency_bitmap & -+ COHERENCY_FEATURE_BIT(override_coherency))) { ++ _mali_osk_wait_queue_wake_up(wait->system->wait_queue); + -+ kbdev->system_coherency = override_coherency; ++ /* Nothing can wait on this tracker, so nothing to schedule after release. */ ++ schedule_mask = mali_timeline_tracker_release(&wait->tracker); ++ MALI_DEBUG_ASSERT(MALI_SCHEDULER_MASK_EMPTY == schedule_mask); ++ MALI_IGNORE(schedule_mask); + -+ dev_info(kbdev->dev, -+ "Using coherency mode %u set from dtb", -+ override_coherency); -+ } else -+ dev_warn(kbdev->dev, -+ "Ignoring unsupported coherency mode %u set from dtb", -+ override_coherency); ++ if (0 == _mali_osk_atomic_dec_return(&wait->refcount)) { ++ mali_timeline_fence_wait_tracker_free(wait); + } ++} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h +new file mode 100755 +index 000000000..9da12baee +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h +@@ -0,0 +1,67 @@ ++/* ++ * Copyright (C) 2013, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+#endif /* CONFIG_OF */ ++/** ++ * @file mali_timeline_fence_wait.h ++ * ++ * This file contains functions used to wait until a Timeline fence is signaled. ++ */ + -+ kbdev->gpu_props.props.raw_props.coherency_mode = -+ kbdev->system_coherency; -+} ++#ifndef __MALI_TIMELINE_FENCE_WAIT_H__ ++#define __MALI_TIMELINE_FENCE_WAIT_H__ + -+#ifdef CONFIG_MALI_FPGA_BUS_LOGGER ++#include "mali_osk.h" ++#include "mali_timeline.h" + -+/* Callback used by the kbase bus logger client, to initiate a GPU reset -+ * when the bus log is restarted. GPU reset is used as reference point -+ * in HW bus log analyses. ++/** ++ * If used as the timeout argument in @ref mali_timeline_fence_wait, a timer is not used and the ++ * function only returns when the fence is signaled. + */ -+static void kbase_logging_started_cb(void *data) -+{ -+ struct kbase_device *kbdev = (struct kbase_device *)data; ++#define MALI_TIMELINE_FENCE_WAIT_TIMEOUT_NEVER ((u32) -1) + -+ if (kbase_prepare_to_reset_gpu(kbdev)) -+ kbase_reset_gpu(kbdev); -+ dev_info(kbdev->dev, "KBASE - Bus logger restarted\n"); -+} -+#endif ++/** ++ * If used as the timeout argument in @ref mali_timeline_fence_wait, the function will return ++ * immediately with the current state of the fence. ++ */ ++#define MALI_TIMELINE_FENCE_WAIT_TIMEOUT_IMMEDIATELY 0 + -+static struct attribute *kbase_attrs[] = { -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ &dev_attr_debug_command.attr, -+ &dev_attr_js_softstop_always.attr, -+#endif -+#if !MALI_CUSTOMER_RELEASE -+ &dev_attr_force_replay.attr, -+#endif -+ &dev_attr_js_timeouts.attr, -+ &dev_attr_soft_job_timeout.attr, -+ &dev_attr_gpuinfo.attr, -+ &dev_attr_dvfs_period.attr, -+ &dev_attr_pm_poweroff.attr, -+ &dev_attr_reset_timeout.attr, -+ &dev_attr_js_scheduling_period.attr, -+ &dev_attr_power_policy.attr, -+ &dev_attr_core_availability_policy.attr, -+ &dev_attr_core_mask.attr, -+ &dev_attr_mem_pool_size.attr, -+ &dev_attr_mem_pool_max_size.attr, -+ &dev_attr_lp_mem_pool_size.attr, -+ &dev_attr_lp_mem_pool_max_size.attr, -+ NULL ++/** ++ * Fence wait tracker. ++ * ++ * The fence wait tracker is added to the Timeline system with the fence we are waiting on as a ++ * dependency. We will then perform a blocking wait, possibly with a timeout, until the tracker is ++ * activated, which happens when the fence is signaled. ++ */ ++struct mali_timeline_fence_wait_tracker { ++ mali_bool activated; /**< MALI_TRUE if the tracker has been activated, MALI_FALSE if not. */ ++ _mali_osk_atomic_t refcount; /**< Reference count. */ ++ struct mali_timeline_system *system; /**< Timeline system. */ ++ struct mali_timeline_tracker tracker; /**< Timeline tracker. */ +}; + -+static const struct attribute_group kbase_attr_group = { -+ .attrs = kbase_attrs, -+}; ++/** ++ * Wait for a fence to be signaled, or timeout is reached. ++ * ++ * @param system Timeline system. ++ * @param fence Fence to wait on. ++ * @param timeout Timeout in ms, or MALI_TIMELINE_FENCE_WAIT_TIMEOUT_NEVER or ++ * MALI_TIMELINE_FENCE_WAIT_TIMEOUT_IMMEDIATELY. ++ * @return MALI_TRUE if signaled, MALI_FALSE if timed out. ++ */ ++mali_bool mali_timeline_fence_wait(struct mali_timeline_system *system, struct mali_timeline_fence *fence, u32 timeout); + -+static int kbase_platform_device_remove(struct platform_device *pdev) -+{ -+ struct kbase_device *kbdev = to_kbase_device(&pdev->dev); -+ const struct list_head *dev_list; ++/** ++ * Used by the Timeline system to activate a fence wait tracker. ++ * ++ * @param fence_wait_tracker Fence waiter tracker. ++ */ ++void mali_timeline_fence_wait_activate(struct mali_timeline_fence_wait_tracker *fence_wait_tracker); + -+ if (!kbdev) -+ return -ENODEV; ++#endif /* __MALI_TIMELINE_FENCE_WAIT_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c +new file mode 100755 +index 000000000..bb7f6a04e +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c +@@ -0,0 +1,179 @@ ++/* ++ * Copyright (C) 2013, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include ++#include "mali_timeline_sync_fence.h" + -+ kfree(kbdev->gpu_props.prop_buffer); ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_sync.h" + -+#ifdef CONFIG_MALI_FPGA_BUS_LOGGER -+ if (kbdev->inited_subsys & inited_buslogger) { -+ bl_core_client_unregister(kbdev->buslogger); -+ kbdev->inited_subsys &= ~inited_buslogger; -+ } ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++/** ++ * Creates a sync fence tracker and a sync fence. Adds sync fence tracker to Timeline system and ++ * returns sync fence. The sync fence will be signaled when the sync fence tracker is activated. ++ * ++ * @param timeline Timeline. ++ * @param point Point on timeline. ++ * @return Sync fence that will be signaled when tracker is activated. ++ */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++static struct sync_fence *mali_timeline_sync_fence_create_and_add_tracker(struct mali_timeline *timeline, mali_timeline_point point) ++#else ++static struct mali_internal_sync_fence *mali_timeline_sync_fence_create_and_add_tracker(struct mali_timeline *timeline, mali_timeline_point point) ++#endif ++{ ++ struct mali_timeline_sync_fence_tracker *sync_fence_tracker; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ struct sync_fence *sync_fence; ++#else ++ struct mali_internal_sync_fence *sync_fence; +#endif ++ struct mali_timeline_fence fence; + ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_NO_POINT != point); + -+ if (kbdev->inited_subsys & inited_dev_list) { -+ dev_list = kbase_dev_list_get(); -+ list_del(&kbdev->entry); -+ kbase_dev_list_put(dev_list); -+ kbdev->inited_subsys &= ~inited_dev_list; ++ /* Allocate sync fence tracker. */ ++ sync_fence_tracker = _mali_osk_calloc(1, sizeof(struct mali_timeline_sync_fence_tracker)); ++ if (NULL == sync_fence_tracker) { ++ MALI_PRINT_ERROR(("Mali Timeline: sync_fence_tracker allocation failed\n")); ++ return NULL; + } + -+ if (kbdev->inited_subsys & inited_misc_register) { -+ misc_deregister(&kbdev->mdev); -+ kbdev->inited_subsys &= ~inited_misc_register; ++ /* Create sync flag. */ ++ MALI_DEBUG_ASSERT_POINTER(timeline->sync_tl); ++ sync_fence_tracker->flag = mali_sync_flag_create(timeline->sync_tl, point); ++ if (NULL == sync_fence_tracker->flag) { ++ MALI_PRINT_ERROR(("Mali Timeline: sync_flag creation failed\n")); ++ _mali_osk_free(sync_fence_tracker); ++ return NULL; + } + -+ if (kbdev->inited_subsys & inited_sysfs_group) { -+ sysfs_remove_group(&kbdev->dev->kobj, &kbase_attr_group); -+ kbdev->inited_subsys &= ~inited_sysfs_group; ++ /* Create sync fence from sync flag. */ ++ sync_fence = mali_sync_flag_create_fence(sync_fence_tracker->flag); ++ if (NULL == sync_fence) { ++ MALI_PRINT_ERROR(("Mali Timeline: sync_fence creation failed\n")); ++ mali_sync_flag_put(sync_fence_tracker->flag); ++ _mali_osk_free(sync_fence_tracker); ++ return NULL; + } + -+ if (kbdev->inited_subsys & inited_get_device) { -+ put_device(kbdev->dev); -+ kbdev->inited_subsys &= ~inited_get_device; -+ } ++ /* Setup fence for tracker. */ ++ _mali_osk_memset(&fence, 0, sizeof(struct mali_timeline_fence)); ++ fence.sync_fd = -1; ++ fence.points[timeline->id] = point; + -+ if (kbdev->inited_subsys & inited_debugfs) { -+ kbase_device_debugfs_term(kbdev); -+ kbdev->inited_subsys &= ~inited_debugfs; -+ } ++ /* Finally, add the tracker to Timeline system. */ ++ mali_timeline_tracker_init(&sync_fence_tracker->tracker, MALI_TIMELINE_TRACKER_SYNC, &fence, sync_fence_tracker); ++ point = mali_timeline_system_add_tracker(timeline->system, &sync_fence_tracker->tracker, MALI_TIMELINE_NONE); ++ MALI_DEBUG_ASSERT(MALI_TIMELINE_NO_POINT == point); + -+ if (kbdev->inited_subsys & inited_job_fault) { -+ kbase_debug_job_fault_dev_term(kbdev); -+ kbdev->inited_subsys &= ~inited_job_fault; -+ } -+ if (kbdev->inited_subsys & inited_vinstr) { -+ kbase_vinstr_term(kbdev->vinstr_ctx); -+ kbdev->inited_subsys &= ~inited_vinstr; -+ } ++ return sync_fence; ++} + -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+ if (kbdev->inited_subsys & inited_devfreq) { -+ kbase_devfreq_term(kbdev); -+ kbdev->inited_subsys &= ~inited_devfreq; -+ } ++s32 mali_timeline_sync_fence_create(struct mali_timeline_system *system, struct mali_timeline_fence *fence) ++{ ++ u32 i; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ struct sync_fence *sync_fence_acc = NULL; ++#else ++ struct mali_internal_sync_fence *sync_fence_acc = NULL; +#endif ++ MALI_DEBUG_ASSERT_POINTER(system); ++ MALI_DEBUG_ASSERT_POINTER(fence); + -+ if (kbdev->inited_subsys & inited_backend_late) { -+ kbase_backend_late_term(kbdev); -+ kbdev->inited_subsys &= ~inited_backend_late; -+ } -+ -+ if (kbdev->inited_subsys & inited_tlstream) { -+ kbase_tlstream_term(); -+ kbdev->inited_subsys &= ~inited_tlstream; -+ } -+ -+ /* Bring job and mem sys to a halt before we continue termination */ -+ -+ if (kbdev->inited_subsys & inited_js) -+ kbasep_js_devdata_halt(kbdev); -+ -+ if (kbdev->inited_subsys & inited_mem) -+ kbase_mem_halt(kbdev); ++ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { ++ struct mali_timeline *timeline; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ struct sync_fence *sync_fence; ++#else ++ struct mali_internal_sync_fence *sync_fence; ++#endif ++ if (MALI_TIMELINE_NO_POINT == fence->points[i]) continue; + -+ if (kbdev->inited_subsys & inited_protected) { -+ kbasep_protected_mode_term(kbdev); -+ kbdev->inited_subsys &= ~inited_protected; -+ } ++ timeline = system->timelines[i]; ++ MALI_DEBUG_ASSERT_POINTER(timeline); + -+ if (kbdev->inited_subsys & inited_js) { -+ kbasep_js_devdata_term(kbdev); -+ kbdev->inited_subsys &= ~inited_js; -+ } ++ sync_fence = mali_timeline_sync_fence_create_and_add_tracker(timeline, fence->points[i]); ++ if (NULL == sync_fence) goto error; + -+ if (kbdev->inited_subsys & inited_mem) { -+ kbase_mem_term(kbdev); -+ kbdev->inited_subsys &= ~inited_mem; ++ if (NULL != sync_fence_acc) { ++ /* Merge sync fences. */ ++ sync_fence_acc = mali_sync_fence_merge(sync_fence_acc, sync_fence); ++ if (NULL == sync_fence_acc) goto error; ++ } else { ++ /* This was the first sync fence created. */ ++ sync_fence_acc = sync_fence; ++ } + } + -+ if (kbdev->inited_subsys & inited_pm_runtime_init) { -+ kbdev->pm.callback_power_runtime_term(kbdev); -+ kbdev->inited_subsys &= ~inited_pm_runtime_init; -+ } ++ if (-1 != fence->sync_fd) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ struct sync_fence *sync_fence; ++ sync_fence = sync_fence_fdget(fence->sync_fd); ++#else ++ struct mali_internal_sync_fence *sync_fence; ++ sync_fence = mali_internal_sync_fence_fdget(fence->sync_fd); ++#endif + -+ if (kbdev->inited_subsys & inited_ctx_sched) { -+ kbase_ctx_sched_term(kbdev); -+ kbdev->inited_subsys &= ~inited_ctx_sched; -+ } ++ if (NULL == sync_fence) goto error; + -+ if (kbdev->inited_subsys & inited_device) { -+ kbase_device_term(kbdev); -+ kbdev->inited_subsys &= ~inited_device; ++ if (NULL != sync_fence_acc) { ++ sync_fence_acc = mali_sync_fence_merge(sync_fence_acc, sync_fence); ++ if (NULL == sync_fence_acc) goto error; ++ } else { ++ sync_fence_acc = sync_fence; ++ } + } + -+ if (kbdev->inited_subsys & inited_backend_early) { -+ kbase_backend_early_term(kbdev); -+ kbdev->inited_subsys &= ~inited_backend_early; -+ } ++ if (NULL == sync_fence_acc) { ++ MALI_DEBUG_ASSERT_POINTER(system->signaled_sync_tl); + -+ if (kbdev->inited_subsys & inited_io_history) { -+ kbase_io_history_term(&kbdev->io_history); -+ kbdev->inited_subsys &= ~inited_io_history; -+ } ++ /* There was nothing to wait on, so return an already signaled fence. */ + -+ if (kbdev->inited_subsys & inited_power_control) { -+ power_control_term(kbdev); -+ kbdev->inited_subsys &= ~inited_power_control; ++ sync_fence_acc = mali_sync_timeline_create_signaled_fence(system->signaled_sync_tl); ++ if (NULL == sync_fence_acc) goto error; + } + -+ if (kbdev->inited_subsys & inited_registers_map) { -+ registers_unmap(kbdev); -+ kbdev->inited_subsys &= ~inited_registers_map; -+ } ++ /* Return file descriptor for the accumulated sync fence. */ ++ return mali_sync_fence_fd_alloc(sync_fence_acc); + -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+ if (kbdev->inited_subsys & inited_gpu_device) { -+ gpu_device_destroy(kbdev); -+ kbdev->inited_subsys &= ~inited_gpu_device; ++error: ++ if (NULL != sync_fence_acc) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ sync_fence_put(sync_fence_acc); ++#else ++ fput(sync_fence_acc->file); ++#endif + } -+#endif /* CONFIG_MALI_BIFROST_NO_MALI */ -+ -+ if (kbdev->inited_subsys != 0) -+ dev_err(kbdev->dev, "Missing sub system termination\n"); -+ -+ kbase_device_free(kbdev); + -+ return 0; ++ return -1; +} + -+ -+/* Number of register accesses for the buffer that we allocate during -+ * initialization time. The buffer size can be changed later via debugfs. */ -+#define KBASEP_DEFAULT_REGISTER_HISTORY_SIZE ((u16)512) -+ -+static int kbase_platform_device_probe(struct platform_device *pdev) ++void mali_timeline_sync_fence_activate(struct mali_timeline_sync_fence_tracker *sync_fence_tracker) +{ -+ struct kbase_device *kbdev; -+ struct mali_base_gpu_core_props *core_props; -+ u32 gpu_id; -+ unsigned prod_id; -+ const struct list_head *dev_list; -+ int err = 0; ++ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; + -+#ifdef CONFIG_OF -+ err = kbase_platform_early_init(); -+ if (err) { -+ dev_err(&pdev->dev, "Early platform initialization failed\n"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+#endif -+ kbdev = kbase_device_alloc(); -+ if (!kbdev) { -+ dev_err(&pdev->dev, "Allocate device failed\n"); -+ kbase_platform_device_remove(pdev); -+ return -ENOMEM; -+ } ++ MALI_DEBUG_ASSERT_POINTER(sync_fence_tracker); ++ MALI_DEBUG_ASSERT_POINTER(sync_fence_tracker->flag); + -+ kbdev->dev = &pdev->dev; -+ dev_set_drvdata(kbdev->dev, kbdev); ++ MALI_DEBUG_PRINT(4, ("Mali Timeline: activation for sync fence tracker\n")); + -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+ err = gpu_device_create(kbdev); -+ if (err) { -+ dev_err(&pdev->dev, "Dummy model initialization failed\n"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_gpu_device; -+#endif /* CONFIG_MALI_BIFROST_NO_MALI */ ++ /* Signal flag and release reference. */ ++ mali_sync_flag_signal(sync_fence_tracker->flag, 0); ++ mali_sync_flag_put(sync_fence_tracker->flag); + -+ err = assign_irqs(pdev); -+ if (err) { -+ dev_err(&pdev->dev, "IRQ search failed\n"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } ++ /* Nothing can wait on this tracker, so nothing to schedule after release. */ ++ schedule_mask = mali_timeline_tracker_release(&sync_fence_tracker->tracker); ++ MALI_DEBUG_ASSERT(MALI_SCHEDULER_MASK_EMPTY == schedule_mask); + -+ err = registers_map(kbdev); -+ if (err) { -+ dev_err(&pdev->dev, "Register map failed\n"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_registers_map; ++ _mali_osk_free(sync_fence_tracker); ++} ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h +new file mode 100755 +index 000000000..65e368ae7 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h +@@ -0,0 +1,51 @@ ++/* ++ * Copyright (C) 2013, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ err = power_control_init(pdev); -+ if (err) { -+ dev_err(&pdev->dev, "Power control initialization failed\n"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_power_control; ++/** ++ * @file mali_timeline_sync_fence.h ++ * ++ * This file contains code related to creating sync fences from timeline fences. ++ */ + -+ err = kbase_io_history_init(&kbdev->io_history, -+ KBASEP_DEFAULT_REGISTER_HISTORY_SIZE); -+ if (err) { -+ dev_err(&pdev->dev, "Register access history initialization failed\n"); -+ kbase_platform_device_remove(pdev); -+ return -ENOMEM; -+ } -+ kbdev->inited_subsys |= inited_io_history; ++#ifndef __MALI_TIMELINE_SYNC_FENCE_H__ ++#define __MALI_TIMELINE_SYNC_FENCE_H__ + -+ err = kbase_backend_early_init(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "Early backend initialization failed\n"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_backend_early; ++#include "mali_timeline.h" + -+ scnprintf(kbdev->devname, DEVNAME_SIZE, "%s%d", kbase_drv_name, -+ kbase_dev_nr); ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) + -+ kbase_disjoint_init(kbdev); ++/** ++ * Sync fence tracker. ++ */ ++struct mali_timeline_sync_fence_tracker { ++ struct mali_sync_flag *flag; /**< Sync flag used to connect tracker and sync fence. */ ++ struct mali_timeline_tracker tracker; /**< Timeline tracker. */ ++}; + -+ /* obtain min/max configured gpu frequencies */ -+ core_props = &(kbdev->gpu_props.props.core_props); -+ core_props->gpu_freq_khz_min = GPU_FREQ_KHZ_MIN; -+ core_props->gpu_freq_khz_max = GPU_FREQ_KHZ_MAX; ++/** ++ * Create a sync fence that will be signaled when @ref fence is signaled. ++ * ++ * @param system Timeline system. ++ * @param fence Fence to create sync fence from. ++ * @return File descriptor for new sync fence, or -1 on error. ++ */ ++s32 mali_timeline_sync_fence_create(struct mali_timeline_system *system, struct mali_timeline_fence *fence); + -+ err = kbase_device_init(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "Device initialization failed (%d)\n", err); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_device; ++/** ++ * Used by the Timeline system to activate a sync fence tracker. ++ * ++ * @param sync_fence_tracker Sync fence tracker. ++ * ++ */ ++void mali_timeline_sync_fence_activate(struct mali_timeline_sync_fence_tracker *sync_fence_tracker); + -+ err = kbase_ctx_sched_init(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "Context scheduler initialization failed (%d)\n", -+ err); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_ctx_sched; ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+ if (kbdev->pm.callback_power_runtime_init) { -+ err = kbdev->pm.callback_power_runtime_init(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, -+ "Runtime PM initialization failed\n"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_pm_runtime_init; -+ } ++#endif /* __MALI_TIMELINE_SYNC_FENCE_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_ukk.h b/drivers/gpu/arm/mali400/mali/common/mali_ukk.h +new file mode 100755 +index 000000000..55a05c504 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_ukk.h +@@ -0,0 +1,551 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ err = kbase_mem_init(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "Memory subsystem initialization failed\n"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_mem; ++/** ++ * @file mali_ukk.h ++ * Defines the kernel-side interface of the user-kernel interface ++ */ + -+ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ gpu_id &= GPU_ID_VERSION_PRODUCT_ID; -+ prod_id = gpu_id >> GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++#ifndef __MALI_UKK_H__ ++#define __MALI_UKK_H__ + -+ kbase_device_coherency_init(kbdev, prod_id); ++#include "mali_osk.h" ++#include "mali_uk_types.h" + -+ err = kbasep_protected_mode_init(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "Protected mode subsystem initialization failed\n"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_protected; -+ -+ dev_list = kbase_dev_list_get(); -+ list_add(&kbdev->entry, &kbase_dev_list); -+ kbase_dev_list_put(dev_list); -+ kbdev->inited_subsys |= inited_dev_list; -+ -+ err = kbasep_js_devdata_init(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "Job JS devdata initialization failed\n"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_js; -+ -+ err = kbase_tlstream_init(); -+ if (err) { -+ dev_err(kbdev->dev, "Timeline stream initialization failed\n"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_tlstream; -+ -+ err = kbase_backend_late_init(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "Late backend initialization failed\n"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_backend_late; -+ -+ /* Initialize the kctx list. This is used by vinstr. */ -+ mutex_init(&kbdev->kctx_list_lock); -+ INIT_LIST_HEAD(&kbdev->kctx_list); -+ -+ kbdev->vinstr_ctx = kbase_vinstr_init(kbdev); -+ if (!kbdev->vinstr_ctx) { -+ dev_err(kbdev->dev, -+ "Virtual instrumentation initialization failed\n"); -+ kbase_platform_device_remove(pdev); -+ return -EINVAL; -+ } -+ kbdev->inited_subsys |= inited_vinstr; -+ -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+ /* Devfreq uses vinstr, so must be initialized after it. */ -+ err = kbase_devfreq_init(kbdev); -+ if (!err) -+ kbdev->inited_subsys |= inited_devfreq; -+ else -+ dev_err(kbdev->dev, "Continuing without devfreq\n"); -+#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ -+ -+ err = kbase_debug_job_fault_dev_init(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "Job fault debug initialization failed\n"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_job_fault; -+ -+ err = kbase_device_debugfs_init(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "DebugFS initialization failed"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_debugfs; -+ -+ kbdev->mdev.minor = MISC_DYNAMIC_MINOR; -+ kbdev->mdev.name = kbdev->devname; -+ kbdev->mdev.fops = &kbase_fops; -+ kbdev->mdev.parent = get_device(kbdev->dev); -+ kbdev->inited_subsys |= inited_get_device; -+ -+ /* This needs to happen before registering the device with misc_register(), -+ * otherwise it causes a race condition between registering the device and a -+ * uevent event being generated for userspace, causing udev rules to run -+ * which might expect certain sysfs attributes present. As a result of the -+ * race condition we avoid, some Mali sysfs entries may have appeared to -+ * udev to not exist. -+ -+ * For more information, see -+ * https://www.kernel.org/doc/Documentation/driver-model/device.txt, the -+ * paragraph that starts with "Word of warning", currently the second-last -+ * paragraph. -+ */ -+ err = sysfs_create_group(&kbdev->dev->kobj, &kbase_attr_group); -+ if (err) { -+ dev_err(&pdev->dev, "SysFS group creation failed\n"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_sysfs_group; -+ -+ err = misc_register(&kbdev->mdev); -+ if (err) { -+ dev_err(kbdev->dev, "Misc device registration failed for %s\n", -+ kbdev->devname); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ kbdev->inited_subsys |= inited_misc_register; -+ -+ -+#ifdef CONFIG_MALI_FPGA_BUS_LOGGER -+ err = bl_core_client_register(kbdev->devname, -+ kbase_logging_started_cb, -+ kbdev, &kbdev->buslogger, -+ THIS_MODULE, NULL); -+ if (err == 0) { -+ kbdev->inited_subsys |= inited_buslogger; -+ bl_core_set_threshold(kbdev->buslogger, 1024*1024*1024); -+ } else { -+ dev_warn(kbdev->dev, "Bus log client registration failed\n"); -+ err = 0; -+ } ++#ifdef __cplusplus ++extern "C" { +#endif + -+ err = kbase_gpuprops_populate_user_buffer(kbdev); -+ if (err) { -+ dev_err(&pdev->dev, "GPU property population failed"); -+ kbase_platform_device_remove(pdev); -+ return err; -+ } -+ -+ dev_info(kbdev->dev, -+ "Probed as %s\n", dev_name(kbdev->mdev.this_device)); -+ -+ kbase_dev_nr++; -+ -+ return err; -+} -+ -+#undef KBASEP_DEFAULT_REGISTER_HISTORY_SIZE -+ +/** -+ * kbase_device_suspend - Suspend callback from the OS. -+ * -+ * This is called by Linux when the device should suspend. -+ * -+ * @dev: The device to suspend ++ * @addtogroup uddapi Unified Device Driver (UDD) APIs + * -+ * Return: A standard Linux error code ++ * @{ + */ -+static int kbase_device_suspend(struct device *dev) -+{ -+ struct kbase_device *kbdev = to_kbase_device(dev); -+ -+ if (!kbdev) -+ return -ENODEV; -+ -+#if defined(CONFIG_MALI_BIFROST_DEVFREQ) && \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+ if (kbdev->inited_subsys & inited_devfreq) -+ devfreq_suspend_device(kbdev->devfreq); -+#endif -+ -+ kbase_pm_suspend(kbdev); -+ return 0; -+} + +/** -+ * kbase_device_resume - Resume callback from the OS. ++ * @addtogroup u_k_api UDD User/Kernel Interface (U/K) APIs + * -+ * This is called by Linux when the device should resume from suspension. ++ * - The _mali_uk functions are an abstraction of the interface to the device ++ * driver. On certain OSs, this would be implemented via the IOCTL interface. ++ * On other OSs, it could be via extension of some Device Driver Class, or ++ * direct function call for Bare metal/RTOSs. ++ * - It is important to note that: ++ * - The Device Driver has implemented the _mali_ukk set of functions ++ * - The Base Driver calls the corresponding set of _mali_uku functions. ++ * - What requires porting is solely the calling mechanism from User-side to ++ * Kernel-side, and propagating back the results. ++ * - Each U/K function is associated with a (group, number) pair from ++ * \ref _mali_uk_functions to make it possible for a common function in the ++ * Base Driver and Device Driver to route User/Kernel calls from/to the ++ * correct _mali_uk function. For example, in an IOCTL system, the IOCTL number ++ * would be formed based on the group and number assigned to the _mali_uk ++ * function, as listed in \ref _mali_uk_functions. On the user-side, each ++ * _mali_uku function would just make an IOCTL with the IOCTL-code being an ++ * encoded form of the (group, number) pair. On the kernel-side, the Device ++ * Driver's IOCTL handler decodes the IOCTL-code back into a (group, number) ++ * pair, and uses this to determine which corresponding _mali_ukk should be ++ * called. ++ * - Refer to \ref _mali_uk_functions for more information about this ++ * (group, number) pairing. ++ * - In a system where there is no distinction between user and kernel-side, ++ * the U/K interface may be implemented as:@code ++ * MALI_STATIC_INLINE _mali_osk_errcode_t _mali_uku_examplefunction( _mali_uk_examplefunction_s *args ) ++ * { ++ * return mali_ukk_examplefunction( args ); ++ * } ++ * @endcode ++ * - Therefore, all U/K calls behave \em as \em though they were direct ++ * function calls (but the \b implementation \em need \em not be a direct ++ * function calls) + * -+ * @dev: The device to resume ++ * @note Naming the _mali_uk functions the same on both User and Kernel sides ++ * on non-RTOS systems causes debugging issues when setting breakpoints. In ++ * this case, it is not clear which function the breakpoint is put on. ++ * Therefore the _mali_uk functions in user space are prefixed with \c _mali_uku ++ * and in kernel space with \c _mali_ukk. The naming for the argument ++ * structures is unaffected. + * -+ * Return: A standard Linux error code -+ */ -+static int kbase_device_resume(struct device *dev) -+{ -+ struct kbase_device *kbdev = to_kbase_device(dev); -+ -+ if (!kbdev) -+ return -ENODEV; -+ -+ kbase_pm_resume(kbdev); -+ -+#if defined(CONFIG_MALI_BIFROST_DEVFREQ) && \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+ if (kbdev->inited_subsys & inited_devfreq) -+ devfreq_resume_device(kbdev->devfreq); -+#endif -+ return 0; -+} -+ -+/** -+ * kbase_device_runtime_suspend - Runtime suspend callback from the OS. ++ * - The _mali_uk functions are synchronous. ++ * - Arguments to the _mali_uk functions are passed in a structure. The only ++ * parameter passed to the _mali_uk functions is a pointer to this structure. ++ * This first member of this structure, ctx, is a pointer to a context returned ++ * by _mali_uku_open(). For example:@code ++ * typedef struct ++ * { ++ * void *ctx; ++ * u32 number_of_cores; ++ * } _mali_uk_get_gp_number_of_cores_s; ++ * @endcode + * -+ * This is called by Linux when the device should prepare for a condition in -+ * which it will not be able to communicate with the CPU(s) and RAM due to -+ * power management. ++ * - Each _mali_uk function has its own argument structure named after the ++ * function. The argument is distinguished by the _s suffix. ++ * - The argument types are defined by the base driver and user-kernel ++ * interface. ++ * - All _mali_uk functions return a standard \ref _mali_osk_errcode_t. ++ * - Only arguments of type input or input/output need be initialized before ++ * calling a _mali_uk function. ++ * - Arguments of type output and input/output are only valid when the ++ * _mali_uk function returns \ref _MALI_OSK_ERR_OK. ++ * - The \c ctx member is always invalid after it has been used by a ++ * _mali_uk function, except for the context management functions + * -+ * @dev: The device to suspend + * -+ * Return: A standard Linux error code -+ */ -+#ifdef KBASE_PM_RUNTIME -+static int kbase_device_runtime_suspend(struct device *dev) -+{ -+ struct kbase_device *kbdev = to_kbase_device(dev); -+ -+ if (!kbdev) -+ return -ENODEV; -+ -+#if defined(CONFIG_MALI_BIFROST_DEVFREQ) && \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+ if (kbdev->inited_subsys & inited_devfreq) -+ devfreq_suspend_device(kbdev->devfreq); -+#endif -+ -+ if (kbdev->pm.backend.callback_power_runtime_off) { -+ kbdev->pm.backend.callback_power_runtime_off(kbdev); -+ dev_dbg(dev, "runtime suspend\n"); -+ } -+ return 0; -+} -+#endif /* KBASE_PM_RUNTIME */ -+ -+/** -+ * kbase_device_runtime_resume - Runtime resume callback from the OS. ++ * \b Interface \b restrictions + * -+ * This is called by Linux when the device should go into a fully active state. ++ * The requirements of the interface mean that an implementation of the ++ * User-kernel interface may do no 'real' work. For example, the following are ++ * illegal in the User-kernel implementation: ++ * - Calling functions necessary for operation on all systems, which would ++ * not otherwise get called on RTOS systems. ++ * - For example, a U/K interface that calls multiple _mali_ukk functions ++ * during one particular U/K call. This could not be achieved by the same code ++ * which uses direct function calls for the U/K interface. ++ * - Writing in values to the args members, when otherwise these members would ++ * not hold a useful value for a direct function call U/K interface. ++ * - For example, U/K interface implementation that take NULL members in ++ * their arguments structure from the user side, but those members are ++ * replaced with non-NULL values in the kernel-side of the U/K interface ++ * implementation. A scratch area for writing data is one such example. In this ++ * case, a direct function call U/K interface would segfault, because no code ++ * would be present to replace the NULL pointer with a meaningful pointer. ++ * - Note that we discourage the case where the U/K implementation changes ++ * a NULL argument member to non-NULL, and then the Device Driver code (outside ++ * of the U/K layer) re-checks this member for NULL, and corrects it when ++ * necessary. Whilst such code works even on direct function call U/K ++ * intefaces, it reduces the testing coverage of the Device Driver code. This ++ * is because we have no way of testing the NULL == value path on an OS ++ * implementation. + * -+ * @dev: The device to suspend ++ * A number of allowable examples exist where U/K interfaces do 'real' work: ++ * - The 'pointer switching' technique for \ref _mali_ukk_get_system_info ++ * - In this case, without the pointer switching on direct function call ++ * U/K interface, the Device Driver code still sees the same thing: a pointer ++ * to which it can write memory. This is because such a system has no ++ * distinction between a user and kernel pointer. ++ * - Writing an OS-specific value into the ukk_private member for ++ * _mali_ukk_mem_mmap(). ++ * - In this case, this value is passed around by Device Driver code, but ++ * its actual value is never checked. Device Driver code simply passes it from ++ * the U/K layer to the OSK layer, where it can be acted upon. In this case, ++ * \em some OS implementations of the U/K (_mali_ukk_mem_mmap()) and OSK ++ * (_mali_osk_mem_mapregion_init()) functions will collaborate on the ++ * meaning of ukk_private member. On other OSs, it may be unused by both ++ * U/K and OSK layers ++ * - Therefore, on error inside the U/K interface implementation itself, ++ * it will be as though the _mali_ukk function itself had failed, and cleaned ++ * up after itself. ++ * - Compare this to a direct function call U/K implementation, where all ++ * error cleanup is handled by the _mali_ukk function itself. The direct ++ * function call U/K interface implementation is automatically atomic. + * -+ * Return: A standard Linux error code ++ * The last example highlights a consequence of all U/K interface ++ * implementations: they must be atomic with respect to the Device Driver code. ++ * And therefore, should Device Driver code succeed but the U/K implementation ++ * fail afterwards (but before return to user-space), then the U/K ++ * implementation must cause appropriate cleanup actions to preserve the ++ * atomicity of the interface. ++ * ++ * @{ + */ + -+#ifdef KBASE_PM_RUNTIME -+static int kbase_device_runtime_resume(struct device *dev) -+{ -+ int ret = 0; -+ struct kbase_device *kbdev = to_kbase_device(dev); -+ -+ if (!kbdev) -+ return -ENODEV; -+ -+ if (kbdev->pm.backend.callback_power_runtime_on) { -+ ret = kbdev->pm.backend.callback_power_runtime_on(kbdev); -+ dev_dbg(dev, "runtime resume\n"); -+ } -+ -+#if defined(CONFIG_MALI_BIFROST_DEVFREQ) && \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+ if (kbdev->inited_subsys & inited_devfreq) -+ devfreq_resume_device(kbdev->devfreq); -+#endif -+ -+ return ret; -+} -+#endif /* KBASE_PM_RUNTIME */ -+ + -+#ifdef KBASE_PM_RUNTIME -+/** -+ * kbase_device_runtime_idle - Runtime idle callback from the OS. -+ * @dev: The device to suspend ++/** @defgroup _mali_uk_context U/K Context management + * -+ * This is called by Linux when the device appears to be inactive and it might -+ * be placed into a low power state. ++ * These functions allow for initialisation of the user-kernel interface once per process. + * -+ * Return: 0 if device can be suspended, non-zero to avoid runtime autosuspend, -+ * otherwise a standard Linux error code -+ */ -+static int kbase_device_runtime_idle(struct device *dev) -+{ -+ struct kbase_device *kbdev = to_kbase_device(dev); -+ -+ if (!kbdev) -+ return -ENODEV; -+ -+ /* Use platform specific implementation if it exists. */ -+ if (kbdev->pm.backend.callback_power_runtime_idle) -+ return kbdev->pm.backend.callback_power_runtime_idle(kbdev); -+ -+ return 0; -+} -+#endif /* KBASE_PM_RUNTIME */ -+ -+/* The power management operations for the platform driver. -+ */ -+static const struct dev_pm_ops kbase_pm_ops = { -+ .suspend = kbase_device_suspend, -+ .resume = kbase_device_resume, -+#ifdef KBASE_PM_RUNTIME -+ .runtime_suspend = kbase_device_runtime_suspend, -+ .runtime_resume = kbase_device_runtime_resume, -+ .runtime_idle = kbase_device_runtime_idle, -+#endif /* KBASE_PM_RUNTIME */ -+}; -+ -+#ifdef CONFIG_OF -+static const struct of_device_id kbase_dt_ids[] = { -+ { .compatible = "arm,malit6xx" }, -+ { .compatible = "arm,mali-midgard" }, -+ { /* sentinel */ } -+}; -+MODULE_DEVICE_TABLE(of, kbase_dt_ids); -+#endif -+ -+static struct platform_driver kbase_platform_driver = { -+ .probe = kbase_platform_device_probe, -+ .remove = kbase_platform_device_remove, -+ .driver = { -+ .name = kbase_drv_name, -+ .owner = THIS_MODULE, -+ .pm = &kbase_pm_ops, -+ .of_match_table = of_match_ptr(kbase_dt_ids), -+ }, -+}; -+ -+/* -+ * The driver will not provide a shortcut to create the Mali platform device -+ * anymore when using Device Tree. -+ */ -+#ifdef CONFIG_OF -+module_platform_driver(kbase_platform_driver); -+#else -+ -+static int __init kbase_driver_init(void) -+{ -+ int ret; -+ -+ ret = kbase_platform_early_init(); -+ if (ret) -+ return ret; -+ -+ ret = kbase_platform_register(); -+ if (ret) -+ return ret; -+ -+ ret = platform_driver_register(&kbase_platform_driver); -+ -+ if (ret) -+ kbase_platform_unregister(); -+ -+ return ret; -+} -+ -+static void __exit kbase_driver_exit(void) -+{ -+ platform_driver_unregister(&kbase_platform_driver); -+ kbase_platform_unregister(); -+} -+ -+module_init(kbase_driver_init); -+module_exit(kbase_driver_exit); -+ -+#endif /* CONFIG_OF */ -+ -+MODULE_LICENSE("GPL"); -+MODULE_VERSION(MALI_RELEASE_NAME " (UK version " \ -+ __stringify(BASE_UK_VERSION_MAJOR) "." \ -+ __stringify(BASE_UK_VERSION_MINOR) ")"); -+ -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) || defined(CONFIG_MALI_BIFROST_SYSTEM_TRACE) -+#define CREATE_TRACE_POINTS -+#endif -+ -+#ifdef CONFIG_MALI_BIFROST_GATOR_SUPPORT -+/* Create the trace points (otherwise we just get code to call a tracepoint) */ -+#include "mali_linux_trace.h" -+ -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_job_slots_event); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_pm_status); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_pm_power_on); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_pm_power_off); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_page_fault_insert_pages); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_mmu_as_in_use); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_mmu_as_released); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_total_alloc_pages_change); -+ -+void kbase_trace_mali_pm_status(u32 event, u64 value) -+{ -+ trace_mali_pm_status(event, value); -+} -+ -+void kbase_trace_mali_pm_power_off(u32 event, u64 value) -+{ -+ trace_mali_pm_power_off(event, value); -+} -+ -+void kbase_trace_mali_pm_power_on(u32 event, u64 value) -+{ -+ trace_mali_pm_power_on(event, value); -+} -+ -+void kbase_trace_mali_job_slots_event(u32 event, const struct kbase_context *kctx, u8 atom_id) -+{ -+ trace_mali_job_slots_event(event, (kctx != NULL ? kctx->tgid : 0), (kctx != NULL ? kctx->pid : 0), atom_id); -+} -+ -+void kbase_trace_mali_page_fault_insert_pages(int event, u32 value) -+{ -+ trace_mali_page_fault_insert_pages(event, value); -+} -+ -+void kbase_trace_mali_mmu_as_in_use(int event) -+{ -+ trace_mali_mmu_as_in_use(event); -+} -+ -+void kbase_trace_mali_mmu_as_released(int event) -+{ -+ trace_mali_mmu_as_released(event); -+} -+ -+void kbase_trace_mali_total_alloc_pages_change(long long int event) -+{ -+ trace_mali_total_alloc_pages_change(event); -+} -+#endif /* CONFIG_MALI_BIFROST_GATOR_SUPPORT */ -+#ifdef CONFIG_MALI_BIFROST_SYSTEM_TRACE -+#include "mali_linux_kbase_trace.h" -+#endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ctx_sched.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ctx_sched.c -new file mode 100755 -index 000000000000..e2f7baabad43 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ctx_sched.c -@@ -0,0 +1,203 @@ -+/* ++ * Generally the context will store the OS specific object to communicate with the kernel device driver and further ++ * state information required by the specific implementation. The context is shareable among all threads in the caller process. + * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++ * On IOCTL systems, this is likely to be a file descriptor as a result of opening the kernel device driver. + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * On a bare-metal/RTOS system with no distinction between kernel and ++ * user-space, the U/K interface simply calls the _mali_ukk variant of the ++ * function by direct function call. In this case, the context returned is the ++ * mali_session_data from _mali_ukk_open(). + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * The kernel side implementations of the U/K interface expect the first member of the argument structure to ++ * be the context created by _mali_uku_open(). On some OS implementations, the meaning of this context ++ * will be different between user-side and kernel-side. In which case, the kernel-side will need to replace this context ++ * with the kernel-side equivalent, because user-side will not have access to kernel-side data. The context parameter ++ * in the argument structure therefore has to be of type input/output. + * -+ */ -+ -+ -+ -+#include -+#include -+ -+#include "mali_kbase_ctx_sched.h" -+ -+int kbase_ctx_sched_init(struct kbase_device *kbdev) -+{ -+ int as_present = (1U << kbdev->nr_hw_address_spaces) - 1; -+ -+ /* These two must be recalculated if nr_hw_address_spaces changes -+ * (e.g. for HW workarounds) */ -+ kbdev->nr_user_address_spaces = kbdev->nr_hw_address_spaces; -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987)) { -+ bool use_workaround; -+ -+ use_workaround = DEFAULT_SECURE_BUT_LOSS_OF_PERFORMANCE; -+ if (use_workaround) { -+ dev_dbg(kbdev->dev, "GPU has HW ISSUE 8987, and driver configured for security workaround: 1 address space only"); -+ kbdev->nr_user_address_spaces = 1; -+ } -+ } -+ -+ kbdev->as_free = as_present; /* All ASs initially free */ -+ -+ memset(kbdev->as_to_kctx, 0, sizeof(kbdev->as_to_kctx)); -+ -+ return 0; -+} -+ -+void kbase_ctx_sched_term(struct kbase_device *kbdev) -+{ -+ s8 i; ++ * It should be noted that the caller cannot reuse the \c ctx member of U/K ++ * argument structure after a U/K call, because it may be overwritten. Instead, ++ * the context handle must always be stored elsewhere, and copied into ++ * the appropriate U/K argument structure for each user-side call to ++ * the U/K interface. This is not usually a problem, since U/K argument ++ * structures are usually placed on the stack. ++ * ++ * @{ */ + -+ /* Sanity checks */ -+ for (i = 0; i != kbdev->nr_hw_address_spaces; ++i) { -+ WARN_ON(kbdev->as_to_kctx[i] != NULL); -+ WARN_ON(!(kbdev->as_free & (1u << i))); -+ } -+} ++/** @brief Begin a new Mali Device Driver session ++ * ++ * This is used to obtain a per-process context handle for all future U/K calls. ++ * ++ * @param context pointer to storage to return a (void*)context handle. ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ */ ++_mali_osk_errcode_t _mali_ukk_open(void **context); + -+/* kbasep_ctx_sched_find_as_for_ctx - Find a free address space ++/** @brief End a Mali Device Driver session + * -+ * @kbdev: The context for which to find a free address space ++ * This should be called when the process no longer requires use of the Mali Device Driver. + * -+ * Return: A valid AS if successful, otherwise KBASEP_AS_NR_INVALID ++ * The context handle must not be used after it has been closed. + * -+ * This function returns an address space available for use. It would prefer -+ * returning an AS that has been previously assigned to the context to -+ * avoid having to reprogram the MMU. ++ * @param context pointer to a stored (void*)context handle. ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+static int kbasep_ctx_sched_find_as_for_ctx(struct kbase_context *kctx) -+{ -+ struct kbase_device *const kbdev = kctx->kbdev; -+ int free_as; -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ /* First check if the previously assigned AS is available */ -+ if ((kctx->as_nr != KBASEP_AS_NR_INVALID) && -+ (kbdev->as_free & (1u << kctx->as_nr))) -+ return kctx->as_nr; -+ -+ /* The previously assigned AS was taken, we'll be returning any free -+ * AS at this point. -+ */ -+ free_as = ffs(kbdev->as_free) - 1; -+ if (free_as >= 0 && free_as < kbdev->nr_hw_address_spaces) -+ return free_as; -+ -+ return KBASEP_AS_NR_INVALID; -+} -+ -+int kbase_ctx_sched_retain_ctx(struct kbase_context *kctx) -+{ -+ struct kbase_device *const kbdev = kctx->kbdev; -+ -+ lockdep_assert_held(&kbdev->mmu_hw_mutex); -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ WARN_ON(!kbdev->pm.backend.gpu_powered); -+ -+ if (atomic_inc_return(&kctx->refcount) == 1) { -+ int const free_as = kbasep_ctx_sched_find_as_for_ctx(kctx); -+ -+ if (free_as != KBASEP_AS_NR_INVALID) { -+ kbdev->as_free &= ~(1u << free_as); -+ /* Only program the MMU if the context has not been -+ * assigned the same address space before. -+ */ -+ if (free_as != kctx->as_nr) { -+ struct kbase_context *const prev_kctx = -+ kbdev->as_to_kctx[free_as]; -+ -+ if (prev_kctx) { -+ WARN_ON(atomic_read(&prev_kctx->refcount) != 0); -+ kbase_mmu_disable(prev_kctx); -+ prev_kctx->as_nr = KBASEP_AS_NR_INVALID; -+ } -+ -+ kctx->as_nr = free_as; -+ kbdev->as_to_kctx[free_as] = kctx; -+ kbase_mmu_update(kctx); -+ } -+ } else { -+ atomic_dec(&kctx->refcount); -+ -+ /* Failed to find an available address space, we must -+ * be returning an error at this point. -+ */ -+ WARN_ON(kctx->as_nr != KBASEP_AS_NR_INVALID); -+ } -+ } -+ -+ return kctx->as_nr; -+} -+ -+void kbase_ctx_sched_retain_ctx_refcount(struct kbase_context *kctx) -+{ -+ struct kbase_device *const kbdev = kctx->kbdev; -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ WARN_ON(atomic_read(&kctx->refcount) == 0); -+ WARN_ON(kctx->as_nr == KBASEP_AS_NR_INVALID); -+ WARN_ON(kbdev->as_to_kctx[kctx->as_nr] != kctx); -+ -+ atomic_inc(&kctx->refcount); -+} -+ -+void kbase_ctx_sched_release_ctx(struct kbase_context *kctx) -+{ -+ struct kbase_device *const kbdev = kctx->kbdev; -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ if (atomic_dec_return(&kctx->refcount) == 0) -+ kbdev->as_free |= (1u << kctx->as_nr); -+} -+ -+void kbase_ctx_sched_remove_ctx(struct kbase_context *kctx) -+{ -+ struct kbase_device *const kbdev = kctx->kbdev; -+ -+ lockdep_assert_held(&kbdev->mmu_hw_mutex); -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ WARN_ON(atomic_read(&kctx->refcount) != 0); -+ -+ if (kctx->as_nr != KBASEP_AS_NR_INVALID) { -+ if (kbdev->pm.backend.gpu_powered) -+ kbase_mmu_disable(kctx); -+ -+ kbdev->as_to_kctx[kctx->as_nr] = NULL; -+ kctx->as_nr = KBASEP_AS_NR_INVALID; -+ } -+} -+ -+void kbase_ctx_sched_restore_all_as(struct kbase_device *kbdev) -+{ -+ s8 i; -+ -+ lockdep_assert_held(&kbdev->mmu_hw_mutex); -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ WARN_ON(!kbdev->pm.backend.gpu_powered); ++_mali_osk_errcode_t _mali_ukk_close(void **context); + -+ for (i = 0; i != kbdev->nr_hw_address_spaces; ++i) { -+ struct kbase_context *kctx; ++/** @} */ /* end group _mali_uk_context */ + -+ kctx = kbdev->as_to_kctx[i]; -+ if (kctx) { -+ if (atomic_read(&kctx->refcount)) { -+ WARN_ON(kctx->as_nr != i); + -+ kbase_mmu_update(kctx); -+ } else { -+ /* This context might have been assigned an -+ * AS before, clear it. -+ */ -+ kbdev->as_to_kctx[kctx->as_nr] = NULL; -+ kctx->as_nr = KBASEP_AS_NR_INVALID; -+ } -+ } else { -+ kbase_mmu_disable_as(kbdev, i); -+ } -+ } -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ctx_sched.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ctx_sched.h -new file mode 100755 -index 000000000000..2330d48c8e51 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ctx_sched.h -@@ -0,0 +1,131 @@ -+/* ++/** @addtogroup _mali_uk_core U/K Core + * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++ * The core functions provide the following functionality: ++ * - verify that the user and kernel API are compatible ++ * - retrieve information about the cores and memory banks in the system ++ * - wait for the result of jobs started on a core + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * @{ */ ++ ++/** @brief Waits for a job notification. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * Sleeps until notified or a timeout occurs. Returns information about the notification. + * ++ * @param args see _mali_uk_wait_for_notification_s in "mali_utgard_uk_types.h" ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ ++_mali_osk_errcode_t _mali_ukk_wait_for_notification(_mali_uk_wait_for_notification_s *args); + -+ -+ -+#ifndef _KBASE_CTX_SCHED_H_ -+#define _KBASE_CTX_SCHED_H_ -+ -+#include -+ -+/* The Context Scheduler manages address space assignment and reference -+ * counting to kbase_context. The interface has been designed to minimise -+ * interactions between the Job Scheduler and Power Management/MMU to support -+ * the existing Job Scheduler interface. ++/** @brief Post a notification to the notification queue of this application. + * -+ * The initial implementation of the Context Scheduler does not schedule -+ * contexts. Instead it relies on the Job Scheduler to make decisions of -+ * when to schedule/evict contexts if address spaces are starved. In the -+ * future, once an interface between the CS and JS have been devised to -+ * provide enough information about how each context is consuming GPU resources, -+ * those decisions can be made in the CS itself, thereby reducing duplicated -+ * code. ++ * @param args see _mali_uk_post_notification_s in "mali_utgard_uk_types.h" ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ ++_mali_osk_errcode_t _mali_ukk_post_notification(_mali_uk_post_notification_s *args); + -+/* base_ctx_sched_init - Initialise the context scheduler -+ * -+ * @kbdev: The device for which the context scheduler needs to be -+ * initialised ++/** @brief Verifies if the user and kernel side of this API are compatible. + * -+ * Return: 0 for success, otherwise failure ++ * This function is obsolete, but kept to allow old, incompatible user space ++ * clients to robustly detect the incompatibility. + * -+ * This must be called during device initilisation. The number of hardware -+ * address spaces must already be established before calling this function. ++ * @param args see _mali_uk_get_api_version_s in "mali_utgard_uk_types.h" ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+int kbase_ctx_sched_init(struct kbase_device *kbdev); ++_mali_osk_errcode_t _mali_ukk_get_api_version(_mali_uk_get_api_version_s *args); + -+/* base_ctx_sched_term - Terminate the context scheduler -+ * -+ * @kbdev: The device for which the context scheduler needs to be -+ * terminated ++/** @brief Verifies if the user and kernel side of this API are compatible. + * -+ * This must be called during device termination after all contexts have been -+ * destroyed. ++ * @param args see _mali_uk_get_api_version_v2_s in "mali_utgard_uk_types.h" ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+void kbase_ctx_sched_term(struct kbase_device *kbdev); ++_mali_osk_errcode_t _mali_ukk_get_api_version_v2(_mali_uk_get_api_version_v2_s *args); + -+/* kbase_ctx_sched_retain_ctx - Retain a reference to the @ref kbase_context -+ * -+ * @kctx: The context to which to retain a reference -+ * -+ * Return: The address space that the context has been assigned to or -+ * KBASEP_AS_NR_INVALID if no address space was available. -+ * -+ * This function should be called whenever an address space should be assigned -+ * to a context and programmed onto the MMU. It should typically be called -+ * when jobs are ready to be submitted to the GPU. -+ * -+ * It can be called as many times as necessary. The address space will be -+ * assigned to the context for as long as there is a reference to said context. ++/** @brief Get the user space settings applicable for calling process. + * -+ * The kbase_device::mmu_hw_mutex and kbase_device::hwaccess_lock locks must be -+ * held whilst calling this function. ++ * @param args see _mali_uk_get_user_settings_s in "mali_utgard_uk_types.h" ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+int kbase_ctx_sched_retain_ctx(struct kbase_context *kctx); ++_mali_osk_errcode_t _mali_ukk_get_user_settings(_mali_uk_get_user_settings_s *args); + -+/* kbase_ctx_sched_retain_ctx_refcount -+ * -+ * @kctx: The context to which to retain a reference ++/** @brief Get a user space setting applicable for calling process. + * -+ * This function only retains a reference to the context. It must be called -+ * only when the context already has a reference. ++ * @param args see _mali_uk_get_user_setting_s in "mali_utgard_uk_types.h" ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ */ ++_mali_osk_errcode_t _mali_ukk_get_user_setting(_mali_uk_get_user_setting_s *args); ++ ++/* @brief Grant or deny high priority scheduling for this session. + * -+ * This is typically called inside an atomic session where we know the context -+ * is already scheduled in but want to take an extra reference to ensure that -+ * it doesn't get descheduled. ++ * @param args see _mali_uk_request_high_priority_s in "mali_utgard_uk_types.h" ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ */ ++_mali_osk_errcode_t _mali_ukk_request_high_priority(_mali_uk_request_high_priority_s *args); ++ ++/** @brief Make process sleep if the pending big job in kernel >= MALI_MAX_PENDING_BIG_JOB + * -+ * The kbase_device::hwaccess_lock must be held whilst calling this function + */ -+void kbase_ctx_sched_retain_ctx_refcount(struct kbase_context *kctx); ++_mali_osk_errcode_t _mali_ukk_pending_submit(_mali_uk_pending_submit_s *args); + -+/* kbase_ctx_sched_release_ctx - Release a reference to the @ref kbase_context ++/** @} */ /* end group _mali_uk_core */ ++ ++ ++/** @addtogroup _mali_uk_memory U/K Memory + * -+ * @kctx: The context from which to release a reference ++ * The memory functions provide functionality with and without a Mali-MMU present. + * -+ * This function should be called whenever an address space could be unassigned -+ * from a context. When there are no more references to said context, the -+ * address space previously assigned to this context shall be reassigned to -+ * other contexts as needed. ++ * For Mali-MMU based systems, the following functionality is provided: ++ * - Initialize and terminate MALI virtual address space ++ * - Allocate/deallocate physical memory to a MALI virtual address range and map into/unmap from the ++ * current process address space ++ * - Map/unmap external physical memory into the MALI virtual address range + * -+ * The kbase_device::hwaccess_lock must be held whilst calling this function -+ */ -+void kbase_ctx_sched_release_ctx(struct kbase_context *kctx); ++ * For Mali-nonMMU based systems: ++ * - Allocate/deallocate MALI memory ++ * ++ * @{ */ + -+/* kbase_ctx_sched_remove_ctx - Unassign previously assigned address space ++/** @brief Map Mali Memory into the current user process + * -+ * @kctx: The context to be removed ++ * Maps Mali memory into the current user process in a generic way. + * -+ * This function should be called when a context is being destroyed. The -+ * context must no longer have any reference. If it has been assigned an -+ * address space before then the AS will be unprogrammed. ++ * This function is to be used for Mali-MMU mode. The function is available in both Mali-MMU and Mali-nonMMU modes, ++ * but should not be called by a user process in Mali-nonMMU mode. + * -+ * The kbase_device::mmu_hw_mutex and kbase_device::hwaccess_lock locks must be -+ * held whilst calling this function. -+ */ -+void kbase_ctx_sched_remove_ctx(struct kbase_context *kctx); -+ -+/* kbase_ctx_sched_restore_all_as - Reprogram all address spaces ++ * The implementation and operation of _mali_ukk_mem_mmap() is dependant on whether the driver is built for Mali-MMU ++ * or Mali-nonMMU: ++ * - In the nonMMU case, _mali_ukk_mem_mmap() requires a physical address to be specified. For this reason, an OS U/K ++ * implementation should not allow this to be called from user-space. In any case, nonMMU implementations are ++ * inherently insecure, and so the overall impact is minimal. Mali-MMU mode should be used if security is desired. ++ * - In the MMU case, _mali_ukk_mem_mmap() the _mali_uk_mem_mmap_s::phys_addr ++ * member is used for the \em Mali-virtual address desired for the mapping. The ++ * implementation of _mali_ukk_mem_mmap() will allocate both the CPU-virtual ++ * and CPU-physical addresses, and can cope with mapping a contiguous virtual ++ * address range to a sequence of non-contiguous physical pages. In this case, ++ * the CPU-physical addresses are not communicated back to the user-side, as ++ * they are unnecsessary; the \em Mali-virtual address range must be used for ++ * programming Mali structures. + * -+ * @kbdev: The device for which address spaces to be reprogrammed ++ * In the second (MMU) case, _mali_ukk_mem_mmap() handles management of ++ * CPU-virtual and CPU-physical ranges, but the \em caller must manage the ++ * \em Mali-virtual address range from the user-side. + * -+ * This function shall reprogram all address spaces previously assigned to -+ * contexts. It can be used after the GPU is reset. ++ * @note Mali-virtual address ranges are entirely separate between processes. ++ * It is not possible for a process to accidentally corrupt another process' ++ * \em Mali-virtual address space. + * -+ * The kbase_device::mmu_hw_mutex and kbase_device::hwaccess_lock locks must be -+ * held whilst calling this function. ++ * @param args see _mali_uk_mem_mmap_s in "mali_utgard_uk_types.h" ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+void kbase_ctx_sched_restore_all_as(struct kbase_device *kbdev); ++_mali_osk_errcode_t _mali_ukk_mem_mmap(_mali_uk_mem_mmap_s *args); + -+#endif /* _KBASE_CTX_SCHED_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug.c -new file mode 100755 -index 000000000000..fb57ac2e31ad ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug.c -@@ -0,0 +1,39 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++/** @brief Unmap Mali Memory from the current user process + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * Unmaps Mali memory from the current user process in a generic way. This only operates on Mali memory supplied ++ * from _mali_ukk_mem_mmap(). + * ++ * @param args see _mali_uk_mem_munmap_s in "mali_utgard_uk_types.h" ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ ++_mali_osk_errcode_t _mali_ukk_mem_munmap(_mali_uk_mem_munmap_s *args); + ++/** @brief Determine the buffer size necessary for an MMU page table dump. ++ * @param args see _mali_uk_query_mmu_page_table_dump_size_s in mali_utgard_uk_types.h ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ */ ++_mali_osk_errcode_t _mali_ukk_query_mmu_page_table_dump_size(_mali_uk_query_mmu_page_table_dump_size_s *args); ++/** @brief Dump MMU Page tables. ++ * @param args see _mali_uk_dump_mmu_page_table_s in mali_utgard_uk_types.h ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ */ ++_mali_osk_errcode_t _mali_ukk_dump_mmu_page_table(_mali_uk_dump_mmu_page_table_s *args); + ++/** @brief Write user data to specified Mali memory without causing segfaults. ++ * @param args see _mali_uk_mem_write_safe_s in mali_utgard_uk_types.h ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ */ ++_mali_osk_errcode_t _mali_ukk_mem_write_safe(_mali_uk_mem_write_safe_s *args); + ++/** @} */ /* end group _mali_uk_memory */ + + -+#include -+ -+static struct kbasep_debug_assert_cb kbasep_debug_assert_registered_cb = { -+ NULL, -+ NULL -+}; -+ -+void kbase_debug_assert_register_hook(kbase_debug_assert_hook *func, void *param) -+{ -+ kbasep_debug_assert_registered_cb.func = func; -+ kbasep_debug_assert_registered_cb.param = param; -+} -+ -+void kbasep_debug_assert_call_hook(void) -+{ -+ if (kbasep_debug_assert_registered_cb.func != NULL) -+ kbasep_debug_assert_registered_cb.func(kbasep_debug_assert_registered_cb.param); -+} -+KBASE_EXPORT_SYMBOL(kbasep_debug_assert_call_hook); ++/** @addtogroup _mali_uk_pp U/K Fragment Processor ++ * ++ * The Fragment Processor (aka PP (Pixel Processor)) functions provide the following functionality: ++ * - retrieving version of the fragment processors ++ * - determine number of fragment processors ++ * - starting a job on a fragment processor ++ * ++ * @{ */ + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug.h -new file mode 100755 -index 000000000000..31b754c5507b ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug.h -@@ -0,0 +1,164 @@ -+/* ++/** @brief Issue a request to start a new job on a Fragment Processor. + * -+ * (C) COPYRIGHT 2012-2015, 2017 ARM Limited. All rights reserved. ++ * If the request fails args->status is set to _MALI_UK_START_JOB_NOT_STARTED_DO_REQUEUE and you can ++ * try to start the job again. + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * An existing job could be returned for requeueing if the new job has a higher priority than a previously started job ++ * which the hardware hasn't actually started processing yet. In this case the new job will be started instead and the ++ * existing one returned, otherwise the new job is started and the status field args->status is set to ++ * _MALI_UK_START_JOB_STARTED. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * Job completion can be awaited with _mali_ukk_wait_for_notification(). + * ++ * @param ctx user-kernel context (mali_session) ++ * @param uargs see _mali_uk_pp_start_job_s in "mali_utgard_uk_types.h". Use _mali_osk_copy_from_user to retrieve data! ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+ -+ -+ -+ -+ -+#ifndef _KBASE_DEBUG_H -+#define _KBASE_DEBUG_H -+ -+#include -+ -+/** @brief If equals to 0, a trace containing the file, line, and function will be displayed before each message. */ -+#define KBASE_DEBUG_SKIP_TRACE 0 -+ -+/** @brief If different from 0, the trace will only contain the file and line. */ -+#define KBASE_DEBUG_SKIP_FUNCTION_NAME 0 -+ -+/** @brief Disable the asserts tests if set to 1. Default is to disable the asserts in release. */ -+#ifndef KBASE_DEBUG_DISABLE_ASSERTS -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+#define KBASE_DEBUG_DISABLE_ASSERTS 0 -+#else -+#define KBASE_DEBUG_DISABLE_ASSERTS 1 -+#endif -+#endif /* KBASE_DEBUG_DISABLE_ASSERTS */ -+ -+/** Function type that is called on an KBASE_DEBUG_ASSERT() or KBASE_DEBUG_ASSERT_MSG() */ -+typedef void (kbase_debug_assert_hook) (void *); -+ -+struct kbasep_debug_assert_cb { -+ kbase_debug_assert_hook *func; -+ void *param; -+}; ++_mali_osk_errcode_t _mali_ukk_pp_start_job(void *ctx, _mali_uk_pp_start_job_s *uargs); + +/** -+ * @def KBASEP_DEBUG_PRINT_TRACE -+ * @brief Private macro containing the format of the trace to display before every message -+ * @sa KBASE_DEBUG_SKIP_TRACE, KBASE_DEBUG_SKIP_FUNCTION_NAME ++ * @brief Issue a request to start new jobs on both Vertex Processor and Fragment Processor. ++ * ++ * @note Will call into @ref _mali_ukk_pp_start_job and @ref _mali_ukk_gp_start_job. ++ * ++ * @param ctx user-kernel context (mali_session) ++ * @param uargs see _mali_uk_pp_and_gp_start_job_s in "mali_utgard_uk_types.h". Use _mali_osk_copy_from_user to retrieve data! ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+#if !KBASE_DEBUG_SKIP_TRACE -+#define KBASEP_DEBUG_PRINT_TRACE \ -+ "In file: " __FILE__ " line: " CSTD_STR2(__LINE__) -+#if !KBASE_DEBUG_SKIP_FUNCTION_NAME -+#define KBASEP_DEBUG_PRINT_FUNCTION __func__ -+#else -+#define KBASEP_DEBUG_PRINT_FUNCTION "" -+#endif -+#else -+#define KBASEP_DEBUG_PRINT_TRACE "" -+#endif ++_mali_osk_errcode_t _mali_ukk_pp_and_gp_start_job(void *ctx, _mali_uk_pp_and_gp_start_job_s *uargs); + -+/** -+ * @def KBASEP_DEBUG_ASSERT_OUT(trace, function, ...) -+ * @brief (Private) system printing function associated to the @ref KBASE_DEBUG_ASSERT_MSG event. -+ * @param trace location in the code from where the message is printed -+ * @param function function from where the message is printed -+ * @param ... Format string followed by format arguments. -+ * @note function parameter cannot be concatenated with other strings ++/** @brief Returns the number of Fragment Processors in the system ++ * ++ * @param args see _mali_uk_get_pp_number_of_cores_s in "mali_utgard_uk_types.h" ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+/* Select the correct system output function*/ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+#define KBASEP_DEBUG_ASSERT_OUT(trace, function, ...)\ -+ do { \ -+ pr_err("Mali: %s function:%s ", trace, function);\ -+ pr_err(__VA_ARGS__);\ -+ pr_err("\n");\ -+ } while (false) -+#else -+#define KBASEP_DEBUG_ASSERT_OUT(trace, function, ...) CSTD_NOP() -+#endif -+ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+#define KBASE_CALL_ASSERT_HOOK() kbasep_debug_assert_call_hook() -+#else -+#define KBASE_CALL_ASSERT_HOOK() CSTD_NOP() -+#endif ++_mali_osk_errcode_t _mali_ukk_get_pp_number_of_cores(_mali_uk_get_pp_number_of_cores_s *args); + -+/** -+ * @def KBASE_DEBUG_ASSERT(expr) -+ * @brief Calls @ref KBASE_PRINT_ASSERT and prints the expression @a expr if @a expr is false ++/** @brief Returns the version that all Fragment Processor cores are compatible with. + * -+ * @note This macro does nothing if the flag @ref KBASE_DEBUG_DISABLE_ASSERTS is set to 1 ++ * This function may only be called when _mali_ukk_get_pp_number_of_cores() indicated at least one Fragment ++ * Processor core is available. + * -+ * @param expr Boolean expression ++ * @param args see _mali_uk_get_pp_core_version_s in "mali_utgard_uk_types.h" ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+#define KBASE_DEBUG_ASSERT(expr) \ -+ KBASE_DEBUG_ASSERT_MSG(expr, #expr) -+ -+#if KBASE_DEBUG_DISABLE_ASSERTS -+#define KBASE_DEBUG_ASSERT_MSG(expr, ...) CSTD_NOP() -+#else -+ /** -+ * @def KBASE_DEBUG_ASSERT_MSG(expr, ...) -+ * @brief Calls @ref KBASEP_DEBUG_ASSERT_OUT and prints the given message if @a expr is false -+ * -+ * @note This macro does nothing if the flag @ref KBASE_DEBUG_DISABLE_ASSERTS is set to 1 -+ * -+ * @param expr Boolean expression -+ * @param ... Message to display when @a expr is false, as a format string followed by format arguments. -+ */ -+#define KBASE_DEBUG_ASSERT_MSG(expr, ...) \ -+ do { \ -+ if (!(expr)) { \ -+ KBASEP_DEBUG_ASSERT_OUT(KBASEP_DEBUG_PRINT_TRACE, KBASEP_DEBUG_PRINT_FUNCTION, __VA_ARGS__);\ -+ KBASE_CALL_ASSERT_HOOK();\ -+ BUG();\ -+ } \ -+ } while (false) -+#endif /* KBASE_DEBUG_DISABLE_ASSERTS */ ++_mali_osk_errcode_t _mali_ukk_get_pp_core_version(_mali_uk_get_pp_core_version_s *args); + -+/** -+ * @def KBASE_DEBUG_CODE( X ) -+ * @brief Executes the code inside the macro only in debug mode ++/** @brief Disable Write-back unit(s) on specified job + * -+ * @param X Code to compile only in debug mode. ++ * @param args see _mali_uk_get_pp_core_version_s in "mali_utgard_uk_types.h" + */ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+#define KBASE_DEBUG_CODE(X) X -+#else -+#define KBASE_DEBUG_CODE(X) CSTD_NOP() -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++void _mali_ukk_pp_job_disable_wb(_mali_uk_pp_disable_wb_s *args); + -+/** @} */ + -+/** -+ * @brief Register a function to call on ASSERT ++/** @} */ /* end group _mali_uk_pp */ ++ ++ ++/** @addtogroup _mali_uk_gp U/K Vertex Processor + * -+ * Such functions will \b only be called during Debug mode, and for debugging -+ * features \b only. Do not rely on them to be called in general use. ++ * The Vertex Processor (aka GP (Geometry Processor)) functions provide the following functionality: ++ * - retrieving version of the Vertex Processors ++ * - determine number of Vertex Processors available ++ * - starting a job on a Vertex Processor + * -+ * To disable the hook, supply NULL to \a func. ++ * @{ */ ++ ++/** @brief Issue a request to start a new job on a Vertex Processor. + * -+ * @note This function is not thread-safe, and should only be used to -+ * register/deregister once in the module's lifetime. ++ * If the request fails args->status is set to _MALI_UK_START_JOB_NOT_STARTED_DO_REQUEUE and you can ++ * try to start the job again. + * -+ * @param[in] func the function to call when an assert is triggered. -+ * @param[in] param the parameter to pass to \a func when calling it ++ * An existing job could be returned for requeueing if the new job has a higher priority than a previously started job ++ * which the hardware hasn't actually started processing yet. In this case the new job will be started and the ++ * existing one returned, otherwise the new job is started and the status field args->status is set to ++ * _MALI_UK_START_JOB_STARTED. ++ * ++ * Job completion can be awaited with _mali_ukk_wait_for_notification(). ++ * ++ * @param ctx user-kernel context (mali_session) ++ * @param uargs see _mali_uk_gp_start_job_s in "mali_utgard_uk_types.h". Use _mali_osk_copy_from_user to retrieve data! ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+void kbase_debug_assert_register_hook(kbase_debug_assert_hook *func, void *param); ++_mali_osk_errcode_t _mali_ukk_gp_start_job(void *ctx, _mali_uk_gp_start_job_s *uargs); + -+/** -+ * @brief Call a debug assert hook previously registered with kbase_debug_assert_register_hook() ++/** @brief Returns the number of Vertex Processors in the system. + * -+ * @note This function is not thread-safe with respect to multiple threads -+ * registering functions and parameters with -+ * kbase_debug_assert_register_hook(). Otherwise, thread safety is the -+ * responsibility of the registered hook. ++ * @param args see _mali_uk_get_gp_number_of_cores_s in "mali_utgard_uk_types.h" ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+void kbasep_debug_assert_call_hook(void); ++_mali_osk_errcode_t _mali_ukk_get_gp_number_of_cores(_mali_uk_get_gp_number_of_cores_s *args); + -+#endif /* _KBASE_DEBUG_H */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_job_fault.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_job_fault.c -new file mode 100755 -index 000000000000..f29430ddf8f9 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_job_fault.c -@@ -0,0 +1,499 @@ -+/* ++/** @brief Returns the version that all Vertex Processor cores are compatible with. + * -+ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ * This function may only be called when _mali_uk_get_gp_number_of_cores() indicated at least one Vertex ++ * Processor core is available. + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * @param args see _mali_uk_get_gp_core_version_s in "mali_utgard_uk_types.h" ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ */ ++_mali_osk_errcode_t _mali_ukk_get_gp_core_version(_mali_uk_get_gp_core_version_s *args); ++ ++/** @brief Resume or abort suspended Vertex Processor jobs. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * After receiving notification that a Vertex Processor job was suspended from ++ * _mali_ukk_wait_for_notification() you can use this function to resume or abort the job. + * ++ * @param args see _mali_uk_gp_suspend_response_s in "mali_utgard_uk_types.h" ++ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ ++_mali_osk_errcode_t _mali_ukk_gp_suspend_response(_mali_uk_gp_suspend_response_s *args); + ++/** @} */ /* end group _mali_uk_gp */ + ++#if defined(CONFIG_MALI400_PROFILING) ++/** @addtogroup _mali_uk_profiling U/K Timeline profiling module ++ * @{ */ + -+#include -+#include -+#include -+ -+#ifdef CONFIG_DEBUG_FS -+ -+static bool kbase_is_job_fault_event_pending(struct kbase_device *kbdev) -+{ -+ struct list_head *event_list = &kbdev->job_fault_event_list; -+ unsigned long flags; -+ bool ret; -+ -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); -+ ret = !list_empty(event_list); -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); -+ -+ return ret; -+} -+ -+static bool kbase_ctx_has_no_event_pending(struct kbase_context *kctx) -+{ -+ struct kbase_device *kbdev = kctx->kbdev; -+ struct list_head *event_list = &kctx->kbdev->job_fault_event_list; -+ struct base_job_fault_event *event; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); -+ if (list_empty(event_list)) { -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); -+ return true; -+ } -+ list_for_each_entry(event, event_list, head) { -+ if (event->katom->kctx == kctx) { -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, -+ flags); -+ return false; -+ } -+ } -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); -+ return true; -+} -+ -+/* wait until the fault happen and copy the event */ -+static int kbase_job_fault_event_wait(struct kbase_device *kbdev, -+ struct base_job_fault_event *event) -+{ -+ struct list_head *event_list = &kbdev->job_fault_event_list; -+ struct base_job_fault_event *event_in; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); -+ if (list_empty(event_list)) { -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); -+ if (wait_event_interruptible(kbdev->job_fault_wq, -+ kbase_is_job_fault_event_pending(kbdev))) -+ return -ERESTARTSYS; -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); -+ } -+ -+ event_in = list_entry(event_list->next, -+ struct base_job_fault_event, head); -+ event->event_code = event_in->event_code; -+ event->katom = event_in->katom; -+ -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); -+ -+ return 0; -+ -+} ++/** @brief Add event to profiling buffer. ++ * ++ * @param args see _mali_uk_profiling_add_event_s in "mali_utgard_uk_types.h" ++ */ ++_mali_osk_errcode_t _mali_ukk_profiling_add_event(_mali_uk_profiling_add_event_s *args); + -+/* remove the event from the queue */ -+static struct base_job_fault_event *kbase_job_fault_event_dequeue( -+ struct kbase_device *kbdev, struct list_head *event_list) -+{ -+ struct base_job_fault_event *event; ++/** @brief Get profiling stream fd. ++ * ++ * @param args see _mali_uk_profiling_stream_fd_get_s in "mali_utgard_uk_types.h" ++ */ ++_mali_osk_errcode_t _mali_ukk_profiling_stream_fd_get(_mali_uk_profiling_stream_fd_get_s *args); + -+ event = list_entry(event_list->next, -+ struct base_job_fault_event, head); -+ list_del(event_list->next); ++/** @brief Profiling control set. ++ * ++ * @param args see _mali_uk_profiling_control_set_s in "mali_utgard_uk_types.h" ++ */ ++_mali_osk_errcode_t _mali_ukk_profiling_control_set(_mali_uk_profiling_control_set_s *args); + -+ return event; ++/** @} */ /* end group _mali_uk_profiling */ ++#endif + -+} ++/** @addtogroup _mali_uk_vsync U/K VSYNC reporting module ++ * @{ */ + -+/* Remove all the following atoms after the failed atom in the same context -+ * Call the postponed bottom half of job done. -+ * Then, this context could be rescheduled. ++/** @brief Report events related to vsync. ++ * ++ * @note Events should be reported when starting to wait for vsync and when the ++ * waiting is finished. This information can then be used in kernel space to ++ * complement the GPU utilization metric. ++ * ++ * @param args see _mali_uk_vsync_event_report_s in "mali_utgard_uk_types.h" + */ -+static void kbase_job_fault_resume_event_cleanup(struct kbase_context *kctx) -+{ -+ struct list_head *event_list = &kctx->job_fault_resume_event_list; -+ -+ while (!list_empty(event_list)) { -+ struct base_job_fault_event *event; ++_mali_osk_errcode_t _mali_ukk_vsync_event_report(_mali_uk_vsync_event_report_s *args); + -+ event = kbase_job_fault_event_dequeue(kctx->kbdev, -+ &kctx->job_fault_resume_event_list); -+ kbase_jd_done_worker(&event->katom->work); -+ } ++/** @} */ /* end group _mali_uk_vsync */ + -+} ++/** @addtogroup _mali_sw_counters_report U/K Software counter reporting ++ * @{ */ + -+/* Remove all the failed atoms that belong to different contexts -+ * Resume all the contexts that were suspend due to failed job ++/** @brief Report software counters. ++ * ++ * @param args see _mali_uk_sw_counters_report_s in "mali_uk_types.h" + */ -+static void kbase_job_fault_event_cleanup(struct kbase_device *kbdev) -+{ -+ struct list_head *event_list = &kbdev->job_fault_event_list; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); -+ while (!list_empty(event_list)) { -+ kbase_job_fault_event_dequeue(kbdev, event_list); -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); -+ wake_up(&kbdev->job_fault_resume_wq); -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); -+ } -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); -+} -+ -+static void kbase_job_fault_resume_worker(struct work_struct *data) -+{ -+ struct base_job_fault_event *event = container_of(data, -+ struct base_job_fault_event, job_fault_work); -+ struct kbase_context *kctx; -+ struct kbase_jd_atom *katom; ++_mali_osk_errcode_t _mali_ukk_sw_counters_report(_mali_uk_sw_counters_report_s *args); + -+ katom = event->katom; -+ kctx = katom->kctx; ++/** @} */ /* end group _mali_sw_counters_report */ + -+ dev_info(kctx->kbdev->dev, "Job dumping wait\n"); ++/** @} */ /* end group u_k_api */ + -+ /* When it was waked up, it need to check if queue is empty or the -+ * failed atom belongs to different context. If yes, wake up. Both -+ * of them mean the failed job has been dumped. Please note, it -+ * should never happen that the job_fault_event_list has the two -+ * atoms belong to the same context. -+ */ -+ wait_event(kctx->kbdev->job_fault_resume_wq, -+ kbase_ctx_has_no_event_pending(kctx)); ++/** @} */ /* end group uddapi */ + -+ atomic_set(&kctx->job_fault_count, 0); -+ kbase_jd_done_worker(&katom->work); ++u32 _mali_ukk_report_memory_usage(void); + -+ /* In case the following atoms were scheduled during failed job dump -+ * the job_done_worker was held. We need to rerun it after the dump -+ * was finished -+ */ -+ kbase_job_fault_resume_event_cleanup(kctx); ++u32 _mali_ukk_report_total_memory_size(void); + -+ dev_info(kctx->kbdev->dev, "Job dumping finish, resume scheduler\n"); -+} ++u32 _mali_ukk_utilization_gp_pp(void); + -+static struct base_job_fault_event *kbase_job_fault_event_queue( -+ struct list_head *event_list, -+ struct kbase_jd_atom *atom, -+ u32 completion_code) -+{ -+ struct base_job_fault_event *event; ++u32 _mali_ukk_utilization_gp(void); + -+ event = &atom->fault_event; ++u32 _mali_ukk_utilization_pp(void); + -+ event->katom = atom; -+ event->event_code = completion_code; ++#ifdef __cplusplus ++} ++#endif + -+ list_add_tail(&event->head, event_list); ++#endif /* __MALI_UKK_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c +new file mode 100755 +index 000000000..1911eff87 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c +@@ -0,0 +1,147 @@ ++/** ++ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ return event; ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_ukk.h" ++#include "mali_uk_types.h" ++#include "mali_user_settings_db.h" ++#include "mali_session.h" + -+} ++static u32 mali_user_settings[_MALI_UK_USER_SETTING_MAX]; ++const char *_mali_uk_user_setting_descriptions[] = _MALI_UK_USER_SETTING_DESCRIPTIONS; + -+static void kbase_job_fault_event_post(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, u32 completion_code) ++static void mali_user_settings_notify(_mali_uk_user_setting_t setting, u32 value) +{ -+ struct base_job_fault_event *event; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); -+ event = kbase_job_fault_event_queue(&kbdev->job_fault_event_list, -+ katom, completion_code); -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); -+ -+ wake_up_interruptible(&kbdev->job_fault_wq); ++ mali_bool done = MALI_FALSE; + -+ INIT_WORK(&event->job_fault_work, kbase_job_fault_resume_worker); -+ queue_work(kbdev->job_fault_resume_workq, &event->job_fault_work); ++ /* ++ * This function gets a bit complicated because we can't hold the session lock while ++ * allocating notification objects. ++ */ + -+ dev_info(katom->kctx->kbdev->dev, "Job fault happen, start dump: %d_%d", -+ katom->kctx->tgid, katom->kctx->id); ++ while (!done) { ++ u32 i; ++ u32 num_sessions_alloc; ++ u32 num_sessions_with_lock; ++ u32 used_notification_objects = 0; ++ _mali_osk_notification_t **notobjs; + -+} ++ /* Pre allocate the number of notifications objects we need right now (might change after lock has been taken) */ ++ num_sessions_alloc = mali_session_get_count(); ++ if (0 == num_sessions_alloc) { ++ /* No sessions to report to */ ++ return; ++ } + -+/* -+ * This function will process the job fault -+ * Get the register copy -+ * Send the failed job dump event -+ * Create a Wait queue to wait until the job dump finish -+ */ ++ notobjs = (_mali_osk_notification_t **)_mali_osk_malloc(sizeof(_mali_osk_notification_t *) * num_sessions_alloc); ++ if (NULL == notobjs) { ++ MALI_PRINT_ERROR(("Failed to notify user space session about num PP core change (alloc failure)\n")); ++ return; ++ } + -+bool kbase_debug_job_fault_process(struct kbase_jd_atom *katom, -+ u32 completion_code) -+{ -+ struct kbase_context *kctx = katom->kctx; ++ for (i = 0; i < num_sessions_alloc; i++) { ++ notobjs[i] = _mali_osk_notification_create(_MALI_NOTIFICATION_SETTINGS_CHANGED, ++ sizeof(_mali_uk_settings_changed_s)); ++ if (NULL != notobjs[i]) { ++ _mali_uk_settings_changed_s *data; ++ data = notobjs[i]->result_buffer; + -+ /* Check if dumping is in the process -+ * only one atom of each context can be dumped at the same time -+ * If the atom belongs to different context, it can be dumped -+ */ -+ if (atomic_read(&kctx->job_fault_count) > 0) { -+ kbase_job_fault_event_queue( -+ &kctx->job_fault_resume_event_list, -+ katom, completion_code); -+ dev_info(kctx->kbdev->dev, "queue:%d\n", -+ kbase_jd_atom_id(kctx, katom)); -+ return true; -+ } ++ data->setting = setting; ++ data->value = value; ++ } else { ++ MALI_PRINT_ERROR(("Failed to notify user space session about setting change (alloc failure %u)\n", i)); ++ } ++ } + -+ if (kctx->kbdev->job_fault_debug == true) { ++ mali_session_lock(); + -+ if (completion_code != BASE_JD_EVENT_DONE) { ++ /* number of sessions will not change while we hold the lock */ ++ num_sessions_with_lock = mali_session_get_count(); + -+ if (kbase_job_fault_get_reg_snapshot(kctx) == false) { -+ dev_warn(kctx->kbdev->dev, "get reg dump failed\n"); -+ return false; ++ if (num_sessions_alloc >= num_sessions_with_lock) { ++ /* We have allocated enough notification objects for all the sessions atm */ ++ struct mali_session_data *session, *tmp; ++ MALI_SESSION_FOREACH(session, tmp, link) { ++ MALI_DEBUG_ASSERT(used_notification_objects < num_sessions_alloc); ++ if (NULL != notobjs[used_notification_objects]) { ++ mali_session_send_notification(session, notobjs[used_notification_objects]); ++ notobjs[used_notification_objects] = NULL; /* Don't track this notification object any more */ ++ } ++ used_notification_objects++; + } ++ done = MALI_TRUE; ++ } + -+ kbase_job_fault_event_post(kctx->kbdev, katom, -+ completion_code); -+ atomic_inc(&kctx->job_fault_count); -+ dev_info(kctx->kbdev->dev, "post:%d\n", -+ kbase_jd_atom_id(kctx, katom)); -+ return true; ++ mali_session_unlock(); + ++ /* Delete any remaining/unused notification objects */ ++ for (; used_notification_objects < num_sessions_alloc; used_notification_objects++) { ++ if (NULL != notobjs[used_notification_objects]) { ++ _mali_osk_notification_delete(notobjs[used_notification_objects]); ++ } + } -+ } -+ return false; + ++ _mali_osk_free(notobjs); ++ } +} + -+static int debug_job_fault_show(struct seq_file *m, void *v) ++void mali_set_user_setting(_mali_uk_user_setting_t setting, u32 value) +{ -+ struct kbase_device *kbdev = m->private; -+ struct base_job_fault_event *event = (struct base_job_fault_event *)v; -+ struct kbase_context *kctx = event->katom->kctx; -+ int i; -+ -+ dev_info(kbdev->dev, "debug job fault seq show:%d_%d, %d", -+ kctx->tgid, kctx->id, event->reg_offset); ++ mali_bool notify = MALI_FALSE; + -+ if (kctx->reg_dump == NULL) { -+ dev_warn(kbdev->dev, "reg dump is NULL"); -+ return -1; ++ if (setting >= _MALI_UK_USER_SETTING_MAX) { ++ MALI_DEBUG_PRINT_ERROR(("Invalid user setting %ud\n")); ++ return; + } + -+ if (kctx->reg_dump[event->reg_offset] == -+ REGISTER_DUMP_TERMINATION_FLAG) { -+ /* Return the error here to stop the read. And the -+ * following next() will not be called. The stop can -+ * get the real event resource and release it -+ */ -+ return -1; ++ if (mali_user_settings[setting] != value) { ++ notify = MALI_TRUE; + } + -+ if (event->reg_offset == 0) -+ seq_printf(m, "%d_%d\n", kctx->tgid, kctx->id); -+ -+ for (i = 0; i < 50; i++) { -+ if (kctx->reg_dump[event->reg_offset] == -+ REGISTER_DUMP_TERMINATION_FLAG) { -+ break; -+ } -+ seq_printf(m, "%08x: %08x\n", -+ kctx->reg_dump[event->reg_offset], -+ kctx->reg_dump[1+event->reg_offset]); -+ event->reg_offset += 2; ++ mali_user_settings[setting] = value; + ++ if (notify) { ++ mali_user_settings_notify(setting, value); + } ++} + ++u32 mali_get_user_setting(_mali_uk_user_setting_t setting) ++{ ++ if (setting >= _MALI_UK_USER_SETTING_MAX) { ++ return 0; ++ } + -+ return 0; ++ return mali_user_settings[setting]; +} -+static void *debug_job_fault_next(struct seq_file *m, void *v, loff_t *pos) ++ ++_mali_osk_errcode_t _mali_ukk_get_user_setting(_mali_uk_get_user_setting_s *args) +{ -+ struct kbase_device *kbdev = m->private; -+ struct base_job_fault_event *event = (struct base_job_fault_event *)v; ++ _mali_uk_user_setting_t setting; ++ MALI_DEBUG_ASSERT_POINTER(args); + -+ dev_info(kbdev->dev, "debug job fault seq next:%d, %d", -+ event->reg_offset, (int)*pos); ++ setting = args->setting; + -+ return event; ++ if (_MALI_UK_USER_SETTING_MAX > setting) { ++ args->value = mali_user_settings[setting]; ++ return _MALI_OSK_ERR_OK; ++ } else { ++ return _MALI_OSK_ERR_INVALID_ARGS; ++ } +} + -+static void *debug_job_fault_start(struct seq_file *m, loff_t *pos) ++_mali_osk_errcode_t _mali_ukk_get_user_settings(_mali_uk_get_user_settings_s *args) +{ -+ struct kbase_device *kbdev = m->private; -+ struct base_job_fault_event *event; -+ -+ dev_info(kbdev->dev, "fault job seq start:%d", (int)*pos); -+ -+ /* The condition is trick here. It needs make sure the -+ * fault hasn't happened and the dumping hasn't been started, -+ * or the dumping has finished -+ */ -+ if (*pos == 0) { -+ event = kmalloc(sizeof(*event), GFP_KERNEL); -+ if (!event) -+ return NULL; -+ event->reg_offset = 0; -+ if (kbase_job_fault_event_wait(kbdev, event)) { -+ kfree(event); -+ return NULL; -+ } ++ MALI_DEBUG_ASSERT_POINTER(args); + -+ /* The cache flush workaround is called in bottom half of -+ * job done but we delayed it. Now we should clean cache -+ * earlier. Then the GPU memory dump should be correct. -+ */ -+ kbase_backend_cacheclean(kbdev, event->katom); -+ } else -+ return NULL; ++ _mali_osk_memcpy(args->settings, mali_user_settings, sizeof(mali_user_settings)); + -+ return event; ++ return _MALI_OSK_ERR_OK; +} +diff --git a/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h +new file mode 100755 +index 000000000..da9c0630e +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h +@@ -0,0 +1,39 @@ ++/** ++ * Copyright (C) 2012-2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+static void debug_job_fault_stop(struct seq_file *m, void *v) -+{ -+ struct kbase_device *kbdev = m->private; ++#ifndef __MALI_USER_SETTINGS_DB_H__ ++#define __MALI_USER_SETTINGS_DB_H__ + -+ /* here we wake up the kbase_jd_done_worker after stop, it needs -+ * get the memory dump before the register dump in debug daemon, -+ * otherwise, the memory dump may be incorrect. -+ */ ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ if (v != NULL) { -+ kfree(v); -+ dev_info(kbdev->dev, "debug job fault seq stop stage 1"); ++#include "mali_uk_types.h" + -+ } else { -+ unsigned long flags; ++/** @brief Set Mali user setting in DB ++ * ++ * Update the DB with a new value for \a setting. If the value is different from theprevious set value running sessions will be notified of the change. ++ * ++ * @param setting the setting to be changed ++ * @param value the new value to set ++ */ ++void mali_set_user_setting(_mali_uk_user_setting_t setting, u32 value); + -+ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); -+ if (!list_empty(&kbdev->job_fault_event_list)) { -+ kbase_job_fault_event_dequeue(kbdev, -+ &kbdev->job_fault_event_list); -+ wake_up(&kbdev->job_fault_resume_wq); -+ } -+ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); -+ dev_info(kbdev->dev, "debug job fault seq stop stage 2"); -+ } ++/** @brief Get current Mali user setting value from DB ++ * ++ * @param setting the setting to extract ++ * @return the value of the selected setting ++ */ ++u32 mali_get_user_setting(_mali_uk_user_setting_t setting); + ++#ifdef __cplusplus +} ++#endif ++#endif /* __MALI_KERNEL_USER_SETTING__ */ +diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h +new file mode 100755 +index 000000000..7df55c951 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h +@@ -0,0 +1,526 @@ ++/* ++ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+static const struct seq_operations ops = { -+ .start = debug_job_fault_start, -+ .next = debug_job_fault_next, -+ .stop = debug_job_fault_stop, -+ .show = debug_job_fault_show, -+}; ++/** ++ * @file mali_utgard.h ++ * Defines types and interface exposed by the Mali Utgard device driver ++ */ + -+static int debug_job_fault_open(struct inode *in, struct file *file) -+{ -+ struct kbase_device *kbdev = in->i_private; ++#ifndef __MALI_UTGARD_H__ ++#define __MALI_UTGARD_H__ + -+ seq_open(file, &ops); ++#include "mali_osk_types.h" ++#ifdef CONFIG_MALI_DEVFREQ ++#include ++#include "mali_pm_metrics.h" ++#ifdef CONFIG_DEVFREQ_THERMAL ++#include ++#endif ++#endif + -+ ((struct seq_file *)file->private_data)->private = kbdev; -+ dev_info(kbdev->dev, "debug job fault seq open"); ++#define MALI_GPU_NAME_UTGARD "mali-utgard" + -+ kbdev->job_fault_debug = true; + -+ return 0; ++#define MALI_OFFSET_GP 0x00000 ++#define MALI_OFFSET_GP_MMU 0x03000 + -+} ++#define MALI_OFFSET_PP0 0x08000 ++#define MALI_OFFSET_PP0_MMU 0x04000 ++#define MALI_OFFSET_PP1 0x0A000 ++#define MALI_OFFSET_PP1_MMU 0x05000 ++#define MALI_OFFSET_PP2 0x0C000 ++#define MALI_OFFSET_PP2_MMU 0x06000 ++#define MALI_OFFSET_PP3 0x0E000 ++#define MALI_OFFSET_PP3_MMU 0x07000 + -+static int debug_job_fault_release(struct inode *in, struct file *file) -+{ -+ struct kbase_device *kbdev = in->i_private; ++#define MALI_OFFSET_PP4 0x28000 ++#define MALI_OFFSET_PP4_MMU 0x1C000 ++#define MALI_OFFSET_PP5 0x2A000 ++#define MALI_OFFSET_PP5_MMU 0x1D000 ++#define MALI_OFFSET_PP6 0x2C000 ++#define MALI_OFFSET_PP6_MMU 0x1E000 ++#define MALI_OFFSET_PP7 0x2E000 ++#define MALI_OFFSET_PP7_MMU 0x1F000 + -+ seq_release(in, file); ++#define MALI_OFFSET_L2_RESOURCE0 0x01000 ++#define MALI_OFFSET_L2_RESOURCE1 0x10000 ++#define MALI_OFFSET_L2_RESOURCE2 0x11000 + -+ kbdev->job_fault_debug = false; ++#define MALI400_OFFSET_L2_CACHE0 MALI_OFFSET_L2_RESOURCE0 ++#define MALI450_OFFSET_L2_CACHE0 MALI_OFFSET_L2_RESOURCE1 ++#define MALI450_OFFSET_L2_CACHE1 MALI_OFFSET_L2_RESOURCE0 ++#define MALI450_OFFSET_L2_CACHE2 MALI_OFFSET_L2_RESOURCE2 ++#define MALI470_OFFSET_L2_CACHE1 MALI_OFFSET_L2_RESOURCE0 + -+ /* Clean the unprocessed job fault. After that, all the suspended -+ * contexts could be rescheduled. -+ */ -+ kbase_job_fault_event_cleanup(kbdev); ++#define MALI_OFFSET_BCAST 0x13000 ++#define MALI_OFFSET_DLBU 0x14000 + -+ dev_info(kbdev->dev, "debug job fault seq close"); ++#define MALI_OFFSET_PP_BCAST 0x16000 ++#define MALI_OFFSET_PP_BCAST_MMU 0x15000 + -+ return 0; -+} ++#define MALI_OFFSET_PMU 0x02000 ++#define MALI_OFFSET_DMA 0x12000 + -+static const struct file_operations kbasep_debug_job_fault_fops = { -+ .open = debug_job_fault_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = debug_job_fault_release, -+}; ++/* Mali-300 */ + -+/* -+ * Initialize debugfs entry for job fault dump -+ */ -+void kbase_debug_job_fault_debugfs_init(struct kbase_device *kbdev) -+{ -+ debugfs_create_file("job_fault", S_IRUGO, -+ kbdev->mali_debugfs_directory, kbdev, -+ &kbasep_debug_job_fault_fops); -+} ++#define MALI_GPU_RESOURCES_MALI300(base_addr, gp_irq, gp_mmu_irq, pp_irq, pp_mmu_irq) \ ++ MALI_GPU_RESOURCES_MALI400_MP1(base_addr, gp_irq, gp_mmu_irq, pp_irq, pp_mmu_irq) + ++#define MALI_GPU_RESOURCES_MALI300_PMU(base_addr, gp_irq, gp_mmu_irq, pp_irq, pp_mmu_irq) \ ++ MALI_GPU_RESOURCES_MALI400_MP1_PMU(base_addr, gp_irq, gp_mmu_irq, pp_irq, pp_mmu_irq) + -+int kbase_debug_job_fault_dev_init(struct kbase_device *kbdev) -+{ ++/* Mali-400 */ + -+ INIT_LIST_HEAD(&kbdev->job_fault_event_list); ++#define MALI_GPU_RESOURCES_MALI400_MP1(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI400_OFFSET_L2_CACHE0) \ ++ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) + -+ init_waitqueue_head(&(kbdev->job_fault_wq)); -+ init_waitqueue_head(&(kbdev->job_fault_resume_wq)); -+ spin_lock_init(&kbdev->job_fault_event_lock); ++#define MALI_GPU_RESOURCES_MALI400_MP1_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCES_MALI400_MP1(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) + -+ kbdev->job_fault_resume_workq = alloc_workqueue( -+ "kbase_job_fault_resume_work_queue", WQ_MEM_RECLAIM, 1); -+ if (!kbdev->job_fault_resume_workq) -+ return -ENOMEM; ++#define MALI_GPU_RESOURCES_MALI400_MP2(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI400_OFFSET_L2_CACHE0) \ ++ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) + -+ kbdev->job_fault_debug = false; ++#define MALI_GPU_RESOURCES_MALI400_MP2_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq) \ ++ MALI_GPU_RESOURCES_MALI400_MP2(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq) \ ++ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) + -+ return 0; -+} ++#define MALI_GPU_RESOURCES_MALI400_MP3(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI400_OFFSET_L2_CACHE0) \ ++ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) + -+/* -+ * Release the relevant resource per device -+ */ -+void kbase_debug_job_fault_dev_term(struct kbase_device *kbdev) -+{ -+ destroy_workqueue(kbdev->job_fault_resume_workq); -+} ++#define MALI_GPU_RESOURCES_MALI400_MP3_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq) \ ++ MALI_GPU_RESOURCES_MALI400_MP3(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq) \ ++ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) + ++#define MALI_GPU_RESOURCES_MALI400_MP4(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI400_OFFSET_L2_CACHE0) \ ++ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(3, base_addr + MALI_OFFSET_PP3, pp3_irq, base_addr + MALI_OFFSET_PP3_MMU, pp3_mmu_irq) + -+/* -+ * Initialize the relevant data structure per context -+ */ -+void kbase_debug_job_fault_context_init(struct kbase_context *kctx) -+{ ++#define MALI_GPU_RESOURCES_MALI400_MP4_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq) \ ++ MALI_GPU_RESOURCES_MALI400_MP4(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq) \ ++ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ + -+ /* We need allocate double size register range -+ * Because this memory will keep the register address and value -+ */ -+ kctx->reg_dump = vmalloc(0x4000 * 2); -+ if (kctx->reg_dump == NULL) -+ return; ++ /* Mali-450 */ ++#define MALI_GPU_RESOURCES_MALI450_MP2(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE0) \ ++ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE1) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ ++ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ ++ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ ++ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) \ ++ MALI_GPU_RESOURCE_DMA(base_addr + MALI_OFFSET_DMA) + -+ if (kbase_debug_job_fault_reg_snapshot_init(kctx, 0x4000) == false) { -+ vfree(kctx->reg_dump); -+ kctx->reg_dump = NULL; -+ } -+ INIT_LIST_HEAD(&kctx->job_fault_resume_event_list); -+ atomic_set(&kctx->job_fault_count, 0); ++#define MALI_GPU_RESOURCES_MALI450_MP2_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCES_MALI450_MP2(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ + -+} ++#define MALI_GPU_RESOURCES_MALI450_MP3(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE0) \ ++ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE1) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) \ ++ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ ++ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ ++ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) + -+/* -+ * release the relevant resource per context -+ */ -+void kbase_debug_job_fault_context_term(struct kbase_context *kctx) -+{ -+ vfree(kctx->reg_dump); -+} ++#define MALI_GPU_RESOURCES_MALI450_MP3_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCES_MALI450_MP3(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ + -+#else /* CONFIG_DEBUG_FS */ ++#define MALI_GPU_RESOURCES_MALI450_MP4(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE0) \ ++ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE1) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(3, base_addr + MALI_OFFSET_PP3, pp3_irq, base_addr + MALI_OFFSET_PP3_MMU, pp3_mmu_irq) \ ++ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ ++ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ ++ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) \ ++ MALI_GPU_RESOURCE_DMA(base_addr + MALI_OFFSET_DMA) + -+int kbase_debug_job_fault_dev_init(struct kbase_device *kbdev) -+{ -+ kbdev->job_fault_debug = false; ++#define MALI_GPU_RESOURCES_MALI450_MP4_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCES_MALI450_MP4(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ + -+ return 0; -+} ++#define MALI_GPU_RESOURCES_MALI450_MP6(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp4_irq, pp4_mmu_irq, pp5_irq, pp5_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE0) \ ++ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE1) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE2) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(3, base_addr + MALI_OFFSET_PP4, pp3_irq, base_addr + MALI_OFFSET_PP4_MMU, pp3_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(4, base_addr + MALI_OFFSET_PP5, pp4_irq, base_addr + MALI_OFFSET_PP5_MMU, pp4_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(5, base_addr + MALI_OFFSET_PP6, pp5_irq, base_addr + MALI_OFFSET_PP6_MMU, pp5_mmu_irq) \ ++ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ ++ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ ++ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) \ ++ MALI_GPU_RESOURCE_DMA(base_addr + MALI_OFFSET_DMA) + -+void kbase_debug_job_fault_dev_term(struct kbase_device *kbdev) -+{ -+} ++#define MALI_GPU_RESOURCES_MALI450_MP6_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp4_irq, pp4_mmu_irq, pp5_irq, pp5_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCES_MALI450_MP6(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp4_irq, pp4_mmu_irq, pp5_irq, pp5_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ + -+#endif /* CONFIG_DEBUG_FS */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_job_fault.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_job_fault.h -new file mode 100755 -index 000000000000..a2bf8983c37c ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_job_fault.h -@@ -0,0 +1,96 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++#define MALI_GPU_RESOURCES_MALI450_MP8(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp4_irq, pp4_mmu_irq, pp5_irq, pp5_mmu_irq, pp6_irq, pp6_mmu_irq, pp7_irq, pp7_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE0) \ ++ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE1) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(3, base_addr + MALI_OFFSET_PP3, pp3_irq, base_addr + MALI_OFFSET_PP3_MMU, pp3_mmu_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE2) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(4, base_addr + MALI_OFFSET_PP4, pp4_irq, base_addr + MALI_OFFSET_PP4_MMU, pp4_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(5, base_addr + MALI_OFFSET_PP5, pp5_irq, base_addr + MALI_OFFSET_PP5_MMU, pp5_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(6, base_addr + MALI_OFFSET_PP6, pp6_irq, base_addr + MALI_OFFSET_PP6_MMU, pp6_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(7, base_addr + MALI_OFFSET_PP7, pp7_irq, base_addr + MALI_OFFSET_PP7_MMU, pp7_mmu_irq) \ ++ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ ++ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ ++ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) \ ++ MALI_GPU_RESOURCE_DMA(base_addr + MALI_OFFSET_DMA) + ++#define MALI_GPU_RESOURCES_MALI450_MP8_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp4_irq, pp4_mmu_irq, pp5_irq, pp5_mmu_irq, pp6_irq, pp6_mmu_irq, pp7_irq, pp7_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCES_MALI450_MP8(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp4_irq, pp4_mmu_irq, pp5_irq, pp5_mmu_irq, pp6_irq, pp6_mmu_irq, pp7_irq, pp7_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ + ++ /* Mali - 470 */ ++#define MALI_GPU_RESOURCES_MALI470_MP1(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI470_OFFSET_L2_CACHE1) \ ++ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ ++ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ ++ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) + -+#ifndef _KBASE_DEBUG_JOB_FAULT_H -+#define _KBASE_DEBUG_JOB_FAULT_H ++#define MALI_GPU_RESOURCES_MALI470_MP1_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCES_MALI470_MP1(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ + -+#include -+#include ++#define MALI_GPU_RESOURCES_MALI470_MP2(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI470_OFFSET_L2_CACHE1) \ ++ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ ++ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ ++ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ ++ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) + -+#define REGISTER_DUMP_TERMINATION_FLAG 0xFFFFFFFF ++#define MALI_GPU_RESOURCES_MALI470_MP2_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCES_MALI470_MP2(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ + -+/** -+ * kbase_debug_job_fault_dev_init - Create the fault event wait queue -+ * per device and initialize the required lists. -+ * @kbdev: Device pointer -+ * -+ * Return: Zero on success or a negative error code. -+ */ -+int kbase_debug_job_fault_dev_init(struct kbase_device *kbdev); ++#define MALI_GPU_RESOURCES_MALI470_MP3(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI470_OFFSET_L2_CACHE1) \ ++ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) \ ++ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ ++ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ ++ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) + -+/** -+ * kbase_debug_job_fault_debugfs_init - Initialize job fault debug sysfs -+ * @kbdev: Device pointer -+ */ -+void kbase_debug_job_fault_debugfs_init(struct kbase_device *kbdev); ++#define MALI_GPU_RESOURCES_MALI470_MP3_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCES_MALI470_MP3(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ + -+/** -+ * kbase_debug_job_fault_dev_term - Clean up resources created in -+ * kbase_debug_job_fault_dev_init. -+ * @kbdev: Device pointer -+ */ -+void kbase_debug_job_fault_dev_term(struct kbase_device *kbdev); -+ -+/** -+ * kbase_debug_job_fault_context_init - Initialize the relevant -+ * data structure per context -+ * @kctx: KBase context pointer -+ */ -+void kbase_debug_job_fault_context_init(struct kbase_context *kctx); -+ -+/** -+ * kbase_debug_job_fault_context_term - Release the relevant -+ * resource per context -+ * @kctx: KBase context pointer -+ */ -+void kbase_debug_job_fault_context_term(struct kbase_context *kctx); -+ -+/** -+ * kbase_debug_job_fault_process - Process the failed job. -+ * It will send a event and wake up the job fault waiting queue -+ * Then create a work queue to wait for job dump finish -+ * This function should be called in the interrupt handler and before -+ * jd_done that make sure the jd_done_worker will be delayed until the -+ * job dump finish -+ * @katom: The failed atom pointer -+ * @completion_code: the job status -+ * @return true if dump is going on -+ */ -+bool kbase_debug_job_fault_process(struct kbase_jd_atom *katom, -+ u32 completion_code); ++#define MALI_GPU_RESOURCES_MALI470_MP4(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_L2(base_addr + MALI470_OFFSET_L2_CACHE1) \ ++ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) \ ++ MALI_GPU_RESOURCE_PP_WITH_MMU(3, base_addr + MALI_OFFSET_PP3, pp3_irq, base_addr + MALI_OFFSET_PP3_MMU, pp3_mmu_irq) \ ++ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ ++ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ ++ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) + ++#define MALI_GPU_RESOURCES_MALI470_MP4_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCES_MALI470_MP4(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp_bcast_irq) \ ++ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ + -+/** -+ * kbase_debug_job_fault_reg_snapshot_init - Set the interested registers -+ * address during the job fault process, the relevant registers will -+ * be saved when a job fault happen -+ * @kctx: KBase context pointer -+ * @reg_range: Maximum register address space -+ * @return true if initializing successfully -+ */ -+bool kbase_debug_job_fault_reg_snapshot_init(struct kbase_context *kctx, -+ int reg_range); ++#define MALI_GPU_RESOURCE_L2(addr) \ ++ { \ ++ .name = "Mali_L2", \ ++ .flags = IORESOURCE_MEM, \ ++ .start = addr, \ ++ .end = addr + 0x200, \ ++ }, + -+/** -+ * kbase_job_fault_get_reg_snapshot - Read the interested registers for -+ * failed job dump -+ * @kctx: KBase context pointer -+ * @return true if getting registers successfully -+ */ -+bool kbase_job_fault_get_reg_snapshot(struct kbase_context *kctx); ++#define MALI_GPU_RESOURCE_GP(gp_addr, gp_irq) \ ++ { \ ++ .name = "Mali_GP", \ ++ .flags = IORESOURCE_MEM, \ ++ .start = gp_addr, \ ++ .end = gp_addr + 0x100, \ ++ }, \ ++ { \ ++ .name = "Mali_GP_IRQ", \ ++ .flags = IORESOURCE_IRQ, \ ++ .start = gp_irq, \ ++ .end = gp_irq, \ ++ }, \ + -+#endif /*_KBASE_DEBUG_JOB_FAULT_H*/ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_mem_view.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_mem_view.c -new file mode 100755 -index 000000000000..aa271566e917 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_mem_view.c -@@ -0,0 +1,306 @@ -+/* -+ * -+ * (C) COPYRIGHT 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++#define MALI_GPU_RESOURCE_GP_WITH_MMU(gp_addr, gp_irq, gp_mmu_addr, gp_mmu_irq) \ ++ { \ ++ .name = "Mali_GP", \ ++ .flags = IORESOURCE_MEM, \ ++ .start = gp_addr, \ ++ .end = gp_addr + 0x100, \ ++ }, \ ++ { \ ++ .name = "Mali_GP_IRQ", \ ++ .flags = IORESOURCE_IRQ, \ ++ .start = gp_irq, \ ++ .end = gp_irq, \ ++ }, \ ++ { \ ++ .name = "Mali_GP_MMU", \ ++ .flags = IORESOURCE_MEM, \ ++ .start = gp_mmu_addr, \ ++ .end = gp_mmu_addr + 0x100, \ ++ }, \ ++ { \ ++ .name = "Mali_GP_MMU_IRQ", \ ++ .flags = IORESOURCE_IRQ, \ ++ .start = gp_mmu_irq, \ ++ .end = gp_mmu_irq, \ ++ }, + ++#define MALI_GPU_RESOURCE_PP(pp_addr, pp_irq) \ ++ { \ ++ .name = "Mali_PP", \ ++ .flags = IORESOURCE_MEM, \ ++ .start = pp_addr, \ ++ .end = pp_addr + 0x1100, \ ++ }, \ ++ { \ ++ .name = "Mali_PP_IRQ", \ ++ .flags = IORESOURCE_IRQ, \ ++ .start = pp_irq, \ ++ .end = pp_irq, \ ++ }, \ + ++#define MALI_GPU_RESOURCE_PP_WITH_MMU(id, pp_addr, pp_irq, pp_mmu_addr, pp_mmu_irq) \ ++ { \ ++ .name = "Mali_PP" #id, \ ++ .flags = IORESOURCE_MEM, \ ++ .start = pp_addr, \ ++ .end = pp_addr + 0x1100, \ ++ }, \ ++ { \ ++ .name = "Mali_PP" #id "_IRQ", \ ++ .flags = IORESOURCE_IRQ, \ ++ .start = pp_irq, \ ++ .end = pp_irq, \ ++ }, \ ++ { \ ++ .name = "Mali_PP" #id "_MMU", \ ++ .flags = IORESOURCE_MEM, \ ++ .start = pp_mmu_addr, \ ++ .end = pp_mmu_addr + 0x100, \ ++ }, \ ++ { \ ++ .name = "Mali_PP" #id "_MMU_IRQ", \ ++ .flags = IORESOURCE_IRQ, \ ++ .start = pp_mmu_irq, \ ++ .end = pp_mmu_irq, \ ++ }, + -+/* -+ * Debugfs interface to dump the memory visible to the GPU -+ */ ++#define MALI_GPU_RESOURCE_MMU(mmu_addr, mmu_irq) \ ++ { \ ++ .name = "Mali_MMU", \ ++ .flags = IORESOURCE_MEM, \ ++ .start = mmu_addr, \ ++ .end = mmu_addr + 0x100, \ ++ }, \ ++ { \ ++ .name = "Mali_MMU_IRQ", \ ++ .flags = IORESOURCE_IRQ, \ ++ .start = mmu_irq, \ ++ .end = mmu_irq, \ ++ }, + -+#include "mali_kbase_debug_mem_view.h" -+#include "mali_kbase.h" ++#define MALI_GPU_RESOURCE_PMU(pmu_addr) \ ++ { \ ++ .name = "Mali_PMU", \ ++ .flags = IORESOURCE_MEM, \ ++ .start = pmu_addr, \ ++ .end = pmu_addr + 0x100, \ ++ }, + -+#include -+#include ++#define MALI_GPU_RESOURCE_DMA(dma_addr) \ ++ { \ ++ .name = "Mali_DMA", \ ++ .flags = IORESOURCE_MEM, \ ++ .start = dma_addr, \ ++ .end = dma_addr + 0x100, \ ++ }, + -+#ifdef CONFIG_DEBUG_FS ++#define MALI_GPU_RESOURCE_DLBU(dlbu_addr) \ ++ { \ ++ .name = "Mali_DLBU", \ ++ .flags = IORESOURCE_MEM, \ ++ .start = dlbu_addr, \ ++ .end = dlbu_addr + 0x100, \ ++ }, + -+struct debug_mem_mapping { -+ struct list_head node; ++#define MALI_GPU_RESOURCE_BCAST(bcast_addr) \ ++ { \ ++ .name = "Mali_Broadcast", \ ++ .flags = IORESOURCE_MEM, \ ++ .start = bcast_addr, \ ++ .end = bcast_addr + 0x100, \ ++ }, + -+ struct kbase_mem_phy_alloc *alloc; -+ unsigned long flags; ++#define MALI_GPU_RESOURCE_PP_BCAST(pp_addr, pp_irq) \ ++ { \ ++ .name = "Mali_PP_Broadcast", \ ++ .flags = IORESOURCE_MEM, \ ++ .start = pp_addr, \ ++ .end = pp_addr + 0x1100, \ ++ }, \ ++ { \ ++ .name = "Mali_PP_Broadcast_IRQ", \ ++ .flags = IORESOURCE_IRQ, \ ++ .start = pp_irq, \ ++ .end = pp_irq, \ ++ }, \ + -+ u64 start_pfn; -+ size_t nr_pages; -+}; ++#define MALI_GPU_RESOURCE_PP_MMU_BCAST(pp_mmu_bcast_addr) \ ++ { \ ++ .name = "Mali_PP_MMU_Broadcast", \ ++ .flags = IORESOURCE_MEM, \ ++ .start = pp_mmu_bcast_addr, \ ++ .end = pp_mmu_bcast_addr + 0x100, \ ++ }, + -+struct debug_mem_data { -+ struct list_head mapping_list; -+ struct kbase_context *kctx; -+}; ++ struct mali_gpu_utilization_data { ++ unsigned int utilization_gpu; /* Utilization for GP and all PP cores combined, 0 = no utilization, 256 = full utilization */ ++ unsigned int utilization_gp; /* Utilization for GP core only, 0 = no utilization, 256 = full utilization */ ++ unsigned int utilization_pp; /* Utilization for all PP cores combined, 0 = no utilization, 256 = full utilization */ ++ }; + -+struct debug_mem_seq_off { -+ struct list_head *lh; -+ size_t offset; -+}; ++ struct mali_gpu_clk_item { ++ unsigned int clock; /* unit(MHz) */ ++ unsigned int vol; ++ }; + -+static void *debug_mem_start(struct seq_file *m, loff_t *_pos) -+{ -+ struct debug_mem_data *mem_data = m->private; -+ struct debug_mem_seq_off *data; -+ struct debug_mem_mapping *map; -+ loff_t pos = *_pos; ++ struct mali_gpu_clock { ++ struct mali_gpu_clk_item *item; ++ unsigned int num_of_steps; ++ }; + -+ list_for_each_entry(map, &mem_data->mapping_list, node) { -+ if (pos >= map->nr_pages) { -+ pos -= map->nr_pages; -+ } else { -+ data = kmalloc(sizeof(*data), GFP_KERNEL); -+ if (!data) -+ return NULL; -+ data->lh = &map->node; -+ data->offset = pos; -+ return data; -+ } -+ } ++ struct mali_gpu_device_data { ++ /* Shared GPU memory */ ++ unsigned long shared_mem_size; + -+ /* Beyond the end */ -+ return NULL; -+} ++ /* ++ * Mali PMU switch delay. ++ * Only needed if the power gates are connected to the PMU in a high fanout ++ * network. This value is the number of Mali clock cycles it takes to ++ * enable the power gates and turn on the power mesh. ++ * This value will have no effect if a daisy chain implementation is used. ++ */ ++ u32 pmu_switch_delay; + -+static void debug_mem_stop(struct seq_file *m, void *v) -+{ -+ kfree(v); -+} ++ /* Mali Dynamic power domain configuration in sequence from 0-11 ++ * GP PP0 PP1 PP2 PP3 PP4 PP5 PP6 PP7, L2$0 L2$1 L2$2 ++ */ ++ u16 pmu_domain_config[12]; + -+static void *debug_mem_next(struct seq_file *m, void *v, loff_t *pos) -+{ -+ struct debug_mem_data *mem_data = m->private; -+ struct debug_mem_seq_off *data = v; -+ struct debug_mem_mapping *map; ++ /* Dedicated GPU memory range (physical). */ ++ unsigned long dedicated_mem_start; ++ unsigned long dedicated_mem_size; + -+ map = list_entry(data->lh, struct debug_mem_mapping, node); ++ /* Frame buffer memory to be accessible by Mali GPU (physical) */ ++ unsigned long fb_start; ++ unsigned long fb_size; + -+ if (data->offset < map->nr_pages - 1) { -+ data->offset++; -+ ++*pos; -+ return data; -+ } ++ /* Max runtime [ms] for jobs */ ++ int max_job_runtime; + -+ if (list_is_last(data->lh, &mem_data->mapping_list)) { -+ kfree(data); -+ return NULL; -+ } ++ /* Report GPU utilization and related control in this interval (specified in ms) */ ++ unsigned long control_interval; + -+ data->lh = data->lh->next; -+ data->offset = 0; -+ ++*pos; ++ /* Function that will receive periodic GPU utilization numbers */ ++ void (*utilization_callback)(struct mali_gpu_utilization_data *data); + -+ return data; -+} ++ /* Fuction that platform callback for freq setting, needed when CONFIG_MALI_DVFS enabled */ ++ int (*set_freq)(int setting_clock_step); ++ /* Function that platfrom report it's clock info which driver can set, needed when CONFIG_MALI_DVFS enabled */ ++ void (*get_clock_info)(struct mali_gpu_clock **data); ++ /* Function that get the current clock info, needed when CONFIG_MALI_DVFS enabled */ ++ int (*get_freq)(void); ++ /* Function that init the mali gpu secure mode */ ++ int (*secure_mode_init)(void); ++ /* Function that deinit the mali gpu secure mode */ ++ void (*secure_mode_deinit)(void); ++ /* Function that reset GPU and enable gpu secure mode */ ++ int (*gpu_reset_and_secure_mode_enable)(void); ++ /* Function that Reset GPU and disable gpu secure mode */ ++ int (*gpu_reset_and_secure_mode_disable)(void); ++ /* ipa related interface customer need register */ ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) ++ struct devfreq_cooling_power *gpu_cooling_ops; ++#endif ++ }; + -+static int debug_mem_show(struct seq_file *m, void *v) -+{ -+ struct debug_mem_data *mem_data = m->private; -+ struct debug_mem_seq_off *data = v; -+ struct debug_mem_mapping *map; -+ int i, j; -+ struct page *page; -+ uint32_t *mapping; -+ pgprot_t prot = PAGE_KERNEL; ++ /** ++ * Pause the scheduling and power state changes of Mali device driver. ++ * mali_dev_resume() must always be called as soon as possible after this function ++ * in order to resume normal operation of the Mali driver. ++ */ ++ void mali_dev_pause(void); + -+ map = list_entry(data->lh, struct debug_mem_mapping, node); ++ /** ++ * Resume scheduling and allow power changes in Mali device driver. ++ * This must always be called after mali_dev_pause(). ++ */ ++ void mali_dev_resume(void); + -+ kbase_gpu_vm_lock(mem_data->kctx); ++ /** @brief Set the desired number of PP cores to use. ++ * ++ * The internal Mali PMU will be used, if present, to physically power off the PP cores. ++ * ++ * @param num_cores The number of desired cores ++ * @return 0 on success, otherwise error. -EINVAL means an invalid number of cores was specified. ++ */ ++ int mali_perf_set_num_pp_cores(unsigned int num_cores); + -+ if (data->offset >= map->alloc->nents) { -+ seq_printf(m, "%016llx: Unbacked page\n\n", (map->start_pfn + -+ data->offset) << PAGE_SHIFT); -+ goto out; -+ } ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h +new file mode 100755 +index 000000000..686708eae +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h +@@ -0,0 +1,97 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ if (!(map->flags & KBASE_REG_CPU_CACHED)) -+ prot = pgprot_writecombine(prot); ++#ifndef __MALI_UTGARD_IOCTL_H__ ++#define __MALI_UTGARD_IOCTL_H__ + -+ page = phys_to_page(as_phys_addr_t(map->alloc->pages[data->offset])); -+ mapping = vmap(&page, 1, VM_MAP, prot); -+ if (!mapping) -+ goto out; ++#include ++#include ++#include /* file system operations */ + -+ for (i = 0; i < PAGE_SIZE; i += 4*sizeof(*mapping)) { -+ seq_printf(m, "%016llx:", i + ((map->start_pfn + -+ data->offset) << PAGE_SHIFT)); ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ for (j = 0; j < 4*sizeof(*mapping); j += sizeof(*mapping)) -+ seq_printf(m, " %08x", mapping[(i+j)/sizeof(*mapping)]); -+ seq_putc(m, '\n'); -+ } ++/** ++ * @file mali_kernel_ioctl.h ++ * Interface to the Linux device driver. ++ * This file describes the interface needed to use the Linux device driver. ++ * Its interface is designed to used by the HAL implementation through a thin arch layer. ++ */ + -+ vunmap(mapping); ++/** ++ * ioctl commands ++ */ + -+ seq_putc(m, '\n'); ++#define MALI_IOC_BASE 0x82 ++#define MALI_IOC_CORE_BASE (_MALI_UK_CORE_SUBSYSTEM + MALI_IOC_BASE) ++#define MALI_IOC_MEMORY_BASE (_MALI_UK_MEMORY_SUBSYSTEM + MALI_IOC_BASE) ++#define MALI_IOC_PP_BASE (_MALI_UK_PP_SUBSYSTEM + MALI_IOC_BASE) ++#define MALI_IOC_GP_BASE (_MALI_UK_GP_SUBSYSTEM + MALI_IOC_BASE) ++#define MALI_IOC_PROFILING_BASE (_MALI_UK_PROFILING_SUBSYSTEM + MALI_IOC_BASE) ++#define MALI_IOC_VSYNC_BASE (_MALI_UK_VSYNC_SUBSYSTEM + MALI_IOC_BASE) + -+out: -+ kbase_gpu_vm_unlock(mem_data->kctx); -+ return 0; -+} ++#define MALI_IOC_WAIT_FOR_NOTIFICATION _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_WAIT_FOR_NOTIFICATION, _mali_uk_wait_for_notification_s) ++#define MALI_IOC_GET_API_VERSION _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_GET_API_VERSION, u32) ++#define MALI_IOC_GET_API_VERSION_V2 _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_GET_API_VERSION, _mali_uk_get_api_version_v2_s) ++/* rk_ext. */ ++#define MALI_IOC_GET_RK_KO_VERSION _IOWR(MALI_IOC_CORE_BASE, _MALI_GET_RK_KO_VERSION, _mali_rk_ko_version_s) ++#define MALI_IOC_POST_NOTIFICATION _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_POST_NOTIFICATION, _mali_uk_post_notification_s) ++#define MALI_IOC_GET_USER_SETTING _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_GET_USER_SETTING, _mali_uk_get_user_setting_s) ++#define MALI_IOC_GET_USER_SETTINGS _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_GET_USER_SETTINGS, _mali_uk_get_user_settings_s) ++#define MALI_IOC_REQUEST_HIGH_PRIORITY _IOW (MALI_IOC_CORE_BASE, _MALI_UK_REQUEST_HIGH_PRIORITY, _mali_uk_request_high_priority_s) ++#define MALI_IOC_TIMELINE_GET_LATEST_POINT _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_TIMELINE_GET_LATEST_POINT, _mali_uk_timeline_get_latest_point_s) ++#define MALI_IOC_TIMELINE_WAIT _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_TIMELINE_WAIT, _mali_uk_timeline_wait_s) ++#define MALI_IOC_TIMELINE_CREATE_SYNC_FENCE _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_TIMELINE_CREATE_SYNC_FENCE, _mali_uk_timeline_create_sync_fence_s) ++#define MALI_IOC_SOFT_JOB_START _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_SOFT_JOB_START, _mali_uk_soft_job_start_s) ++#define MALI_IOC_SOFT_JOB_SIGNAL _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_SOFT_JOB_SIGNAL, _mali_uk_soft_job_signal_s) ++#define MALI_IOC_PENDING_SUBMIT _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_PENDING_SUBMIT, _mali_uk_pending_submit_s) + -+static const struct seq_operations ops = { -+ .start = debug_mem_start, -+ .next = debug_mem_next, -+ .stop = debug_mem_stop, -+ .show = debug_mem_show, -+}; ++#define MALI_IOC_MEM_ALLOC _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_ALLOC_MEM, _mali_uk_alloc_mem_s) ++#define MALI_IOC_MEM_FREE _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_FREE_MEM, _mali_uk_free_mem_s) ++#define MALI_IOC_MEM_BIND _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_BIND_MEM, _mali_uk_bind_mem_s) ++#define MALI_IOC_MEM_UNBIND _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_UNBIND_MEM, _mali_uk_unbind_mem_s) ++#define MALI_IOC_MEM_COW _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_COW_MEM, _mali_uk_cow_mem_s) ++#define MALI_IOC_MEM_COW_MODIFY_RANGE _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_COW_MODIFY_RANGE, _mali_uk_cow_modify_range_s) ++#define MALI_IOC_MEM_RESIZE _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_RESIZE_MEM, _mali_uk_mem_resize_s) ++#define MALI_IOC_MEM_DMA_BUF_GET_SIZE _IOR(MALI_IOC_MEMORY_BASE, _MALI_UK_DMA_BUF_GET_SIZE, _mali_uk_dma_buf_get_size_s) ++#define MALI_IOC_MEM_QUERY_MMU_PAGE_TABLE_DUMP_SIZE _IOR (MALI_IOC_MEMORY_BASE, _MALI_UK_QUERY_MMU_PAGE_TABLE_DUMP_SIZE, _mali_uk_query_mmu_page_table_dump_size_s) ++#define MALI_IOC_MEM_DUMP_MMU_PAGE_TABLE _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_DUMP_MMU_PAGE_TABLE, _mali_uk_dump_mmu_page_table_s) ++#define MALI_IOC_MEM_WRITE_SAFE _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_MEM_WRITE_SAFE, _mali_uk_mem_write_safe_s) + -+static int debug_mem_zone_open(struct rb_root *rbtree, -+ struct debug_mem_data *mem_data) -+{ -+ int ret = 0; -+ struct rb_node *p; -+ struct kbase_va_region *reg; -+ struct debug_mem_mapping *mapping; ++#define MALI_IOC_PP_START_JOB _IOWR(MALI_IOC_PP_BASE, _MALI_UK_PP_START_JOB, _mali_uk_pp_start_job_s) ++#define MALI_IOC_PP_AND_GP_START_JOB _IOWR(MALI_IOC_PP_BASE, _MALI_UK_PP_AND_GP_START_JOB, _mali_uk_pp_and_gp_start_job_s) ++#define MALI_IOC_PP_NUMBER_OF_CORES_GET _IOR (MALI_IOC_PP_BASE, _MALI_UK_GET_PP_NUMBER_OF_CORES, _mali_uk_get_pp_number_of_cores_s) ++#define MALI_IOC_PP_CORE_VERSION_GET _IOR (MALI_IOC_PP_BASE, _MALI_UK_GET_PP_CORE_VERSION, _mali_uk_get_pp_core_version_s) ++#define MALI_IOC_PP_DISABLE_WB _IOW (MALI_IOC_PP_BASE, _MALI_UK_PP_DISABLE_WB, _mali_uk_pp_disable_wb_s) + -+ for (p = rb_first(rbtree); p; p = rb_next(p)) { -+ reg = rb_entry(p, struct kbase_va_region, rblink); ++#define MALI_IOC_GP2_START_JOB _IOWR(MALI_IOC_GP_BASE, _MALI_UK_GP_START_JOB, _mali_uk_gp_start_job_s) ++#define MALI_IOC_GP2_NUMBER_OF_CORES_GET _IOR (MALI_IOC_GP_BASE, _MALI_UK_GET_GP_NUMBER_OF_CORES, _mali_uk_get_gp_number_of_cores_s) ++#define MALI_IOC_GP2_CORE_VERSION_GET _IOR (MALI_IOC_GP_BASE, _MALI_UK_GET_GP_CORE_VERSION, _mali_uk_get_gp_core_version_s) ++#define MALI_IOC_GP2_SUSPEND_RESPONSE _IOW (MALI_IOC_GP_BASE, _MALI_UK_GP_SUSPEND_RESPONSE,_mali_uk_gp_suspend_response_s) + -+ if (reg->gpu_alloc == NULL) -+ /* Empty region - ignore */ -+ continue; ++#define MALI_IOC_PROFILING_ADD_EVENT _IOWR(MALI_IOC_PROFILING_BASE, _MALI_UK_PROFILING_ADD_EVENT, _mali_uk_profiling_add_event_s) ++#define MALI_IOC_PROFILING_REPORT_SW_COUNTERS _IOW (MALI_IOC_PROFILING_BASE, _MALI_UK_PROFILING_REPORT_SW_COUNTERS, _mali_uk_sw_counters_report_s) ++#define MALI_IOC_PROFILING_MEMORY_USAGE_GET _IOR(MALI_IOC_PROFILING_BASE, _MALI_UK_PROFILING_MEMORY_USAGE_GET, _mali_uk_profiling_memory_usage_get_s) ++#define MALI_IOC_PROFILING_STREAM_FD_GET _IOR(MALI_IOC_PROFILING_BASE, _MALI_UK_PROFILING_STREAM_FD_GET, _mali_uk_profiling_stream_fd_get_s) ++#define MALI_IOC_PROILING_CONTROL_SET _IOR(MALI_IOC_PROFILING_BASE, _MALI_UK_PROFILING_CONTROL_SET, _mali_uk_profiling_control_set_s) + -+ mapping = kmalloc(sizeof(*mapping), GFP_KERNEL); -+ if (!mapping) { -+ ret = -ENOMEM; -+ goto out; -+ } ++#define MALI_IOC_VSYNC_EVENT_REPORT _IOW (MALI_IOC_VSYNC_BASE, _MALI_UK_VSYNC_EVENT_REPORT, _mali_uk_vsync_event_report_s) + -+ mapping->alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); -+ mapping->start_pfn = reg->start_pfn; -+ mapping->nr_pages = reg->nr_pages; -+ mapping->flags = reg->flags; -+ list_add_tail(&mapping->node, &mem_data->mapping_list); -+ } ++/* rk_ext : 对 r5p0 集æˆä¹‹åŽ, mali_so ä¸å†ä½¿ç”¨ä¸‹é¢çš„ ioctl, 而使用 MALI_IOC_GET_RK_KO_VERSION. */ ++#if 0 ++#define MALI_IOC_GET_MALI_VERSION_IN_RK30 _IOWR(MALI_IOC_CORE_BASE,_MALI_UK_GET_MALI_VERSION_IN_RK30,_mali_uk_get_mali_version_in_rk30_s *) ++#endif + -+out: -+ return ret; ++#ifdef __cplusplus +} ++#endif + -+static int debug_mem_open(struct inode *i, struct file *file) -+{ -+ struct file *kctx_file = i->i_private; -+ struct kbase_context *kctx = kctx_file->private_data; -+ struct debug_mem_data *mem_data; -+ int ret; -+ -+ ret = seq_open(file, &ops); -+ if (ret) -+ return ret; -+ -+ mem_data = kmalloc(sizeof(*mem_data), GFP_KERNEL); -+ if (!mem_data) { -+ ret = -ENOMEM; -+ goto out; -+ } -+ -+ mem_data->kctx = kctx; -+ -+ INIT_LIST_HEAD(&mem_data->mapping_list); -+ -+ get_file(kctx_file); -+ -+ kbase_gpu_vm_lock(kctx); -+ -+ ret = debug_mem_zone_open(&kctx->reg_rbtree_same, mem_data); -+ if (0 != ret) { -+ kbase_gpu_vm_unlock(kctx); -+ goto out; -+ } -+ -+ ret = debug_mem_zone_open(&kctx->reg_rbtree_exec, mem_data); -+ if (0 != ret) { -+ kbase_gpu_vm_unlock(kctx); -+ goto out; -+ } ++#endif /* __MALI_UTGARD_IOCTL_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h +new file mode 100755 +index 000000000..17d31de93 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h +@@ -0,0 +1,190 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ ret = debug_mem_zone_open(&kctx->reg_rbtree_custom, mem_data); -+ if (0 != ret) { -+ kbase_gpu_vm_unlock(kctx); -+ goto out; -+ } ++#ifndef _MALI_UTGARD_PROFILING_EVENTS_H_ ++#define _MALI_UTGARD_PROFILING_EVENTS_H_ + -+ kbase_gpu_vm_unlock(kctx); ++/* ++ * The event ID is a 32 bit value consisting of different fields ++ * reserved, 4 bits, for future use ++ * event type, 4 bits, cinstr_profiling_event_type_t ++ * event channel, 8 bits, the source of the event. ++ * event data, 16 bit field, data depending on event type ++ */ + -+ ((struct seq_file *)file->private_data)->private = mem_data; ++/** ++ * Specifies what kind of event this is ++ */ ++typedef enum { ++ MALI_PROFILING_EVENT_TYPE_SINGLE = 0 << 24, ++ MALI_PROFILING_EVENT_TYPE_START = 1 << 24, ++ MALI_PROFILING_EVENT_TYPE_STOP = 2 << 24, ++ MALI_PROFILING_EVENT_TYPE_SUSPEND = 3 << 24, ++ MALI_PROFILING_EVENT_TYPE_RESUME = 4 << 24, ++} cinstr_profiling_event_type_t; + -+ return 0; + -+out: -+ if (mem_data) { -+ while (!list_empty(&mem_data->mapping_list)) { -+ struct debug_mem_mapping *mapping; ++/** ++ * Secifies the channel/source of the event ++ */ ++typedef enum { ++ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE = 0 << 16, ++ MALI_PROFILING_EVENT_CHANNEL_GP0 = 1 << 16, ++ MALI_PROFILING_EVENT_CHANNEL_PP0 = 5 << 16, ++ MALI_PROFILING_EVENT_CHANNEL_PP1 = 6 << 16, ++ MALI_PROFILING_EVENT_CHANNEL_PP2 = 7 << 16, ++ MALI_PROFILING_EVENT_CHANNEL_PP3 = 8 << 16, ++ MALI_PROFILING_EVENT_CHANNEL_PP4 = 9 << 16, ++ MALI_PROFILING_EVENT_CHANNEL_PP5 = 10 << 16, ++ MALI_PROFILING_EVENT_CHANNEL_PP6 = 11 << 16, ++ MALI_PROFILING_EVENT_CHANNEL_PP7 = 12 << 16, ++ MALI_PROFILING_EVENT_CHANNEL_GPU = 21 << 16, ++} cinstr_profiling_event_channel_t; + -+ mapping = list_first_entry(&mem_data->mapping_list, -+ struct debug_mem_mapping, node); -+ kbase_mem_phy_alloc_put(mapping->alloc); -+ list_del(&mapping->node); -+ kfree(mapping); -+ } -+ fput(kctx_file); -+ kfree(mem_data); -+ } -+ seq_release(i, file); -+ return ret; -+} + -+static int debug_mem_release(struct inode *inode, struct file *file) -+{ -+ struct file *kctx_file = inode->i_private; -+ struct seq_file *sfile = file->private_data; -+ struct debug_mem_data *mem_data = sfile->private; -+ struct debug_mem_mapping *mapping; ++#define MALI_PROFILING_MAKE_EVENT_CHANNEL_GP(num) (((MALI_PROFILING_EVENT_CHANNEL_GP0 >> 16) + (num)) << 16) ++#define MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(num) (((MALI_PROFILING_EVENT_CHANNEL_PP0 >> 16) + (num)) << 16) + -+ seq_release(inode, file); ++/** ++ * These events are applicable when the type MALI_PROFILING_EVENT_TYPE_SINGLE is used from software channel ++ */ ++typedef enum { ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_NONE = 0, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_NEW_FRAME = 1, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_FLUSH = 2, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_SWAP_BUFFERS = 3, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_FB_EVENT = 4, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_GP_ENQUEUE = 5, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_PP_ENQUEUE = 6, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_READBACK = 7, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_WRITEBACK = 8, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_ENTER_API_FUNC = 10, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_LEAVE_API_FUNC = 11, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_DISCARD_ATTACHMENTS = 13, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_UMP_TRY_LOCK = 53, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_UMP_LOCK = 54, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_UMP_UNLOCK = 55, ++ MALI_PROFILING_EVENT_REASON_SINGLE_LOCK_CONTENDED = 56, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_MALI_FENCE_DUP = 57, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_SET_PP_JOB_FENCE = 58, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_WAIT_SYNC = 59, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_CREATE_FENCE_SYNC = 60, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_CREATE_NATIVE_FENCE_SYNC = 61, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_FENCE_FLUSH = 62, ++ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_FLUSH_SERVER_WAITS = 63, ++} cinstr_profiling_event_reason_single_sw_t; + -+ while (!list_empty(&mem_data->mapping_list)) { -+ mapping = list_first_entry(&mem_data->mapping_list, -+ struct debug_mem_mapping, node); -+ kbase_mem_phy_alloc_put(mapping->alloc); -+ list_del(&mapping->node); -+ kfree(mapping); -+ } ++/** ++ * These events are applicable when the type MALI_PROFILING_EVENT_TYPE_START/STOP is used from software channel ++ * to inform whether the core is physical or virtual ++ */ ++typedef enum { ++ MALI_PROFILING_EVENT_REASON_START_STOP_HW_PHYSICAL = 0, ++ MALI_PROFILING_EVENT_REASON_START_STOP_HW_VIRTUAL = 1, ++} cinstr_profiling_event_reason_start_stop_hw_t; + -+ kfree(mem_data); ++/** ++ * These events are applicable when the type MALI_PROFILING_EVENT_TYPE_START/STOP is used from software channel ++ */ ++typedef enum { ++ /*MALI_PROFILING_EVENT_REASON_START_STOP_SW_NONE = 0,*/ ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_MALI = 1, ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_CALLBACK_THREAD = 2, ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_WORKER_THREAD = 3, ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF = 4, ++ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF = 5, ++} cinstr_profiling_event_reason_start_stop_sw_t; + -+ fput(kctx_file); ++/** ++ * These events are applicable when the type MALI_PROFILING_EVENT_TYPE_SUSPEND/RESUME is used from software channel ++ */ ++typedef enum { ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_NONE = 0, /* used */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_PIPELINE_FULL = 1, /* NOT used */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_VSYNC = 26, /* used in some build configurations */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_FB_IFRAME_WAIT = 27, /* USED */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_FB_IFRAME_SYNC = 28, /* USED */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_VG_WAIT_FILTER_CLEANUP = 29, /* used */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_VG_WAIT_TEXTURE = 30, /* used */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_GLES_WAIT_MIPLEVEL = 31, /* used */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_GLES_WAIT_READPIXELS = 32, /* used */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_EGL_WAIT_SWAP_IMMEDIATE = 33, /* NOT used */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_ICS_QUEUE_BUFFER = 34, /* USED */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_ICS_DEQUEUE_BUFFER = 35, /* USED */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_UMP_LOCK = 36, /* Not currently used */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_X11_GLOBAL_LOCK = 37, /* Not currently used */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_X11_SWAP = 38, /* Not currently used */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_MALI_EGL_IMAGE_SYNC_WAIT = 39, /* USED */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_GP_JOB_HANDLING = 40, /* USED */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_PP_JOB_HANDLING = 41, /* USED */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_EGL_MALI_FENCE_MERGE = 42, /* USED */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_EGL_MALI_FENCE_DUP = 43, ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_EGL_FLUSH_SERVER_WAITS = 44, ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_EGL_WAIT_SYNC = 45, /* USED */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_FB_JOBS_WAIT = 46, /* USED */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_FB_NOFRAMES_WAIT = 47, /* USED */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_FB_NOJOBS_WAIT = 48, /* USED */ ++ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_SUBMIT_LIMITER_WAIT = 49, /* USED */ ++} cinstr_profiling_event_reason_suspend_resume_sw_t; + -+ return 0; -+} ++/** ++ * These events are applicable when the type MALI_PROFILING_EVENT_TYPE_SINGLE is used from a HW channel (GPx+PPx) ++ */ ++typedef enum { ++ MALI_PROFILING_EVENT_REASON_SINGLE_HW_NONE = 0, ++ MALI_PROFILING_EVENT_REASON_SINGLE_HW_INTERRUPT = 1, ++ MALI_PROFILING_EVENT_REASON_SINGLE_HW_FLUSH = 2, ++} cinstr_profiling_event_reason_single_hw_t; + -+static const struct file_operations kbase_debug_mem_view_fops = { -+ .open = debug_mem_open, -+ .release = debug_mem_release, -+ .read = seq_read, -+ .llseek = seq_lseek -+}; ++/** ++ * These events are applicable when the type MALI_PROFILING_EVENT_TYPE_SINGLE is used from the GPU channel ++ */ ++typedef enum { ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_NONE = 0, ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE = 1, ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_L20_COUNTERS = 2, ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_L21_COUNTERS = 3, ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_L22_COUNTERS = 4, ++} cinstr_profiling_event_reason_single_gpu_t; + +/** -+ * kbase_debug_mem_view_init - Initialise the mem_view sysfs file -+ * @kctx_file: The /dev/mali0 file instance for the context -+ * -+ * This function creates a "mem_view" file which can be used to get a view of -+ * the context's memory as the GPU sees it (i.e. using the GPU's page tables). -+ * -+ * The file is cleaned up by a call to debugfs_remove_recursive() deleting the -+ * parent directory. ++ * These values are applicable for the 3rd data parameter when ++ * the type MALI_PROFILING_EVENT_TYPE_START is used from the software channel ++ * with the MALI_PROFILING_EVENT_REASON_START_STOP_BOTTOM_HALF reason. + */ -+void kbase_debug_mem_view_init(struct file *kctx_file) -+{ -+ struct kbase_context *kctx = kctx_file->private_data; ++typedef enum { ++ MALI_PROFILING_EVENT_DATA_CORE_GP0 = 1, ++ MALI_PROFILING_EVENT_DATA_CORE_PP0 = 5, ++ MALI_PROFILING_EVENT_DATA_CORE_PP1 = 6, ++ MALI_PROFILING_EVENT_DATA_CORE_PP2 = 7, ++ MALI_PROFILING_EVENT_DATA_CORE_PP3 = 8, ++ MALI_PROFILING_EVENT_DATA_CORE_PP4 = 9, ++ MALI_PROFILING_EVENT_DATA_CORE_PP5 = 10, ++ MALI_PROFILING_EVENT_DATA_CORE_PP6 = 11, ++ MALI_PROFILING_EVENT_DATA_CORE_PP7 = 12, ++ MALI_PROFILING_EVENT_DATA_CORE_GP0_MMU = 22, /* GP0 + 21 */ ++ MALI_PROFILING_EVENT_DATA_CORE_PP0_MMU = 26, /* PP0 + 21 */ ++ MALI_PROFILING_EVENT_DATA_CORE_PP1_MMU = 27, /* PP1 + 21 */ ++ MALI_PROFILING_EVENT_DATA_CORE_PP2_MMU = 28, /* PP2 + 21 */ ++ MALI_PROFILING_EVENT_DATA_CORE_PP3_MMU = 29, /* PP3 + 21 */ ++ MALI_PROFILING_EVENT_DATA_CORE_PP4_MMU = 30, /* PP4 + 21 */ ++ MALI_PROFILING_EVENT_DATA_CORE_PP5_MMU = 31, /* PP5 + 21 */ ++ MALI_PROFILING_EVENT_DATA_CORE_PP6_MMU = 32, /* PP6 + 21 */ ++ MALI_PROFILING_EVENT_DATA_CORE_PP7_MMU = 33, /* PP7 + 21 */ + -+ debugfs_create_file("mem_view", S_IRUGO, kctx->kctx_dentry, kctx_file, -+ &kbase_debug_mem_view_fops); -+} ++} cinstr_profiling_event_data_core_t; + -+#endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_mem_view.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_mem_view.h ++#define MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP(num) (MALI_PROFILING_EVENT_DATA_CORE_GP0 + (num)) ++#define MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP_MMU(num) (MALI_PROFILING_EVENT_DATA_CORE_GP0_MMU + (num)) ++#define MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP(num) (MALI_PROFILING_EVENT_DATA_CORE_PP0 + (num)) ++#define MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP_MMU(num) (MALI_PROFILING_EVENT_DATA_CORE_PP0_MMU + (num)) ++ ++ ++#endif /*_MALI_UTGARD_PROFILING_EVENTS_H_*/ +diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h new file mode 100755 -index 000000000000..20ab51a776c6 +index 000000000..c1927d145 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_mem_view.h -@@ -0,0 +1,25 @@ ++++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h +@@ -0,0 +1,305 @@ +/* -+ * -+ * (C) COPYRIGHT 2013-2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2013, 2015-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_UTGARD_PROFILING_GATOR_API_H__ ++#define __MALI_UTGARD_PROFILING_GATOR_API_H__ + ++#ifdef __cplusplus ++extern "C" { ++#endif + -+#ifndef _KBASE_DEBUG_MEM_VIEW_H -+#define _KBASE_DEBUG_MEM_VIEW_H ++#define MALI_PROFILING_API_VERSION 4 + -+#include ++#define MAX_NUM_L2_CACHE_CORES 3 ++#define MAX_NUM_FP_CORES 8 ++#define MAX_NUM_VP_CORES 1 + -+void kbase_debug_mem_view_init(struct file *kctx_file); ++#define _MALI_SPCIAL_COUNTER_DESCRIPTIONS \ ++ { \ ++ "Filmstrip_cnt0", \ ++ "Frequency", \ ++ "Voltage", \ ++ "vertex", \ ++ "fragment", \ ++ "Total_alloc_pages", \ ++ }; + -+#endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_defs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_defs.h -new file mode 100755 -index 000000000000..73721f5da139 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_defs.h -@@ -0,0 +1,1641 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++#define _MALI_MEM_COUTNER_DESCRIPTIONS \ ++ { \ ++ "untyped_memory", \ ++ "vertex_index_buffer", \ ++ "texture_buffer", \ ++ "varying_buffer", \ ++ "render_target", \ ++ "pbuffer_buffer", \ ++ "plbu_heap", \ ++ "pointer_array_buffer", \ ++ "slave_tilelist", \ ++ "untyped_gp_cmdlist", \ ++ "polygon_cmdlist", \ ++ "texture_descriptor", \ ++ "render_state_word", \ ++ "shader", \ ++ "stream_buffer", \ ++ "fragment_stack", \ ++ "uniform", \ ++ "untyped_frame_pool", \ ++ "untyped_surface", \ ++ }; + ++/** The list of events supported by the Mali DDK. */ ++typedef enum { ++ /* Vertex processor activity */ ++ ACTIVITY_VP_0 = 0, + ++ /* Fragment processor activity */ ++ ACTIVITY_FP_0, ++ ACTIVITY_FP_1, ++ ACTIVITY_FP_2, ++ ACTIVITY_FP_3, ++ ACTIVITY_FP_4, ++ ACTIVITY_FP_5, ++ ACTIVITY_FP_6, ++ ACTIVITY_FP_7, + ++ /* L2 cache counters */ ++ COUNTER_L2_0_C0, ++ COUNTER_L2_0_C1, ++ COUNTER_L2_1_C0, ++ COUNTER_L2_1_C1, ++ COUNTER_L2_2_C0, ++ COUNTER_L2_2_C1, + ++ /* Vertex processor counters */ ++ COUNTER_VP_0_C0, ++ COUNTER_VP_0_C1, + -+/** -+ * @file mali_kbase_defs.h -+ * -+ * Defintions (types, defines, etcs) common to Kbase. They are placed here to -+ * allow the hierarchy of header files to work. -+ */ ++ /* Fragment processor counters */ ++ COUNTER_FP_0_C0, ++ COUNTER_FP_0_C1, ++ COUNTER_FP_1_C0, ++ COUNTER_FP_1_C1, ++ COUNTER_FP_2_C0, ++ COUNTER_FP_2_C1, ++ COUNTER_FP_3_C0, ++ COUNTER_FP_3_C1, ++ COUNTER_FP_4_C0, ++ COUNTER_FP_4_C1, ++ COUNTER_FP_5_C0, ++ COUNTER_FP_5_C1, ++ COUNTER_FP_6_C0, ++ COUNTER_FP_6_C1, ++ COUNTER_FP_7_C0, ++ COUNTER_FP_7_C1, + -+#ifndef _KBASE_DEFS_H_ -+#define _KBASE_DEFS_H_ ++ /* ++ * If more hardware counters are added, the _mali_osk_hw_counter_table ++ * below should also be updated. ++ */ + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++ /* EGL software counters */ ++ COUNTER_EGL_BLIT_TIME, + -+#include -+#include -+#include -+#include -+#include ++ /* GLES software counters */ ++ COUNTER_GLES_DRAW_ELEMENTS_CALLS, ++ COUNTER_GLES_DRAW_ELEMENTS_NUM_INDICES, ++ COUNTER_GLES_DRAW_ELEMENTS_NUM_TRANSFORMED, ++ COUNTER_GLES_DRAW_ARRAYS_CALLS, ++ COUNTER_GLES_DRAW_ARRAYS_NUM_TRANSFORMED, ++ COUNTER_GLES_DRAW_POINTS, ++ COUNTER_GLES_DRAW_LINES, ++ COUNTER_GLES_DRAW_LINE_LOOP, ++ COUNTER_GLES_DRAW_LINE_STRIP, ++ COUNTER_GLES_DRAW_TRIANGLES, ++ COUNTER_GLES_DRAW_TRIANGLE_STRIP, ++ COUNTER_GLES_DRAW_TRIANGLE_FAN, ++ COUNTER_GLES_NON_VBO_DATA_COPY_TIME, ++ COUNTER_GLES_UNIFORM_BYTES_COPIED_TO_MALI, ++ COUNTER_GLES_UPLOAD_TEXTURE_TIME, ++ COUNTER_GLES_UPLOAD_VBO_TIME, ++ COUNTER_GLES_NUM_FLUSHES, ++ COUNTER_GLES_NUM_VSHADERS_GENERATED, ++ COUNTER_GLES_NUM_FSHADERS_GENERATED, ++ COUNTER_GLES_VSHADER_GEN_TIME, ++ COUNTER_GLES_FSHADER_GEN_TIME, ++ COUNTER_GLES_INPUT_TRIANGLES, ++ COUNTER_GLES_VXCACHE_HIT, ++ COUNTER_GLES_VXCACHE_MISS, ++ COUNTER_GLES_VXCACHE_COLLISION, ++ COUNTER_GLES_CULLED_TRIANGLES, ++ COUNTER_GLES_CULLED_LINES, ++ COUNTER_GLES_BACKFACE_TRIANGLES, ++ COUNTER_GLES_GBCLIP_TRIANGLES, ++ COUNTER_GLES_GBCLIP_LINES, ++ COUNTER_GLES_TRIANGLES_DRAWN, ++ COUNTER_GLES_DRAWCALL_TIME, ++ COUNTER_GLES_TRIANGLES_COUNT, ++ COUNTER_GLES_INDEPENDENT_TRIANGLES_COUNT, ++ COUNTER_GLES_STRIP_TRIANGLES_COUNT, ++ COUNTER_GLES_FAN_TRIANGLES_COUNT, ++ COUNTER_GLES_LINES_COUNT, ++ COUNTER_GLES_INDEPENDENT_LINES_COUNT, ++ COUNTER_GLES_STRIP_LINES_COUNT, ++ COUNTER_GLES_LOOP_LINES_COUNT, + -+#ifdef CONFIG_MALI_FPGA_BUS_LOGGER -+#include -+#endif ++ /* Special counter */ + ++ /* Framebuffer capture pseudo-counter */ ++ COUNTER_FILMSTRIP, ++ COUNTER_FREQUENCY, ++ COUNTER_VOLTAGE, ++ COUNTER_VP_ACTIVITY, ++ COUNTER_FP_ACTIVITY, ++ COUNTER_TOTAL_ALLOC_PAGES, + -+#ifdef CONFIG_KDS -+#include -+#endif /* CONFIG_KDS */ ++ /* Memory usage counter */ ++ COUNTER_MEM_UNTYPED, ++ COUNTER_MEM_VB_IB, ++ COUNTER_MEM_TEXTURE, ++ COUNTER_MEM_VARYING, ++ COUNTER_MEM_RT, ++ COUNTER_MEM_PBUFFER, ++ /* memory usages for gp command */ ++ COUNTER_MEM_PLBU_HEAP, ++ COUNTER_MEM_POINTER_ARRAY, ++ COUNTER_MEM_SLAVE_TILELIST, ++ COUNTER_MEM_UNTYPE_GP_CMDLIST, ++ /* memory usages for polygon list command */ ++ COUNTER_MEM_POLYGON_CMDLIST, ++ /* memory usages for pp command */ ++ COUNTER_MEM_TD, ++ COUNTER_MEM_RSW, ++ /* other memory usages */ ++ COUNTER_MEM_SHADER, ++ COUNTER_MEM_STREAMS, ++ COUNTER_MEM_FRAGMENT_STACK, ++ COUNTER_MEM_UNIFORM, ++ /* Special mem usage, which is used for mem pool allocation */ ++ COUNTER_MEM_UNTYPE_MEM_POOL, ++ COUNTER_MEM_UNTYPE_SURFACE, + -+#if defined(CONFIG_SYNC) -+#include -+#else -+#include "mali_kbase_fence_defs.h" -+#endif ++ NUMBER_OF_EVENTS ++} _mali_osk_counter_id; + -+#ifdef CONFIG_DEBUG_FS -+#include -+#endif /* CONFIG_DEBUG_FS */ ++#define FIRST_ACTIVITY_EVENT ACTIVITY_VP_0 ++#define LAST_ACTIVITY_EVENT ACTIVITY_FP_7 + -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+#include -+#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ ++#define FIRST_HW_COUNTER COUNTER_L2_0_C0 ++#define LAST_HW_COUNTER COUNTER_FP_7_C1 + -+#include -+#include ++#define FIRST_SW_COUNTER COUNTER_EGL_BLIT_TIME ++#define LAST_SW_COUNTER COUNTER_GLES_LOOP_LINES_COUNT + -+#if defined(CONFIG_PM_RUNTIME) || \ -+ (defined(CONFIG_PM) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) -+#define KBASE_PM_RUNTIME 1 -+#endif ++#define FIRST_SPECIAL_COUNTER COUNTER_FILMSTRIP ++#define LAST_SPECIAL_COUNTER COUNTER_TOTAL_ALLOC_PAGES + -+/** Enable SW tracing when set */ -+#ifdef CONFIG_MALI_BIFROST_ENABLE_TRACE -+#define KBASE_TRACE_ENABLE 1 -+#endif ++#define FIRST_MEM_COUNTER COUNTER_MEM_UNTYPED ++#define LAST_MEM_COUNTER COUNTER_MEM_UNTYPE_SURFACE + -+#ifndef KBASE_TRACE_ENABLE -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+#define KBASE_TRACE_ENABLE 1 -+#else -+#define KBASE_TRACE_ENABLE 0 -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+#endif /* KBASE_TRACE_ENABLE */ ++#define MALI_PROFILING_MEM_COUNTERS_NUM (LAST_MEM_COUNTER - FIRST_MEM_COUNTER + 1) ++#define MALI_PROFILING_SPECIAL_COUNTERS_NUM (LAST_SPECIAL_COUNTER - FIRST_SPECIAL_COUNTER + 1) ++#define MALI_PROFILING_SW_COUNTERS_NUM (LAST_SW_COUNTER - FIRST_SW_COUNTER + 1) + -+/** Dump Job slot trace on error (only active if KBASE_TRACE_ENABLE != 0) */ -+#define KBASE_TRACE_DUMP_ON_JOB_SLOT_ERROR 1 ++/** ++ * Define the stream header type for porfiling stream. ++ */ ++#define STREAM_HEADER_FRAMEBUFFER 0x05 /* The stream packet header type for framebuffer dumping. */ ++#define STREAM_HEADER_COUNTER_VALUE 0x09 /* The stream packet header type for hw/sw/memory counter sampling. */ ++#define STREAM_HEADER_CORE_ACTIVITY 0x0a /* The stream packet header type for activity counter sampling. */ ++#define STREAM_HEADER_SIZE 5 + +/** -+ * Number of milliseconds before resetting the GPU when a job cannot be "zapped" from the hardware. -+ * Note that the time is actually ZAP_TIMEOUT+SOFT_STOP_RESET_TIMEOUT between the context zap starting and the GPU -+ * actually being reset to give other contexts time for their jobs to be soft-stopped and removed from the hardware -+ * before resetting. ++ * Define the packet header type of profiling control packet. + */ -+#define ZAP_TIMEOUT 1000 ++#define PACKET_HEADER_ERROR 0x80 /* The response packet header type if error. */ ++#define PACKET_HEADER_ACK 0x81 /* The response packet header type if OK. */ ++#define PACKET_HEADER_COUNTERS_REQUEST 0x82 /* The control packet header type to request counter information from ddk. */ ++#define PACKET_HEADER_COUNTERS_ACK 0x83 /* The response packet header type to send out counter information. */ ++#define PACKET_HEADER_COUNTERS_ENABLE 0x84 /* The control packet header type to enable counters. */ ++#define PACKET_HEADER_START_CAPTURE_VALUE 0x85 /* The control packet header type to start capture values. */ + -+/** Number of milliseconds before we time out on a GPU soft/hard reset */ -+#define RESET_TIMEOUT 500 ++#define PACKET_HEADER_SIZE 5 + +/** -+ * Prevent soft-stops from occuring in scheduling situations -+ * -+ * This is not due to HW issues, but when scheduling is desired to be more predictable. -+ * -+ * Therefore, soft stop may still be disabled due to HW issues. -+ * -+ * @note Soft stop will still be used for non-scheduling purposes e.g. when terminating a context. -+ * -+ * @note if not in use, define this value to 0 instead of \#undef'ing it ++ * Structure to pass performance counter data of a Mali core + */ -+#define KBASE_DISABLE_SCHEDULING_SOFT_STOPS 0 ++typedef struct _mali_profiling_core_counters { ++ u32 source0; ++ u32 value0; ++ u32 source1; ++ u32 value1; ++} _mali_profiling_core_counters; + +/** -+ * Prevent hard-stops from occuring in scheduling situations -+ * -+ * This is not due to HW issues, but when scheduling is desired to be more predictable. -+ * -+ * @note Hard stop will still be used for non-scheduling purposes e.g. when terminating a context. -+ * -+ * @note if not in use, define this value to 0 instead of \#undef'ing it ++ * Structure to pass performance counter data of Mali L2 cache cores + */ -+#define KBASE_DISABLE_SCHEDULING_HARD_STOPS 0 ++typedef struct _mali_profiling_l2_counter_values { ++ struct _mali_profiling_core_counters cores[MAX_NUM_L2_CACHE_CORES]; ++} _mali_profiling_l2_counter_values; + +/** -+ * The maximum number of Job Slots to support in the Hardware. ++ * Structure to pass data defining Mali instance in use: + * -+ * You can optimize this down if your target devices will only ever support a -+ * small number of job slots. ++ * mali_product_id - Mali product id ++ * mali_version_major - Mali version major number ++ * mali_version_minor - Mali version minor number ++ * num_of_l2_cores - number of L2 cache cores ++ * num_of_fp_cores - number of fragment processor cores ++ * num_of_vp_cores - number of vertex processor cores + */ -+#define BASE_JM_MAX_NR_SLOTS 3 ++typedef struct _mali_profiling_mali_version { ++ u32 mali_product_id; ++ u32 mali_version_major; ++ u32 mali_version_minor; ++ u32 num_of_l2_cores; ++ u32 num_of_fp_cores; ++ u32 num_of_vp_cores; ++} _mali_profiling_mali_version; + +/** -+ * The maximum number of Address Spaces to support in the Hardware. -+ * -+ * You can optimize this down if your target devices will only ever support a -+ * small number of Address Spaces ++ * Structure to define the mali profiling counter struct. + */ -+#define BASE_MAX_NR_AS 16 ++typedef struct mali_profiling_counter { ++ char counter_name[40]; ++ u32 counter_id; ++ u32 counter_event; ++ u32 prev_counter_value; ++ u32 current_counter_value; ++ u32 key; ++ int enabled; ++} mali_profiling_counter; + -+/* mmu */ -+#define MIDGARD_MMU_VA_BITS 48 ++/* ++ * List of possible actions to be controlled by Streamline. ++ * The following numbers are used by gator to control the frame buffer dumping and s/w counter reporting. ++ * We cannot use the enums in mali_uk_types.h because they are unknown inside gator. ++ */ ++#define FBDUMP_CONTROL_ENABLE (1) ++#define FBDUMP_CONTROL_RATE (2) ++#define SW_COUNTER_ENABLE (3) ++#define FBDUMP_CONTROL_RESIZE_FACTOR (4) ++#define MEM_COUNTER_ENABLE (5) ++#define ANNOTATE_PROFILING_ENABLE (6) + -+#define MIDGARD_MMU_LEVEL(x) (x) ++void _mali_profiling_control(u32 action, u32 value); + -+#if MIDGARD_MMU_VA_BITS > 39 -+#define MIDGARD_MMU_TOPLEVEL MIDGARD_MMU_LEVEL(0) -+#else -+#define MIDGARD_MMU_TOPLEVEL MIDGARD_MMU_LEVEL(1) ++u32 _mali_profiling_get_l2_counters(_mali_profiling_l2_counter_values *values); ++ ++int _mali_profiling_set_event(u32 counter_id, s32 event_id); ++ ++u32 _mali_profiling_get_api_version(void); ++ ++void _mali_profiling_get_mali_version(struct _mali_profiling_mali_version *values); ++ ++#ifdef __cplusplus ++} +#endif + -+#define MIDGARD_MMU_BOTTOMLEVEL MIDGARD_MMU_LEVEL(3) ++#endif /* __MALI_UTGARD_PROFILING_GATOR_API_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h +new file mode 100755 +index 000000000..34656f09b +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h +@@ -0,0 +1,1108 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+#define GROWABLE_FLAGS_REQUIRED (KBASE_REG_PF_GROW | KBASE_REG_GPU_WR) ++/** ++ * @file mali_uk_types.h ++ * Defines the types and constants used in the user-kernel interface ++ */ + -+/** setting in kbase_context::as_nr that indicates it's invalid */ -+#define KBASEP_AS_NR_INVALID (-1) ++#ifndef __MALI_UTGARD_UK_TYPES_H__ ++#define __MALI_UTGARD_UK_TYPES_H__ + -+#define KBASE_LOCK_REGION_MAX_SIZE (63) -+#define KBASE_LOCK_REGION_MIN_SIZE (11) ++#ifdef __cplusplus ++extern "C" { ++#endif + -+#define KBASE_TRACE_SIZE_LOG2 8 /* 256 entries */ -+#define KBASE_TRACE_SIZE (1 << KBASE_TRACE_SIZE_LOG2) -+#define KBASE_TRACE_MASK ((1 << KBASE_TRACE_SIZE_LOG2)-1) ++/* Iteration functions depend on these values being consecutive. */ ++#define MALI_UK_TIMELINE_GP 0 ++#define MALI_UK_TIMELINE_PP 1 ++#define MALI_UK_TIMELINE_SOFT 2 ++#define MALI_UK_TIMELINE_MAX 3 + -+#include "mali_kbase_js_defs.h" -+#include "mali_kbase_hwaccess_defs.h" ++#define MALI_UK_BIG_VARYING_SIZE (1024*1024*2) + -+#define KBASEP_FORCE_REPLAY_DISABLED 0 ++typedef struct { ++ u32 points[MALI_UK_TIMELINE_MAX]; ++ s32 sync_fd; ++} _mali_uk_fence_t; + -+/* Maximum force replay limit when randomization is enabled */ -+#define KBASEP_FORCE_REPLAY_RANDOM_LIMIT 16 ++/** ++ * @addtogroup uddapi Unified Device Driver (UDD) APIs ++ * ++ * @{ ++ */ + -+/** Atom has been previously soft-stoppped */ -+#define KBASE_KATOM_FLAG_BEEN_SOFT_STOPPPED (1<<1) -+/** Atom has been previously retried to execute */ -+#define KBASE_KATOM_FLAGS_RERUN (1<<2) -+#define KBASE_KATOM_FLAGS_JOBCHAIN (1<<3) -+/** Atom has been previously hard-stopped. */ -+#define KBASE_KATOM_FLAG_BEEN_HARD_STOPPED (1<<4) -+/** Atom has caused us to enter disjoint state */ -+#define KBASE_KATOM_FLAG_IN_DISJOINT (1<<5) -+/* Atom blocked on cross-slot dependency */ -+#define KBASE_KATOM_FLAG_X_DEP_BLOCKED (1<<7) -+/* Atom has fail dependency on cross-slot dependency */ -+#define KBASE_KATOM_FLAG_FAIL_BLOCKER (1<<8) -+/* Atom is currently in the list of atoms blocked on cross-slot dependencies */ -+#define KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST (1<<9) -+/* Atom is currently holding a context reference */ -+#define KBASE_KATOM_FLAG_HOLDING_CTX_REF (1<<10) -+/* Atom requires GPU to be in protected mode */ -+#define KBASE_KATOM_FLAG_PROTECTED (1<<11) -+/* Atom has been stored in runnable_tree */ -+#define KBASE_KATOM_FLAG_JSCTX_IN_TREE (1<<12) ++/** ++ * @addtogroup u_k_api UDD User/Kernel Interface (U/K) APIs ++ * ++ * @{ ++ */ + -+/* SW related flags about types of JS_COMMAND action -+ * NOTE: These must be masked off by JS_COMMAND_MASK */ ++/** @defgroup _mali_uk_core U/K Core ++ * @{ */ + -+/** This command causes a disjoint event */ -+#define JS_COMMAND_SW_CAUSES_DISJOINT 0x100 ++/** Definition of subsystem numbers, to assist in creating a unique identifier ++ * for each U/K call. ++ * ++ * @see _mali_uk_functions */ ++typedef enum { ++ _MALI_UK_CORE_SUBSYSTEM, /**< Core Group of U/K calls */ ++ _MALI_UK_MEMORY_SUBSYSTEM, /**< Memory Group of U/K calls */ ++ _MALI_UK_PP_SUBSYSTEM, /**< Fragment Processor Group of U/K calls */ ++ _MALI_UK_GP_SUBSYSTEM, /**< Vertex Processor Group of U/K calls */ ++ _MALI_UK_PROFILING_SUBSYSTEM, /**< Profiling Group of U/K calls */ ++ _MALI_UK_VSYNC_SUBSYSTEM, /**< VSYNC Group of U/K calls */ ++} _mali_uk_subsystem_t; + -+/** Bitmask of all SW related flags */ -+#define JS_COMMAND_SW_BITS (JS_COMMAND_SW_CAUSES_DISJOINT) ++/** Within a function group each function has its unique sequence number ++ * to assist in creating a unique identifier for each U/K call. ++ * ++ * An ordered pair of numbers selected from ++ * ( \ref _mali_uk_subsystem_t,\ref _mali_uk_functions) will uniquely identify the ++ * U/K call across all groups of functions, and all functions. */ ++typedef enum { ++ /** Core functions */ + -+#if (JS_COMMAND_SW_BITS & JS_COMMAND_MASK) -+#error JS_COMMAND_SW_BITS not masked off by JS_COMMAND_MASK. Must update JS_COMMAND_SW_<..> bitmasks -+#endif ++ _MALI_UK_OPEN = 0, /**< _mali_ukk_open() */ ++ _MALI_UK_CLOSE, /**< _mali_ukk_close() */ ++ _MALI_UK_WAIT_FOR_NOTIFICATION, /**< _mali_ukk_wait_for_notification() */ ++ _MALI_UK_GET_API_VERSION, /**< _mali_ukk_get_api_version() */ ++ _MALI_UK_POST_NOTIFICATION, /**< _mali_ukk_post_notification() */ ++ _MALI_UK_GET_USER_SETTING, /**< _mali_ukk_get_user_setting() *//**< [out] */ ++ _MALI_UK_GET_USER_SETTINGS, /**< _mali_ukk_get_user_settings() *//**< [out] */ ++ _MALI_UK_REQUEST_HIGH_PRIORITY, /**< _mali_ukk_request_high_priority() */ ++ _MALI_UK_TIMELINE_GET_LATEST_POINT, /**< _mali_ukk_timeline_get_latest_point() */ ++ _MALI_UK_TIMELINE_WAIT, /**< _mali_ukk_timeline_wait() */ ++ _MALI_UK_TIMELINE_CREATE_SYNC_FENCE, /**< _mali_ukk_timeline_create_sync_fence() */ ++ _MALI_UK_SOFT_JOB_START, /**< _mali_ukk_soft_job_start() */ ++ _MALI_UK_SOFT_JOB_SIGNAL, /**< _mali_ukk_soft_job_signal() */ ++ _MALI_UK_PENDING_SUBMIT, /**< _mali_ukk_pending_submit() */ + -+/** Soft-stop command that causes a Disjoint event. This of course isn't -+ * entirely masked off by JS_COMMAND_MASK */ -+#define JS_COMMAND_SOFT_STOP_WITH_SW_DISJOINT \ -+ (JS_COMMAND_SW_CAUSES_DISJOINT | JS_COMMAND_SOFT_STOP) ++ _MALI_GET_RK_KO_VERSION, /* rk_ext */ ++ _MALI_UK_GET_MALI_VERSION_IN_RK30, + -+#define KBASEP_ATOM_ID_INVALID BASE_JD_ATOM_COUNT ++ /** Memory functions */ + -+/* Serialize atoms within a slot (ie only one atom per job slot) */ -+#define KBASE_SERIALIZE_INTRA_SLOT (1 << 0) -+/* Serialize atoms between slots (ie only one job slot running at any time) */ -+#define KBASE_SERIALIZE_INTER_SLOT (1 << 1) -+/* Reset the GPU after each atom completion */ -+#define KBASE_SERIALIZE_RESET (1 << 2) ++ _MALI_UK_ALLOC_MEM = 0, /**< _mali_ukk_alloc_mem() */ ++ _MALI_UK_FREE_MEM, /**< _mali_ukk_free_mem() */ ++ _MALI_UK_BIND_MEM, /**< _mali_ukk_mem_bind() */ ++ _MALI_UK_UNBIND_MEM, /**< _mali_ukk_mem_unbind() */ ++ _MALI_UK_COW_MEM, /**< _mali_ukk_mem_cow() */ ++ _MALI_UK_COW_MODIFY_RANGE, /**< _mali_ukk_mem_cow_modify_range() */ ++ _MALI_UK_RESIZE_MEM, /**<._mali_ukk_mem_resize() */ ++ _MALI_UK_QUERY_MMU_PAGE_TABLE_DUMP_SIZE, /**< _mali_ukk_mem_get_mmu_page_table_dump_size() */ ++ _MALI_UK_DUMP_MMU_PAGE_TABLE, /**< _mali_ukk_mem_dump_mmu_page_table() */ ++ _MALI_UK_DMA_BUF_GET_SIZE, /**< _mali_ukk_dma_buf_get_size() */ ++ _MALI_UK_MEM_WRITE_SAFE, /**< _mali_uku_mem_write_safe() */ + -+/* Forward declarations */ -+struct kbase_context; -+struct kbase_device; -+struct kbase_as; -+struct kbase_mmu_setup; ++ /** Common functions for each core */ + -+#ifdef CONFIG_DEBUG_FS -+struct base_job_fault_event { ++ _MALI_UK_START_JOB = 0, /**< Start a Fragment/Vertex Processor Job on a core */ ++ _MALI_UK_GET_NUMBER_OF_CORES, /**< Get the number of Fragment/Vertex Processor cores */ ++ _MALI_UK_GET_CORE_VERSION, /**< Get the Fragment/Vertex Processor version compatible with all cores */ + -+ u32 event_code; -+ struct kbase_jd_atom *katom; -+ struct work_struct job_fault_work; -+ struct list_head head; -+ int reg_offset; -+}; ++ /** Fragment Processor Functions */ + -+#endif ++ _MALI_UK_PP_START_JOB = _MALI_UK_START_JOB, /**< _mali_ukk_pp_start_job() */ ++ _MALI_UK_GET_PP_NUMBER_OF_CORES = _MALI_UK_GET_NUMBER_OF_CORES, /**< _mali_ukk_get_pp_number_of_cores() */ ++ _MALI_UK_GET_PP_CORE_VERSION = _MALI_UK_GET_CORE_VERSION, /**< _mali_ukk_get_pp_core_version() */ ++ _MALI_UK_PP_DISABLE_WB, /**< _mali_ukk_pp_job_disable_wb() */ ++ _MALI_UK_PP_AND_GP_START_JOB, /**< _mali_ukk_pp_and_gp_start_job() */ + -+struct kbase_jd_atom_dependency { -+ struct kbase_jd_atom *atom; -+ u8 dep_type; -+}; ++ /** Vertex Processor Functions */ + -+/** -+ * struct kbase_io_access - holds information about 1 register access -+ * -+ * @addr: first bit indicates r/w (r=0, w=1) -+ * @value: value written or read -+ */ -+struct kbase_io_access { -+ uintptr_t addr; -+ u32 value; -+}; ++ _MALI_UK_GP_START_JOB = _MALI_UK_START_JOB, /**< _mali_ukk_gp_start_job() */ ++ _MALI_UK_GET_GP_NUMBER_OF_CORES = _MALI_UK_GET_NUMBER_OF_CORES, /**< _mali_ukk_get_gp_number_of_cores() */ ++ _MALI_UK_GET_GP_CORE_VERSION = _MALI_UK_GET_CORE_VERSION, /**< _mali_ukk_get_gp_core_version() */ ++ _MALI_UK_GP_SUSPEND_RESPONSE, /**< _mali_ukk_gp_suspend_response() */ + -+/** -+ * struct kbase_io_history - keeps track of all recent register accesses -+ * -+ * @enabled: true if register accesses are recorded, false otherwise -+ * @lock: spinlock protecting kbase_io_access array -+ * @count: number of registers read/written -+ * @size: number of elements in kbase_io_access array -+ * @buf: array of kbase_io_access -+ */ -+struct kbase_io_history { -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) -+ bool enabled; -+#else -+ u32 enabled; -+#endif ++ /** Profiling functions */ + -+ spinlock_t lock; -+ size_t count; -+ u16 size; -+ struct kbase_io_access *buf; -+}; ++ _MALI_UK_PROFILING_ADD_EVENT = 0, /**< __mali_uku_profiling_add_event() */ ++ _MALI_UK_PROFILING_REPORT_SW_COUNTERS,/**< __mali_uku_profiling_report_sw_counters() */ ++ _MALI_UK_PROFILING_MEMORY_USAGE_GET, /**< __mali_uku_profiling_memory_usage_get() */ ++ _MALI_UK_PROFILING_STREAM_FD_GET, /** < __mali_uku_profiling_stream_fd_get() */ ++ _MALI_UK_PROFILING_CONTROL_SET, /** < __mali_uku_profiling_control_set() */ + -+/** -+ * @brief The function retrieves a read-only reference to the atom field from -+ * the kbase_jd_atom_dependency structure -+ * -+ * @param[in] dep kbase jd atom dependency. -+ * -+ * @return readonly reference to dependent ATOM. -+ */ -+static inline const struct kbase_jd_atom * kbase_jd_katom_dep_atom(const struct kbase_jd_atom_dependency *dep) -+{ -+ LOCAL_ASSERT(dep != NULL); ++ /** VSYNC reporting fuctions */ ++ _MALI_UK_VSYNC_EVENT_REPORT = 0, /**< _mali_ukk_vsync_event_report() */ ++} _mali_uk_functions; + -+ return (const struct kbase_jd_atom *)(dep->atom); -+} ++/** @defgroup _mali_uk_getsysteminfo U/K Get System Info ++ * @{ */ + +/** -+ * @brief The function retrieves a read-only reference to the dependency type field from -+ * the kbase_jd_atom_dependency structure -+ * -+ * @param[in] dep kbase jd atom dependency. ++ * Type definition for the core version number. ++ * Used when returning the version number read from a core + * -+ * @return A dependency type value. ++ * Its format is that of the 32-bit Version register for a particular core. ++ * Refer to the "Mali200 and MaliGP2 3D Graphics Processor Technical Reference ++ * Manual", ARM DDI 0415C, for more information. + */ -+static inline u8 kbase_jd_katom_dep_type(const struct kbase_jd_atom_dependency *dep) -+{ -+ LOCAL_ASSERT(dep != NULL); ++typedef u32 _mali_core_version; + -+ return dep->dep_type; -+} ++/** @} */ /* end group _mali_uk_core */ + -+/** -+ * @brief Setter macro for dep_atom array entry in kbase_jd_atom ++ ++/** @defgroup _mali_uk_gp U/K Vertex Processor ++ * @{ */ ++ ++/** @defgroup _mali_uk_gp_suspend_response_s Vertex Processor Suspend Response ++ * @{ */ ++ ++/** @brief Arguments for _mali_ukk_gp_suspend_response() + * -+ * @param[in] dep The kbase jd atom dependency. -+ * @param[in] a The ATOM to be set as a dependency. -+ * @param type The ATOM dependency type to be set. ++ * When _mali_wait_for_notification() receives notification that a ++ * Vertex Processor job was suspended, you need to send a response to indicate ++ * what needs to happen with this job. You can either abort or resume the job. ++ * ++ * - set @c code to indicate response code. This is either @c _MALIGP_JOB_ABORT or ++ * @c _MALIGP_JOB_RESUME_WITH_NEW_HEAP to indicate you will provide a new heap ++ * for the job that will resolve the out of memory condition for the job. ++ * - copy the @c cookie value from the @c _mali_uk_gp_job_suspended_s notification; ++ * this is an identifier for the suspended job ++ * - set @c arguments[0] and @c arguments[1] to zero if you abort the job. If ++ * you resume it, @c argument[0] should specify the Mali start address for the new ++ * heap and @c argument[1] the Mali end address of the heap. ++ * - pass in the user-kernel context @c ctx that was returned from _mali_ukk_open() + * + */ -+static inline void kbase_jd_katom_dep_set(const struct kbase_jd_atom_dependency *const_dep, -+ struct kbase_jd_atom *a, u8 type) -+{ -+ struct kbase_jd_atom_dependency *dep; ++typedef enum _maligp_job_suspended_response_code { ++ _MALIGP_JOB_ABORT, /**< Abort the Vertex Processor job */ ++ _MALIGP_JOB_RESUME_WITH_NEW_HEAP /**< Resume the Vertex Processor job with a new heap */ ++} _maligp_job_suspended_response_code; + -+ LOCAL_ASSERT(const_dep != NULL); ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 cookie; /**< [in] cookie from the _mali_uk_gp_job_suspended_s notification */ ++ _maligp_job_suspended_response_code code; /**< [in] abort or resume response code, see \ref _maligp_job_suspended_response_code */ ++ u32 arguments[2]; /**< [in] 0 when aborting a job. When resuming a job, the Mali start and end address for a new heap to resume the job with */ ++} _mali_uk_gp_suspend_response_s; + -+ dep = (struct kbase_jd_atom_dependency *)const_dep; ++/** @} */ /* end group _mali_uk_gp_suspend_response_s */ + -+ dep->atom = a; -+ dep->dep_type = type; -+} ++/** @defgroup _mali_uk_gpstartjob_s Vertex Processor Start Job ++ * @{ */ + -+/** -+ * @brief Setter macro for dep_atom array entry in kbase_jd_atom ++/** @brief Status indicating the result of the execution of a Vertex or Fragment processor job */ ++typedef enum { ++ _MALI_UK_JOB_STATUS_END_SUCCESS = 1 << (16 + 0), ++ _MALI_UK_JOB_STATUS_END_OOM = 1 << (16 + 1), ++ _MALI_UK_JOB_STATUS_END_ABORT = 1 << (16 + 2), ++ _MALI_UK_JOB_STATUS_END_TIMEOUT_SW = 1 << (16 + 3), ++ _MALI_UK_JOB_STATUS_END_HANG = 1 << (16 + 4), ++ _MALI_UK_JOB_STATUS_END_SEG_FAULT = 1 << (16 + 5), ++ _MALI_UK_JOB_STATUS_END_ILLEGAL_JOB = 1 << (16 + 6), ++ _MALI_UK_JOB_STATUS_END_UNKNOWN_ERR = 1 << (16 + 7), ++ _MALI_UK_JOB_STATUS_END_SHUTDOWN = 1 << (16 + 8), ++ _MALI_UK_JOB_STATUS_END_SYSTEM_UNUSABLE = 1 << (16 + 9) ++} _mali_uk_job_status; ++ ++#define MALIGP2_NUM_REGS_FRAME (6) ++ ++/** @brief Arguments for _mali_ukk_gp_start_job() + * -+ * @param[in] dep The kbase jd atom dependency to be cleared. ++ * To start a Vertex Processor job ++ * - associate the request with a reference to a @c mali_gp_job_info by setting ++ * user_job_ptr to the address of the @c mali_gp_job_info of the job. ++ * - set @c priority to the priority of the @c mali_gp_job_info ++ * - specify a timeout for the job by setting @c watchdog_msecs to the number of ++ * milliseconds the job is allowed to run. Specifying a value of 0 selects the ++ * default timeout in use by the device driver. ++ * - copy the frame registers from the @c mali_gp_job_info into @c frame_registers. ++ * - set the @c perf_counter_flag, @c perf_counter_src0 and @c perf_counter_src1 to zero ++ * for a non-instrumented build. For an instrumented build you can use up ++ * to two performance counters. Set the corresponding bit in @c perf_counter_flag ++ * to enable them. @c perf_counter_src0 and @c perf_counter_src1 specify ++ * the source of what needs to get counted (e.g. number of vertex loader ++ * cache hits). For source id values, see ARM DDI0415A, Table 3-60. ++ * - pass in the user-kernel context @c ctx that was returned from _mali_ukk_open() ++ * ++ * When @c _mali_ukk_gp_start_job() returns @c _MALI_OSK_ERR_OK, status contains the ++ * result of the request (see \ref _mali_uk_start_job_status). If the job could ++ * not get started (@c _MALI_UK_START_JOB_NOT_STARTED_DO_REQUEUE) it should be ++ * tried again. ++ * ++ * After the job has started, @c _mali_wait_for_notification() will be notified ++ * that the job finished or got suspended. It may get suspended due to ++ * resource shortage. If it finished (see _mali_ukk_wait_for_notification()) ++ * the notification will contain a @c _mali_uk_gp_job_finished_s result. If ++ * it got suspended the notification will contain a @c _mali_uk_gp_job_suspended_s ++ * result. ++ * ++ * The @c _mali_uk_gp_job_finished_s contains the job status (see \ref _mali_uk_job_status), ++ * the number of milliseconds the job took to render, and values of core registers ++ * when the job finished (irq status, performance counters, renderer list ++ * address). A job has finished succesfully when its status is ++ * @c _MALI_UK_JOB_STATUS_FINISHED. If the hardware detected a timeout while rendering ++ * the job, or software detected the job is taking more than watchdog_msecs to ++ * complete, the status will indicate @c _MALI_UK_JOB_STATUS_HANG. ++ * If the hardware detected a bus error while accessing memory associated with the ++ * job, status will indicate @c _MALI_UK_JOB_STATUS_SEG_FAULT. ++ * status will indicate @c _MALI_UK_JOB_STATUS_NOT_STARTED if the driver had to ++ * stop the job but the job didn't start on the hardware yet, e.g. when the ++ * driver shutdown. ++ * ++ * In case the job got suspended, @c _mali_uk_gp_job_suspended_s contains ++ * the @c user_job_ptr identifier used to start the job with, the @c reason ++ * why the job stalled (see \ref _maligp_job_suspended_reason) and a @c cookie ++ * to identify the core on which the job stalled. This @c cookie will be needed ++ * when responding to this nofication by means of _mali_ukk_gp_suspend_response(). ++ * (see _mali_ukk_gp_suspend_response()). The response is either to abort or ++ * resume the job. If the job got suspended due to an out of memory condition ++ * you may be able to resolve this by providing more memory and resuming the job. + * + */ -+static inline void kbase_jd_katom_dep_clear(const struct kbase_jd_atom_dependency *const_dep) -+{ -+ struct kbase_jd_atom_dependency *dep; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u64 user_job_ptr; /**< [in] identifier for the job in user space, a @c mali_gp_job_info* */ ++ u32 priority; /**< [in] job priority. A lower number means higher priority */ ++ u32 frame_registers[MALIGP2_NUM_REGS_FRAME]; /**< [in] core specific registers associated with this job */ ++ u32 perf_counter_flag; /**< [in] bitmask indicating which performance counters to enable, see \ref _MALI_PERFORMANCE_COUNTER_FLAG_SRC0_ENABLE and related macro definitions */ ++ u32 perf_counter_src0; /**< [in] source id for performance counter 0 (see ARM DDI0415A, Table 3-60) */ ++ u32 perf_counter_src1; /**< [in] source id for performance counter 1 (see ARM DDI0415A, Table 3-60) */ ++ u32 frame_builder_id; /**< [in] id of the originating frame builder */ ++ u32 flush_id; /**< [in] flush id within the originating frame builder */ ++ _mali_uk_fence_t fence; /**< [in] fence this job must wait on */ ++ u64 timeline_point_ptr; /**< [in,out] pointer to u32: location where point on gp timeline for this job will be written */ ++ u32 varying_memsize; /** < [in] size of varying memory to use deffer bind*/ ++ u32 deferred_mem_num; ++ u64 deferred_mem_list; /** < [in] memory hanlde list of varying buffer to use deffer bind */ ++} _mali_uk_gp_start_job_s; + -+ LOCAL_ASSERT(const_dep != NULL); ++#define _MALI_PERFORMANCE_COUNTER_FLAG_SRC0_ENABLE (1<<0) /**< Enable performance counter SRC0 for a job */ ++#define _MALI_PERFORMANCE_COUNTER_FLAG_SRC1_ENABLE (1<<1) /**< Enable performance counter SRC1 for a job */ ++#define _MALI_PERFORMANCE_COUNTER_FLAG_HEATMAP_ENABLE (1<<2) /**< Enable per tile (aka heatmap) generation with for a job (using the enabled counter sources) */ + -+ dep = (struct kbase_jd_atom_dependency *)const_dep; ++/** @} */ /* end group _mali_uk_gpstartjob_s */ + -+ dep->atom = NULL; -+ dep->dep_type = BASE_JD_DEP_TYPE_INVALID; -+} ++typedef struct { ++ u64 user_job_ptr; /**< [out] identifier for the job in user space */ ++ _mali_uk_job_status status; /**< [out] status of finished job */ ++ u32 heap_current_addr; /**< [out] value of the GP PLB PL heap start address register */ ++ u32 perf_counter0; /**< [out] value of performance counter 0 (see ARM DDI0415A) */ ++ u32 perf_counter1; /**< [out] value of performance counter 1 (see ARM DDI0415A) */ ++ u32 pending_big_job_num; ++} _mali_uk_gp_job_finished_s; + -+enum kbase_atom_gpu_rb_state { -+ /* Atom is not currently present in slot ringbuffer */ -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB, -+ /* Atom is in slot ringbuffer but is blocked on a previous atom */ -+ KBASE_ATOM_GPU_RB_WAITING_BLOCKED, -+ /* Atom is in slot ringbuffer but is waiting for a previous protected -+ * mode transition to complete */ -+ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV, -+ /* Atom is in slot ringbuffer but is waiting for proected mode -+ * transition */ -+ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION, -+ /* Atom is in slot ringbuffer but is waiting for cores to become -+ * available */ -+ KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE, -+ /* Atom is in slot ringbuffer but is blocked on affinity */ -+ KBASE_ATOM_GPU_RB_WAITING_AFFINITY, -+ /* Atom is in slot ringbuffer and ready to run */ -+ KBASE_ATOM_GPU_RB_READY, -+ /* Atom is in slot ringbuffer and has been submitted to the GPU */ -+ KBASE_ATOM_GPU_RB_SUBMITTED, -+ /* Atom must be returned to JS as soon as it reaches the head of the -+ * ringbuffer due to a previous failure */ -+ KBASE_ATOM_GPU_RB_RETURN_TO_JS = -1 -+}; ++typedef struct { ++ u64 user_job_ptr; /**< [out] identifier for the job in user space */ ++ u32 cookie; /**< [out] identifier for the core in kernel space on which the job stalled */ ++} _mali_uk_gp_job_suspended_s; + -+enum kbase_atom_enter_protected_state { -+ /* -+ * Starting state: -+ * Check if a transition into protected mode is required. -+ * -+ * NOTE: The integer value of this must -+ * match KBASE_ATOM_EXIT_PROTECTED_CHECK. -+ */ -+ KBASE_ATOM_ENTER_PROTECTED_CHECK = 0, -+ /* Wait for vinstr to suspend. */ -+ KBASE_ATOM_ENTER_PROTECTED_VINSTR, -+ /* Wait for the L2 to become idle in preparation for -+ * the coherency change. */ -+ KBASE_ATOM_ENTER_PROTECTED_IDLE_L2, -+ /* End state; -+ * Prepare coherency change. */ -+ KBASE_ATOM_ENTER_PROTECTED_FINISHED, -+}; ++/** @} */ /* end group _mali_uk_gp */ + -+enum kbase_atom_exit_protected_state { -+ /* -+ * Starting state: -+ * Check if a transition out of protected mode is required. -+ * -+ * NOTE: The integer value of this must -+ * match KBASE_ATOM_ENTER_PROTECTED_CHECK. -+ */ -+ KBASE_ATOM_EXIT_PROTECTED_CHECK = 0, -+ /* Wait for the L2 to become idle in preparation -+ * for the reset. */ -+ KBASE_ATOM_EXIT_PROTECTED_IDLE_L2, -+ /* Issue the protected reset. */ -+ KBASE_ATOM_EXIT_PROTECTED_RESET, -+ /* End state; -+ * Wait for the reset to complete. */ -+ KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT, -+}; + -+struct kbase_ext_res { -+ u64 gpu_address; -+ struct kbase_mem_phy_alloc *alloc; -+}; ++/** @defgroup _mali_uk_pp U/K Fragment Processor ++ * @{ */ + -+struct kbase_jd_atom { -+ struct work_struct work; -+ ktime_t start_timestamp; ++#define _MALI_PP_MAX_SUB_JOBS 8 + -+ struct base_jd_udata udata; -+ struct kbase_context *kctx; ++#define _MALI_PP_MAX_FRAME_REGISTERS ((0x058/4)+1) + -+ struct list_head dep_head[2]; -+ struct list_head dep_item[2]; -+ const struct kbase_jd_atom_dependency dep[2]; -+ /* List head used during job dispatch job_done processing - as -+ * dependencies may not be entirely resolved at this point, we need to -+ * use a separate list head. */ -+ struct list_head jd_item; -+ /* true if atom's jd_item is currently on a list. Prevents atom being -+ * processed twice. */ -+ bool in_jd_list; ++#define _MALI_PP_MAX_WB_REGISTERS ((0x02C/4)+1) + -+ u16 nr_extres; -+ struct kbase_ext_res *extres; ++#define _MALI_DLBU_MAX_REGISTERS 4 + -+ u32 device_nr; -+ u64 affinity; -+ u64 jc; -+ enum kbase_atom_coreref_state coreref_state; -+#ifdef CONFIG_KDS -+ struct list_head node; -+ struct kds_resource_set *kds_rset; -+ bool kds_dep_satisfied; -+#endif /* CONFIG_KDS */ -+#if defined(CONFIG_SYNC) -+ /* Stores either an input or output fence, depending on soft-job type */ -+ struct sync_fence *fence; -+ struct sync_fence_waiter sync_waiter; -+#endif /* CONFIG_SYNC */ -+#if defined(CONFIG_MALI_BIFROST_DMA_FENCE) || defined(CONFIG_SYNC_FILE) -+ struct { -+ /* Use the functions/API defined in mali_kbase_fence.h to -+ * when working with this sub struct */ -+#if defined(CONFIG_SYNC_FILE) -+ /* Input fence */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence_in; -+#else -+ struct dma_fence *fence_in; -+#endif -+#endif -+ /* This points to the dma-buf output fence for this atom. If -+ * this is NULL then there is no fence for this atom and the -+ * following fields related to dma_fence may have invalid data. -+ * -+ * The context and seqno fields contain the details for this -+ * fence. -+ * -+ * This fence is signaled when the katom is completed, -+ * regardless of the event_code of the katom (signal also on -+ * failure). -+ */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence; -+#else -+ struct dma_fence *fence; -+#endif -+ /* The dma-buf fence context number for this atom. A unique -+ * context number is allocated to each katom in the context on -+ * context creation. -+ */ -+ unsigned int context; -+ /* The dma-buf fence sequence number for this atom. This is -+ * increased every time this katom uses dma-buf fence. -+ */ -+ atomic_t seqno; -+ /* This contains a list of all callbacks set up to wait on -+ * other fences. This atom must be held back from JS until all -+ * these callbacks have been called and dep_count have reached -+ * 0. The initial value of dep_count must be equal to the -+ * number of callbacks on this list. -+ * -+ * This list is protected by jctx.lock. Callbacks are added to -+ * this list when the atom is built and the wait are set up. -+ * All the callbacks then stay on the list until all callbacks -+ * have been called and the atom is queued, or cancelled, and -+ * then all callbacks are taken off the list and freed. -+ */ -+ struct list_head callbacks; -+ /* Atomic counter of number of outstandind dma-buf fence -+ * dependencies for this atom. When dep_count reaches 0 the -+ * atom may be queued. -+ * -+ * The special value "-1" may only be set after the count -+ * reaches 0, while holding jctx.lock. This indicates that the -+ * atom has been handled, either queued in JS or cancelled. -+ * -+ * If anyone but the dma-fence worker sets this to -1 they must -+ * ensure that any potentially queued worker must have -+ * completed before allowing the atom to be marked as unused. -+ * This can be done by flushing the fence work queue: -+ * kctx->dma_fence.wq. -+ */ -+ atomic_t dep_count; -+ } dma_fence; -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE || CONFIG_SYNC_FILE*/ ++/** Flag for _mali_uk_pp_start_job_s */ ++#define _MALI_PP_JOB_FLAG_NO_NOTIFICATION (1<<0) ++#define _MALI_PP_JOB_FLAG_IS_WINDOW_SURFACE (1<<1) ++#define _MALI_PP_JOB_FLAG_PROTECTED (1<<2) + -+ /* Note: refer to kbasep_js_atom_retained_state, which will take a copy of some of the following members */ -+ enum base_jd_event_code event_code; -+ base_jd_core_req core_req; /**< core requirements */ -+ /** Job Slot to retry submitting to if submission from IRQ handler failed -+ * -+ * NOTE: see if this can be unified into the another member e.g. the event */ -+ int retry_submit_on_slot; ++/** @defgroup _mali_uk_ppstartjob_s Fragment Processor Start Job ++ * @{ */ + -+ u32 ticks; -+ /* JS atom priority with respect to other atoms on its kctx. */ -+ int sched_priority; ++/** @brief Arguments for _mali_ukk_pp_start_job() ++ * ++ * To start a Fragment Processor job ++ * - associate the request with a reference to a mali_pp_job by setting ++ * @c user_job_ptr to the address of the @c mali_pp_job of the job. ++ * - set @c priority to the priority of the mali_pp_job ++ * - specify a timeout for the job by setting @c watchdog_msecs to the number of ++ * milliseconds the job is allowed to run. Specifying a value of 0 selects the ++ * default timeout in use by the device driver. ++ * - copy the frame registers from the @c mali_pp_job into @c frame_registers. ++ * For MALI200 you also need to copy the write back 0,1 and 2 registers. ++ * - set the @c perf_counter_flag, @c perf_counter_src0 and @c perf_counter_src1 to zero ++ * for a non-instrumented build. For an instrumented build you can use up ++ * to two performance counters. Set the corresponding bit in @c perf_counter_flag ++ * to enable them. @c perf_counter_src0 and @c perf_counter_src1 specify ++ * the source of what needs to get counted (e.g. number of vertex loader ++ * cache hits). For source id values, see ARM DDI0415A, Table 3-60. ++ * - pass in the user-kernel context in @c ctx that was returned from _mali_ukk_open() ++ * ++ * When _mali_ukk_pp_start_job() returns @c _MALI_OSK_ERR_OK, @c status contains the ++ * result of the request (see \ref _mali_uk_start_job_status). If the job could ++ * not get started (@c _MALI_UK_START_JOB_NOT_STARTED_DO_REQUEUE) it should be ++ * tried again. ++ * ++ * After the job has started, _mali_wait_for_notification() will be notified ++ * when the job finished. The notification will contain a ++ * @c _mali_uk_pp_job_finished_s result. It contains the @c user_job_ptr ++ * identifier used to start the job with, the job @c status (see \ref _mali_uk_job_status), ++ * the number of milliseconds the job took to render, and values of core registers ++ * when the job finished (irq status, performance counters, renderer list ++ * address). A job has finished succesfully when its status is ++ * @c _MALI_UK_JOB_STATUS_FINISHED. If the hardware detected a timeout while rendering ++ * the job, or software detected the job is taking more than @c watchdog_msecs to ++ * complete, the status will indicate @c _MALI_UK_JOB_STATUS_HANG. ++ * If the hardware detected a bus error while accessing memory associated with the ++ * job, status will indicate @c _MALI_UK_JOB_STATUS_SEG_FAULT. ++ * status will indicate @c _MALI_UK_JOB_STATUS_NOT_STARTED if the driver had to ++ * stop the job but the job didn't start on the hardware yet, e.g. when the ++ * driver shutdown. ++ * ++ */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u64 user_job_ptr; /**< [in] identifier for the job in user space */ ++ u32 priority; /**< [in] job priority. A lower number means higher priority */ ++ u32 frame_registers[_MALI_PP_MAX_FRAME_REGISTERS]; /**< [in] core specific registers associated with first sub job, see ARM DDI0415A */ ++ u32 frame_registers_addr_frame[_MALI_PP_MAX_SUB_JOBS - 1]; /**< [in] ADDR_FRAME registers for sub job 1-7 */ ++ u32 frame_registers_addr_stack[_MALI_PP_MAX_SUB_JOBS - 1]; /**< [in] ADDR_STACK registers for sub job 1-7 */ ++ u32 wb0_registers[_MALI_PP_MAX_WB_REGISTERS]; ++ u32 wb1_registers[_MALI_PP_MAX_WB_REGISTERS]; ++ u32 wb2_registers[_MALI_PP_MAX_WB_REGISTERS]; ++ u32 dlbu_registers[_MALI_DLBU_MAX_REGISTERS]; /**< [in] Dynamic load balancing unit registers */ ++ u32 num_cores; /**< [in] Number of cores to set up (valid range: 1-8(M450) or 4(M400)) */ ++ u32 perf_counter_flag; /**< [in] bitmask indicating which performance counters to enable, see \ref _MALI_PERFORMANCE_COUNTER_FLAG_SRC0_ENABLE and related macro definitions */ ++ u32 perf_counter_src0; /**< [in] source id for performance counter 0 (see ARM DDI0415A, Table 3-60) */ ++ u32 perf_counter_src1; /**< [in] source id for performance counter 1 (see ARM DDI0415A, Table 3-60) */ ++ u32 frame_builder_id; /**< [in] id of the originating frame builder */ ++ u32 flush_id; /**< [in] flush id within the originating frame builder */ ++ u32 flags; /**< [in] See _MALI_PP_JOB_FLAG_* for a list of avaiable flags */ ++ u32 tilesx; /**< [in] number of tiles in the x direction (needed for heatmap generation */ ++ u32 tilesy; /**< [in] number of tiles in y direction (needed for reading the heatmap memory) */ ++ u32 heatmap_mem; /**< [in] memory address to store counter values per tile (aka heatmap) */ ++ u32 num_memory_cookies; /**< [in] number of memory cookies attached to job */ ++ u64 memory_cookies; /**< [in] pointer to array of u32 memory cookies attached to job */ ++ _mali_uk_fence_t fence; /**< [in] fence this job must wait on */ ++ u64 timeline_point_ptr; /**< [in,out] pointer to location of u32 where point on pp timeline for this job will be written */ ++} _mali_uk_pp_start_job_s; + -+ int poking; /* BASE_HW_ISSUE_8316 */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u64 gp_args; /**< [in,out] GP uk arguments (see _mali_uk_gp_start_job_s) */ ++ u64 pp_args; /**< [in,out] PP uk arguments (see _mali_uk_pp_start_job_s) */ ++} _mali_uk_pp_and_gp_start_job_s; + -+ wait_queue_head_t completed; -+ enum kbase_jd_atom_state status; -+#ifdef CONFIG_GPU_TRACEPOINTS -+ int work_id; -+#endif -+ /* Assigned after atom is completed. Used to check whether PRLAM-10676 workaround should be applied */ -+ int slot_nr; ++/** @} */ /* end group _mali_uk_ppstartjob_s */ + -+ u32 atom_flags; ++typedef struct { ++ u64 user_job_ptr; /**< [out] identifier for the job in user space */ ++ _mali_uk_job_status status; /**< [out] status of finished job */ ++ u32 perf_counter0[_MALI_PP_MAX_SUB_JOBS]; /**< [out] value of perfomance counter 0 (see ARM DDI0415A), one for each sub job */ ++ u32 perf_counter1[_MALI_PP_MAX_SUB_JOBS]; /**< [out] value of perfomance counter 1 (see ARM DDI0415A), one for each sub job */ ++ u32 perf_counter_src0; ++ u32 perf_counter_src1; ++} _mali_uk_pp_job_finished_s; + -+ /* Number of times this atom has been retried. Used by replay soft job. -+ */ -+ int retry_count; ++typedef struct { ++ u32 number_of_enabled_cores; /**< [out] the new number of enabled cores */ ++} _mali_uk_pp_num_cores_changed_s; + -+ enum kbase_atom_gpu_rb_state gpu_rb_state; + -+ u64 need_cache_flush_cores_retained; + -+ atomic_t blocked; ++/** ++ * Flags to indicate write-back units ++ */ ++typedef enum { ++ _MALI_UK_PP_JOB_WB0 = 1, ++ _MALI_UK_PP_JOB_WB1 = 2, ++ _MALI_UK_PP_JOB_WB2 = 4, ++} _mali_uk_pp_job_wbx_flag; + -+ /* Pointer to atom that this atom has same-slot dependency on */ -+ struct kbase_jd_atom *pre_dep; -+ /* Pointer to atom that has same-slot dependency on this atom */ -+ struct kbase_jd_atom *post_dep; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 fb_id; /**< [in] Frame builder ID of job to disable WB units for */ ++ u32 wb0_memory; ++ u32 wb1_memory; ++ u32 wb2_memory; ++} _mali_uk_pp_disable_wb_s; + -+ /* Pointer to atom that this atom has cross-slot dependency on */ -+ struct kbase_jd_atom *x_pre_dep; -+ /* Pointer to atom that has cross-slot dependency on this atom */ -+ struct kbase_jd_atom *x_post_dep; + -+ /* The GPU's flush count recorded at the time of submission, used for -+ * the cache flush optimisation */ -+ u32 flush_id; ++/** @} */ /* end group _mali_uk_pp */ + -+ struct kbase_jd_atom_backend backend; -+#ifdef CONFIG_DEBUG_FS -+ struct base_job_fault_event fault_event; -+#endif ++/** @defgroup _mali_uk_soft_job U/K Soft Job ++ * @{ */ + -+ /* List head used for three different purposes: -+ * 1. Overflow list for JS ring buffers. If an atom is ready to run, -+ * but there is no room in the JS ring buffer, then the atom is put -+ * on the ring buffer's overflow list using this list node. -+ * 2. List of waiting soft jobs. -+ */ -+ struct list_head queue; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u64 user_job; /**< [in] identifier for the job in user space */ ++ u64 job_id_ptr; /**< [in,out] pointer to location of u32 where job id will be written */ ++ _mali_uk_fence_t fence; /**< [in] fence this job must wait on */ ++ u32 point; /**< [out] point on soft timeline for this job */ ++ u32 type; /**< [in] type of soft job */ ++} _mali_uk_soft_job_start_s; + -+ /* Used to keep track of all JIT free/alloc jobs in submission order -+ */ -+ struct list_head jit_node; -+ bool jit_blocked; ++typedef struct { ++ u64 user_job; /**< [out] identifier for the job in user space */ ++} _mali_uk_soft_job_activated_s; + -+ /* If non-zero, this indicates that the atom will fail with the set -+ * event_code when the atom is processed. */ -+ enum base_jd_event_code will_fail_event_code; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 job_id; /**< [in] id for soft job */ ++} _mali_uk_soft_job_signal_s; + -+ /* Atoms will only ever be transitioning into, or out of -+ * protected mode so we do not need two separate fields. -+ */ -+ union { -+ enum kbase_atom_enter_protected_state enter; -+ enum kbase_atom_exit_protected_state exit; -+ } protected_state; ++/** @} */ /* end group _mali_uk_soft_job */ + -+ struct rb_node runnable_tree_node; ++typedef struct { ++ u32 counter_id; ++ u32 key; ++ int enable; ++} _mali_uk_annotate_profiling_mem_counter_s; + -+ /* 'Age' of atom relative to other atoms in the context. */ -+ u32 age; -+}; ++typedef struct { ++ u32 sampling_rate; ++ int enable; ++} _mali_uk_annotate_profiling_enable_s; + -+static inline bool kbase_jd_katom_is_protected(const struct kbase_jd_atom *katom) -+{ -+ return (bool)(katom->atom_flags & KBASE_KATOM_FLAG_PROTECTED); -+} + -+/* -+ * Theory of operations: ++/** @addtogroup _mali_uk_core U/K Core ++ * @{ */ ++ ++/** @defgroup _mali_uk_waitfornotification_s Wait For Notification ++ * @{ */ ++ ++/** @brief Notification type encodings + * -+ * Atom objects are statically allocated within the context structure. ++ * Each Notification type is an ordered pair of (subsystem,id), and is unique. + * -+ * Each atom is the head of two lists, one for the "left" set of dependencies, one for the "right" set. ++ * The encoding of subsystem,id into a 32-bit word is: ++ * encoding = (( subsystem << _MALI_NOTIFICATION_SUBSYSTEM_SHIFT ) & _MALI_NOTIFICATION_SUBSYSTEM_MASK) ++ * | (( id << _MALI_NOTIFICATION_ID_SHIFT ) & _MALI_NOTIFICATION_ID_MASK) ++ * ++ * @see _mali_uk_wait_for_notification_s + */ ++typedef enum { ++ /** core notifications */ + -+#define KBASE_JD_DEP_QUEUE_SIZE 256 ++ _MALI_NOTIFICATION_CORE_SHUTDOWN_IN_PROGRESS = (_MALI_UK_CORE_SUBSYSTEM << 16) | 0x20, ++ _MALI_NOTIFICATION_APPLICATION_QUIT = (_MALI_UK_CORE_SUBSYSTEM << 16) | 0x40, ++ _MALI_NOTIFICATION_SETTINGS_CHANGED = (_MALI_UK_CORE_SUBSYSTEM << 16) | 0x80, ++ _MALI_NOTIFICATION_SOFT_ACTIVATED = (_MALI_UK_CORE_SUBSYSTEM << 16) | 0x100, + -+struct kbase_jd_context { -+ struct mutex lock; -+ struct kbasep_js_kctx_info sched_info; -+ struct kbase_jd_atom atoms[BASE_JD_ATOM_COUNT]; ++ /** Fragment Processor notifications */ + -+ /** Tracks all job-dispatch jobs. This includes those not tracked by -+ * the scheduler: 'not ready to run' and 'dependency-only' jobs. */ -+ u32 job_nr; ++ _MALI_NOTIFICATION_PP_FINISHED = (_MALI_UK_PP_SUBSYSTEM << 16) | 0x10, ++ _MALI_NOTIFICATION_PP_NUM_CORE_CHANGE = (_MALI_UK_PP_SUBSYSTEM << 16) | 0x20, + -+ /** Waitq that reflects whether there are no jobs (including SW-only -+ * dependency jobs). This is set when no jobs are present on the ctx, -+ * and clear when there are jobs. -+ * -+ * @note: Job Dispatcher knows about more jobs than the Job Scheduler: -+ * the Job Scheduler is unaware of jobs that are blocked on dependencies, -+ * and SW-only dependency jobs. -+ * -+ * This waitq can be waited upon to find out when the context jobs are all -+ * done/cancelled (including those that might've been blocked on -+ * dependencies) - and so, whether it can be terminated. However, it should -+ * only be terminated once it is not present in the run-pool (see -+ * kbasep_js_kctx_info::ctx::is_scheduled). -+ * -+ * Since the waitq is only set under kbase_jd_context::lock, -+ * the waiter should also briefly obtain and drop kbase_jd_context::lock to -+ * guarentee that the setter has completed its work on the kbase_context -+ * -+ * This must be updated atomically with: -+ * - kbase_jd_context::job_nr */ -+ wait_queue_head_t zero_jobs_wait; ++ /** Vertex Processor notifications */ + -+ /** Job Done workqueue. */ -+ struct workqueue_struct *job_done_wq; ++ _MALI_NOTIFICATION_GP_FINISHED = (_MALI_UK_GP_SUBSYSTEM << 16) | 0x10, ++ _MALI_NOTIFICATION_GP_STALLED = (_MALI_UK_GP_SUBSYSTEM << 16) | 0x20, + -+ spinlock_t tb_lock; -+ u32 *tb; -+ size_t tb_wrap_offset; ++ /** Profiling notifications */ ++ _MALI_NOTIFICATION_ANNOTATE_PROFILING_MEM_COUNTER = (_MALI_UK_PROFILING_SUBSYSTEM << 16) | 0x10, ++ _MALI_NOTIFICATION_ANNOTATE_PROFILING_ENABLE = (_MALI_UK_PROFILING_SUBSYSTEM << 16) | 0x20, ++} _mali_uk_notification_type; + -+#ifdef CONFIG_KDS -+ struct kds_callback kds_cb; -+#endif /* CONFIG_KDS */ -+#ifdef CONFIG_GPU_TRACEPOINTS -+ atomic_t work_id; -+#endif -+}; ++/** to assist in splitting up 32-bit notification value in subsystem and id value */ ++#define _MALI_NOTIFICATION_SUBSYSTEM_MASK 0xFFFF0000 ++#define _MALI_NOTIFICATION_SUBSYSTEM_SHIFT 16 ++#define _MALI_NOTIFICATION_ID_MASK 0x0000FFFF ++#define _MALI_NOTIFICATION_ID_SHIFT 0 + -+struct kbase_device_info { -+ u32 features; -+}; + -+/** Poking state for BASE_HW_ISSUE_8316 */ -+enum { -+ KBASE_AS_POKE_STATE_IN_FLIGHT = 1<<0, -+ KBASE_AS_POKE_STATE_KILLING_POKE = 1<<1 -+}; ++/** @brief Enumeration of possible settings which match mali_setting_t in user space ++ * ++ * ++ */ ++typedef enum { ++ _MALI_UK_USER_SETTING_SW_EVENTS_ENABLE = 0, ++ _MALI_UK_USER_SETTING_COLORBUFFER_CAPTURE_ENABLED, ++ _MALI_UK_USER_SETTING_DEPTHBUFFER_CAPTURE_ENABLED, ++ _MALI_UK_USER_SETTING_STENCILBUFFER_CAPTURE_ENABLED, ++ _MALI_UK_USER_SETTING_PER_TILE_COUNTERS_CAPTURE_ENABLED, ++ _MALI_UK_USER_SETTING_BUFFER_CAPTURE_COMPOSITOR, ++ _MALI_UK_USER_SETTING_BUFFER_CAPTURE_WINDOW, ++ _MALI_UK_USER_SETTING_BUFFER_CAPTURE_OTHER, ++ _MALI_UK_USER_SETTING_BUFFER_CAPTURE_N_FRAMES, ++ _MALI_UK_USER_SETTING_BUFFER_CAPTURE_RESIZE_FACTOR, ++ _MALI_UK_USER_SETTING_SW_COUNTER_ENABLED, ++ _MALI_UK_USER_SETTING_MAX, ++} _mali_uk_user_setting_t; + -+/** Poking state for BASE_HW_ISSUE_8316 */ -+typedef u32 kbase_as_poke_state; ++/* See mali_user_settings_db.c */ ++extern const char *_mali_uk_user_setting_descriptions[]; ++#define _MALI_UK_USER_SETTING_DESCRIPTIONS \ ++ { \ ++ "sw_events_enable", \ ++ "colorbuffer_capture_enable", \ ++ "depthbuffer_capture_enable", \ ++ "stencilbuffer_capture_enable", \ ++ "per_tile_counters_enable", \ ++ "buffer_capture_compositor", \ ++ "buffer_capture_window", \ ++ "buffer_capture_other", \ ++ "buffer_capture_n_frames", \ ++ "buffer_capture_resize_factor", \ ++ "sw_counters_enable", \ ++ }; + -+struct kbase_mmu_setup { -+ u64 transtab; -+ u64 memattr; -+ u64 transcfg; -+}; ++/** @brief struct to hold the value to a particular setting as seen in the kernel space ++ */ ++typedef struct { ++ _mali_uk_user_setting_t setting; ++ u32 value; ++} _mali_uk_settings_changed_s; + -+/** -+ * Important: Our code makes assumptions that a struct kbase_as structure is always at -+ * kbase_device->as[number]. This is used to recover the containing -+ * struct kbase_device from a struct kbase_as structure. ++/** @brief Arguments for _mali_ukk_wait_for_notification() + * -+ * Therefore, struct kbase_as structures must not be allocated anywhere else. ++ * On successful return from _mali_ukk_wait_for_notification(), the members of ++ * this structure will indicate the reason for notification. ++ * ++ * Specifically, the source of the notification can be identified by the ++ * subsystem and id fields of the mali_uk_notification_type in the code.type ++ * member. The type member is encoded in a way to divide up the types into a ++ * subsystem field, and a per-subsystem ID field. See ++ * _mali_uk_notification_type for more information. ++ * ++ * Interpreting the data union member depends on the notification type: ++ * ++ * - type == _MALI_NOTIFICATION_CORE_SHUTDOWN_IN_PROGRESS ++ * - The kernel side is shutting down. No further ++ * _mali_uk_wait_for_notification() calls should be made. ++ * - In this case, the value of the data union member is undefined. ++ * - This is used to indicate to the user space client that it should close ++ * the connection to the Mali Device Driver. ++ * - type == _MALI_NOTIFICATION_PP_FINISHED ++ * - The notification data is of type _mali_uk_pp_job_finished_s. It contains the user_job_ptr ++ * identifier used to start the job with, the job status, the number of milliseconds the job took to render, ++ * and values of core registers when the job finished (irq status, performance counters, renderer list ++ * address). ++ * - A job has finished succesfully when its status member is _MALI_UK_JOB_STATUS_FINISHED. ++ * - If the hardware detected a timeout while rendering the job, or software detected the job is ++ * taking more than watchdog_msecs (see _mali_ukk_pp_start_job()) to complete, the status member will ++ * indicate _MALI_UK_JOB_STATUS_HANG. ++ * - If the hardware detected a bus error while accessing memory associated with the job, status will ++ * indicate _MALI_UK_JOB_STATUS_SEG_FAULT. ++ * - Status will indicate MALI_UK_JOB_STATUS_NOT_STARTED if the driver had to stop the job but the job ++ * didn't start the hardware yet, e.g. when the driver closes. ++ * - type == _MALI_NOTIFICATION_GP_FINISHED ++ * - The notification data is of type _mali_uk_gp_job_finished_s. The notification is similar to that of ++ * type == _MALI_NOTIFICATION_PP_FINISHED, except that several other GP core register values are returned. ++ * The status values have the same meaning for type == _MALI_NOTIFICATION_PP_FINISHED. ++ * - type == _MALI_NOTIFICATION_GP_STALLED ++ * - The nofication data is of type _mali_uk_gp_job_suspended_s. It contains the user_job_ptr ++ * identifier used to start the job with, the reason why the job stalled and a cookie to identify the core on ++ * which the job stalled. ++ * - The reason member of gp_job_suspended is set to _MALIGP_JOB_SUSPENDED_OUT_OF_MEMORY ++ * when the polygon list builder unit has run out of memory. + */ -+struct kbase_as { -+ int number; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ _mali_uk_notification_type type; /**< [out] Type of notification available */ ++ union { ++ _mali_uk_gp_job_suspended_s gp_job_suspended;/**< [out] Notification data for _MALI_NOTIFICATION_GP_STALLED notification type */ ++ _mali_uk_gp_job_finished_s gp_job_finished; /**< [out] Notification data for _MALI_NOTIFICATION_GP_FINISHED notification type */ ++ _mali_uk_pp_job_finished_s pp_job_finished; /**< [out] Notification data for _MALI_NOTIFICATION_PP_FINISHED notification type */ ++ _mali_uk_settings_changed_s setting_changed;/**< [out] Notification data for _MALI_NOTIFICAATION_SETTINGS_CHANGED notification type */ ++ _mali_uk_soft_job_activated_s soft_job_activated; /**< [out] Notification data for _MALI_NOTIFICATION_SOFT_ACTIVATED notification type */ ++ _mali_uk_annotate_profiling_mem_counter_s profiling_mem_counter; ++ _mali_uk_annotate_profiling_enable_s profiling_enable; ++ } data; ++} _mali_uk_wait_for_notification_s; + -+ struct workqueue_struct *pf_wq; -+ struct work_struct work_pagefault; -+ struct work_struct work_busfault; -+ enum kbase_mmu_fault_type fault_type; -+ bool protected_mode; -+ u32 fault_status; -+ u64 fault_addr; -+ u64 fault_extra_addr; ++/** @brief Arguments for _mali_ukk_post_notification() ++ * ++ * Posts the specified notification to the notification queue for this application. ++ * This is used to send a quit message to the callback thread. ++ */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ _mali_uk_notification_type type; /**< [in] Type of notification to post */ ++} _mali_uk_post_notification_s; + -+ struct kbase_mmu_setup current_setup; ++/** @} */ /* end group _mali_uk_waitfornotification_s */ + -+ /* BASE_HW_ISSUE_8316 */ -+ struct workqueue_struct *poke_wq; -+ struct work_struct poke_work; -+ /** Protected by hwaccess_lock */ -+ int poke_refcount; -+ /** Protected by hwaccess_lock */ -+ kbase_as_poke_state poke_state; -+ struct hrtimer poke_timer; -+}; ++/** @defgroup _mali_uk_getapiversion_s Get API Version ++ * @{ */ + -+static inline int kbase_as_has_bus_fault(struct kbase_as *as) -+{ -+ return as->fault_type == KBASE_MMU_FAULT_TYPE_BUS; -+} ++/** helpers for Device Driver API version handling */ + -+static inline int kbase_as_has_page_fault(struct kbase_as *as) -+{ -+ return as->fault_type == KBASE_MMU_FAULT_TYPE_PAGE; -+} ++/** @brief Encode a version ID from a 16-bit input ++ * ++ * @note the input is assumed to be 16 bits. It must not exceed 16 bits. */ ++#define _MAKE_VERSION_ID(x) (((x) << 16UL) | (x)) + -+struct kbasep_mem_device { -+ atomic_t used_pages; /* Tracks usage of OS shared memory. Updated -+ when OS memory is allocated/freed. */ ++/** @brief Check whether a 32-bit value is likely to be Device Driver API ++ * version ID. */ ++#define _IS_VERSION_ID(x) (((x) & 0xFFFF) == (((x) >> 16UL) & 0xFFFF)) + -+}; ++/** @brief Decode a 16-bit version number from a 32-bit Device Driver API version ++ * ID */ ++#define _GET_VERSION(x) (((x) >> 16UL) & 0xFFFF) + -+#define KBASE_TRACE_CODE(X) KBASE_TRACE_CODE_ ## X ++/** @brief Determine whether two 32-bit encoded version IDs match */ ++#define _IS_API_MATCH(x, y) (IS_VERSION_ID((x)) && IS_VERSION_ID((y)) && (GET_VERSION((x)) == GET_VERSION((y)))) ++ /** ++ * RK MALI version code ++ */ ++#define _MALI_RK_LIBS_VERSION 1 + -+enum kbase_trace_code { -+ /* IMPORTANT: USE OF SPECIAL #INCLUDE OF NON-STANDARD HEADER FILE -+ * THIS MUST BE USED AT THE START OF THE ENUM */ -+#define KBASE_TRACE_CODE_MAKE_CODE(X) KBASE_TRACE_CODE(X) -+#include "mali_kbase_trace_defs.h" -+#undef KBASE_TRACE_CODE_MAKE_CODE -+ /* Comma on its own, to extend the list */ -+ , -+ /* Must be the last in the enum */ -+ KBASE_TRACE_CODE_COUNT -+}; ++/** ++ * API version define. ++ * Indicates the version of the kernel API ++ * The version is a 16bit integer incremented on each API change. ++ * The 16bit integer is stored twice in a 32bit integer ++ * For example, for version 1 the value would be 0x00010001 ++ */ ++#define _MALI_API_VERSION 900 ++#define _MALI_UK_API_VERSION _MAKE_VERSION_ID(_MALI_API_VERSION) + -+#define KBASE_TRACE_FLAG_REFCOUNT (((u8)1) << 0) -+#define KBASE_TRACE_FLAG_JOBSLOT (((u8)1) << 1) ++/** ++ * The API version is a 16-bit integer stored in both the lower and upper 16-bits ++ * of a 32-bit value. The 16-bit API version value is incremented on each API ++ * change. Version 1 would be 0x00010001. Used in _mali_uk_get_api_version_s. ++ */ ++typedef u32 _mali_uk_api_version; + -+struct kbase_trace { -+ struct timespec timestamp; -+ u32 thread_id; -+ u32 cpu; -+ void *ctx; -+ bool katom; -+ int atom_number; -+ u64 atom_udata[2]; -+ u64 gpu_addr; -+ unsigned long info_val; -+ u8 code; -+ u8 jobslot; -+ u8 refcount; -+ u8 flags; -+}; ++/** @brief Arguments for _mali_uk_get_api_version() ++ * ++ * The user-side interface version must be written into the version member, ++ * encoded using _MAKE_VERSION_ID(). It will be compared to the API version of ++ * the kernel-side interface. ++ * ++ * On successful return, the version member will be the API version of the ++ * kernel-side interface. _MALI_UK_API_VERSION macro defines the current version ++ * of the API. ++ * ++ * The compatible member must be checked to see if the version of the user-side ++ * interface is compatible with the kernel-side interface, since future versions ++ * of the interface may be backwards compatible. ++ */ ++typedef struct { ++ u32 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ _mali_uk_api_version version; /**< [in,out] API version of user-side interface. */ ++ int compatible; /**< [out] @c 1 when @version is compatible, @c 0 otherwise */ ++} _mali_uk_get_api_version_s; + -+/** Event IDs for the power management framework. ++/** @brief Arguments for _mali_uk_get_api_version_v2() + * -+ * Any of these events might be missed, so they should not be relied upon to -+ * find the precise state of the GPU at a particular time in the -+ * trace. Overall, we should get a high percentage of these events for -+ * statisical purposes, and so a few missing should not be a problem */ -+enum kbase_timeline_pm_event { -+ /* helper for tests */ -+ KBASEP_TIMELINE_PM_EVENT_FIRST, ++ * The user-side interface version must be written into the version member, ++ * encoded using _MAKE_VERSION_ID(). It will be compared to the API version of ++ * the kernel-side interface. ++ * ++ * On successful return, the version member will be the API version of the ++ * kernel-side interface. _MALI_UK_API_VERSION macro defines the current version ++ * of the API. ++ * ++ * The compatible member must be checked to see if the version of the user-side ++ * interface is compatible with the kernel-side interface, since future versions ++ * of the interface may be backwards compatible. ++ */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ _mali_uk_api_version version; /**< [in,out] API version of user-side interface. */ ++ int compatible; /**< [out] @c 1 when @version is compatible, @c 0 otherwise */ ++} _mali_uk_get_api_version_v2_s; + -+ /** Event reserved for backwards compatibility with 'init' events */ -+ KBASE_TIMELINE_PM_EVENT_RESERVED_0 = KBASEP_TIMELINE_PM_EVENT_FIRST, ++typedef struct ++{ ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ _mali_uk_api_version version; /**< [in,out] API version of user-side interface. */ ++} _mali_uk_get_mali_version_in_rk30_s; + -+ /** The power state of the device has changed. -+ * -+ * Specifically, the device has reached a desired or available state. -+ */ -+ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED, ++/* rk_ext : rk_ko_ver_t. */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ _mali_uk_api_version version; /**< [in,out] API version of user-side interface. */ ++} _mali_rk_ko_version_s; ++/** @} */ /* end group _mali_uk_getapiversion_s */ + -+ /** The GPU is becoming active. -+ * -+ * This event is sent when the first context is about to use the GPU. -+ */ -+ KBASE_TIMELINE_PM_EVENT_GPU_ACTIVE, ++/** @defgroup _mali_uk_get_user_settings_s Get user space settings */ + -+ /** The GPU is becoming idle. -+ * -+ * This event is sent when the last context has finished using the GPU. -+ */ -+ KBASE_TIMELINE_PM_EVENT_GPU_IDLE, ++/** @brief struct to keep the matching values of the user space settings within certain context ++ * ++ * Each member of the settings array corresponds to a matching setting in the user space and its value is the value ++ * of that particular setting. ++ * ++ * All settings are given reference to the context pointed to by the ctx pointer. ++ * ++ */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 settings[_MALI_UK_USER_SETTING_MAX]; /**< [out] The values for all settings */ ++} _mali_uk_get_user_settings_s; + -+ /** Event reserved for backwards compatibility with 'policy_change' -+ * events */ -+ KBASE_TIMELINE_PM_EVENT_RESERVED_4, ++/** @brief struct to hold the value of a particular setting from the user space within a given context ++ */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ _mali_uk_user_setting_t setting; /**< [in] setting to get */ ++ u32 value; /**< [out] value of setting */ ++} _mali_uk_get_user_setting_s; + -+ /** Event reserved for backwards compatibility with 'system_suspend' -+ * events */ -+ KBASE_TIMELINE_PM_EVENT_RESERVED_5, ++/** @brief Arguments for _mali_ukk_request_high_priority() */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++} _mali_uk_request_high_priority_s; + -+ /** Event reserved for backwards compatibility with 'system_resume' -+ * events */ -+ KBASE_TIMELINE_PM_EVENT_RESERVED_6, ++/** @brief Arguments for _mali_ukk_pending_submit() */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++} _mali_uk_pending_submit_s; + -+ /** The job scheduler is requesting to power up/down cores. -+ * -+ * This event is sent when: -+ * - powered down cores are needed to complete a job -+ * - powered up cores are not needed anymore -+ */ -+ KBASE_TIMELINE_PM_EVENT_CHANGE_GPU_STATE, ++/** @} */ /* end group _mali_uk_core */ + -+ KBASEP_TIMELINE_PM_EVENT_LAST = KBASE_TIMELINE_PM_EVENT_CHANGE_GPU_STATE, -+}; + -+#ifdef CONFIG_MALI_BIFROST_TRACE_TIMELINE -+struct kbase_trace_kctx_timeline { -+ atomic_t jd_atoms_in_flight; -+ u32 owner_tgid; -+}; ++/** @defgroup _mali_uk_memory U/K Memory ++ * @{ */ + -+struct kbase_trace_kbdev_timeline { -+ /* Note: strictly speaking, not needed, because it's in sync with -+ * kbase_device::jm_slots[]::submitted_nr -+ * -+ * But it's kept as an example of how to add global timeline tracking -+ * information -+ * -+ * The caller must hold hwaccess_lock when accessing this */ -+ u8 slot_atoms_submitted[BASE_JM_MAX_NR_SLOTS]; ++#define _MALI_MEMORY_ALLOCATE_RESIZEABLE (1<<4) /* BUFFER can trim dow/grow*/ ++#define _MALI_MEMORY_ALLOCATE_NO_BIND_GPU (1<<5) /*Not map to GPU when allocate, must call bind later*/ ++#define _MALI_MEMORY_ALLOCATE_SWAPPABLE (1<<6) /* Allocate swappale memory. */ ++#define _MALI_MEMORY_ALLOCATE_DEFER_BIND (1<<7) /*Not map to GPU when allocate, must call bind later*/ ++#define _MALI_MEMORY_ALLOCATE_SECURE (1<<8) /* Allocate secure memory. */ + -+ /* Last UID for each PM event */ -+ atomic_t pm_event_uid[KBASEP_TIMELINE_PM_EVENT_LAST+1]; -+ /* Counter for generating PM event UIDs */ -+ atomic_t pm_event_uid_counter; -+ /* -+ * L2 transition state - true indicates that the transition is ongoing -+ * Expected to be protected by hwaccess_lock */ -+ bool l2_transitioning; -+}; -+#endif /* CONFIG_MALI_BIFROST_TRACE_TIMELINE */ + ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 gpu_vaddr; /**< [in] GPU virtual address */ ++ u32 vsize; /**< [in] vitrual size of the allocation */ ++ u32 psize; /**< [in] physical size of the allocation */ ++ u32 flags; ++ u64 backend_handle; /**< [out] backend handle */ ++ s32 secure_shared_fd; /** < [in] the mem handle for secure mem */ ++} _mali_uk_alloc_mem_s; + -+struct kbasep_kctx_list_element { -+ struct list_head link; -+ struct kbase_context *kctx; -+}; + -+/** -+ * Data stored per device for power management. -+ * -+ * This structure contains data for the power management framework. There is one -+ * instance of this structure per device in the system. -+ */ -+struct kbase_pm_device_data { -+ /** -+ * The lock protecting Power Management structures accessed outside of -+ * IRQ. -+ * -+ * This lock must also be held whenever the GPU is being powered on or -+ * off. -+ */ -+ struct mutex lock; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 gpu_vaddr; /**< [in] use as handle to free allocation */ ++ u32 free_pages_nr; /** < [out] record the number of free pages */ ++} _mali_uk_free_mem_s; + -+ /** The reference count of active contexts on this device. */ -+ int active_count; -+ /** Flag indicating suspending/suspended */ -+ bool suspending; -+ /* Wait queue set when active_count == 0 */ -+ wait_queue_head_t zero_active_count_wait; + -+ /** -+ * Bit masks identifying the available shader cores that are specified -+ * via sysfs. One mask per job slot. -+ */ -+ u64 debug_core_mask[BASE_JM_MAX_NR_SLOTS]; -+ u64 debug_core_mask_all; ++#define _MALI_MEMORY_BIND_BACKEND_UMP (1<<8) ++#define _MALI_MEMORY_BIND_BACKEND_DMA_BUF (1<<9) ++#define _MALI_MEMORY_BIND_BACKEND_MALI_MEMORY (1<<10) ++#define _MALI_MEMORY_BIND_BACKEND_EXTERNAL_MEMORY (1<<11) ++#define _MALI_MEMORY_BIND_BACKEND_EXT_COW (1<<12) ++#define _MALI_MEMORY_BIND_BACKEND_HAVE_ALLOCATION (1<<13) + -+ /** -+ * Callback for initializing the runtime power management. -+ * -+ * @param kbdev The kbase device -+ * -+ * @return 0 on success, else error code -+ */ -+ int (*callback_power_runtime_init)(struct kbase_device *kbdev); + -+ /** -+ * Callback for terminating the runtime power management. -+ * -+ * @param kbdev The kbase device -+ */ -+ void (*callback_power_runtime_term)(struct kbase_device *kbdev); ++#define _MALI_MEMORY_BIND_BACKEND_MASK (_MALI_MEMORY_BIND_BACKEND_UMP| \ ++ _MALI_MEMORY_BIND_BACKEND_DMA_BUF |\ ++ _MALI_MEMORY_BIND_BACKEND_MALI_MEMORY |\ ++ _MALI_MEMORY_BIND_BACKEND_EXTERNAL_MEMORY |\ ++ _MALI_MEMORY_BIND_BACKEND_EXT_COW |\ ++ _MALI_MEMORY_BIND_BACKEND_HAVE_ALLOCATION) + -+ /* Time in milliseconds between each dvfs sample */ -+ u32 dvfs_period; + -+ /* Period of GPU poweroff timer */ -+ ktime_t gpu_poweroff_time; ++#define _MALI_MEMORY_GPU_READ_ALLOCATE (1<<16) + -+ /* Number of ticks of GPU poweroff timer before shader is powered off */ -+ int poweroff_shader_ticks; + -+ /* Number of ticks of GPU poweroff timer before GPU is powered off */ -+ int poweroff_gpu_ticks; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 vaddr; /**< [in] mali address to map the physical memory to */ ++ u32 size; /**< [in] size */ ++ u32 flags; /**< [in] see_MALI_MEMORY_BIND_BACKEND_* */ ++ u32 padding; /** padding for 32/64 struct alignment */ ++ union { ++ struct { ++ u32 secure_id; /**< [in] secure id */ ++ u32 rights; /**< [in] rights necessary for accessing memory */ ++ u32 flags; /**< [in] flags, see \ref _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE */ ++ } bind_ump; ++ struct { ++ u32 mem_fd; /**< [in] Memory descriptor */ ++ u32 rights; /**< [in] rights necessary for accessing memory */ ++ u32 flags; /**< [in] flags, see \ref _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE */ ++ } bind_dma_buf; ++ struct { ++ u32 phys_addr; /**< [in] physical address */ ++ u32 rights; /**< [in] rights necessary for accessing memory */ ++ u32 flags; /**< [in] flags, see \ref _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE */ ++ } bind_ext_memory; ++ } mem_union; ++} _mali_uk_bind_mem_s; + -+ struct kbase_pm_backend_data backend; -+}; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 flags; /**< [in] see_MALI_MEMORY_BIND_BACKEND_* */ ++ u32 vaddr; /**< [in] identifier for mapped memory object in kernel space */ ++} _mali_uk_unbind_mem_s; + -+/** -+ * struct kbase_mem_pool - Page based memory pool for kctx/kbdev -+ * @kbdev: Kbase device where memory is used -+ * @cur_size: Number of free pages currently in the pool (may exceed @max_size -+ * in some corner cases) -+ * @max_size: Maximum number of free pages in the pool -+ * @order: order = 0 refers to a pool of 4 KB pages -+ * order = 9 refers to a pool of 2 MB pages (2^9 * 4KB = 2 MB) -+ * @pool_lock: Lock protecting the pool - must be held when modifying @cur_size -+ * and @page_list -+ * @page_list: List of free pages in the pool -+ * @reclaim: Shrinker for kernel reclaim of free pages -+ * @next_pool: Pointer to next pool where pages can be allocated when this pool -+ * is empty. Pages will spill over to the next pool when this pool -+ * is full. Can be NULL if there is no next pool. -+ */ -+struct kbase_mem_pool { -+ struct kbase_device *kbdev; -+ size_t cur_size; -+ size_t max_size; -+ size_t order; -+ spinlock_t pool_lock; -+ struct list_head page_list; -+ struct shrinker reclaim; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 target_handle; /**< [in] handle of allocation need to do COW */ ++ u32 target_offset; /**< [in] offset in target allocation to do COW(for support COW a memory allocated from memory_bank, PAGE_SIZE align)*/ ++ u32 target_size; /**< [in] size of target allocation to do COW (for support memory bank, PAGE_SIZE align)(in byte) */ ++ u32 range_start; /**< [in] re allocate range start offset, offset from the start of allocation (PAGE_SIZE align)*/ ++ u32 range_size; /**< [in] re allocate size (PAGE_SIZE align)*/ ++ u32 vaddr; /**< [in] mali address for the new allocaiton */ ++ u32 backend_handle; /**< [out] backend handle */ ++ u32 flags; ++} _mali_uk_cow_mem_s; + -+ struct kbase_mem_pool *next_pool; -+}; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 range_start; /**< [in] re allocate range start offset, offset from the start of allocation */ ++ u32 size; /**< [in] re allocate size*/ ++ u32 vaddr; /**< [in] mali address for the new allocaiton */ ++ s32 change_pages_nr; /**< [out] record the page number change for cow operation */ ++} _mali_uk_cow_modify_range_s; + -+/** -+ * struct kbase_devfreq_opp - Lookup table for converting between nominal OPP -+ * frequency, and real frequency and core mask -+ * @opp_freq: Nominal OPP frequency -+ * @real_freq: Real GPU frequency -+ * @core_mask: Shader core mask -+ */ -+struct kbase_devfreq_opp { -+ u64 opp_freq; -+ u64 real_freq; -+ u64 core_mask; -+}; + -+struct kbase_mmu_mode { -+ void (*update)(struct kbase_context *kctx); -+ void (*get_as_setup)(struct kbase_context *kctx, -+ struct kbase_mmu_setup * const setup); -+ void (*disable_as)(struct kbase_device *kbdev, int as_nr); -+ phys_addr_t (*pte_to_phy_addr)(u64 entry); -+ int (*ate_is_valid)(u64 ate, unsigned int level); -+ int (*pte_is_valid)(u64 pte, unsigned int level); -+ void (*entry_set_ate)(u64 *entry, struct tagged_addr phy, -+ unsigned long flags, unsigned int level); -+ void (*entry_set_pte)(u64 *entry, phys_addr_t phy); -+ void (*entry_invalidate)(u64 *entry); -+}; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 mem_fd; /**< [in] Memory descriptor */ ++ u32 size; /**< [out] size */ ++} _mali_uk_dma_buf_get_size_s; + -+struct kbase_mmu_mode const *kbase_mmu_mode_get_lpae(void); -+struct kbase_mmu_mode const *kbase_mmu_mode_get_aarch64(void); ++/** Flag for _mali_uk_map_external_mem_s, _mali_uk_attach_ump_mem_s and _mali_uk_attach_dma_buf_s */ ++#define _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE (1<<0) + + -+#define DEVNAME_SIZE 16 ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u64 vaddr; /* the buffer to do resize*/ ++ u32 psize; /* wanted physical size of this memory */ ++} _mali_uk_mem_resize_s; + -+struct kbase_device { -+ s8 slot_submit_count_irq[BASE_JM_MAX_NR_SLOTS]; ++/** ++ * @brief Arguments for _mali_uk[uk]_mem_write_safe() ++ */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u64 src; /**< [in] Pointer to source data */ ++ u64 dest; /**< [in] Destination Mali buffer */ ++ u32 size; /**< [in,out] Number of bytes to write/copy on input, number of bytes actually written/copied on output */ ++} _mali_uk_mem_write_safe_s; + -+ u32 hw_quirks_sc; -+ u32 hw_quirks_tiler; -+ u32 hw_quirks_mmu; -+ u32 hw_quirks_jm; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 size; /**< [out] size of MMU page table information (registers + page tables) */ ++} _mali_uk_query_mmu_page_table_dump_size_s; + -+ struct list_head entry; -+ struct device *dev; -+ struct miscdevice mdev; -+ u64 reg_start; -+ size_t reg_size; -+ void __iomem *reg; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 size; /**< [in] size of buffer to receive mmu page table information */ ++ u64 buffer; /**< [in,out] buffer to receive mmu page table information */ ++ u32 register_writes_size; /**< [out] size of MMU register dump */ ++ u64 register_writes; /**< [out] pointer within buffer where MMU register dump is stored */ ++ u32 page_table_dump_size; /**< [out] size of MMU page table dump */ ++ u64 page_table_dump; /**< [out] pointer within buffer where MMU page table dump is stored */ ++} _mali_uk_dump_mmu_page_table_s; + -+ struct { -+ int irq; -+ int flags; -+ } irqs[3]; ++/** @} */ /* end group _mali_uk_memory */ + -+ struct clk *clock; -+#ifdef CONFIG_REGULATOR -+ struct regulator *regulator; -+#endif -+ char devname[DEVNAME_SIZE]; + -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+ void *model; -+ struct kmem_cache *irq_slab; -+ struct workqueue_struct *irq_workq; -+ atomic_t serving_job_irq; -+ atomic_t serving_gpu_irq; -+ atomic_t serving_mmu_irq; -+ spinlock_t reg_op_lock; -+#endif /* CONFIG_MALI_BIFROST_NO_MALI */ ++/** @addtogroup _mali_uk_pp U/K Fragment Processor ++ * @{ */ + -+ struct kbase_pm_device_data pm; -+ struct kbasep_js_device_data js_data; -+ struct kbase_mem_pool mem_pool; -+ struct kbase_mem_pool lp_mem_pool; -+ struct kbasep_mem_device memdev; -+ struct kbase_mmu_mode const *mmu_mode; ++/** @brief Arguments for _mali_ukk_get_pp_number_of_cores() ++ * ++ * - pass in the user-kernel context @c ctx that was returned from _mali_ukk_open() ++ * - Upon successful return from _mali_ukk_get_pp_number_of_cores(), @c number_of_cores ++ * will contain the number of Fragment Processor cores in the system. ++ */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 number_of_total_cores; /**< [out] Total number of Fragment Processor cores in the system */ ++ u32 number_of_enabled_cores; /**< [out] Number of enabled Fragment Processor cores */ ++} _mali_uk_get_pp_number_of_cores_s; + -+ struct kbase_as as[BASE_MAX_NR_AS]; -+ /* The below variables (as_free and as_to_kctx) are managed by the -+ * Context Scheduler. The kbasep_js_device_data::runpool_irq::lock must -+ * be held whilst accessing these. -+ */ -+ u16 as_free; /* Bitpattern of free Address Spaces */ -+ /* Mapping from active Address Spaces to kbase_context */ -+ struct kbase_context *as_to_kctx[BASE_MAX_NR_AS]; ++/** @brief Arguments for _mali_ukk_get_pp_core_version() ++ * ++ * - pass in the user-kernel context @c ctx that was returned from _mali_ukk_open() ++ * - Upon successful return from _mali_ukk_get_pp_core_version(), @c version contains ++ * the version that all Fragment Processor cores are compatible with. ++ */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ _mali_core_version version; /**< [out] version returned from core, see \ref _mali_core_version */ ++ u32 padding; ++} _mali_uk_get_pp_core_version_s; + ++/** @} */ /* end group _mali_uk_pp */ + -+ spinlock_t mmu_mask_change; + -+ struct kbase_gpu_props gpu_props; ++/** @addtogroup _mali_uk_gp U/K Vertex Processor ++ * @{ */ + -+ /** List of SW workarounds for HW issues */ -+ unsigned long hw_issues_mask[(BASE_HW_ISSUE_END + BITS_PER_LONG - 1) / BITS_PER_LONG]; -+ /** List of features available */ -+ unsigned long hw_features_mask[(BASE_HW_FEATURE_END + BITS_PER_LONG - 1) / BITS_PER_LONG]; ++/** @brief Arguments for _mali_ukk_get_gp_number_of_cores() ++ * ++ * - pass in the user-kernel context @c ctx that was returned from _mali_ukk_open() ++ * - Upon successful return from _mali_ukk_get_gp_number_of_cores(), @c number_of_cores ++ * will contain the number of Vertex Processor cores in the system. ++ */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 number_of_cores; /**< [out] number of Vertex Processor cores in the system */ ++} _mali_uk_get_gp_number_of_cores_s; + -+ /* Bitmaps of cores that are currently in use (running jobs). -+ * These should be kept up to date by the job scheduler. -+ * -+ * pm.power_change_lock should be held when accessing these members. -+ * -+ * kbase_pm_check_transitions_nolock() should be called when bits are -+ * cleared to update the power management system and allow transitions to -+ * occur. */ -+ u64 shader_inuse_bitmap; ++/** @brief Arguments for _mali_ukk_get_gp_core_version() ++ * ++ * - pass in the user-kernel context @c ctx that was returned from _mali_ukk_open() ++ * - Upon successful return from _mali_ukk_get_gp_core_version(), @c version contains ++ * the version that all Vertex Processor cores are compatible with. ++ */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ _mali_core_version version; /**< [out] version returned from core, see \ref _mali_core_version */ ++} _mali_uk_get_gp_core_version_s; + -+ /* Refcount for cores in use */ -+ u32 shader_inuse_cnt[64]; ++/** @} */ /* end group _mali_uk_gp */ + -+ /* Bitmaps of cores the JS needs for jobs ready to run */ -+ u64 shader_needed_bitmap; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 event_id; /**< [in] event id to register (see enum mali_profiling_events for values) */ ++ u32 data[5]; /**< [in] event specific data */ ++} _mali_uk_profiling_add_event_s; + -+ /* Refcount for cores needed */ -+ u32 shader_needed_cnt[64]; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 memory_usage; /**< [out] total memory usage */ ++ u32 vaddr; /**< [in] mali address for the cow allocaiton */ ++ s32 change_pages_nr; /**< [out] record the page number change for cow operation */ ++} _mali_uk_profiling_memory_usage_get_s; + -+ u32 tiler_inuse_cnt; + -+ u32 tiler_needed_cnt; ++/** @addtogroup _mali_uk_memory U/K Memory ++ * @{ */ + -+ /* struct for keeping track of the disjoint information -+ * -+ * The state is > 0 if the GPU is in a disjoint state. Otherwise 0 -+ * The count is the number of disjoint events that have occurred on the GPU -+ */ -+ struct { -+ atomic_t count; -+ atomic_t state; -+ } disjoint_event; ++/** @brief Arguments to _mali_ukk_mem_mmap() ++ * ++ * Use of the phys_addr member depends on whether the driver is compiled for ++ * Mali-MMU or nonMMU: ++ * - in the nonMMU case, this is the physical address of the memory as seen by ++ * the CPU (which may be a constant offset from that used by Mali) ++ * - in the MMU case, this is the Mali Virtual base address of the memory to ++ * allocate, and the particular physical pages used to back the memory are ++ * entirely determined by _mali_ukk_mem_mmap(). The details of the physical pages ++ * are not reported to user-space for security reasons. ++ * ++ * The cookie member must be stored for use later when freeing the memory by ++ * calling _mali_ukk_mem_munmap(). In the Mali-MMU case, the cookie is secure. ++ * ++ * The ukk_private word must be set to zero when calling from user-space. On ++ * Kernel-side, the OS implementation of the U/K interface can use it to ++ * communicate data to the OS implementation of the OSK layer. In particular, ++ * _mali_ukk_get_big_block() directly calls _mali_ukk_mem_mmap directly, and ++ * will communicate its own ukk_private word through the ukk_private member ++ * here. The common code itself will not inspect or modify the ukk_private ++ * word, and so it may be safely used for whatever purposes necessary to ++ * integrate Mali Memory handling into the OS. ++ * ++ * The uku_private member is currently reserved for use by the user-side ++ * implementation of the U/K interface. Its value must be zero. ++ */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ void *mapping; /**< [out] Returns user-space virtual address for the mapping */ ++ u32 size; /**< [in] Size of the requested mapping */ ++ u32 phys_addr; /**< [in] Physical address - could be offset, depending on caller+callee convention */ ++ mali_bool writeable; ++} _mali_uk_mem_mmap_s; + -+ /* Refcount for tracking users of the l2 cache, e.g. when using hardware counter instrumentation. */ -+ u32 l2_users_count; ++/** @brief Arguments to _mali_ukk_mem_munmap() ++ * ++ * The cookie and mapping members must be that returned from the same previous ++ * call to _mali_ukk_mem_mmap(). The size member must correspond to cookie ++ * and mapping - that is, it must be the value originally supplied to a call to ++ * _mali_ukk_mem_mmap that returned the values of mapping and cookie. ++ * ++ * An error will be returned if an attempt is made to unmap only part of the ++ * originally obtained range, or to unmap more than was originally obtained. ++ */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ void *mapping; /**< [in] The mapping returned from mmap call */ ++ u32 size; /**< [in] The size passed to mmap call */ ++} _mali_uk_mem_munmap_s; ++/** @} */ /* end group _mali_uk_memory */ + -+ /* Bitmaps of cores that are currently available (powered up and the power policy is happy for jobs to be -+ * submitted to these cores. These are updated by the power management code. The job scheduler should avoid -+ * submitting new jobs to any cores that are not marked as available. -+ * -+ * pm.power_change_lock should be held when accessing these members. -+ */ -+ u64 shader_available_bitmap; -+ u64 tiler_available_bitmap; -+ u64 l2_available_bitmap; -+ u64 stack_available_bitmap; ++/** @defgroup _mali_uk_vsync U/K VSYNC Wait Reporting Module ++ * @{ */ + -+ u64 shader_ready_bitmap; -+ u64 shader_transitioning_bitmap; ++/** @brief VSYNC events ++ * ++ * These events are reported when DDK starts to wait for vsync and when the ++ * vsync has occured and the DDK can continue on the next frame. ++ */ ++typedef enum _mali_uk_vsync_event { ++ _MALI_UK_VSYNC_EVENT_BEGIN_WAIT = 0, ++ _MALI_UK_VSYNC_EVENT_END_WAIT ++} _mali_uk_vsync_event; + -+ s8 nr_hw_address_spaces; /**< Number of address spaces in the GPU (constant after driver initialisation) */ -+ s8 nr_user_address_spaces; /**< Number of address spaces available to user contexts */ ++/** @brief Arguments to _mali_ukk_vsync_event() ++ * ++ */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ _mali_uk_vsync_event event; /**< [in] VSYNCH event type */ ++} _mali_uk_vsync_event_report_s; + -+ /* Structure used for instrumentation and HW counters dumping */ -+ struct kbase_hwcnt { -+ /* The lock should be used when accessing any of the following members */ -+ spinlock_t lock; ++/** @} */ /* end group _mali_uk_vsync */ + -+ struct kbase_context *kctx; -+ u64 addr; ++/** @defgroup _mali_uk_sw_counters_report U/K Software Counter Reporting ++ * @{ */ + -+ struct kbase_instr_backend backend; -+ } hwcnt; ++/** @brief Software counter values ++ * ++ * Values recorded for each of the software counters during a single renderpass. ++ */ ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u64 counters; /**< [in] The array of u32 counter values */ ++ u32 num_counters; /**< [in] The number of elements in counters array */ ++} _mali_uk_sw_counters_report_s; + -+ struct kbase_vinstr_context *vinstr_ctx; ++/** @} */ /* end group _mali_uk_sw_counters_report */ + -+#if KBASE_TRACE_ENABLE -+ spinlock_t trace_lock; -+ u16 trace_first_out; -+ u16 trace_next_in; -+ struct kbase_trace *trace_rbuf; -+#endif ++/** @defgroup _mali_uk_timeline U/K Mali Timeline ++ * @{ */ + -+ u32 reset_timeout_ms; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 timeline; /**< [in] timeline id */ ++ u32 point; /**< [out] latest point on timeline */ ++} _mali_uk_timeline_get_latest_point_s; + -+ struct mutex cacheclean_lock; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ _mali_uk_fence_t fence; /**< [in] fence */ ++ u32 timeout; /**< [in] timeout (0 for no wait, -1 for blocking) */ ++ u32 status; /**< [out] status of fence (1 if signaled, 0 if timeout) */ ++} _mali_uk_timeline_wait_s; + -+ /* Platform specific private data to be accessed by mali_kbase_config_xxx.c only */ -+ void *platform_context; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ _mali_uk_fence_t fence; /**< [in] mali fence to create linux sync fence from */ ++ s32 sync_fd; /**< [out] file descriptor for new linux sync fence */ ++} _mali_uk_timeline_create_sync_fence_s; + -+ /* List of kbase_contexts created */ -+ struct list_head kctx_list; -+ struct mutex kctx_list_lock; ++/** @} */ /* end group _mali_uk_timeline */ + -+#ifdef CONFIG_MALI_BIFROST_DEVFREQ -+ struct devfreq_dev_profile devfreq_profile; -+ struct devfreq *devfreq; -+ unsigned long current_freq; -+ unsigned long current_nominal_freq; -+ unsigned long current_voltage; -+ u64 current_core_mask; -+ struct kbase_devfreq_opp *opp_table; -+ int num_opps; -+ struct monitor_dev_info *mdev_info; -+ struct ipa_power_model_data *model_data; -+#ifdef CONFIG_DEVFREQ_THERMAL -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) -+ struct devfreq_cooling_device *devfreq_cooling; -+#else -+ struct thermal_cooling_device *devfreq_cooling; -+#endif -+ /* Current IPA model - true for configured model, false for fallback */ -+ atomic_t ipa_use_configured_model; -+ struct { -+ /* Access to this struct must be with ipa.lock held */ -+ struct mutex lock; -+ struct kbase_ipa_model *configured_model; -+ struct kbase_ipa_model *fallback_model; -+ } ipa; -+#endif /* CONFIG_DEVFREQ_THERMAL */ -+#endif /* CONFIG_MALI_BIFROST_DEVFREQ */ ++/** @} */ /* end group u_k_api */ + ++/** @} */ /* end group uddapi */ + -+#ifdef CONFIG_MALI_BIFROST_TRACE_TIMELINE -+ struct kbase_trace_kbdev_timeline timeline; -+#endif ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ s32 stream_fd; /**< [in] The profiling kernel base stream fd handle */ ++} _mali_uk_profiling_stream_fd_get_s; + -+ /* -+ * Control for enabling job dump on failure, set when control debugfs -+ * is opened. -+ */ -+ bool job_fault_debug; ++typedef struct { ++ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u64 control_packet_data; /**< [in] the control packet data for control settings */ ++ u32 control_packet_size; /**< [in] The control packet size */ ++ u64 response_packet_data; /** < [out] The response packet data */ ++ u32 response_packet_size; /** < [in,out] The response packet data */ ++} _mali_uk_profiling_control_set_s; + -+#ifdef CONFIG_DEBUG_FS -+ /* directory for debugfs entries */ -+ struct dentry *mali_debugfs_directory; -+ /* Root directory for per context entry */ -+ struct dentry *debugfs_ctx_directory; ++#ifdef __cplusplus ++} ++#endif + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ /* bit for each as, set if there is new data to report */ -+ u64 debugfs_as_read_bitmap; -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++#endif /* __MALI_UTGARD_UK_TYPES_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h b/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h +new file mode 100755 +index 000000000..6fafc6777 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h +@@ -0,0 +1,30 @@ ++/* ++ * Copyright (C) 2010, 2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ /* failed job dump, used for separate debug process */ -+ wait_queue_head_t job_fault_wq; -+ wait_queue_head_t job_fault_resume_wq; -+ struct workqueue_struct *job_fault_resume_workq; -+ struct list_head job_fault_event_list; -+ spinlock_t job_fault_event_lock; -+ struct kbase_context *kctx_fault; ++/** ++ * @file mali_kernel_license.h ++ * Defines for the macro MODULE_LICENSE. ++ */ + -+#if !MALI_CUSTOMER_RELEASE -+ /* Per-device data for register dumping interface */ -+ struct { -+ u16 reg_offset; /* Offset of a GPU_CONTROL register to be -+ dumped upon request */ -+ } regs_dump_debugfs_data; -+#endif /* !MALI_CUSTOMER_RELEASE */ -+#endif /* CONFIG_DEBUG_FS */ ++#ifndef __MALI_KERNEL_LICENSE_H__ ++#define __MALI_KERNEL_LICENSE_H__ + -+ /* fbdump profiling controls set by gator */ -+ u32 kbase_profiling_controls[FBDUMP_CONTROL_MAX]; ++#ifdef __cplusplus ++extern "C" { ++#endif + ++#define MALI_KERNEL_LINUX_LICENSE "GPL" ++#define MALI_LICENSE_IS_GPL 1 + -+#if MALI_CUSTOMER_RELEASE == 0 -+ /* Number of jobs that are run before a job is forced to fail and -+ * replay. May be KBASEP_FORCE_REPLAY_DISABLED, to disable forced -+ * failures. */ -+ int force_replay_limit; -+ /* Count of jobs between forced failures. Incremented on each job. A -+ * job is forced to fail once this is greater than or equal to -+ * force_replay_limit. */ -+ int force_replay_count; -+ /* Core requirement for jobs to be failed and replayed. May be zero. */ -+ base_jd_core_req force_replay_core_req; -+ /* true if force_replay_limit should be randomized. The random -+ * value will be in the range of 1 - KBASEP_FORCE_REPLAY_RANDOM_LIMIT. -+ */ -+ bool force_replay_random; ++#ifdef __cplusplus ++} +#endif + -+ /* Total number of created contexts */ -+ atomic_t ctx_num; ++#endif /* __MALI_KERNEL_LICENSE_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c +new file mode 100755 +index 000000000..7438cb495 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c +@@ -0,0 +1,362 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+#ifdef CONFIG_DEBUG_FS -+ /* Holds the most recent register accesses */ -+ struct kbase_io_history io_history; -+#endif /* CONFIG_DEBUG_FS */ ++#include "mali_osk_mali.h" ++#include "mali_kernel_common.h" + -+ struct kbase_hwaccess_data hwaccess; ++#include ++#include ++#include ++#include ++#include ++#ifdef CONFIG_DEVFREQ_THERMAL ++#include ++#endif + -+ /* Count of page/bus faults waiting for workqueues to process */ -+ atomic_t faults_pending; ++#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) ++#include ++#else /* Linux >= 3.13 */ ++/* In 3.13 the OPP include header file, types, and functions were all ++ * renamed. Use the old filename for the include, and define the new names to ++ * the old, when an old kernel is detected. ++ */ ++#include ++#define dev_pm_opp opp ++#define dev_pm_opp_get_voltage opp_get_voltage ++#define dev_pm_opp_get_opp_count opp_get_opp_count ++#define dev_pm_opp_find_freq_ceil opp_find_freq_ceil ++#endif /* Linux >= 3.13 */ + -+ /* true if GPU is powered off or power off operation is in progress */ -+ bool poweroff_pending; ++#include "mali_pm_metrics.h" + ++#include ++#include + -+ /* defaults for new context created for this device */ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) -+ bool infinite_cache_active_default; -+#else -+ u32 infinite_cache_active_default; -+#endif -+ size_t mem_pool_max_size_default; ++static struct monitor_dev_profile mali_mdevp = { ++ .type = MONITOR_TYPE_DEV, ++ .low_temp_adjust = rockchip_monitor_dev_low_temp_adjust, ++ .high_temp_adjust = rockchip_monitor_dev_high_temp_adjust, ++}; + -+ /* current gpu coherency mode */ -+ u32 current_gpu_coherency_mode; -+ /* system coherency mode */ -+ u32 system_coherency; -+ /* Flag to track when cci snoops have been enabled on the interface */ -+ bool cci_snoop_enabled; ++static struct devfreq_simple_ondemand_data ondemand_data; + -+ /* SMC function IDs to call into Trusted firmware to enable/disable -+ * cache snooping. Value of 0 indicates that they are not used -+ */ -+ u32 snoop_enable_smc; -+ u32 snoop_disable_smc; ++static int ++mali_devfreq_target(struct device *dev, unsigned long *target_freq, u32 flags) ++{ ++ struct mali_device *mdev = dev_get_drvdata(dev); ++ struct dev_pm_opp *opp; ++ unsigned long freq = 0; ++ unsigned long old_freq = mdev->current_freq; ++ unsigned long voltage; ++ int err; + -+ /* Protected mode operations */ -+ struct protected_mode_ops *protected_ops; ++ freq = *target_freq; + -+ /* Protected device attached to this kbase device */ -+ struct protected_mode_device *protected_dev; ++ opp = devfreq_recommended_opp(dev, &freq, flags); ++ if (IS_ERR(opp)) { ++ MALI_PRINT_ERROR(("Failed to get opp (%ld)\n", PTR_ERR(opp))); ++ return PTR_ERR(opp); ++ } ++ voltage = dev_pm_opp_get_voltage(opp); ++ dev_pm_opp_put(opp); + ++ MALI_DEBUG_PRINT(2, ("mali_devfreq_target:set_freq = %lld flags = 0x%x\n", freq, flags)); + /* -+ * true when GPU is put into protected mode ++ * Only update if there is a change of frequency + */ -+ bool protected_mode; ++ if (old_freq == freq) { ++ *target_freq = freq; ++ mali_pm_reset_dvfs_utilisation(mdev); ++#ifdef CONFIG_REGULATOR ++ if (mdev->current_voltage == voltage) ++ return 0; ++ err = regulator_set_voltage(mdev->regulator, voltage, INT_MAX); ++ if (err) { ++ dev_err(dev, "Failed to set voltage (%d)\n", err); ++ return err; ++ } ++ mdev->current_voltage = voltage; ++#endif ++ return 0; ++ } + -+ /* -+ * true when GPU is transitioning into or out of protected mode -+ */ -+ bool protected_mode_transition; ++ err = clk_bulk_enable(mdev->num_clks, mdev->clks); ++ if (err) ++ return err; + -+ /* -+ * true if protected mode is supported -+ */ -+ bool protected_mode_support; ++#ifdef CONFIG_REGULATOR ++ if (mdev->regulator && mdev->current_voltage != voltage && ++ old_freq < freq) { ++ err = regulator_set_voltage(mdev->regulator, voltage, INT_MAX); ++ if (err) { ++ MALI_PRINT_ERROR(("Failed to increase voltage (%d)\n", err)); ++ goto err; ++ } ++ } ++#endif + ++ err = clk_set_rate(mdev->clock, freq); ++ if (err) { ++ MALI_PRINT_ERROR(("Failed to set clock %lu (target %lu)\n", freq, *target_freq)); ++ goto err; ++ } + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ wait_queue_head_t driver_inactive_wait; -+ bool driver_inactive; -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++ *target_freq = freq; ++ mdev->current_freq = freq; ++ if (mdev->devfreq) ++ mdev->devfreq->last_status.current_frequency = freq; + -+#ifdef CONFIG_MALI_FPGA_BUS_LOGGER -+ /* -+ * Bus logger integration. -+ */ -+ struct bus_logger_client *buslogger; ++#ifdef CONFIG_REGULATOR ++ if (mdev->regulator && mdev->current_voltage != voltage && ++ old_freq > freq) { ++ err = regulator_set_voltage(mdev->regulator, voltage, INT_MAX); ++ if (err) { ++ MALI_PRINT_ERROR(("Failed to decrease voltage (%d)\n", err)); ++ goto err; ++ } ++ } +#endif -+ /* Boolean indicating if an IRQ flush during reset is in progress. */ -+ bool irq_reset_flush; + -+ /* list of inited sub systems. Used during terminate/error recovery */ -+ u32 inited_subsys; ++ mdev->current_voltage = voltage; + -+ spinlock_t hwaccess_lock; ++ mali_pm_reset_dvfs_utilisation(mdev); ++err: ++ clk_bulk_disable(mdev->num_clks, mdev->clks); + -+ /* Protects access to MMU operations */ -+ struct mutex mmu_hw_mutex; ++ return err; ++} + -+ /* Current serialization mode. See KBASE_SERIALIZE_* for details */ -+ u8 serialize_jobs; -+}; ++static int ++mali_devfreq_cur_freq(struct device *dev, unsigned long *freq) ++{ ++ struct mali_device *mdev = dev_get_drvdata(dev); + -+/** -+ * struct jsctx_queue - JS context atom queue -+ * @runnable_tree: Root of RB-tree containing currently runnable atoms on this -+ * job slot. -+ * @x_dep_head: Head item of the linked list of atoms blocked on cross-slot -+ * dependencies. Atoms on this list will be moved to the -+ * runnable_tree when the blocking atom completes. -+ * -+ * hwaccess_lock must be held when accessing this structure. -+ */ -+struct jsctx_queue { -+ struct rb_root runnable_tree; -+ struct list_head x_dep_head; -+}; ++ *freq = mdev->current_freq; + ++ MALI_DEBUG_PRINT(2, ("mali_devfreq_cur_freq: freq = %d \n", *freq)); ++ return 0; ++} + -+#define KBASE_API_VERSION(major, minor) ((((major) & 0xFFF) << 20) | \ -+ (((minor) & 0xFFF) << 8) | \ -+ ((0 & 0xFF) << 0)) ++static int ++mali_devfreq_status(struct device *dev, struct devfreq_dev_status *stat) ++{ ++ struct mali_device *mdev = dev_get_drvdata(dev); + -+/** -+ * enum kbase_context_flags - Flags for kbase contexts -+ * -+ * @KCTX_COMPAT: Set when the context process is a compat process, 32-bit -+ * process on a 64-bit kernel. -+ * -+ * @KCTX_RUNNABLE_REF: Set when context is counted in -+ * kbdev->js_data.nr_contexts_runnable. Must hold queue_mutex when accessing. -+ * -+ * @KCTX_ACTIVE: Set when the context is active. -+ * -+ * @KCTX_PULLED: Set when last kick() caused atoms to be pulled from this -+ * context. -+ * -+ * @KCTX_MEM_PROFILE_INITIALIZED: Set when the context's memory profile has been -+ * initialized. -+ * -+ * @KCTX_INFINITE_CACHE: Set when infinite cache is to be enabled for new -+ * allocations. Existing allocations will not change. -+ * -+ * @KCTX_SUBMIT_DISABLED: Set to prevent context from submitting any jobs. -+ * -+ * @KCTX_PRIVILEGED:Set if the context uses an address space and should be kept -+ * scheduled in. -+ * -+ * @KCTX_SCHEDULED: Set when the context is scheduled on the Run Pool. -+ * This is only ever updated whilst the jsctx_mutex is held. -+ * -+ * @KCTX_DYING: Set when the context process is in the process of being evicted. -+ * -+ * @KCTX_NO_IMPLICIT_SYNC: Set when explicit Android fences are in use on this -+ * context, to disable use of implicit dma-buf fences. This is used to avoid -+ * potential synchronization deadlocks. -+ * -+ * All members need to be separate bits. This enum is intended for use in a -+ * bitmask where multiple values get OR-ed together. -+ */ -+enum kbase_context_flags { -+ KCTX_COMPAT = 1U << 0, -+ KCTX_RUNNABLE_REF = 1U << 1, -+ KCTX_ACTIVE = 1U << 2, -+ KCTX_PULLED = 1U << 3, -+ KCTX_MEM_PROFILE_INITIALIZED = 1U << 4, -+ KCTX_INFINITE_CACHE = 1U << 5, -+ KCTX_SUBMIT_DISABLED = 1U << 6, -+ KCTX_PRIVILEGED = 1U << 7, -+ KCTX_SCHEDULED = 1U << 8, -+ KCTX_DYING = 1U << 9, -+ KCTX_NO_IMPLICIT_SYNC = 1U << 10, -+}; ++ stat->current_frequency = mdev->current_freq; + -+struct kbase_sub_alloc { -+ struct list_head link; -+ struct page *page; -+ DECLARE_BITMAP(sub_pages, SZ_2M / SZ_4K); -+}; ++ mali_pm_get_dvfs_utilisation(mdev, ++ &stat->total_time, &stat->busy_time); + -+struct kbase_context { -+ struct file *filp; -+ struct kbase_device *kbdev; -+ u32 id; /* System wide unique id */ -+ unsigned long api_version; -+ phys_addr_t pgd; -+ struct list_head event_list; -+ struct list_head event_coalesce_list; -+ struct mutex event_mutex; -+ atomic_t event_closed; -+ struct workqueue_struct *event_workq; -+ atomic_t event_count; -+ int event_coalesce_count; ++ stat->private_data = NULL; + -+ atomic_t flags; ++#ifdef CONFIG_DEVFREQ_THERMAL ++ memcpy(&mdev->devfreq->last_status, stat, sizeof(*stat)); ++#endif + -+ atomic_t setup_complete; -+ atomic_t setup_in_progress; ++ return 0; ++} + -+ u64 *mmu_teardown_pages; ++/* setup platform specific opp in platform.c*/ ++int __weak setup_opps(void) ++{ ++ return 0; ++} + -+ struct tagged_addr aliasing_sink_page; ++/* term platform specific opp in platform.c*/ ++int __weak term_opps(struct device *dev) ++{ ++ return 0; ++} + -+ struct mutex mem_partials_lock; -+ struct list_head mem_partials; ++static int mali_devfreq_init_freq_table(struct mali_device *mdev, ++ struct devfreq_dev_profile *dp) ++{ ++ int err, count; ++ int i = 0; ++ unsigned long freq = 0; ++ struct dev_pm_opp *opp; + -+ struct mutex mmu_lock; -+ struct mutex reg_lock; /* To be converted to a rwlock? */ -+ struct rb_root reg_rbtree_same; /* RB tree of GPU (live) regions, -+ * SAME_VA zone */ -+ struct rb_root reg_rbtree_exec; /* RB tree of GPU (live) regions, -+ * EXEC zone */ -+ struct rb_root reg_rbtree_custom; /* RB tree of GPU (live) regions, -+ * CUSTOM_VA zone */ ++ err = setup_opps(); ++ if (err) ++ return err; + -+ unsigned long cookies; -+ struct kbase_va_region *pending_regions[BITS_PER_LONG]; ++ count = dev_pm_opp_get_opp_count(mdev->dev); ++ if (count < 0) { ++ return count; ++ } + -+ wait_queue_head_t event_queue; -+ pid_t tgid; -+ pid_t pid; ++ MALI_DEBUG_PRINT(2, ("mali devfreq table count %d\n", count)); + -+ struct kbase_jd_context jctx; -+ atomic_t used_pages; -+ atomic_t nonmapped_pages; ++ dp->freq_table = kmalloc_array(count, sizeof(dp->freq_table[0]), ++ GFP_KERNEL); ++ if (!dp->freq_table) ++ return -ENOMEM; + -+ struct kbase_mem_pool mem_pool; -+ struct kbase_mem_pool lp_mem_pool; ++ for (i = 0; i < count; i++, freq++) { ++ opp = dev_pm_opp_find_freq_ceil(mdev->dev, &freq); ++ if (IS_ERR(opp)) ++ break; ++ dev_pm_opp_put(opp); + -+ struct shrinker reclaim; -+ struct list_head evict_list; ++ dp->freq_table[i] = freq; ++ MALI_DEBUG_PRINT(2, ("mali devfreq table array[%d] = %d\n", i, freq)); ++ } + -+ struct list_head waiting_soft_jobs; -+ spinlock_t waiting_soft_jobs_lock; -+#ifdef CONFIG_KDS -+ struct list_head waiting_kds_resource; -+#endif -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ struct { -+ struct list_head waiting_resource; -+ struct workqueue_struct *wq; -+ } dma_fence; -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ -+ /** This is effectively part of the Run Pool, because it only has a valid -+ * setting (!=KBASEP_AS_NR_INVALID) whilst the context is scheduled in -+ * -+ * The hwaccess_lock must be held whilst accessing this. -+ * -+ * If the context relating to this as_nr is required, you must use -+ * kbasep_js_runpool_retain_ctx() to ensure that the context doesn't disappear -+ * whilst you're using it. Alternatively, just hold the hwaccess_lock -+ * to ensure the context doesn't disappear (but this has restrictions on what other locks -+ * you can take whilst doing this) */ -+ int as_nr; ++ if (count != i) ++ MALI_PRINT_ERROR(("Unable to enumerate all OPPs (%d!=%d)\n", ++ count, i)); + -+ /* Keeps track of the number of users of this context. A user can be a -+ * job that is available for execution, instrumentation needing to 'pin' -+ * a context for counter collection, etc. If the refcount reaches 0 then -+ * this context is considered inactive and the previously programmed -+ * AS might be cleared at any point. -+ */ -+ atomic_t refcount; ++ dp->max_state = i; + -+ /* NOTE: -+ * -+ * Flags are in jctx.sched_info.ctx.flags -+ * Mutable flags *must* be accessed under jctx.sched_info.ctx.jsctx_mutex -+ * -+ * All other flags must be added there */ -+ spinlock_t mm_update_lock; -+ struct mm_struct *process_mm; -+ /* End of the SAME_VA zone */ -+ u64 same_va_end; ++ return 0; ++} + -+#ifdef CONFIG_MALI_BIFROST_TRACE_TIMELINE -+ struct kbase_trace_kctx_timeline timeline; -+#endif -+#ifdef CONFIG_DEBUG_FS -+ /* Content of mem_profile file */ -+ char *mem_profile_data; -+ /* Size of @c mem_profile_data */ -+ size_t mem_profile_size; -+ /* Mutex guarding memory profile state */ -+ struct mutex mem_profile_lock; -+ /* Memory profile directory under debugfs */ -+ struct dentry *kctx_dentry; ++static void mali_devfreq_term_freq_table(struct mali_device *mdev) ++{ ++ struct devfreq_dev_profile *dp = mdev->devfreq->profile; + -+ /* for job fault debug */ -+ unsigned int *reg_dump; -+ atomic_t job_fault_count; -+ /* This list will keep the following atoms during the dump -+ * in the same context -+ */ -+ struct list_head job_fault_resume_event_list; ++ kfree(dp->freq_table); ++ term_opps(mdev->dev); ++} + -+#endif /* CONFIG_DEBUG_FS */ ++static void mali_devfreq_exit(struct device *dev) ++{ ++ struct mali_device *mdev = dev_get_drvdata(dev); + -+ struct jsctx_queue jsctx_queue -+ [KBASE_JS_ATOM_SCHED_PRIO_COUNT][BASE_JM_MAX_NR_SLOTS]; ++ mali_devfreq_term_freq_table(mdev); ++} + -+ /* Number of atoms currently pulled from this context */ -+ atomic_t atoms_pulled; -+ /* Number of atoms currently pulled from this context, per slot */ -+ atomic_t atoms_pulled_slot[BASE_JM_MAX_NR_SLOTS]; -+ /* Number of atoms currently pulled from this context, per slot and -+ * priority. Hold hwaccess_lock when accessing */ -+ int atoms_pulled_slot_pri[BASE_JM_MAX_NR_SLOTS][ -+ KBASE_JS_ATOM_SCHED_PRIO_COUNT]; ++int mali_devfreq_init(struct mali_device *mdev) ++{ ++ struct device_node *np = mdev->dev->of_node; ++#ifdef CONFIG_DEVFREQ_THERMAL ++ struct devfreq_cooling_power *callbacks = NULL; ++ _mali_osk_device_data data; ++#endif ++ struct devfreq_dev_profile *dp; ++ struct dev_pm_opp *opp; ++ unsigned long opp_rate; ++ int err; + -+ /* true if slot is blocked on the given priority. This will be set on a -+ * soft-stop */ -+ bool blocked_js[BASE_JM_MAX_NR_SLOTS][KBASE_JS_ATOM_SCHED_PRIO_COUNT]; ++ MALI_DEBUG_PRINT(2, ("Init Mali devfreq\n")); + -+ /* Bitmask of slots that can be pulled from */ -+ u32 slots_pullable; ++ if (!mdev->clock) ++ return -ENODEV; + -+ /* Backend specific data */ -+ struct kbase_context_backend backend; ++ mdev->current_freq = clk_get_rate(mdev->clock); + -+ /* Work structure used for deferred ASID assignment */ -+ struct work_struct work; ++ dp = &mdev->devfreq_profile; + -+ /* Only one userspace vinstr client per kbase context */ -+ struct kbase_vinstr_client *vinstr_cli; -+ struct mutex vinstr_cli_lock; ++ dp->initial_freq = mdev->current_freq; ++ dp->polling_ms = 100; ++ dp->target = mali_devfreq_target; ++ dp->get_dev_status = mali_devfreq_status; ++ dp->get_cur_freq = mali_devfreq_cur_freq; ++ dp->exit = mali_devfreq_exit; + -+ /* List of completed jobs waiting for events to be posted */ -+ struct list_head completed_jobs; -+ /* Number of work items currently pending on job_done_wq */ -+ atomic_t work_count; ++ if (mali_devfreq_init_freq_table(mdev, dp)) ++ return -EFAULT; + -+ /* Waiting soft-jobs will fail when this timer expires */ -+ struct timer_list soft_job_timeout; ++ of_property_read_u32(np, "upthreshold", ++ &ondemand_data.upthreshold); ++ of_property_read_u32(np, "downdifferential", ++ &ondemand_data.downdifferential); + -+ /* JIT allocation management */ -+ struct kbase_va_region *jit_alloc[256]; -+ struct list_head jit_active_head; -+ struct list_head jit_pool_head; -+ struct list_head jit_destroy_head; -+ struct mutex jit_evict_lock; -+ struct work_struct jit_work; ++ mdev->devfreq = devfreq_add_device(mdev->dev, dp, ++ "simple_ondemand", &ondemand_data); ++ if (IS_ERR(mdev->devfreq)) { ++ mali_devfreq_term_freq_table(mdev); ++ return PTR_ERR(mdev->devfreq); ++ } + -+ /* A list of the JIT soft-jobs in submission order -+ * (protected by kbase_jd_context.lock) -+ */ -+ struct list_head jit_atoms_head; -+ /* A list of pending JIT alloc soft-jobs (using the 'queue' list_head) -+ * (protected by kbase_jd_context.lock) -+ */ -+ struct list_head jit_pending_alloc; ++ err = devfreq_register_opp_notifier(mdev->dev, mdev->devfreq); ++ if (err) { ++ MALI_PRINT_ERROR(("Failed to register OPP notifier (%d)\n", err)); ++ goto opp_notifier_failed; ++ } + -+ /* External sticky resource management */ -+ struct list_head ext_res_meta_head; ++ opp_rate = mdev->current_freq; ++ opp = devfreq_recommended_opp(mdev->dev, &opp_rate, 0); ++ if (!IS_ERR(opp)) ++ dev_pm_opp_put(opp); ++ mdev->devfreq->last_status.current_frequency = opp_rate; + -+ /* Used to record that a drain was requested from atomic context */ -+ atomic_t drain_pending; ++ mali_mdevp.data = mdev->devfreq; ++ mdev->mdev_info = rockchip_system_monitor_register(mdev->dev, ++ &mali_mdevp); ++ if (IS_ERR(mdev->mdev_info)) { ++ dev_dbg(mdev->dev, "without system monitor\n"); ++ mdev->mdev_info = NULL; ++ } ++#ifdef CONFIG_DEVFREQ_THERMAL ++ if (of_machine_is_compatible("rockchip,rk3036")) ++ return 0; + -+ /* Current age count, used to determine age for newly submitted atoms */ -+ u32 age_count; -+}; ++ /* Initilization last_status it will be used when first power allocate called */ ++ mdev->devfreq->last_status.current_frequency = mdev->current_freq; + -+/** -+ * struct kbase_ctx_ext_res_meta - Structure which binds an external resource -+ * to a @kbase_context. -+ * @ext_res_node: List head for adding the metadata to a -+ * @kbase_context. -+ * @alloc: The physical memory allocation structure -+ * which is mapped. -+ * @gpu_addr: The GPU virtual address the resource is -+ * mapped to. -+ * -+ * External resources can be mapped into multiple contexts as well as the same -+ * context multiple times. -+ * As kbase_va_region itself isn't refcounted we can't attach our extra -+ * information to it as it could be removed under our feet leaving external -+ * resources pinned. -+ * This metadata structure binds a single external resource to a single -+ * context, ensuring that per context mapping is tracked separately so it can -+ * be overridden when needed and abuses by the application (freeing the resource -+ * multiple times) don't effect the refcount of the physical allocation. -+ */ -+struct kbase_ctx_ext_res_meta { -+ struct list_head ext_res_node; -+ struct kbase_mem_phy_alloc *alloc; -+ u64 gpu_addr; -+}; ++ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { ++ if (NULL != data.gpu_cooling_ops) { ++ callbacks = data.gpu_cooling_ops; ++ MALI_DEBUG_PRINT(2, ("Mali GPU Thermal: Callback handler installed \n")); ++ } ++ } + -+enum kbase_reg_access_type { -+ REG_READ, -+ REG_WRITE -+}; ++ if (callbacks) { ++ mdev->devfreq_cooling = of_devfreq_cooling_register_power( ++ mdev->dev->of_node, ++ mdev->devfreq, ++ callbacks); ++ if (IS_ERR_OR_NULL(mdev->devfreq_cooling)) { ++ err = PTR_ERR(mdev->devfreq_cooling); ++ MALI_PRINT_ERROR(("Failed to register cooling device (%d)\n", err)); ++ goto cooling_failed; ++ } else { ++ MALI_DEBUG_PRINT(2, ("Mali GPU Thermal Cooling installed \n")); ++ } ++ } ++#endif + -+enum kbase_share_attr_bits { -+ /* (1ULL << 8) bit is reserved */ -+ SHARE_BOTH_BITS = (2ULL << 8), /* inner and outer shareable coherency */ -+ SHARE_INNER_BITS = (3ULL << 8) /* inner shareable coherency */ -+}; ++ return 0; + -+/** -+ * kbase_device_is_cpu_coherent - Returns if the device is CPU coherent. -+ * @kbdev: kbase device -+ * -+ * Return: true if the device access are coherent, false if not. -+ */ -+static inline bool kbase_device_is_cpu_coherent(struct kbase_device *kbdev) -+{ -+ if ((kbdev->system_coherency == COHERENCY_ACE_LITE) || -+ (kbdev->system_coherency == COHERENCY_ACE)) -+ return true; ++#ifdef CONFIG_DEVFREQ_THERMAL ++cooling_failed: ++ devfreq_unregister_opp_notifier(mdev->dev, mdev->devfreq); ++#endif /* CONFIG_DEVFREQ_THERMAL */ ++opp_notifier_failed: ++ err = devfreq_remove_device(mdev->devfreq); ++ if (err) ++ MALI_PRINT_ERROR(("Failed to terminate devfreq (%d)\n", err)); ++ else ++ mdev->devfreq = NULL; + -+ return false; ++ return err; +} + -+/* Conversion helpers for setting up high resolution timers */ -+#define HR_TIMER_DELAY_MSEC(x) (ns_to_ktime(((u64)(x))*1000000U)) -+#define HR_TIMER_DELAY_NSEC(x) (ns_to_ktime(x)) ++void mali_devfreq_term(struct mali_device *mdev) ++{ ++ int err; + -+/* Maximum number of loops polling the GPU for a cache flush before we assume it must have completed */ -+#define KBASE_CLEAN_CACHE_MAX_LOOPS 100000 -+/* Maximum number of loops polling the GPU for an AS command to complete before we assume the GPU has hung */ -+#define KBASE_AS_INACTIVE_MAX_LOOPS 100000 ++ MALI_DEBUG_PRINT(2, ("Term Mali devfreq\n")); + -+/* Maximum number of times a job can be replayed */ -+#define BASEP_JD_REPLAY_LIMIT 15 ++ rockchip_system_monitor_unregister(mdev->mdev_info); ++#ifdef CONFIG_DEVFREQ_THERMAL ++ devfreq_cooling_unregister(mdev->devfreq_cooling); ++#endif + -+/* JobDescriptorHeader - taken from the architecture specifications, the layout -+ * is currently identical for all GPU archs. */ -+struct job_descriptor_header { -+ u32 exception_status; -+ u32 first_incomplete_task; -+ u64 fault_pointer; -+ u8 job_descriptor_size : 1; -+ u8 job_type : 7; -+ u8 job_barrier : 1; -+ u8 _reserved_01 : 1; -+ u8 _reserved_1 : 1; -+ u8 _reserved_02 : 1; -+ u8 _reserved_03 : 1; -+ u8 _reserved_2 : 1; -+ u8 _reserved_04 : 1; -+ u8 _reserved_05 : 1; -+ u16 job_index; -+ u16 job_dependency_index_1; -+ u16 job_dependency_index_2; -+ union { -+ u64 _64; -+ u32 _32; -+ } next_job; -+}; ++ devfreq_unregister_opp_notifier(mdev->dev, mdev->devfreq); + -+#endif /* _KBASE_DEFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_device.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_device.c ++ err = devfreq_remove_device(mdev->devfreq); ++ if (err) ++ MALI_PRINT_ERROR(("Failed to terminate devfreq (%d)\n", err)); ++ else ++ mdev->devfreq = NULL; ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h new file mode 100755 -index 000000000000..2d11f11f3be0 +index 000000000..ba7c017d8 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_device.c -@@ -0,0 +1,674 @@ ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h +@@ -0,0 +1,17 @@ +/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ ++#ifndef _MALI_DEVFREQ_H_ ++#define _MALI_DEVFREQ_H_ + ++int mali_devfreq_init(struct mali_device *mdev); + ++void mali_devfreq_term(struct mali_device *mdev); + ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c b/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c +new file mode 100755 +index 000000000..95c3ea12d +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c +@@ -0,0 +1,36 @@ ++/** ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ -+/* -+ * Base kernel device APIs ++/** ++ * @file mali_device_pause_resume.c ++ * Implementation of the Mali pause/resume functionality + */ + -+#include -+#include -+#include -+#include +#include -+#include ++#include ++#include "mali_pm.h" + -+#include -+#include -+#include -+#include -+#include ++void mali_dev_pause(void) ++{ ++ /* ++ * Deactive all groups to prevent hardware being touched ++ * during the period of mali device pausing ++ */ ++ mali_pm_os_suspend(MALI_FALSE); ++} + -+#include ++EXPORT_SYMBOL(mali_dev_pause); + -+/* NOTE: Magic - 0x45435254 (TRCE in ASCII). -+ * Supports tracing feature provided in the base module. -+ * Please keep it in sync with the value of base module. ++void mali_dev_resume(void) ++{ ++ mali_pm_os_resume(); ++} ++ ++EXPORT_SYMBOL(mali_dev_resume); +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c +new file mode 100755 +index 000000000..e026e11e4 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c +@@ -0,0 +1,439 @@ ++/* ++ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+#define TRACE_BUFFER_HEADER_SPECIAL 0x45435254 ++#include ++#include "mali_osk.h" ++#include "mali_kernel_common.h" + -+#if KBASE_TRACE_ENABLE -+static const char *kbasep_trace_code_string[] = { -+ /* IMPORTANT: USE OF SPECIAL #INCLUDE OF NON-STANDARD HEADER FILE -+ * THIS MUST BE USED AT THE START OF THE ARRAY */ -+#define KBASE_TRACE_CODE_MAKE_CODE(X) # X -+#include "mali_kbase_trace_defs.h" -+#undef KBASE_TRACE_CODE_MAKE_CODE -+}; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) ++#include "mali_dma_fence.h" ++#include ++#include +#endif + -+#define DEBUG_MESSAGE_SIZE 256 -+ -+static int kbasep_trace_init(struct kbase_device *kbdev); -+static void kbasep_trace_term(struct kbase_device *kbdev); -+static void kbasep_trace_hook_wrapper(void *param); ++static DEFINE_SPINLOCK(mali_dma_fence_lock); + -+struct kbase_device *kbase_device_alloc(void) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++static bool mali_dma_fence_enable_signaling(struct dma_fence *fence) +{ -+ return kzalloc(sizeof(struct kbase_device), GFP_KERNEL); ++ MALI_IGNORE(fence); ++ return true; +} + -+static int kbase_device_as_init(struct kbase_device *kbdev, int i) ++static const char *mali_dma_fence_get_driver_name(struct dma_fence *fence) +{ -+ const char format[] = "mali_mmu%d"; -+ char name[sizeof(format)]; -+ const char poke_format[] = "mali_mmu%d_poker"; -+ char poke_name[sizeof(poke_format)]; -+ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8316)) -+ snprintf(poke_name, sizeof(poke_name), poke_format, i); -+ -+ snprintf(name, sizeof(name), format, i); -+ -+ kbdev->as[i].number = i; -+ kbdev->as[i].fault_addr = 0ULL; -+ -+ kbdev->as[i].pf_wq = alloc_workqueue(name, 0, 1); -+ if (!kbdev->as[i].pf_wq) -+ return -EINVAL; -+ -+ INIT_WORK(&kbdev->as[i].work_pagefault, page_fault_worker); -+ INIT_WORK(&kbdev->as[i].work_busfault, bus_fault_worker); -+ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8316)) { -+ struct hrtimer *poke_timer = &kbdev->as[i].poke_timer; -+ struct work_struct *poke_work = &kbdev->as[i].poke_work; -+ -+ kbdev->as[i].poke_wq = alloc_workqueue(poke_name, 0, 1); -+ if (!kbdev->as[i].poke_wq) { -+ destroy_workqueue(kbdev->as[i].pf_wq); -+ return -EINVAL; -+ } -+ KBASE_DEBUG_ASSERT(!object_is_on_stack(poke_work)); -+ INIT_WORK(poke_work, kbasep_as_do_poke); -+ -+ hrtimer_init(poke_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); -+ -+ poke_timer->function = kbasep_as_poke_timer_callback; -+ -+ kbdev->as[i].poke_refcount = 0; -+ kbdev->as[i].poke_state = 0u; -+ } -+ -+ return 0; ++ MALI_IGNORE(fence); ++ return "mali"; +} + -+static void kbase_device_as_term(struct kbase_device *kbdev, int i) ++static const char *mali_dma_fence_get_timeline_name(struct dma_fence *fence) +{ -+ destroy_workqueue(kbdev->as[i].pf_wq); -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8316)) -+ destroy_workqueue(kbdev->as[i].poke_wq); ++ MALI_IGNORE(fence); ++ return "mali_dma_fence"; +} + -+static int kbase_device_all_as_init(struct kbase_device *kbdev) ++static const struct dma_fence_ops mali_dma_fence_ops = { ++ .get_driver_name = mali_dma_fence_get_driver_name, ++ .get_timeline_name = mali_dma_fence_get_timeline_name, ++ .enable_signaling = mali_dma_fence_enable_signaling, ++ .signaled = NULL, ++ .wait = dma_fence_default_wait, ++ .release = NULL ++}; ++#else ++static bool mali_dma_fence_enable_signaling(struct fence *fence) +{ -+ int i, err; -+ -+ for (i = 0; i < kbdev->nr_hw_address_spaces; i++) { -+ err = kbase_device_as_init(kbdev, i); -+ if (err) -+ goto free_workqs; -+ } -+ -+ return 0; -+ -+free_workqs: -+ for (; i > 0; i--) -+ kbase_device_as_term(kbdev, i); -+ -+ return err; ++ MALI_IGNORE(fence); ++ return true; +} + -+static void kbase_device_all_as_term(struct kbase_device *kbdev) ++static const char *mali_dma_fence_get_driver_name(struct fence *fence) +{ -+ int i; -+ -+ for (i = 0; i < kbdev->nr_hw_address_spaces; i++) -+ kbase_device_as_term(kbdev, i); ++ MALI_IGNORE(fence); ++ return "mali"; +} + -+int kbase_device_init(struct kbase_device * const kbdev) ++static const char *mali_dma_fence_get_timeline_name(struct fence *fence) +{ -+ int i, err; -+#ifdef CONFIG_ARM64 -+ struct device_node *np = NULL; -+#endif /* CONFIG_ARM64 */ ++ MALI_IGNORE(fence); ++ return "mali_dma_fence"; ++} + -+ spin_lock_init(&kbdev->mmu_mask_change); -+ mutex_init(&kbdev->mmu_hw_mutex); -+#ifdef CONFIG_ARM64 -+ kbdev->cci_snoop_enabled = false; -+ np = kbdev->dev->of_node; -+ if (np != NULL) { -+ if (of_property_read_u32(np, "snoop_enable_smc", -+ &kbdev->snoop_enable_smc)) -+ kbdev->snoop_enable_smc = 0; -+ if (of_property_read_u32(np, "snoop_disable_smc", -+ &kbdev->snoop_disable_smc)) -+ kbdev->snoop_disable_smc = 0; -+ /* Either both or none of the calls should be provided. */ -+ if (!((kbdev->snoop_disable_smc == 0 -+ && kbdev->snoop_enable_smc == 0) -+ || (kbdev->snoop_disable_smc != 0 -+ && kbdev->snoop_enable_smc != 0))) { -+ WARN_ON(1); -+ err = -EINVAL; -+ goto fail; -+ } -+ } -+#endif /* CONFIG_ARM64 */ -+ /* Get the list of workarounds for issues on the current HW -+ * (identified by the GPU_ID register) -+ */ -+ err = kbase_hw_set_issues_mask(kbdev); -+ if (err) -+ goto fail; ++static const struct fence_ops mali_dma_fence_ops = { ++ .get_driver_name = mali_dma_fence_get_driver_name, ++ .get_timeline_name = mali_dma_fence_get_timeline_name, ++ .enable_signaling = mali_dma_fence_enable_signaling, ++ .signaled = NULL, ++ .wait = fence_default_wait, ++ .release = NULL ++}; ++#endif + -+ /* Set the list of features available on the current HW -+ * (identified by the GPU_ID register) -+ */ -+ kbase_hw_set_features_mask(kbdev); ++static void mali_dma_fence_context_cleanup(struct mali_dma_fence_context *dma_fence_context) ++{ ++ u32 i; + -+ kbase_gpuprops_set_features(kbdev); ++ MALI_DEBUG_ASSERT_POINTER(dma_fence_context); + -+ /* On Linux 4.0+, dma coherency is determined from device tree */ -+#if defined(CONFIG_ARM64) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) -+ set_dma_ops(kbdev->dev, &noncoherent_swiotlb_dma_ops); -+#endif ++ for (i = 0; i < dma_fence_context->num_dma_fence_waiter; i++) { ++ if (dma_fence_context->mali_dma_fence_waiters[i]) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ dma_fence_remove_callback(dma_fence_context->mali_dma_fence_waiters[i]->fence, ++ &dma_fence_context->mali_dma_fence_waiters[i]->base); ++ dma_fence_put(dma_fence_context->mali_dma_fence_waiters[i]->fence); + -+ /* Workaround a pre-3.13 Linux issue, where dma_mask is NULL when our -+ * device structure was created by device-tree -+ */ -+ if (!kbdev->dev->dma_mask) -+ kbdev->dev->dma_mask = &kbdev->dev->coherent_dma_mask; ++#else ++ fence_remove_callback(dma_fence_context->mali_dma_fence_waiters[i]->fence, ++ &dma_fence_context->mali_dma_fence_waiters[i]->base); ++ fence_put(dma_fence_context->mali_dma_fence_waiters[i]->fence); ++#endif ++ kfree(dma_fence_context->mali_dma_fence_waiters[i]); ++ dma_fence_context->mali_dma_fence_waiters[i] = NULL; ++ } ++ } + -+ err = dma_set_mask(kbdev->dev, -+ DMA_BIT_MASK(kbdev->gpu_props.mmu.pa_bits)); -+ if (err) -+ goto dma_set_mask_failed; ++ if (NULL != dma_fence_context->mali_dma_fence_waiters) ++ kfree(dma_fence_context->mali_dma_fence_waiters); + -+ err = dma_set_coherent_mask(kbdev->dev, -+ DMA_BIT_MASK(kbdev->gpu_props.mmu.pa_bits)); -+ if (err) -+ goto dma_set_mask_failed; ++ dma_fence_context->mali_dma_fence_waiters = NULL; ++ dma_fence_context->num_dma_fence_waiter = 0; ++} + -+ kbdev->nr_hw_address_spaces = kbdev->gpu_props.num_address_spaces; ++static void mali_dma_fence_context_work_func(struct work_struct *work_handle) ++{ ++ struct mali_dma_fence_context *dma_fence_context; + -+ err = kbase_device_all_as_init(kbdev); -+ if (err) -+ goto as_init_failed; ++ MALI_DEBUG_ASSERT_POINTER(work_handle); + -+ spin_lock_init(&kbdev->hwcnt.lock); ++ dma_fence_context = container_of(work_handle, struct mali_dma_fence_context, work_handle); + -+ err = kbasep_trace_init(kbdev); -+ if (err) -+ goto term_as; ++ dma_fence_context->cb_func(dma_fence_context->pp_job_ptr); ++} + -+ mutex_init(&kbdev->cacheclean_lock); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++static void mali_dma_fence_callback(struct dma_fence *fence, struct dma_fence_cb *cb) ++#else ++static void mali_dma_fence_callback(struct fence *fence, struct fence_cb *cb) ++#endif ++{ ++ struct mali_dma_fence_waiter *dma_fence_waiter = NULL; ++ struct mali_dma_fence_context *dma_fence_context = NULL; + -+#ifdef CONFIG_MALI_BIFROST_TRACE_TIMELINE -+ for (i = 0; i < BASE_JM_MAX_NR_SLOTS; ++i) -+ kbdev->timeline.slot_atoms_submitted[i] = 0; ++ MALI_DEBUG_ASSERT_POINTER(fence); ++ MALI_DEBUG_ASSERT_POINTER(cb); + -+ for (i = 0; i <= KBASEP_TIMELINE_PM_EVENT_LAST; ++i) -+ atomic_set(&kbdev->timeline.pm_event_uid[i], 0); -+#endif /* CONFIG_MALI_BIFROST_TRACE_TIMELINE */ ++ MALI_IGNORE(fence); + -+ /* fbdump profiling controls set to 0 - fbdump not enabled until changed by gator */ -+ for (i = 0; i < FBDUMP_CONTROL_MAX; i++) -+ kbdev->kbase_profiling_controls[i] = 0; ++ dma_fence_waiter = container_of(cb, struct mali_dma_fence_waiter, base); ++ dma_fence_context = dma_fence_waiter->parent; + -+ kbase_debug_assert_register_hook(&kbasep_trace_hook_wrapper, kbdev); ++ MALI_DEBUG_ASSERT_POINTER(dma_fence_context); + -+ atomic_set(&kbdev->ctx_num, 0); ++ if (atomic_dec_and_test(&dma_fence_context->count)) ++ schedule_work(&dma_fence_context->work_handle); ++} + -+ err = kbase_instr_backend_init(kbdev); -+ if (err) -+ goto term_trace; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++static _mali_osk_errcode_t mali_dma_fence_add_callback(struct mali_dma_fence_context *dma_fence_context, struct dma_fence *fence) ++#else ++static _mali_osk_errcode_t mali_dma_fence_add_callback(struct mali_dma_fence_context *dma_fence_context, struct fence *fence) ++#endif ++{ ++ int ret = 0; ++ struct mali_dma_fence_waiter *dma_fence_waiter; ++ struct mali_dma_fence_waiter **dma_fence_waiters; + -+ kbdev->pm.dvfs_period = DEFAULT_PM_DVFS_PERIOD; ++ MALI_DEBUG_ASSERT_POINTER(dma_fence_context); ++ MALI_DEBUG_ASSERT_POINTER(fence); + -+ kbdev->reset_timeout_ms = DEFAULT_RESET_TIMEOUT_MS; ++ dma_fence_waiters = krealloc(dma_fence_context->mali_dma_fence_waiters, ++ (dma_fence_context->num_dma_fence_waiter + 1) ++ * sizeof(struct mali_dma_fence_waiter *), ++ GFP_KERNEL); + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) -+ kbdev->mmu_mode = kbase_mmu_mode_get_aarch64(); -+ else -+ kbdev->mmu_mode = kbase_mmu_mode_get_lpae(); ++ if (NULL == dma_fence_waiters) { ++ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to realloc the dma fence waiters.\n")); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ init_waitqueue_head(&kbdev->driver_inactive_wait); -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++ dma_fence_context->mali_dma_fence_waiters = dma_fence_waiters; + -+ return 0; -+term_trace: -+ kbasep_trace_term(kbdev); -+term_as: -+ kbase_device_all_as_term(kbdev); -+as_init_failed: -+dma_set_mask_failed: -+fail: -+ return err; -+} ++ dma_fence_waiter = kzalloc(sizeof(struct mali_dma_fence_waiter), GFP_KERNEL); + -+void kbase_device_term(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev); ++ if (NULL == dma_fence_waiter) { ++ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to create mali dma fence waiter.\n")); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+#if KBASE_TRACE_ENABLE -+ kbase_debug_assert_register_hook(NULL, NULL); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ dma_fence_get(fence); ++#else ++ fence_get(fence); +#endif ++ dma_fence_waiter->fence = fence; ++ dma_fence_waiter->parent = dma_fence_context; ++ atomic_inc(&dma_fence_context->count); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ ret = dma_fence_add_callback(fence, &dma_fence_waiter->base, ++ mali_dma_fence_callback); ++#else ++ ret = fence_add_callback(fence, &dma_fence_waiter->base, ++ mali_dma_fence_callback); ++#endif ++ if (0 > ret) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ dma_fence_put(fence); ++#else ++ fence_put(fence); ++#endif ++ kfree(dma_fence_waiter); ++ atomic_dec(&dma_fence_context->count); ++ if (-ENOENT == ret) { ++ /*-ENOENT if fence has already been signaled, return _MALI_OSK_ERR_OK*/ ++ return _MALI_OSK_ERR_OK; ++ } ++ /* Failed to add the fence callback into fence, return _MALI_OSK_ERR_FAULT*/ ++ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to add callback into fence.\n")); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ kbase_instr_backend_term(kbdev); -+ -+ kbasep_trace_term(kbdev); ++ dma_fence_context->mali_dma_fence_waiters[dma_fence_context->num_dma_fence_waiter] = dma_fence_waiter; ++ dma_fence_context->num_dma_fence_waiter++; + -+ kbase_device_all_as_term(kbdev); ++ return _MALI_OSK_ERR_OK; +} + -+void kbase_device_free(struct kbase_device *kbdev) ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++struct dma_fence *mali_dma_fence_new(u32 context, u32 seqno) ++#else ++struct fence *mali_dma_fence_new(u32 context, u32 seqno) ++#endif +{ -+ kfree(kbdev); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ struct dma_fence *fence = NULL; ++ fence = kzalloc(sizeof(struct dma_fence), GFP_KERNEL); ++#else ++ struct fence *fence = NULL; ++ fence = kzalloc(sizeof(struct fence), GFP_KERNEL); ++#endif ++ if (NULL == fence) { ++ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to create dma fence.\n")); ++ return fence; ++ } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ dma_fence_init(fence, ++ &mali_dma_fence_ops, ++ &mali_dma_fence_lock, ++ context, seqno); ++#else ++ fence_init(fence, ++ &mali_dma_fence_ops, ++ &mali_dma_fence_lock, ++ context, seqno); ++#endif ++ return fence; +} + -+int kbase_device_trace_buffer_install( -+ struct kbase_context *kctx, u32 *tb, size_t size) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++void mali_dma_fence_signal_and_put(struct dma_fence **fence) ++#else ++void mali_dma_fence_signal_and_put(struct fence **fence) ++#endif +{ -+ unsigned long flags; -+ -+ KBASE_DEBUG_ASSERT(kctx); -+ KBASE_DEBUG_ASSERT(tb); -+ -+ /* Interface uses 16-bit value to track last accessed entry. Each entry -+ * is composed of two 32-bit words. -+ * This limits the size that can be handled without an overflow. */ -+ if (0xFFFF * (2 * sizeof(u32)) < size) -+ return -EINVAL; -+ -+ /* set up the header */ -+ /* magic number in the first 4 bytes */ -+ tb[0] = TRACE_BUFFER_HEADER_SPECIAL; -+ /* Store (write offset = 0, wrap counter = 0, transaction active = no) -+ * write offset 0 means never written. -+ * Offsets 1 to (wrap_offset - 1) used to store values when trace started -+ */ -+ tb[1] = 0; -+ -+ /* install trace buffer */ -+ spin_lock_irqsave(&kctx->jctx.tb_lock, flags); -+ kctx->jctx.tb_wrap_offset = size / 8; -+ kctx->jctx.tb = tb; -+ spin_unlock_irqrestore(&kctx->jctx.tb_lock, flags); -+ -+ return 0; ++ MALI_DEBUG_ASSERT_POINTER(fence); ++ MALI_DEBUG_ASSERT_POINTER(*fence); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ dma_fence_signal(*fence); ++ dma_fence_put(*fence); ++#else ++ fence_signal(*fence); ++ fence_put(*fence); ++#endif ++ *fence = NULL; +} + -+void kbase_device_trace_buffer_uninstall(struct kbase_context *kctx) ++void mali_dma_fence_context_init(struct mali_dma_fence_context *dma_fence_context, ++ mali_dma_fence_context_callback_func_t cb_func, ++ void *pp_job_ptr) +{ -+ unsigned long flags; ++ MALI_DEBUG_ASSERT_POINTER(dma_fence_context); + -+ KBASE_DEBUG_ASSERT(kctx); -+ spin_lock_irqsave(&kctx->jctx.tb_lock, flags); -+ kctx->jctx.tb = NULL; -+ kctx->jctx.tb_wrap_offset = 0; -+ spin_unlock_irqrestore(&kctx->jctx.tb_lock, flags); ++ INIT_WORK(&dma_fence_context->work_handle, mali_dma_fence_context_work_func); ++ atomic_set(&dma_fence_context->count, 1); ++ dma_fence_context->num_dma_fence_waiter = 0; ++ dma_fence_context->mali_dma_fence_waiters = NULL; ++ dma_fence_context->cb_func = cb_func; ++ dma_fence_context->pp_job_ptr = pp_job_ptr; +} + -+void kbase_device_trace_register_access(struct kbase_context *kctx, enum kbase_reg_access_type type, u16 reg_offset, u32 reg_value) ++_mali_osk_errcode_t mali_dma_fence_context_add_waiters(struct mali_dma_fence_context *dma_fence_context, ++ struct reservation_object *dma_reservation_object) +{ -+ unsigned long flags; -+ -+ spin_lock_irqsave(&kctx->jctx.tb_lock, flags); -+ if (kctx->jctx.tb) { -+ u16 wrap_count; -+ u16 write_offset; -+ u32 *tb = kctx->jctx.tb; -+ u32 header_word; -+ -+ header_word = tb[1]; -+ KBASE_DEBUG_ASSERT(0 == (header_word & 0x1)); -+ -+ wrap_count = (header_word >> 1) & 0x7FFF; -+ write_offset = (header_word >> 16) & 0xFFFF; ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_OK; ++ u32 shared_count = 0, i; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ struct dma_fence *exclusive_fence = NULL; ++ struct dma_fence **shared_fences = NULL; ++#else ++ struct fence *exclusive_fence = NULL; ++ struct fence **shared_fences = NULL; ++#endif ++ MALI_DEBUG_ASSERT_POINTER(dma_fence_context); ++ MALI_DEBUG_ASSERT_POINTER(dma_reservation_object); + -+ /* mark as transaction in progress */ -+ tb[1] |= 0x1; -+ mb(); ++ /* Get all the shared/exclusive fences in the reservation object of dma buf*/ ++ ret = reservation_object_get_fences_rcu(dma_reservation_object, &exclusive_fence, ++ &shared_count, &shared_fences); ++ if (ret < 0) { ++ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to get shared or exclusive_fence dma fences from the reservation object of dma buf.\n")); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ /* calculate new offset */ -+ write_offset++; -+ if (write_offset == kctx->jctx.tb_wrap_offset) { -+ /* wrap */ -+ write_offset = 1; -+ wrap_count++; -+ wrap_count &= 0x7FFF; /* 15bit wrap counter */ ++ if (exclusive_fence) { ++ ret = mali_dma_fence_add_callback(dma_fence_context, exclusive_fence); ++ if (_MALI_OSK_ERR_OK != ret) { ++ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to add callback into exclusive fence.\n")); ++ mali_dma_fence_context_cleanup(dma_fence_context); ++ goto ended; + } ++ } + -+ /* store the trace entry at the selected offset */ -+ tb[write_offset * 2 + 0] = (reg_offset & ~0x3) | ((type == REG_WRITE) ? 0x1 : 0x0); -+ tb[write_offset * 2 + 1] = reg_value; -+ mb(); + -+ /* new header word */ -+ header_word = (write_offset << 16) | (wrap_count << 1) | 0x0; /* transaction complete */ -+ tb[1] = header_word; ++ for (i = 0; i < shared_count; i++) { ++ ret = mali_dma_fence_add_callback(dma_fence_context, shared_fences[i]); ++ if (_MALI_OSK_ERR_OK != ret) { ++ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to add callback into shared fence [%d].\n", i)); ++ mali_dma_fence_context_cleanup(dma_fence_context); ++ break; ++ } + } -+ spin_unlock_irqrestore(&kctx->jctx.tb_lock, flags); -+} + -+/* -+ * Device trace functions -+ */ -+#if KBASE_TRACE_ENABLE -+ -+static int kbasep_trace_init(struct kbase_device *kbdev) -+{ -+ struct kbase_trace *rbuf; ++ended: + -+ rbuf = kmalloc_array(KBASE_TRACE_SIZE, sizeof(*rbuf), GFP_KERNEL); ++ if (exclusive_fence) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ dma_fence_put(exclusive_fence); ++#else ++ fence_put(exclusive_fence); ++#endif + -+ if (!rbuf) -+ return -EINVAL; ++ if (shared_fences) { ++ for (i = 0; i < shared_count; i++) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ dma_fence_put(shared_fences[i]); ++#else ++ fence_put(shared_fences[i]); ++#endif ++ } ++ kfree(shared_fences); ++ } + -+ kbdev->trace_rbuf = rbuf; -+ spin_lock_init(&kbdev->trace_lock); -+ return 0; ++ return ret; +} + -+static void kbasep_trace_term(struct kbase_device *kbdev) ++ ++void mali_dma_fence_context_term(struct mali_dma_fence_context *dma_fence_context) +{ -+ kfree(kbdev->trace_rbuf); ++ MALI_DEBUG_ASSERT_POINTER(dma_fence_context); ++ atomic_set(&dma_fence_context->count, 0); ++ if (dma_fence_context->work_handle.func) { ++ cancel_work_sync(&dma_fence_context->work_handle); ++ } ++ mali_dma_fence_context_cleanup(dma_fence_context); +} + -+static void kbasep_trace_format_msg(struct kbase_trace *trace_msg, char *buffer, int len) ++void mali_dma_fence_context_dec_count(struct mali_dma_fence_context *dma_fence_context) +{ -+ s32 written = 0; -+ -+ /* Initial part of message */ -+ written += MAX(snprintf(buffer + written, MAX(len - written, 0), "%d.%.6d,%d,%d,%s,%p,", (int)trace_msg->timestamp.tv_sec, (int)(trace_msg->timestamp.tv_nsec / 1000), trace_msg->thread_id, trace_msg->cpu, kbasep_trace_code_string[trace_msg->code], trace_msg->ctx), 0); -+ -+ if (trace_msg->katom) -+ written += MAX(snprintf(buffer + written, MAX(len - written, 0), "atom %d (ud: 0x%llx 0x%llx)", trace_msg->atom_number, trace_msg->atom_udata[0], trace_msg->atom_udata[1]), 0); ++ MALI_DEBUG_ASSERT_POINTER(dma_fence_context); + -+ written += MAX(snprintf(buffer + written, MAX(len - written, 0), ",%.8llx,", trace_msg->gpu_addr), 0); ++ if (atomic_dec_and_test(&dma_fence_context->count)) ++ schedule_work(&dma_fence_context->work_handle); ++} + -+ /* NOTE: Could add function callbacks to handle different message types */ -+ /* Jobslot present */ -+ if (trace_msg->flags & KBASE_TRACE_FLAG_JOBSLOT) -+ written += MAX(snprintf(buffer + written, MAX(len - written, 0), "%d", trace_msg->jobslot), 0); + -+ written += MAX(snprintf(buffer + written, MAX(len - written, 0), ","), 0); ++void mali_dma_fence_add_reservation_object_list(struct reservation_object *dma_reservation_object, ++ struct reservation_object **dma_reservation_object_list, ++ u32 *num_dma_reservation_object) ++{ ++ u32 i; + -+ /* Refcount present */ -+ if (trace_msg->flags & KBASE_TRACE_FLAG_REFCOUNT) -+ written += MAX(snprintf(buffer + written, MAX(len - written, 0), "%d", trace_msg->refcount), 0); ++ MALI_DEBUG_ASSERT_POINTER(dma_reservation_object); ++ MALI_DEBUG_ASSERT_POINTER(dma_reservation_object_list); ++ MALI_DEBUG_ASSERT_POINTER(num_dma_reservation_object); + -+ written += MAX(snprintf(buffer + written, MAX(len - written, 0), ","), 0); ++ for (i = 0; i < *num_dma_reservation_object; i++) { ++ if (dma_reservation_object_list[i] == dma_reservation_object) ++ return; ++ } + -+ /* Rest of message */ -+ written += MAX(snprintf(buffer + written, MAX(len - written, 0), "0x%.8lx", trace_msg->info_val), 0); ++ dma_reservation_object_list[*num_dma_reservation_object] = dma_reservation_object; ++ (*num_dma_reservation_object)++; +} + -+static void kbasep_trace_dump_msg(struct kbase_device *kbdev, struct kbase_trace *trace_msg) ++int mali_dma_fence_lock_reservation_object_list(struct reservation_object **dma_reservation_object_list, ++ u32 num_dma_reservation_object, struct ww_acquire_ctx *ww_actx) +{ -+ char buffer[DEBUG_MESSAGE_SIZE]; -+ -+ kbasep_trace_format_msg(trace_msg, buffer, DEBUG_MESSAGE_SIZE); -+ dev_dbg(kbdev->dev, "%s", buffer); -+} ++ u32 i; + -+void kbasep_trace_add(struct kbase_device *kbdev, enum kbase_trace_code code, void *ctx, struct kbase_jd_atom *katom, u64 gpu_addr, u8 flags, int refcount, int jobslot, unsigned long info_val) -+{ -+ unsigned long irqflags; -+ struct kbase_trace *trace_msg; ++ struct reservation_object *reservation_object_to_slow_lock = NULL; + -+ spin_lock_irqsave(&kbdev->trace_lock, irqflags); ++ MALI_DEBUG_ASSERT_POINTER(dma_reservation_object_list); ++ MALI_DEBUG_ASSERT_POINTER(ww_actx); + -+ trace_msg = &kbdev->trace_rbuf[kbdev->trace_next_in]; ++ ww_acquire_init(ww_actx, &reservation_ww_class); + -+ /* Fill the message */ -+ trace_msg->thread_id = task_pid_nr(current); -+ trace_msg->cpu = task_cpu(current); ++again: ++ for (i = 0; i < num_dma_reservation_object; i++) { ++ int ret; + -+ getnstimeofday(&trace_msg->timestamp); ++ if (dma_reservation_object_list[i] == reservation_object_to_slow_lock) { ++ reservation_object_to_slow_lock = NULL; ++ continue; ++ } + -+ trace_msg->code = code; -+ trace_msg->ctx = ctx; ++ ret = ww_mutex_lock(&dma_reservation_object_list[i]->lock, ww_actx); + -+ if (NULL == katom) { -+ trace_msg->katom = false; -+ } else { -+ trace_msg->katom = true; -+ trace_msg->atom_number = kbase_jd_atom_id(katom->kctx, katom); -+ trace_msg->atom_udata[0] = katom->udata.blob[0]; -+ trace_msg->atom_udata[1] = katom->udata.blob[1]; -+ } ++ if (ret < 0) { ++ u32 slow_lock_index = i; + -+ trace_msg->gpu_addr = gpu_addr; -+ trace_msg->jobslot = jobslot; -+ trace_msg->refcount = MIN((unsigned int)refcount, 0xFF); -+ trace_msg->info_val = info_val; -+ trace_msg->flags = flags; ++ /* unlock all pre locks we have already locked.*/ ++ while (i > 0) { ++ i--; ++ ww_mutex_unlock(&dma_reservation_object_list[i]->lock); ++ } + -+ /* Update the ringbuffer indices */ -+ kbdev->trace_next_in = (kbdev->trace_next_in + 1) & KBASE_TRACE_MASK; -+ if (kbdev->trace_next_in == kbdev->trace_first_out) -+ kbdev->trace_first_out = (kbdev->trace_first_out + 1) & KBASE_TRACE_MASK; ++ if (NULL != reservation_object_to_slow_lock) ++ ww_mutex_unlock(&reservation_object_to_slow_lock->lock); + -+ /* Done */ ++ if (ret == -EDEADLK) { ++ reservation_object_to_slow_lock = dma_reservation_object_list[slow_lock_index]; ++ ww_mutex_lock_slow(&reservation_object_to_slow_lock->lock, ww_actx); ++ goto again; ++ } ++ ww_acquire_fini(ww_actx); ++ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to lock all dma reservation objects.\n", i)); ++ return ret; ++ } ++ } + -+ spin_unlock_irqrestore(&kbdev->trace_lock, irqflags); ++ ww_acquire_done(ww_actx); ++ return 0; +} + -+void kbasep_trace_clear(struct kbase_device *kbdev) ++void mali_dma_fence_unlock_reservation_object_list(struct reservation_object **dma_reservation_object_list, ++ u32 num_dma_reservation_object, struct ww_acquire_ctx *ww_actx) +{ -+ unsigned long flags; ++ u32 i; + -+ spin_lock_irqsave(&kbdev->trace_lock, flags); -+ kbdev->trace_first_out = kbdev->trace_next_in; -+ spin_unlock_irqrestore(&kbdev->trace_lock, flags); ++ for (i = 0; i < num_dma_reservation_object; i++) ++ ww_mutex_unlock(&dma_reservation_object_list[i]->lock); ++ ++ ww_acquire_fini(ww_actx); +} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h +new file mode 100755 +index 000000000..d44f6d1a8 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h +@@ -0,0 +1,124 @@ ++/* ++ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+void kbasep_trace_dump(struct kbase_device *kbdev) -+{ -+ unsigned long flags; -+ u32 start; -+ u32 end; ++/** ++ * @file mali_dma_fence.h ++ * ++ * Mali interface for Linux dma buf fence objects. ++ */ + -+ dev_dbg(kbdev->dev, "Dumping trace:\nsecs,nthread,cpu,code,ctx,katom,gpu_addr,jobslot,refcount,info_val"); -+ spin_lock_irqsave(&kbdev->trace_lock, flags); -+ start = kbdev->trace_first_out; -+ end = kbdev->trace_next_in; ++#ifndef _MALI_DMA_FENCE_H_ ++#define _MALI_DMA_FENCE_H_ + -+ while (start != end) { -+ struct kbase_trace *trace_msg = &kbdev->trace_rbuf[start]; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++#include ++#else ++#include ++#endif ++#include ++#endif + -+ kbasep_trace_dump_msg(kbdev, trace_msg); ++struct mali_dma_fence_context; + -+ start = (start + 1) & KBASE_TRACE_MASK; -+ } -+ dev_dbg(kbdev->dev, "TRACE_END"); ++/* The mali dma fence context callback function */ ++typedef void (*mali_dma_fence_context_callback_func_t)(void *pp_job_ptr); + -+ spin_unlock_irqrestore(&kbdev->trace_lock, flags); ++struct mali_dma_fence_waiter { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ struct dma_fence *fence; ++ struct dma_fence_cb base; ++#else ++ struct fence_cb base; ++ struct fence *fence; ++#endif ++ struct mali_dma_fence_context *parent; ++}; + -+ KBASE_TRACE_CLEAR(kbdev); -+} ++struct mali_dma_fence_context { ++ struct work_struct work_handle; ++ struct mali_dma_fence_waiter **mali_dma_fence_waiters; ++ u32 num_dma_fence_waiter; ++ atomic_t count; ++ void *pp_job_ptr; /* the mali pp job pointer */; ++ mali_dma_fence_context_callback_func_t cb_func; ++}; + -+static void kbasep_trace_hook_wrapper(void *param) -+{ -+ struct kbase_device *kbdev = (struct kbase_device *)param; ++/* Create a dma fence ++ * @param context The execution context this fence is run on ++ * @param seqno A linearly increasing sequence number for this context ++ * @return the new dma fence if success, or NULL on failure. ++ */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++struct dma_fence *mali_dma_fence_new(u32 context, u32 seqno); ++#else ++struct fence *mali_dma_fence_new(u32 context, u32 seqno); ++#endif ++/* Signal and put dma fence ++ * @param fence The dma fence to signal and put ++ */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++void mali_dma_fence_signal_and_put(struct dma_fence **fence); ++#else ++void mali_dma_fence_signal_and_put(struct fence **fence); ++#endif ++/** ++ * Initialize a mali dma fence context for pp job. ++ * @param dma_fence_context The mali dma fence context to initialize. ++ * @param cb_func The dma fence context callback function to call when all dma fence release. ++ * @param pp_job_ptr The pp_job to call function with. ++ */ ++void mali_dma_fence_context_init(struct mali_dma_fence_context *dma_fence_context, ++ mali_dma_fence_context_callback_func_t cb_func, ++ void *pp_job_ptr); + -+ kbasep_trace_dump(kbdev); -+} ++/** ++ * Add new mali dma fence waiter into mali dma fence context ++ * @param dma_fence_context The mali dma fence context ++ * @param dma_reservation_object the reservation object to create new mali dma fence waiters ++ * @return _MALI_OSK_ERR_OK if success, or not. ++ */ ++_mali_osk_errcode_t mali_dma_fence_context_add_waiters(struct mali_dma_fence_context *dma_fence_context, ++ struct reservation_object *dma_reservation_object); + -+#ifdef CONFIG_DEBUG_FS -+struct trace_seq_state { -+ struct kbase_trace trace_buf[KBASE_TRACE_SIZE]; -+ u32 start; -+ u32 end; -+}; ++/** ++ * Release the dma fence context ++ * @param dma_fence_text The mali dma fence context. ++ */ ++void mali_dma_fence_context_term(struct mali_dma_fence_context *dma_fence_context); + -+static void *kbasep_trace_seq_start(struct seq_file *s, loff_t *pos) -+{ -+ struct trace_seq_state *state = s->private; -+ int i; ++/** ++ * Decrease the dma fence context atomic count ++ * @param dma_fence_text The mali dma fence context. ++ */ ++void mali_dma_fence_context_dec_count(struct mali_dma_fence_context *dma_fence_context); + -+ if (*pos > KBASE_TRACE_SIZE) -+ return NULL; -+ i = state->start + *pos; -+ if ((state->end >= state->start && i >= state->end) || -+ i >= state->end + KBASE_TRACE_SIZE) -+ return NULL; ++/** ++ * Get all reservation object ++ * @param dma_reservation_object The reservation object to add into the reservation object list ++ * @param dma_reservation_object_list The reservation object list to store all reservation object ++ * @param num_dma_reservation_object The number of all reservation object ++ */ ++void mali_dma_fence_add_reservation_object_list(struct reservation_object *dma_reservation_object, ++ struct reservation_object **dma_reservation_object_list, ++ u32 *num_dma_reservation_object); + -+ i &= KBASE_TRACE_MASK; ++/** ++ * Wait/wound mutex lock to lock all reservation object. ++ */ ++int mali_dma_fence_lock_reservation_object_list(struct reservation_object **dma_reservation_object_list, ++ u32 num_dma_reservation_object, struct ww_acquire_ctx *ww_actx); + -+ return &state->trace_buf[i]; ++/** ++ * Wait/wound mutex lock to unlock all reservation object. ++ */ ++void mali_dma_fence_unlock_reservation_object_list(struct reservation_object **dma_reservation_object_list, ++ u32 num_dma_reservation_object, struct ww_acquire_ctx *ww_actx); ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c +new file mode 100755 +index 000000000..e13cbad3e +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c +@@ -0,0 +1,783 @@ ++/* ++ * Copyright (C) 2012-2018 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ ++#include "mali_internal_sync.h" ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#if defined(DEBUG) ++#include "mali_session.h" ++#include "mali_timeline.h" ++#endif ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++static const struct dma_fence_ops fence_ops; ++#else ++static const struct fence_ops fence_ops; ++#endif ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++static struct mali_internal_sync_point *mali_internal_fence_to_sync_pt(struct dma_fence *fence) ++#else ++static struct mali_internal_sync_point *mali_internal_fence_to_sync_pt(struct fence *fence) ++#endif ++{ ++ MALI_DEBUG_ASSERT_POINTER(fence); ++ return container_of(fence, struct mali_internal_sync_point, base); +} + -+static void kbasep_trace_seq_stop(struct seq_file *s, void *data) ++static inline struct mali_internal_sync_timeline *mali_internal_sync_pt_to_sync_timeline(struct mali_internal_sync_point *sync_pt) +{ ++ MALI_DEBUG_ASSERT_POINTER(sync_pt); ++ return container_of(sync_pt->base.lock, struct mali_internal_sync_timeline, sync_pt_list_lock); +} + -+static void *kbasep_trace_seq_next(struct seq_file *s, void *data, loff_t *pos) ++static void mali_internal_sync_timeline_free(struct kref *kref_count) +{ -+ struct trace_seq_state *state = s->private; -+ int i; ++ struct mali_internal_sync_timeline *sync_timeline; + -+ (*pos)++; ++ MALI_DEBUG_ASSERT_POINTER(kref_count); + -+ i = (state->start + *pos) & KBASE_TRACE_MASK; -+ if (i == state->end) -+ return NULL; ++ sync_timeline = container_of(kref_count, struct mali_internal_sync_timeline, kref_count); + -+ return &state->trace_buf[i]; ++ if (sync_timeline->ops->release_obj) ++ sync_timeline->ops->release_obj(sync_timeline); ++ ++ kfree(sync_timeline); +} + -+static int kbasep_trace_seq_show(struct seq_file *s, void *data) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++static void mali_internal_fence_check_cb_func(struct fence *fence, struct fence_cb *cb) ++#else ++static void mali_internal_fence_check_cb_func(struct dma_fence *fence, struct dma_fence_cb *cb) ++#endif +{ -+ struct kbase_trace *trace_msg = data; -+ char buffer[DEBUG_MESSAGE_SIZE]; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ struct mali_internal_sync_fence_cb *check; ++#else ++ struct mali_internal_sync_fence_waiter *waiter; ++#endif ++ struct mali_internal_sync_fence *sync_fence; ++ int ret; ++ MALI_DEBUG_ASSERT_POINTER(cb); ++ MALI_IGNORE(fence); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ check = container_of(cb, struct mali_internal_sync_fence_cb, cb); ++ sync_fence = check->sync_file; ++#else ++ waiter = container_of(cb, struct mali_internal_sync_fence_waiter, cb); ++ sync_fence = (struct mali_internal_sync_fence *)waiter->work.private; ++#endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ ret = atomic_dec_and_test(&sync_fence->status); ++ if (ret) ++ wake_up_all(&sync_fence->wq); ++#else ++ ret = sync_fence->fence->ops->signaled(sync_fence->fence); + -+ kbasep_trace_format_msg(trace_msg, buffer, DEBUG_MESSAGE_SIZE); -+ seq_printf(s, "%s\n", buffer); -+ return 0; ++ if (0 > ret) ++ MALI_PRINT_ERROR(("Mali internal sync:Failed to wait fence 0x%x for sync_fence 0x%x.\n", fence, sync_fence)); ++ if (1 == ret) ++ wake_up_all(&sync_fence->wq); ++#endif +} + -+static const struct seq_operations kbasep_trace_seq_ops = { -+ .start = kbasep_trace_seq_start, -+ .next = kbasep_trace_seq_next, -+ .stop = kbasep_trace_seq_stop, -+ .show = kbasep_trace_seq_show, -+}; -+ -+static int kbasep_trace_debugfs_open(struct inode *inode, struct file *file) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++static void mali_internal_sync_fence_add_fence(struct mali_internal_sync_fence *sync_fence, struct fence *sync_pt) +{ -+ struct kbase_device *kbdev = inode->i_private; -+ unsigned long flags; -+ -+ struct trace_seq_state *state; ++ int fence_num = 0; ++ MALI_DEBUG_ASSERT_POINTER(sync_fence); ++ MALI_DEBUG_ASSERT_POINTER(sync_pt); + -+ state = __seq_open_private(file, &kbasep_trace_seq_ops, sizeof(*state)); -+ if (!state) -+ return -ENOMEM; ++ fence_num = sync_fence->num_fences; + -+ spin_lock_irqsave(&kbdev->trace_lock, flags); -+ state->start = kbdev->trace_first_out; -+ state->end = kbdev->trace_next_in; -+ memcpy(state->trace_buf, kbdev->trace_rbuf, sizeof(state->trace_buf)); -+ spin_unlock_irqrestore(&kbdev->trace_lock, flags); ++ sync_fence->cbs[fence_num].fence = sync_pt; ++ sync_fence->cbs[fence_num].sync_file = sync_fence; + -+ return 0; ++ if (!fence_add_callback(sync_pt, &sync_fence->cbs[fence_num].cb, mali_internal_fence_check_cb_func)) { ++ fence_get(sync_pt); ++ sync_fence->num_fences++; ++ atomic_inc(&sync_fence->status); ++ } +} -+ -+static const struct file_operations kbasep_trace_debugfs_fops = { -+ .open = kbasep_trace_debugfs_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = seq_release_private, -+}; -+ -+void kbasep_trace_debugfs_init(struct kbase_device *kbdev) ++#endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) ++static int mali_internal_sync_fence_wake_up_wq(wait_queue_entry_t *curr, unsigned mode, ++ int wake_flags, void *key) ++#else ++static int mali_internal_sync_fence_wake_up_wq(wait_queue_t *curr, unsigned mode, ++ int wake_flags, void *key) ++#endif +{ -+ debugfs_create_file("mali_trace", S_IRUGO, -+ kbdev->mali_debugfs_directory, kbdev, -+ &kbasep_trace_debugfs_fops); -+} ++ struct mali_internal_sync_fence_waiter *wait; ++ MALI_IGNORE(mode); ++ MALI_IGNORE(wake_flags); ++ MALI_IGNORE(key); + ++ wait = container_of(curr, struct mali_internal_sync_fence_waiter, work); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) ++ list_del_init(&wait->work.entry); +#else -+void kbasep_trace_debugfs_init(struct kbase_device *kbdev) -+{ ++ list_del_init(&wait->work.task_list); ++#endif ++ wait->callback(wait->work.private, wait); ++ return 1; +} -+#endif /* CONFIG_DEBUG_FS */ + -+#else /* KBASE_TRACE_ENABLE */ -+static int kbasep_trace_init(struct kbase_device *kbdev) ++struct mali_internal_sync_timeline *mali_internal_sync_timeline_create(const struct mali_internal_sync_timeline_ops *ops, ++ int size, const char *name) +{ -+ CSTD_UNUSED(kbdev); -+ return 0; -+} ++ struct mali_internal_sync_timeline *sync_timeline = NULL; + -+static void kbasep_trace_term(struct kbase_device *kbdev) -+{ -+ CSTD_UNUSED(kbdev); -+} ++ MALI_DEBUG_ASSERT_POINTER(ops); + -+static void kbasep_trace_hook_wrapper(void *param) -+{ -+ CSTD_UNUSED(param); -+} ++ if (size < sizeof(struct mali_internal_sync_timeline)) { ++ MALI_PRINT_ERROR(("Mali internal sync:Invalid size to create the mali internal sync timeline.\n")); ++ goto err; ++ } + -+void kbasep_trace_dump(struct kbase_device *kbdev) -+{ -+ CSTD_UNUSED(kbdev); -+} -+#endif /* KBASE_TRACE_ENABLE */ ++ sync_timeline = kzalloc(size, GFP_KERNEL); ++ if (NULL == sync_timeline) { ++ MALI_PRINT_ERROR(("Mali internal sync:Failed to allocate buffer for the mali internal sync timeline.\n")); ++ goto err; ++ } ++ kref_init(&sync_timeline->kref_count); ++ sync_timeline->ops = ops; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ sync_timeline->fence_context = dma_fence_context_alloc(1); ++#else ++ sync_timeline->fence_context = fence_context_alloc(1); ++#endif ++ strlcpy(sync_timeline->name, name, sizeof(sync_timeline->name)); + -+void kbase_set_profiling_control(struct kbase_device *kbdev, u32 control, u32 value) -+{ -+ switch (control) { -+ case FBDUMP_CONTROL_ENABLE: -+ /* fall through */ -+ case FBDUMP_CONTROL_RATE: -+ /* fall through */ -+ case SW_COUNTER_ENABLE: -+ /* fall through */ -+ case FBDUMP_CONTROL_RESIZE_FACTOR: -+ kbdev->kbase_profiling_controls[control] = value; -+ break; -+ default: -+ dev_err(kbdev->dev, "Profiling control %d not found\n", control); -+ break; ++ INIT_LIST_HEAD(&sync_timeline->sync_pt_list_head); ++ spin_lock_init(&sync_timeline->sync_pt_list_lock); ++ ++ return sync_timeline; ++err: ++ if (NULL != sync_timeline) { ++ kfree(sync_timeline); + } ++ return NULL; +} + -+/* -+ * Called by gator to control the production of -+ * profiling information at runtime -+ * */ -+ -+void _mali_profiling_control(u32 action, u32 value) ++void mali_internal_sync_timeline_destroy(struct mali_internal_sync_timeline *sync_timeline) +{ -+ struct kbase_device *kbdev = NULL; ++ MALI_DEBUG_ASSERT_POINTER(sync_timeline); + -+ /* find the first i.e. call with -1 */ -+ kbdev = kbase_find_device(-1); ++ sync_timeline->destroyed = MALI_TRUE; + -+ if (NULL != kbdev) -+ kbase_set_profiling_control(kbdev, action, value); ++ smp_wmb(); ++ ++ mali_internal_sync_timeline_signal(sync_timeline); ++ kref_put(&sync_timeline->kref_count, mali_internal_sync_timeline_free); +} -+KBASE_EXPORT_SYMBOL(_mali_profiling_control); + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_disjoint_events.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_disjoint_events.c -new file mode 100755 -index 000000000000..f70bcccf4050 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_disjoint_events.c -@@ -0,0 +1,76 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++void mali_internal_sync_timeline_signal(struct mali_internal_sync_timeline *sync_timeline) ++{ ++ unsigned long flags; ++ struct mali_internal_sync_point *sync_pt, *next; + ++ MALI_DEBUG_ASSERT_POINTER(sync_timeline); + ++ spin_lock_irqsave(&sync_timeline->sync_pt_list_lock, flags); + -+/* -+ * Base kernel disjoint events helper functions -+ */ ++ list_for_each_entry_safe(sync_pt, next, &sync_timeline->sync_pt_list_head, ++ sync_pt_list) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ if (dma_fence_is_signaled_locked(&sync_pt->base)) ++#else ++ if (fence_is_signaled_locked(&sync_pt->base)) ++#endif ++ list_del_init(&sync_pt->sync_pt_list); ++ } + -+#include ++ spin_unlock_irqrestore(&sync_timeline->sync_pt_list_lock, flags); ++} + -+void kbase_disjoint_init(struct kbase_device *kbdev) ++struct mali_internal_sync_point *mali_internal_sync_point_create(struct mali_internal_sync_timeline *sync_timeline, int size) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ unsigned long flags; ++ struct mali_internal_sync_point *sync_pt = NULL; + -+ atomic_set(&kbdev->disjoint_event.count, 0); -+ atomic_set(&kbdev->disjoint_event.state, 0); -+} ++ MALI_DEBUG_ASSERT_POINTER(sync_timeline); + -+/* increment the disjoint event count */ -+void kbase_disjoint_event(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ if (size < sizeof(struct mali_internal_sync_point)) { ++ MALI_PRINT_ERROR(("Mali internal sync:Invalid size to create the mali internal sync point.\n")); ++ goto err; ++ } + -+ atomic_inc(&kbdev->disjoint_event.count); ++ sync_pt = kzalloc(size, GFP_KERNEL); ++ if (NULL == sync_pt) { ++ MALI_PRINT_ERROR(("Mali internal sync:Failed to allocate buffer for the mali internal sync point.\n")); ++ goto err; ++ } ++ spin_lock_irqsave(&sync_timeline->sync_pt_list_lock, flags); ++ kref_get(&sync_timeline->kref_count); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ dma_fence_init(&sync_pt->base, &fence_ops, &sync_timeline->sync_pt_list_lock, ++ sync_timeline->fence_context, ++sync_timeline->value); ++#else ++ fence_init(&sync_pt->base, &fence_ops, &sync_timeline->sync_pt_list_lock, ++ sync_timeline->fence_context, ++sync_timeline->value); ++#endif ++ INIT_LIST_HEAD(&sync_pt->sync_pt_list); ++ spin_unlock_irqrestore(&sync_timeline->sync_pt_list_lock, flags); ++ ++ return sync_pt; ++err: ++ if (NULL != sync_pt) { ++ kfree(sync_pt); ++ } ++ return NULL; +} + -+/* increment the state and the event counter */ -+void kbase_disjoint_state_up(struct kbase_device *kbdev) ++struct mali_internal_sync_fence *mali_internal_sync_fence_fdget(int fd) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ struct file *file = fget(fd); + -+ atomic_inc(&kbdev->disjoint_event.state); ++ if (NULL == file) { ++ return NULL; ++ } + -+ kbase_disjoint_event(kbdev); ++ return file->private_data; +} + -+/* decrement the state */ -+void kbase_disjoint_state_down(struct kbase_device *kbdev) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++struct mali_internal_sync_fence *mali_internal_sync_fence_merge( ++ struct mali_internal_sync_fence *sync_fence1, struct mali_internal_sync_fence *sync_fence2) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(atomic_read(&kbdev->disjoint_event.state) > 0); ++ struct mali_internal_sync_fence *new_sync_fence; ++ int i, j, num_fence1, num_fence2, total_fences; ++ struct fence *fence0 = NULL; + -+ kbase_disjoint_event(kbdev); ++ MALI_DEBUG_ASSERT_POINTER(sync_fence1); ++ MALI_DEBUG_ASSERT_POINTER(sync_fence2); + -+ atomic_dec(&kbdev->disjoint_event.state); -+} ++ num_fence1 = sync_fence1->num_fences; ++ num_fence2 = sync_fence2->num_fences; + -+/* increments the count only if the state is > 0 */ -+void kbase_disjoint_event_potential(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ total_fences = num_fence1 + num_fence2; + -+ if (atomic_read(&kbdev->disjoint_event.state)) -+ kbase_disjoint_event(kbdev); -+} ++ i = 0; ++ j = 0; + -+u32 kbase_disjoint_event_get(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ if (num_fence1 > 0) { ++ fence0 = sync_fence1->cbs[i].fence; ++ i = 1; ++ } else if (num_fence2 > 0) { ++ fence0 = sync_fence2->cbs[i].fence; ++ j = 1; ++ } + -+ return atomic_read(&kbdev->disjoint_event.count); -+} -+KBASE_EXPORT_TEST_API(kbase_disjoint_event_get); -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_dma_fence.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_dma_fence.c -new file mode 100755 -index 000000000000..8a571266534b ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_dma_fence.c -@@ -0,0 +1,449 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ new_sync_fence = (struct mali_internal_sync_fence *)sync_file_create(fence0); ++ if (NULL == new_sync_fence) { ++ MALI_PRINT_ERROR(("Mali internal sync:Failed to create the mali internal sync fence when merging sync fence.\n")); ++ return NULL; ++ } + ++ fence_remove_callback(new_sync_fence->cb[0].fence, &new_sync_fence->cb[0].cb); ++ new_sync_fence->num_fences = 0; ++ atomic_dec(&new_sync_fence->status); + ++ for (; i < num_fence1 && j < num_fence2;) { ++ struct fence *fence1 = sync_fence1->cbs[i].fence; ++ struct fence *fence2 = sync_fence2->cbs[j].fence; + ++ if (fence1->context < fence2->context) { ++ mali_internal_sync_fence_add_fence(new_sync_fence, fence1); + -+/* Include mali_kbase_dma_fence.h before checking for CONFIG_MALI_BIFROST_DMA_FENCE as -+ * it will be set there. -+ */ -+#include "mali_kbase_dma_fence.h" ++ i++; ++ } else if (fence1->context > fence2->context) { ++ mali_internal_sync_fence_add_fence(new_sync_fence, fence2); + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++ j++; ++ } else { ++ if (fence1->seqno - fence2->seqno <= INT_MAX) ++ mali_internal_sync_fence_add_fence(new_sync_fence, fence1); ++ else ++ mali_internal_sync_fence_add_fence(new_sync_fence, fence2); ++ i++; ++ j++; ++ } ++ } + -+#include ++ for (; i < num_fence1; i++) ++ mali_internal_sync_fence_add_fence(new_sync_fence, sync_fence1->cbs[i].fence); + -+static void -+kbase_dma_fence_work(struct work_struct *pwork); ++ for (; j < num_fence2; j++) ++ mali_internal_sync_fence_add_fence(new_sync_fence, sync_fence2->cbs[j].fence); + -+static void -+kbase_dma_fence_waiters_add(struct kbase_jd_atom *katom) ++ return new_sync_fence; ++} ++#else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++static struct fence **mali_internal_get_fences(struct mali_internal_sync_fence *sync_fence, int *num_fences) ++#else ++static struct dma_fence **mali_internal_get_fences(struct mali_internal_sync_fence *sync_fence, int *num_fences) ++#endif +{ -+ struct kbase_context *kctx = katom->kctx; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++ if (sync_fence->fence->ops == &fence_array_ops) { ++ struct fence_array *fence_array = container_of(sync_fence->fence, struct fence_array, base); ++ *num_fences = fence_array->num_fences; ++ return fence_array->fences; ++ } ++#else ++ if (sync_fence->fence->ops == &dma_fence_array_ops) { ++ struct dma_fence_array *fence_array = container_of(sync_fence->fence, struct dma_fence_array, base); ++ *num_fences = fence_array->num_fences; ++ return fence_array->fences; ++ } ++#endif ++ *num_fences = 1; ++ return &sync_fence->fence; ++} + -+ list_add_tail(&katom->queue, &kctx->dma_fence.waiting_resource); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++static void mali_internal_add_fence_array(struct fence **fences, int *num_fences, struct fence *fence) ++#else ++static void mali_internal_add_fence_array(struct dma_fence **fences, int *num_fences, struct dma_fence *fence) ++#endif ++{ ++ fences[*num_fences] = fence; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++ if (!fence_is_signaled(fence)) { ++ fence_get(fence); ++ (*num_fences)++; ++ } ++#else ++ if (!dma_fence_is_signaled(fence)) { ++ dma_fence_get(fence); ++ (*num_fences)++; ++ } ++#endif +} + -+static void -+kbase_dma_fence_waiters_remove(struct kbase_jd_atom *katom) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++static int mali_internal_sync_fence_set_fence_array(struct mali_internal_sync_fence *sync_fence, ++ struct fence **fences, int num_fences) ++#else ++static int mali_internal_sync_fence_set_fence_array(struct mali_internal_sync_fence *sync_fence, ++ struct dma_fence **fences, int num_fences) ++#endif +{ -+ list_del(&katom->queue); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++ struct fence_array *array; ++#else ++ struct dma_fence_array *array; ++#endif ++ if(num_fences == 1) { ++ sync_fence->fence =fences[0]; ++ kfree(fences); ++ } else { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++ array = fence_array_create(num_fences, fences, ++ fence_context_alloc(1), 1, false); ++#else ++ array = dma_fence_array_create(num_fences, fences, ++ dma_fence_context_alloc(1), 1, false); ++#endif ++ if (!array){ ++ return -ENOMEM; ++ } ++ sync_fence->fence = &array->base; ++ } ++ return 0; +} + -+static int -+kbase_dma_fence_lock_reservations(struct kbase_dma_fence_resv_info *info, -+ struct ww_acquire_ctx *ctx) ++struct mali_internal_sync_fence *mali_internal_sync_fence_merge( ++ struct mali_internal_sync_fence *sync_fence1, struct mali_internal_sync_fence *sync_fence2) +{ -+ struct reservation_object *content_res = NULL; -+ unsigned int content_res_idx = 0; -+ unsigned int r; -+ int err = 0; ++ struct mali_internal_sync_fence *sync_fence; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++ struct fence **fences, **nfences, **fences1, **fences2; ++#else ++ struct dma_fence **fences, **nfences, **fences1, **fences2; ++#endif ++ int real_num_fences, i, j, num_fences, num_fences1, num_fences2; + -+ ww_acquire_init(ctx, &reservation_ww_class); ++ fences1 = mali_internal_get_fences(sync_fence1, &num_fences1); ++ fences2 = mali_internal_get_fences(sync_fence2, &num_fences2); + -+retry: -+ for (r = 0; r < info->dma_fence_resv_count; r++) { -+ if (info->resv_objs[r] == content_res) { -+ content_res = NULL; -+ continue; -+ } ++ num_fences = num_fences1 + num_fences2; + -+ err = ww_mutex_lock(&info->resv_objs[r]->lock, ctx); -+ if (err) -+ goto error; ++ fences = kcalloc(num_fences, sizeof(*fences), GFP_KERNEL); ++ if (!fences) { ++ MALI_PRINT_ERROR(("Mali internal sync:Failed to alloc buffer for fences.\n")); ++ goto fences_alloc_failed; + } + -+ ww_acquire_done(ctx); -+ return err; -+ -+error: -+ content_res_idx = r; ++ for (real_num_fences = i = j = 0; i < num_fences1 && j < num_fences2;) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++ struct fence *fence1 = fences1[i]; ++ struct fence *fence2 = fences2[j]; ++#else ++ struct dma_fence *fence1 = fences1[i]; ++ struct dma_fence *fence2 = fences2[j]; ++#endif ++ if (fence1->context < fence2->context) { ++ mali_internal_add_fence_array(fences, &real_num_fences, fence1); + -+ /* Unlock the locked one ones */ -+ while (r--) -+ ww_mutex_unlock(&info->resv_objs[r]->lock); ++ i++; ++ } else if (fence1->context > fence2->context) { ++ mali_internal_add_fence_array(fences, &real_num_fences, fence2); + -+ if (content_res) -+ ww_mutex_unlock(&content_res->lock); ++ j++; ++ } else { ++ if (fence1->seqno - fence2->seqno <= INT_MAX) ++ mali_internal_add_fence_array(fences, &real_num_fences, fence1); ++ else ++ mali_internal_add_fence_array(fences, &real_num_fences, fence2); + -+ /* If we deadlock try with lock_slow and retry */ -+ if (err == -EDEADLK) { -+ content_res = info->resv_objs[content_res_idx]; -+ ww_mutex_lock_slow(&content_res->lock, ctx); -+ goto retry; ++ i++; ++ j++; ++ } + } + -+ /* If we are here the function failed */ -+ ww_acquire_fini(ctx); -+ return err; -+} ++ for (; i < num_fences1; i++) ++ mali_internal_add_fence_array(fences, &real_num_fences, fences1[i]); + -+static void -+kbase_dma_fence_unlock_reservations(struct kbase_dma_fence_resv_info *info, -+ struct ww_acquire_ctx *ctx) -+{ -+ unsigned int r; ++ for (; j < num_fences2; j++) ++ mali_internal_add_fence_array(fences, &real_num_fences, fences2[j]); + -+ for (r = 0; r < info->dma_fence_resv_count; r++) -+ ww_mutex_unlock(&info->resv_objs[r]->lock); -+ ww_acquire_fini(ctx); -+} ++ if (0 == real_num_fences) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++ fences[real_num_fences++] = fence_get(fences1[0]); ++#else ++ fences[real_num_fences++] = dma_fence_get(fences1[0]); ++#endif + -+/** -+ * kbase_dma_fence_queue_work() - Queue work to handle @katom -+ * @katom: Pointer to atom for which to queue work -+ * -+ * Queue kbase_dma_fence_work() for @katom to clean up the fence callbacks and -+ * submit the atom. -+ */ -+static void -+kbase_dma_fence_queue_work(struct kbase_jd_atom *katom) -+{ -+ struct kbase_context *kctx = katom->kctx; -+ bool ret; ++ if (num_fences > real_num_fences) { ++ nfences = krealloc(fences, real_num_fences * sizeof(*fences), ++ GFP_KERNEL); ++ if (!nfences) ++ goto nfences_alloc_failed; + -+ INIT_WORK(&katom->work, kbase_dma_fence_work); -+ ret = queue_work(kctx->dma_fence.wq, &katom->work); -+ /* Warn if work was already queued, that should not happen. */ -+ WARN_ON(!ret); -+} ++ fences = nfences; ++ } + -+/** -+ * kbase_dma_fence_cancel_atom() - Cancels waiting on an atom -+ * @katom: Katom to cancel -+ * -+ * Locking: katom->dma_fence.callbacks list assumes jctx.lock is held. -+ */ -+static void -+kbase_dma_fence_cancel_atom(struct kbase_jd_atom *katom) -+{ -+ lockdep_assert_held(&katom->kctx->jctx.lock); ++ sync_fence = (struct mali_internal_sync_fence *)sync_file_create(fences[0]); ++ if (NULL == sync_fence) { ++ MALI_PRINT_ERROR(("Mali internal sync:Failed to create the mali internal sync fence when merging sync fence.\n")); ++ goto sync_fence_alloc_failed; ++ } + -+ /* Cancel callbacks and clean up. */ -+ kbase_fence_free_callbacks(katom); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++ fence_put(fences[0]); ++#else ++ dma_fence_put(fences[0]); ++#endif + -+ /* Mark the atom as handled in case all fences signaled just before -+ * canceling the callbacks and the worker was queued. -+ */ -+ kbase_fence_dep_count_set(katom, -1); ++ if (mali_internal_sync_fence_set_fence_array(sync_fence, fences, real_num_fences) < 0) { ++ MALI_PRINT_ERROR(("Mali internal sync:Failed to set fence for sync fence.\n")); ++ goto sync_fence_set_failed; ++ } + -+ /* Prevent job_done_nolock from being called twice on an atom when -+ * there is a race between job completion and cancellation. -+ */ ++ return sync_fence; + -+ if (katom->status == KBASE_JD_ATOM_STATE_QUEUED) { -+ /* Wait was cancelled - zap the atom */ -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ if (jd_done_nolock(katom, NULL)) -+ kbase_js_sched_all(katom->kctx->kbdev); -+ } ++sync_fence_set_failed: ++ fput(sync_fence->file); ++sync_fence_alloc_failed: ++ for (i = 0; i < real_num_fences; i++) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++ fence_put(fences[i]); ++#else ++ dma_fence_put(fences[i]); ++#endif ++nfences_alloc_failed: ++ kfree(fences); ++fences_alloc_failed: ++ return NULL; +} ++#endif + -+/** -+ * kbase_dma_fence_work() - Worker thread called when a fence is signaled -+ * @pwork: work_struct containing a pointer to a katom -+ * -+ * This function will clean and mark all dependencies as satisfied -+ */ -+static void -+kbase_dma_fence_work(struct work_struct *pwork) ++void mali_internal_sync_fence_waiter_init(struct mali_internal_sync_fence_waiter *waiter, ++ mali_internal_sync_callback_t callback) +{ -+ struct kbase_jd_atom *katom; -+ struct kbase_jd_context *ctx; ++ MALI_DEBUG_ASSERT_POINTER(waiter); ++ MALI_DEBUG_ASSERT_POINTER(callback); + -+ katom = container_of(pwork, struct kbase_jd_atom, work); -+ ctx = &katom->kctx->jctx; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) ++ INIT_LIST_HEAD(&waiter->work.entry); ++#else ++ INIT_LIST_HEAD(&waiter->work.task_list); ++#endif ++ waiter->callback = callback; ++} + -+ mutex_lock(&ctx->lock); -+ if (kbase_fence_dep_count_read(katom) != 0) -+ goto out; ++int mali_internal_sync_fence_wait_async(struct mali_internal_sync_fence *sync_fence, ++ struct mali_internal_sync_fence_waiter *waiter) ++{ ++ int err; ++ unsigned long flags; + -+ kbase_fence_dep_count_set(katom, -1); ++ MALI_DEBUG_ASSERT_POINTER(sync_fence); ++ MALI_DEBUG_ASSERT_POINTER(waiter); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ err = atomic_read(&sync_fence->status); + -+ /* Remove atom from list of dma-fence waiting atoms. */ -+ kbase_dma_fence_waiters_remove(katom); -+ /* Cleanup callbacks. */ -+ kbase_fence_free_callbacks(katom); -+ /* -+ * Queue atom on GPU, unless it has already completed due to a failing -+ * dependency. Run jd_done_nolock() on the katom if it is completed. -+ */ -+ if (unlikely(katom->status == KBASE_JD_ATOM_STATE_COMPLETED)) -+ jd_done_nolock(katom, NULL); -+ else -+ kbase_jd_dep_clear_locked(katom); ++ if (0 > err) ++ return err; + -+out: -+ mutex_unlock(&ctx->lock); -+} ++ if (!err) ++ return 1; + -+static void -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+kbase_dma_fence_cb(struct fence *fence, struct fence_cb *cb) -+#else -+kbase_dma_fence_cb(struct dma_fence *fence, struct dma_fence_cb *cb) -+#endif -+{ -+ struct kbase_fence_cb *kcb = container_of(cb, -+ struct kbase_fence_cb, -+ fence_cb); -+ struct kbase_jd_atom *katom = kcb->katom; ++ init_waitqueue_func_entry(&waiter->work, mali_internal_sync_fence_wake_up_wq); ++ waiter->work.private = sync_fence; + -+ /* If the atom is zapped dep_count will be forced to a negative number -+ * preventing this callback from ever scheduling work. Which in turn -+ * would reschedule the atom. -+ */ ++ spin_lock_irqsave(&sync_fence->wq.lock, flags); ++ err = atomic_read(&sync_fence->status); + -+ if (kbase_fence_dep_count_dec_and_test(katom)) -+ kbase_dma_fence_queue_work(katom); -+} ++ if (0 < err) ++ __add_wait_queue_tail(&sync_fence->wq, &waiter->work); ++ spin_unlock_irqrestore(&sync_fence->wq.lock, flags); + -+static int -+kbase_dma_fence_add_reservation_callback(struct kbase_jd_atom *katom, -+ struct reservation_object *resv, -+ bool exclusive) -+{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *excl_fence = NULL; -+ struct fence **shared_fences = NULL; ++ if (0 > err) ++ return err; ++ ++ return !err; +#else -+ struct dma_fence *excl_fence = NULL; -+ struct dma_fence **shared_fences = NULL; -+#endif -+ unsigned int shared_count = 0; -+ int err, i; ++ if ((sync_fence->fence) && (sync_fence->fence->ops) && (sync_fence->fence->ops->signaled)) ++ err = sync_fence->fence->ops->signaled(sync_fence->fence); ++ else ++ err = -1; + -+ err = reservation_object_get_fences_rcu(resv, -+ &excl_fence, -+ &shared_count, -+ &shared_fences); -+ if (err) ++ if (0 > err) + return err; + -+ if (excl_fence) { -+ err = kbase_fence_add_callback(katom, -+ excl_fence, -+ kbase_dma_fence_cb); -+ -+ /* Release our reference, taken by reservation_object_get_fences_rcu(), -+ * to the fence. We have set up our callback (if that was possible), -+ * and it's the fence's owner is responsible for singling the fence -+ * before allowing it to disappear. -+ */ -+ dma_fence_put(excl_fence); ++ if (1 == err) ++ return err; + -+ if (err) -+ goto out; -+ } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ err = dma_fence_add_callback(sync_fence->fence, &waiter->cb, mali_internal_fence_check_cb_func); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++ err = fence_add_callback(sync_fence->fence, &waiter->cb, mali_internal_fence_check_cb_func); ++#endif + -+ if (exclusive) { -+ for (i = 0; i < shared_count; i++) { -+ err = kbase_fence_add_callback(katom, -+ shared_fences[i], -+ kbase_dma_fence_cb); -+ if (err) -+ goto out; -+ } ++ if (0 != err) { ++ if (-ENOENT == err) ++ err = 1; ++ return err; + } ++ init_waitqueue_func_entry(&waiter->work, mali_internal_sync_fence_wake_up_wq); ++ waiter->work.private = sync_fence; + -+ /* Release all our references to the shared fences, taken by -+ * reservation_object_get_fences_rcu(). We have set up our callback (if -+ * that was possible), and it's the fence's owner is responsible for -+ * signaling the fence before allowing it to disappear. -+ */ -+out: -+ for (i = 0; i < shared_count; i++) -+ dma_fence_put(shared_fences[i]); -+ kfree(shared_fences); ++ spin_lock_irqsave(&sync_fence->wq.lock, flags); ++ err = sync_fence->fence->ops->signaled(sync_fence->fence); + -+ if (err) { -+ /* -+ * On error, cancel and clean up all callbacks that was set up -+ * before the error. -+ */ -+ kbase_fence_free_callbacks(katom); -+ } ++ if (0 == err){ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) ++ __add_wait_queue_entry_tail(&sync_fence->wq, &waiter->work); ++#else ++ __add_wait_queue_tail(&sync_fence->wq, &waiter->work); ++#endif ++ } ++ spin_unlock_irqrestore(&sync_fence->wq.lock, flags); + + return err; ++#endif +} + -+void kbase_dma_fence_add_reservation(struct reservation_object *resv, -+ struct kbase_dma_fence_resv_info *info, -+ bool exclusive) ++int mali_internal_sync_fence_cancel_async(struct mali_internal_sync_fence *sync_fence, ++ struct mali_internal_sync_fence_waiter *waiter) +{ -+ unsigned int i; ++ unsigned long flags; ++ int ret = 0; ++ ++ MALI_DEBUG_ASSERT_POINTER(sync_fence); ++ MALI_DEBUG_ASSERT_POINTER(waiter); ++ ++ spin_lock_irqsave(&sync_fence->wq.lock, flags); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) ++ if (!list_empty(&waiter->work.entry)) ++ list_del_init(&waiter->work.entry); ++#else ++ if (!list_empty(&waiter->work.task_list)) ++ list_del_init(&waiter->work.task_list); ++#endif ++ else ++ ret = -ENOENT; ++ spin_unlock_irqrestore(&sync_fence->wq.lock, flags); ++ ++ if (0 == ret) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ dma_fence_remove_callback(sync_fence->fence, &waiter->cb); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++ fence_remove_callback(sync_fence->fence, &waiter->cb); ++#endif + -+ for (i = 0; i < info->dma_fence_resv_count; i++) { -+ /* Duplicate resource, ignore */ -+ if (info->resv_objs[i] == resv) -+ return; + } + -+ info->resv_objs[info->dma_fence_resv_count] = resv; -+ if (exclusive) -+ set_bit(info->dma_fence_resv_count, -+ info->dma_fence_excl_bitmap); -+ (info->dma_fence_resv_count)++; ++ return ret; +} + -+int kbase_dma_fence_wait(struct kbase_jd_atom *katom, -+ struct kbase_dma_fence_resv_info *info) -+{ -+ int err, i; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++static const char *mali_internal_fence_get_driver_name(struct dma_fence *fence) +#else -+ struct dma_fence *fence; ++static const char *mali_internal_fence_get_driver_name(struct fence *fence) +#endif -+ struct ww_acquire_ctx ww_ctx; ++{ ++ struct mali_internal_sync_point *sync_pt; ++ struct mali_internal_sync_timeline *parent; + -+ lockdep_assert_held(&katom->kctx->jctx.lock); ++ MALI_DEBUG_ASSERT_POINTER(fence); + -+ fence = kbase_fence_out_new(katom); -+ if (!fence) { -+ err = -ENOMEM; -+ dev_err(katom->kctx->kbdev->dev, -+ "Error %d creating fence.\n", err); -+ return err; -+ } ++ sync_pt = mali_internal_fence_to_sync_pt(fence); ++ parent = mali_internal_sync_pt_to_sync_timeline(sync_pt); + -+ kbase_fence_dep_count_set(katom, 1); ++ return parent->ops->driver_name; ++} + -+ err = kbase_dma_fence_lock_reservations(info, &ww_ctx); -+ if (err) { -+ dev_err(katom->kctx->kbdev->dev, -+ "Error %d locking reservations.\n", err); -+ kbase_fence_dep_count_set(katom, -1); -+ kbase_fence_out_remove(katom); -+ return err; -+ } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++static const char *mali_internal_fence_get_timeline_name(struct dma_fence *fence) ++#else ++static const char *mali_internal_fence_get_timeline_name(struct fence *fence) ++#endif ++{ ++ struct mali_internal_sync_point *sync_pt; ++ struct mali_internal_sync_timeline *parent; + -+ for (i = 0; i < info->dma_fence_resv_count; i++) { -+ struct reservation_object *obj = info->resv_objs[i]; ++ MALI_DEBUG_ASSERT_POINTER(fence); + -+ if (!test_bit(i, info->dma_fence_excl_bitmap)) { -+ err = reservation_object_reserve_shared(obj); -+ if (err) { -+ dev_err(katom->kctx->kbdev->dev, -+ "Error %d reserving space for shared fence.\n", err); -+ goto end; -+ } ++ sync_pt = mali_internal_fence_to_sync_pt(fence); ++ parent = mali_internal_sync_pt_to_sync_timeline(sync_pt); + -+ err = kbase_dma_fence_add_reservation_callback(katom, obj, false); -+ if (err) { -+ dev_err(katom->kctx->kbdev->dev, -+ "Error %d adding reservation to callback.\n", err); -+ goto end; -+ } ++ return parent->name; ++} + -+ reservation_object_add_shared_fence(obj, fence); -+ } else { -+ err = kbase_dma_fence_add_reservation_callback(katom, obj, true); -+ if (err) { -+ dev_err(katom->kctx->kbdev->dev, -+ "Error %d adding reservation to callback.\n", err); -+ goto end; -+ } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++static void mali_internal_fence_release(struct dma_fence *fence) ++#else ++static void mali_internal_fence_release(struct fence *fence) ++#endif ++{ ++ unsigned long flags; ++ struct mali_internal_sync_point *sync_pt; ++ struct mali_internal_sync_timeline *parent; + -+ reservation_object_add_excl_fence(obj, fence); -+ } -+ } ++ MALI_DEBUG_ASSERT_POINTER(fence); + -+end: -+ kbase_dma_fence_unlock_reservations(info, &ww_ctx); ++ sync_pt = mali_internal_fence_to_sync_pt(fence); ++ parent = mali_internal_sync_pt_to_sync_timeline(sync_pt); + -+ if (likely(!err)) { -+ /* Test if the callbacks are already triggered */ -+ if (kbase_fence_dep_count_dec_and_test(katom)) { -+ kbase_fence_dep_count_set(katom, -1); -+ kbase_fence_free_callbacks(katom); -+ } else { -+ /* Add katom to the list of dma-buf fence waiting atoms -+ * only if it is still waiting. -+ */ -+ kbase_dma_fence_waiters_add(katom); -+ } -+ } else { -+ /* There was an error, cancel callbacks, set dep_count to -1 to -+ * indicate that the atom has been handled (the caller will -+ * kill it for us), signal the fence, free callbacks and the -+ * fence. -+ */ -+ kbase_fence_free_callbacks(katom); -+ kbase_fence_dep_count_set(katom, -1); -+ kbase_dma_fence_signal(katom); -+ } + -+ return err; ++ spin_lock_irqsave(fence->lock, flags); ++ if (WARN_ON_ONCE(!list_empty(&sync_pt->sync_pt_list))) ++ list_del(&sync_pt->sync_pt_list); ++ spin_unlock_irqrestore(fence->lock, flags); ++ ++ if (parent->ops->free_pt) ++ parent->ops->free_pt(sync_pt); ++ ++ kref_put(&parent->kref_count, mali_internal_sync_timeline_free); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ dma_fence_free(&sync_pt->base); ++#else ++ fence_free(&sync_pt->base); ++#endif +} + -+void kbase_dma_fence_cancel_all_atoms(struct kbase_context *kctx) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++static bool mali_internal_fence_signaled(struct dma_fence *fence) ++#else ++static bool mali_internal_fence_signaled(struct fence *fence) ++#endif +{ -+ struct list_head *list = &kctx->dma_fence.waiting_resource; ++ int ret; ++ struct mali_internal_sync_point *sync_pt; ++ struct mali_internal_sync_timeline *parent; + -+ while (!list_empty(list)) { -+ struct kbase_jd_atom *katom; ++ MALI_DEBUG_ASSERT_POINTER(fence); + -+ katom = list_first_entry(list, struct kbase_jd_atom, queue); -+ kbase_dma_fence_waiters_remove(katom); -+ kbase_dma_fence_cancel_atom(katom); -+ } -+} ++ sync_pt = mali_internal_fence_to_sync_pt(fence); ++ parent = mali_internal_sync_pt_to_sync_timeline(sync_pt); + -+void kbase_dma_fence_cancel_callbacks(struct kbase_jd_atom *katom) -+{ -+ /* Cancel callbacks and clean up. */ -+ if (kbase_fence_free_callbacks(katom)) -+ kbase_dma_fence_queue_work(katom); ++ ret = parent->ops->has_signaled(sync_pt); ++ if (0 > ret) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) \ ++ || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 68))) ++ fence->error = ret; ++#else ++ fence->status = ret; ++#endif ++ return ret; +} + -+void kbase_dma_fence_signal(struct kbase_jd_atom *katom) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++static bool mali_internal_fence_enable_signaling(struct dma_fence *fence) ++#else ++static bool mali_internal_fence_enable_signaling(struct fence *fence) ++#endif +{ -+ if (!katom->dma_fence.fence) -+ return; ++ struct mali_internal_sync_point *sync_pt; ++ struct mali_internal_sync_timeline *parent; + -+ /* Signal the atom's fence. */ -+ dma_fence_signal(katom->dma_fence.fence); ++ MALI_DEBUG_ASSERT_POINTER(fence); + -+ kbase_fence_out_remove(katom); ++ sync_pt = mali_internal_fence_to_sync_pt(fence); ++ parent = mali_internal_sync_pt_to_sync_timeline(sync_pt); + -+ kbase_fence_free_callbacks(katom); -+} ++ if (mali_internal_fence_signaled(fence)) ++ return false; + -+void kbase_dma_fence_term(struct kbase_context *kctx) -+{ -+ destroy_workqueue(kctx->dma_fence.wq); -+ kctx->dma_fence.wq = NULL; ++ list_add_tail(&sync_pt->sync_pt_list, &parent->sync_pt_list_head); ++ return true; +} + -+int kbase_dma_fence_init(struct kbase_context *kctx) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++static void mali_internal_fence_value_str(struct dma_fence *fence, char *str, int size) ++#else ++static void mali_internal_fence_value_str(struct fence *fence, char *str, int size) ++#endif +{ -+ INIT_LIST_HEAD(&kctx->dma_fence.waiting_resource); ++ struct mali_internal_sync_point *sync_pt; ++ struct mali_internal_sync_timeline *parent; + -+ kctx->dma_fence.wq = alloc_workqueue("mali-fence-%d", -+ WQ_UNBOUND, 1, kctx->pid); -+ if (!kctx->dma_fence.wq) -+ return -ENOMEM; ++ MALI_DEBUG_ASSERT_POINTER(fence); ++ MALI_IGNORE(str); ++ MALI_IGNORE(size); + -+ return 0; ++ sync_pt = mali_internal_fence_to_sync_pt(fence); ++ parent = mali_internal_sync_pt_to_sync_timeline(sync_pt); ++ ++ parent->ops->print_sync_pt(sync_pt); +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_dma_fence.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_dma_fence.h ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++static const struct dma_fence_ops fence_ops = { ++#else ++static const struct fence_ops fence_ops = { ++#endif ++ .get_driver_name = mali_internal_fence_get_driver_name, ++ .get_timeline_name = mali_internal_fence_get_timeline_name, ++ .enable_signaling = mali_internal_fence_enable_signaling, ++ .signaled = mali_internal_fence_signaled, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ .wait = dma_fence_default_wait, ++#else ++ .wait = fence_default_wait, ++#endif ++ .release = mali_internal_fence_release, ++ .fence_value_str = mali_internal_fence_value_str, ++}; ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h new file mode 100755 -index 000000000000..b02ea9774c4f +index 000000000..dbb29222b --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_dma_fence.h -@@ -0,0 +1,131 @@ ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h +@@ -0,0 +1,191 @@ +/* ++ * Copyright (C) 2012-2015, 2017-2018 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ ++/** ++ * @file mali_internal_sync.h + * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Mali internal structure/interface for sync. + */ + ++#ifndef _MALI_INTERNAL_SYNC_H ++#define _MALI_INTERNAL_SYNC_H ++#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++#include ++#include ++#include ++#include ++#include ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) ++#include ++#else ++#include ++#endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++#include ++#else ++#include ++#endif + -+#ifndef _KBASE_DMA_FENCE_H_ -+#define _KBASE_DMA_FENCE_H_ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++#include ++#else ++#include ++#endif ++#endif + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE ++struct mali_internal_sync_timeline; ++struct mali_internal_sync_point; ++struct mali_internal_sync_fence; + -+#include -+#include -+#include ++struct mali_internal_sync_timeline_ops { ++ const char *driver_name; ++ int (*has_signaled)(struct mali_internal_sync_point *pt); ++ void (*free_pt)(struct mali_internal_sync_point *sync_pt); ++ void (*release_obj)(struct mali_internal_sync_timeline *sync_timeline); ++ void (*print_sync_pt)(struct mali_internal_sync_point *sync_pt); ++}; + ++struct mali_internal_sync_timeline { ++ struct kref kref_count; ++ const struct mali_internal_sync_timeline_ops *ops; ++ char name[32]; ++ bool destroyed; ++ int fence_context; ++ int value; ++ spinlock_t sync_pt_list_lock; ++ struct list_head sync_pt_list_head; ++}; + -+/* Forward declaration from mali_kbase_defs.h */ -+struct kbase_jd_atom; -+struct kbase_context; ++struct mali_internal_sync_point { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ struct dma_fence base; ++#else ++ struct fence base; ++#endif ++ struct list_head sync_pt_list; ++}; + -+/** -+ * struct kbase_dma_fence_resv_info - Structure with list of reservation objects -+ * @resv_objs: Array of reservation objects to attach the -+ * new fence to. -+ * @dma_fence_resv_count: Number of reservation objects in the array. -+ * @dma_fence_excl_bitmap: Specifies which resv_obj are exclusive. -+ * -+ * This is used by some functions to pass around a collection of data about -+ * reservation objects. -+ */ -+struct kbase_dma_fence_resv_info { -+ struct reservation_object **resv_objs; -+ unsigned int dma_fence_resv_count; -+ unsigned long *dma_fence_excl_bitmap; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++struct mali_internal_sync_fence_cb { ++ struct fence_cb cb; ++ struct fence *fence; ++ struct mali_internal_sync_fence *sync_file; +}; ++#endif + -+/** -+ * kbase_dma_fence_add_reservation() - Adds a resv to the array of resv_objs -+ * @resv: Reservation object to add to the array. -+ * @info: Pointer to struct with current reservation info -+ * @exclusive: Boolean indicating if exclusive access is needed -+ * -+ * The function adds a new reservation_object to an existing array of -+ * reservation_objects. At the same time keeps track of which objects require -+ * exclusive access in dma_fence_excl_bitmap. -+ */ -+void kbase_dma_fence_add_reservation(struct reservation_object *resv, -+ struct kbase_dma_fence_resv_info *info, -+ bool exclusive); ++struct mali_internal_sync_fence { ++ struct file *file; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) ++ struct kref kref; ++#endif ++ char name[32]; ++#ifdef CONFIG_DEBUG_FS ++ struct list_head sync_file_list; ++#endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ int num_fences; ++#endif ++ wait_queue_head_t wq; ++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 12, 0) ++ unsigned long flags; ++#endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ atomic_t status; ++ struct mali_internal_sync_fence_cb cbs[]; ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++ struct fence *fence; ++ struct fence_cb cb; ++#else ++ struct dma_fence *fence; ++ struct dma_fence_cb cb; ++#endif ++}; ++ ++struct mali_internal_sync_fence_waiter; ++ ++typedef void (*mali_internal_sync_callback_t)(struct mali_internal_sync_fence *sync_fence, ++ struct mali_internal_sync_fence_waiter *waiter); ++ ++struct mali_internal_sync_fence_waiter { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) ++ wait_queue_entry_t work; ++#else ++ wait_queue_t work; ++#endif ++ mali_internal_sync_callback_t callback; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++ struct fence_cb cb; ++#else ++ struct dma_fence_cb cb; ++#endif ++#endif ++}; + +/** -+ * kbase_dma_fence_wait() - Creates a new fence and attaches it to the resv_objs -+ * @katom: Katom with the external dependency. -+ * @info: Pointer to struct with current reservation info -+ * -+ * Return: An error code or 0 if succeeds ++ * Create a mali internal sync timeline. ++ * @param ops The implementation ops for the mali internal sync timeline ++ * @param size The size to allocate ++ * @param name The sync_timeline name ++ * @return The new mali internal sync timeline if successful, NULL if not. + */ -+int kbase_dma_fence_wait(struct kbase_jd_atom *katom, -+ struct kbase_dma_fence_resv_info *info); ++struct mali_internal_sync_timeline *mali_internal_sync_timeline_create(const struct mali_internal_sync_timeline_ops *ops, ++ int size, const char *name); + +/** -+ * kbase_dma_fence_cancel_ctx() - Cancel all dma-fences blocked atoms on kctx -+ * @kctx: Pointer to kbase context -+ * -+ * This function will cancel and clean up all katoms on @kctx that is waiting -+ * on dma-buf fences. -+ * -+ * Locking: jctx.lock needs to be held when calling this function. ++ * Destroy one mali internal sync timeline. ++ * @param sync_timeline The mali internal sync timeline to destroy. + */ -+void kbase_dma_fence_cancel_all_atoms(struct kbase_context *kctx); ++void mali_internal_sync_timeline_destroy(struct mali_internal_sync_timeline *sync_timeline); + +/** -+ * kbase_dma_fence_cancel_callbacks() - Cancel only callbacks on katom -+ * @katom: Pointer to katom whose callbacks are to be canceled -+ * -+ * This function cancels all dma-buf fence callbacks on @katom, but does not -+ * cancel the katom itself. -+ * -+ * The caller is responsible for ensuring that jd_done_nolock is called on -+ * @katom. -+ * -+ * Locking: jctx.lock must be held when calling this function. ++ * Signal one mali internal sync timeline. ++ * @param sync_timeline The mali internal sync timeline to signal. + */ -+void kbase_dma_fence_cancel_callbacks(struct kbase_jd_atom *katom); ++void mali_internal_sync_timeline_signal(struct mali_internal_sync_timeline *sync_timeline); + +/** -+ * kbase_dma_fence_signal() - Signal katom's fence and clean up after wait -+ * @katom: Pointer to katom to signal and clean up -+ * -+ * This function will signal the @katom's fence, if it has one, and clean up -+ * the callback data from the katom's wait on earlier fences. -+ * -+ * Locking: jctx.lock must be held while calling this function. ++ * Create one mali internal sync point. ++ * @param sync_timeline The mali internal sync timeline to add this mali internal sync point. ++ * @return the new mali internal sync point if successful, NULL if not. + */ -+void kbase_dma_fence_signal(struct kbase_jd_atom *katom); ++struct mali_internal_sync_point *mali_internal_sync_point_create(struct mali_internal_sync_timeline *sync_timeline, int size); + +/** -+ * kbase_dma_fence_term() - Terminate Mali dma-fence context -+ * @kctx: kbase context to terminate ++ * Merge mali internal sync fences ++ * @param sync_fence1 The mali internal sync fence to merge ++ * @param sync_fence2 The mali internal sync fence to merge ++ * @return the new mali internal sync fence if successful, NULL if not. + */ -+void kbase_dma_fence_term(struct kbase_context *kctx); ++struct mali_internal_sync_fence *mali_internal_sync_fence_merge(struct mali_internal_sync_fence *sync_fence1, ++ struct mali_internal_sync_fence *sync_fence2); + +/** -+ * kbase_dma_fence_init() - Initialize Mali dma-fence context -+ * @kctx: kbase context to initialize ++ * Get the mali internal sync fence from sync fd ++ * @param fd The sync handle to get the mali internal sync fence ++ * @return the mali internal sync fence if successful, NULL if not. + */ -+int kbase_dma_fence_init(struct kbase_context *kctx); ++struct mali_internal_sync_fence *mali_internal_sync_fence_fdget(int fd); + + -+#else /* CONFIG_MALI_BIFROST_DMA_FENCE */ -+/* Dummy functions for when dma-buf fence isn't enabled. */ ++void mali_internal_sync_fence_waiter_init(struct mali_internal_sync_fence_waiter *waiter, ++ mali_internal_sync_callback_t callback); + -+static inline int kbase_dma_fence_init(struct kbase_context *kctx) -+{ -+ return 0; -+} ++int mali_internal_sync_fence_wait_async(struct mali_internal_sync_fence *sync_fence, ++ struct mali_internal_sync_fence_waiter *waiter); + -+static inline void kbase_dma_fence_term(struct kbase_context *kctx) {} -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ -+#endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_event.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_event.c ++int mali_internal_sync_fence_cancel_async(struct mali_internal_sync_fence *sync_fence, ++ struct mali_internal_sync_fence_waiter *waiter); ++ ++#endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)*/ ++#endif /* _MALI_INTERNAL_SYNC_H */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c new file mode 100755 -index 000000000000..188148645f37 +index 000000000..534db255e --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_event.c -@@ -0,0 +1,259 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c +@@ -0,0 +1,1177 @@ ++/** ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + + ++/** ++ * @file mali_kernel_linux.c ++ * Implementation of the Linux device driver entrypoints ++ */ ++#include "../platform/rk/custom_log.h" ++#include "../platform/rk/rk_ext.h" + ++#include /* kernel module definitions */ ++#include /* file system operations */ ++#include /* character device definitions */ ++#include /* memory manager definitions */ ++#include ++#include ++#include ++#include "mali_kernel_license.h" ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + ++#include "mali_kernel_common.h" ++#include "mali_session.h" ++#include "mali_kernel_core.h" ++#include "mali_osk.h" ++#include "mali_kernel_linux.h" ++#include "mali_ukk.h" ++#include "mali_ukk_wrappers.h" ++#include "mali_kernel_sysfs.h" ++#include "mali_pm.h" ++#include "mali_kernel_license.h" ++#include "mali_memory.h" ++#include "mali_memory_dma_buf.h" ++#include "mali_memory_manager.h" ++#include "mali_memory_swap_alloc.h" ++#if defined(CONFIG_MALI400_INTERNAL_PROFILING) ++#include "mali_profiling_internal.h" ++#endif ++#if defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_MALI_DVFS) ++#include "mali_osk_profiling.h" ++#include "mali_dvfs_policy.h" + -+#include -+#include -+#include ++static int is_first_resume = 1; ++/*Store the clk and vol for boot/insmod and mali_resume*/ ++static struct mali_gpu_clk_item mali_gpu_clk[2]; ++#endif + -+static struct base_jd_udata kbase_event_process(struct kbase_context *kctx, struct kbase_jd_atom *katom) -+{ -+ struct base_jd_udata data; ++/* Streamline support for the Mali driver */ ++#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_MALI400_PROFILING) ++/* Ask Linux to create the tracepoints */ ++#define CREATE_TRACE_POINTS ++#include "mali_linux_trace.h" + -+ lockdep_assert_held(&kctx->jctx.lock); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_event); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_hw_counter); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_sw_counters); ++#endif /* CONFIG_TRACEPOINTS */ + -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ KBASE_DEBUG_ASSERT(katom != NULL); -+ KBASE_DEBUG_ASSERT(katom->status == KBASE_JD_ATOM_STATE_COMPLETED); ++#ifdef CONFIG_MALI_DEVFREQ ++#include "mali_devfreq.h" ++#include "mali_osk_mali.h" + -+ data = katom->udata; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) ++#include ++#else ++/* In 3.13 the OPP include header file, types, and functions were all ++ * renamed. Use the old filename for the include, and define the new names to ++ * the old, when an old kernel is detected. ++ */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) ++#include ++#else ++#include ++#endif /* Linux >= 3.13*/ ++#define dev_pm_opp_of_add_table of_init_opp_table ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) ++#define dev_pm_opp_of_remove_table of_free_opp_table ++#endif /* Linux >= 3.19 */ ++#endif /* Linux >= 4.4.0 */ ++#endif + -+ KBASE_TIMELINE_ATOMS_IN_FLIGHT(kctx, atomic_sub_return(1, &kctx->timeline.jd_atoms_in_flight)); ++/* from the __malidrv_build_info.c file that is generated during build */ ++extern const char *__malidrv_build_info(void); + -+ KBASE_TLSTREAM_TL_NRET_ATOM_CTX(katom, kctx); -+ KBASE_TLSTREAM_TL_DEL_ATOM(katom); ++/* Module parameter to control log level */ ++int mali_debug_level = 2; ++module_param(mali_debug_level, int, S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP | S_IROTH); /* rw-rw-r-- */ ++MODULE_PARM_DESC(mali_debug_level, "Higher number, more dmesg output"); + -+ katom->status = KBASE_JD_ATOM_STATE_UNUSED; ++extern int mali_max_job_runtime; ++module_param(mali_max_job_runtime, int, S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP | S_IROTH); ++MODULE_PARM_DESC(mali_max_job_runtime, "Maximum allowed job runtime in msecs.\nJobs will be killed after this no matter what"); + -+ wake_up(&katom->completed); ++extern int mali_l2_max_reads; ++module_param(mali_l2_max_reads, int, S_IRUSR | S_IRGRP | S_IROTH); ++MODULE_PARM_DESC(mali_l2_max_reads, "Maximum reads for Mali L2 cache"); + -+ return data; -+} ++extern unsigned int mali_dedicated_mem_start; ++module_param(mali_dedicated_mem_start, uint, S_IRUSR | S_IRGRP | S_IROTH); ++MODULE_PARM_DESC(mali_dedicated_mem_start, "Physical start address of dedicated Mali GPU memory."); + -+int kbase_event_pending(struct kbase_context *ctx) -+{ -+ KBASE_DEBUG_ASSERT(ctx); ++extern unsigned int mali_dedicated_mem_size; ++module_param(mali_dedicated_mem_size, uint, S_IRUSR | S_IRGRP | S_IROTH); ++MODULE_PARM_DESC(mali_dedicated_mem_size, "Size of dedicated Mali GPU memory."); + -+ return (atomic_read(&ctx->event_count) != 0) || -+ (atomic_read(&ctx->event_closed) != 0); -+} ++extern unsigned int mali_shared_mem_size; ++module_param(mali_shared_mem_size, uint, S_IRUSR | S_IRGRP | S_IROTH); ++MODULE_PARM_DESC(mali_shared_mem_size, "Size of shared Mali GPU memory."); + -+KBASE_EXPORT_TEST_API(kbase_event_pending); ++#if defined(CONFIG_MALI400_PROFILING) ++extern int mali_boot_profiling; ++module_param(mali_boot_profiling, int, S_IRUSR | S_IRGRP | S_IROTH); ++MODULE_PARM_DESC(mali_boot_profiling, "Start profiling as a part of Mali driver initialization"); ++#endif + -+int kbase_event_dequeue(struct kbase_context *ctx, struct base_jd_event_v2 *uevent) -+{ -+ struct kbase_jd_atom *atom; ++extern int mali_max_pp_cores_group_1; ++module_param(mali_max_pp_cores_group_1, int, S_IRUSR | S_IRGRP | S_IROTH); ++MODULE_PARM_DESC(mali_max_pp_cores_group_1, "Limit the number of PP cores to use from first PP group."); + -+ KBASE_DEBUG_ASSERT(ctx); ++extern int mali_max_pp_cores_group_2; ++module_param(mali_max_pp_cores_group_2, int, S_IRUSR | S_IRGRP | S_IROTH); ++MODULE_PARM_DESC(mali_max_pp_cores_group_2, "Limit the number of PP cores to use from second PP group (Mali-450 only)."); + -+ mutex_lock(&ctx->event_mutex); ++extern unsigned int mali_mem_swap_out_threshold_value; ++module_param(mali_mem_swap_out_threshold_value, uint, S_IRUSR | S_IRGRP | S_IROTH); ++MODULE_PARM_DESC(mali_mem_swap_out_threshold_value, "Threshold value used to limit how much swappable memory cached in Mali driver."); + -+ if (list_empty(&ctx->event_list)) { -+ if (!atomic_read(&ctx->event_closed)) { -+ mutex_unlock(&ctx->event_mutex); -+ return -1; -+ } ++#if defined(CONFIG_MALI_DVFS) ++/** the max fps the same as display vsync default 60, can set by module insert parameter */ ++extern int mali_max_system_fps; ++module_param(mali_max_system_fps, int, S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP | S_IROTH); ++MODULE_PARM_DESC(mali_max_system_fps, "Max system fps the same as display VSYNC."); + -+ /* generate the BASE_JD_EVENT_DRV_TERMINATED message on the fly */ -+ mutex_unlock(&ctx->event_mutex); -+ uevent->event_code = BASE_JD_EVENT_DRV_TERMINATED; -+ memset(&uevent->udata, 0, sizeof(uevent->udata)); -+ dev_dbg(ctx->kbdev->dev, -+ "event system closed, returning BASE_JD_EVENT_DRV_TERMINATED(0x%X)\n", -+ BASE_JD_EVENT_DRV_TERMINATED); -+ return 0; -+ } ++/** a lower limit on their desired FPS default 58, can set by module insert parameter*/ ++extern int mali_desired_fps; ++module_param(mali_desired_fps, int, S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP | S_IROTH); ++MODULE_PARM_DESC(mali_desired_fps, "A bit lower than max_system_fps which user desired fps"); ++#endif + -+ /* normal event processing */ -+ atomic_dec(&ctx->event_count); -+ atom = list_entry(ctx->event_list.next, struct kbase_jd_atom, dep_item[0]); -+ list_del(ctx->event_list.next); ++#if MALI_ENABLE_CPU_CYCLES ++#include ++#include ++#include ++static struct timer_list mali_init_cpu_clock_timers[8]; ++static u32 mali_cpu_clock_last_value[8] = {0,}; ++#endif + -+ mutex_unlock(&ctx->event_mutex); ++/* Export symbols from common code: mali_user_settings.c */ ++#include "mali_user_settings_db.h" ++EXPORT_SYMBOL(mali_set_user_setting); ++EXPORT_SYMBOL(mali_get_user_setting); + -+ dev_dbg(ctx->kbdev->dev, "event dequeuing %p\n", (void *)atom); -+ uevent->event_code = atom->event_code; -+ uevent->atom_number = (atom - ctx->jctx.atoms); ++static char mali_dev_name[] = "mali"; /* should be const, but the functions we call requires non-cost */ + -+ if (atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) -+ kbase_jd_free_external_resources(atom); ++/* This driver only supports one Mali device, and this variable stores this single platform device */ ++struct platform_device *mali_platform_device = NULL; + -+ mutex_lock(&ctx->jctx.lock); -+ uevent->udata = kbase_event_process(ctx, atom); -+ mutex_unlock(&ctx->jctx.lock); ++/* This driver only supports one Mali device, and this variable stores the exposed misc device (/dev/mali) */ ++static struct miscdevice mali_miscdevice = { 0, }; + -+ return 0; -+} ++static int mali_miscdevice_register(struct platform_device *pdev); ++static void mali_miscdevice_unregister(void); + -+KBASE_EXPORT_TEST_API(kbase_event_dequeue); ++static int mali_open(struct inode *inode, struct file *filp); ++static int mali_release(struct inode *inode, struct file *filp); ++static long mali_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); + -+/** -+ * kbase_event_process_noreport_worker - Worker for processing atoms that do not -+ * return an event but do have external -+ * resources -+ * @data: Work structure -+ */ -+static void kbase_event_process_noreport_worker(struct work_struct *data) -+{ -+ struct kbase_jd_atom *katom = container_of(data, struct kbase_jd_atom, -+ work); -+ struct kbase_context *kctx = katom->kctx; ++static int mali_probe(struct platform_device *pdev); ++static int mali_remove(struct platform_device *pdev); + -+ if (katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) -+ kbase_jd_free_external_resources(katom); ++static int mali_driver_suspend_scheduler(struct device *dev); ++static int mali_driver_resume_scheduler(struct device *dev); + -+ mutex_lock(&kctx->jctx.lock); -+ kbase_event_process(kctx, katom); -+ mutex_unlock(&kctx->jctx.lock); -+} ++#ifdef CONFIG_PM_RUNTIME ++static int mali_driver_runtime_suspend(struct device *dev); ++static int mali_driver_runtime_resume(struct device *dev); ++static int mali_driver_runtime_idle(struct device *dev); ++#endif + -+/** -+ * kbase_event_process_noreport - Process atoms that do not return an event -+ * @kctx: Context pointer -+ * @katom: Atom to be processed -+ * -+ * Atoms that do not have external resources will be processed immediately. -+ * Atoms that do have external resources will be processed on a workqueue, in -+ * order to avoid locking issues. -+ */ -+static void kbase_event_process_noreport(struct kbase_context *kctx, -+ struct kbase_jd_atom *katom) ++#if defined(MALI_FAKE_PLATFORM_DEVICE) ++#if defined(CONFIG_MALI_DT) ++extern int mali_platform_device_init(struct platform_device *device); ++extern int mali_platform_device_deinit(struct platform_device *device); ++#else ++extern int mali_platform_device_register(void); ++extern int mali_platform_device_unregister(void); ++#endif ++#endif ++ ++extern int rk_platform_init_opp_table(struct device *dev); ++ ++/* Linux power management operations provided by the Mali device driver */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)) ++struct pm_ext_ops mali_dev_ext_pm_ops = { ++ .base = ++ { ++ .suspend = mali_driver_suspend_scheduler, ++ .resume = mali_driver_resume_scheduler, ++ .freeze = mali_driver_suspend_scheduler, ++ .thaw = mali_driver_resume_scheduler, ++ }, ++}; ++#else ++static const struct dev_pm_ops mali_dev_pm_ops = { ++#ifdef CONFIG_PM_RUNTIME ++ .runtime_suspend = mali_driver_runtime_suspend, ++ .runtime_resume = mali_driver_runtime_resume, ++ .runtime_idle = mali_driver_runtime_idle, ++#endif ++ .suspend = mali_driver_suspend_scheduler, ++ .resume = mali_driver_resume_scheduler, ++ .freeze = mali_driver_suspend_scheduler, ++ .thaw = mali_driver_resume_scheduler, ++ .poweroff = mali_driver_suspend_scheduler, ++}; ++#endif ++ ++#ifdef CONFIG_MALI_DT ++static struct of_device_id base_dt_ids[] = { ++ {.compatible = "arm,mali-300"}, ++ /*-------------------------------------------------------*/ ++ /* rk_ext : to use dts_for_mali_ko_befor_r5p0-01rel0. */ ++ // {.compatible = "arm,mali-400"}, ++ {.compatible = "arm,mali400"}, ++ /*-------------------------------------------------------*/ ++ {.compatible = "arm,mali-450"}, ++ {.compatible = "arm,mali-470"}, ++ {}, ++}; ++ ++MODULE_DEVICE_TABLE(of, base_dt_ids); ++#endif ++ ++/* The Mali device driver struct */ ++static struct platform_driver mali_platform_driver = { ++ .probe = mali_probe, ++ .remove = mali_remove, ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)) ++ .pm = &mali_dev_ext_pm_ops, ++#endif ++ .driver = ++ { ++ .name = MALI_GPU_NAME_UTGARD, ++ .owner = THIS_MODULE, ++ .bus = &platform_bus_type, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)) ++ .pm = &mali_dev_pm_ops, ++#endif ++#ifdef CONFIG_MALI_DT ++ .of_match_table = of_match_ptr(base_dt_ids), ++#endif ++ }, ++}; ++ ++/* Linux misc device operations (/dev/mali) */ ++struct file_operations mali_fops = { ++ .owner = THIS_MODULE, ++ .open = mali_open, ++ .release = mali_release, ++ .unlocked_ioctl = mali_ioctl, ++ .compat_ioctl = mali_ioctl, ++ .mmap = mali_mmap ++}; ++ ++#if MALI_ENABLE_CPU_CYCLES ++void mali_init_cpu_time_counters(int reset, int enable_divide_by_64) +{ -+ if (katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) { -+ INIT_WORK(&katom->work, kbase_event_process_noreport_worker); -+ queue_work(kctx->event_workq, &katom->work); -+ } else { -+ kbase_event_process(kctx, katom); ++ /* The CPU assembly reference used is: ARM Architecture Reference Manual ARMv7-AR C.b */ ++ u32 write_value; ++ ++ /* See B4.1.116 PMCNTENSET, Performance Monitors Count Enable Set register, VMSA */ ++ /* setting p15 c9 c12 1 to 0x8000000f==CPU_CYCLE_ENABLE |EVENT_3_ENABLE|EVENT_2_ENABLE|EVENT_1_ENABLE|EVENT_0_ENABLE */ ++ asm volatile("mcr p15, 0, %0, c9, c12, 1" :: "r"(0x8000000f)); ++ ++ ++ /* See B4.1.117 PMCR, Performance Monitors Control Register. Writing to p15, c9, c12, 0 */ ++ write_value = 1 << 0; /* Bit 0 set. Enable counters */ ++ if (reset) { ++ write_value |= 1 << 1; /* Reset event counters */ ++ write_value |= 1 << 2; /* Reset cycle counter */ + } ++ if (enable_divide_by_64) { ++ write_value |= 1 << 3; /* Enable the Clock divider by 64 */ ++ } ++ write_value |= 1 << 4; /* Export enable. Not needed */ ++ asm volatile("MCR p15, 0, %0, c9, c12, 0\t\n" :: "r"(write_value)); ++ ++ /* PMOVSR Overflow Flag Status Register - Clear Clock and Event overflows */ ++ asm volatile("MCR p15, 0, %0, c9, c12, 3\t\n" :: "r"(0x8000000f)); ++ ++ ++ /* See B4.1.124 PMUSERENR - setting p15 c9 c14 to 1" */ ++ /* User mode access to the Performance Monitors enabled. */ ++ /* Lets User space read cpu clock cycles */ ++ asm volatile("mcr p15, 0, %0, c9, c14, 0" :: "r"(1)); +} + -+/** -+ * kbase_event_coalesce - Move pending events to the main event list -+ * @kctx: Context pointer -+ * -+ * kctx->event_list and kctx->event_coalesce_count must be protected -+ * by a lock unless this is the last thread using them -+ * (and we're about to terminate the lock). -+ * -+ * Return: The number of pending events moved to the main event list ++/** A timer function that configures the cycle clock counter on current CPU. ++ * The function \a mali_init_cpu_time_counters_on_all_cpus sets up this ++ * function to trigger on all Cpus during module load. + */ -+static int kbase_event_coalesce(struct kbase_context *kctx) ++static void mali_init_cpu_clock_timer_func(unsigned long data) +{ -+ const int event_count = kctx->event_coalesce_count; ++ int reset_counters, enable_divide_clock_counter_by_64; ++ int current_cpu = raw_smp_processor_id(); ++ unsigned int sample0; ++ unsigned int sample1; + -+ /* Join the list of pending events onto the tail of the main list -+ and reset it */ -+ list_splice_tail_init(&kctx->event_coalesce_list, &kctx->event_list); -+ kctx->event_coalesce_count = 0; ++ MALI_IGNORE(data); + -+ /* Return the number of events moved */ -+ return event_count; ++ reset_counters = 1; ++ enable_divide_clock_counter_by_64 = 0; ++ mali_init_cpu_time_counters(reset_counters, enable_divide_clock_counter_by_64); ++ ++ sample0 = mali_get_cpu_cyclecount(); ++ sample1 = mali_get_cpu_cyclecount(); ++ ++ MALI_DEBUG_PRINT(3, ("Init Cpu %d cycle counter- First two samples: %08x %08x \n", current_cpu, sample0, sample1)); +} + -+void kbase_event_post(struct kbase_context *ctx, struct kbase_jd_atom *atom) ++/** A timer functions for storing current time on all cpus. ++ * Used for checking if the clocks have similar values or if they are drifting. ++ */ ++static void mali_print_cpu_clock_timer_func(unsigned long data) +{ -+ if (atom->core_req & BASE_JD_REQ_EVENT_ONLY_ON_FAILURE) { -+ if (atom->event_code == BASE_JD_EVENT_DONE) { -+ /* Don't report the event */ -+ kbase_event_process_noreport(ctx, atom); -+ return; -+ } ++ int current_cpu = raw_smp_processor_id(); ++ unsigned int sample0; ++ ++ MALI_IGNORE(data); ++ sample0 = mali_get_cpu_cyclecount(); ++ if (current_cpu < 8) { ++ mali_cpu_clock_last_value[current_cpu] = sample0; + } ++} + -+ if (atom->core_req & BASEP_JD_REQ_EVENT_NEVER) { -+ /* Don't report the event */ -+ kbase_event_process_noreport(ctx, atom); -+ return; ++/** Init the performance registers on all CPUs to count clock cycles. ++ * For init \a print_only should be 0. ++ * If \a print_only is 1, it will intead print the current clock value of all CPUs. ++ */ ++void mali_init_cpu_time_counters_on_all_cpus(int print_only) ++{ ++ int i = 0; ++ int cpu_number; ++ int jiffies_trigger; ++ int jiffies_wait; ++ ++ jiffies_wait = 2; ++ jiffies_trigger = jiffies + jiffies_wait; ++ ++ for (i = 0 ; i < 8 ; i++) { ++ init_timer(&mali_init_cpu_clock_timers[i]); ++ if (print_only) mali_init_cpu_clock_timers[i].function = mali_print_cpu_clock_timer_func; ++ else mali_init_cpu_clock_timers[i].function = mali_init_cpu_clock_timer_func; ++ mali_init_cpu_clock_timers[i].expires = jiffies_trigger ; ++ } ++ cpu_number = cpumask_first(cpu_online_mask); ++ for (i = 0 ; i < 8 ; i++) { ++ int next_cpu; ++ add_timer_on(&mali_init_cpu_clock_timers[i], cpu_number); ++ next_cpu = cpumask_next(cpu_number, cpu_online_mask); ++ if (next_cpu >= nr_cpu_ids) break; ++ cpu_number = next_cpu; + } -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(atom, TL_ATOM_STATE_POSTED); -+ if (atom->core_req & BASE_JD_REQ_EVENT_COALESCE) { -+ /* Don't report the event until other event(s) have completed */ -+ mutex_lock(&ctx->event_mutex); -+ list_add_tail(&atom->dep_item[0], &ctx->event_coalesce_list); -+ ++ctx->event_coalesce_count; -+ mutex_unlock(&ctx->event_mutex); -+ } else { -+ /* Report the event and any pending events now */ -+ int event_count = 1; + -+ mutex_lock(&ctx->event_mutex); -+ event_count += kbase_event_coalesce(ctx); -+ list_add_tail(&atom->dep_item[0], &ctx->event_list); -+ atomic_add(event_count, &ctx->event_count); -+ mutex_unlock(&ctx->event_mutex); ++ while (jiffies_wait) jiffies_wait = schedule_timeout_uninterruptible(jiffies_wait); + -+ kbase_event_wakeup(ctx); ++ for (i = 0 ; i < 8 ; i++) { ++ del_timer_sync(&mali_init_cpu_clock_timers[i]); + } -+} -+KBASE_EXPORT_TEST_API(kbase_event_post); + -+void kbase_event_close(struct kbase_context *kctx) -+{ -+ mutex_lock(&kctx->event_mutex); -+ atomic_set(&kctx->event_closed, true); -+ mutex_unlock(&kctx->event_mutex); -+ kbase_event_wakeup(kctx); ++ if (print_only) { ++ if ((0 == mali_cpu_clock_last_value[2]) && (0 == mali_cpu_clock_last_value[3])) { ++ /* Diff can be printed if we want to check if the clocks are in sync ++ int diff = mali_cpu_clock_last_value[0] - mali_cpu_clock_last_value[1];*/ ++ MALI_DEBUG_PRINT(2, ("CPU cycle counters readout all: %08x %08x\n", mali_cpu_clock_last_value[0], mali_cpu_clock_last_value[1])); ++ } else { ++ MALI_DEBUG_PRINT(2, ("CPU cycle counters readout all: %08x %08x %08x %08x\n", mali_cpu_clock_last_value[0], mali_cpu_clock_last_value[1], mali_cpu_clock_last_value[2], mali_cpu_clock_last_value[3])); ++ } ++ } +} ++#endif + -+int kbase_event_init(struct kbase_context *kctx) ++int mali_module_init(void) +{ -+ KBASE_DEBUG_ASSERT(kctx); ++ int err = 0; + -+ INIT_LIST_HEAD(&kctx->event_list); -+ INIT_LIST_HEAD(&kctx->event_coalesce_list); -+ mutex_init(&kctx->event_mutex); -+ atomic_set(&kctx->event_count, 0); -+ kctx->event_coalesce_count = 0; -+ atomic_set(&kctx->event_closed, false); -+ kctx->event_workq = alloc_workqueue("kbase_event", WQ_MEM_RECLAIM, 1); ++ MALI_DEBUG_PRINT(2, ("Inserting Mali v%d device driver. \n", _MALI_API_VERSION)); ++ MALI_DEBUG_PRINT(2, ("Compiled: %s, time: %s.\n", __DATE__, __TIME__)); ++ MALI_DEBUG_PRINT(2, ("Driver revision: %s\n", SVN_REV_STRING)); ++ ++ I("svn_rev_string_from_arm of this mali_ko is '%s', rk_ko_ver is '%d', built at '%s', on '%s'.", ++ SVN_REV_STRING, ++ RK_KO_VER, ++ __TIME__, ++ __DATE__); + -+ if (NULL == kctx->event_workq) -+ return -EINVAL; ++#if MALI_ENABLE_CPU_CYCLES ++ mali_init_cpu_time_counters_on_all_cpus(0); ++ MALI_DEBUG_PRINT(2, ("CPU cycle counter setup complete\n")); ++ /* Printing the current cpu counters */ ++ mali_init_cpu_time_counters_on_all_cpus(1); ++#endif + -+ return 0; -+} ++ /* Initialize module wide settings */ ++#ifdef MALI_FAKE_PLATFORM_DEVICE ++#ifndef CONFIG_MALI_DT ++ MALI_DEBUG_PRINT(2, ("mali_module_init() registering device\n")); ++ err = mali_platform_device_register(); ++ if (0 != err) { ++ return err; ++ } ++#endif ++#endif + -+KBASE_EXPORT_TEST_API(kbase_event_init); ++ MALI_DEBUG_PRINT(2, ("mali_module_init() registering driver\n")); + -+void kbase_event_cleanup(struct kbase_context *kctx) -+{ -+ int event_count; ++ err = platform_driver_register(&mali_platform_driver); + -+ KBASE_DEBUG_ASSERT(kctx); -+ KBASE_DEBUG_ASSERT(kctx->event_workq); ++ if (0 != err) { ++ MALI_DEBUG_PRINT(2, ("mali_module_init() Failed to register driver (%d)\n", err)); ++#ifdef MALI_FAKE_PLATFORM_DEVICE ++#ifndef CONFIG_MALI_DT ++ mali_platform_device_unregister(); ++#endif ++#endif ++ mali_platform_device = NULL; ++ return err; ++ } + -+ flush_workqueue(kctx->event_workq); -+ destroy_workqueue(kctx->event_workq); ++#if defined(CONFIG_MALI400_INTERNAL_PROFILING) ++ err = _mali_internal_profiling_init(mali_boot_profiling ? MALI_TRUE : MALI_FALSE); ++ if (0 != err) { ++ /* No biggie if we wheren't able to initialize the profiling */ ++ MALI_PRINT_ERROR(("Failed to initialize profiling, feature will be unavailable\n")); ++ } ++#endif + -+ /* We use kbase_event_dequeue to remove the remaining events as that -+ * deals with all the cleanup needed for the atoms. -+ * -+ * Note: use of kctx->event_list without a lock is safe because this must be the last -+ * thread using it (because we're about to terminate the lock) -+ */ -+ event_count = kbase_event_coalesce(kctx); -+ atomic_add(event_count, &kctx->event_count); ++ /* Tracing the current frequency and voltage from boot/insmod*/ ++#if defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_MALI_DVFS) ++ /* Just call mali_get_current_gpu_clk_item(),to record current clk info.*/ ++ mali_get_current_gpu_clk_item(&mali_gpu_clk[0]); ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_EVENT_CHANNEL_GPU | ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, ++ mali_gpu_clk[0].clock, ++ mali_gpu_clk[0].vol / 1000, ++ 0, 0, 0); ++#endif + -+ while (!list_empty(&kctx->event_list)) { -+ struct base_jd_event_v2 event; ++ MALI_PRINT(("Mali device driver loaded\n")); + -+ kbase_event_dequeue(kctx, &event); -+ } ++ return 0; /* Success */ +} + -+KBASE_EXPORT_TEST_API(kbase_event_cleanup); -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence.c -new file mode 100755 -index 000000000000..fcb373372596 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence.c -@@ -0,0 +1,196 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++void mali_module_exit(void) ++{ ++ MALI_DEBUG_PRINT(2, ("Unloading Mali v%d device driver.\n", _MALI_API_VERSION)); + ++ MALI_DEBUG_PRINT(2, ("mali_module_exit() unregistering driver\n")); + ++ platform_driver_unregister(&mali_platform_driver); + -+#include -+#include -+#include -+#include -+#include -+#include ++#if defined(MALI_FAKE_PLATFORM_DEVICE) ++#ifndef CONFIG_MALI_DT ++ MALI_DEBUG_PRINT(2, ("mali_module_exit() unregistering device\n")); ++ mali_platform_device_unregister(); ++#endif ++#endif + -+/* Spin lock protecting all Mali fences as fence->lock. */ -+static DEFINE_SPINLOCK(kbase_fence_lock); ++ /* Tracing the current frequency and voltage from rmmod*/ ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_EVENT_CHANNEL_GPU | ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, ++ 0, ++ 0, ++ 0, 0, 0); + -+static const char * -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+kbase_fence_get_driver_name(struct fence *fence) -+#else -+kbase_fence_get_driver_name(struct dma_fence *fence) ++#if defined(CONFIG_MALI400_INTERNAL_PROFILING) ++ _mali_internal_profiling_term(); +#endif -+{ -+ return kbase_drv_name; -+} + -+static const char * -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+kbase_fence_get_timeline_name(struct fence *fence) -+#else -+kbase_fence_get_timeline_name(struct dma_fence *fence) -+#endif -+{ -+ return kbase_timeline_name; ++ MALI_PRINT(("Mali device driver unloaded\n")); +} + -+static bool -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+kbase_fence_enable_signaling(struct fence *fence) -+#else -+kbase_fence_enable_signaling(struct dma_fence *fence) -+#endif ++#ifdef CONFIG_MALI_DEVFREQ ++struct mali_device *mali_device_alloc(void) +{ -+ return true; ++ return kzalloc(sizeof(struct mali_device), GFP_KERNEL); +} + -+static void -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+kbase_fence_fence_value_str(struct fence *fence, char *str, int size) -+#else -+kbase_fence_fence_value_str(struct dma_fence *fence, char *str, int size) -+#endif ++void mali_device_free(struct mali_device *mdev) +{ -+ snprintf(str, size, "%u", fence->seqno); ++ kfree(mdev); +} -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+const struct fence_ops kbase_fence_ops = { -+ .wait = fence_default_wait, -+#else -+const struct dma_fence_ops kbase_fence_ops = { -+ .wait = dma_fence_default_wait, +#endif -+ .get_driver_name = kbase_fence_get_driver_name, -+ .get_timeline_name = kbase_fence_get_timeline_name, -+ .enable_signaling = kbase_fence_enable_signaling, -+ .fence_value_str = kbase_fence_fence_value_str -+}; + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+struct fence * -+kbase_fence_out_new(struct kbase_jd_atom *katom) -+#else -+struct dma_fence * -+kbase_fence_out_new(struct kbase_jd_atom *katom) -+#endif ++static int mali_probe(struct platform_device *pdev) +{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence; -+#else -+ struct dma_fence *fence; ++ int err; ++#ifdef CONFIG_MALI_DEVFREQ ++ struct mali_device *mdev; ++ const char *name = "mali"; +#endif + -+ WARN_ON(katom->dma_fence.fence); -+ -+ fence = kzalloc(sizeof(*fence), GFP_KERNEL); -+ if (!fence) -+ return NULL; ++ MALI_DEBUG_PRINT(2, ("mali_probe(): Called for platform device %s\n", pdev->name)); + -+ dma_fence_init(fence, -+ &kbase_fence_ops, -+ &kbase_fence_lock, -+ katom->dma_fence.context, -+ atomic_inc_return(&katom->dma_fence.seqno)); ++ if (NULL != mali_platform_device) { ++ /* Already connected to a device, return error */ ++ MALI_PRINT_ERROR(("mali_probe(): The Mali driver is already connected with a Mali device.")); ++ return -EEXIST; ++ } + -+ katom->dma_fence.fence = fence; ++ mali_platform_device = pdev; + -+ return fence; -+} ++ dev_info(&pdev->dev, "mali_platform_device->num_resources = %d\n", ++ mali_platform_device->num_resources); ++ ++ { ++ int i = 0; + -+bool -+kbase_fence_free_callbacks(struct kbase_jd_atom *katom) -+{ -+ struct kbase_fence_cb *cb, *tmp; -+ bool res = false; ++ for(i = 0; i < mali_platform_device->num_resources; i++) ++ dev_info(&pdev->dev, ++ "resource[%d].start = 0x%pa\n", ++ i, ++ &mali_platform_device->resource[i].start); ++ } + -+ lockdep_assert_held(&katom->kctx->jctx.lock); ++#ifdef CONFIG_MALI_DT ++ /* If we use DT to initialize our DDK, we have to prepare somethings. */ ++ err = mali_platform_device_init(mali_platform_device); ++ if (0 != err) { ++ MALI_PRINT_ERROR(("mali_probe(): Failed to initialize platform device.")); ++ mali_platform_device = NULL; ++ return -EFAULT; ++ } ++#endif + -+ /* Clean up and free callbacks. */ -+ list_for_each_entry_safe(cb, tmp, &katom->dma_fence.callbacks, node) { -+ bool ret; ++#ifdef CONFIG_MALI_DEVFREQ ++ mdev = mali_device_alloc(); ++ if (!mdev) { ++ MALI_PRINT_ERROR(("Can't allocate mali device private data\n")); ++ return -ENOMEM; ++ } + -+ /* Cancel callbacks that hasn't been called yet. */ -+ ret = dma_fence_remove_callback(cb->fence, &cb->fence_cb); -+ if (ret) { -+ int ret; ++ mdev->dev = &pdev->dev; ++ dev_set_drvdata(mdev->dev, mdev); + -+ /* Fence had not signaled, clean up after -+ * canceling. -+ */ -+ ret = atomic_dec_return(&katom->dma_fence.dep_count); ++ /*Initilization clock and regulator*/ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) && defined(CONFIG_OF) \ ++ && defined(CONFIG_REGULATOR) ++ mdev->regulator = regulator_get_optional(mdev->dev, "mali"); ++ if (IS_ERR_OR_NULL(mdev->regulator)) { ++ MALI_DEBUG_PRINT(2, ("Continuing without Mali regulator control\n")); ++ mdev->regulator = NULL; ++ /* Allow probe to continue without regulator */ ++ } ++ if (mdev->regulator) { ++ mdev->opp_table = dev_pm_opp_set_regulators(mdev->dev, &name, 1); ++ if (IS_ERR(mdev->opp_table)) { ++ mdev->opp_table = NULL; ++ MALI_DEBUG_PRINT(2, ("Continuing without opp regulator\n")); ++ } ++ } ++#endif /* LINUX_VERSION_CODE >= 3, 12, 0 */ + -+ if (unlikely(ret == 0)) -+ res = true; ++ mdev->num_clks = devm_clk_bulk_get_all(mdev->dev, &mdev->clks); ++ if (mdev->num_clks < 1) { ++ MALI_DEBUG_PRINT(2, ("Continuing without Mali clock control\n")); ++ mdev->num_clks = 0; ++ mdev->clock = NULL; ++ } else { ++ /* Get "clk_mali" in the device tree for gpu dvfs */ ++ mdev->clock = clk_get(mdev->dev, "clk_mali"); ++ if (IS_ERR_OR_NULL(mdev->clock)) { ++ MALI_DEBUG_PRINT(2, ("Continuing without Mali dvfs clock\n")); ++ /* Allow probe to continue without clock. */ ++ mdev->clock = NULL; + } ++ } ++ err = clk_bulk_prepare_enable(mdev->num_clks, mdev->clks); ++ if (err) { ++ MALI_PRINT_ERROR(("Failed to prepare clock (%d)\n", err)); ++ goto clock_prepare_failed; ++ } + -+ /* -+ * Release the reference taken in -+ * kbase_fence_add_callback(). -+ */ -+ dma_fence_put(cb->fence); -+ list_del(&cb->node); -+ kfree(cb); ++ err = rk_platform_init_opp_table(mdev->dev); ++ if (err) ++ MALI_DEBUG_PRINT(3, ("Failed to init_opp_table\n")); ++ ++ /* initilize pm metrics related */ ++ if (mali_pm_metrics_init(mdev) < 0) { ++ MALI_DEBUG_PRINT(2, ("mali pm metrics init failed\n")); ++ goto pm_metrics_init_failed; + } + -+ return res; -+} ++ if (mali_devfreq_init(mdev) < 0) { ++ MALI_DEBUG_PRINT(2, ("mali devfreq init failed\n")); ++ goto devfreq_init_failed; ++ } ++ clk_bulk_disable(mdev->num_clks, mdev->clks); ++#endif + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+int -+kbase_fence_add_callback(struct kbase_jd_atom *katom, -+ struct fence *fence, -+ fence_func_t callback) -+#else -+int -+kbase_fence_add_callback(struct kbase_jd_atom *katom, -+ struct dma_fence *fence, -+ dma_fence_func_t callback) ++ ++ if (_MALI_OSK_ERR_OK == _mali_osk_wq_init()) { ++ /* Initialize the Mali GPU HW specified by pdev */ ++ if (_MALI_OSK_ERR_OK == mali_initialize_subsystems()) { ++ /* Register a misc device (so we are accessible from user space) */ ++ err = mali_miscdevice_register(pdev); ++ if (0 == err) { ++ /* Setup sysfs entries */ ++ err = mali_sysfs_register(mali_dev_name); ++ ++ if (0 == err) { ++ MALI_DEBUG_PRINT(2, ("mali_probe(): Successfully initialized driver for platform device %s\n", pdev->name)); ++ ++ return 0; ++ } else { ++ MALI_PRINT_ERROR(("mali_probe(): failed to register sysfs entries")); ++ } ++ mali_miscdevice_unregister(); ++ } else { ++ MALI_PRINT_ERROR(("mali_probe(): failed to register Mali misc device.")); ++ } ++ mali_terminate_subsystems(); ++ } else { ++ MALI_PRINT_ERROR(("mali_probe(): Failed to initialize Mali device driver.")); ++ } ++ _mali_osk_wq_term(); ++ } ++ ++#ifdef CONFIG_MALI_DEVFREQ ++ mali_devfreq_term(mdev); ++devfreq_init_failed: ++ mali_pm_metrics_term(mdev); ++pm_metrics_init_failed: ++ clk_bulk_disable_unprepare(mdev->num_clks, mdev->clks); ++clock_prepare_failed: ++ clk_bulk_put(mdev->num_clks, mdev->clks); ++ clk_put(mdev->clock); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && defined(CONFIG_OF) \ ++ && defined(CONFIG_PM_OPP) ++ dev_pm_opp_of_remove_table(mdev->dev); ++#endif ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) && defined(CONFIG_OF) \ ++ && defined(CONFIG_REGULATOR) ++ regulator_put(mdev->regulator); ++ dev_pm_opp_put_regulators(mdev->opp_table); ++#endif /* LINUX_VERSION_CODE >= 3, 12, 0 */ ++ mali_device_free(mdev); ++#endif ++ ++#ifdef CONFIG_MALI_DT ++ mali_platform_device_deinit(mali_platform_device); +#endif ++ mali_platform_device = NULL; ++ return -EFAULT; ++} ++ ++static int mali_remove(struct platform_device *pdev) +{ -+ int err = 0; -+ struct kbase_fence_cb *kbase_fence_cb; ++#ifdef CONFIG_MALI_DEVFREQ ++ struct mali_device *mdev = dev_get_drvdata(&pdev->dev); ++#endif + -+ if (!fence) -+ return -EINVAL; ++ MALI_DEBUG_PRINT(2, ("mali_remove() called for platform device %s\n", pdev->name)); ++ mali_sysfs_unregister(); ++ mali_miscdevice_unregister(); ++ mali_terminate_subsystems(); ++ _mali_osk_wq_term(); + -+ kbase_fence_cb = kmalloc(sizeof(*kbase_fence_cb), GFP_KERNEL); -+ if (!kbase_fence_cb) -+ return -ENOMEM; ++#ifdef CONFIG_MALI_DEVFREQ ++ mali_devfreq_term(mdev); + -+ kbase_fence_cb->fence = fence; -+ kbase_fence_cb->katom = katom; -+ INIT_LIST_HEAD(&kbase_fence_cb->node); ++ mali_pm_metrics_term(mdev); + -+ err = dma_fence_add_callback(fence, &kbase_fence_cb->fence_cb, -+ callback); -+ if (err == -ENOENT) { -+ /* Fence signaled, clear the error and return */ -+ err = 0; -+ kfree(kbase_fence_cb); -+ } else if (err) { -+ kfree(kbase_fence_cb); -+ } else { -+ /* -+ * Get reference to fence that will be kept until callback gets -+ * cleaned up in kbase_fence_free_callbacks(). -+ */ -+ dma_fence_get(fence); -+ atomic_inc(&katom->dma_fence.dep_count); -+ /* Add callback to katom's list of callbacks */ -+ list_add(&kbase_fence_cb->node, &katom->dma_fence.callbacks); ++ if (mdev->clock) { ++ clk_put(mdev->clock); ++ mdev->clock = NULL; + } ++ clk_bulk_unprepare(mdev->num_clks, mdev->clks); ++ clk_bulk_put(mdev->num_clks, mdev->clks); + -+ return err; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && defined(CONFIG_OF) \ ++ && defined(CONFIG_PM_OPP) ++ dev_pm_opp_of_remove_table(mdev->dev); ++#endif ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) && defined(CONFIG_OF) \ ++ && defined(CONFIG_REGULATOR) ++ regulator_put(mdev->regulator); ++ dev_pm_opp_put_regulators(mdev->opp_table); ++#endif /* LINUX_VERSION_CODE >= 3, 12, 0 */ ++ mali_device_free(mdev); ++#endif ++ ++#ifdef CONFIG_MALI_DT ++ mali_platform_device_deinit(mali_platform_device); ++#endif ++ mali_platform_device = NULL; ++ return 0; +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence.h -new file mode 100755 -index 000000000000..9f59d30a1e2e ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence.h -@@ -0,0 +1,270 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ + ++static int mali_miscdevice_register(struct platform_device *pdev) ++{ ++ int err; + ++ mali_miscdevice.minor = MISC_DYNAMIC_MINOR; ++ mali_miscdevice.name = mali_dev_name; ++ mali_miscdevice.fops = &mali_fops; ++ mali_miscdevice.parent = get_device(&pdev->dev); + -+#ifndef _KBASE_FENCE_H_ -+#define _KBASE_FENCE_H_ ++ err = misc_register(&mali_miscdevice); ++ if (0 != err) { ++ MALI_PRINT_ERROR(("Failed to register misc device, misc_register() returned %d\n", err)); ++ } + -+/* -+ * mali_kbase_fence.[hc] has common fence code used by both -+ * - CONFIG_MALI_BIFROST_DMA_FENCE - implicit DMA fences -+ * - CONFIG_SYNC_FILE - explicit fences beginning with 4.9 kernel -+ */ ++ return err; ++} + -+#if defined(CONFIG_MALI_BIFROST_DMA_FENCE) || defined(CONFIG_SYNC_FILE) ++static void mali_miscdevice_unregister(void) ++{ ++ misc_deregister(&mali_miscdevice); ++} + -+#include -+#include "mali_kbase_fence_defs.h" -+#include "mali_kbase.h" ++static int mali_driver_suspend_scheduler(struct device *dev) ++{ ++#ifdef CONFIG_MALI_DEVFREQ ++ struct mali_device *mdev = dev_get_drvdata(dev); ++ if (!mdev) ++ return -ENODEV; ++#endif + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+extern const struct fence_ops kbase_fence_ops; -+#else -+extern const struct dma_fence_ops kbase_fence_ops; ++ pm_runtime_force_suspend(dev); ++#if defined(CONFIG_MALI_DEVFREQ) && \ ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) ++ devfreq_suspend_device(mdev->devfreq); +#endif + -+/** -+* struct kbase_fence_cb - Mali dma-fence callback data struct -+* @fence_cb: Callback function -+* @katom: Pointer to katom that is waiting on this callback -+* @fence: Pointer to the fence object on which this callback is waiting -+* @node: List head for linking this callback to the katom -+*/ -+struct kbase_fence_cb { -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence_cb fence_cb; -+ struct fence *fence; -+#else -+ struct dma_fence_cb fence_cb; -+ struct dma_fence *fence; ++ mali_pm_os_suspend(MALI_TRUE); ++ /* Tracing the frequency and voltage after mali is suspended */ ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_EVENT_CHANNEL_GPU | ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, ++ 0, ++ 0, ++ 0, 0, 0); ++ return 0; ++} ++ ++static int mali_driver_resume_scheduler(struct device *dev) ++{ ++#ifdef CONFIG_MALI_DEVFREQ ++ struct mali_device *mdev = dev_get_drvdata(dev); ++ if (!mdev) ++ return -ENODEV; +#endif -+ struct kbase_jd_atom *katom; -+ struct list_head node; -+}; + -+/** -+ * kbase_fence_out_new() - Creates a new output fence and puts it on the atom -+ * @katom: Atom to create an output fence for -+ * -+ * return: A new fence object on success, NULL on failure. -+ */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+struct fence *kbase_fence_out_new(struct kbase_jd_atom *katom); -+#else -+struct dma_fence *kbase_fence_out_new(struct kbase_jd_atom *katom); ++ /* Tracing the frequency and voltage after mali is resumed */ ++#if defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_MALI_DVFS) ++ /* Just call mali_get_current_gpu_clk_item() once,to record current clk info.*/ ++ if (is_first_resume == 1) { ++ mali_get_current_gpu_clk_item(&mali_gpu_clk[1]); ++ is_first_resume = 0; ++ } ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_EVENT_CHANNEL_GPU | ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, ++ mali_gpu_clk[1].clock, ++ mali_gpu_clk[1].vol / 1000, ++ 0, 0, 0); +#endif ++ mali_pm_os_resume(); + -+#if defined(CONFIG_SYNC_FILE) -+/** -+ * kbase_fence_fence_in_set() - Assign input fence to atom -+ * @katom: Atom to assign input fence to -+ * @fence: Input fence to assign to atom -+ * -+ * This function will take ownership of one fence reference! -+ */ -+#define kbase_fence_fence_in_set(katom, fence) \ -+ do { \ -+ WARN_ON((katom)->dma_fence.fence_in); \ -+ (katom)->dma_fence.fence_in = fence; \ -+ } while (0) ++#if defined(CONFIG_MALI_DEVFREQ) && \ ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) ++ devfreq_resume_device(mdev->devfreq); +#endif ++ pm_runtime_force_resume(dev); + -+/** -+ * kbase_fence_out_remove() - Removes the output fence from atom -+ * @katom: Atom to remove output fence for -+ * -+ * This will also release the reference to this fence which the atom keeps -+ */ -+static inline void kbase_fence_out_remove(struct kbase_jd_atom *katom) ++ return 0; ++} ++ ++#ifdef CONFIG_PM_RUNTIME ++static int mali_driver_runtime_suspend(struct device *dev) +{ -+ if (katom->dma_fence.fence) { -+ dma_fence_put(katom->dma_fence.fence); -+ katom->dma_fence.fence = NULL; ++#ifdef CONFIG_MALI_DEVFREQ ++ struct mali_device *mdev = dev_get_drvdata(dev); ++ if (!mdev) ++ return -ENODEV; ++#endif ++ ++ if (MALI_TRUE == mali_pm_runtime_suspend()) { ++ /* Tracing the frequency and voltage after mali is suspended */ ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_EVENT_CHANNEL_GPU | ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, ++ 0, ++ 0, ++ 0, 0, 0); ++ ++#if defined(CONFIG_MALI_DEVFREQ) && \ ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) ++ MALI_DEBUG_PRINT(4, ("devfreq_suspend_device: stop devfreq monitor\n")); ++ devfreq_suspend_device(mdev->devfreq); ++#endif ++ ++ return 0; ++ } else { ++ return -EBUSY; + } +} + -+#if defined(CONFIG_SYNC_FILE) -+/** -+ * kbase_fence_out_remove() - Removes the input fence from atom -+ * @katom: Atom to remove input fence for -+ * -+ * This will also release the reference to this fence which the atom keeps -+ */ -+static inline void kbase_fence_in_remove(struct kbase_jd_atom *katom) ++static int mali_driver_runtime_resume(struct device *dev) +{ -+ if (katom->dma_fence.fence_in) { -+ dma_fence_put(katom->dma_fence.fence_in); -+ katom->dma_fence.fence_in = NULL; ++#ifdef CONFIG_MALI_DEVFREQ ++ struct mali_device *mdev = dev_get_drvdata(dev); ++ if (!mdev) ++ return -ENODEV; ++#endif ++ ++ /* Tracing the frequency and voltage after mali is resumed */ ++#if defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_MALI_DVFS) ++ /* Just call mali_get_current_gpu_clk_item() once,to record current clk info.*/ ++ if (is_first_resume == 1) { ++ mali_get_current_gpu_clk_item(&mali_gpu_clk[1]); ++ is_first_resume = 0; + } -+} ++ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | ++ MALI_PROFILING_EVENT_CHANNEL_GPU | ++ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, ++ mali_gpu_clk[1].clock, ++ mali_gpu_clk[1].vol / 1000, ++ 0, 0, 0); +#endif + -+/** -+ * kbase_fence_out_is_ours() - Check if atom has a valid fence created by us -+ * @katom: Atom to check output fence for -+ * -+ * Return: true if fence exists and is valid, otherwise false -+ */ -+static inline bool kbase_fence_out_is_ours(struct kbase_jd_atom *katom) -+{ -+ return katom->dma_fence.fence && -+ katom->dma_fence.fence->ops == &kbase_fence_ops; -+} ++ mali_pm_runtime_resume(); + -+/** -+ * kbase_fence_out_signal() - Signal output fence of atom -+ * @katom: Atom to signal output fence for -+ * @status: Status to signal with (0 for success, < 0 for error) -+ * -+ * Return: 0 on success, < 0 on error -+ */ -+static inline int kbase_fence_out_signal(struct kbase_jd_atom *katom, -+ int status) -+{ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)) -+ katom->dma_fence.fence->error = status; -+#else -+ katom->dma_fence.fence->status = status; ++#if defined(CONFIG_MALI_DEVFREQ) && \ ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) ++ MALI_DEBUG_PRINT(4, ("devfreq_resume_device: start devfreq monitor\n")); ++ devfreq_resume_device(mdev->devfreq); +#endif -+ return dma_fence_signal(katom->dma_fence.fence); ++ return 0; +} + -+/** -+ * kbase_fence_add_callback() - Add callback on @fence to block @katom -+ * @katom: Pointer to katom that will be blocked by @fence -+ * @fence: Pointer to fence on which to set up the callback -+ * @callback: Pointer to function to be called when fence is signaled -+ * -+ * Caller needs to hold a reference to @fence when calling this function, and -+ * the caller is responsible for releasing that reference. An additional -+ * reference to @fence will be taken when the callback was successfully set up -+ * and @fence needs to be kept valid until the callback has been called and -+ * cleanup have been done. -+ * -+ * Return: 0 on success: fence was either already signaled, or callback was -+ * set up. Negative error code is returned on error. -+ */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+int kbase_fence_add_callback(struct kbase_jd_atom *katom, -+ struct fence *fence, -+ fence_func_t callback); -+#else -+int kbase_fence_add_callback(struct kbase_jd_atom *katom, -+ struct dma_fence *fence, -+ dma_fence_func_t callback); ++static int mali_driver_runtime_idle(struct device *dev) ++{ ++ /* Nothing to do */ ++ return 0; ++} +#endif + -+/** -+ * kbase_fence_dep_count_set() - Set dep_count value on atom to specified value -+ * @katom: Atom to set dep_count for -+ * @val: value to set dep_count to -+ * -+ * The dep_count is available to the users of this module so that they can -+ * synchronize completion of the wait with cancellation and adding of more -+ * callbacks. For instance, a user could do the following: -+ * -+ * dep_count set to 1 -+ * callback #1 added, dep_count is increased to 2 -+ * callback #1 happens, dep_count decremented to 1 -+ * since dep_count > 0, no completion is done -+ * callback #2 is added, dep_count is increased to 2 -+ * dep_count decremented to 1 -+ * callback #2 happens, dep_count decremented to 0 -+ * since dep_count now is zero, completion executes -+ * -+ * The dep_count can also be used to make sure that the completion only -+ * executes once. This is typically done by setting dep_count to -1 for the -+ * thread that takes on this responsibility. -+ */ -+static inline void -+kbase_fence_dep_count_set(struct kbase_jd_atom *katom, int val) ++static int mali_open(struct inode *inode, struct file *filp) +{ -+ atomic_set(&katom->dma_fence.dep_count, val); ++ struct mali_session_data *session_data; ++ _mali_osk_errcode_t err; ++ ++ /* input validation */ ++ if (mali_miscdevice.minor != iminor(inode)) { ++ MALI_PRINT_ERROR(("mali_open() Minor does not match\n")); ++ return -ENODEV; ++ } ++ ++ /* allocated struct to track this session */ ++ err = _mali_ukk_open((void **)&session_data); ++ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); ++ ++ /* initialize file pointer */ ++ filp->f_pos = 0; ++ ++ /* link in our session data */ ++ filp->private_data = (void *)session_data; ++ ++ filp->f_mapping = mali_mem_swap_get_global_swap_file()->f_mapping; ++ ++ return 0; +} + -+/** -+ * kbase_fence_dep_count_dec_and_test() - Decrements dep_count -+ * @katom: Atom to decrement dep_count for -+ * -+ * See @kbase_fence_dep_count_set for general description about dep_count -+ * -+ * Return: true if value was decremented to zero, otherwise false -+ */ -+static inline bool -+kbase_fence_dep_count_dec_and_test(struct kbase_jd_atom *katom) ++static int mali_release(struct inode *inode, struct file *filp) +{ -+ return atomic_dec_and_test(&katom->dma_fence.dep_count); ++ _mali_osk_errcode_t err; ++ ++ /* input validation */ ++ if (mali_miscdevice.minor != iminor(inode)) { ++ MALI_PRINT_ERROR(("mali_release() Minor does not match\n")); ++ return -ENODEV; ++ } ++ ++ err = _mali_ukk_close((void **)&filp->private_data); ++ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); ++ ++ return 0; +} + -+/** -+ * kbase_fence_dep_count_read() - Returns the current dep_count value -+ * @katom: Pointer to katom -+ * -+ * See @kbase_fence_dep_count_set for general description about dep_count -+ * -+ * Return: The current dep_count value -+ */ -+static inline int kbase_fence_dep_count_read(struct kbase_jd_atom *katom) ++int map_errcode(_mali_osk_errcode_t err) +{ -+ return atomic_read(&katom->dma_fence.dep_count); ++ switch (err) { ++ case _MALI_OSK_ERR_OK : ++ return 0; ++ case _MALI_OSK_ERR_FAULT: ++ return -EFAULT; ++ case _MALI_OSK_ERR_INVALID_FUNC: ++ return -ENOTTY; ++ case _MALI_OSK_ERR_INVALID_ARGS: ++ return -EINVAL; ++ case _MALI_OSK_ERR_NOMEM: ++ return -ENOMEM; ++ case _MALI_OSK_ERR_TIMEOUT: ++ return -ETIMEDOUT; ++ case _MALI_OSK_ERR_RESTARTSYSCALL: ++ return -ERESTARTSYS; ++ case _MALI_OSK_ERR_ITEM_NOT_FOUND: ++ return -ENOENT; ++ default: ++ return -EFAULT; ++ } +} + -+/** -+ * kbase_fence_free_callbacks() - Free dma-fence callbacks on a katom -+ * @katom: Pointer to katom -+ * -+ * This function will free all fence callbacks on the katom's list of -+ * callbacks. Callbacks that have not yet been called, because their fence -+ * hasn't yet signaled, will first be removed from the fence. -+ * -+ * Locking: katom->dma_fence.callbacks list assumes jctx.lock is held. -+ * -+ * Return: true if dep_count reached 0, otherwise false. -+ */ -+bool kbase_fence_free_callbacks(struct kbase_jd_atom *katom); ++static long mali_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ++{ ++ int err; ++ struct mali_session_data *session_data; + -+#if defined(CONFIG_SYNC_FILE) -+/** -+ * kbase_fence_in_get() - Retrieve input fence for atom. -+ * @katom: Atom to get input fence from -+ * -+ * A ref will be taken for the fence, so use @kbase_fence_put() to release it -+ * -+ * Return: The fence, or NULL if there is no input fence for atom -+ */ -+#define kbase_fence_in_get(katom) dma_fence_get((katom)->dma_fence.fence_in) ++ MALI_DEBUG_PRINT(7, ("Ioctl received 0x%08X 0x%08lX\n", cmd, arg)); ++ ++ session_data = (struct mali_session_data *)filp->private_data; ++ if (NULL == session_data) { ++ MALI_DEBUG_PRINT(7, ("filp->private_data was NULL\n")); ++ return -ENOTTY; ++ } ++ ++ if (NULL == (void *)arg) { ++ MALI_DEBUG_PRINT(7, ("arg was NULL\n")); ++ return -ENOTTY; ++ } ++ ++ switch (cmd) { ++ case MALI_IOC_WAIT_FOR_NOTIFICATION: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_wait_for_notification_s), sizeof(u64))); ++ err = wait_for_notification_wrapper(session_data, (_mali_uk_wait_for_notification_s __user *)arg); ++ break; ++ ++ case MALI_IOC_GET_API_VERSION_V2: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_get_api_version_v2_s), sizeof(u64))); ++ err = get_api_version_v2_wrapper(session_data, (_mali_uk_get_api_version_v2_s __user *)arg); ++ break; ++ ++ case MALI_IOC_GET_API_VERSION: ++ err = get_api_version_wrapper(session_data, (_mali_uk_get_api_version_s __user *)arg); ++ break; ++ ++ case MALI_IOC_POST_NOTIFICATION: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_post_notification_s), sizeof(u64))); ++ err = post_notification_wrapper(session_data, (_mali_uk_post_notification_s __user *)arg); ++ break; ++ ++ /* rk_ext : 从对 r5p0-01rel0 集æˆå¼€å§‹, ä¸å†ä½¿ç”¨. */ ++#if 0 ++ case MALI_IOC_GET_MALI_VERSION_IN_RK30: ++ err = get_mali_version_in_rk30_wrapper(session_data, (_mali_uk_get_mali_version_in_rk30_s __user *)arg); ++ break; ++#else ++ case MALI_IOC_GET_RK_KO_VERSION: ++ err = get_rk_ko_version_wrapper(session_data, (_mali_rk_ko_version_s __user *)arg); ++ break; +#endif ++ ++ case MALI_IOC_GET_USER_SETTINGS: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_get_user_settings_s), sizeof(u64))); ++ err = get_user_settings_wrapper(session_data, (_mali_uk_get_user_settings_s __user *)arg); ++ break; + -+/** -+ * kbase_fence_out_get() - Retrieve output fence for atom. -+ * @katom: Atom to get output fence from -+ * -+ * A ref will be taken for the fence, so use @kbase_fence_put() to release it -+ * -+ * Return: The fence, or NULL if there is no output fence for atom -+ */ -+#define kbase_fence_out_get(katom) dma_fence_get((katom)->dma_fence.fence) ++ case MALI_IOC_REQUEST_HIGH_PRIORITY: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_request_high_priority_s), sizeof(u64))); ++ err = request_high_priority_wrapper(session_data, (_mali_uk_request_high_priority_s __user *)arg); ++ break; + -+/** -+ * kbase_fence_put() - Releases a reference to a fence -+ * @fence: Fence to release reference for. -+ */ -+#define kbase_fence_put(fence) dma_fence_put(fence) ++ case MALI_IOC_PENDING_SUBMIT: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_pending_submit_s), sizeof(u64))); ++ err = pending_submit_wrapper(session_data, (_mali_uk_pending_submit_s __user *)arg); ++ break; + ++#if defined(CONFIG_MALI400_PROFILING) ++ case MALI_IOC_PROFILING_ADD_EVENT: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_profiling_add_event_s), sizeof(u64))); ++ err = profiling_add_event_wrapper(session_data, (_mali_uk_profiling_add_event_s __user *)arg); ++ break; + -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE || defined(CONFIG_SYNC_FILE */ ++ case MALI_IOC_PROFILING_REPORT_SW_COUNTERS: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_sw_counters_report_s), sizeof(u64))); ++ err = profiling_report_sw_counters_wrapper(session_data, (_mali_uk_sw_counters_report_s __user *)arg); ++ break; + -+#endif /* _KBASE_FENCE_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence_defs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence_defs.h -new file mode 100755 -index 000000000000..d2d7c436918c ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence_defs.h -@@ -0,0 +1,51 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ case MALI_IOC_PROFILING_STREAM_FD_GET: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_profiling_stream_fd_get_s), sizeof(u64))); ++ err = profiling_get_stream_fd_wrapper(session_data, (_mali_uk_profiling_stream_fd_get_s __user *)arg); ++ break; + ++ case MALI_IOC_PROILING_CONTROL_SET: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_profiling_control_set_s), sizeof(u64))); ++ err = profiling_control_set_wrapper(session_data, (_mali_uk_profiling_control_set_s __user *)arg); ++ break; ++#else + ++ case MALI_IOC_PROFILING_ADD_EVENT: /* FALL-THROUGH */ ++ case MALI_IOC_PROFILING_REPORT_SW_COUNTERS: /* FALL-THROUGH */ ++ MALI_DEBUG_PRINT(2, ("Profiling not supported\n")); ++ err = -ENOTTY; ++ break; ++#endif + -+#ifndef _KBASE_FENCE_DEFS_H_ -+#define _KBASE_FENCE_DEFS_H_ ++ case MALI_IOC_PROFILING_MEMORY_USAGE_GET: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_profiling_memory_usage_get_s), sizeof(u64))); ++ err = mem_usage_get_wrapper(session_data, (_mali_uk_profiling_memory_usage_get_s __user *)arg); ++ break; + -+/* -+ * There was a big rename in the 4.10 kernel (fence* -> dma_fence*) -+ * This file hides the compatibility issues with this for the rest the driver -+ */ ++ case MALI_IOC_MEM_ALLOC: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_alloc_mem_s), sizeof(u64))); ++ err = mem_alloc_wrapper(session_data, (_mali_uk_alloc_mem_s __user *)arg); ++ break; + -+#if defined(CONFIG_MALI_BIFROST_DMA_FENCE) || defined(CONFIG_SYNC_FILE) ++ case MALI_IOC_MEM_FREE: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_free_mem_s), sizeof(u64))); ++ err = mem_free_wrapper(session_data, (_mali_uk_free_mem_s __user *)arg); ++ break; + -+#include ++ case MALI_IOC_MEM_BIND: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_bind_mem_s), sizeof(u64))); ++ err = mem_bind_wrapper(session_data, (_mali_uk_bind_mem_s __user *)arg); ++ break; + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ case MALI_IOC_MEM_UNBIND: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_unbind_mem_s), sizeof(u64))); ++ err = mem_unbind_wrapper(session_data, (_mali_uk_unbind_mem_s __user *)arg); ++ break; + -+#include ++ case MALI_IOC_MEM_COW: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_cow_mem_s), sizeof(u64))); ++ err = mem_cow_wrapper(session_data, (_mali_uk_cow_mem_s __user *)arg); ++ break; + -+#define dma_fence_context_alloc(a) fence_context_alloc(a) -+#define dma_fence_init(a, b, c, d, e) fence_init(a, b, c, d, e) -+#define dma_fence_get(a) fence_get(a) -+#define dma_fence_put(a) fence_put(a) -+#define dma_fence_signal(a) fence_signal(a) -+#define dma_fence_is_signaled(a) fence_is_signaled(a) -+#define dma_fence_add_callback(a, b, c) fence_add_callback(a, b, c) -+#define dma_fence_remove_callback(a, b) fence_remove_callback(a, b) ++ case MALI_IOC_MEM_COW_MODIFY_RANGE: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_cow_modify_range_s), sizeof(u64))); ++ err = mem_cow_modify_range_wrapper(session_data, (_mali_uk_cow_modify_range_s __user *)arg); ++ break; ++ ++ case MALI_IOC_MEM_RESIZE: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_mem_resize_s), sizeof(u64))); ++ err = mem_resize_mem_wrapper(session_data, (_mali_uk_mem_resize_s __user *)arg); ++ break; ++ ++ case MALI_IOC_MEM_WRITE_SAFE: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_mem_write_safe_s), sizeof(u64))); ++ err = mem_write_safe_wrapper(session_data, (_mali_uk_mem_write_safe_s __user *)arg); ++ break; ++ ++ case MALI_IOC_MEM_QUERY_MMU_PAGE_TABLE_DUMP_SIZE: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_query_mmu_page_table_dump_size_s), sizeof(u64))); ++ err = mem_query_mmu_page_table_dump_size_wrapper(session_data, (_mali_uk_query_mmu_page_table_dump_size_s __user *)arg); ++ break; ++ ++ case MALI_IOC_MEM_DUMP_MMU_PAGE_TABLE: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_dump_mmu_page_table_s), sizeof(u64))); ++ err = mem_dump_mmu_page_table_wrapper(session_data, (_mali_uk_dump_mmu_page_table_s __user *)arg); ++ break; + ++ case MALI_IOC_MEM_DMA_BUF_GET_SIZE: ++#ifdef CONFIG_DMA_SHARED_BUFFER ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_dma_buf_get_size_s), sizeof(u64))); ++ err = mali_dma_buf_get_size(session_data, (_mali_uk_dma_buf_get_size_s __user *)arg); +#else ++ MALI_DEBUG_PRINT(2, ("DMA-BUF not supported\n")); ++ err = -ENOTTY; ++#endif ++ break; + -+#include ++ case MALI_IOC_PP_START_JOB: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_pp_start_job_s), sizeof(u64))); ++ err = pp_start_job_wrapper(session_data, (_mali_uk_pp_start_job_s __user *)arg); ++ break; + -+#endif /* < 4.10.0 */ ++ case MALI_IOC_PP_AND_GP_START_JOB: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_pp_and_gp_start_job_s), sizeof(u64))); ++ err = pp_and_gp_start_job_wrapper(session_data, (_mali_uk_pp_and_gp_start_job_s __user *)arg); ++ break; + -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE || CONFIG_SYNC_FILE */ ++ case MALI_IOC_PP_NUMBER_OF_CORES_GET: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_get_pp_number_of_cores_s), sizeof(u64))); ++ err = pp_get_number_of_cores_wrapper(session_data, (_mali_uk_get_pp_number_of_cores_s __user *)arg); ++ break; + -+#endif /* _KBASE_FENCE_DEFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator.h -new file mode 100755 -index 000000000000..87697b15d986 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator.h -@@ -0,0 +1,45 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ case MALI_IOC_PP_CORE_VERSION_GET: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_get_pp_core_version_s), sizeof(u64))); ++ err = pp_get_core_version_wrapper(session_data, (_mali_uk_get_pp_core_version_s __user *)arg); ++ break; + ++ case MALI_IOC_PP_DISABLE_WB: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_pp_disable_wb_s), sizeof(u64))); ++ err = pp_disable_wb_wrapper(session_data, (_mali_uk_pp_disable_wb_s __user *)arg); ++ break; + ++ case MALI_IOC_GP2_START_JOB: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_gp_start_job_s), sizeof(u64))); ++ err = gp_start_job_wrapper(session_data, (_mali_uk_gp_start_job_s __user *)arg); ++ break; + -+/* NB taken from gator */ -+/* -+ * List of possible actions to be controlled by DS-5 Streamline. -+ * The following numbers are used by gator to control the frame buffer dumping -+ * and s/w counter reporting. We cannot use the enums in mali_uk_types.h because -+ * they are unknown inside gator. -+ */ -+#ifndef _KBASE_GATOR_H_ -+#define _KBASE_GATOR_H_ ++ case MALI_IOC_GP2_NUMBER_OF_CORES_GET: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_get_gp_number_of_cores_s), sizeof(u64))); ++ err = gp_get_number_of_cores_wrapper(session_data, (_mali_uk_get_gp_number_of_cores_s __user *)arg); ++ break; + -+#ifdef CONFIG_MALI_BIFROST_GATOR_SUPPORT -+#define GATOR_MAKE_EVENT(type, number) (((type) << 24) | ((number) << 16)) -+#define GATOR_JOB_SLOT_START 1 -+#define GATOR_JOB_SLOT_STOP 2 -+#define GATOR_JOB_SLOT_SOFT_STOPPED 3 ++ case MALI_IOC_GP2_CORE_VERSION_GET: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_get_gp_core_version_s), sizeof(u64))); ++ err = gp_get_core_version_wrapper(session_data, (_mali_uk_get_gp_core_version_s __user *)arg); ++ break; + -+void kbase_trace_mali_job_slots_event(u32 event, const struct kbase_context *kctx, u8 atom_id); -+void kbase_trace_mali_pm_status(u32 event, u64 value); -+void kbase_trace_mali_pm_power_off(u32 event, u64 value); -+void kbase_trace_mali_pm_power_on(u32 event, u64 value); -+void kbase_trace_mali_page_fault_insert_pages(int event, u32 value); -+void kbase_trace_mali_mmu_as_in_use(int event); -+void kbase_trace_mali_mmu_as_released(int event); -+void kbase_trace_mali_total_alloc_pages_change(long long int event); ++ case MALI_IOC_GP2_SUSPEND_RESPONSE: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_gp_suspend_response_s), sizeof(u64))); ++ err = gp_suspend_response_wrapper(session_data, (_mali_uk_gp_suspend_response_s __user *)arg); ++ break; + -+#endif /* CONFIG_MALI_BIFROST_GATOR_SUPPORT */ ++ case MALI_IOC_VSYNC_EVENT_REPORT: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_vsync_event_report_s), sizeof(u64))); ++ err = vsync_event_report_wrapper(session_data, (_mali_uk_vsync_event_report_s __user *)arg); ++ break; + -+#endif /* _KBASE_GATOR_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_api.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_api.c ++ case MALI_IOC_TIMELINE_GET_LATEST_POINT: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_timeline_get_latest_point_s), sizeof(u64))); ++ err = timeline_get_latest_point_wrapper(session_data, (_mali_uk_timeline_get_latest_point_s __user *)arg); ++ break; ++ case MALI_IOC_TIMELINE_WAIT: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_timeline_wait_s), sizeof(u64))); ++ err = timeline_wait_wrapper(session_data, (_mali_uk_timeline_wait_s __user *)arg); ++ break; ++ case MALI_IOC_TIMELINE_CREATE_SYNC_FENCE: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_timeline_create_sync_fence_s), sizeof(u64))); ++ err = timeline_create_sync_fence_wrapper(session_data, (_mali_uk_timeline_create_sync_fence_s __user *)arg); ++ break; ++ case MALI_IOC_SOFT_JOB_START: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_soft_job_start_s), sizeof(u64))); ++ err = soft_job_start_wrapper(session_data, (_mali_uk_soft_job_start_s __user *)arg); ++ break; ++ case MALI_IOC_SOFT_JOB_SIGNAL: ++ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_soft_job_signal_s), sizeof(u64))); ++ err = soft_job_signal_wrapper(session_data, (_mali_uk_soft_job_signal_s __user *)arg); ++ break; ++ ++ default: ++ MALI_DEBUG_PRINT(2, ("No handler for ioctl 0x%08X 0x%08lX\n", cmd, arg)); ++ err = -ENOTTY; ++ }; ++ ++ return err; ++} ++ ++late_initcall_sync(mali_module_init); ++module_exit(mali_module_exit); ++ ++MODULE_LICENSE(MALI_KERNEL_LINUX_LICENSE); ++MODULE_AUTHOR("ARM Ltd."); ++MODULE_VERSION(SVN_REV_STRING); +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h new file mode 100755 -index 000000000000..860e10159fb3 +index 000000000..be754cb15 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_api.c -@@ -0,0 +1,334 @@ ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h +@@ -0,0 +1,36 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_KERNEL_LINUX_H__ ++#define __MALI_KERNEL_LINUX_H__ + ++#ifdef __cplusplus ++extern "C" { ++#endif + -+#include "mali_kbase.h" -+#include "mali_kbase_hw.h" -+#include "mali_kbase_mem_linux.h" -+#include "mali_kbase_gator_api.h" -+#include "mali_kbase_gator_hwcnt_names.h" ++#include /* character device definitions */ ++#include ++#include ++#include "mali_kernel_license.h" ++#include "mali_osk_types.h" ++#include + -+#define MALI_MAX_CORES_PER_GROUP 4 -+#define MALI_MAX_NUM_BLOCKS_PER_GROUP 8 -+#define MALI_COUNTERS_PER_BLOCK 64 -+#define MALI_BYTES_PER_COUNTER 4 ++extern struct platform_device *mali_platform_device; + -+struct kbase_gator_hwcnt_handles { -+ struct kbase_device *kbdev; -+ struct kbase_vinstr_client *vinstr_cli; -+ void *vinstr_buffer; -+ struct work_struct dump_work; -+ int dump_complete; -+ spinlock_t dump_lock; -+}; ++/* After 3.19.0 kenrel droped CONFIG_PM_RUNTIME define,define by ourself */ ++#if defined(CONFIG_PM) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) ++#define CONFIG_PM_RUNTIME 1 ++#endif + -+static void dump_worker(struct work_struct *work); ++#ifdef __cplusplus ++} ++#endif + -+const char * const *kbase_gator_hwcnt_init_names(uint32_t *total_counters) -+{ -+ const char * const *hardware_counters; -+ struct kbase_device *kbdev; -+ uint32_t product_id; -+ uint32_t count; ++#endif /* __MALI_KERNEL_LINUX_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c +new file mode 100755 +index 000000000..7bda438fe +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c +@@ -0,0 +1,1410 @@ ++/** ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ if (!total_counters) -+ return NULL; + -+ /* Get the first device - it doesn't matter in this case */ -+ kbdev = kbase_find_device(-1); -+ if (!kbdev) -+ return NULL; ++/** ++ * @file mali_kernel_sysfs.c ++ * Implementation of some sysfs data exports ++ */ + -+ product_id = kbdev->gpu_props.props.core_props.product_id; ++#include ++#include ++#include ++#include ++#include "mali_kernel_license.h" ++#include "mali_kernel_common.h" ++#include "mali_ukk.h" + -+ if (GPU_ID_IS_NEW_FORMAT(product_id)) { -+ switch (GPU_ID2_MODEL_MATCH_VALUE(product_id)) { -+ case GPU_ID2_PRODUCT_TMIX: -+ hardware_counters = hardware_counters_mali_tMIx; -+ count = ARRAY_SIZE(hardware_counters_mali_tMIx); -+ break; -+ case GPU_ID2_PRODUCT_THEX: -+ hardware_counters = hardware_counters_mali_tHEx; -+ count = ARRAY_SIZE(hardware_counters_mali_tHEx); -+ break; -+ case GPU_ID2_PRODUCT_TSIX: -+ hardware_counters = hardware_counters_mali_tSIx; -+ count = ARRAY_SIZE(hardware_counters_mali_tSIx); -+ break; -+ default: -+ hardware_counters = NULL; -+ count = 0; -+ dev_err(kbdev->dev, "Unrecognized product ID: %u\n", -+ product_id); -+ break; -+ } -+ } else { -+ switch (product_id) { -+ /* If we are using a Mali-T60x device */ -+ case GPU_ID_PI_T60X: -+ hardware_counters = hardware_counters_mali_t60x; -+ count = ARRAY_SIZE(hardware_counters_mali_t60x); -+ break; -+ /* If we are using a Mali-T62x device */ -+ case GPU_ID_PI_T62X: -+ hardware_counters = hardware_counters_mali_t62x; -+ count = ARRAY_SIZE(hardware_counters_mali_t62x); -+ break; -+ /* If we are using a Mali-T72x device */ -+ case GPU_ID_PI_T72X: -+ hardware_counters = hardware_counters_mali_t72x; -+ count = ARRAY_SIZE(hardware_counters_mali_t72x); -+ break; -+ /* If we are using a Mali-T76x device */ -+ case GPU_ID_PI_T76X: -+ hardware_counters = hardware_counters_mali_t76x; -+ count = ARRAY_SIZE(hardware_counters_mali_t76x); -+ break; -+ /* If we are using a Mali-T82x device */ -+ case GPU_ID_PI_T82X: -+ hardware_counters = hardware_counters_mali_t82x; -+ count = ARRAY_SIZE(hardware_counters_mali_t82x); -+ break; -+ /* If we are using a Mali-T83x device */ -+ case GPU_ID_PI_T83X: -+ hardware_counters = hardware_counters_mali_t83x; -+ count = ARRAY_SIZE(hardware_counters_mali_t83x); -+ break; -+ /* If we are using a Mali-T86x device */ -+ case GPU_ID_PI_T86X: -+ hardware_counters = hardware_counters_mali_t86x; -+ count = ARRAY_SIZE(hardware_counters_mali_t86x); -+ break; -+ /* If we are using a Mali-T88x device */ -+ case GPU_ID_PI_TFRX: -+ hardware_counters = hardware_counters_mali_t88x; -+ count = ARRAY_SIZE(hardware_counters_mali_t88x); -+ break; -+ default: -+ hardware_counters = NULL; -+ count = 0; -+ dev_err(kbdev->dev, "Unrecognized product ID: %u\n", -+ product_id); -+ break; -+ } -+ } ++#if MALI_LICENSE_IS_GPL + -+ /* Release the kbdev reference. */ -+ kbase_release_device(kbdev); ++#include ++#include ++#include ++#include ++#include ++#include "mali_kernel_sysfs.h" ++#if defined(CONFIG_MALI400_INTERNAL_PROFILING) ++#include ++#include "mali_osk_profiling.h" ++#endif + -+ *total_counters = count; ++#include ++#include "mali_pm.h" ++#include "mali_pmu.h" ++#include "mali_group.h" ++#include "mali_gp.h" ++#include "mali_pp.h" ++#include "mali_l2_cache.h" ++#include "mali_hw_core.h" ++#include "mali_kernel_core.h" ++#include "mali_user_settings_db.h" ++#include "mali_profiling_internal.h" ++#include "mali_gp_job.h" ++#include "mali_pp_job.h" ++#include "mali_executor.h" + -+ /* If we return a string array take a reference on the module (or fail). */ -+ if (hardware_counters && !try_module_get(THIS_MODULE)) -+ return NULL; ++#define PRIVATE_DATA_COUNTER_MAKE_GP(src) (src) ++#define PRIVATE_DATA_COUNTER_MAKE_PP(src) ((1 << 24) | src) ++#define PRIVATE_DATA_COUNTER_MAKE_PP_SUB_JOB(src, sub_job) ((1 << 24) | (1 << 16) | (sub_job << 8) | src) ++#define PRIVATE_DATA_COUNTER_IS_PP(a) ((((a) >> 24) & 0xFF) ? MALI_TRUE : MALI_FALSE) ++#define PRIVATE_DATA_COUNTER_GET_SRC(a) (a & 0xFF) ++#define PRIVATE_DATA_COUNTER_IS_SUB_JOB(a) ((((a) >> 16) & 0xFF) ? MALI_TRUE : MALI_FALSE) ++#define PRIVATE_DATA_COUNTER_GET_SUB_JOB(a) (((a) >> 8) & 0xFF) + -+ return hardware_counters; -+} -+KBASE_EXPORT_SYMBOL(kbase_gator_hwcnt_init_names); ++#define POWER_BUFFER_SIZE 3 + -+void kbase_gator_hwcnt_term_names(void) ++static struct dentry *mali_debugfs_dir = NULL; ++ ++typedef enum { ++ _MALI_DEVICE_SUSPEND, ++ _MALI_DEVICE_RESUME, ++ _MALI_DEVICE_DVFS_PAUSE, ++ _MALI_DEVICE_DVFS_RESUME, ++ _MALI_MAX_EVENTS ++} _mali_device_debug_power_events; ++ ++static const char *const mali_power_events[_MALI_MAX_EVENTS] = { ++ [_MALI_DEVICE_SUSPEND] = "suspend", ++ [_MALI_DEVICE_RESUME] = "resume", ++ [_MALI_DEVICE_DVFS_PAUSE] = "dvfs_pause", ++ [_MALI_DEVICE_DVFS_RESUME] = "dvfs_resume", ++}; ++ ++static mali_bool power_always_on_enabled = MALI_FALSE; ++ ++static int open_copy_private_data(struct inode *inode, struct file *filp) +{ -+ /* Release the module reference. */ -+ module_put(THIS_MODULE); ++ filp->private_data = inode->i_private; ++ return 0; +} -+KBASE_EXPORT_SYMBOL(kbase_gator_hwcnt_term_names); + -+struct kbase_gator_hwcnt_handles *kbase_gator_hwcnt_init(struct kbase_gator_hwcnt_info *in_out_info) ++static ssize_t group_enabled_read(struct file *filp, char __user *buf, size_t count, loff_t *offp) +{ -+ struct kbase_gator_hwcnt_handles *hand; -+ struct kbase_uk_hwcnt_reader_setup setup; -+ uint32_t dump_size = 0, i = 0; -+ -+ if (!in_out_info) -+ return NULL; -+ -+ hand = kzalloc(sizeof(*hand), GFP_KERNEL); -+ if (!hand) -+ return NULL; ++ int r; ++ char buffer[64]; ++ struct mali_group *group; + -+ INIT_WORK(&hand->dump_work, dump_worker); -+ spin_lock_init(&hand->dump_lock); ++ group = (struct mali_group *)filp->private_data; ++ MALI_DEBUG_ASSERT_POINTER(group); + -+ /* Get the first device */ -+ hand->kbdev = kbase_find_device(-1); -+ if (!hand->kbdev) -+ goto free_hand; ++ r = snprintf(buffer, 64, "%u\n", ++ mali_executor_group_is_disabled(group) ? 0 : 1); + -+ dump_size = kbase_vinstr_dump_size(hand->kbdev); -+ hand->vinstr_buffer = kzalloc(dump_size, GFP_KERNEL); -+ if (!hand->vinstr_buffer) -+ goto release_device; -+ in_out_info->kernel_dump_buffer = hand->vinstr_buffer; ++ return simple_read_from_buffer(buf, count, offp, buffer, r); ++} + -+ in_out_info->nr_cores = hand->kbdev->gpu_props.num_cores; -+ in_out_info->nr_core_groups = hand->kbdev->gpu_props.num_core_groups; -+ in_out_info->gpu_id = hand->kbdev->gpu_props.props.core_props.product_id; ++static ssize_t group_enabled_write(struct file *filp, const char __user *buf, size_t count, loff_t *offp) ++{ ++ int r; ++ char buffer[64]; ++ unsigned long val; ++ struct mali_group *group; + -+ /* If we are using a v4 device (Mali-T6xx or Mali-T72x) */ -+ if (kbase_hw_has_feature(hand->kbdev, BASE_HW_FEATURE_V4)) { -+ uint32_t cg, j; -+ uint64_t core_mask; ++ group = (struct mali_group *)filp->private_data; ++ MALI_DEBUG_ASSERT_POINTER(group); + -+ /* There are 8 hardware counters blocks per core group */ -+ in_out_info->hwc_layout = kmalloc(sizeof(enum hwc_type) * -+ MALI_MAX_NUM_BLOCKS_PER_GROUP * -+ in_out_info->nr_core_groups, GFP_KERNEL); ++ if (count >= sizeof(buffer)) { ++ return -ENOMEM; ++ } + -+ if (!in_out_info->hwc_layout) -+ goto free_vinstr_buffer; ++ if (copy_from_user(&buffer[0], buf, count)) { ++ return -EFAULT; ++ } ++ buffer[count] = '\0'; + -+ dump_size = in_out_info->nr_core_groups * -+ MALI_MAX_NUM_BLOCKS_PER_GROUP * -+ MALI_COUNTERS_PER_BLOCK * -+ MALI_BYTES_PER_COUNTER; ++ r = kstrtoul(&buffer[0], 10, &val); ++ if (0 != r) { ++ return -EINVAL; ++ } + -+ for (cg = 0; cg < in_out_info->nr_core_groups; cg++) { -+ core_mask = hand->kbdev->gpu_props.props.coherency_info.group[cg].core_mask; ++ switch (val) { ++ case 1: ++ mali_executor_group_enable(group); ++ break; ++ case 0: ++ mali_executor_group_disable(group); ++ break; ++ default: ++ return -EINVAL; ++ break; ++ } + -+ for (j = 0; j < MALI_MAX_CORES_PER_GROUP; j++) { -+ if (core_mask & (1u << j)) -+ in_out_info->hwc_layout[i++] = SHADER_BLOCK; -+ else -+ in_out_info->hwc_layout[i++] = RESERVED_BLOCK; -+ } ++ *offp += count; ++ return count; ++} + -+ in_out_info->hwc_layout[i++] = TILER_BLOCK; -+ in_out_info->hwc_layout[i++] = MMU_L2_BLOCK; ++static const struct file_operations group_enabled_fops = { ++ .owner = THIS_MODULE, ++ .open = open_copy_private_data, ++ .read = group_enabled_read, ++ .write = group_enabled_write, ++}; + -+ in_out_info->hwc_layout[i++] = RESERVED_BLOCK; ++static ssize_t hw_core_base_addr_read(struct file *filp, char __user *buf, size_t count, loff_t *offp) ++{ ++ int r; ++ char buffer[64]; ++ struct mali_hw_core *hw_core; + -+ if (0 == cg) -+ in_out_info->hwc_layout[i++] = JM_BLOCK; -+ else -+ in_out_info->hwc_layout[i++] = RESERVED_BLOCK; -+ } -+ /* If we are using any other device */ -+ } else { -+ uint32_t nr_l2, nr_sc_bits, j; -+ uint64_t core_mask; ++ hw_core = (struct mali_hw_core *)filp->private_data; ++ MALI_DEBUG_ASSERT_POINTER(hw_core); + -+ nr_l2 = hand->kbdev->gpu_props.props.l2_props.num_l2_slices; ++ r = snprintf(buffer, 64, "0x%lX\n", hw_core->phys_addr); + -+ core_mask = hand->kbdev->gpu_props.props.coherency_info.group[0].core_mask; ++ return simple_read_from_buffer(buf, count, offp, buffer, r); ++} + -+ nr_sc_bits = fls64(core_mask); ++static const struct file_operations hw_core_base_addr_fops = { ++ .owner = THIS_MODULE, ++ .open = open_copy_private_data, ++ .read = hw_core_base_addr_read, ++}; + -+ /* The job manager and tiler sets of counters -+ * are always present */ -+ in_out_info->hwc_layout = kmalloc(sizeof(enum hwc_type) * (2 + nr_sc_bits + nr_l2), GFP_KERNEL); ++static ssize_t profiling_counter_src_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ u32 is_pp = PRIVATE_DATA_COUNTER_IS_PP((uintptr_t)filp->private_data); ++ u32 src_id = PRIVATE_DATA_COUNTER_GET_SRC((uintptr_t)filp->private_data); ++ mali_bool is_sub_job = PRIVATE_DATA_COUNTER_IS_SUB_JOB((uintptr_t)filp->private_data); ++ u32 sub_job = PRIVATE_DATA_COUNTER_GET_SUB_JOB((uintptr_t)filp->private_data); ++ char buf[64]; ++ int r; ++ u32 val; + -+ if (!in_out_info->hwc_layout) -+ goto free_vinstr_buffer; ++ if (MALI_TRUE == is_pp) { ++ /* PP counter */ ++ if (MALI_TRUE == is_sub_job) { ++ /* Get counter for a particular sub job */ ++ if (0 == src_id) { ++ val = mali_pp_job_get_pp_counter_sub_job_src0(sub_job); ++ } else { ++ val = mali_pp_job_get_pp_counter_sub_job_src1(sub_job); ++ } ++ } else { ++ /* Get default counter for all PP sub jobs */ ++ if (0 == src_id) { ++ val = mali_pp_job_get_pp_counter_global_src0(); ++ } else { ++ val = mali_pp_job_get_pp_counter_global_src1(); ++ } ++ } ++ } else { ++ /* GP counter */ ++ if (0 == src_id) { ++ val = mali_gp_job_get_gp_counter_src0(); ++ } else { ++ val = mali_gp_job_get_gp_counter_src1(); ++ } ++ } + -+ dump_size = (2 + nr_sc_bits + nr_l2) * MALI_COUNTERS_PER_BLOCK * MALI_BYTES_PER_COUNTER; ++ if (MALI_HW_CORE_NO_COUNTER == val) { ++ r = snprintf(buf, 64, "-1\n"); ++ } else { ++ r = snprintf(buf, 64, "%u\n", val); ++ } + -+ in_out_info->hwc_layout[i++] = JM_BLOCK; -+ in_out_info->hwc_layout[i++] = TILER_BLOCK; ++ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); ++} + -+ for (j = 0; j < nr_l2; j++) -+ in_out_info->hwc_layout[i++] = MMU_L2_BLOCK; ++static ssize_t profiling_counter_src_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ u32 is_pp = PRIVATE_DATA_COUNTER_IS_PP((uintptr_t)filp->private_data); ++ u32 src_id = PRIVATE_DATA_COUNTER_GET_SRC((uintptr_t)filp->private_data); ++ mali_bool is_sub_job = PRIVATE_DATA_COUNTER_IS_SUB_JOB((uintptr_t)filp->private_data); ++ u32 sub_job = PRIVATE_DATA_COUNTER_GET_SUB_JOB((uintptr_t)filp->private_data); ++ char buf[64]; ++ long val; ++ int ret; + -+ while (core_mask != 0ull) { -+ if ((core_mask & 1ull) != 0ull) -+ in_out_info->hwc_layout[i++] = SHADER_BLOCK; -+ else -+ in_out_info->hwc_layout[i++] = RESERVED_BLOCK; -+ core_mask >>= 1; -+ } ++ if (cnt >= sizeof(buf)) { ++ return -EINVAL; + } + -+ in_out_info->nr_hwc_blocks = i; -+ in_out_info->size = dump_size; -+ -+ setup.jm_bm = in_out_info->bitmask[0]; -+ setup.tiler_bm = in_out_info->bitmask[1]; -+ setup.shader_bm = in_out_info->bitmask[2]; -+ setup.mmu_l2_bm = in_out_info->bitmask[3]; -+ hand->vinstr_cli = kbase_vinstr_hwcnt_kernel_setup(hand->kbdev->vinstr_ctx, -+ &setup, hand->vinstr_buffer); -+ if (!hand->vinstr_cli) { -+ dev_err(hand->kbdev->dev, "Failed to register gator with vinstr core"); -+ goto free_layout; ++ if (copy_from_user(&buf, ubuf, cnt)) { ++ return -EFAULT; + } + -+ return hand; ++ buf[cnt] = 0; + -+free_layout: -+ kfree(in_out_info->hwc_layout); ++ ret = kstrtol(buf, 10, &val); ++ if (ret < 0) { ++ return ret; ++ } + -+free_vinstr_buffer: -+ kfree(hand->vinstr_buffer); ++ if (val < 0) { ++ /* any negative input will disable counter */ ++ val = MALI_HW_CORE_NO_COUNTER; ++ } + -+release_device: -+ kbase_release_device(hand->kbdev); ++ if (MALI_TRUE == is_pp) { ++ /* PP counter */ ++ if (MALI_TRUE == is_sub_job) { ++ /* Set counter for a particular sub job */ ++ if (0 == src_id) { ++ mali_pp_job_set_pp_counter_sub_job_src0(sub_job, (u32)val); ++ } else { ++ mali_pp_job_set_pp_counter_sub_job_src1(sub_job, (u32)val); ++ } ++ } else { ++ /* Set default counter for all PP sub jobs */ ++ if (0 == src_id) { ++ mali_pp_job_set_pp_counter_global_src0((u32)val); ++ } else { ++ mali_pp_job_set_pp_counter_global_src1((u32)val); ++ } ++ } ++ } else { ++ /* GP counter */ ++ if (0 == src_id) { ++ mali_gp_job_set_gp_counter_src0((u32)val); ++ } else { ++ mali_gp_job_set_gp_counter_src1((u32)val); ++ } ++ } + -+free_hand: -+ kfree(hand); -+ return NULL; ++ *ppos += cnt; ++ return cnt; +} -+KBASE_EXPORT_SYMBOL(kbase_gator_hwcnt_init); + -+void kbase_gator_hwcnt_term(struct kbase_gator_hwcnt_info *in_out_info, struct kbase_gator_hwcnt_handles *opaque_handles) ++static const struct file_operations profiling_counter_src_fops = { ++ .owner = THIS_MODULE, ++ .open = open_copy_private_data, ++ .read = profiling_counter_src_read, ++ .write = profiling_counter_src_write, ++}; ++ ++static ssize_t l2_l2x_counter_srcx_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos, u32 src_id) +{ -+ if (in_out_info) -+ kfree(in_out_info->hwc_layout); ++ char buf[64]; ++ int r; ++ u32 val; ++ struct mali_l2_cache_core *l2_core = (struct mali_l2_cache_core *)filp->private_data; + -+ if (opaque_handles) { -+ cancel_work_sync(&opaque_handles->dump_work); -+ kbase_vinstr_detach_client(opaque_handles->vinstr_cli); -+ kfree(opaque_handles->vinstr_buffer); -+ kbase_release_device(opaque_handles->kbdev); -+ kfree(opaque_handles); ++ if (0 == src_id) { ++ val = mali_l2_cache_core_get_counter_src0(l2_core); ++ } else { ++ val = mali_l2_cache_core_get_counter_src1(l2_core); + } -+} -+KBASE_EXPORT_SYMBOL(kbase_gator_hwcnt_term); -+ -+static void dump_worker(struct work_struct *work) -+{ -+ struct kbase_gator_hwcnt_handles *hand; + -+ hand = container_of(work, struct kbase_gator_hwcnt_handles, dump_work); -+ if (!kbase_vinstr_hwc_dump(hand->vinstr_cli, -+ BASE_HWCNT_READER_EVENT_MANUAL)) { -+ spin_lock_bh(&hand->dump_lock); -+ hand->dump_complete = 1; -+ spin_unlock_bh(&hand->dump_lock); ++ if (MALI_HW_CORE_NO_COUNTER == val) { ++ r = snprintf(buf, 64, "-1\n"); + } else { -+ schedule_work(&hand->dump_work); ++ r = snprintf(buf, 64, "%u\n", val); + } ++ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); +} + -+uint32_t kbase_gator_instr_hwcnt_dump_complete( -+ struct kbase_gator_hwcnt_handles *opaque_handles, -+ uint32_t * const success) ++static ssize_t l2_l2x_counter_srcx_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos, u32 src_id) +{ ++ struct mali_l2_cache_core *l2_core = (struct mali_l2_cache_core *)filp->private_data; ++ char buf[64]; ++ long val; ++ int ret; + -+ if (opaque_handles && success) { -+ *success = opaque_handles->dump_complete; -+ opaque_handles->dump_complete = 0; -+ return *success; ++ if (cnt >= sizeof(buf)) { ++ return -EINVAL; + } -+ return 0; -+} -+KBASE_EXPORT_SYMBOL(kbase_gator_instr_hwcnt_dump_complete); + -+uint32_t kbase_gator_instr_hwcnt_dump_irq(struct kbase_gator_hwcnt_handles *opaque_handles) -+{ -+ if (opaque_handles) -+ schedule_work(&opaque_handles->dump_work); -+ return 0; -+} -+KBASE_EXPORT_SYMBOL(kbase_gator_instr_hwcnt_dump_irq); -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_api.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_api.h -new file mode 100755 -index 000000000000..ef9ac0f7b633 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_api.h -@@ -0,0 +1,219 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ if (copy_from_user(&buf, ubuf, cnt)) { ++ return -EFAULT; ++ } + ++ buf[cnt] = 0; + ++ ret = kstrtol(buf, 10, &val); ++ if (ret < 0) { ++ return ret; ++ } + -+#ifndef _KBASE_GATOR_API_H_ -+#define _KBASE_GATOR_API_H_ ++ if (val < 0) { ++ /* any negative input will disable counter */ ++ val = MALI_HW_CORE_NO_COUNTER; ++ } + -+/** -+ * @brief This file describes the API used by Gator to fetch hardware counters. -+ */ ++ mali_l2_cache_core_set_counter_src(l2_core, src_id, (u32)val); + -+/* This define is used by the gator kernel module compile to select which DDK -+ * API calling convention to use. If not defined (legacy DDK) gator assumes -+ * version 1. The version to DDK release mapping is: -+ * Version 1 API: DDK versions r1px, r2px -+ * Version 2 API: DDK versions r3px, r4px -+ * Version 3 API: DDK version r5p0 and newer -+ * -+ * API Usage -+ * ========= -+ * -+ * 1] Call kbase_gator_hwcnt_init_names() to return the list of short counter -+ * names for the GPU present in this device. -+ * -+ * 2] Create a kbase_gator_hwcnt_info structure and set the counter enables for -+ * the counters you want enabled. The enables can all be set for simplicity in -+ * most use cases, but disabling some will let you minimize bandwidth impact. -+ * -+ * 3] Call kbase_gator_hwcnt_init() using the above structure, to create a -+ * counter context. On successful return the DDK will have populated the -+ * structure with a variety of useful information. -+ * -+ * 4] Call kbase_gator_hwcnt_dump_irq() to queue a non-blocking request for a -+ * counter dump. If this returns a non-zero value the request has been queued, -+ * otherwise the driver has been unable to do so (typically because of another -+ * user of the instrumentation exists concurrently). -+ * -+ * 5] Call kbase_gator_hwcnt_dump_complete() to test whether the previously -+ * requested dump has been succesful. If this returns non-zero the counter dump -+ * has resolved, but the value of *success must also be tested as the dump -+ * may have not been successful. If it returns zero the counter dump was -+ * abandoned due to the device being busy (typically because of another -+ * user of the instrumentation exists concurrently). -+ * -+ * 6] Process the counters stored in the buffer pointed to by ... -+ * -+ * kbase_gator_hwcnt_info->kernel_dump_buffer -+ * -+ * In pseudo code you can find all of the counters via this approach: -+ * -+ * -+ * hwcnt_info # pointer to kbase_gator_hwcnt_info structure -+ * hwcnt_name # pointer to name list -+ * -+ * u32 * hwcnt_data = (u32*)hwcnt_info->kernel_dump_buffer -+ * -+ * # Iterate over each 64-counter block in this GPU configuration -+ * for( i = 0; i < hwcnt_info->nr_hwc_blocks; i++) { -+ * hwc_type type = hwcnt_info->hwc_layout[i]; -+ * -+ * # Skip reserved type blocks - they contain no counters at all -+ * if( type == RESERVED_BLOCK ) { -+ * continue; -+ * } -+ * -+ * size_t name_offset = type * 64; -+ * size_t data_offset = i * 64; -+ * -+ * # Iterate over the names of the counters in this block type -+ * for( j = 0; j < 64; j++) { -+ * const char * name = hwcnt_name[name_offset+j]; -+ * -+ * # Skip empty name strings - there is no counter here -+ * if( name[0] == '\0' ) { -+ * continue; -+ * } -+ * -+ * u32 data = hwcnt_data[data_offset+j]; -+ * -+ * printk( "COUNTER: %s DATA: %u\n", name, data ); -+ * } -+ * } -+ * -+ * -+ * Note that in most implementations you typically want to either SUM or -+ * AVERAGE multiple instances of the same counter if, for example, you have -+ * multiple shader cores or multiple L2 caches. The most sensible view for -+ * analysis is to AVERAGE shader core counters, but SUM L2 cache and MMU -+ * counters. -+ * -+ * 7] Goto 4, repeating until you want to stop collecting counters. -+ * -+ * 8] Release the dump resources by calling kbase_gator_hwcnt_term(). -+ * -+ * 9] Release the name table resources by calling -+ * kbase_gator_hwcnt_term_names(). This function must only be called if -+ * init_names() returned a non-NULL value. -+ **/ ++ *ppos += cnt; ++ return cnt; ++} + -+#define MALI_DDK_GATOR_API_VERSION 3 ++static ssize_t l2_all_counter_srcx_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos, u32 src_id) ++{ ++ char buf[64]; ++ long val; ++ int ret; ++ u32 l2_id; ++ struct mali_l2_cache_core *l2_cache; + -+enum hwc_type { -+ JM_BLOCK = 0, -+ TILER_BLOCK, -+ SHADER_BLOCK, -+ MMU_L2_BLOCK, -+ RESERVED_BLOCK -+}; ++ if (cnt >= sizeof(buf)) { ++ return -EINVAL; ++ } + -+struct kbase_gator_hwcnt_info { -+ /* Passed from Gator to kbase */ ++ if (copy_from_user(&buf, ubuf, cnt)) { ++ return -EFAULT; ++ } + -+ /* the bitmask of enabled hardware counters for each counter block */ -+ uint16_t bitmask[4]; ++ buf[cnt] = 0; + -+ /* Passed from kbase to Gator */ ++ ret = kstrtol(buf, 10, &val); ++ if (ret < 0) { ++ return ret; ++ } + -+ /* ptr to counter dump memory */ -+ void *kernel_dump_buffer; ++ if (val < 0) { ++ /* any negative input will disable counter */ ++ val = MALI_HW_CORE_NO_COUNTER; ++ } + -+ /* size of counter dump memory */ -+ uint32_t size; ++ l2_id = 0; ++ l2_cache = mali_l2_cache_core_get_glob_l2_core(l2_id); ++ while (NULL != l2_cache) { ++ mali_l2_cache_core_set_counter_src(l2_cache, src_id, (u32)val); + -+ /* the ID of the Mali device */ -+ uint32_t gpu_id; ++ /* try next L2 */ ++ l2_id++; ++ l2_cache = mali_l2_cache_core_get_glob_l2_core(l2_id); ++ } + -+ /* the number of shader cores in the GPU */ -+ uint32_t nr_cores; ++ *ppos += cnt; ++ return cnt; ++} + -+ /* the number of core groups */ -+ uint32_t nr_core_groups; ++static ssize_t l2_l2x_counter_src0_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ return l2_l2x_counter_srcx_read(filp, ubuf, cnt, ppos, 0); ++} + -+ /* the memory layout of the performance counters */ -+ enum hwc_type *hwc_layout; ++static ssize_t l2_l2x_counter_src1_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ return l2_l2x_counter_srcx_read(filp, ubuf, cnt, ppos, 1); ++} + -+ /* the total number of hardware couter blocks */ -+ uint32_t nr_hwc_blocks; ++static ssize_t l2_l2x_counter_src0_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ return l2_l2x_counter_srcx_write(filp, ubuf, cnt, ppos, 0); ++} ++ ++static ssize_t l2_l2x_counter_src1_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ return l2_l2x_counter_srcx_write(filp, ubuf, cnt, ppos, 1); ++} ++ ++static ssize_t l2_all_counter_src0_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ return l2_all_counter_srcx_write(filp, ubuf, cnt, ppos, 0); ++} ++ ++static ssize_t l2_all_counter_src1_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ return l2_all_counter_srcx_write(filp, ubuf, cnt, ppos, 1); ++} ++ ++static const struct file_operations l2_l2x_counter_src0_fops = { ++ .owner = THIS_MODULE, ++ .open = open_copy_private_data, ++ .read = l2_l2x_counter_src0_read, ++ .write = l2_l2x_counter_src0_write, +}; + -+/** -+ * @brief Opaque block of Mali data which Gator needs to return to the API later. -+ */ -+struct kbase_gator_hwcnt_handles; ++static const struct file_operations l2_l2x_counter_src1_fops = { ++ .owner = THIS_MODULE, ++ .open = open_copy_private_data, ++ .read = l2_l2x_counter_src1_read, ++ .write = l2_l2x_counter_src1_write, ++}; + -+/** -+ * @brief Initialize the resources Gator needs for performance profiling. -+ * -+ * @param in_out_info A pointer to a structure containing the enabled counters passed from Gator and all the Mali -+ * specific information that will be returned to Gator. On entry Gator must have populated the -+ * 'bitmask' field with the counters it wishes to enable for each class of counter block. -+ * Each entry in the array corresponds to a single counter class based on the "hwc_type" -+ * enumeration, and each bit corresponds to an enable for 4 sequential counters (LSB enables -+ * the first 4 counters in the block, and so on). See the GPU counter array as returned by -+ * kbase_gator_hwcnt_get_names() for the index values of each counter for the curernt GPU. -+ * -+ * @return Pointer to an opaque handle block on success, NULL on error. -+ */ -+extern struct kbase_gator_hwcnt_handles *kbase_gator_hwcnt_init(struct kbase_gator_hwcnt_info *in_out_info); ++static const struct file_operations l2_all_counter_src0_fops = { ++ .owner = THIS_MODULE, ++ .write = l2_all_counter_src0_write, ++}; + -+/** -+ * @brief Free all resources once Gator has finished using performance counters. -+ * -+ * @param in_out_info A pointer to a structure containing the enabled counters passed from Gator and all the -+ * Mali specific information that will be returned to Gator. -+ * @param opaque_handles A wrapper structure for kbase structures. -+ */ -+extern void kbase_gator_hwcnt_term(struct kbase_gator_hwcnt_info *in_out_info, struct kbase_gator_hwcnt_handles *opaque_handles); ++static const struct file_operations l2_all_counter_src1_fops = { ++ .owner = THIS_MODULE, ++ .write = l2_all_counter_src1_write, ++}; + -+/** -+ * @brief Poll whether a counter dump is successful. -+ * -+ * @param opaque_handles A wrapper structure for kbase structures. -+ * @param[out] success Non-zero on success, zero on failure. -+ * -+ * @return Zero if the dump is still pending, non-zero if the dump has completed. Note that a -+ * completed dump may not have dumped succesfully, so the caller must test for both -+ * a completed and successful dump before processing counters. -+ */ -+extern uint32_t kbase_gator_instr_hwcnt_dump_complete(struct kbase_gator_hwcnt_handles *opaque_handles, uint32_t * const success); ++static ssize_t l2_l2x_counter_valx_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos, u32 src_id) ++{ ++ char buf[64]; ++ int r; ++ u32 src0 = 0; ++ u32 val0 = 0; ++ u32 src1 = 0; ++ u32 val1 = 0; ++ u32 val = -1; ++ struct mali_l2_cache_core *l2_core = (struct mali_l2_cache_core *)filp->private_data; + -+/** -+ * @brief Request the generation of a new counter dump. -+ * -+ * @param opaque_handles A wrapper structure for kbase structures. -+ * -+ * @return Zero if the hardware device is busy and cannot handle the request, non-zero otherwise. -+ */ -+extern uint32_t kbase_gator_instr_hwcnt_dump_irq(struct kbase_gator_hwcnt_handles *opaque_handles); ++ mali_l2_cache_core_get_counter_values(l2_core, &src0, &val0, &src1, &val1); + -+/** -+ * @brief This function is used to fetch the names table based on the Mali device in use. -+ * -+ * @param[out] total_counters The total number of counters short names in the Mali devices' list. -+ * -+ * @return Pointer to an array of strings of length *total_counters. -+ */ -+extern const char * const *kbase_gator_hwcnt_init_names(uint32_t *total_counters); ++ if (0 == src_id) { ++ if (MALI_HW_CORE_NO_COUNTER != val0) { ++ val = val0; ++ } ++ } else { ++ if (MALI_HW_CORE_NO_COUNTER != val1) { ++ val = val1; ++ } ++ } + -+/** -+ * @brief This function is used to terminate the use of the names table. -+ * -+ * This function must only be called if the initial call to kbase_gator_hwcnt_init_names returned a non-NULL value. -+ */ -+extern void kbase_gator_hwcnt_term_names(void); ++ r = snprintf(buf, 64, "%u\n", val); + -+#endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names.h -new file mode 100755 -index 000000000000..24103e292453 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names.h -@@ -0,0 +1,2167 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); ++} + ++static ssize_t l2_l2x_counter_val0_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ return l2_l2x_counter_valx_read(filp, ubuf, cnt, ppos, 0); ++} + ++static ssize_t l2_l2x_counter_val1_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ return l2_l2x_counter_valx_read(filp, ubuf, cnt, ppos, 1); ++} + -+#ifndef _KBASE_GATOR_HWCNT_NAMES_H_ -+#define _KBASE_GATOR_HWCNT_NAMES_H_ ++static const struct file_operations l2_l2x_counter_val0_fops = { ++ .owner = THIS_MODULE, ++ .open = open_copy_private_data, ++ .read = l2_l2x_counter_val0_read, ++}; + -+/* -+ * "Short names" for hardware counters used by Streamline. Counters names are -+ * stored in accordance with their memory layout in the binary counter block -+ * emitted by the Mali GPU. Each "master" in the GPU emits a fixed-size block -+ * of 64 counters, and each GPU implements the same set of "masters" although -+ * the counters each master exposes within its block of 64 may vary. -+ * -+ * Counters which are an empty string are simply "holes" in the counter memory -+ * where no counter exists. -+ */ ++static const struct file_operations l2_l2x_counter_val1_fops = { ++ .owner = THIS_MODULE, ++ .open = open_copy_private_data, ++ .read = l2_l2x_counter_val1_read, ++}; + -+static const char * const hardware_counters_mali_t60x[] = { -+ /* Job Manager */ -+ "", -+ "", -+ "", -+ "", -+ "T60x_MESSAGES_SENT", -+ "T60x_MESSAGES_RECEIVED", -+ "T60x_GPU_ACTIVE", -+ "T60x_IRQ_ACTIVE", -+ "T60x_JS0_JOBS", -+ "T60x_JS0_TASKS", -+ "T60x_JS0_ACTIVE", -+ "", -+ "T60x_JS0_WAIT_READ", -+ "T60x_JS0_WAIT_ISSUE", -+ "T60x_JS0_WAIT_DEPEND", -+ "T60x_JS0_WAIT_FINISH", -+ "T60x_JS1_JOBS", -+ "T60x_JS1_TASKS", -+ "T60x_JS1_ACTIVE", -+ "", -+ "T60x_JS1_WAIT_READ", -+ "T60x_JS1_WAIT_ISSUE", -+ "T60x_JS1_WAIT_DEPEND", -+ "T60x_JS1_WAIT_FINISH", -+ "T60x_JS2_JOBS", -+ "T60x_JS2_TASKS", -+ "T60x_JS2_ACTIVE", -+ "", -+ "T60x_JS2_WAIT_READ", -+ "T60x_JS2_WAIT_ISSUE", -+ "T60x_JS2_WAIT_DEPEND", -+ "T60x_JS2_WAIT_FINISH", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++static ssize_t power_always_on_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ unsigned long val; ++ int ret; ++ char buf[32]; + -+ /*Tiler */ -+ "", -+ "", -+ "", -+ "T60x_TI_JOBS_PROCESSED", -+ "T60x_TI_TRIANGLES", -+ "T60x_TI_QUADS", -+ "T60x_TI_POLYGONS", -+ "T60x_TI_POINTS", -+ "T60x_TI_LINES", -+ "T60x_TI_VCACHE_HIT", -+ "T60x_TI_VCACHE_MISS", -+ "T60x_TI_FRONT_FACING", -+ "T60x_TI_BACK_FACING", -+ "T60x_TI_PRIM_VISIBLE", -+ "T60x_TI_PRIM_CULLED", -+ "T60x_TI_PRIM_CLIPPED", -+ "T60x_TI_LEVEL0", -+ "T60x_TI_LEVEL1", -+ "T60x_TI_LEVEL2", -+ "T60x_TI_LEVEL3", -+ "T60x_TI_LEVEL4", -+ "T60x_TI_LEVEL5", -+ "T60x_TI_LEVEL6", -+ "T60x_TI_LEVEL7", -+ "T60x_TI_COMMAND_1", -+ "T60x_TI_COMMAND_2", -+ "T60x_TI_COMMAND_3", -+ "T60x_TI_COMMAND_4", -+ "T60x_TI_COMMAND_4_7", -+ "T60x_TI_COMMAND_8_15", -+ "T60x_TI_COMMAND_16_63", -+ "T60x_TI_COMMAND_64", -+ "T60x_TI_COMPRESS_IN", -+ "T60x_TI_COMPRESS_OUT", -+ "T60x_TI_COMPRESS_FLUSH", -+ "T60x_TI_TIMESTAMPS", -+ "T60x_TI_PCACHE_HIT", -+ "T60x_TI_PCACHE_MISS", -+ "T60x_TI_PCACHE_LINE", -+ "T60x_TI_PCACHE_STALL", -+ "T60x_TI_WRBUF_HIT", -+ "T60x_TI_WRBUF_MISS", -+ "T60x_TI_WRBUF_LINE", -+ "T60x_TI_WRBUF_PARTIAL", -+ "T60x_TI_WRBUF_STALL", -+ "T60x_TI_ACTIVE", -+ "T60x_TI_LOADING_DESC", -+ "T60x_TI_INDEX_WAIT", -+ "T60x_TI_INDEX_RANGE_WAIT", -+ "T60x_TI_VERTEX_WAIT", -+ "T60x_TI_PCACHE_WAIT", -+ "T60x_TI_WRBUF_WAIT", -+ "T60x_TI_BUS_READ", -+ "T60x_TI_BUS_WRITE", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T60x_TI_UTLB_STALL", -+ "T60x_TI_UTLB_REPLAY_MISS", -+ "T60x_TI_UTLB_REPLAY_FULL", -+ "T60x_TI_UTLB_NEW_MISS", -+ "T60x_TI_UTLB_HIT", ++ cnt = min(cnt, sizeof(buf) - 1); ++ if (copy_from_user(buf, ubuf, cnt)) { ++ return -EFAULT; ++ } ++ buf[cnt] = '\0'; + -+ /* Shader Core */ -+ "", -+ "", -+ "", -+ "", -+ "T60x_FRAG_ACTIVE", -+ "T60x_FRAG_PRIMITIVES", -+ "T60x_FRAG_PRIMITIVES_DROPPED", -+ "T60x_FRAG_CYCLES_DESC", -+ "T60x_FRAG_CYCLES_PLR", -+ "T60x_FRAG_CYCLES_VERT", -+ "T60x_FRAG_CYCLES_TRISETUP", -+ "T60x_FRAG_CYCLES_RAST", -+ "T60x_FRAG_THREADS", -+ "T60x_FRAG_DUMMY_THREADS", -+ "T60x_FRAG_QUADS_RAST", -+ "T60x_FRAG_QUADS_EZS_TEST", -+ "T60x_FRAG_QUADS_EZS_KILLED", -+ "T60x_FRAG_THREADS_LZS_TEST", -+ "T60x_FRAG_THREADS_LZS_KILLED", -+ "T60x_FRAG_CYCLES_NO_TILE", -+ "T60x_FRAG_NUM_TILES", -+ "T60x_FRAG_TRANS_ELIM", -+ "T60x_COMPUTE_ACTIVE", -+ "T60x_COMPUTE_TASKS", -+ "T60x_COMPUTE_THREADS", -+ "T60x_COMPUTE_CYCLES_DESC", -+ "T60x_TRIPIPE_ACTIVE", -+ "T60x_ARITH_WORDS", -+ "T60x_ARITH_CYCLES_REG", -+ "T60x_ARITH_CYCLES_L0", -+ "T60x_ARITH_FRAG_DEPEND", -+ "T60x_LS_WORDS", -+ "T60x_LS_ISSUES", -+ "T60x_LS_RESTARTS", -+ "T60x_LS_REISSUES_MISS", -+ "T60x_LS_REISSUES_VD", -+ "T60x_LS_REISSUE_ATTRIB_MISS", -+ "T60x_LS_NO_WB", -+ "T60x_TEX_WORDS", -+ "T60x_TEX_BUBBLES", -+ "T60x_TEX_WORDS_L0", -+ "T60x_TEX_WORDS_DESC", -+ "T60x_TEX_ISSUES", -+ "T60x_TEX_RECIRC_FMISS", -+ "T60x_TEX_RECIRC_DESC", -+ "T60x_TEX_RECIRC_MULTI", -+ "T60x_TEX_RECIRC_PMISS", -+ "T60x_TEX_RECIRC_CONF", -+ "T60x_LSC_READ_HITS", -+ "T60x_LSC_READ_MISSES", -+ "T60x_LSC_WRITE_HITS", -+ "T60x_LSC_WRITE_MISSES", -+ "T60x_LSC_ATOMIC_HITS", -+ "T60x_LSC_ATOMIC_MISSES", -+ "T60x_LSC_LINE_FETCHES", -+ "T60x_LSC_DIRTY_LINE", -+ "T60x_LSC_SNOOPS", -+ "T60x_AXI_TLB_STALL", -+ "T60x_AXI_TLB_MISS", -+ "T60x_AXI_TLB_TRANSACTION", -+ "T60x_LS_TLB_MISS", -+ "T60x_LS_TLB_HIT", -+ "T60x_AXI_BEATS_READ", -+ "T60x_AXI_BEATS_WRITTEN", ++ ret = kstrtoul(buf, 10, &val); ++ if (0 != ret) { ++ return ret; ++ } + -+ /*L2 and MMU */ -+ "", -+ "", -+ "", -+ "", -+ "T60x_MMU_HIT", -+ "T60x_MMU_NEW_MISS", -+ "T60x_MMU_REPLAY_FULL", -+ "T60x_MMU_REPLAY_MISS", -+ "T60x_MMU_TABLE_WALK", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T60x_UTLB_HIT", -+ "T60x_UTLB_NEW_MISS", -+ "T60x_UTLB_REPLAY_FULL", -+ "T60x_UTLB_REPLAY_MISS", -+ "T60x_UTLB_STALL", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T60x_L2_EXT_WRITE_BEATS", -+ "T60x_L2_EXT_READ_BEATS", -+ "T60x_L2_ANY_LOOKUP", -+ "T60x_L2_READ_LOOKUP", -+ "T60x_L2_SREAD_LOOKUP", -+ "T60x_L2_READ_REPLAY", -+ "T60x_L2_READ_SNOOP", -+ "T60x_L2_READ_HIT", -+ "T60x_L2_CLEAN_MISS", -+ "T60x_L2_WRITE_LOOKUP", -+ "T60x_L2_SWRITE_LOOKUP", -+ "T60x_L2_WRITE_REPLAY", -+ "T60x_L2_WRITE_SNOOP", -+ "T60x_L2_WRITE_HIT", -+ "T60x_L2_EXT_READ_FULL", -+ "T60x_L2_EXT_READ_HALF", -+ "T60x_L2_EXT_WRITE_FULL", -+ "T60x_L2_EXT_WRITE_HALF", -+ "T60x_L2_EXT_READ", -+ "T60x_L2_EXT_READ_LINE", -+ "T60x_L2_EXT_WRITE", -+ "T60x_L2_EXT_WRITE_LINE", -+ "T60x_L2_EXT_WRITE_SMALL", -+ "T60x_L2_EXT_BARRIER", -+ "T60x_L2_EXT_AR_STALL", -+ "T60x_L2_EXT_R_BUF_FULL", -+ "T60x_L2_EXT_RD_BUF_FULL", -+ "T60x_L2_EXT_R_RAW", -+ "T60x_L2_EXT_W_STALL", -+ "T60x_L2_EXT_W_BUF_FULL", -+ "T60x_L2_EXT_R_W_HAZARD", -+ "T60x_L2_TAG_HAZARD", -+ "T60x_L2_SNOOP_FULL", -+ "T60x_L2_REPLAY_FULL" ++ /* Update setting (not exactly thread safe) */ ++ if (1 == val && MALI_FALSE == power_always_on_enabled) { ++ power_always_on_enabled = MALI_TRUE; ++ _mali_osk_pm_dev_ref_get_sync(); ++ } else if (0 == val && MALI_TRUE == power_always_on_enabled) { ++ power_always_on_enabled = MALI_FALSE; ++ _mali_osk_pm_dev_ref_put(); ++ } ++ ++ *ppos += cnt; ++ return cnt; ++} ++ ++static ssize_t power_always_on_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ if (MALI_TRUE == power_always_on_enabled) { ++ return simple_read_from_buffer(ubuf, cnt, ppos, "1\n", 2); ++ } else { ++ return simple_read_from_buffer(ubuf, cnt, ppos, "0\n", 2); ++ } ++} ++ ++static const struct file_operations power_always_on_fops = { ++ .owner = THIS_MODULE, ++ .read = power_always_on_read, ++ .write = power_always_on_write, +}; -+static const char * const hardware_counters_mali_t62x[] = { -+ /* Job Manager */ -+ "", -+ "", -+ "", -+ "", -+ "T62x_MESSAGES_SENT", -+ "T62x_MESSAGES_RECEIVED", -+ "T62x_GPU_ACTIVE", -+ "T62x_IRQ_ACTIVE", -+ "T62x_JS0_JOBS", -+ "T62x_JS0_TASKS", -+ "T62x_JS0_ACTIVE", -+ "", -+ "T62x_JS0_WAIT_READ", -+ "T62x_JS0_WAIT_ISSUE", -+ "T62x_JS0_WAIT_DEPEND", -+ "T62x_JS0_WAIT_FINISH", -+ "T62x_JS1_JOBS", -+ "T62x_JS1_TASKS", -+ "T62x_JS1_ACTIVE", -+ "", -+ "T62x_JS1_WAIT_READ", -+ "T62x_JS1_WAIT_ISSUE", -+ "T62x_JS1_WAIT_DEPEND", -+ "T62x_JS1_WAIT_FINISH", -+ "T62x_JS2_JOBS", -+ "T62x_JS2_TASKS", -+ "T62x_JS2_ACTIVE", -+ "", -+ "T62x_JS2_WAIT_READ", -+ "T62x_JS2_WAIT_ISSUE", -+ "T62x_JS2_WAIT_DEPEND", -+ "T62x_JS2_WAIT_FINISH", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", + -+ /*Tiler */ -+ "", -+ "", -+ "", -+ "T62x_TI_JOBS_PROCESSED", -+ "T62x_TI_TRIANGLES", -+ "T62x_TI_QUADS", -+ "T62x_TI_POLYGONS", -+ "T62x_TI_POINTS", -+ "T62x_TI_LINES", -+ "T62x_TI_VCACHE_HIT", -+ "T62x_TI_VCACHE_MISS", -+ "T62x_TI_FRONT_FACING", -+ "T62x_TI_BACK_FACING", -+ "T62x_TI_PRIM_VISIBLE", -+ "T62x_TI_PRIM_CULLED", -+ "T62x_TI_PRIM_CLIPPED", -+ "T62x_TI_LEVEL0", -+ "T62x_TI_LEVEL1", -+ "T62x_TI_LEVEL2", -+ "T62x_TI_LEVEL3", -+ "T62x_TI_LEVEL4", -+ "T62x_TI_LEVEL5", -+ "T62x_TI_LEVEL6", -+ "T62x_TI_LEVEL7", -+ "T62x_TI_COMMAND_1", -+ "T62x_TI_COMMAND_2", -+ "T62x_TI_COMMAND_3", -+ "T62x_TI_COMMAND_4", -+ "T62x_TI_COMMAND_5_7", -+ "T62x_TI_COMMAND_8_15", -+ "T62x_TI_COMMAND_16_63", -+ "T62x_TI_COMMAND_64", -+ "T62x_TI_COMPRESS_IN", -+ "T62x_TI_COMPRESS_OUT", -+ "T62x_TI_COMPRESS_FLUSH", -+ "T62x_TI_TIMESTAMPS", -+ "T62x_TI_PCACHE_HIT", -+ "T62x_TI_PCACHE_MISS", -+ "T62x_TI_PCACHE_LINE", -+ "T62x_TI_PCACHE_STALL", -+ "T62x_TI_WRBUF_HIT", -+ "T62x_TI_WRBUF_MISS", -+ "T62x_TI_WRBUF_LINE", -+ "T62x_TI_WRBUF_PARTIAL", -+ "T62x_TI_WRBUF_STALL", -+ "T62x_TI_ACTIVE", -+ "T62x_TI_LOADING_DESC", -+ "T62x_TI_INDEX_WAIT", -+ "T62x_TI_INDEX_RANGE_WAIT", -+ "T62x_TI_VERTEX_WAIT", -+ "T62x_TI_PCACHE_WAIT", -+ "T62x_TI_WRBUF_WAIT", -+ "T62x_TI_BUS_READ", -+ "T62x_TI_BUS_WRITE", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T62x_TI_UTLB_STALL", -+ "T62x_TI_UTLB_REPLAY_MISS", -+ "T62x_TI_UTLB_REPLAY_FULL", -+ "T62x_TI_UTLB_NEW_MISS", -+ "T62x_TI_UTLB_HIT", ++static ssize_t power_power_events_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ if (!strncmp(ubuf, mali_power_events[_MALI_DEVICE_SUSPEND], strlen(mali_power_events[_MALI_DEVICE_SUSPEND]) - 1)) { ++ mali_pm_os_suspend(MALI_TRUE); ++ } else if (!strncmp(ubuf, mali_power_events[_MALI_DEVICE_RESUME], strlen(mali_power_events[_MALI_DEVICE_RESUME]) - 1)) { ++ mali_pm_os_resume(); ++ } else if (!strncmp(ubuf, mali_power_events[_MALI_DEVICE_DVFS_PAUSE], strlen(mali_power_events[_MALI_DEVICE_DVFS_PAUSE]) - 1)) { ++ mali_dev_pause(); ++ } else if (!strncmp(ubuf, mali_power_events[_MALI_DEVICE_DVFS_RESUME], strlen(mali_power_events[_MALI_DEVICE_DVFS_RESUME]) - 1)) { ++ mali_dev_resume(); ++ } ++ *ppos += cnt; ++ return cnt; ++} + -+ /* Shader Core */ -+ "", -+ "", -+ "", -+ "T62x_SHADER_CORE_ACTIVE", -+ "T62x_FRAG_ACTIVE", -+ "T62x_FRAG_PRIMITIVES", -+ "T62x_FRAG_PRIMITIVES_DROPPED", -+ "T62x_FRAG_CYCLES_DESC", -+ "T62x_FRAG_CYCLES_FPKQ_ACTIVE", -+ "T62x_FRAG_CYCLES_VERT", -+ "T62x_FRAG_CYCLES_TRISETUP", -+ "T62x_FRAG_CYCLES_EZS_ACTIVE", -+ "T62x_FRAG_THREADS", -+ "T62x_FRAG_DUMMY_THREADS", -+ "T62x_FRAG_QUADS_RAST", -+ "T62x_FRAG_QUADS_EZS_TEST", -+ "T62x_FRAG_QUADS_EZS_KILLED", -+ "T62x_FRAG_THREADS_LZS_TEST", -+ "T62x_FRAG_THREADS_LZS_KILLED", -+ "T62x_FRAG_CYCLES_NO_TILE", -+ "T62x_FRAG_NUM_TILES", -+ "T62x_FRAG_TRANS_ELIM", -+ "T62x_COMPUTE_ACTIVE", -+ "T62x_COMPUTE_TASKS", -+ "T62x_COMPUTE_THREADS", -+ "T62x_COMPUTE_CYCLES_DESC", -+ "T62x_TRIPIPE_ACTIVE", -+ "T62x_ARITH_WORDS", -+ "T62x_ARITH_CYCLES_REG", -+ "T62x_ARITH_CYCLES_L0", -+ "T62x_ARITH_FRAG_DEPEND", -+ "T62x_LS_WORDS", -+ "T62x_LS_ISSUES", -+ "T62x_LS_RESTARTS", -+ "T62x_LS_REISSUES_MISS", -+ "T62x_LS_REISSUES_VD", -+ "T62x_LS_REISSUE_ATTRIB_MISS", -+ "T62x_LS_NO_WB", -+ "T62x_TEX_WORDS", -+ "T62x_TEX_BUBBLES", -+ "T62x_TEX_WORDS_L0", -+ "T62x_TEX_WORDS_DESC", -+ "T62x_TEX_ISSUES", -+ "T62x_TEX_RECIRC_FMISS", -+ "T62x_TEX_RECIRC_DESC", -+ "T62x_TEX_RECIRC_MULTI", -+ "T62x_TEX_RECIRC_PMISS", -+ "T62x_TEX_RECIRC_CONF", -+ "T62x_LSC_READ_HITS", -+ "T62x_LSC_READ_MISSES", -+ "T62x_LSC_WRITE_HITS", -+ "T62x_LSC_WRITE_MISSES", -+ "T62x_LSC_ATOMIC_HITS", -+ "T62x_LSC_ATOMIC_MISSES", -+ "T62x_LSC_LINE_FETCHES", -+ "T62x_LSC_DIRTY_LINE", -+ "T62x_LSC_SNOOPS", -+ "T62x_AXI_TLB_STALL", -+ "T62x_AXI_TLB_MISS", -+ "T62x_AXI_TLB_TRANSACTION", -+ "T62x_LS_TLB_MISS", -+ "T62x_LS_TLB_HIT", -+ "T62x_AXI_BEATS_READ", -+ "T62x_AXI_BEATS_WRITTEN", ++static loff_t power_power_events_seek(struct file *file, loff_t offset, int orig) ++{ ++ file->f_pos = offset; ++ return 0; ++} + -+ /*L2 and MMU */ -+ "", -+ "", -+ "", -+ "", -+ "T62x_MMU_HIT", -+ "T62x_MMU_NEW_MISS", -+ "T62x_MMU_REPLAY_FULL", -+ "T62x_MMU_REPLAY_MISS", -+ "T62x_MMU_TABLE_WALK", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T62x_UTLB_HIT", -+ "T62x_UTLB_NEW_MISS", -+ "T62x_UTLB_REPLAY_FULL", -+ "T62x_UTLB_REPLAY_MISS", -+ "T62x_UTLB_STALL", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T62x_L2_EXT_WRITE_BEATS", -+ "T62x_L2_EXT_READ_BEATS", -+ "T62x_L2_ANY_LOOKUP", -+ "T62x_L2_READ_LOOKUP", -+ "T62x_L2_SREAD_LOOKUP", -+ "T62x_L2_READ_REPLAY", -+ "T62x_L2_READ_SNOOP", -+ "T62x_L2_READ_HIT", -+ "T62x_L2_CLEAN_MISS", -+ "T62x_L2_WRITE_LOOKUP", -+ "T62x_L2_SWRITE_LOOKUP", -+ "T62x_L2_WRITE_REPLAY", -+ "T62x_L2_WRITE_SNOOP", -+ "T62x_L2_WRITE_HIT", -+ "T62x_L2_EXT_READ_FULL", -+ "T62x_L2_EXT_READ_HALF", -+ "T62x_L2_EXT_WRITE_FULL", -+ "T62x_L2_EXT_WRITE_HALF", -+ "T62x_L2_EXT_READ", -+ "T62x_L2_EXT_READ_LINE", -+ "T62x_L2_EXT_WRITE", -+ "T62x_L2_EXT_WRITE_LINE", -+ "T62x_L2_EXT_WRITE_SMALL", -+ "T62x_L2_EXT_BARRIER", -+ "T62x_L2_EXT_AR_STALL", -+ "T62x_L2_EXT_R_BUF_FULL", -+ "T62x_L2_EXT_RD_BUF_FULL", -+ "T62x_L2_EXT_R_RAW", -+ "T62x_L2_EXT_W_STALL", -+ "T62x_L2_EXT_W_BUF_FULL", -+ "T62x_L2_EXT_R_W_HAZARD", -+ "T62x_L2_TAG_HAZARD", -+ "T62x_L2_SNOOP_FULL", -+ "T62x_L2_REPLAY_FULL" ++static const struct file_operations power_power_events_fops = { ++ .owner = THIS_MODULE, ++ .write = power_power_events_write, ++ .llseek = power_power_events_seek, +}; + -+static const char * const hardware_counters_mali_t72x[] = { -+ /* Job Manager */ -+ "", -+ "", -+ "", -+ "", -+ "T72x_GPU_ACTIVE", -+ "T72x_IRQ_ACTIVE", -+ "T72x_JS0_JOBS", -+ "T72x_JS0_TASKS", -+ "T72x_JS0_ACTIVE", -+ "T72x_JS1_JOBS", -+ "T72x_JS1_TASKS", -+ "T72x_JS1_ACTIVE", -+ "T72x_JS2_JOBS", -+ "T72x_JS2_TASKS", -+ "T72x_JS2_ACTIVE", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++#if MALI_STATE_TRACKING ++static int mali_seq_internal_state_show(struct seq_file *seq_file, void *v) ++{ ++ u32 len = 0; ++ u32 size; ++ char *buf; + -+ /*Tiler */ -+ "", -+ "", -+ "", -+ "T72x_TI_JOBS_PROCESSED", -+ "T72x_TI_TRIANGLES", -+ "T72x_TI_QUADS", -+ "T72x_TI_POLYGONS", -+ "T72x_TI_POINTS", -+ "T72x_TI_LINES", -+ "T72x_TI_FRONT_FACING", -+ "T72x_TI_BACK_FACING", -+ "T72x_TI_PRIM_VISIBLE", -+ "T72x_TI_PRIM_CULLED", -+ "T72x_TI_PRIM_CLIPPED", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T72x_TI_ACTIVE", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++ size = seq_get_buf(seq_file, &buf); + -+ /* Shader Core */ -+ "", -+ "", -+ "", -+ "", -+ "T72x_FRAG_ACTIVE", -+ "T72x_FRAG_PRIMITIVES", -+ "T72x_FRAG_PRIMITIVES_DROPPED", -+ "T72x_FRAG_THREADS", -+ "T72x_FRAG_DUMMY_THREADS", -+ "T72x_FRAG_QUADS_RAST", -+ "T72x_FRAG_QUADS_EZS_TEST", -+ "T72x_FRAG_QUADS_EZS_KILLED", -+ "T72x_FRAG_THREADS_LZS_TEST", -+ "T72x_FRAG_THREADS_LZS_KILLED", -+ "T72x_FRAG_CYCLES_NO_TILE", -+ "T72x_FRAG_NUM_TILES", -+ "T72x_FRAG_TRANS_ELIM", -+ "T72x_COMPUTE_ACTIVE", -+ "T72x_COMPUTE_TASKS", -+ "T72x_COMPUTE_THREADS", -+ "T72x_TRIPIPE_ACTIVE", -+ "T72x_ARITH_WORDS", -+ "T72x_ARITH_CYCLES_REG", -+ "T72x_LS_WORDS", -+ "T72x_LS_ISSUES", -+ "T72x_LS_RESTARTS", -+ "T72x_LS_REISSUES_MISS", -+ "T72x_TEX_WORDS", -+ "T72x_TEX_BUBBLES", -+ "T72x_TEX_ISSUES", -+ "T72x_LSC_READ_HITS", -+ "T72x_LSC_READ_MISSES", -+ "T72x_LSC_WRITE_HITS", -+ "T72x_LSC_WRITE_MISSES", -+ "T72x_LSC_ATOMIC_HITS", -+ "T72x_LSC_ATOMIC_MISSES", -+ "T72x_LSC_LINE_FETCHES", -+ "T72x_LSC_DIRTY_LINE", -+ "T72x_LSC_SNOOPS", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++ if (!size) { ++ return -ENOMEM; ++ } + -+ /*L2 and MMU */ -+ "", -+ "", -+ "", -+ "", -+ "T72x_L2_EXT_WRITE_BEAT", -+ "T72x_L2_EXT_READ_BEAT", -+ "T72x_L2_READ_SNOOP", -+ "T72x_L2_READ_HIT", -+ "T72x_L2_WRITE_SNOOP", -+ "T72x_L2_WRITE_HIT", -+ "T72x_L2_EXT_WRITE_SMALL", -+ "T72x_L2_EXT_BARRIER", -+ "T72x_L2_EXT_AR_STALL", -+ "T72x_L2_EXT_W_STALL", -+ "T72x_L2_SNOOP_FULL", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "" -+}; ++ /* Create the internal state dump. */ ++ len = snprintf(buf + len, size - len, "Mali device driver %s\n", SVN_REV_STRING); ++ len += snprintf(buf + len, size - len, "License: %s\n\n", MALI_KERNEL_LINUX_LICENSE); + -+static const char * const hardware_counters_mali_t76x[] = { -+ /* Job Manager */ -+ "", -+ "", -+ "", -+ "", -+ "T76x_MESSAGES_SENT", -+ "T76x_MESSAGES_RECEIVED", -+ "T76x_GPU_ACTIVE", -+ "T76x_IRQ_ACTIVE", -+ "T76x_JS0_JOBS", -+ "T76x_JS0_TASKS", -+ "T76x_JS0_ACTIVE", -+ "", -+ "T76x_JS0_WAIT_READ", -+ "T76x_JS0_WAIT_ISSUE", -+ "T76x_JS0_WAIT_DEPEND", -+ "T76x_JS0_WAIT_FINISH", -+ "T76x_JS1_JOBS", -+ "T76x_JS1_TASKS", -+ "T76x_JS1_ACTIVE", -+ "", -+ "T76x_JS1_WAIT_READ", -+ "T76x_JS1_WAIT_ISSUE", -+ "T76x_JS1_WAIT_DEPEND", -+ "T76x_JS1_WAIT_FINISH", -+ "T76x_JS2_JOBS", -+ "T76x_JS2_TASKS", -+ "T76x_JS2_ACTIVE", -+ "", -+ "T76x_JS2_WAIT_READ", -+ "T76x_JS2_WAIT_ISSUE", -+ "T76x_JS2_WAIT_DEPEND", -+ "T76x_JS2_WAIT_FINISH", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++ len += _mali_kernel_core_dump_state(buf + len, size - len); + -+ /*Tiler */ -+ "", -+ "", -+ "", -+ "T76x_TI_JOBS_PROCESSED", -+ "T76x_TI_TRIANGLES", -+ "T76x_TI_QUADS", -+ "T76x_TI_POLYGONS", -+ "T76x_TI_POINTS", -+ "T76x_TI_LINES", -+ "T76x_TI_VCACHE_HIT", -+ "T76x_TI_VCACHE_MISS", -+ "T76x_TI_FRONT_FACING", -+ "T76x_TI_BACK_FACING", -+ "T76x_TI_PRIM_VISIBLE", -+ "T76x_TI_PRIM_CULLED", -+ "T76x_TI_PRIM_CLIPPED", -+ "T76x_TI_LEVEL0", -+ "T76x_TI_LEVEL1", -+ "T76x_TI_LEVEL2", -+ "T76x_TI_LEVEL3", -+ "T76x_TI_LEVEL4", -+ "T76x_TI_LEVEL5", -+ "T76x_TI_LEVEL6", -+ "T76x_TI_LEVEL7", -+ "T76x_TI_COMMAND_1", -+ "T76x_TI_COMMAND_2", -+ "T76x_TI_COMMAND_3", -+ "T76x_TI_COMMAND_4", -+ "T76x_TI_COMMAND_5_7", -+ "T76x_TI_COMMAND_8_15", -+ "T76x_TI_COMMAND_16_63", -+ "T76x_TI_COMMAND_64", -+ "T76x_TI_COMPRESS_IN", -+ "T76x_TI_COMPRESS_OUT", -+ "T76x_TI_COMPRESS_FLUSH", -+ "T76x_TI_TIMESTAMPS", -+ "T76x_TI_PCACHE_HIT", -+ "T76x_TI_PCACHE_MISS", -+ "T76x_TI_PCACHE_LINE", -+ "T76x_TI_PCACHE_STALL", -+ "T76x_TI_WRBUF_HIT", -+ "T76x_TI_WRBUF_MISS", -+ "T76x_TI_WRBUF_LINE", -+ "T76x_TI_WRBUF_PARTIAL", -+ "T76x_TI_WRBUF_STALL", -+ "T76x_TI_ACTIVE", -+ "T76x_TI_LOADING_DESC", -+ "T76x_TI_INDEX_WAIT", -+ "T76x_TI_INDEX_RANGE_WAIT", -+ "T76x_TI_VERTEX_WAIT", -+ "T76x_TI_PCACHE_WAIT", -+ "T76x_TI_WRBUF_WAIT", -+ "T76x_TI_BUS_READ", -+ "T76x_TI_BUS_WRITE", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T76x_TI_UTLB_HIT", -+ "T76x_TI_UTLB_NEW_MISS", -+ "T76x_TI_UTLB_REPLAY_FULL", -+ "T76x_TI_UTLB_REPLAY_MISS", -+ "T76x_TI_UTLB_STALL", ++ seq_commit(seq_file, len); + -+ /* Shader Core */ -+ "", -+ "", -+ "", -+ "", -+ "T76x_FRAG_ACTIVE", -+ "T76x_FRAG_PRIMITIVES", -+ "T76x_FRAG_PRIMITIVES_DROPPED", -+ "T76x_FRAG_CYCLES_DESC", -+ "T76x_FRAG_CYCLES_FPKQ_ACTIVE", -+ "T76x_FRAG_CYCLES_VERT", -+ "T76x_FRAG_CYCLES_TRISETUP", -+ "T76x_FRAG_CYCLES_EZS_ACTIVE", -+ "T76x_FRAG_THREADS", -+ "T76x_FRAG_DUMMY_THREADS", -+ "T76x_FRAG_QUADS_RAST", -+ "T76x_FRAG_QUADS_EZS_TEST", -+ "T76x_FRAG_QUADS_EZS_KILLED", -+ "T76x_FRAG_THREADS_LZS_TEST", -+ "T76x_FRAG_THREADS_LZS_KILLED", -+ "T76x_FRAG_CYCLES_NO_TILE", -+ "T76x_FRAG_NUM_TILES", -+ "T76x_FRAG_TRANS_ELIM", -+ "T76x_COMPUTE_ACTIVE", -+ "T76x_COMPUTE_TASKS", -+ "T76x_COMPUTE_THREADS", -+ "T76x_COMPUTE_CYCLES_DESC", -+ "T76x_TRIPIPE_ACTIVE", -+ "T76x_ARITH_WORDS", -+ "T76x_ARITH_CYCLES_REG", -+ "T76x_ARITH_CYCLES_L0", -+ "T76x_ARITH_FRAG_DEPEND", -+ "T76x_LS_WORDS", -+ "T76x_LS_ISSUES", -+ "T76x_LS_REISSUE_ATTR", -+ "T76x_LS_REISSUES_VARY", -+ "T76x_LS_VARY_RV_MISS", -+ "T76x_LS_VARY_RV_HIT", -+ "T76x_LS_NO_UNPARK", -+ "T76x_TEX_WORDS", -+ "T76x_TEX_BUBBLES", -+ "T76x_TEX_WORDS_L0", -+ "T76x_TEX_WORDS_DESC", -+ "T76x_TEX_ISSUES", -+ "T76x_TEX_RECIRC_FMISS", -+ "T76x_TEX_RECIRC_DESC", -+ "T76x_TEX_RECIRC_MULTI", -+ "T76x_TEX_RECIRC_PMISS", -+ "T76x_TEX_RECIRC_CONF", -+ "T76x_LSC_READ_HITS", -+ "T76x_LSC_READ_OP", -+ "T76x_LSC_WRITE_HITS", -+ "T76x_LSC_WRITE_OP", -+ "T76x_LSC_ATOMIC_HITS", -+ "T76x_LSC_ATOMIC_OP", -+ "T76x_LSC_LINE_FETCHES", -+ "T76x_LSC_DIRTY_LINE", -+ "T76x_LSC_SNOOPS", -+ "T76x_AXI_TLB_STALL", -+ "T76x_AXI_TLB_MISS", -+ "T76x_AXI_TLB_TRANSACTION", -+ "T76x_LS_TLB_MISS", -+ "T76x_LS_TLB_HIT", -+ "T76x_AXI_BEATS_READ", -+ "T76x_AXI_BEATS_WRITTEN", ++ return 0; ++} + -+ /*L2 and MMU */ -+ "", -+ "", -+ "", -+ "", -+ "T76x_MMU_HIT", -+ "T76x_MMU_NEW_MISS", -+ "T76x_MMU_REPLAY_FULL", -+ "T76x_MMU_REPLAY_MISS", -+ "T76x_MMU_TABLE_WALK", -+ "T76x_MMU_REQUESTS", -+ "", -+ "", -+ "T76x_UTLB_HIT", -+ "T76x_UTLB_NEW_MISS", -+ "T76x_UTLB_REPLAY_FULL", -+ "T76x_UTLB_REPLAY_MISS", -+ "T76x_UTLB_STALL", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T76x_L2_EXT_WRITE_BEATS", -+ "T76x_L2_EXT_READ_BEATS", -+ "T76x_L2_ANY_LOOKUP", -+ "T76x_L2_READ_LOOKUP", -+ "T76x_L2_SREAD_LOOKUP", -+ "T76x_L2_READ_REPLAY", -+ "T76x_L2_READ_SNOOP", -+ "T76x_L2_READ_HIT", -+ "T76x_L2_CLEAN_MISS", -+ "T76x_L2_WRITE_LOOKUP", -+ "T76x_L2_SWRITE_LOOKUP", -+ "T76x_L2_WRITE_REPLAY", -+ "T76x_L2_WRITE_SNOOP", -+ "T76x_L2_WRITE_HIT", -+ "T76x_L2_EXT_READ_FULL", -+ "", -+ "T76x_L2_EXT_WRITE_FULL", -+ "T76x_L2_EXT_R_W_HAZARD", -+ "T76x_L2_EXT_READ", -+ "T76x_L2_EXT_READ_LINE", -+ "T76x_L2_EXT_WRITE", -+ "T76x_L2_EXT_WRITE_LINE", -+ "T76x_L2_EXT_WRITE_SMALL", -+ "T76x_L2_EXT_BARRIER", -+ "T76x_L2_EXT_AR_STALL", -+ "T76x_L2_EXT_R_BUF_FULL", -+ "T76x_L2_EXT_RD_BUF_FULL", -+ "T76x_L2_EXT_R_RAW", -+ "T76x_L2_EXT_W_STALL", -+ "T76x_L2_EXT_W_BUF_FULL", -+ "T76x_L2_EXT_R_BUF_FULL", -+ "T76x_L2_TAG_HAZARD", -+ "T76x_L2_SNOOP_FULL", -+ "T76x_L2_REPLAY_FULL" ++static int mali_seq_internal_state_open(struct inode *inode, struct file *file) ++{ ++ return single_open(file, mali_seq_internal_state_show, NULL); ++} ++ ++static const struct file_operations mali_seq_internal_state_fops = { ++ .owner = THIS_MODULE, ++ .open = mali_seq_internal_state_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, +}; ++#endif /* MALI_STATE_TRACKING */ + -+static const char * const hardware_counters_mali_t82x[] = { -+ /* Job Manager */ -+ "", -+ "", -+ "", -+ "", -+ "T82x_MESSAGES_SENT", -+ "T82x_MESSAGES_RECEIVED", -+ "T82x_GPU_ACTIVE", -+ "T82x_IRQ_ACTIVE", -+ "T82x_JS0_JOBS", -+ "T82x_JS0_TASKS", -+ "T82x_JS0_ACTIVE", -+ "", -+ "T82x_JS0_WAIT_READ", -+ "T82x_JS0_WAIT_ISSUE", -+ "T82x_JS0_WAIT_DEPEND", -+ "T82x_JS0_WAIT_FINISH", -+ "T82x_JS1_JOBS", -+ "T82x_JS1_TASKS", -+ "T82x_JS1_ACTIVE", -+ "", -+ "T82x_JS1_WAIT_READ", -+ "T82x_JS1_WAIT_ISSUE", -+ "T82x_JS1_WAIT_DEPEND", -+ "T82x_JS1_WAIT_FINISH", -+ "T82x_JS2_JOBS", -+ "T82x_JS2_TASKS", -+ "T82x_JS2_ACTIVE", -+ "", -+ "T82x_JS2_WAIT_READ", -+ "T82x_JS2_WAIT_ISSUE", -+ "T82x_JS2_WAIT_DEPEND", -+ "T82x_JS2_WAIT_FINISH", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++#if defined(CONFIG_MALI400_INTERNAL_PROFILING) ++static ssize_t profiling_record_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ char buf[64]; ++ int r; + -+ /*Tiler */ -+ "", -+ "", -+ "", -+ "T82x_TI_JOBS_PROCESSED", -+ "T82x_TI_TRIANGLES", -+ "T82x_TI_QUADS", -+ "T82x_TI_POLYGONS", -+ "T82x_TI_POINTS", -+ "T82x_TI_LINES", -+ "T82x_TI_FRONT_FACING", -+ "T82x_TI_BACK_FACING", -+ "T82x_TI_PRIM_VISIBLE", -+ "T82x_TI_PRIM_CULLED", -+ "T82x_TI_PRIM_CLIPPED", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T82x_TI_ACTIVE", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++ r = snprintf(buf, 64, "%u\n", _mali_internal_profiling_is_recording() ? 1 : 0); ++ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); ++} + -+ /* Shader Core */ -+ "", -+ "", -+ "", -+ "", -+ "T82x_FRAG_ACTIVE", -+ "T82x_FRAG_PRIMITIVES", -+ "T82x_FRAG_PRIMITIVES_DROPPED", -+ "T82x_FRAG_CYCLES_DESC", -+ "T82x_FRAG_CYCLES_FPKQ_ACTIVE", -+ "T82x_FRAG_CYCLES_VERT", -+ "T82x_FRAG_CYCLES_TRISETUP", -+ "T82x_FRAG_CYCLES_EZS_ACTIVE", -+ "T82x_FRAG_THREADS", -+ "T82x_FRAG_DUMMY_THREADS", -+ "T82x_FRAG_QUADS_RAST", -+ "T82x_FRAG_QUADS_EZS_TEST", -+ "T82x_FRAG_QUADS_EZS_KILLED", -+ "T82x_FRAG_THREADS_LZS_TEST", -+ "T82x_FRAG_THREADS_LZS_KILLED", -+ "T82x_FRAG_CYCLES_NO_TILE", -+ "T82x_FRAG_NUM_TILES", -+ "T82x_FRAG_TRANS_ELIM", -+ "T82x_COMPUTE_ACTIVE", -+ "T82x_COMPUTE_TASKS", -+ "T82x_COMPUTE_THREADS", -+ "T82x_COMPUTE_CYCLES_DESC", -+ "T82x_TRIPIPE_ACTIVE", -+ "T82x_ARITH_WORDS", -+ "T82x_ARITH_CYCLES_REG", -+ "T82x_ARITH_CYCLES_L0", -+ "T82x_ARITH_FRAG_DEPEND", -+ "T82x_LS_WORDS", -+ "T82x_LS_ISSUES", -+ "T82x_LS_REISSUE_ATTR", -+ "T82x_LS_REISSUES_VARY", -+ "T82x_LS_VARY_RV_MISS", -+ "T82x_LS_VARY_RV_HIT", -+ "T82x_LS_NO_UNPARK", -+ "T82x_TEX_WORDS", -+ "T82x_TEX_BUBBLES", -+ "T82x_TEX_WORDS_L0", -+ "T82x_TEX_WORDS_DESC", -+ "T82x_TEX_ISSUES", -+ "T82x_TEX_RECIRC_FMISS", -+ "T82x_TEX_RECIRC_DESC", -+ "T82x_TEX_RECIRC_MULTI", -+ "T82x_TEX_RECIRC_PMISS", -+ "T82x_TEX_RECIRC_CONF", -+ "T82x_LSC_READ_HITS", -+ "T82x_LSC_READ_OP", -+ "T82x_LSC_WRITE_HITS", -+ "T82x_LSC_WRITE_OP", -+ "T82x_LSC_ATOMIC_HITS", -+ "T82x_LSC_ATOMIC_OP", -+ "T82x_LSC_LINE_FETCHES", -+ "T82x_LSC_DIRTY_LINE", -+ "T82x_LSC_SNOOPS", -+ "T82x_AXI_TLB_STALL", -+ "T82x_AXI_TLB_MISS", -+ "T82x_AXI_TLB_TRANSACTION", -+ "T82x_LS_TLB_MISS", -+ "T82x_LS_TLB_HIT", -+ "T82x_AXI_BEATS_READ", -+ "T82x_AXI_BEATS_WRITTEN", ++static ssize_t profiling_record_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ char buf[64]; ++ unsigned long val; ++ int ret; + -+ /*L2 and MMU */ -+ "", -+ "", -+ "", -+ "", -+ "T82x_MMU_HIT", -+ "T82x_MMU_NEW_MISS", -+ "T82x_MMU_REPLAY_FULL", -+ "T82x_MMU_REPLAY_MISS", -+ "T82x_MMU_TABLE_WALK", -+ "T82x_MMU_REQUESTS", -+ "", -+ "", -+ "T82x_UTLB_HIT", -+ "T82x_UTLB_NEW_MISS", -+ "T82x_UTLB_REPLAY_FULL", -+ "T82x_UTLB_REPLAY_MISS", -+ "T82x_UTLB_STALL", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T82x_L2_EXT_WRITE_BEATS", -+ "T82x_L2_EXT_READ_BEATS", -+ "T82x_L2_ANY_LOOKUP", -+ "T82x_L2_READ_LOOKUP", -+ "T82x_L2_SREAD_LOOKUP", -+ "T82x_L2_READ_REPLAY", -+ "T82x_L2_READ_SNOOP", -+ "T82x_L2_READ_HIT", -+ "T82x_L2_CLEAN_MISS", -+ "T82x_L2_WRITE_LOOKUP", -+ "T82x_L2_SWRITE_LOOKUP", -+ "T82x_L2_WRITE_REPLAY", -+ "T82x_L2_WRITE_SNOOP", -+ "T82x_L2_WRITE_HIT", -+ "T82x_L2_EXT_READ_FULL", -+ "", -+ "T82x_L2_EXT_WRITE_FULL", -+ "T82x_L2_EXT_R_W_HAZARD", -+ "T82x_L2_EXT_READ", -+ "T82x_L2_EXT_READ_LINE", -+ "T82x_L2_EXT_WRITE", -+ "T82x_L2_EXT_WRITE_LINE", -+ "T82x_L2_EXT_WRITE_SMALL", -+ "T82x_L2_EXT_BARRIER", -+ "T82x_L2_EXT_AR_STALL", -+ "T82x_L2_EXT_R_BUF_FULL", -+ "T82x_L2_EXT_RD_BUF_FULL", -+ "T82x_L2_EXT_R_RAW", -+ "T82x_L2_EXT_W_STALL", -+ "T82x_L2_EXT_W_BUF_FULL", -+ "T82x_L2_EXT_R_BUF_FULL", -+ "T82x_L2_TAG_HAZARD", -+ "T82x_L2_SNOOP_FULL", -+ "T82x_L2_REPLAY_FULL" -+}; ++ if (cnt >= sizeof(buf)) { ++ return -EINVAL; ++ } + -+static const char * const hardware_counters_mali_t83x[] = { -+ /* Job Manager */ -+ "", -+ "", -+ "", -+ "", -+ "T83x_MESSAGES_SENT", -+ "T83x_MESSAGES_RECEIVED", -+ "T83x_GPU_ACTIVE", -+ "T83x_IRQ_ACTIVE", -+ "T83x_JS0_JOBS", -+ "T83x_JS0_TASKS", -+ "T83x_JS0_ACTIVE", -+ "", -+ "T83x_JS0_WAIT_READ", -+ "T83x_JS0_WAIT_ISSUE", -+ "T83x_JS0_WAIT_DEPEND", -+ "T83x_JS0_WAIT_FINISH", -+ "T83x_JS1_JOBS", -+ "T83x_JS1_TASKS", -+ "T83x_JS1_ACTIVE", -+ "", -+ "T83x_JS1_WAIT_READ", -+ "T83x_JS1_WAIT_ISSUE", -+ "T83x_JS1_WAIT_DEPEND", -+ "T83x_JS1_WAIT_FINISH", -+ "T83x_JS2_JOBS", -+ "T83x_JS2_TASKS", -+ "T83x_JS2_ACTIVE", -+ "", -+ "T83x_JS2_WAIT_READ", -+ "T83x_JS2_WAIT_ISSUE", -+ "T83x_JS2_WAIT_DEPEND", -+ "T83x_JS2_WAIT_FINISH", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++ if (copy_from_user(&buf, ubuf, cnt)) { ++ return -EFAULT; ++ } + -+ /*Tiler */ -+ "", -+ "", -+ "", -+ "T83x_TI_JOBS_PROCESSED", -+ "T83x_TI_TRIANGLES", -+ "T83x_TI_QUADS", -+ "T83x_TI_POLYGONS", -+ "T83x_TI_POINTS", -+ "T83x_TI_LINES", -+ "T83x_TI_FRONT_FACING", -+ "T83x_TI_BACK_FACING", -+ "T83x_TI_PRIM_VISIBLE", -+ "T83x_TI_PRIM_CULLED", -+ "T83x_TI_PRIM_CLIPPED", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T83x_TI_ACTIVE", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++ buf[cnt] = 0; + -+ /* Shader Core */ -+ "", -+ "", -+ "", -+ "", -+ "T83x_FRAG_ACTIVE", -+ "T83x_FRAG_PRIMITIVES", -+ "T83x_FRAG_PRIMITIVES_DROPPED", -+ "T83x_FRAG_CYCLES_DESC", -+ "T83x_FRAG_CYCLES_FPKQ_ACTIVE", -+ "T83x_FRAG_CYCLES_VERT", -+ "T83x_FRAG_CYCLES_TRISETUP", -+ "T83x_FRAG_CYCLES_EZS_ACTIVE", -+ "T83x_FRAG_THREADS", -+ "T83x_FRAG_DUMMY_THREADS", -+ "T83x_FRAG_QUADS_RAST", -+ "T83x_FRAG_QUADS_EZS_TEST", -+ "T83x_FRAG_QUADS_EZS_KILLED", -+ "T83x_FRAG_THREADS_LZS_TEST", -+ "T83x_FRAG_THREADS_LZS_KILLED", -+ "T83x_FRAG_CYCLES_NO_TILE", -+ "T83x_FRAG_NUM_TILES", -+ "T83x_FRAG_TRANS_ELIM", -+ "T83x_COMPUTE_ACTIVE", -+ "T83x_COMPUTE_TASKS", -+ "T83x_COMPUTE_THREADS", -+ "T83x_COMPUTE_CYCLES_DESC", -+ "T83x_TRIPIPE_ACTIVE", -+ "T83x_ARITH_WORDS", -+ "T83x_ARITH_CYCLES_REG", -+ "T83x_ARITH_CYCLES_L0", -+ "T83x_ARITH_FRAG_DEPEND", -+ "T83x_LS_WORDS", -+ "T83x_LS_ISSUES", -+ "T83x_LS_REISSUE_ATTR", -+ "T83x_LS_REISSUES_VARY", -+ "T83x_LS_VARY_RV_MISS", -+ "T83x_LS_VARY_RV_HIT", -+ "T83x_LS_NO_UNPARK", -+ "T83x_TEX_WORDS", -+ "T83x_TEX_BUBBLES", -+ "T83x_TEX_WORDS_L0", -+ "T83x_TEX_WORDS_DESC", -+ "T83x_TEX_ISSUES", -+ "T83x_TEX_RECIRC_FMISS", -+ "T83x_TEX_RECIRC_DESC", -+ "T83x_TEX_RECIRC_MULTI", -+ "T83x_TEX_RECIRC_PMISS", -+ "T83x_TEX_RECIRC_CONF", -+ "T83x_LSC_READ_HITS", -+ "T83x_LSC_READ_OP", -+ "T83x_LSC_WRITE_HITS", -+ "T83x_LSC_WRITE_OP", -+ "T83x_LSC_ATOMIC_HITS", -+ "T83x_LSC_ATOMIC_OP", -+ "T83x_LSC_LINE_FETCHES", -+ "T83x_LSC_DIRTY_LINE", -+ "T83x_LSC_SNOOPS", -+ "T83x_AXI_TLB_STALL", -+ "T83x_AXI_TLB_MISS", -+ "T83x_AXI_TLB_TRANSACTION", -+ "T83x_LS_TLB_MISS", -+ "T83x_LS_TLB_HIT", -+ "T83x_AXI_BEATS_READ", -+ "T83x_AXI_BEATS_WRITTEN", ++ ret = kstrtoul(buf, 10, &val); ++ if (ret < 0) { ++ return ret; ++ } + -+ /*L2 and MMU */ -+ "", -+ "", -+ "", -+ "", -+ "T83x_MMU_HIT", -+ "T83x_MMU_NEW_MISS", -+ "T83x_MMU_REPLAY_FULL", -+ "T83x_MMU_REPLAY_MISS", -+ "T83x_MMU_TABLE_WALK", -+ "T83x_MMU_REQUESTS", -+ "", -+ "", -+ "T83x_UTLB_HIT", -+ "T83x_UTLB_NEW_MISS", -+ "T83x_UTLB_REPLAY_FULL", -+ "T83x_UTLB_REPLAY_MISS", -+ "T83x_UTLB_STALL", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T83x_L2_EXT_WRITE_BEATS", -+ "T83x_L2_EXT_READ_BEATS", -+ "T83x_L2_ANY_LOOKUP", -+ "T83x_L2_READ_LOOKUP", -+ "T83x_L2_SREAD_LOOKUP", -+ "T83x_L2_READ_REPLAY", -+ "T83x_L2_READ_SNOOP", -+ "T83x_L2_READ_HIT", -+ "T83x_L2_CLEAN_MISS", -+ "T83x_L2_WRITE_LOOKUP", -+ "T83x_L2_SWRITE_LOOKUP", -+ "T83x_L2_WRITE_REPLAY", -+ "T83x_L2_WRITE_SNOOP", -+ "T83x_L2_WRITE_HIT", -+ "T83x_L2_EXT_READ_FULL", -+ "", -+ "T83x_L2_EXT_WRITE_FULL", -+ "T83x_L2_EXT_R_W_HAZARD", -+ "T83x_L2_EXT_READ", -+ "T83x_L2_EXT_READ_LINE", -+ "T83x_L2_EXT_WRITE", -+ "T83x_L2_EXT_WRITE_LINE", -+ "T83x_L2_EXT_WRITE_SMALL", -+ "T83x_L2_EXT_BARRIER", -+ "T83x_L2_EXT_AR_STALL", -+ "T83x_L2_EXT_R_BUF_FULL", -+ "T83x_L2_EXT_RD_BUF_FULL", -+ "T83x_L2_EXT_R_RAW", -+ "T83x_L2_EXT_W_STALL", -+ "T83x_L2_EXT_W_BUF_FULL", -+ "T83x_L2_EXT_R_BUF_FULL", -+ "T83x_L2_TAG_HAZARD", -+ "T83x_L2_SNOOP_FULL", -+ "T83x_L2_REPLAY_FULL" ++ if (val != 0) { ++ u32 limit = MALI_PROFILING_MAX_BUFFER_ENTRIES; /* This can be made configurable at a later stage if we need to */ ++ ++ /* check if we are already recording */ ++ if (MALI_TRUE == _mali_internal_profiling_is_recording()) { ++ MALI_DEBUG_PRINT(3, ("Recording of profiling events already in progress\n")); ++ return -EFAULT; ++ } ++ ++ /* check if we need to clear out an old recording first */ ++ if (MALI_TRUE == _mali_internal_profiling_have_recording()) { ++ if (_MALI_OSK_ERR_OK != _mali_internal_profiling_clear()) { ++ MALI_DEBUG_PRINT(3, ("Failed to clear existing recording of profiling events\n")); ++ return -EFAULT; ++ } ++ } ++ ++ /* start recording profiling data */ ++ if (_MALI_OSK_ERR_OK != _mali_internal_profiling_start(&limit)) { ++ MALI_DEBUG_PRINT(3, ("Failed to start recording of profiling events\n")); ++ return -EFAULT; ++ } ++ ++ MALI_DEBUG_PRINT(3, ("Profiling recording started (max %u events)\n", limit)); ++ } else { ++ /* stop recording profiling data */ ++ u32 count = 0; ++ if (_MALI_OSK_ERR_OK != _mali_internal_profiling_stop(&count)) { ++ MALI_DEBUG_PRINT(2, ("Failed to stop recording of profiling events\n")); ++ return -EFAULT; ++ } ++ ++ MALI_DEBUG_PRINT(2, ("Profiling recording stopped (recorded %u events)\n", count)); ++ } ++ ++ *ppos += cnt; ++ return cnt; ++} ++ ++static const struct file_operations profiling_record_fops = { ++ .owner = THIS_MODULE, ++ .read = profiling_record_read, ++ .write = profiling_record_write, +}; + -+static const char * const hardware_counters_mali_t86x[] = { -+ /* Job Manager */ -+ "", -+ "", -+ "", -+ "", -+ "T86x_MESSAGES_SENT", -+ "T86x_MESSAGES_RECEIVED", -+ "T86x_GPU_ACTIVE", -+ "T86x_IRQ_ACTIVE", -+ "T86x_JS0_JOBS", -+ "T86x_JS0_TASKS", -+ "T86x_JS0_ACTIVE", -+ "", -+ "T86x_JS0_WAIT_READ", -+ "T86x_JS0_WAIT_ISSUE", -+ "T86x_JS0_WAIT_DEPEND", -+ "T86x_JS0_WAIT_FINISH", -+ "T86x_JS1_JOBS", -+ "T86x_JS1_TASKS", -+ "T86x_JS1_ACTIVE", -+ "", -+ "T86x_JS1_WAIT_READ", -+ "T86x_JS1_WAIT_ISSUE", -+ "T86x_JS1_WAIT_DEPEND", -+ "T86x_JS1_WAIT_FINISH", -+ "T86x_JS2_JOBS", -+ "T86x_JS2_TASKS", -+ "T86x_JS2_ACTIVE", -+ "", -+ "T86x_JS2_WAIT_READ", -+ "T86x_JS2_WAIT_ISSUE", -+ "T86x_JS2_WAIT_DEPEND", -+ "T86x_JS2_WAIT_FINISH", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++static void *profiling_events_start(struct seq_file *s, loff_t *pos) ++{ ++ loff_t *spos; + -+ /*Tiler */ -+ "", -+ "", -+ "", -+ "T86x_TI_JOBS_PROCESSED", -+ "T86x_TI_TRIANGLES", -+ "T86x_TI_QUADS", -+ "T86x_TI_POLYGONS", -+ "T86x_TI_POINTS", -+ "T86x_TI_LINES", -+ "T86x_TI_VCACHE_HIT", -+ "T86x_TI_VCACHE_MISS", -+ "T86x_TI_FRONT_FACING", -+ "T86x_TI_BACK_FACING", -+ "T86x_TI_PRIM_VISIBLE", -+ "T86x_TI_PRIM_CULLED", -+ "T86x_TI_PRIM_CLIPPED", -+ "T86x_TI_LEVEL0", -+ "T86x_TI_LEVEL1", -+ "T86x_TI_LEVEL2", -+ "T86x_TI_LEVEL3", -+ "T86x_TI_LEVEL4", -+ "T86x_TI_LEVEL5", -+ "T86x_TI_LEVEL6", -+ "T86x_TI_LEVEL7", -+ "T86x_TI_COMMAND_1", -+ "T86x_TI_COMMAND_2", -+ "T86x_TI_COMMAND_3", -+ "T86x_TI_COMMAND_4", -+ "T86x_TI_COMMAND_5_7", -+ "T86x_TI_COMMAND_8_15", -+ "T86x_TI_COMMAND_16_63", -+ "T86x_TI_COMMAND_64", -+ "T86x_TI_COMPRESS_IN", -+ "T86x_TI_COMPRESS_OUT", -+ "T86x_TI_COMPRESS_FLUSH", -+ "T86x_TI_TIMESTAMPS", -+ "T86x_TI_PCACHE_HIT", -+ "T86x_TI_PCACHE_MISS", -+ "T86x_TI_PCACHE_LINE", -+ "T86x_TI_PCACHE_STALL", -+ "T86x_TI_WRBUF_HIT", -+ "T86x_TI_WRBUF_MISS", -+ "T86x_TI_WRBUF_LINE", -+ "T86x_TI_WRBUF_PARTIAL", -+ "T86x_TI_WRBUF_STALL", -+ "T86x_TI_ACTIVE", -+ "T86x_TI_LOADING_DESC", -+ "T86x_TI_INDEX_WAIT", -+ "T86x_TI_INDEX_RANGE_WAIT", -+ "T86x_TI_VERTEX_WAIT", -+ "T86x_TI_PCACHE_WAIT", -+ "T86x_TI_WRBUF_WAIT", -+ "T86x_TI_BUS_READ", -+ "T86x_TI_BUS_WRITE", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T86x_TI_UTLB_HIT", -+ "T86x_TI_UTLB_NEW_MISS", -+ "T86x_TI_UTLB_REPLAY_FULL", -+ "T86x_TI_UTLB_REPLAY_MISS", -+ "T86x_TI_UTLB_STALL", ++ /* check if we have data avaiable */ ++ if (MALI_TRUE != _mali_internal_profiling_have_recording()) { ++ return NULL; ++ } + -+ /* Shader Core */ -+ "", -+ "", -+ "", -+ "", -+ "T86x_FRAG_ACTIVE", -+ "T86x_FRAG_PRIMITIVES", -+ "T86x_FRAG_PRIMITIVES_DROPPED", -+ "T86x_FRAG_CYCLES_DESC", -+ "T86x_FRAG_CYCLES_FPKQ_ACTIVE", -+ "T86x_FRAG_CYCLES_VERT", -+ "T86x_FRAG_CYCLES_TRISETUP", -+ "T86x_FRAG_CYCLES_EZS_ACTIVE", -+ "T86x_FRAG_THREADS", -+ "T86x_FRAG_DUMMY_THREADS", -+ "T86x_FRAG_QUADS_RAST", -+ "T86x_FRAG_QUADS_EZS_TEST", -+ "T86x_FRAG_QUADS_EZS_KILLED", -+ "T86x_FRAG_THREADS_LZS_TEST", -+ "T86x_FRAG_THREADS_LZS_KILLED", -+ "T86x_FRAG_CYCLES_NO_TILE", -+ "T86x_FRAG_NUM_TILES", -+ "T86x_FRAG_TRANS_ELIM", -+ "T86x_COMPUTE_ACTIVE", -+ "T86x_COMPUTE_TASKS", -+ "T86x_COMPUTE_THREADS", -+ "T86x_COMPUTE_CYCLES_DESC", -+ "T86x_TRIPIPE_ACTIVE", -+ "T86x_ARITH_WORDS", -+ "T86x_ARITH_CYCLES_REG", -+ "T86x_ARITH_CYCLES_L0", -+ "T86x_ARITH_FRAG_DEPEND", -+ "T86x_LS_WORDS", -+ "T86x_LS_ISSUES", -+ "T86x_LS_REISSUE_ATTR", -+ "T86x_LS_REISSUES_VARY", -+ "T86x_LS_VARY_RV_MISS", -+ "T86x_LS_VARY_RV_HIT", -+ "T86x_LS_NO_UNPARK", -+ "T86x_TEX_WORDS", -+ "T86x_TEX_BUBBLES", -+ "T86x_TEX_WORDS_L0", -+ "T86x_TEX_WORDS_DESC", -+ "T86x_TEX_ISSUES", -+ "T86x_TEX_RECIRC_FMISS", -+ "T86x_TEX_RECIRC_DESC", -+ "T86x_TEX_RECIRC_MULTI", -+ "T86x_TEX_RECIRC_PMISS", -+ "T86x_TEX_RECIRC_CONF", -+ "T86x_LSC_READ_HITS", -+ "T86x_LSC_READ_OP", -+ "T86x_LSC_WRITE_HITS", -+ "T86x_LSC_WRITE_OP", -+ "T86x_LSC_ATOMIC_HITS", -+ "T86x_LSC_ATOMIC_OP", -+ "T86x_LSC_LINE_FETCHES", -+ "T86x_LSC_DIRTY_LINE", -+ "T86x_LSC_SNOOPS", -+ "T86x_AXI_TLB_STALL", -+ "T86x_AXI_TLB_MISS", -+ "T86x_AXI_TLB_TRANSACTION", -+ "T86x_LS_TLB_MISS", -+ "T86x_LS_TLB_HIT", -+ "T86x_AXI_BEATS_READ", -+ "T86x_AXI_BEATS_WRITTEN", ++ spos = kmalloc(sizeof(loff_t), GFP_KERNEL); ++ if (NULL == spos) { ++ return NULL; ++ } + -+ /*L2 and MMU */ -+ "", -+ "", -+ "", -+ "", -+ "T86x_MMU_HIT", -+ "T86x_MMU_NEW_MISS", -+ "T86x_MMU_REPLAY_FULL", -+ "T86x_MMU_REPLAY_MISS", -+ "T86x_MMU_TABLE_WALK", -+ "T86x_MMU_REQUESTS", -+ "", -+ "", -+ "T86x_UTLB_HIT", -+ "T86x_UTLB_NEW_MISS", -+ "T86x_UTLB_REPLAY_FULL", -+ "T86x_UTLB_REPLAY_MISS", -+ "T86x_UTLB_STALL", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T86x_L2_EXT_WRITE_BEATS", -+ "T86x_L2_EXT_READ_BEATS", -+ "T86x_L2_ANY_LOOKUP", -+ "T86x_L2_READ_LOOKUP", -+ "T86x_L2_SREAD_LOOKUP", -+ "T86x_L2_READ_REPLAY", -+ "T86x_L2_READ_SNOOP", -+ "T86x_L2_READ_HIT", -+ "T86x_L2_CLEAN_MISS", -+ "T86x_L2_WRITE_LOOKUP", -+ "T86x_L2_SWRITE_LOOKUP", -+ "T86x_L2_WRITE_REPLAY", -+ "T86x_L2_WRITE_SNOOP", -+ "T86x_L2_WRITE_HIT", -+ "T86x_L2_EXT_READ_FULL", -+ "", -+ "T86x_L2_EXT_WRITE_FULL", -+ "T86x_L2_EXT_R_W_HAZARD", -+ "T86x_L2_EXT_READ", -+ "T86x_L2_EXT_READ_LINE", -+ "T86x_L2_EXT_WRITE", -+ "T86x_L2_EXT_WRITE_LINE", -+ "T86x_L2_EXT_WRITE_SMALL", -+ "T86x_L2_EXT_BARRIER", -+ "T86x_L2_EXT_AR_STALL", -+ "T86x_L2_EXT_R_BUF_FULL", -+ "T86x_L2_EXT_RD_BUF_FULL", -+ "T86x_L2_EXT_R_RAW", -+ "T86x_L2_EXT_W_STALL", -+ "T86x_L2_EXT_W_BUF_FULL", -+ "T86x_L2_EXT_R_BUF_FULL", -+ "T86x_L2_TAG_HAZARD", -+ "T86x_L2_SNOOP_FULL", -+ "T86x_L2_REPLAY_FULL" -+}; ++ *spos = *pos; ++ return spos; ++} + -+static const char * const hardware_counters_mali_t88x[] = { -+ /* Job Manager */ -+ "", -+ "", -+ "", -+ "", -+ "T88x_MESSAGES_SENT", -+ "T88x_MESSAGES_RECEIVED", -+ "T88x_GPU_ACTIVE", -+ "T88x_IRQ_ACTIVE", -+ "T88x_JS0_JOBS", -+ "T88x_JS0_TASKS", -+ "T88x_JS0_ACTIVE", -+ "", -+ "T88x_JS0_WAIT_READ", -+ "T88x_JS0_WAIT_ISSUE", -+ "T88x_JS0_WAIT_DEPEND", -+ "T88x_JS0_WAIT_FINISH", -+ "T88x_JS1_JOBS", -+ "T88x_JS1_TASKS", -+ "T88x_JS1_ACTIVE", -+ "", -+ "T88x_JS1_WAIT_READ", -+ "T88x_JS1_WAIT_ISSUE", -+ "T88x_JS1_WAIT_DEPEND", -+ "T88x_JS1_WAIT_FINISH", -+ "T88x_JS2_JOBS", -+ "T88x_JS2_TASKS", -+ "T88x_JS2_ACTIVE", -+ "", -+ "T88x_JS2_WAIT_READ", -+ "T88x_JS2_WAIT_ISSUE", -+ "T88x_JS2_WAIT_DEPEND", -+ "T88x_JS2_WAIT_FINISH", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++static void *profiling_events_next(struct seq_file *s, void *v, loff_t *pos) ++{ ++ loff_t *spos = v; + -+ /*Tiler */ -+ "", -+ "", -+ "", -+ "T88x_TI_JOBS_PROCESSED", -+ "T88x_TI_TRIANGLES", -+ "T88x_TI_QUADS", -+ "T88x_TI_POLYGONS", -+ "T88x_TI_POINTS", -+ "T88x_TI_LINES", -+ "T88x_TI_VCACHE_HIT", -+ "T88x_TI_VCACHE_MISS", -+ "T88x_TI_FRONT_FACING", -+ "T88x_TI_BACK_FACING", -+ "T88x_TI_PRIM_VISIBLE", -+ "T88x_TI_PRIM_CULLED", -+ "T88x_TI_PRIM_CLIPPED", -+ "T88x_TI_LEVEL0", -+ "T88x_TI_LEVEL1", -+ "T88x_TI_LEVEL2", -+ "T88x_TI_LEVEL3", -+ "T88x_TI_LEVEL4", -+ "T88x_TI_LEVEL5", -+ "T88x_TI_LEVEL6", -+ "T88x_TI_LEVEL7", -+ "T88x_TI_COMMAND_1", -+ "T88x_TI_COMMAND_2", -+ "T88x_TI_COMMAND_3", -+ "T88x_TI_COMMAND_4", -+ "T88x_TI_COMMAND_5_7", -+ "T88x_TI_COMMAND_8_15", -+ "T88x_TI_COMMAND_16_63", -+ "T88x_TI_COMMAND_64", -+ "T88x_TI_COMPRESS_IN", -+ "T88x_TI_COMPRESS_OUT", -+ "T88x_TI_COMPRESS_FLUSH", -+ "T88x_TI_TIMESTAMPS", -+ "T88x_TI_PCACHE_HIT", -+ "T88x_TI_PCACHE_MISS", -+ "T88x_TI_PCACHE_LINE", -+ "T88x_TI_PCACHE_STALL", -+ "T88x_TI_WRBUF_HIT", -+ "T88x_TI_WRBUF_MISS", -+ "T88x_TI_WRBUF_LINE", -+ "T88x_TI_WRBUF_PARTIAL", -+ "T88x_TI_WRBUF_STALL", -+ "T88x_TI_ACTIVE", -+ "T88x_TI_LOADING_DESC", -+ "T88x_TI_INDEX_WAIT", -+ "T88x_TI_INDEX_RANGE_WAIT", -+ "T88x_TI_VERTEX_WAIT", -+ "T88x_TI_PCACHE_WAIT", -+ "T88x_TI_WRBUF_WAIT", -+ "T88x_TI_BUS_READ", -+ "T88x_TI_BUS_WRITE", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T88x_TI_UTLB_HIT", -+ "T88x_TI_UTLB_NEW_MISS", -+ "T88x_TI_UTLB_REPLAY_FULL", -+ "T88x_TI_UTLB_REPLAY_MISS", -+ "T88x_TI_UTLB_STALL", ++ /* check if we have data avaiable */ ++ if (MALI_TRUE != _mali_internal_profiling_have_recording()) { ++ return NULL; ++ } + -+ /* Shader Core */ -+ "", -+ "", -+ "", -+ "", -+ "T88x_FRAG_ACTIVE", -+ "T88x_FRAG_PRIMITIVES", -+ "T88x_FRAG_PRIMITIVES_DROPPED", -+ "T88x_FRAG_CYCLES_DESC", -+ "T88x_FRAG_CYCLES_FPKQ_ACTIVE", -+ "T88x_FRAG_CYCLES_VERT", -+ "T88x_FRAG_CYCLES_TRISETUP", -+ "T88x_FRAG_CYCLES_EZS_ACTIVE", -+ "T88x_FRAG_THREADS", -+ "T88x_FRAG_DUMMY_THREADS", -+ "T88x_FRAG_QUADS_RAST", -+ "T88x_FRAG_QUADS_EZS_TEST", -+ "T88x_FRAG_QUADS_EZS_KILLED", -+ "T88x_FRAG_THREADS_LZS_TEST", -+ "T88x_FRAG_THREADS_LZS_KILLED", -+ "T88x_FRAG_CYCLES_NO_TILE", -+ "T88x_FRAG_NUM_TILES", -+ "T88x_FRAG_TRANS_ELIM", -+ "T88x_COMPUTE_ACTIVE", -+ "T88x_COMPUTE_TASKS", -+ "T88x_COMPUTE_THREADS", -+ "T88x_COMPUTE_CYCLES_DESC", -+ "T88x_TRIPIPE_ACTIVE", -+ "T88x_ARITH_WORDS", -+ "T88x_ARITH_CYCLES_REG", -+ "T88x_ARITH_CYCLES_L0", -+ "T88x_ARITH_FRAG_DEPEND", -+ "T88x_LS_WORDS", -+ "T88x_LS_ISSUES", -+ "T88x_LS_REISSUE_ATTR", -+ "T88x_LS_REISSUES_VARY", -+ "T88x_LS_VARY_RV_MISS", -+ "T88x_LS_VARY_RV_HIT", -+ "T88x_LS_NO_UNPARK", -+ "T88x_TEX_WORDS", -+ "T88x_TEX_BUBBLES", -+ "T88x_TEX_WORDS_L0", -+ "T88x_TEX_WORDS_DESC", -+ "T88x_TEX_ISSUES", -+ "T88x_TEX_RECIRC_FMISS", -+ "T88x_TEX_RECIRC_DESC", -+ "T88x_TEX_RECIRC_MULTI", -+ "T88x_TEX_RECIRC_PMISS", -+ "T88x_TEX_RECIRC_CONF", -+ "T88x_LSC_READ_HITS", -+ "T88x_LSC_READ_OP", -+ "T88x_LSC_WRITE_HITS", -+ "T88x_LSC_WRITE_OP", -+ "T88x_LSC_ATOMIC_HITS", -+ "T88x_LSC_ATOMIC_OP", -+ "T88x_LSC_LINE_FETCHES", -+ "T88x_LSC_DIRTY_LINE", -+ "T88x_LSC_SNOOPS", -+ "T88x_AXI_TLB_STALL", -+ "T88x_AXI_TLB_MISS", -+ "T88x_AXI_TLB_TRANSACTION", -+ "T88x_LS_TLB_MISS", -+ "T88x_LS_TLB_HIT", -+ "T88x_AXI_BEATS_READ", -+ "T88x_AXI_BEATS_WRITTEN", ++ /* check if the next entry actually is avaiable */ ++ if (_mali_internal_profiling_get_count() <= (u32)(*spos + 1)) { ++ return NULL; ++ } + -+ /*L2 and MMU */ -+ "", -+ "", -+ "", -+ "", -+ "T88x_MMU_HIT", -+ "T88x_MMU_NEW_MISS", -+ "T88x_MMU_REPLAY_FULL", -+ "T88x_MMU_REPLAY_MISS", -+ "T88x_MMU_TABLE_WALK", -+ "T88x_MMU_REQUESTS", -+ "", -+ "", -+ "T88x_UTLB_HIT", -+ "T88x_UTLB_NEW_MISS", -+ "T88x_UTLB_REPLAY_FULL", -+ "T88x_UTLB_REPLAY_MISS", -+ "T88x_UTLB_STALL", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "T88x_L2_EXT_WRITE_BEATS", -+ "T88x_L2_EXT_READ_BEATS", -+ "T88x_L2_ANY_LOOKUP", -+ "T88x_L2_READ_LOOKUP", -+ "T88x_L2_SREAD_LOOKUP", -+ "T88x_L2_READ_REPLAY", -+ "T88x_L2_READ_SNOOP", -+ "T88x_L2_READ_HIT", -+ "T88x_L2_CLEAN_MISS", -+ "T88x_L2_WRITE_LOOKUP", -+ "T88x_L2_SWRITE_LOOKUP", -+ "T88x_L2_WRITE_REPLAY", -+ "T88x_L2_WRITE_SNOOP", -+ "T88x_L2_WRITE_HIT", -+ "T88x_L2_EXT_READ_FULL", -+ "", -+ "T88x_L2_EXT_WRITE_FULL", -+ "T88x_L2_EXT_R_W_HAZARD", -+ "T88x_L2_EXT_READ", -+ "T88x_L2_EXT_READ_LINE", -+ "T88x_L2_EXT_WRITE", -+ "T88x_L2_EXT_WRITE_LINE", -+ "T88x_L2_EXT_WRITE_SMALL", -+ "T88x_L2_EXT_BARRIER", -+ "T88x_L2_EXT_AR_STALL", -+ "T88x_L2_EXT_R_BUF_FULL", -+ "T88x_L2_EXT_RD_BUF_FULL", -+ "T88x_L2_EXT_R_RAW", -+ "T88x_L2_EXT_W_STALL", -+ "T88x_L2_EXT_W_BUF_FULL", -+ "T88x_L2_EXT_R_BUF_FULL", -+ "T88x_L2_TAG_HAZARD", -+ "T88x_L2_SNOOP_FULL", -+ "T88x_L2_REPLAY_FULL" -+}; ++ *pos = ++*spos; ++ return spos; ++} + -+#include "mali_kbase_gator_hwcnt_names_tmix.h" ++static void profiling_events_stop(struct seq_file *s, void *v) ++{ ++ kfree(v); ++} + -+#include "mali_kbase_gator_hwcnt_names_thex.h" ++static int profiling_events_show(struct seq_file *seq_file, void *v) ++{ ++ loff_t *spos = v; ++ u32 index; ++ u64 timestamp; ++ u32 event_id; ++ u32 data[5]; + -+#include "mali_kbase_gator_hwcnt_names_tsix.h" ++ index = (u32) * spos; + ++ /* Retrieve all events */ ++ if (_MALI_OSK_ERR_OK == _mali_internal_profiling_get_event(index, ×tamp, &event_id, data)) { ++ seq_printf(seq_file, "%llu %u %u %u %u %u %u\n", timestamp, event_id, data[0], data[1], data[2], data[3], data[4]); ++ return 0; ++ } + ++ return 0; ++} + -+#endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_thex.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_thex.h -new file mode 100755 -index 000000000000..15fd4efdc6ca ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_thex.h -@@ -0,0 +1,291 @@ -+/* -+ * -+ * (C) COPYRIGHT 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++static int profiling_events_show_human_readable(struct seq_file *seq_file, void *v) ++{ ++#define MALI_EVENT_ID_IS_HW(event_id) (((event_id & 0x00FF0000) >= MALI_PROFILING_EVENT_CHANNEL_GP0) && ((event_id & 0x00FF0000) <= MALI_PROFILING_EVENT_CHANNEL_PP7)) + ++ static u64 start_time = 0; ++ loff_t *spos = v; ++ u32 index; ++ u64 timestamp; ++ u32 event_id; ++ u32 data[5]; + ++ index = (u32) * spos; + -+/* -+ * This header was autogenerated, it should not be edited. -+ */ ++ /* Retrieve all events */ ++ if (_MALI_OSK_ERR_OK == _mali_internal_profiling_get_event(index, ×tamp, &event_id, data)) { ++ seq_printf(seq_file, "%llu %u %u %u %u %u %u # ", timestamp, event_id, data[0], data[1], data[2], data[3], data[4]); + -+#ifndef _KBASE_GATOR_HWCNT_NAMES_THEX_H_ -+#define _KBASE_GATOR_HWCNT_NAMES_THEX_H_ ++ if (0 == index) { ++ start_time = timestamp; ++ } + -+static const char * const hardware_counters_mali_tHEx[] = { -+ /* Performance counters for the Job Manager */ -+ "", -+ "", -+ "", -+ "", -+ "THEx_MESSAGES_SENT", -+ "THEx_MESSAGES_RECEIVED", -+ "THEx_GPU_ACTIVE", -+ "THEx_IRQ_ACTIVE", -+ "THEx_JS0_JOBS", -+ "THEx_JS0_TASKS", -+ "THEx_JS0_ACTIVE", -+ "", -+ "THEx_JS0_WAIT_READ", -+ "THEx_JS0_WAIT_ISSUE", -+ "THEx_JS0_WAIT_DEPEND", -+ "THEx_JS0_WAIT_FINISH", -+ "THEx_JS1_JOBS", -+ "THEx_JS1_TASKS", -+ "THEx_JS1_ACTIVE", -+ "", -+ "THEx_JS1_WAIT_READ", -+ "THEx_JS1_WAIT_ISSUE", -+ "THEx_JS1_WAIT_DEPEND", -+ "THEx_JS1_WAIT_FINISH", -+ "THEx_JS2_JOBS", -+ "THEx_JS2_TASKS", -+ "THEx_JS2_ACTIVE", -+ "", -+ "THEx_JS2_WAIT_READ", -+ "THEx_JS2_WAIT_ISSUE", -+ "THEx_JS2_WAIT_DEPEND", -+ "THEx_JS2_WAIT_FINISH", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++ seq_printf(seq_file, "[%06u] ", index); + -+ /* Performance counters for the Tiler */ -+ "", -+ "", -+ "", -+ "", -+ "THEx_TILER_ACTIVE", -+ "THEx_JOBS_PROCESSED", -+ "THEx_TRIANGLES", -+ "THEx_LINES", -+ "THEx_POINTS", -+ "THEx_FRONT_FACING", -+ "THEx_BACK_FACING", -+ "THEx_PRIM_VISIBLE", -+ "THEx_PRIM_CULLED", -+ "THEx_PRIM_CLIPPED", -+ "THEx_PRIM_SAT_CULLED", -+ "THEx_BIN_ALLOC_INIT", -+ "THEx_BIN_ALLOC_OVERFLOW", -+ "THEx_BUS_READ", -+ "", -+ "THEx_BUS_WRITE", -+ "THEx_LOADING_DESC", -+ "THEx_IDVS_POS_SHAD_REQ", -+ "THEx_IDVS_POS_SHAD_WAIT", -+ "THEx_IDVS_POS_SHAD_STALL", -+ "THEx_IDVS_POS_FIFO_FULL", -+ "THEx_PREFETCH_STALL", -+ "THEx_VCACHE_HIT", -+ "THEx_VCACHE_MISS", -+ "THEx_VCACHE_LINE_WAIT", -+ "THEx_VFETCH_POS_READ_WAIT", -+ "THEx_VFETCH_VERTEX_WAIT", -+ "THEx_VFETCH_STALL", -+ "THEx_PRIMASSY_STALL", -+ "THEx_BBOX_GEN_STALL", -+ "THEx_IDVS_VBU_HIT", -+ "THEx_IDVS_VBU_MISS", -+ "THEx_IDVS_VBU_LINE_DEALLOCATE", -+ "THEx_IDVS_VAR_SHAD_REQ", -+ "THEx_IDVS_VAR_SHAD_STALL", -+ "THEx_BINNER_STALL", -+ "THEx_ITER_STALL", -+ "THEx_COMPRESS_MISS", -+ "THEx_COMPRESS_STALL", -+ "THEx_PCACHE_HIT", -+ "THEx_PCACHE_MISS", -+ "THEx_PCACHE_MISS_STALL", -+ "THEx_PCACHE_EVICT_STALL", -+ "THEx_PMGR_PTR_WR_STALL", -+ "THEx_PMGR_PTR_RD_STALL", -+ "THEx_PMGR_CMD_WR_STALL", -+ "THEx_WRBUF_ACTIVE", -+ "THEx_WRBUF_HIT", -+ "THEx_WRBUF_MISS", -+ "THEx_WRBUF_NO_FREE_LINE_STALL", -+ "THEx_WRBUF_NO_AXI_ID_STALL", -+ "THEx_WRBUF_AXI_STALL", -+ "", -+ "", -+ "", -+ "THEx_UTLB_TRANS", -+ "THEx_UTLB_TRANS_HIT", -+ "THEx_UTLB_TRANS_STALL", -+ "THEx_UTLB_TRANS_MISS_DELAY", -+ "THEx_UTLB_MMU_REQ", ++ switch (event_id & 0x0F000000) { ++ case MALI_PROFILING_EVENT_TYPE_SINGLE: ++ seq_printf(seq_file, "SINGLE | "); ++ break; ++ case MALI_PROFILING_EVENT_TYPE_START: ++ seq_printf(seq_file, "START | "); ++ break; ++ case MALI_PROFILING_EVENT_TYPE_STOP: ++ seq_printf(seq_file, "STOP | "); ++ break; ++ case MALI_PROFILING_EVENT_TYPE_SUSPEND: ++ seq_printf(seq_file, "SUSPEND | "); ++ break; ++ case MALI_PROFILING_EVENT_TYPE_RESUME: ++ seq_printf(seq_file, "RESUME | "); ++ break; ++ default: ++ seq_printf(seq_file, "0x%01X | ", (event_id & 0x0F000000) >> 24); ++ break; ++ } + -+ /* Performance counters for the Shader Core */ -+ "", -+ "", -+ "", -+ "", -+ "THEx_FRAG_ACTIVE", -+ "THEx_FRAG_PRIMITIVES", -+ "THEx_FRAG_PRIM_RAST", -+ "THEx_FRAG_FPK_ACTIVE", -+ "THEx_FRAG_STARVING", -+ "THEx_FRAG_WARPS", -+ "THEx_FRAG_PARTIAL_WARPS", -+ "THEx_FRAG_QUADS_RAST", -+ "THEx_FRAG_QUADS_EZS_TEST", -+ "THEx_FRAG_QUADS_EZS_UPDATE", -+ "THEx_FRAG_QUADS_EZS_KILL", -+ "THEx_FRAG_LZS_TEST", -+ "THEx_FRAG_LZS_KILL", -+ "", -+ "THEx_FRAG_PTILES", -+ "THEx_FRAG_TRANS_ELIM", -+ "THEx_QUAD_FPK_KILLER", -+ "", -+ "THEx_COMPUTE_ACTIVE", -+ "THEx_COMPUTE_TASKS", -+ "THEx_COMPUTE_WARPS", -+ "THEx_COMPUTE_STARVING", -+ "THEx_EXEC_CORE_ACTIVE", -+ "THEx_EXEC_ACTIVE", -+ "THEx_EXEC_INSTR_COUNT", -+ "THEx_EXEC_INSTR_DIVERGED", -+ "THEx_EXEC_INSTR_STARVING", -+ "THEx_ARITH_INSTR_SINGLE_FMA", -+ "THEx_ARITH_INSTR_DOUBLE", -+ "THEx_ARITH_INSTR_MSG", -+ "THEx_ARITH_INSTR_MSG_ONLY", -+ "THEx_TEX_INSTR", -+ "THEx_TEX_INSTR_MIPMAP", -+ "THEx_TEX_INSTR_COMPRESSED", -+ "THEx_TEX_INSTR_3D", -+ "THEx_TEX_INSTR_TRILINEAR", -+ "THEx_TEX_COORD_ISSUE", -+ "THEx_TEX_COORD_STALL", -+ "THEx_TEX_STARVE_CACHE", -+ "THEx_TEX_STARVE_FILTER", -+ "THEx_LS_MEM_READ_FULL", -+ "THEx_LS_MEM_READ_SHORT", -+ "THEx_LS_MEM_WRITE_FULL", -+ "THEx_LS_MEM_WRITE_SHORT", -+ "THEx_LS_MEM_ATOMIC", -+ "THEx_VARY_INSTR", -+ "THEx_VARY_SLOT_32", -+ "THEx_VARY_SLOT_16", -+ "THEx_ATTR_INSTR", -+ "THEx_ARITH_INSTR_FP_MUL", -+ "THEx_BEATS_RD_FTC", -+ "THEx_BEATS_RD_FTC_EXT", -+ "THEx_BEATS_RD_LSC", -+ "THEx_BEATS_RD_LSC_EXT", -+ "THEx_BEATS_RD_TEX", -+ "THEx_BEATS_RD_TEX_EXT", -+ "THEx_BEATS_RD_OTHER", -+ "THEx_BEATS_WR_LSC", -+ "THEx_BEATS_WR_TIB", -+ "", ++ switch (event_id & 0x00FF0000) { ++ case MALI_PROFILING_EVENT_CHANNEL_SOFTWARE: ++ seq_printf(seq_file, "SW | "); ++ break; ++ case MALI_PROFILING_EVENT_CHANNEL_GP0: ++ seq_printf(seq_file, "GP0 | "); ++ break; ++ case MALI_PROFILING_EVENT_CHANNEL_PP0: ++ seq_printf(seq_file, "PP0 | "); ++ break; ++ case MALI_PROFILING_EVENT_CHANNEL_PP1: ++ seq_printf(seq_file, "PP1 | "); ++ break; ++ case MALI_PROFILING_EVENT_CHANNEL_PP2: ++ seq_printf(seq_file, "PP2 | "); ++ break; ++ case MALI_PROFILING_EVENT_CHANNEL_PP3: ++ seq_printf(seq_file, "PP3 | "); ++ break; ++ case MALI_PROFILING_EVENT_CHANNEL_PP4: ++ seq_printf(seq_file, "PP4 | "); ++ break; ++ case MALI_PROFILING_EVENT_CHANNEL_PP5: ++ seq_printf(seq_file, "PP5 | "); ++ break; ++ case MALI_PROFILING_EVENT_CHANNEL_PP6: ++ seq_printf(seq_file, "PP6 | "); ++ break; ++ case MALI_PROFILING_EVENT_CHANNEL_PP7: ++ seq_printf(seq_file, "PP7 | "); ++ break; ++ case MALI_PROFILING_EVENT_CHANNEL_GPU: ++ seq_printf(seq_file, "GPU | "); ++ break; ++ default: ++ seq_printf(seq_file, "0x%02X | ", (event_id & 0x00FF0000) >> 16); ++ break; ++ } + -+ /* Performance counters for the Memory System */ -+ "", -+ "", -+ "", -+ "", -+ "THEx_MMU_REQUESTS", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "THEx_L2_RD_MSG_IN", -+ "THEx_L2_RD_MSG_IN_STALL", -+ "THEx_L2_WR_MSG_IN", -+ "THEx_L2_WR_MSG_IN_STALL", -+ "THEx_L2_SNP_MSG_IN", -+ "THEx_L2_SNP_MSG_IN_STALL", -+ "THEx_L2_RD_MSG_OUT", -+ "THEx_L2_RD_MSG_OUT_STALL", -+ "THEx_L2_WR_MSG_OUT", -+ "THEx_L2_ANY_LOOKUP", -+ "THEx_L2_READ_LOOKUP", -+ "THEx_L2_WRITE_LOOKUP", -+ "THEx_L2_EXT_SNOOP_LOOKUP", -+ "THEx_L2_EXT_READ", -+ "THEx_L2_EXT_READ_NOSNP", -+ "THEx_L2_EXT_READ_UNIQUE", -+ "THEx_L2_EXT_READ_BEATS", -+ "THEx_L2_EXT_AR_STALL", -+ "THEx_L2_EXT_AR_CNT_Q1", -+ "THEx_L2_EXT_AR_CNT_Q2", -+ "THEx_L2_EXT_AR_CNT_Q3", -+ "THEx_L2_EXT_RRESP_0_127", -+ "THEx_L2_EXT_RRESP_128_191", -+ "THEx_L2_EXT_RRESP_192_255", -+ "THEx_L2_EXT_RRESP_256_319", -+ "THEx_L2_EXT_RRESP_320_383", -+ "THEx_L2_EXT_WRITE", -+ "THEx_L2_EXT_WRITE_NOSNP_FULL", -+ "THEx_L2_EXT_WRITE_NOSNP_PTL", -+ "THEx_L2_EXT_WRITE_SNP_FULL", -+ "THEx_L2_EXT_WRITE_SNP_PTL", -+ "THEx_L2_EXT_WRITE_BEATS", -+ "THEx_L2_EXT_W_STALL", -+ "THEx_L2_EXT_AW_CNT_Q1", -+ "THEx_L2_EXT_AW_CNT_Q2", -+ "THEx_L2_EXT_AW_CNT_Q3", -+ "THEx_L2_EXT_SNOOP", -+ "THEx_L2_EXT_SNOOP_STALL", -+ "THEx_L2_EXT_SNOOP_RESP_CLEAN", -+ "THEx_L2_EXT_SNOOP_RESP_DATA", -+ "THEx_L2_EXT_SNOOP_INTERNAL", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+}; ++ if (MALI_EVENT_ID_IS_HW(event_id)) { ++ if (((event_id & 0x0F000000) == MALI_PROFILING_EVENT_TYPE_START) || ((event_id & 0x0F000000) == MALI_PROFILING_EVENT_TYPE_STOP)) { ++ switch (event_id & 0x0000FFFF) { ++ case MALI_PROFILING_EVENT_REASON_START_STOP_HW_PHYSICAL: ++ seq_printf(seq_file, "PHYSICAL | "); ++ break; ++ case MALI_PROFILING_EVENT_REASON_START_STOP_HW_VIRTUAL: ++ seq_printf(seq_file, "VIRTUAL | "); ++ break; ++ default: ++ seq_printf(seq_file, "0x%04X | ", event_id & 0x0000FFFF); ++ break; ++ } ++ } else { ++ seq_printf(seq_file, "0x%04X | ", event_id & 0x0000FFFF); ++ } ++ } else { ++ seq_printf(seq_file, "0x%04X | ", event_id & 0x0000FFFF); ++ } + -+#endif /* _KBASE_GATOR_HWCNT_NAMES_THEX_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_tmix.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_tmix.h -new file mode 100755 -index 000000000000..8a215f723570 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_tmix.h -@@ -0,0 +1,291 @@ -+/* -+ * -+ * (C) COPYRIGHT 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ seq_printf(seq_file, "T0 + 0x%016llX\n", timestamp - start_time); + ++ return 0; ++ } + ++ return 0; ++} + -+/* -+ * This header was autogenerated, it should not be edited. -+ */ ++static const struct seq_operations profiling_events_seq_ops = { ++ .start = profiling_events_start, ++ .next = profiling_events_next, ++ .stop = profiling_events_stop, ++ .show = profiling_events_show ++}; + -+#ifndef _KBASE_GATOR_HWCNT_NAMES_TMIX_H_ -+#define _KBASE_GATOR_HWCNT_NAMES_TMIX_H_ ++static int profiling_events_open(struct inode *inode, struct file *file) ++{ ++ return seq_open(file, &profiling_events_seq_ops); ++} + -+static const char * const hardware_counters_mali_tMIx[] = { -+ /* Performance counters for the Job Manager */ -+ "", -+ "", -+ "", -+ "", -+ "TMIx_MESSAGES_SENT", -+ "TMIx_MESSAGES_RECEIVED", -+ "TMIx_GPU_ACTIVE", -+ "TMIx_IRQ_ACTIVE", -+ "TMIx_JS0_JOBS", -+ "TMIx_JS0_TASKS", -+ "TMIx_JS0_ACTIVE", -+ "", -+ "TMIx_JS0_WAIT_READ", -+ "TMIx_JS0_WAIT_ISSUE", -+ "TMIx_JS0_WAIT_DEPEND", -+ "TMIx_JS0_WAIT_FINISH", -+ "TMIx_JS1_JOBS", -+ "TMIx_JS1_TASKS", -+ "TMIx_JS1_ACTIVE", -+ "", -+ "TMIx_JS1_WAIT_READ", -+ "TMIx_JS1_WAIT_ISSUE", -+ "TMIx_JS1_WAIT_DEPEND", -+ "TMIx_JS1_WAIT_FINISH", -+ "TMIx_JS2_JOBS", -+ "TMIx_JS2_TASKS", -+ "TMIx_JS2_ACTIVE", -+ "", -+ "TMIx_JS2_WAIT_READ", -+ "TMIx_JS2_WAIT_ISSUE", -+ "TMIx_JS2_WAIT_DEPEND", -+ "TMIx_JS2_WAIT_FINISH", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++static const struct file_operations profiling_events_fops = { ++ .owner = THIS_MODULE, ++ .open = profiling_events_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = seq_release, ++}; + -+ /* Performance counters for the Tiler */ -+ "", -+ "", -+ "", -+ "", -+ "TMIx_TILER_ACTIVE", -+ "TMIx_JOBS_PROCESSED", -+ "TMIx_TRIANGLES", -+ "TMIx_LINES", -+ "TMIx_POINTS", -+ "TMIx_FRONT_FACING", -+ "TMIx_BACK_FACING", -+ "TMIx_PRIM_VISIBLE", -+ "TMIx_PRIM_CULLED", -+ "TMIx_PRIM_CLIPPED", -+ "TMIx_PRIM_SAT_CULLED", -+ "TMIx_BIN_ALLOC_INIT", -+ "TMIx_BIN_ALLOC_OVERFLOW", -+ "TMIx_BUS_READ", -+ "", -+ "TMIx_BUS_WRITE", -+ "TMIx_LOADING_DESC", -+ "TMIx_IDVS_POS_SHAD_REQ", -+ "TMIx_IDVS_POS_SHAD_WAIT", -+ "TMIx_IDVS_POS_SHAD_STALL", -+ "TMIx_IDVS_POS_FIFO_FULL", -+ "TMIx_PREFETCH_STALL", -+ "TMIx_VCACHE_HIT", -+ "TMIx_VCACHE_MISS", -+ "TMIx_VCACHE_LINE_WAIT", -+ "TMIx_VFETCH_POS_READ_WAIT", -+ "TMIx_VFETCH_VERTEX_WAIT", -+ "TMIx_VFETCH_STALL", -+ "TMIx_PRIMASSY_STALL", -+ "TMIx_BBOX_GEN_STALL", -+ "TMIx_IDVS_VBU_HIT", -+ "TMIx_IDVS_VBU_MISS", -+ "TMIx_IDVS_VBU_LINE_DEALLOCATE", -+ "TMIx_IDVS_VAR_SHAD_REQ", -+ "TMIx_IDVS_VAR_SHAD_STALL", -+ "TMIx_BINNER_STALL", -+ "TMIx_ITER_STALL", -+ "TMIx_COMPRESS_MISS", -+ "TMIx_COMPRESS_STALL", -+ "TMIx_PCACHE_HIT", -+ "TMIx_PCACHE_MISS", -+ "TMIx_PCACHE_MISS_STALL", -+ "TMIx_PCACHE_EVICT_STALL", -+ "TMIx_PMGR_PTR_WR_STALL", -+ "TMIx_PMGR_PTR_RD_STALL", -+ "TMIx_PMGR_CMD_WR_STALL", -+ "TMIx_WRBUF_ACTIVE", -+ "TMIx_WRBUF_HIT", -+ "TMIx_WRBUF_MISS", -+ "TMIx_WRBUF_NO_FREE_LINE_STALL", -+ "TMIx_WRBUF_NO_AXI_ID_STALL", -+ "TMIx_WRBUF_AXI_STALL", -+ "", -+ "", -+ "", -+ "TMIx_UTLB_TRANS", -+ "TMIx_UTLB_TRANS_HIT", -+ "TMIx_UTLB_TRANS_STALL", -+ "TMIx_UTLB_TRANS_MISS_DELAY", -+ "TMIx_UTLB_MMU_REQ", ++static const struct seq_operations profiling_events_human_readable_seq_ops = { ++ .start = profiling_events_start, ++ .next = profiling_events_next, ++ .stop = profiling_events_stop, ++ .show = profiling_events_show_human_readable ++}; + -+ /* Performance counters for the Shader Core */ -+ "", -+ "", -+ "", -+ "", -+ "TMIx_FRAG_ACTIVE", -+ "TMIx_FRAG_PRIMITIVES", -+ "TMIx_FRAG_PRIM_RAST", -+ "TMIx_FRAG_FPK_ACTIVE", -+ "TMIx_FRAG_STARVING", -+ "TMIx_FRAG_WARPS", -+ "TMIx_FRAG_PARTIAL_WARPS", -+ "TMIx_FRAG_QUADS_RAST", -+ "TMIx_FRAG_QUADS_EZS_TEST", -+ "TMIx_FRAG_QUADS_EZS_UPDATE", -+ "TMIx_FRAG_QUADS_EZS_KILL", -+ "TMIx_FRAG_LZS_TEST", -+ "TMIx_FRAG_LZS_KILL", -+ "", -+ "TMIx_FRAG_PTILES", -+ "TMIx_FRAG_TRANS_ELIM", -+ "TMIx_QUAD_FPK_KILLER", -+ "", -+ "TMIx_COMPUTE_ACTIVE", -+ "TMIx_COMPUTE_TASKS", -+ "TMIx_COMPUTE_WARPS", -+ "TMIx_COMPUTE_STARVING", -+ "TMIx_EXEC_CORE_ACTIVE", -+ "TMIx_EXEC_ACTIVE", -+ "TMIx_EXEC_INSTR_COUNT", -+ "TMIx_EXEC_INSTR_DIVERGED", -+ "TMIx_EXEC_INSTR_STARVING", -+ "TMIx_ARITH_INSTR_SINGLE_FMA", -+ "TMIx_ARITH_INSTR_DOUBLE", -+ "TMIx_ARITH_INSTR_MSG", -+ "TMIx_ARITH_INSTR_MSG_ONLY", -+ "TMIx_TEX_INSTR", -+ "TMIx_TEX_INSTR_MIPMAP", -+ "TMIx_TEX_INSTR_COMPRESSED", -+ "TMIx_TEX_INSTR_3D", -+ "TMIx_TEX_INSTR_TRILINEAR", -+ "TMIx_TEX_COORD_ISSUE", -+ "TMIx_TEX_COORD_STALL", -+ "TMIx_TEX_STARVE_CACHE", -+ "TMIx_TEX_STARVE_FILTER", -+ "TMIx_LS_MEM_READ_FULL", -+ "TMIx_LS_MEM_READ_SHORT", -+ "TMIx_LS_MEM_WRITE_FULL", -+ "TMIx_LS_MEM_WRITE_SHORT", -+ "TMIx_LS_MEM_ATOMIC", -+ "TMIx_VARY_INSTR", -+ "TMIx_VARY_SLOT_32", -+ "TMIx_VARY_SLOT_16", -+ "TMIx_ATTR_INSTR", -+ "TMIx_ARITH_INSTR_FP_MUL", -+ "TMIx_BEATS_RD_FTC", -+ "TMIx_BEATS_RD_FTC_EXT", -+ "TMIx_BEATS_RD_LSC", -+ "TMIx_BEATS_RD_LSC_EXT", -+ "TMIx_BEATS_RD_TEX", -+ "TMIx_BEATS_RD_TEX_EXT", -+ "TMIx_BEATS_RD_OTHER", -+ "TMIx_BEATS_WR_LSC", -+ "TMIx_BEATS_WR_TIB", -+ "", ++static int profiling_events_human_readable_open(struct inode *inode, struct file *file) ++{ ++ return seq_open(file, &profiling_events_human_readable_seq_ops); ++} + -+ /* Performance counters for the Memory System */ -+ "", -+ "", -+ "", -+ "", -+ "TMIx_MMU_REQUESTS", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "TMIx_L2_RD_MSG_IN", -+ "TMIx_L2_RD_MSG_IN_STALL", -+ "TMIx_L2_WR_MSG_IN", -+ "TMIx_L2_WR_MSG_IN_STALL", -+ "TMIx_L2_SNP_MSG_IN", -+ "TMIx_L2_SNP_MSG_IN_STALL", -+ "TMIx_L2_RD_MSG_OUT", -+ "TMIx_L2_RD_MSG_OUT_STALL", -+ "TMIx_L2_WR_MSG_OUT", -+ "TMIx_L2_ANY_LOOKUP", -+ "TMIx_L2_READ_LOOKUP", -+ "TMIx_L2_WRITE_LOOKUP", -+ "TMIx_L2_EXT_SNOOP_LOOKUP", -+ "TMIx_L2_EXT_READ", -+ "TMIx_L2_EXT_READ_NOSNP", -+ "TMIx_L2_EXT_READ_UNIQUE", -+ "TMIx_L2_EXT_READ_BEATS", -+ "TMIx_L2_EXT_AR_STALL", -+ "TMIx_L2_EXT_AR_CNT_Q1", -+ "TMIx_L2_EXT_AR_CNT_Q2", -+ "TMIx_L2_EXT_AR_CNT_Q3", -+ "TMIx_L2_EXT_RRESP_0_127", -+ "TMIx_L2_EXT_RRESP_128_191", -+ "TMIx_L2_EXT_RRESP_192_255", -+ "TMIx_L2_EXT_RRESP_256_319", -+ "TMIx_L2_EXT_RRESP_320_383", -+ "TMIx_L2_EXT_WRITE", -+ "TMIx_L2_EXT_WRITE_NOSNP_FULL", -+ "TMIx_L2_EXT_WRITE_NOSNP_PTL", -+ "TMIx_L2_EXT_WRITE_SNP_FULL", -+ "TMIx_L2_EXT_WRITE_SNP_PTL", -+ "TMIx_L2_EXT_WRITE_BEATS", -+ "TMIx_L2_EXT_W_STALL", -+ "TMIx_L2_EXT_AW_CNT_Q1", -+ "TMIx_L2_EXT_AW_CNT_Q2", -+ "TMIx_L2_EXT_AW_CNT_Q3", -+ "TMIx_L2_EXT_SNOOP", -+ "TMIx_L2_EXT_SNOOP_STALL", -+ "TMIx_L2_EXT_SNOOP_RESP_CLEAN", -+ "TMIx_L2_EXT_SNOOP_RESP_DATA", -+ "TMIx_L2_EXT_SNOOP_INTERNAL", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++static const struct file_operations profiling_events_human_readable_fops = { ++ .owner = THIS_MODULE, ++ .open = profiling_events_human_readable_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = seq_release, +}; + -+#endif /* _KBASE_GATOR_HWCNT_NAMES_TMIX_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_tsix.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_tsix.h -new file mode 100755 -index 000000000000..fb6a1437a1f6 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_tsix.h -@@ -0,0 +1,291 @@ -+/* -+ * -+ * (C) COPYRIGHT 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ ++#endif + ++static int memory_debugfs_show(struct seq_file *s, void *private_data) ++{ ++#ifdef MALI_MEM_SWAP_TRACKING ++ seq_printf(s, " %-25s %-10s %-10s %-15s %-15s %-10s %-10s %-10s \n"\ ++ "=================================================================================================================================\n", ++ "Name (:bytes)", "pid", "mali_mem", "max_mali_mem", ++ "external_mem", "ump_mem", "dma_mem", "swap_mem"); ++#else ++ seq_printf(s, " %-25s %-10s %-10s %-15s %-15s %-10s %-10s \n"\ ++ "========================================================================================================================\n", ++ "Name (:bytes)", "pid", "mali_mem", "max_mali_mem", ++ "external_mem", "ump_mem", "dma_mem"); ++#endif ++ mali_session_memory_tracking(s); ++ return 0; ++} + -+/* -+ * This header was autogenerated, it should not be edited. -+ */ ++static int memory_debugfs_open(struct inode *inode, struct file *file) ++{ ++ return single_open(file, memory_debugfs_show, inode->i_private); ++} + -+#ifndef _KBASE_GATOR_HWCNT_NAMES_TSIX_H_ -+#define _KBASE_GATOR_HWCNT_NAMES_TSIX_H_ ++static const struct file_operations memory_usage_fops = { ++ .owner = THIS_MODULE, ++ .open = memory_debugfs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; + -+static const char * const hardware_counters_mali_tSIx[] = { -+ /* Performance counters for the Job Manager */ -+ "", -+ "", -+ "", -+ "", -+ "TSIx_MESSAGES_SENT", -+ "TSIx_MESSAGES_RECEIVED", -+ "TSIx_GPU_ACTIVE", -+ "TSIx_IRQ_ACTIVE", -+ "TSIx_JS0_JOBS", -+ "TSIx_JS0_TASKS", -+ "TSIx_JS0_ACTIVE", -+ "", -+ "TSIx_JS0_WAIT_READ", -+ "TSIx_JS0_WAIT_ISSUE", -+ "TSIx_JS0_WAIT_DEPEND", -+ "TSIx_JS0_WAIT_FINISH", -+ "TSIx_JS1_JOBS", -+ "TSIx_JS1_TASKS", -+ "TSIx_JS1_ACTIVE", -+ "", -+ "TSIx_JS1_WAIT_READ", -+ "TSIx_JS1_WAIT_ISSUE", -+ "TSIx_JS1_WAIT_DEPEND", -+ "TSIx_JS1_WAIT_FINISH", -+ "TSIx_JS2_JOBS", -+ "TSIx_JS2_TASKS", -+ "TSIx_JS2_ACTIVE", -+ "", -+ "TSIx_JS2_WAIT_READ", -+ "TSIx_JS2_WAIT_ISSUE", -+ "TSIx_JS2_WAIT_DEPEND", -+ "TSIx_JS2_WAIT_FINISH", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", ++static ssize_t utilization_gp_pp_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ char buf[64]; ++ size_t r; ++ u32 uval = _mali_ukk_utilization_gp_pp(); + -+ /* Performance counters for the Tiler */ -+ "", -+ "", -+ "", -+ "", -+ "TSIx_TILER_ACTIVE", -+ "TSIx_JOBS_PROCESSED", -+ "TSIx_TRIANGLES", -+ "TSIx_LINES", -+ "TSIx_POINTS", -+ "TSIx_FRONT_FACING", -+ "TSIx_BACK_FACING", -+ "TSIx_PRIM_VISIBLE", -+ "TSIx_PRIM_CULLED", -+ "TSIx_PRIM_CLIPPED", -+ "TSIx_PRIM_SAT_CULLED", -+ "TSIx_BIN_ALLOC_INIT", -+ "TSIx_BIN_ALLOC_OVERFLOW", -+ "TSIx_BUS_READ", -+ "", -+ "TSIx_BUS_WRITE", -+ "TSIx_LOADING_DESC", -+ "TSIx_IDVS_POS_SHAD_REQ", -+ "TSIx_IDVS_POS_SHAD_WAIT", -+ "TSIx_IDVS_POS_SHAD_STALL", -+ "TSIx_IDVS_POS_FIFO_FULL", -+ "TSIx_PREFETCH_STALL", -+ "TSIx_VCACHE_HIT", -+ "TSIx_VCACHE_MISS", -+ "TSIx_VCACHE_LINE_WAIT", -+ "TSIx_VFETCH_POS_READ_WAIT", -+ "TSIx_VFETCH_VERTEX_WAIT", -+ "TSIx_VFETCH_STALL", -+ "TSIx_PRIMASSY_STALL", -+ "TSIx_BBOX_GEN_STALL", -+ "TSIx_IDVS_VBU_HIT", -+ "TSIx_IDVS_VBU_MISS", -+ "TSIx_IDVS_VBU_LINE_DEALLOCATE", -+ "TSIx_IDVS_VAR_SHAD_REQ", -+ "TSIx_IDVS_VAR_SHAD_STALL", -+ "TSIx_BINNER_STALL", -+ "TSIx_ITER_STALL", -+ "TSIx_COMPRESS_MISS", -+ "TSIx_COMPRESS_STALL", -+ "TSIx_PCACHE_HIT", -+ "TSIx_PCACHE_MISS", -+ "TSIx_PCACHE_MISS_STALL", -+ "TSIx_PCACHE_EVICT_STALL", -+ "TSIx_PMGR_PTR_WR_STALL", -+ "TSIx_PMGR_PTR_RD_STALL", -+ "TSIx_PMGR_CMD_WR_STALL", -+ "TSIx_WRBUF_ACTIVE", -+ "TSIx_WRBUF_HIT", -+ "TSIx_WRBUF_MISS", -+ "TSIx_WRBUF_NO_FREE_LINE_STALL", -+ "TSIx_WRBUF_NO_AXI_ID_STALL", -+ "TSIx_WRBUF_AXI_STALL", -+ "", -+ "", -+ "", -+ "TSIx_UTLB_TRANS", -+ "TSIx_UTLB_TRANS_HIT", -+ "TSIx_UTLB_TRANS_STALL", -+ "TSIx_UTLB_TRANS_MISS_DELAY", -+ "TSIx_UTLB_MMU_REQ", ++ r = snprintf(buf, 64, "%u\n", uval); ++ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); ++} + -+ /* Performance counters for the Shader Core */ -+ "", -+ "", -+ "", -+ "", -+ "TSIx_FRAG_ACTIVE", -+ "TSIx_FRAG_PRIMITIVES", -+ "TSIx_FRAG_PRIM_RAST", -+ "TSIx_FRAG_FPK_ACTIVE", -+ "TSIx_FRAG_STARVING", -+ "TSIx_FRAG_WARPS", -+ "TSIx_FRAG_PARTIAL_WARPS", -+ "TSIx_FRAG_QUADS_RAST", -+ "TSIx_FRAG_QUADS_EZS_TEST", -+ "TSIx_FRAG_QUADS_EZS_UPDATE", -+ "TSIx_FRAG_QUADS_EZS_KILL", -+ "TSIx_FRAG_LZS_TEST", -+ "TSIx_FRAG_LZS_KILL", -+ "", -+ "TSIx_FRAG_PTILES", -+ "TSIx_FRAG_TRANS_ELIM", -+ "TSIx_QUAD_FPK_KILLER", -+ "", -+ "TSIx_COMPUTE_ACTIVE", -+ "TSIx_COMPUTE_TASKS", -+ "TSIx_COMPUTE_WARPS", -+ "TSIx_COMPUTE_STARVING", -+ "TSIx_EXEC_CORE_ACTIVE", -+ "TSIx_EXEC_ACTIVE", -+ "TSIx_EXEC_INSTR_COUNT", -+ "TSIx_EXEC_INSTR_DIVERGED", -+ "TSIx_EXEC_INSTR_STARVING", -+ "TSIx_ARITH_INSTR_SINGLE_FMA", -+ "TSIx_ARITH_INSTR_DOUBLE", -+ "TSIx_ARITH_INSTR_MSG", -+ "TSIx_ARITH_INSTR_MSG_ONLY", -+ "TSIx_TEX_MSGI_NUM_QUADS", -+ "TSIx_TEX_DFCH_NUM_PASSES", -+ "TSIx_TEX_DFCH_NUM_PASSES_MISS", -+ "TSIx_TEX_DFCH_NUM_PASSES_MIP_MAP", -+ "TSIx_TEX_TIDX_NUM_SPLIT_MIP_MAP", -+ "TSIx_TEX_TFCH_NUM_LINES_FETCHED", -+ "TSIx_TEX_TFCH_NUM_LINES_FETCHED_BLOCK", -+ "TSIx_TEX_TFCH_NUM_OPERATIONS", -+ "TSIx_TEX_FILT_NUM_OPERATIONS", -+ "TSIx_LS_MEM_READ_FULL", -+ "TSIx_LS_MEM_READ_SHORT", -+ "TSIx_LS_MEM_WRITE_FULL", -+ "TSIx_LS_MEM_WRITE_SHORT", -+ "TSIx_LS_MEM_ATOMIC", -+ "TSIx_VARY_INSTR", -+ "TSIx_VARY_SLOT_32", -+ "TSIx_VARY_SLOT_16", -+ "TSIx_ATTR_INSTR", -+ "TSIx_ARITH_INSTR_FP_MUL", -+ "TSIx_BEATS_RD_FTC", -+ "TSIx_BEATS_RD_FTC_EXT", -+ "TSIx_BEATS_RD_LSC", -+ "TSIx_BEATS_RD_LSC_EXT", -+ "TSIx_BEATS_RD_TEX", -+ "TSIx_BEATS_RD_TEX_EXT", -+ "TSIx_BEATS_RD_OTHER", -+ "TSIx_BEATS_WR_LSC", -+ "TSIx_BEATS_WR_TIB", -+ "", ++static ssize_t utilization_gp_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ char buf[64]; ++ size_t r; ++ u32 uval = _mali_ukk_utilization_gp(); + -+ /* Performance counters for the Memory System */ -+ "", -+ "", -+ "", -+ "", -+ "TSIx_MMU_REQUESTS", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "TSIx_L2_RD_MSG_IN", -+ "TSIx_L2_RD_MSG_IN_STALL", -+ "TSIx_L2_WR_MSG_IN", -+ "TSIx_L2_WR_MSG_IN_STALL", -+ "TSIx_L2_SNP_MSG_IN", -+ "TSIx_L2_SNP_MSG_IN_STALL", -+ "TSIx_L2_RD_MSG_OUT", -+ "TSIx_L2_RD_MSG_OUT_STALL", -+ "TSIx_L2_WR_MSG_OUT", -+ "TSIx_L2_ANY_LOOKUP", -+ "TSIx_L2_READ_LOOKUP", -+ "TSIx_L2_WRITE_LOOKUP", -+ "TSIx_L2_EXT_SNOOP_LOOKUP", -+ "TSIx_L2_EXT_READ", -+ "TSIx_L2_EXT_READ_NOSNP", -+ "TSIx_L2_EXT_READ_UNIQUE", -+ "TSIx_L2_EXT_READ_BEATS", -+ "TSIx_L2_EXT_AR_STALL", -+ "TSIx_L2_EXT_AR_CNT_Q1", -+ "TSIx_L2_EXT_AR_CNT_Q2", -+ "TSIx_L2_EXT_AR_CNT_Q3", -+ "TSIx_L2_EXT_RRESP_0_127", -+ "TSIx_L2_EXT_RRESP_128_191", -+ "TSIx_L2_EXT_RRESP_192_255", -+ "TSIx_L2_EXT_RRESP_256_319", -+ "TSIx_L2_EXT_RRESP_320_383", -+ "TSIx_L2_EXT_WRITE", -+ "TSIx_L2_EXT_WRITE_NOSNP_FULL", -+ "TSIx_L2_EXT_WRITE_NOSNP_PTL", -+ "TSIx_L2_EXT_WRITE_SNP_FULL", -+ "TSIx_L2_EXT_WRITE_SNP_PTL", -+ "TSIx_L2_EXT_WRITE_BEATS", -+ "TSIx_L2_EXT_W_STALL", -+ "TSIx_L2_EXT_AW_CNT_Q1", -+ "TSIx_L2_EXT_AW_CNT_Q2", -+ "TSIx_L2_EXT_AW_CNT_Q3", -+ "TSIx_L2_EXT_SNOOP", -+ "TSIx_L2_EXT_SNOOP_STALL", -+ "TSIx_L2_EXT_SNOOP_RESP_CLEAN", -+ "TSIx_L2_EXT_SNOOP_RESP_DATA", -+ "TSIx_L2_EXT_SNOOP_INTERNAL", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+ "", -+}; ++ r = snprintf(buf, 64, "%u\n", uval); ++ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); ++} + -+#endif /* _KBASE_GATOR_HWCNT_NAMES_TSIX_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_id.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_id.h -new file mode 100755 -index 000000000000..2d368dfaf644 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_id.h -@@ -0,0 +1,118 @@ -+/* -+ * -+ * (C) COPYRIGHT 2015-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++static ssize_t utilization_pp_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ char buf[64]; ++ size_t r; ++ u32 uval = _mali_ukk_utilization_pp(); + ++ r = snprintf(buf, 64, "%u\n", uval); ++ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); ++} + -+#ifndef _KBASE_GPU_ID_H_ -+#define _KBASE_GPU_ID_H_ + -+/* GPU_ID register */ -+#define GPU_ID_VERSION_STATUS_SHIFT 0 -+#define GPU_ID_VERSION_MINOR_SHIFT 4 -+#define GPU_ID_VERSION_MAJOR_SHIFT 12 -+#define GPU_ID_VERSION_PRODUCT_ID_SHIFT 16 -+#define GPU_ID_VERSION_STATUS (0xF << GPU_ID_VERSION_STATUS_SHIFT) -+#define GPU_ID_VERSION_MINOR (0xFF << GPU_ID_VERSION_MINOR_SHIFT) -+#define GPU_ID_VERSION_MAJOR (0xF << GPU_ID_VERSION_MAJOR_SHIFT) -+#define GPU_ID_VERSION_PRODUCT_ID (0xFFFF << GPU_ID_VERSION_PRODUCT_ID_SHIFT) ++static const struct file_operations utilization_gp_pp_fops = { ++ .owner = THIS_MODULE, ++ .read = utilization_gp_pp_read, ++}; + -+/* Values for GPU_ID_VERSION_PRODUCT_ID bitfield */ -+#define GPU_ID_PI_T60X 0x6956 -+#define GPU_ID_PI_T62X 0x0620 -+#define GPU_ID_PI_T76X 0x0750 -+#define GPU_ID_PI_T72X 0x0720 -+#define GPU_ID_PI_TFRX 0x0880 -+#define GPU_ID_PI_T86X 0x0860 -+#define GPU_ID_PI_T82X 0x0820 -+#define GPU_ID_PI_T83X 0x0830 ++static const struct file_operations utilization_gp_fops = { ++ .owner = THIS_MODULE, ++ .read = utilization_gp_read, ++}; + -+/* New GPU ID format when PRODUCT_ID is >= 0x1000 (and not 0x6956) */ -+#define GPU_ID_PI_NEW_FORMAT_START 0x1000 -+#define GPU_ID_IS_NEW_FORMAT(product_id) ((product_id) != GPU_ID_PI_T60X && \ -+ (product_id) >= \ -+ GPU_ID_PI_NEW_FORMAT_START) ++static const struct file_operations utilization_pp_fops = { ++ .owner = THIS_MODULE, ++ .read = utilization_pp_read, ++}; + -+#define GPU_ID2_VERSION_STATUS_SHIFT 0 -+#define GPU_ID2_VERSION_MINOR_SHIFT 4 -+#define GPU_ID2_VERSION_MAJOR_SHIFT 12 -+#define GPU_ID2_PRODUCT_MAJOR_SHIFT 16 -+#define GPU_ID2_ARCH_REV_SHIFT 20 -+#define GPU_ID2_ARCH_MINOR_SHIFT 24 -+#define GPU_ID2_ARCH_MAJOR_SHIFT 28 -+#define GPU_ID2_VERSION_STATUS (0xF << GPU_ID2_VERSION_STATUS_SHIFT) -+#define GPU_ID2_VERSION_MINOR (0xFF << GPU_ID2_VERSION_MINOR_SHIFT) -+#define GPU_ID2_VERSION_MAJOR (0xF << GPU_ID2_VERSION_MAJOR_SHIFT) -+#define GPU_ID2_PRODUCT_MAJOR (0xF << GPU_ID2_PRODUCT_MAJOR_SHIFT) -+#define GPU_ID2_ARCH_REV (0xF << GPU_ID2_ARCH_REV_SHIFT) -+#define GPU_ID2_ARCH_MINOR (0xF << GPU_ID2_ARCH_MINOR_SHIFT) -+#define GPU_ID2_ARCH_MAJOR (0xF << GPU_ID2_ARCH_MAJOR_SHIFT) -+#define GPU_ID2_PRODUCT_MODEL (GPU_ID2_ARCH_MAJOR | GPU_ID2_PRODUCT_MAJOR) -+#define GPU_ID2_VERSION (GPU_ID2_VERSION_MAJOR | \ -+ GPU_ID2_VERSION_MINOR | \ -+ GPU_ID2_VERSION_STATUS) ++static ssize_t user_settings_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ unsigned long val; ++ int ret; ++ _mali_uk_user_setting_t setting; ++ char buf[32]; + -+/* Helper macro to create a partial GPU_ID (new format) that defines -+ a product ignoring its version. */ -+#define GPU_ID2_PRODUCT_MAKE(arch_major, arch_minor, arch_rev, product_major) \ -+ (((arch_major) << GPU_ID2_ARCH_MAJOR_SHIFT) | \ -+ ((arch_minor) << GPU_ID2_ARCH_MINOR_SHIFT) | \ -+ ((arch_rev) << GPU_ID2_ARCH_REV_SHIFT) | \ -+ ((product_major) << GPU_ID2_PRODUCT_MAJOR_SHIFT)) ++ cnt = min(cnt, sizeof(buf) - 1); ++ if (copy_from_user(buf, ubuf, cnt)) { ++ return -EFAULT; ++ } ++ buf[cnt] = '\0'; + -+/* Helper macro to create a partial GPU_ID (new format) that specifies the -+ revision (major, minor, status) of a product */ -+#define GPU_ID2_VERSION_MAKE(version_major, version_minor, version_status) \ -+ (((version_major) << GPU_ID2_VERSION_MAJOR_SHIFT) | \ -+ ((version_minor) << GPU_ID2_VERSION_MINOR_SHIFT) | \ -+ ((version_status) << GPU_ID2_VERSION_STATUS_SHIFT)) ++ ret = kstrtoul(buf, 10, &val); ++ if (0 != ret) { ++ return ret; ++ } + -+/* Helper macro to create a complete GPU_ID (new format) */ -+#define GPU_ID2_MAKE(arch_major, arch_minor, arch_rev, product_major, \ -+ version_major, version_minor, version_status) \ -+ (GPU_ID2_PRODUCT_MAKE(arch_major, arch_minor, arch_rev, \ -+ product_major) | \ -+ GPU_ID2_VERSION_MAKE(version_major, version_minor, \ -+ version_status)) ++ /* Update setting */ ++ setting = (_mali_uk_user_setting_t)(filp->private_data); ++ mali_set_user_setting(setting, val); + -+/* Helper macro to create a partial GPU_ID (new format) that identifies -+ a particular GPU model by its arch_major and product_major. */ -+#define GPU_ID2_MODEL_MAKE(arch_major, product_major) \ -+ (((arch_major) << GPU_ID2_ARCH_MAJOR_SHIFT) | \ -+ ((product_major) << GPU_ID2_PRODUCT_MAJOR_SHIFT)) ++ *ppos += cnt; ++ return cnt; ++} + -+/* Strip off the non-relevant bits from a product_id value and make it suitable -+ for comparison against the GPU_ID2_PRODUCT_xxx values which identify a GPU -+ model. */ -+#define GPU_ID2_MODEL_MATCH_VALUE(product_id) \ -+ (((product_id) << GPU_ID2_PRODUCT_MAJOR_SHIFT) & \ -+ GPU_ID2_PRODUCT_MODEL) ++static ssize_t user_settings_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ char buf[64]; ++ size_t r; ++ u32 value; ++ _mali_uk_user_setting_t setting; + -+#define GPU_ID2_PRODUCT_TMIX GPU_ID2_MODEL_MAKE(6u, 0) -+#define GPU_ID2_PRODUCT_THEX GPU_ID2_MODEL_MAKE(6u, 1) -+#define GPU_ID2_PRODUCT_TSIX GPU_ID2_MODEL_MAKE(7u, 0) -+#define GPU_ID2_PRODUCT_TDVX GPU_ID2_MODEL_MAKE(7u, 3) ++ setting = (_mali_uk_user_setting_t)(filp->private_data); ++ value = mali_get_user_setting(setting); + -+/* Values for GPU_ID_VERSION_STATUS field for PRODUCT_ID GPU_ID_PI_T60X */ -+#define GPU_ID_S_15DEV0 0x1 -+#define GPU_ID_S_EAC 0x2 ++ r = snprintf(buf, 64, "%u\n", value); ++ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); ++} + -+/* Helper macro to create a GPU_ID assuming valid values for id, major, -+ minor, status */ -+#define GPU_ID_MAKE(id, major, minor, status) \ -+ (((id) << GPU_ID_VERSION_PRODUCT_ID_SHIFT) | \ -+ ((major) << GPU_ID_VERSION_MAJOR_SHIFT) | \ -+ ((minor) << GPU_ID_VERSION_MINOR_SHIFT) | \ -+ ((status) << GPU_ID_VERSION_STATUS_SHIFT)) ++static const struct file_operations user_settings_fops = { ++ .owner = THIS_MODULE, ++ .open = open_copy_private_data, ++ .read = user_settings_read, ++ .write = user_settings_write, ++}; + -+#endif /* _KBASE_GPU_ID_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_memory_debugfs.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_memory_debugfs.c -new file mode 100755 -index 000000000000..6df0a1cb1264 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_memory_debugfs.c -@@ -0,0 +1,97 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++static int mali_sysfs_user_settings_register(void) ++{ ++ struct dentry *mali_user_settings_dir = debugfs_create_dir("userspace_settings", mali_debugfs_dir); + ++ if (mali_user_settings_dir != NULL) { ++ long i; ++ for (i = 0; i < _MALI_UK_USER_SETTING_MAX; i++) { ++ debugfs_create_file(_mali_uk_user_setting_descriptions[i], ++ 0600, mali_user_settings_dir, (void *)i, ++ &user_settings_fops); ++ } ++ } + ++ return 0; ++} + -+#include ++static ssize_t pp_num_cores_enabled_write(struct file *filp, const char __user *buf, size_t count, loff_t *offp) ++{ ++ int ret; ++ char buffer[32]; ++ unsigned long val; + -+#ifdef CONFIG_DEBUG_FS -+/** Show callback for the @c gpu_memory debugfs file. -+ * -+ * This function is called to get the contents of the @c gpu_memory debugfs -+ * file. This is a report of current gpu memory usage. -+ * -+ * @param sfile The debugfs entry -+ * @param data Data associated with the entry -+ * -+ * @return 0 if successfully prints data in debugfs entry file -+ * -1 if it encountered an error -+ */ ++ if (count >= sizeof(buffer)) { ++ return -ENOMEM; ++ } + -+static int kbasep_gpu_memory_seq_show(struct seq_file *sfile, void *data) -+{ -+ struct list_head *entry; -+ const struct list_head *kbdev_list; ++ if (copy_from_user(&buffer[0], buf, count)) { ++ return -EFAULT; ++ } ++ buffer[count] = '\0'; + -+ kbdev_list = kbase_dev_list_get(); -+ list_for_each(entry, kbdev_list) { -+ struct kbase_device *kbdev = NULL; -+ struct kbasep_kctx_list_element *element; ++ ret = kstrtoul(&buffer[0], 10, &val); ++ if (0 != ret) { ++ return -EINVAL; ++ } + -+ kbdev = list_entry(entry, struct kbase_device, entry); -+ /* output the total memory usage and cap for this device */ -+ seq_printf(sfile, "%-16s %10u\n", -+ kbdev->devname, -+ atomic_read(&(kbdev->memdev.used_pages))); -+ mutex_lock(&kbdev->kctx_list_lock); -+ list_for_each_entry(element, &kbdev->kctx_list, link) { -+ /* output the memory usage and cap for each kctx -+ * opened on this device */ -+ seq_printf(sfile, " %s-0x%p %10u\n", -+ "kctx", -+ element->kctx, -+ atomic_read(&(element->kctx->used_pages))); -+ } -+ mutex_unlock(&kbdev->kctx_list_lock); ++ ret = mali_executor_set_perf_level(val, MALI_TRUE); /* override even if core scaling is disabled */ ++ if (ret) { ++ return ret; + } -+ kbase_dev_list_put(kbdev_list); -+ return 0; ++ ++ *offp += count; ++ return count; +} + -+/* -+ * File operations related to debugfs entry for gpu_memory -+ */ -+static int kbasep_gpu_memory_debugfs_open(struct inode *in, struct file *file) ++static ssize_t pp_num_cores_enabled_read(struct file *filp, char __user *buf, size_t count, loff_t *offp) +{ -+ return single_open(file, kbasep_gpu_memory_seq_show , NULL); ++ int r; ++ char buffer[64]; ++ ++ r = snprintf(buffer, 64, "%u\n", mali_executor_get_num_cores_enabled()); ++ ++ return simple_read_from_buffer(buf, count, offp, buffer, r); +} + -+static const struct file_operations kbasep_gpu_memory_debugfs_fops = { -+ .open = kbasep_gpu_memory_debugfs_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, ++static const struct file_operations pp_num_cores_enabled_fops = { ++ .owner = THIS_MODULE, ++ .write = pp_num_cores_enabled_write, ++ .read = pp_num_cores_enabled_read, ++ .llseek = default_llseek, +}; + -+/* -+ * Initialize debugfs entry for gpu_memory -+ */ -+void kbasep_gpu_memory_debugfs_init(struct kbase_device *kbdev) ++static ssize_t pp_num_cores_total_read(struct file *filp, char __user *buf, size_t count, loff_t *offp) +{ -+ debugfs_create_file("gpu_memory", S_IRUGO, -+ kbdev->mali_debugfs_directory, NULL, -+ &kbasep_gpu_memory_debugfs_fops); -+ return; ++ int r; ++ char buffer[64]; ++ ++ r = snprintf(buffer, 64, "%u\n", mali_executor_get_num_cores_total()); ++ ++ return simple_read_from_buffer(buf, count, offp, buffer, r); +} + -+#else -+/* -+ * Stub functions for when debugfs is disabled -+ */ -+void kbasep_gpu_memory_debugfs_init(struct kbase_device *kbdev) ++static const struct file_operations pp_num_cores_total_fops = { ++ .owner = THIS_MODULE, ++ .read = pp_num_cores_total_read, ++}; ++ ++static ssize_t pp_core_scaling_enabled_write(struct file *filp, const char __user *buf, size_t count, loff_t *offp) +{ -+ return; -+} -+#endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_memory_debugfs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_memory_debugfs.h -new file mode 100755 -index 000000000000..7045693eb910 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_memory_debugfs.h -@@ -0,0 +1,37 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2014, 2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ int ret; ++ char buffer[32]; ++ unsigned long val; + ++ if (count >= sizeof(buffer)) { ++ return -ENOMEM; ++ } + ++ if (copy_from_user(&buffer[0], buf, count)) { ++ return -EFAULT; ++ } ++ buffer[count] = '\0'; + ++ ret = kstrtoul(&buffer[0], 10, &val); ++ if (0 != ret) { ++ return -EINVAL; ++ } + ++ switch (val) { ++ case 1: ++ mali_executor_core_scaling_enable(); ++ break; ++ case 0: ++ mali_executor_core_scaling_disable(); ++ break; ++ default: ++ return -EINVAL; ++ break; ++ } + -+/** -+ * @file mali_kbase_gpu_memory_debugfs.h -+ * Header file for gpu_memory entry in debugfs -+ * -+ */ ++ *offp += count; ++ return count; ++} + -+#ifndef _KBASE_GPU_MEMORY_DEBUGFS_H -+#define _KBASE_GPU_MEMORY_DEBUGFS_H ++static ssize_t pp_core_scaling_enabled_read(struct file *filp, char __user *buf, size_t count, loff_t *offp) ++{ ++ return simple_read_from_buffer(buf, count, offp, mali_executor_core_scaling_is_enabled() ? "1\n" : "0\n", 2); ++} ++static const struct file_operations pp_core_scaling_enabled_fops = { ++ .owner = THIS_MODULE, ++ .write = pp_core_scaling_enabled_write, ++ .read = pp_core_scaling_enabled_read, ++ .llseek = default_llseek, ++}; + -+#include -+#include ++static ssize_t version_read(struct file *filp, char __user *buf, size_t count, loff_t *offp) ++{ ++ int r = 0; ++ char buffer[64]; + -+/** -+ * @brief Initialize gpu_memory debugfs entry -+ */ -+void kbasep_gpu_memory_debugfs_init(struct kbase_device *kbdev); ++ switch (mali_kernel_core_get_product_id()) { ++ case _MALI_PRODUCT_ID_MALI200: ++ r = snprintf(buffer, 64, "Mali-200\n"); ++ break; ++ case _MALI_PRODUCT_ID_MALI300: ++ r = snprintf(buffer, 64, "Mali-300\n"); ++ break; ++ case _MALI_PRODUCT_ID_MALI400: ++ r = snprintf(buffer, 64, "Mali-400 MP\n"); ++ break; ++ case _MALI_PRODUCT_ID_MALI450: ++ r = snprintf(buffer, 64, "Mali-450 MP\n"); ++ break; ++ case _MALI_PRODUCT_ID_MALI470: ++ r = snprintf(buffer, 64, "Mali-470 MP\n"); ++ break; ++ case _MALI_PRODUCT_ID_UNKNOWN: ++ return -EINVAL; ++ break; ++ }; + -+#endif /*_KBASE_GPU_MEMORY_DEBUGFS_H*/ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops.c -new file mode 100755 -index 000000000000..4130810f1038 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops.c -@@ -0,0 +1,514 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ return simple_read_from_buffer(buf, count, offp, buffer, r); ++} + ++static const struct file_operations version_fops = { ++ .owner = THIS_MODULE, ++ .read = version_read, ++}; + ++#if defined(DEBUG) ++static int timeline_debugfs_show(struct seq_file *s, void *private_data) ++{ ++ struct mali_session_data *session, *tmp; ++ u32 session_seq = 1; + ++ seq_printf(s, "timeline system info: \n=================\n\n"); + ++ mali_session_lock(); ++ MALI_SESSION_FOREACH(session, tmp, link) { ++ seq_printf(s, "session %d <%p> start:\n", session_seq, session); ++ mali_timeline_debug_print_system(session->timeline_system, s); ++ seq_printf(s, "session %d end\n\n\n", session_seq++); ++ } ++ mali_session_unlock(); + -+/* -+ * Base kernel property query APIs -+ */ ++ return 0; ++} + -+#include -+#include -+#include -+#include -+#include -+#include "mali_kbase_ioctl.h" -+#include ++static int timeline_debugfs_open(struct inode *inode, struct file *file) ++{ ++ return single_open(file, timeline_debugfs_show, inode->i_private); ++} + -+/** -+ * KBASE_UBFX32 - Extracts bits from a 32-bit bitfield. -+ * @value: The value from which to extract bits. -+ * @offset: The first bit to extract (0 being the LSB). -+ * @size: The number of bits to extract. -+ * -+ * Context: @offset + @size <= 32. -+ * -+ * Return: Bits [@offset, @offset + @size) from @value. -+ */ -+/* from mali_cdsb.h */ -+#define KBASE_UBFX32(value, offset, size) \ -+ (((u32)(value) >> (u32)(offset)) & (u32)((1ULL << (u32)(size)) - 1)) ++static const struct file_operations timeline_dump_fops = { ++ .owner = THIS_MODULE, ++ .open = timeline_debugfs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release ++}; ++#endif + -+int kbase_gpuprops_uk_get_props(struct kbase_context *kctx, struct kbase_uk_gpuprops * const kbase_props) ++int mali_sysfs_register(const char *mali_dev_name) +{ -+ kbase_gpu_clk_speed_func get_gpu_speed_mhz; -+ u32 gpu_speed_mhz; -+ int rc = 1; ++ mali_debugfs_dir = debugfs_create_dir(mali_dev_name, NULL); ++ if (ERR_PTR(-ENODEV) == mali_debugfs_dir) { ++ /* Debugfs not supported. */ ++ mali_debugfs_dir = NULL; ++ } else { ++ if (NULL != mali_debugfs_dir) { ++ /* Debugfs directory created successfully; create files now */ ++ struct dentry *mali_power_dir; ++ struct dentry *mali_gp_dir; ++ struct dentry *mali_pp_dir; ++ struct dentry *mali_l2_dir; ++ struct dentry *mali_profiling_dir; + -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ KBASE_DEBUG_ASSERT(NULL != kbase_props); ++ debugfs_create_file("version", 0400, mali_debugfs_dir, NULL, &version_fops); + -+ /* Current GPU speed is requested from the system integrator via the GPU_SPEED_FUNC function. -+ * If that function fails, or the function is not provided by the system integrator, we report the maximum -+ * GPU speed as specified by GPU_FREQ_KHZ_MAX. -+ */ -+ get_gpu_speed_mhz = (kbase_gpu_clk_speed_func) GPU_SPEED_FUNC; -+ if (get_gpu_speed_mhz != NULL) { -+ rc = get_gpu_speed_mhz(&gpu_speed_mhz); -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ /* Issue a warning message when the reported GPU speed falls outside the min/max range */ -+ if (rc == 0) { -+ u32 gpu_speed_khz = gpu_speed_mhz * 1000; ++ mali_power_dir = debugfs_create_dir("power", mali_debugfs_dir); ++ if (mali_power_dir != NULL) { ++ debugfs_create_file("always_on", 0600, mali_power_dir, NULL, &power_always_on_fops); ++ debugfs_create_file("power_events", 0200, mali_power_dir, NULL, &power_power_events_fops); ++ } + -+ if (gpu_speed_khz < kctx->kbdev->gpu_props.props.core_props.gpu_freq_khz_min || -+ gpu_speed_khz > kctx->kbdev->gpu_props.props.core_props.gpu_freq_khz_max) -+ dev_warn(kctx->kbdev->dev, "GPU Speed is outside of min/max range (got %lu Khz, min %lu Khz, max %lu Khz)\n", -+ (unsigned long)gpu_speed_khz, -+ (unsigned long)kctx->kbdev->gpu_props.props.core_props.gpu_freq_khz_min, -+ (unsigned long)kctx->kbdev->gpu_props.props.core_props.gpu_freq_khz_max); -+ } -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+ } -+ if (kctx->kbdev->clock) { -+ gpu_speed_mhz = clk_get_rate(kctx->kbdev->clock) / 1000000; -+ rc = 0; -+ } -+ if (rc != 0) -+ gpu_speed_mhz = kctx->kbdev->gpu_props.props.core_props.gpu_freq_khz_max / 1000; ++ mali_gp_dir = debugfs_create_dir("gp", mali_debugfs_dir); ++ if (mali_gp_dir != NULL) { ++ u32 num_groups; ++ long i; + -+ kctx->kbdev->gpu_props.props.core_props.gpu_speed_mhz = gpu_speed_mhz; ++ num_groups = mali_group_get_glob_num_groups(); ++ for (i = 0; i < num_groups; i++) { ++ struct mali_group *group = mali_group_get_glob_group(i); + -+ memcpy(&kbase_props->props, &kctx->kbdev->gpu_props.props, sizeof(kbase_props->props)); ++ struct mali_gp_core *gp_core = mali_group_get_gp_core(group); ++ if (NULL != gp_core) { ++ struct dentry *mali_gp_gpx_dir; ++ mali_gp_gpx_dir = debugfs_create_dir("gp0", mali_gp_dir); ++ if (NULL != mali_gp_gpx_dir) { ++ debugfs_create_file("base_addr", 0400, mali_gp_gpx_dir, &gp_core->hw_core, &hw_core_base_addr_fops); ++ debugfs_create_file("enabled", 0600, mali_gp_gpx_dir, group, &group_enabled_fops); ++ } ++ break; /* no need to look for any other GP cores */ ++ } + -+ /* Before API 8.2 they expect L3 cache info here, which was always 0 */ -+ if (kctx->api_version < KBASE_API_VERSION(8, 2)) -+ kbase_props->props.raw_props.suspend_size = 0; ++ } ++ } + -+ return 0; -+} ++ mali_pp_dir = debugfs_create_dir("pp", mali_debugfs_dir); ++ if (mali_pp_dir != NULL) { ++ u32 num_groups; ++ long i; + -+static void kbase_gpuprops_construct_coherent_groups(base_gpu_props * const props) -+{ -+ struct mali_base_gpu_coherent_group *current_group; -+ u64 group_present; -+ u64 group_mask; -+ u64 first_set, first_set_prev; -+ u32 num_groups = 0; ++ debugfs_create_file("num_cores_total", 0400, mali_pp_dir, NULL, &pp_num_cores_total_fops); ++ debugfs_create_file("num_cores_enabled", 0600, mali_pp_dir, NULL, &pp_num_cores_enabled_fops); ++ debugfs_create_file("core_scaling_enabled", 0600, mali_pp_dir, NULL, &pp_core_scaling_enabled_fops); + -+ KBASE_DEBUG_ASSERT(NULL != props); ++ num_groups = mali_group_get_glob_num_groups(); ++ for (i = 0; i < num_groups; i++) { ++ struct mali_group *group = mali_group_get_glob_group(i); + -+ props->coherency_info.coherency = props->raw_props.mem_features; -+ props->coherency_info.num_core_groups = hweight64(props->raw_props.l2_present); ++ struct mali_pp_core *pp_core = mali_group_get_pp_core(group); ++ if (NULL != pp_core) { ++ char buf[16]; ++ struct dentry *mali_pp_ppx_dir; ++ _mali_osk_snprintf(buf, sizeof(buf), "pp%u", mali_pp_core_get_id(pp_core)); ++ mali_pp_ppx_dir = debugfs_create_dir(buf, mali_pp_dir); ++ if (NULL != mali_pp_ppx_dir) { ++ debugfs_create_file("base_addr", 0400, mali_pp_ppx_dir, &pp_core->hw_core, &hw_core_base_addr_fops); ++ if (!mali_group_is_virtual(group)) { ++ debugfs_create_file("enabled", 0600, mali_pp_ppx_dir, group, &group_enabled_fops); ++ } ++ } ++ } ++ } ++ } + -+ if (props->coherency_info.coherency & GROUPS_L2_COHERENT) { -+ /* Group is l2 coherent */ -+ group_present = props->raw_props.l2_present; -+ } else { -+ /* Group is l1 coherent */ -+ group_present = props->raw_props.shader_present; -+ } ++ mali_l2_dir = debugfs_create_dir("l2", mali_debugfs_dir); ++ if (mali_l2_dir != NULL) { ++ struct dentry *mali_l2_all_dir; ++ u32 l2_id; ++ struct mali_l2_cache_core *l2_cache; + -+ /* -+ * The coherent group mask can be computed from the l2 present -+ * register. -+ * -+ * For the coherent group n: -+ * group_mask[n] = (first_set[n] - 1) & ~(first_set[n-1] - 1) -+ * where first_set is group_present with only its nth set-bit kept -+ * (i.e. the position from where a new group starts). -+ * -+ * For instance if the groups are l2 coherent and l2_present=0x0..01111: -+ * The first mask is: -+ * group_mask[1] = (first_set[1] - 1) & ~(first_set[0] - 1) -+ * = (0x0..010 - 1) & ~(0x0..01 - 1) -+ * = 0x0..00f -+ * The second mask is: -+ * group_mask[2] = (first_set[2] - 1) & ~(first_set[1] - 1) -+ * = (0x0..100 - 1) & ~(0x0..010 - 1) -+ * = 0x0..0f0 -+ * And so on until all the bits from group_present have been cleared -+ * (i.e. there is no group left). -+ */ ++ mali_l2_all_dir = debugfs_create_dir("all", mali_l2_dir); ++ if (mali_l2_all_dir != NULL) { ++ debugfs_create_file("counter_src0", 0200, mali_l2_all_dir, NULL, &l2_all_counter_src0_fops); ++ debugfs_create_file("counter_src1", 0200, mali_l2_all_dir, NULL, &l2_all_counter_src1_fops); ++ } + -+ current_group = props->coherency_info.group; -+ first_set = group_present & ~(group_present - 1); ++ l2_id = 0; ++ l2_cache = mali_l2_cache_core_get_glob_l2_core(l2_id); ++ while (NULL != l2_cache) { ++ char buf[16]; ++ struct dentry *mali_l2_l2x_dir; ++ _mali_osk_snprintf(buf, sizeof(buf), "l2%u", l2_id); ++ mali_l2_l2x_dir = debugfs_create_dir(buf, mali_l2_dir); ++ if (NULL != mali_l2_l2x_dir) { ++ debugfs_create_file("counter_src0", 0600, mali_l2_l2x_dir, l2_cache, &l2_l2x_counter_src0_fops); ++ debugfs_create_file("counter_src1", 0600, mali_l2_l2x_dir, l2_cache, &l2_l2x_counter_src1_fops); ++ debugfs_create_file("counter_val0", 0600, mali_l2_l2x_dir, l2_cache, &l2_l2x_counter_val0_fops); ++ debugfs_create_file("counter_val1", 0600, mali_l2_l2x_dir, l2_cache, &l2_l2x_counter_val1_fops); ++ debugfs_create_file("base_addr", 0400, mali_l2_l2x_dir, &l2_cache->hw_core, &hw_core_base_addr_fops); ++ } + -+ while (group_present != 0 && num_groups < BASE_MAX_COHERENT_GROUPS) { -+ group_present -= first_set; /* Clear the current group bit */ -+ first_set_prev = first_set; ++ /* try next L2 */ ++ l2_id++; ++ l2_cache = mali_l2_cache_core_get_glob_l2_core(l2_id); ++ } ++ } + -+ first_set = group_present & ~(group_present - 1); -+ group_mask = (first_set - 1) & ~(first_set_prev - 1); ++ debugfs_create_file("gpu_memory", 0444, mali_debugfs_dir, NULL, &memory_usage_fops); + -+ /* Populate the coherent_group structure for each group */ -+ current_group->core_mask = group_mask & props->raw_props.shader_present; -+ current_group->num_cores = hweight64(current_group->core_mask); ++ debugfs_create_file("utilization_gp_pp", 0400, mali_debugfs_dir, NULL, &utilization_gp_pp_fops); ++ debugfs_create_file("utilization_gp", 0400, mali_debugfs_dir, NULL, &utilization_gp_fops); ++ debugfs_create_file("utilization_pp", 0400, mali_debugfs_dir, NULL, &utilization_pp_fops); + -+ num_groups++; -+ current_group++; -+ } ++ mali_profiling_dir = debugfs_create_dir("profiling", mali_debugfs_dir); ++ if (mali_profiling_dir != NULL) { ++ u32 max_sub_jobs; ++ long i; ++ struct dentry *mali_profiling_gp_dir; ++ struct dentry *mali_profiling_pp_dir; ++#if defined(CONFIG_MALI400_INTERNAL_PROFILING) ++ struct dentry *mali_profiling_proc_dir; ++#endif ++ /* ++ * Create directory where we can set GP HW counters. ++ */ ++ mali_profiling_gp_dir = debugfs_create_dir("gp", mali_profiling_dir); ++ if (mali_profiling_gp_dir != NULL) { ++ debugfs_create_file("counter_src0", 0600, mali_profiling_gp_dir, (void *)PRIVATE_DATA_COUNTER_MAKE_GP(0), &profiling_counter_src_fops); ++ debugfs_create_file("counter_src1", 0600, mali_profiling_gp_dir, (void *)PRIVATE_DATA_COUNTER_MAKE_GP(1), &profiling_counter_src_fops); ++ } + -+ if (group_present != 0) -+ pr_warn("Too many coherent groups (keeping only %d groups).\n", BASE_MAX_COHERENT_GROUPS); ++ /* ++ * Create directory where we can set PP HW counters. ++ * Possible override with specific HW counters for a particular sub job ++ * (Disable core scaling before using the override!) ++ */ ++ mali_profiling_pp_dir = debugfs_create_dir("pp", mali_profiling_dir); ++ if (mali_profiling_pp_dir != NULL) { ++ debugfs_create_file("counter_src0", 0600, mali_profiling_pp_dir, (void *)PRIVATE_DATA_COUNTER_MAKE_PP(0), &profiling_counter_src_fops); ++ debugfs_create_file("counter_src1", 0600, mali_profiling_pp_dir, (void *)PRIVATE_DATA_COUNTER_MAKE_PP(1), &profiling_counter_src_fops); ++ } + -+ props->coherency_info.num_groups = num_groups; -+} ++ max_sub_jobs = mali_executor_get_num_cores_total(); ++ for (i = 0; i < max_sub_jobs; i++) { ++ char buf[16]; ++ struct dentry *mali_profiling_pp_x_dir; ++ _mali_osk_snprintf(buf, sizeof(buf), "%u", i); ++ mali_profiling_pp_x_dir = debugfs_create_dir(buf, mali_profiling_pp_dir); ++ if (NULL != mali_profiling_pp_x_dir) { ++ debugfs_create_file("counter_src0", ++ 0600, mali_profiling_pp_x_dir, ++ (void *)PRIVATE_DATA_COUNTER_MAKE_PP_SUB_JOB(0, i), ++ &profiling_counter_src_fops); ++ debugfs_create_file("counter_src1", ++ 0600, mali_profiling_pp_x_dir, ++ (void *)PRIVATE_DATA_COUNTER_MAKE_PP_SUB_JOB(1, i), ++ &profiling_counter_src_fops); ++ } ++ } + -+/** -+ * kbase_gpuprops_get_props - Get the GPU configuration -+ * @gpu_props: The &base_gpu_props structure -+ * @kbdev: The &struct kbase_device structure for the device -+ * -+ * Fill the &base_gpu_props structure with values from the GPU configuration -+ * registers. Only the raw properties are filled in this function -+ */ -+static void kbase_gpuprops_get_props(base_gpu_props * const gpu_props, struct kbase_device *kbdev) -+{ -+ struct kbase_gpuprops_regdump regdump; -+ int i; ++#if defined(CONFIG_MALI400_INTERNAL_PROFILING) ++ mali_profiling_proc_dir = debugfs_create_dir("proc", mali_profiling_dir); ++ if (mali_profiling_proc_dir != NULL) { ++ struct dentry *mali_profiling_proc_default_dir = debugfs_create_dir("default", mali_profiling_proc_dir); ++ if (mali_profiling_proc_default_dir != NULL) { ++ debugfs_create_file("enable", 0600, mali_profiling_proc_default_dir, (void *)_MALI_UK_USER_SETTING_SW_EVENTS_ENABLE, &user_settings_fops); ++ } ++ } ++ debugfs_create_file("record", 0600, mali_profiling_dir, NULL, &profiling_record_fops); ++ debugfs_create_file("events", 0400, mali_profiling_dir, NULL, &profiling_events_fops); ++ debugfs_create_file("events_human_readable", 0400, mali_profiling_dir, NULL, &profiling_events_human_readable_fops); ++#endif ++ } + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); -+ KBASE_DEBUG_ASSERT(NULL != gpu_props); ++#if MALI_STATE_TRACKING ++ debugfs_create_file("state_dump", 0400, mali_debugfs_dir, NULL, &mali_seq_internal_state_fops); ++#endif + -+ /* Dump relevant registers */ -+ kbase_backend_gpuprops_get(kbdev, ®dump); ++#if defined(DEBUG) ++ debugfs_create_file("timeline_dump", 0400, mali_debugfs_dir, NULL, &timeline_dump_fops); ++#endif ++ if (mali_sysfs_user_settings_register()) { ++ /* Failed to create the debugfs entries for the user settings DB. */ ++ MALI_DEBUG_PRINT(2, ("Failed to create user setting debugfs files. Ignoring...\n")); ++ } ++ } ++ } + -+ gpu_props->raw_props.gpu_id = regdump.gpu_id; -+ gpu_props->raw_props.tiler_features = regdump.tiler_features; -+ gpu_props->raw_props.mem_features = regdump.mem_features; -+ gpu_props->raw_props.mmu_features = regdump.mmu_features; -+ gpu_props->raw_props.l2_features = regdump.l2_features; -+ gpu_props->raw_props.suspend_size = regdump.suspend_size; ++ /* Success! */ ++ return 0; ++} + -+ gpu_props->raw_props.as_present = regdump.as_present; -+ gpu_props->raw_props.js_present = regdump.js_present; -+ gpu_props->raw_props.shader_present = -+ ((u64) regdump.shader_present_hi << 32) + -+ regdump.shader_present_lo; -+ gpu_props->raw_props.tiler_present = -+ ((u64) regdump.tiler_present_hi << 32) + -+ regdump.tiler_present_lo; -+ gpu_props->raw_props.l2_present = -+ ((u64) regdump.l2_present_hi << 32) + -+ regdump.l2_present_lo; -+#ifdef CONFIG_MALI_CORESTACK -+ gpu_props->raw_props.stack_present = -+ ((u64) regdump.stack_present_hi << 32) + -+ regdump.stack_present_lo; -+#else /* CONFIG_MALI_CORESTACK */ -+ gpu_props->raw_props.stack_present = 0; -+#endif /* CONFIG_MALI_CORESTACK */ ++int mali_sysfs_unregister(void) ++{ ++ if (NULL != mali_debugfs_dir) { ++ debugfs_remove_recursive(mali_debugfs_dir); ++ } ++ return 0; ++} + -+ for (i = 0; i < GPU_MAX_JOB_SLOTS; i++) -+ gpu_props->raw_props.js_features[i] = regdump.js_features[i]; ++#else /* MALI_LICENSE_IS_GPL */ + -+ for (i = 0; i < BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS; i++) -+ gpu_props->raw_props.texture_features[i] = regdump.texture_features[i]; ++/* Dummy implementations for non-GPL */ + -+ gpu_props->raw_props.thread_max_barrier_size = regdump.thread_max_barrier_size; -+ gpu_props->raw_props.thread_max_threads = regdump.thread_max_threads; -+ gpu_props->raw_props.thread_max_workgroup_size = regdump.thread_max_workgroup_size; -+ gpu_props->raw_props.thread_features = regdump.thread_features; ++int mali_sysfs_register(struct mali_dev *device, dev_t dev, const char *mali_dev_name) ++{ ++ return 0; +} + -+void kbase_gpuprops_update_core_props_gpu_id(base_gpu_props * const gpu_props) ++int mali_sysfs_unregister(void) +{ -+ gpu_props->core_props.version_status = -+ KBASE_UBFX32(gpu_props->raw_props.gpu_id, 0U, 4); -+ gpu_props->core_props.minor_revision = -+ KBASE_UBFX32(gpu_props->raw_props.gpu_id, 4U, 8); -+ gpu_props->core_props.major_revision = -+ KBASE_UBFX32(gpu_props->raw_props.gpu_id, 12U, 4); -+ gpu_props->core_props.product_id = -+ KBASE_UBFX32(gpu_props->raw_props.gpu_id, 16U, 16); ++ return 0; +} + -+/** -+ * kbase_gpuprops_calculate_props - Calculate the derived properties -+ * @gpu_props: The &base_gpu_props structure -+ * @kbdev: The &struct kbase_device structure for the device -+ * -+ * Fill the &base_gpu_props structure with values derived from the GPU -+ * configuration registers ++#endif /* MALI_LICENSE_IS_GPL */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h +new file mode 100755 +index 000000000..91580a87c +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h +@@ -0,0 +1,29 @@ ++/* ++ * Copyright (C) 2011-2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+static void kbase_gpuprops_calculate_props(base_gpu_props * const gpu_props, struct kbase_device *kbdev) -+{ -+ int i; -+ -+ /* Populate the base_gpu_props structure */ -+ kbase_gpuprops_update_core_props_gpu_id(gpu_props); -+ gpu_props->core_props.log2_program_counter_size = KBASE_GPU_PC_SIZE_LOG2; -+ gpu_props->core_props.gpu_available_memory_size = totalram_pages << PAGE_SHIFT; + -+ for (i = 0; i < BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS; i++) -+ gpu_props->core_props.texture_features[i] = gpu_props->raw_props.texture_features[i]; ++#ifndef __MALI_KERNEL_SYSFS_H__ ++#define __MALI_KERNEL_SYSFS_H__ + -+ gpu_props->l2_props.log2_line_size = KBASE_UBFX32(gpu_props->raw_props.l2_features, 0U, 8); -+ gpu_props->l2_props.log2_cache_size = KBASE_UBFX32(gpu_props->raw_props.l2_features, 16U, 8); ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ /* Field with number of l2 slices is added to MEM_FEATURES register -+ * since t76x. Below code assumes that for older GPU reserved bits will -+ * be read as zero. */ -+ gpu_props->l2_props.num_l2_slices = -+ KBASE_UBFX32(gpu_props->raw_props.mem_features, 8U, 4) + 1; ++#include + -+ gpu_props->tiler_props.bin_size_bytes = 1 << KBASE_UBFX32(gpu_props->raw_props.tiler_features, 0U, 6); -+ gpu_props->tiler_props.max_active_levels = KBASE_UBFX32(gpu_props->raw_props.tiler_features, 8U, 4); ++#define MALI_PROC_DIR "driver/mali" + -+ if (gpu_props->raw_props.thread_max_threads == 0) -+ gpu_props->thread_props.max_threads = THREAD_MT_DEFAULT; -+ else -+ gpu_props->thread_props.max_threads = gpu_props->raw_props.thread_max_threads; ++int mali_sysfs_register(const char *mali_dev_name); ++int mali_sysfs_unregister(void); + -+ if (gpu_props->raw_props.thread_max_workgroup_size == 0) -+ gpu_props->thread_props.max_workgroup_size = THREAD_MWS_DEFAULT; -+ else -+ gpu_props->thread_props.max_workgroup_size = gpu_props->raw_props.thread_max_workgroup_size; ++#ifdef __cplusplus ++} ++#endif + -+ if (gpu_props->raw_props.thread_max_barrier_size == 0) -+ gpu_props->thread_props.max_barrier_size = THREAD_MBS_DEFAULT; -+ else -+ gpu_props->thread_props.max_barrier_size = gpu_props->raw_props.thread_max_barrier_size; ++#endif /* __MALI_KERNEL_LINUX_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h b/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h +new file mode 100755 +index 000000000..222260823 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h +@@ -0,0 +1,161 @@ ++/* ++ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ gpu_props->thread_props.max_registers = KBASE_UBFX32(gpu_props->raw_props.thread_features, 0U, 16); -+ gpu_props->thread_props.max_task_queue = KBASE_UBFX32(gpu_props->raw_props.thread_features, 16U, 8); -+ gpu_props->thread_props.max_thread_group_split = KBASE_UBFX32(gpu_props->raw_props.thread_features, 24U, 6); -+ gpu_props->thread_props.impl_tech = KBASE_UBFX32(gpu_props->raw_props.thread_features, 30U, 2); ++#if !defined (MALI_LINUX_TRACE_H) || defined (TRACE_HEADER_MULTI_READ) ++#define MALI_LINUX_TRACE_H + -+ /* If values are not specified, then use defaults */ -+ if (gpu_props->thread_props.max_registers == 0) { -+ gpu_props->thread_props.max_registers = THREAD_MR_DEFAULT; -+ gpu_props->thread_props.max_task_queue = THREAD_MTQ_DEFAULT; -+ gpu_props->thread_props.max_thread_group_split = THREAD_MTGS_DEFAULT; -+ } -+ /* Initialize the coherent_group structure for each group */ -+ kbase_gpuprops_construct_coherent_groups(gpu_props); -+} ++#include + -+void kbase_gpuprops_set(struct kbase_device *kbdev) -+{ -+ struct kbase_gpu_props *gpu_props; -+ struct gpu_raw_gpu_props *raw; ++#include ++#include + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); -+ gpu_props = &kbdev->gpu_props; -+ raw = &gpu_props->props.raw_props; ++#undef TRACE_SYSTEM ++#define TRACE_SYSTEM mali + -+ /* Initialize the base_gpu_props structure from the hardware */ -+ kbase_gpuprops_get_props(&gpu_props->props, kbdev); ++#define TRACE_INCLUDE_PATH . ++#define TRACE_INCLUDE_FILE mali_linux_trace + -+ /* Populate the derived properties */ -+ kbase_gpuprops_calculate_props(&gpu_props->props, kbdev); ++/** ++ * Define the tracepoint used to communicate the status of a GPU. Called ++ * when a GPU turns on or turns off. ++ * ++ * @param event_id The type of the event. This parameter is a bitfield ++ * encoding the type of the event. ++ * ++ * @param d0 First data parameter. ++ * @param d1 Second data parameter. ++ * @param d2 Third data parameter. ++ * @param d3 Fourth data parameter. ++ * @param d4 Fifth data parameter. ++ */ ++TRACE_EVENT(mali_timeline_event, + -+ /* Populate kbase-only fields */ -+ gpu_props->l2_props.associativity = KBASE_UBFX32(raw->l2_features, 8U, 8); -+ gpu_props->l2_props.external_bus_width = KBASE_UBFX32(raw->l2_features, 24U, 8); ++ TP_PROTO(unsigned int event_id, unsigned int d0, unsigned int d1, ++ unsigned int d2, unsigned int d3, unsigned int d4), + -+ gpu_props->mem.core_group = KBASE_UBFX32(raw->mem_features, 0U, 1); ++ TP_ARGS(event_id, d0, d1, d2, d3, d4), + -+ gpu_props->mmu.va_bits = KBASE_UBFX32(raw->mmu_features, 0U, 8); -+ gpu_props->mmu.pa_bits = KBASE_UBFX32(raw->mmu_features, 8U, 8); ++ TP_STRUCT__entry( ++ __field(unsigned int, event_id) ++ __field(unsigned int, d0) ++ __field(unsigned int, d1) ++ __field(unsigned int, d2) ++ __field(unsigned int, d3) ++ __field(unsigned int, d4) ++ ), + -+ gpu_props->num_cores = hweight64(raw->shader_present); -+ gpu_props->num_core_groups = hweight64(raw->l2_present); -+ gpu_props->num_address_spaces = hweight32(raw->as_present); -+ gpu_props->num_job_slots = hweight32(raw->js_present); -+} ++ TP_fast_assign( ++ __entry->event_id = event_id; ++ __entry->d0 = d0; ++ __entry->d1 = d1; ++ __entry->d2 = d2; ++ __entry->d3 = d3; ++ __entry->d4 = d4; ++ ), + -+void kbase_gpuprops_set_features(struct kbase_device *kbdev) -+{ -+ base_gpu_props *gpu_props; -+ struct kbase_gpuprops_regdump regdump; ++ TP_printk("event=%d", __entry->event_id) ++ ); + -+ gpu_props = &kbdev->gpu_props.props; ++/** ++ * Define a tracepoint used to regsiter the value of a hardware counter. ++ * Hardware counters belonging to the vertex or fragment processor are ++ * reported via this tracepoint each frame, whilst L2 cache hardware ++ * counters are reported continuously. ++ * ++ * @param counter_id The counter ID. ++ * @param value The value of the counter. ++ */ ++TRACE_EVENT(mali_hw_counter, + -+ /* Dump relevant registers */ -+ kbase_backend_gpuprops_get_features(kbdev, ®dump); ++ TP_PROTO(unsigned int counter_id, unsigned int value), + -+ /* -+ * Copy the raw value from the register, later this will get turned -+ * into the selected coherency mode. -+ * Additionally, add non-coherent mode, as this is always supported. -+ */ -+ gpu_props->raw_props.coherency_mode = regdump.coherency_features | -+ COHERENCY_FEATURE_BIT(COHERENCY_NONE); -+} ++ TP_ARGS(counter_id, value), + -+static struct { -+ u32 type; -+ size_t offset; -+ int size; -+} gpu_property_mapping[] = { -+#define PROP(name, member) \ -+ {KBASE_GPUPROP_ ## name, offsetof(struct mali_base_gpu_props, member), \ -+ sizeof(((struct mali_base_gpu_props *)0)->member)} -+ PROP(PRODUCT_ID, core_props.product_id), -+ PROP(VERSION_STATUS, core_props.version_status), -+ PROP(MINOR_REVISION, core_props.minor_revision), -+ PROP(MAJOR_REVISION, core_props.major_revision), -+ PROP(GPU_SPEED_MHZ, core_props.gpu_speed_mhz), -+ PROP(GPU_FREQ_KHZ_MAX, core_props.gpu_freq_khz_max), -+ PROP(GPU_FREQ_KHZ_MIN, core_props.gpu_freq_khz_min), -+ PROP(LOG2_PROGRAM_COUNTER_SIZE, core_props.log2_program_counter_size), -+ PROP(TEXTURE_FEATURES_0, core_props.texture_features[0]), -+ PROP(TEXTURE_FEATURES_1, core_props.texture_features[1]), -+ PROP(TEXTURE_FEATURES_2, core_props.texture_features[2]), -+ PROP(GPU_AVAILABLE_MEMORY_SIZE, core_props.gpu_available_memory_size), ++ TP_STRUCT__entry( ++ __field(unsigned int, counter_id) ++ __field(unsigned int, value) ++ ), + -+ PROP(L2_LOG2_LINE_SIZE, l2_props.log2_line_size), -+ PROP(L2_LOG2_CACHE_SIZE, l2_props.log2_cache_size), -+ PROP(L2_NUM_L2_SLICES, l2_props.num_l2_slices), ++ TP_fast_assign( ++ __entry->counter_id = counter_id; ++ ), + -+ PROP(TILER_BIN_SIZE_BYTES, tiler_props.bin_size_bytes), -+ PROP(TILER_MAX_ACTIVE_LEVELS, tiler_props.max_active_levels), ++ TP_printk("event %d = %d", __entry->counter_id, __entry->value) ++ ); + -+ PROP(MAX_THREADS, thread_props.max_threads), -+ PROP(MAX_WORKGROUP_SIZE, thread_props.max_workgroup_size), -+ PROP(MAX_BARRIER_SIZE, thread_props.max_barrier_size), -+ PROP(MAX_REGISTERS, thread_props.max_registers), -+ PROP(MAX_TASK_QUEUE, thread_props.max_task_queue), -+ PROP(MAX_THREAD_GROUP_SPLIT, thread_props.max_thread_group_split), -+ PROP(IMPL_TECH, thread_props.impl_tech), ++/** ++ * Define a tracepoint used to send a bundle of software counters. ++ * ++ * @param counters The bundle of counters. ++ */ ++TRACE_EVENT(mali_sw_counters, + -+ PROP(RAW_SHADER_PRESENT, raw_props.shader_present), -+ PROP(RAW_TILER_PRESENT, raw_props.tiler_present), -+ PROP(RAW_L2_PRESENT, raw_props.l2_present), -+ PROP(RAW_STACK_PRESENT, raw_props.stack_present), -+ PROP(RAW_L2_FEATURES, raw_props.l2_features), -+ PROP(RAW_SUSPEND_SIZE, raw_props.suspend_size), -+ PROP(RAW_MEM_FEATURES, raw_props.mem_features), -+ PROP(RAW_MMU_FEATURES, raw_props.mmu_features), -+ PROP(RAW_AS_PRESENT, raw_props.as_present), -+ PROP(RAW_JS_PRESENT, raw_props.js_present), -+ PROP(RAW_JS_FEATURES_0, raw_props.js_features[0]), -+ PROP(RAW_JS_FEATURES_1, raw_props.js_features[1]), -+ PROP(RAW_JS_FEATURES_2, raw_props.js_features[2]), -+ PROP(RAW_JS_FEATURES_3, raw_props.js_features[3]), -+ PROP(RAW_JS_FEATURES_4, raw_props.js_features[4]), -+ PROP(RAW_JS_FEATURES_5, raw_props.js_features[5]), -+ PROP(RAW_JS_FEATURES_6, raw_props.js_features[6]), -+ PROP(RAW_JS_FEATURES_7, raw_props.js_features[7]), -+ PROP(RAW_JS_FEATURES_8, raw_props.js_features[8]), -+ PROP(RAW_JS_FEATURES_9, raw_props.js_features[9]), -+ PROP(RAW_JS_FEATURES_10, raw_props.js_features[10]), -+ PROP(RAW_JS_FEATURES_11, raw_props.js_features[11]), -+ PROP(RAW_JS_FEATURES_12, raw_props.js_features[12]), -+ PROP(RAW_JS_FEATURES_13, raw_props.js_features[13]), -+ PROP(RAW_JS_FEATURES_14, raw_props.js_features[14]), -+ PROP(RAW_JS_FEATURES_15, raw_props.js_features[15]), -+ PROP(RAW_TILER_FEATURES, raw_props.tiler_features), -+ PROP(RAW_TEXTURE_FEATURES_0, raw_props.texture_features[0]), -+ PROP(RAW_TEXTURE_FEATURES_1, raw_props.texture_features[1]), -+ PROP(RAW_TEXTURE_FEATURES_2, raw_props.texture_features[2]), -+ PROP(RAW_GPU_ID, raw_props.gpu_id), -+ PROP(RAW_THREAD_MAX_THREADS, raw_props.thread_max_threads), -+ PROP(RAW_THREAD_MAX_WORKGROUP_SIZE, -+ raw_props.thread_max_workgroup_size), -+ PROP(RAW_THREAD_MAX_BARRIER_SIZE, raw_props.thread_max_barrier_size), -+ PROP(RAW_THREAD_FEATURES, raw_props.thread_features), -+ PROP(RAW_COHERENCY_MODE, raw_props.coherency_mode), ++ TP_PROTO(pid_t pid, pid_t tid, void *surface_id, unsigned int *counters), + -+ PROP(COHERENCY_NUM_GROUPS, coherency_info.num_groups), -+ PROP(COHERENCY_NUM_CORE_GROUPS, coherency_info.num_core_groups), -+ PROP(COHERENCY_COHERENCY, coherency_info.coherency), -+ PROP(COHERENCY_GROUP_0, coherency_info.group[0].core_mask), -+ PROP(COHERENCY_GROUP_1, coherency_info.group[1].core_mask), -+ PROP(COHERENCY_GROUP_2, coherency_info.group[2].core_mask), -+ PROP(COHERENCY_GROUP_3, coherency_info.group[3].core_mask), -+ PROP(COHERENCY_GROUP_4, coherency_info.group[4].core_mask), -+ PROP(COHERENCY_GROUP_5, coherency_info.group[5].core_mask), -+ PROP(COHERENCY_GROUP_6, coherency_info.group[6].core_mask), -+ PROP(COHERENCY_GROUP_7, coherency_info.group[7].core_mask), -+ PROP(COHERENCY_GROUP_8, coherency_info.group[8].core_mask), -+ PROP(COHERENCY_GROUP_9, coherency_info.group[9].core_mask), -+ PROP(COHERENCY_GROUP_10, coherency_info.group[10].core_mask), -+ PROP(COHERENCY_GROUP_11, coherency_info.group[11].core_mask), -+ PROP(COHERENCY_GROUP_12, coherency_info.group[12].core_mask), -+ PROP(COHERENCY_GROUP_13, coherency_info.group[13].core_mask), -+ PROP(COHERENCY_GROUP_14, coherency_info.group[14].core_mask), -+ PROP(COHERENCY_GROUP_15, coherency_info.group[15].core_mask), ++ TP_ARGS(pid, tid, surface_id, counters), + -+#undef PROP -+}; ++ TP_STRUCT__entry( ++ __field(pid_t, pid) ++ __field(pid_t, tid) ++ __field(void *, surface_id) ++ __field(unsigned int *, counters) ++ ), + -+int kbase_gpuprops_populate_user_buffer(struct kbase_device *kbdev) -+{ -+ struct kbase_gpu_props *kprops = &kbdev->gpu_props; -+ struct mali_base_gpu_props *props = &kprops->props; -+ u32 count = ARRAY_SIZE(gpu_property_mapping); -+ u32 i; -+ u32 size = 0; -+ u8 *p; ++ TP_fast_assign( ++ __entry->pid = pid; ++ __entry->tid = tid; ++ __entry->surface_id = surface_id; ++ __entry->counters = counters; ++ ), + -+ for (i = 0; i < count; i++) { -+ /* 4 bytes for the ID, and the size of the property */ -+ size += 4 + gpu_property_mapping[i].size; -+ } ++ TP_printk("counters were %s", __entry->counters == NULL ? "NULL" : "not NULL") ++ ); + -+ kprops->prop_buffer_size = size; -+ kprops->prop_buffer = kmalloc(size, GFP_KERNEL); ++/** ++ * Define a tracepoint used to gather core activity for systrace ++ * @param pid The process id for which the core activity originates from ++ * @param active If the core is active (1) or not (0) ++ * @param core_type The type of core active, either GP (1) or PP (0) ++ * @param core_id The core id that is active for the core_type ++ * @param frame_builder_id The frame builder id associated with this core activity ++ * @param flush_id The flush id associated with this core activity ++ */ ++TRACE_EVENT(mali_core_active, + -+ if (!kprops->prop_buffer) { -+ kprops->prop_buffer_size = 0; -+ return -ENOMEM; -+ } ++ TP_PROTO(pid_t pid, unsigned int active, unsigned int core_type, unsigned int core_id, unsigned int frame_builder_id, unsigned int flush_id), + -+ p = kprops->prop_buffer; ++ TP_ARGS(pid, active, core_type, core_id, frame_builder_id, flush_id), + -+#define WRITE_U8(v) (*p++ = (v) & 0xFF) -+#define WRITE_U16(v) do { WRITE_U8(v); WRITE_U8((v) >> 8); } while (0) -+#define WRITE_U32(v) do { WRITE_U16(v); WRITE_U16((v) >> 16); } while (0) -+#define WRITE_U64(v) do { WRITE_U32(v); WRITE_U32((v) >> 32); } while (0) ++ TP_STRUCT__entry( ++ __field(pid_t, pid) ++ __field(unsigned int, active) ++ __field(unsigned int, core_type) ++ __field(unsigned int, core_id) ++ __field(unsigned int, frame_builder_id) ++ __field(unsigned int, flush_id) ++ ), + -+ for (i = 0; i < count; i++) { -+ u32 type = gpu_property_mapping[i].type; -+ u8 type_size; -+ void *field = ((u8 *)props) + gpu_property_mapping[i].offset; ++ TP_fast_assign( ++ __entry->pid = pid; ++ __entry->active = active; ++ __entry->core_type = core_type; ++ __entry->core_id = core_id; ++ __entry->frame_builder_id = frame_builder_id; ++ __entry->flush_id = flush_id; ++ ), + -+ switch (gpu_property_mapping[i].size) { -+ case 1: -+ type_size = KBASE_GPUPROP_VALUE_SIZE_U8; -+ break; -+ case 2: -+ type_size = KBASE_GPUPROP_VALUE_SIZE_U16; -+ break; -+ case 4: -+ type_size = KBASE_GPUPROP_VALUE_SIZE_U32; -+ break; -+ case 8: -+ type_size = KBASE_GPUPROP_VALUE_SIZE_U64; -+ break; -+ default: -+ dev_err(kbdev->dev, -+ "Invalid gpu_property_mapping type=%d size=%d", -+ type, gpu_property_mapping[i].size); -+ return -EINVAL; -+ } ++ TP_printk("%s|%d|%s%i:%x|%d", __entry->active ? "S" : "F", __entry->pid, __entry->core_type ? "GP" : "PP", __entry->core_id, __entry->flush_id, __entry->frame_builder_id) ++ ); + -+ WRITE_U32((type<<2) | type_size); ++#endif /* MALI_LINUX_TRACE_H */ + -+ switch (type_size) { -+ case KBASE_GPUPROP_VALUE_SIZE_U8: -+ WRITE_U8(*((u8 *)field)); -+ break; -+ case KBASE_GPUPROP_VALUE_SIZE_U16: -+ WRITE_U16(*((u16 *)field)); -+ break; -+ case KBASE_GPUPROP_VALUE_SIZE_U32: -+ WRITE_U32(*((u32 *)field)); -+ break; -+ case KBASE_GPUPROP_VALUE_SIZE_U64: -+ WRITE_U64(*((u64 *)field)); -+ break; -+ default: /* Cannot be reached */ -+ WARN_ON(1); -+ return -EINVAL; -+ } -+ } ++/* This part must exist outside the header guard. */ ++#include + -+ return 0; -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops.h +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory.c new file mode 100755 -index 000000000000..57b3eaf9cd53 +index 000000000..dfc769e6c --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops.h -@@ -0,0 +1,84 @@ ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.c +@@ -0,0 +1,531 @@ +/* -+ * -+ * (C) COPYRIGHT 2011-2015,2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + ++#include "mali_osk.h" ++#include "mali_executor.h" + ++#include "mali_memory.h" ++#include "mali_memory_os_alloc.h" ++#include "mali_memory_block_alloc.h" ++#include "mali_memory_util.h" ++#include "mali_memory_virtual.h" ++#include "mali_memory_manager.h" ++#include "mali_memory_cow.h" ++#include "mali_memory_swap_alloc.h" ++#include "mali_memory_defer_bind.h" ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++#include "mali_memory_secure.h" ++#endif + ++extern unsigned int mali_dedicated_mem_size; ++extern unsigned int mali_shared_mem_size; + -+/** -+ * @file mali_kbase_gpuprops.h -+ * Base kernel property query APIs -+ */ ++#define MALI_VM_NUM_FAULT_PREFETCH (0x8) + -+#ifndef _KBASE_GPUPROPS_H_ -+#define _KBASE_GPUPROPS_H_ ++static void mali_mem_vma_open(struct vm_area_struct *vma) ++{ ++ mali_mem_allocation *alloc = (mali_mem_allocation *)vma->vm_private_data; ++ MALI_DEBUG_PRINT(4, ("Open called on vma %p\n", vma)); + -+#include "mali_kbase_gpuprops_types.h" ++ /* If need to share the allocation, add ref_count here */ ++ mali_allocation_ref(alloc); ++ return; ++} ++static void mali_mem_vma_close(struct vm_area_struct *vma) ++{ ++ /* If need to share the allocation, unref ref_count here */ ++ mali_mem_allocation *alloc = (mali_mem_allocation *)vma->vm_private_data; + -+/* Forward definition - see mali_kbase.h */ -+struct kbase_device; ++ mali_allocation_unref(&alloc); ++ vma->vm_private_data = NULL; ++} + -+/** -+ * @brief Set up Kbase GPU properties. -+ * -+ * Set up Kbase GPU properties with information from the GPU registers -+ * -+ * @param kbdev The struct kbase_device structure for the device -+ */ -+void kbase_gpuprops_set(struct kbase_device *kbdev); ++static vm_fault_t mali_mem_vma_fault(struct vm_fault *vmf) ++{ ++ struct vm_area_struct *vma = vmf->vma; ++ mali_mem_allocation *alloc = (mali_mem_allocation *)vma->vm_private_data; ++ mali_mem_backend *mem_bkend = NULL; ++ int ret; ++ int prefetch_num = MALI_VM_NUM_FAULT_PREFETCH; + -+/** -+ * kbase_gpuprops_set_features - Set up Kbase GPU properties -+ * @kbdev: Device pointer -+ * -+ * This function sets up GPU properties that are dependent on the hardware -+ * features bitmask. This function must be preceeded by a call to -+ * kbase_hw_set_features_mask(). -+ */ -+void kbase_gpuprops_set_features(struct kbase_device *kbdev); ++ unsigned long address = (unsigned long)vmf->address; ++ MALI_DEBUG_ASSERT(alloc->backend_handle); ++ MALI_DEBUG_ASSERT((unsigned long)alloc->cpu_mapping.addr <= address); + -+/** -+ * @brief Provide GPU properties to userside through UKU call. -+ * -+ * Fill the struct kbase_uk_gpuprops with values from GPU configuration registers. -+ * -+ * @param kctx The struct kbase_context structure -+ * @param kbase_props A copy of the struct kbase_uk_gpuprops structure from userspace -+ * -+ * @return 0 on success. Any other value indicates failure. -+ */ -+int kbase_gpuprops_uk_get_props(struct kbase_context *kctx, struct kbase_uk_gpuprops * const kbase_props); ++ /* Get backend memory & Map on CPU */ ++ mutex_lock(&mali_idr_mutex); ++ if (!(mem_bkend = idr_find(&mali_backend_idr, alloc->backend_handle))) { ++ MALI_DEBUG_PRINT(1, ("Can't find memory backend in mmap!\n")); ++ mutex_unlock(&mali_idr_mutex); ++ return VM_FAULT_SIGBUS; ++ } ++ mutex_unlock(&mali_idr_mutex); ++ MALI_DEBUG_ASSERT(mem_bkend->type == alloc->type); + -+/** -+ * kbase_gpuprops_populate_user_buffer - Populate the GPU properties buffer -+ * @kbdev: The kbase device -+ * -+ * Fills kbdev->gpu_props->prop_buffer with the GPU properties for user -+ * space to read. -+ */ -+int kbase_gpuprops_populate_user_buffer(struct kbase_device *kbdev); ++ if ((mem_bkend->type == MALI_MEM_COW && (MALI_MEM_BACKEND_FLAG_SWAP_COWED != ++ (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED))) && ++ (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_COW_CPU_NO_WRITE)) { ++ /*check if use page fault to do COW*/ ++ MALI_DEBUG_PRINT(4, ("mali_vma_fault: do cow allocate on demand!, address=0x%x\n", address)); ++ mutex_lock(&mem_bkend->mutex); ++ ret = mali_mem_cow_allocate_on_demand(mem_bkend, ++ (address - vma->vm_start) / PAGE_SIZE); ++ mutex_unlock(&mem_bkend->mutex); + -+/** -+ * kbase_gpuprops_update_core_props_gpu_id - break down gpu id value -+ * @gpu_props: the &base_gpu_props structure -+ * -+ * Break down gpu_id value stored in base_gpu_props::raw_props.gpu_id into -+ * separate fields (version_status, minor_revision, major_revision, product_id) -+ * stored in base_gpu_props::core_props. -+ */ -+void kbase_gpuprops_update_core_props_gpu_id(base_gpu_props * const gpu_props); ++ if (ret != _MALI_OSK_ERR_OK) { ++ return VM_FAULT_OOM; ++ } ++ prefetch_num = 1; + ++ /* handle COW modified range cpu mapping ++ we zap the mapping in cow_modify_range, it will trigger page fault ++ when CPU access it, so here we map it to CPU*/ ++ mutex_lock(&mem_bkend->mutex); ++ ret = mali_mem_cow_cpu_map_pages_locked(mem_bkend, vma, address, prefetch_num); ++ mutex_unlock(&mem_bkend->mutex); + -+#endif /* _KBASE_GPUPROPS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops_types.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops_types.h -new file mode 100755 -index 000000000000..10794fc27318 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops_types.h -@@ -0,0 +1,92 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ if (unlikely(ret != _MALI_OSK_ERR_OK)) { ++ return VM_FAULT_SIGBUS; ++ } ++ } else if ((mem_bkend->type == MALI_MEM_SWAP) || ++ (mem_bkend->type == MALI_MEM_COW && (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED))) { ++ u32 offset_in_bkend = (address - vma->vm_start) / PAGE_SIZE; ++ int ret = _MALI_OSK_ERR_OK; + ++ mutex_lock(&mem_bkend->mutex); ++ if (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_COW_CPU_NO_WRITE) { ++ ret = mali_mem_swap_cow_page_on_demand(mem_bkend, offset_in_bkend, &vmf->page); ++ } else { ++ ret = mali_mem_swap_allocate_page_on_demand(mem_bkend, offset_in_bkend, &vmf->page); ++ } ++ mutex_unlock(&mem_bkend->mutex); + ++ if (ret != _MALI_OSK_ERR_OK) { ++ MALI_DEBUG_PRINT(2, ("Mali swap memory page fault process failed, address=0x%x\n", address)); ++ return VM_FAULT_OOM; ++ } else { ++ return VM_FAULT_LOCKED; ++ } ++ } else { ++ MALI_PRINT_ERROR(("Mali vma fault! It never happen, indicating some logic errors in caller.\n")); ++ /*NOT support yet or OOM*/ ++ return VM_FAULT_OOM; ++ } ++ return VM_FAULT_NOPAGE; ++} + ++static struct vm_operations_struct mali_kernel_vm_ops = { ++ .open = mali_mem_vma_open, ++ .close = mali_mem_vma_close, ++ .fault = mali_mem_vma_fault, ++}; + + -+/** -+ * @file mali_kbase_gpuprops_types.h -+ * Base kernel property query APIs -+ */ ++/** @ map mali allocation to CPU address ++* ++* Supported backend types: ++* --MALI_MEM_OS ++* -- need to add COW? ++ *Not supported backend types: ++* -_MALI_MEMORY_BIND_BACKEND_UMP ++* -_MALI_MEMORY_BIND_BACKEND_DMA_BUF ++* -_MALI_MEMORY_BIND_BACKEND_EXTERNAL_MEMORY ++* ++*/ ++int mali_mmap(struct file *filp, struct vm_area_struct *vma) ++{ ++ struct mali_session_data *session; ++ mali_mem_allocation *mali_alloc = NULL; ++ u32 mali_addr = vma->vm_pgoff << PAGE_SHIFT; ++ struct mali_vma_node *mali_vma_node = NULL; ++ mali_mem_backend *mem_bkend = NULL; ++ int ret = -EFAULT; + -+#ifndef _KBASE_GPUPROPS_TYPES_H_ -+#define _KBASE_GPUPROPS_TYPES_H_ ++ session = (struct mali_session_data *)filp->private_data; ++ if (NULL == session) { ++ MALI_PRINT_ERROR(("mmap called without any session data available\n")); ++ return -EFAULT; ++ } + -+#include "mali_base_kernel.h" ++ MALI_DEBUG_PRINT(4, ("MMap() handler: start=0x%08X, phys=0x%08X, size=0x%08X vma->flags 0x%08x\n", ++ (unsigned int)vma->vm_start, (unsigned int)(vma->vm_pgoff << PAGE_SHIFT), ++ (unsigned int)(vma->vm_end - vma->vm_start), vma->vm_flags)); + -+#define KBASE_GPU_SPEED_MHZ 123 -+#define KBASE_GPU_PC_SIZE_LOG2 24U ++ /* Operations used on any memory system */ ++ /* do not need to anything in vm open/close now */ + -+struct kbase_gpuprops_regdump { -+ u32 gpu_id; -+ u32 l2_features; -+ u32 suspend_size; /* API 8.2+ */ -+ u32 tiler_features; -+ u32 mem_features; -+ u32 mmu_features; -+ u32 as_present; -+ u32 js_present; -+ u32 thread_max_threads; -+ u32 thread_max_workgroup_size; -+ u32 thread_max_barrier_size; -+ u32 thread_features; -+ u32 texture_features[BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS]; -+ u32 js_features[GPU_MAX_JOB_SLOTS]; -+ u32 shader_present_lo; -+ u32 shader_present_hi; -+ u32 tiler_present_lo; -+ u32 tiler_present_hi; -+ u32 l2_present_lo; -+ u32 l2_present_hi; -+ u32 stack_present_lo; -+ u32 stack_present_hi; -+ u32 coherency_features; -+}; ++ /* find mali allocation structure by vaddress*/ ++ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, mali_addr, 0); ++ if (likely(mali_vma_node)) { ++ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); ++ MALI_DEBUG_ASSERT(mali_addr == mali_vma_node->vm_node.start); ++ if (unlikely(mali_addr != mali_vma_node->vm_node.start)) { ++ /* only allow to use start address for mmap */ ++ MALI_DEBUG_PRINT(1, ("mali_addr != mali_vma_node->vm_node.start\n")); ++ return -EFAULT; ++ } ++ } else { ++ MALI_DEBUG_ASSERT(NULL == mali_vma_node); ++ return -EFAULT; ++ } + -+struct kbase_gpu_cache_props { -+ u8 associativity; -+ u8 external_bus_width; -+}; ++ mali_alloc->cpu_mapping.addr = (void __user *)vma->vm_start; + -+struct kbase_gpu_mem_props { -+ u8 core_group; -+}; ++ if (mali_alloc->flags & _MALI_MEMORY_ALLOCATE_DEFER_BIND) { ++ MALI_DEBUG_PRINT(1, ("ERROR : trying to access varying memory by CPU!\n")); ++ return -EFAULT; ++ } + -+struct kbase_gpu_mmu_props { -+ u8 va_bits; -+ u8 pa_bits; -+}; ++ /* Get backend memory & Map on CPU */ ++ mutex_lock(&mali_idr_mutex); ++ if (!(mem_bkend = idr_find(&mali_backend_idr, mali_alloc->backend_handle))) { ++ MALI_DEBUG_PRINT(1, ("Can't find memory backend in mmap!\n")); ++ mutex_unlock(&mali_idr_mutex); ++ return -EFAULT; ++ } ++ mutex_unlock(&mali_idr_mutex); + -+struct kbase_gpu_props { -+ /* kernel-only properties */ -+ u8 num_cores; -+ u8 num_core_groups; -+ u8 num_address_spaces; -+ u8 num_job_slots; ++ if (!(MALI_MEM_SWAP == mali_alloc->type || ++ (MALI_MEM_COW == mali_alloc->type && (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED)))) { ++ /* Set some bits which indicate that, the memory is IO memory, meaning ++ * that no paging is to be performed and the memory should not be ++ * included in crash dumps. And that the memory is reserved, meaning ++ * that it's present and can never be paged out (see also previous ++ * entry) ++ */ ++ vma->vm_flags |= VM_IO; ++ vma->vm_flags |= VM_DONTCOPY; ++ vma->vm_flags |= VM_PFNMAP; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0) ++ vma->vm_flags |= VM_RESERVED; ++#else ++ vma->vm_flags |= VM_DONTDUMP; ++ vma->vm_flags |= VM_DONTEXPAND; ++#endif ++ } else if (MALI_MEM_SWAP == mali_alloc->type) { ++ vma->vm_pgoff = mem_bkend->start_idx; ++ } + -+ struct kbase_gpu_cache_props l2_props; ++ vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); ++ vma->vm_ops = &mali_kernel_vm_ops; + -+ struct kbase_gpu_mem_props mem; -+ struct kbase_gpu_mmu_props mmu; ++ mali_alloc->cpu_mapping.addr = (void __user *)vma->vm_start; + -+ /* Properties shared with userspace */ -+ base_gpu_props props; ++ /* If it's a copy-on-write mapping, map to read only */ ++ if (!(vma->vm_flags & VM_WRITE)) { ++ MALI_DEBUG_PRINT(4, ("mmap allocation with read only !\n")); ++ /* add VM_WRITE for do_page_fault will check this when a write fault */ ++ vma->vm_flags |= VM_WRITE | VM_READ; ++ vma->vm_page_prot = PAGE_READONLY; ++ vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); ++ mem_bkend->flags |= MALI_MEM_BACKEND_FLAG_COW_CPU_NO_WRITE; ++ goto out; ++ } + -+ u32 prop_buffer_size; -+ void *prop_buffer; -+}; ++ if (mem_bkend->type == MALI_MEM_OS) { ++ ret = mali_mem_os_cpu_map(mem_bkend, vma); ++ } else if (mem_bkend->type == MALI_MEM_COW && ++ (MALI_MEM_BACKEND_FLAG_SWAP_COWED != (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED))) { ++ ret = mali_mem_cow_cpu_map(mem_bkend, vma); ++ } else if (mem_bkend->type == MALI_MEM_BLOCK) { ++ ret = mali_mem_block_cpu_map(mem_bkend, vma); ++ } else if ((mem_bkend->type == MALI_MEM_SWAP) || (mem_bkend->type == MALI_MEM_COW && ++ (MALI_MEM_BACKEND_FLAG_SWAP_COWED == (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED)))) { ++ /*For swappable memory, CPU page table will be created by page fault handler. */ ++ ret = 0; ++ } else if (mem_bkend->type == MALI_MEM_SECURE) { ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++ ret = mali_mem_secure_cpu_map(mem_bkend, vma); ++#else ++ MALI_DEBUG_PRINT(1, ("DMA not supported for mali secure memory\n")); ++ return -EFAULT; ++#endif ++ } else { ++ /* Not support yet*/ ++ MALI_DEBUG_PRINT_ERROR(("Invalid type of backend memory! \n")); ++ return -EFAULT; ++ } + -+#endif /* _KBASE_GPUPROPS_TYPES_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hw.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hw.c -new file mode 100755 -index 000000000000..eb8368ccee5e ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hw.c -@@ -0,0 +1,446 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ if (ret != 0) { ++ MALI_DEBUG_PRINT(1, ("ret != 0\n")); ++ return -EFAULT; ++ } ++out: ++ MALI_DEBUG_ASSERT(MALI_MEM_ALLOCATION_VALID_MAGIC == mali_alloc->magic); + ++ vma->vm_private_data = (void *)mali_alloc; ++ mali_alloc->cpu_mapping.vma = vma; + ++ mali_allocation_ref(mali_alloc); + ++ return 0; ++} + ++_mali_osk_errcode_t mali_mem_mali_map_prepare(mali_mem_allocation *descriptor) ++{ ++ u32 size = descriptor->psize; ++ struct mali_session_data *session = descriptor->session; + -+/* -+ * Run-time work-arounds helpers -+ */ ++ MALI_DEBUG_ASSERT(MALI_MEM_ALLOCATION_VALID_MAGIC == descriptor->magic); + -+#include -+#include -+#include -+#include "mali_kbase.h" -+#include "mali_kbase_hw.h" ++ /* Map dma-buf into this session's page tables */ + -+void kbase_hw_set_features_mask(struct kbase_device *kbdev) ++ if (descriptor->flags & MALI_MEM_FLAG_MALI_GUARD_PAGE) { ++ size += MALI_MMU_PAGE_SIZE; ++ } ++ ++ return mali_mmu_pagedir_map(session->page_directory, descriptor->mali_vma_node.vm_node.start, size); ++} ++ ++_mali_osk_errcode_t mali_mem_mali_map_resize(mali_mem_allocation *descriptor, u32 new_size) +{ -+ const enum base_hw_feature *features; -+ u32 gpu_id; -+ u32 product_id; ++ u32 old_size = descriptor->psize; ++ struct mali_session_data *session = descriptor->session; + -+ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ product_id = gpu_id & GPU_ID_VERSION_PRODUCT_ID; -+ product_id >>= GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++ MALI_DEBUG_ASSERT(MALI_MEM_ALLOCATION_VALID_MAGIC == descriptor->magic); + -+ if (GPU_ID_IS_NEW_FORMAT(product_id)) { -+ switch (gpu_id & GPU_ID2_PRODUCT_MODEL) { -+ case GPU_ID2_PRODUCT_TMIX: -+ features = base_hw_features_tMIx; -+ break; -+ case GPU_ID2_PRODUCT_THEX: -+ features = base_hw_features_tHEx; -+ break; -+ case GPU_ID2_PRODUCT_TSIX: -+ features = base_hw_features_tSIx; -+ break; -+ case GPU_ID2_PRODUCT_TDVX: -+ features = base_hw_features_tDVx; -+ break; -+ default: -+ features = base_hw_features_generic; -+ break; -+ } -+ } else { -+ switch (product_id) { -+ case GPU_ID_PI_TFRX: -+ /* FALLTHROUGH */ -+ case GPU_ID_PI_T86X: -+ features = base_hw_features_tFxx; -+ break; -+ case GPU_ID_PI_T83X: -+ features = base_hw_features_t83x; -+ break; -+ case GPU_ID_PI_T82X: -+ features = base_hw_features_t82x; -+ break; -+ case GPU_ID_PI_T76X: -+ features = base_hw_features_t76x; -+ break; -+ case GPU_ID_PI_T72X: -+ features = base_hw_features_t72x; -+ break; -+ case GPU_ID_PI_T62X: -+ features = base_hw_features_t62x; -+ break; -+ case GPU_ID_PI_T60X: -+ features = base_hw_features_t60x; -+ break; -+ default: -+ features = base_hw_features_generic; -+ break; -+ } ++ if (descriptor->flags & MALI_MEM_FLAG_MALI_GUARD_PAGE) { ++ new_size += MALI_MMU_PAGE_SIZE; + } + -+ for (; *features != BASE_HW_FEATURE_END; features++) -+ set_bit(*features, &kbdev->hw_features_mask[0]); ++ if (new_size > old_size) { ++ MALI_DEBUG_ASSERT(new_size <= descriptor->mali_vma_node.vm_node.size); ++ return mali_mmu_pagedir_map(session->page_directory, descriptor->mali_vma_node.vm_node.start + old_size, new_size - old_size); ++ } ++ return _MALI_OSK_ERR_OK; +} + -+/** -+ * kbase_hw_get_issues_for_new_id - Get the hardware issues for a new GPU ID -+ * @kbdev: Device pointer -+ * -+ * Return: pointer to an array of hardware issues, terminated by -+ * BASE_HW_ISSUE_END. -+ * -+ * This function can only be used on new-format GPU IDs, i.e. those for which -+ * GPU_ID_IS_NEW_FORMAT evaluates as true. The GPU ID is read from the @kbdev. -+ * -+ * In debugging versions of the driver, unknown versions of a known GPU will -+ * be treated as the most recent known version not later than the actual -+ * version. In such circumstances, the GPU ID in @kbdev will also be replaced -+ * with the most recent known version. -+ * -+ * Note: The GPU configuration must have been read by kbase_gpuprops_get_props() -+ * before calling this function. -+ */ -+static const enum base_hw_issue *kbase_hw_get_issues_for_new_id( -+ struct kbase_device *kbdev) ++void mali_mem_mali_map_free(struct mali_session_data *session, u32 size, mali_address_t vaddr, u32 flags) +{ -+ const enum base_hw_issue *issues = NULL; ++ if (flags & MALI_MEM_FLAG_MALI_GUARD_PAGE) { ++ size += MALI_MMU_PAGE_SIZE; ++ } + -+ struct base_hw_product { -+ u32 product_model; -+ struct { -+ u32 version; -+ const enum base_hw_issue *issues; -+ } map[7]; -+ }; ++ /* Umap and flush L2 */ ++ mali_mmu_pagedir_unmap(session->page_directory, vaddr, size); ++ mali_executor_zap_all_active(session); ++} + -+ static const struct base_hw_product base_hw_products[] = { -+ {GPU_ID2_PRODUCT_TMIX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 1), -+ base_hw_issues_tMIx_r0p0_05dev0}, -+ {GPU_ID2_VERSION_MAKE(0, 0, 2), base_hw_issues_tMIx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tMIx_r0p1}, -+ {U32_MAX /* sentinel value */, NULL} } }, ++u32 _mali_ukk_report_memory_usage(void) ++{ ++ u32 sum = 0; + -+ {GPU_ID2_PRODUCT_THEX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tHEx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 0, 1), base_hw_issues_tHEx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tHEx_r0p1}, -+ {GPU_ID2_VERSION_MAKE(0, 1, 1), base_hw_issues_tHEx_r0p1}, -+ {GPU_ID2_VERSION_MAKE(0, 2, 0), base_hw_issues_tHEx_r0p2}, -+ {GPU_ID2_VERSION_MAKE(0, 3, 0), base_hw_issues_tHEx_r0p3}, -+ {U32_MAX, NULL} } }, ++ if (MALI_TRUE == mali_memory_have_dedicated_memory()) { ++ sum += mali_mem_block_allocator_stat(); ++ } + -+ {GPU_ID2_PRODUCT_TSIX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tSIx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 0, 1), base_hw_issues_tSIx_r0p0}, -+ {GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tSIx_r0p1}, -+ {GPU_ID2_VERSION_MAKE(1, 0, 0), base_hw_issues_tSIx_r1p0}, -+ {GPU_ID2_VERSION_MAKE(1, 1, 0), base_hw_issues_tSIx_r1p1}, -+ {U32_MAX, NULL} } }, ++ sum += mali_mem_os_stat(); + -+ {GPU_ID2_PRODUCT_TDVX, -+ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tDVx_r0p0}, -+ {U32_MAX, NULL} } }, ++ return sum; ++} + ++u32 _mali_ukk_report_total_memory_size(void) ++{ ++ return mali_dedicated_mem_size + mali_shared_mem_size; ++} + + ++/** ++ * Per-session memory descriptor mapping table sizes ++ */ ++#define MALI_MEM_DESCRIPTORS_INIT 64 ++#define MALI_MEM_DESCRIPTORS_MAX 65536 + -+ }; ++_mali_osk_errcode_t mali_memory_session_begin(struct mali_session_data *session_data) ++{ ++ MALI_DEBUG_PRINT(5, ("Memory session begin\n")); + -+ u32 gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ const u32 product_model = gpu_id & GPU_ID2_PRODUCT_MODEL; -+ const struct base_hw_product *product = NULL; -+ size_t p; ++ session_data->memory_lock = _mali_osk_mutex_init(_MALI_OSK_LOCKFLAG_ORDERED, ++ _MALI_OSK_LOCK_ORDER_MEM_SESSION); + -+ /* Stop when we reach the end of the products array. */ -+ for (p = 0; p < ARRAY_SIZE(base_hw_products); ++p) { -+ if (product_model == base_hw_products[p].product_model) { -+ product = &base_hw_products[p]; -+ break; -+ } ++ if (NULL == session_data->memory_lock) { ++ MALI_ERROR(_MALI_OSK_ERR_FAULT); + } + -+ if (product != NULL) { -+ /* Found a matching product. */ -+ const u32 version = gpu_id & GPU_ID2_VERSION; -+#if !MALI_CUSTOMER_RELEASE -+ u32 fallback_version = 0; -+ const enum base_hw_issue *fallback_issues = NULL; -+#endif -+ size_t v; ++ session_data->cow_lock = _mali_osk_mutex_init(_MALI_OSK_LOCKFLAG_UNORDERED, 0); ++ if (NULL == session_data->cow_lock) { ++ _mali_osk_mutex_term(session_data->memory_lock); ++ MALI_ERROR(_MALI_OSK_ERR_FAULT); ++ } + -+ /* Stop when we reach the end of the map. */ -+ for (v = 0; product->map[v].version != U32_MAX; ++v) { ++ mali_memory_manager_init(&session_data->allocation_mgr); + -+ if (version == product->map[v].version) { -+ /* Exact match so stop. */ -+ issues = product->map[v].issues; -+ break; -+ } ++ MALI_DEBUG_PRINT(5, ("MMU session begin: success\n")); ++ MALI_SUCCESS; ++} + -+#if !MALI_CUSTOMER_RELEASE -+ /* Check whether this is a candidate for most recent -+ known version not later than the actual -+ version. */ -+ if ((version > product->map[v].version) && -+ (product->map[v].version >= fallback_version)) { -+ fallback_version = product->map[v].version; -+ fallback_issues = product->map[v].issues; -+ } -+#endif -+ } ++void mali_memory_session_end(struct mali_session_data *session) ++{ ++ MALI_DEBUG_PRINT(3, ("MMU session end\n")); + -+#if !MALI_CUSTOMER_RELEASE -+ if ((issues == NULL) && (fallback_issues != NULL)) { -+ /* Fall back to the issue set of the most recent known -+ version not later than the actual version. */ -+ issues = fallback_issues; ++ if (NULL == session) { ++ MALI_DEBUG_PRINT(1, ("No session data found during session end\n")); ++ return; ++ } ++ /* free allocation */ ++ mali_free_session_allocations(session); ++ /* do some check in unint*/ ++ mali_memory_manager_uninit(&session->allocation_mgr); + -+ dev_info(kbdev->dev, -+ "r%dp%d status %d is unknown; treating as r%dp%d status %d", -+ (gpu_id & GPU_ID2_VERSION_MAJOR) >> -+ GPU_ID2_VERSION_MAJOR_SHIFT, -+ (gpu_id & GPU_ID2_VERSION_MINOR) >> -+ GPU_ID2_VERSION_MINOR_SHIFT, -+ (gpu_id & GPU_ID2_VERSION_STATUS) >> -+ GPU_ID2_VERSION_STATUS_SHIFT, -+ (fallback_version & GPU_ID2_VERSION_MAJOR) >> -+ GPU_ID2_VERSION_MAJOR_SHIFT, -+ (fallback_version & GPU_ID2_VERSION_MINOR) >> -+ GPU_ID2_VERSION_MINOR_SHIFT, -+ (fallback_version & GPU_ID2_VERSION_STATUS) >> -+ GPU_ID2_VERSION_STATUS_SHIFT); ++ /* Free the lock */ ++ _mali_osk_mutex_term(session->memory_lock); ++ _mali_osk_mutex_term(session->cow_lock); ++ return; ++} + -+ gpu_id &= ~GPU_ID2_VERSION; -+ gpu_id |= fallback_version; -+ kbdev->gpu_props.props.raw_props.gpu_id = gpu_id; ++_mali_osk_errcode_t mali_memory_initialize(void) ++{ ++ _mali_osk_errcode_t err; + -+ kbase_gpuprops_update_core_props_gpu_id( -+ &kbdev->gpu_props.props); -+ } -+#endif ++ idr_init(&mali_backend_idr); ++ mutex_init(&mali_idr_mutex); ++ ++ err = mali_mem_swap_init(); ++ if (err != _MALI_OSK_ERR_OK) { ++ return err; + } -+ return issues; ++ err = mali_mem_os_init(); ++ if (_MALI_OSK_ERR_OK == err) { ++ err = mali_mem_defer_bind_manager_init(); ++ } ++ ++ return err; +} + -+int kbase_hw_set_issues_mask(struct kbase_device *kbdev) ++void mali_memory_terminate(void) +{ -+ const enum base_hw_issue *issues; -+ u32 gpu_id; -+ u32 product_id; -+ u32 impl_tech; ++ mali_mem_swap_term(); ++ mali_mem_defer_bind_manager_destory(); ++ mali_mem_os_term(); ++ if (mali_memory_have_dedicated_memory()) { ++ mali_mem_block_allocator_destroy(); ++ } ++} + -+ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ product_id = gpu_id & GPU_ID_VERSION_PRODUCT_ID; -+ product_id >>= GPU_ID_VERSION_PRODUCT_ID_SHIFT; -+ impl_tech = kbdev->gpu_props.props.thread_props.impl_tech; + -+ if (impl_tech != IMPLEMENTATION_MODEL) { -+ if (GPU_ID_IS_NEW_FORMAT(product_id)) { -+ issues = kbase_hw_get_issues_for_new_id(kbdev); -+ if (issues == NULL) { -+ dev_err(kbdev->dev, -+ "Unknown GPU ID %x", gpu_id); -+ return -EINVAL; -+ } ++struct mali_page_node *_mali_page_node_allocate(mali_page_node_type type) ++{ ++ mali_page_node *page_node = NULL; + -+#if !MALI_CUSTOMER_RELEASE -+ /* The GPU ID might have been replaced with the last -+ known version of the same GPU. */ -+ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+#endif ++ page_node = kzalloc(sizeof(mali_page_node), GFP_KERNEL); ++ MALI_DEBUG_ASSERT(NULL != page_node); + -+ } else { -+ switch (gpu_id) { -+ case GPU_ID_MAKE(GPU_ID_PI_T60X, 0, 0, GPU_ID_S_15DEV0): -+ issues = base_hw_issues_t60x_r0p0_15dev0; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T60X, 0, 0, GPU_ID_S_EAC): -+ issues = base_hw_issues_t60x_r0p0_eac; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T60X, 0, 1, 0): -+ issues = base_hw_issues_t60x_r0p1; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T62X, 0, 1, 0): -+ issues = base_hw_issues_t62x_r0p1; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T62X, 1, 0, 0): -+ case GPU_ID_MAKE(GPU_ID_PI_T62X, 1, 0, 1): -+ issues = base_hw_issues_t62x_r1p0; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T62X, 1, 1, 0): -+ issues = base_hw_issues_t62x_r1p1; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T76X, 0, 0, 1): -+ issues = base_hw_issues_t76x_r0p0; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T76X, 0, 1, 1): -+ issues = base_hw_issues_t76x_r0p1; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T76X, 0, 1, 9): -+ issues = base_hw_issues_t76x_r0p1_50rel0; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T76X, 0, 2, 1): -+ issues = base_hw_issues_t76x_r0p2; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T76X, 0, 3, 1): -+ issues = base_hw_issues_t76x_r0p3; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T76X, 1, 0, 0): -+ issues = base_hw_issues_t76x_r1p0; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T72X, 0, 0, 0): -+ case GPU_ID_MAKE(GPU_ID_PI_T72X, 0, 0, 1): -+ case GPU_ID_MAKE(GPU_ID_PI_T72X, 0, 0, 2): -+ issues = base_hw_issues_t72x_r0p0; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T72X, 1, 0, 0): -+ issues = base_hw_issues_t72x_r1p0; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T72X, 1, 1, 0): -+ issues = base_hw_issues_t72x_r1p1; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_TFRX, 0, 1, 2): -+ issues = base_hw_issues_tFRx_r0p1; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_TFRX, 0, 2, 0): -+ issues = base_hw_issues_tFRx_r0p2; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_TFRX, 1, 0, 0): -+ case GPU_ID_MAKE(GPU_ID_PI_TFRX, 1, 0, 8): -+ issues = base_hw_issues_tFRx_r1p0; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_TFRX, 2, 0, 0): -+ issues = base_hw_issues_tFRx_r2p0; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T86X, 0, 2, 0): -+ issues = base_hw_issues_t86x_r0p2; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T86X, 1, 0, 0): -+ case GPU_ID_MAKE(GPU_ID_PI_T86X, 1, 0, 8): -+ issues = base_hw_issues_t86x_r1p0; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T86X, 2, 0, 0): -+ issues = base_hw_issues_t86x_r2p0; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T83X, 0, 1, 0): -+ issues = base_hw_issues_t83x_r0p1; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T83X, 1, 0, 0): -+ case GPU_ID_MAKE(GPU_ID_PI_T83X, 1, 0, 8): -+ issues = base_hw_issues_t83x_r1p0; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T82X, 0, 0, 0): -+ issues = base_hw_issues_t82x_r0p0; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T82X, 0, 1, 0): -+ issues = base_hw_issues_t82x_r0p1; -+ break; -+ case GPU_ID_MAKE(GPU_ID_PI_T82X, 1, 0, 0): -+ case GPU_ID_MAKE(GPU_ID_PI_T82X, 1, 0, 8): -+ issues = base_hw_issues_t82x_r1p0; -+ break; -+ default: -+ dev_err(kbdev->dev, -+ "Unknown GPU ID %x", gpu_id); -+ return -EINVAL; -+ } -+ } ++ if (page_node) { ++ page_node->type = type; ++ INIT_LIST_HEAD(&page_node->list); ++ } ++ ++ return page_node; ++} ++ ++void _mali_page_node_ref(struct mali_page_node *node) ++{ ++ if (node->type == MALI_PAGE_NODE_OS) { ++ /* add ref to this page */ ++ get_page(node->page); ++ } else if (node->type == MALI_PAGE_NODE_BLOCK) { ++ mali_mem_block_add_ref(node); ++ } else if (node->type == MALI_PAGE_NODE_SWAP) { ++ atomic_inc(&node->swap_it->ref_count); + } else { -+ /* Software model */ -+ if (GPU_ID_IS_NEW_FORMAT(product_id)) { -+ switch (gpu_id & GPU_ID2_PRODUCT_MODEL) { -+ case GPU_ID2_PRODUCT_TMIX: -+ issues = base_hw_issues_model_tMIx; -+ break; -+ case GPU_ID2_PRODUCT_THEX: -+ issues = base_hw_issues_model_tHEx; -+ break; -+ case GPU_ID2_PRODUCT_TSIX: -+ issues = base_hw_issues_model_tSIx; -+ break; -+ case GPU_ID2_PRODUCT_TDVX: -+ issues = base_hw_issues_model_tDVx; -+ break; -+ default: -+ dev_err(kbdev->dev, -+ "Unknown GPU ID %x", gpu_id); -+ return -EINVAL; -+ } -+ } else { -+ switch (product_id) { -+ case GPU_ID_PI_T60X: -+ issues = base_hw_issues_model_t60x; -+ break; -+ case GPU_ID_PI_T62X: -+ issues = base_hw_issues_model_t62x; -+ break; -+ case GPU_ID_PI_T72X: -+ issues = base_hw_issues_model_t72x; -+ break; -+ case GPU_ID_PI_T76X: -+ issues = base_hw_issues_model_t76x; -+ break; -+ case GPU_ID_PI_TFRX: -+ issues = base_hw_issues_model_tFRx; -+ break; -+ case GPU_ID_PI_T86X: -+ issues = base_hw_issues_model_t86x; -+ break; -+ case GPU_ID_PI_T83X: -+ issues = base_hw_issues_model_t83x; -+ break; -+ case GPU_ID_PI_T82X: -+ issues = base_hw_issues_model_t82x; -+ break; -+ default: -+ dev_err(kbdev->dev, "Unknown GPU ID %x", -+ gpu_id); -+ return -EINVAL; -+ } -+ } ++ MALI_DEBUG_PRINT_ERROR(("Invalid type of mali page node! \n")); + } ++} + -+ if (GPU_ID_IS_NEW_FORMAT(product_id)) { -+ dev_info(kbdev->dev, -+ "GPU identified as 0x%x arch %d.%d.%d r%dp%d status %d", -+ (gpu_id & GPU_ID2_PRODUCT_MAJOR) >> -+ GPU_ID2_PRODUCT_MAJOR_SHIFT, -+ (gpu_id & GPU_ID2_ARCH_MAJOR) >> -+ GPU_ID2_ARCH_MAJOR_SHIFT, -+ (gpu_id & GPU_ID2_ARCH_MINOR) >> -+ GPU_ID2_ARCH_MINOR_SHIFT, -+ (gpu_id & GPU_ID2_ARCH_REV) >> -+ GPU_ID2_ARCH_REV_SHIFT, -+ (gpu_id & GPU_ID2_VERSION_MAJOR) >> -+ GPU_ID2_VERSION_MAJOR_SHIFT, -+ (gpu_id & GPU_ID2_VERSION_MINOR) >> -+ GPU_ID2_VERSION_MINOR_SHIFT, -+ (gpu_id & GPU_ID2_VERSION_STATUS) >> -+ GPU_ID2_VERSION_STATUS_SHIFT); ++void _mali_page_node_unref(struct mali_page_node *node) ++{ ++ if (node->type == MALI_PAGE_NODE_OS) { ++ /* unref to this page */ ++ put_page(node->page); ++ } else if (node->type == MALI_PAGE_NODE_BLOCK) { ++ mali_mem_block_dec_ref(node); + } else { -+ dev_info(kbdev->dev, -+ "GPU identified as 0x%04x r%dp%d status %d", -+ (gpu_id & GPU_ID_VERSION_PRODUCT_ID) >> -+ GPU_ID_VERSION_PRODUCT_ID_SHIFT, -+ (gpu_id & GPU_ID_VERSION_MAJOR) >> -+ GPU_ID_VERSION_MAJOR_SHIFT, -+ (gpu_id & GPU_ID_VERSION_MINOR) >> -+ GPU_ID_VERSION_MINOR_SHIFT, -+ (gpu_id & GPU_ID_VERSION_STATUS) >> -+ GPU_ID_VERSION_STATUS_SHIFT); ++ MALI_DEBUG_PRINT_ERROR(("Invalid type of mali page node! \n")); + } ++} + -+ for (; *issues != BASE_HW_ISSUE_END; issues++) -+ set_bit(*issues, &kbdev->hw_issues_mask[0]); + -+ return 0; ++void _mali_page_node_add_page(struct mali_page_node *node, struct page *page) ++{ ++ MALI_DEBUG_ASSERT(MALI_PAGE_NODE_OS == node->type); ++ node->page = page; +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hw.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hw.h -new file mode 100755 -index 000000000000..754250ce968d ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hw.h -@@ -0,0 +1,65 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ + + ++void _mali_page_node_add_swap_item(struct mali_page_node *node, struct mali_swap_item *item) ++{ ++ MALI_DEBUG_ASSERT(MALI_PAGE_NODE_SWAP == node->type); ++ node->swap_it = item; ++} + ++void _mali_page_node_add_block_item(struct mali_page_node *node, mali_block_item *item) ++{ ++ MALI_DEBUG_ASSERT(MALI_PAGE_NODE_BLOCK == node->type); ++ node->blk_it = item; ++} + -+/** -+ * @file -+ * Run-time work-arounds helpers -+ */ + -+#ifndef _KBASE_HW_H_ -+#define _KBASE_HW_H_ ++int _mali_page_node_get_ref_count(struct mali_page_node *node) ++{ ++ if (node->type == MALI_PAGE_NODE_OS) { ++ /* get ref count of this page */ ++ return page_count(node->page); ++ } else if (node->type == MALI_PAGE_NODE_BLOCK) { ++ return mali_mem_block_get_ref_count(node); ++ } else if (node->type == MALI_PAGE_NODE_SWAP) { ++ return atomic_read(&node->swap_it->ref_count); ++ } else { ++ MALI_DEBUG_PRINT_ERROR(("Invalid type of mali page node! \n")); ++ } ++ return -1; ++} + -+#include "mali_kbase_defs.h" + -+/** -+ * @brief Tell whether a work-around should be enabled -+ */ -+#define kbase_hw_has_issue(kbdev, issue)\ -+ test_bit(issue, &(kbdev)->hw_issues_mask[0]) ++dma_addr_t _mali_page_node_get_dma_addr(struct mali_page_node *node) ++{ ++ if (node->type == MALI_PAGE_NODE_OS) { ++ return page_private(node->page); ++ } else if (node->type == MALI_PAGE_NODE_BLOCK) { ++ return _mali_blk_item_get_phy_addr(node->blk_it); ++ } else if (node->type == MALI_PAGE_NODE_SWAP) { ++ return node->swap_it->dma_addr; ++ } else { ++ MALI_DEBUG_PRINT_ERROR(("Invalid type of mali page node! \n")); ++ } ++ return 0; ++} + -+/** -+ * @brief Tell whether a feature is supported -+ */ -+#define kbase_hw_has_feature(kbdev, feature)\ -+ test_bit(feature, &(kbdev)->hw_features_mask[0]) + -+/** -+ * kbase_hw_set_issues_mask - Set the hardware issues mask based on the GPU ID -+ * @kbdev: Device pointer -+ * -+ * Return: 0 if the GPU ID was recognized, otherwise -EINVAL. -+ * -+ * The GPU ID is read from the @kbdev. -+ * -+ * In debugging versions of the driver, unknown versions of a known GPU with a -+ * new-format ID will be treated as the most recent known version not later -+ * than the actual version. In such circumstances, the GPU ID in @kbdev will -+ * also be replaced with the most recent known version. -+ * -+ * Note: The GPU configuration must have been read by -+ * kbase_gpuprops_get_props() before calling this function. -+ */ -+int kbase_hw_set_issues_mask(struct kbase_device *kbdev); ++unsigned long _mali_page_node_get_pfn(struct mali_page_node *node) ++{ ++ if (node->type == MALI_PAGE_NODE_OS) { ++ return page_to_pfn(node->page); ++ } else if (node->type == MALI_PAGE_NODE_BLOCK) { ++ /* get phy addr for BLOCK page*/ ++ return _mali_blk_item_get_pfn(node->blk_it); ++ } else if (node->type == MALI_PAGE_NODE_SWAP) { ++ return page_to_pfn(node->swap_it->page); ++ } else { ++ MALI_DEBUG_PRINT_ERROR(("Invalid type of mali page node! \n")); ++ } ++ return 0; ++} + -+/** -+ * @brief Set the features mask depending on the GPU ID -+ */ -+void kbase_hw_set_features_mask(struct kbase_device *kbdev); + -+#endif /* _KBASE_HW_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_backend.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_backend.h +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h new file mode 100755 -index 000000000000..b09be99e6b4e +index 000000000..efebbef23 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_backend.h -@@ -0,0 +1,54 @@ ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h +@@ -0,0 +1,143 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_MEMORY_H__ ++#define __MALI_MEMORY_H__ + ++#include "mali_osk.h" ++#include "mali_session.h" + ++#include ++#include + -+/* -+ * HW access backend common APIs -+ */ ++#include "mali_memory_types.h" ++#include "mali_memory_os_alloc.h" + -+#ifndef _KBASE_HWACCESS_BACKEND_H_ -+#define _KBASE_HWACCESS_BACKEND_H_ ++_mali_osk_errcode_t mali_memory_initialize(void); ++void mali_memory_terminate(void); + -+/** -+ * kbase_backend_early_init - Perform any backend-specific initialization. -+ * @kbdev: Device pointer ++/** @brief Allocate a page table page + * -+ * Return: 0 on success, or an error code on failure. ++ * Allocate a page for use as a page directory or page table. The page is ++ * mapped into kernel space. ++ * ++ * @return _MALI_OSK_ERR_OK on success, otherwise an error code ++ * @param table_page GPU pointer to the allocated page ++ * @param mapping CPU pointer to the mapping of the allocated page + */ -+int kbase_backend_early_init(struct kbase_device *kbdev); ++MALI_STATIC_INLINE _mali_osk_errcode_t ++mali_mmu_get_table_page(mali_dma_addr *table_page, mali_io_address *mapping) ++{ ++ return mali_mem_os_get_table_page(table_page, mapping); ++} + -+/** -+ * kbase_backend_late_init - Perform any backend-specific initialization. -+ * @kbdev: Device pointer ++/** @brief Release a page table page + * -+ * Return: 0 on success, or an error code on failure. ++ * Release a page table page allocated through \a mali_mmu_get_table_page ++ * ++ * @param pa the GPU address of the page to release + */ -+int kbase_backend_late_init(struct kbase_device *kbdev); ++MALI_STATIC_INLINE void ++mali_mmu_release_table_page(mali_dma_addr phys, void *virt) ++{ ++ mali_mem_os_release_table_page(phys, virt); ++} + -+/** -+ * kbase_backend_early_term - Perform any backend-specific termination. -+ * @kbdev: Device pointer ++/** @brief mmap function ++ * ++ * mmap syscalls on the Mali device node will end up here. ++ * ++ * This function allocates Mali memory and maps it on CPU and Mali. + */ -+void kbase_backend_early_term(struct kbase_device *kbdev); ++int mali_mmap(struct file *filp, struct vm_area_struct *vma); + -+/** -+ * kbase_backend_late_term - Perform any backend-specific termination. -+ * @kbdev: Device pointer ++/** @brief Start a new memory session ++ * ++ * Called when a process opens the Mali device node. ++ * ++ * @param session Pointer to session to initialize + */ -+void kbase_backend_late_term(struct kbase_device *kbdev); ++_mali_osk_errcode_t mali_memory_session_begin(struct mali_session_data *session); + -+#endif /* _KBASE_HWACCESS_BACKEND_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_defs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_defs.h -new file mode 100755 -index 000000000000..0acf297192fd ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_defs.h -@@ -0,0 +1,36 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014, 2016 ARM Limited. All rights reserved. ++/** @brief Close a memory session + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * Called when a process closes the Mali device node. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * Memory allocated by the session will be freed + * ++ * @param session Pointer to the session to terminate + */ ++void mali_memory_session_end(struct mali_session_data *session); + -+ -+ -+ -+/** -+ * @file mali_kbase_hwaccess_gpu_defs.h -+ * HW access common definitions ++/** @brief Prepare Mali page tables for mapping ++ * ++ * This function will prepare the Mali page tables for mapping the memory ++ * described by \a descriptor. ++ * ++ * Page tables will be reference counted and allocated, if not yet present. ++ * ++ * @param descriptor Pointer to the memory descriptor to the mapping + */ ++_mali_osk_errcode_t mali_mem_mali_map_prepare(mali_mem_allocation *descriptor); + -+#ifndef _KBASE_HWACCESS_DEFS_H_ -+#define _KBASE_HWACCESS_DEFS_H_ -+ -+#include -+ -+/* The hwaccess_lock (a spinlock) must be held when accessing this structure */ -+struct kbase_hwaccess_data { -+ struct kbase_context *active_kctx; -+ -+ struct kbase_backend_data backend; -+}; -+ -+#endif /* _KBASE_HWACCESS_DEFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_gpuprops.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_gpuprops.h -new file mode 100755 -index 000000000000..cf8a8131c22e ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_gpuprops.h -@@ -0,0 +1,47 @@ -+/* ++/** @brief Resize Mali page tables for mapping + * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * This function will Resize the Mali page tables for mapping the memory ++ * described by \a descriptor. + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * Page tables will be reference counted and allocated, if not yet present. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * @param descriptor Pointer to the memory descriptor to the mapping ++ * @param new_size The new size of descriptor ++ */ ++_mali_osk_errcode_t mali_mem_mali_map_resize(mali_mem_allocation *descriptor, u32 new_size); ++ ++/** @brief Free Mali page tables for mapping ++ * ++ * This function will unmap pages from Mali memory and free the page tables ++ * that are now unused. + * ++ * The updated pages in the Mali L2 cache will be invalidated, and the MMU TLBs will be zapped if necessary. ++ * ++ * @param descriptor Pointer to the memory descriptor to unmap + */ ++void mali_mem_mali_map_free(struct mali_session_data *session, u32 size, mali_address_t vaddr, u32 flags); + ++/** @brief Parse resource and prepare the OS memory allocator ++ * ++ * @param size Maximum size to allocate for Mali GPU. ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ */ ++_mali_osk_errcode_t mali_memory_core_resource_os_memory(u32 size); + ++/** @brief Parse resource and prepare the dedicated memory allocator ++ * ++ * @param start Physical start address of dedicated Mali GPU memory. ++ * @param size Size of dedicated Mali GPU memory. ++ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ */ ++_mali_osk_errcode_t mali_memory_core_resource_dedicated_memory(u32 start, u32 size); + + -+/** -+ * Base kernel property query backend APIs -+ */ ++struct mali_page_node *_mali_page_node_allocate(mali_page_node_type type); + -+#ifndef _KBASE_HWACCESS_GPUPROPS_H_ -+#define _KBASE_HWACCESS_GPUPROPS_H_ ++void _mali_page_node_ref(struct mali_page_node *node); ++void _mali_page_node_unref(struct mali_page_node *node); ++void _mali_page_node_add_page(struct mali_page_node *node, struct page *page); + -+/** -+ * kbase_backend_gpuprops_get() - Fill @regdump with GPU properties read from -+ * GPU -+ * @kbdev: Device pointer -+ * @regdump: Pointer to struct kbase_gpuprops_regdump structure -+ */ -+void kbase_backend_gpuprops_get(struct kbase_device *kbdev, -+ struct kbase_gpuprops_regdump *regdump); ++void _mali_page_node_add_block_item(struct mali_page_node *node, mali_block_item *item); + -+/** -+ * kbase_backend_gpuprops_get - Fill @regdump with GPU properties read from GPU -+ * @kbdev: Device pointer -+ * @regdump: Pointer to struct kbase_gpuprops_regdump structure -+ * -+ * This function reads GPU properties that are dependent on the hardware -+ * features bitmask -+ */ -+void kbase_backend_gpuprops_get_features(struct kbase_device *kbdev, -+ struct kbase_gpuprops_regdump *regdump); ++void _mali_page_node_add_swap_item(struct mali_page_node *node, struct mali_swap_item *item); + ++int _mali_page_node_get_ref_count(struct mali_page_node *node); ++dma_addr_t _mali_page_node_get_dma_addr(struct mali_page_node *node); ++unsigned long _mali_page_node_get_pfn(struct mali_page_node *node); + -+#endif /* _KBASE_HWACCESS_GPUPROPS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_instr.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_instr.h ++#endif /* __MALI_MEMORY_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c new file mode 100755 -index 000000000000..5de2b7535bb4 +index 000000000..bccef3576 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_instr.h -@@ -0,0 +1,116 @@ ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c +@@ -0,0 +1,362 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include "mali_kernel_common.h" ++#include "mali_memory.h" ++#include "mali_memory_block_alloc.h" ++#include "mali_osk.h" ++#include + + ++static mali_block_allocator *mali_mem_block_gobal_allocator = NULL; + ++unsigned long _mali_blk_item_get_phy_addr(mali_block_item *item) ++{ ++ return (item->phy_addr & ~(MALI_BLOCK_REF_MASK)); ++} + -+/* -+ * HW Access instrumentation common APIs -+ */ + -+#ifndef _KBASE_HWACCESS_INSTR_H_ -+#define _KBASE_HWACCESS_INSTR_H_ ++unsigned long _mali_blk_item_get_pfn(mali_block_item *item) ++{ ++ return (item->phy_addr / MALI_BLOCK_SIZE); ++} + -+#include + -+/** -+ * kbase_instr_hwcnt_enable_internal - Enable HW counters collection -+ * @kbdev: Kbase device -+ * @kctx: Kbase context -+ * @setup: HW counter setup parameters -+ * -+ * Context: might sleep, waiting for reset to complete -+ * -+ * Return: 0 on success -+ */ -+int kbase_instr_hwcnt_enable_internal(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ struct kbase_uk_hwcnt_setup *setup); -+ -+/** -+ * kbase_instr_hwcnt_disable_internal - Disable HW counters collection -+ * @kctx: Kbase context -+ * -+ * Context: might sleep, waiting for an ongoing dump to complete -+ * -+ * Return: 0 on success -+ */ -+int kbase_instr_hwcnt_disable_internal(struct kbase_context *kctx); -+ -+/** -+ * kbase_instr_hwcnt_request_dump() - Request HW counter dump from GPU -+ * @kctx: Kbase context -+ * -+ * Caller must either wait for kbase_instr_hwcnt_dump_complete() to return true, -+ * of call kbase_instr_hwcnt_wait_for_dump(). -+ * -+ * Return: 0 on success -+ */ -+int kbase_instr_hwcnt_request_dump(struct kbase_context *kctx); -+ -+/** -+ * kbase_instr_hwcnt_wait_for_dump() - Wait until pending HW counter dump has -+ * completed. -+ * @kctx: Kbase context -+ * -+ * Context: will sleep, waiting for dump to complete -+ * -+ * Return: 0 on success -+ */ -+int kbase_instr_hwcnt_wait_for_dump(struct kbase_context *kctx); -+ -+/** -+ * kbase_instr_hwcnt_dump_complete - Tell whether the HW counters dump has -+ * completed -+ * @kctx: Kbase context -+ * @success: Set to true if successful -+ * -+ * Context: does not sleep. -+ * -+ * Return: true if the dump is complete -+ */ -+bool kbase_instr_hwcnt_dump_complete(struct kbase_context *kctx, -+ bool * const success); -+ -+/** -+ * kbase_instr_hwcnt_clear() - Clear HW counters -+ * @kctx: Kbase context -+ * -+ * Context: might sleep, waiting for reset to complete -+ * -+ * Return: 0 on success -+ */ -+int kbase_instr_hwcnt_clear(struct kbase_context *kctx); -+ -+/** -+ * kbase_instr_backend_init() - Initialise the instrumentation backend -+ * @kbdev: Kbase device -+ * -+ * This function should be called during driver initialization. -+ * -+ * Return: 0 on success -+ */ -+int kbase_instr_backend_init(struct kbase_device *kbdev); -+ -+/** -+ * kbase_instr_backend_init() - Terminate the instrumentation backend -+ * @kbdev: Kbase device -+ * -+ * This function should be called during driver termination. -+ */ -+void kbase_instr_backend_term(struct kbase_device *kbdev); -+ -+#endif /* _KBASE_HWACCESS_INSTR_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_jm.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_jm.h -new file mode 100755 -index 000000000000..750fda2cd81d ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_jm.h -@@ -0,0 +1,381 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+ -+/* -+ * HW access job manager common APIs -+ */ -+ -+#ifndef _KBASE_HWACCESS_JM_H_ -+#define _KBASE_HWACCESS_JM_H_ -+ -+/** -+ * kbase_backend_run_atom() - Run an atom on the GPU -+ * @kbdev: Device pointer -+ * @atom: Atom to run -+ * -+ * Caller must hold the HW access lock -+ */ -+void kbase_backend_run_atom(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom); -+ -+/** -+ * kbase_backend_slot_update - Update state based on slot ringbuffers -+ * -+ * @kbdev: Device pointer -+ * -+ * Inspect the jobs in the slot ringbuffers and update state. -+ * -+ * This will cause jobs to be submitted to hardware if they are unblocked -+ */ -+void kbase_backend_slot_update(struct kbase_device *kbdev); -+ -+/** -+ * kbase_backend_find_and_release_free_address_space() - Release a free AS -+ * @kbdev: Device pointer -+ * @kctx: Context pointer -+ * -+ * This function can evict an idle context from the runpool, freeing up the -+ * address space it was using. -+ * -+ * The address space is marked as in use. The caller must either assign a -+ * context using kbase_gpu_use_ctx(), or release it using -+ * kbase_ctx_sched_release() -+ * -+ * Return: Number of free address space, or KBASEP_AS_NR_INVALID if none -+ * available -+ */ -+int kbase_backend_find_and_release_free_address_space( -+ struct kbase_device *kbdev, struct kbase_context *kctx); -+ -+/** -+ * kbase_backend_use_ctx() - Activate a currently unscheduled context, using the -+ * provided address space. -+ * @kbdev: Device pointer -+ * @kctx: Context pointer. May be NULL -+ * @as_nr: Free address space to use -+ * -+ * kbase_gpu_next_job() will pull atoms from the active context. -+ * -+ * Return: true if successful, false if ASID not assigned. -+ */ -+bool kbase_backend_use_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int as_nr); -+ -+/** -+ * kbase_backend_use_ctx_sched() - Activate a context. -+ * @kbdev: Device pointer -+ * @kctx: Context pointer -+ * -+ * kbase_gpu_next_job() will pull atoms from the active context. -+ * -+ * The context must already be scheduled and assigned to an address space. If -+ * the context is not scheduled, then kbase_gpu_use_ctx() should be used -+ * instead. -+ * -+ * Caller must hold hwaccess_lock -+ * -+ * Return: true if context is now active, false otherwise (ie if context does -+ * not have an address space assigned) -+ */ -+bool kbase_backend_use_ctx_sched(struct kbase_device *kbdev, -+ struct kbase_context *kctx); -+ -+/** -+ * kbase_backend_release_ctx_irq - Release a context from the GPU. This will -+ * de-assign the assigned address space. -+ * @kbdev: Device pointer -+ * @kctx: Context pointer -+ * -+ * Caller must hold kbase_device->mmu_hw_mutex and hwaccess_lock -+ */ -+void kbase_backend_release_ctx_irq(struct kbase_device *kbdev, -+ struct kbase_context *kctx); -+ -+/** -+ * kbase_backend_release_ctx_noirq - Release a context from the GPU. This will -+ * de-assign the assigned address space. -+ * @kbdev: Device pointer -+ * @kctx: Context pointer -+ * -+ * Caller must hold kbase_device->mmu_hw_mutex -+ * -+ * This function must perform any operations that could not be performed in IRQ -+ * context by kbase_backend_release_ctx_irq(). -+ */ -+void kbase_backend_release_ctx_noirq(struct kbase_device *kbdev, -+ struct kbase_context *kctx); -+ -+/** -+ * kbase_backend_cacheclean - Perform a cache clean if the given atom requires -+ * one -+ * @kbdev: Device pointer -+ * @katom: Pointer to the failed atom -+ * -+ * On some GPUs, the GPU cache must be cleaned following a failed atom. This -+ * function performs a clean if it is required by @katom. -+ */ -+void kbase_backend_cacheclean(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom); -+ -+ -+/** -+ * kbase_backend_complete_wq() - Perform backend-specific actions required on -+ * completing an atom. -+ * @kbdev: Device pointer -+ * @katom: Pointer to the atom to complete -+ * -+ * This function should only be called from kbase_jd_done_worker() or -+ * js_return_worker(). -+ * -+ * Return: true if atom has completed, false if atom should be re-submitted -+ */ -+void kbase_backend_complete_wq(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom); -+ -+/** -+ * kbase_backend_complete_wq_post_sched - Perform backend-specific actions -+ * required on completing an atom, after -+ * any scheduling has taken place. -+ * @kbdev: Device pointer -+ * @core_req: Core requirements of atom -+ * @affinity: Affinity of atom -+ * @coreref_state: Coreref state of atom -+ * -+ * This function should only be called from kbase_jd_done_worker() or -+ * js_return_worker(). -+ */ -+void kbase_backend_complete_wq_post_sched(struct kbase_device *kbdev, -+ base_jd_core_req core_req, u64 affinity, -+ enum kbase_atom_coreref_state coreref_state); -+ -+/** -+ * kbase_backend_reset() - The GPU is being reset. Cancel all jobs on the GPU -+ * and remove any others from the ringbuffers. -+ * @kbdev: Device pointer -+ * @end_timestamp: Timestamp of reset -+ */ -+void kbase_backend_reset(struct kbase_device *kbdev, ktime_t *end_timestamp); -+ -+/** -+ * kbase_backend_inspect_head() - Return the atom currently at the head of slot -+ * @js -+ * @kbdev: Device pointer -+ * @js: Job slot to inspect -+ * -+ * Return : Atom currently at the head of slot @js, or NULL -+ */ -+struct kbase_jd_atom *kbase_backend_inspect_head(struct kbase_device *kbdev, -+ int js); -+ -+/** -+ * kbase_backend_inspect_tail - Return the atom currently at the tail of slot -+ * @js -+ * @kbdev: Device pointer -+ * @js: Job slot to inspect -+ * -+ * Return : Atom currently at the head of slot @js, or NULL -+ */ -+struct kbase_jd_atom *kbase_backend_inspect_tail(struct kbase_device *kbdev, -+ int js); -+ -+/** -+ * kbase_backend_nr_atoms_on_slot() - Return the number of atoms currently on a -+ * slot. -+ * @kbdev: Device pointer -+ * @js: Job slot to inspect -+ * -+ * Return : Number of atoms currently on slot -+ */ -+int kbase_backend_nr_atoms_on_slot(struct kbase_device *kbdev, int js); -+ -+/** -+ * kbase_backend_nr_atoms_submitted() - Return the number of atoms on a slot -+ * that are currently on the GPU. -+ * @kbdev: Device pointer -+ * @js: Job slot to inspect -+ * -+ * Return : Number of atoms currently on slot @js that are currently on the GPU. -+ */ -+int kbase_backend_nr_atoms_submitted(struct kbase_device *kbdev, int js); -+ -+/** -+ * kbase_backend_ctx_count_changed() - Number of contexts ready to submit jobs -+ * has changed. -+ * @kbdev: Device pointer -+ * -+ * Perform any required backend-specific actions (eg starting/stopping -+ * scheduling timers). -+ */ -+void kbase_backend_ctx_count_changed(struct kbase_device *kbdev); -+ -+/** -+ * kbase_backend_timeouts_changed() - Job Scheduler timeouts have changed. -+ * @kbdev: Device pointer -+ * -+ * Perform any required backend-specific actions (eg updating timeouts of -+ * currently running atoms). -+ */ -+void kbase_backend_timeouts_changed(struct kbase_device *kbdev); -+ -+/** -+ * kbase_backend_slot_free() - Return the number of jobs that can be currently -+ * submitted to slot @js. -+ * @kbdev: Device pointer -+ * @js: Job slot to inspect -+ * -+ * Return : Number of jobs that can be submitted. -+ */ -+int kbase_backend_slot_free(struct kbase_device *kbdev, int js); -+ -+/** -+ * kbase_job_check_enter_disjoint - potentially leave disjoint state -+ * @kbdev: kbase device -+ * @target_katom: atom which is finishing -+ * -+ * Work out whether to leave disjoint state when finishing an atom that was -+ * originated by kbase_job_check_enter_disjoint(). -+ */ -+void kbase_job_check_leave_disjoint(struct kbase_device *kbdev, -+ struct kbase_jd_atom *target_katom); -+ -+/** -+ * kbase_backend_jm_kill_jobs_from_kctx - Kill all jobs that are currently -+ * running from a context -+ * @kctx: Context pointer -+ * -+ * This is used in response to a page fault to remove all jobs from the faulting -+ * context from the hardware. -+ */ -+void kbase_backend_jm_kill_jobs_from_kctx(struct kbase_context *kctx); -+ -+/** -+ * kbase_jm_wait_for_zero_jobs - Wait for context to have zero jobs running, and -+ * to be descheduled. -+ * @kctx: Context pointer -+ * -+ * This should be called following kbase_js_zap_context(), to ensure the context -+ * can be safely destroyed. -+ */ -+void kbase_jm_wait_for_zero_jobs(struct kbase_context *kctx); -+ -+/** -+ * kbase_backend_get_current_flush_id - Return the current flush ID -+ * -+ * @kbdev: Device pointer -+ * -+ * Return: the current flush ID to be recorded for each job chain -+ */ -+u32 kbase_backend_get_current_flush_id(struct kbase_device *kbdev); -+ -+#if KBASE_GPU_RESET_EN -+/** -+ * kbase_prepare_to_reset_gpu - Prepare for resetting the GPU. -+ * @kbdev: Device pointer -+ * -+ * This function just soft-stops all the slots to ensure that as many jobs as -+ * possible are saved. -+ * -+ * Return: a boolean which should be interpreted as follows: -+ * - true - Prepared for reset, kbase_reset_gpu should be called. -+ * - false - Another thread is performing a reset, kbase_reset_gpu should -+ * not be called. -+ */ -+bool kbase_prepare_to_reset_gpu(struct kbase_device *kbdev); -+ -+/** -+ * kbase_reset_gpu - Reset the GPU -+ * @kbdev: Device pointer -+ * -+ * This function should be called after kbase_prepare_to_reset_gpu if it returns -+ * true. It should never be called without a corresponding call to -+ * kbase_prepare_to_reset_gpu. -+ * -+ * After this function is called (or not called if kbase_prepare_to_reset_gpu -+ * returned false), the caller should wait for kbdev->reset_waitq to be -+ * signalled to know when the reset has completed. -+ */ -+void kbase_reset_gpu(struct kbase_device *kbdev); -+ -+/** -+ * kbase_prepare_to_reset_gpu_locked - Prepare for resetting the GPU. -+ * @kbdev: Device pointer -+ * -+ * This function just soft-stops all the slots to ensure that as many jobs as -+ * possible are saved. -+ * -+ * Return: a boolean which should be interpreted as follows: -+ * - true - Prepared for reset, kbase_reset_gpu should be called. -+ * - false - Another thread is performing a reset, kbase_reset_gpu should -+ * not be called. -+ */ -+bool kbase_prepare_to_reset_gpu_locked(struct kbase_device *kbdev); -+ -+/** -+ * kbase_reset_gpu_locked - Reset the GPU -+ * @kbdev: Device pointer -+ * -+ * This function should be called after kbase_prepare_to_reset_gpu if it -+ * returns true. It should never be called without a corresponding call to -+ * kbase_prepare_to_reset_gpu. -+ * -+ * After this function is called (or not called if kbase_prepare_to_reset_gpu -+ * returned false), the caller should wait for kbdev->reset_waitq to be -+ * signalled to know when the reset has completed. -+ */ -+void kbase_reset_gpu_locked(struct kbase_device *kbdev); -+ -+/** -+ * kbase_reset_gpu_silent - Reset the GPU silently -+ * @kbdev: Device pointer -+ * -+ * Reset the GPU without trying to cancel jobs and don't emit messages into -+ * the kernel log while doing the reset. -+ * -+ * This function should be used in cases where we are doing a controlled reset -+ * of the GPU as part of normal processing (e.g. exiting protected mode) where -+ * the driver will have ensured the scheduler has been idled and all other -+ * users of the GPU (e.g. instrumentation) have been suspended. -+ */ -+void kbase_reset_gpu_silent(struct kbase_device *kbdev); -+ -+/** -+ * kbase_reset_gpu_active - Reports if the GPU is being reset -+ * @kbdev: Device pointer -+ * -+ * Return: True if the GPU is in the process of being reset. -+ */ -+bool kbase_reset_gpu_active(struct kbase_device *kbdev); -+#endif -+ -+/** -+ * kbase_job_slot_hardstop - Hard-stop the specified job slot -+ * @kctx: The kbase context that contains the job(s) that should -+ * be hard-stopped -+ * @js: The job slot to hard-stop -+ * @target_katom: The job that should be hard-stopped (or NULL for all -+ * jobs from the context) -+ * Context: -+ * The job slot lock must be held when calling this function. -+ */ -+void kbase_job_slot_hardstop(struct kbase_context *kctx, int js, -+ struct kbase_jd_atom *target_katom); -+ -+extern struct protected_mode_ops kbase_native_protected_ops; -+ -+#endif /* _KBASE_HWACCESS_JM_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_pm.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_pm.h -new file mode 100755 -index 000000000000..71c7d495c40a ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_pm.h -@@ -0,0 +1,209 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+ -+/** -+ * @file mali_kbase_hwaccess_pm.h -+ * HW access power manager common APIs -+ */ -+ -+#ifndef _KBASE_HWACCESS_PM_H_ -+#define _KBASE_HWACCESS_PM_H_ -+ -+#include -+#include -+ -+#include -+ -+/* Forward definition - see mali_kbase.h */ -+struct kbase_device; -+ -+/* Functions common to all HW access backends */ -+ -+/** -+ * Initialize the power management framework. -+ * -+ * Must be called before any other power management function -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) -+ * -+ * @return 0 if the power management framework was successfully -+ * initialized. -+ */ -+int kbase_hwaccess_pm_init(struct kbase_device *kbdev); -+ -+/** -+ * Terminate the power management framework. -+ * -+ * No power management functions may be called after this (except -+ * @ref kbase_pm_init) -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) -+ */ -+void kbase_hwaccess_pm_term(struct kbase_device *kbdev); -+ -+/** -+ * kbase_hwaccess_pm_powerup - Power up the GPU. -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * @flags: Flags to pass on to kbase_pm_init_hw -+ * -+ * Power up GPU after all modules have been initialized and interrupt handlers -+ * installed. -+ * -+ * Return: 0 if powerup was successful. -+ */ -+int kbase_hwaccess_pm_powerup(struct kbase_device *kbdev, -+ unsigned int flags); -+ -+/** -+ * Halt the power management framework. -+ * -+ * Should ensure that no new interrupts are generated, but allow any currently -+ * running interrupt handlers to complete successfully. The GPU is forced off by -+ * the time this function returns, regardless of whether or not the active power -+ * policy asks for the GPU to be powered off. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) -+ */ -+void kbase_hwaccess_pm_halt(struct kbase_device *kbdev); -+ -+/** -+ * Perform any backend-specific actions to suspend the GPU -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) -+ */ -+void kbase_hwaccess_pm_suspend(struct kbase_device *kbdev); -+ -+/** -+ * Perform any backend-specific actions to resume the GPU from a suspend -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) -+ */ -+void kbase_hwaccess_pm_resume(struct kbase_device *kbdev); -+ -+/** -+ * Perform any required actions for activating the GPU. Called when the first -+ * context goes active. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) -+ */ -+void kbase_hwaccess_pm_gpu_active(struct kbase_device *kbdev); -+ -+/** -+ * Perform any required actions for idling the GPU. Called when the last -+ * context goes idle. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) -+ */ -+void kbase_hwaccess_pm_gpu_idle(struct kbase_device *kbdev); -+ -+ -+/** -+ * Set the debug core mask. -+ * -+ * This determines which cores the power manager is allowed to use. -+ * -+ * @param kbdev The kbase device structure for the device (must be a -+ * valid pointer) -+ * @param new_core_mask_js0 The core mask to use for job slot 0 -+ * @param new_core_mask_js0 The core mask to use for job slot 1 -+ * @param new_core_mask_js0 The core mask to use for job slot 2 -+ */ -+void kbase_pm_set_debug_core_mask(struct kbase_device *kbdev, -+ u64 new_core_mask_js0, u64 new_core_mask_js1, -+ u64 new_core_mask_js2); -+ -+ -+/** -+ * Get the current policy. -+ * -+ * Returns the policy that is currently active. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) -+ * -+ * @return The current policy -+ */ -+const struct kbase_pm_ca_policy -+*kbase_pm_ca_get_policy(struct kbase_device *kbdev); -+ -+/** -+ * Change the policy to the one specified. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) -+ * @param policy The policy to change to (valid pointer returned from -+ * @ref kbase_pm_ca_list_policies) -+ */ -+void kbase_pm_ca_set_policy(struct kbase_device *kbdev, -+ const struct kbase_pm_ca_policy *policy); -+ -+/** -+ * Retrieve a static list of the available policies. -+ * -+ * @param[out] policies An array pointer to take the list of policies. This may -+ * be NULL. The contents of this array must not be -+ * modified. -+ * -+ * @return The number of policies -+ */ -+int -+kbase_pm_ca_list_policies(const struct kbase_pm_ca_policy * const **policies); -+ -+ -+/** -+ * Get the current policy. -+ * -+ * Returns the policy that is currently active. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) -+ * -+ * @return The current policy -+ */ -+const struct kbase_pm_policy *kbase_pm_get_policy(struct kbase_device *kbdev); -+ -+/** -+ * Change the policy to the one specified. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid -+ * pointer) -+ * @param policy The policy to change to (valid pointer returned from -+ * @ref kbase_pm_list_policies) -+ */ -+void kbase_pm_set_policy(struct kbase_device *kbdev, -+ const struct kbase_pm_policy *policy); -+ -+/** -+ * Retrieve a static list of the available policies. -+ * -+ * @param[out] policies An array pointer to take the list of policies. This may -+ * be NULL. The contents of this array must not be -+ * modified. -+ * -+ * @return The number of policies -+ */ -+int kbase_pm_list_policies(const struct kbase_pm_policy * const **policies); -+ -+#endif /* _KBASE_HWACCESS_PM_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_time.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_time.h -new file mode 100755 -index 000000000000..b9fe8e669c63 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_time.h -@@ -0,0 +1,53 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+ -+/** -+ * -+ */ -+ -+#ifndef _KBASE_BACKEND_TIME_H_ -+#define _KBASE_BACKEND_TIME_H_ -+ -+/** -+ * kbase_backend_get_gpu_time() - Get current GPU time -+ * @kbdev: Device pointer -+ * @cycle_counter: Pointer to u64 to store cycle counter in -+ * @system_time: Pointer to u64 to store system time in -+ * @ts: Pointer to struct timespec to store current monotonic -+ * time in -+ */ -+void kbase_backend_get_gpu_time(struct kbase_device *kbdev, u64 *cycle_counter, -+ u64 *system_time, struct timespec *ts); -+ -+/** -+ * kbase_wait_write_flush() - Wait for GPU write flush -+ * @kctx: Context pointer -+ * -+ * Wait 1000 GPU clock cycles. This delay is known to give the GPU time to flush -+ * its write buffer. -+ * -+ * If GPU resets occur then the counters are reset to zero, the delay may not be -+ * as expected. -+ * -+ * This function is only in use for BASE_HW_ISSUE_6367 -+ */ -+#ifndef CONFIG_MALI_BIFROST_NO_MALI -+void kbase_wait_write_flush(struct kbase_context *kctx); -+#endif -+ -+#endif /* _KBASE_BACKEND_TIME_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwcnt_reader.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwcnt_reader.h -new file mode 100755 -index 000000000000..cf7bf1b35dc5 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwcnt_reader.h -@@ -0,0 +1,66 @@ -+/* -+ * -+ * (C) COPYRIGHT 2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+#ifndef _KBASE_HWCNT_READER_H_ -+#define _KBASE_HWCNT_READER_H_ -+ -+/* The ids of ioctl commands. */ -+#define KBASE_HWCNT_READER 0xBE -+#define KBASE_HWCNT_READER_GET_HWVER _IOR(KBASE_HWCNT_READER, 0x00, u32) -+#define KBASE_HWCNT_READER_GET_BUFFER_SIZE _IOR(KBASE_HWCNT_READER, 0x01, u32) -+#define KBASE_HWCNT_READER_DUMP _IOW(KBASE_HWCNT_READER, 0x10, u32) -+#define KBASE_HWCNT_READER_CLEAR _IOW(KBASE_HWCNT_READER, 0x11, u32) -+#define KBASE_HWCNT_READER_GET_BUFFER _IOR(KBASE_HWCNT_READER, 0x20,\ -+ struct kbase_hwcnt_reader_metadata) -+#define KBASE_HWCNT_READER_PUT_BUFFER _IOW(KBASE_HWCNT_READER, 0x21,\ -+ struct kbase_hwcnt_reader_metadata) -+#define KBASE_HWCNT_READER_SET_INTERVAL _IOW(KBASE_HWCNT_READER, 0x30, u32) -+#define KBASE_HWCNT_READER_ENABLE_EVENT _IOW(KBASE_HWCNT_READER, 0x40, u32) -+#define KBASE_HWCNT_READER_DISABLE_EVENT _IOW(KBASE_HWCNT_READER, 0x41, u32) -+#define KBASE_HWCNT_READER_GET_API_VERSION _IOW(KBASE_HWCNT_READER, 0xFF, u32) -+ -+/** -+ * struct kbase_hwcnt_reader_metadata - hwcnt reader sample buffer metadata -+ * @timestamp: time when sample was collected -+ * @event_id: id of an event that triggered sample collection -+ * @buffer_idx: position in sampling area where sample buffer was stored -+ */ -+struct kbase_hwcnt_reader_metadata { -+ u64 timestamp; -+ u32 event_id; -+ u32 buffer_idx; -+}; -+ -+/** -+ * enum base_hwcnt_reader_event - hwcnt dumping events -+ * @BASE_HWCNT_READER_EVENT_MANUAL: manual request for dump -+ * @BASE_HWCNT_READER_EVENT_PERIODIC: periodic dump -+ * @BASE_HWCNT_READER_EVENT_PREJOB: prejob dump request -+ * @BASE_HWCNT_READER_EVENT_POSTJOB: postjob dump request -+ * @BASE_HWCNT_READER_EVENT_COUNT: number of supported events -+ */ -+enum base_hwcnt_reader_event { -+ BASE_HWCNT_READER_EVENT_MANUAL, -+ BASE_HWCNT_READER_EVENT_PERIODIC, -+ BASE_HWCNT_READER_EVENT_PREJOB, -+ BASE_HWCNT_READER_EVENT_POSTJOB, -+ -+ BASE_HWCNT_READER_EVENT_COUNT -+}; -+ -+#endif /* _KBASE_HWCNT_READER_H_ */ -+ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ioctl.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ioctl.h -new file mode 100755 -index 000000000000..e7c1daee470b ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ioctl.h -@@ -0,0 +1,658 @@ -+/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+#ifndef _KBASE_IOCTL_H_ -+#define _KBASE_IOCTL_H_ -+ -+#ifdef __cpluscplus -+extern "C" { -+#endif -+ -+#include -+ -+#define KBASE_IOCTL_TYPE 0x80 -+ -+#ifdef ANDROID -+/* Android's definition of ioctl is incorrect, specifying the type argument as -+ * 'int'. This creates a warning when using _IOWR (as the top bit is set). Work -+ * round this by redefining _IOC to include a case to 'int'. -+ */ -+#undef _IOC -+#define _IOC(dir, type, nr, size) \ -+ ((int)(((dir) << _IOC_DIRSHIFT) | ((type) << _IOC_TYPESHIFT) | \ -+ ((nr) << _IOC_NRSHIFT) | ((size) << _IOC_SIZESHIFT))) -+#endif -+ -+/** -+ * struct kbase_ioctl_version_check - Check version compatibility with kernel -+ * -+ * @major: Major version number -+ * @minor: Minor version number -+ */ -+struct kbase_ioctl_version_check { -+ __u16 major; -+ __u16 minor; -+}; -+ -+#define KBASE_IOCTL_VERSION_CHECK \ -+ _IOWR(KBASE_IOCTL_TYPE, 0, struct kbase_ioctl_version_check) -+ -+/** -+ * struct kbase_ioctl_set_flags - Set kernel context creation flags -+ * -+ * @create_flags: Flags - see base_context_create_flags -+ */ -+struct kbase_ioctl_set_flags { -+ __u32 create_flags; -+}; -+ -+#define KBASE_IOCTL_SET_FLAGS \ -+ _IOW(KBASE_IOCTL_TYPE, 1, struct kbase_ioctl_set_flags) -+ -+/** -+ * struct kbase_ioctl_job_submit - Submit jobs/atoms to the kernel -+ * -+ * @addr: Memory address of an array of struct base_jd_atom_v2 -+ * @nr_atoms: Number of entries in the array -+ * @stride: sizeof(struct base_jd_atom_v2) -+ */ -+struct kbase_ioctl_job_submit { -+ __u64 addr; -+ __u32 nr_atoms; -+ __u32 stride; -+}; -+ -+#define KBASE_IOCTL_JOB_SUBMIT \ -+ _IOW(KBASE_IOCTL_TYPE, 2, struct kbase_ioctl_job_submit) -+ -+/** -+ * struct kbase_ioctl_get_gpuprops - Read GPU properties from the kernel -+ * -+ * @buffer: Pointer to the buffer to store properties into -+ * @size: Size of the buffer -+ * @flags: Flags - must be zero for now -+ * -+ * The ioctl will return the number of bytes stored into @buffer or an error -+ * on failure (e.g. @size is too small). If @size is specified as 0 then no -+ * data will be written but the return value will be the number of bytes needed -+ * for all the properties. -+ * -+ * @flags may be used in the future to request a different format for the -+ * buffer. With @flags == 0 the following format is used. -+ * -+ * The buffer will be filled with pairs of values, a u32 key identifying the -+ * property followed by the value. The size of the value is identified using -+ * the bottom bits of the key. The value then immediately followed the key and -+ * is tightly packed (there is no padding). All keys and values are -+ * little-endian. -+ * -+ * 00 = u8 -+ * 01 = u16 -+ * 10 = u32 -+ * 11 = u64 -+ */ -+struct kbase_ioctl_get_gpuprops { -+ __u64 buffer; -+ __u32 size; -+ __u32 flags; -+}; -+ -+#define KBASE_IOCTL_GET_GPUPROPS \ -+ _IOW(KBASE_IOCTL_TYPE, 3, struct kbase_ioctl_get_gpuprops) -+ -+#define KBASE_IOCTL_POST_TERM \ -+ _IO(KBASE_IOCTL_TYPE, 4) -+ -+/** -+ * union kbase_ioctl_mem_alloc - Allocate memory on the GPU -+ * -+ * @va_pages: The number of pages of virtual address space to reserve -+ * @commit_pages: The number of physical pages to allocate -+ * @extent: The number of extra pages to allocate on each GPU fault which grows -+ * the region -+ * @flags: Flags -+ * @gpu_va: The GPU virtual address which is allocated -+ * -+ * @in: Input parameters -+ * @out: Output parameters -+ */ -+union kbase_ioctl_mem_alloc { -+ struct { -+ __u64 va_pages; -+ __u64 commit_pages; -+ __u64 extent; -+ __u64 flags; -+ } in; -+ struct { -+ __u64 flags; -+ __u64 gpu_va; -+ } out; -+}; -+ -+#define KBASE_IOCTL_MEM_ALLOC \ -+ _IOWR(KBASE_IOCTL_TYPE, 5, union kbase_ioctl_mem_alloc) -+ -+/** -+ * struct kbase_ioctl_mem_query - Query properties of a GPU memory region -+ * @gpu_addr: A GPU address contained within the region -+ * @query: The type of query -+ * @value: The result of the query -+ * -+ * Use a %KBASE_MEM_QUERY_xxx flag as input for @query. -+ * -+ * @in: Input parameters -+ * @out: Output parameters -+ */ -+union kbase_ioctl_mem_query { -+ struct { -+ __u64 gpu_addr; -+ __u64 query; -+ } in; -+ struct { -+ __u64 value; -+ } out; -+}; -+ -+#define KBASE_IOCTL_MEM_QUERY \ -+ _IOWR(KBASE_IOCTL_TYPE, 6, union kbase_ioctl_mem_query) -+ -+#define KBASE_MEM_QUERY_COMMIT_SIZE 1 -+#define KBASE_MEM_QUERY_VA_SIZE 2 -+#define KBASE_MEM_QUERY_FLAGS 3 -+ -+/** -+ * struct kbase_ioctl_mem_free - Free a memory region -+ * @gpu_addr: Handle to the region to free -+ */ -+struct kbase_ioctl_mem_free { -+ __u64 gpu_addr; -+}; -+ -+#define KBASE_IOCTL_MEM_FREE \ -+ _IOW(KBASE_IOCTL_TYPE, 7, struct kbase_ioctl_mem_free) -+ -+/** -+ * struct kbase_ioctl_hwcnt_reader_setup - Setup HWC dumper/reader -+ * @buffer_count: requested number of dumping buffers -+ * @jm_bm: counters selection bitmask (JM) -+ * @shader_bm: counters selection bitmask (Shader) -+ * @tiler_bm: counters selection bitmask (Tiler) -+ * @mmu_l2_bm: counters selection bitmask (MMU_L2) -+ * -+ * A fd is returned from the ioctl if successful, or a negative value on error -+ */ -+struct kbase_ioctl_hwcnt_reader_setup { -+ __u32 buffer_count; -+ __u32 jm_bm; -+ __u32 shader_bm; -+ __u32 tiler_bm; -+ __u32 mmu_l2_bm; -+}; -+ -+#define KBASE_IOCTL_HWCNT_READER_SETUP \ -+ _IOW(KBASE_IOCTL_TYPE, 8, struct kbase_ioctl_hwcnt_reader_setup) -+ -+/** -+ * struct kbase_ioctl_hwcnt_enable - Enable hardware counter collection -+ * @dump_buffer: GPU address to write counters to -+ * @jm_bm: counters selection bitmask (JM) -+ * @shader_bm: counters selection bitmask (Shader) -+ * @tiler_bm: counters selection bitmask (Tiler) -+ * @mmu_l2_bm: counters selection bitmask (MMU_L2) -+ */ -+struct kbase_ioctl_hwcnt_enable { -+ __u64 dump_buffer; -+ __u32 jm_bm; -+ __u32 shader_bm; -+ __u32 tiler_bm; -+ __u32 mmu_l2_bm; -+}; -+ -+#define KBASE_IOCTL_HWCNT_ENABLE \ -+ _IOW(KBASE_IOCTL_TYPE, 9, struct kbase_ioctl_hwcnt_enable) -+ -+#define KBASE_IOCTL_HWCNT_DUMP \ -+ _IO(KBASE_IOCTL_TYPE, 10) -+ -+#define KBASE_IOCTL_HWCNT_CLEAR \ -+ _IO(KBASE_IOCTL_TYPE, 11) -+ -+/** -+ * struct kbase_ioctl_disjoint_query - Query the disjoint counter -+ * @counter: A counter of disjoint events in the kernel -+ */ -+struct kbase_ioctl_disjoint_query { -+ __u32 counter; -+}; -+ -+#define KBASE_IOCTL_DISJOINT_QUERY \ -+ _IOR(KBASE_IOCTL_TYPE, 12, struct kbase_ioctl_disjoint_query) -+ -+/** -+ * struct kbase_ioctl_get_ddk_version - Query the kernel version -+ * @version_buffer: Buffer to receive the kernel version string -+ * @size: Size of the buffer -+ * -+ * The ioctl will return the number of bytes written into version_buffer -+ * (which includes a NULL byte) or a negative error code -+ */ -+struct kbase_ioctl_get_ddk_version { -+ __u64 version_buffer; -+ __u32 size; -+}; -+ -+#define KBASE_IOCTL_GET_DDK_VERSION \ -+ _IOW(KBASE_IOCTL_TYPE, 13, struct kbase_ioctl_get_ddk_version) -+ -+/** -+ * struct kbase_ioctl_mem_jit_init - Initialise the JIT memory allocator -+ * -+ * @va_pages: Number of VA pages to reserve for JIT -+ * -+ * Note that depending on the VA size of the application and GPU, the value -+ * specified in @va_pages may be ignored. -+ */ -+struct kbase_ioctl_mem_jit_init { -+ __u64 va_pages; -+}; -+ -+#define KBASE_IOCTL_MEM_JIT_INIT \ -+ _IOW(KBASE_IOCTL_TYPE, 14, struct kbase_ioctl_mem_jit_init) -+ -+/** -+ * struct kbase_ioctl_mem_sync - Perform cache maintenance on memory -+ * -+ * @handle: GPU memory handle (GPU VA) -+ * @user_addr: The address where it is mapped in user space -+ * @size: The number of bytes to synchronise -+ * @type: The direction to synchronise: 0 is sync to memory (clean), -+ * 1 is sync from memory (invalidate). Use the BASE_SYNCSET_OP_xxx constants. -+ * @padding: Padding to round up to a multiple of 8 bytes, must be zero -+ */ -+struct kbase_ioctl_mem_sync { -+ __u64 handle; -+ __u64 user_addr; -+ __u64 size; -+ __u8 type; -+ __u8 padding[7]; -+}; -+ -+#define KBASE_IOCTL_MEM_SYNC \ -+ _IOW(KBASE_IOCTL_TYPE, 15, struct kbase_ioctl_mem_sync) -+ -+/** -+ * union kbase_ioctl_mem_find_cpu_offset - Find the offset of a CPU pointer -+ * -+ * @gpu_addr: The GPU address of the memory region -+ * @cpu_addr: The CPU address to locate -+ * @size: A size in bytes to validate is contained within the region -+ * @offset: The offset from the start of the memory region to @cpu_addr -+ * -+ * @in: Input parameters -+ * @out: Output parameters -+ */ -+union kbase_ioctl_mem_find_cpu_offset { -+ struct { -+ __u64 gpu_addr; -+ __u64 cpu_addr; -+ __u64 size; -+ } in; -+ struct { -+ __u64 offset; -+ } out; -+}; -+ -+#define KBASE_IOCTL_MEM_FIND_CPU_OFFSET \ -+ _IOWR(KBASE_IOCTL_TYPE, 16, union kbase_ioctl_mem_find_cpu_offset) -+ -+/** -+ * struct kbase_ioctl_get_context_id - Get the kernel context ID -+ * -+ * @id: The kernel context ID -+ */ -+struct kbase_ioctl_get_context_id { -+ __u32 id; -+}; -+ -+#define KBASE_IOCTL_GET_CONTEXT_ID \ -+ _IOR(KBASE_IOCTL_TYPE, 17, struct kbase_ioctl_get_context_id) -+ -+/** -+ * struct kbase_ioctl_tlstream_acquire - Acquire a tlstream fd -+ * -+ * @flags: Flags -+ * -+ * The ioctl returns a file descriptor when successful -+ */ -+struct kbase_ioctl_tlstream_acquire { -+ __u32 flags; -+}; -+ -+#define KBASE_IOCTL_TLSTREAM_ACQUIRE \ -+ _IOW(KBASE_IOCTL_TYPE, 18, struct kbase_ioctl_tlstream_acquire) -+ -+#define KBASE_IOCTL_TLSTREAM_FLUSH \ -+ _IO(KBASE_IOCTL_TYPE, 19) -+ -+/** -+ * struct kbase_ioctl_mem_commit - Change the amount of memory backing a region -+ * -+ * @gpu_addr: The memory region to modify -+ * @pages: The number of physical pages that should be present -+ * -+ * The ioctl may return on the following error codes or 0 for success: -+ * -ENOMEM: Out of memory -+ * -EINVAL: Invalid arguments -+ */ -+struct kbase_ioctl_mem_commit { -+ __u64 gpu_addr; -+ __u64 pages; -+}; -+ -+#define KBASE_IOCTL_MEM_COMMIT \ -+ _IOW(KBASE_IOCTL_TYPE, 20, struct kbase_ioctl_mem_commit) -+ -+/** -+ * union kbase_ioctl_mem_alias - Create an alias of memory regions -+ * @flags: Flags, see BASE_MEM_xxx -+ * @stride: Bytes between start of each memory region -+ * @nents: The number of regions to pack together into the alias -+ * @aliasing_info: Pointer to an array of struct base_mem_aliasing_info -+ * @gpu_va: Address of the new alias -+ * @va_pages: Size of the new alias -+ * -+ * @in: Input parameters -+ * @out: Output parameters -+ */ -+union kbase_ioctl_mem_alias { -+ struct { -+ __u64 flags; -+ __u64 stride; -+ __u64 nents; -+ __u64 aliasing_info; -+ } in; -+ struct { -+ __u64 flags; -+ __u64 gpu_va; -+ __u64 va_pages; -+ } out; -+}; -+ -+#define KBASE_IOCTL_MEM_ALIAS \ -+ _IOWR(KBASE_IOCTL_TYPE, 21, union kbase_ioctl_mem_alias) -+ -+/** -+ * union kbase_ioctl_mem_import - Import memory for use by the GPU -+ * @flags: Flags, see BASE_MEM_xxx -+ * @phandle: Handle to the external memory -+ * @type: Type of external memory, see base_mem_import_type -+ * @padding: Amount of extra VA pages to append to the imported buffer -+ * @gpu_va: Address of the new alias -+ * @va_pages: Size of the new alias -+ * -+ * @in: Input parameters -+ * @out: Output parameters -+ */ -+union kbase_ioctl_mem_import { -+ struct { -+ __u64 flags; -+ __u64 phandle; -+ __u32 type; -+ __u32 padding; -+ } in; -+ struct { -+ __u64 flags; -+ __u64 gpu_va; -+ __u64 va_pages; -+ } out; -+}; -+ -+#define KBASE_IOCTL_MEM_IMPORT \ -+ _IOWR(KBASE_IOCTL_TYPE, 22, union kbase_ioctl_mem_import) -+ -+/** -+ * struct kbase_ioctl_mem_flags_change - Change the flags for a memory region -+ * @gpu_va: The GPU region to modify -+ * @flags: The new flags to set -+ * @mask: Mask of the flags to modify -+ */ -+struct kbase_ioctl_mem_flags_change { -+ __u64 gpu_va; -+ __u64 flags; -+ __u64 mask; -+}; -+ -+#define KBASE_IOCTL_MEM_FLAGS_CHANGE \ -+ _IOW(KBASE_IOCTL_TYPE, 23, struct kbase_ioctl_mem_flags_change) -+ -+/** -+ * struct kbase_ioctl_stream_create - Create a synchronisation stream -+ * @name: A name to identify this stream. Must be NULL-terminated. -+ * -+ * Note that this is also called a "timeline", but is named stream to avoid -+ * confusion with other uses of the word. -+ * -+ * Unused bytes in @name (after the first NULL byte) must be also be NULL bytes. -+ * -+ * The ioctl returns a file descriptor. -+ */ -+struct kbase_ioctl_stream_create { -+ char name[32]; -+}; -+ -+#define KBASE_IOCTL_STREAM_CREATE \ -+ _IOW(KBASE_IOCTL_TYPE, 24, struct kbase_ioctl_stream_create) -+ -+/** -+ * struct kbase_ioctl_fence_validate - Validate a fd refers to a fence -+ * @fd: The file descriptor to validate -+ */ -+struct kbase_ioctl_fence_validate { -+ int fd; -+}; -+ -+#define KBASE_IOCTL_FENCE_VALIDATE \ -+ _IOW(KBASE_IOCTL_TYPE, 25, struct kbase_ioctl_fence_validate) -+ -+/** -+ * struct kbase_ioctl_get_profiling_controls - Get the profiling controls -+ * @count: The size of @buffer in u32 words -+ * @buffer: The buffer to receive the profiling controls -+ */ -+struct kbase_ioctl_get_profiling_controls { -+ __u64 buffer; -+ __u32 count; -+}; -+ -+#define KBASE_IOCTL_GET_PROFILING_CONTROLS \ -+ _IOW(KBASE_IOCTL_TYPE, 26, struct kbase_ioctl_get_profiling_controls) -+ -+/** -+ * struct kbase_ioctl_mem_profile_add - Provide profiling information to kernel -+ * @buffer: Pointer to the information -+ * @len: Length -+ * @padding: Padding -+ * -+ * The data provided is accessible through a debugfs file -+ */ -+struct kbase_ioctl_mem_profile_add { -+ __u64 buffer; -+ __u32 len; -+ __u32 padding; -+}; -+ -+#define KBASE_IOCTL_MEM_PROFILE_ADD \ -+ _IOW(KBASE_IOCTL_TYPE, 27, struct kbase_ioctl_mem_profile_add) -+ -+/** -+ * struct kbase_ioctl_soft_event_update - Update the status of a soft-event -+ * @event: GPU address of the event which has been updated -+ * @new_status: The new status to set -+ * @flags: Flags for future expansion -+ */ -+struct kbase_ioctl_soft_event_update { -+ __u64 event; -+ __u32 new_status; -+ __u32 flags; -+}; -+ -+#define KBASE_IOCTL_SOFT_EVENT_UPDATE \ -+ _IOW(KBASE_IOCTL_TYPE, 28, struct kbase_ioctl_soft_event_update) -+ -+/* IOCTLs 29-32 are reserved */ -+ -+/*************** -+ * test ioctls * -+ ***************/ -+#if MALI_UNIT_TEST -+/* These ioctls are purely for test purposes and are not used in the production -+ * driver, they therefore may change without notice -+ */ ++u32 mali_mem_block_get_ref_count(mali_page_node *node) ++{ ++ MALI_DEBUG_ASSERT(node->type == MALI_PAGE_NODE_BLOCK); ++ return (node->blk_it->phy_addr & MALI_BLOCK_REF_MASK); ++} + -+#define KBASE_IOCTL_TEST_TYPE (KBASE_IOCTL_TYPE + 1) + -+/** -+ * struct kbase_ioctl_tlstream_test - Start a timeline stream test -+ * -+ * @tpw_count: number of trace point writers in each context -+ * @msg_delay: time delay between tracepoints from one writer in milliseconds -+ * @msg_count: number of trace points written by one writer -+ * @aux_msg: if non-zero aux messages will be included -+ */ -+struct kbase_ioctl_tlstream_test { -+ __u32 tpw_count; -+ __u32 msg_delay; -+ __u32 msg_count; -+ __u32 aux_msg; -+}; ++/* Increase the refence count ++* It not atomic, so it need to get sp_lock before call this function ++*/ + -+#define KBASE_IOCTL_TLSTREAM_TEST \ -+ _IOW(KBASE_IOCTL_TEST_TYPE, 1, struct kbase_ioctl_tlstream_test) ++u32 mali_mem_block_add_ref(mali_page_node *node) ++{ ++ MALI_DEBUG_ASSERT(node->type == MALI_PAGE_NODE_BLOCK); ++ MALI_DEBUG_ASSERT(mali_mem_block_get_ref_count(node) < MALI_BLOCK_MAX_REF_COUNT); ++ return (node->blk_it->phy_addr++ & MALI_BLOCK_REF_MASK); ++} + -+/** -+ * struct kbase_ioctl_tlstream_stats - Read tlstream stats for test purposes -+ * @bytes_collected: number of bytes read by user -+ * @bytes_generated: number of bytes generated by tracepoints -+ */ -+struct kbase_ioctl_tlstream_stats { -+ __u32 bytes_collected; -+ __u32 bytes_generated; -+}; ++/* Decase the refence count ++* It not atomic, so it need to get sp_lock before call this function ++*/ ++u32 mali_mem_block_dec_ref(mali_page_node *node) ++{ ++ MALI_DEBUG_ASSERT(node->type == MALI_PAGE_NODE_BLOCK); ++ MALI_DEBUG_ASSERT(mali_mem_block_get_ref_count(node) > 0); ++ return (node->blk_it->phy_addr-- & MALI_BLOCK_REF_MASK); ++} + -+#define KBASE_IOCTL_TLSTREAM_STATS \ -+ _IOR(KBASE_IOCTL_TEST_TYPE, 2, struct kbase_ioctl_tlstream_stats) + -+#endif ++static mali_block_allocator *mali_mem_block_allocator_create(u32 base_address, u32 size) ++{ ++ mali_block_allocator *info; ++ u32 usable_size; ++ u32 num_blocks; ++ mali_page_node *m_node; ++ mali_block_item *mali_blk_items = NULL; ++ int i = 0; + -+/********************************** -+ * Definitions for GPU properties * -+ **********************************/ -+#define KBASE_GPUPROP_VALUE_SIZE_U8 (0x0) -+#define KBASE_GPUPROP_VALUE_SIZE_U16 (0x1) -+#define KBASE_GPUPROP_VALUE_SIZE_U32 (0x2) -+#define KBASE_GPUPROP_VALUE_SIZE_U64 (0x3) ++ usable_size = size & ~(MALI_BLOCK_SIZE - 1); ++ MALI_DEBUG_PRINT(3, ("Mali block allocator create for region starting at 0x%08X length 0x%08X\n", base_address, size)); ++ MALI_DEBUG_PRINT(4, ("%d usable bytes\n", usable_size)); ++ num_blocks = usable_size / MALI_BLOCK_SIZE; ++ MALI_DEBUG_PRINT(4, ("which becomes %d blocks\n", num_blocks)); + -+#define KBASE_GPUPROP_PRODUCT_ID 1 -+#define KBASE_GPUPROP_VERSION_STATUS 2 -+#define KBASE_GPUPROP_MINOR_REVISION 3 -+#define KBASE_GPUPROP_MAJOR_REVISION 4 -+#define KBASE_GPUPROP_GPU_SPEED_MHZ 5 -+#define KBASE_GPUPROP_GPU_FREQ_KHZ_MAX 6 -+#define KBASE_GPUPROP_GPU_FREQ_KHZ_MIN 7 -+#define KBASE_GPUPROP_LOG2_PROGRAM_COUNTER_SIZE 8 -+#define KBASE_GPUPROP_TEXTURE_FEATURES_0 9 -+#define KBASE_GPUPROP_TEXTURE_FEATURES_1 10 -+#define KBASE_GPUPROP_TEXTURE_FEATURES_2 11 -+#define KBASE_GPUPROP_GPU_AVAILABLE_MEMORY_SIZE 12 ++ if (usable_size == 0) { ++ MALI_DEBUG_PRINT(1, ("Memory block of size %d is unusable\n", size)); ++ return NULL; ++ } + -+#define KBASE_GPUPROP_L2_LOG2_LINE_SIZE 13 -+#define KBASE_GPUPROP_L2_LOG2_CACHE_SIZE 14 -+#define KBASE_GPUPROP_L2_NUM_L2_SLICES 15 ++ info = _mali_osk_calloc(1, sizeof(mali_block_allocator)); ++ if (NULL != info) { ++ INIT_LIST_HEAD(&info->free); ++ spin_lock_init(&info->sp_lock); ++ info->total_num = num_blocks; ++ mali_blk_items = _mali_osk_calloc(1, sizeof(mali_block_item) * num_blocks); + -+#define KBASE_GPUPROP_TILER_BIN_SIZE_BYTES 16 -+#define KBASE_GPUPROP_TILER_MAX_ACTIVE_LEVELS 17 ++ if (mali_blk_items) { ++ info->items = mali_blk_items; ++ /* add blocks(4k size) to free list*/ ++ for (i = 0 ; i < num_blocks ; i++) { ++ /* add block information*/ ++ mali_blk_items[i].phy_addr = base_address + (i * MALI_BLOCK_SIZE); ++ /* add to free list */ ++ m_node = _mali_page_node_allocate(MALI_PAGE_NODE_BLOCK); ++ if (m_node == NULL) ++ goto fail; ++ _mali_page_node_add_block_item(m_node, &(mali_blk_items[i])); ++ list_add_tail(&m_node->list, &info->free); ++ atomic_add(1, &info->free_num); ++ } ++ return info; ++ } ++ } ++fail: ++ mali_mem_block_allocator_destroy(); ++ return NULL; ++} + -+#define KBASE_GPUPROP_MAX_THREADS 18 -+#define KBASE_GPUPROP_MAX_WORKGROUP_SIZE 19 -+#define KBASE_GPUPROP_MAX_BARRIER_SIZE 20 -+#define KBASE_GPUPROP_MAX_REGISTERS 21 -+#define KBASE_GPUPROP_MAX_TASK_QUEUE 22 -+#define KBASE_GPUPROP_MAX_THREAD_GROUP_SPLIT 23 -+#define KBASE_GPUPROP_IMPL_TECH 24 ++void mali_mem_block_allocator_destroy(void) ++{ ++ struct mali_page_node *m_page, *m_tmp; ++ mali_block_allocator *info = mali_mem_block_gobal_allocator; ++ MALI_DEBUG_ASSERT_POINTER(info); ++ MALI_DEBUG_PRINT(4, ("Memory block destroy !\n")); + -+#define KBASE_GPUPROP_RAW_SHADER_PRESENT 25 -+#define KBASE_GPUPROP_RAW_TILER_PRESENT 26 -+#define KBASE_GPUPROP_RAW_L2_PRESENT 27 -+#define KBASE_GPUPROP_RAW_STACK_PRESENT 28 -+#define KBASE_GPUPROP_RAW_L2_FEATURES 29 -+#define KBASE_GPUPROP_RAW_SUSPEND_SIZE 30 -+#define KBASE_GPUPROP_RAW_MEM_FEATURES 31 -+#define KBASE_GPUPROP_RAW_MMU_FEATURES 32 -+#define KBASE_GPUPROP_RAW_AS_PRESENT 33 -+#define KBASE_GPUPROP_RAW_JS_PRESENT 34 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_0 35 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_1 36 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_2 37 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_3 38 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_4 39 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_5 40 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_6 41 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_7 42 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_8 43 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_9 44 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_10 45 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_11 46 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_12 47 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_13 48 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_14 49 -+#define KBASE_GPUPROP_RAW_JS_FEATURES_15 50 -+#define KBASE_GPUPROP_RAW_TILER_FEATURES 51 -+#define KBASE_GPUPROP_RAW_TEXTURE_FEATURES_0 52 -+#define KBASE_GPUPROP_RAW_TEXTURE_FEATURES_1 53 -+#define KBASE_GPUPROP_RAW_TEXTURE_FEATURES_2 54 -+#define KBASE_GPUPROP_RAW_GPU_ID 55 -+#define KBASE_GPUPROP_RAW_THREAD_MAX_THREADS 56 -+#define KBASE_GPUPROP_RAW_THREAD_MAX_WORKGROUP_SIZE 57 -+#define KBASE_GPUPROP_RAW_THREAD_MAX_BARRIER_SIZE 58 -+#define KBASE_GPUPROP_RAW_THREAD_FEATURES 59 -+#define KBASE_GPUPROP_RAW_COHERENCY_MODE 60 ++ if (NULL == info) ++ return; + -+#define KBASE_GPUPROP_COHERENCY_NUM_GROUPS 61 -+#define KBASE_GPUPROP_COHERENCY_NUM_CORE_GROUPS 62 -+#define KBASE_GPUPROP_COHERENCY_COHERENCY 63 -+#define KBASE_GPUPROP_COHERENCY_GROUP_0 64 -+#define KBASE_GPUPROP_COHERENCY_GROUP_1 65 -+#define KBASE_GPUPROP_COHERENCY_GROUP_2 66 -+#define KBASE_GPUPROP_COHERENCY_GROUP_3 67 -+#define KBASE_GPUPROP_COHERENCY_GROUP_4 68 -+#define KBASE_GPUPROP_COHERENCY_GROUP_5 69 -+#define KBASE_GPUPROP_COHERENCY_GROUP_6 70 -+#define KBASE_GPUPROP_COHERENCY_GROUP_7 71 -+#define KBASE_GPUPROP_COHERENCY_GROUP_8 72 -+#define KBASE_GPUPROP_COHERENCY_GROUP_9 73 -+#define KBASE_GPUPROP_COHERENCY_GROUP_10 74 -+#define KBASE_GPUPROP_COHERENCY_GROUP_11 75 -+#define KBASE_GPUPROP_COHERENCY_GROUP_12 76 -+#define KBASE_GPUPROP_COHERENCY_GROUP_13 77 -+#define KBASE_GPUPROP_COHERENCY_GROUP_14 78 -+#define KBASE_GPUPROP_COHERENCY_GROUP_15 79 ++ list_for_each_entry_safe(m_page, m_tmp , &info->free, list) { ++ MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_BLOCK); ++ list_del(&m_page->list); ++ kfree(m_page); ++ } + -+#ifdef __cpluscplus ++ _mali_osk_free(info->items); ++ _mali_osk_free(info); +} -+#endif + -+#endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd.c -new file mode 100755 -index 000000000000..144ebfcdfc59 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd.c -@@ -0,0 +1,1847 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++u32 mali_mem_block_release(mali_mem_backend *mem_bkend) ++{ ++ mali_mem_allocation *alloc = mem_bkend->mali_allocation; ++ u32 free_pages_nr = 0; ++ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_BLOCK); + ++ /* Unmap the memory from the mali virtual address space. */ ++ mali_mem_block_mali_unmap(alloc); ++ mutex_lock(&mem_bkend->mutex); ++ free_pages_nr = mali_mem_block_free(&mem_bkend->block_mem); ++ mutex_unlock(&mem_bkend->mutex); ++ return free_pages_nr; ++} + + ++int mali_mem_block_alloc(mali_mem_block_mem *block_mem, u32 size) ++{ ++ struct mali_page_node *m_page, *m_tmp; ++ size_t page_count = PAGE_ALIGN(size) / _MALI_OSK_MALI_PAGE_SIZE; ++ mali_block_allocator *info = mali_mem_block_gobal_allocator; ++ MALI_DEBUG_ASSERT_POINTER(info); + ++ MALI_DEBUG_PRINT(4, ("BLOCK Mem: Allocate size = 0x%x\n", size)); ++ /*do some init */ ++ INIT_LIST_HEAD(&block_mem->pfns); + -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+#include -+#endif /* defined(CONFIG_DMA_SHARED_BUFFER) */ -+#ifdef CONFIG_COMPAT -+#include -+#endif -+#include -+#include -+#include -+#include -+#include ++ spin_lock(&info->sp_lock); ++ /*check if have enough space*/ ++ if (atomic_read(&info->free_num) > page_count) { ++ list_for_each_entry_safe(m_page, m_tmp , &info->free, list) { ++ if (page_count > 0) { ++ MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_BLOCK); ++ MALI_DEBUG_ASSERT(mali_mem_block_get_ref_count(m_page) == 0); ++ list_move(&m_page->list, &block_mem->pfns); ++ block_mem->count++; ++ atomic_dec(&info->free_num); ++ _mali_page_node_ref(m_page); ++ } else { ++ break; ++ } ++ page_count--; ++ } ++ } else { ++ /* can't allocate from BLOCK memory*/ ++ spin_unlock(&info->sp_lock); ++ return -1; ++ } + -+#include -+#include -+#include ++ spin_unlock(&info->sp_lock); ++ return 0; ++} + -+#include "mali_kbase_dma_fence.h" ++u32 mali_mem_block_free(mali_mem_block_mem *block_mem) ++{ ++ u32 free_pages_nr = 0; + -+#define beenthere(kctx, f, a...) dev_dbg(kctx->kbdev->dev, "%s:" f, __func__, ##a) ++ free_pages_nr = mali_mem_block_free_list(&block_mem->pfns); ++ MALI_DEBUG_PRINT(4, ("BLOCK Mem free : allocated size = 0x%x, free size = 0x%x\n", block_mem->count * _MALI_OSK_MALI_PAGE_SIZE, ++ free_pages_nr * _MALI_OSK_MALI_PAGE_SIZE)); ++ block_mem->count = 0; ++ MALI_DEBUG_ASSERT(list_empty(&block_mem->pfns)); + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) -+/* random32 was renamed to prandom_u32 in 3.8 */ -+#define prandom_u32 random32 -+#endif ++ return free_pages_nr; ++} + -+/* Return whether katom will run on the GPU or not. Currently only soft jobs and -+ * dependency-only atoms do not run on the GPU */ -+#define IS_GPU_ATOM(katom) (!((katom->core_req & BASE_JD_REQ_SOFT_JOB) || \ -+ ((katom->core_req & BASE_JD_REQ_ATOM_TYPE) == \ -+ BASE_JD_REQ_DEP))) -+/* -+ * This is the kernel side of the API. Only entry points are: -+ * - kbase_jd_submit(): Called from userspace to submit a single bag -+ * - kbase_jd_done(): Called from interrupt context to track the -+ * completion of a job. -+ * Callouts: -+ * - to the job manager (enqueue a job) -+ * - to the event subsystem (signals the completion/failure of bag/job-chains). -+ */ + -+static void __user * -+get_compat_pointer(struct kbase_context *kctx, const u64 p) ++u32 mali_mem_block_free_list(struct list_head *list) +{ -+#ifdef CONFIG_COMPAT -+ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) -+ return compat_ptr(p); -+#endif -+ return u64_to_user_ptr(p); ++ struct mali_page_node *m_page, *m_tmp; ++ mali_block_allocator *info = mali_mem_block_gobal_allocator; ++ u32 free_pages_nr = 0; ++ ++ if (info) { ++ spin_lock(&info->sp_lock); ++ list_for_each_entry_safe(m_page, m_tmp , list, list) { ++ if (1 == _mali_page_node_get_ref_count(m_page)) { ++ free_pages_nr++; ++ } ++ mali_mem_block_free_node(m_page); ++ } ++ spin_unlock(&info->sp_lock); ++ } ++ return free_pages_nr; +} + -+/* Runs an atom, either by handing to the JS or by immediately running it in the case of soft-jobs -+ * -+ * Returns whether the JS needs a reschedule. -+ * -+ * Note that the caller must also check the atom status and -+ * if it is KBASE_JD_ATOM_STATE_COMPLETED must call jd_done_nolock -+ */ -+static int jd_run_atom(struct kbase_jd_atom *katom) ++/* free the node,*/ ++void mali_mem_block_free_node(struct mali_page_node *node) +{ -+ struct kbase_context *kctx = katom->kctx; -+ -+ KBASE_DEBUG_ASSERT(katom->status != KBASE_JD_ATOM_STATE_UNUSED); ++ mali_block_allocator *info = mali_mem_block_gobal_allocator; + -+ if ((katom->core_req & BASE_JD_REQ_ATOM_TYPE) == BASE_JD_REQ_DEP) { -+ /* Dependency only atom */ -+ katom->status = KBASE_JD_ATOM_STATE_COMPLETED; -+ return 0; -+ } else if (katom->core_req & BASE_JD_REQ_SOFT_JOB) { -+ /* Soft-job */ -+ if (katom->will_fail_event_code) { -+ katom->status = KBASE_JD_ATOM_STATE_COMPLETED; -+ return 0; -+ } -+ if ((katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) -+ == BASE_JD_REQ_SOFT_REPLAY) { -+ if (!kbase_replay_process(katom)) -+ katom->status = KBASE_JD_ATOM_STATE_COMPLETED; -+ } else if (kbase_process_soft_job(katom) == 0) { -+ kbase_finish_soft_job(katom); -+ katom->status = KBASE_JD_ATOM_STATE_COMPLETED; ++ /* only handle BLOCK node */ ++ if (node->type == MALI_PAGE_NODE_BLOCK && info) { ++ /*Need to make this atomic?*/ ++ if (1 == _mali_page_node_get_ref_count(node)) { ++ /*Move to free list*/ ++ _mali_page_node_unref(node); ++ list_move_tail(&node->list, &info->free); ++ atomic_add(1, &info->free_num); ++ } else { ++ _mali_page_node_unref(node); ++ list_del(&node->list); ++ kfree(node); + } -+ return 0; + } -+ -+ katom->status = KBASE_JD_ATOM_STATE_IN_JS; -+ /* Queue an action about whether we should try scheduling a context */ -+ return kbasep_js_add_job(kctx, katom); +} + -+#if defined(CONFIG_KDS) || defined(CONFIG_MALI_BIFROST_DMA_FENCE) -+void kbase_jd_dep_clear_locked(struct kbase_jd_atom *katom) ++/* unref the node, but not free it */ ++_mali_osk_errcode_t mali_mem_block_unref_node(struct mali_page_node *node) +{ -+ struct kbase_device *kbdev; -+ -+ KBASE_DEBUG_ASSERT(katom); -+ kbdev = katom->kctx->kbdev; -+ KBASE_DEBUG_ASSERT(kbdev); -+ -+ /* Check whether the atom's other dependencies were already met. If -+ * katom is a GPU atom then the job scheduler may be able to represent -+ * the dependencies, hence we may attempt to submit it before they are -+ * met. Other atoms must have had both dependencies resolved. -+ */ -+ if (IS_GPU_ATOM(katom) || -+ (!kbase_jd_katom_dep_atom(&katom->dep[0]) && -+ !kbase_jd_katom_dep_atom(&katom->dep[1]))) { -+ /* katom dep complete, attempt to run it */ -+ bool resched = false; ++ mali_block_allocator *info = mali_mem_block_gobal_allocator; ++ mali_page_node *new_node; + -+ resched = jd_run_atom(katom); ++ /* only handle BLOCK node */ ++ if (node->type == MALI_PAGE_NODE_BLOCK && info) { ++ /*Need to make this atomic?*/ ++ if (1 == _mali_page_node_get_ref_count(node)) { ++ /* allocate a new node, Add to free list, keep the old node*/ ++ _mali_page_node_unref(node); ++ new_node = _mali_page_node_allocate(MALI_PAGE_NODE_BLOCK); ++ if (new_node) { ++ memcpy(new_node, node, sizeof(mali_page_node)); ++ list_add(&new_node->list, &info->free); ++ atomic_add(1, &info->free_num); ++ } else ++ return _MALI_OSK_ERR_FAULT; + -+ if (katom->status == KBASE_JD_ATOM_STATE_COMPLETED) { -+ /* The atom has already finished */ -+ resched |= jd_done_nolock(katom, NULL); ++ } else { ++ _mali_page_node_unref(node); + } -+ -+ if (resched) -+ kbase_js_sched_all(kbdev); + } ++ return _MALI_OSK_ERR_OK; +} -+#endif -+ -+#ifdef CONFIG_KDS + -+/* Add the katom to the kds waiting list. -+ * Atoms must be added to the waiting list after a successful call to kds_async_waitall. -+ * The caller must hold the kbase_jd_context.lock */ + -+static void kbase_jd_kds_waiters_add(struct kbase_jd_atom *katom) ++int mali_mem_block_mali_map(mali_mem_block_mem *block_mem, struct mali_session_data *session, u32 vaddr, u32 props) +{ -+ struct kbase_context *kctx; -+ -+ KBASE_DEBUG_ASSERT(katom); ++ struct mali_page_directory *pagedir = session->page_directory; ++ struct mali_page_node *m_page; ++ dma_addr_t phys; ++ u32 virt = vaddr; ++ u32 prop = props; + -+ kctx = katom->kctx; ++ list_for_each_entry(m_page, &block_mem->pfns, list) { ++ MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_BLOCK); ++ phys = _mali_page_node_get_dma_addr(m_page); ++#if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT) ++ /* Verify that the "physical" address is 32-bit and ++ * usable for Mali, when on a system with bus addresses ++ * wider than 32-bit. */ ++ MALI_DEBUG_ASSERT(0 == (phys >> 32)); ++#endif ++ mali_mmu_pagedir_update(pagedir, virt, (mali_dma_addr)phys, MALI_MMU_PAGE_SIZE, prop); ++ virt += MALI_MMU_PAGE_SIZE; ++ } + -+ list_add_tail(&katom->node, &kctx->waiting_kds_resource); ++ return 0; +} + -+/* Remove the katom from the kds waiting list. -+ * Atoms must be removed from the waiting list before a call to kds_resource_set_release_sync. -+ * The supplied katom must first have been added to the list with a call to kbase_jd_kds_waiters_add. -+ * The caller must hold the kbase_jd_context.lock */ -+ -+static void kbase_jd_kds_waiters_remove(struct kbase_jd_atom *katom) ++void mali_mem_block_mali_unmap(mali_mem_allocation *alloc) +{ -+ KBASE_DEBUG_ASSERT(katom); -+ list_del(&katom->node); ++ struct mali_session_data *session; ++ MALI_DEBUG_ASSERT_POINTER(alloc); ++ session = alloc->session; ++ MALI_DEBUG_ASSERT_POINTER(session); ++ ++ mali_session_memory_lock(session); ++ mali_mem_mali_map_free(session, alloc->psize, alloc->mali_vma_node.vm_node.start, ++ alloc->flags); ++ mali_session_memory_unlock(session); +} + -+static void kds_dep_clear(void *callback_parameter, void *callback_extra_parameter) ++ ++int mali_mem_block_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma) +{ -+ struct kbase_jd_atom *katom; -+ struct kbase_jd_context *ctx; ++ int ret; ++ mali_mem_block_mem *block_mem = &mem_bkend->block_mem; ++ unsigned long addr = vma->vm_start; ++ struct mali_page_node *m_page; ++ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_BLOCK); + -+ katom = (struct kbase_jd_atom *)callback_parameter; -+ KBASE_DEBUG_ASSERT(katom); ++ list_for_each_entry(m_page, &block_mem->pfns, list) { ++ MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_BLOCK); ++ ret = vmf_insert_pfn(vma, addr, _mali_page_node_get_pfn(m_page)); + -+ ctx = &katom->kctx->jctx; ++ if (unlikely(0 != ret)) { ++ return -EFAULT; ++ } ++ addr += _MALI_OSK_MALI_PAGE_SIZE; + -+ /* If KDS resource has already been satisfied (e.g. due to zapping) -+ * do nothing. -+ */ -+ mutex_lock(&ctx->lock); -+ if (!katom->kds_dep_satisfied) { -+ katom->kds_dep_satisfied = true; -+ kbase_jd_dep_clear_locked(katom); + } -+ mutex_unlock(&ctx->lock); ++ ++ return 0; +} + -+static void kbase_cancel_kds_wait_job(struct kbase_jd_atom *katom) ++ ++_mali_osk_errcode_t mali_memory_core_resource_dedicated_memory(u32 start, u32 size) +{ -+ KBASE_DEBUG_ASSERT(katom); ++ mali_block_allocator *allocator; + -+ /* Prevent job_done_nolock from being called twice on an atom when -+ * there is a race between job completion and cancellation */ ++ /* Do the low level linux operation first */ + -+ if (katom->status == KBASE_JD_ATOM_STATE_QUEUED) { -+ /* Wait was cancelled - zap the atom */ -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ if (jd_done_nolock(katom, NULL)) -+ kbase_js_sched_all(katom->kctx->kbdev); ++ /* Request ownership of the memory */ ++ if (_MALI_OSK_ERR_OK != _mali_osk_mem_reqregion(start, size, "Dedicated Mali GPU memory")) { ++ MALI_DEBUG_PRINT(1, ("Failed to request memory region for frame buffer (0x%08X - 0x%08X)\n", start, start + size - 1)); ++ return _MALI_OSK_ERR_FAULT; + } -+} -+#endif /* CONFIG_KDS */ + -+void kbase_jd_free_external_resources(struct kbase_jd_atom *katom) -+{ -+#ifdef CONFIG_KDS -+ if (katom->kds_rset) { -+ struct kbase_jd_context *jctx = &katom->kctx->jctx; -+ -+ /* -+ * As the atom is no longer waiting, remove it from -+ * the waiting list. -+ */ -+ -+ mutex_lock(&jctx->lock); -+ kbase_jd_kds_waiters_remove(katom); -+ mutex_unlock(&jctx->lock); ++ /* Create generic block allocator object to handle it */ ++ allocator = mali_mem_block_allocator_create(start, size); + -+ /* Release the kds resource or cancel if zapping */ -+ kds_resource_set_release_sync(&katom->kds_rset); ++ if (NULL == allocator) { ++ MALI_DEBUG_PRINT(1, ("Memory bank registration failed\n")); ++ _mali_osk_mem_unreqregion(start, size); ++ MALI_ERROR(_MALI_OSK_ERR_FAULT); + } -+#endif /* CONFIG_KDS */ + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ /* Flush dma-fence workqueue to ensure that any callbacks that may have -+ * been queued are done before continuing. -+ * Any successfully completed atom would have had all it's callbacks -+ * completed before the atom was run, so only flush for failed atoms. -+ */ -+ if (katom->event_code != BASE_JD_EVENT_DONE) -+ flush_workqueue(katom->kctx->dma_fence.wq); -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ ++ mali_mem_block_gobal_allocator = (mali_block_allocator *)allocator; ++ ++ return _MALI_OSK_ERR_OK; +} + -+static void kbase_jd_post_external_resources(struct kbase_jd_atom *katom) ++mali_bool mali_memory_have_dedicated_memory(void) +{ -+ KBASE_DEBUG_ASSERT(katom); -+ KBASE_DEBUG_ASSERT(katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES); -+ -+#ifdef CONFIG_KDS -+ /* Prevent the KDS resource from triggering the atom in case of zapping */ -+ if (katom->kds_rset) -+ katom->kds_dep_satisfied = true; -+#endif /* CONFIG_KDS */ -+ -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ kbase_dma_fence_signal(katom); -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ -+ -+ kbase_gpu_vm_lock(katom->kctx); -+ /* only roll back if extres is non-NULL */ -+ if (katom->extres) { -+ u32 res_no; ++ return mali_mem_block_gobal_allocator ? MALI_TRUE : MALI_FALSE; ++} + -+ res_no = katom->nr_extres; -+ while (res_no-- > 0) { -+ struct kbase_mem_phy_alloc *alloc = katom->extres[res_no].alloc; -+ struct kbase_va_region *reg; ++u32 mali_mem_block_allocator_stat(void) ++{ ++ mali_block_allocator *allocator = mali_mem_block_gobal_allocator; ++ MALI_DEBUG_ASSERT_POINTER(allocator); + -+ reg = kbase_region_tracker_find_region_base_address( -+ katom->kctx, -+ katom->extres[res_no].gpu_address); -+ kbase_unmap_external_resource(katom->kctx, reg, alloc); -+ } -+ kfree(katom->extres); -+ katom->extres = NULL; -+ } -+ kbase_gpu_vm_unlock(katom->kctx); ++ return (allocator->total_num - atomic_read(&allocator->free_num)) * _MALI_OSK_MALI_PAGE_SIZE; +} -+ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h +new file mode 100755 +index 000000000..70fd9ec25 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h +@@ -0,0 +1,58 @@ +/* -+ * Set up external resources needed by this job. -+ * -+ * jctx.lock must be held when this is called. ++ * Copyright (C) 2010, 2013, 2015-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + -+static int kbase_jd_pre_external_resources(struct kbase_jd_atom *katom, const struct base_jd_atom_v2 *user_atom) -+{ -+ int err_ret_val = -EINVAL; -+ u32 res_no; -+#ifdef CONFIG_KDS -+ u32 kds_res_count = 0; -+ struct kds_resource **kds_resources = NULL; -+ unsigned long *kds_access_bitmap = NULL; -+#endif /* CONFIG_KDS */ -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ struct kbase_dma_fence_resv_info info = { -+ .dma_fence_resv_count = 0, -+ }; -+#ifdef CONFIG_SYNC -+ /* -+ * When both dma-buf fence and Android native sync is enabled, we -+ * disable dma-buf fence for contexts that are using Android native -+ * fences. -+ */ -+ const bool implicit_sync = !kbase_ctx_flag(katom->kctx, -+ KCTX_NO_IMPLICIT_SYNC); -+#else /* CONFIG_SYNC */ -+ const bool implicit_sync = true; -+#endif /* CONFIG_SYNC */ -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ -+ struct base_external_resource *input_extres; -+ -+ KBASE_DEBUG_ASSERT(katom); -+ KBASE_DEBUG_ASSERT(katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES); ++#ifndef __MALI_BLOCK_ALLOCATOR_H__ ++#define __MALI_BLOCK_ALLOCATOR_H__ + -+ /* no resources encoded, early out */ -+ if (!katom->nr_extres) -+ return -EINVAL; ++#include "mali_session.h" ++#include "mali_memory.h" ++#include + -+ katom->extres = kmalloc_array(katom->nr_extres, sizeof(*katom->extres), GFP_KERNEL); -+ if (NULL == katom->extres) { -+ err_ret_val = -ENOMEM; -+ goto early_err_out; -+ } ++#include "mali_memory_types.h" + -+ /* copy user buffer to the end of our real buffer. -+ * Make sure the struct sizes haven't changed in a way -+ * we don't support */ -+ BUILD_BUG_ON(sizeof(*input_extres) > sizeof(*katom->extres)); -+ input_extres = (struct base_external_resource *) -+ (((unsigned char *)katom->extres) + -+ (sizeof(*katom->extres) - sizeof(*input_extres)) * -+ katom->nr_extres); ++#define MALI_BLOCK_SIZE (PAGE_SIZE) /* 4 kB, manage BLOCK memory as page size */ ++#define MALI_BLOCK_REF_MASK (0xFFF) ++#define MALI_BLOCK_MAX_REF_COUNT (0xFFF) + -+ if (copy_from_user(input_extres, -+ get_compat_pointer(katom->kctx, user_atom->extres_list), -+ sizeof(*input_extres) * katom->nr_extres) != 0) { -+ err_ret_val = -EINVAL; -+ goto early_err_out; -+ } -+#ifdef CONFIG_KDS -+ /* assume we have to wait for all */ -+ KBASE_DEBUG_ASSERT(0 != katom->nr_extres); -+ kds_resources = kmalloc_array(katom->nr_extres, sizeof(struct kds_resource *), GFP_KERNEL); + -+ if (!kds_resources) { -+ err_ret_val = -ENOMEM; -+ goto early_err_out; -+ } + -+ KBASE_DEBUG_ASSERT(0 != katom->nr_extres); -+ kds_access_bitmap = kcalloc(BITS_TO_LONGS(katom->nr_extres), -+ sizeof(unsigned long), -+ GFP_KERNEL); -+ if (!kds_access_bitmap) { -+ err_ret_val = -ENOMEM; -+ goto early_err_out; -+ } -+#endif /* CONFIG_KDS */ ++typedef struct mali_block_allocator { ++ /* ++ * In free list, each node's ref_count is 0, ++ * ref_count added when allocated or referenced in COW ++ */ ++ mali_block_item *items; /* information for each block item*/ ++ struct list_head free; /*free list of mali_memory_node*/ ++ spinlock_t sp_lock; /*lock for reference count & free list opertion*/ ++ u32 total_num; /* Number of total pages*/ ++ atomic_t free_num; /*number of free pages*/ ++} mali_block_allocator; + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ if (implicit_sync) { -+ info.resv_objs = kmalloc_array(katom->nr_extres, -+ sizeof(struct reservation_object *), -+ GFP_KERNEL); -+ if (!info.resv_objs) { -+ err_ret_val = -ENOMEM; -+ goto early_err_out; -+ } ++unsigned long _mali_blk_item_get_phy_addr(mali_block_item *item); ++unsigned long _mali_blk_item_get_pfn(mali_block_item *item); ++u32 mali_mem_block_get_ref_count(mali_page_node *node); ++u32 mali_mem_block_add_ref(mali_page_node *node); ++u32 mali_mem_block_dec_ref(mali_page_node *node); ++u32 mali_mem_block_release(mali_mem_backend *mem_bkend); ++int mali_mem_block_alloc(mali_mem_block_mem *block_mem, u32 size); ++int mali_mem_block_mali_map(mali_mem_block_mem *block_mem, struct mali_session_data *session, u32 vaddr, u32 props); ++void mali_mem_block_mali_unmap(mali_mem_allocation *alloc); + -+ info.dma_fence_excl_bitmap = -+ kcalloc(BITS_TO_LONGS(katom->nr_extres), -+ sizeof(unsigned long), GFP_KERNEL); -+ if (!info.dma_fence_excl_bitmap) { -+ err_ret_val = -ENOMEM; -+ goto early_err_out; -+ } -+ } -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ ++int mali_mem_block_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma); ++_mali_osk_errcode_t mali_memory_core_resource_dedicated_memory(u32 start, u32 size); ++mali_bool mali_memory_have_dedicated_memory(void); ++u32 mali_mem_block_free(mali_mem_block_mem *block_mem); ++u32 mali_mem_block_free_list(struct list_head *list); ++void mali_mem_block_free_node(struct mali_page_node *node); ++void mali_mem_block_allocator_destroy(void); ++_mali_osk_errcode_t mali_mem_block_unref_node(struct mali_page_node *node); ++u32 mali_mem_block_allocator_stat(void); + -+ /* Take the processes mmap lock */ -+ down_read(¤t->mm->mmap_sem); ++#endif /* __MALI_BLOCK_ALLOCATOR_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c +new file mode 100755 +index 000000000..54e342a1f +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c +@@ -0,0 +1,776 @@ ++/* ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#ifdef CONFIG_ARM ++#include ++#endif ++#include ++ ++#include "mali_memory.h" ++#include "mali_kernel_common.h" ++#include "mali_uk_types.h" ++#include "mali_osk.h" ++#include "mali_kernel_linux.h" ++#include "mali_memory_cow.h" ++#include "mali_memory_block_alloc.h" ++#include "mali_memory_swap_alloc.h" ++ ++/** ++* allocate pages for COW backend and flush cache ++*/ ++static struct page *mali_mem_cow_alloc_page(void) ++ ++{ ++ mali_mem_os_mem os_mem; ++ struct mali_page_node *node; ++ struct page *new_page; ++ ++ int ret = 0; ++ /* allocate pages from os mem */ ++ ret = mali_mem_os_alloc_pages(&os_mem, _MALI_OSK_MALI_PAGE_SIZE); ++ ++ if (ret) { ++ return NULL; ++ } ++ ++ MALI_DEBUG_ASSERT(1 == os_mem.count); ++ ++ node = _MALI_OSK_CONTAINER_OF(os_mem.pages.next, struct mali_page_node, list); ++ new_page = node->page; ++ node->page = NULL; ++ list_del(&node->list); ++ kfree(node); ++ ++ return new_page; ++} ++ ++ ++static struct list_head *_mali_memory_cow_get_node_list(mali_mem_backend *target_bk, ++ u32 target_offset, ++ u32 target_size) ++{ ++ MALI_DEBUG_ASSERT(MALI_MEM_OS == target_bk->type || MALI_MEM_COW == target_bk->type || ++ MALI_MEM_BLOCK == target_bk->type || MALI_MEM_SWAP == target_bk->type); ++ ++ if (MALI_MEM_OS == target_bk->type) { ++ MALI_DEBUG_ASSERT(&target_bk->os_mem); ++ MALI_DEBUG_ASSERT(((target_size + target_offset) / _MALI_OSK_MALI_PAGE_SIZE) <= target_bk->os_mem.count); ++ return &target_bk->os_mem.pages; ++ } else if (MALI_MEM_COW == target_bk->type) { ++ MALI_DEBUG_ASSERT(&target_bk->cow_mem); ++ MALI_DEBUG_ASSERT(((target_size + target_offset) / _MALI_OSK_MALI_PAGE_SIZE) <= target_bk->cow_mem.count); ++ return &target_bk->cow_mem.pages; ++ } else if (MALI_MEM_BLOCK == target_bk->type) { ++ MALI_DEBUG_ASSERT(&target_bk->block_mem); ++ MALI_DEBUG_ASSERT(((target_size + target_offset) / _MALI_OSK_MALI_PAGE_SIZE) <= target_bk->block_mem.count); ++ return &target_bk->block_mem.pfns; ++ } else if (MALI_MEM_SWAP == target_bk->type) { ++ MALI_DEBUG_ASSERT(&target_bk->swap_mem); ++ MALI_DEBUG_ASSERT(((target_size + target_offset) / _MALI_OSK_MALI_PAGE_SIZE) <= target_bk->swap_mem.count); ++ return &target_bk->swap_mem.pages; ++ } ++ ++ return NULL; ++} ++ ++/** ++* Do COW for os memory - support do COW for memory from bank memory ++* The range_start/size can be zero, which means it will call cow_modify_range ++* latter. ++* This function allocate new pages for COW backend from os mem for a modified range ++* It will keep the page which not in the modified range and Add ref to it ++* ++* @target_bk - target allocation's backend(the allocation need to do COW) ++* @target_offset - the offset in target allocation to do COW(for support COW a memory allocated from memory_bank, 4K align) ++* @target_size - size of target allocation to do COW (for support memory bank) ++* @backend -COW backend ++* @range_start - offset of modified range (4K align) ++* @range_size - size of modified range ++*/ ++_mali_osk_errcode_t mali_memory_cow_os_memory(mali_mem_backend *target_bk, ++ u32 target_offset, ++ u32 target_size, ++ mali_mem_backend *backend, ++ u32 range_start, ++ u32 range_size) ++{ ++ mali_mem_cow *cow = &backend->cow_mem; ++ struct mali_page_node *m_page, *m_tmp, *page_node; ++ int target_page = 0; ++ struct page *new_page; ++ struct list_head *pages = NULL; ++ ++ pages = _mali_memory_cow_get_node_list(target_bk, target_offset, target_size); ++ ++ if (NULL == pages) { ++ MALI_DEBUG_PRINT_ERROR(("No memory page need to cow ! \n")); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ ++ MALI_DEBUG_ASSERT(0 == cow->count); ++ ++ INIT_LIST_HEAD(&cow->pages); ++ mutex_lock(&target_bk->mutex); ++ list_for_each_entry_safe(m_page, m_tmp, pages, list) { ++ /* add page from (target_offset,target_offset+size) to cow backend */ ++ if ((target_page >= target_offset / _MALI_OSK_MALI_PAGE_SIZE) && ++ (target_page < ((target_size + target_offset) / _MALI_OSK_MALI_PAGE_SIZE))) { ++ ++ /* allocate a new page node, alway use OS memory for COW */ ++ page_node = _mali_page_node_allocate(MALI_PAGE_NODE_OS); ++ ++ if (NULL == page_node) { ++ mutex_unlock(&target_bk->mutex); ++ goto error; ++ } ++ ++ INIT_LIST_HEAD(&page_node->list); ++ ++ /* check if in the modified range*/ ++ if ((cow->count >= range_start / _MALI_OSK_MALI_PAGE_SIZE) && ++ (cow->count < (range_start + range_size) / _MALI_OSK_MALI_PAGE_SIZE)) { ++ /* need to allocate a new page */ ++ /* To simplify the case, All COW memory is allocated from os memory ?*/ ++ new_page = mali_mem_cow_alloc_page(); ++ ++ if (NULL == new_page) { ++ kfree(page_node); ++ mutex_unlock(&target_bk->mutex); ++ goto error; ++ } ++ ++ _mali_page_node_add_page(page_node, new_page); ++ } else { ++ /*Add Block memory case*/ ++ if (m_page->type != MALI_PAGE_NODE_BLOCK) { ++ _mali_page_node_add_page(page_node, m_page->page); ++ } else { ++ page_node->type = MALI_PAGE_NODE_BLOCK; ++ _mali_page_node_add_block_item(page_node, m_page->blk_it); ++ } ++ ++ /* add ref to this page */ ++ _mali_page_node_ref(m_page); ++ } ++ ++ /* add it to COW backend page list */ ++ list_add_tail(&page_node->list, &cow->pages); ++ cow->count++; ++ } ++ target_page++; ++ } ++ mutex_unlock(&target_bk->mutex); ++ return _MALI_OSK_ERR_OK; ++error: ++ mali_mem_cow_release(backend, MALI_FALSE); ++ return _MALI_OSK_ERR_FAULT; ++} ++ ++_mali_osk_errcode_t mali_memory_cow_swap_memory(mali_mem_backend *target_bk, ++ u32 target_offset, ++ u32 target_size, ++ mali_mem_backend *backend, ++ u32 range_start, ++ u32 range_size) ++{ ++ mali_mem_cow *cow = &backend->cow_mem; ++ struct mali_page_node *m_page, *m_tmp, *page_node; ++ int target_page = 0; ++ struct mali_swap_item *swap_item; ++ struct list_head *pages = NULL; ++ ++ pages = _mali_memory_cow_get_node_list(target_bk, target_offset, target_size); ++ if (NULL == pages) { ++ MALI_DEBUG_PRINT_ERROR(("No swap memory page need to cow ! \n")); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ ++ MALI_DEBUG_ASSERT(0 == cow->count); ++ ++ INIT_LIST_HEAD(&cow->pages); ++ mutex_lock(&target_bk->mutex); ++ ++ backend->flags |= MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN; ++ ++ list_for_each_entry_safe(m_page, m_tmp, pages, list) { ++ /* add page from (target_offset,target_offset+size) to cow backend */ ++ if ((target_page >= target_offset / _MALI_OSK_MALI_PAGE_SIZE) && ++ (target_page < ((target_size + target_offset) / _MALI_OSK_MALI_PAGE_SIZE))) { ++ ++ /* allocate a new page node, use swap memory for COW memory swap cowed flag. */ ++ page_node = _mali_page_node_allocate(MALI_PAGE_NODE_SWAP); ++ ++ if (NULL == page_node) { ++ mutex_unlock(&target_bk->mutex); ++ goto error; ++ } ++ ++ /* check if in the modified range*/ ++ if ((cow->count >= range_start / _MALI_OSK_MALI_PAGE_SIZE) && ++ (cow->count < (range_start + range_size) / _MALI_OSK_MALI_PAGE_SIZE)) { ++ /* need to allocate a new page */ ++ /* To simplify the case, All COW memory is allocated from os memory ?*/ ++ swap_item = mali_mem_swap_alloc_swap_item(); ++ ++ if (NULL == swap_item) { ++ kfree(page_node); ++ mutex_unlock(&target_bk->mutex); ++ goto error; ++ } ++ ++ swap_item->idx = mali_mem_swap_idx_alloc(); ++ ++ if (_MALI_OSK_BITMAP_INVALIDATE_INDEX == swap_item->idx) { ++ MALI_DEBUG_PRINT(1, ("Failed to allocate swap index in swap CoW.\n")); ++ kfree(page_node); ++ kfree(swap_item); ++ mutex_unlock(&target_bk->mutex); ++ goto error; ++ } ++ ++ _mali_page_node_add_swap_item(page_node, swap_item); ++ } else { ++ _mali_page_node_add_swap_item(page_node, m_page->swap_it); ++ ++ /* add ref to this page */ ++ _mali_page_node_ref(m_page); ++ } ++ ++ list_add_tail(&page_node->list, &cow->pages); ++ cow->count++; ++ } ++ target_page++; ++ } ++ mutex_unlock(&target_bk->mutex); ++ ++ return _MALI_OSK_ERR_OK; ++error: ++ mali_mem_swap_release(backend, MALI_FALSE); ++ return _MALI_OSK_ERR_FAULT; ++ ++} ++ ++ ++_mali_osk_errcode_t _mali_mem_put_page_node(mali_page_node *node) ++{ ++ if (node->type == MALI_PAGE_NODE_OS) { ++ return mali_mem_os_put_page(node->page); ++ } else if (node->type == MALI_PAGE_NODE_BLOCK) { ++ return mali_mem_block_unref_node(node); ++ } else if (node->type == MALI_PAGE_NODE_SWAP) { ++ return _mali_mem_swap_put_page_node(node); ++ } else ++ MALI_DEBUG_ASSERT(0); ++ return _MALI_OSK_ERR_FAULT; ++} ++ ++ ++/** ++* Modify a range of a exist COW backend ++* @backend -COW backend ++* @range_start - offset of modified range (4K align) ++* @range_size - size of modified range(in byte) ++*/ ++_mali_osk_errcode_t mali_memory_cow_modify_range(mali_mem_backend *backend, ++ u32 range_start, ++ u32 range_size) ++{ ++ mali_mem_allocation *alloc = NULL; ++ struct mali_session_data *session; ++ mali_mem_cow *cow = &backend->cow_mem; ++ struct mali_page_node *m_page, *m_tmp; ++ LIST_HEAD(pages); ++ struct page *new_page; ++ u32 count = 0; ++ s32 change_pages_nr = 0; ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_OK; ++ ++ if (range_start % _MALI_OSK_MALI_PAGE_SIZE) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); ++ if (range_size % _MALI_OSK_MALI_PAGE_SIZE) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); ++ ++ alloc = backend->mali_allocation; ++ MALI_DEBUG_ASSERT_POINTER(alloc); ++ ++ session = alloc->session; ++ MALI_DEBUG_ASSERT_POINTER(session); ++ ++ MALI_DEBUG_ASSERT(MALI_MEM_COW == backend->type); ++ MALI_DEBUG_ASSERT(((range_start + range_size) / _MALI_OSK_MALI_PAGE_SIZE) <= cow->count); ++ ++ mutex_lock(&backend->mutex); ++ ++ /* free pages*/ ++ list_for_each_entry_safe(m_page, m_tmp, &cow->pages, list) { ++ ++ /* check if in the modified range*/ ++ if ((count >= range_start / _MALI_OSK_MALI_PAGE_SIZE) && ++ (count < (range_start + range_size) / _MALI_OSK_MALI_PAGE_SIZE)) { ++ if (MALI_PAGE_NODE_SWAP != m_page->type) { ++ new_page = mali_mem_cow_alloc_page(); ++ ++ if (NULL == new_page) { ++ goto error; ++ } ++ if (1 != _mali_page_node_get_ref_count(m_page)) ++ change_pages_nr++; ++ /* unref old page*/ ++ _mali_osk_mutex_wait(session->cow_lock); ++ if (_mali_mem_put_page_node(m_page)) { ++ __free_page(new_page); ++ _mali_osk_mutex_signal(session->cow_lock); ++ goto error; ++ } ++ _mali_osk_mutex_signal(session->cow_lock); ++ /* add new page*/ ++ /* always use OS for COW*/ ++ m_page->type = MALI_PAGE_NODE_OS; ++ _mali_page_node_add_page(m_page, new_page); ++ } else { ++ struct mali_swap_item *swap_item; ++ ++ swap_item = mali_mem_swap_alloc_swap_item(); ++ ++ if (NULL == swap_item) { ++ goto error; ++ } ++ ++ swap_item->idx = mali_mem_swap_idx_alloc(); ++ ++ if (_MALI_OSK_BITMAP_INVALIDATE_INDEX == swap_item->idx) { ++ MALI_DEBUG_PRINT(1, ("Failed to allocate swap index in swap CoW modify range.\n")); ++ kfree(swap_item); ++ goto error; ++ } ++ ++ if (1 != _mali_page_node_get_ref_count(m_page)) { ++ change_pages_nr++; ++ } ++ ++ if (_mali_mem_put_page_node(m_page)) { ++ mali_mem_swap_free_swap_item(swap_item); ++ goto error; ++ } ++ ++ _mali_page_node_add_swap_item(m_page, swap_item); ++ } ++ } ++ count++; ++ } ++ cow->change_pages_nr = change_pages_nr; ++ ++ MALI_DEBUG_ASSERT(MALI_MEM_COW == alloc->type); ++ ++ /* ZAP cpu mapping(modified range), and do cpu mapping here if need */ ++ if (NULL != alloc->cpu_mapping.vma) { ++ MALI_DEBUG_ASSERT(0 != alloc->backend_handle); ++ MALI_DEBUG_ASSERT(NULL != alloc->cpu_mapping.vma); ++ MALI_DEBUG_ASSERT(alloc->cpu_mapping.vma->vm_end - alloc->cpu_mapping.vma->vm_start >= range_size); ++ ++ if (MALI_MEM_BACKEND_FLAG_SWAP_COWED != (backend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED)) { ++ zap_vma_ptes(alloc->cpu_mapping.vma, alloc->cpu_mapping.vma->vm_start + range_start, range_size); ++ ++ ret = mali_mem_cow_cpu_map_pages_locked(backend, alloc->cpu_mapping.vma, alloc->cpu_mapping.vma->vm_start + range_start, range_size / _MALI_OSK_MALI_PAGE_SIZE); ++ ++ if (unlikely(ret != _MALI_OSK_ERR_OK)) { ++ MALI_DEBUG_PRINT(2, ("mali_memory_cow_modify_range: cpu mapping failed !\n")); ++ ret = _MALI_OSK_ERR_FAULT; ++ } ++ } else { ++ /* used to trigger page fault for swappable cowed memory. */ ++ alloc->cpu_mapping.vma->vm_flags |= VM_PFNMAP; ++ alloc->cpu_mapping.vma->vm_flags |= VM_MIXEDMAP; ++ ++ zap_vma_ptes(alloc->cpu_mapping.vma, alloc->cpu_mapping.vma->vm_start + range_start, range_size); ++ /* delete this flag to let swappble is ummapped regard to stauct page not page frame. */ ++ alloc->cpu_mapping.vma->vm_flags &= ~VM_PFNMAP; ++ alloc->cpu_mapping.vma->vm_flags &= ~VM_MIXEDMAP; ++ } ++ } ++ ++error: ++ mutex_unlock(&backend->mutex); ++ return ret; ++ ++} ++ ++ ++/** ++* Allocate pages for COW backend ++* @alloc -allocation for COW allocation ++* @target_bk - target allocation's backend(the allocation need to do COW) ++* @target_offset - the offset in target allocation to do COW(for support COW a memory allocated from memory_bank, 4K align) ++* @target_size - size of target allocation to do COW (for support memory bank)(in byte) ++* @backend -COW backend ++* @range_start - offset of modified range (4K align) ++* @range_size - size of modified range(in byte) ++*/ ++_mali_osk_errcode_t mali_memory_do_cow(mali_mem_backend *target_bk, ++ u32 target_offset, ++ u32 target_size, ++ mali_mem_backend *backend, ++ u32 range_start, ++ u32 range_size) ++{ ++ struct mali_session_data *session = backend->mali_allocation->session; ++ ++ MALI_CHECK_NON_NULL(session, _MALI_OSK_ERR_INVALID_ARGS); ++ ++ /* size & offset must be a multiple of the system page size */ ++ if (target_size % _MALI_OSK_MALI_PAGE_SIZE) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); ++ if (range_size % _MALI_OSK_MALI_PAGE_SIZE) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); ++ if (target_offset % _MALI_OSK_MALI_PAGE_SIZE) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); ++ if (range_start % _MALI_OSK_MALI_PAGE_SIZE) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); ++ ++ /* check backend type */ ++ MALI_DEBUG_ASSERT(MALI_MEM_COW == backend->type); ++ ++ switch (target_bk->type) { ++ case MALI_MEM_OS: ++ case MALI_MEM_BLOCK: ++ return mali_memory_cow_os_memory(target_bk, target_offset, target_size, backend, range_start, range_size); ++ break; ++ case MALI_MEM_COW: ++ if (backend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED) { ++ return mali_memory_cow_swap_memory(target_bk, target_offset, target_size, backend, range_start, range_size); ++ } else { ++ return mali_memory_cow_os_memory(target_bk, target_offset, target_size, backend, range_start, range_size); ++ } ++ break; ++ case MALI_MEM_SWAP: ++ return mali_memory_cow_swap_memory(target_bk, target_offset, target_size, backend, range_start, range_size); ++ break; ++ case MALI_MEM_EXTERNAL: ++ /*NOT support yet*/ ++ MALI_DEBUG_PRINT_ERROR(("External physical memory not supported ! \n")); ++ return _MALI_OSK_ERR_UNSUPPORTED; ++ break; ++ case MALI_MEM_DMA_BUF: ++ /*NOT support yet*/ ++ MALI_DEBUG_PRINT_ERROR(("DMA buffer not supported ! \n")); ++ return _MALI_OSK_ERR_UNSUPPORTED; ++ break; ++ case MALI_MEM_UMP: ++ /*NOT support yet*/ ++ MALI_DEBUG_PRINT_ERROR(("UMP buffer not supported ! \n")); ++ return _MALI_OSK_ERR_UNSUPPORTED; ++ break; ++ default: ++ /*Not support yet*/ ++ MALI_DEBUG_PRINT_ERROR(("Invalid memory type not supported ! \n")); ++ return _MALI_OSK_ERR_UNSUPPORTED; ++ break; ++ } ++ return _MALI_OSK_ERR_OK; ++} ++ ++ ++/** ++* Map COW backend memory to mali ++* Support OS/BLOCK for mali_page_node ++*/ ++int mali_mem_cow_mali_map(mali_mem_backend *mem_bkend, u32 range_start, u32 range_size) ++{ ++ mali_mem_allocation *cow_alloc; ++ struct mali_page_node *m_page; ++ struct mali_session_data *session; ++ struct mali_page_directory *pagedir; ++ u32 virt, start; ++ ++ cow_alloc = mem_bkend->mali_allocation; ++ virt = cow_alloc->mali_vma_node.vm_node.start; ++ start = virt; ++ ++ MALI_DEBUG_ASSERT_POINTER(mem_bkend); ++ MALI_DEBUG_ASSERT(MALI_MEM_COW == mem_bkend->type); ++ MALI_DEBUG_ASSERT_POINTER(cow_alloc); ++ ++ session = cow_alloc->session; ++ pagedir = session->page_directory; ++ MALI_CHECK_NON_NULL(session, _MALI_OSK_ERR_INVALID_ARGS); ++ list_for_each_entry(m_page, &mem_bkend->cow_mem.pages, list) { ++ if ((virt - start >= range_start) && (virt - start < range_start + range_size)) { ++ dma_addr_t phys = _mali_page_node_get_dma_addr(m_page); ++#if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT) ++ MALI_DEBUG_ASSERT(0 == (phys >> 32)); ++#endif ++ mali_mmu_pagedir_update(pagedir, virt, (mali_dma_addr)phys, ++ MALI_MMU_PAGE_SIZE, MALI_MMU_FLAGS_DEFAULT); ++ } ++ virt += MALI_MMU_PAGE_SIZE; ++ } ++ return 0; ++} ++ ++/** ++* Map COW backend to cpu ++* support OS/BLOCK memory ++*/ ++int mali_mem_cow_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma) ++{ ++ mali_mem_cow *cow = &mem_bkend->cow_mem; ++ struct mali_page_node *m_page; ++ int ret; ++ unsigned long addr = vma->vm_start; ++ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_COW); ++ ++ list_for_each_entry(m_page, &cow->pages, list) { ++ /* We should use vm_insert_page, but it does a dcache ++ * flush which makes it way slower than remap_pfn_range or vmf_insert_pfn. ++ ret = vm_insert_page(vma, addr, page); ++ */ ++ ret = vmf_insert_pfn(vma, addr, _mali_page_node_get_pfn(m_page)); ++ ++ if (unlikely(VM_FAULT_NOPAGE != ret)) { ++ return -EFAULT; ++ } ++ addr += _MALI_OSK_MALI_PAGE_SIZE; ++ } ++ ++ return 0; ++} ++ ++/** ++* Map some pages(COW backend) to CPU vma@vaddr ++*@ mem_bkend - COW backend ++*@ vma ++*@ vaddr -start CPU vaddr mapped to ++*@ num - max number of pages to map to CPU vaddr ++*/ ++_mali_osk_errcode_t mali_mem_cow_cpu_map_pages_locked(mali_mem_backend *mem_bkend, ++ struct vm_area_struct *vma, ++ unsigned long vaddr, ++ int num) ++{ ++ mali_mem_cow *cow = &mem_bkend->cow_mem; ++ struct mali_page_node *m_page; ++ int ret; ++ int offset; ++ int count ; ++ unsigned long vstart = vma->vm_start; ++ count = 0; ++ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_COW); ++ MALI_DEBUG_ASSERT(0 == vaddr % _MALI_OSK_MALI_PAGE_SIZE); ++ MALI_DEBUG_ASSERT(0 == vstart % _MALI_OSK_MALI_PAGE_SIZE); ++ offset = (vaddr - vstart) / _MALI_OSK_MALI_PAGE_SIZE; ++ ++ list_for_each_entry(m_page, &cow->pages, list) { ++ if ((count >= offset) && (count < offset + num)) { ++ ret = vmf_insert_pfn(vma, vaddr, _mali_page_node_get_pfn(m_page)); ++ ++ if (unlikely(VM_FAULT_NOPAGE != ret)) { ++ if (count == offset) { ++ return _MALI_OSK_ERR_FAULT; ++ } else { ++ /* ret is EBUSY when page isn't in modify range, but now it's OK*/ ++ return _MALI_OSK_ERR_OK; ++ } ++ } ++ vaddr += _MALI_OSK_MALI_PAGE_SIZE; ++ } ++ count++; ++ } ++ return _MALI_OSK_ERR_OK; ++} ++ ++/** ++* Release COW backend memory ++* free it directly(put_page--unref page), not put into pool ++*/ ++u32 mali_mem_cow_release(mali_mem_backend *mem_bkend, mali_bool is_mali_mapped) ++{ ++ mali_mem_allocation *alloc; ++ struct mali_session_data *session; ++ u32 free_pages_nr = 0; ++ MALI_DEBUG_ASSERT_POINTER(mem_bkend); ++ MALI_DEBUG_ASSERT(MALI_MEM_COW == mem_bkend->type); ++ alloc = mem_bkend->mali_allocation; ++ MALI_DEBUG_ASSERT_POINTER(alloc); ++ ++ session = alloc->session; ++ MALI_DEBUG_ASSERT_POINTER(session); ++ ++ if (MALI_MEM_BACKEND_FLAG_SWAP_COWED != (MALI_MEM_BACKEND_FLAG_SWAP_COWED & mem_bkend->flags)) { ++ /* Unmap the memory from the mali virtual address space. */ ++ if (MALI_TRUE == is_mali_mapped) ++ mali_mem_os_mali_unmap(alloc); ++ /* free cow backend list*/ ++ _mali_osk_mutex_wait(session->cow_lock); ++ free_pages_nr = mali_mem_os_free(&mem_bkend->cow_mem.pages, mem_bkend->cow_mem.count, MALI_TRUE); ++ _mali_osk_mutex_signal(session->cow_lock); ++ ++ free_pages_nr += mali_mem_block_free_list(&mem_bkend->cow_mem.pages); ++ ++ MALI_DEBUG_ASSERT(list_empty(&mem_bkend->cow_mem.pages)); ++ } else { ++ free_pages_nr = mali_mem_swap_release(mem_bkend, is_mali_mapped); ++ } ++ ++ ++ MALI_DEBUG_PRINT(4, ("COW Mem free : allocated size = 0x%x, free size = 0x%x\n", mem_bkend->cow_mem.count * _MALI_OSK_MALI_PAGE_SIZE, ++ free_pages_nr * _MALI_OSK_MALI_PAGE_SIZE)); ++ ++ mem_bkend->cow_mem.count = 0; ++ return free_pages_nr; ++} ++ ++ ++/* Dst node could os node or swap node. */ ++void _mali_mem_cow_copy_page(mali_page_node *src_node, mali_page_node *dst_node) ++{ ++ void *dst, *src; ++ struct page *dst_page; ++ dma_addr_t dma_addr; ++ ++ MALI_DEBUG_ASSERT(src_node != NULL); ++ MALI_DEBUG_ASSERT(dst_node != NULL); ++ MALI_DEBUG_ASSERT(dst_node->type == MALI_PAGE_NODE_OS ++ || dst_node->type == MALI_PAGE_NODE_SWAP); ++ ++ if (dst_node->type == MALI_PAGE_NODE_OS) { ++ dst_page = dst_node->page; ++ } else { ++ dst_page = dst_node->swap_it->page; ++ } ++ ++ dma_unmap_page(&mali_platform_device->dev, _mali_page_node_get_dma_addr(dst_node), ++ _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); ++ ++ /* map it , and copy the content*/ ++ dst = kmap_atomic(dst_page); ++ ++ if (src_node->type == MALI_PAGE_NODE_OS || ++ src_node->type == MALI_PAGE_NODE_SWAP) { ++ struct page *src_page; ++ ++ if (src_node->type == MALI_PAGE_NODE_OS) { ++ src_page = src_node->page; ++ } else { ++ src_page = src_node->swap_it->page; ++ } ++ ++ /* Clear and invaliate cache */ ++ /* In ARM architecture, speculative read may pull stale data into L1 cache ++ * for kernel linear mapping page table. DMA_BIDIRECTIONAL could ++ * invalidate the L1 cache so that following read get the latest data ++ */ ++ dma_unmap_page(&mali_platform_device->dev, _mali_page_node_get_dma_addr(src_node), ++ _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); ++ ++ src = kmap_atomic(src_page); ++ memcpy(dst, src , _MALI_OSK_MALI_PAGE_SIZE); ++ kunmap_atomic(src); ++ dma_addr = dma_map_page(&mali_platform_device->dev, src_page, ++ 0, _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); ++ ++ if (src_node->type == MALI_PAGE_NODE_SWAP) { ++ src_node->swap_it->dma_addr = dma_addr; ++ } ++ } else if (src_node->type == MALI_PAGE_NODE_BLOCK) { ++ /* ++ * use ioremap to map src for BLOCK memory ++ */ ++ src = ioremap(_mali_page_node_get_dma_addr(src_node), _MALI_OSK_MALI_PAGE_SIZE); ++ memcpy(dst, src , _MALI_OSK_MALI_PAGE_SIZE); ++ iounmap(src); ++ } ++ kunmap_atomic(dst); ++ dma_addr = dma_map_page(&mali_platform_device->dev, dst_page, ++ 0, _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); ++ ++ if (dst_node->type == MALI_PAGE_NODE_SWAP) { ++ dst_node->swap_it->dma_addr = dma_addr; ++ } ++} ++ ++ ++/* ++* allocate page on demand when CPU access it, ++* THis used in page fault handler ++*/ ++_mali_osk_errcode_t mali_mem_cow_allocate_on_demand(mali_mem_backend *mem_bkend, u32 offset_page) ++{ ++ struct page *new_page = NULL; ++ struct mali_page_node *new_node = NULL; ++ int i = 0; ++ struct mali_page_node *m_page, *found_node = NULL; ++ struct mali_session_data *session = NULL; ++ mali_mem_cow *cow = &mem_bkend->cow_mem; ++ MALI_DEBUG_ASSERT(MALI_MEM_COW == mem_bkend->type); ++ MALI_DEBUG_ASSERT(offset_page < mem_bkend->size / _MALI_OSK_MALI_PAGE_SIZE); ++ MALI_DEBUG_PRINT(4, ("mali_mem_cow_allocate_on_demand !, offset_page =0x%x\n", offset_page)); ++ ++ /* allocate new page here */ ++ new_page = mali_mem_cow_alloc_page(); ++ if (!new_page) ++ return _MALI_OSK_ERR_NOMEM; ++ ++ new_node = _mali_page_node_allocate(MALI_PAGE_NODE_OS); ++ if (!new_node) { ++ __free_page(new_page); ++ return _MALI_OSK_ERR_NOMEM; ++ } ++ ++ /* find the page in backend*/ ++ list_for_each_entry(m_page, &cow->pages, list) { ++ if (i == offset_page) { ++ found_node = m_page; ++ break; ++ } ++ i++; ++ } ++ MALI_DEBUG_ASSERT(found_node); ++ if (NULL == found_node) { ++ __free_page(new_page); ++ kfree(new_node); ++ return _MALI_OSK_ERR_ITEM_NOT_FOUND; ++ } ++ ++ _mali_page_node_add_page(new_node, new_page); ++ ++ /* Copy the src page's content to new page */ ++ _mali_mem_cow_copy_page(found_node, new_node); ++ ++ MALI_DEBUG_ASSERT_POINTER(mem_bkend->mali_allocation); ++ session = mem_bkend->mali_allocation->session; ++ MALI_DEBUG_ASSERT_POINTER(session); ++ if (1 != _mali_page_node_get_ref_count(found_node)) { ++ atomic_add(1, &session->mali_mem_allocated_pages); ++ if (atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE > session->max_mali_mem_allocated_size) { ++ session->max_mali_mem_allocated_size = atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE; ++ } ++ mem_bkend->cow_mem.change_pages_nr++; ++ } ++ ++ _mali_osk_mutex_wait(session->cow_lock); ++ if (_mali_mem_put_page_node(found_node)) { ++ __free_page(new_page); ++ kfree(new_node); ++ _mali_osk_mutex_signal(session->cow_lock); ++ return _MALI_OSK_ERR_NOMEM; ++ } ++ _mali_osk_mutex_signal(session->cow_lock); ++ ++ list_replace(&found_node->list, &new_node->list); ++ ++ kfree(found_node); ++ ++ /* map to GPU side*/ ++ _mali_osk_mutex_wait(session->memory_lock); ++ mali_mem_cow_mali_map(mem_bkend, offset_page * _MALI_OSK_MALI_PAGE_SIZE, _MALI_OSK_MALI_PAGE_SIZE); ++ _mali_osk_mutex_signal(session->memory_lock); ++ return _MALI_OSK_ERR_OK; ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h +new file mode 100755 +index 000000000..5f83a37fc +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h +@@ -0,0 +1,48 @@ ++/* ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ ++#ifndef __MALI_MEMORY_COW_H__ ++#define __MALI_MEMORY_COW_H__ ++ ++#include "mali_osk.h" ++#include "mali_session.h" ++#include "mali_memory_types.h" ++ ++int mali_mem_cow_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma); ++_mali_osk_errcode_t mali_mem_cow_cpu_map_pages_locked(mali_mem_backend *mem_bkend, ++ struct vm_area_struct *vma, ++ unsigned long vaddr, ++ int num); ++ ++_mali_osk_errcode_t mali_memory_do_cow(mali_mem_backend *target_bk, ++ u32 target_offset, ++ u32 target_size, ++ mali_mem_backend *backend, ++ u32 range_start, ++ u32 range_size); ++ ++_mali_osk_errcode_t mali_memory_cow_modify_range(mali_mem_backend *backend, ++ u32 range_start, ++ u32 range_size); ++ ++_mali_osk_errcode_t mali_memory_cow_os_memory(mali_mem_backend *target_bk, ++ u32 target_offset, ++ u32 target_size, ++ mali_mem_backend *backend, ++ u32 range_start, ++ u32 range_size); ++ ++void _mali_mem_cow_copy_page(mali_page_node *src_node, mali_page_node *dst_node); ++ ++int mali_mem_cow_mali_map(mali_mem_backend *mem_bkend, u32 range_start, u32 range_size); ++u32 mali_mem_cow_release(mali_mem_backend *mem_bkend, mali_bool is_mali_mapped); ++_mali_osk_errcode_t mali_mem_cow_allocate_on_demand(mali_mem_backend *mem_bkend, u32 offset_page); ++#endif ++ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c +new file mode 100755 +index 000000000..a9db577cb +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c +@@ -0,0 +1,262 @@ ++/* ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#ifdef CONFIG_ARM ++#include ++#endif ++#include ++ ++#include "mali_memory.h" ++#include "mali_kernel_common.h" ++#include "mali_uk_types.h" ++#include "mali_osk.h" ++#include "mali_kernel_linux.h" ++#include "mali_memory_defer_bind.h" ++#include "mali_executor.h" ++#include "mali_osk.h" ++#include "mali_scheduler.h" ++#include "mali_gp_job.h" ++ ++mali_defer_bind_manager *mali_dmem_man = NULL; ++ ++static u32 mali_dmem_get_gp_varying_size(struct mali_gp_job *gp_job) ++{ ++ return gp_job->required_varying_memsize / _MALI_OSK_MALI_PAGE_SIZE; ++} ++ ++_mali_osk_errcode_t mali_mem_defer_bind_manager_init(void) ++{ ++ mali_dmem_man = _mali_osk_calloc(1, sizeof(struct mali_defer_bind_manager)); ++ if (!mali_dmem_man) ++ return _MALI_OSK_ERR_NOMEM; ++ ++ atomic_set(&mali_dmem_man->num_used_pages, 0); ++ atomic_set(&mali_dmem_man->num_dmem, 0); ++ ++ return _MALI_OSK_ERR_OK; ++} ++ ++ ++void mali_mem_defer_bind_manager_destory(void) ++{ ++ if (mali_dmem_man) { ++ MALI_DEBUG_ASSERT(0 == atomic_read(&mali_dmem_man->num_dmem)); ++ kfree(mali_dmem_man); ++ } ++ mali_dmem_man = NULL; ++} ++ ++ ++/*allocate pages from OS memory*/ ++_mali_osk_errcode_t mali_mem_defer_alloc_mem(u32 require, struct mali_session_data *session, mali_defer_mem_block *dblock) ++{ ++ int retval = 0; ++ u32 num_pages = require; ++ mali_mem_os_mem os_mem; ++ ++ retval = mali_mem_os_alloc_pages(&os_mem, num_pages * _MALI_OSK_MALI_PAGE_SIZE); ++ ++ /* add to free pages list */ ++ if (0 == retval) { ++ MALI_DEBUG_PRINT(4, ("mali_mem_defer_alloc_mem ,,*** pages allocate = 0x%x \n", num_pages)); ++ list_splice(&os_mem.pages, &dblock->free_pages); ++ atomic_add(os_mem.count, &dblock->num_free_pages); ++ atomic_add(os_mem.count, &session->mali_mem_allocated_pages); ++ if (atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE > session->max_mali_mem_allocated_size) { ++ session->max_mali_mem_allocated_size = atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE; ++ } ++ return _MALI_OSK_ERR_OK; ++ } else ++ return _MALI_OSK_ERR_FAULT; ++} ++ ++_mali_osk_errcode_t mali_mem_prepare_mem_for_job(struct mali_gp_job *next_gp_job, mali_defer_mem_block *dblock) ++{ ++ u32 require_page; ++ ++ if (!next_gp_job) ++ return _MALI_OSK_ERR_FAULT; ++ ++ require_page = mali_dmem_get_gp_varying_size(next_gp_job); ++ ++ MALI_DEBUG_PRINT(4, ("mali_mem_defer_prepare_mem_work, require alloc page 0x%x\n", ++ require_page)); ++ /* allocate more pages from OS */ ++ if (_MALI_OSK_ERR_OK != mali_mem_defer_alloc_mem(require_page, next_gp_job->session, dblock)) { ++ MALI_DEBUG_PRINT(1, ("ERROR##mali_mem_defer_prepare_mem_work, allocate page failed!!")); ++ return _MALI_OSK_ERR_NOMEM; ++ } ++ ++ next_gp_job->bind_flag = MALI_DEFER_BIND_MEMORY_PREPARED; ++ ++ return _MALI_OSK_ERR_OK; ++} ++ ++ ++/* do preparetion for allocation before defer bind */ ++_mali_osk_errcode_t mali_mem_defer_bind_allocation_prepare(mali_mem_allocation *alloc, struct list_head *list, u32 *required_varying_memsize) ++{ ++ mali_mem_backend *mem_bkend = NULL; ++ struct mali_backend_bind_list *bk_list = _mali_osk_calloc(1, sizeof(struct mali_backend_bind_list)); ++ if (NULL == bk_list) ++ return _MALI_OSK_ERR_FAULT; ++ ++ INIT_LIST_HEAD(&bk_list->node); ++ /* Get backend memory */ ++ mutex_lock(&mali_idr_mutex); ++ if (!(mem_bkend = idr_find(&mali_backend_idr, alloc->backend_handle))) { ++ MALI_DEBUG_PRINT(1, ("Can't find memory backend in defer bind!\n")); ++ mutex_unlock(&mali_idr_mutex); ++ _mali_osk_free(bk_list); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ mutex_unlock(&mali_idr_mutex); ++ ++ /* If the mem backend has already been bound, no need to bind again.*/ ++ if (mem_bkend->os_mem.count > 0) { ++ _mali_osk_free(bk_list); ++ return _MALI_OSK_ERR_OK; ++ } ++ ++ MALI_DEBUG_PRINT(4, ("bind_allocation_prepare:: allocation =%x vaddr=0x%x!\n", alloc, alloc->mali_vma_node.vm_node.start)); ++ ++ INIT_LIST_HEAD(&mem_bkend->os_mem.pages); ++ ++ bk_list->bkend = mem_bkend; ++ bk_list->vaddr = alloc->mali_vma_node.vm_node.start; ++ bk_list->session = alloc->session; ++ bk_list->page_num = mem_bkend->size / _MALI_OSK_MALI_PAGE_SIZE; ++ *required_varying_memsize += mem_bkend->size; ++ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_OS); ++ ++ /* add to job to do list */ ++ list_add(&bk_list->node, list); ++ ++ return _MALI_OSK_ERR_OK; ++} ++ ++ ++ ++/* bind phyiscal memory to allocation ++This function will be called in IRQ handler*/ ++static _mali_osk_errcode_t mali_mem_defer_bind_allocation(struct mali_backend_bind_list *bk_node, ++ struct list_head *pages) ++{ ++ struct mali_session_data *session = bk_node->session; ++ mali_mem_backend *mem_bkend = bk_node->bkend; ++ MALI_DEBUG_PRINT(4, ("mali_mem_defer_bind_allocation, bind bkend = %x page num=0x%x vaddr=%x session=%x\n", mem_bkend, bk_node->page_num, bk_node->vaddr, session)); ++ ++ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_OS); ++ list_splice(pages, &mem_bkend->os_mem.pages); ++ mem_bkend->os_mem.count = bk_node->page_num; ++ ++ if (mem_bkend->type == MALI_MEM_OS) { ++ mali_mem_os_mali_map(&mem_bkend->os_mem, session, bk_node->vaddr, 0, ++ mem_bkend->os_mem.count, MALI_MMU_FLAGS_DEFAULT); ++ } ++ smp_wmb(); ++ bk_node->flag = MALI_DEFER_BIND_MEMORY_BINDED; ++ mem_bkend->flags &= ~MALI_MEM_BACKEND_FLAG_NOT_BINDED; ++ mem_bkend->flags |= MALI_MEM_BACKEND_FLAG_BINDED; ++ return _MALI_OSK_ERR_OK; ++} ++ ++ ++static struct list_head *mali_mem_defer_get_free_page_list(u32 count, struct list_head *pages, mali_defer_mem_block *dblock) ++{ ++ int i = 0; ++ struct mali_page_node *m_page, *m_tmp; ++ ++ if (atomic_read(&dblock->num_free_pages) < count) { ++ return NULL; ++ } else { ++ list_for_each_entry_safe(m_page, m_tmp, &dblock->free_pages, list) { ++ if (i < count) { ++ list_move_tail(&m_page->list, pages); ++ } else { ++ break; ++ } ++ i++; ++ } ++ MALI_DEBUG_ASSERT(i == count); ++ atomic_sub(count, &dblock->num_free_pages); ++ return pages; ++ } ++} ++ ++ ++/* called in job start IOCTL to bind physical memory for each allocations ++@ bk_list backend list to do defer bind ++@ pages page list to do this bind ++@ count number of pages ++*/ ++_mali_osk_errcode_t mali_mem_defer_bind(struct mali_gp_job *gp, ++ struct mali_defer_mem_block *dmem_block) ++{ ++ struct mali_defer_mem *dmem = NULL; ++ struct mali_backend_bind_list *bkn, *bkn_tmp; ++ LIST_HEAD(pages); ++ ++ if (gp->required_varying_memsize != (atomic_read(&dmem_block->num_free_pages) * _MALI_OSK_MALI_PAGE_SIZE)) { ++ MALI_DEBUG_PRINT_ERROR(("#BIND: The memsize of varying buffer not match to the pagesize of the dmem_block!!## \n")); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ ++ MALI_DEBUG_PRINT(4, ("#BIND: GP job=%x## \n", gp)); ++ dmem = (mali_defer_mem *)_mali_osk_calloc(1, sizeof(struct mali_defer_mem)); ++ if (dmem) { ++ INIT_LIST_HEAD(&dmem->node); ++ gp->dmem = dmem; ++ } else { ++ return _MALI_OSK_ERR_NOMEM; ++ } ++ ++ atomic_add(1, &mali_dmem_man->num_dmem); ++ /* for each bk_list backend, do bind */ ++ list_for_each_entry_safe(bkn, bkn_tmp , &gp->vary_todo, node) { ++ INIT_LIST_HEAD(&pages); ++ if (likely(mali_mem_defer_get_free_page_list(bkn->page_num, &pages, dmem_block))) { ++ list_del(&bkn->node); ++ mali_mem_defer_bind_allocation(bkn, &pages); ++ _mali_osk_free(bkn); ++ } else { ++ /* not enough memory will not happen */ ++ MALI_DEBUG_PRINT_ERROR(("#BIND: NOT enough memory when binded !!## \n")); ++ _mali_osk_free(gp->dmem); ++ return _MALI_OSK_ERR_NOMEM; ++ } ++ } ++ ++ if (!list_empty(&gp->vary_todo)) { ++ MALI_DEBUG_PRINT_ERROR(("#BIND: The deferbind backend list isn't empty !!## \n")); ++ _mali_osk_free(gp->dmem); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ ++ dmem->flag = MALI_DEFER_BIND_MEMORY_BINDED; ++ ++ return _MALI_OSK_ERR_OK; ++} ++ ++void mali_mem_defer_dmem_free(struct mali_gp_job *gp) ++{ ++ if (gp->dmem) { ++ atomic_dec(&mali_dmem_man->num_dmem); ++ _mali_osk_free(gp->dmem); ++ } ++} ++ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h +new file mode 100755 +index 000000000..defa08d52 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h +@@ -0,0 +1,64 @@ ++/* ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#ifndef __MALI_MEMORY_DEFER_BIND_H_ ++#define __MALI_MEMORY_DEFER_BIND_H_ ++ ++ ++#include "mali_osk.h" ++#include "mali_session.h" ++ ++#include ++#include ++#include ++#include ++#include ++ ++ ++#include "mali_memory_types.h" ++#include "mali_memory_os_alloc.h" ++#include "mali_uk_types.h" ++ ++struct mali_gp_job; ++ ++typedef struct mali_defer_mem { ++ struct list_head node; /*dlist node in bind manager */ ++ u32 flag; ++} mali_defer_mem; ++ ++ ++typedef struct mali_defer_mem_block { ++ struct list_head free_pages; /* page pool */ ++ atomic_t num_free_pages; ++} mali_defer_mem_block; ++ ++/* varying memory list need to bind */ ++typedef struct mali_backend_bind_list { ++ struct list_head node; ++ struct mali_mem_backend *bkend; ++ u32 vaddr; ++ u32 page_num; ++ struct mali_session_data *session; ++ u32 flag; ++} mali_backend_bind_lists; ++ ++ ++typedef struct mali_defer_bind_manager { ++ atomic_t num_used_pages; ++ atomic_t num_dmem; ++} mali_defer_bind_manager; ++ ++_mali_osk_errcode_t mali_mem_defer_bind_manager_init(void); ++void mali_mem_defer_bind_manager_destory(void); ++_mali_osk_errcode_t mali_mem_defer_bind(struct mali_gp_job *gp, struct mali_defer_mem_block *dmem_block); ++_mali_osk_errcode_t mali_mem_defer_bind_allocation_prepare(mali_mem_allocation *alloc, struct list_head *list, u32 *required_varying_memsize); ++_mali_osk_errcode_t mali_mem_prepare_mem_for_job(struct mali_gp_job *next_gp_job, mali_defer_mem_block *dblock); ++void mali_mem_defer_dmem_free(struct mali_gp_job *gp); ++ ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c +new file mode 100755 +index 000000000..1f4565127 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c +@@ -0,0 +1,369 @@ ++/* ++ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ /* need to keep the GPU VM locked while we set up UMM buffers */ -+ kbase_gpu_vm_lock(katom->kctx); -+ for (res_no = 0; res_no < katom->nr_extres; res_no++) { -+ struct base_external_resource *res; -+ struct kbase_va_region *reg; -+ struct kbase_mem_phy_alloc *alloc; -+ bool exclusive; ++#include /* file system operations */ ++#include /* user space access */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+ res = &input_extres[res_no]; -+ exclusive = (res->ext_resource & BASE_EXT_RES_ACCESS_EXCLUSIVE) -+ ? true : false; -+ reg = kbase_region_tracker_find_region_enclosing_address( -+ katom->kctx, -+ res->ext_resource & ~BASE_EXT_RES_ACCESS_EXCLUSIVE); -+ /* did we find a matching region object? */ -+ if (NULL == reg || (reg->flags & KBASE_REG_FREE)) { -+ /* roll back */ -+ goto failed_loop; -+ } ++#include "mali_ukk.h" ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_session.h" ++#include "mali_kernel_linux.h" + -+ if (!(katom->core_req & BASE_JD_REQ_SOFT_JOB) && -+ (reg->flags & KBASE_REG_SECURE)) { -+ katom->atom_flags |= KBASE_KATOM_FLAG_PROTECTED; -+ } ++#include "mali_memory.h" ++#include "mali_memory_dma_buf.h" ++#include "mali_memory_virtual.h" ++#include "mali_pp_job.h" + -+ alloc = kbase_map_external_resource(katom->kctx, reg, -+ current->mm -+#ifdef CONFIG_KDS -+ , &kds_res_count, kds_resources, -+ kds_access_bitmap, exclusive -+#endif -+ ); -+ if (!alloc) { -+ err_ret_val = -EINVAL; -+ goto failed_loop; -+ } ++/* ++ * Map DMA buf attachment \a mem into \a session at virtual address \a virt. ++ */ ++static int mali_dma_buf_map(mali_mem_backend *mem_backend) ++{ ++ mali_mem_allocation *alloc; ++ struct mali_dma_buf_attachment *mem; ++ struct mali_session_data *session; ++ struct mali_page_directory *pagedir; ++ _mali_osk_errcode_t err; ++ struct scatterlist *sg; ++ u32 virt, flags; ++ int i; + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ if (implicit_sync && -+ reg->gpu_alloc->type == KBASE_MEM_TYPE_IMPORTED_UMM) { -+ struct reservation_object *resv; ++ MALI_DEBUG_ASSERT_POINTER(mem_backend); + -+ resv = reg->gpu_alloc->imported.umm.dma_buf->resv; -+ if (resv) -+ kbase_dma_fence_add_reservation(resv, &info, -+ exclusive); -+ } -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ ++ alloc = mem_backend->mali_allocation; ++ MALI_DEBUG_ASSERT_POINTER(alloc); + -+ /* finish with updating out array with the data we found */ -+ /* NOTE: It is important that this is the last thing we do (or -+ * at least not before the first write) as we overwrite elements -+ * as we loop and could be overwriting ourself, so no writes -+ * until the last read for an element. -+ * */ -+ katom->extres[res_no].gpu_address = reg->start_pfn << PAGE_SHIFT; /* save the start_pfn (as an address, not pfn) to use fast lookup later */ -+ katom->extres[res_no].alloc = alloc; -+ } -+ /* successfully parsed the extres array */ -+ /* drop the vm lock before we call into kds */ -+ kbase_gpu_vm_unlock(katom->kctx); ++ mem = mem_backend->dma_buf.attachment; ++ MALI_DEBUG_ASSERT_POINTER(mem); + -+ /* Release the processes mmap lock */ -+ up_read(¤t->mm->mmap_sem); ++ session = alloc->session; ++ MALI_DEBUG_ASSERT_POINTER(session); ++ MALI_DEBUG_ASSERT(mem->session == session); + -+#ifdef CONFIG_KDS -+ if (kds_res_count) { -+ int wait_failed; ++ virt = alloc->mali_vma_node.vm_node.start; ++ flags = alloc->flags; + -+ /* We have resources to wait for with kds */ -+ katom->kds_dep_satisfied = false; ++ mali_session_memory_lock(session); ++ mem->map_ref++; + -+ wait_failed = kds_async_waitall(&katom->kds_rset, -+ &katom->kctx->jctx.kds_cb, katom, NULL, -+ kds_res_count, kds_access_bitmap, -+ kds_resources); ++ MALI_DEBUG_PRINT(5, ("Mali DMA-buf: map attachment %p, new map_ref = %d\n", mem, mem->map_ref)); + -+ if (wait_failed) -+ goto failed_kds_setup; -+ else -+ kbase_jd_kds_waiters_add(katom); -+ } else { -+ /* Nothing to wait for, so kds dep met */ -+ katom->kds_dep_satisfied = true; -+ } -+ kfree(kds_resources); -+ kfree(kds_access_bitmap); -+#endif /* CONFIG_KDS */ ++ if (1 == mem->map_ref) { + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ if (implicit_sync) { -+ if (info.dma_fence_resv_count) { -+ int ret; ++ /* First reference taken, so we need to map the dma buf */ ++ MALI_DEBUG_ASSERT(!mem->is_mapped); + -+ ret = kbase_dma_fence_wait(katom, &info); -+ if (ret < 0) -+ goto failed_dma_fence_setup; ++ mem->sgt = dma_buf_map_attachment(mem->attachment, DMA_BIDIRECTIONAL); ++ if (IS_ERR_OR_NULL(mem->sgt)) { ++ MALI_DEBUG_PRINT_ERROR(("Failed to map dma-buf attachment\n")); ++ mem->map_ref--; ++ mali_session_memory_unlock(session); ++ return -EFAULT; + } + -+ kfree(info.resv_objs); -+ kfree(info.dma_fence_excl_bitmap); -+ } -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ -+ -+ /* all done OK */ -+ return 0; ++ err = mali_mem_mali_map_prepare(alloc); ++ if (_MALI_OSK_ERR_OK != err) { ++ MALI_DEBUG_PRINT(1, ("Mapping of DMA memory failed\n")); ++ mem->map_ref--; ++ mali_session_memory_unlock(session); ++ return -ENOMEM; ++ } + -+/* error handling section */ ++ pagedir = mali_session_get_page_directory(session); ++ MALI_DEBUG_ASSERT_POINTER(pagedir); + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+failed_dma_fence_setup: -+#ifdef CONFIG_KDS -+ /* If we are here, dma_fence setup failed but KDS didn't. -+ * Revert KDS setup if any. -+ */ -+ if (kds_res_count) { -+ mutex_unlock(&katom->kctx->jctx.lock); -+ kds_resource_set_release_sync(&katom->kds_rset); -+ mutex_lock(&katom->kctx->jctx.lock); ++ for_each_sg(mem->sgt->sgl, sg, mem->sgt->nents, i) { ++ u32 size = sg_dma_len(sg); ++ dma_addr_t phys = sg_dma_address(sg); + -+ kbase_jd_kds_waiters_remove(katom); -+ katom->kds_dep_satisfied = true; -+ } -+#endif /* CONFIG_KDS */ -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ -+#ifdef CONFIG_KDS -+failed_kds_setup: -+#endif -+#if defined(CONFIG_KDS) || defined(CONFIG_MALI_BIFROST_DMA_FENCE) -+ /* Lock the processes mmap lock */ -+ down_read(¤t->mm->mmap_sem); ++ /* sg must be page aligned. */ ++ MALI_DEBUG_ASSERT(0 == size % MALI_MMU_PAGE_SIZE); ++ MALI_DEBUG_ASSERT(0 == (phys & ~(uintptr_t)0xFFFFFFFF)); + -+ /* lock before we unmap */ -+ kbase_gpu_vm_lock(katom->kctx); -+#endif ++ mali_mmu_pagedir_update(pagedir, virt, phys, size, MALI_MMU_FLAGS_DEFAULT); + -+ failed_loop: -+ /* undo the loop work */ -+ while (res_no-- > 0) { -+ struct kbase_mem_phy_alloc *alloc = katom->extres[res_no].alloc; ++ virt += size; ++ } + -+ kbase_unmap_external_resource(katom->kctx, NULL, alloc); -+ } -+ kbase_gpu_vm_unlock(katom->kctx); ++ if (flags & MALI_MEM_FLAG_MALI_GUARD_PAGE) { ++ u32 guard_phys; ++ MALI_DEBUG_PRINT(7, ("Mapping in extra guard page\n")); + -+ /* Release the processes mmap lock */ -+ up_read(¤t->mm->mmap_sem); ++ guard_phys = sg_dma_address(mem->sgt->sgl); ++ mali_mmu_pagedir_update(pagedir, virt, guard_phys, MALI_MMU_PAGE_SIZE, MALI_MMU_FLAGS_DEFAULT); ++ } + -+ early_err_out: -+ kfree(katom->extres); -+ katom->extres = NULL; -+#ifdef CONFIG_KDS -+ kfree(kds_resources); -+ kfree(kds_access_bitmap); -+#endif /* CONFIG_KDS */ -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ if (implicit_sync) { -+ kfree(info.resv_objs); -+ kfree(info.dma_fence_excl_bitmap); ++ mem->is_mapped = MALI_TRUE; ++ mali_session_memory_unlock(session); ++ /* Wake up any thread waiting for buffer to become mapped */ ++ wake_up_all(&mem->wait_queue); ++ } else { ++ MALI_DEBUG_ASSERT(mem->is_mapped); ++ mali_session_memory_unlock(session); + } -+#endif -+ return err_ret_val; ++ ++ return 0; +} + -+static inline void jd_resolve_dep(struct list_head *out_list, -+ struct kbase_jd_atom *katom, -+ u8 d, bool ctx_is_dying) ++static void mali_dma_buf_unmap(mali_mem_allocation *alloc, struct mali_dma_buf_attachment *mem) +{ -+ u8 other_d = !d; ++ MALI_DEBUG_ASSERT_POINTER(alloc); ++ MALI_DEBUG_ASSERT_POINTER(mem); ++ MALI_DEBUG_ASSERT_POINTER(mem->attachment); ++ MALI_DEBUG_ASSERT_POINTER(mem->buf); ++ MALI_DEBUG_ASSERT_POINTER(alloc->session); + -+ while (!list_empty(&katom->dep_head[d])) { -+ struct kbase_jd_atom *dep_atom; -+ struct kbase_jd_atom *other_dep_atom; -+ u8 dep_type; ++ mali_session_memory_lock(alloc->session); ++ mem->map_ref--; + -+ dep_atom = list_entry(katom->dep_head[d].next, -+ struct kbase_jd_atom, dep_item[d]); -+ list_del(katom->dep_head[d].next); ++ MALI_DEBUG_PRINT(5, ("Mali DMA-buf: unmap attachment %p, new map_ref = %d\n", mem, mem->map_ref)); + -+ dep_type = kbase_jd_katom_dep_type(&dep_atom->dep[d]); -+ kbase_jd_katom_dep_clear(&dep_atom->dep[d]); ++ if (0 == mem->map_ref) { ++ dma_buf_unmap_attachment(mem->attachment, mem->sgt, DMA_BIDIRECTIONAL); ++ if (MALI_TRUE == mem->is_mapped) { ++ mali_mem_mali_map_free(alloc->session, alloc->psize, alloc->mali_vma_node.vm_node.start, ++ alloc->flags); ++ } ++ mem->is_mapped = MALI_FALSE; ++ } ++ mali_session_memory_unlock(alloc->session); ++ /* Wake up any thread waiting for buffer to become unmapped */ ++ wake_up_all(&mem->wait_queue); ++} + -+ if (katom->event_code != BASE_JD_EVENT_DONE && -+ (dep_type != BASE_JD_DEP_TYPE_ORDER)) { -+#ifdef CONFIG_KDS -+ if (!dep_atom->kds_dep_satisfied) { -+ /* Just set kds_dep_satisfied to true. If the callback happens after this then it will early out and -+ * do nothing. If the callback doesn't happen then kbase_jd_post_external_resources will clean up -+ */ -+ dep_atom->kds_dep_satisfied = true; -+ } -+#endif ++#if !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) ++int mali_dma_buf_map_job(struct mali_pp_job *job) ++{ ++ struct mali_dma_buf_attachment *mem; ++ _mali_osk_errcode_t err; ++ int i; ++ int ret = 0; ++ u32 num_memory_cookies; ++ struct mali_session_data *session; ++ struct mali_vma_node *mali_vma_node = NULL; ++ mali_mem_allocation *mali_alloc = NULL; ++ mali_mem_backend *mem_bkend = NULL; + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ kbase_dma_fence_cancel_callbacks(dep_atom); -+#endif ++ MALI_DEBUG_ASSERT_POINTER(job); + -+ dep_atom->event_code = katom->event_code; -+ KBASE_DEBUG_ASSERT(dep_atom->status != -+ KBASE_JD_ATOM_STATE_UNUSED); ++ num_memory_cookies = mali_pp_job_num_memory_cookies(job); + -+ if ((dep_atom->core_req & BASE_JD_REQ_SOFT_REPLAY) -+ != BASE_JD_REQ_SOFT_REPLAY) { -+ dep_atom->will_fail_event_code = -+ dep_atom->event_code; -+ } else { -+ dep_atom->status = -+ KBASE_JD_ATOM_STATE_COMPLETED; -+ } ++ session = mali_pp_job_get_session(job); ++ ++ MALI_DEBUG_ASSERT_POINTER(session); ++ ++ for (i = 0; i < num_memory_cookies; i++) { ++ u32 mali_addr = mali_pp_job_get_memory_cookie(job, i); ++ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, mali_addr, 0); ++ MALI_DEBUG_ASSERT(NULL != mali_vma_node); ++ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); ++ MALI_DEBUG_ASSERT(NULL != mali_alloc); ++ if (MALI_MEM_DMA_BUF != mali_alloc->type) { ++ continue; + } -+ other_dep_atom = (struct kbase_jd_atom *) -+ kbase_jd_katom_dep_atom(&dep_atom->dep[other_d]); + -+ if (!dep_atom->in_jd_list && (!other_dep_atom || -+ (IS_GPU_ATOM(dep_atom) && !ctx_is_dying && -+ !dep_atom->will_fail_event_code && -+ !other_dep_atom->will_fail_event_code))) { -+ bool dep_satisfied = true; -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ int dep_count; ++ /* Get backend memory & Map on CPU */ ++ mutex_lock(&mali_idr_mutex); ++ mem_bkend = idr_find(&mali_backend_idr, mali_alloc->backend_handle); ++ mutex_unlock(&mali_idr_mutex); ++ MALI_DEBUG_ASSERT(NULL != mem_bkend); + -+ dep_count = kbase_fence_dep_count_read(dep_atom); -+ if (likely(dep_count == -1)) { -+ dep_satisfied = true; -+ } else { -+ /* -+ * There are either still active callbacks, or -+ * all fences for this @dep_atom has signaled, -+ * but the worker that will queue the atom has -+ * not yet run. -+ * -+ * Wait for the fences to signal and the fence -+ * worker to run and handle @dep_atom. If -+ * @dep_atom was completed due to error on -+ * @katom, then the fence worker will pick up -+ * the complete status and error code set on -+ * @dep_atom above. -+ */ -+ dep_satisfied = false; -+ } -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ ++ mem = mem_bkend->dma_buf.attachment; + -+#ifdef CONFIG_KDS -+ dep_satisfied = dep_satisfied && dep_atom->kds_dep_satisfied; -+#endif ++ MALI_DEBUG_ASSERT_POINTER(mem); ++ MALI_DEBUG_ASSERT(mem->session == mali_pp_job_get_session(job)); + -+ if (dep_satisfied) { -+ dep_atom->in_jd_list = true; -+ list_add_tail(&dep_atom->jd_item, out_list); -+ } ++ err = mali_dma_buf_map(mem_bkend); ++ if (0 != err) { ++ MALI_DEBUG_PRINT_ERROR(("Mali DMA-buf: Failed to map dma-buf for mali address %x\n", mali_addr)); ++ ret = -EFAULT; ++ continue; + } + } ++ return ret; +} + -+KBASE_EXPORT_TEST_API(jd_resolve_dep); -+ -+#if MALI_CUSTOMER_RELEASE == 0 -+static void jd_force_failure(struct kbase_device *kbdev, struct kbase_jd_atom *katom) ++void mali_dma_buf_unmap_job(struct mali_pp_job *job) +{ -+ kbdev->force_replay_count++; ++ struct mali_dma_buf_attachment *mem; ++ int i; ++ u32 num_memory_cookies; ++ struct mali_session_data *session; ++ struct mali_vma_node *mali_vma_node = NULL; ++ mali_mem_allocation *mali_alloc = NULL; ++ mali_mem_backend *mem_bkend = NULL; + -+ if (kbdev->force_replay_count >= kbdev->force_replay_limit) { -+ kbdev->force_replay_count = 0; -+ katom->event_code = BASE_JD_EVENT_FORCE_REPLAY; ++ MALI_DEBUG_ASSERT_POINTER(job); + -+ if (kbdev->force_replay_random) -+ kbdev->force_replay_limit = -+ (prandom_u32() % KBASEP_FORCE_REPLAY_RANDOM_LIMIT) + 1; ++ num_memory_cookies = mali_pp_job_num_memory_cookies(job); + -+ dev_info(kbdev->dev, "force_replay : promoting to error\n"); -+ } -+} ++ session = mali_pp_job_get_session(job); + -+/** Test to see if atom should be forced to fail. -+ * -+ * This function will check if an atom has a replay job as a dependent. If so -+ * then it will be considered for forced failure. */ -+static void jd_check_force_failure(struct kbase_jd_atom *katom) -+{ -+ struct kbase_context *kctx = katom->kctx; -+ struct kbase_device *kbdev = kctx->kbdev; -+ int i; ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ if ((kbdev->force_replay_limit == KBASEP_FORCE_REPLAY_DISABLED) || -+ (katom->core_req & BASEP_JD_REQ_EVENT_NEVER)) -+ return; ++ for (i = 0; i < num_memory_cookies; i++) { ++ u32 mali_addr = mali_pp_job_get_memory_cookie(job, i); ++ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, mali_addr, 0); ++ MALI_DEBUG_ASSERT(NULL != mali_vma_node); ++ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); ++ MALI_DEBUG_ASSERT(NULL != mali_alloc); ++ if (MALI_MEM_DMA_BUF != mali_alloc->type) { ++ continue; ++ } + -+ for (i = 1; i < BASE_JD_ATOM_COUNT; i++) { -+ if (kbase_jd_katom_dep_atom(&kctx->jctx.atoms[i].dep[0]) == katom || -+ kbase_jd_katom_dep_atom(&kctx->jctx.atoms[i].dep[1]) == katom) { -+ struct kbase_jd_atom *dep_atom = &kctx->jctx.atoms[i]; ++ /* Get backend memory & Map on CPU */ ++ mutex_lock(&mali_idr_mutex); ++ mem_bkend = idr_find(&mali_backend_idr, mali_alloc->backend_handle); ++ mutex_unlock(&mali_idr_mutex); ++ MALI_DEBUG_ASSERT(NULL != mem_bkend); + -+ if ((dep_atom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) == -+ BASE_JD_REQ_SOFT_REPLAY && -+ (dep_atom->core_req & kbdev->force_replay_core_req) -+ == kbdev->force_replay_core_req) { -+ jd_force_failure(kbdev, katom); -+ return; -+ } -+ } ++ mem = mem_bkend->dma_buf.attachment; ++ ++ MALI_DEBUG_ASSERT_POINTER(mem); ++ MALI_DEBUG_ASSERT(mem->session == mali_pp_job_get_session(job)); ++ mali_dma_buf_unmap(mem_bkend->mali_allocation, mem); + } +} -+#endif ++#endif /* !CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH */ + -+/** -+ * is_dep_valid - Validate that a dependency is valid for early dependency -+ * submission -+ * @katom: Dependency atom to validate -+ * -+ * A dependency is valid if any of the following are true : -+ * - It does not exist (a non-existent dependency does not block submission) -+ * - It is in the job scheduler -+ * - It has completed, does not have a failure event code, and has not been -+ * marked to fail in the future -+ * -+ * Return: true if valid, false otherwise -+ */ -+static bool is_dep_valid(struct kbase_jd_atom *katom) ++int mali_dma_buf_get_size(struct mali_session_data *session, _mali_uk_dma_buf_get_size_s __user *user_arg) +{ -+ /* If there's no dependency then this is 'valid' from the perspective of -+ * early dependency submission */ -+ if (!katom) -+ return true; ++ _mali_uk_dma_buf_get_size_s args; ++ int fd; ++ struct dma_buf *buf; + -+ /* Dependency must have reached the job scheduler */ -+ if (katom->status < KBASE_JD_ATOM_STATE_IN_JS) -+ return false; ++ /* get call arguments from user space. copy_from_user returns how many bytes which where NOT copied */ ++ if (0 != copy_from_user(&args, (void __user *)user_arg, sizeof(_mali_uk_dma_buf_get_size_s))) { ++ return -EFAULT; ++ } + -+ /* If dependency has completed and has failed or will fail then it is -+ * not valid */ -+ if (katom->status >= KBASE_JD_ATOM_STATE_HW_COMPLETED && -+ (katom->event_code != BASE_JD_EVENT_DONE || -+ katom->will_fail_event_code)) -+ return false; ++ /* Do DMA-BUF stuff */ ++ fd = args.mem_fd; + -+ return true; ++ buf = dma_buf_get(fd); ++ if (IS_ERR_OR_NULL(buf)) { ++ MALI_DEBUG_PRINT_ERROR(("Failed to get dma-buf from fd: %d\n", fd)); ++ return PTR_ERR_OR_ZERO(buf); ++ } ++ ++ if (0 != put_user(buf->size, &user_arg->size)) { ++ dma_buf_put(buf); ++ return -EFAULT; ++ } ++ ++ dma_buf_put(buf); ++ ++ return 0; +} + -+static void jd_try_submitting_deps(struct list_head *out_list, -+ struct kbase_jd_atom *node) ++_mali_osk_errcode_t mali_mem_bind_dma_buf(mali_mem_allocation *alloc, ++ mali_mem_backend *mem_backend, ++ int fd, u32 flags) +{ -+ int i; ++ struct dma_buf *buf; ++ struct mali_dma_buf_attachment *dma_mem; ++ struct mali_session_data *session = alloc->session; + -+ for (i = 0; i < 2; i++) { -+ struct list_head *pos; ++ MALI_DEBUG_ASSERT_POINTER(session); ++ MALI_DEBUG_ASSERT_POINTER(mem_backend); ++ MALI_DEBUG_ASSERT_POINTER(alloc); + -+ list_for_each(pos, &node->dep_head[i]) { -+ struct kbase_jd_atom *dep_atom = list_entry(pos, -+ struct kbase_jd_atom, dep_item[i]); ++ /* get dma buffer */ ++ buf = dma_buf_get(fd); ++ if (IS_ERR_OR_NULL(buf)) { ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ if (IS_GPU_ATOM(dep_atom) && !dep_atom->in_jd_list) { -+ /*Check if atom deps look sane*/ -+ bool dep0_valid = is_dep_valid( -+ dep_atom->dep[0].atom); -+ bool dep1_valid = is_dep_valid( -+ dep_atom->dep[1].atom); -+ bool dep_satisfied = true; -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ int dep_count; ++ /* Currently, mapping of the full buffer are supported. */ ++ if (alloc->psize != buf->size) { ++ goto failed_alloc_mem; ++ } + -+ dep_count = kbase_fence_dep_count_read( -+ dep_atom); -+ if (likely(dep_count == -1)) { -+ dep_satisfied = true; -+ } else { -+ /* -+ * There are either still active callbacks, or -+ * all fences for this @dep_atom has signaled, -+ * but the worker that will queue the atom has -+ * not yet run. -+ * -+ * Wait for the fences to signal and the fence -+ * worker to run and handle @dep_atom. If -+ * @dep_atom was completed due to error on -+ * @katom, then the fence worker will pick up -+ * the complete status and error code set on -+ * @dep_atom above. -+ */ -+ dep_satisfied = false; -+ } -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ -+#ifdef CONFIG_KDS -+ dep_satisfied = dep_satisfied && -+ dep_atom->kds_dep_satisfied; -+#endif ++ dma_mem = _mali_osk_calloc(1, sizeof(struct mali_dma_buf_attachment)); ++ if (NULL == dma_mem) { ++ goto failed_alloc_mem; ++ } + -+ if (dep0_valid && dep1_valid && dep_satisfied) { -+ dep_atom->in_jd_list = true; -+ list_add(&dep_atom->jd_item, out_list); -+ } -+ } -+ } ++ dma_mem->buf = buf; ++ dma_mem->session = session; ++ dma_mem->map_ref = 0; ++ init_waitqueue_head(&dma_mem->wait_queue); ++ ++ dma_mem->attachment = dma_buf_attach(dma_mem->buf, &mali_platform_device->dev); ++ if (NULL == dma_mem->attachment) { ++ goto failed_dma_attach; + } -+} + -+/* -+ * Perform the necessary handling of an atom that has finished running -+ * on the GPU. -+ * -+ * Note that if this is a soft-job that has had kbase_prepare_soft_job called on it then the caller -+ * is responsible for calling kbase_finish_soft_job *before* calling this function. -+ * -+ * The caller must hold the kbase_jd_context.lock. -+ */ -+bool jd_done_nolock(struct kbase_jd_atom *katom, -+ struct list_head *completed_jobs_ctx) -+{ -+ struct kbase_context *kctx = katom->kctx; -+ struct kbase_device *kbdev = kctx->kbdev; -+ struct list_head completed_jobs; -+ struct list_head runnable_jobs; -+ bool need_to_try_schedule_context = false; -+ int i; ++ mem_backend->dma_buf.attachment = dma_mem; + -+ INIT_LIST_HEAD(&completed_jobs); -+ INIT_LIST_HEAD(&runnable_jobs); ++ alloc->flags |= MALI_MEM_FLAG_DONT_CPU_MAP; ++ if (flags & _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE) { ++ alloc->flags |= MALI_MEM_FLAG_MALI_GUARD_PAGE; ++ } + -+ KBASE_DEBUG_ASSERT(katom->status != KBASE_JD_ATOM_STATE_UNUSED); + -+#if MALI_CUSTOMER_RELEASE == 0 -+ jd_check_force_failure(katom); ++#if defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) ++ /* Map memory into session's Mali virtual address space. */ ++ if (0 != mali_dma_buf_map(mem_backend)) { ++ goto Failed_dma_map; ++ } +#endif + -+ /* This is needed in case an atom is failed due to being invalid, this -+ * can happen *before* the jobs that the atom depends on have completed */ -+ for (i = 0; i < 2; i++) { -+ if (kbase_jd_katom_dep_atom(&katom->dep[i])) { -+ list_del(&katom->dep_item[i]); -+ kbase_jd_katom_dep_clear(&katom->dep[i]); -+ } -+ } ++ return _MALI_OSK_ERR_OK; + -+ /* With PRLAM-10817 or PRLAM-10959 the last tile of a fragment job being soft-stopped can fail with -+ * BASE_JD_EVENT_TILE_RANGE_FAULT. -+ * -+ * So here if the fragment job failed with TILE_RANGE_FAULT and it has been soft-stopped, then we promote the -+ * error code to BASE_JD_EVENT_DONE -+ */ ++#if defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) ++Failed_dma_map: ++ mali_dma_buf_unmap(alloc, dma_mem); ++#endif ++ /* Wait for buffer to become unmapped */ ++ wait_event(dma_mem->wait_queue, !dma_mem->is_mapped); ++ MALI_DEBUG_ASSERT(!dma_mem->is_mapped); ++ dma_buf_detach(dma_mem->buf, dma_mem->attachment); ++failed_dma_attach: ++ _mali_osk_free(dma_mem); ++failed_alloc_mem: ++ dma_buf_put(buf); ++ return _MALI_OSK_ERR_FAULT; ++} + -+ if ((kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10817) || kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10959)) && -+ katom->event_code == BASE_JD_EVENT_TILE_RANGE_FAULT) { -+ if ((katom->core_req & BASE_JD_REQ_FS) && (katom->atom_flags & KBASE_KATOM_FLAG_BEEN_SOFT_STOPPPED)) { -+ /* Promote the failure to job done */ -+ katom->event_code = BASE_JD_EVENT_DONE; -+ katom->atom_flags = katom->atom_flags & (~KBASE_KATOM_FLAG_BEEN_SOFT_STOPPPED); -+ } -+ } ++void mali_mem_unbind_dma_buf(mali_mem_backend *mem_backend) ++{ ++ struct mali_dma_buf_attachment *mem; ++ MALI_DEBUG_ASSERT_POINTER(mem_backend); ++ MALI_DEBUG_ASSERT(MALI_MEM_DMA_BUF == mem_backend->type); + -+ katom->status = KBASE_JD_ATOM_STATE_COMPLETED; -+ list_add_tail(&katom->jd_item, &completed_jobs); ++ mem = mem_backend->dma_buf.attachment; ++ MALI_DEBUG_ASSERT_POINTER(mem); ++ MALI_DEBUG_ASSERT_POINTER(mem->attachment); ++ MALI_DEBUG_ASSERT_POINTER(mem->buf); ++ MALI_DEBUG_PRINT(3, ("Mali DMA-buf: release attachment %p\n", mem)); + -+ while (!list_empty(&completed_jobs)) { -+ katom = list_entry(completed_jobs.prev, struct kbase_jd_atom, jd_item); -+ list_del(completed_jobs.prev); -+ KBASE_DEBUG_ASSERT(katom->status == KBASE_JD_ATOM_STATE_COMPLETED); ++#if defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) ++ MALI_DEBUG_ASSERT_POINTER(mem_backend->mali_allocation); ++ /* We mapped implicitly on attach, so we need to unmap on release */ ++ mali_dma_buf_unmap(mem_backend->mali_allocation, mem); ++#endif ++ /* Wait for buffer to become unmapped */ ++ wait_event(mem->wait_queue, !mem->is_mapped); ++ MALI_DEBUG_ASSERT(!mem->is_mapped); + -+ for (i = 0; i < 2; i++) -+ jd_resolve_dep(&runnable_jobs, katom, i, -+ kbase_ctx_flag(kctx, KCTX_DYING)); ++ dma_buf_detach(mem->buf, mem->attachment); ++ dma_buf_put(mem->buf); + -+ if (katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) -+ kbase_jd_post_external_resources(katom); ++ _mali_osk_free(mem); ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h +new file mode 100755 +index 000000000..a9b287038 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h +@@ -0,0 +1,53 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ while (!list_empty(&runnable_jobs)) { -+ struct kbase_jd_atom *node; ++#ifndef __MALI_MEMORY_DMA_BUF_H__ ++#define __MALI_MEMORY_DMA_BUF_H__ + -+ node = list_entry(runnable_jobs.next, -+ struct kbase_jd_atom, jd_item); -+ list_del(runnable_jobs.next); -+ node->in_jd_list = false; ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ KBASE_DEBUG_ASSERT(node->status != KBASE_JD_ATOM_STATE_UNUSED); ++#include "mali_uk_types.h" ++#include "mali_osk.h" ++#include "mali_memory.h" + -+ if (node->status != KBASE_JD_ATOM_STATE_COMPLETED && -+ !kbase_ctx_flag(kctx, KCTX_DYING)) { -+ need_to_try_schedule_context |= jd_run_atom(node); -+ } else { -+ node->event_code = katom->event_code; ++struct mali_pp_job; + -+ if ((node->core_req & -+ BASE_JD_REQ_SOFT_JOB_TYPE) == -+ BASE_JD_REQ_SOFT_REPLAY) { -+ if (kbase_replay_process(node)) -+ /* Don't complete this atom */ -+ continue; -+ } else if (node->core_req & -+ BASE_JD_REQ_SOFT_JOB) { -+ /* If this is a fence wait soft job -+ * then remove it from the list of sync -+ * waiters. -+ */ -+ if (BASE_JD_REQ_SOFT_FENCE_WAIT == node->core_req) -+ kbasep_remove_waiting_soft_job(node); ++struct mali_dma_buf_attachment; ++struct mali_dma_buf_attachment { ++ struct dma_buf *buf; ++ struct dma_buf_attachment *attachment; ++ struct sg_table *sgt; ++ struct mali_session_data *session; ++ int map_ref; ++ struct mutex map_lock; ++ mali_bool is_mapped; ++ wait_queue_head_t wait_queue; ++}; + -+ kbase_finish_soft_job(node); -+ } -+ node->status = KBASE_JD_ATOM_STATE_COMPLETED; -+ } ++int mali_dma_buf_get_size(struct mali_session_data *session, _mali_uk_dma_buf_get_size_s __user *arg); + -+ if (node->status == KBASE_JD_ATOM_STATE_COMPLETED) { -+ list_add_tail(&node->jd_item, &completed_jobs); -+ } else if (node->status == KBASE_JD_ATOM_STATE_IN_JS && -+ !node->will_fail_event_code) { -+ /* Node successfully submitted, try submitting -+ * dependencies as they may now be representable -+ * in JS */ -+ jd_try_submitting_deps(&runnable_jobs, node); -+ } -+ } ++void mali_mem_unbind_dma_buf(mali_mem_backend *mem_backend); + -+ /* Register a completed job as a disjoint event when the GPU -+ * is in a disjoint state (ie. being reset or replaying jobs). -+ */ -+ kbase_disjoint_event_potential(kctx->kbdev); -+ if (completed_jobs_ctx) -+ list_add_tail(&katom->jd_item, completed_jobs_ctx); -+ else -+ kbase_event_post(kctx, katom); ++_mali_osk_errcode_t mali_mem_bind_dma_buf(mali_mem_allocation *alloc, ++ mali_mem_backend *mem_backend, ++ int fd, u32 flags); + -+ /* Decrement and check the TOTAL number of jobs. This includes -+ * those not tracked by the scheduler: 'not ready to run' and -+ * 'dependency-only' jobs. */ -+ if (--kctx->jctx.job_nr == 0) -+ wake_up(&kctx->jctx.zero_jobs_wait); /* All events are safely queued now, and we can signal any waiter -+ * that we've got no more jobs (so we can be safely terminated) */ -+ } ++#if !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) ++int mali_dma_buf_map_job(struct mali_pp_job *job); ++void mali_dma_buf_unmap_job(struct mali_pp_job *job); ++#endif + -+ return need_to_try_schedule_context; ++#ifdef __cplusplus +} ++#endif + -+KBASE_EXPORT_TEST_API(jd_done_nolock); ++#endif /* __MALI_MEMORY_DMA_BUF_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c +new file mode 100755 +index 000000000..76018b7ab +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c +@@ -0,0 +1,89 @@ ++/* ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+#ifdef CONFIG_GPU_TRACEPOINTS -+enum { -+ CORE_REQ_DEP_ONLY, -+ CORE_REQ_SOFT, -+ CORE_REQ_COMPUTE, -+ CORE_REQ_FRAGMENT, -+ CORE_REQ_VERTEX, -+ CORE_REQ_TILER, -+ CORE_REQ_FRAGMENT_VERTEX, -+ CORE_REQ_FRAGMENT_VERTEX_TILER, -+ CORE_REQ_FRAGMENT_TILER, -+ CORE_REQ_VERTEX_TILER, -+ CORE_REQ_UNKNOWN -+}; -+static const char * const core_req_strings[] = { -+ "Dependency Only Job", -+ "Soft Job", -+ "Compute Shader Job", -+ "Fragment Shader Job", -+ "Vertex/Geometry Shader Job", -+ "Tiler Job", -+ "Fragment Shader + Vertex/Geometry Shader Job", -+ "Fragment Shader + Vertex/Geometry Shader Job + Tiler Job", -+ "Fragment Shader + Tiler Job", -+ "Vertex/Geometry Shader Job + Tiler Job", -+ "Unknown Job" -+}; -+static const char *kbasep_map_core_reqs_to_string(base_jd_core_req core_req) ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_ukk.h" ++#include "mali_memory.h" ++#include "mali_mem_validation.h" ++#include "mali_uk_types.h" ++ ++void mali_mem_unbind_ext_buf(mali_mem_backend *mem_backend) +{ -+ if (core_req & BASE_JD_REQ_SOFT_JOB) -+ return core_req_strings[CORE_REQ_SOFT]; -+ if (core_req & BASE_JD_REQ_ONLY_COMPUTE) -+ return core_req_strings[CORE_REQ_COMPUTE]; -+ switch (core_req & (BASE_JD_REQ_FS | BASE_JD_REQ_CS | BASE_JD_REQ_T)) { -+ case BASE_JD_REQ_DEP: -+ return core_req_strings[CORE_REQ_DEP_ONLY]; -+ case BASE_JD_REQ_FS: -+ return core_req_strings[CORE_REQ_FRAGMENT]; -+ case BASE_JD_REQ_CS: -+ return core_req_strings[CORE_REQ_VERTEX]; -+ case BASE_JD_REQ_T: -+ return core_req_strings[CORE_REQ_TILER]; -+ case (BASE_JD_REQ_FS | BASE_JD_REQ_CS): -+ return core_req_strings[CORE_REQ_FRAGMENT_VERTEX]; -+ case (BASE_JD_REQ_FS | BASE_JD_REQ_T): -+ return core_req_strings[CORE_REQ_FRAGMENT_TILER]; -+ case (BASE_JD_REQ_CS | BASE_JD_REQ_T): -+ return core_req_strings[CORE_REQ_VERTEX_TILER]; -+ case (BASE_JD_REQ_FS | BASE_JD_REQ_CS | BASE_JD_REQ_T): -+ return core_req_strings[CORE_REQ_FRAGMENT_VERTEX_TILER]; -+ } -+ return core_req_strings[CORE_REQ_UNKNOWN]; ++ mali_mem_allocation *alloc; ++ struct mali_session_data *session; ++ MALI_DEBUG_ASSERT_POINTER(mem_backend); ++ alloc = mem_backend->mali_allocation; ++ MALI_DEBUG_ASSERT_POINTER(alloc); ++ MALI_DEBUG_ASSERT(MALI_MEM_EXTERNAL == mem_backend->type); ++ ++ session = alloc->session; ++ MALI_DEBUG_ASSERT_POINTER(session); ++ mali_session_memory_lock(session); ++ mali_mem_mali_map_free(session, alloc->psize, alloc->mali_vma_node.vm_node.start, ++ alloc->flags); ++ mali_session_memory_unlock(session); +} -+#endif + -+bool jd_submit_atom(struct kbase_context *kctx, const struct base_jd_atom_v2 *user_atom, struct kbase_jd_atom *katom) ++_mali_osk_errcode_t mali_mem_bind_ext_buf(mali_mem_allocation *alloc, ++ mali_mem_backend *mem_backend, ++ u32 phys_addr, ++ u32 flag) +{ -+ struct kbase_jd_context *jctx = &kctx->jctx; -+ int queued = 0; -+ int i; -+ int sched_prio; -+ bool ret; -+ bool will_fail = false; ++ struct mali_session_data *session; ++ _mali_osk_errcode_t err; ++ u32 virt, phys, size; ++ MALI_DEBUG_ASSERT_POINTER(mem_backend); ++ MALI_DEBUG_ASSERT_POINTER(alloc); ++ size = alloc->psize; ++ session = (struct mali_session_data *)(uintptr_t)alloc->session; ++ MALI_CHECK_NON_NULL(session, _MALI_OSK_ERR_INVALID_ARGS); + -+ /* Update the TOTAL number of jobs. This includes those not tracked by -+ * the scheduler: 'not ready to run' and 'dependency-only' jobs. */ -+ jctx->job_nr++; ++ /* check arguments */ ++ /* NULL might be a valid Mali address */ ++ if (!size) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+ katom->start_timestamp.tv64 = 0; -+#else -+ katom->start_timestamp = 0; -+#endif -+ katom->udata = user_atom->udata; -+ katom->kctx = kctx; -+ katom->nr_extres = user_atom->nr_extres; -+ katom->extres = NULL; -+ katom->device_nr = user_atom->device_nr; -+ katom->affinity = 0; -+ katom->jc = user_atom->jc; -+ katom->coreref_state = KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED; -+ katom->core_req = user_atom->core_req; -+ katom->atom_flags = 0; -+ katom->retry_count = 0; -+ katom->need_cache_flush_cores_retained = 0; -+ katom->pre_dep = NULL; -+ katom->post_dep = NULL; -+ katom->x_pre_dep = NULL; -+ katom->x_post_dep = NULL; -+ katom->will_fail_event_code = BASE_JD_EVENT_NOT_STARTED; ++ /* size must be a multiple of the system page size */ ++ if (size % _MALI_OSK_MALI_PAGE_SIZE) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); + -+ /* Implicitly sets katom->protected_state.enter as well. */ -+ katom->protected_state.exit = KBASE_ATOM_EXIT_PROTECTED_CHECK; ++ /* Validate the mali physical range */ ++ if (_MALI_OSK_ERR_OK != mali_mem_validation_check(phys_addr, size)) { ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ katom->age = kctx->age_count++; ++ if (flag & _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE) { ++ alloc->flags |= MALI_MEM_FLAG_MALI_GUARD_PAGE; ++ } + -+ INIT_LIST_HEAD(&katom->jd_item); -+#ifdef CONFIG_KDS -+ /* Start by assuming that the KDS dependencies are satisfied, -+ * kbase_jd_pre_external_resources will correct this if there are dependencies */ -+ katom->kds_dep_satisfied = true; -+ katom->kds_rset = NULL; -+#endif /* CONFIG_KDS */ -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ kbase_fence_dep_count_set(katom, -1); -+#endif ++ mali_session_memory_lock(session); + -+ /* Don't do anything if there is a mess up with dependencies. -+ This is done in a separate cycle to check both the dependencies at ones, otherwise -+ it will be extra complexity to deal with 1st dependency ( just added to the list ) -+ if only the 2nd one has invalid config. -+ */ -+ for (i = 0; i < 2; i++) { -+ int dep_atom_number = user_atom->pre_dep[i].atom_id; -+ base_jd_dep_type dep_atom_type = user_atom->pre_dep[i].dependency_type; ++ virt = alloc->mali_vma_node.vm_node.start; ++ phys = phys_addr; + -+ if (dep_atom_number) { -+ if (dep_atom_type != BASE_JD_DEP_TYPE_ORDER && -+ dep_atom_type != BASE_JD_DEP_TYPE_DATA) { -+ katom->event_code = BASE_JD_EVENT_JOB_CONFIG_FAULT; -+ katom->status = KBASE_JD_ATOM_STATE_COMPLETED; ++ err = mali_mem_mali_map_prepare(alloc); ++ if (_MALI_OSK_ERR_OK != err) { ++ mali_session_memory_unlock(session); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ /* Wrong dependency setup. Atom will be sent -+ * back to user space. Do not record any -+ * dependencies. */ -+ KBASE_TLSTREAM_TL_NEW_ATOM( -+ katom, -+ kbase_jd_atom_id(kctx, katom)); -+ KBASE_TLSTREAM_TL_RET_ATOM_CTX( -+ katom, kctx); -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(katom, -+ TL_ATOM_STATE_IDLE); ++ mali_mmu_pagedir_update(session->page_directory, virt, phys, size, MALI_MMU_FLAGS_DEFAULT); + -+ ret = jd_done_nolock(katom, NULL); -+ goto out; -+ } -+ } ++ if (alloc->flags & MALI_MEM_FLAG_MALI_GUARD_PAGE) { ++ mali_mmu_pagedir_update(session->page_directory, virt + size, phys, _MALI_OSK_MALI_PAGE_SIZE, MALI_MMU_FLAGS_DEFAULT); + } ++ MALI_DEBUG_PRINT(3, ++ ("Requested to map physical memory 0x%x-0x%x into virtual memory 0x%x\n", ++ phys_addr, (phys_addr + size - 1), ++ virt)); ++ mali_session_memory_unlock(session); + -+ /* Add dependencies */ -+ for (i = 0; i < 2; i++) { -+ int dep_atom_number = user_atom->pre_dep[i].atom_id; -+ base_jd_dep_type dep_atom_type; -+ struct kbase_jd_atom *dep_atom = &jctx->atoms[dep_atom_number]; -+ -+ dep_atom_type = user_atom->pre_dep[i].dependency_type; -+ kbase_jd_katom_dep_clear(&katom->dep[i]); ++ MALI_SUCCESS; ++} + -+ if (!dep_atom_number) -+ continue; +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h +new file mode 100755 +index 000000000..2db178d96 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h +@@ -0,0 +1,29 @@ + -+ if (dep_atom->status == KBASE_JD_ATOM_STATE_UNUSED || -+ dep_atom->status == KBASE_JD_ATOM_STATE_COMPLETED) { ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ if (dep_atom->event_code == BASE_JD_EVENT_DONE) -+ continue; -+ /* don't stop this atom if it has an order dependency -+ * only to the failed one, try to submit it through -+ * the normal path -+ */ -+ if (dep_atom_type == BASE_JD_DEP_TYPE_ORDER && -+ dep_atom->event_code > BASE_JD_EVENT_ACTIVE) { -+ continue; -+ } ++#ifndef __MALI_MEMORY_EXTERNAL_H__ ++#define __MALI_MEMORY_EXTERNAL_H__ + -+ /* Atom has completed, propagate the error code if any */ -+ katom->event_code = dep_atom->event_code; -+ katom->status = KBASE_JD_ATOM_STATE_QUEUED; ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ /* This atom is going through soft replay or -+ * will be sent back to user space. Do not record any -+ * dependencies. */ -+ KBASE_TLSTREAM_TL_NEW_ATOM( -+ katom, -+ kbase_jd_atom_id(kctx, katom)); -+ KBASE_TLSTREAM_TL_RET_ATOM_CTX(katom, kctx); -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(katom, -+ TL_ATOM_STATE_IDLE); ++_mali_osk_errcode_t mali_mem_bind_ext_buf(mali_mem_allocation *alloc, ++ mali_mem_backend *mem_backend, ++ u32 phys_addr, ++ u32 flag); ++void mali_mem_unbind_ext_buf(mali_mem_backend *mem_backend); + -+ if ((katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) -+ == BASE_JD_REQ_SOFT_REPLAY) { -+ if (kbase_replay_process(katom)) { -+ ret = false; -+ goto out; -+ } -+ } -+ will_fail = true; ++#ifdef __cplusplus ++} ++#endif + -+ } else { -+ /* Atom is in progress, add this atom to the list */ -+ list_add_tail(&katom->dep_item[i], &dep_atom->dep_head[i]); -+ kbase_jd_katom_dep_set(&katom->dep[i], dep_atom, dep_atom_type); -+ queued = 1; -+ } -+ } ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c +new file mode 100755 +index 000000000..6c0a2e9a8 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c +@@ -0,0 +1,992 @@ ++/* ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ if (will_fail) { -+ if (!queued) { -+ ret = jd_done_nolock(katom, NULL); ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+ goto out; -+ } else { -+ katom->will_fail_event_code = katom->event_code; -+ ret = false; ++#include ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++#include ++#endif ++#include + -+ goto out; -+ } -+ } else { -+ /* These must occur after the above loop to ensure that an atom -+ * that depends on a previous atom with the same number behaves -+ * as expected */ -+ katom->event_code = BASE_JD_EVENT_DONE; -+ katom->status = KBASE_JD_ATOM_STATE_QUEUED; -+ } ++#include "mali_osk.h" ++#include "mali_osk_mali.h" ++#include "mali_kernel_linux.h" ++#include "mali_scheduler.h" ++#include "mali_memory.h" ++#include "mali_memory_os_alloc.h" ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++#include "mali_memory_dma_buf.h" ++#include "mali_memory_secure.h" ++#endif ++#if defined(CONFIG_MALI400_UMP) ++#include "mali_memory_ump.h" ++#endif ++#include "mali_memory_manager.h" ++#include "mali_memory_virtual.h" ++#include "mali_memory_util.h" ++#include "mali_memory_external.h" ++#include "mali_memory_cow.h" ++#include "mali_memory_block_alloc.h" ++#include "mali_ukk.h" ++#include "mali_memory_swap_alloc.h" + -+ /* For invalid priority, be most lenient and choose the default */ -+ sched_prio = kbasep_js_atom_prio_to_sched_prio(user_atom->prio); -+ if (sched_prio == KBASE_JS_ATOM_SCHED_PRIO_INVALID) -+ sched_prio = KBASE_JS_ATOM_SCHED_PRIO_DEFAULT; -+ katom->sched_priority = sched_prio; ++/* ++* New memory system interface ++*/ + -+ /* Create a new atom recording all dependencies it was set up with. */ -+ KBASE_TLSTREAM_TL_NEW_ATOM( -+ katom, -+ kbase_jd_atom_id(kctx, katom)); -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(katom, TL_ATOM_STATE_IDLE); -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY(katom, katom->sched_priority); -+ KBASE_TLSTREAM_TL_RET_ATOM_CTX(katom, kctx); -+ for (i = 0; i < 2; i++) -+ if (BASE_JD_DEP_TYPE_INVALID != kbase_jd_katom_dep_type( -+ &katom->dep[i])) { -+ KBASE_TLSTREAM_TL_DEP_ATOM_ATOM( -+ (void *)kbase_jd_katom_dep_atom( -+ &katom->dep[i]), -+ (void *)katom); -+ } else if (BASE_JD_DEP_TYPE_INVALID != -+ user_atom->pre_dep[i].dependency_type) { -+ /* Resolved dependency. */ -+ int dep_atom_number = -+ user_atom->pre_dep[i].atom_id; -+ struct kbase_jd_atom *dep_atom = -+ &jctx->atoms[dep_atom_number]; ++/*inti idr for backend memory */ ++struct idr mali_backend_idr; ++struct mutex mali_idr_mutex; + -+ KBASE_TLSTREAM_TL_RDEP_ATOM_ATOM( -+ (void *)dep_atom, -+ (void *)katom); -+ } ++/* init allocation manager */ ++int mali_memory_manager_init(struct mali_allocation_manager *mgr) ++{ ++ /* init Locks */ ++ rwlock_init(&mgr->vm_lock); ++ mutex_init(&mgr->list_mutex); + -+ /* Reject atoms with job chain = NULL, as these cause issues with soft-stop */ -+ if (!katom->jc && (katom->core_req & BASE_JD_REQ_ATOM_TYPE) != BASE_JD_REQ_DEP) { -+ dev_warn(kctx->kbdev->dev, "Rejecting atom with jc = NULL"); -+ katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ ret = jd_done_nolock(katom, NULL); -+ goto out; -+ } ++ /* init link */ ++ INIT_LIST_HEAD(&mgr->head); + -+ /* Reject atoms with an invalid device_nr */ -+ if ((katom->core_req & BASE_JD_REQ_SPECIFIC_COHERENT_GROUP) && -+ (katom->device_nr >= kctx->kbdev->gpu_props.num_core_groups)) { -+ dev_warn(kctx->kbdev->dev, -+ "Rejecting atom with invalid device_nr %d", -+ katom->device_nr); -+ katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ ret = jd_done_nolock(katom, NULL); -+ goto out; -+ } ++ /* init RB tree */ ++ mgr->allocation_mgr_rb = RB_ROOT; ++ mgr->mali_allocation_num = 0; ++ return 0; ++} + -+ /* Reject atoms with invalid core requirements */ -+ if ((katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) && -+ (katom->core_req & BASE_JD_REQ_EVENT_COALESCE)) { -+ dev_warn(kctx->kbdev->dev, -+ "Rejecting atom with invalid core requirements"); -+ katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ katom->core_req &= ~BASE_JD_REQ_EVENT_COALESCE; -+ ret = jd_done_nolock(katom, NULL); -+ goto out; -+ } ++/* Deinit allocation manager ++* Do some check for debug ++*/ ++void mali_memory_manager_uninit(struct mali_allocation_manager *mgr) ++{ ++ /* check RB tree is empty */ ++ MALI_DEBUG_ASSERT(((void *)(mgr->allocation_mgr_rb.rb_node) == (void *)rb_last(&mgr->allocation_mgr_rb))); ++ /* check allocation List */ ++ MALI_DEBUG_ASSERT(list_empty(&mgr->head)); ++} + -+ if (katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) { -+ /* handle what we need to do to access the external resources */ -+ if (kbase_jd_pre_external_resources(katom, user_atom) != 0) { -+ /* setup failed (no access, bad resource, unknown resource types, etc.) */ -+ katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ ret = jd_done_nolock(katom, NULL); -+ goto out; -+ } -+ } ++/* Prepare memory descriptor */ ++static mali_mem_allocation *mali_mem_allocation_struct_create(struct mali_session_data *session) ++{ ++ mali_mem_allocation *mali_allocation; + -+ /* Validate the atom. Function will return error if the atom is -+ * malformed. -+ * -+ * Soft-jobs never enter the job scheduler but have their own initialize method. -+ * -+ * If either fail then we immediately complete the atom with an error. -+ */ -+ if ((katom->core_req & BASE_JD_REQ_SOFT_JOB) == 0) { -+ if (!kbase_js_is_atom_valid(kctx->kbdev, katom)) { -+ katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ ret = jd_done_nolock(katom, NULL); -+ goto out; -+ } -+ } else { -+ /* Soft-job */ -+ if (kbase_prepare_soft_job(katom) != 0) { -+ katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ ret = jd_done_nolock(katom, NULL); -+ goto out; -+ } ++ /* Allocate memory */ ++ mali_allocation = (mali_mem_allocation *)kzalloc(sizeof(mali_mem_allocation), GFP_KERNEL); ++ if (NULL == mali_allocation) { ++ MALI_DEBUG_PRINT(1, ("mali_mem_allocation_struct_create: descriptor was NULL\n")); ++ return NULL; + } + -+#ifdef CONFIG_GPU_TRACEPOINTS -+ katom->work_id = atomic_inc_return(&jctx->work_id); -+ trace_gpu_job_enqueue(kctx->id, katom->work_id, -+ kbasep_map_core_reqs_to_string(katom->core_req)); -+#endif -+ -+ if (queued && !IS_GPU_ATOM(katom)) { -+ ret = false; -+ goto out; -+ } -+#ifdef CONFIG_KDS -+ if (!katom->kds_dep_satisfied) { -+ /* Queue atom due to KDS dependency */ -+ ret = false; -+ goto out; -+ } -+#endif /* CONFIG_KDS */ ++ MALI_DEBUG_CODE(mali_allocation->magic = MALI_MEM_ALLOCATION_VALID_MAGIC); + ++ /* do init */ ++ mali_allocation->flags = 0; ++ mali_allocation->session = session; + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ if (kbase_fence_dep_count_read(katom) != -1) { -+ ret = false; -+ goto out; -+ } -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ ++ INIT_LIST_HEAD(&mali_allocation->list); ++ _mali_osk_atomic_init(&mali_allocation->mem_alloc_refcount, 1); + -+ if ((katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) -+ == BASE_JD_REQ_SOFT_REPLAY) { -+ if (kbase_replay_process(katom)) -+ ret = false; -+ else -+ ret = jd_done_nolock(katom, NULL); ++ /** ++ *add to session list ++ */ ++ mutex_lock(&session->allocation_mgr.list_mutex); ++ list_add_tail(&mali_allocation->list, &session->allocation_mgr.head); ++ session->allocation_mgr.mali_allocation_num++; ++ mutex_unlock(&session->allocation_mgr.list_mutex); + -+ goto out; -+ } else if (katom->core_req & BASE_JD_REQ_SOFT_JOB) { -+ if (kbase_process_soft_job(katom) == 0) { -+ kbase_finish_soft_job(katom); -+ ret = jd_done_nolock(katom, NULL); -+ goto out; -+ } ++ return mali_allocation; ++} + -+ ret = false; -+ } else if ((katom->core_req & BASE_JD_REQ_ATOM_TYPE) != BASE_JD_REQ_DEP) { -+ katom->status = KBASE_JD_ATOM_STATE_IN_JS; -+ ret = kbasep_js_add_job(kctx, katom); -+ /* If job was cancelled then resolve immediately */ -+ if (katom->event_code == BASE_JD_EVENT_JOB_CANCELLED) -+ ret = jd_done_nolock(katom, NULL); -+ } else { -+ /* This is a pure dependency. Resolve it immediately */ -+ ret = jd_done_nolock(katom, NULL); -+ } ++void mali_mem_allocation_struct_destory(mali_mem_allocation *alloc) ++{ ++ MALI_DEBUG_ASSERT_POINTER(alloc); ++ MALI_DEBUG_ASSERT_POINTER(alloc->session); ++ mutex_lock(&alloc->session->allocation_mgr.list_mutex); ++ list_del(&alloc->list); ++ alloc->session->allocation_mgr.mali_allocation_num--; ++ mutex_unlock(&alloc->session->allocation_mgr.list_mutex); + -+ out: -+ return ret; ++ kfree(alloc); +} + -+int kbase_jd_submit(struct kbase_context *kctx, -+ void __user *user_addr, u32 nr_atoms, u32 stride, -+ bool uk6_atom) ++int mali_mem_backend_struct_create(mali_mem_backend **backend, u32 psize) +{ -+ struct kbase_jd_context *jctx = &kctx->jctx; -+ int err = 0; -+ int i; -+ bool need_to_try_schedule_context = false; -+ struct kbase_device *kbdev; -+ u32 latest_flush; -+ -+ /* -+ * kbase_jd_submit isn't expected to fail and so all errors with the -+ * jobs are reported by immediately failing them (through event system) -+ */ -+ kbdev = kctx->kbdev; ++ mali_mem_backend *mem_backend = NULL; ++ s32 ret = -ENOSPC; ++ s32 index = -1; ++ *backend = (mali_mem_backend *)kzalloc(sizeof(mali_mem_backend), GFP_KERNEL); ++ if (NULL == *backend) { ++ MALI_DEBUG_PRINT(1, ("mali_mem_backend_struct_create: backend descriptor was NULL\n")); ++ return -1; ++ } ++ mem_backend = *backend; ++ mem_backend->size = psize; ++ mutex_init(&mem_backend->mutex); ++ INIT_LIST_HEAD(&mem_backend->list); ++ mem_backend->using_count = 0; + -+ beenthere(kctx, "%s", "Enter"); + -+ if (kbase_ctx_flag(kctx, KCTX_SUBMIT_DISABLED)) { -+ dev_err(kbdev->dev, "Attempt to submit to a context that has SUBMIT_DISABLED set on it"); -+ return -EINVAL; ++ /* link backend with id */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) ++again: ++ if (!idr_pre_get(&mali_backend_idr, GFP_KERNEL)) { ++ kfree(mem_backend); ++ return -ENOMEM; + } ++ mutex_lock(&mali_idr_mutex); ++ ret = idr_get_new_above(&mali_backend_idr, mem_backend, 1, &index); ++ mutex_unlock(&mali_idr_mutex); + -+ if (stride != sizeof(base_jd_atom_v2)) { -+ dev_err(kbdev->dev, "Stride passed to job_submit doesn't match kernel"); -+ return -EINVAL; ++ if (-ENOSPC == ret) { ++ kfree(mem_backend); ++ return -ENOSPC; ++ } ++ if (-EAGAIN == ret) ++ goto again; ++#else ++ mutex_lock(&mali_idr_mutex); ++ ret = idr_alloc(&mali_backend_idr, mem_backend, 1, MALI_S32_MAX, GFP_KERNEL); ++ mutex_unlock(&mali_idr_mutex); ++ index = ret; ++ if (ret < 0) { ++ MALI_DEBUG_PRINT(1, ("mali_mem_backend_struct_create: Can't allocate idr for backend! \n")); ++ kfree(mem_backend); ++ return -ENOSPC; + } -+ -+ KBASE_TIMELINE_ATOMS_IN_FLIGHT(kctx, atomic_add_return(nr_atoms, -+ &kctx->timeline.jd_atoms_in_flight)); -+ -+ /* All atoms submitted in this call have the same flush ID */ -+ latest_flush = kbase_backend_get_current_flush_id(kbdev); -+ -+ for (i = 0; i < nr_atoms; i++) { -+ struct base_jd_atom_v2 user_atom; -+ struct kbase_jd_atom *katom; -+ -+ if (copy_from_user(&user_atom, user_addr, -+ sizeof(user_atom)) != 0) { -+ err = -EINVAL; -+ KBASE_TIMELINE_ATOMS_IN_FLIGHT(kctx, -+ atomic_sub_return(nr_atoms - i, -+ &kctx->timeline.jd_atoms_in_flight)); -+ break; -+ } -+ -+#ifdef BASE_LEGACY_UK10_2_SUPPORT -+ if (KBASE_API_VERSION(10, 3) > kctx->api_version) -+ user_atom.core_req = (u32)(user_atom.compat_core_req -+ & 0x7fff); -+#endif /* BASE_LEGACY_UK10_2_SUPPORT */ -+ -+ user_addr = (void __user *)((uintptr_t) user_addr + stride); -+ -+ mutex_lock(&jctx->lock); -+#ifndef compiletime_assert -+#define compiletime_assert_defined -+#define compiletime_assert(x, msg) do { switch (0) { case 0: case (x):; } } \ -+while (false) -+#endif -+ compiletime_assert((1 << (8*sizeof(user_atom.atom_number))) == -+ BASE_JD_ATOM_COUNT, -+ "BASE_JD_ATOM_COUNT and base_atom_id type out of sync"); -+ compiletime_assert(sizeof(user_atom.pre_dep[0].atom_id) == -+ sizeof(user_atom.atom_number), -+ "BASE_JD_ATOM_COUNT and base_atom_id type out of sync"); -+#ifdef compiletime_assert_defined -+#undef compiletime_assert -+#undef compiletime_assert_defined +#endif -+ katom = &jctx->atoms[user_atom.atom_number]; -+ -+ /* Record the flush ID for the cache flush optimisation */ -+ katom->flush_id = latest_flush; -+ -+ while (katom->status != KBASE_JD_ATOM_STATE_UNUSED) { -+ /* Atom number is already in use, wait for the atom to -+ * complete -+ */ -+ mutex_unlock(&jctx->lock); -+ -+ /* This thread will wait for the atom to complete. Due -+ * to thread scheduling we are not sure that the other -+ * thread that owns the atom will also schedule the -+ * context, so we force the scheduler to be active and -+ * hence eventually schedule this context at some point -+ * later. -+ */ -+ kbase_js_sched_all(kbdev); ++ return index; ++} + -+ if (wait_event_killable(katom->completed, -+ katom->status == -+ KBASE_JD_ATOM_STATE_UNUSED) != 0) { -+ /* We're being killed so the result code -+ * doesn't really matter -+ */ -+ return 0; -+ } -+ mutex_lock(&jctx->lock); -+ } + -+ need_to_try_schedule_context |= -+ jd_submit_atom(kctx, &user_atom, katom); ++static void mali_mem_backend_struct_destory(mali_mem_backend **backend, s32 backend_handle) ++{ ++ mali_mem_backend *mem_backend = *backend; + -+ /* Register a completed job as a disjoint event when the GPU is in a disjoint state -+ * (ie. being reset or replaying jobs). -+ */ -+ kbase_disjoint_event_potential(kbdev); ++ mutex_lock(&mali_idr_mutex); ++ idr_remove(&mali_backend_idr, backend_handle); ++ mutex_unlock(&mali_idr_mutex); ++ kfree(mem_backend); ++ *backend = NULL; ++} + -+ mutex_unlock(&jctx->lock); ++mali_mem_backend *mali_mem_backend_struct_search(struct mali_session_data *session, u32 mali_address) ++{ ++ struct mali_vma_node *mali_vma_node = NULL; ++ mali_mem_backend *mem_bkend = NULL; ++ mali_mem_allocation *mali_alloc = NULL; ++ MALI_DEBUG_ASSERT_POINTER(session); ++ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, mali_address, 0); ++ if (NULL == mali_vma_node) { ++ MALI_DEBUG_PRINT(1, ("mali_mem_backend_struct_search:vma node was NULL\n")); ++ return NULL; + } -+ -+ if (need_to_try_schedule_context) -+ kbase_js_sched_all(kbdev); -+ -+ return err; ++ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); ++ /* Get backend memory & Map on CPU */ ++ mutex_lock(&mali_idr_mutex); ++ mem_bkend = idr_find(&mali_backend_idr, mali_alloc->backend_handle); ++ mutex_unlock(&mali_idr_mutex); ++ MALI_DEBUG_ASSERT(NULL != mem_bkend); ++ return mem_bkend; +} + -+KBASE_EXPORT_TEST_API(kbase_jd_submit); -+ -+void kbase_jd_done_worker(struct work_struct *data) ++static _mali_osk_errcode_t mali_mem_resize(struct mali_session_data *session, mali_mem_backend *mem_backend, u32 physical_size) +{ -+ struct kbase_jd_atom *katom = container_of(data, struct kbase_jd_atom, work); -+ struct kbase_jd_context *jctx; -+ struct kbase_context *kctx; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ struct kbase_device *kbdev; -+ struct kbasep_js_device_data *js_devdata; -+ u64 cache_jc = katom->jc; -+ struct kbasep_js_atom_retained_state katom_retained_state; -+ bool context_idle; -+ base_jd_core_req core_req = katom->core_req; -+ u64 affinity = katom->affinity; -+ enum kbase_atom_coreref_state coreref_state = katom->coreref_state; ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; ++ int retval = 0; ++ mali_mem_allocation *mali_allocation = NULL; ++ mali_mem_os_mem tmp_os_mem; ++ s32 change_page_count; + -+ /* Soft jobs should never reach this function */ -+ KBASE_DEBUG_ASSERT((katom->core_req & BASE_JD_REQ_SOFT_JOB) == 0); ++ MALI_DEBUG_ASSERT_POINTER(session); ++ MALI_DEBUG_ASSERT_POINTER(mem_backend); ++ MALI_DEBUG_PRINT(4, (" mali_mem_resize_memory called! \n")); ++ MALI_DEBUG_ASSERT(0 == physical_size % MALI_MMU_PAGE_SIZE); + -+ kctx = katom->kctx; -+ jctx = &kctx->jctx; -+ kbdev = kctx->kbdev; -+ js_kctx_info = &kctx->jctx.sched_info; -+ js_devdata = &kbdev->js_data; ++ mali_allocation = mem_backend->mali_allocation; ++ MALI_DEBUG_ASSERT_POINTER(mali_allocation); + -+ KBASE_TRACE_ADD(kbdev, JD_DONE_WORKER, kctx, katom, katom->jc, 0); ++ MALI_DEBUG_ASSERT(MALI_MEM_FLAG_CAN_RESIZE & mali_allocation->flags); ++ MALI_DEBUG_ASSERT(MALI_MEM_OS == mali_allocation->type); + -+ kbase_backend_complete_wq(kbdev, katom); ++ mutex_lock(&mem_backend->mutex); + -+ /* -+ * Begin transaction on JD context and JS context -+ */ -+ mutex_lock(&jctx->lock); -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(katom, TL_ATOM_STATE_DONE); -+ mutex_lock(&js_devdata->queue_mutex); -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++ /* Do resize*/ ++ if (physical_size > mem_backend->size) { ++ u32 add_size = physical_size - mem_backend->size; + -+ /* This worker only gets called on contexts that are scheduled *in*. This is -+ * because it only happens in response to an IRQ from a job that was -+ * running. -+ */ -+ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ MALI_DEBUG_ASSERT(0 == add_size % MALI_MMU_PAGE_SIZE); + -+ if (katom->event_code == BASE_JD_EVENT_STOPPED) { -+ /* Atom has been promoted to stopped */ -+ unsigned long flags; ++ /* Allocate new pages from os mem */ ++ retval = mali_mem_os_alloc_pages(&tmp_os_mem, add_size); + -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_unlock(&js_devdata->queue_mutex); ++ if (retval) { ++ if (-ENOMEM == retval) { ++ ret = _MALI_OSK_ERR_NOMEM; ++ } else { ++ ret = _MALI_OSK_ERR_FAULT; ++ } ++ MALI_DEBUG_PRINT(2, ("_mali_ukk_mem_resize: memory allocation failed !\n")); ++ goto failed_alloc_memory; ++ } + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ MALI_DEBUG_ASSERT(tmp_os_mem.count == add_size / MALI_MMU_PAGE_SIZE); + -+ katom->status = KBASE_JD_ATOM_STATE_IN_JS; -+ kbase_js_unpull(kctx, katom); ++ /* Resize the memory of the backend */ ++ ret = mali_mem_os_resize_pages(&tmp_os_mem, &mem_backend->os_mem, 0, tmp_os_mem.count); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&jctx->lock); ++ if (ret) { ++ MALI_DEBUG_PRINT(2, ("_mali_ukk_mem_resize: memory resizing failed !\n")); ++ goto failed_resize_pages; ++ } + -+ return; -+ } ++ /*Resize cpu mapping */ ++ if (NULL != mali_allocation->cpu_mapping.vma) { ++ ret = mali_mem_os_resize_cpu_map_locked(mem_backend, mali_allocation->cpu_mapping.vma, mali_allocation->cpu_mapping.vma->vm_start + mem_backend->size, add_size); ++ if (unlikely(ret != _MALI_OSK_ERR_OK)) { ++ MALI_DEBUG_PRINT(2, ("_mali_ukk_mem_resize: cpu mapping failed !\n")); ++ goto failed_cpu_map; ++ } ++ } + -+ if (katom->event_code != BASE_JD_EVENT_DONE) -+ dev_err(kbdev->dev, -+ "t6xx: GPU fault 0x%02lx from job slot %d\n", -+ (unsigned long)katom->event_code, -+ katom->slot_nr); ++ /* Resize mali mapping */ ++ _mali_osk_mutex_wait(session->memory_lock); ++ ret = mali_mem_mali_map_resize(mali_allocation, physical_size); + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8316)) -+ kbase_as_poking_timer_release_atom(kbdev, kctx, katom); ++ if (ret) { ++ MALI_DEBUG_PRINT(1, ("_mali_ukk_mem_resize: mali map resize fail !\n")); ++ goto failed_gpu_map; ++ } + -+ /* Retain state before the katom disappears */ -+ kbasep_js_atom_retained_state_copy(&katom_retained_state, katom); ++ ret = mali_mem_os_mali_map(&mem_backend->os_mem, session, mali_allocation->mali_vma_node.vm_node.start, ++ mali_allocation->psize / MALI_MMU_PAGE_SIZE, add_size / MALI_MMU_PAGE_SIZE, mali_allocation->mali_mapping.properties); ++ if (ret) { ++ MALI_DEBUG_PRINT(2, ("_mali_ukk_mem_resize: mali mapping failed !\n")); ++ goto failed_gpu_map; ++ } + -+ context_idle = kbase_js_complete_atom_wq(kctx, katom); ++ _mali_osk_mutex_signal(session->memory_lock); ++ } else { ++ u32 dec_size, page_count; ++ u32 vaddr = 0; ++ INIT_LIST_HEAD(&tmp_os_mem.pages); ++ tmp_os_mem.count = 0; + -+ KBASE_DEBUG_ASSERT(kbasep_js_has_atom_finished(&katom_retained_state)); ++ dec_size = mem_backend->size - physical_size; ++ MALI_DEBUG_ASSERT(0 == dec_size % MALI_MMU_PAGE_SIZE); + -+ kbasep_js_remove_job(kbdev, kctx, katom); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_unlock(&js_devdata->queue_mutex); -+ katom->atom_flags &= ~KBASE_KATOM_FLAG_HOLDING_CTX_REF; -+ /* jd_done_nolock() requires the jsctx_mutex lock to be dropped */ -+ jd_done_nolock(katom, &kctx->completed_jobs); ++ page_count = dec_size / MALI_MMU_PAGE_SIZE; ++ vaddr = mali_allocation->mali_vma_node.vm_node.start + physical_size; + -+ /* katom may have been freed now, do not use! */ ++ /* Resize the memory of the backend */ ++ ret = mali_mem_os_resize_pages(&mem_backend->os_mem, &tmp_os_mem, physical_size / MALI_MMU_PAGE_SIZE, page_count); + -+ if (context_idle) { -+ unsigned long flags; ++ if (ret) { ++ MALI_DEBUG_PRINT(4, ("_mali_ukk_mem_resize: mali map resize failed!\n")); ++ goto failed_resize_pages; ++ } + -+ context_idle = false; -+ mutex_lock(&js_devdata->queue_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ /* Resize mali map */ ++ _mali_osk_mutex_wait(session->memory_lock); ++ mali_mem_mali_map_free(session, dec_size, vaddr, mali_allocation->flags); ++ _mali_osk_mutex_signal(session->memory_lock); + -+ /* If kbase_sched() has scheduled this context back in then -+ * KCTX_ACTIVE will have been set after we marked it as -+ * inactive, and another pm reference will have been taken, so -+ * drop our reference. But do not call kbase_jm_idle_ctx(), as -+ * the context is active and fast-starting is allowed. -+ * -+ * If an atom has been fast-started then kctx->atoms_pulled will -+ * be non-zero but KCTX_ACTIVE will still be false (as the -+ * previous pm reference has been inherited). Do NOT drop our -+ * reference, as it has been re-used, and leave the context as -+ * active. -+ * -+ * If no new atoms have been started then KCTX_ACTIVE will still -+ * be false and atoms_pulled will be zero, so drop the reference -+ * and call kbase_jm_idle_ctx(). -+ * -+ * As the checks are done under both the queue_mutex and -+ * hwaccess_lock is should be impossible for this to race -+ * with the scheduler code. -+ */ -+ if (kbase_ctx_flag(kctx, KCTX_ACTIVE) || -+ !atomic_read(&kctx->atoms_pulled)) { -+ /* Calling kbase_jm_idle_ctx() here will ensure that -+ * atoms are not fast-started when we drop the -+ * hwaccess_lock. This is not performed if -+ * KCTX_ACTIVE is set as in that case another pm -+ * reference has been taken and a fast-start would be -+ * valid. -+ */ -+ if (!kbase_ctx_flag(kctx, KCTX_ACTIVE)) -+ kbase_jm_idle_ctx(kbdev, kctx); -+ context_idle = true; -+ } else { -+ kbase_ctx_flag_set(kctx, KCTX_ACTIVE); ++ /* Zap cpu mapping */ ++ if (0 != mali_allocation->cpu_mapping.addr) { ++ MALI_DEBUG_ASSERT(NULL != mali_allocation->cpu_mapping.vma); ++ zap_vma_ptes(mali_allocation->cpu_mapping.vma, mali_allocation->cpu_mapping.vma->vm_start + physical_size, dec_size); + } -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&js_devdata->queue_mutex); -+ } + -+ /* -+ * Transaction complete -+ */ -+ mutex_unlock(&jctx->lock); ++ /* Free those extra pages */ ++ mali_mem_os_free(&tmp_os_mem.pages, tmp_os_mem.count, MALI_FALSE); ++ } + -+ /* Job is now no longer running, so can now safely release the context -+ * reference, and handle any actions that were logged against the atom's retained state */ ++ /* Resize memory allocation and memory backend */ ++ change_page_count = (s32)(physical_size - mem_backend->size) / MALI_MMU_PAGE_SIZE; ++ mali_allocation->psize = physical_size; ++ mem_backend->size = physical_size; ++ mutex_unlock(&mem_backend->mutex); + -+ kbasep_js_runpool_release_ctx_and_katom_retained_state(kbdev, kctx, &katom_retained_state); ++ if (change_page_count > 0) { ++ atomic_add(change_page_count, &session->mali_mem_allocated_pages); ++ if (atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE > session->max_mali_mem_allocated_size) { ++ session->max_mali_mem_allocated_size = atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE; ++ } + -+ kbase_js_sched_all(kbdev); ++ } else { ++ atomic_sub((s32)(-change_page_count), &session->mali_mem_allocated_pages); ++ } + -+ if (!atomic_dec_return(&kctx->work_count)) { -+ /* If worker now idle then post all events that jd_done_nolock() -+ * has queued */ -+ mutex_lock(&jctx->lock); -+ while (!list_empty(&kctx->completed_jobs)) { -+ struct kbase_jd_atom *atom = list_entry( -+ kctx->completed_jobs.next, -+ struct kbase_jd_atom, jd_item); -+ list_del(kctx->completed_jobs.next); ++ return _MALI_OSK_ERR_OK; + -+ kbase_event_post(kctx, atom); -+ } -+ mutex_unlock(&jctx->lock); ++failed_gpu_map: ++ _mali_osk_mutex_signal(session->memory_lock); ++failed_cpu_map: ++ if (physical_size > mem_backend->size) { ++ mali_mem_os_resize_pages(&mem_backend->os_mem, &tmp_os_mem, mem_backend->size / MALI_MMU_PAGE_SIZE, ++ (physical_size - mem_backend->size) / MALI_MMU_PAGE_SIZE); ++ } else { ++ mali_mem_os_resize_pages(&tmp_os_mem, &mem_backend->os_mem, 0, tmp_os_mem.count); + } ++failed_resize_pages: ++ if (0 != tmp_os_mem.count) ++ mali_mem_os_free(&tmp_os_mem.pages, tmp_os_mem.count, MALI_FALSE); ++failed_alloc_memory: + -+ kbase_backend_complete_wq_post_sched(kbdev, core_req, affinity, -+ coreref_state); ++ mutex_unlock(&mem_backend->mutex); ++ return ret; ++} + -+ if (context_idle) -+ kbase_pm_context_idle(kbdev); + -+ KBASE_TRACE_ADD(kbdev, JD_DONE_WORKER_END, kctx, NULL, cache_jc, 0); ++/* Set GPU MMU properties */ ++static void _mali_memory_gpu_map_property_set(u32 *properties, u32 flags) ++{ ++ if (_MALI_MEMORY_GPU_READ_ALLOCATE & flags) { ++ *properties = MALI_MMU_FLAGS_FORCE_GP_READ_ALLOCATE; ++ } else { ++ *properties = MALI_MMU_FLAGS_DEFAULT; ++ } +} + -+/** -+ * jd_cancel_worker - Work queue job cancel function. -+ * @data: a &struct work_struct -+ * -+ * Only called as part of 'Zapping' a context (which occurs on termination). -+ * Operates serially with the kbase_jd_done_worker() on the work queue. -+ * -+ * This can only be called on contexts that aren't scheduled. -+ * -+ * We don't need to release most of the resources that would occur on -+ * kbase_jd_done() or kbase_jd_done_worker(), because the atoms here must not be -+ * running (by virtue of only being called on contexts that aren't -+ * scheduled). -+ */ -+static void jd_cancel_worker(struct work_struct *data) ++_mali_osk_errcode_t mali_mem_add_mem_size(struct mali_session_data *session, u32 mali_addr, u32 add_size) +{ -+ struct kbase_jd_atom *katom = container_of(data, struct kbase_jd_atom, work); -+ struct kbase_jd_context *jctx; -+ struct kbase_context *kctx; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ bool need_to_try_schedule_context; -+ bool attr_state_changed; -+ struct kbase_device *kbdev; ++ mali_mem_backend *mem_backend = NULL; ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; ++ mali_mem_allocation *mali_allocation = NULL; ++ u32 new_physical_size; ++ MALI_DEBUG_ASSERT_POINTER(session); ++ MALI_DEBUG_ASSERT(0 == add_size % MALI_MMU_PAGE_SIZE); + -+ /* Soft jobs should never reach this function */ -+ KBASE_DEBUG_ASSERT((katom->core_req & BASE_JD_REQ_SOFT_JOB) == 0); ++ /* Get the memory backend that need to be resize. */ ++ mem_backend = mali_mem_backend_struct_search(session, mali_addr); + -+ kctx = katom->kctx; -+ kbdev = kctx->kbdev; -+ jctx = &kctx->jctx; -+ js_kctx_info = &kctx->jctx.sched_info; ++ if (NULL == mem_backend) { ++ MALI_DEBUG_PRINT(2, ("_mali_ukk_mem_resize: memory backend = NULL!\n")); ++ return ret; ++ } + -+ KBASE_TRACE_ADD(kbdev, JD_CANCEL_WORKER, kctx, katom, katom->jc, 0); ++ mali_allocation = mem_backend->mali_allocation; + -+ /* This only gets called on contexts that are scheduled out. Hence, we must -+ * make sure we don't de-ref the number of running jobs (there aren't -+ * any), nor must we try to schedule out the context (it's already -+ * scheduled out). -+ */ -+ KBASE_DEBUG_ASSERT(!kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ MALI_DEBUG_ASSERT_POINTER(mali_allocation); + -+ /* Scheduler: Remove the job from the system */ -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); -+ attr_state_changed = kbasep_js_remove_cancelled_job(kbdev, kctx, katom); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ new_physical_size = add_size + mem_backend->size; + -+ mutex_lock(&jctx->lock); ++ if (new_physical_size > (mali_allocation->mali_vma_node.vm_node.size)) ++ return ret; + -+ need_to_try_schedule_context = jd_done_nolock(katom, NULL); -+ /* Because we're zapping, we're not adding any more jobs to this ctx, so no need to -+ * schedule the context. There's also no need for the jsctx_mutex to have been taken -+ * around this too. */ -+ KBASE_DEBUG_ASSERT(!need_to_try_schedule_context); ++ MALI_DEBUG_ASSERT(new_physical_size != mem_backend->size); + -+ /* katom may have been freed now, do not use! */ -+ mutex_unlock(&jctx->lock); ++ ret = mali_mem_resize(session, mem_backend, new_physical_size); + -+ if (attr_state_changed) -+ kbase_js_sched_all(kbdev); ++ return ret; +} + +/** -+ * kbase_jd_done - Complete a job that has been removed from the Hardware -+ * @katom: atom which has been completed -+ * @slot_nr: slot the atom was on -+ * @end_timestamp: completion time -+ * @done_code: completion code -+ * -+ * This must be used whenever a job has been removed from the Hardware, e.g.: -+ * An IRQ indicates that the job finished (for both error and 'done' codes), or -+ * the job was evicted from the JS_HEAD_NEXT registers during a Soft/Hard stop. -+ * -+ * Some work is carried out immediately, and the rest is deferred onto a -+ * workqueue -+ * -+ * Context: -+ * This can be called safely from atomic context. -+ * The caller must hold kbdev->hwaccess_lock -+ */ -+void kbase_jd_done(struct kbase_jd_atom *katom, int slot_nr, -+ ktime_t *end_timestamp, kbasep_js_atom_done_code done_code) ++* function@_mali_ukk_mem_allocate - allocate mali memory ++*/ ++_mali_osk_errcode_t _mali_ukk_mem_allocate(_mali_uk_alloc_mem_s *args) +{ -+ struct kbase_context *kctx; -+ struct kbase_device *kbdev; ++ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; ++ mali_mem_backend *mem_backend = NULL; ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; ++ int retval = 0; ++ mali_mem_allocation *mali_allocation = NULL; ++ struct mali_vma_node *mali_vma_node = NULL; + -+ KBASE_DEBUG_ASSERT(katom); -+ kctx = katom->kctx; -+ KBASE_DEBUG_ASSERT(kctx); -+ kbdev = kctx->kbdev; -+ KBASE_DEBUG_ASSERT(kbdev); ++ MALI_DEBUG_PRINT(4, (" _mali_ukk_mem_allocate, vaddr=0x%x, size =0x%x! \n", args->gpu_vaddr, args->psize)); + -+ if (done_code & KBASE_JS_ATOM_DONE_EVICTED_FROM_NEXT) -+ katom->event_code = BASE_JD_EVENT_REMOVED_FROM_NEXT; ++ /* Check if the address is allocated ++ */ ++ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, args->gpu_vaddr, 0); + -+ KBASE_TRACE_ADD(kbdev, JD_DONE, kctx, katom, katom->jc, 0); ++ if (unlikely(mali_vma_node)) { ++ MALI_DEBUG_PRINT_ERROR(("The mali virtual address has already been used ! \n")); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ /** ++ *create mali memory allocation ++ */ + -+ kbase_job_check_leave_disjoint(kbdev, katom); ++ mali_allocation = mali_mem_allocation_struct_create(session); + -+ katom->slot_nr = slot_nr; ++ if (mali_allocation == NULL) { ++ MALI_DEBUG_PRINT(1, ("_mali_ukk_mem_allocate: Failed to create allocation struct! \n")); ++ return _MALI_OSK_ERR_NOMEM; ++ } ++ mali_allocation->psize = args->psize; ++ mali_allocation->vsize = args->vsize; + -+ atomic_inc(&kctx->work_count); ++ /* MALI_MEM_OS if need to support mem resize, ++ * or MALI_MEM_BLOCK if have dedicated memory, ++ * or MALI_MEM_OS, ++ * or MALI_MEM_SWAP. ++ */ ++ if (args->flags & _MALI_MEMORY_ALLOCATE_SWAPPABLE) { ++ mali_allocation->type = MALI_MEM_SWAP; ++ } else if (args->flags & _MALI_MEMORY_ALLOCATE_RESIZEABLE) { ++ mali_allocation->type = MALI_MEM_OS; ++ mali_allocation->flags |= MALI_MEM_FLAG_CAN_RESIZE; ++ } else if (args->flags & _MALI_MEMORY_ALLOCATE_SECURE) { ++ mali_allocation->type = MALI_MEM_SECURE; ++ } else if (MALI_TRUE == mali_memory_have_dedicated_memory()) { ++ mali_allocation->type = MALI_MEM_BLOCK; ++ } else { ++ mali_allocation->type = MALI_MEM_OS; ++ } + -+#ifdef CONFIG_DEBUG_FS -+ /* a failed job happened and is waiting for dumping*/ -+ if (!katom->will_fail_event_code && -+ kbase_debug_job_fault_process(katom, katom->event_code)) -+ return; -+#endif ++ /** ++ *add allocation node to RB tree for index ++ */ ++ mali_allocation->mali_vma_node.vm_node.start = args->gpu_vaddr; ++ mali_allocation->mali_vma_node.vm_node.size = args->vsize; + -+ WARN_ON(work_pending(&katom->work)); -+ KBASE_DEBUG_ASSERT(0 == object_is_on_stack(&katom->work)); -+ INIT_WORK(&katom->work, kbase_jd_done_worker); -+ queue_work(kctx->jctx.job_done_wq, &katom->work); -+} ++ mali_vma_offset_add(&session->allocation_mgr, &mali_allocation->mali_vma_node); + -+KBASE_EXPORT_TEST_API(kbase_jd_done); ++ mali_allocation->backend_handle = mali_mem_backend_struct_create(&mem_backend, args->psize); ++ if (mali_allocation->backend_handle < 0) { ++ ret = _MALI_OSK_ERR_NOMEM; ++ MALI_DEBUG_PRINT(1, ("mali_allocation->backend_handle < 0! \n")); ++ goto failed_alloc_backend; ++ } + -+void kbase_jd_cancel(struct kbase_device *kbdev, struct kbase_jd_atom *katom) -+{ -+ struct kbase_context *kctx; + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); -+ KBASE_DEBUG_ASSERT(NULL != katom); -+ kctx = katom->kctx; -+ KBASE_DEBUG_ASSERT(NULL != kctx); ++ mem_backend->mali_allocation = mali_allocation; ++ mem_backend->type = mali_allocation->type; + -+ KBASE_TRACE_ADD(kbdev, JD_CANCEL, kctx, katom, katom->jc, 0); ++ mali_allocation->mali_mapping.addr = args->gpu_vaddr; + -+ /* This should only be done from a context that is not scheduled */ -+ KBASE_DEBUG_ASSERT(!kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ /* set gpu mmu propery */ ++ _mali_memory_gpu_map_property_set(&mali_allocation->mali_mapping.properties, args->flags); ++ /* do prepare for MALI mapping */ ++ if (!(args->flags & _MALI_MEMORY_ALLOCATE_NO_BIND_GPU) && mali_allocation->psize > 0) { ++ _mali_osk_mutex_wait(session->memory_lock); + -+ WARN_ON(work_pending(&katom->work)); ++ ret = mali_mem_mali_map_prepare(mali_allocation); ++ if (0 != ret) { ++ _mali_osk_mutex_signal(session->memory_lock); ++ goto failed_prepare_map; ++ } ++ _mali_osk_mutex_signal(session->memory_lock); ++ } + -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ if (mali_allocation->psize == 0) { ++ mem_backend->os_mem.count = 0; ++ INIT_LIST_HEAD(&mem_backend->os_mem.pages); ++ goto done; ++ } + -+ KBASE_DEBUG_ASSERT(0 == object_is_on_stack(&katom->work)); -+ INIT_WORK(&katom->work, jd_cancel_worker); -+ queue_work(kctx->jctx.job_done_wq, &katom->work); -+} ++ if (args->flags & _MALI_MEMORY_ALLOCATE_DEFER_BIND) { ++ mali_allocation->flags |= _MALI_MEMORY_ALLOCATE_DEFER_BIND; ++ mem_backend->flags |= MALI_MEM_BACKEND_FLAG_NOT_BINDED; ++ /* init for defer bind backend*/ ++ mem_backend->os_mem.count = 0; ++ INIT_LIST_HEAD(&mem_backend->os_mem.pages); + ++ goto done; ++ } + -+void kbase_jd_zap_context(struct kbase_context *kctx) -+{ -+ struct kbase_jd_atom *katom; -+ struct list_head *entry, *tmp; -+ struct kbase_device *kbdev; ++ if (likely(mali_allocation->psize > 0)) { + -+ KBASE_DEBUG_ASSERT(kctx); ++ if (MALI_MEM_SECURE == mem_backend->type) { ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++ ret = mali_mem_secure_attach_dma_buf(&mem_backend->secure_mem, mem_backend->size, args->secure_shared_fd); ++ if (_MALI_OSK_ERR_OK != ret) { ++ MALI_DEBUG_PRINT(1, ("Failed to attach dma buf for secure memory! \n")); ++ goto failed_alloc_pages; ++ } ++#else ++ ret = _MALI_OSK_ERR_UNSUPPORTED; ++ MALI_DEBUG_PRINT(1, ("DMA not supported for mali secure memory! \n")); ++ goto failed_alloc_pages; ++#endif ++ } else { + -+ kbdev = kctx->kbdev; ++ /** ++ *allocate physical memory ++ */ ++ if (mem_backend->type == MALI_MEM_OS) { ++ retval = mali_mem_os_alloc_pages(&mem_backend->os_mem, mem_backend->size); ++ } else if (mem_backend->type == MALI_MEM_BLOCK) { ++ /* try to allocated from BLOCK memory first, then try OS memory if failed.*/ ++ if (mali_mem_block_alloc(&mem_backend->block_mem, mem_backend->size)) { ++ retval = mali_mem_os_alloc_pages(&mem_backend->os_mem, mem_backend->size); ++ mem_backend->type = MALI_MEM_OS; ++ mali_allocation->type = MALI_MEM_OS; ++ } ++ } else if (MALI_MEM_SWAP == mem_backend->type) { ++ retval = mali_mem_swap_alloc_pages(&mem_backend->swap_mem, mali_allocation->mali_vma_node.vm_node.size, &mem_backend->start_idx); ++ } else { ++ /* ONLY support mem_os type */ ++ MALI_DEBUG_ASSERT(0); ++ } + -+ KBASE_TRACE_ADD(kbdev, JD_ZAP_CONTEXT, kctx, NULL, 0u, 0u); ++ if (retval) { ++ ret = _MALI_OSK_ERR_NOMEM; ++ MALI_DEBUG_PRINT(1, (" can't allocate enough pages! \n")); ++ goto failed_alloc_pages; ++ } ++ } ++ } + -+ kbase_js_zap_context(kctx); ++ /** ++ *map to GPU side ++ */ ++ if (!(args->flags & _MALI_MEMORY_ALLOCATE_NO_BIND_GPU) && mali_allocation->psize > 0) { ++ _mali_osk_mutex_wait(session->memory_lock); ++ /* Map on Mali */ + -+ mutex_lock(&kctx->jctx.lock); ++ if (mem_backend->type == MALI_MEM_OS) { ++ ret = mali_mem_os_mali_map(&mem_backend->os_mem, session, args->gpu_vaddr, 0, ++ mem_backend->size / MALI_MMU_PAGE_SIZE, mali_allocation->mali_mapping.properties); + -+ /* -+ * While holding the struct kbase_jd_context lock clean up jobs which are known to kbase but are -+ * queued outside the job scheduler. -+ */ ++ } else if (mem_backend->type == MALI_MEM_BLOCK) { ++ mali_mem_block_mali_map(&mem_backend->block_mem, session, args->gpu_vaddr, ++ mali_allocation->mali_mapping.properties); ++ } else if (mem_backend->type == MALI_MEM_SWAP) { ++ ret = mali_mem_swap_mali_map(&mem_backend->swap_mem, session, args->gpu_vaddr, ++ mali_allocation->mali_mapping.properties); ++ } else if (mem_backend->type == MALI_MEM_SECURE) { ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++ ret = mali_mem_secure_mali_map(&mem_backend->secure_mem, session, args->gpu_vaddr, mali_allocation->mali_mapping.properties); ++#endif ++ } else { /* unsupport type */ ++ MALI_DEBUG_ASSERT(0); ++ } + -+ del_timer_sync(&kctx->soft_job_timeout); -+ list_for_each_safe(entry, tmp, &kctx->waiting_soft_jobs) { -+ katom = list_entry(entry, struct kbase_jd_atom, queue); -+ kbase_cancel_soft_job(katom); ++ _mali_osk_mutex_signal(session->memory_lock); ++ } ++done: ++ if (MALI_MEM_OS == mem_backend->type) { ++ atomic_add(mem_backend->os_mem.count, &session->mali_mem_allocated_pages); ++ } else if (MALI_MEM_BLOCK == mem_backend->type) { ++ atomic_add(mem_backend->block_mem.count, &session->mali_mem_allocated_pages); ++ } else if (MALI_MEM_SECURE == mem_backend->type) { ++ atomic_add(mem_backend->secure_mem.count, &session->mali_mem_allocated_pages); ++ } else { ++ MALI_DEBUG_ASSERT(MALI_MEM_SWAP == mem_backend->type); ++ atomic_add(mem_backend->swap_mem.count, &session->mali_mem_allocated_pages); ++ atomic_add(mem_backend->swap_mem.count, &session->mali_mem_array[mem_backend->type]); + } + ++ if (atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE > session->max_mali_mem_allocated_size) { ++ session->max_mali_mem_allocated_size = atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE; ++ } ++ return _MALI_OSK_ERR_OK; + -+#ifdef CONFIG_KDS -+ -+ /* For each job waiting on a kds resource, cancel the wait and force the job to -+ * complete early, this is done so that we don't leave jobs outstanding waiting -+ * on kds resources which may never be released when contexts are zapped, resulting -+ * in a hang. -+ * -+ * Note that we can safely iterate over the list as the struct kbase_jd_context lock is held, -+ * this prevents items being removed when calling job_done_nolock in kbase_cancel_kds_wait_job. -+ */ ++failed_alloc_pages: ++ mali_mem_mali_map_free(session, mali_allocation->psize, mali_allocation->mali_vma_node.vm_node.start, mali_allocation->flags); ++failed_prepare_map: ++ mali_mem_backend_struct_destory(&mem_backend, mali_allocation->backend_handle); ++failed_alloc_backend: ++ mali_vma_offset_remove(&session->allocation_mgr, &mali_allocation->mali_vma_node); ++ mali_mem_allocation_struct_destory(mali_allocation); + -+ list_for_each(entry, &kctx->waiting_kds_resource) { -+ katom = list_entry(entry, struct kbase_jd_atom, node); ++ return ret; ++} + -+ kbase_cancel_kds_wait_job(katom); -+ } -+#endif + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ kbase_dma_fence_cancel_all_atoms(kctx); -+#endif ++_mali_osk_errcode_t _mali_ukk_mem_free(_mali_uk_free_mem_s *args) ++{ ++ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; ++ u32 vaddr = args->gpu_vaddr; ++ mali_mem_allocation *mali_alloc = NULL; ++ struct mali_vma_node *mali_vma_node = NULL; + -+ mutex_unlock(&kctx->jctx.lock); ++ /* find mali allocation structure by vaddress*/ ++ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, vaddr, 0); ++ if (NULL == mali_vma_node) { ++ MALI_DEBUG_PRINT(1, ("_mali_ukk_mem_free: invalid addr: 0x%x\n", vaddr)); ++ return _MALI_OSK_ERR_INVALID_ARGS; ++ } ++ MALI_DEBUG_ASSERT(NULL != mali_vma_node); ++ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ /* Flush dma-fence workqueue to ensure that any callbacks that may have -+ * been queued are done before continuing. -+ */ -+ flush_workqueue(kctx->dma_fence.wq); -+#endif ++ if (mali_alloc) ++ /* check ref_count */ ++ args->free_pages_nr = mali_allocation_unref(&mali_alloc); + -+ kbase_jm_wait_for_zero_jobs(kctx); ++ return _MALI_OSK_ERR_OK; +} + -+KBASE_EXPORT_TEST_API(kbase_jd_zap_context); + -+int kbase_jd_init(struct kbase_context *kctx) ++/** ++* Function _mali_ukk_mem_bind -- bind a external memory to a new GPU address ++* It will allocate a new mem allocation and bind external memory to it. ++* Supported backend type are: ++* _MALI_MEMORY_BIND_BACKEND_UMP ++* _MALI_MEMORY_BIND_BACKEND_DMA_BUF ++* _MALI_MEMORY_BIND_BACKEND_EXTERNAL_MEMORY ++* CPU access is not supported yet ++*/ ++_mali_osk_errcode_t _mali_ukk_mem_bind(_mali_uk_bind_mem_s *args) +{ -+ int i; -+ int mali_err = 0; -+#ifdef CONFIG_KDS -+ int err; -+#endif /* CONFIG_KDS */ ++ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; ++ mali_mem_backend *mem_backend = NULL; ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; ++ mali_mem_allocation *mali_allocation = NULL; ++ MALI_DEBUG_PRINT(5, (" _mali_ukk_mem_bind, vaddr=0x%x, size =0x%x! \n", args->vaddr, args->size)); + -+ KBASE_DEBUG_ASSERT(kctx); ++ /** ++ * allocate mali allocation. ++ */ ++ mali_allocation = mali_mem_allocation_struct_create(session); + -+ kctx->jctx.job_done_wq = alloc_workqueue("mali_jd", -+ WQ_HIGHPRI | WQ_UNBOUND, 1); -+ if (NULL == kctx->jctx.job_done_wq) { -+ mali_err = -ENOMEM; -+ goto out1; ++ if (mali_allocation == NULL) { ++ return _MALI_OSK_ERR_NOMEM; + } ++ mali_allocation->psize = args->size; ++ mali_allocation->vsize = args->size; ++ mali_allocation->mali_mapping.addr = args->vaddr; + -+ for (i = 0; i < BASE_JD_ATOM_COUNT; i++) { -+ init_waitqueue_head(&kctx->jctx.atoms[i].completed); -+ -+ INIT_LIST_HEAD(&kctx->jctx.atoms[i].dep_head[0]); -+ INIT_LIST_HEAD(&kctx->jctx.atoms[i].dep_head[1]); ++ /* add allocation node to RB tree for index */ ++ mali_allocation->mali_vma_node.vm_node.start = args->vaddr; ++ mali_allocation->mali_vma_node.vm_node.size = args->size; ++ mali_vma_offset_add(&session->allocation_mgr, &mali_allocation->mali_vma_node); + -+ /* Catch userspace attempting to use an atom which doesn't exist as a pre-dependency */ -+ kctx->jctx.atoms[i].event_code = BASE_JD_EVENT_JOB_INVALID; -+ kctx->jctx.atoms[i].status = KBASE_JD_ATOM_STATE_UNUSED; ++ /* allocate backend*/ ++ if (mali_allocation->psize > 0) { ++ mali_allocation->backend_handle = mali_mem_backend_struct_create(&mem_backend, mali_allocation->psize); ++ if (mali_allocation->backend_handle < 0) { ++ goto Failed_alloc_backend; ++ } + -+#if defined(CONFIG_MALI_BIFROST_DMA_FENCE) || defined(CONFIG_SYNC_FILE) -+ kctx->jctx.atoms[i].dma_fence.context = -+ dma_fence_context_alloc(1); -+ atomic_set(&kctx->jctx.atoms[i].dma_fence.seqno, 0); -+ INIT_LIST_HEAD(&kctx->jctx.atoms[i].dma_fence.callbacks); -+#endif ++ } else { ++ goto Failed_alloc_backend; + } + -+ mutex_init(&kctx->jctx.lock); ++ mem_backend->size = mali_allocation->psize; ++ mem_backend->mali_allocation = mali_allocation; + -+ init_waitqueue_head(&kctx->jctx.zero_jobs_wait); ++ switch (args->flags & _MALI_MEMORY_BIND_BACKEND_MASK) { ++ case _MALI_MEMORY_BIND_BACKEND_UMP: ++#if defined(CONFIG_MALI400_UMP) ++ mali_allocation->type = MALI_MEM_UMP; ++ mem_backend->type = MALI_MEM_UMP; ++ ret = mali_mem_bind_ump_buf(mali_allocation, mem_backend, ++ args->mem_union.bind_ump.secure_id, args->mem_union.bind_ump.flags); ++ if (_MALI_OSK_ERR_OK != ret) { ++ MALI_DEBUG_PRINT(1, ("Bind ump buf failed\n")); ++ goto Failed_bind_backend; ++ } ++#else ++ MALI_DEBUG_PRINT(1, ("UMP not supported\n")); ++ goto Failed_bind_backend; ++#endif ++ break; ++ case _MALI_MEMORY_BIND_BACKEND_DMA_BUF: ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++ mali_allocation->type = MALI_MEM_DMA_BUF; ++ mem_backend->type = MALI_MEM_DMA_BUF; ++ ret = mali_mem_bind_dma_buf(mali_allocation, mem_backend, ++ args->mem_union.bind_dma_buf.mem_fd, args->mem_union.bind_dma_buf.flags); ++ if (_MALI_OSK_ERR_OK != ret) { ++ MALI_DEBUG_PRINT(1, ("Bind dma buf failed\n")); ++ goto Failed_bind_backend; ++ } ++#else ++ MALI_DEBUG_PRINT(1, ("DMA not supported\n")); ++ goto Failed_bind_backend; ++#endif ++ break; ++ case _MALI_MEMORY_BIND_BACKEND_MALI_MEMORY: ++ /* not allowed */ ++ MALI_DEBUG_PRINT_ERROR(("Mali internal memory type not supported !\n")); ++ goto Failed_bind_backend; ++ break; + -+ spin_lock_init(&kctx->jctx.tb_lock); ++ case _MALI_MEMORY_BIND_BACKEND_EXTERNAL_MEMORY: ++ mali_allocation->type = MALI_MEM_EXTERNAL; ++ mem_backend->type = MALI_MEM_EXTERNAL; ++ ret = mali_mem_bind_ext_buf(mali_allocation, mem_backend, args->mem_union.bind_ext_memory.phys_addr, ++ args->mem_union.bind_ext_memory.flags); ++ if (_MALI_OSK_ERR_OK != ret) { ++ MALI_DEBUG_PRINT(1, ("Bind external buf failed\n")); ++ goto Failed_bind_backend; ++ } ++ break; + -+#ifdef CONFIG_KDS -+ err = kds_callback_init(&kctx->jctx.kds_cb, 0, kds_dep_clear); -+ if (0 != err) { -+ mali_err = -EINVAL; -+ goto out2; ++ case _MALI_MEMORY_BIND_BACKEND_EXT_COW: ++ /* not allowed */ ++ MALI_DEBUG_PRINT_ERROR(("External cow memory type not supported !\n")); ++ goto Failed_bind_backend; ++ break; ++ ++ default: ++ MALI_DEBUG_PRINT_ERROR(("Invalid memory type not supported !\n")); ++ goto Failed_bind_backend; ++ break; + } -+#endif /* CONFIG_KDS */ ++ MALI_DEBUG_ASSERT(0 == mem_backend->size % MALI_MMU_PAGE_SIZE); ++ atomic_add(mem_backend->size / MALI_MMU_PAGE_SIZE, &session->mali_mem_array[mem_backend->type]); ++ return _MALI_OSK_ERR_OK; + -+ kctx->jctx.job_nr = 0; -+ INIT_LIST_HEAD(&kctx->completed_jobs); -+ atomic_set(&kctx->work_count, 0); ++Failed_bind_backend: ++ mali_mem_backend_struct_destory(&mem_backend, mali_allocation->backend_handle); + -+ return 0; ++Failed_alloc_backend: ++ mali_vma_offset_remove(&session->allocation_mgr, &mali_allocation->mali_vma_node); ++ mali_mem_allocation_struct_destory(mali_allocation); + -+#ifdef CONFIG_KDS -+ out2: -+ destroy_workqueue(kctx->jctx.job_done_wq); -+#endif /* CONFIG_KDS */ -+ out1: -+ return mali_err; ++ MALI_DEBUG_PRINT(1, (" _mali_ukk_mem_bind, return ERROR! \n")); ++ return ret; +} + -+KBASE_EXPORT_TEST_API(kbase_jd_init); + -+void kbase_jd_exit(struct kbase_context *kctx) ++/* ++* Function _mali_ukk_mem_unbind -- unbind a external memory to a new GPU address ++* This function unbind the backend memory and free the allocation ++* no ref_count for this type of memory ++*/ ++_mali_osk_errcode_t _mali_ukk_mem_unbind(_mali_uk_unbind_mem_s *args) +{ -+ KBASE_DEBUG_ASSERT(kctx); ++ /**/ ++ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; ++ mali_mem_allocation *mali_allocation = NULL; ++ struct mali_vma_node *mali_vma_node = NULL; ++ u32 mali_addr = args->vaddr; ++ MALI_DEBUG_PRINT(5, (" _mali_ukk_mem_unbind, vaddr=0x%x! \n", args->vaddr)); + -+#ifdef CONFIG_KDS -+ kds_callback_term(&kctx->jctx.kds_cb); -+#endif /* CONFIG_KDS */ -+ /* Work queue is emptied by this */ -+ destroy_workqueue(kctx->jctx.job_done_wq); ++ /* find the allocation by vaddr */ ++ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, mali_addr, 0); ++ if (likely(mali_vma_node)) { ++ MALI_DEBUG_ASSERT(mali_addr == mali_vma_node->vm_node.start); ++ mali_allocation = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); ++ } else { ++ MALI_DEBUG_ASSERT(NULL != mali_vma_node); ++ return _MALI_OSK_ERR_INVALID_ARGS; ++ } ++ ++ if (NULL != mali_allocation) ++ /* check ref_count */ ++ mali_allocation_unref(&mali_allocation); ++ return _MALI_OSK_ERR_OK; +} + -+KBASE_EXPORT_TEST_API(kbase_jd_exit); -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd_debugfs.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd_debugfs.c -new file mode 100755 -index 000000000000..fed4ad5816ab ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd_debugfs.c -@@ -0,0 +1,235 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++* Function _mali_ukk_mem_cow -- COW for an allocation ++* This function allocate new pages for a range (range, range+size) of allocation ++* And Map it(keep use the not in range pages from target allocation ) to an GPU vaddr ++*/ ++_mali_osk_errcode_t _mali_ukk_mem_cow(_mali_uk_cow_mem_s *args) ++{ ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; ++ mali_mem_backend *target_backend = NULL; ++ mali_mem_backend *mem_backend = NULL; ++ struct mali_vma_node *mali_vma_node = NULL; ++ mali_mem_allocation *mali_allocation = NULL; + ++ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; ++ /* Get the target backend for cow */ ++ target_backend = mali_mem_backend_struct_search(session, args->target_handle); + ++ if (NULL == target_backend || 0 == target_backend->size) { ++ MALI_DEBUG_ASSERT_POINTER(target_backend); ++ MALI_DEBUG_ASSERT(0 != target_backend->size); ++ return ret; ++ } + -+#ifdef CONFIG_DEBUG_FS ++ /*Cow not support resized mem */ ++ MALI_DEBUG_ASSERT(MALI_MEM_FLAG_CAN_RESIZE != (MALI_MEM_FLAG_CAN_RESIZE & target_backend->mali_allocation->flags)); + -+#include -+#include -+#include -+#include -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+#include -+#endif ++ /* Check if the new mali address is allocated */ ++ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, args->vaddr, 0); + -+struct kbase_jd_debugfs_depinfo { -+ u8 id; -+ char type; -+}; ++ if (unlikely(mali_vma_node)) { ++ MALI_DEBUG_PRINT_ERROR(("The mali virtual address has already been used ! \n")); ++ return ret; ++ } + -+static void kbase_jd_debugfs_fence_info(struct kbase_jd_atom *atom, -+ struct seq_file *sfile) -+{ -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ struct kbase_sync_fence_info info; -+ int res; ++ /* create new alloction for COW*/ ++ mali_allocation = mali_mem_allocation_struct_create(session); ++ if (mali_allocation == NULL) { ++ MALI_DEBUG_PRINT(1, ("_mali_ukk_mem_cow: Failed to create allocation struct!\n")); ++ return _MALI_OSK_ERR_NOMEM; ++ } ++ mali_allocation->psize = args->target_size; ++ mali_allocation->vsize = args->target_size; ++ mali_allocation->type = MALI_MEM_COW; + -+ switch (atom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { -+ case BASE_JD_REQ_SOFT_FENCE_TRIGGER: -+ res = kbase_sync_fence_out_info_get(atom, &info); -+ if (0 == res) { -+ seq_printf(sfile, "Sa([%p]%d) ", -+ info.fence, info.status); -+ break; -+ } -+ case BASE_JD_REQ_SOFT_FENCE_WAIT: -+ res = kbase_sync_fence_in_info_get(atom, &info); -+ if (0 == res) { -+ seq_printf(sfile, "Wa([%p]%d) ", -+ info.fence, info.status); -+ break; -+ } -+ default: -+ break; ++ /*add allocation node to RB tree for index*/ ++ mali_allocation->mali_vma_node.vm_node.start = args->vaddr; ++ mali_allocation->mali_vma_node.vm_node.size = mali_allocation->vsize; ++ mali_vma_offset_add(&session->allocation_mgr, &mali_allocation->mali_vma_node); ++ ++ /* create new backend for COW memory */ ++ mali_allocation->backend_handle = mali_mem_backend_struct_create(&mem_backend, mali_allocation->psize); ++ if (mali_allocation->backend_handle < 0) { ++ ret = _MALI_OSK_ERR_NOMEM; ++ MALI_DEBUG_PRINT(1, ("mali_allocation->backend_handle < 0! \n")); ++ goto failed_alloc_backend; + } -+#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ ++ mem_backend->mali_allocation = mali_allocation; ++ mem_backend->type = mali_allocation->type; + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ if (atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) { -+ struct kbase_fence_cb *cb; ++ if (target_backend->type == MALI_MEM_SWAP || ++ (MALI_MEM_COW == target_backend->type && (MALI_MEM_BACKEND_FLAG_SWAP_COWED & target_backend->flags))) { ++ mem_backend->flags |= MALI_MEM_BACKEND_FLAG_SWAP_COWED; ++ /** ++ * CoWed swap backends couldn't be mapped as non-linear vma, because if one ++ * vma is set with flag VM_NONLINEAR, the vma->vm_private_data will be used by kernel, ++ * while in mali driver, we use this variable to store the pointer of mali_allocation, so there ++ * is a conflict. ++ * To resolve this problem, we have to do some fake things, we reserved about 64MB ++ * space from index 0, there isn't really page's index will be set from 0 to (64MB>>PAGE_SHIFT_NUM), ++ * and all of CoWed swap memory backends' start_idx will be assigned with 0, and these ++ * backends will be mapped as linear and will add to priority tree of global swap file, while ++ * these vmas will never be found by using normal page->index, these pages in those vma ++ * also couldn't be swapped out. ++ */ ++ mem_backend->start_idx = 0; ++ } + -+ if (atom->dma_fence.fence) { -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence = atom->dma_fence.fence; -+#else -+ struct dma_fence *fence = atom->dma_fence.fence; -+#endif ++ /* Add the target backend's cow count, also allocate new pages for COW backend from os mem ++ *for a modified range and keep the page which not in the modified range and Add ref to it ++ */ ++ MALI_DEBUG_PRINT(3, ("Cow mapping: target_addr: 0x%x; cow_addr: 0x%x, size: %u\n", target_backend->mali_allocation->mali_vma_node.vm_node.start, ++ mali_allocation->mali_vma_node.vm_node.start, mali_allocation->mali_vma_node.vm_node.size)); + -+ seq_printf(sfile, -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) -+ "Sd(%u#%u: %s) ", -+#else -+ "Sd(%llu#%u: %s) ", -+#endif -+ fence->context, -+ fence->seqno, -+ dma_fence_is_signaled(fence) ? -+ "signaled" : "active"); -+ } ++ ret = mali_memory_do_cow(target_backend, args->target_offset, args->target_size, mem_backend, args->range_start, args->range_size); ++ if (_MALI_OSK_ERR_OK != ret) { ++ MALI_DEBUG_PRINT(1, ("_mali_ukk_mem_cow: Failed to cow!\n")); ++ goto failed_do_cow; ++ } + -+ list_for_each_entry(cb, &atom->dma_fence.callbacks, -+ node) { -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence = cb->fence; -+#else -+ struct dma_fence *fence = cb->fence; -+#endif ++ /** ++ *map to GPU side ++ */ ++ mali_allocation->mali_mapping.addr = args->vaddr; ++ /* set gpu mmu propery */ ++ _mali_memory_gpu_map_property_set(&mali_allocation->mali_mapping.properties, args->flags); + -+ seq_printf(sfile, -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) -+ "Wd(%u#%u: %s) ", -+#else -+ "Wd(%llu#%u: %s) ", -+#endif -+ fence->context, -+ fence->seqno, -+ dma_fence_is_signaled(fence) ? -+ "signaled" : "active"); -+ } ++ _mali_osk_mutex_wait(session->memory_lock); ++ /* Map on Mali */ ++ ret = mali_mem_mali_map_prepare(mali_allocation); ++ if (0 != ret) { ++ MALI_DEBUG_PRINT(1, (" prepare map fail! \n")); ++ goto failed_gpu_map; + } -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ + -+} ++ if (!(mem_backend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED)) { ++ mali_mem_cow_mali_map(mem_backend, 0, mem_backend->size); ++ } + -+static void kbasep_jd_debugfs_atom_deps( -+ struct kbase_jd_debugfs_depinfo *deps, -+ struct kbase_jd_atom *atom) -+{ -+ struct kbase_context *kctx = atom->kctx; -+ int i; ++ _mali_osk_mutex_signal(session->memory_lock); + -+ for (i = 0; i < 2; i++) { -+ deps[i].id = (unsigned)(atom->dep[i].atom ? -+ kbase_jd_atom_id(kctx, atom->dep[i].atom) : 0); ++ mutex_lock(&target_backend->mutex); ++ target_backend->flags |= MALI_MEM_BACKEND_FLAG_COWED; ++ mutex_unlock(&target_backend->mutex); + -+ switch (atom->dep[i].dep_type) { -+ case BASE_JD_DEP_TYPE_INVALID: -+ deps[i].type = ' '; -+ break; -+ case BASE_JD_DEP_TYPE_DATA: -+ deps[i].type = 'D'; -+ break; -+ case BASE_JD_DEP_TYPE_ORDER: -+ deps[i].type = '>'; -+ break; -+ default: -+ deps[i].type = '?'; -+ break; -+ } ++ atomic_add(args->range_size / MALI_MMU_PAGE_SIZE, &session->mali_mem_allocated_pages); ++ if (atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE > session->max_mali_mem_allocated_size) { ++ session->max_mali_mem_allocated_size = atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE; + } ++ return _MALI_OSK_ERR_OK; ++ ++failed_gpu_map: ++ _mali_osk_mutex_signal(session->memory_lock); ++ mali_mem_cow_release(mem_backend, MALI_FALSE); ++ mem_backend->cow_mem.count = 0; ++failed_do_cow: ++ mali_mem_backend_struct_destory(&mem_backend, mali_allocation->backend_handle); ++failed_alloc_backend: ++ mali_vma_offset_remove(&session->allocation_mgr, &mali_allocation->mali_vma_node); ++ mali_mem_allocation_struct_destory(mali_allocation); ++ ++ return ret; +} -+/** -+ * kbasep_jd_debugfs_atoms_show - Show callback for the JD atoms debugfs file. -+ * @sfile: The debugfs entry -+ * @data: Data associated with the entry -+ * -+ * This function is called to get the contents of the JD atoms debugfs file. -+ * This is a report of all atoms managed by kbase_jd_context.atoms -+ * -+ * Return: 0 if successfully prints data in debugfs entry file, failure -+ * otherwise -+ */ -+static int kbasep_jd_debugfs_atoms_show(struct seq_file *sfile, void *data) ++ ++_mali_osk_errcode_t _mali_ukk_mem_cow_modify_range(_mali_uk_cow_modify_range_s *args) +{ -+ struct kbase_context *kctx = sfile->private; -+ struct kbase_jd_atom *atoms; -+ unsigned long irq_flags; -+ int i; ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; ++ mali_mem_backend *mem_backend = NULL; ++ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; + -+ KBASE_DEBUG_ASSERT(kctx != NULL); ++ MALI_DEBUG_PRINT(4, (" _mali_ukk_mem_cow_modify_range called! \n")); ++ /* Get the backend that need to be modified. */ ++ mem_backend = mali_mem_backend_struct_search(session, args->vaddr); + -+ /* Print version */ -+ seq_printf(sfile, "v%u\n", MALI_JD_DEBUGFS_VERSION); ++ if (NULL == mem_backend || 0 == mem_backend->size) { ++ MALI_DEBUG_ASSERT_POINTER(mem_backend); ++ MALI_DEBUG_ASSERT(0 != mem_backend->size); ++ return ret; ++ } + -+ /* Print U/K API version */ -+ seq_printf(sfile, "ukv%u.%u\n", BASE_UK_VERSION_MAJOR, -+ BASE_UK_VERSION_MINOR); ++ MALI_DEBUG_ASSERT(MALI_MEM_COW == mem_backend->type); + -+ /* Print table heading */ -+ seq_puts(sfile, " ID, Core req, St, CR, Predeps, Start time, Additional info...\n"); ++ ret = mali_memory_cow_modify_range(mem_backend, args->range_start, args->size); ++ args->change_pages_nr = mem_backend->cow_mem.change_pages_nr; ++ if (_MALI_OSK_ERR_OK != ret) ++ return ret; ++ _mali_osk_mutex_wait(session->memory_lock); ++ if (!(mem_backend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED)) { ++ mali_mem_cow_mali_map(mem_backend, args->range_start, args->size); ++ } ++ _mali_osk_mutex_signal(session->memory_lock); + -+ atoms = kctx->jctx.atoms; -+ /* General atom states */ -+ mutex_lock(&kctx->jctx.lock); -+ /* JS-related states */ -+ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, irq_flags); -+ for (i = 0; i != BASE_JD_ATOM_COUNT; ++i) { -+ struct kbase_jd_atom *atom = &atoms[i]; -+ s64 start_timestamp = 0; -+ struct kbase_jd_debugfs_depinfo deps[2]; ++ atomic_add(args->change_pages_nr, &session->mali_mem_allocated_pages); ++ if (atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE > session->max_mali_mem_allocated_size) { ++ session->max_mali_mem_allocated_size = atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE; ++ } + -+ if (atom->status == KBASE_JD_ATOM_STATE_UNUSED) -+ continue; ++ return _MALI_OSK_ERR_OK; ++} + -+ /* start_timestamp is cleared as soon as the atom leaves UNUSED state -+ * and set before a job is submitted to the h/w, a non-zero value means -+ * it is valid */ -+ if (ktime_to_ns(atom->start_timestamp)) -+ start_timestamp = ktime_to_ns( -+ ktime_sub(ktime_get(), atom->start_timestamp)); + -+ kbasep_jd_debugfs_atom_deps(deps, atom); ++_mali_osk_errcode_t _mali_ukk_mem_resize(_mali_uk_mem_resize_s *args) ++{ ++ mali_mem_backend *mem_backend = NULL; ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; + -+ seq_printf(sfile, -+ "%3u, %8x, %2u, %2u, %c%3u %c%3u, %20lld, ", -+ i, atom->core_req, atom->status, -+ atom->coreref_state, -+ deps[0].type, deps[0].id, -+ deps[1].type, deps[1].id, -+ start_timestamp); ++ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; + ++ MALI_DEBUG_ASSERT_POINTER(session); ++ MALI_DEBUG_PRINT(4, (" mali_mem_resize_memory called! \n")); ++ MALI_DEBUG_ASSERT(0 == args->psize % MALI_MMU_PAGE_SIZE); + -+ kbase_jd_debugfs_fence_info(atom, sfile); ++ /* Get the memory backend that need to be resize. */ ++ mem_backend = mali_mem_backend_struct_search(session, args->vaddr); + -+ seq_puts(sfile, "\n"); ++ if (NULL == mem_backend) { ++ MALI_DEBUG_PRINT(2, ("_mali_ukk_mem_resize: memory backend = NULL!\n")); ++ return ret; + } -+ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, irq_flags); -+ mutex_unlock(&kctx->jctx.lock); + -+ return 0; -+} ++ MALI_DEBUG_ASSERT(args->psize != mem_backend->size); + ++ ret = mali_mem_resize(session, mem_backend, args->psize); + -+/** -+ * kbasep_jd_debugfs_atoms_open - open operation for atom debugfs file -+ * @in: &struct inode pointer -+ * @file: &struct file pointer -+ * -+ * Return: file descriptor -+ */ -+static int kbasep_jd_debugfs_atoms_open(struct inode *in, struct file *file) -+{ -+ return single_open(file, kbasep_jd_debugfs_atoms_show, in->i_private); ++ return ret; +} + -+static const struct file_operations kbasep_jd_debugfs_atoms_fops = { -+ .open = kbasep_jd_debugfs_atoms_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+void kbasep_jd_debugfs_ctx_init(struct kbase_context *kctx) ++_mali_osk_errcode_t _mali_ukk_mem_usage_get(_mali_uk_profiling_memory_usage_get_s *args) +{ -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ -+ /* Expose all atoms */ -+ debugfs_create_file("atoms", S_IRUGO, kctx->kctx_dentry, kctx, -+ &kbasep_jd_debugfs_atoms_fops); ++ args->memory_usage = _mali_ukk_report_memory_usage(); ++ if (0 != args->vaddr) { ++ mali_mem_backend *mem_backend = NULL; ++ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; ++ /* Get the backend that need to be modified. */ ++ mem_backend = mali_mem_backend_struct_search(session, args->vaddr); ++ if (NULL == mem_backend) { ++ MALI_DEBUG_ASSERT_POINTER(mem_backend); ++ return _MALI_OSK_ERR_FAULT; ++ } + ++ if (MALI_MEM_COW == mem_backend->type) ++ args->change_pages_nr = mem_backend->cow_mem.change_pages_nr; ++ } ++ return _MALI_OSK_ERR_OK; +} -+ -+#endif /* CONFIG_DEBUG_FS */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd_debugfs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd_debugfs.h +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h new file mode 100755 -index 000000000000..fae32919b22f +index 000000000..23d8cde75 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd_debugfs.h -@@ -0,0 +1,40 @@ ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h +@@ -0,0 +1,51 @@ ++/* ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ ++#ifndef __MALI_MEMORY_MANAGER_H__ ++#define __MALI_MEMORY_MANAGER_H__ ++ ++#include "mali_osk.h" ++#include ++#include ++#include ++#include ++#include ++#include "mali_memory_types.h" ++#include "mali_memory_os_alloc.h" ++#include "mali_uk_types.h" ++ ++struct mali_allocation_manager { ++ rwlock_t vm_lock; ++ struct rb_root allocation_mgr_rb; ++ struct list_head head; ++ struct mutex list_mutex; ++ u32 mali_allocation_num; ++}; ++ ++extern struct idr mali_backend_idr; ++extern struct mutex mali_idr_mutex; ++ ++int mali_memory_manager_init(struct mali_allocation_manager *mgr); ++void mali_memory_manager_uninit(struct mali_allocation_manager *mgr); ++ ++void mali_mem_allocation_struct_destory(mali_mem_allocation *alloc); ++_mali_osk_errcode_t mali_mem_add_mem_size(struct mali_session_data *session, u32 mali_addr, u32 add_size); ++mali_mem_backend *mali_mem_backend_struct_search(struct mali_session_data *session, u32 mali_address); ++_mali_osk_errcode_t _mali_ukk_mem_allocate(_mali_uk_alloc_mem_s *args); ++_mali_osk_errcode_t _mali_ukk_mem_free(_mali_uk_free_mem_s *args); ++_mali_osk_errcode_t _mali_ukk_mem_bind(_mali_uk_bind_mem_s *args); ++_mali_osk_errcode_t _mali_ukk_mem_unbind(_mali_uk_unbind_mem_s *args); ++_mali_osk_errcode_t _mali_ukk_mem_cow(_mali_uk_cow_mem_s *args); ++_mali_osk_errcode_t _mali_ukk_mem_cow_modify_range(_mali_uk_cow_modify_range_s *args); ++_mali_osk_errcode_t _mali_ukk_mem_usage_get(_mali_uk_profiling_memory_usage_get_s *args); ++_mali_osk_errcode_t _mali_ukk_mem_resize(_mali_uk_mem_resize_s *args); ++ ++#endif ++ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c +new file mode 100755 +index 000000000..9c8214ba3 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c +@@ -0,0 +1,810 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include "../platform/rk/custom_log.h" + ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+/** -+ * @file mali_kbase_jd_debugfs.h -+ * Header file for job dispatcher-related entries in debugfs -+ */ -+ -+#ifndef _KBASE_JD_DEBUGFS_H -+#define _KBASE_JD_DEBUGFS_H -+ -+#include ++#include "mali_osk.h" ++#include "mali_memory.h" ++#include "mali_memory_os_alloc.h" ++#include "mali_kernel_linux.h" + -+#define MALI_JD_DEBUGFS_VERSION 2 ++/* Minimum size of allocator page pool */ ++#define MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES (MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB * 256) ++#define MALI_OS_MEMORY_POOL_TRIM_JIFFIES (10 * CONFIG_HZ) /* Default to 10s */ + -+/* Forward declarations */ -+struct kbase_context; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) ++static int mali_mem_os_shrink(int nr_to_scan, gfp_t gfp_mask); ++#else ++static int mali_mem_os_shrink(struct shrinker *shrinker, int nr_to_scan, gfp_t gfp_mask); ++#endif ++#else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) ++static int mali_mem_os_shrink(struct shrinker *shrinker, struct shrink_control *sc); ++#else ++static unsigned long mali_mem_os_shrink(struct shrinker *shrinker, struct shrink_control *sc); ++static unsigned long mali_mem_os_shrink_count(struct shrinker *shrinker, struct shrink_control *sc); ++#endif ++#endif ++static void mali_mem_os_trim_pool(struct work_struct *work); + -+/** -+ * kbasep_jd_debugfs_ctx_init() - Add debugfs entries for JD system -+ * -+ * @kctx Pointer to kbase_context -+ */ -+void kbasep_jd_debugfs_ctx_init(struct kbase_context *kctx); ++struct mali_mem_os_allocator mali_mem_os_allocator = { ++ .pool_lock = __SPIN_LOCK_UNLOCKED(pool_lock), ++ .pool_pages = LIST_HEAD_INIT(mali_mem_os_allocator.pool_pages), ++ .pool_count = 0, + -+#endif /*_KBASE_JD_DEBUGFS_H*/ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jm.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jm.c -new file mode 100755 -index 000000000000..0c5c6a6f78cb ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jm.c -@@ -0,0 +1,131 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ .allocated_pages = ATOMIC_INIT(0), ++ .allocation_limit = 0, + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) ++ .shrinker.shrink = mali_mem_os_shrink, ++#else ++ .shrinker.count_objects = mali_mem_os_shrink_count, ++ .shrinker.scan_objects = mali_mem_os_shrink, ++#endif ++ .shrinker.seeks = DEFAULT_SEEKS, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) ++ .timed_shrinker = __DELAYED_WORK_INITIALIZER(mali_mem_os_allocator.timed_shrinker, mali_mem_os_trim_pool, TIMER_DEFERRABLE), ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) ++ .timed_shrinker = __DEFERRED_WORK_INITIALIZER(mali_mem_os_allocator.timed_shrinker, mali_mem_os_trim_pool), ++#else ++ .timed_shrinker = __DELAYED_WORK_INITIALIZER(mali_mem_os_allocator.timed_shrinker, mali_mem_os_trim_pool), ++#endif ++}; + ++u32 mali_mem_os_free(struct list_head *os_pages, u32 pages_count, mali_bool cow_flag) ++{ ++ LIST_HEAD(pages); ++ struct mali_page_node *m_page, *m_tmp; ++ u32 free_pages_nr = 0; + ++ if (MALI_TRUE == cow_flag) { ++ list_for_each_entry_safe(m_page, m_tmp, os_pages, list) { ++ /*only handle OS node here */ ++ if (m_page->type == MALI_PAGE_NODE_OS) { ++ if (1 == _mali_page_node_get_ref_count(m_page)) { ++ list_move(&m_page->list, &pages); ++ atomic_sub(1, &mali_mem_os_allocator.allocated_pages); ++ free_pages_nr ++; ++ } else { ++ _mali_page_node_unref(m_page); ++ m_page->page = NULL; ++ list_del(&m_page->list); ++ kfree(m_page); ++ } ++ } ++ } ++ } else { ++ list_cut_position(&pages, os_pages, os_pages->prev); ++ atomic_sub(pages_count, &mali_mem_os_allocator.allocated_pages); ++ free_pages_nr = pages_count; ++ } + -+/* -+ * HW access job manager common APIs -+ */ ++ /* Put pages on pool. */ ++ spin_lock(&mali_mem_os_allocator.pool_lock); ++ list_splice(&pages, &mali_mem_os_allocator.pool_pages); ++ mali_mem_os_allocator.pool_count += free_pages_nr; ++ spin_unlock(&mali_mem_os_allocator.pool_lock); + -+#include -+#include "mali_kbase_hwaccess_jm.h" -+#include "mali_kbase_jm.h" ++ if (MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES < mali_mem_os_allocator.pool_count) { ++ MALI_DEBUG_PRINT(5, ("OS Mem: Starting pool trim timer %u\n", mali_mem_os_allocator.pool_count)); ++ queue_delayed_work(mali_mem_os_allocator.wq, &mali_mem_os_allocator.timed_shrinker, MALI_OS_MEMORY_POOL_TRIM_JIFFIES); ++ } ++ return free_pages_nr; ++} + +/** -+ * kbase_jm_next_job() - Attempt to run the next @nr_jobs_to_submit jobs on slot -+ * @js on the active context. -+ * @kbdev: Device pointer -+ * @js: Job slot to run on -+ * @nr_jobs_to_submit: Number of jobs to attempt to submit -+ * -+ * Return: true if slot can still be submitted on, false if slot is now full. -+ */ -+static bool kbase_jm_next_job(struct kbase_device *kbdev, int js, -+ int nr_jobs_to_submit) ++* put page without put it into page pool ++*/ ++_mali_osk_errcode_t mali_mem_os_put_page(struct page *page) +{ -+ struct kbase_context *kctx; -+ int i; -+ -+ kctx = kbdev->hwaccess.active_kctx; -+ -+ if (!kctx) -+ return true; -+ -+ for (i = 0; i < nr_jobs_to_submit; i++) { -+ struct kbase_jd_atom *katom = kbase_js_pull(kctx, js); -+ -+ if (!katom) -+ return true; /* Context has no jobs on this slot */ -+ -+ kbase_backend_run_atom(kbdev, katom); ++ MALI_DEBUG_ASSERT_POINTER(page); ++ if (1 == page_count(page)) { ++ atomic_sub(1, &mali_mem_os_allocator.allocated_pages); ++ dma_unmap_page(&mali_platform_device->dev, page_private(page), ++ _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); ++ ClearPagePrivate(page); + } -+ -+ return false; /* Slot ringbuffer should now be full */ ++ put_page(page); ++ return _MALI_OSK_ERR_OK; +} + -+u32 kbase_jm_kick(struct kbase_device *kbdev, u32 js_mask) ++_mali_osk_errcode_t mali_mem_os_resize_pages(mali_mem_os_mem *mem_from, mali_mem_os_mem *mem_to, u32 start_page, u32 page_count) +{ -+ u32 ret_mask = 0; -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ struct mali_page_node *m_page, *m_tmp; ++ u32 i = 0; + -+ while (js_mask) { -+ int js = ffs(js_mask) - 1; -+ int nr_jobs_to_submit = kbase_backend_slot_free(kbdev, js); ++ MALI_DEBUG_ASSERT_POINTER(mem_from); ++ MALI_DEBUG_ASSERT_POINTER(mem_to); + -+ if (kbase_jm_next_job(kbdev, js, nr_jobs_to_submit)) -+ ret_mask |= (1 << js); ++ if (mem_from->count < start_page + page_count) { ++ return _MALI_OSK_ERR_INVALID_ARGS; ++ } + -+ js_mask &= ~(1 << js); ++ list_for_each_entry_safe(m_page, m_tmp, &mem_from->pages, list) { ++ if (i >= start_page && i < start_page + page_count) { ++ list_move_tail(&m_page->list, &mem_to->pages); ++ mem_from->count--; ++ mem_to->count++; ++ } ++ i++; + } + -+ return ret_mask; ++ return _MALI_OSK_ERR_OK; +} + -+void kbase_jm_try_kick(struct kbase_device *kbdev, u32 js_mask) ++ ++int mali_mem_os_alloc_pages(mali_mem_os_mem *os_mem, u32 size) +{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ struct page *new_page; ++ LIST_HEAD(pages_list); ++ size_t page_count = PAGE_ALIGN(size) / _MALI_OSK_MALI_PAGE_SIZE; ++ size_t remaining = page_count; ++ struct mali_page_node *m_page, *m_tmp; ++ u32 i; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ MALI_DEBUG_ASSERT_POINTER(os_mem); + -+ if (!down_trylock(&js_devdata->schedule_sem)) { -+ kbase_jm_kick(kbdev, js_mask); -+ up(&js_devdata->schedule_sem); ++ if (atomic_read(&mali_mem_os_allocator.allocated_pages) * _MALI_OSK_MALI_PAGE_SIZE + size > mali_mem_os_allocator.allocation_limit) { ++ MALI_DEBUG_PRINT(2, ("Mali Mem: Unable to allocate %u bytes. Currently allocated: %lu, max limit %lu\n", ++ size, ++ atomic_read(&mali_mem_os_allocator.allocated_pages) * _MALI_OSK_MALI_PAGE_SIZE, ++ mali_mem_os_allocator.allocation_limit)); ++ return -ENOMEM; + } -+} + -+void kbase_jm_try_kick_all(struct kbase_device *kbdev) -+{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ INIT_LIST_HEAD(&os_mem->pages); ++ os_mem->count = page_count; + -+ if (!down_trylock(&js_devdata->schedule_sem)) { -+ kbase_jm_kick_all(kbdev); -+ up(&js_devdata->schedule_sem); ++ /* Grab pages from pool. */ ++ { ++ size_t pool_pages; ++ spin_lock(&mali_mem_os_allocator.pool_lock); ++ pool_pages = min(remaining, mali_mem_os_allocator.pool_count); ++ for (i = pool_pages; i > 0; i--) { ++ BUG_ON(list_empty(&mali_mem_os_allocator.pool_pages)); ++ list_move(mali_mem_os_allocator.pool_pages.next, &pages_list); ++ } ++ mali_mem_os_allocator.pool_count -= pool_pages; ++ remaining -= pool_pages; ++ spin_unlock(&mali_mem_os_allocator.pool_lock); + } -+} + -+void kbase_jm_idle_ctx(struct kbase_device *kbdev, struct kbase_context *kctx) -+{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ /* Process pages from pool. */ ++ i = 0; ++ list_for_each_entry_safe(m_page, m_tmp, &pages_list, list) { ++ BUG_ON(NULL == m_page); + -+ if (kbdev->hwaccess.active_kctx == kctx) -+ kbdev->hwaccess.active_kctx = NULL; -+} ++ list_move_tail(&m_page->list, &os_mem->pages); ++ } + -+struct kbase_jd_atom *kbase_jm_return_atom_to_js(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) -+{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ /* Allocate new pages, if needed. */ ++ for (i = 0; i < remaining; i++) { ++ dma_addr_t dma_addr; ++ gfp_t flags = __GFP_ZERO | GFP_HIGHUSER; ++ int err; + -+ if (katom->event_code != BASE_JD_EVENT_STOPPED && -+ katom->event_code != BASE_JD_EVENT_REMOVED_FROM_NEXT) { -+ return kbase_js_complete_atom(katom, NULL); -+ } else { -+ kbase_js_unpull(katom->kctx, katom); -+ return NULL; -+ } -+} ++#if defined(CONFIG_ARM) && !defined(CONFIG_ARM_LPAE) ++ flags |= GFP_HIGHUSER; ++#else ++#ifdef CONFIG_ZONE_DMA32 ++ flags |= GFP_DMA32; ++#else ++#ifdef CONFIG_ZONE_DMA ++#else ++ /* arm64 utgard only work on < 4G, but the kernel ++ * didn't provide method to allocte memory < 4G ++ */ ++ MALI_DEBUG_ASSERT(0); ++#endif ++#endif ++#endif + -+struct kbase_jd_atom *kbase_jm_complete(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, ktime_t *end_timestamp) -+{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ new_page = alloc_page(flags); + -+ return kbase_js_complete_atom(katom, end_timestamp); -+} ++ if (unlikely(NULL == new_page)) { ++ E("err."); ++ /* Calculate the number of pages actually allocated, and free them. */ ++ os_mem->count = (page_count - remaining) + i; ++ atomic_add(os_mem->count, &mali_mem_os_allocator.allocated_pages); ++ mali_mem_os_free(&os_mem->pages, os_mem->count, MALI_FALSE); ++ return -ENOMEM; ++ } + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jm.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jm.h -new file mode 100755 -index 000000000000..a74ee24c8058 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jm.h -@@ -0,0 +1,110 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014, 2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ /* Ensure page is flushed from CPU caches. */ ++ dma_addr = dma_map_page(&mali_platform_device->dev, new_page, ++ 0, _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&mali_platform_device->dev, dma_addr, ++ _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_addr = dma_map_page(&mali_platform_device->dev, new_page, ++ 0, _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); + ++ err = dma_mapping_error(&mali_platform_device->dev, dma_addr); ++ if (unlikely(err)) { ++ MALI_DEBUG_PRINT_ERROR(("OS Mem: Failed to DMA map page %p: %u", ++ new_page, err)); ++ __free_page(new_page); ++ os_mem->count = (page_count - remaining) + i; ++ atomic_add(os_mem->count, &mali_mem_os_allocator.allocated_pages); ++ mali_mem_os_free(&os_mem->pages, os_mem->count, MALI_FALSE); ++ return -EFAULT; ++ } + ++ /* Store page phys addr */ ++ SetPagePrivate(new_page); ++ set_page_private(new_page, dma_addr); + ++ m_page = _mali_page_node_allocate(MALI_PAGE_NODE_OS); ++ if (unlikely(NULL == m_page)) { ++ MALI_PRINT_ERROR(("OS Mem: Can't allocate mali_page node! \n")); ++ dma_unmap_page(&mali_platform_device->dev, page_private(new_page), ++ _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); ++ ClearPagePrivate(new_page); ++ __free_page(new_page); ++ os_mem->count = (page_count - remaining) + i; ++ atomic_add(os_mem->count, &mali_mem_os_allocator.allocated_pages); ++ mali_mem_os_free(&os_mem->pages, os_mem->count, MALI_FALSE); ++ return -EFAULT; ++ } ++ m_page->page = new_page; + -+/* -+ * Job manager common APIs -+ */ ++ list_add_tail(&m_page->list, &os_mem->pages); ++ } + -+#ifndef _KBASE_JM_H_ -+#define _KBASE_JM_H_ ++ atomic_add(page_count, &mali_mem_os_allocator.allocated_pages); + -+/** -+ * kbase_jm_kick() - Indicate that there are jobs ready to run. -+ * @kbdev: Device pointer -+ * @js_mask: Mask of the job slots that can be pulled from. -+ * -+ * Caller must hold the hwaccess_lock and schedule_sem semaphore -+ * -+ * Return: Mask of the job slots that can still be submitted to. -+ */ -+u32 kbase_jm_kick(struct kbase_device *kbdev, u32 js_mask); ++ if (MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES > mali_mem_os_allocator.pool_count) { ++ MALI_DEBUG_PRINT(4, ("OS Mem: Stopping pool trim timer, only %u pages on pool\n", mali_mem_os_allocator.pool_count)); ++ cancel_delayed_work(&mali_mem_os_allocator.timed_shrinker); ++ } + -+/** -+ * kbase_jm_kick_all() - Indicate that there are jobs ready to run on all job -+ * slots. -+ * @kbdev: Device pointer -+ * -+ * Caller must hold the hwaccess_lock and schedule_sem semaphore -+ * -+ * Return: Mask of the job slots that can still be submitted to. -+ */ -+static inline u32 kbase_jm_kick_all(struct kbase_device *kbdev) -+{ -+ return kbase_jm_kick(kbdev, (1 << kbdev->gpu_props.num_job_slots) - 1); ++ return 0; +} + -+/** -+ * kbase_jm_try_kick - Attempt to call kbase_jm_kick -+ * @kbdev: Device pointer -+ * @js_mask: Mask of the job slots that can be pulled from -+ * Context: Caller must hold hwaccess_lock -+ * -+ * If schedule_sem can be immediately obtained then this function will call -+ * kbase_jm_kick() otherwise it will do nothing. -+ */ -+void kbase_jm_try_kick(struct kbase_device *kbdev, u32 js_mask); + -+/** -+ * kbase_jm_try_kick_all() - Attempt to call kbase_jm_kick_all -+ * @kbdev: Device pointer -+ * Context: Caller must hold hwaccess_lock -+ * -+ * If schedule_sem can be immediately obtained then this function will call -+ * kbase_jm_kick_all() otherwise it will do nothing. -+ */ -+void kbase_jm_try_kick_all(struct kbase_device *kbdev); ++_mali_osk_errcode_t mali_mem_os_mali_map(mali_mem_os_mem *os_mem, struct mali_session_data *session, u32 vaddr, u32 start_page, u32 mapping_pgae_num, u32 props) ++{ ++ struct mali_page_directory *pagedir = session->page_directory; ++ struct mali_page_node *m_page; ++ u32 virt; ++ u32 prop = props; + -+/** -+ * kbase_jm_idle_ctx() - Mark a context as idle. -+ * @kbdev: Device pointer -+ * @kctx: Context to mark as idle -+ * -+ * No more atoms will be pulled from this context until it is marked as active -+ * by kbase_js_use_ctx(). -+ * -+ * The context should have no atoms currently pulled from it -+ * (kctx->atoms_pulled == 0). -+ * -+ * Caller must hold the hwaccess_lock -+ */ -+void kbase_jm_idle_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); ++ MALI_DEBUG_ASSERT_POINTER(session); ++ MALI_DEBUG_ASSERT_POINTER(os_mem); + -+/** -+ * kbase_jm_return_atom_to_js() - Return an atom to the job scheduler that has -+ * been soft-stopped or will fail due to a -+ * dependency -+ * @kbdev: Device pointer -+ * @katom: Atom that has been stopped or will be failed -+ * -+ * Return: Atom that has now been unblocked and can now be run, or NULL if none -+ */ -+struct kbase_jd_atom *kbase_jm_return_atom_to_js(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom); ++ MALI_DEBUG_ASSERT(start_page <= os_mem->count); ++ MALI_DEBUG_ASSERT((start_page + mapping_pgae_num) <= os_mem->count); + -+/** -+ * kbase_jm_complete() - Complete an atom -+ * @kbdev: Device pointer -+ * @katom: Atom that has completed -+ * @end_timestamp: Timestamp of atom completion -+ * -+ * Return: Atom that has now been unblocked and can now be run, or NULL if none -+ */ -+struct kbase_jd_atom *kbase_jm_complete(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, ktime_t *end_timestamp); ++ if ((start_page + mapping_pgae_num) == os_mem->count) { + -+#endif /* _KBASE_JM_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js.c -new file mode 100755 -index 000000000000..677e438aedfa ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js.c -@@ -0,0 +1,2798 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ virt = vaddr + MALI_MMU_PAGE_SIZE * (start_page + mapping_pgae_num); + ++ list_for_each_entry_reverse(m_page, &os_mem->pages, list) { + ++ virt -= MALI_MMU_PAGE_SIZE; ++ if (mapping_pgae_num > 0) { ++ dma_addr_t phys = page_private(m_page->page); ++#if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT) ++ /* Verify that the "physical" address is 32-bit and ++ * usable for Mali, when on a system with bus addresses ++ * wider than 32-bit. */ ++ MALI_DEBUG_ASSERT(0 == (phys >> 32)); ++#endif ++ mali_mmu_pagedir_update(pagedir, virt, (mali_dma_addr)phys, MALI_MMU_PAGE_SIZE, prop); ++ } else { ++ break; ++ } ++ mapping_pgae_num--; ++ } + ++ } else { ++ u32 i = 0; ++ virt = vaddr; ++ list_for_each_entry(m_page, &os_mem->pages, list) { + ++ if (i >= start_page) { ++ dma_addr_t phys = page_private(m_page->page); + -+/* -+ * Job Scheduler Implementation -+ */ -+#include -+#include -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+#include ++#if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT) ++ /* Verify that the "physical" address is 32-bit and ++ * usable for Mali, when on a system with bus addresses ++ * wider than 32-bit. */ ++ MALI_DEBUG_ASSERT(0 == (phys >> 32)); +#endif -+#include -+#include -+#include ++ mali_mmu_pagedir_update(pagedir, virt, (mali_dma_addr)phys, MALI_MMU_PAGE_SIZE, prop); ++ } ++ i++; ++ virt += MALI_MMU_PAGE_SIZE; ++ } ++ } ++ return _MALI_OSK_ERR_OK; ++} + -+#include -+#include + -+#include "mali_kbase_jm.h" -+#include "mali_kbase_hwaccess_jm.h" ++void mali_mem_os_mali_unmap(mali_mem_allocation *alloc) ++{ ++ struct mali_session_data *session; ++ MALI_DEBUG_ASSERT_POINTER(alloc); ++ session = alloc->session; ++ MALI_DEBUG_ASSERT_POINTER(session); + -+/* -+ * Private types -+ */ ++ mali_session_memory_lock(session); ++ mali_mem_mali_map_free(session, alloc->psize, alloc->mali_vma_node.vm_node.start, ++ alloc->flags); ++ mali_session_memory_unlock(session); ++} + -+/* Bitpattern indicating the result of releasing a context */ -+enum { -+ /* The context was descheduled - caller should try scheduling in a new -+ * one to keep the runpool full */ -+ KBASEP_JS_RELEASE_RESULT_WAS_DESCHEDULED = (1u << 0), -+ /* Ctx attributes were changed - caller should try scheduling all -+ * contexts */ -+ KBASEP_JS_RELEASE_RESULT_SCHED_ALL = (1u << 1) -+}; ++int mali_mem_os_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma) ++{ ++ mali_mem_os_mem *os_mem = &mem_bkend->os_mem; ++ struct mali_page_node *m_page; ++ struct page *page; ++ int ret; ++ unsigned long addr = vma->vm_start; ++ MALI_DEBUG_ASSERT(MALI_MEM_OS == mem_bkend->type); + -+typedef u32 kbasep_js_release_result; ++ list_for_each_entry(m_page, &os_mem->pages, list) { ++ /* We should use vm_insert_page, but it does a dcache ++ * flush which makes it way slower than remap_pfn_range or vmf_insert_pfn. ++ ret = vm_insert_page(vma, addr, page); ++ */ ++ page = m_page->page; ++ ret = vmf_insert_pfn(vma, addr, page_to_pfn(page)); + -+const int kbasep_js_atom_priority_to_relative[BASE_JD_NR_PRIO_LEVELS] = { -+ KBASE_JS_ATOM_SCHED_PRIO_MED, /* BASE_JD_PRIO_MEDIUM */ -+ KBASE_JS_ATOM_SCHED_PRIO_HIGH, /* BASE_JD_PRIO_HIGH */ -+ KBASE_JS_ATOM_SCHED_PRIO_LOW /* BASE_JD_PRIO_LOW */ -+}; ++ if (unlikely(VM_FAULT_NOPAGE != ret)) { ++ return -EFAULT; ++ } ++ addr += _MALI_OSK_MALI_PAGE_SIZE; ++ } + -+const base_jd_prio -+kbasep_js_relative_priority_to_atom[KBASE_JS_ATOM_SCHED_PRIO_COUNT] = { -+ BASE_JD_PRIO_HIGH, /* KBASE_JS_ATOM_SCHED_PRIO_HIGH */ -+ BASE_JD_PRIO_MEDIUM, /* KBASE_JS_ATOM_SCHED_PRIO_MED */ -+ BASE_JD_PRIO_LOW /* KBASE_JS_ATOM_SCHED_PRIO_LOW */ -+}; ++ return 0; ++} + ++_mali_osk_errcode_t mali_mem_os_resize_cpu_map_locked(mali_mem_backend *mem_bkend, struct vm_area_struct *vma, unsigned long start_vaddr, u32 mappig_size) ++{ ++ mali_mem_os_mem *os_mem = &mem_bkend->os_mem; ++ struct mali_page_node *m_page; ++ int ret; ++ int offset; ++ int mapping_page_num; ++ int count ; + -+/* -+ * Private function prototypes -+ */ -+static kbasep_js_release_result kbasep_js_runpool_release_ctx_internal( -+ struct kbase_device *kbdev, struct kbase_context *kctx, -+ struct kbasep_js_atom_retained_state *katom_retained_state); ++ unsigned long vstart = vma->vm_start; ++ count = 0; ++ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_OS); ++ MALI_DEBUG_ASSERT(0 == start_vaddr % _MALI_OSK_MALI_PAGE_SIZE); ++ MALI_DEBUG_ASSERT(0 == vstart % _MALI_OSK_MALI_PAGE_SIZE); ++ offset = (start_vaddr - vstart) / _MALI_OSK_MALI_PAGE_SIZE; ++ MALI_DEBUG_ASSERT(offset <= os_mem->count); ++ mapping_page_num = mappig_size / _MALI_OSK_MALI_PAGE_SIZE; ++ MALI_DEBUG_ASSERT((offset + mapping_page_num) <= os_mem->count); + -+static int kbase_js_get_slot(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom); ++ if ((offset + mapping_page_num) == os_mem->count) { + -+static void kbase_js_foreach_ctx_job(struct kbase_context *kctx, -+ kbasep_js_ctx_job_cb callback); ++ unsigned long vm_end = start_vaddr + mappig_size; + -+/* Helper for trace subcodes */ -+#if KBASE_TRACE_ENABLE -+static int kbasep_js_trace_get_refcnt(struct kbase_device *kbdev, -+ struct kbase_context *kctx) -+{ -+ return atomic_read(&kctx->refcount); -+} -+#else /* KBASE_TRACE_ENABLE */ -+static int kbasep_js_trace_get_refcnt(struct kbase_device *kbdev, -+ struct kbase_context *kctx) -+{ -+ CSTD_UNUSED(kbdev); -+ CSTD_UNUSED(kctx); -+ return 0; -+} -+#endif /* KBASE_TRACE_ENABLE */ ++ list_for_each_entry_reverse(m_page, &os_mem->pages, list) { + -+/* -+ * Private functions -+ */ ++ vm_end -= _MALI_OSK_MALI_PAGE_SIZE; ++ if (mapping_page_num > 0) { ++ ret = vmf_insert_pfn(vma, vm_end, page_to_pfn(m_page->page)); + -+/** -+ * core_reqs_from_jsn_features - Convert JSn_FEATURES to core requirements -+ * @features: JSn_FEATURE register value -+ * -+ * Given a JSn_FEATURE register value returns the core requirements that match -+ * -+ * Return: Core requirement bit mask -+ */ -+static base_jd_core_req core_reqs_from_jsn_features(u16 features) ++ if (unlikely(VM_FAULT_NOPAGE != ret)) { ++ /*will return -EBUSY If the page has already been mapped into table, but it's OK*/ ++ if (-EBUSY == ret) { ++ break; ++ } else { ++ MALI_DEBUG_PRINT(1, ("OS Mem: mali_mem_os_resize_cpu_map_locked failed, ret = %d, offset is %d,page_count is %d\n", ++ ret, offset + mapping_page_num, os_mem->count)); ++ } ++ return _MALI_OSK_ERR_FAULT; ++ } ++ } else { ++ break; ++ } ++ mapping_page_num--; ++ ++ } ++ } else { ++ ++ list_for_each_entry(m_page, &os_mem->pages, list) { ++ if (count >= offset) { ++ ++ ret = vmf_insert_pfn(vma, vstart, page_to_pfn(m_page->page)); ++ ++ if (unlikely(VM_FAULT_NOPAGE != ret)) { ++ /*will return -EBUSY If the page has already been mapped into table, but it's OK*/ ++ if (-EBUSY == ret) { ++ break; ++ } else { ++ MALI_DEBUG_PRINT(1, ("OS Mem: mali_mem_os_resize_cpu_map_locked failed, ret = %d, count is %d, offset is %d,page_count is %d\n", ++ ret, count, offset, os_mem->count)); ++ } ++ return _MALI_OSK_ERR_FAULT; ++ } ++ } ++ count++; ++ vstart += _MALI_OSK_MALI_PAGE_SIZE; ++ } ++ } ++ return _MALI_OSK_ERR_OK; ++} ++ ++u32 mali_mem_os_release(mali_mem_backend *mem_bkend) +{ -+ base_jd_core_req core_req = 0u; + -+ if ((features & JS_FEATURE_SET_VALUE_JOB) != 0) -+ core_req |= BASE_JD_REQ_V; ++ mali_mem_allocation *alloc; ++ struct mali_session_data *session; ++ u32 free_pages_nr = 0; ++ MALI_DEBUG_ASSERT_POINTER(mem_bkend); ++ MALI_DEBUG_ASSERT(MALI_MEM_OS == mem_bkend->type); + -+ if ((features & JS_FEATURE_CACHE_FLUSH_JOB) != 0) -+ core_req |= BASE_JD_REQ_CF; ++ alloc = mem_bkend->mali_allocation; ++ MALI_DEBUG_ASSERT_POINTER(alloc); + -+ if ((features & JS_FEATURE_COMPUTE_JOB) != 0) -+ core_req |= BASE_JD_REQ_CS; ++ session = alloc->session; ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ if ((features & JS_FEATURE_TILER_JOB) != 0) -+ core_req |= BASE_JD_REQ_T; ++ /* Unmap the memory from the mali virtual address space. */ ++ mali_mem_os_mali_unmap(alloc); ++ mutex_lock(&mem_bkend->mutex); ++ /* Free pages */ ++ if (MALI_MEM_BACKEND_FLAG_COWED & mem_bkend->flags) { ++ /* Lock to avoid the free race condition for the cow shared memory page node. */ ++ _mali_osk_mutex_wait(session->cow_lock); ++ free_pages_nr = mali_mem_os_free(&mem_bkend->os_mem.pages, mem_bkend->os_mem.count, MALI_TRUE); ++ _mali_osk_mutex_signal(session->cow_lock); ++ } else { ++ free_pages_nr = mali_mem_os_free(&mem_bkend->os_mem.pages, mem_bkend->os_mem.count, MALI_FALSE); ++ } ++ mutex_unlock(&mem_bkend->mutex); + -+ if ((features & JS_FEATURE_FRAGMENT_JOB) != 0) -+ core_req |= BASE_JD_REQ_FS; ++ MALI_DEBUG_PRINT(4, ("OS Mem free : allocated size = 0x%x, free size = 0x%x\n", mem_bkend->os_mem.count * _MALI_OSK_MALI_PAGE_SIZE, ++ free_pages_nr * _MALI_OSK_MALI_PAGE_SIZE)); + -+ return core_req; ++ mem_bkend->os_mem.count = 0; ++ return free_pages_nr; +} + -+static void kbase_js_sync_timers(struct kbase_device *kbdev) -+{ -+ mutex_lock(&kbdev->js_data.runpool_mutex); -+ kbase_backend_ctx_count_changed(kbdev); -+ mutex_unlock(&kbdev->js_data.runpool_mutex); -+} + -+/* Hold the mmu_hw_mutex and hwaccess_lock for this */ -+bool kbasep_js_runpool_retain_ctx_nolock(struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++#define MALI_MEM_OS_PAGE_TABLE_PAGE_POOL_SIZE 128 ++static struct { ++ struct { ++ mali_dma_addr phys; ++ mali_io_address mapping; ++ } page[MALI_MEM_OS_PAGE_TABLE_PAGE_POOL_SIZE]; ++ size_t count; ++ spinlock_t lock; ++} mali_mem_page_table_page_pool = { ++ .count = 0, ++ .lock = __SPIN_LOCK_UNLOCKED(pool_lock), ++}; ++ ++_mali_osk_errcode_t mali_mem_os_get_table_page(mali_dma_addr *phys, mali_io_address *mapping) +{ -+ struct kbasep_js_device_data *js_devdata; -+ bool result = false; -+ int as_nr; ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_NOMEM; ++ dma_addr_t tmp_phys; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ js_devdata = &kbdev->js_data; ++ spin_lock(&mali_mem_page_table_page_pool.lock); ++ if (0 < mali_mem_page_table_page_pool.count) { ++ u32 i = --mali_mem_page_table_page_pool.count; ++ *phys = mali_mem_page_table_page_pool.page[i].phys; ++ *mapping = mali_mem_page_table_page_pool.page[i].mapping; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ret = _MALI_OSK_ERR_OK; ++ } ++ spin_unlock(&mali_mem_page_table_page_pool.lock); + -+ as_nr = kctx->as_nr; -+ if (atomic_read(&kctx->refcount) > 0) { -+ KBASE_DEBUG_ASSERT(as_nr >= 0); ++ if (_MALI_OSK_ERR_OK != ret) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) ++ *mapping = dma_alloc_attrs(&mali_platform_device->dev, ++ _MALI_OSK_MALI_PAGE_SIZE, &tmp_phys, ++ GFP_KERNEL, DMA_ATTR_WRITE_COMBINE); ++#else ++ *mapping = dma_alloc_writecombine(&mali_platform_device->dev, ++ _MALI_OSK_MALI_PAGE_SIZE, &tmp_phys, GFP_KERNEL); ++#endif ++ if (NULL != *mapping) { ++ ret = _MALI_OSK_ERR_OK; + -+ kbase_ctx_sched_retain_ctx_refcount(kctx); -+ KBASE_TRACE_ADD_REFCOUNT(kbdev, JS_RETAIN_CTX_NOLOCK, kctx, -+ NULL, 0u, atomic_read(&kctx->refcount)); -+ result = true; ++#if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT) ++ /* Verify that the "physical" address is 32-bit and ++ * usable for Mali, when on a system with bus addresses ++ * wider than 32-bit. */ ++ MALI_DEBUG_ASSERT(0 == (tmp_phys >> 32)); ++#endif ++ ++ *phys = (mali_dma_addr)tmp_phys; ++ } + } + -+ return result; ++ return ret; +} + -+/** -+ * jsctx_rb_none_to_pull_prio(): - Check if there are no pullable atoms -+ * @kctx: Pointer to kbase context with ring buffer. -+ * @js: Job slot id to check. -+ * @prio: Priority to check. -+ * -+ * Return true if there are no atoms to pull. There may be running atoms in the -+ * ring buffer even if there are no atoms to pull. It is also possible for the -+ * ring buffer to be full (with running atoms) when this functions returns -+ * true. -+ * -+ * Return: true if there are no atoms to pull, false otherwise. -+ */ -+static inline bool -+jsctx_rb_none_to_pull_prio(struct kbase_context *kctx, int js, int prio) ++void mali_mem_os_release_table_page(mali_dma_addr phys, void *virt) +{ -+ struct jsctx_queue *rb = &kctx->jsctx_queue[prio][js]; ++ spin_lock(&mali_mem_page_table_page_pool.lock); ++ if (MALI_MEM_OS_PAGE_TABLE_PAGE_POOL_SIZE > mali_mem_page_table_page_pool.count) { ++ u32 i = mali_mem_page_table_page_pool.count; ++ mali_mem_page_table_page_pool.page[i].phys = phys; ++ mali_mem_page_table_page_pool.page[i].mapping = virt; + -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ ++mali_mem_page_table_page_pool.count; + -+ return RB_EMPTY_ROOT(&rb->runnable_tree); ++ spin_unlock(&mali_mem_page_table_page_pool.lock); ++ } else { ++ spin_unlock(&mali_mem_page_table_page_pool.lock); ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) ++ dma_free_attrs(&mali_platform_device->dev, ++ _MALI_OSK_MALI_PAGE_SIZE, virt, phys, ++ DMA_ATTR_WRITE_COMBINE); ++#else ++ dma_free_writecombine(&mali_platform_device->dev, ++ _MALI_OSK_MALI_PAGE_SIZE, virt, phys); ++#endif ++ } +} + -+/** -+ * jsctx_rb_none_to_pull(): - Check if all priority ring buffers have no -+ * pullable atoms -+ * @kctx: Pointer to kbase context with ring buffer. -+ * @js: Job slot id to check. -+ * -+ * Caller must hold hwaccess_lock -+ * -+ * Return: true if the ring buffers for all priorities have no pullable atoms, -+ * false otherwise. -+ */ -+static inline bool -+jsctx_rb_none_to_pull(struct kbase_context *kctx, int js) ++void mali_mem_os_free_page_node(struct mali_page_node *m_page) +{ -+ int prio; -+ -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ struct page *page = m_page->page; ++ MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_OS); + -+ for (prio = 0; prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT; prio++) { -+ if (!jsctx_rb_none_to_pull_prio(kctx, js, prio)) -+ return false; ++ if (1 == page_count(page)) { ++ dma_unmap_page(&mali_platform_device->dev, page_private(page), ++ _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); ++ ClearPagePrivate(page); + } -+ -+ return true; ++ __free_page(page); ++ m_page->page = NULL; ++ list_del(&m_page->list); ++ kfree(m_page); +} + -+/** -+ * jsctx_queue_foreach_prio(): - Execute callback for each entry in the queue. -+ * @kctx: Pointer to kbase context with the queue. -+ * @js: Job slot id to iterate. -+ * @prio: Priority id to iterate. -+ * @callback: Function pointer to callback. -+ * -+ * Iterate over a queue and invoke @callback for each entry in the queue, and -+ * remove the entry from the queue. -+ * -+ * If entries are added to the queue while this is running those entries may, or -+ * may not be covered. To ensure that all entries in the buffer have been -+ * enumerated when this function returns jsctx->lock must be held when calling -+ * this function. -+ * -+ * The HW access lock must always be held when calling this function. ++/* The maximum number of page table pool pages to free in one go. */ ++#define MALI_MEM_OS_CHUNK_TO_FREE 64UL ++ ++/* Free a certain number of pages from the page table page pool. ++ * The pool lock must be held when calling the function, and the lock will be ++ * released before returning. + */ -+static void -+jsctx_queue_foreach_prio(struct kbase_context *kctx, int js, int prio, -+ kbasep_js_ctx_job_cb callback) ++static void mali_mem_os_page_table_pool_free(size_t nr_to_free) +{ -+ struct jsctx_queue *queue = &kctx->jsctx_queue[prio][js]; ++ mali_dma_addr phys_arr[MALI_MEM_OS_CHUNK_TO_FREE]; ++ void *virt_arr[MALI_MEM_OS_CHUNK_TO_FREE]; ++ u32 i; + -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ MALI_DEBUG_ASSERT(nr_to_free <= MALI_MEM_OS_CHUNK_TO_FREE); + -+ while (!RB_EMPTY_ROOT(&queue->runnable_tree)) { -+ struct rb_node *node = rb_first(&queue->runnable_tree); -+ struct kbase_jd_atom *entry = rb_entry(node, -+ struct kbase_jd_atom, runnable_tree_node); ++ /* Remove nr_to_free pages from the pool and store them locally on stack. */ ++ for (i = 0; i < nr_to_free; i++) { ++ u32 pool_index = mali_mem_page_table_page_pool.count - i - 1; + -+ rb_erase(node, &queue->runnable_tree); -+ callback(kctx->kbdev, entry); ++ phys_arr[i] = mali_mem_page_table_page_pool.page[pool_index].phys; ++ virt_arr[i] = mali_mem_page_table_page_pool.page[pool_index].mapping; + } + -+ while (!list_empty(&queue->x_dep_head)) { -+ struct kbase_jd_atom *entry = list_entry(queue->x_dep_head.next, -+ struct kbase_jd_atom, queue); ++ mali_mem_page_table_page_pool.count -= nr_to_free; + -+ list_del(queue->x_dep_head.next); ++ spin_unlock(&mali_mem_page_table_page_pool.lock); + -+ callback(kctx->kbdev, entry); ++ /* After releasing the spinlock: free the pages we removed from the pool. */ ++ for (i = 0; i < nr_to_free; i++) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) ++ dma_free_attrs(&mali_platform_device->dev, _MALI_OSK_MALI_PAGE_SIZE, ++ virt_arr[i], (dma_addr_t)phys_arr[i], ++ DMA_ATTR_WRITE_COMBINE); ++#else ++ dma_free_writecombine(&mali_platform_device->dev, ++ _MALI_OSK_MALI_PAGE_SIZE, ++ virt_arr[i], (dma_addr_t)phys_arr[i]); ++#endif + } +} + -+/** -+ * jsctx_queue_foreach(): - Execute callback for each entry in every queue -+ * @kctx: Pointer to kbase context with queue. -+ * @js: Job slot id to iterate. -+ * @callback: Function pointer to callback. -+ * -+ * Iterate over all the different priorities, and for each call -+ * jsctx_queue_foreach_prio() to iterate over the queue and invoke @callback -+ * for each entry, and remove the entry from the queue. -+ */ -+static inline void -+jsctx_queue_foreach(struct kbase_context *kctx, int js, -+ kbasep_js_ctx_job_cb callback) ++static void mali_mem_os_trim_page_table_page_pool(void) +{ -+ int prio; -+ -+ for (prio = 0; prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT; prio++) -+ jsctx_queue_foreach_prio(kctx, js, prio, callback); -+} ++ size_t nr_to_free = 0; ++ size_t nr_to_keep; + -+/** -+ * jsctx_rb_peek_prio(): - Check buffer and get next atom -+ * @kctx: Pointer to kbase context with ring buffer. -+ * @js: Job slot id to check. -+ * @prio: Priority id to check. -+ * -+ * Check the ring buffer for the specified @js and @prio and return a pointer to -+ * the next atom, unless the ring buffer is empty. -+ * -+ * Return: Pointer to next atom in buffer, or NULL if there is no atom. -+ */ -+static inline struct kbase_jd_atom * -+jsctx_rb_peek_prio(struct kbase_context *kctx, int js, int prio) -+{ -+ struct jsctx_queue *rb = &kctx->jsctx_queue[prio][js]; -+ struct rb_node *node; ++ /* Keep 2 page table pages for each 1024 pages in the page cache. */ ++ nr_to_keep = mali_mem_os_allocator.pool_count / 512; ++ /* And a minimum of eight pages, to accomodate new sessions. */ ++ nr_to_keep += 8; + -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ if (0 == spin_trylock(&mali_mem_page_table_page_pool.lock)) return; + -+ node = rb_first(&rb->runnable_tree); -+ if (!node) -+ return NULL; ++ if (nr_to_keep < mali_mem_page_table_page_pool.count) { ++ nr_to_free = mali_mem_page_table_page_pool.count - nr_to_keep; ++ nr_to_free = min((size_t)MALI_MEM_OS_CHUNK_TO_FREE, nr_to_free); ++ } + -+ return rb_entry(node, struct kbase_jd_atom, runnable_tree_node); ++ /* Pool lock will be released by the callee. */ ++ mali_mem_os_page_table_pool_free(nr_to_free); +} + -+/** -+ * jsctx_rb_peek(): - Check all priority buffers and get next atom -+ * @kctx: Pointer to kbase context with ring buffer. -+ * @js: Job slot id to check. -+ * -+ * Check the ring buffers for all priorities, starting from -+ * KBASE_JS_ATOM_SCHED_PRIO_HIGH, for the specified @js and @prio and return a -+ * pointer to the next atom, unless all the priority's ring buffers are empty. -+ * -+ * Caller must hold the hwaccess_lock. -+ * -+ * Return: Pointer to next atom in buffer, or NULL if there is no atom. -+ */ -+static inline struct kbase_jd_atom * -+jsctx_rb_peek(struct kbase_context *kctx, int js) ++static unsigned long mali_mem_os_shrink_count(struct shrinker *shrinker, struct shrink_control *sc) +{ -+ int prio; ++ return mali_mem_os_allocator.pool_count; ++} + -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) ++static int mali_mem_os_shrink(int nr_to_scan, gfp_t gfp_mask) ++#else ++static int mali_mem_os_shrink(struct shrinker *shrinker, int nr_to_scan, gfp_t gfp_mask) ++#endif /* Linux < 2.6.35 */ ++#else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) ++static int mali_mem_os_shrink(struct shrinker *shrinker, struct shrink_control *sc) ++#else ++static unsigned long mali_mem_os_shrink(struct shrinker *shrinker, struct shrink_control *sc) ++#endif /* Linux < 3.12.0 */ ++#endif /* Linux < 3.0.0 */ ++{ ++ struct mali_page_node *m_page, *m_tmp; ++ unsigned long flags; ++ struct list_head *le, pages; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) ++ int nr = nr_to_scan; ++#else ++ int nr = sc->nr_to_scan; ++#endif + -+ for (prio = 0; prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT; prio++) { -+ struct kbase_jd_atom *katom; ++ if (0 == nr) { ++ return mali_mem_os_shrink_count(shrinker, sc); ++ } + -+ katom = jsctx_rb_peek_prio(kctx, js, prio); -+ if (katom) -+ return katom; ++ if (0 == spin_trylock_irqsave(&mali_mem_os_allocator.pool_lock, flags)) { ++ /* Not able to lock. */ ++ return -1; + } + -+ return NULL; -+} ++ if (0 == mali_mem_os_allocator.pool_count) { ++ /* No pages availble */ ++ spin_unlock_irqrestore(&mali_mem_os_allocator.pool_lock, flags); ++ return 0; ++ } + -+/** -+ * jsctx_rb_pull(): - Mark atom in list as running -+ * @kctx: Pointer to kbase context with ring buffer. -+ * @katom: Pointer to katom to pull. -+ * -+ * Mark an atom previously obtained from jsctx_rb_peek() as running. -+ * -+ * @katom must currently be at the head of the ring buffer. -+ */ -+static inline void -+jsctx_rb_pull(struct kbase_context *kctx, struct kbase_jd_atom *katom) -+{ -+ int prio = katom->sched_priority; -+ int js = katom->slot_nr; -+ struct jsctx_queue *rb = &kctx->jsctx_queue[prio][js]; ++ /* Release from general page pool */ ++ nr = min((size_t)nr, mali_mem_os_allocator.pool_count); ++ mali_mem_os_allocator.pool_count -= nr; ++ list_for_each(le, &mali_mem_os_allocator.pool_pages) { ++ --nr; ++ if (0 == nr) break; ++ } ++ list_cut_position(&pages, &mali_mem_os_allocator.pool_pages, le); ++ spin_unlock_irqrestore(&mali_mem_os_allocator.pool_lock, flags); + -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ list_for_each_entry_safe(m_page, m_tmp, &pages, list) { ++ mali_mem_os_free_page_node(m_page); ++ } + -+ /* Atoms must be pulled in the correct order. */ -+ WARN_ON(katom != jsctx_rb_peek_prio(kctx, js, prio)); ++ if (MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES > mali_mem_os_allocator.pool_count) { ++ /* Pools are empty, stop timer */ ++ MALI_DEBUG_PRINT(5, ("Stopping timer, only %u pages on pool\n", mali_mem_os_allocator.pool_count)); ++ cancel_delayed_work(&mali_mem_os_allocator.timed_shrinker); ++ } + -+ rb_erase(&katom->runnable_tree_node, &rb->runnable_tree); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) ++ return mali_mem_os_shrink_count(shrinker, sc); ++#else ++ return nr; ++#endif +} + -+#define LESS_THAN_WRAP(a, b) ((s32)(a - b) < 0) -+ -+static void -+jsctx_tree_add(struct kbase_context *kctx, struct kbase_jd_atom *katom) ++static void mali_mem_os_trim_pool(struct work_struct *data) +{ -+ int prio = katom->sched_priority; -+ int js = katom->slot_nr; -+ struct jsctx_queue *queue = &kctx->jsctx_queue[prio][js]; -+ struct rb_node **new = &(queue->runnable_tree.rb_node), *parent = NULL; ++ struct mali_page_node *m_page, *m_tmp; ++ struct list_head *le; ++ LIST_HEAD(pages); ++ size_t nr_to_free; + -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ MALI_IGNORE(data); + -+ while (*new) { -+ struct kbase_jd_atom *entry = container_of(*new, -+ struct kbase_jd_atom, runnable_tree_node); ++ MALI_DEBUG_PRINT(3, ("OS Mem: Trimming pool %u\n", mali_mem_os_allocator.pool_count)); + -+ parent = *new; -+ if (LESS_THAN_WRAP(katom->age, entry->age)) -+ new = &((*new)->rb_left); -+ else -+ new = &((*new)->rb_right); ++ /* Release from general page pool */ ++ spin_lock(&mali_mem_os_allocator.pool_lock); ++ if (MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES < mali_mem_os_allocator.pool_count) { ++ size_t count = mali_mem_os_allocator.pool_count - MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES; ++ const size_t min_to_free = min(64, MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES); ++ ++ /* Free half the pages on the pool above the static limit. Or 64 pages, 256KB. */ ++ nr_to_free = max(count / 2, min_to_free); ++ ++ mali_mem_os_allocator.pool_count -= nr_to_free; ++ list_for_each(le, &mali_mem_os_allocator.pool_pages) { ++ --nr_to_free; ++ if (0 == nr_to_free) break; ++ } ++ list_cut_position(&pages, &mali_mem_os_allocator.pool_pages, le); + } ++ spin_unlock(&mali_mem_os_allocator.pool_lock); + -+ /* Add new node and rebalance tree. */ -+ rb_link_node(&katom->runnable_tree_node, parent, new); -+ rb_insert_color(&katom->runnable_tree_node, &queue->runnable_tree); -+} ++ list_for_each_entry_safe(m_page, m_tmp, &pages, list) { ++ mali_mem_os_free_page_node(m_page); ++ } + -+/** -+ * jsctx_rb_unpull(): - Undo marking of atom in list as running -+ * @kctx: Pointer to kbase context with ring buffer. -+ * @katom: Pointer to katom to unpull. -+ * -+ * Undo jsctx_rb_pull() and put @katom back in the queue. -+ * -+ * jsctx_rb_unpull() must be called on atoms in the same order the atoms were -+ * pulled. -+ */ -+static inline void -+jsctx_rb_unpull(struct kbase_context *kctx, struct kbase_jd_atom *katom) -+{ -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ /* Release some pages from page table page pool */ ++ mali_mem_os_trim_page_table_page_pool(); + -+ jsctx_tree_add(kctx, katom); ++ if (MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES < mali_mem_os_allocator.pool_count) { ++ MALI_DEBUG_PRINT(4, ("OS Mem: Starting pool trim timer %u\n", mali_mem_os_allocator.pool_count)); ++ queue_delayed_work(mali_mem_os_allocator.wq, &mali_mem_os_allocator.timed_shrinker, MALI_OS_MEMORY_POOL_TRIM_JIFFIES); ++ } +} + -+static bool kbase_js_ctx_pullable(struct kbase_context *kctx, -+ int js, -+ bool is_scheduled); -+static bool kbase_js_ctx_list_add_pullable_nolock(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js); -+static bool kbase_js_ctx_list_add_unpullable_nolock(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js); -+ -+/* -+ * Functions private to KBase ('Protected' functions) -+ */ -+int kbasep_js_devdata_init(struct kbase_device * const kbdev) ++_mali_osk_errcode_t mali_mem_os_init(void) +{ -+ struct kbasep_js_device_data *jsdd; -+ int i; ++ mali_mem_os_allocator.wq = alloc_workqueue("mali-mem", WQ_UNBOUND, 1); ++ if (NULL == mali_mem_os_allocator.wq) { ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ register_shrinker(&mali_mem_os_allocator.shrinker); + -+ jsdd = &kbdev->js_data; ++ return _MALI_OSK_ERR_OK; ++} + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ /* Soft-stop will be disabled on a single context by default unless -+ * softstop_always is set */ -+ jsdd->softstop_always = false; -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+ jsdd->nr_all_contexts_running = 0; -+ jsdd->nr_user_contexts_running = 0; -+ jsdd->nr_contexts_pullable = 0; -+ atomic_set(&jsdd->nr_contexts_runnable, 0); -+ /* No ctx allowed to submit */ -+ jsdd->runpool_irq.submit_allowed = 0u; -+ memset(jsdd->runpool_irq.ctx_attr_ref_count, 0, -+ sizeof(jsdd->runpool_irq.ctx_attr_ref_count)); -+ memset(jsdd->runpool_irq.slot_affinities, 0, -+ sizeof(jsdd->runpool_irq.slot_affinities)); -+ memset(jsdd->runpool_irq.slot_affinity_refcount, 0, -+ sizeof(jsdd->runpool_irq.slot_affinity_refcount)); -+ INIT_LIST_HEAD(&jsdd->suspended_soft_jobs_list); ++void mali_mem_os_term(void) ++{ ++ struct mali_page_node *m_page, *m_tmp; ++ unregister_shrinker(&mali_mem_os_allocator.shrinker); ++ cancel_delayed_work_sync(&mali_mem_os_allocator.timed_shrinker); + -+ /* Config attributes */ -+ jsdd->scheduling_period_ns = DEFAULT_JS_SCHEDULING_PERIOD_NS; -+ jsdd->soft_stop_ticks = DEFAULT_JS_SOFT_STOP_TICKS; -+ jsdd->soft_stop_ticks_cl = DEFAULT_JS_SOFT_STOP_TICKS_CL; -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8408)) -+ jsdd->hard_stop_ticks_ss = DEFAULT_JS_HARD_STOP_TICKS_SS_8408; -+ else -+ jsdd->hard_stop_ticks_ss = DEFAULT_JS_HARD_STOP_TICKS_SS; -+ jsdd->hard_stop_ticks_cl = DEFAULT_JS_HARD_STOP_TICKS_CL; -+ jsdd->hard_stop_ticks_dumping = DEFAULT_JS_HARD_STOP_TICKS_DUMPING; -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8408)) -+ jsdd->gpu_reset_ticks_ss = DEFAULT_JS_RESET_TICKS_SS_8408; -+ else -+ jsdd->gpu_reset_ticks_ss = DEFAULT_JS_RESET_TICKS_SS; -+ jsdd->gpu_reset_ticks_cl = DEFAULT_JS_RESET_TICKS_CL; -+ jsdd->gpu_reset_ticks_dumping = DEFAULT_JS_RESET_TICKS_DUMPING; -+ jsdd->ctx_timeslice_ns = DEFAULT_JS_CTX_TIMESLICE_NS; -+ atomic_set(&jsdd->soft_job_timeout_ms, DEFAULT_JS_SOFT_JOB_TIMEOUT); ++ if (NULL != mali_mem_os_allocator.wq) { ++ destroy_workqueue(mali_mem_os_allocator.wq); ++ mali_mem_os_allocator.wq = NULL; ++ } + -+ dev_dbg(kbdev->dev, "JS Config Attribs: "); -+ dev_dbg(kbdev->dev, "\tscheduling_period_ns:%u", -+ jsdd->scheduling_period_ns); -+ dev_dbg(kbdev->dev, "\tsoft_stop_ticks:%u", -+ jsdd->soft_stop_ticks); -+ dev_dbg(kbdev->dev, "\tsoft_stop_ticks_cl:%u", -+ jsdd->soft_stop_ticks_cl); -+ dev_dbg(kbdev->dev, "\thard_stop_ticks_ss:%u", -+ jsdd->hard_stop_ticks_ss); -+ dev_dbg(kbdev->dev, "\thard_stop_ticks_cl:%u", -+ jsdd->hard_stop_ticks_cl); -+ dev_dbg(kbdev->dev, "\thard_stop_ticks_dumping:%u", -+ jsdd->hard_stop_ticks_dumping); -+ dev_dbg(kbdev->dev, "\tgpu_reset_ticks_ss:%u", -+ jsdd->gpu_reset_ticks_ss); -+ dev_dbg(kbdev->dev, "\tgpu_reset_ticks_cl:%u", -+ jsdd->gpu_reset_ticks_cl); -+ dev_dbg(kbdev->dev, "\tgpu_reset_ticks_dumping:%u", -+ jsdd->gpu_reset_ticks_dumping); -+ dev_dbg(kbdev->dev, "\tctx_timeslice_ns:%u", -+ jsdd->ctx_timeslice_ns); -+ dev_dbg(kbdev->dev, "\tsoft_job_timeout:%i", -+ atomic_read(&jsdd->soft_job_timeout_ms)); ++ spin_lock(&mali_mem_os_allocator.pool_lock); ++ list_for_each_entry_safe(m_page, m_tmp, &mali_mem_os_allocator.pool_pages, list) { ++ mali_mem_os_free_page_node(m_page); + -+ if (!(jsdd->soft_stop_ticks < jsdd->hard_stop_ticks_ss && -+ jsdd->hard_stop_ticks_ss < jsdd->gpu_reset_ticks_ss && -+ jsdd->soft_stop_ticks < jsdd->hard_stop_ticks_dumping && -+ jsdd->hard_stop_ticks_dumping < -+ jsdd->gpu_reset_ticks_dumping)) { -+ dev_err(kbdev->dev, "Job scheduler timeouts invalid; soft/hard/reset tick counts should be in increasing order\n"); -+ return -EINVAL; ++ --mali_mem_os_allocator.pool_count; + } ++ BUG_ON(mali_mem_os_allocator.pool_count); ++ spin_unlock(&mali_mem_os_allocator.pool_lock); + -+#if KBASE_DISABLE_SCHEDULING_SOFT_STOPS -+ dev_dbg(kbdev->dev, "Job Scheduling Soft-stops disabled, ignoring value for soft_stop_ticks==%u at %uns per tick. Other soft-stops may still occur.", -+ jsdd->soft_stop_ticks, -+ jsdd->scheduling_period_ns); -+#endif -+#if KBASE_DISABLE_SCHEDULING_HARD_STOPS -+ dev_dbg(kbdev->dev, "Job Scheduling Hard-stops disabled, ignoring values for hard_stop_ticks_ss==%d and hard_stop_ticks_dumping==%u at %uns per tick. Other hard-stops may still occur.", -+ jsdd->hard_stop_ticks_ss, -+ jsdd->hard_stop_ticks_dumping, -+ jsdd->scheduling_period_ns); -+#endif -+#if KBASE_DISABLE_SCHEDULING_SOFT_STOPS && KBASE_DISABLE_SCHEDULING_HARD_STOPS -+ dev_dbg(kbdev->dev, "Note: The JS tick timer (if coded) will still be run, but do nothing."); -+#endif ++ /* Release from page table page pool */ ++ do { ++ u32 nr_to_free; + -+ for (i = 0; i < kbdev->gpu_props.num_job_slots; ++i) -+ jsdd->js_reqs[i] = core_reqs_from_jsn_features( -+ kbdev->gpu_props.props.raw_props.js_features[i]); ++ spin_lock(&mali_mem_page_table_page_pool.lock); + -+ /* On error, we could continue on: providing none of the below resources -+ * rely on the ones above */ ++ nr_to_free = min((size_t)MALI_MEM_OS_CHUNK_TO_FREE, mali_mem_page_table_page_pool.count); + -+ mutex_init(&jsdd->runpool_mutex); -+ mutex_init(&jsdd->queue_mutex); -+ spin_lock_init(&kbdev->hwaccess_lock); -+ sema_init(&jsdd->schedule_sem, 1); ++ /* Pool lock will be released by the callee. */ ++ mali_mem_os_page_table_pool_free(nr_to_free); ++ } while (0 != mali_mem_page_table_page_pool.count); ++} + -+ for (i = 0; i < kbdev->gpu_props.num_job_slots; ++i) { -+ INIT_LIST_HEAD(&jsdd->ctx_list_pullable[i]); -+ INIT_LIST_HEAD(&jsdd->ctx_list_unpullable[i]); -+ } ++_mali_osk_errcode_t mali_memory_core_resource_os_memory(u32 size) ++{ ++ mali_mem_os_allocator.allocation_limit = size; + -+ return 0; ++ MALI_SUCCESS; +} + -+void kbasep_js_devdata_halt(struct kbase_device *kbdev) ++u32 mali_mem_os_stat(void) +{ -+ CSTD_UNUSED(kbdev); ++ return atomic_read(&mali_mem_os_allocator.allocated_pages) * _MALI_OSK_MALI_PAGE_SIZE; +} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h +new file mode 100755 +index 000000000..8c9b35d0b +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h +@@ -0,0 +1,54 @@ ++/* ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+void kbasep_js_devdata_term(struct kbase_device *kbdev) -+{ -+ struct kbasep_js_device_data *js_devdata; -+ s8 zero_ctx_attr_ref_count[KBASEP_JS_CTX_ATTR_COUNT] = { 0, }; ++#ifndef __MALI_MEMORY_OS_ALLOC_H__ ++#define __MALI_MEMORY_OS_ALLOC_H__ + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++#include "mali_osk.h" ++#include "mali_memory_types.h" + -+ js_devdata = &kbdev->js_data; + -+ /* The caller must de-register all contexts before calling this -+ */ -+ KBASE_DEBUG_ASSERT(js_devdata->nr_all_contexts_running == 0); -+ KBASE_DEBUG_ASSERT(memcmp( -+ js_devdata->runpool_irq.ctx_attr_ref_count, -+ zero_ctx_attr_ref_count, -+ sizeof(zero_ctx_attr_ref_count)) == 0); -+ CSTD_UNUSED(zero_ctx_attr_ref_count); -+} ++/** @brief Release Mali OS memory ++ * ++ * The session memory_lock must be held when calling this function. ++ * ++ * @param mem_bkend Pointer to the mali_mem_backend to release ++ */ ++u32 mali_mem_os_release(mali_mem_backend *mem_bkend); + -+int kbasep_js_kctx_init(struct kbase_context * const kctx) -+{ -+ struct kbase_device *kbdev; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ int i, j; ++_mali_osk_errcode_t mali_mem_os_get_table_page(mali_dma_addr *phys, mali_io_address *mapping); + -+ KBASE_DEBUG_ASSERT(kctx != NULL); ++void mali_mem_os_release_table_page(mali_dma_addr phys, void *virt); + -+ kbdev = kctx->kbdev; -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++_mali_osk_errcode_t mali_mem_os_init(void); + -+ for (i = 0; i < BASE_JM_MAX_NR_SLOTS; ++i) -+ INIT_LIST_HEAD(&kctx->jctx.sched_info.ctx.ctx_list_entry[i]); ++void mali_mem_os_term(void); + -+ js_kctx_info = &kctx->jctx.sched_info; ++u32 mali_mem_os_stat(void); + -+ js_kctx_info->ctx.nr_jobs = 0; -+ kbase_ctx_flag_clear(kctx, KCTX_SCHEDULED); -+ kbase_ctx_flag_clear(kctx, KCTX_DYING); -+ memset(js_kctx_info->ctx.ctx_attr_ref_count, 0, -+ sizeof(js_kctx_info->ctx.ctx_attr_ref_count)); ++void mali_mem_os_free_page_node(struct mali_page_node *m_page); + -+ /* Initially, the context is disabled from submission until the create -+ * flags are set */ -+ kbase_ctx_flag_set(kctx, KCTX_SUBMIT_DISABLED); ++int mali_mem_os_alloc_pages(mali_mem_os_mem *os_mem, u32 size); + -+ /* On error, we could continue on: providing none of the below resources -+ * rely on the ones above */ -+ mutex_init(&js_kctx_info->ctx.jsctx_mutex); ++u32 mali_mem_os_free(struct list_head *os_pages, u32 pages_count, mali_bool cow_flag); + -+ init_waitqueue_head(&js_kctx_info->ctx.is_scheduled_wait); ++_mali_osk_errcode_t mali_mem_os_put_page(struct page *page); + -+ for (i = 0; i < KBASE_JS_ATOM_SCHED_PRIO_COUNT; i++) { -+ for (j = 0; j < BASE_JM_MAX_NR_SLOTS; j++) { -+ INIT_LIST_HEAD(&kctx->jsctx_queue[i][j].x_dep_head); -+ kctx->jsctx_queue[i][j].runnable_tree = RB_ROOT; -+ } -+ } ++_mali_osk_errcode_t mali_mem_os_resize_pages(mali_mem_os_mem *mem_from, mali_mem_os_mem *mem_to, u32 start_page, u32 page_count); + -+ return 0; -+} ++_mali_osk_errcode_t mali_mem_os_mali_map(mali_mem_os_mem *os_mem, struct mali_session_data *session, u32 vaddr, u32 start_page, u32 mapping_pgae_num, u32 props); + -+void kbasep_js_kctx_term(struct kbase_context *kctx) -+{ -+ struct kbase_device *kbdev; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ int js; -+ bool update_ctx_count = false; ++void mali_mem_os_mali_unmap(mali_mem_allocation *alloc); + -+ KBASE_DEBUG_ASSERT(kctx != NULL); ++int mali_mem_os_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma); + -+ kbdev = kctx->kbdev; -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++_mali_osk_errcode_t mali_mem_os_resize_cpu_map_locked(mali_mem_backend *mem_bkend, struct vm_area_struct *vma, unsigned long start_vaddr, u32 mappig_size); + -+ js_kctx_info = &kctx->jctx.sched_info; ++#endif /* __MALI_MEMORY_OS_ALLOC_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c +new file mode 100755 +index 000000000..63506bfbe +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c +@@ -0,0 +1,170 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ /* The caller must de-register all jobs before calling this */ -+ KBASE_DEBUG_ASSERT(!kbase_ctx_flag(kctx, KCTX_SCHEDULED)); -+ KBASE_DEBUG_ASSERT(js_kctx_info->ctx.nr_jobs == 0); ++#include "mali_kernel_common.h" ++#include "mali_memory.h" ++#include "mali_memory_secure.h" ++#include "mali_osk.h" ++#include ++#include ++#include ++#include + -+ mutex_lock(&kbdev->js_data.queue_mutex); -+ mutex_lock(&kctx->jctx.sched_info.ctx.jsctx_mutex); ++_mali_osk_errcode_t mali_mem_secure_attach_dma_buf(mali_mem_secure *secure_mem, u32 size, int mem_fd) ++{ ++ struct dma_buf *buf; ++ MALI_DEBUG_ASSERT_POINTER(secure_mem); + -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) -+ list_del_init(&kctx->jctx.sched_info.ctx.ctx_list_entry[js]); ++ /* get dma buffer */ ++ buf = dma_buf_get(mem_fd); ++ if (IS_ERR_OR_NULL(buf)) { ++ MALI_DEBUG_PRINT_ERROR(("Failed to get dma buf!\n")); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ if (kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)) { -+ WARN_ON(atomic_read(&kbdev->js_data.nr_contexts_runnable) <= 0); -+ atomic_dec(&kbdev->js_data.nr_contexts_runnable); -+ update_ctx_count = true; -+ kbase_ctx_flag_clear(kctx, KCTX_RUNNABLE_REF); ++ if (size != buf->size) { ++ MALI_DEBUG_PRINT_ERROR(("The secure mem size not match to the dma buf size!\n")); ++ goto failed_alloc_mem; + } + -+ mutex_unlock(&kctx->jctx.sched_info.ctx.jsctx_mutex); -+ mutex_unlock(&kbdev->js_data.queue_mutex); ++ secure_mem->buf = buf; ++ secure_mem->attachment = dma_buf_attach(secure_mem->buf, &mali_platform_device->dev); ++ if (NULL == secure_mem->attachment) { ++ MALI_DEBUG_PRINT_ERROR(("Failed to get dma buf attachment!\n")); ++ goto failed_dma_attach; ++ } + -+ if (update_ctx_count) { -+ mutex_lock(&kbdev->js_data.runpool_mutex); -+ kbase_backend_ctx_count_changed(kbdev); -+ mutex_unlock(&kbdev->js_data.runpool_mutex); ++ secure_mem->sgt = dma_buf_map_attachment(secure_mem->attachment, DMA_BIDIRECTIONAL); ++ if (IS_ERR_OR_NULL(secure_mem->sgt)) { ++ MALI_DEBUG_PRINT_ERROR(("Failed to map dma buf attachment\n")); ++ goto failed_dma_map; + } ++ ++ secure_mem->count = size / MALI_MMU_PAGE_SIZE; ++ ++ return _MALI_OSK_ERR_OK; ++ ++failed_dma_map: ++ dma_buf_detach(secure_mem->buf, secure_mem->attachment); ++failed_dma_attach: ++failed_alloc_mem: ++ dma_buf_put(buf); ++ return _MALI_OSK_ERR_FAULT; +} + -+/** -+ * kbase_js_ctx_list_add_pullable_nolock - Variant of -+ * kbase_jd_ctx_list_add_pullable() -+ * where the caller must hold -+ * hwaccess_lock -+ * @kbdev: Device pointer -+ * @kctx: Context to add to queue -+ * @js: Job slot to use -+ * -+ * Caller must hold hwaccess_lock -+ * -+ * Return: true if caller should call kbase_backend_ctx_count_changed() -+ */ -+static bool kbase_js_ctx_list_add_pullable_nolock(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js) ++_mali_osk_errcode_t mali_mem_secure_mali_map(mali_mem_secure *secure_mem, struct mali_session_data *session, u32 vaddr, u32 props) +{ -+ bool ret = false; ++ struct mali_page_directory *pagedir; ++ struct scatterlist *sg; ++ u32 virt = vaddr; ++ u32 prop = props; ++ int i; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ MALI_DEBUG_ASSERT_POINTER(secure_mem); ++ MALI_DEBUG_ASSERT_POINTER(secure_mem->sgt); ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ if (!list_empty(&kctx->jctx.sched_info.ctx.ctx_list_entry[js])) -+ list_del_init(&kctx->jctx.sched_info.ctx.ctx_list_entry[js]); ++ pagedir = session->page_directory; + -+ list_add_tail(&kctx->jctx.sched_info.ctx.ctx_list_entry[js], -+ &kbdev->js_data.ctx_list_pullable[js]); ++ for_each_sg(secure_mem->sgt->sgl, sg, secure_mem->sgt->nents, i) { ++ u32 size = sg_dma_len(sg); ++ dma_addr_t phys = sg_dma_address(sg); + -+ if (!kctx->slots_pullable) { -+ kbdev->js_data.nr_contexts_pullable++; -+ ret = true; -+ if (!atomic_read(&kctx->atoms_pulled)) { -+ WARN_ON(kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); -+ kbase_ctx_flag_set(kctx, KCTX_RUNNABLE_REF); -+ atomic_inc(&kbdev->js_data.nr_contexts_runnable); -+ } ++ /* sg must be page aligned. */ ++ MALI_DEBUG_ASSERT(0 == size % MALI_MMU_PAGE_SIZE); ++ MALI_DEBUG_ASSERT(0 == (phys & ~(uintptr_t)0xFFFFFFFF)); ++ ++ mali_mmu_pagedir_update(pagedir, virt, phys, size, prop); ++ ++ MALI_DEBUG_PRINT(3, ("The secure mem physical address: 0x%x gpu virtual address: 0x%x! \n", phys, virt)); ++ virt += size; + } -+ kctx->slots_pullable |= (1 << js); + -+ return ret; ++ return _MALI_OSK_ERR_OK; +} + -+/** -+ * kbase_js_ctx_list_add_pullable_head_nolock - Variant of -+ * kbase_js_ctx_list_add_pullable_head() -+ * where the caller must hold -+ * hwaccess_lock -+ * @kbdev: Device pointer -+ * @kctx: Context to add to queue -+ * @js: Job slot to use -+ * -+ * Caller must hold hwaccess_lock -+ * -+ * Return: true if caller should call kbase_backend_ctx_count_changed() -+ */ -+static bool kbase_js_ctx_list_add_pullable_head_nolock( -+ struct kbase_device *kbdev, struct kbase_context *kctx, int js) ++void mali_mem_secure_mali_unmap(mali_mem_allocation *alloc) +{ -+ bool ret = false; ++ struct mali_session_data *session; ++ MALI_DEBUG_ASSERT_POINTER(alloc); ++ session = alloc->session; ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ mali_session_memory_lock(session); ++ mali_mem_mali_map_free(session, alloc->psize, alloc->mali_vma_node.vm_node.start, ++ alloc->flags); ++ mali_session_memory_unlock(session); ++} + -+ if (!list_empty(&kctx->jctx.sched_info.ctx.ctx_list_entry[js])) -+ list_del_init(&kctx->jctx.sched_info.ctx.ctx_list_entry[js]); + -+ list_add(&kctx->jctx.sched_info.ctx.ctx_list_entry[js], -+ &kbdev->js_data.ctx_list_pullable[js]); ++int mali_mem_secure_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma) ++{ + -+ if (!kctx->slots_pullable) { -+ kbdev->js_data.nr_contexts_pullable++; -+ ret = true; -+ if (!atomic_read(&kctx->atoms_pulled)) { -+ WARN_ON(kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); -+ kbase_ctx_flag_set(kctx, KCTX_RUNNABLE_REF); -+ atomic_inc(&kbdev->js_data.nr_contexts_runnable); ++ int ret = 0; ++ struct scatterlist *sg; ++ mali_mem_secure *secure_mem = &mem_bkend->secure_mem; ++ unsigned long addr = vma->vm_start; ++ int i; ++ ++ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_SECURE); ++ ++ for_each_sg(secure_mem->sgt->sgl, sg, secure_mem->sgt->nents, i) { ++ phys_addr_t phys; ++ dma_addr_t dev_addr; ++ u32 size, j; ++ dev_addr = sg_dma_address(sg); ++#if defined(CONFIG_ARM64) ||LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) ++ phys = dma_to_phys(&mali_platform_device->dev, dev_addr); ++#else ++ phys = page_to_phys(pfn_to_page(dma_to_pfn(&mali_platform_device->dev, dev_addr))); ++#endif ++ size = sg_dma_len(sg); ++ MALI_DEBUG_ASSERT(0 == size % _MALI_OSK_MALI_PAGE_SIZE); ++ ++ for (j = 0; j < size / _MALI_OSK_MALI_PAGE_SIZE; j++) { ++ ret = vmf_insert_pfn(vma, addr, PFN_DOWN(phys)); ++ ++ if (unlikely(VM_FAULT_NOPAGE != ret)) { ++ return -EFAULT; ++ } ++ addr += _MALI_OSK_MALI_PAGE_SIZE; ++ phys += _MALI_OSK_MALI_PAGE_SIZE; ++ ++ MALI_DEBUG_PRINT(3, ("The secure mem physical address: 0x%x , cpu virtual address: 0x%x! \n", phys, addr)); + } + } -+ kctx->slots_pullable |= (1 << js); -+ + return ret; +} + -+/** -+ * kbase_js_ctx_list_add_pullable_head - Add context to the head of the -+ * per-slot pullable context queue -+ * @kbdev: Device pointer -+ * @kctx: Context to add to queue -+ * @js: Job slot to use -+ * -+ * If the context is on either the pullable or unpullable queues, then it is -+ * removed before being added to the head. -+ * -+ * This function should be used when a context has been scheduled, but no jobs -+ * can currently be pulled from it. -+ * -+ * Return: true if caller should call kbase_backend_ctx_count_changed() -+ */ -+static bool kbase_js_ctx_list_add_pullable_head(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js) ++u32 mali_mem_secure_release(mali_mem_backend *mem_bkend) +{ -+ bool ret; -+ unsigned long flags; ++ struct mali_mem_secure *mem; ++ mali_mem_allocation *alloc = mem_bkend->mali_allocation; ++ u32 free_pages_nr = 0; ++ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_SECURE); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ ret = kbase_js_ctx_list_add_pullable_head_nolock(kbdev, kctx, js); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mem = &mem_bkend->secure_mem; ++ MALI_DEBUG_ASSERT_POINTER(mem->attachment); ++ MALI_DEBUG_ASSERT_POINTER(mem->buf); ++ MALI_DEBUG_ASSERT_POINTER(mem->sgt); ++ /* Unmap the memory from the mali virtual address space. */ ++ mali_mem_secure_mali_unmap(alloc); ++ mutex_lock(&mem_bkend->mutex); ++ dma_buf_unmap_attachment(mem->attachment, mem->sgt, DMA_BIDIRECTIONAL); ++ dma_buf_detach(mem->buf, mem->attachment); ++ dma_buf_put(mem->buf); ++ mutex_unlock(&mem_bkend->mutex); + -+ return ret; ++ free_pages_nr = mem->count; ++ ++ return free_pages_nr; +} + -+/** -+ * kbase_js_ctx_list_add_unpullable_nolock - Add context to the tail of the -+ * per-slot unpullable context queue -+ * @kbdev: Device pointer -+ * @kctx: Context to add to queue -+ * @js: Job slot to use -+ * -+ * The context must already be on the per-slot pullable queue. It will be -+ * removed from the pullable queue before being added to the unpullable queue. -+ * -+ * This function should be used when a context has been pulled from, and there -+ * are no jobs remaining on the specified slot. -+ * -+ * Caller must hold hwaccess_lock -+ * -+ * Return: true if caller should call kbase_backend_ctx_count_changed() ++ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h +new file mode 100755 +index 000000000..48691d479 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h +@@ -0,0 +1,30 @@ ++/* ++ * Copyright (C) 2010, 2013, 2015-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+static bool kbase_js_ctx_list_add_unpullable_nolock(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js) -+{ -+ bool ret = false; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++#ifndef __MALI_MEMORY_SECURE_H__ ++#define __MALI_MEMORY_SECURE_H__ + -+ list_move_tail(&kctx->jctx.sched_info.ctx.ctx_list_entry[js], -+ &kbdev->js_data.ctx_list_unpullable[js]); ++#include "mali_session.h" ++#include "mali_memory.h" ++#include + -+ if (kctx->slots_pullable == (1 << js)) { -+ kbdev->js_data.nr_contexts_pullable--; -+ ret = true; -+ if (!atomic_read(&kctx->atoms_pulled)) { -+ WARN_ON(!kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); -+ kbase_ctx_flag_clear(kctx, KCTX_RUNNABLE_REF); -+ atomic_dec(&kbdev->js_data.nr_contexts_runnable); -+ } -+ } -+ kctx->slots_pullable &= ~(1 << js); ++#include "mali_memory_types.h" + -+ return ret; -+} ++_mali_osk_errcode_t mali_mem_secure_attach_dma_buf(mali_mem_secure *secure_mem, u32 size, int mem_fd); + -+/** -+ * kbase_js_ctx_list_remove_nolock - Remove context from the per-slot pullable -+ * or unpullable context queues -+ * @kbdev: Device pointer -+ * @kctx: Context to remove from queue -+ * @js: Job slot to use -+ * -+ * The context must already be on one of the queues. -+ * -+ * This function should be used when a context has no jobs on the GPU, and no -+ * jobs remaining for the specified slot. -+ * -+ * Caller must hold hwaccess_lock -+ * -+ * Return: true if caller should call kbase_backend_ctx_count_changed() ++_mali_osk_errcode_t mali_mem_secure_mali_map(mali_mem_secure *secure_mem, struct mali_session_data *session, u32 vaddr, u32 props); ++ ++void mali_mem_secure_mali_unmap(mali_mem_allocation *alloc); ++ ++int mali_mem_secure_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma); ++ ++u32 mali_mem_secure_release(mali_mem_backend *mem_bkend); ++ ++#endif /* __MALI_MEMORY_SECURE_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c +new file mode 100755 +index 000000000..d682785b9 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c +@@ -0,0 +1,943 @@ ++/* ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+static bool kbase_js_ctx_list_remove_nolock(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js) -+{ -+ bool ret = false; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "mali_osk.h" ++#include "mali_osk_mali.h" ++#include "mali_memory.h" ++#include "mali_memory_manager.h" ++#include "mali_memory_virtual.h" ++#include "mali_memory_cow.h" ++#include "mali_ukk.h" ++#include "mali_kernel_utilization.h" ++#include "mali_memory_swap_alloc.h" + -+ WARN_ON(list_empty(&kctx->jctx.sched_info.ctx.ctx_list_entry[js])); + -+ list_del_init(&kctx->jctx.sched_info.ctx.ctx_list_entry[js]); ++static struct _mali_osk_bitmap idx_mgr; ++static struct file *global_swap_file; ++static struct address_space *global_swap_space; ++static _mali_osk_wq_work_t *mali_mem_swap_out_workq = NULL; ++static u32 mem_backend_swapped_pool_size; ++#ifdef MALI_MEM_SWAP_TRACKING ++static u32 mem_backend_swapped_unlock_size; ++#endif ++/* Lock order: mem_backend_swapped_pool_lock > each memory backend's mutex lock. ++ * This lock used to protect mem_backend_swapped_pool_size and mem_backend_swapped_pool. */ ++static struct mutex mem_backend_swapped_pool_lock; ++static struct list_head mem_backend_swapped_pool; + -+ if (kctx->slots_pullable == (1 << js)) { -+ kbdev->js_data.nr_contexts_pullable--; -+ ret = true; -+ if (!atomic_read(&kctx->atoms_pulled)) { -+ WARN_ON(!kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); -+ kbase_ctx_flag_clear(kctx, KCTX_RUNNABLE_REF); -+ atomic_dec(&kbdev->js_data.nr_contexts_runnable); -+ } -+ } -+ kctx->slots_pullable &= ~(1 << js); ++extern struct mali_mem_os_allocator mali_mem_os_allocator; + -+ return ret; -+} ++#define MALI_SWAP_LOW_MEM_DEFAULT_VALUE (60*1024*1024) ++#define MALI_SWAP_INVALIDATE_MALI_ADDRESS (0) /* Used to mark the given memory cookie is invalidate. */ ++#define MALI_SWAP_GLOBAL_SWAP_FILE_SIZE (0xFFFFFFFF) ++#define MALI_SWAP_GLOBAL_SWAP_FILE_INDEX \ ++ ((MALI_SWAP_GLOBAL_SWAP_FILE_SIZE) >> PAGE_SHIFT) ++#define MALI_SWAP_GLOBAL_SWAP_FILE_INDEX_RESERVE (1 << 15) /* Reserved for CoW nonlinear swap backend memory, the space size is 128MB. */ ++ ++unsigned int mali_mem_swap_out_threshold_value = MALI_SWAP_LOW_MEM_DEFAULT_VALUE; + +/** -+ * kbase_js_ctx_list_pop_head_nolock - Variant of kbase_js_ctx_list_pop_head() -+ * where the caller must hold -+ * hwaccess_lock -+ * @kbdev: Device pointer -+ * @js: Job slot to use -+ * -+ * Caller must hold hwaccess_lock -+ * -+ * Return: Context to use for specified slot. -+ * NULL if no contexts present for specified slot ++ * We have two situations to do shrinking things, one is we met low GPU utilization which shows GPU needn't touch too ++ * swappable backends in short time, and the other one is we add new swappable backends, the total pool size exceed ++ * the threshold value of the swapped pool size. + */ -+static struct kbase_context *kbase_js_ctx_list_pop_head_nolock( -+ struct kbase_device *kbdev, -+ int js) ++typedef enum { ++ MALI_MEM_SWAP_SHRINK_WITH_LOW_UTILIZATION = 100, ++ MALI_MEM_SWAP_SHRINK_FOR_ADDING_NEW_BACKENDS = 257, ++} _mali_mem_swap_pool_shrink_type_t; ++ ++static void mali_mem_swap_swapped_bkend_pool_check_for_low_utilization(void *arg); ++ ++_mali_osk_errcode_t mali_mem_swap_init(void) +{ -+ struct kbase_context *kctx; ++ gfp_t flags = __GFP_NORETRY | __GFP_NOWARN; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ if (_MALI_OSK_ERR_OK != _mali_osk_bitmap_init(&idx_mgr, MALI_SWAP_GLOBAL_SWAP_FILE_INDEX, MALI_SWAP_GLOBAL_SWAP_FILE_INDEX_RESERVE)) { ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ if (list_empty(&kbdev->js_data.ctx_list_pullable[js])) -+ return NULL; ++ global_swap_file = shmem_file_setup("mali_swap", MALI_SWAP_GLOBAL_SWAP_FILE_SIZE, VM_NORESERVE); ++ if (IS_ERR(global_swap_file)) { ++ _mali_osk_bitmap_term(&idx_mgr); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ kctx = list_entry(kbdev->js_data.ctx_list_pullable[js].next, -+ struct kbase_context, -+ jctx.sched_info.ctx.ctx_list_entry[js]); ++ global_swap_space = global_swap_file->f_path.dentry->d_inode->i_mapping; + -+ list_del_init(&kctx->jctx.sched_info.ctx.ctx_list_entry[js]); ++ mali_mem_swap_out_workq = _mali_osk_wq_create_work(mali_mem_swap_swapped_bkend_pool_check_for_low_utilization, NULL); ++ if (NULL == mali_mem_swap_out_workq) { ++ _mali_osk_bitmap_term(&idx_mgr); ++ fput(global_swap_file); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ return kctx; -+} ++#if defined(CONFIG_ARM) && !defined(CONFIG_ARM_LPAE) ++ flags |= GFP_HIGHUSER; ++#else ++#ifdef CONFIG_ZONE_DMA32 ++ flags |= GFP_DMA32; ++#else ++#ifdef CONFIG_ZONE_DMA ++ flags |= GFP_DMA; ++#else ++ /* arm64 utgard only work on < 4G, but the kernel ++ * didn't provide method to allocte memory < 4G ++ */ ++ MALI_DEBUG_ASSERT(0); ++#endif ++#endif ++#endif + -+/** -+ * kbase_js_ctx_list_pop_head - Pop the head context off the per-slot pullable -+ * queue. -+ * @kbdev: Device pointer -+ * @js: Job slot to use -+ * -+ * Return: Context to use for specified slot. -+ * NULL if no contexts present for specified slot -+ */ -+static struct kbase_context *kbase_js_ctx_list_pop_head( -+ struct kbase_device *kbdev, int js) -+{ -+ struct kbase_context *kctx; -+ unsigned long flags; ++ /* When we use shmem_read_mapping_page to allocate/swap-in, it will ++ * use these flags to allocate new page if need.*/ ++ mapping_set_gfp_mask(global_swap_space, flags); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kctx = kbase_js_ctx_list_pop_head_nolock(kbdev, js); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mem_backend_swapped_pool_size = 0; ++#ifdef MALI_MEM_SWAP_TRACKING ++ mem_backend_swapped_unlock_size = 0; ++#endif ++ mutex_init(&mem_backend_swapped_pool_lock); ++ INIT_LIST_HEAD(&mem_backend_swapped_pool); + -+ return kctx; ++ MALI_DEBUG_PRINT(2, ("Mali SWAP: Swap out threshold vaule is %uM\n", mali_mem_swap_out_threshold_value >> 20)); ++ ++ return _MALI_OSK_ERR_OK; +} + -+/** -+ * kbase_js_ctx_pullable - Return if a context can be pulled from on the -+ * specified slot -+ * @kctx: Context pointer -+ * @js: Job slot to use -+ * @is_scheduled: true if the context is currently scheduled -+ * -+ * Caller must hold hwaccess_lock -+ * -+ * Return: true if context can be pulled from on specified slot -+ * false otherwise -+ */ -+static bool kbase_js_ctx_pullable(struct kbase_context *kctx, int js, -+ bool is_scheduled) ++void mali_mem_swap_term(void) +{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbase_jd_atom *katom; ++ _mali_osk_bitmap_term(&idx_mgr); + -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ fput(global_swap_file); + -+ js_devdata = &kctx->kbdev->js_data; ++ _mali_osk_wq_delete_work(mali_mem_swap_out_workq); + -+ if (is_scheduled) { -+ if (!kbasep_js_is_submit_allowed(js_devdata, kctx)) -+ return false; -+ } -+ katom = jsctx_rb_peek(kctx, js); -+ if (!katom) -+ return false; /* No pullable atoms */ -+ if (kctx->blocked_js[js][katom->sched_priority]) -+ return false; -+ if (atomic_read(&katom->blocked)) -+ return false; /* next atom blocked */ -+ if (katom->atom_flags & KBASE_KATOM_FLAG_X_DEP_BLOCKED) { -+ if (katom->x_pre_dep->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB || -+ katom->x_pre_dep->will_fail_event_code) -+ return false; -+ if ((katom->atom_flags & KBASE_KATOM_FLAG_FAIL_BLOCKER) && -+ kbase_backend_nr_atoms_on_slot(kctx->kbdev, js)) -+ return false; -+ } ++ MALI_DEBUG_ASSERT(list_empty(&mem_backend_swapped_pool)); ++ MALI_DEBUG_ASSERT(0 == mem_backend_swapped_pool_size); + -+ return true; ++ return; +} + -+static bool kbase_js_dep_validate(struct kbase_context *kctx, -+ struct kbase_jd_atom *katom) ++struct file *mali_mem_swap_get_global_swap_file(void) +{ -+ struct kbase_device *kbdev = kctx->kbdev; -+ bool ret = true; -+ bool has_dep = false, has_x_dep = false; -+ int js = kbase_js_get_slot(kbdev, katom); -+ int prio = katom->sched_priority; -+ int i; -+ -+ for (i = 0; i < 2; i++) { -+ struct kbase_jd_atom *dep_atom = katom->dep[i].atom; ++ return global_swap_file; ++} + -+ if (dep_atom) { -+ int dep_js = kbase_js_get_slot(kbdev, dep_atom); -+ int dep_prio = dep_atom->sched_priority; ++/* Judge if swappable backend in swapped pool. */ ++static mali_bool mali_memory_swap_backend_in_swapped_pool(mali_mem_backend *mem_bkend) ++{ ++ MALI_DEBUG_ASSERT_POINTER(mem_bkend); + -+ /* Dependent atom must already have been submitted */ -+ if (!(dep_atom->atom_flags & -+ KBASE_KATOM_FLAG_JSCTX_IN_TREE)) { -+ ret = false; -+ break; -+ } ++ return !list_empty(&mem_bkend->list); ++} + -+ /* Dependencies with different priorities can't -+ be represented in the ringbuffer */ -+ if (prio != dep_prio) { -+ ret = false; -+ break; -+ } ++void mali_memory_swap_list_backend_delete(mali_mem_backend *mem_bkend) ++{ ++ MALI_DEBUG_ASSERT_POINTER(mem_bkend); + -+ if (js == dep_js) { -+ /* Only one same-slot dependency can be -+ * represented in the ringbuffer */ -+ if (has_dep) { -+ ret = false; -+ break; -+ } -+ /* Each dependee atom can only have one -+ * same-slot dependency */ -+ if (dep_atom->post_dep) { -+ ret = false; -+ break; -+ } -+ has_dep = true; -+ } else { -+ /* Only one cross-slot dependency can be -+ * represented in the ringbuffer */ -+ if (has_x_dep) { -+ ret = false; -+ break; -+ } -+ /* Each dependee atom can only have one -+ * cross-slot dependency */ -+ if (dep_atom->x_post_dep) { -+ ret = false; -+ break; -+ } -+ /* The dependee atom can not already be in the -+ * HW access ringbuffer */ -+ if (dep_atom->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { -+ ret = false; -+ break; -+ } -+ /* The dependee atom can not already have -+ * completed */ -+ if (dep_atom->status != -+ KBASE_JD_ATOM_STATE_IN_JS) { -+ ret = false; -+ break; -+ } -+ /* Cross-slot dependencies must not violate -+ * PRLAM-8987 affinity restrictions */ -+ if (kbase_hw_has_issue(kbdev, -+ BASE_HW_ISSUE_8987) && -+ (js == 2 || dep_js == 2)) { -+ ret = false; -+ break; -+ } -+ has_x_dep = true; -+ } ++ mutex_lock(&mem_backend_swapped_pool_lock); ++ mutex_lock(&mem_bkend->mutex); + -+ /* Dependency can be represented in ringbuffers */ -+ } ++ if (MALI_FALSE == mali_memory_swap_backend_in_swapped_pool(mem_bkend)) { ++ mutex_unlock(&mem_bkend->mutex); ++ mutex_unlock(&mem_backend_swapped_pool_lock); ++ return; + } + -+ /* If dependencies can be represented by ringbuffer then clear them from -+ * atom structure */ -+ if (ret) { -+ for (i = 0; i < 2; i++) { -+ struct kbase_jd_atom *dep_atom = katom->dep[i].atom; -+ -+ if (dep_atom) { -+ int dep_js = kbase_js_get_slot(kbdev, dep_atom); ++ MALI_DEBUG_ASSERT(!list_empty(&mem_bkend->list)); + -+ if ((js != dep_js) && -+ (dep_atom->status != -+ KBASE_JD_ATOM_STATE_COMPLETED) -+ && (dep_atom->status != -+ KBASE_JD_ATOM_STATE_HW_COMPLETED) -+ && (dep_atom->status != -+ KBASE_JD_ATOM_STATE_UNUSED)) { ++ list_del_init(&mem_bkend->list); + -+ katom->atom_flags |= -+ KBASE_KATOM_FLAG_X_DEP_BLOCKED; -+ katom->x_pre_dep = dep_atom; -+ dep_atom->x_post_dep = katom; -+ if (kbase_jd_katom_dep_type( -+ &katom->dep[i]) == -+ BASE_JD_DEP_TYPE_DATA) -+ katom->atom_flags |= -+ KBASE_KATOM_FLAG_FAIL_BLOCKER; -+ } -+ if ((kbase_jd_katom_dep_type(&katom->dep[i]) -+ == BASE_JD_DEP_TYPE_DATA) && -+ (js == dep_js)) { -+ katom->pre_dep = dep_atom; -+ dep_atom->post_dep = katom; -+ } ++ mutex_unlock(&mem_bkend->mutex); + -+ list_del(&katom->dep_item[i]); -+ kbase_jd_katom_dep_clear(&katom->dep[i]); -+ } -+ } -+ } ++ mem_backend_swapped_pool_size -= mem_bkend->size; + -+ return ret; ++ mutex_unlock(&mem_backend_swapped_pool_lock); +} + -+bool kbasep_js_add_job(struct kbase_context *kctx, -+ struct kbase_jd_atom *atom) ++static void mali_mem_swap_out_page_node(mali_page_node *page_node) +{ -+ unsigned long flags; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ struct kbase_device *kbdev; -+ struct kbasep_js_device_data *js_devdata; -+ -+ bool enqueue_required = false; -+ bool timer_sync = false; -+ -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ KBASE_DEBUG_ASSERT(atom != NULL); -+ lockdep_assert_held(&kctx->jctx.lock); ++ MALI_DEBUG_ASSERT(page_node); + -+ kbdev = kctx->kbdev; -+ js_devdata = &kbdev->js_data; -+ js_kctx_info = &kctx->jctx.sched_info; ++ dma_unmap_page(&mali_platform_device->dev, page_node->swap_it->dma_addr, ++ _MALI_OSK_MALI_PAGE_SIZE, DMA_TO_DEVICE); ++ set_page_dirty(page_node->swap_it->page); ++ put_page(page_node->swap_it->page); ++} + -+ mutex_lock(&js_devdata->queue_mutex); -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++void mali_mem_swap_unlock_single_mem_backend(mali_mem_backend *mem_bkend) ++{ ++ mali_page_node *m_page; + -+ /* -+ * Begin Runpool transaction -+ */ -+ mutex_lock(&js_devdata->runpool_mutex); ++ MALI_DEBUG_ASSERT(1 == mutex_is_locked(&mem_bkend->mutex)); + -+ /* Refcount ctx.nr_jobs */ -+ KBASE_DEBUG_ASSERT(js_kctx_info->ctx.nr_jobs < U32_MAX); -+ ++(js_kctx_info->ctx.nr_jobs); ++ if (MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN == (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN)) { ++ return; ++ } + -+ /* Setup any scheduling information */ -+ kbasep_js_clear_job_retry_submit(atom); ++ mem_bkend->flags |= MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN; + -+ /* Lock for state available during IRQ */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ list_for_each_entry(m_page, &mem_bkend->swap_mem.pages, list) { ++ mali_mem_swap_out_page_node(m_page); ++ } + -+ if (!kbase_js_dep_validate(kctx, atom)) { -+ /* Dependencies could not be represented */ -+ --(js_kctx_info->ctx.nr_jobs); ++ return; ++} + -+ /* Setting atom status back to queued as it still has unresolved -+ * dependencies */ -+ atom->status = KBASE_JD_ATOM_STATE_QUEUED; ++static void mali_mem_swap_unlock_partial_locked_mem_backend(mali_mem_backend *mem_bkend, mali_page_node *page_node) ++{ ++ mali_page_node *m_page; + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&js_devdata->runpool_mutex); ++ MALI_DEBUG_ASSERT(1 == mutex_is_locked(&mem_bkend->mutex)); + -+ goto out_unlock; ++ list_for_each_entry(m_page, &mem_bkend->swap_mem.pages, list) { ++ if (m_page == page_node) { ++ break; ++ } ++ mali_mem_swap_out_page_node(m_page); + } ++} + -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(atom, TL_ATOM_STATE_READY); -+ KBASE_TIMELINE_ATOM_READY(kctx, kbase_jd_atom_id(kctx, atom)); ++static void mali_mem_swap_swapped_bkend_pool_shrink(_mali_mem_swap_pool_shrink_type_t shrink_type) ++{ ++ mali_mem_backend *bkend, *tmp_bkend; ++ long system_free_size; ++ u32 last_gpu_utilization, gpu_utilization_threshold_value, temp_swap_out_threshold_value; + -+ enqueue_required = kbase_js_dep_resolved_submit(kctx, atom); ++ MALI_DEBUG_ASSERT(1 == mutex_is_locked(&mem_backend_swapped_pool_lock)); + -+ KBASE_TRACE_ADD_REFCOUNT(kbdev, JS_ADD_JOB, kctx, atom, atom->jc, -+ kbasep_js_trace_get_refcnt(kbdev, kctx)); ++ if (MALI_MEM_SWAP_SHRINK_WITH_LOW_UTILIZATION == shrink_type) { ++ /** ++ * When we met that system memory is very low and Mali locked swappable memory size is less than ++ * threshold value, and at the same time, GPU load is very low and don't need high performance, ++ * at this condition, we can unlock more swap memory backend from swapped backends pool. ++ */ ++ gpu_utilization_threshold_value = MALI_MEM_SWAP_SHRINK_WITH_LOW_UTILIZATION; ++ temp_swap_out_threshold_value = (mali_mem_swap_out_threshold_value >> 2); ++ } else { ++ /* When we add swappable memory backends to swapped pool, we need to think that we couldn't ++ * hold too much swappable backends in Mali driver, and also we need considering performance. ++ * So there is a balance for swapping out memory backend, we should follow the following conditions: ++ * 1. Total memory size in global mem backend swapped pool is more than the defined threshold value. ++ * 2. System level free memory size is less than the defined threshold value. ++ * 3. Please note that GPU utilization problem isn't considered in this condition. ++ */ ++ gpu_utilization_threshold_value = MALI_MEM_SWAP_SHRINK_FOR_ADDING_NEW_BACKENDS; ++ temp_swap_out_threshold_value = mali_mem_swap_out_threshold_value; ++ } + -+ /* Context Attribute Refcounting */ -+ kbasep_js_ctx_attr_ctx_retain_atom(kbdev, kctx, atom); ++ /* Get system free pages number. */ ++ system_free_size = global_zone_page_state(NR_FREE_PAGES) * PAGE_SIZE; ++ last_gpu_utilization = _mali_ukk_utilization_gp_pp(); + -+ if (enqueue_required) { -+ if (kbase_js_ctx_pullable(kctx, atom->slot_nr, false)) -+ timer_sync = kbase_js_ctx_list_add_pullable_nolock( -+ kbdev, kctx, atom->slot_nr); -+ else -+ timer_sync = kbase_js_ctx_list_add_unpullable_nolock( -+ kbdev, kctx, atom->slot_nr); -+ } -+ /* If this context is active and the atom is the first on its slot, -+ * kick the job manager to attempt to fast-start the atom */ -+ if (enqueue_required && kctx == kbdev->hwaccess.active_kctx) -+ kbase_jm_try_kick(kbdev, 1 << atom->slot_nr); ++ if ((last_gpu_utilization < gpu_utilization_threshold_value) ++ && (system_free_size < mali_mem_swap_out_threshold_value) ++ && (mem_backend_swapped_pool_size > temp_swap_out_threshold_value)) { ++ list_for_each_entry_safe(bkend, tmp_bkend, &mem_backend_swapped_pool, list) { ++ if (mem_backend_swapped_pool_size <= temp_swap_out_threshold_value) { ++ break; ++ } + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ if (timer_sync) -+ kbase_backend_ctx_count_changed(kbdev); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ /* End runpool transaction */ ++ mutex_lock(&bkend->mutex); + -+ if (!kbase_ctx_flag(kctx, KCTX_SCHEDULED)) { -+ if (kbase_ctx_flag(kctx, KCTX_DYING)) { -+ /* A job got added while/after kbase_job_zap_context() -+ * was called on a non-scheduled context (e.g. KDS -+ * dependency resolved). Kill that job by killing the -+ * context. */ -+ kbasep_js_runpool_requeue_or_kill_ctx(kbdev, kctx, -+ false); -+ } else if (js_kctx_info->ctx.nr_jobs == 1) { -+ /* Handle Refcount going from 0 to 1: schedule the -+ * context on the Queue */ -+ KBASE_DEBUG_ASSERT(!kbase_ctx_flag(kctx, KCTX_SCHEDULED)); -+ dev_dbg(kbdev->dev, "JS: Enqueue Context %p", kctx); ++ /* check if backend is in use. */ ++ if (0 < bkend->using_count) { ++ mutex_unlock(&bkend->mutex); ++ continue; ++ } + -+ /* Queue was updated - caller must try to -+ * schedule the head context */ -+ WARN_ON(!enqueue_required); ++ mali_mem_swap_unlock_single_mem_backend(bkend); ++ list_del_init(&bkend->list); ++ mem_backend_swapped_pool_size -= bkend->size; ++#ifdef MALI_MEM_SWAP_TRACKING ++ mem_backend_swapped_unlock_size += bkend->size; ++#endif ++ mutex_unlock(&bkend->mutex); + } + } -+out_unlock: -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); -+ -+ mutex_unlock(&js_devdata->queue_mutex); + -+ return enqueue_required; ++ return; +} + -+void kbasep_js_remove_job(struct kbase_device *kbdev, -+ struct kbase_context *kctx, struct kbase_jd_atom *atom) ++static void mali_mem_swap_swapped_bkend_pool_check_for_low_utilization(void *arg) +{ -+ struct kbasep_js_kctx_info *js_kctx_info; -+ struct kbasep_js_device_data *js_devdata; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ KBASE_DEBUG_ASSERT(atom != NULL); ++ MALI_IGNORE(arg); + -+ js_devdata = &kbdev->js_data; -+ js_kctx_info = &kctx->jctx.sched_info; ++ mutex_lock(&mem_backend_swapped_pool_lock); + -+ KBASE_TRACE_ADD_REFCOUNT(kbdev, JS_REMOVE_JOB, kctx, atom, atom->jc, -+ kbasep_js_trace_get_refcnt(kbdev, kctx)); ++ mali_mem_swap_swapped_bkend_pool_shrink(MALI_MEM_SWAP_SHRINK_WITH_LOW_UTILIZATION); + -+ /* De-refcount ctx.nr_jobs */ -+ KBASE_DEBUG_ASSERT(js_kctx_info->ctx.nr_jobs > 0); -+ --(js_kctx_info->ctx.nr_jobs); ++ mutex_unlock(&mem_backend_swapped_pool_lock); +} + -+bool kbasep_js_remove_cancelled_job(struct kbase_device *kbdev, -+ struct kbase_context *kctx, struct kbase_jd_atom *katom) ++/** ++ * After PP job finished, we add all of swappable memory backend used by this PP ++ * job to the tail of the global swapped pool, and if the total size of swappable memory is more than threshold ++ * value, we also need to shrink the swapped pool start from the head of the list. ++ */ ++void mali_memory_swap_list_backend_add(mali_mem_backend *mem_bkend) +{ -+ unsigned long flags; -+ struct kbasep_js_atom_retained_state katom_retained_state; -+ struct kbasep_js_device_data *js_devdata; -+ bool attr_state_changed; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ KBASE_DEBUG_ASSERT(katom != NULL); ++ mutex_lock(&mem_backend_swapped_pool_lock); ++ mutex_lock(&mem_bkend->mutex); + -+ js_devdata = &kbdev->js_data; ++ if (mali_memory_swap_backend_in_swapped_pool(mem_bkend)) { ++ MALI_DEBUG_ASSERT(!list_empty(&mem_bkend->list)); + -+ kbasep_js_atom_retained_state_copy(&katom_retained_state, katom); -+ kbasep_js_remove_job(kbdev, kctx, katom); -+ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ list_del_init(&mem_bkend->list); ++ list_add_tail(&mem_bkend->list, &mem_backend_swapped_pool); ++ mutex_unlock(&mem_bkend->mutex); ++ mutex_unlock(&mem_backend_swapped_pool_lock); ++ return; ++ } + -+ /* The atom has 'finished' (will not be re-run), so no need to call -+ * kbasep_js_has_atom_finished(). -+ * -+ * This is because it returns false for soft-stopped atoms, but we -+ * want to override that, because we're cancelling an atom regardless of -+ * whether it was soft-stopped or not */ -+ attr_state_changed = kbasep_js_ctx_attr_ctx_release_atom(kbdev, kctx, -+ &katom_retained_state); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ list_add_tail(&mem_bkend->list, &mem_backend_swapped_pool); + -+ return attr_state_changed; -+} ++ mutex_unlock(&mem_bkend->mutex); ++ mem_backend_swapped_pool_size += mem_bkend->size; + -+bool kbasep_js_runpool_retain_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx) -+{ -+ unsigned long flags; -+ struct kbasep_js_device_data *js_devdata; -+ bool result; ++ mali_mem_swap_swapped_bkend_pool_shrink(MALI_MEM_SWAP_SHRINK_FOR_ADDING_NEW_BACKENDS); + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ js_devdata = &kbdev->js_data; ++ mutex_unlock(&mem_backend_swapped_pool_lock); ++ return; ++} + -+ mutex_lock(&kbdev->mmu_hw_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ result = kbasep_js_runpool_retain_ctx_nolock(kbdev, kctx); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kbdev->mmu_hw_mutex); + -+ return result; ++u32 mali_mem_swap_idx_alloc(void) ++{ ++ return _mali_osk_bitmap_alloc(&idx_mgr); +} + -+struct kbase_context *kbasep_js_runpool_lookup_ctx(struct kbase_device *kbdev, -+ int as_nr) ++void mali_mem_swap_idx_free(u32 idx) +{ -+ unsigned long flags; -+ struct kbase_context *found_kctx = NULL; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(0 <= as_nr && as_nr < BASE_MAX_NR_AS); -+ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ -+ found_kctx = kbdev->as_to_kctx[as_nr]; -+ -+ if (found_kctx != NULL) -+ kbase_ctx_sched_retain_ctx_refcount(found_kctx); -+ -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ -+ return found_kctx; ++ _mali_osk_bitmap_free(&idx_mgr, idx); +} + -+/** -+ * kbasep_js_release_result - Try running more jobs after releasing a context -+ * and/or atom -+ * -+ * @kbdev: The kbase_device to operate on -+ * @kctx: The kbase_context to operate on -+ * @katom_retained_state: Retained state from the atom -+ * @runpool_ctx_attr_change: True if the runpool context attributes have changed -+ * -+ * This collates a set of actions that must happen whilst hwaccess_lock is held. -+ * -+ * This includes running more jobs when: -+ * - The previously released kctx caused a ctx attribute change, -+ * - The released atom caused a ctx attribute change, -+ * - Slots were previously blocked due to affinity restrictions, -+ * - Submission during IRQ handling failed. -+ * -+ * Return: %KBASEP_JS_RELEASE_RESULT_SCHED_ALL if context attributes were -+ * changed. The caller should try scheduling all contexts -+ */ -+static kbasep_js_release_result kbasep_js_run_jobs_after_ctx_and_atom_release( -+ struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ struct kbasep_js_atom_retained_state *katom_retained_state, -+ bool runpool_ctx_attr_change) ++static u32 mali_mem_swap_idx_range_alloc(u32 count) +{ -+ struct kbasep_js_device_data *js_devdata; -+ kbasep_js_release_result result = 0; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ KBASE_DEBUG_ASSERT(katom_retained_state != NULL); -+ js_devdata = &kbdev->js_data; -+ -+ lockdep_assert_held(&kctx->jctx.sched_info.ctx.jsctx_mutex); -+ lockdep_assert_held(&js_devdata->runpool_mutex); -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ if (js_devdata->nr_user_contexts_running != 0) { -+ bool retry_submit = false; -+ int retry_jobslot = 0; -+ -+ if (katom_retained_state) -+ retry_submit = kbasep_js_get_atom_retry_submit_slot( -+ katom_retained_state, &retry_jobslot); ++ u32 index; + -+ if (runpool_ctx_attr_change || retry_submit) { -+ /* A change in runpool ctx attributes might mean we can -+ * run more jobs than before */ -+ result = KBASEP_JS_RELEASE_RESULT_SCHED_ALL; ++ index = _mali_osk_bitmap_alloc_range(&idx_mgr, count); + -+ KBASE_TRACE_ADD_SLOT(kbdev, JD_DONE_TRY_RUN_NEXT_JOB, -+ kctx, NULL, 0u, retry_jobslot); -+ } -+ } -+ return result; ++ return index; +} + -+/* -+ * Internal function to release the reference on a ctx and an atom's "retained -+ * state", only taking the runpool and as transaction mutexes -+ * -+ * This also starts more jobs running in the case of an ctx-attribute state -+ * change -+ * -+ * This does none of the followup actions for scheduling: -+ * - It does not schedule in a new context -+ * - It does not requeue or handle dying contexts -+ * -+ * For those tasks, just call kbasep_js_runpool_release_ctx() instead -+ * -+ * Requires: -+ * - Context is scheduled in, and kctx->as_nr matches kctx_as_nr -+ * - Context has a non-zero refcount -+ * - Caller holds js_kctx_info->ctx.jsctx_mutex -+ * - Caller holds js_devdata->runpool_mutex -+ */ -+static kbasep_js_release_result kbasep_js_runpool_release_ctx_internal( -+ struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ struct kbasep_js_atom_retained_state *katom_retained_state) ++static void mali_mem_swap_idx_range_free(u32 idx, int num) +{ -+ unsigned long flags; -+ struct kbasep_js_device_data *js_devdata; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ -+ kbasep_js_release_result release_result = 0u; -+ bool runpool_ctx_attr_change = false; -+ int kctx_as_nr; -+ int new_ref_count; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ js_kctx_info = &kctx->jctx.sched_info; -+ js_devdata = &kbdev->js_data; -+ -+ /* Ensure context really is scheduled in */ -+ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); -+ -+ kctx_as_nr = kctx->as_nr; -+ KBASE_DEBUG_ASSERT(kctx_as_nr != KBASEP_AS_NR_INVALID); -+ KBASE_DEBUG_ASSERT(atomic_read(&kctx->refcount) > 0); -+ -+ /* -+ * Transaction begins on AS and runpool_irq -+ * -+ * Assert about out calling contract -+ */ -+ mutex_lock(&kbdev->pm.lock); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ -+ KBASE_DEBUG_ASSERT(kctx_as_nr == kctx->as_nr); -+ KBASE_DEBUG_ASSERT(atomic_read(&kctx->refcount) > 0); -+ -+ /* Update refcount */ -+ kbase_ctx_sched_release_ctx(kctx); -+ new_ref_count = atomic_read(&kctx->refcount); ++ _mali_osk_bitmap_free_range(&idx_mgr, idx, num); ++} + -+ /* Release the atom if it finished (i.e. wasn't soft-stopped) */ -+ if (kbasep_js_has_atom_finished(katom_retained_state)) -+ runpool_ctx_attr_change |= kbasep_js_ctx_attr_ctx_release_atom( -+ kbdev, kctx, katom_retained_state); ++struct mali_swap_item *mali_mem_swap_alloc_swap_item(void) ++{ ++ mali_swap_item *swap_item; + -+ KBASE_TRACE_ADD_REFCOUNT(kbdev, JS_RELEASE_CTX, kctx, NULL, 0u, -+ new_ref_count); ++ swap_item = kzalloc(sizeof(mali_swap_item), GFP_KERNEL); + -+ if (new_ref_count == 2 && kbase_ctx_flag(kctx, KCTX_PRIVILEGED) && -+ !kbase_pm_is_suspending(kbdev)) { -+ /* Context is kept scheduled into an address space even when -+ * there are no jobs, in this case we have to handle the -+ * situation where all jobs have been evicted from the GPU and -+ * submission is disabled. -+ * -+ * At this point we re-enable submission to allow further jobs -+ * to be executed -+ */ -+ kbasep_js_set_submit_allowed(js_devdata, kctx); ++ if (NULL == swap_item) { ++ return NULL; + } + -+ /* Make a set of checks to see if the context should be scheduled out. -+ * Note that there'll always be at least 1 reference to the context -+ * which was previously acquired by kbasep_js_schedule_ctx(). */ -+ if (new_ref_count == 1 && -+ (!kbasep_js_is_submit_allowed(js_devdata, kctx) || -+ kbdev->pm.suspending)) { -+ int num_slots = kbdev->gpu_props.num_job_slots; -+ int slot; -+ -+ /* Last reference, and we've been told to remove this context -+ * from the Run Pool */ -+ dev_dbg(kbdev->dev, "JS: RunPool Remove Context %p because refcount=%d, jobs=%d, allowed=%d", -+ kctx, new_ref_count, js_kctx_info->ctx.nr_jobs, -+ kbasep_js_is_submit_allowed(js_devdata, kctx)); -+ -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+ kbase_trace_mali_mmu_as_released(kctx->as_nr); -+#endif -+ KBASE_TLSTREAM_TL_NRET_AS_CTX(&kbdev->as[kctx->as_nr], kctx); -+ -+ kbase_backend_release_ctx_irq(kbdev, kctx); -+ -+ if (kbdev->hwaccess.active_kctx == kctx) -+ kbdev->hwaccess.active_kctx = NULL; ++ atomic_set(&swap_item->ref_count, 1); ++ swap_item->page = NULL; ++ atomic_add(1, &mali_mem_os_allocator.allocated_pages); + -+ /* Ctx Attribute handling -+ * -+ * Releasing atoms attributes must either happen before this, or -+ * after the KCTX_SHEDULED flag is changed, otherwise we -+ * double-decount the attributes -+ */ -+ runpool_ctx_attr_change |= -+ kbasep_js_ctx_attr_runpool_release_ctx(kbdev, kctx); ++ return swap_item; ++} + -+ /* Releasing the context and katom retained state can allow -+ * more jobs to run */ -+ release_result |= -+ kbasep_js_run_jobs_after_ctx_and_atom_release(kbdev, -+ kctx, katom_retained_state, -+ runpool_ctx_attr_change); ++void mali_mem_swap_free_swap_item(mali_swap_item *swap_item) ++{ ++ struct inode *file_node; ++ long long start, end; + -+ /* -+ * Transaction ends on AS and runpool_irq: -+ * -+ * By this point, the AS-related data is now clear and ready -+ * for re-use. -+ * -+ * Since releases only occur once for each previous successful -+ * retain, and no more retains are allowed on this context, no -+ * other thread will be operating in this -+ * code whilst we are -+ */ ++ /* If this swap item is shared, we just reduce the reference counter. */ ++ if (0 == atomic_dec_return(&swap_item->ref_count)) { ++ file_node = global_swap_file->f_path.dentry->d_inode; ++ start = swap_item->idx; ++ start = start << 12; ++ end = start + PAGE_SIZE; + -+ /* Recalculate pullable status for all slots */ -+ for (slot = 0; slot < num_slots; slot++) { -+ if (kbase_js_ctx_pullable(kctx, slot, false)) -+ kbase_js_ctx_list_add_pullable_nolock(kbdev, -+ kctx, slot); -+ } ++ shmem_truncate_range(file_node, start, (end - 1)); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mali_mem_swap_idx_free(swap_item->idx); + -+ kbase_backend_release_ctx_noirq(kbdev, kctx); ++ atomic_sub(1, &mali_mem_os_allocator.allocated_pages); + -+ mutex_unlock(&kbdev->pm.lock); ++ kfree(swap_item); ++ } ++} + -+ /* Note: Don't reuse kctx_as_nr now */ ++/* Used to allocate new swap item for new memory allocation and cow page for write. */ ++struct mali_page_node *_mali_mem_swap_page_node_allocate(void) ++{ ++ struct mali_page_node *m_page; + -+ /* Synchronize with any timers */ -+ kbase_backend_ctx_count_changed(kbdev); ++ m_page = _mali_page_node_allocate(MALI_PAGE_NODE_SWAP); + -+ /* update book-keeping info */ -+ kbase_ctx_flag_clear(kctx, KCTX_SCHEDULED); -+ /* Signal any waiter that the context is not scheduled, so is -+ * safe for termination - once the jsctx_mutex is also dropped, -+ * and jobs have finished. */ -+ wake_up(&js_kctx_info->ctx.is_scheduled_wait); ++ if (NULL == m_page) { ++ return NULL; ++ } + -+ /* Queue an action to occur after we've dropped the lock */ -+ release_result |= KBASEP_JS_RELEASE_RESULT_WAS_DESCHEDULED | -+ KBASEP_JS_RELEASE_RESULT_SCHED_ALL; -+ } else { -+ kbasep_js_run_jobs_after_ctx_and_atom_release(kbdev, kctx, -+ katom_retained_state, runpool_ctx_attr_change); ++ m_page->swap_it = mali_mem_swap_alloc_swap_item(); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kbdev->pm.lock); ++ if (NULL == m_page->swap_it) { ++ kfree(m_page); ++ return NULL; + } + -+ return release_result; ++ return m_page; +} + -+void kbasep_js_runpool_release_ctx_nolock(struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++_mali_osk_errcode_t _mali_mem_swap_put_page_node(struct mali_page_node *m_page) +{ -+ struct kbasep_js_atom_retained_state katom_retained_state; + -+ /* Setup a dummy katom_retained_state */ -+ kbasep_js_atom_retained_state_init_invalid(&katom_retained_state); ++ mali_mem_swap_free_swap_item(m_page->swap_it); + -+ kbasep_js_runpool_release_ctx_internal(kbdev, kctx, -+ &katom_retained_state); ++ return _MALI_OSK_ERR_OK; +} + -+void kbasep_js_runpool_requeue_or_kill_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx, bool has_pm_ref) ++void _mali_mem_swap_page_node_free(struct mali_page_node *m_page) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); ++ _mali_mem_swap_put_page_node(m_page); + -+ /* This is called if and only if you've you've detached the context from -+ * the Runpool Queue, and not added it back to the Runpool -+ */ -+ KBASE_DEBUG_ASSERT(!kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ kfree(m_page); + -+ if (kbase_ctx_flag(kctx, KCTX_DYING)) { -+ /* Dying: don't requeue, but kill all jobs on the context. This -+ * happens asynchronously */ -+ dev_dbg(kbdev->dev, -+ "JS: ** Killing Context %p on RunPool Remove **", kctx); -+ kbase_js_foreach_ctx_job(kctx, &kbase_jd_cancel); -+ } ++ return; +} + -+void kbasep_js_runpool_release_ctx_and_katom_retained_state( -+ struct kbase_device *kbdev, struct kbase_context *kctx, -+ struct kbasep_js_atom_retained_state *katom_retained_state) ++u32 mali_mem_swap_free(mali_mem_swap *swap_mem) +{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ kbasep_js_release_result release_result; ++ struct mali_page_node *m_page, *m_tmp; ++ u32 free_pages_nr = 0; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ js_kctx_info = &kctx->jctx.sched_info; -+ js_devdata = &kbdev->js_data; ++ MALI_DEBUG_ASSERT_POINTER(swap_mem); + -+ mutex_lock(&js_devdata->queue_mutex); -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_lock(&js_devdata->runpool_mutex); ++ list_for_each_entry_safe(m_page, m_tmp, &swap_mem->pages, list) { ++ MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_SWAP); + -+ release_result = kbasep_js_runpool_release_ctx_internal(kbdev, kctx, -+ katom_retained_state); ++ /* free the page node and release the swap item, if the ref count is 1, ++ * then need also free the swap item. */ ++ list_del(&m_page->list); ++ if (1 == _mali_page_node_get_ref_count(m_page)) { ++ free_pages_nr++; ++ } + -+ /* Drop the runpool mutex to allow requeing kctx */ -+ mutex_unlock(&js_devdata->runpool_mutex); ++ _mali_mem_swap_page_node_free(m_page); ++ } + -+ if ((release_result & KBASEP_JS_RELEASE_RESULT_WAS_DESCHEDULED) != 0u) -+ kbasep_js_runpool_requeue_or_kill_ctx(kbdev, kctx, true); ++ return free_pages_nr; ++} + -+ /* Drop the jsctx_mutex to allow scheduling in a new context */ ++static u32 mali_mem_swap_cow_free(mali_mem_cow *cow_mem) ++{ ++ struct mali_page_node *m_page, *m_tmp; ++ u32 free_pages_nr = 0; + -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_unlock(&js_devdata->queue_mutex); ++ MALI_DEBUG_ASSERT_POINTER(cow_mem); + -+ if (release_result & KBASEP_JS_RELEASE_RESULT_SCHED_ALL) -+ kbase_js_sched_all(kbdev); -+} ++ list_for_each_entry_safe(m_page, m_tmp, &cow_mem->pages, list) { ++ MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_SWAP); + -+void kbasep_js_runpool_release_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx) -+{ -+ struct kbasep_js_atom_retained_state katom_retained_state; ++ /* free the page node and release the swap item, if the ref count is 1, ++ * then need also free the swap item. */ ++ list_del(&m_page->list); ++ if (1 == _mali_page_node_get_ref_count(m_page)) { ++ free_pages_nr++; ++ } + -+ kbasep_js_atom_retained_state_init_invalid(&katom_retained_state); ++ _mali_mem_swap_page_node_free(m_page); ++ } + -+ kbasep_js_runpool_release_ctx_and_katom_retained_state(kbdev, kctx, -+ &katom_retained_state); ++ return free_pages_nr; +} + -+/* Variant of kbasep_js_runpool_release_ctx() that doesn't call into -+ * kbase_js_sched_all() */ -+static void kbasep_js_runpool_release_ctx_no_schedule( -+ struct kbase_device *kbdev, struct kbase_context *kctx) ++u32 mali_mem_swap_release(mali_mem_backend *mem_bkend, mali_bool is_mali_mapped) +{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ kbasep_js_release_result release_result; -+ struct kbasep_js_atom_retained_state katom_retained_state_struct; -+ struct kbasep_js_atom_retained_state *katom_retained_state = -+ &katom_retained_state_struct; ++ mali_mem_allocation *alloc; ++ u32 free_pages_nr = 0; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ js_kctx_info = &kctx->jctx.sched_info; -+ js_devdata = &kbdev->js_data; -+ kbasep_js_atom_retained_state_init_invalid(katom_retained_state); ++ MALI_DEBUG_ASSERT_POINTER(mem_bkend); ++ alloc = mem_bkend->mali_allocation; ++ MALI_DEBUG_ASSERT_POINTER(alloc); + -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_lock(&js_devdata->runpool_mutex); ++ if (is_mali_mapped) { ++ mali_mem_swap_mali_unmap(alloc); ++ } + -+ release_result = kbasep_js_runpool_release_ctx_internal(kbdev, kctx, -+ katom_retained_state); ++ mali_memory_swap_list_backend_delete(mem_bkend); + -+ /* Drop the runpool mutex to allow requeing kctx */ -+ mutex_unlock(&js_devdata->runpool_mutex); -+ if ((release_result & KBASEP_JS_RELEASE_RESULT_WAS_DESCHEDULED) != 0u) -+ kbasep_js_runpool_requeue_or_kill_ctx(kbdev, kctx, true); ++ mutex_lock(&mem_bkend->mutex); ++ /* To make sure the given memory backend was unlocked from Mali side, ++ * and then free this memory block. */ ++ mali_mem_swap_unlock_single_mem_backend(mem_bkend); ++ mutex_unlock(&mem_bkend->mutex); + -+ /* Drop the jsctx_mutex to allow scheduling in a new context */ -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ if (MALI_MEM_SWAP == mem_bkend->type) { ++ free_pages_nr = mali_mem_swap_free(&mem_bkend->swap_mem); ++ } else { ++ free_pages_nr = mali_mem_swap_cow_free(&mem_bkend->cow_mem); ++ } + -+ /* NOTE: could return release_result if the caller would like to know -+ * whether it should schedule a new context, but currently no callers do -+ */ ++ return free_pages_nr; +} + -+void kbase_js_set_timeouts(struct kbase_device *kbdev) ++mali_bool mali_mem_swap_in_page_node(struct mali_page_node *page_node) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ MALI_DEBUG_ASSERT(NULL != page_node); + -+ kbase_backend_timeouts_changed(kbdev); -+} ++ page_node->swap_it->page = shmem_read_mapping_page(global_swap_space, page_node->swap_it->idx); + -+static bool kbasep_js_schedule_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx) -+{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ unsigned long flags; -+ bool kctx_suspended = false; -+ int as_nr; ++ if (IS_ERR(page_node->swap_it->page)) { ++ MALI_DEBUG_PRINT_ERROR(("SWAP Mem: failed to swap in page with index: %d.\n", page_node->swap_it->idx)); ++ return MALI_FALSE; ++ } + -+ js_devdata = &kbdev->js_data; -+ js_kctx_info = &kctx->jctx.sched_info; ++ /* Ensure page is flushed from CPU caches. */ ++ page_node->swap_it->dma_addr = dma_map_page(&mali_platform_device->dev, page_node->swap_it->page, ++ 0, _MALI_OSK_MALI_PAGE_SIZE, DMA_TO_DEVICE); + -+ /* Pick available address space for this context */ -+ mutex_lock(&kbdev->mmu_hw_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ as_nr = kbase_ctx_sched_retain_ctx(kctx); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kbdev->mmu_hw_mutex); -+ if (as_nr == KBASEP_AS_NR_INVALID) { -+ as_nr = kbase_backend_find_and_release_free_address_space( -+ kbdev, kctx); -+ if (as_nr != KBASEP_AS_NR_INVALID) { -+ /* Attempt to retain the context again, this should -+ * succeed */ -+ mutex_lock(&kbdev->mmu_hw_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ as_nr = kbase_ctx_sched_retain_ctx(kctx); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kbdev->mmu_hw_mutex); ++ return MALI_TRUE; ++} + -+ WARN_ON(as_nr == KBASEP_AS_NR_INVALID); -+ } -+ } -+ if (as_nr == KBASEP_AS_NR_INVALID) -+ return false; /* No address spaces currently available */ ++int mali_mem_swap_alloc_pages(mali_mem_swap *swap_mem, u32 size, u32 *bkend_idx) ++{ ++ size_t page_count = PAGE_ALIGN(size) / PAGE_SIZE; ++ struct mali_page_node *m_page; ++ long system_free_size; ++ u32 i, index; ++ mali_bool ret; + -+ /* -+ * Atomic transaction on the Context and Run Pool begins -+ */ -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->mmu_hw_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ MALI_DEBUG_ASSERT(NULL != swap_mem); ++ MALI_DEBUG_ASSERT(NULL != bkend_idx); ++ MALI_DEBUG_ASSERT(page_count <= MALI_SWAP_GLOBAL_SWAP_FILE_INDEX_RESERVE); + -+ /* Check to see if context is dying due to kbase_job_zap_context() */ -+ if (kbase_ctx_flag(kctx, KCTX_DYING)) { -+ /* Roll back the transaction so far and return */ -+ kbase_ctx_sched_release_ctx(kctx); ++ if (atomic_read(&mali_mem_os_allocator.allocated_pages) * _MALI_OSK_MALI_PAGE_SIZE + size > mali_mem_os_allocator.allocation_limit) { ++ MALI_DEBUG_PRINT(2, ("Mali Mem: Unable to allocate %u bytes. Currently allocated: %lu, max limit %lu\n", ++ size, ++ atomic_read(&mali_mem_os_allocator.allocated_pages) * _MALI_OSK_MALI_PAGE_SIZE, ++ mali_mem_os_allocator.allocation_limit)); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kbdev->mmu_hw_mutex); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ INIT_LIST_HEAD(&swap_mem->pages); ++ swap_mem->count = page_count; ++ index = mali_mem_swap_idx_range_alloc(page_count); + -+ return false; ++ if (_MALI_OSK_BITMAP_INVALIDATE_INDEX == index) { ++ MALI_PRINT_ERROR(("Mali Swap: Failed to allocate continuous index for swappable Mali memory.")); ++ return _MALI_OSK_ERR_FAULT; + } + -+ KBASE_TRACE_ADD_REFCOUNT(kbdev, JS_TRY_SCHEDULE_HEAD_CTX, kctx, NULL, -+ 0u, -+ kbasep_js_trace_get_refcnt(kbdev, kctx)); -+ -+ kbase_ctx_flag_set(kctx, KCTX_SCHEDULED); ++ for (i = 0; i < page_count; i++) { ++ m_page = _mali_mem_swap_page_node_allocate(); + -+ /* Assign context to previously chosen address space */ -+ if (!kbase_backend_use_ctx(kbdev, kctx, as_nr)) { -+ /* Roll back the transaction so far and return */ -+ kbase_ctx_sched_release_ctx(kctx); -+ kbase_ctx_flag_clear(kctx, KCTX_SCHEDULED); ++ if (NULL == m_page) { ++ MALI_DEBUG_PRINT_ERROR(("SWAP Mem: Failed to allocate mali page node.")); ++ swap_mem->count = i; + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kbdev->mmu_hw_mutex); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ mali_mem_swap_free(swap_mem); ++ mali_mem_swap_idx_range_free(index + i, page_count - i); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ return false; -+ } ++ m_page->swap_it->idx = index + i; + -+ kbdev->hwaccess.active_kctx = kctx; ++ ret = mali_mem_swap_in_page_node(m_page); + -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+ kbase_trace_mali_mmu_as_in_use(kctx->as_nr); -+#endif -+ KBASE_TLSTREAM_TL_RET_AS_CTX(&kbdev->as[kctx->as_nr], kctx); ++ if (MALI_FALSE == ret) { ++ MALI_DEBUG_PRINT_ERROR(("SWAP Mem: Allocate new page from SHMEM file failed.")); ++ _mali_mem_swap_page_node_free(m_page); ++ mali_mem_swap_idx_range_free(index + i + 1, page_count - i - 1); + -+ /* Cause any future waiter-on-termination to wait until the context is -+ * descheduled */ -+ wake_up(&js_kctx_info->ctx.is_scheduled_wait); ++ swap_mem->count = i; ++ mali_mem_swap_free(swap_mem); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ /* Re-check for suspending: a suspend could've occurred, and all the -+ * contexts could've been removed from the runpool before we took this -+ * lock. In this case, we don't want to allow this context to run jobs, -+ * we just want it out immediately. -+ * -+ * The DMB required to read the suspend flag was issued recently as part -+ * of the hwaccess_lock locking. If a suspend occurs *after* that lock -+ * was taken (i.e. this condition doesn't execute), then the -+ * kbasep_js_suspend() code will cleanup this context instead (by virtue -+ * of it being called strictly after the suspend flag is set, and will -+ * wait for this lock to drop) */ -+ if (kbase_pm_is_suspending(kbdev)) { -+ /* Cause it to leave at some later point */ -+ bool retained; ++ list_add_tail(&m_page->list, &swap_mem->pages); ++ } + -+ retained = kbasep_js_runpool_retain_ctx_nolock(kbdev, kctx); -+ KBASE_DEBUG_ASSERT(retained); ++ system_free_size = global_zone_page_state(NR_FREE_PAGES) * PAGE_SIZE; + -+ kbasep_js_clear_submit_allowed(js_devdata, kctx); -+ kctx_suspended = true; ++ if ((system_free_size < mali_mem_swap_out_threshold_value) ++ && (mem_backend_swapped_pool_size > (mali_mem_swap_out_threshold_value >> 2)) ++ && mali_utilization_enabled()) { ++ _mali_osk_wq_schedule_work(mali_mem_swap_out_workq); + } + -+ /* Transaction complete */ -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kbdev->mmu_hw_mutex); ++ *bkend_idx = index; ++ return 0; ++} + -+ /* Synchronize with any timers */ -+ kbase_backend_ctx_count_changed(kbdev); ++void mali_mem_swap_mali_unmap(mali_mem_allocation *alloc) ++{ ++ struct mali_session_data *session; + -+ mutex_unlock(&js_devdata->runpool_mutex); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); -+ /* Note: after this point, the context could potentially get scheduled -+ * out immediately */ ++ MALI_DEBUG_ASSERT_POINTER(alloc); ++ session = alloc->session; ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ if (kctx_suspended) { -+ /* Finishing forcing out the context due to a suspend. Use a -+ * variant of kbasep_js_runpool_release_ctx() that doesn't -+ * schedule a new context, to prevent a risk of recursion back -+ * into this function */ -+ kbasep_js_runpool_release_ctx_no_schedule(kbdev, kctx); -+ return false; -+ } -+ return true; ++ mali_session_memory_lock(session); ++ mali_mem_mali_map_free(session, alloc->psize, alloc->mali_vma_node.vm_node.start, ++ alloc->flags); ++ mali_session_memory_unlock(session); +} + -+static bool kbase_js_use_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++ ++/* Insert these pages from shmem to mali page table*/ ++_mali_osk_errcode_t mali_mem_swap_mali_map(mali_mem_swap *swap_mem, struct mali_session_data *session, u32 vaddr, u32 props) +{ -+ unsigned long flags; ++ struct mali_page_directory *pagedir = session->page_directory; ++ struct mali_page_node *m_page; ++ dma_addr_t phys; ++ u32 virt = vaddr; ++ u32 prop = props; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ list_for_each_entry(m_page, &swap_mem->pages, list) { ++ MALI_DEBUG_ASSERT(NULL != m_page->swap_it->page); ++ phys = m_page->swap_it->dma_addr; + -+ if (kbase_ctx_flag(kctx, KCTX_SCHEDULED) && -+ kbase_backend_use_ctx_sched(kbdev, kctx)) { -+ /* Context already has ASID - mark as active */ -+ kbdev->hwaccess.active_kctx = kctx; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ return true; /* Context already scheduled */ ++ mali_mmu_pagedir_update(pagedir, virt, phys, MALI_MMU_PAGE_SIZE, prop); ++ virt += MALI_MMU_PAGE_SIZE; + } + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ -+ return kbasep_js_schedule_ctx(kbdev, kctx); ++ return _MALI_OSK_ERR_OK; +} + -+void kbasep_js_schedule_privileged_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++int mali_mem_swap_in_pages(struct mali_pp_job *job) +{ -+ struct kbasep_js_kctx_info *js_kctx_info; -+ struct kbasep_js_device_data *js_devdata; -+ bool is_scheduled; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ -+ js_devdata = &kbdev->js_data; -+ js_kctx_info = &kctx->jctx.sched_info; -+ -+ /* This must never be attempted whilst suspending - i.e. it should only -+ * happen in response to a syscall from a user-space thread */ -+ BUG_ON(kbase_pm_is_suspending(kbdev)); -+ -+ mutex_lock(&js_devdata->queue_mutex); -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++ u32 num_memory_cookies; ++ struct mali_session_data *session; ++ struct mali_vma_node *mali_vma_node = NULL; ++ mali_mem_allocation *mali_alloc = NULL; ++ mali_mem_backend *mem_bkend = NULL; ++ struct mali_page_node *m_page; ++ mali_bool swap_in_success = MALI_TRUE; ++ int i; + -+ /* Mark the context as privileged */ -+ kbase_ctx_flag_set(kctx, KCTX_PRIVILEGED); ++ MALI_DEBUG_ASSERT_POINTER(job); + -+ is_scheduled = kbase_ctx_flag(kctx, KCTX_SCHEDULED); -+ if (!is_scheduled) { -+ /* Add the context to the pullable list */ -+ if (kbase_js_ctx_list_add_pullable_head(kbdev, kctx, 0)) -+ kbase_js_sync_timers(kbdev); ++ num_memory_cookies = mali_pp_job_num_memory_cookies(job); ++ session = mali_pp_job_get_session(job); + -+ /* Fast-starting requires the jsctx_mutex to be dropped, -+ * because it works on multiple ctxs */ -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_unlock(&js_devdata->queue_mutex); ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ /* Try to schedule the context in */ -+ kbase_js_sched_all(kbdev); ++ for (i = 0; i < num_memory_cookies; i++) { + -+ /* Wait for the context to be scheduled in */ -+ wait_event(kctx->jctx.sched_info.ctx.is_scheduled_wait, -+ kbase_ctx_flag(kctx, KCTX_SCHEDULED)); -+ } else { -+ /* Already scheduled in - We need to retain it to keep the -+ * corresponding address space */ -+ kbasep_js_runpool_retain_ctx(kbdev, kctx); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_unlock(&js_devdata->queue_mutex); -+ } -+} -+KBASE_EXPORT_TEST_API(kbasep_js_schedule_privileged_ctx); ++ u32 mali_addr = mali_pp_job_get_memory_cookie(job, i); + -+void kbasep_js_release_privileged_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx) -+{ -+ struct kbasep_js_kctx_info *js_kctx_info; ++ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, mali_addr, 0); ++ if (NULL == mali_vma_node) { ++ job->memory_cookies[i] = MALI_SWAP_INVALIDATE_MALI_ADDRESS; ++ swap_in_success = MALI_FALSE; ++ MALI_PRINT_ERROR(("SWAP Mem: failed to find mali_vma_node through Mali address: 0x%08x.\n", mali_addr)); ++ continue; ++ } + -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ js_kctx_info = &kctx->jctx.sched_info; ++ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); ++ MALI_DEBUG_ASSERT(NULL != mali_alloc); + -+ /* We don't need to use the address space anymore */ -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); -+ kbase_ctx_flag_clear(kctx, KCTX_PRIVILEGED); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ if (MALI_MEM_SWAP != mali_alloc->type && ++ MALI_MEM_COW != mali_alloc->type) { ++ continue; ++ } + -+ /* Release the context - it will be scheduled out */ -+ kbasep_js_runpool_release_ctx(kbdev, kctx); ++ /* Get backend memory & Map on GPU */ ++ mutex_lock(&mali_idr_mutex); ++ mem_bkend = idr_find(&mali_backend_idr, mali_alloc->backend_handle); ++ mutex_unlock(&mali_idr_mutex); ++ MALI_DEBUG_ASSERT(NULL != mem_bkend); + -+ kbase_js_sched_all(kbdev); -+} -+KBASE_EXPORT_TEST_API(kbasep_js_release_privileged_ctx); ++ /* We neednot hold backend's lock here, race safe.*/ ++ if ((MALI_MEM_COW == mem_bkend->type) && ++ (!(mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED))) { ++ continue; ++ } + -+void kbasep_js_suspend(struct kbase_device *kbdev) -+{ -+ unsigned long flags; -+ struct kbasep_js_device_data *js_devdata; -+ int i; -+ u16 retained = 0u; -+ int nr_privileged_ctx = 0; ++ mutex_lock(&mem_bkend->mutex); + -+ KBASE_DEBUG_ASSERT(kbdev); -+ KBASE_DEBUG_ASSERT(kbase_pm_is_suspending(kbdev)); -+ js_devdata = &kbdev->js_data; ++ /* When swap_in_success is MALI_FALSE, it means this job has memory backend that could not be swapped in, ++ * and it will be aborted in mali scheduler, so here, we just mark those memory cookies which ++ * should not be swapped out when delete job to invalide */ ++ if (MALI_FALSE == swap_in_success) { ++ job->memory_cookies[i] = MALI_SWAP_INVALIDATE_MALI_ADDRESS; ++ mutex_unlock(&mem_bkend->mutex); ++ continue; ++ } + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ /* Before swap in, checking if this memory backend has been swapped in by the latest flushed jobs. */ ++ ++mem_bkend->using_count; + -+ /* Prevent all contexts from submitting */ -+ js_devdata->runpool_irq.submit_allowed = 0; ++ if (1 < mem_bkend->using_count) { ++ MALI_DEBUG_ASSERT(MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN != (MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN & mem_bkend->flags)); ++ mutex_unlock(&mem_bkend->mutex); ++ continue; ++ } + -+ /* Retain each of the contexts, so we can cause it to leave even if it -+ * had no refcount to begin with */ -+ for (i = BASE_MAX_NR_AS - 1; i >= 0; --i) { -+ struct kbase_context *kctx = kbdev->as_to_kctx[i]; ++ if (MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN != (MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN & mem_bkend->flags)) { ++ mutex_unlock(&mem_bkend->mutex); ++ continue; ++ } + -+ retained = retained << 1; + -+ if (kctx) { -+ kbase_ctx_sched_retain_ctx_refcount(kctx); -+ retained |= 1u; -+ /* We can only cope with up to 1 privileged context - -+ * the instrumented context. It'll be suspended by -+ * disabling instrumentation */ -+ if (kbase_ctx_flag(kctx, KCTX_PRIVILEGED)) { -+ ++nr_privileged_ctx; -+ WARN_ON(nr_privileged_ctx != 1); ++ list_for_each_entry(m_page, &mem_bkend->swap_mem.pages, list) { ++ if (MALI_FALSE == mali_mem_swap_in_page_node(m_page)) { ++ /* Don't have enough memory to swap in page, so release pages have already been swapped ++ * in and then mark this pp job to be fail. */ ++ mali_mem_swap_unlock_partial_locked_mem_backend(mem_bkend, m_page); ++ swap_in_success = MALI_FALSE; ++ break; + } + } -+ } -+ CSTD_UNUSED(nr_privileged_ctx); -+ -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ /* De-ref the previous retain to ensure each context gets pulled out -+ * sometime later. */ -+ for (i = 0; -+ i < BASE_MAX_NR_AS; -+ ++i, retained = retained >> 1) { -+ struct kbase_context *kctx = kbdev->as_to_kctx[i]; ++ if (swap_in_success) { ++#ifdef MALI_MEM_SWAP_TRACKING ++ mem_backend_swapped_unlock_size -= mem_bkend->size; ++#endif ++ _mali_osk_mutex_wait(session->memory_lock); ++ mali_mem_swap_mali_map(&mem_bkend->swap_mem, session, mali_alloc->mali_mapping.addr, mali_alloc->mali_mapping.properties); ++ _mali_osk_mutex_signal(session->memory_lock); + -+ if (retained & 1u) -+ kbasep_js_runpool_release_ctx(kbdev, kctx); ++ /* Remove the unlock flag from mem backend flags, mark this backend has been swapped in. */ ++ mem_bkend->flags &= ~(MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN); ++ mutex_unlock(&mem_bkend->mutex); ++ } else { ++ --mem_bkend->using_count; ++ /* Marking that this backend is not swapped in, need not to be processed anymore. */ ++ job->memory_cookies[i] = MALI_SWAP_INVALIDATE_MALI_ADDRESS; ++ mutex_unlock(&mem_bkend->mutex); ++ } + } + -+ /* Caller must wait for all Power Manager active references to be -+ * dropped */ ++ job->swap_status = swap_in_success ? MALI_SWAP_IN_SUCC : MALI_SWAP_IN_FAIL; ++ ++ return _MALI_OSK_ERR_OK; +} + -+void kbasep_js_resume(struct kbase_device *kbdev) ++int mali_mem_swap_out_pages(struct mali_pp_job *job) +{ -+ struct kbasep_js_device_data *js_devdata; -+ int js; ++ u32 num_memory_cookies; ++ struct mali_session_data *session; ++ struct mali_vma_node *mali_vma_node = NULL; ++ mali_mem_allocation *mali_alloc = NULL; ++ mali_mem_backend *mem_bkend = NULL; ++ int i; + -+ KBASE_DEBUG_ASSERT(kbdev); -+ js_devdata = &kbdev->js_data; -+ KBASE_DEBUG_ASSERT(!kbase_pm_is_suspending(kbdev)); ++ MALI_DEBUG_ASSERT_POINTER(job); + -+ mutex_lock(&js_devdata->queue_mutex); -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ struct kbase_context *kctx, *n; ++ num_memory_cookies = mali_pp_job_num_memory_cookies(job); ++ session = mali_pp_job_get_session(job); + -+ list_for_each_entry_safe(kctx, n, -+ &kbdev->js_data.ctx_list_unpullable[js], -+ jctx.sched_info.ctx.ctx_list_entry[js]) { -+ struct kbasep_js_kctx_info *js_kctx_info; -+ unsigned long flags; -+ bool timer_sync = false; ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ js_kctx_info = &kctx->jctx.sched_info; + -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_lock(&js_devdata->runpool_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ for (i = 0; i < num_memory_cookies; i++) { ++ u32 mali_addr = mali_pp_job_get_memory_cookie(job, i); + -+ if (!kbase_ctx_flag(kctx, KCTX_SCHEDULED) && -+ kbase_js_ctx_pullable(kctx, js, false)) -+ timer_sync = -+ kbase_js_ctx_list_add_pullable_nolock( -+ kbdev, kctx, js); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ if (timer_sync) -+ kbase_backend_ctx_count_changed(kbdev); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ if (MALI_SWAP_INVALIDATE_MALI_ADDRESS == mali_addr) { ++ continue; + } -+ } -+ mutex_unlock(&js_devdata->queue_mutex); + -+ /* Restart atom processing */ -+ kbase_js_sched_all(kbdev); ++ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, mali_addr, 0); + -+ /* JS Resume complete */ -+} ++ if (NULL == mali_vma_node) { ++ MALI_PRINT_ERROR(("SWAP Mem: failed to find mali_vma_node through Mali address: 0x%08x.\n", mali_addr)); ++ continue; ++ } + -+bool kbase_js_is_atom_valid(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) -+{ -+ if ((katom->core_req & BASE_JD_REQ_FS) && -+ (katom->core_req & (BASE_JD_REQ_CS | BASE_JD_REQ_ONLY_COMPUTE | -+ BASE_JD_REQ_T))) -+ return false; ++ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); ++ MALI_DEBUG_ASSERT(NULL != mali_alloc); + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987) && -+ (katom->core_req & BASE_JD_REQ_ONLY_COMPUTE) && -+ (katom->core_req & (BASE_JD_REQ_CS | BASE_JD_REQ_T))) -+ return false; ++ if (MALI_MEM_SWAP != mali_alloc->type && ++ MALI_MEM_COW != mali_alloc->type) { ++ continue; ++ } + -+ return true; -+} ++ mutex_lock(&mali_idr_mutex); ++ mem_bkend = idr_find(&mali_backend_idr, mali_alloc->backend_handle); ++ mutex_unlock(&mali_idr_mutex); ++ MALI_DEBUG_ASSERT(NULL != mem_bkend); + -+static int kbase_js_get_slot(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) -+{ -+ if (katom->core_req & BASE_JD_REQ_FS) -+ return 0; ++ /* We neednot hold backend's lock here, race safe.*/ ++ if ((MALI_MEM_COW == mem_bkend->type) && ++ (!(mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED))) { ++ continue; ++ } + -+ if (katom->core_req & BASE_JD_REQ_ONLY_COMPUTE) { -+ if (katom->device_nr == 1 && -+ kbdev->gpu_props.num_core_groups == 2) -+ return 2; -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987)) -+ return 2; ++ mutex_lock(&mem_bkend->mutex); ++ ++ MALI_DEBUG_ASSERT(0 < mem_bkend->using_count); ++ ++ /* Reducing the using_count of mem backend means less pp job are using this memory backend, ++ * if this count get to zero, it means no pp job is using it now, could put it to swap out list. */ ++ --mem_bkend->using_count; ++ ++ if (0 < mem_bkend->using_count) { ++ mutex_unlock(&mem_bkend->mutex); ++ continue; ++ } ++ mutex_unlock(&mem_bkend->mutex); ++ ++ mali_memory_swap_list_backend_add(mem_bkend); + } + -+ return 1; ++ return _MALI_OSK_ERR_OK; +} + -+bool kbase_js_dep_resolved_submit(struct kbase_context *kctx, -+ struct kbase_jd_atom *katom) ++int mali_mem_swap_allocate_page_on_demand(mali_mem_backend *mem_bkend, u32 offset, struct page **pagep) +{ -+ bool enqueue_required; ++ struct mali_page_node *m_page, *found_node = NULL; ++ struct page *found_page; ++ mali_mem_swap *swap = NULL; ++ mali_mem_cow *cow = NULL; ++ dma_addr_t dma_addr; ++ u32 i = 0; + -+ katom->slot_nr = kbase_js_get_slot(kctx->kbdev, katom); ++ if (MALI_MEM_SWAP == mem_bkend->type) { ++ swap = &mem_bkend->swap_mem; ++ list_for_each_entry(m_page, &swap->pages, list) { ++ if (i == offset) { ++ found_node = m_page; ++ break; ++ } ++ i++; ++ } ++ } else { ++ MALI_DEBUG_ASSERT(MALI_MEM_COW == mem_bkend->type); ++ MALI_DEBUG_ASSERT(MALI_MEM_BACKEND_FLAG_SWAP_COWED == (MALI_MEM_BACKEND_FLAG_SWAP_COWED & mem_bkend->flags)); + -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); -+ lockdep_assert_held(&kctx->jctx.lock); ++ cow = &mem_bkend->cow_mem; ++ list_for_each_entry(m_page, &cow->pages, list) { ++ if (i == offset) { ++ found_node = m_page; ++ break; ++ } ++ i++; ++ } ++ } + -+ /* If slot will transition from unpullable to pullable then add to -+ * pullable list */ -+ if (jsctx_rb_none_to_pull(kctx, katom->slot_nr)) { -+ enqueue_required = true; -+ } else { -+ enqueue_required = false; ++ if (NULL == found_node) { ++ return _MALI_OSK_ERR_FAULT; + } -+ if ((katom->atom_flags & KBASE_KATOM_FLAG_X_DEP_BLOCKED) || -+ (katom->pre_dep && (katom->pre_dep->atom_flags & -+ KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST))) { -+ int prio = katom->sched_priority; -+ int js = katom->slot_nr; -+ struct jsctx_queue *queue = &kctx->jsctx_queue[prio][js]; + -+ list_add_tail(&katom->queue, &queue->x_dep_head); -+ katom->atom_flags |= KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST; -+ enqueue_required = false; -+ } else { -+ /* Check if there are lower priority jobs to soft stop */ -+ kbase_job_slot_ctx_priority_check_locked(kctx, katom); ++ found_page = shmem_read_mapping_page(global_swap_space, found_node->swap_it->idx); + -+ /* Add atom to ring buffer. */ -+ jsctx_tree_add(kctx, katom); -+ katom->atom_flags |= KBASE_KATOM_FLAG_JSCTX_IN_TREE; ++ if (!IS_ERR(found_page)) { ++ lock_page(found_page); ++ dma_addr = dma_map_page(&mali_platform_device->dev, found_page, ++ 0, _MALI_OSK_MALI_PAGE_SIZE, DMA_TO_DEVICE); ++ dma_unmap_page(&mali_platform_device->dev, dma_addr, ++ _MALI_OSK_MALI_PAGE_SIZE, DMA_TO_DEVICE); ++ ++ *pagep = found_page; ++ } else { ++ return _MALI_OSK_ERR_NOMEM; + } + -+ return enqueue_required; ++ return _MALI_OSK_ERR_OK; +} + -+/** -+ * kbase_js_move_to_tree - Move atom (and any dependent atoms) to the -+ * runnable_tree, ready for execution -+ * @katom: Atom to submit -+ * -+ * It is assumed that @katom does not have KBASE_KATOM_FLAG_X_DEP_BLOCKED set, -+ * but is still present in the x_dep list. If @katom has a same-slot dependent -+ * atom then that atom (and any dependents) will also be moved. -+ */ -+static void kbase_js_move_to_tree(struct kbase_jd_atom *katom) ++int mali_mem_swap_cow_page_on_demand(mali_mem_backend *mem_bkend, u32 offset, struct page **pagep) +{ -+ lockdep_assert_held(&katom->kctx->kbdev->hwaccess_lock); ++ struct mali_page_node *m_page, *found_node = NULL, *new_node = NULL; ++ mali_mem_cow *cow = NULL; ++ u32 i = 0; + -+ while (katom) { -+ WARN_ON(!(katom->atom_flags & -+ KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST)); ++ MALI_DEBUG_ASSERT(MALI_MEM_COW == mem_bkend->type); ++ MALI_DEBUG_ASSERT(MALI_MEM_BACKEND_FLAG_SWAP_COWED == (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED)); ++ MALI_DEBUG_ASSERT(MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN == (MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN & mem_bkend->flags)); ++ MALI_DEBUG_ASSERT(!mali_memory_swap_backend_in_swapped_pool(mem_bkend)); + -+ if (!(katom->atom_flags & KBASE_KATOM_FLAG_X_DEP_BLOCKED)) { -+ list_del(&katom->queue); -+ katom->atom_flags &= -+ ~KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST; -+ jsctx_tree_add(katom->kctx, katom); -+ katom->atom_flags |= KBASE_KATOM_FLAG_JSCTX_IN_TREE; -+ } else { ++ cow = &mem_bkend->cow_mem; ++ list_for_each_entry(m_page, &cow->pages, list) { ++ if (i == offset) { ++ found_node = m_page; + break; + } -+ -+ katom = katom->post_dep; ++ i++; + } -+} -+ -+ -+/** -+ * kbase_js_evict_deps - Evict dependencies of a failed atom. -+ * @kctx: Context pointer -+ * @katom: Pointer to the atom that has failed. -+ * @js: The job slot the katom was run on. -+ * @prio: Priority of the katom. -+ * -+ * Remove all post dependencies of an atom from the context ringbuffers. -+ * -+ * The original atom's event_code will be propogated to all dependent atoms. -+ * -+ * Context: Caller must hold the HW access lock -+ */ -+static void kbase_js_evict_deps(struct kbase_context *kctx, -+ struct kbase_jd_atom *katom, int js, int prio) -+{ -+ struct kbase_jd_atom *x_dep = katom->x_post_dep; -+ struct kbase_jd_atom *next_katom = katom->post_dep; + -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ if (NULL == found_node) { ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ if (next_katom) { -+ KBASE_DEBUG_ASSERT(next_katom->status != -+ KBASE_JD_ATOM_STATE_HW_COMPLETED); -+ next_katom->will_fail_event_code = katom->event_code; ++ new_node = _mali_mem_swap_page_node_allocate(); + ++ if (NULL == new_node) { ++ return _MALI_OSK_ERR_FAULT; + } + -+ /* Has cross slot depenency. */ -+ if (x_dep && (x_dep->atom_flags & (KBASE_KATOM_FLAG_JSCTX_IN_TREE | -+ KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST))) { -+ /* Remove dependency.*/ -+ x_dep->atom_flags &= ~KBASE_KATOM_FLAG_X_DEP_BLOCKED; ++ new_node->swap_it->idx = mali_mem_swap_idx_alloc(); + -+ /* Fail if it had a data dependency. */ -+ if (x_dep->atom_flags & KBASE_KATOM_FLAG_FAIL_BLOCKER) { -+ x_dep->will_fail_event_code = katom->event_code; -+ } -+ if (x_dep->atom_flags & KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST) -+ kbase_js_move_to_tree(x_dep); ++ if (_MALI_OSK_BITMAP_INVALIDATE_INDEX == new_node->swap_it->idx) { ++ MALI_DEBUG_PRINT(1, ("Failed to allocate swap index in swap CoW on demand.\n")); ++ kfree(new_node->swap_it); ++ kfree(new_node); ++ return _MALI_OSK_ERR_FAULT; + } -+} + -+struct kbase_jd_atom *kbase_js_pull(struct kbase_context *kctx, int js) -+{ -+ struct kbase_jd_atom *katom; -+ struct kbasep_js_device_data *js_devdata; -+ struct kbase_device *kbdev; -+ int pulled; ++ if (MALI_FALSE == mali_mem_swap_in_page_node(new_node)) { ++ _mali_mem_swap_page_node_free(new_node); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ KBASE_DEBUG_ASSERT(kctx); ++ /* swap in found node for copy in kernel. */ ++ if (MALI_FALSE == mali_mem_swap_in_page_node(found_node)) { ++ mali_mem_swap_out_page_node(new_node); ++ _mali_mem_swap_page_node_free(new_node); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ kbdev = kctx->kbdev; ++ _mali_mem_cow_copy_page(found_node, new_node); + -+ js_devdata = &kbdev->js_data; -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ list_replace(&found_node->list, &new_node->list); + -+ if (!kbasep_js_is_submit_allowed(js_devdata, kctx)) -+ return NULL; -+ if (kbase_pm_is_suspending(kbdev)) -+ return NULL; ++ if (1 != _mali_page_node_get_ref_count(found_node)) { ++ atomic_add(1, &mem_bkend->mali_allocation->session->mali_mem_allocated_pages); ++ if (atomic_read(&mem_bkend->mali_allocation->session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE > mem_bkend->mali_allocation->session->max_mali_mem_allocated_size) { ++ mem_bkend->mali_allocation->session->max_mali_mem_allocated_size = atomic_read(&mem_bkend->mali_allocation->session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE; ++ } ++ mem_bkend->cow_mem.change_pages_nr++; ++ } + -+ katom = jsctx_rb_peek(kctx, js); -+ if (!katom) -+ return NULL; -+ if (kctx->blocked_js[js][katom->sched_priority]) -+ return NULL; -+ if (atomic_read(&katom->blocked)) -+ return NULL; ++ mali_mem_swap_out_page_node(found_node); ++ _mali_mem_swap_page_node_free(found_node); + -+ /* Due to ordering restrictions when unpulling atoms on failure, we do -+ * not allow multiple runs of fail-dep atoms from the same context to be -+ * present on the same slot */ -+ if (katom->pre_dep && atomic_read(&kctx->atoms_pulled_slot[js])) { -+ struct kbase_jd_atom *prev_atom = -+ kbase_backend_inspect_tail(kbdev, js); ++ /* When swap in the new page node, we have called dma_map_page for this page.\n */ ++ dma_unmap_page(&mali_platform_device->dev, new_node->swap_it->dma_addr, ++ _MALI_OSK_MALI_PAGE_SIZE, DMA_TO_DEVICE); + -+ if (prev_atom && prev_atom->kctx != kctx) -+ return NULL; -+ } ++ lock_page(new_node->swap_it->page); + -+ if (katom->atom_flags & KBASE_KATOM_FLAG_X_DEP_BLOCKED) { -+ if (katom->x_pre_dep->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB || -+ katom->x_pre_dep->will_fail_event_code) -+ return NULL; -+ if ((katom->atom_flags & KBASE_KATOM_FLAG_FAIL_BLOCKER) && -+ kbase_backend_nr_atoms_on_slot(kbdev, js)) -+ return NULL; -+ } ++ *pagep = new_node->swap_it->page; + -+ kbase_ctx_flag_set(kctx, KCTX_PULLED); ++ return _MALI_OSK_ERR_OK; ++} + -+ pulled = atomic_inc_return(&kctx->atoms_pulled); -+ if (pulled == 1 && !kctx->slots_pullable) { -+ WARN_ON(kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); -+ kbase_ctx_flag_set(kctx, KCTX_RUNNABLE_REF); -+ atomic_inc(&kbdev->js_data.nr_contexts_runnable); -+ } -+ atomic_inc(&kctx->atoms_pulled_slot[katom->slot_nr]); -+ kctx->atoms_pulled_slot_pri[katom->slot_nr][katom->sched_priority]++; -+ jsctx_rb_pull(kctx, katom); ++#ifdef MALI_MEM_SWAP_TRACKING ++void mali_mem_swap_tracking(u32 *swap_pool_size, u32 *unlock_size) ++{ ++ *swap_pool_size = mem_backend_swapped_pool_size; ++ *unlock_size = mem_backend_swapped_unlock_size; ++} ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h +new file mode 100755 +index 000000000..5810960e2 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h +@@ -0,0 +1,121 @@ ++/* ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ ++#ifndef __MALI_MEMORY_SWAP_ALLOC_H__ ++#define __MALI_MEMORY_SWAP_ALLOC_H__ ++ ++#include "mali_osk.h" ++#include "mali_session.h" ++ ++#include "mali_memory_types.h" ++#include "mali_pp_job.h" ++ ++/** ++ * Initialize memory swapping module. ++ */ ++_mali_osk_errcode_t mali_mem_swap_init(void); ++ ++void mali_mem_swap_term(void); ++ ++/** ++ * Return global share memory file to other modules. ++ */ ++struct file *mali_mem_swap_get_global_swap_file(void); ++ ++/** ++ * Unlock the given memory backend and pages in it could be swapped out by kernel. ++ */ ++void mali_mem_swap_unlock_single_mem_backend(mali_mem_backend *mem_bkend); ++ ++/** ++ * Remove the given memory backend from global swap list. ++ */ ++void mali_memory_swap_list_backend_delete(mali_mem_backend *mem_bkend); ++ ++/** ++ * Add the given memory backend to global swap list. ++ */ ++void mali_memory_swap_list_backend_add(mali_mem_backend *mem_bkend); ++ ++/** ++ * Allocate 1 index from bitmap used as page index in global swap file. ++ */ ++u32 mali_mem_swap_idx_alloc(void); ++ ++void mali_mem_swap_idx_free(u32 idx); ++ ++/** ++ * Allocate a new swap item without page index. ++ */ ++struct mali_swap_item *mali_mem_swap_alloc_swap_item(void); ++ ++/** ++ * Free a swap item, truncate the corresponding space in page cache and free index of page. ++ */ ++void mali_mem_swap_free_swap_item(mali_swap_item *swap_item); ++ ++/** ++ * Allocate a page node with swap item. ++ */ ++struct mali_page_node *_mali_mem_swap_page_node_allocate(void); ++ ++/** ++ * Reduce the reference count of given page node and if return 0, just free this page node. ++ */ ++_mali_osk_errcode_t _mali_mem_swap_put_page_node(struct mali_page_node *m_page); ++ ++void _mali_mem_swap_page_node_free(struct mali_page_node *m_page); ++ ++/** ++ * Free a swappable memory backend. ++ */ ++u32 mali_mem_swap_free(mali_mem_swap *swap_mem); ++ ++/** ++ * Ummap and free. ++ */ ++u32 mali_mem_swap_release(mali_mem_backend *mem_bkend, mali_bool is_mali_mapped); ++ ++/** ++ * Read in a page from global swap file with the pre-allcated page index. ++ */ ++mali_bool mali_mem_swap_in_page_node(struct mali_page_node *page_node); ++ ++int mali_mem_swap_alloc_pages(mali_mem_swap *swap_mem, u32 size, u32 *bkend_idx); ++ ++_mali_osk_errcode_t mali_mem_swap_mali_map(mali_mem_swap *swap_mem, struct mali_session_data *session, u32 vaddr, u32 props); ++ ++void mali_mem_swap_mali_unmap(mali_mem_allocation *alloc); ++ ++/** ++ * When pp job created, we need swap in all of memory backend needed by this pp job. ++ */ ++int mali_mem_swap_in_pages(struct mali_pp_job *job); ++ ++/** ++ * Put all of memory backends used this pp job to the global swap list. ++ */ ++int mali_mem_swap_out_pages(struct mali_pp_job *job); ++ ++/** ++ * This will be called in page fault to process CPU read&write. ++ */ ++int mali_mem_swap_allocate_page_on_demand(mali_mem_backend *mem_bkend, u32 offset, struct page **pagep) ; ++ ++/** ++ * Used to process cow on demand for swappable memory backend. ++ */ ++int mali_mem_swap_cow_page_on_demand(mali_mem_backend *mem_bkend, u32 offset, struct page **pagep); ++ ++#ifdef MALI_MEM_SWAP_TRACKING ++void mali_mem_swap_tracking(u32 *swap_pool_size, u32 *unlock_size); ++#endif ++#endif /* __MALI_MEMORY_SWAP_ALLOC_H__ */ ++ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h +new file mode 100755 +index 000000000..33db40929 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h +@@ -0,0 +1,219 @@ ++/* ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ kbasep_js_runpool_retain_ctx_nolock(kbdev, kctx); ++#ifndef __MALI_MEMORY_TYPES_H__ ++#define __MALI_MEMORY_TYPES_H__ + -+ katom->atom_flags |= KBASE_KATOM_FLAG_HOLDING_CTX_REF; ++#include + -+ katom->ticks = 0; ++#if defined(CONFIG_MALI400_UMP) ++#include "ump_kernel_interface.h" ++#endif + -+ return katom; -+} ++typedef u32 mali_address_t; + ++typedef enum mali_mem_type { ++ MALI_MEM_OS, ++ MALI_MEM_EXTERNAL, ++ MALI_MEM_SWAP, ++ MALI_MEM_DMA_BUF, ++ MALI_MEM_UMP, ++ MALI_MEM_BLOCK, ++ MALI_MEM_COW, ++ MALI_MEM_SECURE, ++ MALI_MEM_TYPE_MAX, ++} mali_mem_type; + -+static void js_return_worker(struct work_struct *data) -+{ -+ struct kbase_jd_atom *katom = container_of(data, struct kbase_jd_atom, -+ work); -+ struct kbase_context *kctx = katom->kctx; -+ struct kbase_device *kbdev = kctx->kbdev; -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ struct kbasep_js_kctx_info *js_kctx_info = &kctx->jctx.sched_info; -+ struct kbasep_js_atom_retained_state retained_state; -+ int js = katom->slot_nr; -+ int prio = katom->sched_priority; -+ bool timer_sync = false; -+ bool context_idle = false; -+ unsigned long flags; -+ base_jd_core_req core_req = katom->core_req; -+ u64 affinity = katom->affinity; -+ enum kbase_atom_coreref_state coreref_state = katom->coreref_state; ++typedef struct mali_block_item { ++ /* for block type, the block_phy is alway page size align ++ * so use low 12bit used for ref_cout. ++ */ ++ unsigned long phy_addr; ++} mali_block_item; + -+ KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_EX(katom); ++/** ++ * idx is used to locate the given page in the address space of swap file. ++ * ref_count is used to mark how many memory backends are using this item. ++ */ ++typedef struct mali_swap_item { ++ u32 idx; ++ atomic_t ref_count; ++ struct page *page; ++ dma_addr_t dma_addr; ++} mali_swap_item; + -+ kbase_backend_complete_wq(kbdev, katom); ++typedef enum mali_page_node_type { ++ MALI_PAGE_NODE_OS, ++ MALI_PAGE_NODE_BLOCK, ++ MALI_PAGE_NODE_SWAP, ++} mali_page_node_type; + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8316)) -+ kbase_as_poking_timer_release_atom(kbdev, kctx, katom); ++typedef struct mali_page_node { ++ struct list_head list; ++ union { ++ struct page *page; ++ mali_block_item *blk_it; /*pointer to block item*/ ++ mali_swap_item *swap_it; ++ }; + -+ kbasep_js_atom_retained_state_copy(&retained_state, katom); ++ u32 type; ++} mali_page_node; + -+ mutex_lock(&js_devdata->queue_mutex); -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++typedef struct mali_mem_os_mem { ++ struct list_head pages; ++ u32 count; ++} mali_mem_os_mem; + -+ atomic_dec(&kctx->atoms_pulled); -+ atomic_dec(&kctx->atoms_pulled_slot[js]); ++typedef struct mali_mem_dma_buf { ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++ struct mali_dma_buf_attachment *attachment; ++#endif ++} mali_mem_dma_buf; + -+ atomic_dec(&katom->blocked); ++typedef struct mali_mem_external { ++ dma_addr_t phys; ++ u32 size; ++} mali_mem_external; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++typedef struct mali_mem_ump { ++#if defined(CONFIG_MALI400_UMP) ++ ump_dd_handle handle; ++#endif ++} mali_mem_ump; + -+ kctx->atoms_pulled_slot_pri[js][katom->sched_priority]--; ++typedef struct block_allocator_allocation { ++ /* The list will be released in reverse order */ ++ struct block_info *last_allocated; ++ u32 mapping_length; ++ struct block_allocator *info; ++} block_allocator_allocation; + -+ if (!atomic_read(&kctx->atoms_pulled_slot[js]) && -+ jsctx_rb_none_to_pull(kctx, js)) -+ timer_sync |= kbase_js_ctx_list_remove_nolock(kbdev, kctx, js); ++typedef struct mali_mem_block_mem { ++ struct list_head pfns; ++ u32 count; ++} mali_mem_block_mem; + -+ /* If this slot has been blocked due to soft-stopped atoms, and all -+ * atoms have now been processed, then unblock the slot */ -+ if (!kctx->atoms_pulled_slot_pri[js][prio] && -+ kctx->blocked_js[js][prio]) { -+ kctx->blocked_js[js][prio] = false; ++typedef struct mali_mem_virt_mali_mapping { ++ mali_address_t addr; /* Virtual Mali address */ ++ u32 properties; /* MMU Permissions + cache, must match MMU HW */ ++} mali_mem_virt_mali_mapping; + -+ /* Only mark the slot as pullable if the context is not idle - -+ * that case is handled below */ -+ if (atomic_read(&kctx->atoms_pulled) && -+ kbase_js_ctx_pullable(kctx, js, true)) -+ timer_sync |= kbase_js_ctx_list_add_pullable_nolock( -+ kbdev, kctx, js); -+ } ++typedef struct mali_mem_virt_cpu_mapping { ++ void __user *addr; ++ struct vm_area_struct *vma; ++} mali_mem_virt_cpu_mapping; + -+ if (!atomic_read(&kctx->atoms_pulled)) { -+ if (!kctx->slots_pullable) { -+ WARN_ON(!kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); -+ kbase_ctx_flag_clear(kctx, KCTX_RUNNABLE_REF); -+ atomic_dec(&kbdev->js_data.nr_contexts_runnable); -+ timer_sync = true; -+ } ++#define MALI_MEM_ALLOCATION_VALID_MAGIC 0xdeda110c ++#define MALI_MEM_ALLOCATION_FREED_MAGIC 0x10101010 + -+ if (kctx->as_nr != KBASEP_AS_NR_INVALID && -+ !kbase_ctx_flag(kctx, KCTX_DYING)) { -+ int num_slots = kbdev->gpu_props.num_job_slots; -+ int slot; ++typedef struct mali_mm_node { ++ /* MALI GPU vaddr start, use u32 for mmu only support 32bit address*/ ++ uint32_t start; /* GPU vaddr */ ++ uint32_t size; /* GPU allocation virtual size */ ++ unsigned allocated : 1; ++} mali_mm_node; + -+ if (!kbasep_js_is_submit_allowed(js_devdata, kctx)) -+ kbasep_js_set_submit_allowed(js_devdata, kctx); ++typedef struct mali_vma_node { ++ struct mali_mm_node vm_node; ++ struct rb_node vm_rb; ++} mali_vma_node; + -+ for (slot = 0; slot < num_slots; slot++) { -+ if (kbase_js_ctx_pullable(kctx, slot, true)) -+ timer_sync |= -+ kbase_js_ctx_list_add_pullable_nolock( -+ kbdev, kctx, slot); -+ } -+ } + -+ kbase_jm_idle_ctx(kbdev, kctx); ++typedef struct mali_mem_allocation { ++ MALI_DEBUG_CODE(u32 magic); ++ mali_mem_type type; /**< Type of memory */ ++ u32 flags; /**< Flags for this allocation */ + -+ context_idle = true; -+ } ++ struct mali_session_data *session; /**< Pointer to session that owns the allocation */ + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mali_mem_virt_cpu_mapping cpu_mapping; /**< CPU mapping */ ++ mali_mem_virt_mali_mapping mali_mapping; /**< Mali mapping */ + -+ if (context_idle) { -+ WARN_ON(!kbase_ctx_flag(kctx, KCTX_ACTIVE)); -+ kbase_ctx_flag_clear(kctx, KCTX_ACTIVE); -+ kbase_pm_context_idle(kbdev); -+ } ++ /* add for new memory system */ ++ struct mali_vma_node mali_vma_node; ++ u32 vsize; /* virtual size*/ ++ u32 psize; /* physical backend memory size*/ ++ struct list_head list; ++ s32 backend_handle; /* idr for mem_backend */ ++ _mali_osk_atomic_t mem_alloc_refcount; ++} mali_mem_allocation; + -+ if (timer_sync) -+ kbase_js_sync_timers(kbdev); ++struct mali_mem_os_allocator { ++ spinlock_t pool_lock; ++ struct list_head pool_pages; ++ size_t pool_count; + -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_unlock(&js_devdata->queue_mutex); ++ atomic_t allocated_pages; ++ size_t allocation_limit; + -+ katom->atom_flags &= ~KBASE_KATOM_FLAG_HOLDING_CTX_REF; -+ kbasep_js_runpool_release_ctx_and_katom_retained_state(kbdev, kctx, -+ &retained_state); ++ struct shrinker shrinker; ++ struct delayed_work timed_shrinker; ++ struct workqueue_struct *wq; ++}; + -+ kbase_js_sched_all(kbdev); ++/* COW backend memory type */ ++typedef struct mali_mem_cow { ++ struct list_head pages; /**< all pages for this cow backend allocation, ++ including new allocated pages for modified range*/ ++ u32 count; /**< number of pages */ ++ s32 change_pages_nr; ++} mali_mem_cow; + -+ kbase_backend_complete_wq_post_sched(kbdev, core_req, affinity, -+ coreref_state); -+} ++typedef struct mali_mem_swap { ++ struct list_head pages; ++ u32 count; ++} mali_mem_swap; + -+void kbase_js_unpull(struct kbase_context *kctx, struct kbase_jd_atom *katom) -+{ -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++typedef struct mali_mem_secure { ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++ struct dma_buf *buf; ++ struct dma_buf_attachment *attachment; ++ struct sg_table *sgt; ++#endif ++ u32 count; ++} mali_mem_secure; + -+ jsctx_rb_unpull(kctx, katom); ++#define MALI_MEM_BACKEND_FLAG_COWED (0x1) /* COW has happen on this backend */ ++#define MALI_MEM_BACKEND_FLAG_COW_CPU_NO_WRITE (0x2) /* This is an COW backend, mapped as not allowed cpu to write */ ++#define MALI_MEM_BACKEND_FLAG_SWAP_COWED (0x4) /* Mark the given backend is cowed from swappable memory. */ ++/* Mark this backend is not swapped_in in MALI driver, and before using it, ++ * we should swap it in and set up corresponding page table. */ ++#define MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN (0x8) ++#define MALI_MEM_BACKEND_FLAG_NOT_BINDED (0x1 << 5) /* this backend it not back with physical memory, used for defer bind */ ++#define MALI_MEM_BACKEND_FLAG_BINDED (0x1 << 6) /* this backend it back with physical memory, used for defer bind */ + -+ WARN_ON(work_pending(&katom->work)); ++typedef struct mali_mem_backend { ++ mali_mem_type type; /**< Type of backend memory */ ++ u32 flags; /**< Flags for this allocation */ ++ u32 size; ++ /* Union selected by type. */ ++ union { ++ mali_mem_os_mem os_mem; /**< MALI_MEM_OS */ ++ mali_mem_external ext_mem; /**< MALI_MEM_EXTERNAL */ ++ mali_mem_dma_buf dma_buf; /**< MALI_MEM_DMA_BUF */ ++ mali_mem_ump ump_mem; /**< MALI_MEM_UMP */ ++ mali_mem_block_mem block_mem; /**< MALI_MEM_BLOCK */ ++ mali_mem_cow cow_mem; ++ mali_mem_swap swap_mem; ++ mali_mem_secure secure_mem; ++ }; ++ mali_mem_allocation *mali_allocation; ++ struct mutex mutex; ++ mali_mem_type cow_type; + -+ /* Block re-submission until workqueue has run */ -+ atomic_inc(&katom->blocked); ++ struct list_head list; /**< Used to link swappable memory backend to the global swappable list */ ++ int using_count; /**< Mark how many PP jobs are using this memory backend */ ++ u32 start_idx; /**< If the correspondign vma of this backend is linear, this value will be used to set vma->vm_pgoff */ ++} mali_mem_backend; + -+ kbase_job_check_leave_disjoint(kctx->kbdev, katom); ++#define MALI_MEM_FLAG_MALI_GUARD_PAGE (_MALI_MAP_EXTERNAL_MAP_GUARD_PAGE) ++#define MALI_MEM_FLAG_DONT_CPU_MAP (1 << 1) ++#define MALI_MEM_FLAG_CAN_RESIZE (_MALI_MEMORY_ALLOCATE_RESIZEABLE) ++#endif /* __MALI_MEMORY_TYPES__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c +new file mode 100755 +index 000000000..666d4b0fb +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c +@@ -0,0 +1,154 @@ ++/* ++ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ KBASE_DEBUG_ASSERT(0 == object_is_on_stack(&katom->work)); -+ INIT_WORK(&katom->work, js_return_worker); -+ queue_work(kctx->jctx.job_done_wq, &katom->work); -+} ++#include "mali_ukk.h" ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_session.h" ++#include "mali_kernel_linux.h" ++#include "mali_memory.h" ++#include "ump_kernel_interface.h" + -+bool kbase_js_complete_atom_wq(struct kbase_context *kctx, -+ struct kbase_jd_atom *katom) ++static int mali_mem_ump_map(mali_mem_backend *mem_backend) +{ -+ struct kbasep_js_kctx_info *js_kctx_info; -+ struct kbasep_js_device_data *js_devdata; -+ struct kbase_device *kbdev; -+ unsigned long flags; -+ bool timer_sync = false; -+ int atom_slot; -+ bool context_idle = false; -+ int prio = katom->sched_priority; -+ -+ kbdev = kctx->kbdev; -+ atom_slot = katom->slot_nr; ++ ump_dd_handle ump_mem; ++ mali_mem_allocation *alloc; ++ struct mali_session_data *session; ++ u32 nr_blocks; ++ u32 i; ++ ump_dd_physical_block *ump_blocks; ++ struct mali_page_directory *pagedir; ++ u32 offset = 0; ++ _mali_osk_errcode_t err; + -+ js_kctx_info = &kctx->jctx.sched_info; -+ js_devdata = &kbdev->js_data; ++ MALI_DEBUG_ASSERT_POINTER(mem_backend); ++ MALI_DEBUG_ASSERT(MALI_MEM_UMP == mem_backend->type); + -+ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); ++ alloc = mem_backend->mali_allocation; ++ MALI_DEBUG_ASSERT_POINTER(alloc); + -+ mutex_lock(&js_devdata->runpool_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ session = alloc->session; ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ if (katom->atom_flags & KBASE_KATOM_FLAG_JSCTX_IN_TREE) { -+ context_idle = !atomic_dec_return(&kctx->atoms_pulled); -+ atomic_dec(&kctx->atoms_pulled_slot[atom_slot]); -+ kctx->atoms_pulled_slot_pri[atom_slot][prio]--; ++ ump_mem = mem_backend->ump_mem.handle; ++ MALI_DEBUG_ASSERT(UMP_DD_HANDLE_INVALID != ump_mem); + -+ if (!atomic_read(&kctx->atoms_pulled) && -+ !kctx->slots_pullable) { -+ WARN_ON(!kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); -+ kbase_ctx_flag_clear(kctx, KCTX_RUNNABLE_REF); -+ atomic_dec(&kbdev->js_data.nr_contexts_runnable); -+ timer_sync = true; -+ } ++ nr_blocks = ump_dd_phys_block_count_get(ump_mem); ++ if (nr_blocks == 0) { ++ MALI_DEBUG_PRINT(1, ("No block count\n")); ++ return -EINVAL; ++ } + -+ /* If this slot has been blocked due to soft-stopped atoms, and -+ * all atoms have now been processed, then unblock the slot */ -+ if (!kctx->atoms_pulled_slot_pri[atom_slot][prio] -+ && kctx->blocked_js[atom_slot][prio]) { -+ kctx->blocked_js[atom_slot][prio] = false; -+ if (kbase_js_ctx_pullable(kctx, atom_slot, true)) -+ timer_sync |= -+ kbase_js_ctx_list_add_pullable_nolock( -+ kbdev, kctx, atom_slot); -+ } ++ ump_blocks = _mali_osk_malloc(sizeof(*ump_blocks) * nr_blocks); ++ if (NULL == ump_blocks) { ++ return -ENOMEM; + } -+ WARN_ON(!(katom->atom_flags & KBASE_KATOM_FLAG_JSCTX_IN_TREE)); + -+ if (!atomic_read(&kctx->atoms_pulled_slot[atom_slot]) && -+ jsctx_rb_none_to_pull(kctx, atom_slot)) { -+ if (!list_empty( -+ &kctx->jctx.sched_info.ctx.ctx_list_entry[atom_slot])) -+ timer_sync |= kbase_js_ctx_list_remove_nolock( -+ kctx->kbdev, kctx, atom_slot); ++ if (UMP_DD_INVALID == ump_dd_phys_blocks_get(ump_mem, ump_blocks, nr_blocks)) { ++ _mali_osk_free(ump_blocks); ++ return -EFAULT; + } + -+ /* -+ * If submission is disabled on this context (most likely due to an -+ * atom failure) and there are now no atoms left in the system then -+ * re-enable submission so that context can be scheduled again. -+ */ -+ if (!kbasep_js_is_submit_allowed(js_devdata, kctx) && -+ !atomic_read(&kctx->atoms_pulled) && -+ !kbase_ctx_flag(kctx, KCTX_DYING)) { -+ int js; ++ pagedir = session->page_directory; + -+ kbasep_js_set_submit_allowed(js_devdata, kctx); ++ mali_session_memory_lock(session); + -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ if (kbase_js_ctx_pullable(kctx, js, true)) -+ timer_sync |= -+ kbase_js_ctx_list_add_pullable_nolock( -+ kbdev, kctx, js); -+ } -+ } else if (katom->x_post_dep && -+ kbasep_js_is_submit_allowed(js_devdata, kctx)) { -+ int js; ++ err = mali_mem_mali_map_prepare(alloc); ++ if (_MALI_OSK_ERR_OK != err) { ++ MALI_DEBUG_PRINT(1, ("Mapping of UMP memory failed\n")); + -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ if (kbase_js_ctx_pullable(kctx, js, true)) -+ timer_sync |= -+ kbase_js_ctx_list_add_pullable_nolock( -+ kbdev, kctx, js); -+ } ++ _mali_osk_free(ump_blocks); ++ mali_session_memory_unlock(session); ++ return -ENOMEM; + } + -+ /* Mark context as inactive. The pm reference will be dropped later in -+ * jd_done_worker(). -+ */ -+ if (context_idle) -+ kbase_ctx_flag_clear(kctx, KCTX_ACTIVE); -+ -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ if (timer_sync) -+ kbase_backend_ctx_count_changed(kbdev); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ -+ return context_idle; -+} ++ for (i = 0; i < nr_blocks; ++i) { ++ u32 virt = alloc->mali_vma_node.vm_node.start + offset; + -+struct kbase_jd_atom *kbase_js_complete_atom(struct kbase_jd_atom *katom, -+ ktime_t *end_timestamp) -+{ -+ struct kbase_device *kbdev; -+ struct kbase_context *kctx = katom->kctx; -+ struct kbase_jd_atom *x_dep = katom->x_post_dep; ++ MALI_DEBUG_PRINT(7, ("Mapping in 0x%08x size %d\n", ump_blocks[i].addr , ump_blocks[i].size)); + -+ kbdev = kctx->kbdev; ++ mali_mmu_pagedir_update(pagedir, virt, ump_blocks[i].addr, ++ ump_blocks[i].size, MALI_MMU_FLAGS_DEFAULT); + ++ offset += ump_blocks[i].size; ++ } + -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ if (alloc->flags & _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE) { ++ u32 virt = alloc->mali_vma_node.vm_node.start + offset; + -+ if (katom->will_fail_event_code) -+ katom->event_code = katom->will_fail_event_code; ++ /* Map in an extra virtual guard page at the end of the VMA */ ++ MALI_DEBUG_PRINT(6, ("Mapping in extra guard page\n")); + -+ katom->status = KBASE_JD_ATOM_STATE_HW_COMPLETED; ++ mali_mmu_pagedir_update(pagedir, virt, ump_blocks[0].addr, _MALI_OSK_MALI_PAGE_SIZE, MALI_MMU_FLAGS_DEFAULT); + -+ if (katom->event_code != BASE_JD_EVENT_DONE) { -+ kbase_js_evict_deps(kctx, katom, katom->slot_nr, -+ katom->sched_priority); ++ offset += _MALI_OSK_MALI_PAGE_SIZE; + } ++ mali_session_memory_unlock(session); ++ _mali_osk_free(ump_blocks); ++ return 0; ++} + -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+ kbase_trace_mali_job_slots_event(GATOR_MAKE_EVENT(GATOR_JOB_SLOT_STOP, -+ katom->slot_nr), NULL, 0); -+#endif ++static void mali_mem_ump_unmap(mali_mem_allocation *alloc) ++{ ++ struct mali_session_data *session; ++ MALI_DEBUG_ASSERT_POINTER(alloc); ++ session = alloc->session; ++ MALI_DEBUG_ASSERT_POINTER(session); ++ mali_session_memory_lock(session); ++ mali_mem_mali_map_free(session, alloc->psize, alloc->mali_vma_node.vm_node.start, ++ alloc->flags); ++ mali_session_memory_unlock(session); ++} + -+ kbase_jd_done(katom, katom->slot_nr, end_timestamp, 0); ++int mali_mem_bind_ump_buf(mali_mem_allocation *alloc, mali_mem_backend *mem_backend, u32 secure_id, u32 flags) ++{ ++ ump_dd_handle ump_mem; ++ int ret; ++ MALI_DEBUG_ASSERT_POINTER(alloc); ++ MALI_DEBUG_ASSERT_POINTER(mem_backend); ++ MALI_DEBUG_ASSERT(MALI_MEM_UMP == mem_backend->type); + -+ /* Unblock cross dependency if present */ -+ if (x_dep && (katom->event_code == BASE_JD_EVENT_DONE || -+ !(x_dep->atom_flags & KBASE_KATOM_FLAG_FAIL_BLOCKER)) && -+ (x_dep->atom_flags & KBASE_KATOM_FLAG_X_DEP_BLOCKED)) { -+ bool was_pullable = kbase_js_ctx_pullable(kctx, x_dep->slot_nr, -+ false); -+ x_dep->atom_flags &= ~KBASE_KATOM_FLAG_X_DEP_BLOCKED; -+ kbase_js_move_to_tree(x_dep); -+ if (!was_pullable && kbase_js_ctx_pullable(kctx, x_dep->slot_nr, -+ false)) -+ kbase_js_ctx_list_add_pullable_nolock(kbdev, kctx, -+ x_dep->slot_nr); ++ MALI_DEBUG_PRINT(3, ++ ("Requested to map ump memory with secure id %d into virtual memory 0x%08X, size 0x%08X\n", ++ secure_id, alloc->mali_vma_node.vm_node.start, alloc->mali_vma_node.vm_node.size)); + -+ if (x_dep->atom_flags & KBASE_KATOM_FLAG_JSCTX_IN_TREE) -+ return x_dep; ++ ump_mem = ump_dd_handle_create_from_secure_id(secure_id); ++ if (UMP_DD_HANDLE_INVALID == ump_mem) MALI_ERROR(_MALI_OSK_ERR_FAULT); ++ alloc->flags |= MALI_MEM_FLAG_DONT_CPU_MAP; ++ if (flags & _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE) { ++ alloc->flags |= MALI_MEM_FLAG_MALI_GUARD_PAGE; + } + -+ return NULL; ++ mem_backend->ump_mem.handle = ump_mem; ++ ++ ret = mali_mem_ump_map(mem_backend); ++ if (0 != ret) { ++ ump_dd_reference_release(ump_mem); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ MALI_DEBUG_PRINT(3, ("Returning from UMP bind\n")); ++ return _MALI_OSK_ERR_OK; +} + -+void kbase_js_sched(struct kbase_device *kbdev, int js_mask) ++void mali_mem_unbind_ump_buf(mali_mem_backend *mem_backend) +{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbase_context *last_active; -+ bool timer_sync = false; -+ bool ctx_waiting = false; ++ ump_dd_handle ump_mem; ++ mali_mem_allocation *alloc; ++ MALI_DEBUG_ASSERT_POINTER(mem_backend); ++ MALI_DEBUG_ASSERT(MALI_MEM_UMP == mem_backend->type); ++ ump_mem = mem_backend->ump_mem.handle; ++ MALI_DEBUG_ASSERT(UMP_DD_HANDLE_INVALID != ump_mem); + -+ js_devdata = &kbdev->js_data; ++ alloc = mem_backend->mali_allocation; ++ MALI_DEBUG_ASSERT_POINTER(alloc); ++ mali_mem_ump_unmap(alloc); ++ ump_dd_reference_release(ump_mem); ++} + -+ down(&js_devdata->schedule_sem); -+ mutex_lock(&js_devdata->queue_mutex); +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h +new file mode 100755 +index 000000000..c314c8dcb +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h +@@ -0,0 +1,29 @@ ++/* ++ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ last_active = kbdev->hwaccess.active_kctx; ++#ifndef __MALI_MEMORY_UMP_BUF_H__ ++#define __MALI_MEMORY_UMP_BUF_H__ + -+ while (js_mask) { -+ int js; ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ js = ffs(js_mask) - 1; ++#include "mali_uk_types.h" ++#include "mali_osk.h" ++#include "mali_memory.h" + -+ while (1) { -+ struct kbase_context *kctx; -+ unsigned long flags; -+ bool context_idle = false; ++int mali_mem_bind_ump_buf(mali_mem_allocation *alloc, mali_mem_backend *mem_backend, u32 secure_id, u32 flags); ++void mali_mem_unbind_ump_buf(mali_mem_backend *mem_backend); + -+ kctx = kbase_js_ctx_list_pop_head(kbdev, js); ++#ifdef __cplusplus ++} ++#endif + -+ if (!kctx) { -+ js_mask &= ~(1 << js); -+ break; /* No contexts on pullable list */ -+ } ++#endif /* __MALI_MEMORY_DMA_BUF_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c +new file mode 100755 +index 000000000..8e13e923c +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c +@@ -0,0 +1,158 @@ ++/* ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ if (!kbase_ctx_flag(kctx, KCTX_ACTIVE)) { -+ context_idle = true; ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+ if (kbase_pm_context_active_handle_suspend( -+ kbdev, -+ KBASE_PM_SUSPEND_HANDLER_DONT_INCREASE)) { -+ /* Suspend pending - return context to -+ * queue and stop scheduling */ -+ mutex_lock( -+ &kctx->jctx.sched_info.ctx.jsctx_mutex); -+ if (kbase_js_ctx_list_add_pullable_head( -+ kctx->kbdev, kctx, js)) -+ kbase_js_sync_timers(kbdev); -+ mutex_unlock( -+ &kctx->jctx.sched_info.ctx.jsctx_mutex); -+ mutex_unlock(&js_devdata->queue_mutex); -+ up(&js_devdata->schedule_sem); -+ return; -+ } -+ kbase_ctx_flag_set(kctx, KCTX_ACTIVE); -+ } ++#include "mali_osk.h" ++#include "mali_osk_mali.h" ++#include "mali_kernel_linux.h" ++#include "mali_scheduler.h" + -+ if (!kbase_js_use_ctx(kbdev, kctx)) { -+ mutex_lock( -+ &kctx->jctx.sched_info.ctx.jsctx_mutex); -+ /* Context can not be used at this time */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ if (kbase_js_ctx_pullable(kctx, js, false) -+ || kbase_ctx_flag(kctx, KCTX_PRIVILEGED)) -+ timer_sync |= -+ kbase_js_ctx_list_add_pullable_head_nolock( -+ kctx->kbdev, kctx, js); -+ else -+ timer_sync |= -+ kbase_js_ctx_list_add_unpullable_nolock( -+ kctx->kbdev, kctx, js); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, -+ flags); -+ mutex_unlock( -+ &kctx->jctx.sched_info.ctx.jsctx_mutex); -+ if (context_idle) { -+ WARN_ON(!kbase_ctx_flag(kctx, KCTX_ACTIVE)); -+ kbase_ctx_flag_clear(kctx, KCTX_ACTIVE); -+ kbase_pm_context_idle(kbdev); -+ } ++#include "mali_memory.h" ++#include "mali_memory_os_alloc.h" ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++#include "mali_memory_dma_buf.h" ++#include "mali_memory_secure.h" ++#endif ++#if defined(CONFIG_MALI400_UMP) ++#include "mali_memory_ump.h" ++#endif ++#include "mali_memory_external.h" ++#include "mali_memory_manager.h" ++#include "mali_memory_virtual.h" ++#include "mali_memory_cow.h" ++#include "mali_memory_block_alloc.h" ++#include "mali_memory_swap_alloc.h" + -+ /* No more jobs can be submitted on this slot */ -+ js_mask &= ~(1 << js); -+ break; -+ } -+ mutex_lock(&kctx->jctx.sched_info.ctx.jsctx_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ kbase_ctx_flag_clear(kctx, KCTX_PULLED); + -+ if (!kbase_jm_kick(kbdev, 1 << js)) -+ /* No more jobs can be submitted on this slot */ -+ js_mask &= ~(1 << js); ++/** ++*function @_mali_free_allocation_mem - free a memory allocation ++*/ ++static u32 _mali_free_allocation_mem(mali_mem_allocation *mali_alloc) ++{ ++ mali_mem_backend *mem_bkend = NULL; ++ u32 free_pages_nr = 0; + -+ if (!kbase_ctx_flag(kctx, KCTX_PULLED)) { -+ bool pullable = kbase_js_ctx_pullable(kctx, js, -+ true); ++ struct mali_session_data *session = mali_alloc->session; ++ MALI_DEBUG_PRINT(4, (" _mali_free_allocation_mem, psize =0x%x! \n", mali_alloc->psize)); ++ if (0 == mali_alloc->psize) ++ goto out; + -+ /* Failed to pull jobs - push to head of list. -+ * Unless this context is already 'active', in -+ * which case it's effectively already scheduled -+ * so push it to the back of the list. */ -+ if (pullable && kctx == last_active) -+ timer_sync |= -+ kbase_js_ctx_list_add_pullable_nolock( -+ kctx->kbdev, -+ kctx, js); -+ else if (pullable) -+ timer_sync |= -+ kbase_js_ctx_list_add_pullable_head_nolock( -+ kctx->kbdev, -+ kctx, js); -+ else -+ timer_sync |= -+ kbase_js_ctx_list_add_unpullable_nolock( -+ kctx->kbdev, -+ kctx, js); ++ /* Get backend memory & Map on CPU */ ++ mutex_lock(&mali_idr_mutex); ++ mem_bkend = idr_find(&mali_backend_idr, mali_alloc->backend_handle); ++ mutex_unlock(&mali_idr_mutex); ++ MALI_DEBUG_ASSERT(NULL != mem_bkend); + -+ /* If this context is not the active context, -+ * but the active context is pullable on this -+ * slot, then we need to remove the active -+ * marker to prevent it from submitting atoms in -+ * the IRQ handler, which would prevent this -+ * context from making progress. */ -+ if (last_active && kctx != last_active && -+ kbase_js_ctx_pullable( -+ last_active, js, true)) -+ ctx_waiting = true; -+ -+ if (context_idle) { -+ kbase_jm_idle_ctx(kbdev, kctx); -+ spin_unlock_irqrestore( -+ &kbdev->hwaccess_lock, -+ flags); -+ WARN_ON(!kbase_ctx_flag(kctx, KCTX_ACTIVE)); -+ kbase_ctx_flag_clear(kctx, KCTX_ACTIVE); -+ kbase_pm_context_idle(kbdev); -+ } else { -+ spin_unlock_irqrestore( -+ &kbdev->hwaccess_lock, -+ flags); -+ } -+ mutex_unlock( -+ &kctx->jctx.sched_info.ctx.jsctx_mutex); -+ -+ js_mask &= ~(1 << js); -+ break; /* Could not run atoms on this slot */ -+ } ++ switch (mem_bkend->type) { ++ case MALI_MEM_OS: ++ free_pages_nr = mali_mem_os_release(mem_bkend); ++ atomic_sub(free_pages_nr, &session->mali_mem_allocated_pages); ++ break; ++ case MALI_MEM_UMP: ++#if defined(CONFIG_MALI400_UMP) ++ mali_mem_unbind_ump_buf(mem_bkend); ++ atomic_sub(mem_bkend->size / MALI_MMU_PAGE_SIZE, &session->mali_mem_array[mem_bkend->type]); ++#else ++ MALI_DEBUG_PRINT(1, ("UMP not supported\n")); ++#endif ++ break; ++ case MALI_MEM_DMA_BUF: ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++ mali_mem_unbind_dma_buf(mem_bkend); ++ atomic_sub(mem_bkend->size / MALI_MMU_PAGE_SIZE, &session->mali_mem_array[mem_bkend->type]); ++#else ++ MALI_DEBUG_PRINT(1, ("DMA not supported\n")); ++#endif ++ break; ++ case MALI_MEM_EXTERNAL: ++ mali_mem_unbind_ext_buf(mem_bkend); ++ atomic_sub(mem_bkend->size / MALI_MMU_PAGE_SIZE, &session->mali_mem_array[mem_bkend->type]); ++ break; + -+ /* Push to back of list */ -+ if (kbase_js_ctx_pullable(kctx, js, true)) -+ timer_sync |= -+ kbase_js_ctx_list_add_pullable_nolock( -+ kctx->kbdev, kctx, js); -+ else -+ timer_sync |= -+ kbase_js_ctx_list_add_unpullable_nolock( -+ kctx->kbdev, kctx, js); ++ case MALI_MEM_BLOCK: ++ free_pages_nr = mali_mem_block_release(mem_bkend); ++ atomic_sub(free_pages_nr, &session->mali_mem_allocated_pages); ++ break; + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kctx->jctx.sched_info.ctx.jsctx_mutex); ++ case MALI_MEM_COW: ++ if (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED) { ++ free_pages_nr = mali_mem_swap_release(mem_bkend, MALI_TRUE); ++ } else { ++ free_pages_nr = mali_mem_cow_release(mem_bkend, MALI_TRUE); + } ++ atomic_sub(free_pages_nr, &session->mali_mem_allocated_pages); ++ break; ++ case MALI_MEM_SWAP: ++ free_pages_nr = mali_mem_swap_release(mem_bkend, MALI_TRUE); ++ atomic_sub(free_pages_nr, &session->mali_mem_allocated_pages); ++ atomic_sub(free_pages_nr, &session->mali_mem_array[mem_bkend->type]); ++ break; ++ case MALI_MEM_SECURE: ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++ free_pages_nr = mali_mem_secure_release(mem_bkend); ++ atomic_sub(free_pages_nr, &session->mali_mem_allocated_pages); ++#else ++ MALI_DEBUG_PRINT(1, ("DMA not supported for mali secure memory\n")); ++#endif ++ break; ++ default: ++ MALI_DEBUG_PRINT(1, ("mem type %d is not in the mali_mem_type enum.\n", mem_bkend->type)); ++ break; + } + -+ if (timer_sync) -+ kbase_js_sync_timers(kbdev); -+ -+ if (kbdev->hwaccess.active_kctx == last_active && ctx_waiting) -+ kbdev->hwaccess.active_kctx = NULL; -+ -+ mutex_unlock(&js_devdata->queue_mutex); -+ up(&js_devdata->schedule_sem); ++ /*Remove backend memory idex */ ++ mutex_lock(&mali_idr_mutex); ++ idr_remove(&mali_backend_idr, mali_alloc->backend_handle); ++ mutex_unlock(&mali_idr_mutex); ++ kfree(mem_bkend); ++out: ++ /* remove memory allocation */ ++ mali_vma_offset_remove(&session->allocation_mgr, &mali_alloc->mali_vma_node); ++ mali_mem_allocation_struct_destory(mali_alloc); ++ return free_pages_nr; +} + -+void kbase_js_zap_context(struct kbase_context *kctx) ++/** ++* ref_count for allocation ++*/ ++u32 mali_allocation_unref(struct mali_mem_allocation **alloc) +{ -+ struct kbase_device *kbdev = kctx->kbdev; -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ struct kbasep_js_kctx_info *js_kctx_info = &kctx->jctx.sched_info; -+ int js; -+ -+ /* -+ * Critical assumption: No more submission is possible outside of the -+ * workqueue. This is because the OS *must* prevent U/K calls (IOCTLs) -+ * whilst the struct kbase_context is terminating. -+ */ -+ -+ /* First, atomically do the following: -+ * - mark the context as dying -+ * - try to evict it from the queue */ -+ mutex_lock(&kctx->jctx.lock); -+ mutex_lock(&js_devdata->queue_mutex); -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); -+ kbase_ctx_flag_set(kctx, KCTX_DYING); -+ -+ dev_dbg(kbdev->dev, "Zap: Try Evict Ctx %p", kctx); -+ -+ /* -+ * At this point we know: -+ * - If eviction succeeded, it was in the queue, but now no -+ * longer is -+ * - We must cancel the jobs here. No Power Manager active reference to -+ * release. -+ * - This happens asynchronously - kbase_jd_zap_context() will wait for -+ * those jobs to be killed. -+ * - If eviction failed, then it wasn't in the queue. It is one -+ * of the following: -+ * - a. it didn't have any jobs, and so is not in the Queue or -+ * the Run Pool (not scheduled) -+ * - Hence, no more work required to cancel jobs. No Power Manager -+ * active reference to release. -+ * - b. it was in the middle of a scheduling transaction (and thus must -+ * have at least 1 job). This can happen from a syscall or a -+ * kernel thread. We still hold the jsctx_mutex, and so the thread -+ * must be waiting inside kbasep_js_try_schedule_head_ctx(), -+ * before checking whether the runpool is full. That thread will -+ * continue after we drop the mutex, and will notice the context -+ * is dying. It will rollback the transaction, killing all jobs at -+ * the same time. kbase_jd_zap_context() will wait for those jobs -+ * to be killed. -+ * - Hence, no more work required to cancel jobs, or to release the -+ * Power Manager active reference. -+ * - c. it is scheduled, and may or may not be running jobs -+ * - We must cause it to leave the runpool by stopping it from -+ * submitting any more jobs. When it finally does leave, -+ * kbasep_js_runpool_requeue_or_kill_ctx() will kill all remaining jobs -+ * (because it is dying), release the Power Manager active reference, -+ * and will not requeue the context in the queue. -+ * kbase_jd_zap_context() will wait for those jobs to be killed. -+ * - Hence, work required just to make it leave the runpool. Cancelling -+ * jobs and releasing the Power manager active reference will be -+ * handled when it leaves the runpool. -+ */ -+ if (!kbase_ctx_flag(kctx, KCTX_SCHEDULED)) { -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ if (!list_empty( -+ &kctx->jctx.sched_info.ctx.ctx_list_entry[js])) -+ list_del_init( -+ &kctx->jctx.sched_info.ctx.ctx_list_entry[js]); -+ } -+ -+ /* The following events require us to kill off remaining jobs -+ * and update PM book-keeping: -+ * - we evicted it correctly (it must have jobs to be in the -+ * Queue) -+ * -+ * These events need no action, but take this path anyway: -+ * - Case a: it didn't have any jobs, and was never in the Queue -+ * - Case b: scheduling transaction will be partially rolled- -+ * back (this already cancels the jobs) -+ */ -+ -+ KBASE_TRACE_ADD(kbdev, JM_ZAP_NON_SCHEDULED, kctx, NULL, 0u, -+ kbase_ctx_flag(kctx, KCTX_SCHEDULED)); -+ -+ dev_dbg(kbdev->dev, "Zap: Ctx %p scheduled=0", kctx); -+ -+ /* Only cancel jobs when we evicted from the -+ * queue. No Power Manager active reference was held. -+ * -+ * Having is_dying set ensures that this kills, and -+ * doesn't requeue */ -+ kbasep_js_runpool_requeue_or_kill_ctx(kbdev, kctx, false); -+ -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_unlock(&js_devdata->queue_mutex); -+ mutex_unlock(&kctx->jctx.lock); -+ } else { -+ unsigned long flags; -+ bool was_retained; -+ -+ /* Case c: didn't evict, but it is scheduled - it's in the Run -+ * Pool */ -+ KBASE_TRACE_ADD(kbdev, JM_ZAP_SCHEDULED, kctx, NULL, 0u, -+ kbase_ctx_flag(kctx, KCTX_SCHEDULED)); -+ dev_dbg(kbdev->dev, "Zap: Ctx %p is in RunPool", kctx); -+ -+ /* Disable the ctx from submitting any more jobs */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ -+ kbasep_js_clear_submit_allowed(js_devdata, kctx); -+ -+ /* Retain and (later) release the context whilst it is is now -+ * disallowed from submitting jobs - ensures that someone -+ * somewhere will be removing the context later on */ -+ was_retained = kbasep_js_runpool_retain_ctx_nolock(kbdev, kctx); -+ -+ /* Since it's scheduled and we have the jsctx_mutex, it must be -+ * retained successfully */ -+ KBASE_DEBUG_ASSERT(was_retained); -+ -+ dev_dbg(kbdev->dev, "Zap: Ctx %p Kill Any Running jobs", kctx); -+ -+ /* Cancel any remaining running jobs for this kctx - if any. -+ * Submit is disallowed which takes effect immediately, so no -+ * more new jobs will appear after we do this. */ -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) -+ kbase_job_slot_hardstop(kctx, js, NULL); -+ -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_unlock(&js_devdata->queue_mutex); -+ mutex_unlock(&kctx->jctx.lock); -+ -+ dev_dbg(kbdev->dev, "Zap: Ctx %p Release (may or may not schedule out immediately)", -+ kctx); -+ -+ kbasep_js_runpool_release_ctx(kbdev, kctx); ++ u32 free_pages_nr = 0; ++ mali_mem_allocation *mali_alloc = *alloc; ++ *alloc = NULL; ++ if (0 == _mali_osk_atomic_dec_return(&mali_alloc->mem_alloc_refcount)) { ++ free_pages_nr = _mali_free_allocation_mem(mali_alloc); + } -+ -+ KBASE_TRACE_ADD(kbdev, JM_ZAP_DONE, kctx, NULL, 0u, 0u); -+ -+ /* After this, you must wait on both the -+ * kbase_jd_context::zero_jobs_wait and the -+ * kbasep_js_kctx_info::ctx::is_scheduled_waitq - to wait for the jobs -+ * to be destroyed, and the context to be de-scheduled (if it was on the -+ * runpool). -+ * -+ * kbase_jd_zap_context() will do this. */ ++ return free_pages_nr; +} + -+static inline int trace_get_refcnt(struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++void mali_allocation_ref(struct mali_mem_allocation *alloc) +{ -+ return atomic_read(&kctx->refcount); ++ _mali_osk_atomic_inc(&alloc->mem_alloc_refcount); +} + -+/** -+ * kbase_js_foreach_ctx_job(): - Call a function on all jobs in context -+ * @kctx: Pointer to context. -+ * @callback: Pointer to function to call for each job. -+ * -+ * Call a function on all jobs belonging to a non-queued, non-running -+ * context, and detach the jobs from the context as it goes. -+ * -+ * Due to the locks that might be held at the time of the call, the callback -+ * may need to defer work on a workqueue to complete its actions (e.g. when -+ * cancelling jobs) -+ * -+ * Atoms will be removed from the queue, so this must only be called when -+ * cancelling jobs (which occurs as part of context destruction). -+ * -+ * The locking conditions on the caller are as follows: -+ * - it will be holding kbasep_js_kctx_info::ctx::jsctx_mutex. -+ */ -+static void kbase_js_foreach_ctx_job(struct kbase_context *kctx, -+ kbasep_js_ctx_job_cb callback) ++void mali_free_session_allocations(struct mali_session_data *session) +{ -+ struct kbase_device *kbdev; -+ unsigned long flags; -+ u32 js; -+ -+ kbdev = kctx->kbdev; -+ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ -+ KBASE_TRACE_ADD_REFCOUNT(kbdev, JS_POLICY_FOREACH_CTX_JOBS, kctx, NULL, -+ 0u, trace_get_refcnt(kbdev, kctx)); ++ struct mali_mem_allocation *entry, *next; + -+ /* Invoke callback on jobs on each slot in turn */ -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) -+ jsctx_queue_foreach(kctx, js, callback); ++ MALI_DEBUG_PRINT(4, (" mali_free_session_allocations! \n")); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ list_for_each_entry_safe(entry, next, &session->allocation_mgr.head, list) { ++ mali_allocation_unref(&entry); ++ } +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js.h +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h new file mode 100755 -index 000000000000..ddada8e468a1 +index 000000000..33ac99509 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js.h -@@ -0,0 +1,925 @@ ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h +@@ -0,0 +1,20 @@ ++/* ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ ++#ifndef __MALI_MEMORY_UTIL_H__ ++#define __MALI_MEMORY_UTIL_H__ ++ ++u32 mali_allocation_unref(struct mali_mem_allocation **alloc); ++ ++void mali_allocation_ref(struct mali_mem_allocation *alloc); ++ ++void mali_free_session_allocations(struct mali_session_data *session); ++ ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c +new file mode 100755 +index 000000000..0b31e3a23 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c +@@ -0,0 +1,127 @@ ++/* ++ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "mali_osk.h" ++#include "mali_osk_mali.h" ++#include "mali_kernel_linux.h" ++#include "mali_scheduler.h" ++#include "mali_memory_os_alloc.h" ++#include "mali_memory_manager.h" ++#include "mali_memory_virtual.h" ++ ++ ++/** ++*internal helper to link node into the rb-tree ++*/ ++static inline void _mali_vma_offset_add_rb(struct mali_allocation_manager *mgr, ++ struct mali_vma_node *node) ++{ ++ struct rb_node **iter = &mgr->allocation_mgr_rb.rb_node; ++ struct rb_node *parent = NULL; ++ struct mali_vma_node *iter_node; ++ ++ while (likely(*iter)) { ++ parent = *iter; ++ iter_node = rb_entry(*iter, struct mali_vma_node, vm_rb); ++ ++ if (node->vm_node.start < iter_node->vm_node.start) ++ iter = &(*iter)->rb_left; ++ else if (node->vm_node.start > iter_node->vm_node.start) ++ iter = &(*iter)->rb_right; ++ else ++ MALI_DEBUG_ASSERT(0); ++ } ++ ++ rb_link_node(&node->vm_rb, parent, iter); ++ rb_insert_color(&node->vm_rb, &mgr->allocation_mgr_rb); ++} ++ ++/** ++ * mali_vma_offset_add() - Add offset node to RB Tree ++ */ ++int mali_vma_offset_add(struct mali_allocation_manager *mgr, ++ struct mali_vma_node *node) ++{ ++ int ret = 0; ++ write_lock(&mgr->vm_lock); ++ ++ if (node->vm_node.allocated) { ++ goto out; ++ } ++ ++ _mali_vma_offset_add_rb(mgr, node); ++ /* set to allocated */ ++ node->vm_node.allocated = 1; ++ ++out: ++ write_unlock(&mgr->vm_lock); ++ return ret; ++} ++ ++/** ++ * mali_vma_offset_remove() - Remove offset node from RB tree ++ */ ++void mali_vma_offset_remove(struct mali_allocation_manager *mgr, ++ struct mali_vma_node *node) ++{ ++ write_lock(&mgr->vm_lock); ++ ++ if (node->vm_node.allocated) { ++ rb_erase(&node->vm_rb, &mgr->allocation_mgr_rb); ++ memset(&node->vm_node, 0, sizeof(node->vm_node)); ++ } ++ write_unlock(&mgr->vm_lock); ++} ++ ++/** ++* mali_vma_offset_search - Search the node in RB tree ++*/ ++struct mali_vma_node *mali_vma_offset_search(struct mali_allocation_manager *mgr, ++ unsigned long start, unsigned long pages) ++{ ++ struct mali_vma_node *node, *best; ++ struct rb_node *iter; ++ unsigned long offset; ++ read_lock(&mgr->vm_lock); ++ ++ iter = mgr->allocation_mgr_rb.rb_node; ++ best = NULL; ++ ++ while (likely(iter)) { ++ node = rb_entry(iter, struct mali_vma_node, vm_rb); ++ offset = node->vm_node.start; ++ if (start >= offset) { ++ iter = iter->rb_right; ++ best = node; ++ if (start == offset) ++ break; ++ } else { ++ iter = iter->rb_left; ++ } ++ } ++ ++ if (best) { ++ offset = best->vm_node.start + best->vm_node.size; ++ if (offset <= start + pages) ++ best = NULL; ++ } ++ read_unlock(&mgr->vm_lock); ++ ++ return best; ++} ++ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h +new file mode 100755 +index 000000000..fd03ed9f2 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h +@@ -0,0 +1,35 @@ ++/* ++ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#ifndef __MALI_GPU_VMEM_H__ ++#define __MALI_GPU_VMEM_H__ ++ ++#include "mali_osk.h" ++#include "mali_session.h" ++#include ++#include ++#include ++#include ++#include ++#include "mali_memory_types.h" ++#include "mali_memory_os_alloc.h" ++#include "mali_memory_manager.h" ++ ++ ++ ++int mali_vma_offset_add(struct mali_allocation_manager *mgr, ++ struct mali_vma_node *node); ++ ++void mali_vma_offset_remove(struct mali_allocation_manager *mgr, ++ struct mali_vma_node *node); ++ ++struct mali_vma_node *mali_vma_offset_search(struct mali_allocation_manager *mgr, ++ unsigned long start, unsigned long pages); ++ ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c +new file mode 100755 +index 000000000..5bc0e52eb +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c +@@ -0,0 +1,59 @@ +/* -+ * -+ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + -+ -+ -+ -+ +/** -+ * @file mali_kbase_js.h -+ * Job Scheduler APIs. ++ * @file mali_osk_atomics.c ++ * Implementation of the OS abstraction layer for the kernel device driver + */ + -+#ifndef _KBASE_JS_H_ -+#define _KBASE_JS_H_ -+ -+#include "mali_kbase_js_defs.h" -+#include "mali_kbase_context.h" -+#include "mali_kbase_defs.h" -+#include "mali_kbase_debug.h" -+ -+#include "mali_kbase_js_ctx_attr.h" ++#include "mali_osk.h" ++#include ++#include "mali_kernel_common.h" + -+/** -+ * @addtogroup base_api -+ * @{ -+ */ ++void _mali_osk_atomic_dec(_mali_osk_atomic_t *atom) ++{ ++ atomic_dec((atomic_t *)&atom->u.val); ++} + -+/** -+ * @addtogroup base_kbase_api -+ * @{ -+ */ ++u32 _mali_osk_atomic_dec_return(_mali_osk_atomic_t *atom) ++{ ++ return atomic_dec_return((atomic_t *)&atom->u.val); ++} + -+/** -+ * @addtogroup kbase_js Job Scheduler Internal APIs -+ * @{ -+ * -+ * These APIs are Internal to KBase. -+ */ ++void _mali_osk_atomic_inc(_mali_osk_atomic_t *atom) ++{ ++ atomic_inc((atomic_t *)&atom->u.val); ++} + -+/** -+ * @brief Initialize the Job Scheduler -+ * -+ * The struct kbasep_js_device_data sub-structure of \a kbdev must be zero -+ * initialized before passing to the kbasep_js_devdata_init() function. This is -+ * to give efficient error path code. -+ */ -+int kbasep_js_devdata_init(struct kbase_device * const kbdev); ++u32 _mali_osk_atomic_inc_return(_mali_osk_atomic_t *atom) ++{ ++ return atomic_inc_return((atomic_t *)&atom->u.val); ++} + -+/** -+ * @brief Halt the Job Scheduler. -+ * -+ * It is safe to call this on \a kbdev even if it the kbasep_js_device_data -+ * sub-structure was never initialized/failed initialization, to give efficient -+ * error-path code. -+ * -+ * For this to work, the struct kbasep_js_device_data sub-structure of \a kbdev must -+ * be zero initialized before passing to the kbasep_js_devdata_init() -+ * function. This is to give efficient error path code. -+ * -+ * It is a Programming Error to call this whilst there are still kbase_context -+ * structures registered with this scheduler. -+ * -+ */ -+void kbasep_js_devdata_halt(struct kbase_device *kbdev); ++void _mali_osk_atomic_init(_mali_osk_atomic_t *atom, u32 val) ++{ ++ MALI_DEBUG_ASSERT_POINTER(atom); ++ atomic_set((atomic_t *)&atom->u.val, val); ++} + -+/** -+ * @brief Terminate the Job Scheduler -+ * -+ * It is safe to call this on \a kbdev even if it the kbasep_js_device_data -+ * sub-structure was never initialized/failed initialization, to give efficient -+ * error-path code. -+ * -+ * For this to work, the struct kbasep_js_device_data sub-structure of \a kbdev must -+ * be zero initialized before passing to the kbasep_js_devdata_init() -+ * function. This is to give efficient error path code. -+ * -+ * It is a Programming Error to call this whilst there are still kbase_context -+ * structures registered with this scheduler. -+ */ -+void kbasep_js_devdata_term(struct kbase_device *kbdev); ++u32 _mali_osk_atomic_read(_mali_osk_atomic_t *atom) ++{ ++ return atomic_read((atomic_t *)&atom->u.val); ++} + -+/** -+ * @brief Initialize the Scheduling Component of a struct kbase_context on the Job Scheduler. -+ * -+ * This effectively registers a struct kbase_context with a Job Scheduler. -+ * -+ * It does not register any jobs owned by the struct kbase_context with the scheduler. -+ * Those must be separately registered by kbasep_js_add_job(). -+ * -+ * The struct kbase_context must be zero intitialized before passing to the -+ * kbase_js_init() function. This is to give efficient error path code. -+ */ -+int kbasep_js_kctx_init(struct kbase_context * const kctx); ++void _mali_osk_atomic_term(_mali_osk_atomic_t *atom) ++{ ++ MALI_IGNORE(atom); ++} + -+/** -+ * @brief Terminate the Scheduling Component of a struct kbase_context on the Job Scheduler -+ * -+ * This effectively de-registers a struct kbase_context from its Job Scheduler -+ * -+ * It is safe to call this on a struct kbase_context that has never had or failed -+ * initialization of its jctx.sched_info member, to give efficient error-path -+ * code. -+ * -+ * For this to work, the struct kbase_context must be zero intitialized before passing -+ * to the kbase_js_init() function. -+ * -+ * It is a Programming Error to call this whilst there are still jobs -+ * registered with this context. ++u32 _mali_osk_atomic_xchg(_mali_osk_atomic_t *atom, u32 val) ++{ ++ return atomic_xchg((atomic_t *)&atom->u.val, val); ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c +new file mode 100755 +index 000000000..fb9ccd2ad +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c +@@ -0,0 +1,152 @@ ++/* ++ * Copyright (C) 2010, 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ ++/** ++ * @file mali_osk_bitmap.c ++ * Implementation of the OS abstraction layer for the kernel device driver ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include "common/mali_kernel_common.h" ++#include "mali_osk_types.h" ++#include "mali_osk.h" ++ ++u32 _mali_osk_bitmap_alloc(struct _mali_osk_bitmap *bitmap) ++{ ++ u32 obj; ++ ++ MALI_DEBUG_ASSERT_POINTER(bitmap); ++ ++ _mali_osk_spinlock_lock(bitmap->lock); ++ ++ obj = find_next_zero_bit(bitmap->table, bitmap->max, bitmap->reserve); ++ ++ if (obj < bitmap->max) { ++ set_bit(obj, bitmap->table); ++ } else { ++ obj = -1; ++ } ++ ++ if (obj != -1) ++ --bitmap->avail; ++ _mali_osk_spinlock_unlock(bitmap->lock); ++ ++ return obj; ++} ++ ++void _mali_osk_bitmap_free(struct _mali_osk_bitmap *bitmap, u32 obj) ++{ ++ MALI_DEBUG_ASSERT_POINTER(bitmap); ++ ++ _mali_osk_bitmap_free_range(bitmap, obj, 1); ++} ++ ++u32 _mali_osk_bitmap_alloc_range(struct _mali_osk_bitmap *bitmap, int cnt) ++{ ++ u32 obj; ++ ++ MALI_DEBUG_ASSERT_POINTER(bitmap); ++ ++ if (0 >= cnt) { ++ return -1; ++ } ++ ++ if (1 == cnt) { ++ return _mali_osk_bitmap_alloc(bitmap); ++ } ++ ++ _mali_osk_spinlock_lock(bitmap->lock); ++ obj = bitmap_find_next_zero_area(bitmap->table, bitmap->max, ++ bitmap->last, cnt, 0); ++ ++ if (obj >= bitmap->max) { ++ obj = bitmap_find_next_zero_area(bitmap->table, bitmap->max, ++ bitmap->reserve, cnt, 0); ++ } ++ ++ if (obj < bitmap->max) { ++ bitmap_set(bitmap->table, obj, cnt); ++ ++ bitmap->last = (obj + cnt); ++ if (bitmap->last >= bitmap->max) { ++ bitmap->last = bitmap->reserve; ++ } ++ } else { ++ obj = -1; ++ } ++ ++ if (obj != -1) { ++ bitmap->avail -= cnt; ++ } ++ ++ _mali_osk_spinlock_unlock(bitmap->lock); ++ ++ return obj; ++} ++ ++u32 _mali_osk_bitmap_avail(struct _mali_osk_bitmap *bitmap) ++{ ++ MALI_DEBUG_ASSERT_POINTER(bitmap); ++ ++ return bitmap->avail; ++} ++ ++void _mali_osk_bitmap_free_range(struct _mali_osk_bitmap *bitmap, u32 obj, int cnt) ++{ ++ MALI_DEBUG_ASSERT_POINTER(bitmap); ++ ++ _mali_osk_spinlock_lock(bitmap->lock); ++ bitmap_clear(bitmap->table, obj, cnt); ++ bitmap->last = min(bitmap->last, obj); ++ ++ bitmap->avail += cnt; ++ _mali_osk_spinlock_unlock(bitmap->lock); ++} ++ ++int _mali_osk_bitmap_init(struct _mali_osk_bitmap *bitmap, u32 num, u32 reserve) ++{ ++ MALI_DEBUG_ASSERT_POINTER(bitmap); ++ MALI_DEBUG_ASSERT(reserve <= num); ++ ++ bitmap->reserve = reserve; ++ bitmap->last = reserve; ++ bitmap->max = num; ++ bitmap->avail = num - reserve; ++ bitmap->lock = _mali_osk_spinlock_init(_MALI_OSK_LOCKFLAG_UNORDERED, _MALI_OSK_LOCK_ORDER_FIRST); ++ if (!bitmap->lock) { ++ return _MALI_OSK_ERR_NOMEM; ++ } ++ bitmap->table = kzalloc(BITS_TO_LONGS(bitmap->max) * ++ sizeof(long), GFP_KERNEL); ++ if (!bitmap->table) { ++ _mali_osk_spinlock_term(bitmap->lock); ++ return _MALI_OSK_ERR_NOMEM; ++ } ++ ++ return _MALI_OSK_ERR_OK; ++} ++ ++void _mali_osk_bitmap_term(struct _mali_osk_bitmap *bitmap) ++{ ++ MALI_DEBUG_ASSERT_POINTER(bitmap); ++ ++ if (NULL != bitmap->lock) { ++ _mali_osk_spinlock_term(bitmap->lock); ++ } ++ ++ if (NULL != bitmap->table) { ++ kfree(bitmap->table); ++ } ++} ++ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c +new file mode 100755 +index 000000000..5c8b9ceab +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c +@@ -0,0 +1,200 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+void kbasep_js_kctx_term(struct kbase_context *kctx); + +/** -+ * @brief Add a job chain to the Job Scheduler, and take necessary actions to -+ * schedule the context/run the job. -+ * -+ * This atomically does the following: -+ * - Update the numbers of jobs information -+ * - Add the job to the run pool if necessary (part of init_job) -+ * -+ * Once this is done, then an appropriate action is taken: -+ * - If the ctx is scheduled, it attempts to start the next job (which might be -+ * this added job) -+ * - Otherwise, and if this is the first job on the context, it enqueues it on -+ * the Policy Queue -+ * -+ * The Policy's Queue can be updated by this in the following ways: -+ * - In the above case that this is the first job on the context -+ * - If the context is high priority and the context is not scheduled, then it -+ * could cause the Policy to schedule out a low-priority context, allowing -+ * this context to be scheduled in. -+ * -+ * If the context is already scheduled on the RunPool, then adding a job to it -+ * is guarenteed not to update the Policy Queue. And so, the caller is -+ * guarenteed to not need to try scheduling a context from the Run Pool - it -+ * can safely assert that the result is false. -+ * -+ * It is a programming error to have more than U32_MAX jobs in flight at a time. -+ * -+ * The following locking conditions are made on the caller: -+ * - it must \em not hold kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * - it must \em not hold hwaccess_lock (as this will be obtained internally) -+ * - it must \em not hold kbasep_js_device_data::runpool_mutex (as this will be -+ * obtained internally) -+ * - it must \em not hold kbasep_jd_device_data::queue_mutex (again, it's used internally). -+ * -+ * @return true indicates that the Policy Queue was updated, and so the -+ * caller will need to try scheduling a context onto the Run Pool. -+ * @return false indicates that no updates were made to the Policy Queue, -+ * so no further action is required from the caller. This is \b always returned -+ * when the context is currently scheduled. ++ * @file mali_osk_irq.c ++ * Implementation of the OS abstraction layer for the kernel device driver + */ -+bool kbasep_js_add_job(struct kbase_context *kctx, struct kbase_jd_atom *atom); + -+/** -+ * @brief Remove a job chain from the Job Scheduler, except for its 'retained state'. -+ * -+ * Completely removing a job requires several calls: -+ * - kbasep_js_copy_atom_retained_state(), to capture the 'retained state' of -+ * the atom -+ * - kbasep_js_remove_job(), to partially remove the atom from the Job Scheduler -+ * - kbasep_js_runpool_release_ctx_and_katom_retained_state(), to release the -+ * remaining state held as part of the job having been run. -+ * -+ * In the common case of atoms completing normally, this set of actions is more optimal for spinlock purposes than having kbasep_js_remove_job() handle all of the actions. -+ * -+ * In the case of cancelling atoms, it is easier to call kbasep_js_remove_cancelled_job(), which handles all the necessary actions. -+ * -+ * It is a programming error to call this when: -+ * - \a atom is not a job belonging to kctx. -+ * - \a atom has already been removed from the Job Scheduler. -+ * - \a atom is still in the runpool -+ * -+ * Do not use this for removing jobs being killed by kbase_jd_cancel() - use -+ * kbasep_js_remove_cancelled_job() instead. -+ * -+ * The following locking conditions are made on the caller: -+ * - it must hold kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * -+ */ -+void kbasep_js_remove_job(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *atom); ++#include /* For memory allocation */ ++#include ++#include ++#include + -+/** -+ * @brief Completely remove a job chain from the Job Scheduler, in the case -+ * where the job chain was cancelled. -+ * -+ * This is a variant of kbasep_js_remove_job() that takes care of removing all -+ * of the retained state too. This is generally useful for cancelled atoms, -+ * which need not be handled in an optimal way. -+ * -+ * It is a programming error to call this when: -+ * - \a atom is not a job belonging to kctx. -+ * - \a atom has already been removed from the Job Scheduler. -+ * - \a atom is still in the runpool: -+ * - it is not being killed with kbasep_jd_cancel() -+ * -+ * The following locking conditions are made on the caller: -+ * - it must hold kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * - it must \em not hold the hwaccess_lock, (as this will be obtained -+ * internally) -+ * - it must \em not hold kbasep_js_device_data::runpool_mutex (as this could be -+ * obtained internally) -+ * -+ * @return true indicates that ctx attributes have changed and the caller -+ * should call kbase_js_sched_all() to try to run more jobs -+ * @return false otherwise -+ */ -+bool kbasep_js_remove_cancelled_job(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ struct kbase_jd_atom *katom); ++#include "mali_osk.h" ++#include "mali_kernel_common.h" + -+/** -+ * @brief Refcount a context as being busy, preventing it from being scheduled -+ * out. -+ * -+ * @note This function can safely be called from IRQ context. -+ * -+ * The following locking conditions are made on the caller: -+ * - it must \em not hold mmu_hw_mutex and hwaccess_lock, because they will be -+ * used internally. -+ * -+ * @return value != false if the retain succeeded, and the context will not be scheduled out. -+ * @return false if the retain failed (because the context is being/has been scheduled out). -+ */ -+bool kbasep_js_runpool_retain_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); ++typedef struct _mali_osk_irq_t_struct { ++ u32 irqnum; ++ void *data; ++ _mali_osk_irq_uhandler_t uhandler; ++} mali_osk_irq_object_t; + -+/** -+ * @brief Refcount a context as being busy, preventing it from being scheduled -+ * out. -+ * -+ * @note This function can safely be called from IRQ context. -+ * -+ * The following locks must be held by the caller: -+ * - mmu_hw_mutex, hwaccess_lock -+ * -+ * @return value != false if the retain succeeded, and the context will not be scheduled out. -+ * @return false if the retain failed (because the context is being/has been scheduled out). -+ */ -+bool kbasep_js_runpool_retain_ctx_nolock(struct kbase_device *kbdev, struct kbase_context *kctx); ++typedef irqreturn_t (*irq_handler_func_t)(int, void *, struct pt_regs *); ++static irqreturn_t irq_handler_upper_half(int port_name, void *dev_id); /* , struct pt_regs *regs*/ + -+/** -+ * @brief Lookup a context in the Run Pool based upon its current address space -+ * and ensure that is stays scheduled in. -+ * -+ * The context is refcounted as being busy to prevent it from scheduling -+ * out. It must be released with kbasep_js_runpool_release_ctx() when it is no -+ * longer required to stay scheduled in. -+ * -+ * @note This function can safely be called from IRQ context. -+ * -+ * The following locking conditions are made on the caller: -+ * - it must \em not hold the hwaccess_lock, because it will be used internally. -+ * If the hwaccess_lock is already held, then the caller should use -+ * kbasep_js_runpool_lookup_ctx_nolock() instead. -+ * -+ * @return a valid struct kbase_context on success, which has been refcounted as being busy. -+ * @return NULL on failure, indicating that no context was found in \a as_nr -+ */ -+struct kbase_context *kbasep_js_runpool_lookup_ctx(struct kbase_device *kbdev, int as_nr); ++#if defined(DEBUG) + -+/** -+ * @brief Handling the requeuing/killing of a context that was evicted from the -+ * policy queue or runpool. -+ * -+ * This should be used whenever handing off a context that has been evicted -+ * from the policy queue or the runpool: -+ * - If the context is not dying and has jobs, it gets re-added to the policy -+ * queue -+ * - Otherwise, it is not added -+ * -+ * In addition, if the context is dying the jobs are killed asynchronously. -+ * -+ * In all cases, the Power Manager active reference is released -+ * (kbase_pm_context_idle()) whenever the has_pm_ref parameter is true. \a -+ * has_pm_ref must be set to false whenever the context was not previously in -+ * the runpool and does not hold a Power Manager active refcount. Note that -+ * contexts in a rollback of kbasep_js_try_schedule_head_ctx() might have an -+ * active refcount even though they weren't in the runpool. -+ * -+ * The following locking conditions are made on the caller: -+ * - it must hold kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * - it must \em not hold kbasep_jd_device_data::queue_mutex (as this will be -+ * obtained internally) -+ */ -+void kbasep_js_runpool_requeue_or_kill_ctx(struct kbase_device *kbdev, struct kbase_context *kctx, bool has_pm_ref); ++struct test_interrupt_data { ++ _mali_osk_irq_ack_t ack_func; ++ void *probe_data; ++ mali_bool interrupt_received; ++ wait_queue_head_t wq; ++}; + -+/** -+ * @brief Release a refcount of a context being busy, allowing it to be -+ * scheduled out. -+ * -+ * When the refcount reaches zero and the context \em might be scheduled out -+ * (depending on whether the Scheudling Policy has deemed it so, or if it has run -+ * out of jobs). -+ * -+ * If the context does get scheduled out, then The following actions will be -+ * taken as part of deschduling a context: -+ * - For the context being descheduled: -+ * - If the context is in the processing of dying (all the jobs are being -+ * removed from it), then descheduling also kills off any jobs remaining in the -+ * context. -+ * - If the context is not dying, and any jobs remain after descheduling the -+ * context then it is re-enqueued to the Policy's Queue. -+ * - Otherwise, the context is still known to the scheduler, but remains absent -+ * from the Policy Queue until a job is next added to it. -+ * - In all descheduling cases, the Power Manager active reference (obtained -+ * during kbasep_js_try_schedule_head_ctx()) is released (kbase_pm_context_idle()). -+ * -+ * Whilst the context is being descheduled, this also handles actions that -+ * cause more atoms to be run: -+ * - Attempt submitting atoms when the Context Attributes on the Runpool have -+ * changed. This is because the context being scheduled out could mean that -+ * there are more opportunities to run atoms. -+ * - Attempt submitting to a slot that was previously blocked due to affinity -+ * restrictions. This is usually only necessary when releasing a context -+ * happens as part of completing a previous job, but is harmless nonetheless. -+ * - Attempt scheduling in a new context (if one is available), and if necessary, -+ * running a job from that new context. -+ * -+ * Unlike retaining a context in the runpool, this function \b cannot be called -+ * from IRQ context. -+ * -+ * It is a programming error to call this on a \a kctx that is not currently -+ * scheduled, or that already has a zero refcount. -+ * -+ * The following locking conditions are made on the caller: -+ * - it must \em not hold the hwaccess_lock, because it will be used internally. -+ * - it must \em not hold kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * - it must \em not hold kbasep_js_device_data::runpool_mutex (as this will be -+ * obtained internally) -+ * - it must \em not hold the kbase_device::mmu_hw_mutex (as this will be -+ * obtained internally) -+ * - it must \em not hold kbasep_jd_device_data::queue_mutex (as this will be -+ * obtained internally) -+ * -+ */ -+void kbasep_js_runpool_release_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); ++static irqreturn_t test_interrupt_upper_half(int port_name, void *dev_id) ++{ ++ irqreturn_t ret = IRQ_NONE; ++ struct test_interrupt_data *data = (struct test_interrupt_data *)dev_id; + -+/** -+ * @brief Variant of kbasep_js_runpool_release_ctx() that handles additional -+ * actions from completing an atom. -+ * -+ * This is usually called as part of completing an atom and releasing the -+ * refcount on the context held by the atom. -+ * -+ * Therefore, the extra actions carried out are part of handling actions queued -+ * on a completed atom, namely: -+ * - Releasing the atom's context attributes -+ * - Retrying the submission on a particular slot, because we couldn't submit -+ * on that slot from an IRQ handler. -+ * -+ * The locking conditions of this function are the same as those for -+ * kbasep_js_runpool_release_ctx() -+ */ -+void kbasep_js_runpool_release_ctx_and_katom_retained_state(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbasep_js_atom_retained_state *katom_retained_state); ++ if (_MALI_OSK_ERR_OK == data->ack_func(data->probe_data)) { ++ data->interrupt_received = MALI_TRUE; ++ wake_up(&data->wq); ++ ret = IRQ_HANDLED; ++ } + -+/** -+ * @brief Variant of kbase_js_runpool_release_ctx() that assumes that -+ * kbasep_js_device_data::runpool_mutex and -+ * kbasep_js_kctx_info::ctx::jsctx_mutex are held by the caller, and does not -+ * attempt to schedule new contexts. -+ */ -+void kbasep_js_runpool_release_ctx_nolock(struct kbase_device *kbdev, -+ struct kbase_context *kctx); ++ return ret; ++} + -+/** -+ * @brief Schedule in a privileged context -+ * -+ * This schedules a context in regardless of the context priority. -+ * If the runpool is full, a context will be forced out of the runpool and the function will wait -+ * for the new context to be scheduled in. -+ * The context will be kept scheduled in (and the corresponding address space reserved) until -+ * kbasep_js_release_privileged_ctx is called). -+ * -+ * The following locking conditions are made on the caller: -+ * - it must \em not hold the hwaccess_lock, because it will be used internally. -+ * - it must \em not hold kbasep_js_device_data::runpool_mutex (as this will be -+ * obtained internally) -+ * - it must \em not hold the kbase_device::mmu_hw_mutex (as this will be -+ * obtained internally) -+ * - it must \em not hold kbasep_jd_device_data::queue_mutex (again, it's used internally). -+ * - it must \em not hold kbasep_js_kctx_info::ctx::jsctx_mutex, because it will -+ * be used internally. -+ * -+ */ -+void kbasep_js_schedule_privileged_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); ++static _mali_osk_errcode_t test_interrupt(u32 irqnum, ++ _mali_osk_irq_trigger_t trigger_func, ++ _mali_osk_irq_ack_t ack_func, ++ void *probe_data, ++ const char *description) ++{ ++ unsigned long irq_flags = 0; ++ struct test_interrupt_data data = { ++ .ack_func = ack_func, ++ .probe_data = probe_data, ++ .interrupt_received = MALI_FALSE, ++ }; + -+/** -+ * @brief Release a privileged context, allowing it to be scheduled out. -+ * -+ * See kbasep_js_runpool_release_ctx for potential side effects. -+ * -+ * The following locking conditions are made on the caller: -+ * - it must \em not hold the hwaccess_lock, because it will be used internally. -+ * - it must \em not hold kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * - it must \em not hold kbasep_js_device_data::runpool_mutex (as this will be -+ * obtained internally) -+ * - it must \em not hold the kbase_device::mmu_hw_mutex (as this will be -+ * obtained internally) -+ * -+ */ -+void kbasep_js_release_privileged_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ irq_flags |= IRQF_SHARED; ++#endif /* defined(CONFIG_MALI_SHARED_INTERRUPTS) */ + -+/** -+ * @brief Try to submit the next job on each slot -+ * -+ * The following locks may be used: -+ * - kbasep_js_device_data::runpool_mutex -+ * - hwaccess_lock -+ */ -+void kbase_js_try_run_jobs(struct kbase_device *kbdev); ++ if (0 != request_irq(irqnum, test_interrupt_upper_half, irq_flags, description, &data)) { ++ MALI_DEBUG_PRINT(2, ("Unable to install test IRQ handler for core '%s'\n", description)); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+/** -+ * @brief Suspend the job scheduler during a Power Management Suspend event. -+ * -+ * Causes all contexts to be removed from the runpool, and prevents any -+ * contexts from (re)entering the runpool. -+ * -+ * This does not handle suspending the one privileged context: the caller must -+ * instead do this by by suspending the GPU HW Counter Instrumentation. -+ * -+ * This will eventually cause all Power Management active references held by -+ * contexts on the runpool to be released, without running any more atoms. -+ * -+ * The caller must then wait for all Power Mangement active refcount to become -+ * zero before completing the suspend. -+ * -+ * The emptying mechanism may take some time to complete, since it can wait for -+ * jobs to complete naturally instead of forcing them to end quickly. However, -+ * this is bounded by the Job Scheduler's Job Timeouts. Hence, this -+ * function is guaranteed to complete in a finite time. -+ */ -+void kbasep_js_suspend(struct kbase_device *kbdev); ++ init_waitqueue_head(&data.wq); + -+/** -+ * @brief Resume the Job Scheduler after a Power Management Resume event. -+ * -+ * This restores the actions from kbasep_js_suspend(): -+ * - Schedules contexts back into the runpool -+ * - Resumes running atoms on the GPU -+ */ -+void kbasep_js_resume(struct kbase_device *kbdev); ++ trigger_func(probe_data); ++ wait_event_timeout(data.wq, data.interrupt_received, 100); + -+/** -+ * @brief Submit an atom to the job scheduler. -+ * -+ * The atom is enqueued on the context's ringbuffer. The caller must have -+ * ensured that all dependencies can be represented in the ringbuffer. -+ * -+ * Caller must hold jctx->lock -+ * -+ * @param[in] kctx Context pointer -+ * @param[in] atom Pointer to the atom to submit -+ * -+ * @return Whether the context requires to be enqueued. */ -+bool kbase_js_dep_resolved_submit(struct kbase_context *kctx, -+ struct kbase_jd_atom *katom); ++ free_irq(irqnum, &data); + -+/** -+ * jsctx_ll_flush_to_rb() - Pushes atoms from the linked list to ringbuffer. -+ * @kctx: Context Pointer -+ * @prio: Priority (specifies the queue together with js). -+ * @js: Job slot (specifies the queue together with prio). -+ * -+ * Pushes all possible atoms from the linked list to the ringbuffer. -+ * Number of atoms are limited to free space in the ringbuffer and -+ * number of available atoms in the linked list. -+ * -+ */ -+void jsctx_ll_flush_to_rb(struct kbase_context *kctx, int prio, int js); -+/** -+ * @brief Pull an atom from a context in the job scheduler for execution. -+ * -+ * The atom will not be removed from the ringbuffer at this stage. -+ * -+ * The HW access lock must be held when calling this function. -+ * -+ * @param[in] kctx Context to pull from -+ * @param[in] js Job slot to pull from -+ * @return Pointer to an atom, or NULL if there are no atoms for this -+ * slot that can be currently run. -+ */ -+struct kbase_jd_atom *kbase_js_pull(struct kbase_context *kctx, int js); ++ if (data.interrupt_received) { ++ MALI_DEBUG_PRINT(3, ("%s: Interrupt test OK\n", description)); ++ return _MALI_OSK_ERR_OK; ++ } else { ++ MALI_PRINT_ERROR(("%s: Failed interrupt test on %u\n", description, irqnum)); ++ return _MALI_OSK_ERR_FAULT; ++ } ++} + -+/** -+ * @brief Return an atom to the job scheduler ringbuffer. -+ * -+ * An atom is 'unpulled' if execution is stopped but intended to be returned to -+ * later. The most common reason for this is that the atom has been -+ * soft-stopped. -+ * -+ * Note that if multiple atoms are to be 'unpulled', they must be returned in -+ * the reverse order to which they were originally pulled. It is a programming -+ * error to return atoms in any other order. -+ * -+ * The HW access lock must be held when calling this function. -+ * -+ * @param[in] kctx Context pointer -+ * @param[in] atom Pointer to the atom to unpull -+ */ -+void kbase_js_unpull(struct kbase_context *kctx, struct kbase_jd_atom *katom); ++#endif /* defined(DEBUG) */ + -+/** -+ * @brief Complete an atom from jd_done_worker(), removing it from the job -+ * scheduler ringbuffer. -+ * -+ * If the atom failed then all dependee atoms marked for failure propagation -+ * will also fail. -+ * -+ * @param[in] kctx Context pointer -+ * @param[in] katom Pointer to the atom to complete -+ * @return true if the context is now idle (no jobs pulled) -+ * false otherwise -+ */ -+bool kbase_js_complete_atom_wq(struct kbase_context *kctx, -+ struct kbase_jd_atom *katom); ++_mali_osk_irq_t *_mali_osk_irq_init(u32 irqnum, _mali_osk_irq_uhandler_t uhandler, void *int_data, _mali_osk_irq_trigger_t trigger_func, _mali_osk_irq_ack_t ack_func, void *probe_data, const char *description) ++{ ++ mali_osk_irq_object_t *irq_object; ++ unsigned long irq_flags = 0; + -+/** -+ * @brief Complete an atom. -+ * -+ * Most of the work required to complete an atom will be performed by -+ * jd_done_worker(). -+ * -+ * The HW access lock must be held when calling this function. -+ * -+ * @param[in] katom Pointer to the atom to complete -+ * @param[in] end_timestamp The time that the atom completed (may be NULL) -+ * -+ * Return: Atom that has now been unblocked and can now be run, or NULL if none -+ */ -+struct kbase_jd_atom *kbase_js_complete_atom(struct kbase_jd_atom *katom, -+ ktime_t *end_timestamp); ++#if defined(CONFIG_MALI_SHARED_INTERRUPTS) ++ irq_flags |= IRQF_SHARED; ++#endif /* defined(CONFIG_MALI_SHARED_INTERRUPTS) */ + -+/** -+ * @brief Submit atoms from all available contexts. -+ * -+ * This will attempt to submit as many jobs as possible to the provided job -+ * slots. It will exit when either all job slots are full, or all contexts have -+ * been used. -+ * -+ * @param[in] kbdev Device pointer -+ * @param[in] js_mask Mask of job slots to submit to -+ */ -+void kbase_js_sched(struct kbase_device *kbdev, int js_mask); ++ irq_object = kmalloc(sizeof(mali_osk_irq_object_t), GFP_KERNEL); ++ if (NULL == irq_object) { ++ return NULL; ++ } + -+/** -+ * kbase_jd_zap_context - Attempt to deschedule a context that is being -+ * destroyed -+ * @kctx: Context pointer -+ * -+ * This will attempt to remove a context from any internal job scheduler queues -+ * and perform any other actions to ensure a context will not be submitted -+ * from. -+ * -+ * If the context is currently scheduled, then the caller must wait for all -+ * pending jobs to complete before taking any further action. -+ */ -+void kbase_js_zap_context(struct kbase_context *kctx); ++ if (-1 == irqnum) { ++ /* Probe for IRQ */ ++ if ((NULL != trigger_func) && (NULL != ack_func)) { ++ unsigned long probe_count = 3; ++ _mali_osk_errcode_t err; ++ int irq; + -+/** -+ * @brief Validate an atom -+ * -+ * This will determine whether the atom can be scheduled onto the GPU. Atoms -+ * with invalid combinations of core requirements will be rejected. -+ * -+ * @param[in] kbdev Device pointer -+ * @param[in] katom Atom to validate -+ * @return true if atom is valid -+ * false otherwise -+ */ -+bool kbase_js_is_atom_valid(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom); ++ MALI_DEBUG_PRINT(2, ("Probing for irq\n")); + -+/** -+ * kbase_js_set_timeouts - update all JS timeouts with user specified data -+ * @kbdev: Device pointer -+ * -+ * Timeouts are specified through the 'js_timeouts' sysfs file. If a timeout is -+ * set to a positive number then that becomes the new value used, if a timeout -+ * is negative then the default is set. -+ */ -+void kbase_js_set_timeouts(struct kbase_device *kbdev); ++ do { ++ unsigned long mask; + -+/* -+ * Helpers follow -+ */ ++ mask = probe_irq_on(); ++ trigger_func(probe_data); + -+/** -+ * @brief Check that a context is allowed to submit jobs on this policy -+ * -+ * The purpose of this abstraction is to hide the underlying data size, and wrap up -+ * the long repeated line of code. -+ * -+ * As with any bool, never test the return value with true. -+ * -+ * The caller must hold hwaccess_lock. -+ */ -+static inline bool kbasep_js_is_submit_allowed(struct kbasep_js_device_data *js_devdata, struct kbase_context *kctx) -+{ -+ u16 test_bit; ++ _mali_osk_time_ubusydelay(5); + -+ /* Ensure context really is scheduled in */ -+ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); -+ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ irq = probe_irq_off(mask); ++ err = ack_func(probe_data); ++ } while (irq < 0 && (err == _MALI_OSK_ERR_OK) && probe_count--); + -+ test_bit = (u16) (1u << kctx->as_nr); ++ if (irq < 0 || (_MALI_OSK_ERR_OK != err)) irqnum = -1; ++ else irqnum = irq; ++ } else irqnum = -1; /* no probe functions, fault */ + -+ return (bool) (js_devdata->runpool_irq.submit_allowed & test_bit); -+} ++ if (-1 != irqnum) { ++ /* found an irq */ ++ MALI_DEBUG_PRINT(2, ("Found irq %d\n", irqnum)); ++ } else { ++ MALI_DEBUG_PRINT(2, ("Probe for irq failed\n")); ++ } ++ } + -+/** -+ * @brief Allow a context to submit jobs on this policy -+ * -+ * The purpose of this abstraction is to hide the underlying data size, and wrap up -+ * the long repeated line of code. -+ * -+ * The caller must hold hwaccess_lock. -+ */ -+static inline void kbasep_js_set_submit_allowed(struct kbasep_js_device_data *js_devdata, struct kbase_context *kctx) -+{ -+ u16 set_bit; ++ irq_object->irqnum = irqnum; ++ irq_object->uhandler = uhandler; ++ irq_object->data = int_data; + -+ /* Ensure context really is scheduled in */ -+ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); -+ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ if (-1 == irqnum) { ++ MALI_DEBUG_PRINT(2, ("No IRQ for core '%s' found during probe\n", description)); ++ kfree(irq_object); ++ return NULL; ++ } + -+ set_bit = (u16) (1u << kctx->as_nr); ++#if defined(DEBUG) ++ /* Verify that the configured interrupt settings are working */ ++ if (_MALI_OSK_ERR_OK != test_interrupt(irqnum, trigger_func, ack_func, probe_data, description)) { ++ MALI_DEBUG_PRINT(2, ("Test of IRQ(%d) handler for core '%s' failed\n", irqnum, description)); ++ kfree(irq_object); ++ return NULL; ++ } ++#endif + -+ dev_dbg(kctx->kbdev->dev, "JS: Setting Submit Allowed on %p (as=%d)", kctx, kctx->as_nr); ++ if (0 != request_irq(irqnum, irq_handler_upper_half, irq_flags, description, irq_object)) { ++ MALI_DEBUG_PRINT(2, ("Unable to install IRQ handler for core '%s'\n", description)); ++ kfree(irq_object); ++ return NULL; ++ } + -+ js_devdata->runpool_irq.submit_allowed |= set_bit; ++ return irq_object; +} + -+/** -+ * @brief Prevent a context from submitting more jobs on this policy -+ * -+ * The purpose of this abstraction is to hide the underlying data size, and wrap up -+ * the long repeated line of code. -+ * -+ * The caller must hold hwaccess_lock. -+ */ -+static inline void kbasep_js_clear_submit_allowed(struct kbasep_js_device_data *js_devdata, struct kbase_context *kctx) ++void _mali_osk_irq_term(_mali_osk_irq_t *irq) +{ -+ u16 clear_bit; -+ u16 clear_mask; -+ -+ /* Ensure context really is scheduled in */ -+ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); -+ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); -+ -+ clear_bit = (u16) (1u << kctx->as_nr); -+ clear_mask = ~clear_bit; -+ -+ dev_dbg(kctx->kbdev->dev, "JS: Clearing Submit Allowed on %p (as=%d)", kctx, kctx->as_nr); -+ -+ js_devdata->runpool_irq.submit_allowed &= clear_mask; ++ mali_osk_irq_object_t *irq_object = (mali_osk_irq_object_t *)irq; ++ free_irq(irq_object->irqnum, irq_object); ++ kfree(irq_object); +} + -+/** -+ * @brief Manage the 'retry_submit_on_slot' part of a kbase_jd_atom -+ */ -+static inline void kbasep_js_clear_job_retry_submit(struct kbase_jd_atom *atom) -+{ -+ atom->retry_submit_on_slot = KBASEP_JS_RETRY_SUBMIT_SLOT_INVALID; -+} + -+/** -+ * Mark a slot as requiring resubmission by carrying that information on a -+ * completing atom. -+ * -+ * @note This can ASSERT in debug builds if the submit slot has been set to -+ * something other than the current value for @a js. This is because you might -+ * be unintentionally stopping more jobs being submitted on the old submit -+ * slot, and that might cause a scheduling-hang. -+ * -+ * @note If you can guarantee that the atoms for the original slot will be -+ * submitted on some other slot, then call kbasep_js_clear_job_retry_submit() -+ * first to silence the ASSERT. ++/** This function is called directly in interrupt context from the OS just after ++ * the CPU get the hw-irq from mali, or other devices on the same IRQ-channel. ++ * It is registered one of these function for each mali core. When an interrupt ++ * arrives this function will be called equal times as registered mali cores. ++ * That means that we only check one mali core in one function call, and the ++ * core we check for each turn is given by the \a dev_id variable. ++ * If we detect an pending interrupt on the given core, we mask the interrupt ++ * out by settging the core's IRQ_MASK register to zero. ++ * Then we schedule the mali_core_irq_handler_bottom_half to run as high priority ++ * work queue job. + */ -+static inline void kbasep_js_set_job_retry_submit_slot(struct kbase_jd_atom *atom, int js) ++static irqreturn_t irq_handler_upper_half(int port_name, void *dev_id) /* , struct pt_regs *regs*/ +{ -+ KBASE_DEBUG_ASSERT(0 <= js && js <= BASE_JM_MAX_NR_SLOTS); -+ KBASE_DEBUG_ASSERT((atom->retry_submit_on_slot == -+ KBASEP_JS_RETRY_SUBMIT_SLOT_INVALID) -+ || (atom->retry_submit_on_slot == js)); ++ irqreturn_t ret = IRQ_NONE; ++ mali_osk_irq_object_t *irq_object = (mali_osk_irq_object_t *)dev_id; + -+ atom->retry_submit_on_slot = js; -+} ++ if (_MALI_OSK_ERR_OK == irq_object->uhandler(irq_object->data)) { ++ ret = IRQ_HANDLED; ++ } + -+/** -+ * Create an initial 'invalid' atom retained state, that requires no -+ * atom-related work to be done on releasing with -+ * kbasep_js_runpool_release_ctx_and_katom_retained_state() -+ */ -+static inline void kbasep_js_atom_retained_state_init_invalid(struct kbasep_js_atom_retained_state *retained_state) -+{ -+ retained_state->event_code = BASE_JD_EVENT_NOT_STARTED; -+ retained_state->core_req = KBASEP_JS_ATOM_RETAINED_STATE_CORE_REQ_INVALID; -+ retained_state->retry_submit_on_slot = KBASEP_JS_RETRY_SUBMIT_SLOT_INVALID; ++ return ret; +} -+ -+/** -+ * Copy atom state that can be made available after jd_done_nolock() is called -+ * on that atom. +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c +new file mode 100755 +index 000000000..ed5f0b0da +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c +@@ -0,0 +1,287 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+static inline void kbasep_js_atom_retained_state_copy(struct kbasep_js_atom_retained_state *retained_state, const struct kbase_jd_atom *katom) -+{ -+ retained_state->event_code = katom->event_code; -+ retained_state->core_req = katom->core_req; -+ retained_state->retry_submit_on_slot = katom->retry_submit_on_slot; -+ retained_state->sched_priority = katom->sched_priority; -+ retained_state->device_nr = katom->device_nr; -+} + +/** -+ * @brief Determine whether an atom has finished (given its retained state), -+ * and so should be given back to userspace/removed from the system. -+ * -+ * Reasons for an atom not finishing include: -+ * - Being soft-stopped (and so, the atom should be resubmitted sometime later) -+ * -+ * @param[in] katom_retained_state the retained state of the atom to check -+ * @return false if the atom has not finished -+ * @return !=false if the atom has finished ++ * @file mali_osk_locks.c ++ * Implemenation of the OS abstraction layer for the kernel device driver + */ -+static inline bool kbasep_js_has_atom_finished(const struct kbasep_js_atom_retained_state *katom_retained_state) -+{ -+ return (bool) (katom_retained_state->event_code != BASE_JD_EVENT_STOPPED && katom_retained_state->event_code != BASE_JD_EVENT_REMOVED_FROM_NEXT); -+} + -+/** -+ * @brief Determine whether a struct kbasep_js_atom_retained_state is valid -+ * -+ * An invalid struct kbasep_js_atom_retained_state is allowed, and indicates that the -+ * code should just ignore it. -+ * -+ * @param[in] katom_retained_state the atom's retained state to check -+ * @return false if the retained state is invalid, and can be ignored -+ * @return !=false if the retained state is valid -+ */ -+static inline bool kbasep_js_atom_retained_state_is_valid(const struct kbasep_js_atom_retained_state *katom_retained_state) -+{ -+ return (bool) (katom_retained_state->core_req != KBASEP_JS_ATOM_RETAINED_STATE_CORE_REQ_INVALID); -+} ++#include "mali_osk_locks.h" ++#include "mali_kernel_common.h" ++#include "mali_osk.h" + -+static inline bool kbasep_js_get_atom_retry_submit_slot(const struct kbasep_js_atom_retained_state *katom_retained_state, int *res) -+{ -+ int js = katom_retained_state->retry_submit_on_slot; + -+ *res = js; -+ return (bool) (js >= 0); -+} ++#ifdef DEBUG ++#ifdef LOCK_ORDER_CHECKING ++static DEFINE_SPINLOCK(lock_tracking_lock); ++static mali_bool add_lock_to_log_and_check(struct _mali_osk_lock_debug_s *lock, uint32_t tid); ++static void remove_lock_from_log(struct _mali_osk_lock_debug_s *lock, uint32_t tid); ++static const char *const lock_order_to_string(_mali_osk_lock_order_t order); ++#endif /* LOCK_ORDER_CHECKING */ + -+/** -+ * @brief Variant of kbasep_js_runpool_lookup_ctx() that can be used when the -+ * context is guaranteed to be already previously retained. -+ * -+ * It is a programming error to supply the \a as_nr of a context that has not -+ * been previously retained/has a busy refcount of zero. The only exception is -+ * when there is no ctx in \a as_nr (NULL returned). -+ * -+ * The following locking conditions are made on the caller: -+ * - it must \em not hold the hwaccess_lock, because it will be used internally. -+ * -+ * @return a valid struct kbase_context on success, with a refcount that is guaranteed -+ * to be non-zero and unmodified by this function. -+ * @return NULL on failure, indicating that no context was found in \a as_nr -+ */ -+static inline struct kbase_context *kbasep_js_runpool_lookup_ctx_noretain(struct kbase_device *kbdev, int as_nr) ++void _mali_osk_locks_debug_init(struct _mali_osk_lock_debug_s *checker, _mali_osk_lock_flags_t flags, _mali_osk_lock_order_t order) +{ -+ struct kbase_context *found_kctx; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(0 <= as_nr && as_nr < BASE_MAX_NR_AS); -+ -+ found_kctx = kbdev->as_to_kctx[as_nr]; -+ KBASE_DEBUG_ASSERT(found_kctx == NULL || -+ atomic_read(&found_kctx->refcount) > 0); ++ checker->orig_flags = flags; ++ checker->owner = 0; + -+ return found_kctx; ++#ifdef LOCK_ORDER_CHECKING ++ checker->order = order; ++ checker->next = NULL; ++#endif +} + -+/* -+ * The following locking conditions are made on the caller: -+ * - The caller must hold the kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * - The caller must hold the kbasep_js_device_data::runpool_mutex -+ */ -+static inline void kbase_js_runpool_inc_context_count( -+ struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++void _mali_osk_locks_debug_add(struct _mali_osk_lock_debug_s *checker) +{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ -+ js_devdata = &kbdev->js_data; -+ js_kctx_info = &kctx->jctx.sched_info; -+ -+ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); -+ lockdep_assert_held(&js_devdata->runpool_mutex); -+ -+ /* Track total contexts */ -+ KBASE_DEBUG_ASSERT(js_devdata->nr_all_contexts_running < S8_MAX); -+ ++(js_devdata->nr_all_contexts_running); ++ checker->owner = _mali_osk_get_tid(); + -+ if (!kbase_ctx_flag(kctx, KCTX_SUBMIT_DISABLED)) { -+ /* Track contexts that can submit jobs */ -+ KBASE_DEBUG_ASSERT(js_devdata->nr_user_contexts_running < -+ S8_MAX); -+ ++(js_devdata->nr_user_contexts_running); ++#ifdef LOCK_ORDER_CHECKING ++ if (!(checker->orig_flags & _MALI_OSK_LOCKFLAG_UNORDERED)) { ++ if (!add_lock_to_log_and_check(checker, _mali_osk_get_tid())) { ++ printk(KERN_ERR "%d: ERROR lock %p taken while holding a lock of a higher order.\n", ++ _mali_osk_get_tid(), checker); ++ dump_stack(); ++ } + } ++#endif +} + -+/* -+ * The following locking conditions are made on the caller: -+ * - The caller must hold the kbasep_js_kctx_info::ctx::jsctx_mutex. -+ * - The caller must hold the kbasep_js_device_data::runpool_mutex -+ */ -+static inline void kbase_js_runpool_dec_context_count( -+ struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++void _mali_osk_locks_debug_remove(struct _mali_osk_lock_debug_s *checker) +{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ -+ js_devdata = &kbdev->js_data; -+ js_kctx_info = &kctx->jctx.sched_info; + -+ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); -+ lockdep_assert_held(&js_devdata->runpool_mutex); -+ -+ /* Track total contexts */ -+ --(js_devdata->nr_all_contexts_running); -+ KBASE_DEBUG_ASSERT(js_devdata->nr_all_contexts_running >= 0); -+ -+ if (!kbase_ctx_flag(kctx, KCTX_SUBMIT_DISABLED)) { -+ /* Track contexts that can submit jobs */ -+ --(js_devdata->nr_user_contexts_running); -+ KBASE_DEBUG_ASSERT(js_devdata->nr_user_contexts_running >= 0); ++#ifdef LOCK_ORDER_CHECKING ++ if (!(checker->orig_flags & _MALI_OSK_LOCKFLAG_UNORDERED)) { ++ remove_lock_from_log(checker, _mali_osk_get_tid()); + } ++#endif ++ checker->owner = 0; +} + + -+/** -+ * @brief Submit atoms from all available contexts to all job slots. -+ * -+ * This will attempt to submit as many jobs as possible. It will exit when -+ * either all job slots are full, or all contexts have been used. -+ * -+ * @param[in] kbdev Device pointer -+ */ -+static inline void kbase_js_sched_all(struct kbase_device *kbdev) -+{ -+ kbase_js_sched(kbdev, (1 << kbdev->gpu_props.num_job_slots) - 1); -+} -+ -+extern const int -+kbasep_js_atom_priority_to_relative[BASE_JD_NR_PRIO_LEVELS]; -+ -+extern const base_jd_prio -+kbasep_js_relative_priority_to_atom[KBASE_JS_ATOM_SCHED_PRIO_COUNT]; -+ -+/** -+ * kbasep_js_atom_prio_to_sched_prio(): - Convert atom priority (base_jd_prio) -+ * to relative ordering -+ * @atom_prio: Priority ID to translate. -+ * -+ * Atom priority values for @ref base_jd_prio cannot be compared directly to -+ * find out which are higher or lower. -+ * -+ * This function will convert base_jd_prio values for successively lower -+ * priorities into a monotonically increasing sequence. That is, the lower the -+ * base_jd_prio priority, the higher the value produced by this function. This -+ * is in accordance with how the rest of the kernel treates priority. -+ * -+ * The mapping is 1:1 and the size of the valid input range is the same as the -+ * size of the valid output range, i.e. -+ * KBASE_JS_ATOM_SCHED_PRIO_COUNT == BASE_JD_NR_PRIO_LEVELS ++#ifdef LOCK_ORDER_CHECKING ++/* Lock order checking ++ * ------------------- + * -+ * Note This must be kept in sync with BASE_JD_PRIO_<...> definitions ++ * To assure that lock ordering scheme defined by _mali_osk_lock_order_t is strictly adhered to, the ++ * following function will, together with a linked list and some extra members in _mali_osk_lock_debug_s, ++ * make sure that a lock that is taken has a higher order than the current highest-order lock a ++ * thread holds. + * -+ * Return: On success: a value in the inclusive range -+ * 0..KBASE_JS_ATOM_SCHED_PRIO_COUNT-1. On failure: -+ * KBASE_JS_ATOM_SCHED_PRIO_INVALID ++ * This is done in the following manner: ++ * - A linked list keeps track of locks held by a thread. ++ * - A `next' pointer is added to each lock. This is used to chain the locks together. ++ * - When taking a lock, the `add_lock_to_log_and_check' makes sure that taking ++ * the given lock is legal. It will follow the linked list to find the last ++ * lock taken by this thread. If the last lock's order was lower than the ++ * lock that is to be taken, it appends the new lock to the list and returns ++ * true, if not, it return false. This return value is assert()'ed on in ++ * _mali_osk_lock_wait(). + */ -+static inline int kbasep_js_atom_prio_to_sched_prio(base_jd_prio atom_prio) -+{ -+ if (atom_prio >= BASE_JD_NR_PRIO_LEVELS) -+ return KBASE_JS_ATOM_SCHED_PRIO_INVALID; + -+ return kbasep_js_atom_priority_to_relative[atom_prio]; -+} ++static struct _mali_osk_lock_debug_s *lock_lookup_list; + -+static inline base_jd_prio kbasep_js_sched_prio_to_atom_prio(int sched_prio) ++static void dump_lock_tracking_list(void) +{ -+ unsigned int prio_idx; -+ -+ KBASE_DEBUG_ASSERT(0 <= sched_prio -+ && sched_prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT); ++ struct _mali_osk_lock_debug_s *l; ++ u32 n = 1; + -+ prio_idx = (unsigned int)sched_prio; ++ /* print list for debugging purposes */ ++ l = lock_lookup_list; + -+ return kbasep_js_relative_priority_to_atom[prio_idx]; ++ while (NULL != l) { ++ printk(" [lock: %p, tid_owner: %d, order: %d] ->", l, l->owner, l->order); ++ l = l->next; ++ MALI_DEBUG_ASSERT(n++ < 100); ++ } ++ printk(" NULL\n"); +} + -+ /** @} *//* end group kbase_js */ -+ /** @} *//* end group base_kbase_api */ -+ /** @} *//* end group base_api */ -+ -+#endif /* _KBASE_JS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_ctx_attr.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_ctx_attr.c -new file mode 100755 -index 000000000000..321506ada835 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_ctx_attr.c -@@ -0,0 +1,301 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+ -+#include -+#include -+ -+/* -+ * Private functions follow -+ */ -+ -+/** -+ * @brief Check whether a ctx has a certain attribute, and if so, retain that -+ * attribute on the runpool. -+ * -+ * Requires: -+ * - jsctx mutex -+ * - runpool_irq spinlock -+ * - ctx is scheduled on the runpool -+ * -+ * @return true indicates a change in ctx attributes state of the runpool. -+ * In this state, the scheduler might be able to submit more jobs than -+ * previously, and so the caller should ensure kbasep_js_try_run_next_job_nolock() -+ * or similar is called sometime later. -+ * @return false indicates no change in ctx attributes state of the runpool. -+ */ -+static bool kbasep_js_ctx_attr_runpool_retain_attr(struct kbase_device *kbdev, struct kbase_context *kctx, enum kbasep_js_ctx_attr attribute) ++static int tracking_list_length(void) +{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ bool runpool_state_changed = false; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ KBASE_DEBUG_ASSERT(attribute < KBASEP_JS_CTX_ATTR_COUNT); -+ js_devdata = &kbdev->js_data; -+ js_kctx_info = &kctx->jctx.sched_info; -+ -+ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); -+ -+ if (kbasep_js_ctx_attr_is_attr_on_ctx(kctx, attribute) != false) { -+ KBASE_DEBUG_ASSERT(js_devdata->runpool_irq.ctx_attr_ref_count[attribute] < S8_MAX); -+ ++(js_devdata->runpool_irq.ctx_attr_ref_count[attribute]); ++ struct _mali_osk_lock_debug_s *l; ++ u32 n = 0; ++ l = lock_lookup_list; + -+ if (js_devdata->runpool_irq.ctx_attr_ref_count[attribute] == 1) { -+ /* First refcount indicates a state change */ -+ runpool_state_changed = true; -+ KBASE_TRACE_ADD(kbdev, JS_CTX_ATTR_NOW_ON_RUNPOOL, kctx, NULL, 0u, attribute); -+ } ++ while (NULL != l) { ++ l = l->next; ++ n++; ++ MALI_DEBUG_ASSERT(n < 100); + } -+ -+ return runpool_state_changed; ++ return n; +} + -+/** -+ * @brief Check whether a ctx has a certain attribute, and if so, release that -+ * attribute on the runpool. -+ * -+ * Requires: -+ * - jsctx mutex -+ * - runpool_irq spinlock -+ * - ctx is scheduled on the runpool -+ * -+ * @return true indicates a change in ctx attributes state of the runpool. -+ * In this state, the scheduler might be able to submit more jobs than -+ * previously, and so the caller should ensure kbasep_js_try_run_next_job_nolock() -+ * or similar is called sometime later. -+ * @return false indicates no change in ctx attributes state of the runpool. -+ */ -+static bool kbasep_js_ctx_attr_runpool_release_attr(struct kbase_device *kbdev, struct kbase_context *kctx, enum kbasep_js_ctx_attr attribute) ++static mali_bool add_lock_to_log_and_check(struct _mali_osk_lock_debug_s *lock, uint32_t tid) +{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ bool runpool_state_changed = false; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ KBASE_DEBUG_ASSERT(attribute < KBASEP_JS_CTX_ATTR_COUNT); -+ js_devdata = &kbdev->js_data; -+ js_kctx_info = &kctx->jctx.sched_info; ++ mali_bool ret = MALI_FALSE; ++ _mali_osk_lock_order_t highest_order_for_tid = _MALI_OSK_LOCK_ORDER_FIRST; ++ struct _mali_osk_lock_debug_s *highest_order_lock = (struct _mali_osk_lock_debug_s *)0xbeefbabe; ++ struct _mali_osk_lock_debug_s *l; ++ unsigned long local_lock_flag; ++ u32 len; + -+ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ spin_lock_irqsave(&lock_tracking_lock, local_lock_flag); ++ len = tracking_list_length(); + -+ if (kbasep_js_ctx_attr_is_attr_on_ctx(kctx, attribute) != false) { -+ KBASE_DEBUG_ASSERT(js_devdata->runpool_irq.ctx_attr_ref_count[attribute] > 0); -+ --(js_devdata->runpool_irq.ctx_attr_ref_count[attribute]); ++ l = lock_lookup_list; ++ if (NULL == l) { /* This is the first lock taken by this thread -- record and return true */ ++ lock_lookup_list = lock; ++ spin_unlock_irqrestore(&lock_tracking_lock, local_lock_flag); ++ return MALI_TRUE; ++ } else { ++ /* Traverse the locks taken and find the lock of the highest order. ++ * Since several threads may hold locks, each lock's owner must be ++ * checked so that locks not owned by this thread can be ignored. */ ++ for (;;) { ++ MALI_DEBUG_ASSERT_POINTER(l); ++ if (tid == l->owner && l->order >= highest_order_for_tid) { ++ highest_order_for_tid = l->order; ++ highest_order_lock = l; ++ } + -+ if (js_devdata->runpool_irq.ctx_attr_ref_count[attribute] == 0) { -+ /* Last de-refcount indicates a state change */ -+ runpool_state_changed = true; -+ KBASE_TRACE_ADD(kbdev, JS_CTX_ATTR_NOW_OFF_RUNPOOL, kctx, NULL, 0u, attribute); ++ if (NULL != l->next) { ++ l = l->next; ++ } else { ++ break; ++ } + } -+ } -+ -+ return runpool_state_changed; -+} -+ -+/** -+ * @brief Retain a certain attribute on a ctx, also retaining it on the runpool -+ * if the context is scheduled. -+ * -+ * Requires: -+ * - jsctx mutex -+ * - If the context is scheduled, then runpool_irq spinlock must also be held -+ * -+ * @return true indicates a change in ctx attributes state of the runpool. -+ * This may allow the scheduler to submit more jobs than previously. -+ * @return false indicates no change in ctx attributes state of the runpool. -+ */ -+static bool kbasep_js_ctx_attr_ctx_retain_attr(struct kbase_device *kbdev, struct kbase_context *kctx, enum kbasep_js_ctx_attr attribute) -+{ -+ struct kbasep_js_kctx_info *js_kctx_info; -+ bool runpool_state_changed = false; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ KBASE_DEBUG_ASSERT(attribute < KBASEP_JS_CTX_ATTR_COUNT); -+ js_kctx_info = &kctx->jctx.sched_info; ++ l->next = lock; ++ l->next = NULL; ++ } + -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); -+ KBASE_DEBUG_ASSERT(js_kctx_info->ctx.ctx_attr_ref_count[attribute] < U32_MAX); ++ /* We have now found the highest order lock currently held by this thread and can see if it is ++ * legal to take the requested lock. */ ++ ret = highest_order_for_tid < lock->order; + -+ ++(js_kctx_info->ctx.ctx_attr_ref_count[attribute]); ++ if (!ret) { ++ printk(KERN_ERR "Took lock of order %d (%s) while holding lock of order %d (%s)\n", ++ lock->order, lock_order_to_string(lock->order), ++ highest_order_for_tid, lock_order_to_string(highest_order_for_tid)); ++ dump_lock_tracking_list(); ++ } + -+ if (kbase_ctx_flag(kctx, KCTX_SCHEDULED) && js_kctx_info->ctx.ctx_attr_ref_count[attribute] == 1) { -+ /* Only ref-count the attribute on the runpool for the first time this contexts sees this attribute */ -+ KBASE_TRACE_ADD(kbdev, JS_CTX_ATTR_NOW_ON_CTX, kctx, NULL, 0u, attribute); -+ runpool_state_changed = kbasep_js_ctx_attr_runpool_retain_attr(kbdev, kctx, attribute); ++ if (len + 1 != tracking_list_length()) { ++ printk(KERN_ERR "************ lock: %p\n", lock); ++ printk(KERN_ERR "************ before: %d *** after: %d ****\n", len, tracking_list_length()); ++ dump_lock_tracking_list(); ++ MALI_DEBUG_ASSERT_POINTER(NULL); + } + -+ return runpool_state_changed; ++ spin_unlock_irqrestore(&lock_tracking_lock, local_lock_flag); ++ return ret; +} + -+/* -+ * @brief Release a certain attribute on a ctx, also releasing it from the runpool -+ * if the context is scheduled. -+ * -+ * Requires: -+ * - jsctx mutex -+ * - If the context is scheduled, then runpool_irq spinlock must also be held -+ * -+ * @return true indicates a change in ctx attributes state of the runpool. -+ * This may allow the scheduler to submit more jobs than previously. -+ * @return false indicates no change in ctx attributes state of the runpool. -+ */ -+static bool kbasep_js_ctx_attr_ctx_release_attr(struct kbase_device *kbdev, struct kbase_context *kctx, enum kbasep_js_ctx_attr attribute) ++static void remove_lock_from_log(struct _mali_osk_lock_debug_s *lock, uint32_t tid) +{ -+ struct kbasep_js_kctx_info *js_kctx_info; -+ bool runpool_state_changed = false; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ KBASE_DEBUG_ASSERT(attribute < KBASEP_JS_CTX_ATTR_COUNT); -+ js_kctx_info = &kctx->jctx.sched_info; ++ struct _mali_osk_lock_debug_s *curr; ++ struct _mali_osk_lock_debug_s *prev = NULL; ++ unsigned long local_lock_flag; ++ u32 len; ++ u32 n = 0; + -+ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); -+ KBASE_DEBUG_ASSERT(js_kctx_info->ctx.ctx_attr_ref_count[attribute] > 0); ++ spin_lock_irqsave(&lock_tracking_lock, local_lock_flag); ++ len = tracking_list_length(); ++ curr = lock_lookup_list; + -+ if (kbase_ctx_flag(kctx, KCTX_SCHEDULED) && js_kctx_info->ctx.ctx_attr_ref_count[attribute] == 1) { -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ /* Only de-ref-count the attribute on the runpool when this is the last ctx-reference to it */ -+ runpool_state_changed = kbasep_js_ctx_attr_runpool_release_attr(kbdev, kctx, attribute); -+ KBASE_TRACE_ADD(kbdev, JS_CTX_ATTR_NOW_OFF_CTX, kctx, NULL, 0u, attribute); ++ if (NULL == curr) { ++ printk(KERN_ERR "Error: Lock tracking list was empty on call to remove_lock_from_log\n"); ++ dump_lock_tracking_list(); + } + -+ /* De-ref must happen afterwards, because kbasep_js_ctx_attr_runpool_release() needs to check it too */ -+ --(js_kctx_info->ctx.ctx_attr_ref_count[attribute]); -+ -+ return runpool_state_changed; -+} ++ MALI_DEBUG_ASSERT_POINTER(curr); + -+/* -+ * More commonly used public functions -+ */ + -+void kbasep_js_ctx_attr_set_initial_attrs(struct kbase_device *kbdev, struct kbase_context *kctx) -+{ -+ bool runpool_state_changed = false; ++ while (lock != curr) { ++ prev = curr; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kctx != NULL); ++ MALI_DEBUG_ASSERT_POINTER(curr); ++ curr = curr->next; ++ MALI_DEBUG_ASSERT(n++ < 100); ++ } + -+ if (kbase_ctx_flag(kctx, KCTX_SUBMIT_DISABLED)) { -+ /* This context never submits, so don't track any scheduling attributes */ -+ return; ++ if (NULL == prev) { ++ lock_lookup_list = curr->next; ++ } else { ++ MALI_DEBUG_ASSERT_POINTER(curr); ++ MALI_DEBUG_ASSERT_POINTER(prev); ++ prev->next = curr->next; + } + -+ /* Transfer attributes held in the context flags for contexts that have submit enabled */ ++ lock->next = NULL; + -+ /* ... More attributes can be added here ... */ ++ if (len - 1 != tracking_list_length()) { ++ printk(KERN_ERR "************ lock: %p\n", lock); ++ printk(KERN_ERR "************ before: %d *** after: %d ****\n", len, tracking_list_length()); ++ dump_lock_tracking_list(); ++ MALI_DEBUG_ASSERT_POINTER(NULL); ++ } + -+ /* The context should not have been scheduled yet, so ASSERT if this caused -+ * runpool state changes (note that other threads *can't* affect the value -+ * of runpool_state_changed, due to how it's calculated) */ -+ KBASE_DEBUG_ASSERT(runpool_state_changed == false); -+ CSTD_UNUSED(runpool_state_changed); ++ spin_unlock_irqrestore(&lock_tracking_lock, local_lock_flag); +} + -+void kbasep_js_ctx_attr_runpool_retain_ctx(struct kbase_device *kbdev, struct kbase_context *kctx) ++static const char *const lock_order_to_string(_mali_osk_lock_order_t order) +{ -+ bool runpool_state_changed; -+ int i; -+ -+ /* Retain any existing attributes */ -+ for (i = 0; i < KBASEP_JS_CTX_ATTR_COUNT; ++i) { -+ if (kbasep_js_ctx_attr_is_attr_on_ctx(kctx, (enum kbasep_js_ctx_attr) i) != false) { -+ /* The context is being scheduled in, so update the runpool with the new attributes */ -+ runpool_state_changed = kbasep_js_ctx_attr_runpool_retain_attr(kbdev, kctx, (enum kbasep_js_ctx_attr) i); -+ -+ /* We don't need to know about state changed, because retaining a -+ * context occurs on scheduling it, and that itself will also try -+ * to run new atoms */ -+ CSTD_UNUSED(runpool_state_changed); -+ } -+ } -+} -+ -+bool kbasep_js_ctx_attr_runpool_release_ctx(struct kbase_device *kbdev, struct kbase_context *kctx) -+{ -+ bool runpool_state_changed = false; -+ int i; -+ -+ /* Release any existing attributes */ -+ for (i = 0; i < KBASEP_JS_CTX_ATTR_COUNT; ++i) { -+ if (kbasep_js_ctx_attr_is_attr_on_ctx(kctx, (enum kbasep_js_ctx_attr) i) != false) { -+ /* The context is being scheduled out, so update the runpool on the removed attributes */ -+ runpool_state_changed |= kbasep_js_ctx_attr_runpool_release_attr(kbdev, kctx, (enum kbasep_js_ctx_attr) i); -+ } ++ switch (order) { ++ case _MALI_OSK_LOCK_ORDER_SESSIONS: ++ return "_MALI_OSK_LOCK_ORDER_SESSIONS"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_MEM_SESSION: ++ return "_MALI_OSK_LOCK_ORDER_MEM_SESSION"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_MEM_INFO: ++ return "_MALI_OSK_LOCK_ORDER_MEM_INFO"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_MEM_PT_CACHE: ++ return "_MALI_OSK_LOCK_ORDER_MEM_PT_CACHE"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_DESCRIPTOR_MAP: ++ return "_MALI_OSK_LOCK_ORDER_DESCRIPTOR_MAP"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_PM_EXECUTION: ++ return "_MALI_OSK_LOCK_ORDER_PM_EXECUTION"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_EXECUTOR: ++ return "_MALI_OSK_LOCK_ORDER_EXECUTOR"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_TIMELINE_SYSTEM: ++ return "_MALI_OSK_LOCK_ORDER_TIMELINE_SYSTEM"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_SCHEDULER: ++ return "_MALI_OSK_LOCK_ORDER_SCHEDULER"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_SCHEDULER_DEFERRED: ++ return "_MALI_OSK_LOCK_ORDER_SCHEDULER_DEFERRED"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_DMA_COMMAND: ++ return "_MALI_OSK_LOCK_ORDER_DMA_COMMAND"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_PROFILING: ++ return "_MALI_OSK_LOCK_ORDER_PROFILING"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_L2: ++ return "_MALI_OSK_LOCK_ORDER_L2"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_L2_COMMAND: ++ return "_MALI_OSK_LOCK_ORDER_L2_COMMAND"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_UTILIZATION: ++ return "_MALI_OSK_LOCK_ORDER_UTILIZATION"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_SESSION_PENDING_JOBS: ++ return "_MALI_OSK_LOCK_ORDER_SESSION_PENDING_JOBS"; ++ break; ++ case _MALI_OSK_LOCK_ORDER_PM_STATE: ++ return "_MALI_OSK_LOCK_ORDER_PM_STATE"; ++ break; ++ default: ++ return ""; + } -+ -+ return runpool_state_changed; +} ++#endif /* LOCK_ORDER_CHECKING */ ++#endif /* DEBUG */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h +new file mode 100755 +index 000000000..6fd5af952 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h +@@ -0,0 +1,326 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+void kbasep_js_ctx_attr_ctx_retain_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *katom) -+{ -+ bool runpool_state_changed = false; -+ base_jd_core_req core_req; ++/** ++ * @file mali_osk_locks.h ++ * Defines OS abstraction of lock and mutex ++ */ ++#ifndef _MALI_OSK_LOCKS_H ++#define _MALI_OSK_LOCKS_H + -+ KBASE_DEBUG_ASSERT(katom); -+ core_req = katom->core_req; ++#include ++#include ++#include + -+ if (core_req & BASE_JD_REQ_ONLY_COMPUTE) -+ runpool_state_changed |= kbasep_js_ctx_attr_ctx_retain_attr(kbdev, kctx, KBASEP_JS_CTX_ATTR_COMPUTE); -+ else -+ runpool_state_changed |= kbasep_js_ctx_attr_ctx_retain_attr(kbdev, kctx, KBASEP_JS_CTX_ATTR_NON_COMPUTE); ++#include + -+ if ((core_req & (BASE_JD_REQ_CS | BASE_JD_REQ_ONLY_COMPUTE | BASE_JD_REQ_T)) != 0 && (core_req & (BASE_JD_REQ_COHERENT_GROUP | BASE_JD_REQ_SPECIFIC_COHERENT_GROUP)) == 0) { -+ /* Atom that can run on slot1 or slot2, and can use all cores */ -+ runpool_state_changed |= kbasep_js_ctx_attr_ctx_retain_attr(kbdev, kctx, KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES); -+ } ++#include "mali_osk_types.h" + -+ /* We don't need to know about state changed, because retaining an -+ * atom occurs on adding it, and that itself will also try to run -+ * new atoms */ -+ CSTD_UNUSED(runpool_state_changed); -+} ++#ifdef _cplusplus ++extern "C" { ++#endif + -+bool kbasep_js_ctx_attr_ctx_release_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbasep_js_atom_retained_state *katom_retained_state) -+{ -+ bool runpool_state_changed = false; -+ base_jd_core_req core_req; ++ /* When DEBUG is enabled, this struct will be used to track owner, mode and order checking */ ++#ifdef DEBUG ++ struct _mali_osk_lock_debug_s { ++ u32 owner; ++ _mali_osk_lock_flags_t orig_flags; ++ _mali_osk_lock_order_t order; ++ struct _mali_osk_lock_debug_s *next; ++ }; ++#endif + -+ KBASE_DEBUG_ASSERT(katom_retained_state); -+ core_req = katom_retained_state->core_req; ++ /* Anstraction of spinlock_t */ ++ struct _mali_osk_spinlock_s { ++#ifdef DEBUG ++ struct _mali_osk_lock_debug_s checker; ++#endif ++ spinlock_t spinlock; ++ }; + -+ /* No-op for invalid atoms */ -+ if (kbasep_js_atom_retained_state_is_valid(katom_retained_state) == false) -+ return false; ++ /* Abstration of spinlock_t and lock flag which is used to store register's state before locking */ ++ struct _mali_osk_spinlock_irq_s { ++#ifdef DEBUG ++ struct _mali_osk_lock_debug_s checker; ++#endif + -+ if (core_req & BASE_JD_REQ_ONLY_COMPUTE) -+ runpool_state_changed |= kbasep_js_ctx_attr_ctx_release_attr(kbdev, kctx, KBASEP_JS_CTX_ATTR_COMPUTE); -+ else -+ runpool_state_changed |= kbasep_js_ctx_attr_ctx_release_attr(kbdev, kctx, KBASEP_JS_CTX_ATTR_NON_COMPUTE); ++ spinlock_t spinlock; ++ unsigned long flags; ++ }; + -+ if ((core_req & (BASE_JD_REQ_CS | BASE_JD_REQ_ONLY_COMPUTE | BASE_JD_REQ_T)) != 0 && (core_req & (BASE_JD_REQ_COHERENT_GROUP | BASE_JD_REQ_SPECIFIC_COHERENT_GROUP)) == 0) { -+ /* Atom that can run on slot1 or slot2, and can use all cores */ -+ runpool_state_changed |= kbasep_js_ctx_attr_ctx_release_attr(kbdev, kctx, KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES); -+ } ++ /* Abstraction of rw_semaphore in OS */ ++ struct _mali_osk_mutex_rw_s { ++#ifdef DEBUG ++ struct _mali_osk_lock_debug_s checker; ++ _mali_osk_lock_mode_t mode; ++#endif + -+ return runpool_state_changed; -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_ctx_attr.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_ctx_attr.h -new file mode 100755 -index 000000000000..ce9183326a57 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_ctx_attr.h -@@ -0,0 +1,158 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ struct rw_semaphore rw_sema; ++ }; + ++ /* Mutex and mutex_interruptible functions share the same osk mutex struct */ ++ struct _mali_osk_mutex_s { ++#ifdef DEBUG ++ struct _mali_osk_lock_debug_s checker; ++#endif ++ struct mutex mutex; ++ }; + ++#ifdef DEBUG ++ /** @brief _mali_osk_locks_debug_init/add/remove() functions are declared when DEBUG is enabled and ++ * defined in file mali_osk_locks.c. When LOCK_ORDER_CHECKING is enabled, calling these functions when we ++ * init/lock/unlock a lock/mutex, we could track lock order of a given tid. */ ++ void _mali_osk_locks_debug_init(struct _mali_osk_lock_debug_s *checker, _mali_osk_lock_flags_t flags, _mali_osk_lock_order_t order); ++ void _mali_osk_locks_debug_add(struct _mali_osk_lock_debug_s *checker); ++ void _mali_osk_locks_debug_remove(struct _mali_osk_lock_debug_s *checker); + ++ /** @brief This function can return a given lock's owner when DEBUG is enabled. */ ++ static inline u32 _mali_osk_lock_get_owner(struct _mali_osk_lock_debug_s *lock) ++ { ++ return lock->owner; ++ } ++#else ++#define _mali_osk_locks_debug_init(x, y, z) do {} while (0) ++#define _mali_osk_locks_debug_add(x) do {} while (0) ++#define _mali_osk_locks_debug_remove(x) do {} while (0) ++#endif + ++ /** @brief Before use _mali_osk_spin_lock, init function should be used to allocate memory and initial spinlock*/ ++ static inline _mali_osk_spinlock_t *_mali_osk_spinlock_init(_mali_osk_lock_flags_t flags, _mali_osk_lock_order_t order) ++ { ++ _mali_osk_spinlock_t *lock = NULL; + -+/** -+ * @file mali_kbase_js_ctx_attr.h -+ * Job Scheduler Context Attribute APIs -+ */ ++ lock = kmalloc(sizeof(_mali_osk_spinlock_t), GFP_KERNEL); ++ if (NULL == lock) { ++ return NULL; ++ } ++ spin_lock_init(&lock->spinlock); ++ _mali_osk_locks_debug_init((struct _mali_osk_lock_debug_s *)lock, flags, order); ++ return lock; ++ } + -+#ifndef _KBASE_JS_CTX_ATTR_H_ -+#define _KBASE_JS_CTX_ATTR_H_ ++ /** @brief Lock a spinlock */ ++ static inline void _mali_osk_spinlock_lock(_mali_osk_spinlock_t *lock) ++ { ++ BUG_ON(NULL == lock); ++ spin_lock(&lock->spinlock); ++ _mali_osk_locks_debug_add((struct _mali_osk_lock_debug_s *)lock); ++ } + -+/** -+ * @addtogroup base_api -+ * @{ -+ */ ++ /** @brief Unlock a spinlock */ ++ static inline void _mali_osk_spinlock_unlock(_mali_osk_spinlock_t *lock) ++ { ++ BUG_ON(NULL == lock); ++ _mali_osk_locks_debug_remove((struct _mali_osk_lock_debug_s *)lock); ++ spin_unlock(&lock->spinlock); ++ } + -+/** -+ * @addtogroup base_kbase_api -+ * @{ -+ */ ++ /** @brief Free a memory block which the argument lock pointed to and its type must be ++ * _mali_osk_spinlock_t *. */ ++ static inline void _mali_osk_spinlock_term(_mali_osk_spinlock_t *lock) ++ { ++ /* Parameter validation */ ++ BUG_ON(NULL == lock); + -+/** -+ * @addtogroup kbase_js -+ * @{ -+ */ ++ /* Linux requires no explicit termination of spinlocks, semaphores, or rw_semaphores */ ++ kfree(lock); ++ } + -+/** -+ * Set the initial attributes of a context (when context create flags are set) -+ * -+ * Requires: -+ * - Hold the jsctx_mutex -+ */ -+void kbasep_js_ctx_attr_set_initial_attrs(struct kbase_device *kbdev, struct kbase_context *kctx); ++ /** @brief Before _mali_osk_spinlock_irq_lock/unlock/term() is called, init function should be ++ * called to initial spinlock and flags in struct _mali_osk_spinlock_irq_t. */ ++ static inline _mali_osk_spinlock_irq_t *_mali_osk_spinlock_irq_init(_mali_osk_lock_flags_t flags, _mali_osk_lock_order_t order) ++ { ++ _mali_osk_spinlock_irq_t *lock = NULL; ++ lock = kmalloc(sizeof(_mali_osk_spinlock_irq_t), GFP_KERNEL); + -+/** -+ * Retain all attributes of a context -+ * -+ * This occurs on scheduling in the context on the runpool (but after -+ * is_scheduled is set) -+ * -+ * Requires: -+ * - jsctx mutex -+ * - runpool_irq spinlock -+ * - ctx->is_scheduled is true -+ */ -+void kbasep_js_ctx_attr_runpool_retain_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); ++ if (NULL == lock) { ++ return NULL; ++ } + -+/** -+ * Release all attributes of a context -+ * -+ * This occurs on scheduling out the context from the runpool (but before -+ * is_scheduled is cleared) -+ * -+ * Requires: -+ * - jsctx mutex -+ * - runpool_irq spinlock -+ * - ctx->is_scheduled is true -+ * -+ * @return true indicates a change in ctx attributes state of the runpool. -+ * In this state, the scheduler might be able to submit more jobs than -+ * previously, and so the caller should ensure kbasep_js_try_run_next_job_nolock() -+ * or similar is called sometime later. -+ * @return false indicates no change in ctx attributes state of the runpool. -+ */ -+bool kbasep_js_ctx_attr_runpool_release_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); ++ lock->flags = 0; ++ spin_lock_init(&lock->spinlock); ++ _mali_osk_locks_debug_init((struct _mali_osk_lock_debug_s *)lock, flags, order); ++ return lock; ++ } + -+/** -+ * Retain all attributes of an atom -+ * -+ * This occurs on adding an atom to a context -+ * -+ * Requires: -+ * - jsctx mutex -+ * - If the context is scheduled, then runpool_irq spinlock must also be held -+ */ -+void kbasep_js_ctx_attr_ctx_retain_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *katom); ++ /** @brief Lock spinlock and save the register's state */ ++ static inline void _mali_osk_spinlock_irq_lock(_mali_osk_spinlock_irq_t *lock) ++ { ++ unsigned long tmp_flags; + -+/** -+ * Release all attributes of an atom, given its retained state. -+ * -+ * This occurs after (permanently) removing an atom from a context -+ * -+ * Requires: -+ * - jsctx mutex -+ * - If the context is scheduled, then runpool_irq spinlock must also be held -+ * -+ * This is a no-op when \a katom_retained_state is invalid. -+ * -+ * @return true indicates a change in ctx attributes state of the runpool. -+ * In this state, the scheduler might be able to submit more jobs than -+ * previously, and so the caller should ensure kbasep_js_try_run_next_job_nolock() -+ * or similar is called sometime later. -+ * @return false indicates no change in ctx attributes state of the runpool. -+ */ -+bool kbasep_js_ctx_attr_ctx_release_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbasep_js_atom_retained_state *katom_retained_state); ++ BUG_ON(NULL == lock); ++ spin_lock_irqsave(&lock->spinlock, tmp_flags); ++ lock->flags = tmp_flags; ++ _mali_osk_locks_debug_add((struct _mali_osk_lock_debug_s *)lock); ++ } + -+/** -+ * Requires: -+ * - runpool_irq spinlock -+ */ -+static inline s8 kbasep_js_ctx_attr_count_on_runpool(struct kbase_device *kbdev, enum kbasep_js_ctx_attr attribute) -+{ -+ struct kbasep_js_device_data *js_devdata; ++ /** @brief Unlock spinlock with saved register's state */ ++ static inline void _mali_osk_spinlock_irq_unlock(_mali_osk_spinlock_irq_t *lock) ++ { ++ BUG_ON(NULL == lock); ++ _mali_osk_locks_debug_remove((struct _mali_osk_lock_debug_s *)lock); ++ spin_unlock_irqrestore(&lock->spinlock, lock->flags); ++ } + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(attribute < KBASEP_JS_CTX_ATTR_COUNT); -+ js_devdata = &kbdev->js_data; ++ /** @brief Destroy a given memory block which lock pointed to, and the lock type must be ++ * _mali_osk_spinlock_irq_t *. */ ++ static inline void _mali_osk_spinlock_irq_term(_mali_osk_spinlock_irq_t *lock) ++ { ++ /* Parameter validation */ ++ BUG_ON(NULL == lock); + -+ return js_devdata->runpool_irq.ctx_attr_ref_count[attribute]; -+} ++ /* Linux requires no explicit termination of spinlocks, semaphores, or rw_semaphores */ ++ kfree(lock); ++ } + -+/** -+ * Requires: -+ * - runpool_irq spinlock -+ */ -+static inline bool kbasep_js_ctx_attr_is_attr_on_runpool(struct kbase_device *kbdev, enum kbasep_js_ctx_attr attribute) -+{ -+ /* In general, attributes are 'on' when they have a non-zero refcount (note: the refcount will never be < 0) */ -+ return (bool) kbasep_js_ctx_attr_count_on_runpool(kbdev, attribute); -+} ++ /** @brief Before _mali_osk_mutex_rw_wait/signal/term() is called, we should call ++ * _mali_osk_mutex_rw_init() to kmalloc a memory block and initial part of elements in it. */ ++ static inline _mali_osk_mutex_rw_t *_mali_osk_mutex_rw_init(_mali_osk_lock_flags_t flags, _mali_osk_lock_order_t order) ++ { ++ _mali_osk_mutex_rw_t *lock = NULL; + -+/** -+ * Requires: -+ * - jsctx mutex -+ */ -+static inline bool kbasep_js_ctx_attr_is_attr_on_ctx(struct kbase_context *kctx, enum kbasep_js_ctx_attr attribute) -+{ -+ struct kbasep_js_kctx_info *js_kctx_info; ++ lock = kmalloc(sizeof(_mali_osk_mutex_rw_t), GFP_KERNEL); + -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ KBASE_DEBUG_ASSERT(attribute < KBASEP_JS_CTX_ATTR_COUNT); -+ js_kctx_info = &kctx->jctx.sched_info; ++ if (NULL == lock) { ++ return NULL; ++ } + -+ /* In general, attributes are 'on' when they have a refcount (which should never be < 0) */ -+ return (bool) (js_kctx_info->ctx.ctx_attr_ref_count[attribute]); -+} ++ init_rwsem(&lock->rw_sema); ++ _mali_osk_locks_debug_init((struct _mali_osk_lock_debug_s *)lock, flags, order); ++ return lock; ++ } + -+ /** @} *//* end group kbase_js */ -+ /** @} *//* end group base_kbase_api */ -+ /** @} *//* end group base_api */ ++ /** @brief When call _mali_osk_mutex_rw_wait/signal() functions, the second argument mode ++ * should be assigned with value _MALI_OSK_LOCKMODE_RO or _MALI_OSK_LOCKMODE_RW */ ++ static inline void _mali_osk_mutex_rw_wait(_mali_osk_mutex_rw_t *lock, _mali_osk_lock_mode_t mode) ++ { ++ BUG_ON(NULL == lock); ++ BUG_ON(!(_MALI_OSK_LOCKMODE_RO == mode || _MALI_OSK_LOCKMODE_RW == mode)); + -+#endif /* _KBASE_JS_DEFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_defs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_defs.h -new file mode 100755 -index 000000000000..0b4890d6b50e ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_defs.h -@@ -0,0 +1,386 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ if (mode == _MALI_OSK_LOCKMODE_RO) { ++ down_read(&lock->rw_sema); ++ } else { ++ down_write(&lock->rw_sema); ++ } + ++#ifdef DEBUG ++ if (mode == _MALI_OSK_LOCKMODE_RW) { ++ lock->mode = mode; ++ } else { /* mode == _MALI_OSK_LOCKMODE_RO */ ++ lock->mode = mode; ++ } ++ _mali_osk_locks_debug_add((struct _mali_osk_lock_debug_s *)lock); ++#endif ++ } + ++ /** @brief Up lock->rw_sema with up_read/write() accordinf argument mode's value. */ ++ static inline void _mali_osk_mutex_rw_signal(_mali_osk_mutex_rw_t *lock, _mali_osk_lock_mode_t mode) ++ { ++ BUG_ON(NULL == lock); ++ BUG_ON(!(_MALI_OSK_LOCKMODE_RO == mode || _MALI_OSK_LOCKMODE_RW == mode)); ++#ifdef DEBUG ++ /* make sure the thread releasing the lock actually was the owner */ ++ if (mode == _MALI_OSK_LOCKMODE_RW) { ++ _mali_osk_locks_debug_remove((struct _mali_osk_lock_debug_s *)lock); ++ /* This lock now has no owner */ ++ lock->checker.owner = 0; ++ } ++#endif + ++ if (mode == _MALI_OSK_LOCKMODE_RO) { ++ up_read(&lock->rw_sema); ++ } else { ++ up_write(&lock->rw_sema); ++ } ++ } + ++ /** @brief Free a given memory block which lock pointed to and its type must be ++ * _mali_sok_mutex_rw_t *. */ ++ static inline void _mali_osk_mutex_rw_term(_mali_osk_mutex_rw_t *lock) ++ { ++ /* Parameter validation */ ++ BUG_ON(NULL == lock); + -+/** -+ * @file mali_kbase_js.h -+ * Job Scheduler Type Definitions -+ */ ++ /* Linux requires no explicit termination of spinlocks, semaphores, or rw_semaphores */ ++ kfree(lock); ++ } + -+#ifndef _KBASE_JS_DEFS_H_ -+#define _KBASE_JS_DEFS_H_ ++ /** @brief Mutex & mutex_interruptible share the same init and term function, because they have the ++ * same osk mutex struct, and the difference between them is which locking function they use */ ++ static inline _mali_osk_mutex_t *_mali_osk_mutex_init(_mali_osk_lock_flags_t flags, _mali_osk_lock_order_t order) ++ { ++ _mali_osk_mutex_t *lock = NULL; + -+/** -+ * @addtogroup base_api -+ * @{ -+ */ ++ lock = kmalloc(sizeof(_mali_osk_mutex_t), GFP_KERNEL); + -+/** -+ * @addtogroup base_kbase_api -+ * @{ -+ */ ++ if (NULL == lock) { ++ return NULL; ++ } ++ mutex_init(&lock->mutex); + -+/** -+ * @addtogroup kbase_js -+ * @{ -+ */ -+/* Forward decls */ -+struct kbase_device; -+struct kbase_jd_atom; ++ _mali_osk_locks_debug_init((struct _mali_osk_lock_debug_s *)lock, flags, order); ++ return lock; ++ } + ++ /** @brief Lock the lock->mutex with mutex_lock_interruptible function */ ++ static inline _mali_osk_errcode_t _mali_osk_mutex_wait_interruptible(_mali_osk_mutex_t *lock) ++ { ++ _mali_osk_errcode_t err = _MALI_OSK_ERR_OK; + -+typedef u32 kbase_context_flags; ++ BUG_ON(NULL == lock); + -+struct kbasep_atom_req { -+ base_jd_core_req core_req; -+ kbase_context_flags ctx_req; -+ u32 device_nr; -+}; ++ if (mutex_lock_interruptible(&lock->mutex)) { ++ printk(KERN_WARNING "Mali: Can not lock mutex\n"); ++ err = _MALI_OSK_ERR_RESTARTSYSCALL; ++ } + -+/** Callback function run on all of a context's jobs registered with the Job -+ * Scheduler */ -+typedef void (*kbasep_js_ctx_job_cb)(struct kbase_device *kbdev, struct kbase_jd_atom *katom); ++ _mali_osk_locks_debug_add((struct _mali_osk_lock_debug_s *)lock); ++ return err; ++ } + -+/** -+ * @brief Maximum number of jobs that can be submitted to a job slot whilst -+ * inside the IRQ handler. -+ * -+ * This is important because GPU NULL jobs can complete whilst the IRQ handler -+ * is running. Otherwise, it potentially allows an unlimited number of GPU NULL -+ * jobs to be submitted inside the IRQ handler, which increases IRQ latency. -+ */ -+#define KBASE_JS_MAX_JOB_SUBMIT_PER_SLOT_PER_IRQ 2 ++ /** @brief Unlock the lock->mutex which is locked with mutex_lock_interruptible() function. */ ++ static inline void _mali_osk_mutex_signal_interruptible(_mali_osk_mutex_t *lock) ++ { ++ BUG_ON(NULL == lock); ++ _mali_osk_locks_debug_remove((struct _mali_osk_lock_debug_s *)lock); ++ mutex_unlock(&lock->mutex); ++ } + -+/** -+ * @brief Context attributes -+ * -+ * Each context attribute can be thought of as a boolean value that caches some -+ * state information about either the runpool, or the context: -+ * - In the case of the runpool, it is a cache of "Do any contexts owned by -+ * the runpool have attribute X?" -+ * - In the case of a context, it is a cache of "Do any atoms owned by the -+ * context have attribute X?" -+ * -+ * The boolean value of the context attributes often affect scheduling -+ * decisions, such as affinities to use and job slots to use. -+ * -+ * To accomodate changes of state in the context, each attribute is refcounted -+ * in the context, and in the runpool for all running contexts. Specifically: -+ * - The runpool holds a refcount of how many contexts in the runpool have this -+ * attribute. -+ * - The context holds a refcount of how many atoms have this attribute. -+ */ -+enum kbasep_js_ctx_attr { -+ /** Attribute indicating a context that contains Compute jobs. That is, -+ * the context has jobs of type @ref BASE_JD_REQ_ONLY_COMPUTE -+ * -+ * @note A context can be both 'Compute' and 'Non Compute' if it contains -+ * both types of jobs. -+ */ -+ KBASEP_JS_CTX_ATTR_COMPUTE, ++ /** @brief Lock the lock->mutex just with mutex_lock() function which could not be interruptted. */ ++ static inline void _mali_osk_mutex_wait(_mali_osk_mutex_t *lock) ++ { ++ BUG_ON(NULL == lock); ++ mutex_lock(&lock->mutex); ++ _mali_osk_locks_debug_add((struct _mali_osk_lock_debug_s *)lock); ++ } + -+ /** Attribute indicating a context that contains Non-Compute jobs. That is, -+ * the context has some jobs that are \b not of type @ref -+ * BASE_JD_REQ_ONLY_COMPUTE. -+ * -+ * @note A context can be both 'Compute' and 'Non Compute' if it contains -+ * both types of jobs. -+ */ -+ KBASEP_JS_CTX_ATTR_NON_COMPUTE, ++ /** @brief Unlock the lock->mutex which is locked with mutex_lock() function. */ ++ static inline void _mali_osk_mutex_signal(_mali_osk_mutex_t *lock) ++ { ++ BUG_ON(NULL == lock); ++ _mali_osk_locks_debug_remove((struct _mali_osk_lock_debug_s *)lock); ++ mutex_unlock(&lock->mutex); ++ } + -+ /** Attribute indicating that a context contains compute-job atoms that -+ * aren't restricted to a coherent group, and can run on all cores. -+ * -+ * Specifically, this is when the atom's \a core_req satisfy: -+ * - (\a core_req & (BASE_JD_REQ_CS | BASE_JD_REQ_ONLY_COMPUTE | BASE_JD_REQ_T) // uses slot 1 or slot 2 -+ * - && !(\a core_req & BASE_JD_REQ_COHERENT_GROUP) // not restricted to coherent groups -+ * -+ * Such atoms could be blocked from running if one of the coherent groups -+ * is being used by another job slot, so tracking this context attribute -+ * allows us to prevent such situations. -+ * -+ * @note This doesn't take into account the 1-coregroup case, where all -+ * compute atoms would effectively be able to run on 'all cores', but -+ * contexts will still not always get marked with this attribute. Instead, -+ * it is the caller's responsibility to take into account the number of -+ * coregroups when interpreting this attribute. -+ * -+ * @note Whilst Tiler atoms are normally combined with -+ * BASE_JD_REQ_COHERENT_GROUP, it is possible to send such atoms without -+ * BASE_JD_REQ_COHERENT_GROUP set. This is an unlikely case, but it's easy -+ * enough to handle anyway. -+ */ -+ KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES, ++ /** @brief Free a given memory block which lock point. */ ++ static inline void _mali_osk_mutex_term(_mali_osk_mutex_t *lock) ++ { ++ /* Parameter validation */ ++ BUG_ON(NULL == lock); + -+ /** Must be the last in the enum */ -+ KBASEP_JS_CTX_ATTR_COUNT -+}; ++ /* Linux requires no explicit termination of spinlocks, semaphores, or rw_semaphores */ ++ kfree(lock); ++ } + -+enum { -+ /** Bit indicating that new atom should be started because this atom completed */ -+ KBASE_JS_ATOM_DONE_START_NEW_ATOMS = (1u << 0), -+ /** Bit indicating that the atom was evicted from the JS_NEXT registers */ -+ KBASE_JS_ATOM_DONE_EVICTED_FROM_NEXT = (1u << 1) -+}; ++#ifdef _cplusplus ++} ++#endif + -+/** Combination of KBASE_JS_ATOM_DONE_<...> bits */ -+typedef u32 kbasep_js_atom_done_code; ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c +new file mode 100755 +index 000000000..994b04dad +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c +@@ -0,0 +1,146 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + +/** -+ * @brief KBase Device Data Job Scheduler sub-structure -+ * -+ * This encapsulates the current context of the Job Scheduler on a particular -+ * device. This context is global to the device, and is not tied to any -+ * particular struct kbase_context running on the device. -+ * -+ * nr_contexts_running and as_free are optimized for packing together (by making -+ * them smaller types than u32). The operations on them should rarely involve -+ * masking. The use of signed types for arithmetic indicates to the compiler that -+ * the value will not rollover (which would be undefined behavior), and so under -+ * the Total License model, it is free to make optimizations based on that (i.e. -+ * to remove masking). ++ * @file mali_osk_low_level_mem.c ++ * Implementation of the OS abstraction layer for the kernel device driver + */ -+struct kbasep_js_device_data { -+ /* Sub-structure to collect together Job Scheduling data used in IRQ -+ * context. The hwaccess_lock must be held when accessing. */ -+ struct runpool_irq { -+ /** Bitvector indicating whether a currently scheduled context is allowed to submit jobs. -+ * When bit 'N' is set in this, it indicates whether the context bound to address space -+ * 'N' is allowed to submit jobs. -+ */ -+ u16 submit_allowed; -+ -+ /** Context Attributes: -+ * Each is large enough to hold a refcount of the number of contexts -+ * that can fit into the runpool. This is currently BASE_MAX_NR_AS -+ * -+ * Note that when BASE_MAX_NR_AS==16 we need 5 bits (not 4) to store -+ * the refcount. Hence, it's not worthwhile reducing this to -+ * bit-manipulation on u32s to save space (where in contrast, 4 bit -+ * sub-fields would be easy to do and would save space). -+ * -+ * Whilst this must not become negative, the sign bit is used for: -+ * - error detection in debug builds -+ * - Optimization: it is undefined for a signed int to overflow, and so -+ * the compiler can optimize for that never happening (thus, no masking -+ * is required on updating the variable) */ -+ s8 ctx_attr_ref_count[KBASEP_JS_CTX_ATTR_COUNT]; -+ -+ /* -+ * Affinity management and tracking -+ */ -+ /** Bitvector to aid affinity checking. Element 'n' bit 'i' indicates -+ * that slot 'n' is using core i (i.e. slot_affinity_refcount[n][i] > 0) */ -+ u64 slot_affinities[BASE_JM_MAX_NR_SLOTS]; -+ /** Refcount for each core owned by each slot. Used to generate the -+ * slot_affinities array of bitvectors -+ * -+ * The value of the refcount will not exceed BASE_JM_SUBMIT_SLOTS, -+ * because it is refcounted only when a job is definitely about to be -+ * submitted to a slot, and is de-refcounted immediately after a job -+ * finishes */ -+ s8 slot_affinity_refcount[BASE_JM_MAX_NR_SLOTS][64]; -+ } runpool_irq; -+ -+ /** -+ * Run Pool mutex, for managing contexts within the runpool. -+ * Unless otherwise specified, you must hold this lock whilst accessing any -+ * members that follow -+ * -+ * In addition, this is used to access: -+ * - the kbasep_js_kctx_info::runpool substructure -+ */ -+ struct mutex runpool_mutex; -+ -+ /** -+ * Queue Lock, used to access the Policy's queue of contexts independently -+ * of the Run Pool. -+ * -+ * Of course, you don't need the Run Pool lock to access this. -+ */ -+ struct mutex queue_mutex; + -+ /** -+ * Scheduling semaphore. This must be held when calling -+ * kbase_jm_kick() -+ */ -+ struct semaphore schedule_sem; ++#include ++#include ++#include + -+ /** -+ * List of contexts that can currently be pulled from -+ */ -+ struct list_head ctx_list_pullable[BASE_JM_MAX_NR_SLOTS]; -+ /** -+ * List of contexts that can not currently be pulled from, but have -+ * jobs currently running. -+ */ -+ struct list_head ctx_list_unpullable[BASE_JM_MAX_NR_SLOTS]; ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_ukk.h" + -+ /** Number of currently scheduled user contexts (excluding ones that are not submitting jobs) */ -+ s8 nr_user_contexts_running; -+ /** Number of currently scheduled contexts (including ones that are not submitting jobs) */ -+ s8 nr_all_contexts_running; ++void _mali_osk_mem_barrier(void) ++{ ++ mb(); ++} + -+ /** Core Requirements to match up with base_js_atom's core_req memeber -+ * @note This is a write-once member, and so no locking is required to read */ -+ base_jd_core_req js_reqs[BASE_JM_MAX_NR_SLOTS]; ++void _mali_osk_write_mem_barrier(void) ++{ ++ wmb(); ++} + -+ u32 scheduling_period_ns; /*< Value for JS_SCHEDULING_PERIOD_NS */ -+ u32 soft_stop_ticks; /*< Value for JS_SOFT_STOP_TICKS */ -+ u32 soft_stop_ticks_cl; /*< Value for JS_SOFT_STOP_TICKS_CL */ -+ u32 hard_stop_ticks_ss; /*< Value for JS_HARD_STOP_TICKS_SS */ -+ u32 hard_stop_ticks_cl; /*< Value for JS_HARD_STOP_TICKS_CL */ -+ u32 hard_stop_ticks_dumping; /*< Value for JS_HARD_STOP_TICKS_DUMPING */ -+ u32 gpu_reset_ticks_ss; /*< Value for JS_RESET_TICKS_SS */ -+ u32 gpu_reset_ticks_cl; /*< Value for JS_RESET_TICKS_CL */ -+ u32 gpu_reset_ticks_dumping; /*< Value for JS_RESET_TICKS_DUMPING */ -+ u32 ctx_timeslice_ns; /**< Value for JS_CTX_TIMESLICE_NS */ ++mali_io_address _mali_osk_mem_mapioregion(uintptr_t phys, u32 size, const char *description) ++{ ++ return (mali_io_address)ioremap(phys, size); ++} + -+ /**< Value for JS_SOFT_JOB_TIMEOUT */ -+ atomic_t soft_job_timeout_ms; ++void _mali_osk_mem_unmapioregion(uintptr_t phys, u32 size, mali_io_address virt) ++{ ++ iounmap((void *)virt); ++} + -+ /** List of suspended soft jobs */ -+ struct list_head suspended_soft_jobs_list; ++_mali_osk_errcode_t inline _mali_osk_mem_reqregion(uintptr_t phys, u32 size, const char *description) ++{ ++#if MALI_LICENSE_IS_GPL ++ return _MALI_OSK_ERR_OK; /* GPL driver gets the mem region for the resources registered automatically */ ++#else ++ return ((NULL == request_mem_region(phys, size, description)) ? _MALI_OSK_ERR_NOMEM : _MALI_OSK_ERR_OK); ++#endif ++} + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ /* Support soft-stop on a single context */ -+ bool softstop_always; -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ ++void inline _mali_osk_mem_unreqregion(uintptr_t phys, u32 size) ++{ ++#if !MALI_LICENSE_IS_GPL ++ release_mem_region(phys, size); ++#endif ++} + -+ /** The initalized-flag is placed at the end, to avoid cache-pollution (we should -+ * only be using this during init/term paths). -+ * @note This is a write-once member, and so no locking is required to read */ -+ int init_status; ++void inline _mali_osk_mem_iowrite32_relaxed(volatile mali_io_address addr, u32 offset, u32 val) ++{ ++ __raw_writel(cpu_to_le32(val), ((u8 *)addr) + offset); ++} + -+ /* Number of contexts that can currently be pulled from */ -+ u32 nr_contexts_pullable; ++u32 inline _mali_osk_mem_ioread32(volatile mali_io_address addr, u32 offset) ++{ ++ return ioread32(((u8 *)addr) + offset); ++} + -+ /* Number of contexts that can either be pulled from or are currently -+ * running */ -+ atomic_t nr_contexts_runnable; -+}; ++void inline _mali_osk_mem_iowrite32(volatile mali_io_address addr, u32 offset, u32 val) ++{ ++ iowrite32(val, ((u8 *)addr) + offset); ++} + -+/** -+ * @brief KBase Context Job Scheduling information structure -+ * -+ * This is a substructure in the struct kbase_context that encapsulates all the -+ * scheduling information. -+ */ -+struct kbasep_js_kctx_info { ++void _mali_osk_cache_flushall(void) ++{ ++ /** @note Cached memory is not currently supported in this implementation */ ++} + -+ /** -+ * Job Scheduler Context information sub-structure. These members are -+ * accessed regardless of whether the context is: -+ * - In the Policy's Run Pool -+ * - In the Policy's Queue -+ * - Not queued nor in the Run Pool. -+ * -+ * You must obtain the jsctx_mutex before accessing any other members of -+ * this substructure. -+ * -+ * You may not access any of these members from IRQ context. -+ */ -+ struct kbase_jsctx { -+ struct mutex jsctx_mutex; /**< Job Scheduler Context lock */ ++void _mali_osk_cache_ensure_uncached_range_flushed(void *uncached_mapping, u32 offset, u32 size) ++{ ++ _mali_osk_write_mem_barrier(); ++} + -+ /** Number of jobs ready to run - does \em not include the jobs waiting in -+ * the dispatcher, and dependency-only jobs. See kbase_jd_context::job_nr -+ * for such jobs*/ -+ u32 nr_jobs; ++u32 _mali_osk_mem_write_safe(void __user *dest, const void __user *src, u32 size) ++{ ++#define MALI_MEM_SAFE_COPY_BLOCK_SIZE 4096 ++ u32 retval = 0; ++ void *temp_buf; + -+ /** Context Attributes: -+ * Each is large enough to hold a refcount of the number of atoms on -+ * the context. **/ -+ u32 ctx_attr_ref_count[KBASEP_JS_CTX_ATTR_COUNT]; ++ temp_buf = kmalloc(MALI_MEM_SAFE_COPY_BLOCK_SIZE, GFP_KERNEL); ++ if (NULL != temp_buf) { ++ u32 bytes_left_to_copy = size; ++ u32 i; ++ for (i = 0; i < size; i += MALI_MEM_SAFE_COPY_BLOCK_SIZE) { ++ u32 size_to_copy; ++ u32 size_copied; ++ u32 bytes_left; + -+ /** -+ * Wait queue to wait for KCTX_SHEDULED flag state changes. -+ * */ -+ wait_queue_head_t is_scheduled_wait; ++ if (bytes_left_to_copy > MALI_MEM_SAFE_COPY_BLOCK_SIZE) { ++ size_to_copy = MALI_MEM_SAFE_COPY_BLOCK_SIZE; ++ } else { ++ size_to_copy = bytes_left_to_copy; ++ } + -+ /** Link implementing JS queues. Context can be present on one -+ * list per job slot -+ */ -+ struct list_head ctx_list_entry[BASE_JM_MAX_NR_SLOTS]; -+ } ctx; ++ bytes_left = copy_from_user(temp_buf, ((char *)src) + i, size_to_copy); ++ size_copied = size_to_copy - bytes_left; + -+ /* The initalized-flag is placed at the end, to avoid cache-pollution (we should -+ * only be using this during init/term paths) */ -+ int init_status; -+}; ++ bytes_left = copy_to_user(((char *)dest) + i, temp_buf, size_copied); ++ size_copied -= bytes_left; + -+/** Subset of atom state that can be available after jd_done_nolock() is called -+ * on that atom. A copy must be taken via kbasep_js_atom_retained_state_copy(), -+ * because the original atom could disappear. */ -+struct kbasep_js_atom_retained_state { -+ /** Event code - to determine whether the atom has finished */ -+ enum base_jd_event_code event_code; -+ /** core requirements */ -+ base_jd_core_req core_req; -+ /* priority */ -+ int sched_priority; -+ /** Job Slot to retry submitting to if submission from IRQ handler failed */ -+ int retry_submit_on_slot; -+ /* Core group atom was executed on */ -+ u32 device_nr; ++ bytes_left_to_copy -= size_copied; ++ retval += size_copied; + -+}; ++ if (size_copied != size_to_copy) { ++ break; /* Early out, we was not able to copy this entire block */ ++ } ++ } + -+/** -+ * Value signifying 'no retry on a slot required' for: -+ * - kbase_js_atom_retained_state::retry_submit_on_slot -+ * - kbase_jd_atom::retry_submit_on_slot -+ */ -+#define KBASEP_JS_RETRY_SUBMIT_SLOT_INVALID (-1) ++ kfree(temp_buf); ++ } + -+/** -+ * base_jd_core_req value signifying 'invalid' for a kbase_jd_atom_retained_state. -+ * -+ * @see kbase_atom_retained_state_is_valid() -+ */ -+#define KBASEP_JS_ATOM_RETAINED_STATE_CORE_REQ_INVALID BASE_JD_REQ_DEP ++ return retval; ++} + -+/** -+ * @brief The JS timer resolution, in microseconds -+ * -+ * Any non-zero difference in time will be at least this size. -+ */ -+#define KBASEP_JS_TICK_RESOLUTION_US 1 ++_mali_osk_errcode_t _mali_ukk_mem_write_safe(_mali_uk_mem_write_safe_s *args) ++{ ++ void __user *src; ++ void __user *dst; ++ struct mali_session_data *session; + -+/* -+ * Internal atom priority defines for kbase_jd_atom::sched_prio -+ */ -+enum { -+ KBASE_JS_ATOM_SCHED_PRIO_HIGH = 0, -+ KBASE_JS_ATOM_SCHED_PRIO_MED, -+ KBASE_JS_ATOM_SCHED_PRIO_LOW, -+ KBASE_JS_ATOM_SCHED_PRIO_COUNT, -+}; ++ MALI_DEBUG_ASSERT_POINTER(args); + -+/* Invalid priority for kbase_jd_atom::sched_prio */ -+#define KBASE_JS_ATOM_SCHED_PRIO_INVALID -1 ++ session = (struct mali_session_data *)(uintptr_t)args->ctx; + -+/* Default priority in the case of contexts with no atoms, or being lenient -+ * about invalid priorities from userspace */ -+#define KBASE_JS_ATOM_SCHED_PRIO_DEFAULT KBASE_JS_ATOM_SCHED_PRIO_MED ++ if (NULL == session) { ++ return _MALI_OSK_ERR_INVALID_ARGS; ++ } + -+ /** @} *//* end group kbase_js */ -+ /** @} *//* end group base_kbase_api */ -+ /** @} *//* end group base_api */ ++ src = (void __user *)(uintptr_t)args->src; ++ dst = (void __user *)(uintptr_t)args->dest; + -+#endif /* _KBASE_JS_DEFS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_linux.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_linux.h ++ /* Return number of bytes actually copied */ ++ args->size = _mali_osk_mem_write_safe(dst, src, args->size); ++ return _MALI_OSK_ERR_OK; ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c new file mode 100755 -index 000000000000..6d1e61fd41e0 +index 000000000..a729d0499 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_linux.h -@@ -0,0 +1,43 @@ ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c +@@ -0,0 +1,505 @@ +/* -+ * -+ * (C) COPYRIGHT 2010-2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + + ++/** ++ * @file mali_osk_mali.c ++ * Implementation of the OS abstraction layer which is specific for the Mali kernel device driver ++ */ ++#include "../platform/rk/custom_log.h" + ++#include ++#include ++#include ++#include ++#include ++#include + ++#include "mali_osk_mali.h" ++#include "mali_kernel_common.h" /* MALI_xxx macros */ ++#include "mali_osk.h" /* kernel side OS functions */ ++#include "mali_kernel_linux.h" + -+/** -+ * @file mali_kbase_linux.h -+ * Base kernel APIs, Linux implementation. -+ */ ++static mali_bool mali_secure_mode_enabled = MALI_FALSE; ++static mali_bool mali_secure_mode_supported = MALI_FALSE; + -+#ifndef _KBASE_LINUX_H_ -+#define _KBASE_LINUX_H_ ++/* Function that init the mali gpu secure mode */ ++void (*mali_secure_mode_deinit)(void) = NULL; ++/* Function that reset GPU and enable the mali gpu secure mode */ ++int (*mali_gpu_reset_and_secure_mode_enable)(void) = NULL; ++/* Function that reset GPU and disable the mali gpu secure mode */ ++int (*mali_gpu_reset_and_secure_mode_disable)(void) = NULL; + -+/* All things that are needed for the Linux port. */ -+#include -+#include -+#include -+#include -+#include + -+#if (defined(MALI_KERNEL_TEST_API) && (1 == MALI_KERNEL_TEST_API)) -+ #define KBASE_EXPORT_TEST_API(func) EXPORT_SYMBOL(func) -+#else -+ #define KBASE_EXPORT_TEST_API(func) -+#endif ++#ifdef CONFIG_MALI_DT + -+#define KBASE_EXPORT_SYMBOL(func) EXPORT_SYMBOL(func) ++#define MALI_OSK_INVALID_RESOURCE_ADDRESS 0xFFFFFFFF + -+#endif /* _KBASE_LINUX_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem.c -new file mode 100755 -index 000000000000..a105b15d641c ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem.c -@@ -0,0 +1,2875 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++/** ++ * Define the max number of resource we could have. + */ ++#define MALI_OSK_MAX_RESOURCE_NUMBER 27 + ++/** ++ * Define the max number of resource with interrupts, and they are ++ * the first 20 elements in array mali_osk_resource_bank. ++ */ ++#define MALI_OSK_RESOURCE_WITH_IRQ_NUMBER 20 + ++/** ++ * pp core start and end location in mali_osk_resource_bank array. ++ */ ++#define MALI_OSK_RESOURCE_PP_LOCATION_START 2 ++#define MALI_OSK_RESOURCE_PP_LOCATION_END 17 + -+ ++/** ++ * L2 cache start and end location in mali_osk_resource_bank array. ++ */ ++#define MALI_OSK_RESOURCE_L2_LOCATION_START 20 ++#define MALI_OSK_RESOURCE_l2_LOCATION_END 22 + +/** -+ * @file mali_kbase_mem.c -+ * Base kernel memory APIs ++ * DMA unit location. + */ -+#ifdef CONFIG_DMA_SHARED_BUFFER -+#include -+#endif /* CONFIG_DMA_SHARED_BUFFER */ -+#ifdef CONFIG_UMP -+#include -+#endif /* CONFIG_UMP */ -+#include -+#include -+#include -+#include ++#define MALI_OSK_RESOURCE_DMA_LOCATION 26 + -+#include -+#include -+#include -+#include -+#include -+#include ++static _mali_osk_resource_t mali_osk_resource_bank[MALI_OSK_MAX_RESOURCE_NUMBER] = { ++ /*-------------------------------------------------------*/ ++ /* rk_ext : to use dts_for_mali_ko_befor_r5p0-01rel0. */ ++ /* {.description = "Mali_GP", .base = MALI_OFFSET_GP, .irq_name = "IRQGP",}, */ ++ {.description = "Mali_GP", .base = MALI_OFFSET_GP, .irq_name = "Mali_GP_IRQ",}, ++ /* {.description = "Mali_GP_MMU", .base = MALI_OFFSET_GP_MMU, .irq_name = "IRQGPMMU",}, */ ++ {.description = "Mali_GP_MMU", .base = MALI_OFFSET_GP_MMU, .irq_name = "Mali_GP_MMU_IRQ",}, ++ /* {.description = "Mali_PP0", .base = MALI_OFFSET_PP0, .irq_name = "IRQPP0",}, */ ++ {.description = "Mali_PP0", .base = MALI_OFFSET_PP0, .irq_name = "Mali_PP0_IRQ",}, ++ /* {.description = "Mali_PP0_MMU", .base = MALI_OFFSET_PP0_MMU, .irq_name = "IRQPPMMU0",}, */ ++ {.description = "Mali_PP0_MMU", .base = MALI_OFFSET_PP0_MMU, .irq_name = "Mali_PP0_MMU_IRQ",}, ++ /* {.description = "Mali_PP1", .base = MALI_OFFSET_PP1, .irq_name = "IRQPP1",}, */ ++ {.description = "Mali_PP1", .base = MALI_OFFSET_PP1, .irq_name = "Mali_PP1_IRQ",}, ++ /* {.description = "Mali_PP1_MMU", .base = MALI_OFFSET_PP1_MMU, .irq_name = "IRQPPMMU1",}, */ ++ {.description = "Mali_PP1_MMU", .base = MALI_OFFSET_PP1_MMU, .irq_name = "Mali_PP1_MMU_IRQ",}, + -+/* This function finds out which RB tree the given GPU VA region belongs to -+ * based on the region zone */ -+static struct rb_root *kbase_reg_flags_to_rbtree(struct kbase_context *kctx, -+ struct kbase_va_region *reg) ++ {.description = "Mali_PP2", .base = MALI_OFFSET_PP2, .irq_name = "Mali_PP2_IRQ",}, ++ {.description = "Mali_PP2_MMU", .base = MALI_OFFSET_PP2_MMU, .irq_name = "Mali_PP2_MMU_IRQ",}, ++ {.description = "Mali_PP3", .base = MALI_OFFSET_PP3, .irq_name = "Mali_PP3_IRQ",}, ++ {.description = "Mali_PP3_MMU", .base = MALI_OFFSET_PP3_MMU, .irq_name = "Mali_PP3_MMU_IRQ",}, ++ /*-------------------------------------------------------*/ ++ {.description = "Mali_PP4", .base = MALI_OFFSET_PP4, .irq_name = "IRQPP4",}, ++ {.description = "Mali_PP4_MMU", .base = MALI_OFFSET_PP4_MMU, .irq_name = "IRQPPMMU4",}, ++ {.description = "Mali_PP5", .base = MALI_OFFSET_PP5, .irq_name = "IRQPP5",}, ++ {.description = "Mali_PP5_MMU", .base = MALI_OFFSET_PP5_MMU, .irq_name = "IRQPPMMU5",}, ++ {.description = "Mali_PP6", .base = MALI_OFFSET_PP6, .irq_name = "IRQPP6",}, ++ {.description = "Mali_PP6_MMU", .base = MALI_OFFSET_PP6_MMU, .irq_name = "IRQPPMMU6",}, ++ {.description = "Mali_PP7", .base = MALI_OFFSET_PP7, .irq_name = "IRQPP7",}, ++ {.description = "Mali_PP7_MMU", .base = MALI_OFFSET_PP7_MMU, .irq_name = "IRQPPMMU",}, ++ {.description = "Mali_PP_Broadcast", .base = MALI_OFFSET_PP_BCAST, .irq_name = "IRQPP",}, ++ {.description = "Mali_PMU", .base = MALI_OFFSET_PMU, .irq_name = "IRQPMU",}, ++ {.description = "Mali_L2", .base = MALI_OFFSET_L2_RESOURCE0,}, ++ {.description = "Mali_L2", .base = MALI_OFFSET_L2_RESOURCE1,}, ++ {.description = "Mali_L2", .base = MALI_OFFSET_L2_RESOURCE2,}, ++ {.description = "Mali_PP_MMU_Broadcast", .base = MALI_OFFSET_PP_BCAST_MMU,}, ++ {.description = "Mali_Broadcast", .base = MALI_OFFSET_BCAST,}, ++ {.description = "Mali_DLBU", .base = MALI_OFFSET_DLBU,}, ++ {.description = "Mali_DMA", .base = MALI_OFFSET_DMA,}, ++}; ++ ++static int _mali_osk_get_compatible_name(const char **out_string) +{ -+ struct rb_root *rbtree = NULL; ++ struct device_node *node = mali_platform_device->dev.of_node; + -+ switch (reg->flags & KBASE_REG_ZONE_MASK) { -+ case KBASE_REG_ZONE_CUSTOM_VA: -+ rbtree = &kctx->reg_rbtree_custom; -+ break; -+ case KBASE_REG_ZONE_EXEC: -+ rbtree = &kctx->reg_rbtree_exec; -+ break; -+ case KBASE_REG_ZONE_SAME_VA: -+ rbtree = &kctx->reg_rbtree_same; -+ /* fall through */ -+ default: -+ rbtree = &kctx->reg_rbtree_same; -+ break; -+ } ++ MALI_DEBUG_ASSERT(NULL != node); + -+ return rbtree; ++ return of_property_read_string(node, "compatible", out_string); +} + -+/* This function finds out which RB tree the given pfn from the GPU VA belongs -+ * to based on the memory zone the pfn refers to */ -+static struct rb_root *kbase_gpu_va_to_rbtree(struct kbase_context *kctx, -+ u64 gpu_pfn) ++_mali_osk_errcode_t _mali_osk_resource_initialize(void) +{ -+ struct rb_root *rbtree = NULL; ++ mali_bool mali_is_450 = MALI_FALSE, mali_is_470 = MALI_FALSE; ++ int i, pp_core_num = 0, l2_core_num = 0; ++ struct resource *res; ++ const char *compatible_name = NULL; + -+#ifdef CONFIG_64BIT -+ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) { -+#endif /* CONFIG_64BIT */ -+ if (gpu_pfn >= KBASE_REG_ZONE_CUSTOM_VA_BASE) -+ rbtree = &kctx->reg_rbtree_custom; -+ else if (gpu_pfn >= KBASE_REG_ZONE_EXEC_BASE) -+ rbtree = &kctx->reg_rbtree_exec; -+ else -+ rbtree = &kctx->reg_rbtree_same; -+#ifdef CONFIG_64BIT -+ } else { -+ if (gpu_pfn >= kctx->same_va_end) -+ rbtree = &kctx->reg_rbtree_custom; -+ else -+ rbtree = &kctx->reg_rbtree_same; ++ if (0 == _mali_osk_get_compatible_name(&compatible_name)) { ++ if (0 == strncmp(compatible_name, "arm,mali-450", strlen("arm,mali-450"))) { ++ mali_is_450 = MALI_TRUE; ++ MALI_DEBUG_PRINT(2, ("mali-450 device tree detected.")); ++ } else if (0 == strncmp(compatible_name, "arm,mali-470", strlen("arm,mali-470"))) { ++ mali_is_470 = MALI_TRUE; ++ MALI_DEBUG_PRINT(2, ("mali-470 device tree detected.")); ++ } + } -+#endif /* CONFIG_64BIT */ + -+ return rbtree; -+} ++ for (i = 0; i < MALI_OSK_RESOURCE_WITH_IRQ_NUMBER; i++) { ++ res = platform_get_resource_byname(mali_platform_device, IORESOURCE_IRQ, mali_osk_resource_bank[i].irq_name); ++ if (res) { ++ mali_osk_resource_bank[i].irq = res->start; ++ } else { ++ mali_osk_resource_bank[i].base = MALI_OSK_INVALID_RESOURCE_ADDRESS; ++ } ++ } + -+/* This function inserts a region into the tree. */ -+static void kbase_region_tracker_insert(struct kbase_context *kctx, -+ struct kbase_va_region *new_reg) -+{ -+ u64 start_pfn = new_reg->start_pfn; -+ struct rb_node **link = NULL; -+ struct rb_node *parent = NULL; -+ struct rb_root *rbtree = NULL; ++ for (i = MALI_OSK_RESOURCE_PP_LOCATION_START; i <= MALI_OSK_RESOURCE_PP_LOCATION_END; i++) { ++ if (MALI_OSK_INVALID_RESOURCE_ADDRESS != mali_osk_resource_bank[i].base) { ++ pp_core_num++; ++ } ++ } + -+ rbtree = kbase_reg_flags_to_rbtree(kctx, new_reg); ++ /* We have to divide by 2, because we caculate twice for only one pp(pp_core and pp_mmu_core). */ ++ if (0 != pp_core_num % 2) { ++ MALI_DEBUG_PRINT(2, ("The value of pp core number isn't normal.")); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ link = &(rbtree->rb_node); -+ /* Find the right place in the tree using tree search */ -+ while (*link) { -+ struct kbase_va_region *old_reg; ++ pp_core_num /= 2; + -+ parent = *link; -+ old_reg = rb_entry(parent, struct kbase_va_region, rblink); ++ /** ++ * we can caculate the number of l2 cache core according the number of pp core number ++ * and device type(mali400/mali450/mali470). ++ */ ++ l2_core_num = 1; ++ if (mali_is_450) { ++ if (pp_core_num > 4) { ++ l2_core_num = 3; ++ } else if (pp_core_num <= 4) { ++ l2_core_num = 2; ++ } ++ } + -+ /* RBTree requires no duplicate entries. */ -+ KBASE_DEBUG_ASSERT(old_reg->start_pfn != start_pfn); ++ for (i = MALI_OSK_RESOURCE_l2_LOCATION_END; i > MALI_OSK_RESOURCE_L2_LOCATION_START + l2_core_num - 1; i--) { ++ mali_osk_resource_bank[i].base = MALI_OSK_INVALID_RESOURCE_ADDRESS; ++ } + -+ if (old_reg->start_pfn > start_pfn) -+ link = &(*link)->rb_left; -+ else -+ link = &(*link)->rb_right; ++ /* If device is not mali-450 type, we have to remove related resource from resource bank. */ ++ if (!(mali_is_450 || mali_is_470)) { ++ for (i = MALI_OSK_RESOURCE_l2_LOCATION_END + 1; i < MALI_OSK_MAX_RESOURCE_NUMBER; i++) { ++ mali_osk_resource_bank[i].base = MALI_OSK_INVALID_RESOURCE_ADDRESS; ++ } + } + -+ /* Put the new node there, and rebalance tree */ -+ rb_link_node(&(new_reg->rblink), parent, link); ++ if (mali_is_470) ++ mali_osk_resource_bank[MALI_OSK_RESOURCE_DMA_LOCATION].base = MALI_OSK_INVALID_RESOURCE_ADDRESS; + -+ rb_insert_color(&(new_reg->rblink), rbtree); ++ return _MALI_OSK_ERR_OK; +} + -+/* Find allocated region enclosing free range. */ -+static struct kbase_va_region *kbase_region_tracker_find_region_enclosing_range_free( -+ struct kbase_context *kctx, u64 start_pfn, size_t nr_pages) ++_mali_osk_errcode_t _mali_osk_resource_find(u32 addr, _mali_osk_resource_t *res) +{ -+ struct rb_node *rbnode = NULL; -+ struct kbase_va_region *reg = NULL; -+ struct rb_root *rbtree = NULL; ++ int i; + -+ u64 end_pfn = start_pfn + nr_pages; ++ if (NULL == mali_platform_device) { ++ return _MALI_OSK_ERR_ITEM_NOT_FOUND; ++ } + -+ rbtree = kbase_gpu_va_to_rbtree(kctx, start_pfn); ++ /* Traverse all of resources in resources bank to find the matching one. */ ++ for (i = 0; i < MALI_OSK_MAX_RESOURCE_NUMBER; i++) { ++ if (mali_osk_resource_bank[i].base == addr) { ++ if (NULL != res) { ++ res->base = addr + _mali_osk_resource_base_address(); ++ res->description = mali_osk_resource_bank[i].description; ++ res->irq = mali_osk_resource_bank[i].irq; ++ } ++ return _MALI_OSK_ERR_OK; ++ } ++ } + -+ rbnode = rbtree->rb_node; ++ return _MALI_OSK_ERR_ITEM_NOT_FOUND; ++} + -+ while (rbnode) { -+ u64 tmp_start_pfn, tmp_end_pfn; ++uintptr_t _mali_osk_resource_base_address(void) ++{ ++ struct resource *reg_res = NULL; ++ uintptr_t ret = 0; + -+ reg = rb_entry(rbnode, struct kbase_va_region, rblink); -+ tmp_start_pfn = reg->start_pfn; -+ tmp_end_pfn = reg->start_pfn + reg->nr_pages; ++ reg_res = platform_get_resource(mali_platform_device, IORESOURCE_MEM, 0); + -+ /* If start is lower than this, go left. */ -+ if (start_pfn < tmp_start_pfn) -+ rbnode = rbnode->rb_left; -+ /* If end is higher than this, then go right. */ -+ else if (end_pfn > tmp_end_pfn) -+ rbnode = rbnode->rb_right; -+ else /* Enclosing */ -+ return reg; ++ if (NULL != reg_res) { ++ ret = reg_res->start; + } + -+ return NULL; ++ return ret; +} + -+/* Find region enclosing given address. */ -+struct kbase_va_region *kbase_region_tracker_find_region_enclosing_address(struct kbase_context *kctx, u64 gpu_addr) ++void _mali_osk_device_data_pmu_config_get(u16 *domain_config_array, int array_size) +{ -+ struct rb_node *rbnode; -+ struct kbase_va_region *reg; -+ u64 gpu_pfn = gpu_addr >> PAGE_SHIFT; -+ struct rb_root *rbtree = NULL; ++ struct device_node *node = mali_platform_device->dev.of_node; ++ struct property *prop; ++ const __be32 *p; ++ int length = 0, i = 0; ++ u32 u; + -+ KBASE_DEBUG_ASSERT(NULL != kctx); ++ MALI_DEBUG_PRINT(2, ("Get pmu config from device tree configuration.\n")); + -+ lockdep_assert_held(&kctx->reg_lock); ++ MALI_DEBUG_ASSERT(NULL != node); + -+ rbtree = kbase_gpu_va_to_rbtree(kctx, gpu_pfn); ++ if (!of_get_property(node, "pmu_domain_config", &length)) { ++ return; ++ } + -+ rbnode = rbtree->rb_node; ++ if (array_size != length / sizeof(u32)) { ++ MALI_PRINT_ERROR(("Wrong pmu domain config in device tree.")); ++ return; ++ } + -+ while (rbnode) { -+ u64 tmp_start_pfn, tmp_end_pfn; ++ of_property_for_each_u32(node, "pmu_domain_config", prop, p, u) { ++ domain_config_array[i] = (u16)u; ++ i++; ++ } + -+ reg = rb_entry(rbnode, struct kbase_va_region, rblink); -+ tmp_start_pfn = reg->start_pfn; -+ tmp_end_pfn = reg->start_pfn + reg->nr_pages; ++ return; ++} + -+ /* If start is lower than this, go left. */ -+ if (gpu_pfn < tmp_start_pfn) -+ rbnode = rbnode->rb_left; -+ /* If end is higher than this, then go right. */ -+ else if (gpu_pfn >= tmp_end_pfn) -+ rbnode = rbnode->rb_right; -+ else /* Enclosing */ -+ return reg; ++u32 _mali_osk_get_pmu_switch_delay(void) ++{ ++ struct device_node *node = mali_platform_device->dev.of_node; ++ u32 switch_delay; ++ ++ MALI_DEBUG_ASSERT(NULL != node); ++ ++ if (0 == of_property_read_u32(node, "pmu_switch_delay", &switch_delay)) { ++ return switch_delay; ++ } else { ++ MALI_DEBUG_PRINT(2, ("Couldn't find pmu_switch_delay in device tree configuration.\n")); + } + -+ return NULL; ++ return 0; +} + -+KBASE_EXPORT_TEST_API(kbase_region_tracker_find_region_enclosing_address); ++#else /* CONFIG_MALI_DT */ /* 若未 定义 CONFIG_MALI_DT. */ + -+/* Find region with given base address */ -+struct kbase_va_region *kbase_region_tracker_find_region_base_address(struct kbase_context *kctx, u64 gpu_addr) ++_mali_osk_errcode_t _mali_osk_resource_find(u32 addr, _mali_osk_resource_t *res) +{ -+ u64 gpu_pfn = gpu_addr >> PAGE_SHIFT; -+ struct rb_node *rbnode = NULL; -+ struct kbase_va_region *reg = NULL; -+ struct rb_root *rbtree = NULL; ++ int i; ++ uintptr_t phys_addr; + -+ KBASE_DEBUG_ASSERT(NULL != kctx); ++ if (NULL == mali_platform_device) { ++ /* Not connected to a device */ ++ return _MALI_OSK_ERR_ITEM_NOT_FOUND; ++ } + -+ lockdep_assert_held(&kctx->reg_lock); ++ phys_addr = addr + _mali_osk_resource_base_address(); ++ for (i = 0; i < mali_platform_device->num_resources; i++) { ++ if (IORESOURCE_MEM == resource_type(&(mali_platform_device->resource[i])) && ++ mali_platform_device->resource[i].start == phys_addr) { ++ if (NULL != res) { ++ res->base = phys_addr; ++ res->description = mali_platform_device->resource[i].name; + -+ rbtree = kbase_gpu_va_to_rbtree(kctx, gpu_pfn); ++ /* Any (optional) IRQ resource belonging to this resource will follow */ ++ if ((i + 1) < mali_platform_device->num_resources && ++ IORESOURCE_IRQ == resource_type(&(mali_platform_device->resource[i + 1]))) { ++ res->irq = mali_platform_device->resource[i + 1].start; ++ } else { ++ res->irq = -1; ++ } ++ } ++ return _MALI_OSK_ERR_OK; ++ } ++ } + -+ rbnode = rbtree->rb_node; ++ return _MALI_OSK_ERR_ITEM_NOT_FOUND; ++} + -+ while (rbnode) { -+ reg = rb_entry(rbnode, struct kbase_va_region, rblink); -+ if (reg->start_pfn > gpu_pfn) -+ rbnode = rbnode->rb_left; -+ else if (reg->start_pfn < gpu_pfn) -+ rbnode = rbnode->rb_right; -+ else -+ return reg; ++uintptr_t _mali_osk_resource_base_address(void) ++{ ++ uintptr_t lowest_addr = (uintptr_t)(0 - 1); ++ uintptr_t ret = 0; + ++ if (NULL != mali_platform_device) { ++ int i; ++ for (i = 0; i < mali_platform_device->num_resources; i++) { ++ if (mali_platform_device->resource[i].flags & IORESOURCE_MEM && ++ mali_platform_device->resource[i].start < lowest_addr) { ++ lowest_addr = mali_platform_device->resource[i].start; ++ ret = lowest_addr; ++ } ++ } + } + -+ return NULL; ++ return ret; +} + -+KBASE_EXPORT_TEST_API(kbase_region_tracker_find_region_base_address); -+ -+/* Find region meeting given requirements */ -+static struct kbase_va_region *kbase_region_tracker_find_region_meeting_reqs(struct kbase_context *kctx, struct kbase_va_region *reg_reqs, size_t nr_pages, size_t align) ++void _mali_osk_device_data_pmu_config_get(u16 *domain_config_array, int array_size) +{ -+ struct rb_node *rbnode = NULL; -+ struct kbase_va_region *reg = NULL; -+ struct rb_root *rbtree = NULL; ++ _mali_osk_device_data data = { 0, }; + -+ /* Note that this search is a linear search, as we do not have a target -+ address in mind, so does not benefit from the rbtree search */ ++ MALI_DEBUG_PRINT(2, ("Get pmu config from platform device data.\n")); ++ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { ++ /* Copy the custom customer power domain config */ ++ _mali_osk_memcpy(domain_config_array, data.pmu_domain_config, sizeof(data.pmu_domain_config)); ++ } + -+ rbtree = kbase_reg_flags_to_rbtree(kctx, reg_reqs); ++ return; ++} + -+ rbnode = rb_first(rbtree); ++u32 _mali_osk_get_pmu_switch_delay(void) ++{ ++ _mali_osk_errcode_t err; ++ _mali_osk_device_data data = { 0, }; + -+ while (rbnode) { -+ reg = rb_entry(rbnode, struct kbase_va_region, rblink); -+ if ((reg->nr_pages >= nr_pages) && -+ (reg->flags & KBASE_REG_FREE)) { -+ /* Check alignment */ -+ u64 start_pfn = (reg->start_pfn + align - 1) & ~(align - 1); ++ err = _mali_osk_device_data_get(&data); + -+ if ((start_pfn >= reg->start_pfn) && -+ (start_pfn <= (reg->start_pfn + reg->nr_pages - 1)) && -+ ((start_pfn + nr_pages - 1) <= (reg->start_pfn + reg->nr_pages - 1))) -+ return reg; -+ } -+ rbnode = rb_next(rbnode); ++ if (_MALI_OSK_ERR_OK == err) { ++ return data.pmu_switch_delay; + } + -+ return NULL; ++ return 0; +} ++#endif /* CONFIG_MALI_DT */ + -+/** -+ * @brief Remove a region object from the global list. -+ * -+ * The region reg is removed, possibly by merging with other free and -+ * compatible adjacent regions. It must be called with the context -+ * region lock held. The associated memory is not released (see -+ * kbase_free_alloced_region). Internal use only. -+ */ -+static int kbase_remove_va_region(struct kbase_context *kctx, struct kbase_va_region *reg) ++_mali_osk_errcode_t _mali_osk_device_data_get(_mali_osk_device_data *data) +{ -+ struct rb_node *rbprev; -+ struct kbase_va_region *prev = NULL; -+ struct rb_node *rbnext; -+ struct kbase_va_region *next = NULL; -+ struct rb_root *reg_rbtree = NULL; ++ MALI_DEBUG_ASSERT_POINTER(data); + -+ int merged_front = 0; -+ int merged_back = 0; -+ int err = 0; ++ if (NULL != mali_platform_device) { ++ struct mali_gpu_device_data *os_data = NULL; + -+ reg_rbtree = kbase_reg_flags_to_rbtree(kctx, reg); ++ os_data = (struct mali_gpu_device_data *)mali_platform_device->dev.platform_data; ++ if (NULL != os_data) { ++ /* Copy data from OS dependant struct to Mali neutral struct (identical!) */ ++ BUILD_BUG_ON(sizeof(*os_data) != sizeof(*data)); ++ _mali_osk_memcpy(data, os_data, sizeof(*os_data)); + -+ /* Try to merge with the previous block first */ -+ rbprev = rb_prev(&(reg->rblink)); -+ if (rbprev) { -+ prev = rb_entry(rbprev, struct kbase_va_region, rblink); -+ if (prev->flags & KBASE_REG_FREE) { -+ /* We're compatible with the previous VMA, -+ * merge with it */ -+ WARN_ON((prev->flags & KBASE_REG_ZONE_MASK) != -+ (reg->flags & KBASE_REG_ZONE_MASK)); -+ prev->nr_pages += reg->nr_pages; -+ rb_erase(&(reg->rblink), reg_rbtree); -+ reg = prev; -+ merged_front = 1; ++ return _MALI_OSK_ERR_OK; + } + } + -+ /* Try to merge with the next block second */ -+ /* Note we do the lookup here as the tree may have been rebalanced. */ -+ rbnext = rb_next(&(reg->rblink)); -+ if (rbnext) { -+ /* We're compatible with the next VMA, merge with it */ -+ next = rb_entry(rbnext, struct kbase_va_region, rblink); -+ if (next->flags & KBASE_REG_FREE) { -+ WARN_ON((next->flags & KBASE_REG_ZONE_MASK) != -+ (reg->flags & KBASE_REG_ZONE_MASK)); -+ next->start_pfn = reg->start_pfn; -+ next->nr_pages += reg->nr_pages; -+ rb_erase(&(reg->rblink), reg_rbtree); -+ merged_back = 1; -+ if (merged_front) { -+ /* We already merged with prev, free it */ -+ kbase_free_alloced_region(reg); -+ } -+ } -+ } ++ return _MALI_OSK_ERR_ITEM_NOT_FOUND; ++} + -+ /* If we failed to merge then we need to add a new block */ -+ if (!(merged_front || merged_back)) { -+ /* -+ * We didn't merge anything. Add a new free -+ * placeholder and remove the original one. -+ */ -+ struct kbase_va_region *free_reg; ++u32 _mali_osk_identify_gpu_resource(void) ++{ ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI_OFFSET_L2_RESOURCE1, NULL)) ++ /* Mali 450 */ ++ return 0x450; + -+ free_reg = kbase_alloc_free_region(kctx, reg->start_pfn, reg->nr_pages, reg->flags & KBASE_REG_ZONE_MASK); -+ if (!free_reg) { -+ err = -ENOMEM; -+ goto out; -+ } -+ rb_replace_node(&(reg->rblink), &(free_reg->rblink), reg_rbtree); -+ } ++ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI_OFFSET_DLBU, NULL)) ++ /* Mali 470 */ ++ return 0x470; + -+ out: -+ return err; ++ /* Mali 400 */ ++ return 0x400; +} + -+KBASE_EXPORT_TEST_API(kbase_remove_va_region); -+ -+/** -+ * @brief Insert a VA region to the list, replacing the current at_reg. -+ */ -+static int kbase_insert_va_region_nolock(struct kbase_context *kctx, struct kbase_va_region *new_reg, struct kbase_va_region *at_reg, u64 start_pfn, size_t nr_pages) ++mali_bool _mali_osk_shared_interrupts(void) +{ -+ struct rb_root *reg_rbtree = NULL; -+ int err = 0; ++ u32 irqs[128]; ++ u32 i, j, irq, num_irqs_found = 0; + -+ reg_rbtree = kbase_reg_flags_to_rbtree(kctx, at_reg); ++ MALI_DEBUG_ASSERT_POINTER(mali_platform_device); ++ MALI_DEBUG_ASSERT(128 >= mali_platform_device->num_resources); + -+ /* Must be a free region */ -+ KBASE_DEBUG_ASSERT((at_reg->flags & KBASE_REG_FREE) != 0); -+ /* start_pfn should be contained within at_reg */ -+ KBASE_DEBUG_ASSERT((start_pfn >= at_reg->start_pfn) && (start_pfn < at_reg->start_pfn + at_reg->nr_pages)); -+ /* at least nr_pages from start_pfn should be contained within at_reg */ -+ KBASE_DEBUG_ASSERT(start_pfn + nr_pages <= at_reg->start_pfn + at_reg->nr_pages); ++ for (i = 0; i < mali_platform_device->num_resources; i++) { ++ if (IORESOURCE_IRQ & mali_platform_device->resource[i].flags) { ++ irq = mali_platform_device->resource[i].start; + -+ new_reg->start_pfn = start_pfn; -+ new_reg->nr_pages = nr_pages; ++ for (j = 0; j < num_irqs_found; ++j) { ++ if (irq == irqs[j]) { ++ return MALI_TRUE; ++ } ++ } + -+ /* Regions are a whole use, so swap and delete old one. */ -+ if (at_reg->start_pfn == start_pfn && at_reg->nr_pages == nr_pages) { -+ rb_replace_node(&(at_reg->rblink), &(new_reg->rblink), -+ reg_rbtree); -+ kbase_free_alloced_region(at_reg); ++ irqs[num_irqs_found++] = irq; ++ } + } -+ /* New region replaces the start of the old one, so insert before. */ -+ else if (at_reg->start_pfn == start_pfn) { -+ at_reg->start_pfn += nr_pages; -+ KBASE_DEBUG_ASSERT(at_reg->nr_pages >= nr_pages); -+ at_reg->nr_pages -= nr_pages; + -+ kbase_region_tracker_insert(kctx, new_reg); -+ } -+ /* New region replaces the end of the old one, so insert after. */ -+ else if ((at_reg->start_pfn + at_reg->nr_pages) == (start_pfn + nr_pages)) { -+ at_reg->nr_pages -= nr_pages; ++ return MALI_FALSE; ++} + -+ kbase_region_tracker_insert(kctx, new_reg); -+ } -+ /* New region splits the old one, so insert and create new */ -+ else { -+ struct kbase_va_region *new_front_reg; ++_mali_osk_errcode_t _mali_osk_gpu_secure_mode_init(void) ++{ ++ _mali_osk_device_data data = { 0, }; + -+ new_front_reg = kbase_alloc_free_region(kctx, -+ at_reg->start_pfn, -+ start_pfn - at_reg->start_pfn, -+ at_reg->flags & KBASE_REG_ZONE_MASK); ++ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { ++ if ((NULL != data.secure_mode_init) && (NULL != data.secure_mode_deinit) ++ && (NULL != data.gpu_reset_and_secure_mode_enable) && (NULL != data.gpu_reset_and_secure_mode_disable)) { ++ int err = data.secure_mode_init(); ++ if (err) { ++ MALI_DEBUG_PRINT(1, ("Failed to init gpu secure mode.\n")); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ if (new_front_reg) { -+ at_reg->nr_pages -= nr_pages + new_front_reg->nr_pages; -+ at_reg->start_pfn = start_pfn + nr_pages; ++ mali_secure_mode_deinit = data.secure_mode_deinit; ++ mali_gpu_reset_and_secure_mode_enable = data.gpu_reset_and_secure_mode_enable; ++ mali_gpu_reset_and_secure_mode_disable = data.gpu_reset_and_secure_mode_disable; + -+ kbase_region_tracker_insert(kctx, new_front_reg); -+ kbase_region_tracker_insert(kctx, new_reg); -+ } else { -+ err = -ENOMEM; ++ mali_secure_mode_supported = MALI_TRUE; ++ mali_secure_mode_enabled = MALI_FALSE; ++ return _MALI_OSK_ERR_OK; + } + } ++ MALI_DEBUG_PRINT(3, ("GPU secure mode not supported.\n")); ++ return _MALI_OSK_ERR_UNSUPPORTED; + -+ return err; +} + -+/** -+ * @brief Add a VA region to the list. -+ */ -+int kbase_add_va_region(struct kbase_context *kctx, -+ struct kbase_va_region *reg, u64 addr, -+ size_t nr_pages, size_t align) ++_mali_osk_errcode_t _mali_osk_gpu_secure_mode_deinit(void) +{ -+ struct kbase_va_region *tmp; -+ u64 gpu_pfn = addr >> PAGE_SHIFT; -+ int err = 0; ++ if (NULL != mali_secure_mode_deinit) { ++ mali_secure_mode_deinit(); ++ mali_secure_mode_enabled = MALI_FALSE; ++ mali_secure_mode_supported = MALI_FALSE; ++ return _MALI_OSK_ERR_OK; ++ } ++ MALI_DEBUG_PRINT(3, ("GPU secure mode not supported.\n")); ++ return _MALI_OSK_ERR_UNSUPPORTED; + -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ KBASE_DEBUG_ASSERT(NULL != reg); ++} + -+ lockdep_assert_held(&kctx->reg_lock); + -+ if (!align) -+ align = 1; ++_mali_osk_errcode_t _mali_osk_gpu_reset_and_secure_mode_enable(void) ++{ ++ /* the mali executor lock must be held before enter this function. */ + -+ /* must be a power of 2 */ -+ KBASE_DEBUG_ASSERT((align & (align - 1)) == 0); -+ KBASE_DEBUG_ASSERT(nr_pages > 0); ++ MALI_DEBUG_ASSERT(MALI_FALSE == mali_secure_mode_enabled); + -+ /* Path 1: Map a specific address. Find the enclosing region, which *must* be free. */ -+ if (gpu_pfn) { -+ struct device *dev = kctx->kbdev->dev; ++ if (NULL != mali_gpu_reset_and_secure_mode_enable) { ++ if (mali_gpu_reset_and_secure_mode_enable()) { ++ MALI_DEBUG_PRINT(1, ("Failed to reset GPU or enable gpu secure mode.\n")); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ mali_secure_mode_enabled = MALI_TRUE; ++ return _MALI_OSK_ERR_OK; ++ } ++ MALI_DEBUG_PRINT(1, ("GPU secure mode not supported.\n")); ++ return _MALI_OSK_ERR_UNSUPPORTED; ++} + -+ KBASE_DEBUG_ASSERT(!(gpu_pfn & (align - 1))); ++_mali_osk_errcode_t _mali_osk_gpu_reset_and_secure_mode_disable(void) ++{ ++ /* the mali executor lock must be held before enter this function. */ + -+ tmp = kbase_region_tracker_find_region_enclosing_range_free(kctx, gpu_pfn, nr_pages); -+ if (!tmp) { -+ dev_warn(dev, "Enclosing region not found: 0x%08llx gpu_pfn, %zu nr_pages", gpu_pfn, nr_pages); -+ err = -ENOMEM; -+ goto exit; -+ } -+ if (!(tmp->flags & KBASE_REG_FREE)) { -+ dev_warn(dev, "Zone mismatch: %lu != %lu", tmp->flags & KBASE_REG_ZONE_MASK, reg->flags & KBASE_REG_ZONE_MASK); -+ dev_warn(dev, "!(tmp->flags & KBASE_REG_FREE): tmp->start_pfn=0x%llx tmp->flags=0x%lx tmp->nr_pages=0x%zx gpu_pfn=0x%llx nr_pages=0x%zx\n", tmp->start_pfn, tmp->flags, tmp->nr_pages, gpu_pfn, nr_pages); -+ dev_warn(dev, "in function %s (%p, %p, 0x%llx, 0x%zx, 0x%zx)\n", __func__, kctx, reg, addr, nr_pages, align); -+ err = -ENOMEM; -+ goto exit; -+ } ++ MALI_DEBUG_ASSERT(MALI_TRUE == mali_secure_mode_enabled); + -+ err = kbase_insert_va_region_nolock(kctx, reg, tmp, gpu_pfn, nr_pages); -+ if (err) { -+ dev_warn(dev, "Failed to insert va region"); -+ err = -ENOMEM; -+ goto exit; ++ if (NULL != mali_gpu_reset_and_secure_mode_disable) { ++ if (mali_gpu_reset_and_secure_mode_disable()) { ++ MALI_DEBUG_PRINT(1, ("Failed to reset GPU or disable gpu secure mode.\n")); ++ return _MALI_OSK_ERR_FAULT; + } ++ mali_secure_mode_enabled = MALI_FALSE; + -+ goto exit; -+ } -+ -+ /* Path 2: Map any free address which meets the requirements. */ -+ { -+ u64 start_pfn; ++ return _MALI_OSK_ERR_OK; + -+ /* -+ * Depending on the zone the allocation request is for -+ * we might need to retry it. -+ */ -+ do { -+ tmp = kbase_region_tracker_find_region_meeting_reqs( -+ kctx, reg, nr_pages, align); -+ if (tmp) { -+ start_pfn = (tmp->start_pfn + align - 1) & -+ ~(align - 1); -+ err = kbase_insert_va_region_nolock(kctx, reg, -+ tmp, start_pfn, nr_pages); -+ break; -+ } ++ } ++ MALI_DEBUG_PRINT(1, ("GPU secure mode not supported.\n")); ++ return _MALI_OSK_ERR_UNSUPPORTED; + -+ /* -+ * If the allocation is not from the same zone as JIT -+ * then don't retry, we're out of VA and there is -+ * nothing which can be done about it. -+ */ -+ if ((reg->flags & KBASE_REG_ZONE_MASK) != -+ KBASE_REG_ZONE_CUSTOM_VA) -+ break; -+ } while (kbase_jit_evict(kctx)); ++} + -+ if (!tmp) -+ err = -ENOMEM; -+ } ++mali_bool _mali_osk_gpu_secure_mode_is_enabled(void) ++{ ++ return mali_secure_mode_enabled; ++} + -+ exit: -+ return err; ++mali_bool _mali_osk_gpu_secure_mode_is_supported(void) ++{ ++ return mali_secure_mode_supported; +} + -+KBASE_EXPORT_TEST_API(kbase_add_va_region); + -+/** -+ * @brief Initialize the internal region tracker data structure. +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c +new file mode 100755 +index 000000000..0b2d00762 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c +@@ -0,0 +1,27 @@ ++/* ++ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+static void kbase_region_tracker_ds_init(struct kbase_context *kctx, -+ struct kbase_va_region *same_va_reg, -+ struct kbase_va_region *exec_reg, -+ struct kbase_va_region *custom_va_reg) -+{ -+ kctx->reg_rbtree_same = RB_ROOT; -+ kbase_region_tracker_insert(kctx, same_va_reg); + -+ /* Although exec and custom_va_reg don't always exist, -+ * initialize unconditionally because of the mem_view debugfs -+ * implementation which relies on these being empty */ -+ kctx->reg_rbtree_exec = RB_ROOT; -+ kctx->reg_rbtree_custom = RB_ROOT; ++/** ++ * @file mali_osk_math.c ++ * Implementation of the OS abstraction layer for the kernel device driver ++ */ + -+ if (exec_reg) -+ kbase_region_tracker_insert(kctx, exec_reg); -+ if (custom_va_reg) -+ kbase_region_tracker_insert(kctx, custom_va_reg); -+} ++#include "mali_osk.h" ++#include + -+static void kbase_region_tracker_erase_rbtree(struct rb_root *rbtree) ++u32 _mali_osk_clz(u32 input) +{ -+ struct rb_node *rbnode; -+ struct kbase_va_region *reg; -+ -+ do { -+ rbnode = rb_first(rbtree); -+ if (rbnode) { -+ rb_erase(rbnode, rbtree); -+ reg = rb_entry(rbnode, struct kbase_va_region, rblink); -+ kbase_free_alloced_region(reg); -+ } -+ } while (rbnode); ++ return 32 - fls(input); +} + -+void kbase_region_tracker_term(struct kbase_context *kctx) ++u32 _mali_osk_fls(u32 input) +{ -+ kbase_region_tracker_erase_rbtree(&kctx->reg_rbtree_same); -+ kbase_region_tracker_erase_rbtree(&kctx->reg_rbtree_exec); -+ kbase_region_tracker_erase_rbtree(&kctx->reg_rbtree_custom); ++ return fls(input); +} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c +new file mode 100755 +index 000000000..174616b56 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c +@@ -0,0 +1,61 @@ ++/* ++ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + +/** -+ * Initialize the region tracker data structure. ++ * @file mali_osk_memory.c ++ * Implementation of the OS abstraction layer for the kernel device driver + */ -+int kbase_region_tracker_init(struct kbase_context *kctx) -+{ -+ struct kbase_va_region *same_va_reg; -+ struct kbase_va_region *exec_reg = NULL; -+ struct kbase_va_region *custom_va_reg = NULL; -+ size_t same_va_bits = sizeof(void *) * BITS_PER_BYTE; -+ u64 custom_va_size = KBASE_REG_ZONE_CUSTOM_VA_SIZE; -+ u64 gpu_va_limit = (1ULL << kctx->kbdev->gpu_props.mmu.va_bits) >> PAGE_SHIFT; -+ u64 same_va_pages; -+ int err; + -+ /* Take the lock as kbase_free_alloced_region requires it */ -+ kbase_gpu_vm_lock(kctx); ++#include "mali_osk.h" ++#include ++#include + -+#if defined(CONFIG_ARM64) -+ same_va_bits = VA_BITS; -+#elif defined(CONFIG_X86_64) -+ same_va_bits = 47; -+#elif defined(CONFIG_64BIT) -+#error Unsupported 64-bit architecture -+#endif ++void inline *_mali_osk_calloc(u32 n, u32 size) ++{ ++ return kcalloc(n, size, GFP_KERNEL); ++} + -+#ifdef CONFIG_64BIT -+ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) -+ same_va_bits = 32; -+ else if (kbase_hw_has_feature(kctx->kbdev, BASE_HW_FEATURE_33BIT_VA)) -+ same_va_bits = 33; -+#endif ++void inline *_mali_osk_malloc(u32 size) ++{ ++ return kmalloc(size, GFP_KERNEL); ++} + -+ if (kctx->kbdev->gpu_props.mmu.va_bits < same_va_bits) { -+ err = -EINVAL; -+ goto fail_unlock; -+ } ++void inline _mali_osk_free(void *ptr) ++{ ++ kfree(ptr); ++} + -+ same_va_pages = (1ULL << (same_va_bits - PAGE_SHIFT)) - 1; -+ /* all have SAME_VA */ -+ same_va_reg = kbase_alloc_free_region(kctx, 1, -+ same_va_pages, -+ KBASE_REG_ZONE_SAME_VA); ++void inline *_mali_osk_valloc(u32 size) ++{ ++ return vmalloc(size); ++} + -+ if (!same_va_reg) { -+ err = -ENOMEM; -+ goto fail_unlock; -+ } ++void inline _mali_osk_vfree(void *ptr) ++{ ++ vfree(ptr); ++} + -+#ifdef CONFIG_64BIT -+ /* 32-bit clients have exec and custom VA zones */ -+ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) { -+#endif -+ if (gpu_va_limit <= KBASE_REG_ZONE_CUSTOM_VA_BASE) { -+ err = -EINVAL; -+ goto fail_free_same_va; -+ } -+ /* If the current size of TMEM is out of range of the -+ * virtual address space addressable by the MMU then -+ * we should shrink it to fit -+ */ -+ if ((KBASE_REG_ZONE_CUSTOM_VA_BASE + KBASE_REG_ZONE_CUSTOM_VA_SIZE) >= gpu_va_limit) -+ custom_va_size = gpu_va_limit - KBASE_REG_ZONE_CUSTOM_VA_BASE; ++void inline *_mali_osk_memcpy(void *dst, const void *src, u32 len) ++{ ++ return memcpy(dst, src, len); ++} + -+ exec_reg = kbase_alloc_free_region(kctx, -+ KBASE_REG_ZONE_EXEC_BASE, -+ KBASE_REG_ZONE_EXEC_SIZE, -+ KBASE_REG_ZONE_EXEC); ++void inline *_mali_osk_memset(void *s, u32 c, u32 n) ++{ ++ return memset(s, c, n); ++} + -+ if (!exec_reg) { -+ err = -ENOMEM; -+ goto fail_free_same_va; -+ } ++mali_bool _mali_osk_mem_check_allocated(u32 max_allocated) ++{ ++ /* No need to prevent an out-of-memory dialogue appearing on Linux, ++ * so we always return MALI_TRUE. ++ */ ++ return MALI_TRUE; ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c +new file mode 100755 +index 000000000..9845187f8 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c +@@ -0,0 +1,81 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ custom_va_reg = kbase_alloc_free_region(kctx, -+ KBASE_REG_ZONE_CUSTOM_VA_BASE, -+ custom_va_size, KBASE_REG_ZONE_CUSTOM_VA); ++/** ++ * @file mali_osk_misc.c ++ * Implementation of the OS abstraction layer for the kernel device driver ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include "mali_osk.h" + -+ if (!custom_va_reg) { -+ err = -ENOMEM; -+ goto fail_free_exec; -+ } -+#ifdef CONFIG_64BIT -+ } -+#endif ++#if !defined(CONFIG_MALI_QUIET) ++void _mali_osk_dbgmsg(const char *fmt, ...) ++{ ++ va_list args; ++ va_start(args, fmt); ++ vprintk(fmt, args); ++ va_end(args); ++} ++#endif /* !defined(CONFIG_MALI_QUIET) */ + -+ kbase_region_tracker_ds_init(kctx, same_va_reg, exec_reg, custom_va_reg); ++u32 _mali_osk_snprintf(char *buf, u32 size, const char *fmt, ...) ++{ ++ int res; ++ va_list args; ++ va_start(args, fmt); + -+ kctx->same_va_end = same_va_pages + 1; ++ res = vscnprintf(buf, (size_t)size, fmt, args); + -+ kbase_gpu_vm_unlock(kctx); -+ return 0; ++ va_end(args); ++ return res; ++} + -+fail_free_exec: -+ kbase_free_alloced_region(exec_reg); -+fail_free_same_va: -+ kbase_free_alloced_region(same_va_reg); -+fail_unlock: -+ kbase_gpu_vm_unlock(kctx); -+ return err; ++void _mali_osk_abort(void) ++{ ++ /* make a simple fault by dereferencing a NULL pointer */ ++ dump_stack(); ++ *(volatile int *)0 = 0; +} + -+int kbase_region_tracker_init_jit(struct kbase_context *kctx, u64 jit_va_pages) ++void _mali_osk_break(void) +{ -+#ifdef CONFIG_64BIT -+ struct kbase_va_region *same_va; -+ struct kbase_va_region *custom_va_reg; -+ u64 same_va_bits; -+ u64 total_va_size; -+ int err; ++ _mali_osk_abort(); ++} + -+ /* -+ * Nothing to do for 32-bit clients, JIT uses the existing -+ * custom VA zone. -+ */ -+ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) -+ return 0; ++u32 _mali_osk_get_pid(void) ++{ ++ /* Thread group ID is the process ID on Linux */ ++ return (u32)current->tgid; ++} + -+#if defined(CONFIG_ARM64) -+ same_va_bits = VA_BITS; -+#elif defined(CONFIG_X86_64) -+ same_va_bits = 47; -+#elif defined(CONFIG_64BIT) -+#error Unsupported 64-bit architecture -+#endif -+ -+ if (kbase_hw_has_feature(kctx->kbdev, BASE_HW_FEATURE_33BIT_VA)) -+ same_va_bits = 33; ++char *_mali_osk_get_comm(void) ++{ ++ return (char *)current->comm; ++} + -+ total_va_size = (1ULL << (same_va_bits - PAGE_SHIFT)) - 1; + -+ kbase_gpu_vm_lock(kctx); ++u32 _mali_osk_get_tid(void) ++{ ++ /* pid is actually identifying the thread on Linux */ ++ u32 tid = current->pid; + -+ /* -+ * Modify the same VA free region after creation. Be careful to ensure -+ * that allocations haven't been made as they could cause an overlap -+ * to happen with existing same VA allocations and the custom VA zone. -+ */ -+ same_va = kbase_region_tracker_find_region_base_address(kctx, -+ PAGE_SIZE); -+ if (!same_va) { -+ err = -ENOMEM; -+ goto fail_unlock; ++ /* If the pid is 0 the core was idle. Instead of returning 0 we return a special number ++ * identifying which core we are on. */ ++ if (0 == tid) { ++ tid = -(1 + raw_smp_processor_id()); + } + -+ /* The region flag or region size has changed since creation so bail. */ -+ if ((!(same_va->flags & KBASE_REG_FREE)) || -+ (same_va->nr_pages != total_va_size)) { -+ err = -ENOMEM; -+ goto fail_unlock; -+ } ++ return tid; ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c +new file mode 100755 +index 000000000..a05f8f066 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c +@@ -0,0 +1,182 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ if (same_va->nr_pages < jit_va_pages || -+ kctx->same_va_end < jit_va_pages) { -+ err = -ENOMEM; -+ goto fail_unlock; -+ } ++/** ++ * @file mali_osk_notification.c ++ * Implementation of the OS abstraction layer for the kernel device driver ++ */ + -+ /* It's safe to adjust the same VA zone now */ -+ same_va->nr_pages -= jit_va_pages; -+ kctx->same_va_end -= jit_va_pages; ++#include "mali_osk.h" ++#include "mali_kernel_common.h" + -+ /* -+ * Create a custom VA zone at the end of the VA for allocations which -+ * JIT can use so it doesn't have to allocate VA from the kernel. -+ */ -+ custom_va_reg = kbase_alloc_free_region(kctx, -+ kctx->same_va_end, -+ jit_va_pages, -+ KBASE_REG_ZONE_CUSTOM_VA); ++#include ++#include ++#include + -+ if (!custom_va_reg) { -+ /* -+ * The context will be destroyed if we fail here so no point -+ * reverting the change we made to same_va. -+ */ -+ err = -ENOMEM; -+ goto fail_unlock; -+ } ++/** ++ * Declaration of the notification queue object type ++ * Contains a linked list of notification pending delivery to user space. ++ * It also contains a wait queue of exclusive waiters blocked in the ioctl ++ * When a new notification is posted a single thread is resumed. ++ */ ++struct _mali_osk_notification_queue_t_struct { ++ spinlock_t mutex; /**< Mutex protecting the list */ ++ wait_queue_head_t receive_queue; /**< Threads waiting for new entries to the queue */ ++ struct list_head head; /**< List of notifications waiting to be picked up */ ++}; + -+ kbase_region_tracker_insert(kctx, custom_va_reg); ++typedef struct _mali_osk_notification_wrapper_t_struct { ++ struct list_head list; /**< Internal linked list variable */ ++ _mali_osk_notification_t data; /**< Notification data */ ++} _mali_osk_notification_wrapper_t; + -+ kbase_gpu_vm_unlock(kctx); -+ return 0; ++_mali_osk_notification_queue_t *_mali_osk_notification_queue_init(void) ++{ ++ _mali_osk_notification_queue_t *result; + -+fail_unlock: -+ kbase_gpu_vm_unlock(kctx); -+ return err; -+#else -+ return 0; -+#endif ++ result = (_mali_osk_notification_queue_t *)kmalloc(sizeof(_mali_osk_notification_queue_t), GFP_KERNEL); ++ if (NULL == result) return NULL; ++ ++ spin_lock_init(&result->mutex); ++ init_waitqueue_head(&result->receive_queue); ++ INIT_LIST_HEAD(&result->head); ++ ++ return result; +} + -+int kbase_mem_init(struct kbase_device *kbdev) ++_mali_osk_notification_t *_mali_osk_notification_create(u32 type, u32 size) +{ -+ struct kbasep_mem_device *memdev; -+ int ret; -+ -+ KBASE_DEBUG_ASSERT(kbdev); ++ /* OPT Recycling of notification objects */ ++ _mali_osk_notification_wrapper_t *notification; + -+ memdev = &kbdev->memdev; -+ kbdev->mem_pool_max_size_default = KBASE_MEM_POOL_MAX_SIZE_KCTX; ++ notification = (_mali_osk_notification_wrapper_t *)kmalloc(sizeof(_mali_osk_notification_wrapper_t) + size, ++ GFP_KERNEL | __GFP_HIGH | __GFP_RETRY_MAYFAIL); ++ if (NULL == notification) { ++ MALI_DEBUG_PRINT(1, ("Failed to create a notification object\n")); ++ return NULL; ++ } + -+ /* Initialize memory usage */ -+ atomic_set(&memdev->used_pages, 0); ++ /* Init the list */ ++ INIT_LIST_HEAD(¬ification->list); + -+ ret = kbase_mem_pool_init(&kbdev->mem_pool, -+ KBASE_MEM_POOL_MAX_SIZE_KBDEV, -+ KBASE_MEM_POOL_4KB_PAGE_TABLE_ORDER, -+ kbdev, -+ NULL); -+ if (ret) -+ return ret; ++ if (0 != size) { ++ notification->data.result_buffer = ((u8 *)notification) + sizeof(_mali_osk_notification_wrapper_t); ++ } else { ++ notification->data.result_buffer = NULL; ++ } + -+ ret = kbase_mem_pool_init(&kbdev->lp_mem_pool, -+ (KBASE_MEM_POOL_MAX_SIZE_KBDEV >> 9), -+ KBASE_MEM_POOL_2MB_PAGE_TABLE_ORDER, -+ kbdev, -+ NULL); -+ if (ret) -+ kbase_mem_pool_term(&kbdev->mem_pool); ++ /* set up the non-allocating fields */ ++ notification->data.notification_type = type; ++ notification->data.result_buffer_size = size; + -+ return ret; ++ /* all ok */ ++ return &(notification->data); +} + -+void kbase_mem_halt(struct kbase_device *kbdev) ++void _mali_osk_notification_delete(_mali_osk_notification_t *object) +{ -+ CSTD_UNUSED(kbdev); ++ _mali_osk_notification_wrapper_t *notification; ++ MALI_DEBUG_ASSERT_POINTER(object); ++ ++ notification = container_of(object, _mali_osk_notification_wrapper_t, data); ++ ++ /* Free the container */ ++ kfree(notification); +} + -+void kbase_mem_term(struct kbase_device *kbdev) ++void _mali_osk_notification_queue_term(_mali_osk_notification_queue_t *queue) +{ -+ struct kbasep_mem_device *memdev; -+ int pages; ++ _mali_osk_notification_t *result; ++ MALI_DEBUG_ASSERT_POINTER(queue); + -+ KBASE_DEBUG_ASSERT(kbdev); ++ while (_MALI_OSK_ERR_OK == _mali_osk_notification_queue_dequeue(queue, &result)) { ++ _mali_osk_notification_delete(result); ++ } + -+ memdev = &kbdev->memdev; ++ /* not much to do, just free the memory */ ++ kfree(queue); ++} ++void _mali_osk_notification_queue_send(_mali_osk_notification_queue_t *queue, _mali_osk_notification_t *object) ++{ ++#if defined(MALI_UPPER_HALF_SCHEDULING) ++ unsigned long irq_flags; ++#endif + -+ pages = atomic_read(&memdev->used_pages); -+ if (pages != 0) -+ dev_warn(kbdev->dev, "%s: %d pages in use!\n", __func__, pages); ++ _mali_osk_notification_wrapper_t *notification; ++ MALI_DEBUG_ASSERT_POINTER(queue); ++ MALI_DEBUG_ASSERT_POINTER(object); + -+ kbase_mem_pool_term(&kbdev->mem_pool); -+ kbase_mem_pool_term(&kbdev->lp_mem_pool); -+} ++ notification = container_of(object, _mali_osk_notification_wrapper_t, data); + -+KBASE_EXPORT_TEST_API(kbase_mem_term); ++#if defined(MALI_UPPER_HALF_SCHEDULING) ++ spin_lock_irqsave(&queue->mutex, irq_flags); ++#else ++ spin_lock(&queue->mutex); ++#endif + ++ list_add_tail(¬ification->list, &queue->head); + ++#if defined(MALI_UPPER_HALF_SCHEDULING) ++ spin_unlock_irqrestore(&queue->mutex, irq_flags); ++#else ++ spin_unlock(&queue->mutex); ++#endif + ++ /* and wake up one possible exclusive waiter */ ++ wake_up(&queue->receive_queue); ++} + -+/** -+ * @brief Allocate a free region object. -+ * -+ * The allocated object is not part of any list yet, and is flagged as -+ * KBASE_REG_FREE. No mapping is allocated yet. -+ * -+ * zone is KBASE_REG_ZONE_CUSTOM_VA, KBASE_REG_ZONE_SAME_VA, or KBASE_REG_ZONE_EXEC -+ * -+ */ -+struct kbase_va_region *kbase_alloc_free_region(struct kbase_context *kctx, u64 start_pfn, size_t nr_pages, int zone) ++_mali_osk_errcode_t _mali_osk_notification_queue_dequeue(_mali_osk_notification_queue_t *queue, _mali_osk_notification_t **result) +{ -+ struct kbase_va_region *new_reg; ++#if defined(MALI_UPPER_HALF_SCHEDULING) ++ unsigned long irq_flags; ++#endif + -+ KBASE_DEBUG_ASSERT(kctx != NULL); ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_ITEM_NOT_FOUND; ++ _mali_osk_notification_wrapper_t *wrapper_object; + -+ /* zone argument should only contain zone related region flags */ -+ KBASE_DEBUG_ASSERT((zone & ~KBASE_REG_ZONE_MASK) == 0); -+ KBASE_DEBUG_ASSERT(nr_pages > 0); -+ /* 64-bit address range is the max */ -+ KBASE_DEBUG_ASSERT(start_pfn + nr_pages <= (U64_MAX / PAGE_SIZE)); ++#if defined(MALI_UPPER_HALF_SCHEDULING) ++ spin_lock_irqsave(&queue->mutex, irq_flags); ++#else ++ spin_lock(&queue->mutex); ++#endif + -+ new_reg = kzalloc(sizeof(*new_reg), GFP_KERNEL); ++ if (!list_empty(&queue->head)) { ++ wrapper_object = list_entry(queue->head.next, _mali_osk_notification_wrapper_t, list); ++ *result = &(wrapper_object->data); ++ list_del_init(&wrapper_object->list); ++ ret = _MALI_OSK_ERR_OK; ++ } + -+ if (!new_reg) -+ return NULL; ++#if defined(MALI_UPPER_HALF_SCHEDULING) ++ spin_unlock_irqrestore(&queue->mutex, irq_flags); ++#else ++ spin_unlock(&queue->mutex); ++#endif + -+ new_reg->cpu_alloc = NULL; /* no alloc bound yet */ -+ new_reg->gpu_alloc = NULL; /* no alloc bound yet */ -+ new_reg->kctx = kctx; -+ new_reg->flags = zone | KBASE_REG_FREE; ++ return ret; ++} + -+ new_reg->flags |= KBASE_REG_GROWABLE; ++_mali_osk_errcode_t _mali_osk_notification_queue_receive(_mali_osk_notification_queue_t *queue, _mali_osk_notification_t **result) ++{ ++ /* check input */ ++ MALI_DEBUG_ASSERT_POINTER(queue); ++ MALI_DEBUG_ASSERT_POINTER(result); + -+ new_reg->start_pfn = start_pfn; -+ new_reg->nr_pages = nr_pages; ++ /* default result */ ++ *result = NULL; + -+ return new_reg; -+} ++ if (wait_event_interruptible(queue->receive_queue, ++ _MALI_OSK_ERR_OK == _mali_osk_notification_queue_dequeue(queue, result))) { ++ return _MALI_OSK_ERR_RESTARTSYSCALL; ++ } + -+KBASE_EXPORT_TEST_API(kbase_alloc_free_region); ++ return _MALI_OSK_ERR_OK; /* all ok */ ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c +new file mode 100755 +index 000000000..e28e2eb21 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c +@@ -0,0 +1,83 @@ ++/** ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + +/** -+ * @brief Free a region object. -+ * -+ * The described region must be freed of any mapping. -+ * -+ * If the region is not flagged as KBASE_REG_FREE, the region's -+ * alloc object will be released. -+ * It is a bug if no alloc object exists for non-free regions. -+ * ++ * @file mali_osk_pm.c ++ * Implementation of the callback functions from common power management + */ -+void kbase_free_alloced_region(struct kbase_va_region *reg) -+{ -+ if (!(reg->flags & KBASE_REG_FREE)) { -+ /* -+ * The physical allocation should have been removed from the -+ * eviction list before this function is called. However, in the -+ * case of abnormal process termination or the app leaking the -+ * memory kbase_mem_free_region is not called so it can still be -+ * on the list at termination time of the region tracker. -+ */ -+ if (!list_empty(®->gpu_alloc->evict_node)) { -+ /* -+ * Unlink the physical allocation before unmaking it -+ * evictable so that the allocation isn't grown back to -+ * its last backed size as we're going to unmap it -+ * anyway. -+ */ -+ reg->cpu_alloc->reg = NULL; -+ if (reg->cpu_alloc != reg->gpu_alloc) -+ reg->gpu_alloc->reg = NULL; + -+ /* -+ * If a region has been made evictable then we must -+ * unmake it before trying to free it. -+ * If the memory hasn't been reclaimed it will be -+ * unmapped and freed below, if it has been reclaimed -+ * then the operations below are no-ops. -+ */ -+ if (reg->flags & KBASE_REG_DONT_NEED) { -+ KBASE_DEBUG_ASSERT(reg->cpu_alloc->type == -+ KBASE_MEM_TYPE_NATIVE); -+ kbase_mem_evictable_unmake(reg->gpu_alloc); -+ } -+ } ++#include + -+ /* -+ * Remove the region from the sticky resource metadata -+ * list should it be there. -+ */ -+ kbase_sticky_resource_release(reg->kctx, NULL, -+ reg->start_pfn << PAGE_SHIFT); ++#include "mali_kernel_linux.h" ++#ifdef CONFIG_PM_RUNTIME ++#include ++#endif /* CONFIG_PM_RUNTIME */ ++#include ++#include ++#include "mali_osk.h" ++#include "mali_kernel_common.h" + -+ kbase_mem_phy_alloc_put(reg->cpu_alloc); -+ kbase_mem_phy_alloc_put(reg->gpu_alloc); -+ /* To detect use-after-free in debug builds */ -+ KBASE_DEBUG_CODE(reg->flags |= KBASE_REG_FREE); ++/* Can NOT run in atomic context */ ++_mali_osk_errcode_t _mali_osk_pm_dev_ref_get_sync(void) ++{ ++#ifdef CONFIG_PM_RUNTIME ++ int err; ++ MALI_DEBUG_ASSERT_POINTER(mali_platform_device); ++ err = pm_runtime_get_sync(&(mali_platform_device->dev)); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) ++ pm_runtime_mark_last_busy(&(mali_platform_device->dev)); ++#endif ++ if (0 > err) { ++ MALI_PRINT_ERROR(("Mali OSK PM: pm_runtime_get_sync() returned error code %d\n", err)); ++ return _MALI_OSK_ERR_FAULT; + } -+ kfree(reg); ++#endif ++ return _MALI_OSK_ERR_OK; +} + -+KBASE_EXPORT_TEST_API(kbase_free_alloced_region); -+ -+int kbase_gpu_mmap(struct kbase_context *kctx, struct kbase_va_region *reg, u64 addr, size_t nr_pages, size_t align) ++/* Can run in atomic context */ ++_mali_osk_errcode_t _mali_osk_pm_dev_ref_get_async(void) +{ ++#ifdef CONFIG_PM_RUNTIME + int err; -+ size_t i = 0; -+ unsigned long attr; -+ unsigned long mask = ~KBASE_REG_MEMATTR_MASK; ++ MALI_DEBUG_ASSERT_POINTER(mali_platform_device); ++ err = pm_runtime_get(&(mali_platform_device->dev)); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) ++ pm_runtime_mark_last_busy(&(mali_platform_device->dev)); ++#endif ++ if (0 > err && -EINPROGRESS != err) { ++ MALI_PRINT_ERROR(("Mali OSK PM: pm_runtime_get() returned error code %d\n", err)); ++ return _MALI_OSK_ERR_FAULT; ++ } ++#endif ++ return _MALI_OSK_ERR_OK; ++} + -+ if ((kctx->kbdev->system_coherency == COHERENCY_ACE) && -+ (reg->flags & KBASE_REG_SHARE_BOTH)) -+ attr = KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_OUTER_WA); -+ else -+ attr = KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_WRITE_ALLOC); + -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ KBASE_DEBUG_ASSERT(NULL != reg); ++/* Can run in atomic context */ ++void _mali_osk_pm_dev_ref_put(void) ++{ ++#ifdef CONFIG_PM_RUNTIME ++ MALI_DEBUG_ASSERT_POINTER(mali_platform_device); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) ++ pm_runtime_mark_last_busy(&(mali_platform_device->dev)); ++ pm_runtime_put_autosuspend(&(mali_platform_device->dev)); ++#else ++ pm_runtime_put(&(mali_platform_device->dev)); ++#endif ++#endif ++} + -+ err = kbase_add_va_region(kctx, reg, addr, nr_pages, align); -+ if (err) -+ return err; ++void _mali_osk_pm_dev_barrier(void) ++{ ++#ifdef CONFIG_PM_RUNTIME ++ pm_runtime_barrier(&(mali_platform_device->dev)); ++#endif ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c +new file mode 100755 +index 000000000..9e977ea4d +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c +@@ -0,0 +1,1282 @@ ++/* ++ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include ++#include ++#include ++#include ++#include ++#include + -+ if (reg->gpu_alloc->type == KBASE_MEM_TYPE_ALIAS) { -+ u64 stride; -+ struct kbase_mem_phy_alloc *alloc; ++#include ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_ukk.h" ++#include "mali_uk_types.h" ++#include "mali_osk_profiling.h" ++#include "mali_linux_trace.h" ++#include "mali_gp.h" ++#include "mali_pp.h" ++#include "mali_l2_cache.h" ++#include "mali_user_settings_db.h" ++#include "mali_executor.h" ++#include "mali_memory_manager.h" + -+ alloc = reg->gpu_alloc; -+ stride = alloc->imported.alias.stride; -+ KBASE_DEBUG_ASSERT(alloc->imported.alias.aliased); -+ for (i = 0; i < alloc->imported.alias.nents; i++) { -+ if (alloc->imported.alias.aliased[i].alloc) { -+ err = kbase_mmu_insert_pages(kctx, -+ reg->start_pfn + (i * stride), -+ alloc->imported.alias.aliased[i].alloc->pages + alloc->imported.alias.aliased[i].offset, -+ alloc->imported.alias.aliased[i].length, -+ reg->flags); -+ if (err) -+ goto bad_insert; ++#define MALI_PROFILING_STREAM_DATA_DEFAULT_SIZE 100 ++#define MALI_PROFILING_STREAM_HOLD_TIME 1000000 /*1 ms */ + -+ kbase_mem_phy_alloc_gpu_mapped(alloc->imported.alias.aliased[i].alloc); -+ } else { -+ err = kbase_mmu_insert_single_page(kctx, -+ reg->start_pfn + i * stride, -+ kctx->aliasing_sink_page, -+ alloc->imported.alias.aliased[i].length, -+ (reg->flags & mask) | attr); ++#define MALI_PROFILING_STREAM_BUFFER_SIZE (1 << 12) ++#define MALI_PROFILING_STREAM_BUFFER_NUM 100 + -+ if (err) -+ goto bad_insert; -+ } -+ } -+ } else { -+ err = kbase_mmu_insert_pages(kctx, reg->start_pfn, -+ kbase_get_gpu_phy_pages(reg), -+ kbase_reg_current_backed_size(reg), -+ reg->flags); -+ if (err) -+ goto bad_insert; -+ kbase_mem_phy_alloc_gpu_mapped(reg->gpu_alloc); -+ } ++/** ++ * Define the mali profiling stream struct. ++ */ ++typedef struct mali_profiling_stream { ++ u8 data[MALI_PROFILING_STREAM_BUFFER_SIZE]; ++ u32 used_size; ++ struct list_head list; ++} mali_profiling_stream; + -+ return err; ++typedef struct mali_profiling_stream_list { ++ spinlock_t spin_lock; ++ struct list_head free_list; ++ struct list_head queue_list; ++} mali_profiling_stream_list; + -+bad_insert: -+ if (reg->gpu_alloc->type == KBASE_MEM_TYPE_ALIAS) { -+ u64 stride; ++static const char mali_name[] = "4xx"; ++static const char utgard_setup_version[] = "ANNOTATE_SETUP 1\n"; + -+ stride = reg->gpu_alloc->imported.alias.stride; -+ KBASE_DEBUG_ASSERT(reg->gpu_alloc->imported.alias.aliased); -+ while (i--) -+ if (reg->gpu_alloc->imported.alias.aliased[i].alloc) { -+ kbase_mmu_teardown_pages(kctx, reg->start_pfn + (i * stride), reg->gpu_alloc->imported.alias.aliased[i].length); -+ kbase_mem_phy_alloc_gpu_unmapped(reg->gpu_alloc->imported.alias.aliased[i].alloc); -+ } -+ } ++static u32 profiling_sample_rate = 0; ++static u32 first_sw_counter_index = 0; + -+ kbase_remove_va_region(kctx, reg); ++static mali_bool l2_cache_counter_if_enabled = MALI_FALSE; ++static u32 num_counters_enabled = 0; ++static u32 mem_counters_enabled = 0; + -+ return err; -+} ++static _mali_osk_atomic_t stream_fd_if_used; + -+KBASE_EXPORT_TEST_API(kbase_gpu_mmap); ++static wait_queue_head_t stream_fd_wait_queue; ++static mali_profiling_counter *global_mali_profiling_counters = NULL; ++static u32 num_global_mali_profiling_counters = 0; + -+static void kbase_jd_user_buf_unmap(struct kbase_context *kctx, -+ struct kbase_mem_phy_alloc *alloc, bool writeable); ++static mali_profiling_stream_list *global_mali_stream_list = NULL; ++static mali_profiling_stream *mali_counter_stream = NULL; ++static mali_profiling_stream *mali_core_activity_stream = NULL; ++static u64 mali_core_activity_stream_dequeue_time = 0; ++static spinlock_t mali_activity_lock; ++static u32 mali_activity_cores_num = 0; ++static struct hrtimer profiling_sampling_timer; + -+int kbase_gpu_munmap(struct kbase_context *kctx, struct kbase_va_region *reg) -+{ -+ int err; ++const char *_mali_mem_counter_descriptions[] = _MALI_MEM_COUTNER_DESCRIPTIONS; ++const char *_mali_special_counter_descriptions[] = _MALI_SPCIAL_COUNTER_DESCRIPTIONS; + -+ if (reg->start_pfn == 0) -+ return 0; ++static u32 current_profiling_pid = 0; + -+ if (reg->gpu_alloc && reg->gpu_alloc->type == KBASE_MEM_TYPE_ALIAS) { -+ size_t i; ++static void _mali_profiling_stream_list_destory(mali_profiling_stream_list *profiling_stream_list) ++{ ++ mali_profiling_stream *profiling_stream, *tmp_profiling_stream; ++ MALI_DEBUG_ASSERT_POINTER(profiling_stream_list); + -+ err = kbase_mmu_teardown_pages(kctx, reg->start_pfn, reg->nr_pages); -+ KBASE_DEBUG_ASSERT(reg->gpu_alloc->imported.alias.aliased); -+ for (i = 0; i < reg->gpu_alloc->imported.alias.nents; i++) -+ if (reg->gpu_alloc->imported.alias.aliased[i].alloc) -+ kbase_mem_phy_alloc_gpu_unmapped(reg->gpu_alloc->imported.alias.aliased[i].alloc); -+ } else { -+ err = kbase_mmu_teardown_pages(kctx, reg->start_pfn, kbase_reg_current_backed_size(reg)); -+ kbase_mem_phy_alloc_gpu_unmapped(reg->gpu_alloc); ++ list_for_each_entry_safe(profiling_stream, tmp_profiling_stream, &profiling_stream_list->free_list, list) { ++ list_del(&profiling_stream->list); ++ kfree(profiling_stream); + } + -+ if (reg->gpu_alloc && reg->gpu_alloc->type == -+ KBASE_MEM_TYPE_IMPORTED_USER_BUF) { -+ struct kbase_alloc_import_user_buf *user_buf = -+ ®->gpu_alloc->imported.user_buf; -+ -+ if (user_buf->current_mapping_usage_count & PINNED_ON_IMPORT) { -+ user_buf->current_mapping_usage_count &= -+ ~PINNED_ON_IMPORT; -+ -+ kbase_jd_user_buf_unmap(kctx, reg->gpu_alloc, -+ (reg->flags & KBASE_REG_GPU_WR)); -+ } ++ list_for_each_entry_safe(profiling_stream, tmp_profiling_stream, &profiling_stream_list->queue_list, list) { ++ list_del(&profiling_stream->list); ++ kfree(profiling_stream); + } + -+ if (err) -+ return err; -+ -+ err = kbase_remove_va_region(kctx, reg); -+ return err; ++ kfree(profiling_stream_list); +} + -+static struct kbase_cpu_mapping *kbasep_find_enclosing_cpu_mapping( -+ struct kbase_context *kctx, -+ unsigned long uaddr, size_t size, u64 *offset) ++static void _mali_profiling_global_stream_list_free(void) +{ -+ struct vm_area_struct *vma; -+ struct kbase_cpu_mapping *map; -+ unsigned long vm_pgoff_in_region; -+ unsigned long vm_off_in_region; -+ unsigned long map_start; -+ size_t map_size; -+ -+ lockdep_assert_held(¤t->mm->mmap_sem); -+ -+ if ((uintptr_t) uaddr + size < (uintptr_t) uaddr) /* overflow check */ -+ return NULL; -+ -+ vma = find_vma_intersection(current->mm, uaddr, uaddr+size); -+ -+ if (!vma || vma->vm_start > uaddr) -+ return NULL; -+ if (vma->vm_ops != &kbase_vm_ops) -+ /* Not ours! */ -+ return NULL; ++ mali_profiling_stream *profiling_stream, *tmp_profiling_stream; ++ unsigned long irq_flags; + -+ map = vma->vm_private_data; ++ MALI_DEBUG_ASSERT_POINTER(global_mali_stream_list); ++ spin_lock_irqsave(&global_mali_stream_list->spin_lock, irq_flags); ++ list_for_each_entry_safe(profiling_stream, tmp_profiling_stream, &global_mali_stream_list->queue_list, list) { ++ profiling_stream->used_size = 0; ++ list_move(&profiling_stream->list, &global_mali_stream_list->free_list); ++ } ++ spin_unlock_irqrestore(&global_mali_stream_list->spin_lock, irq_flags); ++} + -+ if (map->kctx != kctx) -+ /* Not from this context! */ -+ return NULL; ++static _mali_osk_errcode_t _mali_profiling_global_stream_list_dequeue(struct list_head *stream_list, mali_profiling_stream **new_mali_profiling_stream) ++{ ++ unsigned long irq_flags; ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_OK; ++ MALI_DEBUG_ASSERT_POINTER(global_mali_stream_list); ++ MALI_DEBUG_ASSERT_POINTER(stream_list); + -+ vm_pgoff_in_region = vma->vm_pgoff - map->region->start_pfn; -+ vm_off_in_region = vm_pgoff_in_region << PAGE_SHIFT; -+ map_start = vma->vm_start - vm_off_in_region; -+ map_size = map->region->nr_pages << PAGE_SHIFT; ++ spin_lock_irqsave(&global_mali_stream_list->spin_lock, irq_flags); + -+ if ((uaddr + size) > (map_start + map_size)) -+ /* Not within the CPU mapping */ -+ return NULL; ++ if (!list_empty(stream_list)) { ++ *new_mali_profiling_stream = list_entry(stream_list->next, mali_profiling_stream, list); ++ list_del_init(&(*new_mali_profiling_stream)->list); ++ } else { ++ ret = _MALI_OSK_ERR_NOMEM; ++ } + -+ *offset = (uaddr - vma->vm_start) + vm_off_in_region; ++ spin_unlock_irqrestore(&global_mali_stream_list->spin_lock, irq_flags); + -+ return map; ++ return ret; +} + -+int kbasep_find_enclosing_cpu_mapping_offset( -+ struct kbase_context *kctx, -+ unsigned long uaddr, size_t size, u64 *offset) ++static void _mali_profiling_global_stream_list_queue(struct list_head *stream_list, mali_profiling_stream *current_mali_profiling_stream) +{ -+ struct kbase_cpu_mapping *map; -+ -+ kbase_os_mem_map_lock(kctx); -+ -+ map = kbasep_find_enclosing_cpu_mapping(kctx, uaddr, size, offset); -+ -+ kbase_os_mem_map_unlock(kctx); -+ -+ if (!map) -+ return -EINVAL; ++ unsigned long irq_flags; ++ MALI_DEBUG_ASSERT_POINTER(global_mali_stream_list); ++ MALI_DEBUG_ASSERT_POINTER(stream_list); + -+ return 0; ++ spin_lock_irqsave(&global_mali_stream_list->spin_lock, irq_flags); ++ list_add_tail(¤t_mali_profiling_stream->list, stream_list); ++ spin_unlock_irqrestore(&global_mali_stream_list->spin_lock, irq_flags); +} + -+KBASE_EXPORT_TEST_API(kbasep_find_enclosing_cpu_mapping_offset); ++static mali_bool _mali_profiling_global_stream_queue_list_if_empty(void) ++{ ++ MALI_DEBUG_ASSERT_POINTER(global_mali_stream_list); ++ return list_empty(&global_mali_stream_list->queue_list); ++} + -+void kbase_sync_single(struct kbase_context *kctx, -+ struct tagged_addr t_cpu_pa, struct tagged_addr t_gpu_pa, -+ off_t offset, size_t size, enum kbase_sync_type sync_fn) ++static u32 _mali_profiling_global_stream_queue_list_next_size(void) +{ -+ struct page *cpu_page; -+ phys_addr_t cpu_pa = as_phys_addr_t(t_cpu_pa); -+ phys_addr_t gpu_pa = as_phys_addr_t(t_gpu_pa); ++ unsigned long irq_flags; ++ u32 size = 0; ++ MALI_DEBUG_ASSERT_POINTER(global_mali_stream_list); + -+ cpu_page = pfn_to_page(PFN_DOWN(cpu_pa)); ++ spin_lock_irqsave(&global_mali_stream_list->spin_lock, irq_flags); ++ if (!list_empty(&global_mali_stream_list->queue_list)) { ++ mali_profiling_stream *next_mali_profiling_stream = ++ list_entry(global_mali_stream_list->queue_list.next, mali_profiling_stream, list); ++ size = next_mali_profiling_stream->used_size; ++ } ++ spin_unlock_irqrestore(&global_mali_stream_list->spin_lock, irq_flags); ++ return size; ++} + -+ if (likely(cpu_pa == gpu_pa)) { -+ dma_addr_t dma_addr; ++/* The mali profiling stream file operations functions. */ ++static ssize_t _mali_profiling_stream_read( ++ struct file *filp, ++ char __user *buffer, ++ size_t size, ++ loff_t *f_pos); + -+ BUG_ON(!cpu_page); -+ BUG_ON(offset + size > PAGE_SIZE); ++static unsigned int _mali_profiling_stream_poll(struct file *filp, poll_table *wait); + -+ dma_addr = kbase_dma_addr(cpu_page) + offset; -+ if (sync_fn == KBASE_SYNC_TO_CPU) -+ dma_sync_single_for_cpu(kctx->kbdev->dev, dma_addr, -+ size, DMA_BIDIRECTIONAL); -+ else if (sync_fn == KBASE_SYNC_TO_DEVICE) -+ dma_sync_single_for_device(kctx->kbdev->dev, dma_addr, -+ size, DMA_BIDIRECTIONAL); -+ } else { -+ void *src = NULL; -+ void *dst = NULL; -+ struct page *gpu_page; ++static int _mali_profiling_stream_release(struct inode *inode, struct file *filp); + -+ if (WARN(!gpu_pa, "No GPU PA found for infinite cache op")) -+ return; ++/* The timeline stream file operations structure. */ ++static const struct file_operations mali_profiling_stream_fops = { ++ .release = _mali_profiling_stream_release, ++ .read = _mali_profiling_stream_read, ++ .poll = _mali_profiling_stream_poll, ++}; + -+ gpu_page = pfn_to_page(PFN_DOWN(gpu_pa)); ++static ssize_t _mali_profiling_stream_read( ++ struct file *filp, ++ char __user *buffer, ++ size_t size, ++ loff_t *f_pos) ++{ ++ u32 copy_len = 0; ++ mali_profiling_stream *current_mali_profiling_stream; ++ u32 used_size; ++ MALI_DEBUG_ASSERT_POINTER(global_mali_stream_list); + -+ if (sync_fn == KBASE_SYNC_TO_DEVICE) { -+ src = ((unsigned char *)kmap(cpu_page)) + offset; -+ dst = ((unsigned char *)kmap(gpu_page)) + offset; -+ } else if (sync_fn == KBASE_SYNC_TO_CPU) { -+ dma_sync_single_for_cpu(kctx->kbdev->dev, -+ kbase_dma_addr(gpu_page) + offset, -+ size, DMA_BIDIRECTIONAL); -+ src = ((unsigned char *)kmap(gpu_page)) + offset; -+ dst = ((unsigned char *)kmap(cpu_page)) + offset; ++ while (!_mali_profiling_global_stream_queue_list_if_empty()) { ++ used_size = _mali_profiling_global_stream_queue_list_next_size(); ++ if (used_size <= ((u32)size - copy_len)) { ++ current_mali_profiling_stream = NULL; ++ _mali_profiling_global_stream_list_dequeue(&global_mali_stream_list->queue_list, ++ ¤t_mali_profiling_stream); ++ MALI_DEBUG_ASSERT_POINTER(current_mali_profiling_stream); ++ if (copy_to_user(&buffer[copy_len], current_mali_profiling_stream->data, current_mali_profiling_stream->used_size)) { ++ current_mali_profiling_stream->used_size = 0; ++ _mali_profiling_global_stream_list_queue(&global_mali_stream_list->free_list, current_mali_profiling_stream); ++ return -EFAULT; ++ } ++ copy_len += current_mali_profiling_stream->used_size; ++ current_mali_profiling_stream->used_size = 0; ++ _mali_profiling_global_stream_list_queue(&global_mali_stream_list->free_list, current_mali_profiling_stream); ++ } else { ++ break; + } -+ memcpy(dst, src, size); -+ kunmap(gpu_page); -+ kunmap(cpu_page); -+ if (sync_fn == KBASE_SYNC_TO_DEVICE) -+ dma_sync_single_for_device(kctx->kbdev->dev, -+ kbase_dma_addr(gpu_page) + offset, -+ size, DMA_BIDIRECTIONAL); + } ++ return (ssize_t)copy_len; +} + -+static int kbase_do_syncset(struct kbase_context *kctx, -+ struct basep_syncset *sset, enum kbase_sync_type sync_fn) ++static unsigned int _mali_profiling_stream_poll(struct file *filp, poll_table *wait) +{ -+ int err = 0; -+ struct kbase_va_region *reg; -+ struct kbase_cpu_mapping *map; -+ unsigned long start; -+ size_t size; -+ struct tagged_addr *cpu_pa; -+ struct tagged_addr *gpu_pa; -+ u64 page_off, page_count; -+ u64 i; -+ u64 offset; -+ -+ kbase_os_mem_map_lock(kctx); -+ kbase_gpu_vm_lock(kctx); -+ -+ /* find the region where the virtual address is contained */ -+ reg = kbase_region_tracker_find_region_enclosing_address(kctx, -+ sset->mem_handle.basep.handle); -+ if (!reg) { -+ dev_warn(kctx->kbdev->dev, "Can't find region at VA 0x%016llX", -+ sset->mem_handle.basep.handle); -+ err = -EINVAL; -+ goto out_unlock; -+ } -+ -+ if (!(reg->flags & KBASE_REG_CPU_CACHED) || -+ kbase_mem_is_imported(reg->gpu_alloc->type)) -+ goto out_unlock; -+ -+ start = (uintptr_t)sset->user_addr; -+ size = (size_t)sset->size; -+ -+ map = kbasep_find_enclosing_cpu_mapping(kctx, start, size, &offset); -+ if (!map) { -+ dev_warn(kctx->kbdev->dev, "Can't find CPU mapping 0x%016lX for VA 0x%016llX", -+ start, sset->mem_handle.basep.handle); -+ err = -EINVAL; -+ goto out_unlock; -+ } ++ poll_wait(filp, &stream_fd_wait_queue, wait); ++ if (!_mali_profiling_global_stream_queue_list_if_empty()) ++ return POLLIN; ++ return 0; ++} + -+ page_off = offset >> PAGE_SHIFT; -+ offset &= ~PAGE_MASK; -+ page_count = (size + offset + (PAGE_SIZE - 1)) >> PAGE_SHIFT; -+ cpu_pa = kbase_get_cpu_phy_pages(reg); -+ gpu_pa = kbase_get_gpu_phy_pages(reg); ++static int _mali_profiling_stream_release(struct inode *inode, struct file *filp) ++{ ++ _mali_osk_atomic_init(&stream_fd_if_used, 0); ++ return 0; ++} + -+ if (page_off > reg->nr_pages || -+ page_off + page_count > reg->nr_pages) { -+ /* Sync overflows the region */ -+ err = -EINVAL; -+ goto out_unlock; -+ } ++/* The funs for control packet and stream data.*/ ++static void _mali_profiling_set_packet_size(unsigned char *const buf, const u32 size) ++{ ++ u32 i; + -+ /* Sync first page */ -+ if (as_phys_addr_t(cpu_pa[page_off])) { -+ size_t sz = MIN(((size_t) PAGE_SIZE - offset), size); ++ for (i = 0; i < sizeof(size); ++i) ++ buf[i] = (size >> 8 * i) & 0xFF; ++} + -+ kbase_sync_single(kctx, cpu_pa[page_off], gpu_pa[page_off], -+ offset, sz, sync_fn); -+ } ++static u32 _mali_profiling_get_packet_size(unsigned char *const buf) ++{ ++ u32 i; ++ u32 size = 0; ++ for (i = 0; i < sizeof(size); ++i) ++ size |= (u32)buf[i] << 8 * i; ++ return size; ++} + -+ /* Sync middle pages (if any) */ -+ for (i = 1; page_count > 2 && i < page_count - 1; i++) { -+ /* we grow upwards, so bail on first non-present page */ -+ if (!as_phys_addr_t(cpu_pa[page_off + i])) -+ break; ++static u32 _mali_profiling_read_packet_int(unsigned char *const buf, u32 *const pos, u32 const packet_size) ++{ ++ u64 int_value = 0; ++ u8 shift = 0; ++ u8 byte_value = ~0; + -+ kbase_sync_single(kctx, cpu_pa[page_off + i], -+ gpu_pa[page_off + i], 0, PAGE_SIZE, sync_fn); ++ while ((byte_value & 0x80) != 0) { ++ if ((*pos) >= packet_size) ++ return -1; ++ byte_value = buf[*pos]; ++ *pos += 1; ++ int_value |= (u32)(byte_value & 0x7f) << shift; ++ shift += 7; + } + -+ /* Sync last page (if any) */ -+ if (page_count > 1 && -+ as_phys_addr_t(cpu_pa[page_off + page_count - 1])) { -+ size_t sz = ((start + size - 1) & ~PAGE_MASK) + 1; -+ -+ kbase_sync_single(kctx, cpu_pa[page_off + page_count - 1], -+ gpu_pa[page_off + page_count - 1], 0, sz, -+ sync_fn); ++ if (shift < 8 * sizeof(int_value) && (byte_value & 0x40) != 0) { ++ int_value |= -(1 << shift); + } + -+out_unlock: -+ kbase_gpu_vm_unlock(kctx); -+ kbase_os_mem_map_unlock(kctx); -+ return err; ++ return int_value; +} + -+int kbase_sync_now(struct kbase_context *kctx, struct basep_syncset *sset) ++static u32 _mali_profiling_pack_int(u8 *const buf, u32 const buf_size, u32 const pos, s32 value) +{ -+ int err = -EINVAL; -+ -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ KBASE_DEBUG_ASSERT(sset != NULL); -+ -+ if (sset->mem_handle.basep.handle & ~PAGE_MASK) { -+ dev_warn(kctx->kbdev->dev, -+ "mem_handle: passed parameter is invalid"); -+ return -EINVAL; -+ } -+ -+ switch (sset->type) { -+ case BASE_SYNCSET_OP_MSYNC: -+ err = kbase_do_syncset(kctx, sset, KBASE_SYNC_TO_DEVICE); -+ break; ++ u32 add_bytes = 0; ++ int more = 1; ++ while (more) { ++ /* low order 7 bits of val */ ++ char byte_value = value & 0x7f; ++ value >>= 7; + -+ case BASE_SYNCSET_OP_CSYNC: -+ err = kbase_do_syncset(kctx, sset, KBASE_SYNC_TO_CPU); -+ break; ++ if ((value == 0 && (byte_value & 0x40) == 0) || (value == -1 && (byte_value & 0x40) != 0)) { ++ more = 0; ++ } else { ++ byte_value |= 0x80; ++ } + -+ default: -+ dev_warn(kctx->kbdev->dev, "Unknown msync op %d\n", sset->type); -+ break; ++ if ((pos + add_bytes) >= buf_size) ++ return 0; ++ buf[pos + add_bytes] = byte_value; ++ add_bytes++; + } + -+ return err; ++ return add_bytes; +} + -+KBASE_EXPORT_TEST_API(kbase_sync_now); -+ -+/* vm lock must be held */ -+int kbase_mem_free_region(struct kbase_context *kctx, struct kbase_va_region *reg) ++static int _mali_profiling_pack_long(uint8_t *const buf, u32 const buf_size, u32 const pos, s64 val) +{ -+ int err; -+ -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ KBASE_DEBUG_ASSERT(NULL != reg); -+ lockdep_assert_held(&kctx->reg_lock); -+ -+ /* -+ * Unlink the physical allocation before unmaking it evictable so -+ * that the allocation isn't grown back to its last backed size -+ * as we're going to unmap it anyway. -+ */ -+ reg->cpu_alloc->reg = NULL; -+ if (reg->cpu_alloc != reg->gpu_alloc) -+ reg->gpu_alloc->reg = NULL; ++ int add_bytes = 0; ++ int more = 1; ++ while (more) { ++ /* low order 7 bits of x */ ++ char byte_value = val & 0x7f; ++ val >>= 7; + -+ /* -+ * If a region has been made evictable then we must unmake it -+ * before trying to free it. -+ * If the memory hasn't been reclaimed it will be unmapped and freed -+ * below, if it has been reclaimed then the operations below are no-ops. -+ */ -+ if (reg->flags & KBASE_REG_DONT_NEED) { -+ KBASE_DEBUG_ASSERT(reg->cpu_alloc->type == -+ KBASE_MEM_TYPE_NATIVE); -+ kbase_mem_evictable_unmake(reg->gpu_alloc); -+ } ++ if ((val == 0 && (byte_value & 0x40) == 0) || (val == -1 && (byte_value & 0x40) != 0)) { ++ more = 0; ++ } else { ++ byte_value |= 0x80; ++ } + -+ err = kbase_gpu_munmap(kctx, reg); -+ if (err) { -+ dev_warn(reg->kctx->kbdev->dev, "Could not unmap from the GPU...\n"); -+ goto out; ++ MALI_DEBUG_ASSERT((pos + add_bytes) < buf_size); ++ buf[pos + add_bytes] = byte_value; ++ add_bytes++; + } + -+ /* This will also free the physical pages */ -+ kbase_free_alloced_region(reg); -+ -+ out: -+ return err; ++ return add_bytes; +} + -+KBASE_EXPORT_TEST_API(kbase_mem_free_region); -+ -+/** -+ * @brief Free the region from the GPU and unregister it. -+ * -+ * This function implements the free operation on a memory segment. -+ * It will loudly fail if called with outstanding mappings. -+ */ -+int kbase_mem_free(struct kbase_context *kctx, u64 gpu_addr) ++static void _mali_profiling_stream_add_counter(mali_profiling_stream *profiling_stream, s64 current_time, u32 key, u32 counter_value) +{ -+ int err = 0; -+ struct kbase_va_region *reg; ++ u32 add_size = STREAM_HEADER_SIZE; ++ MALI_DEBUG_ASSERT_POINTER(profiling_stream); ++ MALI_DEBUG_ASSERT((profiling_stream->used_size) < MALI_PROFILING_STREAM_BUFFER_SIZE); + -+ KBASE_DEBUG_ASSERT(kctx != NULL); ++ profiling_stream->data[profiling_stream->used_size] = STREAM_HEADER_COUNTER_VALUE; + -+ if ((gpu_addr & ~PAGE_MASK) && (gpu_addr >= PAGE_SIZE)) { -+ dev_warn(kctx->kbdev->dev, "kbase_mem_free: gpu_addr parameter is invalid"); -+ return -EINVAL; -+ } ++ add_size += _mali_profiling_pack_long(profiling_stream->data, MALI_PROFILING_STREAM_BUFFER_SIZE, ++ profiling_stream->used_size + add_size, current_time); ++ add_size += _mali_profiling_pack_int(profiling_stream->data, MALI_PROFILING_STREAM_BUFFER_SIZE, ++ profiling_stream->used_size + add_size, (s32)0); ++ add_size += _mali_profiling_pack_int(profiling_stream->data, MALI_PROFILING_STREAM_BUFFER_SIZE, ++ profiling_stream->used_size + add_size, (s32)key); ++ add_size += _mali_profiling_pack_int(profiling_stream->data, MALI_PROFILING_STREAM_BUFFER_SIZE, ++ profiling_stream->used_size + add_size, (s32)counter_value); + -+ if (0 == gpu_addr) { -+ dev_warn(kctx->kbdev->dev, "gpu_addr 0 is reserved for the ringbuffer and it's an error to try to free it using kbase_mem_free\n"); -+ return -EINVAL; -+ } -+ kbase_gpu_vm_lock(kctx); ++ _mali_profiling_set_packet_size(profiling_stream->data + profiling_stream->used_size + 1, ++ add_size - STREAM_HEADER_SIZE); + -+ if (gpu_addr >= BASE_MEM_COOKIE_BASE && -+ gpu_addr < BASE_MEM_FIRST_FREE_ADDRESS) { -+ int cookie = PFN_DOWN(gpu_addr - BASE_MEM_COOKIE_BASE); ++ profiling_stream->used_size += add_size; ++} + -+ reg = kctx->pending_regions[cookie]; -+ if (!reg) { -+ err = -EINVAL; -+ goto out_unlock; -+ } ++/* The callback function for sampling timer.*/ ++static enum hrtimer_restart _mali_profiling_sampling_counters(struct hrtimer *timer) ++{ ++ u32 counter_index; ++ s64 current_time; ++ MALI_DEBUG_ASSERT_POINTER(global_mali_profiling_counters); ++ MALI_DEBUG_ASSERT_POINTER(global_mali_stream_list); + -+ /* ask to unlink the cookie as we'll free it */ ++ MALI_DEBUG_ASSERT(NULL == mali_counter_stream); ++ if (_MALI_OSK_ERR_OK == _mali_profiling_global_stream_list_dequeue( ++ &global_mali_stream_list->free_list, &mali_counter_stream)) { + -+ kctx->pending_regions[cookie] = NULL; -+ kctx->cookies |= (1UL << cookie); ++ MALI_DEBUG_ASSERT_POINTER(mali_counter_stream); ++ MALI_DEBUG_ASSERT(0 == mali_counter_stream->used_size); + -+ kbase_free_alloced_region(reg); -+ } else { -+ /* A real GPU va */ -+ /* Validate the region */ -+ reg = kbase_region_tracker_find_region_base_address(kctx, gpu_addr); -+ if (!reg || (reg->flags & KBASE_REG_FREE)) { -+ dev_warn(kctx->kbdev->dev, "kbase_mem_free called with nonexistent gpu_addr 0x%llX", -+ gpu_addr); -+ err = -EINVAL; -+ goto out_unlock; -+ } ++ /* Capture l2 cache counter values if enabled */ ++ if (MALI_TRUE == l2_cache_counter_if_enabled) { ++ int i, j = 0; ++ _mali_profiling_l2_counter_values l2_counters_values; ++ _mali_profiling_get_l2_counters(&l2_counters_values); + -+ if ((reg->flags & KBASE_REG_ZONE_MASK) == KBASE_REG_ZONE_SAME_VA) { -+ /* SAME_VA must be freed through munmap */ -+ dev_warn(kctx->kbdev->dev, "%s called on SAME_VA memory 0x%llX", __func__, -+ gpu_addr); -+ err = -EINVAL; -+ goto out_unlock; ++ for (i = COUNTER_L2_0_C0; i <= COUNTER_L2_2_C1; i++) { ++ if (0 == (j % 2)) ++ _mali_osk_profiling_record_global_counters(i, l2_counters_values.cores[j / 2].value0); ++ else ++ _mali_osk_profiling_record_global_counters(i, l2_counters_values.cores[j / 2].value1); ++ j++; ++ } + } -+ err = kbase_mem_free_region(kctx, reg); -+ } + -+ out_unlock: -+ kbase_gpu_vm_unlock(kctx); -+ return err; -+} -+ -+KBASE_EXPORT_TEST_API(kbase_mem_free); -+ -+int kbase_update_region_flags(struct kbase_context *kctx, -+ struct kbase_va_region *reg, unsigned long flags) -+{ -+ KBASE_DEBUG_ASSERT(NULL != reg); -+ KBASE_DEBUG_ASSERT((flags & ~((1ul << BASE_MEM_FLAGS_NR_BITS) - 1)) == 0); ++ current_time = (s64)_mali_osk_boot_time_get_ns(); + -+ reg->flags |= kbase_cache_enabled(flags, reg->nr_pages); -+ /* all memory is now growable */ -+ reg->flags |= KBASE_REG_GROWABLE; ++ /* Add all enabled counter values into stream */ ++ for (counter_index = 0; counter_index < num_global_mali_profiling_counters; counter_index++) { ++ /* No need to sample these couners here. */ ++ if (global_mali_profiling_counters[counter_index].enabled) { ++ if ((global_mali_profiling_counters[counter_index].counter_id >= FIRST_MEM_COUNTER && ++ global_mali_profiling_counters[counter_index].counter_id <= LAST_MEM_COUNTER) ++ || (global_mali_profiling_counters[counter_index].counter_id == COUNTER_VP_ACTIVITY) ++ || (global_mali_profiling_counters[counter_index].counter_id == COUNTER_FP_ACTIVITY) ++ || (global_mali_profiling_counters[counter_index].counter_id == COUNTER_FILMSTRIP)) { + -+ if (flags & BASE_MEM_GROW_ON_GPF) -+ reg->flags |= KBASE_REG_PF_GROW; ++ continue; ++ } + -+ if (flags & BASE_MEM_PROT_CPU_WR) -+ reg->flags |= KBASE_REG_CPU_WR; ++ if (global_mali_profiling_counters[counter_index].counter_id >= COUNTER_L2_0_C0 && ++ global_mali_profiling_counters[counter_index].counter_id <= COUNTER_L2_2_C1) { + -+ if (flags & BASE_MEM_PROT_CPU_RD) -+ reg->flags |= KBASE_REG_CPU_RD; ++ u32 prev_val = global_mali_profiling_counters[counter_index].prev_counter_value; + -+ if (flags & BASE_MEM_PROT_GPU_WR) -+ reg->flags |= KBASE_REG_GPU_WR; ++ _mali_profiling_stream_add_counter(mali_counter_stream, current_time, global_mali_profiling_counters[counter_index].key, ++ global_mali_profiling_counters[counter_index].current_counter_value - prev_val); + -+ if (flags & BASE_MEM_PROT_GPU_RD) -+ reg->flags |= KBASE_REG_GPU_RD; ++ prev_val = global_mali_profiling_counters[counter_index].current_counter_value; + -+ if (0 == (flags & BASE_MEM_PROT_GPU_EX)) -+ reg->flags |= KBASE_REG_GPU_NX; ++ global_mali_profiling_counters[counter_index].prev_counter_value = prev_val; ++ } else { + -+ if (!kbase_device_is_cpu_coherent(kctx->kbdev)) { -+ if (flags & BASE_MEM_COHERENT_SYSTEM_REQUIRED) -+ return -EINVAL; -+ } else if (flags & (BASE_MEM_COHERENT_SYSTEM | -+ BASE_MEM_COHERENT_SYSTEM_REQUIRED)) { -+ reg->flags |= KBASE_REG_SHARE_BOTH; ++ if (global_mali_profiling_counters[counter_index].counter_id == COUNTER_TOTAL_ALLOC_PAGES) { ++ u32 total_alloc_mem = _mali_ukk_report_memory_usage(); ++ global_mali_profiling_counters[counter_index].current_counter_value = total_alloc_mem / _MALI_OSK_MALI_PAGE_SIZE; ++ } ++ _mali_profiling_stream_add_counter(mali_counter_stream, current_time, global_mali_profiling_counters[counter_index].key, ++ global_mali_profiling_counters[counter_index].current_counter_value); ++ if (global_mali_profiling_counters[counter_index].counter_id < FIRST_SPECIAL_COUNTER) ++ global_mali_profiling_counters[counter_index].current_counter_value = 0; ++ } ++ } ++ } ++ _mali_profiling_global_stream_list_queue(&global_mali_stream_list->queue_list, mali_counter_stream); ++ mali_counter_stream = NULL; ++ } else { ++ MALI_DEBUG_PRINT(1, ("Not enough mali profiling stream buffer!\n")); + } + -+ if (!(reg->flags & KBASE_REG_SHARE_BOTH) && -+ flags & BASE_MEM_COHERENT_LOCAL) { -+ reg->flags |= KBASE_REG_SHARE_IN; -+ } ++ wake_up_interruptible(&stream_fd_wait_queue); + -+ /* Set up default MEMATTR usage */ -+ if (kctx->kbdev->system_coherency == COHERENCY_ACE && -+ (reg->flags & KBASE_REG_SHARE_BOTH)) { -+ reg->flags |= -+ KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_DEFAULT_ACE); -+ } else { -+ reg->flags |= -+ KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_DEFAULT); ++ /*Enable the sampling timer again*/ ++ if (0 != num_counters_enabled && 0 != profiling_sample_rate) { ++ hrtimer_forward_now(&profiling_sampling_timer, ns_to_ktime(profiling_sample_rate)); ++ return HRTIMER_RESTART; + } -+ -+ return 0; ++ return HRTIMER_NORESTART; +} + -+int kbase_alloc_phy_pages_helper( -+ struct kbase_mem_phy_alloc *alloc, -+ size_t nr_pages_requested) ++static void _mali_profiling_sampling_core_activity_switch(int counter_id, int core, u32 activity, u32 pid) +{ -+ int new_page_count __maybe_unused; -+ size_t old_page_count = alloc->nents; -+ size_t nr_left = nr_pages_requested; -+ int res; -+ struct kbase_context *kctx; -+ struct tagged_addr *tp; -+ -+ KBASE_DEBUG_ASSERT(alloc->type == KBASE_MEM_TYPE_NATIVE); -+ KBASE_DEBUG_ASSERT(alloc->imported.kctx); -+ -+ kctx = alloc->imported.kctx; -+ -+ if (nr_pages_requested == 0) -+ goto done; /*nothing to do*/ -+ -+ new_page_count = kbase_atomic_add_pages( -+ nr_pages_requested, &kctx->used_pages); -+ kbase_atomic_add_pages(nr_pages_requested, -+ &kctx->kbdev->memdev.used_pages); ++ unsigned long irq_flags; + -+ /* Increase mm counters before we allocate pages so that this -+ * allocation is visible to the OOM killer */ -+ kbase_process_page_usage_inc(kctx, nr_pages_requested); ++ spin_lock_irqsave(&mali_activity_lock, irq_flags); ++ if (activity == 0) ++ mali_activity_cores_num--; ++ else ++ mali_activity_cores_num++; ++ spin_unlock_irqrestore(&mali_activity_lock, irq_flags); + -+ tp = alloc->pages + old_page_count; ++ if (NULL != global_mali_profiling_counters) { ++ int i ; ++ for (i = 0; i < num_global_mali_profiling_counters; i++) { ++ if (counter_id == global_mali_profiling_counters[i].counter_id && global_mali_profiling_counters[i].enabled) { ++ u64 current_time = _mali_osk_boot_time_get_ns(); ++ u32 add_size = STREAM_HEADER_SIZE; + -+#ifdef CONFIG_MALI_2MB_ALLOC -+ /* Check if we have enough pages requested so we can allocate a large -+ * page (512 * 4KB = 2MB ) -+ */ -+ if (nr_left >= (SZ_2M / SZ_4K)) { -+ int nr_lp = nr_left / (SZ_2M / SZ_4K); ++ if (NULL != mali_core_activity_stream) { ++ if ((mali_core_activity_stream_dequeue_time + MALI_PROFILING_STREAM_HOLD_TIME < current_time) || ++ (MALI_PROFILING_STREAM_DATA_DEFAULT_SIZE > MALI_PROFILING_STREAM_BUFFER_SIZE ++ - mali_core_activity_stream->used_size)) { ++ _mali_profiling_global_stream_list_queue(&global_mali_stream_list->queue_list, mali_core_activity_stream); ++ mali_core_activity_stream = NULL; ++ wake_up_interruptible(&stream_fd_wait_queue); ++ } ++ } + -+ res = kbase_mem_pool_alloc_pages(&kctx->lp_mem_pool, -+ nr_lp * (SZ_2M / SZ_4K), -+ tp, -+ true); ++ if (NULL == mali_core_activity_stream) { ++ if (_MALI_OSK_ERR_OK == _mali_profiling_global_stream_list_dequeue( ++ &global_mali_stream_list->free_list, &mali_core_activity_stream)) { ++ mali_core_activity_stream_dequeue_time = current_time; ++ } else { ++ MALI_DEBUG_PRINT(1, ("Not enough mali profiling stream buffer!\n")); ++ wake_up_interruptible(&stream_fd_wait_queue); ++ break; ++ } + -+ if (res > 0) { -+ nr_left -= res; -+ tp += res; -+ } ++ } + -+ if (nr_left) { -+ struct kbase_sub_alloc *sa, *temp_sa; ++ mali_core_activity_stream->data[mali_core_activity_stream->used_size] = STREAM_HEADER_CORE_ACTIVITY; + -+ mutex_lock(&kctx->mem_partials_lock); ++ add_size += _mali_profiling_pack_long(mali_core_activity_stream->data, ++ MALI_PROFILING_STREAM_BUFFER_SIZE, mali_core_activity_stream->used_size + add_size, (s64)current_time); ++ add_size += _mali_profiling_pack_int(mali_core_activity_stream->data, ++ MALI_PROFILING_STREAM_BUFFER_SIZE, mali_core_activity_stream->used_size + add_size, core); ++ add_size += _mali_profiling_pack_int(mali_core_activity_stream->data, ++ MALI_PROFILING_STREAM_BUFFER_SIZE, mali_core_activity_stream->used_size + add_size, (s32)global_mali_profiling_counters[i].key); ++ add_size += _mali_profiling_pack_int(mali_core_activity_stream->data, ++ MALI_PROFILING_STREAM_BUFFER_SIZE, mali_core_activity_stream->used_size + add_size, activity); ++ add_size += _mali_profiling_pack_int(mali_core_activity_stream->data, ++ MALI_PROFILING_STREAM_BUFFER_SIZE, mali_core_activity_stream->used_size + add_size, pid); + -+ list_for_each_entry_safe(sa, temp_sa, -+ &kctx->mem_partials, link) { -+ int pidx = 0; ++ _mali_profiling_set_packet_size(mali_core_activity_stream->data + mali_core_activity_stream->used_size + 1, ++ add_size - STREAM_HEADER_SIZE); + -+ while (nr_left) { -+ pidx = find_next_zero_bit(sa->sub_pages, -+ SZ_2M / SZ_4K, -+ pidx); -+ bitmap_set(sa->sub_pages, pidx, 1); -+ *tp++ = as_tagged_tag(page_to_phys(sa->page + -+ pidx), -+ FROM_PARTIAL); -+ nr_left--; ++ mali_core_activity_stream->used_size += add_size; + -+ if (bitmap_full(sa->sub_pages, SZ_2M / SZ_4K)) { -+ /* unlink from partial list when full */ -+ list_del_init(&sa->link); -+ break; -+ } ++ if (0 == mali_activity_cores_num) { ++ _mali_profiling_global_stream_list_queue(&global_mali_stream_list->queue_list, mali_core_activity_stream); ++ mali_core_activity_stream = NULL; ++ wake_up_interruptible(&stream_fd_wait_queue); + } ++ ++ break; + } -+ mutex_unlock(&kctx->mem_partials_lock); + } ++ } ++} + -+ /* only if we actually have a chunk left <512. If more it indicates -+ * that we couldn't allocate a 2MB above, so no point to retry here. -+ */ -+ if (nr_left > 0 && nr_left < (SZ_2M / SZ_4K)) { -+ /* create a new partial and suballocate the rest from it */ -+ struct page *np = NULL; -+ -+ do { -+ int err; ++static mali_bool _mali_profiling_global_counters_init(void) ++{ ++ int core_id, counter_index, counter_number, counter_id; ++ u32 num_l2_cache_cores; ++ u32 num_pp_cores; ++ u32 num_gp_cores = 1; + -+ np = kbase_mem_pool_alloc(&kctx->lp_mem_pool); -+ if (np) -+ break; -+ err = kbase_mem_pool_grow(&kctx->lp_mem_pool, 1); -+ if (err) -+ break; -+ } while (1); ++ MALI_DEBUG_ASSERT(NULL == global_mali_profiling_counters); ++ num_pp_cores = mali_pp_get_glob_num_pp_cores(); ++ num_l2_cache_cores = mali_l2_cache_core_get_glob_num_l2_cores(); + -+ if (np) { -+ int i; -+ struct kbase_sub_alloc *sa; -+ struct page *p; ++ num_global_mali_profiling_counters = 3 * (num_gp_cores + num_pp_cores) + 2 * num_l2_cache_cores ++ + MALI_PROFILING_SW_COUNTERS_NUM ++ + MALI_PROFILING_SPECIAL_COUNTERS_NUM ++ + MALI_PROFILING_MEM_COUNTERS_NUM; ++ global_mali_profiling_counters = _mali_osk_calloc(num_global_mali_profiling_counters, sizeof(mali_profiling_counter)); + -+ sa = kmalloc(sizeof(*sa), GFP_KERNEL); -+ if (!sa) { -+ kbase_mem_pool_free(&kctx->lp_mem_pool, np, false); -+ goto no_new_partial; -+ } ++ if (NULL == global_mali_profiling_counters) ++ return MALI_FALSE; + -+ /* store pointers back to the control struct */ -+ np->lru.next = (void *)sa; -+ for (p = np; p < np + SZ_2M / SZ_4K; p++) -+ p->lru.prev = (void *)np; -+ INIT_LIST_HEAD(&sa->link); -+ bitmap_zero(sa->sub_pages, SZ_2M / SZ_4K); -+ sa->page = np; ++ counter_index = 0; ++ /*Vertex processor counters */ ++ for (core_id = 0; core_id < num_gp_cores; core_id ++) { ++ global_mali_profiling_counters[counter_index].counter_id = ACTIVITY_VP_0 + core_id; ++ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, ++ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_VP_%d_active", mali_name, core_id); + -+ for (i = 0; i < nr_left; i++) -+ *tp++ = as_tagged_tag(page_to_phys(np + i), FROM_PARTIAL); ++ for (counter_number = 0; counter_number < 2; counter_number++) { ++ counter_index++; ++ global_mali_profiling_counters[counter_index].counter_id = COUNTER_VP_0_C0 + (2 * core_id) + counter_number; ++ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, ++ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_VP_%d_cnt%d", mali_name, core_id, counter_number); ++ } ++ } + -+ bitmap_set(sa->sub_pages, 0, nr_left); -+ nr_left = 0; ++ /* Fragment processors' counters */ ++ for (core_id = 0; core_id < num_pp_cores; core_id++) { ++ counter_index++; ++ global_mali_profiling_counters[counter_index].counter_id = ACTIVITY_FP_0 + core_id; ++ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, ++ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_FP_%d_active", mali_name, core_id); + -+ /* expose for later use */ -+ mutex_lock(&kctx->mem_partials_lock); -+ list_add(&sa->link, &kctx->mem_partials); -+ mutex_unlock(&kctx->mem_partials_lock); -+ } ++ for (counter_number = 0; counter_number < 2; counter_number++) { ++ counter_index++; ++ global_mali_profiling_counters[counter_index].counter_id = COUNTER_FP_0_C0 + (2 * core_id) + counter_number; ++ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, ++ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_FP_%d_cnt%d", mali_name, core_id, counter_number); + } + } -+no_new_partial: -+#endif + -+ if (nr_left) { -+ res = kbase_mem_pool_alloc_pages(&kctx->mem_pool, -+ nr_left, -+ tp, -+ false); -+ if (res <= 0) -+ goto alloc_failed; ++ /* L2 Cache counters */ ++ for (core_id = 0; core_id < num_l2_cache_cores; core_id++) { ++ for (counter_number = 0; counter_number < 2; counter_number++) { ++ counter_index++; ++ global_mali_profiling_counters[counter_index].counter_id = COUNTER_L2_0_C0 + (2 * core_id) + counter_number; ++ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, ++ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_L2_%d_cnt%d", mali_name, core_id, counter_number); ++ } + } + -+ /* -+ * Request a zone cache update, this scans only the new pages an -+ * appends their information to the zone cache. if the update -+ * fails then clear the cache so we fall-back to doing things -+ * page by page. -+ */ -+ if (kbase_zone_cache_update(alloc, old_page_count) != 0) -+ kbase_zone_cache_clear(alloc); ++ /* Now set up the software counter entries */ ++ for (counter_id = FIRST_SW_COUNTER; counter_id <= LAST_SW_COUNTER; counter_id++) { ++ counter_index++; + -+ KBASE_TLSTREAM_AUX_PAGESALLOC( -+ kctx->id, -+ (u64)new_page_count); ++ if (0 == first_sw_counter_index) ++ first_sw_counter_index = counter_index; + -+ alloc->nents += nr_pages_requested; -+done: -+ return 0; ++ global_mali_profiling_counters[counter_index].counter_id = counter_id; ++ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, ++ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_SW_%d", mali_name, counter_id - FIRST_SW_COUNTER); ++ } + -+alloc_failed: -+ /* rollback needed if got one or more 2MB but failed later */ -+ if (nr_left != nr_pages_requested) -+ kbase_mem_pool_free_pages(&kctx->lp_mem_pool, -+ nr_pages_requested - nr_left, -+ alloc->pages + old_page_count, -+ false, -+ false); ++ /* Now set up the special counter entries */ ++ for (counter_id = FIRST_SPECIAL_COUNTER; counter_id <= LAST_SPECIAL_COUNTER; counter_id++) { + -+ kbase_process_page_usage_dec(kctx, nr_pages_requested); -+ kbase_atomic_sub_pages(nr_pages_requested, &kctx->used_pages); -+ kbase_atomic_sub_pages(nr_pages_requested, -+ &kctx->kbdev->memdev.used_pages); ++ counter_index++; ++ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, ++ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_%s", ++ mali_name, _mali_special_counter_descriptions[counter_id - FIRST_SPECIAL_COUNTER]); + -+ return -ENOMEM; -+} ++ global_mali_profiling_counters[counter_index].counter_id = counter_id; ++ } + -+static void free_partial(struct kbase_context *kctx, struct tagged_addr tp) -+{ -+ struct page *p, *head_page; -+ struct kbase_sub_alloc *sa; ++ /* Now set up the mem counter entries*/ ++ for (counter_id = FIRST_MEM_COUNTER; counter_id <= LAST_MEM_COUNTER; counter_id++) { + -+ p = phys_to_page(as_phys_addr_t(tp)); -+ head_page = (struct page *)p->lru.prev; -+ sa = (struct kbase_sub_alloc *)head_page->lru.next; -+ mutex_lock(&kctx->mem_partials_lock); -+ clear_bit(p - head_page, sa->sub_pages); -+ if (bitmap_empty(sa->sub_pages, SZ_2M / SZ_4K)) { -+ list_del(&sa->link); -+ kbase_mem_pool_free(&kctx->lp_mem_pool, head_page, true); -+ kfree(sa); -+ } else if (bitmap_weight(sa->sub_pages, SZ_2M / SZ_4K) == -+ SZ_2M / SZ_4K - 1) { -+ /* expose the partial again */ -+ list_add(&sa->link, &kctx->mem_partials); ++ counter_index++; ++ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, ++ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_%s", ++ mali_name, _mali_mem_counter_descriptions[counter_id - FIRST_MEM_COUNTER]); ++ ++ global_mali_profiling_counters[counter_index].counter_id = counter_id; + } -+ mutex_unlock(&kctx->mem_partials_lock); -+} + -+int kbase_free_phy_pages_helper( -+ struct kbase_mem_phy_alloc *alloc, -+ size_t nr_pages_to_free) -+{ -+ struct kbase_context *kctx = alloc->imported.kctx; -+ bool syncback; -+ bool reclaimed = (alloc->evicted != 0); -+ struct tagged_addr *start_free; -+ int new_page_count __maybe_unused; -+ size_t freed = 0; ++ MALI_DEBUG_ASSERT((counter_index + 1) == num_global_mali_profiling_counters); + -+ KBASE_DEBUG_ASSERT(alloc->type == KBASE_MEM_TYPE_NATIVE); -+ KBASE_DEBUG_ASSERT(alloc->imported.kctx); -+ KBASE_DEBUG_ASSERT(alloc->nents >= nr_pages_to_free); ++ return MALI_TRUE; ++} + -+ /* early out if nothing to do */ -+ if (0 == nr_pages_to_free) -+ return 0; ++void _mali_profiling_notification_mem_counter(struct mali_session_data *session, u32 counter_id, u32 key, int enable) ++{ + -+ start_free = alloc->pages + alloc->nents - nr_pages_to_free; ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ syncback = alloc->properties & KBASE_MEM_PHY_ALLOC_ACCESSED_CACHED; ++ if (NULL != session) { ++ _mali_osk_notification_t *notification; ++ _mali_osk_notification_queue_t *queue; + -+ /* pad start_free to a valid start location */ -+ while (nr_pages_to_free && is_huge(*start_free) && -+ !is_huge_head(*start_free)) { -+ nr_pages_to_free--; -+ start_free++; -+ } ++ queue = session->ioctl_queue; ++ MALI_DEBUG_ASSERT(NULL != queue); + -+ /* -+ * Clear the zone cache, we don't expect JIT allocations to be -+ * shrunk in parts so there is no point trying to optimize for that -+ * by scanning for the changes caused by freeing this memory and -+ * updating the existing cache entries. -+ */ -+ kbase_zone_cache_clear(alloc); ++ notification = _mali_osk_notification_create(_MALI_NOTIFICATION_ANNOTATE_PROFILING_MEM_COUNTER, ++ sizeof(_mali_uk_annotate_profiling_mem_counter_s)); + ++ if (NULL != notification) { ++ _mali_uk_annotate_profiling_mem_counter_s *data = notification->result_buffer; ++ data->counter_id = counter_id; ++ data->key = key; ++ data->enable = enable; + -+ while (nr_pages_to_free) { -+ if (is_huge_head(*start_free)) { -+ /* This is a 2MB entry, so free all the 512 pages that -+ * it points to -+ */ -+ kbase_mem_pool_free_pages(&kctx->lp_mem_pool, -+ 512, -+ start_free, -+ syncback, -+ reclaimed); -+ nr_pages_to_free -= 512; -+ start_free += 512; -+ freed += 512; -+ } else if (is_partial(*start_free)) { -+ free_partial(kctx, *start_free); -+ nr_pages_to_free--; -+ start_free++; -+ freed++; ++ _mali_osk_notification_queue_send(queue, notification); + } else { -+ struct tagged_addr *local_end_free; -+ -+ local_end_free = start_free; -+ while (nr_pages_to_free && -+ !is_huge(*local_end_free) && -+ !is_partial(*local_end_free)) { -+ local_end_free++; -+ nr_pages_to_free--; -+ } -+ kbase_mem_pool_free_pages(&kctx->mem_pool, -+ local_end_free - start_free, -+ start_free, -+ syncback, -+ reclaimed); -+ freed += local_end_free - start_free; -+ start_free += local_end_free - start_free; ++ MALI_PRINT_ERROR(("Failed to create notification object!\n")); + } ++ } else { ++ MALI_PRINT_ERROR(("Failed to find the right session!\n")); + } -+ -+ alloc->nents -= freed; -+ -+ /* -+ * If the allocation was not evicted (i.e. evicted == 0) then -+ * the page accounting needs to be done. -+ */ -+ if (!reclaimed) { -+ kbase_process_page_usage_dec(kctx, freed); -+ new_page_count = kbase_atomic_sub_pages(freed, -+ &kctx->used_pages); -+ kbase_atomic_sub_pages(freed, -+ &kctx->kbdev->memdev.used_pages); -+ -+ KBASE_TLSTREAM_AUX_PAGESALLOC( -+ kctx->id, -+ (u64)new_page_count); -+ } -+ -+ return 0; +} + -+void kbase_mem_kref_free(struct kref *kref) ++void _mali_profiling_notification_enable(struct mali_session_data *session, u32 sampling_rate, int enable) +{ -+ struct kbase_mem_phy_alloc *alloc; ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ alloc = container_of(kref, struct kbase_mem_phy_alloc, kref); ++ if (NULL != session) { ++ _mali_osk_notification_t *notification; ++ _mali_osk_notification_queue_t *queue; + -+ switch (alloc->type) { -+ case KBASE_MEM_TYPE_NATIVE: { -+ WARN_ON(!alloc->imported.kctx); -+ /* -+ * The physical allocation must have been removed from the -+ * eviction list before trying to free it. -+ */ -+ WARN_ON(!list_empty(&alloc->evict_node)); -+ kbase_free_phy_pages_helper(alloc, alloc->nents); -+ break; -+ } -+ case KBASE_MEM_TYPE_ALIAS: { -+ /* just call put on the underlying phy allocs */ -+ size_t i; -+ struct kbase_aliased *aliased; ++ queue = session->ioctl_queue; ++ MALI_DEBUG_ASSERT(NULL != queue); + -+ aliased = alloc->imported.alias.aliased; -+ if (aliased) { -+ for (i = 0; i < alloc->imported.alias.nents; i++) -+ if (aliased[i].alloc) -+ kbase_mem_phy_alloc_put(aliased[i].alloc); -+ vfree(aliased); -+ } -+ break; -+ } -+ case KBASE_MEM_TYPE_RAW: -+ /* raw pages, external cleanup */ -+ break; -+ #ifdef CONFIG_UMP -+ case KBASE_MEM_TYPE_IMPORTED_UMP: -+ ump_dd_release(alloc->imported.ump_handle); -+ break; -+#endif -+#ifdef CONFIG_DMA_SHARED_BUFFER -+ case KBASE_MEM_TYPE_IMPORTED_UMM: -+ dma_buf_detach(alloc->imported.umm.dma_buf, -+ alloc->imported.umm.dma_attachment); -+ dma_buf_put(alloc->imported.umm.dma_buf); -+ break; -+#endif -+ case KBASE_MEM_TYPE_IMPORTED_USER_BUF: -+ if (alloc->imported.user_buf.mm) -+ mmdrop(alloc->imported.user_buf.mm); -+ kfree(alloc->imported.user_buf.pages); -+ break; -+ case KBASE_MEM_TYPE_TB:{ -+ void *tb; ++ notification = _mali_osk_notification_create(_MALI_NOTIFICATION_ANNOTATE_PROFILING_ENABLE, ++ sizeof(_mali_uk_annotate_profiling_enable_s)); + -+ tb = alloc->imported.kctx->jctx.tb; -+ kbase_device_trace_buffer_uninstall(alloc->imported.kctx); -+ vfree(tb); -+ break; -+ } -+ default: -+ WARN(1, "Unexecpted free of type %d\n", alloc->type); -+ break; -+ } ++ if (NULL != notification) { ++ _mali_uk_annotate_profiling_enable_s *data = notification->result_buffer; ++ data->sampling_rate = sampling_rate; ++ data->enable = enable; + -+ /* Free based on allocation type */ -+ if (alloc->properties & KBASE_MEM_PHY_ALLOC_LARGE) -+ vfree(alloc); -+ else -+ kfree(alloc); ++ _mali_osk_notification_queue_send(queue, notification); ++ } else { ++ MALI_PRINT_ERROR(("Failed to create notification object!\n")); ++ } ++ } else { ++ MALI_PRINT_ERROR(("Failed to find the right session!\n")); ++ } +} + -+KBASE_EXPORT_TEST_API(kbase_mem_kref_free); + -+int kbase_alloc_phy_pages(struct kbase_va_region *reg, size_t vsize, size_t size) ++_mali_osk_errcode_t _mali_osk_profiling_init(mali_bool auto_start) +{ -+ KBASE_DEBUG_ASSERT(NULL != reg); -+ KBASE_DEBUG_ASSERT(vsize > 0); -+ -+ /* validate user provided arguments */ -+ if (size > vsize || vsize > reg->nr_pages) -+ goto out_term; -+ -+ /* Prevent vsize*sizeof from wrapping around. -+ * For instance, if vsize is 2**29+1, we'll allocate 1 byte and the alloc won't fail. -+ */ -+ if ((size_t) vsize > ((size_t) -1 / sizeof(*reg->cpu_alloc->pages))) -+ goto out_term; -+ -+ KBASE_DEBUG_ASSERT(0 != vsize); ++ int i; ++ mali_profiling_stream *new_mali_profiling_stream = NULL; ++ mali_profiling_stream_list *new_mali_profiling_stream_list = NULL; ++ if (MALI_TRUE == auto_start) { ++ mali_set_user_setting(_MALI_UK_USER_SETTING_SW_EVENTS_ENABLE, MALI_TRUE); ++ } + -+ if (kbase_alloc_phy_pages_helper(reg->cpu_alloc, size) != 0) -+ goto out_term; ++ /*Init the global_mali_stream_list*/ ++ MALI_DEBUG_ASSERT(NULL == global_mali_stream_list); ++ new_mali_profiling_stream_list = (mali_profiling_stream_list *)kmalloc(sizeof(mali_profiling_stream_list), GFP_KERNEL); + -+ reg->cpu_alloc->reg = reg; -+ if (reg->cpu_alloc != reg->gpu_alloc) { -+ if (kbase_alloc_phy_pages_helper(reg->gpu_alloc, size) != 0) -+ goto out_rollback; -+ reg->gpu_alloc->reg = reg; ++ if (NULL == new_mali_profiling_stream_list) { ++ return _MALI_OSK_ERR_NOMEM; + } + -+ return 0; -+ -+out_rollback: -+ kbase_free_phy_pages_helper(reg->cpu_alloc, size); -+out_term: -+ return -1; -+} ++ spin_lock_init(&new_mali_profiling_stream_list->spin_lock); ++ INIT_LIST_HEAD(&new_mali_profiling_stream_list->free_list); ++ INIT_LIST_HEAD(&new_mali_profiling_stream_list->queue_list); + -+KBASE_EXPORT_TEST_API(kbase_alloc_phy_pages); ++ spin_lock_init(&mali_activity_lock); ++ mali_activity_cores_num = 0; + -+bool kbase_check_alloc_flags(unsigned long flags) -+{ -+ /* Only known input flags should be set. */ -+ if (flags & ~BASE_MEM_FLAGS_INPUT_MASK) -+ return false; ++ for (i = 0; i < MALI_PROFILING_STREAM_BUFFER_NUM; i++) { ++ new_mali_profiling_stream = (mali_profiling_stream *)kmalloc(sizeof(mali_profiling_stream), GFP_KERNEL); ++ if (NULL == new_mali_profiling_stream) { ++ _mali_profiling_stream_list_destory(new_mali_profiling_stream_list); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ /* At least one flag should be set */ -+ if (flags == 0) -+ return false; ++ INIT_LIST_HEAD(&new_mali_profiling_stream->list); ++ new_mali_profiling_stream->used_size = 0; ++ list_add_tail(&new_mali_profiling_stream->list, &new_mali_profiling_stream_list->free_list); + -+ /* Either the GPU or CPU must be reading from the allocated memory */ -+ if ((flags & (BASE_MEM_PROT_CPU_RD | BASE_MEM_PROT_GPU_RD)) == 0) -+ return false; ++ } + -+ /* Either the GPU or CPU must be writing to the allocated memory */ -+ if ((flags & (BASE_MEM_PROT_CPU_WR | BASE_MEM_PROT_GPU_WR)) == 0) -+ return false; ++ _mali_osk_atomic_init(&stream_fd_if_used, 0); ++ init_waitqueue_head(&stream_fd_wait_queue); + -+ /* GPU cannot be writing to GPU executable memory and cannot grow the memory on page fault. */ -+ if ((flags & BASE_MEM_PROT_GPU_EX) && (flags & (BASE_MEM_PROT_GPU_WR | BASE_MEM_GROW_ON_GPF))) -+ return false; ++ hrtimer_init(&profiling_sampling_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + -+ /* GPU should have at least read or write access otherwise there is no -+ reason for allocating. */ -+ if ((flags & (BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR)) == 0) -+ return false; ++ profiling_sampling_timer.function = _mali_profiling_sampling_counters; + -+ /* BASE_MEM_IMPORT_SHARED is only valid for imported memory */ -+ if ((flags & BASE_MEM_IMPORT_SHARED) == BASE_MEM_IMPORT_SHARED) -+ return false; ++ global_mali_stream_list = new_mali_profiling_stream_list; + -+ return true; ++ return _MALI_OSK_ERR_OK; +} + -+bool kbase_check_import_flags(unsigned long flags) ++void _mali_osk_profiling_term(void) +{ -+ /* Only known input flags should be set. */ -+ if (flags & ~BASE_MEM_FLAGS_INPUT_MASK) -+ return false; -+ -+ /* At least one flag should be set */ -+ if (flags == 0) -+ return false; -+ -+ /* Imported memory cannot be GPU executable */ -+ if (flags & BASE_MEM_PROT_GPU_EX) -+ return false; -+ -+ /* Imported memory cannot grow on page fault */ -+ if (flags & BASE_MEM_GROW_ON_GPF) -+ return false; ++ if (0 != profiling_sample_rate) { ++ hrtimer_cancel(&profiling_sampling_timer); ++ profiling_sample_rate = 0; ++ } ++ _mali_osk_atomic_term(&stream_fd_if_used); + -+ /* GPU should have at least read or write access otherwise there is no -+ reason for importing. */ -+ if ((flags & (BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR)) == 0) -+ return false; ++ if (NULL != global_mali_profiling_counters) { ++ _mali_osk_free(global_mali_profiling_counters); ++ global_mali_profiling_counters = NULL; ++ num_global_mali_profiling_counters = 0; ++ } + -+ /* Secure memory cannot be read by the CPU */ -+ if ((flags & BASE_MEM_SECURE) && (flags & BASE_MEM_PROT_CPU_RD)) -+ return false; ++ if (NULL != global_mali_stream_list) { ++ _mali_profiling_stream_list_destory(global_mali_stream_list); ++ global_mali_stream_list = NULL; ++ } + -+ return true; +} + -+/** -+ * @brief Acquire the per-context region list lock -+ */ -+void kbase_gpu_vm_lock(struct kbase_context *kctx) ++void _mali_osk_profiling_stop_sampling(u32 pid) +{ -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ mutex_lock(&kctx->reg_lock); -+} -+ -+KBASE_EXPORT_TEST_API(kbase_gpu_vm_lock); ++ if (pid == current_profiling_pid) { + -+/** -+ * @brief Release the per-context region list lock -+ */ -+void kbase_gpu_vm_unlock(struct kbase_context *kctx) -+{ -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ mutex_unlock(&kctx->reg_lock); ++ int i; ++ /* Reset all counter states when closing connection.*/ ++ for (i = 0; i < num_global_mali_profiling_counters; ++i) { ++ _mali_profiling_set_event(global_mali_profiling_counters[i].counter_id, MALI_HW_CORE_NO_COUNTER); ++ global_mali_profiling_counters[i].enabled = 0; ++ global_mali_profiling_counters[i].prev_counter_value = 0; ++ global_mali_profiling_counters[i].current_counter_value = 0; ++ } ++ l2_cache_counter_if_enabled = MALI_FALSE; ++ num_counters_enabled = 0; ++ mem_counters_enabled = 0; ++ _mali_profiling_control(FBDUMP_CONTROL_ENABLE, 0); ++ _mali_profiling_control(SW_COUNTER_ENABLE, 0); ++ /* Delete sampling timer when closing connection. */ ++ if (0 != profiling_sample_rate) { ++ hrtimer_cancel(&profiling_sampling_timer); ++ profiling_sample_rate = 0; ++ } ++ current_profiling_pid = 0; ++ } +} + -+KBASE_EXPORT_TEST_API(kbase_gpu_vm_unlock); -+ -+#ifdef CONFIG_DEBUG_FS -+struct kbase_jit_debugfs_data { -+ int (*func)(struct kbase_jit_debugfs_data *); -+ struct mutex lock; -+ struct kbase_context *kctx; -+ u64 active_value; -+ u64 pool_value; -+ u64 destroy_value; -+ char buffer[50]; -+}; -+ -+static int kbase_jit_debugfs_common_open(struct inode *inode, -+ struct file *file, int (*func)(struct kbase_jit_debugfs_data *)) ++void _mali_osk_profiling_add_event(u32 event_id, u32 data0, u32 data1, u32 data2, u32 data3, u32 data4) +{ -+ struct kbase_jit_debugfs_data *data; -+ -+ data = kzalloc(sizeof(*data), GFP_KERNEL); -+ if (!data) -+ return -ENOMEM; -+ -+ data->func = func; -+ mutex_init(&data->lock); -+ data->kctx = (struct kbase_context *) inode->i_private; -+ -+ file->private_data = data; ++ /*Record the freq & volt to global_mali_profiling_counters here. */ ++ if (0 != profiling_sample_rate) { ++ u32 channel; ++ u32 state; ++ channel = (event_id >> 16) & 0xFF; ++ state = ((event_id >> 24) & 0xF) << 24; + -+ return nonseekable_open(inode, file); ++ switch (state) { ++ case MALI_PROFILING_EVENT_TYPE_SINGLE: ++ if ((MALI_PROFILING_EVENT_CHANNEL_GPU >> 16) == channel) { ++ u32 reason = (event_id & 0xFFFF); ++ if (MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE == reason) { ++ _mali_osk_profiling_record_global_counters(COUNTER_FREQUENCY, data0); ++ _mali_osk_profiling_record_global_counters(COUNTER_VOLTAGE, data1); ++ } ++ } ++ break; ++ case MALI_PROFILING_EVENT_TYPE_START: ++ if ((MALI_PROFILING_EVENT_CHANNEL_GP0 >> 16) == channel) { ++ _mali_profiling_sampling_core_activity_switch(COUNTER_VP_ACTIVITY, 0, 1, data1); ++ } else if (channel >= (MALI_PROFILING_EVENT_CHANNEL_PP0 >> 16) && ++ (MALI_PROFILING_EVENT_CHANNEL_PP7 >> 16) >= channel) { ++ u32 core_id = channel - (MALI_PROFILING_EVENT_CHANNEL_PP0 >> 16); ++ _mali_profiling_sampling_core_activity_switch(COUNTER_FP_ACTIVITY, core_id, 1, data1); ++ } ++ break; ++ case MALI_PROFILING_EVENT_TYPE_STOP: ++ if ((MALI_PROFILING_EVENT_CHANNEL_GP0 >> 16) == channel) { ++ _mali_profiling_sampling_core_activity_switch(COUNTER_VP_ACTIVITY, 0, 0, 0); ++ } else if (channel >= (MALI_PROFILING_EVENT_CHANNEL_PP0 >> 16) && ++ (MALI_PROFILING_EVENT_CHANNEL_PP7 >> 16) >= channel) { ++ u32 core_id = channel - (MALI_PROFILING_EVENT_CHANNEL_PP0 >> 16); ++ _mali_profiling_sampling_core_activity_switch(COUNTER_FP_ACTIVITY, core_id, 0, 0); ++ } ++ break; ++ default: ++ break; ++ } ++ } ++ trace_mali_timeline_event(event_id, data0, data1, data2, data3, data4); +} + -+static ssize_t kbase_jit_debugfs_common_read(struct file *file, -+ char __user *buf, size_t len, loff_t *ppos) ++void _mali_osk_profiling_report_sw_counters(u32 *counters) +{ -+ struct kbase_jit_debugfs_data *data; -+ size_t size; -+ int ret; -+ -+ data = (struct kbase_jit_debugfs_data *) file->private_data; -+ mutex_lock(&data->lock); -+ -+ if (*ppos) { -+ size = strnlen(data->buffer, sizeof(data->buffer)); -+ } else { -+ if (!data->func) { -+ ret = -EACCES; -+ goto out_unlock; -+ } ++ trace_mali_sw_counters(_mali_osk_get_pid(), _mali_osk_get_tid(), NULL, counters); ++} + -+ if (data->func(data)) { -+ ret = -EACCES; -+ goto out_unlock; ++void _mali_osk_profiling_record_global_counters(int counter_id, u32 value) ++{ ++ if (NULL != global_mali_profiling_counters) { ++ int i ; ++ for (i = 0; i < num_global_mali_profiling_counters; i++) { ++ if (counter_id == global_mali_profiling_counters[i].counter_id && global_mali_profiling_counters[i].enabled) { ++ global_mali_profiling_counters[i].current_counter_value = value; ++ break; ++ } + } -+ -+ size = scnprintf(data->buffer, sizeof(data->buffer), -+ "%llu,%llu,%llu", data->active_value, -+ data->pool_value, data->destroy_value); + } -+ -+ ret = simple_read_from_buffer(buf, len, ppos, data->buffer, size); -+ -+out_unlock: -+ mutex_unlock(&data->lock); -+ return ret; +} + -+static int kbase_jit_debugfs_common_release(struct inode *inode, -+ struct file *file) ++_mali_osk_errcode_t _mali_ukk_profiling_add_event(_mali_uk_profiling_add_event_s *args) +{ -+ kfree(file->private_data); -+ return 0; -+} ++ /* Always add process and thread identificator in the first two data elements for events from user space */ ++ _mali_osk_profiling_add_event(args->event_id, _mali_osk_get_pid(), _mali_osk_get_tid(), args->data[2], args->data[3], args->data[4]); + -+#define KBASE_JIT_DEBUGFS_DECLARE(__fops, __func) \ -+static int __fops ## _open(struct inode *inode, struct file *file) \ -+{ \ -+ return kbase_jit_debugfs_common_open(inode, file, __func); \ -+} \ -+static const struct file_operations __fops = { \ -+ .owner = THIS_MODULE, \ -+ .open = __fops ## _open, \ -+ .release = kbase_jit_debugfs_common_release, \ -+ .read = kbase_jit_debugfs_common_read, \ -+ .write = NULL, \ -+ .llseek = generic_file_llseek, \ ++ return _MALI_OSK_ERR_OK; +} + -+static int kbase_jit_debugfs_count_get(struct kbase_jit_debugfs_data *data) ++_mali_osk_errcode_t _mali_ukk_sw_counters_report(_mali_uk_sw_counters_report_s *args) +{ -+ struct kbase_context *kctx = data->kctx; -+ struct list_head *tmp; -+ -+ mutex_lock(&kctx->jit_evict_lock); -+ list_for_each(tmp, &kctx->jit_active_head) { -+ data->active_value++; -+ } ++ u32 *counters = (u32 *)(uintptr_t)args->counters; + -+ list_for_each(tmp, &kctx->jit_pool_head) { -+ data->pool_value++; -+ } ++ _mali_osk_profiling_report_sw_counters(counters); + -+ list_for_each(tmp, &kctx->jit_destroy_head) { -+ data->destroy_value++; ++ if (NULL != global_mali_profiling_counters) { ++ int i; ++ for (i = 0; i < MALI_PROFILING_SW_COUNTERS_NUM; i ++) { ++ if (global_mali_profiling_counters[first_sw_counter_index + i].enabled) { ++ global_mali_profiling_counters[first_sw_counter_index + i].current_counter_value = *(counters + i); ++ } ++ } + } -+ mutex_unlock(&kctx->jit_evict_lock); + -+ return 0; ++ return _MALI_OSK_ERR_OK; +} -+KBASE_JIT_DEBUGFS_DECLARE(kbase_jit_debugfs_count_fops, -+ kbase_jit_debugfs_count_get); + -+static int kbase_jit_debugfs_vm_get(struct kbase_jit_debugfs_data *data) ++_mali_osk_errcode_t _mali_ukk_profiling_stream_fd_get(_mali_uk_profiling_stream_fd_get_s *args) +{ -+ struct kbase_context *kctx = data->kctx; -+ struct kbase_va_region *reg; ++ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ mutex_lock(&kctx->jit_evict_lock); -+ list_for_each_entry(reg, &kctx->jit_active_head, jit_node) { -+ data->active_value += reg->nr_pages; -+ } ++ if (1 == _mali_osk_atomic_inc_return(&stream_fd_if_used)) { + -+ list_for_each_entry(reg, &kctx->jit_pool_head, jit_node) { -+ data->pool_value += reg->nr_pages; -+ } ++ s32 fd = anon_inode_getfd("[mali_profiling_stream]", &mali_profiling_stream_fops, ++ session, ++ O_RDONLY | O_CLOEXEC); + -+ list_for_each_entry(reg, &kctx->jit_destroy_head, jit_node) { -+ data->destroy_value += reg->nr_pages; ++ args->stream_fd = fd; ++ if (0 > fd) { ++ _mali_osk_atomic_dec(&stream_fd_if_used); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ args->stream_fd = fd; ++ } else { ++ _mali_osk_atomic_dec(&stream_fd_if_used); ++ args->stream_fd = -1; ++ return _MALI_OSK_ERR_BUSY; + } -+ mutex_unlock(&kctx->jit_evict_lock); + -+ return 0; ++ return _MALI_OSK_ERR_OK; +} -+KBASE_JIT_DEBUGFS_DECLARE(kbase_jit_debugfs_vm_fops, -+ kbase_jit_debugfs_vm_get); + -+static int kbase_jit_debugfs_phys_get(struct kbase_jit_debugfs_data *data) ++_mali_osk_errcode_t _mali_ukk_profiling_control_set(_mali_uk_profiling_control_set_s *args) +{ -+ struct kbase_context *kctx = data->kctx; -+ struct kbase_va_region *reg; ++ u32 control_packet_size; ++ u32 output_buffer_size; + -+ mutex_lock(&kctx->jit_evict_lock); -+ list_for_each_entry(reg, &kctx->jit_active_head, jit_node) { -+ data->active_value += reg->gpu_alloc->nents; -+ } ++ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ list_for_each_entry(reg, &kctx->jit_pool_head, jit_node) { -+ data->pool_value += reg->gpu_alloc->nents; ++ if (NULL == global_mali_profiling_counters && MALI_FALSE == _mali_profiling_global_counters_init()) { ++ MALI_PRINT_ERROR(("Failed to create global_mali_profiling_counters.\n")); ++ return _MALI_OSK_ERR_FAULT; + } + -+ list_for_each_entry(reg, &kctx->jit_destroy_head, jit_node) { -+ data->destroy_value += reg->gpu_alloc->nents; -+ } -+ mutex_unlock(&kctx->jit_evict_lock); ++ control_packet_size = args->control_packet_size; ++ output_buffer_size = args->response_packet_size; + -+ return 0; -+} -+KBASE_JIT_DEBUGFS_DECLARE(kbase_jit_debugfs_phys_fops, -+ kbase_jit_debugfs_phys_get); ++ if (0 != control_packet_size) { ++ u8 control_type; ++ u8 *control_packet_data; ++ u8 *response_packet_data; ++ u32 version_length = sizeof(utgard_setup_version) - 1; + -+void kbase_jit_debugfs_init(struct kbase_context *kctx) -+{ -+ /* Debugfs entry for getting the number of JIT allocations. */ -+ debugfs_create_file("mem_jit_count", S_IRUGO, kctx->kctx_dentry, -+ kctx, &kbase_jit_debugfs_count_fops); ++ control_packet_data = (u8 *)(uintptr_t)args->control_packet_data; ++ MALI_DEBUG_ASSERT_POINTER(control_packet_data); ++ response_packet_data = (u8 *)(uintptr_t)args->response_packet_data; ++ MALI_DEBUG_ASSERT_POINTER(response_packet_data); + -+ /* -+ * Debugfs entry for getting the total number of virtual pages -+ * used by JIT allocations. -+ */ -+ debugfs_create_file("mem_jit_vm", S_IRUGO, kctx->kctx_dentry, -+ kctx, &kbase_jit_debugfs_vm_fops); ++ /*Decide if need to ignore Utgard setup version.*/ ++ if (control_packet_size >= version_length) { ++ if (0 == memcmp(control_packet_data, utgard_setup_version, version_length)) { ++ if (control_packet_size == version_length) { ++ args->response_packet_size = 0; ++ return _MALI_OSK_ERR_OK; ++ } else { ++ control_packet_data += version_length; ++ control_packet_size -= version_length; ++ } ++ } ++ } + -+ /* -+ * Debugfs entry for getting the number of physical pages used -+ * by JIT allocations. -+ */ -+ debugfs_create_file("mem_jit_phys", S_IRUGO, kctx->kctx_dentry, -+ kctx, &kbase_jit_debugfs_phys_fops); -+} -+#endif /* CONFIG_DEBUG_FS */ ++ current_profiling_pid = _mali_osk_get_pid(); + -+/** -+ * kbase_jit_destroy_worker - Deferred worker which frees JIT allocations -+ * @work: Work item -+ * -+ * This function does the work of freeing JIT allocations whose physical -+ * backing has been released. -+ */ -+static void kbase_jit_destroy_worker(struct work_struct *work) -+{ -+ struct kbase_context *kctx; -+ struct kbase_va_region *reg; ++ control_type = control_packet_data[0]; ++ switch (control_type) { ++ case PACKET_HEADER_COUNTERS_REQUEST: { ++ int i; + -+ kctx = container_of(work, struct kbase_context, jit_work); -+ do { -+ mutex_lock(&kctx->jit_evict_lock); -+ if (list_empty(&kctx->jit_destroy_head)) { -+ mutex_unlock(&kctx->jit_evict_lock); -+ break; -+ } ++ if (PACKET_HEADER_SIZE > control_packet_size || ++ control_packet_size != _mali_profiling_get_packet_size(control_packet_data + 1)) { ++ MALI_PRINT_ERROR(("Wrong control packet size, type 0x%x,size 0x%x.\n", control_packet_data[0], control_packet_size)); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ reg = list_first_entry(&kctx->jit_destroy_head, -+ struct kbase_va_region, jit_node); ++ /* Send supported counters */ ++ if (PACKET_HEADER_SIZE > output_buffer_size) ++ return _MALI_OSK_ERR_FAULT; + -+ list_del(®->jit_node); -+ mutex_unlock(&kctx->jit_evict_lock); ++ *response_packet_data = PACKET_HEADER_COUNTERS_ACK; ++ args->response_packet_size = PACKET_HEADER_SIZE; + -+ kbase_gpu_vm_lock(kctx); -+ kbase_mem_free_region(kctx, reg); -+ kbase_gpu_vm_unlock(kctx); -+ } while (1); -+} ++ for (i = 0; i < num_global_mali_profiling_counters; ++i) { ++ u32 name_size = strlen(global_mali_profiling_counters[i].counter_name); + -+int kbase_jit_init(struct kbase_context *kctx) -+{ -+ INIT_LIST_HEAD(&kctx->jit_active_head); -+ INIT_LIST_HEAD(&kctx->jit_pool_head); -+ INIT_LIST_HEAD(&kctx->jit_destroy_head); -+ INIT_WORK(&kctx->jit_work, kbase_jit_destroy_worker); ++ if ((args->response_packet_size + name_size + 1) > output_buffer_size) { ++ MALI_PRINT_ERROR(("Response packet data is too large..\n")); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ INIT_LIST_HEAD(&kctx->jit_pending_alloc); -+ INIT_LIST_HEAD(&kctx->jit_atoms_head); ++ memcpy(response_packet_data + args->response_packet_size, ++ global_mali_profiling_counters[i].counter_name, name_size + 1); + -+ return 0; -+} ++ args->response_packet_size += (name_size + 1); + -+struct kbase_va_region *kbase_jit_allocate(struct kbase_context *kctx, -+ struct base_jit_alloc_info *info) -+{ -+ struct kbase_va_region *reg = NULL; -+ struct kbase_va_region *walker; -+ struct kbase_va_region *temp; -+ size_t current_diff = SIZE_MAX; ++ if (global_mali_profiling_counters[i].counter_id == COUNTER_VP_ACTIVITY) { ++ args->response_packet_size += _mali_profiling_pack_int(response_packet_data, ++ output_buffer_size, args->response_packet_size, (s32)1); ++ } else if (global_mali_profiling_counters[i].counter_id == COUNTER_FP_ACTIVITY) { ++ args->response_packet_size += _mali_profiling_pack_int(response_packet_data, ++ output_buffer_size, args->response_packet_size, (s32)mali_pp_get_glob_num_pp_cores()); ++ } else { ++ args->response_packet_size += _mali_profiling_pack_int(response_packet_data, ++ output_buffer_size, args->response_packet_size, (s32) - 1); ++ } ++ } + -+ int ret; ++ _mali_profiling_set_packet_size(response_packet_data + 1, args->response_packet_size); ++ break; ++ } + -+ mutex_lock(&kctx->jit_evict_lock); -+ /* -+ * Scan the pool for an existing allocation which meets our -+ * requirements and remove it. -+ */ -+ list_for_each_entry_safe(walker, temp, &kctx->jit_pool_head, jit_node) { ++ case PACKET_HEADER_COUNTERS_ENABLE: { ++ int i; ++ u32 request_pos = PACKET_HEADER_SIZE; ++ mali_bool sw_counter_if_enabled = MALI_FALSE; + -+ if (walker->nr_pages >= info->va_pages) { -+ size_t min_size, max_size, diff; ++ if (PACKET_HEADER_SIZE > control_packet_size || ++ control_packet_size != _mali_profiling_get_packet_size(control_packet_data + 1)) { ++ MALI_PRINT_ERROR(("Wrong control packet size , type 0x%x,size 0x%x.\n", control_packet_data[0], control_packet_size)); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ /* -+ * The JIT allocations VA requirements have been -+ * meet, it's suitable but other allocations -+ * might be a better fit. -+ */ -+ min_size = min_t(size_t, walker->gpu_alloc->nents, -+ info->commit_pages); -+ max_size = max_t(size_t, walker->gpu_alloc->nents, -+ info->commit_pages); -+ diff = max_size - min_size; ++ /* Init all counter states before enable requested counters.*/ ++ for (i = 0; i < num_global_mali_profiling_counters; ++i) { ++ _mali_profiling_set_event(global_mali_profiling_counters[i].counter_id, MALI_HW_CORE_NO_COUNTER); ++ global_mali_profiling_counters[i].enabled = 0; ++ global_mali_profiling_counters[i].prev_counter_value = 0; ++ global_mali_profiling_counters[i].current_counter_value = 0; + -+ if (current_diff > diff) { -+ current_diff = diff; -+ reg = walker; ++ if (global_mali_profiling_counters[i].counter_id >= FIRST_MEM_COUNTER && ++ global_mali_profiling_counters[i].counter_id <= LAST_MEM_COUNTER) { ++ _mali_profiling_notification_mem_counter(session, global_mali_profiling_counters[i].counter_id, 0, 0); ++ } + } + -+ /* The allocation is an exact match, stop looking */ -+ if (current_diff == 0) -+ break; -+ } -+ } ++ l2_cache_counter_if_enabled = MALI_FALSE; ++ num_counters_enabled = 0; ++ mem_counters_enabled = 0; ++ _mali_profiling_control(FBDUMP_CONTROL_ENABLE, 0); ++ _mali_profiling_control(SW_COUNTER_ENABLE, 0); ++ _mali_profiling_notification_enable(session, 0, 0); + -+ if (reg) { -+ /* -+ * Remove the found region from the pool and add it to the -+ * active list. -+ */ -+ list_move(®->jit_node, &kctx->jit_active_head); ++ /* Enable requested counters */ ++ while (request_pos < control_packet_size) { ++ u32 begin = request_pos; ++ u32 event; ++ u32 key; + -+ /* -+ * Remove the allocation from the eviction list as it's no -+ * longer eligible for eviction. This must be done before -+ * dropping the jit_evict_lock -+ */ -+ list_del_init(®->gpu_alloc->evict_node); -+ mutex_unlock(&kctx->jit_evict_lock); ++ /* Check the counter name which should be ended with null */ ++ while (request_pos < control_packet_size && control_packet_data[request_pos] != '\0') { ++ ++request_pos; ++ } + -+ kbase_gpu_vm_lock(kctx); ++ if (request_pos >= control_packet_size) ++ return _MALI_OSK_ERR_FAULT; + -+ /* Make the physical backing no longer reclaimable */ -+ if (!kbase_mem_evictable_unmake(reg->gpu_alloc)) -+ goto update_failed; ++ ++request_pos; ++ event = _mali_profiling_read_packet_int(control_packet_data, &request_pos, control_packet_size); ++ key = _mali_profiling_read_packet_int(control_packet_data, &request_pos, control_packet_size); + -+ /* Grow the backing if required */ -+ if (reg->gpu_alloc->nents < info->commit_pages) { -+ size_t delta; -+ size_t old_size = reg->gpu_alloc->nents; ++ for (i = 0; i < num_global_mali_profiling_counters; ++i) { ++ u32 name_size = strlen((char *)(control_packet_data + begin)); + -+ /* Allocate some more pages */ -+ delta = info->commit_pages - reg->gpu_alloc->nents; -+ if (kbase_alloc_phy_pages_helper(reg->gpu_alloc, delta) -+ != 0) -+ goto update_failed; ++ if (strncmp(global_mali_profiling_counters[i].counter_name, (char *)(control_packet_data + begin), name_size) == 0) { ++ if (!sw_counter_if_enabled && (FIRST_SW_COUNTER <= global_mali_profiling_counters[i].counter_id ++ && global_mali_profiling_counters[i].counter_id <= LAST_SW_COUNTER)) { ++ sw_counter_if_enabled = MALI_TRUE; ++ _mali_profiling_control(SW_COUNTER_ENABLE, 1); ++ } + -+ if (reg->cpu_alloc != reg->gpu_alloc) { -+ if (kbase_alloc_phy_pages_helper( -+ reg->cpu_alloc, delta) != 0) { -+ kbase_free_phy_pages_helper( -+ reg->gpu_alloc, delta); -+ goto update_failed; ++ if (COUNTER_FILMSTRIP == global_mali_profiling_counters[i].counter_id) { ++ _mali_profiling_control(FBDUMP_CONTROL_ENABLE, 1); ++ _mali_profiling_control(FBDUMP_CONTROL_RATE, event & 0xff); ++ _mali_profiling_control(FBDUMP_CONTROL_RESIZE_FACTOR, (event >> 8) & 0xff); ++ } ++ ++ if (global_mali_profiling_counters[i].counter_id >= FIRST_MEM_COUNTER && ++ global_mali_profiling_counters[i].counter_id <= LAST_MEM_COUNTER) { ++ _mali_profiling_notification_mem_counter(session, global_mali_profiling_counters[i].counter_id, ++ key, 1); ++ mem_counters_enabled++; ++ } ++ ++ global_mali_profiling_counters[i].counter_event = event; ++ global_mali_profiling_counters[i].key = key; ++ global_mali_profiling_counters[i].enabled = 1; ++ ++ _mali_profiling_set_event(global_mali_profiling_counters[i].counter_id, ++ global_mali_profiling_counters[i].counter_event); ++ num_counters_enabled++; ++ break; ++ } ++ } ++ ++ if (i == num_global_mali_profiling_counters) { ++ MALI_PRINT_ERROR(("Counter name does not match for type %u.\n", control_type)); ++ return _MALI_OSK_ERR_FAULT; + } + } + -+ ret = kbase_mem_grow_gpu_mapping(kctx, reg, -+ info->commit_pages, old_size); -+ /* -+ * The grow failed so put the allocation back in the -+ * pool and return failure. -+ */ -+ if (ret) -+ goto update_failed; ++ if (PACKET_HEADER_SIZE <= output_buffer_size) { ++ *response_packet_data = PACKET_HEADER_ACK; ++ _mali_profiling_set_packet_size(response_packet_data + 1, PACKET_HEADER_SIZE); ++ args->response_packet_size = PACKET_HEADER_SIZE; ++ } else { ++ return _MALI_OSK_ERR_FAULT; ++ } ++ ++ break; + } -+ kbase_gpu_vm_unlock(kctx); -+ } else { -+ /* No suitable JIT allocation was found so create a new one */ -+ u64 flags = BASE_MEM_PROT_CPU_RD | BASE_MEM_PROT_GPU_RD | -+ BASE_MEM_PROT_GPU_WR | BASE_MEM_GROW_ON_GPF | -+ BASE_MEM_COHERENT_LOCAL; -+ u64 gpu_addr; + -+ mutex_unlock(&kctx->jit_evict_lock); ++ case PACKET_HEADER_START_CAPTURE_VALUE: { ++ u32 live_rate; ++ u32 request_pos = PACKET_HEADER_SIZE; + -+ reg = kbase_mem_alloc(kctx, info->va_pages, info->commit_pages, -+ info->extent, &flags, &gpu_addr); -+ if (!reg) -+ goto out_unlocked; ++ if (PACKET_HEADER_SIZE > control_packet_size || ++ control_packet_size != _mali_profiling_get_packet_size(control_packet_data + 1)) { ++ MALI_PRINT_ERROR(("Wrong control packet size , type 0x%x,size 0x%x.\n", control_packet_data[0], control_packet_size)); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ mutex_lock(&kctx->jit_evict_lock); -+ list_add(®->jit_node, &kctx->jit_active_head); -+ mutex_unlock(&kctx->jit_evict_lock); -+ } ++ /* Read samping rate in nanoseconds and live rate, start capture.*/ ++ profiling_sample_rate = _mali_profiling_read_packet_int(control_packet_data, ++ &request_pos, control_packet_size); + -+ return reg; ++ live_rate = _mali_profiling_read_packet_int(control_packet_data, &request_pos, control_packet_size); + -+update_failed: -+ /* -+ * An update to an allocation from the pool failed, chances -+ * are slim a new allocation would fair any better so return -+ * the allocation to the pool and return the function with failure. -+ */ -+ kbase_gpu_vm_unlock(kctx); -+ mutex_lock(&kctx->jit_evict_lock); -+ list_move(®->jit_node, &kctx->jit_pool_head); -+ mutex_unlock(&kctx->jit_evict_lock); -+out_unlocked: -+ return NULL; ++ if (PACKET_HEADER_SIZE <= output_buffer_size) { ++ *response_packet_data = PACKET_HEADER_ACK; ++ _mali_profiling_set_packet_size(response_packet_data + 1, PACKET_HEADER_SIZE); ++ args->response_packet_size = PACKET_HEADER_SIZE; ++ } else { ++ return _MALI_OSK_ERR_FAULT; ++ } ++ ++ if (0 != num_counters_enabled && 0 != profiling_sample_rate) { ++ _mali_profiling_global_stream_list_free(); ++ if (mem_counters_enabled > 0) { ++ _mali_profiling_notification_enable(session, profiling_sample_rate, 1); ++ } ++ hrtimer_start(&profiling_sampling_timer, ++ ktime_set(profiling_sample_rate / 1000000000, profiling_sample_rate % 1000000000), ++ HRTIMER_MODE_REL_PINNED); ++ } ++ ++ break; ++ } ++ default: ++ MALI_PRINT_ERROR(("Unsupported profiling packet header type %u.\n", control_type)); ++ args->response_packet_size = 0; ++ return _MALI_OSK_ERR_FAULT; ++ } ++ } else { ++ _mali_osk_profiling_stop_sampling(current_profiling_pid); ++ _mali_profiling_notification_enable(session, 0, 0); ++ } ++ ++ return _MALI_OSK_ERR_OK; +} + -+void kbase_jit_free(struct kbase_context *kctx, struct kbase_va_region *reg) ++/** ++ * Called by gator.ko to set HW counters ++ * ++ * @param counter_id The counter ID. ++ * @param event_id Event ID that the counter should count (HW counter value from TRM). ++ * ++ * @return 1 on success, 0 on failure. ++ */ ++int _mali_profiling_set_event(u32 counter_id, s32 event_id) +{ -+ /* The physical backing of memory in the pool is always reclaimable */ -+ kbase_gpu_vm_lock(kctx); -+ kbase_mem_evictable_make(reg->gpu_alloc); -+ kbase_gpu_vm_unlock(kctx); ++ if (COUNTER_VP_0_C0 == counter_id) { ++ mali_gp_job_set_gp_counter_src0(event_id); ++ } else if (COUNTER_VP_0_C1 == counter_id) { ++ mali_gp_job_set_gp_counter_src1(event_id); ++ } else if (COUNTER_FP_0_C0 <= counter_id && COUNTER_FP_7_C1 >= counter_id) { ++ /* ++ * Two compatibility notes for this function: ++ * ++ * 1) Previously the DDK allowed per core counters. ++ * ++ * This did not make much sense on Mali-450 with the "virtual PP core" concept, ++ * so this option was removed, and only the same pair of HW counters was allowed on all cores, ++ * beginning with r3p2 release. ++ * ++ * Starting with r4p0, it is now possible to set different HW counters for the different sub jobs. ++ * This should be almost the same, since sub job 0 is designed to run on core 0, ++ * sub job 1 on core 1, and so on. ++ * ++ * The scheduling of PP sub jobs is not predictable, and this often led to situations where core 0 ran 2 ++ * sub jobs, while for instance core 1 ran zero. Having the counters set per sub job would thus increase ++ * the predictability of the returned data (as you would be guaranteed data for all the selected HW counters). ++ * ++ * PS: Core scaling needs to be disabled in order to use this reliably (goes for both solutions). ++ * ++ * The framework/#defines with Gator still indicates that the counter is for a particular core, ++ * but this is internally used as a sub job ID instead (no translation needed). ++ * ++ * 2) Global/default vs per sub job counters ++ * ++ * Releases before r3p2 had only per PP core counters. ++ * r3p2 releases had only one set of default/global counters which applied to all PP cores ++ * Starting with r4p0, we have both a set of default/global counters, ++ * and individual counters per sub job (equal to per core). ++ * ++ * To keep compatibility with Gator/DS-5/streamline, the following scheme is used: ++ * ++ * r3p2 release; only counters set for core 0 is handled, ++ * this is applied as the default/global set of counters, and will thus affect all cores. ++ * ++ * r4p0 release; counters set for core 0 is applied as both the global/default set of counters, ++ * and counters for sub job 0. ++ * Counters set for core 1-7 is only applied for the corresponding sub job. ++ * ++ * This should allow the DS-5/Streamline GUI to have a simple mode where it only allows setting the ++ * values for core 0, and thus this will be applied to all PP sub jobs/cores. ++ * Advanced mode will also be supported, where individual pairs of HW counters can be selected. ++ * ++ * The GUI will (until it is updated) still refer to cores instead of sub jobs, but this is probably ++ * something we can live with! ++ * ++ * Mali-450 note: Each job is not divided into a deterministic number of sub jobs, as the HW DLBU ++ * automatically distributes the load between whatever number of cores is available at this particular time. ++ * A normal PP job on Mali-450 is thus considered a single (virtual) job, and it will thus only be possible ++ * to use a single pair of HW counters (even if the job ran on multiple PP cores). ++ * In other words, only the global/default pair of PP HW counters will be used for normal Mali-450 jobs. ++ */ ++ u32 sub_job = (counter_id - COUNTER_FP_0_C0) >> 1; ++ u32 counter_src = (counter_id - COUNTER_FP_0_C0) & 1; ++ if (0 == counter_src) { ++ mali_pp_job_set_pp_counter_sub_job_src0(sub_job, event_id); ++ if (0 == sub_job) { ++ mali_pp_job_set_pp_counter_global_src0(event_id); ++ } ++ } else { ++ mali_pp_job_set_pp_counter_sub_job_src1(sub_job, event_id); ++ if (0 == sub_job) { ++ mali_pp_job_set_pp_counter_global_src1(event_id); ++ } ++ } ++ } else if (COUNTER_L2_0_C0 <= counter_id && COUNTER_L2_2_C1 >= counter_id) { ++ u32 core_id = (counter_id - COUNTER_L2_0_C0) >> 1; ++ struct mali_l2_cache_core *l2_cache_core = mali_l2_cache_core_get_glob_l2_core(core_id); + -+ mutex_lock(&kctx->jit_evict_lock); -+ list_move(®->jit_node, &kctx->jit_pool_head); -+ mutex_unlock(&kctx->jit_evict_lock); ++ if (NULL != l2_cache_core) { ++ u32 counter_src = (counter_id - COUNTER_L2_0_C0) & 1; ++ mali_l2_cache_core_set_counter_src(l2_cache_core, ++ counter_src, event_id); ++ l2_cache_counter_if_enabled = MALI_TRUE; ++ } ++ } else { ++ return 0; /* Failure, unknown event */ ++ } ++ ++ return 1; /* success */ +} + -+void kbase_jit_backing_lost(struct kbase_va_region *reg) ++/** ++ * Called by gator.ko to retrieve the L2 cache counter values for all L2 cache cores. ++ * The L2 cache counters are unique in that they are polled by gator, rather than being ++ * transmitted via the tracepoint mechanism. ++ * ++ * @param values Pointer to a _mali_profiling_l2_counter_values structure where ++ * the counter sources and values will be output ++ * @return 0 if all went well; otherwise, return the mask with the bits set for the powered off cores ++ */ ++u32 _mali_profiling_get_l2_counters(_mali_profiling_l2_counter_values *values) +{ -+ struct kbase_context *kctx = reg->kctx; ++ u32 l2_cores_num = mali_l2_cache_core_get_glob_num_l2_cores(); ++ u32 i; + -+ lockdep_assert_held(&kctx->jit_evict_lock); ++ MALI_DEBUG_ASSERT(l2_cores_num <= 3); + -+ /* -+ * JIT allocations will always be on a list, if the region -+ * is not on a list then it's not a JIT allocation. -+ */ -+ if (list_empty(®->jit_node)) -+ return; ++ for (i = 0; i < l2_cores_num; i++) { ++ struct mali_l2_cache_core *l2_cache = mali_l2_cache_core_get_glob_l2_core(i); + -+ /* -+ * Freeing the allocation requires locks we might not be able -+ * to take now, so move the allocation to the free list and kick -+ * the worker which will do the freeing. -+ */ -+ list_move(®->jit_node, &kctx->jit_destroy_head); ++ if (NULL == l2_cache) { ++ continue; ++ } + -+ schedule_work(&kctx->jit_work); ++ mali_l2_cache_core_get_counter_values(l2_cache, ++ &values->cores[i].source0, ++ &values->cores[i].value0, ++ &values->cores[i].source1, ++ &values->cores[i].value1); ++ } ++ ++ return 0; +} + -+bool kbase_jit_evict(struct kbase_context *kctx) ++/** ++ * Called by gator to control the production of profiling information at runtime. ++ */ ++void _mali_profiling_control(u32 action, u32 value) +{ -+ struct kbase_va_region *reg = NULL; -+ -+ lockdep_assert_held(&kctx->reg_lock); -+ -+ /* Free the oldest allocation from the pool */ -+ mutex_lock(&kctx->jit_evict_lock); -+ if (!list_empty(&kctx->jit_pool_head)) { -+ reg = list_entry(kctx->jit_pool_head.prev, -+ struct kbase_va_region, jit_node); -+ list_del(®->jit_node); ++ switch (action) { ++ case FBDUMP_CONTROL_ENABLE: ++ mali_set_user_setting(_MALI_UK_USER_SETTING_COLORBUFFER_CAPTURE_ENABLED, (value == 0 ? MALI_FALSE : MALI_TRUE)); ++ break; ++ case FBDUMP_CONTROL_RATE: ++ mali_set_user_setting(_MALI_UK_USER_SETTING_BUFFER_CAPTURE_N_FRAMES, value); ++ break; ++ case SW_COUNTER_ENABLE: ++ mali_set_user_setting(_MALI_UK_USER_SETTING_SW_COUNTER_ENABLED, value); ++ break; ++ case FBDUMP_CONTROL_RESIZE_FACTOR: ++ mali_set_user_setting(_MALI_UK_USER_SETTING_BUFFER_CAPTURE_RESIZE_FACTOR, value); ++ break; ++ default: ++ break; /* Ignore unimplemented actions */ + } -+ mutex_unlock(&kctx->jit_evict_lock); -+ -+ if (reg) -+ kbase_mem_free_region(kctx, reg); ++} + -+ return (reg != NULL); ++/** ++ * Called by gator to get mali api version. ++ */ ++u32 _mali_profiling_get_api_version(void) ++{ ++ return MALI_PROFILING_API_VERSION; +} + -+void kbase_jit_term(struct kbase_context *kctx) ++/** ++* Called by gator to get the data about Mali instance in use: ++* product id, version, number of cores ++*/ ++void _mali_profiling_get_mali_version(struct _mali_profiling_mali_version *values) +{ -+ struct kbase_va_region *walker; ++ values->mali_product_id = (u32)mali_kernel_core_get_product_id(); ++ values->mali_version_major = mali_kernel_core_get_gpu_major_version(); ++ values->mali_version_minor = mali_kernel_core_get_gpu_minor_version(); ++ values->num_of_l2_cores = mali_l2_cache_core_get_glob_num_l2_cores(); ++ values->num_of_fp_cores = mali_executor_get_num_cores_total(); ++ values->num_of_vp_cores = 1; ++} + -+ /* Free all allocations for this context */ + -+ /* -+ * Flush the freeing of allocations whose backing has been freed -+ * (i.e. everything in jit_destroy_head). -+ */ -+ cancel_work_sync(&kctx->jit_work); ++EXPORT_SYMBOL(_mali_profiling_set_event); ++EXPORT_SYMBOL(_mali_profiling_get_l2_counters); ++EXPORT_SYMBOL(_mali_profiling_control); ++EXPORT_SYMBOL(_mali_profiling_get_api_version); ++EXPORT_SYMBOL(_mali_profiling_get_mali_version); +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h b/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h +new file mode 100755 +index 000000000..af51161f9 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h +@@ -0,0 +1,74 @@ ++/* ++ * Copyright (C) 2010, 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ kbase_gpu_vm_lock(kctx); -+ mutex_lock(&kctx->jit_evict_lock); -+ /* Free all allocations from the pool */ -+ while (!list_empty(&kctx->jit_pool_head)) { -+ walker = list_first_entry(&kctx->jit_pool_head, -+ struct kbase_va_region, jit_node); -+ list_del(&walker->jit_node); -+ mutex_unlock(&kctx->jit_evict_lock); -+ kbase_mem_free_region(kctx, walker); -+ mutex_lock(&kctx->jit_evict_lock); -+ } ++/** ++ * @file mali_osk_specific.h ++ * Defines per-OS Kernel level specifics, such as unusual workarounds for ++ * certain OSs. ++ */ + -+ /* Free all allocations from active list */ -+ while (!list_empty(&kctx->jit_active_head)) { -+ walker = list_first_entry(&kctx->jit_active_head, -+ struct kbase_va_region, jit_node); -+ list_del(&walker->jit_node); -+ mutex_unlock(&kctx->jit_evict_lock); -+ kbase_mem_free_region(kctx, walker); -+ mutex_lock(&kctx->jit_evict_lock); -+ } -+ mutex_unlock(&kctx->jit_evict_lock); -+ kbase_gpu_vm_unlock(kctx); -+} ++#ifndef __MALI_OSK_SPECIFIC_H__ ++#define __MALI_OSK_SPECIFIC_H__ + -+static int kbase_jd_user_buf_map(struct kbase_context *kctx, -+ struct kbase_va_region *reg) -+{ -+ long pinned_pages; -+ struct kbase_mem_phy_alloc *alloc; -+ struct page **pages; -+ struct tagged_addr *pa; -+ long i; -+ int err = -ENOMEM; -+ unsigned long address; -+ struct mm_struct *mm; -+ struct device *dev; -+ unsigned long offset; -+ unsigned long local_size; ++#include ++#include ++#include ++#include ++#include ++#include + -+ alloc = reg->gpu_alloc; -+ pa = kbase_get_gpu_phy_pages(reg); -+ address = alloc->imported.user_buf.address; -+ mm = alloc->imported.user_buf.mm; + -+ KBASE_DEBUG_ASSERT(alloc->type == KBASE_MEM_TYPE_IMPORTED_USER_BUF); ++#include "mali_osk_types.h" ++#include "mali_kernel_linux.h" + -+ pages = alloc->imported.user_buf.pages; ++#define MALI_STATIC_INLINE static inline ++#define MALI_NON_STATIC_INLINE inline + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ pinned_pages = get_user_pages(NULL, mm, -+ address, -+ alloc->imported.user_buf.nr_pages, -+ reg->flags & KBASE_REG_GPU_WR, -+ 0, pages, NULL); -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) -+ pinned_pages = get_user_pages_remote(NULL, mm, -+ address, -+ alloc->imported.user_buf.nr_pages, -+ reg->flags & KBASE_REG_GPU_WR, -+ 0, pages, NULL); -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+ pinned_pages = get_user_pages_remote(NULL, mm, -+ address, -+ alloc->imported.user_buf.nr_pages, -+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, -+ pages, NULL); -+#else -+ pinned_pages = get_user_pages_remote(NULL, mm, -+ address, -+ alloc->imported.user_buf.nr_pages, -+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, -+ pages, NULL, NULL); -+#endif ++typedef struct dma_pool *mali_dma_pool; + -+ if (pinned_pages <= 0) -+ return pinned_pages; ++typedef u32 mali_dma_addr; + -+ if (pinned_pages != alloc->imported.user_buf.nr_pages) { -+ for (i = 0; i < pinned_pages; i++) -+ put_page(pages[i]); -+ return -ENOMEM; -+ } ++#if MALI_ENABLE_CPU_CYCLES ++/* Reads out the clock cycle performance counter of the current cpu. ++ It is useful for cost-free (2 cycle) measuring of the time spent ++ in a code path. Sample before and after, the diff number of cycles. ++ When the CPU is idle it will not increase this clock counter. ++ It means that the counter is accurate if only spin-locks are used, ++ but mutexes may lead to too low values since the cpu might "idle" ++ waiting for the mutex to become available. ++ The clock source is configured on the CPU during mali module load, ++ but will not give useful output after a CPU has been power cycled. ++ It is therefore important to configure the system to not turn of ++ the cpu cores when using this functionallity.*/ ++static inline unsigned int mali_get_cpu_cyclecount(void) ++{ ++ unsigned int value; ++ /* Reading the CCNT Register - CPU clock counter */ ++ asm volatile("MRC p15, 0, %0, c9, c13, 0\t\n": "=r"(value)); ++ return value; ++} + -+ dev = kctx->kbdev->dev; -+ offset = address & ~PAGE_MASK; -+ local_size = alloc->imported.user_buf.size; ++void mali_init_cpu_time_counters(int reset, int enable_divide_by_64); ++#endif + -+ for (i = 0; i < pinned_pages; i++) { -+ dma_addr_t dma_addr; -+ unsigned long min; + -+ min = MIN(PAGE_SIZE - offset, local_size); -+ dma_addr = dma_map_page(dev, pages[i], -+ offset, min, -+ DMA_BIDIRECTIONAL); -+ if (dma_mapping_error(dev, dma_addr)) -+ goto unwind; ++MALI_STATIC_INLINE u32 _mali_osk_copy_from_user(void *to, void *from, u32 n) ++{ ++ return (u32)copy_from_user(to, from, (unsigned long)n); ++} + -+ alloc->imported.user_buf.dma_addrs[i] = dma_addr; -+ pa[i] = as_tagged(page_to_phys(pages[i])); ++MALI_STATIC_INLINE mali_bool _mali_osk_in_atomic(void) ++{ ++ return in_atomic(); ++} + -+ local_size -= min; -+ offset = 0; -+ } ++#define _mali_osk_put_user(x, ptr) put_user(x, ptr) + -+ alloc->nents = pinned_pages; ++#endif /* __MALI_OSK_SPECIFIC_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c +new file mode 100755 +index 000000000..d295e712a +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c +@@ -0,0 +1,59 @@ ++/* ++ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ err = kbase_mmu_insert_pages(kctx, reg->start_pfn, pa, -+ kbase_reg_current_backed_size(reg), -+ reg->flags); -+ if (err == 0) -+ return 0; ++/** ++ * @file mali_osk_time.c ++ * Implementation of the OS abstraction layer for the kernel device driver ++ */ + -+ alloc->nents = 0; -+ /* fall down */ -+unwind: -+ while (i--) { -+ dma_unmap_page(kctx->kbdev->dev, -+ alloc->imported.user_buf.dma_addrs[i], -+ PAGE_SIZE, DMA_BIDIRECTIONAL); -+ } ++#include "mali_osk.h" ++#include ++#include ++#include + -+ while (++i < pinned_pages) { -+ put_page(pages[i]); -+ pages[i] = NULL; -+ } ++mali_bool _mali_osk_time_after_eq(unsigned long ticka, unsigned long tickb) ++{ ++ return time_after_eq(ticka, tickb) ? ++ MALI_TRUE : MALI_FALSE; ++} + -+ return err; ++unsigned long _mali_osk_time_mstoticks(u32 ms) ++{ ++ return msecs_to_jiffies(ms); +} + -+static void kbase_jd_user_buf_unmap(struct kbase_context *kctx, -+ struct kbase_mem_phy_alloc *alloc, bool writeable) ++u32 _mali_osk_time_tickstoms(unsigned long ticks) +{ -+ long i; -+ struct page **pages; -+ unsigned long size = alloc->imported.user_buf.size; ++ return jiffies_to_msecs(ticks); ++} + -+ KBASE_DEBUG_ASSERT(alloc->type == KBASE_MEM_TYPE_IMPORTED_USER_BUF); -+ pages = alloc->imported.user_buf.pages; -+ for (i = 0; i < alloc->imported.user_buf.nr_pages; i++) { -+ unsigned long local_size; -+ dma_addr_t dma_addr = alloc->imported.user_buf.dma_addrs[i]; ++unsigned long _mali_osk_time_tickcount(void) ++{ ++ return jiffies; ++} + -+ local_size = MIN(size, PAGE_SIZE - (dma_addr & ~PAGE_MASK)); -+ dma_unmap_page(kctx->kbdev->dev, dma_addr, local_size, -+ DMA_BIDIRECTIONAL); -+ if (writeable) -+ set_page_dirty_lock(pages[i]); -+ put_page(pages[i]); -+ pages[i] = NULL; ++void _mali_osk_time_ubusydelay(u32 usecs) ++{ ++ udelay(usecs); ++} + -+ size -= local_size; -+ } -+ alloc->nents = 0; ++u64 _mali_osk_time_get_ns(void) ++{ ++ struct timespec64 tsval; ++ ktime_get_real_ts64(&tsval); ++ return (u64)timespec64_to_ns(&tsval); +} + -+/* to replace sg_dma_len. */ -+#define MALI_SG_DMA_LEN(sg) ((sg)->length) ++u64 _mali_osk_boot_time_get_ns(void) ++{ ++ struct timespec64 tsval; ++ ktime_get_boottime_ts64(&tsval); ++ return (u64)timespec64_to_ns(&tsval); ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c +new file mode 100755 +index 000000000..d01c11482 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c +@@ -0,0 +1,76 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+#ifdef CONFIG_DMA_SHARED_BUFFER -+static int kbase_jd_umm_map(struct kbase_context *kctx, -+ struct kbase_va_region *reg) ++/** ++ * @file mali_osk_timers.c ++ * Implementation of the OS abstraction layer for the kernel device driver ++ */ ++ ++#include ++#include ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++ ++struct _mali_osk_timer_t_struct { ++ struct timer_list timer; ++}; ++ ++typedef void (*timer_timeout_function_t)(unsigned long); ++ ++_mali_osk_timer_t *_mali_osk_timer_init(_mali_osk_timer_callback_t callback) +{ -+ struct sg_table *sgt; -+ struct scatterlist *s; -+ int i; -+ struct tagged_addr *pa; -+ int err; -+ size_t count = 0; -+ struct kbase_mem_phy_alloc *alloc; ++ _mali_osk_timer_t *t = (_mali_osk_timer_t *)kmalloc(sizeof(_mali_osk_timer_t), GFP_KERNEL); ++ if (NULL != t) ++ timer_setup(&t->timer, ++ (void (*)(struct timer_list *))callback, 0); ++ return t; ++} + -+ alloc = reg->gpu_alloc; ++void _mali_osk_timer_add(_mali_osk_timer_t *tim, unsigned long ticks_to_expire) ++{ ++ MALI_DEBUG_ASSERT_POINTER(tim); ++ tim->timer.expires = jiffies + ticks_to_expire; ++ add_timer(&(tim->timer)); ++} + -+ KBASE_DEBUG_ASSERT(alloc->type == KBASE_MEM_TYPE_IMPORTED_UMM); -+ KBASE_DEBUG_ASSERT(NULL == alloc->imported.umm.sgt); -+ sgt = dma_buf_map_attachment(alloc->imported.umm.dma_attachment, -+ DMA_BIDIRECTIONAL); ++void _mali_osk_timer_mod(_mali_osk_timer_t *tim, unsigned long ticks_to_expire) ++{ ++ MALI_DEBUG_ASSERT_POINTER(tim); ++ mod_timer(&(tim->timer), jiffies + ticks_to_expire); ++} + -+ if (IS_ERR_OR_NULL(sgt)) -+ return -EINVAL; ++void _mali_osk_timer_del(_mali_osk_timer_t *tim) ++{ ++ MALI_DEBUG_ASSERT_POINTER(tim); ++ del_timer_sync(&(tim->timer)); ++} + -+ /* save for later */ -+ alloc->imported.umm.sgt = sgt; ++void _mali_osk_timer_del_async(_mali_osk_timer_t *tim) ++{ ++ MALI_DEBUG_ASSERT_POINTER(tim); ++ del_timer(&(tim->timer)); ++} + -+ pa = kbase_get_gpu_phy_pages(reg); -+ KBASE_DEBUG_ASSERT(pa); ++mali_bool _mali_osk_timer_pending(_mali_osk_timer_t *tim) ++{ ++ MALI_DEBUG_ASSERT_POINTER(tim); ++ return 1 == timer_pending(&(tim->timer)); ++} + -+ for_each_sg(sgt->sgl, s, sgt->nents, i) { -+ int j; -+ size_t pages = PFN_UP(MALI_SG_DMA_LEN(s)); ++void _mali_osk_timer_setcallback(_mali_osk_timer_t *tim, _mali_osk_timer_callback_t callback, void *data) ++{ ++ MALI_DEBUG_ASSERT_POINTER(tim); ++} + -+ WARN_ONCE(MALI_SG_DMA_LEN(s) & (PAGE_SIZE-1), -+ "MALI_SG_DMA_LEN(s)=%u is not a multiple of PAGE_SIZE\n", -+ MALI_SG_DMA_LEN(s)); ++void _mali_osk_timer_term(_mali_osk_timer_t *tim) ++{ ++ MALI_DEBUG_ASSERT_POINTER(tim); ++ kfree(tim); ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c +new file mode 100755 +index 000000000..fa12abd3f +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c +@@ -0,0 +1,78 @@ ++/* ++ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ WARN_ONCE(sg_dma_address(s) & (PAGE_SIZE-1), -+ "sg_dma_address(s)=%llx is not aligned to PAGE_SIZE\n", -+ (unsigned long long) sg_dma_address(s)); ++/** ++ * @file mali_osk_wait_queue.c ++ * Implemenation of the OS abstraction layer for the kernel device driver ++ */ + -+ for (j = 0; (j < pages) && (count < reg->nr_pages); j++, -+ count++) -+ *pa++ = as_tagged(sg_dma_address(s) + -+ (j << PAGE_SHIFT)); -+ WARN_ONCE(j < pages, -+ "sg list from dma_buf_map_attachment > dma_buf->size=%zu\n", -+ alloc->imported.umm.dma_buf->size); -+ } ++#include ++#include ++#include + -+ if (!(reg->flags & KBASE_REG_IMPORT_PAD) && -+ WARN_ONCE(count < reg->nr_pages, -+ "sg list from dma_buf_map_attachment < dma_buf->size=%zu\n", -+ alloc->imported.umm.dma_buf->size)) { -+ err = -EINVAL; -+ goto err_unmap_attachment; -+ } ++#include "mali_osk.h" ++#include "mali_kernel_common.h" + -+ /* Update nents as we now have pages to map */ -+ alloc->nents = reg->nr_pages; ++struct _mali_osk_wait_queue_t_struct { ++ wait_queue_head_t wait_queue; ++}; + -+ err = kbase_mmu_insert_pages(kctx, reg->start_pfn, -+ kbase_get_gpu_phy_pages(reg), -+ count, -+ reg->flags | KBASE_REG_GPU_WR | KBASE_REG_GPU_RD); -+ if (err) -+ goto err_unmap_attachment; ++_mali_osk_wait_queue_t *_mali_osk_wait_queue_init(void) ++{ ++ _mali_osk_wait_queue_t *ret = NULL; + -+ if (reg->flags & KBASE_REG_IMPORT_PAD) { -+ err = kbase_mmu_insert_single_page(kctx, -+ reg->start_pfn + count, -+ kctx->aliasing_sink_page, -+ reg->nr_pages - count, -+ (reg->flags | KBASE_REG_GPU_RD) & -+ ~KBASE_REG_GPU_WR); -+ if (err) -+ goto err_teardown_orig_pages; ++ ret = kmalloc(sizeof(_mali_osk_wait_queue_t), GFP_KERNEL); ++ ++ if (NULL == ret) { ++ return ret; + } + -+ return 0; ++ init_waitqueue_head(&ret->wait_queue); ++ MALI_DEBUG_ASSERT(!waitqueue_active(&ret->wait_queue)); + -+err_teardown_orig_pages: -+ kbase_mmu_teardown_pages(kctx, reg->start_pfn, count); -+err_unmap_attachment: -+ dma_buf_unmap_attachment(alloc->imported.umm.dma_attachment, -+ alloc->imported.umm.sgt, DMA_BIDIRECTIONAL); -+ alloc->imported.umm.sgt = NULL; ++ return ret; ++} + -+ return err; ++void _mali_osk_wait_queue_wait_event(_mali_osk_wait_queue_t *queue, mali_bool(*condition)(void *), void *data) ++{ ++ MALI_DEBUG_ASSERT_POINTER(queue); ++ MALI_DEBUG_PRINT(6, ("Adding to wait queue %p\n", queue)); ++ wait_event(queue->wait_queue, condition(data)); +} + -+static void kbase_jd_umm_unmap(struct kbase_context *kctx, -+ struct kbase_mem_phy_alloc *alloc) ++void _mali_osk_wait_queue_wait_event_timeout(_mali_osk_wait_queue_t *queue, mali_bool(*condition)(void *), void *data, u32 timeout) +{ -+ KBASE_DEBUG_ASSERT(kctx); -+ KBASE_DEBUG_ASSERT(alloc); -+ KBASE_DEBUG_ASSERT(alloc->imported.umm.dma_attachment); -+ KBASE_DEBUG_ASSERT(alloc->imported.umm.sgt); -+ dma_buf_unmap_attachment(alloc->imported.umm.dma_attachment, -+ alloc->imported.umm.sgt, DMA_BIDIRECTIONAL); -+ alloc->imported.umm.sgt = NULL; -+ alloc->nents = 0; ++ MALI_DEBUG_ASSERT_POINTER(queue); ++ MALI_DEBUG_PRINT(6, ("Adding to wait queue %p\n", queue)); ++ wait_event_timeout(queue->wait_queue, condition(data), _mali_osk_time_mstoticks(timeout)); +} -+#endif /* CONFIG_DMA_SHARED_BUFFER */ + -+#if (defined(CONFIG_KDS) && defined(CONFIG_UMP)) \ -+ || defined(CONFIG_DMA_SHARED_BUFFER_USES_KDS) -+static void add_kds_resource(struct kds_resource *kds_res, -+ struct kds_resource **kds_resources, u32 *kds_res_count, -+ unsigned long *kds_access_bitmap, bool exclusive) ++void _mali_osk_wait_queue_wake_up(_mali_osk_wait_queue_t *queue) +{ -+ u32 i; ++ MALI_DEBUG_ASSERT_POINTER(queue); + -+ for (i = 0; i < *kds_res_count; i++) { -+ /* Duplicate resource, ignore */ -+ if (kds_resources[i] == kds_res) -+ return; -+ } ++ /* if queue is empty, don't attempt to wake up its elements */ ++ if (!waitqueue_active(&queue->wait_queue)) return; + -+ kds_resources[*kds_res_count] = kds_res; -+ if (exclusive) -+ set_bit(*kds_res_count, kds_access_bitmap); -+ (*kds_res_count)++; ++ MALI_DEBUG_PRINT(6, ("Waking up elements in wait queue %p ....\n", queue)); ++ ++ wake_up_all(&queue->wait_queue); ++ ++ MALI_DEBUG_PRINT(6, ("... elements in wait queue %p woken up\n", queue)); +} -+#endif + -+struct kbase_mem_phy_alloc *kbase_map_external_resource( -+ struct kbase_context *kctx, struct kbase_va_region *reg, -+ struct mm_struct *locked_mm -+#ifdef CONFIG_KDS -+ , u32 *kds_res_count, struct kds_resource **kds_resources, -+ unsigned long *kds_access_bitmap, bool exclusive -+#endif -+ ) ++void _mali_osk_wait_queue_term(_mali_osk_wait_queue_t *queue) +{ -+ int err; ++ /* Parameter validation */ ++ MALI_DEBUG_ASSERT_POINTER(queue); + -+ /* decide what needs to happen for this resource */ -+ switch (reg->gpu_alloc->type) { -+ case KBASE_MEM_TYPE_IMPORTED_USER_BUF: { -+ if (reg->gpu_alloc->imported.user_buf.mm != locked_mm) -+ goto exit; ++ /* Linux requires no explicit termination of wait queues */ ++ kfree(queue); ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c +new file mode 100755 +index 000000000..d5e258a83 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c +@@ -0,0 +1,240 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ reg->gpu_alloc->imported.user_buf.current_mapping_usage_count++; -+ if (1 == reg->gpu_alloc->imported.user_buf.current_mapping_usage_count) { -+ err = kbase_jd_user_buf_map(kctx, reg); -+ if (err) { -+ reg->gpu_alloc->imported.user_buf.current_mapping_usage_count--; -+ goto exit; -+ } -+ } -+ } -+ break; -+ case KBASE_MEM_TYPE_IMPORTED_UMP: { -+#if defined(CONFIG_KDS) && defined(CONFIG_UMP) -+ if (kds_res_count) { -+ struct kds_resource *kds_res; ++/** ++ * @file mali_osk_wq.c ++ * Implementation of the OS abstraction layer for the kernel device driver ++ */ + -+ kds_res = ump_dd_kds_resource_get( -+ reg->gpu_alloc->imported.ump_handle); -+ if (kds_res) -+ add_kds_resource(kds_res, kds_resources, -+ kds_res_count, -+ kds_access_bitmap, exclusive); -+ } -+#endif /*defined(CONFIG_KDS) && defined(CONFIG_UMP) */ -+ break; -+ } -+#ifdef CONFIG_DMA_SHARED_BUFFER -+ case KBASE_MEM_TYPE_IMPORTED_UMM: { -+#ifdef CONFIG_DMA_SHARED_BUFFER_USES_KDS -+ if (kds_res_count) { -+ struct kds_resource *kds_res; ++#include /* For memory allocation */ ++#include ++#include ++#include + -+ kds_res = get_dma_buf_kds_resource( -+ reg->gpu_alloc->imported.umm.dma_buf); -+ if (kds_res) -+ add_kds_resource(kds_res, kds_resources, -+ kds_res_count, -+ kds_access_bitmap, exclusive); -+ } ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_kernel_license.h" ++#include "mali_kernel_linux.h" ++ ++typedef struct _mali_osk_wq_work_s { ++ _mali_osk_wq_work_handler_t handler; ++ void *data; ++ mali_bool high_pri; ++ struct work_struct work_handle; ++} mali_osk_wq_work_object_t; ++ ++typedef struct _mali_osk_wq_delayed_work_s { ++ _mali_osk_wq_work_handler_t handler; ++ void *data; ++ struct delayed_work work; ++} mali_osk_wq_delayed_work_object_t; ++ ++#if MALI_LICENSE_IS_GPL ++static struct workqueue_struct *mali_wq_normal = NULL; ++static struct workqueue_struct *mali_wq_high = NULL; +#endif -+ reg->gpu_alloc->imported.umm.current_mapping_usage_count++; -+ if (1 == reg->gpu_alloc->imported.umm.current_mapping_usage_count) { -+ err = kbase_jd_umm_map(kctx, reg); -+ if (err) { -+ reg->gpu_alloc->imported.umm.current_mapping_usage_count--; -+ goto exit; -+ } -+ } -+ break; -+ } ++ ++static void _mali_osk_wq_work_func(struct work_struct *work); ++ ++_mali_osk_errcode_t _mali_osk_wq_init(void) ++{ ++#if MALI_LICENSE_IS_GPL ++ MALI_DEBUG_ASSERT(NULL == mali_wq_normal); ++ MALI_DEBUG_ASSERT(NULL == mali_wq_high); ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) ++ mali_wq_normal = alloc_workqueue("mali", WQ_UNBOUND, 0); ++ mali_wq_high = alloc_workqueue("mali_high_pri", WQ_HIGHPRI | WQ_UNBOUND, 0); ++#else ++ mali_wq_normal = create_workqueue("mali"); ++ mali_wq_high = create_workqueue("mali_high_pri"); +#endif -+ default: -+ goto exit; ++ if (NULL == mali_wq_normal || NULL == mali_wq_high) { ++ MALI_PRINT_ERROR(("Unable to create Mali workqueues\n")); ++ ++ if (mali_wq_normal) destroy_workqueue(mali_wq_normal); ++ if (mali_wq_high) destroy_workqueue(mali_wq_high); ++ ++ mali_wq_normal = NULL; ++ mali_wq_high = NULL; ++ ++ return _MALI_OSK_ERR_FAULT; + } ++#endif /* MALI_LICENSE_IS_GPL */ + -+ return kbase_mem_phy_alloc_get(reg->gpu_alloc); -+exit: -+ return NULL; ++ return _MALI_OSK_ERR_OK; +} + -+void kbase_unmap_external_resource(struct kbase_context *kctx, -+ struct kbase_va_region *reg, struct kbase_mem_phy_alloc *alloc) ++void _mali_osk_wq_flush(void) +{ -+ switch (alloc->type) { -+#ifdef CONFIG_DMA_SHARED_BUFFER -+ case KBASE_MEM_TYPE_IMPORTED_UMM: { -+ alloc->imported.umm.current_mapping_usage_count--; ++#if MALI_LICENSE_IS_GPL ++ flush_workqueue(mali_wq_high); ++ flush_workqueue(mali_wq_normal); ++#else ++ flush_scheduled_work(); ++#endif ++} + -+ if (0 == alloc->imported.umm.current_mapping_usage_count) { -+ if (reg && reg->gpu_alloc == alloc) { -+ int err; ++void _mali_osk_wq_term(void) ++{ ++#if MALI_LICENSE_IS_GPL ++ MALI_DEBUG_ASSERT(NULL != mali_wq_normal); ++ MALI_DEBUG_ASSERT(NULL != mali_wq_high); + -+ err = kbase_mmu_teardown_pages( -+ kctx, -+ reg->start_pfn, -+ alloc->nents); -+ WARN_ON(err); -+ } ++ flush_workqueue(mali_wq_normal); ++ destroy_workqueue(mali_wq_normal); + -+ kbase_jd_umm_unmap(kctx, alloc); -+ } -+ } -+ break; -+#endif /* CONFIG_DMA_SHARED_BUFFER */ -+ case KBASE_MEM_TYPE_IMPORTED_USER_BUF: { -+ alloc->imported.user_buf.current_mapping_usage_count--; ++ flush_workqueue(mali_wq_high); ++ destroy_workqueue(mali_wq_high); + -+ if (0 == alloc->imported.user_buf.current_mapping_usage_count) { -+ bool writeable = true; ++ mali_wq_normal = NULL; ++ mali_wq_high = NULL; ++#else ++ flush_scheduled_work(); ++#endif ++} + -+ if (reg && reg->gpu_alloc == alloc) -+ kbase_mmu_teardown_pages( -+ kctx, -+ reg->start_pfn, -+ kbase_reg_current_backed_size(reg)); ++_mali_osk_wq_work_t *_mali_osk_wq_create_work(_mali_osk_wq_work_handler_t handler, void *data) ++{ ++ mali_osk_wq_work_object_t *work = kmalloc(sizeof(mali_osk_wq_work_object_t), GFP_KERNEL); + -+ if (reg && ((reg->flags & KBASE_REG_GPU_WR) == 0)) -+ writeable = false; ++ if (NULL == work) return NULL; + -+ kbase_jd_user_buf_unmap(kctx, alloc, writeable); -+ } -+ } -+ break; -+ default: -+ break; -+ } -+ kbase_mem_phy_alloc_put(alloc); ++ work->handler = handler; ++ work->data = data; ++ work->high_pri = MALI_FALSE; ++ ++ INIT_WORK(&work->work_handle, _mali_osk_wq_work_func); ++ ++ return work; +} + -+struct kbase_ctx_ext_res_meta *kbase_sticky_resource_acquire( -+ struct kbase_context *kctx, u64 gpu_addr) ++_mali_osk_wq_work_t *_mali_osk_wq_create_work_high_pri(_mali_osk_wq_work_handler_t handler, void *data) +{ -+ struct kbase_ctx_ext_res_meta *meta = NULL; -+ struct kbase_ctx_ext_res_meta *walker; ++ mali_osk_wq_work_object_t *work = kmalloc(sizeof(mali_osk_wq_work_object_t), GFP_KERNEL); + -+ lockdep_assert_held(&kctx->reg_lock); ++ if (NULL == work) return NULL; + -+ /* -+ * Walk the per context external resource metadata list for the -+ * metadata which matches the region which is being acquired. -+ */ -+ list_for_each_entry(walker, &kctx->ext_res_meta_head, ext_res_node) { -+ if (walker->gpu_addr == gpu_addr) { -+ meta = walker; -+ break; -+ } -+ } ++ work->handler = handler; ++ work->data = data; ++ work->high_pri = MALI_TRUE; + -+ /* No metadata exists so create one. */ -+ if (!meta) { -+ struct kbase_va_region *reg; ++ INIT_WORK(&work->work_handle, _mali_osk_wq_work_func); + -+ /* Find the region */ -+ reg = kbase_region_tracker_find_region_enclosing_address( -+ kctx, gpu_addr); -+ if (NULL == reg || (reg->flags & KBASE_REG_FREE)) -+ goto failed; ++ return work; ++} + -+ /* Allocate the metadata object */ -+ meta = kzalloc(sizeof(*meta), GFP_KERNEL); -+ if (!meta) -+ goto failed; ++void _mali_osk_wq_delete_work(_mali_osk_wq_work_t *work) ++{ ++ mali_osk_wq_work_object_t *work_object = (mali_osk_wq_work_object_t *)work; ++ _mali_osk_wq_flush(); ++ kfree(work_object); ++} + -+ /* -+ * Fill in the metadata object and acquire a reference -+ * for the physical resource. -+ */ -+ meta->alloc = kbase_map_external_resource(kctx, reg, NULL -+#ifdef CONFIG_KDS -+ , NULL, NULL, -+ NULL, false ++void _mali_osk_wq_delete_work_nonflush(_mali_osk_wq_work_t *work) ++{ ++ mali_osk_wq_work_object_t *work_object = (mali_osk_wq_work_object_t *)work; ++ kfree(work_object); ++} ++ ++void _mali_osk_wq_schedule_work(_mali_osk_wq_work_t *work) ++{ ++ mali_osk_wq_work_object_t *work_object = (mali_osk_wq_work_object_t *)work; ++#if MALI_LICENSE_IS_GPL ++ queue_work(mali_wq_normal, &work_object->work_handle); ++#else ++ schedule_work(&work_object->work_handle); +#endif -+ ); ++} + -+ if (!meta->alloc) -+ goto fail_map; ++void _mali_osk_wq_schedule_work_high_pri(_mali_osk_wq_work_t *work) ++{ ++ mali_osk_wq_work_object_t *work_object = (mali_osk_wq_work_object_t *)work; ++#if MALI_LICENSE_IS_GPL ++ queue_work(mali_wq_high, &work_object->work_handle); ++#else ++ schedule_work(&work_object->work_handle); ++#endif ++} + -+ meta->gpu_addr = reg->start_pfn << PAGE_SHIFT; ++static void _mali_osk_wq_work_func(struct work_struct *work) ++{ ++ mali_osk_wq_work_object_t *work_object; + -+ list_add(&meta->ext_res_node, &kctx->ext_res_meta_head); -+ } ++ work_object = _MALI_OSK_CONTAINER_OF(work, mali_osk_wq_work_object_t, work_handle); + -+ return meta; ++#if MALI_LICENSE_IS_GPL ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) ++ /* We want highest Dynamic priority of the thread so that the Jobs depending ++ ** on this thread could be scheduled in time. Without this, this thread might ++ ** sometimes need to wait for some threads in user mode to finish its round-robin ++ ** time, causing *bubble* in the Mali pipeline. Thanks to the new implementation ++ ** of high-priority workqueue in new kernel, this only happens in older kernel. ++ */ ++ if (MALI_TRUE == work_object->high_pri) { ++ set_user_nice(current, -19); ++ } ++#endif ++#endif /* MALI_LICENSE_IS_GPL */ + -+fail_map: -+ kfree(meta); -+failed: -+ return NULL; ++ work_object->handler(work_object->data); +} + -+bool kbase_sticky_resource_release(struct kbase_context *kctx, -+ struct kbase_ctx_ext_res_meta *meta, u64 gpu_addr) ++static void _mali_osk_wq_delayed_work_func(struct work_struct *work) +{ -+ struct kbase_ctx_ext_res_meta *walker; -+ struct kbase_va_region *reg; ++ mali_osk_wq_delayed_work_object_t *work_object; + -+ lockdep_assert_held(&kctx->reg_lock); ++ work_object = _MALI_OSK_CONTAINER_OF(work, mali_osk_wq_delayed_work_object_t, work.work); ++ work_object->handler(work_object->data); ++} + -+ /* Search of the metadata if one isn't provided. */ -+ if (!meta) { -+ /* -+ * Walk the per context external resource metadata list for the -+ * metadata which matches the region which is being released. -+ */ -+ list_for_each_entry(walker, &kctx->ext_res_meta_head, -+ ext_res_node) { -+ if (walker->gpu_addr == gpu_addr) { -+ meta = walker; -+ break; -+ } -+ } -+ } ++mali_osk_wq_delayed_work_object_t *_mali_osk_wq_delayed_create_work(_mali_osk_wq_work_handler_t handler, void *data) ++{ ++ mali_osk_wq_delayed_work_object_t *work = kmalloc(sizeof(mali_osk_wq_delayed_work_object_t), GFP_KERNEL); + -+ /* No metadata so just return. */ -+ if (!meta) -+ return false; ++ if (NULL == work) return NULL; + -+ /* Drop the physical memory reference and free the metadata. */ -+ reg = kbase_region_tracker_find_region_enclosing_address( -+ kctx, -+ meta->gpu_addr); ++ work->handler = handler; ++ work->data = data; + -+ kbase_unmap_external_resource(kctx, reg, meta->alloc); -+ list_del(&meta->ext_res_node); -+ kfree(meta); ++ INIT_DELAYED_WORK(&work->work, _mali_osk_wq_delayed_work_func); + -+ return true; ++ return work; +} + -+int kbase_sticky_resource_init(struct kbase_context *kctx) ++void _mali_osk_wq_delayed_delete_work_nonflush(_mali_osk_wq_delayed_work_t *work) +{ -+ INIT_LIST_HEAD(&kctx->ext_res_meta_head); ++ mali_osk_wq_delayed_work_object_t *work_object = (mali_osk_wq_delayed_work_object_t *)work; ++ kfree(work_object); ++} + -+ return 0; ++void _mali_osk_wq_delayed_cancel_work_async(_mali_osk_wq_delayed_work_t *work) ++{ ++ mali_osk_wq_delayed_work_object_t *work_object = (mali_osk_wq_delayed_work_object_t *)work; ++ cancel_delayed_work(&work_object->work); +} + -+void kbase_sticky_resource_term(struct kbase_context *kctx) ++void _mali_osk_wq_delayed_cancel_work_sync(_mali_osk_wq_delayed_work_t *work) +{ -+ struct kbase_ctx_ext_res_meta *walker; ++ mali_osk_wq_delayed_work_object_t *work_object = (mali_osk_wq_delayed_work_object_t *)work; ++ cancel_delayed_work_sync(&work_object->work); ++} + -+ lockdep_assert_held(&kctx->reg_lock); ++void _mali_osk_wq_delayed_schedule_work(_mali_osk_wq_delayed_work_t *work, u32 delay) ++{ ++ mali_osk_wq_delayed_work_object_t *work_object = (mali_osk_wq_delayed_work_object_t *)work; + -+ /* -+ * Free any sticky resources which haven't been unmapped. -+ * -+ * Note: -+ * We don't care about refcounts at this point as no future -+ * references to the meta data will be made. -+ * Region termination would find these if we didn't free them -+ * here, but it's more efficient if we do the clean up here. -+ */ -+ while (!list_empty(&kctx->ext_res_meta_head)) { -+ walker = list_first_entry(&kctx->ext_res_meta_head, -+ struct kbase_ctx_ext_res_meta, ext_res_node); ++#if MALI_LICENSE_IS_GPL ++ queue_delayed_work(mali_wq_normal, &work_object->work, delay); ++#else ++ schedule_delayed_work(&work_object->work, delay); ++#endif + -+ kbase_sticky_resource_release(kctx, walker, 0); -+ } +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem.h +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c b/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c new file mode 100755 -index 000000000000..f2fd75e2018b +index 000000000..931d7f07a --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem.h -@@ -0,0 +1,1142 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c +@@ -0,0 +1,23 @@ ++/** ++ * Copyright (C) 2010, 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + -+ -+ -+ -+ +/** -+ * @file mali_kbase_mem.h -+ * Base kernel memory APIs ++ * @file mali_pmu_power_up_down.c + */ + -+#ifndef _KBASE_MEM_H_ -+#define _KBASE_MEM_H_ -+ -+#ifndef _KBASE_H_ -+#error "Don't include this file directly, use mali_kbase.h instead" -+#endif ++#include ++#include "mali_executor.h" + -+#include -+#ifdef CONFIG_KDS -+#include -+#endif /* CONFIG_KDS */ -+#ifdef CONFIG_UMP -+#include -+#endif /* CONFIG_UMP */ -+#include "mali_base_kernel.h" -+#include -+#include "mali_kbase_pm.h" -+#include "mali_kbase_defs.h" -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+#include "mali_kbase_gator.h" -+#endif -+/* Required for kbase_mem_evictable_unmake */ -+#include "mali_kbase_mem_linux.h" ++int mali_perf_set_num_pp_cores(unsigned int num_cores) ++{ ++ return mali_executor_set_perf_level(num_cores, MALI_FALSE); ++} + -+/* Part of the workaround for uTLB invalid pages is to ensure we grow/shrink tmem by 4 pages at a time */ -+#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2_HW_ISSUE_8316 (2) /* round to 4 pages */ ++EXPORT_SYMBOL(mali_perf_set_num_pp_cores); +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h +new file mode 100755 +index 000000000..4661cac42 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h +@@ -0,0 +1,17 @@ ++/* ++ * Copyright (C) 2012, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+/* Part of the workaround for PRLAM-9630 requires us to grow/shrink memory by 8 pages. -+The MMU reads in 8 page table entries from memory at a time, if we have more than one page fault within the same 8 pages and -+page tables are updated accordingly, the MMU does not re-read the page table entries from memory for the subsequent page table -+updates and generates duplicate page faults as the page table information used by the MMU is not valid. */ -+#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2_HW_ISSUE_9630 (3) /* round to 8 pages */ ++#ifndef __MALI_PROFILING_EVENTS_H__ ++#define __MALI_PROFILING_EVENTS_H__ + -+#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2 (0) /* round to 1 page */ ++/* Simple wrapper in order to find the OS specific location of this file */ ++#include + -+/* This must always be a power of 2 */ -+#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES (1u << KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2) -+#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_HW_ISSUE_8316 (1u << KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2_HW_ISSUE_8316) -+#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_HW_ISSUE_9630 (1u << KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2_HW_ISSUE_9630) -+/** -+ * A CPU mapping ++#endif /* __MALI_PROFILING_EVENTS_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h +new file mode 100755 +index 000000000..6fdaa427c +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h +@@ -0,0 +1,17 @@ ++/* ++ * Copyright (C) 2012-2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+struct kbase_cpu_mapping { -+ struct list_head mappings_list; -+ struct kbase_mem_phy_alloc *alloc; -+ struct kbase_context *kctx; -+ struct kbase_va_region *region; -+ int count; -+ int free_on_close; -+}; -+ -+enum kbase_memory_type { -+ KBASE_MEM_TYPE_NATIVE, -+ KBASE_MEM_TYPE_IMPORTED_UMP, -+ KBASE_MEM_TYPE_IMPORTED_UMM, -+ KBASE_MEM_TYPE_IMPORTED_USER_BUF, -+ KBASE_MEM_TYPE_ALIAS, -+ KBASE_MEM_TYPE_TB, -+ KBASE_MEM_TYPE_RAW -+}; + -+/* internal structure, mirroring base_mem_aliasing_info, -+ * but with alloc instead of a gpu va (handle) */ -+struct kbase_aliased { -+ struct kbase_mem_phy_alloc *alloc; /* NULL for special, non-NULL for native */ -+ u64 offset; /* in pages */ -+ u64 length; /* in pages */ -+}; ++#ifndef __MALI_PROFILING_GATOR_API_H__ ++#define __MALI_PROFILING_GATOR_API_H__ + -+/** -+ * @brief Physical pages tracking object properties -+ */ -+#define KBASE_MEM_PHY_ALLOC_ACCESSED_CACHED (1ul << 0) -+#define KBASE_MEM_PHY_ALLOC_LARGE (1ul << 1) ++/* Simple wrapper in order to find the OS specific location of this file */ ++#include + -+/* physical pages tracking object. -+ * Set up to track N pages. -+ * N not stored here, the creator holds that info. -+ * This object only tracks how many elements are actually valid (present). -+ * Changing of nents or *pages should only happen if the kbase_mem_phy_alloc is not -+ * shared with another region or client. CPU mappings are OK to exist when changing, as -+ * long as the tracked mappings objects are updated as part of the change. ++#endif /* __MALI_PROFILING_GATOR_API_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c +new file mode 100755 +index 000000000..c3a526f0a +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c +@@ -0,0 +1,275 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+struct kbase_mem_phy_alloc { -+ struct kref kref; /* number of users of this alloc */ -+ atomic_t gpu_mappings; -+ size_t nents; /* 0..N */ -+ struct tagged_addr *pages; /* N elements, only 0..nents are valid */ -+ -+ /* kbase_cpu_mappings */ -+ struct list_head mappings; -+ -+ /* Node used to store this allocation on the eviction list */ -+ struct list_head evict_node; -+ /* Physical backing size when the pages where evicted */ -+ size_t evicted; -+ /* -+ * Back reference to the region structure which created this -+ * allocation, or NULL if it has been freed. -+ */ -+ struct kbase_va_region *reg; + -+ /* type of buffer */ -+ enum kbase_memory_type type; ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_osk_mali.h" ++#include "mali_ukk.h" ++#include "mali_timestamp.h" ++#include "mali_osk_profiling.h" ++#include "mali_user_settings_db.h" ++#include "mali_profiling_internal.h" + -+ unsigned long properties; ++typedef struct mali_profiling_entry { ++ u64 timestamp; ++ u32 event_id; ++ u32 data[5]; ++} mali_profiling_entry; + -+ struct list_head zone_cache; ++typedef enum mali_profiling_state { ++ MALI_PROFILING_STATE_UNINITIALIZED, ++ MALI_PROFILING_STATE_IDLE, ++ MALI_PROFILING_STATE_RUNNING, ++ MALI_PROFILING_STATE_RETURN, ++} mali_profiling_state; + -+ /* member in union valid based on @a type */ -+ union { -+#ifdef CONFIG_UMP -+ ump_dd_handle ump_handle; -+#endif /* CONFIG_UMP */ -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+ struct { -+ struct dma_buf *dma_buf; -+ struct dma_buf_attachment *dma_attachment; -+ unsigned int current_mapping_usage_count; -+ struct sg_table *sgt; -+ } umm; -+#endif /* defined(CONFIG_DMA_SHARED_BUFFER) */ -+ struct { -+ u64 stride; -+ size_t nents; -+ struct kbase_aliased *aliased; -+ } alias; -+ /* Used by type = (KBASE_MEM_TYPE_NATIVE, KBASE_MEM_TYPE_TB) */ -+ struct kbase_context *kctx; -+ struct kbase_alloc_import_user_buf { -+ unsigned long address; -+ unsigned long size; -+ unsigned long nr_pages; -+ struct page **pages; -+ /* top bit (1<<31) of current_mapping_usage_count -+ * specifies that this import was pinned on import -+ * See PINNED_ON_IMPORT -+ */ -+ u32 current_mapping_usage_count; -+ struct mm_struct *mm; -+ dma_addr_t *dma_addrs; -+ } user_buf; -+ } imported; -+}; ++static _mali_osk_mutex_t *lock = NULL; ++static mali_profiling_state prof_state = MALI_PROFILING_STATE_UNINITIALIZED; ++static mali_profiling_entry *profile_entries = NULL; ++static _mali_osk_atomic_t profile_insert_index; ++static u32 profile_mask = 0; + -+/* The top bit of kbase_alloc_import_user_buf::current_mapping_usage_count is -+ * used to signify that a buffer was pinned when it was imported. Since the -+ * reference count is limited by the number of atoms that can be submitted at -+ * once there should be no danger of overflowing into this bit. -+ * Stealing the top bit also has the benefit that -+ * current_mapping_usage_count != 0 if and only if the buffer is mapped. -+ */ -+#define PINNED_ON_IMPORT (1<<31) ++static inline void add_event(u32 event_id, u32 data0, u32 data1, u32 data2, u32 data3, u32 data4); + -+static inline void kbase_mem_phy_alloc_gpu_mapped(struct kbase_mem_phy_alloc *alloc) ++void probe_mali_timeline_event(void *data, TP_PROTO(unsigned int event_id, unsigned int d0, unsigned int d1, unsigned ++ int d2, unsigned int d3, unsigned int d4)) +{ -+ KBASE_DEBUG_ASSERT(alloc); -+ /* we only track mappings of NATIVE buffers */ -+ if (alloc->type == KBASE_MEM_TYPE_NATIVE) -+ atomic_inc(&alloc->gpu_mappings); ++ add_event(event_id, d0, d1, d2, d3, d4); +} + -+static inline void kbase_mem_phy_alloc_gpu_unmapped(struct kbase_mem_phy_alloc *alloc) ++_mali_osk_errcode_t _mali_internal_profiling_init(mali_bool auto_start) +{ -+ KBASE_DEBUG_ASSERT(alloc); -+ /* we only track mappings of NATIVE buffers */ -+ if (alloc->type == KBASE_MEM_TYPE_NATIVE) -+ if (0 > atomic_dec_return(&alloc->gpu_mappings)) { -+ pr_err("Mismatched %s:\n", __func__); -+ dump_stack(); ++ profile_entries = NULL; ++ profile_mask = 0; ++ _mali_osk_atomic_init(&profile_insert_index, 0); ++ ++ lock = _mali_osk_mutex_init(_MALI_OSK_LOCKFLAG_ORDERED, _MALI_OSK_LOCK_ORDER_PROFILING); ++ if (NULL == lock) { ++ return _MALI_OSK_ERR_FAULT; ++ } ++ ++ prof_state = MALI_PROFILING_STATE_IDLE; ++ ++ if (MALI_TRUE == auto_start) { ++ u32 limit = MALI_PROFILING_MAX_BUFFER_ENTRIES; /* Use maximum buffer size */ ++ ++ mali_set_user_setting(_MALI_UK_USER_SETTING_SW_EVENTS_ENABLE, MALI_TRUE); ++ if (_MALI_OSK_ERR_OK != _mali_internal_profiling_start(&limit)) { ++ return _MALI_OSK_ERR_FAULT; + } ++ } ++ ++ return _MALI_OSK_ERR_OK; +} + -+/** -+ * kbase_mem_is_imported - Indicate whether a memory type is imported -+ * -+ * @type: the memory type -+ * -+ * Return: true if the memory type is imported, false otherwise -+ */ -+static inline bool kbase_mem_is_imported(enum kbase_memory_type type) ++void _mali_internal_profiling_term(void) +{ -+ return (type == KBASE_MEM_TYPE_IMPORTED_UMP) || -+ (type == KBASE_MEM_TYPE_IMPORTED_UMM) || -+ (type == KBASE_MEM_TYPE_IMPORTED_USER_BUF); -+} ++ u32 count; + -+void kbase_mem_kref_free(struct kref *kref); ++ /* Ensure profiling is stopped */ ++ _mali_internal_profiling_stop(&count); + -+int kbase_mem_init(struct kbase_device *kbdev); -+void kbase_mem_halt(struct kbase_device *kbdev); -+void kbase_mem_term(struct kbase_device *kbdev); ++ prof_state = MALI_PROFILING_STATE_UNINITIALIZED; + -+static inline struct kbase_mem_phy_alloc *kbase_mem_phy_alloc_get(struct kbase_mem_phy_alloc *alloc) -+{ -+ kref_get(&alloc->kref); -+ return alloc; ++ if (NULL != profile_entries) { ++ _mali_osk_vfree(profile_entries); ++ profile_entries = NULL; ++ } ++ ++ if (NULL != lock) { ++ _mali_osk_mutex_term(lock); ++ lock = NULL; ++ } +} + -+static inline struct kbase_mem_phy_alloc *kbase_mem_phy_alloc_put(struct kbase_mem_phy_alloc *alloc) ++_mali_osk_errcode_t _mali_internal_profiling_start(u32 *limit) +{ -+ kref_put(&alloc->kref, kbase_mem_kref_free); -+ return NULL; -+} ++ _mali_osk_errcode_t ret; ++ mali_profiling_entry *new_profile_entries; + -+/** -+ * A GPU memory region, and attributes for CPU mappings. -+ */ -+struct kbase_va_region { -+ struct rb_node rblink; -+ struct list_head link; ++ _mali_osk_mutex_wait(lock); + -+ struct kbase_context *kctx; /* Backlink to base context */ ++ if (MALI_PROFILING_STATE_RUNNING == prof_state) { ++ _mali_osk_mutex_signal(lock); ++ return _MALI_OSK_ERR_BUSY; ++ } + -+ u64 start_pfn; /* The PFN in GPU space */ -+ size_t nr_pages; ++ new_profile_entries = _mali_osk_valloc(*limit * sizeof(mali_profiling_entry)); + -+/* Free region */ -+#define KBASE_REG_FREE (1ul << 0) -+/* CPU write access */ -+#define KBASE_REG_CPU_WR (1ul << 1) -+/* GPU write access */ -+#define KBASE_REG_GPU_WR (1ul << 2) -+/* No eXecute flag */ -+#define KBASE_REG_GPU_NX (1ul << 3) -+/* Is CPU cached? */ -+#define KBASE_REG_CPU_CACHED (1ul << 4) -+/* Is GPU cached? */ -+#define KBASE_REG_GPU_CACHED (1ul << 5) ++ if (NULL == new_profile_entries) { ++ _mali_osk_mutex_signal(lock); ++ _mali_osk_vfree(new_profile_entries); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+#define KBASE_REG_GROWABLE (1ul << 6) -+/* Can grow on pf? */ -+#define KBASE_REG_PF_GROW (1ul << 7) ++ if (MALI_PROFILING_MAX_BUFFER_ENTRIES < *limit) { ++ *limit = MALI_PROFILING_MAX_BUFFER_ENTRIES; ++ } + -+/* Bit 8 is unused */ ++ profile_mask = 1; ++ while (profile_mask <= *limit) { ++ profile_mask <<= 1; ++ } ++ profile_mask >>= 1; + -+/* inner shareable coherency */ -+#define KBASE_REG_SHARE_IN (1ul << 9) -+/* inner & outer shareable coherency */ -+#define KBASE_REG_SHARE_BOTH (1ul << 10) ++ *limit = profile_mask; + -+/* Space for 4 different zones */ -+#define KBASE_REG_ZONE_MASK (3ul << 11) -+#define KBASE_REG_ZONE(x) (((x) & 3) << 11) ++ profile_mask--; /* turns the power of two into a mask of one less */ + -+/* GPU read access */ -+#define KBASE_REG_GPU_RD (1ul<<13) -+/* CPU read access */ -+#define KBASE_REG_CPU_RD (1ul<<14) ++ if (MALI_PROFILING_STATE_IDLE != prof_state) { ++ _mali_osk_mutex_signal(lock); ++ _mali_osk_vfree(new_profile_entries); ++ return _MALI_OSK_ERR_INVALID_ARGS; /* invalid to call this function in this state */ ++ } + -+/* Index of chosen MEMATTR for this region (0..7) */ -+#define KBASE_REG_MEMATTR_MASK (7ul << 16) -+#define KBASE_REG_MEMATTR_INDEX(x) (((x) & 7) << 16) -+#define KBASE_REG_MEMATTR_VALUE(x) (((x) & KBASE_REG_MEMATTR_MASK) >> 16) ++ profile_entries = new_profile_entries; + -+#define KBASE_REG_SECURE (1ul << 19) ++ ret = _mali_timestamp_reset(); + -+#define KBASE_REG_DONT_NEED (1ul << 20) ++ if (_MALI_OSK_ERR_OK == ret) { ++ prof_state = MALI_PROFILING_STATE_RUNNING; ++ } else { ++ _mali_osk_vfree(profile_entries); ++ profile_entries = NULL; ++ } + -+/* Imported buffer is padded? */ -+#define KBASE_REG_IMPORT_PAD (1ul << 21) ++ register_trace_mali_timeline_event(probe_mali_timeline_event, NULL); + -+/* Bit 22 is reserved. -+ * -+ * Do not remove, use the next unreserved bit for new flags */ -+#define KBASE_REG_RESERVED_BIT_22 (1ul << 22) ++ _mali_osk_mutex_signal(lock); ++ return ret; ++} + -+#define KBASE_REG_ZONE_SAME_VA KBASE_REG_ZONE(0) ++static inline void add_event(u32 event_id, u32 data0, u32 data1, u32 data2, u32 data3, u32 data4) ++{ ++ u32 cur_index = (_mali_osk_atomic_inc_return(&profile_insert_index) - 1) & profile_mask; + -+/* only used with 32-bit clients */ -+/* -+ * On a 32bit platform, custom VA should be wired from (4GB + shader region) -+ * to the VA limit of the GPU. Unfortunately, the Linux mmap() interface -+ * limits us to 2^32 pages (2^44 bytes, see mmap64 man page for reference). -+ * So we put the default limit to the maximum possible on Linux and shrink -+ * it down, if required by the GPU, during initialization. -+ */ ++ profile_entries[cur_index].timestamp = _mali_timestamp_get(); ++ profile_entries[cur_index].event_id = event_id; ++ profile_entries[cur_index].data[0] = data0; ++ profile_entries[cur_index].data[1] = data1; ++ profile_entries[cur_index].data[2] = data2; ++ profile_entries[cur_index].data[3] = data3; ++ profile_entries[cur_index].data[4] = data4; + -+/* -+ * Dedicated 16MB region for shader code: -+ * VA range 0x101000000-0x102000000 -+ */ -+#define KBASE_REG_ZONE_EXEC KBASE_REG_ZONE(1) -+#define KBASE_REG_ZONE_EXEC_BASE (0x101000000ULL >> PAGE_SHIFT) -+#define KBASE_REG_ZONE_EXEC_SIZE ((16ULL * 1024 * 1024) >> PAGE_SHIFT) ++ /* If event is "leave API function", add current memory usage to the event ++ * as data point 4. This is used in timeline profiling to indicate how ++ * much memory was used when leaving a function. */ ++ if (event_id == (MALI_PROFILING_EVENT_TYPE_SINGLE | MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | MALI_PROFILING_EVENT_REASON_SINGLE_SW_LEAVE_API_FUNC)) { ++ profile_entries[cur_index].data[4] = _mali_ukk_report_memory_usage(); ++ } ++} + -+#define KBASE_REG_ZONE_CUSTOM_VA KBASE_REG_ZONE(2) -+#define KBASE_REG_ZONE_CUSTOM_VA_BASE (KBASE_REG_ZONE_EXEC_BASE + KBASE_REG_ZONE_EXEC_SIZE) /* Starting after KBASE_REG_ZONE_EXEC */ -+#define KBASE_REG_ZONE_CUSTOM_VA_SIZE (((1ULL << 44) >> PAGE_SHIFT) - KBASE_REG_ZONE_CUSTOM_VA_BASE) -+/* end 32-bit clients only */ ++_mali_osk_errcode_t _mali_internal_profiling_stop(u32 *count) ++{ ++ _mali_osk_mutex_wait(lock); + -+ unsigned long flags; ++ if (MALI_PROFILING_STATE_RUNNING != prof_state) { ++ _mali_osk_mutex_signal(lock); ++ return _MALI_OSK_ERR_INVALID_ARGS; /* invalid to call this function in this state */ ++ } + -+ size_t extent; /* nr of pages alloc'd on PF */ ++ /* go into return state (user to retreive events), no more events will be added after this */ ++ prof_state = MALI_PROFILING_STATE_RETURN; + -+ struct kbase_mem_phy_alloc *cpu_alloc; /* the one alloc object we mmap to the CPU when mapping this region */ -+ struct kbase_mem_phy_alloc *gpu_alloc; /* the one alloc object we mmap to the GPU when mapping this region */ ++ unregister_trace_mali_timeline_event(probe_mali_timeline_event, NULL); + -+ /* non-NULL if this memory object is a kds_resource */ -+ struct kds_resource *kds_res; ++ _mali_osk_mutex_signal(lock); + -+ /* List head used to store the region in the JIT allocation pool */ -+ struct list_head jit_node; -+}; ++ tracepoint_synchronize_unregister(); + -+/* Common functions */ -+static inline struct tagged_addr *kbase_get_cpu_phy_pages( -+ struct kbase_va_region *reg) -+{ -+ KBASE_DEBUG_ASSERT(reg); -+ KBASE_DEBUG_ASSERT(reg->cpu_alloc); -+ KBASE_DEBUG_ASSERT(reg->gpu_alloc); -+ KBASE_DEBUG_ASSERT(reg->cpu_alloc->nents == reg->gpu_alloc->nents); ++ *count = _mali_osk_atomic_read(&profile_insert_index); ++ if (*count > profile_mask) *count = profile_mask; + -+ return reg->cpu_alloc->pages; ++ return _MALI_OSK_ERR_OK; +} + -+static inline struct tagged_addr *kbase_get_gpu_phy_pages( -+ struct kbase_va_region *reg) ++u32 _mali_internal_profiling_get_count(void) +{ -+ KBASE_DEBUG_ASSERT(reg); -+ KBASE_DEBUG_ASSERT(reg->cpu_alloc); -+ KBASE_DEBUG_ASSERT(reg->gpu_alloc); -+ KBASE_DEBUG_ASSERT(reg->cpu_alloc->nents == reg->gpu_alloc->nents); ++ u32 retval = 0; + -+ return reg->gpu_alloc->pages; ++ _mali_osk_mutex_wait(lock); ++ if (MALI_PROFILING_STATE_RETURN == prof_state) { ++ retval = _mali_osk_atomic_read(&profile_insert_index); ++ if (retval > profile_mask) retval = profile_mask; ++ } ++ _mali_osk_mutex_signal(lock); ++ ++ return retval; +} + -+static inline size_t kbase_reg_current_backed_size(struct kbase_va_region *reg) ++_mali_osk_errcode_t _mali_internal_profiling_get_event(u32 index, u64 *timestamp, u32 *event_id, u32 data[5]) +{ -+ KBASE_DEBUG_ASSERT(reg); -+ /* if no alloc object the backed size naturally is 0 */ -+ if (!reg->cpu_alloc) -+ return 0; ++ u32 raw_index = _mali_osk_atomic_read(&profile_insert_index); + -+ KBASE_DEBUG_ASSERT(reg->cpu_alloc); -+ KBASE_DEBUG_ASSERT(reg->gpu_alloc); -+ KBASE_DEBUG_ASSERT(reg->cpu_alloc->nents == reg->gpu_alloc->nents); ++ _mali_osk_mutex_wait(lock); + -+ return reg->cpu_alloc->nents; -+} ++ if (index < profile_mask) { ++ if ((raw_index & ~profile_mask) != 0) { ++ index += raw_index; ++ index &= profile_mask; ++ } + -+#define KBASE_MEM_PHY_ALLOC_LARGE_THRESHOLD ((size_t)(4*1024)) /* size above which vmalloc is used over kmalloc */ ++ if (prof_state != MALI_PROFILING_STATE_RETURN) { ++ _mali_osk_mutex_signal(lock); ++ return _MALI_OSK_ERR_INVALID_ARGS; /* invalid to call this function in this state */ ++ } + -+static inline struct kbase_mem_phy_alloc *kbase_alloc_create(size_t nr_pages, enum kbase_memory_type type) -+{ -+ struct kbase_mem_phy_alloc *alloc; -+ size_t alloc_size = sizeof(*alloc) + sizeof(*alloc->pages) * nr_pages; -+ size_t per_page_size = sizeof(*alloc->pages); ++ if (index >= raw_index) { ++ _mali_osk_mutex_signal(lock); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ /* Imported pages may have page private data already in use */ -+ if (type == KBASE_MEM_TYPE_IMPORTED_USER_BUF) { -+ alloc_size += nr_pages * -+ sizeof(*alloc->imported.user_buf.dma_addrs); -+ per_page_size += sizeof(*alloc->imported.user_buf.dma_addrs); ++ *timestamp = profile_entries[index].timestamp; ++ *event_id = profile_entries[index].event_id; ++ data[0] = profile_entries[index].data[0]; ++ data[1] = profile_entries[index].data[1]; ++ data[2] = profile_entries[index].data[2]; ++ data[3] = profile_entries[index].data[3]; ++ data[4] = profile_entries[index].data[4]; ++ } else { ++ _mali_osk_mutex_signal(lock); ++ return _MALI_OSK_ERR_FAULT; + } + -+ /* -+ * Prevent nr_pages*per_page_size + sizeof(*alloc) from -+ * wrapping around. -+ */ -+ if (nr_pages > ((((size_t) -1) - sizeof(*alloc)) -+ / per_page_size)) -+ return ERR_PTR(-ENOMEM); -+ -+ /* Allocate based on the size to reduce internal fragmentation of vmem */ -+ if (alloc_size > KBASE_MEM_PHY_ALLOC_LARGE_THRESHOLD) -+ alloc = vzalloc(alloc_size); -+ else -+ alloc = kzalloc(alloc_size, GFP_KERNEL); ++ _mali_osk_mutex_signal(lock); ++ return _MALI_OSK_ERR_OK; ++} + -+ if (!alloc) -+ return ERR_PTR(-ENOMEM); ++_mali_osk_errcode_t _mali_internal_profiling_clear(void) ++{ ++ _mali_osk_mutex_wait(lock); + -+ /* Store allocation method */ -+ if (alloc_size > KBASE_MEM_PHY_ALLOC_LARGE_THRESHOLD) -+ alloc->properties |= KBASE_MEM_PHY_ALLOC_LARGE; ++ if (MALI_PROFILING_STATE_RETURN != prof_state) { ++ _mali_osk_mutex_signal(lock); ++ return _MALI_OSK_ERR_INVALID_ARGS; /* invalid to call this function in this state */ ++ } + -+ kref_init(&alloc->kref); -+ atomic_set(&alloc->gpu_mappings, 0); -+ alloc->nents = 0; -+ alloc->pages = (void *)(alloc + 1); -+ INIT_LIST_HEAD(&alloc->mappings); -+ alloc->type = type; -+ INIT_LIST_HEAD(&alloc->zone_cache); ++ prof_state = MALI_PROFILING_STATE_IDLE; ++ profile_mask = 0; ++ _mali_osk_atomic_init(&profile_insert_index, 0); + -+ if (type == KBASE_MEM_TYPE_IMPORTED_USER_BUF) -+ alloc->imported.user_buf.dma_addrs = -+ (void *) (alloc->pages + nr_pages); ++ if (NULL != profile_entries) { ++ _mali_osk_vfree(profile_entries); ++ profile_entries = NULL; ++ } + -+ return alloc; ++ _mali_osk_mutex_signal(lock); ++ return _MALI_OSK_ERR_OK; +} + -+static inline int kbase_reg_prepare_native(struct kbase_va_region *reg, -+ struct kbase_context *kctx) ++mali_bool _mali_internal_profiling_is_recording(void) +{ -+ KBASE_DEBUG_ASSERT(reg); -+ KBASE_DEBUG_ASSERT(!reg->cpu_alloc); -+ KBASE_DEBUG_ASSERT(!reg->gpu_alloc); -+ KBASE_DEBUG_ASSERT(reg->flags & KBASE_REG_FREE); -+ -+ reg->cpu_alloc = kbase_alloc_create(reg->nr_pages, -+ KBASE_MEM_TYPE_NATIVE); -+ if (IS_ERR(reg->cpu_alloc)) -+ return PTR_ERR(reg->cpu_alloc); -+ else if (!reg->cpu_alloc) -+ return -ENOMEM; -+ reg->cpu_alloc->imported.kctx = kctx; -+ INIT_LIST_HEAD(®->cpu_alloc->evict_node); -+ if (kbase_ctx_flag(kctx, KCTX_INFINITE_CACHE) -+ && (reg->flags & KBASE_REG_CPU_CACHED)) { -+ reg->gpu_alloc = kbase_alloc_create(reg->nr_pages, -+ KBASE_MEM_TYPE_NATIVE); -+ reg->gpu_alloc->imported.kctx = kctx; -+ INIT_LIST_HEAD(®->gpu_alloc->evict_node); -+ } else { -+ reg->gpu_alloc = kbase_mem_phy_alloc_get(reg->cpu_alloc); -+ } -+ -+ INIT_LIST_HEAD(®->jit_node); -+ reg->flags &= ~KBASE_REG_FREE; -+ return 0; ++ return prof_state == MALI_PROFILING_STATE_RUNNING ? MALI_TRUE : MALI_FALSE; +} + -+static inline int kbase_atomic_add_pages(int num_pages, atomic_t *used_pages) ++mali_bool _mali_internal_profiling_have_recording(void) +{ -+ int new_val = atomic_add_return(num_pages, used_pages); -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+ kbase_trace_mali_total_alloc_pages_change((long long int)new_val); -+#endif -+ return new_val; ++ return prof_state == MALI_PROFILING_STATE_RETURN ? MALI_TRUE : MALI_FALSE; +} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h +new file mode 100755 +index 000000000..f17b45833 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h +@@ -0,0 +1,35 @@ ++/* ++ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+static inline int kbase_atomic_sub_pages(int num_pages, atomic_t *used_pages) -+{ -+ int new_val = atomic_sub_return(num_pages, used_pages); -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+ kbase_trace_mali_total_alloc_pages_change((long long int)new_val); ++#ifndef __MALI_PROFILING_INTERNAL_H__ ++#define __MALI_PROFILING_INTERNAL_H__ ++ ++#ifdef __cplusplus ++extern "C" { +#endif -+ return new_val; ++ ++#include "mali_osk.h" ++ ++int _mali_internal_profiling_init(mali_bool auto_start); ++void _mali_internal_profiling_term(void); ++ ++mali_bool _mali_internal_profiling_is_recording(void); ++mali_bool _mali_internal_profiling_have_recording(void); ++_mali_osk_errcode_t _mali_internal_profiling_clear(void); ++_mali_osk_errcode_t _mali_internal_profiling_get_event(u32 index, u64 *timestamp, u32 *event_id, u32 data[5]); ++u32 _mali_internal_profiling_get_count(void); ++int _mali_internal_profiling_stop(u32 *count); ++int _mali_internal_profiling_start(u32 *limit); ++ ++#ifdef __cplusplus +} ++#endif + ++#endif /* __MALI_PROFILING_INTERNAL_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_sync.c b/drivers/gpu/arm/mali400/mali/linux/mali_sync.c +new file mode 100755 +index 000000000..0d98b518f +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.c +@@ -0,0 +1,665 @@ +/* -+ * Max size for kbdev memory pool (in pages) ++ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+#define KBASE_MEM_POOL_MAX_SIZE_KBDEV (SZ_64M >> PAGE_SHIFT) + -+/* -+ * Max size for kctx memory pool (in pages) -+ */ -+#define KBASE_MEM_POOL_MAX_SIZE_KCTX (SZ_64M >> PAGE_SHIFT) ++#include "mali_sync.h" + -+/* -+ * The order required for a 2MB page allocation (2^order * 4KB = 2MB) -+ */ -+#define KBASE_MEM_POOL_2MB_PAGE_TABLE_ORDER 9 ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_timeline.h" ++#include "mali_executor.h" + -+/* -+ * The order required for a 4KB page allocation -+ */ -+#define KBASE_MEM_POOL_4KB_PAGE_TABLE_ORDER 0 ++#include ++#include ++#include + -+/** -+ * kbase_mem_pool_init - Create a memory pool for a kbase device -+ * @pool: Memory pool to initialize -+ * @max_size: Maximum number of free pages the pool can hold -+ * @order: Page order for physical page size (order=0=>4kB, order=9=>2MB) -+ * @kbdev: Kbase device where memory is used -+ * @next_pool: Pointer to the next pool or NULL. -+ * -+ * Allocations from @pool are in whole pages. Each @pool has a free list where -+ * pages can be quickly allocated from. The free list is initially empty and -+ * filled whenever pages are freed back to the pool. The number of free pages -+ * in the pool will in general not exceed @max_size, but the pool may in -+ * certain corner cases grow above @max_size. -+ * -+ * If @next_pool is not NULL, we will allocate from @next_pool before going to -+ * the kernel allocator. Similarily pages can spill over to @next_pool when -+ * @pool is full. Pages are zeroed before they spill over to another pool, to -+ * prevent leaking information between applications. -+ * -+ * A shrinker is registered so that Linux mm can reclaim pages from the pool as -+ * needed. -+ * -+ * Return: 0 on success, negative -errno on error -+ */ -+int kbase_mem_pool_init(struct kbase_mem_pool *pool, -+ size_t max_size, -+ size_t order, -+ struct kbase_device *kbdev, -+ struct kbase_mem_pool *next_pool); ++struct mali_sync_pt { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ struct sync_pt sync_pt; ++#else ++ struct mali_internal_sync_point sync_pt; ++#endif ++ struct mali_sync_flag *flag; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ struct sync_timeline *sync_tl; /**< Sync timeline this pt is connected to. */ ++#else ++ struct mali_internal_sync_timeline *sync_tl; /**< Sync timeline this pt is connected to. */ ++#endif ++}; + +/** -+ * kbase_mem_pool_term - Destroy a memory pool -+ * @pool: Memory pool to destroy -+ * -+ * Pages in the pool will spill over to @next_pool (if available) or freed to -+ * the kernel. ++ * The sync flag is used to connect sync fences to the Mali Timeline system. Sync fences can be ++ * created from a sync flag, and when the flag is signaled, the sync fences will also be signaled. + */ -+void kbase_mem_pool_term(struct kbase_mem_pool *pool); ++struct mali_sync_flag { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ struct sync_timeline *sync_tl; /**< Sync timeline this flag is connected to. */ ++#else ++ struct mali_internal_sync_timeline *sync_tl; /**< Sync timeline this flag is connected to. */ ++#endif ++ u32 point; /**< Point on timeline. */ ++ int status; /**< 0 if unsignaled, 1 if signaled without error or negative if signaled with error. */ ++ struct kref refcount; /**< Reference count. */ ++}; + +/** -+ * kbase_mem_pool_alloc - Allocate a page from memory pool -+ * @pool: Memory pool to allocate from -+ * -+ * Allocations from the pool are made as follows: -+ * 1. If there are free pages in the pool, allocate a page from @pool. -+ * 2. Otherwise, if @next_pool is not NULL and has free pages, allocate a page -+ * from @next_pool. -+ * 3. Return NULL if no memory in the pool -+ * -+ * Return: Pointer to allocated page, or NULL if allocation failed. ++ * Mali sync timeline is used to connect mali timeline to sync_timeline. ++ * When fence timeout can print more detailed mali timeline system info. + */ -+struct page *kbase_mem_pool_alloc(struct kbase_mem_pool *pool); ++struct mali_sync_timeline_container { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ struct sync_timeline sync_timeline; ++#else ++ struct mali_internal_sync_timeline sync_timeline; ++#endif ++ struct mali_timeline *timeline; ++}; + -+/** -+ * kbase_mem_pool_free - Free a page to memory pool -+ * @pool: Memory pool where page should be freed -+ * @page: Page to free to the pool -+ * @dirty: Whether some of the page may be dirty in the cache. -+ * -+ * Pages are freed to the pool as follows: -+ * 1. If @pool is not full, add @page to @pool. -+ * 2. Otherwise, if @next_pool is not NULL and not full, add @page to -+ * @next_pool. -+ * 3. Finally, free @page to the kernel. -+ */ -+void kbase_mem_pool_free(struct kbase_mem_pool *pool, struct page *page, -+ bool dirty); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++MALI_STATIC_INLINE struct mali_sync_pt *to_mali_sync_pt(struct sync_pt *pt) ++#else ++MALI_STATIC_INLINE struct mali_sync_pt *to_mali_sync_pt(struct mali_internal_sync_point *pt) ++#endif ++{ ++ return container_of(pt, struct mali_sync_pt, sync_pt); ++} + -+/** -+ * kbase_mem_pool_alloc_pages - Allocate pages from memory pool -+ * @pool: Memory pool to allocate from -+ * @nr_pages: Number of pages to allocate -+ * @pages: Pointer to array where the physical address of the allocated -+ * pages will be stored. -+ * @partial_allowed: If fewer pages allocated is allowed -+ * -+ * Like kbase_mem_pool_alloc() but optimized for allocating many pages. -+ * -+ * Return: -+ * On success number of pages allocated (could be less than nr_pages if -+ * partial_allowed). -+ * On error an error code. -+ */ -+int kbase_mem_pool_alloc_pages(struct kbase_mem_pool *pool, size_t nr_pages, -+ struct tagged_addr *pages, bool partial_allowed); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++MALI_STATIC_INLINE struct mali_sync_timeline_container *to_mali_sync_tl_container(struct sync_timeline *sync_tl) ++#else ++MALI_STATIC_INLINE struct mali_sync_timeline_container *to_mali_sync_tl_container(struct mali_internal_sync_timeline *sync_tl) ++#endif ++{ ++ return container_of(sync_tl, struct mali_sync_timeline_container, sync_timeline); ++} + -+/** -+ * kbase_mem_pool_free_pages - Free pages to memory pool -+ * @pool: Memory pool where pages should be freed -+ * @nr_pages: Number of pages to free -+ * @pages: Pointer to array holding the physical addresses of the pages to -+ * free. -+ * @dirty: Whether any pages may be dirty in the cache. -+ * @reclaimed: Whether the pages where reclaimable and thus should bypass -+ * the pool and go straight to the kernel. -+ * -+ * Like kbase_mem_pool_free() but optimized for freeing many pages. -+ */ -+void kbase_mem_pool_free_pages(struct kbase_mem_pool *pool, size_t nr_pages, -+ struct tagged_addr *pages, bool dirty, bool reclaimed); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++static int timeline_has_signaled(struct sync_pt *pt) ++#else ++static int timeline_has_signaled(struct mali_internal_sync_point *pt) ++#endif ++{ ++ struct mali_sync_pt *mpt; + -+/** -+ * kbase_mem_pool_size - Get number of free pages in memory pool -+ * @pool: Memory pool to inspect -+ * -+ * Note: the size of the pool may in certain corner cases exceed @max_size! -+ * -+ * Return: Number of free pages in the pool -+ */ -+static inline size_t kbase_mem_pool_size(struct kbase_mem_pool *pool) ++ MALI_DEBUG_ASSERT_POINTER(pt); ++ mpt = to_mali_sync_pt(pt); ++ ++ MALI_DEBUG_ASSERT_POINTER(mpt->flag); ++ ++ return mpt->flag->status; ++} ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++static void timeline_free_pt(struct sync_pt *pt) ++#else ++static void timeline_free_pt(struct mali_internal_sync_point *pt) ++#endif +{ -+ return READ_ONCE(pool->cur_size); ++ struct mali_sync_pt *mpt; ++ ++ MALI_DEBUG_ASSERT_POINTER(pt); ++ mpt = to_mali_sync_pt(pt); ++ ++ mali_sync_flag_put(mpt->flag); +} + -+/** -+ * kbase_mem_pool_max_size - Get maximum number of free pages in memory pool -+ * @pool: Memory pool to inspect -+ * -+ * Return: Maximum number of free pages in the pool -+ */ -+static inline size_t kbase_mem_pool_max_size(struct kbase_mem_pool *pool) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++static void timeline_release(struct sync_timeline *sync_timeline) ++#else ++static void timeline_release(struct mali_internal_sync_timeline *sync_timeline) ++#endif +{ -+ return pool->max_size; ++ struct mali_sync_timeline_container *mali_sync_tl = NULL; ++ struct mali_timeline *mali_tl = NULL; ++ ++ MALI_DEBUG_ASSERT_POINTER(sync_timeline); ++ ++ mali_sync_tl = to_mali_sync_tl_container(sync_timeline); ++ MALI_DEBUG_ASSERT_POINTER(mali_sync_tl); ++ ++ mali_tl = mali_sync_tl->timeline; ++ ++ /* always signaled timeline didn't have mali container */ ++ if (mali_tl) { ++ if (NULL != mali_tl->spinlock) { ++ mali_spinlock_reentrant_term(mali_tl->spinlock); ++ } ++ _mali_osk_free(mali_tl); ++ } ++ ++ module_put(THIS_MODULE); +} + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++static struct sync_pt *timeline_dup(struct sync_pt *pt) ++{ ++ struct mali_sync_pt *mpt, *new_mpt; ++ struct sync_pt *new_pt; ++ MALI_DEBUG_ASSERT_POINTER(pt); + -+/** -+ * kbase_mem_pool_set_max_size - Set maximum number of free pages in memory pool -+ * @pool: Memory pool to inspect -+ * @max_size: Maximum number of free pages the pool can hold -+ * -+ * If @max_size is reduced, the pool will be shrunk to adhere to the new limit. -+ * For details see kbase_mem_pool_shrink(). -+ */ -+void kbase_mem_pool_set_max_size(struct kbase_mem_pool *pool, size_t max_size); ++ mpt = to_mali_sync_pt(pt); + -+/** -+ * kbase_mem_pool_grow - Grow the pool -+ * @pool: Memory pool to grow -+ * @nr_to_grow: Number of pages to add to the pool -+ * -+ * Adds @nr_to_grow pages to the pool. Note that this may cause the pool to -+ * become larger than the maximum size specified. -+ * -+ * Returns: 0 on success, -ENOMEM if unable to allocate sufficent pages -+ */ -+int kbase_mem_pool_grow(struct kbase_mem_pool *pool, size_t nr_to_grow); ++ new_pt = sync_pt_create(mpt->sync_tl, sizeof(struct mali_sync_pt)); ++ if (NULL == new_pt) return NULL; + -+/** -+ * kbase_mem_pool_trim - Grow or shrink the pool to a new size -+ * @pool: Memory pool to trim -+ * @new_size: New number of pages in the pool -+ * -+ * If @new_size > @cur_size, fill the pool with new pages from the kernel, but -+ * not above the max_size for the pool. -+ * If @new_size < @cur_size, shrink the pool by freeing pages to the kernel. -+ */ -+void kbase_mem_pool_trim(struct kbase_mem_pool *pool, size_t new_size); ++ new_mpt = to_mali_sync_pt(new_pt); + -+/** -+ * kbase_mem_alloc_page - Allocate a new page for a device -+ * @pool: Memory pool to allocate a page from -+ * -+ * Most uses should use kbase_mem_pool_alloc to allocate a page. However that -+ * function can fail in the event the pool is empty. -+ * -+ * Return: A new page or NULL if no memory -+ */ -+struct page *kbase_mem_alloc_page(struct kbase_mem_pool *pool); ++ mali_sync_flag_get(mpt->flag); ++ new_mpt->flag = mpt->flag; ++ new_mpt->sync_tl = mpt->sync_tl; + -+int kbase_region_tracker_init(struct kbase_context *kctx); -+int kbase_region_tracker_init_jit(struct kbase_context *kctx, u64 jit_va_pages); -+void kbase_region_tracker_term(struct kbase_context *kctx); ++ return new_pt; ++} + -+struct kbase_va_region *kbase_region_tracker_find_region_enclosing_address(struct kbase_context *kctx, u64 gpu_addr); ++static int timeline_compare(struct sync_pt *pta, struct sync_pt *ptb) ++{ ++ struct mali_sync_pt *mpta; ++ struct mali_sync_pt *mptb; ++ u32 a, b; + -+/** -+ * @brief Check that a pointer is actually a valid region. -+ * -+ * Must be called with context lock held. -+ */ -+struct kbase_va_region *kbase_region_tracker_find_region_base_address(struct kbase_context *kctx, u64 gpu_addr); ++ MALI_DEBUG_ASSERT_POINTER(pta); ++ MALI_DEBUG_ASSERT_POINTER(ptb); ++ mpta = to_mali_sync_pt(pta); ++ mptb = to_mali_sync_pt(ptb); + -+struct kbase_va_region *kbase_alloc_free_region(struct kbase_context *kctx, u64 start_pfn, size_t nr_pages, int zone); -+void kbase_free_alloced_region(struct kbase_va_region *reg); -+int kbase_add_va_region(struct kbase_context *kctx, struct kbase_va_region *reg, u64 addr, size_t nr_pages, size_t align); ++ MALI_DEBUG_ASSERT_POINTER(mpta->flag); ++ MALI_DEBUG_ASSERT_POINTER(mptb->flag); + -+bool kbase_check_alloc_flags(unsigned long flags); -+bool kbase_check_import_flags(unsigned long flags); ++ a = mpta->flag->point; ++ b = mptb->flag->point; + -+/** -+ * kbase_update_region_flags - Convert user space flags to kernel region flags -+ * -+ * @kctx: kbase context -+ * @reg: The region to update the flags on -+ * @flags: The flags passed from user space -+ * -+ * The user space flag BASE_MEM_COHERENT_SYSTEM_REQUIRED will be rejected and -+ * this function will fail if the system does not support system coherency. -+ * -+ * Return: 0 if successful, -EINVAL if the flags are not supported -+ */ -+int kbase_update_region_flags(struct kbase_context *kctx, -+ struct kbase_va_region *reg, unsigned long flags); ++ if (a == b) return 0; + -+void kbase_gpu_vm_lock(struct kbase_context *kctx); -+void kbase_gpu_vm_unlock(struct kbase_context *kctx); ++ return ((b - a) < (a - b) ? -1 : 1); ++} ++#endif + -+int kbase_alloc_phy_pages(struct kbase_va_region *reg, size_t vsize, size_t size); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) ++static void timeline_print_pt(struct seq_file *s, struct sync_pt *sync_pt) ++{ ++ struct mali_sync_pt *mpt; + -+int kbase_mmu_init(struct kbase_context *kctx); -+void kbase_mmu_term(struct kbase_context *kctx); ++ MALI_DEBUG_ASSERT_POINTER(s); ++ MALI_DEBUG_ASSERT_POINTER(sync_pt); + -+phys_addr_t kbase_mmu_alloc_pgd(struct kbase_context *kctx); -+void kbase_mmu_free_pgd(struct kbase_context *kctx); -+int kbase_mmu_insert_pages_no_flush(struct kbase_context *kctx, u64 vpfn, -+ struct tagged_addr *phys, size_t nr, -+ unsigned long flags); -+int kbase_mmu_insert_pages(struct kbase_context *kctx, u64 vpfn, -+ struct tagged_addr *phys, size_t nr, -+ unsigned long flags); -+int kbase_mmu_insert_single_page(struct kbase_context *kctx, u64 vpfn, -+ struct tagged_addr phys, size_t nr, -+ unsigned long flags); ++ mpt = to_mali_sync_pt(sync_pt); + -+int kbase_mmu_teardown_pages(struct kbase_context *kctx, u64 vpfn, size_t nr); -+int kbase_mmu_update_pages(struct kbase_context *kctx, u64 vpfn, -+ struct tagged_addr *phys, size_t nr, -+ unsigned long flags); ++ /* It is possible this sync point is just under construct, ++ * make sure the flag is valid before accessing it ++ */ ++ if (mpt->flag) { ++ seq_printf(s, "%u", mpt->flag->point); ++ } else { ++ seq_printf(s, "uninitialized"); ++ } ++} + -+/** -+ * @brief Register region and map it on the GPU. -+ * -+ * Call kbase_add_va_region() and map the region on the GPU. -+ */ -+int kbase_gpu_mmap(struct kbase_context *kctx, struct kbase_va_region *reg, u64 addr, size_t nr_pages, size_t align); ++static void timeline_print_obj(struct seq_file *s, struct sync_timeline *sync_tl) ++{ ++ struct mali_sync_timeline_container *mali_sync_tl = NULL; ++ struct mali_timeline *mali_tl = NULL; + -+/** -+ * @brief Remove the region from the GPU and unregister it. -+ * -+ * Must be called with context lock held. -+ */ -+int kbase_gpu_munmap(struct kbase_context *kctx, struct kbase_va_region *reg); ++ MALI_DEBUG_ASSERT_POINTER(sync_tl); + -+/** -+ * The caller has the following locking conditions: -+ * - It must hold kbase_device->mmu_hw_mutex -+ * - It must hold the hwaccess_lock -+ */ -+void kbase_mmu_update(struct kbase_context *kctx); ++ mali_sync_tl = to_mali_sync_tl_container(sync_tl); ++ MALI_DEBUG_ASSERT_POINTER(mali_sync_tl); + -+/** -+ * kbase_mmu_disable() - Disable the MMU for a previously active kbase context. -+ * @kctx: Kbase context -+ * -+ * Disable and perform the required cache maintenance to remove the all -+ * data from provided kbase context from the GPU caches. -+ * -+ * The caller has the following locking conditions: -+ * - It must hold kbase_device->mmu_hw_mutex -+ * - It must hold the hwaccess_lock -+ */ -+void kbase_mmu_disable(struct kbase_context *kctx); ++ mali_tl = mali_sync_tl->timeline; + -+/** -+ * kbase_mmu_disable_as() - Set the MMU to unmapped mode for the specified -+ * address space. -+ * @kbdev: Kbase device -+ * @as_nr: The address space number to set to unmapped. -+ * -+ * This function must only be called during reset/power-up and it used to -+ * ensure the registers are in a known state. -+ * -+ * The caller must hold kbdev->mmu_hw_mutex. -+ */ -+void kbase_mmu_disable_as(struct kbase_device *kbdev, int as_nr); ++ if (NULL != mali_tl) { ++ seq_printf(s, "oldest (%u) ", mali_tl->point_oldest); ++ seq_printf(s, "next (%u)", mali_tl->point_next); ++ seq_printf(s, "\n"); + -+void kbase_mmu_interrupt(struct kbase_device *kbdev, u32 irq_stat); ++#if defined(MALI_TIMELINE_DEBUG_FUNCTIONS) ++ { ++ u32 tid = _mali_osk_get_tid(); ++ struct mali_timeline_system *system = mali_tl->system; + -+/** Dump the MMU tables to a buffer -+ * -+ * This function allocates a buffer (of @c nr_pages pages) to hold a dump of the MMU tables and fills it. If the -+ * buffer is too small then the return value will be NULL. -+ * -+ * The GPU vm lock must be held when calling this function. -+ * -+ * The buffer returned should be freed with @ref vfree when it is no longer required. -+ * -+ * @param[in] kctx The kbase context to dump -+ * @param[in] nr_pages The number of pages to allocate for the buffer. -+ * -+ * @return The address of the buffer containing the MMU dump or NULL on error (including if the @c nr_pages is too -+ * small) -+ */ -+void *kbase_mmu_dump(struct kbase_context *kctx, int nr_pages); ++ mali_spinlock_reentrant_wait(mali_tl->spinlock, tid); ++ if (!mali_tl->destroyed) { ++ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ mali_timeline_debug_print_timeline(mali_tl, s); ++ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ } ++ mali_spinlock_reentrant_signal(mali_tl->spinlock, tid); + -+/** -+ * kbase_sync_now - Perform cache maintenance on a memory region -+ * -+ * @kctx: The kbase context of the region -+ * @sset: A syncset structure describing the region and direction of the -+ * synchronisation required -+ * -+ * Return: 0 on success or error code -+ */ -+int kbase_sync_now(struct kbase_context *kctx, struct basep_syncset *sset); -+void kbase_sync_single(struct kbase_context *kctx, struct tagged_addr cpu_pa, -+ struct tagged_addr gpu_pa, off_t offset, size_t size, -+ enum kbase_sync_type sync_fn); -+void kbase_pre_job_sync(struct kbase_context *kctx, struct base_syncset *syncsets, size_t nr); -+void kbase_post_job_sync(struct kbase_context *kctx, struct base_syncset *syncsets, size_t nr); ++ /* dump job queue status and group running status */ ++ mali_executor_status_dump(); ++ } ++#endif ++ } ++} ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++static void timeline_pt_value_str(struct sync_pt *pt, char *str, int size) ++{ ++ struct mali_sync_pt *mpt; + -+/* OS specific functions */ -+int kbase_mem_free(struct kbase_context *kctx, u64 gpu_addr); -+int kbase_mem_free_region(struct kbase_context *kctx, struct kbase_va_region *reg); -+void kbase_os_mem_map_lock(struct kbase_context *kctx); -+void kbase_os_mem_map_unlock(struct kbase_context *kctx); ++ MALI_DEBUG_ASSERT_POINTER(str); ++ MALI_DEBUG_ASSERT_POINTER(pt); + -+/** -+ * @brief Update the memory allocation counters for the current process -+ * -+ * OS specific call to updates the current memory allocation counters for the current process with -+ * the supplied delta. -+ * -+ * @param[in] kctx The kbase context -+ * @param[in] pages The desired delta to apply to the memory usage counters. -+ */ ++ mpt = to_mali_sync_pt(pt); + -+void kbasep_os_process_page_usage_update(struct kbase_context *kctx, int pages); ++ /* It is possible this sync point is just under construct, ++ * make sure the flag is valid before accessing it ++ */ ++ if (mpt->flag) { ++ _mali_osk_snprintf(str, size, "%u", mpt->flag->point); ++ } else { ++ _mali_osk_snprintf(str, size, "uninitialized"); ++ } ++} + -+/** -+ * @brief Add to the memory allocation counters for the current process -+ * -+ * OS specific call to add to the current memory allocation counters for the current process by -+ * the supplied amount. -+ * -+ * @param[in] kctx The kernel base context used for the allocation. -+ * @param[in] pages The desired delta to apply to the memory usage counters. -+ */ ++static void timeline_value_str(struct sync_timeline *timeline, char *str, int size) ++{ ++ struct mali_sync_timeline_container *mali_sync_tl = NULL; ++ struct mali_timeline *mali_tl = NULL; + -+static inline void kbase_process_page_usage_inc(struct kbase_context *kctx, int pages) ++ MALI_DEBUG_ASSERT_POINTER(timeline); ++ ++ mali_sync_tl = to_mali_sync_tl_container(timeline); ++ MALI_DEBUG_ASSERT_POINTER(mali_sync_tl); ++ ++ mali_tl = mali_sync_tl->timeline; ++ ++ if (NULL != mali_tl) { ++ _mali_osk_snprintf(str, size, "oldest (%u) ", mali_tl->point_oldest); ++ _mali_osk_snprintf(str, size, "next (%u)", mali_tl->point_next); ++ _mali_osk_snprintf(str, size, "\n"); ++ ++#if defined(MALI_TIMELINE_DEBUG_FUNCTIONS) ++ { ++ u32 tid = _mali_osk_get_tid(); ++ struct mali_timeline_system *system = mali_tl->system; ++ ++ mali_spinlock_reentrant_wait(mali_tl->spinlock, tid); ++ if (!mali_tl->destroyed) { ++ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ mali_timeline_debug_direct_print_timeline(mali_tl); ++ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ } ++ mali_spinlock_reentrant_signal(mali_tl->spinlock, tid); ++ ++ /* dump job queue status and group running status */ ++ mali_executor_status_dump(); ++ } ++#endif ++ } ++} ++#else ++static void timeline_print_sync_pt(struct mali_internal_sync_point *sync_pt) +{ -+ kbasep_os_process_page_usage_update(kctx, pages); ++ struct mali_sync_pt *mpt; ++ ++ MALI_DEBUG_ASSERT_POINTER(sync_pt); ++ ++ mpt = to_mali_sync_pt(sync_pt); ++ ++ if (mpt->flag) { ++ MALI_DEBUG_PRINT(2, ("mali_internal_sync_pt: %u\n", mpt->flag->point)); ++ } else { ++ MALI_DEBUG_PRINT(2, ("uninitialized\n", mpt->flag->point)); ++ } +} ++#endif + -+/** -+ * @brief Subtract from the memory allocation counters for the current process -+ * -+ * OS specific call to subtract from the current memory allocation counters for the current process by -+ * the supplied amount. -+ * -+ * @param[in] kctx The kernel base context used for the allocation. -+ * @param[in] pages The desired delta to apply to the memory usage counters. -+ */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++static struct sync_timeline_ops mali_timeline_ops = { ++ .driver_name = "Mali", ++ .dup = timeline_dup, ++ .has_signaled = timeline_has_signaled, ++ .compare = timeline_compare, ++ .free_pt = timeline_free_pt, ++ .release_obj = timeline_release, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) ++ .print_pt = timeline_print_pt, ++ .print_obj = timeline_print_obj, ++#else ++ .pt_value_str = timeline_pt_value_str, ++ .timeline_value_str = timeline_value_str, ++#endif ++}; + -+static inline void kbase_process_page_usage_dec(struct kbase_context *kctx, int pages) ++struct sync_timeline *mali_sync_timeline_create(struct mali_timeline *timeline, const char *name) +{ -+ kbasep_os_process_page_usage_update(kctx, 0 - pages); ++ struct sync_timeline *sync_tl; ++ struct mali_sync_timeline_container *mali_sync_tl; ++ ++ sync_tl = sync_timeline_create(&mali_timeline_ops, sizeof(struct mali_sync_timeline_container), name); ++ if (NULL == sync_tl) return NULL; ++ ++ mali_sync_tl = to_mali_sync_tl_container(sync_tl); ++ mali_sync_tl->timeline = timeline; ++ ++ /* Grab a reference on the module to ensure the callbacks are present ++ * as long some timeline exists. The reference is released when the ++ * timeline is freed. ++ * Since this function is called from a ioctl on an open file we know ++ * we already have a reference, so using __module_get is safe. */ ++ __module_get(THIS_MODULE); ++ ++ return sync_tl; ++} ++ ++s32 mali_sync_fence_fd_alloc(struct sync_fence *sync_fence) ++{ ++ s32 fd = -1; ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) ++ fd = get_unused_fd(); ++#else ++ fd = get_unused_fd_flags(0); ++#endif ++ ++ if (fd < 0) { ++ sync_fence_put(sync_fence); ++ return -1; ++ } ++ sync_fence_install(sync_fence, fd); ++ ++ return fd; ++} ++ ++struct sync_fence *mali_sync_fence_merge(struct sync_fence *sync_fence1, struct sync_fence *sync_fence2) ++{ ++ struct sync_fence *sync_fence; ++ ++ MALI_DEBUG_ASSERT_POINTER(sync_fence1); ++ MALI_DEBUG_ASSERT_POINTER(sync_fence1); ++ ++ sync_fence = sync_fence_merge("mali_merge_fence", sync_fence1, sync_fence2); ++ sync_fence_put(sync_fence1); ++ sync_fence_put(sync_fence2); ++ ++ return sync_fence; ++} ++ ++struct sync_fence *mali_sync_timeline_create_signaled_fence(struct sync_timeline *sync_tl) ++{ ++ struct mali_sync_flag *flag; ++ struct sync_fence *sync_fence; ++ ++ MALI_DEBUG_ASSERT_POINTER(sync_tl); ++ ++ flag = mali_sync_flag_create(sync_tl, 0); ++ if (NULL == flag) return NULL; ++ ++ sync_fence = mali_sync_flag_create_fence(flag); ++ ++ mali_sync_flag_signal(flag, 0); ++ mali_sync_flag_put(flag); ++ ++ return sync_fence; ++} ++ ++struct mali_sync_flag *mali_sync_flag_create(struct sync_timeline *sync_tl, mali_timeline_point point) ++{ ++ struct mali_sync_flag *flag; ++ ++ if (NULL == sync_tl) return NULL; ++ ++ flag = _mali_osk_calloc(1, sizeof(*flag)); ++ if (NULL == flag) return NULL; ++ ++ flag->sync_tl = sync_tl; ++ flag->point = point; ++ ++ flag->status = 0; ++ kref_init(&flag->refcount); ++ ++ return flag; +} + +/** -+ * kbasep_find_enclosing_cpu_mapping_offset() - Find the offset of the CPU -+ * mapping of a memory allocation containing a given address range -+ * -+ * Searches for a CPU mapping of any part of any region that fully encloses the -+ * CPU virtual address range specified by @uaddr and @size. Returns a failure -+ * indication if only part of the address range lies within a CPU mapping. ++ * Create a sync point attached to given sync flag. + * -+ * @kctx: The kernel base context used for the allocation. -+ * @uaddr: Start of the CPU virtual address range. -+ * @size: Size of the CPU virtual address range (in bytes). -+ * @offset: The offset from the start of the allocation to the specified CPU -+ * virtual address. ++ * @note Sync points must be triggered in *exactly* the same order as they are created. + * -+ * Return: 0 if offset was obtained successfully. Error code otherwise. ++ * @param flag Sync flag. ++ * @return New sync point if successful, NULL if not. + */ -+int kbasep_find_enclosing_cpu_mapping_offset( -+ struct kbase_context *kctx, -+ unsigned long uaddr, size_t size, u64 *offset); ++static struct sync_pt *mali_sync_flag_create_pt(struct mali_sync_flag *flag) ++{ ++ struct sync_pt *pt; ++ struct mali_sync_pt *mpt; + -+enum hrtimer_restart kbasep_as_poke_timer_callback(struct hrtimer *timer); -+void kbase_as_poking_timer_retain_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *katom); -+void kbase_as_poking_timer_release_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *katom); ++ MALI_DEBUG_ASSERT_POINTER(flag); ++ MALI_DEBUG_ASSERT_POINTER(flag->sync_tl); + -+/** -+* @brief Allocates physical pages. -+* -+* Allocates \a nr_pages_requested and updates the alloc object. -+* -+* @param[in] alloc allocation object to add pages to -+* @param[in] nr_pages_requested number of physical pages to allocate -+* -+* @return 0 if all pages have been successfully allocated. Error code otherwise -+*/ -+int kbase_alloc_phy_pages_helper(struct kbase_mem_phy_alloc *alloc, size_t nr_pages_requested); ++ pt = sync_pt_create(flag->sync_tl, sizeof(struct mali_sync_pt)); ++ if (NULL == pt) return NULL; + -+/** -+* @brief Free physical pages. -+* -+* Frees \a nr_pages and updates the alloc object. -+* -+* @param[in] alloc allocation object to free pages from -+* @param[in] nr_pages_to_free number of physical pages to free -+*/ -+int kbase_free_phy_pages_helper(struct kbase_mem_phy_alloc *alloc, size_t nr_pages_to_free); ++ mali_sync_flag_get(flag); + -+static inline void kbase_set_dma_addr(struct page *p, dma_addr_t dma_addr) ++ mpt = to_mali_sync_pt(pt); ++ mpt->flag = flag; ++ mpt->sync_tl = flag->sync_tl; ++ ++ return pt; ++} ++ ++struct sync_fence *mali_sync_flag_create_fence(struct mali_sync_flag *flag) +{ -+ SetPagePrivate(p); -+ if (sizeof(dma_addr_t) > sizeof(p->private)) { -+ /* on 32-bit ARM with LPAE dma_addr_t becomes larger, but the -+ * private field stays the same. So we have to be clever and -+ * use the fact that we only store DMA addresses of whole pages, -+ * so the low bits should be zero */ -+ KBASE_DEBUG_ASSERT(!(dma_addr & (PAGE_SIZE - 1))); -+ set_page_private(p, dma_addr >> PAGE_SHIFT); -+ } else { -+ set_page_private(p, dma_addr); ++ struct sync_pt *sync_pt; ++ struct sync_fence *sync_fence; ++ ++ MALI_DEBUG_ASSERT_POINTER(flag); ++ MALI_DEBUG_ASSERT_POINTER(flag->sync_tl); ++ ++ sync_pt = mali_sync_flag_create_pt(flag); ++ if (NULL == sync_pt) return NULL; ++ ++ sync_fence = sync_fence_create("mali_flag_fence", sync_pt); ++ if (NULL == sync_fence) { ++ sync_pt_free(sync_pt); ++ return NULL; + } ++ ++ return sync_fence; +} ++#else ++static struct mali_internal_sync_timeline_ops mali_timeline_ops = { ++ .driver_name = "Mali", ++ .has_signaled = timeline_has_signaled, ++ .free_pt = timeline_free_pt, ++ .release_obj = timeline_release, ++ .print_sync_pt = timeline_print_sync_pt, ++}; + -+static inline dma_addr_t kbase_dma_addr(struct page *p) ++struct mali_internal_sync_timeline *mali_sync_timeline_create(struct mali_timeline *timeline, const char *name) +{ -+ if (sizeof(dma_addr_t) > sizeof(p->private)) -+ return ((dma_addr_t)page_private(p)) << PAGE_SHIFT; ++ struct mali_internal_sync_timeline *sync_tl; ++ struct mali_sync_timeline_container *mali_sync_tl; + -+ return (dma_addr_t)page_private(p); ++ sync_tl = mali_internal_sync_timeline_create(&mali_timeline_ops, sizeof(struct mali_sync_timeline_container), name); ++ if (NULL == sync_tl) return NULL; ++ ++ mali_sync_tl = to_mali_sync_tl_container(sync_tl); ++ mali_sync_tl->timeline = timeline; ++ ++ /* Grab a reference on the module to ensure the callbacks are present ++ * as long some timeline exists. The reference is released when the ++ * timeline is freed. ++ * Since this function is called from a ioctl on an open file we know ++ * we already have a reference, so using __module_get is safe. */ ++ __module_get(THIS_MODULE); ++ ++ return sync_tl; +} + -+static inline void kbase_clear_dma_addr(struct page *p) ++s32 mali_sync_fence_fd_alloc(struct mali_internal_sync_fence *sync_fence) +{ -+ ClearPagePrivate(p); ++ s32 fd = -1; ++ ++ fd = get_unused_fd_flags(0); ++ ++ if (fd < 0) { ++ fput(sync_fence->file); ++ return -1; ++ } ++ fd_install(fd, sync_fence->file); ++ return fd; +} + -+/** -+* @brief Process a bus or page fault. -+* -+* This function will process a fault on a specific address space -+* -+* @param[in] kbdev The @ref kbase_device the fault happened on -+* @param[in] kctx The @ref kbase_context for the faulting address space if -+* one was found. -+* @param[in] as The address space that has the fault -+*/ -+void kbase_mmu_interrupt_process(struct kbase_device *kbdev, -+ struct kbase_context *kctx, struct kbase_as *as); ++struct mali_internal_sync_fence *mali_sync_fence_merge(struct mali_internal_sync_fence *sync_fence1, struct mali_internal_sync_fence *sync_fence2) ++{ ++ struct mali_internal_sync_fence *sync_fence; ++ ++ MALI_DEBUG_ASSERT_POINTER(sync_fence1); ++ MALI_DEBUG_ASSERT_POINTER(sync_fence1); ++ ++ sync_fence = mali_internal_sync_fence_merge(sync_fence1, sync_fence2); ++ fput(sync_fence1->file); ++ fput(sync_fence2->file); ++ ++ return sync_fence; ++} ++ ++struct mali_internal_sync_fence *mali_sync_timeline_create_signaled_fence(struct mali_internal_sync_timeline *sync_tl) ++{ ++ struct mali_sync_flag *flag; ++ struct mali_internal_sync_fence *sync_fence; ++ ++ MALI_DEBUG_ASSERT_POINTER(sync_tl); ++ ++ flag = mali_sync_flag_create(sync_tl, 0); ++ if (NULL == flag) return NULL; ++ ++ sync_fence = mali_sync_flag_create_fence(flag); ++ ++ mali_sync_flag_signal(flag, 0); ++ mali_sync_flag_put(flag); ++ ++ return sync_fence; ++} ++ ++struct mali_sync_flag *mali_sync_flag_create(struct mali_internal_sync_timeline *sync_tl, mali_timeline_point point) ++{ ++ struct mali_sync_flag *flag; ++ ++ if (NULL == sync_tl) return NULL; ++ ++ flag = _mali_osk_calloc(1, sizeof(*flag)); ++ if (NULL == flag) return NULL; ++ ++ flag->sync_tl = sync_tl; ++ flag->point = point; ++ ++ flag->status = 0; ++ kref_init(&flag->refcount); ++ ++ return flag; ++} + +/** -+ * @brief Process a page fault. ++ * Create a sync point attached to given sync flag. + * -+ * @param[in] data work_struct passed by queue_work() ++ * @note Sync points must be triggered in *exactly* the same order as they are created. ++ * ++ * @param flag Sync flag. ++ * @return New sync point if successful, NULL if not. + */ -+void page_fault_worker(struct work_struct *data); ++static struct mali_internal_sync_point *mali_sync_flag_create_pt(struct mali_sync_flag *flag) ++{ ++ struct mali_internal_sync_point *pt; ++ struct mali_sync_pt *mpt; ++ ++ MALI_DEBUG_ASSERT_POINTER(flag); ++ MALI_DEBUG_ASSERT_POINTER(flag->sync_tl); ++ ++ pt = mali_internal_sync_point_create(flag->sync_tl, sizeof(struct mali_sync_pt)); ++ ++ if (pt == NULL) { ++ MALI_PRINT_ERROR(("Mali sync: sync_pt creation failed\n")); ++ return NULL; ++ } ++ mali_sync_flag_get(flag); ++ ++ mpt = to_mali_sync_pt(pt); ++ mpt->flag = flag; ++ mpt->sync_tl = flag->sync_tl; ++ ++ return pt; ++} ++ ++struct mali_internal_sync_fence *mali_sync_flag_create_fence(struct mali_sync_flag *flag) ++{ ++ struct mali_internal_sync_point *sync_pt; ++ struct mali_internal_sync_fence *sync_fence; ++ ++ MALI_DEBUG_ASSERT_POINTER(flag); ++ MALI_DEBUG_ASSERT_POINTER(flag->sync_tl); ++ ++ sync_pt = mali_sync_flag_create_pt(flag); ++ if (NULL == sync_pt) { ++ MALI_PRINT_ERROR(("Mali sync: sync_pt creation failed\n")); ++ return NULL; ++ } ++ sync_fence = (struct mali_internal_sync_fence *)sync_file_create(&sync_pt->base); ++ if (NULL == sync_fence) { ++ MALI_PRINT_ERROR(("Mali sync: sync_fence creation failed\n")); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) ++ dma_fence_put(&sync_pt->base); ++#else ++ fence_put(&sync_pt->base); ++#endif ++ return NULL; ++ } ++ ++ /* 'sync_pt' no longer needs to hold a refcount of '*sync_pt', to put it off. */ ++ dma_fence_put(&sync_pt->base); ++ sync_pt = NULL; ++ ++ return sync_fence; ++} ++#endif ++ ++void mali_sync_flag_get(struct mali_sync_flag *flag) ++{ ++ MALI_DEBUG_ASSERT_POINTER(flag); ++ kref_get(&flag->refcount); ++} + +/** -+ * @brief Process a bus fault. ++ * Free sync flag. + * -+ * @param[in] data work_struct passed by queue_work() ++ * @param ref kref object embedded in sync flag that should be freed. + */ -+void bus_fault_worker(struct work_struct *data); ++static void mali_sync_flag_free(struct kref *ref) ++{ ++ struct mali_sync_flag *flag; + -+/** -+ * @brief Flush MMU workqueues. -+ * -+ * This function will cause any outstanding page or bus faults to be processed. -+ * It should be called prior to powering off the GPU. -+ * -+ * @param[in] kbdev Device pointer ++ MALI_DEBUG_ASSERT_POINTER(ref); ++ flag = container_of(ref, struct mali_sync_flag, refcount); ++ ++ _mali_osk_free(flag); ++} ++ ++void mali_sync_flag_put(struct mali_sync_flag *flag) ++{ ++ MALI_DEBUG_ASSERT_POINTER(flag); ++ kref_put(&flag->refcount, mali_sync_flag_free); ++} ++ ++void mali_sync_flag_signal(struct mali_sync_flag *flag, int error) ++{ ++ MALI_DEBUG_ASSERT_POINTER(flag); ++ ++ MALI_DEBUG_ASSERT(0 == flag->status); ++ flag->status = (0 > error) ? error : 1; ++ ++ _mali_osk_write_mem_barrier(); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ sync_timeline_signal(flag->sync_tl); ++#else ++ mali_internal_sync_timeline_signal(flag->sync_tl); ++#endif ++} ++ ++ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_sync.h b/drivers/gpu/arm/mali400/mali/linux/mali_sync.h +new file mode 100755 +index 000000000..91be8b9cf +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.h +@@ -0,0 +1,169 @@ ++/* ++ * Copyright (C) 2012-2015, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+void kbase_flush_mmu_wqs(struct kbase_device *kbdev); + +/** -+ * kbase_sync_single_for_device - update physical memory and give GPU ownership -+ * @kbdev: Device pointer -+ * @handle: DMA address of region -+ * @size: Size of region to sync -+ * @dir: DMA data direction ++ * @file mali_sync.h ++ * ++ * Mali interface for Linux sync objects. + */ + -+void kbase_sync_single_for_device(struct kbase_device *kbdev, dma_addr_t handle, -+ size_t size, enum dma_data_direction dir); ++#ifndef _MALI_SYNC_H_ ++#define _MALI_SYNC_H_ + -+/** -+ * kbase_sync_single_for_cpu - update physical memory and give CPU ownership -+ * @kbdev: Device pointer -+ * @handle: DMA address of region -+ * @size: Size of region to sync -+ * @dir: DMA data direction -+ */ ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) + -+void kbase_sync_single_for_cpu(struct kbase_device *kbdev, dma_addr_t handle, -+ size_t size, enum dma_data_direction dir); ++#include ++#include + -+#ifdef CONFIG_DEBUG_FS -+/** -+ * kbase_jit_debugfs_init - Add per context debugfs entry for JIT. -+ * @kctx: kbase context -+ */ -+void kbase_jit_debugfs_init(struct kbase_context *kctx); -+#endif /* CONFIG_DEBUG_FS */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) ++#include ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++#include ++#else ++#include "mali_internal_sync.h" ++#endif + ++ ++#include "mali_osk.h" ++ ++struct mali_sync_flag; ++struct mali_timeline; ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) +/** -+ * kbase_jit_init - Initialize the JIT memory pool management -+ * @kctx: kbase context ++ * Create a sync timeline. + * -+ * Returns zero on success or negative error number on failure. ++ * @param name Name of the sync timeline. ++ * @return The new sync timeline if successful, NULL if not. + */ -+int kbase_jit_init(struct kbase_context *kctx); ++struct sync_timeline *mali_sync_timeline_create(struct mali_timeline *timeline, const char *name); + +/** -+ * kbase_jit_allocate - Allocate JIT memory -+ * @kctx: kbase context -+ * @info: JIT allocation information ++ * Creates a file descriptor representing the sync fence. Will release sync fence if allocation of ++ * file descriptor fails. + * -+ * Return: JIT allocation on success or NULL on failure. ++ * @param sync_fence Sync fence. ++ * @return File descriptor representing sync fence if successful, or -1 if not. + */ -+struct kbase_va_region *kbase_jit_allocate(struct kbase_context *kctx, -+ struct base_jit_alloc_info *info); ++s32 mali_sync_fence_fd_alloc(struct sync_fence *sync_fence); + +/** -+ * kbase_jit_free - Free a JIT allocation -+ * @kctx: kbase context -+ * @reg: JIT allocation ++ * Merges two sync fences. Both input sync fences will be released. + * -+ * Frees a JIT allocation and places it into the free pool for later reuse. ++ * @param sync_fence1 First sync fence. ++ * @param sync_fence2 Second sync fence. ++ * @return New sync fence that is the result of the merger if successful, or NULL if not. + */ -+void kbase_jit_free(struct kbase_context *kctx, struct kbase_va_region *reg); ++struct sync_fence *mali_sync_fence_merge(struct sync_fence *sync_fence1, struct sync_fence *sync_fence2); + +/** -+ * kbase_jit_backing_lost - Inform JIT that an allocation has lost backing -+ * @reg: JIT allocation ++ * Create a sync fence that is already signaled. ++ * ++ * @param tl Sync timeline. ++ * @return New signaled sync fence if successful, NULL if not. + */ -+void kbase_jit_backing_lost(struct kbase_va_region *reg); ++struct sync_fence *mali_sync_timeline_create_signaled_fence(struct sync_timeline *sync_tl); ++ + +/** -+ * kbase_jit_evict - Evict a JIT allocation from the pool -+ * @kctx: kbase context -+ * -+ * Evict the least recently used JIT allocation from the pool. This can be -+ * required if normal VA allocations are failing due to VA exhaustion. ++ * Create a sync flag. + * -+ * Return: True if a JIT allocation was freed, false otherwise. ++ * @param sync_tl Sync timeline. ++ * @param point Point on Mali timeline. ++ * @return New sync flag if successful, NULL if not. + */ -+bool kbase_jit_evict(struct kbase_context *kctx); ++struct mali_sync_flag *mali_sync_flag_create(struct sync_timeline *sync_tl, u32 point); + +/** -+ * kbase_jit_term - Terminate the JIT memory pool management -+ * @kctx: kbase context ++ * Create a sync fence attached to given sync flag. ++ * ++ * @param flag Sync flag. ++ * @return New sync fence if successful, NULL if not. + */ -+void kbase_jit_term(struct kbase_context *kctx); -+ ++struct sync_fence *mali_sync_flag_create_fence(struct mali_sync_flag *flag); ++#else +/** -+ * kbase_map_external_resource - Map an external resource to the GPU. -+ * @kctx: kbase context. -+ * @reg: The region to map. -+ * @locked_mm: The mm_struct which has been locked for this operation. -+ * @kds_res_count: The number of KDS resources. -+ * @kds_resources: Array of KDS resources. -+ * @kds_access_bitmap: Access bitmap for KDS. -+ * @exclusive: If the KDS resource requires exclusive access. ++ * Create a sync timeline. + * -+ * Return: The physical allocation which backs the region on success or NULL -+ * on failure. ++ * @param name Name of the sync timeline. ++ * @return The new sync timeline if successful, NULL if not. + */ -+struct kbase_mem_phy_alloc *kbase_map_external_resource( -+ struct kbase_context *kctx, struct kbase_va_region *reg, -+ struct mm_struct *locked_mm -+#ifdef CONFIG_KDS -+ , u32 *kds_res_count, struct kds_resource **kds_resources, -+ unsigned long *kds_access_bitmap, bool exclusive -+#endif -+ ); ++struct mali_internal_sync_timeline *mali_sync_timeline_create(struct mali_timeline *timeline, const char *name); + +/** -+ * kbase_unmap_external_resource - Unmap an external resource from the GPU. -+ * @kctx: kbase context. -+ * @reg: The region to unmap or NULL if it has already been released. -+ * @alloc: The physical allocation being unmapped. ++ * Creates a file descriptor representing the sync fence. Will release sync fence if allocation of ++ * file descriptor fails. ++ * ++ * @param sync_fence Sync fence. ++ * @return File descriptor representing sync fence if successful, or -1 if not. + */ -+void kbase_unmap_external_resource(struct kbase_context *kctx, -+ struct kbase_va_region *reg, struct kbase_mem_phy_alloc *alloc); ++s32 mali_sync_fence_fd_alloc(struct mali_internal_sync_fence *sync_fence); + +/** -+ * kbase_sticky_resource_init - Initialize sticky resource management. -+ * @kctx: kbase context ++ * Merges two sync fences. Both input sync fences will be released. + * -+ * Returns zero on success or negative error number on failure. ++ * @param sync_fence1 First sync fence. ++ * @param sync_fence2 Second sync fence. ++ * @return New sync fence that is the result of the merger if successful, or NULL if not. + */ -+int kbase_sticky_resource_init(struct kbase_context *kctx); ++struct mali_internal_sync_fence *mali_sync_fence_merge(struct mali_internal_sync_fence *sync_fence1, struct mali_internal_sync_fence *sync_fence2); + +/** -+ * kbase_sticky_resource_acquire - Acquire a reference on a sticky resource. -+ * @kctx: kbase context. -+ * @gpu_addr: The GPU address of the external resource. ++ * Create a sync fence that is already signaled. + * -+ * Return: The metadata object which represents the binding between the -+ * external resource and the kbase context on success or NULL on failure. ++ * @param tl Sync timeline. ++ * @return New signaled sync fence if successful, NULL if not. + */ -+struct kbase_ctx_ext_res_meta *kbase_sticky_resource_acquire( -+ struct kbase_context *kctx, u64 gpu_addr); ++struct mali_internal_sync_fence *mali_sync_timeline_create_signaled_fence(struct mali_internal_sync_timeline *sync_tl); ++ + +/** -+ * kbase_sticky_resource_release - Release a reference on a sticky resource. -+ * @kctx: kbase context. -+ * @meta: Binding metadata. -+ * @gpu_addr: GPU address of the external resource. -+ * -+ * If meta is NULL then gpu_addr will be used to scan the metadata list and -+ * find the matching metadata (if any), otherwise the provided meta will be -+ * used and gpu_addr will be ignored. ++ * Create a sync flag. + * -+ * Return: True if the release found the metadata and the reference was dropped. ++ * @param sync_tl Sync timeline. ++ * @param point Point on Mali timeline. ++ * @return New sync flag if successful, NULL if not. + */ -+bool kbase_sticky_resource_release(struct kbase_context *kctx, -+ struct kbase_ctx_ext_res_meta *meta, u64 gpu_addr); ++struct mali_sync_flag *mali_sync_flag_create(struct mali_internal_sync_timeline *sync_tl, u32 point); + +/** -+ * kbase_sticky_resource_term - Terminate sticky resource management. -+ * @kctx: kbase context ++ * Create a sync fence attached to given sync flag. ++ * ++ * @param flag Sync flag. ++ * @return New sync fence if successful, NULL if not. + */ -+void kbase_sticky_resource_term(struct kbase_context *kctx); ++struct mali_internal_sync_fence *mali_sync_flag_create_fence(struct mali_sync_flag *flag); + ++#endif +/** -+ * kbase_zone_cache_update - Update the memory zone cache after new pages have -+ * been added. -+ * @alloc: The physical memory allocation to build the cache for. -+ * @start_offset: Offset to where the new pages start. -+ * -+ * Updates an existing memory zone cache, updating the counters for the -+ * various zones. -+ * If the memory allocation doesn't already have a zone cache assume that -+ * one isn't created and thus don't do anything. ++ * Grab sync flag reference. + * -+ * Return: Zero cache was updated, negative error code on error. ++ * @param flag Sync flag. + */ -+int kbase_zone_cache_update(struct kbase_mem_phy_alloc *alloc, -+ size_t start_offset); ++void mali_sync_flag_get(struct mali_sync_flag *flag); + +/** -+ * kbase_zone_cache_build - Build the memory zone cache. -+ * @alloc: The physical memory allocation to build the cache for. -+ * -+ * Create a new zone cache for the provided physical memory allocation if -+ * one doesn't already exist, if one does exist then just return. ++ * Release sync flag reference. If this was the last reference, the sync flag will be freed. + * -+ * Return: Zero if the zone cache was created, negative error code on error. ++ * @param flag Sync flag. + */ -+int kbase_zone_cache_build(struct kbase_mem_phy_alloc *alloc); ++void mali_sync_flag_put(struct mali_sync_flag *flag); + +/** -+ * kbase_zone_cache_clear - Clear the memory zone cache. -+ * @alloc: The physical memory allocation to clear the cache on. ++ * Signal sync flag. All sync fences created from this flag will be signaled. ++ * ++ * @param flag Sync flag to signal. ++ * @param error Negative error code, or 0 if no error. + */ -+void kbase_zone_cache_clear(struct kbase_mem_phy_alloc *alloc); ++void mali_sync_flag_signal(struct mali_sync_flag *flag, int error); + -+#endif /* _KBASE_MEM_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_linux.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_linux.c ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ ++#endif /* _MALI_SYNC_H_ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h b/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h new file mode 100755 -index 000000000000..842444c9b0bd +index 000000000..68b27b8be --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_linux.c -@@ -0,0 +1,2678 @@ ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h +@@ -0,0 +1,17 @@ +/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2012, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_UK_TYPES_H__ ++#define __MALI_UK_TYPES_H__ + ++/* Simple wrapper in order to find the OS specific location of this file */ ++#include + ++#endif /* __MALI_UK_TYPES_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c +new file mode 100755 +index 000000000..0bd1cddb1 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c +@@ -0,0 +1,171 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include /* file system operations */ ++#include /* memort allocation functions */ ++#include /* user space access */ + ++#include "mali_ukk.h" ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_session.h" ++#include "mali_ukk_wrappers.h" + -+/** -+ * @file mali_kbase_mem_linux.c -+ * Base kernel memory APIs, Linux implementation. -+ */ ++int get_api_version_wrapper(struct mali_session_data *session_data, _mali_uk_get_api_version_s __user *uargs) ++{ ++ _mali_uk_get_api_version_s kargs; ++ _mali_osk_errcode_t err; + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) && \ -+ (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) -+#include -+#endif /* LINUX_VERSION_CODE >= 3.5.0 && < 4.8.0 */ -+#ifdef CONFIG_DMA_SHARED_BUFFER -+#include -+#endif /* defined(CONFIG_DMA_SHARED_BUFFER) */ -+#include -+#include ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+#include -+#include -+#include -+#include ++ if (0 != get_user(kargs.version, &uargs->version)) return -EFAULT; + -+static int kbase_tracking_page_setup(struct kbase_context *kctx, struct vm_area_struct *vma); ++ kargs.ctx = (uintptr_t)session_data; ++ err = _mali_ukk_get_api_version(&kargs); ++ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); + -+/** -+ * kbase_mem_shrink_cpu_mapping - Shrink the CPU mapping(s) of an allocation -+ * @kctx: Context the region belongs to -+ * @reg: The GPU region -+ * @new_pages: The number of pages after the shrink -+ * @old_pages: The number of pages before the shrink -+ * -+ * Shrink (or completely remove) all CPU mappings which reference the shrunk -+ * part of the allocation. -+ * -+ * Note: Caller must be holding the processes mmap_sem lock. -+ */ -+static void kbase_mem_shrink_cpu_mapping(struct kbase_context *kctx, -+ struct kbase_va_region *reg, -+ u64 new_pages, u64 old_pages); ++ if (0 != put_user(kargs.version, &uargs->version)) return -EFAULT; ++ if (0 != put_user(kargs.compatible, &uargs->compatible)) return -EFAULT; + -+/** -+ * kbase_mem_shrink_gpu_mapping - Shrink the GPU mapping of an allocation -+ * @kctx: Context the region belongs to -+ * @reg: The GPU region or NULL if there isn't one -+ * @new_pages: The number of pages after the shrink -+ * @old_pages: The number of pages before the shrink -+ * -+ * Return: 0 on success, negative -errno on error -+ * -+ * Unmap the shrunk pages from the GPU mapping. Note that the size of the region -+ * itself is unmodified as we still need to reserve the VA, only the page tables -+ * will be modified by this function. -+ */ -+static int kbase_mem_shrink_gpu_mapping(struct kbase_context *kctx, -+ struct kbase_va_region *reg, -+ u64 new_pages, u64 old_pages); ++ return 0; ++} + -+struct kbase_va_region *kbase_mem_alloc(struct kbase_context *kctx, -+ u64 va_pages, u64 commit_pages, u64 extent, u64 *flags, -+ u64 *gpu_va) ++int get_api_version_v2_wrapper(struct mali_session_data *session_data, _mali_uk_get_api_version_v2_s __user *uargs) +{ -+ int zone; -+ int gpu_pc_bits; -+ struct kbase_va_region *reg; -+ struct device *dev; ++ _mali_uk_get_api_version_v2_s kargs; ++ _mali_osk_errcode_t err; + -+ KBASE_DEBUG_ASSERT(kctx); -+ KBASE_DEBUG_ASSERT(flags); -+ KBASE_DEBUG_ASSERT(gpu_va); ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ dev = kctx->kbdev->dev; -+ *gpu_va = 0; /* return 0 on failure */ ++ if (0 != get_user(kargs.version, &uargs->version)) return -EFAULT; + -+ gpu_pc_bits = kctx->kbdev->gpu_props.props.core_props.log2_program_counter_size; ++ kargs.ctx = (uintptr_t)session_data; ++ err = _mali_ukk_get_api_version_v2(&kargs); ++ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); + -+ if (0 == va_pages) { -+ dev_warn(dev, "kbase_mem_alloc called with 0 va_pages!"); -+ goto bad_size; -+ } ++ if (0 != put_user(kargs.version, &uargs->version)) return -EFAULT; ++ if (0 != put_user(kargs.compatible, &uargs->compatible)) return -EFAULT; + -+ if (va_pages > (U64_MAX / PAGE_SIZE)) -+ /* 64-bit address range is the max */ -+ goto bad_size; ++ return 0; ++} + -+ if (!kbase_check_alloc_flags(*flags)) { -+ dev_warn(dev, -+ "kbase_mem_alloc called with bad flags (%llx)", -+ (unsigned long long)*flags); -+ goto bad_flags; -+ } ++/* rk_ext : 从对 r5p0-01rel0 集æˆå¼€å§‹, ä¸å†ä½¿ç”¨. */ ++#if 0 ++#define mali400_in_rk30_version 0x01 ++int get_mali_version_in_rk30_wrapper(struct mali_session_data *session_data, _mali_uk_get_mali_version_in_rk30_s __user *uargs) ++{ ++ _mali_uk_get_mali_version_in_rk30_s kargs; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ kargs.ctx = (uintptr_t)session_data; ++ kargs.version = mali400_in_rk30_version; ++ if (0 != put_user(kargs.version, &uargs->version)) return -EFAULT; ++ return 0; ++} ++#else ++#include "../platform/rk/rk_ext.h" ++int get_rk_ko_version_wrapper(struct mali_session_data *session_data, _mali_rk_ko_version_s __user *uargs) ++{ ++ _mali_rk_ko_version_s kargs; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ kargs.ctx = (uintptr_t)session_data; ++ kargs.version = RK_KO_VER; ++ if (0 != put_user(kargs.version, &uargs->version)) return -EFAULT; ++ return 0; ++} ++#endif + -+ if ((*flags & BASE_MEM_COHERENT_SYSTEM_REQUIRED) != 0 && -+ !kbase_device_is_cpu_coherent(kctx->kbdev)) { -+ dev_warn(dev, "kbase_mem_alloc call required coherent mem when unavailable"); -+ goto bad_flags; -+ } -+ if ((*flags & BASE_MEM_COHERENT_SYSTEM) != 0 && -+ !kbase_device_is_cpu_coherent(kctx->kbdev)) { -+ /* Remove COHERENT_SYSTEM flag if coherent mem is unavailable */ -+ *flags &= ~BASE_MEM_COHERENT_SYSTEM; -+ } ++int wait_for_notification_wrapper(struct mali_session_data *session_data, _mali_uk_wait_for_notification_s __user *uargs) ++{ ++ _mali_uk_wait_for_notification_s kargs; ++ _mali_osk_errcode_t err; + -+ /* Limit GPU executable allocs to GPU PC size */ -+ if ((*flags & BASE_MEM_PROT_GPU_EX) && -+ (va_pages > (1ULL << gpu_pc_bits >> PAGE_SHIFT))) -+ goto bad_ex_size; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ /* find out which VA zone to use */ -+ if (*flags & BASE_MEM_SAME_VA) -+ zone = KBASE_REG_ZONE_SAME_VA; -+ else if (*flags & BASE_MEM_PROT_GPU_EX) -+ zone = KBASE_REG_ZONE_EXEC; -+ else -+ zone = KBASE_REG_ZONE_CUSTOM_VA; ++ kargs.ctx = (uintptr_t)session_data; ++ err = _mali_ukk_wait_for_notification(&kargs); ++ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); + -+ reg = kbase_alloc_free_region(kctx, 0, va_pages, zone); -+ if (!reg) { -+ dev_err(dev, "Failed to allocate free region"); -+ goto no_region; ++ if (_MALI_NOTIFICATION_CORE_SHUTDOWN_IN_PROGRESS != kargs.type) { ++ kargs.ctx = (uintptr_t)NULL; /* prevent kernel address to be returned to user space */ ++ if (0 != copy_to_user(uargs, &kargs, sizeof(_mali_uk_wait_for_notification_s))) return -EFAULT; ++ } else { ++ if (0 != put_user(kargs.type, &uargs->type)) return -EFAULT; + } + -+ if (kbase_update_region_flags(kctx, reg, *flags) != 0) -+ goto invalid_flags; ++ return 0; ++} + -+ if (kbase_reg_prepare_native(reg, kctx) != 0) { -+ dev_err(dev, "Failed to prepare region"); -+ goto prepare_failed; -+ } ++int post_notification_wrapper(struct mali_session_data *session_data, _mali_uk_post_notification_s __user *uargs) ++{ ++ _mali_uk_post_notification_s kargs; ++ _mali_osk_errcode_t err; + -+ if (*flags & BASE_MEM_GROW_ON_GPF) -+ reg->extent = extent; -+ else -+ reg->extent = 0; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ if (kbase_alloc_phy_pages(reg, va_pages, commit_pages) != 0) { -+ dev_warn(dev, "Failed to allocate %lld pages (va_pages=%lld)", -+ (unsigned long long)commit_pages, -+ (unsigned long long)va_pages); -+ goto no_mem; ++ kargs.ctx = (uintptr_t)session_data; ++ ++ if (0 != get_user(kargs.type, &uargs->type)) { ++ return -EFAULT; + } + -+ kbase_gpu_vm_lock(kctx); ++ err = _mali_ukk_post_notification(&kargs); ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); ++ } + -+ /* mmap needed to setup VA? */ -+ if (*flags & BASE_MEM_SAME_VA) { -+ unsigned long prot = PROT_NONE; -+ unsigned long va_size = va_pages << PAGE_SHIFT; -+ unsigned long va_map = va_size; -+ unsigned long cookie, cookie_nr; -+ unsigned long cpu_addr; ++ return 0; ++} + -+ /* Bind to a cookie */ -+ if (!kctx->cookies) { -+ dev_err(dev, "No cookies available for allocation!"); -+ kbase_gpu_vm_unlock(kctx); -+ goto no_cookie; -+ } -+ /* return a cookie */ -+ cookie_nr = __ffs(kctx->cookies); -+ kctx->cookies &= ~(1UL << cookie_nr); -+ BUG_ON(kctx->pending_regions[cookie_nr]); -+ kctx->pending_regions[cookie_nr] = reg; ++int get_user_settings_wrapper(struct mali_session_data *session_data, _mali_uk_get_user_settings_s __user *uargs) ++{ ++ _mali_uk_get_user_settings_s kargs; ++ _mali_osk_errcode_t err; + -+ kbase_gpu_vm_unlock(kctx); ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ /* relocate to correct base */ -+ cookie = cookie_nr + PFN_DOWN(BASE_MEM_COOKIE_BASE); -+ cookie <<= PAGE_SHIFT; ++ kargs.ctx = (uintptr_t)session_data; ++ err = _mali_ukk_get_user_settings(&kargs); ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); ++ } + -+ /* -+ * 10.1-10.4 UKU userland relies on the kernel to call mmap. -+ * For all other versions we can just return the cookie -+ */ -+ if (kctx->api_version < KBASE_API_VERSION(10, 1) || -+ kctx->api_version > KBASE_API_VERSION(10, 4)) { -+ *gpu_va = (u64) cookie; -+ return reg; -+ } -+ if (*flags & BASE_MEM_PROT_CPU_RD) -+ prot |= PROT_READ; -+ if (*flags & BASE_MEM_PROT_CPU_WR) -+ prot |= PROT_WRITE; ++ kargs.ctx = 0; /* prevent kernel address to be returned to user space */ ++ if (0 != copy_to_user(uargs, &kargs, sizeof(_mali_uk_get_user_settings_s))) return -EFAULT; + -+ cpu_addr = vm_mmap(kctx->filp, 0, va_map, prot, -+ MAP_SHARED, cookie); ++ return 0; ++} + -+ if (IS_ERR_VALUE(cpu_addr)) { -+ kbase_gpu_vm_lock(kctx); -+ kctx->pending_regions[cookie_nr] = NULL; -+ kctx->cookies |= (1UL << cookie_nr); -+ kbase_gpu_vm_unlock(kctx); -+ goto no_mmap; -+ } ++int request_high_priority_wrapper(struct mali_session_data *session_data, _mali_uk_request_high_priority_s __user *uargs) ++{ ++ _mali_uk_request_high_priority_s kargs; ++ _mali_osk_errcode_t err; + -+ *gpu_va = (u64) cpu_addr; -+ } else /* we control the VA */ { -+ if (kbase_gpu_mmap(kctx, reg, 0, va_pages, 1) != 0) { -+ dev_warn(dev, "Failed to map memory on GPU"); -+ kbase_gpu_vm_unlock(kctx); -+ goto no_mmap; -+ } -+ /* return real GPU VA */ -+ *gpu_va = reg->start_pfn << PAGE_SHIFT; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ kbase_gpu_vm_unlock(kctx); -+ } ++ kargs.ctx = (uintptr_t)session_data; ++ err = _mali_ukk_request_high_priority(&kargs); + -+ return reg; ++ kargs.ctx = 0; + -+no_mmap: -+no_cookie: -+no_mem: -+ kbase_mem_phy_alloc_put(reg->cpu_alloc); -+ kbase_mem_phy_alloc_put(reg->gpu_alloc); -+invalid_flags: -+prepare_failed: -+ kfree(reg); -+no_region: -+bad_ex_size: -+bad_flags: -+bad_size: -+ return NULL; ++ return map_errcode(err); +} -+KBASE_EXPORT_TEST_API(kbase_mem_alloc); + -+int kbase_mem_query(struct kbase_context *kctx, u64 gpu_addr, int query, u64 * const out) ++int pending_submit_wrapper(struct mali_session_data *session_data, _mali_uk_pending_submit_s __user *uargs) +{ -+ struct kbase_va_region *reg; -+ int ret = -EINVAL; ++ _mali_uk_pending_submit_s kargs; ++ _mali_osk_errcode_t err; + -+ KBASE_DEBUG_ASSERT(kctx); -+ KBASE_DEBUG_ASSERT(out); ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ if (gpu_addr & ~PAGE_MASK) { -+ dev_warn(kctx->kbdev->dev, "mem_query: gpu_addr: passed parameter is invalid"); -+ return -EINVAL; -+ } ++ kargs.ctx = (uintptr_t)session_data; ++ err = _mali_ukk_pending_submit(&kargs); ++ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); + -+ kbase_gpu_vm_lock(kctx); ++ return 0; ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c +new file mode 100755 +index 000000000..68fcd9719 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c +@@ -0,0 +1,91 @@ ++/* ++ * Copyright (C) 2010, 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include /* file system operations */ ++#include /* user space access */ + -+ /* Validate the region */ -+ reg = kbase_region_tracker_find_region_base_address(kctx, gpu_addr); -+ if (!reg || (reg->flags & KBASE_REG_FREE)) -+ goto out_unlock; ++#include "mali_ukk.h" ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_session.h" ++#include "mali_ukk_wrappers.h" + -+ switch (query) { -+ case KBASE_MEM_QUERY_COMMIT_SIZE: -+ if (reg->cpu_alloc->type != KBASE_MEM_TYPE_ALIAS) { -+ *out = kbase_reg_current_backed_size(reg); -+ } else { -+ size_t i; -+ struct kbase_aliased *aliased; -+ *out = 0; -+ aliased = reg->cpu_alloc->imported.alias.aliased; -+ for (i = 0; i < reg->cpu_alloc->imported.alias.nents; i++) -+ *out += aliased[i].length; -+ } -+ break; -+ case KBASE_MEM_QUERY_VA_SIZE: -+ *out = reg->nr_pages; -+ break; -+ case KBASE_MEM_QUERY_FLAGS: -+ { -+ *out = 0; -+ if (KBASE_REG_CPU_WR & reg->flags) -+ *out |= BASE_MEM_PROT_CPU_WR; -+ if (KBASE_REG_CPU_RD & reg->flags) -+ *out |= BASE_MEM_PROT_CPU_RD; -+ if (KBASE_REG_CPU_CACHED & reg->flags) -+ *out |= BASE_MEM_CACHED_CPU; -+ if (KBASE_REG_GPU_WR & reg->flags) -+ *out |= BASE_MEM_PROT_GPU_WR; -+ if (KBASE_REG_GPU_RD & reg->flags) -+ *out |= BASE_MEM_PROT_GPU_RD; -+ if (!(KBASE_REG_GPU_NX & reg->flags)) -+ *out |= BASE_MEM_PROT_GPU_EX; -+ if (KBASE_REG_SHARE_BOTH & reg->flags) -+ *out |= BASE_MEM_COHERENT_SYSTEM; -+ if (KBASE_REG_SHARE_IN & reg->flags) -+ *out |= BASE_MEM_COHERENT_LOCAL; -+ break; -+ } -+ default: -+ *out = 0; -+ goto out_unlock; -+ } ++int gp_start_job_wrapper(struct mali_session_data *session_data, _mali_uk_gp_start_job_s __user *uargs) ++{ ++ _mali_osk_errcode_t err; + -+ ret = 0; ++ /* If the job was started successfully, 0 is returned. If there was an error, but the job ++ * was started, we return -ENOENT. For anything else returned, the job was not started. */ + -+out_unlock: -+ kbase_gpu_vm_unlock(kctx); -+ return ret; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); ++ ++ err = _mali_ukk_gp_start_job(session_data, uargs); ++ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); ++ ++ return 0; +} + -+/** -+ * kbase_mem_evictable_reclaim_count_objects - Count number of pages in the -+ * Ephemeral memory eviction list. -+ * @s: Shrinker -+ * @sc: Shrinker control -+ * -+ * Return: Number of pages which can be freed. -+ */ -+static -+unsigned long kbase_mem_evictable_reclaim_count_objects(struct shrinker *s, -+ struct shrink_control *sc) ++int gp_get_core_version_wrapper(struct mali_session_data *session_data, _mali_uk_get_gp_core_version_s __user *uargs) +{ -+ struct kbase_context *kctx; -+ struct kbase_mem_phy_alloc *alloc; -+ unsigned long pages = 0; ++ _mali_uk_get_gp_core_version_s kargs; ++ _mali_osk_errcode_t err; + -+ kctx = container_of(s, struct kbase_context, reclaim); ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+ mutex_lock(&kctx->jit_evict_lock); ++ kargs.ctx = (uintptr_t)session_data; ++ err = _mali_ukk_get_gp_core_version(&kargs); ++ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); + -+ list_for_each_entry(alloc, &kctx->evict_list, evict_node) -+ pages += alloc->nents; ++ /* no known transactions to roll-back */ + -+ mutex_unlock(&kctx->jit_evict_lock); -+ return pages; ++ if (0 != put_user(kargs.version, &uargs->version)) return -EFAULT; ++ ++ return 0; +} + -+/** -+ * kbase_mem_evictable_reclaim_scan_objects - Scan the Ephemeral memory eviction -+ * list for pages and try to reclaim them. -+ * @s: Shrinker -+ * @sc: Shrinker control -+ * -+ * Return: Number of pages freed (can be less then requested) or -1 if the -+ * shrinker failed to free pages in its pool. -+ * -+ * Note: -+ * This function accesses region structures without taking the region lock, -+ * this is required as the OOM killer can call the shrinker after the region -+ * lock has already been held. -+ * This is safe as we can guarantee that a region on the eviction list will -+ * not be freed (kbase_mem_free_region removes the allocation from the list -+ * before destroying it), or modified by other parts of the driver. -+ * The eviction list itself is guarded by the eviction lock and the MMU updates -+ * are protected by their own lock. -+ */ -+static -+unsigned long kbase_mem_evictable_reclaim_scan_objects(struct shrinker *s, -+ struct shrink_control *sc) ++int gp_suspend_response_wrapper(struct mali_session_data *session_data, _mali_uk_gp_suspend_response_s __user *uargs) +{ -+ struct kbase_context *kctx; -+ struct kbase_mem_phy_alloc *alloc; -+ struct kbase_mem_phy_alloc *tmp; -+ unsigned long freed = 0; -+ -+ kctx = container_of(s, struct kbase_context, reclaim); -+ mutex_lock(&kctx->jit_evict_lock); -+ -+ list_for_each_entry_safe(alloc, tmp, &kctx->evict_list, evict_node) { -+ int err; -+ -+ err = kbase_mem_shrink_gpu_mapping(kctx, alloc->reg, -+ 0, alloc->nents); -+ if (err != 0) { -+ /* -+ * Failed to remove GPU mapping, tell the shrinker -+ * to stop trying to shrink our slab even though we -+ * have pages in it. -+ */ -+ freed = -1; -+ goto out_unlock; -+ } ++ _mali_uk_gp_suspend_response_s kargs; ++ _mali_osk_errcode_t err; + -+ /* -+ * Update alloc->evicted before freeing the backing so the -+ * helper can determine that it needs to bypass the accounting -+ * and memory pool. -+ */ -+ alloc->evicted = alloc->nents; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+ kbase_free_phy_pages_helper(alloc, alloc->evicted); -+ freed += alloc->evicted; -+ list_del_init(&alloc->evict_node); ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_gp_suspend_response_s))) return -EFAULT; + -+ /* -+ * Inform the JIT allocator this region has lost backing -+ * as it might need to free the allocation. -+ */ -+ kbase_jit_backing_lost(alloc->reg); ++ kargs.ctx = (uintptr_t)session_data; ++ err = _mali_ukk_gp_suspend_response(&kargs); ++ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); + -+ /* Enough pages have been freed so stop now */ -+ if (freed > sc->nr_to_scan) -+ break; -+ } -+out_unlock: -+ mutex_unlock(&kctx->jit_evict_lock); ++ if (0 != put_user(kargs.cookie, &uargs->cookie)) return -EFAULT; + -+ return freed; ++ /* no known transactions to roll-back */ ++ return 0; +} + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) -+static int kbase_mem_evictable_reclaim_shrink(struct shrinker *s, -+ struct shrink_control *sc) ++int gp_get_number_of_cores_wrapper(struct mali_session_data *session_data, _mali_uk_get_gp_number_of_cores_s __user *uargs) +{ -+ if (sc->nr_to_scan == 0) -+ return kbase_mem_evictable_reclaim_count_objects(s, sc); ++ _mali_uk_get_gp_number_of_cores_s kargs; ++ _mali_osk_errcode_t err; + -+ return kbase_mem_evictable_reclaim_scan_objects(s, sc); -+} -+#endif ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+int kbase_mem_evictable_init(struct kbase_context *kctx) -+{ -+ INIT_LIST_HEAD(&kctx->evict_list); -+ mutex_init(&kctx->jit_evict_lock); ++ kargs.ctx = (uintptr_t)session_data; ++ err = _mali_ukk_get_gp_number_of_cores(&kargs); ++ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); + -+ /* Register shrinker */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) -+ kctx->reclaim.shrink = kbase_mem_evictable_reclaim_shrink; -+#else -+ kctx->reclaim.count_objects = kbase_mem_evictable_reclaim_count_objects; -+ kctx->reclaim.scan_objects = kbase_mem_evictable_reclaim_scan_objects; -+#endif -+ kctx->reclaim.seeks = DEFAULT_SEEKS; -+ /* Kernel versions prior to 3.1 : -+ * struct shrinker does not define batch */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) -+ kctx->reclaim.batch = 0; -+#endif -+ register_shrinker(&kctx->reclaim); -+ return 0; -+} ++ /* no known transactions to roll-back */ + -+void kbase_mem_evictable_deinit(struct kbase_context *kctx) -+{ -+ unregister_shrinker(&kctx->reclaim); ++ if (0 != put_user(kargs.number_of_cores, &uargs->number_of_cores)) return -EFAULT; ++ ++ return 0; +} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c +new file mode 100755 +index 000000000..baea4c688 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c +@@ -0,0 +1,333 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include /* file system operations */ ++#include /* user space access */ + -+struct kbase_mem_zone_cache_entry { -+ /* List head used to link the cache entry to the memory allocation. */ -+ struct list_head zone_node; -+ /* The zone the cacheline is for. */ -+ struct zone *zone; -+ /* The number of pages in the allocation which belong to this zone. */ -+ u64 count; -+}; ++#include "mali_ukk.h" ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_session.h" ++#include "mali_ukk_wrappers.h" + -+static bool kbase_zone_cache_builder(struct kbase_mem_phy_alloc *alloc, -+ size_t start_offset) ++int mem_alloc_wrapper(struct mali_session_data *session_data, _mali_uk_alloc_mem_s __user *uargs) +{ -+ struct kbase_mem_zone_cache_entry *cache = NULL; -+ size_t i; -+ int ret = 0; ++ _mali_uk_alloc_mem_s kargs; ++ _mali_osk_errcode_t err; + -+ for (i = start_offset; i < alloc->nents; i++) { -+ struct page *p = phys_to_page(as_phys_addr_t(alloc->pages[i])); -+ struct zone *zone = page_zone(p); -+ bool create = true; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+ if (cache && (cache->zone == zone)) { -+ /* -+ * Fast path check as most of the time adjacent -+ * pages come from the same zone. -+ */ -+ create = false; -+ } else { -+ /* -+ * Slow path check, walk all the cache entries to see -+ * if we already know about this zone. -+ */ -+ list_for_each_entry(cache, &alloc->zone_cache, zone_node) { -+ if (cache->zone == zone) { -+ create = false; -+ break; -+ } -+ } -+ } ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_alloc_mem_s))) { ++ return -EFAULT; ++ } ++ kargs.ctx = (uintptr_t)session_data; + -+ /* This zone wasn't found in the cache, create an entry for it */ -+ if (create) { -+ cache = kmalloc(sizeof(*cache), GFP_KERNEL); -+ if (!cache) { -+ ret = -ENOMEM; -+ goto bail; -+ } -+ cache->zone = zone; -+ cache->count = 0; -+ list_add(&cache->zone_node, &alloc->zone_cache); -+ } ++ err = _mali_ukk_mem_allocate(&kargs); + -+ cache->count++; ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); + } -+ return 0; + -+bail: -+ return ret; ++ if (0 != put_user(kargs.backend_handle, &uargs->backend_handle)) { ++ return -EFAULT; ++ } ++ ++ return 0; +} + -+int kbase_zone_cache_update(struct kbase_mem_phy_alloc *alloc, -+ size_t start_offset) ++int mem_free_wrapper(struct mali_session_data *session_data, _mali_uk_free_mem_s __user *uargs) +{ -+ /* -+ * Bail if the zone cache is empty, only update the cache if it -+ * existed in the first place. -+ */ -+ if (list_empty(&alloc->zone_cache)) -+ return 0; ++ _mali_uk_free_mem_s kargs; ++ _mali_osk_errcode_t err; + -+ return kbase_zone_cache_builder(alloc, start_offset); -+} ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+int kbase_zone_cache_build(struct kbase_mem_phy_alloc *alloc) -+{ -+ /* Bail if the zone cache already exists */ -+ if (!list_empty(&alloc->zone_cache)) -+ return 0; ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_free_mem_s))) { ++ return -EFAULT; ++ } ++ kargs.ctx = (uintptr_t)session_data; ++ ++ err = _mali_ukk_mem_free(&kargs); ++ ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); ++ } ++ ++ if (0 != put_user(kargs.free_pages_nr, &uargs->free_pages_nr)) { ++ return -EFAULT; ++ } + -+ return kbase_zone_cache_builder(alloc, 0); ++ return 0; +} + -+void kbase_zone_cache_clear(struct kbase_mem_phy_alloc *alloc) ++int mem_bind_wrapper(struct mali_session_data *session_data, _mali_uk_bind_mem_s __user *uargs) +{ -+ struct kbase_mem_zone_cache_entry *walker; ++ _mali_uk_bind_mem_s kargs; ++ _mali_osk_errcode_t err; ++ ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); ++ ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_bind_mem_s))) { ++ return -EFAULT; ++ } ++ kargs.ctx = (uintptr_t)session_data; ++ ++ err = _mali_ukk_mem_bind(&kargs); + -+ while(!list_empty(&alloc->zone_cache)){ -+ walker = list_first_entry(&alloc->zone_cache, -+ struct kbase_mem_zone_cache_entry, zone_node); -+ list_del(&walker->zone_node); -+ kfree(walker); ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); + } ++ ++ return 0; +} + -+/** -+ * kbase_mem_evictable_mark_reclaim - Mark the pages as reclaimable. -+ * @alloc: The physical allocation -+ */ -+static void kbase_mem_evictable_mark_reclaim(struct kbase_mem_phy_alloc *alloc) ++int mem_unbind_wrapper(struct mali_session_data *session_data, _mali_uk_unbind_mem_s __user *uargs) +{ -+ struct kbase_context *kctx = alloc->imported.kctx; -+ struct kbase_mem_zone_cache_entry *zone_cache; -+ int __maybe_unused new_page_count; -+ int err; ++ _mali_uk_unbind_mem_s kargs; ++ _mali_osk_errcode_t err; + -+ /* Attempt to build a zone cache of tracking */ -+ err = kbase_zone_cache_build(alloc); -+ if (err == 0) { -+ /* Bulk update all the zones */ -+ list_for_each_entry(zone_cache, &alloc->zone_cache, zone_node) { -+ zone_page_state_add(zone_cache->count, -+ zone_cache->zone, NR_SLAB_RECLAIMABLE); -+ } -+ } else { -+ /* Fall-back to page by page updates */ -+ int i; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+ for (i = 0; i < alloc->nents; i++) { -+ struct page *p; -+ struct zone *zone; ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_unbind_mem_s))) { ++ return -EFAULT; ++ } ++ kargs.ctx = (uintptr_t)session_data; + -+ p = phys_to_page(as_phys_addr_t(alloc->pages[i])); -+ zone = page_zone(p); ++ err = _mali_ukk_mem_unbind(&kargs); + -+ zone_page_state_add(1, zone, NR_SLAB_RECLAIMABLE); -+ } ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); + } + -+ kbase_process_page_usage_dec(kctx, alloc->nents); -+ new_page_count = kbase_atomic_sub_pages(alloc->nents, -+ &kctx->used_pages); -+ kbase_atomic_sub_pages(alloc->nents, &kctx->kbdev->memdev.used_pages); -+ -+ KBASE_TLSTREAM_AUX_PAGESALLOC( -+ kctx->id, -+ (u64)new_page_count); ++ return 0; +} + -+/** -+ * kbase_mem_evictable_unmark_reclaim - Mark the pages as no longer reclaimable. -+ * @alloc: The physical allocation -+ */ -+static -+void kbase_mem_evictable_unmark_reclaim(struct kbase_mem_phy_alloc *alloc) ++ ++int mem_cow_wrapper(struct mali_session_data *session_data, _mali_uk_cow_mem_s __user *uargs) +{ -+ struct kbase_context *kctx = alloc->imported.kctx; -+ struct kbase_mem_zone_cache_entry *zone_cache; -+ int __maybe_unused new_page_count; -+ int err; ++ _mali_uk_cow_mem_s kargs; ++ _mali_osk_errcode_t err; + -+ new_page_count = kbase_atomic_add_pages(alloc->nents, -+ &kctx->used_pages); -+ kbase_atomic_add_pages(alloc->nents, &kctx->kbdev->memdev.used_pages); ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+ /* Increase mm counters so that the allocation is accounted for -+ * against the process and thus is visible to the OOM killer, -+ * then remove it from the reclaimable accounting. */ -+ kbase_process_page_usage_inc(kctx, alloc->nents); ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_cow_mem_s))) { ++ return -EFAULT; ++ } ++ kargs.ctx = (uintptr_t)session_data; + -+ /* Attempt to build a zone cache of tracking */ -+ err = kbase_zone_cache_build(alloc); -+ if (err == 0) { -+ /* Bulk update all the zones */ -+ list_for_each_entry(zone_cache, &alloc->zone_cache, zone_node) { -+ zone_page_state_add(-zone_cache->count, -+ zone_cache->zone, NR_SLAB_RECLAIMABLE); -+ } -+ } else { -+ /* Fall-back to page by page updates */ -+ int i; ++ err = _mali_ukk_mem_cow(&kargs); + -+ for (i = 0; i < alloc->nents; i++) { -+ struct page *p; -+ struct zone *zone; ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); ++ } + -+ p = phys_to_page(as_phys_addr_t(alloc->pages[i])); -+ zone = page_zone(p); -+ zone_page_state_add(-1, zone, NR_SLAB_RECLAIMABLE); -+ } ++ if (0 != put_user(kargs.backend_handle, &uargs->backend_handle)) { ++ return -EFAULT; + } + -+ KBASE_TLSTREAM_AUX_PAGESALLOC( -+ kctx->id, -+ (u64)new_page_count); ++ return 0; +} + -+int kbase_mem_evictable_make(struct kbase_mem_phy_alloc *gpu_alloc) ++int mem_cow_modify_range_wrapper(struct mali_session_data *session_data, _mali_uk_cow_modify_range_s __user *uargs) +{ -+ struct kbase_context *kctx = gpu_alloc->imported.kctx; ++ _mali_uk_cow_modify_range_s kargs; ++ _mali_osk_errcode_t err; + -+ lockdep_assert_held(&kctx->reg_lock); ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+ /* This alloction can't already be on a list. */ -+ WARN_ON(!list_empty(&gpu_alloc->evict_node)); ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_cow_modify_range_s))) { ++ return -EFAULT; ++ } ++ kargs.ctx = (uintptr_t)session_data; + -+ kbase_mem_shrink_cpu_mapping(kctx, gpu_alloc->reg, -+ 0, gpu_alloc->nents); ++ err = _mali_ukk_mem_cow_modify_range(&kargs); + -+ /* -+ * Add the allocation to the eviction list, after this point the shrink -+ * can reclaim it. -+ */ -+ mutex_lock(&kctx->jit_evict_lock); -+ list_add(&gpu_alloc->evict_node, &kctx->evict_list); -+ mutex_unlock(&kctx->jit_evict_lock); -+ kbase_mem_evictable_mark_reclaim(gpu_alloc); ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); ++ } + -+ gpu_alloc->reg->flags |= KBASE_REG_DONT_NEED; ++ if (0 != put_user(kargs.change_pages_nr, &uargs->change_pages_nr)) { ++ return -EFAULT; ++ } + return 0; +} + -+bool kbase_mem_evictable_unmake(struct kbase_mem_phy_alloc *gpu_alloc) -+{ -+ struct kbase_context *kctx = gpu_alloc->imported.kctx; -+ int err = 0; + -+ lockdep_assert_held(&kctx->reg_lock); ++int mem_resize_mem_wrapper(struct mali_session_data *session_data, _mali_uk_mem_resize_s __user *uargs) ++{ ++ _mali_uk_mem_resize_s kargs; ++ _mali_osk_errcode_t err; + -+ /* -+ * First remove the allocation from the eviction list as it's no -+ * longer eligible for eviction. -+ */ -+ list_del_init(&gpu_alloc->evict_node); ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+ if (gpu_alloc->evicted == 0) { -+ /* -+ * The backing is still present, update the VM stats as it's -+ * in use again. -+ */ -+ kbase_mem_evictable_unmark_reclaim(gpu_alloc); -+ } else { -+ /* If the region is still alive ... */ -+ if (gpu_alloc->reg) { -+ /* ... allocate replacement backing ... */ -+ err = kbase_alloc_phy_pages_helper(gpu_alloc, -+ gpu_alloc->evicted); ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_mem_resize_s))) { ++ return -EFAULT; ++ } ++ kargs.ctx = (uintptr_t)session_data; + -+ /* -+ * ... and grow the mapping back to its -+ * pre-eviction size. -+ */ -+ if (!err) -+ err = kbase_mem_grow_gpu_mapping(kctx, -+ gpu_alloc->reg, -+ gpu_alloc->evicted, 0); ++ err = _mali_ukk_mem_resize(&kargs); + -+ gpu_alloc->evicted = 0; -+ } ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); + } + -+ /* If the region is still alive remove the DONT_NEED attribute. */ -+ if (gpu_alloc->reg) -+ gpu_alloc->reg->flags &= ~KBASE_REG_DONT_NEED; -+ -+ return (err == 0); ++ return 0; +} + -+int kbase_mem_flags_change(struct kbase_context *kctx, u64 gpu_addr, unsigned int flags, unsigned int mask) ++int mem_write_safe_wrapper(struct mali_session_data *session_data, _mali_uk_mem_write_safe_s __user *uargs) +{ -+ struct kbase_va_region *reg; -+ int ret = -EINVAL; -+ unsigned int real_flags = 0; -+ unsigned int prev_flags = 0; -+ bool prev_needed, new_needed; ++ _mali_uk_mem_write_safe_s kargs; ++ _mali_osk_errcode_t err; + -+ KBASE_DEBUG_ASSERT(kctx); ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+ if (!gpu_addr) ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_mem_write_safe_s))) { ++ return -EFAULT; ++ } ++ ++ kargs.ctx = (uintptr_t)session_data; ++ ++ /* Check if we can access the buffers */ ++ if (!access_ok((const void *)(uintptr_t)kargs.dest, kargs.size) || ++ !access_ok((const void *)(uintptr_t)kargs.src, kargs.size)) { + return -EINVAL; ++ } + -+ if ((gpu_addr & ~PAGE_MASK) && (gpu_addr >= PAGE_SIZE)) ++ /* Check if size wraps */ ++ if ((kargs.size + kargs.dest) <= kargs.dest ++ || (kargs.size + kargs.src) <= kargs.src) { + return -EINVAL; ++ } + -+ /* nuke other bits */ -+ flags &= mask; -+ -+ /* check for only supported flags */ -+ if (flags & ~(BASE_MEM_FLAGS_MODIFIABLE)) -+ goto out; -+ -+ /* mask covers bits we don't support? */ -+ if (mask & ~(BASE_MEM_FLAGS_MODIFIABLE)) -+ goto out; -+ -+ /* convert flags */ -+ if (BASE_MEM_COHERENT_SYSTEM & flags) -+ real_flags |= KBASE_REG_SHARE_BOTH; -+ else if (BASE_MEM_COHERENT_LOCAL & flags) -+ real_flags |= KBASE_REG_SHARE_IN; ++ err = _mali_ukk_mem_write_safe(&kargs); ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); ++ } + -+ /* now we can lock down the context, and find the region */ -+ down_write(¤t->mm->mmap_sem); -+ kbase_gpu_vm_lock(kctx); ++ if (0 != put_user(kargs.size, &uargs->size)) { ++ return -EFAULT; ++ } + -+ /* Validate the region */ -+ reg = kbase_region_tracker_find_region_base_address(kctx, gpu_addr); -+ if (!reg || (reg->flags & KBASE_REG_FREE)) -+ goto out_unlock; ++ return 0; ++} + -+ /* Is the region being transitioning between not needed and needed? */ -+ prev_needed = (KBASE_REG_DONT_NEED & reg->flags) == KBASE_REG_DONT_NEED; -+ new_needed = (BASE_MEM_DONT_NEED & flags) == BASE_MEM_DONT_NEED; -+ if (prev_needed != new_needed) { -+ /* Aliased allocations can't be made ephemeral */ -+ if (atomic_read(®->cpu_alloc->gpu_mappings) > 1) -+ goto out_unlock; + -+ if (new_needed) { -+ /* Only native allocations can be marked not needed */ -+ if (reg->cpu_alloc->type != KBASE_MEM_TYPE_NATIVE) { -+ ret = -EINVAL; -+ goto out_unlock; -+ } -+ ret = kbase_mem_evictable_make(reg->gpu_alloc); -+ if (ret) -+ goto out_unlock; -+ } else { -+ kbase_mem_evictable_unmake(reg->gpu_alloc); -+ } -+ } + -+ /* limit to imported memory */ -+ if ((reg->gpu_alloc->type != KBASE_MEM_TYPE_IMPORTED_UMP) && -+ (reg->gpu_alloc->type != KBASE_MEM_TYPE_IMPORTED_UMM)) -+ goto out_unlock; ++int mem_query_mmu_page_table_dump_size_wrapper(struct mali_session_data *session_data, _mali_uk_query_mmu_page_table_dump_size_s __user *uargs) ++{ ++ _mali_uk_query_mmu_page_table_dump_size_s kargs; ++ _mali_osk_errcode_t err; + -+ /* no change? */ -+ if (real_flags == (reg->flags & (KBASE_REG_SHARE_IN | KBASE_REG_SHARE_BOTH))) { -+ ret = 0; -+ goto out_unlock; -+ } ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+ /* save for roll back */ -+ prev_flags = reg->flags; -+ reg->flags &= ~(KBASE_REG_SHARE_IN | KBASE_REG_SHARE_BOTH); -+ reg->flags |= real_flags; ++ kargs.ctx = (uintptr_t)session_data; + -+ /* Currently supporting only imported memory */ -+ switch (reg->gpu_alloc->type) { -+#ifdef CONFIG_UMP -+ case KBASE_MEM_TYPE_IMPORTED_UMP: -+ ret = kbase_mmu_update_pages(kctx, reg->start_pfn, -+ kbase_get_gpu_phy_pages(reg), -+ reg->gpu_alloc->nents, reg->flags); -+ break; -+#endif -+#ifdef CONFIG_DMA_SHARED_BUFFER -+ case KBASE_MEM_TYPE_IMPORTED_UMM: -+ /* Future use will use the new flags, existing mapping will NOT be updated -+ * as memory should not be in use by the GPU when updating the flags. -+ */ -+ ret = 0; -+ WARN_ON(reg->gpu_alloc->imported.umm.current_mapping_usage_count); -+ break; -+#endif -+ default: -+ break; -+ } ++ err = _mali_ukk_query_mmu_page_table_dump_size(&kargs); ++ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); + -+ /* roll back on error, i.e. not UMP */ -+ if (ret) -+ reg->flags = prev_flags; ++ if (0 != put_user(kargs.size, &uargs->size)) return -EFAULT; + -+out_unlock: -+ kbase_gpu_vm_unlock(kctx); -+ up_write(¤t->mm->mmap_sem); -+out: -+ return ret; ++ return 0; +} + -+#define KBASE_MEM_IMPORT_HAVE_PAGES (1UL << BASE_MEM_FLAGS_NR_BITS) -+ -+#ifdef CONFIG_UMP -+static struct kbase_va_region *kbase_mem_from_ump(struct kbase_context *kctx, ump_secure_id id, u64 *va_pages, u64 *flags) ++int mem_dump_mmu_page_table_wrapper(struct mali_session_data *session_data, _mali_uk_dump_mmu_page_table_s __user *uargs) +{ -+ struct kbase_va_region *reg; -+ ump_dd_handle umph; -+ u64 block_count; -+ const ump_dd_physical_block_64 *block_array; -+ u64 i, j; -+ int page = 0; -+ ump_alloc_flags ump_flags; -+ ump_alloc_flags cpu_flags; -+ ump_alloc_flags gpu_flags; -+ -+ if (*flags & BASE_MEM_SECURE) -+ goto bad_flags; ++ _mali_uk_dump_mmu_page_table_s kargs; ++ _mali_osk_errcode_t err; ++ void __user *user_buffer; ++ void *buffer = NULL; ++ int rc = -EFAULT; + -+ umph = ump_dd_from_secure_id(id); -+ if (UMP_DD_INVALID_MEMORY_HANDLE == umph) -+ goto bad_id; ++ /* validate input */ ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ /* the session_data pointer was validated by caller */ + -+ ump_flags = ump_dd_allocation_flags_get(umph); -+ cpu_flags = (ump_flags >> UMP_DEVICE_CPU_SHIFT) & UMP_DEVICE_MASK; -+ gpu_flags = (ump_flags >> DEFAULT_UMP_GPU_DEVICE_SHIFT) & -+ UMP_DEVICE_MASK; ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_dump_mmu_page_table_s))) ++ goto err_exit; + -+ *va_pages = ump_dd_size_get_64(umph); -+ *va_pages >>= PAGE_SHIFT; ++ user_buffer = (void __user *)(uintptr_t)kargs.buffer; ++ if (!access_ok(user_buffer, kargs.size)) ++ goto err_exit; + -+ if (!*va_pages) -+ goto bad_size; ++ /* allocate temporary buffer (kernel side) to store mmu page table info */ ++ if (kargs.size <= 0) ++ return -EINVAL; ++ /* Allow at most 8MiB buffers, this is more than enough to dump a fully ++ * populated page table. */ ++ if (kargs.size > SZ_8M) ++ return -EINVAL; + -+ if (*va_pages > (U64_MAX / PAGE_SIZE)) -+ /* 64-bit address range is the max */ -+ goto bad_size; ++ buffer = (void *)(uintptr_t)_mali_osk_valloc(kargs.size); ++ if (NULL == buffer) { ++ rc = -ENOMEM; ++ goto err_exit; ++ } + -+ if (*flags & BASE_MEM_SAME_VA) -+ reg = kbase_alloc_free_region(kctx, 0, *va_pages, KBASE_REG_ZONE_SAME_VA); -+ else -+ reg = kbase_alloc_free_region(kctx, 0, *va_pages, KBASE_REG_ZONE_CUSTOM_VA); ++ kargs.ctx = (uintptr_t)session_data; ++ kargs.buffer = (uintptr_t)buffer; ++ err = _mali_ukk_dump_mmu_page_table(&kargs); ++ if (_MALI_OSK_ERR_OK != err) { ++ rc = map_errcode(err); ++ goto err_exit; ++ } + -+ if (!reg) -+ goto no_region; ++ /* copy mmu page table info back to user space and update pointers */ ++ if (0 != copy_to_user(user_buffer, buffer, kargs.size)) ++ goto err_exit; + -+ /* we've got pages to map now, and support SAME_VA */ -+ *flags |= KBASE_MEM_IMPORT_HAVE_PAGES; ++ kargs.register_writes = kargs.register_writes - ++ (uintptr_t)buffer + (uintptr_t)user_buffer; ++ kargs.page_table_dump = kargs.page_table_dump - ++ (uintptr_t)buffer + (uintptr_t)user_buffer; + -+ reg->gpu_alloc = kbase_alloc_create(*va_pages, KBASE_MEM_TYPE_IMPORTED_UMP); -+ if (IS_ERR_OR_NULL(reg->gpu_alloc)) -+ goto no_alloc_obj; ++ if (0 != copy_to_user(uargs, &kargs, sizeof(kargs))) ++ goto err_exit; + -+ reg->cpu_alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); ++ rc = 0; + -+ reg->gpu_alloc->imported.ump_handle = umph; ++err_exit: ++ if (buffer) _mali_osk_vfree(buffer); ++ return rc; ++} + -+ reg->flags &= ~KBASE_REG_FREE; -+ reg->flags |= KBASE_REG_GPU_NX; /* UMP is always No eXecute */ -+ reg->flags &= ~KBASE_REG_GROWABLE; /* UMP cannot be grown */ ++int mem_usage_get_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_memory_usage_get_s __user *uargs) ++{ ++ _mali_osk_errcode_t err; ++ _mali_uk_profiling_memory_usage_get_s kargs; + -+ /* Override import flags based on UMP flags */ -+ *flags &= ~(BASE_MEM_CACHED_CPU); -+ *flags &= ~(BASE_MEM_PROT_CPU_RD | BASE_MEM_PROT_CPU_WR); -+ *flags &= ~(BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR); ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+ if ((cpu_flags & (UMP_HINT_DEVICE_RD | UMP_HINT_DEVICE_WR)) == -+ (UMP_HINT_DEVICE_RD | UMP_HINT_DEVICE_WR)) { -+ reg->flags |= KBASE_REG_CPU_CACHED; -+ *flags |= BASE_MEM_CACHED_CPU; ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_profiling_memory_usage_get_s))) { ++ return -EFAULT; + } + -+ if (cpu_flags & UMP_PROT_CPU_WR) { -+ reg->flags |= KBASE_REG_CPU_WR; -+ *flags |= BASE_MEM_PROT_CPU_WR; ++ kargs.ctx = (uintptr_t)session_data; ++ err = _mali_ukk_mem_usage_get(&kargs); ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); + } + -+ if (cpu_flags & UMP_PROT_CPU_RD) { -+ reg->flags |= KBASE_REG_CPU_RD; -+ *flags |= BASE_MEM_PROT_CPU_RD; ++ kargs.ctx = (uintptr_t)NULL; /* prevent kernel address to be returned to user space */ ++ if (0 != copy_to_user(uargs, &kargs, sizeof(_mali_uk_profiling_memory_usage_get_s))) { ++ return -EFAULT; + } + -+ if ((gpu_flags & (UMP_HINT_DEVICE_RD | UMP_HINT_DEVICE_WR)) == -+ (UMP_HINT_DEVICE_RD | UMP_HINT_DEVICE_WR)) -+ reg->flags |= KBASE_REG_GPU_CACHED; ++ return 0; ++} + -+ if (gpu_flags & UMP_PROT_DEVICE_WR) { -+ reg->flags |= KBASE_REG_GPU_WR; -+ *flags |= BASE_MEM_PROT_GPU_WR; -+ } +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c +new file mode 100755 +index 000000000..a9b0958c0 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c +@@ -0,0 +1,105 @@ ++/* ++ * Copyright (C) 2010, 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include /* file system operations */ ++#include /* user space access */ + -+ if (gpu_flags & UMP_PROT_DEVICE_RD) { -+ reg->flags |= KBASE_REG_GPU_RD; -+ *flags |= BASE_MEM_PROT_GPU_RD; -+ } ++#include "mali_ukk.h" ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_session.h" ++#include "mali_ukk_wrappers.h" + -+ /* ump phys block query */ -+ ump_dd_phys_blocks_get_64(umph, &block_count, &block_array); ++int pp_start_job_wrapper(struct mali_session_data *session_data, _mali_uk_pp_start_job_s __user *uargs) ++{ ++ _mali_osk_errcode_t err; + -+ for (i = 0; i < block_count; i++) { -+ for (j = 0; j < (block_array[i].size >> PAGE_SHIFT); j++) { -+ struct tagged_addr tagged; ++ /* If the job was started successfully, 0 is returned. If there was an error, but the job ++ * was started, we return -ENOENT. For anything else returned, the job was not started. */ + -+ tagged = as_tagged(block_array[i].addr + -+ (j << PAGE_SHIFT)); -+ reg->gpu_alloc->pages[page] = tagged; -+ page++; -+ } -+ } -+ reg->gpu_alloc->nents = *va_pages; -+ reg->extent = 0; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+ return reg; ++ err = _mali_ukk_pp_start_job(session_data, uargs); ++ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); + -+no_alloc_obj: -+ kfree(reg); -+no_region: -+bad_size: -+ ump_dd_release(umph); -+bad_id: -+bad_flags: -+ return NULL; ++ return 0; +} -+#endif /* CONFIG_UMP */ + -+#ifdef CONFIG_DMA_SHARED_BUFFER -+static struct kbase_va_region *kbase_mem_from_umm(struct kbase_context *kctx, -+ int fd, u64 *va_pages, u64 *flags, u32 padding) ++int pp_and_gp_start_job_wrapper(struct mali_session_data *session_data, _mali_uk_pp_and_gp_start_job_s __user *uargs) +{ -+ struct kbase_va_region *reg; -+ struct dma_buf *dma_buf; -+ struct dma_buf_attachment *dma_attachment; -+ bool shared_zone = false; ++ _mali_osk_errcode_t err; + -+ dma_buf = dma_buf_get(fd); -+ if (IS_ERR_OR_NULL(dma_buf)) -+ goto no_buf; ++ /* If the jobs were started successfully, 0 is returned. If there was an error, but the ++ * jobs were started, we return -ENOENT. For anything else returned, the jobs were not ++ * started. */ + -+ dma_attachment = dma_buf_attach(dma_buf, kctx->kbdev->dev); -+ if (!dma_attachment) -+ goto no_attachment; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+ *va_pages = (PAGE_ALIGN(dma_buf->size) >> PAGE_SHIFT) + padding; -+ if (!*va_pages) -+ goto bad_size; ++ err = _mali_ukk_pp_and_gp_start_job(session_data, uargs); ++ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); + -+ if (*va_pages > (U64_MAX / PAGE_SIZE)) -+ /* 64-bit address range is the max */ -+ goto bad_size; ++ return 0; ++} + -+ /* ignore SAME_VA */ -+ *flags &= ~BASE_MEM_SAME_VA; ++int pp_get_number_of_cores_wrapper(struct mali_session_data *session_data, _mali_uk_get_pp_number_of_cores_s __user *uargs) ++{ ++ _mali_uk_get_pp_number_of_cores_s kargs; ++ _mali_osk_errcode_t err; + -+ if (*flags & BASE_MEM_IMPORT_SHARED) -+ shared_zone = true; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+#ifdef CONFIG_64BIT -+ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { -+ /* -+ * 64-bit tasks require us to reserve VA on the CPU that we use -+ * on the GPU. -+ */ -+ shared_zone = true; ++ kargs.ctx = (uintptr_t)session_data; ++ ++ err = _mali_ukk_get_pp_number_of_cores(&kargs); ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); + } -+#endif + -+ if (shared_zone) { -+ *flags |= BASE_MEM_NEED_MMAP; -+ reg = kbase_alloc_free_region(kctx, 0, *va_pages, KBASE_REG_ZONE_SAME_VA); -+ } else { -+ reg = kbase_alloc_free_region(kctx, 0, *va_pages, KBASE_REG_ZONE_CUSTOM_VA); ++ kargs.ctx = (uintptr_t)NULL; /* prevent kernel address to be returned to user space */ ++ if (0 != copy_to_user(uargs, &kargs, sizeof(_mali_uk_get_pp_number_of_cores_s))) { ++ return -EFAULT; + } + -+ if (!reg) -+ goto no_region; ++ return 0; ++} + -+ reg->gpu_alloc = kbase_alloc_create(*va_pages, KBASE_MEM_TYPE_IMPORTED_UMM); -+ if (IS_ERR_OR_NULL(reg->gpu_alloc)) -+ goto no_alloc_obj; ++int pp_get_core_version_wrapper(struct mali_session_data *session_data, _mali_uk_get_pp_core_version_s __user *uargs) ++{ ++ _mali_uk_get_pp_core_version_s kargs; ++ _mali_osk_errcode_t err; + -+ reg->cpu_alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+ /* No pages to map yet */ -+ reg->gpu_alloc->nents = 0; ++ kargs.ctx = (uintptr_t)session_data; ++ err = _mali_ukk_get_pp_core_version(&kargs); ++ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); + -+ if (kbase_update_region_flags(kctx, reg, *flags) != 0) -+ goto invalid_flags; ++ if (0 != put_user(kargs.version, &uargs->version)) return -EFAULT; + -+ reg->flags &= ~KBASE_REG_FREE; -+ reg->flags |= KBASE_REG_GPU_NX; /* UMM is always No eXecute */ -+ reg->flags &= ~KBASE_REG_GROWABLE; /* UMM cannot be grown */ -+ reg->flags |= KBASE_REG_GPU_CACHED; ++ return 0; ++} + -+ if (*flags & BASE_MEM_SECURE) -+ reg->flags |= KBASE_REG_SECURE; ++int pp_disable_wb_wrapper(struct mali_session_data *session_data, _mali_uk_pp_disable_wb_s __user *uargs) ++{ ++ _mali_uk_pp_disable_wb_s kargs; + -+ if (padding) -+ reg->flags |= KBASE_REG_IMPORT_PAD; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session_data, -EINVAL); + -+ reg->gpu_alloc->type = KBASE_MEM_TYPE_IMPORTED_UMM; -+ reg->gpu_alloc->imported.umm.sgt = NULL; -+ reg->gpu_alloc->imported.umm.dma_buf = dma_buf; -+ reg->gpu_alloc->imported.umm.dma_attachment = dma_attachment; -+ reg->gpu_alloc->imported.umm.current_mapping_usage_count = 0; -+ reg->extent = 0; ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_pp_disable_wb_s))) return -EFAULT; + -+ return reg; ++ kargs.ctx = (uintptr_t)session_data; ++ _mali_ukk_pp_job_disable_wb(&kargs); + -+invalid_flags: -+ kbase_mem_phy_alloc_put(reg->gpu_alloc); -+no_alloc_obj: -+ kfree(reg); -+no_region: -+bad_size: -+ dma_buf_detach(dma_buf, dma_attachment); -+no_attachment: -+ dma_buf_put(dma_buf); -+no_buf: -+ return NULL; ++ return 0; +} -+#endif /* CONFIG_DMA_SHARED_BUFFER */ +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c +new file mode 100755 +index 000000000..8b49ebc50 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c +@@ -0,0 +1,183 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include /* file system operations */ ++#include /* user space access */ ++#include + -+static u32 kbase_get_cache_line_alignment(struct kbase_context *kctx) ++#include "mali_ukk.h" ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_session.h" ++#include "mali_ukk_wrappers.h" ++ ++int profiling_add_event_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_add_event_s __user *uargs) +{ -+ u32 cpu_cache_line_size = cache_line_size(); -+ u32 gpu_cache_line_size = -+ (1UL << kctx->kbdev->gpu_props.props.l2_props.log2_line_size); ++ _mali_uk_profiling_add_event_s kargs; ++ _mali_osk_errcode_t err; + -+ return ((cpu_cache_line_size > gpu_cache_line_size) ? -+ cpu_cache_line_size : -+ gpu_cache_line_size); -+} ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+static struct kbase_va_region *kbase_mem_from_user_buffer( -+ struct kbase_context *kctx, unsigned long address, -+ unsigned long size, u64 *va_pages, u64 *flags) -+{ -+ long i; -+ struct kbase_va_region *reg; -+ long faulted_pages; -+ int zone = KBASE_REG_ZONE_CUSTOM_VA; -+ bool shared_zone = false; -+ u32 cache_line_alignment = kbase_get_cache_line_alignment(kctx); -+ struct kbase_alloc_import_user_buf *user_buf; -+ struct page **pages = NULL; ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_profiling_add_event_s))) { ++ return -EFAULT; ++ } + -+ if ((address & (cache_line_alignment - 1)) != 0 || -+ (size & (cache_line_alignment - 1)) != 0) { -+ /* Coherency must be enabled to handle partial cache lines */ -+ if (*flags & (BASE_MEM_COHERENT_SYSTEM | -+ BASE_MEM_COHERENT_SYSTEM_REQUIRED)) { -+ /* Force coherent system required flag, import will -+ * then fail if coherency isn't available -+ */ -+ *flags |= BASE_MEM_COHERENT_SYSTEM_REQUIRED; -+ } else { -+ dev_warn(kctx->kbdev->dev, -+ "User buffer is not cache line aligned and no coherency enabled\n"); -+ goto bad_size; -+ } ++ kargs.ctx = (uintptr_t)session_data; ++ err = _mali_ukk_profiling_add_event(&kargs); ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); + } + -+ *va_pages = (PAGE_ALIGN(address + size) >> PAGE_SHIFT) - -+ PFN_DOWN(address); -+ if (!*va_pages) -+ goto bad_size; ++ return 0; ++} + -+ if (*va_pages > (UINT64_MAX / PAGE_SIZE)) -+ /* 64-bit address range is the max */ -+ goto bad_size; ++int profiling_report_sw_counters_wrapper(struct mali_session_data *session_data, _mali_uk_sw_counters_report_s __user *uargs) ++{ ++ _mali_uk_sw_counters_report_s kargs; ++ _mali_osk_errcode_t err; ++ u32 *counter_buffer; ++ u32 __user *counters; + -+ /* SAME_VA generally not supported with imported memory (no known use cases) */ -+ *flags &= ~BASE_MEM_SAME_VA; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ if (*flags & BASE_MEM_IMPORT_SHARED) -+ shared_zone = true; ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_sw_counters_report_s))) { ++ return -EFAULT; ++ } + -+#ifdef CONFIG_64BIT -+ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { -+ /* -+ * 64-bit tasks require us to reserve VA on the CPU that we use -+ * on the GPU. -+ */ -+ shared_zone = true; ++ /* make sure that kargs.num_counters is [at least somewhat] sane */ ++ if (kargs.num_counters > 10000) { ++ MALI_DEBUG_PRINT(1, ("User space attempted to allocate too many counters.\n")); ++ return -EINVAL; + } -+#endif + -+ if (shared_zone) { -+ *flags |= BASE_MEM_NEED_MMAP; -+ zone = KBASE_REG_ZONE_SAME_VA; ++ counter_buffer = (u32 *)kmalloc(sizeof(u32) * kargs.num_counters, GFP_KERNEL); ++ if (NULL == counter_buffer) { ++ return -ENOMEM; + } + -+ reg = kbase_alloc_free_region(kctx, 0, *va_pages, zone); ++ counters = (u32 *)(uintptr_t)kargs.counters; + -+ if (!reg) -+ goto no_region; ++ if (0 != copy_from_user(counter_buffer, counters, sizeof(u32) * kargs.num_counters)) { ++ kfree(counter_buffer); ++ return -EFAULT; ++ } + -+ reg->gpu_alloc = kbase_alloc_create(*va_pages, -+ KBASE_MEM_TYPE_IMPORTED_USER_BUF); -+ if (IS_ERR_OR_NULL(reg->gpu_alloc)) -+ goto no_alloc_obj; ++ kargs.ctx = (uintptr_t)session_data; ++ kargs.counters = (uintptr_t)counter_buffer; + -+ reg->cpu_alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); ++ err = _mali_ukk_sw_counters_report(&kargs); + -+ if (kbase_update_region_flags(kctx, reg, *flags) != 0) -+ goto invalid_flags; ++ kfree(counter_buffer); + -+ reg->flags &= ~KBASE_REG_FREE; -+ reg->flags |= KBASE_REG_GPU_NX; /* User-buffers are always No eXecute */ -+ reg->flags &= ~KBASE_REG_GROWABLE; /* Cannot be grown */ ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); ++ } + -+ user_buf = ®->gpu_alloc->imported.user_buf; ++ return 0; ++} + -+ user_buf->size = size; -+ user_buf->address = address; -+ user_buf->nr_pages = *va_pages; -+ user_buf->mm = current->mm; -+ user_buf->pages = kmalloc_array(*va_pages, sizeof(struct page *), -+ GFP_KERNEL); ++int profiling_get_stream_fd_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_stream_fd_get_s __user *uargs) ++{ ++ _mali_uk_profiling_stream_fd_get_s kargs; ++ _mali_osk_errcode_t err; + -+ if (!user_buf->pages) -+ goto no_page_array; ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ /* If the region is coherent with the CPU then the memory is imported -+ * and mapped onto the GPU immediately. -+ * Otherwise get_user_pages is called as a sanity check, but with -+ * NULL as the pages argument which will fault the pages, but not -+ * pin them. The memory will then be pinned only around the jobs that -+ * specify the region as an external resource. -+ */ -+ if (reg->flags & KBASE_REG_SHARE_BOTH) { -+ pages = user_buf->pages; -+ *flags |= KBASE_MEM_IMPORT_HAVE_PAGES; ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_profiling_stream_fd_get_s))) { ++ return -EFAULT; + } + -+ down_read(¤t->mm->mmap_sem); ++ kargs.ctx = (uintptr_t)session_data; ++ err = _mali_ukk_profiling_stream_fd_get(&kargs); ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); ++ } + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ faulted_pages = get_user_pages(current, current->mm, address, *va_pages, -+ reg->flags & KBASE_REG_GPU_WR, 0, pages, NULL); -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) -+ faulted_pages = get_user_pages(address, *va_pages, -+ reg->flags & KBASE_REG_GPU_WR, 0, pages, NULL); -+#else -+ faulted_pages = get_user_pages(address, *va_pages, -+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, -+ pages, NULL); -+#endif ++ if (0 != copy_to_user(uargs, &kargs, sizeof(_mali_uk_profiling_stream_fd_get_s))) { ++ return -EFAULT; ++ } + -+ up_read(¤t->mm->mmap_sem); ++ return 0; ++} + -+ if (faulted_pages != *va_pages) -+ goto fault_mismatch; ++int profiling_control_set_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_control_set_s __user *uargs) ++{ ++ _mali_uk_profiling_control_set_s kargs; ++ _mali_osk_errcode_t err; ++ u8 *kernel_control_data = NULL; ++ u8 *kernel_response_data = NULL; + -+ atomic_inc(¤t->mm->mm_count); ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ reg->gpu_alloc->nents = 0; -+ reg->extent = 0; ++ if (0 != get_user(kargs.control_packet_size, &uargs->control_packet_size)) return -EFAULT; ++ if (0 != get_user(kargs.response_packet_size, &uargs->response_packet_size)) return -EFAULT; + -+ if (pages) { -+ struct device *dev = kctx->kbdev->dev; -+ unsigned long local_size = user_buf->size; -+ unsigned long offset = user_buf->address & ~PAGE_MASK; -+ struct tagged_addr *pa = kbase_get_gpu_phy_pages(reg); ++ kargs.ctx = (uintptr_t)session_data; + -+ /* Top bit signifies that this was pinned on import */ -+ user_buf->current_mapping_usage_count |= PINNED_ON_IMPORT; + -+ for (i = 0; i < faulted_pages; i++) { -+ dma_addr_t dma_addr; -+ unsigned long min; ++ /* Sanity check about the size */ ++ if (kargs.control_packet_size > PAGE_SIZE || kargs.response_packet_size > PAGE_SIZE) ++ return -EINVAL; + -+ min = MIN(PAGE_SIZE - offset, local_size); -+ dma_addr = dma_map_page(dev, pages[i], -+ offset, min, -+ DMA_BIDIRECTIONAL); -+ if (dma_mapping_error(dev, dma_addr)) -+ goto unwind_dma_map; ++ if (0 != kargs.control_packet_size) { + -+ user_buf->dma_addrs[i] = dma_addr; -+ pa[i] = as_tagged(page_to_phys(pages[i])); ++ if (0 == kargs.response_packet_size) ++ return -EINVAL; + -+ local_size -= min; -+ offset = 0; ++ kernel_control_data = _mali_osk_calloc(1, kargs.control_packet_size); ++ if (NULL == kernel_control_data) { ++ return -ENOMEM; + } + -+ reg->gpu_alloc->nents = faulted_pages; -+ } -+ -+ return reg; -+ -+unwind_dma_map: -+ while (i--) { -+ dma_unmap_page(kctx->kbdev->dev, -+ user_buf->dma_addrs[i], -+ PAGE_SIZE, DMA_BIDIRECTIONAL); -+ } -+fault_mismatch: -+ if (pages) { -+ for (i = 0; i < faulted_pages; i++) -+ put_page(pages[i]); -+ } -+ kfree(user_buf->pages); -+no_page_array: -+invalid_flags: -+ kbase_mem_phy_alloc_put(reg->cpu_alloc); -+ kbase_mem_phy_alloc_put(reg->gpu_alloc); -+no_alloc_obj: -+ kfree(reg); -+no_region: -+bad_size: -+ return NULL; -+ -+} -+ -+ -+u64 kbase_mem_alias(struct kbase_context *kctx, u64 *flags, u64 stride, -+ u64 nents, struct base_mem_aliasing_info *ai, -+ u64 *num_pages) -+{ -+ struct kbase_va_region *reg; -+ u64 gpu_va; -+ size_t i; -+ bool coherent; -+ -+ KBASE_DEBUG_ASSERT(kctx); -+ KBASE_DEBUG_ASSERT(flags); -+ KBASE_DEBUG_ASSERT(ai); -+ KBASE_DEBUG_ASSERT(num_pages); -+ -+ /* mask to only allowed flags */ -+ *flags &= (BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR | -+ BASE_MEM_COHERENT_SYSTEM | BASE_MEM_COHERENT_LOCAL | -+ BASE_MEM_COHERENT_SYSTEM_REQUIRED); ++ kernel_response_data = _mali_osk_calloc(1, kargs.response_packet_size); ++ if (NULL == kernel_response_data) { ++ _mali_osk_free(kernel_control_data); ++ return -ENOMEM; ++ } + -+ if (!(*flags & (BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR))) { -+ dev_warn(kctx->kbdev->dev, -+ "kbase_mem_alias called with bad flags (%llx)", -+ (unsigned long long)*flags); -+ goto bad_flags; -+ } -+ coherent = (*flags & BASE_MEM_COHERENT_SYSTEM) != 0 || -+ (*flags & BASE_MEM_COHERENT_SYSTEM_REQUIRED) != 0; ++ kargs.control_packet_data = (uintptr_t)kernel_control_data; ++ kargs.response_packet_data = (uintptr_t)kernel_response_data; + -+ if (!stride) -+ goto bad_stride; ++ if (0 != copy_from_user((void *)(uintptr_t)kernel_control_data, (void *)(uintptr_t)uargs->control_packet_data, kargs.control_packet_size)) { ++ _mali_osk_free(kernel_control_data); ++ _mali_osk_free(kernel_response_data); ++ return -EFAULT; ++ } + -+ if (!nents) -+ goto bad_nents; ++ err = _mali_ukk_profiling_control_set(&kargs); ++ if (_MALI_OSK_ERR_OK != err) { ++ _mali_osk_free(kernel_control_data); ++ _mali_osk_free(kernel_response_data); ++ return map_errcode(err); ++ } + -+ if ((nents * stride) > (U64_MAX / PAGE_SIZE)) -+ /* 64-bit address range is the max */ -+ goto bad_size; ++ if (0 != kargs.response_packet_size && 0 != copy_to_user(((void *)(uintptr_t)uargs->response_packet_data), ((void *)(uintptr_t)kargs.response_packet_data), kargs.response_packet_size)) { ++ _mali_osk_free(kernel_control_data); ++ _mali_osk_free(kernel_response_data); ++ return -EFAULT; ++ } + -+ /* calculate the number of pages this alias will cover */ -+ *num_pages = nents * stride; ++ if (0 != put_user(kargs.response_packet_size, &uargs->response_packet_size)) { ++ _mali_osk_free(kernel_control_data); ++ _mali_osk_free(kernel_response_data); ++ return -EFAULT; ++ } + -+#ifdef CONFIG_64BIT -+ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { -+ /* 64-bit tasks must MMAP anyway, but not expose this address to -+ * clients */ -+ *flags |= BASE_MEM_NEED_MMAP; -+ reg = kbase_alloc_free_region(kctx, 0, *num_pages, -+ KBASE_REG_ZONE_SAME_VA); ++ _mali_osk_free(kernel_control_data); ++ _mali_osk_free(kernel_response_data); + } else { -+#else -+ if (1) { -+#endif -+ reg = kbase_alloc_free_region(kctx, 0, *num_pages, -+ KBASE_REG_ZONE_CUSTOM_VA); -+ } -+ -+ if (!reg) -+ goto no_reg; + -+ /* zero-sized page array, as we don't need one/can support one */ -+ reg->gpu_alloc = kbase_alloc_create(0, KBASE_MEM_TYPE_ALIAS); -+ if (IS_ERR_OR_NULL(reg->gpu_alloc)) -+ goto no_alloc_obj; ++ err = _mali_ukk_profiling_control_set(&kargs); ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); ++ } + -+ reg->cpu_alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); ++ } ++ return 0; ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c +new file mode 100755 +index 000000000..1dd4a7c6f +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c +@@ -0,0 +1,90 @@ ++/* ++ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include /* file system operations */ ++#include /* user space access */ + -+ if (kbase_update_region_flags(kctx, reg, *flags) != 0) -+ goto invalid_flags; ++#include "mali_ukk.h" ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_session.h" ++#include "mali_ukk_wrappers.h" + -+ reg->gpu_alloc->imported.alias.nents = nents; -+ reg->gpu_alloc->imported.alias.stride = stride; -+ reg->gpu_alloc->imported.alias.aliased = vzalloc(sizeof(*reg->gpu_alloc->imported.alias.aliased) * nents); -+ if (!reg->gpu_alloc->imported.alias.aliased) -+ goto no_aliased_array; ++#include "mali_soft_job.h" ++#include "mali_timeline.h" + -+ kbase_gpu_vm_lock(kctx); ++int soft_job_start_wrapper(struct mali_session_data *session, _mali_uk_soft_job_start_s __user *uargs) ++{ ++ _mali_uk_soft_job_start_s kargs; ++ u32 type, point; ++ u64 user_job; ++ struct mali_timeline_fence fence; ++ struct mali_soft_job *job = NULL; ++ u32 __user *job_id_ptr = NULL; + -+ /* validate and add src handles */ -+ for (i = 0; i < nents; i++) { -+ if (ai[i].handle.basep.handle < BASE_MEM_FIRST_FREE_ADDRESS) { -+ if (ai[i].handle.basep.handle != -+ BASEP_MEM_WRITE_ALLOC_PAGES_HANDLE) -+ goto bad_handle; /* unsupported magic handle */ -+ if (!ai[i].length) -+ goto bad_handle; /* must be > 0 */ -+ if (ai[i].length > stride) -+ goto bad_handle; /* can't be larger than the -+ stride */ -+ reg->gpu_alloc->imported.alias.aliased[i].length = ai[i].length; -+ } else { -+ struct kbase_va_region *aliasing_reg; -+ struct kbase_mem_phy_alloc *alloc; ++ /* If the job was started successfully, 0 is returned. If there was an error, but the job ++ * was started, we return -ENOENT. For anything else returned, the job was not started. */ + -+ aliasing_reg = kbase_region_tracker_find_region_base_address( -+ kctx, -+ (ai[i].handle.basep.handle >> PAGE_SHIFT) << PAGE_SHIFT); ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ MALI_CHECK_NON_NULL(session, -EINVAL); + -+ /* validate found region */ -+ if (!aliasing_reg) -+ goto bad_handle; /* Not found */ -+ if (aliasing_reg->flags & KBASE_REG_FREE) -+ goto bad_handle; /* Free region */ -+ if (aliasing_reg->flags & KBASE_REG_DONT_NEED) -+ goto bad_handle; /* Ephemeral region */ -+ if (!aliasing_reg->gpu_alloc) -+ goto bad_handle; /* No alloc */ -+ if (aliasing_reg->gpu_alloc->type != KBASE_MEM_TYPE_NATIVE) -+ goto bad_handle; /* Not a native alloc */ -+ if (coherent != ((aliasing_reg->flags & KBASE_REG_SHARE_BOTH) != 0)) -+ goto bad_handle; -+ /* Non-coherent memory cannot alias -+ coherent memory, and vice versa.*/ ++ MALI_DEBUG_ASSERT_POINTER(session->soft_job_system); + -+ /* check size against stride */ -+ if (!ai[i].length) -+ goto bad_handle; /* must be > 0 */ -+ if (ai[i].length > stride) -+ goto bad_handle; /* can't be larger than the -+ stride */ ++ if (0 != copy_from_user(&kargs, uargs, sizeof(kargs))) { ++ return -EFAULT; ++ } + -+ alloc = aliasing_reg->gpu_alloc; ++ type = kargs.type; ++ user_job = kargs.user_job; ++ job_id_ptr = (u32 __user *)(uintptr_t)kargs.job_id_ptr; + -+ /* check against the alloc's size */ -+ if (ai[i].offset > alloc->nents) -+ goto bad_handle; /* beyond end */ -+ if (ai[i].offset + ai[i].length > alloc->nents) -+ goto bad_handle; /* beyond end */ ++ mali_timeline_fence_copy_uk_fence(&fence, &kargs.fence); + -+ reg->gpu_alloc->imported.alias.aliased[i].alloc = kbase_mem_phy_alloc_get(alloc); -+ reg->gpu_alloc->imported.alias.aliased[i].length = ai[i].length; -+ reg->gpu_alloc->imported.alias.aliased[i].offset = ai[i].offset; -+ } ++ if ((MALI_SOFT_JOB_TYPE_USER_SIGNALED != type) && (MALI_SOFT_JOB_TYPE_SELF_SIGNALED != type)) { ++ MALI_DEBUG_PRINT_ERROR(("Invalid soft job type specified\n")); ++ return -EINVAL; + } + -+#ifdef CONFIG_64BIT -+ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { -+ /* Bind to a cookie */ -+ if (!kctx->cookies) { -+ dev_err(kctx->kbdev->dev, "No cookies available for allocation!"); -+ goto no_cookie; -+ } -+ /* return a cookie */ -+ gpu_va = __ffs(kctx->cookies); -+ kctx->cookies &= ~(1UL << gpu_va); -+ BUG_ON(kctx->pending_regions[gpu_va]); -+ kctx->pending_regions[gpu_va] = reg; -+ -+ /* relocate to correct base */ -+ gpu_va += PFN_DOWN(BASE_MEM_COOKIE_BASE); -+ gpu_va <<= PAGE_SHIFT; -+ } else /* we control the VA */ { -+#else -+ if (1) { -+#endif -+ if (kbase_gpu_mmap(kctx, reg, 0, *num_pages, 1) != 0) { -+ dev_warn(kctx->kbdev->dev, "Failed to map memory on GPU"); -+ goto no_mmap; -+ } -+ /* return real GPU VA */ -+ gpu_va = reg->start_pfn << PAGE_SHIFT; ++ /* Create soft job. */ ++ job = mali_soft_job_create(session->soft_job_system, (enum mali_soft_job_type)type, user_job); ++ if (unlikely(NULL == job)) { ++ return map_errcode(_MALI_OSK_ERR_NOMEM); + } + -+ reg->flags &= ~KBASE_REG_FREE; -+ reg->flags &= ~KBASE_REG_GROWABLE; ++ /* Write job id back to user space. */ ++ if (0 != put_user(job->id, job_id_ptr)) { ++ MALI_PRINT_ERROR(("Mali Soft Job: failed to put job id")); ++ mali_soft_job_destroy(job); ++ return map_errcode(_MALI_OSK_ERR_NOMEM); ++ } + -+ kbase_gpu_vm_unlock(kctx); ++ /* Start soft job. */ ++ point = mali_soft_job_start(job, &fence); + -+ return gpu_va; ++ if (0 != put_user(point, &uargs->point)) { ++ /* Let user space know that something failed after the job was started. */ ++ return -ENOENT; ++ } + -+#ifdef CONFIG_64BIT -+no_cookie: -+#endif -+no_mmap: -+bad_handle: -+ kbase_gpu_vm_unlock(kctx); -+no_aliased_array: -+invalid_flags: -+ kbase_mem_phy_alloc_put(reg->cpu_alloc); -+ kbase_mem_phy_alloc_put(reg->gpu_alloc); -+no_alloc_obj: -+ kfree(reg); -+no_reg: -+bad_size: -+bad_nents: -+bad_stride: -+bad_flags: + return 0; +} + -+int kbase_mem_import(struct kbase_context *kctx, enum base_mem_import_type type, -+ void __user *phandle, u32 padding, u64 *gpu_va, u64 *va_pages, -+ u64 *flags) ++int soft_job_signal_wrapper(struct mali_session_data *session, _mali_uk_soft_job_signal_s __user *uargs) +{ -+ struct kbase_va_region *reg; ++ u32 job_id; ++ _mali_osk_errcode_t err; + -+ KBASE_DEBUG_ASSERT(kctx); -+ KBASE_DEBUG_ASSERT(gpu_va); -+ KBASE_DEBUG_ASSERT(va_pages); -+ KBASE_DEBUG_ASSERT(flags); ++ MALI_DEBUG_ASSERT_POINTER(session); + -+#ifdef CONFIG_64BIT -+ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) -+ *flags |= BASE_MEM_SAME_VA; -+#endif ++ if (0 != get_user(job_id, &uargs->job_id)) return -EFAULT; + -+ if (!kbase_check_import_flags(*flags)) { -+ dev_warn(kctx->kbdev->dev, -+ "kbase_mem_import called with bad flags (%llx)", -+ (unsigned long long)*flags); -+ goto bad_flags; -+ } ++ err = mali_soft_job_system_signal_job(session->soft_job_system, job_id); + -+ if ((*flags & BASE_MEM_COHERENT_SYSTEM_REQUIRED) != 0 && -+ !kbase_device_is_cpu_coherent(kctx->kbdev)) { -+ dev_warn(kctx->kbdev->dev, -+ "kbase_mem_import call required coherent mem when unavailable"); -+ goto bad_flags; -+ } -+ if ((*flags & BASE_MEM_COHERENT_SYSTEM) != 0 && -+ !kbase_device_is_cpu_coherent(kctx->kbdev)) { -+ /* Remove COHERENT_SYSTEM flag if coherent mem is unavailable */ -+ *flags &= ~BASE_MEM_COHERENT_SYSTEM; -+ } ++ return map_errcode(err); ++} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c +new file mode 100755 +index 000000000..ff0c90939 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c +@@ -0,0 +1,88 @@ ++/* ++ * Copyright (C) 2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include /* file system operations */ ++#include /* user space access */ + -+ if ((padding != 0) && (type != BASE_MEM_IMPORT_TYPE_UMM)) { -+ dev_warn(kctx->kbdev->dev, -+ "padding is only supported for UMM"); -+ goto bad_flags; -+ } ++#include "mali_ukk.h" ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_session.h" ++#include "mali_ukk_wrappers.h" + -+ switch (type) { -+#ifdef CONFIG_UMP -+ case BASE_MEM_IMPORT_TYPE_UMP: { -+ ump_secure_id id; ++#include "mali_timeline.h" ++#include "mali_timeline_fence_wait.h" ++#include "mali_timeline_sync_fence.h" + -+ if (get_user(id, (ump_secure_id __user *)phandle)) -+ reg = NULL; -+ else -+ reg = kbase_mem_from_ump(kctx, id, va_pages, flags); -+ } -+ break; -+#endif /* CONFIG_UMP */ -+#ifdef CONFIG_DMA_SHARED_BUFFER -+ case BASE_MEM_IMPORT_TYPE_UMM: { -+ int fd; ++int timeline_get_latest_point_wrapper(struct mali_session_data *session, _mali_uk_timeline_get_latest_point_s __user *uargs) ++{ ++ u32 val; ++ mali_timeline_id timeline; ++ mali_timeline_point point; + -+ if (get_user(fd, (int __user *)phandle)) -+ reg = NULL; -+ else -+ reg = kbase_mem_from_umm(kctx, fd, va_pages, flags, -+ padding); -+ } -+ break; -+#endif /* CONFIG_DMA_SHARED_BUFFER */ -+ case BASE_MEM_IMPORT_TYPE_USER_BUFFER: { -+ struct base_mem_import_user_buffer user_buffer; -+ void __user *uptr; ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ if (copy_from_user(&user_buffer, phandle, -+ sizeof(user_buffer))) { -+ reg = NULL; -+ } else { -+#ifdef CONFIG_COMPAT -+ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) -+ uptr = compat_ptr(user_buffer.ptr); -+ else -+#endif -+ uptr = u64_to_user_ptr(user_buffer.ptr); ++ if (0 != get_user(val, &uargs->timeline)) return -EFAULT; + -+ reg = kbase_mem_from_user_buffer(kctx, -+ (unsigned long)uptr, user_buffer.length, -+ va_pages, flags); -+ } -+ break; -+ } -+ default: { -+ reg = NULL; -+ break; -+ } ++ if (MALI_UK_TIMELINE_MAX <= val) { ++ return -EINVAL; + } + -+ if (!reg) -+ goto no_reg; -+ -+ kbase_gpu_vm_lock(kctx); -+ -+ /* mmap needed to setup VA? */ -+ if (*flags & (BASE_MEM_SAME_VA | BASE_MEM_NEED_MMAP)) { -+ /* Bind to a cookie */ -+ if (!kctx->cookies) -+ goto no_cookie; -+ /* return a cookie */ -+ *gpu_va = __ffs(kctx->cookies); -+ kctx->cookies &= ~(1UL << *gpu_va); -+ BUG_ON(kctx->pending_regions[*gpu_va]); -+ kctx->pending_regions[*gpu_va] = reg; -+ -+ /* relocate to correct base */ -+ *gpu_va += PFN_DOWN(BASE_MEM_COOKIE_BASE); -+ *gpu_va <<= PAGE_SHIFT; -+ -+ } else if (*flags & KBASE_MEM_IMPORT_HAVE_PAGES) { -+ /* we control the VA, mmap now to the GPU */ -+ if (kbase_gpu_mmap(kctx, reg, 0, *va_pages, 1) != 0) -+ goto no_gpu_va; -+ /* return real GPU VA */ -+ *gpu_va = reg->start_pfn << PAGE_SHIFT; -+ } else { -+ /* we control the VA, but nothing to mmap yet */ -+ if (kbase_add_va_region(kctx, reg, 0, *va_pages, 1) != 0) -+ goto no_gpu_va; -+ /* return real GPU VA */ -+ *gpu_va = reg->start_pfn << PAGE_SHIFT; -+ } ++ timeline = (mali_timeline_id)val; + -+ /* clear out private flags */ -+ *flags &= ((1UL << BASE_MEM_FLAGS_NR_BITS) - 1); ++ point = mali_timeline_system_get_latest_point(session->timeline_system, timeline); + -+ kbase_gpu_vm_unlock(kctx); ++ if (0 != put_user(point, &uargs->point)) return -EFAULT; + + return 0; -+ -+no_gpu_va: -+no_cookie: -+ kbase_gpu_vm_unlock(kctx); -+ kbase_mem_phy_alloc_put(reg->cpu_alloc); -+ kbase_mem_phy_alloc_put(reg->gpu_alloc); -+ kfree(reg); -+no_reg: -+bad_flags: -+ *gpu_va = 0; -+ *va_pages = 0; -+ *flags = 0; -+ return -ENOMEM; +} + -+int kbase_mem_grow_gpu_mapping(struct kbase_context *kctx, -+ struct kbase_va_region *reg, -+ u64 new_pages, u64 old_pages) ++int timeline_wait_wrapper(struct mali_session_data *session, _mali_uk_timeline_wait_s __user *uargs) +{ -+ struct tagged_addr *phy_pages; -+ u64 delta = new_pages - old_pages; -+ int ret = 0; ++ u32 timeout, status; ++ mali_bool ret; ++ _mali_uk_fence_t uk_fence; ++ struct mali_timeline_fence fence; + -+ lockdep_assert_held(&kctx->reg_lock); ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ /* Map the new pages into the GPU */ -+ phy_pages = kbase_get_gpu_phy_pages(reg); -+ ret = kbase_mmu_insert_pages(kctx, reg->start_pfn + old_pages, -+ phy_pages + old_pages, delta, reg->flags); ++ if (0 != copy_from_user(&uk_fence, &uargs->fence, sizeof(_mali_uk_fence_t))) return -EFAULT; ++ if (0 != get_user(timeout, &uargs->timeout)) return -EFAULT; + -+ return ret; -+} ++ mali_timeline_fence_copy_uk_fence(&fence, &uk_fence); + -+static void kbase_mem_shrink_cpu_mapping(struct kbase_context *kctx, -+ struct kbase_va_region *reg, -+ u64 new_pages, u64 old_pages) -+{ -+ u64 gpu_va_start = reg->start_pfn; ++ ret = mali_timeline_fence_wait(session->timeline_system, &fence, timeout); ++ status = (MALI_TRUE == ret ? 1 : 0); + -+ if (new_pages == old_pages) -+ /* Nothing to do */ -+ return; ++ if (0 != put_user(status, &uargs->status)) return -EFAULT; + -+ unmap_mapping_range(kctx->filp->f_inode->i_mapping, -+ (gpu_va_start + new_pages)<start_pfn + new_pages, delta); ++ MALI_DEBUG_ASSERT_POINTER(session); + -+ return ret; ++ if (0 != copy_from_user(&uk_fence, &uargs->fence, sizeof(_mali_uk_fence_t))) return -EFAULT; ++ mali_timeline_fence_copy_uk_fence(&fence, &uk_fence); ++ ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ sync_fd = mali_timeline_sync_fence_create(session->timeline_system, &fence); ++#else ++ sync_fd = -1; ++#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ ++ if (0 != put_user(sync_fd, &uargs->sync_fd)) return -EFAULT; ++ ++ return 0; +} +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c +new file mode 100755 +index 000000000..52519d1f9 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c +@@ -0,0 +1,39 @@ ++/* ++ * Copyright (C) 2011-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++#include /* file system operations */ ++#include /* user space access */ + -+int kbase_mem_commit(struct kbase_context *kctx, u64 gpu_addr, u64 new_pages) ++#include "mali_ukk.h" ++#include "mali_osk.h" ++#include "mali_kernel_common.h" ++#include "mali_session.h" ++#include "mali_ukk_wrappers.h" ++ ++ ++int vsync_event_report_wrapper(struct mali_session_data *session_data, _mali_uk_vsync_event_report_s __user *uargs) +{ -+ u64 old_pages; -+ u64 delta; -+ int res = -EINVAL; -+ struct kbase_va_region *reg; -+ bool read_locked = false; ++ _mali_uk_vsync_event_report_s kargs; ++ _mali_osk_errcode_t err; + -+ KBASE_DEBUG_ASSERT(kctx); -+ KBASE_DEBUG_ASSERT(gpu_addr != 0); ++ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ if (gpu_addr & ~PAGE_MASK) { -+ dev_warn(kctx->kbdev->dev, "kbase:mem_commit: gpu_addr: passed parameter is invalid"); -+ return -EINVAL; ++ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_vsync_event_report_s))) { ++ return -EFAULT; + } + -+ down_write(¤t->mm->mmap_sem); -+ kbase_gpu_vm_lock(kctx); ++ kargs.ctx = (uintptr_t)session_data; ++ err = _mali_ukk_vsync_event_report(&kargs); ++ if (_MALI_OSK_ERR_OK != err) { ++ return map_errcode(err); ++ } + -+ /* Validate the region */ -+ reg = kbase_region_tracker_find_region_base_address(kctx, gpu_addr); -+ if (!reg || (reg->flags & KBASE_REG_FREE)) -+ goto out_unlock; ++ return 0; ++} + -+ KBASE_DEBUG_ASSERT(reg->cpu_alloc); -+ KBASE_DEBUG_ASSERT(reg->gpu_alloc); +diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h +new file mode 100755 +index 000000000..1add628fe +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h +@@ -0,0 +1,82 @@ ++/* ++ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ if (reg->gpu_alloc->type != KBASE_MEM_TYPE_NATIVE) -+ goto out_unlock; ++/** ++ * @file mali_ukk_wrappers.h ++ * Defines the wrapper functions for each user-kernel function ++ */ + -+ if (0 == (reg->flags & KBASE_REG_GROWABLE)) -+ goto out_unlock; ++#ifndef __MALI_UKK_WRAPPERS_H__ ++#define __MALI_UKK_WRAPPERS_H__ + -+ /* Would overflow the VA region */ -+ if (new_pages > reg->nr_pages) -+ goto out_unlock; ++#include "mali_uk_types.h" ++#include "mali_osk.h" + -+ /* can't be mapped more than once on the GPU */ -+ if (atomic_read(®->gpu_alloc->gpu_mappings) > 1) -+ goto out_unlock; -+ /* can't grow regions which are ephemeral */ -+ if (reg->flags & KBASE_REG_DONT_NEED) -+ goto out_unlock; ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ if (new_pages == reg->gpu_alloc->nents) { -+ /* no change */ -+ res = 0; -+ goto out_unlock; -+ } ++int wait_for_notification_wrapper(struct mali_session_data *session_data, _mali_uk_wait_for_notification_s __user *uargs); ++int get_api_version_wrapper(struct mali_session_data *session_data, _mali_uk_get_api_version_s __user *uargs); ++int get_api_version_v2_wrapper(struct mali_session_data *session_data, _mali_uk_get_api_version_v2_s __user *uargs); ++int get_user_settings_wrapper(struct mali_session_data *session_data, _mali_uk_get_user_settings_s __user *uargs); ++int post_notification_wrapper(struct mali_session_data *session_data, _mali_uk_post_notification_s __user *uargs); ++int request_high_priority_wrapper(struct mali_session_data *session_data, _mali_uk_request_high_priority_s __user *uargs); ++int pending_submit_wrapper(struct mali_session_data *session_data, _mali_uk_pending_submit_s __user *uargs); + -+ old_pages = kbase_reg_current_backed_size(reg); -+ if (new_pages > old_pages) { -+ delta = new_pages - old_pages; ++/* rk_ext : 从对 r5p0-01rel0 集æˆå¼€å§‹, ä¸å†ä½¿ç”¨. */ ++#if 0 ++int get_mali_version_in_rk30_wrapper(struct mali_session_data *session_data, _mali_uk_get_mali_version_in_rk30_s __user *uargs); ++#else ++int get_rk_ko_version_wrapper(struct mali_session_data *session_data, _mali_rk_ko_version_s __user *uargs); ++#endif + -+ /* -+ * No update to the mm so downgrade the writer lock to a read -+ * lock so other readers aren't blocked after this point. -+ */ -+ downgrade_write(¤t->mm->mmap_sem); -+ read_locked = true; ++int mem_alloc_wrapper(struct mali_session_data *session_data, _mali_uk_alloc_mem_s __user *uargs); ++int mem_free_wrapper(struct mali_session_data *session_data, _mali_uk_free_mem_s __user *uargs); ++int mem_bind_wrapper(struct mali_session_data *session_data, _mali_uk_bind_mem_s __user *uargs); ++int mem_unbind_wrapper(struct mali_session_data *session_data, _mali_uk_unbind_mem_s __user *uargs); ++int mem_cow_wrapper(struct mali_session_data *session_data, _mali_uk_cow_mem_s __user *uargs); ++int mem_cow_modify_range_wrapper(struct mali_session_data *session_data, _mali_uk_cow_modify_range_s __user *uargs); ++int mem_resize_mem_wrapper(struct mali_session_data *session_data, _mali_uk_mem_resize_s __user *uargs); ++int mem_write_safe_wrapper(struct mali_session_data *session_data, _mali_uk_mem_write_safe_s __user *uargs); ++int mem_query_mmu_page_table_dump_size_wrapper(struct mali_session_data *session_data, _mali_uk_query_mmu_page_table_dump_size_s __user *uargs); ++int mem_dump_mmu_page_table_wrapper(struct mali_session_data *session_data, _mali_uk_dump_mmu_page_table_s __user *uargs); ++int mem_usage_get_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_memory_usage_get_s __user *uargs); + -+ /* Allocate some more pages */ -+ if (kbase_alloc_phy_pages_helper(reg->cpu_alloc, delta) != 0) { -+ res = -ENOMEM; -+ goto out_unlock; -+ } -+ if (reg->cpu_alloc != reg->gpu_alloc) { -+ if (kbase_alloc_phy_pages_helper( -+ reg->gpu_alloc, delta) != 0) { -+ res = -ENOMEM; -+ kbase_free_phy_pages_helper(reg->cpu_alloc, -+ delta); -+ goto out_unlock; -+ } -+ } ++int timeline_get_latest_point_wrapper(struct mali_session_data *session, _mali_uk_timeline_get_latest_point_s __user *uargs); ++int timeline_wait_wrapper(struct mali_session_data *session, _mali_uk_timeline_wait_s __user *uargs); ++int timeline_create_sync_fence_wrapper(struct mali_session_data *session, _mali_uk_timeline_create_sync_fence_s __user *uargs); ++int soft_job_start_wrapper(struct mali_session_data *session, _mali_uk_soft_job_start_s __user *uargs); ++int soft_job_signal_wrapper(struct mali_session_data *session, _mali_uk_soft_job_signal_s __user *uargs); ++int pp_start_job_wrapper(struct mali_session_data *session_data, _mali_uk_pp_start_job_s __user *uargs); ++int pp_and_gp_start_job_wrapper(struct mali_session_data *session_data, _mali_uk_pp_and_gp_start_job_s __user *uargs); ++int pp_get_number_of_cores_wrapper(struct mali_session_data *session_data, _mali_uk_get_pp_number_of_cores_s __user *uargs); ++int pp_get_core_version_wrapper(struct mali_session_data *session_data, _mali_uk_get_pp_core_version_s __user *uargs); ++int pp_disable_wb_wrapper(struct mali_session_data *session_data, _mali_uk_pp_disable_wb_s __user *uargs); ++int gp_start_job_wrapper(struct mali_session_data *session_data, _mali_uk_gp_start_job_s __user *uargs); ++int gp_get_number_of_cores_wrapper(struct mali_session_data *session_data, _mali_uk_get_gp_number_of_cores_s __user *uargs); ++int gp_get_core_version_wrapper(struct mali_session_data *session_data, _mali_uk_get_gp_core_version_s __user *uargs); ++int gp_suspend_response_wrapper(struct mali_session_data *session_data, _mali_uk_gp_suspend_response_s __user *uargs); + -+ /* No update required for CPU mappings, that's done on fault. */ ++int profiling_add_event_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_add_event_s __user *uargs); ++int profiling_report_sw_counters_wrapper(struct mali_session_data *session_data, _mali_uk_sw_counters_report_s __user *uargs); ++int profiling_get_stream_fd_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_stream_fd_get_s __user *uargs); ++int profiling_control_set_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_control_set_s __user *uargs); + -+ /* Update GPU mapping. */ -+ res = kbase_mem_grow_gpu_mapping(kctx, reg, -+ new_pages, old_pages); ++int vsync_event_report_wrapper(struct mali_session_data *session_data, _mali_uk_vsync_event_report_s __user *uargs); + -+ /* On error free the new pages */ -+ if (res) { -+ kbase_free_phy_pages_helper(reg->cpu_alloc, delta); -+ if (reg->cpu_alloc != reg->gpu_alloc) -+ kbase_free_phy_pages_helper(reg->gpu_alloc, -+ delta); -+ res = -ENOMEM; -+ goto out_unlock; -+ } -+ } else { -+ delta = old_pages - new_pages; + -+ /* Update all CPU mapping(s) */ -+ kbase_mem_shrink_cpu_mapping(kctx, reg, -+ new_pages, old_pages); ++int map_errcode(_mali_osk_errcode_t err); + -+ /* Update the GPU mapping */ -+ res = kbase_mem_shrink_gpu_mapping(kctx, reg, -+ new_pages, old_pages); -+ if (res) { -+ res = -ENOMEM; -+ goto out_unlock; -+ } ++#ifdef __cplusplus ++} ++#endif + -+ kbase_free_phy_pages_helper(reg->cpu_alloc, delta); -+ if (reg->cpu_alloc != reg->gpu_alloc) -+ kbase_free_phy_pages_helper(reg->gpu_alloc, delta); -+ } ++#endif /* __MALI_UKK_WRAPPERS_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm.c b/drivers/gpu/arm/mali400/mali/platform/arm/arm.c +new file mode 100755 +index 000000000..fc7017bbf +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm.c +@@ -0,0 +1,629 @@ ++/* ++ * Copyright (C) 2010, 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+out_unlock: -+ kbase_gpu_vm_unlock(kctx); -+ if (read_locked) -+ up_read(¤t->mm->mmap_sem); -+ else -+ up_write(¤t->mm->mmap_sem); ++/** ++ * @file mali_platform.c ++ * Platform specific Mali driver functions for: ++ * - Realview Versatile platforms with ARM11 Mpcore and virtex 5. ++ * - Versatile Express platforms with ARM Cortex-A9 and virtex 6. ++ */ ++#include ++#include ++#include ++#include "mali_kernel_linux.h" ++#ifdef CONFIG_PM_RUNTIME ++#include ++#endif ++#include ++#include ++#include "mali_kernel_common.h" ++#include ++#include + -+ return res; -+} ++#include "arm_core_scaling.h" ++#include "mali_executor.h" + -+static void kbase_cpu_vm_open(struct vm_area_struct *vma) -+{ -+ struct kbase_cpu_mapping *map = vma->vm_private_data; ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) ++#include ++#include ++#endif + -+ KBASE_DEBUG_ASSERT(map); -+ KBASE_DEBUG_ASSERT(map->count > 0); -+ /* non-atomic as we're under Linux' mm lock */ -+ map->count++; -+} ++static int mali_core_scaling_enable = 0; + -+static void kbase_cpu_vm_close(struct vm_area_struct *vma) -+{ -+ struct kbase_cpu_mapping *map = vma->vm_private_data; ++void mali_gpu_utilization_callback(struct mali_gpu_utilization_data *data); ++static u32 mali_read_phys(u32 phys_addr); ++#if defined(CONFIG_ARCH_REALVIEW) ++static void mali_write_phys(u32 phys_addr, u32 value); ++#endif + -+ KBASE_DEBUG_ASSERT(map); -+ KBASE_DEBUG_ASSERT(map->count > 0); ++#if defined(CONFIG_ARCH_VEXPRESS) && defined(CONFIG_ARM64) + -+ /* non-atomic as we're under Linux' mm lock */ -+ if (--map->count) -+ return; ++#define SECURE_MODE_CONTROL_HANDLER 0x6F02006C ++void *secure_mode_mapped_addr = NULL; ++/** ++ * Reset GPU and enable/disable Mali secure mode. ++ * @Return value: ++ * 0: success ++ * non-0: failure. ++ */ + -+ KBASE_DEBUG_ASSERT(map->kctx); -+ KBASE_DEBUG_ASSERT(map->alloc); ++static int mali_gpu_reset_and_secure_mode_enable_juno(void) ++{ ++ u32 phys_offset = SECURE_MODE_CONTROL_HANDLER & 0x00001FFF; ++ MALI_DEBUG_ASSERT(NULL != secure_mode_mapped_addr); + -+ kbase_gpu_vm_lock(map->kctx); ++ iowrite32(1, ((u8 *)secure_mode_mapped_addr) + phys_offset); + -+ if (map->free_on_close) { -+ KBASE_DEBUG_ASSERT((map->region->flags & KBASE_REG_ZONE_MASK) == -+ KBASE_REG_ZONE_SAME_VA); -+ /* Avoid freeing memory on the process death which results in -+ * GPU Page Fault. Memory will be freed in kbase_destroy_context -+ */ -+ if (!(current->flags & PF_EXITING)) -+ kbase_mem_free_region(map->kctx, map->region); ++ if (1 == (u32)ioread32(((u8 *)secure_mode_mapped_addr) + phys_offset)) { ++ MALI_DEBUG_PRINT(3, ("Mali reset GPU and enable secured mode successfully! \n")); ++ return 0; + } + -+ list_del(&map->mappings_list); ++ MALI_PRINT_ERROR(("Failed to reset GPU and enable Mali secured mode !!! \n")); + -+ kbase_gpu_vm_unlock(map->kctx); ++ return -1; + -+ kbase_mem_phy_alloc_put(map->alloc); -+ kfree(map); +} + -+KBASE_EXPORT_TEST_API(kbase_cpu_vm_close); -+ -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)) -+static int kbase_cpu_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) -+{ -+#else -+static int kbase_cpu_vm_fault(struct vm_fault *vmf) ++static int mali_gpu_reset_and_secure_mode_disable_juno(void) +{ -+ struct vm_area_struct *vma = vmf->vma; -+#endif -+ struct kbase_cpu_mapping *map = vma->vm_private_data; -+ pgoff_t rel_pgoff; -+ size_t i; -+ pgoff_t addr; ++ u32 phys_offset = SECURE_MODE_CONTROL_HANDLER & 0x00001FFF; ++ MALI_DEBUG_ASSERT(NULL != secure_mode_mapped_addr); + -+ KBASE_DEBUG_ASSERT(map); -+ KBASE_DEBUG_ASSERT(map->count > 0); -+ KBASE_DEBUG_ASSERT(map->kctx); -+ KBASE_DEBUG_ASSERT(map->alloc); ++ iowrite32(0, ((u8 *)secure_mode_mapped_addr) + phys_offset); + -+ rel_pgoff = vmf->pgoff - map->region->start_pfn; ++ if (0 == (u32)ioread32(((u8 *)secure_mode_mapped_addr) + phys_offset)) { ++ MALI_DEBUG_PRINT(3, ("Mali reset GPU and disable secured mode successfully! \n")); ++ return 0; ++ } + -+ kbase_gpu_vm_lock(map->kctx); -+ if (rel_pgoff >= map->alloc->nents) -+ goto locked_bad_fault; ++ MALI_PRINT_ERROR(("Failed to reset GPU and disable mali secured mode !!! \n")); ++ return -1; ++} + -+ /* Fault on access to DONT_NEED regions */ -+ if (map->alloc->reg && (map->alloc->reg->flags & KBASE_REG_DONT_NEED)) -+ goto locked_bad_fault; ++static int mali_secure_mode_init_juno(void) ++{ ++ u32 phys_addr_page = SECURE_MODE_CONTROL_HANDLER & 0xFFFFE000; ++ u32 phys_offset = SECURE_MODE_CONTROL_HANDLER & 0x00001FFF; ++ u32 map_size = phys_offset + sizeof(u32); + -+ /* insert all valid pages from the fault location */ -+ i = rel_pgoff; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ addr = (pgoff_t)((uintptr_t)vmf->virtual_address >> PAGE_SHIFT); -+#else -+ addr = (pgoff_t)(vmf->address >> PAGE_SHIFT); -+#endif -+ while (i < map->alloc->nents && (addr < vma->vm_end >> PAGE_SHIFT)) { -+ int ret = vm_insert_pfn(vma, addr << PAGE_SHIFT, -+ PFN_DOWN(as_phys_addr_t(map->alloc->pages[i]))); -+ if (ret < 0 && ret != -EBUSY) -+ goto locked_bad_fault; ++ MALI_DEBUG_ASSERT(NULL == secure_mode_mapped_addr); + -+ i++; addr++; ++ secure_mode_mapped_addr = ioremap(phys_addr_page, map_size); ++ if (NULL != secure_mode_mapped_addr) { ++ return mali_gpu_reset_and_secure_mode_disable_juno(); + } ++ MALI_DEBUG_PRINT(2, ("Failed to ioremap for Mali secured mode! \n")); ++ return -1; ++} + -+ kbase_gpu_vm_unlock(map->kctx); -+ /* we resolved it, nothing for VM to do */ -+ return VM_FAULT_NOPAGE; -+ -+locked_bad_fault: -+ kbase_gpu_vm_unlock(map->kctx); -+ return VM_FAULT_SIGBUS; ++static void mali_secure_mode_deinit_juno(void) ++{ ++ if (NULL != secure_mode_mapped_addr) { ++ mali_gpu_reset_and_secure_mode_disable_juno(); ++ iounmap(secure_mode_mapped_addr); ++ secure_mode_mapped_addr = NULL; ++ } +} ++#endif + -+const struct vm_operations_struct kbase_vm_ops = { -+ .open = kbase_cpu_vm_open, -+ .close = kbase_cpu_vm_close, -+ .fault = kbase_cpu_vm_fault ++#ifndef CONFIG_MALI_DT ++static void mali_platform_device_release(struct device *device); ++ ++#if defined(CONFIG_ARCH_VEXPRESS) ++ ++#if defined(CONFIG_ARM64) ++/* Juno + Mali-450 MP6 in V7 FPGA */ ++static struct resource mali_gpu_resources_m450_mp6[] = { ++ MALI_GPU_RESOURCES_MALI450_MP6_PMU(0x6F040000, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200) +}; + -+static int kbase_cpu_mmap(struct kbase_va_region *reg, struct vm_area_struct *vma, void *kaddr, size_t nr_pages, unsigned long aligned_offset, int free_on_close) -+{ -+ struct kbase_cpu_mapping *map; -+ struct tagged_addr *page_array; -+ int err = 0; -+ int i; ++static struct resource mali_gpu_resources_m470_mp4[] = { ++ MALI_GPU_RESOURCES_MALI470_MP4_PMU(0x6F040000, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200) ++}; + -+ map = kzalloc(sizeof(*map), GFP_KERNEL); ++static struct resource mali_gpu_resources_m470_mp3[] = { ++ MALI_GPU_RESOURCES_MALI470_MP3_PMU(0x6F040000, 200, 200, 200, 200, 200, 200, 200, 200, 200) ++}; + -+ if (!map) { -+ WARN_ON(1); -+ err = -ENOMEM; -+ goto out; -+ } ++static struct resource mali_gpu_resources_m470_mp2[] = { ++ MALI_GPU_RESOURCES_MALI470_MP2_PMU(0x6F040000, 200, 200, 200, 200, 200, 200, 200) ++}; + -+ /* -+ * VM_DONTCOPY - don't make this mapping available in fork'ed processes -+ * VM_DONTEXPAND - disable mremap on this region -+ * VM_IO - disables paging -+ * VM_DONTDUMP - Don't include in core dumps (3.7 only) -+ * VM_MIXEDMAP - Support mixing struct page*s and raw pfns. -+ * This is needed to support using the dedicated and -+ * the OS based memory backends together. -+ */ -+ /* -+ * This will need updating to propagate coherency flags -+ * See MIDBASE-1057 -+ */ ++static struct resource mali_gpu_resources_m470_mp1[] = { ++ MALI_GPU_RESOURCES_MALI470_MP1_PMU(0x6F040000, 200, 200, 200, 200, 200) ++}; + -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)) -+ vma->vm_flags |= VM_DONTCOPY | VM_DONTDUMP | VM_DONTEXPAND | VM_IO; +#else -+ vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED | VM_IO; -+#endif -+ vma->vm_ops = &kbase_vm_ops; -+ vma->vm_private_data = map; ++static struct resource mali_gpu_resources_m450_mp8[] = { ++ MALI_GPU_RESOURCES_MALI450_MP8_PMU(0xFC040000, -1, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 68) ++}; + -+ page_array = kbase_get_cpu_phy_pages(reg); ++static struct resource mali_gpu_resources_m450_mp6[] = { ++ MALI_GPU_RESOURCES_MALI450_MP6_PMU(0xFC040000, -1, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 68) ++}; + -+ if (!(reg->flags & KBASE_REG_CPU_CACHED) && -+ (reg->flags & (KBASE_REG_CPU_WR|KBASE_REG_CPU_RD))) { -+ /* We can't map vmalloc'd memory uncached. -+ * Other memory will have been returned from -+ * kbase_mem_pool which would be -+ * suitable for mapping uncached. -+ */ -+ BUG_ON(kaddr); -+ vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); -+ } ++static struct resource mali_gpu_resources_m450_mp4[] = { ++ MALI_GPU_RESOURCES_MALI450_MP4_PMU(0xFC040000, -1, 70, 70, 70, 70, 70, 70, 70, 70, 70, 68) ++}; + -+ if (!kaddr) { -+ unsigned long addr = vma->vm_start + aligned_offset; -+ u64 start_off = vma->vm_pgoff - reg->start_pfn + -+ (aligned_offset>>PAGE_SHIFT); ++static struct resource mali_gpu_resources_m470_mp4[] = { ++ MALI_GPU_RESOURCES_MALI470_MP4_PMU(0xFC040000, -1, 70, 70, 70, 70, 70, 70, 70, 70, 70, 68) ++}; ++#endif /* CONFIG_ARM64 */ + -+ vma->vm_flags |= VM_PFNMAP; -+ for (i = 0; i < nr_pages; i++) { -+ phys_addr_t phys; ++#elif defined(CONFIG_ARCH_REALVIEW) + -+ phys = as_phys_addr_t(page_array[i + start_off]); -+ err = vm_insert_pfn(vma, addr, PFN_DOWN(phys)); -+ if (WARN_ON(err)) -+ break; ++static struct resource mali_gpu_resources_m300[] = { ++ MALI_GPU_RESOURCES_MALI300_PMU(0xC0000000, -1, -1, -1, -1) ++}; + -+ addr += PAGE_SIZE; -+ } -+ } else { -+ WARN_ON(aligned_offset); -+ /* MIXEDMAP so we can vfree the kaddr early and not track it after map time */ -+ vma->vm_flags |= VM_MIXEDMAP; -+ /* vmalloc remaping is easy... */ -+ err = remap_vmalloc_range(vma, kaddr, 0); -+ WARN_ON(err); -+ } ++static struct resource mali_gpu_resources_m400_mp1[] = { ++ MALI_GPU_RESOURCES_MALI400_MP1_PMU(0xC0000000, -1, -1, -1, -1) ++}; + -+ if (err) { -+ kfree(map); -+ goto out; -+ } ++static struct resource mali_gpu_resources_m400_mp2[] = { ++ MALI_GPU_RESOURCES_MALI400_MP2_PMU(0xC0000000, -1, -1, -1, -1, -1, -1) ++}; + -+ map->region = reg; -+ map->free_on_close = free_on_close; -+ map->kctx = reg->kctx; -+ map->alloc = kbase_mem_phy_alloc_get(reg->cpu_alloc); -+ map->count = 1; /* start with one ref */ ++#endif ++#endif + -+ if (reg->flags & KBASE_REG_CPU_CACHED) -+ map->alloc->properties |= KBASE_MEM_PHY_ALLOC_ACCESSED_CACHED; ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) + -+ list_add(&map->mappings_list, &map->alloc->mappings); ++#define FALLBACK_STATIC_TEMPERATURE 55000 + -+ out: -+ return err; -+} ++static struct thermal_zone_device *gpu_tz; + -+static int kbase_trace_buffer_mmap(struct kbase_context *kctx, struct vm_area_struct *vma, struct kbase_va_region **const reg, void **const kaddr) ++/* Calculate gpu static power example for reference */ ++static unsigned long arm_model_static_power(struct devfreq *devfreq, ++ unsigned long voltage) +{ -+ struct kbase_va_region *new_reg; -+ u32 nr_pages; -+ size_t size; -+ int err = 0; -+ u32 *tb; -+ int owns_tb = 1; -+ -+ dev_dbg(kctx->kbdev->dev, "in %s\n", __func__); -+ size = (vma->vm_end - vma->vm_start); -+ nr_pages = size >> PAGE_SHIFT; -+ -+ if (!kctx->jctx.tb) { -+ KBASE_DEBUG_ASSERT(0 != size); -+ tb = vmalloc_user(size); ++ int temperature, temp; ++ int temp_squared, temp_cubed, temp_scaling_factor; ++ const unsigned long coefficient = (410UL << 20) / (729000000UL >> 10); ++ const unsigned long voltage_cubed = (voltage * voltage * voltage) >> 10; ++ unsigned long static_power; + -+ if (NULL == tb) { -+ err = -ENOMEM; -+ goto out; -+ } ++ if (gpu_tz) { ++ int ret; + -+ err = kbase_device_trace_buffer_install(kctx, tb, size); -+ if (err) { -+ vfree(tb); -+ goto out; ++ ret = gpu_tz->ops->get_temp(gpu_tz, &temperature); ++ if (ret) { ++ MALI_DEBUG_PRINT(2, ("Error reading temperature for gpu thermal zone: %d\n", ret)); ++ temperature = FALLBACK_STATIC_TEMPERATURE; + } + } else { -+ err = -EINVAL; -+ goto out; ++ temperature = FALLBACK_STATIC_TEMPERATURE; + } + -+ *kaddr = kctx->jctx.tb; ++ /* Calculate the temperature scaling factor. To be applied to the ++ * voltage scaled power. ++ */ ++ temp = temperature / 1000; ++ temp_squared = temp * temp; ++ temp_cubed = temp_squared * temp; ++ temp_scaling_factor = ++ (2 * temp_cubed) ++ - (80 * temp_squared) ++ + (4700 * temp) ++ + 32000; + -+ new_reg = kbase_alloc_free_region(kctx, 0, nr_pages, KBASE_REG_ZONE_SAME_VA); -+ if (!new_reg) { -+ err = -ENOMEM; -+ WARN_ON(1); -+ goto out_no_region; -+ } ++ static_power = (((coefficient * voltage_cubed) >> 20) ++ * temp_scaling_factor) ++ / 1000000; + -+ new_reg->cpu_alloc = kbase_alloc_create(0, KBASE_MEM_TYPE_TB); -+ if (IS_ERR_OR_NULL(new_reg->cpu_alloc)) { -+ err = -ENOMEM; -+ new_reg->cpu_alloc = NULL; -+ WARN_ON(1); -+ goto out_no_alloc; -+ } ++ return static_power; ++} + -+ new_reg->gpu_alloc = kbase_mem_phy_alloc_get(new_reg->cpu_alloc); ++/* Calculate gpu dynamic power example for reference */ ++static unsigned long arm_model_dynamic_power(struct devfreq *devfreq, ++ unsigned long freq, ++ unsigned long voltage) ++{ ++ /* The inputs: freq (f) is in Hz, and voltage (v) in mV. ++ * The coefficient (c) is in mW/(MHz mV mV). ++ * ++ * This function calculates the dynamic power after this formula: ++ * Pdyn (mW) = c (mW/(MHz*mV*mV)) * v (mV) * v (mV) * f (MHz) ++ */ ++ const unsigned long v2 = (voltage * voltage) / 1000; /* m*(V*V) */ ++ const unsigned long f_mhz = freq / 1000000; /* MHz */ ++ const unsigned long coefficient = 3600; /* mW/(MHz*mV*mV) */ ++ unsigned long dynamic_power; + -+ new_reg->cpu_alloc->imported.kctx = kctx; -+ new_reg->flags &= ~KBASE_REG_FREE; -+ new_reg->flags |= KBASE_REG_CPU_CACHED; ++ dynamic_power = (coefficient * v2 * f_mhz) / 1000000; /* mW */ + -+ /* alloc now owns the tb */ -+ owns_tb = 0; ++ return dynamic_power; ++} + -+ if (kbase_add_va_region(kctx, new_reg, vma->vm_start, nr_pages, 1) != 0) { -+ err = -ENOMEM; -+ WARN_ON(1); -+ goto out_no_va_region; -+ } ++struct devfreq_cooling_power arm_cooling_ops = { ++ .get_static_power = arm_model_static_power, ++ .get_dynamic_power = arm_model_dynamic_power, ++}; ++#endif + -+ *reg = new_reg; ++static struct mali_gpu_device_data mali_gpu_data = { ++#ifndef CONFIG_MALI_DT ++ .pmu_switch_delay = 0xFF, /* do not have to be this high on FPGA, but it is good for testing to have a delay */ ++#if defined(CONFIG_ARCH_VEXPRESS) ++ .shared_mem_size = 256 * 1024 * 1024, /* 256MB */ ++#endif ++#endif ++ .max_job_runtime = 60000, /* 60 seconds */ + -+ /* map read only, noexec */ -+ vma->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_EXEC | VM_MAYEXEC); -+ /* the rest of the flags is added by the cpu_mmap handler */ ++#if defined(CONFIG_ARCH_REALVIEW) ++ .dedicated_mem_start = 0x80000000, /* Physical start address (use 0xD0000000 for old indirect setup) */ ++ .dedicated_mem_size = 0x10000000, /* 256MB */ ++#endif ++#if defined(CONFIG_ARM64) ++ /* Some framebuffer drivers get the framebuffer dynamically, such as through GEM, ++ * in which the memory resource can't be predicted in advance. ++ */ ++ .fb_start = 0x0, ++ .fb_size = 0xFFFFF000, ++#else ++ .fb_start = 0xe0000000, ++ .fb_size = 0x01000000, ++#endif ++ .control_interval = 1000, /* 1000ms */ ++ .utilization_callback = mali_gpu_utilization_callback, ++ .get_clock_info = NULL, ++ .get_freq = NULL, ++ .set_freq = NULL, ++#if defined(CONFIG_ARCH_VEXPRESS) && defined(CONFIG_ARM64) ++ .secure_mode_init = mali_secure_mode_init_juno, ++ .secure_mode_deinit = mali_secure_mode_deinit_juno, ++ .gpu_reset_and_secure_mode_enable = mali_gpu_reset_and_secure_mode_enable_juno, ++ .gpu_reset_and_secure_mode_disable = mali_gpu_reset_and_secure_mode_disable_juno, ++#else ++ .secure_mode_init = NULL, ++ .secure_mode_deinit = NULL, ++ .gpu_reset_and_secure_mode_enable = NULL, ++ .gpu_reset_and_secure_mode_disable = NULL, ++#endif ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) ++ .gpu_cooling_ops = &arm_cooling_ops, ++#endif ++}; + -+ dev_dbg(kctx->kbdev->dev, "%s done\n", __func__); -+ return 0; ++#ifndef CONFIG_MALI_DT ++static struct platform_device mali_gpu_device = { ++ .name = MALI_GPU_NAME_UTGARD, ++ .id = 0, ++ .dev.release = mali_platform_device_release, ++ .dev.dma_mask = &mali_gpu_device.dev.coherent_dma_mask, ++ .dev.coherent_dma_mask = DMA_BIT_MASK(32), + -+out_no_va_region: -+out_no_alloc: -+ kbase_free_alloced_region(new_reg); -+out_no_region: -+ if (owns_tb) { -+ kbase_device_trace_buffer_uninstall(kctx); -+ vfree(tb); -+ } -+out: -+ return err; -+} ++ .dev.platform_data = &mali_gpu_data, ++}; + -+static int kbase_mmu_dump_mmap(struct kbase_context *kctx, struct vm_area_struct *vma, struct kbase_va_region **const reg, void **const kmap_addr) ++int mali_platform_device_register(void) +{ -+ struct kbase_va_region *new_reg; -+ void *kaddr; -+ u32 nr_pages; -+ size_t size; -+ int err = 0; -+ -+ dev_dbg(kctx->kbdev->dev, "in kbase_mmu_dump_mmap\n"); -+ size = (vma->vm_end - vma->vm_start); -+ nr_pages = size >> PAGE_SHIFT; ++ int err = -1; ++ int num_pp_cores = 0; ++#if defined(CONFIG_ARCH_REALVIEW) ++ u32 m400_gp_version; ++#endif + -+ kaddr = kbase_mmu_dump(kctx, nr_pages); ++ MALI_DEBUG_PRINT(4, ("mali_platform_device_register() called\n")); + -+ if (!kaddr) { -+ err = -ENOMEM; -+ goto out; -+ } ++ /* Detect present Mali GPU and connect the correct resources to the device */ ++#if defined(CONFIG_ARCH_VEXPRESS) + -+ new_reg = kbase_alloc_free_region(kctx, 0, nr_pages, KBASE_REG_ZONE_SAME_VA); -+ if (!new_reg) { -+ err = -ENOMEM; -+ WARN_ON(1); -+ goto out; ++#if defined(CONFIG_ARM64) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) ++ mali_gpu_device.dev.archdata.dma_ops = &dummy_dma_ops; ++#else ++ mali_gpu_device.dev.archdata.dma_ops = dma_ops; ++#endif ++ if ((mali_read_phys(0x6F000000) & 0x00600450) == 0x00600450) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-450 MP6 device\n")); ++ num_pp_cores = 6; ++ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m450_mp6); ++ mali_gpu_device.resource = mali_gpu_resources_m450_mp6; ++ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00400430) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP4 device\n")); ++ num_pp_cores = 4; ++ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m470_mp4); ++ mali_gpu_device.resource = mali_gpu_resources_m470_mp4; ++ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00300430) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP3 device\n")); ++ num_pp_cores = 3; ++ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m470_mp3); ++ mali_gpu_device.resource = mali_gpu_resources_m470_mp3; ++ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00200430) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP2 device\n")); ++ num_pp_cores = 2; ++ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m470_mp2); ++ mali_gpu_device.resource = mali_gpu_resources_m470_mp2; ++ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00100430) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP1 device\n")); ++ num_pp_cores = 1; ++ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m470_mp1); ++ mali_gpu_device.resource = mali_gpu_resources_m470_mp1; + } -+ -+ new_reg->cpu_alloc = kbase_alloc_create(0, KBASE_MEM_TYPE_RAW); -+ if (IS_ERR_OR_NULL(new_reg->cpu_alloc)) { -+ err = -ENOMEM; -+ new_reg->cpu_alloc = NULL; -+ WARN_ON(1); -+ goto out_no_alloc; ++#else ++ if (mali_read_phys(0xFC000000) == 0x00000450) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-450 MP8 device\n")); ++ num_pp_cores = 8; ++ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m450_mp8); ++ mali_gpu_device.resource = mali_gpu_resources_m450_mp8; ++ } else if (mali_read_phys(0xFC000000) == 0x40600450) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-450 MP6 device\n")); ++ num_pp_cores = 6; ++ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m450_mp6); ++ mali_gpu_device.resource = mali_gpu_resources_m450_mp6; ++ } else if (mali_read_phys(0xFC000000) == 0x40400450) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-450 MP4 device\n")); ++ num_pp_cores = 4; ++ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m450_mp4); ++ mali_gpu_device.resource = mali_gpu_resources_m450_mp4; ++ } else if (mali_read_phys(0xFC000000) == 0xFFFFFFFF) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP4 device\n")); ++ num_pp_cores = 4; ++ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m470_mp4); ++ mali_gpu_device.resource = mali_gpu_resources_m470_mp4; + } ++#endif /* CONFIG_ARM64 */ + -+ new_reg->gpu_alloc = kbase_mem_phy_alloc_get(new_reg->cpu_alloc); ++#elif defined(CONFIG_ARCH_REALVIEW) + -+ new_reg->flags &= ~KBASE_REG_FREE; -+ new_reg->flags |= KBASE_REG_CPU_CACHED; -+ if (kbase_add_va_region(kctx, new_reg, vma->vm_start, nr_pages, 1) != 0) { -+ err = -ENOMEM; -+ WARN_ON(1); -+ goto out_va_region; ++ m400_gp_version = mali_read_phys(0xC000006C); ++ if ((m400_gp_version & 0xFFFF0000) == 0x0C070000) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-300 device\n")); ++ num_pp_cores = 1; ++ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m300); ++ mali_gpu_device.resource = mali_gpu_resources_m300; ++ mali_write_phys(0xC0010020, 0xA); /* Enable direct memory mapping for FPGA */ ++ } else if ((m400_gp_version & 0xFFFF0000) == 0x0B070000) { ++ u32 fpga_fw_version = mali_read_phys(0xC0010000); ++ if (fpga_fw_version == 0x130C008F || fpga_fw_version == 0x110C008F) { ++ /* Mali-400 MP1 r1p0 or r1p1 */ ++ MALI_DEBUG_PRINT(4, ("Registering Mali-400 MP1 device\n")); ++ num_pp_cores = 1; ++ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m400_mp1); ++ mali_gpu_device.resource = mali_gpu_resources_m400_mp1; ++ mali_write_phys(0xC0010020, 0xA); /* Enable direct memory mapping for FPGA */ ++ } else if (fpga_fw_version == 0x130C000F) { ++ /* Mali-400 MP2 r1p1 */ ++ MALI_DEBUG_PRINT(4, ("Registering Mali-400 MP2 device\n")); ++ num_pp_cores = 2; ++ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m400_mp2); ++ mali_gpu_device.resource = mali_gpu_resources_m400_mp2; ++ mali_write_phys(0xC0010020, 0xA); /* Enable direct memory mapping for FPGA */ ++ } + } + -+ *kmap_addr = kaddr; -+ *reg = new_reg; ++#endif ++ /* Register the platform device */ ++ err = platform_device_register(&mali_gpu_device); ++ if (0 == err) { ++#ifdef CONFIG_PM_RUNTIME ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) ++ pm_runtime_set_autosuspend_delay(&(mali_gpu_device.dev), 1000); ++ pm_runtime_use_autosuspend(&(mali_gpu_device.dev)); ++#endif ++ pm_runtime_enable(&(mali_gpu_device.dev)); ++#endif ++ MALI_DEBUG_ASSERT(0 < num_pp_cores); ++ mali_core_scaling_init(num_pp_cores); + -+ dev_dbg(kctx->kbdev->dev, "kbase_mmu_dump_mmap done\n"); -+ return 0; ++ return 0; ++ } + -+out_no_alloc: -+out_va_region: -+ kbase_free_alloced_region(new_reg); -+out: + return err; +} + -+ -+void kbase_os_mem_map_lock(struct kbase_context *kctx) ++void mali_platform_device_unregister(void) +{ -+ struct mm_struct *mm = current->mm; -+ (void)kctx; -+ down_read(&mm->mmap_sem); ++ MALI_DEBUG_PRINT(4, ("mali_platform_device_unregister() called\n")); ++ ++ mali_core_scaling_term(); ++#ifdef CONFIG_PM_RUNTIME ++ pm_runtime_disable(&(mali_gpu_device.dev)); ++#endif ++ platform_device_unregister(&mali_gpu_device); ++ ++ platform_device_put(&mali_gpu_device); ++ ++#if defined(CONFIG_ARCH_REALVIEW) ++ mali_write_phys(0xC0010020, 0x9); /* Restore default (legacy) memory mapping */ ++#endif +} + -+void kbase_os_mem_map_unlock(struct kbase_context *kctx) ++static void mali_platform_device_release(struct device *device) +{ -+ struct mm_struct *mm = current->mm; -+ (void)kctx; -+ up_read(&mm->mmap_sem); ++ MALI_DEBUG_PRINT(4, ("mali_platform_device_release() called\n")); +} + -+static int kbasep_reg_mmap(struct kbase_context *kctx, -+ struct vm_area_struct *vma, -+ struct kbase_va_region **regm, -+ size_t *nr_pages, size_t *aligned_offset) -+ ++#else /* CONFIG_MALI_DT */ ++int mali_platform_device_init(struct platform_device *device) +{ -+ int cookie = vma->vm_pgoff - PFN_DOWN(BASE_MEM_COOKIE_BASE); -+ struct kbase_va_region *reg; -+ int err = 0; -+ -+ *aligned_offset = 0; ++ int num_pp_cores = 0; ++ int err = -1; ++#if defined(CONFIG_ARCH_REALVIEW) ++ u32 m400_gp_version; ++#endif + -+ dev_dbg(kctx->kbdev->dev, "in kbasep_reg_mmap\n"); ++ /* Detect present Mali GPU and connect the correct resources to the device */ ++#if defined(CONFIG_ARCH_VEXPRESS) + -+ /* SAME_VA stuff, fetch the right region */ -+ reg = kctx->pending_regions[cookie]; -+ if (!reg) { -+ err = -ENOMEM; -+ goto out; ++#if defined(CONFIG_ARM64) ++ if ((mali_read_phys(0x6F000000) & 0x00600450) == 0x00600450) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-450 MP6 device\n")); ++ num_pp_cores = 6; ++ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00400430) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP4 device\n")); ++ num_pp_cores = 4; ++ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00300430) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP3 device\n")); ++ num_pp_cores = 3; ++ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00200430) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP2 device\n")); ++ num_pp_cores = 2; ++ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00100430) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP1 device\n")); ++ num_pp_cores = 1; ++ } ++#else ++ if (mali_read_phys(0xFC000000) == 0x00000450) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-450 MP8 device\n")); ++ num_pp_cores = 8; ++ } else if (mali_read_phys(0xFC000000) == 0x40400450) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-450 MP4 device\n")); ++ num_pp_cores = 4; ++ } else if (mali_read_phys(0xFC000000) == 0xFFFFFFFF) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP4 device\n")); ++ num_pp_cores = 4; + } ++#endif + -+ if ((reg->flags & KBASE_REG_GPU_NX) && (reg->nr_pages != *nr_pages)) { -+ /* incorrect mmap size */ -+ /* leave the cookie for a potential later -+ * mapping, or to be reclaimed later when the -+ * context is freed */ -+ err = -ENOMEM; -+ goto out; -+ } -+ -+ if ((vma->vm_flags & VM_READ && !(reg->flags & KBASE_REG_CPU_RD)) || -+ (vma->vm_flags & VM_WRITE && !(reg->flags & KBASE_REG_CPU_WR))) { -+ /* VM flags inconsistent with region flags */ -+ err = -EPERM; -+ dev_err(kctx->kbdev->dev, "%s:%d inconsistent VM flags\n", -+ __FILE__, __LINE__); -+ goto out; -+ } -+ -+ /* adjust down nr_pages to what we have physically */ -+ *nr_pages = kbase_reg_current_backed_size(reg); ++#elif defined(CONFIG_ARCH_REALVIEW) + -+ if (kbase_gpu_mmap(kctx, reg, vma->vm_start + *aligned_offset, -+ reg->nr_pages, 1) != 0) { -+ dev_err(kctx->kbdev->dev, "%s:%d\n", __FILE__, __LINE__); -+ /* Unable to map in GPU space. */ -+ WARN_ON(1); -+ err = -ENOMEM; -+ goto out; ++ m400_gp_version = mali_read_phys(0xC000006C); ++ if ((m400_gp_version & 0xFFFF0000) == 0x0C070000) { ++ MALI_DEBUG_PRINT(4, ("Registering Mali-300 device\n")); ++ num_pp_cores = 1; ++ mali_write_phys(0xC0010020, 0xA); /* Enable direct memory mapping for FPGA */ ++ } else if ((m400_gp_version & 0xFFFF0000) == 0x0B070000) { ++ u32 fpga_fw_version = mali_read_phys(0xC0010000); ++ if (fpga_fw_version == 0x130C008F || fpga_fw_version == 0x110C008F) { ++ /* Mali-400 MP1 r1p0 or r1p1 */ ++ MALI_DEBUG_PRINT(4, ("Registering Mali-400 MP1 device\n")); ++ num_pp_cores = 1; ++ mali_write_phys(0xC0010020, 0xA); /* Enable direct memory mapping for FPGA */ ++ } else if (fpga_fw_version == 0x130C000F) { ++ /* Mali-400 MP2 r1p1 */ ++ MALI_DEBUG_PRINT(4, ("Registering Mali-400 MP2 device\n")); ++ num_pp_cores = 2; ++ mali_write_phys(0xC0010020, 0xA); /* Enable direct memory mapping for FPGA */ ++ } + } -+ /* no need for the cookie anymore */ -+ kctx->pending_regions[cookie] = NULL; -+ kctx->cookies |= (1UL << cookie); ++#endif + -+ /* -+ * Overwrite the offset with the region start_pfn, so we effectively -+ * map from offset 0 in the region. However subtract the aligned -+ * offset so that when user space trims the mapping the beginning of -+ * the trimmed VMA has the correct vm_pgoff; ++ /* After kernel 3.15 device tree will default set dev ++ * related parameters in of_platform_device_create_pdata. ++ * But kernel changes from version to version, ++ * For example 3.10 didn't include device->dev.dma_mask parameter setting, ++ * if we didn't include here will cause dma_mapping error, ++ * but in kernel 3.15 it include device->dev.dma_mask parameter setting, ++ * so it's better to set must need paramter by DDK itself. + */ -+ vma->vm_pgoff = reg->start_pfn - ((*aligned_offset)>>PAGE_SHIFT); -+out: -+ *regm = reg; -+ dev_dbg(kctx->kbdev->dev, "kbasep_reg_mmap done\n"); -+ -+ return err; -+} -+ -+int kbase_mmap(struct file *file, struct vm_area_struct *vma) -+{ -+ struct kbase_context *kctx = file->private_data; -+ struct kbase_va_region *reg = NULL; -+ void *kaddr = NULL; -+ size_t nr_pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; -+ int err = 0; -+ int free_on_close = 0; -+ struct device *dev = kctx->kbdev->dev; -+ size_t aligned_offset = 0; -+ -+ dev_dbg(dev, "kbase_mmap\n"); ++ if (!device->dev.dma_mask) ++ device->dev.dma_mask = &device->dev.coherent_dma_mask; ++ device->dev.archdata.dma_ops = dma_ops; + -+ /* strip away corresponding VM_MAY% flags to the VM_% flags requested */ -+ vma->vm_flags &= ~((vma->vm_flags & (VM_READ | VM_WRITE)) << 4); ++ err = platform_device_add_data(device, &mali_gpu_data, sizeof(mali_gpu_data)); + -+ if (0 == nr_pages) { -+ err = -EINVAL; -+ goto out; ++ if (0 == err) { ++#ifdef CONFIG_PM_RUNTIME ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) ++ pm_runtime_set_autosuspend_delay(&(device->dev), 1000); ++ pm_runtime_use_autosuspend(&(device->dev)); ++#endif ++ pm_runtime_enable(&(device->dev)); ++#endif ++ MALI_DEBUG_ASSERT(0 < num_pp_cores); ++ mali_core_scaling_init(num_pp_cores); + } + -+ if (!(vma->vm_flags & VM_SHARED)) { -+ err = -EINVAL; -+ goto out; -+ } ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) ++ /* Some Socs didn't support the devfreq thermal for mali */ ++ if (of_machine_is_compatible("rockchip,rk3036")) ++ return 0; + -+ kbase_gpu_vm_lock(kctx); ++ /* Get thermal zone */ ++ gpu_tz = thermal_zone_get_zone_by_name("soc_thermal"); ++ if (IS_ERR(gpu_tz)) { ++ MALI_DEBUG_PRINT(2, ("Error getting gpu thermal zone (%ld), not yet ready?\n", ++ PTR_ERR(gpu_tz))); ++ gpu_tz = NULL; + -+ if (vma->vm_pgoff == PFN_DOWN(BASE_MEM_MAP_TRACKING_HANDLE)) { -+ /* The non-mapped tracking helper page */ -+ err = kbase_tracking_page_setup(kctx, vma); -+ goto out_unlock; ++ err = -EPROBE_DEFER; + } ++#endif + -+ /* if not the MTP, verify that the MTP has been mapped */ -+ rcu_read_lock(); -+ /* catches both when the special page isn't present or -+ * when we've forked */ -+ if (rcu_dereference(kctx->process_mm) != current->mm) { -+ err = -EINVAL; -+ rcu_read_unlock(); -+ goto out_unlock; -+ } -+ rcu_read_unlock(); ++ return err; ++} + -+ switch (vma->vm_pgoff) { -+ case PFN_DOWN(BASEP_MEM_INVALID_HANDLE): -+ case PFN_DOWN(BASEP_MEM_WRITE_ALLOC_PAGES_HANDLE): -+ /* Illegal handle for direct map */ -+ err = -EINVAL; -+ goto out_unlock; -+ case PFN_DOWN(BASE_MEM_TRACE_BUFFER_HANDLE): -+ err = kbase_trace_buffer_mmap(kctx, vma, ®, &kaddr); -+ if (0 != err) -+ goto out_unlock; -+ dev_dbg(dev, "kbase_trace_buffer_mmap ok\n"); -+ /* free the region on munmap */ -+ free_on_close = 1; -+ break; -+ case PFN_DOWN(BASE_MEM_MMU_DUMP_HANDLE): -+ /* MMU dump */ -+ err = kbase_mmu_dump_mmap(kctx, vma, ®, &kaddr); -+ if (0 != err) -+ goto out_unlock; -+ /* free the region on munmap */ -+ free_on_close = 1; -+ break; -+ case PFN_DOWN(BASE_MEM_COOKIE_BASE) ... -+ PFN_DOWN(BASE_MEM_FIRST_FREE_ADDRESS) - 1: { -+ err = kbasep_reg_mmap(kctx, vma, ®, &nr_pages, -+ &aligned_offset); -+ if (0 != err) -+ goto out_unlock; -+ /* free the region on munmap */ -+ free_on_close = 1; -+ break; -+ } -+ default: { -+ reg = kbase_region_tracker_find_region_enclosing_address(kctx, -+ (u64)vma->vm_pgoff << PAGE_SHIFT); ++int mali_platform_device_deinit(struct platform_device *device) ++{ ++ MALI_IGNORE(device); + -+ if (reg && !(reg->flags & KBASE_REG_FREE)) { -+ /* will this mapping overflow the size of the region? */ -+ if (nr_pages > (reg->nr_pages - -+ (vma->vm_pgoff - reg->start_pfn))) { -+ err = -ENOMEM; -+ goto out_unlock; -+ } ++ MALI_DEBUG_PRINT(4, ("mali_platform_device_deinit() called\n")); + -+ if ((vma->vm_flags & VM_READ && -+ !(reg->flags & KBASE_REG_CPU_RD)) || -+ (vma->vm_flags & VM_WRITE && -+ !(reg->flags & KBASE_REG_CPU_WR))) { -+ /* VM flags inconsistent with region flags */ -+ err = -EPERM; -+ dev_err(dev, "%s:%d inconsistent VM flags\n", -+ __FILE__, __LINE__); -+ goto out_unlock; -+ } ++ mali_core_scaling_term(); ++#ifdef CONFIG_PM_RUNTIME ++ pm_runtime_disable(&(device->dev)); ++#endif + -+#ifdef CONFIG_DMA_SHARED_BUFFER -+ if (KBASE_MEM_TYPE_IMPORTED_UMM == -+ reg->cpu_alloc->type) { -+ err = dma_buf_mmap( -+ reg->cpu_alloc->imported.umm.dma_buf, -+ vma, vma->vm_pgoff - reg->start_pfn); -+ goto out_unlock; -+ } -+#endif /* CONFIG_DMA_SHARED_BUFFER */ ++#if defined(CONFIG_ARCH_REALVIEW) ++ mali_write_phys(0xC0010020, 0x9); /* Restore default (legacy) memory mapping */ ++#endif + -+ /* limit what we map to the amount currently backed */ -+ if (reg->cpu_alloc->nents < (vma->vm_pgoff - reg->start_pfn + nr_pages)) { -+ if ((vma->vm_pgoff - reg->start_pfn) >= reg->cpu_alloc->nents) -+ nr_pages = 0; -+ else -+ nr_pages = reg->cpu_alloc->nents - (vma->vm_pgoff - reg->start_pfn); -+ } -+ } else { -+ err = -ENOMEM; -+ goto out_unlock; -+ } -+ } /* default */ -+ } /* switch */ ++ return 0; ++} + -+ err = kbase_cpu_mmap(reg, vma, kaddr, nr_pages, aligned_offset, free_on_close); ++#endif /* CONFIG_MALI_DT */ + -+ if (vma->vm_pgoff == PFN_DOWN(BASE_MEM_MMU_DUMP_HANDLE)) { -+ /* MMU dump - userspace should now have a reference on -+ * the pages, so we can now free the kernel mapping */ -+ vfree(kaddr); ++static u32 mali_read_phys(u32 phys_addr) ++{ ++ u32 phys_addr_page = phys_addr & 0xFFFFE000; ++ u32 phys_offset = phys_addr & 0x00001FFF; ++ u32 map_size = phys_offset + sizeof(u32); ++ u32 ret = 0xDEADBEEF; ++ void *mem_mapped = ioremap(phys_addr_page, map_size); ++ if (NULL != mem_mapped) { ++ ret = (u32)ioread32(((u8 *)mem_mapped) + phys_offset); ++ iounmap(mem_mapped); + } + -+out_unlock: -+ kbase_gpu_vm_unlock(kctx); -+out: -+ if (err) -+ dev_err(dev, "mmap failed %d\n", err); -+ -+ return err; ++ return ret; +} + -+KBASE_EXPORT_TEST_API(kbase_mmap); -+ -+static void kbasep_sync_mem_regions(struct kbase_context *kctx, -+ struct kbase_vmap_struct *map, enum kbase_sync_type dest) ++#if defined(CONFIG_ARCH_REALVIEW) ++static void mali_write_phys(u32 phys_addr, u32 value) +{ -+ size_t i; -+ off_t const offset = (uintptr_t)map->gpu_addr & ~PAGE_MASK; -+ size_t const page_count = PFN_UP(offset + map->size); -+ -+ /* Sync first page */ -+ size_t sz = MIN(((size_t) PAGE_SIZE - offset), map->size); -+ struct tagged_addr cpu_pa = map->cpu_pages[0]; -+ struct tagged_addr gpu_pa = map->gpu_pages[0]; -+ -+ kbase_sync_single(kctx, cpu_pa, gpu_pa, offset, sz, dest); -+ -+ /* Sync middle pages (if any) */ -+ for (i = 1; page_count > 2 && i < page_count - 1; i++) { -+ cpu_pa = map->cpu_pages[i]; -+ gpu_pa = map->gpu_pages[i]; -+ kbase_sync_single(kctx, cpu_pa, gpu_pa, 0, PAGE_SIZE, dest); -+ } -+ -+ /* Sync last page (if any) */ -+ if (page_count > 1) { -+ cpu_pa = map->cpu_pages[page_count - 1]; -+ gpu_pa = map->gpu_pages[page_count - 1]; -+ sz = ((offset + map->size - 1) & ~PAGE_MASK) + 1; -+ kbase_sync_single(kctx, cpu_pa, gpu_pa, 0, sz, dest); ++ u32 phys_addr_page = phys_addr & 0xFFFFE000; ++ u32 phys_offset = phys_addr & 0x00001FFF; ++ u32 map_size = phys_offset + sizeof(u32); ++ void *mem_mapped = ioremap(phys_addr_page, map_size); ++ if (NULL != mem_mapped) { ++ iowrite32(value, ((u8 *)mem_mapped) + phys_offset); ++ iounmap(mem_mapped); + } +} ++#endif + -+void *kbase_vmap_prot(struct kbase_context *kctx, u64 gpu_addr, size_t size, -+ unsigned long prot_request, struct kbase_vmap_struct *map) ++static int param_set_core_scaling(const char *val, const struct kernel_param *kp) +{ -+ struct kbase_va_region *reg; -+ unsigned long page_index; -+ unsigned int offset = gpu_addr & ~PAGE_MASK; -+ size_t page_count = PFN_UP(offset + size); -+ struct tagged_addr *page_array; -+ struct page **pages; -+ void *cpu_addr = NULL; -+ pgprot_t prot; -+ size_t i; -+ -+ if (!size || !map) -+ return NULL; -+ -+ /* check if page_count calculation will wrap */ -+ if (size > ((size_t)-1 / PAGE_SIZE)) -+ return NULL; -+ -+ kbase_gpu_vm_lock(kctx); -+ -+ reg = kbase_region_tracker_find_region_enclosing_address(kctx, gpu_addr); -+ if (!reg || (reg->flags & KBASE_REG_FREE)) -+ goto out_unlock; -+ -+ page_index = (gpu_addr >> PAGE_SHIFT) - reg->start_pfn; -+ -+ /* check if page_index + page_count will wrap */ -+ if (-1UL - page_count < page_index) -+ goto out_unlock; -+ -+ if (page_index + page_count > kbase_reg_current_backed_size(reg)) -+ goto out_unlock; -+ -+ if (reg->flags & KBASE_REG_DONT_NEED) -+ goto out_unlock; -+ -+ /* check access permissions can be satisfied -+ * Intended only for checking KBASE_REG_{CPU,GPU}_{RD,WR} */ -+ if ((reg->flags & prot_request) != prot_request) -+ goto out_unlock; ++ int ret = param_set_int(val, kp); + -+ page_array = kbase_get_cpu_phy_pages(reg); -+ if (!page_array) -+ goto out_unlock; ++ if (1 == mali_core_scaling_enable) { ++ mali_core_scaling_sync(mali_executor_get_num_cores_enabled()); ++ } ++ return ret; ++} + -+ pages = kmalloc_array(page_count, sizeof(struct page *), GFP_KERNEL); -+ if (!pages) -+ goto out_unlock; ++static struct kernel_param_ops param_ops_core_scaling = { ++ .set = param_set_core_scaling, ++ .get = param_get_int, ++}; + -+ for (i = 0; i < page_count; i++) -+ pages[i] = phys_to_page(as_phys_addr_t(page_array[page_index + -+ i])); ++module_param_cb(mali_core_scaling_enable, ¶m_ops_core_scaling, &mali_core_scaling_enable, 0644); ++MODULE_PARM_DESC(mali_core_scaling_enable, "1 means to enable core scaling policy, 0 means to disable core scaling policy"); + -+ prot = PAGE_KERNEL; -+ if (!(reg->flags & KBASE_REG_CPU_CACHED)) { -+ /* Map uncached */ -+ prot = pgprot_writecombine(prot); ++void mali_gpu_utilization_callback(struct mali_gpu_utilization_data *data) ++{ ++ if (1 == mali_core_scaling_enable) { ++ mali_core_scaling_update(data); + } -+ /* Note: enforcing a RO prot_request onto prot is not done, since: -+ * - CPU-arch-specific integration required -+ * - kbase_vmap() requires no access checks to be made/enforced */ ++} +diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c +new file mode 100755 +index 000000000..7a2fc8107 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c +@@ -0,0 +1,122 @@ ++/* ++ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ cpu_addr = vmap(pages, page_count, VM_MAP, prot); ++/** ++ * @file arm_core_scaling.c ++ * Example core scaling policy. ++ */ + -+ kfree(pages); ++#include "arm_core_scaling.h" + -+ if (!cpu_addr) -+ goto out_unlock; ++#include ++#include "mali_kernel_common.h" + -+ map->gpu_addr = gpu_addr; -+ map->cpu_alloc = kbase_mem_phy_alloc_get(reg->cpu_alloc); -+ map->cpu_pages = &kbase_get_cpu_phy_pages(reg)[page_index]; -+ map->gpu_alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); -+ map->gpu_pages = &kbase_get_gpu_phy_pages(reg)[page_index]; -+ map->addr = (void *)((uintptr_t)cpu_addr + offset); -+ map->size = size; -+ map->sync_needed = ((reg->flags & KBASE_REG_CPU_CACHED) != 0) && -+ !kbase_mem_is_imported(map->gpu_alloc->type); ++#include + -+ if (map->sync_needed) -+ kbasep_sync_mem_regions(kctx, map, KBASE_SYNC_TO_CPU); -+ kbase_gpu_vm_unlock(kctx); ++static int num_cores_total; ++static int num_cores_enabled; + -+ return map->addr; ++static struct work_struct wq_work; + -+out_unlock: -+ kbase_gpu_vm_unlock(kctx); -+ return NULL; ++static void set_num_cores(struct work_struct *work) ++{ ++ int err = mali_perf_set_num_pp_cores(num_cores_enabled); ++ MALI_DEBUG_ASSERT(0 == err); ++ MALI_IGNORE(err); +} + -+void *kbase_vmap(struct kbase_context *kctx, u64 gpu_addr, size_t size, -+ struct kbase_vmap_struct *map) ++static void enable_one_core(void) +{ -+ /* 0 is specified for prot_request to indicate no access checks should -+ * be made. -+ * -+ * As mentioned in kbase_vmap_prot() this means that a kernel-side -+ * CPU-RO mapping is not enforced to allow this to work */ -+ return kbase_vmap_prot(kctx, gpu_addr, size, 0u, map); ++ if (num_cores_enabled < num_cores_total) { ++ ++num_cores_enabled; ++ schedule_work(&wq_work); ++ MALI_DEBUG_PRINT(3, ("Core scaling: Enabling one more core\n")); ++ } ++ ++ MALI_DEBUG_ASSERT(1 <= num_cores_enabled); ++ MALI_DEBUG_ASSERT(num_cores_total >= num_cores_enabled); +} -+KBASE_EXPORT_TEST_API(kbase_vmap); + -+void kbase_vunmap(struct kbase_context *kctx, struct kbase_vmap_struct *map) ++static void disable_one_core(void) +{ -+ void *addr = (void *)((uintptr_t)map->addr & PAGE_MASK); -+ vunmap(addr); ++ if (1 < num_cores_enabled) { ++ --num_cores_enabled; ++ schedule_work(&wq_work); ++ MALI_DEBUG_PRINT(3, ("Core scaling: Disabling one core\n")); ++ } + -+ if (map->sync_needed) -+ kbasep_sync_mem_regions(kctx, map, KBASE_SYNC_TO_DEVICE); -+ map->gpu_addr = 0; -+ map->cpu_alloc = kbase_mem_phy_alloc_put(map->cpu_alloc); -+ map->gpu_alloc = kbase_mem_phy_alloc_put(map->gpu_alloc); -+ map->cpu_pages = NULL; -+ map->gpu_pages = NULL; -+ map->addr = NULL; -+ map->size = 0; -+ map->sync_needed = false; ++ MALI_DEBUG_ASSERT(1 <= num_cores_enabled); ++ MALI_DEBUG_ASSERT(num_cores_total >= num_cores_enabled); +} -+KBASE_EXPORT_TEST_API(kbase_vunmap); + -+void kbasep_os_process_page_usage_update(struct kbase_context *kctx, int pages) ++static void enable_max_num_cores(void) +{ -+ struct mm_struct *mm; -+ -+ rcu_read_lock(); -+ mm = rcu_dereference(kctx->process_mm); -+ if (mm) { -+ atomic_add(pages, &kctx->nonmapped_pages); -+#ifdef SPLIT_RSS_COUNTING -+ add_mm_counter(mm, MM_FILEPAGES, pages); -+#else -+ spin_lock(&mm->page_table_lock); -+ add_mm_counter(mm, MM_FILEPAGES, pages); -+ spin_unlock(&mm->page_table_lock); -+#endif ++ if (num_cores_enabled < num_cores_total) { ++ num_cores_enabled = num_cores_total; ++ schedule_work(&wq_work); ++ MALI_DEBUG_PRINT(3, ("Core scaling: Enabling maximum number of cores\n")); + } -+ rcu_read_unlock(); ++ ++ MALI_DEBUG_ASSERT(num_cores_total == num_cores_enabled); +} + -+static void kbasep_os_process_page_usage_drain(struct kbase_context *kctx) ++void mali_core_scaling_init(int num_pp_cores) +{ -+ int pages; -+ struct mm_struct *mm; -+ -+ spin_lock(&kctx->mm_update_lock); -+ mm = rcu_dereference_protected(kctx->process_mm, lockdep_is_held(&kctx->mm_update_lock)); -+ if (!mm) { -+ spin_unlock(&kctx->mm_update_lock); -+ return; -+ } ++ INIT_WORK(&wq_work, set_num_cores); + -+ rcu_assign_pointer(kctx->process_mm, NULL); -+ spin_unlock(&kctx->mm_update_lock); -+ synchronize_rcu(); ++ num_cores_total = num_pp_cores; ++ num_cores_enabled = num_pp_cores; + -+ pages = atomic_xchg(&kctx->nonmapped_pages, 0); -+#ifdef SPLIT_RSS_COUNTING -+ add_mm_counter(mm, MM_FILEPAGES, -pages); -+#else -+ spin_lock(&mm->page_table_lock); -+ add_mm_counter(mm, MM_FILEPAGES, -pages); -+ spin_unlock(&mm->page_table_lock); -+#endif ++ /* NOTE: Mali is not fully initialized at this point. */ +} + -+static void kbase_special_vm_close(struct vm_area_struct *vma) ++void mali_core_scaling_sync(int num_cores) +{ -+ struct kbase_context *kctx; ++ num_cores_enabled = num_cores; ++} + -+ kctx = vma->vm_private_data; -+ kbasep_os_process_page_usage_drain(kctx); ++void mali_core_scaling_term(void) ++{ ++ flush_scheduled_work(); +} + -+static const struct vm_operations_struct kbase_vm_special_ops = { -+ .close = kbase_special_vm_close, -+}; ++#define PERCENT_OF(percent, max) ((int) ((percent)*(max)/100.0 + 0.5)) + -+static int kbase_tracking_page_setup(struct kbase_context *kctx, struct vm_area_struct *vma) ++void mali_core_scaling_update(struct mali_gpu_utilization_data *data) +{ -+ /* check that this is the only tracking page */ -+ spin_lock(&kctx->mm_update_lock); -+ if (rcu_dereference_protected(kctx->process_mm, lockdep_is_held(&kctx->mm_update_lock))) { -+ spin_unlock(&kctx->mm_update_lock); -+ return -EFAULT; -+ } -+ -+ rcu_assign_pointer(kctx->process_mm, current->mm); ++ /* ++ * This function implements a very trivial PP core scaling algorithm. ++ * ++ * It is _NOT_ of production quality. ++ * The only intention behind this algorithm is to exercise and test the ++ * core scaling functionality of the driver. ++ * It is _NOT_ tuned for neither power saving nor performance! ++ * ++ * Other metrics than PP utilization need to be considered as well ++ * in order to make a good core scaling algorithm. ++ */ + -+ spin_unlock(&kctx->mm_update_lock); ++ MALI_DEBUG_PRINT(3, ("Utilization: (%3d, %3d, %3d), cores enabled: %d/%d\n", data->utilization_gpu, data->utilization_gp, data->utilization_pp, num_cores_enabled, num_cores_total)); + -+ /* no real access */ -+ vma->vm_flags &= ~(VM_READ | VM_MAYREAD | VM_WRITE | VM_MAYWRITE | VM_EXEC | VM_MAYEXEC); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)) -+ vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND | VM_DONTDUMP | VM_IO; -+#else -+ vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED | VM_IO; -+#endif -+ vma->vm_ops = &kbase_vm_special_ops; -+ vma->vm_private_data = kctx; ++ /* NOTE: this function is normally called directly from the utilization callback which is in ++ * timer context. */ + -+ return 0; ++ if (PERCENT_OF(90, 256) < data->utilization_pp) { ++ enable_max_num_cores(); ++ } else if (PERCENT_OF(50, 256) < data->utilization_pp) { ++ enable_one_core(); ++ } else if (PERCENT_OF(40, 256) < data->utilization_pp) { ++ /* do nothing */ ++ } else if (PERCENT_OF(0, 256) < data->utilization_pp) { ++ disable_one_core(); ++ } else { ++ /* do nothing */ ++ } +} -+void *kbase_va_alloc(struct kbase_context *kctx, u32 size, struct kbase_hwc_dma_mapping *handle) -+{ -+ int res; -+ void *va; -+ dma_addr_t dma_pa; -+ struct kbase_va_region *reg; -+ struct tagged_addr *page_array; -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) -+ unsigned long attrs = DMA_ATTR_WRITE_COMBINE; -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) -+ DEFINE_DMA_ATTRS(attrs); -+#endif +diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h +new file mode 100755 +index 000000000..8e0101830 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h +@@ -0,0 +1,44 @@ ++/* ++ * Copyright (C) 2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ u32 pages = ((size - 1) >> PAGE_SHIFT) + 1; -+ u32 flags = BASE_MEM_PROT_CPU_RD | BASE_MEM_PROT_CPU_WR | -+ BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR; -+ u32 i; ++/** ++ * @file arm_core_scaling.h ++ * Example core scaling policy. ++ */ + -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ KBASE_DEBUG_ASSERT(0 != size); -+ KBASE_DEBUG_ASSERT(0 != pages); ++#ifndef __ARM_CORE_SCALING_H__ ++#define __ARM_CORE_SCALING_H__ + -+ if (size == 0) -+ goto err; ++struct mali_gpu_utilization_data; + -+ /* All the alloc calls return zeroed memory */ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) -+ va = dma_alloc_attrs(kctx->kbdev->dev, size, &dma_pa, GFP_KERNEL, -+ attrs); -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) -+ dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs); -+ va = dma_alloc_attrs(kctx->kbdev->dev, size, &dma_pa, GFP_KERNEL, -+ &attrs); -+#else -+ va = dma_alloc_writecombine(kctx->kbdev->dev, size, &dma_pa, GFP_KERNEL); -+#endif -+ if (!va) -+ goto err; ++/** ++ * Initialize core scaling policy. ++ * ++ * @note The core scaling policy will assume that all PP cores are on initially. ++ * ++ * @param num_pp_cores Total number of PP cores. ++ */ ++void mali_core_scaling_init(int num_pp_cores); + -+ /* Store the state so we can free it later. */ -+ handle->cpu_va = va; -+ handle->dma_pa = dma_pa; -+ handle->size = size; ++/** ++ * Terminate core scaling policy. ++ */ ++void mali_core_scaling_term(void); + ++/** ++ * Update core scaling policy with new utilization data. ++ * ++ * @param data Utilization data. ++ */ ++void mali_core_scaling_update(struct mali_gpu_utilization_data *data); + -+ reg = kbase_alloc_free_region(kctx, 0, pages, KBASE_REG_ZONE_SAME_VA); -+ if (!reg) -+ goto no_reg; ++void mali_core_scaling_sync(int num_cores); + -+ reg->flags &= ~KBASE_REG_FREE; -+ if (kbase_update_region_flags(kctx, reg, flags) != 0) -+ goto invalid_flags; ++#endif /* __ARM_CORE_SCALING_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c b/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c +new file mode 100755 +index 000000000..e4e7ab8b2 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c +@@ -0,0 +1,127 @@ ++/* ++ * Copyright (C) 2010, 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ reg->cpu_alloc = kbase_alloc_create(pages, KBASE_MEM_TYPE_RAW); -+ if (IS_ERR_OR_NULL(reg->cpu_alloc)) -+ goto no_alloc; ++/** ++ * @file juno_opp.c ++ * Example: Set up opp table ++ * Using ARM64 juno specific SCPI_PROTOCOL get frequence inform ++ * Customer need implement your own platform releated logic ++ */ ++#ifdef CONFIG_ARCH_VEXPRESS ++#ifdef CONFIG_MALI_DEVFREQ ++#ifdef CONFIG_ARM64 ++#ifdef CONFIG_ARM_SCPI_PROTOCOL ++#include ++#include ++#include ++#include ++#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) ++#include ++#else /* Linux >= 3.13 */ ++/* In 3.13 the OPP include header file, types, and functions were all ++ * renamed. Use the old filename for the include, and define the new names to ++ * the old, when an old kernel is detected. ++ */ ++#include ++#define dev_pm_opp_add opp_add ++#define dev_pm_opp_remove opp_remove ++#endif /* Linux >= 3.13 */ + -+ reg->gpu_alloc = kbase_mem_phy_alloc_get(reg->cpu_alloc); ++#include "mali_kernel_common.h" + -+ page_array = kbase_get_cpu_phy_pages(reg); ++static int init_juno_opps_from_scpi(struct device *dev) ++{ ++ struct scpi_dvfs_info *sinfo; ++ struct scpi_ops *sops; + -+ for (i = 0; i < pages; i++) -+ page_array[i] = as_tagged(dma_pa + (i << PAGE_SHIFT)); ++ int i; + -+ reg->cpu_alloc->nents = pages; ++ sops = get_scpi_ops(); ++ if (NULL == sops) { ++ MALI_DEBUG_PRINT(2, ("Mali didn't get any scpi ops \n")); ++ return -1; ++ } + -+ kbase_gpu_vm_lock(kctx); -+ res = kbase_gpu_mmap(kctx, reg, (uintptr_t) va, pages, 1); -+ kbase_gpu_vm_unlock(kctx); -+ if (res) -+ goto no_mmap; ++ /* Hard coded for Juno. 2 is GPU domain */ ++ sinfo = sops->dvfs_get_info(2); ++ if (IS_ERR_OR_NULL(sinfo)) ++ return PTR_ERR(sinfo); + -+ return va; ++ for (i = 0; i < sinfo->count; i++) { ++ struct scpi_opp *e = &sinfo->opps[i]; + -+no_mmap: -+ kbase_mem_phy_alloc_put(reg->cpu_alloc); -+ kbase_mem_phy_alloc_put(reg->gpu_alloc); -+no_alloc: -+invalid_flags: -+ kfree(reg); -+no_reg: -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) -+ dma_free_attrs(kctx->kbdev->dev, size, va, dma_pa, attrs); -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) -+ dma_free_attrs(kctx->kbdev->dev, size, va, dma_pa, &attrs); -+#else -+ dma_free_writecombine(kctx->kbdev->dev, size, va, dma_pa); -+#endif -+err: -+ return NULL; ++ MALI_DEBUG_PRINT(2, ("Mali OPP from SCPI: %u Hz @ %u mV\n", e->freq, e->m_volt)); ++ ++ dev_pm_opp_add(dev, e->freq, e->m_volt * 1000); ++ } ++ ++ return 0; +} -+KBASE_EXPORT_SYMBOL(kbase_va_alloc); + -+void kbase_va_free(struct kbase_context *kctx, struct kbase_hwc_dma_mapping *handle) ++int setup_opps(void) +{ -+ struct kbase_va_region *reg; ++ struct device_node *np; ++ struct platform_device *pdev; + int err; -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) && \ -+ (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) -+ DEFINE_DMA_ATTRS(attrs); -+#endif + -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ KBASE_DEBUG_ASSERT(handle->cpu_va != NULL); ++ np = of_find_node_by_name(NULL, "gpu"); ++ if (!np) { ++ pr_err("Failed to find DT entry for Mali\n"); ++ return -EFAULT; ++ } + -+ kbase_gpu_vm_lock(kctx); -+ reg = kbase_region_tracker_find_region_base_address(kctx, (uintptr_t)handle->cpu_va); -+ KBASE_DEBUG_ASSERT(reg); -+ err = kbase_gpu_munmap(kctx, reg); -+ kbase_gpu_vm_unlock(kctx); -+ KBASE_DEBUG_ASSERT(!err); ++ pdev = of_find_device_by_node(np); ++ if (!pdev) { ++ pr_err("Failed to find device for Mali\n"); ++ of_node_put(np); ++ return -EFAULT; ++ } + -+ kbase_mem_phy_alloc_put(reg->cpu_alloc); -+ kbase_mem_phy_alloc_put(reg->gpu_alloc); -+ kfree(reg); ++ err = init_juno_opps_from_scpi(&pdev->dev); + -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) -+ dma_free_attrs(kctx->kbdev->dev, handle->size, -+ handle->cpu_va, handle->dma_pa, DMA_ATTR_WRITE_COMBINE); -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) -+ dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs); -+ dma_free_attrs(kctx->kbdev->dev, handle->size, -+ handle->cpu_va, handle->dma_pa, &attrs); -+#else -+ dma_free_writecombine(kctx->kbdev->dev, handle->size, -+ handle->cpu_va, handle->dma_pa); -+#endif ++ of_node_put(np); ++ ++ return err; +} -+KBASE_EXPORT_SYMBOL(kbase_va_free); + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_linux.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_linux.h ++int term_opps(struct device *dev) ++{ ++ struct scpi_dvfs_info *sinfo; ++ struct scpi_ops *sops; ++ ++ int i; ++ ++ sops = get_scpi_ops(); ++ if (NULL == sops) { ++ MALI_DEBUG_PRINT(2, ("Mali didn't get any scpi ops \n")); ++ return -1; ++ } ++ ++ /* Hard coded for Juno. 2 is GPU domain */ ++ sinfo = sops->dvfs_get_info(2); ++ if (IS_ERR_OR_NULL(sinfo)) ++ return PTR_ERR(sinfo); ++ ++ for (i = 0; i < sinfo->count; i++) { ++ struct scpi_opp *e = &sinfo->opps[i]; ++ ++ MALI_DEBUG_PRINT(2, ("Mali Remove OPP: %u Hz \n", e->freq)); ++ ++ dev_pm_opp_remove(dev, e->freq); ++ } ++ ++ return 0; ++ ++} ++#endif ++#endif ++#endif ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h b/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h new file mode 100755 -index 000000000000..db35f62a7431 +index 000000000..fe5e12241 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_linux.h -@@ -0,0 +1,240 @@ -+/* ++++ b/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h +@@ -0,0 +1,209 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ---------------------------------------------------------------------------- ++ * File: custom_log.h + * -+ * (C) COPYRIGHT 2010, 2012-2017 ARM Limited. All rights reserved. ++ * Desc: ChenZhen å好的 log 输出的定制实现. + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * -------------------------------------------------------------------- ++ * < 习语 å’Œ 缩略语 > : + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * -------------------------------------------------------------------- ++ * Usage: ++ * ++ * Note: ++ * ++ * Author: ChenZhen ++ * ++ * ---------------------------------------------------------------------------- ++ * Version: ++ * v1.0 ++ * ---------------------------------------------------------------------------- ++ * Log: ++ ----Fri Nov 19 15:20:28 2010 v1.0 + * ++ * ---------------------------------------------------------------------------- + */ + ++#ifndef __CUSTOM_LOG_H__ ++#define __CUSTOM_LOG_H__ + ++#ifdef __cplusplus ++extern "C" { ++#endif + ++/* ----------------------------------------------------------------------------- ++ * Include Files ++ * ----------------------------------------------------------------------------- ++ */ ++#include ++#include + -+ -+/** -+ * @file mali_kbase_mem_linux.h -+ * Base kernel memory APIs, Linux implementation. ++/* ----------------------------------------------------------------------------- ++ * Macros Definition ++ * ----------------------------------------------------------------------------- + */ + -+#ifndef _KBASE_MEM_LINUX_H_ -+#define _KBASE_MEM_LINUX_H_ ++/** 若下列 macro 有被定义, æ‰ ä½¿èƒ½ log 输出. */ ++/* #define ENABLE_DEBUG_LOG */ + -+/** A HWC dump mapping */ -+struct kbase_hwc_dma_mapping { -+ void *cpu_va; -+ dma_addr_t dma_pa; -+ size_t size; -+}; ++/*----------------------------------------------------------------------------*/ + -+struct kbase_va_region *kbase_mem_alloc(struct kbase_context *kctx, -+ u64 va_pages, u64 commit_pages, u64 extent, u64 *flags, -+ u64 *gpu_va); -+int kbase_mem_query(struct kbase_context *kctx, u64 gpu_addr, int query, u64 *const pages); -+int kbase_mem_import(struct kbase_context *kctx, enum base_mem_import_type type, -+ void __user *phandle, u32 padding, u64 *gpu_va, u64 *va_pages, -+ u64 *flags); -+u64 kbase_mem_alias(struct kbase_context *kctx, u64 *flags, u64 stride, u64 nents, struct base_mem_aliasing_info *ai, u64 *num_pages); -+int kbase_mem_flags_change(struct kbase_context *kctx, u64 gpu_addr, unsigned int flags, unsigned int mask); ++#ifdef ENABLE_VERBOSE_LOG ++/** Verbose log. */ ++#define V(fmt, args...) \ ++ pr_debug("V : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ ++ "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) ++#else ++#define V(...) ((void)0) ++#endif + -+/** -+ * kbase_mem_commit - Change the physical backing size of a region -+ * -+ * @kctx: The kernel context -+ * @gpu_addr: Handle to the memory region -+ * @new_pages: Number of physical pages to back the region with -+ * -+ * Return: 0 on success or error code -+ */ -+int kbase_mem_commit(struct kbase_context *kctx, u64 gpu_addr, u64 new_pages); ++#ifdef ENABLE_DEBUG_LOG ++/** Debug log. */ ++#define D(fmt, args...) \ ++ pr_info("D : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ ++ "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) ++#else ++#define D(...) ((void)0) ++#endif + -+int kbase_mmap(struct file *file, struct vm_area_struct *vma); ++#define I(fmt, args...) \ ++ pr_info("I : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ ++ "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) + -+/** -+ * kbase_mem_evictable_init - Initialize the Ephemeral memory the eviction -+ * mechanism. -+ * @kctx: The kbase context to initialize. -+ * -+ * Return: Zero on success or -errno on failure. -+ */ -+int kbase_mem_evictable_init(struct kbase_context *kctx); ++#define W(fmt, args...) \ ++ pr_warn("W : [File] : %s; [Line] : %d; [Func] : %s(); " \ ++ fmt "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) + -+/** -+ * kbase_mem_evictable_deinit - De-initialize the Ephemeral memory eviction -+ * mechanism. -+ * @kctx: The kbase context to de-initialize. -+ */ -+void kbase_mem_evictable_deinit(struct kbase_context *kctx); ++#define E(fmt, args...) \ ++ pr_err("E : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ ++ "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) + -+/** -+ * kbase_mem_grow_gpu_mapping - Grow the GPU mapping of an allocation -+ * @kctx: Context the region belongs to -+ * @reg: The GPU region -+ * @new_pages: The number of pages after the grow -+ * @old_pages: The number of pages before the grow -+ * -+ * Return: 0 on success, -errno on error. -+ * -+ * Expand the GPU mapping to encompass the new psychical pages which have -+ * been added to the allocation. -+ * -+ * Note: Caller must be holding the region lock. -+ */ -+int kbase_mem_grow_gpu_mapping(struct kbase_context *kctx, -+ struct kbase_va_region *reg, -+ u64 new_pages, u64 old_pages); ++/*-------------------------------------------------------*/ + -+/** -+ * kbase_mem_evictable_make - Make a physical allocation eligible for eviction -+ * @gpu_alloc: The physical allocation to make evictable -+ * -+ * Return: 0 on success, -errno on error. -+ * -+ * Take the provided region and make all the physical pages within it -+ * reclaimable by the kernel, updating the per-process VM stats as well. -+ * Remove any CPU mappings (as these can't be removed in the shrinker callback -+ * as mmap_sem might already be taken) but leave the GPU mapping intact as -+ * and until the shrinker reclaims the allocation. -+ * -+ * Note: Must be called with the region lock of the containing context. -+ */ -+int kbase_mem_evictable_make(struct kbase_mem_phy_alloc *gpu_alloc); ++/** 使用 D(), 以å进制的形å¼æ‰“å°å˜é‡ 'var' çš„ value. */ ++#define D_DEC(var) D(#var " = %d.", var) ++ ++#define E_DEC(var) E(#var " = %d.", var) ++ ++/** 使用 D(), 以å六进制的形å¼æ‰“å°å˜é‡ 'var' çš„ value. */ ++#define D_HEX(var) D(#var " = 0x%x.", var) ++ ++#define E_HEX(var) E(#var " = 0x%x.", var) + +/** -+ * kbase_mem_evictable_unmake - Remove a physical allocations eligibility for -+ * eviction. -+ * @alloc: The physical allocation to remove eviction eligibility from. -+ * -+ * Return: True if the allocation had its backing restored and false if -+ * it hasn't. -+ * -+ * Make the physical pages in the region no longer reclaimable and update the -+ * per-process stats, if the shrinker has already evicted the memory then -+ * re-allocate it if the region is still alive. -+ * -+ * Note: Must be called with the region lock of the containing context. ++ * 使用 D(), 以å六进制的形å¼, ++ * 打å°æŒ‡é’ˆç±»åž‹å˜é‡ 'ptr' çš„ value. + */ -+bool kbase_mem_evictable_unmake(struct kbase_mem_phy_alloc *alloc); ++#define D_PTR(ptr) D(#ptr " = %p.", ptr) + -+struct kbase_vmap_struct { -+ u64 gpu_addr; -+ struct kbase_mem_phy_alloc *cpu_alloc; -+ struct kbase_mem_phy_alloc *gpu_alloc; -+ struct tagged_addr *cpu_pages; -+ struct tagged_addr *gpu_pages; -+ void *addr; -+ size_t size; -+ bool sync_needed; -+}; ++#define E_PTR(ptr) E(#ptr " = %p.", ptr) ++ ++/** 使用 D(), æ‰“å° char 字串. */ ++#define D_STR(p_str) \ ++do { \ ++ if (!p_str) { \ ++ D(#p_str " = NULL."); \ ++ else \ ++ D(#p_str " = '%s'.", p_str); \ ++} while (0) + ++#define E_STR(p_str) \ ++do { \ ++ if (!p_str) \ ++ E(#p_str " = NULL."); \ ++ else \ ++ E(#p_str " = '%s'.", p_str); \ ++} while (0) + ++#ifdef ENABLE_DEBUG_LOG +/** -+ * kbase_vmap_prot - Map a GPU VA range into the kernel safely, only if the -+ * requested access permissions are supported -+ * @kctx: Context the VA range belongs to -+ * @gpu_addr: Start address of VA range -+ * @size: Size of VA range -+ * @prot_request: Flags indicating how the caller will then access the memory -+ * @map: Structure to be given to kbase_vunmap() on freeing -+ * -+ * Return: Kernel-accessible CPU pointer to the VA range, or NULL on error -+ * -+ * Map a GPU VA Range into the kernel. The VA range must be contained within a -+ * GPU memory region. Appropriate CPU cache-flushing operations are made as -+ * required, dependent on the CPU mapping for the memory region. -+ * -+ * This is safer than using kmap() on the pages directly, -+ * because the pages here are refcounted to prevent freeing (and hence reuse -+ * elsewhere in the system) until an kbase_vunmap() -+ * -+ * The flags in @prot_request should use KBASE_REG_{CPU,GPU}_{RD,WR}, to check -+ * whether the region should allow the intended access, and return an error if -+ * disallowed. This is essential for security of imported memory, particularly -+ * a user buf from SHM mapped into the process as RO. In that case, write -+ * access must be checked if the intention is for kernel to write to the -+ * memory. -+ * -+ * The checks are also there to help catch access errors on memory where -+ * security is not a concern: imported memory that is always RW, and memory -+ * that was allocated and owned by the process attached to @kctx. In this case, -+ * it helps to identify memory that was was mapped with the wrong access type. -+ * -+ * Note: KBASE_REG_GPU_{RD,WR} flags are currently supported for legacy cases -+ * where either the security of memory is solely dependent on those flags, or -+ * when userspace code was expecting only the GPU to access the memory (e.g. HW -+ * workarounds). -+ * -+ * All cache maintenance operations shall be ignored if the -+ * memory region has been imported. -+ * ++ * log 从 'p_start' 地å€å¼€å§‹çš„ 'len' 个字节的数æ®. + */ -+void *kbase_vmap_prot(struct kbase_context *kctx, u64 gpu_addr, size_t size, -+ unsigned long prot_request, struct kbase_vmap_struct *map); ++#define D_MEM(p_start, len) \ ++do { \ ++ int i = 0; \ ++ char *p = (char *)(p_start); \ ++ D("dump memory from addr of '" #p_start "', from %p, length %d' : ", \ ++ (p_start), \ ++ (len)); \ ++ pr_debug("\t\t"); \ ++ for (i = 0; i < (len); i++) \ ++ pr_debug("0x%02x, ", p[i]); \ ++ pr_debug("\n"); \ ++} while (0) ++#else ++#define D_MEM(...) ((void)0) ++#endif ++ ++/*-------------------------------------------------------*/ + +/** -+ * kbase_vmap - Map a GPU VA range into the kernel safely -+ * @kctx: Context the VA range belongs to -+ * @gpu_addr: Start address of VA range -+ * @size: Size of VA range -+ * @map: Structure to be given to kbase_vunmap() on freeing -+ * -+ * Return: Kernel-accessible CPU pointer to the VA range, or NULL on error -+ * -+ * Map a GPU VA Range into the kernel. The VA range must be contained within a -+ * GPU memory region. Appropriate CPU cache-flushing operations are made as -+ * required, dependent on the CPU mapping for the memory region. -+ * -+ * This is safer than using kmap() on the pages directly, -+ * because the pages here are refcounted to prevent freeing (and hence reuse -+ * elsewhere in the system) until an kbase_vunmap() -+ * -+ * kbase_vmap_prot() should be used in preference, since kbase_vmap() makes no -+ * checks to ensure the security of e.g. imported user bufs from RO SHM. -+ * -+ * Note: All cache maintenance operations shall be ignored if the memory region -+ * has been imported. ++ * 在特定æ¡ä»¶ä¸‹, 判定 error å‘生, ++ * å°†å˜é‡ 'ret_var' 设置 'err_code', ++ * log 输出对应的 Error Caution, ++ * 然åŽè·³è½¬ 'label' 指定的代ç å¤„执行. ++ * @param msg ++ * 纯字串形å¼çš„æ示信æ¯. ++ * @param ret_var ++ * 标识函数执行状æ€æˆ–者结果的å˜é‡, ++ * 将被设置具体的 Error Code. ++ * 通常是 'ret' or 'result'. ++ * @param err_code ++ * 表å¾ç‰¹å®š error 的常数标识, ++ * 通常是 å®çš„å½¢æ€. ++ * @param label ++ * 程åºå°†è¦è·³è½¬åˆ°çš„错误处ç†ä»£ç çš„æ ‡å·, ++ * 通常就是 'EXIT'. ++ * @param args... ++ * 对应 'msg_fmt' 实å‚中, ++ * '%s', '%d', ... 等转æ¢è¯´æ˜Žç¬¦çš„具体å¯å˜é•¿å®žå‚. + */ -+void *kbase_vmap(struct kbase_context *kctx, u64 gpu_addr, size_t size, -+ struct kbase_vmap_struct *map); ++#define SET_ERROR_AND_JUMP(msg_fmt, ret_var, err_code, label, args...) \ ++do { \ ++ E("To set '" #ret_var "' to %d('" #err_code "'), because : " msg_fmt, \ ++ (err_code), \ ++ ## args); \ ++ (ret_var) = (err_code); \ ++ goto label; \ ++} while (0) + -+/** -+ * kbase_vunmap - Unmap a GPU VA range from the kernel -+ * @kctx: Context the VA range belongs to -+ * @map: Structure describing the mapping from the corresponding kbase_vmap() -+ * call -+ * -+ * Unmaps a GPU VA range from the kernel, given its @map structure obtained -+ * from kbase_vmap(). Appropriate CPU cache-flushing operations are made as -+ * required, dependent on the CPU mapping for the memory region. -+ * -+ * The reference taken on pages during kbase_vmap() is released. -+ * -+ * Note: All cache maintenance operations shall be ignored if the memory region -+ * has been imported. ++/* ----------------------------------------------------------------------------- ++ * Types and Structures Definition ++ * ----------------------------------------------------------------------------- + */ -+void kbase_vunmap(struct kbase_context *kctx, struct kbase_vmap_struct *map); + -+/** @brief Allocate memory from kernel space and map it onto the GPU -+ * -+ * @param kctx The context used for the allocation/mapping -+ * @param size The size of the allocation in bytes -+ * @param handle An opaque structure used to contain the state needed to free the memory -+ * @return the VA for kernel space and GPU MMU ++/* ----------------------------------------------------------------------------- ++ * Global Functions' Prototype ++ * ----------------------------------------------------------------------------- + */ -+void *kbase_va_alloc(struct kbase_context *kctx, u32 size, struct kbase_hwc_dma_mapping *handle); + -+/** @brief Free/unmap memory allocated by kbase_va_alloc -+ * -+ * @param kctx The context used for the allocation/mapping -+ * @param handle An opaque structure returned by the kbase_va_alloc function. ++/* ----------------------------------------------------------------------------- ++ * Inline Functions Implementation ++ * ----------------------------------------------------------------------------- + */ -+void kbase_va_free(struct kbase_context *kctx, struct kbase_hwc_dma_mapping *handle); + -+extern const struct vm_operations_struct kbase_vm_ops; ++#ifdef __cplusplus ++} ++#endif + -+#endif /* _KBASE_MEM_LINUX_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_lowlevel.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_lowlevel.h ++#endif /* __CUSTOM_LOG_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/rk.c b/drivers/gpu/arm/mali400/mali/platform/rk/rk.c new file mode 100755 -index 000000000000..f4e88491327e +index 000000000..2b412b5ec --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_lowlevel.h -@@ -0,0 +1,89 @@ ++++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk.c +@@ -0,0 +1,721 @@ +/* -+ * -+ * (C) COPYRIGHT 2012-2014,2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT RockChip Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms + * of such GNU licence. ++ */ ++ ++/** ++ * @file rk.c ++ * implementation of platform_specific_code on rk platforms, such as rk3328h. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * mali_device_driver(MDD) includes 2 parts : ++ * .DP : platform_dependent_part : ++ * located in /mali/platform// ++ * .DP : common_part : ++ * common part implemented by ARM. + */ + ++#define ENABLE_DEBUG_LOG ++#include "custom_log.h" + ++#include ++#include ++#include ++#include ++#include ++#include ++#ifdef CONFIG_PM ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include + ++#include ++#include "mali_kernel_common.h" ++#include "../../common/mali_osk_mali.h" + ++/*---------------------------------------------------------------------------*/ + -+#ifndef _KBASE_MEM_LOWLEVEL_H -+#define _KBASE_MEM_LOWLEVEL_H ++u32 mali_group_error; + -+#ifndef _KBASE_H_ -+#error "Don't include this file directly, use mali_kbase.h instead" -+#endif ++/*---------------------------------------------------------------------------*/ + -+#include ++#define DEFAULT_UTILISATION_PERIOD_IN_MS (100) + -+/** -+ * @brief Flags for kbase_phy_allocator_pages_alloc ++/* ++ * rk_platform_context_of_mali_device. + */ -+#define KBASE_PHY_PAGES_FLAG_DEFAULT (0) /** Default allocation flag */ -+#define KBASE_PHY_PAGES_FLAG_CLEAR (1 << 0) /** Clear the pages after allocation */ -+#define KBASE_PHY_PAGES_FLAG_POISON (1 << 1) /** Fill the memory with a poison value */ -+ -+#define KBASE_PHY_PAGES_SUPPORTED_FLAGS (KBASE_PHY_PAGES_FLAG_DEFAULT|KBASE_PHY_PAGES_FLAG_CLEAR|KBASE_PHY_PAGES_FLAG_POISON) -+ -+#define KBASE_PHY_PAGES_POISON_VALUE 0xFD /** Value to fill the memory with when KBASE_PHY_PAGES_FLAG_POISON is set */ -+ -+enum kbase_sync_type { -+ KBASE_SYNC_TO_CPU, -+ KBASE_SYNC_TO_DEVICE ++struct rk_context { ++ /* mali device. */ ++ struct device *dev; ++ /* is the GPU powered on? */ ++ bool is_powered; ++ /* debug only, the period in ms to count gpu_utilisation. */ ++ unsigned int utilisation_period; +}; + -+struct tagged_addr { phys_addr_t tagged_addr; }; ++struct rk_context *s_rk_context; + -+#define HUGE_PAGE (1u << 0) -+#define HUGE_HEAD (1u << 1) -+#define FROM_PARTIAL (1u << 2) ++/*---------------------------------------------------------------------------*/ + -+static inline phys_addr_t as_phys_addr_t(struct tagged_addr t) ++#ifdef CONFIG_MALI_DEVFREQ ++static ssize_t utilisation_period_show(struct device *dev, ++ struct device_attribute *attr, ++ char *buf) +{ -+ return t.tagged_addr & PAGE_MASK; -+} ++ struct rk_context *platform = s_rk_context; ++ ssize_t ret = 0; + -+static inline struct tagged_addr as_tagged(phys_addr_t phys) -+{ -+ struct tagged_addr t; ++ ret += snprintf(buf, PAGE_SIZE, "%u\n", platform->utilisation_period); + -+ t.tagged_addr = phys & PAGE_MASK; -+ return t; ++ return ret; +} + -+static inline struct tagged_addr as_tagged_tag(phys_addr_t phys, int tag) ++static ssize_t utilisation_period_store(struct device *dev, ++ struct device_attribute *attr, ++ const char *buf, ++ size_t count) +{ -+ struct tagged_addr t; ++ struct rk_context *platform = s_rk_context; ++ int ret = 0; + -+ t.tagged_addr = (phys & PAGE_MASK) | (tag & ~PAGE_MASK); -+ return t; -+} ++ ret = kstrtouint(buf, 0, &platform->utilisation_period); ++ if (ret) { ++ E("invalid input period : %s.", buf); ++ return ret; ++ } ++ D("set utilisation_period to '%d'.", platform->utilisation_period); + -+static inline bool is_huge(struct tagged_addr t) -+{ -+ return t.tagged_addr & HUGE_PAGE; ++ return count; +} + -+static inline bool is_huge_head(struct tagged_addr t) ++static ssize_t utilisation_show(struct device *dev, ++ struct device_attribute *attr, ++ char *buf) +{ -+ int mask = HUGE_HEAD | HUGE_PAGE; ++ struct rk_context *platform = s_rk_context; ++ struct mali_device *mdev = dev_get_drvdata(dev); ++ ssize_t ret = 0; ++ unsigned long period_in_us = platform->utilisation_period * 1000; ++ unsigned long total_time; ++ unsigned long busy_time; ++ unsigned long utilisation; + -+ return mask == (t.tagged_addr & mask); -+} ++ mali_pm_reset_dvfs_utilisation(mdev); ++ usleep_range(period_in_us, period_in_us + 100); ++ mali_pm_get_dvfs_utilisation(mdev, &total_time, &busy_time); + -+static inline bool is_partial(struct tagged_addr t) -+{ -+ return t.tagged_addr & FROM_PARTIAL; -+} ++ /* 'devfreq_dev_profile' instance registered to devfreq ++ * also uses mali_pm_reset_dvfs_utilisation() ++ * and mali_pm_get_dvfs_utilisation(). ++ * So, it's better to disable GPU DVFS before reading this node. ++ */ ++ D("total_time : %lu, busy_time : %lu.", total_time, busy_time); + -+#endif /* _KBASE_LOWLEVEL_H */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool.c -new file mode 100755 -index 000000000000..696730ac5b2b ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool.c -@@ -0,0 +1,651 @@ -+/* -+ * -+ * (C) COPYRIGHT 2015-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ utilisation = busy_time / (total_time / 100); ++ ret += snprintf(buf, PAGE_SIZE, "%lu\n", utilisation); + ++ return ret; ++} + ++static DEVICE_ATTR_RW(utilisation_period); ++static DEVICE_ATTR_RO(utilisation); ++#endif + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++static int rk_context_create_sysfs_files(struct device *dev) ++{ ++#ifdef CONFIG_MALI_DEVFREQ ++ int ret; + -+#define pool_dbg(pool, format, ...) \ -+ dev_dbg(pool->kbdev->dev, "%s-pool [%zu/%zu]: " format, \ -+ (pool->next_pool) ? "kctx" : "kbdev", \ -+ kbase_mem_pool_size(pool), \ -+ kbase_mem_pool_max_size(pool), \ -+ ##__VA_ARGS__) ++ ret = device_create_file(dev, &dev_attr_utilisation_period); ++ if (ret) { ++ E("fail to create sysfs file 'utilisation_period'."); ++ goto out; ++ } + -+#define NOT_DIRTY false -+#define NOT_RECLAIMED false ++ ret = device_create_file(dev, &dev_attr_utilisation); ++ if (ret) { ++ E("fail to create sysfs file 'utilisation'."); ++ goto remove_utilisation_period; ++ } + -+static inline void kbase_mem_pool_lock(struct kbase_mem_pool *pool) -+{ -+ spin_lock(&pool->pool_lock); ++ return 0; ++ ++remove_utilisation_period: ++ device_remove_file(dev, &dev_attr_utilisation_period); ++out: ++ return ret; ++#else ++ return 0; ++#endif +} + -+static inline void kbase_mem_pool_unlock(struct kbase_mem_pool *pool) ++static void rk_context_remove_sysfs_files(struct device *dev) +{ -+ spin_unlock(&pool->pool_lock); ++#ifdef CONFIG_MALI_DEVFREQ ++ device_remove_file(dev, &dev_attr_utilisation_period); ++ device_remove_file(dev, &dev_attr_utilisation); ++#endif +} + -+static size_t kbase_mem_pool_capacity(struct kbase_mem_pool *pool) ++/*---------------------------------------------------------------------------*/ ++ ++/* ++ * Init rk_platform_context of mali_device. ++ */ ++static int rk_context_init(struct platform_device *pdev) +{ -+ ssize_t max_size = kbase_mem_pool_max_size(pool); -+ ssize_t cur_size = kbase_mem_pool_size(pool); ++ int ret = 0; ++ struct device *dev = &pdev->dev; ++ struct rk_context *platform; /* platform_context */ + -+ return max(max_size - cur_size, (ssize_t)0); -+} ++ platform = kzalloc(sizeof(*platform), GFP_KERNEL); ++ if (!platform) { ++ E("no mem."); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+static bool kbase_mem_pool_is_full(struct kbase_mem_pool *pool) -+{ -+ return kbase_mem_pool_size(pool) >= kbase_mem_pool_max_size(pool); -+} ++ platform->dev = dev; ++ platform->is_powered = false; + -+static bool kbase_mem_pool_is_empty(struct kbase_mem_pool *pool) -+{ -+ return kbase_mem_pool_size(pool) == 0; -+} ++ platform->utilisation_period = DEFAULT_UTILISATION_PERIOD_IN_MS; + -+static void kbase_mem_pool_add_locked(struct kbase_mem_pool *pool, -+ struct page *p) -+{ -+ lockdep_assert_held(&pool->pool_lock); ++ ret = rk_context_create_sysfs_files(dev); ++ if (ret) { ++ E("fail to create sysfs files, ret = %d", ret); ++ goto EXIT; ++ } + -+ list_add(&p->lru, &pool->page_list); -+ pool->cur_size++; ++ s_rk_context = platform; + -+ zone_page_state_add(1, page_zone(p), NR_SLAB_RECLAIMABLE); ++ pm_runtime_set_autosuspend_delay(dev, 1000); ++ pm_runtime_use_autosuspend(dev); ++ pm_runtime_enable(dev); + -+ pool_dbg(pool, "added page\n"); ++EXIT: ++ return ret; +} + -+static void kbase_mem_pool_add(struct kbase_mem_pool *pool, struct page *p) ++static void rk_context_deinit(struct platform_device *pdev) +{ -+ kbase_mem_pool_lock(pool); -+ kbase_mem_pool_add_locked(pool, p); -+ kbase_mem_pool_unlock(pool); -+} ++ struct device *dev = &pdev->dev; ++ struct rk_context *platform = s_rk_context; + -+static void kbase_mem_pool_add_list_locked(struct kbase_mem_pool *pool, -+ struct list_head *page_list, size_t nr_pages) -+{ -+ struct page *p; ++ pm_runtime_disable(dev); + -+ lockdep_assert_held(&pool->pool_lock); ++ s_rk_context = NULL; ++ ++ rk_context_remove_sysfs_files(dev); + -+ list_for_each_entry(p, page_list, lru) { -+ zone_page_state_add(1, page_zone(p), NR_SLAB_RECLAIMABLE); ++ if (platform) { ++ platform->is_powered = false; ++ platform->dev = NULL; ++ kfree(platform); + } ++} + -+ list_splice(page_list, &pool->page_list); -+ pool->cur_size += nr_pages; ++/*---------------------------------------------------------------------------*/ ++/* for devfreq cooling. */ + -+ pool_dbg(pool, "added %zu pages\n", nr_pages); -+} ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) + -+static void kbase_mem_pool_add_list(struct kbase_mem_pool *pool, -+ struct list_head *page_list, size_t nr_pages) -+{ -+ kbase_mem_pool_lock(pool); -+ kbase_mem_pool_add_list_locked(pool, page_list, nr_pages); -+ kbase_mem_pool_unlock(pool); -+} ++#define FALLBACK_STATIC_TEMPERATURE 55000 + -+static struct page *kbase_mem_pool_remove_locked(struct kbase_mem_pool *pool) -+{ -+ struct page *p; ++static u32 dynamic_coefficient; ++static u32 static_coefficient; ++static s32 ts[4]; ++static struct thermal_zone_device *gpu_tz; ++static struct ipa_power_model_data *model_data; + -+ lockdep_assert_held(&pool->pool_lock); ++/* Calculate gpu static power example for reference */ ++static unsigned long rk_model_static_power(struct devfreq *devfreq, ++ unsigned long voltage) ++{ ++ int temperature, temp; ++ int temp_squared, temp_cubed, temp_scaling_factor; ++ const unsigned long voltage_cubed = (voltage * voltage * voltage) >> 10; ++ unsigned long static_power; + -+ if (kbase_mem_pool_is_empty(pool)) -+ return NULL; ++ if (gpu_tz) { ++ int ret; + -+ p = list_first_entry(&pool->page_list, struct page, lru); -+ list_del_init(&p->lru); -+ pool->cur_size--; ++ ret = gpu_tz->ops->get_temp(gpu_tz, &temperature); ++ if (ret) { ++ MALI_DEBUG_PRINT(2, ("fail to read temp: %d\n", ret)); ++ temperature = FALLBACK_STATIC_TEMPERATURE; ++ } ++ } else { ++ temperature = FALLBACK_STATIC_TEMPERATURE; ++ } + -+ zone_page_state_add(-1, page_zone(p), NR_SLAB_RECLAIMABLE); ++ /* Calculate the temperature scaling factor. To be applied to the ++ * voltage scaled power. ++ */ ++ temp = temperature / 1000; ++ temp_squared = temp * temp; ++ temp_cubed = temp_squared * temp; ++ temp_scaling_factor = ++ (ts[3] * temp_cubed) ++ + (ts[2] * temp_squared) ++ + (ts[1] * temp) ++ + ts[0]; + -+ pool_dbg(pool, "removed page\n"); ++ static_power = (((static_coefficient * voltage_cubed) >> 20) ++ * temp_scaling_factor) ++ / 1000000; + -+ return p; ++ return static_power; +} + -+static struct page *kbase_mem_pool_remove(struct kbase_mem_pool *pool) ++/* Calculate gpu dynamic power example for reference */ ++static unsigned long rk_model_dynamic_power(struct devfreq *devfreq, ++ unsigned long freq, ++ unsigned long voltage) +{ -+ struct page *p; ++ /* The inputs: freq (f) is in Hz, and voltage (v) in mV. ++ * The coefficient (c) is in mW/(MHz mV mV). ++ * ++ * This function calculates the dynamic power after this formula: ++ * Pdyn (mW) = c (mW/(MHz*mV*mV)) * v (mV) * v (mV) * f (MHz) ++ */ ++ const unsigned long v2 = (voltage * voltage) / 1000; /* m*(V*V) */ ++ const unsigned long f_mhz = freq / 1000000; /* MHz */ ++ unsigned long dynamic_power; + -+ kbase_mem_pool_lock(pool); -+ p = kbase_mem_pool_remove_locked(pool); -+ kbase_mem_pool_unlock(pool); ++ dynamic_power = (dynamic_coefficient * v2 * f_mhz) / 1000000; /* mW */ + -+ return p; ++ return dynamic_power; +} + -+static void kbase_mem_pool_sync_page(struct kbase_mem_pool *pool, -+ struct page *p) ++static struct devfreq_cooling_power rk_cooling_ops = { ++ .get_static_power = rk_model_static_power, ++ .get_dynamic_power = rk_model_dynamic_power, ++}; ++ ++static unsigned long mali_devfreq_get_static_power(struct devfreq *devfreq, ++ unsigned long voltage) +{ -+ struct device *dev = pool->kbdev->dev; -+ dma_sync_single_for_device(dev, kbase_dma_addr(p), -+ (PAGE_SIZE << pool->order), DMA_BIDIRECTIONAL); ++ return rockchip_ipa_get_static_power(model_data, voltage); +} + -+static void kbase_mem_pool_zero_page(struct kbase_mem_pool *pool, -+ struct page *p) ++static int power_model_simple_init(struct platform_device *pdev) +{ -+ int i; ++ struct device_node *power_model_node; ++ const char *tz_name; ++ u32 static_power, dynamic_power; ++ u32 voltage, voltage_squared, voltage_cubed, frequency; + -+ for (i = 0; i < (1U << pool->order); i++) -+ clear_highpage(p+i); ++ if (of_find_compatible_node(pdev->dev.of_node, NULL, "simple-power-model")) { ++ of_property_read_u32(pdev->dev.of_node, ++ "dynamic-power-coefficient", ++ (u32 *)&rk_cooling_ops.dyn_power_coeff); ++ model_data = rockchip_ipa_power_model_init(&pdev->dev, ++ "gpu_leakage"); ++ if (IS_ERR_OR_NULL(model_data)) { ++ model_data = NULL; ++ dev_err(&pdev->dev, "failed to initialize power model\n"); ++ } else if (model_data->dynamic_coefficient) { ++ rk_cooling_ops.dyn_power_coeff = ++ model_data->dynamic_coefficient; ++ rk_cooling_ops.get_dynamic_power = NULL; ++ rk_cooling_ops.get_static_power = mali_devfreq_get_static_power; ++ } ++ if (!rk_cooling_ops.dyn_power_coeff) { ++ dev_err(&pdev->dev, "failed to get dynamic-coefficient\n"); ++ return -EINVAL; ++ } + -+ kbase_mem_pool_sync_page(pool, p); -+} ++ return 0; ++ } + -+static void kbase_mem_pool_spill(struct kbase_mem_pool *next_pool, -+ struct page *p) -+{ -+ /* Zero page before spilling */ -+ kbase_mem_pool_zero_page(next_pool, p); ++ power_model_node = of_get_child_by_name(pdev->dev.of_node, ++ "power_model"); ++ if (!power_model_node) { ++ dev_err(&pdev->dev, "could not find power_model node\n"); ++ return -ENODEV; ++ } ++ if (!of_device_is_compatible(power_model_node, ++ "arm,mali-simple-power-model")) { ++ dev_err(&pdev->dev, "power_model incompatible with simple power model\n"); ++ return -ENODEV; ++ } + -+ kbase_mem_pool_add(next_pool, p); -+} ++ if (of_property_read_string(power_model_node, "thermal-zone", ++ &tz_name)) { ++ dev_err(&pdev->dev, "ts in power_model not available\n"); ++ return -EINVAL; ++ } + -+struct page *kbase_mem_alloc_page(struct kbase_mem_pool *pool) -+{ -+ struct page *p; -+ gfp_t gfp; -+ struct device *dev = pool->kbdev->dev; -+ dma_addr_t dma_addr; -+ int i; ++ gpu_tz = thermal_zone_get_zone_by_name(tz_name); ++ if (IS_ERR(gpu_tz)) { ++ pr_warn_ratelimited("Error getting gpu thermal zone '%s'(%ld), not yet ready?\n", ++ tz_name, ++ PTR_ERR(gpu_tz)); ++ gpu_tz = NULL; ++ } + -+#if defined(CONFIG_ARM) && !defined(CONFIG_HAVE_DMA_ATTRS) && \ -+ LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) -+ /* DMA cache sync fails for HIGHMEM before 3.5 on ARM */ -+ gfp = GFP_USER | __GFP_ZERO; -+#else -+ gfp = GFP_HIGHUSER | __GFP_ZERO; -+#endif ++ if (of_property_read_u32(power_model_node, "static-power", ++ &static_power)) { ++ dev_err(&pdev->dev, "static-power in power_model not available\n"); ++ return -EINVAL; ++ } ++ if (of_property_read_u32(power_model_node, "dynamic-power", ++ &dynamic_power)) { ++ dev_err(&pdev->dev, "dynamic-power in power_model not available\n"); ++ return -EINVAL; ++ } ++ if (of_property_read_u32(power_model_node, "voltage", ++ &voltage)) { ++ dev_err(&pdev->dev, "voltage in power_model not available\n"); ++ return -EINVAL; ++ } ++ if (of_property_read_u32(power_model_node, "frequency", ++ &frequency)) { ++ dev_err(&pdev->dev, "frequency in power_model not available\n"); ++ return -EINVAL; ++ } ++ voltage_squared = (voltage * voltage) / 1000; ++ voltage_cubed = voltage * voltage * voltage; ++ static_coefficient = (static_power << 20) / (voltage_cubed >> 10); ++ dynamic_coefficient = (((dynamic_power * 1000) / voltage_squared) ++ * 1000) / frequency; + -+ if (current->flags & PF_KTHREAD) { -+ /* Don't trigger OOM killer from kernel threads, e.g. when -+ * growing memory on GPU page fault */ -+ gfp |= __GFP_NORETRY; ++ if (of_property_read_u32_array(power_model_node, "ts", (u32 *)ts, 4)) { ++ dev_err(&pdev->dev, "ts in power_model not available\n"); ++ return -EINVAL; + } + -+ /* don't warn on higer order failures */ -+ if (pool->order) -+ gfp |= __GFP_NOWARN; ++ return 0; ++} + -+ p = alloc_pages(gfp, pool->order); -+ if (!p) -+ return NULL; ++#endif + -+ dma_addr = dma_map_page(dev, p, 0, (PAGE_SIZE << pool->order), -+ DMA_BIDIRECTIONAL); -+ if (dma_mapping_error(dev, dma_addr)) { -+ __free_pages(p, pool->order); -+ return NULL; -+ } ++/*---------------------------------------------------------------------------*/ + -+ WARN_ON(dma_addr != page_to_phys(p)); -+ for (i = 0; i < (1u << pool->order); i++) -+ kbase_set_dma_addr(p+i, dma_addr + PAGE_SIZE * i); ++#ifdef CONFIG_PM + -+ return p; ++static int rk_platform_enable_clk_gpu(struct device *dev) ++{ ++ int ret = 0; ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_HAVE_CLK) ++ struct mali_device *mdev = dev_get_drvdata(dev); ++ ++ ret = clk_bulk_enable(mdev->num_clks, mdev->clks); ++#endif ++ return ret; +} + -+static void kbase_mem_pool_free_page(struct kbase_mem_pool *pool, -+ struct page *p) ++static void rk_platform_disable_clk_gpu(struct device *dev) +{ -+ struct device *dev = pool->kbdev->dev; -+ dma_addr_t dma_addr = kbase_dma_addr(p); -+ int i; -+ -+ dma_unmap_page(dev, dma_addr, (PAGE_SIZE << pool->order), -+ DMA_BIDIRECTIONAL); -+ for (i = 0; i < (1u << pool->order); i++) -+ kbase_clear_dma_addr(p+i); -+ __free_pages(p, pool->order); ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_HAVE_CLK) ++ struct mali_device *mdev = dev_get_drvdata(dev); + -+ pool_dbg(pool, "freed page to kernel\n"); ++ clk_bulk_disable(mdev->num_clks, mdev->clks); ++#endif +} + -+static size_t kbase_mem_pool_shrink_locked(struct kbase_mem_pool *pool, -+ size_t nr_to_shrink) ++static int rk_platform_enable_gpu_regulator(struct device *dev) +{ -+ struct page *p; -+ size_t i; ++ int ret = 0; ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_REGULATOR) ++ struct mali_device *mdev = dev_get_drvdata(dev); + -+ lockdep_assert_held(&pool->pool_lock); ++ if (mdev->regulator) ++ ret = regulator_enable(mdev->regulator); ++#endif ++ return ret; ++} + -+ for (i = 0; i < nr_to_shrink && !kbase_mem_pool_is_empty(pool); i++) { -+ p = kbase_mem_pool_remove_locked(pool); -+ kbase_mem_pool_free_page(pool, p); -+ } ++static void rk_platform_disable_gpu_regulator(struct device *dev) ++{ ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_REGULATOR) ++ struct mali_device *mdev = dev_get_drvdata(dev); + -+ return i; ++ if (mdev->regulator) ++ regulator_disable(mdev->regulator); ++#endif +} + -+static size_t kbase_mem_pool_shrink(struct kbase_mem_pool *pool, -+ size_t nr_to_shrink) ++static int rk_platform_power_on_gpu(struct device *dev) +{ -+ size_t nr_freed; ++ struct rk_context *platform = s_rk_context; ++ int ret = 0; + -+ kbase_mem_pool_lock(pool); -+ nr_freed = kbase_mem_pool_shrink_locked(pool, nr_to_shrink); -+ kbase_mem_pool_unlock(pool); ++ if (!(platform->is_powered)) { ++ ret = rk_platform_enable_clk_gpu(dev); ++ if (ret) { ++ E("fail to enable clk_gpu, ret : %d.", ret); ++ goto fail_to_enable_clk; ++ } + -+ return nr_freed; -+} ++ ret = rk_platform_enable_gpu_regulator(dev); ++ if (ret) { ++ E("fail to enable vdd_gpu, ret : %d.", ret); ++ goto fail_to_enable_regulator; ++ } + -+int kbase_mem_pool_grow(struct kbase_mem_pool *pool, -+ size_t nr_to_grow) -+{ -+ struct page *p; -+ size_t i; ++ if (cpu_is_rk3528()) { ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_HAVE_CLK) ++ struct mali_device *mdev = dev_get_drvdata(dev); + -+ for (i = 0; i < nr_to_grow; i++) { -+ p = kbase_mem_alloc_page(pool); -+ if (!p) -+ return -ENOMEM; -+ kbase_mem_pool_add(pool, p); ++ clk_set_rate(mdev->clock, mdev->current_freq); ++#endif ++ } ++ platform->is_powered = true; + } + + return 0; -+} + -+void kbase_mem_pool_trim(struct kbase_mem_pool *pool, size_t new_size) -+{ -+ size_t cur_size; -+ int err = 0; ++fail_to_enable_regulator: ++ rk_platform_disable_clk_gpu(dev); + -+ cur_size = kbase_mem_pool_size(pool); ++fail_to_enable_clk: ++ return ret; ++} + -+ if (new_size > pool->max_size) -+ new_size = pool->max_size; ++static void rk_platform_power_off_gpu(struct device *dev) ++{ ++ struct rk_context *platform = s_rk_context; + -+ if (new_size < cur_size) -+ kbase_mem_pool_shrink(pool, cur_size - new_size); -+ else if (new_size > cur_size) -+ err = kbase_mem_pool_grow(pool, new_size - cur_size); ++ if (platform->is_powered) { ++ if (cpu_is_rk3528()) { ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_HAVE_CLK) ++ struct mali_device *mdev = dev_get_drvdata(dev); + -+ if (err) { -+ size_t grown_size = kbase_mem_pool_size(pool); ++ //use normal pll 200M for gpu when suspend ++ clk_set_rate(mdev->clock, 200000000); ++#endif ++ } ++ rk_platform_disable_clk_gpu(dev); ++ rk_platform_disable_gpu_regulator(dev); + -+ dev_warn(pool->kbdev->dev, -+ "Mem pool not grown to the required size of %zu bytes, grown for additional %zu bytes instead!\n", -+ (new_size - cur_size), (grown_size - cur_size)); ++ platform->is_powered = false; + } +} + -+void kbase_mem_pool_set_max_size(struct kbase_mem_pool *pool, size_t max_size) ++int rk_platform_init_opp_table(struct device *dev) +{ -+ size_t cur_size; -+ size_t nr_to_shrink; ++ return rockchip_init_opp_table(dev, NULL, "gpu_leakage", "mali"); ++} + -+ kbase_mem_pool_lock(pool); ++static int mali_runtime_suspend(struct device *device) ++{ ++ int ret = 0; + -+ pool->max_size = max_size; ++ MALI_DEBUG_PRINT(4, ("mali_runtime_suspend() called\n")); + -+ cur_size = kbase_mem_pool_size(pool); -+ if (max_size < cur_size) { -+ nr_to_shrink = cur_size - max_size; -+ kbase_mem_pool_shrink_locked(pool, nr_to_shrink); ++ if (device->driver && ++ device->driver->pm && ++ device->driver->pm->runtime_suspend) { ++ /* Need to notify Mali driver about this event */ ++ ret = device->driver->pm->runtime_suspend(device); + } + -+ kbase_mem_pool_unlock(pool); -+} -+ -+ -+static unsigned long kbase_mem_pool_reclaim_count_objects(struct shrinker *s, -+ struct shrink_control *sc) -+{ -+ struct kbase_mem_pool *pool; ++ if (!ret) ++ rk_platform_power_off_gpu(device); + -+ pool = container_of(s, struct kbase_mem_pool, reclaim); -+ pool_dbg(pool, "reclaim count: %zu\n", kbase_mem_pool_size(pool)); -+ return kbase_mem_pool_size(pool); ++ return ret; +} + -+static unsigned long kbase_mem_pool_reclaim_scan_objects(struct shrinker *s, -+ struct shrink_control *sc) ++static int mali_runtime_resume(struct device *device) +{ -+ struct kbase_mem_pool *pool; -+ unsigned long freed; -+ -+ pool = container_of(s, struct kbase_mem_pool, reclaim); ++ int ret = 0; + -+ pool_dbg(pool, "reclaim scan %ld:\n", sc->nr_to_scan); ++ MALI_DEBUG_PRINT(4, ("mali_runtime_resume() called\n")); + -+ freed = kbase_mem_pool_shrink(pool, sc->nr_to_scan); ++ rk_platform_power_on_gpu(device); + -+ pool_dbg(pool, "reclaim freed %ld pages\n", freed); ++ if (device->driver && ++ device->driver->pm && ++ device->driver->pm->runtime_resume) { ++ /* Need to notify Mali driver about this event */ ++ ret = device->driver->pm->runtime_resume(device); ++ } + -+ return freed; ++ return ret; +} + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) -+static int kbase_mem_pool_reclaim_shrink(struct shrinker *s, -+ struct shrink_control *sc) ++static int mali_runtime_idle(struct device *device) +{ -+ if (sc->nr_to_scan == 0) -+ return kbase_mem_pool_reclaim_count_objects(s, sc); ++ int ret = 0; + -+ return kbase_mem_pool_reclaim_scan_objects(s, sc); ++ MALI_DEBUG_PRINT(4, ("mali_runtime_idle() called\n")); ++ ++ if (device->driver && ++ device->driver->pm && ++ device->driver->pm->runtime_idle) { ++ /* Need to notify Mali driver about this event */ ++ ret = device->driver->pm->runtime_idle(device); ++ if (ret) ++ return ret; ++ } ++ ++ return 0; +} +#endif + -+int kbase_mem_pool_init(struct kbase_mem_pool *pool, -+ size_t max_size, -+ size_t order, -+ struct kbase_device *kbdev, -+ struct kbase_mem_pool *next_pool) ++static int mali_os_suspend(struct device *device) +{ -+ pool->cur_size = 0; -+ pool->max_size = max_size; -+ pool->order = order; -+ pool->kbdev = kbdev; -+ pool->next_pool = next_pool; ++ int ret = 0; + -+ spin_lock_init(&pool->pool_lock); -+ INIT_LIST_HEAD(&pool->page_list); ++ MALI_DEBUG_PRINT(4, ("mali_os_suspend() called\n")); + -+ /* Register shrinker */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) -+ pool->reclaim.shrink = kbase_mem_pool_reclaim_shrink; -+#else -+ pool->reclaim.count_objects = kbase_mem_pool_reclaim_count_objects; -+ pool->reclaim.scan_objects = kbase_mem_pool_reclaim_scan_objects; -+#endif -+ pool->reclaim.seeks = DEFAULT_SEEKS; -+ /* Kernel versions prior to 3.1 : -+ * struct shrinker does not define batch */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) -+ pool->reclaim.batch = 0; -+#endif -+ register_shrinker(&pool->reclaim); ++ if (device->driver && ++ device->driver->pm && ++ device->driver->pm->suspend) { ++ /* Need to notify Mali driver about this event */ ++ ret = device->driver->pm->suspend(device); ++ } + -+ pool_dbg(pool, "initialized\n"); ++ if (!ret) ++ rk_platform_power_off_gpu(device); + -+ return 0; ++ return ret; +} + -+void kbase_mem_pool_term(struct kbase_mem_pool *pool) ++static int mali_os_resume(struct device *device) +{ -+ struct kbase_mem_pool *next_pool = pool->next_pool; -+ struct page *p; -+ size_t nr_to_spill = 0; -+ LIST_HEAD(spill_list); -+ int i; -+ -+ pool_dbg(pool, "terminate()\n"); -+ -+ unregister_shrinker(&pool->reclaim); ++ int ret = 0; + -+ kbase_mem_pool_lock(pool); -+ pool->max_size = 0; ++ MALI_DEBUG_PRINT(4, ("mali_os_resume() called\n")); + -+ if (next_pool && !kbase_mem_pool_is_full(next_pool)) { -+ /* Spill to next pool (may overspill) */ -+ nr_to_spill = kbase_mem_pool_capacity(next_pool); -+ nr_to_spill = min(kbase_mem_pool_size(pool), nr_to_spill); ++ rk_platform_power_on_gpu(device); + -+ /* Zero pages first without holding the next_pool lock */ -+ for (i = 0; i < nr_to_spill; i++) { -+ p = kbase_mem_pool_remove_locked(pool); -+ kbase_mem_pool_zero_page(pool, p); -+ list_add(&p->lru, &spill_list); -+ } ++ if (device->driver && ++ device->driver->pm && ++ device->driver->pm->resume) { ++ /* Need to notify Mali driver about this event */ ++ ret = device->driver->pm->resume(device); + } + -+ while (!kbase_mem_pool_is_empty(pool)) { -+ /* Free remaining pages to kernel */ -+ p = kbase_mem_pool_remove_locked(pool); -+ kbase_mem_pool_free_page(pool, p); -+ } ++ return ret; ++} + -+ kbase_mem_pool_unlock(pool); ++static int mali_os_freeze(struct device *device) ++{ ++ int ret = 0; + -+ if (next_pool && nr_to_spill) { -+ /* Add new page list to next_pool */ -+ kbase_mem_pool_add_list(next_pool, &spill_list, nr_to_spill); ++ MALI_DEBUG_PRINT(4, ("mali_os_freeze() called\n")); + -+ pool_dbg(pool, "terminate() spilled %zu pages\n", nr_to_spill); ++ if (device->driver && ++ device->driver->pm && ++ device->driver->pm->freeze) { ++ /* Need to notify Mali driver about this event */ ++ ret = device->driver->pm->freeze(device); + } + -+ pool_dbg(pool, "terminated\n"); ++ return ret; +} + -+struct page *kbase_mem_pool_alloc(struct kbase_mem_pool *pool) ++static int mali_os_thaw(struct device *device) +{ -+ struct page *p; -+ -+ do { -+ pool_dbg(pool, "alloc()\n"); -+ p = kbase_mem_pool_remove(pool); ++ int ret = 0; + -+ if (p) -+ return p; ++ MALI_DEBUG_PRINT(4, ("mali_os_thaw() called\n")); + -+ pool = pool->next_pool; -+ } while (pool); ++ if (device->driver && ++ device->driver->pm && ++ device->driver->pm->thaw) { ++ /* Need to notify Mali driver about this event */ ++ ret = device->driver->pm->thaw(device); ++ } + -+ return NULL; ++ return ret; +} + -+void kbase_mem_pool_free(struct kbase_mem_pool *pool, struct page *p, -+ bool dirty) -+{ -+ struct kbase_mem_pool *next_pool = pool->next_pool; ++static const struct dev_pm_ops mali_gpu_device_type_pm_ops = { ++ .suspend = mali_os_suspend, ++ .resume = mali_os_resume, ++ .freeze = mali_os_freeze, ++ .thaw = mali_os_thaw, ++#ifdef CONFIG_PM ++ .runtime_suspend = mali_runtime_suspend, ++ .runtime_resume = mali_runtime_resume, ++ .runtime_idle = mali_runtime_idle, ++#endif ++}; + -+ pool_dbg(pool, "free()\n"); ++static const struct device_type mali_gpu_device_device_type = { ++ .pm = &mali_gpu_device_type_pm_ops, ++}; + -+ if (!kbase_mem_pool_is_full(pool)) { -+ /* Add to our own pool */ -+ if (dirty) -+ kbase_mem_pool_sync_page(pool, p); ++/* ++ * platform_specific_data of platform_device of mali_gpu. ++ */ ++static const struct mali_gpu_device_data mali_gpu_data = { ++ .shared_mem_size = 1024 * 1024 * 1024, /* 1GB */ ++ .max_job_runtime = 60000, /* 60 seconds */ ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) ++ .gpu_cooling_ops = &rk_cooling_ops, ++#endif ++}; + -+ kbase_mem_pool_add(pool, p); -+ } else if (next_pool && !kbase_mem_pool_is_full(next_pool)) { -+ /* Spill to next pool */ -+ kbase_mem_pool_spill(next_pool, p); -+ } else { -+ /* Free page */ -+ kbase_mem_pool_free_page(pool, p); -+ } ++static void mali_platform_device_add_config(struct platform_device *pdev) ++{ ++ pdev->name = MALI_GPU_NAME_UTGARD, ++ pdev->id = 0; ++ pdev->dev.type = &mali_gpu_device_device_type; ++ pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask, ++ pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); +} + -+int kbase_mem_pool_alloc_pages(struct kbase_mem_pool *pool, size_t nr_4k_pages, -+ struct tagged_addr *pages, bool partial_allowed) ++/*---------------------------------------------------------------------------*/ ++/* platform_device_functions called by common_part. */ ++ ++int mali_platform_device_init(struct platform_device *pdev) +{ -+ struct page *p; -+ size_t nr_from_pool; -+ size_t i = 0; -+ int err = -ENOMEM; -+ size_t nr_pages_internal; ++ int err = 0; + -+ nr_pages_internal = nr_4k_pages / (1u << (pool->order)); ++ mali_platform_device_add_config(pdev); + -+ if (nr_pages_internal * (1u << pool->order) != nr_4k_pages) -+ return -EINVAL; ++ D("to add platform_specific_data to platform_device_of_mali."); ++ err = platform_device_add_data(pdev, ++ &mali_gpu_data, ++ sizeof(mali_gpu_data)); ++ if (err) { ++ E("fail to add platform_specific_data. err : %d.", err); ++ goto add_data_failed; ++ } + -+ pool_dbg(pool, "alloc_pages(4k=%zu):\n", nr_4k_pages); -+ pool_dbg(pool, "alloc_pages(internal=%zu):\n", nr_pages_internal); ++ err = rk_context_init(pdev); ++ if (err) { ++ E("fail to init rk_context. err : %d.", err); ++ goto init_rk_context_failed; ++ } + -+ /* Get pages from this pool */ -+ kbase_mem_pool_lock(pool); -+ nr_from_pool = min(nr_pages_internal, kbase_mem_pool_size(pool)); -+ while (nr_from_pool--) { -+ int j; -+ p = kbase_mem_pool_remove_locked(pool); -+ if (pool->order) { -+ pages[i++] = as_tagged_tag(page_to_phys(p), -+ HUGE_HEAD | HUGE_PAGE); -+ for (j = 1; j < (1u << pool->order); j++) -+ pages[i++] = as_tagged_tag(page_to_phys(p) + -+ PAGE_SIZE * j, -+ HUGE_PAGE); -+ } else { -+ pages[i++] = as_tagged(page_to_phys(p)); -+ } -+ } -+ kbase_mem_pool_unlock(pool); -+ -+ if (i != nr_4k_pages && pool->next_pool) { -+ /* Allocate via next pool */ -+ err = kbase_mem_pool_alloc_pages(pool->next_pool, -+ nr_4k_pages - i, pages + i, partial_allowed); -+ -+ if (err < 0) -+ goto err_rollback; -+ -+ i += err; -+ } else { -+ /* Get any remaining pages from kernel */ -+ while (i != nr_4k_pages) { -+ p = kbase_mem_alloc_page(pool); -+ if (!p) { -+ if (partial_allowed) -+ goto done; -+ else -+ goto err_rollback; -+ } -+ -+ if (pool->order) { -+ int j; -+ -+ pages[i++] = as_tagged_tag(page_to_phys(p), -+ HUGE_PAGE | -+ HUGE_HEAD); -+ for (j = 1; j < (1u << pool->order); j++) { -+ phys_addr_t phys; ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) ++ if (of_machine_is_compatible("rockchip,rk3036")) ++ return 0; + -+ phys = page_to_phys(p) + PAGE_SIZE * j; -+ pages[i++] = as_tagged_tag(phys, -+ HUGE_PAGE); -+ } -+ } else { -+ pages[i++] = as_tagged(page_to_phys(p)); -+ } -+ } ++ err = power_model_simple_init(pdev); ++ if (err) { ++ E("fail to init simple_power_model, err : %d.", err); ++ goto init_power_model_failed; + } ++#endif + -+done: -+ pool_dbg(pool, "alloc_pages(%zu) done\n", i); -+ -+ return i; ++ return 0; + -+err_rollback: -+ kbase_mem_pool_free_pages(pool, i, pages, NOT_DIRTY, NOT_RECLAIMED); ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) ++init_power_model_failed: ++ rk_context_deinit(pdev); ++#endif ++init_rk_context_failed: ++add_data_failed: + return err; +} + -+static void kbase_mem_pool_add_array(struct kbase_mem_pool *pool, -+ size_t nr_pages, struct tagged_addr *pages, -+ bool zero, bool sync) ++void mali_platform_device_deinit(struct platform_device *pdev) +{ -+ struct page *p; -+ size_t nr_to_pool = 0; -+ LIST_HEAD(new_page_list); -+ size_t i; ++ MALI_DEBUG_PRINT(4, ("mali_platform_device_unregister() called\n")); + -+ if (!nr_pages) -+ return; ++ rk_context_deinit(pdev); ++} +diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h b/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h +new file mode 100755 +index 000000000..bd939350c +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h +@@ -0,0 +1,37 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ---------------------------------------------------------------------------- ++ * File: rk_ext.h ++ * ++ * Desc: rk_ext_on_mali_ko 中的 通行定义等. ++ * ++ * Usage: ++ * ++ * Note: ++ * ++ * Author: ChenZhen ++ * ++ * Log: ++ * ++ * ---------------------------------------------------------------------------- ++ */ + -+ pool_dbg(pool, "add_array(%zu, zero=%d, sync=%d):\n", -+ nr_pages, zero, sync); ++#ifndef __RK_EXT_H__ ++#define __RK_EXT_H__ + -+ /* Zero/sync pages first without holding the pool lock */ -+ for (i = 0; i < nr_pages; i++) { -+ if (unlikely(!as_phys_addr_t(pages[i]))) -+ continue; ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ if (is_huge_head(pages[i]) || !is_huge(pages[i])) { -+ p = phys_to_page(as_phys_addr_t(pages[i])); -+ if (zero) -+ kbase_mem_pool_zero_page(pool, p); -+ else if (sync) -+ kbase_mem_pool_sync_page(pool, p); ++/*---------------------------------------------------------------------------*/ + -+ list_add(&p->lru, &new_page_list); -+ nr_to_pool++; -+ } -+ pages[i] = as_tagged(0); -+ } ++/** version of rk_ext on mali_ko, aka. rk_ko_ver. */ ++#define RK_KO_VER (5) + -+ /* Add new page list to pool */ -+ kbase_mem_pool_add_list(pool, &new_page_list, nr_to_pool); ++/*---------------------------------------------------------------------------*/ + -+ pool_dbg(pool, "add_array(%zu) added %zu pages\n", -+ nr_pages, nr_to_pool); ++#ifdef __cplusplus +} ++#endif + -+void kbase_mem_pool_free_pages(struct kbase_mem_pool *pool, size_t nr_pages, -+ struct tagged_addr *pages, bool dirty, bool reclaimed) -+{ -+ struct kbase_mem_pool *next_pool = pool->next_pool; -+ struct page *p; -+ size_t nr_to_pool; -+ LIST_HEAD(to_pool_list); -+ size_t i = 0; -+ -+ pool_dbg(pool, "free_pages(%zu):\n", nr_pages); -+ -+ if (!reclaimed) { -+ /* Add to this pool */ -+ nr_to_pool = kbase_mem_pool_capacity(pool); -+ nr_to_pool = min(nr_pages, nr_to_pool); -+ -+ kbase_mem_pool_add_array(pool, nr_to_pool, pages, false, dirty); -+ -+ i += nr_to_pool; ++#endif /* __RK_EXT_H__ */ + -+ if (i != nr_pages && next_pool) { -+ /* Spill to next pool (may overspill) */ -+ nr_to_pool = kbase_mem_pool_capacity(next_pool); -+ nr_to_pool = min(nr_pages - i, nr_to_pool); +diff --git a/drivers/gpu/arm/mali400/mali/readme.txt b/drivers/gpu/arm/mali400/mali/readme.txt +new file mode 100755 +index 000000000..6785ac933 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/readme.txt +@@ -0,0 +1,28 @@ ++Building the Mali Device Driver for Linux ++----------------------------------------- + -+ kbase_mem_pool_add_array(next_pool, nr_to_pool, -+ pages + i, true, dirty); -+ i += nr_to_pool; -+ } -+ } ++Build the Mali Device Driver for Linux by running the following make command: + -+ /* Free any remaining pages to kernel */ -+ for (; i < nr_pages; i++) { -+ if (unlikely(!as_phys_addr_t(pages[i]))) -+ continue; ++KDIR= USING_UMP= BUILD= make + -+ if (is_huge(pages[i]) && !is_huge_head(pages[i])) { -+ pages[i] = as_tagged(0); -+ continue; -+ } ++where ++ kdir_path: Path to your Linux Kernel directory ++ ump_option: 1 = Enable UMP support(*) ++ 0 = disable UMP support ++ build_option: debug = debug build of driver ++ release = release build of driver + -+ p = phys_to_page(as_phys_addr_t(pages[i])); ++(*) For newer Linux Kernels, the Module.symvers file for the UMP device driver ++ must be available. The UMP_SYMVERS_FILE variable in the Makefile should ++ point to this file. This file is generated when the UMP driver is built. + -+ if (reclaimed) -+ zone_page_state_add(-1, page_zone(p), -+ NR_SLAB_RECLAIMABLE); ++The result will be a mali.ko file, which can be loaded into the Linux kernel ++by using the insmod command. + -+ kbase_mem_pool_free_page(pool, p); -+ pages[i] = as_tagged(0); -+ } ++Use of UMP is not recommended. The dma-buf API in the Linux kernel has ++replaced UMP. The Mali Device Driver will be built with dma-buf support if the ++kernel config includes enabled dma-buf. + -+ pool_dbg(pool, "free_pages(%zu) done\n", nr_pages); -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool_debugfs.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool_debugfs.c ++The kernel needs to be provided with a platform_device struct for the Mali GPU ++device. See the mali_utgard.h header file for how to set up the Mali GPU ++resources. +diff --git a/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h b/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h new file mode 100755 -index 000000000000..319cf2568aba +index 000000000..0345fb169 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool_debugfs.c -@@ -0,0 +1,88 @@ ++++ b/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h +@@ -0,0 +1,131 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2015, 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010, 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef _MALI200_REGS_H_ ++#define _MALI200_REGS_H_ + ++/** ++ * Enum for management register addresses. ++ */ ++enum mali200_mgmt_reg { ++ MALI200_REG_ADDR_MGMT_VERSION = 0x1000, ++ MALI200_REG_ADDR_MGMT_CURRENT_REND_LIST_ADDR = 0x1004, ++ MALI200_REG_ADDR_MGMT_STATUS = 0x1008, ++ MALI200_REG_ADDR_MGMT_CTRL_MGMT = 0x100c, + -+#include -+#include -+ -+#include ++ MALI200_REG_ADDR_MGMT_INT_RAWSTAT = 0x1020, ++ MALI200_REG_ADDR_MGMT_INT_CLEAR = 0x1024, ++ MALI200_REG_ADDR_MGMT_INT_MASK = 0x1028, ++ MALI200_REG_ADDR_MGMT_INT_STATUS = 0x102c, + -+#ifdef CONFIG_DEBUG_FS ++ MALI200_REG_ADDR_MGMT_BUS_ERROR_STATUS = 0x1050, + -+static int kbase_mem_pool_debugfs_size_get(void *data, u64 *val) -+{ -+ struct kbase_mem_pool *pool = (struct kbase_mem_pool *)data; ++ MALI200_REG_ADDR_MGMT_PERF_CNT_0_ENABLE = 0x1080, ++ MALI200_REG_ADDR_MGMT_PERF_CNT_0_SRC = 0x1084, ++ MALI200_REG_ADDR_MGMT_PERF_CNT_0_LIMIT = 0x1088, ++ MALI200_REG_ADDR_MGMT_PERF_CNT_0_VALUE = 0x108c, + -+ *val = kbase_mem_pool_size(pool); ++ MALI200_REG_ADDR_MGMT_PERF_CNT_1_ENABLE = 0x10a0, ++ MALI200_REG_ADDR_MGMT_PERF_CNT_1_SRC = 0x10a4, ++ MALI200_REG_ADDR_MGMT_PERF_CNT_1_VALUE = 0x10ac, + -+ return 0; -+} ++ MALI200_REG_ADDR_MGMT_PERFMON_CONTR = 0x10b0, ++ MALI200_REG_ADDR_MGMT_PERFMON_BASE = 0x10b4, + -+static int kbase_mem_pool_debugfs_size_set(void *data, u64 val) -+{ -+ struct kbase_mem_pool *pool = (struct kbase_mem_pool *)data; ++ MALI200_REG_SIZEOF_REGISTER_BANK = 0x10f0 + -+ kbase_mem_pool_trim(pool, val); ++}; + -+ return 0; -+} ++#define MALI200_REG_VAL_PERF_CNT_ENABLE 1 + -+DEFINE_SIMPLE_ATTRIBUTE(kbase_mem_pool_debugfs_size_fops, -+ kbase_mem_pool_debugfs_size_get, -+ kbase_mem_pool_debugfs_size_set, -+ "%llu\n"); ++enum mali200_mgmt_ctrl_mgmt { ++ MALI200_REG_VAL_CTRL_MGMT_STOP_BUS = (1 << 0), ++ MALI200_REG_VAL_CTRL_MGMT_FLUSH_CACHES = (1 << 3), ++ MALI200_REG_VAL_CTRL_MGMT_FORCE_RESET = (1 << 5), ++ MALI200_REG_VAL_CTRL_MGMT_START_RENDERING = (1 << 6), ++ MALI400PP_REG_VAL_CTRL_MGMT_SOFT_RESET = (1 << 7), /* Only valid for Mali-300 and later */ ++}; + -+static int kbase_mem_pool_debugfs_max_size_get(void *data, u64 *val) -+{ -+ struct kbase_mem_pool *pool = (struct kbase_mem_pool *)data; ++enum mali200_mgmt_irq { ++ MALI200_REG_VAL_IRQ_END_OF_FRAME = (1 << 0), ++ MALI200_REG_VAL_IRQ_END_OF_TILE = (1 << 1), ++ MALI200_REG_VAL_IRQ_HANG = (1 << 2), ++ MALI200_REG_VAL_IRQ_FORCE_HANG = (1 << 3), ++ MALI200_REG_VAL_IRQ_BUS_ERROR = (1 << 4), ++ MALI200_REG_VAL_IRQ_BUS_STOP = (1 << 5), ++ MALI200_REG_VAL_IRQ_CNT_0_LIMIT = (1 << 6), ++ MALI200_REG_VAL_IRQ_CNT_1_LIMIT = (1 << 7), ++ MALI200_REG_VAL_IRQ_WRITE_BOUNDARY_ERROR = (1 << 8), ++ MALI400PP_REG_VAL_IRQ_INVALID_PLIST_COMMAND = (1 << 9), ++ MALI400PP_REG_VAL_IRQ_CALL_STACK_UNDERFLOW = (1 << 10), ++ MALI400PP_REG_VAL_IRQ_CALL_STACK_OVERFLOW = (1 << 11), ++ MALI400PP_REG_VAL_IRQ_RESET_COMPLETED = (1 << 12), ++}; + -+ *val = kbase_mem_pool_max_size(pool); ++#define MALI200_REG_VAL_IRQ_MASK_ALL ((enum mali200_mgmt_irq) (\ ++ MALI200_REG_VAL_IRQ_END_OF_FRAME |\ ++ MALI200_REG_VAL_IRQ_END_OF_TILE |\ ++ MALI200_REG_VAL_IRQ_HANG |\ ++ MALI200_REG_VAL_IRQ_FORCE_HANG |\ ++ MALI200_REG_VAL_IRQ_BUS_ERROR |\ ++ MALI200_REG_VAL_IRQ_BUS_STOP |\ ++ MALI200_REG_VAL_IRQ_CNT_0_LIMIT |\ ++ MALI200_REG_VAL_IRQ_CNT_1_LIMIT |\ ++ MALI200_REG_VAL_IRQ_WRITE_BOUNDARY_ERROR |\ ++ MALI400PP_REG_VAL_IRQ_INVALID_PLIST_COMMAND |\ ++ MALI400PP_REG_VAL_IRQ_CALL_STACK_UNDERFLOW |\ ++ MALI400PP_REG_VAL_IRQ_CALL_STACK_OVERFLOW |\ ++ MALI400PP_REG_VAL_IRQ_RESET_COMPLETED)) + -+ return 0; -+} ++#define MALI200_REG_VAL_IRQ_MASK_USED ((enum mali200_mgmt_irq) (\ ++ MALI200_REG_VAL_IRQ_END_OF_FRAME |\ ++ MALI200_REG_VAL_IRQ_FORCE_HANG |\ ++ MALI200_REG_VAL_IRQ_BUS_ERROR |\ ++ MALI200_REG_VAL_IRQ_WRITE_BOUNDARY_ERROR |\ ++ MALI400PP_REG_VAL_IRQ_INVALID_PLIST_COMMAND |\ ++ MALI400PP_REG_VAL_IRQ_CALL_STACK_UNDERFLOW |\ ++ MALI400PP_REG_VAL_IRQ_CALL_STACK_OVERFLOW)) + -+static int kbase_mem_pool_debugfs_max_size_set(void *data, u64 val) -+{ -+ struct kbase_mem_pool *pool = (struct kbase_mem_pool *)data; ++#define MALI200_REG_VAL_IRQ_MASK_NONE ((enum mali200_mgmt_irq)(0)) + -+ kbase_mem_pool_set_max_size(pool, val); ++enum mali200_mgmt_status { ++ MALI200_REG_VAL_STATUS_RENDERING_ACTIVE = (1 << 0), ++ MALI200_REG_VAL_STATUS_BUS_STOPPED = (1 << 4), ++}; + -+ return 0; -+} ++enum mali200_render_unit { ++ MALI200_REG_ADDR_FRAME = 0x0000, ++ MALI200_REG_ADDR_RSW = 0x0004, ++ MALI200_REG_ADDR_STACK = 0x0030, ++ MALI200_REG_ADDR_STACK_SIZE = 0x0034, ++ MALI200_REG_ADDR_ORIGIN_OFFSET_X = 0x0040 ++}; + -+DEFINE_SIMPLE_ATTRIBUTE(kbase_mem_pool_debugfs_max_size_fops, -+ kbase_mem_pool_debugfs_max_size_get, -+ kbase_mem_pool_debugfs_max_size_set, -+ "%llu\n"); ++enum mali200_wb_unit { ++ MALI200_REG_ADDR_WB0 = 0x0100, ++ MALI200_REG_ADDR_WB1 = 0x0200, ++ MALI200_REG_ADDR_WB2 = 0x0300 ++}; + -+void kbase_mem_pool_debugfs_init(struct dentry *parent, -+ struct kbase_mem_pool *pool, -+ struct kbase_mem_pool *lp_pool) -+{ -+ debugfs_create_file("mem_pool_size", S_IRUGO | S_IWUSR, parent, -+ pool, &kbase_mem_pool_debugfs_size_fops); ++enum mali200_wb_unit_regs { ++ MALI200_REG_ADDR_WB_SOURCE_SELECT = 0x0000, ++ MALI200_REG_ADDR_WB_SOURCE_ADDR = 0x0004, ++}; + -+ debugfs_create_file("mem_pool_max_size", S_IRUGO | S_IWUSR, parent, -+ pool, &kbase_mem_pool_debugfs_max_size_fops); ++/* This should be in the top 16 bit of the version register of Mali PP */ ++#define MALI200_PP_PRODUCT_ID 0xC807 ++#define MALI300_PP_PRODUCT_ID 0xCE07 ++#define MALI400_PP_PRODUCT_ID 0xCD07 ++#define MALI450_PP_PRODUCT_ID 0xCF07 ++#define MALI470_PP_PRODUCT_ID 0xCF08 + -+ debugfs_create_file("lp_mem_pool_size", S_IRUGO | S_IWUSR, parent, -+ lp_pool, &kbase_mem_pool_debugfs_size_fops); + -+ debugfs_create_file("lp_mem_pool_max_size", S_IRUGO | S_IWUSR, parent, -+ lp_pool, &kbase_mem_pool_debugfs_max_size_fops); -+} + -+#endif /* CONFIG_DEBUG_FS */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool_debugfs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool_debugfs.h ++#endif /* _MALI200_REGS_H_ */ +diff --git a/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h b/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h new file mode 100755 -index 000000000000..496eaf3f1e1a +index 000000000..7f8b58fd6 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool_debugfs.h -@@ -0,0 +1,40 @@ ++++ b/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h +@@ -0,0 +1,172 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2015, 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010, 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef _MALIGP2_CONROL_REGS_H_ ++#define _MALIGP2_CONROL_REGS_H_ + ++/** ++ * These are the different geometry processor control registers. ++ * Their usage is to control and monitor the operation of the ++ * Vertex Shader and the Polygon List Builder in the geometry processor. ++ * Addresses are in 32-bit word relative sizes. ++ * @see [P0081] "Geometry Processor Data Structures" for details ++ */ + -+#ifndef _KBASE_MEM_POOL_DEBUGFS_H -+#define _KBASE_MEM_POOL_DEBUGFS_H ++typedef enum { ++ MALIGP2_REG_ADDR_MGMT_VSCL_START_ADDR = 0x00, ++ MALIGP2_REG_ADDR_MGMT_VSCL_END_ADDR = 0x04, ++ MALIGP2_REG_ADDR_MGMT_PLBUCL_START_ADDR = 0x08, ++ MALIGP2_REG_ADDR_MGMT_PLBUCL_END_ADDR = 0x0c, ++ MALIGP2_REG_ADDR_MGMT_PLBU_ALLOC_START_ADDR = 0x10, ++ MALIGP2_REG_ADDR_MGMT_PLBU_ALLOC_END_ADDR = 0x14, ++ MALIGP2_REG_ADDR_MGMT_CMD = 0x20, ++ MALIGP2_REG_ADDR_MGMT_INT_RAWSTAT = 0x24, ++ MALIGP2_REG_ADDR_MGMT_INT_CLEAR = 0x28, ++ MALIGP2_REG_ADDR_MGMT_INT_MASK = 0x2C, ++ MALIGP2_REG_ADDR_MGMT_INT_STAT = 0x30, ++ MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_ENABLE = 0x3C, ++ MALIGP2_REG_ADDR_MGMT_PERF_CNT_1_ENABLE = 0x40, ++ MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_SRC = 0x44, ++ MALIGP2_REG_ADDR_MGMT_PERF_CNT_1_SRC = 0x48, ++ MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_VALUE = 0x4C, ++ MALIGP2_REG_ADDR_MGMT_PERF_CNT_1_VALUE = 0x50, ++ MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_LIMIT = 0x54, ++ MALIGP2_REG_ADDR_MGMT_STATUS = 0x68, ++ MALIGP2_REG_ADDR_MGMT_VERSION = 0x6C, ++ MALIGP2_REG_ADDR_MGMT_VSCL_START_ADDR_READ = 0x80, ++ MALIGP2_REG_ADDR_MGMT_PLBCL_START_ADDR_READ = 0x84, ++ MALIGP2_CONTR_AXI_BUS_ERROR_STAT = 0x94, ++ MALIGP2_REGISTER_ADDRESS_SPACE_SIZE = 0x98, ++} maligp_reg_addr_mgmt_addr; + -+#include ++#define MALIGP2_REG_VAL_PERF_CNT_ENABLE 1 + +/** -+ * kbase_mem_pool_debugfs_init - add debugfs knobs for @pool -+ * @parent: Parent debugfs dentry -+ * @pool: Memory pool of small pages to control -+ * @lp_pool: Memory pool of large pages to control -+ * -+ * Adds four debugfs files under @parent: -+ * - mem_pool_size: get/set the current size of @pool -+ * - mem_pool_max_size: get/set the max size of @pool -+ * - lp_mem_pool_size: get/set the current size of @lp_pool -+ * - lp_mem_pool_max_size: get/set the max size of @lp_pool ++ * Commands to geometry processor. ++ * @see MALIGP2_CTRL_REG_CMD + */ -+void kbase_mem_pool_debugfs_init(struct dentry *parent, -+ struct kbase_mem_pool *pool, -+ struct kbase_mem_pool *lp_pool); ++typedef enum { ++ MALIGP2_REG_VAL_CMD_START_VS = (1 << 0), ++ MALIGP2_REG_VAL_CMD_START_PLBU = (1 << 1), ++ MALIGP2_REG_VAL_CMD_UPDATE_PLBU_ALLOC = (1 << 4), ++ MALIGP2_REG_VAL_CMD_RESET = (1 << 5), ++ MALIGP2_REG_VAL_CMD_FORCE_HANG = (1 << 6), ++ MALIGP2_REG_VAL_CMD_STOP_BUS = (1 << 9), ++ MALI400GP_REG_VAL_CMD_SOFT_RESET = (1 << 10), /* only valid for Mali-300 and later */ ++} mgp_contr_reg_val_cmd; + -+#endif /*_KBASE_MEM_POOL_DEBUGFS_H*/ + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs.c -new file mode 100755 -index 000000000000..d58fd8d62fde ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs.c -@@ -0,0 +1,121 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++/** @defgroup MALIGP2_IRQ ++ * Interrupt status of geometry processor. ++ * @see MALIGP2_CTRL_REG_INT_RAWSTAT, MALIGP2_REG_ADDR_MGMT_INT_CLEAR, ++ * MALIGP2_REG_ADDR_MGMT_INT_MASK, MALIGP2_REG_ADDR_MGMT_INT_STAT ++ * @{ + */ ++#define MALIGP2_REG_VAL_IRQ_VS_END_CMD_LST (1 << 0) ++#define MALIGP2_REG_VAL_IRQ_PLBU_END_CMD_LST (1 << 1) ++#define MALIGP2_REG_VAL_IRQ_PLBU_OUT_OF_MEM (1 << 2) ++#define MALIGP2_REG_VAL_IRQ_VS_SEM_IRQ (1 << 3) ++#define MALIGP2_REG_VAL_IRQ_PLBU_SEM_IRQ (1 << 4) ++#define MALIGP2_REG_VAL_IRQ_HANG (1 << 5) ++#define MALIGP2_REG_VAL_IRQ_FORCE_HANG (1 << 6) ++#define MALIGP2_REG_VAL_IRQ_PERF_CNT_0_LIMIT (1 << 7) ++#define MALIGP2_REG_VAL_IRQ_PERF_CNT_1_LIMIT (1 << 8) ++#define MALIGP2_REG_VAL_IRQ_WRITE_BOUND_ERR (1 << 9) ++#define MALIGP2_REG_VAL_IRQ_SYNC_ERROR (1 << 10) ++#define MALIGP2_REG_VAL_IRQ_AXI_BUS_ERROR (1 << 11) ++#define MALI400GP_REG_VAL_IRQ_AXI_BUS_STOPPED (1 << 12) ++#define MALI400GP_REG_VAL_IRQ_VS_INVALID_CMD (1 << 13) ++#define MALI400GP_REG_VAL_IRQ_PLB_INVALID_CMD (1 << 14) ++#define MALI400GP_REG_VAL_IRQ_RESET_COMPLETED (1 << 19) ++#define MALI400GP_REG_VAL_IRQ_SEMAPHORE_UNDERFLOW (1 << 20) ++#define MALI400GP_REG_VAL_IRQ_SEMAPHORE_OVERFLOW (1 << 21) ++#define MALI400GP_REG_VAL_IRQ_PTR_ARRAY_OUT_OF_BOUNDS (1 << 22) + ++/* Mask defining all IRQs in Mali GP */ ++#define MALIGP2_REG_VAL_IRQ_MASK_ALL \ ++ (\ ++ MALIGP2_REG_VAL_IRQ_VS_END_CMD_LST | \ ++ MALIGP2_REG_VAL_IRQ_PLBU_END_CMD_LST | \ ++ MALIGP2_REG_VAL_IRQ_PLBU_OUT_OF_MEM | \ ++ MALIGP2_REG_VAL_IRQ_VS_SEM_IRQ | \ ++ MALIGP2_REG_VAL_IRQ_PLBU_SEM_IRQ | \ ++ MALIGP2_REG_VAL_IRQ_HANG | \ ++ MALIGP2_REG_VAL_IRQ_FORCE_HANG | \ ++ MALIGP2_REG_VAL_IRQ_PERF_CNT_0_LIMIT | \ ++ MALIGP2_REG_VAL_IRQ_PERF_CNT_1_LIMIT | \ ++ MALIGP2_REG_VAL_IRQ_WRITE_BOUND_ERR | \ ++ MALIGP2_REG_VAL_IRQ_SYNC_ERROR | \ ++ MALIGP2_REG_VAL_IRQ_AXI_BUS_ERROR | \ ++ MALI400GP_REG_VAL_IRQ_AXI_BUS_STOPPED | \ ++ MALI400GP_REG_VAL_IRQ_VS_INVALID_CMD | \ ++ MALI400GP_REG_VAL_IRQ_PLB_INVALID_CMD | \ ++ MALI400GP_REG_VAL_IRQ_RESET_COMPLETED | \ ++ MALI400GP_REG_VAL_IRQ_SEMAPHORE_UNDERFLOW | \ ++ MALI400GP_REG_VAL_IRQ_SEMAPHORE_OVERFLOW | \ ++ MALI400GP_REG_VAL_IRQ_PTR_ARRAY_OUT_OF_BOUNDS) + ++/* Mask defining the IRQs in Mali GP which we use */ ++#define MALIGP2_REG_VAL_IRQ_MASK_USED \ ++ (\ ++ MALIGP2_REG_VAL_IRQ_VS_END_CMD_LST | \ ++ MALIGP2_REG_VAL_IRQ_PLBU_END_CMD_LST | \ ++ MALIGP2_REG_VAL_IRQ_PLBU_OUT_OF_MEM | \ ++ MALIGP2_REG_VAL_IRQ_FORCE_HANG | \ ++ MALIGP2_REG_VAL_IRQ_WRITE_BOUND_ERR | \ ++ MALIGP2_REG_VAL_IRQ_SYNC_ERROR | \ ++ MALIGP2_REG_VAL_IRQ_AXI_BUS_ERROR | \ ++ MALI400GP_REG_VAL_IRQ_VS_INVALID_CMD | \ ++ MALI400GP_REG_VAL_IRQ_PLB_INVALID_CMD | \ ++ MALI400GP_REG_VAL_IRQ_SEMAPHORE_UNDERFLOW | \ ++ MALI400GP_REG_VAL_IRQ_SEMAPHORE_OVERFLOW | \ ++ MALI400GP_REG_VAL_IRQ_PTR_ARRAY_OUT_OF_BOUNDS) + -+#include ++/* Mask defining non IRQs on MaliGP2*/ ++#define MALIGP2_REG_VAL_IRQ_MASK_NONE 0 + -+#ifdef CONFIG_DEBUG_FS ++/** }@ defgroup MALIGP2_IRQ*/ + -+/** Show callback for the @c mem_profile debugfs file. -+ * -+ * This function is called to get the contents of the @c mem_profile debugfs -+ * file. This is a report of current memory usage and distribution in userspace. -+ * -+ * @param sfile The debugfs entry -+ * @param data Data associated with the entry -+ * -+ * @return 0 if it successfully prints data in debugfs entry file, non-zero otherwise ++/** @defgroup MALIGP2_STATUS ++ * The different Status values to the geometry processor. ++ * @see MALIGP2_CTRL_REG_STATUS ++ * @{ + */ -+static int kbasep_mem_profile_seq_show(struct seq_file *sfile, void *data) -+{ -+ struct kbase_context *kctx = sfile->private; -+ -+ mutex_lock(&kctx->mem_profile_lock); ++#define MALIGP2_REG_VAL_STATUS_VS_ACTIVE 0x0002 ++#define MALIGP2_REG_VAL_STATUS_BUS_STOPPED 0x0004 ++#define MALIGP2_REG_VAL_STATUS_PLBU_ACTIVE 0x0008 ++#define MALIGP2_REG_VAL_STATUS_BUS_ERROR 0x0040 ++#define MALIGP2_REG_VAL_STATUS_WRITE_BOUND_ERR 0x0100 ++/** }@ defgroup MALIGP2_STATUS*/ + -+ seq_write(sfile, kctx->mem_profile_data, kctx->mem_profile_size); ++#define MALIGP2_REG_VAL_STATUS_MASK_ACTIVE (\ ++ MALIGP2_REG_VAL_STATUS_VS_ACTIVE|\ ++ MALIGP2_REG_VAL_STATUS_PLBU_ACTIVE) + -+ seq_putc(sfile, '\n'); + -+ mutex_unlock(&kctx->mem_profile_lock); ++#define MALIGP2_REG_VAL_STATUS_MASK_ERROR (\ ++ MALIGP2_REG_VAL_STATUS_BUS_ERROR |\ ++ MALIGP2_REG_VAL_STATUS_WRITE_BOUND_ERR ) + -+ return 0; -+} ++/* This should be in the top 16 bit of the version register of gp.*/ ++#define MALI200_GP_PRODUCT_ID 0xA07 ++#define MALI300_GP_PRODUCT_ID 0xC07 ++#define MALI400_GP_PRODUCT_ID 0xB07 ++#define MALI450_GP_PRODUCT_ID 0xD07 + -+/* -+ * File operations related to debugfs entry for mem_profile ++/** ++ * The different sources for instrumented on the geometry processor. ++ * @see MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_SRC + */ -+static int kbasep_mem_profile_debugfs_open(struct inode *in, struct file *file) -+{ -+ return single_open(file, kbasep_mem_profile_seq_show, in->i_private); -+} + -+static const struct file_operations kbasep_mem_profile_debugfs_fops = { -+ .open = kbasep_mem_profile_debugfs_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, ++enum MALIGP2_cont_reg_perf_cnt_src { ++ MALIGP2_REG_VAL_PERF_CNT1_SRC_NUMBER_OF_VERTICES_PROCESSED = 0x0a, +}; + -+int kbasep_mem_profile_debugfs_insert(struct kbase_context *kctx, char *data, -+ size_t size) -+{ -+ int err = 0; ++#endif +diff --git a/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c +new file mode 100755 +index 000000000..7df934c12 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c +@@ -0,0 +1,13 @@ ++/* ++ * Copyright (C) 2010-2011, 2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ mutex_lock(&kctx->mem_profile_lock); ++#include "mali_timestamp.h" + -+ dev_dbg(kctx->kbdev->dev, "initialised: %d", -+ kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED)); ++/* This file is intentionally left empty, as all functions are inlined in mali_profiling_sampler.h */ +diff --git a/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h +new file mode 100755 +index 000000000..f52097c19 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h +@@ -0,0 +1,48 @@ ++/* ++ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ if (!kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED)) { -+ if (!debugfs_create_file("mem_profile", S_IRUGO, -+ kctx->kctx_dentry, kctx, -+ &kbasep_mem_profile_debugfs_fops)) { -+ err = -EAGAIN; -+ } else { -+ kbase_ctx_flag_set(kctx, -+ KCTX_MEM_PROFILE_INITIALIZED); -+ } -+ } ++#ifndef __MALI_TIMESTAMP_H__ ++#define __MALI_TIMESTAMP_H__ + -+ if (kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED)) { -+ kfree(kctx->mem_profile_data); -+ kctx->mem_profile_data = data; -+ kctx->mem_profile_size = size; -+ } else { -+ kfree(data); -+ } ++#include "mali_osk.h" + -+ dev_dbg(kctx->kbdev->dev, "returning: %d, initialised: %d", -+ err, kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED)); ++MALI_STATIC_INLINE _mali_osk_errcode_t _mali_timestamp_reset(void) ++{ ++ /* ++ * reset counters and overflow flags ++ */ + -+ mutex_unlock(&kctx->mem_profile_lock); ++ u32 mask = (1 << 0) | /* enable all three counters */ ++ (0 << 1) | /* reset both Count Registers to 0x0 */ ++ (1 << 2) | /* reset the Cycle Counter Register to 0x0 */ ++ (0 << 3) | /* 1 = Cycle Counter Register counts every 64th processor clock cycle */ ++ (0 << 4) | /* Count Register 0 interrupt enable */ ++ (0 << 5) | /* Count Register 1 interrupt enable */ ++ (0 << 6) | /* Cycle Counter interrupt enable */ ++ (0 << 8) | /* Count Register 0 overflow flag (clear or write, flag on read) */ ++ (0 << 9) | /* Count Register 1 overflow flag (clear or write, flag on read) */ ++ (1 << 10); /* Cycle Counter Register overflow flag (clear or write, flag on read) */ + -+ return err; ++ __asm__ __volatile__("MCR p15, 0, %0, c15, c12, 0" : : "r"(mask)); ++ ++ return _MALI_OSK_ERR_OK; +} + -+void kbasep_mem_profile_debugfs_remove(struct kbase_context *kctx) ++MALI_STATIC_INLINE u64 _mali_timestamp_get(void) +{ -+ mutex_lock(&kctx->mem_profile_lock); -+ -+ dev_dbg(kctx->kbdev->dev, "initialised: %d", -+ kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED)); ++ u32 result; + -+ kfree(kctx->mem_profile_data); -+ kctx->mem_profile_data = NULL; -+ kctx->mem_profile_size = 0; ++ /* this is for the clock cycles */ ++ __asm__ __volatile__("MRC p15, 0, %0, c15, c12, 1" : "=r"(result)); + -+ mutex_unlock(&kctx->mem_profile_lock); ++ return (u64)result; +} + -+#else /* CONFIG_DEBUG_FS */ -+ -+int kbasep_mem_profile_debugfs_insert(struct kbase_context *kctx, char *data, -+ size_t size) -+{ -+ kfree(data); -+ return 0; -+} -+#endif /* CONFIG_DEBUG_FS */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs.h ++#endif /* __MALI_TIMESTAMP_H__ */ +diff --git a/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c new file mode 100755 -index 000000000000..a1dc2e0b165b +index 000000000..7df934c12 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs.h -@@ -0,0 +1,59 @@ ++++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c +@@ -0,0 +1,13 @@ +/* -+ * -+ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+ -+ -+/** -+ * @file mali_kbase_mem_profile_debugfs.h -+ * Header file for mem profiles entries in debugfs -+ * -+ */ -+ -+#ifndef _KBASE_MEM_PROFILE_DEBUGFS_H -+#define _KBASE_MEM_PROFILE_DEBUGFS_H -+ -+#include -+#include -+ -+/** -+ * @brief Remove entry from Mali memory profile debugfs -+ */ -+void kbasep_mem_profile_debugfs_remove(struct kbase_context *kctx); -+ -+/** -+ * @brief Insert @p data to the debugfs file so it can be read by userspace -+ * -+ * The function takes ownership of @p data and frees it later when new data -+ * is inserted. -+ * -+ * If the debugfs entry corresponding to the @p kctx doesn't exist, -+ * an attempt will be made to create it. -+ * -+ * @param kctx The context whose debugfs file @p data should be inserted to -+ * @param data A NULL-terminated string to be inserted to the debugfs file, -+ * without the trailing new line character -+ * @param size The length of the @p data string -+ * @return 0 if @p data inserted correctly -+ * -EAGAIN in case of error -+ * @post @ref mem_profile_initialized will be set to @c true -+ * the first time this function succeeds. ++ * Copyright (C) 2010-2011, 2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+int kbasep_mem_profile_debugfs_insert(struct kbase_context *kctx, char *data, -+ size_t size); + -+#endif /*_KBASE_MEM_PROFILE_DEBUGFS_H*/ ++#include "mali_timestamp.h" + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs_buf_size.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs_buf_size.h ++/* This file is intentionally left empty, as all functions are inlined in mali_profiling_sampler.h */ +diff --git a/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h new file mode 100755 -index 000000000000..82f0702974c2 +index 000000000..709a16a82 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs_buf_size.h -@@ -0,0 +1,33 @@ ++++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h +@@ -0,0 +1,26 @@ +/* -+ * -+ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#ifndef __MALI_TIMESTAMP_H__ ++#define __MALI_TIMESTAMP_H__ + ++#include "mali_osk.h" + -+/** -+ * @file mali_kbase_mem_profile_debugfs_buf_size.h -+ * Header file for the size of the buffer to accumulate the histogram report text in -+ */ -+ -+#ifndef _KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_ -+#define _KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_ -+ -+/** -+ * The size of the buffer to accumulate the histogram report text in -+ * @see @ref CCTXP_HIST_BUF_SIZE_MAX_LENGTH_REPORT -+ */ -+#define KBASE_MEM_PROFILE_MAX_BUF_SIZE ((size_t) (64 + ((80 + (56 * 64)) * 15) + 56)) ++MALI_STATIC_INLINE _mali_osk_errcode_t _mali_timestamp_reset(void) ++{ ++ return _MALI_OSK_ERR_OK; ++} + -+#endif /*_KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_*/ ++MALI_STATIC_INLINE u64 _mali_timestamp_get(void) ++{ ++ return _mali_osk_boot_time_get_ns(); ++} + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu.c ++#endif /* __MALI_TIMESTAMP_H__ */ +diff --git a/drivers/gpu/arm/mali400/rk_ver_info.txt b/drivers/gpu/arm/mali400/rk_ver_info.txt new file mode 100755 -index 000000000000..c63269aed53c +index 000000000..2a6cbbbb5 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu.c -@@ -0,0 +1,2138 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ ++++ b/drivers/gpu/arm/mali400/rk_ver_info.txt +@@ -0,0 +1,11 @@ + ++r5p0-01rel0-1-x@0 ++ 对 arm_release_ver r5p0-01rel0 的定制集æˆ. ++ r5p0-01rel0 对 gpu çš„ dts 有大修改, 但这里出于兼容考虑, ä»æ—§ä½¿ç”¨ dts_for_mali_ko_befor_r5p0-01rel0. + ++r5p0-01rel0-2-x@0 ++ æ”¯æŒ mali_so æ¥èŽ·å– rk_ko_ver. ++ ++r5p0-01rel0-3-x@0 ++ 在 mali_control_timer_callback_chain 中使用 mod_timer, 而ä¸å†æ˜¯ add_timer. + +diff --git a/drivers/gpu/arm/mali400/ump/Kbuild b/drivers/gpu/arm/mali400/ump/Kbuild +new file mode 100755 +index 000000000..a3067ba72 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/Kbuild +@@ -0,0 +1,92 @@ ++# ++# Copyright (C) 2010-2012 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++# as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained from Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++# + -+/** -+ * @file mali_kbase_mmu.c -+ * Base kernel MMU management. -+ */ ++# Set default configuration to use, if Makefile didn't provide one. ++# Change this to use a different config.h ++CONFIG ?= default + -+/* #define DEBUG 1 */ -+#include -+#include -+#include -+#include -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+#include -+#endif -+#include -+#include -+#include ++# Link arch to the selected arch-config directory ++$(shell [ -L $(src)/arch ] && rm $(src)/arch) ++$(shell ln -sf arch-$(CONFIG) $(src)/arch) ++$(shell touch $(src)/arch/config.h) + -+#define beenthere(kctx, f, a...) dev_dbg(kctx->kbdev->dev, "%s:" f, __func__, ##a) ++UDD_FILE_PREFIX = ../mali/ + -+#include -+#include -+#include -+#include -+#include -+#include ++# Get subversion revision number, fall back to 0000 if no svn info is available ++SVN_INFO = (cd $(src); svn info 2>/dev/null) + -+#define KBASE_MMU_PAGE_ENTRIES 512 ++ifneq ($(shell $(SVN_INFO) 2>/dev/null),) ++# SVN detected ++SVN_REV := $(shell $(SVN_INFO) | grep '^Revision: '| sed -e 's/^Revision: //' 2>/dev/null) ++DRIVER_REV := $(MALI_RELEASE_NAME)-r$(SVN_REV) ++CHANGE_DATE := $(shell $(SVN_INFO) | grep '^Last Changed Date: ' | cut -d: -f2- | cut -b2-) ++CHANGED_REVISION := $(shell $(SVN_INFO) | grep '^Last Changed Rev: ' | cut -d: -f2- | cut -b2-) ++REPO_URL := $(shell $(SVN_INFO) | grep '^URL: ' | cut -d: -f2- | cut -b2-) + -+/** -+ * kbase_mmu_flush_invalidate() - Flush and invalidate the GPU caches. -+ * @kctx: The KBase context. -+ * @vpfn: The virtual page frame number to start the flush on. -+ * @nr: The number of pages to flush. -+ * @sync: Set if the operation should be synchronous or not. -+ * -+ * Issue a cache flush + invalidate to the GPU caches and invalidate the TLBs. -+ * -+ * If sync is not set then transactions still in flight when the flush is issued -+ * may use the old page tables and the data they write will not be written out -+ * to memory, this function returns after the flush has been issued but -+ * before all accesses which might effect the flushed region have completed. -+ * -+ * If sync is set then accesses in the flushed region will be drained -+ * before data is flush and invalidated through L1, L2 and into memory, -+ * after which point this function will return. -+ */ -+static void kbase_mmu_flush_invalidate(struct kbase_context *kctx, -+ u64 vpfn, size_t nr, bool sync); ++else # SVN ++GIT_REV := $(shell cd $(src); git describe --always 2>/dev/null) ++ifneq ($(GIT_REV),) ++# Git detected ++DRIVER_REV := $(MALI_RELEASE_NAME)-$(GIT_REV) ++CHANGE_DATE := $(shell cd $(src); git log -1 --format="%ci") ++CHANGED_REVISION := $(GIT_REV) ++REPO_URL := $(shell cd $(src); git describe --all --always 2>/dev/null) + -+/** -+ * kbase_mmu_sync_pgd - sync page directory to memory -+ * @kbdev: Device pointer. -+ * @handle: Address of DMA region. -+ * @size: Size of the region to sync. -+ * -+ * This should be called after each page directory update. -+ */ ++else # Git ++# No Git or SVN detected ++DRIVER_REV := $(MALI_RELEASE_NAME) ++CHANGE_DATE := $(MALI_RELEASE_NAME) ++CHANGED_REVISION := $(MALI_RELEASE_NAME) ++endif ++endif + -+static void kbase_mmu_sync_pgd(struct kbase_device *kbdev, -+ dma_addr_t handle, size_t size) -+{ -+ /* If page table is not coherent then ensure the gpu can read -+ * the pages from memory -+ */ -+ if (kbdev->system_coherency != COHERENCY_ACE) -+ dma_sync_single_for_device(kbdev->dev, handle, size, -+ DMA_TO_DEVICE); -+} ++ccflags-y += -DSVN_REV=$(SVN_REV) ++ccflags-y += -DSVN_REV_STRING=\"$(DRIVER_REV)\" + -+/* -+ * Definitions: -+ * - PGD: Page Directory. -+ * - PTE: Page Table Entry. A 64bit value pointing to the next -+ * level of translation -+ * - ATE: Address Transation Entry. A 64bit value pointing to -+ * a 4kB physical page. -+ */ ++ccflags-y += -I$(src) -I$(src)/common -I$(src)/linux -I$(src)/../mali/common -I$(src)/../mali/linux -I$(src)/include -I$(src)/../../ump/include/ump ++ccflags-y += -DMALI_STATE_TRACKING=0 ++ccflags-y += -DMALI_ENABLE_CPU_CYCLES=0 ++ccflags-$(CONFIG_UMP_DEBUG) += -DDEBUG + -+static void kbase_mmu_report_fault_and_kill(struct kbase_context *kctx, -+ struct kbase_as *as, const char *reason_str); ++# For customer releases the Linux Device Drivers will be provided as ARM proprietary and GPL releases: ++# The ARM proprietary product will only include the license/proprietary directory ++# The GPL product will only include the license/gpl directory + ++ifeq ($(wildcard $(src)/linux/license/gpl/*),) ++ccflags-y += -I$(src)/linux/license/proprietary -I$(src)/../mali/linux/license/proprietary ++else ++ccflags-y += -I$(src)/linux/license/gpl -I$(src)/../mali/linux/license/gpl ++endif + -+static size_t make_multiple(size_t minimum, size_t multiple) -+{ -+ size_t remainder = minimum % multiple; ++ump-y = common/ump_kernel_common.o \ ++ common/ump_kernel_descriptor_mapping.o \ ++ common/ump_kernel_api.o \ ++ common/ump_kernel_ref_drv.o \ ++ linux/ump_kernel_linux.o \ ++ linux/ump_kernel_memory_backend_os.o \ ++ linux/ump_kernel_memory_backend_dedicated.o \ ++ linux/ump_memory_backend.o \ ++ linux/ump_ukk_wrappers.o \ ++ linux/ump_ukk_ref_wrappers.o \ ++ linux/ump_osk_atomics.o \ ++ linux/ump_osk_low_level_mem.o \ ++ linux/ump_osk_misc.o \ ++ linux/ump_kernel_random_mapping.o + -+ if (remainder == 0) -+ return minimum; ++ifneq ($(CONFIG_MALI400),y) ++ump-y += $(UDD_FILE_PREFIX)linux/mali_osk_atomics.o \ ++ $(UDD_FILE_PREFIX)linux/mali_osk_locks.o \ ++ $(UDD_FILE_PREFIX)linux/mali_osk_memory.o \ ++ $(UDD_FILE_PREFIX)linux/mali_osk_math.o \ ++ $(UDD_FILE_PREFIX)linux/mali_osk_misc.o ++endif + -+ return minimum + multiple - remainder; -+} ++obj-$(CONFIG_UMP) := ump.o + -+void page_fault_worker(struct work_struct *data) -+{ -+ u64 fault_pfn; -+ u32 fault_status; -+ size_t new_pages; -+ size_t fault_rel_pfn; -+ struct kbase_as *faulting_as; -+ int as_no; -+ struct kbase_context *kctx; -+ struct kbase_device *kbdev; -+ struct kbase_va_region *region; -+ int err; -+ bool grown = false; +diff --git a/drivers/gpu/arm/mali400/ump/Kconfig b/drivers/gpu/arm/mali400/ump/Kconfig +new file mode 100755 +index 000000000..ec3509057 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/Kconfig +@@ -0,0 +1,17 @@ ++# SPDX-License-Identifier: GPL-2.0 ++config UMP ++ tristate "UMP support" ++ depends on ARM ++ help ++ This enables support for the UMP memory allocation and sharing API. + -+ faulting_as = container_of(data, struct kbase_as, work_pagefault); -+ fault_pfn = faulting_as->fault_addr >> PAGE_SHIFT; -+ as_no = faulting_as->number; ++ To compile this driver as a module, choose M here: the module will be ++ called ump. + -+ kbdev = container_of(faulting_as, struct kbase_device, as[as_no]); ++config UMP_DEBUG ++ bool "Enable extra debug in UMP" ++ depends on UMP ++ default y ++ help ++ This enabled extra debug checks and messages in UMP. + -+ /* Grab the context that was already refcounted in kbase_mmu_interrupt(). -+ * Therefore, it cannot be scheduled out of this AS until we explicitly release it -+ */ -+ kctx = kbasep_js_runpool_lookup_ctx_noretain(kbdev, as_no); -+ if (WARN_ON(!kctx)) { -+ atomic_dec(&kbdev->faults_pending); -+ return; -+ } +diff --git a/drivers/gpu/arm/mali400/ump/Makefile b/drivers/gpu/arm/mali400/ump/Makefile +new file mode 100755 +index 000000000..88b02a22f +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/Makefile +@@ -0,0 +1,67 @@ ++# ++# Copyright (C) 2010-2012, 2014, 2016-2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++# as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained from Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++# + -+ KBASE_DEBUG_ASSERT(kctx->kbdev == kbdev); ++# For each arch check: CROSS_COMPILE , KDIR , CFLAGS += -DARCH + -+ if (unlikely(faulting_as->protected_mode)) -+ { -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Protected mode fault"); -+ kbase_mmu_hw_clear_fault(kbdev, faulting_as, kctx, -+ KBASE_MMU_FAULT_TYPE_PAGE); ++export ARCH ?= arm ++BUILD ?= debug + -+ goto fault_done; -+ } ++check_cc2 = \ ++ $(shell if $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ ++ then \ ++ echo "$(2)"; \ ++ else \ ++ echo "$(3)"; \ ++ fi ;) + -+ fault_status = faulting_as->fault_status; -+ switch (fault_status & AS_FAULTSTATUS_EXCEPTION_CODE_MASK) { ++# Check that required parameters are supplied. ++ifeq ($(CONFIG),) ++CONFIG := default ++endif ++ifeq ($(CPU)$(KDIR),) ++$(error "KDIR or CPU must be specified.") ++endif + -+ case AS_FAULTSTATUS_EXCEPTION_CODE_TRANSLATION_FAULT: -+ /* need to check against the region to handle this one */ -+ break; ++# Get any user defined KDIR- or maybe even a hardcoded KDIR ++-include KDIR_CONFIGURATION + -+ case AS_FAULTSTATUS_EXCEPTION_CODE_PERMISSION_FAULT: -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Permission failure"); -+ goto fault_done; ++# Define host system directory ++KDIR-$(shell uname -m):=/lib/modules/$(shell uname -r)/build + -+ case AS_FAULTSTATUS_EXCEPTION_CODE_TRANSTAB_BUS_FAULT: -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Translation table bus fault"); -+ goto fault_done; ++ifeq ($(ARCH), arm) ++# when compiling for ARM we're cross compiling ++export CROSS_COMPILE ?= $(call check_cc2, arm-linux-gnueabi-gcc, arm-linux-gnueabi-, arm-none-linux-gnueabi-) ++endif + -+ case AS_FAULTSTATUS_EXCEPTION_CODE_ACCESS_FLAG: -+ /* nothing to do, but we don't expect this fault currently */ -+ dev_warn(kbdev->dev, "Access flag unexpectedly set"); -+ goto fault_done; ++# look up KDIR based om CPU selection ++KDIR ?= $(KDIR-$(CPU)) + -+ case AS_FAULTSTATUS_EXCEPTION_CODE_ADDRESS_SIZE_FAULT: -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Address size fault"); -+ else -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Unknown fault code"); -+ goto fault_done; ++export CONFIG + -+ case AS_FAULTSTATUS_EXCEPTION_CODE_MEMORY_ATTRIBUTES_FAULT: -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Memory attributes fault"); -+ else -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Unknown fault code"); -+ goto fault_done; ++export CONFIG_UMP := m ++ifeq ($(BUILD),debug) ++export CONFIG_UMP_DEBUG := y ++else ++export CONFIG_UMP_DEBUG := n ++endif + -+ default: -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Unknown fault code"); -+ goto fault_done; -+ } ++ifeq ($(KDIR),) ++$(error No KDIR found for platform $(CPU)) ++endif + -+ /* so we have a translation fault, let's see if it is for growable -+ * memory */ -+ kbase_gpu_vm_lock(kctx); ++all: ++ $(MAKE) -C $(KDIR) M=$(CURDIR) modules + -+ region = kbase_region_tracker_find_region_enclosing_address(kctx, -+ faulting_as->fault_addr); -+ if (!region || region->flags & KBASE_REG_FREE) { -+ kbase_gpu_vm_unlock(kctx); -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Memory is not mapped on the GPU"); -+ goto fault_done; -+ } ++kernelrelease: ++ $(MAKE) -C $(KDIR) kernelrelease + -+ if (region->gpu_alloc->type == KBASE_MEM_TYPE_IMPORTED_UMM) { -+ kbase_gpu_vm_unlock(kctx); -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "DMA-BUF is not mapped on the GPU"); -+ goto fault_done; -+ } ++clean: ++ $(MAKE) -C $(KDIR) M=$(CURDIR) clean ++ $(MAKE) -C $(KDIR) M=$(CURDIR)/../mali clean +diff --git a/drivers/gpu/arm/mali400/ump/Makefile.common b/drivers/gpu/arm/mali400/ump/Makefile.common +new file mode 100755 +index 000000000..ad2c18da9 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/Makefile.common +@@ -0,0 +1,20 @@ ++# ++# Copyright (C) 2010-2011, 2013, 2016-2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++# as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained from Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++# + -+ if ((region->flags & GROWABLE_FLAGS_REQUIRED) -+ != GROWABLE_FLAGS_REQUIRED) { -+ kbase_gpu_vm_unlock(kctx); -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Memory is not growable"); -+ goto fault_done; -+ } ++SRC = $(UMP_FILE_PREFIX)common/ump_kernel_common.c \ ++ $(UMP_FILE_PREFIX)common/ump_kernel_descriptor_mapping.c \ ++ $(UMP_FILE_PREFIX)common/ump_kernel_api.c \ ++ $(UMP_FILE_PREFIX)common/ump_kernel_ref_drv.c + -+ if ((region->flags & KBASE_REG_DONT_NEED)) { -+ kbase_gpu_vm_unlock(kctx); -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Don't need memory can't be grown"); -+ goto fault_done; -+ } ++# Get subversion revision number, fall back to 0000 if no svn info is available ++SVN_REV:=$(shell ((svnversion | grep -qv exported && echo -n 'Revision: ' && svnversion) || git svn info | sed -e 's/$$$$/M/' | grep '^Revision: ' || echo ${MALI_RELEASE_NAME}) 2>/dev/null | sed -e 's/^Revision: //') + -+ /* find the size we need to grow it by */ -+ /* we know the result fit in a size_t due to kbase_region_tracker_find_region_enclosing_address -+ * validating the fault_adress to be within a size_t from the start_pfn */ -+ fault_rel_pfn = fault_pfn - region->start_pfn; ++EXTRA_CFLAGS += -DSVN_REV=$(SVN_REV) ++EXTRA_CFLAGS += -DSVN_REV_STRING=\"$(SVN_REV)\" +diff --git a/drivers/gpu/arm/mali400/ump/arch-default/config.h b/drivers/gpu/arm/mali400/ump/arch-default/config.h +new file mode 100755 +index 000000000..d4aef9dd0 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/arch-default/config.h +@@ -0,0 +1,24 @@ ++/* ++ * Copyright (C) 2010, 2012, 2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ if (fault_rel_pfn < kbase_reg_current_backed_size(region)) { -+ dev_dbg(kbdev->dev, "Page fault @ 0x%llx in allocated region 0x%llx-0x%llx of growable TMEM: Ignoring", -+ faulting_as->fault_addr, region->start_pfn, -+ region->start_pfn + -+ kbase_reg_current_backed_size(region)); ++#ifndef __ARCH_CONFIG_H__ ++#define __ARCH_CONFIG_H__ + -+ mutex_lock(&kbdev->mmu_hw_mutex); ++/* Use OS memory. */ ++#define ARCH_UMP_BACKEND_DEFAULT 1 + -+ kbase_mmu_hw_clear_fault(kbdev, faulting_as, kctx, -+ KBASE_MMU_FAULT_TYPE_PAGE); -+ /* [1] in case another page fault occurred while we were -+ * handling the (duplicate) page fault we need to ensure we -+ * don't loose the other page fault as result of us clearing -+ * the MMU IRQ. Therefore, after we clear the MMU IRQ we send -+ * an UNLOCK command that will retry any stalled memory -+ * transaction (which should cause the other page fault to be -+ * raised again). -+ */ -+ kbase_mmu_hw_do_operation(kbdev, faulting_as, NULL, 0, 0, -+ AS_COMMAND_UNLOCK, 1); ++/* OS memory won't need a base address. */ ++#define ARCH_UMP_MEMORY_ADDRESS_DEFAULT 0x00000000 + -+ mutex_unlock(&kbdev->mmu_hw_mutex); ++/* 512 MB maximum limit for UMP allocations. */ ++#define ARCH_UMP_MEMORY_SIZE_DEFAULT 512UL * 1024UL * 1024UL + -+ kbase_mmu_hw_enable_fault(kbdev, faulting_as, kctx, -+ KBASE_MMU_FAULT_TYPE_PAGE); -+ kbase_gpu_vm_unlock(kctx); + -+ goto fault_done; -+ } ++#endif /* __ARCH_CONFIG_H__ */ +diff --git a/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h b/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h +new file mode 100755 +index 000000000..182e90c1d +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h +@@ -0,0 +1,18 @@ ++/* ++ * Copyright (C) 2010-2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ new_pages = make_multiple(fault_rel_pfn - -+ kbase_reg_current_backed_size(region) + 1, -+ region->extent); ++#ifndef __ARCH_CONFIG_H__ ++#define __ARCH_CONFIG_H__ + -+ /* cap to max vsize */ -+ if (new_pages + kbase_reg_current_backed_size(region) > -+ region->nr_pages) -+ new_pages = region->nr_pages - -+ kbase_reg_current_backed_size(region); ++#define ARCH_UMP_BACKEND_DEFAULT 0 ++#define ARCH_UMP_MEMORY_ADDRESS_DEFAULT 0xE1000000 ++#define ARCH_UMP_MEMORY_SIZE_DEFAULT 16UL * 1024UL * 1024UL + -+ if (0 == new_pages) { -+ mutex_lock(&kbdev->mmu_hw_mutex); ++#endif /* __ARCH_CONFIG_H__ */ +diff --git a/drivers/gpu/arm/mali400/ump/arch/config.h b/drivers/gpu/arm/mali400/ump/arch/config.h +new file mode 100755 +index 000000000..d4aef9dd0 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/arch/config.h +@@ -0,0 +1,24 @@ ++/* ++ * Copyright (C) 2010, 2012, 2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ /* Duplicate of a fault we've already handled, nothing to do */ -+ kbase_mmu_hw_clear_fault(kbdev, faulting_as, kctx, -+ KBASE_MMU_FAULT_TYPE_PAGE); -+ /* See comment [1] about UNLOCK usage */ -+ kbase_mmu_hw_do_operation(kbdev, faulting_as, NULL, 0, 0, -+ AS_COMMAND_UNLOCK, 1); ++#ifndef __ARCH_CONFIG_H__ ++#define __ARCH_CONFIG_H__ + -+ mutex_unlock(&kbdev->mmu_hw_mutex); ++/* Use OS memory. */ ++#define ARCH_UMP_BACKEND_DEFAULT 1 + -+ kbase_mmu_hw_enable_fault(kbdev, faulting_as, kctx, -+ KBASE_MMU_FAULT_TYPE_PAGE); -+ kbase_gpu_vm_unlock(kctx); -+ goto fault_done; -+ } ++/* OS memory won't need a base address. */ ++#define ARCH_UMP_MEMORY_ADDRESS_DEFAULT 0x00000000 + -+ if (kbase_alloc_phy_pages_helper(region->gpu_alloc, new_pages) == 0) { -+ if (region->gpu_alloc != region->cpu_alloc) { -+ if (kbase_alloc_phy_pages_helper( -+ region->cpu_alloc, new_pages) == 0) { -+ grown = true; -+ } else { -+ kbase_free_phy_pages_helper(region->gpu_alloc, -+ new_pages); -+ } -+ } else { -+ grown = true; -+ } -+ } ++/* 512 MB maximum limit for UMP allocations. */ ++#define ARCH_UMP_MEMORY_SIZE_DEFAULT 512UL * 1024UL * 1024UL + + -+ if (grown) { -+ u64 pfn_offset; -+ u32 op; ++#endif /* __ARCH_CONFIG_H__ */ +diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c +new file mode 100755 +index 000000000..36adb2f53 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c +@@ -0,0 +1,455 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ /* alloc success */ -+ KBASE_DEBUG_ASSERT(kbase_reg_current_backed_size(region) <= region->nr_pages); ++#include "mali_osk.h" ++#include "mali_osk_list.h" ++#include "ump_osk.h" ++#include "ump_uk_types.h" ++#include "ump_kernel_interface.h" ++#include "ump_kernel_common.h" ++#include "ump_kernel_random_mapping.h" + -+ /* set up the new pages */ -+ pfn_offset = kbase_reg_current_backed_size(region) - new_pages; -+ /* -+ * Note: -+ * Issuing an MMU operation will unlock the MMU and cause the -+ * translation to be replayed. If the page insertion fails then -+ * rather then trying to continue the context should be killed -+ * so the no_flush version of insert_pages is used which allows -+ * us to unlock the MMU as we see fit. -+ */ -+ err = kbase_mmu_insert_pages_no_flush(kctx, -+ region->start_pfn + pfn_offset, -+ &kbase_get_gpu_phy_pages(region)[pfn_offset], -+ new_pages, region->flags); -+ if (err) { -+ kbase_free_phy_pages_helper(region->gpu_alloc, new_pages); -+ if (region->gpu_alloc != region->cpu_alloc) -+ kbase_free_phy_pages_helper(region->cpu_alloc, -+ new_pages); -+ kbase_gpu_vm_unlock(kctx); -+ /* The locked VA region will be unlocked and the cache invalidated in here */ -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Page table update failure"); -+ goto fault_done; -+ } -+#if defined(CONFIG_MALI_BIFROST_GATOR_SUPPORT) -+ kbase_trace_mali_page_fault_insert_pages(as_no, new_pages); -+#endif -+ KBASE_TLSTREAM_AUX_PAGEFAULT(kctx->id, (u64)new_pages); + -+ /* AS transaction begin */ -+ mutex_lock(&kbdev->mmu_hw_mutex); + -+ /* flush L2 and unlock the VA (resumes the MMU) */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_6367)) -+ op = AS_COMMAND_FLUSH; -+ else -+ op = AS_COMMAND_FLUSH_PT; ++/* ---------------- UMP kernel space API functions follows ---------------- */ + -+ /* clear MMU interrupt - this needs to be done after updating -+ * the page tables but before issuing a FLUSH command. The -+ * FLUSH cmd has a side effect that it restarts stalled memory -+ * transactions in other address spaces which may cause -+ * another fault to occur. If we didn't clear the interrupt at -+ * this stage a new IRQ might not be raised when the GPU finds -+ * a MMU IRQ is already pending. -+ */ -+ kbase_mmu_hw_clear_fault(kbdev, faulting_as, kctx, -+ KBASE_MMU_FAULT_TYPE_PAGE); + -+ kbase_mmu_hw_do_operation(kbdev, faulting_as, kctx, -+ faulting_as->fault_addr >> PAGE_SHIFT, -+ new_pages, -+ op, 1); + -+ mutex_unlock(&kbdev->mmu_hw_mutex); -+ /* AS transaction end */ ++UMP_KERNEL_API_EXPORT ump_secure_id ump_dd_secure_id_get(ump_dd_handle memh) ++{ ++ ump_dd_mem *mem = (ump_dd_mem *)memh; + -+ /* reenable this in the mask */ -+ kbase_mmu_hw_enable_fault(kbdev, faulting_as, kctx, -+ KBASE_MMU_FAULT_TYPE_PAGE); -+ kbase_gpu_vm_unlock(kctx); -+ } else { -+ /* failed to extend, handle as a normal PF */ -+ kbase_gpu_vm_unlock(kctx); -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Page allocation failure"); -+ } ++ DEBUG_ASSERT_POINTER(mem); + -+fault_done: -+ /* -+ * By this point, the fault was handled in some way, -+ * so release the ctx refcount -+ */ -+ kbasep_js_runpool_release_ctx(kbdev, kctx); ++ DBG_MSG(5, ("Returning secure ID. ID: %u\n", mem->secure_id)); + -+ atomic_dec(&kbdev->faults_pending); ++ return mem->secure_id; +} + -+phys_addr_t kbase_mmu_alloc_pgd(struct kbase_context *kctx) -+{ -+ u64 *page; -+ int i; -+ struct page *p; -+ int new_page_count __maybe_unused; + -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ new_page_count = kbase_atomic_add_pages(1, &kctx->used_pages); -+ kbase_atomic_add_pages(1, &kctx->kbdev->memdev.used_pages); + -+ p = kbase_mem_pool_alloc(&kctx->mem_pool); -+ if (!p) -+ goto sub_pages; ++UMP_KERNEL_API_EXPORT ump_dd_handle ump_dd_handle_create_from_secure_id(ump_secure_id secure_id) ++{ ++ ump_dd_mem *mem; + -+ KBASE_TLSTREAM_AUX_PAGESALLOC( -+ kctx->id, -+ (u64)new_page_count); ++ DBG_MSG(5, ("Getting handle from secure ID. ID: %u\n", secure_id)); ++ mem = ump_random_mapping_get(device.secure_id_map, (int)secure_id); ++ if (NULL == mem) { ++ DBG_MSG(1, ("Secure ID not found. ID: %u\n", secure_id)); ++ return UMP_DD_HANDLE_INVALID; ++ } + -+ page = kmap(p); -+ if (NULL == page) -+ goto alloc_free; ++ /* Keep the reference taken in ump_random_mapping_get() */ + -+ kbase_process_page_usage_inc(kctx, 1); ++ return (ump_dd_handle)mem; ++} + -+ for (i = 0; i < KBASE_MMU_PAGE_ENTRIES; i++) -+ kctx->kbdev->mmu_mode->entry_invalidate(&page[i]); + -+ kbase_mmu_sync_pgd(kctx->kbdev, kbase_dma_addr(p), PAGE_SIZE); + -+ kunmap(p); -+ return page_to_phys(p); ++UMP_KERNEL_API_EXPORT unsigned long ump_dd_phys_block_count_get(ump_dd_handle memh) ++{ ++ ump_dd_mem *mem = (ump_dd_mem *) memh; + -+alloc_free: -+ kbase_mem_pool_free(&kctx->mem_pool, p, false); -+sub_pages: -+ kbase_atomic_sub_pages(1, &kctx->used_pages); -+ kbase_atomic_sub_pages(1, &kctx->kbdev->memdev.used_pages); ++ DEBUG_ASSERT_POINTER(mem); + -+ return 0; ++ return mem->nr_blocks; +} + -+KBASE_EXPORT_TEST_API(kbase_mmu_alloc_pgd); -+ -+/* Given PGD PFN for level N, return PGD PFN for level N+1, allocating the -+ * new table from the pool if needed and possible -+ */ -+static int mmu_get_next_pgd(struct kbase_context *kctx, -+ phys_addr_t *pgd, u64 vpfn, int level) -+{ -+ u64 *page; -+ phys_addr_t target_pgd; -+ struct page *p; + -+ KBASE_DEBUG_ASSERT(*pgd); -+ KBASE_DEBUG_ASSERT(NULL != kctx); + -+ lockdep_assert_held(&kctx->mmu_lock); ++UMP_KERNEL_API_EXPORT ump_dd_status_code ump_dd_phys_blocks_get(ump_dd_handle memh, ump_dd_physical_block *blocks, unsigned long num_blocks) ++{ ++ ump_dd_mem *mem = (ump_dd_mem *)memh; + -+ /* -+ * Architecture spec defines level-0 as being the top-most. -+ * This is a bit unfortunate here, but we keep the same convention. -+ */ -+ vpfn >>= (3 - level) * 9; -+ vpfn &= 0x1FF; ++ DEBUG_ASSERT_POINTER(mem); + -+ p = pfn_to_page(PFN_DOWN(*pgd)); -+ page = kmap(p); -+ if (NULL == page) { -+ dev_warn(kctx->kbdev->dev, "mmu_get_next_pgd: kmap failure\n"); -+ return -EINVAL; ++ if (blocks == NULL) { ++ DBG_MSG(1, ("NULL parameter in ump_dd_phys_blocks_get()\n")); ++ return UMP_DD_INVALID; + } + -+ target_pgd = kctx->kbdev->mmu_mode->pte_to_phy_addr(page[vpfn]); ++ if (mem->nr_blocks != num_blocks) { ++ DBG_MSG(1, ("Specified number of blocks do not match actual number of blocks\n")); ++ return UMP_DD_INVALID; ++ } + -+ if (!target_pgd) { -+ target_pgd = kbase_mmu_alloc_pgd(kctx); -+ if (!target_pgd) { -+ dev_dbg(kctx->kbdev->dev, "mmu_get_next_pgd: kbase_mmu_alloc_pgd failure\n"); -+ kunmap(p); -+ return -ENOMEM; -+ } ++ DBG_MSG(5, ("Returning physical block information. ID: %u\n", mem->secure_id)); + -+ kctx->kbdev->mmu_mode->entry_set_pte(&page[vpfn], target_pgd); ++ _mali_osk_memcpy(blocks, mem->block_array, sizeof(ump_dd_physical_block) * mem->nr_blocks); + -+ kbase_mmu_sync_pgd(kctx->kbdev, kbase_dma_addr(p), PAGE_SIZE); -+ /* Rely on the caller to update the address space flags. */ -+ } ++ return UMP_DD_SUCCESS; ++} + -+ kunmap(p); -+ *pgd = target_pgd; + -+ return 0; -+} + -+/* -+ * Returns the PGD for the specified level of translation -+ */ -+static int mmu_get_pgd_at_level(struct kbase_context *kctx, -+ u64 vpfn, -+ unsigned int level, -+ phys_addr_t *out_pgd) ++UMP_KERNEL_API_EXPORT ump_dd_status_code ump_dd_phys_block_get(ump_dd_handle memh, unsigned long index, ump_dd_physical_block *block) +{ -+ phys_addr_t pgd; -+ int l; ++ ump_dd_mem *mem = (ump_dd_mem *)memh; + -+ lockdep_assert_held(&kctx->mmu_lock); -+ pgd = kctx->pgd; ++ DEBUG_ASSERT_POINTER(mem); + -+ for (l = MIDGARD_MMU_TOPLEVEL; l < level; l++) { -+ int err = mmu_get_next_pgd(kctx, &pgd, vpfn, l); -+ /* Handle failure condition */ -+ if (err) { -+ dev_dbg(kctx->kbdev->dev, -+ "%s: mmu_get_next_pgd failure at level %d\n", -+ __func__, l); -+ return err; -+ } ++ if (block == NULL) { ++ DBG_MSG(1, ("NULL parameter in ump_dd_phys_block_get()\n")); ++ return UMP_DD_INVALID; + } + -+ *out_pgd = pgd; ++ if (index >= mem->nr_blocks) { ++ DBG_MSG(5, ("Invalid index specified in ump_dd_phys_block_get()\n")); ++ return UMP_DD_INVALID; ++ } + -+ return 0; -+} ++ DBG_MSG(5, ("Returning physical block information. ID: %u, index: %lu\n", mem->secure_id, index)); + -+#define mmu_get_bottom_pgd(kctx, vpfn, out_pgd) \ -+ mmu_get_pgd_at_level((kctx), (vpfn), MIDGARD_MMU_BOTTOMLEVEL, (out_pgd)) ++ *block = mem->block_array[index]; + ++ return UMP_DD_SUCCESS; ++} + -+static void mmu_insert_pages_failure_recovery(struct kbase_context *kctx, -+ u64 from_vpfn, u64 to_vpfn) -+{ -+ phys_addr_t pgd; -+ u64 vpfn = from_vpfn; -+ struct kbase_mmu_mode const *mmu_mode; + -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ KBASE_DEBUG_ASSERT(0 != vpfn); -+ /* 64-bit address range is the max */ -+ KBASE_DEBUG_ASSERT(vpfn <= (U64_MAX / PAGE_SIZE)); -+ KBASE_DEBUG_ASSERT(from_vpfn <= to_vpfn); + -+ lockdep_assert_held(&kctx->mmu_lock); -+ lockdep_assert_held(&kctx->reg_lock); ++UMP_KERNEL_API_EXPORT unsigned long ump_dd_size_get(ump_dd_handle memh) ++{ ++ ump_dd_mem *mem = (ump_dd_mem *)memh; + -+ mmu_mode = kctx->kbdev->mmu_mode; ++ DEBUG_ASSERT_POINTER(mem); + -+ while (vpfn < to_vpfn) { -+ unsigned int i; -+ unsigned int idx = vpfn & 0x1FF; -+ unsigned int count = KBASE_MMU_PAGE_ENTRIES - idx; -+ unsigned int pcount = 0; -+ unsigned int left = to_vpfn - vpfn; -+ unsigned int level; -+ u64 *page; ++ DBG_MSG(5, ("Returning size. ID: %u, size: %lu\n", mem->secure_id, mem->size_bytes)); + -+ if (count > left) -+ count = left; ++ return mem->size_bytes; ++} + -+ /* need to check if this is a 2MB page or a 4kB */ -+ pgd = kctx->pgd; + -+ for (level = MIDGARD_MMU_TOPLEVEL; -+ level <= MIDGARD_MMU_BOTTOMLEVEL; level++) { -+ idx = (vpfn >> ((3 - level) * 9)) & 0x1FF; -+ page = kmap(phys_to_page(pgd)); -+ if (mmu_mode->ate_is_valid(page[idx], level)) -+ break; /* keep the mapping */ -+ kunmap(phys_to_page(pgd)); -+ pgd = mmu_mode->pte_to_phy_addr(page[idx]); -+ } + -+ switch (level) { -+ case MIDGARD_MMU_LEVEL(2): -+ /* remap to single entry to update */ -+ pcount = 1; -+ break; -+ case MIDGARD_MMU_BOTTOMLEVEL: -+ /* page count is the same as the logical count */ -+ pcount = count; -+ break; -+ default: -+ dev_warn(kctx->kbdev->dev, "%sNo support for ATEs at level %d\n", -+ __func__, level); -+ goto next; -+ } ++UMP_KERNEL_API_EXPORT void ump_dd_reference_add(ump_dd_handle memh) ++{ ++ ump_dd_mem *mem = (ump_dd_mem *)memh; ++ int new_ref; + -+ /* Invalidate the entries we added */ -+ for (i = 0; i < pcount; i++) -+ mmu_mode->entry_invalidate(&page[idx + i]); ++ DEBUG_ASSERT_POINTER(mem); + -+ kbase_mmu_sync_pgd(kctx->kbdev, -+ kbase_dma_addr(phys_to_page(pgd)) + 8 * idx, -+ 8 * pcount); -+ kunmap(phys_to_page(pgd)); ++ new_ref = _ump_osk_atomic_inc_and_read(&mem->ref_count); + -+next: -+ vpfn += count; -+ } ++ DBG_MSG(5, ("Memory reference incremented. ID: %u, new value: %d\n", mem->secure_id, new_ref)); +} + -+/* -+ * Map the single page 'phys' 'nr' of times, starting at GPU PFN 'vpfn' -+ */ -+int kbase_mmu_insert_single_page(struct kbase_context *kctx, u64 vpfn, -+ struct tagged_addr phys, size_t nr, -+ unsigned long flags) -+{ -+ phys_addr_t pgd; -+ u64 *pgd_page; -+ /* In case the insert_single_page only partially completes we need to be -+ * able to recover */ -+ bool recover_required = false; -+ u64 recover_vpfn = vpfn; -+ size_t recover_count = 0; -+ size_t remain = nr; -+ int err; -+ struct kbase_mmu_mode const *mmu_mode; -+ -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ KBASE_DEBUG_ASSERT(0 != vpfn); -+ /* 64-bit address range is the max */ -+ KBASE_DEBUG_ASSERT(vpfn <= (U64_MAX / PAGE_SIZE)); -+ -+ mmu_mode = kctx->kbdev->mmu_mode; + -+ /* Early out if there is nothing to do */ -+ if (nr == 0) -+ return 0; + -+ mutex_lock(&kctx->mmu_lock); ++UMP_KERNEL_API_EXPORT void ump_dd_reference_release(ump_dd_handle memh) ++{ ++ ump_dd_mem *mem = (ump_dd_mem *)memh; + -+ while (remain) { -+ unsigned int i; -+ unsigned int index = vpfn & 0x1FF; -+ unsigned int count = KBASE_MMU_PAGE_ENTRIES - index; -+ struct page *p; ++ DEBUG_ASSERT_POINTER(mem); + -+ if (count > remain) -+ count = remain; ++ ump_random_mapping_put(mem); ++} + -+ /* -+ * Repeatedly calling mmu_get_bottom_pte() is clearly -+ * suboptimal. We don't have to re-parse the whole tree -+ * each time (just cache the l0-l2 sequence). -+ * On the other hand, it's only a gain when we map more than -+ * 256 pages at once (on average). Do we really care? -+ */ -+ do { -+ err = mmu_get_bottom_pgd(kctx, vpfn, &pgd); -+ if (err != -ENOMEM) -+ break; -+ /* Fill the memory pool with enough pages for -+ * the page walk to succeed -+ */ -+ mutex_unlock(&kctx->mmu_lock); -+ err = kbase_mem_pool_grow(&kctx->mem_pool, -+ MIDGARD_MMU_BOTTOMLEVEL); -+ mutex_lock(&kctx->mmu_lock); -+ } while (!err); -+ if (err) { -+ dev_warn(kctx->kbdev->dev, "kbase_mmu_insert_pages: mmu_get_bottom_pgd failure\n"); -+ if (recover_required) { -+ /* Invalidate the pages we have partially -+ * completed */ -+ mmu_insert_pages_failure_recovery(kctx, -+ recover_vpfn, -+ recover_vpfn + -+ recover_count -+ ); -+ } -+ goto fail_unlock; -+ } + -+ p = pfn_to_page(PFN_DOWN(pgd)); -+ pgd_page = kmap(p); -+ if (!pgd_page) { -+ dev_warn(kctx->kbdev->dev, "kbase_mmu_insert_pages: kmap failure\n"); -+ if (recover_required) { -+ /* Invalidate the pages we have partially -+ * completed */ -+ mmu_insert_pages_failure_recovery(kctx, -+ recover_vpfn, -+ recover_vpfn + -+ recover_count -+ ); -+ } -+ err = -ENOMEM; -+ goto fail_unlock; -+ } + -+ for (i = 0; i < count; i++) { -+ unsigned int ofs = index + i; ++/* --------------- Handling of user space requests follows --------------- */ + -+ /* Fail if the current page is a valid ATE entry */ -+ KBASE_DEBUG_ASSERT(0 == (pgd_page[ofs] & 1UL)); + -+ mmu_mode->entry_set_ate(&pgd_page[ofs], -+ phys, flags, -+ MIDGARD_MMU_BOTTOMLEVEL); -+ } ++_mali_osk_errcode_t _ump_uku_get_api_version(_ump_uk_api_version_s *args) ++{ ++ ump_session_data *session_data; + -+ vpfn += count; -+ remain -= count; ++ DEBUG_ASSERT_POINTER(args); ++ DEBUG_ASSERT_POINTER(args->ctx); + -+ kbase_mmu_sync_pgd(kctx->kbdev, -+ kbase_dma_addr(p) + (index * sizeof(u64)), -+ count * sizeof(u64)); ++ session_data = (ump_session_data *)args->ctx; + -+ kunmap(p); -+ /* We have started modifying the page table. -+ * If further pages need inserting and fail we need to undo what -+ * has already taken place */ -+ recover_required = true; -+ recover_count += count; ++ /* check compatability */ ++ if (args->version == UMP_IOCTL_API_VERSION) { ++ DBG_MSG(3, ("API version set to newest %d (compatible)\n", ++ GET_VERSION(args->version))); ++ args->compatible = 1; ++ session_data->api_version = args->version; ++ } else { ++ DBG_MSG(2, ("API version set to %d (incompatible with client version %d)\n", ++ GET_VERSION(UMP_IOCTL_API_VERSION), GET_VERSION(args->version))); ++ args->compatible = 0; ++ args->version = UMP_IOCTL_API_VERSION; /* report our version */ + } -+ mutex_unlock(&kctx->mmu_lock); -+ kbase_mmu_flush_invalidate(kctx, vpfn, nr, false); -+ return 0; + -+fail_unlock: -+ mutex_unlock(&kctx->mmu_lock); -+ kbase_mmu_flush_invalidate(kctx, vpfn, nr, false); -+ return err; ++ return _MALI_OSK_ERR_OK; +} + -+static inline void cleanup_empty_pte(struct kbase_context *kctx, u64 *pte) ++ ++_mali_osk_errcode_t _ump_ukk_release(_ump_uk_release_s *release_info) +{ -+ phys_addr_t tmp_pgd; -+ struct page *tmp_p; ++ ump_session_memory_list_element *session_memory_element; ++ ump_session_memory_list_element *tmp; ++ ump_session_data *session_data; ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_INVALID_FUNC; ++ int secure_id; + -+ tmp_pgd = kctx->kbdev->mmu_mode->pte_to_phy_addr(*pte); -+ tmp_p = phys_to_page(tmp_pgd); -+ kbase_mem_pool_free(&kctx->mem_pool, tmp_p, false); -+ kbase_process_page_usage_dec(kctx, 1); -+ kbase_atomic_sub_pages(1, &kctx->used_pages); -+ kbase_atomic_sub_pages(1, &kctx->kbdev->memdev.used_pages); -+} ++ DEBUG_ASSERT_POINTER(release_info); ++ DEBUG_ASSERT_POINTER(release_info->ctx); + -+int kbase_mmu_insert_pages_no_flush(struct kbase_context *kctx, -+ const u64 start_vpfn, -+ struct tagged_addr *phys, size_t nr, -+ unsigned long flags) -+{ -+ phys_addr_t pgd; -+ u64 *pgd_page; -+ u64 insert_vpfn = start_vpfn; -+ size_t remain = nr; -+ int err; -+ struct kbase_mmu_mode const *mmu_mode; ++ /* Retreive the session data */ ++ session_data = (ump_session_data *)release_info->ctx; + -+ KBASE_DEBUG_ASSERT(kctx); -+ KBASE_DEBUG_ASSERT(start_vpfn); -+ /* 64-bit address range is the max */ -+ KBASE_DEBUG_ASSERT(start_vpfn <= (U64_MAX / PAGE_SIZE)); ++ /* If there are many items in the memory session list we ++ * could be de-referencing this pointer a lot so keep a local copy ++ */ ++ secure_id = release_info->secure_id; + -+ mmu_mode = kctx->kbdev->mmu_mode; ++ DBG_MSG(4, ("Releasing memory with IOCTL, ID: %u\n", secure_id)); + -+ /* Early out if there is nothing to do */ -+ if (nr == 0) -+ return 0; ++ /* Iterate through the memory list looking for the requested secure ID */ ++ _mali_osk_mutex_wait(session_data->lock); ++ _MALI_OSK_LIST_FOREACHENTRY(session_memory_element, tmp, &session_data->list_head_session_memory_list, ump_session_memory_list_element, list) { ++ if (session_memory_element->mem->secure_id == secure_id) { ++ ump_dd_mem *release_mem; + -+ mutex_lock(&kctx->mmu_lock); ++ release_mem = session_memory_element->mem; ++ _mali_osk_list_del(&session_memory_element->list); ++ ump_dd_reference_release(release_mem); ++ _mali_osk_free(session_memory_element); + -+ while (remain) { -+ unsigned int i; -+ unsigned int vindex = insert_vpfn & 0x1FF; -+ unsigned int count = KBASE_MMU_PAGE_ENTRIES - vindex; -+ struct page *p; -+ unsigned int cur_level; ++ ret = _MALI_OSK_ERR_OK; ++ break; ++ } ++ } + -+ if (count > remain) -+ count = remain; ++ _mali_osk_mutex_signal(session_data->lock); ++ DBG_MSG_IF(1, _MALI_OSK_ERR_OK != ret, ("UMP memory with ID %u does not belong to this session.\n", secure_id)); + -+ if (!vindex && is_huge_head(*phys)) -+ cur_level = MIDGARD_MMU_LEVEL(2); -+ else -+ cur_level = MIDGARD_MMU_BOTTOMLEVEL; ++ DBG_MSG(4, ("_ump_ukk_release() returning 0x%x\n", ret)); ++ return ret; ++} + -+ /* -+ * Repeatedly calling mmu_get_pgd_at_level() is clearly -+ * suboptimal. We don't have to re-parse the whole tree -+ * each time (just cache the l0-l2 sequence). -+ * On the other hand, it's only a gain when we map more than -+ * 256 pages at once (on average). Do we really care? -+ */ -+ do { -+ err = mmu_get_pgd_at_level(kctx, insert_vpfn, cur_level, -+ &pgd); -+ if (err != -ENOMEM) -+ break; -+ /* Fill the memory pool with enough pages for -+ * the page walk to succeed -+ */ -+ mutex_unlock(&kctx->mmu_lock); -+ err = kbase_mem_pool_grow(&kctx->mem_pool, -+ cur_level); -+ mutex_lock(&kctx->mmu_lock); -+ } while (!err); ++_mali_osk_errcode_t _ump_ukk_size_get(_ump_uk_size_get_s *user_interaction) ++{ ++ ump_dd_mem *mem; ++ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; + -+ if (err) { -+ dev_warn(kctx->kbdev->dev, -+ "%s: mmu_get_bottom_pgd failure\n", __func__); -+ if (insert_vpfn != start_vpfn) { -+ /* Invalidate the pages we have partially -+ * completed */ -+ mmu_insert_pages_failure_recovery(kctx, -+ start_vpfn, -+ insert_vpfn); -+ } -+ goto fail_unlock; -+ } ++ DEBUG_ASSERT_POINTER(user_interaction); + -+ p = pfn_to_page(PFN_DOWN(pgd)); -+ pgd_page = kmap(p); -+ if (!pgd_page) { -+ dev_warn(kctx->kbdev->dev, "%s: kmap failure\n", -+ __func__); -+ if (insert_vpfn != start_vpfn) { -+ /* Invalidate the pages we have partially -+ * completed */ -+ mmu_insert_pages_failure_recovery(kctx, -+ start_vpfn, -+ insert_vpfn); -+ } -+ err = -ENOMEM; -+ goto fail_unlock; -+ } ++ /* We lock the mappings so things don't get removed while we are looking for the memory */ ++ mem = ump_random_mapping_get(device.secure_id_map, user_interaction->secure_id); ++ if (NULL != mem) { ++ user_interaction->size = mem->size_bytes; ++ DBG_MSG(4, ("Returning size. ID: %u, size: %lu ", ++ (ump_secure_id)user_interaction->secure_id, ++ (unsigned long)user_interaction->size)); ++ ump_random_mapping_put(mem); ++ ret = _MALI_OSK_ERR_OK; ++ } else { ++ user_interaction->size = 0; ++ DBG_MSG(1, ("Failed to look up mapping in ump_ioctl_size_get(). ID: %u\n", ++ (ump_secure_id)user_interaction->secure_id)); ++ } + -+ if (cur_level == MIDGARD_MMU_LEVEL(2)) { -+ unsigned int level_index = (insert_vpfn >> 9) & 0x1FF; -+ u64 *target = &pgd_page[level_index]; ++ return ret; ++} + -+ if (mmu_mode->pte_is_valid(*target, cur_level)) -+ cleanup_empty_pte(kctx, target); -+ mmu_mode->entry_set_ate(target, *phys, flags, -+ cur_level); -+ } else { -+ for (i = 0; i < count; i++) { -+ unsigned int ofs = vindex + i; -+ u64 *target = &pgd_page[ofs]; + -+ /* Fail if the current page is a valid ATE entry -+ */ -+ KBASE_DEBUG_ASSERT(0 == (*target & 1UL)); + -+ kctx->kbdev->mmu_mode->entry_set_ate(target, -+ phys[i], flags, cur_level); -+ } -+ } ++void _ump_ukk_msync(_ump_uk_msync_s *args) ++{ ++ ump_dd_mem *mem = NULL; ++ void *virtual = NULL; ++ u32 size = 0; ++ u32 offset = 0; + -+ phys += count; -+ insert_vpfn += count; -+ remain -= count; ++ mem = ump_random_mapping_get(device.secure_id_map, (int)args->secure_id); ++ if (NULL == mem) { ++ DBG_MSG(1, ("Failed to look up mapping in _ump_ukk_msync(). ID: %u\n", ++ (ump_secure_id)args->secure_id)); ++ return; ++ } + -+ kbase_mmu_sync_pgd(kctx->kbdev, -+ kbase_dma_addr(p) + (vindex * sizeof(u64)), -+ count * sizeof(u64)); ++ /* Returns the cache settings back to Userspace */ ++ args->is_cached = mem->is_cached; + -+ kunmap(p); ++ /* If this flag is the only one set, we should not do the actual flush, only the readout */ ++ if (_UMP_UK_MSYNC_READOUT_CACHE_ENABLED == args->op) { ++ DBG_MSG(3, ("_ump_ukk_msync READOUT ID: %u Enabled: %d\n", (ump_secure_id)args->secure_id, mem->is_cached)); ++ goto msync_release_and_return; + } + -+ mutex_unlock(&kctx->mmu_lock); -+ return 0; ++ /* Nothing to do if the memory is not caches */ ++ if (0 == mem->is_cached) { ++ DBG_MSG(3, ("_ump_ukk_msync IGNORING ID: %u Enabled: %d OP: %d\n", (ump_secure_id)args->secure_id, mem->is_cached, args->op)); ++ goto msync_release_and_return; ++ } ++ DBG_MSG(3, ("UMP[%02u] _ump_ukk_msync Flush OP: %d Address: 0x%08x Mapping: 0x%08x\n", ++ (ump_secure_id)args->secure_id, args->op, args->address, args->mapping)); + -+fail_unlock: -+ mutex_unlock(&kctx->mmu_lock); -+ return err; -+} ++ if (args->address) { ++ virtual = (void *)((u32)args->address); ++ offset = (u32)((args->address) - (args->mapping)); ++ } else { ++ /* Flush entire mapping when no address is specified. */ ++ virtual = args->mapping; ++ } ++ if (args->size) { ++ size = args->size; ++ } else { ++ /* Flush entire mapping when no size is specified. */ ++ size = mem->size_bytes - offset; ++ } + -+/* -+ * Map 'nr' pages pointed to by 'phys' at GPU PFN 'vpfn' -+ */ -+int kbase_mmu_insert_pages(struct kbase_context *kctx, u64 vpfn, -+ struct tagged_addr *phys, size_t nr, -+ unsigned long flags) -+{ -+ int err; ++ if ((offset + size) > mem->size_bytes) { ++ DBG_MSG(1, ("Trying to flush more than the entire UMP allocation: offset: %u + size: %u > %u\n", offset, size, mem->size_bytes)); ++ goto msync_release_and_return; ++ } + -+ err = kbase_mmu_insert_pages_no_flush(kctx, vpfn, phys, nr, flags); -+ kbase_mmu_flush_invalidate(kctx, vpfn, nr, false); -+ return err; -+} ++ /* The actual cache flush - Implemented for each OS*/ ++ _ump_osk_msync(mem, virtual, offset, size, args->op, NULL); + -+KBASE_EXPORT_TEST_API(kbase_mmu_insert_pages); ++msync_release_and_return: ++ ump_random_mapping_put(mem); ++ return; ++} + -+/** -+ * kbase_mmu_flush_invalidate_noretain() - Flush and invalidate the GPU caches -+ * without retaining the kbase context. -+ * @kctx: The KBase context. -+ * @vpfn: The virtual page frame number to start the flush on. -+ * @nr: The number of pages to flush. -+ * @sync: Set if the operation should be synchronous or not. -+ * -+ * As per kbase_mmu_flush_invalidate but doesn't retain the kctx or do any -+ * other locking. -+ */ -+static void kbase_mmu_flush_invalidate_noretain(struct kbase_context *kctx, -+ u64 vpfn, size_t nr, bool sync) ++void _ump_ukk_cache_operations_control(_ump_uk_cache_operations_control_s *args) +{ -+ struct kbase_device *kbdev = kctx->kbdev; -+ int err; -+ u32 op; ++ ump_session_data *session_data; ++ ump_uk_cache_op_control op; + -+ /* Early out if there is nothing to do */ -+ if (nr == 0) -+ return; ++ DEBUG_ASSERT_POINTER(args); ++ DEBUG_ASSERT_POINTER(args->ctx); + -+ if (sync) -+ op = AS_COMMAND_FLUSH_MEM; -+ else -+ op = AS_COMMAND_FLUSH_PT; ++ op = args->op; ++ session_data = (ump_session_data *)args->ctx; + -+ err = kbase_mmu_hw_do_operation(kbdev, -+ &kbdev->as[kctx->as_nr], -+ kctx, vpfn, nr, op, 0); -+#if KBASE_GPU_RESET_EN -+ if (err) { -+ /* Flush failed to complete, assume the -+ * GPU has hung and perform a reset to -+ * recover */ -+ dev_err(kbdev->dev, "Flush for GPU page table update did not complete. Issuing GPU soft-reset to recover\n"); ++ _mali_osk_mutex_wait(session_data->lock); ++ if (op == _UMP_UK_CACHE_OP_START) { ++ session_data->cache_operations_ongoing++; ++ DBG_MSG(4, ("Cache ops start\n")); ++ if (session_data->cache_operations_ongoing != 1) { ++ DBG_MSG(2, ("UMP: Number of simultanious cache control ops: %d\n", session_data->cache_operations_ongoing)); ++ } ++ } else if (op == _UMP_UK_CACHE_OP_FINISH) { ++ DBG_MSG(4, ("Cache ops finish\n")); ++ session_data->cache_operations_ongoing--; ++#if 0 ++ if (session_data->has_pending_level1_cache_flush) { ++ /* This function will set has_pending_level1_cache_flush=0 */ ++ _ump_osk_msync(NULL, NULL, 0, 0, _UMP_UK_MSYNC_FLUSH_L1, session_data); ++ } ++#endif + -+ if (kbase_prepare_to_reset_gpu_locked(kbdev)) -+ kbase_reset_gpu_locked(kbdev); ++ /* to be on the safe side: always flush l1 cache when cache operations are done */ ++ _ump_osk_msync(NULL, NULL, 0, 0, _UMP_UK_MSYNC_FLUSH_L1, session_data); ++ DBG_MSG(4, ("Cache ops finish end\n")); ++ } else { ++ DBG_MSG(1, ("Illegal call to %s at line %d\n", __FUNCTION__, __LINE__)); + } -+#endif /* KBASE_GPU_RESET_EN */ ++ _mali_osk_mutex_signal(session_data->lock); + -+#ifndef CONFIG_MALI_BIFROST_NO_MALI -+ /* -+ * As this function could be called in interrupt context the sync -+ * request can't block. Instead log the request and the next flush -+ * request will pick it up. -+ */ -+ if ((!err) && sync && -+ kbase_hw_has_issue(kctx->kbdev, BASE_HW_ISSUE_6367)) -+ atomic_set(&kctx->drain_pending, 1); -+#endif /* !CONFIG_MALI_BIFROST_NO_MALI */ +} + -+static void kbase_mmu_flush_invalidate(struct kbase_context *kctx, -+ u64 vpfn, size_t nr, bool sync) ++void _ump_ukk_switch_hw_usage(_ump_uk_switch_hw_usage_s *args) +{ -+ struct kbase_device *kbdev; -+ bool ctx_is_in_runpool; -+#ifndef CONFIG_MALI_BIFROST_NO_MALI -+ bool drain_pending = false; ++ ump_dd_mem *mem = NULL; ++ ump_uk_user old_user; ++ ump_uk_msync_op cache_op = _UMP_UK_MSYNC_CLEAN_AND_INVALIDATE; ++ ump_session_data *session_data; + -+ if (atomic_xchg(&kctx->drain_pending, 0)) -+ drain_pending = true; -+#endif /* !CONFIG_MALI_BIFROST_NO_MALI */ ++ DEBUG_ASSERT_POINTER(args); ++ DEBUG_ASSERT_POINTER(args->ctx); + -+ /* Early out if there is nothing to do */ -+ if (nr == 0) ++ session_data = (ump_session_data *)args->ctx; ++ ++ mem = ump_random_mapping_get(device.secure_id_map, (int)args->secure_id); ++ if (NULL == mem) { ++ DBG_MSG(1, ("Failed to look up mapping in _ump_ukk_switch_hw_usage(). ID: %u\n", ++ (ump_secure_id)args->secure_id)); + return; ++ } + -+ kbdev = kctx->kbdev; -+ mutex_lock(&kbdev->js_data.queue_mutex); -+ ctx_is_in_runpool = kbasep_js_runpool_retain_ctx(kbdev, kctx); -+ mutex_unlock(&kbdev->js_data.queue_mutex); ++ old_user = mem->hw_device; ++ mem->hw_device = args->new_user; + -+ if (ctx_is_in_runpool) { -+ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); -+ -+ if (!kbase_pm_context_active_handle_suspend(kbdev, -+ KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE)) { -+ int err; -+ u32 op; -+ -+ /* AS transaction begin */ -+ mutex_lock(&kbdev->mmu_hw_mutex); -+ -+ if (sync) -+ op = AS_COMMAND_FLUSH_MEM; -+ else -+ op = AS_COMMAND_FLUSH_PT; -+ -+ err = kbase_mmu_hw_do_operation(kbdev, -+ &kbdev->as[kctx->as_nr], -+ kctx, vpfn, nr, op, 0); -+ -+#if KBASE_GPU_RESET_EN -+ if (err) { -+ /* Flush failed to complete, assume the -+ * GPU has hung and perform a reset to -+ * recover */ -+ dev_err(kbdev->dev, "Flush for GPU page table update did not complete. Issueing GPU soft-reset to recover\n"); -+ -+ if (kbase_prepare_to_reset_gpu(kbdev)) -+ kbase_reset_gpu(kbdev); -+ } -+#endif /* KBASE_GPU_RESET_EN */ ++ DBG_MSG(3, ("UMP[%02u] Switch usage Start New: %s Prev: %s.\n", ++ (ump_secure_id)args->secure_id, ++ args->new_user ? "MALI" : "CPU", ++ old_user ? "MALI" : "CPU")); + -+ mutex_unlock(&kbdev->mmu_hw_mutex); -+ /* AS transaction end */ ++ if (!mem->is_cached) { ++ DBG_MSG(3, ("UMP[%02u] Changing owner of uncached memory. Cache flushing not needed.\n", ++ (ump_secure_id)args->secure_id)); ++ goto out; ++ } + -+#ifndef CONFIG_MALI_BIFROST_NO_MALI -+ /* -+ * The transaction lock must be dropped before here -+ * as kbase_wait_write_flush could take it if -+ * the GPU was powered down (static analysis doesn't -+ * know this can't happen). -+ */ -+ drain_pending |= (!err) && sync && -+ kbase_hw_has_issue(kctx->kbdev, -+ BASE_HW_ISSUE_6367); -+ if (drain_pending) { -+ /* Wait for GPU to flush write buffer */ -+ kbase_wait_write_flush(kctx); -+ } -+#endif /* !CONFIG_MALI_BIFROST_NO_MALI */ ++ if (old_user == args->new_user) { ++ DBG_MSG(4, ("UMP[%02u] Setting the new_user equal to previous for. Cache flushing not needed.\n", ++ (ump_secure_id)args->secure_id)); ++ goto out; ++ } ++ if ( ++ /* Previous AND new is both different from CPU */ ++ (old_user != _UMP_UK_USED_BY_CPU) && (args->new_user != _UMP_UK_USED_BY_CPU) ++ ) { ++ DBG_MSG(4, ("UMP[%02u] Previous and new user is not CPU. Cache flushing not needed.\n", ++ (ump_secure_id)args->secure_id)); ++ goto out; ++ } + -+ kbase_pm_context_idle(kbdev); -+ } -+ kbasep_js_runpool_release_ctx(kbdev, kctx); ++ if ((old_user != _UMP_UK_USED_BY_CPU) && (args->new_user == _UMP_UK_USED_BY_CPU)) { ++ cache_op = _UMP_UK_MSYNC_INVALIDATE; ++ DBG_MSG(4, ("UMP[%02u] Cache invalidation needed\n", (ump_secure_id)args->secure_id)); ++#ifdef UMP_SKIP_INVALIDATION ++#error ++ DBG_MSG(4, ("UMP[%02u] Performing Cache invalidation SKIPPED\n", (ump_secure_id)args->secure_id)); ++ goto out; ++#endif + } -+} + -+void kbase_mmu_update(struct kbase_context *kctx) -+{ -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); -+ lockdep_assert_held(&kctx->kbdev->mmu_hw_mutex); -+ /* ASSERT that the context has a valid as_nr, which is only the case -+ * when it's scheduled in. -+ * -+ * as_nr won't change because the caller has the hwaccess_lock */ -+ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); ++ /* Take lock to protect: session->cache_operations_ongoing and session->has_pending_level1_cache_flush */ ++ _mali_osk_mutex_wait(session_data->lock); ++ /* Actual cache flush */ ++ _ump_osk_msync(mem, NULL, 0, mem->size_bytes, cache_op, session_data); ++ _mali_osk_mutex_signal(session_data->lock); + -+ kctx->kbdev->mmu_mode->update(kctx); ++out: ++ ump_random_mapping_put(mem); ++ DBG_MSG(4, ("UMP[%02u] Switch usage Finish\n", (ump_secure_id)args->secure_id)); ++ return; +} -+KBASE_EXPORT_TEST_API(kbase_mmu_update); + -+void kbase_mmu_disable_as(struct kbase_device *kbdev, int as_nr) ++void _ump_ukk_lock(_ump_uk_lock_s *args) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ lockdep_assert_held(&kbdev->mmu_hw_mutex); -+ -+ kbdev->mmu_mode->disable_as(kbdev, as_nr); -+} ++ ump_dd_mem *mem = NULL; + -+void kbase_mmu_disable(struct kbase_context *kctx) -+{ -+ /* ASSERT that the context has a valid as_nr, which is only the case -+ * when it's scheduled in. -+ * -+ * as_nr won't change because the caller has the hwaccess_lock */ -+ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); ++ mem = ump_random_mapping_get(device.secure_id_map, (int)args->secure_id); ++ if (NULL == mem) { ++ DBG_MSG(1, ("UMP[%02u] Failed to look up mapping in _ump_ukk_lock(). ID: %u\n", ++ (ump_secure_id)args->secure_id)); ++ return; ++ } + -+ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ DBG_MSG(1, ("UMP[%02u] Lock. New lock flag: %d. Old Lock flag:\n", (u32)args->secure_id, (u32)args->lock_usage, (u32) mem->lock_usage)); + -+ /* -+ * The address space is being disabled, drain all knowledge of it out -+ * from the caches as pages and page tables might be freed after this. -+ * -+ * The job scheduler code will already be holding the locks and context -+ * so just do the flush. -+ */ -+ kbase_mmu_flush_invalidate_noretain(kctx, 0, ~0, true); ++ mem->lock_usage = (ump_lock_usage) args->lock_usage; + -+ kctx->kbdev->mmu_mode->disable_as(kctx->kbdev, kctx->as_nr); ++ ump_random_mapping_put(mem); +} -+KBASE_EXPORT_TEST_API(kbase_mmu_disable); + -+/* -+ * We actually only discard the ATE, and not the page table -+ * pages. There is a potential DoS here, as we'll leak memory by -+ * having PTEs that are potentially unused. Will require physical -+ * page accounting, so MMU pages are part of the process allocation. -+ * -+ * IMPORTANT: This uses kbasep_js_runpool_release_ctx() when the context is -+ * currently scheduled into the runpool, and so potentially uses a lot of locks. -+ * These locks must be taken in the correct order with respect to others -+ * already held by the caller. Refer to kbasep_js_runpool_release_ctx() for more -+ * information. -+ */ -+int kbase_mmu_teardown_pages(struct kbase_context *kctx, u64 vpfn, size_t nr) ++void _ump_ukk_unlock(_ump_uk_unlock_s *args) +{ -+ phys_addr_t pgd; -+ size_t requested_nr = nr; -+ struct kbase_mmu_mode const *mmu_mode; -+ int err = -EFAULT; -+ -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ beenthere(kctx, "kctx %p vpfn %lx nr %zd", (void *)kctx, (unsigned long)vpfn, nr); ++ ump_dd_mem *mem = NULL; + -+ if (0 == nr) { -+ /* early out if nothing to do */ -+ return 0; ++ mem = ump_random_mapping_get(device.secure_id_map, (int)args->secure_id); ++ if (NULL == mem) { ++ DBG_MSG(1, ("Failed to look up mapping in _ump_ukk_unlock(). ID: %u\n", ++ (ump_secure_id)args->secure_id)); ++ return; + } + -+ mutex_lock(&kctx->mmu_lock); -+ -+ mmu_mode = kctx->kbdev->mmu_mode; -+ -+ while (nr) { -+ unsigned int i; -+ unsigned int index = vpfn & 0x1FF; -+ unsigned int count = KBASE_MMU_PAGE_ENTRIES - index; -+ unsigned int pcount; -+ unsigned int level; -+ u64 *page; -+ -+ if (count > nr) -+ count = nr; -+ -+ /* need to check if this is a 2MB or a 4kB page */ -+ pgd = kctx->pgd; -+ -+ for (level = MIDGARD_MMU_TOPLEVEL; -+ level <= MIDGARD_MMU_BOTTOMLEVEL; level++) { -+ phys_addr_t next_pgd; -+ -+ index = (vpfn >> ((3 - level) * 9)) & 0x1FF; -+ page = kmap(phys_to_page(pgd)); -+ if (mmu_mode->ate_is_valid(page[index], level)) -+ break; /* keep the mapping */ -+ else if (!mmu_mode->pte_is_valid(page[index], level)) { -+ /* nothing here, advance */ -+ switch (level) { -+ case MIDGARD_MMU_LEVEL(0): -+ count = 134217728; -+ break; -+ case MIDGARD_MMU_LEVEL(1): -+ count = 262144; -+ break; -+ case MIDGARD_MMU_LEVEL(2): -+ count = 512; -+ break; -+ case MIDGARD_MMU_LEVEL(3): -+ count = 1; -+ break; -+ } -+ if (count > nr) -+ count = nr; -+ goto next; -+ } -+ next_pgd = mmu_mode->pte_to_phy_addr(page[index]); -+ kunmap(phys_to_page(pgd)); -+ pgd = next_pgd; -+ } ++ DBG_MSG(1, ("UMP[%02u] Unlocking. Old Lock flag:\n", ++ (u32)args->secure_id, (u32) mem->lock_usage)); + -+ switch (level) { -+ case MIDGARD_MMU_LEVEL(0): -+ case MIDGARD_MMU_LEVEL(1): -+ dev_warn(kctx->kbdev->dev, -+ "%s: No support for ATEs at level %d\n", -+ __func__, level); -+ kunmap(phys_to_page(pgd)); -+ goto out; -+ case MIDGARD_MMU_LEVEL(2): -+ /* can only teardown if count >= 512 */ -+ if (count >= 512) { -+ pcount = 1; -+ } else { -+ dev_warn(kctx->kbdev->dev, -+ "%s: limiting teardown as it tries to do a partial 2MB teardown, need 512, but have %d to tear down\n", -+ __func__, count); -+ pcount = 0; -+ } -+ break; -+ case MIDGARD_MMU_BOTTOMLEVEL: -+ /* page count is the same as the logical count */ -+ pcount = count; -+ break; -+ default: -+ dev_err(kctx->kbdev->dev, -+ "%s: found non-mapped memory, early out\n", -+ __func__); -+ vpfn += count; -+ nr -= count; -+ continue; -+ } ++ mem->lock_usage = (ump_lock_usage) UMP_NOT_LOCKED; + -+ /* Invalidate the entries we added */ -+ for (i = 0; i < pcount; i++) -+ mmu_mode->entry_invalidate(&page[index + i]); ++ ump_random_mapping_put(mem); ++} +diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c +new file mode 100755 +index 000000000..73aa9e4c4 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c +@@ -0,0 +1,358 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ kbase_mmu_sync_pgd(kctx->kbdev, -+ kbase_dma_addr(phys_to_page(pgd)) + -+ 8 * index, 8*pcount); ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_osk_bitops.h" ++#include "mali_osk_list.h" ++#include "ump_osk.h" ++#include "ump_uk_types.h" ++#include "ump_ukk.h" ++#include "ump_kernel_common.h" ++#include "ump_kernel_descriptor_mapping.h" ++#include "ump_kernel_memory_backend.h" + -+next: -+ kunmap(phys_to_page(pgd)); -+ vpfn += count; -+ nr -= count; -+ } -+ err = 0; -+out: -+ mutex_unlock(&kctx->mmu_lock); -+ kbase_mmu_flush_invalidate(kctx, vpfn, requested_nr, true); -+ return err; -+} + -+KBASE_EXPORT_TEST_API(kbase_mmu_teardown_pages); + +/** -+ * Update the entries for specified number of pages pointed to by 'phys' at GPU PFN 'vpfn'. -+ * This call is being triggered as a response to the changes of the mem attributes -+ * -+ * @pre : The caller is responsible for validating the memory attributes -+ * -+ * IMPORTANT: This uses kbasep_js_runpool_release_ctx() when the context is -+ * currently scheduled into the runpool, and so potentially uses a lot of locks. -+ * These locks must be taken in the correct order with respect to others -+ * already held by the caller. Refer to kbasep_js_runpool_release_ctx() for more -+ * information. ++ * Define the initial and maximum size of number of secure_ids on the system + */ -+int kbase_mmu_update_pages(struct kbase_context *kctx, u64 vpfn, -+ struct tagged_addr *phys, size_t nr, -+ unsigned long flags) -+{ -+ phys_addr_t pgd; -+ u64 *pgd_page; -+ size_t requested_nr = nr; -+ struct kbase_mmu_mode const *mmu_mode; -+ int err; ++#define UMP_SECURE_ID_TABLE_ENTRIES_INITIAL (128 ) ++#define UMP_SECURE_ID_TABLE_ENTRIES_MAXIMUM (4096 ) + -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ KBASE_DEBUG_ASSERT(0 != vpfn); -+ KBASE_DEBUG_ASSERT(vpfn <= (U64_MAX / PAGE_SIZE)); + -+ /* Early out if there is nothing to do */ -+ if (nr == 0) -+ return 0; ++/** ++ * Define the initial and maximum size of the ump_session_data::cookies_map, ++ * which is a \ref ump_descriptor_mapping. This limits how many secure_ids ++ * may be mapped into a particular process using _ump_ukk_map_mem(). ++ */ + -+ mutex_lock(&kctx->mmu_lock); ++#define UMP_COOKIES_PER_SESSION_INITIAL (UMP_SECURE_ID_TABLE_ENTRIES_INITIAL ) ++#define UMP_COOKIES_PER_SESSION_MAXIMUM (UMP_SECURE_ID_TABLE_ENTRIES_MAXIMUM) + -+ mmu_mode = kctx->kbdev->mmu_mode; ++struct ump_dev device; + -+ dev_warn(kctx->kbdev->dev, "kbase_mmu_update_pages(): updating page share flags on GPU PFN 0x%llx from phys %p, %zu pages", -+ vpfn, phys, nr); ++_mali_osk_errcode_t ump_kernel_constructor(void) ++{ ++ _mali_osk_errcode_t err; + -+ while (nr) { -+ unsigned int i; -+ unsigned int index = vpfn & 0x1FF; -+ size_t count = KBASE_MMU_PAGE_ENTRIES - index; -+ struct page *p; ++ /* Perform OS Specific initialization */ ++ err = _ump_osk_init(); ++ if (_MALI_OSK_ERR_OK != err) { ++ MSG_ERR(("Failed to initiaze the UMP Device Driver")); ++ return err; ++ } + -+ if (count > nr) -+ count = nr; ++ /* Init the global device */ ++ _mali_osk_memset(&device, 0, sizeof(device)); + -+ do { -+ err = mmu_get_bottom_pgd(kctx, vpfn, &pgd); -+ if (err != -ENOMEM) -+ break; -+ /* Fill the memory pool with enough pages for -+ * the page walk to succeed -+ */ -+ mutex_unlock(&kctx->mmu_lock); -+ err = kbase_mem_pool_grow(&kctx->mem_pool, -+ MIDGARD_MMU_BOTTOMLEVEL); -+ mutex_lock(&kctx->mmu_lock); -+ } while (!err); -+ if (err) { -+ dev_warn(kctx->kbdev->dev, -+ "mmu_get_bottom_pgd failure\n"); -+ goto fail_unlock; -+ } ++ /* Create the descriptor map, which will be used for mapping secure ID to ump_dd_mem structs */ ++ device.secure_id_map = ump_random_mapping_create(); ++ if (NULL == device.secure_id_map) { ++ MSG_ERR(("Failed to create secure id lookup table\n")); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ p = pfn_to_page(PFN_DOWN(pgd)); -+ pgd_page = kmap(p); -+ if (!pgd_page) { -+ dev_warn(kctx->kbdev->dev, "kmap failure\n"); -+ err = -ENOMEM; -+ goto fail_unlock; -+ } ++ /* Init memory backend */ ++ device.backend = ump_memory_backend_create(); ++ if (NULL == device.backend) { ++ MSG_ERR(("Failed to create memory backend\n")); ++ ump_random_mapping_destroy(device.secure_id_map); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ for (i = 0; i < count; i++) -+ mmu_mode->entry_set_ate(&pgd_page[index + i], phys[i], -+ flags, MIDGARD_MMU_BOTTOMLEVEL); ++ return _MALI_OSK_ERR_OK; ++} + -+ phys += count; -+ vpfn += count; -+ nr -= count; ++void ump_kernel_destructor(void) ++{ ++ DEBUG_ASSERT_POINTER(device.secure_id_map); + -+ kbase_mmu_sync_pgd(kctx->kbdev, -+ kbase_dma_addr(p) + (index * sizeof(u64)), -+ count * sizeof(u64)); ++ ump_random_mapping_destroy(device.secure_id_map); ++ device.secure_id_map = NULL; + -+ kunmap(pfn_to_page(PFN_DOWN(pgd))); -+ } ++ device.backend->shutdown(device.backend); ++ device.backend = NULL; + -+ mutex_unlock(&kctx->mmu_lock); -+ kbase_mmu_flush_invalidate(kctx, vpfn, requested_nr, true); -+ return 0; ++ ump_memory_backend_destroy(); + -+fail_unlock: -+ mutex_unlock(&kctx->mmu_lock); -+ kbase_mmu_flush_invalidate(kctx, vpfn, requested_nr, true); -+ return err; ++ _ump_osk_term(); +} + -+static void mmu_teardown_level(struct kbase_context *kctx, phys_addr_t pgd, -+ int level, u64 *pgd_page_buffer) ++/** Creates a new UMP session ++ */ ++_mali_osk_errcode_t _ump_ukk_open(void **context) +{ -+ phys_addr_t target_pgd; -+ struct page *p; -+ u64 *pgd_page; -+ int i; -+ struct kbase_mmu_mode const *mmu_mode; ++ struct ump_session_data *session_data; + -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ lockdep_assert_held(&kctx->mmu_lock); -+ lockdep_assert_held(&kctx->reg_lock); ++ /* allocated struct to track this session */ ++ session_data = (struct ump_session_data *)_mali_osk_malloc(sizeof(struct ump_session_data)); ++ if (NULL == session_data) { ++ MSG_ERR(("Failed to allocate ump_session_data in ump_file_open()\n")); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ pgd_page = kmap_atomic(pfn_to_page(PFN_DOWN(pgd))); -+ /* kmap_atomic should NEVER fail. */ -+ KBASE_DEBUG_ASSERT(NULL != pgd_page); -+ /* Copy the page to our preallocated buffer so that we can minimize -+ * kmap_atomic usage */ -+ memcpy(pgd_page_buffer, pgd_page, PAGE_SIZE); -+ kunmap_atomic(pgd_page); -+ pgd_page = pgd_page_buffer; ++ session_data->lock = _mali_osk_mutex_init(_MALI_OSK_LOCKFLAG_UNORDERED, 0); ++ if (NULL == session_data->lock) { ++ MSG_ERR(("Failed to initialize lock for ump_session_data in ump_file_open()\n")); ++ _mali_osk_free(session_data); ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ mmu_mode = kctx->kbdev->mmu_mode; ++ session_data->cookies_map = ump_descriptor_mapping_create( ++ UMP_COOKIES_PER_SESSION_INITIAL, ++ UMP_COOKIES_PER_SESSION_MAXIMUM); + -+ for (i = 0; i < KBASE_MMU_PAGE_ENTRIES; i++) { -+ target_pgd = mmu_mode->pte_to_phy_addr(pgd_page[i]); ++ if (NULL == session_data->cookies_map) { ++ MSG_ERR(("Failed to create descriptor mapping for _ump_ukk_map_mem cookies\n")); + -+ if (target_pgd) { -+ if (mmu_mode->pte_is_valid(pgd_page[i], level)) { -+ mmu_teardown_level(kctx, -+ target_pgd, -+ level + 1, -+ pgd_page_buffer + -+ (PAGE_SIZE / sizeof(u64))); -+ } -+ } ++ _mali_osk_mutex_term(session_data->lock); ++ _mali_osk_free(session_data); ++ return _MALI_OSK_ERR_NOMEM; + } + -+ p = pfn_to_page(PFN_DOWN(pgd)); -+ kbase_mem_pool_free(&kctx->mem_pool, p, true); -+ kbase_process_page_usage_dec(kctx, 1); -+ kbase_atomic_sub_pages(1, &kctx->used_pages); -+ kbase_atomic_sub_pages(1, &kctx->kbdev->memdev.used_pages); -+} -+ -+int kbase_mmu_init(struct kbase_context *kctx) -+{ -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ KBASE_DEBUG_ASSERT(NULL == kctx->mmu_teardown_pages); ++ _MALI_OSK_INIT_LIST_HEAD(&session_data->list_head_session_memory_list); + -+ mutex_init(&kctx->mmu_lock); ++ _MALI_OSK_INIT_LIST_HEAD(&session_data->list_head_session_memory_mappings_list); + -+ /* Preallocate MMU depth of four pages for mmu_teardown_level to use */ -+ kctx->mmu_teardown_pages = kmalloc(PAGE_SIZE * 4, GFP_KERNEL); ++ /* Since initial version of the UMP interface did not use the API_VERSION ioctl we have to assume ++ that it is this version, and not the "latest" one: UMP_IOCTL_API_VERSION ++ Current and later API versions would do an additional call to this IOCTL and update this variable ++ to the correct one.*/ ++ session_data->api_version = MAKE_VERSION_ID(1); + -+ if (NULL == kctx->mmu_teardown_pages) -+ return -ENOMEM; ++ *context = (void *)session_data; + -+ return 0; -+} ++ session_data->cache_operations_ongoing = 0 ; ++ session_data->has_pending_level1_cache_flush = 0; + -+void kbase_mmu_term(struct kbase_context *kctx) -+{ -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ KBASE_DEBUG_ASSERT(NULL != kctx->mmu_teardown_pages); ++ DBG_MSG(2, ("New session opened\n")); + -+ kfree(kctx->mmu_teardown_pages); -+ kctx->mmu_teardown_pages = NULL; ++ return _MALI_OSK_ERR_OK; +} + -+void kbase_mmu_free_pgd(struct kbase_context *kctx) ++_mali_osk_errcode_t _ump_ukk_close(void **context) +{ -+ int new_page_count = 0; -+ -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ KBASE_DEBUG_ASSERT(NULL != kctx->mmu_teardown_pages); -+ -+ mutex_lock(&kctx->mmu_lock); -+ mmu_teardown_level(kctx, kctx->pgd, MIDGARD_MMU_TOPLEVEL, -+ kctx->mmu_teardown_pages); -+ mutex_unlock(&kctx->mmu_lock); -+ -+ KBASE_TLSTREAM_AUX_PAGESALLOC( -+ kctx->id, -+ (u64)new_page_count); -+} ++ struct ump_session_data *session_data; ++ ump_session_memory_list_element *item; ++ ump_session_memory_list_element *tmp; + -+KBASE_EXPORT_TEST_API(kbase_mmu_free_pgd); ++ session_data = (struct ump_session_data *)*context; ++ if (NULL == session_data) { ++ MSG_ERR(("Session data is NULL in _ump_ukk_close()\n")); ++ return _MALI_OSK_ERR_INVALID_ARGS; ++ } + -+static size_t kbasep_mmu_dump_level(struct kbase_context *kctx, phys_addr_t pgd, int level, char ** const buffer, size_t *size_left) -+{ -+ phys_addr_t target_pgd; -+ u64 *pgd_page; -+ int i; -+ size_t size = KBASE_MMU_PAGE_ENTRIES * sizeof(u64) + sizeof(u64); -+ size_t dump_size; -+ struct kbase_mmu_mode const *mmu_mode; ++ /* Unmap any descriptors mapped in. */ ++ if (0 == _mali_osk_list_empty(&session_data->list_head_session_memory_mappings_list)) { ++ ump_memory_allocation *descriptor; ++ ump_memory_allocation *temp; + -+ KBASE_DEBUG_ASSERT(NULL != kctx); -+ lockdep_assert_held(&kctx->mmu_lock); ++ DBG_MSG(1, ("Memory mappings found on session usage list during session termination\n")); + -+ mmu_mode = kctx->kbdev->mmu_mode; ++ /* use the 'safe' list iterator, since freeing removes the active block from the list we're iterating */ ++ _MALI_OSK_LIST_FOREACHENTRY(descriptor, temp, &session_data->list_head_session_memory_mappings_list, ump_memory_allocation, list) { ++ _ump_uk_unmap_mem_s unmap_args; ++ DBG_MSG(4, ("Freeing block with phys address 0x%x size 0x%x mapped in user space at 0x%x\n", ++ descriptor->phys_addr, descriptor->size, descriptor->mapping)); ++ unmap_args.ctx = (void *)session_data; ++ unmap_args.mapping = descriptor->mapping; ++ unmap_args.size = descriptor->size; ++ unmap_args._ukk_private = NULL; /* NOTE: unused */ ++ unmap_args.cookie = descriptor->cookie; + -+ pgd_page = kmap(pfn_to_page(PFN_DOWN(pgd))); -+ if (!pgd_page) { -+ dev_warn(kctx->kbdev->dev, "kbasep_mmu_dump_level: kmap failure\n"); -+ return 0; ++ /* NOTE: This modifies the list_head_session_memory_mappings_list */ ++ _ump_ukk_unmap_mem(&unmap_args); ++ } + } + -+ if (*size_left >= size) { -+ /* A modified physical address that contains the page table level */ -+ u64 m_pgd = pgd | level; -+ -+ /* Put the modified physical address in the output buffer */ -+ memcpy(*buffer, &m_pgd, sizeof(m_pgd)); -+ *buffer += sizeof(m_pgd); -+ -+ /* Followed by the page table itself */ -+ memcpy(*buffer, pgd_page, sizeof(u64) * KBASE_MMU_PAGE_ENTRIES); -+ *buffer += sizeof(u64) * KBASE_MMU_PAGE_ENTRIES; ++ /* ASSERT that we really did free everything, because _ump_ukk_unmap_mem() ++ * can fail silently. */ ++ DEBUG_ASSERT(_mali_osk_list_empty(&session_data->list_head_session_memory_mappings_list)); + -+ *size_left -= size; ++ _MALI_OSK_LIST_FOREACHENTRY(item, tmp, &session_data->list_head_session_memory_list, ump_session_memory_list_element, list) { ++ _mali_osk_list_del(&item->list); ++ DBG_MSG(2, ("Releasing UMP memory %u as part of file close\n", item->mem->secure_id)); ++ ump_dd_reference_release(item->mem); ++ _mali_osk_free(item); + } + -+ if (level < MIDGARD_MMU_BOTTOMLEVEL) { -+ for (i = 0; i < KBASE_MMU_PAGE_ENTRIES; i++) { -+ if (mmu_mode->pte_is_valid(pgd_page[i], level)) { -+ target_pgd = mmu_mode->pte_to_phy_addr( -+ pgd_page[i]); ++ ump_descriptor_mapping_destroy(session_data->cookies_map); + -+ dump_size = kbasep_mmu_dump_level(kctx, -+ target_pgd, level + 1, -+ buffer, size_left); -+ if (!dump_size) { -+ kunmap(pfn_to_page(PFN_DOWN(pgd))); -+ return 0; -+ } -+ size += dump_size; -+ } -+ } -+ } ++ _mali_osk_mutex_term(session_data->lock); ++ _mali_osk_free(session_data); + -+ kunmap(pfn_to_page(PFN_DOWN(pgd))); ++ DBG_MSG(2, ("Session closed\n")); + -+ return size; ++ return _MALI_OSK_ERR_OK; +} + -+void *kbase_mmu_dump(struct kbase_context *kctx, int nr_pages) ++_mali_osk_errcode_t _ump_ukk_map_mem(_ump_uk_map_mem_s *args) +{ -+ void *kaddr; -+ size_t size_left; ++ struct ump_session_data *session_data; ++ ump_memory_allocation *descriptor; /* Describes current mapping of memory */ ++ _mali_osk_errcode_t err; ++ unsigned long offset = 0; ++ unsigned long left; ++ ump_dd_handle handle; /* The real UMP handle for this memory. Its real datatype is ump_dd_mem* */ ++ ump_dd_mem *mem; /* The real UMP memory. It is equal to the handle, but with exposed struct */ ++ u32 block; ++ int map_id; + -+ KBASE_DEBUG_ASSERT(kctx); ++ session_data = (ump_session_data *)args->ctx; ++ if (NULL == session_data) { ++ MSG_ERR(("Session data is NULL in _ump_ukk_map_mem()\n")); ++ return _MALI_OSK_ERR_INVALID_ARGS; ++ } + -+ if (0 == nr_pages) { -+ /* can't dump in a 0 sized buffer, early out */ -+ return NULL; ++ descriptor = (ump_memory_allocation *) _mali_osk_calloc(1, sizeof(ump_memory_allocation)); ++ if (NULL == descriptor) { ++ MSG_ERR(("ump_ukk_map_mem: descriptor allocation failed\n")); ++ return _MALI_OSK_ERR_NOMEM; + } + -+ size_left = nr_pages * PAGE_SIZE; ++ handle = ump_dd_handle_create_from_secure_id(args->secure_id); ++ if (UMP_DD_HANDLE_INVALID == handle) { ++ _mali_osk_free(descriptor); ++ DBG_MSG(1, ("Trying to map unknown secure ID %u\n", args->secure_id)); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ KBASE_DEBUG_ASSERT(0 != size_left); -+ kaddr = vmalloc_user(size_left); ++ mem = (ump_dd_mem *)handle; ++ DEBUG_ASSERT(mem); ++ if (mem->size_bytes != args->size) { ++ _mali_osk_free(descriptor); ++ ump_dd_reference_release(handle); ++ DBG_MSG(1, ("Trying to map too much or little. ID: %u, virtual size=%lu, UMP size: %lu\n", args->secure_id, args->size, mem->size_bytes)); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ mutex_lock(&kctx->mmu_lock); ++ map_id = ump_descriptor_mapping_allocate_mapping(session_data->cookies_map, (void *) descriptor); + -+ if (kaddr) { -+ u64 end_marker = 0xFFULL; -+ char *buffer; -+ char *mmu_dump_buffer; -+ u64 config[3]; -+ size_t dump_size, size = 0; ++ if (map_id < 0) { ++ _mali_osk_free(descriptor); ++ ump_dd_reference_release(handle); ++ DBG_MSG(1, ("ump_ukk_map_mem: unable to allocate a descriptor_mapping for return cookie\n")); + -+ buffer = (char *)kaddr; -+ mmu_dump_buffer = buffer; ++ return _MALI_OSK_ERR_NOMEM; ++ } + -+ if (kctx->api_version >= KBASE_API_VERSION(8, 4)) { -+ struct kbase_mmu_setup as_setup; ++ descriptor->size = args->size; ++ descriptor->handle = handle; ++ descriptor->phys_addr = args->phys_addr; ++ descriptor->process_mapping_info = args->_ukk_private; ++ descriptor->ump_session = session_data; ++ descriptor->cookie = (u32)map_id; + -+ kctx->kbdev->mmu_mode->get_as_setup(kctx, &as_setup); -+ config[0] = as_setup.transtab; -+ config[1] = as_setup.memattr; -+ config[2] = as_setup.transcfg; -+ memcpy(buffer, &config, sizeof(config)); -+ mmu_dump_buffer += sizeof(config); -+ size_left -= sizeof(config); -+ size += sizeof(config); -+ } ++ if (mem->is_cached) { ++ descriptor->is_cached = 1; ++ DBG_MSG(3, ("Mapping UMP secure_id: %d as cached.\n", args->secure_id)); ++ } else { ++ descriptor->is_cached = 0; ++ DBG_MSG(3, ("Mapping UMP secure_id: %d as Uncached.\n", args->secure_id)); ++ } + -+ dump_size = kbasep_mmu_dump_level(kctx, -+ kctx->pgd, -+ MIDGARD_MMU_TOPLEVEL, -+ &mmu_dump_buffer, -+ &size_left); ++ _mali_osk_list_init(&descriptor->list); + -+ if (!dump_size) -+ goto fail_free; ++ err = _ump_osk_mem_mapregion_init(descriptor); ++ if (_MALI_OSK_ERR_OK != err) { ++ DBG_MSG(1, ("Failed to initialize memory mapping in _ump_ukk_map_mem(). ID: %u\n", args->secure_id)); ++ ump_descriptor_mapping_free(session_data->cookies_map, map_id); ++ _mali_osk_free(descriptor); ++ ump_dd_reference_release(mem); ++ return err; ++ } + -+ size += dump_size; ++ DBG_MSG(4, ("Mapping virtual to physical memory: ID: %u, size:%lu, first physical addr: 0x%08lx, number of regions: %lu\n", ++ mem->secure_id, ++ mem->size_bytes, ++ ((NULL != mem->block_array) ? mem->block_array->addr : 0), ++ mem->nr_blocks)); + -+ /* Add on the size for the end marker */ -+ size += sizeof(u64); ++ left = descriptor->size; ++ /* loop over all blocks and map them in */ ++ for (block = 0; block < mem->nr_blocks; block++) { ++ unsigned long size_to_map; + -+ if (size > (nr_pages * PAGE_SIZE)) { -+ /* The buffer isn't big enough - free the memory and return failure */ -+ goto fail_free; ++ if (left > mem->block_array[block].size) { ++ size_to_map = mem->block_array[block].size; ++ } else { ++ size_to_map = left; + } + -+ /* Add the end marker */ -+ memcpy(mmu_dump_buffer, &end_marker, sizeof(u64)); ++ if (_MALI_OSK_ERR_OK != _ump_osk_mem_mapregion_map(descriptor, offset, (u32 *) & (mem->block_array[block].addr), size_to_map)) { ++ DBG_MSG(1, ("WARNING: _ump_ukk_map_mem failed to map memory into userspace\n")); ++ ump_descriptor_mapping_free(session_data->cookies_map, map_id); ++ ump_dd_reference_release(mem); ++ _ump_osk_mem_mapregion_term(descriptor); ++ _mali_osk_free(descriptor); ++ return _MALI_OSK_ERR_FAULT; ++ } ++ left -= size_to_map; ++ offset += size_to_map; + } + -+ mutex_unlock(&kctx->mmu_lock); -+ return kaddr; ++ /* Add to the ump_memory_allocation tracking list */ ++ _mali_osk_mutex_wait(session_data->lock); ++ _mali_osk_list_add(&descriptor->list, &session_data->list_head_session_memory_mappings_list); ++ _mali_osk_mutex_signal(session_data->lock); + -+fail_free: -+ vfree(kaddr); -+ mutex_unlock(&kctx->mmu_lock); -+ return NULL; ++ args->mapping = descriptor->mapping; ++ args->cookie = descriptor->cookie; ++ ++ return _MALI_OSK_ERR_OK; +} -+KBASE_EXPORT_TEST_API(kbase_mmu_dump); + -+void bus_fault_worker(struct work_struct *data) ++void _ump_ukk_unmap_mem(_ump_uk_unmap_mem_s *args) +{ -+ struct kbase_as *faulting_as; -+ int as_no; -+ struct kbase_context *kctx; -+ struct kbase_device *kbdev; -+#if KBASE_GPU_RESET_EN -+ bool reset_status = false; -+#endif /* KBASE_GPU_RESET_EN */ -+ -+ faulting_as = container_of(data, struct kbase_as, work_busfault); -+ -+ as_no = faulting_as->number; ++ struct ump_session_data *session_data; ++ ump_memory_allocation *descriptor; ++ ump_dd_handle handle; + -+ kbdev = container_of(faulting_as, struct kbase_device, as[as_no]); ++ session_data = (ump_session_data *)args->ctx; + -+ /* Grab the context that was already refcounted in kbase_mmu_interrupt(). -+ * Therefore, it cannot be scheduled out of this AS until we explicitly release it -+ */ -+ kctx = kbasep_js_runpool_lookup_ctx_noretain(kbdev, as_no); -+ if (WARN_ON(!kctx)) { -+ atomic_dec(&kbdev->faults_pending); ++ if (NULL == session_data) { ++ MSG_ERR(("Session data is NULL in _ump_ukk_map_mem()\n")); + return; + } + -+ if (unlikely(faulting_as->protected_mode)) -+ { -+ kbase_mmu_report_fault_and_kill(kctx, faulting_as, -+ "Permission failure"); -+ kbase_mmu_hw_clear_fault(kbdev, faulting_as, kctx, -+ KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED); -+ kbasep_js_runpool_release_ctx(kbdev, kctx); -+ atomic_dec(&kbdev->faults_pending); ++ if (0 != ump_descriptor_mapping_get(session_data->cookies_map, (int)args->cookie, (void **)&descriptor)) { ++ MSG_ERR(("_ump_ukk_map_mem: cookie 0x%X not found for this session\n", args->cookie)); + return; -+ -+ } -+ -+#if KBASE_GPU_RESET_EN -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8245)) { -+ /* Due to H/W issue 8245 we need to reset the GPU after using UNMAPPED mode. -+ * We start the reset before switching to UNMAPPED to ensure that unrelated jobs -+ * are evicted from the GPU before the switch. -+ */ -+ dev_err(kbdev->dev, "GPU bus error occurred. For this GPU version we now soft-reset as part of bus error recovery\n"); -+ reset_status = kbase_prepare_to_reset_gpu(kbdev); + } -+#endif /* KBASE_GPU_RESET_EN */ -+ /* NOTE: If GPU already powered off for suspend, we don't need to switch to unmapped */ -+ if (!kbase_pm_context_active_handle_suspend(kbdev, KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE)) { -+ unsigned long flags; -+ -+ /* switch to UNMAPPED mode, will abort all jobs and stop any hw counter dumping */ -+ /* AS transaction begin */ -+ mutex_lock(&kbdev->mmu_hw_mutex); -+ -+ /* Set the MMU into unmapped mode */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_mmu_disable(kctx); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ -+ mutex_unlock(&kbdev->mmu_hw_mutex); -+ /* AS transaction end */ + -+ kbase_mmu_hw_clear_fault(kbdev, faulting_as, kctx, -+ KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED); -+ kbase_mmu_hw_enable_fault(kbdev, faulting_as, kctx, -+ KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED); ++ DEBUG_ASSERT_POINTER(descriptor); + -+ kbase_pm_context_idle(kbdev); ++ handle = descriptor->handle; ++ if (UMP_DD_HANDLE_INVALID == handle) { ++ DBG_MSG(1, ("WARNING: Trying to unmap unknown handle: UNKNOWN\n")); ++ return; + } + -+#if KBASE_GPU_RESET_EN -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8245) && reset_status) -+ kbase_reset_gpu(kbdev); -+#endif /* KBASE_GPU_RESET_EN */ -+ -+ kbasep_js_runpool_release_ctx(kbdev, kctx); -+ -+ atomic_dec(&kbdev->faults_pending); -+} ++ /* Remove the ump_memory_allocation from the list of tracked mappings */ ++ _mali_osk_mutex_wait(session_data->lock); ++ _mali_osk_list_del(&descriptor->list); ++ _mali_osk_mutex_signal(session_data->lock); + -+const char *kbase_exception_name(struct kbase_device *kbdev, u32 exception_code) -+{ -+ const char *e; ++ ump_descriptor_mapping_free(session_data->cookies_map, (int)args->cookie); + -+ switch (exception_code) { -+ /* Non-Fault Status code */ -+ case 0x00: -+ e = "NOT_STARTED/IDLE/OK"; -+ break; -+ case 0x01: -+ e = "DONE"; -+ break; -+ case 0x02: -+ e = "INTERRUPTED"; -+ break; -+ case 0x03: -+ e = "STOPPED"; -+ break; -+ case 0x04: -+ e = "TERMINATED"; -+ break; -+ case 0x08: -+ e = "ACTIVE"; -+ break; -+ /* Job exceptions */ -+ case 0x40: -+ e = "JOB_CONFIG_FAULT"; -+ break; -+ case 0x41: -+ e = "JOB_POWER_FAULT"; -+ break; -+ case 0x42: -+ e = "JOB_READ_FAULT"; -+ break; -+ case 0x43: -+ e = "JOB_WRITE_FAULT"; -+ break; -+ case 0x44: -+ e = "JOB_AFFINITY_FAULT"; -+ break; -+ case 0x48: -+ e = "JOB_BUS_FAULT"; -+ break; -+ case 0x50: -+ e = "INSTR_INVALID_PC"; -+ break; -+ case 0x51: -+ e = "INSTR_INVALID_ENC"; -+ break; -+ case 0x52: -+ e = "INSTR_TYPE_MISMATCH"; -+ break; -+ case 0x53: -+ e = "INSTR_OPERAND_FAULT"; -+ break; -+ case 0x54: -+ e = "INSTR_TLS_FAULT"; -+ break; -+ case 0x55: -+ e = "INSTR_BARRIER_FAULT"; -+ break; -+ case 0x56: -+ e = "INSTR_ALIGN_FAULT"; -+ break; -+ case 0x58: -+ e = "DATA_INVALID_FAULT"; -+ break; -+ case 0x59: -+ e = "TILE_RANGE_FAULT"; -+ break; -+ case 0x5A: -+ e = "ADDR_RANGE_FAULT"; -+ break; -+ case 0x60: -+ e = "OUT_OF_MEMORY"; -+ break; -+ /* GPU exceptions */ -+ case 0x80: -+ e = "DELAYED_BUS_FAULT"; -+ break; -+ case 0x88: -+ e = "SHAREABILITY_FAULT"; -+ break; -+ /* MMU exceptions */ -+ case 0xC0: -+ case 0xC1: -+ case 0xC2: -+ case 0xC3: -+ case 0xC4: -+ case 0xC5: -+ case 0xC6: -+ case 0xC7: -+ e = "TRANSLATION_FAULT"; -+ break; -+ case 0xC8: -+ e = "PERMISSION_FAULT"; -+ break; -+ case 0xC9: -+ case 0xCA: -+ case 0xCB: -+ case 0xCC: -+ case 0xCD: -+ case 0xCE: -+ case 0xCF: -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) -+ e = "PERMISSION_FAULT"; -+ else -+ e = "UNKNOWN"; -+ break; -+ case 0xD0: -+ case 0xD1: -+ case 0xD2: -+ case 0xD3: -+ case 0xD4: -+ case 0xD5: -+ case 0xD6: -+ case 0xD7: -+ e = "TRANSTAB_BUS_FAULT"; -+ break; -+ case 0xD8: -+ e = "ACCESS_FLAG"; -+ break; -+ case 0xD9: -+ case 0xDA: -+ case 0xDB: -+ case 0xDC: -+ case 0xDD: -+ case 0xDE: -+ case 0xDF: -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) -+ e = "ACCESS_FLAG"; -+ else -+ e = "UNKNOWN"; -+ break; -+ case 0xE0: -+ case 0xE1: -+ case 0xE2: -+ case 0xE3: -+ case 0xE4: -+ case 0xE5: -+ case 0xE6: -+ case 0xE7: -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) -+ e = "ADDRESS_SIZE_FAULT"; -+ else -+ e = "UNKNOWN"; -+ break; -+ case 0xE8: -+ case 0xE9: -+ case 0xEA: -+ case 0xEB: -+ case 0xEC: -+ case 0xED: -+ case 0xEE: -+ case 0xEF: -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) -+ e = "MEMORY_ATTRIBUTES_FAULT"; -+ else -+ e = "UNKNOWN"; -+ break; -+ default: -+ e = "UNKNOWN"; -+ break; -+ }; ++ ump_dd_reference_release(handle); + -+ return e; ++ _ump_osk_mem_mapregion_term(descriptor); ++ _mali_osk_free(descriptor); +} + -+static const char *access_type_name(struct kbase_device *kbdev, -+ u32 fault_status) ++u32 _ump_ukk_report_memory_usage(void) +{ -+ switch (fault_status & AS_FAULTSTATUS_ACCESS_TYPE_MASK) { -+ case AS_FAULTSTATUS_ACCESS_TYPE_ATOMIC: -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) -+ return "ATOMIC"; -+ else -+ return "UNKNOWN"; -+ case AS_FAULTSTATUS_ACCESS_TYPE_READ: -+ return "READ"; -+ case AS_FAULTSTATUS_ACCESS_TYPE_WRITE: -+ return "WRITE"; -+ case AS_FAULTSTATUS_ACCESS_TYPE_EX: -+ return "EXECUTE"; -+ default: -+ WARN_ON(1); -+ return NULL; -+ } ++ if (device.backend->stat) ++ return device.backend->stat(device.backend); ++ else ++ return 0; +} -+ -+/** -+ * The caller must ensure it's retained the ctx to prevent it from being scheduled out whilst it's being worked on. +diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h +new file mode 100755 +index 000000000..aa65f1cb6 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h +@@ -0,0 +1,125 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+static void kbase_mmu_report_fault_and_kill(struct kbase_context *kctx, -+ struct kbase_as *as, const char *reason_str) -+{ -+ unsigned long flags; -+ int exception_type; -+ int access_type; -+ int source_id; -+ int as_no; -+ struct kbase_device *kbdev; -+ struct kbasep_js_device_data *js_devdata; -+ -+#if KBASE_GPU_RESET_EN -+ bool reset_status = false; -+#endif -+ -+ as_no = as->number; -+ kbdev = kctx->kbdev; -+ js_devdata = &kbdev->js_data; + -+ /* ASSERT that the context won't leave the runpool */ -+ KBASE_DEBUG_ASSERT(atomic_read(&kctx->refcount) > 0); ++#ifndef __UMP_KERNEL_COMMON_H__ ++#define __UMP_KERNEL_COMMON_H__ + -+ /* decode the fault status */ -+ exception_type = as->fault_status & 0xFF; -+ access_type = (as->fault_status >> 8) & 0x3; -+ source_id = (as->fault_status >> 16); ++#include "ump_kernel_types.h" ++#include "ump_kernel_interface.h" ++#include "ump_kernel_descriptor_mapping.h" ++#include "ump_kernel_random_mapping.h" ++#include "ump_kernel_memory_backend.h" + -+ /* terminal fault, print info about the fault */ -+ dev_err(kbdev->dev, -+ "Unhandled Page fault in AS%d at VA 0x%016llX\n" -+ "Reason: %s\n" -+ "raw fault status: 0x%X\n" -+ "decoded fault status: %s\n" -+ "exception type 0x%X: %s\n" -+ "access type 0x%X: %s\n" -+ "source id 0x%X\n" -+ "pid: %d\n", -+ as_no, as->fault_addr, -+ reason_str, -+ as->fault_status, -+ (as->fault_status & (1 << 10) ? "DECODER FAULT" : "SLAVE FAULT"), -+ exception_type, kbase_exception_name(kbdev, exception_type), -+ access_type, access_type_name(kbdev, as->fault_status), -+ source_id, -+ kctx->pid); + -+ /* hardware counters dump fault handling */ -+ if ((kbdev->hwcnt.kctx) && (kbdev->hwcnt.kctx->as_nr == as_no) && -+ (kbdev->hwcnt.backend.state == -+ KBASE_INSTR_STATE_DUMPING)) { -+ unsigned int num_core_groups = kbdev->gpu_props.num_core_groups; ++#ifdef DEBUG ++extern int ump_debug_level; ++#define UMP_DEBUG_PRINT(args) _mali_osk_dbgmsg args ++#define UMP_DEBUG_CODE(args) args ++#define DBG_MSG(level,args) do { /* args should be in brackets */ \ ++ ((level) <= ump_debug_level)?\ ++ UMP_DEBUG_PRINT(("UMP<" #level ">: ")), \ ++ UMP_DEBUG_PRINT(args):0; \ ++ } while (0) + -+ if ((as->fault_addr >= kbdev->hwcnt.addr) && -+ (as->fault_addr < (kbdev->hwcnt.addr + -+ (num_core_groups * 2048)))) -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_FAULT; ++#define DBG_MSG_IF(level,condition,args) /* args should be in brackets */ \ ++ if((condition)&&((level) <= ump_debug_level)) {\ ++ UMP_DEBUG_PRINT(("UMP<" #level ">: ")); \ ++ UMP_DEBUG_PRINT(args); \ + } + -+ /* Stop the kctx from submitting more jobs and cause it to be scheduled -+ * out/rescheduled - this will occur on releasing the context's refcount */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbasep_js_clear_submit_allowed(js_devdata, kctx); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ -+ /* Kill any running jobs from the context. Submit is disallowed, so no more jobs from this -+ * context can appear in the job slots from this point on */ -+ kbase_backend_jm_kill_jobs_from_kctx(kctx); -+ /* AS transaction begin */ -+ mutex_lock(&kbdev->mmu_hw_mutex); -+#if KBASE_GPU_RESET_EN -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8245)) { -+ /* Due to H/W issue 8245 we need to reset the GPU after using UNMAPPED mode. -+ * We start the reset before switching to UNMAPPED to ensure that unrelated jobs -+ * are evicted from the GPU before the switch. -+ */ -+ dev_err(kbdev->dev, "Unhandled page fault. For this GPU version we now soft-reset the GPU as part of page fault recovery."); -+ reset_status = kbase_prepare_to_reset_gpu(kbdev); ++#define DBG_MSG_ELSE(level,args) /* args should be in brackets */ \ ++ else if((level) <= ump_debug_level) { \ ++ UMP_DEBUG_PRINT(("UMP<" #level ">: ")); \ ++ UMP_DEBUG_PRINT(args); \ + } -+#endif /* KBASE_GPU_RESET_EN */ -+ /* switch to UNMAPPED mode, will abort all jobs and stop any hw counter dumping */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_mmu_disable(kctx); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ mutex_unlock(&kbdev->mmu_hw_mutex); -+ /* AS transaction end */ -+ /* Clear down the fault */ -+ kbase_mmu_hw_clear_fault(kbdev, as, kctx, -+ KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED); -+ kbase_mmu_hw_enable_fault(kbdev, as, kctx, -+ KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED); ++#define DEBUG_ASSERT_POINTER(pointer) do {if( (pointer)== NULL) MSG_ERR(("NULL pointer " #pointer)); } while(0) ++#define DEBUG_ASSERT(condition) do {if(!(condition)) MSG_ERR(("ASSERT failed: " #condition)); } while(0) ++#else /* DEBUG */ ++#define UMP_DEBUG_PRINT(args) do {} while(0) ++#define UMP_DEBUG_CODE(args) ++#define DBG_MSG(level,args) do {} while(0) ++#define DBG_MSG_IF(level,condition,args) do {} while(0) ++#define DBG_MSG_ELSE(level,args) do {} while(0) ++#define DEBUG_ASSERT(condition) do {} while(0) ++#define DEBUG_ASSERT_POINTER(pointer) do {} while(0) ++#endif /* DEBUG */ + -+#if KBASE_GPU_RESET_EN -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8245) && reset_status) -+ kbase_reset_gpu(kbdev); -+#endif /* KBASE_GPU_RESET_EN */ -+} ++#define MSG_ERR(args) do{ /* args should be in brackets */ \ ++ _mali_osk_dbgmsg("UMP: ERR: %s\n" ,__FILE__); \ ++ _mali_osk_dbgmsg( " %s()%4d\n", __FUNCTION__, __LINE__) ; \ ++ _mali_osk_dbgmsg args ; \ ++ _mali_osk_dbgmsg("\n"); \ ++ } while(0) + -+void kbasep_as_do_poke(struct work_struct *work) -+{ -+ struct kbase_as *as; -+ struct kbase_device *kbdev; -+ struct kbase_context *kctx; -+ unsigned long flags; ++#define MSG(args) do{ /* args should be in brackets */ \ ++ _mali_osk_dbgmsg("UMP: "); \ ++ _mali_osk_dbgmsg args; \ ++ } while (0) + -+ KBASE_DEBUG_ASSERT(work); -+ as = container_of(work, struct kbase_as, poke_work); -+ kbdev = container_of(as, struct kbase_device, as[as->number]); -+ KBASE_DEBUG_ASSERT(as->poke_state & KBASE_AS_POKE_STATE_IN_FLIGHT); + -+ /* GPU power will already be active by virtue of the caller holding a JS -+ * reference on the address space, and will not release it until this worker -+ * has finished */ + -+ /* Further to the comment above, we know that while this function is running -+ * the AS will not be released as before the atom is released this workqueue -+ * is flushed (in kbase_as_poking_timer_release_atom) -+ */ -+ kctx = kbasep_js_runpool_lookup_ctx_noretain(kbdev, as->number); ++/* ++ * This struct is used to store per session data. ++ * A session is created when someone open() the device, and ++ * closed when someone close() it or the user space application terminates. ++ */ ++typedef struct ump_session_data { ++ _mali_osk_list_t list_head_session_memory_list; /**< List of ump allocations made by the process (elements are ump_session_memory_list_element) */ ++ _mali_osk_list_t list_head_session_memory_mappings_list; /**< List of ump_memory_allocations mapped in */ ++ int api_version; ++ _mali_osk_mutex_t *lock; ++ ump_descriptor_mapping *cookies_map; /**< Secure mapping of cookies from _ump_ukk_map_mem() */ ++ int cache_operations_ongoing; ++ int has_pending_level1_cache_flush; ++} ump_session_data; + -+ /* AS transaction begin */ -+ mutex_lock(&kbdev->mmu_hw_mutex); -+ /* Force a uTLB invalidate */ -+ kbase_mmu_hw_do_operation(kbdev, as, kctx, 0, 0, -+ AS_COMMAND_UNLOCK, 0); -+ mutex_unlock(&kbdev->mmu_hw_mutex); -+ /* AS transaction end */ + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ if (as->poke_refcount && -+ !(as->poke_state & KBASE_AS_POKE_STATE_KILLING_POKE)) { -+ /* Only queue up the timer if we need it, and we're not trying to kill it */ -+ hrtimer_start(&as->poke_timer, HR_TIMER_DELAY_MSEC(5), HRTIMER_MODE_REL); -+ } -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+} + -+enum hrtimer_restart kbasep_as_poke_timer_callback(struct hrtimer *timer) -+{ -+ struct kbase_as *as; -+ int queue_work_ret; ++/* ++ * This struct is used to track the UMP memory references a session has. ++ * We need to track this in order to be able to clean up after user space processes ++ * which don't do it themself (e.g. due to a crash or premature termination). ++ */ ++typedef struct ump_session_memory_list_element { ++ struct ump_dd_mem *mem; ++ _mali_osk_list_t list; ++} ump_session_memory_list_element; + -+ KBASE_DEBUG_ASSERT(NULL != timer); -+ as = container_of(timer, struct kbase_as, poke_timer); -+ KBASE_DEBUG_ASSERT(as->poke_state & KBASE_AS_POKE_STATE_IN_FLIGHT); + -+ queue_work_ret = queue_work(as->poke_wq, &as->poke_work); -+ KBASE_DEBUG_ASSERT(queue_work_ret); -+ return HRTIMER_NORESTART; -+} + -+/** -+ * Retain the poking timer on an atom's context (if the atom hasn't already -+ * done so), and start the timer (if it's not already started). -+ * -+ * This must only be called on a context that's scheduled in, and an atom -+ * that's running on the GPU. -+ * -+ * The caller must hold hwaccess_lock -+ * -+ * This can be called safely from atomic context ++/* ++ * Device specific data, created when device driver is loaded, and then kept as the global variable device. + */ -+void kbase_as_poking_timer_retain_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *katom) -+{ -+ struct kbase_as *as; -+ -+ KBASE_DEBUG_ASSERT(kbdev); -+ KBASE_DEBUG_ASSERT(kctx); -+ KBASE_DEBUG_ASSERT(katom); -+ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++typedef struct ump_dev { ++ ump_random_mapping *secure_id_map; ++ ump_memory_backend *backend; ++} ump_dev; + -+ if (katom->poking) -+ return; + -+ katom->poking = 1; + -+ /* It's safe to work on the as/as_nr without an explicit reference, -+ * because the caller holds the hwaccess_lock, and the atom itself -+ * was also running and had already taken a reference */ -+ as = &kbdev->as[kctx->as_nr]; ++extern int ump_debug_level; ++extern struct ump_dev device; + -+ if (++(as->poke_refcount) == 1) { -+ /* First refcount for poke needed: check if not already in flight */ -+ if (!as->poke_state) { -+ /* need to start poking */ -+ as->poke_state |= KBASE_AS_POKE_STATE_IN_FLIGHT; -+ queue_work(as->poke_wq, &as->poke_work); -+ } -+ } -+} ++_mali_osk_errcode_t ump_kernel_constructor(void); ++void ump_kernel_destructor(void); ++int ump_map_errcode(_mali_osk_errcode_t err); + +/** -+ * If an atom holds a poking timer, release it and wait for it to finish -+ * -+ * This must only be called on a context that's scheduled in, and an atom -+ * that still has a JS reference on the context -+ * -+ * This must \b not be called from atomic context, since it can sleep. ++ * variables from user space cannot be dereferenced from kernel space; tagging them ++ * with __user allows the GCC compiler to generate a warning. Other compilers may ++ * not support this so we define it here as an empty macro if the compiler doesn't ++ * define it. + */ -+void kbase_as_poking_timer_release_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *katom) -+{ -+ struct kbase_as *as; -+ unsigned long flags; -+ -+ KBASE_DEBUG_ASSERT(kbdev); -+ KBASE_DEBUG_ASSERT(kctx); -+ KBASE_DEBUG_ASSERT(katom); -+ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); ++#ifndef __user ++#define __user ++#endif + -+ if (!katom->poking) -+ return; ++#endif /* __UMP_KERNEL_COMMON_H__ */ +diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c +new file mode 100755 +index 000000000..e4642f039 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c +@@ -0,0 +1,155 @@ ++/* ++ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ as = &kbdev->as[kctx->as_nr]; ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "mali_osk_bitops.h" ++#include "ump_kernel_common.h" ++#include "ump_kernel_descriptor_mapping.h" + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ KBASE_DEBUG_ASSERT(as->poke_refcount > 0); -+ KBASE_DEBUG_ASSERT(as->poke_state & KBASE_AS_POKE_STATE_IN_FLIGHT); ++#define MALI_PAD_INT(x) (((x) + (BITS_PER_LONG - 1)) & ~(BITS_PER_LONG - 1)) + -+ if (--(as->poke_refcount) == 0) { -+ as->poke_state |= KBASE_AS_POKE_STATE_KILLING_POKE; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++/** ++ * Allocate a descriptor table capable of holding 'count' mappings ++ * @param count Number of mappings in the table ++ * @return Pointer to a new table, NULL on error ++ */ ++static ump_descriptor_table *descriptor_table_alloc(int count); + -+ hrtimer_cancel(&as->poke_timer); -+ flush_workqueue(as->poke_wq); ++/** ++ * Free a descriptor table ++ * @param table The table to free ++ */ ++static void descriptor_table_free(ump_descriptor_table *table); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ump_descriptor_mapping *ump_descriptor_mapping_create(int init_entries, int max_entries) ++{ ++ ump_descriptor_mapping *map = _mali_osk_calloc(1, sizeof(ump_descriptor_mapping)); + -+ /* Re-check whether it's still needed */ -+ if (as->poke_refcount) { -+ int queue_work_ret; -+ /* Poking still needed: -+ * - Another retain will not be starting the timer or queueing work, -+ * because it's still marked as in-flight -+ * - The hrtimer has finished, and has not started a new timer or -+ * queued work because it's been marked as killing -+ * -+ * So whatever happens now, just queue the work again */ -+ as->poke_state &= ~((kbase_as_poke_state)KBASE_AS_POKE_STATE_KILLING_POKE); -+ queue_work_ret = queue_work(as->poke_wq, &as->poke_work); -+ KBASE_DEBUG_ASSERT(queue_work_ret); -+ } else { -+ /* It isn't - so mark it as not in flight, and not killing */ -+ as->poke_state = 0u; ++ init_entries = MALI_PAD_INT(init_entries); ++ max_entries = MALI_PAD_INT(max_entries); + -+ /* The poke associated with the atom has now finished. If this is -+ * also the last atom on the context, then we can guarentee no more -+ * pokes (and thus no more poking register accesses) will occur on -+ * the context until new atoms are run */ ++ if (NULL != map) { ++ map->table = descriptor_table_alloc(init_entries); ++ if (NULL != map->table) { ++ map->lock = _mali_osk_mutex_rw_init(_MALI_OSK_LOCKFLAG_UNORDERED, 0); ++ if (NULL != map->lock) { ++ _mali_osk_set_nonatomic_bit(0, map->table->usage); /* reserve bit 0 to prevent NULL/zero logic to kick in */ ++ map->max_nr_mappings_allowed = max_entries; ++ map->current_nr_mappings = init_entries; ++ return map; ++ } ++ descriptor_table_free(map->table); + } ++ _mali_osk_free(map); + } -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ -+ katom->poking = 0; ++ return NULL; +} + -+void kbase_mmu_interrupt_process(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_as *as) ++void ump_descriptor_mapping_destroy(ump_descriptor_mapping *map) +{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ if (!kctx) { -+ dev_warn(kbdev->dev, "%s in AS%d at 0x%016llx with no context present! Suprious IRQ or SW Design Error?\n", -+ kbase_as_has_bus_fault(as) ? "Bus error" : "Page fault", -+ as->number, as->fault_addr); ++ descriptor_table_free(map->table); ++ _mali_osk_mutex_rw_term(map->lock); ++ _mali_osk_free(map); ++} + -+ /* Since no ctx was found, the MMU must be disabled. */ -+ WARN_ON(as->current_setup.transtab); ++int ump_descriptor_mapping_allocate_mapping(ump_descriptor_mapping *map, void *target) ++{ ++ int descriptor = -1;/*-EFAULT;*/ ++ _mali_osk_mutex_rw_wait(map->lock, _MALI_OSK_LOCKMODE_RW); ++ descriptor = _mali_osk_find_first_zero_bit(map->table->usage, map->current_nr_mappings); ++ if (descriptor == map->current_nr_mappings) { ++ int nr_mappings_new; ++ /* no free descriptor, try to expand the table */ ++ ump_descriptor_table *new_table; ++ ump_descriptor_table *old_table = map->table; ++ nr_mappings_new = map->current_nr_mappings * 2; + -+ if (kbase_as_has_bus_fault(as)) { -+ kbase_mmu_hw_clear_fault(kbdev, as, kctx, -+ KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED); -+ kbase_mmu_hw_enable_fault(kbdev, as, kctx, -+ KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED); -+ } else if (kbase_as_has_page_fault(as)) { -+ kbase_mmu_hw_clear_fault(kbdev, as, kctx, -+ KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED); -+ kbase_mmu_hw_enable_fault(kbdev, as, kctx, -+ KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED); ++ if (map->current_nr_mappings >= map->max_nr_mappings_allowed) { ++ descriptor = -1; ++ goto unlock_and_exit; + } + -+#if KBASE_GPU_RESET_EN -+ if (kbase_as_has_bus_fault(as) && -+ kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8245)) { -+ bool reset_status; -+ /* -+ * Reset the GPU, like in bus_fault_worker, in case an -+ * earlier error hasn't been properly cleared by this -+ * point. -+ */ -+ dev_err(kbdev->dev, "GPU bus error occurred. For this GPU version we now soft-reset as part of bus error recovery\n"); -+ reset_status = kbase_prepare_to_reset_gpu_locked(kbdev); -+ if (reset_status) -+ kbase_reset_gpu_locked(kbdev); ++ new_table = descriptor_table_alloc(nr_mappings_new); ++ if (NULL == new_table) { ++ descriptor = -1; ++ goto unlock_and_exit; + } -+#endif /* KBASE_GPU_RESET_EN */ + -+ return; ++ _mali_osk_memcpy(new_table->usage, old_table->usage, (sizeof(unsigned long)*map->current_nr_mappings) / BITS_PER_LONG); ++ _mali_osk_memcpy(new_table->mappings, old_table->mappings, map->current_nr_mappings * sizeof(void *)); ++ map->table = new_table; ++ map->current_nr_mappings = nr_mappings_new; ++ descriptor_table_free(old_table); + } + -+ if (kbase_as_has_bus_fault(as)) { -+ /* -+ * hw counters dumping in progress, signal the -+ * other thread that it failed -+ */ -+ if ((kbdev->hwcnt.kctx == kctx) && -+ (kbdev->hwcnt.backend.state == -+ KBASE_INSTR_STATE_DUMPING)) -+ kbdev->hwcnt.backend.state = -+ KBASE_INSTR_STATE_FAULT; ++ /* we have found a valid descriptor, set the value and usage bit */ ++ _mali_osk_set_nonatomic_bit(descriptor, map->table->usage); ++ map->table->mappings[descriptor] = target; + -+ /* -+ * Stop the kctx from submitting more jobs and cause it -+ * to be scheduled out/rescheduled when all references -+ * to it are released -+ */ -+ kbasep_js_clear_submit_allowed(js_devdata, kctx); ++unlock_and_exit: ++ _mali_osk_mutex_rw_signal(map->lock, _MALI_OSK_LOCKMODE_RW); ++ return descriptor; ++} + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) -+ dev_warn(kbdev->dev, -+ "Bus error in AS%d at VA=0x%016llx, IPA=0x%016llx\n", -+ as->number, as->fault_addr, -+ as->fault_extra_addr); -+ else -+ dev_warn(kbdev->dev, "Bus error in AS%d at 0x%016llx\n", -+ as->number, as->fault_addr); ++int ump_descriptor_mapping_get(ump_descriptor_mapping *map, int descriptor, void **target) ++{ ++ int result = -1;/*-EFAULT;*/ ++ DEBUG_ASSERT(map); ++ _mali_osk_mutex_rw_wait(map->lock, _MALI_OSK_LOCKMODE_RO); ++ if ((descriptor > 0) && (descriptor < map->current_nr_mappings) && _mali_osk_test_bit(descriptor, map->table->usage)) { ++ *target = map->table->mappings[descriptor]; ++ result = 0; ++ } else *target = NULL; ++ _mali_osk_mutex_rw_signal(map->lock, _MALI_OSK_LOCKMODE_RO); ++ return result; ++} + -+ /* -+ * We need to switch to UNMAPPED mode - but we do this in a -+ * worker so that we can sleep -+ */ -+ KBASE_DEBUG_ASSERT(0 == object_is_on_stack(&as->work_busfault)); -+ WARN_ON(work_pending(&as->work_busfault)); -+ queue_work(as->pf_wq, &as->work_busfault); -+ atomic_inc(&kbdev->faults_pending); -+ } else { -+ KBASE_DEBUG_ASSERT(0 == object_is_on_stack(&as->work_pagefault)); -+ WARN_ON(work_pending(&as->work_pagefault)); -+ queue_work(as->pf_wq, &as->work_pagefault); -+ atomic_inc(&kbdev->faults_pending); ++int ump_descriptor_mapping_set(ump_descriptor_mapping *map, int descriptor, void *target) ++{ ++ int result = -1;/*-EFAULT;*/ ++ _mali_osk_mutex_rw_wait(map->lock, _MALI_OSK_LOCKMODE_RO); ++ if ((descriptor > 0) && (descriptor < map->current_nr_mappings) && _mali_osk_test_bit(descriptor, map->table->usage)) { ++ map->table->mappings[descriptor] = target; ++ result = 0; + } ++ _mali_osk_mutex_rw_signal(map->lock, _MALI_OSK_LOCKMODE_RO); ++ return result; +} + -+void kbase_flush_mmu_wqs(struct kbase_device *kbdev) ++void ump_descriptor_mapping_free(ump_descriptor_mapping *map, int descriptor) +{ -+ int i; ++ _mali_osk_mutex_rw_wait(map->lock, _MALI_OSK_LOCKMODE_RW); ++ if ((descriptor > 0) && (descriptor < map->current_nr_mappings) && _mali_osk_test_bit(descriptor, map->table->usage)) { ++ map->table->mappings[descriptor] = NULL; ++ _mali_osk_clear_nonatomic_bit(descriptor, map->table->usage); ++ } ++ _mali_osk_mutex_rw_signal(map->lock, _MALI_OSK_LOCKMODE_RW); ++} + -+ for (i = 0; i < kbdev->nr_hw_address_spaces; i++) { -+ struct kbase_as *as = &kbdev->as[i]; ++static ump_descriptor_table *descriptor_table_alloc(int count) ++{ ++ ump_descriptor_table *table; + -+ flush_workqueue(as->pf_wq); ++ table = _mali_osk_calloc(1, sizeof(ump_descriptor_table) + ((sizeof(unsigned long) * count) / BITS_PER_LONG) + (sizeof(void *) * count)); ++ ++ if (NULL != table) { ++ table->usage = (u32 *)((u8 *)table + sizeof(ump_descriptor_table)); ++ table->mappings = (void **)((u8 *)table + sizeof(ump_descriptor_table) + ((sizeof(unsigned long) * count) / BITS_PER_LONG)); + } ++ ++ return table; ++} ++ ++static void descriptor_table_free(ump_descriptor_table *table) ++{ ++ _mali_osk_free(table); +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_hw.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_hw.h ++ +diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h new file mode 100755 -index 000000000000..986e959e9a0c +index 000000000..a888ba833 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_hw.h -@@ -0,0 +1,123 @@ ++++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h +@@ -0,0 +1,89 @@ +/* -+ * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+/** -+ * @file -+ * Interface file for accessing MMU hardware functionality ++ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** -+ * @page mali_kbase_mmu_hw_page MMU hardware interface -+ * -+ * @section mali_kbase_mmu_hw_intro_sec Introduction -+ * This module provides an abstraction for accessing the functionality provided -+ * by the midgard MMU and thus allows all MMU HW access to be contained within -+ * one common place and allows for different backends (implementations) to -+ * be provided. ++ * @file ump_kernel_descriptor_mapping.h + */ + -+#ifndef _MALI_KBASE_MMU_HW_H_ -+#define _MALI_KBASE_MMU_HW_H_ ++#ifndef __UMP_KERNEL_DESCRIPTOR_MAPPING_H__ ++#define __UMP_KERNEL_DESCRIPTOR_MAPPING_H__ + -+/* Forward declarations */ -+struct kbase_device; -+struct kbase_as; -+struct kbase_context; ++#include "mali_osk.h" + +/** -+ * @addtogroup base_kbase_api -+ * @{ ++ * The actual descriptor mapping table, never directly accessed by clients + */ ++typedef struct ump_descriptor_table { ++ u32 *usage; /**< Pointer to bitpattern indicating if a descriptor is valid/used or not */ ++ void **mappings; /**< Array of the pointers the descriptors map to */ ++} ump_descriptor_table; + +/** -+ * @addtogroup mali_kbase_mmu_hw MMU access APIs -+ * @{ ++ * The descriptor mapping object ++ * Provides a separate namespace where we can map an integer to a pointer + */ ++typedef struct ump_descriptor_mapping { ++ _mali_osk_mutex_rw_t *lock; /**< Lock protecting access to the mapping object */ ++ int max_nr_mappings_allowed; /**< Max number of mappings to support in this namespace */ ++ int current_nr_mappings; /**< Current number of possible mappings */ ++ ump_descriptor_table *table; /**< Pointer to the current mapping table */ ++} ump_descriptor_mapping; + -+/** @brief MMU fault type descriptor. ++/** ++ * Create a descriptor mapping object ++ * Create a descriptor mapping capable of holding init_entries growable to max_entries ++ * @param init_entries Number of entries to preallocate memory for ++ * @param max_entries Number of entries to max support ++ * @return Pointer to a descriptor mapping object, NULL on failure + */ -+enum kbase_mmu_fault_type { -+ KBASE_MMU_FAULT_TYPE_UNKNOWN = 0, -+ KBASE_MMU_FAULT_TYPE_PAGE, -+ KBASE_MMU_FAULT_TYPE_BUS, -+ KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED, -+ KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED -+}; ++ump_descriptor_mapping *ump_descriptor_mapping_create(int init_entries, int max_entries); + -+/** @brief Configure an address space for use. -+ * -+ * Configure the MMU using the address space details setup in the -+ * @ref kbase_context structure. -+ * -+ * @param[in] kbdev kbase device to configure. -+ * @param[in] as address space to configure. -+ * @param[in] kctx kbase context to configure. ++/** ++ * Destroy a descriptor mapping object ++ * @param map The map to free + */ -+void kbase_mmu_hw_configure(struct kbase_device *kbdev, -+ struct kbase_as *as, struct kbase_context *kctx); ++void ump_descriptor_mapping_destroy(ump_descriptor_mapping *map); + -+/** @brief Issue an operation to the MMU. -+ * -+ * Issue an operation (MMU invalidate, MMU flush, etc) on the address space that -+ * is associated with the provided @ref kbase_context over the specified range -+ * -+ * @param[in] kbdev kbase device to issue the MMU operation on. -+ * @param[in] as address space to issue the MMU operation on. -+ * @param[in] kctx kbase context to issue the MMU operation on. -+ * @param[in] vpfn MMU Virtual Page Frame Number to start the -+ * operation on. -+ * @param[in] nr Number of pages to work on. -+ * @param[in] type Operation type (written to ASn_COMMAND). -+ * @param[in] handling_irq Is this operation being called during the handling -+ * of an interrupt? -+ * -+ * @return Zero if the operation was successful, non-zero otherwise. ++/** ++ * Allocate a new mapping entry (descriptor ID) ++ * Allocates a new entry in the map. ++ * @param map The map to allocate a new entry in ++ * @param target The value to map to ++ * @return The descriptor allocated, a negative value on error + */ -+int kbase_mmu_hw_do_operation(struct kbase_device *kbdev, struct kbase_as *as, -+ struct kbase_context *kctx, u64 vpfn, u32 nr, u32 type, -+ unsigned int handling_irq); ++int ump_descriptor_mapping_allocate_mapping(ump_descriptor_mapping *map, void *target); + -+/** @brief Clear a fault that has been previously reported by the MMU. -+ * -+ * Clear a bus error or page fault that has been reported by the MMU. -+ * -+ * @param[in] kbdev kbase device to clear the fault from. -+ * @param[in] as address space to clear the fault from. -+ * @param[in] kctx kbase context to clear the fault from or NULL. -+ * @param[in] type The type of fault that needs to be cleared. ++/** ++ * Get the value mapped to by a descriptor ID ++ * @param map The map to lookup the descriptor id in ++ * @param descriptor The descriptor ID to lookup ++ * @param target Pointer to a pointer which will receive the stored value ++ * @return 0 on successful lookup, negative on error + */ -+void kbase_mmu_hw_clear_fault(struct kbase_device *kbdev, struct kbase_as *as, -+ struct kbase_context *kctx, enum kbase_mmu_fault_type type); ++int ump_descriptor_mapping_get(ump_descriptor_mapping *map, int descriptor, void **target); + -+/** @brief Enable fault that has been previously reported by the MMU. -+ * -+ * After a page fault or bus error has been reported by the MMU these -+ * will be disabled. After these are handled this function needs to be -+ * called to enable the page fault or bus error fault again. -+ * -+ * @param[in] kbdev kbase device to again enable the fault from. -+ * @param[in] as address space to again enable the fault from. -+ * @param[in] kctx kbase context to again enable the fault from. -+ * @param[in] type The type of fault that needs to be enabled again. ++/** ++ * Set the value mapped to by a descriptor ID ++ * @param map The map to lookup the descriptor id in ++ * @param descriptor The descriptor ID to lookup ++ * @param target Pointer to replace the current value with ++ * @return 0 on successful lookup, negative on error + */ -+void kbase_mmu_hw_enable_fault(struct kbase_device *kbdev, struct kbase_as *as, -+ struct kbase_context *kctx, enum kbase_mmu_fault_type type); ++int ump_descriptor_mapping_set(ump_descriptor_mapping *map, int descriptor, void *target); + -+/** @} *//* end group mali_kbase_mmu_hw */ -+/** @} *//* end group base_kbase_api */ ++/** ++ * Free the descriptor ID ++ * For the descriptor to be reused it has to be freed ++ * @param map The map to free the descriptor from ++ * @param descriptor The descriptor ID to free ++ */ ++void ump_descriptor_mapping_free(ump_descriptor_mapping *map, int descriptor); + -+#endif /* _MALI_KBASE_MMU_HW_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_mode_aarch64.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_mode_aarch64.c ++#endif /* __UMP_KERNEL_DESCRIPTOR_MAPPING_H__ */ +diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h new file mode 100755 -index 000000000000..0fb717b67af9 +index 000000000..2b69f68e8 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_mode_aarch64.c -@@ -0,0 +1,214 @@ ++++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h +@@ -0,0 +1,48 @@ +/* -+ * -+ * (C) COPYRIGHT 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++/** ++ * @file ump_kernel_memory_mapping.h ++ */ + ++#ifndef __UMP_KERNEL_MEMORY_BACKEND_H__ ++#define __UMP_KERNEL_MEMORY_BACKEND_H__ + ++#include "ump_kernel_interface.h" ++#include "ump_kernel_types.h" + + -+#include "mali_kbase.h" -+#include "mali_midg_regmap.h" -+#include "mali_kbase_defs.h" -+ -+#define ENTRY_TYPE_MASK 3ULL -+/* For valid ATEs bit 1 = ((level == 3) ? 1 : 0). -+ * Valid ATE entries at level 3 are flagged with the value 3. -+ * Valid ATE entries at level 0-2 are flagged with the value 1. -+ */ -+#define ENTRY_IS_ATE_L3 3ULL -+#define ENTRY_IS_ATE_L02 1ULL -+#define ENTRY_IS_INVAL 2ULL -+#define ENTRY_IS_PTE 3ULL ++typedef struct ump_memory_allocation { ++ void *phys_addr; ++ void *mapping; ++ unsigned long size; ++ ump_dd_handle handle; ++ void *process_mapping_info; ++ u32 cookie; /**< necessary on some U/K interface implementations */ ++ struct ump_session_data *ump_session; /**< Session that this allocation belongs to */ ++ _mali_osk_list_t list; /**< List for linking together memory allocations into the session's memory head */ ++ u32 is_cached; ++} ump_memory_allocation; + -+#define ENTRY_ATTR_BITS (7ULL << 2) /* bits 4:2 */ -+#define ENTRY_ACCESS_RW (1ULL << 6) /* bits 6:7 */ -+#define ENTRY_ACCESS_RO (3ULL << 6) -+#define ENTRY_SHARE_BITS (3ULL << 8) /* bits 9:8 */ -+#define ENTRY_ACCESS_BIT (1ULL << 10) -+#define ENTRY_NX_BIT (1ULL << 54) ++typedef struct ump_memory_backend { ++ int (*allocate)(void *ctx, ump_dd_mem *descriptor); ++ void (*release)(void *ctx, ump_dd_mem *descriptor); ++ void (*shutdown)(struct ump_memory_backend *backend); ++ u32(*stat)(struct ump_memory_backend *backend); ++ int (*pre_allocate_physical_check)(void *ctx, u32 size); ++ u32(*adjust_to_mali_phys)(void *ctx, u32 cpu_phys); ++ void *ctx; ++} ump_memory_backend; + -+/* Helper Function to perform assignment of page table entries, to -+ * ensure the use of strd, which is required on LPAE systems. -+ */ -+static inline void page_table_entry_set(u64 *pte, u64 phy) -+{ -+#ifdef CONFIG_64BIT -+ *pte = phy; -+#elif defined(CONFIG_ARM) -+ /* -+ * In order to prevent the compiler keeping cached copies of -+ * memory, we have to explicitly say that we have updated memory. -+ * -+ * Note: We could manually move the data ourselves into R0 and -+ * R1 by specifying register variables that are explicitly -+ * given registers assignments, the down side of this is that -+ * we have to assume cpu endianness. To avoid this we can use -+ * the ldrd to read the data from memory into R0 and R1 which -+ * will respect the cpu endianness, we then use strd to make -+ * the 64 bit assignment to the page table entry. -+ */ -+ asm volatile("ldrd r0, r1, [%[ptemp]]\n\t" -+ "strd r0, r1, [%[pte]]\n\t" -+ : "=m" (*pte) -+ : [ptemp] "r" (&phy), [pte] "r" (pte), "m" (phy) -+ : "r0", "r1"); -+#else -+#error "64-bit atomic write must be implemented for your architecture" -+#endif -+} ++ump_memory_backend *ump_memory_backend_create(void); ++void ump_memory_backend_destroy(void); + -+static void mmu_get_as_setup(struct kbase_context *kctx, -+ struct kbase_mmu_setup * const setup) -+{ -+ /* Set up the required caching policies at the correct indices -+ * in the memattr register. -+ */ -+ setup->memattr = -+ (AS_MEMATTR_IMPL_DEF_CACHE_POLICY << -+ (AS_MEMATTR_INDEX_IMPL_DEF_CACHE_POLICY * 8)) | -+ (AS_MEMATTR_FORCE_TO_CACHE_ALL << -+ (AS_MEMATTR_INDEX_FORCE_TO_CACHE_ALL * 8)) | -+ (AS_MEMATTR_WRITE_ALLOC << -+ (AS_MEMATTR_INDEX_WRITE_ALLOC * 8)) | -+ (AS_MEMATTR_AARCH64_OUTER_IMPL_DEF << -+ (AS_MEMATTR_INDEX_OUTER_IMPL_DEF * 8)) | -+ (AS_MEMATTR_AARCH64_OUTER_WA << -+ (AS_MEMATTR_INDEX_OUTER_WA * 8)); ++#endif /*__UMP_KERNEL_MEMORY_BACKEND_H__ */ + -+ setup->transtab = (u64)kctx->pgd & AS_TRANSTAB_BASE_MASK; -+ setup->transcfg = AS_TRANSCFG_ADRMODE_AARCH64_4K; -+} +diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c +new file mode 100755 +index 000000000..0b6434bee +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c +@@ -0,0 +1,181 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+static void mmu_update(struct kbase_context *kctx) -+{ -+ struct kbase_device * const kbdev = kctx->kbdev; -+ struct kbase_as * const as = &kbdev->as[kctx->as_nr]; -+ struct kbase_mmu_setup * const current_setup = &as->current_setup; ++#include "mali_osk.h" ++#include "mali_osk_list.h" ++#include "ump_osk.h" ++#include "ump_uk_types.h" + -+ mmu_get_as_setup(kctx, current_setup); ++#include "ump_kernel_interface_ref_drv.h" ++#include "ump_kernel_common.h" ++#include "ump_kernel_descriptor_mapping.h" + -+ /* Apply the address space setting */ -+ kbase_mmu_hw_configure(kbdev, as, kctx); -+} ++#define UMP_MINIMUM_SIZE 4096 ++#define UMP_MINIMUM_SIZE_MASK (~(UMP_MINIMUM_SIZE-1)) ++#define UMP_SIZE_ALIGN(x) (((x)+UMP_MINIMUM_SIZE-1)&UMP_MINIMUM_SIZE_MASK) ++#define UMP_ADDR_ALIGN_OFFSET(x) ((x)&(UMP_MINIMUM_SIZE-1)) ++static void phys_blocks_release(void *ctx, struct ump_dd_mem *descriptor); + -+static void mmu_disable_as(struct kbase_device *kbdev, int as_nr) ++UMP_KERNEL_API_EXPORT ump_dd_handle ump_dd_handle_create_from_phys_blocks(ump_dd_physical_block *blocks, unsigned long num_blocks) +{ -+ struct kbase_as * const as = &kbdev->as[as_nr]; -+ struct kbase_mmu_setup * const current_setup = &as->current_setup; -+ -+ current_setup->transtab = 0ULL; -+ current_setup->transcfg = AS_TRANSCFG_ADRMODE_UNMAPPED; -+ -+ /* Apply the address space setting */ -+ kbase_mmu_hw_configure(kbdev, as, NULL); -+} ++ ump_dd_mem *mem; ++ unsigned long size_total = 0; ++ int ret; ++ u32 i; + -+static phys_addr_t pte_to_phy_addr(u64 entry) -+{ -+ if (!(entry & 1)) -+ return 0; ++ /* Go through the input blocks and verify that they are sane */ ++ for (i = 0; i < num_blocks; i++) { ++ unsigned long addr = blocks[i].addr; ++ unsigned long size = blocks[i].size; + -+ return entry & ~0xFFF; -+} ++ DBG_MSG(5, ("Adding physical memory to new handle. Address: 0x%08lx, size: %lu\n", addr, size)); ++ size_total += blocks[i].size; + -+static int ate_is_valid(u64 ate, unsigned int level) -+{ -+ if (level == MIDGARD_MMU_BOTTOMLEVEL) -+ return ((ate & ENTRY_TYPE_MASK) == ENTRY_IS_ATE_L3); -+ else -+ return ((ate & ENTRY_TYPE_MASK) == ENTRY_IS_ATE_L02); -+} ++ if (0 != UMP_ADDR_ALIGN_OFFSET(addr)) { ++ MSG_ERR(("Trying to create UMP memory from unaligned physical address. Address: 0x%08lx\n", addr)); ++ return UMP_DD_HANDLE_INVALID; ++ } + -+static int pte_is_valid(u64 pte, unsigned int level) -+{ -+ /* PTEs cannot exist at the bottom level */ -+ if (level == MIDGARD_MMU_BOTTOMLEVEL) -+ return false; -+ return ((pte & ENTRY_TYPE_MASK) == ENTRY_IS_PTE); -+} ++ if (0 != UMP_ADDR_ALIGN_OFFSET(size)) { ++ MSG_ERR(("Trying to create UMP memory with unaligned size. Size: %lu\n", size)); ++ return UMP_DD_HANDLE_INVALID; ++ } ++ } + -+/* -+ * Map KBASE_REG flags to MMU flags -+ */ -+static u64 get_mmu_flags(unsigned long flags) -+{ -+ u64 mmu_flags; ++ /* Allocate the ump_dd_mem struct for this allocation */ ++ mem = _mali_osk_malloc(sizeof(*mem)); ++ if (NULL == mem) { ++ DBG_MSG(1, ("Could not allocate ump_dd_mem in ump_dd_handle_create_from_phys_blocks()\n")); ++ return UMP_DD_HANDLE_INVALID; ++ } + -+ /* store mem_attr index as 4:2 (macro called ensures 3 bits already) */ -+ mmu_flags = KBASE_REG_MEMATTR_VALUE(flags) << 2; ++ /* Now, make a copy of the block information supplied by the user */ ++ mem->block_array = _mali_osk_malloc(sizeof(ump_dd_physical_block) * num_blocks); ++ if (NULL == mem->block_array) { ++ _mali_osk_free(mem); ++ DBG_MSG(1, ("Could not allocate a mem handle for function ump_dd_handle_create_from_phys_blocks().\n")); ++ return UMP_DD_HANDLE_INVALID; ++ } + -+ /* Set access flags - note that AArch64 stage 1 does not support -+ * write-only access, so we use read/write instead -+ */ -+ if (flags & KBASE_REG_GPU_WR) -+ mmu_flags |= ENTRY_ACCESS_RW; -+ else if (flags & KBASE_REG_GPU_RD) -+ mmu_flags |= ENTRY_ACCESS_RO; ++ _mali_osk_memcpy(mem->block_array, blocks, sizeof(ump_dd_physical_block) * num_blocks); + -+ /* nx if requested */ -+ mmu_flags |= (flags & KBASE_REG_GPU_NX) ? ENTRY_NX_BIT : 0; ++ /* And setup the rest of the ump_dd_mem struct */ ++ _mali_osk_atomic_init(&mem->ref_count, 1); ++ mem->size_bytes = size_total; ++ mem->nr_blocks = num_blocks; ++ mem->backend_info = NULL; ++ mem->ctx = NULL; ++ mem->release_func = phys_blocks_release; ++ /* For now UMP handles created by ump_dd_handle_create_from_phys_blocks() is forced to be Uncached */ ++ mem->is_cached = 0; ++ mem->hw_device = _UMP_UK_USED_BY_CPU; ++ mem->lock_usage = UMP_NOT_LOCKED; + -+ if (flags & KBASE_REG_SHARE_BOTH) { -+ /* inner and outer shareable */ -+ mmu_flags |= SHARE_BOTH_BITS; -+ } else if (flags & KBASE_REG_SHARE_IN) { -+ /* inner shareable coherency */ -+ mmu_flags |= SHARE_INNER_BITS; ++ /* Find a secure ID for this allocation */ ++ ret = ump_random_mapping_insert(device.secure_id_map, mem); ++ if (unlikely(ret)) { ++ _mali_osk_free(mem->block_array); ++ _mali_osk_free(mem); ++ DBG_MSG(1, ("Failed to allocate secure ID in ump_dd_handle_create_from_phys_blocks()\n")); ++ return UMP_DD_HANDLE_INVALID; + } + -+ return mmu_flags; -+} ++ DBG_MSG(3, ("UMP memory created. ID: %u, size: %lu\n", mem->secure_id, mem->size_bytes)); + -+static void entry_set_ate(u64 *entry, -+ struct tagged_addr phy, -+ unsigned long flags, -+ unsigned int level) -+{ -+ if (level == MIDGARD_MMU_BOTTOMLEVEL) -+ page_table_entry_set(entry, as_phys_addr_t(phy) | -+ get_mmu_flags(flags) | -+ ENTRY_ACCESS_BIT | ENTRY_IS_ATE_L3); -+ else -+ page_table_entry_set(entry, as_phys_addr_t(phy) | -+ get_mmu_flags(flags) | -+ ENTRY_ACCESS_BIT | ENTRY_IS_ATE_L02); ++ return (ump_dd_handle)mem; +} + -+static void entry_set_pte(u64 *entry, phys_addr_t phy) ++static void phys_blocks_release(void *ctx, struct ump_dd_mem *descriptor) +{ -+ page_table_entry_set(entry, (phy & PAGE_MASK) | -+ ENTRY_ACCESS_BIT | ENTRY_IS_PTE); ++ _mali_osk_free(descriptor->block_array); ++ descriptor->block_array = NULL; +} + -+static void entry_invalidate(u64 *entry) ++_mali_osk_errcode_t _ump_ukk_allocate(_ump_uk_allocate_s *user_interaction) +{ -+ page_table_entry_set(entry, ENTRY_IS_INVAL); -+} ++ ump_session_data *session_data = NULL; ++ ump_dd_mem *new_allocation = NULL; ++ ump_session_memory_list_element *session_memory_element = NULL; ++ int ret; + -+static struct kbase_mmu_mode const aarch64_mode = { -+ .update = mmu_update, -+ .get_as_setup = mmu_get_as_setup, -+ .disable_as = mmu_disable_as, -+ .pte_to_phy_addr = pte_to_phy_addr, -+ .ate_is_valid = ate_is_valid, -+ .pte_is_valid = pte_is_valid, -+ .entry_set_ate = entry_set_ate, -+ .entry_set_pte = entry_set_pte, -+ .entry_invalidate = entry_invalidate -+}; ++ DEBUG_ASSERT_POINTER(user_interaction); ++ DEBUG_ASSERT_POINTER(user_interaction->ctx); + -+struct kbase_mmu_mode const *kbase_mmu_mode_get_aarch64(void) -+{ -+ return &aarch64_mode; -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_mode_lpae.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_mode_lpae.c -new file mode 100755 -index 000000000000..f080fdc0be88 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_mode_lpae.c -@@ -0,0 +1,199 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ session_data = (ump_session_data *) user_interaction->ctx; + ++ session_memory_element = _mali_osk_calloc(1, sizeof(ump_session_memory_list_element)); ++ if (NULL == session_memory_element) { ++ DBG_MSG(1, ("Failed to allocate ump_session_memory_list_element in ump_ioctl_allocate()\n")); ++ return _MALI_OSK_ERR_NOMEM; ++ } + + ++ new_allocation = _mali_osk_calloc(1, sizeof(ump_dd_mem)); ++ if (NULL == new_allocation) { ++ _mali_osk_free(session_memory_element); ++ DBG_MSG(1, ("Failed to allocate ump_dd_mem in _ump_ukk_allocate()\n")); ++ return _MALI_OSK_ERR_NOMEM; ++ } + ++ /* Initialize the part of the new_allocation that we know so for */ ++ _mali_osk_atomic_init(&new_allocation->ref_count, 1); ++ if (0 == (UMP_REF_DRV_UK_CONSTRAINT_USE_CACHE & user_interaction->constraints)) ++ new_allocation->is_cached = 0; ++ else new_allocation->is_cached = 1; + -+#include "mali_kbase.h" -+#include "mali_midg_regmap.h" -+#include "mali_kbase_defs.h" ++ /* Special case a size of 0, we should try to emulate what malloc does ++ * in this case, which is to return a valid pointer that must be freed, ++ * but can't be dereferenced */ ++ if (0 == user_interaction->size) { ++ /* Emulate by actually allocating the minimum block size */ ++ user_interaction->size = 1; ++ } + -+#define ENTRY_TYPE_MASK 3ULL -+#define ENTRY_IS_ATE 1ULL -+#define ENTRY_IS_INVAL 2ULL -+#define ENTRY_IS_PTE 3ULL ++ /* Page align the size */ ++ new_allocation->size_bytes = UMP_SIZE_ALIGN(user_interaction->size); ++ new_allocation->lock_usage = UMP_NOT_LOCKED; + -+#define ENTRY_ATTR_BITS (7ULL << 2) /* bits 4:2 */ -+#define ENTRY_RD_BIT (1ULL << 6) -+#define ENTRY_WR_BIT (1ULL << 7) -+#define ENTRY_SHARE_BITS (3ULL << 8) /* bits 9:8 */ -+#define ENTRY_ACCESS_BIT (1ULL << 10) -+#define ENTRY_NX_BIT (1ULL << 54) -+ -+#define ENTRY_FLAGS_MASK (ENTRY_ATTR_BITS | ENTRY_RD_BIT | ENTRY_WR_BIT | \ -+ ENTRY_SHARE_BITS | ENTRY_ACCESS_BIT | ENTRY_NX_BIT) ++ /* Now, ask the active memory backend to do the actual memory allocation */ ++ if (!device.backend->allocate(device.backend->ctx, new_allocation)) { ++ DBG_MSG(3, ("OOM: No more UMP memory left. Failed to allocate memory in ump_ioctl_allocate(). Size: %lu, requested size: %lu\n", ++ new_allocation->size_bytes, ++ (unsigned long)user_interaction->size)); ++ _mali_osk_free(new_allocation); ++ _mali_osk_free(session_memory_element); ++ return _MALI_OSK_ERR_INVALID_FUNC; ++ } ++ new_allocation->hw_device = _UMP_UK_USED_BY_CPU; ++ new_allocation->ctx = device.backend->ctx; ++ new_allocation->release_func = device.backend->release; + -+/* Helper Function to perform assignment of page table entries, to -+ * ensure the use of strd, which is required on LPAE systems. -+ */ -+static inline void page_table_entry_set(u64 *pte, u64 phy) -+{ -+#ifdef CONFIG_64BIT -+ *pte = phy; -+#elif defined(CONFIG_ARM) -+ /* -+ * In order to prevent the compiler keeping cached copies of -+ * memory, we have to explicitly say that we have updated -+ * memory. -+ * -+ * Note: We could manually move the data ourselves into R0 and -+ * R1 by specifying register variables that are explicitly -+ * given registers assignments, the down side of this is that -+ * we have to assume cpu endianness. To avoid this we can use -+ * the ldrd to read the data from memory into R0 and R1 which -+ * will respect the cpu endianness, we then use strd to make -+ * the 64 bit assignment to the page table entry. -+ */ -+ asm volatile("ldrd r0, r1, [%[ptemp]]\n\t" -+ "strd r0, r1, [%[pte]]\n\t" -+ : "=m" (*pte) -+ : [ptemp] "r" (&phy), [pte] "r" (pte), "m" (phy) -+ : "r0", "r1"); -+#else -+#error "64-bit atomic write must be implemented for your architecture" -+#endif -+} ++ /* Initialize the session_memory_element, and add it to the session object */ ++ session_memory_element->mem = new_allocation; ++ _mali_osk_mutex_wait(session_data->lock); ++ _mali_osk_list_add(&(session_memory_element->list), &(session_data->list_head_session_memory_list)); ++ _mali_osk_mutex_signal(session_data->lock); + -+static void mmu_get_as_setup(struct kbase_context *kctx, -+ struct kbase_mmu_setup * const setup) -+{ -+ /* Set up the required caching policies at the correct indices -+ * in the memattr register. */ -+ setup->memattr = -+ (AS_MEMATTR_LPAE_IMPL_DEF_CACHE_POLICY << -+ (AS_MEMATTR_INDEX_IMPL_DEF_CACHE_POLICY * 8)) | -+ (AS_MEMATTR_LPAE_FORCE_TO_CACHE_ALL << -+ (AS_MEMATTR_INDEX_FORCE_TO_CACHE_ALL * 8)) | -+ (AS_MEMATTR_LPAE_WRITE_ALLOC << -+ (AS_MEMATTR_INDEX_WRITE_ALLOC * 8)) | -+ (AS_MEMATTR_LPAE_OUTER_IMPL_DEF << -+ (AS_MEMATTR_INDEX_OUTER_IMPL_DEF * 8)) | -+ (AS_MEMATTR_LPAE_OUTER_WA << -+ (AS_MEMATTR_INDEX_OUTER_WA * 8)) | -+ 0; /* The other indices are unused for now */ ++ /* Create a secure ID for this allocation */ ++ ret = ump_random_mapping_insert(device.secure_id_map, new_allocation); ++ if (unlikely(ret)) { ++ new_allocation->release_func(new_allocation->ctx, new_allocation); ++ _mali_osk_free(session_memory_element); ++ _mali_osk_free(new_allocation); ++ DBG_MSG(1, ("Failed to allocate secure ID in ump_ioctl_allocate()\n")); ++ return _MALI_OSK_ERR_INVALID_FUNC; ++ } + -+ setup->transtab = ((u64)kctx->pgd & -+ ((0xFFFFFFFFULL << 32) | AS_TRANSTAB_LPAE_ADDR_SPACE_MASK)) | -+ AS_TRANSTAB_LPAE_ADRMODE_TABLE | -+ AS_TRANSTAB_LPAE_READ_INNER; ++ user_interaction->secure_id = new_allocation->secure_id; ++ user_interaction->size = new_allocation->size_bytes; ++ DBG_MSG(3, ("UMP memory allocated. ID: %u, size: %lu\n", ++ new_allocation->secure_id, ++ new_allocation->size_bytes)); + -+ setup->transcfg = 0; ++ return _MALI_OSK_ERR_OK; +} +diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h +new file mode 100755 +index 000000000..32f32ccbe +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h +@@ -0,0 +1,58 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+static void mmu_update(struct kbase_context *kctx) -+{ -+ struct kbase_device * const kbdev = kctx->kbdev; -+ struct kbase_as * const as = &kbdev->as[kctx->as_nr]; -+ struct kbase_mmu_setup * const current_setup = &as->current_setup; -+ -+ mmu_get_as_setup(kctx, current_setup); -+ -+ /* Apply the address space setting */ -+ kbase_mmu_hw_configure(kbdev, as, kctx); -+} ++#ifndef __UMP_KERNEL_TYPES_H__ ++#define __UMP_KERNEL_TYPES_H__ + -+static void mmu_disable_as(struct kbase_device *kbdev, int as_nr) -+{ -+ struct kbase_as * const as = &kbdev->as[as_nr]; -+ struct kbase_mmu_setup * const current_setup = &as->current_setup; ++#include "ump_kernel_interface.h" ++#include "mali_osk.h" + -+ current_setup->transtab = AS_TRANSTAB_LPAE_ADRMODE_UNMAPPED; ++#include ++#ifdef CONFIG_DMA_SHARED_BUFFER ++#include ++#endif + -+ /* Apply the address space setting */ -+ kbase_mmu_hw_configure(kbdev, as, NULL); -+} ++typedef enum { ++ UMP_USED_BY_CPU = 0, ++ UMP_USED_BY_MALI = 1, ++ UMP_USED_BY_UNKNOWN_DEVICE = 100, ++} ump_hw_usage; + -+static phys_addr_t pte_to_phy_addr(u64 entry) -+{ -+ if (!(entry & 1)) -+ return 0; ++typedef enum { ++ UMP_NOT_LOCKED = 0, ++ UMP_READ = 1, ++ UMP_READ_WRITE = 3, ++} ump_lock_usage; + -+ return entry & ~0xFFF; -+} ++/* ++ * This struct is what is "behind" a ump_dd_handle ++ */ ++typedef struct ump_dd_mem { ++ struct rb_node node; ++ ump_secure_id secure_id; ++ _mali_osk_atomic_t ref_count; ++ unsigned long size_bytes; ++ unsigned long nr_blocks; ++ ump_dd_physical_block *block_array; ++ void (*release_func)(void *ctx, struct ump_dd_mem *descriptor); ++ void *ctx; ++ void *backend_info; ++ int is_cached; ++ ump_hw_usage hw_device; ++ ump_lock_usage lock_usage; ++#ifdef CONFIG_DMA_SHARED_BUFFER ++ struct dma_buf_attachment *import_attach; ++ struct sg_table *sgt; ++#endif ++} ump_dd_mem; + -+static int ate_is_valid(u64 ate, unsigned int level) -+{ -+ return ((ate & ENTRY_TYPE_MASK) == ENTRY_IS_ATE); -+} + -+static int pte_is_valid(u64 pte, unsigned int level) -+{ -+ return ((pte & ENTRY_TYPE_MASK) == ENTRY_IS_PTE); -+} + ++#endif /* __UMP_KERNEL_TYPES_H__ */ +diff --git a/drivers/gpu/arm/mali400/ump/common/ump_osk.h b/drivers/gpu/arm/mali400/ump/common/ump_osk.h +new file mode 100755 +index 000000000..9adc4d3df +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/common/ump_osk.h +@@ -0,0 +1,48 @@ +/* -+ * Map KBASE_REG flags to MMU flags ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+static u64 get_mmu_flags(unsigned long flags) -+{ -+ u64 mmu_flags; + -+ /* store mem_attr index as 4:2 (macro called ensures 3 bits already) */ -+ mmu_flags = KBASE_REG_MEMATTR_VALUE(flags) << 2; ++/** ++ * @file ump_osk.h ++ * Defines the OS abstraction layer for the UMP kernel device driver (OSK) ++ */ + -+ /* write perm if requested */ -+ mmu_flags |= (flags & KBASE_REG_GPU_WR) ? ENTRY_WR_BIT : 0; -+ /* read perm if requested */ -+ mmu_flags |= (flags & KBASE_REG_GPU_RD) ? ENTRY_RD_BIT : 0; -+ /* nx if requested */ -+ mmu_flags |= (flags & KBASE_REG_GPU_NX) ? ENTRY_NX_BIT : 0; ++#ifndef __UMP_OSK_H__ ++#define __UMP_OSK_H__ + -+ if (flags & KBASE_REG_SHARE_BOTH) { -+ /* inner and outer shareable */ -+ mmu_flags |= SHARE_BOTH_BITS; -+ } else if (flags & KBASE_REG_SHARE_IN) { -+ /* inner shareable coherency */ -+ mmu_flags |= SHARE_INNER_BITS; -+ } ++#include ++#include ++#include "ump_uk_types.h" ++#include "ump_kernel_common.h" + -+ return mmu_flags; -+} ++#ifdef __cplusplus ++extern "C" { ++#endif + -+static void entry_set_ate(u64 *entry, -+ struct tagged_addr phy, -+ unsigned long flags, -+ unsigned int level) -+{ -+ page_table_entry_set(entry, as_phys_addr_t(phy) | get_mmu_flags(flags) | -+ ENTRY_IS_ATE); -+} ++_mali_osk_errcode_t _ump_osk_init(void); + -+static void entry_set_pte(u64 *entry, phys_addr_t phy) -+{ -+ page_table_entry_set(entry, (phy & ~0xFFF) | ENTRY_IS_PTE); -+} ++_mali_osk_errcode_t _ump_osk_term(void); + -+static void entry_invalidate(u64 *entry) -+{ -+ page_table_entry_set(entry, ENTRY_IS_INVAL); -+} ++int _ump_osk_atomic_inc_and_read(_mali_osk_atomic_t *atom); + -+static struct kbase_mmu_mode const lpae_mode = { -+ .update = mmu_update, -+ .get_as_setup = mmu_get_as_setup, -+ .disable_as = mmu_disable_as, -+ .pte_to_phy_addr = pte_to_phy_addr, -+ .ate_is_valid = ate_is_valid, -+ .pte_is_valid = pte_is_valid, -+ .entry_set_ate = entry_set_ate, -+ .entry_set_pte = entry_set_pte, -+ .entry_invalidate = entry_invalidate -+}; ++int _ump_osk_atomic_dec_and_read(_mali_osk_atomic_t *atom); + -+struct kbase_mmu_mode const *kbase_mmu_mode_get_lpae(void) -+{ -+ return &lpae_mode; ++_mali_osk_errcode_t _ump_osk_mem_mapregion_init(ump_memory_allocation *descriptor); ++ ++_mali_osk_errcode_t _ump_osk_mem_mapregion_map(ump_memory_allocation *descriptor, u32 offset, u32 *phys_addr, unsigned long size); ++ ++void _ump_osk_mem_mapregion_term(ump_memory_allocation *descriptor); ++ ++void _ump_osk_msync(ump_dd_mem *mem, void *virt, u32 offset, u32 size, ump_uk_msync_op op, ump_session_data *session_data); ++ ++#ifdef __cplusplus +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_platform_fake.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_platform_fake.c ++#endif ++ ++#endif +diff --git a/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h b/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h new file mode 100755 -index 000000000000..0152b35f711b +index 000000000..db842cdcb --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_platform_fake.c -@@ -0,0 +1,119 @@ ++++ b/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h +@@ -0,0 +1,202 @@ +/* -+ * -+ * (C) COPYRIGHT 2011-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010, 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++/** ++ * @file ump_uk_types.h ++ * Defines the types and constants used in the user-kernel interface ++ */ + ++#ifndef __UMP_UK_TYPES_H__ ++#define __UMP_UK_TYPES_H__ + -+#include -+#include -+#include -+#include -+#include ++#ifdef __cplusplus ++extern "C" { ++#endif + ++/* Helpers for API version handling */ ++#define MAKE_VERSION_ID(x) (((x) << 16UL) | (x)) ++#define IS_VERSION_ID(x) (((x) & 0xFFFF) == (((x) >> 16UL) & 0xFFFF)) ++#define GET_VERSION(x) (((x) >> 16UL) & 0xFFFF) ++#define IS_API_MATCH(x, y) (IS_VERSION_ID((x)) && IS_VERSION_ID((y)) && (GET_VERSION((x)) == GET_VERSION((y)))) + -+/* -+ * This file is included only for type definitions and functions belonging to -+ * specific platform folders. Do not add dependencies with symbols that are -+ * defined somewhere else. ++/** ++ * API version define. ++ * Indicates the version of the kernel API ++ * The version is a 16bit integer incremented on each API change. ++ * The 16bit integer is stored twice in a 32bit integer ++ * So for version 1 the value would be 0x00010001 + */ -+#include ++#define UMP_IOCTL_API_VERSION MAKE_VERSION_ID(3) + -+#define PLATFORM_CONFIG_RESOURCE_COUNT 4 -+#define PLATFORM_CONFIG_IRQ_RES_COUNT 3 ++typedef enum ++{ ++ _UMP_IOC_QUERY_API_VERSION = 1, ++ _UMP_IOC_ALLOCATE, ++ _UMP_IOC_RELEASE, ++ _UMP_IOC_SIZE_GET, ++ _UMP_IOC_MAP_MEM, /* not used in Linux */ ++ _UMP_IOC_UNMAP_MEM, /* not used in Linux */ ++ _UMP_IOC_MSYNC, ++ _UMP_IOC_CACHE_OPERATIONS_CONTROL, ++ _UMP_IOC_SWITCH_HW_USAGE, ++ _UMP_IOC_LOCK, ++ _UMP_IOC_UNLOCK, ++ _UMP_IOC_DMABUF_IMPORT, ++} _ump_uk_functions; + -+static struct platform_device *mali_device; ++typedef enum ++{ ++ UMP_REF_DRV_UK_CONSTRAINT_NONE = 0, ++ UMP_REF_DRV_UK_CONSTRAINT_PHYSICALLY_LINEAR = 1, ++ UMP_REF_DRV_UK_CONSTRAINT_USE_CACHE = 4, ++} ump_uk_alloc_constraints; ++ ++typedef enum ++{ ++ _UMP_UK_MSYNC_CLEAN = 0, ++ _UMP_UK_MSYNC_CLEAN_AND_INVALIDATE = 1, ++ _UMP_UK_MSYNC_INVALIDATE = 2, ++ _UMP_UK_MSYNC_FLUSH_L1 = 3, ++ _UMP_UK_MSYNC_READOUT_CACHE_ENABLED = 128, ++} ump_uk_msync_op; ++ ++typedef enum ++{ ++ _UMP_UK_CACHE_OP_START = 0, ++ _UMP_UK_CACHE_OP_FINISH = 1, ++} ump_uk_cache_op_control; ++ ++typedef enum ++{ ++ _UMP_UK_READ = 1, ++ _UMP_UK_READ_WRITE = 3, ++} ump_uk_lock_usage; ++ ++typedef enum ++{ ++ _UMP_UK_USED_BY_CPU = 0, ++ _UMP_UK_USED_BY_MALI = 1, ++ _UMP_UK_USED_BY_UNKNOWN_DEVICE = 100, ++} ump_uk_user; + -+#ifndef CONFIG_OF +/** -+ * @brief Convert data in struct kbase_io_resources struct to Linux-specific resources -+ * -+ * Function converts data in struct kbase_io_resources struct to an array of Linux resource structures. Note that function -+ * assumes that size of linux_resource array is at least PLATFORM_CONFIG_RESOURCE_COUNT. -+ * Resources are put in fixed order: I/O memory region, job IRQ, MMU IRQ, GPU IRQ. -+ * -+ * @param[in] io_resource Input IO resource data -+ * @param[out] linux_resources Pointer to output array of Linux resource structures ++ * Get API version ([in,out] u32 api_version, [out] u32 compatible) + */ -+static void kbasep_config_parse_io_resources(const struct kbase_io_resources *io_resources, struct resource *const linux_resources) ++typedef struct _ump_uk_api_version_s +{ -+ if (!io_resources || !linux_resources) { -+ pr_err("%s: couldn't find proper resources\n", __func__); -+ return; -+ } ++ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 version; /**< Set to the user space version on entry, stores the device driver version on exit */ ++ u32 compatible; /**< Non-null if the device is compatible with the client */ ++} _ump_uk_api_version_s; + -+ memset(linux_resources, 0, PLATFORM_CONFIG_RESOURCE_COUNT * sizeof(struct resource)); ++/** ++ * ALLOCATE ([out] u32 secure_id, [in,out] u32 size, [in] contraints) ++ */ ++typedef struct _ump_uk_allocate_s ++{ ++ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 secure_id; /**< Return value from DD to Userdriver */ ++ u32 size; /**< Input and output. Requested size; input. Returned size; output */ ++ ump_uk_alloc_constraints constraints; /**< Only input to Devicedriver */ ++} _ump_uk_allocate_s; + -+ linux_resources[0].start = io_resources->io_memory_region.start; -+ linux_resources[0].end = io_resources->io_memory_region.end; -+ linux_resources[0].flags = IORESOURCE_MEM; ++/** ++ * SIZE_GET ([in] u32 secure_id, [out]size ) ++ */ ++typedef struct _ump_uk_size_get_s ++{ ++ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 secure_id; /**< Input to DD */ ++ u32 size; /**< Returned size; output */ ++} _ump_uk_size_get_s; + -+ linux_resources[1].start = io_resources->job_irq_number; -+ linux_resources[1].end = io_resources->job_irq_number; -+ linux_resources[1].flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL; ++/** ++ * Release ([in] u32 secure_id) ++ */ ++typedef struct _ump_uk_release_s ++{ ++ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 secure_id; /**< Input to DD */ ++} _ump_uk_release_s; + -+ linux_resources[2].start = io_resources->mmu_irq_number; -+ linux_resources[2].end = io_resources->mmu_irq_number; -+ linux_resources[2].flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL; ++typedef struct _ump_uk_map_mem_s ++{ ++ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ void *mapping; /**< [out] Returns user-space virtual address for the mapping */ ++ void *phys_addr; /**< [in] physical address */ ++ unsigned long size; /**< [in] size */ ++ u32 secure_id; /**< [in] secure_id to assign to mapping */ ++ void *_ukk_private; /**< Only used inside linux port between kernel frontend and common part to store vma */ ++ u32 cookie; ++ u32 is_cached; /**< [in,out] caching of CPU mappings */ ++} _ump_uk_map_mem_s; + -+ linux_resources[3].start = io_resources->gpu_irq_number; -+ linux_resources[3].end = io_resources->gpu_irq_number; -+ linux_resources[3].flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL; -+} -+#endif /* CONFIG_OF */ ++typedef struct _ump_uk_unmap_mem_s ++{ ++ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ void *mapping; ++ u32 size; ++ void *_ukk_private; ++ u32 cookie; ++} _ump_uk_unmap_mem_s; + -+int kbase_platform_register(void) ++typedef struct _ump_uk_msync_s +{ -+ struct kbase_platform_config *config; -+#ifndef CONFIG_OF -+ struct resource resources[PLATFORM_CONFIG_RESOURCE_COUNT]; -+#endif -+ int err; ++ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ void *mapping; /**< [in] mapping addr */ ++ void *address; /**< [in] flush start addr */ ++ u32 size; /**< [in] size to flush */ ++ ump_uk_msync_op op; /**< [in] flush operation */ ++ u32 cookie; /**< [in] cookie stored with reference to the kernel mapping internals */ ++ u32 secure_id; /**< [in] secure_id that identifies the ump buffer */ ++ u32 is_cached; /**< [out] caching of CPU mappings */ ++} _ump_uk_msync_s; + -+ config = kbase_get_platform_config(); /* declared in midgard/mali_kbase_config.h but defined in platform folder */ -+ if (config == NULL) { -+ pr_err("%s: couldn't get platform config\n", __func__); -+ return -ENODEV; -+ } ++typedef struct _ump_uk_cache_operations_control_s ++{ ++ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ ump_uk_cache_op_control op; /**< [in] cache operations start/stop */ ++} _ump_uk_cache_operations_control_s; + -+ mali_device = platform_device_alloc("mali", 0); -+ if (mali_device == NULL) -+ return -ENOMEM; + -+#ifndef CONFIG_OF -+ kbasep_config_parse_io_resources(config->io_resources, resources); -+ err = platform_device_add_resources(mali_device, resources, PLATFORM_CONFIG_RESOURCE_COUNT); -+ if (err) { -+ platform_device_put(mali_device); -+ mali_device = NULL; -+ return err; -+ } -+#endif /* CONFIG_OF */ ++typedef struct _ump_uk_switch_hw_usage_s ++{ ++ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 secure_id; /**< [in] secure_id that identifies the ump buffer */ ++ ump_uk_user new_user; /**< [in] cookie stored with reference to the kernel mapping internals */ + -+ err = platform_device_add(mali_device); -+ if (err) { -+ platform_device_unregister(mali_device); -+ mali_device = NULL; -+ return err; -+ } ++} _ump_uk_switch_hw_usage_s; + -+ return 0; -+} -+EXPORT_SYMBOL(kbase_platform_register); ++typedef struct _ump_uk_lock_s ++{ ++ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 secure_id; /**< [in] secure_id that identifies the ump buffer */ ++ ump_uk_lock_usage lock_usage; ++} _ump_uk_lock_s; + -+void kbase_platform_unregister(void) ++typedef struct _ump_uk_unlock_s +{ -+ if (mali_device) -+ platform_device_unregister(mali_device); ++ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ u32 secure_id; /**< [in] secure_id that identifies the ump buffer */ ++} _ump_uk_unlock_s; ++ ++typedef struct _ump_uk_dmabuf_s ++{ ++ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ ++ int fd; /**< [in] dmabuf_fd that identifies the dmabuf buffer */ ++ size_t size; /**< [in] size of the buffer */ ++ u32 secure_id; /**< [out] secure_id that identifies the ump buffer */ ++} _ump_uk_dmabuf_s; ++ ++#ifdef __cplusplus +} -+EXPORT_SYMBOL(kbase_platform_unregister); -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_pm.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_pm.c ++#endif ++ ++#endif /* __UMP_UK_TYPES_H__ */ +diff --git a/drivers/gpu/arm/mali400/ump/common/ump_ukk.h b/drivers/gpu/arm/mali400/ump/common/ump_ukk.h new file mode 100755 -index 000000000000..97d543464c28 +index 000000000..f2906768c --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_pm.c -@@ -0,0 +1,205 @@ ++++ b/drivers/gpu/arm/mali400/ump/common/ump_ukk.h +@@ -0,0 +1,60 @@ +/* -+ * -+ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + -+ -+ -+ -+ +/** -+ * @file mali_kbase_pm.c -+ * Base kernel power management APIs ++ * @file ump_ukk.h ++ * Defines the kernel-side interface of the user-kernel interface + */ + -+#include -+#include -+#include ++#ifndef __UMP_UKK_H__ ++#define __UMP_UKK_H__ + -+#include ++#include "mali_osk.h" ++#include "ump_uk_types.h" + -+int kbase_pm_powerup(struct kbase_device *kbdev, unsigned int flags) -+{ -+ return kbase_hwaccess_pm_powerup(kbdev, flags); -+} + -+void kbase_pm_halt(struct kbase_device *kbdev) -+{ -+ kbase_hwaccess_pm_halt(kbdev); -+} ++#ifdef __cplusplus ++extern "C" { ++#endif + -+void kbase_pm_context_active(struct kbase_device *kbdev) -+{ -+ (void)kbase_pm_context_active_handle_suspend(kbdev, KBASE_PM_SUSPEND_HANDLER_NOT_POSSIBLE); -+} + -+int kbase_pm_context_active_handle_suspend(struct kbase_device *kbdev, enum kbase_pm_suspend_handler suspend_handler) -+{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ int c; -+ int old_count; ++_mali_osk_errcode_t _ump_ukk_open(void **context); + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++_mali_osk_errcode_t _ump_ukk_close(void **context); + -+ /* Trace timeline information about how long it took to handle the decision -+ * to powerup. Sometimes the event might be missed due to reading the count -+ * outside of mutex, but this is necessary to get the trace timing -+ * correct. */ -+ old_count = kbdev->pm.active_count; -+ if (old_count == 0) -+ kbase_timeline_pm_send_event(kbdev, KBASE_TIMELINE_PM_EVENT_GPU_ACTIVE); ++_mali_osk_errcode_t _ump_ukk_allocate(_ump_uk_allocate_s *user_interaction); + -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); -+ if (kbase_pm_is_suspending(kbdev)) { -+ switch (suspend_handler) { -+ case KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE: -+ if (kbdev->pm.active_count != 0) -+ break; -+ /* FALLTHROUGH */ -+ case KBASE_PM_SUSPEND_HANDLER_DONT_INCREASE: -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ if (old_count == 0) -+ kbase_timeline_pm_handle_event(kbdev, KBASE_TIMELINE_PM_EVENT_GPU_ACTIVE); -+ return 1; ++_mali_osk_errcode_t _ump_ukk_release(_ump_uk_release_s *release_info); + -+ case KBASE_PM_SUSPEND_HANDLER_NOT_POSSIBLE: -+ /* FALLTHROUGH */ -+ default: -+ KBASE_DEBUG_ASSERT_MSG(false, "unreachable"); -+ break; -+ } -+ } -+ c = ++kbdev->pm.active_count; -+ KBASE_TIMELINE_CONTEXT_ACTIVE(kbdev, c); -+ KBASE_TRACE_ADD_REFCOUNT(kbdev, PM_CONTEXT_ACTIVE, NULL, NULL, 0u, c); ++_mali_osk_errcode_t _ump_ukk_size_get(_ump_uk_size_get_s *user_interaction); + -+ /* Trace the event being handled */ -+ if (old_count == 0) -+ kbase_timeline_pm_handle_event(kbdev, KBASE_TIMELINE_PM_EVENT_GPU_ACTIVE); ++_mali_osk_errcode_t _ump_ukk_map_mem(_ump_uk_map_mem_s *args); + -+ if (c == 1) -+ /* First context active: Power on the GPU and any cores requested by -+ * the policy */ -+ kbase_hwaccess_pm_gpu_active(kbdev); ++_mali_osk_errcode_t _ump_uku_get_api_version(_ump_uk_api_version_s *args); + -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); ++void _ump_ukk_unmap_mem(_ump_uk_unmap_mem_s *args); + -+ return 0; -+} ++void _ump_ukk_msync(_ump_uk_msync_s *args); + -+KBASE_EXPORT_TEST_API(kbase_pm_context_active); ++void _ump_ukk_cache_operations_control(_ump_uk_cache_operations_control_s *args); + -+void kbase_pm_context_idle(struct kbase_device *kbdev) -+{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ int c; -+ int old_count; ++void _ump_ukk_switch_hw_usage(_ump_uk_switch_hw_usage_s *args); + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++void _ump_ukk_lock(_ump_uk_lock_s *args); + -+ /* Trace timeline information about how long it took to handle the decision -+ * to powerdown. Sometimes the event might be missed due to reading the -+ * count outside of mutex, but this is necessary to get the trace timing -+ * correct. */ -+ old_count = kbdev->pm.active_count; -+ if (old_count == 0) -+ kbase_timeline_pm_send_event(kbdev, KBASE_TIMELINE_PM_EVENT_GPU_IDLE); ++void _ump_ukk_unlock(_ump_uk_unlock_s *args); + -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); ++u32 _ump_ukk_report_memory_usage(void); + -+ c = --kbdev->pm.active_count; -+ KBASE_TIMELINE_CONTEXT_ACTIVE(kbdev, c); -+ KBASE_TRACE_ADD_REFCOUNT(kbdev, PM_CONTEXT_IDLE, NULL, NULL, 0u, c); ++#ifdef __cplusplus ++} ++#endif + -+ KBASE_DEBUG_ASSERT(c >= 0); ++#endif /* __UMP_UKK_H__ */ +diff --git a/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h b/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h +new file mode 100755 +index 000000000..d0174055a +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h +@@ -0,0 +1,30 @@ ++/* ++ * Copyright (C) 2010, 2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ /* Trace the event being handled */ -+ if (old_count == 0) -+ kbase_timeline_pm_handle_event(kbdev, KBASE_TIMELINE_PM_EVENT_GPU_IDLE); ++/** ++ * @file ump_kernel_license.h ++ * Defines for the macro MODULE_LICENSE. ++ */ + -+ if (c == 0) { -+ /* Last context has gone idle */ -+ kbase_hwaccess_pm_gpu_idle(kbdev); ++#ifndef __UMP_KERNEL_LICENSE_H__ ++#define __UMP_KERNEL_LICENSE_H__ + -+ /* Wake up anyone waiting for this to become 0 (e.g. suspend). The -+ * waiters must synchronize with us by locking the pm.lock after -+ * waiting */ -+ wake_up(&kbdev->pm.zero_active_count_wait); -+ } ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); -+} ++#define UMP_KERNEL_LINUX_LICENSE "GPL" ++#define UMP_LICENSE_IS_GPL 1 + -+KBASE_EXPORT_TEST_API(kbase_pm_context_idle); ++#ifdef __cplusplus ++} ++#endif + -+void kbase_pm_suspend(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev); ++#endif /* __UMP_KERNEL_LICENSE_H__ */ +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h b/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h +new file mode 100755 +index 000000000..bfb4e8d64 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h +@@ -0,0 +1,54 @@ ++/* ++ * Copyright (C) 2010-2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ /* Suspend vinstr. -+ * This call will block until vinstr is suspended. */ -+ kbase_vinstr_suspend(kbdev->vinstr_ctx); ++#ifndef __UMP_IOCTL_H__ ++#define __UMP_IOCTL_H__ + -+ mutex_lock(&kbdev->pm.lock); -+ KBASE_DEBUG_ASSERT(!kbase_pm_is_suspending(kbdev)); -+ kbdev->pm.suspending = true; -+ mutex_unlock(&kbdev->pm.lock); ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ /* From now on, the active count will drop towards zero. Sometimes, it'll -+ * go up briefly before going down again. However, once it reaches zero it -+ * will stay there - guaranteeing that we've idled all pm references */ ++#include ++#include + -+ /* Suspend job scheduler and associated components, so that it releases all -+ * the PM active count references */ -+ kbasep_js_suspend(kbdev); ++#include + -+ /* Wait for the active count to reach zero. This is not the same as -+ * waiting for a power down, since not all policies power down when this -+ * reaches zero. */ -+ wait_event(kbdev->pm.zero_active_count_wait, kbdev->pm.active_count == 0); ++#ifndef __user ++#define __user ++#endif + -+ /* NOTE: We synchronize with anything that was just finishing a -+ * kbase_pm_context_idle() call by locking the pm.lock below */ + -+ kbase_hwaccess_pm_suspend(kbdev); -+} ++/** ++ * @file UMP_ioctl.h ++ * This file describes the interface needed to use the Linux device driver. ++ * The interface is used by the userpace UMP driver. ++ */ + -+void kbase_pm_resume(struct kbase_device *kbdev) -+{ -+ /* MUST happen before any pm_context_active calls occur */ -+ kbase_hwaccess_pm_resume(kbdev); ++#define UMP_IOCTL_NR 0x90 + -+ /* Initial active call, to power on the GPU/cores if needed */ -+ kbase_pm_context_active(kbdev); + -+ /* Resume any blocked atoms (which may cause contexts to be scheduled in -+ * and dependent atoms to run) */ -+ kbase_resume_suspended_soft_jobs(kbdev); ++#define UMP_IOC_QUERY_API_VERSION _IOR(UMP_IOCTL_NR, _UMP_IOC_QUERY_API_VERSION, _ump_uk_api_version_s) ++#define UMP_IOC_ALLOCATE _IOWR(UMP_IOCTL_NR, _UMP_IOC_ALLOCATE, _ump_uk_allocate_s) ++#define UMP_IOC_RELEASE _IOR(UMP_IOCTL_NR, _UMP_IOC_RELEASE, _ump_uk_release_s) ++#define UMP_IOC_SIZE_GET _IOWR(UMP_IOCTL_NR, _UMP_IOC_SIZE_GET, _ump_uk_size_get_s) ++#define UMP_IOC_MSYNC _IOW(UMP_IOCTL_NR, _UMP_IOC_MSYNC, _ump_uk_msync_s) + -+ /* Resume the Job Scheduler and associated components, and start running -+ * atoms */ -+ kbasep_js_resume(kbdev); ++#define UMP_IOC_CACHE_OPERATIONS_CONTROL _IOW(UMP_IOCTL_NR, _UMP_IOC_CACHE_OPERATIONS_CONTROL, _ump_uk_cache_operations_control_s) ++#define UMP_IOC_SWITCH_HW_USAGE _IOW(UMP_IOCTL_NR, _UMP_IOC_SWITCH_HW_USAGE, _ump_uk_switch_hw_usage_s) ++#define UMP_IOC_LOCK _IOW(UMP_IOCTL_NR, _UMP_IOC_LOCK, _ump_uk_lock_s) ++#define UMP_IOC_UNLOCK _IOW(UMP_IOCTL_NR, _UMP_IOC_UNLOCK, _ump_uk_unlock_s) + -+ /* Matching idle call, to power off the GPU/cores if we didn't actually -+ * need it and the policy doesn't want it on */ -+ kbase_pm_context_idle(kbdev); ++#define UMP_IOC_DMABUF_IMPORT _IOW(UMP_IOCTL_NR, _UMP_IOC_DMABUF_IMPORT, _ump_uk_dmabuf_s) + -+ /* Resume vinstr operation */ -+ kbase_vinstr_resume(kbdev->vinstr_ctx); ++#ifdef __cplusplus +} ++#endif + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_pm.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_pm.h ++#endif /* __UMP_IOCTL_H__ */ +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c new file mode 100755 -index 000000000000..37fa2479df74 +index 000000000..71b30830c --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_pm.h -@@ -0,0 +1,171 @@ ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c +@@ -0,0 +1,449 @@ +/* -+ * -+ * (C) COPYRIGHT 2010-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include /* kernel module definitions */ ++#include /* file system operations */ ++#include /* character device definitions */ ++#include /* request_mem_region */ ++#include /* memory management functions and types */ ++#include /* user space access */ ++#include ++#include ++#include + ++#include "arch/config.h" /* Configuration for current platform. The symlinc for arch is set by Makefile */ ++#include "ump_ioctl.h" ++#include "ump_kernel_common.h" ++#include "ump_kernel_interface.h" ++#include "ump_kernel_interface_ref_drv.h" ++#include "ump_kernel_descriptor_mapping.h" ++#include "ump_kernel_memory_backend.h" ++#include "ump_kernel_memory_backend_os.h" ++#include "ump_kernel_memory_backend_dedicated.h" ++#include "ump_kernel_license.h" + ++#include "ump_osk.h" ++#include "ump_ukk.h" ++#include "ump_uk_types.h" ++#include "ump_ukk_wrappers.h" ++#include "ump_ukk_ref_wrappers.h" + + -+/** -+ * @file mali_kbase_pm.h -+ * Power management API definitions -+ */ -+ -+#ifndef _KBASE_PM_H_ -+#define _KBASE_PM_H_ ++/* Module parameter to control log level */ ++int ump_debug_level = 2; ++module_param(ump_debug_level, int, S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP | S_IROTH); /* rw-rw-r-- */ ++MODULE_PARM_DESC(ump_debug_level, "Higher number, more dmesg output"); + -+#include "mali_kbase_hwaccess_pm.h" ++/* By default the module uses any available major, but it's possible to set it at load time to a specific number */ ++int ump_major = 0; ++module_param(ump_major, int, S_IRUGO); /* r--r--r-- */ ++MODULE_PARM_DESC(ump_major, "Device major number"); + -+#define PM_ENABLE_IRQS 0x01 -+#define PM_HW_ISSUES_DETECT 0x02 ++/* Name of the UMP device driver */ ++static char ump_dev_name[] = "ump"; /* should be const, but the functions we call requires non-cost */ + + -+/** Initialize the power management framework. -+ * -+ * Must be called before any other power management function -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) -+ * -+ * @return 0 if the power management framework was successfully initialized. -+ */ -+int kbase_pm_init(struct kbase_device *kbdev); ++#if UMP_LICENSE_IS_GPL ++static struct dentry *ump_debugfs_dir = NULL; ++#endif + -+/** Power up GPU after all modules have been initialized and interrupt handlers installed. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) -+ * -+ * @param flags Flags to pass on to kbase_pm_init_hw -+ * -+ * @return 0 if powerup was successful. ++/* ++ * The data which we attached to each virtual memory mapping request we get. ++ * Each memory mapping has a reference to the UMP memory it maps. ++ * We release this reference when the last memory mapping is unmapped. + */ -+int kbase_pm_powerup(struct kbase_device *kbdev, unsigned int flags); ++typedef struct ump_vma_usage_tracker { ++ int references; ++ ump_dd_handle handle; ++} ump_vma_usage_tracker; + -+/** -+ * Halt the power management framework. -+ * Should ensure that no new interrupts are generated, -+ * but allow any currently running interrupt handlers to complete successfully. -+ * The GPU is forced off by the time this function returns, regardless of -+ * whether or not the active power policy asks for the GPU to be powered off. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_halt(struct kbase_device *kbdev); ++struct ump_device { ++ struct cdev cdev; ++#if UMP_LICENSE_IS_GPL ++ struct class *ump_class; ++#endif ++}; + -+/** Terminate the power management framework. -+ * -+ * No power management functions may be called after this -+ * (except @ref kbase_pm_init) -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_term(struct kbase_device *kbdev); ++/* The global variable containing the global device data */ ++static struct ump_device ump_device; ++struct device *ump_global_mdev = NULL; + -+/** Increment the count of active contexts. -+ * -+ * This function should be called when a context is about to submit a job. It informs the active power policy that the -+ * GPU is going to be in use shortly and the policy is expected to start turning on the GPU. -+ * -+ * This function will block until the GPU is available. -+ * -+ * This function ASSERTS if a suspend is occuring/has occurred whilst this is -+ * in use. Use kbase_pm_contect_active_unless_suspending() instead. -+ * -+ * @note a Suspend is only visible to Kernel threads; user-space threads in a -+ * syscall cannot witness a suspend, because they are frozen before the suspend -+ * begins. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_context_active(struct kbase_device *kbdev); ++/* Forward declare static functions */ ++static int ump_file_open(struct inode *inode, struct file *filp); ++static int ump_file_release(struct inode *inode, struct file *filp); ++#ifdef HAVE_UNLOCKED_IOCTL ++static long ump_file_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); ++#else ++static int ump_file_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); ++#endif ++static int ump_file_mmap(struct file *filp, struct vm_area_struct *vma); + + -+/** Handler codes for doing kbase_pm_context_active_handle_suspend() */ -+enum kbase_pm_suspend_handler { -+ /** A suspend is not expected/not possible - this is the same as -+ * kbase_pm_context_active() */ -+ KBASE_PM_SUSPEND_HANDLER_NOT_POSSIBLE, -+ /** If we're suspending, fail and don't increase the active count */ -+ KBASE_PM_SUSPEND_HANDLER_DONT_INCREASE, -+ /** If we're suspending, succeed and allow the active count to increase iff -+ * it didn't go from 0->1 (i.e., we didn't re-activate the GPU). -+ * -+ * This should only be used when there is a bounded time on the activation -+ * (e.g. guarantee it's going to be idled very soon after) */ -+ KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE ++/* This variable defines the file operations this UMP device driver offer */ ++static struct file_operations ump_fops = { ++ .owner = THIS_MODULE, ++ .open = ump_file_open, ++ .release = ump_file_release, ++#ifdef HAVE_UNLOCKED_IOCTL ++ .unlocked_ioctl = ump_file_ioctl, ++#else ++ .ioctl = ump_file_ioctl, ++#endif ++ .mmap = ump_file_mmap +}; + -+/** Suspend 'safe' variant of kbase_pm_context_active() -+ * -+ * If a suspend is in progress, this allows for various different ways of -+ * handling the suspend. Refer to @ref enum kbase_pm_suspend_handler for details. -+ * -+ * We returns a status code indicating whether we're allowed to keep the GPU -+ * active during the suspend, depending on the handler code. If the status code -+ * indicates a failure, the caller must abort whatever operation it was -+ * attempting, and potentially queue it up for after the OS has resumed. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) -+ * @param suspend_handler The handler code for how to handle a suspend that might occur -+ * @return zero Indicates success -+ * @return non-zero Indicates failure due to the system being suspending/suspended. -+ */ -+int kbase_pm_context_active_handle_suspend(struct kbase_device *kbdev, enum kbase_pm_suspend_handler suspend_handler); + -+/** Decrement the reference count of active contexts. -+ * -+ * This function should be called when a context becomes idle. After this call the GPU may be turned off by the power -+ * policy so the calling code should ensure that it does not access the GPU's registers. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) ++/* This function is called by Linux to initialize this module. ++ * All we do is initialize the UMP device driver. + */ -+void kbase_pm_context_idle(struct kbase_device *kbdev); ++static int ump_initialize_module(void) ++{ ++ _mali_osk_errcode_t err; + -+/** -+ * Suspend the GPU and prevent any further register accesses to it from Kernel -+ * threads. -+ * -+ * This is called in response to an OS suspend event, and calls into the various -+ * kbase components to complete the suspend. -+ * -+ * @note the mechanisms used here rely on all user-space threads being frozen -+ * by the OS before we suspend. Otherwise, an IOCTL could occur that powers up -+ * the GPU e.g. via atom submission. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_suspend(struct kbase_device *kbdev); ++ DBG_MSG(2, ("Inserting UMP device driver. Compiled: %s, time: %s\n", __DATE__, __TIME__)); ++ ++ err = ump_kernel_constructor(); ++ if (_MALI_OSK_ERR_OK != err) { ++ MSG_ERR(("UMP device driver init failed\n")); ++ return ump_map_errcode(err); ++ } ++ ++ MSG(("UMP device driver %s loaded\n", SVN_REV_STRING)); ++ return 0; ++} + -+/** -+ * Resume the GPU, allow register accesses to it, and resume running atoms on -+ * the GPU. -+ * -+ * This is called in response to an OS resume event, and calls into the various -+ * kbase components to complete the resume. -+ * -+ * @param kbdev The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_resume(struct kbase_device *kbdev); + -+/** -+ * kbase_pm_vsync_callback - vsync callback -+ * -+ * @buffer_updated: 1 if a new frame was displayed, 0 otherwise -+ * @data: Pointer to the kbase device as returned by kbase_find_device() -+ * -+ * Callback function used to notify the power management code that a vsync has -+ * occurred on the display. -+ */ -+void kbase_pm_vsync_callback(int buffer_updated, void *data); + -+#endif /* _KBASE_PM_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_profiling_gator_api.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_profiling_gator_api.h -new file mode 100755 -index 000000000000..7fb674eded37 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_profiling_gator_api.h -@@ -0,0 +1,40 @@ +/* -+ * -+ * (C) COPYRIGHT 2010, 2013 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * This function is called by Linux to unload/terminate/exit/cleanup this module. ++ * All we do is terminate the UMP device driver. + */ ++static void ump_cleanup_module(void) ++{ ++ DBG_MSG(2, ("Unloading UMP device driver\n")); ++ ump_kernel_destructor(); ++ DBG_MSG(2, ("Module unloaded\n")); ++} + + + -+/** -+ * @file mali_kbase_profiling_gator_api.h -+ * Model interface -+ */ -+ -+#ifndef _KBASE_PROFILING_GATOR_API_H_ -+#define _KBASE_PROFILING_GATOR_API_H_ ++static ssize_t ump_memory_used_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ char buf[64]; ++ size_t r; ++ u32 mem = _ump_ukk_report_memory_usage(); + -+/* -+ * List of possible actions to be controlled by Streamline. -+ * The following numbers are used by gator to control -+ * the frame buffer dumping and s/w counter reporting. -+ */ -+#define FBDUMP_CONTROL_ENABLE (1) -+#define FBDUMP_CONTROL_RATE (2) -+#define SW_COUNTER_ENABLE (3) -+#define FBDUMP_CONTROL_RESIZE_FACTOR (4) -+#define FBDUMP_CONTROL_MAX (5) -+#define FBDUMP_CONTROL_MIN FBDUMP_CONTROL_ENABLE ++ r = snprintf(buf, 64, "%u\n", mem); ++ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); ++} + -+void _mali_profiling_control(u32 action, u32 value); ++static const struct file_operations ump_memory_usage_fops = { ++ .owner = THIS_MODULE, ++ .read = ump_memory_used_read, ++}; + -+#endif /* _KBASE_PROFILING_GATOR_API */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_regs_history_debugfs.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_regs_history_debugfs.c -new file mode 100755 -index 000000000000..9e73f9f4999e ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_regs_history_debugfs.c -@@ -0,0 +1,130 @@ +/* -+ * -+ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Initialize the UMP device driver. + */ ++int ump_kernel_device_initialize(void) ++{ ++ int err; ++ dev_t dev = 0; ++#if UMP_LICENSE_IS_GPL ++ ump_debugfs_dir = debugfs_create_dir(ump_dev_name, NULL); ++ if (ERR_PTR(-ENODEV) == ump_debugfs_dir) { ++ ump_debugfs_dir = NULL; ++ } else { ++ debugfs_create_file("memory_usage", 0400, ump_debugfs_dir, NULL, &ump_memory_usage_fops); ++ } ++#endif + ++ if (0 == ump_major) { ++ /* auto select a major */ ++ err = alloc_chrdev_region(&dev, 0, 1, ump_dev_name); ++ ump_major = MAJOR(dev); ++ } else { ++ /* use load time defined major number */ ++ dev = MKDEV(ump_major, 0); ++ err = register_chrdev_region(dev, 1, ump_dev_name); ++ } + ++ if (0 == err) { ++ memset(&ump_device, 0, sizeof(ump_device)); + -+#include "mali_kbase.h" ++ /* initialize our char dev data */ ++ cdev_init(&ump_device.cdev, &ump_fops); ++ ump_device.cdev.owner = THIS_MODULE; ++ ump_device.cdev.ops = &ump_fops; + -+#include "mali_kbase_regs_history_debugfs.h" ++ /* register char dev with the kernel */ ++ err = cdev_add(&ump_device.cdev, dev, 1/*count*/); ++ if (0 == err) { + -+#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_BIFROST_NO_MALI) ++#if UMP_LICENSE_IS_GPL ++ ump_device.ump_class = class_create(THIS_MODULE, ump_dev_name); ++ if (IS_ERR(ump_device.ump_class)) { ++ err = PTR_ERR(ump_device.ump_class); ++ } else { ++ ump_global_mdev = device_create(ump_device.ump_class, NULL, dev, NULL, ump_dev_name); ++ if (!IS_ERR(ump_global_mdev)) { ++ return 0; ++ } + -+#include ++ err = PTR_ERR(ump_global_mdev); ++ } ++ cdev_del(&ump_device.cdev); ++#else ++ return 0; ++#endif ++ } + ++ unregister_chrdev_region(dev, 1); ++ } + -+static int regs_history_size_get(void *data, u64 *val) -+{ -+ struct kbase_io_history *const h = data; ++ return err; ++} + -+ *val = h->size; + -+ return 0; -+} + -+static int regs_history_size_set(void *data, u64 val) ++/* ++ * Terminate the UMP device driver ++ */ ++void ump_kernel_device_terminate(void) +{ -+ struct kbase_io_history *const h = data; ++ dev_t dev = MKDEV(ump_major, 0); + -+ return kbase_io_history_resize(h, (u16)val); -+} ++#if UMP_LICENSE_IS_GPL ++ device_destroy(ump_device.ump_class, dev); ++ class_destroy(ump_device.ump_class); ++#endif + ++ /* unregister char device */ ++ cdev_del(&ump_device.cdev); + -+DEFINE_SIMPLE_ATTRIBUTE(regs_history_size_fops, -+ regs_history_size_get, -+ regs_history_size_set, -+ "%llu\n"); ++ /* free major */ ++ unregister_chrdev_region(dev, 1); + ++#if UMP_LICENSE_IS_GPL ++ if (ump_debugfs_dir) ++ debugfs_remove_recursive(ump_debugfs_dir); ++#endif ++} + -+/** -+ * regs_history_show - show callback for the register access history file. -+ * -+ * @sfile: The debugfs entry -+ * @data: Data associated with the entry -+ * -+ * This function is called to dump all recent accesses to the GPU registers. -+ * -+ * @return 0 if successfully prints data in debugfs entry file, failure -+ * otherwise ++/* ++ * Open a new session. User space has called open() on us. + */ -+static int regs_history_show(struct seq_file *sfile, void *data) ++static int ump_file_open(struct inode *inode, struct file *filp) +{ -+ struct kbase_io_history *const h = sfile->private; -+ u16 i; -+ size_t iters; -+ unsigned long flags; ++ struct ump_session_data *session_data; ++ _mali_osk_errcode_t err; + -+ if (!h->enabled) { -+ seq_puts(sfile, "The register access history is disabled\n"); -+ goto out; ++ /* input validation */ ++ if (0 != MINOR(inode->i_rdev)) { ++ MSG_ERR(("Minor not zero in ump_file_open()\n")); ++ return -ENODEV; + } + -+ spin_lock_irqsave(&h->lock, flags); -+ -+ iters = (h->size > h->count) ? h->count : h->size; -+ seq_printf(sfile, "Last %zu register accesses of %zu total:\n", iters, -+ h->count); -+ for (i = 0; i < iters; ++i) { -+ struct kbase_io_access *io = -+ &h->buf[(h->count - iters + i) % h->size]; -+ char const access = (io->addr & 1) ? 'w' : 'r'; -+ -+ seq_printf(sfile, "%6i: %c: reg 0x%p val %08x\n", i, access, -+ (void *)(io->addr & ~0x1), io->value); ++ /* Call the OS-Independent UMP Open function */ ++ err = _ump_ukk_open((void **) &session_data); ++ if (_MALI_OSK_ERR_OK != err) { ++ MSG_ERR(("Ump failed to open a new session\n")); ++ return ump_map_errcode(err); + } + -+ spin_unlock_irqrestore(&h->lock, flags); ++ filp->private_data = (void *)session_data; ++ filp->f_pos = 0; + -+out: -+ return 0; ++ return 0; /* success */ +} + + -+/** -+ * regs_history_open - open operation for regs_history debugfs file -+ * -+ * @in: &struct inode pointer -+ * @file: &struct file pointer -+ * -+ * @return file descriptor ++ ++/* ++ * Close a session. User space has called close() or crashed/terminated. + */ -+static int regs_history_open(struct inode *in, struct file *file) ++static int ump_file_release(struct inode *inode, struct file *filp) +{ -+ return single_open(file, ®s_history_show, in->i_private); -+} -+ -+ -+static const struct file_operations regs_history_fops = { -+ .open = ®s_history_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; ++ _mali_osk_errcode_t err; + ++ err = _ump_ukk_close((void **) &filp->private_data); ++ if (_MALI_OSK_ERR_OK != err) { ++ return ump_map_errcode(err); ++ } + -+void kbasep_regs_history_debugfs_init(struct kbase_device *kbdev) -+{ -+ debugfs_create_bool("regs_history_enabled", S_IRUGO | S_IWUSR, -+ kbdev->mali_debugfs_directory, -+ &kbdev->io_history.enabled); -+ debugfs_create_file("regs_history_size", S_IRUGO | S_IWUSR, -+ kbdev->mali_debugfs_directory, -+ &kbdev->io_history, ®s_history_size_fops); -+ debugfs_create_file("regs_history", S_IRUGO, -+ kbdev->mali_debugfs_directory, &kbdev->io_history, -+ ®s_history_fops); ++ return 0; /* success */ +} + + -+#endif /* CONFIG_DEBUG_FS */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_regs_history_debugfs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_regs_history_debugfs.h -new file mode 100755 -index 000000000000..fbb36b3f22e4 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_regs_history_debugfs.h -@@ -0,0 +1,50 @@ ++ +/* -+ * -+ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Handle IOCTL requests. + */ ++#ifdef HAVE_UNLOCKED_IOCTL ++static long ump_file_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ++#else ++static int ump_file_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) ++#endif ++{ ++ int err = -ENOTTY; ++ void __user *argument; ++ struct ump_session_data *session_data; + ++#ifndef HAVE_UNLOCKED_IOCTL ++ (void)inode; /* inode not used */ ++#endif + ++ session_data = (struct ump_session_data *)filp->private_data; ++ if (NULL == session_data) { ++ MSG_ERR(("No session data attached to file object\n")); ++ return -ENOTTY; ++ } + -+/** -+ * Header file for register access history support via debugfs -+ * -+ * This interface is made available via /sys/kernel/debug/mali#/regs_history*. -+ * -+ * Usage: -+ * - regs_history_enabled: whether recording of register accesses is enabled. -+ * Write 'y' to enable, 'n' to disable. -+ * - regs_history_size: size of the register history buffer, must be > 0 -+ * - regs_history: return the information about last accesses to the registers. -+ */ ++ /* interpret the argument as a user pointer to something */ ++ argument = (void __user *)arg; + -+#ifndef _KBASE_REGS_HISTORY_DEBUGFS_H -+#define _KBASE_REGS_HISTORY_DEBUGFS_H ++ switch (cmd) { ++ case UMP_IOC_QUERY_API_VERSION: ++ err = ump_get_api_version_wrapper((u32 __user *)argument, session_data); ++ break; + -+struct kbase_device; ++ case UMP_IOC_ALLOCATE : ++ err = ump_allocate_wrapper((u32 __user *)argument, session_data); ++ break; + -+#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_BIFROST_NO_MALI) ++ case UMP_IOC_RELEASE: ++ err = ump_release_wrapper((u32 __user *)argument, session_data); ++ break; + -+/** -+ * kbasep_regs_history_debugfs_init - add debugfs entries for register history -+ * -+ * @kbdev: Pointer to kbase_device containing the register history -+ */ -+void kbasep_regs_history_debugfs_init(struct kbase_device *kbdev); ++ case UMP_IOC_SIZE_GET: ++ err = ump_size_get_wrapper((u32 __user *)argument, session_data); ++ break; + -+#else /* CONFIG_DEBUG_FS */ ++ case UMP_IOC_MSYNC: ++ err = ump_msync_wrapper((u32 __user *)argument, session_data); ++ break; + -+#define kbasep_regs_history_debugfs_init CSTD_NOP ++ case UMP_IOC_CACHE_OPERATIONS_CONTROL: ++ err = ump_cache_operations_control_wrapper((u32 __user *)argument, session_data); ++ break; + -+#endif /* CONFIG_DEBUG_FS */ ++ case UMP_IOC_SWITCH_HW_USAGE: ++ err = ump_switch_hw_usage_wrapper((u32 __user *)argument, session_data); ++ break; + -+#endif /*_KBASE_REGS_HISTORY_DEBUGFS_H*/ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_replay.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_replay.c -new file mode 100755 -index 000000000000..9f4dc372770d ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_replay.c -@@ -0,0 +1,1166 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ case UMP_IOC_LOCK: ++ err = ump_lock_wrapper((u32 __user *)argument, session_data); ++ break; + ++ case UMP_IOC_UNLOCK: ++ err = ump_unlock_wrapper((u32 __user *)argument, session_data); ++ break; + ++ case UMP_IOC_DMABUF_IMPORT: ++#ifdef CONFIG_DMA_SHARED_BUFFER ++ err = ump_dmabuf_import_wrapper((u32 __user *)argument, session_data); ++#else ++ err = -EFAULT; ++ DBG_MSG(1, ("User space use dmabuf API, but kernel don't support DMA BUF\n")); ++#endif ++ break; + -+/** -+ * @file mali_kbase_replay.c -+ * Replay soft job handlers -+ */ ++ default: ++ DBG_MSG(1, ("No handler for IOCTL. cmd: 0x%08x, arg: 0x%08lx\n", cmd, arg)); ++ err = -EFAULT; ++ break; ++ } + -+#include -+#include -+#include -+#include -+#include ++ return err; ++} + -+#define JOB_NOT_STARTED 0 -+#define JOB_TYPE_NULL (1) -+#define JOB_TYPE_VERTEX (5) -+#define JOB_TYPE_TILER (7) -+#define JOB_TYPE_FUSED (8) -+#define JOB_TYPE_FRAGMENT (9) ++int ump_map_errcode(_mali_osk_errcode_t err) ++{ ++ switch (err) { ++ case _MALI_OSK_ERR_OK : ++ return 0; ++ case _MALI_OSK_ERR_FAULT: ++ return -EFAULT; ++ case _MALI_OSK_ERR_INVALID_FUNC: ++ return -ENOTTY; ++ case _MALI_OSK_ERR_INVALID_ARGS: ++ return -EINVAL; ++ case _MALI_OSK_ERR_NOMEM: ++ return -ENOMEM; ++ case _MALI_OSK_ERR_TIMEOUT: ++ return -ETIMEDOUT; ++ case _MALI_OSK_ERR_RESTARTSYSCALL: ++ return -ERESTARTSYS; ++ case _MALI_OSK_ERR_ITEM_NOT_FOUND: ++ return -ENOENT; ++ default: ++ return -EFAULT; ++ } ++} + -+#define JOB_HEADER_32_FBD_OFFSET (31*4) -+#define JOB_HEADER_64_FBD_OFFSET (44*4) ++/* ++ * Handle from OS to map specified virtual memory to specified UMP memory. ++ */ ++static int ump_file_mmap(struct file *filp, struct vm_area_struct *vma) ++{ ++ _ump_uk_map_mem_s args; ++ _mali_osk_errcode_t err; ++ struct ump_session_data *session_data; + -+#define FBD_POINTER_MASK (~0x3f) ++ /* Validate the session data */ ++ session_data = (struct ump_session_data *)filp->private_data; ++ if (NULL == session_data) { ++ MSG_ERR(("mmap() called without any session data available\n")); ++ return -EFAULT; ++ } + -+#define SFBD_TILER_OFFSET (48*4) ++ /* Re-pack the arguments that mmap() packed for us */ ++ args.ctx = session_data; ++ args.phys_addr = 0; ++ args.size = vma->vm_end - vma->vm_start; ++ args._ukk_private = vma; ++ args.secure_id = vma->vm_pgoff; + -+#define MFBD_TILER_OFFSET (14*4) ++ /* By setting this flag, during a process fork; the child process will not have the parent UMP mappings */ ++ vma->vm_flags |= VM_DONTCOPY; + -+#define FBD_HIERARCHY_WEIGHTS 8 -+#define FBD_HIERARCHY_MASK_MASK 0x1fff ++ DBG_MSG(4, ("UMP vma->flags: %x\n", vma->vm_flags)); + -+#define FBD_TYPE 1 ++ /* Call the common mmap handler */ ++ err = _ump_ukk_map_mem(&args); ++ if (_MALI_OSK_ERR_OK != err) { ++ MSG_ERR(("_ump_ukk_map_mem() failed in function ump_file_mmap()")); ++ return ump_map_errcode(err); ++ } + -+#define HIERARCHY_WEIGHTS 13 ++ return 0; /* success */ ++} + -+#define JOB_HEADER_ID_MAX 0xffff ++/* Export UMP kernel space API functions */ ++EXPORT_SYMBOL(ump_dd_secure_id_get); ++EXPORT_SYMBOL(ump_dd_handle_create_from_secure_id); ++EXPORT_SYMBOL(ump_dd_phys_block_count_get); ++EXPORT_SYMBOL(ump_dd_phys_block_get); ++EXPORT_SYMBOL(ump_dd_phys_blocks_get); ++EXPORT_SYMBOL(ump_dd_size_get); ++EXPORT_SYMBOL(ump_dd_reference_add); ++EXPORT_SYMBOL(ump_dd_reference_release); + -+#define JOB_SOURCE_ID(status) (((status) >> 16) & 0xFFFF) -+#define JOB_POLYGON_LIST (0x03) ++/* Export our own extended kernel space allocator */ ++EXPORT_SYMBOL(ump_dd_handle_create_from_phys_blocks); + -+struct fragment_job { -+ struct job_descriptor_header header; ++/* Setup init and exit functions for this module */ ++module_init(ump_initialize_module); ++module_exit(ump_cleanup_module); + -+ u32 x[2]; -+ union { -+ u64 _64; -+ u32 _32; -+ } fragment_fbd; -+}; ++/* And some module informatio */ ++MODULE_LICENSE(UMP_KERNEL_LINUX_LICENSE); ++MODULE_AUTHOR("ARM Ltd."); ++MODULE_VERSION(SVN_REV_STRING); +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h +new file mode 100755 +index 000000000..8d32ddbb5 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h +@@ -0,0 +1,18 @@ ++/* ++ * Copyright (C) 2010-2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+static void dump_job_head(struct kbase_context *kctx, char *head_str, -+ struct job_descriptor_header *job) -+{ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ dev_dbg(kctx->kbdev->dev, "%s\n", head_str); -+ dev_dbg(kctx->kbdev->dev, -+ "addr = %p\n" -+ "exception_status = %x (Source ID: 0x%x Access: 0x%x Exception: 0x%x)\n" -+ "first_incomplete_task = %x\n" -+ "fault_pointer = %llx\n" -+ "job_descriptor_size = %x\n" -+ "job_type = %x\n" -+ "job_barrier = %x\n" -+ "_reserved_01 = %x\n" -+ "_reserved_02 = %x\n" -+ "_reserved_03 = %x\n" -+ "_reserved_04/05 = %x,%x\n" -+ "job_index = %x\n" -+ "dependencies = %x,%x\n", -+ job, job->exception_status, -+ JOB_SOURCE_ID(job->exception_status), -+ (job->exception_status >> 8) & 0x3, -+ job->exception_status & 0xFF, -+ job->first_incomplete_task, -+ job->fault_pointer, job->job_descriptor_size, -+ job->job_type, job->job_barrier, job->_reserved_01, -+ job->_reserved_02, job->_reserved_03, -+ job->_reserved_04, job->_reserved_05, -+ job->job_index, -+ job->job_dependency_index_1, -+ job->job_dependency_index_2); ++#ifndef __UMP_KERNEL_LINUX_H__ ++#define __UMP_KERNEL_LINUX_H__ + -+ if (job->job_descriptor_size) -+ dev_dbg(kctx->kbdev->dev, "next = %llx\n", -+ job->next_job._64); -+ else -+ dev_dbg(kctx->kbdev->dev, "next = %x\n", -+ job->next_job._32); -+#endif -+} ++int ump_kernel_device_initialize(void); ++void ump_kernel_device_terminate(void); + -+static int kbasep_replay_reset_sfbd(struct kbase_context *kctx, -+ u64 fbd_address, u64 tiler_heap_free, -+ u16 hierarchy_mask, u32 default_weight) -+{ -+ struct { -+ u32 padding_1[1]; -+ u32 flags; -+ u64 padding_2[2]; -+ u64 heap_free_address; -+ u32 padding[8]; -+ u32 weights[FBD_HIERARCHY_WEIGHTS]; -+ } *fbd_tiler; -+ struct kbase_vmap_struct map; + -+ dev_dbg(kctx->kbdev->dev, "fbd_address: %llx\n", fbd_address); ++#endif /* __UMP_KERNEL_H__ */ +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c +new file mode 100755 +index 000000000..5a1257a25 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c +@@ -0,0 +1,271 @@ ++/* ++ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ fbd_tiler = kbase_vmap(kctx, fbd_address + SFBD_TILER_OFFSET, -+ sizeof(*fbd_tiler), &map); -+ if (!fbd_tiler) { -+ dev_err(kctx->kbdev->dev, "kbasep_replay_reset_fbd: failed to map fbd\n"); -+ return -EINVAL; -+ } ++/* needed to detect kernel version specific code */ ++#include + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ dev_dbg(kctx->kbdev->dev, -+ "FBD tiler:\n" -+ "flags = %x\n" -+ "heap_free_address = %llx\n", -+ fbd_tiler->flags, fbd_tiler->heap_free_address); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++#include ++#else /* pre 2.6.26 the file was in the arch specific location */ ++#include +#endif -+ if (hierarchy_mask) { -+ u32 weights[HIERARCHY_WEIGHTS]; -+ u16 old_hierarchy_mask = fbd_tiler->flags & -+ FBD_HIERARCHY_MASK_MASK; -+ int i, j = 0; + -+ for (i = 0; i < HIERARCHY_WEIGHTS; i++) { -+ if (old_hierarchy_mask & (1 << i)) { -+ KBASE_DEBUG_ASSERT(j < FBD_HIERARCHY_WEIGHTS); -+ weights[i] = fbd_tiler->weights[j++]; -+ } else { -+ weights[i] = default_weight; -+ } -+ } ++#include ++#include ++#include ++#include ++#include "ump_kernel_common.h" ++#include "ump_kernel_memory_backend.h" + + -+ dev_dbg(kctx->kbdev->dev, "Old hierarchy mask=%x New hierarchy mask=%x\n", -+ old_hierarchy_mask, hierarchy_mask); + -+ for (i = 0; i < HIERARCHY_WEIGHTS; i++) -+ dev_dbg(kctx->kbdev->dev, " Hierarchy weight %02d: %08x\n", -+ i, weights[i]); ++#define UMP_BLOCK_SIZE (256UL * 1024UL) /* 256kB, remember to keep the ()s */ + -+ j = 0; + -+ for (i = 0; i < HIERARCHY_WEIGHTS; i++) { -+ if (hierarchy_mask & (1 << i)) { -+ KBASE_DEBUG_ASSERT(j < FBD_HIERARCHY_WEIGHTS); + -+ dev_dbg(kctx->kbdev->dev, " Writing hierarchy level %02d (%08x) to %d\n", -+ i, weights[i], j); ++typedef struct block_info { ++ struct block_info *next; ++} block_info; + -+ fbd_tiler->weights[j++] = weights[i]; -+ } -+ } + -+ for (; j < FBD_HIERARCHY_WEIGHTS; j++) -+ fbd_tiler->weights[j] = 0; + -+ fbd_tiler->flags = hierarchy_mask | (1 << 16); -+ } ++typedef struct block_allocator { ++ struct semaphore mutex; ++ block_info *all_blocks; ++ block_info *first_free; ++ u32 base; ++ u32 num_blocks; ++ u32 num_free; ++} block_allocator; + -+ fbd_tiler->heap_free_address = tiler_heap_free; + -+ dev_dbg(kctx->kbdev->dev, "heap_free_address=%llx flags=%x\n", -+ fbd_tiler->heap_free_address, fbd_tiler->flags); ++static void block_allocator_shutdown(ump_memory_backend *backend); ++static int block_allocator_allocate(void *ctx, ump_dd_mem *mem); ++static void block_allocator_release(void *ctx, ump_dd_mem *handle); ++static inline u32 get_phys(block_allocator *allocator, block_info *block); ++static u32 block_allocator_stat(struct ump_memory_backend *backend); + -+ kbase_vunmap(kctx, &map); + -+ return 0; -+} + -+static int kbasep_replay_reset_mfbd(struct kbase_context *kctx, -+ u64 fbd_address, u64 tiler_heap_free, -+ u16 hierarchy_mask, u32 default_weight) ++/* ++ * Create dedicated memory backend ++ */ ++ump_memory_backend *ump_block_allocator_create(u32 base_address, u32 size) +{ -+ struct kbase_vmap_struct map; -+ struct { -+ u32 padding_0; -+ u32 flags; -+ u64 padding_1[2]; -+ u64 heap_free_address; -+ u64 padding_2; -+ u32 weights[FBD_HIERARCHY_WEIGHTS]; -+ } *fbd_tiler; ++ ump_memory_backend *backend; ++ block_allocator *allocator; ++ u32 usable_size; ++ u32 num_blocks; + -+ dev_dbg(kctx->kbdev->dev, "fbd_address: %llx\n", fbd_address); ++ usable_size = (size + UMP_BLOCK_SIZE - 1) & ~(UMP_BLOCK_SIZE - 1); ++ num_blocks = usable_size / UMP_BLOCK_SIZE; + -+ fbd_tiler = kbase_vmap(kctx, fbd_address + MFBD_TILER_OFFSET, -+ sizeof(*fbd_tiler), &map); -+ if (!fbd_tiler) { -+ dev_err(kctx->kbdev->dev, -+ "kbasep_replay_reset_fbd: failed to map fbd\n"); -+ return -EINVAL; ++ if (0 == usable_size) { ++ DBG_MSG(1, ("Memory block of size %u is unusable\n", size)); ++ return NULL; + } + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ dev_dbg(kctx->kbdev->dev, "FBD tiler:\n" -+ "flags = %x\n" -+ "heap_free_address = %llx\n", -+ fbd_tiler->flags, -+ fbd_tiler->heap_free_address); -+#endif -+ if (hierarchy_mask) { -+ u32 weights[HIERARCHY_WEIGHTS]; -+ u16 old_hierarchy_mask = (fbd_tiler->flags) & -+ FBD_HIERARCHY_MASK_MASK; -+ int i, j = 0; -+ -+ for (i = 0; i < HIERARCHY_WEIGHTS; i++) { -+ if (old_hierarchy_mask & (1 << i)) { -+ KBASE_DEBUG_ASSERT(j < FBD_HIERARCHY_WEIGHTS); -+ weights[i] = fbd_tiler->weights[j++]; -+ } else { -+ weights[i] = default_weight; -+ } -+ } -+ -+ -+ dev_dbg(kctx->kbdev->dev, "Old hierarchy mask=%x New hierarchy mask=%x\n", -+ old_hierarchy_mask, hierarchy_mask); ++ DBG_MSG(5, ("Creating dedicated UMP memory backend. Base address: 0x%08x, size: 0x%08x\n", base_address, size)); ++ DBG_MSG(6, ("%u usable bytes which becomes %u blocks\n", usable_size, num_blocks)); + -+ for (i = 0; i < HIERARCHY_WEIGHTS; i++) -+ dev_dbg(kctx->kbdev->dev, " Hierarchy weight %02d: %08x\n", -+ i, weights[i]); ++ backend = kzalloc(sizeof(ump_memory_backend), GFP_KERNEL); ++ if (NULL != backend) { ++ allocator = kmalloc(sizeof(block_allocator), GFP_KERNEL); ++ if (NULL != allocator) { ++ allocator->all_blocks = kmalloc(sizeof(block_info) * num_blocks, GFP_KERNEL); ++ if (NULL != allocator->all_blocks) { ++ int i; + -+ j = 0; ++ allocator->first_free = NULL; ++ allocator->num_blocks = num_blocks; ++ allocator->num_free = num_blocks; ++ allocator->base = base_address; ++ sema_init(&allocator->mutex, 1); + -+ for (i = 0; i < HIERARCHY_WEIGHTS; i++) { -+ if (hierarchy_mask & (1 << i)) { -+ KBASE_DEBUG_ASSERT(j < FBD_HIERARCHY_WEIGHTS); ++ for (i = 0; i < num_blocks; i++) { ++ allocator->all_blocks[i].next = allocator->first_free; ++ allocator->first_free = &allocator->all_blocks[i]; ++ } + -+ dev_dbg(kctx->kbdev->dev, -+ " Writing hierarchy level %02d (%08x) to %d\n", -+ i, weights[i], j); ++ backend->ctx = allocator; ++ backend->allocate = block_allocator_allocate; ++ backend->release = block_allocator_release; ++ backend->shutdown = block_allocator_shutdown; ++ backend->stat = block_allocator_stat; ++ backend->pre_allocate_physical_check = NULL; ++ backend->adjust_to_mali_phys = NULL; + -+ fbd_tiler->weights[j++] = weights[i]; ++ return backend; + } ++ kfree(allocator); + } -+ -+ for (; j < FBD_HIERARCHY_WEIGHTS; j++) -+ fbd_tiler->weights[j] = 0; -+ -+ fbd_tiler->flags = hierarchy_mask | (1 << 16); ++ kfree(backend); + } + -+ fbd_tiler->heap_free_address = tiler_heap_free; ++ return NULL; ++} + -+ kbase_vunmap(kctx, &map); + -+ return 0; -+} + -+/** -+ * @brief Reset the status of an FBD pointed to by a tiler job -+ * -+ * This performs two functions : -+ * - Set the hierarchy mask -+ * - Reset the tiler free heap address -+ * -+ * @param[in] kctx Context pointer -+ * @param[in] job_header Address of job header to reset. -+ * @param[in] tiler_heap_free The value to reset Tiler Heap Free to -+ * @param[in] hierarchy_mask The hierarchy mask to use -+ * @param[in] default_weight Default hierarchy weight to write when no other -+ * weight is given in the FBD -+ * @param[in] job_64 true if this job is using 64-bit -+ * descriptors -+ * -+ * @return 0 on success, error code on failure ++/* ++ * Destroy specified dedicated memory backend + */ -+static int kbasep_replay_reset_tiler_job(struct kbase_context *kctx, -+ u64 job_header, u64 tiler_heap_free, -+ u16 hierarchy_mask, u32 default_weight, bool job_64) ++static void block_allocator_shutdown(ump_memory_backend *backend) +{ -+ struct kbase_vmap_struct map; -+ u64 fbd_address; ++ block_allocator *allocator; + -+ if (job_64) { -+ u64 *job_ext; ++ BUG_ON(!backend); ++ BUG_ON(!backend->ctx); + -+ job_ext = kbase_vmap(kctx, -+ job_header + JOB_HEADER_64_FBD_OFFSET, -+ sizeof(*job_ext), &map); ++ allocator = (block_allocator *)backend->ctx; + -+ if (!job_ext) { -+ dev_err(kctx->kbdev->dev, "kbasep_replay_reset_tiler_job: failed to map jc\n"); -+ return -EINVAL; -+ } ++ DBG_MSG_IF(1, allocator->num_free != allocator->num_blocks, ("%u blocks still in use during shutdown\n", allocator->num_blocks - allocator->num_free)); + -+ fbd_address = *job_ext; ++ kfree(allocator->all_blocks); ++ kfree(allocator); ++ kfree(backend); ++} + -+ kbase_vunmap(kctx, &map); -+ } else { -+ u32 *job_ext; + -+ job_ext = kbase_vmap(kctx, -+ job_header + JOB_HEADER_32_FBD_OFFSET, -+ sizeof(*job_ext), &map); + -+ if (!job_ext) { -+ dev_err(kctx->kbdev->dev, "kbasep_replay_reset_tiler_job: failed to map jc\n"); -+ return -EINVAL; -+ } ++static int block_allocator_allocate(void *ctx, ump_dd_mem *mem) ++{ ++ block_allocator *allocator; ++ u32 left; ++ block_info *last_allocated = NULL; ++ int i = 0; + -+ fbd_address = *job_ext; ++ BUG_ON(!ctx); ++ BUG_ON(!mem); + -+ kbase_vunmap(kctx, &map); ++ allocator = (block_allocator *)ctx; ++ left = mem->size_bytes; ++ ++ BUG_ON(!left); ++ BUG_ON(!&allocator->mutex); ++ ++ mem->nr_blocks = ((left + UMP_BLOCK_SIZE - 1) & ~(UMP_BLOCK_SIZE - 1)) / UMP_BLOCK_SIZE; ++ mem->block_array = (ump_dd_physical_block *)vmalloc(sizeof(ump_dd_physical_block) * mem->nr_blocks); ++ if (NULL == mem->block_array) { ++ MSG_ERR(("Failed to allocate block array\n")); ++ return 0; + } + -+ if (fbd_address & FBD_TYPE) { -+ return kbasep_replay_reset_mfbd(kctx, -+ fbd_address & FBD_POINTER_MASK, -+ tiler_heap_free, -+ hierarchy_mask, -+ default_weight); -+ } else { -+ return kbasep_replay_reset_sfbd(kctx, -+ fbd_address & FBD_POINTER_MASK, -+ tiler_heap_free, -+ hierarchy_mask, -+ default_weight); ++ if (down_interruptible(&allocator->mutex)) { ++ MSG_ERR(("Could not get mutex to do block_allocate\n")); ++ return 0; + } -+} + -+/** -+ * @brief Reset the status of a job -+ * -+ * This performs the following functions : -+ * -+ * - Reset the Job Status field of each job to NOT_STARTED. -+ * - Set the Job Type field of any Vertex Jobs to Null Job. -+ * - For any jobs using an FBD, set the Tiler Heap Free field to the value of -+ * the tiler_heap_free parameter, and set the hierarchy level mask to the -+ * hier_mask parameter. -+ * - Offset HW dependencies by the hw_job_id_offset parameter -+ * - Set the Perform Job Barrier flag if this job is the first in the chain -+ * - Read the address of the next job header -+ * -+ * @param[in] kctx Context pointer -+ * @param[in,out] job_header Address of job header to reset. Set to address -+ * of next job header on exit. -+ * @param[in] prev_jc Previous job chain to link to, if this job is -+ * the last in the chain. -+ * @param[in] hw_job_id_offset Offset for HW job IDs -+ * @param[in] tiler_heap_free The value to reset Tiler Heap Free to -+ * @param[in] hierarchy_mask The hierarchy mask to use -+ * @param[in] default_weight Default hierarchy weight to write when no other -+ * weight is given in the FBD -+ * @param[in] first_in_chain true if this job is the first in the chain -+ * @param[in] fragment_chain true if this job is in the fragment chain -+ * -+ * @return 0 on success, error code on failure -+ */ -+static int kbasep_replay_reset_job(struct kbase_context *kctx, -+ u64 *job_header, u64 prev_jc, -+ u64 tiler_heap_free, u16 hierarchy_mask, -+ u32 default_weight, u16 hw_job_id_offset, -+ bool first_in_chain, bool fragment_chain) -+{ -+ struct fragment_job *frag_job; -+ struct job_descriptor_header *job; -+ u64 new_job_header; -+ struct kbase_vmap_struct map; ++ mem->size_bytes = 0; + -+ frag_job = kbase_vmap(kctx, *job_header, sizeof(*frag_job), &map); -+ if (!frag_job) { -+ dev_err(kctx->kbdev->dev, -+ "kbasep_replay_parse_jc: failed to map jc\n"); -+ return -EINVAL; -+ } -+ job = &frag_job->header; ++ while ((left > 0) && (allocator->first_free)) { ++ block_info *block; + -+ dump_job_head(kctx, "Job header:", job); ++ block = allocator->first_free; ++ allocator->first_free = allocator->first_free->next; ++ block->next = last_allocated; ++ last_allocated = block; ++ allocator->num_free--; + -+ if (job->exception_status == JOB_NOT_STARTED && !fragment_chain) { -+ dev_err(kctx->kbdev->dev, "Job already not started\n"); -+ goto out_unmap; -+ } -+ job->exception_status = JOB_NOT_STARTED; ++ mem->block_array[i].addr = get_phys(allocator, block); ++ mem->block_array[i].size = UMP_BLOCK_SIZE; ++ mem->size_bytes += UMP_BLOCK_SIZE; + -+ if (job->job_type == JOB_TYPE_VERTEX) -+ job->job_type = JOB_TYPE_NULL; ++ i++; + -+ if (job->job_type == JOB_TYPE_FUSED) { -+ dev_err(kctx->kbdev->dev, "Fused jobs can not be replayed\n"); -+ goto out_unmap; ++ if (left < UMP_BLOCK_SIZE) left = 0; ++ else left -= UMP_BLOCK_SIZE; + } + -+ if (first_in_chain) -+ job->job_barrier = 1; ++ if (left) { ++ block_info *block; ++ /* release all memory back to the pool */ ++ while (last_allocated) { ++ block = last_allocated->next; ++ last_allocated->next = allocator->first_free; ++ allocator->first_free = last_allocated; ++ last_allocated = block; ++ allocator->num_free++; ++ } + -+ if ((job->job_dependency_index_1 + hw_job_id_offset) > -+ JOB_HEADER_ID_MAX || -+ (job->job_dependency_index_2 + hw_job_id_offset) > -+ JOB_HEADER_ID_MAX || -+ (job->job_index + hw_job_id_offset) > JOB_HEADER_ID_MAX) { -+ dev_err(kctx->kbdev->dev, -+ "Job indicies/dependencies out of valid range\n"); -+ goto out_unmap; ++ vfree(mem->block_array); ++ mem->backend_info = NULL; ++ mem->block_array = NULL; ++ ++ DBG_MSG(4, ("Could not find a mem-block for the allocation.\n")); ++ up(&allocator->mutex); ++ ++ return 0; + } + -+ if (job->job_dependency_index_1) -+ job->job_dependency_index_1 += hw_job_id_offset; -+ if (job->job_dependency_index_2) -+ job->job_dependency_index_2 += hw_job_id_offset; ++ mem->backend_info = last_allocated; + -+ job->job_index += hw_job_id_offset; ++ up(&allocator->mutex); ++ mem->is_cached = 0; + -+ if (job->job_descriptor_size) { -+ new_job_header = job->next_job._64; -+ if (!job->next_job._64) -+ job->next_job._64 = prev_jc; -+ } else { -+ new_job_header = job->next_job._32; -+ if (!job->next_job._32) -+ job->next_job._32 = prev_jc; -+ } -+ dump_job_head(kctx, "Updated to:", job); ++ return 1; ++} + -+ if (job->job_type == JOB_TYPE_TILER) { -+ bool job_64 = job->job_descriptor_size != 0; + -+ if (kbasep_replay_reset_tiler_job(kctx, *job_header, -+ tiler_heap_free, hierarchy_mask, -+ default_weight, job_64) != 0) -+ goto out_unmap; + -+ } else if (job->job_type == JOB_TYPE_FRAGMENT) { -+ u64 fbd_address; ++static void block_allocator_release(void *ctx, ump_dd_mem *handle) ++{ ++ block_allocator *allocator; ++ block_info *block, * next; + -+ if (job->job_descriptor_size) -+ fbd_address = frag_job->fragment_fbd._64; -+ else -+ fbd_address = (u64)frag_job->fragment_fbd._32; ++ BUG_ON(!ctx); ++ BUG_ON(!handle); + -+ if (fbd_address & FBD_TYPE) { -+ if (kbasep_replay_reset_mfbd(kctx, -+ fbd_address & FBD_POINTER_MASK, -+ tiler_heap_free, -+ hierarchy_mask, -+ default_weight) != 0) -+ goto out_unmap; -+ } else { -+ if (kbasep_replay_reset_sfbd(kctx, -+ fbd_address & FBD_POINTER_MASK, -+ tiler_heap_free, -+ hierarchy_mask, -+ default_weight) != 0) -+ goto out_unmap; -+ } ++ allocator = (block_allocator *)ctx; ++ block = (block_info *)handle->backend_info; ++ BUG_ON(!block); ++ ++ if (down_interruptible(&allocator->mutex)) { ++ MSG_ERR(("Allocator release: Failed to get mutex - memory leak\n")); ++ return; + } + -+ kbase_vunmap(kctx, &map); ++ while (block) { ++ next = block->next; + -+ *job_header = new_job_header; ++ BUG_ON((block < allocator->all_blocks) || (block > (allocator->all_blocks + allocator->num_blocks))); + -+ return 0; ++ block->next = allocator->first_free; ++ allocator->first_free = block; ++ allocator->num_free++; + -+out_unmap: -+ kbase_vunmap(kctx, &map); -+ return -EINVAL; -+} -+ -+/** -+ * @brief Find the highest job ID in a job chain -+ * -+ * @param[in] kctx Context pointer -+ * @param[in] jc Job chain start address -+ * @param[out] hw_job_id Highest job ID in chain -+ * -+ * @return 0 on success, error code on failure -+ */ -+static int kbasep_replay_find_hw_job_id(struct kbase_context *kctx, -+ u64 jc, u16 *hw_job_id) -+{ -+ while (jc) { -+ struct job_descriptor_header *job; -+ struct kbase_vmap_struct map; -+ -+ dev_dbg(kctx->kbdev->dev, -+ "kbasep_replay_find_hw_job_id: parsing jc=%llx\n", jc); ++ block = next; ++ } ++ DBG_MSG(3, ("%d blocks free after release call\n", allocator->num_free)); ++ up(&allocator->mutex); + -+ job = kbase_vmap(kctx, jc, sizeof(*job), &map); -+ if (!job) { -+ dev_err(kctx->kbdev->dev, "failed to map jc\n"); ++ vfree(handle->block_array); ++ handle->block_array = NULL; ++} + -+ return -EINVAL; -+ } + -+ if (job->job_index > *hw_job_id) -+ *hw_job_id = job->job_index; + -+ if (job->job_descriptor_size) -+ jc = job->next_job._64; -+ else -+ jc = job->next_job._32; ++/* ++ * Helper function for calculating the physical base adderss of a memory block ++ */ ++static inline u32 get_phys(block_allocator *allocator, block_info *block) ++{ ++ return allocator->base + ((block - allocator->all_blocks) * UMP_BLOCK_SIZE); ++} + -+ kbase_vunmap(kctx, &map); -+ } ++static u32 block_allocator_stat(struct ump_memory_backend *backend) ++{ ++ block_allocator *allocator; ++ BUG_ON(!backend); ++ allocator = (block_allocator *)backend->ctx; ++ BUG_ON(!allocator); + -+ return 0; ++ return (allocator->num_blocks - allocator->num_free) * UMP_BLOCK_SIZE; +} +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h +new file mode 100755 +index 000000000..949fd245c +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h +@@ -0,0 +1,23 @@ ++/* ++ * Copyright (C) 2010, 2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + +/** -+ * @brief Reset the status of a number of jobs -+ * -+ * This function walks the provided job chain, and calls -+ * kbasep_replay_reset_job for each job. It also links the job chain to the -+ * provided previous job chain. -+ * -+ * The function will fail if any of the jobs passed already have status of -+ * NOT_STARTED. -+ * -+ * @param[in] kctx Context pointer -+ * @param[in] jc Job chain to be processed -+ * @param[in] prev_jc Job chain to be added to. May be NULL -+ * @param[in] tiler_heap_free The value to reset Tiler Heap Free to -+ * @param[in] hierarchy_mask The hierarchy mask to use -+ * @param[in] default_weight Default hierarchy weight to write when no other -+ * weight is given in the FBD -+ * @param[in] hw_job_id_offset Offset for HW job IDs -+ * @param[in] fragment_chain true if this chain is the fragment chain -+ * -+ * @return 0 on success, error code otherwise ++ * @file ump_kernel_memory_backend_dedicated.h + */ -+static int kbasep_replay_parse_jc(struct kbase_context *kctx, -+ u64 jc, u64 prev_jc, -+ u64 tiler_heap_free, u16 hierarchy_mask, -+ u32 default_weight, u16 hw_job_id_offset, -+ bool fragment_chain) -+{ -+ bool first_in_chain = true; -+ int nr_jobs = 0; -+ -+ dev_dbg(kctx->kbdev->dev, "kbasep_replay_parse_jc: jc=%llx hw_job_id=%x\n", -+ jc, hw_job_id_offset); -+ -+ while (jc) { -+ dev_dbg(kctx->kbdev->dev, "kbasep_replay_parse_jc: parsing jc=%llx\n", jc); + -+ if (kbasep_replay_reset_job(kctx, &jc, prev_jc, -+ tiler_heap_free, hierarchy_mask, -+ default_weight, hw_job_id_offset, -+ first_in_chain, fragment_chain) != 0) -+ return -EINVAL; ++#ifndef __UMP_KERNEL_MEMORY_BACKEND_DEDICATED_H__ ++#define __UMP_KERNEL_MEMORY_BACKEND_DEDICATED_H__ + -+ first_in_chain = false; ++#include "ump_kernel_memory_backend.h" + -+ nr_jobs++; -+ if (fragment_chain && -+ nr_jobs >= BASE_JD_REPLAY_F_CHAIN_JOB_LIMIT) { -+ dev_err(kctx->kbdev->dev, -+ "Exceeded maximum number of jobs in fragment chain\n"); -+ return -EINVAL; -+ } -+ } ++ump_memory_backend *ump_block_allocator_create(u32 base_address, u32 size); + -+ return 0; -+} ++#endif /* __UMP_KERNEL_MEMORY_BACKEND_DEDICATED_H__ */ + -+/** -+ * @brief Reset the status of a replay job, and set up dependencies -+ * -+ * This performs the actions to allow the replay job to be re-run following -+ * completion of the passed dependency. -+ * -+ * @param[in] katom The atom to be reset -+ * @param[in] dep_atom The dependency to be attached to the atom +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c +new file mode 100755 +index 000000000..7cd8d5d38 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c +@@ -0,0 +1,235 @@ ++/* ++ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ -+static void kbasep_replay_reset_softjob(struct kbase_jd_atom *katom, -+ struct kbase_jd_atom *dep_atom) -+{ -+ katom->status = KBASE_JD_ATOM_STATE_QUEUED; -+ kbase_jd_katom_dep_set(&katom->dep[0], dep_atom, BASE_JD_DEP_TYPE_DATA); -+ list_add_tail(&katom->dep_item[0], &dep_atom->dep_head[0]); -+} + -+/** -+ * @brief Allocate an unused katom -+ * -+ * This will search the provided context for an unused katom, and will mark it -+ * as KBASE_JD_ATOM_STATE_QUEUED. -+ * -+ * If no atoms are available then the function will fail. -+ * -+ * @param[in] kctx Context pointer -+ * @return An atom ID, or -1 on failure -+ */ -+static int kbasep_allocate_katom(struct kbase_context *kctx) -+{ -+ struct kbase_jd_context *jctx = &kctx->jctx; -+ int i; ++/* needed to detect kernel version specific code */ ++#include + -+ for (i = BASE_JD_ATOM_COUNT-1; i > 0; i--) { -+ if (jctx->atoms[i].status == KBASE_JD_ATOM_STATE_UNUSED) { -+ jctx->atoms[i].status = KBASE_JD_ATOM_STATE_QUEUED; -+ dev_dbg(kctx->kbdev->dev, -+ "kbasep_allocate_katom: Allocated atom %d\n", -+ i); -+ return i; -+ } -+ } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++#include ++#else /* pre 2.6.26 the file was in the arch specific location */ ++#include ++#endif + -+ return -1; -+} ++#include ++#include ++#include ++#include ++#include ++#include ++#include "ump_kernel_common.h" ++#include "ump_kernel_memory_backend.h" + -+/** -+ * @brief Release a katom -+ * -+ * This will mark the provided atom as available, and remove any dependencies. -+ * -+ * For use on error path. -+ * -+ * @param[in] kctx Context pointer -+ * @param[in] atom_id ID of atom to release -+ */ -+static void kbasep_release_katom(struct kbase_context *kctx, int atom_id) -+{ -+ struct kbase_jd_context *jctx = &kctx->jctx; + -+ dev_dbg(kctx->kbdev->dev, "kbasep_release_katom: Released atom %d\n", -+ atom_id); + -+ while (!list_empty(&jctx->atoms[atom_id].dep_head[0])) -+ list_del(jctx->atoms[atom_id].dep_head[0].next); ++typedef struct os_allocator { ++ struct semaphore mutex; ++ u32 num_pages_max; /**< Maximum number of pages to allocate from the OS */ ++ u32 num_pages_allocated; /**< Number of pages allocated from the OS */ ++} os_allocator; + -+ while (!list_empty(&jctx->atoms[atom_id].dep_head[1])) -+ list_del(jctx->atoms[atom_id].dep_head[1].next); + -+ jctx->atoms[atom_id].status = KBASE_JD_ATOM_STATE_UNUSED; -+} + -+static void kbasep_replay_create_atom(struct kbase_context *kctx, -+ struct base_jd_atom_v2 *atom, -+ int atom_nr, -+ base_jd_prio prio) -+{ -+ atom->nr_extres = 0; -+ atom->extres_list = 0; -+ atom->device_nr = 0; -+ atom->prio = prio; -+ atom->atom_number = atom_nr; ++static void os_free(void *ctx, ump_dd_mem *descriptor); ++static int os_allocate(void *ctx, ump_dd_mem *descriptor); ++static void os_memory_backend_destroy(ump_memory_backend *backend); ++static u32 os_stat(struct ump_memory_backend *backend); + -+ base_jd_atom_dep_set(&atom->pre_dep[0], 0 , BASE_JD_DEP_TYPE_INVALID); -+ base_jd_atom_dep_set(&atom->pre_dep[1], 0 , BASE_JD_DEP_TYPE_INVALID); + -+ atom->udata.blob[0] = 0; -+ atom->udata.blob[1] = 0; -+} + -+/** -+ * @brief Create two atoms for the purpose of replaying jobs -+ * -+ * Two atoms are allocated and created. The jc pointer is not set at this -+ * stage. The second atom has a dependency on the first. The remaining fields -+ * are set up as follows : -+ * -+ * - No external resources. Any required external resources will be held by the -+ * replay atom. -+ * - device_nr is set to 0. This is not relevant as -+ * BASE_JD_REQ_SPECIFIC_COHERENT_GROUP should not be set. -+ * - Priority is inherited from the replay job. -+ * -+ * @param[out] t_atom Atom to use for tiler jobs -+ * @param[out] f_atom Atom to use for fragment jobs -+ * @param[in] prio Priority of new atom (inherited from replay soft -+ * job) -+ * @return 0 on success, error code on failure ++/* ++ * Create OS memory backend + */ -+static int kbasep_replay_create_atoms(struct kbase_context *kctx, -+ struct base_jd_atom_v2 *t_atom, -+ struct base_jd_atom_v2 *f_atom, -+ base_jd_prio prio) ++ump_memory_backend *ump_os_memory_backend_create(const int max_allocation) +{ -+ int t_atom_nr, f_atom_nr; ++ ump_memory_backend *backend; ++ os_allocator *info; + -+ t_atom_nr = kbasep_allocate_katom(kctx); -+ if (t_atom_nr < 0) { -+ dev_err(kctx->kbdev->dev, "Failed to allocate katom\n"); -+ return -EINVAL; ++ info = kmalloc(sizeof(os_allocator), GFP_KERNEL); ++ if (NULL == info) { ++ return NULL; + } + -+ f_atom_nr = kbasep_allocate_katom(kctx); -+ if (f_atom_nr < 0) { -+ dev_err(kctx->kbdev->dev, "Failed to allocate katom\n"); -+ kbasep_release_katom(kctx, t_atom_nr); -+ return -EINVAL; -+ } ++ info->num_pages_max = max_allocation >> PAGE_SHIFT; ++ info->num_pages_allocated = 0; + -+ kbasep_replay_create_atom(kctx, t_atom, t_atom_nr, prio); -+ kbasep_replay_create_atom(kctx, f_atom, f_atom_nr, prio); ++ sema_init(&info->mutex, 1); + -+ base_jd_atom_dep_set(&f_atom->pre_dep[0], t_atom_nr , BASE_JD_DEP_TYPE_DATA); ++ backend = kmalloc(sizeof(ump_memory_backend), GFP_KERNEL); ++ if (NULL == backend) { ++ kfree(info); ++ return NULL; ++ } + -+ return 0; -+} ++ backend->ctx = info; ++ backend->allocate = os_allocate; ++ backend->release = os_free; ++ backend->shutdown = os_memory_backend_destroy; ++ backend->stat = os_stat; ++ backend->pre_allocate_physical_check = NULL; ++ backend->adjust_to_mali_phys = NULL; + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+static void payload_dump(struct kbase_context *kctx, base_jd_replay_payload *payload) -+{ -+ u64 next; ++ return backend; ++} + -+ dev_dbg(kctx->kbdev->dev, "Tiler jc list :\n"); -+ next = payload->tiler_jc_list; + -+ while (next) { -+ struct kbase_vmap_struct map; -+ base_jd_replay_jc *jc_struct; + -+ jc_struct = kbase_vmap(kctx, next, sizeof(*jc_struct), &map); ++/* ++ * Destroy specified OS memory backend ++ */ ++static void os_memory_backend_destroy(ump_memory_backend *backend) ++{ ++ os_allocator *info = (os_allocator *)backend->ctx; + -+ if (!jc_struct) -+ return; ++ DBG_MSG_IF(1, 0 != info->num_pages_allocated, ("%d pages still in use during shutdown\n", info->num_pages_allocated)); + -+ dev_dbg(kctx->kbdev->dev, "* jc_struct=%p jc=%llx next=%llx\n", -+ jc_struct, jc_struct->jc, jc_struct->next); ++ kfree(info); ++ kfree(backend); ++} + -+ next = jc_struct->next; + -+ kbase_vunmap(kctx, &map); -+ } -+} -+#endif + -+/** -+ * @brief Parse a base_jd_replay_payload provided by userspace -+ * -+ * This will read the payload from userspace, and parse the job chains. -+ * -+ * @param[in] kctx Context pointer -+ * @param[in] replay_atom Replay soft job atom -+ * @param[in] t_atom Atom to use for tiler jobs -+ * @param[in] f_atom Atom to use for fragment jobs -+ * @return 0 on success, error code on failure ++/* ++ * Allocate UMP memory + */ -+static int kbasep_replay_parse_payload(struct kbase_context *kctx, -+ struct kbase_jd_atom *replay_atom, -+ struct base_jd_atom_v2 *t_atom, -+ struct base_jd_atom_v2 *f_atom) ++static int os_allocate(void *ctx, ump_dd_mem *descriptor) +{ -+ base_jd_replay_payload *payload = NULL; -+ u64 next; -+ u64 prev_jc = 0; -+ u16 hw_job_id_offset = 0; -+ int ret = -EINVAL; -+ struct kbase_vmap_struct map; -+ -+ dev_dbg(kctx->kbdev->dev, "kbasep_replay_parse_payload: replay_atom->jc = %llx sizeof(payload) = %zu\n", -+ replay_atom->jc, sizeof(payload)); ++ u32 left; ++ os_allocator *info; ++ int pages_allocated = 0; ++ int is_cached; + -+ payload = kbase_vmap(kctx, replay_atom->jc, sizeof(*payload), &map); -+ if (!payload) { -+ dev_err(kctx->kbdev->dev, "kbasep_replay_parse_payload: failed to map payload into kernel space\n"); -+ return -EINVAL; -+ } ++ BUG_ON(!descriptor); ++ BUG_ON(!ctx); + -+#ifdef BASE_LEGACY_UK10_2_SUPPORT -+ if (KBASE_API_VERSION(10, 3) > replay_atom->kctx->api_version) { -+ base_jd_replay_payload_uk10_2 *payload_uk10_2; -+ u16 tiler_core_req; -+ u16 fragment_core_req; ++ info = (os_allocator *)ctx; ++ left = descriptor->size_bytes; ++ is_cached = descriptor->is_cached; + -+ payload_uk10_2 = (base_jd_replay_payload_uk10_2 *) payload; -+ memcpy(&tiler_core_req, &payload_uk10_2->tiler_core_req, -+ sizeof(tiler_core_req)); -+ memcpy(&fragment_core_req, &payload_uk10_2->fragment_core_req, -+ sizeof(fragment_core_req)); -+ payload->tiler_core_req = (u32)(tiler_core_req & 0x7fff); -+ payload->fragment_core_req = (u32)(fragment_core_req & 0x7fff); ++ if (down_interruptible(&info->mutex)) { ++ DBG_MSG(1, ("Failed to get mutex in os_free\n")); ++ return 0; /* failure */ + } -+#endif /* BASE_LEGACY_UK10_2_SUPPORT */ + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ dev_dbg(kctx->kbdev->dev, "kbasep_replay_parse_payload: payload=%p\n", payload); -+ dev_dbg(kctx->kbdev->dev, "Payload structure:\n" -+ "tiler_jc_list = %llx\n" -+ "fragment_jc = %llx\n" -+ "tiler_heap_free = %llx\n" -+ "fragment_hierarchy_mask = %x\n" -+ "tiler_hierarchy_mask = %x\n" -+ "hierarchy_default_weight = %x\n" -+ "tiler_core_req = %x\n" -+ "fragment_core_req = %x\n", -+ payload->tiler_jc_list, -+ payload->fragment_jc, -+ payload->tiler_heap_free, -+ payload->fragment_hierarchy_mask, -+ payload->tiler_hierarchy_mask, -+ payload->hierarchy_default_weight, -+ payload->tiler_core_req, -+ payload->fragment_core_req); -+ payload_dump(kctx, payload); -+#endif -+ t_atom->core_req = payload->tiler_core_req | BASEP_JD_REQ_EVENT_NEVER; -+ f_atom->core_req = payload->fragment_core_req | BASEP_JD_REQ_EVENT_NEVER; ++ descriptor->backend_info = NULL; ++ descriptor->nr_blocks = ((left + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)) >> PAGE_SHIFT; + -+ /* Sanity check core requirements*/ -+ if ((t_atom->core_req & BASE_JD_REQ_ATOM_TYPE) != BASE_JD_REQ_T || -+ (f_atom->core_req & BASE_JD_REQ_ATOM_TYPE) != BASE_JD_REQ_FS || -+ t_atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES || -+ f_atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) { ++ DBG_MSG(5, ("Allocating page array. Size: %lu\n", descriptor->nr_blocks * sizeof(ump_dd_physical_block))); + -+ int t_atom_type = t_atom->core_req & BASE_JD_REQ_ATOM_TYPE & ~BASE_JD_REQ_COHERENT_GROUP; -+ int f_atom_type = f_atom->core_req & BASE_JD_REQ_ATOM_TYPE & ~BASE_JD_REQ_COHERENT_GROUP & ~BASE_JD_REQ_FS_AFBC; -+ int t_has_ex_res = t_atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES; -+ int f_has_ex_res = f_atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES; ++ descriptor->block_array = (ump_dd_physical_block *)vmalloc(sizeof(ump_dd_physical_block) * descriptor->nr_blocks); ++ if (NULL == descriptor->block_array) { ++ up(&info->mutex); ++ DBG_MSG(1, ("Block array could not be allocated\n")); ++ return 0; /* failure */ ++ } + -+ if (t_atom_type != BASE_JD_REQ_T) { -+ dev_err(kctx->kbdev->dev, "Invalid core requirement: Tiler atom not a tiler job. Was: 0x%x\n Expected: 0x%x", -+ t_atom_type, BASE_JD_REQ_T); ++ while (left > 0 && ((info->num_pages_allocated + pages_allocated) < info->num_pages_max)) { ++ struct page *new_page; ++ ++ if (is_cached) { ++ new_page = alloc_page(GFP_HIGHUSER | __GFP_ZERO | __GFP_REPEAT | __GFP_NOWARN); ++ } else { ++ new_page = alloc_page(GFP_HIGHUSER | __GFP_ZERO | __GFP_REPEAT | __GFP_NOWARN | __GFP_COLD); + } -+ if (f_atom_type != BASE_JD_REQ_FS) { -+ dev_err(kctx->kbdev->dev, "Invalid core requirement: Fragment shader atom not a fragment shader. Was 0x%x Expected: 0x%x\n", -+ f_atom_type, BASE_JD_REQ_FS); ++ if (NULL == new_page) { ++ break; + } -+ if (t_has_ex_res) { -+ dev_err(kctx->kbdev->dev, "Invalid core requirement: Tiler atom has external resources.\n"); ++ ++ /* Ensure page caches are flushed. */ ++ if (is_cached) { ++ descriptor->block_array[pages_allocated].addr = page_to_phys(new_page); ++ descriptor->block_array[pages_allocated].size = PAGE_SIZE; ++ } else { ++ descriptor->block_array[pages_allocated].addr = dma_map_page(NULL, new_page, 0, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ descriptor->block_array[pages_allocated].size = PAGE_SIZE; + } -+ if (f_has_ex_res) { -+ dev_err(kctx->kbdev->dev, "Invalid core requirement: Fragment shader atom has external resources.\n"); ++ ++ DBG_MSG(5, ("Allocated page 0x%08lx cached: %d\n", descriptor->block_array[pages_allocated].addr, is_cached)); ++ ++ if (left < PAGE_SIZE) { ++ left = 0; ++ } else { ++ left -= PAGE_SIZE; + } + -+ goto out; ++ pages_allocated++; + } + -+ /* Process tiler job chains */ -+ next = payload->tiler_jc_list; -+ if (!next) { -+ dev_err(kctx->kbdev->dev, "Invalid tiler JC list\n"); -+ goto out; ++ DBG_MSG(5, ("Alloce for ID:%2d got %d pages, cached: %d\n", descriptor->secure_id, pages_allocated)); ++ ++ if (left) { ++ DBG_MSG(1, ("Failed to allocate needed pages\n")); ++ ++ while (pages_allocated) { ++ pages_allocated--; ++ if (!is_cached) { ++ dma_unmap_page(NULL, descriptor->block_array[pages_allocated].addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ } ++ __free_page(pfn_to_page(descriptor->block_array[pages_allocated].addr >> PAGE_SHIFT)); ++ } ++ ++ up(&info->mutex); ++ ++ return 0; /* failure */ + } + -+ while (next) { -+ base_jd_replay_jc *jc_struct; -+ struct kbase_vmap_struct jc_map; -+ u64 jc; ++ info->num_pages_allocated += pages_allocated; + -+ jc_struct = kbase_vmap(kctx, next, sizeof(*jc_struct), &jc_map); ++ DBG_MSG(6, ("%d out of %d pages now allocated\n", info->num_pages_allocated, info->num_pages_max)); + -+ if (!jc_struct) { -+ dev_err(kctx->kbdev->dev, "Failed to map jc struct\n"); -+ goto out; -+ } ++ up(&info->mutex); + -+ jc = jc_struct->jc; -+ next = jc_struct->next; -+ if (next) -+ jc_struct->jc = 0; ++ return 1; /* success*/ ++} + -+ kbase_vunmap(kctx, &jc_map); + -+ if (jc) { -+ u16 max_hw_job_id = 0; ++/* ++ * Free specified UMP memory ++ */ ++static void os_free(void *ctx, ump_dd_mem *descriptor) ++{ ++ os_allocator *info; ++ int i; + -+ if (kbasep_replay_find_hw_job_id(kctx, jc, -+ &max_hw_job_id) != 0) -+ goto out; ++ BUG_ON(!ctx); ++ BUG_ON(!descriptor); + -+ if (kbasep_replay_parse_jc(kctx, jc, prev_jc, -+ payload->tiler_heap_free, -+ payload->tiler_hierarchy_mask, -+ payload->hierarchy_default_weight, -+ hw_job_id_offset, false) != 0) { -+ goto out; -+ } ++ info = (os_allocator *)ctx; + -+ hw_job_id_offset += max_hw_job_id; ++ BUG_ON(descriptor->nr_blocks > info->num_pages_allocated); + -+ prev_jc = jc; -+ } ++ if (down_interruptible(&info->mutex)) { ++ DBG_MSG(1, ("Failed to get mutex in os_free\n")); ++ return; + } -+ t_atom->jc = prev_jc; + -+ /* Process fragment job chain */ -+ f_atom->jc = payload->fragment_jc; -+ if (kbasep_replay_parse_jc(kctx, payload->fragment_jc, 0, -+ payload->tiler_heap_free, -+ payload->fragment_hierarchy_mask, -+ payload->hierarchy_default_weight, 0, -+ true) != 0) { -+ goto out; -+ } ++ DBG_MSG(5, ("Releasing %lu OS pages\n", descriptor->nr_blocks)); + -+ if (!t_atom->jc || !f_atom->jc) { -+ dev_err(kctx->kbdev->dev, "Invalid payload\n"); -+ goto out; -+ } ++ info->num_pages_allocated -= descriptor->nr_blocks; + -+ dev_dbg(kctx->kbdev->dev, "t_atom->jc=%llx f_atom->jc=%llx\n", -+ t_atom->jc, f_atom->jc); -+ ret = 0; ++ up(&info->mutex); + -+out: -+ kbase_vunmap(kctx, &map); ++ for (i = 0; i < descriptor->nr_blocks; i++) { ++ DBG_MSG(6, ("Freeing physical page. Address: 0x%08lx\n", descriptor->block_array[i].addr)); ++ if (! descriptor->is_cached) { ++ dma_unmap_page(NULL, descriptor->block_array[i].addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ } ++ __free_page(pfn_to_page(descriptor->block_array[i].addr >> PAGE_SHIFT)); ++ } + -+ return ret; ++ vfree(descriptor->block_array); +} + -+static void kbase_replay_process_worker(struct work_struct *data) ++ ++static u32 os_stat(struct ump_memory_backend *backend) +{ -+ struct kbase_jd_atom *katom; -+ struct kbase_context *kctx; -+ struct kbase_jd_context *jctx; -+ bool need_to_try_schedule_context = false; ++ os_allocator *info; ++ info = (os_allocator *)backend->ctx; ++ return info->num_pages_allocated * _MALI_OSK_MALI_PAGE_SIZE; ++} +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h +new file mode 100755 +index 000000000..d21d50351 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h +@@ -0,0 +1,23 @@ ++/* ++ * Copyright (C) 2010, 2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ struct base_jd_atom_v2 t_atom, f_atom; -+ struct kbase_jd_atom *t_katom, *f_katom; -+ base_jd_prio atom_prio; ++/** ++ * @file ump_kernel_memory_backend_os.h ++ */ + -+ katom = container_of(data, struct kbase_jd_atom, work); -+ kctx = katom->kctx; -+ jctx = &kctx->jctx; ++#ifndef __UMP_KERNEL_MEMORY_BACKEND_OS_H__ ++#define __UMP_KERNEL_MEMORY_BACKEND_OS_H__ + -+ mutex_lock(&jctx->lock); ++#include "ump_kernel_memory_backend.h" + -+ atom_prio = kbasep_js_sched_prio_to_atom_prio(katom->sched_priority); ++ump_memory_backend *ump_os_memory_backend_create(const int max_allocation); + -+ if (kbasep_replay_create_atoms( -+ kctx, &t_atom, &f_atom, atom_prio) != 0) { -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ goto out; -+ } ++#endif /* __UMP_KERNEL_MEMORY_BACKEND_OS_H__ */ + -+ t_katom = &jctx->atoms[t_atom.atom_number]; -+ f_katom = &jctx->atoms[f_atom.atom_number]; +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c +new file mode 100755 +index 000000000..6be0f8644 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c +@@ -0,0 +1,222 @@ ++/* ++ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ if (kbasep_replay_parse_payload(kctx, katom, &t_atom, &f_atom) != 0) { -+ kbasep_release_katom(kctx, t_atom.atom_number); -+ kbasep_release_katom(kctx, f_atom.atom_number); -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ goto out; -+ } ++#include "mali_kernel_common.h" ++#include "mali_osk.h" ++#include "ump_osk.h" ++#include "ump_kernel_common.h" ++#include "ump_kernel_types.h" ++#include "ump_kernel_random_mapping.h" + -+ kbasep_replay_reset_softjob(katom, f_katom); ++#include ++#include ++#include ++#include + -+ need_to_try_schedule_context |= jd_submit_atom(kctx, &t_atom, t_katom); -+ if (t_katom->event_code == BASE_JD_EVENT_JOB_INVALID) { -+ dev_err(kctx->kbdev->dev, "Replay failed to submit atom\n"); -+ kbasep_release_katom(kctx, f_atom.atom_number); -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ goto out; -+ } -+ need_to_try_schedule_context |= jd_submit_atom(kctx, &f_atom, f_katom); -+ if (f_katom->event_code == BASE_JD_EVENT_JOB_INVALID) { -+ dev_err(kctx->kbdev->dev, "Replay failed to submit atom\n"); -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ goto out; -+ } + -+ katom->event_code = BASE_JD_EVENT_DONE; ++static ump_dd_mem *search(struct rb_root *root, int id) ++{ ++ struct rb_node *node = root->rb_node; + -+out: -+ if (katom->event_code != BASE_JD_EVENT_DONE) { -+ kbase_disjoint_state_down(kctx->kbdev); ++ while (node) { ++ ump_dd_mem *e = container_of(node, ump_dd_mem, node); + -+ need_to_try_schedule_context |= jd_done_nolock(katom, NULL); ++ if (id < e->secure_id) { ++ node = node->rb_left; ++ } else if (id > e->secure_id) { ++ node = node->rb_right; ++ } else { ++ return e; ++ } + } + -+ if (need_to_try_schedule_context) -+ kbase_js_sched_all(kctx->kbdev); -+ -+ mutex_unlock(&jctx->lock); ++ return NULL; +} + -+/** -+ * @brief Check job replay fault -+ * -+ * This will read the job payload, checks fault type and source, then decides -+ * whether replay is required. -+ * -+ * @param[in] katom The atom to be processed -+ * @return true (success) if replay required or false on failure. -+ */ -+static bool kbase_replay_fault_check(struct kbase_jd_atom *katom) ++static mali_bool insert(struct rb_root *root, int id, ump_dd_mem *mem) +{ -+ struct kbase_context *kctx = katom->kctx; -+ struct device *dev = kctx->kbdev->dev; -+ base_jd_replay_payload *payload; -+ u64 job_header; -+ u64 job_loop_detect; -+ struct job_descriptor_header *job; -+ struct kbase_vmap_struct job_map; -+ struct kbase_vmap_struct map; -+ bool err = false; -+ -+ /* Replay job if fault is of type BASE_JD_EVENT_JOB_WRITE_FAULT or -+ * if force_replay is enabled. -+ */ -+ if (BASE_JD_EVENT_TERMINATED == katom->event_code) { -+ return false; -+ } else if (BASE_JD_EVENT_JOB_WRITE_FAULT == katom->event_code) { -+ return true; -+ } else if (BASE_JD_EVENT_FORCE_REPLAY == katom->event_code) { -+ katom->event_code = BASE_JD_EVENT_DATA_INVALID_FAULT; -+ return true; -+ } else if (BASE_JD_EVENT_DATA_INVALID_FAULT != katom->event_code) { -+ /* No replay for faults of type other than -+ * BASE_JD_EVENT_DATA_INVALID_FAULT. -+ */ -+ return false; -+ } ++ struct rb_node **new = &(root->rb_node); ++ struct rb_node *parent = NULL; + -+ /* Job fault is BASE_JD_EVENT_DATA_INVALID_FAULT, now scan fragment jc -+ * to find out whether the source of exception is POLYGON_LIST. Replay -+ * is required if the source of fault is POLYGON_LIST. -+ */ -+ payload = kbase_vmap(kctx, katom->jc, sizeof(*payload), &map); -+ if (!payload) { -+ dev_err(dev, "kbase_replay_fault_check: failed to map payload.\n"); -+ return false; -+ } ++ while (*new) { ++ ump_dd_mem *this = container_of(*new, ump_dd_mem, node); + -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ dev_dbg(dev, "kbase_replay_fault_check: payload=%p\n", payload); -+ dev_dbg(dev, "\nPayload structure:\n" -+ "fragment_jc = 0x%llx\n" -+ "fragment_hierarchy_mask = 0x%x\n" -+ "fragment_core_req = 0x%x\n", -+ payload->fragment_jc, -+ payload->fragment_hierarchy_mask, -+ payload->fragment_core_req); -+#endif -+ /* Process fragment job chain */ -+ job_header = (u64) payload->fragment_jc; -+ job_loop_detect = job_header; -+ while (job_header) { -+ job = kbase_vmap(kctx, job_header, sizeof(*job), &job_map); -+ if (!job) { -+ dev_err(dev, "failed to map jc\n"); -+ /* unmap payload*/ -+ kbase_vunmap(kctx, &map); -+ return false; ++ parent = *new; ++ if (id < this->secure_id) { ++ new = &((*new)->rb_left); ++ } else if (id > this->secure_id) { ++ new = &((*new)->rb_right); ++ } else { ++ printk(KERN_ERR "UMP: ID already used %x\n", id); ++ return MALI_FALSE; + } ++ } + ++ rb_link_node(&mem->node, parent, new); ++ rb_insert_color(&mem->node, root); + -+ dump_job_head(kctx, "\njob_head structure:\n", job); ++ return MALI_TRUE; ++} + -+ /* Replay only when the polygon list reader caused the -+ * DATA_INVALID_FAULT */ -+ if ((BASE_JD_EVENT_DATA_INVALID_FAULT == katom->event_code) && -+ (JOB_POLYGON_LIST == JOB_SOURCE_ID(job->exception_status))) { -+ err = true; -+ kbase_vunmap(kctx, &job_map); -+ break; -+ } + -+ /* Move on to next fragment job in the list */ -+ if (job->job_descriptor_size) -+ job_header = job->next_job._64; -+ else -+ job_header = job->next_job._32; ++ump_random_mapping *ump_random_mapping_create(void) ++{ ++ ump_random_mapping *map = _mali_osk_calloc(1, sizeof(ump_random_mapping)); + -+ kbase_vunmap(kctx, &job_map); ++ if (NULL == map) ++ return NULL; + -+ /* Job chain loop detected */ -+ if (job_header == job_loop_detect) -+ break; ++ map->lock = _mali_osk_mutex_rw_init(_MALI_OSK_LOCKFLAG_ORDERED, ++ _MALI_OSK_LOCK_ORDER_DESCRIPTOR_MAP); ++ if (NULL != map->lock) { ++ map->root = RB_ROOT; ++#if UMP_RANDOM_MAP_DELAY ++ map->failed.count = 0; ++ map->failed.timestamp = jiffies; ++#endif ++ return map; + } -+ -+ /* unmap payload*/ -+ kbase_vunmap(kctx, &map); -+ -+ return err; ++ return NULL; +} + ++void ump_random_mapping_destroy(ump_random_mapping *map) ++{ ++ _mali_osk_mutex_rw_term(map->lock); ++ _mali_osk_free(map); ++} + -+/** -+ * @brief Process a replay job -+ * -+ * Called from kbase_process_soft_job. -+ * -+ * On exit, if the job has completed, katom->event_code will have been updated. -+ * If the job has not completed, and is replaying jobs, then the atom status -+ * will have been reset to KBASE_JD_ATOM_STATE_QUEUED. -+ * -+ * @param[in] katom The atom to be processed -+ * @return false if the atom has completed -+ * true if the atom is replaying jobs -+ */ -+bool kbase_replay_process(struct kbase_jd_atom *katom) ++int ump_random_mapping_insert(ump_random_mapping *map, ump_dd_mem *mem) +{ -+ struct kbase_context *kctx = katom->kctx; -+ struct kbase_device *kbdev = kctx->kbdev; ++ _mali_osk_mutex_rw_wait(map->lock, _MALI_OSK_LOCKMODE_RW); + -+ /* Don't replay this atom if these issues are not present in the -+ * hardware */ -+ if (!kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_11020) && -+ !kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_11024)) { -+ dev_dbg(kbdev->dev, "Hardware does not need replay workaround"); ++ while (1) { ++ u32 id; + -+ /* Signal failure to userspace */ -+ katom->event_code = BASE_JD_EVENT_JOB_INVALID; ++ get_random_bytes(&id, sizeof(id)); + -+ return false; ++ /* Try a new random number if id happened to be the invalid ++ * secure ID (-1). */ ++ if (unlikely(id == UMP_INVALID_SECURE_ID)) ++ continue; ++ ++ /* Insert into the tree. If the id was already in use, get a ++ * new random id and try again. */ ++ if (insert(&map->root, id, mem)) { ++ mem->secure_id = id; ++ break; ++ } + } ++ _mali_osk_mutex_rw_signal(map->lock, _MALI_OSK_LOCKMODE_RW); + -+ if (katom->event_code == BASE_JD_EVENT_DONE) { -+ dev_dbg(kbdev->dev, "Previous job succeeded - not replaying\n"); ++ return 0; ++} + -+ if (katom->retry_count) -+ kbase_disjoint_state_down(kbdev); ++ump_dd_mem *ump_random_mapping_get(ump_random_mapping *map, int id) ++{ ++ ump_dd_mem *mem = NULL; ++#if UMP_RANDOM_MAP_DELAY ++ int do_delay = 0; ++#endif + -+ return false; -+ } ++ DEBUG_ASSERT(map); + -+ if (kbase_ctx_flag(kctx, KCTX_DYING)) { -+ dev_dbg(kbdev->dev, "Not replaying; context is dying\n"); ++ _mali_osk_mutex_rw_wait(map->lock, _MALI_OSK_LOCKMODE_RO); ++ mem = search(&map->root, id); + -+ if (katom->retry_count) -+ kbase_disjoint_state_down(kbdev); ++ if (unlikely(NULL == mem)) { ++#if UMP_RANDOM_MAP_DELAY ++ map->failed.count++; + -+ return false; -+ } ++ if (time_is_before_jiffies(map->failed.timestamp + ++ UMP_FAILED_LOOKUP_DELAY * HZ)) { ++ /* If it is a long time since last failure, reset ++ * the counter and skip the delay this time. */ ++ map->failed.count = 0; ++ } else if (map->failed.count > UMP_FAILED_LOOKUPS_ALLOWED) { ++ do_delay = 1; ++ } + -+ /* Check job exception type and source before replaying. */ -+ if (!kbase_replay_fault_check(katom)) { -+ dev_dbg(kbdev->dev, -+ "Replay cancelled on event %x\n", katom->event_code); -+ /* katom->event_code is already set to the failure code of the -+ * previous job. -+ */ -+ return false; ++ map->failed.timestamp = jiffies; ++#endif /* UMP_RANDOM_MAP_DELAY */ ++ } else { ++ ump_dd_reference_add(mem); + } ++ _mali_osk_mutex_rw_signal(map->lock, _MALI_OSK_LOCKMODE_RO); + -+ dev_warn(kbdev->dev, "Replaying jobs retry=%d\n", -+ katom->retry_count); ++#if UMP_RANDOM_MAP_DELAY ++ if (do_delay) { ++ /* Apply delay */ ++ schedule_timeout_killable(UMP_FAILED_LOOKUP_DELAY); ++ } ++#endif /* UMP_RANDOM_MAP_DELAY */ + -+ katom->retry_count++; ++ return mem; ++} + -+ if (katom->retry_count > BASEP_JD_REPLAY_LIMIT) { -+ dev_err(kbdev->dev, "Replay exceeded limit - failing jobs\n"); ++static ump_dd_mem *ump_random_mapping_remove_internal(ump_random_mapping *map, int id) ++{ ++ ump_dd_mem *mem = NULL; + -+ kbase_disjoint_state_down(kbdev); ++ mem = search(&map->root, id); + -+ /* katom->event_code is already set to the failure code of the -+ previous job */ -+ return false; ++ if (mem) { ++ rb_erase(&mem->node, &map->root); + } + -+ /* only enter the disjoint state once for the whole time while the replay is ongoing */ -+ if (katom->retry_count == 1) -+ kbase_disjoint_state_up(kbdev); -+ -+ INIT_WORK(&katom->work, kbase_replay_process_worker); -+ queue_work(kctx->event_workq, &katom->work); -+ -+ return true; ++ return mem; +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_smc.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_smc.c -new file mode 100755 -index 000000000000..43175c85988f ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_smc.c -@@ -0,0 +1,74 @@ -+/* -+ * -+ * (C) COPYRIGHT 2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ + ++void ump_random_mapping_put(ump_dd_mem *mem) ++{ ++ int new_ref; + ++ _mali_osk_mutex_rw_wait(device.secure_id_map->lock, _MALI_OSK_LOCKMODE_RW); + -+#ifdef CONFIG_ARM64 ++ new_ref = _ump_osk_atomic_dec_and_read(&mem->ref_count); ++ DBG_MSG(5, ("Memory reference decremented. ID: %u, new value: %d\n", ++ mem->secure_id, new_ref)); + -+#include -+#include ++ if (0 == new_ref) { ++ DBG_MSG(3, ("Final release of memory. ID: %u\n", mem->secure_id)); + -+#include ++#ifdef CONFIG_DMA_SHARED_BUFFER ++ if (mem->import_attach) { ++ struct dma_buf_attachment *attach = mem->import_attach; ++ struct dma_buf *dma_buf; + -+static noinline u64 invoke_smc_fid(u64 function_id, -+ u64 arg0, u64 arg1, u64 arg2) -+{ -+ register u64 x0 asm("x0") = function_id; -+ register u64 x1 asm("x1") = arg0; -+ register u64 x2 asm("x2") = arg1; -+ register u64 x3 asm("x3") = arg2; ++ if (mem->sgt) ++ dma_buf_unmap_attachment(attach, mem->sgt, ++ DMA_BIDIRECTIONAL); + -+ asm volatile( -+ __asmeq("%0", "x0") -+ __asmeq("%1", "x1") -+ __asmeq("%2", "x2") -+ __asmeq("%3", "x3") -+ "smc #0\n" -+ : "+r" (x0) -+ : "r" (x1), "r" (x2), "r" (x3)); ++ dma_buf = attach->dmabuf; ++ dma_buf_detach(attach->dmabuf, attach); ++ dma_buf_put(dma_buf); + -+ return x0; -+} ++ } ++#endif ++ ump_random_mapping_remove_internal(device.secure_id_map, mem->secure_id); + -+u64 kbase_invoke_smc_fid(u32 fid, u64 arg0, u64 arg1, u64 arg2) -+{ -+ /* Is fast call (bit 31 set) */ -+ KBASE_DEBUG_ASSERT(fid & ~SMC_FAST_CALL); -+ /* bits 16-23 must be zero for fast calls */ -+ KBASE_DEBUG_ASSERT((fid & (0xFF << 16)) == 0); ++ mem->release_func(mem->ctx, mem); ++ _mali_osk_free(mem); ++ } + -+ return invoke_smc_fid(fid, arg0, arg1, arg2); ++ _mali_osk_mutex_rw_signal(device.secure_id_map->lock, _MALI_OSK_LOCKMODE_RW); +} + -+u64 kbase_invoke_smc(u32 oen, u16 function_number, bool smc64, -+ u64 arg0, u64 arg1, u64 arg2) ++ump_dd_mem *ump_random_mapping_remove(ump_random_mapping *map, int descriptor) +{ -+ u32 fid = 0; -+ -+ /* Only the six bits allowed should be used. */ -+ KBASE_DEBUG_ASSERT((oen & ~SMC_OEN_MASK) == 0); ++ ump_dd_mem *mem; + -+ fid |= SMC_FAST_CALL; /* Bit 31: Fast call */ -+ if (smc64) -+ fid |= SMC_64; /* Bit 30: 1=SMC64, 0=SMC32 */ -+ fid |= oen; /* Bit 29:24: OEN */ -+ /* Bit 23:16: Must be zero for fast calls */ -+ fid |= (function_number); /* Bit 15:0: function number */ ++ _mali_osk_mutex_rw_wait(map->lock, _MALI_OSK_LOCKMODE_RW); ++ mem = ump_random_mapping_remove_internal(map, descriptor); ++ _mali_osk_mutex_rw_signal(map->lock, _MALI_OSK_LOCKMODE_RW); + -+ return kbase_invoke_smc_fid(fid, arg0, arg1, arg2); ++ return mem; +} -+ -+#endif /* CONFIG_ARM64 */ -+ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_smc.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_smc.h +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h new file mode 100755 -index 000000000000..9bff3d2e8b4d +index 000000000..2cea6cedc --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_smc.h -@@ -0,0 +1,67 @@ ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h +@@ -0,0 +1,84 @@ +/* -+ * -+ * (C) COPYRIGHT 2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++/** ++ * @file ump_kernel_random_mapping.h ++ */ + ++#ifndef __UMP_KERNEL_RANDOM_MAPPING_H__ ++#define __UMP_KERNEL_RANDOM_MAPPING_H__ + ++#include "mali_osk.h" ++#include + ++#define UMP_RANDOM_MAP_DELAY 1 ++#define UMP_FAILED_LOOKUP_DELAY 10 /* ms */ ++#define UMP_FAILED_LOOKUPS_ALLOWED 10 /* number of allowed failed lookups */ + -+#ifndef _KBASE_SMC_H_ -+#define _KBASE_SMC_H_ -+ -+#ifdef CONFIG_ARM64 -+ -+#include -+ -+#define SMC_FAST_CALL (1 << 31) -+#define SMC_64 (1 << 30) ++/** ++ * The random mapping object ++ * Provides a separate namespace where we can map an integer to a pointer ++ */ ++typedef struct ump_random_mapping { ++ _mali_osk_mutex_rw_t *lock; /**< Lock protecting access to the mapping object */ ++ struct rb_root root; ++#if UMP_RANDOM_MAP_DELAY ++ struct { ++ unsigned long count; ++ unsigned long timestamp; ++ } failed; ++#endif ++} ump_random_mapping; + -+#define SMC_OEN_OFFSET 24 -+#define SMC_OEN_MASK (0x3F << SMC_OEN_OFFSET) /* 6 bits */ -+#define SMC_OEN_SIP (2 << SMC_OEN_OFFSET) -+#define SMC_OEN_STD (4 << SMC_OEN_OFFSET) ++/** ++ * Create a random mapping object ++ * Create a random mapping capable of holding 2^20 entries ++ * @return Pointer to a random mapping object, NULL on failure ++ */ ++ump_random_mapping *ump_random_mapping_create(void); + ++/** ++ * Destroy a random mapping object ++ * @param map The map to free ++ */ ++void ump_random_mapping_destroy(ump_random_mapping *map); + +/** -+ * kbase_invoke_smc_fid - Perform a secure monitor call -+ * @fid: The SMC function to call, see SMC Calling convention. -+ * @arg0: First argument to the SMC. -+ * @arg1: Second argument to the SMC. -+ * @arg2: Third argument to the SMC. -+ * -+ * See SMC Calling Convention for details. -+ * -+ * Return: the return value from the SMC. -+ */ -+u64 kbase_invoke_smc_fid(u32 fid, u64 arg0, u64 arg1, u64 arg2); ++ * Allocate a new mapping entry (random ID) ++ * Allocates a new entry in the map. ++ * @param map The map to allocate a new entry in ++ * @param target The value to map to ++ * @return The random allocated, a negative value on error ++ */ ++int ump_random_mapping_insert(ump_random_mapping *map, ump_dd_mem *mem); + +/** -+ * kbase_invoke_smc_fid - Perform a secure monitor call -+ * @oen: Owning Entity number (SIP, STD etc). -+ * @function_number: The function number within the OEN. -+ * @smc64: use SMC64 calling convention instead of SMC32. -+ * @arg0: First argument to the SMC. -+ * @arg1: Second argument to the SMC. -+ * @arg2: Third argument to the SMC. -+ * -+ * See SMC Calling Convention for details. -+ * -+ * Return: the return value from the SMC call. -+ */ -+u64 kbase_invoke_smc(u32 oen, u16 function_number, bool smc64, -+ u64 arg0, u64 arg1, u64 arg2); ++ * Get the value mapped to by a random ID ++ * ++ * If the lookup fails, punish the calling thread by applying a delay. ++ * ++ * @param map The map to lookup the random id in ++ * @param id The ID to lookup ++ * @param target Pointer to a pointer which will receive the stored value ++ * @return ump_dd_mem pointer on successful lookup, NULL on error ++ */ ++ump_dd_mem *ump_random_mapping_get(ump_random_mapping *map, int id); + -+#endif /* CONFIG_ARM64 */ ++void ump_random_mapping_put(ump_dd_mem *mem); + -+#endif /* _KBASE_SMC_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_softjobs.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_softjobs.c ++/** ++ * Free the random ID ++ * For the random to be reused it has to be freed ++ * @param map The map to free the random from ++ * @param id The ID to free ++ */ ++ump_dd_mem *ump_random_mapping_remove(ump_random_mapping *map, int id); ++ ++#endif /* __UMP_KERNEL_RANDOM_MAPPING_H__ */ +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c b/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c new file mode 100755 -index 000000000000..c24b94e0d6eb +index 000000000..e41931e1e --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_softjobs.c -@@ -0,0 +1,1513 @@ ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c +@@ -0,0 +1,65 @@ +/* -+ * -+ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include /* kernel module definitions */ ++#include /* request_mem_region */ + ++#include "arch/config.h" /* Configuration for current platform. The symlink for arch is set by Makefile */ + ++#include "ump_osk.h" ++#include "ump_kernel_common.h" ++#include "ump_kernel_memory_backend_os.h" ++#include "ump_kernel_memory_backend_dedicated.h" + ++/* Configure which dynamic memory allocator to use */ ++int ump_backend = ARCH_UMP_BACKEND_DEFAULT; ++module_param(ump_backend, int, S_IRUGO); /* r--r--r-- */ ++MODULE_PARM_DESC(ump_backend, "0 = dedicated memory backend (default), 1 = OS memory backend"); + -+#include -+ -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+#include -+#include -+#endif /* defined(CONFIG_DMA_SHARED_BUFFER) */ -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++/* The base address of the memory block for the dedicated memory backend */ ++unsigned int ump_memory_address = ARCH_UMP_MEMORY_ADDRESS_DEFAULT; ++module_param(ump_memory_address, uint, S_IRUGO); /* r--r--r-- */ ++MODULE_PARM_DESC(ump_memory_address, "The physical address to map for the dedicated memory backend"); + -+/** -+ * @file mali_kbase_softjobs.c -+ * -+ * This file implements the logic behind software only jobs that are -+ * executed within the driver rather than being handed over to the GPU. -+ */ ++/* The size of the memory block for the dedicated memory backend */ ++unsigned int ump_memory_size = ARCH_UMP_MEMORY_SIZE_DEFAULT; ++module_param(ump_memory_size, uint, S_IRUGO); /* r--r--r-- */ ++MODULE_PARM_DESC(ump_memory_size, "The size of fixed memory to map in the dedicated memory backend"); + -+static void kbasep_add_waiting_soft_job(struct kbase_jd_atom *katom) ++ump_memory_backend *ump_memory_backend_create(void) +{ -+ struct kbase_context *kctx = katom->kctx; -+ unsigned long lflags; ++ ump_memory_backend *backend = NULL; + -+ spin_lock_irqsave(&kctx->waiting_soft_jobs_lock, lflags); -+ list_add_tail(&katom->queue, &kctx->waiting_soft_jobs); -+ spin_unlock_irqrestore(&kctx->waiting_soft_jobs_lock, lflags); -+} ++ /* Create the dynamic memory allocator backend */ ++ if (0 == ump_backend) { ++ DBG_MSG(2, ("Using dedicated memory backend\n")); + -+void kbasep_remove_waiting_soft_job(struct kbase_jd_atom *katom) -+{ -+ struct kbase_context *kctx = katom->kctx; -+ unsigned long lflags; ++ DBG_MSG(2, ("Requesting dedicated memory: 0x%08x, size: %u\n", ump_memory_address, ump_memory_size)); ++ /* Ask the OS if we can use the specified physical memory */ ++ if (NULL == request_mem_region(ump_memory_address, ump_memory_size, "UMP Memory")) { ++ MSG_ERR(("Failed to request memory region (0x%08X - 0x%08X). Is Mali DD already loaded?\n", ump_memory_address, ump_memory_address + ump_memory_size - 1)); ++ return NULL; ++ } ++ backend = ump_block_allocator_create(ump_memory_address, ump_memory_size); ++ } else if (1 == ump_backend) { ++ DBG_MSG(2, ("Using OS memory backend, allocation limit: %d\n", ump_memory_size)); ++ backend = ump_os_memory_backend_create(ump_memory_size); ++ } + -+ spin_lock_irqsave(&kctx->waiting_soft_jobs_lock, lflags); -+ list_del(&katom->queue); -+ spin_unlock_irqrestore(&kctx->waiting_soft_jobs_lock, lflags); ++ return backend; +} + -+static void kbasep_add_waiting_with_timeout(struct kbase_jd_atom *katom) ++void ump_memory_backend_destroy(void) +{ -+ struct kbase_context *kctx = katom->kctx; ++ if (0 == ump_backend) { ++ DBG_MSG(2, ("Releasing dedicated memory: 0x%08x\n", ump_memory_address)); ++ release_mem_region(ump_memory_address, ump_memory_size); ++ } ++} +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c +new file mode 100755 +index 000000000..2b634ba79 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c +@@ -0,0 +1,27 @@ ++/* ++ * Copyright (C) 2010, 2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ /* Record the start time of this atom so we could cancel it at -+ * the right time. -+ */ -+ katom->start_timestamp = ktime_get(); ++/** ++ * @file ump_osk_atomics.c ++ * Implementation of the OS abstraction layer for the UMP kernel device driver ++ */ + -+ /* Add the atom to the waiting list before the timer is -+ * (re)started to make sure that it gets processed. -+ */ -+ kbasep_add_waiting_soft_job(katom); ++#include "ump_osk.h" ++#include + -+ /* Schedule timeout of this atom after a period if it is not active */ -+ if (!timer_pending(&kctx->soft_job_timeout)) { -+ int timeout_ms = atomic_read( -+ &kctx->kbdev->js_data.soft_job_timeout_ms); -+ mod_timer(&kctx->soft_job_timeout, -+ jiffies + msecs_to_jiffies(timeout_ms)); -+ } ++int _ump_osk_atomic_dec_and_read(_mali_osk_atomic_t *atom) ++{ ++ return atomic_dec_return((atomic_t *)&atom->u.val); +} + -+static int kbasep_read_soft_event_status( -+ struct kbase_context *kctx, u64 evt, unsigned char *status) ++int _ump_osk_atomic_inc_and_read(_mali_osk_atomic_t *atom) +{ -+ unsigned char *mapped_evt; -+ struct kbase_vmap_struct map; -+ -+ mapped_evt = kbase_vmap(kctx, evt, sizeof(*mapped_evt), &map); -+ if (!mapped_evt) -+ return -EFAULT; ++ return atomic_inc_return((atomic_t *)&atom->u.val); ++} +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c +new file mode 100755 +index 000000000..e08bf2525 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c +@@ -0,0 +1,314 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ *status = *mapped_evt; ++/** ++ * @file ump_osk_memory.c ++ * Implementation of the OS abstraction layer for the kernel device driver ++ */ + -+ kbase_vunmap(kctx, &map); ++/* needed to detect kernel version specific code */ ++#include + -+ return 0; -+} ++#include "ump_osk.h" ++#include "ump_uk_types.h" ++#include "ump_ukk.h" ++#include "ump_kernel_common.h" ++#include /* kernel module definitions */ ++#include ++#include ++#include + -+static int kbasep_write_soft_event_status( -+ struct kbase_context *kctx, u64 evt, unsigned char new_status) -+{ -+ unsigned char *mapped_evt; -+ struct kbase_vmap_struct map; ++#include ++#include /* to verify pointers from user space */ ++#include ++#include + -+ if ((new_status != BASE_JD_SOFT_EVENT_SET) && -+ (new_status != BASE_JD_SOFT_EVENT_RESET)) -+ return -EINVAL; ++typedef struct ump_vma_usage_tracker { ++ atomic_t references; ++ ump_memory_allocation *descriptor; ++} ump_vma_usage_tracker; + -+ mapped_evt = kbase_vmap(kctx, evt, sizeof(*mapped_evt), &map); -+ if (!mapped_evt) -+ return -EFAULT; ++static void ump_vma_open(struct vm_area_struct *vma); ++static void ump_vma_close(struct vm_area_struct *vma); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++static int ump_cpu_page_fault_handler(struct vm_area_struct *vma, struct vm_fault *vmf); ++#else ++static unsigned long ump_cpu_page_fault_handler(struct vm_area_struct *vma, unsigned long address); ++#endif + -+ *mapped_evt = new_status; ++static struct vm_operations_struct ump_vm_ops = { ++ .open = ump_vma_open, ++ .close = ump_vma_close, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++ .fault = ump_cpu_page_fault_handler ++#else ++ .nopfn = ump_cpu_page_fault_handler ++#endif ++}; + -+ kbase_vunmap(kctx, &map); ++/* ++ * Page fault for VMA region ++ * This should never happen since we always map in the entire virtual memory range. ++ */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++static int ump_cpu_page_fault_handler(struct vm_area_struct *vma, struct vm_fault *vmf) ++#else ++static unsigned long ump_cpu_page_fault_handler(struct vm_area_struct *vma, unsigned long address) ++#endif ++{ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++ void __user *address; ++ address = vmf->virtual_address; ++#endif ++ MSG_ERR(("Page-fault in UMP memory region caused by the CPU\n")); ++ MSG_ERR(("VMA: 0x%08lx, virtual address: 0x%08lx\n", (unsigned long)vma, address)); + -+ return 0; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++ return VM_FAULT_SIGBUS; ++#else ++ return NOPFN_SIGBUS; ++#endif +} + -+static int kbase_dump_cpu_gpu_time(struct kbase_jd_atom *katom) ++static void ump_vma_open(struct vm_area_struct *vma) +{ -+ struct kbase_vmap_struct map; -+ void *user_result; -+ struct timespec ts; -+ struct base_dump_cpu_gpu_counters data; -+ u64 system_time; -+ u64 cycle_counter; -+ u64 jc = katom->jc; -+ struct kbase_context *kctx = katom->kctx; -+ int pm_active_err; -+ -+ memset(&data, 0, sizeof(data)); ++ ump_vma_usage_tracker *vma_usage_tracker; ++ int new_val; + -+ /* Take the PM active reference as late as possible - otherwise, it could -+ * delay suspend until we process the atom (which may be at the end of a -+ * long chain of dependencies */ -+ pm_active_err = kbase_pm_context_active_handle_suspend(kctx->kbdev, KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE); -+ if (pm_active_err) { -+ struct kbasep_js_device_data *js_devdata = &kctx->kbdev->js_data; ++ vma_usage_tracker = (ump_vma_usage_tracker *)vma->vm_private_data; ++ BUG_ON(NULL == vma_usage_tracker); + -+ /* We're suspended - queue this on the list of suspended jobs -+ * Use dep_item[1], because dep_item[0] was previously in use -+ * for 'waiting_soft_jobs'. -+ */ -+ mutex_lock(&js_devdata->runpool_mutex); -+ list_add_tail(&katom->dep_item[1], &js_devdata->suspended_soft_jobs_list); -+ mutex_unlock(&js_devdata->runpool_mutex); ++ new_val = atomic_inc_return(&vma_usage_tracker->references); + -+ /* Also adding this to the list of waiting soft job */ -+ kbasep_add_waiting_soft_job(katom); ++ DBG_MSG(4, ("VMA open, VMA reference count incremented. VMA: 0x%08lx, reference count: %d\n", (unsigned long)vma, new_val)); ++} + -+ return pm_active_err; -+ } ++static void ump_vma_close(struct vm_area_struct *vma) ++{ ++ ump_vma_usage_tracker *vma_usage_tracker; ++ _ump_uk_unmap_mem_s args; ++ int new_val; + -+ kbase_backend_get_gpu_time(kctx->kbdev, &cycle_counter, &system_time, -+ &ts); ++ vma_usage_tracker = (ump_vma_usage_tracker *)vma->vm_private_data; ++ BUG_ON(NULL == vma_usage_tracker); + -+ kbase_pm_context_idle(kctx->kbdev); ++ new_val = atomic_dec_return(&vma_usage_tracker->references); + -+ data.sec = ts.tv_sec; -+ data.usec = ts.tv_nsec / 1000; -+ data.system_time = system_time; -+ data.cycle_counter = cycle_counter; ++ DBG_MSG(4, ("VMA close, VMA reference count decremented. VMA: 0x%08lx, reference count: %d\n", (unsigned long)vma, new_val)); + -+ /* Assume this atom will be cancelled until we know otherwise */ -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ if (0 == new_val) { ++ ump_memory_allocation *descriptor; + -+ /* GPU_WR access is checked on the range for returning the result to -+ * userspace for the following reasons: -+ * - security, this is currently how imported user bufs are checked. -+ * - userspace ddk guaranteed to assume region was mapped as GPU_WR */ -+ user_result = kbase_vmap_prot(kctx, jc, sizeof(data), KBASE_REG_GPU_WR, &map); -+ if (!user_result) -+ return 0; ++ descriptor = vma_usage_tracker->descriptor; + -+ memcpy(user_result, &data, sizeof(data)); ++ args.ctx = descriptor->ump_session; ++ args.cookie = descriptor->cookie; ++ args.mapping = descriptor->mapping; ++ args.size = descriptor->size; + -+ kbase_vunmap(kctx, &map); ++ args._ukk_private = NULL; /** @note unused */ + -+ /* Atom was fine - mark it as done */ -+ katom->event_code = BASE_JD_EVENT_DONE; ++ DBG_MSG(4, ("No more VMA references left, releasing UMP memory\n")); ++ _ump_ukk_unmap_mem(& args); + -+ return 0; ++ /* vma_usage_tracker is free()d by _ump_osk_mem_mapregion_term() */ ++ } +} + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+/* Called by the explicit fence mechanism when a fence wait has completed */ -+void kbase_soft_event_wait_callback(struct kbase_jd_atom *katom) ++_mali_osk_errcode_t _ump_osk_mem_mapregion_init(ump_memory_allocation *descriptor) +{ -+ struct kbase_context *kctx = katom->kctx; ++ ump_vma_usage_tracker *vma_usage_tracker; ++ struct vm_area_struct *vma; + -+ mutex_lock(&kctx->jctx.lock); -+ kbasep_remove_waiting_soft_job(katom); -+ kbase_finish_soft_job(katom); -+ if (jd_done_nolock(katom, NULL)) -+ kbase_js_sched_all(kctx->kbdev); -+ mutex_unlock(&kctx->jctx.lock); -+} -+#endif ++ if (NULL == descriptor) return _MALI_OSK_ERR_FAULT; + -+static void kbasep_soft_event_complete_job(struct work_struct *work) -+{ -+ struct kbase_jd_atom *katom = container_of(work, struct kbase_jd_atom, -+ work); -+ struct kbase_context *kctx = katom->kctx; -+ int resched; ++ vma_usage_tracker = kmalloc(sizeof(ump_vma_usage_tracker), GFP_KERNEL); ++ if (NULL == vma_usage_tracker) { ++ DBG_MSG(1, ("Failed to allocate memory for ump_vma_usage_tracker in _mali_osk_mem_mapregion_init\n")); ++ return -_MALI_OSK_ERR_FAULT; ++ } + -+ mutex_lock(&kctx->jctx.lock); -+ resched = jd_done_nolock(katom, NULL); -+ mutex_unlock(&kctx->jctx.lock); ++ vma = (struct vm_area_struct *)descriptor->process_mapping_info; ++ if (NULL == vma) { ++ kfree(vma_usage_tracker); ++ return _MALI_OSK_ERR_FAULT; ++ } + -+ if (resched) -+ kbase_js_sched_all(kctx->kbdev); -+} ++ vma->vm_private_data = vma_usage_tracker; ++ vma->vm_flags |= VM_IO; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) ++ vma->vm_flags |= VM_RESERVED; ++#else ++ vma->vm_flags |= VM_DONTDUMP; ++ vma->vm_flags |= VM_DONTEXPAND; ++ vma->vm_flags |= VM_PFNMAP; ++#endif + -+void kbasep_complete_triggered_soft_events(struct kbase_context *kctx, u64 evt) -+{ -+ int cancel_timer = 1; -+ struct list_head *entry, *tmp; -+ unsigned long lflags; + -+ spin_lock_irqsave(&kctx->waiting_soft_jobs_lock, lflags); -+ list_for_each_safe(entry, tmp, &kctx->waiting_soft_jobs) { -+ struct kbase_jd_atom *katom = list_entry( -+ entry, struct kbase_jd_atom, queue); ++ if (0 == descriptor->is_cached) { ++ vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); ++ } ++ DBG_MSG(3, ("Mapping with page_prot: 0x%x\n", vma->vm_page_prot)); + -+ switch (katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { -+ case BASE_JD_REQ_SOFT_EVENT_WAIT: -+ if (katom->jc == evt) { -+ list_del(&katom->queue); ++ /* Setup the functions which handle further VMA handling */ ++ vma->vm_ops = &ump_vm_ops; + -+ katom->event_code = BASE_JD_EVENT_DONE; -+ INIT_WORK(&katom->work, -+ kbasep_soft_event_complete_job); -+ queue_work(kctx->jctx.job_done_wq, -+ &katom->work); -+ } else { -+ /* There are still other waiting jobs, we cannot -+ * cancel the timer yet. -+ */ -+ cancel_timer = 0; -+ } -+ break; -+#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG -+ case BASE_JD_REQ_SOFT_FENCE_WAIT: -+ /* Keep the timer running if fence debug is enabled and -+ * there are waiting fence jobs. -+ */ -+ cancel_timer = 0; -+ break; -+#endif -+ } -+ } ++ /* Do the va range allocation - in this case, it was done earlier, so we copy in that information */ ++ descriptor->mapping = (void __user *)vma->vm_start; + -+ if (cancel_timer) -+ del_timer(&kctx->soft_job_timeout); -+ spin_unlock_irqrestore(&kctx->waiting_soft_jobs_lock, lflags); ++ atomic_set(&vma_usage_tracker->references, 1); /*this can later be increased if process is forked, see ump_vma_open() */ ++ vma_usage_tracker->descriptor = descriptor; ++ ++ return _MALI_OSK_ERR_OK; +} + -+#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG -+static void kbase_fence_debug_check_atom(struct kbase_jd_atom *katom) ++void _ump_osk_mem_mapregion_term(ump_memory_allocation *descriptor) +{ -+ struct kbase_context *kctx = katom->kctx; -+ struct device *dev = kctx->kbdev->dev; -+ int i; -+ -+ for (i = 0; i < 2; i++) { -+ struct kbase_jd_atom *dep; ++ struct vm_area_struct *vma; ++ ump_vma_usage_tracker *vma_usage_tracker; + -+ list_for_each_entry(dep, &katom->dep_head[i], dep_item[i]) { -+ if (dep->status == KBASE_JD_ATOM_STATE_UNUSED || -+ dep->status == KBASE_JD_ATOM_STATE_COMPLETED) -+ continue; ++ if (NULL == descriptor) return; + -+ if ((dep->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) -+ == BASE_JD_REQ_SOFT_FENCE_TRIGGER) { -+ /* Found blocked trigger fence. */ -+ struct kbase_sync_fence_info info; ++ /* Linux does the right thing as part of munmap to remove the mapping ++ * All that remains is that we remove the vma_usage_tracker setup in init() */ ++ vma = (struct vm_area_struct *)descriptor->process_mapping_info; + -+ if (!kbase_sync_fence_in_info_get(dep, &info)) { -+ dev_warn(dev, -+ "\tVictim trigger atom %d fence [%p] %s: %s\n", -+ kbase_jd_atom_id(kctx, dep), -+ info.fence, -+ info.name, -+ kbase_sync_status_string(info.status)); -+ } -+ } ++ vma_usage_tracker = vma->vm_private_data; + -+ kbase_fence_debug_check_atom(dep); -+ } -+ } ++ /* We only get called if mem_mapregion_init succeeded */ ++ kfree(vma_usage_tracker); ++ return; +} + -+static void kbase_fence_debug_wait_timeout(struct kbase_jd_atom *katom) ++_mali_osk_errcode_t _ump_osk_mem_mapregion_map(ump_memory_allocation *descriptor, u32 offset, u32 *phys_addr, unsigned long size) +{ -+ struct kbase_context *kctx = katom->kctx; -+ struct device *dev = katom->kctx->kbdev->dev; -+ int timeout_ms = atomic_read(&kctx->kbdev->js_data.soft_job_timeout_ms); -+ unsigned long lflags; -+ struct kbase_sync_fence_info info; ++ struct vm_area_struct *vma; ++ _mali_osk_errcode_t retval; + -+ spin_lock_irqsave(&kctx->waiting_soft_jobs_lock, lflags); ++ if (NULL == descriptor) return _MALI_OSK_ERR_FAULT; + -+ if (kbase_sync_fence_in_info_get(katom, &info)) { -+ /* Fence must have signaled just after timeout. */ -+ spin_unlock_irqrestore(&kctx->waiting_soft_jobs_lock, lflags); -+ return; -+ } ++ vma = (struct vm_area_struct *)descriptor->process_mapping_info; + -+ dev_warn(dev, "ctx %d_%d: Atom %d still waiting for fence [%p] after %dms\n", -+ kctx->tgid, kctx->id, -+ kbase_jd_atom_id(kctx, katom), -+ info.fence, timeout_ms); -+ dev_warn(dev, "\tGuilty fence [%p] %s: %s\n", -+ info.fence, info.name, -+ kbase_sync_status_string(info.status)); ++ if (NULL == vma) return _MALI_OSK_ERR_FAULT; + -+ /* Search for blocked trigger atoms */ -+ kbase_fence_debug_check_atom(katom); ++ retval = remap_pfn_range(vma, ((u32)descriptor->mapping) + offset, (*phys_addr) >> PAGE_SHIFT, size, vma->vm_page_prot) ? _MALI_OSK_ERR_FAULT : _MALI_OSK_ERR_OK;; + -+ spin_unlock_irqrestore(&kctx->waiting_soft_jobs_lock, lflags); ++ DBG_MSG(4, ("Mapping virtual to physical memory. ID: %u, vma: 0x%08lx, virtual addr:0x%08lx, physical addr: 0x%08lx, size:%lu, prot:0x%x, vm_flags:0x%x RETVAL: 0x%x\n", ++ ump_dd_secure_id_get(descriptor->handle), ++ (unsigned long)vma, ++ (unsigned long)(vma->vm_start + offset), ++ (unsigned long)*phys_addr, ++ size, ++ (unsigned int)vma->vm_page_prot, vma->vm_flags, retval)); + -+ kbase_sync_fence_in_dump(katom); ++ return retval; +} + -+struct kbase_fence_debug_work { -+ struct kbase_jd_atom *katom; -+ struct work_struct work; -+}; -+ -+static void kbase_fence_debug_wait_timeout_worker(struct work_struct *work) ++static void level1_cache_flush_all(void) +{ -+ struct kbase_fence_debug_work *w = container_of(work, -+ struct kbase_fence_debug_work, work); -+ struct kbase_jd_atom *katom = w->katom; -+ struct kbase_context *kctx = katom->kctx; -+ -+ mutex_lock(&kctx->jctx.lock); -+ kbase_fence_debug_wait_timeout(katom); -+ mutex_unlock(&kctx->jctx.lock); -+ -+ kfree(w); ++ DBG_MSG(4, ("UMP[xx] Flushing complete L1 cache\n")); ++ __cpuc_flush_kern_all(); +} + -+static void kbase_fence_debug_timeout(struct kbase_jd_atom *katom) ++void _ump_osk_msync(ump_dd_mem *mem, void *virt, u32 offset, u32 size, ump_uk_msync_op op, ump_session_data *session_data) +{ -+ struct kbase_fence_debug_work *work; -+ struct kbase_context *kctx = katom->kctx; ++ int i; + -+ /* Enqueue fence debug worker. Use job_done_wq to get -+ * debug print ordered with job completion. -+ */ -+ work = kzalloc(sizeof(struct kbase_fence_debug_work), GFP_ATOMIC); -+ /* Ignore allocation failure. */ -+ if (work) { -+ work->katom = katom; -+ INIT_WORK(&work->work, kbase_fence_debug_wait_timeout_worker); -+ queue_work(kctx->jctx.job_done_wq, &work->work); ++ /* Flush L1 using virtual address, the entire range in one go. ++ * Only flush if user space process has a valid write mapping on given address. */ ++ if ((mem) && (virt != NULL) && (access_ok(virt, size))) { ++ __cpuc_flush_dcache_area(virt, size); ++ DBG_MSG(3, ("UMP[%02u] Flushing CPU L1 Cache. CPU address: %x, size: %x\n", mem->secure_id, virt, size)); ++ } else { ++ if (session_data) { ++ if (op == _UMP_UK_MSYNC_FLUSH_L1) { ++ DBG_MSG(4, ("UMP Pending L1 cache flushes: %d\n", session_data->has_pending_level1_cache_flush)); ++ session_data->has_pending_level1_cache_flush = 0; ++ level1_cache_flush_all(); ++ return; ++ } else { ++ if (session_data->cache_operations_ongoing) { ++ session_data->has_pending_level1_cache_flush++; ++ DBG_MSG(4, ("UMP[%02u] Defering the L1 flush. Nr pending:%d\n", mem->secure_id, session_data->has_pending_level1_cache_flush)); ++ } else { ++ /* Flushing the L1 cache for each switch_user() if ump_cache_operations_control(START) is not called */ ++ level1_cache_flush_all(); ++ } ++ } ++ } else { ++ DBG_MSG(4, ("Unkown state %s %d\n", __FUNCTION__, __LINE__)); ++ level1_cache_flush_all(); ++ } + } -+} -+#endif /* CONFIG_MALI_BIFROST_FENCE_DEBUG */ + -+void kbasep_soft_job_timeout_worker(struct timer_list *t) -+{ -+ struct kbase_context *kctx = from_timer(kctx, t, soft_job_timeout); -+ u32 timeout_ms = (u32)atomic_read( -+ &kctx->kbdev->js_data.soft_job_timeout_ms); -+ struct timer_list *timer = &kctx->soft_job_timeout; -+ ktime_t cur_time = ktime_get(); -+ bool restarting = false; -+ unsigned long lflags; -+ struct list_head *entry, *tmp; ++ if (NULL == mem) return; + -+ spin_lock_irqsave(&kctx->waiting_soft_jobs_lock, lflags); -+ list_for_each_safe(entry, tmp, &kctx->waiting_soft_jobs) { -+ struct kbase_jd_atom *katom = list_entry(entry, -+ struct kbase_jd_atom, queue); -+ s64 elapsed_time = ktime_to_ms(ktime_sub(cur_time, -+ katom->start_timestamp)); ++ if (mem->size_bytes == size) { ++ DBG_MSG(3, ("UMP[%02u] Flushing CPU L2 Cache\n", mem->secure_id)); ++ } else { ++ DBG_MSG(3, ("UMP[%02u] Flushing CPU L2 Cache. Blocks:%u, TotalSize:%u. FlushSize:%u Offset:0x%x FirstPaddr:0x%08x\n", ++ mem->secure_id, mem->nr_blocks, mem->size_bytes, size, offset, mem->block_array[0].addr)); ++ } + -+ if (elapsed_time < (s64)timeout_ms) { -+ restarting = true; ++ ++ /* Flush L2 using physical addresses, block for block. */ ++ for (i = 0 ; i < mem->nr_blocks; i++) { ++ u32 start_p, end_p; ++ ump_dd_physical_block *block; ++ block = &mem->block_array[i]; ++ ++ if (offset >= block->size) { ++ offset -= block->size; + continue; + } + -+ switch (katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { -+ case BASE_JD_REQ_SOFT_EVENT_WAIT: -+ /* Take it out of the list to ensure that it -+ * will be cancelled in all cases -+ */ -+ list_del(&katom->queue); ++ if (offset) { ++ start_p = (u32)block->addr + offset; ++ /* We'll zero the offset later, after using it to calculate end_p. */ ++ } else { ++ start_p = (u32)block->addr; ++ } + -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ INIT_WORK(&katom->work, kbasep_soft_event_complete_job); -+ queue_work(kctx->jctx.job_done_wq, &katom->work); ++ if (size < block->size - offset) { ++ end_p = start_p + size; ++ size = 0; ++ } else { ++ if (offset) { ++ end_p = start_p + (block->size - offset); ++ size -= block->size - offset; ++ offset = 0; ++ } else { ++ end_p = start_p + block->size; ++ size -= block->size; ++ } ++ } ++ ++ switch (op) { ++ case _UMP_UK_MSYNC_CLEAN: ++ outer_clean_range(start_p, end_p); + break; -+#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG -+ case BASE_JD_REQ_SOFT_FENCE_WAIT: -+ kbase_fence_debug_timeout(katom); ++ case _UMP_UK_MSYNC_CLEAN_AND_INVALIDATE: ++ outer_flush_range(start_p, end_p); ++ break; ++ case _UMP_UK_MSYNC_INVALIDATE: ++ outer_inv_range(start_p, end_p); ++ break; ++ default: ++ break; ++ } ++ ++ if (0 == size) { ++ /* Nothing left to flush. */ + break; -+#endif + } + } + -+ if (restarting) -+ mod_timer(timer, jiffies + msecs_to_jiffies(timeout_ms)); -+ spin_unlock_irqrestore(&kctx->waiting_soft_jobs_lock, lflags); ++ return; +} +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c +new file mode 100755 +index 000000000..58c9f1bf2 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c +@@ -0,0 +1,36 @@ ++/* ++ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+static int kbasep_soft_event_wait(struct kbase_jd_atom *katom) -+{ -+ struct kbase_context *kctx = katom->kctx; -+ unsigned char status; -+ -+ /* The status of this soft-job is stored in jc */ -+ if (kbasep_read_soft_event_status(kctx, katom->jc, &status)) { -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ return 0; -+ } ++/** ++ * @file ump_osk_misc.c ++ * Implementation of the OS abstraction layer for the UMP kernel device driver ++ */ + -+ if (status == BASE_JD_SOFT_EVENT_SET) -+ return 0; /* Event already set, nothing to do */ + -+ kbasep_add_waiting_with_timeout(katom); ++#include "ump_osk.h" + -+ return 1; -+} ++#include ++#include "ump_kernel_linux.h" + -+static void kbasep_soft_event_update_locked(struct kbase_jd_atom *katom, -+ unsigned char new_status) ++/* is called from ump_kernel_constructor in common code */ ++_mali_osk_errcode_t _ump_osk_init(void) +{ -+ /* Complete jobs waiting on the same event */ -+ struct kbase_context *kctx = katom->kctx; -+ -+ if (kbasep_write_soft_event_status(kctx, katom->jc, new_status) != 0) { -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ return; ++ if (0 != ump_kernel_device_initialize()) { ++ return _MALI_OSK_ERR_FAULT; + } + -+ if (new_status == BASE_JD_SOFT_EVENT_SET) -+ kbasep_complete_triggered_soft_events(kctx, katom->jc); ++ return _MALI_OSK_ERR_OK; +} + -+/** -+ * kbase_soft_event_update() - Update soft event state -+ * @kctx: Pointer to context -+ * @event: Event to update -+ * @new_status: New status value of event -+ * -+ * Update the event, and wake up any atoms waiting for the event. -+ * -+ * Return: 0 on success, a negative error code on failure. -+ */ -+int kbase_soft_event_update(struct kbase_context *kctx, -+ u64 event, -+ unsigned char new_status) ++_mali_osk_errcode_t _ump_osk_term(void) +{ -+ int err = 0; ++ ump_kernel_device_terminate(); ++ return _MALI_OSK_ERR_OK; ++} +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c +new file mode 100755 +index 000000000..56a787ff6 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c +@@ -0,0 +1,230 @@ ++/* ++ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ mutex_lock(&kctx->jctx.lock); ++/** ++ * @file ump_ukk_wrappers.c ++ * Defines the wrapper functions which turn Linux IOCTL calls into _ukk_ calls for the reference implementation ++ */ + -+ if (kbasep_write_soft_event_status(kctx, event, new_status)) { -+ err = -ENOENT; -+ goto out; -+ } + -+ if (new_status == BASE_JD_SOFT_EVENT_SET) -+ kbasep_complete_triggered_soft_events(kctx, event); ++#include /* user space access */ + -+out: -+ mutex_unlock(&kctx->jctx.lock); ++#include "ump_osk.h" ++#include "ump_uk_types.h" ++#include "ump_ukk.h" ++#include "ump_kernel_common.h" ++#include ++#include "ump_kernel_interface_ref_drv.h" ++#include "mali_osk_list.h" + -+ return err; -+} ++extern struct device *ump_global_mdev; + -+static void kbasep_soft_event_cancel_job(struct kbase_jd_atom *katom) ++/* ++ * IOCTL operation; Allocate UMP memory ++ */ ++int ump_allocate_wrapper(u32 __user *argument, struct ump_session_data *session_data) +{ -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ if (jd_done_nolock(katom, NULL)) -+ kbase_js_sched_all(katom->kctx->kbdev); -+} ++ _ump_uk_allocate_s user_interaction; ++ _mali_osk_errcode_t err; + -+struct kbase_debug_copy_buffer { -+ size_t size; -+ struct page **pages; -+ int nr_pages; -+ size_t offset; -+ struct kbase_mem_phy_alloc *gpu_alloc; ++ /* Sanity check input parameters */ ++ if (NULL == argument || NULL == session_data) { ++ MSG_ERR(("NULL parameter in ump_ioctl_allocate()\n")); ++ return -ENOTTY; ++ } + -+ struct page **extres_pages; -+ int nr_extres_pages; -+}; ++ /* Copy the user space memory to kernel space (so we safely can read it) */ ++ if (0 != copy_from_user(&user_interaction, argument, sizeof(user_interaction))) { ++ MSG_ERR(("copy_from_user() in ump_ioctl_allocate()\n")); ++ return -EFAULT; ++ } + -+static inline void free_user_buffer(struct kbase_debug_copy_buffer *buffer) -+{ -+ struct page **pages = buffer->extres_pages; -+ int nr_pages = buffer->nr_extres_pages; ++ user_interaction.ctx = (void *) session_data; + -+ if (pages) { -+ int i; ++ err = _ump_ukk_allocate(&user_interaction); ++ if (_MALI_OSK_ERR_OK != err) { ++ DBG_MSG(1, ("_ump_ukk_allocate() failed in ump_ioctl_allocate()\n")); ++ return ump_map_errcode(err); ++ } ++ user_interaction.ctx = NULL; + -+ for (i = 0; i < nr_pages; i++) { -+ struct page *pg = pages[i]; ++ if (0 != copy_to_user(argument, &user_interaction, sizeof(user_interaction))) { ++ /* If the copy fails then we should release the memory. We can use the IOCTL release to accomplish this */ ++ _ump_uk_release_s release_args; + -+ if (pg) -+ put_page(pg); ++ MSG_ERR(("copy_to_user() failed in ump_ioctl_allocate()\n")); ++ ++ release_args.ctx = (void *) session_data; ++ release_args.secure_id = user_interaction.secure_id; ++ ++ err = _ump_ukk_release(&release_args); ++ if (_MALI_OSK_ERR_OK != err) { ++ MSG_ERR(("_ump_ukk_release() also failed when trying to release newly allocated memory in ump_ioctl_allocate()\n")); + } -+ kfree(pages); ++ ++ return -EFAULT; + } ++ ++ return 0; /* success */ +} + -+static void kbase_debug_copy_finish(struct kbase_jd_atom *katom) ++#ifdef CONFIG_DMA_SHARED_BUFFER ++static ump_dd_handle get_ump_handle_from_dmabuf(struct ump_session_data *session_data, ++ struct dma_buf *dmabuf) +{ -+ struct kbase_debug_copy_buffer *buffers = -+ (struct kbase_debug_copy_buffer *)(uintptr_t)katom->jc; -+ unsigned int i; -+ unsigned int nr = katom->nr_extres; -+ -+ if (!buffers) -+ return; ++ ump_session_memory_list_element *session_mem, *tmp; ++ struct dma_buf_attachment *attach; ++ ump_dd_handle ump_handle; + -+ kbase_gpu_vm_lock(katom->kctx); -+ for (i = 0; i < nr; i++) { -+ int p; -+ struct kbase_mem_phy_alloc *gpu_alloc = buffers[i].gpu_alloc; ++ DEBUG_ASSERT_POINTER(session_data); + -+ if (!buffers[i].pages) -+ break; -+ for (p = 0; p < buffers[i].nr_pages; p++) { -+ struct page *pg = buffers[i].pages[p]; ++ _mali_osk_mutex_wait(session_data->lock); + -+ if (pg) -+ put_page(pg); -+ } -+ kfree(buffers[i].pages); -+ if (gpu_alloc) { -+ switch (gpu_alloc->type) { -+ case KBASE_MEM_TYPE_IMPORTED_USER_BUF: -+ { -+ free_user_buffer(&buffers[i]); -+ break; -+ } -+ default: -+ /* Nothing to be done. */ -+ break; ++ _MALI_OSK_LIST_FOREACHENTRY(session_mem, tmp, ++ &session_data->list_head_session_memory_list, ++ ump_session_memory_list_element, list) { ++ if (session_mem->mem->import_attach) { ++ attach = session_mem->mem->import_attach; ++ if (attach->dmabuf == dmabuf) { ++ _mali_osk_mutex_signal(session_data->lock); ++ ump_handle = (ump_dd_handle)session_mem->mem; ++ ump_random_mapping_get(device.secure_id_map, ump_dd_secure_id_get(ump_handle)); ++ return ump_handle; + } -+ kbase_mem_phy_alloc_put(gpu_alloc); + } + } -+ kbase_gpu_vm_unlock(katom->kctx); -+ kfree(buffers); + -+ katom->jc = 0; ++ _mali_osk_mutex_signal(session_data->lock); ++ ++ return NULL; +} + -+static int kbase_debug_copy_prepare(struct kbase_jd_atom *katom) ++int ump_dmabuf_import_wrapper(u32 __user *argument, ++ struct ump_session_data *session_data) +{ -+ struct kbase_debug_copy_buffer *buffers; -+ struct base_jd_debug_copy_buffer *user_buffers = NULL; -+ unsigned int i; -+ unsigned int nr = katom->nr_extres; ++ ump_session_memory_list_element *session = NULL; ++ _ump_uk_dmabuf_s ump_dmabuf; ++ ump_dd_handle ump_handle; ++ ump_dd_physical_block *blocks = NULL; ++ struct dma_buf_attachment *attach = NULL; ++ struct dma_buf *dma_buf; ++ struct sg_table *sgt = NULL; ++ struct scatterlist *sgl; ++ unsigned int i = 0; + int ret = 0; -+ void __user *user_structs = (void __user *)(uintptr_t)katom->jc; + -+ if (!user_structs) ++ /* Sanity check input parameters */ ++ if (!argument || !session_data) { ++ MSG_ERR(("NULL parameter.\n")); + return -EINVAL; -+ -+ buffers = kcalloc(nr, sizeof(*buffers), GFP_KERNEL); -+ if (!buffers) { -+ ret = -ENOMEM; -+ katom->jc = 0; -+ goto out_cleanup; + } -+ katom->jc = (u64)(uintptr_t)buffers; -+ -+ user_buffers = kmalloc_array(nr, sizeof(*user_buffers), GFP_KERNEL); + -+ if (!user_buffers) { -+ ret = -ENOMEM; -+ goto out_cleanup; ++ if (copy_from_user(&ump_dmabuf, argument, ++ sizeof(_ump_uk_dmabuf_s))) { ++ MSG_ERR(("copy_from_user() failed.\n")); ++ return -EFAULT; + } + -+ ret = copy_from_user(user_buffers, user_structs, -+ sizeof(*user_buffers)*nr); -+ if (ret) { -+ ret = -EFAULT; -+ goto out_cleanup; -+ } -+ -+ for (i = 0; i < nr; i++) { -+ u64 addr = user_buffers[i].address; -+ u64 page_addr = addr & PAGE_MASK; -+ u64 end_page_addr = addr + user_buffers[i].size - 1; -+ u64 last_page_addr = end_page_addr & PAGE_MASK; -+ int nr_pages = (last_page_addr-page_addr)/PAGE_SIZE+1; -+ int pinned_pages; -+ struct kbase_va_region *reg; -+ struct base_external_resource user_extres; -+ -+ if (!addr) -+ continue; ++ dma_buf = dma_buf_get(ump_dmabuf.fd); ++ if (IS_ERR(dma_buf)) ++ return PTR_ERR(dma_buf); + -+ buffers[i].nr_pages = nr_pages; -+ buffers[i].offset = addr & ~PAGE_MASK; -+ if (buffers[i].offset >= PAGE_SIZE) { -+ ret = -EINVAL; -+ goto out_cleanup; -+ } -+ buffers[i].size = user_buffers[i].size; ++ /* ++ * if already imported then increase a refcount to the ump descriptor ++ * and call dma_buf_put() and then go to found to return previous ++ * ump secure id. ++ */ ++ ump_handle = get_ump_handle_from_dmabuf(session_data, dma_buf); ++ if (ump_handle) { ++ dma_buf_put(dma_buf); ++ goto found; ++ } + -+ buffers[i].pages = kcalloc(nr_pages, sizeof(struct page *), -+ GFP_KERNEL); -+ if (!buffers[i].pages) { -+ ret = -ENOMEM; -+ goto out_cleanup; -+ } ++ attach = dma_buf_attach(dma_buf, ump_global_mdev); ++ if (IS_ERR(attach)) { ++ ret = PTR_ERR(attach); ++ goto err_dma_buf_put; ++ } + -+ pinned_pages = get_user_pages_fast(page_addr, -+ nr_pages, -+ 1, /* Write */ -+ buffers[i].pages); -+ if (pinned_pages < 0) { -+ ret = pinned_pages; -+ goto out_cleanup; -+ } -+ if (pinned_pages != nr_pages) { -+ ret = -EINVAL; -+ goto out_cleanup; -+ } ++ sgt = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL); ++ if (IS_ERR(sgt)) { ++ ret = PTR_ERR(sgt); ++ goto err_dma_buf_detach; ++ } + -+ user_extres = user_buffers[i].extres; -+ if (user_extres.ext_resource == 0ULL) { -+ ret = -EINVAL; -+ goto out_cleanup; -+ } ++ blocks = (ump_dd_physical_block *)_mali_osk_malloc(sizeof(ump_dd_physical_block) * sgt->nents); ++ if (!blocks) { ++ DBG_MSG(1, ("Failed to allocate blocks.\n")); ++ ret = -EFAULT; ++ goto err_dma_buf_unmap; ++ } ++ for_each_sg(sgt->sgl, sgl, sgt->nents, i) { ++ blocks[i].addr = sg_phys(sgl); ++ blocks[i].size = sg_dma_len(sgl); ++ } + -+ kbase_gpu_vm_lock(katom->kctx); -+ reg = kbase_region_tracker_find_region_enclosing_address( -+ katom->kctx, user_extres.ext_resource & -+ ~BASE_EXT_RES_ACCESS_EXCLUSIVE); ++ /* ++ * Initialize the session memory list element, and add it ++ * to the session object ++ */ ++ session = _mali_osk_calloc(1, sizeof(*session)); ++ if (!session) { ++ DBG_MSG(1, ("Failed to allocate session.\n")); ++ ret = -EFAULT; ++ goto err_free_block; ++ } + -+ if (NULL == reg || NULL == reg->gpu_alloc || -+ (reg->flags & KBASE_REG_FREE)) { -+ ret = -EINVAL; -+ goto out_unlock; -+ } ++ ump_handle = ump_dd_handle_create_from_phys_blocks(blocks, i); ++ if (UMP_DD_HANDLE_INVALID == ump_handle) { ++ DBG_MSG(1, ("Failed to create ump handle.\n")); ++ ret = -EFAULT; ++ goto err_free_session; ++ } + -+ buffers[i].gpu_alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); -+ buffers[i].nr_extres_pages = reg->nr_pages; ++ session->mem = (ump_dd_mem *)ump_handle; ++ session->mem->import_attach = attach; ++ session->mem->sgt = sgt; + -+ if (reg->nr_pages*PAGE_SIZE != buffers[i].size) -+ dev_warn(katom->kctx->kbdev->dev, "Copy buffer is not of same size as the external resource to copy.\n"); ++ _mali_osk_mutex_wait(session_data->lock); ++ _mali_osk_list_add(&(session->list), ++ &(session_data->list_head_session_memory_list)); ++ _mali_osk_mutex_signal(session_data->lock); + -+ switch (reg->gpu_alloc->type) { -+ case KBASE_MEM_TYPE_IMPORTED_USER_BUF: -+ { -+ struct kbase_mem_phy_alloc *alloc = reg->gpu_alloc; -+ unsigned long nr_pages = -+ alloc->imported.user_buf.nr_pages; ++ _mali_osk_free(blocks); + -+ if (alloc->imported.user_buf.mm != current->mm) { -+ ret = -EINVAL; -+ goto out_unlock; -+ } -+ buffers[i].extres_pages = kcalloc(nr_pages, -+ sizeof(struct page *), GFP_KERNEL); -+ if (!buffers[i].extres_pages) { -+ ret = -ENOMEM; -+ goto out_unlock; -+ } ++found: ++ ump_dmabuf.ctx = (void *)session_data; ++ ump_dmabuf.secure_id = ump_dd_secure_id_get(ump_handle); ++ ump_dmabuf.size = ump_dd_size_get(ump_handle); + -+ ret = get_user_pages_fast( -+ alloc->imported.user_buf.address, -+ nr_pages, 0, -+ buffers[i].extres_pages); -+ if (ret != nr_pages) -+ goto out_unlock; -+ ret = 0; -+ break; -+ } -+ case KBASE_MEM_TYPE_IMPORTED_UMP: -+ { -+ dev_warn(katom->kctx->kbdev->dev, -+ "UMP is not supported for debug_copy jobs\n"); -+ ret = -EINVAL; -+ goto out_unlock; -+ } -+ default: -+ /* Nothing to be done. */ -+ break; -+ } -+ kbase_gpu_vm_unlock(katom->kctx); ++ if (copy_to_user(argument, &ump_dmabuf, ++ sizeof(_ump_uk_dmabuf_s))) { ++ MSG_ERR(("copy_to_user() failed.\n")); ++ ret = -EFAULT; ++ goto err_release_ump_handle; + } -+ kfree(user_buffers); + + return ret; + -+out_unlock: -+ kbase_gpu_vm_unlock(katom->kctx); -+ -+out_cleanup: -+ /* Frees allocated memory for kbase_debug_copy_job struct, including -+ * members, and sets jc to 0 */ -+ kbase_debug_copy_finish(katom); -+ kfree(user_buffers); -+ ++err_release_ump_handle: ++ ump_dd_reference_release(ump_handle); ++err_free_session: ++ _mali_osk_free(session); ++err_free_block: ++ _mali_osk_free(blocks); ++err_dma_buf_unmap: ++ dma_buf_unmap_attachment(attach, sgt, DMA_BIDIRECTIONAL); ++err_dma_buf_detach: ++ dma_buf_detach(dma_buf, attach); ++err_dma_buf_put: ++ dma_buf_put(dma_buf); + return ret; +} ++#endif +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h +new file mode 100755 +index 000000000..61a7095a6 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h +@@ -0,0 +1,36 @@ ++/* ++ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+static void kbase_mem_copy_from_extres_page(struct kbase_context *kctx, -+ void *extres_page, struct page **pages, unsigned int nr_pages, -+ unsigned int *target_page_nr, size_t offset, size_t *to_copy) -+{ -+ void *target_page = kmap(pages[*target_page_nr]); -+ size_t chunk = PAGE_SIZE-offset; ++/** ++ * @file ump_ukk_wrappers.h ++ * Defines the wrapper functions which turn Linux IOCTL calls into _ukk_ calls for the reference implementation ++ */ + -+ lockdep_assert_held(&kctx->reg_lock); ++#ifndef __UMP_UKK_REF_WRAPPERS_H__ ++#define __UMP_UKK_REF_WRAPPERS_H__ + -+ if (!target_page) { -+ *target_page_nr += 1; -+ dev_warn(kctx->kbdev->dev, "kmap failed in debug_copy job."); -+ return; -+ } ++#include ++#include "ump_kernel_common.h" + -+ chunk = min(chunk, *to_copy); ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ memcpy(target_page + offset, extres_page, chunk); -+ *to_copy -= chunk; + -+ kunmap(pages[*target_page_nr]); ++int ump_allocate_wrapper(u32 __user *argument, struct ump_session_data *session_data); ++#ifdef CONFIG_DMA_SHARED_BUFFER ++int ump_dmabuf_import_wrapper(u32 __user *argument, struct ump_session_data *session_data); ++#endif + -+ *target_page_nr += 1; -+ if (*target_page_nr >= nr_pages) -+ return; ++#ifdef __cplusplus ++} ++#endif + -+ target_page = kmap(pages[*target_page_nr]); -+ if (!target_page) { -+ *target_page_nr += 1; -+ dev_warn(kctx->kbdev->dev, "kmap failed in debug_copy job."); -+ return; -+ } ++#endif /* __UMP_UKK_REF_WRAPPERS_H__ */ +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c +new file mode 100755 +index 000000000..4d6b69608 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c +@@ -0,0 +1,280 @@ ++/* ++ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ KBASE_DEBUG_ASSERT(target_page); ++/** ++ * @file ump_ukk_wrappers.c ++ * Defines the wrapper functions which turn Linux IOCTL calls into _ukk_ calls ++ */ + -+ chunk = min(offset, *to_copy); -+ memcpy(target_page, extres_page + PAGE_SIZE-offset, chunk); -+ *to_copy -= chunk; ++#include /* user space access */ + -+ kunmap(pages[*target_page_nr]); -+} ++#include "ump_osk.h" ++#include "ump_uk_types.h" ++#include "ump_ukk.h" ++#include "ump_kernel_common.h" + -+static int kbase_mem_copy_from_extres(struct kbase_context *kctx, -+ struct kbase_debug_copy_buffer *buf_data) ++/* ++ * IOCTL operation; Negotiate version of IOCTL API ++ */ ++int ump_get_api_version_wrapper(u32 __user *argument, struct ump_session_data *session_data) +{ -+ unsigned int i; -+ unsigned int target_page_nr = 0; -+ struct page **pages = buf_data->pages; -+ u64 offset = buf_data->offset; -+ size_t extres_size = buf_data->nr_extres_pages*PAGE_SIZE; -+ size_t to_copy = min(extres_size, buf_data->size); -+ size_t dma_to_copy; -+ struct kbase_mem_phy_alloc *gpu_alloc = buf_data->gpu_alloc; -+ int ret = 0; ++ _ump_uk_api_version_s version_info; ++ _mali_osk_errcode_t err; + -+ KBASE_DEBUG_ASSERT(pages != NULL); ++ /* Sanity check input parameters */ ++ if (NULL == argument || NULL == session_data) { ++ MSG_ERR(("NULL parameter in ump_ioctl_get_api_version()\n")); ++ return -ENOTTY; ++ } + -+ kbase_gpu_vm_lock(kctx); -+ if (!gpu_alloc) { -+ ret = -EINVAL; -+ goto out_unlock; ++ /* Copy the user space memory to kernel space (so we safely can read it) */ ++ if (0 != copy_from_user(&version_info, argument, sizeof(version_info))) { ++ MSG_ERR(("copy_from_user() in ump_ioctl_get_api_version()\n")); ++ return -EFAULT; + } + -+ switch (gpu_alloc->type) { -+ case KBASE_MEM_TYPE_IMPORTED_USER_BUF: -+ { -+ for (i = 0; i < buf_data->nr_extres_pages; i++) { -+ struct page *pg = buf_data->extres_pages[i]; -+ void *extres_page = kmap(pg); ++ version_info.ctx = (void *) session_data; ++ err = _ump_uku_get_api_version(&version_info); ++ if (_MALI_OSK_ERR_OK != err) { ++ MSG_ERR(("_ump_uku_get_api_version() failed in ump_ioctl_get_api_version()\n")); ++ return ump_map_errcode(err); ++ } + -+ if (extres_page) -+ kbase_mem_copy_from_extres_page(kctx, -+ extres_page, pages, -+ buf_data->nr_pages, -+ &target_page_nr, -+ offset, &to_copy); ++ version_info.ctx = NULL; + -+ kunmap(pg); -+ if (target_page_nr >= buf_data->nr_pages) -+ break; -+ } -+ break; ++ /* Copy ouput data back to user space */ ++ if (0 != copy_to_user(argument, &version_info, sizeof(version_info))) { ++ MSG_ERR(("copy_to_user() failed in ump_ioctl_get_api_version()\n")); ++ return -EFAULT; + } -+ break; -+#ifdef CONFIG_DMA_SHARED_BUFFER -+ case KBASE_MEM_TYPE_IMPORTED_UMM: { -+ struct dma_buf *dma_buf = gpu_alloc->imported.umm.dma_buf; -+ -+ KBASE_DEBUG_ASSERT(dma_buf != NULL); -+ if (dma_buf->size > buf_data->nr_extres_pages * PAGE_SIZE) -+ dev_warn(kctx->kbdev->dev, "External resources buffer size mismatch"); + -+ dma_to_copy = min(dma_buf->size, -+ (size_t)(buf_data->nr_extres_pages * PAGE_SIZE)); -+ ret = dma_buf_begin_cpu_access(dma_buf, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) && !defined(CONFIG_CHROMEOS) -+ 0, dma_to_copy, -+#endif -+ DMA_FROM_DEVICE); -+ if (ret) -+ goto out_unlock; ++ return 0; /* success */ ++} + -+ for (i = 0; i < dma_to_copy/PAGE_SIZE; i++) { + -+ void *extres_page = dma_buf_kmap(dma_buf, i); ++/* ++ * IOCTL operation; Release reference to specified UMP memory. ++ */ ++int ump_release_wrapper(u32 __user *argument, struct ump_session_data *session_data) ++{ ++ _ump_uk_release_s release_args; ++ _mali_osk_errcode_t err; + -+ if (extres_page) -+ kbase_mem_copy_from_extres_page(kctx, -+ extres_page, pages, -+ buf_data->nr_pages, -+ &target_page_nr, -+ offset, &to_copy); ++ /* Sanity check input parameters */ ++ if (NULL == session_data) { ++ MSG_ERR(("NULL parameter in ump_ioctl_release()\n")); ++ return -ENOTTY; ++ } + -+ dma_buf_kunmap(dma_buf, i, extres_page); -+ if (target_page_nr >= buf_data->nr_pages) -+ break; -+ } -+ dma_buf_end_cpu_access(dma_buf, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) && !defined(CONFIG_CHROMEOS) -+ 0, dma_to_copy, -+#endif -+ DMA_FROM_DEVICE); -+ break; ++ /* Copy the user space memory to kernel space (so we safely can read it) */ ++ if (0 != copy_from_user(&release_args, argument, sizeof(release_args))) { ++ MSG_ERR(("copy_from_user() in ump_ioctl_get_api_version()\n")); ++ return -EFAULT; + } -+#endif -+ default: -+ ret = -EINVAL; ++ ++ release_args.ctx = (void *) session_data; ++ err = _ump_ukk_release(&release_args); ++ if (_MALI_OSK_ERR_OK != err) { ++ MSG_ERR(("_ump_ukk_release() failed in ump_ioctl_release()\n")); ++ return ump_map_errcode(err); + } -+out_unlock: -+ kbase_gpu_vm_unlock(kctx); -+ return ret; + ++ ++ return 0; /* success */ +} + -+static int kbase_debug_copy(struct kbase_jd_atom *katom) ++/* ++ * IOCTL operation; Return size for specified UMP memory. ++ */ ++int ump_size_get_wrapper(u32 __user *argument, struct ump_session_data *session_data) +{ -+ struct kbase_debug_copy_buffer *buffers = -+ (struct kbase_debug_copy_buffer *)(uintptr_t)katom->jc; -+ unsigned int i; ++ _ump_uk_size_get_s user_interaction; ++ _mali_osk_errcode_t err; + -+ for (i = 0; i < katom->nr_extres; i++) { -+ int res = kbase_mem_copy_from_extres(katom->kctx, &buffers[i]); ++ /* Sanity check input parameters */ ++ if (NULL == argument || NULL == session_data) { ++ MSG_ERR(("NULL parameter in ump_ioctl_size_get()\n")); ++ return -ENOTTY; ++ } + -+ if (res) -+ return res; ++ if (0 != copy_from_user(&user_interaction, argument, sizeof(user_interaction))) { ++ MSG_ERR(("copy_from_user() in ump_ioctl_size_get()\n")); ++ return -EFAULT; + } + -+ return 0; ++ user_interaction.ctx = (void *) session_data; ++ err = _ump_ukk_size_get(&user_interaction); ++ if (_MALI_OSK_ERR_OK != err) { ++ MSG_ERR(("_ump_ukk_size_get() failed in ump_ioctl_size_get()\n")); ++ return ump_map_errcode(err); ++ } ++ ++ user_interaction.ctx = NULL; ++ ++ if (0 != copy_to_user(argument, &user_interaction, sizeof(user_interaction))) { ++ MSG_ERR(("copy_to_user() failed in ump_ioctl_size_get()\n")); ++ return -EFAULT; ++ } ++ ++ return 0; /* success */ +} + -+static int kbase_jit_allocate_prepare(struct kbase_jd_atom *katom) ++/* ++ * IOCTL operation; Do cache maintenance on specified UMP memory. ++ */ ++int ump_msync_wrapper(u32 __user *argument, struct ump_session_data *session_data) +{ -+ __user void *data = (__user void *)(uintptr_t) katom->jc; -+ struct base_jit_alloc_info *info; -+ struct kbase_context *kctx = katom->kctx; -+ int ret; ++ _ump_uk_msync_s user_interaction; + -+ /* Fail the job if there is no info structure */ -+ if (!data) { -+ ret = -EINVAL; -+ goto fail; ++ /* Sanity check input parameters */ ++ if (NULL == argument || NULL == session_data) { ++ MSG_ERR(("NULL parameter in ump_ioctl_size_get()\n")); ++ return -ENOTTY; + } + -+ /* Copy the information for safe access and future storage */ -+ info = kzalloc(sizeof(*info), GFP_KERNEL); -+ if (!info) { -+ ret = -ENOMEM; -+ goto fail; ++ if (0 != copy_from_user(&user_interaction, argument, sizeof(user_interaction))) { ++ MSG_ERR(("copy_from_user() in ump_ioctl_msync()\n")); ++ return -EFAULT; + } + -+ if (copy_from_user(info, data, sizeof(*info)) != 0) { -+ ret = -EINVAL; -+ goto free_info; -+ } ++ user_interaction.ctx = (void *) session_data; + -+ /* If the ID is zero then fail the job */ -+ if (info->id == 0) { -+ ret = -EINVAL; -+ goto free_info; ++ _ump_ukk_msync(&user_interaction); ++ ++ user_interaction.ctx = NULL; ++ ++ if (0 != copy_to_user(argument, &user_interaction, sizeof(user_interaction))) { ++ MSG_ERR(("copy_to_user() failed in ump_ioctl_msync()\n")); ++ return -EFAULT; + } + -+ /* Sanity check that the PA fits within the VA */ -+ if (info->va_pages < info->commit_pages) { -+ ret = -EINVAL; -+ goto free_info; ++ return 0; /* success */ ++} ++int ump_cache_operations_control_wrapper(u32 __user *argument, struct ump_session_data *session_data) ++{ ++ _ump_uk_cache_operations_control_s user_interaction; ++ ++ /* Sanity check input parameters */ ++ if (NULL == argument || NULL == session_data) { ++ MSG_ERR(("NULL parameter in ump_ioctl_size_get()\n")); ++ return -ENOTTY; + } + -+ /* Ensure the GPU address is correctly aligned */ -+ if ((info->gpu_alloc_addr & 0x7) != 0) { -+ ret = -EINVAL; -+ goto free_info; ++ if (0 != copy_from_user(&user_interaction, argument, sizeof(user_interaction))) { ++ MSG_ERR(("copy_from_user() in ump_ioctl_cache_operations_control()\n")); ++ return -EFAULT; + } + -+ /* Replace the user pointer with our kernel allocated info structure */ -+ katom->jc = (u64)(uintptr_t) info; -+ katom->jit_blocked = false; ++ user_interaction.ctx = (void *) session_data; + -+ lockdep_assert_held(&kctx->jctx.lock); -+ list_add_tail(&katom->jit_node, &kctx->jit_atoms_head); ++ _ump_ukk_cache_operations_control((_ump_uk_cache_operations_control_s *) &user_interaction); + -+ /* -+ * Note: -+ * The provided info->gpu_alloc_addr isn't validated here as -+ * userland can cache allocations which means that even -+ * though the region is valid it doesn't represent the -+ * same thing it used to. -+ * -+ * Complete validation of va_pages, commit_pages and extent -+ * isn't done here as it will be done during the call to -+ * kbase_mem_alloc. -+ */ -+ return 0; ++ user_interaction.ctx = NULL; + -+free_info: -+ kfree(info); -+fail: -+ katom->jc = 0; -+ return ret; ++#if 0 /* No data to copy back */ ++ if (0 != copy_to_user(argument, &user_interaction, sizeof(user_interaction))) { ++ MSG_ERR(("copy_to_user() failed in ump_ioctl_cache_operations_control()\n")); ++ return -EFAULT; ++ } ++#endif ++ return 0; /* success */ +} + -+static u8 kbase_jit_free_get_id(struct kbase_jd_atom *katom) ++int ump_switch_hw_usage_wrapper(u32 __user *argument, struct ump_session_data *session_data) +{ -+ if (WARN_ON(katom->core_req != BASE_JD_REQ_SOFT_JIT_FREE)) -+ return 0; -+ -+ return (u8) katom->jc; -+} ++ _ump_uk_switch_hw_usage_s user_interaction; + -+static int kbase_jit_allocate_process(struct kbase_jd_atom *katom) -+{ -+ struct kbase_context *kctx = katom->kctx; -+ struct base_jit_alloc_info *info; -+ struct kbase_va_region *reg; -+ struct kbase_vmap_struct mapping; -+ u64 *ptr, new_addr; ++ /* Sanity check input parameters */ ++ if (NULL == argument || NULL == session_data) { ++ MSG_ERR(("NULL parameter in ump_ioctl_size_get()\n")); ++ return -ENOTTY; ++ } + -+ if (katom->jit_blocked) { -+ list_del(&katom->queue); -+ katom->jit_blocked = false; ++ if (0 != copy_from_user(&user_interaction, argument, sizeof(user_interaction))) { ++ MSG_ERR(("copy_from_user() in ump_ioctl_switch_hw_usage()\n")); ++ return -EFAULT; + } + -+ info = (struct base_jit_alloc_info *) (uintptr_t) katom->jc; ++ user_interaction.ctx = (void *) session_data; + -+ /* The JIT ID is still in use so fail the allocation */ -+ if (kctx->jit_alloc[info->id]) { -+ katom->event_code = BASE_JD_EVENT_MEM_GROWTH_FAILED; -+ return 0; ++ _ump_ukk_switch_hw_usage(&user_interaction); ++ ++ user_interaction.ctx = NULL; ++ ++#if 0 /* No data to copy back */ ++ if (0 != copy_to_user(argument, &user_interaction, sizeof(user_interaction))) { ++ MSG_ERR(("copy_to_user() failed in ump_ioctl_switch_hw_usage()\n")); ++ return -EFAULT; + } ++#endif ++ return 0; /* success */ ++} + -+ /* Create a JIT allocation */ -+ reg = kbase_jit_allocate(kctx, info); -+ if (!reg) { -+ struct kbase_jd_atom *jit_atom; -+ bool can_block = false; ++int ump_lock_wrapper(u32 __user *argument, struct ump_session_data *session_data) ++{ ++ _ump_uk_lock_s user_interaction; + -+ lockdep_assert_held(&kctx->jctx.lock); ++ /* Sanity check input parameters */ ++ if (NULL == argument || NULL == session_data) { ++ MSG_ERR(("NULL parameter in ump_ioctl_size_get()\n")); ++ return -ENOTTY; ++ } + -+ jit_atom = list_first_entry(&kctx->jit_atoms_head, -+ struct kbase_jd_atom, jit_node); ++ if (0 != copy_from_user(&user_interaction, argument, sizeof(user_interaction))) { ++ MSG_ERR(("copy_from_user() in ump_ioctl_switch_hw_usage()\n")); ++ return -EFAULT; ++ } + -+ list_for_each_entry(jit_atom, &kctx->jit_atoms_head, jit_node) { -+ if (jit_atom == katom) -+ break; -+ if (jit_atom->core_req == BASE_JD_REQ_SOFT_JIT_FREE) { -+ u8 free_id = kbase_jit_free_get_id(jit_atom); ++ user_interaction.ctx = (void *) session_data; + -+ if (free_id && kctx->jit_alloc[free_id]) { -+ /* A JIT free which is active and -+ * submitted before this atom -+ */ -+ can_block = true; -+ break; -+ } -+ } -+ } ++ _ump_ukk_lock(&user_interaction); + -+ if (!can_block) { -+ /* Mark the allocation so we know it's in use even if -+ * the allocation itself fails. -+ */ -+ kctx->jit_alloc[info->id] = -+ (struct kbase_va_region *) -1; ++ user_interaction.ctx = NULL; + -+ katom->event_code = BASE_JD_EVENT_MEM_GROWTH_FAILED; -+ return 0; -+ } ++#if 0 /* No data to copy back */ ++ if (0 != copy_to_user(argument, &user_interaction, sizeof(user_interaction))) { ++ MSG_ERR(("copy_to_user() failed in ump_ioctl_switch_hw_usage()\n")); ++ return -EFAULT; ++ } ++#endif + -+ /* There are pending frees for an active allocation -+ * so we should wait to see whether they free the memory. -+ * Add to the beginning of the list to ensure that the atom is -+ * processed only once in kbase_jit_free_finish -+ */ -+ list_add(&katom->queue, &kctx->jit_pending_alloc); -+ katom->jit_blocked = true; ++ return 0; /* success */ ++} + -+ return 1; ++int ump_unlock_wrapper(u32 __user *argument, struct ump_session_data *session_data) ++{ ++ _ump_uk_unlock_s user_interaction; ++ ++ /* Sanity check input parameters */ ++ if (NULL == argument || NULL == session_data) { ++ MSG_ERR(("NULL parameter in ump_ioctl_size_get()\n")); ++ return -ENOTTY; + } + -+ /* -+ * Write the address of the JIT allocation to the user provided -+ * GPU allocation. -+ */ -+ ptr = kbase_vmap(kctx, info->gpu_alloc_addr, sizeof(*ptr), -+ &mapping); -+ if (!ptr) { -+ /* -+ * Leave the allocation "live" as the JIT free jit will be -+ * submitted anyway. -+ */ -+ katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ return 0; ++ if (0 != copy_from_user(&user_interaction, argument, sizeof(user_interaction))) { ++ MSG_ERR(("copy_from_user() in ump_ioctl_switch_hw_usage()\n")); ++ return -EFAULT; + } + -+ new_addr = reg->start_pfn << PAGE_SHIFT; -+ *ptr = new_addr; -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_JIT( -+ katom, info->gpu_alloc_addr, new_addr); -+ kbase_vunmap(kctx, &mapping); ++ user_interaction.ctx = (void *) session_data; + -+ katom->event_code = BASE_JD_EVENT_DONE; ++ _ump_ukk_unlock(&user_interaction); + -+ /* -+ * Bind it to the user provided ID. Do this last so we can check for -+ * the JIT free racing this JIT alloc job. -+ */ -+ kctx->jit_alloc[info->id] = reg; ++ user_interaction.ctx = NULL; + -+ return 0; -+} ++#if 0 /* No data to copy back */ ++ if (0 != copy_to_user(argument, &user_interaction, sizeof(user_interaction))) { ++ MSG_ERR(("copy_to_user() failed in ump_ioctl_switch_hw_usage()\n")); ++ return -EFAULT; ++ } ++#endif + -+static void kbase_jit_allocate_finish(struct kbase_jd_atom *katom) -+{ -+ struct base_jit_alloc_info *info; ++ return 0; /* success */ ++} +diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h +new file mode 100755 +index 000000000..5f8fc683c +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h +@@ -0,0 +1,46 @@ ++/* ++ * Copyright (C) 2010, 2012-2014, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ lockdep_assert_held(&katom->kctx->jctx.lock); ++/** ++ * @file ump_ukk_wrappers.h ++ * Defines the wrapper functions which turn Linux IOCTL calls into _ukk_ calls ++ */ + -+ /* Remove atom from jit_atoms_head list */ -+ list_del(&katom->jit_node); ++#ifndef __UMP_UKK_WRAPPERS_H__ ++#define __UMP_UKK_WRAPPERS_H__ + -+ if (katom->jit_blocked) { -+ list_del(&katom->queue); -+ katom->jit_blocked = false; -+ } ++#include ++#include "ump_kernel_common.h" + -+ info = (struct base_jit_alloc_info *) (uintptr_t) katom->jc; -+ /* Free the info structure */ -+ kfree(info); -+} ++#ifdef __cplusplus ++extern "C" { ++#endif + -+static int kbase_jit_free_prepare(struct kbase_jd_atom *katom) -+{ -+ struct kbase_context *kctx = katom->kctx; + -+ lockdep_assert_held(&kctx->jctx.lock); -+ list_add_tail(&katom->jit_node, &kctx->jit_atoms_head); + -+ return 0; -+} ++int ump_get_api_version_wrapper(u32 __user *argument, struct ump_session_data *session_data); ++int ump_release_wrapper(u32 __user *argument, struct ump_session_data *session_data); ++int ump_size_get_wrapper(u32 __user *argument, struct ump_session_data *session_data); ++int ump_msync_wrapper(u32 __user *argument, struct ump_session_data *session_data); ++int ump_cache_operations_control_wrapper(u32 __user *argument, struct ump_session_data *session_data); ++int ump_switch_hw_usage_wrapper(u32 __user *argument, struct ump_session_data *session_data); ++int ump_lock_wrapper(u32 __user *argument, struct ump_session_data *session_data); ++int ump_unlock_wrapper(u32 __user *argument, struct ump_session_data *session_data); + -+static void kbase_jit_free_process(struct kbase_jd_atom *katom) -+{ -+ struct kbase_context *kctx = katom->kctx; -+ u8 id = kbase_jit_free_get_id(katom); + -+ /* -+ * If the ID is zero or it is not in use yet then fail the job. -+ */ -+ if ((id == 0) || (kctx->jit_alloc[id] == NULL)) { -+ katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ return; -+ } + -+ /* -+ * If the ID is valid but the allocation request failed still succeed -+ * this soft job but don't try and free the allocation. -+ */ -+ if (kctx->jit_alloc[id] != (struct kbase_va_region *) -1) -+ kbase_jit_free(kctx, kctx->jit_alloc[id]); + -+ kctx->jit_alloc[id] = NULL; ++#ifdef __cplusplus +} ++#endif + -+static void kbasep_jit_free_finish_worker(struct work_struct *work) -+{ -+ struct kbase_jd_atom *katom = container_of(work, struct kbase_jd_atom, -+ work); -+ struct kbase_context *kctx = katom->kctx; -+ int resched; + -+ mutex_lock(&kctx->jctx.lock); -+ kbase_finish_soft_job(katom); -+ resched = jd_done_nolock(katom, NULL); -+ mutex_unlock(&kctx->jctx.lock); + -+ if (resched) -+ kbase_js_sched_all(kctx->kbdev); -+} ++#endif /* __UMP_UKK_WRAPPERS_H__ */ +diff --git a/drivers/gpu/arm/mali400/ump/readme.txt b/drivers/gpu/arm/mali400/ump/readme.txt +new file mode 100755 +index 000000000..c238cf0f2 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/ump/readme.txt +@@ -0,0 +1,28 @@ ++Building the UMP Device Driver for Linux ++---------------------------------------- + -+static void kbase_jit_free_finish(struct kbase_jd_atom *katom) -+{ -+ struct list_head *i, *tmp; -+ struct kbase_context *kctx = katom->kctx; ++Build the UMP Device Driver for Linux by running the following make command: + -+ lockdep_assert_held(&kctx->jctx.lock); -+ /* Remove this atom from the kctx->jit_atoms_head list */ -+ list_del(&katom->jit_node); ++KDIR= CONFIG= BUILD= make + -+ list_for_each_safe(i, tmp, &kctx->jit_pending_alloc) { -+ struct kbase_jd_atom *pending_atom = list_entry(i, -+ struct kbase_jd_atom, queue); -+ if (kbase_jit_allocate_process(pending_atom) == 0) { -+ /* Atom has completed */ -+ INIT_WORK(&pending_atom->work, -+ kbasep_jit_free_finish_worker); -+ queue_work(kctx->jctx.job_done_wq, &pending_atom->work); -+ } -+ } -+} ++where ++ kdir_path: Path to your Linux Kernel directory ++ your_config: Name of the sub-folder to find the required config.h file ++ ("arch-" will be prepended) ++ build_option: debug or release. Debug is default. + -+static int kbase_ext_res_prepare(struct kbase_jd_atom *katom) -+{ -+ __user struct base_external_resource_list *user_ext_res; -+ struct base_external_resource_list *ext_res; -+ u64 count = 0; -+ size_t copy_size; -+ int ret; ++The config.h contains following configuration parameters: + -+ user_ext_res = (__user struct base_external_resource_list *) -+ (uintptr_t) katom->jc; ++ARCH_UMP_BACKEND_DEFAULT ++ 0 specifies the dedicated memory allocator. ++ 1 specifies the OS memory allocator. ++ARCH_UMP_MEMORY_ADDRESS_DEFAULT ++ This is only required for the dedicated memory allocator, and specifies ++ the physical start address of the memory block reserved for UMP. ++ARCH_UMP_MEMORY_SIZE_DEFAULT ++ This specified the size of the memory block reserved for UMP, or the ++ maximum limit for allocations from the OS. + -+ /* Fail the job if there is no info structure */ -+ if (!user_ext_res) { -+ ret = -EINVAL; -+ goto fail; -+ } ++The result will be a ump.ko file, which can be loaded into the Linux kernel ++by using the insmod command. The driver can also be built as a part of the ++kernel itself. +diff --git a/drivers/gpu/arm/mali400/umplock/Makefile b/drivers/gpu/arm/mali400/umplock/Makefile +new file mode 100755 +index 000000000..e5549a33f +--- /dev/null ++++ b/drivers/gpu/arm/mali400/umplock/Makefile +@@ -0,0 +1,69 @@ ++# ++# Copyright (C) 2012, 2016-2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++# as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained from Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++# + -+ if (copy_from_user(&count, &user_ext_res->count, sizeof(u64)) != 0) { -+ ret = -EINVAL; -+ goto fail; -+ } ++# default to building for the host ++ARCH ?= $(shell uname -m) + -+ /* Is the number of external resources in range? */ -+ if (!count || count > BASE_EXT_RES_COUNT_MAX) { -+ ret = -EINVAL; -+ goto fail; -+ } ++# linux build system integration + -+ /* Copy the information for safe access and future storage */ -+ copy_size = sizeof(*ext_res); -+ copy_size += sizeof(struct base_external_resource) * (count - 1); -+ ext_res = kzalloc(copy_size, GFP_KERNEL); -+ if (!ext_res) { -+ ret = -ENOMEM; -+ goto fail; -+ } ++ifneq ($(KERNELRELEASE),) ++# Inside the kernel build system + -+ if (copy_from_user(ext_res, user_ext_res, copy_size) != 0) { -+ ret = -EINVAL; -+ goto free_info; -+ } ++EXTRA_CFLAGS += -I$(KBUILD_EXTMOD) + -+ /* -+ * Overwrite the count with the first value incase it was changed -+ * after the fact. -+ */ -+ ext_res->count = count; ++SRC = umplock_driver.c + -+ /* -+ * Replace the user pointer with our kernel allocated -+ * ext_res structure. -+ */ -+ katom->jc = (u64)(uintptr_t) ext_res; ++MODULE:=umplock.ko + -+ return 0; ++obj-m := $(MODULE:.ko=.o) ++$(MODULE:.ko=-y) := $(SRC:.c=.o) + -+free_info: -+ kfree(ext_res); -+fail: -+ return ret; -+} ++$(MODULE:.ko=-objs) := $(SRC:.c=.o) + -+static void kbase_ext_res_process(struct kbase_jd_atom *katom, bool map) -+{ -+ struct base_external_resource_list *ext_res; -+ int i; -+ bool failed = false; ++else ++# Outside the kernel build system ++# ++# + -+ ext_res = (struct base_external_resource_list *) (uintptr_t) katom->jc; -+ if (!ext_res) -+ goto failed_jc; ++# Get any user defined KDIR- or maybe even a hardcoded KDIR ++-include KDIR_CONFIGURATION + -+ kbase_gpu_vm_lock(katom->kctx); ++# Define host system directory ++KDIR-$(shell uname -m):=/lib/modules/$(shell uname -r)/build + -+ for (i = 0; i < ext_res->count; i++) { -+ u64 gpu_addr; ++ifeq ($(ARCH), arm) ++ # when compiling for ARM we're cross compiling ++ export CROSS_COMPILE ?= arm-none-linux-gnueabi- ++ CONFIG ?= arm ++else ++ # Compiling for the host ++ CONFIG ?= $(shell uname -m) ++endif + -+ gpu_addr = ext_res->ext_res[i].ext_resource & -+ ~BASE_EXT_RES_ACCESS_EXCLUSIVE; -+ if (map) { -+ if (!kbase_sticky_resource_acquire(katom->kctx, -+ gpu_addr)) -+ goto failed_loop; -+ } else -+ if (!kbase_sticky_resource_release(katom->kctx, NULL, -+ gpu_addr)) -+ failed = true; -+ } ++# default cpu to select ++CPU ?= $(shell uname -m) + -+ /* -+ * In the case of unmap we continue unmapping other resources in the -+ * case of failure but will always report failure if _any_ unmap -+ * request fails. -+ */ -+ if (failed) -+ katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ else -+ katom->event_code = BASE_JD_EVENT_DONE; ++# look up KDIR based om CPU selection ++KDIR ?= $(KDIR-$(CPU)) + -+ kbase_gpu_vm_unlock(katom->kctx); ++ifeq ($(KDIR),) ++$(error No KDIR found for platform $(CPU)) ++endif + -+ return; ++all: ++ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) + -+failed_loop: -+ while (--i > 0) { -+ u64 gpu_addr; ++kernelrelease: ++ $(MAKE) -C $(KDIR) kernelrelease + -+ gpu_addr = ext_res->ext_res[i].ext_resource & -+ ~BASE_EXT_RES_ACCESS_EXCLUSIVE; ++clean: ++ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean + -+ kbase_sticky_resource_release(katom->kctx, NULL, gpu_addr); -+ } ++endif +diff --git a/drivers/gpu/arm/mali400/umplock/umplock_driver.c b/drivers/gpu/arm/mali400/umplock/umplock_driver.c +new file mode 100755 +index 000000000..173f4d9bb +--- /dev/null ++++ b/drivers/gpu/arm/mali400/umplock/umplock_driver.c +@@ -0,0 +1,618 @@ ++/* ++ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ kbase_gpu_vm_unlock(katom->kctx); ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "umplock_ioctl.h" ++#include + -+failed_jc: -+ return; -+} ++#define MAX_ITEMS 1024 ++#define MAX_PIDS 128 + -+static void kbase_ext_res_finish(struct kbase_jd_atom *katom) -+{ -+ struct base_external_resource_list *ext_res; ++typedef struct lock_cmd_priv { ++ uint32_t msg[128]; /*ioctl args*/ ++ u32 pid; /*process id*/ ++} _lock_cmd_priv; + -+ ext_res = (struct base_external_resource_list *) (uintptr_t) katom->jc; -+ /* Free the info structure */ -+ kfree(ext_res); -+} ++typedef struct lock_ref { ++ int ref_count; ++ u32 pid; ++ u32 down_count; ++} _lock_ref; + -+int kbase_process_soft_job(struct kbase_jd_atom *katom) -+{ -+ switch (katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { -+ case BASE_JD_REQ_SOFT_DUMP_CPU_GPU_TIME: -+ return kbase_dump_cpu_gpu_time(katom); ++typedef struct umplock_item { ++ u32 secure_id; ++ u32 id_ref_count; ++ u32 owner; ++ _lock_access_usage usage; ++ _lock_ref references[MAX_PIDS]; ++ struct semaphore item_lock; ++} umplock_item; + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ case BASE_JD_REQ_SOFT_FENCE_TRIGGER: -+ katom->event_code = kbase_sync_fence_out_trigger(katom, -+ katom->event_code == BASE_JD_EVENT_DONE ? -+ 0 : -EFAULT); -+ break; -+ case BASE_JD_REQ_SOFT_FENCE_WAIT: -+ { -+ int ret = kbase_sync_fence_in_wait(katom); ++typedef struct umplock_device_private { ++ struct mutex item_list_lock; ++ atomic_t sessions; ++ umplock_item items[MAX_ITEMS]; ++ u32 pids[MAX_PIDS]; ++} umplock_device_private; + -+ if (ret == 1) { -+#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG -+ kbasep_add_waiting_with_timeout(katom); -+#else -+ kbasep_add_waiting_soft_job(katom); -+#endif -+ } -+ return ret; -+ } -+#endif ++struct umplock_device { ++ struct cdev cdev; ++ struct class *umplock_class; ++}; + -+ case BASE_JD_REQ_SOFT_REPLAY: -+ return kbase_replay_process(katom); -+ case BASE_JD_REQ_SOFT_EVENT_WAIT: -+ return kbasep_soft_event_wait(katom); -+ case BASE_JD_REQ_SOFT_EVENT_SET: -+ kbasep_soft_event_update_locked(katom, BASE_JD_SOFT_EVENT_SET); -+ break; -+ case BASE_JD_REQ_SOFT_EVENT_RESET: -+ kbasep_soft_event_update_locked(katom, BASE_JD_SOFT_EVENT_RESET); -+ break; -+ case BASE_JD_REQ_SOFT_DEBUG_COPY: -+ { -+ int res = kbase_debug_copy(katom); ++static struct umplock_device umplock_device; ++static umplock_device_private device; ++static dev_t umplock_dev; ++static char umplock_dev_name[] = "umplock"; + -+ if (res) -+ katom->event_code = BASE_JD_EVENT_JOB_INVALID; -+ break; -+ } -+ case BASE_JD_REQ_SOFT_JIT_ALLOC: -+ return kbase_jit_allocate_process(katom); -+ case BASE_JD_REQ_SOFT_JIT_FREE: -+ kbase_jit_free_process(katom); -+ break; -+ case BASE_JD_REQ_SOFT_EXT_RES_MAP: -+ kbase_ext_res_process(katom, true); -+ break; -+ case BASE_JD_REQ_SOFT_EXT_RES_UNMAP: -+ kbase_ext_res_process(katom, false); -+ break; -+ } ++int umplock_debug_level = 0; ++module_param(umplock_debug_level, int, S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP | S_IROTH); /* rw-rw-r-- */ ++MODULE_PARM_DESC(umplock_debug_level, "set umplock_debug_level to print debug messages"); + -+ /* Atom is complete */ -+ return 0; -+} ++#define PDEBUG(level, fmt, args...) do { if ((level) <= umplock_debug_level) printk(KERN_DEBUG "umplock: " fmt, ##args); } while (0) ++#define PERROR(fmt, args...) do { printk(KERN_ERR "umplock: " fmt, ##args); } while (0) + -+void kbase_cancel_soft_job(struct kbase_jd_atom *katom) ++int umplock_find_item(u32 secure_id) +{ -+ switch (katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ case BASE_JD_REQ_SOFT_FENCE_WAIT: -+ kbase_sync_fence_in_cancel_wait(katom); -+ break; -+#endif -+ case BASE_JD_REQ_SOFT_EVENT_WAIT: -+ kbasep_soft_event_cancel_job(katom); -+ break; -+ default: -+ /* This soft-job doesn't support cancellation! */ -+ KBASE_DEBUG_ASSERT(0); ++ int i; ++ for (i = 0; i < MAX_ITEMS; i++) { ++ if (device.items[i].secure_id == secure_id) { ++ return i; ++ } + } ++ ++ return -1; +} + -+int kbase_prepare_soft_job(struct kbase_jd_atom *katom) ++static int umplock_find_item_by_pid(_lock_cmd_priv *lock_cmd, int *item_slot, int *ref_slot) +{ -+ switch (katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { -+ case BASE_JD_REQ_SOFT_DUMP_CPU_GPU_TIME: -+ { -+ if (!IS_ALIGNED(katom->jc, cache_line_size())) -+ return -EINVAL; -+ } -+ break; -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ case BASE_JD_REQ_SOFT_FENCE_TRIGGER: -+ { -+ struct base_fence fence; -+ int fd; -+ -+ if (0 != copy_from_user(&fence, (__user void *)(uintptr_t) katom->jc, sizeof(fence))) -+ return -EINVAL; -+ -+ fd = kbase_sync_fence_out_create(katom, -+ fence.basep.stream_fd); -+ if (fd < 0) -+ return -EINVAL; ++ _lock_item_s *lock_item; ++ int i, j; + -+ fence.basep.fd = fd; -+ if (0 != copy_to_user((__user void *)(uintptr_t) katom->jc, &fence, sizeof(fence))) { -+ kbase_sync_fence_out_remove(katom); -+ kbase_sync_fence_close_fd(fd); -+ fence.basep.fd = -EINVAL; -+ return -EINVAL; -+ } -+ } -+ break; -+ case BASE_JD_REQ_SOFT_FENCE_WAIT: -+ { -+ struct base_fence fence; -+ int ret; ++ lock_item = (_lock_item_s *)&lock_cmd->msg; + -+ if (0 != copy_from_user(&fence, (__user void *)(uintptr_t) katom->jc, sizeof(fence))) -+ return -EINVAL; ++ i = umplock_find_item(lock_item->secure_id); + -+ /* Get a reference to the fence object */ -+ ret = kbase_sync_fence_in_from_fd(katom, -+ fence.basep.fd); -+ if (ret < 0) -+ return ret; ++ if (i < 0) { ++ return -1; ++ } + -+#ifdef CONFIG_MALI_BIFROST_DMA_FENCE -+ /* -+ * Set KCTX_NO_IMPLICIT_FENCE in the context the first -+ * time a soft fence wait job is observed. This will -+ * prevent the implicit dma-buf fence to conflict with -+ * the Android native sync fences. -+ */ -+ if (!kbase_ctx_flag(katom->kctx, KCTX_NO_IMPLICIT_SYNC)) -+ kbase_ctx_flag_set(katom->kctx, KCTX_NO_IMPLICIT_SYNC); -+#endif /* CONFIG_MALI_BIFROST_DMA_FENCE */ ++ for (j = 0; j < MAX_PIDS; j++) { ++ if (device.items[i].references[j].pid == lock_cmd->pid) { ++ *item_slot = i; ++ *ref_slot = j; ++ return 0; + } -+ break; -+#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ -+ case BASE_JD_REQ_SOFT_JIT_ALLOC: -+ return kbase_jit_allocate_prepare(katom); -+ case BASE_JD_REQ_SOFT_REPLAY: -+ break; -+ case BASE_JD_REQ_SOFT_JIT_FREE: -+ return kbase_jit_free_prepare(katom); -+ case BASE_JD_REQ_SOFT_EVENT_WAIT: -+ case BASE_JD_REQ_SOFT_EVENT_SET: -+ case BASE_JD_REQ_SOFT_EVENT_RESET: -+ if (katom->jc == 0) -+ return -EINVAL; -+ break; -+ case BASE_JD_REQ_SOFT_DEBUG_COPY: -+ return kbase_debug_copy_prepare(katom); -+ case BASE_JD_REQ_SOFT_EXT_RES_MAP: -+ return kbase_ext_res_prepare(katom); -+ case BASE_JD_REQ_SOFT_EXT_RES_UNMAP: -+ return kbase_ext_res_prepare(katom); -+ default: -+ /* Unsupported soft-job */ -+ return -EINVAL; + } -+ return 0; ++ return -1 ; +} + -+void kbase_finish_soft_job(struct kbase_jd_atom *katom) ++static int umplock_find_client_valid(u32 pid) +{ -+ switch (katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { -+ case BASE_JD_REQ_SOFT_DUMP_CPU_GPU_TIME: -+ /* Nothing to do */ -+ break; -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ case BASE_JD_REQ_SOFT_FENCE_TRIGGER: -+ /* If fence has not yet been signaled, do it now */ -+ kbase_sync_fence_out_trigger(katom, katom->event_code == -+ BASE_JD_EVENT_DONE ? 0 : -EFAULT); -+ break; -+ case BASE_JD_REQ_SOFT_FENCE_WAIT: -+ /* Release katom's reference to fence object */ -+ kbase_sync_fence_in_remove(katom); -+ break; -+#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ -+ case BASE_JD_REQ_SOFT_DEBUG_COPY: -+ kbase_debug_copy_finish(katom); -+ break; -+ case BASE_JD_REQ_SOFT_JIT_ALLOC: -+ kbase_jit_allocate_finish(katom); -+ break; -+ case BASE_JD_REQ_SOFT_EXT_RES_MAP: -+ kbase_ext_res_finish(katom); -+ break; -+ case BASE_JD_REQ_SOFT_EXT_RES_UNMAP: -+ kbase_ext_res_finish(katom); -+ break; -+ case BASE_JD_REQ_SOFT_JIT_FREE: -+ kbase_jit_free_finish(katom); -+ break; ++ int i; ++ ++ if (pid == 0) { ++ return -1; + } -+} + -+void kbase_resume_suspended_soft_jobs(struct kbase_device *kbdev) -+{ -+ LIST_HEAD(local_suspended_soft_jobs); -+ struct kbase_jd_atom *tmp_iter; -+ struct kbase_jd_atom *katom_iter; -+ struct kbasep_js_device_data *js_devdata; -+ bool resched = false; ++ for (i = 0; i < MAX_PIDS; i++) { ++ if (device.pids[i] == pid) { ++ return i; ++ } ++ } + -+ KBASE_DEBUG_ASSERT(kbdev); ++ return -1; ++} + -+ js_devdata = &kbdev->js_data; ++static int do_umplock_create_locked(_lock_cmd_priv *lock_cmd) ++{ ++ int i_index, ref_index; ++ int ret; ++ _lock_item_s *lock_item = (_lock_item_s *)&lock_cmd->msg; + -+ /* Move out the entire list */ -+ mutex_lock(&js_devdata->runpool_mutex); -+ list_splice_init(&js_devdata->suspended_soft_jobs_list, -+ &local_suspended_soft_jobs); -+ mutex_unlock(&js_devdata->runpool_mutex); ++ i_index = ref_index = -1; + -+ /* -+ * Each atom must be detached from the list and ran separately - -+ * it could be re-added to the old list, but this is unlikely -+ */ -+ list_for_each_entry_safe(katom_iter, tmp_iter, -+ &local_suspended_soft_jobs, dep_item[1]) { -+ struct kbase_context *kctx = katom_iter->kctx; ++ ret = umplock_find_client_valid(lock_cmd->pid); ++ if (ret < 0) { ++ /*lock request from an invalid client pid, do nothing*/ ++ return -EINVAL; ++ } + -+ mutex_lock(&kctx->jctx.lock); ++ ret = umplock_find_item_by_pid(lock_cmd, &i_index, &ref_index); ++ if (ret >= 0) { ++ } else if ((i_index = umplock_find_item(lock_item->secure_id)) >= 0) { ++ for (ref_index = 0; ref_index < MAX_PIDS; ref_index++) { ++ if (device.items[i_index].references[ref_index].pid == 0) { ++ break; ++ } ++ } ++ if (ref_index < MAX_PIDS) { ++ device.items[i_index].references[ref_index].pid = lock_cmd->pid; ++ device.items[i_index].references[ref_index].ref_count = 0; ++ device.items[i_index].references[ref_index].down_count = 0; ++ } else { ++ PERROR("whoops, item ran out of available reference slots\n"); ++ return -EINVAL; + -+ /* Remove from the global list */ -+ list_del(&katom_iter->dep_item[1]); -+ /* Remove from the context's list of waiting soft jobs */ -+ kbasep_remove_waiting_soft_job(katom_iter); ++ } ++ } else { ++ i_index = umplock_find_item(0); + -+ if (kbase_process_soft_job(katom_iter) == 0) { -+ kbase_finish_soft_job(katom_iter); -+ resched |= jd_done_nolock(katom_iter, NULL); ++ if (i_index >= 0) { ++ device.items[i_index].secure_id = lock_item->secure_id; ++ device.items[i_index].id_ref_count = 0; ++ device.items[i_index].usage = lock_item->usage; ++ device.items[i_index].references[0].pid = lock_cmd->pid; ++ device.items[i_index].references[0].ref_count = 0; ++ device.items[i_index].references[0].down_count = 0; ++ sema_init(&device.items[i_index].item_lock, 1); + } else { -+ KBASE_DEBUG_ASSERT((katom_iter->core_req & -+ BASE_JD_REQ_SOFT_JOB_TYPE) -+ != BASE_JD_REQ_SOFT_REPLAY); ++ PERROR("whoops, ran out of available slots\n"); ++ return -EINVAL; + } -+ -+ mutex_unlock(&kctx->jctx.lock); + } + -+ if (resched) -+ kbase_js_sched_all(kbdev); ++ return 0; +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_strings.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_strings.c -new file mode 100755 -index 000000000000..c98762cec244 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_strings.c -@@ -0,0 +1,23 @@ -+ /* -+ * -+ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ ++/** IOCTLs **/ + -+#include "mali_kbase_strings.h" ++static int do_umplock_create(_lock_cmd_priv *lock_cmd) ++{ ++ return 0; ++} + -+#define KBASE_DRV_NAME "mali" -+#define KBASE_TIMELINE_NAME KBASE_DRV_NAME ".timeline" ++static int do_umplock_process(_lock_cmd_priv *lock_cmd) ++{ ++ int ret, i_index, ref_index; ++ _lock_item_s *lock_item = (_lock_item_s *)&lock_cmd->msg; + -+const char kbase_drv_name[] = KBASE_DRV_NAME; -+const char kbase_timeline_name[] = KBASE_TIMELINE_NAME; -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_strings.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_strings.h -new file mode 100755 -index 000000000000..41b8fdbec6a4 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_strings.h -@@ -0,0 +1,19 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ mutex_lock(&device.item_list_lock); + ++ if (0 == lock_item->secure_id) { ++ PERROR("IOCTL_UMPLOCK_PROCESS called with secure_id is 0, pid: %d\n", lock_cmd->pid); ++ mutex_unlock(&device.item_list_lock); ++ return -EINVAL; ++ } + ++ ret = do_umplock_create_locked(lock_cmd); ++ if (ret < 0) { ++ mutex_unlock(&device.item_list_lock); ++ return -EINVAL; ++ } + -+extern const char kbase_drv_name[]; -+extern const char kbase_timeline_name[]; -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync.h -new file mode 100755 -index 000000000000..54159262314a ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync.h -@@ -0,0 +1,203 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ ret = umplock_find_item_by_pid(lock_cmd, &i_index, &ref_index); ++ if (ret < 0) { ++ /*fail to find a item*/ ++ PERROR("IOCTL_UMPLOCK_PROCESS called with invalid parameter, pid: %d\n", lock_cmd->pid); ++ mutex_unlock(&device.item_list_lock); ++ return -EINVAL; ++ } ++ device.items[i_index].references[ref_index].ref_count++; ++ device.items[i_index].id_ref_count++; ++ PDEBUG(1, "try to lock, pid: %d, secure_id: 0x%x, ref_count: %d\n", lock_cmd->pid, lock_item->secure_id, device.items[i_index].references[ref_index].ref_count); + ++ if (lock_cmd->pid == device.items[i_index].owner) { ++ PDEBUG(1, "already own the lock, pid: %d, secure_id: 0x%x, ref_count: %d\n", lock_cmd->pid, lock_item->secure_id, device.items[i_index].references[ref_index].ref_count); ++ mutex_unlock(&device.item_list_lock); ++ return 0; ++ } + ++ device.items[i_index].references[ref_index].down_count++; ++ mutex_unlock(&device.item_list_lock); ++ if (down_interruptible(&device.items[i_index].item_lock)) { ++ /*wait up without hold the umplock. restore previous state and return*/ ++ mutex_lock(&device.item_list_lock); ++ device.items[i_index].references[ref_index].ref_count--; ++ device.items[i_index].id_ref_count--; ++ device.items[i_index].references[ref_index].down_count--; ++ if (0 == device.items[i_index].references[ref_index].ref_count) { ++ device.items[i_index].references[ref_index].pid = 0; ++ if (0 == device.items[i_index].id_ref_count) { ++ PDEBUG(1, "release item, pid: %d, secure_id: 0x%x\n", lock_cmd->pid, lock_item->secure_id); ++ device.items[i_index].secure_id = 0; ++ } ++ } + -+/** -+ * @file mali_kbase_sync.h -+ * -+ * This file contains our internal "API" for explicit fences. -+ * It hides the implementation details of the actual explicit fence mechanism -+ * used (Android fences or sync file with DMA fences). -+ */ ++ PERROR("failed lock, pid: %d, secure_id: 0x%x, ref_count: %d\n", lock_cmd->pid, lock_item->secure_id, device.items[i_index].references[ref_index].ref_count); + -+#ifndef MALI_KBASE_SYNC_H -+#define MALI_KBASE_SYNC_H ++ mutex_unlock(&device.item_list_lock); ++ return -ERESTARTSYS; ++ } + -+#include -+#ifdef CONFIG_SYNC -+#include -+#endif -+#ifdef CONFIG_SYNC_FILE -+#include "mali_kbase_fence_defs.h" -+#include -+#endif ++ mutex_lock(&device.item_list_lock); ++ PDEBUG(1, "got lock, pid: %d, secure_id: 0x%x, ref_count: %d\n", lock_cmd->pid, lock_item->secure_id, device.items[i_index].references[ref_index].ref_count); ++ device.items[i_index].owner = lock_cmd->pid; ++ mutex_unlock(&device.item_list_lock); + -+#include "mali_kbase.h" ++ return 0; ++} + -+/** -+ * struct kbase_sync_fence_info - Information about a fence -+ * @fence: Pointer to fence (type is void*, as underlaying struct can differ) -+ * @name: The name given to this fence when it was created -+ * @status: < 0 means error, 0 means active, 1 means signaled -+ * -+ * Use kbase_sync_fence_in_info_get() or kbase_sync_fence_out_info_get() -+ * to get the information. -+ */ -+struct kbase_sync_fence_info { -+ void *fence; -+ char name[32]; -+ int status; -+}; ++static int do_umplock_release(_lock_cmd_priv *lock_cmd) ++{ ++ int ret, i_index, ref_index, call_up; ++ _lock_item_s *lock_item = (_lock_item_s *)&lock_cmd->msg; + -+/** -+ * kbase_sync_fence_stream_create() - Create a stream object -+ * @name: Name of stream (only used to ease debugging/visualization) -+ * @out_fd: A file descriptor representing the created stream object -+ * -+ * Can map down to a timeline implementation in some implementations. -+ * Exposed as a file descriptor. -+ * Life-time controlled via the file descriptor: -+ * - dup to add a ref -+ * - close to remove a ref -+ * -+ * return: 0 on success, < 0 on error -+ */ -+int kbase_sync_fence_stream_create(const char *name, int *const out_fd); ++ mutex_lock(&device.item_list_lock); + -+/** -+ * kbase_sync_fence_out_create Create an explicit output fence to specified atom -+ * @katom: Atom to assign the new explicit fence to -+ * @stream_fd: File descriptor for stream object to create fence on -+ * -+ * return: Valid file descriptor to fence or < 0 on error -+ */ -+int kbase_sync_fence_out_create(struct kbase_jd_atom *katom, int stream_fd); ++ if (0 == lock_item->secure_id) { ++ PERROR("IOCTL_UMPLOCK_RELEASE called with secure_id is 0, pid: %d\n", lock_cmd->pid); ++ mutex_unlock(&device.item_list_lock); ++ return -EINVAL; ++ } + -+/** -+ * kbase_sync_fence_in_from_fd() Assigns an existing fence to specified atom -+ * @katom: Atom to assign the existing explicit fence to -+ * @fd: File descriptor to an existing fence -+ * -+ * Assigns an explicit input fence to atom. -+ * This can later be waited for by calling @kbase_sync_fence_in_wait -+ * -+ * return: 0 on success, < 0 on error -+ */ -+int kbase_sync_fence_in_from_fd(struct kbase_jd_atom *katom, int fd); ++ ret = umplock_find_client_valid(lock_cmd->pid); ++ if (ret < 0) { ++ /*lock request from an invalid client pid, do nothing*/ ++ mutex_unlock(&device.item_list_lock); ++ return -EPERM; ++ } + -+/** -+ * kbase_sync_fence_validate() - Validate a fd to be a valid fence -+ * @fd: File descriptor to check -+ * -+ * This function is only usable to catch unintentional user errors early, -+ * it does not stop malicious code changing the fd after this function returns. -+ * -+ * return 0: if fd is for a valid fence, < 0 if invalid -+ */ -+int kbase_sync_fence_validate(int fd); ++ i_index = ref_index = -1; + -+/** -+ * kbase_sync_fence_out_trigger - Signal explicit output fence attached on katom -+ * @katom: Atom with an explicit fence to signal -+ * @result: < 0 means signal with error, 0 >= indicates success -+ * -+ * Signal output fence attached on katom and remove the fence from the atom. -+ * -+ * return: The "next" event code for atom, typically JOB_CANCELLED or EVENT_DONE -+ */ -+enum base_jd_event_code -+kbase_sync_fence_out_trigger(struct kbase_jd_atom *katom, int result); ++ ret = umplock_find_item_by_pid(lock_cmd, &i_index, &ref_index); ++ if (ret < 0) { ++ /*fail to find item*/ ++ PERROR("IOCTL_UMPLOCK_RELEASE called with invalid parameter pid: %d, secid: 0x%x\n", lock_cmd->pid, lock_item->secure_id); ++ mutex_unlock(&device.item_list_lock); ++ return -EINVAL; ++ } + -+/** -+ * kbase_sync_fence_in_wait() - Wait for explicit input fence to be signaled -+ * @katom: Atom with explicit fence to wait for -+ * -+ * If the fence is already signaled, then 0 is returned, and the caller must -+ * continue processing of the katom. -+ * -+ * If the fence isn't already signaled, then this kbase_sync framework will -+ * take responsibility to continue the processing once the fence is signaled. -+ * -+ * return: 0 if already signaled, otherwise 1 -+ */ -+int kbase_sync_fence_in_wait(struct kbase_jd_atom *katom); ++ /* if the lock is not owned by this process */ ++ if (lock_cmd->pid != device.items[i_index].owner) { ++ mutex_unlock(&device.item_list_lock); ++ return -EPERM; ++ } + -+/** -+ * kbase_sync_fence_in_cancel_wait() - Cancel explicit input fence waits -+ * @katom: Atom to cancel wait for -+ * -+ * This function is fully responsible for continuing processing of this atom -+ * (remove_waiting_soft_job + finish_soft_job + jd_done + js_sched_all) -+ */ -+void kbase_sync_fence_in_cancel_wait(struct kbase_jd_atom *katom); ++ /* if the ref_count is 0, that means nothing to unlock, just return */ ++ if (0 == device.items[i_index].references[ref_index].ref_count) { ++ mutex_unlock(&device.item_list_lock); ++ return 0; ++ } + -+/** -+ * kbase_sync_fence_in_remove() - Remove the input fence from the katom -+ * @katom: Atom to remove explicit input fence for -+ * -+ * This will also release the corresponding reference. -+ */ -+void kbase_sync_fence_in_remove(struct kbase_jd_atom *katom); ++ device.items[i_index].references[ref_index].ref_count--; ++ device.items[i_index].id_ref_count--; ++ PDEBUG(1, "unlock, pid: %d, secure_id: 0x%x, ref_count: %d\n", lock_cmd->pid, lock_item->secure_id, device.items[i_index].references[ref_index].ref_count); + -+/** -+ * kbase_sync_fence_out_remove() - Remove the output fence from the katom -+ * @katom: Atom to remove explicit output fence for -+ * -+ * This will also release the corresponding reference. -+ */ -+void kbase_sync_fence_out_remove(struct kbase_jd_atom *katom); ++ call_up = 0; ++ if (device.items[i_index].references[ref_index].down_count > 1) { ++ call_up = 1; ++ device.items[i_index].references[ref_index].down_count--; ++ } ++ if (0 == device.items[i_index].references[ref_index].ref_count) { ++ device.items[i_index].references[ref_index].pid = 0; ++ if (0 == device.items[i_index].id_ref_count) { ++ PDEBUG(1, "release item, pid: %d, secure_id: 0x%x\n", lock_cmd->pid, lock_item->secure_id); ++ device.items[i_index].secure_id = 0; ++ } ++ device.items[i_index].owner = 0; ++ call_up = 1; ++ } ++ if (call_up) { ++ PDEBUG(1, "call up, pid: %d, secure_id: 0x%x\n", lock_cmd->pid, lock_item->secure_id); ++ up(&device.items[i_index].item_lock); ++ } ++ mutex_unlock(&device.item_list_lock); + -+/** -+ * kbase_sync_fence_close_fd() - Close a file descriptor representing a fence -+ * @fd: File descriptor to close -+ */ -+static inline void kbase_sync_fence_close_fd(int fd) -+{ -+ ksys_close(fd); ++ return 0; +} + -+/** -+ * kbase_sync_fence_in_info_get() - Retrieves information about input fence -+ * @katom: Atom to get fence information from -+ * @info: Struct to be filled with fence information -+ * -+ * return: 0 on success, < 0 on error -+ */ -+int kbase_sync_fence_in_info_get(struct kbase_jd_atom *katom, -+ struct kbase_sync_fence_info *info); -+ -+/** -+ * kbase_sync_fence_out_info_get() - Retrieves information about output fence -+ * @katom: Atom to get fence information from -+ * @info: Struct to be filled with fence information -+ * -+ * return: 0 on success, < 0 on error -+ */ -+int kbase_sync_fence_out_info_get(struct kbase_jd_atom *katom, -+ struct kbase_sync_fence_info *info); -+ -+/** -+ * kbase_sync_status_string() - Get string matching @status -+ * @status: Value of fence status. -+ * -+ * return: Pointer to string describing @status. -+ */ -+const char *kbase_sync_status_string(int status); -+ -+/* -+ * Internal worker used to continue processing of atom. -+ */ -+void kbase_sync_fence_wait_worker(struct work_struct *data); -+ -+#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG -+/** -+ * kbase_sync_fence_in_dump() Trigger a debug dump of atoms input fence state -+ * @katom: Atom to trigger fence debug dump for -+ */ -+void kbase_sync_fence_in_dump(struct kbase_jd_atom *katom); -+#endif ++static int do_umplock_zap(void) ++{ ++ int i; + -+#endif /* MALI_KBASE_SYNC_H */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_android.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_android.c -new file mode 100755 -index 000000000000..e4528e2b9f25 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_android.c -@@ -0,0 +1,537 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ PDEBUG(1, "ZAP ALL ENTRIES!\n"); + ++ mutex_lock(&device.item_list_lock); + ++ for (i = 0; i < MAX_ITEMS; i++) { ++ device.items[i].secure_id = 0; ++ memset(&device.items[i].references, 0, sizeof(_lock_ref) * MAX_PIDS); ++ sema_init(&device.items[i].item_lock, 1); ++ } + -+/* -+ * Code for supporting explicit Android fences (CONFIG_SYNC) -+ * Known to be good for kernels 4.5 and earlier. -+ * Replaced with CONFIG_SYNC_FILE for 4.9 and later kernels -+ * (see mali_kbase_sync_file.c) -+ */ ++ for (i = 0; i < MAX_PIDS; i++) { ++ device.pids[i] = 0; ++ } ++ mutex_unlock(&device.item_list_lock); + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "sync.h" -+#include -+#include ++ return 0; ++} + -+struct mali_sync_timeline { -+ struct sync_timeline timeline; -+ atomic_t counter; -+ atomic_t signaled; -+}; ++static int do_umplock_dump(void) ++{ ++ int i, j; + -+struct mali_sync_pt { -+ struct sync_pt pt; -+ int order; -+ int result; -+}; ++ mutex_lock(&device.item_list_lock); ++ PERROR("dump all the items begin\n"); ++ for (i = 0; i < MAX_ITEMS; i++) { ++ for (j = 0; j < MAX_PIDS; j++) { ++ if (device.items[i].secure_id != 0 && device.items[i].references[j].pid != 0) { ++ PERROR("item[%d]->secure_id=0x%x, owner=%d\t reference[%d].ref_count=%d.pid=%d\n", ++ i, ++ device.items[i].secure_id, ++ device.items[i].owner, ++ j, ++ device.items[i].references[j].ref_count, ++ device.items[i].references[j].pid); ++ } ++ } ++ } ++ PERROR("dump all the items end\n"); ++ mutex_unlock(&device.item_list_lock); + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) -+/* For backwards compatibility with kernels before 3.17. After 3.17 -+ * sync_pt_parent is included in the kernel. */ -+static inline struct sync_timeline *sync_pt_parent(struct sync_pt *pt) -+{ -+ return pt->parent; ++ return 0; +} -+#endif + -+static struct mali_sync_timeline *to_mali_sync_timeline( -+ struct sync_timeline *timeline) ++int do_umplock_client_add(_lock_cmd_priv *lock_cmd) +{ -+ return container_of(timeline, struct mali_sync_timeline, timeline); ++ int i; ++ mutex_lock(&device.item_list_lock); ++ for (i = 0; i < MAX_PIDS; i++) { ++ if (device.pids[i] == lock_cmd->pid) { ++ mutex_unlock(&device.item_list_lock); ++ return 0; ++ } ++ } ++ for (i = 0; i < MAX_PIDS; i++) { ++ if (device.pids[i] == 0) { ++ device.pids[i] = lock_cmd->pid; ++ break; ++ } ++ } ++ mutex_unlock(&device.item_list_lock); ++ if (i == MAX_PIDS) { ++ PERROR("Oops, Run out of client slots\n "); ++ return -EINVAL; ++ } ++ return 0; +} + -+static struct mali_sync_pt *to_mali_sync_pt(struct sync_pt *pt) ++int do_umplock_client_delete(_lock_cmd_priv *lock_cmd) +{ -+ return container_of(pt, struct mali_sync_pt, pt); -+} ++ int p_index = -1, i_index = -1, ref_index = -1; ++ int ret; ++ _lock_item_s *lock_item; ++ lock_item = (_lock_item_s *)&lock_cmd->msg; + -+static struct sync_pt *timeline_dup(struct sync_pt *pt) -+{ -+ struct mali_sync_pt *mpt = to_mali_sync_pt(pt); -+ struct mali_sync_pt *new_mpt; -+ struct sync_pt *new_pt = sync_pt_create(sync_pt_parent(pt), -+ sizeof(struct mali_sync_pt)); ++ mutex_lock(&device.item_list_lock); ++ p_index = umplock_find_client_valid(lock_cmd->pid); ++ /*lock item pid is not valid.*/ ++ if (p_index < 0) { ++ mutex_unlock(&device.item_list_lock); ++ return 0; ++ } + -+ if (!new_pt) -+ return NULL; ++ /*walk through umplock item list and release reference attached to this client*/ ++ for (i_index = 0; i_index < MAX_ITEMS; i_index++) { ++ lock_item->secure_id = device.items[i_index].secure_id; + -+ new_mpt = to_mali_sync_pt(new_pt); -+ new_mpt->order = mpt->order; -+ new_mpt->result = mpt->result; ++ /*find the item index and reference slot for the lock_item*/ ++ ret = umplock_find_item_by_pid(lock_cmd, &i_index, &ref_index); + -+ return new_pt; -+} ++ if (ret < 0) { ++ /*client has no reference on this umplock item, skip*/ ++ continue; ++ } ++ while (device.items[i_index].references[ref_index].ref_count) { ++ /*release references on this client*/ + -+static int timeline_has_signaled(struct sync_pt *pt) -+{ -+ struct mali_sync_pt *mpt = to_mali_sync_pt(pt); -+ struct mali_sync_timeline *mtl = to_mali_sync_timeline( -+ sync_pt_parent(pt)); -+ int result = mpt->result; ++ PDEBUG(1, "delete client, pid: %d, ref_count: %d\n", lock_cmd->pid, device.items[i_index].references[ref_index].ref_count); + -+ int diff = atomic_read(&mtl->signaled) - mpt->order; ++ mutex_unlock(&device.item_list_lock); ++ do_umplock_release(lock_cmd); ++ mutex_lock(&device.item_list_lock); ++ } ++ } + -+ if (diff >= 0) -+ return (result < 0) ? result : 1; ++ /*remove the pid from umplock valid pid list*/ ++ device.pids[p_index] = 0; ++ mutex_unlock(&device.item_list_lock); + + return 0; +} + -+static int timeline_compare(struct sync_pt *a, struct sync_pt *b) ++static long umplock_driver_ioctl(struct file *f, unsigned int cmd, unsigned long arg) +{ -+ struct mali_sync_pt *ma = container_of(a, struct mali_sync_pt, pt); -+ struct mali_sync_pt *mb = container_of(b, struct mali_sync_pt, pt); ++ int ret; ++ uint32_t size = _IOC_SIZE(cmd); ++ _lock_cmd_priv lock_cmd ; + -+ int diff = ma->order - mb->order; ++ if (_IOC_TYPE(cmd) != LOCK_IOCTL_GROUP) { ++ return -ENOTTY; ++ } + -+ if (diff == 0) ++ if (_IOC_NR(cmd) >= LOCK_IOCTL_MAX_CMDS) { ++ return -ENOTTY; ++ } ++ ++ switch (cmd) { ++ case LOCK_IOCTL_CREATE: ++ if (size != sizeof(_lock_item_s)) { ++ return -ENOTTY; ++ } ++ ++ if (copy_from_user(&lock_cmd.msg, (void __user *)arg, size)) { ++ return -EFAULT; ++ } ++ lock_cmd.pid = (u32)current->tgid; ++ ret = do_umplock_create(&lock_cmd); ++ if (ret) { ++ return ret; ++ } + return 0; + -+ return (diff < 0) ? -1 : 1; -+} ++ case LOCK_IOCTL_PROCESS: ++ if (size != sizeof(_lock_item_s)) { ++ return -ENOTTY; ++ } + -+static void timeline_value_str(struct sync_timeline *timeline, char *str, -+ int size) -+{ -+ struct mali_sync_timeline *mtl = to_mali_sync_timeline(timeline); ++ if (copy_from_user(&lock_cmd.msg, (void __user *)arg, size)) { ++ return -EFAULT; ++ } ++ lock_cmd.pid = (u32)current->tgid; ++ return do_umplock_process(&lock_cmd); + -+ snprintf(str, size, "%d", atomic_read(&mtl->signaled)); -+} ++ case LOCK_IOCTL_RELEASE: ++ if (size != sizeof(_lock_item_s)) { ++ return -ENOTTY; ++ } + -+static void pt_value_str(struct sync_pt *pt, char *str, int size) -+{ -+ struct mali_sync_pt *mpt = to_mali_sync_pt(pt); ++ if (copy_from_user(&lock_cmd.msg, (void __user *)arg, size)) { ++ return -EFAULT; ++ } ++ lock_cmd.pid = (u32)current->tgid; ++ ret = do_umplock_release(&lock_cmd); ++ if (ret) { ++ return ret; ++ } ++ return 0; + -+ snprintf(str, size, "%d(%d)", mpt->order, mpt->result); -+} ++ case LOCK_IOCTL_ZAP: ++ do_umplock_zap(); ++ return 0; + -+static struct sync_timeline_ops mali_timeline_ops = { -+ .driver_name = "Mali", -+ .dup = timeline_dup, -+ .has_signaled = timeline_has_signaled, -+ .compare = timeline_compare, -+ .timeline_value_str = timeline_value_str, -+ .pt_value_str = pt_value_str, -+}; ++ case LOCK_IOCTL_DUMP: ++ do_umplock_dump(); ++ return 0; ++ } + -+/* Allocates a timeline for Mali -+ * -+ * One timeline should be allocated per API context. -+ */ -+static struct sync_timeline *mali_sync_timeline_alloc(const char *name) ++ return -ENOIOCTLCMD; ++} ++ ++static int umplock_driver_open(struct inode *inode, struct file *filp) +{ -+ struct sync_timeline *tl; -+ struct mali_sync_timeline *mtl; ++ _lock_cmd_priv lock_cmd; + -+ tl = sync_timeline_create(&mali_timeline_ops, -+ sizeof(struct mali_sync_timeline), name); -+ if (!tl) -+ return NULL; ++ atomic_inc(&device.sessions); ++ PDEBUG(1, "OPEN SESSION (%i references)\n", atomic_read(&device.sessions)); + -+ /* Set the counter in our private struct */ -+ mtl = to_mali_sync_timeline(tl); -+ atomic_set(&mtl->counter, 0); -+ atomic_set(&mtl->signaled, 0); ++ lock_cmd.pid = (u32)current->tgid; ++ do_umplock_client_add(&lock_cmd); + -+ return tl; ++ return 0; +} + -+static int kbase_stream_close(struct inode *inode, struct file *file) ++static int umplock_driver_release(struct inode *inode, struct file *filp) +{ -+ struct sync_timeline *tl; ++ int sessions = 0; ++ _lock_cmd_priv lock_cmd; ++ ++ lock_cmd.pid = (u32)current->tgid; ++ do_umplock_client_delete(&lock_cmd); ++ ++ mutex_lock(&device.item_list_lock); ++ atomic_dec(&device.sessions); ++ sessions = atomic_read(&device.sessions); ++ PDEBUG(1, "CLOSE SESSION (%i references)\n", sessions); ++ mutex_unlock(&device.item_list_lock); ++ if (sessions == 0) { ++ do_umplock_zap(); ++ } + -+ tl = (struct sync_timeline *)file->private_data; -+ sync_timeline_destroy(tl); + return 0; +} + -+static const struct file_operations stream_fops = { -+ .owner = THIS_MODULE, -+ .release = kbase_stream_close, ++static struct file_operations umplock_fops = { ++ .owner = THIS_MODULE, ++ .open = umplock_driver_open, ++ .release = umplock_driver_release, ++ .unlocked_ioctl = umplock_driver_ioctl, +}; + -+int kbase_sync_fence_stream_create(const char *name, int *const out_fd) ++int umplock_device_initialize(void) +{ -+ struct sync_timeline *tl; ++ int err; + -+ if (!out_fd) -+ return -EINVAL; ++ err = alloc_chrdev_region(&umplock_dev, 0, 1, umplock_dev_name); + -+ tl = mali_sync_timeline_alloc(name); -+ if (!tl) -+ return -EINVAL; ++ if (0 == err) { ++ memset(&umplock_device, 0, sizeof(umplock_device)); ++ cdev_init(&umplock_device.cdev, &umplock_fops); ++ umplock_device.cdev.owner = THIS_MODULE; ++ umplock_device.cdev.ops = &umplock_fops; + -+ *out_fd = anon_inode_getfd(name, &stream_fops, tl, O_RDONLY|O_CLOEXEC); ++ err = cdev_add(&umplock_device.cdev, umplock_dev, 1); ++ if (0 == err) { ++ umplock_device.umplock_class = class_create(THIS_MODULE, umplock_dev_name); ++ if (IS_ERR(umplock_device.umplock_class)) { ++ err = PTR_ERR(umplock_device.umplock_class); ++ } else { ++ struct device *mdev; ++ mdev = device_create(umplock_device.umplock_class, NULL, umplock_dev, NULL, umplock_dev_name); ++ if (!IS_ERR(mdev)) { ++ return 0; /* all ok */ ++ } + -+ if (*out_fd < 0) { -+ sync_timeline_destroy(tl); -+ return -EINVAL; ++ err = PTR_ERR(mdev); ++ class_destroy(umplock_device.umplock_class); ++ } ++ cdev_del(&umplock_device.cdev); ++ } ++ ++ unregister_chrdev_region(umplock_dev, 1); ++ } else { ++ PERROR("alloc chardev region failed\n"); + } + -+ return 0; ++ return err; +} + -+/* Allocates a sync point within the timeline. -+ * -+ * The timeline must be the one allocated by kbase_sync_timeline_alloc -+ * -+ * Sync points must be triggered in *exactly* the same order as they are -+ * allocated. -+ */ -+static struct sync_pt *kbase_sync_pt_alloc(struct sync_timeline *parent) ++void umplock_device_terminate(void) +{ -+ struct sync_pt *pt = sync_pt_create(parent, -+ sizeof(struct mali_sync_pt)); -+ struct mali_sync_timeline *mtl = to_mali_sync_timeline(parent); -+ struct mali_sync_pt *mpt; ++ device_destroy(umplock_device.umplock_class, umplock_dev); ++ class_destroy(umplock_device.umplock_class); + -+ if (!pt) -+ return NULL; ++ cdev_del(&umplock_device.cdev); ++ unregister_chrdev_region(umplock_dev, 1); ++} + -+ mpt = to_mali_sync_pt(pt); -+ mpt->order = atomic_inc_return(&mtl->counter); -+ mpt->result = 0; ++static int __init umplock_initialize_module(void) ++{ ++ PDEBUG(1, "Inserting UMP lock device driver. Compiled: %s, time: %s\n", __DATE__, __TIME__); + -+ return pt; ++ mutex_init(&device.item_list_lock); ++ if (umplock_device_initialize() != 0) { ++ PERROR("UMP lock device driver init failed\n"); ++ return -ENOTTY; ++ } ++ memset(&device.items, 0, sizeof(umplock_item) * MAX_ITEMS); ++ memset(&device.pids, 0, sizeof(u32) * MAX_PIDS); ++ atomic_set(&device.sessions, 0); ++ ++ PDEBUG(1, "UMP lock device driver loaded\n"); ++ ++ return 0; +} + -+int kbase_sync_fence_out_create(struct kbase_jd_atom *katom, int tl_fd) ++static void __exit umplock_cleanup_module(void) +{ -+ struct sync_timeline *tl; -+ struct sync_pt *pt; -+ struct sync_fence *fence; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0) -+ struct files_struct *files; -+ struct fdtable *fdt; -+#endif -+ int fd; -+ struct file *tl_file; ++ PDEBUG(1, "unloading UMP lock module\n"); + -+ tl_file = fget(tl_fd); -+ if (tl_file == NULL) -+ return -EBADF; ++ memset(&device.items, 0, sizeof(umplock_item) * MAX_ITEMS); ++ memset(&device.pids, 0, sizeof(u32) * MAX_PIDS); ++ umplock_device_terminate(); ++ mutex_destroy(&device.item_list_lock); + -+ if (tl_file->f_op != &stream_fops) { -+ fd = -EBADF; -+ goto out; -+ } ++ PDEBUG(1, "UMP lock module unloaded\n"); ++} + -+ tl = tl_file->private_data; ++module_init(umplock_initialize_module); ++module_exit(umplock_cleanup_module); + -+ pt = kbase_sync_pt_alloc(tl); -+ if (!pt) { -+ fd = -EFAULT; -+ goto out; -+ } + -+ fence = sync_fence_create("mali_fence", pt); -+ if (!fence) { -+ sync_pt_free(pt); -+ fd = -EFAULT; -+ goto out; -+ } ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("ARM Ltd."); ++MODULE_DESCRIPTION("ARM UMP locker"); +diff --git a/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h b/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h +new file mode 100755 +index 000000000..8afdaad70 +--- /dev/null ++++ b/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h +@@ -0,0 +1,66 @@ ++/* ++ * Copyright (C) 2012-2013, 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained from Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ + -+ /* from here the fence owns the sync_pt */ ++#ifndef __UMPLOCK_IOCTL_H__ ++#define __UMPLOCK_IOCTL_H__ + -+ /* create a fd representing the fence */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) -+ fd = get_unused_fd_flags(O_RDWR | O_CLOEXEC); -+ if (fd < 0) { -+ sync_fence_put(fence); -+ goto out; -+ } -+#else -+ fd = get_unused_fd(); -+ if (fd < 0) { -+ sync_fence_put(fence); -+ goto out; -+ } ++#ifdef __cplusplus ++extern "C" { ++#endif + -+ files = current->files; -+ spin_lock(&files->file_lock); -+ fdt = files_fdtable(files); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) -+ __set_close_on_exec(fd, fdt); -+#else -+ FD_SET(fd, fdt->close_on_exec); ++#include ++#include ++ ++#ifndef __user ++#define __user +#endif -+ spin_unlock(&files->file_lock); -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) */ + -+ /* bind fence to the new fd */ -+ sync_fence_install(fence, fd); + -+ katom->fence = sync_fence_fdget(fd); -+ if (katom->fence == NULL) { -+ /* The only way the fence can be NULL is if userspace closed it -+ * for us, so we don't need to clear it up */ -+ fd = -EINVAL; -+ goto out; -+ } ++/** ++ * @file umplock_ioctl.h ++ * This file describes the interface needed to use the Linux device driver. ++ * The interface is used by the userpace Mali DDK. ++ */ + -+out: -+ fput(tl_file); ++typedef enum { ++ _LOCK_ACCESS_RENDERABLE = 1, ++ _LOCK_ACCESS_TEXTURE, ++ _LOCK_ACCESS_CPU_WRITE, ++ _LOCK_ACCESS_CPU_READ, ++} _lock_access_usage; + -+ return fd; -+} ++typedef struct _lock_item_s { ++ unsigned int secure_id; ++ _lock_access_usage usage; ++} _lock_item_s; + -+int kbase_sync_fence_in_from_fd(struct kbase_jd_atom *katom, int fd) -+{ -+ katom->fence = sync_fence_fdget(fd); -+ return katom->fence ? 0 : -ENOENT; -+} + -+int kbase_sync_fence_validate(int fd) -+{ -+ struct sync_fence *fence; ++#define LOCK_IOCTL_GROUP 0x91 + -+ fence = sync_fence_fdget(fd); -+ if (!fence) -+ return -EINVAL; ++#define _LOCK_IOCTL_CREATE_CMD 0 /* create kernel lock item */ ++#define _LOCK_IOCTL_PROCESS_CMD 1 /* process kernel lock item */ ++#define _LOCK_IOCTL_RELEASE_CMD 2 /* release kernel lock item */ ++#define _LOCK_IOCTL_ZAP_CMD 3 /* clean up all kernel lock items */ ++#define _LOCK_IOCTL_DUMP_CMD 4 /* dump all the items */ + -+ sync_fence_put(fence); -+ return 0; -+} ++#define LOCK_IOCTL_MAX_CMDS 5 + -+/* Returns true if the specified timeline is allocated by Mali */ -+static int kbase_sync_timeline_is_ours(struct sync_timeline *timeline) -+{ -+ return timeline->ops == &mali_timeline_ops; ++#define LOCK_IOCTL_CREATE _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_CREATE_CMD, _lock_item_s ) ++#define LOCK_IOCTL_PROCESS _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_PROCESS_CMD, _lock_item_s ) ++#define LOCK_IOCTL_RELEASE _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_RELEASE_CMD, _lock_item_s ) ++#define LOCK_IOCTL_ZAP _IO ( LOCK_IOCTL_GROUP, _LOCK_IOCTL_ZAP_CMD ) ++#define LOCK_IOCTL_DUMP _IO ( LOCK_IOCTL_GROUP, _LOCK_IOCTL_DUMP_CMD ) ++ ++#ifdef __cplusplus +} ++#endif + -+/* Signals a particular sync point -+ * -+ * Sync points must be triggered in *exactly* the same order as they are -+ * allocated. -+ * -+ * If they are signaled in the wrong order then a message will be printed in -+ * debug builds and otherwise attempts to signal order sync_pts will be ignored. -+ * -+ * result can be negative to indicate error, any other value is interpreted as -+ * success. -+ */ -+static void kbase_sync_signal_pt(struct sync_pt *pt, int result) -+{ -+ struct mali_sync_pt *mpt = to_mali_sync_pt(pt); -+ struct mali_sync_timeline *mtl = to_mali_sync_timeline( -+ sync_pt_parent(pt)); -+ int signaled; -+ int diff; ++#endif /* __UMPLOCK_IOCTL_H__ */ + -+ mpt->result = result; +diff --git a/drivers/gpu/arm/midgard/Kbuild b/drivers/gpu/arm/midgard/Kbuild +new file mode 100755 +index 000000000..b2c2bbcda +--- /dev/null ++++ b/drivers/gpu/arm/midgard/Kbuild +@@ -0,0 +1,221 @@ ++# ++# (C) COPYRIGHT 2012-2016, 2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+ do { -+ signaled = atomic_read(&mtl->signaled); ++KBUILD_CFLAGS += -include rename.h + -+ diff = signaled - mpt->order; ++# Driver version string which is returned to userspace via an ioctl ++MALI_RELEASE_NAME ?= "r18p0-01rel0" + -+ if (diff > 0) { -+ /* The timeline is already at or ahead of this point. -+ * This should not happen unless userspace has been -+ * signaling fences out of order, so warn but don't -+ * violate the sync_pt API. -+ * The warning is only in debug builds to prevent -+ * a malicious user being able to spam dmesg. -+ */ -+#ifdef CONFIG_MALI_BIFROST_DEBUG -+ pr_err("Fences were triggered in a different order to allocation!"); -+#endif /* CONFIG_MALI_BIFROST_DEBUG */ -+ return; -+ } -+ } while (atomic_cmpxchg(&mtl->signaled, -+ signaled, mpt->order) != signaled); -+} ++# Paths required for build + -+enum base_jd_event_code -+kbase_sync_fence_out_trigger(struct kbase_jd_atom *katom, int result) -+{ -+ struct sync_pt *pt; -+ struct sync_timeline *timeline; ++# make $(src) as absolute path if it isn't already, by prefixing $(srctree) ++src:=$(if $(patsubst /%,,$(src)),$(srctree)/$(src),$(src)) ++KBASE_PATH = $(src) ++KBASE_PLATFORM_PATH = $(KBASE_PATH)/platform_dummy ++UMP_PATH = $(src)/../../../base + -+ if (!katom->fence) -+ return BASE_JD_EVENT_JOB_CANCELLED; ++ifeq ($(CONFIG_MALI_ERROR_INJECTION),y) ++MALI_ERROR_INJECT_ON = 1 ++endif + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) -+ if (!list_is_singular(&katom->fence->pt_list_head)) { -+#else -+ if (katom->fence->num_fences != 1) { -+#endif -+ /* Not exactly one item in the list - so it didn't (directly) -+ * come from us */ -+ return BASE_JD_EVENT_JOB_CANCELLED; -+ } ++# Set up defaults if not defined by build system ++MALI_CUSTOMER_RELEASE ?= 1 ++MALI_UNIT_TEST ?= 0 ++MALI_KERNEL_TEST_API ?= 0 ++MALI_ERROR_INJECT_ON ?= 0 ++MALI_MOCK_TEST ?= 0 ++MALI_COVERAGE ?= 0 ++MALI_INSTRUMENTATION_LEVEL ?= 0 ++# This workaround is for what seems to be a compiler bug we observed in ++# GCC 4.7 on AOSP 4.3. The bug caused an intermittent failure compiling ++# the "_Pragma" syntax, where an error message is returned: ++# ++# "internal compiler error: unspellable token PRAGMA" ++# ++# This regression has thus far only been seen on the GCC 4.7 compiler bundled ++# with AOSP 4.3.0. So this makefile, intended for in-tree kernel builds ++# which are not known to be used with AOSP, is hardcoded to disable the ++# workaround, i.e. set the define to 0. ++MALI_GCC_WORKAROUND_MIDCOM_4598 ?= 0 + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) -+ pt = list_first_entry(&katom->fence->pt_list_head, -+ struct sync_pt, pt_list); -+#else -+ pt = container_of(katom->fence->cbs[0].sync_pt, struct sync_pt, base); -+#endif -+ timeline = sync_pt_parent(pt); ++# Set up our defines, which will be passed to gcc ++DEFINES = \ ++ -DMALI_CUSTOMER_RELEASE=$(MALI_CUSTOMER_RELEASE) \ ++ -DMALI_KERNEL_TEST_API=$(MALI_KERNEL_TEST_API) \ ++ -DMALI_UNIT_TEST=$(MALI_UNIT_TEST) \ ++ -DMALI_ERROR_INJECT_ON=$(MALI_ERROR_INJECT_ON) \ ++ -DMALI_MOCK_TEST=$(MALI_MOCK_TEST) \ ++ -DMALI_COVERAGE=$(MALI_COVERAGE) \ ++ -DMALI_INSTRUMENTATION_LEVEL=$(MALI_INSTRUMENTATION_LEVEL) \ ++ -DMALI_RELEASE_NAME=\"$(MALI_RELEASE_NAME)\" \ ++ -DMALI_GCC_WORKAROUND_MIDCOM_4598=$(MALI_GCC_WORKAROUND_MIDCOM_4598) + -+ if (!kbase_sync_timeline_is_ours(timeline)) { -+ /* Fence has a sync_pt which isn't ours! */ -+ return BASE_JD_EVENT_JOB_CANCELLED; -+ } ++ifeq ($(KBUILD_EXTMOD),) ++# in-tree ++DEFINES +=-DMALI_KBASE_THIRDPARTY_PATH=../../$(src)/platform/$(CONFIG_MALI_PLATFORM_THIRDPARTY_NAME) ++else ++# out-of-tree ++DEFINES +=-DMALI_KBASE_THIRDPARTY_PATH=$(src)/platform/$(CONFIG_MALI_PLATFORM_THIRDPARTY_NAME) ++endif + -+ kbase_sync_signal_pt(pt, result); ++DEFINES += -I$(srctree)/drivers/staging/android + -+ sync_timeline_signal(timeline); ++# Use our defines when compiling ++ccflags-y += $(DEFINES) -I$(KBASE_PATH) -I$(KBASE_PLATFORM_PATH) -I$(UMP_PATH) -I$(srctree)/include/linux ++subdir-ccflags-y += $(DEFINES) -I$(KBASE_PATH) -I$(KBASE_PLATFORM_PATH) -I$(OSK_PATH) -I$(UMP_PATH) -I$(srctree)/include/linux + -+ kbase_sync_fence_out_remove(katom); ++SRC := \ ++ mali_kbase_device.c \ ++ mali_kbase_cache_policy.c \ ++ mali_kbase_mem.c \ ++ mali_kbase_mmu.c \ ++ mali_kbase_ctx_sched.c \ ++ mali_kbase_jd.c \ ++ mali_kbase_jd_debugfs.c \ ++ mali_kbase_jm.c \ ++ mali_kbase_gpuprops.c \ ++ mali_kbase_js.c \ ++ mali_kbase_js_ctx_attr.c \ ++ mali_kbase_event.c \ ++ mali_kbase_context.c \ ++ mali_kbase_pm.c \ ++ mali_kbase_config.c \ ++ mali_kbase_vinstr.c \ ++ mali_kbase_softjobs.c \ ++ mali_kbase_10969_workaround.c \ ++ mali_kbase_hw.c \ ++ mali_kbase_utility.c \ ++ mali_kbase_debug.c \ ++ mali_kbase_trace_timeline.c \ ++ mali_kbase_gpu_memory_debugfs.c \ ++ mali_kbase_mem_linux.c \ ++ mali_kbase_core_linux.c \ ++ mali_kbase_replay.c \ ++ mali_kbase_mem_profile_debugfs.c \ ++ mali_kbase_mmu_mode_lpae.c \ ++ mali_kbase_mmu_mode_aarch64.c \ ++ mali_kbase_disjoint_events.c \ ++ mali_kbase_gator_api.c \ ++ mali_kbase_debug_mem_view.c \ ++ mali_kbase_debug_job_fault.c \ ++ mali_kbase_smc.c \ ++ mali_kbase_mem_pool.c \ ++ mali_kbase_mem_pool_debugfs.c \ ++ mali_kbase_tlstream.c \ ++ mali_kbase_strings.c \ ++ mali_kbase_as_fault_debugfs.c \ ++ mali_kbase_regs_history_debugfs.c + -+ return (result < 0) ? BASE_JD_EVENT_JOB_CANCELLED : BASE_JD_EVENT_DONE; -+} + -+static inline int kbase_fence_get_status(struct sync_fence *fence) -+{ -+ if (!fence) -+ return -ENOENT; + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) -+ return fence->status; -+#else -+ return atomic_read(&fence->status); -+#endif -+} + -+static void kbase_fence_wait_callback(struct sync_fence *fence, -+ struct sync_fence_waiter *waiter) -+{ -+ struct kbase_jd_atom *katom = container_of(waiter, -+ struct kbase_jd_atom, sync_waiter); -+ struct kbase_context *kctx = katom->kctx; ++ifeq ($(MALI_UNIT_TEST),1) ++ SRC += mali_kbase_tlstream_test.c ++endif + -+ /* Propagate the fence status to the atom. -+ * If negative then cancel this atom and its dependencies. -+ */ -+ if (kbase_fence_get_status(fence) < 0) -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ifeq ($(MALI_CUSTOMER_RELEASE),0) ++ SRC += mali_kbase_regs_dump_debugfs.c ++endif + -+ /* To prevent a potential deadlock we schedule the work onto the -+ * job_done_wq workqueue -+ * -+ * The issue is that we may signal the timeline while holding -+ * kctx->jctx.lock and the callbacks are run synchronously from -+ * sync_timeline_signal. So we simply defer the work. -+ */ + -+ INIT_WORK(&katom->work, kbase_sync_fence_wait_worker); -+ queue_work(kctx->jctx.job_done_wq, &katom->work); -+} ++ccflags-y += -I$(KBASE_PATH) + -+int kbase_sync_fence_in_wait(struct kbase_jd_atom *katom) -+{ -+ int ret; ++ifeq ($(CONFIG_MALI_PLATFORM_FAKE),y) ++ SRC += mali_kbase_platform_fake.c + -+ sync_fence_waiter_init(&katom->sync_waiter, kbase_fence_wait_callback); ++ ifeq ($(CONFIG_MALI_PLATFORM_VEXPRESS),y) ++ SRC += platform/vexpress/mali_kbase_config_vexpress.c \ ++ platform/vexpress/mali_kbase_cpu_vexpress.c ++ ccflags-y += -I$(src)/platform/vexpress ++ endif + -+ ret = sync_fence_wait_async(katom->fence, &katom->sync_waiter); ++ ifeq ($(CONFIG_MALI_PLATFORM_RTSM_VE),y) ++ SRC += platform/rtsm_ve/mali_kbase_config_vexpress.c ++ ccflags-y += -I$(src)/platform/rtsm_ve ++ endif + -+ if (ret == 1) { -+ /* Already signaled */ -+ return 0; -+ } ++ ifeq ($(CONFIG_MALI_PLATFORM_VEXPRESS_1XV7_A57),y) ++ SRC += platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c ++ ccflags-y += -I$(src)/platform/vexpress_1xv7_a57 ++ endif + -+ if (ret < 0) { -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ /* We should cause the dependent jobs in the bag to be failed, -+ * to do this we schedule the work queue to complete this job */ -+ INIT_WORK(&katom->work, kbase_sync_fence_wait_worker); -+ queue_work(katom->kctx->jctx.job_done_wq, &katom->work); -+ } ++ ifeq ($(CONFIG_MALI_PLATFORM_VEXPRESS_6XVIRTEX7_10MHZ),y) ++ SRC += platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c \ ++ platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c ++ ccflags-y += -I$(src)/platform/vexpress_6xvirtex7_10mhz ++ endif ++endif # CONFIG_MALI_PLATFORM_FAKE=y + -+ return 1; -+} ++# Tell the Linux build system from which .o file to create the kernel module ++obj-$(CONFIG_MALI_MIDGARD) += midgard_kbase.o + -+void kbase_sync_fence_in_cancel_wait(struct kbase_jd_atom *katom) -+{ -+ if (sync_fence_cancel_async(katom->fence, &katom->sync_waiter) != 0) { -+ /* The wait wasn't cancelled - leave the cleanup for -+ * kbase_fence_wait_callback */ -+ return; -+ } ++# Tell the Linux build system to enable building of our .c files ++midgard_kbase-y := $(SRC:.c=.o) + -+ /* Wait was cancelled - zap the atoms */ -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ifeq ($(CONFIG_MALI_PLATFORM_THIRDPARTY),y) ++ # Kconfig passes in the name with quotes for in-tree builds - remove them. ++ platform_name := $(shell echo $(CONFIG_MALI_PLATFORM_THIRDPARTY_NAME)) ++ MALI_PLATFORM_THIRDPARTY_DIR := platform/$(platform_name) ++ ccflags-y += -I$(src)/$(MALI_PLATFORM_THIRDPARTY_DIR) ++ include $(src)/$(MALI_PLATFORM_THIRDPARTY_DIR)/Kbuild ++endif + -+ kbasep_remove_waiting_soft_job(katom); -+ kbase_finish_soft_job(katom); ++ifeq ($(CONFIG_MALI_DEVFREQ),y) ++ ifeq ($(CONFIG_DEVFREQ_THERMAL),y) ++ include $(src)/ipa/Kbuild ++ endif ++endif + -+ if (jd_done_nolock(katom, NULL)) -+ kbase_js_sched_all(katom->kctx->kbdev); -+} ++midgard_kbase-$(CONFIG_MALI_DMA_FENCE) += \ ++ mali_kbase_dma_fence.o \ ++ mali_kbase_fence.o ++midgard_kbase-$(CONFIG_SYNC) += \ ++ mali_kbase_sync_android.o \ ++ mali_kbase_sync_common.o ++midgard_kbase-$(CONFIG_SYNC_FILE) += \ ++ mali_kbase_sync_file.o \ ++ mali_kbase_sync_common.o \ ++ mali_kbase_fence.o + -+void kbase_sync_fence_out_remove(struct kbase_jd_atom *katom) -+{ -+ if (katom->fence) { -+ sync_fence_put(katom->fence); -+ katom->fence = NULL; -+ } -+} ++MALI_BACKEND_PATH ?= backend ++CONFIG_MALI_BACKEND ?= gpu ++CONFIG_MALI_BACKEND_REAL ?= $(CONFIG_MALI_BACKEND) + -+void kbase_sync_fence_in_remove(struct kbase_jd_atom *katom) -+{ -+ if (katom->fence) { -+ sync_fence_put(katom->fence); -+ katom->fence = NULL; -+ } -+} ++ifeq ($(MALI_MOCK_TEST),1) ++ifeq ($(CONFIG_MALI_BACKEND_REAL),gpu) ++# Test functionality ++midgard_kbase-y += tests/internal/src/mock/mali_kbase_pm_driver_mock.o ++endif ++endif + -+int kbase_sync_fence_in_info_get(struct kbase_jd_atom *katom, -+ struct kbase_sync_fence_info *info) -+{ -+ if (!katom->fence) -+ return -ENOENT; ++include $(src)/$(MALI_BACKEND_PATH)/$(CONFIG_MALI_BACKEND_REAL)/Kbuild ++midgard_kbase-y += $(BACKEND:.c=.o) + -+ info->fence = katom->fence; -+ info->status = kbase_fence_get_status(katom->fence); -+ strlcpy(info->name, katom->fence->name, sizeof(info->name)); + -+ return 0; -+} ++ccflags-y += -I$(src)/$(MALI_BACKEND_PATH)/$(CONFIG_MALI_BACKEND_REAL) ++subdir-ccflags-y += -I$(src)/$(MALI_BACKEND_PATH)/$(CONFIG_MALI_BACKEND_REAL) + -+int kbase_sync_fence_out_info_get(struct kbase_jd_atom *katom, -+ struct kbase_sync_fence_info *info) -+{ -+ if (!katom->fence) -+ return -ENOENT; ++# Default to devicetree platform if neither a fake platform or a thirdparty ++# platform is configured. ++ifeq ($(CONFIG_MALI_PLATFORM_THIRDPARTY)$(CONFIG_MALI_PLATFORM_FAKE),) ++CONFIG_MALI_PLATFORM_DEVICETREE := y ++endif + -+ info->fence = katom->fence; -+ info->status = kbase_fence_get_status(katom->fence); -+ strlcpy(info->name, katom->fence->name, sizeof(info->name)); ++midgard_kbase-$(CONFIG_MALI_PLATFORM_DEVICETREE) += \ ++ platform/devicetree/mali_kbase_runtime_pm.o \ ++ platform/devicetree/mali_kbase_config_devicetree.o ++ccflags-$(CONFIG_MALI_PLATFORM_DEVICETREE) += -I$(src)/platform/devicetree + -+ return 0; -+} ++# For kutf and mali_kutf_irq_latency_test ++obj-$(CONFIG_MALI_KUTF) += tests/ +diff --git a/drivers/gpu/arm/midgard/Kconfig b/drivers/gpu/arm/midgard/Kconfig +new file mode 100755 +index 000000000..043bfc002 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/Kconfig +@@ -0,0 +1,249 @@ ++# ++# (C) COPYRIGHT 2012-2015 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG -+void kbase_sync_fence_in_dump(struct kbase_jd_atom *katom) ++ ++ ++menuconfig MALI_MIDGARD ++ tristate "Mali Midgard series support" ++ select GPU_TRACEPOINTS if ANDROID ++ default n ++ help ++ Enable this option to build support for a ARM Mali Midgard GPU. ++ ++ To compile this driver as a module, choose M here: ++ this will generate a single module, called mali_kbase. ++ ++config MALI_GATOR_SUPPORT ++ bool "Streamline support via Gator" ++ depends on MALI_MIDGARD ++ default n ++ help ++ Adds diagnostic support for use with the ARM Streamline Performance Analyzer. ++ You will need the Gator device driver already loaded before loading this driver when enabling ++ Streamline debug support. ++ This is a legacy interface required by older versions of Streamline. ++ ++config MALI_MIDGARD_DVFS ++ bool "Enable legacy DVFS" ++ depends on MALI_MIDGARD && !MALI_DEVFREQ && !MALI_PLATFORM_DEVICETREE ++ default n ++ help ++ Choose this option to enable legacy DVFS in the Mali Midgard DDK. ++ ++config MALI_MIDGARD_ENABLE_TRACE ++ bool "Enable kbase tracing" ++ depends on MALI_MIDGARD ++ default n ++ help ++ Enables tracing in kbase. Trace log available through ++ the "mali_trace" debugfs file, when the CONFIG_DEBUG_FS is enabled ++ ++config MALI_DEVFREQ ++ bool "devfreq support for Mali" ++ depends on MALI_MIDGARD && PM_DEVFREQ ++ select DEVFREQ_GOV_SIMPLE_ONDEMAND ++ help ++ Support devfreq for Mali. ++ ++ Using the devfreq framework and, by default, the simpleondemand ++ governor, the frequency of Mali will be dynamically selected from the ++ available OPPs. ++ ++config MALI_DMA_FENCE ++ bool "DMA_BUF fence support for Mali" ++ depends on MALI_MIDGARD && !KDS ++ default n ++ help ++ Support DMA_BUF fences for Mali. ++ ++ This option should only be enabled if KDS is not present and ++ the Linux Kernel has built in support for DMA_BUF fences. ++ ++# MALI_EXPERT configuration options ++ ++menuconfig MALI_EXPERT ++ depends on MALI_MIDGARD ++ bool "Enable Expert Settings" ++ default n ++ help ++ Enabling this option and modifying the default settings may produce a driver with performance or ++ other limitations. ++ ++config MALI_CORESTACK ++ bool "Support controlling power to the GPU core stack" ++ depends on MALI_MIDGARD && MALI_EXPERT ++ default n ++ help ++ Enabling this feature on supported GPUs will let the driver powering ++ on/off the GPU core stack independently without involving the Power ++ Domain Controller. This should only be enabled on platforms which ++ integration of the PDC to the Mali GPU is known to be problematic. ++ This feature is currently only supported on t-Six and t-HEx GPUs. ++ ++ If unsure, say N. ++ ++config MALI_PRFCNT_SET_SECONDARY ++ bool "Use secondary set of performance counters" ++ depends on MALI_MIDGARD && MALI_EXPERT ++ default n ++ help ++ Select this option to use secondary set of performance counters. Kernel ++ features that depend on an access to the primary set of counters may ++ become unavailable. Enabling this option will prevent power management ++ from working optimally and may cause instrumentation tools to return ++ bogus results. ++ ++ If unsure, say N. ++ ++config MALI_PLATFORM_FAKE ++ bool "Enable fake platform device support" ++ depends on MALI_MIDGARD && MALI_EXPERT ++ default n ++ help ++ When you start to work with the Mali Midgard series device driver the platform-specific code of ++ the Linux kernel for your platform may not be complete. In this situation the kernel device driver ++ supports creating the platform device outside of the Linux platform-specific code. ++ Enable this option if would like to use a platform device configuration from within the device driver. ++ ++choice ++ prompt "Platform configuration" ++ depends on MALI_MIDGARD && MALI_EXPERT ++ default MALI_PLATFORM_DEVICETREE ++ help ++ Select the SOC platform that contains a Mali Midgard GPU ++ ++config MALI_PLATFORM_DEVICETREE ++ bool "Device Tree platform" ++ depends on OF ++ help ++ Select this option to use Device Tree with the Mali driver. ++ ++ When using this option the Mali driver will get the details of the ++ GPU hardware from the Device Tree. This means that the same driver ++ binary can run on multiple platforms as long as all the GPU hardware ++ details are described in the device tree. ++ ++ Device Tree is the recommended method for the Mali driver platform ++ integration. ++ ++config MALI_PLATFORM_VEXPRESS ++ depends on ARCH_VEXPRESS && (ARCH_VEXPRESS_CA9X4 || ARCH_VEXPRESS_CA15X4) ++ bool "Versatile Express" ++config MALI_PLATFORM_VEXPRESS_VIRTEX7_40MHZ ++ depends on ARCH_VEXPRESS && (ARCH_VEXPRESS_CA9X4 || ARCH_VEXPRESS_CA15X4) ++ bool "Versatile Express w/Virtex7 @ 40Mhz" ++config MALI_PLATFORM_GOLDFISH ++ depends on ARCH_GOLDFISH ++ bool "Android Goldfish virtual CPU" ++config MALI_PLATFORM_PBX ++ depends on ARCH_REALVIEW && REALVIEW_EB_A9MP && MACH_REALVIEW_PBX ++ bool "Realview PBX-A9" ++config MALI_PLATFORM_THIRDPARTY ++ bool "Third Party Platform" ++endchoice ++ ++config MALI_PLATFORM_THIRDPARTY_NAME ++ depends on MALI_MIDGARD && MALI_PLATFORM_THIRDPARTY && MALI_EXPERT ++ string "Third party platform name" ++ help ++ Enter the name of a third party platform that is supported. The third part configuration ++ file must be in midgard/config/tpip/mali_kbase_config_xxx.c where xxx is the name ++ specified here. ++ ++config MALI_DEBUG ++ bool "Debug build" ++ depends on MALI_MIDGARD && MALI_EXPERT ++ default n ++ help ++ Select this option for increased checking and reporting of errors. ++ ++config MALI_FENCE_DEBUG ++ bool "Debug sync fence usage" ++ depends on MALI_MIDGARD && MALI_EXPERT && (SYNC || SYNC_FILE) ++ default y if MALI_DEBUG ++ help ++ Select this option to enable additional checking and reporting on the ++ use of sync fences in the Mali driver. ++ ++ This will add a 3s timeout to all sync fence waits in the Mali ++ driver, so that when work for Mali has been waiting on a sync fence ++ for a long time a debug message will be printed, detailing what fence ++ is causing the block, and which dependent Mali atoms are blocked as a ++ result of this. ++ ++ The timeout can be changed at runtime through the js_soft_timeout ++ device attribute, where the timeout is specified in milliseconds. ++ ++config MALI_NO_MALI ++ bool "No Mali" ++ depends on MALI_MIDGARD && MALI_EXPERT ++ default n ++ help ++ This can be used to test the driver in a simulated environment ++ whereby the hardware is not physically present. If the hardware is physically ++ present it will not be used. This can be used to test the majority of the ++ driver without needing actual hardware or for software benchmarking. ++ All calls to the simulated hardware will complete immediately as if the hardware ++ completed the task. ++ ++config MALI_ERROR_INJECT ++ bool "Error injection" ++ depends on MALI_MIDGARD && MALI_EXPERT && MALI_NO_MALI ++ default n ++ help ++ Enables insertion of errors to test module failure and recovery mechanisms. ++ ++config MALI_TRACE_TIMELINE ++ bool "Timeline tracing" ++ depends on MALI_MIDGARD && MALI_EXPERT ++ default n ++ help ++ Enables timeline tracing through the kernel tracepoint system. ++ ++config MALI_SYSTEM_TRACE ++ bool "Enable system event tracing support" ++ depends on MALI_MIDGARD && MALI_EXPERT ++ default n ++ help ++ Choose this option to enable system trace events for each ++ kbase event. This is typically used for debugging but has ++ minimal overhead when not in use. Enable only if you know what ++ you are doing. ++ ++config MALI_GPU_MMU_AARCH64 ++ bool "Use AArch64 page tables" ++ depends on MALI_MIDGARD && MALI_EXPERT ++ default n ++ help ++ Use AArch64 format page tables for the GPU instead of LPAE-style. ++ The two formats have the same functionality and performance but a ++ future GPU may deprecate or remove the legacy LPAE-style format. ++ ++ The LPAE-style format is supported on all Midgard and current Bifrost ++ GPUs. Enabling AArch64 format restricts the driver to only supporting ++ Bifrost GPUs. ++ ++ If in doubt, say N. ++ ++config MALI_PWRSOFT_765 ++ bool "PWRSOFT-765 ticket" ++ depends on MALI_MIDGARD && MALI_EXPERT ++ default n ++ help ++ PWRSOFT-765 fixes devfreq cooling devices issues. However, they are ++ not merged in mainline kernel yet. So this define helps to guard those ++ parts of the code. ++ ++source "drivers/gpu/arm/midgard/platform/Kconfig" ++source "drivers/gpu/arm/midgard/tests/Kconfig" +diff --git a/drivers/gpu/arm/midgard/Makefile b/drivers/gpu/arm/midgard/Makefile +new file mode 100755 +index 000000000..9aa242c4f +--- /dev/null ++++ b/drivers/gpu/arm/midgard/Makefile +@@ -0,0 +1,42 @@ ++# ++# (C) COPYRIGHT 2010-2016, 2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# ++ ++ ++ ++KDIR ?= /lib/modules/$(shell uname -r)/build ++ ++BUSLOG_PATH_RELATIVE = $(CURDIR)/../../../.. ++UMP_PATH_RELATIVE = $(CURDIR)/../../../base/ump ++KBASE_PATH_RELATIVE = $(CURDIR) ++KDS_PATH_RELATIVE = $(CURDIR)/../../../.. ++EXTRA_SYMBOLS = $(UMP_PATH_RELATIVE)/src/Module.symvers ++ ++ifeq ($(MALI_UNIT_TEST), 1) ++ EXTRA_SYMBOLS += $(KBASE_PATH_RELATIVE)/tests/internal/src/kernel_assert_module/linux/Module.symvers ++endif ++ ++ifeq ($(MALI_BUS_LOG), 1) ++#Add bus logger symbols ++EXTRA_SYMBOLS += $(BUSLOG_PATH_RELATIVE)/drivers/base/bus_logger/Module.symvers ++endif ++ ++# GPL driver supports KDS ++EXTRA_SYMBOLS += $(KDS_PATH_RELATIVE)/drivers/base/kds/Module.symvers ++ ++# we get the symbols from modules using KBUILD_EXTRA_SYMBOLS to prevent warnings about unknown functions ++all: ++ $(MAKE) -C $(KDIR) M=$(CURDIR) EXTRA_CFLAGS="-I$(CURDIR)/../../../../include -I$(CURDIR)/../../../../tests/include $(SCONS_CFLAGS)" $(SCONS_CONFIGS) KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" modules ++ ++clean: ++ $(MAKE) -C $(KDIR) M=$(CURDIR) clean +diff --git a/drivers/gpu/arm/midgard/Makefile.kbase b/drivers/gpu/arm/midgard/Makefile.kbase +new file mode 100755 +index 000000000..2bef9c25e +--- /dev/null ++++ b/drivers/gpu/arm/midgard/Makefile.kbase +@@ -0,0 +1,17 @@ ++# ++# (C) COPYRIGHT 2010 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# ++ ++ ++EXTRA_CFLAGS += -I$(ROOT) -I$(KBASE_PATH) -I$(OSK_PATH)/src/linux/include -I$(KBASE_PATH)/platform_$(PLATFORM) ++ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/Kbuild b/drivers/gpu/arm/midgard/backend/gpu/Kbuild +new file mode 100755 +index 000000000..5f700e9b6 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/Kbuild +@@ -0,0 +1,60 @@ ++# ++# (C) COPYRIGHT 2014,2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# ++ ++ ++BACKEND += \ ++ backend/gpu/mali_kbase_cache_policy_backend.c \ ++ backend/gpu/mali_kbase_device_hw.c \ ++ backend/gpu/mali_kbase_gpu.c \ ++ backend/gpu/mali_kbase_gpuprops_backend.c \ ++ backend/gpu/mali_kbase_debug_job_fault_backend.c \ ++ backend/gpu/mali_kbase_irq_linux.c \ ++ backend/gpu/mali_kbase_instr_backend.c \ ++ backend/gpu/mali_kbase_jm_as.c \ ++ backend/gpu/mali_kbase_jm_hw.c \ ++ backend/gpu/mali_kbase_jm_rb.c \ ++ backend/gpu/mali_kbase_js_affinity.c \ ++ backend/gpu/mali_kbase_js_backend.c \ ++ backend/gpu/mali_kbase_mmu_hw_direct.c \ ++ backend/gpu/mali_kbase_pm_backend.c \ ++ backend/gpu/mali_kbase_pm_driver.c \ ++ backend/gpu/mali_kbase_pm_metrics.c \ ++ backend/gpu/mali_kbase_pm_ca.c \ ++ backend/gpu/mali_kbase_pm_ca_fixed.c \ ++ backend/gpu/mali_kbase_pm_always_on.c \ ++ backend/gpu/mali_kbase_pm_coarse_demand.c \ ++ backend/gpu/mali_kbase_pm_demand.c \ ++ backend/gpu/mali_kbase_pm_policy.c \ ++ backend/gpu/mali_kbase_time.c ++ ++ifeq ($(MALI_CUSTOMER_RELEASE),0) ++BACKEND += \ ++ backend/gpu/mali_kbase_pm_ca_random.c \ ++ backend/gpu/mali_kbase_pm_demand_always_powered.c \ ++ backend/gpu/mali_kbase_pm_fast_start.c ++endif ++ ++ifeq ($(CONFIG_MALI_DEVFREQ),y) ++BACKEND += \ ++ backend/gpu/mali_kbase_devfreq.c \ ++ backend/gpu/mali_kbase_pm_ca_devfreq.c ++endif ++ ++ifeq ($(CONFIG_MALI_NO_MALI),y) ++ # Dummy model ++ BACKEND += backend/gpu/mali_kbase_model_dummy.c ++ BACKEND += backend/gpu/mali_kbase_model_linux.c ++ # HW error simulation ++ BACKEND += backend/gpu/mali_kbase_model_error_generator.c ++endif +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h +new file mode 100755 +index 000000000..c8ae87eb8 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h +@@ -0,0 +1,29 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ ++ ++ ++ ++/* ++ * Backend specific configuration ++ */ ++ ++#ifndef _KBASE_BACKEND_CONFIG_H_ ++#define _KBASE_BACKEND_CONFIG_H_ ++ ++/* Enable GPU reset API */ ++#define KBASE_GPU_RESET_EN 1 ++ ++#endif /* _KBASE_BACKEND_CONFIG_H_ */ ++ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c +new file mode 100755 +index 000000000..fef9a2cb7 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c +@@ -0,0 +1,29 @@ ++/* ++ * ++ * (C) COPYRIGHT 2015-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ ++ ++ ++ ++#include "backend/gpu/mali_kbase_cache_policy_backend.h" ++#include ++ ++void kbase_cache_set_coherency_mode(struct kbase_device *kbdev, ++ u32 mode) +{ -+ /* Dump out the full state of all the Android sync fences. -+ * The function sync_dump() isn't exported to modules, so force -+ * sync_fence_wait() to time out to trigger sync_dump(). -+ */ -+ if (katom->fence) -+ sync_fence_wait(katom->fence, 1); ++ kbdev->current_gpu_coherency_mode = mode; ++ ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_COHERENCY_REG)) ++ kbase_reg_write(kbdev, COHERENCY_ENABLE, mode, NULL); +} -+#endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_common.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_common.c ++ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h new file mode 100755 -index 000000000000..457def296684 +index 000000000..fe9869109 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_common.c -@@ -0,0 +1,43 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h +@@ -0,0 +1,34 @@ +/* + * -+ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2015-2016 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -323073,41 +359919,195 @@ index 000000000000..457def296684 + + + ++ ++#ifndef _KBASE_CACHE_POLICY_BACKEND_H_ ++#define _KBASE_CACHE_POLICY_BACKEND_H_ ++ ++#include "mali_kbase.h" ++#include "mali_base_kernel.h" ++ ++/** ++ * kbase_cache_set_coherency_mode() - Sets the system coherency mode ++ * in the GPU. ++ * @kbdev: Device pointer ++ * @mode: Coherency mode. COHERENCY_ACE/ACE_LITE ++ */ ++void kbase_cache_set_coherency_mode(struct kbase_device *kbdev, ++ u32 mode); ++ ++#endif /* _KBASE_CACHE_POLICY_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c +new file mode 100755 +index 000000000..7851ea646 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c +@@ -0,0 +1,157 @@ +/* -+ * @file mali_kbase_sync_common.c + * -+ * Common code for our explicit fence functionality ++ * (C) COPYRIGHT 2012-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include -+#include "mali_kbase.h" + -+void kbase_sync_fence_wait_worker(struct work_struct *data) ++ ++#include ++#include ++#include "mali_kbase_debug_job_fault.h" ++ ++#ifdef CONFIG_DEBUG_FS ++ ++/*GPU_CONTROL_REG(r)*/ ++static int gpu_control_reg_snapshot[] = { ++ GPU_ID, ++ SHADER_READY_LO, ++ SHADER_READY_HI, ++ TILER_READY_LO, ++ TILER_READY_HI, ++ L2_READY_LO, ++ L2_READY_HI ++}; ++ ++/* JOB_CONTROL_REG(r) */ ++static int job_control_reg_snapshot[] = { ++ JOB_IRQ_MASK, ++ JOB_IRQ_STATUS ++}; ++ ++/* JOB_SLOT_REG(n,r) */ ++static int job_slot_reg_snapshot[] = { ++ JS_HEAD_LO, ++ JS_HEAD_HI, ++ JS_TAIL_LO, ++ JS_TAIL_HI, ++ JS_AFFINITY_LO, ++ JS_AFFINITY_HI, ++ JS_CONFIG, ++ JS_STATUS, ++ JS_HEAD_NEXT_LO, ++ JS_HEAD_NEXT_HI, ++ JS_AFFINITY_NEXT_LO, ++ JS_AFFINITY_NEXT_HI, ++ JS_CONFIG_NEXT ++}; ++ ++/*MMU_REG(r)*/ ++static int mmu_reg_snapshot[] = { ++ MMU_IRQ_MASK, ++ MMU_IRQ_STATUS ++}; ++ ++/* MMU_AS_REG(n,r) */ ++static int as_reg_snapshot[] = { ++ AS_TRANSTAB_LO, ++ AS_TRANSTAB_HI, ++ AS_MEMATTR_LO, ++ AS_MEMATTR_HI, ++ AS_FAULTSTATUS, ++ AS_FAULTADDRESS_LO, ++ AS_FAULTADDRESS_HI, ++ AS_STATUS ++}; ++ ++bool kbase_debug_job_fault_reg_snapshot_init(struct kbase_context *kctx, ++ int reg_range) +{ -+ struct kbase_jd_atom *katom; ++ int i, j; ++ int offset = 0; ++ int slot_number; ++ int as_number; + -+ katom = container_of(data, struct kbase_jd_atom, work); -+ kbase_soft_event_wait_callback(katom); ++ if (kctx->reg_dump == NULL) ++ return false; ++ ++ slot_number = kctx->kbdev->gpu_props.num_job_slots; ++ as_number = kctx->kbdev->gpu_props.num_address_spaces; ++ ++ /* get the GPU control registers*/ ++ for (i = 0; i < sizeof(gpu_control_reg_snapshot)/4; i++) { ++ kctx->reg_dump[offset] = ++ GPU_CONTROL_REG(gpu_control_reg_snapshot[i]); ++ offset += 2; ++ } ++ ++ /* get the Job control registers*/ ++ for (i = 0; i < sizeof(job_control_reg_snapshot)/4; i++) { ++ kctx->reg_dump[offset] = ++ JOB_CONTROL_REG(job_control_reg_snapshot[i]); ++ offset += 2; ++ } ++ ++ /* get the Job Slot registers*/ ++ for (j = 0; j < slot_number; j++) { ++ for (i = 0; i < sizeof(job_slot_reg_snapshot)/4; i++) { ++ kctx->reg_dump[offset] = ++ JOB_SLOT_REG(j, job_slot_reg_snapshot[i]); ++ offset += 2; ++ } ++ } ++ ++ /* get the MMU registers*/ ++ for (i = 0; i < sizeof(mmu_reg_snapshot)/4; i++) { ++ kctx->reg_dump[offset] = MMU_REG(mmu_reg_snapshot[i]); ++ offset += 2; ++ } ++ ++ /* get the Address space registers*/ ++ for (j = 0; j < as_number; j++) { ++ for (i = 0; i < sizeof(as_reg_snapshot)/4; i++) { ++ kctx->reg_dump[offset] = ++ MMU_AS_REG(j, as_reg_snapshot[i]); ++ offset += 2; ++ } ++ } ++ ++ WARN_ON(offset >= (reg_range*2/4)); ++ ++ /* set the termination flag*/ ++ kctx->reg_dump[offset] = REGISTER_DUMP_TERMINATION_FLAG; ++ kctx->reg_dump[offset + 1] = REGISTER_DUMP_TERMINATION_FLAG; ++ ++ dev_dbg(kctx->kbdev->dev, "kbase_job_fault_reg_snapshot_init:%d\n", ++ offset); ++ ++ return true; +} + -+const char *kbase_sync_status_string(int status) ++bool kbase_job_fault_get_reg_snapshot(struct kbase_context *kctx) +{ -+ if (status == 0) -+ return "signaled"; -+ else if (status > 0) -+ return "active"; -+ else -+ return "error"; ++ int offset = 0; ++ ++ if (kctx->reg_dump == NULL) ++ return false; ++ ++ while (kctx->reg_dump[offset] != REGISTER_DUMP_TERMINATION_FLAG) { ++ kctx->reg_dump[offset+1] = ++ kbase_reg_read(kctx->kbdev, ++ kctx->reg_dump[offset], NULL); ++ offset += 2; ++ } ++ return true; +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_file.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_file.c ++ ++ ++#endif +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c new file mode 100755 -index 000000000000..509c0666f10f +index 000000000..4e8e56e9b --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_file.c -@@ -0,0 +1,348 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c +@@ -0,0 +1,474 @@ +/* + * -+ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -323121,347 +360121,473 @@ index 000000000000..509c0666f10f + */ + + ++#define ENABLE_DEBUG_LOG ++#include "../../platform/rk/custom_log.h" + -+/* -+ * Code for supporting explicit Linux fences (CONFIG_SYNC_FILE) -+ * Introduced in kernel 4.9. -+ * Android explicit fences (CONFIG_SYNC) can be used for older kernels -+ * (see mali_kbase_sync_android.c) -+ */ + -+#include -+#include -+#include -+#include -+#include -+#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#ifdef CONFIG_DEVFREQ_THERMAL ++#include ++#endif ++ +#include -+#include -+#include -+#include -+#include "mali_kbase_fence_defs.h" -+#include "mali_kbase_sync.h" -+#include "mali_kbase_fence.h" -+#include "mali_kbase.h" ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) ++#include ++#else /* Linux >= 3.13 */ ++/* In 3.13 the OPP include header file, types, and functions were all ++ * renamed. Use the old filename for the include, and define the new names to ++ * the old, when an old kernel is detected. ++ */ ++#include ++#define dev_pm_opp opp ++#define dev_pm_opp_get_voltage opp_get_voltage ++#define dev_pm_opp_get_opp_count opp_get_opp_count ++#define dev_pm_opp_find_freq_ceil opp_find_freq_ceil ++#define dev_pm_opp_find_freq_floor opp_find_freq_floor ++#endif /* Linux >= 3.13 */ ++#include ++#include + -+static const struct file_operations stream_fops = { -+ .owner = THIS_MODULE ++static struct devfreq_simple_ondemand_data ondemand_data; ++ ++static struct monitor_dev_profile mali_mdevp = { ++ .type = MONITOR_TYPE_DEV, ++ .low_temp_adjust = rockchip_monitor_dev_low_temp_adjust, ++ .high_temp_adjust = rockchip_monitor_dev_high_temp_adjust, +}; + -+int kbase_sync_fence_stream_create(const char *name, int *const out_fd) ++/** ++ * opp_translate - Translate nominal OPP frequency from devicetree into real ++ * frequency and core mask ++ * @kbdev: Device pointer ++ * @freq: Nominal frequency ++ * @core_mask: Pointer to u64 to store core mask to ++ * ++ * Return: Real target frequency ++ * ++ * This function will only perform translation if an operating-points-v2-mali ++ * table is present in devicetree. If one is not present then it will return an ++ * untranslated frequency and all cores enabled. ++ */ ++static unsigned long opp_translate(struct kbase_device *kbdev, ++ unsigned long freq, u64 *core_mask) +{ -+ if (!out_fd) -+ return -EINVAL; ++ int i; + -+ *out_fd = anon_inode_getfd(name, &stream_fops, NULL, -+ O_RDONLY | O_CLOEXEC); -+ if (*out_fd < 0) -+ return -EINVAL; ++ for (i = 0; i < kbdev->num_opps; i++) { ++ if (kbdev->opp_table[i].opp_freq == freq) { ++ *core_mask = kbdev->opp_table[i].core_mask; ++ return kbdev->opp_table[i].real_freq; ++ } ++ } + -+ return 0; ++ /* Failed to find OPP - return all cores enabled & nominal frequency */ ++ *core_mask = kbdev->gpu_props.props.raw_props.shader_present; ++ ++ return freq; +} + -+int kbase_sync_fence_out_create(struct kbase_jd_atom *katom, int stream_fd) ++static int ++kbase_devfreq_target(struct device *dev, unsigned long *target_freq, u32 flags) +{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence; -+#else -+ struct dma_fence *fence; -+#endif -+ struct sync_file *sync_file; -+ int fd; ++ struct kbase_device *kbdev = dev_get_drvdata(dev); ++ struct dev_pm_opp *opp; ++ unsigned long nominal_freq; ++ unsigned long freq = 0; ++ unsigned long old_freq = kbdev->current_freq; ++ unsigned long voltage; ++ int err; ++ u64 core_mask; + -+ fence = kbase_fence_out_new(katom); -+ if (!fence) -+ return -ENOMEM; ++ freq = *target_freq; + -+ /* Take an extra reference to the fence on behalf of the katom. -+ * This is needed because sync_file_create() will take ownership of -+ * one of these refs */ -+ dma_fence_get(fence); ++ opp = devfreq_recommended_opp(dev, &freq, flags); ++ if (IS_ERR(opp)) { ++ dev_err(dev, "Failed to get opp (%ld)\n", PTR_ERR(opp)); ++ return PTR_ERR(opp); ++ } ++ voltage = dev_pm_opp_get_voltage(opp); + -+ /* create a sync_file fd representing the fence */ -+ sync_file = sync_file_create(fence); -+ if (!sync_file) { -+ dma_fence_put(fence); -+ kbase_fence_out_remove(katom); -+ return -ENOMEM; ++ nominal_freq = freq; ++ ++ /* ++ * Only update if there is a change of frequency ++ */ ++ if (kbdev->current_nominal_freq == nominal_freq) { ++ *target_freq = nominal_freq; ++#ifdef CONFIG_REGULATOR ++ if (kbdev->current_voltage == voltage) ++ return 0; ++ err = regulator_set_voltage(kbdev->regulator, voltage, INT_MAX); ++ if (err) { ++ dev_err(dev, "Failed to set voltage (%d)\n", err); ++ return err; ++ } ++ kbdev->current_voltage = voltage; ++#endif ++ return 0; + } + -+ fd = get_unused_fd_flags(O_CLOEXEC); -+ if (fd < 0) { -+ fput(sync_file->file); -+ kbase_fence_out_remove(katom); -+ return fd; ++ freq = opp_translate(kbdev, nominal_freq, &core_mask); ++#ifdef CONFIG_REGULATOR ++ if (kbdev->regulator && kbdev->current_voltage != voltage && ++ old_freq < freq) { ++ err = regulator_set_voltage(kbdev->regulator, voltage, INT_MAX); ++ if (err) { ++ dev_err(dev, "Failed to increase voltage (%d)\n", err); ++ return err; ++ } + } ++#endif + -+ fd_install(fd, sync_file->file); ++ err = clk_set_rate(kbdev->clock, freq); ++ if (err) { ++ dev_err(dev, "Failed to set clock %lu (target %lu)\n", ++ freq, *target_freq); ++ return err; ++ } ++ *target_freq = freq; ++ kbdev->current_freq = freq; ++ if (kbdev->devfreq) ++ kbdev->devfreq->last_status.current_frequency = freq; ++#ifdef CONFIG_REGULATOR ++ if (kbdev->regulator && kbdev->current_voltage != voltage && ++ old_freq > freq) { ++ err = regulator_set_voltage(kbdev->regulator, voltage, INT_MAX); ++ if (err) { ++ dev_err(dev, "Failed to decrease voltage (%d)\n", err); ++ return err; ++ } ++ } ++#endif + -+ return fd; ++ if (kbdev->pm.backend.ca_current_policy->id == ++ KBASE_PM_CA_POLICY_ID_DEVFREQ) ++ kbase_devfreq_set_core_mask(kbdev, core_mask); ++ ++ *target_freq = nominal_freq; ++ kbdev->current_voltage = voltage; ++ kbdev->current_nominal_freq = nominal_freq; ++ kbdev->current_freq = freq; ++ kbdev->current_core_mask = core_mask; ++ ++ KBASE_TLSTREAM_AUX_DEVFREQ_TARGET((u64)nominal_freq); ++ ++ kbase_pm_reset_dvfs_utilisation(kbdev); ++ ++ return err; +} + -+int kbase_sync_fence_in_from_fd(struct kbase_jd_atom *katom, int fd) ++static int ++kbase_devfreq_cur_freq(struct device *dev, unsigned long *freq) +{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence = sync_file_get_fence(fd); -+#else -+ struct dma_fence *fence = sync_file_get_fence(fd); -+#endif -+ -+ if (!fence) -+ return -ENOENT; ++ struct kbase_device *kbdev = dev_get_drvdata(dev); + -+ kbase_fence_fence_in_set(katom, fence); ++ *freq = kbdev->current_nominal_freq; + + return 0; +} + -+int kbase_sync_fence_validate(int fd) ++static int ++kbase_devfreq_status(struct device *dev, struct devfreq_dev_status *stat) +{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence = sync_file_get_fence(fd); -+#else -+ struct dma_fence *fence = sync_file_get_fence(fd); -+#endif ++ struct kbase_device *kbdev = dev_get_drvdata(dev); + -+ if (!fence) -+ return -EINVAL; ++ stat->current_frequency = kbdev->current_nominal_freq; + -+ dma_fence_put(fence); ++ kbase_pm_get_dvfs_utilisation(kbdev, ++ &stat->total_time, &stat->busy_time); + -+ return 0; /* valid */ ++ stat->private_data = NULL; ++ ++ return 0; +} + -+enum base_jd_event_code -+kbase_sync_fence_out_trigger(struct kbase_jd_atom *katom, int result) ++static int kbase_devfreq_init_freq_table(struct kbase_device *kbdev, ++ struct devfreq_dev_profile *dp) +{ -+ int res; ++ int count; ++ int i = 0; ++ unsigned long freq; ++ struct dev_pm_opp *opp; + -+ if (!kbase_fence_out_is_ours(katom)) { -+ /* Not our fence */ -+ return BASE_JD_EVENT_JOB_CANCELLED; ++ count = dev_pm_opp_get_opp_count(kbdev->dev); ++ if (count < 0) { ++ return count; + } + -+ res = kbase_fence_out_signal(katom, result); -+ if (unlikely(res < 0)) { -+ dev_warn(katom->kctx->kbdev->dev, -+ "fence_signal() failed with %d\n", res); ++ dp->freq_table = kmalloc_array(count, sizeof(dp->freq_table[0]), ++ GFP_KERNEL); ++ if (!dp->freq_table) ++ return -ENOMEM; ++ ++ for (i = 0, freq = ULONG_MAX; i < count; i++, freq--) { ++ opp = dev_pm_opp_find_freq_floor(kbdev->dev, &freq); ++ if (IS_ERR(opp)) ++ break; ++ dev_pm_opp_put(opp); ++ ++ dp->freq_table[i] = freq; + } + -+ kbase_sync_fence_out_remove(katom); ++ if (count != i) ++ dev_warn(kbdev->dev, "Unable to enumerate all OPPs (%d!=%d\n", ++ count, i); + -+ return (result != 0) ? BASE_JD_EVENT_JOB_CANCELLED : BASE_JD_EVENT_DONE; ++ dp->max_state = i; ++ ++ return 0; +} + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+static void kbase_fence_wait_callback(struct fence *fence, -+ struct fence_cb *cb) -+#else -+static void kbase_fence_wait_callback(struct dma_fence *fence, -+ struct dma_fence_cb *cb) -+#endif ++static void kbase_devfreq_term_freq_table(struct kbase_device *kbdev) +{ -+ struct kbase_fence_cb *kcb = container_of(cb, -+ struct kbase_fence_cb, -+ fence_cb); -+ struct kbase_jd_atom *katom = kcb->katom; -+ struct kbase_context *kctx = katom->kctx; ++ struct devfreq_dev_profile *dp = &kbdev->devfreq_profile; + -+ /* Cancel atom if fence is erroneous */ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)) -+ if (dma_fence_is_signaled(kcb->fence) && kcb->fence->error) -+#else -+ if (dma_fence_is_signaled(kcb->fence) && kcb->fence->status < 0) -+#endif -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ kfree(dp->freq_table); ++ dp->freq_table = NULL; ++} + -+ if (kbase_fence_dep_count_dec_and_test(katom)) { -+ /* We take responsibility of handling this */ -+ kbase_fence_dep_count_set(katom, -1); ++static void kbase_devfreq_term_core_mask_table(struct kbase_device *kbdev) ++{ ++ kfree(kbdev->opp_table); ++ kbdev->opp_table = NULL; ++} + -+ /* To prevent a potential deadlock we schedule the work onto the -+ * job_done_wq workqueue -+ * -+ * The issue is that we may signal the timeline while holding -+ * kctx->jctx.lock and the callbacks are run synchronously from -+ * sync_timeline_signal. So we simply defer the work. -+ */ -+ INIT_WORK(&katom->work, kbase_sync_fence_wait_worker); -+ queue_work(kctx->jctx.job_done_wq, &katom->work); -+ } ++static void kbase_devfreq_exit(struct device *dev) ++{ ++ struct kbase_device *kbdev = dev_get_drvdata(dev); ++ ++ if (kbdev) ++ kbase_devfreq_term_freq_table(kbdev); +} + -+int kbase_sync_fence_in_wait(struct kbase_jd_atom *katom) ++static int kbase_devfreq_init_core_mask_table(struct kbase_device *kbdev) +{ -+ int err; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence; -+#else -+ struct dma_fence *fence; -+#endif ++ struct device_node *opp_node = of_parse_phandle(kbdev->dev->of_node, ++ "operating-points-v2", 0); ++ struct device_node *node; ++ int i = 0; ++ int count; + -+ fence = kbase_fence_in_get(katom); -+ if (!fence) -+ return 0; /* no input fence to wait for, good to go! */ ++ if (!opp_node) ++ return 0; ++ if (!of_device_is_compatible(opp_node, "operating-points-v2-mali")) ++ return 0; + -+ kbase_fence_dep_count_set(katom, 1); ++ count = dev_pm_opp_get_opp_count(kbdev->dev); ++ kbdev->opp_table = kmalloc_array(count, ++ sizeof(struct kbase_devfreq_opp), GFP_KERNEL); ++ if (!kbdev->opp_table) ++ return -ENOMEM; + -+ err = kbase_fence_add_callback(katom, fence, kbase_fence_wait_callback); ++ for_each_available_child_of_node(opp_node, node) { ++ u64 core_mask; ++ u64 opp_freq, real_freq; ++ const void *core_count_p; + -+ kbase_fence_put(fence); ++ if (of_property_read_u64(node, "opp-hz", &opp_freq)) { ++ dev_warn(kbdev->dev, "OPP is missing required opp-hz property\n"); ++ continue; ++ } ++ if (of_property_read_u64(node, "opp-hz-real", &real_freq)) ++ real_freq = opp_freq; ++ if (of_property_read_u64(node, "opp-core-mask", &core_mask)) ++ core_mask = ++ kbdev->gpu_props.props.raw_props.shader_present; ++ core_count_p = of_get_property(node, "opp-core-count", NULL); ++ if (core_count_p) { ++ u64 remaining_core_mask = ++ kbdev->gpu_props.props.raw_props.shader_present; ++ int core_count = be32_to_cpup(core_count_p); + -+ if (likely(!err)) { -+ /* Test if the callbacks are already triggered */ -+ if (kbase_fence_dep_count_dec_and_test(katom)) { -+ kbase_fence_free_callbacks(katom); -+ kbase_fence_dep_count_set(katom, -1); -+ return 0; /* Already signaled, good to go right now */ ++ core_mask = 0; ++ ++ for (; core_count > 0; core_count--) { ++ int core = ffs(remaining_core_mask); ++ ++ if (!core) { ++ dev_err(kbdev->dev, "OPP has more cores than GPU\n"); ++ return -ENODEV; ++ } ++ ++ core_mask |= (1ull << (core-1)); ++ remaining_core_mask &= ~(1ull << (core-1)); ++ } + } + -+ /* Callback installed, so we just need to wait for it... */ -+ } else { -+ /* Failure */ -+ kbase_fence_free_callbacks(katom); -+ kbase_fence_dep_count_set(katom, -1); ++ if (!core_mask) { ++ dev_err(kbdev->dev, "OPP has invalid core mask of 0\n"); ++ return -ENODEV; ++ } + -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ kbdev->opp_table[i].opp_freq = opp_freq; ++ kbdev->opp_table[i].real_freq = real_freq; ++ kbdev->opp_table[i].core_mask = core_mask; + -+ /* We should cause the dependent jobs in the bag to be failed, -+ * to do this we schedule the work queue to complete this job */ ++ dev_info(kbdev->dev, "OPP %d : opp_freq=%llu real_freq=%llu core_mask=%llx\n", ++ i, opp_freq, real_freq, core_mask); + -+ INIT_WORK(&katom->work, kbase_sync_fence_wait_worker); -+ queue_work(katom->kctx->jctx.job_done_wq, &katom->work); ++ i++; + } + -+ return 1; /* completion to be done later by callback/worker */ ++ kbdev->num_opps = i; ++ ++ return 0; +} + -+void kbase_sync_fence_in_cancel_wait(struct kbase_jd_atom *katom) ++int kbase_devfreq_init(struct kbase_device *kbdev) +{ -+ if (!kbase_fence_free_callbacks(katom)) { -+ /* The wait wasn't cancelled - -+ * leave the cleanup for kbase_fence_wait_callback */ -+ return; ++ struct device_node *np = kbdev->dev->of_node; ++ struct devfreq_dev_profile *dp; ++ struct dev_pm_opp *opp; ++ unsigned long opp_rate; ++ int err; ++ ++ if (!kbdev->clock) { ++ dev_err(kbdev->dev, "Clock not available for devfreq\n"); ++ return -ENODEV; + } + -+ /* Take responsibility of completion */ -+ kbase_fence_dep_count_set(katom, -1); ++ kbdev->current_freq = clk_get_rate(kbdev->clock); ++ kbdev->current_nominal_freq = kbdev->current_freq; + -+ /* Wait was cancelled - zap the atoms */ -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ dp = &kbdev->devfreq_profile; + -+ kbasep_remove_waiting_soft_job(katom); -+ kbase_finish_soft_job(katom); ++ dp->initial_freq = kbdev->current_freq; ++ /* .KP : set devfreq_dvfs_interval_in_ms */ ++ dp->polling_ms = 20; ++ dp->target = kbase_devfreq_target; ++ dp->get_dev_status = kbase_devfreq_status; ++ dp->get_cur_freq = kbase_devfreq_cur_freq; ++ dp->exit = kbase_devfreq_exit; + -+ if (jd_done_nolock(katom, NULL)) -+ kbase_js_sched_all(katom->kctx->kbdev); -+} ++ if (kbase_devfreq_init_freq_table(kbdev, dp)) ++ return -EFAULT; + -+void kbase_sync_fence_out_remove(struct kbase_jd_atom *katom) -+{ -+ kbase_fence_out_remove(katom); -+} ++ err = kbase_devfreq_init_core_mask_table(kbdev); ++ if (err) ++ goto init_core_mask_table_failed; + -+void kbase_sync_fence_in_remove(struct kbase_jd_atom *katom) -+{ -+ kbase_fence_free_callbacks(katom); -+ kbase_fence_in_remove(katom); -+} ++ of_property_read_u32(np, "upthreshold", ++ &ondemand_data.upthreshold); ++ of_property_read_u32(np, "downdifferential", ++ &ondemand_data.downdifferential); + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+static void kbase_sync_fence_info_get(struct fence *fence, -+ struct kbase_sync_fence_info *info) -+#else -+static void kbase_sync_fence_info_get(struct dma_fence *fence, -+ struct kbase_sync_fence_info *info) -+#endif -+{ -+ info->fence = fence; ++ kbdev->devfreq = devfreq_add_device(kbdev->dev, dp, ++ "simple_ondemand", &ondemand_data); ++ if (IS_ERR(kbdev->devfreq)) { ++ err = PTR_ERR(kbdev->devfreq); ++ kbdev->devfreq = NULL; ++ dev_err(kbdev->dev, "Fail to add devfreq device(%d)", err); ++ goto devfreq_add_dev_failed; ++ } + -+ /* translate into CONFIG_SYNC status: -+ * < 0 : error -+ * 0 : active -+ * 1 : signaled -+ */ -+ if (dma_fence_is_signaled(fence)) { -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)) -+ int status = fence->error; -+#else -+ int status = fence->status; -+#endif -+ if (status < 0) -+ info->status = status; /* signaled with error */ -+ else -+ info->status = 1; /* signaled with success */ -+ } else { -+ info->status = 0; /* still active (unsignaled) */ ++ /* devfreq_add_device only copies a few of kbdev->dev's fields, so ++ * set drvdata explicitly so IPA models can access kbdev. */ ++ dev_set_drvdata(&kbdev->devfreq->dev, kbdev); ++ ++ err = devfreq_register_opp_notifier(kbdev->dev, kbdev->devfreq); ++ if (err) { ++ dev_err(kbdev->dev, ++ "Failed to register OPP notifier (%d)\n", err); ++ goto opp_notifier_failed; + } + -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) -+ scnprintf(info->name, sizeof(info->name), "%u#%u", -+ fence->context, fence->seqno); -+#else -+ scnprintf(info->name, sizeof(info->name), "%llu#%u", -+ fence->context, fence->seqno); -+#endif -+} ++ opp_rate = kbdev->current_freq; ++ opp = devfreq_recommended_opp(kbdev->dev, &opp_rate, 0); ++ if (!IS_ERR(opp)) ++ dev_pm_opp_put(opp); ++ kbdev->devfreq->last_status.current_frequency = opp_rate; + -+int kbase_sync_fence_in_info_get(struct kbase_jd_atom *katom, -+ struct kbase_sync_fence_info *info) -+{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence; -+#else -+ struct dma_fence *fence; ++ mali_mdevp.data = kbdev->devfreq; ++ kbdev->mdev_info = rockchip_system_monitor_register(kbdev->dev, ++ &mali_mdevp); ++ if (IS_ERR(kbdev->mdev_info)) { ++ dev_dbg(kbdev->dev, "without system monitor\n"); ++ kbdev->mdev_info = NULL; ++ } ++#ifdef CONFIG_DEVFREQ_THERMAL ++ err = kbase_ipa_init(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, "IPA initialization failed\n"); ++ goto cooling_failed; ++ } ++ ++ kbdev->devfreq_cooling = of_devfreq_cooling_register_power( ++ kbdev->dev->of_node, ++ kbdev->devfreq, ++ &kbase_ipa_power_model_ops); ++ if (IS_ERR_OR_NULL(kbdev->devfreq_cooling)) { ++ err = PTR_ERR(kbdev->devfreq_cooling); ++ dev_err(kbdev->dev, ++ "Failed to register cooling device (%d)\n", ++ err); ++ goto cooling_failed; ++ } ++ I("success initing power_model_simple."); +#endif + -+ fence = kbase_fence_in_get(katom); -+ if (!fence) -+ return -ENOENT; ++ return 0; + -+ kbase_sync_fence_info_get(fence, info); ++#ifdef CONFIG_DEVFREQ_THERMAL ++cooling_failed: ++ devfreq_unregister_opp_notifier(kbdev->dev, kbdev->devfreq); ++#endif /* CONFIG_DEVFREQ_THERMAL */ ++opp_notifier_failed: ++ if (devfreq_remove_device(kbdev->devfreq)) ++ dev_err(kbdev->dev, "Failed to terminate devfreq (%d)\n", err); ++ else ++ kbdev->devfreq = NULL; + -+ kbase_fence_put(fence); ++devfreq_add_dev_failed: ++ kbase_devfreq_term_core_mask_table(kbdev); + -+ return 0; ++init_core_mask_table_failed: ++ kbase_devfreq_term_freq_table(kbdev); ++ ++ return err; +} + -+int kbase_sync_fence_out_info_get(struct kbase_jd_atom *katom, -+ struct kbase_sync_fence_info *info) ++void kbase_devfreq_term(struct kbase_device *kbdev) +{ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ struct fence *fence; -+#else -+ struct dma_fence *fence; -+#endif ++ int err; + -+ fence = kbase_fence_out_get(katom); -+ if (!fence) -+ return -ENOENT; ++ dev_dbg(kbdev->dev, "Term Mali devfreq\n"); + -+ kbase_sync_fence_info_get(fence, info); ++ rockchip_system_monitor_unregister(kbdev->mdev_info); ++#ifdef CONFIG_DEVFREQ_THERMAL ++ if (kbdev->devfreq_cooling) ++ devfreq_cooling_unregister(kbdev->devfreq_cooling); + -+ kbase_fence_put(fence); ++ kbase_ipa_term(kbdev); ++#endif + -+ return 0; -+} ++ devfreq_unregister_opp_notifier(kbdev->dev, kbdev->devfreq); + ++ err = devfreq_remove_device(kbdev->devfreq); ++ if (err) ++ dev_err(kbdev->dev, "Failed to terminate devfreq (%d)\n", err); ++ else ++ kbdev->devfreq = NULL; + -+#ifdef CONFIG_MALI_BIFROST_FENCE_DEBUG -+void kbase_sync_fence_in_dump(struct kbase_jd_atom *katom) -+{ -+ /* Not implemented */ ++ kbase_devfreq_term_core_mask_table(kbdev); +} -+#endif -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_tlstream.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_tlstream.c +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h new file mode 100755 -index 000000000000..485565ebfe80 +index 000000000..c0bf8b15b --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_tlstream.c -@@ -0,0 +1,2569 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h +@@ -0,0 +1,24 @@ +/* + * -+ * (C) COPYRIGHT 2015-2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -323476,2567 +360602,1734 @@ index 000000000000..485565ebfe80 + + + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++#ifndef _BASE_DEVFREQ_H_ ++#define _BASE_DEVFREQ_H_ ++ ++int kbase_devfreq_init(struct kbase_device *kbdev); ++void kbase_devfreq_term(struct kbase_device *kbdev); ++ ++#endif /* _BASE_DEVFREQ_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c +new file mode 100755 +index 000000000..dcdf15cdc +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c +@@ -0,0 +1,255 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ ++ ++ + ++ ++/* ++ * ++ */ +#include -+#include -+#include ++#include ++#include + -+/*****************************************************************************/ ++#include + -+/* The version of swtrace protocol used in timeline stream. */ -+#define SWTRACE_VERSION 3 ++#if !defined(CONFIG_MALI_NO_MALI) + -+/* The maximum expected length of string in tracepoint descriptor. */ -+#define STRLEN_MAX 64 /* bytes */ + -+/* The number of nanoseconds in a second. */ -+#define NSECS_IN_SEC 1000000000ull /* ns */ ++#ifdef CONFIG_DEBUG_FS + -+/* The period of autoflush checker execution in milliseconds. */ -+#define AUTOFLUSH_INTERVAL 1000 /* ms */ + -+/* The maximum size of a single packet used by timeline. */ -+#define PACKET_SIZE 4096 /* bytes */ ++int kbase_io_history_resize(struct kbase_io_history *h, u16 new_size) ++{ ++ struct kbase_io_access *old_buf; ++ struct kbase_io_access *new_buf; ++ unsigned long flags; + -+/* The number of packets used by one timeline stream. */ -+#define PACKET_COUNT 16 ++ if (!new_size) ++ goto out_err; /* The new size must not be 0 */ + -+/* The number of bytes reserved for packet header. -+ * These value must be defined according to MIPE documentation. */ -+#define PACKET_HEADER_SIZE 8 /* bytes */ ++ new_buf = vmalloc(new_size * sizeof(*h->buf)); ++ if (!new_buf) ++ goto out_err; + -+/* The number of bytes reserved for packet sequence number. -+ * These value must be defined according to MIPE documentation. */ -+#define PACKET_NUMBER_SIZE 4 /* bytes */ ++ spin_lock_irqsave(&h->lock, flags); + -+/* Packet header - first word. -+ * These values must be defined according to MIPE documentation. */ -+#define PACKET_STREAMID_POS 0 -+#define PACKET_STREAMID_LEN 8 -+#define PACKET_RSVD1_POS (PACKET_STREAMID_POS + PACKET_STREAMID_LEN) -+#define PACKET_RSVD1_LEN 8 -+#define PACKET_TYPE_POS (PACKET_RSVD1_POS + PACKET_RSVD1_LEN) -+#define PACKET_TYPE_LEN 3 -+#define PACKET_CLASS_POS (PACKET_TYPE_POS + PACKET_TYPE_LEN) -+#define PACKET_CLASS_LEN 7 -+#define PACKET_FAMILY_POS (PACKET_CLASS_POS + PACKET_CLASS_LEN) -+#define PACKET_FAMILY_LEN 6 ++ old_buf = h->buf; + -+/* Packet header - second word -+ * These values must be defined according to MIPE documentation. */ -+#define PACKET_LENGTH_POS 0 -+#define PACKET_LENGTH_LEN 24 -+#define PACKET_SEQBIT_POS (PACKET_LENGTH_POS + PACKET_LENGTH_LEN) -+#define PACKET_SEQBIT_LEN 1 -+#define PACKET_RSVD2_POS (PACKET_SEQBIT_POS + PACKET_SEQBIT_LEN) -+#define PACKET_RSVD2_LEN 7 ++ /* Note: we won't bother with copying the old data over. The dumping ++ * logic wouldn't work properly as it relies on 'count' both as a ++ * counter and as an index to the buffer which would have changed with ++ * the new array. This is a corner case that we don't need to support. ++ */ ++ h->count = 0; ++ h->size = new_size; ++ h->buf = new_buf; + -+/* Types of streams generated by timeline. -+ * Order is significant! Header streams must precede respective body streams. */ -+enum tl_stream_type { -+ TL_STREAM_TYPE_OBJ_HEADER, -+ TL_STREAM_TYPE_OBJ_SUMMARY, -+ TL_STREAM_TYPE_OBJ, -+ TL_STREAM_TYPE_AUX_HEADER, -+ TL_STREAM_TYPE_AUX, ++ spin_unlock_irqrestore(&h->lock, flags); + -+ TL_STREAM_TYPE_COUNT -+}; ++ vfree(old_buf); + -+/* Timeline packet family ids. -+ * Values are significant! Check MIPE documentation. */ -+enum tl_packet_family { -+ TL_PACKET_FAMILY_CTRL = 0, /* control packets */ -+ TL_PACKET_FAMILY_TL = 1, /* timeline packets */ ++ return 0; + -+ TL_PACKET_FAMILY_COUNT -+}; ++out_err: ++ return -1; ++} + -+/* Packet classes used in timeline streams. -+ * Values are significant! Check MIPE documentation. */ -+enum tl_packet_class { -+ TL_PACKET_CLASS_OBJ = 0, /* timeline objects packet */ -+ TL_PACKET_CLASS_AUX = 1, /* auxiliary events packet */ -+}; + -+/* Packet types used in timeline streams. -+ * Values are significant! Check MIPE documentation. */ -+enum tl_packet_type { -+ TL_PACKET_TYPE_HEADER = 0, /* stream's header/directory */ -+ TL_PACKET_TYPE_BODY = 1, /* stream's body */ -+ TL_PACKET_TYPE_SUMMARY = 2, /* stream's summary */ -+}; ++int kbase_io_history_init(struct kbase_io_history *h, u16 n) ++{ ++ h->enabled = false; ++ spin_lock_init(&h->lock); ++ h->count = 0; ++ h->size = 0; ++ h->buf = NULL; ++ if (kbase_io_history_resize(h, n)) ++ return -1; + -+/* Message ids of trace events that are recorded in the timeline stream. */ -+enum tl_msg_id_obj { -+ /* Timeline object events. */ -+ KBASE_TL_NEW_CTX, -+ KBASE_TL_NEW_GPU, -+ KBASE_TL_NEW_LPU, -+ KBASE_TL_NEW_ATOM, -+ KBASE_TL_NEW_AS, -+ KBASE_TL_DEL_CTX, -+ KBASE_TL_DEL_ATOM, -+ KBASE_TL_LIFELINK_LPU_GPU, -+ KBASE_TL_LIFELINK_AS_GPU, -+ KBASE_TL_RET_CTX_LPU, -+ KBASE_TL_RET_ATOM_CTX, -+ KBASE_TL_RET_ATOM_LPU, -+ KBASE_TL_NRET_CTX_LPU, -+ KBASE_TL_NRET_ATOM_CTX, -+ KBASE_TL_NRET_ATOM_LPU, -+ KBASE_TL_RET_AS_CTX, -+ KBASE_TL_NRET_AS_CTX, -+ KBASE_TL_RET_ATOM_AS, -+ KBASE_TL_NRET_ATOM_AS, -+ KBASE_TL_DEP_ATOM_ATOM, -+ KBASE_TL_NDEP_ATOM_ATOM, -+ KBASE_TL_RDEP_ATOM_ATOM, -+ KBASE_TL_ATTRIB_ATOM_CONFIG, -+ KBASE_TL_ATTRIB_ATOM_PRIORITY, -+ KBASE_TL_ATTRIB_ATOM_STATE, -+ KBASE_TL_ATTRIB_ATOM_PRIORITY_CHANGE, -+ KBASE_TL_ATTRIB_ATOM_JIT, -+ KBASE_TL_ATTRIB_AS_CONFIG, -+ KBASE_TL_EVENT_LPU_SOFTSTOP, -+ KBASE_TL_EVENT_ATOM_SOFTSTOP_EX, -+ KBASE_TL_EVENT_ATOM_SOFTSTOP_ISSUE, ++ return 0; ++} + -+ /* Job dump specific events. */ -+ KBASE_JD_GPU_SOFT_RESET -+}; + -+/* Message ids of trace events that are recorded in the auxiliary stream. */ -+enum tl_msg_id_aux { -+ KBASE_AUX_PM_STATE, -+ KBASE_AUX_PAGEFAULT, -+ KBASE_AUX_PAGESALLOC, -+ KBASE_AUX_DEVFREQ_TARGET, -+ KBASE_AUX_PROTECTED_ENTER_START, -+ KBASE_AUX_PROTECTED_ENTER_END, -+ KBASE_AUX_PROTECTED_LEAVE_START, -+ KBASE_AUX_PROTECTED_LEAVE_END -+}; ++void kbase_io_history_term(struct kbase_io_history *h) ++{ ++ vfree(h->buf); ++ h->buf = NULL; ++} + -+/*****************************************************************************/ + -+/** -+ * struct tl_stream - timeline stream structure -+ * @lock: message order lock -+ * @buffer: array of buffers -+ * @wbi: write buffer index -+ * @rbi: read buffer index -+ * @numbered: if non-zero stream's packets are sequentially numbered -+ * @autoflush_counter: counter tracking stream's autoflush state ++/* kbase_io_history_add - add new entry to the register access history + * -+ * This structure holds information needed to construct proper packets in the -+ * timeline stream. Each message in sequence must bear timestamp that is greater -+ * to one in previous message in the same stream. For this reason lock is held -+ * throughout the process of message creation. Each stream contains set of -+ * buffers. Each buffer will hold one MIPE packet. In case there is no free -+ * space required to store incoming message the oldest buffer is discarded. -+ * Each packet in timeline body stream has sequence number embedded (this value -+ * must increment monotonically and is used by packets receiver to discover -+ * buffer overflows. -+ * Autoflush counter is set to negative number when there is no data pending -+ * for flush and it is set to zero on every update of the buffer. Autoflush -+ * timer will increment the counter by one on every expiry. In case there will -+ * be no activity on the buffer during two consecutive timer expiries, stream -+ * buffer will be flushed. ++ * @h: Pointer to the history data structure ++ * @addr: Register address ++ * @value: The value that is either read from or written to the register ++ * @write: 1 if it's a register write, 0 if it's a read + */ -+struct tl_stream { -+ spinlock_t lock; ++static void kbase_io_history_add(struct kbase_io_history *h, ++ void __iomem const *addr, u32 value, u8 write) ++{ ++ struct kbase_io_access *io; ++ unsigned long flags; + -+ struct { -+ atomic_t size; /* number of bytes in buffer */ -+ char data[PACKET_SIZE]; /* buffer's data */ -+ } buffer[PACKET_COUNT]; ++ spin_lock_irqsave(&h->lock, flags); + -+ atomic_t wbi; -+ atomic_t rbi; ++ io = &h->buf[h->count % h->size]; ++ io->addr = (uintptr_t)addr | write; ++ io->value = value; ++ ++h->count; ++ /* If count overflows, move the index by the buffer size so the entire ++ * buffer will still be dumped later */ ++ if (unlikely(!h->count)) ++ h->count = h->size; + -+ int numbered; -+ atomic_t autoflush_counter; -+}; ++ spin_unlock_irqrestore(&h->lock, flags); ++} + -+/** -+ * struct tp_desc - tracepoint message descriptor structure -+ * @id: tracepoint ID identifying message in stream -+ * @id_str: human readable version of tracepoint ID -+ * @name: tracepoint description -+ * @arg_types: tracepoint's arguments types declaration -+ * @arg_names: comma separated list of tracepoint's arguments names -+ */ -+struct tp_desc { -+ u32 id; -+ const char *id_str; -+ const char *name; -+ const char *arg_types; -+ const char *arg_names; -+}; + -+/*****************************************************************************/ ++void kbase_io_history_dump(struct kbase_device *kbdev) ++{ ++ struct kbase_io_history *const h = &kbdev->io_history; ++ u16 i; ++ size_t iters; ++ unsigned long flags; + -+/* Configuration of timeline streams generated by kernel. -+ * Kernel emit only streams containing either timeline object events or -+ * auxiliary events. All streams have stream id value of 1 (as opposed to user -+ * space streams that have value of 0). */ -+static const struct { -+ enum tl_packet_family pkt_family; -+ enum tl_packet_class pkt_class; -+ enum tl_packet_type pkt_type; -+ unsigned int stream_id; -+} tl_stream_cfg[TL_STREAM_TYPE_COUNT] = { -+ {TL_PACKET_FAMILY_TL, TL_PACKET_CLASS_OBJ, TL_PACKET_TYPE_HEADER, 1}, -+ {TL_PACKET_FAMILY_TL, TL_PACKET_CLASS_OBJ, TL_PACKET_TYPE_SUMMARY, 1}, -+ {TL_PACKET_FAMILY_TL, TL_PACKET_CLASS_OBJ, TL_PACKET_TYPE_BODY, 1}, -+ {TL_PACKET_FAMILY_TL, TL_PACKET_CLASS_AUX, TL_PACKET_TYPE_HEADER, 1}, -+ {TL_PACKET_FAMILY_TL, TL_PACKET_CLASS_AUX, TL_PACKET_TYPE_BODY, 1} -+}; ++ if (!unlikely(h->enabled)) ++ return; + -+/* The timeline streams generated by kernel. */ -+static struct tl_stream *tl_stream[TL_STREAM_TYPE_COUNT]; ++ spin_lock_irqsave(&h->lock, flags); + -+/* Autoflush timer. */ -+static struct timer_list autoflush_timer; ++ dev_err(kbdev->dev, "Register IO History:"); ++ iters = (h->size > h->count) ? h->count : h->size; ++ dev_err(kbdev->dev, "Last %zu register accesses of %zu total:\n", iters, ++ h->count); ++ for (i = 0; i < iters; ++i) { ++ struct kbase_io_access *io = ++ &h->buf[(h->count - iters + i) % h->size]; ++ char const access = (io->addr & 1) ? 'w' : 'r'; + -+/* If non-zero autoflush timer is active. */ -+static atomic_t autoflush_timer_active; ++ dev_err(kbdev->dev, "%6i: %c: reg 0x%p val %08x\n", i, access, ++ (void *)(io->addr & ~0x1), io->value); ++ } + -+/* Reader lock. Only one reader is allowed to have access to the timeline -+ * streams at any given time. */ -+static DEFINE_MUTEX(tl_reader_lock); ++ spin_unlock_irqrestore(&h->lock, flags); ++} + -+/* Timeline stream event queue. */ -+static DECLARE_WAIT_QUEUE_HEAD(tl_event_queue); + -+/* The timeline stream file operations functions. */ -+static ssize_t kbasep_tlstream_read( -+ struct file *filp, -+ char __user *buffer, -+ size_t size, -+ loff_t *f_pos); -+static unsigned int kbasep_tlstream_poll(struct file *filp, poll_table *wait); -+static int kbasep_tlstream_release(struct inode *inode, struct file *filp); ++#endif /* CONFIG_DEBUG_FS */ + -+/* The timeline stream file operations structure. */ -+static const struct file_operations kbasep_tlstream_fops = { -+ .release = kbasep_tlstream_release, -+ .read = kbasep_tlstream_read, -+ .poll = kbasep_tlstream_poll, -+}; + -+/* Descriptors of timeline messages transmitted in object events stream. */ -+static const struct tp_desc tp_desc_obj[] = { -+ { -+ KBASE_TL_NEW_CTX, -+ __stringify(KBASE_TL_NEW_CTX), -+ "object ctx is created", -+ "@pII", -+ "ctx,ctx_nr,tgid" -+ }, -+ { -+ KBASE_TL_NEW_GPU, -+ __stringify(KBASE_TL_NEW_GPU), -+ "object gpu is created", -+ "@pII", -+ "gpu,gpu_id,core_count" -+ }, -+ { -+ KBASE_TL_NEW_LPU, -+ __stringify(KBASE_TL_NEW_LPU), -+ "object lpu is created", -+ "@pII", -+ "lpu,lpu_nr,lpu_fn" -+ }, -+ { -+ KBASE_TL_NEW_ATOM, -+ __stringify(KBASE_TL_NEW_ATOM), -+ "object atom is created", -+ "@pI", -+ "atom,atom_nr" -+ }, -+ { -+ KBASE_TL_NEW_AS, -+ __stringify(KBASE_TL_NEW_AS), -+ "address space object is created", -+ "@pI", -+ "address_space,as_nr" -+ }, -+ { -+ KBASE_TL_DEL_CTX, -+ __stringify(KBASE_TL_DEL_CTX), -+ "context is destroyed", -+ "@p", -+ "ctx" -+ }, -+ { -+ KBASE_TL_DEL_ATOM, -+ __stringify(KBASE_TL_DEL_ATOM), -+ "atom is destroyed", -+ "@p", -+ "atom" -+ }, -+ { -+ KBASE_TL_LIFELINK_LPU_GPU, -+ __stringify(KBASE_TL_LIFELINK_LPU_GPU), -+ "lpu is deleted with gpu", -+ "@pp", -+ "lpu,gpu" -+ }, -+ { -+ KBASE_TL_LIFELINK_AS_GPU, -+ __stringify(KBASE_TL_LIFELINK_AS_GPU), -+ "address space is deleted with gpu", -+ "@pp", -+ "address_space,gpu" -+ }, -+ { -+ KBASE_TL_RET_CTX_LPU, -+ __stringify(KBASE_TL_RET_CTX_LPU), -+ "context is retained by lpu", -+ "@pp", -+ "ctx,lpu" -+ }, -+ { -+ KBASE_TL_RET_ATOM_CTX, -+ __stringify(KBASE_TL_RET_ATOM_CTX), -+ "atom is retained by context", -+ "@pp", -+ "atom,ctx" -+ }, -+ { -+ KBASE_TL_RET_ATOM_LPU, -+ __stringify(KBASE_TL_RET_ATOM_LPU), -+ "atom is retained by lpu", -+ "@pps", -+ "atom,lpu,attrib_match_list" -+ }, -+ { -+ KBASE_TL_NRET_CTX_LPU, -+ __stringify(KBASE_TL_NRET_CTX_LPU), -+ "context is released by lpu", -+ "@pp", -+ "ctx,lpu" -+ }, -+ { -+ KBASE_TL_NRET_ATOM_CTX, -+ __stringify(KBASE_TL_NRET_ATOM_CTX), -+ "atom is released by context", -+ "@pp", -+ "atom,ctx" -+ }, -+ { -+ KBASE_TL_NRET_ATOM_LPU, -+ __stringify(KBASE_TL_NRET_ATOM_LPU), -+ "atom is released by lpu", -+ "@pp", -+ "atom,lpu" -+ }, -+ { -+ KBASE_TL_RET_AS_CTX, -+ __stringify(KBASE_TL_RET_AS_CTX), -+ "address space is retained by context", -+ "@pp", -+ "address_space,ctx" -+ }, -+ { -+ KBASE_TL_NRET_AS_CTX, -+ __stringify(KBASE_TL_NRET_AS_CTX), -+ "address space is released by context", -+ "@pp", -+ "address_space,ctx" -+ }, -+ { -+ KBASE_TL_RET_ATOM_AS, -+ __stringify(KBASE_TL_RET_ATOM_AS), -+ "atom is retained by address space", -+ "@pp", -+ "atom,address_space" -+ }, -+ { -+ KBASE_TL_NRET_ATOM_AS, -+ __stringify(KBASE_TL_NRET_ATOM_AS), -+ "atom is released by address space", -+ "@pp", -+ "atom,address_space" -+ }, -+ { -+ KBASE_TL_DEP_ATOM_ATOM, -+ __stringify(KBASE_TL_DEP_ATOM_ATOM), -+ "atom2 depends on atom1", -+ "@pp", -+ "atom1,atom2" -+ }, -+ { -+ KBASE_TL_NDEP_ATOM_ATOM, -+ __stringify(KBASE_TL_NDEP_ATOM_ATOM), -+ "atom2 no longer depends on atom1", -+ "@pp", -+ "atom1,atom2" -+ }, -+ { -+ KBASE_TL_RDEP_ATOM_ATOM, -+ __stringify(KBASE_TL_RDEP_ATOM_ATOM), -+ "resolved dependecy of atom2 depending on atom1", -+ "@pp", -+ "atom1,atom2" -+ }, -+ { -+ KBASE_TL_ATTRIB_ATOM_CONFIG, -+ __stringify(KBASE_TL_ATTRIB_ATOM_CONFIG), -+ "atom job slot attributes", -+ "@pLLI", -+ "atom,descriptor,affinity,config" -+ }, -+ { -+ KBASE_TL_ATTRIB_ATOM_PRIORITY, -+ __stringify(KBASE_TL_ATTRIB_ATOM_PRIORITY), -+ "atom priority", -+ "@pI", -+ "atom,prio" -+ }, -+ { -+ KBASE_TL_ATTRIB_ATOM_STATE, -+ __stringify(KBASE_TL_ATTRIB_ATOM_STATE), -+ "atom state", -+ "@pI", -+ "atom,state" -+ }, -+ { -+ KBASE_TL_ATTRIB_ATOM_PRIORITY_CHANGE, -+ __stringify(KBASE_TL_ATTRIB_ATOM_PRIORITY_CHANGE), -+ "atom caused priority change", -+ "@p", -+ "atom" -+ }, -+ { -+ KBASE_TL_ATTRIB_ATOM_JIT, -+ __stringify(KBASE_TL_ATTRIB_ATOM_JIT), -+ "jit done for atom", -+ "@pLL", -+ "atom,edit_addr,new_addr" -+ }, -+ { -+ KBASE_TL_ATTRIB_AS_CONFIG, -+ __stringify(KBASE_TL_ATTRIB_AS_CONFIG), -+ "address space attributes", -+ "@pLLL", -+ "address_space,transtab,memattr,transcfg" -+ }, -+ { -+ KBASE_TL_EVENT_LPU_SOFTSTOP, -+ __stringify(KBASE_TL_EVENT_LPU_SOFTSTOP), -+ "softstop event on given lpu", -+ "@p", -+ "lpu" -+ }, -+ { -+ KBASE_TL_EVENT_ATOM_SOFTSTOP_EX, -+ __stringify(KBASE_TL_EVENT_ATOM_SOFTSTOP_EX), -+ "atom softstopped", -+ "@p", -+ "atom" -+ }, -+ { -+ KBASE_TL_EVENT_ATOM_SOFTSTOP_ISSUE, -+ __stringify(KBASE_TL_EVENT_SOFTSTOP_ISSUE), -+ "atom softstop issued", -+ "@p", -+ "atom" -+ }, -+ { -+ KBASE_JD_GPU_SOFT_RESET, -+ __stringify(KBASE_JD_GPU_SOFT_RESET), -+ "gpu soft reset", -+ "@p", -+ "gpu" -+ }, -+}; ++void kbase_reg_write(struct kbase_device *kbdev, u16 offset, u32 value, ++ struct kbase_context *kctx) ++{ ++ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_powered); ++ KBASE_DEBUG_ASSERT(kctx == NULL || kctx->as_nr != KBASEP_AS_NR_INVALID); ++ KBASE_DEBUG_ASSERT(kbdev->dev != NULL); + -+/* Descriptors of timeline messages transmitted in auxiliary events stream. */ -+static const struct tp_desc tp_desc_aux[] = { -+ { -+ KBASE_AUX_PM_STATE, -+ __stringify(KBASE_AUX_PM_STATE), -+ "PM state", -+ "@IL", -+ "core_type,core_state_bitset" -+ }, -+ { -+ KBASE_AUX_PAGEFAULT, -+ __stringify(KBASE_AUX_PAGEFAULT), -+ "Page fault", -+ "@IL", -+ "ctx_nr,page_cnt_change" -+ }, -+ { -+ KBASE_AUX_PAGESALLOC, -+ __stringify(KBASE_AUX_PAGESALLOC), -+ "Total alloc pages change", -+ "@IL", -+ "ctx_nr,page_cnt" -+ }, -+ { -+ KBASE_AUX_DEVFREQ_TARGET, -+ __stringify(KBASE_AUX_DEVFREQ_TARGET), -+ "New device frequency target", -+ "@L", -+ "target_freq" -+ }, -+ { -+ KBASE_AUX_PROTECTED_ENTER_START, -+ __stringify(KBASE_AUX_PROTECTED_ENTER_START), -+ "enter protected mode start", -+ "@p", -+ "gpu" -+ }, -+ { -+ KBASE_AUX_PROTECTED_ENTER_END, -+ __stringify(KBASE_AUX_PROTECTED_ENTER_END), -+ "enter protected mode end", -+ "@p", -+ "gpu" -+ }, -+ { -+ KBASE_AUX_PROTECTED_LEAVE_START, -+ __stringify(KBASE_AUX_PROTECTED_LEAVE_START), -+ "leave protected mode start", -+ "@p", -+ "gpu" -+ }, -+ { -+ KBASE_AUX_PROTECTED_LEAVE_END, -+ __stringify(KBASE_AUX_PROTECTED_LEAVE_END), -+ "leave protected mode end", -+ "@p", -+ "gpu" -+ } -+}; ++ writel(value, kbdev->reg + offset); + -+#if MALI_UNIT_TEST -+/* Number of bytes read by user. */ -+static atomic_t tlstream_bytes_collected = {0}; ++#ifdef CONFIG_DEBUG_FS ++ if (unlikely(kbdev->io_history.enabled)) ++ kbase_io_history_add(&kbdev->io_history, kbdev->reg + offset, ++ value, 1); ++#endif /* CONFIG_DEBUG_FS */ ++ dev_dbg(kbdev->dev, "w: reg %04x val %08x", offset, value); + -+/* Number of bytes generated by tracepoint messages. */ -+static atomic_t tlstream_bytes_generated = {0}; -+#endif /* MALI_UNIT_TEST */ ++ if (kctx && kctx->jctx.tb) ++ kbase_device_trace_register_access(kctx, REG_WRITE, offset, ++ value); ++} + -+/*****************************************************************************/ ++KBASE_EXPORT_TEST_API(kbase_reg_write); + -+/* Indicator of whether the timeline stream file descriptor is used. */ -+atomic_t kbase_tlstream_enabled = {0}; ++u32 kbase_reg_read(struct kbase_device *kbdev, u16 offset, ++ struct kbase_context *kctx) ++{ ++ u32 val; ++ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_powered); ++ KBASE_DEBUG_ASSERT(kctx == NULL || kctx->as_nr != KBASEP_AS_NR_INVALID); ++ KBASE_DEBUG_ASSERT(kbdev->dev != NULL); + -+/*****************************************************************************/ ++ val = readl(kbdev->reg + offset); + -+/** -+ * kbasep_tlstream_get_timestamp - return timestamp -+ * -+ * Function returns timestamp value based on raw monotonic timer. Value will -+ * wrap around zero in case of overflow. -+ * Return: timestamp value -+ */ -+static u64 kbasep_tlstream_get_timestamp(void) -+{ -+ struct timespec ts; -+ u64 timestamp; ++#ifdef CONFIG_DEBUG_FS ++ if (unlikely(kbdev->io_history.enabled)) ++ kbase_io_history_add(&kbdev->io_history, kbdev->reg + offset, ++ val, 0); ++#endif /* CONFIG_DEBUG_FS */ ++ dev_dbg(kbdev->dev, "r: reg %04x val %08x", offset, val); + -+ getrawmonotonic(&ts); -+ timestamp = (u64)ts.tv_sec * NSECS_IN_SEC + ts.tv_nsec; -+ return timestamp; ++ if (kctx && kctx->jctx.tb) ++ kbase_device_trace_register_access(kctx, REG_READ, offset, val); ++ return val; +} + ++KBASE_EXPORT_TEST_API(kbase_reg_read); ++#endif /* !defined(CONFIG_MALI_NO_MALI) */ ++ +/** -+ * kbasep_tlstream_write_bytes - write data to message buffer -+ * @buffer: buffer where data will be written -+ * @pos: position in the buffer where to place data -+ * @bytes: pointer to buffer holding data -+ * @len: length of data to be written ++ * kbase_report_gpu_fault - Report a GPU fault. ++ * @kbdev: Kbase device pointer ++ * @multiple: Zero if only GPU_FAULT was raised, non-zero if MULTIPLE_GPU_FAULTS ++ * was also set + * -+ * Return: updated position in the buffer ++ * This function is called from the interrupt handler when a GPU fault occurs. ++ * It reports the details of the fault using dev_warn(). + */ -+static size_t kbasep_tlstream_write_bytes( -+ char *buffer, -+ size_t pos, -+ const void *bytes, -+ size_t len) ++static void kbase_report_gpu_fault(struct kbase_device *kbdev, int multiple) +{ -+ KBASE_DEBUG_ASSERT(buffer); -+ KBASE_DEBUG_ASSERT(bytes); ++ u32 status; ++ u64 address; + -+ memcpy(&buffer[pos], bytes, len); ++ status = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_FAULTSTATUS), NULL); ++ address = (u64) kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(GPU_FAULTADDRESS_HI), NULL) << 32; ++ address |= kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(GPU_FAULTADDRESS_LO), NULL); + -+ return pos + len; ++ dev_warn(kbdev->dev, "GPU Fault 0x%08x (%s) at 0x%016llx", ++ status & 0xFF, ++ kbase_exception_name(kbdev, status), ++ address); ++ if (multiple) ++ dev_warn(kbdev->dev, "There were multiple GPU faults - some have not been reported\n"); +} + -+/** -+ * kbasep_tlstream_write_string - write string to message buffer -+ * @buffer: buffer where data will be written -+ * @pos: position in the buffer where to place data -+ * @string: pointer to buffer holding the source string -+ * @max_write_size: number of bytes that can be stored in buffer -+ * -+ * Return: updated position in the buffer -+ */ -+static size_t kbasep_tlstream_write_string( -+ char *buffer, -+ size_t pos, -+ const char *string, -+ size_t max_write_size) ++void kbase_gpu_interrupt(struct kbase_device *kbdev, u32 val) +{ -+ u32 string_len; ++ KBASE_TRACE_ADD(kbdev, CORE_GPU_IRQ, NULL, NULL, 0u, val); ++ if (val & GPU_FAULT) ++ kbase_report_gpu_fault(kbdev, val & MULTIPLE_GPU_FAULTS); + -+ KBASE_DEBUG_ASSERT(buffer); -+ KBASE_DEBUG_ASSERT(string); -+ /* Timeline string consists of at least string length and nul -+ * terminator. */ -+ KBASE_DEBUG_ASSERT(max_write_size >= sizeof(string_len) + sizeof(char)); -+ max_write_size -= sizeof(string_len); ++ if (val & RESET_COMPLETED) ++ kbase_pm_reset_done(kbdev); + -+ string_len = strlcpy( -+ &buffer[pos + sizeof(string_len)], -+ string, -+ max_write_size); -+ string_len += sizeof(char); ++ if (val & PRFCNT_SAMPLE_COMPLETED) ++ kbase_instr_hwcnt_sample_done(kbdev); + -+ /* Make sure that the source string fit into the buffer. */ -+ KBASE_DEBUG_ASSERT(string_len <= max_write_size); ++ if (val & CLEAN_CACHES_COMPLETED) ++ kbase_clean_caches_done(kbdev); + -+ /* Update string length. */ -+ memcpy(&buffer[pos], &string_len, sizeof(string_len)); ++ KBASE_TRACE_ADD(kbdev, CORE_GPU_IRQ_CLEAR, NULL, NULL, 0u, val); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), val, NULL); + -+ return pos + sizeof(string_len) + string_len; -+} ++ /* kbase_pm_check_transitions must be called after the IRQ has been ++ * cleared. This is because it might trigger further power transitions ++ * and we don't want to miss the interrupt raised to notify us that ++ * these further transitions have finished. ++ */ ++ if (val & POWER_CHANGED_ALL) ++ kbase_pm_power_changed(kbdev); + -+/** -+ * kbasep_tlstream_write_timestamp - write timestamp to message buffer -+ * @buffer: buffer where data will be written -+ * @pos: position in the buffer where to place data ++ KBASE_TRACE_ADD(kbdev, CORE_GPU_IRQ_DONE, NULL, NULL, 0u, val); ++} +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h +new file mode 100755 +index 000000000..5b2044593 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h +@@ -0,0 +1,67 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * Return: updated position in the buffer + */ -+static size_t kbasep_tlstream_write_timestamp(void *buffer, size_t pos) -+{ -+ u64 timestamp = kbasep_tlstream_get_timestamp(); + -+ return kbasep_tlstream_write_bytes( -+ buffer, pos, -+ ×tamp, sizeof(timestamp)); -+} + -+/** -+ * kbasep_tlstream_put_bits - put bits in a word -+ * @word: pointer to the words being modified -+ * @value: value that shall be written to given position -+ * @bitpos: position where value shall be written (in bits) -+ * @bitlen: length of value (in bits) -+ */ -+static void kbasep_tlstream_put_bits( -+ u32 *word, -+ u32 value, -+ unsigned int bitpos, -+ unsigned int bitlen) -+{ -+ const u32 mask = ((1 << bitlen) - 1) << bitpos; + -+ KBASE_DEBUG_ASSERT(word); -+ KBASE_DEBUG_ASSERT((0 != bitlen) && (32 >= bitlen)); -+ KBASE_DEBUG_ASSERT((bitpos + bitlen) <= 32); + -+ *word &= ~mask; -+ *word |= ((value << bitpos) & mask); -+} + -+/** -+ * kbasep_tlstream_packet_header_setup - setup the packet header -+ * @buffer: pointer to the buffer -+ * @pkt_family: packet's family -+ * @pkt_type: packet's type -+ * @pkt_class: packet's class -+ * @stream_id: stream id -+ * @numbered: non-zero if this stream is numbered -+ * -+ * Function sets up immutable part of packet header in the given buffer. ++/* ++ * Backend-specific HW access device APIs + */ -+static void kbasep_tlstream_packet_header_setup( -+ char *buffer, -+ enum tl_packet_family pkt_family, -+ enum tl_packet_class pkt_class, -+ enum tl_packet_type pkt_type, -+ unsigned int stream_id, -+ int numbered) -+{ -+ u32 word0 = 0; -+ u32 word1 = 0; -+ -+ KBASE_DEBUG_ASSERT(buffer); -+ KBASE_DEBUG_ASSERT(pkt_family == TL_PACKET_FAMILY_TL); -+ KBASE_DEBUG_ASSERT( -+ (pkt_type == TL_PACKET_TYPE_HEADER) || -+ (pkt_type == TL_PACKET_TYPE_SUMMARY) || -+ (pkt_type == TL_PACKET_TYPE_BODY)); -+ KBASE_DEBUG_ASSERT( -+ (pkt_class == TL_PACKET_CLASS_OBJ) || -+ (pkt_class == TL_PACKET_CLASS_AUX)); -+ -+ kbasep_tlstream_put_bits( -+ &word0, pkt_family, -+ PACKET_FAMILY_POS, PACKET_FAMILY_LEN); -+ kbasep_tlstream_put_bits( -+ &word0, pkt_class, -+ PACKET_CLASS_POS, PACKET_CLASS_LEN); -+ kbasep_tlstream_put_bits( -+ &word0, pkt_type, -+ PACKET_TYPE_POS, PACKET_TYPE_LEN); -+ kbasep_tlstream_put_bits( -+ &word0, stream_id, -+ PACKET_STREAMID_POS, PACKET_STREAMID_LEN); -+ -+ if (numbered) -+ kbasep_tlstream_put_bits( -+ &word1, 1, -+ PACKET_SEQBIT_POS, PACKET_SEQBIT_LEN); + -+ memcpy(&buffer[0], &word0, sizeof(word0)); -+ memcpy(&buffer[sizeof(word0)], &word1, sizeof(word1)); -+} ++#ifndef _KBASE_DEVICE_INTERNAL_H_ ++#define _KBASE_DEVICE_INTERNAL_H_ + +/** -+ * kbasep_tlstream_packet_header_update - update the packet header -+ * @buffer: pointer to the buffer -+ * @data_size: amount of data carried in this packet ++ * kbase_reg_write - write to GPU register ++ * @kbdev: Kbase device pointer ++ * @offset: Offset of register ++ * @value: Value to write ++ * @kctx: Kbase context pointer. May be NULL + * -+ * Function updates mutable part of packet header in the given buffer. -+ * Note that value of data_size must not including size of the header. ++ * Caller must ensure the GPU is powered (@kbdev->pm.gpu_powered != false). If ++ * @kctx is not NULL then the caller must ensure it is scheduled (@kctx->as_nr ++ * != KBASEP_AS_NR_INVALID). + */ -+static void kbasep_tlstream_packet_header_update( -+ char *buffer, -+ size_t data_size) -+{ -+ u32 word0; -+ u32 word1; -+ -+ KBASE_DEBUG_ASSERT(buffer); -+ CSTD_UNUSED(word0); -+ -+ memcpy(&word1, &buffer[sizeof(word0)], sizeof(word1)); -+ -+ kbasep_tlstream_put_bits( -+ &word1, data_size, -+ PACKET_LENGTH_POS, PACKET_LENGTH_LEN); -+ -+ memcpy(&buffer[sizeof(word0)], &word1, sizeof(word1)); -+} ++void kbase_reg_write(struct kbase_device *kbdev, u16 offset, u32 value, ++ struct kbase_context *kctx); + +/** -+ * kbasep_tlstream_packet_number_update - update the packet number -+ * @buffer: pointer to the buffer -+ * @counter: value of packet counter for this packet's stream ++ * kbase_reg_read - read from GPU register ++ * @kbdev: Kbase device pointer ++ * @offset: Offset of register ++ * @kctx: Kbase context pointer. May be NULL + * -+ * Function updates packet number embedded within the packet placed in the -+ * given buffer. ++ * Caller must ensure the GPU is powered (@kbdev->pm.gpu_powered != false). If ++ * @kctx is not NULL then the caller must ensure it is scheduled (@kctx->as_nr ++ * != KBASEP_AS_NR_INVALID). ++ * ++ * Return: Value in desired register + */ -+static void kbasep_tlstream_packet_number_update(char *buffer, u32 counter) -+{ -+ KBASE_DEBUG_ASSERT(buffer); ++u32 kbase_reg_read(struct kbase_device *kbdev, u16 offset, ++ struct kbase_context *kctx); + -+ memcpy(&buffer[PACKET_HEADER_SIZE], &counter, sizeof(counter)); -+} + +/** -+ * kbasep_timeline_stream_reset - reset stream -+ * @stream: pointer to the stream structure ++ * kbase_gpu_interrupt - GPU interrupt handler ++ * @kbdev: Kbase device pointer ++ * @val: The value of the GPU IRQ status register which triggered the call + * -+ * Function discards all pending messages and resets packet counters. ++ * This function is called from the interrupt handler when a GPU irq is to be ++ * handled. + */ -+static void kbasep_timeline_stream_reset(struct tl_stream *stream) -+{ -+ unsigned int i; -+ -+ for (i = 0; i < PACKET_COUNT; i++) { -+ if (stream->numbered) -+ atomic_set( -+ &stream->buffer[i].size, -+ PACKET_HEADER_SIZE + -+ PACKET_NUMBER_SIZE); -+ else -+ atomic_set(&stream->buffer[i].size, PACKET_HEADER_SIZE); -+ } -+ -+ atomic_set(&stream->wbi, 0); -+ atomic_set(&stream->rbi, 0); -+} ++void kbase_gpu_interrupt(struct kbase_device *kbdev, u32 val); + -+/** -+ * kbasep_timeline_stream_init - initialize timeline stream -+ * @stream: pointer to the stream structure -+ * @stream_type: stream type ++#endif /* _KBASE_DEVICE_INTERNAL_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c +new file mode 100755 +index 000000000..d578fd78e +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c +@@ -0,0 +1,123 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ -+static void kbasep_timeline_stream_init( -+ struct tl_stream *stream, -+ enum tl_stream_type stream_type) -+{ -+ unsigned int i; -+ -+ KBASE_DEBUG_ASSERT(stream); -+ KBASE_DEBUG_ASSERT(TL_STREAM_TYPE_COUNT > stream_type); -+ -+ spin_lock_init(&stream->lock); + -+ /* All packets carrying tracepoints shall be numbered. */ -+ if (TL_PACKET_TYPE_BODY == tl_stream_cfg[stream_type].pkt_type) -+ stream->numbered = 1; -+ else -+ stream->numbered = 0; + -+ for (i = 0; i < PACKET_COUNT; i++) -+ kbasep_tlstream_packet_header_setup( -+ stream->buffer[i].data, -+ tl_stream_cfg[stream_type].pkt_family, -+ tl_stream_cfg[stream_type].pkt_class, -+ tl_stream_cfg[stream_type].pkt_type, -+ tl_stream_cfg[stream_type].stream_id, -+ stream->numbered); + -+ kbasep_timeline_stream_reset(tl_stream[stream_type]); -+} + -+/** -+ * kbasep_timeline_stream_term - terminate timeline stream -+ * @stream: pointer to the stream structure ++/* ++ * Register-based HW access backend APIs + */ -+static void kbasep_timeline_stream_term(struct tl_stream *stream) -+{ -+ KBASE_DEBUG_ASSERT(stream); -+} ++#include ++#include ++#include ++#include ++#include ++#include + -+/** -+ * kbasep_tlstream_msgbuf_submit - submit packet to the user space -+ * @stream: pointer to the stream structure -+ * @wb_idx_raw: write buffer index -+ * @wb_size: length of data stored in current buffer -+ * -+ * Function updates currently written buffer with packet header. Then write -+ * index is incremented and buffer is handled to user space. Parameters -+ * of new buffer are returned using provided arguments. -+ * -+ * Return: length of data in new buffer -+ * -+ * Warning: User must update the stream structure with returned value. -+ */ -+static size_t kbasep_tlstream_msgbuf_submit( -+ struct tl_stream *stream, -+ unsigned int wb_idx_raw, -+ unsigned int wb_size) ++int kbase_backend_early_init(struct kbase_device *kbdev) +{ -+ unsigned int rb_idx_raw = atomic_read(&stream->rbi); -+ unsigned int wb_idx = wb_idx_raw % PACKET_COUNT; ++ int err; + -+ /* Set stream as flushed. */ -+ atomic_set(&stream->autoflush_counter, -1); ++ err = kbasep_platform_device_init(kbdev); ++ if (err) ++ return err; + -+ kbasep_tlstream_packet_header_update( -+ stream->buffer[wb_idx].data, -+ wb_size - PACKET_HEADER_SIZE); ++ /* Ensure we can access the GPU registers */ ++ kbase_pm_register_access_enable(kbdev); + -+ if (stream->numbered) -+ kbasep_tlstream_packet_number_update( -+ stream->buffer[wb_idx].data, -+ wb_idx_raw); ++ /* Find out GPU properties based on the GPU feature registers */ ++ kbase_gpuprops_set(kbdev); + -+ /* Increasing write buffer index will expose this packet to the reader. -+ * As stream->lock is not taken on reader side we must make sure memory -+ * is updated correctly before this will happen. */ -+ smp_wmb(); -+ wb_idx_raw++; -+ atomic_set(&stream->wbi, wb_idx_raw); ++ /* We're done accessing the GPU registers for now. */ ++ kbase_pm_register_access_disable(kbdev); + -+ /* Inform user that packets are ready for reading. */ -+ wake_up_interruptible(&tl_event_queue); ++ err = kbase_hwaccess_pm_init(kbdev); ++ if (err) ++ goto fail_pm; + -+ /* Detect and mark overflow in this stream. */ -+ if (PACKET_COUNT == wb_idx_raw - rb_idx_raw) { -+ /* Reader side depends on this increment to correctly handle -+ * overflows. The value shall be updated only if it was not -+ * modified by the reader. The data holding buffer will not be -+ * updated before stream->lock is released, however size of the -+ * buffer will. Make sure this increment is globally visible -+ * before information about selected write buffer size. */ -+ atomic_cmpxchg(&stream->rbi, rb_idx_raw, rb_idx_raw + 1); -+ } ++ err = kbase_install_interrupts(kbdev); ++ if (err) ++ goto fail_interrupts; + -+ wb_size = PACKET_HEADER_SIZE; -+ if (stream->numbered) -+ wb_size += PACKET_NUMBER_SIZE; ++ return 0; + -+ return wb_size; ++fail_interrupts: ++ kbase_hwaccess_pm_term(kbdev); ++fail_pm: ++ kbasep_platform_device_term(kbdev); ++ ++ return err; +} + -+/** -+ * kbasep_tlstream_msgbuf_acquire - lock selected stream and reserves buffer -+ * @stream_type: type of the stream that shall be locked -+ * @msg_size: message size -+ * @flags: pointer to store flags passed back on stream release -+ * -+ * Function will lock the stream and reserve the number of bytes requested -+ * in msg_size for the user. -+ * -+ * Return: pointer to the buffer where message can be stored -+ * -+ * Warning: Stream must be released with kbasep_tlstream_msgbuf_release(). -+ * Only atomic operations are allowed while stream is locked -+ * (i.e. do not use any operation that may sleep). -+ */ -+static char *kbasep_tlstream_msgbuf_acquire( -+ enum tl_stream_type stream_type, -+ size_t msg_size, -+ unsigned long *flags) __acquires(&stream->lock) ++void kbase_backend_early_term(struct kbase_device *kbdev) +{ -+ struct tl_stream *stream; -+ unsigned int wb_idx_raw; -+ unsigned int wb_idx; -+ size_t wb_size; -+ -+ KBASE_DEBUG_ASSERT(TL_STREAM_TYPE_COUNT > stream_type); -+ KBASE_DEBUG_ASSERT( -+ PACKET_SIZE - PACKET_HEADER_SIZE - PACKET_NUMBER_SIZE >= -+ msg_size); ++ kbase_release_interrupts(kbdev); ++ kbase_hwaccess_pm_term(kbdev); ++ kbasep_platform_device_term(kbdev); ++} + -+ stream = tl_stream[stream_type]; ++int kbase_backend_late_init(struct kbase_device *kbdev) ++{ ++ int err; + -+ spin_lock_irqsave(&stream->lock, *flags); ++ err = kbase_hwaccess_pm_powerup(kbdev, PM_HW_ISSUES_DETECT); ++ if (err) ++ return err; + -+ wb_idx_raw = atomic_read(&stream->wbi); -+ wb_idx = wb_idx_raw % PACKET_COUNT; -+ wb_size = atomic_read(&stream->buffer[wb_idx].size); ++ err = kbase_backend_timer_init(kbdev); ++ if (err) ++ goto fail_timer; + -+ /* Select next buffer if data will not fit into current one. */ -+ if (PACKET_SIZE < wb_size + msg_size) { -+ wb_size = kbasep_tlstream_msgbuf_submit( -+ stream, wb_idx_raw, wb_size); -+ wb_idx = (wb_idx_raw + 1) % PACKET_COUNT; ++#ifdef CONFIG_MALI_DEBUG ++#ifndef CONFIG_MALI_NO_MALI ++ if (kbasep_common_test_interrupt_handlers(kbdev) != 0) { ++ dev_err(kbdev->dev, "Interrupt assigment check failed.\n"); ++ err = -EINVAL; ++ goto fail_interrupt_test; + } ++#endif /* !CONFIG_MALI_NO_MALI */ ++#endif /* CONFIG_MALI_DEBUG */ + -+ /* Reserve space in selected buffer. */ -+ atomic_set(&stream->buffer[wb_idx].size, wb_size + msg_size); -+ -+#if MALI_UNIT_TEST -+ atomic_add(msg_size, &tlstream_bytes_generated); -+#endif /* MALI_UNIT_TEST */ ++ err = kbase_job_slot_init(kbdev); ++ if (err) ++ goto fail_job_slot; + -+ return &stream->buffer[wb_idx].data[wb_size]; -+} ++ init_waitqueue_head(&kbdev->hwaccess.backend.reset_wait); + -+/** -+ * kbasep_tlstream_msgbuf_release - unlock selected stream -+ * @stream_type: type of the stream that shall be locked -+ * @flags: value obtained during stream acquire -+ * -+ * Function releases stream that has been previously locked with a call to -+ * kbasep_tlstream_msgbuf_acquire(). -+ */ -+static void kbasep_tlstream_msgbuf_release( -+ enum tl_stream_type stream_type, -+ unsigned long flags) __releases(&stream->lock) -+{ -+ struct tl_stream *stream; ++ return 0; + -+ KBASE_DEBUG_ASSERT(TL_STREAM_TYPE_COUNT > stream_type); ++fail_job_slot: + -+ stream = tl_stream[stream_type]; ++#ifdef CONFIG_MALI_DEBUG ++#ifndef CONFIG_MALI_NO_MALI ++fail_interrupt_test: ++#endif /* !CONFIG_MALI_NO_MALI */ ++#endif /* CONFIG_MALI_DEBUG */ + -+ /* Mark stream as containing unflushed data. */ -+ atomic_set(&stream->autoflush_counter, 0); ++ kbase_backend_timer_term(kbdev); ++fail_timer: ++ kbase_hwaccess_pm_halt(kbdev); + -+ spin_unlock_irqrestore(&stream->lock, flags); ++ return err; +} + -+/*****************************************************************************/ ++void kbase_backend_late_term(struct kbase_device *kbdev) ++{ ++ kbase_job_slot_halt(kbdev); ++ kbase_job_slot_term(kbdev); ++ kbase_backend_timer_term(kbdev); ++ kbase_hwaccess_pm_halt(kbdev); ++} + -+/** -+ * kbasep_tlstream_flush_stream - flush stream -+ * @stype: type of stream to be flushed +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c +new file mode 100755 +index 000000000..b395325b5 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c +@@ -0,0 +1,110 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * Flush pending data in timeline stream. + */ -+static void kbasep_tlstream_flush_stream(enum tl_stream_type stype) -+{ -+ struct tl_stream *stream = tl_stream[stype]; -+ unsigned long flags; -+ unsigned int wb_idx_raw; -+ unsigned int wb_idx; -+ size_t wb_size; -+ size_t min_size = PACKET_HEADER_SIZE; + -+ if (stream->numbered) -+ min_size += PACKET_NUMBER_SIZE; + -+ spin_lock_irqsave(&stream->lock, flags); + -+ wb_idx_raw = atomic_read(&stream->wbi); -+ wb_idx = wb_idx_raw % PACKET_COUNT; -+ wb_size = atomic_read(&stream->buffer[wb_idx].size); + -+ if (wb_size > min_size) { -+ wb_size = kbasep_tlstream_msgbuf_submit( -+ stream, wb_idx_raw, wb_size); -+ wb_idx = (wb_idx_raw + 1) % PACKET_COUNT; -+ atomic_set(&stream->buffer[wb_idx].size, wb_size); -+ } -+ spin_unlock_irqrestore(&stream->lock, flags); -+} + -+/** -+ * kbasep_tlstream_autoflush_timer_callback - autoflush timer callback -+ * @data: unused -+ * -+ * Timer is executed periodically to check if any of the stream contains -+ * buffer ready to be submitted to user space. ++/* ++ * Base kernel property query backend APIs + */ -+static void kbasep_tlstream_autoflush_timer_callback(struct timer_list *t) ++ ++#include ++#include ++#include ++#include ++ ++void kbase_backend_gpuprops_get(struct kbase_device *kbdev, ++ struct kbase_gpuprops_regdump *regdump) +{ -+ enum tl_stream_type stype; -+ int rcode; ++ int i; + -+ for (stype = 0; stype < TL_STREAM_TYPE_COUNT; stype++) { -+ struct tl_stream *stream = tl_stream[stype]; -+ unsigned long flags; -+ unsigned int wb_idx_raw; -+ unsigned int wb_idx; -+ size_t wb_size; -+ size_t min_size = PACKET_HEADER_SIZE; ++ /* Fill regdump with the content of the relevant registers */ ++ regdump->gpu_id = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_ID), NULL); + -+ int af_cnt = atomic_read(&stream->autoflush_counter); ++ regdump->l2_features = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(L2_FEATURES), NULL); ++ regdump->suspend_size = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(SUSPEND_SIZE), NULL); ++ regdump->tiler_features = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(TILER_FEATURES), NULL); ++ regdump->mem_features = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(MEM_FEATURES), NULL); ++ regdump->mmu_features = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(MMU_FEATURES), NULL); ++ regdump->as_present = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(AS_PRESENT), NULL); ++ regdump->js_present = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(JS_PRESENT), NULL); + -+ /* Check if stream contain unflushed data. */ -+ if (0 > af_cnt) -+ continue; ++ for (i = 0; i < GPU_MAX_JOB_SLOTS; i++) ++ regdump->js_features[i] = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(JS_FEATURES_REG(i)), NULL); + -+ /* Check if stream should be flushed now. */ -+ if (af_cnt != atomic_cmpxchg( -+ &stream->autoflush_counter, -+ af_cnt, -+ af_cnt + 1)) -+ continue; -+ if (!af_cnt) -+ continue; ++ for (i = 0; i < BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS; i++) ++ regdump->texture_features[i] = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(TEXTURE_FEATURES_REG(i)), NULL); + -+ /* Autoflush this stream. */ -+ if (stream->numbered) -+ min_size += PACKET_NUMBER_SIZE; ++ regdump->thread_max_threads = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(THREAD_MAX_THREADS), NULL); ++ regdump->thread_max_workgroup_size = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(THREAD_MAX_WORKGROUP_SIZE), ++ NULL); ++ regdump->thread_max_barrier_size = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(THREAD_MAX_BARRIER_SIZE), NULL); ++ regdump->thread_features = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(THREAD_FEATURES), NULL); + -+ spin_lock_irqsave(&stream->lock, flags); ++ regdump->shader_present_lo = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(SHADER_PRESENT_LO), NULL); ++ regdump->shader_present_hi = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(SHADER_PRESENT_HI), NULL); + -+ wb_idx_raw = atomic_read(&stream->wbi); -+ wb_idx = wb_idx_raw % PACKET_COUNT; -+ wb_size = atomic_read(&stream->buffer[wb_idx].size); ++ regdump->tiler_present_lo = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(TILER_PRESENT_LO), NULL); ++ regdump->tiler_present_hi = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(TILER_PRESENT_HI), NULL); + -+ if (wb_size > min_size) { -+ wb_size = kbasep_tlstream_msgbuf_submit( -+ stream, wb_idx_raw, wb_size); -+ wb_idx = (wb_idx_raw + 1) % PACKET_COUNT; -+ atomic_set(&stream->buffer[wb_idx].size, -+ wb_size); -+ } -+ spin_unlock_irqrestore(&stream->lock, flags); -+ } ++ regdump->l2_present_lo = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(L2_PRESENT_LO), NULL); ++ regdump->l2_present_hi = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(L2_PRESENT_HI), NULL); + -+ if (atomic_read(&autoflush_timer_active)) -+ rcode = mod_timer( -+ &autoflush_timer, -+ jiffies + msecs_to_jiffies(AUTOFLUSH_INTERVAL)); -+ CSTD_UNUSED(rcode); ++ regdump->stack_present_lo = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(STACK_PRESENT_LO), NULL); ++ regdump->stack_present_hi = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(STACK_PRESENT_HI), NULL); +} + -+/** -+ * kbasep_tlstream_packet_pending - check timeline streams for pending packets -+ * @stype: pointer to variable where stream type will be placed -+ * @rb_idx_raw: pointer to variable where read buffer index will be placed -+ * -+ * Function checks all streams for pending packets. It will stop as soon as -+ * packet ready to be submitted to user space is detected. Variables under -+ * pointers, passed as the parameters to this function will be updated with -+ * values pointing to right stream and buffer. -+ * -+ * Return: non-zero if any of timeline streams has at last one packet ready -+ */ -+static int kbasep_tlstream_packet_pending( -+ enum tl_stream_type *stype, -+ unsigned int *rb_idx_raw) ++void kbase_backend_gpuprops_get_features(struct kbase_device *kbdev, ++ struct kbase_gpuprops_regdump *regdump) +{ -+ int pending = 0; ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_COHERENCY_REG)) { ++ /* Ensure we can access the GPU registers */ ++ kbase_pm_register_access_enable(kbdev); + -+ KBASE_DEBUG_ASSERT(stype); -+ KBASE_DEBUG_ASSERT(rb_idx_raw); ++ regdump->coherency_features = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(COHERENCY_FEATURES), NULL); + -+ for ( -+ *stype = 0; -+ (*stype < TL_STREAM_TYPE_COUNT) && !pending; -+ (*stype)++) { -+ if (NULL != tl_stream[*stype]) { -+ *rb_idx_raw = atomic_read(&tl_stream[*stype]->rbi); -+ /* Read buffer index may be updated by writer in case of -+ * overflow. Read and write buffer indexes must be -+ * loaded in correct order. */ -+ smp_rmb(); -+ if (atomic_read(&tl_stream[*stype]->wbi) != *rb_idx_raw) -+ pending = 1; -+ } ++ /* We're done accessing the GPU registers for now. */ ++ kbase_pm_register_access_disable(kbdev); ++ } else { ++ /* Pre COHERENCY_FEATURES we only supported ACE_LITE */ ++ regdump->coherency_features = ++ COHERENCY_FEATURE_BIT(COHERENCY_NONE) | ++ COHERENCY_FEATURE_BIT(COHERENCY_ACE_LITE); + } -+ (*stype)--; -+ -+ return pending; +} + -+/** -+ * kbasep_tlstream_read - copy data from streams to buffer provided by user -+ * @filp: pointer to file structure (unused) -+ * @buffer: pointer to the buffer provided by user -+ * @size: maximum amount of data that can be stored in the buffer -+ * @f_pos: pointer to file offset (unused) +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c +new file mode 100755 +index 000000000..7ad309e8d +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c +@@ -0,0 +1,492 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * Return: number of bytes stored in the buffer + */ -+static ssize_t kbasep_tlstream_read( -+ struct file *filp, -+ char __user *buffer, -+ size_t size, -+ loff_t *f_pos) -+{ -+ ssize_t copy_len = 0; -+ -+ KBASE_DEBUG_ASSERT(filp); -+ KBASE_DEBUG_ASSERT(f_pos); -+ -+ if (!buffer) -+ return -EINVAL; -+ -+ if ((0 > *f_pos) || (PACKET_SIZE > size)) -+ return -EINVAL; -+ -+ mutex_lock(&tl_reader_lock); -+ -+ while (copy_len < size) { -+ enum tl_stream_type stype; -+ unsigned int rb_idx_raw = 0; -+ unsigned int rb_idx; -+ size_t rb_size; -+ -+ /* If we don't have any data yet, wait for packet to be -+ * submitted. If we already read some packets and there is no -+ * packet pending return back to user. */ -+ if (0 < copy_len) { -+ if (!kbasep_tlstream_packet_pending( -+ &stype, -+ &rb_idx_raw)) -+ break; -+ } else { -+ if (wait_event_interruptible( -+ tl_event_queue, -+ kbasep_tlstream_packet_pending( -+ &stype, -+ &rb_idx_raw))) { -+ copy_len = -ERESTARTSYS; -+ break; -+ } -+ } -+ -+ /* Check if this packet fits into the user buffer. -+ * If so copy its content. */ -+ rb_idx = rb_idx_raw % PACKET_COUNT; -+ rb_size = atomic_read(&tl_stream[stype]->buffer[rb_idx].size); -+ if (rb_size > size - copy_len) -+ break; -+ if (copy_to_user( -+ &buffer[copy_len], -+ tl_stream[stype]->buffer[rb_idx].data, -+ rb_size)) { -+ copy_len = -EFAULT; -+ break; -+ } + -+ /* If the rbi still points to the packet we just processed -+ * then there was no overflow so we add the copied size to -+ * copy_len and move rbi on to the next packet -+ */ -+ smp_rmb(); -+ if (atomic_read(&tl_stream[stype]->rbi) == rb_idx_raw) { -+ copy_len += rb_size; -+ atomic_inc(&tl_stream[stype]->rbi); + -+#if MALI_UNIT_TEST -+ atomic_add(rb_size, &tlstream_bytes_collected); -+#endif /* MALI_UNIT_TEST */ -+ } -+ } + -+ mutex_unlock(&tl_reader_lock); + -+ return copy_len; -+} + -+/** -+ * kbasep_tlstream_poll - poll timeline stream for packets -+ * @filp: pointer to file structure -+ * @wait: pointer to poll table -+ * Return: POLLIN if data can be read without blocking, otherwise zero ++/* ++ * GPU backend instrumentation APIs. + */ -+static unsigned int kbasep_tlstream_poll(struct file *filp, poll_table *wait) -+{ -+ enum tl_stream_type stream_type; -+ unsigned int rb_idx; + -+ KBASE_DEBUG_ASSERT(filp); -+ KBASE_DEBUG_ASSERT(wait); -+ -+ poll_wait(filp, &tl_event_queue, wait); -+ if (kbasep_tlstream_packet_pending(&stream_type, &rb_idx)) -+ return POLLIN; -+ return 0; -+} ++#include ++#include ++#include ++#include ++#include ++#include + +/** -+ * kbasep_tlstream_release - release timeline stream descriptor -+ * @inode: pointer to inode structure -+ * @filp: pointer to file structure ++ * kbasep_instr_hwcnt_cacheclean - Issue Cache Clean & Invalidate command to ++ * hardware + * -+ * Return always return zero ++ * @kbdev: Kbase device + */ -+static int kbasep_tlstream_release(struct inode *inode, struct file *filp) ++static void kbasep_instr_hwcnt_cacheclean(struct kbase_device *kbdev) +{ -+ KBASE_DEBUG_ASSERT(inode); -+ KBASE_DEBUG_ASSERT(filp); -+ CSTD_UNUSED(inode); -+ CSTD_UNUSED(filp); ++ unsigned long flags; ++ unsigned long pm_flags; ++ u32 irq_mask; + -+ /* Stop autoflush timer before releasing access to streams. */ -+ atomic_set(&autoflush_timer_active, 0); -+ del_timer_sync(&autoflush_timer); ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == ++ KBASE_INSTR_STATE_REQUEST_CLEAN); + -+ atomic_set(&kbase_tlstream_enabled, 0); -+ return 0; ++ /* Enable interrupt */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); ++ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), NULL); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), ++ irq_mask | CLEAN_CACHES_COMPLETED, NULL); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); ++ ++ /* clean&invalidate the caches so we're sure the mmu tables for the dump ++ * buffer is valid */ ++ KBASE_TRACE_ADD(kbdev, CORE_GPU_CLEAN_INV_CACHES, NULL, NULL, 0u, 0); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), ++ GPU_COMMAND_CLEAN_INV_CACHES, NULL); ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_CLEANING; ++ ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); +} + -+/** -+ * kbasep_tlstream_timeline_header - prepare timeline header stream packet -+ * @stream_type: type of the stream that will carry header data -+ * @tp_desc: pointer to array with tracepoint descriptors -+ * @tp_count: number of descriptors in the given array -+ * -+ * Functions fills in information about tracepoints stored in body stream -+ * associated with this header stream. -+ */ -+static void kbasep_tlstream_timeline_header( -+ enum tl_stream_type stream_type, -+ const struct tp_desc *tp_desc, -+ u32 tp_count) ++int kbase_instr_hwcnt_enable_internal(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ struct kbase_uk_hwcnt_setup *setup) +{ -+ const u8 tv = SWTRACE_VERSION; /* protocol version */ -+ const u8 ps = sizeof(void *); /* pointer size */ -+ size_t msg_size = sizeof(tv) + sizeof(ps) + sizeof(tp_count); -+ char *buffer; -+ size_t pos = 0; -+ unsigned long flags; -+ unsigned int i; ++ unsigned long flags, pm_flags; ++ int err = -EINVAL; ++ u32 irq_mask; ++ int ret; ++ u64 shader_cores_needed; ++ u32 prfcnt_config; + -+ KBASE_DEBUG_ASSERT(TL_STREAM_TYPE_COUNT > stream_type); -+ KBASE_DEBUG_ASSERT(tp_desc); ++ shader_cores_needed = kbase_pm_get_present_cores(kbdev, ++ KBASE_PM_CORE_SHADER); + -+ /* Calculate the size of the timeline message. */ -+ for (i = 0; i < tp_count; i++) { -+ msg_size += sizeof(tp_desc[i].id); -+ msg_size += -+ strnlen(tp_desc[i].id_str, STRLEN_MAX) + -+ sizeof(char) + sizeof(u32); -+ msg_size += -+ strnlen(tp_desc[i].name, STRLEN_MAX) + -+ sizeof(char) + sizeof(u32); -+ msg_size += -+ strnlen(tp_desc[i].arg_types, STRLEN_MAX) + -+ sizeof(char) + sizeof(u32); -+ msg_size += -+ strnlen(tp_desc[i].arg_names, STRLEN_MAX) + -+ sizeof(char) + sizeof(u32); -+ } ++ /* alignment failure */ ++ if ((setup->dump_buffer == 0ULL) || (setup->dump_buffer & (2048 - 1))) ++ goto out_err; + -+ KBASE_DEBUG_ASSERT(PACKET_SIZE - PACKET_HEADER_SIZE >= msg_size); ++ /* Override core availability policy to ensure all cores are available ++ */ ++ kbase_pm_ca_instr_enable(kbdev); + -+ buffer = kbasep_tlstream_msgbuf_acquire(stream_type, msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ /* Request the cores early on synchronously - we'll release them on any ++ * errors (e.g. instrumentation already active) */ ++ kbase_pm_request_cores_sync(kbdev, true, shader_cores_needed); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &tv, sizeof(tv)); -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &ps, sizeof(ps)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &tp_count, sizeof(tp_count)); ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + -+ for (i = 0; i < tp_count; i++) { -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, -+ &tp_desc[i].id, sizeof(tp_desc[i].id)); -+ pos = kbasep_tlstream_write_string( -+ buffer, pos, -+ tp_desc[i].id_str, msg_size - pos); -+ pos = kbasep_tlstream_write_string( -+ buffer, pos, -+ tp_desc[i].name, msg_size - pos); -+ pos = kbasep_tlstream_write_string( -+ buffer, pos, -+ tp_desc[i].arg_types, msg_size - pos); -+ pos = kbasep_tlstream_write_string( -+ buffer, pos, -+ tp_desc[i].arg_names, msg_size - pos); ++ if (kbdev->hwcnt.backend.state != KBASE_INSTR_STATE_DISABLED) { ++ /* Instrumentation is already enabled */ ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ goto out_unrequest_cores; + } + -+ KBASE_DEBUG_ASSERT(msg_size == pos); -+ -+ kbasep_tlstream_msgbuf_release(stream_type, flags); ++ /* Enable interrupt */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); ++ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), NULL); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), irq_mask | ++ PRFCNT_SAMPLE_COMPLETED, NULL); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); + -+ /* We don't expect any more data to be read in this stream. -+ * As header stream must be read before its associated body stream, -+ * make this packet visible to the user straightaway. */ -+ kbasep_tlstream_flush_stream(stream_type); -+} ++ /* In use, this context is the owner */ ++ kbdev->hwcnt.kctx = kctx; ++ /* Remember the dump address so we can reprogram it later */ ++ kbdev->hwcnt.addr = setup->dump_buffer; + -+/*****************************************************************************/ ++ /* Request the clean */ ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_REQUEST_CLEAN; ++ kbdev->hwcnt.backend.triggered = 0; ++ /* Clean&invalidate the caches so we're sure the mmu tables for the dump ++ * buffer is valid */ ++ ret = queue_work(kbdev->hwcnt.backend.cache_clean_wq, ++ &kbdev->hwcnt.backend.cache_clean_work); ++ KBASE_DEBUG_ASSERT(ret); + -+int kbase_tlstream_init(void) -+{ -+ enum tl_stream_type i; ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); + -+ /* Prepare stream structures. */ -+ for (i = 0; i < TL_STREAM_TYPE_COUNT; i++) { -+ tl_stream[i] = kmalloc(sizeof(**tl_stream), GFP_KERNEL); -+ if (!tl_stream[i]) -+ break; -+ kbasep_timeline_stream_init(tl_stream[i], i); -+ } -+ if (TL_STREAM_TYPE_COUNT > i) { -+ for (; i > 0; i--) { -+ kbasep_timeline_stream_term(tl_stream[i - 1]); -+ kfree(tl_stream[i - 1]); -+ } -+ return -ENOMEM; -+ } ++ /* Wait for cacheclean to complete */ ++ wait_event(kbdev->hwcnt.backend.wait, ++ kbdev->hwcnt.backend.triggered != 0); + -+ /* Initialize autoflush timer. */ -+ timer_setup(&autoflush_timer, -+ kbasep_tlstream_autoflush_timer_callback, -+ 0); ++ KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == ++ KBASE_INSTR_STATE_IDLE); + -+ return 0; -+} ++ kbase_pm_request_l2_caches(kbdev); + -+void kbase_tlstream_term(void) -+{ -+ enum tl_stream_type i; ++ /* Configure */ ++ prfcnt_config = kctx->as_nr << PRFCNT_CONFIG_AS_SHIFT; ++#ifdef CONFIG_MALI_PRFCNT_SET_SECONDARY ++ { ++ u32 gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++ u32 product_id = (gpu_id & GPU_ID_VERSION_PRODUCT_ID) ++ >> GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++ int arch_v6 = GPU_ID_IS_NEW_FORMAT(product_id); + -+ for (i = 0; i < TL_STREAM_TYPE_COUNT; i++) { -+ kbasep_timeline_stream_term(tl_stream[i]); -+ kfree(tl_stream[i]); ++ if (arch_v6) ++ prfcnt_config |= 1 << PRFCNT_CONFIG_SETSELECT_SHIFT; + } -+} ++#endif + -+static void kbase_create_timeline_objects(struct kbase_context *kctx) -+{ -+ struct kbase_device *kbdev = kctx->kbdev; -+ unsigned int lpu_id; -+ unsigned int as_nr; -+ struct kbasep_kctx_list_element *element; ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_CONFIG), ++ prfcnt_config | PRFCNT_CONFIG_MODE_OFF, kctx); + -+ /* Create LPU objects. */ -+ for (lpu_id = 0; lpu_id < kbdev->gpu_props.num_job_slots; lpu_id++) { -+ u32 *lpu = -+ &kbdev->gpu_props.props.raw_props.js_features[lpu_id]; -+ KBASE_TLSTREAM_TL_SUMMARY_NEW_LPU(lpu, lpu_id, *lpu); -+ } ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_LO), ++ setup->dump_buffer & 0xFFFFFFFF, kctx); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_HI), ++ setup->dump_buffer >> 32, kctx); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_JM_EN), ++ setup->jm_bm, kctx); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_SHADER_EN), ++ setup->shader_bm, kctx); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_MMU_L2_EN), ++ setup->mmu_l2_bm, kctx); ++ /* Due to PRLAM-8186 we need to disable the Tiler before we enable the ++ * HW counter dump. */ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8186)) ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_TILER_EN), 0, ++ kctx); ++ else ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_TILER_EN), ++ setup->tiler_bm, kctx); + -+ /* Create Address Space objects. */ -+ for (as_nr = 0; as_nr < kbdev->nr_hw_address_spaces; as_nr++) -+ KBASE_TLSTREAM_TL_SUMMARY_NEW_AS(&kbdev->as[as_nr], as_nr); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_CONFIG), ++ prfcnt_config | PRFCNT_CONFIG_MODE_MANUAL, kctx); + -+ /* Create GPU object and make it retain all LPUs and address spaces. */ -+ KBASE_TLSTREAM_TL_SUMMARY_NEW_GPU( -+ kbdev, -+ kbdev->gpu_props.props.raw_props.gpu_id, -+ kbdev->gpu_props.num_cores); ++ /* If HW has PRLAM-8186 we can now re-enable the tiler HW counters dump ++ */ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8186)) ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_TILER_EN), ++ setup->tiler_bm, kctx); + -+ for (lpu_id = 0; lpu_id < kbdev->gpu_props.num_job_slots; lpu_id++) { -+ void *lpu = -+ &kbdev->gpu_props.props.raw_props.js_features[lpu_id]; -+ KBASE_TLSTREAM_TL_SUMMARY_LIFELINK_LPU_GPU(lpu, kbdev); -+ } -+ for (as_nr = 0; as_nr < kbdev->nr_hw_address_spaces; as_nr++) -+ KBASE_TLSTREAM_TL_SUMMARY_LIFELINK_AS_GPU( -+ &kbdev->as[as_nr], -+ kbdev); ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + -+ /* Create object for each known context. */ -+ mutex_lock(&kbdev->kctx_list_lock); -+ list_for_each_entry(element, &kbdev->kctx_list, link) { -+ KBASE_TLSTREAM_TL_SUMMARY_NEW_CTX( -+ element->kctx, -+ element->kctx->id, -+ (u32)(element->kctx->tgid)); -+ } -+ /* Before releasing the lock, reset body stream buffers. -+ * This will prevent context creation message to be directed to both -+ * summary and body stream. -+ */ -+ kbase_tlstream_reset_body_streams(); -+ mutex_unlock(&kbdev->kctx_list_lock); -+ /* Static object are placed into summary packet that needs to be -+ * transmitted first. Flush all streams to make it available to -+ * user space. -+ */ -+ kbase_tlstream_flush_streams(); ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; ++ kbdev->hwcnt.backend.triggered = 1; ++ wake_up(&kbdev->hwcnt.backend.wait); ++ ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ ++ err = 0; ++ ++ dev_dbg(kbdev->dev, "HW counters dumping set-up for context %p", kctx); ++ return err; ++ out_unrequest_cores: ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_pm_unrequest_cores(kbdev, true, shader_cores_needed); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ out_err: ++ return err; +} + -+int kbase_tlstream_acquire(struct kbase_context *kctx, u32 flags) ++int kbase_instr_hwcnt_disable_internal(struct kbase_context *kctx) +{ -+ int ret; -+ u32 tlstream_enabled = TLSTREAM_ENABLED | flags; ++ unsigned long flags, pm_flags; ++ int err = -EINVAL; ++ u32 irq_mask; ++ struct kbase_device *kbdev = kctx->kbdev; + -+ if (0 == atomic_cmpxchg(&kbase_tlstream_enabled, 0, tlstream_enabled)) { -+ int rcode; ++ while (1) { ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + -+ ret = anon_inode_getfd( -+ "[mali_tlstream]", -+ &kbasep_tlstream_fops, -+ kctx, -+ O_RDONLY | O_CLOEXEC); -+ if (ret < 0) { -+ atomic_set(&kbase_tlstream_enabled, 0); -+ return ret; ++ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_DISABLED) { ++ /* Instrumentation is not enabled */ ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ goto out; + } + -+ /* Reset and initialize header streams. */ -+ kbasep_timeline_stream_reset( -+ tl_stream[TL_STREAM_TYPE_OBJ_HEADER]); -+ kbasep_timeline_stream_reset( -+ tl_stream[TL_STREAM_TYPE_OBJ_SUMMARY]); -+ kbasep_timeline_stream_reset( -+ tl_stream[TL_STREAM_TYPE_AUX_HEADER]); -+ kbasep_tlstream_timeline_header( -+ TL_STREAM_TYPE_OBJ_HEADER, -+ tp_desc_obj, -+ ARRAY_SIZE(tp_desc_obj)); -+ kbasep_tlstream_timeline_header( -+ TL_STREAM_TYPE_AUX_HEADER, -+ tp_desc_aux, -+ ARRAY_SIZE(tp_desc_aux)); -+ -+ /* Start autoflush timer. */ -+ atomic_set(&autoflush_timer_active, 1); -+ rcode = mod_timer( -+ &autoflush_timer, -+ jiffies + msecs_to_jiffies(AUTOFLUSH_INTERVAL)); -+ CSTD_UNUSED(rcode); -+ -+ /* If job dumping is enabled, readjust the software event's -+ * timeout as the default value of 3 seconds is often -+ * insufficient. */ -+ if (flags & BASE_TLSTREAM_JOB_DUMPING_ENABLED) { -+ dev_info(kctx->kbdev->dev, -+ "Job dumping is enabled, readjusting the software event's timeout\n"); -+ atomic_set(&kctx->kbdev->js_data.soft_job_timeout_ms, -+ 1800000); ++ if (kbdev->hwcnt.kctx != kctx) { ++ /* Instrumentation has been setup for another context */ ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ goto out; + } + -+ /* Summary stream was cleared during acquire. -+ * Create static timeline objects that will be -+ * read by client. -+ */ -+ kbase_create_timeline_objects(kctx); ++ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_IDLE) ++ break; + -+ } else { -+ ret = -EBUSY; ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ ++ /* Ongoing dump/setup - wait for its completion */ ++ wait_event(kbdev->hwcnt.backend.wait, ++ kbdev->hwcnt.backend.triggered != 0); + } + -+ return ret; -+} ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_DISABLED; ++ kbdev->hwcnt.backend.triggered = 0; + -+void kbase_tlstream_flush_streams(void) -+{ -+ enum tl_stream_type stype; ++ /* Disable interrupt */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); ++ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), NULL); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), ++ irq_mask & ~PRFCNT_SAMPLE_COMPLETED, NULL); + -+ for (stype = 0; stype < TL_STREAM_TYPE_COUNT; stype++) -+ kbasep_tlstream_flush_stream(stype); -+} ++ /* Disable the counters */ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_CONFIG), 0, kctx); + -+void kbase_tlstream_reset_body_streams(void) -+{ -+ kbasep_timeline_stream_reset( -+ tl_stream[TL_STREAM_TYPE_OBJ]); -+ kbasep_timeline_stream_reset( -+ tl_stream[TL_STREAM_TYPE_AUX]); -+} ++ kbdev->hwcnt.kctx = NULL; ++ kbdev->hwcnt.addr = 0ULL; + -+#if MALI_UNIT_TEST -+void kbase_tlstream_stats(u32 *bytes_collected, u32 *bytes_generated) -+{ -+ KBASE_DEBUG_ASSERT(bytes_collected); -+ KBASE_DEBUG_ASSERT(bytes_generated); -+ *bytes_collected = atomic_read(&tlstream_bytes_collected); -+ *bytes_generated = atomic_read(&tlstream_bytes_generated); -+} -+#endif /* MALI_UNIT_TEST */ ++ kbase_pm_ca_instr_disable(kbdev); + -+/*****************************************************************************/ ++ kbase_pm_unrequest_cores(kbdev, true, ++ kbase_pm_get_present_cores(kbdev, KBASE_PM_CORE_SHADER)); + -+void __kbase_tlstream_tl_summary_new_ctx(void *context, u32 nr, u32 tgid) -+{ -+ const u32 msg_id = KBASE_TL_NEW_CTX; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(context) + sizeof(nr) + -+ sizeof(tgid); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ kbase_pm_release_l2_caches(kbdev); + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ_SUMMARY, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &context, sizeof(context)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &nr, sizeof(nr)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &tgid, sizeof(tgid)); ++ dev_dbg(kbdev->dev, "HW counters dumping disabled for context %p", ++ kctx); + -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ err = 0; + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ_SUMMARY, flags); ++ out: ++ return err; +} + -+void __kbase_tlstream_tl_summary_new_gpu(void *gpu, u32 id, u32 core_count) ++int kbase_instr_hwcnt_request_dump(struct kbase_context *kctx) +{ -+ const u32 msg_id = KBASE_TL_NEW_GPU; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(gpu) + sizeof(id) + -+ sizeof(core_count); + unsigned long flags; -+ char *buffer; -+ size_t pos = 0; -+ -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ_SUMMARY, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ int err = -EINVAL; ++ struct kbase_device *kbdev = kctx->kbdev; + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &gpu, sizeof(gpu)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &id, sizeof(id)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &core_count, sizeof(core_count)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ_SUMMARY, flags); -+} ++ if (kbdev->hwcnt.kctx != kctx) { ++ /* The instrumentation has been setup for another context */ ++ goto unlock; ++ } + -+void __kbase_tlstream_tl_summary_new_lpu(void *lpu, u32 nr, u32 fn) -+{ -+ const u32 msg_id = KBASE_TL_NEW_LPU; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(lpu) + sizeof(nr) + -+ sizeof(fn); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ if (kbdev->hwcnt.backend.state != KBASE_INSTR_STATE_IDLE) { ++ /* HW counters are disabled or another dump is ongoing, or we're ++ * resetting */ ++ goto unlock; ++ } + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ_SUMMARY, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ kbdev->hwcnt.backend.triggered = 0; + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &lpu, sizeof(lpu)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &nr, sizeof(nr)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &fn, sizeof(fn)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ /* Mark that we're dumping - the PF handler can signal that we faulted ++ */ ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_DUMPING; + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ_SUMMARY, flags); -+} ++ /* Reconfigure the dump address */ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_LO), ++ kbdev->hwcnt.addr & 0xFFFFFFFF, NULL); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_HI), ++ kbdev->hwcnt.addr >> 32, NULL); + -+void __kbase_tlstream_tl_summary_lifelink_lpu_gpu(void *lpu, void *gpu) -+{ -+ const u32 msg_id = KBASE_TL_LIFELINK_LPU_GPU; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(lpu) + sizeof(gpu); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ /* Start dumping */ ++ KBASE_TRACE_ADD(kbdev, CORE_GPU_PRFCNT_SAMPLE, NULL, NULL, ++ kbdev->hwcnt.addr, 0); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), ++ GPU_COMMAND_PRFCNT_SAMPLE, kctx); + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ_SUMMARY, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ dev_dbg(kbdev->dev, "HW counters dumping done for context %p", kctx); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &lpu, sizeof(lpu)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &gpu, sizeof(gpu)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ err = 0; + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ_SUMMARY, flags); ++ unlock: ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ return err; +} ++KBASE_EXPORT_SYMBOL(kbase_instr_hwcnt_request_dump); + -+void __kbase_tlstream_tl_summary_new_as(void *as, u32 nr) ++bool kbase_instr_hwcnt_dump_complete(struct kbase_context *kctx, ++ bool * const success) +{ -+ const u32 msg_id = KBASE_TL_NEW_AS; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(as) + sizeof(nr); + unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ bool complete = false; ++ struct kbase_device *kbdev = kctx->kbdev; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ_SUMMARY, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &as, sizeof(as)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &nr, sizeof(nr)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_IDLE) { ++ *success = true; ++ complete = true; ++ } else if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_FAULT) { ++ *success = false; ++ complete = true; ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; ++ } + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ_SUMMARY, flags); ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ ++ return complete; +} ++KBASE_EXPORT_SYMBOL(kbase_instr_hwcnt_dump_complete); + -+void __kbase_tlstream_tl_summary_lifelink_as_gpu(void *as, void *gpu) ++void kbasep_cache_clean_worker(struct work_struct *data) +{ -+ const u32 msg_id = KBASE_TL_LIFELINK_AS_GPU; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(as) + sizeof(gpu); ++ struct kbase_device *kbdev; + unsigned long flags; -+ char *buffer; -+ size_t pos = 0; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ_SUMMARY, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ kbdev = container_of(data, struct kbase_device, ++ hwcnt.backend.cache_clean_work); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &as, sizeof(as)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &gpu, sizeof(gpu)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ mutex_lock(&kbdev->cacheclean_lock); ++ kbasep_instr_hwcnt_cacheclean(kbdev); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ_SUMMARY, flags); -+} ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ /* Wait for our condition, and any reset to complete */ ++ while (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_CLEANING) { ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ wait_event(kbdev->hwcnt.backend.cache_clean_wait, ++ kbdev->hwcnt.backend.state != ++ KBASE_INSTR_STATE_CLEANING); ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ } ++ KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == ++ KBASE_INSTR_STATE_CLEANED); + -+/*****************************************************************************/ ++ /* All finished and idle */ ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; ++ kbdev->hwcnt.backend.triggered = 1; ++ wake_up(&kbdev->hwcnt.backend.wait); + -+void __kbase_tlstream_tl_new_ctx(void *context, u32 nr, u32 tgid) ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ mutex_unlock(&kbdev->cacheclean_lock); ++} ++ ++void kbase_instr_hwcnt_sample_done(struct kbase_device *kbdev) +{ -+ const u32 msg_id = KBASE_TL_NEW_CTX; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(context) + sizeof(nr) + -+ sizeof(tgid); + unsigned long flags; -+ char *buffer; -+ size_t pos = 0; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &context, sizeof(context)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &nr, sizeof(nr)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &tgid, sizeof(tgid)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_FAULT) { ++ kbdev->hwcnt.backend.triggered = 1; ++ wake_up(&kbdev->hwcnt.backend.wait); ++ } else if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_DUMPING) { ++ int ret; ++ /* Always clean and invalidate the cache after a successful dump ++ */ ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_REQUEST_CLEAN; ++ ret = queue_work(kbdev->hwcnt.backend.cache_clean_wq, ++ &kbdev->hwcnt.backend.cache_clean_work); ++ KBASE_DEBUG_ASSERT(ret); ++ } + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); +} + -+void __kbase_tlstream_tl_new_atom(void *atom, u32 nr) ++void kbase_clean_caches_done(struct kbase_device *kbdev) +{ -+ const u32 msg_id = KBASE_TL_NEW_ATOM; -+ const size_t msg_size = sizeof(msg_id) + sizeof(u64) + sizeof(atom) + -+ sizeof(nr); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ u32 irq_mask; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ if (kbdev->hwcnt.backend.state != KBASE_INSTR_STATE_DISABLED) { ++ unsigned long flags; ++ unsigned long pm_flags; + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &nr, sizeof(nr)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ /* Disable interrupt */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); ++ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), ++ NULL); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), ++ irq_mask & ~CLEAN_CACHES_COMPLETED, NULL); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); ++ /* Wakeup... */ ++ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_CLEANING) { ++ /* Only wake if we weren't resetting */ ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_CLEANED; ++ wake_up(&kbdev->hwcnt.backend.cache_clean_wait); ++ } ++ ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ } +} + -+void __kbase_tlstream_tl_del_ctx(void *context) ++int kbase_instr_hwcnt_wait_for_dump(struct kbase_context *kctx) +{ -+ const u32 msg_id = KBASE_TL_DEL_CTX; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(context); ++ struct kbase_device *kbdev = kctx->kbdev; + unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ int err; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ /* Wait for dump & cacheclean to complete */ ++ wait_event(kbdev->hwcnt.backend.wait, ++ kbdev->hwcnt.backend.triggered != 0); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &context, sizeof(context)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); ++ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_FAULT) { ++ err = -EINVAL; ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; ++ } else { ++ /* Dump done */ ++ KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == ++ KBASE_INSTR_STATE_IDLE); ++ err = 0; ++ } ++ ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ ++ return err; +} + -+void __kbase_tlstream_tl_del_atom(void *atom) ++int kbase_instr_hwcnt_clear(struct kbase_context *kctx) +{ -+ const u32 msg_id = KBASE_TL_DEL_ATOM; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom); + unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ int err = -EINVAL; ++ struct kbase_device *kbdev = kctx->kbdev; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ /* Check it's the context previously set up and we're not already ++ * dumping */ ++ if (kbdev->hwcnt.kctx != kctx || kbdev->hwcnt.backend.state != ++ KBASE_INSTR_STATE_IDLE) ++ goto out; + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); ++ /* Clear the counters */ ++ KBASE_TRACE_ADD(kbdev, CORE_GPU_PRFCNT_CLEAR, NULL, NULL, 0u, 0); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), ++ GPU_COMMAND_PRFCNT_CLEAR, kctx); ++ ++ err = 0; ++ ++out: ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ return err; +} ++KBASE_EXPORT_SYMBOL(kbase_instr_hwcnt_clear); + -+void __kbase_tlstream_tl_ret_ctx_lpu(void *context, void *lpu) ++int kbase_instr_backend_init(struct kbase_device *kbdev) +{ -+ const u32 msg_id = KBASE_TL_RET_CTX_LPU; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(context) + sizeof(lpu); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ int ret = 0; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_DISABLED; + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &context, sizeof(context)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &lpu, sizeof(lpu)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ init_waitqueue_head(&kbdev->hwcnt.backend.wait); ++ init_waitqueue_head(&kbdev->hwcnt.backend.cache_clean_wait); ++ INIT_WORK(&kbdev->hwcnt.backend.cache_clean_work, ++ kbasep_cache_clean_worker); ++ kbdev->hwcnt.backend.triggered = 0; + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); ++ kbdev->hwcnt.backend.cache_clean_wq = ++ alloc_workqueue("Mali cache cleaning workqueue", 0, 1); ++ if (NULL == kbdev->hwcnt.backend.cache_clean_wq) ++ ret = -EINVAL; ++ ++ return ret; +} + -+void __kbase_tlstream_tl_ret_atom_ctx(void *atom, void *context) ++void kbase_instr_backend_term(struct kbase_device *kbdev) +{ -+ const u32 msg_id = KBASE_TL_RET_ATOM_CTX; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + sizeof(context); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ destroy_workqueue(kbdev->hwcnt.backend.cache_clean_wq); ++} + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h +new file mode 100755 +index 000000000..4794672da +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h +@@ -0,0 +1,58 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014, 2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &context, sizeof(context)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} + -+void __kbase_tlstream_tl_ret_atom_lpu( -+ void *atom, void *lpu, const char *attrib_match_list) -+{ -+ const u32 msg_id = KBASE_TL_RET_ATOM_LPU; -+ const size_t msg_s0 = sizeof(u32) + sizeof(char) + -+ strnlen(attrib_match_list, STRLEN_MAX); -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + -+ sizeof(atom) + sizeof(lpu) + msg_s0; -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++/* ++ * Backend-specific instrumentation definitions ++ */ + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++#ifndef _KBASE_INSTR_DEFS_H_ ++#define _KBASE_INSTR_DEFS_H_ + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &lpu, sizeof(lpu)); -+ pos = kbasep_tlstream_write_string( -+ buffer, pos, attrib_match_list, msg_s0); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++/* ++ * Instrumentation State Machine States ++ */ ++enum kbase_instr_state { ++ /* State where instrumentation is not active */ ++ KBASE_INSTR_STATE_DISABLED = 0, ++ /* State machine is active and ready for a command. */ ++ KBASE_INSTR_STATE_IDLE, ++ /* Hardware is currently dumping a frame. */ ++ KBASE_INSTR_STATE_DUMPING, ++ /* We've requested a clean to occur on a workqueue */ ++ KBASE_INSTR_STATE_REQUEST_CLEAN, ++ /* Hardware is currently cleaning and invalidating caches. */ ++ KBASE_INSTR_STATE_CLEANING, ++ /* Cache clean completed, and either a) a dump is complete, or ++ * b) instrumentation can now be setup. */ ++ KBASE_INSTR_STATE_CLEANED, ++ /* An error has occured during DUMPING (page fault). */ ++ KBASE_INSTR_STATE_FAULT ++}; + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} ++/* Structure used for instrumentation and HW counters dumping */ ++struct kbase_instr_backend { ++ wait_queue_head_t wait; ++ int triggered; + -+void __kbase_tlstream_tl_nret_ctx_lpu(void *context, void *lpu) -+{ -+ const u32 msg_id = KBASE_TL_NRET_CTX_LPU; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(context) + sizeof(lpu); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ enum kbase_instr_state state; ++ wait_queue_head_t cache_clean_wait; ++ struct workqueue_struct *cache_clean_wq; ++ struct work_struct cache_clean_work; ++}; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++#endif /* _KBASE_INSTR_DEFS_H_ */ + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &context, sizeof(context)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &lpu, sizeof(lpu)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h +new file mode 100755 +index 000000000..e96aeae78 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h +@@ -0,0 +1,45 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} + -+void __kbase_tlstream_tl_nret_atom_ctx(void *atom, void *context) -+{ -+ const u32 msg_id = KBASE_TL_NRET_ATOM_CTX; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + sizeof(context); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &context, sizeof(context)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} ++/* ++ * Backend-specific HW access instrumentation APIs ++ */ + -+void __kbase_tlstream_tl_dep_atom_atom(void *atom1, void *atom2) -+{ -+ const u32 msg_id = KBASE_TL_DEP_ATOM_ATOM; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom1) + sizeof(atom2); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++#ifndef _KBASE_INSTR_INTERNAL_H_ ++#define _KBASE_INSTR_INTERNAL_H_ + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++/** ++ * kbasep_cache_clean_worker() - Workqueue for handling cache cleaning ++ * @data: a &struct work_struct ++ */ ++void kbasep_cache_clean_worker(struct work_struct *data); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom1, sizeof(atom1)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom2, sizeof(atom2)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++/** ++ * kbase_clean_caches_done() - Cache clean interrupt received ++ * @kbdev: Kbase device ++ */ ++void kbase_clean_caches_done(struct kbase_device *kbdev); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} ++/** ++ * kbase_instr_hwcnt_sample_done() - Dump complete interrupt received ++ * @kbdev: Kbase device ++ */ ++void kbase_instr_hwcnt_sample_done(struct kbase_device *kbdev); + -+void __kbase_tlstream_tl_ndep_atom_atom(void *atom1, void *atom2) -+{ -+ const u32 msg_id = KBASE_TL_NDEP_ATOM_ATOM; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom1) + sizeof(atom2); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++#endif /* _KBASE_INSTR_INTERNAL_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h +new file mode 100755 +index 000000000..8781561e7 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h +@@ -0,0 +1,39 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom1, sizeof(atom1)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom2, sizeof(atom2)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} ++/* ++ * Backend specific IRQ APIs ++ */ + -+void __kbase_tlstream_tl_rdep_atom_atom(void *atom1, void *atom2) -+{ -+ const u32 msg_id = KBASE_TL_RDEP_ATOM_ATOM; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom1) + sizeof(atom2); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++#ifndef _KBASE_IRQ_INTERNAL_H_ ++#define _KBASE_IRQ_INTERNAL_H_ + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++int kbase_install_interrupts(struct kbase_device *kbdev); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom1, sizeof(atom1)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom2, sizeof(atom2)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++void kbase_release_interrupts(struct kbase_device *kbdev); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} ++/** ++ * kbase_synchronize_irqs - Ensure that all IRQ handlers have completed ++ * execution ++ * @kbdev: The kbase device ++ */ ++void kbase_synchronize_irqs(struct kbase_device *kbdev); + -+void __kbase_tlstream_tl_nret_atom_lpu(void *atom, void *lpu) -+{ -+ const u32 msg_id = KBASE_TL_NRET_ATOM_LPU; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + sizeof(lpu); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++int kbasep_common_test_interrupt_handlers( ++ struct kbase_device * const kbdev); + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++#endif /* _KBASE_IRQ_INTERNAL_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c +new file mode 100755 +index 000000000..8416b80e8 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c +@@ -0,0 +1,469 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &lpu, sizeof(lpu)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} + -+void __kbase_tlstream_tl_ret_as_ctx(void *as, void *ctx) -+{ -+ const u32 msg_id = KBASE_TL_RET_AS_CTX; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(as) + sizeof(ctx); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++#include ++#include ++#include + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++#include + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &as, sizeof(as)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &ctx, sizeof(ctx)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++#if !defined(CONFIG_MALI_NO_MALI) + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} ++/* GPU IRQ Tags */ ++#define JOB_IRQ_TAG 0 ++#define MMU_IRQ_TAG 1 ++#define GPU_IRQ_TAG 2 + -+void __kbase_tlstream_tl_nret_as_ctx(void *as, void *ctx) ++static void *kbase_tag(void *ptr, u32 tag) +{ -+ const u32 msg_id = KBASE_TL_NRET_AS_CTX; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(as) + sizeof(ctx); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; -+ -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); -+ -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &as, sizeof(as)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &ctx, sizeof(ctx)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ return (void *)(((uintptr_t) ptr) | tag); ++} + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); ++static void *kbase_untag(void *ptr) ++{ ++ return (void *)(((uintptr_t) ptr) & ~3); +} + -+void __kbase_tlstream_tl_ret_atom_as(void *atom, void *as) ++static irqreturn_t kbase_job_irq_handler(int irq, void *data) +{ -+ const u32 msg_id = KBASE_TL_RET_ATOM_AS; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + sizeof(as); + unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ struct kbase_device *kbdev = kbase_untag(data); ++ u32 val; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &as, sizeof(as)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ if (!kbdev->pm.backend.gpu_powered) { ++ /* GPU is turned off - IRQ is not for us */ ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, ++ flags); ++ return IRQ_NONE; ++ } + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} ++ val = kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_STATUS), NULL); + -+void __kbase_tlstream_tl_nret_atom_as(void *atom, void *as) -+{ -+ const u32 msg_id = KBASE_TL_NRET_ATOM_AS; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + sizeof(as); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++#ifdef CONFIG_MALI_DEBUG ++ if (!kbdev->pm.backend.driver_ready_for_irqs) ++ dev_warn(kbdev->dev, "%s: irq %d irqstatus 0x%x before driver is ready\n", ++ __func__, irq, val); ++#endif /* CONFIG_MALI_DEBUG */ ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ if (!val) ++ return IRQ_NONE; + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &as, sizeof(as)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); ++ kbase_job_done(kbdev, val); ++ ++ return IRQ_HANDLED; +} + -+void __kbase_tlstream_tl_attrib_atom_config( -+ void *atom, u64 jd, u64 affinity, u32 config) ++KBASE_EXPORT_TEST_API(kbase_job_irq_handler); ++ ++static irqreturn_t kbase_mmu_irq_handler(int irq, void *data) +{ -+ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_CONFIG; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + -+ sizeof(jd) + sizeof(affinity) + sizeof(config); + unsigned long flags; -+ char *buffer; -+ size_t pos = 0; -+ -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ struct kbase_device *kbdev = kbase_untag(data); ++ u32 val; + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &jd, sizeof(jd)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &affinity, sizeof(affinity)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &config, sizeof(config)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} ++ if (!kbdev->pm.backend.gpu_powered) { ++ /* GPU is turned off - IRQ is not for us */ ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, ++ flags); ++ return IRQ_NONE; ++ } + -+void __kbase_tlstream_tl_attrib_atom_priority(void *atom, u32 prio) -+{ -+ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_PRIORITY; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + sizeof(prio); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ atomic_inc(&kbdev->faults_pending); + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ val = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_STATUS), NULL); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &prio, sizeof(prio)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++#ifdef CONFIG_MALI_DEBUG ++ if (!kbdev->pm.backend.driver_ready_for_irqs) ++ dev_warn(kbdev->dev, "%s: irq %d irqstatus 0x%x before driver is ready\n", ++ __func__, irq, val); ++#endif /* CONFIG_MALI_DEBUG */ ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} ++ if (!val) { ++ atomic_dec(&kbdev->faults_pending); ++ return IRQ_NONE; ++ } + -+void __kbase_tlstream_tl_attrib_atom_state(void *atom, u32 state) -+{ -+ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_STATE; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + sizeof(state); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ kbase_mmu_interrupt(kbdev, val); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &state, sizeof(state)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ atomic_dec(&kbdev->faults_pending); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); ++ return IRQ_HANDLED; +} + -+void __kbase_tlstream_tl_attrib_atom_priority_change(void *atom) ++static irqreturn_t kbase_gpu_irq_handler(int irq, void *data) +{ -+ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_PRIORITY_CHANGE; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom); + unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ struct kbase_device *kbdev = kbase_untag(data); ++ u32 val; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ if (!kbdev->pm.backend.gpu_powered) { ++ /* GPU is turned off - IRQ is not for us */ ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, ++ flags); ++ return IRQ_NONE; ++ } + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} ++ val = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_STATUS), NULL); + -+void __kbase_tlstream_tl_attrib_atom_jit( -+ void *atom, u64 edit_addr, u64 new_addr) -+{ -+ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_JIT; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom) -+ + sizeof(edit_addr) + sizeof(new_addr); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++#ifdef CONFIG_MALI_DEBUG ++ if (!kbdev->pm.backend.driver_ready_for_irqs) ++ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x before driver is ready\n", ++ __func__, irq, val); ++#endif /* CONFIG_MALI_DEBUG */ ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ if (!val) ++ return IRQ_NONE; + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &edit_addr, sizeof(edit_addr)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &new_addr, sizeof(new_addr)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); ++ kbase_gpu_interrupt(kbdev, val); ++ ++ return IRQ_HANDLED; +} + -+void __kbase_tlstream_tl_attrib_as_config( -+ void *as, u64 transtab, u64 memattr, u64 transcfg) ++KBASE_EXPORT_TEST_API(kbase_gpu_irq_handler); ++ ++static irq_handler_t kbase_handler_table[] = { ++ [JOB_IRQ_TAG] = kbase_job_irq_handler, ++ [MMU_IRQ_TAG] = kbase_mmu_irq_handler, ++ [GPU_IRQ_TAG] = kbase_gpu_irq_handler, ++}; ++ ++#ifdef CONFIG_MALI_DEBUG ++#define JOB_IRQ_HANDLER JOB_IRQ_TAG ++#define MMU_IRQ_HANDLER MMU_IRQ_TAG ++#define GPU_IRQ_HANDLER GPU_IRQ_TAG ++ ++/** ++ * kbase_set_custom_irq_handler - Set a custom IRQ handler ++ * @kbdev: Device for which the handler is to be registered ++ * @custom_handler: Handler to be registered ++ * @irq_type: Interrupt type ++ * ++ * Registers given interrupt handler for requested interrupt type ++ * In the case where irq handler is not specified, the default handler shall be ++ * registered ++ * ++ * Return: 0 case success, error code otherwise ++ */ ++int kbase_set_custom_irq_handler(struct kbase_device *kbdev, ++ irq_handler_t custom_handler, ++ int irq_type) +{ -+ const u32 msg_id = KBASE_TL_ATTRIB_AS_CONFIG; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(as) + -+ sizeof(transtab) + sizeof(memattr) + sizeof(transcfg); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ int result = 0; ++ irq_handler_t requested_irq_handler = NULL; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ KBASE_DEBUG_ASSERT((JOB_IRQ_HANDLER <= irq_type) && ++ (GPU_IRQ_HANDLER >= irq_type)); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &as, sizeof(as)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &transtab, sizeof(transtab)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &memattr, sizeof(memattr)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &transcfg, sizeof(transcfg)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ /* Release previous handler */ ++ if (kbdev->irqs[irq_type].irq) ++ free_irq(kbdev->irqs[irq_type].irq, kbase_tag(kbdev, irq_type)); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); ++ requested_irq_handler = (NULL != custom_handler) ? custom_handler : ++ kbase_handler_table[irq_type]; ++ ++ if (0 != request_irq(kbdev->irqs[irq_type].irq, ++ requested_irq_handler, ++ kbdev->irqs[irq_type].flags | IRQF_SHARED, ++ dev_name(kbdev->dev), kbase_tag(kbdev, irq_type))) { ++ result = -EINVAL; ++ dev_err(kbdev->dev, "Can't request interrupt %d (index %d)\n", ++ kbdev->irqs[irq_type].irq, irq_type); ++#ifdef CONFIG_SPARSE_IRQ ++ dev_err(kbdev->dev, "You have CONFIG_SPARSE_IRQ support enabled - is the interrupt number correct for this configuration?\n"); ++#endif /* CONFIG_SPARSE_IRQ */ ++ } ++ ++ return result; +} + -+void __kbase_tlstream_tl_event_lpu_softstop(void *lpu) -+{ -+ const u32 msg_id = KBASE_TL_EVENT_LPU_SOFTSTOP; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(lpu); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++KBASE_EXPORT_TEST_API(kbase_set_custom_irq_handler); + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++/* test correct interrupt assigment and reception by cpu */ ++struct kbasep_irq_test { ++ struct hrtimer timer; ++ wait_queue_head_t wait; ++ int triggered; ++ u32 timeout; ++}; + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &lpu, sizeof(lpu)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++static struct kbasep_irq_test kbasep_irq_test_data; + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} ++#define IRQ_TEST_TIMEOUT 500 + -+void __kbase_tlstream_tl_event_atom_softstop_ex(void *atom) ++static irqreturn_t kbase_job_irq_test_handler(int irq, void *data) +{ -+ const u32 msg_id = KBASE_TL_EVENT_ATOM_SOFTSTOP_EX; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom); + unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ struct kbase_device *kbdev = kbase_untag(data); ++ u32 val; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ if (!kbdev->pm.backend.gpu_powered) { ++ /* GPU is turned off - IRQ is not for us */ ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, ++ flags); ++ return IRQ_NONE; ++ } + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} ++ val = kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_STATUS), NULL); + -+void __kbase_tlstream_tl_event_atom_softstop_issue(void *atom) -+{ -+ const u32 msg_id = KBASE_TL_EVENT_ATOM_SOFTSTOP_ISSUE; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(atom); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ if (!val) ++ return IRQ_NONE; + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &atom, sizeof(atom)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); ++ kbasep_irq_test_data.triggered = 1; ++ wake_up(&kbasep_irq_test_data.wait); ++ ++ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_CLEAR), val, NULL); ++ ++ return IRQ_HANDLED; +} + -+void __kbase_tlstream_jd_gpu_soft_reset(void *gpu) ++static irqreturn_t kbase_mmu_irq_test_handler(int irq, void *data) +{ -+ const u32 msg_id = KBASE_JD_GPU_SOFT_RESET; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(gpu); + unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ struct kbase_device *kbdev = kbase_untag(data); ++ u32 val; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_OBJ, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &gpu, sizeof(gpu)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ if (!kbdev->pm.backend.gpu_powered) { ++ /* GPU is turned off - IRQ is not for us */ ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, ++ flags); ++ return IRQ_NONE; ++ } + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); -+} ++ val = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_STATUS), NULL); + -+/*****************************************************************************/ ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); + -+void __kbase_tlstream_aux_pm_state(u32 core_type, u64 state) -+{ -+ const u32 msg_id = KBASE_AUX_PM_STATE; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(core_type) + -+ sizeof(state); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ if (!val) ++ return IRQ_NONE; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_AUX, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &core_type, sizeof(core_type)); -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &state, sizeof(state)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ kbasep_irq_test_data.triggered = 1; ++ wake_up(&kbasep_irq_test_data.wait); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); ++ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_CLEAR), val, NULL); ++ ++ return IRQ_HANDLED; +} + -+void __kbase_tlstream_aux_pagefault(u32 ctx_nr, u64 page_count_change) ++static enum hrtimer_restart kbasep_test_interrupt_timeout(struct hrtimer *timer) +{ -+ const u32 msg_id = KBASE_AUX_PAGEFAULT; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(ctx_nr) + -+ sizeof(page_count_change); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; -+ -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_AUX, msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); -+ -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &ctx_nr, sizeof(ctx_nr)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, -+ &page_count_change, sizeof(page_count_change)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ struct kbasep_irq_test *test_data = container_of(timer, ++ struct kbasep_irq_test, timer); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); ++ test_data->timeout = 1; ++ test_data->triggered = 1; ++ wake_up(&test_data->wait); ++ return HRTIMER_NORESTART; +} + -+void __kbase_tlstream_aux_pagesalloc(u32 ctx_nr, u64 page_count) ++static int kbasep_common_test_interrupt( ++ struct kbase_device * const kbdev, u32 tag) +{ -+ const u32 msg_id = KBASE_AUX_PAGESALLOC; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(ctx_nr) + -+ sizeof(page_count); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ int err = 0; ++ irq_handler_t test_handler; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_AUX, msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ u32 old_mask_val; ++ u16 mask_offset; ++ u16 rawstat_offset; + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &ctx_nr, sizeof(ctx_nr)); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &page_count, sizeof(page_count)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ switch (tag) { ++ case JOB_IRQ_TAG: ++ test_handler = kbase_job_irq_test_handler; ++ rawstat_offset = JOB_CONTROL_REG(JOB_IRQ_RAWSTAT); ++ mask_offset = JOB_CONTROL_REG(JOB_IRQ_MASK); ++ break; ++ case MMU_IRQ_TAG: ++ test_handler = kbase_mmu_irq_test_handler; ++ rawstat_offset = MMU_REG(MMU_IRQ_RAWSTAT); ++ mask_offset = MMU_REG(MMU_IRQ_MASK); ++ break; ++ case GPU_IRQ_TAG: ++ /* already tested by pm_driver - bail out */ ++ default: ++ return 0; ++ } + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); -+} ++ /* store old mask */ ++ old_mask_val = kbase_reg_read(kbdev, mask_offset, NULL); ++ /* mask interrupts */ ++ kbase_reg_write(kbdev, mask_offset, 0x0, NULL); + -+void __kbase_tlstream_aux_devfreq_target(u64 target_freq) -+{ -+ const u32 msg_id = KBASE_AUX_DEVFREQ_TARGET; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(target_freq); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ if (kbdev->irqs[tag].irq) { ++ /* release original handler and install test handler */ ++ if (kbase_set_custom_irq_handler(kbdev, test_handler, tag) != 0) { ++ err = -EINVAL; ++ } else { ++ kbasep_irq_test_data.timeout = 0; ++ hrtimer_init(&kbasep_irq_test_data.timer, ++ CLOCK_MONOTONIC, HRTIMER_MODE_REL); ++ kbasep_irq_test_data.timer.function = ++ kbasep_test_interrupt_timeout; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_AUX, msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ /* trigger interrupt */ ++ kbase_reg_write(kbdev, mask_offset, 0x1, NULL); ++ kbase_reg_write(kbdev, rawstat_offset, 0x1, NULL); + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &target_freq, sizeof(target_freq)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ hrtimer_start(&kbasep_irq_test_data.timer, ++ HR_TIMER_DELAY_MSEC(IRQ_TEST_TIMEOUT), ++ HRTIMER_MODE_REL); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); -+} ++ wait_event(kbasep_irq_test_data.wait, ++ kbasep_irq_test_data.triggered != 0); + -+void __kbase_tlstream_aux_protected_enter_start(void *gpu) -+{ -+ const u32 msg_id = KBASE_AUX_PROTECTED_ENTER_START; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(gpu); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ if (kbasep_irq_test_data.timeout != 0) { ++ dev_err(kbdev->dev, "Interrupt %d (index %d) didn't reach CPU.\n", ++ kbdev->irqs[tag].irq, tag); ++ err = -EINVAL; ++ } else { ++ dev_dbg(kbdev->dev, "Interrupt %d (index %d) reached CPU.\n", ++ kbdev->irqs[tag].irq, tag); ++ } + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_AUX, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ hrtimer_cancel(&kbasep_irq_test_data.timer); ++ kbasep_irq_test_data.triggered = 0; + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &gpu, sizeof(gpu)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ /* mask interrupts */ ++ kbase_reg_write(kbdev, mask_offset, 0x0, NULL); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); ++ /* release test handler */ ++ free_irq(kbdev->irqs[tag].irq, kbase_tag(kbdev, tag)); ++ } ++ ++ /* restore original interrupt */ ++ if (request_irq(kbdev->irqs[tag].irq, kbase_handler_table[tag], ++ kbdev->irqs[tag].flags | IRQF_SHARED, ++ dev_name(kbdev->dev), kbase_tag(kbdev, tag))) { ++ dev_err(kbdev->dev, "Can't restore original interrupt %d (index %d)\n", ++ kbdev->irqs[tag].irq, tag); ++ err = -EINVAL; ++ } ++ } ++ /* restore old mask */ ++ kbase_reg_write(kbdev, mask_offset, old_mask_val, NULL); ++ ++ return err; +} -+void __kbase_tlstream_aux_protected_enter_end(void *gpu) ++ ++int kbasep_common_test_interrupt_handlers( ++ struct kbase_device * const kbdev) +{ -+ const u32 msg_id = KBASE_AUX_PROTECTED_ENTER_END; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(gpu); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ int err; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_AUX, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ init_waitqueue_head(&kbasep_irq_test_data.wait); ++ kbasep_irq_test_data.triggered = 0; + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &gpu, sizeof(gpu)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ /* A suspend won't happen during startup/insmod */ ++ kbase_pm_context_active(kbdev); + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); ++ err = kbasep_common_test_interrupt(kbdev, JOB_IRQ_TAG); ++ if (err) { ++ dev_err(kbdev->dev, "Interrupt JOB_IRQ didn't reach CPU. Check interrupt assignments.\n"); ++ goto out; ++ } ++ ++ err = kbasep_common_test_interrupt(kbdev, MMU_IRQ_TAG); ++ if (err) { ++ dev_err(kbdev->dev, "Interrupt MMU_IRQ didn't reach CPU. Check interrupt assignments.\n"); ++ goto out; ++ } ++ ++ dev_dbg(kbdev->dev, "Interrupts are correctly assigned.\n"); ++ ++ out: ++ kbase_pm_context_idle(kbdev); ++ ++ return err; +} ++#endif /* CONFIG_MALI_DEBUG */ + -+void __kbase_tlstream_aux_protected_leave_start(void *gpu) ++int kbase_install_interrupts(struct kbase_device *kbdev) +{ -+ const u32 msg_id = KBASE_AUX_PROTECTED_LEAVE_START; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(gpu); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ u32 nr = ARRAY_SIZE(kbase_handler_table); ++ int err; ++ u32 i; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_AUX, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ for (i = 0; i < nr; i++) { ++ err = request_irq(kbdev->irqs[i].irq, kbase_handler_table[i], ++ kbdev->irqs[i].flags | IRQF_SHARED, ++ dev_name(kbdev->dev), ++ kbase_tag(kbdev, i)); ++ if (err) { ++ dev_err(kbdev->dev, "Can't request interrupt %d (index %d)\n", ++ kbdev->irqs[i].irq, i); ++#ifdef CONFIG_SPARSE_IRQ ++ dev_err(kbdev->dev, "You have CONFIG_SPARSE_IRQ support enabled - is the interrupt number correct for this configuration?\n"); ++#endif /* CONFIG_SPARSE_IRQ */ ++ goto release; ++ } ++ } + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &gpu, sizeof(gpu)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++ return 0; + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); ++ release: ++ while (i-- > 0) ++ free_irq(kbdev->irqs[i].irq, kbase_tag(kbdev, i)); ++ ++ return err; +} -+void __kbase_tlstream_aux_protected_leave_end(void *gpu) ++ ++void kbase_release_interrupts(struct kbase_device *kbdev) +{ -+ const u32 msg_id = KBASE_AUX_PROTECTED_LEAVE_END; -+ const size_t msg_size = -+ sizeof(msg_id) + sizeof(u64) + sizeof(gpu); -+ unsigned long flags; -+ char *buffer; -+ size_t pos = 0; ++ u32 nr = ARRAY_SIZE(kbase_handler_table); ++ u32 i; + -+ buffer = kbasep_tlstream_msgbuf_acquire( -+ TL_STREAM_TYPE_AUX, -+ msg_size, &flags); -+ KBASE_DEBUG_ASSERT(buffer); ++ for (i = 0; i < nr; i++) { ++ if (kbdev->irqs[i].irq) ++ free_irq(kbdev->irqs[i].irq, kbase_tag(kbdev, i)); ++ } ++} + -+ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); -+ pos = kbasep_tlstream_write_timestamp(buffer, pos); -+ pos = kbasep_tlstream_write_bytes( -+ buffer, pos, &gpu, sizeof(gpu)); -+ KBASE_DEBUG_ASSERT(msg_size == pos); ++void kbase_synchronize_irqs(struct kbase_device *kbdev) ++{ ++ u32 nr = ARRAY_SIZE(kbase_handler_table); ++ u32 i; + -+ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); ++ for (i = 0; i < nr; i++) { ++ if (kbdev->irqs[i].irq) ++ synchronize_irq(kbdev->irqs[i].irq); ++ } +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_tlstream.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_tlstream.h ++ ++#endif /* !defined(CONFIG_MALI_NO_MALI) */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c new file mode 100755 -index 000000000000..c0a1117d5f25 +index 000000000..92358f2bf --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_tlstream.h -@@ -0,0 +1,623 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c +@@ -0,0 +1,237 @@ +/* + * -+ * (C) COPYRIGHT 2015-2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -326051,621 +362344,364 @@ index 000000000000..c0a1117d5f25 + + + -+#if !defined(_KBASE_TLSTREAM_H) -+#define _KBASE_TLSTREAM_H -+ -+#include -+ -+/*****************************************************************************/ + -+/** -+ * kbase_tlstream_init - initialize timeline infrastructure in kernel -+ * Return: zero on success, negative number on error ++/* ++ * Register backend context / address space management + */ -+int kbase_tlstream_init(void); + -+/** -+ * kbase_tlstream_term - terminate timeline infrastructure in kernel -+ * -+ * Timeline need have to been previously enabled with kbase_tlstream_init(). -+ */ -+void kbase_tlstream_term(void); ++#include ++#include ++#include + +/** -+ * kbase_tlstream_acquire - acquire timeline stream file descriptor -+ * @kctx: kernel common context -+ * @flags: timeline stream flags ++ * assign_and_activate_kctx_addr_space - Assign an AS to a context ++ * @kbdev: Kbase device ++ * @kctx: Kbase context ++ * @current_as: Address Space to assign + * -+ * This descriptor is meant to be used by userspace timeline to gain access to -+ * kernel timeline stream. This stream is later broadcasted by user space to the -+ * timeline client. -+ * Only one entity can own the descriptor at any given time. Descriptor shall be -+ * closed if unused. If descriptor cannot be obtained (i.e. when it is already -+ * being used) return will be a negative value. ++ * Assign an Address Space (AS) to a context, and add the context to the Policy. + * -+ * Return: file descriptor on success, negative number on error -+ */ -+int kbase_tlstream_acquire(struct kbase_context *kctx, u32 flags); -+ -+/** -+ * kbase_tlstream_flush_streams - flush timeline streams. ++ * This includes ++ * setting up the global runpool_irq structure and the context on the AS, ++ * Activating the MMU on the AS, ++ * Allowing jobs to be submitted on the AS. + * -+ * Function will flush pending data in all timeline streams. ++ * Context: ++ * kbasep_js_kctx_info.jsctx_mutex held, ++ * kbasep_js_device_data.runpool_mutex held, ++ * AS transaction mutex held, ++ * Runpool IRQ lock held + */ -+void kbase_tlstream_flush_streams(void); ++static void assign_and_activate_kctx_addr_space(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ struct kbase_as *current_as) ++{ ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; + -+/** -+ * kbase_tlstream_reset_body_streams - reset timeline body streams. -+ * -+ * Function will discard pending data in all timeline body streams. -+ */ -+void kbase_tlstream_reset_body_streams(void); ++ lockdep_assert_held(&kctx->jctx.sched_info.ctx.jsctx_mutex); ++ lockdep_assert_held(&js_devdata->runpool_mutex); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+#if MALI_UNIT_TEST -+/** -+ * kbase_tlstream_test - start timeline stream data generator -+ * @tpw_count: number of trace point writers in each context -+ * @msg_delay: time delay in milliseconds between trace points written by one -+ * writer -+ * @msg_count: number of trace points written by one writer -+ * @aux_msg: if non-zero aux messages will be included -+ * -+ * This test starts a requested number of asynchronous writers in both IRQ and -+ * thread context. Each writer will generate required number of test -+ * tracepoints (tracepoints with embedded information about writer that -+ * should be verified by user space reader). Tracepoints will be emitted in -+ * all timeline body streams. If aux_msg is non-zero writer will also -+ * generate not testable tracepoints (tracepoints without information about -+ * writer). These tracepoints are used to check correctness of remaining -+ * timeline message generating functions. Writer will wait requested time -+ * between generating another set of messages. This call blocks until all -+ * writers finish. -+ */ -+void kbase_tlstream_test( -+ unsigned int tpw_count, -+ unsigned int msg_delay, -+ unsigned int msg_count, -+ int aux_msg); ++ /* Attribute handling */ ++ kbasep_js_ctx_attr_runpool_retain_ctx(kbdev, kctx); + -+/** -+ * kbase_tlstream_stats - read timeline stream statistics -+ * @bytes_collected: will hold number of bytes read by the user -+ * @bytes_generated: will hold number of bytes generated by trace points -+ */ -+void kbase_tlstream_stats(u32 *bytes_collected, u32 *bytes_generated); -+#endif /* MALI_UNIT_TEST */ ++ /* Allow it to run jobs */ ++ kbasep_js_set_submit_allowed(js_devdata, kctx); + -+/*****************************************************************************/ ++ kbase_js_runpool_inc_context_count(kbdev, kctx); ++} + -+#define TL_ATOM_STATE_IDLE 0 -+#define TL_ATOM_STATE_READY 1 -+#define TL_ATOM_STATE_DONE 2 -+#define TL_ATOM_STATE_POSTED 3 ++bool kbase_backend_use_ctx_sched(struct kbase_device *kbdev, ++ struct kbase_context *kctx) ++{ ++ int i; + -+void __kbase_tlstream_tl_summary_new_ctx(void *context, u32 nr, u32 tgid); -+void __kbase_tlstream_tl_summary_new_gpu(void *gpu, u32 id, u32 core_count); -+void __kbase_tlstream_tl_summary_new_lpu(void *lpu, u32 nr, u32 fn); -+void __kbase_tlstream_tl_summary_lifelink_lpu_gpu(void *lpu, void *gpu); -+void __kbase_tlstream_tl_summary_new_as(void *as, u32 nr); -+void __kbase_tlstream_tl_summary_lifelink_as_gpu(void *as, void *gpu); -+void __kbase_tlstream_tl_new_ctx(void *context, u32 nr, u32 tgid); -+void __kbase_tlstream_tl_new_atom(void *atom, u32 nr); -+void __kbase_tlstream_tl_del_ctx(void *context); -+void __kbase_tlstream_tl_del_atom(void *atom); -+void __kbase_tlstream_tl_ret_ctx_lpu(void *context, void *lpu); -+void __kbase_tlstream_tl_ret_atom_ctx(void *atom, void *context); -+void __kbase_tlstream_tl_ret_atom_lpu( -+ void *atom, void *lpu, const char *attrib_match_list); -+void __kbase_tlstream_tl_nret_ctx_lpu(void *context, void *lpu); -+void __kbase_tlstream_tl_nret_atom_ctx(void *atom, void *context); -+void __kbase_tlstream_tl_nret_atom_lpu(void *atom, void *lpu); -+void __kbase_tlstream_tl_ret_as_ctx(void *as, void *ctx); -+void __kbase_tlstream_tl_nret_as_ctx(void *as, void *ctx); -+void __kbase_tlstream_tl_ret_atom_as(void *atom, void *as); -+void __kbase_tlstream_tl_nret_atom_as(void *atom, void *as); -+void __kbase_tlstream_tl_dep_atom_atom(void *atom1, void *atom2); -+void __kbase_tlstream_tl_ndep_atom_atom(void *atom1, void *atom2); -+void __kbase_tlstream_tl_rdep_atom_atom(void *atom1, void *atom2); -+void __kbase_tlstream_tl_attrib_atom_config( -+ void *atom, u64 jd, u64 affinity, u32 config); -+void __kbase_tlstream_tl_attrib_atom_priority(void *atom, u32 prio); -+void __kbase_tlstream_tl_attrib_atom_state(void *atom, u32 state); -+void __kbase_tlstream_tl_attrib_atom_priority_change(void *atom); -+void __kbase_tlstream_tl_attrib_atom_jit( -+ void *atom, u64 edit_addr, u64 new_addr); -+void __kbase_tlstream_tl_attrib_as_config( -+ void *as, u64 transtab, u64 memattr, u64 transcfg); -+void __kbase_tlstream_tl_event_atom_softstop_ex(void *atom); -+void __kbase_tlstream_tl_event_lpu_softstop(void *lpu); -+void __kbase_tlstream_tl_event_atom_softstop_issue(void *atom); -+void __kbase_tlstream_jd_gpu_soft_reset(void *gpu); -+void __kbase_tlstream_aux_pm_state(u32 core_type, u64 state); -+void __kbase_tlstream_aux_pagefault(u32 ctx_nr, u64 page_count_change); -+void __kbase_tlstream_aux_pagesalloc(u32 ctx_nr, u64 page_count); -+void __kbase_tlstream_aux_devfreq_target(u64 target_freq); -+void __kbase_tlstream_aux_protected_enter_start(void *gpu); -+void __kbase_tlstream_aux_protected_enter_end(void *gpu); -+void __kbase_tlstream_aux_protected_leave_start(void *gpu); -+void __kbase_tlstream_aux_protected_leave_end(void *gpu); ++ if (kbdev->hwaccess.active_kctx == kctx) { ++ /* Context is already active */ ++ return true; ++ } + -+#define TLSTREAM_ENABLED (1 << 31) ++ for (i = 0; i < kbdev->nr_hw_address_spaces; i++) { ++ if (kbdev->as_to_kctx[i] == kctx) { ++ /* Context already has ASID - mark as active */ ++ return true; ++ } ++ } + -+extern atomic_t kbase_tlstream_enabled; ++ /* Context does not have address space assigned */ ++ return false; ++} + -+#define __TRACE_IF_ENABLED(trace_name, ...) \ -+ do { \ -+ int enabled = atomic_read(&kbase_tlstream_enabled); \ -+ if (enabled & TLSTREAM_ENABLED) \ -+ __kbase_tlstream_##trace_name(__VA_ARGS__); \ -+ } while (0) ++void kbase_backend_release_ctx_irq(struct kbase_device *kbdev, ++ struct kbase_context *kctx) ++{ ++ int as_nr = kctx->as_nr; + -+#define __TRACE_IF_ENABLED_LATENCY(trace_name, ...) \ -+ do { \ -+ int enabled = atomic_read(&kbase_tlstream_enabled); \ -+ if (enabled & BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS) \ -+ __kbase_tlstream_##trace_name(__VA_ARGS__); \ -+ } while (0) ++ if (as_nr == KBASEP_AS_NR_INVALID) { ++ WARN(1, "Attempting to release context without ASID\n"); ++ return; ++ } + -+#define __TRACE_IF_ENABLED_JD(trace_name, ...) \ -+ do { \ -+ int enabled = atomic_read(&kbase_tlstream_enabled); \ -+ if (enabled & BASE_TLSTREAM_JOB_DUMPING_ENABLED) \ -+ __kbase_tlstream_##trace_name(__VA_ARGS__); \ -+ } while (0) ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+/*****************************************************************************/ ++ if (atomic_read(&kctx->refcount) != 1) { ++ WARN(1, "Attempting to release active ASID\n"); ++ return; ++ } + -+/** -+ * KBASE_TLSTREAM_TL_SUMMARY_NEW_CTX - create context object in timeline -+ * summary -+ * @context: name of the context object -+ * @nr: context number -+ * @tgid: thread Group Id -+ * -+ * Function emits a timeline message informing about context creation. Context -+ * is created with context number (its attribute), that can be used to link -+ * kbase context with userspace context. -+ * This message is directed to timeline summary stream. -+ */ -+#define KBASE_TLSTREAM_TL_SUMMARY_NEW_CTX(context, nr, tgid) \ -+ __TRACE_IF_ENABLED(tl_summary_new_ctx, context, nr, tgid) ++ kbasep_js_clear_submit_allowed(&kbdev->js_data, kctx); + -+/** -+ * KBASE_TLSTREAM_TL_SUMMARY_NEW_GPU - create GPU object in timeline summary -+ * @gpu: name of the GPU object -+ * @id: id value of this GPU -+ * @core_count: number of cores this GPU hosts -+ * -+ * Function emits a timeline message informing about GPU creation. GPU is -+ * created with two attributes: id and core count. -+ * This message is directed to timeline summary stream. -+ */ -+#define KBASE_TLSTREAM_TL_SUMMARY_NEW_GPU(gpu, id, core_count) \ -+ __TRACE_IF_ENABLED(tl_summary_new_gpu, gpu, id, core_count) ++ kbase_ctx_sched_release_ctx(kctx); ++ kbase_js_runpool_dec_context_count(kbdev, kctx); ++} + -+/** -+ * KBASE_TLSTREAM_TL_SUMMARY_NEW_LPU - create LPU object in timeline summary -+ * @lpu: name of the Logical Processing Unit object -+ * @nr: sequential number assigned to this LPU -+ * @fn: property describing this LPU's functional abilities -+ * -+ * Function emits a timeline message informing about LPU creation. LPU is -+ * created with two attributes: number linking this LPU with GPU's job slot -+ * and function bearing information about this LPU abilities. -+ * This message is directed to timeline summary stream. -+ */ -+#define KBASE_TLSTREAM_TL_SUMMARY_NEW_LPU(lpu, nr, fn) \ -+ __TRACE_IF_ENABLED(tl_summary_new_lpu, lpu, nr, fn) ++void kbase_backend_release_ctx_noirq(struct kbase_device *kbdev, ++ struct kbase_context *kctx) ++{ ++} + -+/** -+ * KBASE_TLSTREAM_TL_SUMMARY_LIFELINK_LPU_GPU - lifelink LPU object to GPU -+ * @lpu: name of the Logical Processing Unit object -+ * @gpu: name of the GPU object -+ * -+ * Function emits a timeline message informing that LPU object shall be deleted -+ * along with GPU object. -+ * This message is directed to timeline summary stream. -+ */ -+#define KBASE_TLSTREAM_TL_SUMMARY_LIFELINK_LPU_GPU(lpu, gpu) \ -+ __TRACE_IF_ENABLED(tl_summary_lifelink_lpu_gpu, lpu, gpu) ++int kbase_backend_find_and_release_free_address_space( ++ struct kbase_device *kbdev, struct kbase_context *kctx) ++{ ++ struct kbasep_js_device_data *js_devdata; ++ struct kbasep_js_kctx_info *js_kctx_info; ++ unsigned long flags; ++ int i; + -+/** -+ * KBASE_TLSTREAM_TL_SUMMARY_NEW_AS - create address space object in timeline summary -+ * @as: name of the address space object -+ * @nr: sequential number assigned to this address space -+ * -+ * Function emits a timeline message informing about address space creation. -+ * Address space is created with one attribute: number identifying this -+ * address space. -+ * This message is directed to timeline summary stream. -+ */ -+#define KBASE_TLSTREAM_TL_SUMMARY_NEW_AS(as, nr) \ -+ __TRACE_IF_ENABLED(tl_summary_new_as, as, nr) ++ js_devdata = &kbdev->js_data; ++ js_kctx_info = &kctx->jctx.sched_info; + -+/** -+ * KBASE_TLSTREAM_TL_SUMMARY_LIFELINK_AS_GPU - lifelink address space object to GPU -+ * @as: name of the address space object -+ * @gpu: name of the GPU object -+ * -+ * Function emits a timeline message informing that address space object -+ * shall be deleted along with GPU object. -+ * This message is directed to timeline summary stream. -+ */ -+#define KBASE_TLSTREAM_TL_SUMMARY_LIFELINK_AS_GPU(as, gpu) \ -+ __TRACE_IF_ENABLED(tl_summary_lifelink_as_gpu, as, gpu) ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++ mutex_lock(&js_devdata->runpool_mutex); + -+/** -+ * KBASE_TLSTREAM_TL_NEW_CTX - create context object in timeline -+ * @context: name of the context object -+ * @nr: context number -+ * @tgid: thread Group Id -+ * -+ * Function emits a timeline message informing about context creation. Context -+ * is created with context number (its attribute), that can be used to link -+ * kbase context with userspace context. -+ */ -+#define KBASE_TLSTREAM_TL_NEW_CTX(context, nr, tgid) \ -+ __TRACE_IF_ENABLED(tl_new_ctx, context, nr, tgid) ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+/** -+ * KBASE_TLSTREAM_TL_NEW_ATOM - create atom object in timeline -+ * @atom: name of the atom object -+ * @nr: sequential number assigned to this atom -+ * -+ * Function emits a timeline message informing about atom creation. Atom is -+ * created with atom number (its attribute) that links it with actual work -+ * bucket id understood by hardware. -+ */ -+#define KBASE_TLSTREAM_TL_NEW_ATOM(atom, nr) \ -+ __TRACE_IF_ENABLED(tl_new_atom, atom, nr) ++ for (i = 0; i < kbdev->nr_hw_address_spaces; i++) { ++ struct kbasep_js_kctx_info *as_js_kctx_info; ++ struct kbase_context *as_kctx; + -+/** -+ * KBASE_TLSTREAM_TL_DEL_CTX - destroy context object in timeline -+ * @context: name of the context object -+ * -+ * Function emits a timeline message informing that context object ceased to -+ * exist. -+ */ -+#define KBASE_TLSTREAM_TL_DEL_CTX(context) \ -+ __TRACE_IF_ENABLED(tl_del_ctx, context) ++ as_kctx = kbdev->as_to_kctx[i]; ++ as_js_kctx_info = &as_kctx->jctx.sched_info; + -+/** -+ * KBASE_TLSTREAM_TL_DEL_ATOM - destroy atom object in timeline -+ * @atom: name of the atom object -+ * -+ * Function emits a timeline message informing that atom object ceased to -+ * exist. -+ */ -+#define KBASE_TLSTREAM_TL_DEL_ATOM(atom) \ -+ __TRACE_IF_ENABLED(tl_del_atom, atom) ++ /* Don't release privileged or active contexts, or contexts with ++ * jobs running. ++ * Note that a context will have at least 1 reference (which ++ * was previously taken by kbasep_js_schedule_ctx()) until ++ * descheduled. ++ */ ++ if (as_kctx && !kbase_ctx_flag(as_kctx, KCTX_PRIVILEGED) && ++ atomic_read(&as_kctx->refcount) == 1) { ++ if (!kbasep_js_runpool_retain_ctx_nolock(kbdev, ++ as_kctx)) { ++ WARN(1, "Failed to retain active context\n"); + -+/** -+ * KBASE_TLSTREAM_TL_RET_CTX_LPU - retain context by LPU -+ * @context: name of the context object -+ * @lpu: name of the Logical Processing Unit object -+ * -+ * Function emits a timeline message informing that context is being held -+ * by LPU and must not be deleted unless it is released. -+ */ -+#define KBASE_TLSTREAM_TL_RET_CTX_LPU(context, lpu) \ -+ __TRACE_IF_ENABLED(tl_ret_ctx_lpu, context, lpu) ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, ++ flags); ++ mutex_unlock(&js_devdata->runpool_mutex); ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); + -+/** -+ * KBASE_TLSTREAM_TL_RET_ATOM_CTX - retain atom by context -+ * @atom: name of the atom object -+ * @context: name of the context object -+ * -+ * Function emits a timeline message informing that atom object is being held -+ * by context and must not be deleted unless it is released. -+ */ -+#define KBASE_TLSTREAM_TL_RET_ATOM_CTX(atom, context) \ -+ __TRACE_IF_ENABLED(tl_ret_atom_ctx, atom, context) ++ return KBASEP_AS_NR_INVALID; ++ } + -+/** -+ * KBASE_TLSTREAM_TL_RET_ATOM_LPU - retain atom by LPU -+ * @atom: name of the atom object -+ * @lpu: name of the Logical Processing Unit object -+ * @attrib_match_list: list containing match operator attributes -+ * -+ * Function emits a timeline message informing that atom object is being held -+ * by LPU and must not be deleted unless it is released. -+ */ -+#define KBASE_TLSTREAM_TL_RET_ATOM_LPU(atom, lpu, attrib_match_list) \ -+ __TRACE_IF_ENABLED(tl_ret_atom_lpu, atom, lpu, attrib_match_list) ++ kbasep_js_clear_submit_allowed(js_devdata, as_kctx); + -+/** -+ * KBASE_TLSTREAM_TL_NRET_CTX_LPU - release context by LPU -+ * @context: name of the context object -+ * @lpu: name of the Logical Processing Unit object -+ * -+ * Function emits a timeline message informing that context is being released -+ * by LPU object. -+ */ -+#define KBASE_TLSTREAM_TL_NRET_CTX_LPU(context, lpu) \ -+ __TRACE_IF_ENABLED(tl_nret_ctx_lpu, context, lpu) ++ /* Drop and retake locks to take the jsctx_mutex on the ++ * context we're about to release without violating lock ++ * ordering ++ */ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&js_devdata->runpool_mutex); ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); + -+/** -+ * KBASE_TLSTREAM_TL_NRET_ATOM_CTX - release atom by context -+ * @atom: name of the atom object -+ * @context: name of the context object -+ * -+ * Function emits a timeline message informing that atom object is being -+ * released by context. -+ */ -+#define KBASE_TLSTREAM_TL_NRET_ATOM_CTX(atom, context) \ -+ __TRACE_IF_ENABLED(tl_nret_atom_ctx, atom, context) + -+/** -+ * KBASE_TLSTREAM_TL_NRET_ATOM_LPU - release atom by LPU -+ * @atom: name of the atom object -+ * @lpu: name of the Logical Processing Unit object -+ * -+ * Function emits a timeline message informing that atom object is being -+ * released by LPU. -+ */ -+#define KBASE_TLSTREAM_TL_NRET_ATOM_LPU(atom, lpu) \ -+ __TRACE_IF_ENABLED(tl_nret_atom_lpu, atom, lpu) ++ /* Release context from address space */ ++ mutex_lock(&as_js_kctx_info->ctx.jsctx_mutex); ++ mutex_lock(&js_devdata->runpool_mutex); + -+/** -+ * KBASE_TLSTREAM_TL_RET_AS_CTX - lifelink address space object to context -+ * @as: name of the address space object -+ * @ctx: name of the context object -+ * -+ * Function emits a timeline message informing that address space object -+ * is being held by the context object. -+ */ -+#define KBASE_TLSTREAM_TL_RET_AS_CTX(as, ctx) \ -+ __TRACE_IF_ENABLED(tl_ret_as_ctx, as, ctx) ++ kbasep_js_runpool_release_ctx_nolock(kbdev, as_kctx); + -+/** -+ * KBASE_TLSTREAM_TL_NRET_AS_CTX - release address space by context -+ * @as: name of the address space object -+ * @ctx: name of the context object -+ * -+ * Function emits a timeline message informing that address space object -+ * is being released by atom. -+ */ -+#define KBASE_TLSTREAM_TL_NRET_AS_CTX(as, ctx) \ -+ __TRACE_IF_ENABLED(tl_nret_as_ctx, as, ctx) ++ if (!kbase_ctx_flag(as_kctx, KCTX_SCHEDULED)) { ++ kbasep_js_runpool_requeue_or_kill_ctx(kbdev, ++ as_kctx, ++ true); + -+/** -+ * KBASE_TLSTREAM_TL_RET_ATOM_AS - retain atom by address space -+ * @atom: name of the atom object -+ * @as: name of the address space object -+ * -+ * Function emits a timeline message informing that atom object is being held -+ * by address space and must not be deleted unless it is released. -+ */ -+#define KBASE_TLSTREAM_TL_RET_ATOM_AS(atom, as) \ -+ __TRACE_IF_ENABLED(tl_ret_atom_as, atom, as) ++ mutex_unlock(&js_devdata->runpool_mutex); ++ mutex_unlock(&as_js_kctx_info->ctx.jsctx_mutex); + -+/** -+ * KBASE_TLSTREAM_TL_NRET_ATOM_AS - release atom by address space -+ * @atom: name of the atom object -+ * @as: name of the address space object -+ * -+ * Function emits a timeline message informing that atom object is being -+ * released by address space. -+ */ -+#define KBASE_TLSTREAM_TL_NRET_ATOM_AS(atom, as) \ -+ __TRACE_IF_ENABLED(tl_nret_atom_as, atom, as) ++ return i; ++ } + -+/** -+ * KBASE_TLSTREAM_TL_DEP_ATOM_ATOM - parent atom depends on child atom -+ * @atom1: name of the child atom object -+ * @atom2: name of the parent atom object that depends on child atom -+ * -+ * Function emits a timeline message informing that parent atom waits for -+ * child atom object to be completed before start its execution. -+ */ -+#define KBASE_TLSTREAM_TL_DEP_ATOM_ATOM(atom1, atom2) \ -+ __TRACE_IF_ENABLED(tl_dep_atom_atom, atom1, atom2) ++ /* Context was retained while locks were dropped, ++ * continue looking for free AS */ + -+/** -+ * KBASE_TLSTREAM_TL_NDEP_ATOM_ATOM - dependency between atoms resolved -+ * @atom1: name of the child atom object -+ * @atom2: name of the parent atom object that depended on child atom -+ * -+ * Function emits a timeline message informing that parent atom execution -+ * dependency on child atom has been resolved. -+ */ -+#define KBASE_TLSTREAM_TL_NDEP_ATOM_ATOM(atom1, atom2) \ -+ __TRACE_IF_ENABLED(tl_ndep_atom_atom, atom1, atom2) ++ mutex_unlock(&js_devdata->runpool_mutex); ++ mutex_unlock(&as_js_kctx_info->ctx.jsctx_mutex); + -+/** -+ * KBASE_TLSTREAM_TL_RDEP_ATOM_ATOM - information about already resolved dependency between atoms -+ * @atom1: name of the child atom object -+ * @atom2: name of the parent atom object that depended on child atom -+ * -+ * Function emits a timeline message informing that parent atom execution -+ * dependency on child atom has been resolved. -+ */ -+#define KBASE_TLSTREAM_TL_RDEP_ATOM_ATOM(atom1, atom2) \ -+ __TRACE_IF_ENABLED(tl_rdep_atom_atom, atom1, atom2) ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++ mutex_lock(&js_devdata->runpool_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ } ++ } + -+/** -+ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_CONFIG - atom job slot attributes -+ * @atom: name of the atom object -+ * @jd: job descriptor address -+ * @affinity: job affinity -+ * @config: job config -+ * -+ * Function emits a timeline message containing atom attributes. -+ */ -+#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_CONFIG(atom, jd, affinity, config) \ -+ __TRACE_IF_ENABLED(tl_attrib_atom_config, atom, jd, affinity, config) ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+/** -+ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY - atom priority -+ * @atom: name of the atom object -+ * @prio: atom priority -+ * -+ * Function emits a timeline message containing atom priority. -+ */ -+#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY(atom, prio) \ -+ __TRACE_IF_ENABLED_LATENCY(tl_attrib_atom_priority, atom, prio) ++ mutex_unlock(&js_devdata->runpool_mutex); ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); + -+/** -+ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE - atom state -+ * @atom: name of the atom object -+ * @state: atom state -+ * -+ * Function emits a timeline message containing atom state. -+ */ -+#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(atom, state) \ -+ __TRACE_IF_ENABLED_LATENCY(tl_attrib_atom_state, atom, state) ++ return KBASEP_AS_NR_INVALID; ++} + -+/** -+ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY_CHANGE - atom caused priority change -+ * @atom: name of the atom object -+ * -+ * Function emits a timeline message signalling priority change -+ */ -+#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY_CHANGE(atom) \ -+ __TRACE_IF_ENABLED_LATENCY(tl_attrib_atom_priority_change, atom) ++bool kbase_backend_use_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ int as_nr) ++{ ++ struct kbasep_js_device_data *js_devdata; ++ struct kbasep_js_kctx_info *js_kctx_info; ++ struct kbase_as *new_address_space = NULL; + -+/** -+ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_JIT - jit happened on atom -+ * @atom: atom identifier -+ * @edit_addr: address edited by jit -+ * @new_addr: address placed into the edited location -+ */ -+#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_JIT(atom, edit_addr, new_addr) \ -+ __TRACE_IF_ENABLED_JD(tl_attrib_atom_jit, atom, edit_addr, new_addr) ++ js_devdata = &kbdev->js_data; ++ js_kctx_info = &kctx->jctx.sched_info; + -+/** -+ * KBASE_TLSTREAM_TL_ATTRIB_AS_CONFIG - address space attributes -+ * @as: assigned address space -+ * @transtab: configuration of the TRANSTAB register -+ * @memattr: configuration of the MEMATTR register -+ * @transcfg: configuration of the TRANSCFG register (or zero if not present) -+ * -+ * Function emits a timeline message containing address space attributes. -+ */ -+#define KBASE_TLSTREAM_TL_ATTRIB_AS_CONFIG(as, transtab, memattr, transcfg) \ -+ __TRACE_IF_ENABLED(tl_attrib_as_config, as, transtab, memattr, transcfg) ++ if (kbdev->hwaccess.active_kctx == kctx) { ++ WARN(1, "Context is already scheduled in\n"); ++ return false; ++ } + -+/** -+ * KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_ex -+ * @atom: atom identifier -+ */ -+#define KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_EX(atom) \ -+ __TRACE_IF_ENABLED(tl_event_atom_softstop_ex, atom) ++ new_address_space = &kbdev->as[as_nr]; + -+/** -+ * KBASE_TLSTREAM_TL_EVENT_LPU_softstop -+ * @lpu: name of the LPU object -+ */ -+#define KBASE_TLSTREAM_TL_EVENT_LPU_SOFTSTOP(lpu) \ -+ __TRACE_IF_ENABLED(tl_event_lpu_softstop, lpu) ++ lockdep_assert_held(&js_devdata->runpool_mutex); ++ lockdep_assert_held(&kbdev->mmu_hw_mutex); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+/** -+ * KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_issue -+ * @atom: atom identifier -+ */ -+#define KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_ISSUE(atom) \ -+ __TRACE_IF_ENABLED(tl_event_atom_softstop_issue, atom) ++ assign_and_activate_kctx_addr_space(kbdev, kctx, new_address_space); + -+/** -+ * KBASE_TLSTREAM_JD_GPU_SOFT_RESET - The GPU is being soft reset -+ * @gpu: name of the GPU object ++ if (kbase_ctx_flag(kctx, KCTX_PRIVILEGED)) { ++ /* We need to retain it to keep the corresponding address space ++ */ ++ kbasep_js_runpool_retain_ctx_nolock(kbdev, kctx); ++ } ++ ++ return true; ++} ++ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h +new file mode 100755 +index 000000000..08a7400e6 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h +@@ -0,0 +1,123 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * This imperative tracepoint is specific to job dumping. -+ * Function emits a timeline message indicating GPU soft reset. + */ -+#define KBASE_TLSTREAM_JD_GPU_SOFT_RESET(gpu) \ -+ __TRACE_IF_ENABLED(jd_gpu_soft_reset, gpu) + + -+/** -+ * KBASE_TLSTREAM_AUX_PM_STATE - timeline message: power management state -+ * @core_type: core type (shader, tiler, l2 cache, l3 cache) -+ * @state: 64bits bitmask reporting power state of the cores (1-ON, 0-OFF) -+ */ -+#define KBASE_TLSTREAM_AUX_PM_STATE(core_type, state) \ -+ __TRACE_IF_ENABLED(aux_pm_state, core_type, state) + -+/** -+ * KBASE_TLSTREAM_AUX_PAGEFAULT - timeline message: MMU page fault event -+ * resulting in new pages being mapped -+ * @ctx_nr: kernel context number -+ * @page_count_change: number of pages to be added -+ */ -+#define KBASE_TLSTREAM_AUX_PAGEFAULT(ctx_nr, page_count_change) \ -+ __TRACE_IF_ENABLED(aux_pagefault, ctx_nr, page_count_change) + -+/** -+ * KBASE_TLSTREAM_AUX_PAGESALLOC - timeline message: total number of allocated -+ * pages is changed -+ * @ctx_nr: kernel context number -+ * @page_count: number of pages used by the context ++/* ++ * Register-based HW access backend specific definitions + */ -+#define KBASE_TLSTREAM_AUX_PAGESALLOC(ctx_nr, page_count) \ -+ __TRACE_IF_ENABLED(aux_pagesalloc, ctx_nr, page_count) ++ ++#ifndef _KBASE_HWACCESS_GPU_DEFS_H_ ++#define _KBASE_HWACCESS_GPU_DEFS_H_ ++ ++/* SLOT_RB_SIZE must be < 256 */ ++#define SLOT_RB_SIZE 2 ++#define SLOT_RB_MASK (SLOT_RB_SIZE - 1) + +/** -+ * KBASE_TLSTREAM_AUX_DEVFREQ_TARGET - timeline message: new target DVFS -+ * frequency -+ * @target_freq: new target frequency ++ * struct rb_entry - Ringbuffer entry ++ * @katom: Atom associated with this entry + */ -+#define KBASE_TLSTREAM_AUX_DEVFREQ_TARGET(target_freq) \ -+ __TRACE_IF_ENABLED(aux_devfreq_target, target_freq) ++struct rb_entry { ++ struct kbase_jd_atom *katom; ++}; + +/** -+ * KBASE_TLSTREAM_AUX_PROTECTED_ENTER_START - The GPU has started transitioning -+ * to protected mode -+ * @gpu: name of the GPU object -+ * -+ * Function emits a timeline message indicating the GPU is starting to -+ * transition to protected mode. ++ * struct slot_rb - Slot ringbuffer ++ * @entries: Ringbuffer entries ++ * @last_context: The last context to submit a job on this slot ++ * @read_idx: Current read index of buffer ++ * @write_idx: Current write index of buffer ++ * @job_chain_flag: Flag used to implement jobchain disambiguation + */ -+#define KBASE_TLSTREAM_AUX_PROTECTED_ENTER_START(gpu) \ -+ __TRACE_IF_ENABLED_LATENCY(aux_protected_enter_start, gpu) ++struct slot_rb { ++ struct rb_entry entries[SLOT_RB_SIZE]; ++ ++ struct kbase_context *last_context; ++ ++ u8 read_idx; ++ u8 write_idx; ++ ++ u8 job_chain_flag; ++}; + +/** -+ * KBASE_TLSTREAM_AUX_PROTECTED_ENTER_END - The GPU has finished transitioning -+ * to protected mode -+ * @gpu: name of the GPU object ++ * struct kbase_backend_data - GPU backend specific data for HW access layer ++ * @slot_rb: Slot ringbuffers ++ * @rmu_workaround_flag: When PRLAM-8987 is present, this flag determines ++ * whether slots 0/1 or slot 2 are currently being ++ * pulled from ++ * @scheduling_timer: The timer tick used for rescheduling jobs ++ * @timer_running: Is the timer running? The runpool_mutex must be ++ * held whilst modifying this. ++ * @suspend_timer: Is the timer suspended? Set when a suspend ++ * occurs and cleared on resume. The runpool_mutex ++ * must be held whilst modifying this. ++ * @reset_gpu: Set to a KBASE_RESET_xxx value (see comments) ++ * @reset_workq: Work queue for performing the reset ++ * @reset_work: Work item for performing the reset ++ * @reset_wait: Wait event signalled when the reset is complete ++ * @reset_timer: Timeout for soft-stops before the reset ++ * @timeouts_updated: Have timeout values just been updated? + * -+ * Function emits a timeline message indicating the GPU has finished -+ * transitioning to protected mode. ++ * The hwaccess_lock (a spinlock) must be held when accessing this structure + */ -+#define KBASE_TLSTREAM_AUX_PROTECTED_ENTER_END(gpu) \ -+ __TRACE_IF_ENABLED_LATENCY(aux_protected_enter_end, gpu) ++struct kbase_backend_data { ++ struct slot_rb slot_rb[BASE_JM_MAX_NR_SLOTS]; ++ ++ bool rmu_workaround_flag; ++ ++ struct hrtimer scheduling_timer; ++ ++ bool timer_running; ++ bool suspend_timer; ++ ++ atomic_t reset_gpu; ++ ++/* The GPU reset isn't pending */ ++#define KBASE_RESET_GPU_NOT_PENDING 0 ++/* kbase_prepare_to_reset_gpu has been called */ ++#define KBASE_RESET_GPU_PREPARED 1 ++/* kbase_reset_gpu has been called - the reset will now definitely happen ++ * within the timeout period */ ++#define KBASE_RESET_GPU_COMMITTED 2 ++/* The GPU reset process is currently occuring (timeout has expired or ++ * kbasep_try_reset_gpu_early was called) */ ++#define KBASE_RESET_GPU_HAPPENING 3 ++/* Reset the GPU silently, used when resetting the GPU as part of normal ++ * behavior (e.g. when exiting protected mode). */ ++#define KBASE_RESET_GPU_SILENT 4 ++ struct workqueue_struct *reset_workq; ++ struct work_struct reset_work; ++ wait_queue_head_t reset_wait; ++ struct hrtimer reset_timer; ++ ++ bool timeouts_updated; ++}; + +/** -+ * KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_START - The GPU has started transitioning -+ * to non-protected mode -+ * @gpu: name of the GPU object -+ * -+ * Function emits a timeline message indicating the GPU is starting to -+ * transition to non-protected mode. ++ * struct kbase_jd_atom_backend - GPU backend specific katom data + */ -+#define KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_START(gpu) \ -+ __TRACE_IF_ENABLED_LATENCY(aux_protected_leave_start, gpu) ++struct kbase_jd_atom_backend { ++}; + +/** -+ * KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_END - The GPU has finished transitioning -+ * to non-protected mode -+ * @gpu: name of the GPU object -+ * -+ * Function emits a timeline message indicating the GPU has finished -+ * transitioning to non-protected mode. ++ * struct kbase_context_backend - GPU backend specific context data + */ -+#define KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_END(gpu) \ -+ __TRACE_IF_ENABLED_LATENCY(aux_protected_leave_end, gpu) -+ -+#endif /* _KBASE_TLSTREAM_H */ ++struct kbase_context_backend { ++}; + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_defs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_defs.h ++#endif /* _KBASE_HWACCESS_GPU_DEFS_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c new file mode 100755 -index 000000000000..e2e0544208ce +index 000000000..a6fb097b9 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_defs.h -@@ -0,0 +1,264 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c +@@ -0,0 +1,1518 @@ +/* + * -+ * (C) COPYRIGHT 2011-2014 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -326680,1019 +362716,1516 @@ index 000000000000..e2e0544208ce + + + -+ -+ -+/* ***** IMPORTANT: THIS IS NOT A NORMAL HEADER FILE ***** -+ * ***** DO NOT INCLUDE DIRECTLY ***** -+ * ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ -+ +/* -+ * The purpose of this header file is just to contain a list of trace code idenitifers -+ * -+ * Each identifier is wrapped in a macro, so that its string form and enum form can be created -+ * -+ * Each macro is separated with a comma, to allow insertion into an array initializer or enum definition block. -+ * -+ * This allows automatic creation of an enum and a corresponding array of strings -+ * -+ * Before #including, the includer MUST #define KBASE_TRACE_CODE_MAKE_CODE. -+ * After #including, the includer MUST #under KBASE_TRACE_CODE_MAKE_CODE. -+ * -+ * e.g.: -+ * #define KBASE_TRACE_CODE( X ) KBASE_TRACE_CODE_ ## X -+ * typedef enum -+ * { -+ * #define KBASE_TRACE_CODE_MAKE_CODE( X ) KBASE_TRACE_CODE( X ) -+ * #include "mali_kbase_trace_defs.h" -+ * #undef KBASE_TRACE_CODE_MAKE_CODE -+ * } kbase_trace_code; -+ * -+ * IMPORTANT: THIS FILE MUST NOT BE USED FOR ANY OTHER PURPOSE OTHER THAN THE ABOVE -+ * -+ * -+ * The use of the macro here is: -+ * - KBASE_TRACE_CODE_MAKE_CODE( X ) -+ * -+ * Which produces: -+ * - For an enum, KBASE_TRACE_CODE_X -+ * - For a string, "X" -+ * -+ * -+ * For example: -+ * - KBASE_TRACE_CODE_MAKE_CODE( JM_JOB_COMPLETE ) expands to: -+ * - KBASE_TRACE_CODE_JM_JOB_COMPLETE for the enum -+ * - "JM_JOB_COMPLETE" for the string -+ * - To use it to trace an event, do: -+ * - KBASE_TRACE_ADD( kbdev, JM_JOB_COMPLETE, subcode, kctx, uatom, val ); ++ * Base kernel job manager APIs + */ + -+#if 0 /* Dummy section to avoid breaking formatting */ -+int dummy_array[] = { ++#include ++#include ++#include ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++#include +#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+/* -+ * Core events -+ */ -+ /* no info_val, no gpu_addr, no atom */ -+ KBASE_TRACE_CODE_MAKE_CODE(CORE_CTX_DESTROY), -+ /* no info_val, no gpu_addr, no atom */ -+ KBASE_TRACE_CODE_MAKE_CODE(CORE_CTX_HWINSTR_TERM), -+ /* info_val == GPU_IRQ_STATUS register */ -+ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_IRQ), -+ /* info_val == bits cleared */ -+ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_IRQ_CLEAR), -+ /* info_val == GPU_IRQ_STATUS register */ -+ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_IRQ_DONE), -+ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_SOFT_RESET), -+ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_HARD_RESET), -+ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_PRFCNT_CLEAR), -+ /* GPU addr==dump address */ -+ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_PRFCNT_SAMPLE), -+ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_CLEAN_INV_CACHES), -+/* -+ * Job Slot management events -+ */ -+ /* info_val==irq rawstat at start */ -+ KBASE_TRACE_CODE_MAKE_CODE(JM_IRQ), -+ /* info_val==jobs processed */ -+ KBASE_TRACE_CODE_MAKE_CODE(JM_IRQ_END), -+/* In the following: -+ * -+ * - ctx is set if a corresponding job found (NULL otherwise, e.g. some soft-stop cases) -+ * - uatom==kernel-side mapped uatom address (for correlation with user-side) -+ */ -+ /* info_val==exit code; gpu_addr==chain gpuaddr */ -+ KBASE_TRACE_CODE_MAKE_CODE(JM_JOB_DONE), -+ /* gpu_addr==JS_HEAD_NEXT written, info_val==lower 32 bits of affinity */ -+ KBASE_TRACE_CODE_MAKE_CODE(JM_SUBMIT), -+ /* gpu_addr is as follows: -+ * - If JS_STATUS active after soft-stop, val==gpu addr written to -+ * JS_HEAD on submit -+ * - otherwise gpu_addr==0 */ -+ KBASE_TRACE_CODE_MAKE_CODE(JM_SOFTSTOP), -+ KBASE_TRACE_CODE_MAKE_CODE(JM_SOFTSTOP_0), -+ KBASE_TRACE_CODE_MAKE_CODE(JM_SOFTSTOP_1), -+ /* gpu_addr==JS_HEAD read */ -+ KBASE_TRACE_CODE_MAKE_CODE(JM_HARDSTOP), -+ /* gpu_addr==JS_HEAD read */ -+ KBASE_TRACE_CODE_MAKE_CODE(JM_HARDSTOP_0), -+ /* gpu_addr==JS_HEAD read */ -+ KBASE_TRACE_CODE_MAKE_CODE(JM_HARDSTOP_1), -+ /* gpu_addr==JS_TAIL read */ -+ KBASE_TRACE_CODE_MAKE_CODE(JM_UPDATE_HEAD), -+/* gpu_addr is as follows: -+ * - If JS_STATUS active before soft-stop, val==JS_HEAD -+ * - otherwise gpu_addr==0 -+ */ -+ /* gpu_addr==JS_HEAD read */ -+ KBASE_TRACE_CODE_MAKE_CODE(JM_CHECK_HEAD), -+ KBASE_TRACE_CODE_MAKE_CODE(JM_FLUSH_WORKQS), -+ KBASE_TRACE_CODE_MAKE_CODE(JM_FLUSH_WORKQS_DONE), -+ /* info_val == is_scheduled */ -+ KBASE_TRACE_CODE_MAKE_CODE(JM_ZAP_NON_SCHEDULED), -+ /* info_val == is_scheduled */ -+ KBASE_TRACE_CODE_MAKE_CODE(JM_ZAP_SCHEDULED), -+ KBASE_TRACE_CODE_MAKE_CODE(JM_ZAP_DONE), -+ /* info_val == nr jobs submitted */ -+ KBASE_TRACE_CODE_MAKE_CODE(JM_SLOT_SOFT_OR_HARD_STOP), -+ /* gpu_addr==JS_HEAD_NEXT last written */ -+ KBASE_TRACE_CODE_MAKE_CODE(JM_SLOT_EVICT), -+ KBASE_TRACE_CODE_MAKE_CODE(JM_SUBMIT_AFTER_RESET), -+ KBASE_TRACE_CODE_MAKE_CODE(JM_BEGIN_RESET_WORKER), -+ KBASE_TRACE_CODE_MAKE_CODE(JM_END_RESET_WORKER), -+/* -+ * Job dispatch events -+ */ -+ /* gpu_addr==value to write into JS_HEAD */ -+ KBASE_TRACE_CODE_MAKE_CODE(JD_DONE), -+ /* gpu_addr==value to write into JS_HEAD */ -+ KBASE_TRACE_CODE_MAKE_CODE(JD_DONE_WORKER), -+ /* gpu_addr==value to write into JS_HEAD */ -+ KBASE_TRACE_CODE_MAKE_CODE(JD_DONE_WORKER_END), -+ /* gpu_addr==value to write into JS_HEAD */ -+ KBASE_TRACE_CODE_MAKE_CODE(JD_DONE_TRY_RUN_NEXT_JOB), -+ /* gpu_addr==0, info_val==0, uatom==0 */ -+ KBASE_TRACE_CODE_MAKE_CODE(JD_ZAP_CONTEXT), -+ /* gpu_addr==value to write into JS_HEAD */ -+ KBASE_TRACE_CODE_MAKE_CODE(JD_CANCEL), -+ /* gpu_addr==value to write into JS_HEAD */ -+ KBASE_TRACE_CODE_MAKE_CODE(JD_CANCEL_WORKER), -+/* -+ * Scheduler Core events -+ */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_RETAIN_CTX_NOLOCK), -+ /* gpu_addr==value to write into JS_HEAD */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_ADD_JOB), -+ /* gpu_addr==last value written/would be written to JS_HEAD */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_REMOVE_JOB), -+ KBASE_TRACE_CODE_MAKE_CODE(JS_RETAIN_CTX), -+ KBASE_TRACE_CODE_MAKE_CODE(JS_RELEASE_CTX), -+ KBASE_TRACE_CODE_MAKE_CODE(JS_TRY_SCHEDULE_HEAD_CTX), -+ /* gpu_addr==value to write into JS_HEAD */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_JOB_DONE_TRY_RUN_NEXT_JOB), -+ /* gpu_addr==value to write into JS_HEAD */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_JOB_DONE_RETRY_NEEDED), -+ /* kctx is the one being evicted, info_val == kctx to put in */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_FAST_START_EVICTS_CTX), -+ KBASE_TRACE_CODE_MAKE_CODE(JS_AFFINITY_SUBMIT_TO_BLOCKED), -+ /* info_val == lower 32 bits of affinity */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_AFFINITY_CURRENT), -+ /* info_val == lower 32 bits of affinity */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_CORE_REF_REQUEST_CORES_FAILED), -+ /* info_val == lower 32 bits of affinity */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_CORE_REF_REGISTER_INUSE_FAILED), -+ /* info_val == lower 32 bits of rechecked affinity */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_CORE_REF_REQUEST_ON_RECHECK_FAILED), -+ /* info_val == lower 32 bits of rechecked affinity */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_CORE_REF_REGISTER_ON_RECHECK_FAILED), -+ /* info_val == lower 32 bits of affinity */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_CORE_REF_AFFINITY_WOULD_VIOLATE), -+ /* info_val == the ctx attribute now on ctx */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_CTX_ATTR_NOW_ON_CTX), -+ /* info_val == the ctx attribute now on runpool */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_CTX_ATTR_NOW_ON_RUNPOOL), -+ /* info_val == the ctx attribute now off ctx */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_CTX_ATTR_NOW_OFF_CTX), -+ /* info_val == the ctx attribute now off runpool */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_CTX_ATTR_NOW_OFF_RUNPOOL), -+/* -+ * Scheduler Policy events -+ */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_INIT_CTX), -+ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_TERM_CTX), -+ /* info_val == whether it was evicted */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_TRY_EVICT_CTX), -+ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_FOREACH_CTX_JOBS), -+ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_ENQUEUE_CTX), -+ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_DEQUEUE_HEAD_CTX), -+ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_RUNPOOL_ADD_CTX), -+ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_RUNPOOL_REMOVE_CTX), -+ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_DEQUEUE_JOB), -+ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_DEQUEUE_JOB_IRQ), -+ /* gpu_addr==JS_HEAD to write if the job were run */ -+ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_ENQUEUE_JOB), -+ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_TIMER_START), -+ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_TIMER_END), -+/* -+ * Power Management Events -+ */ -+ KBASE_TRACE_CODE_MAKE_CODE(PM_JOB_SUBMIT_AFTER_POWERING_UP), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_JOB_SUBMIT_AFTER_POWERED_UP), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_PWRON), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_PWRON_TILER), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_PWRON_L2), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_PWROFF), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_PWROFF_TILER), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_PWROFF_L2), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_POWERED), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_POWERED_TILER), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_POWERED_L2), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_CHANGE_DESIRED), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_CHANGE_DESIRED_TILER), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_CHANGE_AVAILABLE), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_CHANGE_AVAILABLE_TILER), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_AVAILABLE), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_AVAILABLE_TILER), -+ /* PM_DESIRED_REACHED: gpu_addr == pm.gpu_in_desired_state */ -+ KBASE_TRACE_CODE_MAKE_CODE(PM_DESIRED_REACHED), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_DESIRED_REACHED_TILER), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_REGISTER_CHANGE_SHADER_INUSE), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_REGISTER_CHANGE_TILER_INUSE), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_REGISTER_CHANGE_SHADER_NEEDED), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_REGISTER_CHANGE_TILER_NEEDED), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_RELEASE_CHANGE_SHADER_INUSE), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_RELEASE_CHANGE_TILER_INUSE), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_UNREQUEST_CHANGE_SHADER_NEEDED), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_UNREQUEST_CHANGE_TILER_NEEDED), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_REQUEST_CHANGE_SHADER_NEEDED), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_REQUEST_CHANGE_TILER_NEEDED), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_WAKE_WAITERS), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_CONTEXT_ACTIVE), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_CONTEXT_IDLE), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_GPU_ON), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_GPU_OFF), -+ /* info_val == policy number, or -1 for "Already changing" */ -+ KBASE_TRACE_CODE_MAKE_CODE(PM_SET_POLICY), -+ KBASE_TRACE_CODE_MAKE_CODE(PM_CA_SET_POLICY), -+ /* info_val == policy number */ -+ KBASE_TRACE_CODE_MAKE_CODE(PM_CURRENT_POLICY_INIT), -+ /* info_val == policy number */ -+ KBASE_TRACE_CODE_MAKE_CODE(PM_CURRENT_POLICY_TERM), -+/* Unused code just to make it easier to not have a comma at the end. -+ * All other codes MUST come before this */ -+ KBASE_TRACE_CODE_MAKE_CODE(DUMMY) ++#define beenthere(kctx, f, a...) \ ++ dev_dbg(kctx->kbdev->dev, "%s:" f, __func__, ##a) + -+#if 0 /* Dummy section to avoid breaking formatting */ -+}; ++#if KBASE_GPU_RESET_EN ++static void kbasep_try_reset_gpu_early(struct kbase_device *kbdev); ++static void kbasep_reset_timeout_worker(struct work_struct *data); ++static enum hrtimer_restart kbasep_reset_timer_callback(struct hrtimer *timer); ++#endif /* KBASE_GPU_RESET_EN */ ++ ++static inline int kbasep_jm_is_js_free(struct kbase_device *kbdev, int js, ++ struct kbase_context *kctx) ++{ ++ return !kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_COMMAND_NEXT), kctx); ++} ++ ++void kbase_job_hw_submit(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom, ++ int js) ++{ ++ struct kbase_context *kctx; ++ u32 cfg; ++ u64 jc_head = katom->jc; ++ ++ KBASE_DEBUG_ASSERT(kbdev); ++ KBASE_DEBUG_ASSERT(katom); ++ ++ kctx = katom->kctx; ++ ++ /* Command register must be available */ ++ KBASE_DEBUG_ASSERT(kbasep_jm_is_js_free(kbdev, js, kctx)); ++ /* Affinity is not violating */ ++ kbase_js_debug_log_current_affinities(kbdev); ++ KBASE_DEBUG_ASSERT(!kbase_js_affinity_would_violate(kbdev, js, ++ katom->affinity)); ++ ++ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_LO), ++ jc_head & 0xFFFFFFFF, kctx); ++ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_HI), ++ jc_head >> 32, kctx); ++ ++ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_AFFINITY_NEXT_LO), ++ katom->affinity & 0xFFFFFFFF, kctx); ++ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_AFFINITY_NEXT_HI), ++ katom->affinity >> 32, kctx); ++ ++ /* start MMU, medium priority, cache clean/flush on end, clean/flush on ++ * start */ ++ cfg = kctx->as_nr; ++ ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_FLUSH_REDUCTION)) ++ cfg |= JS_CONFIG_ENABLE_FLUSH_REDUCTION; ++ ++#ifndef CONFIG_MALI_COH_GPU ++ if (0 != (katom->core_req & BASE_JD_REQ_SKIP_CACHE_START)) ++ cfg |= JS_CONFIG_START_FLUSH_NO_ACTION; ++ else ++ cfg |= JS_CONFIG_START_FLUSH_CLEAN_INVALIDATE; ++ ++ if (0 != (katom->core_req & BASE_JD_REQ_SKIP_CACHE_END)) ++ cfg |= JS_CONFIG_END_FLUSH_NO_ACTION; ++ else ++ cfg |= JS_CONFIG_END_FLUSH_CLEAN_INVALIDATE; ++#endif /* CONFIG_MALI_COH_GPU */ ++ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10649)) ++ cfg |= JS_CONFIG_START_MMU; ++ ++ cfg |= JS_CONFIG_THREAD_PRI(8); ++ ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_MODE) && ++ (katom->atom_flags & KBASE_KATOM_FLAG_PROTECTED)) ++ cfg |= JS_CONFIG_DISABLE_DESCRIPTOR_WR_BK; ++ ++ if (kbase_hw_has_feature(kbdev, ++ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION)) { ++ if (!kbdev->hwaccess.backend.slot_rb[js].job_chain_flag) { ++ cfg |= JS_CONFIG_JOB_CHAIN_FLAG; ++ katom->atom_flags |= KBASE_KATOM_FLAGS_JOBCHAIN; ++ kbdev->hwaccess.backend.slot_rb[js].job_chain_flag = ++ true; ++ } else { ++ katom->atom_flags &= ~KBASE_KATOM_FLAGS_JOBCHAIN; ++ kbdev->hwaccess.backend.slot_rb[js].job_chain_flag = ++ false; ++ } ++ } ++ ++ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_CONFIG_NEXT), cfg, kctx); ++ ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_FLUSH_REDUCTION)) ++ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_FLUSH_ID_NEXT), ++ katom->flush_id, kctx); ++ ++ /* Write an approximate start timestamp. ++ * It's approximate because there might be a job in the HEAD register. ++ */ ++ katom->start_timestamp = ktime_get(); ++ ++ /* GO ! */ ++ dev_dbg(kbdev->dev, "JS: Submitting atom %p from ctx %p to js[%d] with head=0x%llx, affinity=0x%llx", ++ katom, kctx, js, jc_head, katom->affinity); ++ ++ KBASE_TRACE_ADD_SLOT_INFO(kbdev, JM_SUBMIT, kctx, katom, jc_head, js, ++ (u32) katom->affinity); ++ ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++ kbase_trace_mali_job_slots_event( ++ GATOR_MAKE_EVENT(GATOR_JOB_SLOT_START, js), ++ kctx, kbase_jd_atom_id(kctx, katom)); +#endif ++ KBASE_TLSTREAM_TL_ATTRIB_ATOM_CONFIG(katom, jc_head, ++ katom->affinity, cfg); ++ KBASE_TLSTREAM_TL_RET_CTX_LPU( ++ kctx, ++ &kbdev->gpu_props.props.raw_props.js_features[ ++ katom->slot_nr]); ++ KBASE_TLSTREAM_TL_RET_ATOM_AS(katom, &kbdev->as[kctx->as_nr]); ++ KBASE_TLSTREAM_TL_RET_ATOM_LPU( ++ katom, ++ &kbdev->gpu_props.props.raw_props.js_features[js], ++ "ctx_nr,atom_nr"); ++#ifdef CONFIG_GPU_TRACEPOINTS ++ if (!kbase_backend_nr_atoms_submitted(kbdev, js)) { ++ /* If this is the only job on the slot, trace it as starting */ ++ char js_string[16]; + -+/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline.c -new file mode 100755 -index 000000000000..d9854749f45b ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline.c -@@ -0,0 +1,236 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ trace_gpu_sched_switch( ++ kbasep_make_job_slot_string(js, js_string, ++ sizeof(js_string)), ++ ktime_to_ns(katom->start_timestamp), ++ (u32)katom->kctx->id, 0, katom->work_id); ++ kbdev->hwaccess.backend.slot_rb[js].last_context = katom->kctx; ++ } ++#endif ++ kbase_timeline_job_slot_submit(kbdev, kctx, katom, js); ++ ++ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_COMMAND_NEXT), ++ JS_COMMAND_START, katom->kctx); ++} ++ ++/** ++ * kbasep_job_slot_update_head_start_timestamp - Update timestamp ++ * @kbdev: kbase device ++ * @js: job slot ++ * @end_timestamp: timestamp + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * Update the start_timestamp of the job currently in the HEAD, based on the ++ * fact that we got an IRQ for the previous set of completed jobs. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * The estimate also takes into account the time the job was submitted, to ++ * work out the best estimate (which might still result in an over-estimate to ++ * the calculated time spent) ++ */ ++static void kbasep_job_slot_update_head_start_timestamp( ++ struct kbase_device *kbdev, ++ int js, ++ ktime_t end_timestamp) ++{ ++ if (kbase_backend_nr_atoms_on_slot(kbdev, js) > 0) { ++ struct kbase_jd_atom *katom; ++ ktime_t timestamp_diff; ++ /* The atom in the HEAD */ ++ katom = kbase_gpu_inspect(kbdev, js, 0); ++ ++ KBASE_DEBUG_ASSERT(katom != NULL); ++ ++ timestamp_diff = ktime_sub(end_timestamp, ++ katom->start_timestamp); ++ if (ktime_to_ns(timestamp_diff) >= 0) { ++ /* Only update the timestamp if it's a better estimate ++ * than what's currently stored. This is because our ++ * estimate that accounts for the throttle time may be ++ * too much of an overestimate */ ++ katom->start_timestamp = end_timestamp; ++ } ++ } ++} ++ ++/** ++ * kbasep_trace_tl_event_lpu_softstop - Call event_lpu_softstop timeline ++ * tracepoint ++ * @kbdev: kbase device ++ * @js: job slot + * ++ * Make a tracepoint call to the instrumentation module informing that ++ * softstop happened on given lpu (job slot). + */ ++static void kbasep_trace_tl_event_lpu_softstop(struct kbase_device *kbdev, ++ int js) ++{ ++ KBASE_TLSTREAM_TL_EVENT_LPU_SOFTSTOP( ++ &kbdev->gpu_props.props.raw_props.js_features[js]); ++} + ++void kbase_job_done(struct kbase_device *kbdev, u32 done) ++{ ++ unsigned long flags; ++ int i; ++ u32 count = 0; ++ ktime_t end_timestamp = ktime_get(); ++ struct kbasep_js_device_data *js_devdata; + ++ KBASE_DEBUG_ASSERT(kbdev); ++ js_devdata = &kbdev->js_data; + ++ KBASE_TRACE_ADD(kbdev, JM_IRQ, NULL, NULL, 0, done); + ++ memset(&kbdev->slot_submit_count_irq[0], 0, ++ sizeof(kbdev->slot_submit_count_irq)); + -+#include -+#include -+#include ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+#define CREATE_TRACE_POINTS ++ while (done) { ++ u32 failed = done >> 16; + -+#ifdef CONFIG_MALI_BIFROST_TRACE_TIMELINE -+#include "mali_timeline.h" ++ /* treat failed slots as finished slots */ ++ u32 finished = (done & 0xFFFF) | failed; + -+#include -+#include ++ /* Note: This is inherently unfair, as we always check ++ * for lower numbered interrupts before the higher ++ * numbered ones.*/ ++ i = ffs(finished) - 1; ++ KBASE_DEBUG_ASSERT(i >= 0); + -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_atoms_in_flight); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_atom); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_gpu_slot_active); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_gpu_slot_action); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_gpu_power_active); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_l2_power_active); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_pm_event); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_slot_atom); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_pm_checktrans); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_context_active); ++ do { ++ int nr_done; ++ u32 active; ++ u32 completion_code = BASE_JD_EVENT_DONE;/* assume OK */ ++ u64 job_tail = 0; + -+struct kbase_trace_timeline_desc { -+ char *enum_str; -+ char *desc; -+ char *format; -+ char *format_desc; -+}; ++ if (failed & (1u << i)) { ++ /* read out the job slot status code if the job ++ * slot reported failure */ ++ completion_code = kbase_reg_read(kbdev, ++ JOB_SLOT_REG(i, JS_STATUS), NULL); + -+static struct kbase_trace_timeline_desc kbase_trace_timeline_desc_table[] = { -+ #define KBASE_TIMELINE_TRACE_CODE(enum_val, desc, format, format_desc) { #enum_val, desc, format, format_desc } -+ #include "mali_kbase_trace_timeline_defs.h" -+ #undef KBASE_TIMELINE_TRACE_CODE -+}; ++ switch (completion_code) { ++ case BASE_JD_EVENT_STOPPED: ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++ kbase_trace_mali_job_slots_event( ++ GATOR_MAKE_EVENT( ++ GATOR_JOB_SLOT_SOFT_STOPPED, i), ++ NULL, 0); ++#endif + -+#define KBASE_NR_TRACE_CODES ARRAY_SIZE(kbase_trace_timeline_desc_table) ++ kbasep_trace_tl_event_lpu_softstop( ++ kbdev, i); + -+static void *kbasep_trace_timeline_seq_start(struct seq_file *s, loff_t *pos) -+{ -+ if (*pos >= KBASE_NR_TRACE_CODES) -+ return NULL; ++ /* Soft-stopped job - read the value of ++ * JS_TAIL so that the job chain can ++ * be resumed */ ++ job_tail = (u64)kbase_reg_read(kbdev, ++ JOB_SLOT_REG(i, JS_TAIL_LO), ++ NULL) | ++ ((u64)kbase_reg_read(kbdev, ++ JOB_SLOT_REG(i, JS_TAIL_HI), ++ NULL) << 32); ++ break; ++ case BASE_JD_EVENT_NOT_STARTED: ++ /* PRLAM-10673 can cause a TERMINATED ++ * job to come back as NOT_STARTED, but ++ * the error interrupt helps us detect ++ * it */ ++ completion_code = ++ BASE_JD_EVENT_TERMINATED; ++ /* fall through */ ++ default: ++ dev_warn(kbdev->dev, "error detected from slot %d, job status 0x%08x (%s)", ++ i, completion_code, ++ kbase_exception_name ++ (kbdev, ++ completion_code)); ++ } + -+ return &kbase_trace_timeline_desc_table[*pos]; ++ kbase_gpu_irq_evict(kbdev, i); ++ } ++ ++ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_CLEAR), ++ done & ((1 << i) | (1 << (i + 16))), ++ NULL); ++ active = kbase_reg_read(kbdev, ++ JOB_CONTROL_REG(JOB_IRQ_JS_STATE), ++ NULL); ++ ++ if (((active >> i) & 1) == 0 && ++ (((done >> (i + 16)) & 1) == 0)) { ++ /* There is a potential race we must work ++ * around: ++ * ++ * 1. A job slot has a job in both current and ++ * next registers ++ * 2. The job in current completes ++ * successfully, the IRQ handler reads ++ * RAWSTAT and calls this function with the ++ * relevant bit set in "done" ++ * 3. The job in the next registers becomes the ++ * current job on the GPU ++ * 4. Sometime before the JOB_IRQ_CLEAR line ++ * above the job on the GPU _fails_ ++ * 5. The IRQ_CLEAR clears the done bit but not ++ * the failed bit. This atomically sets ++ * JOB_IRQ_JS_STATE. However since both jobs ++ * have now completed the relevant bits for ++ * the slot are set to 0. ++ * ++ * If we now did nothing then we'd incorrectly ++ * assume that _both_ jobs had completed ++ * successfully (since we haven't yet observed ++ * the fail bit being set in RAWSTAT). ++ * ++ * So at this point if there are no active jobs ++ * left we check to see if RAWSTAT has a failure ++ * bit set for the job slot. If it does we know ++ * that there has been a new failure that we ++ * didn't previously know about, so we make sure ++ * that we record this in active (but we wait ++ * for the next loop to deal with it). ++ * ++ * If we were handling a job failure (i.e. done ++ * has the relevant high bit set) then we know ++ * that the value read back from ++ * JOB_IRQ_JS_STATE is the correct number of ++ * remaining jobs because the failed job will ++ * have prevented any futher jobs from starting ++ * execution. ++ */ ++ u32 rawstat = kbase_reg_read(kbdev, ++ JOB_CONTROL_REG(JOB_IRQ_RAWSTAT), NULL); ++ ++ if ((rawstat >> (i + 16)) & 1) { ++ /* There is a failed job that we've ++ * missed - add it back to active */ ++ active |= (1u << i); ++ } ++ } ++ ++ dev_dbg(kbdev->dev, "Job ended with status 0x%08X\n", ++ completion_code); ++ ++ nr_done = kbase_backend_nr_atoms_submitted(kbdev, i); ++ nr_done -= (active >> i) & 1; ++ nr_done -= (active >> (i + 16)) & 1; ++ ++ if (nr_done <= 0) { ++ dev_warn(kbdev->dev, "Spurious interrupt on slot %d", ++ i); ++ ++ goto spurious; ++ } ++ ++ count += nr_done; ++ ++ while (nr_done) { ++ if (nr_done == 1) { ++ kbase_gpu_complete_hw(kbdev, i, ++ completion_code, ++ job_tail, ++ &end_timestamp); ++ kbase_jm_try_kick_all(kbdev); ++ } else { ++ /* More than one job has completed. ++ * Since this is not the last job being ++ * reported this time it must have ++ * passed. This is because the hardware ++ * will not allow further jobs in a job ++ * slot to complete until the failed job ++ * is cleared from the IRQ status. ++ */ ++ kbase_gpu_complete_hw(kbdev, i, ++ BASE_JD_EVENT_DONE, ++ 0, ++ &end_timestamp); ++ } ++ nr_done--; ++ } ++ spurious: ++ done = kbase_reg_read(kbdev, ++ JOB_CONTROL_REG(JOB_IRQ_RAWSTAT), NULL); ++ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10883)) { ++ /* Workaround for missing interrupt caused by ++ * PRLAM-10883 */ ++ if (((active >> i) & 1) && (0 == ++ kbase_reg_read(kbdev, ++ JOB_SLOT_REG(i, ++ JS_STATUS), NULL))) { ++ /* Force job slot to be processed again ++ */ ++ done |= (1u << i); ++ } ++ } ++ ++ failed = done >> 16; ++ finished = (done & 0xFFFF) | failed; ++ if (done) ++ end_timestamp = ktime_get(); ++ } while (finished & (1 << i)); ++ ++ kbasep_job_slot_update_head_start_timestamp(kbdev, i, ++ end_timestamp); ++ } ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++#if KBASE_GPU_RESET_EN ++ if (atomic_read(&kbdev->hwaccess.backend.reset_gpu) == ++ KBASE_RESET_GPU_COMMITTED) { ++ /* If we're trying to reset the GPU then we might be able to do ++ * it early (without waiting for a timeout) because some jobs ++ * have completed ++ */ ++ kbasep_try_reset_gpu_early(kbdev); ++ } ++#endif /* KBASE_GPU_RESET_EN */ ++ KBASE_TRACE_ADD(kbdev, JM_IRQ_END, NULL, NULL, 0, count); +} ++KBASE_EXPORT_TEST_API(kbase_job_done); + -+static void kbasep_trace_timeline_seq_stop(struct seq_file *s, void *data) ++static bool kbasep_soft_stop_allowed(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom) +{ ++ bool soft_stops_allowed = true; ++ ++ if (kbase_jd_katom_is_protected(katom)) { ++ soft_stops_allowed = false; ++ } else if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8408)) { ++ if ((katom->core_req & BASE_JD_REQ_T) != 0) ++ soft_stops_allowed = false; ++ } ++ return soft_stops_allowed; +} + -+static void *kbasep_trace_timeline_seq_next(struct seq_file *s, void *data, loff_t *pos) ++static bool kbasep_hard_stop_allowed(struct kbase_device *kbdev, ++ base_jd_core_req core_reqs) +{ -+ (*pos)++; -+ -+ if (*pos == KBASE_NR_TRACE_CODES) -+ return NULL; ++ bool hard_stops_allowed = true; + -+ return &kbase_trace_timeline_desc_table[*pos]; ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8394)) { ++ if ((core_reqs & BASE_JD_REQ_T) != 0) ++ hard_stops_allowed = false; ++ } ++ return hard_stops_allowed; +} + -+static int kbasep_trace_timeline_seq_show(struct seq_file *s, void *data) ++void kbasep_job_slot_soft_or_hard_stop_do_action(struct kbase_device *kbdev, ++ int js, ++ u32 action, ++ base_jd_core_req core_reqs, ++ struct kbase_jd_atom *target_katom) +{ -+ struct kbase_trace_timeline_desc *trace_desc = data; ++ struct kbase_context *kctx = target_katom->kctx; ++#if KBASE_TRACE_ENABLE ++ u32 status_reg_before; ++ u64 job_in_head_before; ++ u32 status_reg_after; + -+ seq_printf(s, "%s#%s#%s#%s\n", trace_desc->enum_str, trace_desc->desc, trace_desc->format, trace_desc->format_desc); -+ return 0; -+} ++ KBASE_DEBUG_ASSERT(!(action & (~JS_COMMAND_MASK))); + ++ /* Check the head pointer */ ++ job_in_head_before = ((u64) kbase_reg_read(kbdev, ++ JOB_SLOT_REG(js, JS_HEAD_LO), NULL)) ++ | (((u64) kbase_reg_read(kbdev, ++ JOB_SLOT_REG(js, JS_HEAD_HI), NULL)) ++ << 32); ++ status_reg_before = kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_STATUS), ++ NULL); ++#endif + -+static const struct seq_operations kbasep_trace_timeline_seq_ops = { -+ .start = kbasep_trace_timeline_seq_start, -+ .next = kbasep_trace_timeline_seq_next, -+ .stop = kbasep_trace_timeline_seq_stop, -+ .show = kbasep_trace_timeline_seq_show, -+}; ++ if (action == JS_COMMAND_SOFT_STOP) { ++ bool soft_stop_allowed = kbasep_soft_stop_allowed(kbdev, ++ target_katom); + -+static int kbasep_trace_timeline_debugfs_open(struct inode *inode, struct file *file) -+{ -+ return seq_open(file, &kbasep_trace_timeline_seq_ops); -+} ++ if (!soft_stop_allowed) { ++#ifdef CONFIG_MALI_DEBUG ++ dev_dbg(kbdev->dev, ++ "Attempt made to soft-stop a job that cannot be soft-stopped. core_reqs = 0x%X", ++ (unsigned int)core_reqs); ++#endif /* CONFIG_MALI_DEBUG */ ++ return; ++ } + -+static const struct file_operations kbasep_trace_timeline_debugfs_fops = { -+ .open = kbasep_trace_timeline_debugfs_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = seq_release, -+}; ++ /* We are about to issue a soft stop, so mark the atom as having ++ * been soft stopped */ ++ target_katom->atom_flags |= KBASE_KATOM_FLAG_BEEN_SOFT_STOPPPED; + -+#ifdef CONFIG_DEBUG_FS ++ /* Mark the point where we issue the soft-stop command */ ++ KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_ISSUE(target_katom); + -+void kbasep_trace_timeline_debugfs_init(struct kbase_device *kbdev) -+{ -+ debugfs_create_file("mali_timeline_defs", -+ S_IRUGO, kbdev->mali_debugfs_directory, NULL, -+ &kbasep_trace_timeline_debugfs_fops); -+} ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8316)) { ++ int i; + -+#endif /* CONFIG_DEBUG_FS */ ++ for (i = 0; ++ i < kbase_backend_nr_atoms_submitted(kbdev, js); ++ i++) { ++ struct kbase_jd_atom *katom; + -+void kbase_timeline_job_slot_submit(struct kbase_device *kbdev, struct kbase_context *kctx, -+ struct kbase_jd_atom *katom, int js) -+{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ katom = kbase_gpu_inspect(kbdev, js, i); + -+ if (kbdev->timeline.slot_atoms_submitted[js] > 0) { -+ KBASE_TIMELINE_JOB_START_NEXT(kctx, js, 1); ++ KBASE_DEBUG_ASSERT(katom); ++ ++ /* For HW_ISSUE_8316, only 'bad' jobs attacking ++ * the system can cause this issue: normally, ++ * all memory should be allocated in multiples ++ * of 4 pages, and growable memory should be ++ * changed size in multiples of 4 pages. ++ * ++ * Whilst such 'bad' jobs can be cleared by a ++ * GPU reset, the locking up of a uTLB entry ++ * caused by the bad job could also stall other ++ * ASs, meaning that other ASs' jobs don't ++ * complete in the 'grace' period before the ++ * reset. We don't want to lose other ASs' jobs ++ * when they would normally complete fine, so we ++ * must 'poke' the MMU regularly to help other ++ * ASs complete */ ++ kbase_as_poking_timer_retain_atom( ++ kbdev, katom->kctx, katom); ++ } ++ } ++ ++ if (kbase_hw_has_feature( ++ kbdev, ++ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION)) { ++ action = (target_katom->atom_flags & ++ KBASE_KATOM_FLAGS_JOBCHAIN) ? ++ JS_COMMAND_SOFT_STOP_1 : ++ JS_COMMAND_SOFT_STOP_0; ++ } ++ } else if (action == JS_COMMAND_HARD_STOP) { ++ bool hard_stop_allowed = kbasep_hard_stop_allowed(kbdev, ++ core_reqs); ++ ++ if (!hard_stop_allowed) { ++ /* Jobs can be hard-stopped for the following reasons: ++ * * CFS decides the job has been running too long (and ++ * soft-stop has not occurred). In this case the GPU ++ * will be reset by CFS if the job remains on the ++ * GPU. ++ * ++ * * The context is destroyed, kbase_jd_zap_context ++ * will attempt to hard-stop the job. However it also ++ * has a watchdog which will cause the GPU to be ++ * reset if the job remains on the GPU. ++ * ++ * * An (unhandled) MMU fault occurred. As long as ++ * BASE_HW_ISSUE_8245 is defined then the GPU will be ++ * reset. ++ * ++ * All three cases result in the GPU being reset if the ++ * hard-stop fails, so it is safe to just return and ++ * ignore the hard-stop request. ++ */ ++ dev_warn(kbdev->dev, ++ "Attempt made to hard-stop a job that cannot be hard-stopped. core_reqs = 0x%X", ++ (unsigned int)core_reqs); ++ return; ++ } ++ target_katom->atom_flags |= KBASE_KATOM_FLAG_BEEN_HARD_STOPPED; ++ ++ if (kbase_hw_has_feature( ++ kbdev, ++ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION)) { ++ action = (target_katom->atom_flags & ++ KBASE_KATOM_FLAGS_JOBCHAIN) ? ++ JS_COMMAND_HARD_STOP_1 : ++ JS_COMMAND_HARD_STOP_0; ++ } ++ } ++ ++ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_COMMAND), action, kctx); ++ ++#if KBASE_TRACE_ENABLE ++ status_reg_after = kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_STATUS), ++ NULL); ++ if (status_reg_after == BASE_JD_EVENT_ACTIVE) { ++ struct kbase_jd_atom *head; ++ struct kbase_context *head_kctx; ++ ++ head = kbase_gpu_inspect(kbdev, js, 0); ++ head_kctx = head->kctx; ++ ++ if (status_reg_before == BASE_JD_EVENT_ACTIVE) ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_CHECK_HEAD, head_kctx, ++ head, job_in_head_before, js); ++ else ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_CHECK_HEAD, NULL, NULL, ++ 0, js); ++ ++ switch (action) { ++ case JS_COMMAND_SOFT_STOP: ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP, head_kctx, ++ head, head->jc, js); ++ break; ++ case JS_COMMAND_SOFT_STOP_0: ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP_0, head_kctx, ++ head, head->jc, js); ++ break; ++ case JS_COMMAND_SOFT_STOP_1: ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP_1, head_kctx, ++ head, head->jc, js); ++ break; ++ case JS_COMMAND_HARD_STOP: ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP, head_kctx, ++ head, head->jc, js); ++ break; ++ case JS_COMMAND_HARD_STOP_0: ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP_0, head_kctx, ++ head, head->jc, js); ++ break; ++ case JS_COMMAND_HARD_STOP_1: ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP_1, head_kctx, ++ head, head->jc, js); ++ break; ++ default: ++ BUG(); ++ break; ++ } + } else { -+ base_atom_id atom_number = kbase_jd_atom_id(kctx, katom); ++ if (status_reg_before == BASE_JD_EVENT_ACTIVE) ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_CHECK_HEAD, NULL, NULL, ++ job_in_head_before, js); ++ else ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_CHECK_HEAD, NULL, NULL, ++ 0, js); + -+ KBASE_TIMELINE_JOB_START_HEAD(kctx, js, 1); -+ KBASE_TIMELINE_JOB_START(kctx, js, atom_number); ++ switch (action) { ++ case JS_COMMAND_SOFT_STOP: ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP, NULL, NULL, 0, ++ js); ++ break; ++ case JS_COMMAND_SOFT_STOP_0: ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP_0, NULL, NULL, ++ 0, js); ++ break; ++ case JS_COMMAND_SOFT_STOP_1: ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP_1, NULL, NULL, ++ 0, js); ++ break; ++ case JS_COMMAND_HARD_STOP: ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP, NULL, NULL, 0, ++ js); ++ break; ++ case JS_COMMAND_HARD_STOP_0: ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP_0, NULL, NULL, ++ 0, js); ++ break; ++ case JS_COMMAND_HARD_STOP_1: ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP_1, NULL, NULL, ++ 0, js); ++ break; ++ default: ++ BUG(); ++ break; ++ } + } -+ ++kbdev->timeline.slot_atoms_submitted[js]; ++#endif ++} + -+ KBASE_TIMELINE_ATOMS_SUBMITTED(kctx, js, kbdev->timeline.slot_atoms_submitted[js]); ++void kbase_backend_jm_kill_jobs_from_kctx(struct kbase_context *kctx) ++{ ++ unsigned long flags; ++ struct kbase_device *kbdev; ++ struct kbasep_js_device_data *js_devdata; ++ int i; ++ ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ kbdev = kctx->kbdev; ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ js_devdata = &kbdev->js_data; ++ ++ /* Cancel any remaining running jobs for this kctx */ ++ mutex_lock(&kctx->jctx.lock); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ++ /* Invalidate all jobs in context, to prevent re-submitting */ ++ for (i = 0; i < BASE_JD_ATOM_COUNT; i++) { ++ if (!work_pending(&kctx->jctx.atoms[i].work)) ++ kctx->jctx.atoms[i].event_code = ++ BASE_JD_EVENT_JOB_CANCELLED; ++ } ++ ++ for (i = 0; i < kbdev->gpu_props.num_job_slots; i++) ++ kbase_job_slot_hardstop(kctx, i, NULL); ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kctx->jctx.lock); +} + -+void kbase_timeline_job_slot_done(struct kbase_device *kbdev, struct kbase_context *kctx, -+ struct kbase_jd_atom *katom, int js, -+ kbasep_js_atom_done_code done_code) ++void kbase_job_slot_ctx_priority_check_locked(struct kbase_context *kctx, ++ struct kbase_jd_atom *target_katom) +{ ++ struct kbase_device *kbdev; ++ int js = target_katom->slot_nr; ++ int priority = target_katom->sched_priority; ++ int i; ++ bool stop_sent = false; ++ ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ kbdev = kctx->kbdev; ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ + lockdep_assert_held(&kbdev->hwaccess_lock); + -+ if (done_code & KBASE_JS_ATOM_DONE_EVICTED_FROM_NEXT) { -+ KBASE_TIMELINE_JOB_START_NEXT(kctx, js, 0); -+ } else { -+ /* Job finished in JS_HEAD */ -+ base_atom_id atom_number = kbase_jd_atom_id(kctx, katom); ++ for (i = 0; i < kbase_backend_nr_atoms_on_slot(kbdev, js); i++) { ++ struct kbase_jd_atom *katom; + -+ KBASE_TIMELINE_JOB_START_HEAD(kctx, js, 0); -+ KBASE_TIMELINE_JOB_STOP(kctx, js, atom_number); ++ katom = kbase_gpu_inspect(kbdev, js, i); ++ if (!katom) ++ continue; + -+ /* see if we need to trace the job in JS_NEXT moving to JS_HEAD */ -+ if (kbase_backend_nr_atoms_submitted(kbdev, js)) { -+ struct kbase_jd_atom *next_katom; -+ struct kbase_context *next_kctx; ++ if (katom->kctx != kctx) ++ continue; + -+ /* Peek the next atom - note that the atom in JS_HEAD will already -+ * have been dequeued */ -+ next_katom = kbase_backend_inspect_head(kbdev, js); -+ WARN_ON(!next_katom); -+ next_kctx = next_katom->kctx; -+ KBASE_TIMELINE_JOB_START_NEXT(next_kctx, js, 0); -+ KBASE_TIMELINE_JOB_START_HEAD(next_kctx, js, 1); -+ KBASE_TIMELINE_JOB_START(next_kctx, js, kbase_jd_atom_id(next_kctx, next_katom)); ++ if (katom->sched_priority > priority) { ++ if (!stop_sent) ++ KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY_CHANGE( ++ target_katom); ++ ++ kbase_job_slot_softstop(kbdev, js, katom); ++ stop_sent = true; + } + } ++} + -+ --kbdev->timeline.slot_atoms_submitted[js]; ++struct zap_reset_data { ++ /* The stages are: ++ * 1. The timer has never been called ++ * 2. The zap has timed out, all slots are soft-stopped - the GPU reset ++ * will happen. The GPU has been reset when ++ * kbdev->hwaccess.backend.reset_waitq is signalled ++ * ++ * (-1 - The timer has been cancelled) ++ */ ++ int stage; ++ struct kbase_device *kbdev; ++ struct hrtimer timer; ++ spinlock_t lock; /* protects updates to stage member */ ++}; + -+ KBASE_TIMELINE_ATOMS_SUBMITTED(kctx, js, kbdev->timeline.slot_atoms_submitted[js]); ++static enum hrtimer_restart zap_timeout_callback(struct hrtimer *timer) ++{ ++ struct zap_reset_data *reset_data = container_of(timer, ++ struct zap_reset_data, timer); ++ struct kbase_device *kbdev = reset_data->kbdev; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&reset_data->lock, flags); ++ ++ if (reset_data->stage == -1) ++ goto out; ++ ++#if KBASE_GPU_RESET_EN ++ if (kbase_prepare_to_reset_gpu(kbdev)) { ++ dev_err(kbdev->dev, "Issueing GPU soft-reset because jobs failed to be killed (within %d ms) as part of context termination (e.g. process exit)\n", ++ ZAP_TIMEOUT); ++ kbase_reset_gpu(kbdev); ++ } ++#endif /* KBASE_GPU_RESET_EN */ ++ reset_data->stage = 2; ++ ++ out: ++ spin_unlock_irqrestore(&reset_data->lock, flags); ++ ++ return HRTIMER_NORESTART; +} + -+void kbase_timeline_pm_send_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event_sent) ++void kbase_jm_wait_for_zero_jobs(struct kbase_context *kctx) +{ -+ int uid = 0; -+ int old_uid; ++ struct kbase_device *kbdev = kctx->kbdev; ++ struct zap_reset_data reset_data; ++ unsigned long flags; + -+ /* If a producer already exists for the event, try to use their UID (multiple-producers) */ -+ uid = atomic_read(&kbdev->timeline.pm_event_uid[event_sent]); -+ old_uid = uid; ++ hrtimer_init_on_stack(&reset_data.timer, CLOCK_MONOTONIC, ++ HRTIMER_MODE_REL); ++ reset_data.timer.function = zap_timeout_callback; + -+ /* Get a new non-zero UID if we don't have one yet */ -+ while (!uid) -+ uid = atomic_inc_return(&kbdev->timeline.pm_event_uid_counter); ++ spin_lock_init(&reset_data.lock); + -+ /* Try to use this UID */ -+ if (old_uid != atomic_cmpxchg(&kbdev->timeline.pm_event_uid[event_sent], old_uid, uid)) -+ /* If it changed, raced with another producer: we've lost this UID */ -+ uid = 0; ++ reset_data.kbdev = kbdev; ++ reset_data.stage = 1; + -+ KBASE_TIMELINE_PM_SEND_EVENT(kbdev, event_sent, uid); ++ hrtimer_start(&reset_data.timer, HR_TIMER_DELAY_MSEC(ZAP_TIMEOUT), ++ HRTIMER_MODE_REL); ++ ++ /* Wait for all jobs to finish, and for the context to be not-scheduled ++ * (due to kbase_job_zap_context(), we also guarentee it's not in the JS ++ * policy queue either */ ++ wait_event(kctx->jctx.zero_jobs_wait, kctx->jctx.job_nr == 0); ++ wait_event(kctx->jctx.sched_info.ctx.is_scheduled_wait, ++ !kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ ++ spin_lock_irqsave(&reset_data.lock, flags); ++ if (reset_data.stage == 1) { ++ /* The timer hasn't run yet - so cancel it */ ++ reset_data.stage = -1; ++ } ++ spin_unlock_irqrestore(&reset_data.lock, flags); ++ ++ hrtimer_cancel(&reset_data.timer); ++ ++ if (reset_data.stage == 2) { ++ /* The reset has already started. ++ * Wait for the reset to complete ++ */ ++ wait_event(kbdev->hwaccess.backend.reset_wait, ++ atomic_read(&kbdev->hwaccess.backend.reset_gpu) ++ == KBASE_RESET_GPU_NOT_PENDING); ++ } ++ destroy_hrtimer_on_stack(&reset_data.timer); ++ ++ dev_dbg(kbdev->dev, "Zap: Finished Context %p", kctx); ++ ++ /* Ensure that the signallers of the waitqs have finished */ ++ mutex_lock(&kctx->jctx.lock); ++ mutex_lock(&kctx->jctx.sched_info.ctx.jsctx_mutex); ++ mutex_unlock(&kctx->jctx.sched_info.ctx.jsctx_mutex); ++ mutex_unlock(&kctx->jctx.lock); +} + -+void kbase_timeline_pm_check_handle_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event) ++u32 kbase_backend_get_current_flush_id(struct kbase_device *kbdev) +{ -+ int uid = atomic_read(&kbdev->timeline.pm_event_uid[event]); -+ -+ if (uid != 0) { -+ if (uid != atomic_cmpxchg(&kbdev->timeline.pm_event_uid[event], uid, 0)) -+ /* If it changed, raced with another consumer: we've lost this UID */ -+ uid = 0; ++ u32 flush_id = 0; + -+ KBASE_TIMELINE_PM_HANDLE_EVENT(kbdev, event, uid); ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_FLUSH_REDUCTION)) { ++ mutex_lock(&kbdev->pm.lock); ++ if (kbdev->pm.backend.gpu_powered) ++ flush_id = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(LATEST_FLUSH), NULL); ++ mutex_unlock(&kbdev->pm.lock); + } ++ ++ return flush_id; +} + -+void kbase_timeline_pm_handle_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event) ++int kbase_job_slot_init(struct kbase_device *kbdev) +{ -+ int uid = atomic_read(&kbdev->timeline.pm_event_uid[event]); ++#if KBASE_GPU_RESET_EN ++ kbdev->hwaccess.backend.reset_workq = alloc_workqueue( ++ "Mali reset workqueue", 0, 1); ++ if (NULL == kbdev->hwaccess.backend.reset_workq) ++ return -EINVAL; + -+ if (uid != atomic_cmpxchg(&kbdev->timeline.pm_event_uid[event], uid, 0)) -+ /* If it changed, raced with another consumer: we've lost this UID */ -+ uid = 0; ++ KBASE_DEBUG_ASSERT(0 == ++ object_is_on_stack(&kbdev->hwaccess.backend.reset_work)); ++ INIT_WORK(&kbdev->hwaccess.backend.reset_work, ++ kbasep_reset_timeout_worker); + -+ KBASE_TIMELINE_PM_HANDLE_EVENT(kbdev, event, uid); ++ hrtimer_init(&kbdev->hwaccess.backend.reset_timer, CLOCK_MONOTONIC, ++ HRTIMER_MODE_REL); ++ kbdev->hwaccess.backend.reset_timer.function = ++ kbasep_reset_timer_callback; ++#endif ++ ++ return 0; +} ++KBASE_EXPORT_TEST_API(kbase_job_slot_init); + -+void kbase_timeline_pm_l2_transition_start(struct kbase_device *kbdev) ++void kbase_job_slot_halt(struct kbase_device *kbdev) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ /* Simply log the start of the transition */ -+ kbdev->timeline.l2_transitioning = true; -+ KBASE_TIMELINE_POWERING_L2(kbdev); ++ CSTD_UNUSED(kbdev); +} + -+void kbase_timeline_pm_l2_transition_done(struct kbase_device *kbdev) ++void kbase_job_slot_term(struct kbase_device *kbdev) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ /* Simply log the end of the transition */ -+ if (kbdev->timeline.l2_transitioning) { -+ kbdev->timeline.l2_transitioning = false; -+ KBASE_TIMELINE_POWERED_L2(kbdev); -+ } ++#if KBASE_GPU_RESET_EN ++ destroy_workqueue(kbdev->hwaccess.backend.reset_workq); ++#endif +} ++KBASE_EXPORT_TEST_API(kbase_job_slot_term); + -+#endif /* CONFIG_MALI_BIFROST_TRACE_TIMELINE */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline.h -new file mode 100755 -index 000000000000..4b517f396f8c ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline.h -@@ -0,0 +1,363 @@ -+/* ++#if KBASE_GPU_RESET_EN ++/** ++ * kbasep_check_for_afbc_on_slot() - Check whether AFBC is in use on this slot ++ * @kbdev: kbase device pointer ++ * @kctx: context to check against ++ * @js: slot to check ++ * @target_katom: An atom to check, or NULL if all atoms from @kctx on ++ * slot @js should be checked + * -+ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ * This checks are based upon parameters that would normally be passed to ++ * kbase_job_slot_hardstop(). + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * In the event of @target_katom being NULL, this will check the last jobs that ++ * are likely to be running on the slot to see if a) they belong to kctx, and ++ * so would be stopped, and b) whether they have AFBC + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * In that case, It's guaranteed that a job currently executing on the HW with ++ * AFBC will be detected. However, this is a conservative check because it also ++ * detects jobs that have just completed too. + * ++ * Return: true when hard-stop _might_ stop an afbc atom, else false. + */ ++static bool kbasep_check_for_afbc_on_slot(struct kbase_device *kbdev, ++ struct kbase_context *kctx, int js, ++ struct kbase_jd_atom *target_katom) ++{ ++ bool ret = false; ++ int i; + ++ lockdep_assert_held(&kbdev->hwaccess_lock); + ++ /* When we have an atom the decision can be made straight away. */ ++ if (target_katom) ++ return !!(target_katom->core_req & BASE_JD_REQ_FS_AFBC); + ++ /* Otherwise, we must chweck the hardware to see if it has atoms from ++ * this context with AFBC. */ ++ for (i = 0; i < kbase_backend_nr_atoms_on_slot(kbdev, js); i++) { ++ struct kbase_jd_atom *katom; + ++ katom = kbase_gpu_inspect(kbdev, js, i); ++ if (!katom) ++ continue; + -+#if !defined(_KBASE_TRACE_TIMELINE_H) -+#define _KBASE_TRACE_TIMELINE_H -+ -+#ifdef CONFIG_MALI_BIFROST_TRACE_TIMELINE ++ /* Ignore atoms from other contexts, they won't be stopped when ++ * we use this for checking if we should hard-stop them */ ++ if (katom->kctx != kctx) ++ continue; + -+enum kbase_trace_timeline_code { -+ #define KBASE_TIMELINE_TRACE_CODE(enum_val, desc, format, format_desc) enum_val -+ #include "mali_kbase_trace_timeline_defs.h" -+ #undef KBASE_TIMELINE_TRACE_CODE -+}; ++ /* An atom on this slot and this context: check for AFBC */ ++ if (katom->core_req & BASE_JD_REQ_FS_AFBC) { ++ ret = true; ++ break; ++ } ++ } + -+#ifdef CONFIG_DEBUG_FS ++ return ret; ++} ++#endif /* KBASE_GPU_RESET_EN */ + -+/** Initialize Timeline DebugFS entries */ -+void kbasep_trace_timeline_debugfs_init(struct kbase_device *kbdev); ++/** ++ * kbase_job_slot_softstop_swflags - Soft-stop a job with flags ++ * @kbdev: The kbase device ++ * @js: The job slot to soft-stop ++ * @target_katom: The job that should be soft-stopped (or NULL for any job) ++ * @sw_flags: Flags to pass in about the soft-stop ++ * ++ * Context: ++ * The job slot lock must be held when calling this function. ++ * The job slot must not already be in the process of being soft-stopped. ++ * ++ * Soft-stop the specified job slot, with extra information about the stop ++ * ++ * Where possible any job in the next register is evicted before the soft-stop. ++ */ ++void kbase_job_slot_softstop_swflags(struct kbase_device *kbdev, int js, ++ struct kbase_jd_atom *target_katom, u32 sw_flags) ++{ ++ KBASE_DEBUG_ASSERT(!(sw_flags & JS_COMMAND_MASK)); ++ kbase_backend_soft_hard_stop_slot(kbdev, NULL, js, target_katom, ++ JS_COMMAND_SOFT_STOP | sw_flags); ++} + -+#else /* CONFIG_DEBUG_FS */ ++/** ++ * kbase_job_slot_softstop - Soft-stop the specified job slot ++ * @kbdev: The kbase device ++ * @js: The job slot to soft-stop ++ * @target_katom: The job that should be soft-stopped (or NULL for any job) ++ * Context: ++ * The job slot lock must be held when calling this function. ++ * The job slot must not already be in the process of being soft-stopped. ++ * ++ * Where possible any job in the next register is evicted before the soft-stop. ++ */ ++void kbase_job_slot_softstop(struct kbase_device *kbdev, int js, ++ struct kbase_jd_atom *target_katom) ++{ ++ kbase_job_slot_softstop_swflags(kbdev, js, target_katom, 0u); ++} + -+#define kbasep_trace_timeline_debugfs_init CSTD_NOP ++/** ++ * kbase_job_slot_hardstop - Hard-stop the specified job slot ++ * @kctx: The kbase context that contains the job(s) that should ++ * be hard-stopped ++ * @js: The job slot to hard-stop ++ * @target_katom: The job that should be hard-stopped (or NULL for all ++ * jobs from the context) ++ * Context: ++ * The job slot lock must be held when calling this function. ++ */ ++void kbase_job_slot_hardstop(struct kbase_context *kctx, int js, ++ struct kbase_jd_atom *target_katom) ++{ ++ struct kbase_device *kbdev = kctx->kbdev; ++ bool stopped; ++#if KBASE_GPU_RESET_EN ++ /* We make the check for AFBC before evicting/stopping atoms. Note ++ * that no other thread can modify the slots whilst we have the ++ * hwaccess_lock. */ ++ int needs_workaround_for_afbc = ++ kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_T76X_3542) ++ && kbasep_check_for_afbc_on_slot(kbdev, kctx, js, ++ target_katom); ++#endif + -+#endif /* CONFIG_DEBUG_FS */ ++ stopped = kbase_backend_soft_hard_stop_slot(kbdev, kctx, js, ++ target_katom, ++ JS_COMMAND_HARD_STOP); ++#if KBASE_GPU_RESET_EN ++ if (stopped && (kbase_hw_has_issue(kctx->kbdev, BASE_HW_ISSUE_8401) || ++ kbase_hw_has_issue(kctx->kbdev, BASE_HW_ISSUE_9510) || ++ needs_workaround_for_afbc)) { ++ /* MIDBASE-2916 if a fragment job with AFBC encoding is ++ * hardstopped, ensure to do a soft reset also in order to ++ * clear the GPU status. ++ * Workaround for HW issue 8401 has an issue,so after ++ * hard-stopping just reset the GPU. This will ensure that the ++ * jobs leave the GPU.*/ ++ if (kbase_prepare_to_reset_gpu_locked(kbdev)) { ++ dev_err(kbdev->dev, "Issueing GPU soft-reset after hard stopping due to hardware issue"); ++ kbase_reset_gpu_locked(kbdev); ++ } ++ } ++#endif ++} + -+/* mali_timeline.h defines kernel tracepoints used by the KBASE_TIMELINE -+ * functions. -+ * Output is timestamped by either sched_clock() (default), local_clock(), or -+ * cpu_clock(), depending on /sys/kernel/debug/tracing/trace_clock */ -+#include "mali_timeline.h" ++/** ++ * kbase_job_check_enter_disjoint - potentiall enter disjoint mode ++ * @kbdev: kbase device ++ * @action: the event which has occurred ++ * @core_reqs: core requirements of the atom ++ * @target_katom: the atom which is being affected ++ * ++ * For a certain soft/hard-stop action, work out whether to enter disjoint ++ * state. ++ * ++ * This does not register multiple disjoint events if the atom has already ++ * started a disjoint period ++ * ++ * @core_reqs can be supplied as 0 if the atom had not started on the hardware ++ * (and so a 'real' soft/hard-stop was not required, but it still interrupted ++ * flow, perhaps on another context) ++ * ++ * kbase_job_check_leave_disjoint() should be used to end the disjoint ++ * state when the soft/hard-stop action is complete ++ */ ++void kbase_job_check_enter_disjoint(struct kbase_device *kbdev, u32 action, ++ base_jd_core_req core_reqs, struct kbase_jd_atom *target_katom) ++{ ++ u32 hw_action = action & JS_COMMAND_MASK; + -+/* Trace number of atoms in flight for kctx (atoms either not completed, or in -+ process of being returned to user */ -+#define KBASE_TIMELINE_ATOMS_IN_FLIGHT(kctx, count) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_atoms_in_flight(ts.tv_sec, ts.tv_nsec, \ -+ (int)kctx->timeline.owner_tgid, \ -+ count); \ -+ } while (0) ++ /* For hard-stop, don't enter if hard-stop not allowed */ ++ if (hw_action == JS_COMMAND_HARD_STOP && ++ !kbasep_hard_stop_allowed(kbdev, core_reqs)) ++ return; + -+/* Trace atom_id being Ready to Run */ -+#define KBASE_TIMELINE_ATOM_READY(kctx, atom_id) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_atom(ts.tv_sec, ts.tv_nsec, \ -+ CTX_FLOW_ATOM_READY, \ -+ (int)kctx->timeline.owner_tgid, \ -+ atom_id); \ -+ } while (0) ++ /* For soft-stop, don't enter if soft-stop not allowed, or isn't ++ * causing disjoint */ ++ if (hw_action == JS_COMMAND_SOFT_STOP && ++ !(kbasep_soft_stop_allowed(kbdev, target_katom) && ++ (action & JS_COMMAND_SW_CAUSES_DISJOINT))) ++ return; + -+/* Trace number of atoms submitted to job slot js -+ * -+ * NOTE: This uses a different tracepoint to the head/next/soft-stop actions, -+ * so that those actions can be filtered out separately from this -+ * -+ * This is because this is more useful, as we can use it to calculate general -+ * utilization easily and accurately */ -+#define KBASE_TIMELINE_ATOMS_SUBMITTED(kctx, js, count) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_gpu_slot_active(ts.tv_sec, ts.tv_nsec, \ -+ SW_SET_GPU_SLOT_ACTIVE, \ -+ (int)kctx->timeline.owner_tgid, \ -+ js, count); \ -+ } while (0) ++ /* Nothing to do if already logged disjoint state on this atom */ ++ if (target_katom->atom_flags & KBASE_KATOM_FLAG_IN_DISJOINT) ++ return; + ++ target_katom->atom_flags |= KBASE_KATOM_FLAG_IN_DISJOINT; ++ kbase_disjoint_state_up(kbdev); ++} + -+/* Trace atoms present in JS_NEXT */ -+#define KBASE_TIMELINE_JOB_START_NEXT(kctx, js, count) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_gpu_slot_action(ts.tv_sec, ts.tv_nsec, \ -+ SW_SET_GPU_SLOT_NEXT, \ -+ (int)kctx->timeline.owner_tgid, \ -+ js, count); \ -+ } while (0) ++/** ++ * kbase_job_check_enter_disjoint - potentially leave disjoint state ++ * @kbdev: kbase device ++ * @target_katom: atom which is finishing ++ * ++ * Work out whether to leave disjoint state when finishing an atom that was ++ * originated by kbase_job_check_enter_disjoint(). ++ */ ++void kbase_job_check_leave_disjoint(struct kbase_device *kbdev, ++ struct kbase_jd_atom *target_katom) ++{ ++ if (target_katom->atom_flags & KBASE_KATOM_FLAG_IN_DISJOINT) { ++ target_katom->atom_flags &= ~KBASE_KATOM_FLAG_IN_DISJOINT; ++ kbase_disjoint_state_down(kbdev); ++ } ++} + -+/* Trace atoms present in JS_HEAD */ -+#define KBASE_TIMELINE_JOB_START_HEAD(kctx, js, count) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_gpu_slot_action(ts.tv_sec, ts.tv_nsec, \ -+ SW_SET_GPU_SLOT_HEAD, \ -+ (int)kctx->timeline.owner_tgid, \ -+ js, count); \ -+ } while (0) + -+/* Trace that a soft stop/evict from next is being attempted on a slot */ -+#define KBASE_TIMELINE_TRY_SOFT_STOP(kctx, js, count) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_gpu_slot_action(ts.tv_sec, ts.tv_nsec, \ -+ SW_SET_GPU_SLOT_STOPPING, \ -+ (kctx) ? (int)kctx->timeline.owner_tgid : 0, \ -+ js, count); \ -+ } while (0) ++#if KBASE_GPU_RESET_EN ++static void kbase_debug_dump_registers(struct kbase_device *kbdev) ++{ ++ int i; + ++ kbase_io_history_dump(kbdev); + ++ dev_err(kbdev->dev, "Register state:"); ++ dev_err(kbdev->dev, " GPU_IRQ_RAWSTAT=0x%08x GPU_STATUS=0x%08x", ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_RAWSTAT), NULL), ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_STATUS), NULL)); ++ dev_err(kbdev->dev, " JOB_IRQ_RAWSTAT=0x%08x JOB_IRQ_JS_STATE=0x%08x", ++ kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_RAWSTAT), NULL), ++ kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_JS_STATE), NULL)); ++ for (i = 0; i < 3; i++) { ++ dev_err(kbdev->dev, " JS%d_STATUS=0x%08x JS%d_HEAD_LO=0x%08x", ++ i, kbase_reg_read(kbdev, JOB_SLOT_REG(i, JS_STATUS), ++ NULL), ++ i, kbase_reg_read(kbdev, JOB_SLOT_REG(i, JS_HEAD_LO), ++ NULL)); ++ } ++ dev_err(kbdev->dev, " MMU_IRQ_RAWSTAT=0x%08x GPU_FAULTSTATUS=0x%08x", ++ kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_RAWSTAT), NULL), ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_FAULTSTATUS), NULL)); ++ dev_err(kbdev->dev, " GPU_IRQ_MASK=0x%08x JOB_IRQ_MASK=0x%08x MMU_IRQ_MASK=0x%08x", ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), NULL), ++ kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_MASK), NULL), ++ kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_MASK), NULL)); ++ dev_err(kbdev->dev, " PWR_OVERRIDE0=0x%08x PWR_OVERRIDE1=0x%08x", ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(PWR_OVERRIDE0), NULL), ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(PWR_OVERRIDE1), NULL)); ++ dev_err(kbdev->dev, " SHADER_CONFIG=0x%08x L2_MMU_CONFIG=0x%08x", ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(SHADER_CONFIG), NULL), ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(L2_MMU_CONFIG), NULL)); ++ dev_err(kbdev->dev, " TILER_CONFIG=0x%08x JM_CONFIG=0x%08x", ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(TILER_CONFIG), NULL), ++ kbase_reg_read(kbdev, GPU_CONTROL_REG(JM_CONFIG), NULL)); ++} + -+/* Trace state of overall GPU power */ -+#define KBASE_TIMELINE_GPU_POWER(kbdev, active) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_gpu_power_active(ts.tv_sec, ts.tv_nsec, \ -+ SW_SET_GPU_POWER_ACTIVE, active); \ -+ } while (0) ++static void kbasep_reset_timeout_worker(struct work_struct *data) ++{ ++ unsigned long flags; ++ struct kbase_device *kbdev; ++ ktime_t end_timestamp = ktime_get(); ++ struct kbasep_js_device_data *js_devdata; ++ bool try_schedule = false; ++ bool silent = false; ++ u32 max_loops = KBASE_CLEAN_CACHE_MAX_LOOPS; + -+/* Trace state of tiler power */ -+#define KBASE_TIMELINE_POWER_TILER(kbdev, bitmap) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_gpu_power_active(ts.tv_sec, ts.tv_nsec, \ -+ SW_SET_GPU_POWER_TILER_ACTIVE, \ -+ hweight64(bitmap)); \ -+ } while (0) ++ KBASE_DEBUG_ASSERT(data); + -+/* Trace number of shaders currently powered */ -+#define KBASE_TIMELINE_POWER_SHADER(kbdev, bitmap) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_gpu_power_active(ts.tv_sec, ts.tv_nsec, \ -+ SW_SET_GPU_POWER_SHADER_ACTIVE, \ -+ hweight64(bitmap)); \ -+ } while (0) ++ kbdev = container_of(data, struct kbase_device, ++ hwaccess.backend.reset_work); + -+/* Trace state of L2 power */ -+#define KBASE_TIMELINE_POWER_L2(kbdev, bitmap) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_gpu_power_active(ts.tv_sec, ts.tv_nsec, \ -+ SW_SET_GPU_POWER_L2_ACTIVE, \ -+ hweight64(bitmap)); \ -+ } while (0) ++ KBASE_DEBUG_ASSERT(kbdev); ++ js_devdata = &kbdev->js_data; + -+/* Trace state of L2 cache*/ -+#define KBASE_TIMELINE_POWERING_L2(kbdev) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_l2_power_active(ts.tv_sec, ts.tv_nsec, \ -+ SW_FLOW_GPU_POWER_L2_POWERING, \ -+ 1); \ -+ } while (0) ++ if (atomic_read(&kbdev->hwaccess.backend.reset_gpu) == ++ KBASE_RESET_GPU_SILENT) ++ silent = true; + -+#define KBASE_TIMELINE_POWERED_L2(kbdev) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_l2_power_active(ts.tv_sec, ts.tv_nsec, \ -+ SW_FLOW_GPU_POWER_L2_ACTIVE, \ -+ 1); \ -+ } while (0) ++ KBASE_TRACE_ADD(kbdev, JM_BEGIN_RESET_WORKER, NULL, NULL, 0u, 0); + -+/* Trace kbase_pm_send_event message send */ -+#define KBASE_TIMELINE_PM_SEND_EVENT(kbdev, event_type, pm_event_id) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_pm_event(ts.tv_sec, ts.tv_nsec, \ -+ SW_FLOW_PM_SEND_EVENT, \ -+ event_type, pm_event_id); \ -+ } while (0) ++ /* Suspend vinstr. ++ * This call will block until vinstr is suspended. */ ++ kbase_vinstr_suspend(kbdev->vinstr_ctx); + -+/* Trace kbase_pm_worker message receive */ -+#define KBASE_TIMELINE_PM_HANDLE_EVENT(kbdev, event_type, pm_event_id) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_pm_event(ts.tv_sec, ts.tv_nsec, \ -+ SW_FLOW_PM_HANDLE_EVENT, \ -+ event_type, pm_event_id); \ -+ } while (0) ++ /* Make sure the timer has completed - this cannot be done from ++ * interrupt context, so this cannot be done within ++ * kbasep_try_reset_gpu_early. */ ++ hrtimer_cancel(&kbdev->hwaccess.backend.reset_timer); + ++ if (kbase_pm_context_active_handle_suspend(kbdev, ++ KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE)) { ++ /* This would re-activate the GPU. Since it's already idle, ++ * there's no need to reset it */ ++ atomic_set(&kbdev->hwaccess.backend.reset_gpu, ++ KBASE_RESET_GPU_NOT_PENDING); ++ kbase_disjoint_state_down(kbdev); ++ wake_up(&kbdev->hwaccess.backend.reset_wait); ++ kbase_vinstr_resume(kbdev->vinstr_ctx); ++ return; ++ } + -+/* Trace atom_id starting in JS_HEAD */ -+#define KBASE_TIMELINE_JOB_START(kctx, js, _consumerof_atom_number) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_slot_atom(ts.tv_sec, ts.tv_nsec, \ -+ HW_START_GPU_JOB_CHAIN_SW_APPROX, \ -+ (int)kctx->timeline.owner_tgid, \ -+ js, _consumerof_atom_number); \ -+ } while (0) ++ KBASE_DEBUG_ASSERT(kbdev->irq_reset_flush == false); + -+/* Trace atom_id stopping on JS_HEAD */ -+#define KBASE_TIMELINE_JOB_STOP(kctx, js, _producerof_atom_number_completed) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_slot_atom(ts.tv_sec, ts.tv_nsec, \ -+ HW_STOP_GPU_JOB_CHAIN_SW_APPROX, \ -+ (int)kctx->timeline.owner_tgid, \ -+ js, _producerof_atom_number_completed); \ -+ } while (0) ++ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ spin_lock(&kbdev->hwaccess_lock); ++ spin_lock(&kbdev->mmu_mask_change); ++ /* We're about to flush out the IRQs and their bottom half's */ ++ kbdev->irq_reset_flush = true; + -+/** Trace beginning/end of a call to kbase_pm_check_transitions_nolock from a -+ * certin caller */ -+#define KBASE_TIMELINE_PM_CHECKTRANS(kbdev, trace_code) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_pm_checktrans(ts.tv_sec, ts.tv_nsec, \ -+ trace_code, 1); \ -+ } while (0) ++ /* Disable IRQ to avoid IRQ handlers to kick in after releasing the ++ * spinlock; this also clears any outstanding interrupts */ ++ kbase_pm_disable_interrupts_nolock(kbdev); + -+/* Trace number of contexts active */ -+#define KBASE_TIMELINE_CONTEXT_ACTIVE(kbdev, count) \ -+ do { \ -+ struct timespec ts; \ -+ getrawmonotonic(&ts); \ -+ trace_mali_timeline_context_active(ts.tv_sec, ts.tv_nsec, \ -+ count); \ -+ } while (0) ++ spin_unlock(&kbdev->mmu_mask_change); ++ spin_unlock(&kbdev->hwaccess_lock); ++ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); + -+/* NOTE: kbase_timeline_pm_cores_func() is in mali_kbase_pm_policy.c */ ++ /* Ensure that any IRQ handlers have finished ++ * Must be done without any locks IRQ handlers will take */ ++ kbase_synchronize_irqs(kbdev); + -+/** -+ * Trace that an atom is starting on a job slot -+ * -+ * The caller must be holding hwaccess_lock -+ */ -+void kbase_timeline_job_slot_submit(struct kbase_device *kbdev, struct kbase_context *kctx, -+ struct kbase_jd_atom *katom, int js); ++ /* Flush out any in-flight work items */ ++ kbase_flush_mmu_wqs(kbdev); + -+/** -+ * Trace that an atom has done on a job slot -+ * -+ * 'Done' in this sense can occur either because: -+ * - the atom in JS_HEAD finished -+ * - the atom in JS_NEXT was evicted -+ * -+ * Whether the atom finished or was evicted is passed in @a done_code -+ * -+ * It is assumed that the atom has already been removed from the submit slot, -+ * with either: -+ * - kbasep_jm_dequeue_submit_slot() -+ * - kbasep_jm_dequeue_tail_submit_slot() -+ * -+ * The caller must be holding hwaccess_lock -+ */ -+void kbase_timeline_job_slot_done(struct kbase_device *kbdev, struct kbase_context *kctx, -+ struct kbase_jd_atom *katom, int js, -+ kbasep_js_atom_done_code done_code); ++ /* The flush has completed so reset the active indicator */ ++ kbdev->irq_reset_flush = false; + ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TMIX_8463)) { ++ /* Ensure that L2 is not transitioning when we send the reset ++ * command */ ++ while (--max_loops && kbase_pm_get_trans_cores(kbdev, ++ KBASE_PM_CORE_L2)) ++ ; + -+/** Trace a pm event starting */ -+void kbase_timeline_pm_send_event(struct kbase_device *kbdev, -+ enum kbase_timeline_pm_event event_sent); ++ WARN(!max_loops, "L2 power transition timed out while trying to reset\n"); ++ } + -+/** Trace a pm event finishing */ -+void kbase_timeline_pm_check_handle_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event); ++ mutex_lock(&kbdev->pm.lock); ++ /* We hold the pm lock, so there ought to be a current policy */ ++ KBASE_DEBUG_ASSERT(kbdev->pm.backend.pm_current_policy); + -+/** Check whether a pm event was present, and if so trace finishing it */ -+void kbase_timeline_pm_handle_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event); ++ /* All slot have been soft-stopped and we've waited ++ * SOFT_STOP_RESET_TIMEOUT for the slots to clear, at this point we ++ * assume that anything that is still left on the GPU is stuck there and ++ * we'll kill it when we reset the GPU */ + -+/** Trace L2 power-up start */ -+void kbase_timeline_pm_l2_transition_start(struct kbase_device *kbdev); ++ if (!silent) ++ dev_err(kbdev->dev, "Resetting GPU (allowing up to %d ms)", ++ RESET_TIMEOUT); + -+/** Trace L2 power-up done */ -+void kbase_timeline_pm_l2_transition_done(struct kbase_device *kbdev); ++ /* Output the state of some interesting registers to help in the ++ * debugging of GPU resets */ ++ if (!silent) ++ kbase_debug_dump_registers(kbdev); + -+#else ++ /* Complete any jobs that were still on the GPU */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbdev->protected_mode = false; ++ kbase_backend_reset(kbdev, &end_timestamp); ++ kbase_pm_metrics_update(kbdev, NULL); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+#define KBASE_TIMELINE_ATOMS_IN_FLIGHT(kctx, count) CSTD_NOP() ++ /* Reset the GPU */ ++ kbase_pm_init_hw(kbdev, 0); + -+#define KBASE_TIMELINE_ATOM_READY(kctx, atom_id) CSTD_NOP() ++ mutex_unlock(&kbdev->pm.lock); + -+#define KBASE_TIMELINE_ATOMS_SUBMITTED(kctx, js, count) CSTD_NOP() ++ mutex_lock(&js_devdata->runpool_mutex); + -+#define KBASE_TIMELINE_JOB_START_NEXT(kctx, js, count) CSTD_NOP() ++ mutex_lock(&kbdev->mmu_hw_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_ctx_sched_restore_all_as(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); + -+#define KBASE_TIMELINE_JOB_START_HEAD(kctx, js, count) CSTD_NOP() ++ kbase_pm_enable_interrupts(kbdev); + -+#define KBASE_TIMELINE_TRY_SOFT_STOP(kctx, js, count) CSTD_NOP() ++ atomic_set(&kbdev->hwaccess.backend.reset_gpu, ++ KBASE_RESET_GPU_NOT_PENDING); + -+#define KBASE_TIMELINE_GPU_POWER(kbdev, active) CSTD_NOP() ++ kbase_disjoint_state_down(kbdev); + -+#define KBASE_TIMELINE_POWER_TILER(kbdev, bitmap) CSTD_NOP() ++ wake_up(&kbdev->hwaccess.backend.reset_wait); ++ if (!silent) ++ dev_err(kbdev->dev, "Reset complete"); + -+#define KBASE_TIMELINE_POWER_SHADER(kbdev, bitmap) CSTD_NOP() ++ if (js_devdata->nr_contexts_pullable > 0 && !kbdev->poweroff_pending) ++ try_schedule = true; + -+#define KBASE_TIMELINE_POWER_L2(kbdev, active) CSTD_NOP() ++ mutex_unlock(&js_devdata->runpool_mutex); + -+#define KBASE_TIMELINE_POWERING_L2(kbdev) CSTD_NOP() ++ mutex_lock(&kbdev->pm.lock); + -+#define KBASE_TIMELINE_POWERED_L2(kbdev) CSTD_NOP() ++ /* Find out what cores are required now */ ++ kbase_pm_update_cores_state(kbdev); + -+#define KBASE_TIMELINE_PM_SEND_EVENT(kbdev, event_type, pm_event_id) CSTD_NOP() ++ /* Synchronously request and wait for those cores, because if ++ * instrumentation is enabled it would need them immediately. */ ++ kbase_pm_check_transitions_sync(kbdev); + -+#define KBASE_TIMELINE_PM_HANDLE_EVENT(kbdev, event_type, pm_event_id) CSTD_NOP() ++ mutex_unlock(&kbdev->pm.lock); + -+#define KBASE_TIMELINE_JOB_START(kctx, js, _consumerof_atom_number) CSTD_NOP() ++ /* Try submitting some jobs to restart processing */ ++ if (try_schedule) { ++ KBASE_TRACE_ADD(kbdev, JM_SUBMIT_AFTER_RESET, NULL, NULL, 0u, ++ 0); ++ kbase_js_sched_all(kbdev); ++ } + -+#define KBASE_TIMELINE_JOB_STOP(kctx, js, _producerof_atom_number_completed) CSTD_NOP() ++ /* Process any pending slot updates */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_backend_slot_update(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+#define KBASE_TIMELINE_PM_CHECKTRANS(kbdev, trace_code) CSTD_NOP() ++ kbase_pm_context_idle(kbdev); + -+#define KBASE_TIMELINE_CONTEXT_ACTIVE(kbdev, count) CSTD_NOP() ++ /* Release vinstr */ ++ kbase_vinstr_resume(kbdev->vinstr_ctx); + -+static inline void kbase_timeline_job_slot_submit(struct kbase_device *kbdev, struct kbase_context *kctx, -+ struct kbase_jd_atom *katom, int js) -+{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ KBASE_TRACE_ADD(kbdev, JM_END_RESET_WORKER, NULL, NULL, 0u, 0); +} + -+static inline void kbase_timeline_job_slot_done(struct kbase_device *kbdev, struct kbase_context *kctx, -+ struct kbase_jd_atom *katom, int js, -+ kbasep_js_atom_done_code done_code) ++static enum hrtimer_restart kbasep_reset_timer_callback(struct hrtimer *timer) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+} ++ struct kbase_device *kbdev = container_of(timer, struct kbase_device, ++ hwaccess.backend.reset_timer); + -+static inline void kbase_timeline_pm_send_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event_sent) -+{ -+} ++ KBASE_DEBUG_ASSERT(kbdev); + -+static inline void kbase_timeline_pm_check_handle_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event) -+{ -+} ++ /* Reset still pending? */ ++ if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, ++ KBASE_RESET_GPU_COMMITTED, KBASE_RESET_GPU_HAPPENING) == ++ KBASE_RESET_GPU_COMMITTED) ++ queue_work(kbdev->hwaccess.backend.reset_workq, ++ &kbdev->hwaccess.backend.reset_work); + -+static inline void kbase_timeline_pm_handle_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event) -+{ ++ return HRTIMER_NORESTART; +} + -+static inline void kbase_timeline_pm_l2_transition_start(struct kbase_device *kbdev) ++/* ++ * If all jobs are evicted from the GPU then we can reset the GPU ++ * immediately instead of waiting for the timeout to elapse ++ */ ++ ++static void kbasep_try_reset_gpu_early_locked(struct kbase_device *kbdev) +{ ++ int i; ++ int pending_jobs = 0; ++ ++ KBASE_DEBUG_ASSERT(kbdev); ++ ++ /* Count the number of jobs */ ++ for (i = 0; i < kbdev->gpu_props.num_job_slots; i++) ++ pending_jobs += kbase_backend_nr_atoms_submitted(kbdev, i); ++ ++ if (pending_jobs > 0) { ++ /* There are still jobs on the GPU - wait */ ++ return; ++ } ++ ++ /* To prevent getting incorrect registers when dumping failed job, ++ * skip early reset. ++ */ ++ if (kbdev->job_fault_debug != false) ++ return; ++ ++ /* Check that the reset has been committed to (i.e. kbase_reset_gpu has ++ * been called), and that no other thread beat this thread to starting ++ * the reset */ ++ if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, ++ KBASE_RESET_GPU_COMMITTED, KBASE_RESET_GPU_HAPPENING) != ++ KBASE_RESET_GPU_COMMITTED) { ++ /* Reset has already occurred */ ++ return; ++ } ++ ++ queue_work(kbdev->hwaccess.backend.reset_workq, ++ &kbdev->hwaccess.backend.reset_work); +} + -+static inline void kbase_timeline_pm_l2_transition_done(struct kbase_device *kbdev) ++static void kbasep_try_reset_gpu_early(struct kbase_device *kbdev) +{ -+} -+#endif /* CONFIG_MALI_BIFROST_TRACE_TIMELINE */ ++ unsigned long flags; ++ struct kbasep_js_device_data *js_devdata; + -+#endif /* _KBASE_TRACE_TIMELINE_H */ ++ js_devdata = &kbdev->js_data; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbasep_try_reset_gpu_early_locked(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++} + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline_defs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline_defs.h -new file mode 100755 -index 000000000000..156a95a67f4a ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline_defs.h -@@ -0,0 +1,140 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++/** ++ * kbase_prepare_to_reset_gpu_locked - Prepare for resetting the GPU ++ * @kbdev: kbase device + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * This function just soft-stops all the slots to ensure that as many jobs as ++ * possible are saved. + * ++ * Return: ++ * The function returns a boolean which should be interpreted as follows: ++ * true - Prepared for reset, kbase_reset_gpu_locked should be called. ++ * false - Another thread is performing a reset, kbase_reset_gpu should ++ * not be called. + */ ++bool kbase_prepare_to_reset_gpu_locked(struct kbase_device *kbdev) ++{ ++ int i; ++ ++ KBASE_DEBUG_ASSERT(kbdev); ++ ++ if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, ++ KBASE_RESET_GPU_NOT_PENDING, ++ KBASE_RESET_GPU_PREPARED) != ++ KBASE_RESET_GPU_NOT_PENDING) { ++ /* Some other thread is already resetting the GPU */ ++ return false; ++ } + ++ kbase_disjoint_state_up(kbdev); + ++ for (i = 0; i < kbdev->gpu_props.num_job_slots; i++) ++ kbase_job_slot_softstop(kbdev, i, NULL); + ++ return true; ++} + ++bool kbase_prepare_to_reset_gpu(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ bool ret; ++ struct kbasep_js_device_data *js_devdata; + -+/* ***** IMPORTANT: THIS IS NOT A NORMAL HEADER FILE ***** -+ * ***** DO NOT INCLUDE DIRECTLY ***** -+ * ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ ++ js_devdata = &kbdev->js_data; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ret = kbase_prepare_to_reset_gpu_locked(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+/* -+ * Conventions on Event Names: -+ * -+ * - The prefix determines something about how the timeline should be -+ * displayed, and is split up into various parts, separated by underscores: -+ * - 'SW' and 'HW' as the first part will be used to determine whether a -+ * timeline is to do with Software or Hardware - effectively, separate -+ * 'channels' for Software and Hardware -+ * - 'START', 'STOP', 'ENTER', 'LEAVE' can be used in the second part, and -+ * signify related pairs of events - these are optional. -+ * - 'FLOW' indicates a generic event, which can use dependencies -+ * - This gives events such as: -+ * - 'SW_ENTER_FOO' -+ * - 'SW_LEAVE_FOO' -+ * - 'SW_FLOW_BAR_1' -+ * - 'SW_FLOW_BAR_2' -+ * - 'HW_START_BAZ' -+ * - 'HW_STOP_BAZ' -+ * - And an unadorned HW event: -+ * - 'HW_BAZ_FROZBOZ' -+ */ ++ return ret; ++} ++KBASE_EXPORT_TEST_API(kbase_prepare_to_reset_gpu); + +/* -+ * Conventions on parameter names: -+ * - anything with 'instance' in the name will have a separate timeline based -+ * on that instances. -+ * - underscored-prefixed parameters will by hidden by default on timelines -+ * -+ * Hence: -+ * - Different job slots have their own 'instance', based on the instance value -+ * - Per-context info (e.g. atoms on a context) have their own 'instance' -+ * (i.e. each context should be on a different timeline) ++ * This function should be called after kbase_prepare_to_reset_gpu if it ++ * returns true. It should never be called without a corresponding call to ++ * kbase_prepare_to_reset_gpu. + * -+ * Note that globally-shared resources can be tagged with a tgid, but we don't -+ * want an instance per context: -+ * - There's no point having separate Job Slot timelines for each context, that -+ * would be confusing - there's only really 3 job slots! -+ * - There's no point having separate Shader-powered timelines for each -+ * context, that would be confusing - all shader cores (whether it be 4, 8, -+ * etc) are shared in the system. ++ * After this function is called (or not called if kbase_prepare_to_reset_gpu ++ * returned false), the caller should wait for ++ * kbdev->hwaccess.backend.reset_waitq to be signalled to know when the reset ++ * has completed. + */ ++void kbase_reset_gpu(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev); + -+ /* -+ * CTX events -+ */ -+ /* Separate timelines for each context 'instance'*/ -+ KBASE_TIMELINE_TRACE_CODE(CTX_SET_NR_ATOMS_IN_FLIGHT, "CTX: Atoms in flight", "%d,%d", "_instance_tgid,_value_number_of_atoms"), -+ KBASE_TIMELINE_TRACE_CODE(CTX_FLOW_ATOM_READY, "CTX: Atoms Ready to Run", "%d,%d,%d", "_instance_tgid,_consumerof_atom_number,_producerof_atom_number_ready"), ++ /* Note this is an assert/atomic_set because it is a software issue for ++ * a race to be occuring here */ ++ KBASE_DEBUG_ASSERT(atomic_read(&kbdev->hwaccess.backend.reset_gpu) == ++ KBASE_RESET_GPU_PREPARED); ++ atomic_set(&kbdev->hwaccess.backend.reset_gpu, ++ KBASE_RESET_GPU_COMMITTED); + -+ /* -+ * SW Events -+ */ -+ /* Separate timelines for each slot 'instance' */ -+ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_SLOT_ACTIVE, "SW: GPU slot active", "%d,%d,%d", "_tgid,_instance_slot,_value_number_of_atoms"), -+ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_SLOT_NEXT, "SW: GPU atom in NEXT", "%d,%d,%d", "_tgid,_instance_slot,_value_is_an_atom_in_next"), -+ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_SLOT_HEAD, "SW: GPU atom in HEAD", "%d,%d,%d", "_tgid,_instance_slot,_value_is_an_atom_in_head"), -+ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_SLOT_STOPPING, "SW: Try Soft-Stop on GPU slot", "%d,%d,%d", "_tgid,_instance_slot,_value_is_slot_stopping"), -+ /* Shader and overall power is shared - can't have separate instances of -+ * it, just tagging with the context */ -+ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_POWER_ACTIVE, "SW: GPU power active", "%d,%d", "_tgid,_value_is_power_active"), -+ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_POWER_TILER_ACTIVE, "SW: GPU tiler powered", "%d,%d", "_tgid,_value_number_of_tilers"), -+ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_POWER_SHADER_ACTIVE, "SW: GPU shaders powered", "%d,%d", "_tgid,_value_number_of_shaders"), -+ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_POWER_L2_ACTIVE, "SW: GPU L2 powered", "%d,%d", "_tgid,_value_number_of_l2"), ++ dev_err(kbdev->dev, "Preparing to soft-reset GPU: Waiting (upto %d ms) for all jobs to complete soft-stop\n", ++ kbdev->reset_timeout_ms); + -+ /* SW Power event messaging. _event_type is one from the kbase_pm_event enum */ -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_SEND_EVENT, "SW: PM Send Event", "%d,%d,%d", "_tgid,_event_type,_writerof_pm_event_id"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_HANDLE_EVENT, "SW: PM Handle Event", "%d,%d,%d", "_tgid,_event_type,_finalconsumerof_pm_event_id"), -+ /* SW L2 power events */ -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_GPU_POWER_L2_POWERING, "SW: GPU L2 powering", "%d,%d", "_tgid,_writerof_l2_transitioning"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_GPU_POWER_L2_ACTIVE, "SW: GPU L2 powering done", "%d,%d", "_tgid,_finalconsumerof_l2_transitioning"), ++ hrtimer_start(&kbdev->hwaccess.backend.reset_timer, ++ HR_TIMER_DELAY_MSEC(kbdev->reset_timeout_ms), ++ HRTIMER_MODE_REL); + -+ KBASE_TIMELINE_TRACE_CODE(SW_SET_CONTEXT_ACTIVE, "SW: Context Active", "%d,%d", "_tgid,_value_active"), ++ /* Try resetting early */ ++ kbasep_try_reset_gpu_early(kbdev); ++} ++KBASE_EXPORT_TEST_API(kbase_reset_gpu); + -+ /* -+ * BEGIN: Significant SW Functions that call kbase_pm_check_transitions_nolock() -+ */ -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_DO_POWEROFF_START, "SW: PM CheckTrans from kbase_pm_do_poweroff", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_do_poweroff"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_DO_POWEROFF_END, "SW: PM CheckTrans from kbase_pm_do_poweroff", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_do_poweroff"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_DO_POWERON_START, "SW: PM CheckTrans from kbase_pm_do_poweron", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_do_poweron"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_DO_POWERON_END, "SW: PM CheckTrans from kbase_pm_do_poweron", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_do_poweron"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_GPU_INTERRUPT_START, "SW: PM CheckTrans from kbase_gpu_interrupt", "%d,%d", "_tgid,_writerof_pm_checktrans_gpu_interrupt"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_GPU_INTERRUPT_END, "SW: PM CheckTrans from kbase_gpu_interrupt", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_gpu_interrupt"), ++void kbase_reset_gpu_locked(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev); + -+ /* -+ * Significant Indirect callers of kbase_pm_check_transitions_nolock() -+ */ -+ /* kbase_pm_request_cores */ -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_START, "SW: PM CheckTrans from kbase_pm_request_cores(shader)", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_request_cores_shader"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_END, "SW: PM CheckTrans from kbase_pm_request_cores(shader)", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_request_cores_shader"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_TILER_START, "SW: PM CheckTrans from kbase_pm_request_cores(tiler)", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_request_cores_tiler"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_TILER_END, "SW: PM CheckTrans from kbase_pm_request_cores(tiler)", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_request_cores_tiler"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_TILER_START, "SW: PM CheckTrans from kbase_pm_request_cores(shader+tiler)", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_request_cores_shader_tiler"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_TILER_END, "SW: PM CheckTrans from kbase_pm_request_cores(shader+tiler)", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_request_cores_shader_tiler"), -+ /* kbase_pm_release_cores */ -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_START, "SW: PM CheckTrans from kbase_pm_release_cores(shader)", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_release_cores_shader"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_END, "SW: PM CheckTrans from kbase_pm_release_cores(shader)", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_release_cores_shader"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_TILER_START, "SW: PM CheckTrans from kbase_pm_release_cores(tiler)", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_release_cores_tiler"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_TILER_END, "SW: PM CheckTrans from kbase_pm_release_cores(tiler)", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_release_cores_tiler"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_TILER_START, "SW: PM CheckTrans from kbase_pm_release_cores(shader+tiler)", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_release_cores_shader_tiler"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_TILER_END, "SW: PM CheckTrans from kbase_pm_release_cores(shader+tiler)", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_release_cores_shader_tiler"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_DEFERRED_START, "SW: PM CheckTrans from kbasep_pm_do_shader_poweroff_callback", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_do_shader_poweroff_callback"), -+ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_DEFERRED_END, "SW: PM CheckTrans from kbasep_pm_do_shader_poweroff_callback", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_do_shader_poweroff_callback"), -+ /* -+ * END: SW Functions that call kbase_pm_check_transitions_nolock() -+ */ ++ /* Note this is an assert/atomic_set because it is a software issue for ++ * a race to be occuring here */ ++ KBASE_DEBUG_ASSERT(atomic_read(&kbdev->hwaccess.backend.reset_gpu) == ++ KBASE_RESET_GPU_PREPARED); ++ atomic_set(&kbdev->hwaccess.backend.reset_gpu, ++ KBASE_RESET_GPU_COMMITTED); + -+ /* -+ * HW Events -+ */ -+ KBASE_TIMELINE_TRACE_CODE(HW_MMU_FAULT, -+"HW: MMU Fault", "%d,%d,%d", "_tgid,fault_type,fault_stage,asid"), -+ KBASE_TIMELINE_TRACE_CODE(HW_START_GPU_JOB_CHAIN_SW_APPROX, -+"HW: Job Chain start (SW approximated)", "%d,%d,%d", -+"_tgid,job_slot,_consumerof_atom_number_ready"), -+ KBASE_TIMELINE_TRACE_CODE(HW_STOP_GPU_JOB_CHAIN_SW_APPROX, -+"HW: Job Chain stop (SW approximated)", "%d,%d,%d", -+"_tgid,job_slot,_producerof_atom_number_completed") -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_uku.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_uku.h ++ dev_err(kbdev->dev, "Preparing to soft-reset GPU: Waiting (upto %d ms) for all jobs to complete soft-stop\n", ++ kbdev->reset_timeout_ms); ++ hrtimer_start(&kbdev->hwaccess.backend.reset_timer, ++ HR_TIMER_DELAY_MSEC(kbdev->reset_timeout_ms), ++ HRTIMER_MODE_REL); ++ ++ /* Try resetting early */ ++ kbasep_try_reset_gpu_early_locked(kbdev); ++} ++ ++void kbase_reset_gpu_silent(struct kbase_device *kbdev) ++{ ++ if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, ++ KBASE_RESET_GPU_NOT_PENDING, ++ KBASE_RESET_GPU_SILENT) != ++ KBASE_RESET_GPU_NOT_PENDING) { ++ /* Some other thread is already resetting the GPU */ ++ return; ++ } ++ ++ kbase_disjoint_state_up(kbdev); ++ ++ queue_work(kbdev->hwaccess.backend.reset_workq, ++ &kbdev->hwaccess.backend.reset_work); ++} ++ ++bool kbase_reset_gpu_active(struct kbase_device *kbdev) ++{ ++ if (atomic_read(&kbdev->hwaccess.backend.reset_gpu) == ++ KBASE_RESET_GPU_NOT_PENDING) ++ return false; ++ ++ return true; ++} ++#endif /* KBASE_GPU_RESET_EN */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h new file mode 100755 -index 000000000000..cf8ee0572dc5 +index 000000000..1f382b3c1 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_uku.h -@@ -0,0 +1,532 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h +@@ -0,0 +1,164 @@ +/* + * -+ * (C) COPYRIGHT 2008-2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -327709,528 +364242,160 @@ index 000000000000..cf8ee0572dc5 + + + -+#ifndef _KBASE_UKU_H_ -+#define _KBASE_UKU_H_ -+ -+#include "mali_uk.h" -+#include "mali_base_kernel.h" ++/* ++ * Job Manager backend-specific low-level APIs. ++ */ + -+/* This file needs to support being included from kernel and userside (which use different defines) */ -+#if defined(CONFIG_MALI_BIFROST_ERROR_INJECT) || MALI_ERROR_INJECT_ON -+#define SUPPORT_MALI_ERROR_INJECT -+#endif /* defined(CONFIG_MALI_BIFROST_ERROR_INJECT) || MALI_ERROR_INJECT_ON */ -+#if defined(CONFIG_MALI_BIFROST_NO_MALI) -+#define SUPPORT_MALI_NO_MALI -+#elif defined(MALI_BIFROST_NO_MALI) -+#if MALI_BIFROST_NO_MALI -+#define SUPPORT_MALI_NO_MALI -+#endif -+#endif ++#ifndef _KBASE_JM_HWACCESS_H_ ++#define _KBASE_JM_HWACCESS_H_ + -+#if defined(SUPPORT_MALI_NO_MALI) || defined(SUPPORT_MALI_ERROR_INJECT) -+#include "backend/gpu/mali_kbase_model_dummy.h" -+#endif ++#include ++#include ++#include + -+#include "mali_kbase_gpuprops_types.h" ++#include + -+/* -+ * 10.1: -+ * - Do mmap in kernel for SAME_VA memory allocations rather then -+ * calling back into the kernel as a 2nd stage of the allocation request. -+ * -+ * 10.2: -+ * - Add KBASE_FUNC_MEM_JIT_INIT which allows clients to request a custom VA -+ * region for use with JIT (ignored on 32-bit platforms) -+ * -+ * 10.3: -+ * - base_jd_core_req typedef-ed to u32 (instead of to u16) -+ * - two flags added: BASE_JD_REQ_SKIP_CACHE_STAT / _END -+ * -+ * 10.4: -+ * - Removed KBASE_FUNC_EXT_BUFFER_LOCK used only in internal tests ++/** ++ * kbase_job_submit_nolock() - Submit a job to a certain job-slot ++ * @kbdev: Device pointer ++ * @katom: Atom to submit ++ * @js: Job slot to submit on + * -+ * 10.5: -+ * - Reverted to performing mmap in user space so that tools like valgrind work. ++ * The caller must check kbasep_jm_is_submit_slots_free() != false before ++ * calling this. + * -+ * 10.6: -+ * - Add flags input variable to KBASE_FUNC_TLSTREAM_ACQUIRE ++ * The following locking conditions are made on the caller: ++ * - it must hold the hwaccess_lock + */ -+#define BASE_UK_VERSION_MAJOR 10 -+#define BASE_UK_VERSION_MINOR 6 ++void kbase_job_submit_nolock(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom, int js); + -+#define LINUX_UK_BASE_MAGIC 0x80 ++/** ++ * kbase_job_done_slot() - Complete the head job on a particular job-slot ++ * @kbdev: Device pointer ++ * @s: Job slot ++ * @completion_code: Completion code of job reported by GPU ++ * @job_tail: Job tail address reported by GPU ++ * @end_timestamp: Timestamp of job completion ++ */ ++void kbase_job_done_slot(struct kbase_device *kbdev, int s, u32 completion_code, ++ u64 job_tail, ktime_t *end_timestamp); + -+struct kbase_uk_mem_alloc { -+ union uk_header header; -+ /* IN */ -+ u64 va_pages; -+ u64 commit_pages; -+ u64 extent; -+ /* IN/OUT */ -+ u64 flags; -+ /* OUT */ -+ u64 gpu_va; -+ u16 va_alignment; -+ u8 padding[6]; -+}; ++#ifdef CONFIG_GPU_TRACEPOINTS ++static inline char *kbasep_make_job_slot_string(int js, char *js_string, ++ size_t js_size) ++{ ++ snprintf(js_string, js_size, "job_slot_%i", js); ++ return js_string; ++} ++#endif + -+struct kbase_uk_mem_free { -+ union uk_header header; -+ /* IN */ -+ u64 gpu_addr; -+ /* OUT */ -+}; -+ -+struct kbase_uk_mem_alias { -+ union uk_header header; -+ /* IN/OUT */ -+ u64 flags; -+ /* IN */ -+ u64 stride; -+ u64 nents; -+ u64 ai; -+ /* OUT */ -+ u64 gpu_va; -+ u64 va_pages; -+}; -+ -+struct kbase_uk_mem_import { -+ union uk_header header; -+ /* IN */ -+ u64 phandle; -+ u32 type; -+ u32 padding; -+ /* IN/OUT */ -+ u64 flags; -+ /* OUT */ -+ u64 gpu_va; -+ u64 va_pages; -+}; -+ -+struct kbase_uk_mem_flags_change { -+ union uk_header header; -+ /* IN */ -+ u64 gpu_va; -+ u64 flags; -+ u64 mask; -+}; -+ -+struct kbase_uk_job_submit { -+ union uk_header header; -+ /* IN */ -+ u64 addr; -+ u32 nr_atoms; -+ u32 stride; /* bytes between atoms, i.e. sizeof(base_jd_atom_v2) */ -+ /* OUT */ -+}; -+ -+struct kbase_uk_post_term { -+ union uk_header header; -+}; -+ -+struct kbase_uk_sync_now { -+ union uk_header header; -+ -+ /* IN */ -+ struct base_syncset sset; -+ -+ /* OUT */ -+}; -+ -+struct kbase_uk_hwcnt_setup { -+ union uk_header header; -+ -+ /* IN */ -+ u64 dump_buffer; -+ u32 jm_bm; -+ u32 shader_bm; -+ u32 tiler_bm; -+ u32 unused_1; /* keep for backwards compatibility */ -+ u32 mmu_l2_bm; -+ u32 padding; -+ /* OUT */ -+}; ++/** ++ * kbase_job_hw_submit() - Submit a job to the GPU ++ * @kbdev: Device pointer ++ * @katom: Atom to submit ++ * @js: Job slot to submit on ++ * ++ * The caller must check kbasep_jm_is_submit_slots_free() != false before ++ * calling this. ++ * ++ * The following locking conditions are made on the caller: ++ * - it must hold the hwaccess_lock ++ */ ++void kbase_job_hw_submit(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom, ++ int js); + +/** -+ * struct kbase_uk_hwcnt_reader_setup - User/Kernel space data exchange structure -+ * @header: UK structure header -+ * @buffer_count: requested number of dumping buffers -+ * @jm_bm: counters selection bitmask (JM) -+ * @shader_bm: counters selection bitmask (Shader) -+ * @tiler_bm: counters selection bitmask (Tiler) -+ * @mmu_l2_bm: counters selection bitmask (MMU_L2) -+ * @fd: dumping notification file descriptor ++ * kbasep_job_slot_soft_or_hard_stop_do_action() - Perform a soft or hard stop ++ * on the specified atom ++ * @kbdev: Device pointer ++ * @js: Job slot to stop on ++ * @action: The action to perform, either JSn_COMMAND_HARD_STOP or ++ * JSn_COMMAND_SOFT_STOP ++ * @core_reqs: Core requirements of atom to stop ++ * @target_katom: Atom to stop + * -+ * This structure sets up HWC dumper/reader for this context. -+ * Multiple instances can be created for single context. ++ * The following locking conditions are made on the caller: ++ * - it must hold the hwaccess_lock + */ -+struct kbase_uk_hwcnt_reader_setup { -+ union uk_header header; -+ -+ /* IN */ -+ u32 buffer_count; -+ u32 jm_bm; -+ u32 shader_bm; -+ u32 tiler_bm; -+ u32 mmu_l2_bm; -+ -+ /* OUT */ -+ s32 fd; -+}; -+ -+struct kbase_uk_hwcnt_dump { -+ union uk_header header; -+}; -+ -+struct kbase_uk_hwcnt_clear { -+ union uk_header header; -+}; -+ -+struct kbase_uk_fence_validate { -+ union uk_header header; -+ /* IN */ -+ s32 fd; -+ u32 padding; -+ /* OUT */ -+}; -+ -+struct kbase_uk_stream_create { -+ union uk_header header; -+ /* IN */ -+ char name[32]; -+ /* OUT */ -+ s32 fd; -+ u32 padding; -+}; -+ -+struct kbase_uk_gpuprops { -+ union uk_header header; -+ -+ /* IN */ -+ struct mali_base_gpu_props props; -+ /* OUT */ -+}; -+ -+struct kbase_uk_mem_query { -+ union uk_header header; -+ /* IN */ -+ u64 gpu_addr; -+#define KBASE_MEM_QUERY_COMMIT_SIZE 1 -+#define KBASE_MEM_QUERY_VA_SIZE 2 -+#define KBASE_MEM_QUERY_FLAGS 3 -+ u64 query; -+ /* OUT */ -+ u64 value; -+}; -+ -+struct kbase_uk_mem_commit { -+ union uk_header header; -+ /* IN */ -+ u64 gpu_addr; -+ u64 pages; -+ /* OUT */ -+ u32 result_subcode; -+ u32 padding; -+}; -+ -+struct kbase_uk_find_cpu_offset { -+ union uk_header header; -+ /* IN */ -+ u64 gpu_addr; -+ u64 cpu_addr; -+ u64 size; -+ /* OUT */ -+ u64 offset; -+}; -+ -+#define KBASE_GET_VERSION_BUFFER_SIZE 64 -+struct kbase_uk_get_ddk_version { -+ union uk_header header; -+ /* OUT */ -+ char version_buffer[KBASE_GET_VERSION_BUFFER_SIZE]; -+ u32 version_string_size; -+ u32 padding; -+}; -+ -+struct kbase_uk_disjoint_query { -+ union uk_header header; -+ /* OUT */ -+ u32 counter; -+ u32 padding; -+}; -+ -+struct kbase_uk_set_flags { -+ union uk_header header; -+ /* IN */ -+ u32 create_flags; -+ u32 padding; -+}; -+ -+#if MALI_UNIT_TEST -+#define TEST_ADDR_COUNT 4 -+#define KBASE_TEST_BUFFER_SIZE 128 -+struct kbase_exported_test_data { -+ u64 test_addr[TEST_ADDR_COUNT]; /**< memory address */ -+ u32 test_addr_pages[TEST_ADDR_COUNT]; /**< memory size in pages */ -+ u64 kctx; /**< base context created by process */ -+ u64 mm; /**< pointer to process address space */ -+ u8 buffer1[KBASE_TEST_BUFFER_SIZE]; /**< unit test defined parameter */ -+ u8 buffer2[KBASE_TEST_BUFFER_SIZE]; /**< unit test defined parameter */ -+}; -+ -+struct kbase_uk_set_test_data { -+ union uk_header header; -+ /* IN */ -+ struct kbase_exported_test_data test_data; -+}; -+ -+#endif /* MALI_UNIT_TEST */ -+ -+#ifdef SUPPORT_MALI_ERROR_INJECT -+struct kbase_uk_error_params { -+ union uk_header header; -+ /* IN */ -+ struct kbase_error_params params; -+}; -+#endif /* SUPPORT_MALI_ERROR_INJECT */ -+ -+#ifdef SUPPORT_MALI_NO_MALI -+struct kbase_uk_model_control_params { -+ union uk_header header; -+ /* IN */ -+ struct kbase_model_control_params params; -+}; -+#endif /* SUPPORT_MALI_NO_MALI */ -+ -+struct kbase_uk_profiling_controls { -+ union uk_header header; -+ u32 profiling_controls[FBDUMP_CONTROL_MAX]; -+}; -+ -+struct kbase_uk_debugfs_mem_profile_add { -+ union uk_header header; -+ u32 len; -+ u32 padding; -+ u64 buf; -+}; -+ -+struct kbase_uk_context_id { -+ union uk_header header; -+ /* OUT */ -+ int id; -+}; ++void kbasep_job_slot_soft_or_hard_stop_do_action(struct kbase_device *kbdev, ++ int js, ++ u32 action, ++ base_jd_core_req core_reqs, ++ struct kbase_jd_atom *target_katom); + +/** -+ * struct kbase_uk_tlstream_acquire - User/Kernel space data exchange structure -+ * @header: UK structure header -+ * @flags: timeline stream flags -+ * @fd: timeline stream file descriptor ++ * kbase_backend_soft_hard_stop_slot() - Soft or hard stop jobs on a given job ++ * slot belonging to a given context. ++ * @kbdev: Device pointer ++ * @kctx: Context pointer. May be NULL ++ * @katom: Specific atom to stop. May be NULL ++ * @js: Job slot to hard stop ++ * @action: The action to perform, either JSn_COMMAND_HARD_STOP or ++ * JSn_COMMAND_SOFT_STOP + * -+ * This structure is used when performing a call to acquire kernel side timeline -+ * stream file descriptor. -+ */ -+struct kbase_uk_tlstream_acquire { -+ union uk_header header; -+ /* IN */ -+ u32 flags; -+ /* OUT */ -+ s32 fd; -+}; -+ -+/** -+ * struct kbase_uk_tlstream_acquire_v10_4 - User/Kernel space data exchange -+ * structure -+ * @header: UK structure header -+ * @fd: timeline stream file descriptor ++ * If no context is provided then all jobs on the slot will be soft or hard ++ * stopped. + * -+ * This structure is used when performing a call to acquire kernel side timeline -+ * stream file descriptor. -+ */ -+struct kbase_uk_tlstream_acquire_v10_4 { -+ union uk_header header; -+ /* IN */ -+ /* OUT */ -+ s32 fd; -+}; -+ -+/** -+ * struct kbase_uk_tlstream_flush - User/Kernel space data exchange structure -+ * @header: UK structure header ++ * If a katom is provided then only that specific atom will be stopped. In this ++ * case the kctx parameter is ignored. + * -+ * This structure is used when performing a call to flush kernel side -+ * timeline streams. -+ */ -+struct kbase_uk_tlstream_flush { -+ union uk_header header; -+ /* IN */ -+ /* OUT */ -+}; -+ -+#if MALI_UNIT_TEST -+/** -+ * struct kbase_uk_tlstream_test - User/Kernel space data exchange structure -+ * @header: UK structure header -+ * @tpw_count: number of trace point writers in each context -+ * @msg_delay: time delay between tracepoints from one writer in milliseconds -+ * @msg_count: number of trace points written by one writer -+ * @aux_msg: if non-zero aux messages will be included ++ * Jobs that are on the slot but are not yet on the GPU will be unpulled and ++ * returned to the job scheduler. + * -+ * This structure is used when performing a call to start timeline stream test -+ * embedded in kernel. ++ * Return: true if an atom was stopped, false otherwise + */ -+struct kbase_uk_tlstream_test { -+ union uk_header header; -+ /* IN */ -+ u32 tpw_count; -+ u32 msg_delay; -+ u32 msg_count; -+ u32 aux_msg; -+ /* OUT */ -+}; ++bool kbase_backend_soft_hard_stop_slot(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ int js, ++ struct kbase_jd_atom *katom, ++ u32 action); + +/** -+ * struct kbase_uk_tlstream_stats - User/Kernel space data exchange structure -+ * @header: UK structure header -+ * @bytes_collected: number of bytes read by user -+ * @bytes_generated: number of bytes generated by tracepoints ++ * kbase_job_slot_init - Initialise job slot framework ++ * @kbdev: Device pointer + * -+ * This structure is used when performing a call to obtain timeline stream -+ * statistics. ++ * Called on driver initialisation ++ * ++ * Return: 0 on success + */ -+struct kbase_uk_tlstream_stats { -+ union uk_header header; /**< UK structure header. */ -+ /* IN */ -+ /* OUT */ -+ u32 bytes_collected; -+ u32 bytes_generated; -+}; -+#endif /* MALI_UNIT_TEST */ ++int kbase_job_slot_init(struct kbase_device *kbdev); + +/** -+ * struct struct kbase_uk_prfcnt_value for the KBASE_FUNC_SET_PRFCNT_VALUES ioctl -+ * @header: UK structure header -+ * @data: Counter samples for the dummy model -+ * @size:............Size of the counter sample data ++ * kbase_job_slot_halt - Halt the job slot framework ++ * @kbdev: Device pointer ++ * ++ * Should prevent any further job slot processing + */ -+struct kbase_uk_prfcnt_values { -+ union uk_header header; -+ /* IN */ -+ u32 *data; -+ u32 size; -+}; ++void kbase_job_slot_halt(struct kbase_device *kbdev); + +/** -+ * struct kbase_uk_soft_event_update - User/Kernel space data exchange structure -+ * @header: UK structure header -+ * @evt: the GPU address containing the event -+ * @new_status: the new event status, must be either BASE_JD_SOFT_EVENT_SET or -+ * BASE_JD_SOFT_EVENT_RESET -+ * @flags: reserved for future uses, must be set to 0 ++ * kbase_job_slot_term - Terminate job slot framework ++ * @kbdev: Device pointer + * -+ * This structure is used to update the status of a software event. If the -+ * event's status is set to BASE_JD_SOFT_EVENT_SET, any job currently waiting -+ * on this event will complete. ++ * Called on driver termination + */ -+struct kbase_uk_soft_event_update { -+ union uk_header header; -+ /* IN */ -+ u64 evt; -+ u32 new_status; -+ u32 flags; -+}; ++void kbase_job_slot_term(struct kbase_device *kbdev); + +/** -+ * struct kbase_uk_mem_jit_init - User/Kernel space data exchange structure -+ * @header: UK structure header -+ * @va_pages: Number of virtual pages required for JIT ++ * kbase_gpu_cacheclean - Cause a GPU cache clean & flush ++ * @kbdev: Device pointer + * -+ * This structure is used when requesting initialization of JIT. ++ * Caller must not be in IRQ context + */ -+struct kbase_uk_mem_jit_init { -+ union uk_header header; -+ /* IN */ -+ u64 va_pages; -+}; -+ -+enum kbase_uk_function_id { -+ KBASE_FUNC_MEM_ALLOC = (UK_FUNC_ID + 0), -+ KBASE_FUNC_MEM_IMPORT = (UK_FUNC_ID + 1), -+ KBASE_FUNC_MEM_COMMIT = (UK_FUNC_ID + 2), -+ KBASE_FUNC_MEM_QUERY = (UK_FUNC_ID + 3), -+ KBASE_FUNC_MEM_FREE = (UK_FUNC_ID + 4), -+ KBASE_FUNC_MEM_FLAGS_CHANGE = (UK_FUNC_ID + 5), -+ KBASE_FUNC_MEM_ALIAS = (UK_FUNC_ID + 6), -+ -+ /* UK_FUNC_ID + 7 not in use since BASE_LEGACY_UK6_SUPPORT dropped */ -+ -+ KBASE_FUNC_SYNC = (UK_FUNC_ID + 8), -+ -+ KBASE_FUNC_POST_TERM = (UK_FUNC_ID + 9), -+ -+ KBASE_FUNC_HWCNT_SETUP = (UK_FUNC_ID + 10), -+ KBASE_FUNC_HWCNT_DUMP = (UK_FUNC_ID + 11), -+ KBASE_FUNC_HWCNT_CLEAR = (UK_FUNC_ID + 12), -+ -+ KBASE_FUNC_GPU_PROPS_REG_DUMP = (UK_FUNC_ID + 14), -+ -+ KBASE_FUNC_FIND_CPU_OFFSET = (UK_FUNC_ID + 15), -+ -+ KBASE_FUNC_GET_VERSION = (UK_FUNC_ID + 16), -+ KBASE_FUNC_SET_FLAGS = (UK_FUNC_ID + 18), -+ -+ KBASE_FUNC_SET_TEST_DATA = (UK_FUNC_ID + 19), -+ KBASE_FUNC_INJECT_ERROR = (UK_FUNC_ID + 20), -+ KBASE_FUNC_MODEL_CONTROL = (UK_FUNC_ID + 21), -+ -+ /* UK_FUNC_ID + 22 not in use since BASE_LEGACY_UK8_SUPPORT dropped */ -+ -+ KBASE_FUNC_FENCE_VALIDATE = (UK_FUNC_ID + 23), -+ KBASE_FUNC_STREAM_CREATE = (UK_FUNC_ID + 24), -+ KBASE_FUNC_GET_PROFILING_CONTROLS = (UK_FUNC_ID + 25), -+ KBASE_FUNC_SET_PROFILING_CONTROLS = (UK_FUNC_ID + 26), -+ /* to be used only for testing -+ * purposes, otherwise these controls -+ * are set through gator API */ -+ -+ KBASE_FUNC_DEBUGFS_MEM_PROFILE_ADD = (UK_FUNC_ID + 27), -+ KBASE_FUNC_JOB_SUBMIT = (UK_FUNC_ID + 28), -+ KBASE_FUNC_DISJOINT_QUERY = (UK_FUNC_ID + 29), -+ -+ KBASE_FUNC_GET_CONTEXT_ID = (UK_FUNC_ID + 31), -+ -+ KBASE_FUNC_TLSTREAM_ACQUIRE_V10_4 = (UK_FUNC_ID + 32), -+#if MALI_UNIT_TEST -+ KBASE_FUNC_TLSTREAM_TEST = (UK_FUNC_ID + 33), -+ KBASE_FUNC_TLSTREAM_STATS = (UK_FUNC_ID + 34), -+#endif /* MALI_UNIT_TEST */ -+ KBASE_FUNC_TLSTREAM_FLUSH = (UK_FUNC_ID + 35), -+ -+ KBASE_FUNC_HWCNT_READER_SETUP = (UK_FUNC_ID + 36), -+ -+#ifdef SUPPORT_MALI_NO_MALI -+ KBASE_FUNC_SET_PRFCNT_VALUES = (UK_FUNC_ID + 37), -+#endif -+ -+ KBASE_FUNC_SOFT_EVENT_UPDATE = (UK_FUNC_ID + 38), -+ -+ KBASE_FUNC_MEM_JIT_INIT = (UK_FUNC_ID + 39), -+ -+ KBASE_FUNC_TLSTREAM_ACQUIRE = (UK_FUNC_ID + 40), -+ -+ KBASE_FUNC_MAX -+}; -+ -+#endif /* _KBASE_UKU_H_ */ ++void kbase_gpu_cacheclean(struct kbase_device *kbdev); + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_utility.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_utility.c ++#endif /* _KBASE_JM_HWACCESS_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c new file mode 100755 -index 000000000000..be474ff87401 +index 000000000..4b4541660 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_utility.c -@@ -0,0 +1,33 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c +@@ -0,0 +1,1952 @@ +/* + * -+ * (C) COPYRIGHT 2012-2013, 2015 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -328246,2151 +364411,1949 @@ index 000000000000..be474ff87401 + + + ++/* ++ * Register-based HW access backend specific APIs ++ */ + +#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+bool kbasep_list_member_of(const struct list_head *base, struct list_head *entry) -+{ -+ struct list_head *pos = base->next; ++/* Return whether the specified ringbuffer is empty. HW access lock must be ++ * held */ ++#define SLOT_RB_EMPTY(rb) (rb->write_idx == rb->read_idx) ++/* Return number of atoms currently in the specified ringbuffer. HW access lock ++ * must be held */ ++#define SLOT_RB_ENTRIES(rb) (int)(s8)(rb->write_idx - rb->read_idx) + -+ while (pos != base) { -+ if (pos == entry) -+ return true; ++static void kbase_gpu_release_atom(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom, ++ ktime_t *end_timestamp); + -+ pos = pos->next; -+ } -+ return false; -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_utility.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_utility.h -new file mode 100755 -index 000000000000..fd7252dab0de ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_utility.h -@@ -0,0 +1,37 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2013, 2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++/** ++ * kbase_gpu_enqueue_atom - Enqueue an atom in the HW access ringbuffer ++ * @kbdev: Device pointer ++ * @katom: Atom to enqueue + * ++ * Context: Caller must hold the HW access lock + */ ++static void kbase_gpu_enqueue_atom(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom) ++{ ++ struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[katom->slot_nr]; + ++ WARN_ON(SLOT_RB_ENTRIES(rb) >= SLOT_RB_SIZE); + ++ lockdep_assert_held(&kbdev->hwaccess_lock); + ++ rb->entries[rb->write_idx & SLOT_RB_MASK].katom = katom; ++ rb->write_idx++; + ++ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_WAITING_BLOCKED; ++} + -+#ifndef _KBASE_UTILITY_H -+#define _KBASE_UTILITY_H -+ -+#ifndef _KBASE_H_ -+#error "Don't include this file directly, use mali_kbase.h instead" -+#endif -+ -+/** Test whether the given list entry is a member of the given list. -+ * -+ * @param base The head of the list to be tested -+ * @param entry The list entry to be tested -+ * -+ * @return true if entry is a member of base -+ * false otherwise -+ */ -+bool kbasep_list_member_of(const struct list_head *base, struct list_head *entry); -+ -+#endif /* _KBASE_UTILITY_H */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_vinstr.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_vinstr.c -new file mode 100755 -index 000000000000..9c5b2e46c0e5 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_vinstr.c -@@ -0,0 +1,2072 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++/** ++ * kbase_gpu_dequeue_atom - Remove an atom from the HW access ringbuffer, once ++ * it has been completed ++ * @kbdev: Device pointer ++ * @js: Job slot to remove atom from ++ * @end_timestamp: Pointer to timestamp of atom completion. May be NULL, in ++ * which case current time will be used. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * Context: Caller must hold the HW access lock + * ++ * Return: Atom removed from ringbuffer + */ ++static struct kbase_jd_atom *kbase_gpu_dequeue_atom(struct kbase_device *kbdev, ++ int js, ++ ktime_t *end_timestamp) ++{ ++ struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[js]; ++ struct kbase_jd_atom *katom; + ++ if (SLOT_RB_EMPTY(rb)) { ++ WARN(1, "GPU ringbuffer unexpectedly empty\n"); ++ return NULL; ++ } + ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+/*****************************************************************************/ -+ -+/* Hwcnt reader API version */ -+#define HWCNT_READER_API 1 -+ -+/* The number of nanoseconds in a second. */ -+#define NSECS_IN_SEC 1000000000ull /* ns */ ++ katom = rb->entries[rb->read_idx & SLOT_RB_MASK].katom; + -+/* The time resolution of dumping service. */ -+#define DUMPING_RESOLUTION 500000ull /* ns */ ++ kbase_gpu_release_atom(kbdev, katom, end_timestamp); + -+/* The maximal supported number of dumping buffers. */ -+#define MAX_BUFFER_COUNT 32 ++ rb->read_idx++; + -+/* Size and number of hw counters blocks. */ -+#define NR_CNT_BLOCKS_PER_GROUP 8 -+#define NR_CNT_PER_BLOCK 64 -+#define NR_BYTES_PER_CNT 4 -+#define NR_BYTES_PER_HDR 16 -+#define PRFCNT_EN_MASK_OFFSET 0x8 ++ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB; + -+/*****************************************************************************/ ++ kbase_js_debug_log_current_affinities(kbdev); + -+enum { -+ SHADER_HWCNT_BM, -+ TILER_HWCNT_BM, -+ MMU_L2_HWCNT_BM, -+ JM_HWCNT_BM -+}; ++ return katom; ++} + -+enum vinstr_state { -+ VINSTR_IDLE, -+ VINSTR_DUMPING, -+ VINSTR_SUSPENDING, -+ VINSTR_SUSPENDED, -+ VINSTR_RESUMING -+}; ++struct kbase_jd_atom *kbase_gpu_inspect(struct kbase_device *kbdev, int js, ++ int idx) ++{ ++ struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[js]; + -+/** -+ * struct kbase_vinstr_context - vinstr context per device -+ * @lock: protects the entire vinstr context -+ * @kbdev: pointer to kbase device -+ * @kctx: pointer to kbase context -+ * @vmap: vinstr vmap for mapping hwcnt dump buffer -+ * @gpu_va: GPU hwcnt dump buffer address -+ * @cpu_va: the CPU side mapping of the hwcnt dump buffer -+ * @dump_size: size of the dump buffer in bytes -+ * @bitmap: current set of counters monitored, not always in sync -+ * with hardware -+ * @reprogram: when true, reprogram hwcnt block with the new set of -+ * counters -+ * @state: vinstr state -+ * @state_lock: protects information about vinstr state -+ * @suspend_waitq: notification queue to trigger state re-validation -+ * @suspend_cnt: reference counter of vinstr's suspend state -+ * @suspend_work: worker to execute on entering suspended state -+ * @resume_work: worker to execute on leaving suspended state -+ * @nclients: number of attached clients, pending or otherwise -+ * @waiting_clients: head of list of clients being periodically sampled -+ * @idle_clients: head of list of clients being idle -+ * @suspended_clients: head of list of clients being suspended -+ * @thread: periodic sampling thread -+ * @waitq: notification queue of sampling thread -+ * @request_pending: request for action for sampling thread -+ * @clients_present: when true, we have at least one client -+ * Note: this variable is in sync. with nclients and is -+ * present to preserve simplicity. Protected by state_lock. -+ */ -+struct kbase_vinstr_context { -+ struct mutex lock; -+ struct kbase_device *kbdev; -+ struct kbase_context *kctx; ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ struct kbase_vmap_struct vmap; -+ u64 gpu_va; -+ void *cpu_va; -+ size_t dump_size; -+ u32 bitmap[4]; -+ bool reprogram; ++ if ((SLOT_RB_ENTRIES(rb) - 1) < idx) ++ return NULL; /* idx out of range */ + -+ enum vinstr_state state; -+ struct spinlock state_lock; -+ wait_queue_head_t suspend_waitq; -+ unsigned int suspend_cnt; -+ struct work_struct suspend_work; -+ struct work_struct resume_work; ++ return rb->entries[(rb->read_idx + idx) & SLOT_RB_MASK].katom; ++} + -+ u32 nclients; -+ struct list_head waiting_clients; -+ struct list_head idle_clients; -+ struct list_head suspended_clients; ++struct kbase_jd_atom *kbase_backend_inspect_head(struct kbase_device *kbdev, ++ int js) ++{ ++ return kbase_gpu_inspect(kbdev, js, 0); ++} + -+ struct task_struct *thread; -+ wait_queue_head_t waitq; -+ atomic_t request_pending; ++struct kbase_jd_atom *kbase_backend_inspect_tail(struct kbase_device *kbdev, ++ int js) ++{ ++ struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[js]; + -+ bool clients_present; -+}; ++ if (SLOT_RB_EMPTY(rb)) ++ return NULL; + -+/** -+ * struct kbase_vinstr_client - a vinstr client attached to a vinstr context -+ * @vinstr_ctx: vinstr context client is attached to -+ * @list: node used to attach this client to list in vinstr context -+ * @buffer_count: number of buffers this client is using -+ * @event_mask: events this client reacts to -+ * @dump_size: size of one dump buffer in bytes -+ * @bitmap: bitmap request for JM, TILER, SHADER and MMU counters -+ * @legacy_buffer: userspace hwcnt dump buffer (legacy interface) -+ * @kernel_buffer: kernel hwcnt dump buffer (kernel client interface) -+ * @accum_buffer: temporary accumulation buffer for preserving counters -+ * @dump_time: next time this clients shall request hwcnt dump -+ * @dump_interval: interval between periodic hwcnt dumps -+ * @dump_buffers: kernel hwcnt dump buffers allocated by this client -+ * @dump_buffers_meta: metadata of dump buffers -+ * @meta_idx: index of metadata being accessed by userspace -+ * @read_idx: index of buffer read by userspace -+ * @write_idx: index of buffer being written by dumping service -+ * @waitq: client's notification queue -+ * @pending: when true, client has attached but hwcnt not yet updated -+ */ -+struct kbase_vinstr_client { -+ struct kbase_vinstr_context *vinstr_ctx; -+ struct list_head list; -+ unsigned int buffer_count; -+ u32 event_mask; -+ size_t dump_size; -+ u32 bitmap[4]; -+ void __user *legacy_buffer; -+ void *kernel_buffer; -+ void *accum_buffer; -+ u64 dump_time; -+ u32 dump_interval; -+ char *dump_buffers; -+ struct kbase_hwcnt_reader_metadata *dump_buffers_meta; -+ atomic_t meta_idx; -+ atomic_t read_idx; -+ atomic_t write_idx; -+ wait_queue_head_t waitq; -+ bool pending; -+}; ++ return rb->entries[(rb->write_idx - 1) & SLOT_RB_MASK].katom; ++} + +/** -+ * struct kbasep_vinstr_wake_up_timer - vinstr service thread wake up timer -+ * @hrtimer: high resolution timer -+ * @vinstr_ctx: vinstr context ++ * kbase_gpu_atoms_submitted - Inspect whether a slot has any atoms currently ++ * on the GPU ++ * @kbdev: Device pointer ++ * @js: Job slot to inspect ++ * ++ * Return: true if there are atoms on the GPU for slot js, ++ * false otherwise + */ -+struct kbasep_vinstr_wake_up_timer { -+ struct hrtimer hrtimer; -+ struct kbase_vinstr_context *vinstr_ctx; -+}; -+ -+/*****************************************************************************/ -+ -+static int kbasep_vinstr_service_task(void *data); -+ -+static unsigned int kbasep_vinstr_hwcnt_reader_poll( -+ struct file *filp, -+ poll_table *wait); -+static long kbasep_vinstr_hwcnt_reader_ioctl( -+ struct file *filp, -+ unsigned int cmd, -+ unsigned long arg); -+static int kbasep_vinstr_hwcnt_reader_mmap( -+ struct file *filp, -+ struct vm_area_struct *vma); -+static int kbasep_vinstr_hwcnt_reader_release( -+ struct inode *inode, -+ struct file *filp); -+ -+/* The timeline stream file operations structure. */ -+static const struct file_operations vinstr_client_fops = { -+ .poll = kbasep_vinstr_hwcnt_reader_poll, -+ .unlocked_ioctl = kbasep_vinstr_hwcnt_reader_ioctl, -+ .compat_ioctl = kbasep_vinstr_hwcnt_reader_ioctl, -+ .mmap = kbasep_vinstr_hwcnt_reader_mmap, -+ .release = kbasep_vinstr_hwcnt_reader_release, -+}; -+ -+/*****************************************************************************/ -+ -+static int enable_hwcnt(struct kbase_vinstr_context *vinstr_ctx) ++static bool kbase_gpu_atoms_submitted(struct kbase_device *kbdev, int js) +{ -+ struct kbase_context *kctx = vinstr_ctx->kctx; -+ struct kbase_device *kbdev = kctx->kbdev; -+ struct kbase_uk_hwcnt_setup setup; -+ int err; -+ -+ setup.dump_buffer = vinstr_ctx->gpu_va; -+ setup.jm_bm = vinstr_ctx->bitmap[JM_HWCNT_BM]; -+ setup.tiler_bm = vinstr_ctx->bitmap[TILER_HWCNT_BM]; -+ setup.shader_bm = vinstr_ctx->bitmap[SHADER_HWCNT_BM]; -+ setup.mmu_l2_bm = vinstr_ctx->bitmap[MMU_L2_HWCNT_BM]; ++ int i; + -+ /* Mark the context as active so the GPU is kept turned on */ -+ /* A suspend won't happen here, because we're in a syscall from a -+ * userspace thread. */ -+ kbase_pm_context_active(kbdev); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ /* Schedule the context in */ -+ kbasep_js_schedule_privileged_ctx(kbdev, kctx); -+ err = kbase_instr_hwcnt_enable_internal(kbdev, kctx, &setup); -+ if (err) { -+ /* Release the context. This had its own Power Manager Active -+ * reference */ -+ kbasep_js_release_privileged_ctx(kbdev, kctx); ++ for (i = 0; i < SLOT_RB_SIZE; i++) { ++ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, i); + -+ /* Also release our Power Manager Active reference */ -+ kbase_pm_context_idle(kbdev); ++ if (!katom) ++ return false; ++ if (katom->gpu_rb_state == KBASE_ATOM_GPU_RB_SUBMITTED || ++ katom->gpu_rb_state == KBASE_ATOM_GPU_RB_READY) ++ return true; + } + -+ return err; ++ return false; +} + -+static void disable_hwcnt(struct kbase_vinstr_context *vinstr_ctx) ++/** ++ * kbase_gpu_atoms_submitted_any() - Inspect whether there are any atoms ++ * currently on the GPU ++ * @kbdev: Device pointer ++ * ++ * Return: true if there are any atoms on the GPU, false otherwise ++ */ ++static bool kbase_gpu_atoms_submitted_any(struct kbase_device *kbdev) +{ -+ struct kbase_context *kctx = vinstr_ctx->kctx; -+ struct kbase_device *kbdev = kctx->kbdev; -+ int err; -+ -+ err = kbase_instr_hwcnt_disable_internal(kctx); -+ if (err) { -+ dev_warn(kbdev->dev, "Failed to disable HW counters (ctx:%p)", -+ kctx); -+ return; -+ } ++ int js; ++ int i; + -+ /* Release the context. This had its own Power Manager Active reference. */ -+ kbasep_js_release_privileged_ctx(kbdev, kctx); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ /* Also release our Power Manager Active reference. */ -+ kbase_pm_context_idle(kbdev); ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { ++ for (i = 0; i < SLOT_RB_SIZE; i++) { ++ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, i); + -+ dev_dbg(kbdev->dev, "HW counters dumping disabled for context %p", kctx); ++ if (katom && katom->gpu_rb_state == KBASE_ATOM_GPU_RB_SUBMITTED) ++ return true; ++ } ++ } ++ return false; +} + -+static int reprogram_hwcnt(struct kbase_vinstr_context *vinstr_ctx) ++int kbase_backend_nr_atoms_submitted(struct kbase_device *kbdev, int js) +{ -+ disable_hwcnt(vinstr_ctx); -+ return enable_hwcnt(vinstr_ctx); -+} ++ int nr = 0; ++ int i; + -+static void hwcnt_bitmap_set(u32 dst[4], u32 src[4]) -+{ -+ dst[JM_HWCNT_BM] = src[JM_HWCNT_BM]; -+ dst[TILER_HWCNT_BM] = src[TILER_HWCNT_BM]; -+ dst[SHADER_HWCNT_BM] = src[SHADER_HWCNT_BM]; -+ dst[MMU_L2_HWCNT_BM] = src[MMU_L2_HWCNT_BM]; -+} ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+static void hwcnt_bitmap_union(u32 dst[4], u32 src[4]) -+{ -+ dst[JM_HWCNT_BM] |= src[JM_HWCNT_BM]; -+ dst[TILER_HWCNT_BM] |= src[TILER_HWCNT_BM]; -+ dst[SHADER_HWCNT_BM] |= src[SHADER_HWCNT_BM]; -+ dst[MMU_L2_HWCNT_BM] |= src[MMU_L2_HWCNT_BM]; ++ for (i = 0; i < SLOT_RB_SIZE; i++) { ++ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, i); ++ ++ if (katom && (katom->gpu_rb_state == ++ KBASE_ATOM_GPU_RB_SUBMITTED)) ++ nr++; ++ } ++ ++ return nr; +} + -+size_t kbase_vinstr_dump_size(struct kbase_device *kbdev) ++int kbase_backend_nr_atoms_on_slot(struct kbase_device *kbdev, int js) +{ -+ size_t dump_size; -+ -+#ifndef CONFIG_MALI_BIFROST_NO_MALI -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_V4)) { -+ u32 nr_cg; ++ int nr = 0; ++ int i; + -+ nr_cg = kbdev->gpu_props.num_core_groups; -+ dump_size = nr_cg * NR_CNT_BLOCKS_PER_GROUP * -+ NR_CNT_PER_BLOCK * -+ NR_BYTES_PER_CNT; -+ } else -+#endif /* CONFIG_MALI_BIFROST_NO_MALI */ -+ { -+ /* assume v5 for now */ -+ base_gpu_props *props = &kbdev->gpu_props.props; -+ u32 nr_l2 = props->l2_props.num_l2_slices; -+ u64 core_mask = props->coherency_info.group[0].core_mask; -+ u32 nr_blocks = fls64(core_mask); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ /* JM and tiler counter blocks are always present */ -+ dump_size = (2 + nr_l2 + nr_blocks) * -+ NR_CNT_PER_BLOCK * -+ NR_BYTES_PER_CNT; ++ for (i = 0; i < SLOT_RB_SIZE; i++) { ++ if (kbase_gpu_inspect(kbdev, js, i)) ++ nr++; + } -+ return dump_size; -+} -+KBASE_EXPORT_TEST_API(kbase_vinstr_dump_size); + -+static size_t kbasep_vinstr_dump_size_ctx( -+ struct kbase_vinstr_context *vinstr_ctx) -+{ -+ return kbase_vinstr_dump_size(vinstr_ctx->kctx->kbdev); ++ return nr; +} + -+static int kbasep_vinstr_map_kernel_dump_buffer( -+ struct kbase_vinstr_context *vinstr_ctx) ++static int kbase_gpu_nr_atoms_on_slot_min(struct kbase_device *kbdev, int js, ++ enum kbase_atom_gpu_rb_state min_rb_state) +{ -+ struct kbase_va_region *reg; -+ struct kbase_context *kctx = vinstr_ctx->kctx; -+ u64 flags, nr_pages; ++ int nr = 0; ++ int i; + -+ flags = BASE_MEM_PROT_CPU_RD | BASE_MEM_PROT_GPU_WR; -+ vinstr_ctx->dump_size = kbasep_vinstr_dump_size_ctx(vinstr_ctx); -+ nr_pages = PFN_UP(vinstr_ctx->dump_size); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ reg = kbase_mem_alloc(kctx, nr_pages, nr_pages, 0, &flags, -+ &vinstr_ctx->gpu_va); -+ if (!reg) -+ return -ENOMEM; ++ for (i = 0; i < SLOT_RB_SIZE; i++) { ++ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, i); + -+ vinstr_ctx->cpu_va = kbase_vmap( -+ kctx, -+ vinstr_ctx->gpu_va, -+ vinstr_ctx->dump_size, -+ &vinstr_ctx->vmap); -+ if (!vinstr_ctx->cpu_va) { -+ kbase_mem_free(kctx, vinstr_ctx->gpu_va); -+ return -ENOMEM; ++ if (katom && (katom->gpu_rb_state >= min_rb_state)) ++ nr++; + } + -+ return 0; ++ return nr; +} + -+static void kbasep_vinstr_unmap_kernel_dump_buffer( -+ struct kbase_vinstr_context *vinstr_ctx) ++/** ++ * check_secure_atom - Check if the given atom is in the given secure state and ++ * has a ringbuffer state of at least ++ * KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION ++ * @katom: Atom pointer ++ * @secure: Desired secure state ++ * ++ * Return: true if atom is in the given state, false otherwise ++ */ ++static bool check_secure_atom(struct kbase_jd_atom *katom, bool secure) +{ -+ struct kbase_context *kctx = vinstr_ctx->kctx; ++ if (katom->gpu_rb_state >= ++ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION && ++ ((kbase_jd_katom_is_protected(katom) && secure) || ++ (!kbase_jd_katom_is_protected(katom) && !secure))) ++ return true; + -+ kbase_vunmap(kctx, &vinstr_ctx->vmap); -+ kbase_mem_free(kctx, vinstr_ctx->gpu_va); ++ return false; +} + +/** -+ * kbasep_vinstr_create_kctx - create kernel context for vinstr -+ * @vinstr_ctx: vinstr context -+ * Return: zero on success ++ * kbase_gpu_check_secure_atoms - Check if there are any atoms in the given ++ * secure state in the ringbuffers of at least ++ * state ++ * KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE ++ * @kbdev: Device pointer ++ * @secure: Desired secure state ++ * ++ * Return: true if any atoms are in the given state, false otherwise + */ -+static int kbasep_vinstr_create_kctx(struct kbase_vinstr_context *vinstr_ctx) ++static bool kbase_gpu_check_secure_atoms(struct kbase_device *kbdev, ++ bool secure) +{ -+ struct kbase_device *kbdev = vinstr_ctx->kbdev; -+ struct kbasep_kctx_list_element *element = NULL; -+ unsigned long flags; -+ bool enable_backend = false; -+ int err; -+ -+ vinstr_ctx->kctx = kbase_create_context(vinstr_ctx->kbdev, true); -+ if (!vinstr_ctx->kctx) -+ return -ENOMEM; -+ -+ /* Map the master kernel dump buffer. The HW dumps the counters -+ * into this memory region. */ -+ err = kbasep_vinstr_map_kernel_dump_buffer(vinstr_ctx); -+ if (err) -+ goto failed_map; -+ -+ /* Add kernel context to list of contexts associated with device. */ -+ element = kzalloc(sizeof(*element), GFP_KERNEL); -+ if (element) { -+ element->kctx = vinstr_ctx->kctx; -+ mutex_lock(&kbdev->kctx_list_lock); -+ list_add(&element->link, &kbdev->kctx_list); ++ int js, i; + -+ /* Inform timeline client about new context. -+ * Do this while holding the lock to avoid tracepoint -+ * being created in both body and summary stream. */ -+ KBASE_TLSTREAM_TL_NEW_CTX( -+ vinstr_ctx->kctx, -+ vinstr_ctx->kctx->id, -+ (u32)(vinstr_ctx->kctx->tgid)); ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { ++ for (i = 0; i < SLOT_RB_SIZE; i++) { ++ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, ++ js, i); + -+ mutex_unlock(&kbdev->kctx_list_lock); -+ } else { -+ /* Don't treat this as a fail - just warn about it. */ -+ dev_warn(kbdev->dev, -+ "couldn't add kctx to kctx_list\n"); ++ if (katom) { ++ if (check_secure_atom(katom, secure)) ++ return true; ++ } ++ } + } + -+ /* Don't enable hardware counters if vinstr is suspended. -+ * Note that vinstr resume code is run under vinstr context lock, -+ * lower layer will be enabled as needed on resume. */ -+ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); -+ if (VINSTR_IDLE == vinstr_ctx->state) -+ enable_backend = true; -+ vinstr_ctx->clients_present = true; -+ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); -+ if (enable_backend) -+ err = enable_hwcnt(vinstr_ctx); -+ if (err) -+ goto failed_enable; ++ return false; ++} + -+ vinstr_ctx->thread = kthread_run( -+ kbasep_vinstr_service_task, -+ vinstr_ctx, -+ "mali_vinstr_service"); -+ if (IS_ERR(vinstr_ctx->thread)) { -+ err = PTR_ERR(vinstr_ctx->thread); -+ goto failed_kthread; ++int kbase_backend_slot_free(struct kbase_device *kbdev, int js) ++{ ++ if (atomic_read(&kbdev->hwaccess.backend.reset_gpu) != ++ KBASE_RESET_GPU_NOT_PENDING) { ++ /* The GPU is being reset - so prevent submission */ ++ return 0; + } + -+ return 0; -+ -+failed_kthread: -+ disable_hwcnt(vinstr_ctx); -+failed_enable: -+ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); -+ vinstr_ctx->clients_present = false; -+ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); -+ kbasep_vinstr_unmap_kernel_dump_buffer(vinstr_ctx); -+ if (element) { -+ mutex_lock(&kbdev->kctx_list_lock); -+ list_del(&element->link); -+ kfree(element); -+ mutex_unlock(&kbdev->kctx_list_lock); -+ KBASE_TLSTREAM_TL_DEL_CTX(vinstr_ctx->kctx); -+ } -+failed_map: -+ kbase_destroy_context(vinstr_ctx->kctx); -+ vinstr_ctx->kctx = NULL; -+ return err; ++ return SLOT_RB_SIZE - kbase_backend_nr_atoms_on_slot(kbdev, js); +} + -+/** -+ * kbasep_vinstr_destroy_kctx - destroy vinstr's kernel context -+ * @vinstr_ctx: vinstr context -+ */ -+static void kbasep_vinstr_destroy_kctx(struct kbase_vinstr_context *vinstr_ctx) -+{ -+ struct kbase_device *kbdev = vinstr_ctx->kbdev; -+ struct kbasep_kctx_list_element *element; -+ struct kbasep_kctx_list_element *tmp; -+ bool found = false; -+ unsigned long flags; + -+ /* Release hw counters dumping resources. */ -+ vinstr_ctx->thread = NULL; -+ disable_hwcnt(vinstr_ctx); -+ kbasep_vinstr_unmap_kernel_dump_buffer(vinstr_ctx); ++static void kbasep_js_job_check_deref_cores(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom); + -+ /* Simplify state transitions by specifying that we have no clients. */ -+ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); -+ vinstr_ctx->clients_present = false; -+ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); ++static bool kbasep_js_job_check_ref_cores(struct kbase_device *kbdev, ++ int js, ++ struct kbase_jd_atom *katom) ++{ ++ /* The most recently checked affinity. Having this at this scope allows ++ * us to guarantee that we've checked the affinity in this function ++ * call. ++ */ ++ u64 recently_chosen_affinity = 0; ++ bool chosen_affinity = false; ++ bool retry; + -+ /* Remove kernel context from the device's contexts list. */ -+ mutex_lock(&kbdev->kctx_list_lock); -+ list_for_each_entry_safe(element, tmp, &kbdev->kctx_list, link) { -+ if (element->kctx == vinstr_ctx->kctx) { -+ list_del(&element->link); -+ kfree(element); -+ found = true; -+ } -+ } -+ mutex_unlock(&kbdev->kctx_list_lock); ++ do { ++ retry = false; + -+ if (!found) -+ dev_warn(kbdev->dev, "kctx not in kctx_list\n"); ++ /* NOTE: The following uses a number of FALLTHROUGHs to optimize ++ * the calls to this function. Ending of the function is ++ * indicated by BREAK OUT */ ++ switch (katom->coreref_state) { ++ /* State when job is first attempted to be run */ ++ case KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED: ++ KBASE_DEBUG_ASSERT(katom->affinity == 0); + -+ /* Destroy context. */ -+ kbase_destroy_context(vinstr_ctx->kctx); ++ /* Compute affinity */ ++ if (false == kbase_js_choose_affinity( ++ &recently_chosen_affinity, kbdev, katom, ++ js)) { ++ /* No cores are currently available */ ++ /* *** BREAK OUT: No state transition *** */ ++ break; ++ } + -+ /* Inform timeline client about context destruction. */ -+ KBASE_TLSTREAM_TL_DEL_CTX(vinstr_ctx->kctx); ++ chosen_affinity = true; + -+ vinstr_ctx->kctx = NULL; -+} ++ /* Request the cores */ ++ kbase_pm_request_cores(kbdev, ++ katom->core_req & BASE_JD_REQ_T, ++ recently_chosen_affinity); + -+/** -+ * kbasep_vinstr_attach_client - Attach a client to the vinstr core -+ * @vinstr_ctx: vinstr context -+ * @buffer_count: requested number of dump buffers -+ * @bitmap: bitmaps describing which counters should be enabled -+ * @argp: pointer where notification descriptor shall be stored -+ * @kernel_buffer: pointer to kernel side buffer -+ * -+ * Return: vinstr opaque client handle or NULL on failure -+ */ -+static struct kbase_vinstr_client *kbasep_vinstr_attach_client( -+ struct kbase_vinstr_context *vinstr_ctx, u32 buffer_count, -+ u32 bitmap[4], void *argp, void *kernel_buffer) -+{ -+ struct task_struct *thread = NULL; -+ struct kbase_vinstr_client *cli; ++ katom->affinity = recently_chosen_affinity; + -+ KBASE_DEBUG_ASSERT(vinstr_ctx); ++ /* Proceed to next state */ ++ katom->coreref_state = ++ KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES; + -+ if (buffer_count > MAX_BUFFER_COUNT -+ || (buffer_count & (buffer_count - 1))) -+ return NULL; ++ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES: ++ { ++ enum kbase_pm_cores_ready cores_ready; + -+ cli = kzalloc(sizeof(*cli), GFP_KERNEL); -+ if (!cli) -+ return NULL; ++ KBASE_DEBUG_ASSERT(katom->affinity != 0 || ++ (katom->core_req & BASE_JD_REQ_T)); + -+ cli->vinstr_ctx = vinstr_ctx; -+ cli->buffer_count = buffer_count; -+ cli->event_mask = -+ (1 << BASE_HWCNT_READER_EVENT_MANUAL) | -+ (1 << BASE_HWCNT_READER_EVENT_PERIODIC); -+ cli->pending = true; ++ cores_ready = kbase_pm_register_inuse_cores( ++ kbdev, ++ katom->core_req & BASE_JD_REQ_T, ++ katom->affinity); ++ if (cores_ready == KBASE_NEW_AFFINITY) { ++ /* Affinity no longer valid - return to ++ * previous state */ ++ kbasep_js_job_check_deref_cores(kbdev, ++ katom); ++ KBASE_TRACE_ADD_SLOT_INFO(kbdev, ++ JS_CORE_REF_REGISTER_INUSE_FAILED, ++ katom->kctx, katom, ++ katom->jc, js, ++ (u32) katom->affinity); ++ /* *** BREAK OUT: Return to previous ++ * state, retry *** */ ++ retry = true; ++ break; ++ } ++ if (cores_ready == KBASE_CORES_NOT_READY) { ++ /* Stay in this state and return, to ++ * retry at this state later */ ++ KBASE_TRACE_ADD_SLOT_INFO(kbdev, ++ JS_CORE_REF_REGISTER_INUSE_FAILED, ++ katom->kctx, katom, ++ katom->jc, js, ++ (u32) katom->affinity); ++ /* *** BREAK OUT: No state transition ++ * *** */ ++ break; ++ } ++ /* Proceed to next state */ ++ katom->coreref_state = ++ KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY; ++ } + -+ hwcnt_bitmap_set(cli->bitmap, bitmap); ++ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY: ++ KBASE_DEBUG_ASSERT(katom->affinity != 0 || ++ (katom->core_req & BASE_JD_REQ_T)); + -+ mutex_lock(&vinstr_ctx->lock); ++ /* Optimize out choosing the affinity twice in the same ++ * function call */ ++ if (chosen_affinity == false) { ++ /* See if the affinity changed since a previous ++ * call. */ ++ if (false == kbase_js_choose_affinity( ++ &recently_chosen_affinity, ++ kbdev, katom, js)) { ++ /* No cores are currently available */ ++ kbasep_js_job_check_deref_cores(kbdev, ++ katom); ++ KBASE_TRACE_ADD_SLOT_INFO(kbdev, ++ JS_CORE_REF_REQUEST_ON_RECHECK_FAILED, ++ katom->kctx, katom, ++ katom->jc, js, ++ (u32) recently_chosen_affinity); ++ /* *** BREAK OUT: Transition to lower ++ * state *** */ ++ break; ++ } ++ chosen_affinity = true; ++ } + -+ hwcnt_bitmap_union(vinstr_ctx->bitmap, cli->bitmap); -+ vinstr_ctx->reprogram = true; ++ /* Now see if this requires a different set of cores */ ++ if (recently_chosen_affinity != katom->affinity) { ++ enum kbase_pm_cores_ready cores_ready; + -+ /* If this is the first client, create the vinstr kbase -+ * context. This context is permanently resident until the -+ * last client exits. */ -+ if (!vinstr_ctx->nclients) { -+ hwcnt_bitmap_set(vinstr_ctx->bitmap, cli->bitmap); -+ if (kbasep_vinstr_create_kctx(vinstr_ctx) < 0) -+ goto error; ++ kbase_pm_request_cores(kbdev, ++ katom->core_req & BASE_JD_REQ_T, ++ recently_chosen_affinity); + -+ vinstr_ctx->reprogram = false; -+ cli->pending = false; -+ } ++ /* Register new cores whilst we still hold the ++ * old ones, to minimize power transitions */ ++ cores_ready = ++ kbase_pm_register_inuse_cores(kbdev, ++ katom->core_req & BASE_JD_REQ_T, ++ recently_chosen_affinity); ++ kbasep_js_job_check_deref_cores(kbdev, katom); + -+ /* The GPU resets the counter block every time there is a request -+ * to dump it. We need a per client kernel buffer for accumulating -+ * the counters. */ -+ cli->dump_size = kbasep_vinstr_dump_size_ctx(vinstr_ctx); -+ cli->accum_buffer = kzalloc(cli->dump_size, GFP_KERNEL); -+ if (!cli->accum_buffer) -+ goto error; ++ /* Fixup the state that was reduced by ++ * deref_cores: */ ++ katom->coreref_state = ++ KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY; ++ katom->affinity = recently_chosen_affinity; ++ if (cores_ready == KBASE_NEW_AFFINITY) { ++ /* Affinity no longer valid - return to ++ * previous state */ ++ katom->coreref_state = ++ KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES; + -+ /* Prepare buffers. */ -+ if (cli->buffer_count) { -+ int *fd = (int *)argp; -+ size_t tmp; ++ kbasep_js_job_check_deref_cores(kbdev, ++ katom); + -+ /* Allocate area for buffers metadata storage. */ -+ tmp = sizeof(struct kbase_hwcnt_reader_metadata) * -+ cli->buffer_count; -+ cli->dump_buffers_meta = kmalloc(tmp, GFP_KERNEL); -+ if (!cli->dump_buffers_meta) -+ goto error; ++ KBASE_TRACE_ADD_SLOT_INFO(kbdev, ++ JS_CORE_REF_REGISTER_INUSE_FAILED, ++ katom->kctx, katom, ++ katom->jc, js, ++ (u32) katom->affinity); ++ /* *** BREAK OUT: Return to previous ++ * state, retry *** */ ++ retry = true; ++ break; ++ } ++ /* Now might be waiting for powerup again, with ++ * a new affinity */ ++ if (cores_ready == KBASE_CORES_NOT_READY) { ++ /* Return to previous state */ ++ katom->coreref_state = ++ KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES; ++ KBASE_TRACE_ADD_SLOT_INFO(kbdev, ++ JS_CORE_REF_REGISTER_ON_RECHECK_FAILED, ++ katom->kctx, katom, ++ katom->jc, js, ++ (u32) katom->affinity); ++ /* *** BREAK OUT: Transition to lower ++ * state *** */ ++ break; ++ } ++ } ++ /* Proceed to next state */ ++ katom->coreref_state = ++ KBASE_ATOM_COREREF_STATE_CHECK_AFFINITY_VIOLATIONS; + -+ /* Allocate required number of dumping buffers. */ -+ cli->dump_buffers = (char *)__get_free_pages( -+ GFP_KERNEL | __GFP_ZERO, -+ get_order(cli->dump_size * cli->buffer_count)); -+ if (!cli->dump_buffers) -+ goto error; ++ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_COREREF_STATE_CHECK_AFFINITY_VIOLATIONS: ++ KBASE_DEBUG_ASSERT(katom->affinity != 0 || ++ (katom->core_req & BASE_JD_REQ_T)); ++ KBASE_DEBUG_ASSERT(katom->affinity == ++ recently_chosen_affinity); + -+ /* Create descriptor for user-kernel data exchange. */ -+ *fd = anon_inode_getfd( -+ "[mali_vinstr_desc]", -+ &vinstr_client_fops, -+ cli, -+ O_RDONLY | O_CLOEXEC); -+ if (0 > *fd) -+ goto error; -+ } else if (kernel_buffer) { -+ cli->kernel_buffer = kernel_buffer; -+ } else { -+ cli->legacy_buffer = (void __user *)argp; -+ } ++ /* Note: this is where the caller must've taken the ++ * hwaccess_lock */ + -+ atomic_set(&cli->read_idx, 0); -+ atomic_set(&cli->meta_idx, 0); -+ atomic_set(&cli->write_idx, 0); -+ init_waitqueue_head(&cli->waitq); ++ /* Check for affinity violations - if there are any, ++ * then we just ask the caller to requeue and try again ++ * later */ ++ if (kbase_js_affinity_would_violate(kbdev, js, ++ katom->affinity) != false) { ++ /* Return to previous state */ ++ katom->coreref_state = ++ KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY; ++ /* *** BREAK OUT: Transition to lower state *** ++ */ ++ KBASE_TRACE_ADD_SLOT_INFO(kbdev, ++ JS_CORE_REF_AFFINITY_WOULD_VIOLATE, ++ katom->kctx, katom, katom->jc, js, ++ (u32) katom->affinity); ++ break; ++ } + -+ vinstr_ctx->nclients++; -+ list_add(&cli->list, &vinstr_ctx->idle_clients); ++ /* No affinity violations would result, so the cores are ++ * ready */ ++ katom->coreref_state = KBASE_ATOM_COREREF_STATE_READY; ++ /* *** BREAK OUT: Cores Ready *** */ ++ break; + -+ mutex_unlock(&vinstr_ctx->lock); ++ default: ++ KBASE_DEBUG_ASSERT_MSG(false, ++ "Unhandled kbase_atom_coreref_state %d", ++ katom->coreref_state); ++ break; ++ } ++ } while (retry != false); + -+ return cli; ++ return (katom->coreref_state == KBASE_ATOM_COREREF_STATE_READY); ++} + -+error: -+ kfree(cli->dump_buffers_meta); -+ if (cli->dump_buffers) -+ free_pages( -+ (unsigned long)cli->dump_buffers, -+ get_order(cli->dump_size * cli->buffer_count)); -+ kfree(cli->accum_buffer); -+ if (!vinstr_ctx->nclients && vinstr_ctx->kctx) { -+ thread = vinstr_ctx->thread; -+ kbasep_vinstr_destroy_kctx(vinstr_ctx); -+ } -+ kfree(cli); ++static void kbasep_js_job_check_deref_cores(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(katom != NULL); + -+ mutex_unlock(&vinstr_ctx->lock); ++ switch (katom->coreref_state) { ++ case KBASE_ATOM_COREREF_STATE_READY: ++ /* State where atom was submitted to the HW - just proceed to ++ * power-down */ ++ KBASE_DEBUG_ASSERT(katom->affinity != 0 || ++ (katom->core_req & BASE_JD_REQ_T)); + -+ /* Thread must be stopped after lock is released. */ -+ if (thread) -+ kthread_stop(thread); ++ /* fallthrough */ + -+ return NULL; -+} ++ case KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY: ++ /* State where cores were registered */ ++ KBASE_DEBUG_ASSERT(katom->affinity != 0 || ++ (katom->core_req & BASE_JD_REQ_T)); ++ kbase_pm_release_cores(kbdev, katom->core_req & BASE_JD_REQ_T, ++ katom->affinity); + -+void kbase_vinstr_detach_client(struct kbase_vinstr_client *cli) -+{ -+ struct kbase_vinstr_context *vinstr_ctx; -+ struct kbase_vinstr_client *iter, *tmp; -+ struct task_struct *thread = NULL; -+ u32 zerobitmap[4] = { 0 }; -+ int cli_found = 0; ++ break; + -+ KBASE_DEBUG_ASSERT(cli); -+ vinstr_ctx = cli->vinstr_ctx; -+ KBASE_DEBUG_ASSERT(vinstr_ctx); ++ case KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES: ++ /* State where cores were requested, but not registered */ ++ KBASE_DEBUG_ASSERT(katom->affinity != 0 || ++ (katom->core_req & BASE_JD_REQ_T)); ++ kbase_pm_unrequest_cores(kbdev, katom->core_req & BASE_JD_REQ_T, ++ katom->affinity); ++ break; + -+ mutex_lock(&vinstr_ctx->lock); ++ case KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED: ++ /* Initial state - nothing required */ ++ KBASE_DEBUG_ASSERT(katom->affinity == 0); ++ break; + -+ list_for_each_entry_safe(iter, tmp, &vinstr_ctx->idle_clients, list) { -+ if (iter == cli) { -+ vinstr_ctx->reprogram = true; -+ cli_found = 1; -+ list_del(&iter->list); -+ break; -+ } -+ } -+ if (!cli_found) { -+ list_for_each_entry_safe( -+ iter, tmp, &vinstr_ctx->waiting_clients, list) { -+ if (iter == cli) { -+ vinstr_ctx->reprogram = true; -+ cli_found = 1; -+ list_del(&iter->list); -+ break; -+ } -+ } ++ default: ++ KBASE_DEBUG_ASSERT_MSG(false, ++ "Unhandled coreref_state: %d", ++ katom->coreref_state); ++ break; + } -+ KBASE_DEBUG_ASSERT(cli_found); + -+ kfree(cli->dump_buffers_meta); -+ free_pages( -+ (unsigned long)cli->dump_buffers, -+ get_order(cli->dump_size * cli->buffer_count)); -+ kfree(cli->accum_buffer); -+ kfree(cli); ++ katom->affinity = 0; ++ katom->coreref_state = KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED; ++} + -+ vinstr_ctx->nclients--; -+ if (!vinstr_ctx->nclients) { -+ thread = vinstr_ctx->thread; -+ kbasep_vinstr_destroy_kctx(vinstr_ctx); -+ } ++static void kbasep_js_job_check_deref_cores_nokatom(struct kbase_device *kbdev, ++ base_jd_core_req core_req, u64 affinity, ++ enum kbase_atom_coreref_state coreref_state) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ /* Rebuild context bitmap now that the client has detached */ -+ hwcnt_bitmap_set(vinstr_ctx->bitmap, zerobitmap); -+ list_for_each_entry(iter, &vinstr_ctx->idle_clients, list) -+ hwcnt_bitmap_union(vinstr_ctx->bitmap, iter->bitmap); -+ list_for_each_entry(iter, &vinstr_ctx->waiting_clients, list) -+ hwcnt_bitmap_union(vinstr_ctx->bitmap, iter->bitmap); ++ switch (coreref_state) { ++ case KBASE_ATOM_COREREF_STATE_READY: ++ /* State where atom was submitted to the HW - just proceed to ++ * power-down */ ++ KBASE_DEBUG_ASSERT(affinity != 0 || ++ (core_req & BASE_JD_REQ_T)); + -+ mutex_unlock(&vinstr_ctx->lock); ++ /* fallthrough */ + -+ /* Thread must be stopped after lock is released. */ -+ if (thread) -+ kthread_stop(thread); -+} -+KBASE_EXPORT_TEST_API(kbase_vinstr_detach_client); ++ case KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY: ++ /* State where cores were registered */ ++ KBASE_DEBUG_ASSERT(affinity != 0 || ++ (core_req & BASE_JD_REQ_T)); ++ kbase_pm_release_cores(kbdev, core_req & BASE_JD_REQ_T, ++ affinity); + -+/* Accumulate counters in the dump buffer */ -+static void accum_dump_buffer(void *dst, void *src, size_t dump_size) -+{ -+ size_t block_size = NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT; -+ u32 *d = dst; -+ u32 *s = src; -+ size_t i, j; ++ break; + -+ for (i = 0; i < dump_size; i += block_size) { -+ /* skip over the header block */ -+ d += NR_BYTES_PER_HDR / sizeof(u32); -+ s += NR_BYTES_PER_HDR / sizeof(u32); -+ for (j = 0; j < (block_size - NR_BYTES_PER_HDR) / sizeof(u32); j++) { -+ /* saturate result if addition would result in wraparound */ -+ if (U32_MAX - *d < *s) -+ *d = U32_MAX; -+ else -+ *d += *s; -+ d++; -+ s++; -+ } ++ case KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES: ++ /* State where cores were requested, but not registered */ ++ KBASE_DEBUG_ASSERT(affinity != 0 || ++ (core_req & BASE_JD_REQ_T)); ++ kbase_pm_unrequest_cores(kbdev, core_req & BASE_JD_REQ_T, ++ affinity); ++ break; ++ ++ case KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED: ++ /* Initial state - nothing required */ ++ KBASE_DEBUG_ASSERT(affinity == 0); ++ break; ++ ++ default: ++ KBASE_DEBUG_ASSERT_MSG(false, ++ "Unhandled coreref_state: %d", ++ coreref_state); ++ break; + } +} + -+/* This is the Midgard v4 patch function. It copies the headers for each -+ * of the defined blocks from the master kernel buffer and then patches up -+ * the performance counter enable mask for each of the blocks to exclude -+ * counters that were not requested by the client. */ -+static void patch_dump_buffer_hdr_v4( -+ struct kbase_vinstr_context *vinstr_ctx, -+ struct kbase_vinstr_client *cli) ++static void kbase_gpu_release_atom(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom, ++ ktime_t *end_timestamp) +{ -+ u32 *mask; -+ u8 *dst = cli->accum_buffer; -+ u8 *src = vinstr_ctx->cpu_va; -+ u32 nr_cg = vinstr_ctx->kctx->kbdev->gpu_props.num_core_groups; -+ size_t i, group_size, group; -+ enum { -+ SC0_BASE = 0 * NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT, -+ SC1_BASE = 1 * NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT, -+ SC2_BASE = 2 * NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT, -+ SC3_BASE = 3 * NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT, -+ TILER_BASE = 4 * NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT, -+ MMU_L2_BASE = 5 * NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT, -+ JM_BASE = 7 * NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT -+ }; ++ struct kbase_context *kctx = katom->kctx; + -+ group_size = NR_CNT_BLOCKS_PER_GROUP * -+ NR_CNT_PER_BLOCK * -+ NR_BYTES_PER_CNT; -+ for (i = 0; i < nr_cg; i++) { -+ group = i * group_size; -+ /* copy shader core headers */ -+ memcpy(&dst[group + SC0_BASE], &src[group + SC0_BASE], -+ NR_BYTES_PER_HDR); -+ memcpy(&dst[group + SC1_BASE], &src[group + SC1_BASE], -+ NR_BYTES_PER_HDR); -+ memcpy(&dst[group + SC2_BASE], &src[group + SC2_BASE], -+ NR_BYTES_PER_HDR); -+ memcpy(&dst[group + SC3_BASE], &src[group + SC3_BASE], -+ NR_BYTES_PER_HDR); ++ switch (katom->gpu_rb_state) { ++ case KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB: ++ /* Should be impossible */ ++ WARN(1, "Attempting to release atom not in ringbuffer\n"); ++ break; + -+ /* copy tiler header */ -+ memcpy(&dst[group + TILER_BASE], &src[group + TILER_BASE], -+ NR_BYTES_PER_HDR); ++ case KBASE_ATOM_GPU_RB_SUBMITTED: ++ /* Inform power management at start/finish of atom so it can ++ * update its GPU utilisation metrics. Mark atom as not ++ * submitted beforehand. */ ++ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_READY; ++ kbase_pm_metrics_update(kbdev, end_timestamp); + -+ /* copy mmu header */ -+ memcpy(&dst[group + MMU_L2_BASE], &src[group + MMU_L2_BASE], -+ NR_BYTES_PER_HDR); ++ if (katom->core_req & BASE_JD_REQ_PERMON) ++ kbase_pm_release_gpu_cycle_counter_nolock(kbdev); ++ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ + -+ /* copy job manager header */ -+ memcpy(&dst[group + JM_BASE], &src[group + JM_BASE], -+ NR_BYTES_PER_HDR); ++ KBASE_TLSTREAM_TL_NRET_ATOM_LPU(katom, ++ &kbdev->gpu_props.props.raw_props.js_features ++ [katom->slot_nr]); ++ KBASE_TLSTREAM_TL_NRET_ATOM_AS(katom, &kbdev->as[kctx->as_nr]); ++ KBASE_TLSTREAM_TL_NRET_CTX_LPU(kctx, ++ &kbdev->gpu_props.props.raw_props.js_features ++ [katom->slot_nr]); ++ /* fallthrough */ ++ case KBASE_ATOM_GPU_RB_READY: ++ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_GPU_RB_WAITING_AFFINITY: ++ kbase_js_affinity_release_slot_cores(kbdev, katom->slot_nr, ++ katom->affinity); ++ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE: ++ break; + -+ /* patch the shader core enable mask */ -+ mask = (u32 *)&dst[group + SC0_BASE + PRFCNT_EN_MASK_OFFSET]; -+ *mask &= cli->bitmap[SHADER_HWCNT_BM]; -+ mask = (u32 *)&dst[group + SC1_BASE + PRFCNT_EN_MASK_OFFSET]; -+ *mask &= cli->bitmap[SHADER_HWCNT_BM]; -+ mask = (u32 *)&dst[group + SC2_BASE + PRFCNT_EN_MASK_OFFSET]; -+ *mask &= cli->bitmap[SHADER_HWCNT_BM]; -+ mask = (u32 *)&dst[group + SC3_BASE + PRFCNT_EN_MASK_OFFSET]; -+ *mask &= cli->bitmap[SHADER_HWCNT_BM]; ++ case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION: ++ if (katom->protected_state.enter != ++ KBASE_ATOM_ENTER_PROTECTED_CHECK || ++ katom->protected_state.exit != ++ KBASE_ATOM_EXIT_PROTECTED_CHECK) ++ kbdev->protected_mode_transition = false; + -+ /* patch the tiler core enable mask */ -+ mask = (u32 *)&dst[group + TILER_BASE + PRFCNT_EN_MASK_OFFSET]; -+ *mask &= cli->bitmap[TILER_HWCNT_BM]; ++ if (kbase_jd_katom_is_protected(katom) && ++ (katom->protected_state.enter == ++ KBASE_ATOM_ENTER_PROTECTED_IDLE_L2)) { ++ kbase_vinstr_resume(kbdev->vinstr_ctx); + -+ /* patch the mmu core enable mask */ -+ mask = (u32 *)&dst[group + MMU_L2_BASE + PRFCNT_EN_MASK_OFFSET]; -+ *mask &= cli->bitmap[MMU_L2_HWCNT_BM]; ++ /* Go back to configured model for IPA */ ++ kbase_ipa_model_use_configured_locked(kbdev); ++ } + -+ /* patch the job manager enable mask */ -+ mask = (u32 *)&dst[group + JM_BASE + PRFCNT_EN_MASK_OFFSET]; -+ *mask &= cli->bitmap[JM_HWCNT_BM]; ++ ++ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV: ++ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_GPU_RB_WAITING_BLOCKED: ++ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_GPU_RB_RETURN_TO_JS: ++ break; + } ++ ++ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_WAITING_BLOCKED; ++ katom->protected_state.exit = KBASE_ATOM_EXIT_PROTECTED_CHECK; +} + -+/* This is the Midgard v5 patch function. It copies the headers for each -+ * of the defined blocks from the master kernel buffer and then patches up -+ * the performance counter enable mask for each of the blocks to exclude -+ * counters that were not requested by the client. */ -+static void patch_dump_buffer_hdr_v5( -+ struct kbase_vinstr_context *vinstr_ctx, -+ struct kbase_vinstr_client *cli) ++static void kbase_gpu_mark_atom_for_return(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom) +{ -+ struct kbase_device *kbdev = vinstr_ctx->kctx->kbdev; -+ u32 i, nr_l2; -+ u64 core_mask; -+ u32 *mask; -+ u8 *dst = cli->accum_buffer; -+ u8 *src = vinstr_ctx->cpu_va; -+ size_t block_size = NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT; -+ -+ /* copy and patch job manager header */ -+ memcpy(dst, src, NR_BYTES_PER_HDR); -+ mask = (u32 *)&dst[PRFCNT_EN_MASK_OFFSET]; -+ *mask &= cli->bitmap[JM_HWCNT_BM]; -+ dst += block_size; -+ src += block_size; ++ kbase_gpu_release_atom(kbdev, katom, NULL); ++ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_RETURN_TO_JS; ++} + -+ /* copy and patch tiler header */ -+ memcpy(dst, src, NR_BYTES_PER_HDR); -+ mask = (u32 *)&dst[PRFCNT_EN_MASK_OFFSET]; -+ *mask &= cli->bitmap[TILER_HWCNT_BM]; -+ dst += block_size; -+ src += block_size; ++static inline bool kbase_gpu_rmu_workaround(struct kbase_device *kbdev, int js) ++{ ++ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; ++ bool slot_busy[3]; + -+ /* copy and patch MMU/L2C headers */ -+ nr_l2 = kbdev->gpu_props.props.l2_props.num_l2_slices; -+ for (i = 0; i < nr_l2; i++) { -+ memcpy(dst, src, NR_BYTES_PER_HDR); -+ mask = (u32 *)&dst[PRFCNT_EN_MASK_OFFSET]; -+ *mask &= cli->bitmap[MMU_L2_HWCNT_BM]; -+ dst += block_size; -+ src += block_size; -+ } ++ if (!kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987)) ++ return true; ++ slot_busy[0] = kbase_gpu_nr_atoms_on_slot_min(kbdev, 0, ++ KBASE_ATOM_GPU_RB_WAITING_AFFINITY); ++ slot_busy[1] = kbase_gpu_nr_atoms_on_slot_min(kbdev, 1, ++ KBASE_ATOM_GPU_RB_WAITING_AFFINITY); ++ slot_busy[2] = kbase_gpu_nr_atoms_on_slot_min(kbdev, 2, ++ KBASE_ATOM_GPU_RB_WAITING_AFFINITY); + -+ /* copy and patch shader core headers */ -+ core_mask = kbdev->gpu_props.props.coherency_info.group[0].core_mask; -+ while (0ull != core_mask) { -+ memcpy(dst, src, NR_BYTES_PER_HDR); -+ if (0ull != (core_mask & 1ull)) { -+ /* if block is not reserved update header */ -+ mask = (u32 *)&dst[PRFCNT_EN_MASK_OFFSET]; -+ *mask &= cli->bitmap[SHADER_HWCNT_BM]; -+ } -+ dst += block_size; -+ src += block_size; ++ if ((js == 2 && !(slot_busy[0] || slot_busy[1])) || ++ (js != 2 && !slot_busy[2])) ++ return true; + -+ core_mask >>= 1; -+ } -+} ++ /* Don't submit slot 2 atom while GPU has jobs on slots 0/1 */ ++ if (js == 2 && (kbase_gpu_atoms_submitted(kbdev, 0) || ++ kbase_gpu_atoms_submitted(kbdev, 1) || ++ backend->rmu_workaround_flag)) ++ return false; + -+/** -+ * accum_clients - accumulate dumped hw counters for all known clients -+ * @vinstr_ctx: vinstr context -+ */ -+static void accum_clients(struct kbase_vinstr_context *vinstr_ctx) -+{ -+ struct kbase_vinstr_client *iter; -+ int v4 = 0; ++ /* Don't submit slot 0/1 atom while GPU has jobs on slot 2 */ ++ if (js != 2 && (kbase_gpu_atoms_submitted(kbdev, 2) || ++ !backend->rmu_workaround_flag)) ++ return false; + -+#ifndef CONFIG_MALI_BIFROST_NO_MALI -+ v4 = kbase_hw_has_feature(vinstr_ctx->kbdev, BASE_HW_FEATURE_V4); -+#endif ++ backend->rmu_workaround_flag = !backend->rmu_workaround_flag; + -+ list_for_each_entry(iter, &vinstr_ctx->idle_clients, list) { -+ /* Don't bother accumulating clients whose hwcnt requests -+ * have not yet been honoured. */ -+ if (iter->pending) -+ continue; -+ if (v4) -+ patch_dump_buffer_hdr_v4(vinstr_ctx, iter); -+ else -+ patch_dump_buffer_hdr_v5(vinstr_ctx, iter); -+ accum_dump_buffer( -+ iter->accum_buffer, -+ vinstr_ctx->cpu_va, -+ iter->dump_size); -+ } -+ list_for_each_entry(iter, &vinstr_ctx->waiting_clients, list) { -+ /* Don't bother accumulating clients whose hwcnt requests -+ * have not yet been honoured. */ -+ if (iter->pending) -+ continue; -+ if (v4) -+ patch_dump_buffer_hdr_v4(vinstr_ctx, iter); -+ else -+ patch_dump_buffer_hdr_v5(vinstr_ctx, iter); -+ accum_dump_buffer( -+ iter->accum_buffer, -+ vinstr_ctx->cpu_va, -+ iter->dump_size); -+ } ++ return true; +} + -+/*****************************************************************************/ -+ +/** -+ * kbasep_vinstr_get_timestamp - return timestamp -+ * -+ * Function returns timestamp value based on raw monotonic timer. Value will -+ * wrap around zero in case of overflow. ++ * other_slots_busy - Determine if any job slots other than @js are currently ++ * running atoms ++ * @kbdev: Device pointer ++ * @js: Job slot + * -+ * Return: timestamp value ++ * Return: true if any slots other than @js are busy, false otherwise + */ -+static u64 kbasep_vinstr_get_timestamp(void) ++static inline bool other_slots_busy(struct kbase_device *kbdev, int js) +{ -+ struct timespec ts; ++ int slot; + -+ getrawmonotonic(&ts); -+ return (u64)ts.tv_sec * NSECS_IN_SEC + ts.tv_nsec; ++ for (slot = 0; slot < kbdev->gpu_props.num_job_slots; slot++) { ++ if (slot == js) ++ continue; ++ ++ if (kbase_gpu_nr_atoms_on_slot_min(kbdev, slot, ++ KBASE_ATOM_GPU_RB_SUBMITTED)) ++ return true; ++ } ++ ++ return false; +} + -+/** -+ * kbasep_vinstr_add_dump_request - register client's dumping request -+ * @cli: requesting client -+ * @waiting_clients: list of pending dumping requests -+ */ -+static void kbasep_vinstr_add_dump_request( -+ struct kbase_vinstr_client *cli, -+ struct list_head *waiting_clients) ++static inline bool kbase_gpu_in_protected_mode(struct kbase_device *kbdev) +{ -+ struct kbase_vinstr_client *tmp; -+ -+ if (list_empty(waiting_clients)) { -+ list_add(&cli->list, waiting_clients); -+ return; -+ } -+ list_for_each_entry(tmp, waiting_clients, list) { -+ if (tmp->dump_time > cli->dump_time) { -+ list_add_tail(&cli->list, &tmp->list); -+ return; -+ } -+ } -+ list_add_tail(&cli->list, waiting_clients); ++ return kbdev->protected_mode; +} + -+/** -+ * kbasep_vinstr_collect_and_accumulate - collect hw counters via low level -+ * dump and accumulate them for known -+ * clients -+ * @vinstr_ctx: vinstr context -+ * @timestamp: pointer where collection timestamp will be recorded -+ * -+ * Return: zero on success -+ */ -+static int kbasep_vinstr_collect_and_accumulate( -+ struct kbase_vinstr_context *vinstr_ctx, u64 *timestamp) ++static int kbase_gpu_protected_mode_enter(struct kbase_device *kbdev) +{ -+ unsigned long flags; -+ int rcode; ++ int err = -EINVAL; + -+#ifdef CONFIG_MALI_BIFROST_NO_MALI -+ /* The dummy model needs the CPU mapping. */ -+ gpu_model_set_dummy_prfcnt_base_cpu(vinstr_ctx->cpu_va); -+#endif ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); -+ if (VINSTR_IDLE != vinstr_ctx->state) { -+ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); -+ return -EAGAIN; -+ } else { -+ vinstr_ctx->state = VINSTR_DUMPING; -+ } -+ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); ++ WARN_ONCE(!kbdev->protected_ops, ++ "Cannot enter protected mode: protected callbacks not specified.\n"); + -+ /* Request HW counters dump. -+ * Disable preemption to make dump timestamp more accurate. */ -+ preempt_disable(); -+ *timestamp = kbasep_vinstr_get_timestamp(); -+ rcode = kbase_instr_hwcnt_request_dump(vinstr_ctx->kctx); -+ preempt_enable(); ++ /* ++ * When entering into protected mode, we must ensure that the ++ * GPU is not operating in coherent mode as well. This is to ++ * ensure that no protected memory can be leaked. ++ */ ++ if (kbdev->system_coherency == COHERENCY_ACE) ++ kbase_cache_set_coherency_mode(kbdev, COHERENCY_ACE_LITE); + -+ if (!rcode) -+ rcode = kbase_instr_hwcnt_wait_for_dump(vinstr_ctx->kctx); -+ WARN_ON(rcode); ++ if (kbdev->protected_ops) { ++ /* Switch GPU to protected mode */ ++ err = kbdev->protected_ops->protected_mode_enable( ++ kbdev->protected_dev); + -+ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); -+ switch (vinstr_ctx->state) -+ { -+ case VINSTR_SUSPENDING: -+ schedule_work(&vinstr_ctx->suspend_work); -+ break; -+ case VINSTR_DUMPING: -+ vinstr_ctx->state = VINSTR_IDLE; -+ wake_up_all(&vinstr_ctx->suspend_waitq); -+ break; -+ default: -+ break; ++ if (err) ++ dev_warn(kbdev->dev, "Failed to enable protected mode: %d\n", ++ err); ++ else ++ kbdev->protected_mode = true; + } -+ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); -+ -+ /* Accumulate values of collected counters. */ -+ if (!rcode) -+ accum_clients(vinstr_ctx); + -+ return rcode; ++ return err; +} + -+/** -+ * kbasep_vinstr_fill_dump_buffer - copy accumulated counters to empty kernel -+ * buffer -+ * @cli: requesting client -+ * @timestamp: timestamp when counters were collected -+ * @event_id: id of event that caused triggered counters collection -+ * -+ * Return: zero on success -+ */ -+static int kbasep_vinstr_fill_dump_buffer( -+ struct kbase_vinstr_client *cli, u64 timestamp, -+ enum base_hwcnt_reader_event event_id) ++static int kbase_gpu_protected_mode_reset(struct kbase_device *kbdev) +{ -+ unsigned int write_idx = atomic_read(&cli->write_idx); -+ unsigned int read_idx = atomic_read(&cli->read_idx); -+ -+ struct kbase_hwcnt_reader_metadata *meta; -+ void *buffer; ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ /* Check if there is a place to copy HWC block into. */ -+ if (write_idx - read_idx == cli->buffer_count) -+ return -1; -+ write_idx %= cli->buffer_count; ++ WARN_ONCE(!kbdev->protected_ops, ++ "Cannot exit protected mode: protected callbacks not specified.\n"); + -+ /* Fill in dump buffer and its metadata. */ -+ buffer = &cli->dump_buffers[write_idx * cli->dump_size]; -+ meta = &cli->dump_buffers_meta[write_idx]; -+ meta->timestamp = timestamp; -+ meta->event_id = event_id; -+ meta->buffer_idx = write_idx; -+ memcpy(buffer, cli->accum_buffer, cli->dump_size); -+ return 0; -+} ++ if (!kbdev->protected_ops) ++ return -EINVAL; + -+/** -+ * kbasep_vinstr_fill_dump_buffer_legacy - copy accumulated counters to buffer -+ * allocated in userspace -+ * @cli: requesting client -+ * -+ * Return: zero on success -+ * -+ * This is part of legacy ioctl interface. -+ */ -+static int kbasep_vinstr_fill_dump_buffer_legacy( -+ struct kbase_vinstr_client *cli) -+{ -+ void __user *buffer = cli->legacy_buffer; -+ int rcode; ++ /* The protected mode disable callback will be called as part of reset ++ */ ++ kbase_reset_gpu_silent(kbdev); + -+ /* Copy data to user buffer. */ -+ rcode = copy_to_user(buffer, cli->accum_buffer, cli->dump_size); -+ if (rcode) { -+ pr_warn("error while copying buffer to user\n"); -+ return -EFAULT; -+ } + return 0; +} + -+/** -+ * kbasep_vinstr_fill_dump_buffer_kernel - copy accumulated counters to buffer -+ * allocated in kernel space -+ * @cli: requesting client -+ * -+ * Return: zero on success -+ * -+ * This is part of the kernel client interface. -+ */ -+static int kbasep_vinstr_fill_dump_buffer_kernel( -+ struct kbase_vinstr_client *cli) ++static int kbase_jm_enter_protected_mode(struct kbase_device *kbdev, ++ struct kbase_jd_atom **katom, int idx, int js) +{ -+ memcpy(cli->kernel_buffer, cli->accum_buffer, cli->dump_size); ++ int err = 0; + -+ return 0; -+} ++ switch (katom[idx]->protected_state.enter) { ++ case KBASE_ATOM_ENTER_PROTECTED_CHECK: ++ KBASE_TLSTREAM_AUX_PROTECTED_ENTER_START(kbdev); ++ /* The checks in KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV ++ * should ensure that we are not already transitiong, and that ++ * there are no atoms currently on the GPU. */ ++ WARN_ON(kbdev->protected_mode_transition); ++ WARN_ON(kbase_gpu_atoms_submitted_any(kbdev)); + -+/** -+ * kbasep_vinstr_reprogram - reprogram hwcnt set collected by inst -+ * @vinstr_ctx: vinstr context -+ */ -+static void kbasep_vinstr_reprogram( -+ struct kbase_vinstr_context *vinstr_ctx) -+{ -+ unsigned long flags; -+ bool suspended = false; ++ kbdev->protected_mode_transition = true; ++ katom[idx]->protected_state.enter = ++ KBASE_ATOM_ENTER_PROTECTED_VINSTR; + -+ /* Don't enable hardware counters if vinstr is suspended. */ -+ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); -+ if (VINSTR_IDLE != vinstr_ctx->state) -+ suspended = true; -+ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); -+ if (suspended) -+ return; ++ /* ***TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_ENTER_PROTECTED_VINSTR: ++ if (kbase_vinstr_try_suspend(kbdev->vinstr_ctx) < 0) { ++ /* ++ * We can't switch now because ++ * the vinstr core state switch ++ * is not done yet. ++ */ ++ return -EAGAIN; ++ } + -+ /* Change to suspended state is done while holding vinstr context -+ * lock. Below code will then no re-enable the instrumentation. */ ++ /* Use generic model for IPA in protected mode */ ++ kbase_ipa_model_use_fallback_locked(kbdev); + -+ if (vinstr_ctx->reprogram) { -+ struct kbase_vinstr_client *iter; ++ /* Once reaching this point GPU must be ++ * switched to protected mode or vinstr ++ * re-enabled. */ + -+ if (!reprogram_hwcnt(vinstr_ctx)) { -+ vinstr_ctx->reprogram = false; -+ list_for_each_entry( -+ iter, -+ &vinstr_ctx->idle_clients, -+ list) -+ iter->pending = false; -+ list_for_each_entry( -+ iter, -+ &vinstr_ctx->waiting_clients, -+ list) -+ iter->pending = false; -+ } -+ } -+} -+ -+/** -+ * kbasep_vinstr_update_client - copy accumulated counters to user readable -+ * buffer and notify the user -+ * @cli: requesting client -+ * @timestamp: timestamp when counters were collected -+ * @event_id: id of event that caused triggered counters collection -+ * -+ * Return: zero on success -+ */ -+static int kbasep_vinstr_update_client( -+ struct kbase_vinstr_client *cli, u64 timestamp, -+ enum base_hwcnt_reader_event event_id) -+{ -+ int rcode = 0; ++ /* ++ * Not in correct mode, begin protected mode switch. ++ * Entering protected mode requires us to power down the L2, ++ * and drop out of fully coherent mode. ++ */ ++ katom[idx]->protected_state.enter = ++ KBASE_ATOM_ENTER_PROTECTED_IDLE_L2; + -+ /* Copy collected counters to user readable buffer. */ -+ if (cli->buffer_count) -+ rcode = kbasep_vinstr_fill_dump_buffer( -+ cli, timestamp, event_id); -+ else if (cli->kernel_buffer) -+ rcode = kbasep_vinstr_fill_dump_buffer_kernel(cli); -+ else -+ rcode = kbasep_vinstr_fill_dump_buffer_legacy(cli); ++ kbase_pm_update_cores_state_nolock(kbdev); + -+ if (rcode) -+ goto exit; ++ /* ***TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_ENTER_PROTECTED_IDLE_L2: ++ /* Avoid unnecessary waiting on non-ACE platforms. */ ++ if (kbdev->current_gpu_coherency_mode == COHERENCY_ACE) { ++ if (kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_L2) || ++ kbase_pm_get_trans_cores(kbdev, KBASE_PM_CORE_L2)) { ++ /* ++ * The L2 is still powered, wait for all the users to ++ * finish with it before doing the actual reset. ++ */ ++ return -EAGAIN; ++ } ++ } + ++ katom[idx]->protected_state.enter = ++ KBASE_ATOM_ENTER_PROTECTED_FINISHED; + -+ /* Notify client. Make sure all changes to memory are visible. */ -+ wmb(); -+ atomic_inc(&cli->write_idx); -+ wake_up_interruptible(&cli->waitq); ++ /* ***TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_ENTER_PROTECTED_FINISHED: + -+ /* Prepare for next request. */ -+ memset(cli->accum_buffer, 0, cli->dump_size); ++ /* No jobs running, so we can switch GPU mode right now. */ ++ err = kbase_gpu_protected_mode_enter(kbdev); + -+exit: -+ return rcode; -+} ++ /* ++ * Regardless of result, we are no longer transitioning ++ * the GPU. ++ */ ++ kbdev->protected_mode_transition = false; ++ KBASE_TLSTREAM_AUX_PROTECTED_ENTER_END(kbdev); ++ if (err) { ++ /* ++ * Failed to switch into protected mode, resume ++ * vinstr core and fail atom. ++ */ ++ kbase_vinstr_resume(kbdev->vinstr_ctx); ++ katom[idx]->event_code = BASE_JD_EVENT_JOB_INVALID; ++ kbase_gpu_mark_atom_for_return(kbdev, katom[idx]); ++ /* Only return if head atom or previous atom ++ * already removed - as atoms must be returned ++ * in order. */ ++ if (idx == 0 || katom[0]->gpu_rb_state == ++ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { ++ kbase_gpu_dequeue_atom(kbdev, js, NULL); ++ kbase_jm_return_atom_to_js(kbdev, katom[idx]); ++ } + -+/** -+ * kbasep_vinstr_wake_up_callback - vinstr wake up timer wake up function -+ * -+ * @hrtimer: high resolution timer -+ * -+ * Return: High resolution timer restart enum. -+ */ -+static enum hrtimer_restart kbasep_vinstr_wake_up_callback( -+ struct hrtimer *hrtimer) -+{ -+ struct kbasep_vinstr_wake_up_timer *timer = -+ container_of( -+ hrtimer, -+ struct kbasep_vinstr_wake_up_timer, -+ hrtimer); ++ /* Go back to configured model for IPA */ ++ kbase_ipa_model_use_configured_locked(kbdev); + -+ KBASE_DEBUG_ASSERT(timer); ++ return -EINVAL; ++ } + -+ atomic_set(&timer->vinstr_ctx->request_pending, 1); -+ wake_up_all(&timer->vinstr_ctx->waitq); ++ /* Protected mode sanity checks. */ ++ KBASE_DEBUG_ASSERT_MSG( ++ kbase_jd_katom_is_protected(katom[idx]) == ++ kbase_gpu_in_protected_mode(kbdev), ++ "Protected mode of atom (%d) doesn't match protected mode of GPU (%d)", ++ kbase_jd_katom_is_protected(katom[idx]), ++ kbase_gpu_in_protected_mode(kbdev)); ++ katom[idx]->gpu_rb_state = ++ KBASE_ATOM_GPU_RB_READY; ++ } + -+ return HRTIMER_NORESTART; ++ return 0; +} + -+/** -+ * kbasep_vinstr_service_task - HWC dumping service thread -+ * -+ * @data: Pointer to vinstr context structure. -+ * -+ * Return: 0 on success; -ENOMEM if timer allocation fails -+ */ -+static int kbasep_vinstr_service_task(void *data) ++static int kbase_jm_exit_protected_mode(struct kbase_device *kbdev, ++ struct kbase_jd_atom **katom, int idx, int js) +{ -+ struct kbase_vinstr_context *vinstr_ctx = data; -+ struct kbasep_vinstr_wake_up_timer *timer; -+ -+ KBASE_DEBUG_ASSERT(vinstr_ctx); -+ -+ timer = kmalloc(sizeof(*timer), GFP_KERNEL); -+ -+ if (!timer) { -+ dev_warn(vinstr_ctx->kbdev->dev, "Timer allocation failed!\n"); -+ return -ENOMEM; -+ } -+ -+ hrtimer_init(&timer->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); -+ -+ timer->hrtimer.function = kbasep_vinstr_wake_up_callback; -+ timer->vinstr_ctx = vinstr_ctx; -+ -+ while (!kthread_should_stop()) { -+ struct kbase_vinstr_client *cli = NULL; -+ struct kbase_vinstr_client *tmp; -+ int rcode; -+ -+ u64 timestamp = kbasep_vinstr_get_timestamp(); -+ u64 dump_time = 0; -+ struct list_head expired_requests; -+ -+ /* Hold lock while performing operations on lists of clients. */ -+ mutex_lock(&vinstr_ctx->lock); ++ int err = 0; + -+ /* Closing thread must not interact with client requests. */ -+ if (current == vinstr_ctx->thread) { -+ atomic_set(&vinstr_ctx->request_pending, 0); + -+ if (!list_empty(&vinstr_ctx->waiting_clients)) { -+ cli = list_first_entry( -+ &vinstr_ctx->waiting_clients, -+ struct kbase_vinstr_client, -+ list); -+ dump_time = cli->dump_time; -+ } -+ } ++ switch (katom[idx]->protected_state.exit) { ++ case KBASE_ATOM_EXIT_PROTECTED_CHECK: ++ KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_START(kbdev); ++ /* The checks in KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV ++ * should ensure that we are not already transitiong, and that ++ * there are no atoms currently on the GPU. */ ++ WARN_ON(kbdev->protected_mode_transition); ++ WARN_ON(kbase_gpu_atoms_submitted_any(kbdev)); + -+ if (!cli || ((s64)timestamp - (s64)dump_time < 0ll)) { -+ mutex_unlock(&vinstr_ctx->lock); ++ /* ++ * Exiting protected mode requires a reset, but first the L2 ++ * needs to be powered down to ensure it's not active when the ++ * reset is issued. ++ */ ++ katom[idx]->protected_state.exit = ++ KBASE_ATOM_EXIT_PROTECTED_IDLE_L2; + -+ /* Sleep until next dumping event or service request. */ -+ if (cli) { -+ u64 diff = dump_time - timestamp; ++ kbdev->protected_mode_transition = true; ++ kbase_pm_update_cores_state_nolock(kbdev); + -+ hrtimer_start( -+ &timer->hrtimer, -+ ns_to_ktime(diff), -+ HRTIMER_MODE_REL); -+ } -+ wait_event( -+ vinstr_ctx->waitq, -+ atomic_read( -+ &vinstr_ctx->request_pending) || -+ kthread_should_stop()); -+ hrtimer_cancel(&timer->hrtimer); -+ continue; ++ /* ***TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_EXIT_PROTECTED_IDLE_L2: ++ if (kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_L2) || ++ kbase_pm_get_trans_cores(kbdev, KBASE_PM_CORE_L2)) { ++ /* ++ * The L2 is still powered, wait for all the users to ++ * finish with it before doing the actual reset. ++ */ ++ return -EAGAIN; + } ++ katom[idx]->protected_state.exit = ++ KBASE_ATOM_EXIT_PROTECTED_RESET; + -+ rcode = kbasep_vinstr_collect_and_accumulate(vinstr_ctx, -+ ×tamp); ++ /* ***TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_EXIT_PROTECTED_RESET: ++ /* Issue the reset to the GPU */ ++ err = kbase_gpu_protected_mode_reset(kbdev); + -+ INIT_LIST_HEAD(&expired_requests); ++ if (err) { ++ kbdev->protected_mode_transition = false; + -+ /* Find all expired requests. */ -+ list_for_each_entry_safe( -+ cli, -+ tmp, -+ &vinstr_ctx->waiting_clients, -+ list) { -+ s64 tdiff = -+ (s64)(timestamp + DUMPING_RESOLUTION) - -+ (s64)cli->dump_time; -+ if (tdiff >= 0ll) { -+ list_del(&cli->list); -+ list_add(&cli->list, &expired_requests); -+ } else { -+ break; ++ /* Failed to exit protected mode, fail atom */ ++ katom[idx]->event_code = BASE_JD_EVENT_JOB_INVALID; ++ kbase_gpu_mark_atom_for_return(kbdev, katom[idx]); ++ /* Only return if head atom or previous atom ++ * already removed - as atoms must be returned ++ * in order */ ++ if (idx == 0 || katom[0]->gpu_rb_state == ++ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { ++ kbase_gpu_dequeue_atom(kbdev, js, NULL); ++ kbase_jm_return_atom_to_js(kbdev, katom[idx]); + } -+ } -+ -+ /* Fill data for each request found. */ -+ list_for_each_entry_safe(cli, tmp, &expired_requests, list) { -+ /* Ensure that legacy buffer will not be used from -+ * this kthread context. */ -+ BUG_ON(0 == cli->buffer_count); -+ /* Expect only periodically sampled clients. */ -+ BUG_ON(0 == cli->dump_interval); + -+ if (!rcode) -+ kbasep_vinstr_update_client( -+ cli, -+ timestamp, -+ BASE_HWCNT_READER_EVENT_PERIODIC); ++ kbase_vinstr_resume(kbdev->vinstr_ctx); + -+ /* Set new dumping time. Drop missed probing times. */ -+ do { -+ cli->dump_time += cli->dump_interval; -+ } while (cli->dump_time < timestamp); ++ /* Use generic model for IPA in protected mode */ ++ kbase_ipa_model_use_fallback_locked(kbdev); + -+ list_del(&cli->list); -+ kbasep_vinstr_add_dump_request( -+ cli, -+ &vinstr_ctx->waiting_clients); ++ return -EINVAL; + } + -+ /* Reprogram counters set if required. */ -+ kbasep_vinstr_reprogram(vinstr_ctx); ++ katom[idx]->protected_state.exit = ++ KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT; + -+ mutex_unlock(&vinstr_ctx->lock); ++ /* ***TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT: ++ /* A GPU reset is issued when exiting protected mode. Once the ++ * reset is done all atoms' state will also be reset. For this ++ * reason, if the atom is still in this state we can safely ++ * say that the reset has not completed i.e., we have not ++ * finished exiting protected mode yet. ++ */ ++ return -EAGAIN; + } + -+ kfree(timer); -+ + return 0; +} + -+/*****************************************************************************/ -+ -+/** -+ * kbasep_vinstr_hwcnt_reader_buffer_ready - check if client has ready buffers -+ * @cli: pointer to vinstr client structure -+ * -+ * Return: non-zero if client has at least one dumping buffer filled that was -+ * not notified to user yet -+ */ -+static int kbasep_vinstr_hwcnt_reader_buffer_ready( -+ struct kbase_vinstr_client *cli) ++void kbase_backend_slot_update(struct kbase_device *kbdev) +{ -+ KBASE_DEBUG_ASSERT(cli); -+ return atomic_read(&cli->write_idx) != atomic_read(&cli->meta_idx); -+} ++ int js; + -+/** -+ * kbasep_vinstr_hwcnt_reader_ioctl_get_buffer - hwcnt reader's ioctl command -+ * @cli: pointer to vinstr client structure -+ * @buffer: pointer to userspace buffer -+ * @size: size of buffer -+ * -+ * Return: zero on success -+ */ -+static long kbasep_vinstr_hwcnt_reader_ioctl_get_buffer( -+ struct kbase_vinstr_client *cli, void __user *buffer, -+ size_t size) -+{ -+ unsigned int meta_idx = atomic_read(&cli->meta_idx); -+ unsigned int idx = meta_idx % cli->buffer_count; ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ struct kbase_hwcnt_reader_metadata *meta = &cli->dump_buffers_meta[idx]; ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { ++ struct kbase_jd_atom *katom[2]; ++ int idx; + -+ /* Metadata sanity check. */ -+ KBASE_DEBUG_ASSERT(idx == meta->buffer_idx); ++ katom[0] = kbase_gpu_inspect(kbdev, js, 0); ++ katom[1] = kbase_gpu_inspect(kbdev, js, 1); ++ WARN_ON(katom[1] && !katom[0]); + -+ if (sizeof(struct kbase_hwcnt_reader_metadata) != size) -+ return -EINVAL; ++ for (idx = 0; idx < SLOT_RB_SIZE; idx++) { ++ bool cores_ready; ++ int ret; + -+ /* Check if there is any buffer available. */ -+ if (atomic_read(&cli->write_idx) == meta_idx) -+ return -EAGAIN; ++ if (!katom[idx]) ++ continue; + -+ /* Check if previously taken buffer was put back. */ -+ if (atomic_read(&cli->read_idx) != meta_idx) -+ return -EBUSY; ++ switch (katom[idx]->gpu_rb_state) { ++ case KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB: ++ /* Should be impossible */ ++ WARN(1, "Attempting to update atom not in ringbuffer\n"); ++ break; + -+ /* Copy next available buffer's metadata to user. */ -+ if (copy_to_user(buffer, meta, size)) -+ return -EFAULT; ++ case KBASE_ATOM_GPU_RB_WAITING_BLOCKED: ++ if (katom[idx]->atom_flags & ++ KBASE_KATOM_FLAG_X_DEP_BLOCKED) ++ break; + -+ atomic_inc(&cli->meta_idx); ++ katom[idx]->gpu_rb_state = ++ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV; + -+ return 0; -+} ++ /* ***TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV: ++ if (kbase_gpu_check_secure_atoms(kbdev, ++ !kbase_jd_katom_is_protected( ++ katom[idx]))) ++ break; + -+/** -+ * kbasep_vinstr_hwcnt_reader_ioctl_put_buffer - hwcnt reader's ioctl command -+ * @cli: pointer to vinstr client structure -+ * @buffer: pointer to userspace buffer -+ * @size: size of buffer -+ * -+ * Return: zero on success -+ */ -+static long kbasep_vinstr_hwcnt_reader_ioctl_put_buffer( -+ struct kbase_vinstr_client *cli, void __user *buffer, -+ size_t size) -+{ -+ unsigned int read_idx = atomic_read(&cli->read_idx); -+ unsigned int idx = read_idx % cli->buffer_count; ++ if ((idx == 1) && (kbase_jd_katom_is_protected( ++ katom[0]) != ++ kbase_jd_katom_is_protected( ++ katom[1]))) ++ break; + -+ struct kbase_hwcnt_reader_metadata meta; ++ if (kbdev->protected_mode_transition) ++ break; + -+ if (sizeof(struct kbase_hwcnt_reader_metadata) != size) -+ return -EINVAL; ++ katom[idx]->gpu_rb_state = ++ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION; + -+ /* Check if any buffer was taken. */ -+ if (atomic_read(&cli->meta_idx) == read_idx) -+ return -EPERM; ++ /* ***TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION: + -+ /* Check if correct buffer is put back. */ -+ if (copy_from_user(&meta, buffer, size)) -+ return -EFAULT; -+ if (idx != meta.buffer_idx) -+ return -EINVAL; ++ /* ++ * Exiting protected mode must be done before ++ * the references on the cores are taken as ++ * a power down the L2 is required which ++ * can't happen after the references for this ++ * atom are taken. ++ */ + -+ atomic_inc(&cli->read_idx); ++ if (!kbase_gpu_in_protected_mode(kbdev) && ++ kbase_jd_katom_is_protected(katom[idx])) { ++ /* Atom needs to transition into protected mode. */ ++ ret = kbase_jm_enter_protected_mode(kbdev, ++ katom, idx, js); ++ if (ret) ++ break; ++ } else if (kbase_gpu_in_protected_mode(kbdev) && ++ !kbase_jd_katom_is_protected(katom[idx])) { ++ /* Atom needs to transition out of protected mode. */ ++ ret = kbase_jm_exit_protected_mode(kbdev, ++ katom, idx, js); ++ if (ret) ++ break; ++ } ++ katom[idx]->protected_state.exit = ++ KBASE_ATOM_EXIT_PROTECTED_CHECK; + -+ return 0; -+} ++ /* Atom needs no protected mode transition. */ + -+/** -+ * kbasep_vinstr_hwcnt_reader_ioctl_set_interval - hwcnt reader's ioctl command -+ * @cli: pointer to vinstr client structure -+ * @interval: periodic dumping interval (disable periodic dumping if zero) -+ * -+ * Return: zero on success -+ */ -+static long kbasep_vinstr_hwcnt_reader_ioctl_set_interval( -+ struct kbase_vinstr_client *cli, u32 interval) -+{ -+ struct kbase_vinstr_context *vinstr_ctx = cli->vinstr_ctx; ++ katom[idx]->gpu_rb_state = ++ KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE; + -+ KBASE_DEBUG_ASSERT(vinstr_ctx); ++ /* ***TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE: ++ if (katom[idx]->will_fail_event_code) { ++ kbase_gpu_mark_atom_for_return(kbdev, ++ katom[idx]); ++ /* Set EVENT_DONE so this atom will be ++ completed, not unpulled. */ ++ katom[idx]->event_code = ++ BASE_JD_EVENT_DONE; ++ /* Only return if head atom or previous ++ * atom already removed - as atoms must ++ * be returned in order. */ ++ if (idx == 0 || katom[0]->gpu_rb_state == ++ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { ++ kbase_gpu_dequeue_atom(kbdev, js, NULL); ++ kbase_jm_return_atom_to_js(kbdev, katom[idx]); ++ } ++ break; ++ } + -+ mutex_lock(&vinstr_ctx->lock); ++ cores_ready = ++ kbasep_js_job_check_ref_cores(kbdev, js, ++ katom[idx]); + -+ list_del(&cli->list); ++ if (katom[idx]->event_code == ++ BASE_JD_EVENT_PM_EVENT) { ++ katom[idx]->gpu_rb_state = ++ KBASE_ATOM_GPU_RB_RETURN_TO_JS; ++ break; ++ } + -+ cli->dump_interval = interval; ++ if (!cores_ready) ++ break; + -+ /* If interval is non-zero, enable periodic dumping for this client. */ -+ if (cli->dump_interval) { -+ if (DUMPING_RESOLUTION > cli->dump_interval) -+ cli->dump_interval = DUMPING_RESOLUTION; -+ cli->dump_time = -+ kbasep_vinstr_get_timestamp() + cli->dump_interval; ++ kbase_js_affinity_retain_slot_cores(kbdev, js, ++ katom[idx]->affinity); ++ katom[idx]->gpu_rb_state = ++ KBASE_ATOM_GPU_RB_WAITING_AFFINITY; + -+ kbasep_vinstr_add_dump_request( -+ cli, &vinstr_ctx->waiting_clients); ++ /* ***TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_GPU_RB_WAITING_AFFINITY: ++ if (!kbase_gpu_rmu_workaround(kbdev, js)) ++ break; + -+ atomic_set(&vinstr_ctx->request_pending, 1); -+ wake_up_all(&vinstr_ctx->waitq); -+ } else { -+ list_add(&cli->list, &vinstr_ctx->idle_clients); -+ } ++ katom[idx]->gpu_rb_state = ++ KBASE_ATOM_GPU_RB_READY; + -+ mutex_unlock(&vinstr_ctx->lock); ++ /* ***TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_GPU_RB_READY: + -+ return 0; -+} ++ if (idx == 1) { ++ /* Only submit if head atom or previous ++ * atom already submitted */ ++ if ((katom[0]->gpu_rb_state != ++ KBASE_ATOM_GPU_RB_SUBMITTED && ++ katom[0]->gpu_rb_state != ++ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB)) ++ break; + -+/** -+ * kbasep_vinstr_hwcnt_reader_event_mask - return event mask for event id -+ * @event_id: id of event -+ * Return: event_mask or zero if event is not supported or maskable -+ */ -+static u32 kbasep_vinstr_hwcnt_reader_event_mask( -+ enum base_hwcnt_reader_event event_id) -+{ -+ u32 event_mask = 0; ++ /* If intra-slot serialization in use ++ * then don't submit atom to NEXT slot ++ */ ++ if (kbdev->serialize_jobs & ++ KBASE_SERIALIZE_INTRA_SLOT) ++ break; ++ } + -+ switch (event_id) { -+ case BASE_HWCNT_READER_EVENT_PREJOB: -+ case BASE_HWCNT_READER_EVENT_POSTJOB: -+ /* These event are maskable. */ -+ event_mask = (1 << event_id); -+ break; ++ /* If inter-slot serialization in use then don't ++ * submit atom if any other slots are in use */ ++ if ((kbdev->serialize_jobs & ++ KBASE_SERIALIZE_INTER_SLOT) && ++ other_slots_busy(kbdev, js)) ++ break; + -+ case BASE_HWCNT_READER_EVENT_MANUAL: -+ case BASE_HWCNT_READER_EVENT_PERIODIC: -+ /* These event are non-maskable. */ -+ default: -+ /* These event are not supported. */ -+ break; -+ } ++ if ((kbdev->serialize_jobs & ++ KBASE_SERIALIZE_RESET) && ++ kbase_reset_gpu_active(kbdev)) ++ break; + -+ return event_mask; -+} ++ /* Check if this job needs the cycle counter ++ * enabled before submission */ ++ if (katom[idx]->core_req & BASE_JD_REQ_PERMON) ++ kbase_pm_request_gpu_cycle_counter_l2_is_on( ++ kbdev); + -+/** -+ * kbasep_vinstr_hwcnt_reader_ioctl_enable_event - hwcnt reader's ioctl command -+ * @cli: pointer to vinstr client structure -+ * @event_id: id of event to enable -+ * -+ * Return: zero on success -+ */ -+static long kbasep_vinstr_hwcnt_reader_ioctl_enable_event( -+ struct kbase_vinstr_client *cli, -+ enum base_hwcnt_reader_event event_id) -+{ -+ struct kbase_vinstr_context *vinstr_ctx = cli->vinstr_ctx; -+ u32 event_mask; ++ kbase_job_hw_submit(kbdev, katom[idx], js); ++ katom[idx]->gpu_rb_state = ++ KBASE_ATOM_GPU_RB_SUBMITTED; + -+ KBASE_DEBUG_ASSERT(vinstr_ctx); ++ /* Inform power management at start/finish of ++ * atom so it can update its GPU utilisation ++ * metrics. */ ++ kbase_pm_metrics_update(kbdev, ++ &katom[idx]->start_timestamp); + -+ event_mask = kbasep_vinstr_hwcnt_reader_event_mask(event_id); -+ if (!event_mask) -+ return -EINVAL; ++ /* ***TRANSITION TO HIGHER STATE*** */ ++ /* fallthrough */ ++ case KBASE_ATOM_GPU_RB_SUBMITTED: ++ /* Atom submitted to HW, nothing else to do */ ++ break; + -+ mutex_lock(&vinstr_ctx->lock); -+ cli->event_mask |= event_mask; -+ mutex_unlock(&vinstr_ctx->lock); ++ case KBASE_ATOM_GPU_RB_RETURN_TO_JS: ++ /* Only return if head atom or previous atom ++ * already removed - as atoms must be returned ++ * in order */ ++ if (idx == 0 || katom[0]->gpu_rb_state == ++ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { ++ kbase_gpu_dequeue_atom(kbdev, js, NULL); ++ kbase_jm_return_atom_to_js(kbdev, ++ katom[idx]); ++ } ++ break; ++ } ++ } ++ } + -+ return 0; ++ /* Warn if PRLAM-8987 affinity restrictions are violated */ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987)) ++ WARN_ON((kbase_gpu_atoms_submitted(kbdev, 0) || ++ kbase_gpu_atoms_submitted(kbdev, 1)) && ++ kbase_gpu_atoms_submitted(kbdev, 2)); +} + -+/** -+ * kbasep_vinstr_hwcnt_reader_ioctl_disable_event - hwcnt reader's ioctl command -+ * @cli: pointer to vinstr client structure -+ * @event_id: id of event to disable -+ * -+ * Return: zero on success -+ */ -+static long kbasep_vinstr_hwcnt_reader_ioctl_disable_event( -+ struct kbase_vinstr_client *cli, -+ enum base_hwcnt_reader_event event_id) ++ ++void kbase_backend_run_atom(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom) +{ -+ struct kbase_vinstr_context *vinstr_ctx = cli->vinstr_ctx; -+ u32 event_mask; ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ kbase_gpu_enqueue_atom(kbdev, katom); ++ kbase_backend_slot_update(kbdev); ++} + -+ KBASE_DEBUG_ASSERT(vinstr_ctx); ++#define HAS_DEP(katom) (katom->pre_dep || katom->atom_flags & \ ++ (KBASE_KATOM_FLAG_X_DEP_BLOCKED | KBASE_KATOM_FLAG_FAIL_BLOCKER)) + -+ event_mask = kbasep_vinstr_hwcnt_reader_event_mask(event_id); -+ if (!event_mask) -+ return -EINVAL; ++bool kbase_gpu_irq_evict(struct kbase_device *kbdev, int js) ++{ ++ struct kbase_jd_atom *katom; ++ struct kbase_jd_atom *next_katom; + -+ mutex_lock(&vinstr_ctx->lock); -+ cli->event_mask &= ~event_mask; -+ mutex_unlock(&vinstr_ctx->lock); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ return 0; -+} ++ katom = kbase_gpu_inspect(kbdev, js, 0); ++ next_katom = kbase_gpu_inspect(kbdev, js, 1); + -+/** -+ * kbasep_vinstr_hwcnt_reader_ioctl_get_hwver - hwcnt reader's ioctl command -+ * @cli: pointer to vinstr client structure -+ * @hwver: pointer to user buffer where hw version will be stored -+ * -+ * Return: zero on success -+ */ -+static long kbasep_vinstr_hwcnt_reader_ioctl_get_hwver( -+ struct kbase_vinstr_client *cli, u32 __user *hwver) -+{ -+#ifndef CONFIG_MALI_BIFROST_NO_MALI -+ struct kbase_vinstr_context *vinstr_ctx = cli->vinstr_ctx; -+#endif ++ if (next_katom && katom->kctx == next_katom->kctx && ++ next_katom->gpu_rb_state == KBASE_ATOM_GPU_RB_SUBMITTED && ++ HAS_DEP(next_katom) && ++ (kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_LO), NULL) ++ != 0 || ++ kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_HI), NULL) ++ != 0)) { ++ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_COMMAND_NEXT), ++ JS_COMMAND_NOP, NULL); ++ next_katom->gpu_rb_state = KBASE_ATOM_GPU_RB_READY; + -+ u32 ver = 5; ++ KBASE_TLSTREAM_TL_NRET_ATOM_LPU(katom, ++ &kbdev->gpu_props.props.raw_props.js_features ++ [katom->slot_nr]); ++ KBASE_TLSTREAM_TL_NRET_ATOM_AS(katom, &kbdev->as ++ [katom->kctx->as_nr]); ++ KBASE_TLSTREAM_TL_NRET_CTX_LPU(katom->kctx, ++ &kbdev->gpu_props.props.raw_props.js_features ++ [katom->slot_nr]); + -+#ifndef CONFIG_MALI_BIFROST_NO_MALI -+ KBASE_DEBUG_ASSERT(vinstr_ctx); -+ if (kbase_hw_has_feature(vinstr_ctx->kbdev, BASE_HW_FEATURE_V4)) -+ ver = 4; -+#endif ++ return true; ++ } + -+ return put_user(ver, hwver); ++ return false; +} + -+/** -+ * kbasep_vinstr_hwcnt_reader_ioctl - hwcnt reader's ioctl -+ * @filp: pointer to file structure -+ * @cmd: user command -+ * @arg: command's argument -+ * -+ * Return: zero on success -+ */ -+static long kbasep_vinstr_hwcnt_reader_ioctl(struct file *filp, -+ unsigned int cmd, unsigned long arg) ++void kbase_gpu_complete_hw(struct kbase_device *kbdev, int js, ++ u32 completion_code, ++ u64 job_tail, ++ ktime_t *end_timestamp) +{ -+ long rcode = 0; -+ struct kbase_vinstr_client *cli; -+ -+ KBASE_DEBUG_ASSERT(filp); -+ -+ cli = filp->private_data; -+ KBASE_DEBUG_ASSERT(cli); ++ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, 0); ++ struct kbase_context *kctx = katom->kctx; + -+ if (unlikely(KBASE_HWCNT_READER != _IOC_TYPE(cmd))) -+ return -EINVAL; ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ switch (cmd) { -+ case KBASE_HWCNT_READER_GET_API_VERSION: -+ rcode = put_user(HWCNT_READER_API, (u32 __user *)arg); -+ break; -+ case KBASE_HWCNT_READER_GET_HWVER: -+ rcode = kbasep_vinstr_hwcnt_reader_ioctl_get_hwver( -+ cli, (u32 __user *)arg); -+ break; -+ case KBASE_HWCNT_READER_GET_BUFFER_SIZE: -+ KBASE_DEBUG_ASSERT(cli->vinstr_ctx); -+ rcode = put_user( -+ (u32)cli->vinstr_ctx->dump_size, -+ (u32 __user *)arg); -+ break; -+ case KBASE_HWCNT_READER_DUMP: -+ rcode = kbase_vinstr_hwc_dump( -+ cli, BASE_HWCNT_READER_EVENT_MANUAL); -+ break; -+ case KBASE_HWCNT_READER_CLEAR: -+ rcode = kbase_vinstr_hwc_clear(cli); -+ break; -+ case KBASE_HWCNT_READER_GET_BUFFER: -+ rcode = kbasep_vinstr_hwcnt_reader_ioctl_get_buffer( -+ cli, (void __user *)arg, _IOC_SIZE(cmd)); -+ break; -+ case KBASE_HWCNT_READER_PUT_BUFFER: -+ rcode = kbasep_vinstr_hwcnt_reader_ioctl_put_buffer( -+ cli, (void __user *)arg, _IOC_SIZE(cmd)); -+ break; -+ case KBASE_HWCNT_READER_SET_INTERVAL: -+ rcode = kbasep_vinstr_hwcnt_reader_ioctl_set_interval( -+ cli, (u32)arg); -+ break; -+ case KBASE_HWCNT_READER_ENABLE_EVENT: -+ rcode = kbasep_vinstr_hwcnt_reader_ioctl_enable_event( -+ cli, (enum base_hwcnt_reader_event)arg); -+ break; -+ case KBASE_HWCNT_READER_DISABLE_EVENT: -+ rcode = kbasep_vinstr_hwcnt_reader_ioctl_disable_event( -+ cli, (enum base_hwcnt_reader_event)arg); -+ break; -+ default: -+ rcode = -EINVAL; -+ break; ++ /* ++ * When a hard-stop is followed close after a soft-stop, the completion ++ * code may be set to STOPPED, even though the job is terminated ++ */ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TMIX_8438)) { ++ if (completion_code == BASE_JD_EVENT_STOPPED && ++ (katom->atom_flags & ++ KBASE_KATOM_FLAG_BEEN_HARD_STOPPED)) { ++ completion_code = BASE_JD_EVENT_TERMINATED; ++ } + } + -+ return rcode; -+} -+ -+/** -+ * kbasep_vinstr_hwcnt_reader_poll - hwcnt reader's poll -+ * @filp: pointer to file structure -+ * @wait: pointer to poll table -+ * Return: POLLIN if data can be read without blocking, otherwise zero -+ */ -+static unsigned int kbasep_vinstr_hwcnt_reader_poll(struct file *filp, -+ poll_table *wait) -+{ -+ struct kbase_vinstr_client *cli; -+ -+ KBASE_DEBUG_ASSERT(filp); -+ KBASE_DEBUG_ASSERT(wait); ++ if ((kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_6787) || (katom->core_req & ++ BASE_JD_REQ_SKIP_CACHE_END)) && ++ completion_code != BASE_JD_EVENT_DONE && ++ !(completion_code & BASE_JD_SW_EVENT)) { ++ /* When a job chain fails, on a T60x or when ++ * BASE_JD_REQ_SKIP_CACHE_END is set, the GPU cache is not ++ * flushed. To prevent future evictions causing possible memory ++ * corruption we need to flush the cache manually before any ++ * affected memory gets reused. */ ++ katom->need_cache_flush_cores_retained = katom->affinity; ++ kbase_pm_request_cores(kbdev, false, katom->affinity); ++ } else if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10676)) { ++ if (kbdev->gpu_props.num_core_groups > 1 && ++ !(katom->affinity & ++ kbdev->gpu_props.props.coherency_info.group[0].core_mask ++ ) && ++ (katom->affinity & ++ kbdev->gpu_props.props.coherency_info.group[1].core_mask ++ )) { ++ dev_info(kbdev->dev, "JD: Flushing cache due to PRLAM-10676\n"); ++ katom->need_cache_flush_cores_retained = ++ katom->affinity; ++ kbase_pm_request_cores(kbdev, false, ++ katom->affinity); ++ } ++ } + -+ cli = filp->private_data; -+ KBASE_DEBUG_ASSERT(cli); ++ katom = kbase_gpu_dequeue_atom(kbdev, js, end_timestamp); ++ kbase_timeline_job_slot_done(kbdev, katom->kctx, katom, js, 0); + -+ poll_wait(filp, &cli->waitq, wait); -+ if (kbasep_vinstr_hwcnt_reader_buffer_ready(cli)) -+ return POLLIN; -+ return 0; -+} ++ if (completion_code == BASE_JD_EVENT_STOPPED) { ++ struct kbase_jd_atom *next_katom = kbase_gpu_inspect(kbdev, js, ++ 0); + -+/** -+ * kbasep_vinstr_hwcnt_reader_mmap - hwcnt reader's mmap -+ * @filp: pointer to file structure -+ * @vma: pointer to vma structure -+ * Return: zero on success -+ */ -+static int kbasep_vinstr_hwcnt_reader_mmap(struct file *filp, -+ struct vm_area_struct *vma) -+{ -+ struct kbase_vinstr_client *cli; -+ unsigned long size, addr, pfn, offset; -+ unsigned long vm_size = vma->vm_end - vma->vm_start; ++ /* ++ * Dequeue next atom from ringbuffers on same slot if required. ++ * This atom will already have been removed from the NEXT ++ * registers by kbase_gpu_soft_hard_stop_slot(), to ensure that ++ * the atoms on this slot are returned in the correct order. ++ */ ++ if (next_katom && katom->kctx == next_katom->kctx && ++ next_katom->sched_priority == ++ katom->sched_priority) { ++ kbase_gpu_dequeue_atom(kbdev, js, end_timestamp); ++ kbase_jm_return_atom_to_js(kbdev, next_katom); ++ } ++ } else if (completion_code != BASE_JD_EVENT_DONE) { ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ int i; + -+ KBASE_DEBUG_ASSERT(filp); -+ KBASE_DEBUG_ASSERT(vma); ++#if KBASE_TRACE_DUMP_ON_JOB_SLOT_ERROR != 0 ++ KBASE_TRACE_DUMP(kbdev); ++#endif ++ kbasep_js_clear_submit_allowed(js_devdata, katom->kctx); + -+ cli = filp->private_data; -+ KBASE_DEBUG_ASSERT(cli); ++ /* ++ * Remove all atoms on the same context from ringbuffers. This ++ * will not remove atoms that are already on the GPU, as these ++ * are guaranteed not to have fail dependencies on the failed ++ * atom. ++ */ ++ for (i = 0; i < kbdev->gpu_props.num_job_slots; i++) { ++ struct kbase_jd_atom *katom_idx0 = ++ kbase_gpu_inspect(kbdev, i, 0); ++ struct kbase_jd_atom *katom_idx1 = ++ kbase_gpu_inspect(kbdev, i, 1); + -+ size = cli->buffer_count * cli->dump_size; ++ if (katom_idx0 && katom_idx0->kctx == katom->kctx && ++ HAS_DEP(katom_idx0) && ++ katom_idx0->gpu_rb_state != ++ KBASE_ATOM_GPU_RB_SUBMITTED) { ++ /* Dequeue katom_idx0 from ringbuffer */ ++ kbase_gpu_dequeue_atom(kbdev, i, end_timestamp); + -+ if (vma->vm_pgoff > (size >> PAGE_SHIFT)) -+ return -EINVAL; ++ if (katom_idx1 && ++ katom_idx1->kctx == katom->kctx ++ && HAS_DEP(katom_idx1) && ++ katom_idx0->gpu_rb_state != ++ KBASE_ATOM_GPU_RB_SUBMITTED) { ++ /* Dequeue katom_idx1 from ringbuffer */ ++ kbase_gpu_dequeue_atom(kbdev, i, ++ end_timestamp); + -+ offset = vma->vm_pgoff << PAGE_SHIFT; -+ if (vm_size > size - offset) -+ return -EINVAL; ++ katom_idx1->event_code = ++ BASE_JD_EVENT_STOPPED; ++ kbase_jm_return_atom_to_js(kbdev, ++ katom_idx1); ++ } ++ katom_idx0->event_code = BASE_JD_EVENT_STOPPED; ++ kbase_jm_return_atom_to_js(kbdev, katom_idx0); + -+ addr = __pa((unsigned long)cli->dump_buffers + offset); -+ pfn = addr >> PAGE_SHIFT; ++ } else if (katom_idx1 && ++ katom_idx1->kctx == katom->kctx && ++ HAS_DEP(katom_idx1) && ++ katom_idx1->gpu_rb_state != ++ KBASE_ATOM_GPU_RB_SUBMITTED) { ++ /* Can not dequeue this atom yet - will be ++ * dequeued when atom at idx0 completes */ ++ katom_idx1->event_code = BASE_JD_EVENT_STOPPED; ++ kbase_gpu_mark_atom_for_return(kbdev, ++ katom_idx1); ++ } ++ } ++ } + -+ return remap_pfn_range( -+ vma, -+ vma->vm_start, -+ pfn, -+ vm_size, -+ vma->vm_page_prot); -+} ++ KBASE_TRACE_ADD_SLOT_INFO(kbdev, JM_JOB_DONE, kctx, katom, katom->jc, ++ js, completion_code); + -+/** -+ * kbasep_vinstr_hwcnt_reader_release - hwcnt reader's release -+ * @inode: pointer to inode structure -+ * @filp: pointer to file structure -+ * Return always return zero -+ */ -+static int kbasep_vinstr_hwcnt_reader_release(struct inode *inode, -+ struct file *filp) -+{ -+ struct kbase_vinstr_client *cli; ++ if (job_tail != 0 && job_tail != katom->jc) { ++ bool was_updated = (job_tail != katom->jc); + -+ KBASE_DEBUG_ASSERT(inode); -+ KBASE_DEBUG_ASSERT(filp); ++ /* Some of the job has been executed, so we update the job chain ++ * address to where we should resume from */ ++ katom->jc = job_tail; ++ if (was_updated) ++ KBASE_TRACE_ADD_SLOT(kbdev, JM_UPDATE_HEAD, katom->kctx, ++ katom, job_tail, js); ++ } + -+ cli = filp->private_data; -+ KBASE_DEBUG_ASSERT(cli); ++ /* Only update the event code for jobs that weren't cancelled */ ++ if (katom->event_code != BASE_JD_EVENT_JOB_CANCELLED) ++ katom->event_code = (base_jd_event_code)completion_code; + -+ kbase_vinstr_detach_client(cli); -+ return 0; -+} ++ kbase_device_trace_register_access(kctx, REG_WRITE, ++ JOB_CONTROL_REG(JOB_IRQ_CLEAR), ++ 1 << js); + -+/*****************************************************************************/ ++ /* Complete the job, and start new ones ++ * ++ * Also defer remaining work onto the workqueue: ++ * - Re-queue Soft-stopped jobs ++ * - For any other jobs, queue the job back into the dependency system ++ * - Schedule out the parent context if necessary, and schedule a new ++ * one in. ++ */ ++#ifdef CONFIG_GPU_TRACEPOINTS ++ { ++ /* The atom in the HEAD */ ++ struct kbase_jd_atom *next_katom = kbase_gpu_inspect(kbdev, js, ++ 0); + -+/** -+ * kbasep_vinstr_kick_scheduler - trigger scheduler cycle -+ * @kbdev: pointer to kbase device structure -+ */ -+static void kbasep_vinstr_kick_scheduler(struct kbase_device *kbdev) -+{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ unsigned long flags; ++ if (next_katom && next_katom->gpu_rb_state == ++ KBASE_ATOM_GPU_RB_SUBMITTED) { ++ char js_string[16]; + -+ down(&js_devdata->schedule_sem); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_backend_slot_update(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ up(&js_devdata->schedule_sem); -+} ++ trace_gpu_sched_switch(kbasep_make_job_slot_string(js, ++ js_string, ++ sizeof(js_string)), ++ ktime_to_ns(*end_timestamp), ++ (u32)next_katom->kctx->id, 0, ++ next_katom->work_id); ++ kbdev->hwaccess.backend.slot_rb[js].last_context = ++ next_katom->kctx; ++ } else { ++ char js_string[16]; + -+/** -+ * kbasep_vinstr_suspend_worker - worker suspending vinstr module -+ * @data: pointer to work structure -+ */ -+static void kbasep_vinstr_suspend_worker(struct work_struct *data) -+{ -+ struct kbase_vinstr_context *vinstr_ctx; -+ unsigned long flags; ++ trace_gpu_sched_switch(kbasep_make_job_slot_string(js, ++ js_string, ++ sizeof(js_string)), ++ ktime_to_ns(ktime_get()), 0, 0, ++ 0); ++ kbdev->hwaccess.backend.slot_rb[js].last_context = 0; ++ } ++ } ++#endif + -+ vinstr_ctx = container_of(data, struct kbase_vinstr_context, -+ suspend_work); ++ if (kbdev->serialize_jobs & KBASE_SERIALIZE_RESET) ++ kbase_reset_gpu_silent(kbdev); + -+ mutex_lock(&vinstr_ctx->lock); ++ if (completion_code == BASE_JD_EVENT_STOPPED) ++ katom = kbase_jm_return_atom_to_js(kbdev, katom); ++ else ++ katom = kbase_jm_complete(kbdev, katom, end_timestamp); + -+ if (vinstr_ctx->kctx) -+ disable_hwcnt(vinstr_ctx); ++ if (katom) { ++ /* Cross-slot dependency has now become runnable. Try to submit ++ * it. */ + -+ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); -+ vinstr_ctx->state = VINSTR_SUSPENDED; -+ wake_up_all(&vinstr_ctx->suspend_waitq); -+ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); ++ /* Check if there are lower priority jobs to soft stop */ ++ kbase_job_slot_ctx_priority_check_locked(kctx, katom); + -+ mutex_unlock(&vinstr_ctx->lock); ++ kbase_jm_try_kick(kbdev, 1 << katom->slot_nr); ++ } + -+ /* Kick GPU scheduler to allow entering protected mode. -+ * This must happen after vinstr was suspended. */ -+ kbasep_vinstr_kick_scheduler(vinstr_ctx->kbdev); ++ /* Job completion may have unblocked other atoms. Try to update all job ++ * slots */ ++ kbase_backend_slot_update(kbdev); +} + -+/** -+ * kbasep_vinstr_suspend_worker - worker resuming vinstr module -+ * @data: pointer to work structure -+ */ -+static void kbasep_vinstr_resume_worker(struct work_struct *data) ++void kbase_backend_reset(struct kbase_device *kbdev, ktime_t *end_timestamp) +{ -+ struct kbase_vinstr_context *vinstr_ctx; -+ unsigned long flags; -+ -+ vinstr_ctx = container_of(data, struct kbase_vinstr_context, -+ resume_work); ++ int js; + -+ mutex_lock(&vinstr_ctx->lock); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ if (vinstr_ctx->kctx) -+ enable_hwcnt(vinstr_ctx); ++ /* Reset should always take the GPU out of protected mode */ ++ WARN_ON(kbase_gpu_in_protected_mode(kbdev)); + -+ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); -+ vinstr_ctx->state = VINSTR_IDLE; -+ wake_up_all(&vinstr_ctx->suspend_waitq); -+ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { ++ int atom_idx = 0; ++ int idx; + -+ mutex_unlock(&vinstr_ctx->lock); ++ for (idx = 0; idx < SLOT_RB_SIZE; idx++) { ++ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, ++ js, atom_idx); ++ bool keep_in_jm_rb = false; + -+ /* Kick GPU scheduler to allow entering protected mode. -+ * Note that scheduler state machine might requested re-entry to -+ * protected mode before vinstr was resumed. -+ * This must happen after vinstr was release. */ -+ kbasep_vinstr_kick_scheduler(vinstr_ctx->kbdev); -+} ++ if (!katom) ++ break; ++ if (katom->protected_state.exit == ++ KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT) ++ { ++ KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_END(kbdev); + -+/*****************************************************************************/ ++ kbase_vinstr_resume(kbdev->vinstr_ctx); + -+struct kbase_vinstr_context *kbase_vinstr_init(struct kbase_device *kbdev) -+{ -+ struct kbase_vinstr_context *vinstr_ctx; ++ /* protected mode sanity checks */ ++ KBASE_DEBUG_ASSERT_MSG( ++ kbase_jd_katom_is_protected(katom) == kbase_gpu_in_protected_mode(kbdev), ++ "Protected mode of atom (%d) doesn't match protected mode of GPU (%d)", ++ kbase_jd_katom_is_protected(katom), kbase_gpu_in_protected_mode(kbdev)); ++ KBASE_DEBUG_ASSERT_MSG( ++ (kbase_jd_katom_is_protected(katom) && js == 0) || ++ !kbase_jd_katom_is_protected(katom), ++ "Protected atom on JS%d not supported", js); ++ } ++ if (katom->gpu_rb_state < KBASE_ATOM_GPU_RB_SUBMITTED) ++ keep_in_jm_rb = true; + -+ vinstr_ctx = kzalloc(sizeof(*vinstr_ctx), GFP_KERNEL); -+ if (!vinstr_ctx) -+ return NULL; ++ kbase_gpu_release_atom(kbdev, katom, NULL); + -+ INIT_LIST_HEAD(&vinstr_ctx->idle_clients); -+ INIT_LIST_HEAD(&vinstr_ctx->waiting_clients); -+ mutex_init(&vinstr_ctx->lock); -+ spin_lock_init(&vinstr_ctx->state_lock); -+ vinstr_ctx->kbdev = kbdev; -+ vinstr_ctx->thread = NULL; -+ vinstr_ctx->state = VINSTR_IDLE; -+ vinstr_ctx->suspend_cnt = 0; -+ INIT_WORK(&vinstr_ctx->suspend_work, kbasep_vinstr_suspend_worker); -+ INIT_WORK(&vinstr_ctx->resume_work, kbasep_vinstr_resume_worker); -+ init_waitqueue_head(&vinstr_ctx->suspend_waitq); ++ /* ++ * If the atom wasn't on HW when the reset was issued ++ * then leave it in the RB and next time we're kicked ++ * it will be processed again from the starting state. ++ */ ++ if (keep_in_jm_rb) { ++ kbasep_js_job_check_deref_cores(kbdev, katom); ++ katom->coreref_state = KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED; ++ katom->affinity = 0; ++ katom->protected_state.exit = KBASE_ATOM_EXIT_PROTECTED_CHECK; ++ /* As the atom was not removed, increment the ++ * index so that we read the correct atom in the ++ * next iteration. */ ++ atom_idx++; ++ continue; ++ } + -+ atomic_set(&vinstr_ctx->request_pending, 0); -+ init_waitqueue_head(&vinstr_ctx->waitq); ++ /* ++ * The atom was on the HW when the reset was issued ++ * all we can do is fail the atom. ++ */ ++ kbase_gpu_dequeue_atom(kbdev, js, NULL); ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ kbase_jm_complete(kbdev, katom, end_timestamp); ++ } ++ } + -+ return vinstr_ctx; ++ kbdev->protected_mode_transition = false; +} + -+void kbase_vinstr_term(struct kbase_vinstr_context *vinstr_ctx) ++static inline void kbase_gpu_stop_atom(struct kbase_device *kbdev, ++ int js, ++ struct kbase_jd_atom *katom, ++ u32 action) +{ -+ struct kbase_vinstr_client *cli; ++ u32 hw_action = action & JS_COMMAND_MASK; + -+ /* Stop service thread first. */ -+ if (vinstr_ctx->thread) -+ kthread_stop(vinstr_ctx->thread); ++ kbase_job_check_enter_disjoint(kbdev, action, katom->core_req, katom); ++ kbasep_job_slot_soft_or_hard_stop_do_action(kbdev, js, hw_action, ++ katom->core_req, katom); ++ katom->kctx->blocked_js[js][katom->sched_priority] = true; ++} + -+ /* Wait for workers. */ -+ flush_work(&vinstr_ctx->suspend_work); -+ flush_work(&vinstr_ctx->resume_work); ++static inline void kbase_gpu_remove_atom(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom, ++ u32 action, ++ bool disjoint) ++{ ++ katom->event_code = BASE_JD_EVENT_REMOVED_FROM_NEXT; ++ kbase_gpu_mark_atom_for_return(kbdev, katom); ++ katom->kctx->blocked_js[katom->slot_nr][katom->sched_priority] = true; + -+ while (1) { -+ struct list_head *list = &vinstr_ctx->idle_clients; ++ if (disjoint) ++ kbase_job_check_enter_disjoint(kbdev, action, katom->core_req, ++ katom); ++} + -+ if (list_empty(list)) { -+ list = &vinstr_ctx->waiting_clients; -+ if (list_empty(list)) -+ break; -+ } ++static int should_stop_x_dep_slot(struct kbase_jd_atom *katom) ++{ ++ if (katom->x_post_dep) { ++ struct kbase_jd_atom *dep_atom = katom->x_post_dep; + -+ cli = list_first_entry(list, struct kbase_vinstr_client, list); -+ list_del(&cli->list); -+ kfree(cli->accum_buffer); -+ kfree(cli); -+ vinstr_ctx->nclients--; ++ if (dep_atom->gpu_rb_state != ++ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB && ++ dep_atom->gpu_rb_state != ++ KBASE_ATOM_GPU_RB_RETURN_TO_JS) ++ return dep_atom->slot_nr; + } -+ KBASE_DEBUG_ASSERT(!vinstr_ctx->nclients); -+ if (vinstr_ctx->kctx) -+ kbasep_vinstr_destroy_kctx(vinstr_ctx); -+ kfree(vinstr_ctx); ++ return -1; +} + -+int kbase_vinstr_hwcnt_reader_setup(struct kbase_vinstr_context *vinstr_ctx, -+ struct kbase_uk_hwcnt_reader_setup *setup) ++static void kbase_job_evicted(struct kbase_jd_atom *katom) +{ -+ struct kbase_vinstr_client *cli; -+ u32 bitmap[4]; -+ -+ KBASE_DEBUG_ASSERT(vinstr_ctx); -+ KBASE_DEBUG_ASSERT(setup); -+ KBASE_DEBUG_ASSERT(setup->buffer_count); -+ -+ bitmap[SHADER_HWCNT_BM] = setup->shader_bm; -+ bitmap[TILER_HWCNT_BM] = setup->tiler_bm; -+ bitmap[MMU_L2_HWCNT_BM] = setup->mmu_l2_bm; -+ bitmap[JM_HWCNT_BM] = setup->jm_bm; -+ -+ cli = kbasep_vinstr_attach_client( -+ vinstr_ctx, -+ setup->buffer_count, -+ bitmap, -+ &setup->fd, -+ NULL); -+ -+ if (!cli) -+ return -ENOMEM; -+ -+ return 0; ++ kbase_timeline_job_slot_done(katom->kctx->kbdev, katom->kctx, katom, ++ katom->slot_nr, KBASE_JS_ATOM_DONE_EVICTED_FROM_NEXT); +} + -+int kbase_vinstr_legacy_hwc_setup( -+ struct kbase_vinstr_context *vinstr_ctx, -+ struct kbase_vinstr_client **cli, -+ struct kbase_uk_hwcnt_setup *setup) ++bool kbase_backend_soft_hard_stop_slot(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ int js, ++ struct kbase_jd_atom *katom, ++ u32 action) +{ -+ KBASE_DEBUG_ASSERT(vinstr_ctx); -+ KBASE_DEBUG_ASSERT(setup); -+ KBASE_DEBUG_ASSERT(cli); -+ -+ if (setup->dump_buffer) { -+ u32 bitmap[4]; -+ -+ bitmap[SHADER_HWCNT_BM] = setup->shader_bm; -+ bitmap[TILER_HWCNT_BM] = setup->tiler_bm; -+ bitmap[MMU_L2_HWCNT_BM] = setup->mmu_l2_bm; -+ bitmap[JM_HWCNT_BM] = setup->jm_bm; ++ struct kbase_jd_atom *katom_idx0; ++ struct kbase_jd_atom *katom_idx1; + -+ if (*cli) -+ return -EBUSY; ++ bool katom_idx0_valid, katom_idx1_valid; + -+ *cli = kbasep_vinstr_attach_client( -+ vinstr_ctx, -+ 0, -+ bitmap, -+ (void *)(long)setup->dump_buffer, -+ NULL); ++ bool ret = false; + -+ if (!(*cli)) -+ return -ENOMEM; -+ } else { -+ if (!*cli) -+ return -EINVAL; ++ int stop_x_dep_idx0 = -1, stop_x_dep_idx1 = -1; ++ int prio_idx0 = 0, prio_idx1 = 0; + -+ kbase_vinstr_detach_client(*cli); -+ *cli = NULL; -+ } ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ return 0; -+} ++ katom_idx0 = kbase_gpu_inspect(kbdev, js, 0); ++ katom_idx1 = kbase_gpu_inspect(kbdev, js, 1); + -+struct kbase_vinstr_client *kbase_vinstr_hwcnt_kernel_setup( -+ struct kbase_vinstr_context *vinstr_ctx, -+ struct kbase_uk_hwcnt_reader_setup *setup, -+ void *kernel_buffer) -+{ -+ u32 bitmap[4]; ++ if (katom_idx0) ++ prio_idx0 = katom_idx0->sched_priority; ++ if (katom_idx1) ++ prio_idx1 = katom_idx1->sched_priority; + -+ if (!vinstr_ctx || !setup || !kernel_buffer) -+ return NULL; ++ if (katom) { ++ katom_idx0_valid = (katom_idx0 == katom); ++ /* If idx0 is to be removed and idx1 is on the same context, ++ * then idx1 must also be removed otherwise the atoms might be ++ * returned out of order */ ++ if (katom_idx1) ++ katom_idx1_valid = (katom_idx1 == katom) || ++ (katom_idx0_valid && ++ (katom_idx0->kctx == ++ katom_idx1->kctx)); ++ else ++ katom_idx1_valid = false; ++ } else { ++ katom_idx0_valid = (katom_idx0 && ++ (!kctx || katom_idx0->kctx == kctx)); ++ katom_idx1_valid = (katom_idx1 && ++ (!kctx || katom_idx1->kctx == kctx) && ++ prio_idx0 == prio_idx1); ++ } + -+ bitmap[SHADER_HWCNT_BM] = setup->shader_bm; -+ bitmap[TILER_HWCNT_BM] = setup->tiler_bm; -+ bitmap[MMU_L2_HWCNT_BM] = setup->mmu_l2_bm; -+ bitmap[JM_HWCNT_BM] = setup->jm_bm; ++ if (katom_idx0_valid) ++ stop_x_dep_idx0 = should_stop_x_dep_slot(katom_idx0); ++ if (katom_idx1_valid) ++ stop_x_dep_idx1 = should_stop_x_dep_slot(katom_idx1); + -+ return kbasep_vinstr_attach_client( -+ vinstr_ctx, -+ 0, -+ bitmap, -+ NULL, -+ kernel_buffer); -+} -+KBASE_EXPORT_TEST_API(kbase_vinstr_hwcnt_kernel_setup); ++ if (katom_idx0_valid) { ++ if (katom_idx0->gpu_rb_state != KBASE_ATOM_GPU_RB_SUBMITTED) { ++ /* Simple case - just dequeue and return */ ++ kbase_gpu_dequeue_atom(kbdev, js, NULL); ++ if (katom_idx1_valid) { ++ kbase_gpu_dequeue_atom(kbdev, js, NULL); ++ katom_idx1->event_code = ++ BASE_JD_EVENT_REMOVED_FROM_NEXT; ++ kbase_jm_return_atom_to_js(kbdev, katom_idx1); ++ katom_idx1->kctx->blocked_js[js][prio_idx1] = ++ true; ++ } + -+int kbase_vinstr_hwc_dump(struct kbase_vinstr_client *cli, -+ enum base_hwcnt_reader_event event_id) -+{ -+ int rcode = 0; -+ struct kbase_vinstr_context *vinstr_ctx; -+ u64 timestamp; -+ u32 event_mask; ++ katom_idx0->event_code = ++ BASE_JD_EVENT_REMOVED_FROM_NEXT; ++ kbase_jm_return_atom_to_js(kbdev, katom_idx0); ++ katom_idx0->kctx->blocked_js[js][prio_idx0] = true; ++ } else { ++ /* katom_idx0 is on GPU */ ++ if (katom_idx1 && katom_idx1->gpu_rb_state == ++ KBASE_ATOM_GPU_RB_SUBMITTED) { ++ /* katom_idx0 and katom_idx1 are on GPU */ + -+ if (!cli) -+ return -EINVAL; ++ if (kbase_reg_read(kbdev, JOB_SLOT_REG(js, ++ JS_COMMAND_NEXT), NULL) == 0) { ++ /* idx0 has already completed - stop ++ * idx1 if needed*/ ++ if (katom_idx1_valid) { ++ kbase_gpu_stop_atom(kbdev, js, ++ katom_idx1, ++ action); ++ ret = true; ++ } ++ } else { ++ /* idx1 is in NEXT registers - attempt ++ * to remove */ ++ kbase_reg_write(kbdev, ++ JOB_SLOT_REG(js, ++ JS_COMMAND_NEXT), ++ JS_COMMAND_NOP, NULL); + -+ vinstr_ctx = cli->vinstr_ctx; -+ KBASE_DEBUG_ASSERT(vinstr_ctx); ++ if (kbase_reg_read(kbdev, ++ JOB_SLOT_REG(js, ++ JS_HEAD_NEXT_LO), NULL) ++ != 0 || ++ kbase_reg_read(kbdev, ++ JOB_SLOT_REG(js, ++ JS_HEAD_NEXT_HI), NULL) ++ != 0) { ++ /* idx1 removed successfully, ++ * will be handled in IRQ */ ++ kbase_job_evicted(katom_idx1); ++ kbase_gpu_remove_atom(kbdev, ++ katom_idx1, ++ action, true); ++ stop_x_dep_idx1 = ++ should_stop_x_dep_slot(katom_idx1); + -+ KBASE_DEBUG_ASSERT(event_id < BASE_HWCNT_READER_EVENT_COUNT); -+ event_mask = 1 << event_id; ++ /* stop idx0 if still on GPU */ ++ kbase_gpu_stop_atom(kbdev, js, ++ katom_idx0, ++ action); ++ ret = true; ++ } else if (katom_idx1_valid) { ++ /* idx0 has already completed, ++ * stop idx1 if needed */ ++ kbase_gpu_stop_atom(kbdev, js, ++ katom_idx1, ++ action); ++ ret = true; ++ } ++ } ++ } else if (katom_idx1_valid) { ++ /* idx1 not on GPU but must be dequeued*/ + -+ mutex_lock(&vinstr_ctx->lock); ++ /* idx1 will be handled in IRQ */ ++ kbase_gpu_remove_atom(kbdev, katom_idx1, action, ++ false); ++ /* stop idx0 */ ++ /* This will be repeated for anything removed ++ * from the next registers, since their normal ++ * flow was also interrupted, and this function ++ * might not enter disjoint state e.g. if we ++ * don't actually do a hard stop on the head ++ * atom */ ++ kbase_gpu_stop_atom(kbdev, js, katom_idx0, ++ action); ++ ret = true; ++ } else { ++ /* no atom in idx1 */ ++ /* just stop idx0 */ ++ kbase_gpu_stop_atom(kbdev, js, katom_idx0, ++ action); ++ ret = true; ++ } ++ } ++ } else if (katom_idx1_valid) { ++ if (katom_idx1->gpu_rb_state != KBASE_ATOM_GPU_RB_SUBMITTED) { ++ /* Mark for return */ ++ /* idx1 will be returned once idx0 completes */ ++ kbase_gpu_remove_atom(kbdev, katom_idx1, action, ++ false); ++ } else { ++ /* idx1 is on GPU */ ++ if (kbase_reg_read(kbdev, JOB_SLOT_REG(js, ++ JS_COMMAND_NEXT), NULL) == 0) { ++ /* idx0 has already completed - stop idx1 */ ++ kbase_gpu_stop_atom(kbdev, js, katom_idx1, ++ action); ++ ret = true; ++ } else { ++ /* idx1 is in NEXT registers - attempt to ++ * remove */ ++ kbase_reg_write(kbdev, JOB_SLOT_REG(js, ++ JS_COMMAND_NEXT), ++ JS_COMMAND_NOP, NULL); + -+ if (event_mask & cli->event_mask) { -+ rcode = kbasep_vinstr_collect_and_accumulate( -+ vinstr_ctx, -+ ×tamp); -+ if (rcode) -+ goto exit; ++ if (kbase_reg_read(kbdev, JOB_SLOT_REG(js, ++ JS_HEAD_NEXT_LO), NULL) != 0 || ++ kbase_reg_read(kbdev, JOB_SLOT_REG(js, ++ JS_HEAD_NEXT_HI), NULL) != 0) { ++ /* idx1 removed successfully, will be ++ * handled in IRQ once idx0 completes */ ++ kbase_job_evicted(katom_idx1); ++ kbase_gpu_remove_atom(kbdev, katom_idx1, ++ action, ++ false); ++ } else { ++ /* idx0 has already completed - stop ++ * idx1 */ ++ kbase_gpu_stop_atom(kbdev, js, ++ katom_idx1, ++ action); ++ ret = true; ++ } ++ } ++ } ++ } + -+ rcode = kbasep_vinstr_update_client(cli, timestamp, event_id); -+ if (rcode) -+ goto exit; + -+ kbasep_vinstr_reprogram(vinstr_ctx); -+ } ++ if (stop_x_dep_idx0 != -1) ++ kbase_backend_soft_hard_stop_slot(kbdev, kctx, stop_x_dep_idx0, ++ NULL, action); + -+exit: -+ mutex_unlock(&vinstr_ctx->lock); ++ if (stop_x_dep_idx1 != -1) ++ kbase_backend_soft_hard_stop_slot(kbdev, kctx, stop_x_dep_idx1, ++ NULL, action); + -+ return rcode; ++ return ret; +} -+KBASE_EXPORT_TEST_API(kbase_vinstr_hwc_dump); + -+int kbase_vinstr_hwc_clear(struct kbase_vinstr_client *cli) ++void kbase_gpu_cacheclean(struct kbase_device *kbdev) +{ -+ struct kbase_vinstr_context *vinstr_ctx; -+ int rcode; -+ u64 unused; -+ -+ if (!cli) -+ return -EINVAL; -+ -+ vinstr_ctx = cli->vinstr_ctx; -+ KBASE_DEBUG_ASSERT(vinstr_ctx); ++ /* Limit the number of loops to avoid a hang if the interrupt is missed ++ */ ++ u32 max_loops = KBASE_CLEAN_CACHE_MAX_LOOPS; + -+ mutex_lock(&vinstr_ctx->lock); ++ mutex_lock(&kbdev->cacheclean_lock); + -+ rcode = kbasep_vinstr_collect_and_accumulate(vinstr_ctx, &unused); -+ if (rcode) -+ goto exit; -+ rcode = kbase_instr_hwcnt_clear(vinstr_ctx->kctx); -+ if (rcode) -+ goto exit; -+ memset(cli->accum_buffer, 0, cli->dump_size); ++ /* use GPU_COMMAND completion solution */ ++ /* clean & invalidate the caches */ ++ KBASE_TRACE_ADD(kbdev, CORE_GPU_CLEAN_INV_CACHES, NULL, NULL, 0u, 0); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), ++ GPU_COMMAND_CLEAN_INV_CACHES, NULL); + -+ kbasep_vinstr_reprogram(vinstr_ctx); ++ /* wait for cache flush to complete before continuing */ ++ while (--max_loops && ++ (kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_RAWSTAT), NULL) & ++ CLEAN_CACHES_COMPLETED) == 0) ++ ; + -+exit: -+ mutex_unlock(&vinstr_ctx->lock); ++ /* clear the CLEAN_CACHES_COMPLETED irq */ ++ KBASE_TRACE_ADD(kbdev, CORE_GPU_IRQ_CLEAR, NULL, NULL, 0u, ++ CLEAN_CACHES_COMPLETED); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), ++ CLEAN_CACHES_COMPLETED, NULL); ++ KBASE_DEBUG_ASSERT_MSG(kbdev->hwcnt.backend.state != ++ KBASE_INSTR_STATE_CLEANING, ++ "Instrumentation code was cleaning caches, but Job Management code cleared their IRQ - Instrumentation code will now hang."); + -+ return rcode; ++ mutex_unlock(&kbdev->cacheclean_lock); +} + -+int kbase_vinstr_try_suspend(struct kbase_vinstr_context *vinstr_ctx) ++void kbase_backend_cacheclean(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom) +{ -+ unsigned long flags; -+ int ret = -EAGAIN; ++ if (katom->need_cache_flush_cores_retained) { ++ unsigned long flags; + -+ KBASE_DEBUG_ASSERT(vinstr_ctx); ++ kbase_gpu_cacheclean(kbdev); + -+ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); -+ switch (vinstr_ctx->state) { -+ case VINSTR_SUSPENDED: -+ vinstr_ctx->suspend_cnt++; -+ /* overflow shall not happen */ -+ BUG_ON(0 == vinstr_ctx->suspend_cnt); -+ ret = 0; -+ break; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_pm_unrequest_cores(kbdev, false, ++ katom->need_cache_flush_cores_retained); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ katom->need_cache_flush_cores_retained = 0; ++ } ++} + -+ case VINSTR_IDLE: -+ if (vinstr_ctx->clients_present) { -+ vinstr_ctx->state = VINSTR_SUSPENDING; -+ schedule_work(&vinstr_ctx->suspend_work); -+ } else { -+ vinstr_ctx->state = VINSTR_SUSPENDED; ++void kbase_backend_complete_wq(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom) ++{ ++ /* ++ * If cache flush required due to HW workaround then perform the flush ++ * now ++ */ ++ kbase_backend_cacheclean(kbdev, katom); + -+ vinstr_ctx->suspend_cnt++; -+ /* overflow shall not happen */ -+ WARN_ON(0 == vinstr_ctx->suspend_cnt); -+ ret = 0; ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10969) && ++ (katom->core_req & BASE_JD_REQ_FS) && ++ katom->event_code == BASE_JD_EVENT_TILE_RANGE_FAULT && ++ (katom->atom_flags & KBASE_KATOM_FLAG_BEEN_SOFT_STOPPPED) && ++ !(katom->atom_flags & KBASE_KATOM_FLAGS_RERUN)) { ++ dev_dbg(kbdev->dev, "Soft-stopped fragment shader job got a TILE_RANGE_FAULT. Possible HW issue, trying SW workaround\n"); ++ if (kbasep_10969_workaround_clamp_coordinates(katom)) { ++ /* The job had a TILE_RANGE_FAULT after was soft-stopped ++ * Due to an HW issue we try to execute the job again. ++ */ ++ dev_dbg(kbdev->dev, ++ "Clamping has been executed, try to rerun the job\n" ++ ); ++ katom->event_code = BASE_JD_EVENT_STOPPED; ++ katom->atom_flags |= KBASE_KATOM_FLAGS_RERUN; + } -+ break; -+ -+ case VINSTR_DUMPING: -+ vinstr_ctx->state = VINSTR_SUSPENDING; -+ break; -+ -+ case VINSTR_SUSPENDING: -+ /* fall through */ -+ case VINSTR_RESUMING: -+ break; -+ -+ default: -+ BUG(); -+ break; + } -+ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); + -+ return ret; ++ /* Clear the coreref_state now - while check_deref_cores() may not have ++ * been called yet, the caller will have taken a copy of this field. If ++ * this is not done, then if the atom is re-scheduled (following a soft ++ * stop) then the core reference would not be retaken. */ ++ katom->coreref_state = KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED; ++ katom->affinity = 0; +} + -+void kbase_vinstr_suspend(struct kbase_vinstr_context *vinstr_ctx) ++void kbase_backend_complete_wq_post_sched(struct kbase_device *kbdev, ++ base_jd_core_req core_req, u64 affinity, ++ enum kbase_atom_coreref_state coreref_state) +{ -+ wait_event(vinstr_ctx->suspend_waitq, -+ (0 == kbase_vinstr_try_suspend(vinstr_ctx))); ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbasep_js_job_check_deref_cores_nokatom(kbdev, core_req, affinity, ++ coreref_state); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ if (!kbdev->pm.active_count) { ++ mutex_lock(&kbdev->js_data.runpool_mutex); ++ mutex_lock(&kbdev->pm.lock); ++ kbase_pm_update_active(kbdev); ++ mutex_unlock(&kbdev->pm.lock); ++ mutex_unlock(&kbdev->js_data.runpool_mutex); ++ } +} + -+void kbase_vinstr_resume(struct kbase_vinstr_context *vinstr_ctx) ++void kbase_gpu_dump_slots(struct kbase_device *kbdev) +{ ++ struct kbasep_js_device_data *js_devdata; + unsigned long flags; ++ int js; + -+ KBASE_DEBUG_ASSERT(vinstr_ctx); ++ js_devdata = &kbdev->js_data; + -+ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); -+ BUG_ON(VINSTR_SUSPENDING == vinstr_ctx->state); -+ if (VINSTR_SUSPENDED == vinstr_ctx->state) { -+ BUG_ON(0 == vinstr_ctx->suspend_cnt); -+ vinstr_ctx->suspend_cnt--; -+ if (0 == vinstr_ctx->suspend_cnt) { -+ if (vinstr_ctx->clients_present) { -+ vinstr_ctx->state = VINSTR_RESUMING; -+ schedule_work(&vinstr_ctx->resume_work); -+ } else { -+ vinstr_ctx->state = VINSTR_IDLE; -+ } ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ++ dev_info(kbdev->dev, "kbase_gpu_dump_slots:\n"); ++ ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { ++ int idx; ++ ++ for (idx = 0; idx < SLOT_RB_SIZE; idx++) { ++ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, ++ js, ++ idx); ++ ++ if (katom) ++ dev_info(kbdev->dev, ++ " js%d idx%d : katom=%p gpu_rb_state=%d\n", ++ js, idx, katom, katom->gpu_rb_state); ++ else ++ dev_info(kbdev->dev, " js%d idx%d : empty\n", ++ js, idx); + } + } -+ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_vinstr.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_vinstr.h ++ ++ ++ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h new file mode 100755 -index 000000000000..6207d25aef06 +index 000000000..1e0e05ad3 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_vinstr.h -@@ -0,0 +1,155 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h +@@ -0,0 +1,76 @@ +/* + * -+ * (C) COPYRIGHT 2015-2016 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -330405,153 +366368,74 @@ index 000000000000..6207d25aef06 + + + -+#ifndef _KBASE_VINSTR_H_ -+#define _KBASE_VINSTR_H_ -+ -+#include -+#include -+ -+/*****************************************************************************/ -+ -+struct kbase_vinstr_context; -+struct kbase_vinstr_client; -+ -+/*****************************************************************************/ -+ -+/** -+ * kbase_vinstr_init() - initialize the vinstr core -+ * @kbdev: kbase device -+ * -+ * Return: pointer to the vinstr context on success or NULL on failure -+ */ -+struct kbase_vinstr_context *kbase_vinstr_init(struct kbase_device *kbdev); -+ -+/** -+ * kbase_vinstr_term() - terminate the vinstr core -+ * @vinstr_ctx: vinstr context -+ */ -+void kbase_vinstr_term(struct kbase_vinstr_context *vinstr_ctx); -+ -+/** -+ * kbase_vinstr_hwcnt_reader_setup - configure hw counters reader -+ * @vinstr_ctx: vinstr context -+ * @setup: reader's configuration -+ * -+ * Return: zero on success -+ */ -+int kbase_vinstr_hwcnt_reader_setup( -+ struct kbase_vinstr_context *vinstr_ctx, -+ struct kbase_uk_hwcnt_reader_setup *setup); -+ -+/** -+ * kbase_vinstr_legacy_hwc_setup - configure hw counters for dumping -+ * @vinstr_ctx: vinstr context -+ * @cli: pointer where to store pointer to new vinstr client structure -+ * @setup: hwc configuration -+ * -+ * Return: zero on success -+ */ -+int kbase_vinstr_legacy_hwc_setup( -+ struct kbase_vinstr_context *vinstr_ctx, -+ struct kbase_vinstr_client **cli, -+ struct kbase_uk_hwcnt_setup *setup); + -+/** -+ * kbase_vinstr_hwcnt_kernel_setup - configure hw counters for kernel side -+ * client -+ * @vinstr_ctx: vinstr context -+ * @setup: reader's configuration -+ * @kernel_buffer: pointer to dump buffer -+ * -+ * setup->buffer_count and setup->fd are not used for kernel side clients. -+ * -+ * Return: pointer to client structure, or NULL on failure ++/* ++ * Register-based HW access backend specific APIs + */ -+struct kbase_vinstr_client *kbase_vinstr_hwcnt_kernel_setup( -+ struct kbase_vinstr_context *vinstr_ctx, -+ struct kbase_uk_hwcnt_reader_setup *setup, -+ void *kernel_buffer); + -+/** -+ * kbase_vinstr_hwc_dump - issue counter dump for vinstr client -+ * @cli: pointer to vinstr client -+ * @event_id: id of event that triggered hwcnt dump -+ * -+ * Return: zero on success -+ */ -+int kbase_vinstr_hwc_dump( -+ struct kbase_vinstr_client *cli, -+ enum base_hwcnt_reader_event event_id); ++#ifndef _KBASE_HWACCESS_GPU_H_ ++#define _KBASE_HWACCESS_GPU_H_ + -+/** -+ * kbase_vinstr_hwc_clear - performs a reset of the hardware counters for -+ * a given kbase context -+ * @cli: pointer to vinstr client -+ * -+ * Return: zero on success -+ */ -+int kbase_vinstr_hwc_clear(struct kbase_vinstr_client *cli); ++#include + +/** -+ * kbase_vinstr_try_suspend - try suspending operation of a given vinstr context -+ * @vinstr_ctx: vinstr context ++ * kbase_gpu_irq_evict - Evict an atom from a NEXT slot + * -+ * Return: 0 on success, or negative if state change is in progress ++ * @kbdev: Device pointer ++ * @js: Job slot to evict from + * -+ * Warning: This API call is non-generic. It is meant to be used only by -+ * job scheduler state machine. ++ * Evict the atom in the NEXT slot for the specified job slot. This function is ++ * called from the job complete IRQ handler when the previous job has failed. + * -+ * Function initiates vinstr switch to suspended state. Once it was called -+ * vinstr enters suspending state. If function return non-zero value, it -+ * indicates that state switch is not complete and function must be called -+ * again. On state switch vinstr will trigger job scheduler state machine -+ * cycle. ++ * Return: true if job evicted from NEXT registers, false otherwise + */ -+int kbase_vinstr_try_suspend(struct kbase_vinstr_context *vinstr_ctx); ++bool kbase_gpu_irq_evict(struct kbase_device *kbdev, int js); + +/** -+ * kbase_vinstr_suspend - suspends operation of a given vinstr context -+ * @vinstr_ctx: vinstr context ++ * kbase_gpu_complete_hw - Complete an atom on job slot js + * -+ * Function initiates vinstr switch to suspended state. Then it blocks until -+ * operation is completed. ++ * @kbdev: Device pointer ++ * @js: Job slot that has completed ++ * @completion_code: Event code from job that has completed ++ * @job_tail: The tail address from the hardware if the job has partially ++ * completed ++ * @end_timestamp: Time of completion + */ -+void kbase_vinstr_suspend(struct kbase_vinstr_context *vinstr_ctx); ++void kbase_gpu_complete_hw(struct kbase_device *kbdev, int js, ++ u32 completion_code, ++ u64 job_tail, ++ ktime_t *end_timestamp); + +/** -+ * kbase_vinstr_resume - resumes operation of a given vinstr context -+ * @vinstr_ctx: vinstr context ++ * kbase_gpu_inspect - Inspect the contents of the HW access ringbuffer + * -+ * Function can be called only if it was preceded by a successful call -+ * to kbase_vinstr_suspend. ++ * @kbdev: Device pointer ++ * @js: Job slot to inspect ++ * @idx: Index into ringbuffer. 0 is the job currently running on ++ * the slot, 1 is the job waiting, all other values are invalid. ++ * Return: The atom at that position in the ringbuffer ++ * or NULL if no atom present + */ -+void kbase_vinstr_resume(struct kbase_vinstr_context *vinstr_ctx); ++struct kbase_jd_atom *kbase_gpu_inspect(struct kbase_device *kbdev, int js, ++ int idx); + +/** -+ * kbase_vinstr_dump_size - Return required size of dump buffer -+ * @kbdev: device pointer ++ * kbase_gpu_dump_slots - Print the contents of the slot ringbuffers + * -+ * Return : buffer size in bytes -+ */ -+size_t kbase_vinstr_dump_size(struct kbase_device *kbdev); -+ -+/** -+ * kbase_vinstr_detach_client - Detach a client from the vinstr core -+ * @cli: pointer to vinstr client ++ * @kbdev: Device pointer + */ -+void kbase_vinstr_detach_client(struct kbase_vinstr_client *cli); -+ -+#endif /* _KBASE_VINSTR_H_ */ ++void kbase_gpu_dump_slots(struct kbase_device *kbdev); + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_linux_kbase_trace.h b/drivers/gpu/arm/bifrost_for_linux/mali_linux_kbase_trace.h ++#endif /* _KBASE_HWACCESS_GPU_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c new file mode 100755 -index 000000000000..5d6b4021d626 +index 000000000..54d8ddd80 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_linux_kbase_trace.h -@@ -0,0 +1,201 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c +@@ -0,0 +1,303 @@ +/* + * -+ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -330567,195 +366451,297 @@ index 000000000000..5d6b4021d626 + + + -+#if !defined(_TRACE_MALI_KBASE_H) || defined(TRACE_HEADER_MULTI_READ) -+#define _TRACE_MALI_KBASE_H + -+#undef TRACE_SYSTEM -+#define TRACE_SYSTEM mali ++/* ++ * Base kernel affinity manager APIs ++ */ + -+#include ++#include ++#include "mali_kbase_js_affinity.h" ++#include "mali_kbase_hw.h" + -+DECLARE_EVENT_CLASS(mali_slot_template, -+ TP_PROTO(int jobslot, unsigned int info_val), -+ TP_ARGS(jobslot, info_val), -+ TP_STRUCT__entry( -+ __field(unsigned int, jobslot) -+ __field(unsigned int, info_val) -+ ), -+ TP_fast_assign( -+ __entry->jobslot = jobslot; -+ __entry->info_val = info_val; -+ ), -+ TP_printk("jobslot=%u info=%u", __entry->jobslot, __entry->info_val) -+); ++#include + -+#define DEFINE_MALI_SLOT_EVENT(name) \ -+DEFINE_EVENT(mali_slot_template, mali_##name, \ -+ TP_PROTO(int jobslot, unsigned int info_val), \ -+ TP_ARGS(jobslot, info_val)) -+DEFINE_MALI_SLOT_EVENT(JM_SUBMIT); -+DEFINE_MALI_SLOT_EVENT(JM_JOB_DONE); -+DEFINE_MALI_SLOT_EVENT(JM_UPDATE_HEAD); -+DEFINE_MALI_SLOT_EVENT(JM_CHECK_HEAD); -+DEFINE_MALI_SLOT_EVENT(JM_SOFTSTOP); -+DEFINE_MALI_SLOT_EVENT(JM_SOFTSTOP_0); -+DEFINE_MALI_SLOT_EVENT(JM_SOFTSTOP_1); -+DEFINE_MALI_SLOT_EVENT(JM_HARDSTOP); -+DEFINE_MALI_SLOT_EVENT(JM_HARDSTOP_0); -+DEFINE_MALI_SLOT_EVENT(JM_HARDSTOP_1); -+DEFINE_MALI_SLOT_EVENT(JM_SLOT_SOFT_OR_HARD_STOP); -+DEFINE_MALI_SLOT_EVENT(JM_SLOT_EVICT); -+DEFINE_MALI_SLOT_EVENT(JM_BEGIN_RESET_WORKER); -+DEFINE_MALI_SLOT_EVENT(JM_END_RESET_WORKER); -+DEFINE_MALI_SLOT_EVENT(JS_CORE_REF_REGISTER_ON_RECHECK_FAILED); -+DEFINE_MALI_SLOT_EVENT(JS_AFFINITY_SUBMIT_TO_BLOCKED); -+DEFINE_MALI_SLOT_EVENT(JS_AFFINITY_CURRENT); -+DEFINE_MALI_SLOT_EVENT(JD_DONE_TRY_RUN_NEXT_JOB); -+DEFINE_MALI_SLOT_EVENT(JS_CORE_REF_REQUEST_CORES_FAILED); -+DEFINE_MALI_SLOT_EVENT(JS_CORE_REF_REGISTER_INUSE_FAILED); -+DEFINE_MALI_SLOT_EVENT(JS_CORE_REF_REQUEST_ON_RECHECK_FAILED); -+DEFINE_MALI_SLOT_EVENT(JS_CORE_REF_AFFINITY_WOULD_VIOLATE); -+DEFINE_MALI_SLOT_EVENT(JS_JOB_DONE_TRY_RUN_NEXT_JOB); -+DEFINE_MALI_SLOT_EVENT(JS_JOB_DONE_RETRY_NEEDED); -+DEFINE_MALI_SLOT_EVENT(JS_POLICY_DEQUEUE_JOB); -+DEFINE_MALI_SLOT_EVENT(JS_POLICY_DEQUEUE_JOB_IRQ); -+#undef DEFINE_MALI_SLOT_EVENT + -+DECLARE_EVENT_CLASS(mali_refcount_template, -+ TP_PROTO(int refcount, unsigned int info_val), -+ TP_ARGS(refcount, info_val), -+ TP_STRUCT__entry( -+ __field(unsigned int, refcount) -+ __field(unsigned int, info_val) -+ ), -+ TP_fast_assign( -+ __entry->refcount = refcount; -+ __entry->info_val = info_val; -+ ), -+ TP_printk("refcount=%u info=%u", __entry->refcount, __entry->info_val) -+); ++bool kbase_js_can_run_job_on_slot_no_lock(struct kbase_device *kbdev, ++ int js) ++{ ++ /* ++ * Here are the reasons for using job slot 2: ++ * - BASE_HW_ISSUE_8987 (which is entirely used for that purpose) ++ * - In absence of the above, then: ++ * - Atoms with BASE_JD_REQ_COHERENT_GROUP ++ * - But, only when there aren't contexts with ++ * KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES, because the atoms that run on ++ * all cores on slot 1 could be blocked by those using a coherent group ++ * on slot 2 ++ * - And, only when you actually have 2 or more coregroups - if you ++ * only have 1 coregroup, then having jobs for slot 2 implies they'd ++ * also be for slot 1, meaning you'll get interference from them. Jobs ++ * able to run on slot 2 could also block jobs that can only run on ++ * slot 1 (tiler jobs) ++ */ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987)) ++ return true; + -+#define DEFINE_MALI_REFCOUNT_EVENT(name) \ -+DEFINE_EVENT(mali_refcount_template, mali_##name, \ -+ TP_PROTO(int refcount, unsigned int info_val), \ -+ TP_ARGS(refcount, info_val)) -+DEFINE_MALI_REFCOUNT_EVENT(JS_RETAIN_CTX_NOLOCK); -+DEFINE_MALI_REFCOUNT_EVENT(JS_ADD_JOB); -+DEFINE_MALI_REFCOUNT_EVENT(JS_REMOVE_JOB); -+DEFINE_MALI_REFCOUNT_EVENT(JS_RETAIN_CTX); -+DEFINE_MALI_REFCOUNT_EVENT(JS_RELEASE_CTX); -+DEFINE_MALI_REFCOUNT_EVENT(JS_TRY_SCHEDULE_HEAD_CTX); -+DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_INIT_CTX); -+DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_TERM_CTX); -+DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_ENQUEUE_CTX); -+DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_DEQUEUE_HEAD_CTX); -+DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_TRY_EVICT_CTX); -+DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_RUNPOOL_ADD_CTX); -+DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_RUNPOOL_REMOVE_CTX); -+DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_FOREACH_CTX_JOBS); -+DEFINE_MALI_REFCOUNT_EVENT(PM_CONTEXT_ACTIVE); -+DEFINE_MALI_REFCOUNT_EVENT(PM_CONTEXT_IDLE); -+#undef DEFINE_MALI_REFCOUNT_EVENT ++ if (js != 2) ++ return true; + -+DECLARE_EVENT_CLASS(mali_add_template, -+ TP_PROTO(int gpu_addr, unsigned int info_val), -+ TP_ARGS(gpu_addr, info_val), -+ TP_STRUCT__entry( -+ __field(unsigned int, gpu_addr) -+ __field(unsigned int, info_val) -+ ), -+ TP_fast_assign( -+ __entry->gpu_addr = gpu_addr; -+ __entry->info_val = info_val; -+ ), -+ TP_printk("gpu_addr=%u info=%u", __entry->gpu_addr, __entry->info_val) -+); ++ /* Only deal with js==2 now: */ ++ if (kbdev->gpu_props.num_core_groups > 1) { ++ /* Only use slot 2 in the 2+ coregroup case */ ++ if (kbasep_js_ctx_attr_is_attr_on_runpool(kbdev, ++ KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES) == ++ false) { ++ /* ...But only when we *don't* have atoms that run on ++ * all cores */ + -+#define DEFINE_MALI_ADD_EVENT(name) \ -+DEFINE_EVENT(mali_add_template, mali_##name, \ -+ TP_PROTO(int gpu_addr, unsigned int info_val), \ -+ TP_ARGS(gpu_addr, info_val)) -+DEFINE_MALI_ADD_EVENT(CORE_CTX_DESTROY); -+DEFINE_MALI_ADD_EVENT(CORE_CTX_HWINSTR_TERM); -+DEFINE_MALI_ADD_EVENT(CORE_GPU_IRQ); -+DEFINE_MALI_ADD_EVENT(CORE_GPU_IRQ_CLEAR); -+DEFINE_MALI_ADD_EVENT(CORE_GPU_IRQ_DONE); -+DEFINE_MALI_ADD_EVENT(CORE_GPU_SOFT_RESET); -+DEFINE_MALI_ADD_EVENT(CORE_GPU_HARD_RESET); -+DEFINE_MALI_ADD_EVENT(CORE_GPU_PRFCNT_SAMPLE); -+DEFINE_MALI_ADD_EVENT(CORE_GPU_PRFCNT_CLEAR); -+DEFINE_MALI_ADD_EVENT(CORE_GPU_CLEAN_INV_CACHES); -+DEFINE_MALI_ADD_EVENT(JD_DONE_WORKER); -+DEFINE_MALI_ADD_EVENT(JD_DONE_WORKER_END); -+DEFINE_MALI_ADD_EVENT(JD_CANCEL_WORKER); -+DEFINE_MALI_ADD_EVENT(JD_DONE); -+DEFINE_MALI_ADD_EVENT(JD_CANCEL); -+DEFINE_MALI_ADD_EVENT(JD_ZAP_CONTEXT); -+DEFINE_MALI_ADD_EVENT(JM_IRQ); -+DEFINE_MALI_ADD_EVENT(JM_IRQ_END); -+DEFINE_MALI_ADD_EVENT(JM_FLUSH_WORKQS); -+DEFINE_MALI_ADD_EVENT(JM_FLUSH_WORKQS_DONE); -+DEFINE_MALI_ADD_EVENT(JM_ZAP_NON_SCHEDULED); -+DEFINE_MALI_ADD_EVENT(JM_ZAP_SCHEDULED); -+DEFINE_MALI_ADD_EVENT(JM_ZAP_DONE); -+DEFINE_MALI_ADD_EVENT(JM_SUBMIT_AFTER_RESET); -+DEFINE_MALI_ADD_EVENT(JM_JOB_COMPLETE); -+DEFINE_MALI_ADD_EVENT(JS_FAST_START_EVICTS_CTX); -+DEFINE_MALI_ADD_EVENT(JS_CTX_ATTR_NOW_ON_RUNPOOL); -+DEFINE_MALI_ADD_EVENT(JS_CTX_ATTR_NOW_OFF_RUNPOOL); -+DEFINE_MALI_ADD_EVENT(JS_CTX_ATTR_NOW_ON_CTX); -+DEFINE_MALI_ADD_EVENT(JS_CTX_ATTR_NOW_OFF_CTX); -+DEFINE_MALI_ADD_EVENT(JS_POLICY_TIMER_END); -+DEFINE_MALI_ADD_EVENT(JS_POLICY_TIMER_START); -+DEFINE_MALI_ADD_EVENT(JS_POLICY_ENQUEUE_JOB); -+DEFINE_MALI_ADD_EVENT(PM_CORES_CHANGE_DESIRED); -+DEFINE_MALI_ADD_EVENT(PM_JOB_SUBMIT_AFTER_POWERING_UP); -+DEFINE_MALI_ADD_EVENT(PM_JOB_SUBMIT_AFTER_POWERED_UP); -+DEFINE_MALI_ADD_EVENT(PM_PWRON); -+DEFINE_MALI_ADD_EVENT(PM_PWRON_TILER); -+DEFINE_MALI_ADD_EVENT(PM_PWRON_L2); -+DEFINE_MALI_ADD_EVENT(PM_PWROFF); -+DEFINE_MALI_ADD_EVENT(PM_PWROFF_TILER); -+DEFINE_MALI_ADD_EVENT(PM_PWROFF_L2); -+DEFINE_MALI_ADD_EVENT(PM_CORES_POWERED); -+DEFINE_MALI_ADD_EVENT(PM_CORES_POWERED_TILER); -+DEFINE_MALI_ADD_EVENT(PM_CORES_POWERED_L2); -+DEFINE_MALI_ADD_EVENT(PM_DESIRED_REACHED); -+DEFINE_MALI_ADD_EVENT(PM_DESIRED_REACHED_TILER); -+DEFINE_MALI_ADD_EVENT(PM_UNREQUEST_CHANGE_SHADER_NEEDED); -+DEFINE_MALI_ADD_EVENT(PM_REQUEST_CHANGE_SHADER_NEEDED); -+DEFINE_MALI_ADD_EVENT(PM_REGISTER_CHANGE_SHADER_NEEDED); -+DEFINE_MALI_ADD_EVENT(PM_REGISTER_CHANGE_SHADER_INUSE); -+DEFINE_MALI_ADD_EVENT(PM_RELEASE_CHANGE_SHADER_INUSE); -+DEFINE_MALI_ADD_EVENT(PM_CORES_AVAILABLE); -+DEFINE_MALI_ADD_EVENT(PM_CORES_AVAILABLE_TILER); -+DEFINE_MALI_ADD_EVENT(PM_CORES_CHANGE_AVAILABLE); -+DEFINE_MALI_ADD_EVENT(PM_CORES_CHANGE_AVAILABLE_TILER); -+DEFINE_MALI_ADD_EVENT(PM_GPU_ON); -+DEFINE_MALI_ADD_EVENT(PM_GPU_OFF); -+DEFINE_MALI_ADD_EVENT(PM_SET_POLICY); -+DEFINE_MALI_ADD_EVENT(PM_CURRENT_POLICY_INIT); -+DEFINE_MALI_ADD_EVENT(PM_CURRENT_POLICY_TERM); -+DEFINE_MALI_ADD_EVENT(PM_CA_SET_POLICY); -+DEFINE_MALI_ADD_EVENT(PM_WAKE_WAITERS); -+#undef DEFINE_MALI_ADD_EVENT ++ /* No specific check for BASE_JD_REQ_COHERENT_GROUP ++ * atoms - the policy will sort that out */ ++ return true; ++ } ++ } + -+#endif /* _TRACE_MALI_KBASE_H */ ++ /* Above checks failed mean we shouldn't use slot 2 */ ++ return false; ++} + -+#undef TRACE_INCLUDE_PATH -+#undef linux -+#define TRACE_INCLUDE_PATH . -+#undef TRACE_INCLUDE_FILE -+#define TRACE_INCLUDE_FILE mali_linux_kbase_trace ++/* ++ * As long as it has been decided to have a deeper modification of ++ * what job scheduler, power manager and affinity manager will ++ * implement, this function is just an intermediate step that ++ * assumes: ++ * - all working cores will be powered on when this is called. ++ * - largest current configuration is 2 core groups. ++ * - It has been decided not to have hardcoded values so the low ++ * and high cores in a core split will be evently distributed. ++ * - Odd combinations of core requirements have been filtered out ++ * and do not get to this function (e.g. CS+T+NSS is not ++ * supported here). ++ * - This function is frequently called and can be optimized, ++ * (see notes in loops), but as the functionallity will likely ++ * be modified, optimization has not been addressed. ++*/ ++bool kbase_js_choose_affinity(u64 * const affinity, ++ struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom, int js) ++{ ++ base_jd_core_req core_req = katom->core_req; ++ unsigned int num_core_groups = kbdev->gpu_props.num_core_groups; ++ u64 core_availability_mask; + -+/* This part must be outside protection */ -+#include -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_linux_trace.h b/drivers/gpu/arm/bifrost_for_linux/mali_linux_trace.h ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ core_availability_mask = kbase_pm_ca_get_core_mask(kbdev); ++ ++ /* ++ * If no cores are currently available (core availability policy is ++ * transitioning) then fail. ++ */ ++ if (0 == core_availability_mask) { ++ *affinity = 0; ++ return false; ++ } ++ ++ KBASE_DEBUG_ASSERT(js >= 0); ++ ++ if ((core_req & (BASE_JD_REQ_FS | BASE_JD_REQ_CS | BASE_JD_REQ_T)) == ++ BASE_JD_REQ_T) { ++ /* If the hardware supports XAFFINITY then we'll only enable ++ * the tiler (which is the default so this is a no-op), ++ * otherwise enable shader core 0. */ ++ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_XAFFINITY)) ++ *affinity = 1; ++ else ++ *affinity = 0; ++ ++ return true; ++ } ++ ++ if (1 == kbdev->gpu_props.num_cores) { ++ /* trivial case only one core, nothing to do */ ++ *affinity = core_availability_mask & ++ kbdev->pm.debug_core_mask[js]; ++ } else { ++ if ((core_req & (BASE_JD_REQ_COHERENT_GROUP | ++ BASE_JD_REQ_SPECIFIC_COHERENT_GROUP))) { ++ if (js == 0 || num_core_groups == 1) { ++ /* js[0] and single-core-group systems just get ++ * the first core group */ ++ *affinity = ++ kbdev->gpu_props.props.coherency_info.group[0].core_mask ++ & core_availability_mask & ++ kbdev->pm.debug_core_mask[js]; ++ } else { ++ /* js[1], js[2] use core groups 0, 1 for ++ * dual-core-group systems */ ++ u32 core_group_idx = ((u32) js) - 1; ++ ++ KBASE_DEBUG_ASSERT(core_group_idx < ++ num_core_groups); ++ *affinity = ++ kbdev->gpu_props.props.coherency_info.group[core_group_idx].core_mask ++ & core_availability_mask & ++ kbdev->pm.debug_core_mask[js]; ++ ++ /* If the job is specifically targeting core ++ * group 1 and the core availability policy is ++ * keeping that core group off, then fail */ ++ if (*affinity == 0 && core_group_idx == 1 && ++ kbdev->pm.backend.cg1_disabled ++ == true) ++ katom->event_code = ++ BASE_JD_EVENT_PM_EVENT; ++ } ++ } else { ++ /* All cores are available when no core split is ++ * required */ ++ *affinity = core_availability_mask & ++ kbdev->pm.debug_core_mask[js]; ++ } ++ } ++ ++ /* ++ * If no cores are currently available in the desired core group(s) ++ * (core availability policy is transitioning) then fail. ++ */ ++ if (*affinity == 0) ++ return false; ++ ++ /* Enable core 0 if tiler required for hardware without XAFFINITY ++ * support (notes above) */ ++ if (core_req & BASE_JD_REQ_T) { ++ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_XAFFINITY)) ++ *affinity = *affinity | 1; ++ } ++ ++ return true; ++} ++ ++static inline bool kbase_js_affinity_is_violating( ++ struct kbase_device *kbdev, ++ u64 *affinities) ++{ ++ /* This implementation checks whether the two slots involved in Generic ++ * thread creation have intersecting affinity. This is due to micro- ++ * architectural issues where a job in slot A targetting cores used by ++ * slot B could prevent the job in slot B from making progress until the ++ * job in slot A has completed. ++ */ ++ u64 affinity_set_left; ++ u64 affinity_set_right; ++ u64 intersection; ++ ++ KBASE_DEBUG_ASSERT(affinities != NULL); ++ ++ affinity_set_left = affinities[1]; ++ ++ affinity_set_right = affinities[2]; ++ ++ /* A violation occurs when any bit in the left_set is also in the ++ * right_set */ ++ intersection = affinity_set_left & affinity_set_right; ++ ++ return (bool) (intersection != (u64) 0u); ++} ++ ++bool kbase_js_affinity_would_violate(struct kbase_device *kbdev, int js, ++ u64 affinity) ++{ ++ struct kbasep_js_device_data *js_devdata; ++ u64 new_affinities[BASE_JM_MAX_NR_SLOTS]; ++ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(js < BASE_JM_MAX_NR_SLOTS); ++ js_devdata = &kbdev->js_data; ++ ++ memcpy(new_affinities, js_devdata->runpool_irq.slot_affinities, ++ sizeof(js_devdata->runpool_irq.slot_affinities)); ++ ++ new_affinities[js] |= affinity; ++ ++ return kbase_js_affinity_is_violating(kbdev, new_affinities); ++} ++ ++void kbase_js_affinity_retain_slot_cores(struct kbase_device *kbdev, int js, ++ u64 affinity) ++{ ++ struct kbasep_js_device_data *js_devdata; ++ u64 cores; ++ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(js < BASE_JM_MAX_NR_SLOTS); ++ js_devdata = &kbdev->js_data; ++ ++ KBASE_DEBUG_ASSERT(kbase_js_affinity_would_violate(kbdev, js, affinity) ++ == false); ++ ++ cores = affinity; ++ while (cores) { ++ int bitnum = fls64(cores) - 1; ++ u64 bit = 1ULL << bitnum; ++ s8 cnt; ++ ++ cnt = ++ ++(js_devdata->runpool_irq.slot_affinity_refcount[js][bitnum]); ++ ++ if (cnt == 1) ++ js_devdata->runpool_irq.slot_affinities[js] |= bit; ++ ++ cores &= ~bit; ++ } ++} ++ ++void kbase_js_affinity_release_slot_cores(struct kbase_device *kbdev, int js, ++ u64 affinity) ++{ ++ struct kbasep_js_device_data *js_devdata; ++ u64 cores; ++ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(js < BASE_JM_MAX_NR_SLOTS); ++ js_devdata = &kbdev->js_data; ++ ++ cores = affinity; ++ while (cores) { ++ int bitnum = fls64(cores) - 1; ++ u64 bit = 1ULL << bitnum; ++ s8 cnt; ++ ++ KBASE_DEBUG_ASSERT( ++ js_devdata->runpool_irq.slot_affinity_refcount[js][bitnum] > 0); ++ ++ cnt = ++ --(js_devdata->runpool_irq.slot_affinity_refcount[js][bitnum]); ++ ++ if (0 == cnt) ++ js_devdata->runpool_irq.slot_affinities[js] &= ~bit; ++ ++ cores &= ~bit; ++ } ++} ++ ++#if KBASE_TRACE_ENABLE ++void kbase_js_debug_log_current_affinities(struct kbase_device *kbdev) ++{ ++ struct kbasep_js_device_data *js_devdata; ++ int slot_nr; ++ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ js_devdata = &kbdev->js_data; ++ ++ for (slot_nr = 0; slot_nr < 3; ++slot_nr) ++ KBASE_TRACE_ADD_SLOT_INFO(kbdev, JS_AFFINITY_CURRENT, NULL, ++ NULL, 0u, slot_nr, ++ (u32) js_devdata->runpool_irq.slot_affinities[slot_nr]); ++} ++#endif /* KBASE_TRACE_ENABLE */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h new file mode 100755 -index 000000000000..2be06a552768 +index 000000000..35d9781ae --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_linux_trace.h -@@ -0,0 +1,189 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h +@@ -0,0 +1,129 @@ +/* + * + * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. @@ -330773,187 +366759,127 @@ index 000000000000..2be06a552768 + + + -+#if !defined(_TRACE_MALI_H) || defined(TRACE_HEADER_MULTI_READ) -+#define _TRACE_MALI_H -+ -+#undef TRACE_SYSTEM -+#define TRACE_SYSTEM mali -+#define TRACE_INCLUDE_FILE mali_linux_trace -+ -+#include + -+#define MALI_JOB_SLOTS_EVENT_CHANGED + -+/** -+ * mali_job_slots_event - called from mali_kbase_core_linux.c -+ * @event_id: ORed together bitfields representing a type of event, made with the GATOR_MAKE_EVENT() macro. ++/* ++ * Affinity Manager internal APIs. + */ -+TRACE_EVENT(mali_job_slots_event, -+ TP_PROTO(unsigned int event_id, unsigned int tgid, unsigned int pid, -+ unsigned char job_id), -+ TP_ARGS(event_id, tgid, pid, job_id), -+ TP_STRUCT__entry( -+ __field(unsigned int, event_id) -+ __field(unsigned int, tgid) -+ __field(unsigned int, pid) -+ __field(unsigned char, job_id) -+ ), -+ TP_fast_assign( -+ __entry->event_id = event_id; -+ __entry->tgid = tgid; -+ __entry->pid = pid; -+ __entry->job_id = job_id; -+ ), -+ TP_printk("event=%u tgid=%u pid=%u job_id=%u", -+ __entry->event_id, __entry->tgid, __entry->pid, __entry->job_id) -+); + -+/** -+ * mali_pm_status - Called by mali_kbase_pm_driver.c -+ * @event_id: core type (shader, tiler, l2 cache) -+ * @value: 64bits bitmask reporting either power status of the cores (1-ON, 0-OFF) -+ */ -+TRACE_EVENT(mali_pm_status, -+ TP_PROTO(unsigned int event_id, unsigned long long value), -+ TP_ARGS(event_id, value), -+ TP_STRUCT__entry( -+ __field(unsigned int, event_id) -+ __field(unsigned long long, value) -+ ), -+ TP_fast_assign( -+ __entry->event_id = event_id; -+ __entry->value = value; -+ ), -+ TP_printk("event %u = %llu", __entry->event_id, __entry->value) -+); ++#ifndef _KBASE_JS_AFFINITY_H_ ++#define _KBASE_JS_AFFINITY_H_ + +/** -+ * mali_pm_power_on - Called by mali_kbase_pm_driver.c -+ * @event_id: core type (shader, tiler, l2 cache) -+ * @value: 64bits bitmask reporting the cores to power up ++ * kbase_js_can_run_job_on_slot_no_lock - Decide whether it is possible to ++ * submit a job to a particular job slot in the current status ++ * ++ * @kbdev: The kbase device structure of the device ++ * @js: Job slot number to check for allowance ++ * ++ * Will check if submitting to the given job slot is allowed in the current ++ * status. For example using job slot 2 while in soft-stoppable state and only ++ * having 1 coregroup is not allowed by the policy. This function should be ++ * called prior to submitting a job to a slot to make sure policy rules are not ++ * violated. ++ * ++ * The following locking conditions are made on the caller ++ * - it must hold hwaccess_lock + */ -+TRACE_EVENT(mali_pm_power_on, -+ TP_PROTO(unsigned int event_id, unsigned long long value), -+ TP_ARGS(event_id, value), -+ TP_STRUCT__entry( -+ __field(unsigned int, event_id) -+ __field(unsigned long long, value) -+ ), -+ TP_fast_assign( -+ __entry->event_id = event_id; -+ __entry->value = value; -+ ), -+ TP_printk("event %u = %llu", __entry->event_id, __entry->value) -+); ++bool kbase_js_can_run_job_on_slot_no_lock(struct kbase_device *kbdev, int js); + +/** -+ * mali_pm_power_off - Called by mali_kbase_pm_driver.c -+ * @event_id: core type (shader, tiler, l2 cache) -+ * @value: 64bits bitmask reporting the cores to power down ++ * kbase_js_choose_affinity - Compute affinity for a given job. ++ * ++ * @affinity: Affinity bitmap computed ++ * @kbdev: The kbase device structure of the device ++ * @katom: Job chain of which affinity is going to be found ++ * @js: Slot the job chain is being submitted ++ * ++ * Currently assumes an all-on/all-off power management policy. ++ * Also assumes there is at least one core with tiler available. ++ * ++ * Returns true if a valid affinity was chosen, false if ++ * no cores were available. + */ -+TRACE_EVENT(mali_pm_power_off, -+ TP_PROTO(unsigned int event_id, unsigned long long value), -+ TP_ARGS(event_id, value), -+ TP_STRUCT__entry( -+ __field(unsigned int, event_id) -+ __field(unsigned long long, value) -+ ), -+ TP_fast_assign( -+ __entry->event_id = event_id; -+ __entry->value = value; -+ ), -+ TP_printk("event %u = %llu", __entry->event_id, __entry->value) -+); ++bool kbase_js_choose_affinity(u64 * const affinity, ++ struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom, ++ int js); + +/** -+ * mali_page_fault_insert_pages - Called by page_fault_worker() -+ * it reports an MMU page fault resulting in new pages being mapped. -+ * @event_id: MMU address space number. -+ * @value: number of newly allocated pages ++ * kbase_js_affinity_would_violate - Determine whether a proposed affinity on ++ * job slot @js would cause a violation of affinity restrictions. ++ * ++ * @kbdev: Kbase device structure ++ * @js: The job slot to test ++ * @affinity: The affinity mask to test ++ * ++ * The following locks must be held by the caller ++ * - hwaccess_lock ++ * ++ * Return: true if the affinity would violate the restrictions + */ -+TRACE_EVENT(mali_page_fault_insert_pages, -+ TP_PROTO(int event_id, unsigned long value), -+ TP_ARGS(event_id, value), -+ TP_STRUCT__entry( -+ __field(int, event_id) -+ __field(unsigned long, value) -+ ), -+ TP_fast_assign( -+ __entry->event_id = event_id; -+ __entry->value = value; -+ ), -+ TP_printk("event %d = %lu", __entry->event_id, __entry->value) -+); ++bool kbase_js_affinity_would_violate(struct kbase_device *kbdev, int js, ++ u64 affinity); + +/** -+ * mali_mmu_as_in_use - Called by assign_and_activate_kctx_addr_space() -+ * it reports that a certain MMU address space is in use now. -+ * @event_id: MMU address space number. ++ * kbase_js_affinity_retain_slot_cores - Affinity tracking: retain cores used by ++ * a slot ++ * ++ * @kbdev: Kbase device structure ++ * @js: The job slot retaining the cores ++ * @affinity: The cores to retain ++ * ++ * The following locks must be held by the caller ++ * - hwaccess_lock + */ -+TRACE_EVENT(mali_mmu_as_in_use, -+ TP_PROTO(int event_id), -+ TP_ARGS(event_id), -+ TP_STRUCT__entry( -+ __field(int, event_id) -+ ), -+ TP_fast_assign( -+ __entry->event_id = event_id; -+ ), -+ TP_printk("event=%d", __entry->event_id) -+); ++void kbase_js_affinity_retain_slot_cores(struct kbase_device *kbdev, int js, ++ u64 affinity); + +/** -+ * mali_mmu_as_released - Called by kbasep_js_runpool_release_ctx_internal() -+ * it reports that a certain MMU address space has been released now. -+ * @event_id: MMU address space number. ++ * kbase_js_affinity_release_slot_cores - Affinity tracking: release cores used ++ * by a slot ++ * ++ * @kbdev: Kbase device structure ++ * @js: Job slot ++ * @affinity: Bit mask of core to be released ++ * ++ * Cores must be released as soon as a job is dequeued from a slot's 'submit ++ * slots', and before another job is submitted to those slots. Otherwise, the ++ * refcount could exceed the maximum number submittable to a slot, ++ * %BASE_JM_SUBMIT_SLOTS. ++ * ++ * The following locks must be held by the caller ++ * - hwaccess_lock + */ -+TRACE_EVENT(mali_mmu_as_released, -+ TP_PROTO(int event_id), -+ TP_ARGS(event_id), -+ TP_STRUCT__entry( -+ __field(int, event_id) -+ ), -+ TP_fast_assign( -+ __entry->event_id = event_id; -+ ), -+ TP_printk("event=%d", __entry->event_id) -+); ++void kbase_js_affinity_release_slot_cores(struct kbase_device *kbdev, int js, ++ u64 affinity); + +/** -+ * mali_total_alloc_pages_change - Called by kbase_atomic_add_pages() -+ * and by kbase_atomic_sub_pages() -+ * it reports that the total number of allocated pages is changed. -+ * @event_id: number of pages to be added or subtracted (according to the sign). ++ * kbase_js_debug_log_current_affinities - log the current affinities ++ * ++ * @kbdev: Kbase device structure ++ * ++ * Output to the Trace log the current tracked affinities on all slots + */ -+TRACE_EVENT(mali_total_alloc_pages_change, -+ TP_PROTO(long long int event_id), -+ TP_ARGS(event_id), -+ TP_STRUCT__entry( -+ __field(long long int, event_id) -+ ), -+ TP_fast_assign( -+ __entry->event_id = event_id; -+ ), -+ TP_printk("event=%lld", __entry->event_id) -+); -+ -+#endif /* _TRACE_MALI_H */ -+ -+#undef TRACE_INCLUDE_PATH -+#undef linux -+#define TRACE_INCLUDE_PATH . ++#if KBASE_TRACE_ENABLE ++void kbase_js_debug_log_current_affinities(struct kbase_device *kbdev); ++#else /* KBASE_TRACE_ENABLE */ ++static inline void ++kbase_js_debug_log_current_affinities(struct kbase_device *kbdev) ++{ ++} ++#endif /* KBASE_TRACE_ENABLE */ + -+/* This part must be outside protection */ -+#include -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_malisw.h b/drivers/gpu/arm/bifrost_for_linux/mali_malisw.h ++#endif /* _KBASE_JS_AFFINITY_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c new file mode 100755 -index 000000000000..99452933eab4 +index 000000000..a8c1af23a --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_malisw.h -@@ -0,0 +1,131 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c +@@ -0,0 +1,356 @@ +/* + * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -330968,129 +366894,354 @@ index 000000000000..99452933eab4 + + + -+/** -+ * Kernel-wide include for common macros and types. -+ */ + -+#ifndef _MALISW_H_ -+#define _MALISW_H_ ++/* ++ * Register-based HW access backend specific job scheduler APIs ++ */ + -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) -+#define U8_MAX ((u8)~0U) -+#define S8_MAX ((s8)(U8_MAX>>1)) -+#define S8_MIN ((s8)(-S8_MAX - 1)) -+#define U16_MAX ((u16)~0U) -+#define S16_MAX ((s16)(U16_MAX>>1)) -+#define S16_MIN ((s16)(-S16_MAX - 1)) -+#define U32_MAX ((u32)~0U) -+#define S32_MAX ((s32)(U32_MAX>>1)) -+#define S32_MIN ((s32)(-S32_MAX - 1)) -+#define U64_MAX ((u64)~0ULL) -+#define S64_MAX ((s64)(U64_MAX>>1)) -+#define S64_MIN ((s64)(-S64_MAX - 1)) -+#endif /* LINUX_VERSION_CODE */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) -+#define SIZE_MAX (~(size_t)0) -+#endif /* LINUX_VERSION_CODE */ ++#include ++#include ++#include ++#include + -+/** -+ * MIN - Return the lesser of two values. -+ * -+ * As a macro it may evaluate its arguments more than once. -+ * Refer to MAX macro for more details ++/* ++ * Define for when dumping is enabled. ++ * This should not be based on the instrumentation level as whether dumping is ++ * enabled for a particular level is down to the integrator. However this is ++ * being used for now as otherwise the cinstr headers would be needed. + */ -+#define MIN(x, y) ((x) < (y) ? (x) : (y)) ++#define CINSTR_DUMPING_ENABLED (2 == MALI_INSTRUMENTATION_LEVEL) + -+/** -+ * MAX - Return the greater of two values. -+ * -+ * As a macro it may evaluate its arguments more than once. -+ * If called on the same two arguments as MIN it is guaranteed to return -+ * the one that MIN didn't return. This is significant for types where not -+ * all values are comparable e.g. NaNs in floating-point types. But if you want -+ * to retrieve the min and max of two values, consider using a conditional swap -+ * instead. ++/* ++ * Hold the runpool_mutex for this + */ -+#define MAX(x, y) ((x) < (y) ? (y) : (x)) ++static inline bool timer_callback_should_run(struct kbase_device *kbdev) ++{ ++ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; ++ s8 nr_running_ctxs; + -+/** -+ * @hideinitializer -+ * Function-like macro for suppressing unused variable warnings. Where possible -+ * such variables should be removed; this macro is present for cases where we -+ * much support API backwards compatibility. -+ */ -+#define CSTD_UNUSED(x) ((void)(x)) ++ lockdep_assert_held(&kbdev->js_data.runpool_mutex); + -+/** -+ * @hideinitializer -+ * Function-like macro for use where "no behavior" is desired. This is useful -+ * when compile time macros turn a function-like macro in to a no-op, but -+ * where having no statement is otherwise invalid. -+ */ -+#define CSTD_NOP(...) ((void)#__VA_ARGS__) ++ /* Timer must stop if we are suspending */ ++ if (backend->suspend_timer) ++ return false; + -+/** -+ * Function-like macro for converting a pointer in to a u64 for storing into -+ * an external data structure. This is commonly used when pairing a 32-bit -+ * CPU with a 64-bit peripheral, such as a Midgard GPU. C's type promotion -+ * is complex and a straight cast does not work reliably as pointers are -+ * often considered as signed. -+ */ -+#define PTR_TO_U64(x) ((uint64_t)((uintptr_t)(x))) ++ /* nr_contexts_pullable is updated with the runpool_mutex. However, the ++ * locking in the caller gives us a barrier that ensures ++ * nr_contexts_pullable is up-to-date for reading */ ++ nr_running_ctxs = atomic_read(&kbdev->js_data.nr_contexts_runnable); + -+/** -+ * @hideinitializer -+ * Function-like macro for stringizing a single level macro. -+ * @code -+ * #define MY_MACRO 32 -+ * CSTD_STR1( MY_MACRO ) -+ * > "MY_MACRO" -+ * @endcode -+ */ -+#define CSTD_STR1(x) #x ++#ifdef CONFIG_MALI_DEBUG ++ if (kbdev->js_data.softstop_always) { ++ /* Debug support for allowing soft-stop on a single context */ ++ return true; ++ } ++#endif /* CONFIG_MALI_DEBUG */ + -+/** -+ * @hideinitializer -+ * Function-like macro for stringizing a macro's value. This should not be used -+ * if the macro is defined in a way which may have no value; use the -+ * alternative @c CSTD_STR2N macro should be used instead. -+ * @code -+ * #define MY_MACRO 32 -+ * CSTD_STR2( MY_MACRO ) -+ * > "32" -+ * @endcode -+ */ -+#define CSTD_STR2(x) CSTD_STR1(x) ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_9435)) { ++ /* Timeouts would have to be 4x longer (due to micro- ++ * architectural design) to support OpenCL conformance tests, so ++ * only run the timer when there's: ++ * - 2 or more CL contexts ++ * - 1 or more GLES contexts ++ * ++ * NOTE: We will treat a context that has both Compute and Non- ++ * Compute jobs will be treated as an OpenCL context (hence, we ++ * don't check KBASEP_JS_CTX_ATTR_NON_COMPUTE). ++ */ ++ { ++ s8 nr_compute_ctxs = ++ kbasep_js_ctx_attr_count_on_runpool(kbdev, ++ KBASEP_JS_CTX_ATTR_COMPUTE); ++ s8 nr_noncompute_ctxs = nr_running_ctxs - ++ nr_compute_ctxs; + -+/** -+ * Specify an assertion value which is evaluated at compile time. Recommended -+ * usage is specification of a @c static @c INLINE function containing all of -+ * the assertions thus: -+ * -+ * @code -+ * static INLINE [module]_compile_time_assertions( void ) -+ * { -+ * COMPILE_TIME_ASSERT( sizeof(uintptr_t) == sizeof(intptr_t) ); -+ * } -+ * @endcode -+ * -+ * @note Use @c static not @c STATIC. We never want to turn off this @c static -+ * specification for testing purposes. -+ */ -+#define CSTD_COMPILE_TIME_ASSERT(expr) \ -+ do { switch (0) { case 0: case (expr):; } } while (false) ++ return (bool) (nr_compute_ctxs >= 2 || ++ nr_noncompute_ctxs > 0); ++ } ++ } else { ++ /* Run the timer callback whenever you have at least 1 context ++ */ ++ return (bool) (nr_running_ctxs > 0); ++ } ++} + -+#endif /* _MALISW_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_midg_coherency.h b/drivers/gpu/arm/bifrost_for_linux/mali_midg_coherency.h ++static enum hrtimer_restart timer_callback(struct hrtimer *timer) ++{ ++ unsigned long flags; ++ struct kbase_device *kbdev; ++ struct kbasep_js_device_data *js_devdata; ++ struct kbase_backend_data *backend; ++ int s; ++ bool reset_needed = false; ++ ++ KBASE_DEBUG_ASSERT(timer != NULL); ++ ++ backend = container_of(timer, struct kbase_backend_data, ++ scheduling_timer); ++ kbdev = container_of(backend, struct kbase_device, hwaccess.backend); ++ js_devdata = &kbdev->js_data; ++ ++ /* Loop through the slots */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ for (s = 0; s < kbdev->gpu_props.num_job_slots; s++) { ++ struct kbase_jd_atom *atom = NULL; ++ ++ if (kbase_backend_nr_atoms_on_slot(kbdev, s) > 0) { ++ atom = kbase_gpu_inspect(kbdev, s, 0); ++ KBASE_DEBUG_ASSERT(atom != NULL); ++ } ++ ++ if (atom != NULL) { ++ /* The current version of the model doesn't support ++ * Soft-Stop */ ++ if (!kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_5736)) { ++ u32 ticks = atom->ticks++; ++ ++#if !CINSTR_DUMPING_ENABLED ++ u32 soft_stop_ticks, hard_stop_ticks, ++ gpu_reset_ticks; ++ if (atom->core_req & BASE_JD_REQ_ONLY_COMPUTE) { ++ soft_stop_ticks = ++ js_devdata->soft_stop_ticks_cl; ++ hard_stop_ticks = ++ js_devdata->hard_stop_ticks_cl; ++ gpu_reset_ticks = ++ js_devdata->gpu_reset_ticks_cl; ++ } else { ++ soft_stop_ticks = ++ js_devdata->soft_stop_ticks; ++ hard_stop_ticks = ++ js_devdata->hard_stop_ticks_ss; ++ gpu_reset_ticks = ++ js_devdata->gpu_reset_ticks_ss; ++ } ++ ++ /* If timeouts have been changed then ensure ++ * that atom tick count is not greater than the ++ * new soft_stop timeout. This ensures that ++ * atoms do not miss any of the timeouts due to ++ * races between this worker and the thread ++ * changing the timeouts. */ ++ if (backend->timeouts_updated && ++ ticks > soft_stop_ticks) ++ ticks = atom->ticks = soft_stop_ticks; ++ ++ /* Job is Soft-Stoppable */ ++ if (ticks == soft_stop_ticks) { ++ int disjoint_threshold = ++ KBASE_DISJOINT_STATE_INTERLEAVED_CONTEXT_COUNT_THRESHOLD; ++ u32 softstop_flags = 0u; ++ /* Job has been scheduled for at least ++ * js_devdata->soft_stop_ticks ticks. ++ * Soft stop the slot so we can run ++ * other jobs. ++ */ ++ dev_dbg(kbdev->dev, "Soft-stop"); ++#if !KBASE_DISABLE_SCHEDULING_SOFT_STOPS ++ /* nr_user_contexts_running is updated ++ * with the runpool_mutex, but we can't ++ * take that here. ++ * ++ * However, if it's about to be ++ * increased then the new context can't ++ * run any jobs until they take the ++ * hwaccess_lock, so it's OK to observe ++ * the older value. ++ * ++ * Similarly, if it's about to be ++ * decreased, the last job from another ++ * context has already finished, so it's ++ * not too bad that we observe the older ++ * value and register a disjoint event ++ * when we try soft-stopping */ ++ if (js_devdata->nr_user_contexts_running ++ >= disjoint_threshold) ++ softstop_flags |= ++ JS_COMMAND_SW_CAUSES_DISJOINT; ++ ++ kbase_job_slot_softstop_swflags(kbdev, ++ s, atom, softstop_flags); ++#endif ++ } else if (ticks == hard_stop_ticks) { ++ /* Job has been scheduled for at least ++ * js_devdata->hard_stop_ticks_ss ticks. ++ * It should have been soft-stopped by ++ * now. Hard stop the slot. ++ */ ++#if !KBASE_DISABLE_SCHEDULING_HARD_STOPS ++ int ms = ++ js_devdata->scheduling_period_ns ++ / 1000000u; ++ dev_warn(kbdev->dev, "JS: Job Hard-Stopped (took more than %lu ticks at %lu ms/tick)", ++ (unsigned long)ticks, ++ (unsigned long)ms); ++ kbase_job_slot_hardstop(atom->kctx, s, ++ atom); ++#endif ++ } else if (ticks == gpu_reset_ticks) { ++ /* Job has been scheduled for at least ++ * js_devdata->gpu_reset_ticks_ss ticks. ++ * It should have left the GPU by now. ++ * Signal that the GPU needs to be ++ * reset. ++ */ ++ reset_needed = true; ++ } ++#else /* !CINSTR_DUMPING_ENABLED */ ++ /* NOTE: During CINSTR_DUMPING_ENABLED, we use ++ * the alternate timeouts, which makes the hard- ++ * stop and GPU reset timeout much longer. We ++ * also ensure that we don't soft-stop at all. ++ */ ++ if (ticks == js_devdata->soft_stop_ticks) { ++ /* Job has been scheduled for at least ++ * js_devdata->soft_stop_ticks. We do ++ * not soft-stop during ++ * CINSTR_DUMPING_ENABLED, however. ++ */ ++ dev_dbg(kbdev->dev, "Soft-stop"); ++ } else if (ticks == ++ js_devdata->hard_stop_ticks_dumping) { ++ /* Job has been scheduled for at least ++ * js_devdata->hard_stop_ticks_dumping ++ * ticks. Hard stop the slot. ++ */ ++#if !KBASE_DISABLE_SCHEDULING_HARD_STOPS ++ int ms = ++ js_devdata->scheduling_period_ns ++ / 1000000u; ++ dev_warn(kbdev->dev, "JS: Job Hard-Stopped (took more than %lu ticks at %lu ms/tick)", ++ (unsigned long)ticks, ++ (unsigned long)ms); ++ kbase_job_slot_hardstop(atom->kctx, s, ++ atom); ++#endif ++ } else if (ticks == ++ js_devdata->gpu_reset_ticks_dumping) { ++ /* Job has been scheduled for at least ++ * js_devdata->gpu_reset_ticks_dumping ++ * ticks. It should have left the GPU by ++ * now. Signal that the GPU needs to be ++ * reset. ++ */ ++ reset_needed = true; ++ } ++#endif /* !CINSTR_DUMPING_ENABLED */ ++ } ++ } ++ } ++#if KBASE_GPU_RESET_EN ++ if (reset_needed) { ++ dev_err(kbdev->dev, "JS: Job has been on the GPU for too long (JS_RESET_TICKS_SS/DUMPING timeout hit). Issueing GPU soft-reset to resolve."); ++ ++ if (kbase_prepare_to_reset_gpu_locked(kbdev)) ++ kbase_reset_gpu_locked(kbdev); ++ } ++#endif /* KBASE_GPU_RESET_EN */ ++ /* the timer is re-issued if there is contexts in the run-pool */ ++ ++ if (backend->timer_running) ++ hrtimer_start(&backend->scheduling_timer, ++ HR_TIMER_DELAY_NSEC(js_devdata->scheduling_period_ns), ++ HRTIMER_MODE_REL); ++ ++ backend->timeouts_updated = false; ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ return HRTIMER_NORESTART; ++} ++ ++void kbase_backend_ctx_count_changed(struct kbase_device *kbdev) ++{ ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; ++ unsigned long flags; ++ ++ lockdep_assert_held(&js_devdata->runpool_mutex); ++ ++ if (!timer_callback_should_run(kbdev)) { ++ /* Take spinlock to force synchronisation with timer */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ backend->timer_running = false; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ /* From now on, return value of timer_callback_should_run() will ++ * also cause the timer to not requeue itself. Its return value ++ * cannot change, because it depends on variables updated with ++ * the runpool_mutex held, which the caller of this must also ++ * hold */ ++ hrtimer_cancel(&backend->scheduling_timer); ++ } ++ ++ if (timer_callback_should_run(kbdev) && !backend->timer_running) { ++ /* Take spinlock to force synchronisation with timer */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ backend->timer_running = true; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ hrtimer_start(&backend->scheduling_timer, ++ HR_TIMER_DELAY_NSEC(js_devdata->scheduling_period_ns), ++ HRTIMER_MODE_REL); ++ ++ KBASE_TRACE_ADD(kbdev, JS_POLICY_TIMER_START, NULL, NULL, 0u, ++ 0u); ++ } ++} ++ ++int kbase_backend_timer_init(struct kbase_device *kbdev) ++{ ++ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; ++ ++ hrtimer_init(&backend->scheduling_timer, CLOCK_MONOTONIC, ++ HRTIMER_MODE_REL); ++ backend->scheduling_timer.function = timer_callback; ++ ++ backend->timer_running = false; ++ ++ return 0; ++} ++ ++void kbase_backend_timer_term(struct kbase_device *kbdev) ++{ ++ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; ++ ++ hrtimer_cancel(&backend->scheduling_timer); ++} ++ ++void kbase_backend_timer_suspend(struct kbase_device *kbdev) ++{ ++ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; ++ ++ backend->suspend_timer = true; ++ ++ kbase_backend_ctx_count_changed(kbdev); ++} ++ ++void kbase_backend_timer_resume(struct kbase_device *kbdev) ++{ ++ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; ++ ++ backend->suspend_timer = false; ++ ++ kbase_backend_ctx_count_changed(kbdev); ++} ++ ++void kbase_backend_timeouts_changed(struct kbase_device *kbdev) ++{ ++ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; ++ ++ backend->timeouts_updated = true; ++} ++ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h new file mode 100755 -index 000000000000..a509cbd5f175 +index 000000000..3f53779c6 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_midg_coherency.h -@@ -0,0 +1,26 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h +@@ -0,0 +1,69 @@ +/* + * -+ * (C) COPYRIGHT 2015 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -331105,24 +367256,67 @@ index 000000000000..a509cbd5f175 + + + -+#ifndef _MIDG_COHERENCY_H_ -+#define _MIDG_COHERENCY_H_ + -+#define COHERENCY_ACE_LITE 0 -+#define COHERENCY_ACE 1 -+#define COHERENCY_NONE 31 -+#define COHERENCY_FEATURE_BIT(x) (1 << (x)) ++/* ++ * Register-based HW access backend specific job scheduler APIs ++ */ + -+#endif /* _MIDG_COHERENCY_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_midg_regmap.h b/drivers/gpu/arm/bifrost_for_linux/mali_midg_regmap.h ++#ifndef _KBASE_JS_BACKEND_H_ ++#define _KBASE_JS_BACKEND_H_ ++ ++/** ++ * kbase_backend_timer_init() - Initialise the JS scheduling timer ++ * @kbdev: Device pointer ++ * ++ * This function should be called at driver initialisation ++ * ++ * Return: 0 on success ++ */ ++int kbase_backend_timer_init(struct kbase_device *kbdev); ++ ++/** ++ * kbase_backend_timer_term() - Terminate the JS scheduling timer ++ * @kbdev: Device pointer ++ * ++ * This function should be called at driver termination ++ */ ++void kbase_backend_timer_term(struct kbase_device *kbdev); ++ ++/** ++ * kbase_backend_timer_suspend - Suspend is happening, stop the JS scheduling ++ * timer ++ * @kbdev: Device pointer ++ * ++ * This function should be called on suspend, after the active count has reached ++ * zero. This is required as the timer may have been started on job submission ++ * to the job scheduler, but before jobs are submitted to the GPU. ++ * ++ * Caller must hold runpool_mutex. ++ */ ++void kbase_backend_timer_suspend(struct kbase_device *kbdev); ++ ++/** ++ * kbase_backend_timer_resume - Resume is happening, re-evaluate the JS ++ * scheduling timer ++ * @kbdev: Device pointer ++ * ++ * This function should be called on resume. Note that is is not guaranteed to ++ * re-start the timer, only evalute whether it should be re-started. ++ * ++ * Caller must hold runpool_mutex. ++ */ ++void kbase_backend_timer_resume(struct kbase_device *kbdev); ++ ++#endif /* _KBASE_JS_BACKEND_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c new file mode 100755 -index 000000000000..554ed8dcb3eb +index 000000000..ba826184d --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_midg_regmap.h -@@ -0,0 +1,611 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c +@@ -0,0 +1,407 @@ +/* + * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -331136,610 +367330,606 @@ index 000000000000..554ed8dcb3eb + */ + + ++/* #define ENABLE_DEBUG_LOG */ ++#include "../../platform/rk/custom_log.h" + -+#ifndef _MIDGARD_REGMAP_H_ -+#define _MIDGARD_REGMAP_H_ -+ -+#include "mali_midg_coherency.h" -+#include "mali_kbase_gpu_id.h" ++#include + -+/* -+ * Begin Register Offsets -+ */ ++#include ++#include ++#include ++#include ++#include ++#include + -+#define GPU_CONTROL_BASE 0x0000 -+#define GPU_CONTROL_REG(r) (GPU_CONTROL_BASE + (r)) -+#define GPU_ID 0x000 /* (RO) GPU and revision identifier */ -+#define L2_FEATURES 0x004 /* (RO) Level 2 cache features */ -+#define SUSPEND_SIZE 0x008 /* (RO) Fixed-function suspend buffer -+ size */ -+#define TILER_FEATURES 0x00C /* (RO) Tiler Features */ -+#define MEM_FEATURES 0x010 /* (RO) Memory system features */ -+#define MMU_FEATURES 0x014 /* (RO) MMU features */ -+#define AS_PRESENT 0x018 /* (RO) Address space slots present */ -+#define JS_PRESENT 0x01C /* (RO) Job slots present */ -+#define GPU_IRQ_RAWSTAT 0x020 /* (RW) */ -+#define GPU_IRQ_CLEAR 0x024 /* (WO) */ -+#define GPU_IRQ_MASK 0x028 /* (RW) */ -+#define GPU_IRQ_STATUS 0x02C /* (RO) */ ++static inline u64 lock_region(struct kbase_device *kbdev, u64 pfn, ++ u32 num_pages) ++{ ++ u64 region; + -+/* IRQ flags */ -+#define GPU_FAULT (1 << 0) /* A GPU Fault has occurred */ -+#define MULTIPLE_GPU_FAULTS (1 << 7) /* More than one GPU Fault occurred. */ -+#define RESET_COMPLETED (1 << 8) /* Set when a reset has completed. Intended to use with SOFT_RESET -+ commands which may take time. */ -+#define POWER_CHANGED_SINGLE (1 << 9) /* Set when a single core has finished powering up or down. */ -+#define POWER_CHANGED_ALL (1 << 10) /* Set when all cores have finished powering up or down -+ and the power manager is idle. */ ++ /* can't lock a zero sized range */ ++ KBASE_DEBUG_ASSERT(num_pages); + -+#define PRFCNT_SAMPLE_COMPLETED (1 << 16) /* Set when a performance count sample has completed. */ -+#define CLEAN_CACHES_COMPLETED (1 << 17) /* Set when a cache clean operation has completed. */ ++ region = pfn << PAGE_SHIFT; ++ /* ++ * fls returns (given the ASSERT above): ++ * 1 .. 32 ++ * ++ * 10 + fls(num_pages) ++ * results in the range (11 .. 42) ++ */ + -+#define GPU_IRQ_REG_ALL (GPU_FAULT | MULTIPLE_GPU_FAULTS | RESET_COMPLETED \ -+ | POWER_CHANGED_ALL | PRFCNT_SAMPLE_COMPLETED) ++ /* gracefully handle num_pages being zero */ ++ if (0 == num_pages) { ++ region |= 11; ++ } else { ++ u8 region_width; + -+#define GPU_COMMAND 0x030 /* (WO) */ -+#define GPU_STATUS 0x034 /* (RO) */ -+#define LATEST_FLUSH 0x038 /* (RO) */ ++ region_width = 10 + fls(num_pages); ++ if (num_pages != (1ul << (region_width - 11))) { ++ /* not pow2, so must go up to the next pow2 */ ++ region_width += 1; ++ } ++ KBASE_DEBUG_ASSERT(region_width <= KBASE_LOCK_REGION_MAX_SIZE); ++ KBASE_DEBUG_ASSERT(region_width >= KBASE_LOCK_REGION_MIN_SIZE); ++ region |= region_width; ++ } + -+#define GROUPS_L2_COHERENT (1 << 0) /* Cores groups are l2 coherent */ -+#define GPU_DBGEN (1 << 8) /* DBGEN wire status */ ++ return region; ++} + -+#define GPU_FAULTSTATUS 0x03C /* (RO) GPU exception type and fault status */ -+#define GPU_FAULTADDRESS_LO 0x040 /* (RO) GPU exception fault address, low word */ -+#define GPU_FAULTADDRESS_HI 0x044 /* (RO) GPU exception fault address, high word */ ++static int wait_ready(struct kbase_device *kbdev, ++ unsigned int as_nr, struct kbase_context *kctx) ++{ ++ unsigned int max_loops = KBASE_AS_INACTIVE_MAX_LOOPS; ++ u32 val = kbase_reg_read(kbdev, MMU_AS_REG(as_nr, AS_STATUS), kctx); + -+#define PWR_KEY 0x050 /* (WO) Power manager key register */ -+#define PWR_OVERRIDE0 0x054 /* (RW) Power manager override settings */ -+#define PWR_OVERRIDE1 0x058 /* (RW) Power manager override settings */ ++ /* Wait for the MMU status to indicate there is no active command, in ++ * case one is pending. Do not log remaining register accesses. */ ++ while (--max_loops && (val & AS_STATUS_AS_ACTIVE)) ++ val = kbase_reg_read(kbdev, MMU_AS_REG(as_nr, AS_STATUS), NULL); + -+#define PRFCNT_BASE_LO 0x060 /* (RW) Performance counter memory region base address, low word */ -+#define PRFCNT_BASE_HI 0x064 /* (RW) Performance counter memory region base address, high word */ -+#define PRFCNT_CONFIG 0x068 /* (RW) Performance counter configuration */ -+#define PRFCNT_JM_EN 0x06C /* (RW) Performance counter enable flags for Job Manager */ -+#define PRFCNT_SHADER_EN 0x070 /* (RW) Performance counter enable flags for shader cores */ -+#define PRFCNT_TILER_EN 0x074 /* (RW) Performance counter enable flags for tiler */ -+#define PRFCNT_MMU_L2_EN 0x07C /* (RW) Performance counter enable flags for MMU/L2 cache */ ++ if (max_loops == 0) { ++ dev_err(kbdev->dev, "AS_ACTIVE bit stuck\n"); ++ return -1; ++ } + -+#define CYCLE_COUNT_LO 0x090 /* (RO) Cycle counter, low word */ -+#define CYCLE_COUNT_HI 0x094 /* (RO) Cycle counter, high word */ -+#define TIMESTAMP_LO 0x098 /* (RO) Global time stamp counter, low word */ -+#define TIMESTAMP_HI 0x09C /* (RO) Global time stamp counter, high word */ ++ /* If waiting in loop was performed, log last read value. */ ++ if (KBASE_AS_INACTIVE_MAX_LOOPS - 1 > max_loops) ++ kbase_reg_read(kbdev, MMU_AS_REG(as_nr, AS_STATUS), kctx); + -+#define THREAD_MAX_THREADS 0x0A0 /* (RO) Maximum number of threads per core */ -+#define THREAD_MAX_WORKGROUP_SIZE 0x0A4 /* (RO) Maximum workgroup size */ -+#define THREAD_MAX_BARRIER_SIZE 0x0A8 /* (RO) Maximum threads waiting at a barrier */ -+#define THREAD_FEATURES 0x0AC /* (RO) Thread features */ ++ return 0; ++} + -+#define TEXTURE_FEATURES_0 0x0B0 /* (RO) Support flags for indexed texture formats 0..31 */ -+#define TEXTURE_FEATURES_1 0x0B4 /* (RO) Support flags for indexed texture formats 32..63 */ -+#define TEXTURE_FEATURES_2 0x0B8 /* (RO) Support flags for indexed texture formats 64..95 */ ++static int write_cmd(struct kbase_device *kbdev, int as_nr, u32 cmd, ++ struct kbase_context *kctx) ++{ ++ int status; + -+#define TEXTURE_FEATURES_REG(n) GPU_CONTROL_REG(TEXTURE_FEATURES_0 + ((n) << 2)) ++ /* write AS_COMMAND when MMU is ready to accept another command */ ++ status = wait_ready(kbdev, as_nr, kctx); ++ if (status == 0) ++ kbase_reg_write(kbdev, MMU_AS_REG(as_nr, AS_COMMAND), cmd, ++ kctx); + -+#define JS0_FEATURES 0x0C0 /* (RO) Features of job slot 0 */ -+#define JS1_FEATURES 0x0C4 /* (RO) Features of job slot 1 */ -+#define JS2_FEATURES 0x0C8 /* (RO) Features of job slot 2 */ -+#define JS3_FEATURES 0x0CC /* (RO) Features of job slot 3 */ -+#define JS4_FEATURES 0x0D0 /* (RO) Features of job slot 4 */ -+#define JS5_FEATURES 0x0D4 /* (RO) Features of job slot 5 */ -+#define JS6_FEATURES 0x0D8 /* (RO) Features of job slot 6 */ -+#define JS7_FEATURES 0x0DC /* (RO) Features of job slot 7 */ -+#define JS8_FEATURES 0x0E0 /* (RO) Features of job slot 8 */ -+#define JS9_FEATURES 0x0E4 /* (RO) Features of job slot 9 */ -+#define JS10_FEATURES 0x0E8 /* (RO) Features of job slot 10 */ -+#define JS11_FEATURES 0x0EC /* (RO) Features of job slot 11 */ -+#define JS12_FEATURES 0x0F0 /* (RO) Features of job slot 12 */ -+#define JS13_FEATURES 0x0F4 /* (RO) Features of job slot 13 */ -+#define JS14_FEATURES 0x0F8 /* (RO) Features of job slot 14 */ -+#define JS15_FEATURES 0x0FC /* (RO) Features of job slot 15 */ ++ return status; ++} + -+#define JS_FEATURES_REG(n) GPU_CONTROL_REG(JS0_FEATURES + ((n) << 2)) ++static void validate_protected_page_fault(struct kbase_device *kbdev, ++ struct kbase_context *kctx) ++{ ++ /* GPUs which support (native) protected mode shall not report page ++ * fault addresses unless it has protected debug mode and protected ++ * debug mode is turned on */ ++ u32 protected_debug_mode = 0; + -+#define SHADER_PRESENT_LO 0x100 /* (RO) Shader core present bitmap, low word */ -+#define SHADER_PRESENT_HI 0x104 /* (RO) Shader core present bitmap, high word */ ++ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_MODE)) ++ return; + -+#define TILER_PRESENT_LO 0x110 /* (RO) Tiler core present bitmap, low word */ -+#define TILER_PRESENT_HI 0x114 /* (RO) Tiler core present bitmap, high word */ ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_DEBUG_MODE)) { ++ protected_debug_mode = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(GPU_STATUS), ++ kctx) & GPU_DBGEN; ++ } + -+#define L2_PRESENT_LO 0x120 /* (RO) Level 2 cache present bitmap, low word */ -+#define L2_PRESENT_HI 0x124 /* (RO) Level 2 cache present bitmap, high word */ ++ if (!protected_debug_mode) { ++ /* fault_addr should never be reported in protected mode. ++ * However, we just continue by printing an error message */ ++ dev_err(kbdev->dev, "Fault address reported in protected mode\n"); ++ } ++} + -+#define STACK_PRESENT_LO 0xE00 /* (RO) Core stack present bitmap, low word */ -+#define STACK_PRESENT_HI 0xE04 /* (RO) Core stack present bitmap, high word */ ++void kbase_mmu_interrupt(struct kbase_device *kbdev, u32 irq_stat) ++{ ++ const int num_as = 16; ++ const int busfault_shift = MMU_PAGE_FAULT_FLAGS; ++ const int pf_shift = 0; ++ const unsigned long as_bit_mask = (1UL << num_as) - 1; ++ unsigned long flags; ++ u32 new_mask; ++ u32 tmp; + ++ /* bus faults */ ++ u32 bf_bits = (irq_stat >> busfault_shift) & as_bit_mask; ++ /* page faults (note: Ignore ASes with both pf and bf) */ ++ u32 pf_bits = ((irq_stat >> pf_shift) & as_bit_mask) & ~bf_bits; + -+#define SHADER_READY_LO 0x140 /* (RO) Shader core ready bitmap, low word */ -+#define SHADER_READY_HI 0x144 /* (RO) Shader core ready bitmap, high word */ ++ KBASE_DEBUG_ASSERT(NULL != kbdev); + -+#define TILER_READY_LO 0x150 /* (RO) Tiler core ready bitmap, low word */ -+#define TILER_READY_HI 0x154 /* (RO) Tiler core ready bitmap, high word */ ++ /* remember current mask */ ++ spin_lock_irqsave(&kbdev->mmu_mask_change, flags); ++ new_mask = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_MASK), NULL); ++ /* mask interrupts for now */ ++ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_MASK), 0, NULL); ++ spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); + -+#define L2_READY_LO 0x160 /* (RO) Level 2 cache ready bitmap, low word */ -+#define L2_READY_HI 0x164 /* (RO) Level 2 cache ready bitmap, high word */ ++ while (bf_bits | pf_bits) { ++ struct kbase_as *as; ++ int as_no; ++ struct kbase_context *kctx; + -+#define STACK_READY_LO 0xE10 /* (RO) Core stack ready bitmap, low word */ -+#define STACK_READY_HI 0xE14 /* (RO) Core stack ready bitmap, high word */ ++ /* ++ * the while logic ensures we have a bit set, no need to check ++ * for not-found here ++ */ ++ as_no = ffs(bf_bits | pf_bits) - 1; ++ as = &kbdev->as[as_no]; + ++ /* ++ * Refcount the kctx ASAP - it shouldn't disappear anyway, since ++ * Bus/Page faults _should_ only occur whilst jobs are running, ++ * and a job causing the Bus/Page fault shouldn't complete until ++ * the MMU is updated ++ */ ++ kctx = kbasep_js_runpool_lookup_ctx(kbdev, as_no); ++ if (!kctx) { ++ E("fail to lookup ctx, to break out."); ++ break; ++ } + -+#define SHADER_PWRON_LO 0x180 /* (WO) Shader core power on bitmap, low word */ -+#define SHADER_PWRON_HI 0x184 /* (WO) Shader core power on bitmap, high word */ + -+#define TILER_PWRON_LO 0x190 /* (WO) Tiler core power on bitmap, low word */ -+#define TILER_PWRON_HI 0x194 /* (WO) Tiler core power on bitmap, high word */ ++ /* find faulting address */ ++ as->fault_addr = kbase_reg_read(kbdev, ++ MMU_AS_REG(as_no, ++ AS_FAULTADDRESS_HI), ++ kctx); ++ as->fault_addr <<= 32; ++ as->fault_addr |= kbase_reg_read(kbdev, ++ MMU_AS_REG(as_no, ++ AS_FAULTADDRESS_LO), ++ kctx); + -+#define L2_PWRON_LO 0x1A0 /* (WO) Level 2 cache power on bitmap, low word */ -+#define L2_PWRON_HI 0x1A4 /* (WO) Level 2 cache power on bitmap, high word */ ++ /* Mark the fault protected or not */ ++ as->protected_mode = kbdev->protected_mode; + -+#define STACK_PWRON_LO 0xE20 /* (RO) Core stack power on bitmap, low word */ -+#define STACK_PWRON_HI 0xE24 /* (RO) Core stack power on bitmap, high word */ ++ if (kbdev->protected_mode && as->fault_addr) ++ { ++ /* check if address reporting is allowed */ ++ validate_protected_page_fault(kbdev, kctx); ++ } + ++ /* report the fault to debugfs */ ++ kbase_as_fault_debugfs_new(kbdev, as_no); + -+#define SHADER_PWROFF_LO 0x1C0 /* (WO) Shader core power off bitmap, low word */ -+#define SHADER_PWROFF_HI 0x1C4 /* (WO) Shader core power off bitmap, high word */ ++ /* record the fault status */ ++ as->fault_status = kbase_reg_read(kbdev, ++ MMU_AS_REG(as_no, ++ AS_FAULTSTATUS), ++ kctx); + -+#define TILER_PWROFF_LO 0x1D0 /* (WO) Tiler core power off bitmap, low word */ -+#define TILER_PWROFF_HI 0x1D4 /* (WO) Tiler core power off bitmap, high word */ ++ /* find the fault type */ ++ as->fault_type = (bf_bits & (1 << as_no)) ? ++ KBASE_MMU_FAULT_TYPE_BUS : ++ KBASE_MMU_FAULT_TYPE_PAGE; + -+#define L2_PWROFF_LO 0x1E0 /* (WO) Level 2 cache power off bitmap, low word */ -+#define L2_PWROFF_HI 0x1E4 /* (WO) Level 2 cache power off bitmap, high word */ ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) { ++ as->fault_extra_addr = kbase_reg_read(kbdev, ++ MMU_AS_REG(as_no, AS_FAULTEXTRA_HI), ++ kctx); ++ as->fault_extra_addr <<= 32; ++ as->fault_extra_addr |= kbase_reg_read(kbdev, ++ MMU_AS_REG(as_no, AS_FAULTEXTRA_LO), ++ kctx); ++ } + -+#define STACK_PWROFF_LO 0xE30 /* (RO) Core stack power off bitmap, low word */ -+#define STACK_PWROFF_HI 0xE34 /* (RO) Core stack power off bitmap, high word */ ++ if (kbase_as_has_bus_fault(as)) { ++ /* Mark bus fault as handled. ++ * Note that a bus fault is processed first in case ++ * where both a bus fault and page fault occur. ++ */ ++ bf_bits &= ~(1UL << as_no); + ++ /* remove the queued BF (and PF) from the mask */ ++ new_mask &= ~(MMU_BUS_ERROR(as_no) | ++ MMU_PAGE_FAULT(as_no)); ++ } else { ++ /* Mark page fault as handled */ ++ pf_bits &= ~(1UL << as_no); + -+#define SHADER_PWRTRANS_LO 0x200 /* (RO) Shader core power transition bitmap, low word */ -+#define SHADER_PWRTRANS_HI 0x204 /* (RO) Shader core power transition bitmap, high word */ ++ /* remove the queued PF from the mask */ ++ new_mask &= ~MMU_PAGE_FAULT(as_no); ++ } + -+#define TILER_PWRTRANS_LO 0x210 /* (RO) Tiler core power transition bitmap, low word */ -+#define TILER_PWRTRANS_HI 0x214 /* (RO) Tiler core power transition bitmap, high word */ ++ /* Process the interrupt for this address space */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_mmu_interrupt_process(kbdev, kctx, as); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } + -+#define L2_PWRTRANS_LO 0x220 /* (RO) Level 2 cache power transition bitmap, low word */ -+#define L2_PWRTRANS_HI 0x224 /* (RO) Level 2 cache power transition bitmap, high word */ ++ /* reenable interrupts */ ++ spin_lock_irqsave(&kbdev->mmu_mask_change, flags); ++ tmp = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_MASK), NULL); ++ new_mask |= tmp; ++ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_MASK), new_mask, NULL); ++ spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); ++} + -+#define STACK_PWRTRANS_LO 0xE40 /* (RO) Core stack power transition bitmap, low word */ -+#define STACK_PWRTRANS_HI 0xE44 /* (RO) Core stack power transition bitmap, high word */ ++void kbase_mmu_hw_configure(struct kbase_device *kbdev, struct kbase_as *as, ++ struct kbase_context *kctx) ++{ ++ struct kbase_mmu_setup *current_setup = &as->current_setup; ++ u32 transcfg = 0; + ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) { ++ transcfg = current_setup->transcfg & 0xFFFFFFFFUL; + -+#define SHADER_PWRACTIVE_LO 0x240 /* (RO) Shader core active bitmap, low word */ -+#define SHADER_PWRACTIVE_HI 0x244 /* (RO) Shader core active bitmap, high word */ ++ /* Set flag AS_TRANSCFG_PTW_MEMATTR_WRITE_BACK */ ++ /* Clear PTW_MEMATTR bits */ ++ transcfg &= ~AS_TRANSCFG_PTW_MEMATTR_MASK; ++ /* Enable correct PTW_MEMATTR bits */ ++ transcfg |= AS_TRANSCFG_PTW_MEMATTR_WRITE_BACK; + -+#define TILER_PWRACTIVE_LO 0x250 /* (RO) Tiler core active bitmap, low word */ -+#define TILER_PWRACTIVE_HI 0x254 /* (RO) Tiler core active bitmap, high word */ ++ if (kbdev->system_coherency == COHERENCY_ACE) { ++ /* Set flag AS_TRANSCFG_PTW_SH_OS (outer shareable) */ ++ /* Clear PTW_SH bits */ ++ transcfg = (transcfg & ~AS_TRANSCFG_PTW_SH_MASK); ++ /* Enable correct PTW_SH bits */ ++ transcfg = (transcfg | AS_TRANSCFG_PTW_SH_OS); ++ } + -+#define L2_PWRACTIVE_LO 0x260 /* (RO) Level 2 cache active bitmap, low word */ -+#define L2_PWRACTIVE_HI 0x264 /* (RO) Level 2 cache active bitmap, high word */ ++ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSCFG_LO), ++ transcfg, kctx); ++ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSCFG_HI), ++ (current_setup->transcfg >> 32) & 0xFFFFFFFFUL, ++ kctx); ++ } else { ++ if (kbdev->system_coherency == COHERENCY_ACE) ++ current_setup->transtab |= AS_TRANSTAB_LPAE_SHARE_OUTER; ++ } + -+#define COHERENCY_FEATURES 0x300 /* (RO) Coherency features present */ -+#define COHERENCY_ENABLE 0x304 /* (RW) Coherency enable */ ++ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSTAB_LO), ++ current_setup->transtab & 0xFFFFFFFFUL, kctx); ++ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSTAB_HI), ++ (current_setup->transtab >> 32) & 0xFFFFFFFFUL, kctx); + -+#define JM_CONFIG 0xF00 /* (RW) Job Manager configuration register (Implementation specific register) */ -+#define SHADER_CONFIG 0xF04 /* (RW) Shader core configuration settings (Implementation specific register) */ -+#define TILER_CONFIG 0xF08 /* (RW) Tiler core configuration settings (Implementation specific register) */ -+#define L2_MMU_CONFIG 0xF0C /* (RW) Configuration of the L2 cache and MMU (Implementation specific register) */ ++ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_MEMATTR_LO), ++ current_setup->memattr & 0xFFFFFFFFUL, kctx); ++ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_MEMATTR_HI), ++ (current_setup->memattr >> 32) & 0xFFFFFFFFUL, kctx); + -+#define JOB_CONTROL_BASE 0x1000 ++ KBASE_TLSTREAM_TL_ATTRIB_AS_CONFIG(as, ++ current_setup->transtab, ++ current_setup->memattr, ++ transcfg); + -+#define JOB_CONTROL_REG(r) (JOB_CONTROL_BASE + (r)) ++ write_cmd(kbdev, as->number, AS_COMMAND_UPDATE, kctx); ++} + -+#define JOB_IRQ_RAWSTAT 0x000 /* Raw interrupt status register */ -+#define JOB_IRQ_CLEAR 0x004 /* Interrupt clear register */ -+#define JOB_IRQ_MASK 0x008 /* Interrupt mask register */ -+#define JOB_IRQ_STATUS 0x00C /* Interrupt status register */ -+#define JOB_IRQ_JS_STATE 0x010 /* status==active and _next == busy snapshot from last JOB_IRQ_CLEAR */ -+#define JOB_IRQ_THROTTLE 0x014 /* cycles to delay delivering an interrupt externally. The JOB_IRQ_STATUS is NOT affected by this, just the delivery of the interrupt. */ ++int kbase_mmu_hw_do_operation(struct kbase_device *kbdev, struct kbase_as *as, ++ struct kbase_context *kctx, u64 vpfn, u32 nr, u32 op, ++ unsigned int handling_irq) ++{ ++ int ret; + -+#define JOB_SLOT0 0x800 /* Configuration registers for job slot 0 */ -+#define JOB_SLOT1 0x880 /* Configuration registers for job slot 1 */ -+#define JOB_SLOT2 0x900 /* Configuration registers for job slot 2 */ -+#define JOB_SLOT3 0x980 /* Configuration registers for job slot 3 */ -+#define JOB_SLOT4 0xA00 /* Configuration registers for job slot 4 */ -+#define JOB_SLOT5 0xA80 /* Configuration registers for job slot 5 */ -+#define JOB_SLOT6 0xB00 /* Configuration registers for job slot 6 */ -+#define JOB_SLOT7 0xB80 /* Configuration registers for job slot 7 */ -+#define JOB_SLOT8 0xC00 /* Configuration registers for job slot 8 */ -+#define JOB_SLOT9 0xC80 /* Configuration registers for job slot 9 */ -+#define JOB_SLOT10 0xD00 /* Configuration registers for job slot 10 */ -+#define JOB_SLOT11 0xD80 /* Configuration registers for job slot 11 */ -+#define JOB_SLOT12 0xE00 /* Configuration registers for job slot 12 */ -+#define JOB_SLOT13 0xE80 /* Configuration registers for job slot 13 */ -+#define JOB_SLOT14 0xF00 /* Configuration registers for job slot 14 */ -+#define JOB_SLOT15 0xF80 /* Configuration registers for job slot 15 */ ++ lockdep_assert_held(&kbdev->mmu_hw_mutex); + -+#define JOB_SLOT_REG(n, r) (JOB_CONTROL_REG(JOB_SLOT0 + ((n) << 7)) + (r)) ++ if (op == AS_COMMAND_UNLOCK) { ++ /* Unlock doesn't require a lock first */ ++ ret = write_cmd(kbdev, as->number, AS_COMMAND_UNLOCK, kctx); ++ } else { ++ u64 lock_addr = lock_region(kbdev, vpfn, nr); + -+#define JS_HEAD_LO 0x00 /* (RO) Job queue head pointer for job slot n, low word */ -+#define JS_HEAD_HI 0x04 /* (RO) Job queue head pointer for job slot n, high word */ -+#define JS_TAIL_LO 0x08 /* (RO) Job queue tail pointer for job slot n, low word */ -+#define JS_TAIL_HI 0x0C /* (RO) Job queue tail pointer for job slot n, high word */ -+#define JS_AFFINITY_LO 0x10 /* (RO) Core affinity mask for job slot n, low word */ -+#define JS_AFFINITY_HI 0x14 /* (RO) Core affinity mask for job slot n, high word */ -+#define JS_CONFIG 0x18 /* (RO) Configuration settings for job slot n */ -+#define JS_XAFFINITY 0x1C /* (RO) Extended affinity mask for job -+ slot n */ ++ /* Lock the region that needs to be updated */ ++ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_LOCKADDR_LO), ++ lock_addr & 0xFFFFFFFFUL, kctx); ++ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_LOCKADDR_HI), ++ (lock_addr >> 32) & 0xFFFFFFFFUL, kctx); ++ write_cmd(kbdev, as->number, AS_COMMAND_LOCK, kctx); + -+#define JS_COMMAND 0x20 /* (WO) Command register for job slot n */ -+#define JS_STATUS 0x24 /* (RO) Status register for job slot n */ ++ /* Run the MMU operation */ ++ write_cmd(kbdev, as->number, op, kctx); + -+#define JS_HEAD_NEXT_LO 0x40 /* (RW) Next job queue head pointer for job slot n, low word */ -+#define JS_HEAD_NEXT_HI 0x44 /* (RW) Next job queue head pointer for job slot n, high word */ ++ /* Wait for the flush to complete */ ++ ret = wait_ready(kbdev, as->number, kctx); + -+#define JS_AFFINITY_NEXT_LO 0x50 /* (RW) Next core affinity mask for job slot n, low word */ -+#define JS_AFFINITY_NEXT_HI 0x54 /* (RW) Next core affinity mask for job slot n, high word */ -+#define JS_CONFIG_NEXT 0x58 /* (RW) Next configuration settings for job slot n */ -+#define JS_XAFFINITY_NEXT 0x5C /* (RW) Next extended affinity mask for -+ job slot n */ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_9630)) { ++ /* Issue an UNLOCK command to ensure that valid page ++ tables are re-read by the GPU after an update. ++ Note that, the FLUSH command should perform all the ++ actions necessary, however the bus logs show that if ++ multiple page faults occur within an 8 page region ++ the MMU does not always re-read the updated page ++ table entries for later faults or is only partially ++ read, it subsequently raises the page fault IRQ for ++ the same addresses, the unlock ensures that the MMU ++ cache is flushed, so updates can be re-read. As the ++ region is now unlocked we need to issue 2 UNLOCK ++ commands in order to flush the MMU/uTLB, ++ see PRLAM-8812. ++ */ ++ write_cmd(kbdev, as->number, AS_COMMAND_UNLOCK, kctx); ++ write_cmd(kbdev, as->number, AS_COMMAND_UNLOCK, kctx); ++ } ++ } + -+#define JS_COMMAND_NEXT 0x60 /* (RW) Next command register for job slot n */ ++ return ret; ++} + -+#define JS_FLUSH_ID_NEXT 0x70 /* (RW) Next job slot n cache flush ID */ ++void kbase_mmu_hw_clear_fault(struct kbase_device *kbdev, struct kbase_as *as, ++ struct kbase_context *kctx, enum kbase_mmu_fault_type type) ++{ ++ unsigned long flags; ++ u32 pf_bf_mask; + -+#define MEMORY_MANAGEMENT_BASE 0x2000 -+#define MMU_REG(r) (MEMORY_MANAGEMENT_BASE + (r)) ++ spin_lock_irqsave(&kbdev->mmu_mask_change, flags); + -+#define MMU_IRQ_RAWSTAT 0x000 /* (RW) Raw interrupt status register */ -+#define MMU_IRQ_CLEAR 0x004 /* (WO) Interrupt clear register */ -+#define MMU_IRQ_MASK 0x008 /* (RW) Interrupt mask register */ -+#define MMU_IRQ_STATUS 0x00C /* (RO) Interrupt status register */ ++ /* ++ * A reset is in-flight and we're flushing the IRQ + bottom half ++ * so don't update anything as it could race with the reset code. ++ */ ++ if (kbdev->irq_reset_flush) ++ goto unlock; + -+#define MMU_AS0 0x400 /* Configuration registers for address space 0 */ -+#define MMU_AS1 0x440 /* Configuration registers for address space 1 */ -+#define MMU_AS2 0x480 /* Configuration registers for address space 2 */ -+#define MMU_AS3 0x4C0 /* Configuration registers for address space 3 */ -+#define MMU_AS4 0x500 /* Configuration registers for address space 4 */ -+#define MMU_AS5 0x540 /* Configuration registers for address space 5 */ -+#define MMU_AS6 0x580 /* Configuration registers for address space 6 */ -+#define MMU_AS7 0x5C0 /* Configuration registers for address space 7 */ -+#define MMU_AS8 0x600 /* Configuration registers for address space 8 */ -+#define MMU_AS9 0x640 /* Configuration registers for address space 9 */ -+#define MMU_AS10 0x680 /* Configuration registers for address space 10 */ -+#define MMU_AS11 0x6C0 /* Configuration registers for address space 11 */ -+#define MMU_AS12 0x700 /* Configuration registers for address space 12 */ -+#define MMU_AS13 0x740 /* Configuration registers for address space 13 */ -+#define MMU_AS14 0x780 /* Configuration registers for address space 14 */ -+#define MMU_AS15 0x7C0 /* Configuration registers for address space 15 */ ++ /* Clear the page (and bus fault IRQ as well in case one occurred) */ ++ pf_bf_mask = MMU_PAGE_FAULT(as->number); ++ if (type == KBASE_MMU_FAULT_TYPE_BUS || ++ type == KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED) ++ pf_bf_mask |= MMU_BUS_ERROR(as->number); + -+#define MMU_AS_REG(n, r) (MMU_REG(MMU_AS0 + ((n) << 6)) + (r)) ++ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_CLEAR), pf_bf_mask, kctx); + -+#define AS_TRANSTAB_LO 0x00 /* (RW) Translation Table Base Address for address space n, low word */ -+#define AS_TRANSTAB_HI 0x04 /* (RW) Translation Table Base Address for address space n, high word */ -+#define AS_MEMATTR_LO 0x08 /* (RW) Memory attributes for address space n, low word. */ -+#define AS_MEMATTR_HI 0x0C /* (RW) Memory attributes for address space n, high word. */ -+#define AS_LOCKADDR_LO 0x10 /* (RW) Lock region address for address space n, low word */ -+#define AS_LOCKADDR_HI 0x14 /* (RW) Lock region address for address space n, high word */ -+#define AS_COMMAND 0x18 /* (WO) MMU command register for address space n */ -+#define AS_FAULTSTATUS 0x1C /* (RO) MMU fault status register for address space n */ -+#define AS_FAULTADDRESS_LO 0x20 /* (RO) Fault Address for address space n, low word */ -+#define AS_FAULTADDRESS_HI 0x24 /* (RO) Fault Address for address space n, high word */ -+#define AS_STATUS 0x28 /* (RO) Status flags for address space n */ ++unlock: ++ spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); ++} + ++void kbase_mmu_hw_enable_fault(struct kbase_device *kbdev, struct kbase_as *as, ++ struct kbase_context *kctx, enum kbase_mmu_fault_type type) ++{ ++ unsigned long flags; ++ u32 irq_mask; + -+/* (RW) Translation table configuration for address space n, low word */ -+#define AS_TRANSCFG_LO 0x30 -+/* (RW) Translation table configuration for address space n, high word */ -+#define AS_TRANSCFG_HI 0x34 -+/* (RO) Secondary fault address for address space n, low word */ -+#define AS_FAULTEXTRA_LO 0x38 -+/* (RO) Secondary fault address for address space n, high word */ -+#define AS_FAULTEXTRA_HI 0x3C ++ /* Enable the page fault IRQ (and bus fault IRQ as well in case one ++ * occurred) */ ++ spin_lock_irqsave(&kbdev->mmu_mask_change, flags); + -+/* End Register Offsets */ ++ /* ++ * A reset is in-flight and we're flushing the IRQ + bottom half ++ * so don't update anything as it could race with the reset code. ++ */ ++ if (kbdev->irq_reset_flush) ++ goto unlock; + -+/* -+ * MMU_IRQ_RAWSTAT register values. Values are valid also for -+ MMU_IRQ_CLEAR, MMU_IRQ_MASK, MMU_IRQ_STATUS registers. -+ */ ++ irq_mask = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_MASK), kctx) | ++ MMU_PAGE_FAULT(as->number); + -+#define MMU_PAGE_FAULT_FLAGS 16 ++ if (type == KBASE_MMU_FAULT_TYPE_BUS || ++ type == KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED) ++ irq_mask |= MMU_BUS_ERROR(as->number); + -+/* Macros returning a bitmask to retrieve page fault or bus error flags from -+ * MMU registers */ -+#define MMU_PAGE_FAULT(n) (1UL << (n)) -+#define MMU_BUS_ERROR(n) (1UL << ((n) + MMU_PAGE_FAULT_FLAGS)) ++ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_MASK), irq_mask, kctx); + ++unlock: ++ spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); ++} +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h +new file mode 100755 +index 000000000..c02253c6a +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h +@@ -0,0 +1,42 @@ +/* -+ * Begin LPAE MMU TRANSTAB register values ++ * ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ -+#define AS_TRANSTAB_LPAE_ADDR_SPACE_MASK 0xfffff000 -+#define AS_TRANSTAB_LPAE_ADRMODE_UNMAPPED (0u << 0) -+#define AS_TRANSTAB_LPAE_ADRMODE_IDENTITY (1u << 1) -+#define AS_TRANSTAB_LPAE_ADRMODE_TABLE (3u << 0) -+#define AS_TRANSTAB_LPAE_READ_INNER (1u << 2) -+#define AS_TRANSTAB_LPAE_SHARE_OUTER (1u << 4) + -+#define AS_TRANSTAB_LPAE_ADRMODE_MASK 0x00000003 + -+/* -+ * Begin AARCH64 MMU TRANSTAB register values -+ */ -+#define MMU_HW_OUTA_BITS 40 -+#define AS_TRANSTAB_BASE_MASK ((1ULL << MMU_HW_OUTA_BITS) - (1ULL << 4)) + +/* -+ * Begin MMU STATUS register values ++ * Interface file for the direct implementation for MMU hardware access ++ * ++ * Direct MMU hardware interface ++ * ++ * This module provides the interface(s) that are required by the direct ++ * register access implementation of the MMU hardware interface + */ -+#define AS_STATUS_AS_ACTIVE 0x01 + -+#define AS_FAULTSTATUS_EXCEPTION_CODE_MASK (0x7<<3) -+#define AS_FAULTSTATUS_EXCEPTION_CODE_TRANSLATION_FAULT (0x0<<3) -+#define AS_FAULTSTATUS_EXCEPTION_CODE_PERMISSION_FAULT (0x1<<3) -+#define AS_FAULTSTATUS_EXCEPTION_CODE_TRANSTAB_BUS_FAULT (0x2<<3) -+#define AS_FAULTSTATUS_EXCEPTION_CODE_ACCESS_FLAG (0x3<<3) ++#ifndef _MALI_KBASE_MMU_HW_DIRECT_H_ ++#define _MALI_KBASE_MMU_HW_DIRECT_H_ + -+#define AS_FAULTSTATUS_EXCEPTION_CODE_ADDRESS_SIZE_FAULT (0x4<<3) -+#define AS_FAULTSTATUS_EXCEPTION_CODE_MEMORY_ATTRIBUTES_FAULT (0x5<<3) ++#include + -+#define AS_FAULTSTATUS_ACCESS_TYPE_MASK (0x3<<8) -+#define AS_FAULTSTATUS_ACCESS_TYPE_ATOMIC (0x0<<8) -+#define AS_FAULTSTATUS_ACCESS_TYPE_EX (0x1<<8) -+#define AS_FAULTSTATUS_ACCESS_TYPE_READ (0x2<<8) -+#define AS_FAULTSTATUS_ACCESS_TYPE_WRITE (0x3<<8) ++/** ++ * kbase_mmu_interrupt - Process an MMU interrupt. ++ * ++ * Process the MMU interrupt that was reported by the &kbase_device. ++ * ++ * @kbdev: kbase context to clear the fault from. ++ * @irq_stat: Value of the MMU_IRQ_STATUS register ++ */ ++void kbase_mmu_interrupt(struct kbase_device *kbdev, u32 irq_stat); + ++#endif /* _MALI_KBASE_MMU_HW_DIRECT_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c +new file mode 100755 +index 000000000..0614348e9 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c +@@ -0,0 +1,63 @@ +/* -+ * Begin MMU TRANSCFG register values ++ * ++ * (C) COPYRIGHT 2010-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#define AS_TRANSCFG_ADRMODE_LEGACY 0 -+#define AS_TRANSCFG_ADRMODE_UNMAPPED 1 -+#define AS_TRANSCFG_ADRMODE_IDENTITY 2 -+#define AS_TRANSCFG_ADRMODE_AARCH64_4K 6 -+#define AS_TRANSCFG_ADRMODE_AARCH64_64K 8 -+ -+#define AS_TRANSCFG_ADRMODE_MASK 0xF + + -+/* -+ * Begin TRANSCFG register values -+ */ -+#define AS_TRANSCFG_PTW_MEMATTR_MASK (3 << 24) -+#define AS_TRANSCFG_PTW_MEMATTR_NON_CACHEABLE (1 << 24) -+#define AS_TRANSCFG_PTW_MEMATTR_WRITE_BACK (2 << 24) + -+#define AS_TRANSCFG_PTW_SH_MASK ((3 << 28)) -+#define AS_TRANSCFG_PTW_SH_OS (2 << 28) -+#define AS_TRANSCFG_PTW_SH_IS (3 << 28) + +/* -+ * Begin Command Values ++ * "Always on" power management policy + */ + -+/* JS_COMMAND register commands */ -+#define JS_COMMAND_NOP 0x00 /* NOP Operation. Writing this value is ignored */ -+#define JS_COMMAND_START 0x01 /* Start processing a job chain. Writing this value is ignored */ -+#define JS_COMMAND_SOFT_STOP 0x02 /* Gently stop processing a job chain */ -+#define JS_COMMAND_HARD_STOP 0x03 /* Rudely stop processing a job chain */ -+#define JS_COMMAND_SOFT_STOP_0 0x04 /* Execute SOFT_STOP if JOB_CHAIN_FLAG is 0 */ -+#define JS_COMMAND_HARD_STOP_0 0x05 /* Execute HARD_STOP if JOB_CHAIN_FLAG is 0 */ -+#define JS_COMMAND_SOFT_STOP_1 0x06 /* Execute SOFT_STOP if JOB_CHAIN_FLAG is 1 */ -+#define JS_COMMAND_HARD_STOP_1 0x07 /* Execute HARD_STOP if JOB_CHAIN_FLAG is 1 */ -+ -+#define JS_COMMAND_MASK 0x07 /* Mask of bits currently in use by the HW */ ++#include ++#include + -+/* AS_COMMAND register commands */ -+#define AS_COMMAND_NOP 0x00 /* NOP Operation */ -+#define AS_COMMAND_UPDATE 0x01 /* Broadcasts the values in AS_TRANSTAB and ASn_MEMATTR to all MMUs */ -+#define AS_COMMAND_LOCK 0x02 /* Issue a lock region command to all MMUs */ -+#define AS_COMMAND_UNLOCK 0x03 /* Issue a flush region command to all MMUs */ -+#define AS_COMMAND_FLUSH 0x04 /* Flush all L2 caches then issue a flush region command to all MMUs -+ (deprecated - only for use with T60x) */ -+#define AS_COMMAND_FLUSH_PT 0x04 /* Flush all L2 caches then issue a flush region command to all MMUs */ -+#define AS_COMMAND_FLUSH_MEM 0x05 /* Wait for memory accesses to complete, flush all the L1s cache then -+ flush all L2 caches then issue a flush region command to all MMUs */ ++static u64 always_on_get_core_mask(struct kbase_device *kbdev) ++{ ++ return kbdev->gpu_props.props.raw_props.shader_present; ++} + -+/* Possible values of JS_CONFIG and JS_CONFIG_NEXT registers */ -+#define JS_CONFIG_START_FLUSH_NO_ACTION (0u << 0) -+#define JS_CONFIG_START_FLUSH_CLEAN (1u << 8) -+#define JS_CONFIG_START_FLUSH_CLEAN_INVALIDATE (3u << 8) -+#define JS_CONFIG_START_MMU (1u << 10) -+#define JS_CONFIG_JOB_CHAIN_FLAG (1u << 11) -+#define JS_CONFIG_END_FLUSH_NO_ACTION JS_CONFIG_START_FLUSH_NO_ACTION -+#define JS_CONFIG_END_FLUSH_CLEAN (1u << 12) -+#define JS_CONFIG_END_FLUSH_CLEAN_INVALIDATE (3u << 12) -+#define JS_CONFIG_ENABLE_FLUSH_REDUCTION (1u << 14) -+#define JS_CONFIG_DISABLE_DESCRIPTOR_WR_BK (1u << 15) -+#define JS_CONFIG_THREAD_PRI(n) ((n) << 16) ++static bool always_on_get_core_active(struct kbase_device *kbdev) ++{ ++ return true; ++} + -+/* JS_XAFFINITY register values */ -+#define JS_XAFFINITY_XAFFINITY_ENABLE (1u << 0) -+#define JS_XAFFINITY_TILER_ENABLE (1u << 8) -+#define JS_XAFFINITY_CACHE_ENABLE (1u << 16) ++static void always_on_init(struct kbase_device *kbdev) ++{ ++ CSTD_UNUSED(kbdev); ++} + -+/* JS_STATUS register values */ ++static void always_on_term(struct kbase_device *kbdev) ++{ ++ CSTD_UNUSED(kbdev); ++} + -+/* NOTE: Please keep this values in sync with enum base_jd_event_code in mali_base_kernel.h. -+ * The values are separated to avoid dependency of userspace and kernel code. ++/* ++ * The struct kbase_pm_policy structure for the demand power policy. ++ * ++ * This is the static structure that defines the demand power policy's callback ++ * and name. + */ ++const struct kbase_pm_policy kbase_pm_always_on_policy_ops = { ++ "always_on", /* name */ ++ always_on_init, /* init */ ++ always_on_term, /* term */ ++ always_on_get_core_mask, /* get_core_mask */ ++ always_on_get_core_active, /* get_core_active */ ++ 0u, /* flags */ ++ KBASE_PM_POLICY_ID_ALWAYS_ON, /* id */ ++}; + -+/* Group of values representing the job status insead a particular fault */ -+#define JS_STATUS_NO_EXCEPTION_BASE 0x00 -+#define JS_STATUS_INTERRUPTED (JS_STATUS_NO_EXCEPTION_BASE + 0x02) /* 0x02 means INTERRUPTED */ -+#define JS_STATUS_STOPPED (JS_STATUS_NO_EXCEPTION_BASE + 0x03) /* 0x03 means STOPPED */ -+#define JS_STATUS_TERMINATED (JS_STATUS_NO_EXCEPTION_BASE + 0x04) /* 0x04 means TERMINATED */ -+ -+/* General fault values */ -+#define JS_STATUS_FAULT_BASE 0x40 -+#define JS_STATUS_CONFIG_FAULT (JS_STATUS_FAULT_BASE) /* 0x40 means CONFIG FAULT */ -+#define JS_STATUS_POWER_FAULT (JS_STATUS_FAULT_BASE + 0x01) /* 0x41 means POWER FAULT */ -+#define JS_STATUS_READ_FAULT (JS_STATUS_FAULT_BASE + 0x02) /* 0x42 means READ FAULT */ -+#define JS_STATUS_WRITE_FAULT (JS_STATUS_FAULT_BASE + 0x03) /* 0x43 means WRITE FAULT */ -+#define JS_STATUS_AFFINITY_FAULT (JS_STATUS_FAULT_BASE + 0x04) /* 0x44 means AFFINITY FAULT */ -+#define JS_STATUS_BUS_FAULT (JS_STATUS_FAULT_BASE + 0x08) /* 0x48 means BUS FAULT */ -+ -+/* Instruction or data faults */ -+#define JS_STATUS_INSTRUCTION_FAULT_BASE 0x50 -+#define JS_STATUS_INSTR_INVALID_PC (JS_STATUS_INSTRUCTION_FAULT_BASE) /* 0x50 means INSTR INVALID PC */ -+#define JS_STATUS_INSTR_INVALID_ENC (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x01) /* 0x51 means INSTR INVALID ENC */ -+#define JS_STATUS_INSTR_TYPE_MISMATCH (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x02) /* 0x52 means INSTR TYPE MISMATCH */ -+#define JS_STATUS_INSTR_OPERAND_FAULT (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x03) /* 0x53 means INSTR OPERAND FAULT */ -+#define JS_STATUS_INSTR_TLS_FAULT (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x04) /* 0x54 means INSTR TLS FAULT */ -+#define JS_STATUS_INSTR_BARRIER_FAULT (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x05) /* 0x55 means INSTR BARRIER FAULT */ -+#define JS_STATUS_INSTR_ALIGN_FAULT (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x06) /* 0x56 means INSTR ALIGN FAULT */ -+/* NOTE: No fault with 0x57 code defined in spec. */ -+#define JS_STATUS_DATA_INVALID_FAULT (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x08) /* 0x58 means DATA INVALID FAULT */ -+#define JS_STATUS_TILE_RANGE_FAULT (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x09) /* 0x59 means TILE RANGE FAULT */ -+#define JS_STATUS_ADDRESS_RANGE_FAULT (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x0A) /* 0x5A means ADDRESS RANGE FAULT */ -+ -+/* Other faults */ -+#define JS_STATUS_MEMORY_FAULT_BASE 0x60 -+#define JS_STATUS_OUT_OF_MEMORY (JS_STATUS_MEMORY_FAULT_BASE) /* 0x60 means OUT OF MEMORY */ -+#define JS_STATUS_UNKNOWN 0x7F /* 0x7F means UNKNOWN */ -+ -+/* GPU_COMMAND values */ -+#define GPU_COMMAND_NOP 0x00 /* No operation, nothing happens */ -+#define GPU_COMMAND_SOFT_RESET 0x01 /* Stop all external bus interfaces, and then reset the entire GPU. */ -+#define GPU_COMMAND_HARD_RESET 0x02 /* Immediately reset the entire GPU. */ -+#define GPU_COMMAND_PRFCNT_CLEAR 0x03 /* Clear all performance counters, setting them all to zero. */ -+#define GPU_COMMAND_PRFCNT_SAMPLE 0x04 /* Sample all performance counters, writing them out to memory */ -+#define GPU_COMMAND_CYCLE_COUNT_START 0x05 /* Starts the cycle counter, and system timestamp propagation */ -+#define GPU_COMMAND_CYCLE_COUNT_STOP 0x06 /* Stops the cycle counter, and system timestamp propagation */ -+#define GPU_COMMAND_CLEAN_CACHES 0x07 /* Clean all caches */ -+#define GPU_COMMAND_CLEAN_INV_CACHES 0x08 /* Clean and invalidate all caches */ -+#define GPU_COMMAND_SET_PROTECTED_MODE 0x09 /* Places the GPU in protected mode */ -+ -+/* End Command Values */ -+ -+/* GPU_STATUS values */ -+#define GPU_STATUS_PRFCNT_ACTIVE (1 << 2) /* Set if the performance counters are active. */ -+#define GPU_STATUS_PROTECTED_MODE_ACTIVE (1 << 7) /* Set if protected mode is active */ -+ -+/* PRFCNT_CONFIG register values */ -+#define PRFCNT_CONFIG_MODE_SHIFT 0 /* Counter mode position. */ -+#define PRFCNT_CONFIG_AS_SHIFT 4 /* Address space bitmap position. */ -+#define PRFCNT_CONFIG_SETSELECT_SHIFT 8 /* Set select position. */ -+ -+#define PRFCNT_CONFIG_MODE_OFF 0 /* The performance counters are disabled. */ -+#define PRFCNT_CONFIG_MODE_MANUAL 1 /* The performance counters are enabled, but are only written out when a PRFCNT_SAMPLE command is issued using the GPU_COMMAND register. */ -+#define PRFCNT_CONFIG_MODE_TILE 2 /* The performance counters are enabled, and are written out each time a tile finishes rendering. */ -+ -+/* AS_MEMATTR values: */ -+/* Use GPU implementation-defined caching policy. */ -+#define AS_MEMATTR_IMPL_DEF_CACHE_POLICY 0x88ull -+/* The attribute set to force all resources to be cached. */ -+#define AS_MEMATTR_FORCE_TO_CACHE_ALL 0x8Full -+/* Inner write-alloc cache setup, no outer caching */ -+#define AS_MEMATTR_WRITE_ALLOC 0x8Dull -+ -+/* Set to implementation defined, outer caching */ -+#define AS_MEMATTR_AARCH64_OUTER_IMPL_DEF 0x88ull -+/* Set to write back memory, outer caching */ -+#define AS_MEMATTR_AARCH64_OUTER_WA 0x8Dull -+ -+/* Use GPU implementation-defined caching policy. */ -+#define AS_MEMATTR_LPAE_IMPL_DEF_CACHE_POLICY 0x48ull -+/* The attribute set to force all resources to be cached. */ -+#define AS_MEMATTR_LPAE_FORCE_TO_CACHE_ALL 0x4Full -+/* Inner write-alloc cache setup, no outer caching */ -+#define AS_MEMATTR_LPAE_WRITE_ALLOC 0x4Dull -+/* Set to implementation defined, outer caching */ -+#define AS_MEMATTR_LPAE_OUTER_IMPL_DEF 0x88ull -+/* Set to write back memory, outer caching */ -+#define AS_MEMATTR_LPAE_OUTER_WA 0x8Dull -+ -+/* Symbols for default MEMATTR to use -+ * Default is - HW implementation defined caching */ -+#define AS_MEMATTR_INDEX_DEFAULT 0 -+#define AS_MEMATTR_INDEX_DEFAULT_ACE 3 -+ -+/* HW implementation defined caching */ -+#define AS_MEMATTR_INDEX_IMPL_DEF_CACHE_POLICY 0 -+/* Force cache on */ -+#define AS_MEMATTR_INDEX_FORCE_TO_CACHE_ALL 1 -+/* Write-alloc */ -+#define AS_MEMATTR_INDEX_WRITE_ALLOC 2 -+/* Outer coherent, inner implementation defined policy */ -+#define AS_MEMATTR_INDEX_OUTER_IMPL_DEF 3 -+/* Outer coherent, write alloc inner */ -+#define AS_MEMATTR_INDEX_OUTER_WA 4 -+ -+/* JS_FEATURES register */ -+ -+#define JS_FEATURE_NULL_JOB (1u << 1) -+#define JS_FEATURE_SET_VALUE_JOB (1u << 2) -+#define JS_FEATURE_CACHE_FLUSH_JOB (1u << 3) -+#define JS_FEATURE_COMPUTE_JOB (1u << 4) -+#define JS_FEATURE_VERTEX_JOB (1u << 5) -+#define JS_FEATURE_GEOMETRY_JOB (1u << 6) -+#define JS_FEATURE_TILER_JOB (1u << 7) -+#define JS_FEATURE_FUSED_JOB (1u << 8) -+#define JS_FEATURE_FRAGMENT_JOB (1u << 9) -+ -+/* End JS_FEATURES register */ -+ -+/* L2_MMU_CONFIG register */ -+#define L2_MMU_CONFIG_ALLOW_SNOOP_DISPARITY_SHIFT (23) -+#define L2_MMU_CONFIG_ALLOW_SNOOP_DISPARITY (0x1 << L2_MMU_CONFIG_ALLOW_SNOOP_DISPARITY_SHIFT) -+#define L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_SHIFT (24) -+#define L2_MMU_CONFIG_LIMIT_EXTERNAL_READS (0x3 << L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_SHIFT) -+#define L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_OCTANT (0x1 << L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_SHIFT) -+#define L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_QUARTER (0x2 << L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_SHIFT) -+#define L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_HALF (0x3 << L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_SHIFT) -+ -+#define L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_SHIFT (26) -+#define L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES (0x3 << L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_SHIFT) -+#define L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_OCTANT (0x1 << L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_SHIFT) -+#define L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_QUARTER (0x2 << L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_SHIFT) -+#define L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_HALF (0x3 << L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_SHIFT) -+/* End L2_MMU_CONFIG register */ -+ -+/* THREAD_* registers */ ++KBASE_EXPORT_TEST_API(kbase_pm_always_on_policy_ops); +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h +new file mode 100755 +index 000000000..f9d244b01 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h +@@ -0,0 +1,77 @@ + -+/* THREAD_FEATURES IMPLEMENTATION_TECHNOLOGY values */ -+#define IMPLEMENTATION_UNSPECIFIED 0 -+#define IMPLEMENTATION_SILICON 1 -+#define IMPLEMENTATION_FPGA 2 -+#define IMPLEMENTATION_MODEL 3 ++/* ++ * ++ * (C) COPYRIGHT 2011-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+/* Default values when registers are not supported by the implemented hardware */ -+#define THREAD_MT_DEFAULT 256 -+#define THREAD_MWS_DEFAULT 256 -+#define THREAD_MBS_DEFAULT 256 -+#define THREAD_MR_DEFAULT 1024 -+#define THREAD_MTQ_DEFAULT 4 -+#define THREAD_MTGS_DEFAULT 10 + -+/* End THREAD_* registers */ + -+/* SHADER_CONFIG register */ + -+#define SC_ALT_COUNTERS (1ul << 3) -+#define SC_OVERRIDE_FWD_PIXEL_KILL (1ul << 4) -+#define SC_SDC_DISABLE_OQ_DISCARD (1ul << 6) -+#define SC_LS_ALLOW_ATTR_TYPES (1ul << 16) -+#define SC_LS_PAUSEBUFFER_DISABLE (1ul << 16) -+#define SC_TLS_HASH_ENABLE (1ul << 17) -+#define SC_LS_ATTR_CHECK_DISABLE (1ul << 18) -+#define SC_ENABLE_TEXGRD_FLAGS (1ul << 25) -+/* End SHADER_CONFIG register */ + -+/* TILER_CONFIG register */ ++/* ++ * "Always on" power management policy ++ */ + -+#define TC_CLOCK_GATE_OVERRIDE (1ul << 0) ++#ifndef MALI_KBASE_PM_ALWAYS_ON_H ++#define MALI_KBASE_PM_ALWAYS_ON_H + -+/* End TILER_CONFIG register */ ++/** ++ * DOC: ++ * The "Always on" power management policy has the following ++ * characteristics: ++ * ++ * - When KBase indicates that the GPU will be powered up, but we don't yet ++ * know which Job Chains are to be run: ++ * All Shader Cores are powered up, regardless of whether or not they will ++ * be needed later. ++ * ++ * - When KBase indicates that a set of Shader Cores are needed to submit the ++ * currently queued Job Chains: ++ * All Shader Cores are kept powered, regardless of whether or not they will ++ * be needed ++ * ++ * - When KBase indicates that the GPU need not be powered: ++ * The Shader Cores are kept powered, regardless of whether or not they will ++ * be needed. The GPU itself is also kept powered, even though it is not ++ * needed. ++ * ++ * This policy is automatically overridden during system suspend: the desired ++ * core state is ignored, and the cores are forced off regardless of what the ++ * policy requests. After resuming from suspend, new changes to the desired ++ * core state made by the policy are honored. ++ * ++ * Note: ++ * ++ * - KBase indicates the GPU will be powered up when it has a User Process that ++ * has just started to submit Job Chains. ++ * ++ * - KBase indicates the GPU need not be powered when all the Job Chains from ++ * User Processes have finished, and it is waiting for a User Process to ++ * submit some more Job Chains. ++ */ + -+/* JM_CONFIG register */ ++/** ++ * struct kbasep_pm_policy_always_on - Private struct for policy instance data ++ * @dummy: unused dummy variable ++ * ++ * This contains data that is private to the particular power policy that is ++ * active. ++ */ ++struct kbasep_pm_policy_always_on { ++ int dummy; ++}; + -+#define JM_TIMESTAMP_OVERRIDE (1ul << 0) -+#define JM_CLOCK_GATE_OVERRIDE (1ul << 1) -+#define JM_JOB_THROTTLE_ENABLE (1ul << 2) -+#define JM_JOB_THROTTLE_LIMIT_SHIFT (3) -+#define JM_MAX_JOB_THROTTLE_LIMIT (0x3F) -+#define JM_FORCE_COHERENCY_FEATURES_SHIFT (2) -+#define JM_IDVS_GROUP_SIZE_SHIFT (16) -+#define JM_MAX_IDVS_GROUP_SIZE (0x3F) -+/* End JM_CONFIG register */ ++extern const struct kbase_pm_policy kbase_pm_always_on_policy_ops; + ++#endif /* MALI_KBASE_PM_ALWAYS_ON_H */ + -+#endif /* _MIDGARD_REGMAP_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_timeline.h b/drivers/gpu/arm/bifrost_for_linux/mali_timeline.h +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c new file mode 100755 -index 000000000000..bd5f6614b6bb +index 000000000..146fd48ba --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_timeline.h -@@ -0,0 +1,396 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c +@@ -0,0 +1,482 @@ +/* + * -+ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -331755,393 +367945,479 @@ index 000000000000..bd5f6614b6bb + + + ++/* ++ * GPU backend implementation of base kernel power management APIs ++ */ + -+#undef TRACE_SYSTEM -+#define TRACE_SYSTEM mali_timeline ++#include ++#include ++#include ++#ifdef CONFIG_MALI_PLATFORM_DEVICETREE ++#include ++#endif /* CONFIG_MALI_PLATFORM_DEVICETREE */ + -+#if !defined(_MALI_TIMELINE_H) || defined(TRACE_HEADER_MULTI_READ) -+#define _MALI_TIMELINE_H ++#include ++#include ++#include ++#include ++#include ++#include + -+#include ++static void kbase_pm_gpu_poweroff_wait_wq(struct work_struct *data); + -+TRACE_EVENT(mali_timeline_atoms_in_flight, ++void kbase_pm_register_access_enable(struct kbase_device *kbdev) ++{ ++ struct kbase_pm_callback_conf *callbacks; + -+ TP_PROTO(u64 ts_sec, -+ u32 ts_nsec, -+ int tgid, -+ int count), ++ callbacks = (struct kbase_pm_callback_conf *)POWER_MANAGEMENT_CALLBACKS; + -+ TP_ARGS(ts_sec, -+ ts_nsec, -+ tgid, -+ count), ++ if (callbacks) ++ callbacks->power_on_callback(kbdev); + -+ TP_STRUCT__entry( -+ __field(u64, ts_sec) -+ __field(u32, ts_nsec) -+ __field(int, tgid) -+ __field(int, count) -+ ), ++ kbdev->pm.backend.gpu_powered = true; ++} + -+ TP_fast_assign( -+ __entry->ts_sec = ts_sec; -+ __entry->ts_nsec = ts_nsec; -+ __entry->tgid = tgid; -+ __entry->count = count; -+ ), ++void kbase_pm_register_access_disable(struct kbase_device *kbdev) ++{ ++ struct kbase_pm_callback_conf *callbacks; + -+ TP_printk("%i,%i.%.9i,%i,%i", CTX_SET_NR_ATOMS_IN_FLIGHT, -+ (int)__entry->ts_sec, -+ (int)__entry->ts_nsec, -+ __entry->tgid, -+ __entry->count) -+); ++ callbacks = (struct kbase_pm_callback_conf *)POWER_MANAGEMENT_CALLBACKS; + ++ if (callbacks) ++ callbacks->power_off_callback(kbdev); + -+TRACE_EVENT(mali_timeline_atom, ++ kbdev->pm.backend.gpu_powered = false; ++} + -+ TP_PROTO(u64 ts_sec, -+ u32 ts_nsec, -+ int event_type, -+ int tgid, -+ int atom_id), ++int kbase_hwaccess_pm_init(struct kbase_device *kbdev) ++{ ++ int ret = 0; ++ struct kbase_pm_callback_conf *callbacks; + -+ TP_ARGS(ts_sec, -+ ts_nsec, -+ event_type, -+ tgid, -+ atom_id), ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ TP_STRUCT__entry( -+ __field(u64, ts_sec) -+ __field(u32, ts_nsec) -+ __field(int, event_type) -+ __field(int, tgid) -+ __field(int, atom_id) -+ ), ++ mutex_init(&kbdev->pm.lock); + -+ TP_fast_assign( -+ __entry->ts_sec = ts_sec; -+ __entry->ts_nsec = ts_nsec; -+ __entry->event_type = event_type; -+ __entry->tgid = tgid; -+ __entry->atom_id = atom_id; -+ ), ++ kbdev->pm.backend.gpu_poweroff_wait_wq = alloc_workqueue("kbase_pm_poweroff_wait", ++ WQ_HIGHPRI | WQ_UNBOUND, 1); ++ if (!kbdev->pm.backend.gpu_poweroff_wait_wq) ++ return -ENOMEM; + -+ TP_printk("%i,%i.%.9i,%i,%i,%i", __entry->event_type, -+ (int)__entry->ts_sec, -+ (int)__entry->ts_nsec, -+ __entry->tgid, -+ __entry->atom_id, -+ __entry->atom_id) -+); ++ INIT_WORK(&kbdev->pm.backend.gpu_poweroff_wait_work, ++ kbase_pm_gpu_poweroff_wait_wq); + -+TRACE_EVENT(mali_timeline_gpu_slot_active, ++ kbdev->pm.backend.gpu_powered = false; ++ kbdev->pm.suspending = false; ++#ifdef CONFIG_MALI_DEBUG ++ kbdev->pm.backend.driver_ready_for_irqs = false; ++#endif /* CONFIG_MALI_DEBUG */ ++ kbdev->pm.backend.gpu_in_desired_state = true; ++ init_waitqueue_head(&kbdev->pm.backend.gpu_in_desired_state_wait); + -+ TP_PROTO(u64 ts_sec, -+ u32 ts_nsec, -+ int event_type, -+ int tgid, -+ int js, -+ int count), ++ callbacks = (struct kbase_pm_callback_conf *)POWER_MANAGEMENT_CALLBACKS; ++ if (callbacks) { ++ kbdev->pm.backend.callback_power_on = ++ callbacks->power_on_callback; ++ kbdev->pm.backend.callback_power_off = ++ callbacks->power_off_callback; ++ kbdev->pm.backend.callback_power_suspend = ++ callbacks->power_suspend_callback; ++ kbdev->pm.backend.callback_power_resume = ++ callbacks->power_resume_callback; ++ kbdev->pm.callback_power_runtime_init = ++ callbacks->power_runtime_init_callback; ++ kbdev->pm.callback_power_runtime_term = ++ callbacks->power_runtime_term_callback; ++ kbdev->pm.backend.callback_power_runtime_on = ++ callbacks->power_runtime_on_callback; ++ kbdev->pm.backend.callback_power_runtime_off = ++ callbacks->power_runtime_off_callback; ++ kbdev->pm.backend.callback_power_runtime_idle = ++ callbacks->power_runtime_idle_callback; ++ } else { ++ kbdev->pm.backend.callback_power_on = NULL; ++ kbdev->pm.backend.callback_power_off = NULL; ++ kbdev->pm.backend.callback_power_suspend = NULL; ++ kbdev->pm.backend.callback_power_resume = NULL; ++ kbdev->pm.callback_power_runtime_init = NULL; ++ kbdev->pm.callback_power_runtime_term = NULL; ++ kbdev->pm.backend.callback_power_runtime_on = NULL; ++ kbdev->pm.backend.callback_power_runtime_off = NULL; ++ kbdev->pm.backend.callback_power_runtime_idle = NULL; ++ } + -+ TP_ARGS(ts_sec, -+ ts_nsec, -+ event_type, -+ tgid, -+ js, -+ count), ++ /* Initialise the metrics subsystem */ ++ ret = kbasep_pm_metrics_init(kbdev); ++ if (ret) ++ return ret; + -+ TP_STRUCT__entry( -+ __field(u64, ts_sec) -+ __field(u32, ts_nsec) -+ __field(int, event_type) -+ __field(int, tgid) -+ __field(int, js) -+ __field(int, count) -+ ), ++ init_waitqueue_head(&kbdev->pm.backend.l2_powered_wait); ++ kbdev->pm.backend.l2_powered = 0; + -+ TP_fast_assign( -+ __entry->ts_sec = ts_sec; -+ __entry->ts_nsec = ts_nsec; -+ __entry->event_type = event_type; -+ __entry->tgid = tgid; -+ __entry->js = js; -+ __entry->count = count; -+ ), ++ init_waitqueue_head(&kbdev->pm.backend.reset_done_wait); ++ kbdev->pm.backend.reset_done = false; + -+ TP_printk("%i,%i.%.9i,%i,%i,%i", __entry->event_type, -+ (int)__entry->ts_sec, -+ (int)__entry->ts_nsec, -+ __entry->tgid, -+ __entry->js, -+ __entry->count) -+); ++ init_waitqueue_head(&kbdev->pm.zero_active_count_wait); ++ kbdev->pm.active_count = 0; + -+TRACE_EVENT(mali_timeline_gpu_slot_action, ++ spin_lock_init(&kbdev->pm.backend.gpu_cycle_counter_requests_lock); ++ spin_lock_init(&kbdev->pm.backend.gpu_powered_lock); + -+ TP_PROTO(u64 ts_sec, -+ u32 ts_nsec, -+ int event_type, -+ int tgid, -+ int js, -+ int count), ++ init_waitqueue_head(&kbdev->pm.backend.poweroff_wait); + -+ TP_ARGS(ts_sec, -+ ts_nsec, -+ event_type, -+ tgid, -+ js, -+ count), ++ if (kbase_pm_ca_init(kbdev) != 0) ++ goto workq_fail; + -+ TP_STRUCT__entry( -+ __field(u64, ts_sec) -+ __field(u32, ts_nsec) -+ __field(int, event_type) -+ __field(int, tgid) -+ __field(int, js) -+ __field(int, count) -+ ), ++ if (kbase_pm_policy_init(kbdev) != 0) ++ goto pm_policy_fail; + -+ TP_fast_assign( -+ __entry->ts_sec = ts_sec; -+ __entry->ts_nsec = ts_nsec; -+ __entry->event_type = event_type; -+ __entry->tgid = tgid; -+ __entry->js = js; -+ __entry->count = count; -+ ), ++ return 0; + -+ TP_printk("%i,%i.%.9i,%i,%i,%i", __entry->event_type, -+ (int)__entry->ts_sec, -+ (int)__entry->ts_nsec, -+ __entry->tgid, -+ __entry->js, -+ __entry->count) -+); ++pm_policy_fail: ++ kbase_pm_ca_term(kbdev); ++workq_fail: ++ kbasep_pm_metrics_term(kbdev); ++ return -EINVAL; ++} + -+TRACE_EVENT(mali_timeline_gpu_power_active, ++void kbase_pm_do_poweron(struct kbase_device *kbdev, bool is_resume) ++{ ++ lockdep_assert_held(&kbdev->pm.lock); + -+ TP_PROTO(u64 ts_sec, -+ u32 ts_nsec, -+ int event_type, -+ int active), ++ /* Turn clocks and interrupts on - no-op if we haven't done a previous ++ * kbase_pm_clock_off() */ ++ kbase_pm_clock_on(kbdev, is_resume); + -+ TP_ARGS(ts_sec, -+ ts_nsec, -+ event_type, -+ active), ++ /* Update core status as required by the policy */ ++ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, ++ SW_FLOW_PM_CHECKTRANS_PM_DO_POWERON_START); ++ kbase_pm_update_cores_state(kbdev); ++ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, ++ SW_FLOW_PM_CHECKTRANS_PM_DO_POWERON_END); + -+ TP_STRUCT__entry( -+ __field(u64, ts_sec) -+ __field(u32, ts_nsec) -+ __field(int, event_type) -+ __field(int, active) -+ ), ++ /* NOTE: We don't wait to reach the desired state, since running atoms ++ * will wait for that state to be reached anyway */ ++} + -+ TP_fast_assign( -+ __entry->ts_sec = ts_sec; -+ __entry->ts_nsec = ts_nsec; -+ __entry->event_type = event_type; -+ __entry->active = active; -+ ), ++static void kbase_pm_gpu_poweroff_wait_wq(struct work_struct *data) ++{ ++ struct kbase_device *kbdev = container_of(data, struct kbase_device, ++ pm.backend.gpu_poweroff_wait_work); ++ struct kbase_pm_device_data *pm = &kbdev->pm; ++ struct kbase_pm_backend_data *backend = &pm->backend; ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ unsigned long flags; + -+ TP_printk("%i,%i.%.9i,0,%i", __entry->event_type, -+ (int)__entry->ts_sec, -+ (int)__entry->ts_nsec, -+ __entry->active) ++#if !PLATFORM_POWER_DOWN_ONLY ++ /* Wait for power transitions to complete. We do this with no locks held ++ * so that we don't deadlock with any pending workqueues */ ++ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, ++ SW_FLOW_PM_CHECKTRANS_PM_DO_POWEROFF_START); ++ kbase_pm_check_transitions_sync(kbdev); ++ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, ++ SW_FLOW_PM_CHECKTRANS_PM_DO_POWEROFF_END); ++#endif /* !PLATFORM_POWER_DOWN_ONLY */ + -+); ++ mutex_lock(&js_devdata->runpool_mutex); ++ mutex_lock(&kbdev->pm.lock); + -+TRACE_EVENT(mali_timeline_l2_power_active, ++#if PLATFORM_POWER_DOWN_ONLY ++ if (kbdev->pm.backend.gpu_powered) { ++ if (kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_L2)) { ++ /* If L2 cache is powered then we must flush it before ++ * we power off the GPU. Normally this would have been ++ * handled when the L2 was powered off. */ ++ kbase_gpu_cacheclean(kbdev); ++ } ++ } ++#endif /* PLATFORM_POWER_DOWN_ONLY */ + -+ TP_PROTO(u64 ts_sec, -+ u32 ts_nsec, -+ int event_type, -+ int state), ++ if (!backend->poweron_required) { ++#if !PLATFORM_POWER_DOWN_ONLY ++ unsigned long flags; + -+ TP_ARGS(ts_sec, -+ ts_nsec, -+ event_type, -+ state), ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ WARN_ON(kbdev->l2_available_bitmap || ++ kbdev->shader_available_bitmap || ++ kbdev->tiler_available_bitmap); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++#endif /* !PLATFORM_POWER_DOWN_ONLY */ + -+ TP_STRUCT__entry( -+ __field(u64, ts_sec) -+ __field(u32, ts_nsec) -+ __field(int, event_type) -+ __field(int, state) -+ ), ++ /* Consume any change-state events */ ++ kbase_timeline_pm_check_handle_event(kbdev, ++ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED); + -+ TP_fast_assign( -+ __entry->ts_sec = ts_sec; -+ __entry->ts_nsec = ts_nsec; -+ __entry->event_type = event_type; -+ __entry->state = state; -+ ), ++ /* Disable interrupts and turn the clock off */ ++ if (!kbase_pm_clock_off(kbdev, backend->poweroff_is_suspend)) { ++ /* ++ * Page/bus faults are pending, must drop locks to ++ * process. Interrupts are disabled so no more faults ++ * should be generated at this point. ++ */ ++ mutex_unlock(&kbdev->pm.lock); ++ mutex_unlock(&js_devdata->runpool_mutex); ++ kbase_flush_mmu_wqs(kbdev); ++ mutex_lock(&js_devdata->runpool_mutex); ++ mutex_lock(&kbdev->pm.lock); + -+ TP_printk("%i,%i.%.9i,0,%i", __entry->event_type, -+ (int)__entry->ts_sec, -+ (int)__entry->ts_nsec, -+ __entry->state) ++ /* Turn off clock now that fault have been handled. We ++ * dropped locks so poweron_required may have changed - ++ * power back on if this is the case.*/ ++ if (backend->poweron_required) ++ kbase_pm_clock_on(kbdev, false); ++ else ++ WARN_ON(!kbase_pm_clock_off(kbdev, ++ backend->poweroff_is_suspend)); ++ } ++ } + -+); -+TRACE_EVENT(mali_timeline_pm_event, ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ backend->poweroff_wait_in_progress = false; ++ if (backend->poweron_required) { ++ backend->poweron_required = false; ++ kbase_pm_update_cores_state_nolock(kbdev); ++ kbase_backend_slot_update(kbdev); ++ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ TP_PROTO(u64 ts_sec, -+ u32 ts_nsec, -+ int event_type, -+ int pm_event_type, -+ unsigned int pm_event_id), ++ mutex_unlock(&kbdev->pm.lock); ++ mutex_unlock(&js_devdata->runpool_mutex); + -+ TP_ARGS(ts_sec, -+ ts_nsec, -+ event_type, -+ pm_event_type, -+ pm_event_id), ++ wake_up(&kbdev->pm.backend.poweroff_wait); ++} + -+ TP_STRUCT__entry( -+ __field(u64, ts_sec) -+ __field(u32, ts_nsec) -+ __field(int, event_type) -+ __field(int, pm_event_type) -+ __field(unsigned int, pm_event_id) -+ ), ++void kbase_pm_do_poweroff(struct kbase_device *kbdev, bool is_suspend) ++{ ++ unsigned long flags; + -+ TP_fast_assign( -+ __entry->ts_sec = ts_sec; -+ __entry->ts_nsec = ts_nsec; -+ __entry->event_type = event_type; -+ __entry->pm_event_type = pm_event_type; -+ __entry->pm_event_id = pm_event_id; -+ ), ++ lockdep_assert_held(&kbdev->pm.lock); + -+ TP_printk("%i,%i.%.9i,0,%i,%u", __entry->event_type, -+ (int)__entry->ts_sec, -+ (int)__entry->ts_nsec, -+ __entry->pm_event_type, __entry->pm_event_id) ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ if (!kbdev->pm.backend.poweroff_wait_in_progress) { ++ /* Force all cores off */ ++ kbdev->pm.backend.desired_shader_state = 0; ++ kbdev->pm.backend.desired_tiler_state = 0; + -+); ++ /* Force all cores to be unavailable, in the situation where ++ * transitions are in progress for some cores but not others, ++ * and kbase_pm_check_transitions_nolock can not immediately ++ * power off the cores */ ++ kbdev->shader_available_bitmap = 0; ++ kbdev->tiler_available_bitmap = 0; ++ kbdev->l2_available_bitmap = 0; + -+TRACE_EVENT(mali_timeline_slot_atom, ++ kbdev->pm.backend.poweroff_wait_in_progress = true; ++ kbdev->pm.backend.poweroff_is_suspend = is_suspend; + -+ TP_PROTO(u64 ts_sec, -+ u32 ts_nsec, -+ int event_type, -+ int tgid, -+ int js, -+ int atom_id), ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ /*Kick off wq here. Callers will have to wait*/ ++ queue_work(kbdev->pm.backend.gpu_poweroff_wait_wq, ++ &kbdev->pm.backend.gpu_poweroff_wait_work); ++ } else { ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } ++} + -+ TP_ARGS(ts_sec, -+ ts_nsec, -+ event_type, -+ tgid, -+ js, -+ atom_id), ++static bool is_poweroff_in_progress(struct kbase_device *kbdev) ++{ ++ bool ret; ++ unsigned long flags; + -+ TP_STRUCT__entry( -+ __field(u64, ts_sec) -+ __field(u32, ts_nsec) -+ __field(int, event_type) -+ __field(int, tgid) -+ __field(int, js) -+ __field(int, atom_id) -+ ), ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ret = (kbdev->pm.backend.poweroff_wait_in_progress == false); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ TP_fast_assign( -+ __entry->ts_sec = ts_sec; -+ __entry->ts_nsec = ts_nsec; -+ __entry->event_type = event_type; -+ __entry->tgid = tgid; -+ __entry->js = js; -+ __entry->atom_id = atom_id; -+ ), ++ return ret; ++} + -+ TP_printk("%i,%i.%.9i,%i,%i,%i", __entry->event_type, -+ (int)__entry->ts_sec, -+ (int)__entry->ts_nsec, -+ __entry->tgid, -+ __entry->js, -+ __entry->atom_id) -+); ++void kbase_pm_wait_for_poweroff_complete(struct kbase_device *kbdev) ++{ ++ wait_event_killable(kbdev->pm.backend.poweroff_wait, ++ is_poweroff_in_progress(kbdev)); ++} + -+TRACE_EVENT(mali_timeline_pm_checktrans, ++int kbase_hwaccess_pm_powerup(struct kbase_device *kbdev, ++ unsigned int flags) ++{ ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ unsigned long irq_flags; ++ int ret; + -+ TP_PROTO(u64 ts_sec, -+ u32 ts_nsec, -+ int trans_code, -+ int trans_id), ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ TP_ARGS(ts_sec, -+ ts_nsec, -+ trans_code, -+ trans_id), ++ mutex_lock(&js_devdata->runpool_mutex); ++ mutex_lock(&kbdev->pm.lock); + -+ TP_STRUCT__entry( -+ __field(u64, ts_sec) -+ __field(u32, ts_nsec) -+ __field(int, trans_code) -+ __field(int, trans_id) -+ ), ++ /* A suspend won't happen during startup/insmod */ ++ KBASE_DEBUG_ASSERT(!kbase_pm_is_suspending(kbdev)); + -+ TP_fast_assign( -+ __entry->ts_sec = ts_sec; -+ __entry->ts_nsec = ts_nsec; -+ __entry->trans_code = trans_code; -+ __entry->trans_id = trans_id; -+ ), ++ /* Power up the GPU, don't enable IRQs as we are not ready to receive ++ * them. */ ++ ret = kbase_pm_init_hw(kbdev, flags); ++ if (ret) { ++ mutex_unlock(&kbdev->pm.lock); ++ mutex_unlock(&js_devdata->runpool_mutex); ++ return ret; ++ } + -+ TP_printk("%i,%i.%.9i,0,%i", __entry->trans_code, -+ (int)__entry->ts_sec, -+ (int)__entry->ts_nsec, -+ __entry->trans_id) ++ kbasep_pm_init_core_use_bitmaps(kbdev); + -+); ++ kbdev->pm.debug_core_mask_all = kbdev->pm.debug_core_mask[0] = ++ kbdev->pm.debug_core_mask[1] = ++ kbdev->pm.debug_core_mask[2] = ++ kbdev->gpu_props.props.raw_props.shader_present; + -+TRACE_EVENT(mali_timeline_context_active, ++ /* Pretend the GPU is active to prevent a power policy turning the GPU ++ * cores off */ ++ kbdev->pm.active_count = 1; + -+ TP_PROTO(u64 ts_sec, -+ u32 ts_nsec, -+ int count), ++ spin_lock_irqsave(&kbdev->pm.backend.gpu_cycle_counter_requests_lock, ++ irq_flags); ++ /* Ensure cycle counter is off */ ++ kbdev->pm.backend.gpu_cycle_counter_requests = 0; ++ spin_unlock_irqrestore( ++ &kbdev->pm.backend.gpu_cycle_counter_requests_lock, ++ irq_flags); + -+ TP_ARGS(ts_sec, -+ ts_nsec, -+ count), ++ /* We are ready to receive IRQ's now as power policy is set up, so ++ * enable them now. */ ++#ifdef CONFIG_MALI_DEBUG ++ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, irq_flags); ++ kbdev->pm.backend.driver_ready_for_irqs = true; ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, irq_flags); ++#endif ++ kbase_pm_enable_interrupts(kbdev); + -+ TP_STRUCT__entry( -+ __field(u64, ts_sec) -+ __field(u32, ts_nsec) -+ __field(int, count) -+ ), ++ /* Turn on the GPU and any cores needed by the policy */ ++ kbase_pm_do_poweron(kbdev, false); ++ mutex_unlock(&kbdev->pm.lock); ++ mutex_unlock(&js_devdata->runpool_mutex); + -+ TP_fast_assign( -+ __entry->ts_sec = ts_sec; -+ __entry->ts_nsec = ts_nsec; -+ __entry->count = count; -+ ), ++ /* Idle the GPU and/or cores, if the policy wants it to */ ++ kbase_pm_context_idle(kbdev); + -+ TP_printk("%i,%i.%.9i,0,%i", SW_SET_CONTEXT_ACTIVE, -+ (int)__entry->ts_sec, -+ (int)__entry->ts_nsec, -+ __entry->count) -+); ++ return 0; ++} + -+#endif /* _MALI_TIMELINE_H */ ++void kbase_hwaccess_pm_halt(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+#undef TRACE_INCLUDE_PATH -+#define TRACE_INCLUDE_PATH . ++ mutex_lock(&kbdev->pm.lock); ++ kbase_pm_cancel_deferred_poweroff(kbdev); ++ kbase_pm_do_poweroff(kbdev, false); ++ mutex_unlock(&kbdev->pm.lock); ++} + -+/* This part must be outside protection */ -+#include ++KBASE_EXPORT_TEST_API(kbase_hwaccess_pm_halt); ++ ++void kbase_hwaccess_pm_term(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kbdev->pm.active_count == 0); ++ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_cycle_counter_requests == 0); ++ ++ /* Free any resources the policy allocated */ ++ kbase_pm_policy_term(kbdev); ++ kbase_pm_ca_term(kbdev); ++ ++ /* Shut down the metrics subsystem */ ++ kbasep_pm_metrics_term(kbdev); ++ ++ destroy_workqueue(kbdev->pm.backend.gpu_poweroff_wait_wq); ++} ++ ++void kbase_pm_power_changed(struct kbase_device *kbdev) ++{ ++ bool cores_are_available; ++ unsigned long flags; ++ ++ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, ++ SW_FLOW_PM_CHECKTRANS_GPU_INTERRUPT_START); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ cores_are_available = kbase_pm_check_transitions_nolock(kbdev); ++ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, ++ SW_FLOW_PM_CHECKTRANS_GPU_INTERRUPT_END); ++ ++ if (cores_are_available) { ++ /* Log timelining information that a change in state has ++ * completed */ ++ kbase_timeline_pm_handle_event(kbdev, ++ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED); ++ ++ kbase_backend_slot_update(kbdev); ++ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++} ++ ++void kbase_pm_set_debug_core_mask(struct kbase_device *kbdev, ++ u64 new_core_mask_js0, u64 new_core_mask_js1, ++ u64 new_core_mask_js2) ++{ ++ kbdev->pm.debug_core_mask[0] = new_core_mask_js0; ++ kbdev->pm.debug_core_mask[1] = new_core_mask_js1; ++ kbdev->pm.debug_core_mask[2] = new_core_mask_js2; ++ kbdev->pm.debug_core_mask_all = new_core_mask_js0 | new_core_mask_js1 | ++ new_core_mask_js2; ++ ++ kbase_pm_update_cores_state_nolock(kbdev); ++} ++ ++void kbase_hwaccess_pm_gpu_active(struct kbase_device *kbdev) ++{ ++ kbase_pm_update_active(kbdev); ++} ++ ++void kbase_hwaccess_pm_gpu_idle(struct kbase_device *kbdev) ++{ ++ kbase_pm_update_active(kbdev); ++} ++ ++void kbase_hwaccess_pm_suspend(struct kbase_device *kbdev) ++{ ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ ++ /* Force power off the GPU and all cores (regardless of policy), only ++ * after the PM active count reaches zero (otherwise, we risk turning it ++ * off prematurely) */ ++ mutex_lock(&js_devdata->runpool_mutex); ++ mutex_lock(&kbdev->pm.lock); ++ ++ kbase_pm_cancel_deferred_poweroff(kbdev); ++ kbase_pm_do_poweroff(kbdev, true); ++ ++ kbase_backend_timer_suspend(kbdev); ++ ++ mutex_unlock(&kbdev->pm.lock); ++ mutex_unlock(&js_devdata->runpool_mutex); ++ ++ kbase_pm_wait_for_poweroff_complete(kbdev); ++} ++ ++void kbase_hwaccess_pm_resume(struct kbase_device *kbdev) ++{ ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ ++ mutex_lock(&js_devdata->runpool_mutex); ++ mutex_lock(&kbdev->pm.lock); ++ ++ kbdev->pm.suspending = false; ++ kbase_pm_do_poweron(kbdev, true); ++ ++ kbase_backend_timer_resume(kbdev); + -diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_uk.h b/drivers/gpu/arm/bifrost_for_linux/mali_uk.h ++ mutex_unlock(&kbdev->pm.lock); ++ mutex_unlock(&js_devdata->runpool_mutex); ++} +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c new file mode 100755 -index 000000000000..841d03fb5873 +index 000000000..85890f1e8 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/mali_uk.h -@@ -0,0 +1,141 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c +@@ -0,0 +1,182 @@ +/* + * -+ * (C) COPYRIGHT 2010, 2012-2015 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2013-2017 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -332156,239 +368432,180 @@ index 000000000000..841d03fb5873 + + + -+ -+ -+/** -+ * @file mali_uk.h -+ * Types and definitions that are common across OSs for both the user -+ * and kernel side of the User-Kernel interface. ++/* ++ * Base kernel core availability APIs + */ + -+#ifndef _UK_H_ -+#define _UK_H_ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ ++#include ++#include ++#include + -+/** -+ * @addtogroup base_api -+ * @{ -+ */ ++static const struct kbase_pm_ca_policy *const policy_list[] = { ++ &kbase_pm_ca_fixed_policy_ops, ++#ifdef CONFIG_MALI_DEVFREQ ++ &kbase_pm_ca_devfreq_policy_ops, ++#endif ++#if !MALI_CUSTOMER_RELEASE ++ &kbase_pm_ca_random_policy_ops ++#endif ++}; + +/** -+ * @defgroup uk_api User-Kernel Interface API -+ * -+ * The User-Kernel Interface abstracts the communication mechanism between the user and kernel-side code of device -+ * drivers developed as part of the Midgard DDK. Currently that includes the Base driver and the UMP driver. -+ * -+ * It exposes an OS independent API to user-side code (UKU) which routes functions calls to an OS-independent -+ * kernel-side API (UKK) via an OS-specific communication mechanism. -+ * -+ * This API is internal to the Midgard DDK and is not exposed to any applications. ++ * POLICY_COUNT - The number of policies available in the system. + * -+ * @{ ++ * This is derived from the number of functions listed in policy_list. + */ ++#define POLICY_COUNT (sizeof(policy_list)/sizeof(*policy_list)) + -+/** -+ * These are identifiers for kernel-side drivers implementing a UK interface, aka UKK clients. The -+ * UK module maps this to an OS specific device name, e.g. "gpu_base" -> "GPU0:". Specify this -+ * identifier to select a UKK client to the uku_open() function. -+ * -+ * When a new UKK client driver is created a new identifier needs to be added to the uk_client_id -+ * enumeration and the uku_open() implemenation for the various OS ports need to be updated to -+ * provide a mapping of the identifier to the OS specific device name. -+ * -+ */ -+enum uk_client_id { -+ /** -+ * Value used to identify the Base driver UK client. -+ */ -+ UK_CLIENT_MALI_T600_BASE, ++int kbase_pm_ca_init(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ /** The number of uk clients supported. This must be the last member of the enum */ -+ UK_CLIENT_COUNT -+}; ++ kbdev->pm.backend.ca_current_policy = policy_list[0]; + -+/** -+ * Each function callable through the UK interface has a unique number. -+ * Functions provided by UK clients start from number UK_FUNC_ID. -+ * Numbers below UK_FUNC_ID are used for internal UK functions. -+ */ -+enum uk_func { -+ UKP_FUNC_ID_CHECK_VERSION, /**< UKK Core internal function */ -+ /** -+ * Each UK client numbers the functions they provide starting from -+ * number UK_FUNC_ID. This number is then eventually assigned to the -+ * id field of the union uk_header structure when preparing to make a -+ * UK call. See your UK client for a list of their function numbers. -+ */ -+ UK_FUNC_ID = 512 -+}; ++ kbdev->pm.backend.ca_current_policy->init(kbdev); + -+/** -+ * Arguments for a UK call are stored in a structure. This structure consists -+ * of a fixed size header and a payload. The header carries a 32-bit number -+ * identifying the UK function to be called (see uk_func). When the UKK client -+ * receives this header and executed the requested UK function, it will use -+ * the same header to store the result of the function in the form of a -+ * int return code. The size of this structure is such that the -+ * first member of the payload following the header can be accessed efficiently -+ * on a 32 and 64-bit kernel and the structure has the same size regardless -+ * of a 32 or 64-bit kernel. The uk_kernel_size_type type should be defined -+ * accordingly in the OS specific mali_uk_os.h header file. -+ */ -+union uk_header { -+ /** -+ * 32-bit number identifying the UK function to be called. -+ * Also see uk_func. -+ */ -+ u32 id; -+ /** -+ * The int return code returned by the called UK function. -+ * See the specification of the particular UK function you are -+ * calling for the meaning of the error codes returned. All -+ * UK functions return 0 on success. -+ */ -+ u32 ret; -+ /* -+ * Used to ensure 64-bit alignment of this union. Do not remove. -+ * This field is used for padding and does not need to be initialized. -+ */ -+ u64 sizer; -+}; ++ return 0; ++} + -+/** -+ * This structure carries a 16-bit major and minor number and is sent along with an internal UK call -+ * used during uku_open to identify the versions of the UK module in use by the user-side and kernel-side. -+ */ -+struct uku_version_check_args { -+ union uk_header header; -+ /**< UK call header */ -+ u16 major; -+ /**< This field carries the user-side major version on input and the kernel-side major version on output */ -+ u16 minor; -+ /**< This field carries the user-side minor version on input and the kernel-side minor version on output. */ -+ u8 padding[4]; -+}; ++void kbase_pm_ca_term(struct kbase_device *kbdev) ++{ ++ kbdev->pm.backend.ca_current_policy->term(kbdev); ++} + -+/** @} end group uk_api */ ++int kbase_pm_ca_list_policies(const struct kbase_pm_ca_policy * const **list) ++{ ++ if (!list) ++ return POLICY_COUNT; + -+/** @} *//* end group base_api */ ++ *list = policy_list; + -+#ifdef __cplusplus ++ return POLICY_COUNT; +} -+#endif /* __cplusplus */ -+#endif /* _UK_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/Kconfig b/drivers/gpu/arm/bifrost_for_linux/platform/Kconfig -new file mode 100755 -index 000000000000..38835d3d1531 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/Kconfig -@@ -0,0 +1,24 @@ -+# -+# (C) COPYRIGHT 2012-2013, 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# + ++KBASE_EXPORT_TEST_API(kbase_pm_ca_list_policies); + ++const struct kbase_pm_ca_policy ++*kbase_pm_ca_get_policy(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + ++ return kbdev->pm.backend.ca_current_policy; ++} + -+# Add your platform specific Kconfig file here -+# -+# "drivers/gpu/arm/midgard/platform/xxx/Kconfig" -+# -+# Where xxx is the platform name is the name set in MALI_PLATFORM_NAME -+# ++KBASE_EXPORT_TEST_API(kbase_pm_ca_get_policy); + -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/Kbuild b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/Kbuild -new file mode 100755 -index 000000000000..d40d7982ff04 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/Kbuild -@@ -0,0 +1,18 @@ -+# -+# (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++void kbase_pm_ca_set_policy(struct kbase_device *kbdev, ++ const struct kbase_pm_ca_policy *new_policy) ++{ ++ const struct kbase_pm_ca_policy *old_policy; ++ unsigned long flags; + ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(new_policy != NULL); + -+mali_kbase-y += \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_config_devicetree.o \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_runtime_pm.o -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_config_devicetree.c b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_config_devicetree.c -new file mode 100755 -index 000000000000..29ccc29e4125 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_config_devicetree.c -@@ -0,0 +1,40 @@ -+/* -+ * -+ * (C) COPYRIGHT 2015, 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ KBASE_TRACE_ADD(kbdev, PM_CA_SET_POLICY, NULL, NULL, 0u, ++ new_policy->id); ++ ++ /* During a policy change we pretend the GPU is active */ ++ /* A suspend won't happen here, because we're in a syscall from a ++ * userspace thread */ ++ kbase_pm_context_active(kbdev); ++ ++ mutex_lock(&kbdev->pm.lock); + ++ /* Remove the policy to prevent IRQ handlers from working on it */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ old_policy = kbdev->pm.backend.ca_current_policy; ++ kbdev->pm.backend.ca_current_policy = NULL; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + ++ if (old_policy->term) ++ old_policy->term(kbdev); + -+#include ++ if (new_policy->init) ++ new_policy->init(kbdev); + -+int kbase_platform_early_init(void) ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbdev->pm.backend.ca_current_policy = new_policy; ++ ++ /* If any core power state changes were previously attempted, but ++ * couldn't be made because the policy was changing (current_policy was ++ * NULL), then re-try them here. */ ++ kbase_pm_update_cores_state_nolock(kbdev); ++ ++ kbdev->pm.backend.ca_current_policy->update_core_status(kbdev, ++ kbdev->shader_ready_bitmap, ++ kbdev->shader_transitioning_bitmap); ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ mutex_unlock(&kbdev->pm.lock); ++ ++ /* Now the policy change is finished, we release our fake context active ++ * reference */ ++ kbase_pm_context_idle(kbdev); ++} ++ ++KBASE_EXPORT_TEST_API(kbase_pm_ca_set_policy); ++ ++u64 kbase_pm_ca_get_core_mask(struct kbase_device *kbdev) +{ -+ /* Nothing needed at this stage */ -+ return 0; ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ /* All cores must be enabled when instrumentation is in use */ ++ if (kbdev->pm.backend.instr_enabled) ++ return kbdev->gpu_props.props.raw_props.shader_present & ++ kbdev->pm.debug_core_mask_all; ++ ++ if (kbdev->pm.backend.ca_current_policy == NULL) ++ return kbdev->gpu_props.props.raw_props.shader_present & ++ kbdev->pm.debug_core_mask_all; ++ ++ return kbdev->pm.backend.ca_current_policy->get_core_mask(kbdev) & ++ kbdev->pm.debug_core_mask_all; +} + -+static struct kbase_platform_config dummy_platform_config; ++KBASE_EXPORT_TEST_API(kbase_pm_ca_get_core_mask); + -+struct kbase_platform_config *kbase_get_platform_config(void) ++void kbase_pm_ca_update_core_status(struct kbase_device *kbdev, u64 cores_ready, ++ u64 cores_transitioning) +{ -+ return &dummy_platform_config; ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ if (kbdev->pm.backend.ca_current_policy != NULL) ++ kbdev->pm.backend.ca_current_policy->update_core_status(kbdev, ++ cores_ready, ++ cores_transitioning); +} + -+int kbase_platform_register(void) ++void kbase_pm_ca_instr_enable(struct kbase_device *kbdev) +{ -+ return 0; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbdev->pm.backend.instr_enabled = true; ++ ++ kbase_pm_update_cores_state_nolock(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} + -+void kbase_platform_unregister(void) ++void kbase_pm_ca_instr_disable(struct kbase_device *kbdev) +{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ kbdev->pm.backend.instr_enabled = false; ++ ++ kbase_pm_update_cores_state_nolock(kbdev); +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_config_platform.h +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h new file mode 100755 -index 000000000000..2ceca34945b9 +index 000000000..ee9e751f2 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_config_platform.h -@@ -0,0 +1,80 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h +@@ -0,0 +1,92 @@ +/* + * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2015 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -332403,78 +368620,90 @@ index 000000000000..2ceca34945b9 + + + -+/** -+ * Maximum frequency GPU will be clocked at. Given in kHz. -+ * This must be specified as there is no default value. -+ * -+ * Attached value: number in kHz -+ * Default value: NA ++/* ++ * Base kernel core availability APIs + */ -+#define GPU_FREQ_KHZ_MAX (5000) ++ ++#ifndef _KBASE_PM_CA_H_ ++#define _KBASE_PM_CA_H_ ++ +/** -+ * Minimum frequency GPU will be clocked at. Given in kHz. -+ * This must be specified as there is no default value. ++ * kbase_pm_ca_init - Initialize core availability framework + * -+ * Attached value: number in kHz -+ * Default value: NA ++ * Must be called before calling any other core availability function ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Return: 0 if the core availability framework was successfully initialized, ++ * -errno otherwise + */ -+#define GPU_FREQ_KHZ_MIN (5000) ++int kbase_pm_ca_init(struct kbase_device *kbdev); + +/** -+ * CPU_SPEED_FUNC - A pointer to a function that calculates the CPU clock -+ * -+ * CPU clock speed of the platform is in MHz - see kbase_cpu_clk_speed_func -+ * for the function prototype. ++ * kbase_pm_ca_term - Terminate core availability framework + * -+ * Attached value: A kbase_cpu_clk_speed_func. -+ * Default Value: NA ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+#define CPU_SPEED_FUNC (NULL) ++void kbase_pm_ca_term(struct kbase_device *kbdev); + +/** -+ * GPU_SPEED_FUNC - A pointer to a function that calculates the GPU clock ++ * kbase_pm_ca_get_core_mask - Get currently available shaders core mask + * -+ * GPU clock speed of the platform in MHz - see kbase_gpu_clk_speed_func -+ * for the function prototype. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * -+ * Attached value: A kbase_gpu_clk_speed_func. -+ * Default Value: NA ++ * Returns a mask of the currently available shader cores. ++ * Calls into the core availability policy ++ * ++ * Return: The bit mask of available cores + */ -+#define GPU_SPEED_FUNC (NULL) ++u64 kbase_pm_ca_get_core_mask(struct kbase_device *kbdev); + +/** -+ * Power management configuration ++ * kbase_pm_ca_update_core_status - Update core status + * -+ * Attached value: pointer to @ref kbase_pm_callback_conf -+ * Default value: See @ref kbase_pm_callback_conf ++ * @kbdev: The kbase device structure for the device (must be ++ * a valid pointer) ++ * @cores_ready: The bit mask of cores ready for job submission ++ * @cores_transitioning: The bit mask of cores that are transitioning power ++ * state ++ * ++ * Update core availability policy with current core power status ++ * ++ * Calls into the core availability policy + */ -+#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) ++void kbase_pm_ca_update_core_status(struct kbase_device *kbdev, u64 cores_ready, ++ u64 cores_transitioning); + +/** -+ * Platform specific configuration functions ++ * kbase_pm_ca_instr_enable - Enable override for instrumentation + * -+ * Attached value: pointer to @ref kbase_platform_funcs_conf -+ * Default value: See @ref kbase_platform_funcs_conf ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * This overrides the output of the core availability policy, ensuring that all ++ * cores are available + */ -+#define PLATFORM_FUNCS (NULL) -+ -+extern struct kbase_pm_callback_conf pm_callbacks; ++void kbase_pm_ca_instr_enable(struct kbase_device *kbdev); + +/** -+ * Autosuspend delay ++ * kbase_pm_ca_instr_disable - Disable override for instrumentation + * -+ * The delay time (in milliseconds) to be used for autosuspend ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * This disables any previously enabled override, and resumes normal policy ++ * functionality + */ -+#define AUTO_SUSPEND_DELAY (100) -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_runtime_pm.c b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_runtime_pm.c ++void kbase_pm_ca_instr_disable(struct kbase_device *kbdev); ++ ++#endif /* _KBASE_PM_CA_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c new file mode 100755 -index 000000000000..9fe37c8d835e +index 000000000..66bf660cf --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_runtime_pm.c -@@ -0,0 +1,121 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c +@@ -0,0 +1,129 @@ +/* + * -+ * (C) COPYRIGHT 2015, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -332489,119 +368718,127 @@ index 000000000000..9fe37c8d835e + + + ++/* ++ * A core availability policy implementing core mask selection from devfreq OPPs ++ * ++ */ ++ +#include -+#include -+#include -+#include "mali_kbase_config_platform.h" ++#include ++#include ++#include + -+static int pm_callback_power_on(struct kbase_device *kbdev) ++void kbase_devfreq_set_core_mask(struct kbase_device *kbdev, u64 core_mask) +{ -+ int ret = 1; /* Assume GPU has been powered off */ -+ int error; -+ -+ dev_dbg(kbdev->dev, "pm_callback_power_on %p\n", -+ (void *)kbdev->dev->pm_domain); ++ struct kbasep_pm_ca_policy_devfreq *data = ++ &kbdev->pm.backend.ca_policy_data.devfreq; ++ unsigned long flags; + -+ error = pm_runtime_get_sync(kbdev->dev); -+ if (error == 1) { -+ /* -+ * Let core know that the chip has not been -+ * powered off, so we can save on re-initialization. -+ */ -+ ret = 0; -+ } ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ dev_dbg(kbdev->dev, "pm_runtime_get_sync returned %d\n", error); ++ data->cores_desired = core_mask; + -+ return ret; -+} ++ /* Disable any cores that are now unwanted */ ++ data->cores_enabled &= data->cores_desired; + -+static void pm_callback_power_off(struct kbase_device *kbdev) -+{ -+ dev_dbg(kbdev->dev, "pm_callback_power_off\n"); ++ kbdev->pm.backend.ca_in_transition = true; + -+ pm_runtime_mark_last_busy(kbdev->dev); -+ pm_runtime_put_autosuspend(kbdev->dev); -+} ++ /* If there are no cores to be powered off then power on desired cores ++ */ ++ if (!(data->cores_used & ~data->cores_desired)) { ++ data->cores_enabled = data->cores_desired; ++ kbdev->pm.backend.ca_in_transition = false; ++ } + -+int kbase_device_runtime_init(struct kbase_device *kbdev) -+{ -+ int ret = 0; ++ kbase_pm_update_cores_state_nolock(kbdev); + -+ dev_dbg(kbdev->dev, "kbase_device_runtime_init\n"); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ pm_runtime_set_autosuspend_delay(kbdev->dev, AUTO_SUSPEND_DELAY); -+ pm_runtime_use_autosuspend(kbdev->dev); ++ dev_dbg(kbdev->dev, "Devfreq policy : new core mask=%llX %llX\n", ++ data->cores_desired, data->cores_enabled); ++} + -+ pm_runtime_set_active(kbdev->dev); -+ pm_runtime_enable(kbdev->dev); ++static void devfreq_init(struct kbase_device *kbdev) ++{ ++ struct kbasep_pm_ca_policy_devfreq *data = ++ &kbdev->pm.backend.ca_policy_data.devfreq; + -+ if (!pm_runtime_enabled(kbdev->dev)) { -+ dev_warn(kbdev->dev, "pm_runtime not enabled"); -+ ret = -ENOSYS; ++ if (kbdev->current_core_mask) { ++ data->cores_enabled = kbdev->current_core_mask; ++ data->cores_desired = kbdev->current_core_mask; ++ } else { ++ data->cores_enabled = ++ kbdev->gpu_props.props.raw_props.shader_present; ++ data->cores_desired = ++ kbdev->gpu_props.props.raw_props.shader_present; + } -+ -+ return ret; ++ data->cores_used = 0; ++ kbdev->pm.backend.ca_in_transition = false; +} + -+void kbase_device_runtime_disable(struct kbase_device *kbdev) ++static void devfreq_term(struct kbase_device *kbdev) +{ -+ dev_dbg(kbdev->dev, "kbase_device_runtime_disable\n"); -+ pm_runtime_disable(kbdev->dev); +} + -+static int pm_callback_runtime_on(struct kbase_device *kbdev) ++static u64 devfreq_get_core_mask(struct kbase_device *kbdev) +{ -+ dev_dbg(kbdev->dev, "pm_callback_runtime_on\n"); -+ -+ return 0; ++ return kbdev->pm.backend.ca_policy_data.devfreq.cores_enabled; +} + -+static void pm_callback_runtime_off(struct kbase_device *kbdev) ++static void devfreq_update_core_status(struct kbase_device *kbdev, ++ u64 cores_ready, ++ u64 cores_transitioning) +{ -+ dev_dbg(kbdev->dev, "pm_callback_runtime_off\n"); -+} ++ struct kbasep_pm_ca_policy_devfreq *data = ++ &kbdev->pm.backend.ca_policy_data.devfreq; + -+static void pm_callback_resume(struct kbase_device *kbdev) -+{ -+ int ret = pm_callback_runtime_on(kbdev); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ WARN_ON(ret); -+} ++ data->cores_used = cores_ready | cores_transitioning; + -+static void pm_callback_suspend(struct kbase_device *kbdev) -+{ -+ pm_callback_runtime_off(kbdev); ++ /* If in desired state then clear transition flag */ ++ if (data->cores_enabled == data->cores_desired) ++ kbdev->pm.backend.ca_in_transition = false; ++ ++ /* If all undesired cores are now off then power on desired cores. ++ * The direct comparison against cores_enabled limits potential ++ * recursion to one level */ ++ if (!(data->cores_used & ~data->cores_desired) && ++ data->cores_enabled != data->cores_desired) { ++ data->cores_enabled = data->cores_desired; ++ ++ kbase_pm_update_cores_state_nolock(kbdev); ++ ++ kbdev->pm.backend.ca_in_transition = false; ++ } +} + -+struct kbase_pm_callback_conf pm_callbacks = { -+ .power_on_callback = pm_callback_power_on, -+ .power_off_callback = pm_callback_power_off, -+ .power_suspend_callback = pm_callback_suspend, -+ .power_resume_callback = pm_callback_resume, -+#ifdef KBASE_PM_RUNTIME -+ .power_runtime_init_callback = kbase_device_runtime_init, -+ .power_runtime_term_callback = kbase_device_runtime_disable, -+ .power_runtime_on_callback = pm_callback_runtime_on, -+ .power_runtime_off_callback = pm_callback_runtime_off, -+#else /* KBASE_PM_RUNTIME */ -+ .power_runtime_init_callback = NULL, -+ .power_runtime_term_callback = NULL, -+ .power_runtime_on_callback = NULL, -+ .power_runtime_off_callback = NULL, -+#endif /* KBASE_PM_RUNTIME */ ++/* ++ * The struct kbase_pm_ca_policy structure for the devfreq core availability ++ * policy. ++ * ++ * This is the static structure that defines the devfreq core availability power ++ * policy's callback and name. ++ */ ++const struct kbase_pm_ca_policy kbase_pm_ca_devfreq_policy_ops = { ++ "devfreq", /* name */ ++ devfreq_init, /* init */ ++ devfreq_term, /* term */ ++ devfreq_get_core_mask, /* get_core_mask */ ++ devfreq_update_core_status, /* update_core_status */ ++ 0u, /* flags */ ++ KBASE_PM_CA_POLICY_ID_DEVFREQ, /* id */ +}; + -+ -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/mali_kbase_platform_common.h b/drivers/gpu/arm/bifrost_for_linux/platform/mali_kbase_platform_common.h +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h new file mode 100755 -index 000000000000..7cb3be7f78ce +index 000000000..7ab3cd4d8 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/mali_kbase_platform_common.h -@@ -0,0 +1,26 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h +@@ -0,0 +1,55 @@ +/* + * -+ * (C) COPYRIGHT 2010-2013 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -332616,897 +368853,920 @@ index 000000000000..7cb3be7f78ce + + + ++/* ++ * A core availability policy for use with devfreq, where core masks are ++ * associated with OPPs. ++ */ ++ ++#ifndef MALI_KBASE_PM_CA_DEVFREQ_H ++#define MALI_KBASE_PM_CA_DEVFREQ_H ++ +/** -+ * @brief Entry point to transfer control to a platform for early initialization ++ * struct kbasep_pm_ca_policy_devfreq - Private structure for devfreq ca policy + * -+ * This function is called early on in the initialization during execution of -+ * @ref kbase_driver_init. ++ * This contains data that is private to the devfreq core availability ++ * policy. + * -+ * @return Zero to indicate success non-zero for failure. ++ * @cores_desired: Cores that the policy wants to be available ++ * @cores_enabled: Cores that the policy is currently returning as available ++ * @cores_used: Cores currently powered or transitioning + */ -+int kbase_platform_early_init(void); -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/rk/Kbuild b/drivers/gpu/arm/bifrost_for_linux/platform/rk/Kbuild -new file mode 100755 -index 000000000000..7cc6c59d969f ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/rk/Kbuild -@@ -0,0 +1,17 @@ -+# -+# (C) COPYRIGHT 2012-2013 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++struct kbasep_pm_ca_policy_devfreq { ++ u64 cores_desired; ++ u64 cores_enabled; ++ u64 cores_used; ++}; + -+bifrost_kbase-y += \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_config_rk.o \ ++extern const struct kbase_pm_ca_policy kbase_pm_ca_devfreq_policy_ops; ++ ++/** ++ * kbase_devfreq_set_core_mask - Set core mask for policy to use ++ * @kbdev: Device pointer ++ * @core_mask: New core mask ++ * ++ * The new core mask will have immediate effect if the GPU is powered, or will ++ * take effect when it is next powered on. ++ */ ++void kbase_devfreq_set_core_mask(struct kbase_device *kbdev, u64 core_mask); ++ ++#endif /* MALI_KBASE_PM_CA_DEVFREQ_H */ + -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/rk/custom_log.h b/drivers/gpu/arm/bifrost_for_linux/platform/rk/custom_log.h +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c new file mode 100755 -index 000000000000..5de70ee13d25 +index 000000000..864612d31 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/rk/custom_log.h -@@ -0,0 +1,192 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c +@@ -0,0 +1,65 @@ +/* -+ * (C) COPYRIGHT RockChip Limited. All rights reserved. ++ * ++ * (C) COPYRIGHT 2013-2015 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms + * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef __CUSTOM_LOG_H__ -+#define __CUSTOM_LOG_H__ + -+#ifdef __cplusplus -+extern "C" { -+#endif + -+/* ----------------------------------------------------------------------------- -+ * Include Files -+ * ----------------------------------------------------------------------------- ++/* ++ * A power policy implementing fixed core availability + */ -+#include -+#include + -+/* ----------------------------------------------------------------------------- -+ * Macros Definition -+ * ----------------------------------------------------------------------------- -+ */ ++#include ++#include + -+/** 若下列 macro 有被定义, æ‰ ä½¿èƒ½ log 输出. */ -+/* #define ENABLE_DEBUG_LOG */ ++static void fixed_init(struct kbase_device *kbdev) ++{ ++ kbdev->pm.backend.ca_in_transition = false; ++} + -+/*----------------------------------------------------------------------------*/ ++static void fixed_term(struct kbase_device *kbdev) ++{ ++ CSTD_UNUSED(kbdev); ++} + -+#ifdef ENABLE_VERBOSE_LOG -+/** Verbose log. */ -+#define V(fmt, args...) \ -+ pr_debug("V : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ -+ "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) -+#else -+#define V(...) ((void)0) -+#endif ++static u64 fixed_get_core_mask(struct kbase_device *kbdev) ++{ ++ return kbdev->gpu_props.props.raw_props.shader_present; ++} + -+#ifdef ENABLE_DEBUG_LOG -+/** Debug log. */ -+#define D(fmt, args...) \ -+ pr_info("D : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ -+ "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) -+#else -+#define D(...) ((void)0) -+#endif ++static void fixed_update_core_status(struct kbase_device *kbdev, ++ u64 cores_ready, ++ u64 cores_transitioning) ++{ ++ CSTD_UNUSED(kbdev); ++ CSTD_UNUSED(cores_ready); ++ CSTD_UNUSED(cores_transitioning); ++} + -+#define I(fmt, args...) \ -+ pr_info("I : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ -+ "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) ++/* ++ * The struct kbase_pm_policy structure for the fixed power policy. ++ * ++ * This is the static structure that defines the fixed power policy's callback ++ * and name. ++ */ ++const struct kbase_pm_ca_policy kbase_pm_ca_fixed_policy_ops = { ++ "fixed", /* name */ ++ fixed_init, /* init */ ++ fixed_term, /* term */ ++ fixed_get_core_mask, /* get_core_mask */ ++ fixed_update_core_status, /* update_core_status */ ++ 0u, /* flags */ ++ KBASE_PM_CA_POLICY_ID_FIXED, /* id */ ++}; + -+#define W(fmt, args...) \ -+ pr_warn("W : [File] : %s; [Line] : %d; [Func] : %s(); " \ -+ fmt "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) ++KBASE_EXPORT_TEST_API(kbase_pm_ca_fixed_policy_ops); +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h +new file mode 100755 +index 000000000..a763155cb +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h +@@ -0,0 +1,40 @@ ++/* ++ * ++ * (C) COPYRIGHT 2013-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+#define E(fmt, args...) \ -+ pr_err("E : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ -+ "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) + -+/*-------------------------------------------------------*/ + -+/** 使用 D(), 以å进制的形å¼æ‰“å°å˜é‡ 'var' çš„ value. */ -+#define D_DEC(var) D(#var " = %d.", var) ++/* ++ * A power policy implementing fixed core availability ++ */ + -+#define E_DEC(var) E(#var " = %d.", var) ++#ifndef MALI_KBASE_PM_CA_FIXED_H ++#define MALI_KBASE_PM_CA_FIXED_H + -+/** 使用 D(), 以å六进制的形å¼æ‰“å°å˜é‡ 'var' çš„ value. */ -+#define D_HEX(var) D(#var " = 0x%x.", var) ++/** ++ * struct kbasep_pm_ca_policy_fixed - Private structure for policy instance data ++ * ++ * @dummy: Dummy member - no state is needed ++ * ++ * This contains data that is private to the particular power policy that is ++ * active. ++ */ ++struct kbasep_pm_ca_policy_fixed { ++ int dummy; ++}; + -+#define E_HEX(var) E(#var " = 0x%x.", var) ++extern const struct kbase_pm_ca_policy kbase_pm_ca_fixed_policy_ops; + -+/** -+ * 使用 D(), 以å六进制的形å¼, -+ * 打å°æŒ‡é’ˆç±»åž‹å˜é‡ 'ptr' çš„ value. ++#endif /* MALI_KBASE_PM_CA_FIXED_H */ ++ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c +new file mode 100755 +index 000000000..f891fa225 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c +@@ -0,0 +1,70 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ -+#define D_PTR(ptr) D(#ptr " = %p.", ptr) + -+#define E_PTR(ptr) E(#ptr " = %p.", ptr) + -+/** 使用 D(), æ‰“å° char 字串. */ -+#define D_STR(p_str) \ -+do { \ -+ if (!p_str) { \ -+ D(#p_str " = NULL."); \ -+ else \ -+ D(#p_str " = '%s'.", p_str); \ -+} while (0) + -+#define E_STR(p_str) \ -+do { \ -+ if (!p_str) \ -+ E(#p_str " = NULL."); \ -+ else \ -+ E(#p_str " = '%s'.", p_str); \ -+} while (0) + -+#ifdef ENABLE_DEBUG_LOG -+/** -+ * log 从 'p_start' 地å€å¼€å§‹çš„ 'len' 个字节的数æ®. ++ ++/* ++ * "Coarse Demand" power management policy + */ -+#define D_MEM(p_start, len) \ -+do { \ -+ int i = 0; \ -+ char *p = (char *)(p_start); \ -+ D("dump memory from addr of '" #p_start "', from %p, length %d' : ", \ -+ (p_start), \ -+ (len)); \ -+ pr_debug("\t\t"); \ -+ for (i = 0; i < (len); i++) \ -+ pr_debug("0x%02x, ", p[i]); \ -+ pr_debug("\n"); \ -+} while (0) -+#else -+#define D_MEM(...) ((void)0) -+#endif + -+/*-------------------------------------------------------*/ ++#include ++#include + -+/** -+ * 在特定æ¡ä»¶ä¸‹, 判定 error å‘生, -+ * å°†å˜é‡ 'ret_var' 设置 'err_code', -+ * log 输出对应的 Error Caution, -+ * 然åŽè·³è½¬ 'label' 指定的代ç å¤„执行. -+ * @param msg -+ * 纯字串形å¼çš„æ示信æ¯. -+ * @param ret_var -+ * 标识函数执行状æ€æˆ–者结果的å˜é‡, -+ * 将被设置具体的 Error Code. -+ * 通常是 'ret' or 'result'. -+ * @param err_code -+ * 表å¾ç‰¹å®š error 的常数标识, -+ * 通常是 å®çš„å½¢æ€. -+ * @param label -+ * 程åºå°†è¦è·³è½¬åˆ°çš„错误处ç†ä»£ç çš„æ ‡å·, -+ * 通常就是 'EXIT'. -+ * @param args... -+ * 对应 'msg_fmt' 实å‚中, -+ * '%s', '%d', ... 等转æ¢è¯´æ˜Žç¬¦çš„具体å¯å˜é•¿å®žå‚. -+ */ -+#define SET_ERROR_AND_JUMP(msg_fmt, ret_var, err_code, label, args...) \ -+do { \ -+ E("To set '" #ret_var "' to %d('" #err_code "'), because : " msg_fmt, \ -+ (err_code), \ -+ ## args); \ -+ (ret_var) = (err_code); \ -+ goto label; \ -+} while (0) ++static u64 coarse_demand_get_core_mask(struct kbase_device *kbdev) ++{ ++ if (kbdev->pm.active_count == 0) ++ return 0; + -+/* ----------------------------------------------------------------------------- -+ * Types and Structures Definition -+ * ----------------------------------------------------------------------------- -+ */ ++ return kbdev->gpu_props.props.raw_props.shader_present; ++} + -+/* ----------------------------------------------------------------------------- -+ * Global Functions' Prototype -+ * ----------------------------------------------------------------------------- -+ */ ++static bool coarse_demand_get_core_active(struct kbase_device *kbdev) ++{ ++ if (0 == kbdev->pm.active_count && !(kbdev->shader_needed_bitmap | ++ kbdev->shader_inuse_bitmap) && !kbdev->tiler_needed_cnt ++ && !kbdev->tiler_inuse_cnt) ++ return false; + -+/* ----------------------------------------------------------------------------- -+ * Inline Functions Implementation -+ * ----------------------------------------------------------------------------- -+ */ ++ return true; ++} + -+#ifdef __cplusplus ++static void coarse_demand_init(struct kbase_device *kbdev) ++{ ++ CSTD_UNUSED(kbdev); +} -+#endif + -+#endif /* __CUSTOM_LOG_H__ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_config_platform.h ++static void coarse_demand_term(struct kbase_device *kbdev) ++{ ++ CSTD_UNUSED(kbdev); ++} ++ ++/* The struct kbase_pm_policy structure for the demand power policy. ++ * ++ * This is the static structure that defines the demand power policy's callback ++ * and name. ++ */ ++const struct kbase_pm_policy kbase_pm_coarse_demand_policy_ops = { ++ "coarse_demand", /* name */ ++ coarse_demand_init, /* init */ ++ coarse_demand_term, /* term */ ++ coarse_demand_get_core_mask, /* get_core_mask */ ++ coarse_demand_get_core_active, /* get_core_active */ ++ 0u, /* flags */ ++ KBASE_PM_POLICY_ID_COARSE_DEMAND, /* id */ ++}; ++ ++KBASE_EXPORT_TEST_API(kbase_pm_coarse_demand_policy_ops); +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h new file mode 100755 -index 000000000000..07c5b6f8a760 +index 000000000..749d305ee --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_config_platform.h -@@ -0,0 +1,88 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h +@@ -0,0 +1,64 @@ +/* + * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2012-2015 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms + * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+/** -+ * @file mali_kbase_config_platform.h -+ * 声明 platform_config_of_rk (platform_rk çš„ platform_config). -+ */ + -+/** -+ * Maximum frequency GPU will be clocked at. -+ * Given in kHz. -+ * This must be specified as there is no default value. -+ * -+ * Attached value: number in kHz -+ * Default value: NA -+ */ -+#define GPU_FREQ_KHZ_MAX (5000) + -+/** -+ * Minimum frequency GPU will be clocked at. -+ * Given in kHz. -+ * This must be specified as there is no default value. -+ * -+ * Attached value: number in kHz -+ * Default value: NA -+ */ -+#define GPU_FREQ_KHZ_MIN (5000) + -+/** -+ * CPU_SPEED_FUNC -+ * - A pointer to a function that calculates the CPU clock -+ * -+ * CPU clock speed of the platform is in MHz -+ * - see kbase_cpu_clk_speed_func for the function prototype. -+ * -+ * Attached value: A kbase_cpu_clk_speed_func. -+ * Default Value: NA -+ */ -+#define CPU_SPEED_FUNC (NULL) + -+/** -+ * GPU_SPEED_FUNC -+ * - A pointer to a function that calculates the GPU clock -+ * -+ * GPU clock speed of the platform in MHz -+ * - see kbase_gpu_clk_speed_func for the function prototype. -+ * -+ * Attached value: A kbase_gpu_clk_speed_func. -+ * Default Value: NA ++/* ++ * "Coarse Demand" power management policy + */ -+#define GPU_SPEED_FUNC (NULL) + -+/** -+ * Power management configuration -+ * -+ * Attached value: -+ * pointer to @ref kbase_pm_callback_conf -+ * Default value: -+ * See @ref kbase_pm_callback_conf -+ */ -+#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) -+extern struct kbase_pm_callback_conf pm_callbacks; ++#ifndef MALI_KBASE_PM_COARSE_DEMAND_H ++#define MALI_KBASE_PM_COARSE_DEMAND_H + +/** -+ * Platform specific configuration functions ++ * DOC: ++ * The "Coarse" demand power management policy has the following ++ * characteristics: ++ * - When KBase indicates that the GPU will be powered up, but we don't yet ++ * know which Job Chains are to be run: ++ * - All Shader Cores are powered up, regardless of whether or not they will ++ * be needed later. ++ * - When KBase indicates that a set of Shader Cores are needed to submit the ++ * currently queued Job Chains: ++ * - All Shader Cores are kept powered, regardless of whether or not they will ++ * be needed ++ * - When KBase indicates that the GPU need not be powered: ++ * - The Shader Cores are powered off, and the GPU itself is powered off too. + * -+ * Attached value: -+ * pointer to @ref kbase_platform_funcs_conf -+ * Default value: -+ * See @ref kbase_platform_funcs_conf ++ * @note: ++ * - KBase indicates the GPU will be powered up when it has a User Process that ++ * has just started to submit Job Chains. ++ * - KBase indicates the GPU need not be powered when all the Job Chains from ++ * User Processes have finished, and it is waiting for a User Process to ++ * submit some more Job Chains. + */ -+#define PLATFORM_FUNCS (&platform_funcs) -+extern struct kbase_platform_funcs_conf platform_funcs; + +/** -+ * Secure mode switch ++ * struct kbasep_pm_policy_coarse_demand - Private structure for coarse demand ++ * policy + * -+ * Attached value: pointer to @ref kbase_secure_ops ++ * This contains data that is private to the coarse demand power policy. ++ * ++ * @dummy: Dummy member - no state needed + */ -+#define SECURE_CALLBACKS (NULL) ++struct kbasep_pm_policy_coarse_demand { ++ int dummy; ++}; ++ ++extern const struct kbase_pm_policy kbase_pm_coarse_demand_policy_ops; + -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_config_rk.c b/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_config_rk.c ++#endif /* MALI_KBASE_PM_COARSE_DEMAND_H */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h new file mode 100755 -index 000000000000..926c2dd3f8c9 +index 000000000..352744ee6 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_config_rk.c -@@ -0,0 +1,459 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h +@@ -0,0 +1,519 @@ +/* -+ * (C) COPYRIGHT RockChip Limited. All rights reserved. ++ * ++ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms + * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+/* #define ENABLE_DEBUG_LOG */ -+#include "custom_log.h" + -+#include -+#include -+#include -+#include + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++/* ++ * Backend-specific Power Manager definitions ++ */ + -+#include "mali_kbase_rk.h" ++#ifndef _KBASE_PM_HWACCESS_DEFS_H_ ++#define _KBASE_PM_HWACCESS_DEFS_H_ + -+#define MAX_PROP_NAME_LEN 3 -+#define LEAKAGE_TABLE_END ~1 -+#define LEAKAGE_INVALID 0xff ++#include "mali_kbase_pm_ca_fixed.h" ++#include "mali_kbase_pm_ca_devfreq.h" ++#if !MALI_CUSTOMER_RELEASE ++#include "mali_kbase_pm_ca_random.h" ++#endif + -+struct pvtm_config { -+ unsigned int freq; -+ unsigned int volt; -+ unsigned int ch[2]; -+ unsigned int sample_time; -+ unsigned int num; -+ unsigned int err; -+ unsigned int ref_temp; -+ int temp_prop[2]; -+ const char *tz_name; -+ struct thermal_zone_device *tz; -+}; ++#include "mali_kbase_pm_always_on.h" ++#include "mali_kbase_pm_coarse_demand.h" ++#include "mali_kbase_pm_demand.h" ++#if !MALI_CUSTOMER_RELEASE ++#include "mali_kbase_pm_demand_always_powered.h" ++#include "mali_kbase_pm_fast_start.h" ++#endif + -+struct volt_sel_table { -+ int min; -+ int max; -+ int sel; ++/* Forward definition - see mali_kbase.h */ ++struct kbase_device; ++struct kbase_jd_atom; ++ ++/** ++ * enum kbase_pm_core_type - The types of core in a GPU. ++ * ++ * These enumerated values are used in calls to ++ * - kbase_pm_get_present_cores() ++ * - kbase_pm_get_active_cores() ++ * - kbase_pm_get_trans_cores() ++ * - kbase_pm_get_ready_cores(). ++ * ++ * They specify which type of core should be acted on. These values are set in ++ * a manner that allows core_type_to_reg() function to be simpler and more ++ * efficient. ++ * ++ * @KBASE_PM_CORE_L2: The L2 cache ++ * @KBASE_PM_CORE_SHADER: Shader cores ++ * @KBASE_PM_CORE_TILER: Tiler cores ++ * @KBASE_PM_CORE_STACK: Core stacks ++ */ ++enum kbase_pm_core_type { ++ KBASE_PM_CORE_L2 = L2_PRESENT_LO, ++ KBASE_PM_CORE_SHADER = SHADER_PRESENT_LO, ++ KBASE_PM_CORE_TILER = TILER_PRESENT_LO, ++ KBASE_PM_CORE_STACK = STACK_PRESENT_LO +}; + +/** -+ * @file mali_kbase_config_rk.c -+ * 对 platform_config_of_rk 的具体实现. ++ * struct kbasep_pm_metrics_data - Metrics data collected for use by the power ++ * management framework. ++ * ++ * @time_period_start: time at which busy/idle measurements started ++ * @time_busy: number of ns the GPU was busy executing jobs since the ++ * @time_period_start timestamp. ++ * @time_idle: number of ns since time_period_start the GPU was not executing ++ * jobs since the @time_period_start timestamp. ++ * @prev_busy: busy time in ns of previous time period. ++ * Updated when metrics are reset. ++ * @prev_idle: idle time in ns of previous time period ++ * Updated when metrics are reset. ++ * @gpu_active: true when the GPU is executing jobs. false when ++ * not. Updated when the job scheduler informs us a job in submitted ++ * or removed from a GPU slot. ++ * @busy_cl: number of ns the GPU was busy executing CL jobs. Note that ++ * if two CL jobs were active for 400ns, this value would be updated ++ * with 800. ++ * @busy_gl: number of ns the GPU was busy executing GL jobs. Note that ++ * if two GL jobs were active for 400ns, this value would be updated ++ * with 800. ++ * @active_cl_ctx: number of CL jobs active on the GPU. Array is per-device. ++ * @active_gl_ctx: number of GL jobs active on the GPU. Array is per-slot. As ++ * GL jobs never run on slot 2 this slot is not recorded. ++ * @lock: spinlock protecting the kbasep_pm_metrics_data structure ++ * @timer: timer to regularly make DVFS decisions based on the power ++ * management metrics. ++ * @timer_active: boolean indicating @timer is running ++ * @platform_data: pointer to data controlled by platform specific code ++ * @kbdev: pointer to kbase device for which metrics are collected + * -+ * mali_device_driver 包å«ä¸¤éƒ¨åˆ† : -+ * .DP : platform_dependent_part_in_mdd : -+ * ä¾èµ– platform 部分, -+ * æºç åœ¨ /platform// -+ * 在 mali_device_driver 内部, -+ * 记为 platform_dependent_part, -+ * 也被记为 platform_specific_code. -+ * .DP : common_parts_in_mdd : -+ * arm 实现的通用的部分, -+ * æºç åœ¨ / 下. -+ * 在 mali_device_driver 内部, 记为 common_parts. + */ ++struct kbasep_pm_metrics_data { ++ ktime_t time_period_start; ++ u32 time_busy; ++ u32 time_idle; ++ u32 prev_busy; ++ u32 prev_idle; ++ bool gpu_active; ++ u32 busy_cl[2]; ++ u32 busy_gl; ++ u32 active_cl_ctx[2]; ++ u32 active_gl_ctx[2]; /* GL jobs can only run on 2 of the 3 job slots */ ++ spinlock_t lock; + -+/*---------------------------------------------------------------------------*/ ++#ifdef CONFIG_MALI_MIDGARD_DVFS ++ struct hrtimer timer; ++ bool timer_active; ++#endif + -+#ifdef CONFIG_REGULATOR -+static int rk_pm_enable_regulator(struct kbase_device *kbdev); -+static void rk_pm_disable_regulator(struct kbase_device *kbdev); -+#else -+static inline int rk_pm_enable_regulator(struct kbase_device *kbdev) -+{ -+ return 0; -+} ++ void *platform_data; ++ struct kbase_device *kbdev; ++}; + -+static inline void rk_pm_disable_regulator(struct kbase_device *kbdev) -+{ -+} ++union kbase_pm_policy_data { ++ struct kbasep_pm_policy_always_on always_on; ++ struct kbasep_pm_policy_coarse_demand coarse_demand; ++ struct kbasep_pm_policy_demand demand; ++#if !MALI_CUSTOMER_RELEASE ++ struct kbasep_pm_policy_demand_always_powered demand_always_powered; ++ struct kbasep_pm_policy_fast_start fast_start; +#endif ++}; + -+static int rk_pm_enable_clk(struct kbase_device *kbdev); -+ -+static void rk_pm_disable_clk(struct kbase_device *kbdev); ++union kbase_pm_ca_policy_data { ++ struct kbasep_pm_ca_policy_fixed fixed; ++ struct kbasep_pm_ca_policy_devfreq devfreq; ++#if !MALI_CUSTOMER_RELEASE ++ struct kbasep_pm_ca_policy_random random; ++#endif ++}; + -+static int kbase_platform_rk_create_sysfs_files(struct device *dev); ++/** ++ * struct kbase_pm_backend_data - Data stored per device for power management. ++ * ++ * This structure contains data for the power management framework. There is one ++ * instance of this structure per device in the system. ++ * ++ * @ca_current_policy: The policy that is currently actively controlling core ++ * availability. ++ * @pm_current_policy: The policy that is currently actively controlling the ++ * power state. ++ * @ca_policy_data: Private data for current CA policy ++ * @pm_policy_data: Private data for current PM policy ++ * @ca_in_transition: Flag indicating when core availability policy is ++ * transitioning cores. The core availability policy must ++ * set this when a change in core availability is occurring. ++ * power_change_lock must be held when accessing this. ++ * @reset_done: Flag when a reset is complete ++ * @reset_done_wait: Wait queue to wait for changes to @reset_done ++ * @l2_powered_wait: Wait queue for whether the l2 cache has been powered as ++ * requested ++ * @l2_powered: State indicating whether all the l2 caches are powered. ++ * Non-zero indicates they're *all* powered ++ * Zero indicates that some (or all) are not powered ++ * @gpu_cycle_counter_requests: The reference count of active gpu cycle counter ++ * users ++ * @gpu_cycle_counter_requests_lock: Lock to protect @gpu_cycle_counter_requests ++ * @desired_shader_state: A bit mask identifying the shader cores that the ++ * power policy would like to be on. The current state ++ * of the cores may be different, but there should be ++ * transitions in progress that will eventually achieve ++ * this state (assuming that the policy doesn't change ++ * its mind in the mean time). ++ * @powering_on_shader_state: A bit mask indicating which shader cores are ++ * currently in a power-on transition ++ * @desired_tiler_state: A bit mask identifying the tiler cores that the power ++ * policy would like to be on. See @desired_shader_state ++ * @powering_on_tiler_state: A bit mask indicating which tiler core are ++ * currently in a power-on transition ++ * @powering_on_l2_state: A bit mask indicating which l2-caches are currently ++ * in a power-on transition ++ * @powering_on_stack_state: A bit mask indicating which core stacks are ++ * currently in a power-on transition ++ * @gpu_in_desired_state: This flag is set if the GPU is powered as requested ++ * by the desired_xxx_state variables ++ * @gpu_in_desired_state_wait: Wait queue set when @gpu_in_desired_state != 0 ++ * @gpu_powered: Set to true when the GPU is powered and register ++ * accesses are possible, false otherwise ++ * @instr_enabled: Set to true when instrumentation is enabled, ++ * false otherwise ++ * @cg1_disabled: Set if the policy wants to keep the second core group ++ * powered off ++ * @driver_ready_for_irqs: Debug state indicating whether sufficient ++ * initialization of the driver has occurred to handle ++ * IRQs ++ * @gpu_powered_lock: Spinlock that must be held when writing @gpu_powered or ++ * accessing @driver_ready_for_irqs ++ * @metrics: Structure to hold metrics for the GPU ++ * @gpu_poweroff_pending: number of poweroff timer ticks until the GPU is ++ * powered off ++ * @shader_poweroff_pending_time: number of poweroff timer ticks until shaders ++ * and/or timers are powered off ++ * @gpu_poweroff_timer: Timer for powering off GPU ++ * @gpu_poweroff_wq: Workqueue to power off GPU on when timer fires ++ * @gpu_poweroff_work: Workitem used on @gpu_poweroff_wq ++ * @shader_poweroff_pending: Bit mask of shaders to be powered off on next ++ * timer callback ++ * @tiler_poweroff_pending: Bit mask of tilers to be powered off on next timer ++ * callback ++ * @poweroff_timer_needed: true if the poweroff timer is currently required, ++ * false otherwise ++ * @poweroff_timer_running: true if the poweroff timer is currently running, ++ * false otherwise ++ * power_change_lock should be held when accessing, ++ * unless there is no way the timer can be running (eg ++ * hrtimer_cancel() was called immediately before) ++ * @poweroff_wait_in_progress: true if a wait for GPU power off is in progress. ++ * hwaccess_lock must be held when accessing ++ * @poweron_required: true if a GPU power on is required. Should only be set ++ * when poweroff_wait_in_progress is true, and therefore the ++ * GPU can not immediately be powered on. pm.lock must be ++ * held when accessing ++ * @poweroff_is_suspend: true if the GPU is being powered off due to a suspend ++ * request. pm.lock must be held when accessing ++ * @gpu_poweroff_wait_wq: workqueue for waiting for GPU to power off ++ * @gpu_poweroff_wait_work: work item for use with @gpu_poweroff_wait_wq ++ * @poweroff_wait: waitqueue for waiting for @gpu_poweroff_wait_work to complete ++ * @callback_power_on: Callback when the GPU needs to be turned on. See ++ * &struct kbase_pm_callback_conf ++ * @callback_power_off: Callback when the GPU may be turned off. See ++ * &struct kbase_pm_callback_conf ++ * @callback_power_suspend: Callback when a suspend occurs and the GPU needs to ++ * be turned off. See &struct kbase_pm_callback_conf ++ * @callback_power_resume: Callback when a resume occurs and the GPU needs to ++ * be turned on. See &struct kbase_pm_callback_conf ++ * @callback_power_runtime_on: Callback when the GPU needs to be turned on. See ++ * &struct kbase_pm_callback_conf ++ * @callback_power_runtime_off: Callback when the GPU may be turned off. See ++ * &struct kbase_pm_callback_conf ++ * @callback_power_runtime_idle: Optional callback when the GPU may be idle. See ++ * &struct kbase_pm_callback_conf ++ * ++ * Note: ++ * During an IRQ, @ca_current_policy or @pm_current_policy can be NULL when the ++ * policy is being changed with kbase_pm_ca_set_policy() or ++ * kbase_pm_set_policy(). The change is protected under ++ * kbase_device.pm.power_change_lock. Direct access to this ++ * from IRQ context must therefore check for NULL. If NULL, then ++ * kbase_pm_ca_set_policy() or kbase_pm_set_policy() will re-issue the policy ++ * functions that would have been done under IRQ. ++ */ ++struct kbase_pm_backend_data { ++ const struct kbase_pm_ca_policy *ca_current_policy; ++ const struct kbase_pm_policy *pm_current_policy; ++ union kbase_pm_ca_policy_data ca_policy_data; ++ union kbase_pm_policy_data pm_policy_data; ++ bool ca_in_transition; ++ bool reset_done; ++ wait_queue_head_t reset_done_wait; ++ wait_queue_head_t l2_powered_wait; ++ int l2_powered; ++ int gpu_cycle_counter_requests; ++ spinlock_t gpu_cycle_counter_requests_lock; + -+static void kbase_platform_rk_remove_sysfs_files(struct device *dev); ++ u64 desired_shader_state; ++ u64 powering_on_shader_state; ++ u64 desired_tiler_state; ++ u64 powering_on_tiler_state; ++ u64 powering_on_l2_state; ++#ifdef CONFIG_MALI_CORESTACK ++ u64 powering_on_stack_state; ++#endif /* CONFIG_MALI_CORESTACK */ + -+/*---------------------------------------------------------------------------*/ ++ bool gpu_in_desired_state; ++ wait_queue_head_t gpu_in_desired_state_wait; + -+static void rk_pm_power_off_delay_work(struct work_struct *work) -+{ -+ struct rk_context *platform = -+ container_of(to_delayed_work(work), struct rk_context, work); -+ struct kbase_device *kbdev = platform->kbdev; ++ bool gpu_powered; + -+ if (!platform->is_powered) { -+ D("mali_dev is already powered off."); -+ return; -+ } ++ bool instr_enabled; + -+ if (pm_runtime_enabled(kbdev->dev)) { -+ D("to put_sync_suspend mali_dev."); -+ pm_runtime_put_sync_suspend(kbdev->dev); -+ } ++ bool cg1_disabled; + -+ rk_pm_disable_regulator(kbdev); ++#ifdef CONFIG_MALI_DEBUG ++ bool driver_ready_for_irqs; ++#endif /* CONFIG_MALI_DEBUG */ + -+ platform->is_powered = false; -+ KBASE_TIMELINE_GPU_POWER(kbdev, 0); -+ wake_unlock(&platform->wake_lock); -+} ++ spinlock_t gpu_powered_lock; + -+static int kbase_platform_rk_init(struct kbase_device *kbdev) -+{ -+ int ret = 0; -+ struct rk_context *platform; + -+ platform = kzalloc(sizeof(*platform), GFP_KERNEL); -+ if (!platform) { -+ E("err."); -+ return -ENOMEM; -+ } ++ struct kbasep_pm_metrics_data metrics; + -+ platform->is_powered = false; -+ platform->kbdev = kbdev; ++ int gpu_poweroff_pending; ++ int shader_poweroff_pending_time; + -+ platform->delay_ms = 200; -+ if (of_property_read_u32(kbdev->dev->of_node, "power-off-delay-ms", -+ &platform->delay_ms)) -+ W("power-off-delay-ms not available."); ++ struct hrtimer gpu_poweroff_timer; ++ struct workqueue_struct *gpu_poweroff_wq; ++ struct work_struct gpu_poweroff_work; + -+ platform->power_off_wq = create_freezable_workqueue("gpu_power_off_wq"); -+ if (!platform->power_off_wq) { -+ E("couldn't create workqueue"); -+ ret = -ENOMEM; -+ goto err_wq; -+ } -+ INIT_DEFERRABLE_WORK(&platform->work, rk_pm_power_off_delay_work); ++ u64 shader_poweroff_pending; ++ u64 tiler_poweroff_pending; + -+ wake_lock_init(&platform->wake_lock, WAKE_LOCK_SUSPEND, "gpu"); ++ bool poweroff_timer_needed; ++ bool poweroff_timer_running; + -+ platform->utilisation_period = DEFAULT_UTILISATION_PERIOD_IN_MS; ++ bool poweroff_wait_in_progress; ++ bool poweron_required; ++ bool poweroff_is_suspend; + -+ ret = kbase_platform_rk_create_sysfs_files(kbdev->dev); -+ if (ret) { -+ E("fail to create sysfs_files. ret = %d.", ret); -+ goto err_sysfs_files; -+ } ++ struct workqueue_struct *gpu_poweroff_wait_wq; ++ struct work_struct gpu_poweroff_wait_work; + -+ kbdev->platform_context = (void *)platform; -+ pm_runtime_enable(kbdev->dev); ++ wait_queue_head_t poweroff_wait; + -+ return 0; ++ int (*callback_power_on)(struct kbase_device *kbdev); ++ void (*callback_power_off)(struct kbase_device *kbdev); ++ void (*callback_power_suspend)(struct kbase_device *kbdev); ++ void (*callback_power_resume)(struct kbase_device *kbdev); ++ int (*callback_power_runtime_on)(struct kbase_device *kbdev); ++ void (*callback_power_runtime_off)(struct kbase_device *kbdev); ++ int (*callback_power_runtime_idle)(struct kbase_device *kbdev); ++}; + -+err_sysfs_files: -+ wake_lock_destroy(&platform->wake_lock); -+ destroy_workqueue(platform->power_off_wq); -+err_wq: -+ return ret; -+} + -+static void kbase_platform_rk_term(struct kbase_device *kbdev) -+{ -+ struct rk_context *platform = -+ (struct rk_context *)kbdev->platform_context; ++/* List of policy IDs */ ++enum kbase_pm_policy_id { ++ KBASE_PM_POLICY_ID_DEMAND = 1, ++ KBASE_PM_POLICY_ID_ALWAYS_ON, ++ KBASE_PM_POLICY_ID_COARSE_DEMAND, ++#if !MALI_CUSTOMER_RELEASE ++ KBASE_PM_POLICY_ID_DEMAND_ALWAYS_POWERED, ++ KBASE_PM_POLICY_ID_FAST_START ++#endif ++}; + -+ pm_runtime_disable(kbdev->dev); -+ kbdev->platform_context = NULL; ++typedef u32 kbase_pm_policy_flags; + -+ if (platform) { -+ cancel_delayed_work_sync(&platform->work); -+ wake_lock_destroy(&platform->wake_lock); -+ destroy_workqueue(platform->power_off_wq); -+ platform->is_powered = false; -+ platform->kbdev = NULL; -+ kfree(platform); -+ } -+ kbase_platform_rk_remove_sysfs_files(kbdev->dev); -+} -+ -+struct kbase_platform_funcs_conf platform_funcs = { -+ .platform_init_func = &kbase_platform_rk_init, -+ .platform_term_func = &kbase_platform_rk_term, -+}; -+ -+/*---------------------------------------------------------------------------*/ -+ -+static int rk_pm_callback_runtime_on(struct kbase_device *kbdev) -+{ -+ return 0; -+} -+ -+static void rk_pm_callback_runtime_off(struct kbase_device *kbdev) -+{ -+} -+ -+static int rk_pm_callback_power_on(struct kbase_device *kbdev) -+{ -+ int ret = 1; /* Assume GPU has been powered off */ -+ int err = 0; -+ struct rk_context *platform = get_rk_context(kbdev); -+ -+ cancel_delayed_work_sync(&platform->work); -+ -+ err = rk_pm_enable_clk(kbdev); -+ if (err) { -+ E("failed to enable clk: %d", err); -+ return err; -+ } -+ -+ if (platform->is_powered) { -+ D("mali_device is already powered."); -+ return 0; -+ } -+ -+ /* we must enable vdd_gpu before pd_gpu_in_chip. */ -+ err = rk_pm_enable_regulator(kbdev); -+ if (err) { -+ E("fail to enable regulator, err : %d.", err); -+ return err; -+ } -+ -+ /* è‹¥ mali_dev çš„ runtime_pm 是 enabled çš„, 则... */ -+ if (pm_runtime_enabled(kbdev->dev)) { -+ D("to resume mali_dev syncly."); -+ /* 对 pd_in_chip çš„ on æ“作, -+ * 将在 pm_domain çš„ runtime_pm_callbacks 中完æˆ. -+ */ -+ err = pm_runtime_get_sync(kbdev->dev); -+ if (err < 0) { -+ E("failed to runtime resume device: %d.", err); -+ return err; -+ } else if (err == 1) { /* runtime_pm_status is still active */ -+ D("chip has NOT been powered off, no need to re-init."); -+ ret = 0; -+ } -+ } -+ -+ platform->is_powered = true; -+ KBASE_TIMELINE_GPU_POWER(kbdev, 1); -+ wake_lock(&platform->wake_lock); -+ -+ return ret; -+} ++/** ++ * struct kbase_pm_policy - Power policy structure. ++ * ++ * Each power policy exposes a (static) instance of this structure which ++ * contains function pointers to the policy's methods. ++ * ++ * @name: The name of this policy ++ * @init: Function called when the policy is selected ++ * @term: Function called when the policy is unselected ++ * @get_core_mask: Function called to get the current shader core mask ++ * @get_core_active: Function called to get the current overall GPU power ++ * state ++ * @flags: Field indicating flags for this policy ++ * @id: Field indicating an ID for this policy. This is not ++ * necessarily the same as its index in the list returned ++ * by kbase_pm_list_policies(). ++ * It is used purely for debugging. ++ */ ++struct kbase_pm_policy { ++ char *name; + -+static void rk_pm_callback_power_off(struct kbase_device *kbdev) -+{ -+ struct rk_context *platform = get_rk_context(kbdev); ++ /** ++ * Function called when the policy is selected ++ * ++ * This should initialize the kbdev->pm.pm_policy_data structure. It ++ * should not attempt to make any changes to hardware state. ++ * ++ * It is undefined what state the cores are in when the function is ++ * called. ++ * ++ * @kbdev: The kbase device structure for the device (must be a ++ * valid pointer) ++ */ ++ void (*init)(struct kbase_device *kbdev); + -+ rk_pm_disable_clk(kbdev); -+ queue_delayed_work(platform->power_off_wq, &platform->work, -+ msecs_to_jiffies(platform->delay_ms)); -+} ++ /** ++ * Function called when the policy is unselected. ++ * ++ * @kbdev: The kbase device structure for the device (must be a ++ * valid pointer) ++ */ ++ void (*term)(struct kbase_device *kbdev); + -+int rk_kbase_device_runtime_init(struct kbase_device *kbdev) -+{ -+ return 0; -+} ++ /** ++ * Function called to get the current shader core mask ++ * ++ * The returned mask should meet or exceed (kbdev->shader_needed_bitmap ++ * | kbdev->shader_inuse_bitmap). ++ * ++ * @kbdev: The kbase device structure for the device (must be a ++ * valid pointer) ++ * ++ * Return: The mask of shader cores to be powered ++ */ ++ u64 (*get_core_mask)(struct kbase_device *kbdev); + -+void rk_kbase_device_runtime_disable(struct kbase_device *kbdev) -+{ -+} ++ /** ++ * Function called to get the current overall GPU power state ++ * ++ * This function should consider the state of kbdev->pm.active_count. If ++ * this count is greater than 0 then there is at least one active ++ * context on the device and the GPU should be powered. If it is equal ++ * to 0 then there are no active contexts and the GPU could be powered ++ * off if desired. ++ * ++ * @kbdev: The kbase device structure for the device (must be a ++ * valid pointer) ++ * ++ * Return: true if the GPU should be powered, false otherwise ++ */ ++ bool (*get_core_active)(struct kbase_device *kbdev); + -+struct kbase_pm_callback_conf pm_callbacks = { -+ .power_on_callback = rk_pm_callback_power_on, -+ .power_off_callback = rk_pm_callback_power_off, -+#ifdef CONFIG_PM -+ .power_runtime_init_callback = rk_kbase_device_runtime_init, -+ .power_runtime_term_callback = rk_kbase_device_runtime_disable, -+ .power_runtime_on_callback = rk_pm_callback_runtime_on, -+ .power_runtime_off_callback = rk_pm_callback_runtime_off, -+#else /* CONFIG_PM */ -+ .power_runtime_init_callback = NULL, -+ .power_runtime_term_callback = NULL, -+ .power_runtime_on_callback = NULL, -+ .power_runtime_off_callback = NULL, -+#endif /* CONFIG_PM */ ++ kbase_pm_policy_flags flags; ++ enum kbase_pm_policy_id id; +}; + -+int kbase_platform_early_init(void) -+{ -+ /* Nothing needed at this stage */ -+ return 0; -+} -+ -+/*---------------------------------------------------------------------------*/ -+ -+void kbase_platform_rk_shutdown(struct kbase_device *kbdev) -+{ -+ I("to make vdd_gpu enabled for turning off pd_gpu in pm_framework."); -+ rk_pm_enable_regulator(kbdev); -+} -+ -+/*---------------------------------------------------------------------------*/ + -+#ifdef CONFIG_REGULATOR -+static int rk_pm_enable_regulator(struct kbase_device *kbdev) -+{ -+ int ret = 0; ++enum kbase_pm_ca_policy_id { ++ KBASE_PM_CA_POLICY_ID_FIXED = 1, ++ KBASE_PM_CA_POLICY_ID_DEVFREQ, ++ KBASE_PM_CA_POLICY_ID_RANDOM ++}; + -+ if (!kbdev->regulator) { -+ W("no mali regulator control, no need to enable."); -+ goto EXIT; -+ } ++typedef u32 kbase_pm_ca_policy_flags; + -+ D("to enable regulator."); -+ ret = regulator_enable(kbdev->regulator); -+ if (ret) { -+ E("fail to enable regulator, ret : %d.", ret); -+ goto EXIT; -+ } ++/** ++ * Maximum length of a CA policy names ++ */ ++#define KBASE_PM_CA_MAX_POLICY_NAME_LEN 15 + -+EXIT: -+ return ret; -+} ++/** ++ * struct kbase_pm_ca_policy - Core availability policy structure. ++ * ++ * Each core availability policy exposes a (static) instance of this structure ++ * which contains function pointers to the policy's methods. ++ * ++ * @name: The name of this policy ++ * @init: Function called when the policy is selected ++ * @term: Function called when the policy is unselected ++ * @get_core_mask: Function called to get the current shader core ++ * availability mask ++ * @update_core_status: Function called to update the current core status ++ * @flags: Field indicating flags for this policy ++ * @id: Field indicating an ID for this policy. This is not ++ * necessarily the same as its index in the list returned ++ * by kbase_pm_list_policies(). ++ * It is used purely for debugging. ++ */ ++struct kbase_pm_ca_policy { ++ char name[KBASE_PM_CA_MAX_POLICY_NAME_LEN + 1]; + -+static void rk_pm_disable_regulator(struct kbase_device *kbdev) -+{ -+ if (!(kbdev->regulator)) { -+ W("no mali regulator control, no need to disable."); -+ return; -+ } ++ /** ++ * Function called when the policy is selected ++ * ++ * This should initialize the kbdev->pm.ca_policy_data structure. It ++ * should not attempt to make any changes to hardware state. ++ * ++ * It is undefined what state the cores are in when the function is ++ * called. ++ * ++ * @kbdev The kbase device structure for the device (must be a ++ * valid pointer) ++ */ ++ void (*init)(struct kbase_device *kbdev); + -+ D("to disable regulator."); -+ regulator_disable(kbdev->regulator); -+} -+#endif ++ /** ++ * Function called when the policy is unselected. ++ * ++ * @kbdev The kbase device structure for the device (must be a ++ * valid pointer) ++ */ ++ void (*term)(struct kbase_device *kbdev); + -+static int rk_pm_enable_clk(struct kbase_device *kbdev) -+{ -+ int err = 0; ++ /** ++ * Function called to get the current shader core availability mask ++ * ++ * When a change in core availability is occurring, the policy must set ++ * kbdev->pm.ca_in_transition to true. This is to indicate that ++ * reporting changes in power state cannot be optimized out, even if ++ * kbdev->pm.desired_shader_state remains unchanged. This must be done ++ * by any functions internal to the Core Availability Policy that change ++ * the return value of kbase_pm_ca_policy::get_core_mask. ++ * ++ * @kbdev The kbase device structure for the device (must be a ++ * valid pointer) ++ * ++ * Return: The current core availability mask ++ */ ++ u64 (*get_core_mask)(struct kbase_device *kbdev); + -+ if (!(kbdev->clock)) { -+ W("no mali clock control, no need to enable."); -+ } else { -+ D("to enable clk."); -+ err = clk_enable(kbdev->clock); -+ if (err) -+ E("failed to enable clk: %d.", err); -+ } ++ /** ++ * Function called to update the current core status ++ * ++ * If none of the cores in core group 0 are ready or transitioning, then ++ * the policy must ensure that the next call to get_core_mask does not ++ * return 0 for all cores in core group 0. It is an error to disable ++ * core group 0 through the core availability policy. ++ * ++ * When a change in core availability has finished, the policy must set ++ * kbdev->pm.ca_in_transition to false. This is to indicate that ++ * changes in power state can once again be optimized out when ++ * kbdev->pm.desired_shader_state is unchanged. ++ * ++ * @kbdev: The kbase device structure for the device ++ * (must be a valid pointer) ++ * @cores_ready: The mask of cores currently powered and ++ * ready to run jobs ++ * @cores_transitioning: The mask of cores currently transitioning ++ * power state ++ */ ++ void (*update_core_status)(struct kbase_device *kbdev, u64 cores_ready, ++ u64 cores_transitioning); + -+ return err; -+} ++ kbase_pm_ca_policy_flags flags; + -+static void rk_pm_disable_clk(struct kbase_device *kbdev) -+{ -+ if (!(kbdev->clock)) { -+ W("no mali clock control, no need to disable."); -+ } else { -+ D("to disable clk."); -+ clk_disable(kbdev->clock); -+ } -+} ++ /** ++ * Field indicating an ID for this policy. This is not necessarily the ++ * same as its index in the list returned by kbase_pm_list_policies(). ++ * It is used purely for debugging. ++ */ ++ enum kbase_pm_ca_policy_id id; ++}; + -+/*---------------------------------------------------------------------------*/ ++#endif /* _KBASE_PM_HWACCESS_DEFS_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c +new file mode 100755 +index 000000000..81322fd0d +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c +@@ -0,0 +1,73 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+static ssize_t utilisation_period_show(struct device *dev, -+ struct device_attribute *attr, -+ char *buf) -+{ -+ struct kbase_device *kbdev = dev_get_drvdata(dev); -+ struct rk_context *platform = get_rk_context(kbdev); -+ ssize_t ret = 0; + -+ ret += snprintf(buf, PAGE_SIZE, "%u\n", platform->utilisation_period); + -+ return ret; -+} + -+static ssize_t utilisation_period_store(struct device *dev, -+ struct device_attribute *attr, -+ const char *buf, -+ size_t count) -+{ -+ struct kbase_device *kbdev = dev_get_drvdata(dev); -+ struct rk_context *platform = get_rk_context(kbdev); -+ int ret = 0; + -+ ret = kstrtouint(buf, 0, &platform->utilisation_period); -+ if (ret) { -+ E("invalid input period : %s.", buf); -+ return ret; -+ } -+ D("set utilisation_period to '%d'.", platform->utilisation_period); ++/* ++ * A simple demand based power management policy ++ */ + -+ return count; -+} ++#include ++#include + -+static ssize_t utilisation_show(struct device *dev, -+ struct device_attribute *attr, -+ char *buf) ++static u64 demand_get_core_mask(struct kbase_device *kbdev) +{ -+ struct kbase_device *kbdev = dev_get_drvdata(dev); -+ struct rk_context *platform = get_rk_context(kbdev); -+ ssize_t ret = 0; -+ unsigned long period_in_us = platform->utilisation_period * 1000; -+ unsigned long total_time; -+ unsigned long busy_time; -+ unsigned long utilisation; -+ -+ kbase_pm_reset_dvfs_utilisation(kbdev); -+ usleep_range(period_in_us, period_in_us + 100); -+ kbase_pm_get_dvfs_utilisation(kbdev, &total_time, &busy_time); -+ /* 'devfreq_dev_profile' instance registered to devfreq -+ * also uses kbase_pm_reset_dvfs_utilisation -+ * and kbase_pm_get_dvfs_utilisation. -+ * it's better to cat this file when DVFS is disabled. -+ */ -+ D("total_time : %lu, busy_time : %lu.", total_time, busy_time); ++ u64 desired = kbdev->shader_needed_bitmap | kbdev->shader_inuse_bitmap; + -+ utilisation = busy_time * 100 / total_time; -+ ret += snprintf(buf, PAGE_SIZE, "%ld\n", utilisation); ++ if (0 == kbdev->pm.active_count) ++ return 0; + -+ return ret; ++ return desired; +} + -+static DEVICE_ATTR_RW(utilisation_period); -+static DEVICE_ATTR_RO(utilisation); -+ -+static int kbase_platform_rk_create_sysfs_files(struct device *dev) ++static bool demand_get_core_active(struct kbase_device *kbdev) +{ -+ int ret = 0; -+ -+ ret = device_create_file(dev, &dev_attr_utilisation_period); -+ if (ret) { -+ E("fail to create sysfs file 'utilisation_period'."); -+ goto out; -+ } -+ -+ ret = device_create_file(dev, &dev_attr_utilisation); -+ if (ret) { -+ E("fail to create sysfs file 'utilisation'."); -+ goto remove_utilisation_period; -+ } -+ -+ return 0; ++ if (0 == kbdev->pm.active_count && !(kbdev->shader_needed_bitmap | ++ kbdev->shader_inuse_bitmap) && !kbdev->tiler_needed_cnt ++ && !kbdev->tiler_inuse_cnt) ++ return false; + -+remove_utilisation_period: -+ device_remove_file(dev, &dev_attr_utilisation_period); -+out: -+ return ret; ++ return true; +} + -+static void kbase_platform_rk_remove_sysfs_files(struct device *dev) ++static void demand_init(struct kbase_device *kbdev) +{ -+ device_remove_file(dev, &dev_attr_utilisation_period); -+ device_remove_file(dev, &dev_attr_utilisation); ++ CSTD_UNUSED(kbdev); +} + -+int kbase_platform_rk_init_opp_table(struct kbase_device *kbdev) ++static void demand_term(struct kbase_device *kbdev) +{ -+ return rockchip_init_opp_table(kbdev->dev, NULL, -+ "gpu_leakage", "mali"); ++ CSTD_UNUSED(kbdev); +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_rk.h b/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_rk.h -new file mode 100755 -index 000000000000..6eab25014d21 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_rk.h -@@ -0,0 +1,62 @@ -+/* drivers/gpu/t6xx/kbase/src/platform/rk/mali_kbase_platform.h -+ * Rockchip SoC Mali-Midgard platform-dependent codes -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software FoundatIon. -+ */ -+ -+/** -+ * @file mali_kbase_rk.h -+ * -+ * defines work_context type of platform_dependent_part. -+ */ -+ -+#ifndef _MALI_KBASE_RK_H_ -+#define _MALI_KBASE_RK_H_ -+ -+#include -+ -+/*---------------------------------------------------------------------------*/ -+ -+#define DEFAULT_UTILISATION_PERIOD_IN_MS (100) -+ -+/*---------------------------------------------------------------------------*/ + +/* -+ * struct rk_context - work_context of platform_dependent_part_of_rk. ++ * The struct kbase_pm_policy structure for the demand power policy. ++ * ++ * This is the static structure that defines the demand power policy's callback ++ * and name. + */ -+struct rk_context { -+ /* -+ * record the status of common_parts calling 'power_on_callback' -+ * and 'power_off_callback'. -+ */ -+ bool is_powered; -+ -+ struct kbase_device *kbdev; -+ -+ struct workqueue_struct *power_off_wq; -+ /* delayed_work_to_power_off_gpu. */ -+ struct delayed_work work; -+ unsigned int delay_ms; -+ -+ /* -+ * WAKE_LOCK_SUSPEND for ensuring to run -+ * delayed_work_to_power_off_gpu before suspend. -+ */ -+ struct wake_lock wake_lock; -+ -+ /* debug only, the period in ms to count gpu_utilisation. */ -+ unsigned int utilisation_period; ++const struct kbase_pm_policy kbase_pm_demand_policy_ops = { ++ "demand", /* name */ ++ demand_init, /* init */ ++ demand_term, /* term */ ++ demand_get_core_mask, /* get_core_mask */ ++ demand_get_core_active, /* get_core_active */ ++ 0u, /* flags */ ++ KBASE_PM_POLICY_ID_DEMAND, /* id */ +}; + -+/*---------------------------------------------------------------------------*/ -+ -+static inline struct rk_context *get_rk_context( -+ const struct kbase_device *kbdev) -+{ -+ return (struct rk_context *)(kbdev->platform_context); -+} -+ -+#endif /* _MALI_KBASE_RK_H_ */ -+ -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/Kbuild b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/Kbuild -new file mode 100755 -index 000000000000..d9d5e9085231 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/Kbuild -@@ -0,0 +1,19 @@ -+# -+# (C) COPYRIGHT 2012-2013, 2016-2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# -+ -+ -+mali_kbase-y += \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_config_vexpress.o \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_cpu_vexpress.o \ -+ mali_kbase_platform_fake.o -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_config_platform.h ++KBASE_EXPORT_TEST_API(kbase_pm_demand_policy_ops); +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h new file mode 100755 -index 000000000000..02835f129aa3 +index 000000000..c0c84b6e9 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_config_platform.h -@@ -0,0 +1,75 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h +@@ -0,0 +1,64 @@ +/* + * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2015 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -333521,73 +369781,62 @@ index 000000000000..02835f129aa3 + + + -+#include "mali_kbase_cpu_vexpress.h" + -+/** -+ * Maximum frequency GPU will be clocked at. Given in kHz. -+ * This must be specified as there is no default value. -+ * -+ * Attached value: number in kHz -+ * Default value: NA -+ */ -+#define GPU_FREQ_KHZ_MAX kbase_get_platform_max_freq() -+/** -+ * Minimum frequency GPU will be clocked at. Given in kHz. -+ * This must be specified as there is no default value. -+ * -+ * Attached value: number in kHz -+ * Default value: NA ++ ++/* ++ * A simple demand based power management policy + */ -+#define GPU_FREQ_KHZ_MIN kbase_get_platform_min_freq() ++ ++#ifndef MALI_KBASE_PM_DEMAND_H ++#define MALI_KBASE_PM_DEMAND_H + +/** -+ * CPU_SPEED_FUNC - A pointer to a function that calculates the CPU clock ++ * DOC: Demand power management policy + * -+ * CPU clock speed of the platform is in MHz - see kbase_cpu_clk_speed_func -+ * for the function prototype. ++ * The demand power management policy has the following characteristics: ++ * - When KBase indicates that the GPU will be powered up, but we don't yet ++ * know which Job Chains are to be run: ++ * - The Shader Cores are not powered up + * -+ * Attached value: A kbase_cpu_clk_speed_func. -+ * Default Value: NA -+ */ -+#define CPU_SPEED_FUNC (&kbase_get_vexpress_cpu_clock_speed) -+ -+/** -+ * GPU_SPEED_FUNC - A pointer to a function that calculates the GPU clock ++ * - When KBase indicates that a set of Shader Cores are needed to submit the ++ * currently queued Job Chains: ++ * - Only those Shader Cores are powered up + * -+ * GPU clock speed of the platform in MHz - see kbase_gpu_clk_speed_func -+ * for the function prototype. ++ * - When KBase indicates that the GPU need not be powered: ++ * - The Shader Cores are powered off, and the GPU itself is powered off too. + * -+ * Attached value: A kbase_gpu_clk_speed_func. -+ * Default Value: NA -+ */ -+#define GPU_SPEED_FUNC (NULL) -+ -+/** -+ * Power management configuration ++ * Note: ++ * - KBase indicates the GPU will be powered up when it has a User Process that ++ * has just started to submit Job Chains. + * -+ * Attached value: pointer to @ref kbase_pm_callback_conf -+ * Default value: See @ref kbase_pm_callback_conf ++ * - KBase indicates the GPU need not be powered when all the Job Chains from ++ * User Processes have finished, and it is waiting for a User Process to ++ * submit some more Job Chains. + */ -+#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) + +/** -+ * Platform specific configuration functions ++ * struct kbasep_pm_policy_demand - Private structure for policy instance data + * -+ * Attached value: pointer to @ref kbase_platform_funcs_conf -+ * Default value: See @ref kbase_platform_funcs_conf ++ * @dummy: No state is needed, a dummy variable ++ * ++ * This contains data that is private to the demand power policy. + */ -+#define PLATFORM_FUNCS (NULL) ++struct kbasep_pm_policy_demand { ++ int dummy; ++}; + -+extern struct kbase_pm_callback_conf pm_callbacks; -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_config_vexpress.c ++extern const struct kbase_pm_policy kbase_pm_demand_policy_ops; ++ ++#endif /* MALI_KBASE_PM_DEMAND_H */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c new file mode 100755 -index 000000000000..15ce2bc5eea5 +index 000000000..82727937c --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_config_vexpress.c -@@ -0,0 +1,85 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c +@@ -0,0 +1,1713 @@ +/* + * -+ * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -333604,1765 +369853,1709 @@ index 000000000000..15ce2bc5eea5 + + + -+#include ++/* ++ * Base kernel Power Management hardware control ++ */ ++ ++// #define ENABLE_DEBUG_LOG ++#include "../../platform/rk/custom_log.h" ++ +#include -+#include -+#include -+#include "mali_kbase_cpu_vexpress.h" -+#include "mali_kbase_config_platform.h" ++#include ++#include ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+#define HARD_RESET_AT_POWER_OFF 0 ++#include + -+#ifndef CONFIG_OF -+static struct kbase_io_resources io_resources = { -+ .job_irq_number = 68, -+ .mmu_irq_number = 69, -+ .gpu_irq_number = 70, -+ .io_memory_region = { -+ .start = 0xFC010000, -+ .end = 0xFC010000 + (4096 * 4) - 1 -+ } ++#if MALI_MOCK_TEST ++#define MOCKABLE(function) function##_original ++#else ++#define MOCKABLE(function) function ++#endif /* MALI_MOCK_TEST */ ++ ++/** ++ * enum kbasep_pm_action - Actions that can be performed on a core. ++ * ++ * This enumeration is private to the file. Its values are set to allow ++ * core_type_to_reg() function, which decodes this enumeration, to be simpler ++ * and more efficient. ++ * ++ * @ACTION_PRESENT: The cores that are present ++ * @ACTION_READY: The cores that are ready ++ * @ACTION_PWRON: Power on the cores specified ++ * @ACTION_PWROFF: Power off the cores specified ++ * @ACTION_PWRTRANS: The cores that are transitioning ++ * @ACTION_PWRACTIVE: The cores that are active ++ */ ++enum kbasep_pm_action { ++ ACTION_PRESENT = 0, ++ ACTION_READY = (SHADER_READY_LO - SHADER_PRESENT_LO), ++ ACTION_PWRON = (SHADER_PWRON_LO - SHADER_PRESENT_LO), ++ ACTION_PWROFF = (SHADER_PWROFF_LO - SHADER_PRESENT_LO), ++ ACTION_PWRTRANS = (SHADER_PWRTRANS_LO - SHADER_PRESENT_LO), ++ ACTION_PWRACTIVE = (SHADER_PWRACTIVE_LO - SHADER_PRESENT_LO) +}; -+#endif /* CONFIG_OF */ + -+static int pm_callback_power_on(struct kbase_device *kbdev) ++/*---------------------------------------------------------------------------*/ ++ ++static bool is_action_of_powering_off_l2(enum kbase_pm_core_type core_type, ++ enum kbasep_pm_action active) +{ -+ /* Nothing is needed on VExpress, but we may have destroyed GPU state (if the below HARD_RESET code is active) */ -+ return 1; ++ return (KBASE_PM_CORE_L2 == core_type) && (ACTION_PWROFF == active); +} + -+static void pm_callback_power_off(struct kbase_device *kbdev) ++static bool is_action_of_powering_off_shader(enum kbase_pm_core_type core_type, ++ enum kbasep_pm_action active) +{ -+#if HARD_RESET_AT_POWER_OFF -+ /* Cause a GPU hard reset to test whether we have actually idled the GPU -+ * and that we properly reconfigure the GPU on power up. -+ * Usually this would be dangerous, but if the GPU is working correctly it should -+ * be completely safe as the GPU should not be active at this point. -+ * However this is disabled normally because it will most likely interfere with -+ * bus logging etc. -+ */ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_HARD_RESET, NULL, NULL, 0u, 0); -+ kbase_os_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), GPU_COMMAND_HARD_RESET); -+#endif ++ return (KBASE_PM_CORE_SHADER == core_type) && (ACTION_PWROFF == active); +} + -+struct kbase_pm_callback_conf pm_callbacks = { -+ .power_on_callback = pm_callback_power_on, -+ .power_off_callback = pm_callback_power_off, -+ .power_suspend_callback = NULL, -+ .power_resume_callback = NULL -+}; -+ -+static struct kbase_platform_config versatile_platform_config = { -+#ifndef CONFIG_OF -+ .io_resources = &io_resources -+#endif -+}; -+ -+struct kbase_platform_config *kbase_get_platform_config(void) ++static bool is_action_of_powering_off_tiler(enum kbase_pm_core_type core_type, ++ enum kbasep_pm_action active) +{ -+ return &versatile_platform_config; ++ return (KBASE_PM_CORE_TILER == core_type) && (ACTION_PWROFF == active); +} + ++static u64 kbase_pm_get_state( ++ struct kbase_device *kbdev, ++ enum kbase_pm_core_type core_type, ++ enum kbasep_pm_action action); + -+int kbase_platform_early_init(void) -+{ -+ /* Nothing needed at this stage */ -+ return 0; -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_cpu_vexpress.c b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_cpu_vexpress.c -new file mode 100755 -index 000000000000..4665f98cbbe4 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_cpu_vexpress.c -@@ -0,0 +1,279 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. ++/** ++ * core_type_to_reg - Decode a core type and action to a register. + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * Given a core type (defined by kbase_pm_core_type) and an action (defined ++ * by kbasep_pm_action) this function will return the register offset that ++ * will perform the action on the core type. The register returned is the _LO ++ * register and an offset must be applied to use the _HI register. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * @core_type: The type of core ++ * @action: The type of action + * ++ * Return: The register offset of the _LO register that performs an action of ++ * type @action on a core of type @core_type. + */ ++static u32 core_type_to_reg(enum kbase_pm_core_type core_type, ++ enum kbasep_pm_action action) ++{ ++#ifdef CONFIG_MALI_CORESTACK ++ if (core_type == KBASE_PM_CORE_STACK) { ++ switch (action) { ++ case ACTION_PRESENT: ++ return STACK_PRESENT_LO; ++ case ACTION_READY: ++ return STACK_READY_LO; ++ case ACTION_PWRON: ++ return STACK_PWRON_LO; ++ case ACTION_PWROFF: ++ return STACK_PWROFF_LO; ++ case ACTION_PWRTRANS: ++ return STACK_PWRTRANS_LO; ++ default: ++ BUG(); ++ } ++ } ++#endif /* CONFIG_MALI_CORESTACK */ + ++ return (u32)core_type + (u32)action; ++} + ++#ifdef CONFIG_ARM64 ++static void mali_cci_flush_l2(struct kbase_device *kbdev) ++{ ++ const u32 mask = CLEAN_CACHES_COMPLETED | RESET_COMPLETED; ++ u32 loops = KBASE_CLEAN_CACHE_MAX_LOOPS; ++ u32 raw; + -+#include -+#include -+#include "mali_kbase_cpu_vexpress.h" -+ -+#define HZ_IN_MHZ (1000000) -+ -+#define CORETILE_EXPRESS_A9X4_SCC_START (0x100E2000) -+#define MOTHERBOARD_SYS_CFG_START (0x10000000) -+#define SYS_CFGDATA_OFFSET (0x000000A0) -+#define SYS_CFGCTRL_OFFSET (0x000000A4) -+#define SYS_CFGSTAT_OFFSET (0x000000A8) -+ -+#define SYS_CFGCTRL_START_BIT_VALUE (1 << 31) -+#define READ_REG_BIT_VALUE (0 << 30) -+#define DCC_DEFAULT_BIT_VALUE (0 << 26) -+#define SYS_CFG_OSC_FUNC_BIT_VALUE (1 << 20) -+#define SITE_DEFAULT_BIT_VALUE (1 << 16) -+#define BOARD_STACK_POS_DEFAULT_BIT_VALUE (0 << 12) -+#define DEVICE_DEFAULT_BIT_VALUE (2 << 0) -+#define SYS_CFG_COMPLETE_BIT_VALUE (1 << 0) -+#define SYS_CFG_ERROR_BIT_VALUE (1 << 1) -+ -+#define FEED_REG_BIT_MASK (0x0F) -+#define FCLK_PA_DIVIDE_BIT_SHIFT (0x03) -+#define FCLK_PB_DIVIDE_BIT_SHIFT (0x07) -+#define FCLK_PC_DIVIDE_BIT_SHIFT (0x0B) -+#define AXICLK_PA_DIVIDE_BIT_SHIFT (0x0F) -+#define AXICLK_PB_DIVIDE_BIT_SHIFT (0x13) -+ -+/* the following three values used for reading -+ * HBI value of the LogicTile daughterboard */ -+#define VE_MOTHERBOARD_PERIPHERALS_SMB_CS7 (0x10000000) -+#define VE_SYS_PROC_ID1_OFFSET (0x00000088) -+#define VE_LOGIC_TILE_HBI_MASK (0x00000FFF) -+ -+#define IS_SINGLE_BIT_SET(val, pos) (val&(1<> 32) & 0xFFFFFFFF; + -+ if (CPU_CLOCK_SPEED_UNDEFINED != cpu_clock_speed) { -+ *cpu_clock = cpu_clock_speed; -+ return 0; -+ } ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ /* Init the value in case something goes wrong */ -+ *cpu_clock = 0; ++ /*-------------------------------------------------------*/ + -+ /* Map CPU register into virtual memory */ -+ syscfg_reg = ioremap(MOTHERBOARD_SYS_CFG_START, 0x1000); -+ if (syscfg_reg == NULL) { -+ err = -EIO; -+ goto syscfg_reg_map_failed; ++ if ( is_action_of_powering_off_l2(core_type, action) ) { ++ D("not to power off l2 actually."); ++ return; + } -+ -+ scc_reg = ioremap(CORETILE_EXPRESS_A9X4_SCC_START, 0x1000); -+ if (scc_reg == NULL) { -+ err = -EIO; -+ goto scc_reg_map_failed; ++ if ( is_action_of_powering_off_shader(core_type, action) ) { ++ D("not to power off shader actually. cores_lo : 0x%x, hi : 0x%x.", ++ lo, ++ hi); ++ return; ++ } ++ if ( is_action_of_powering_off_tiler(core_type, action) ) { ++ D("not to power off tiler actually."); ++ return; + } + -+ raw_spin_lock(&syscfg_lock); ++ /*-------------------------------------------------------*/ + -+ /* Read SYS regs - OSC2 */ -+ reg_val = readl(syscfg_reg + SYS_CFGCTRL_OFFSET); ++ reg = core_type_to_reg(core_type, action); + -+ /* Check if there is any other undergoing request */ -+ if (reg_val & SYS_CFGCTRL_START_BIT_VALUE) { -+ err = -EBUSY; -+ goto ongoing_request; ++ KBASE_DEBUG_ASSERT(reg); ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++ if (cores) { ++ if (action == ACTION_PWRON) ++ kbase_trace_mali_pm_power_on(core_type, cores); ++ else if (action == ACTION_PWROFF) ++ kbase_trace_mali_pm_power_off(core_type, cores); + } -+ /* Reset the CGFGSTAT reg */ -+ writel(0, (syscfg_reg + SYS_CFGSTAT_OFFSET)); ++#endif + -+ writel(SYS_CFGCTRL_START_BIT_VALUE | READ_REG_BIT_VALUE | -+ DCC_DEFAULT_BIT_VALUE | -+ SYS_CFG_OSC_FUNC_BIT_VALUE | -+ SITE_DEFAULT_BIT_VALUE | -+ BOARD_STACK_POS_DEFAULT_BIT_VALUE | -+ DEVICE_DEFAULT_BIT_VALUE, -+ (syscfg_reg + SYS_CFGCTRL_OFFSET)); -+ /* Wait for the transaction to complete */ -+ while (!(readl(syscfg_reg + SYS_CFGSTAT_OFFSET) & -+ SYS_CFG_COMPLETE_BIT_VALUE)) -+ ; -+ /* Read SYS_CFGSTAT Register to get the status of submitted -+ * transaction */ -+ reg_val = readl(syscfg_reg + SYS_CFGSTAT_OFFSET); ++ if (cores) { ++ u64 state = kbase_pm_get_state(kbdev, core_type, ACTION_READY); + -+ if (reg_val & SYS_CFG_ERROR_BIT_VALUE) { -+ /* Error while setting register */ -+ err = -EIO; -+ goto set_reg_error; ++ if (action == ACTION_PWRON) ++ state |= cores; ++ else if (action == ACTION_PWROFF) ++ state &= ~cores; ++ KBASE_TLSTREAM_AUX_PM_STATE(core_type, state); + } + -+ osc2_value = readl(syscfg_reg + SYS_CFGDATA_OFFSET); -+ /* Read the SCC CFGRW0 register */ -+ reg_val = readl(scc_reg); -+ -+ /* -+ * Select the appropriate feed: -+ * CFGRW0[0] - CLKOB -+ * CFGRW0[1] - CLKOC -+ * CFGRW0[2] - FACLK (CLK)B FROM AXICLK PLL) -+ */ -+ /* Calculate the FCLK */ -+ if (IS_SINGLE_BIT_SET(reg_val, 0)) { -+ /* CFGRW0[0] - CLKOB */ -+ /* CFGRW0[6:3] */ -+ pa_divide = ((reg_val & (FEED_REG_BIT_MASK << -+ FCLK_PA_DIVIDE_BIT_SHIFT)) >> -+ FCLK_PA_DIVIDE_BIT_SHIFT); -+ /* CFGRW0[10:7] */ -+ pb_divide = ((reg_val & (FEED_REG_BIT_MASK << -+ FCLK_PB_DIVIDE_BIT_SHIFT)) >> -+ FCLK_PB_DIVIDE_BIT_SHIFT); -+ *cpu_clock = osc2_value * (pa_divide + 1) / (pb_divide + 1); -+ } else if (IS_SINGLE_BIT_SET(reg_val, 1)) { -+ /* CFGRW0[1] - CLKOC */ -+ /* CFGRW0[6:3] */ -+ pa_divide = ((reg_val & (FEED_REG_BIT_MASK << -+ FCLK_PA_DIVIDE_BIT_SHIFT)) >> -+ FCLK_PA_DIVIDE_BIT_SHIFT); -+ /* CFGRW0[14:11] */ -+ pc_divide = ((reg_val & (FEED_REG_BIT_MASK << -+ FCLK_PC_DIVIDE_BIT_SHIFT)) >> -+ FCLK_PC_DIVIDE_BIT_SHIFT); -+ *cpu_clock = osc2_value * (pa_divide + 1) / (pc_divide + 1); -+ } else if (IS_SINGLE_BIT_SET(reg_val, 2)) { -+ /* CFGRW0[2] - FACLK */ -+ /* CFGRW0[18:15] */ -+ pa_divide = ((reg_val & (FEED_REG_BIT_MASK << -+ AXICLK_PA_DIVIDE_BIT_SHIFT)) >> -+ AXICLK_PA_DIVIDE_BIT_SHIFT); -+ /* CFGRW0[22:19] */ -+ pb_divide = ((reg_val & (FEED_REG_BIT_MASK << -+ AXICLK_PB_DIVIDE_BIT_SHIFT)) >> -+ AXICLK_PB_DIVIDE_BIT_SHIFT); -+ *cpu_clock = osc2_value * (pa_divide + 1) / (pb_divide + 1); -+ } else { -+ err = -EIO; ++ /* Tracing */ ++ if (cores) { ++ if (action == ACTION_PWRON) ++ switch (core_type) { ++ case KBASE_PM_CORE_SHADER: ++ KBASE_TRACE_ADD(kbdev, PM_PWRON, NULL, NULL, 0u, ++ lo); ++ break; ++ case KBASE_PM_CORE_TILER: ++ KBASE_TRACE_ADD(kbdev, PM_PWRON_TILER, NULL, ++ NULL, 0u, lo); ++ break; ++ case KBASE_PM_CORE_L2: ++ KBASE_TRACE_ADD(kbdev, PM_PWRON_L2, NULL, NULL, ++ 0u, lo); ++ break; ++ default: ++ break; ++ } ++ else if (action == ACTION_PWROFF) ++ switch (core_type) { ++ case KBASE_PM_CORE_SHADER: ++ KBASE_TRACE_ADD(kbdev, PM_PWROFF, NULL, NULL, ++ 0u, lo); ++ break; ++ case KBASE_PM_CORE_TILER: ++ KBASE_TRACE_ADD(kbdev, PM_PWROFF_TILER, NULL, ++ NULL, 0u, lo); ++ break; ++ case KBASE_PM_CORE_L2: ++ KBASE_TRACE_ADD(kbdev, PM_PWROFF_L2, NULL, NULL, ++ 0u, lo); ++ /* disable snoops before L2 is turned off */ ++ kbase_pm_cache_snoop_disable(kbdev); ++ break; ++ default: ++ break; ++ } + } + -+set_reg_error: -+ongoing_request: -+ raw_spin_unlock(&syscfg_lock); -+ *cpu_clock /= HZ_IN_MHZ; -+ -+ if (!err) -+ cpu_clock_speed = *cpu_clock; -+ -+ iounmap(scc_reg); -+ -+scc_reg_map_failed: -+ iounmap(syscfg_reg); -+ -+syscfg_reg_map_failed: ++ if (lo != 0) ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(reg), lo, NULL); + -+ return err; ++ if (hi != 0) ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(reg + 4), hi, NULL); +} + +/** -+ * kbase_get_platform_logic_tile_type - determines which LogicTile type -+ * is used by Versatile Express -+ * -+ * When platform_config build parameter is specified as vexpress, i.e., -+ * platform_config=vexpress, GPU frequency may vary dependent on the -+ * particular platform. The GPU frequency depends on the LogicTile type. ++ * kbase_pm_get_state - Get information about a core set + * -+ * This function determines which LogicTile type is used by the platform by -+ * reading the HBI value of the daughterboard which holds the LogicTile: ++ * This function gets information (chosen by @action) about a set of cores of ++ * a type given by @core_type. It is a static function used by ++ * kbase_pm_get_active_cores(), kbase_pm_get_trans_cores() and ++ * kbase_pm_get_ready_cores(). + * -+ * 0x217 HBI0217 Virtex-6 -+ * 0x192 HBI0192 Virtex-5 -+ * 0x247 HBI0247 Virtex-7 ++ * @kbdev: The kbase device structure of the device ++ * @core_type: The type of core that the should be queried ++ * @action: The property of the cores to query + * -+ * Return: HBI value of the logic tile daughterboard, zero if not accessible ++ * Return: A bit mask specifying the state of the cores + */ -+static u32 kbase_get_platform_logic_tile_type(void) ++static u64 kbase_pm_get_state(struct kbase_device *kbdev, ++ enum kbase_pm_core_type core_type, ++ enum kbasep_pm_action action) +{ -+ void __iomem *syscfg_reg = NULL; -+ u32 sys_procid1 = 0; ++ u32 reg; ++ u32 lo, hi; + -+ syscfg_reg = ioremap(VE_MOTHERBOARD_PERIPHERALS_SMB_CS7 + VE_SYS_PROC_ID1_OFFSET, 4); -+ if (NULL != syscfg_reg) { -+ sys_procid1 = readl(syscfg_reg); -+ iounmap(syscfg_reg); -+ } ++ reg = core_type_to_reg(core_type, action); + -+ return sys_procid1 & VE_LOGIC_TILE_HBI_MASK; -+} ++ KBASE_DEBUG_ASSERT(reg); + -+u32 kbase_get_platform_min_freq(void) -+{ -+ u32 ve_logic_tile = kbase_get_platform_logic_tile_type(); ++ lo = kbase_reg_read(kbdev, GPU_CONTROL_REG(reg), NULL); ++ hi = kbase_reg_read(kbdev, GPU_CONTROL_REG(reg + 4), NULL); + -+ switch (ve_logic_tile) { -+ case 0x217: -+ /* Virtex 6, HBI0217 */ -+ return VE_VIRTEX6_GPU_FREQ_MIN; -+ case 0x247: -+ /* Virtex 7, HBI0247 */ -+ return VE_VIRTEX7_GPU_FREQ_MIN; -+ default: -+ /* all other logic tiles, i.e., Virtex 5 HBI0192 -+ * or unsuccessful reading from the platform - -+ * fall back to some default value */ -+ return VE_DEFAULT_GPU_FREQ_MIN; -+ } ++ return (((u64) hi) << 32) | ((u64) lo); +} + -+u32 kbase_get_platform_max_freq(void) ++void kbasep_pm_init_core_use_bitmaps(struct kbase_device *kbdev) +{ -+ u32 ve_logic_tile = kbase_get_platform_logic_tile_type(); ++ kbdev->shader_inuse_bitmap = 0; ++ kbdev->shader_needed_bitmap = 0; ++ kbdev->shader_available_bitmap = 0; ++ kbdev->tiler_available_bitmap = 0; ++ kbdev->l2_users_count = 0; ++ kbdev->l2_available_bitmap = 0; ++ kbdev->tiler_needed_cnt = 0; ++ kbdev->tiler_inuse_cnt = 0; + -+ switch (ve_logic_tile) { -+ case 0x217: -+ /* Virtex 6, HBI0217 */ -+ return VE_VIRTEX6_GPU_FREQ_MAX; -+ case 0x247: -+ /* Virtex 7, HBI0247 */ -+ return VE_VIRTEX7_GPU_FREQ_MAX; -+ default: -+ /* all other logic tiles, i.e., Virtex 5 HBI0192 -+ * or unsuccessful reading from the platform - -+ * fall back to some default value */ -+ return VE_DEFAULT_GPU_FREQ_MAX; -+ } ++ memset(kbdev->shader_needed_cnt, 0, sizeof(kbdev->shader_needed_cnt)); +} -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_cpu_vexpress.h b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_cpu_vexpress.h -new file mode 100755 -index 000000000000..da865698133a ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_cpu_vexpress.h -@@ -0,0 +1,38 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2013, 2015-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ ++/** ++ * kbase_pm_get_present_cores - Get the cores that are present + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * @kbdev: Kbase device ++ * @type: The type of cores to query + * ++ * Return: Bitmask of the cores that are present + */ ++u64 kbase_pm_get_present_cores(struct kbase_device *kbdev, ++ enum kbase_pm_core_type type) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + ++ switch (type) { ++ case KBASE_PM_CORE_L2: ++ return kbdev->gpu_props.props.raw_props.l2_present; ++ case KBASE_PM_CORE_SHADER: ++ return kbdev->gpu_props.props.raw_props.shader_present; ++ case KBASE_PM_CORE_TILER: ++ return kbdev->gpu_props.props.raw_props.tiler_present; ++#ifdef CONFIG_MALI_CORESTACK ++ case KBASE_PM_CORE_STACK: ++ return kbdev->gpu_props.props.raw_props.stack_present; ++#endif /* CONFIG_MALI_CORESTACK */ ++ default: ++ break; ++ } ++ KBASE_DEBUG_ASSERT(0); + ++ return 0; ++} + -+ -+ -+#ifndef _KBASE_CPU_VEXPRESS_H_ -+#define _KBASE_CPU_VEXPRESS_H_ -+ -+/** -+ * Versatile Express implementation of @ref kbase_cpu_clk_speed_func. -+ */ -+int kbase_get_vexpress_cpu_clock_speed(u32 *cpu_clock); -+ -+/** -+ * Get the minimum GPU frequency for the attached logic tile -+ */ -+u32 kbase_get_platform_min_freq(void); ++KBASE_EXPORT_TEST_API(kbase_pm_get_present_cores); + +/** -+ * Get the maximum GPU frequency for the attached logic tile -+ */ -+u32 kbase_get_platform_max_freq(void); -+ -+#endif /* _KBASE_CPU_VEXPRESS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/Kbuild b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/Kbuild -new file mode 100755 -index 000000000000..df87c74f43ba ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/Kbuild -@@ -0,0 +1,18 @@ -+# -+# (C) COPYRIGHT 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# -+ -+ -+mali_kbase-y += \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_config_vexpress.o \ -+ mali_kbase_platform_fake.o -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h -new file mode 100755 -index 000000000000..0efbf3962f98 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h -@@ -0,0 +1,73 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * kbase_pm_get_active_cores - Get the cores that are "active" ++ * (busy processing work) + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * @kbdev: Kbase device ++ * @type: The type of cores to query + * ++ * Return: Bitmask of cores that are active + */ ++u64 kbase_pm_get_active_cores(struct kbase_device *kbdev, ++ enum kbase_pm_core_type type) ++{ ++ return kbase_pm_get_state(kbdev, type, ACTION_PWRACTIVE); ++} + -+ ++KBASE_EXPORT_TEST_API(kbase_pm_get_active_cores); + +/** -+ * Maximum frequency GPU will be clocked at. Given in kHz. -+ * This must be specified as there is no default value. ++ * kbase_pm_get_trans_cores - Get the cores that are transitioning between ++ * power states + * -+ * Attached value: number in kHz -+ * Default value: NA -+ */ -+#define GPU_FREQ_KHZ_MAX 5000 -+/** -+ * Minimum frequency GPU will be clocked at. Given in kHz. -+ * This must be specified as there is no default value. ++ * @kbdev: Kbase device ++ * @type: The type of cores to query + * -+ * Attached value: number in kHz -+ * Default value: NA ++ * Return: Bitmask of cores that are transitioning + */ -+#define GPU_FREQ_KHZ_MIN 5000 ++u64 kbase_pm_get_trans_cores(struct kbase_device *kbdev, ++ enum kbase_pm_core_type type) ++{ ++ return kbase_pm_get_state(kbdev, type, ACTION_PWRTRANS); ++} + -+/** -+ * CPU_SPEED_FUNC - A pointer to a function that calculates the CPU clock -+ * -+ * CPU clock speed of the platform is in MHz - see kbase_cpu_clk_speed_func -+ * for the function prototype. -+ * -+ * Attached value: A kbase_cpu_clk_speed_func. -+ * Default Value: NA -+ */ -+#define CPU_SPEED_FUNC (&kbase_cpuprops_get_default_clock_speed) ++KBASE_EXPORT_TEST_API(kbase_pm_get_trans_cores); + +/** -+ * GPU_SPEED_FUNC - A pointer to a function that calculates the GPU clock ++ * kbase_pm_get_ready_cores - Get the cores that are powered on + * -+ * GPU clock speed of the platform in MHz - see kbase_gpu_clk_speed_func -+ * for the function prototype. ++ * @kbdev: Kbase device ++ * @type: The type of cores to query + * -+ * Attached value: A kbase_gpu_clk_speed_func. -+ * Default Value: NA ++ * Return: Bitmask of cores that are ready (powered on) + */ -+#define GPU_SPEED_FUNC (NULL) ++u64 kbase_pm_get_ready_cores(struct kbase_device *kbdev, ++ enum kbase_pm_core_type type) ++{ ++ u64 result; + -+/** -+ * Power management configuration -+ * -+ * Attached value: pointer to @ref kbase_pm_callback_conf -+ * Default value: See @ref kbase_pm_callback_conf -+ */ -+#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) ++ result = kbase_pm_get_state(kbdev, type, ACTION_READY); + -+/** -+ * Platform specific configuration functions -+ * -+ * Attached value: pointer to @ref kbase_platform_funcs_conf -+ * Default value: See @ref kbase_platform_funcs_conf -+ */ -+#define PLATFORM_FUNCS (NULL) ++ switch (type) { ++ case KBASE_PM_CORE_SHADER: ++ KBASE_TRACE_ADD(kbdev, PM_CORES_POWERED, NULL, NULL, 0u, ++ (u32) result); ++ break; ++ case KBASE_PM_CORE_TILER: ++ KBASE_TRACE_ADD(kbdev, PM_CORES_POWERED_TILER, NULL, NULL, 0u, ++ (u32) result); ++ break; ++ case KBASE_PM_CORE_L2: ++ KBASE_TRACE_ADD(kbdev, PM_CORES_POWERED_L2, NULL, NULL, 0u, ++ (u32) result); ++ break; ++ default: ++ break; ++ } + -+extern struct kbase_pm_callback_conf pm_callbacks; -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c -new file mode 100755 -index 000000000000..3ff0930fb4a3 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c -@@ -0,0 +1,79 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2014 ARM Limited. All rights reserved. ++ return result; ++} ++ ++KBASE_EXPORT_TEST_API(kbase_pm_get_ready_cores); ++ ++/** ++ * kbase_pm_transition_core_type - Perform power transitions for a particular ++ * core type. + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * This function will perform any available power transitions to make the actual ++ * hardware state closer to the desired state. If a core is currently ++ * transitioning then changes to the power state of that call cannot be made ++ * until the transition has finished. Cores which are not present in the ++ * hardware are ignored if they are specified in the desired_state bitmask, ++ * however the return value will always be 0 in this case. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * @kbdev: The kbase device ++ * @type: The core type to perform transitions for ++ * @desired_state: A bit mask of the desired state of the cores ++ * @in_use: A bit mask of the cores that are currently running ++ * jobs. These cores have to be kept powered up because ++ * there are jobs running (or about to run) on them. ++ * @available: Receives a bit mask of the cores that the job ++ * scheduler can use to submit jobs to. May be NULL if ++ * this is not needed. ++ * @powering_on: Bit mask to update with cores that are ++ * transitioning to a power-on state. + * ++ * Return: true if the desired state has been reached, false otherwise + */ ++static bool kbase_pm_transition_core_type(struct kbase_device *kbdev, ++ enum kbase_pm_core_type type, ++ u64 desired_state, ++ u64 in_use, ++ u64 * const available, ++ u64 *powering_on) ++{ ++ u64 present; ++ u64 ready; ++ u64 trans; ++ u64 powerup; ++ u64 powerdown; ++ u64 powering_on_trans; ++ u64 desired_state_in_use; + ++ lockdep_assert_held(&kbdev->hwaccess_lock); + ++ /* Get current state */ ++ present = kbase_pm_get_present_cores(kbdev, type); ++ trans = kbase_pm_get_trans_cores(kbdev, type); ++ ready = kbase_pm_get_ready_cores(kbdev, type); ++ /* mask off ready from trans in case transitions finished between the ++ * register reads */ ++ trans &= ~ready; + -+#include -+#include -+#include -+#include -+ -+#define HARD_RESET_AT_POWER_OFF 0 ++ if (trans) /* Do not progress if any cores are transitioning */ ++ return false; + -+#ifndef CONFIG_OF -+static struct kbase_io_resources io_resources = { -+ .job_irq_number = 68, -+ .mmu_irq_number = 69, -+ .gpu_irq_number = 70, -+ .io_memory_region = { -+ .start = 0x2f010000, -+ .end = 0x2f010000 + (4096 * 4) - 1} -+}; -+#endif ++ powering_on_trans = trans & *powering_on; ++ *powering_on = powering_on_trans; + -+static int pm_callback_power_on(struct kbase_device *kbdev) -+{ -+ /* Nothing is needed on VExpress, but we may have destroyed GPU state (if the below HARD_RESET code is active) */ -+ return 1; -+} ++ if (available != NULL) ++ *available = (ready | powering_on_trans) & desired_state; + -+static void pm_callback_power_off(struct kbase_device *kbdev) -+{ -+#if HARD_RESET_AT_POWER_OFF -+ /* Cause a GPU hard reset to test whether we have actually idled the GPU -+ * and that we properly reconfigure the GPU on power up. -+ * Usually this would be dangerous, but if the GPU is working correctly it should -+ * be completely safe as the GPU should not be active at this point. -+ * However this is disabled normally because it will most likely interfere with -+ * bus logging etc. ++ /* Update desired state to include the in-use cores. These have to be ++ * kept powered up because there are jobs running or about to run on ++ * these cores + */ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_HARD_RESET, NULL, NULL, 0u, 0); -+ kbase_os_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), GPU_COMMAND_HARD_RESET); -+#endif -+} ++ desired_state_in_use = desired_state | in_use; + -+struct kbase_pm_callback_conf pm_callbacks = { -+ .power_on_callback = pm_callback_power_on, -+ .power_off_callback = pm_callback_power_off, -+ .power_suspend_callback = NULL, -+ .power_resume_callback = NULL -+}; ++ /* Update state of whether l2 caches are powered */ ++ if (type == KBASE_PM_CORE_L2) { ++ if ((ready == present) && (desired_state_in_use == ready) && ++ (trans == 0)) { ++ /* All are ready, none will be turned off, and none are ++ * transitioning */ ++ kbdev->pm.backend.l2_powered = 1; ++ /* ++ * Ensure snoops are enabled after L2 is powered up, ++ * note that kbase keeps track of the snoop state, so ++ * safe to repeatedly call. ++ */ ++ kbase_pm_cache_snoop_enable(kbdev); ++ if (kbdev->l2_users_count > 0) { ++ /* Notify any registered l2 cache users ++ * (optimized out when no users waiting) */ ++ wake_up(&kbdev->pm.backend.l2_powered_wait); ++ } ++ } else ++ kbdev->pm.backend.l2_powered = 0; ++ } + -+static struct kbase_platform_config versatile_platform_config = { -+#ifndef CONFIG_OF -+ .io_resources = &io_resources -+#endif -+}; ++ if (desired_state == ready && (trans == 0)) ++ return true; + -+struct kbase_platform_config *kbase_get_platform_config(void) -+{ -+ return &versatile_platform_config; -+} ++ /* Restrict the cores to those that are actually present */ ++ powerup = desired_state_in_use & present; ++ powerdown = (~desired_state_in_use) & present; + -+int kbase_platform_early_init(void) -+{ -+ /* Nothing needed at this stage */ -+ return 0; -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/Kbuild b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/Kbuild -new file mode 100755 -index 000000000000..d9d5e9085231 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/Kbuild -@@ -0,0 +1,19 @@ -+# -+# (C) COPYRIGHT 2012-2013, 2016-2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++ /* Restrict to cores that are not already in the desired state */ ++ powerup &= ~ready; ++ powerdown &= ready; + ++ /* Don't transition any cores that are already transitioning, except for ++ * Mali cores that support the following case: ++ * ++ * If the SHADER_PWRON or TILER_PWRON registers are written to turn on ++ * a core that is currently transitioning to power off, then this is ++ * remembered and the shader core is automatically powered up again once ++ * the original transition completes. Once the automatic power on is ++ * complete any job scheduled on the shader core should start. ++ */ ++ powerdown &= ~trans; + -+mali_kbase-y += \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_config_vexpress.o \ -+ $(MALI_PLATFORM_DIR)/mali_kbase_cpu_vexpress.o \ -+ mali_kbase_platform_fake.o -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h -new file mode 100755 -index 000000000000..dbdf21e009f9 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h -@@ -0,0 +1,75 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ if (kbase_hw_has_feature(kbdev, ++ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS)) ++ if (KBASE_PM_CORE_SHADER == type || KBASE_PM_CORE_TILER == type) ++ trans = powering_on_trans; /* for exception cases, only ++ * mask off cores in power on ++ * transitions */ + ++ powerup &= ~trans; + ++ /* Perform transitions if any */ ++ kbase_pm_invoke(kbdev, type, powerup, ACTION_PWRON); ++#if !PLATFORM_POWER_DOWN_ONLY ++ kbase_pm_invoke(kbdev, type, powerdown, ACTION_PWROFF); ++#endif + -+#include "mali_kbase_cpu_vexpress.h" ++ /* Recalculate cores transitioning on, and re-evaluate our state */ ++ powering_on_trans |= powerup; ++ *powering_on = powering_on_trans; ++ if (available != NULL) ++ *available = (ready | powering_on_trans) & desired_state; + -+/** -+ * Maximum frequency GPU will be clocked at. Given in kHz. -+ * This must be specified as there is no default value. -+ * -+ * Attached value: number in kHz -+ * Default value: NA -+ */ -+#define GPU_FREQ_KHZ_MAX 10000 -+/** -+ * Minimum frequency GPU will be clocked at. Given in kHz. -+ * This must be specified as there is no default value. -+ * -+ * Attached value: number in kHz -+ * Default value: NA -+ */ -+#define GPU_FREQ_KHZ_MIN 10000 ++ return false; ++} + -+/** -+ * CPU_SPEED_FUNC - A pointer to a function that calculates the CPU clock -+ * -+ * CPU clock speed of the platform is in MHz - see kbase_cpu_clk_speed_func -+ * for the function prototype. -+ * -+ * Attached value: A kbase_cpu_clk_speed_func. -+ * Default Value: NA -+ */ -+#define CPU_SPEED_FUNC (&kbase_get_vexpress_cpu_clock_speed) ++KBASE_EXPORT_TEST_API(kbase_pm_transition_core_type); + +/** -+ * GPU_SPEED_FUNC - A pointer to a function that calculates the GPU clock ++ * get_desired_cache_status - Determine which caches should be on for a ++ * particular core state + * -+ * GPU clock speed of the platform in MHz - see kbase_gpu_clk_speed_func -+ * for the function prototype. ++ * This function takes a bit mask of the present caches and the cores (or ++ * caches) that are attached to the caches that will be powered. It then ++ * computes which caches should be turned on to allow the cores requested to be ++ * powered up. + * -+ * Attached value: A kbase_gpu_clk_speed_func. -+ * Default Value: NA -+ */ -+#define GPU_SPEED_FUNC (NULL) -+ -+/** -+ * Power management configuration ++ * @present: The bit mask of present caches ++ * @cores_powered: A bit mask of cores (or L2 caches) that are desired to ++ * be powered ++ * @tilers_powered: The bit mask of tilers that are desired to be powered + * -+ * Attached value: pointer to @ref kbase_pm_callback_conf -+ * Default value: See @ref kbase_pm_callback_conf ++ * Return: A bit mask of the caches that should be turned on + */ -+#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) ++static u64 get_desired_cache_status(u64 present, u64 cores_powered, ++ u64 tilers_powered) ++{ ++ u64 desired = 0; + -+/** -+ * Platform specific configuration functions -+ * -+ * Attached value: pointer to @ref kbase_platform_funcs_conf -+ * Default value: See @ref kbase_platform_funcs_conf -+ */ -+#define PLATFORM_FUNCS (NULL) ++ while (present) { ++ /* Find out which is the highest set bit */ ++ u64 bit = fls64(present) - 1; ++ u64 bit_mask = 1ull << bit; ++ /* Create a mask which has all bits from 'bit' upwards set */ + -+extern struct kbase_pm_callback_conf pm_callbacks; -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c -new file mode 100755 -index 000000000000..76ffe4a1e59e ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c -@@ -0,0 +1,83 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ u64 mask = ~(bit_mask - 1); + ++ /* If there are any cores powered at this bit or above (that ++ * haven't previously been processed) then we need this core on ++ */ ++ if (cores_powered & mask) ++ desired |= bit_mask; + ++ /* Remove bits from cores_powered and present */ ++ cores_powered &= ~mask; ++ present &= ~bit_mask; ++ } + ++ /* Power up the required L2(s) for the tiler */ ++ if (tilers_powered) ++ desired |= 1; + ++ return desired; ++} + -+#include -+#include -+#include -+#include -+#include "mali_kbase_cpu_vexpress.h" ++KBASE_EXPORT_TEST_API(get_desired_cache_status); + -+#define HARD_RESET_AT_POWER_OFF 0 ++#ifdef CONFIG_MALI_CORESTACK ++u64 kbase_pm_core_stack_mask(u64 cores) ++{ ++ u64 stack_mask = 0; ++ size_t const MAX_CORE_ID = 31; ++ size_t const NUM_CORES_PER_STACK = 4; ++ size_t i; + -+#ifndef CONFIG_OF -+static struct kbase_io_resources io_resources = { -+ .job_irq_number = 75, -+ .mmu_irq_number = 76, -+ .gpu_irq_number = 77, -+ .io_memory_region = { -+ .start = 0x2F000000, -+ .end = 0x2F000000 + (4096 * 4) - 1} -+}; -+#endif ++ for (i = 0; i <= MAX_CORE_ID; ++i) { ++ if (test_bit(i, (unsigned long *)&cores)) { ++ /* Every core which ID >= 16 is filled to stacks 4-7 ++ * instead of 0-3 */ ++ size_t const stack_num = (i > 16) ? ++ (i % NUM_CORES_PER_STACK) + 4 : ++ (i % NUM_CORES_PER_STACK); ++ set_bit(stack_num, (unsigned long *)&stack_mask); ++ } ++ } + -+static int pm_callback_power_on(struct kbase_device *kbdev) -+{ -+ /* Nothing is needed on VExpress, but we may have destroyed GPU state (if the below HARD_RESET code is active) */ -+ return 1; ++ return stack_mask; +} ++#endif /* CONFIG_MALI_CORESTACK */ + -+static void pm_callback_power_off(struct kbase_device *kbdev) ++bool ++MOCKABLE(kbase_pm_check_transitions_nolock) (struct kbase_device *kbdev) +{ -+#if HARD_RESET_AT_POWER_OFF -+ /* Cause a GPU hard reset to test whether we have actually idled the GPU -+ * and that we properly reconfigure the GPU on power up. -+ * Usually this would be dangerous, but if the GPU is working correctly it should -+ * be completely safe as the GPU should not be active at this point. -+ * However this is disabled normally because it will most likely interfere with -+ * bus logging etc. -+ */ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_HARD_RESET, NULL, NULL, 0u, 0); -+ kbase_os_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), GPU_COMMAND_HARD_RESET); -+#endif -+} ++ bool cores_are_available = false; ++ bool in_desired_state = true; ++ u64 desired_l2_state; ++#ifdef CONFIG_MALI_CORESTACK ++ u64 desired_stack_state; ++ u64 stacks_powered; ++#endif /* CONFIG_MALI_CORESTACK */ ++ u64 cores_powered; ++ u64 tilers_powered; ++ u64 tiler_available_bitmap; ++ u64 tiler_transitioning_bitmap; ++ u64 shader_available_bitmap; ++ u64 shader_ready_bitmap; ++ u64 shader_transitioning_bitmap; ++ u64 l2_available_bitmap; ++ u64 prev_l2_available_bitmap; ++ u64 l2_inuse_bitmap; + -+struct kbase_pm_callback_conf pm_callbacks = { -+ .power_on_callback = pm_callback_power_on, -+ .power_off_callback = pm_callback_power_off, -+ .power_suspend_callback = NULL, -+ .power_resume_callback = NULL -+}; ++ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+static struct kbase_platform_config versatile_platform_config = { -+#ifndef CONFIG_OF -+ .io_resources = &io_resources -+#endif -+}; ++ spin_lock(&kbdev->pm.backend.gpu_powered_lock); ++ if (kbdev->pm.backend.gpu_powered == false) { ++ spin_unlock(&kbdev->pm.backend.gpu_powered_lock); ++ if (kbdev->pm.backend.desired_shader_state == 0 && ++ kbdev->pm.backend.desired_tiler_state == 0) ++ return true; ++ return false; ++ } + -+struct kbase_platform_config *kbase_get_platform_config(void) -+{ -+ return &versatile_platform_config; -+} ++ /* Trace that a change-state is being requested, and that it took ++ * (effectively) no time to start it. This is useful for counting how ++ * many state changes occurred, in a way that's backwards-compatible ++ * with processing the trace data */ ++ kbase_timeline_pm_send_event(kbdev, ++ KBASE_TIMELINE_PM_EVENT_CHANGE_GPU_STATE); ++ kbase_timeline_pm_handle_event(kbdev, ++ KBASE_TIMELINE_PM_EVENT_CHANGE_GPU_STATE); + -+int kbase_platform_early_init(void) -+{ -+ /* Nothing needed at this stage */ -+ return 0; -+} ++ /* If any cores are already powered then, we must keep the caches on */ ++ shader_transitioning_bitmap = kbase_pm_get_trans_cores(kbdev, ++ KBASE_PM_CORE_SHADER); ++ cores_powered = kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_SHADER); ++ cores_powered |= kbdev->pm.backend.desired_shader_state; + -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c -new file mode 100755 -index 000000000000..816dff49835f ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c -@@ -0,0 +1,71 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2013 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++#ifdef CONFIG_MALI_CORESTACK ++ /* Work out which core stacks want to be powered */ ++ desired_stack_state = kbase_pm_core_stack_mask(cores_powered); ++ stacks_powered = kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_STACK) | ++ desired_stack_state; ++#endif /* CONFIG_MALI_CORESTACK */ + ++ /* Work out which tilers want to be powered */ ++ tiler_transitioning_bitmap = kbase_pm_get_trans_cores(kbdev, ++ KBASE_PM_CORE_TILER); ++ tilers_powered = kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_TILER); ++ tilers_powered |= kbdev->pm.backend.desired_tiler_state; + ++ /* If there are l2 cache users registered, keep all l2s powered even if ++ * all other cores are off. */ ++ if (kbdev->l2_users_count > 0) ++ cores_powered |= kbdev->gpu_props.props.raw_props.l2_present; + ++ desired_l2_state = get_desired_cache_status( ++ kbdev->gpu_props.props.raw_props.l2_present, ++ cores_powered, tilers_powered); + ++ l2_inuse_bitmap = get_desired_cache_status( ++ kbdev->gpu_props.props.raw_props.l2_present, ++ cores_powered | shader_transitioning_bitmap, ++ tilers_powered | tiler_transitioning_bitmap); + -+#include -+#include -+#include "mali_kbase_cpu_vexpress.h" ++#ifdef CONFIG_MALI_CORESTACK ++ if (stacks_powered) ++ desired_l2_state |= 1; ++#endif /* CONFIG_MALI_CORESTACK */ + -+#define HZ_IN_MHZ (1000000) ++ /* If any l2 cache is on, then enable l2 #0, for use by job manager */ ++ if (0 != desired_l2_state) ++ desired_l2_state |= 1; + -+#define CORETILE_EXPRESS_A9X4_SCC_START (0x100E2000) -+#define MOTHERBOARD_SYS_CFG_START (0x10000000) -+#define SYS_CFGDATA_OFFSET (0x000000A0) -+#define SYS_CFGCTRL_OFFSET (0x000000A4) -+#define SYS_CFGSTAT_OFFSET (0x000000A8) ++ prev_l2_available_bitmap = kbdev->l2_available_bitmap; ++ in_desired_state &= kbase_pm_transition_core_type(kbdev, ++ KBASE_PM_CORE_L2, desired_l2_state, l2_inuse_bitmap, ++ &l2_available_bitmap, ++ &kbdev->pm.backend.powering_on_l2_state); + -+#define SYS_CFGCTRL_START_BIT_VALUE (1 << 31) -+#define READ_REG_BIT_VALUE (0 << 30) -+#define DCC_DEFAULT_BIT_VALUE (0 << 26) -+#define SYS_CFG_OSC_FUNC_BIT_VALUE (1 << 20) -+#define SITE_DEFAULT_BIT_VALUE (1 << 16) -+#define BOARD_STACK_POS_DEFAULT_BIT_VALUE (0 << 12) -+#define DEVICE_DEFAULT_BIT_VALUE (2 << 0) -+#define SYS_CFG_COMPLETE_BIT_VALUE (1 << 0) -+#define SYS_CFG_ERROR_BIT_VALUE (1 << 1) ++ if (kbdev->l2_available_bitmap != l2_available_bitmap) ++ KBASE_TIMELINE_POWER_L2(kbdev, l2_available_bitmap); + -+#define FEED_REG_BIT_MASK (0x0F) -+#define FCLK_PA_DIVIDE_BIT_SHIFT (0x03) -+#define FCLK_PB_DIVIDE_BIT_SHIFT (0x07) -+#define FCLK_PC_DIVIDE_BIT_SHIFT (0x0B) -+#define AXICLK_PA_DIVIDE_BIT_SHIFT (0x0F) -+#define AXICLK_PB_DIVIDE_BIT_SHIFT (0x13) ++ kbdev->l2_available_bitmap = l2_available_bitmap; + -+#define IS_SINGLE_BIT_SET(val, pos) (val&(1<stack_available_bitmap, ++ &kbdev->pm.backend.powering_on_stack_state); ++ } ++#endif /* CONFIG_MALI_CORESTACK */ + -+#define CPU_CLOCK_SPEED_6XV7 50 ++ if (in_desired_state) { ++ in_desired_state &= kbase_pm_transition_core_type(kbdev, ++ KBASE_PM_CORE_TILER, ++ kbdev->pm.backend.desired_tiler_state, ++ 0, &tiler_available_bitmap, ++ &kbdev->pm.backend.powering_on_tiler_state); ++ in_desired_state &= kbase_pm_transition_core_type(kbdev, ++ KBASE_PM_CORE_SHADER, ++ kbdev->pm.backend.desired_shader_state, ++ kbdev->shader_inuse_bitmap, ++ &shader_available_bitmap, ++ &kbdev->pm.backend.powering_on_shader_state); + -+static u32 cpu_clock_speed = CPU_CLOCK_SPEED_UNDEFINED; ++ if (kbdev->shader_available_bitmap != shader_available_bitmap) { ++ KBASE_TRACE_ADD(kbdev, PM_CORES_CHANGE_AVAILABLE, NULL, ++ NULL, 0u, ++ (u32) shader_available_bitmap); ++ KBASE_TIMELINE_POWER_SHADER(kbdev, ++ shader_available_bitmap); ++ } + -+static DEFINE_RAW_SPINLOCK(syscfg_lock); -+/** -+ * kbase_get_vendor_specific_cpu_clock_speed -+ * @brief Retrieves the CPU clock speed. -+ * The implementation is platform specific. -+ * @param[out] cpu_clock - the value of CPU clock speed in MHz -+ * @return 0 on success, 1 otherwise -+*/ -+int kbase_get_vexpress_cpu_clock_speed(u32 *cpu_clock) -+{ -+ /* TODO: MIDBASE-2873 - Provide runtime detection of CPU clock freq for 6XV7 board */ -+ *cpu_clock = CPU_CLOCK_SPEED_6XV7; ++ kbdev->shader_available_bitmap = shader_available_bitmap; + -+ return 0; -+} -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h -new file mode 100755 -index 000000000000..23647ccb0871 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h -@@ -0,0 +1,28 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2013, 2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ if (kbdev->tiler_available_bitmap != tiler_available_bitmap) { ++ KBASE_TRACE_ADD(kbdev, PM_CORES_CHANGE_AVAILABLE_TILER, ++ NULL, NULL, 0u, ++ (u32) tiler_available_bitmap); ++ KBASE_TIMELINE_POWER_TILER(kbdev, ++ tiler_available_bitmap); ++ } + ++ kbdev->tiler_available_bitmap = tiler_available_bitmap; + ++ } else if ((l2_available_bitmap & ++ kbdev->gpu_props.props.raw_props.tiler_present) != ++ kbdev->gpu_props.props.raw_props.tiler_present) { ++ tiler_available_bitmap = 0; + ++ if (kbdev->tiler_available_bitmap != tiler_available_bitmap) ++ KBASE_TIMELINE_POWER_TILER(kbdev, ++ tiler_available_bitmap); + ++ kbdev->tiler_available_bitmap = tiler_available_bitmap; ++ } + -+#ifndef _KBASE_CPU_VEXPRESS_H_ -+#define _KBASE_CPU_VEXPRESS_H_ ++ /* State updated for slow-path waiters */ ++ kbdev->pm.backend.gpu_in_desired_state = in_desired_state; + -+/** -+ * Versatile Express implementation of @ref kbase_cpu_clk_speed_func. -+ */ -+int kbase_get_vexpress_cpu_clock_speed(u32 *cpu_clock); ++ shader_ready_bitmap = kbase_pm_get_ready_cores(kbdev, ++ KBASE_PM_CORE_SHADER); ++ shader_transitioning_bitmap = kbase_pm_get_trans_cores(kbdev, ++ KBASE_PM_CORE_SHADER); + -+#endif /* _KBASE_CPU_VEXPRESS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/platform_dummy/mali_ukk_os.h b/drivers/gpu/arm/bifrost_for_linux/platform_dummy/mali_ukk_os.h -new file mode 100755 -index 000000000000..5fa9b39c4bc0 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/platform_dummy/mali_ukk_os.h -@@ -0,0 +1,53 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010, 2012-2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ /* Determine whether the cores are now available (even if the set of ++ * available cores is empty). Note that they can be available even if ++ * we've not finished transitioning to the desired state */ ++ if ((kbdev->shader_available_bitmap & ++ kbdev->pm.backend.desired_shader_state) ++ == kbdev->pm.backend.desired_shader_state && ++ (kbdev->tiler_available_bitmap & ++ kbdev->pm.backend.desired_tiler_state) ++ == kbdev->pm.backend.desired_tiler_state) { ++ cores_are_available = true; + ++ KBASE_TRACE_ADD(kbdev, PM_CORES_AVAILABLE, NULL, NULL, 0u, ++ (u32)(kbdev->shader_available_bitmap & ++ kbdev->pm.backend.desired_shader_state)); ++ KBASE_TRACE_ADD(kbdev, PM_CORES_AVAILABLE_TILER, NULL, NULL, 0u, ++ (u32)(kbdev->tiler_available_bitmap & ++ kbdev->pm.backend.desired_tiler_state)); + ++ /* Log timelining information about handling events that power ++ * up cores, to match up either with immediate submission either ++ * because cores already available, or from PM IRQ */ ++ if (!in_desired_state) ++ kbase_timeline_pm_send_event(kbdev, ++ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED); ++ } + ++ if (in_desired_state) { ++ KBASE_DEBUG_ASSERT(cores_are_available); + ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++ kbase_trace_mali_pm_status(KBASE_PM_CORE_L2, ++ kbase_pm_get_ready_cores(kbdev, ++ KBASE_PM_CORE_L2)); ++ kbase_trace_mali_pm_status(KBASE_PM_CORE_SHADER, ++ kbase_pm_get_ready_cores(kbdev, ++ KBASE_PM_CORE_SHADER)); ++ kbase_trace_mali_pm_status(KBASE_PM_CORE_TILER, ++ kbase_pm_get_ready_cores(kbdev, ++ KBASE_PM_CORE_TILER)); ++#ifdef CONFIG_MALI_CORESTACK ++ kbase_trace_mali_pm_status(KBASE_PM_CORE_STACK, ++ kbase_pm_get_ready_cores(kbdev, ++ KBASE_PM_CORE_STACK)); ++#endif /* CONFIG_MALI_CORESTACK */ ++#endif + -+/** -+ * @file mali_ukk_os.h -+ * Types and definitions that are common for Linux OSs for the kernel side of the -+ * User-Kernel interface. -+ */ ++ KBASE_TLSTREAM_AUX_PM_STATE( ++ KBASE_PM_CORE_L2, ++ kbase_pm_get_ready_cores( ++ kbdev, KBASE_PM_CORE_L2)); ++ KBASE_TLSTREAM_AUX_PM_STATE( ++ KBASE_PM_CORE_SHADER, ++ kbase_pm_get_ready_cores( ++ kbdev, KBASE_PM_CORE_SHADER)); ++ KBASE_TLSTREAM_AUX_PM_STATE( ++ KBASE_PM_CORE_TILER, ++ kbase_pm_get_ready_cores( ++ kbdev, ++ KBASE_PM_CORE_TILER)); ++#ifdef CONFIG_MALI_CORESTACK ++ KBASE_TLSTREAM_AUX_PM_STATE( ++ KBASE_PM_CORE_STACK, ++ kbase_pm_get_ready_cores( ++ kbdev, ++ KBASE_PM_CORE_STACK)); ++#endif /* CONFIG_MALI_CORESTACK */ + -+#ifndef _UKK_OS_H_ /* Linux version */ -+#define _UKK_OS_H_ ++ KBASE_TRACE_ADD(kbdev, PM_DESIRED_REACHED, NULL, NULL, ++ kbdev->pm.backend.gpu_in_desired_state, ++ (u32)kbdev->pm.backend.desired_shader_state); ++ KBASE_TRACE_ADD(kbdev, PM_DESIRED_REACHED_TILER, NULL, NULL, 0u, ++ (u32)kbdev->pm.backend.desired_tiler_state); + -+#include ++ /* Log timelining information for synchronous waiters */ ++ kbase_timeline_pm_send_event(kbdev, ++ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED); ++ /* Wake slow-path waiters. Job scheduler does not use this. */ ++ KBASE_TRACE_ADD(kbdev, PM_WAKE_WAITERS, NULL, NULL, 0u, 0); + -+/** -+ * @addtogroup uk_api User-Kernel Interface API -+ * @{ -+ */ ++ wake_up(&kbdev->pm.backend.gpu_in_desired_state_wait); ++ } + -+/** -+ * @addtogroup uk_api_kernel UKK (Kernel side) -+ * @{ -+ */ ++ spin_unlock(&kbdev->pm.backend.gpu_powered_lock); + -+/** -+ * Internal OS specific data structure associated with each UKK session. Part -+ * of a ukk_session object. -+ */ -+typedef struct ukkp_session { -+ int dummy; /**< No internal OS specific data at this time */ -+} ukkp_session; ++ /* kbase_pm_ca_update_core_status can cause one-level recursion into ++ * this function, so it must only be called once all changes to kbdev ++ * have been committed, and after the gpu_powered_lock has been ++ * dropped. */ ++ if (kbdev->shader_ready_bitmap != shader_ready_bitmap || ++ kbdev->shader_transitioning_bitmap != shader_transitioning_bitmap) { ++ kbdev->shader_ready_bitmap = shader_ready_bitmap; ++ kbdev->shader_transitioning_bitmap = ++ shader_transitioning_bitmap; + -+/** @} end group uk_api_kernel */ ++ kbase_pm_ca_update_core_status(kbdev, shader_ready_bitmap, ++ shader_transitioning_bitmap); ++ } + -+/** @} end group uk_api */ ++ /* The core availability policy is not allowed to keep core group 0 ++ * turned off (unless it was changing the l2 power state) */ ++ if (!((shader_ready_bitmap | shader_transitioning_bitmap) & ++ kbdev->gpu_props.props.coherency_info.group[0].core_mask) && ++ (prev_l2_available_bitmap == desired_l2_state) && ++ !(kbase_pm_ca_get_core_mask(kbdev) & ++ kbdev->gpu_props.props.coherency_info.group[0].core_mask)) ++ BUG(); + -+#endif /* _UKK_OS_H__ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/protected_mode_switcher.h b/drivers/gpu/arm/bifrost_for_linux/protected_mode_switcher.h -new file mode 100755 -index 000000000000..5dc2f3ba8cf6 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/protected_mode_switcher.h -@@ -0,0 +1,64 @@ -+/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ /* The core availability policy is allowed to keep core group 1 off, ++ * but all jobs specifically targeting CG1 must fail */ ++ if (!((shader_ready_bitmap | shader_transitioning_bitmap) & ++ kbdev->gpu_props.props.coherency_info.group[1].core_mask) && ++ !(kbase_pm_ca_get_core_mask(kbdev) & ++ kbdev->gpu_props.props.coherency_info.group[1].core_mask)) ++ kbdev->pm.backend.cg1_disabled = true; ++ else ++ kbdev->pm.backend.cg1_disabled = false; + ++ return cores_are_available; ++} ++KBASE_EXPORT_TEST_API(kbase_pm_check_transitions_nolock); + ++/* Timeout for kbase_pm_check_transitions_sync when wait_event_killable has ++ * aborted due to a fatal signal. If the time spent waiting has exceeded this ++ * threshold then there is most likely a hardware issue. */ ++#define PM_TIMEOUT (5*HZ) /* 5s */ + -+#ifndef _PROTECTED_MODE_SWITCH_H_ -+#define _PROTECTED_MODE_SWITCH_H_ ++void kbase_pm_check_transitions_sync(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ unsigned long timeout; ++ bool cores_are_available; ++ int ret; + -+struct protected_mode_device; ++ /* Force the transition to be checked and reported - the cores may be ++ * 'available' (for job submission) but not fully powered up. */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+/** -+ * struct protected_mode_ops - Callbacks for protected mode switch operations -+ * -+ * @protected_mode_enable: Callback to enable protected mode for device -+ * @protected_mode_disable: Callback to disable protected mode for device -+ */ -+struct protected_mode_ops { -+ /** -+ * protected_mode_enable() - Enable protected mode on device -+ * @dev: The struct device -+ * -+ * Return: 0 on success, non-zero on error ++ cores_are_available = kbase_pm_check_transitions_nolock(kbdev); ++ ++ /* Don't need 'cores_are_available', because we don't return anything */ ++ CSTD_UNUSED(cores_are_available); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ timeout = jiffies + PM_TIMEOUT; ++ ++ /* Wait for cores */ ++ ret = wait_event_killable(kbdev->pm.backend.gpu_in_desired_state_wait, ++ kbdev->pm.backend.gpu_in_desired_state); ++ ++ if (ret < 0 && time_after(jiffies, timeout)) { ++ dev_err(kbdev->dev, "Power transition timed out unexpectedly\n"); ++ dev_err(kbdev->dev, "Desired state :\n"); ++ dev_err(kbdev->dev, "\tShader=%016llx\n", ++ kbdev->pm.backend.desired_shader_state); ++ dev_err(kbdev->dev, "\tTiler =%016llx\n", ++ kbdev->pm.backend.desired_tiler_state); ++ dev_err(kbdev->dev, "Current state :\n"); ++ dev_err(kbdev->dev, "\tShader=%08x%08x\n", ++ kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(SHADER_READY_HI), NULL), ++ kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(SHADER_READY_LO), ++ NULL)); ++ dev_err(kbdev->dev, "\tTiler =%08x%08x\n", ++ kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(TILER_READY_HI), NULL), ++ kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(TILER_READY_LO), NULL)); ++ dev_err(kbdev->dev, "\tL2 =%08x%08x\n", ++ kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(L2_READY_HI), NULL), ++ kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(L2_READY_LO), NULL)); ++ dev_err(kbdev->dev, "Cores transitioning :\n"); ++ dev_err(kbdev->dev, "\tShader=%08x%08x\n", ++ kbase_reg_read(kbdev, GPU_CONTROL_REG( ++ SHADER_PWRTRANS_HI), NULL), ++ kbase_reg_read(kbdev, GPU_CONTROL_REG( ++ SHADER_PWRTRANS_LO), NULL)); ++ dev_err(kbdev->dev, "\tTiler =%08x%08x\n", ++ kbase_reg_read(kbdev, GPU_CONTROL_REG( ++ TILER_PWRTRANS_HI), NULL), ++ kbase_reg_read(kbdev, GPU_CONTROL_REG( ++ TILER_PWRTRANS_LO), NULL)); ++ dev_err(kbdev->dev, "\tL2 =%08x%08x\n", ++ kbase_reg_read(kbdev, GPU_CONTROL_REG( ++ L2_PWRTRANS_HI), NULL), ++ kbase_reg_read(kbdev, GPU_CONTROL_REG( ++ L2_PWRTRANS_LO), NULL)); ++#if KBASE_GPU_RESET_EN ++ dev_err(kbdev->dev, "Sending reset to GPU - all running jobs will be lost\n"); ++ if (kbase_prepare_to_reset_gpu(kbdev)) ++ kbase_reset_gpu(kbdev); ++#endif /* KBASE_GPU_RESET_EN */ ++ } else { ++ /* Log timelining information that a change in state has ++ * completed */ ++ kbase_timeline_pm_handle_event(kbdev, ++ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED); ++ } ++} ++KBASE_EXPORT_TEST_API(kbase_pm_check_transitions_sync); ++ ++void kbase_pm_enable_interrupts(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ ++ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ /* ++ * Clear all interrupts, ++ * and unmask them all. + */ -+ int (*protected_mode_enable)( -+ struct protected_mode_device *protected_dev); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), GPU_IRQ_REG_ALL, ++ NULL); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), GPU_IRQ_REG_ALL, ++ NULL); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ /** -+ * protected_mode_disable() - Disable protected mode on device, and -+ * reset device -+ * @dev: The struct device -+ * -+ * Return: 0 on success, non-zero on error ++ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_CLEAR), 0xFFFFFFFF, ++ NULL); ++ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_MASK), 0xFFFFFFFF, NULL); ++ ++ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_CLEAR), 0xFFFFFFFF, NULL); ++ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_MASK), 0xFFFFFFFF, NULL); ++} ++ ++KBASE_EXPORT_TEST_API(kbase_pm_enable_interrupts); ++ ++void kbase_pm_disable_interrupts_nolock(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ /* ++ * Mask all interrupts, ++ * and clear them all. + */ -+ int (*protected_mode_disable)( -+ struct protected_mode_device *protected_dev); -+}; ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+/** -+ * struct protected_mode_device - Device structure for protected mode devices -+ * -+ * @ops - Callbacks associated with this device -+ * @data - Pointer to device private data -+ * -+ * This structure should be registered with the platform device using -+ * platform_set_drvdata(). -+ */ -+struct protected_mode_device { -+ struct protected_mode_ops ops; -+ void *data; -+}; ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), 0, NULL); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), GPU_IRQ_REG_ALL, ++ NULL); ++ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_MASK), 0, NULL); ++ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_CLEAR), 0xFFFFFFFF, ++ NULL); + -+#endif /* _PROTECTED_MODE_SWITCH_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/sconscript b/drivers/gpu/arm/bifrost_for_linux/sconscript -new file mode 100755 -index 000000000000..e738dd7a3869 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/sconscript -@@ -0,0 +1,72 @@ -+# -+# (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_MASK), 0, NULL); ++ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_CLEAR), 0xFFFFFFFF, NULL); ++} + ++void kbase_pm_disable_interrupts(struct kbase_device *kbdev) ++{ ++ unsigned long flags; + -+import sys -+Import('env') ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_pm_disable_interrupts_nolock(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++} + -+SConscript( 'tests/sconscript' ) ++KBASE_EXPORT_TEST_API(kbase_pm_disable_interrupts); + -+mock_test = 0 + -+# Source files required for kbase. -+kbase_src = [ -+ Glob('*.c'), -+ Glob('backend/*/*.c'), -+ Glob('internal/*/*.c'), -+ Glob('ipa/*.c'), -+ Glob('platform/%s/*.c' % env['platform_config']), -+] ++/* ++ * pmu layout: ++ * 0x0000: PMU TAG (RO) (0xCAFECAFE) ++ * 0x0004: PMU VERSION ID (RO) (0x00000000) ++ * 0x0008: CLOCK ENABLE (RW) (31:1 SBZ, 0 CLOCK STATE) ++ */ ++void kbase_pm_clock_on(struct kbase_device *kbdev, bool is_resume) ++{ ++ bool reset_required = is_resume; ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ unsigned long flags; + -+if env['platform_config']=='juno_soc': -+ kbase_src += [Glob('platform/devicetree/*.c')] -+else: -+ kbase_src += [Glob('platform/%s/*.c' % env['platform_config'])] ++ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ lockdep_assert_held(&js_devdata->runpool_mutex); ++ lockdep_assert_held(&kbdev->pm.lock); + -+if Glob('#kernel/drivers/gpu/arm/midgard/tests/internal/src/mock') and env['unit'] == '1': -+ kbase_src += [Glob('#kernel/drivers/gpu/arm/midgard/tests/internal/src/mock/*.c')] -+ mock_test = 1 ++ if (kbdev->pm.backend.gpu_powered) { ++ /* Already turned on */ ++ if (kbdev->poweroff_pending) ++ kbase_pm_enable_interrupts(kbdev); ++ kbdev->poweroff_pending = false; ++ KBASE_DEBUG_ASSERT(!is_resume); ++ return; ++ } + -+make_args = env.kernel_get_config_defines(ret_list = True) + [ -+ 'PLATFORM=%s' % env['platform'], -+ 'MALI_ERROR_INJECT_ON=%s' % env['error_inject'], -+ 'MALI_KERNEL_TEST_API=%s' % env['debug'], -+ 'MALI_UNIT_TEST=%s' % env['unit'], -+ 'MALI_RELEASE_NAME=%s' % env['mali_release_name'], -+ 'MALI_MOCK_TEST=%s' % mock_test, -+ 'MALI_CUSTOMER_RELEASE=%s' % env['release'], -+ 'MALI_INSTRUMENTATION_LEVEL=%s' % env['instr'], -+ 'MALI_COVERAGE=%s' % env['coverage'], -+] ++ kbdev->poweroff_pending = false; + -+kbase = env.BuildKernelModule('$STATIC_LIB_PATH/mali_kbase.ko', kbase_src, -+ make_args = make_args) ++ KBASE_TRACE_ADD(kbdev, PM_GPU_ON, NULL, NULL, 0u, 0u); + -+# Add a dependency on kds.ko. -+# Only necessary when KDS is not built into the kernel. -+# -+if env['os'] != 'android': -+ if not env.KernelConfigEnabled("CONFIG_KDS"): -+ env.Depends(kbase, '$STATIC_LIB_PATH/kds.ko') ++ if (is_resume && kbdev->pm.backend.callback_power_resume) { ++ kbdev->pm.backend.callback_power_resume(kbdev); ++ return; ++ } else if (kbdev->pm.backend.callback_power_on) { ++ kbdev->pm.backend.callback_power_on(kbdev); ++ /* If your platform properly keeps the GPU state you may use the ++ * return value of the callback_power_on function to ++ * conditionally reset the GPU on power up. Currently we are ++ * conservative and always reset the GPU. */ ++ reset_required = true; ++ } + -+# need Module.symvers from ump.ko build -+if int(env['ump']) == 1: -+ env.Depends(kbase, '$STATIC_LIB_PATH/ump.ko') ++ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); ++ kbdev->pm.backend.gpu_powered = true; ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); + -+if 'smc_protected_mode_switcher' in env: -+ env.Depends('$STATIC_LIB_PATH/mali_kbase.ko', '$STATIC_LIB_PATH/smc_protected_mode_switcher.ko') ++ if (reset_required) { ++ /* GPU state was lost, reset GPU to ensure it is in a ++ * consistent state */ ++ kbase_pm_init_hw(kbdev, PM_ENABLE_IRQS); ++ } + -+env.KernelObjTarget('kbase', kbase) ++ mutex_lock(&kbdev->mmu_hw_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_ctx_sched_restore_all_as(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); + -+env.AppendUnique(BASE=['cutils_linked_list']) -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/Kbuild b/drivers/gpu/arm/bifrost_for_linux/tests/Kbuild -new file mode 100755 -index 000000000000..b4bed0473439 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/Kbuild -@@ -0,0 +1,17 @@ -+# -+# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++ /* Lastly, enable the interrupts */ ++ kbase_pm_enable_interrupts(kbdev); ++} + ++KBASE_EXPORT_TEST_API(kbase_pm_clock_on); + -+obj-$(CONFIG_MALI_KUTF) += kutf/ -+obj-$(CONFIG_MALI_IRQ_LATENCY) += mali_kutf_irq_test/ -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/Kconfig b/drivers/gpu/arm/bifrost_for_linux/tests/Kconfig -new file mode 100755 -index 000000000000..da0515c065de ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/Kconfig -@@ -0,0 +1,17 @@ -+# -+# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++bool kbase_pm_clock_off(struct kbase_device *kbdev, bool is_suspend) ++{ ++ unsigned long flags; + ++ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ lockdep_assert_held(&kbdev->pm.lock); + -+source "drivers/gpu/arm/midgard/tests/kutf/Kconfig" -+source "drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig" -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_helpers.h b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_helpers.h -new file mode 100755 -index 000000000000..3f1dfc244d30 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_helpers.h -@@ -0,0 +1,216 @@ -+/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ /* ASSERT that the cores should now be unavailable. No lock needed. */ ++ KBASE_DEBUG_ASSERT(kbdev->shader_available_bitmap == 0u); + ++ kbdev->poweroff_pending = true; + ++ if (!kbdev->pm.backend.gpu_powered) { ++ /* Already turned off */ ++ if (is_suspend && kbdev->pm.backend.callback_power_suspend) ++ kbdev->pm.backend.callback_power_suspend(kbdev); ++ return true; ++ } + -+#ifndef _KERNEL_UTF_HELPERS_H_ -+#define _KERNEL_UTF_HELPERS_H_ ++ KBASE_TRACE_ADD(kbdev, PM_GPU_OFF, NULL, NULL, 0u, 0u); + -+/* kutf_helpers.h -+ * Test helper functions for the kernel UTF test infrastructure. -+ * -+ * This collection of helper functions are provided as 'stock' implementation -+ * helpers for certain features of kutf. Tests can implement common/boilerplate -+ * functionality using these, whilst still providing them the option of -+ * implementing completely custom functions themselves to use those kutf -+ * features. -+ */ ++ /* Disable interrupts. This also clears any outstanding interrupts */ ++ kbase_pm_disable_interrupts(kbdev); ++ /* Ensure that any IRQ handlers have finished */ ++ kbase_synchronize_irqs(kbdev); + -+#include -+#include -+#include ++ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); + -+/** -+ * enum kutf_helper_textbuf_flag - flags for textbufs -+ * @KUTF_HELPER_TEXTBUF_FLAG_DYING: Test is dying, textbuf should not allow -+ * writes, nor block on empty. -+ */ -+enum kutf_helper_textbuf_flag { -+ KUTF_HELPER_TEXTBUF_FLAG_DYING = (1u << 0), -+}; ++ if (atomic_read(&kbdev->faults_pending)) { ++ /* Page/bus faults are still being processed. The GPU can not ++ * be powered off until they have completed */ ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, ++ flags); ++ return false; ++ } + -+/** -+ * struct kutf_helper_textbuf_line - Structure representing a line of text -+ * -+ * The string itself is stored immediately after this. -+ * -+ * @node: List node for the textbuf's textbuf_list -+ * @str_size: Length of the string buffer, including the \0 terminator -+ * @str: 'Flexible array' for the string representing the line -+ */ -+struct kutf_helper_textbuf_line { -+ struct list_head node; -+ int str_size; -+ char str[]; -+}; -+ -+/** -+ * struct kutf_helper_textbuf - Structure to representing sequential lines of -+ * text -+ * @lock: mutex to hold whilst accessing the structure -+ * @nr_user_clients: Number of userspace clients connected via an open() -+ * call -+ * @mempool: mempool for allocating lines -+ * @scratchpad: scratch area for receiving text of size max_line_size -+ * @used_bytes: number of valid bytes in the scratchpad -+ * @prev_pos: Previous position userspace has accessed -+ * @prev_line_pos: Previous start of line position userspace has accessed -+ * @textbuf_list: List head to store all the lines of text -+ * @max_line_size: Maximum size in memory allowed for a line of text -+ * @max_nr_lines: Maximum number of lines permitted in this textbuf -+ * @nr_lines: Number of entries in textbuf_list -+ * @flags: Flags indicating state of the textbuf, using values -+ * from enum kutf_helper_textbuf_flag -+ * @user_opened_wq: Waitq for when there's at least one userspace client -+ * connected to the textbuf via an open() call -+ * @not_full_wq: Waitq for when the textbuf can be enqueued into/can -+ * consume data from userspace -+ * @not_empty_wq: Waitq for when the textbuf can be dequeued from/can -+ * produce data for userspace -+ */ -+ -+struct kutf_helper_textbuf { -+ struct mutex lock; -+ int nr_user_clients; -+ struct kutf_mempool *mempool; -+ char *scratchpad; -+ int used_bytes; -+ loff_t prev_pos; -+ loff_t prev_line_pos; -+ struct list_head textbuf_list; -+ int max_line_size; -+ int max_nr_lines; -+ int nr_lines; -+ unsigned long flags; -+ wait_queue_head_t user_opened_wq; -+ wait_queue_head_t not_full_wq; -+ wait_queue_head_t not_empty_wq; ++ kbase_pm_cache_snoop_disable(kbdev); ++ ++ /* The GPU power may be turned off from this point */ ++ kbdev->pm.backend.gpu_powered = false; ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); ++ ++ if (is_suspend && kbdev->pm.backend.callback_power_suspend) ++ kbdev->pm.backend.callback_power_suspend(kbdev); ++ else if (kbdev->pm.backend.callback_power_off) ++ kbdev->pm.backend.callback_power_off(kbdev); ++ return true; ++} ++ ++KBASE_EXPORT_TEST_API(kbase_pm_clock_off); + ++struct kbasep_reset_timeout_data { ++ struct hrtimer timer; ++ bool timed_out; ++ struct kbase_device *kbdev; +}; + -+/* stock callbacks for userspace to read from/write to the 'data' file as a -+ * textbuf */ -+extern struct kutf_userdata_ops kutf_helper_textbuf_userdata_ops; ++void kbase_pm_reset_done(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ kbdev->pm.backend.reset_done = true; ++ wake_up(&kbdev->pm.backend.reset_done_wait); ++} + +/** -+ * kutf_helper_textbuf_init() - init a textbuf for use as a 'data' file -+ * consumer/producer -+ * @textbuf: textbuf to initialize -+ * @mempool: mempool to allocate from -+ * @max_line_size: maximum line size expected to/from userspace -+ * @max_nr_lines: maximum number of lines to expect to/from userspace -+ * -+ * Initialize a textbuf so that it can consume writes made to the 'data' file, -+ * and produce reads for userspace on the 'data' file. Tests may then read the -+ * lines written by userspace, or fill the buffer so it may be read back by -+ * userspace. -+ * -+ * The caller should write the @textbuf pointer into the kutf_context's -+ * userdata_producer_priv or userdata_consumer_priv member during fixture -+ * creation. -+ * -+ * Usually a test will have separate textbufs for userspace to write to and -+ * read from. Using the same one for both will echo back to the user what they -+ * are writing. -+ * -+ * Lines are understood as being separated by the '\n' character, but no '\n' -+ * characters will be observed by the test -+ * -+ * @max_line_size puts an upper bound on the size of lines in a textbuf, -+ * including the \0 terminator. Lines exceeding this will be truncated, -+ * effectively ignoring incoming data until the next '\n' ++ * kbase_pm_wait_for_reset - Wait for a reset to happen + * -+ * Combining this with @max_nr_lines puts an upper bound on the size of the -+ * file read in ++ * Wait for the %RESET_COMPLETED IRQ to occur, then reset the waiting state. + * -+ * Return: 0 on success, or negative value on error. ++ * @kbdev: Kbase device + */ -+int kutf_helper_textbuf_init(struct kutf_helper_textbuf *textbuf, -+ struct kutf_mempool *mempool, int max_line_size, -+ int max_nr_lines); ++static void kbase_pm_wait_for_reset(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->pm.lock); + -+/** -+ * kutf_helper_textbuf_wait_for_user() - wait for userspace to open the 'data' -+ * file -+ * @textbuf: textbuf to wait on -+ * -+ * This can be used to synchronize with userspace so that subsequent calls to -+ * kutf_helper_textbuf_dequeue() and kutf_helper_textbuf_enqueue() should -+ * succeed. -+ * -+ * Waiting is done on a timeout. -+ * -+ * There is of course no guarantee that userspace will keep the file open after -+ * this, but any error in the dequeue/enqueue functions afterwards can be -+ * treated as such rather than "we're still waiting for userspace to begin" -+ * -+ * Return: 0 if waited successfully, -ETIMEDOUT if we exceeded the -+ * timeout, or some other negative value if there was an -+ * error during waiting. -+ */ ++ wait_event(kbdev->pm.backend.reset_done_wait, ++ (kbdev->pm.backend.reset_done)); ++ kbdev->pm.backend.reset_done = false; ++} + -+int kutf_helper_textbuf_wait_for_user(struct kutf_helper_textbuf *textbuf); ++KBASE_EXPORT_TEST_API(kbase_pm_reset_done); + ++static enum hrtimer_restart kbasep_reset_timeout(struct hrtimer *timer) ++{ ++ struct kbasep_reset_timeout_data *rtdata = ++ container_of(timer, struct kbasep_reset_timeout_data, timer); + -+/** -+ * kutf_helper_textbuf_dequeue() - dequeue a line from a textbuf -+ * @textbuf: textbuf dequeue a line as a string from -+ * @str_size: pointer to storage to receive the size of the string, -+ * which includes the '\0' terminator, or NULL if not -+ * required -+ * -+ * Dequeue (remove) a line from the start of the textbuf as a string, and -+ * return it. -+ * -+ * If no lines are available, then this will block until a line has been -+ * submitted. If a userspace client is not connected and there are no remaining -+ * lines, then this function returns NULL instead. -+ * -+ * The memory for the string comes from the kutf_mempool given during -+ * initialization of the textbuf, and shares the same lifetime as it. -+ * -+ * Return: pointer to the next line of the textbuf. NULL indicated -+ * all userspace clients disconnected. An error value to be -+ * checked with IS_ERR() family of functions if a signal or -+ * some other error occurred -+ */ -+char *kutf_helper_textbuf_dequeue(struct kutf_helper_textbuf *textbuf, -+ int *str_size); ++ rtdata->timed_out = 1; + -+/** -+ * kutf_helper_textbuf_enqueue() - enqueue a line to a textbuf -+ * @textbuf: textbuf to enqueue a line as a string to -+ * @enqueue_str: pointer to the string to enqueue to the textbuf -+ * @buf_max_size: maximum size of the buffer holding @enqueue_str -+ * -+ * Enqueue (add) a line to the end of a textbuf as a string. -+ * -+ * The caller should avoid placing '\n' characters in their strings, as these -+ * will not be split into multiple lines. -+ * -+ * A copy of the string will be made into the textbuf, so @enqueue_str can be -+ * freed immediately after if.the caller wishes to do so. -+ * -+ * If the maximum amount of lines has been reached, then this will block until -+ * a line has been removed to make space. If a userspace client is not -+ * connected and there is no space available, then this function returns -+ * -EBUSY. -+ * -+ * Return: 0 on success, or negative value on error -+ */ -+int kutf_helper_textbuf_enqueue(struct kutf_helper_textbuf *textbuf, -+ char *enqueue_str, int buf_max_size); ++ /* Set the wait queue to wake up kbase_pm_init_hw even though the reset ++ * hasn't completed */ ++ kbase_pm_reset_done(rtdata->kbdev); + -+#endif /* _KERNEL_UTF_HELPERS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_helpers_user.h b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_helpers_user.h -new file mode 100755 -index 000000000000..759bf717c7cd ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_helpers_user.h -@@ -0,0 +1,179 @@ -+/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ return HRTIMER_NORESTART; ++} + ++static void kbase_pm_hw_issues_detect(struct kbase_device *kbdev) ++{ ++ struct device_node *np = kbdev->dev->of_node; ++ u32 jm_values[4]; ++ const u32 gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++ const u32 prod_id = (gpu_id & GPU_ID_VERSION_PRODUCT_ID) >> ++ GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++ const u32 major = (gpu_id & GPU_ID_VERSION_MAJOR) >> ++ GPU_ID_VERSION_MAJOR_SHIFT; + ++ kbdev->hw_quirks_sc = 0; + -+#ifndef _KERNEL_UTF_HELPERS_USER_H_ -+#define _KERNEL_UTF_HELPERS_USER_H_ ++ /* Needed due to MIDBASE-1494: LS_PAUSEBUFFER_DISABLE. See PRLAM-8443. ++ * and needed due to MIDGLES-3539. See PRLAM-11035 */ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8443) || ++ kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_11035)) ++ kbdev->hw_quirks_sc |= SC_LS_PAUSEBUFFER_DISABLE; + -+/* kutf_helpers.h -+ * Test helper functions for the kernel UTF test infrastructure, whose -+ * implementation mirrors that of similar functions for kutf-userside -+ */ ++ /* Needed due to MIDBASE-2054: SDC_DISABLE_OQ_DISCARD. See PRLAM-10327. ++ */ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10327)) ++ kbdev->hw_quirks_sc |= SC_SDC_DISABLE_OQ_DISCARD; + -+#include -+#include ++#ifdef CONFIG_MALI_PRFCNT_SET_SECONDARY ++ /* Enable alternative hardware counter selection if configured. */ ++ if (!GPU_ID_IS_NEW_FORMAT(prod_id)) ++ kbdev->hw_quirks_sc |= SC_ALT_COUNTERS; ++#endif + ++ /* Needed due to MIDBASE-2795. ENABLE_TEXGRD_FLAGS. See PRLAM-10797. */ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10797)) ++ kbdev->hw_quirks_sc |= SC_ENABLE_TEXGRD_FLAGS; + -+#define KUTF_HELPER_MAX_VAL_NAME_LEN 255 ++ if (!kbase_hw_has_issue(kbdev, GPUCORE_1619)) { ++ if (prod_id < 0x750 || prod_id == 0x6956) /* T60x, T62x, T72x */ ++ kbdev->hw_quirks_sc |= SC_LS_ATTR_CHECK_DISABLE; ++ else if (prod_id >= 0x750 && prod_id <= 0x880) /* T76x, T8xx */ ++ kbdev->hw_quirks_sc |= SC_LS_ALLOW_ATTR_TYPES; ++ } + -+enum kutf_helper_valtype { -+ KUTF_HELPER_VALTYPE_INVALID, -+ KUTF_HELPER_VALTYPE_U64, -+ KUTF_HELPER_VALTYPE_STR, ++ if (!kbdev->hw_quirks_sc) ++ kbdev->hw_quirks_sc = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(SHADER_CONFIG), NULL); + -+ KUTF_HELPER_VALTYPE_COUNT /* Must be last */ -+}; ++ kbdev->hw_quirks_tiler = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(TILER_CONFIG), NULL); + -+struct kutf_helper_named_val { -+ enum kutf_helper_valtype type; -+ char *val_name; -+ union { -+ u64 val_u64; -+ char *val_str; -+ } u; -+}; ++ /* Set tiler clock gate override if required */ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_T76X_3953)) ++ kbdev->hw_quirks_tiler |= TC_CLOCK_GATE_OVERRIDE; + -+/* Extra error values for certain helpers when we want to distinguish between -+ * Linux's own error values too. -+ * -+ * These can only be used on certain functions returning an int type that are -+ * documented as returning one of these potential values, they cannot be used -+ * from functions return a ptr type, since we can't decode it with PTR_ERR -+ * -+ * No negative values are used - Linux error codes should be used instead, and -+ * indicate a problem in accessing the data file itself (are generally -+ * unrecoverable) -+ * -+ * Positive values indicate correct access but invalid parsing (can be -+ * recovered from assuming data in the future is correct) */ -+enum kutf_helper_err { -+ /* No error - must be zero */ -+ KUTF_HELPER_ERR_NONE = 0, -+ /* Named value parsing encountered an invalid name */ -+ KUTF_HELPER_ERR_INVALID_NAME, -+ /* Named value parsing of string or u64 type encountered extra -+ * characters after the value (after the last digit for a u64 type or -+ * after the string end delimiter for string type) */ -+ KUTF_HELPER_ERR_CHARS_AFTER_VAL, -+ /* Named value parsing of string type couldn't find the string end -+ * delimiter. -+ * -+ * This cannot be encountered when the NAME="value" message exceeds the -+ * textbuf's maximum line length, because such messages are not checked -+ * for an end string delimiter */ -+ KUTF_HELPER_ERR_NO_END_DELIMITER, -+ /* Named value didn't parse as any of the known types */ -+ KUTF_HELPER_ERR_INVALID_VALUE, -+}; ++ /* Limit the GPU bus bandwidth if the platform needs this. */ ++ kbdev->hw_quirks_mmu = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(L2_MMU_CONFIG), NULL); + ++ /* Limit read ID width for AXI */ ++ kbdev->hw_quirks_mmu &= ~(L2_MMU_CONFIG_LIMIT_EXTERNAL_READS); ++ kbdev->hw_quirks_mmu |= (DEFAULT_ARID_LIMIT & 0x3) << ++ L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_SHIFT; + -+/* textbuf Send named NAME=value pair, u64 value -+ * -+ * NAME must match [A-Z0-9_]\+ and can be up to MAX_VAL_NAME_LEN characters long -+ * -+ * This is assuming the kernel-side test is using the 'textbuf' helpers -+ * -+ * Any failure will be logged on the suite's current test fixture -+ * -+ * Returns 0 on success, non-zero on failure -+ */ -+int kutf_helper_textbuf_send_named_u64(struct kutf_context *context, -+ struct kutf_helper_textbuf *textbuf, char *val_name, u64 val); ++ /* Limit write ID width for AXI */ ++ kbdev->hw_quirks_mmu &= ~(L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES); ++ kbdev->hw_quirks_mmu |= (DEFAULT_AWID_LIMIT & 0x3) << ++ L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_SHIFT; + -+/* Get the maximum length of a string that can be represented as a particular -+ * NAME="value" pair without string-value truncation in the kernel's buffer -+ * -+ * Given val_name and the kernel buffer's size, this can be used to determine -+ * the maximum length of a string that can be sent as val_name="value" pair -+ * without having the string value truncated. Any string longer than this will -+ * be truncated at some point during communication to this size. -+ * -+ * The calculation is valid both for sending strings of val_str_len to kernel, -+ * and for receiving a string that was originally val_str_len from the kernel. -+ * -+ * It is assumed that valname is a valid name for -+ * kutf_test_helpers_textbuf_send_named_str(), and no checking will be made to -+ * ensure this. -+ * -+ * Returns the maximum string length that can be represented, or a negative -+ * value if the NAME="value" encoding itself wouldn't fit in kern_buf_sz -+ */ -+int kutf_helper_textbuf_max_str_len_for_kern(char *val_name, int kern_buf_sz); ++ if (kbdev->system_coherency == COHERENCY_ACE) { ++ /* Allow memory configuration disparity to be ignored, we ++ * optimize the use of shared memory and thus we expect ++ * some disparity in the memory configuration */ ++ kbdev->hw_quirks_mmu |= L2_MMU_CONFIG_ALLOW_SNOOP_DISPARITY; ++ } + -+/* textbuf Send named NAME="str" pair -+ * -+ * no escaping allowed in str. Any of the following characters will terminate -+ * the string: '"' '\\' '\n' -+ * -+ * NAME must match [A-Z0-9_]\+ and can be up to MAX_VAL_NAME_LEN characters long -+ * -+ * This is assuming the kernel-side test is using the 'textbuf' helpers -+ * -+ * Any failure will be logged on the suite's current test fixture -+ * -+ * Returns 0 on success, non-zero on failure */ -+int kutf_helper_textbuf_send_named_str(struct kutf_context *context, -+ struct kutf_helper_textbuf *textbuf, char *val_name, -+ char *val_str); ++ kbdev->hw_quirks_jm = 0; ++ /* Only for T86x/T88x-based products after r2p0 */ ++ if (prod_id >= 0x860 && prod_id <= 0x880 && major >= 2) { + -+/* textbuf Receive named NAME=value pair -+ * -+ * This can receive u64 and string values - check named_val->type -+ * -+ * If you are not planning on dynamic handling of the named value's name and -+ * type, then kutf_test_helpers_textbuf_receive_check_val() is more useful as a -+ * convenience function. -+ * -+ * String members of named_val will come from memory allocated on the fixture's mempool -+ * -+ * Returns 0 on success. Negative value on failure to receive from the 'data' -+ * file, positive value indicates an enum kutf_helper_err value for correct -+ * reception of data but invalid parsing */ -+int kutf_helper_textbuf_receive_named_val(struct kutf_helper_named_val *named_val, -+ struct kutf_helper_textbuf *textbuf); ++ if (of_property_read_u32_array(np, ++ "jm_config", ++ &jm_values[0], ++ ARRAY_SIZE(jm_values))) { ++ /* Entry not in device tree, use defaults */ ++ jm_values[0] = 0; ++ jm_values[1] = 0; ++ jm_values[2] = 0; ++ jm_values[3] = JM_MAX_JOB_THROTTLE_LIMIT; ++ } + -+/* textbuf Receive and validate NAME=value pair -+ * -+ * As with kutf_test_helpers_textbuf_receive_named_val, but validate that the -+ * name and type are as expected, as a convenience for a common pattern found -+ * in tests. -+ * -+ * NOTE: this only returns an error value if there was actually a problem -+ * receiving data. -+ * -+ * NOTE: If the underlying data was received correctly, but: -+ * - isn't of the expected name -+ * - isn't the expected type -+ * - isn't correctly parsed for the type -+ * then the following happens: -+ * - failure result is recorded -+ * - named_val->type will be KUTF_HELPER_VALTYPE_INVALID -+ * - named_val->u will contain some default value that should be relatively -+ * harmless for the test, including being writable in the case of string -+ * values -+ * - return value will be 0 to indicate success -+ * -+ * The rationale behind this is that we'd prefer to continue the rest of the -+ * test with failures propagated, rather than hitting a timeout */ -+int kutf_helper_textbuf_receive_check_val(struct kutf_helper_named_val *named_val, -+ struct kutf_context *context, struct kutf_helper_textbuf *textbuf, -+ char *expect_val_name, enum kutf_helper_valtype expect_val_type); ++ /* Limit throttle limit to 6 bits*/ ++ if (jm_values[3] > JM_MAX_JOB_THROTTLE_LIMIT) { ++ dev_dbg(kbdev->dev, "JOB_THROTTLE_LIMIT supplied in device tree is too large. Limiting to MAX (63)."); ++ jm_values[3] = JM_MAX_JOB_THROTTLE_LIMIT; ++ } + -+/* Output a named value to kmsg */ -+void kutf_helper_output_named_val(struct kutf_helper_named_val *named_val); ++ /* Aggregate to one integer. */ ++ kbdev->hw_quirks_jm |= (jm_values[0] ? ++ JM_TIMESTAMP_OVERRIDE : 0); ++ kbdev->hw_quirks_jm |= (jm_values[1] ? ++ JM_CLOCK_GATE_OVERRIDE : 0); ++ kbdev->hw_quirks_jm |= (jm_values[2] ? ++ JM_JOB_THROTTLE_ENABLE : 0); ++ kbdev->hw_quirks_jm |= (jm_values[3] << ++ JM_JOB_THROTTLE_LIMIT_SHIFT); + ++ } else if (GPU_ID_IS_NEW_FORMAT(prod_id) && ++ (GPU_ID2_MODEL_MATCH_VALUE(prod_id) == ++ GPU_ID2_PRODUCT_TMIX)) { ++ /* Only for tMIx */ ++ u32 coherency_features; + -+#endif /* _KERNEL_UTF_HELPERS_USER_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_mem.h b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_mem.h -new file mode 100755 -index 000000000000..584c9dd4bc13 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_mem.h -@@ -0,0 +1,68 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ coherency_features = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(COHERENCY_FEATURES), NULL); + ++ /* (COHERENCY_ACE_LITE | COHERENCY_ACE) was incorrectly ++ * documented for tMIx so force correct value here. ++ */ ++ if (coherency_features == ++ COHERENCY_FEATURE_BIT(COHERENCY_ACE)) { ++ kbdev->hw_quirks_jm |= ++ (COHERENCY_ACE_LITE | COHERENCY_ACE) << ++ JM_FORCE_COHERENCY_FEATURES_SHIFT; ++ } ++ } + ++ if (!kbdev->hw_quirks_jm) ++ kbdev->hw_quirks_jm = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(JM_CONFIG), NULL); + -+#ifndef _KERNEL_UTF_MEM_H_ -+#define _KERNEL_UTF_MEM_H_ ++#ifdef CONFIG_MALI_CORESTACK ++#define MANUAL_POWER_CONTROL ((u32)(1 << 8)) ++ kbdev->hw_quirks_jm |= MANUAL_POWER_CONTROL; ++#endif /* CONFIG_MALI_CORESTACK */ ++} + -+/* kutf_mem.h -+ * Functions for management of memory pools in the kernel. -+ * -+ * This module implements a memory pool allocator, allowing a test -+ * implementation to allocate linked allocations which can then be freed by a -+ * single free which releases all of the resources held by the entire pool. -+ * -+ * Note that it is not possible to free single resources within the pool once -+ * allocated. -+ */ ++static void kbase_pm_hw_issues_apply(struct kbase_device *kbdev) ++{ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(SHADER_CONFIG), ++ kbdev->hw_quirks_sc, NULL); + -+#include -+#include ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(TILER_CONFIG), ++ kbdev->hw_quirks_tiler, NULL); + -+/** -+ * struct kutf_mempool - the memory pool context management structure -+ * @head: list head on which the allocations in this context are added to -+ * @lock: mutex for concurrent allocation from multiple threads -+ * -+ */ -+struct kutf_mempool { -+ struct list_head head; -+ struct mutex lock; ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(L2_MMU_CONFIG), ++ kbdev->hw_quirks_mmu, NULL); ++ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(JM_CONFIG), ++ kbdev->hw_quirks_jm, NULL); ++ ++} ++ ++void kbase_pm_cache_snoop_enable(struct kbase_device *kbdev) ++{ ++ if ((kbdev->current_gpu_coherency_mode == COHERENCY_ACE) && ++ !kbdev->cci_snoop_enabled) { ++#ifdef CONFIG_ARM64 ++ if (kbdev->snoop_enable_smc != 0) ++ kbase_invoke_smc_fid(kbdev->snoop_enable_smc, 0, 0, 0); ++#endif /* CONFIG_ARM64 */ ++ dev_dbg(kbdev->dev, "MALI - CCI Snoops - Enabled\n"); ++ kbdev->cci_snoop_enabled = true; ++ } ++} ++ ++void kbase_pm_cache_snoop_disable(struct kbase_device *kbdev) ++{ ++ if (kbdev->cci_snoop_enabled) { ++#ifdef CONFIG_ARM64 ++ if (kbdev->snoop_disable_smc != 0) { ++ mali_cci_flush_l2(kbdev); ++ kbase_invoke_smc_fid(kbdev->snoop_disable_smc, 0, 0, 0); ++ } ++#endif /* CONFIG_ARM64 */ ++ dev_dbg(kbdev->dev, "MALI - CCI Snoops Disabled\n"); ++ kbdev->cci_snoop_enabled = false; ++ } ++} ++ ++static int kbase_pm_do_reset(struct kbase_device *kbdev) ++{ ++ struct kbasep_reset_timeout_data rtdata; ++ ++ KBASE_TRACE_ADD(kbdev, CORE_GPU_SOFT_RESET, NULL, NULL, 0u, 0); ++ ++ KBASE_TLSTREAM_JD_GPU_SOFT_RESET(kbdev); ++ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), ++ GPU_COMMAND_SOFT_RESET, NULL); ++ ++ /* Unmask the reset complete interrupt only */ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), RESET_COMPLETED, ++ NULL); ++ ++ /* Initialize a structure for tracking the status of the reset */ ++ rtdata.kbdev = kbdev; ++ rtdata.timed_out = 0; ++ ++ /* Create a timer to use as a timeout on the reset */ ++ hrtimer_init_on_stack(&rtdata.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); ++ rtdata.timer.function = kbasep_reset_timeout; ++ ++ hrtimer_start(&rtdata.timer, HR_TIMER_DELAY_MSEC(RESET_TIMEOUT), ++ HRTIMER_MODE_REL); ++ ++ /* Wait for the RESET_COMPLETED interrupt to be raised */ ++ kbase_pm_wait_for_reset(kbdev); ++ ++ if (rtdata.timed_out == 0) { ++ /* GPU has been reset */ ++ hrtimer_cancel(&rtdata.timer); ++ destroy_hrtimer_on_stack(&rtdata.timer); ++ return 0; ++ } ++ ++ /* No interrupt has been received - check if the RAWSTAT register says ++ * the reset has completed */ ++ if (kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_RAWSTAT), NULL) & ++ RESET_COMPLETED) { ++ /* The interrupt is set in the RAWSTAT; this suggests that the ++ * interrupts are not getting to the CPU */ ++ dev_err(kbdev->dev, "Reset interrupt didn't reach CPU. Check interrupt assignments.\n"); ++ /* If interrupts aren't working we can't continue. */ ++ destroy_hrtimer_on_stack(&rtdata.timer); ++ return -EINVAL; ++ } ++ ++ /* The GPU doesn't seem to be responding to the reset so try a hard ++ * reset */ ++ dev_err(kbdev->dev, "Failed to soft-reset GPU (timed out after %d ms), now attempting a hard reset\n", ++ RESET_TIMEOUT); ++ KBASE_TRACE_ADD(kbdev, CORE_GPU_HARD_RESET, NULL, NULL, 0u, 0); ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), ++ GPU_COMMAND_HARD_RESET, NULL); ++ ++ /* Restart the timer to wait for the hard reset to complete */ ++ rtdata.timed_out = 0; ++ ++ hrtimer_start(&rtdata.timer, HR_TIMER_DELAY_MSEC(RESET_TIMEOUT), ++ HRTIMER_MODE_REL); ++ ++ /* Wait for the RESET_COMPLETED interrupt to be raised */ ++ kbase_pm_wait_for_reset(kbdev); ++ ++ if (rtdata.timed_out == 0) { ++ /* GPU has been reset */ ++ hrtimer_cancel(&rtdata.timer); ++ destroy_hrtimer_on_stack(&rtdata.timer); ++ return 0; ++ } ++ ++ destroy_hrtimer_on_stack(&rtdata.timer); ++ ++ dev_err(kbdev->dev, "Failed to hard-reset the GPU (timed out after %d ms)\n", ++ RESET_TIMEOUT); ++ ++ return -EINVAL; ++} ++ ++static int kbasep_protected_mode_enable(struct protected_mode_device *pdev) ++{ ++ struct kbase_device *kbdev = pdev->data; ++ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), ++ GPU_COMMAND_SET_PROTECTED_MODE, NULL); ++ return 0; ++} ++ ++static int kbasep_protected_mode_disable(struct protected_mode_device *pdev) ++{ ++ struct kbase_device *kbdev = pdev->data; ++ ++ lockdep_assert_held(&kbdev->pm.lock); ++ ++ return kbase_pm_do_reset(kbdev); ++} ++ ++struct protected_mode_ops kbase_native_protected_ops = { ++ .protected_mode_enable = kbasep_protected_mode_enable, ++ .protected_mode_disable = kbasep_protected_mode_disable +}; + -+/** -+ * kutf_mempool_init() - Initialize a memory pool. -+ * @pool: Memory pool structure to initialize, provided by the user -+ * -+ * Return: zero on success -+ */ -+int kutf_mempool_init(struct kutf_mempool *pool); ++int kbase_pm_init_hw(struct kbase_device *kbdev, unsigned int flags) ++{ ++ unsigned long irq_flags; ++ int err; ++ bool resume_vinstr = false; + -+/** -+ * kutf_mempool_alloc() - Allocate memory from a pool -+ * @pool: Memory pool to allocate from -+ * @size: Size of memory wanted in number of bytes -+ * -+ * Return: Pointer to memory on success, NULL on failure. -+ */ -+void *kutf_mempool_alloc(struct kutf_mempool *pool, size_t size); ++ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ lockdep_assert_held(&kbdev->pm.lock); ++ ++ /* Ensure the clock is on before attempting to access the hardware */ ++ if (!kbdev->pm.backend.gpu_powered) { ++ if (kbdev->pm.backend.callback_power_on) ++ kbdev->pm.backend.callback_power_on(kbdev); ++ ++ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, ++ irq_flags); ++ kbdev->pm.backend.gpu_powered = true; ++ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, ++ irq_flags); ++ } ++ ++ /* Ensure interrupts are off to begin with, this also clears any ++ * outstanding interrupts */ ++ kbase_pm_disable_interrupts(kbdev); ++ /* Ensure cache snoops are disabled before reset. */ ++ kbase_pm_cache_snoop_disable(kbdev); ++ /* Prepare for the soft-reset */ ++ kbdev->pm.backend.reset_done = false; ++ ++ /* The cores should be made unavailable due to the reset */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, irq_flags); ++ if (kbdev->shader_available_bitmap != 0u) ++ KBASE_TRACE_ADD(kbdev, PM_CORES_CHANGE_AVAILABLE, NULL, ++ NULL, 0u, (u32)0u); ++ if (kbdev->tiler_available_bitmap != 0u) ++ KBASE_TRACE_ADD(kbdev, PM_CORES_CHANGE_AVAILABLE_TILER, ++ NULL, NULL, 0u, (u32)0u); ++ kbdev->shader_available_bitmap = 0u; ++ kbdev->tiler_available_bitmap = 0u; ++ kbdev->l2_available_bitmap = 0u; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, irq_flags); ++ ++ /* Soft reset the GPU */ ++ if (kbdev->protected_mode_support) ++ err = kbdev->protected_ops->protected_mode_disable( ++ kbdev->protected_dev); ++ else ++ err = kbase_pm_do_reset(kbdev); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, irq_flags); ++ if (kbdev->protected_mode) ++ resume_vinstr = true; ++ kbdev->protected_mode = false; ++ kbase_ipa_model_use_configured_locked(kbdev); ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, irq_flags); ++ ++ if (err) ++ goto exit; ++ ++ if (flags & PM_HW_ISSUES_DETECT) ++ kbase_pm_hw_issues_detect(kbdev); ++ ++ kbase_pm_hw_issues_apply(kbdev); ++ kbase_cache_set_coherency_mode(kbdev, kbdev->system_coherency); ++ ++ /* Sanity check protected mode was left after reset */ ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_MODE)) { ++ u32 gpu_status = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(GPU_STATUS), NULL); ++ ++ WARN_ON(gpu_status & GPU_STATUS_PROTECTED_MODE_ACTIVE); ++ } ++ ++ /* If cycle counter was in use re-enable it, enable_irqs will only be ++ * false when called from kbase_pm_powerup */ ++ if (kbdev->pm.backend.gpu_cycle_counter_requests && ++ (flags & PM_ENABLE_IRQS)) { ++ /* enable interrupts as the L2 may have to be powered on */ ++ kbase_pm_enable_interrupts(kbdev); ++ kbase_pm_request_l2_caches(kbdev); ++ ++ /* Re-enable the counters if we need to */ ++ spin_lock_irqsave( ++ &kbdev->pm.backend.gpu_cycle_counter_requests_lock, ++ irq_flags); ++ if (kbdev->pm.backend.gpu_cycle_counter_requests) ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), ++ GPU_COMMAND_CYCLE_COUNT_START, NULL); ++ spin_unlock_irqrestore( ++ &kbdev->pm.backend.gpu_cycle_counter_requests_lock, ++ irq_flags); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, irq_flags); ++ kbase_pm_release_l2_caches(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, irq_flags); ++ ++ kbase_pm_disable_interrupts(kbdev); ++ } ++ ++ if (flags & PM_ENABLE_IRQS) ++ kbase_pm_enable_interrupts(kbdev); ++ ++exit: ++ /* If GPU is leaving protected mode resume vinstr operation. */ ++ if (kbdev->vinstr_ctx && resume_vinstr) ++ kbase_vinstr_resume(kbdev->vinstr_ctx); ++ ++ return err; ++} + +/** -+ * kutf_mempool_destroy() - Destroy a memory pool, freeing all memory within it. -+ * @pool: The memory pool to free -+ */ -+void kutf_mempool_destroy(struct kutf_mempool *pool); -+#endif /* _KERNEL_UTF_MEM_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_resultset.h b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_resultset.h -new file mode 100755 -index 000000000000..1cc85f1b7a46 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_resultset.h -@@ -0,0 +1,121 @@ -+/* ++ * kbase_pm_request_gpu_cycle_counter_do_request - Request cycle counters + * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * Increase the count of cycle counter users and turn the cycle counters on if ++ * they were previously off + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * This function is designed to be called by ++ * kbase_pm_request_gpu_cycle_counter() or ++ * kbase_pm_request_gpu_cycle_counter_l2_is_on() only + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * When this function is called the l2 cache must be on and the l2 cache users ++ * count must have been incremented by a call to ( ++ * kbase_pm_request_l2_caches() or kbase_pm_request_l2_caches_l2_on() ) + * ++ * @kbdev: The kbase device structure of the device + */ ++static void ++kbase_pm_request_gpu_cycle_counter_do_request(struct kbase_device *kbdev) ++{ ++ unsigned long flags; + ++ spin_lock_irqsave(&kbdev->pm.backend.gpu_cycle_counter_requests_lock, ++ flags); + ++ ++kbdev->pm.backend.gpu_cycle_counter_requests; + -+#ifndef _KERNEL_UTF_RESULTSET_H_ -+#define _KERNEL_UTF_RESULTSET_H_ ++ if (1 == kbdev->pm.backend.gpu_cycle_counter_requests) ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), ++ GPU_COMMAND_CYCLE_COUNT_START, NULL); + -+/* kutf_resultset.h -+ * Functions and structures for handling test results and result sets. -+ * -+ * This section of the kernel UTF contains structures and functions used for the -+ * management of Results and Result Sets. -+ */ ++ spin_unlock_irqrestore( ++ &kbdev->pm.backend.gpu_cycle_counter_requests_lock, ++ flags); ++} + -+/** -+ * enum kutf_result_status - Status values for a single Test error. -+ * @KUTF_RESULT_BENCHMARK: Result is a meta-result containing benchmark -+ * results. -+ * @KUTF_RESULT_SKIP: The test was skipped. -+ * @KUTF_RESULT_UNKNOWN: The test has an unknown result. -+ * @KUTF_RESULT_PASS: The test result passed. -+ * @KUTF_RESULT_DEBUG: The test result passed, but raised a debug -+ * message. -+ * @KUTF_RESULT_INFO: The test result passed, but raised -+ * an informative message. -+ * @KUTF_RESULT_WARN: The test result passed, but raised a warning -+ * message. -+ * @KUTF_RESULT_FAIL: The test result failed with a non-fatal error. -+ * @KUTF_RESULT_FATAL: The test result failed with a fatal error. -+ * @KUTF_RESULT_ABORT: The test result failed due to a non-UTF -+ * assertion failure. -+ * @KUTF_RESULT_COUNT: The current number of possible status messages. -+ */ -+enum kutf_result_status { -+ KUTF_RESULT_BENCHMARK = -3, -+ KUTF_RESULT_SKIP = -2, -+ KUTF_RESULT_UNKNOWN = -1, ++void kbase_pm_request_gpu_cycle_counter(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ KUTF_RESULT_PASS = 0, -+ KUTF_RESULT_DEBUG = 1, -+ KUTF_RESULT_INFO = 2, -+ KUTF_RESULT_WARN = 3, -+ KUTF_RESULT_FAIL = 4, -+ KUTF_RESULT_FATAL = 5, -+ KUTF_RESULT_ABORT = 6, ++ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_powered); + -+ KUTF_RESULT_COUNT -+}; ++ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_cycle_counter_requests < ++ INT_MAX); + -+/* The maximum size of a kutf_result_status result when -+ * converted to a string -+ */ -+#define KUTF_ERROR_MAX_NAME_SIZE 21 ++ kbase_pm_request_l2_caches(kbdev); + -+#ifdef __KERNEL__ ++ kbase_pm_request_gpu_cycle_counter_do_request(kbdev); ++} + -+#include ++KBASE_EXPORT_TEST_API(kbase_pm_request_gpu_cycle_counter); + -+/** -+ * struct kutf_result - Represents a single test result. -+ * @node: Next result in the list of results. -+ * @status: The status summary (pass / warn / fail / etc). -+ * @message: A more verbose status message. -+ */ -+struct kutf_result { -+ struct list_head node; -+ enum kutf_result_status status; -+ const char *message; -+}; ++void kbase_pm_request_gpu_cycle_counter_l2_is_on(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+/** -+ * kutf_create_result_set() - Create a new result set -+ * to which results can be added. -+ * -+ * Return: The created resultset. -+ */ -+struct kutf_result_set *kutf_create_result_set(void); ++ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_powered); + -+/** -+ * kutf_add_result() - Add a result to the end of an existing resultset. -+ * -+ * @mempool: The memory pool to allocate the result storage from. -+ * @set: The resultset to add the result to. -+ * @status: The result status to add. -+ * @message: The result message to add. -+ */ -+void kutf_add_result(struct kutf_mempool *mempool, struct kutf_result_set *set, -+ enum kutf_result_status status, const char *message); ++ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_cycle_counter_requests < ++ INT_MAX); + -+/** -+ * kutf_remove_result() - Remove a result from the head of a resultset. -+ * @set: The resultset. -+ * -+ * Return: result or NULL if there are no further results in the resultset. -+ */ -+struct kutf_result *kutf_remove_result( -+ struct kutf_result_set *set); ++ kbase_pm_request_l2_caches_l2_is_on(kbdev); + -+/** -+ * kutf_destroy_result_set() - Free a previously created resultset. -+ * -+ * @results: The result set whose resources to free. -+ */ -+void kutf_destroy_result_set(struct kutf_result_set *results); ++ kbase_pm_request_gpu_cycle_counter_do_request(kbdev); ++} + -+#endif /* __KERNEL__ */ ++KBASE_EXPORT_TEST_API(kbase_pm_request_gpu_cycle_counter_l2_is_on); + -+#endif /* _KERNEL_UTF_RESULTSET_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_suite.h b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_suite.h ++void kbase_pm_release_gpu_cycle_counter_nolock(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ spin_lock_irqsave(&kbdev->pm.backend.gpu_cycle_counter_requests_lock, ++ flags); ++ ++ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_cycle_counter_requests > 0); ++ ++ --kbdev->pm.backend.gpu_cycle_counter_requests; ++ ++ if (0 == kbdev->pm.backend.gpu_cycle_counter_requests) ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), ++ GPU_COMMAND_CYCLE_COUNT_STOP, NULL); ++ ++ spin_unlock_irqrestore( ++ &kbdev->pm.backend.gpu_cycle_counter_requests_lock, ++ flags); ++ ++ kbase_pm_release_l2_caches(kbdev); ++} ++ ++void kbase_pm_release_gpu_cycle_counter(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ++ kbase_pm_release_gpu_cycle_counter_nolock(kbdev); ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++} ++ ++KBASE_EXPORT_TEST_API(kbase_pm_release_gpu_cycle_counter); +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h new file mode 100755 -index 000000000000..cba2b2d84d62 +index 000000000..6804f45ac --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_suite.h -@@ -0,0 +1,568 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h +@@ -0,0 +1,548 @@ +/* + * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -335377,566 +371570,546 @@ index 000000000000..cba2b2d84d62 + + + -+#ifndef _KERNEL_UTF_SUITE_H_ -+#define _KERNEL_UTF_SUITE_H_ + -+/* kutf_suite.h -+ * Functions for management of test suites. -+ * -+ * This collection of data structures, macros, and functions are used to -+ * create Test Suites, Tests within those Test Suites, and Fixture variants -+ * of each test. -+ */ + -+#include ++/* ++ * Power management API definitions used internally by GPU backend ++ */ + -+#include -+#include ++#ifndef _KBASE_BACKEND_PM_INTERNAL_H_ ++#define _KBASE_BACKEND_PM_INTERNAL_H_ + -+/** -+ * Pseudo-flag indicating an absence of any specified test class. Note that -+ * tests should not be annotated with this constant as it is simply a zero -+ * value; tests without a more specific class must be marked with the flag -+ * KUTF_F_TEST_GENERIC. -+ */ -+#define KUTF_F_TEST_NONE ((unsigned int)(0)) ++#include + -+/** -+ * Class indicating this test is a smoke test. -+ * A given set of smoke tests should be quick to run, enabling rapid turn-around -+ * of "regress-on-commit" test runs. -+ */ -+#define KUTF_F_TEST_SMOKETEST ((unsigned int)(1 << 1)) ++#include "mali_kbase_pm_ca.h" ++#include "mali_kbase_pm_policy.h" + -+/** -+ * Class indicating this test is a performance test. -+ * These tests typically produce a performance metric, such as "time to run" or -+ * "frames per second", -+ */ -+#define KUTF_F_TEST_PERFORMANCE ((unsigned int)(1 << 2)) + +/** -+ * Class indicating that this test is a deprecated test. -+ * These tests have typically been replaced by an alternative test which is -+ * more efficient, or has better coverage. ++ * kbase_pm_dev_idle - The GPU is idle. ++ * ++ * The OS may choose to turn off idle devices ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+#define KUTF_F_TEST_DEPRECATED ((unsigned int)(1 << 3)) ++void kbase_pm_dev_idle(struct kbase_device *kbdev); + +/** -+ * Class indicating that this test is a known failure. -+ * These tests have typically been run and failed, but marking them as a known -+ * failure means it is easier to triage results. ++ * kbase_pm_dev_activate - The GPU is active. + * -+ * It is typically more convenient to triage known failures using the -+ * results database and web UI, as this means there is no need to modify the -+ * test code. ++ * The OS should avoid opportunistically turning off the GPU while it is active ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+#define KUTF_F_TEST_EXPECTED_FAILURE ((unsigned int)(1 << 4)) ++void kbase_pm_dev_activate(struct kbase_device *kbdev); + +/** -+ * Class indicating that this test is a generic test, which is not a member of -+ * a more specific test class. Tests which are not created with a specific set -+ * of filter flags by the user are assigned this test class by default. ++ * kbase_pm_get_present_cores - Get details of the cores that are present in ++ * the device. ++ * ++ * This function can be called by the active power policy to return a bitmask of ++ * the cores (of a specified type) present in the GPU device and also a count of ++ * the number of cores. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid ++ * pointer) ++ * @type: The type of core (see the enum kbase_pm_core_type enumeration) ++ * ++ * Return: The bit mask of cores present + */ -+#define KUTF_F_TEST_GENERIC ((unsigned int)(1 << 5)) ++u64 kbase_pm_get_present_cores(struct kbase_device *kbdev, ++ enum kbase_pm_core_type type); + +/** -+ * Class indicating this test is a resource allocation failure test. -+ * A resource allocation failure test will test that an error code is -+ * correctly propagated when an allocation fails. ++ * kbase_pm_get_active_cores - Get details of the cores that are currently ++ * active in the device. ++ * ++ * This function can be called by the active power policy to return a bitmask of ++ * the cores (of a specified type) that are actively processing work (i.e. ++ * turned on *and* busy). ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @type: The type of core (see the enum kbase_pm_core_type enumeration) ++ * ++ * Return: The bit mask of active cores + */ -+#define KUTF_F_TEST_RESFAIL ((unsigned int)(1 << 6)) ++u64 kbase_pm_get_active_cores(struct kbase_device *kbdev, ++ enum kbase_pm_core_type type); + +/** -+ * Additional flag indicating that this test is an expected failure when -+ * run in resource failure mode. These tests are never run when running -+ * the low resource mode. ++ * kbase_pm_get_trans_cores - Get details of the cores that are currently ++ * transitioning between power states. ++ * ++ * This function can be called by the active power policy to return a bitmask of ++ * the cores (of a specified type) that are currently transitioning between ++ * power states. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @type: The type of core (see the enum kbase_pm_core_type enumeration) ++ * ++ * Return: The bit mask of transitioning cores + */ -+#define KUTF_F_TEST_EXPECTED_FAILURE_RF ((unsigned int)(1 << 7)) ++u64 kbase_pm_get_trans_cores(struct kbase_device *kbdev, ++ enum kbase_pm_core_type type); + +/** -+ * Flag reserved for user-defined filter zero. ++ * kbase_pm_get_ready_cores - Get details of the cores that are currently ++ * powered and ready for jobs. ++ * ++ * This function can be called by the active power policy to return a bitmask of ++ * the cores (of a specified type) that are powered and ready for jobs (they may ++ * or may not be currently executing jobs). ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @type: The type of core (see the enum kbase_pm_core_type enumeration) ++ * ++ * Return: The bit mask of ready cores + */ -+#define KUTF_F_TEST_USER_0 ((unsigned int)(1 << 24)) ++u64 kbase_pm_get_ready_cores(struct kbase_device *kbdev, ++ enum kbase_pm_core_type type); + +/** -+ * Flag reserved for user-defined filter one. ++ * kbase_pm_clock_on - Turn the clock for the device on, and enable device ++ * interrupts. ++ * ++ * This function can be used by a power policy to turn the clock for the GPU on. ++ * It should be modified during integration to perform the necessary actions to ++ * ensure that the GPU is fully powered and clocked. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid ++ * pointer) ++ * @is_resume: true if clock on due to resume after suspend, false otherwise + */ -+#define KUTF_F_TEST_USER_1 ((unsigned int)(1 << 25)) ++void kbase_pm_clock_on(struct kbase_device *kbdev, bool is_resume); + +/** -+ * Flag reserved for user-defined filter two. ++ * kbase_pm_clock_off - Disable device interrupts, and turn the clock for the ++ * device off. ++ * ++ * This function can be used by a power policy to turn the clock for the GPU ++ * off. It should be modified during integration to perform the necessary ++ * actions to turn the clock off (if this is possible in the integration). ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid ++ * pointer) ++ * @is_suspend: true if clock off due to suspend, false otherwise ++ * ++ * Return: true if clock was turned off, or ++ * false if clock can not be turned off due to pending page/bus fault ++ * workers. Caller must flush MMU workqueues and retry + */ -+#define KUTF_F_TEST_USER_2 ((unsigned int)(1 << 26)) ++bool kbase_pm_clock_off(struct kbase_device *kbdev, bool is_suspend); + +/** -+ * Flag reserved for user-defined filter three. ++ * kbase_pm_enable_interrupts - Enable interrupts on the device. ++ * ++ * Interrupts are also enabled after a call to kbase_pm_clock_on(). ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+#define KUTF_F_TEST_USER_3 ((unsigned int)(1 << 27)) ++void kbase_pm_enable_interrupts(struct kbase_device *kbdev); + +/** -+ * Flag reserved for user-defined filter four. ++ * kbase_pm_disable_interrupts - Disable interrupts on the device. ++ * ++ * This prevents delivery of Power Management interrupts to the CPU so that ++ * kbase_pm_check_transitions_nolock() will not be called from the IRQ handler ++ * until kbase_pm_enable_interrupts() or kbase_pm_clock_on() is called. ++ * ++ * Interrupts are also disabled after a call to kbase_pm_clock_off(). ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+#define KUTF_F_TEST_USER_4 ((unsigned int)(1 << 28)) ++void kbase_pm_disable_interrupts(struct kbase_device *kbdev); + +/** -+ * Flag reserved for user-defined filter five. ++ * kbase_pm_disable_interrupts_nolock - Version of kbase_pm_disable_interrupts() ++ * that does not take the hwaccess_lock ++ * ++ * Caller must hold the hwaccess_lock. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+#define KUTF_F_TEST_USER_5 ((unsigned int)(1 << 29)) ++void kbase_pm_disable_interrupts_nolock(struct kbase_device *kbdev); + +/** -+ * Flag reserved for user-defined filter six. ++ * kbase_pm_init_hw - Initialize the hardware. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @flags: Flags specifying the type of PM init ++ * ++ * This function checks the GPU ID register to ensure that the GPU is supported ++ * by the driver and performs a reset on the device so that it is in a known ++ * state before the device is used. ++ * ++ * Return: 0 if the device is supported and successfully reset. + */ -+#define KUTF_F_TEST_USER_6 ((unsigned int)(1 << 30)) ++int kbase_pm_init_hw(struct kbase_device *kbdev, unsigned int flags); + +/** -+ * Flag reserved for user-defined filter seven. ++ * kbase_pm_reset_done - The GPU has been reset successfully. ++ * ++ * This function must be called by the GPU interrupt handler when the ++ * RESET_COMPLETED bit is set. It signals to the power management initialization ++ * code that the GPU has been successfully reset. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+#define KUTF_F_TEST_USER_7 ((unsigned int)(1 << 31)) ++void kbase_pm_reset_done(struct kbase_device *kbdev); + -+/** -+ * Pseudo-flag indicating that all test classes should be executed. -+ */ -+#define KUTF_F_TEST_ALL ((unsigned int)(0xFFFFFFFFU)) + +/** -+ * union kutf_callback_data - Union used to store test callback data -+ * @ptr_value: pointer to the location where test callback data -+ * are stored -+ * @u32_value: a number which represents test callback data ++ * kbase_pm_check_transitions_nolock - Check if there are any power transitions ++ * to make, and if so start them. ++ * ++ * This function will check the desired_xx_state members of ++ * struct kbase_pm_device_data and the actual status of the hardware to see if ++ * any power transitions can be made at this time to make the hardware state ++ * closer to the state desired by the power policy. ++ * ++ * The return value can be used to check whether all the desired cores are ++ * available, and so whether it's worth submitting a job (e.g. from a Power ++ * Management IRQ). ++ * ++ * Note that this still returns true when desired_xx_state has no ++ * cores. That is: of the no cores desired, none were *un*available. In ++ * this case, the caller may still need to try submitting jobs. This is because ++ * the Core Availability Policy might have taken us to an intermediate state ++ * where no cores are powered, before powering on more cores (e.g. for core ++ * rotation) ++ * ++ * The caller must hold kbase_device.pm.power_change_lock ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Return: non-zero when all desired cores are available. That is, ++ * it's worthwhile for the caller to submit a job. ++ * false otherwise + */ -+union kutf_callback_data { -+ void *ptr_value; -+ u32 u32_value; -+}; ++bool kbase_pm_check_transitions_nolock(struct kbase_device *kbdev); + +/** -+ * struct kutf_userdata_ops- Structure defining methods to exchange data -+ * with userspace via the 'data' file -+ * @open: Function used to notify when the 'data' file was opened -+ * @release: Function used to notify when the 'data' file was closed -+ * @notify_ended: Function used to notify when the test has ended. -+ * @consumer: Function used to consume writes from userspace -+ * @producer: Function used to produce data for userspace to read ++ * kbase_pm_check_transitions_sync - Synchronous and locking variant of ++ * kbase_pm_check_transitions_nolock() ++ * ++ * On returning, the desired state at the time of the call will have been met. ++ * ++ * There is nothing to stop the core being switched off by calls to ++ * kbase_pm_release_cores() or kbase_pm_unrequest_cores(). Therefore, the ++ * caller must have already made a call to ++ * kbase_pm_request_cores()/kbase_pm_request_cores_sync() previously. ++ * ++ * The usual use-case for this is to ensure cores are 'READY' after performing ++ * a GPU Reset. ++ * ++ * Unlike kbase_pm_check_transitions_nolock(), the caller must not hold ++ * kbase_device.pm.power_change_lock, because this function will take that ++ * lock itself. + * -+ * All ops can be NULL. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+struct kutf_userdata_ops { -+ int (*open)(void *priv); -+ void (*release)(void *priv); -+ void (*notify_ended)(void *priv); -+ ssize_t (*consumer)(void *priv, const char __user *userbuf, -+ size_t userbuf_len, loff_t *ppos); -+ ssize_t (*producer)(void *priv, char __user *userbuf, -+ size_t userbuf_len, loff_t *ppos); -+}; ++void kbase_pm_check_transitions_sync(struct kbase_device *kbdev); + +/** -+ * struct kutf_context - Structure representing a kernel test context -+ * @kref: Refcount for number of users of this context -+ * @suite: Convenience pointer to the suite this context -+ * is running -+ * @test_fix: The fixture that is being run in this context -+ * @fixture_pool: The memory pool used for the duration of -+ * the fixture/text context. -+ * @fixture: The user provided fixture structure. -+ * @fixture_index: The index (id) of the current fixture. -+ * @fixture_name: The name of the current fixture (or NULL if unnamed). -+ * @test_data: Any user private data associated with this test -+ * @result_set: All the results logged by this test context -+ * @status: The status of the currently running fixture. -+ * @expected_status: The expected status on exist of the currently -+ * running fixture. -+ * @userdata_consumer_priv: Parameter to pass into kutf_userdata_ops -+ * consumer function. Must not be NULL if a -+ * consumer function was specified -+ * @userdata_producer_priv: Parameter to pass into kutf_userdata_ops -+ * producer function. Must not be NULL if a -+ * producer function was specified -+ * @userdata_dentry: The debugfs file for userdata exchange ++ * kbase_pm_update_cores_state_nolock - Variant of kbase_pm_update_cores_state() ++ * where the caller must hold ++ * kbase_device.pm.power_change_lock ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+struct kutf_context { -+ struct kref kref; -+ struct kutf_suite *suite; -+ struct kutf_test_fixture *test_fix; -+ struct kutf_mempool fixture_pool; -+ void *fixture; -+ unsigned int fixture_index; -+ const char *fixture_name; -+ union kutf_callback_data test_data; -+ struct kutf_result_set *result_set; -+ enum kutf_result_status status; -+ enum kutf_result_status expected_status; -+ void *userdata_consumer_priv; -+ void *userdata_producer_priv; -+ struct dentry *userdata_dentry; -+}; ++void kbase_pm_update_cores_state_nolock(struct kbase_device *kbdev); + +/** -+ * struct kutf_suite - Structure representing a kernel test suite -+ * @app: The application this suite belongs to. -+ * @name: The name of this suite. -+ * @suite_data: Any user private data associated with this -+ * suite. -+ * @create_fixture: Function used to create a new fixture instance -+ * @remove_fixture: Function used to destroy a new fixture instance -+ * @fixture_variants: The number of variants (must be at least 1). -+ * @suite_default_flags: Suite global filter flags which are set on -+ * all tests. -+ * @node: List node for suite_list -+ * @dir: The debugfs directory for this suite -+ * @test_list: List head to store all the tests which are -+ * part of this suite ++ * kbase_pm_update_cores_state - Update the desired state of shader cores from ++ * the Power Policy, and begin any power ++ * transitions. ++ * ++ * This function will update the desired_xx_state members of ++ * struct kbase_pm_device_data by calling into the current Power Policy. It will ++ * then begin power transitions to make the hardware acheive the desired shader ++ * core state. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+struct kutf_suite { -+ struct kutf_application *app; -+ const char *name; -+ union kutf_callback_data suite_data; -+ void *(*create_fixture)(struct kutf_context *context); -+ void (*remove_fixture)(struct kutf_context *context); -+ unsigned int fixture_variants; -+ unsigned int suite_default_flags; -+ struct list_head node; -+ struct dentry *dir; -+ struct list_head test_list; -+}; -+ -+/* ============================================================================ -+ Application functions -+============================================================================ */ ++void kbase_pm_update_cores_state(struct kbase_device *kbdev); + +/** -+ * kutf_create_application() - Create an in kernel test application. -+ * @name: The name of the test application. ++ * kbase_pm_cancel_deferred_poweroff - Cancel any pending requests to power off ++ * the GPU and/or shader cores. + * -+ * Return: pointer to the kutf_application on success or NULL -+ * on failure ++ * This should be called by any functions which directly power off the GPU. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+struct kutf_application *kutf_create_application(const char *name); ++void kbase_pm_cancel_deferred_poweroff(struct kbase_device *kbdev); + +/** -+ * kutf_destroy_application() - Destroy an in kernel test application. ++ * kbasep_pm_init_core_use_bitmaps - Initialise data tracking the required ++ * and used cores. + * -+ * @app: The test application to destroy. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+void kutf_destroy_application(struct kutf_application *app); -+ -+/* ============================================================================ -+ Suite functions -+============================================================================ */ ++void kbasep_pm_init_core_use_bitmaps(struct kbase_device *kbdev); + +/** -+ * kutf_create_suite() - Create a kernel test suite. -+ * @app: The test application to create the suite in. -+ * @name: The name of the suite. -+ * @fixture_count: The number of fixtures to run over the test -+ * functions in this suite -+ * @create_fixture: Callback used to create a fixture. The returned value -+ * is stored in the fixture pointer in the context for -+ * use in the test functions. -+ * @remove_fixture: Callback used to remove a previously created fixture. ++ * kbasep_pm_metrics_init - Initialize the metrics gathering framework. + * -+ * Suite names must be unique. Should two suites with the same name be -+ * registered with the same application then this function will fail, if they -+ * are registered with different applications then the function will not detect -+ * this and the call will succeed. ++ * This must be called before other metric gathering APIs are called. + * -+ * Return: pointer to the created kutf_suite on success or NULL -+ * on failure ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Return: 0 on success, error code on error + */ -+struct kutf_suite *kutf_create_suite( -+ struct kutf_application *app, -+ const char *name, -+ unsigned int fixture_count, -+ void *(*create_fixture)(struct kutf_context *context), -+ void (*remove_fixture)(struct kutf_context *context)); ++int kbasep_pm_metrics_init(struct kbase_device *kbdev); + +/** -+ * kutf_create_suite_with_filters() - Create a kernel test suite with user -+ * defined default filters. -+ * @app: The test application to create the suite in. -+ * @name: The name of the suite. -+ * @fixture_count: The number of fixtures to run over the test -+ * functions in this suite -+ * @create_fixture: Callback used to create a fixture. The returned value -+ * is stored in the fixture pointer in the context for -+ * use in the test functions. -+ * @remove_fixture: Callback used to remove a previously created fixture. -+ * @filters: Filters to apply to a test if it doesn't provide its own ++ * kbasep_pm_metrics_term - Terminate the metrics gathering framework. + * -+ * Suite names must be unique. Should two suites with the same name be -+ * registered with the same application then this function will fail, if they -+ * are registered with different applications then the function will not detect -+ * this and the call will succeed. ++ * This must be called when metric gathering is no longer required. It is an ++ * error to call any metrics gathering function (other than ++ * kbasep_pm_metrics_init()) after calling this function. + * -+ * Return: pointer to the created kutf_suite on success or NULL on failure ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+struct kutf_suite *kutf_create_suite_with_filters( -+ struct kutf_application *app, -+ const char *name, -+ unsigned int fixture_count, -+ void *(*create_fixture)(struct kutf_context *context), -+ void (*remove_fixture)(struct kutf_context *context), -+ unsigned int filters); ++void kbasep_pm_metrics_term(struct kbase_device *kbdev); + +/** -+ * kutf_create_suite_with_filters_and_data() - Create a kernel test suite with -+ * user defined default filters. -+ * @app: The test application to create the suite in. -+ * @name: The name of the suite. -+ * @fixture_count: The number of fixtures to run over the test -+ * functions in this suite -+ * @create_fixture: Callback used to create a fixture. The returned value -+ * is stored in the fixture pointer in the context for -+ * use in the test functions. -+ * @remove_fixture: Callback used to remove a previously created fixture. -+ * @filters: Filters to apply to a test if it doesn't provide its own -+ * @suite_data: Suite specific callback data, provided during the -+ * running of the test in the kutf_context ++ * kbase_pm_report_vsync - Function to be called by the frame buffer driver to ++ * update the vsync metric. + * -+ * Return: pointer to the created kutf_suite on success or NULL -+ * on failure -+ */ -+struct kutf_suite *kutf_create_suite_with_filters_and_data( -+ struct kutf_application *app, -+ const char *name, -+ unsigned int fixture_count, -+ void *(*create_fixture)(struct kutf_context *context), -+ void (*remove_fixture)(struct kutf_context *context), -+ unsigned int filters, -+ union kutf_callback_data suite_data); -+ -+/** -+ * kutf_add_test() - Add a test to a kernel test suite. -+ * @suite: The suite to add the test to. -+ * @id: The ID of the test. -+ * @name: The name of the test. -+ * @execute: Callback to the test function to run. ++ * This function should be called by the frame buffer driver to update whether ++ * the system is hitting the vsync target or not. buffer_updated should be true ++ * if the vsync corresponded with a new frame being displayed, otherwise it ++ * should be false. This function does not need to be called every vsync, but ++ * only when the value of @buffer_updated differs from a previous call. + * -+ * Note: As no filters are provided the test will use the suite filters instead -+ */ -+void kutf_add_test(struct kutf_suite *suite, -+ unsigned int id, -+ const char *name, -+ void (*execute)(struct kutf_context *context)); -+ -+/** -+ * kutf_add_test_with_filters() - Add a test to a kernel test suite with filters -+ * @suite: The suite to add the test to. -+ * @id: The ID of the test. -+ * @name: The name of the test. -+ * @execute: Callback to the test function to run. -+ * @filters: A set of filtering flags, assigning test categories. ++ * @kbdev: The kbase device structure for the device (must be a ++ * valid pointer) ++ * @buffer_updated: True if the buffer has been updated on this VSync, ++ * false otherwise + */ -+void kutf_add_test_with_filters(struct kutf_suite *suite, -+ unsigned int id, -+ const char *name, -+ void (*execute)(struct kutf_context *context), -+ unsigned int filters); ++void kbase_pm_report_vsync(struct kbase_device *kbdev, int buffer_updated); + +/** -+ * kutf_add_test_with_filters_and_data() - Add a test to a kernel test suite -+ * with filters. -+ * @suite: The suite to add the test to. -+ * @id: The ID of the test. -+ * @name: The name of the test. -+ * @execute: Callback to the test function to run. -+ * @filters: A set of filtering flags, assigning test categories. -+ * @test_data: Test specific callback data, provided during the -+ * running of the test in the kutf_context ++ * kbase_pm_get_dvfs_action - Determine whether the DVFS system should change ++ * the clock speed of the GPU. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * This function should be called regularly by the DVFS system to check whether ++ * the clock speed of the GPU needs updating. + */ -+void kutf_add_test_with_filters_and_data( -+ struct kutf_suite *suite, -+ unsigned int id, -+ const char *name, -+ void (*execute)(struct kutf_context *context), -+ unsigned int filters, -+ union kutf_callback_data test_data); ++void kbase_pm_get_dvfs_action(struct kbase_device *kbdev); + +/** -+ * kutf_add_test_with_filters_data_and_userdata() - Add a test to a kernel test suite with filters and setup for -+ * receiving data from userside -+ * @suite: The suite to add the test to. -+ * @id: The ID of the test. -+ * @name: The name of the test. -+ * @execute: Callback to the test function to run. -+ * @filters: A set of filtering flags, assigning test categories. -+ * @test_data: Test specific callback data, provided during the -+ * running of the test in the kutf_context -+ * @userdata_ops: Callbacks to use for sending and receiving data to -+ * userspace. A copy of the struct kutf_userdata_ops is -+ * taken. Each callback can be NULL. ++ * kbase_pm_request_gpu_cycle_counter - Mark that the GPU cycle counter is ++ * needed ++ * ++ * If the caller is the first caller then the GPU cycle counters will be enabled ++ * along with the l2 cache ++ * ++ * The GPU must be powered when calling this function (i.e. ++ * kbase_pm_context_active() must have been called). + * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+void kutf_add_test_with_filters_data_and_userdata( -+ struct kutf_suite *suite, -+ unsigned int id, -+ const char *name, -+ void (*execute)(struct kutf_context *context), -+ unsigned int filters, -+ union kutf_callback_data test_data, -+ struct kutf_userdata_ops *userdata_ops); -+ ++void kbase_pm_request_gpu_cycle_counter(struct kbase_device *kbdev); + -+/* ============================================================================ -+ Test functions -+============================================================================ */ +/** -+ * kutf_test_log_result_external() - Log a result which has been created -+ * externally into a in a standard form -+ * recognized by the log parser. -+ * @context: The test context the test is running in -+ * @message: The message for this result -+ * @new_status: The result status of this log message ++ * kbase_pm_request_gpu_cycle_counter_l2_is_on - Mark GPU cycle counter is ++ * needed (l2 cache already on) ++ * ++ * This is a version of the above function ++ * (kbase_pm_request_gpu_cycle_counter()) suitable for being called when the ++ * l2 cache is known to be on and assured to be on until the subsequent call of ++ * kbase_pm_release_gpu_cycle_counter() such as when a job is submitted. It does ++ * not sleep and can be called from atomic functions. ++ * ++ * The GPU must be powered when calling this function (i.e. ++ * kbase_pm_context_active() must have been called) and the l2 cache must be ++ * powered on. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+void kutf_test_log_result_external( -+ struct kutf_context *context, -+ const char *message, -+ enum kutf_result_status new_status); ++void kbase_pm_request_gpu_cycle_counter_l2_is_on(struct kbase_device *kbdev); + +/** -+ * kutf_test_expect_abort() - Tell the kernel that you expect the current -+ * fixture to produce an abort. -+ * @context: The test context this test is running in. ++ * kbase_pm_release_gpu_cycle_counter - Mark that the GPU cycle counter is no ++ * longer in use ++ * ++ * If the caller is the last caller then the GPU cycle counters will be ++ * disabled. A request must have been made before a call to this. ++ * ++ * Caller must not hold the hwaccess_lock, as it will be taken in this function. ++ * If the caller is already holding this lock then ++ * kbase_pm_release_gpu_cycle_counter_nolock() must be used instead. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+void kutf_test_expect_abort(struct kutf_context *context); ++void kbase_pm_release_gpu_cycle_counter(struct kbase_device *kbdev); + +/** -+ * kutf_test_expect_fatal() - Tell the kernel that you expect the current -+ * fixture to produce a fatal error. -+ * @context: The test context this test is running in. ++ * kbase_pm_release_gpu_cycle_counter_nolock - Version of kbase_pm_release_gpu_cycle_counter() ++ * that does not take hwaccess_lock ++ * ++ * Caller must hold the hwaccess_lock. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+void kutf_test_expect_fatal(struct kutf_context *context); ++void kbase_pm_release_gpu_cycle_counter_nolock(struct kbase_device *kbdev); + +/** -+ * kutf_test_expect_fail() - Tell the kernel that you expect the current -+ * fixture to fail. -+ * @context: The test context this test is running in. ++ * kbase_pm_wait_for_poweroff_complete - Wait for the poweroff workqueue to ++ * complete ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+void kutf_test_expect_fail(struct kutf_context *context); ++void kbase_pm_wait_for_poweroff_complete(struct kbase_device *kbdev); + +/** -+ * kutf_test_expect_warn() - Tell the kernel that you expect the current -+ * fixture to produce a warning. -+ * @context: The test context this test is running in. ++ * kbase_pm_register_access_enable - Enable access to GPU registers ++ * ++ * Enables access to the GPU registers before power management has powered up ++ * the GPU with kbase_pm_powerup(). ++ * ++ * Access to registers should be done using kbase_os_reg_read()/write() at this ++ * stage, not kbase_reg_read()/write(). ++ * ++ * This results in the power management callbacks provided in the driver ++ * configuration to get called to turn on power and/or clocks to the GPU. See ++ * kbase_pm_callback_conf. ++ * ++ * This should only be used before power management is powered up with ++ * kbase_pm_powerup() ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+void kutf_test_expect_warn(struct kutf_context *context); ++void kbase_pm_register_access_enable(struct kbase_device *kbdev); + +/** -+ * kutf_test_expect_pass() - Tell the kernel that you expect the current -+ * fixture to pass. -+ * @context: The test context this test is running in. ++ * kbase_pm_register_access_disable - Disable early register access ++ * ++ * Disables access to the GPU registers enabled earlier by a call to ++ * kbase_pm_register_access_enable(). ++ * ++ * This results in the power management callbacks provided in the driver ++ * configuration to get called to turn off power and/or clocks to the GPU. See ++ * kbase_pm_callback_conf ++ * ++ * This should only be used before power management is powered up with ++ * kbase_pm_powerup() ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+void kutf_test_expect_pass(struct kutf_context *context); ++void kbase_pm_register_access_disable(struct kbase_device *kbdev); + -+/** -+ * kutf_test_skip() - Tell the kernel that the test should be skipped. -+ * @context: The test context this test is running in. -+ */ -+void kutf_test_skip(struct kutf_context *context); ++/* NOTE: kbase_pm_is_suspending is in mali_kbase.h, because it is an inline ++ * function */ + +/** -+ * kutf_test_skip_msg() - Tell the kernel that this test has been skipped, -+ * supplying a reason string. -+ * @context: The test context this test is running in. -+ * @message: A message string containing the reason for the skip. ++ * kbase_pm_metrics_is_active - Check if the power management metrics ++ * collection is active. + * -+ * Note: The message must not be freed during the lifetime of the test run. -+ * This means it should either be a prebaked string, or if a dynamic string -+ * is required it must be created with kutf_dsprintf which will store -+ * the resultant string in a buffer who's lifetime is the same as the test run. -+ */ -+void kutf_test_skip_msg(struct kutf_context *context, const char *message); -+ -+/** -+ * kutf_test_pass() - Tell the kernel that this test has passed. -+ * @context: The test context this test is running in. -+ * @message: A message string containing the reason for the pass. ++ * Note that this returns if the power management metrics collection was ++ * active at the time of calling, it is possible that after the call the metrics ++ * collection enable may have changed state. + * -+ * Note: The message must not be freed during the lifetime of the test run. -+ * This means it should either be a pre-baked string, or if a dynamic string -+ * is required it must be created with kutf_dsprintf which will store -+ * the resultant string in a buffer who's lifetime is the same as the test run. ++ * The caller must handle the consequence that the state may have changed. ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * Return: true if metrics collection was active else false. + */ -+void kutf_test_pass(struct kutf_context *context, char const *message); ++bool kbase_pm_metrics_is_active(struct kbase_device *kbdev); + +/** -+ * kutf_test_debug() - Send a debug message -+ * @context: The test context this test is running in. -+ * @message: A message string containing the debug information. ++ * kbase_pm_do_poweron - Power on the GPU, and any cores that are requested. + * -+ * Note: The message must not be freed during the lifetime of the test run. -+ * This means it should either be a pre-baked string, or if a dynamic string -+ * is required it must be created with kutf_dsprintf which will store -+ * the resultant string in a buffer who's lifetime is the same as the test run. ++ * @kbdev: The kbase device structure for the device (must be a valid ++ * pointer) ++ * @is_resume: true if power on due to resume after suspend, ++ * false otherwise + */ -+void kutf_test_debug(struct kutf_context *context, char const *message); ++void kbase_pm_do_poweron(struct kbase_device *kbdev, bool is_resume); + +/** -+ * kutf_test_info() - Send an information message -+ * @context: The test context this test is running in. -+ * @message: A message string containing the information message. ++ * kbase_pm_do_poweroff - Power off the GPU, and any cores that have been ++ * requested. + * -+ * Note: The message must not be freed during the lifetime of the test run. -+ * This means it should either be a pre-baked string, or if a dynamic string -+ * is required it must be created with kutf_dsprintf which will store -+ * the resultant string in a buffer who's lifetime is the same as the test run. ++ * @kbdev: The kbase device structure for the device (must be a valid ++ * pointer) ++ * @is_suspend: true if power off due to suspend, ++ * false otherwise + */ -+void kutf_test_info(struct kutf_context *context, char const *message); ++void kbase_pm_do_poweroff(struct kbase_device *kbdev, bool is_suspend); ++ ++#if defined(CONFIG_MALI_DEVFREQ) || defined(CONFIG_MALI_MIDGARD_DVFS) ++void kbase_pm_get_dvfs_utilisation(struct kbase_device *kbdev, ++ unsigned long *total, unsigned long *busy); ++void kbase_pm_reset_dvfs_utilisation(struct kbase_device *kbdev); ++#endif /* defined(CONFIG_MALI_DEVFREQ) || defined(CONFIG_MALI_MIDGARD_DVFS) */ ++ ++#ifdef CONFIG_MALI_MIDGARD_DVFS + +/** -+ * kutf_test_warn() - Send a warning message -+ * @context: The test context this test is running in. -+ * @message: A message string containing the warning message. ++ * kbase_platform_dvfs_event - Report utilisation to DVFS code + * -+ * Note: The message must not be freed during the lifetime of the test run. -+ * This means it should either be a pre-baked string, or if a dynamic string -+ * is required it must be created with kutf_dsprintf which will store -+ * the resultant string in a buffer who's lifetime is the same as the test run. ++ * Function provided by platform specific code when DVFS is enabled to allow ++ * the power management metrics system to report utilisation. ++ * ++ * @kbdev: The kbase device structure for the device (must be a ++ * valid pointer) ++ * @utilisation: The current calculated utilisation by the metrics system. ++ * @util_gl_share: The current calculated gl share of utilisation. ++ * @util_cl_share: The current calculated cl share of utilisation per core ++ * group. ++ * Return: Returns 0 on failure and non zero on success. + */ -+void kutf_test_warn(struct kutf_context *context, char const *message); ++ ++int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, ++ u32 util_gl_share, u32 util_cl_share[2]); ++#endif ++ ++void kbase_pm_power_changed(struct kbase_device *kbdev); + +/** -+ * kutf_test_fail() - Tell the kernel that a test has failed -+ * @context: The test context this test is running in. -+ * @message: A message string containing the failure message. ++ * kbase_pm_metrics_update - Inform the metrics system that an atom is either ++ * about to be run or has just completed. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @now: Pointer to the timestamp of the change, or NULL to use current time + * -+ * Note: The message must not be freed during the lifetime of the test run. -+ * This means it should either be a pre-baked string, or if a dynamic string -+ * is required it must be created with kutf_dsprintf which will store -+ * the resultant string in a buffer who's lifetime is the same as the test run. ++ * Caller must hold hwaccess_lock + */ -+void kutf_test_fail(struct kutf_context *context, char const *message); ++void kbase_pm_metrics_update(struct kbase_device *kbdev, ++ ktime_t *now); + +/** -+ * kutf_test_fatal() - Tell the kernel that a test has triggered a fatal error -+ * @context: The test context this test is running in. -+ * @message: A message string containing the fatal error message. ++ * kbase_pm_cache_snoop_enable - Allow CPU snoops on the GPU ++ * If the GPU does not have coherency this is a no-op ++ * @kbdev: Device pointer + * -+ * Note: The message must not be freed during the lifetime of the test run. -+ * This means it should either be a pre-baked string, or if a dynamic string -+ * is required it must be created with kutf_dsprintf which will store -+ * the resultant string in a buffer who's lifetime is the same as the test run. ++ * This function should be called after L2 power up. + */ -+void kutf_test_fatal(struct kutf_context *context, char const *message); ++ ++void kbase_pm_cache_snoop_enable(struct kbase_device *kbdev); + +/** -+ * kutf_test_abort() - Tell the kernel that a test triggered an abort in the test ++ * kbase_pm_cache_snoop_disable - Prevent CPU snoops on the GPU ++ * If the GPU does not have coherency this is a no-op ++ * @kbdev: Device pointer + * -+ * @context: The test context this test is running in. ++ * This function should be called before L2 power off. + */ -+void kutf_test_abort(struct kutf_context *context); ++void kbase_pm_cache_snoop_disable(struct kbase_device *kbdev); + -+#endif /* _KERNEL_UTF_SUITE_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_utils.h b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_utils.h ++#endif /* _KBASE_BACKEND_PM_INTERNAL_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c new file mode 100755 -index 000000000000..c458c1f73802 +index 000000000..024248ca7 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_utils.h -@@ -0,0 +1,55 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c +@@ -0,0 +1,401 @@ +/* + * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -335951,1591 +372124,1378 @@ index 000000000000..c458c1f73802 + + + -+#ifndef _KERNEL_UTF_UTILS_H_ -+#define _KERNEL_UTF_UTILS_H_ + -+/* kutf_utils.h -+ * Utilities for the kernel UTF test infrastructure. -+ * -+ * This collection of library functions are provided for use by kernel UTF -+ * and users of kernel UTF which don't directly fit within the other -+ * code modules. ++ ++/* ++ * Metrics for power management + */ + -+#include ++#include ++#include ++#include ++#include + -+/** -+ * Maximum size of the message strings within kernel UTF, messages longer then -+ * this will be truncated. -+ */ -+#define KUTF_MAX_DSPRINTF_LEN 1024 ++/* When VSync is being hit aim for utilisation between 70-90% */ ++#define KBASE_PM_VSYNC_MIN_UTILISATION 70 ++#define KBASE_PM_VSYNC_MAX_UTILISATION 90 ++/* Otherwise aim for 10-40% */ ++#define KBASE_PM_NO_VSYNC_MIN_UTILISATION 10 ++#define KBASE_PM_NO_VSYNC_MAX_UTILISATION 40 + -+/** -+ * kutf_dsprintf() - dynamic sprintf -+ * @pool: memory pool to allocate from -+ * @fmt: The format string describing the string to document. -+ * @... The parameters to feed in to the format string. -+ * -+ * This function implements sprintf which dynamically allocates memory to store -+ * the string. The library will free the memory containing the string when the -+ * result set is cleared or destroyed. -+ * -+ * Note The returned string may be truncated to fit an internal temporary -+ * buffer, which is KUTF_MAX_DSPRINTF_LEN bytes in length. -+ * -+ * Return: Returns pointer to allocated string, or NULL on error. -+ */ -+const char *kutf_dsprintf(struct kutf_mempool *pool, -+ const char *fmt, ...); ++/* Shift used for kbasep_pm_metrics_data.time_busy/idle - units of (1 << 8) ns ++ * This gives a maximum period between samples of 2^(32+8)/100 ns = slightly ++ * under 11s. Exceeding this will cause overflow */ ++#define KBASE_PM_TIME_SHIFT 8 + -+#endif /* _KERNEL_UTF_UTILS_H_ */ -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Kbuild b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Kbuild -new file mode 100755 -index 000000000000..97f80057224f ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Kbuild -@@ -0,0 +1,20 @@ -+# -+# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++/* Maximum time between sampling of utilization data, without resetting the ++ * counters. */ ++#define MALI_UTILIZATION_MAX_PERIOD 100000 /* ns = 100ms */ + ++#ifdef CONFIG_MALI_MIDGARD_DVFS ++static enum hrtimer_restart dvfs_callback(struct hrtimer *timer) ++{ ++ unsigned long flags; ++ struct kbasep_pm_metrics_data *metrics; + -+ccflags-y += -I$(src)/../include ++ KBASE_DEBUG_ASSERT(timer != NULL); + -+obj-$(CONFIG_MALI_KUTF) += kutf.o ++ metrics = container_of(timer, struct kbasep_pm_metrics_data, timer); ++ kbase_pm_get_dvfs_action(metrics->kbdev); + -+kutf-y := kutf_mem.o kutf_resultset.o kutf_suite.o kutf_utils.o kutf_helpers.o kutf_helpers_user.o -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Kconfig b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Kconfig -new file mode 100755 -index 000000000000..6a87bdbf746e ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Kconfig -@@ -0,0 +1,22 @@ -+# -+# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++ spin_lock_irqsave(&metrics->lock, flags); + ++ if (metrics->timer_active) ++ hrtimer_start(timer, ++ HR_TIMER_DELAY_MSEC(metrics->kbdev->pm.dvfs_period), ++ HRTIMER_MODE_REL); + ++ spin_unlock_irqrestore(&metrics->lock, flags); + -+config MALI_KUTF -+ tristate "Mali Kernel Unit Test Framework" -+ default m -+ help -+ Enables MALI testing framework. To compile it as a module, -+ choose M here - this will generate a single module called kutf. -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Makefile b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Makefile -new file mode 100755 -index 000000000000..010c92ca39b9 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Makefile -@@ -0,0 +1,29 @@ -+# -+# (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++ return HRTIMER_NORESTART; ++} ++#endif /* CONFIG_MALI_MIDGARD_DVFS */ + ++int kbasep_pm_metrics_init(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+# linux build system bootstrap for out-of-tree module ++ kbdev->pm.backend.metrics.kbdev = kbdev; + -+# default to building for the host -+ARCH ?= $(shell uname -m) ++ kbdev->pm.backend.metrics.time_period_start = ktime_get(); ++ kbdev->pm.backend.metrics.time_busy = 0; ++ kbdev->pm.backend.metrics.time_idle = 0; ++ kbdev->pm.backend.metrics.prev_busy = 0; ++ kbdev->pm.backend.metrics.prev_idle = 0; ++ kbdev->pm.backend.metrics.gpu_active = false; ++ kbdev->pm.backend.metrics.active_cl_ctx[0] = 0; ++ kbdev->pm.backend.metrics.active_cl_ctx[1] = 0; ++ kbdev->pm.backend.metrics.active_gl_ctx[0] = 0; ++ kbdev->pm.backend.metrics.active_gl_ctx[1] = 0; ++ kbdev->pm.backend.metrics.busy_cl[0] = 0; ++ kbdev->pm.backend.metrics.busy_cl[1] = 0; ++ kbdev->pm.backend.metrics.busy_gl = 0; + -+ifeq ($(KDIR),) -+$(error Must specify KDIR to point to the kernel to target)) -+endif ++ spin_lock_init(&kbdev->pm.backend.metrics.lock); + -+all: -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) $(SCONS_CONFIGS) EXTRA_CFLAGS=-I$(CURDIR)/../include modules ++#ifdef CONFIG_MALI_MIDGARD_DVFS ++ kbdev->pm.backend.metrics.timer_active = true; ++ hrtimer_init(&kbdev->pm.backend.metrics.timer, CLOCK_MONOTONIC, ++ HRTIMER_MODE_REL); ++ kbdev->pm.backend.metrics.timer.function = dvfs_callback; + -+clean: -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_helpers.c b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_helpers.c -new file mode 100755 -index 000000000000..793d58c789ff ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_helpers.c -@@ -0,0 +1,768 @@ -+/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ hrtimer_start(&kbdev->pm.backend.metrics.timer, ++ HR_TIMER_DELAY_MSEC(kbdev->pm.dvfs_period), ++ HRTIMER_MODE_REL); ++#endif /* CONFIG_MALI_MIDGARD_DVFS */ + ++ return 0; ++} + ++KBASE_EXPORT_TEST_API(kbasep_pm_metrics_init); + -+/* Kernel UTF test helpers */ -+#include ++void kbasep_pm_metrics_term(struct kbase_device *kbdev) ++{ ++#ifdef CONFIG_MALI_MIDGARD_DVFS ++ unsigned long flags; + -+/* 10s timeout for user thread to open the 'data' file once the test is started */ -+#define USERDATA_WAIT_TIMEOUT_MS 10000 -+#include -+#include -+#include -+#include -+#include -+#include ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + ++ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); ++ kbdev->pm.backend.metrics.timer_active = false; ++ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); ++ ++ hrtimer_cancel(&kbdev->pm.backend.metrics.timer); ++#endif /* CONFIG_MALI_MIDGARD_DVFS */ ++} ++ ++KBASE_EXPORT_TEST_API(kbasep_pm_metrics_term); + -+int kutf_helper_textbuf_init(struct kutf_helper_textbuf *textbuf, -+ struct kutf_mempool *mempool, int max_line_size, -+ int max_nr_lines) ++/* caller needs to hold kbdev->pm.backend.metrics.lock before calling this ++ * function ++ */ ++static void kbase_pm_get_dvfs_utilisation_calc(struct kbase_device *kbdev, ++ ktime_t now) +{ -+ textbuf->scratchpad = kutf_mempool_alloc(mempool, max_line_size); ++ ktime_t diff; + -+ if (!textbuf->scratchpad) -+ return -ENOMEM; ++ lockdep_assert_held(&kbdev->pm.backend.metrics.lock); ++ ++ diff = ktime_sub(now, kbdev->pm.backend.metrics.time_period_start); ++ if (ktime_to_ns(diff) < 0) ++ return; + -+ mutex_init(&textbuf->lock); -+ textbuf->nr_user_clients = 0; -+ textbuf->mempool = mempool; -+ textbuf->used_bytes = 0; -+ textbuf->prev_pos = 0; -+ textbuf->prev_line_pos = 0; -+ INIT_LIST_HEAD(&textbuf->textbuf_list); -+ textbuf->max_line_size = max_line_size; -+ textbuf->max_nr_lines = max_nr_lines; -+ textbuf->nr_lines = 0; -+ textbuf->flags = 0ul; -+ init_waitqueue_head(&textbuf->user_opened_wq); -+ init_waitqueue_head(&textbuf->not_full_wq); -+ init_waitqueue_head(&textbuf->not_empty_wq); ++ if (kbdev->pm.backend.metrics.gpu_active) { ++ u32 ns_time = (u32) (ktime_to_ns(diff) >> KBASE_PM_TIME_SHIFT); + -+ return 0; ++ kbdev->pm.backend.metrics.time_busy += ns_time; ++ if (kbdev->pm.backend.metrics.active_cl_ctx[0]) ++ kbdev->pm.backend.metrics.busy_cl[0] += ns_time; ++ if (kbdev->pm.backend.metrics.active_cl_ctx[1]) ++ kbdev->pm.backend.metrics.busy_cl[1] += ns_time; ++ if (kbdev->pm.backend.metrics.active_gl_ctx[0]) ++ kbdev->pm.backend.metrics.busy_gl += ns_time; ++ if (kbdev->pm.backend.metrics.active_gl_ctx[1]) ++ kbdev->pm.backend.metrics.busy_gl += ns_time; ++ } else { ++ kbdev->pm.backend.metrics.time_idle += (u32) (ktime_to_ns(diff) ++ >> KBASE_PM_TIME_SHIFT); ++ } ++ ++ kbdev->pm.backend.metrics.time_period_start = now; +} -+EXPORT_SYMBOL(kutf_helper_textbuf_init); + -+/** -+ * kutf_helper_textbuf_open() - Notify that userspace has opened the 'data' -+ * file for a textbuf -+ * -+ * @priv: private pointer from a kutf_userdata_exchange, which -+ * should be a pointer to a struct kutf_helper_textbuf -+ * -+ * Return: 0 on success, or negative value on error. ++#if defined(CONFIG_MALI_DEVFREQ) || defined(CONFIG_MALI_MIDGARD_DVFS) ++/* Caller needs to hold kbdev->pm.backend.metrics.lock before calling this ++ * function. + */ -+static int kutf_helper_textbuf_open(void *priv) ++static void kbase_pm_reset_dvfs_utilisation_unlocked(struct kbase_device *kbdev, ++ ktime_t now) +{ -+ struct kutf_helper_textbuf *textbuf = priv; -+ int ret; ++ /* Store previous value */ ++ kbdev->pm.backend.metrics.prev_idle = ++ kbdev->pm.backend.metrics.time_idle; ++ kbdev->pm.backend.metrics.prev_busy = ++ kbdev->pm.backend.metrics.time_busy; + -+ ret = mutex_lock_interruptible(&textbuf->lock); -+ if (ret) -+ return -ERESTARTSYS; ++ /* Reset current values */ ++ kbdev->pm.backend.metrics.time_period_start = now; ++ kbdev->pm.backend.metrics.time_idle = 0; ++ kbdev->pm.backend.metrics.time_busy = 0; ++ kbdev->pm.backend.metrics.busy_cl[0] = 0; ++ kbdev->pm.backend.metrics.busy_cl[1] = 0; ++ kbdev->pm.backend.metrics.busy_gl = 0; ++} + -+ ++(textbuf->nr_user_clients); -+ wake_up(&textbuf->user_opened_wq); ++void kbase_pm_reset_dvfs_utilisation(struct kbase_device *kbdev) ++{ ++ unsigned long flags; + -+ mutex_unlock(&textbuf->lock); -+ return ret; ++ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); ++ kbase_pm_reset_dvfs_utilisation_unlocked(kbdev, ktime_get()); ++ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); +} + -+/** -+ * kutf_helper_textbuf_release() - Notify that userspace has closed the 'data' -+ * file for a textbuf -+ * -+ * @priv: private pointer from a kutf_userdata_exchange, which -+ * should be a pointer to a struct kutf_helper_textbuf -+ */ -+static void kutf_helper_textbuf_release(void *priv) ++void kbase_pm_get_dvfs_utilisation(struct kbase_device *kbdev, ++ unsigned long *total_out, unsigned long *busy_out) +{ -+ struct kutf_helper_textbuf *textbuf = priv; ++ ktime_t now = ktime_get(); ++ unsigned long flags, busy, total; ++ ++ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); ++ kbase_pm_get_dvfs_utilisation_calc(kbdev, now); + -+ /* Shouldn't use interruptible variants here because if a signal is -+ * pending, we can't abort and restart the call */ -+ mutex_lock(&textbuf->lock); ++ busy = kbdev->pm.backend.metrics.time_busy; ++ total = busy + kbdev->pm.backend.metrics.time_idle; + -+ --(textbuf->nr_user_clients); -+ if (!textbuf->nr_user_clients) { -+ /* All clients disconnected, wakeup kernel-side waiters */ -+ wake_up(&textbuf->not_full_wq); -+ wake_up(&textbuf->not_empty_wq); ++ /* Reset stats if older than MALI_UTILIZATION_MAX_PERIOD (default ++ * 100ms) */ ++ if (total >= MALI_UTILIZATION_MAX_PERIOD) { ++ kbase_pm_reset_dvfs_utilisation_unlocked(kbdev, now); ++ } else if (total < (MALI_UTILIZATION_MAX_PERIOD / 2)) { ++ total += kbdev->pm.backend.metrics.prev_idle + ++ kbdev->pm.backend.metrics.prev_busy; ++ busy += kbdev->pm.backend.metrics.prev_busy; + } + -+ mutex_unlock(&textbuf->lock); ++ *total_out = total; ++ *busy_out = busy; ++ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); +} ++#endif + -+/** -+ * kutf_helper_textbuf_notify_test_ended() - Notify that the test has ended -+ * -+ * @priv: private pointer from a kutf_userdata_exchange, which -+ * should be a pointer to a struct kutf_helper_textbuf -+ * -+ * After this call, userspace should be allowed to finish remaining reads but -+ * not make new ones, and not be allowed to make new writes. ++#ifdef CONFIG_MALI_MIDGARD_DVFS ++ ++/* caller needs to hold kbdev->pm.backend.metrics.lock before calling this ++ * function + */ -+static void kutf_helper_textbuf_notify_test_ended(void *priv) ++int kbase_pm_get_dvfs_utilisation_old(struct kbase_device *kbdev, ++ int *util_gl_share, ++ int util_cl_share[2], ++ ktime_t now) +{ -+ struct kutf_helper_textbuf *textbuf = priv; ++ int utilisation; ++ int busy; ++ ++ kbase_pm_get_dvfs_utilisation_calc(kbdev, now); ++ ++ if (kbdev->pm.backend.metrics.time_idle + ++ kbdev->pm.backend.metrics.time_busy == 0) { ++ /* No data - so we return NOP */ ++ utilisation = -1; ++ if (util_gl_share) ++ *util_gl_share = -1; ++ if (util_cl_share) { ++ util_cl_share[0] = -1; ++ util_cl_share[1] = -1; ++ } ++ goto out; ++ } + -+ /* Shouldn't use interruptible variants here because if a signal is -+ * pending, we can't abort and restart the call */ -+ mutex_lock(&textbuf->lock); ++ utilisation = (100 * kbdev->pm.backend.metrics.time_busy) / ++ (kbdev->pm.backend.metrics.time_idle + ++ kbdev->pm.backend.metrics.time_busy); + -+ textbuf->flags |= KUTF_HELPER_TEXTBUF_FLAG_DYING; ++ busy = kbdev->pm.backend.metrics.busy_gl + ++ kbdev->pm.backend.metrics.busy_cl[0] + ++ kbdev->pm.backend.metrics.busy_cl[1]; + -+ /* Consumers waiting due to being full should wake up and abort */ -+ wake_up(&textbuf->not_full_wq); -+ /* Producers waiting due to being empty should wake up and abort */ -+ wake_up(&textbuf->not_empty_wq); ++ if (busy != 0) { ++ if (util_gl_share) ++ *util_gl_share = ++ (100 * kbdev->pm.backend.metrics.busy_gl) / ++ busy; ++ if (util_cl_share) { ++ util_cl_share[0] = ++ (100 * kbdev->pm.backend.metrics.busy_cl[0]) / ++ busy; ++ util_cl_share[1] = ++ (100 * kbdev->pm.backend.metrics.busy_cl[1]) / ++ busy; ++ } ++ } else { ++ if (util_gl_share) ++ *util_gl_share = -1; ++ if (util_cl_share) { ++ util_cl_share[0] = -1; ++ util_cl_share[1] = -1; ++ } ++ } + -+ mutex_unlock(&textbuf->lock); ++out: ++ return utilisation; +} + -+/* Collect text in a textbuf scratchpad up to (but excluding) specified -+ * newline_off, and add it as a textbuf_line -+ * -+ * newline_off is permissible to be at the character after the end of the -+ * scratchpad (i.e. equal to textbuf->max_line_size), for handling when the -+ * line was longer than the size of the scratchpad. Nevertheless, the resulting -+ * size of the line is kept at textbuf->max_line_size, including the '\0' -+ * terminator. That is, the string length will be textbuf->max_line_size-1. -+ * -+ * Remaining characters strictly after newline_off are moved to the beginning -+ * of the scratchpad, to allow space for a longer line to be collected. This -+ * means the character specified at newline_off will be removed from/no longer -+ * be within the valid region of the scratchpad -+ * -+ * Returns number of bytes the scratchpad was shortened by, or an error -+ * otherwise -+ */ -+static size_t collect_line(struct kutf_helper_textbuf *textbuf, int newline_off) ++void kbase_pm_get_dvfs_action(struct kbase_device *kbdev) +{ -+ /* '\n' terminator will be replaced as '\0' */ -+ int str_buf_size; -+ struct kutf_helper_textbuf_line *textbuf_line; -+ char *str_start; -+ int bytes_remain; -+ char *scratch = textbuf->scratchpad; -+ int nextline_off; ++ unsigned long flags; ++ int utilisation, util_gl_share; ++ int util_cl_share[2]; ++ ktime_t now; + -+ str_buf_size = newline_off + 1; -+ if (str_buf_size > textbuf->max_line_size) -+ str_buf_size = textbuf->max_line_size; ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ /* String is stored immediately after the line */ -+ textbuf_line = kutf_mempool_alloc(textbuf->mempool, str_buf_size + sizeof(struct kutf_helper_textbuf_line)); -+ if (!textbuf_line) -+ return -ENOMEM; ++ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); ++ ++ now = ktime_get(); ++ ++ utilisation = kbase_pm_get_dvfs_utilisation_old(kbdev, &util_gl_share, ++ util_cl_share, now); ++ ++ if (utilisation < 0 || util_gl_share < 0 || util_cl_share[0] < 0 || ++ util_cl_share[1] < 0) { ++ utilisation = 0; ++ util_gl_share = 0; ++ util_cl_share[0] = 0; ++ util_cl_share[1] = 0; ++ goto out; ++ } + -+ str_start = &textbuf_line->str[0]; ++out: ++#ifdef CONFIG_MALI_MIDGARD_DVFS ++ kbase_platform_dvfs_event(kbdev, utilisation, util_gl_share, ++ util_cl_share); ++#endif /*CONFIG_MALI_MIDGARD_DVFS */ + -+ /* Copy in string, excluding the terminating '\n' character, replacing -+ * it with '\0' */ -+ strncpy(str_start, scratch, str_buf_size - 1); -+ str_start[str_buf_size-1] = '\0'; -+ textbuf_line->str_size = str_buf_size; ++ kbase_pm_reset_dvfs_utilisation_unlocked(kbdev, now); + -+ /* Append to the textbuf */ -+ list_add_tail(&textbuf_line->node, &textbuf->textbuf_list); -+ ++(textbuf->nr_lines); ++ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); ++} + -+ /* Move the rest of the scratchpad to the start */ -+ nextline_off = newline_off + 1; -+ if (nextline_off > textbuf->used_bytes) -+ nextline_off = textbuf->used_bytes; ++bool kbase_pm_metrics_is_active(struct kbase_device *kbdev) ++{ ++ bool isactive; ++ unsigned long flags; + -+ bytes_remain = textbuf->used_bytes - nextline_off; -+ memmove(scratch, scratch + nextline_off, bytes_remain); -+ textbuf->used_bytes = bytes_remain; ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ /* Wakeup anyone blocked on empty */ -+ wake_up(&textbuf->not_empty_wq); ++ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); ++ isactive = kbdev->pm.backend.metrics.timer_active; ++ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); + -+ return nextline_off; ++ return isactive; +} ++KBASE_EXPORT_TEST_API(kbase_pm_metrics_is_active); + -+/* Buffer size for truncating a string to its newline. -+ * Allocated on the stack, so keep it moderately small (within PAGE_SIZE) */ -+#define TRUNCATE_BUF_SZ 512 ++#endif /* CONFIG_MALI_MIDGARD_DVFS */ + -+/* Discard input from a userbuf up to a newline, then collect what was in the -+ * scratchpad into a new textbuf line */ -+static ssize_t collect_longline_truncate(struct kutf_helper_textbuf *textbuf, -+ const char __user *userbuf, size_t userbuf_len) ++/** ++ * kbase_pm_metrics_active_calc - Update PM active counts based on currently ++ * running atoms ++ * @kbdev: Device pointer ++ * ++ * The caller must hold kbdev->pm.backend.metrics.lock ++ */ ++static void kbase_pm_metrics_active_calc(struct kbase_device *kbdev) +{ -+ ssize_t bytes_processed = 0; ++ int js; + -+ while (userbuf_len > 0) { -+ int userbuf_copy_sz = userbuf_len; -+ size_t res; -+ char *newline_ptr; -+ char truncate_buf[TRUNCATE_BUF_SZ]; ++ lockdep_assert_held(&kbdev->pm.backend.metrics.lock); + -+ if (userbuf_len > TRUNCATE_BUF_SZ) -+ userbuf_copy_sz = TRUNCATE_BUF_SZ; -+ else -+ userbuf_copy_sz = (int)userbuf_len; ++ kbdev->pm.backend.metrics.active_gl_ctx[0] = 0; ++ kbdev->pm.backend.metrics.active_gl_ctx[1] = 0; ++ kbdev->pm.backend.metrics.active_cl_ctx[0] = 0; ++ kbdev->pm.backend.metrics.active_cl_ctx[1] = 0; ++ kbdev->pm.backend.metrics.gpu_active = false; + -+ /* copy what we can */ -+ res = copy_from_user(truncate_buf, userbuf, userbuf_copy_sz); -+ if (res == userbuf_copy_sz) -+ return -EFAULT; -+ userbuf_copy_sz -= res; ++ for (js = 0; js < BASE_JM_MAX_NR_SLOTS; js++) { ++ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, 0); + -+ /* Search for newline in what was copied */ -+ newline_ptr = strnchr(truncate_buf, userbuf_copy_sz, '\n'); ++ /* Head atom may have just completed, so if it isn't running ++ * then try the next atom */ ++ if (katom && katom->gpu_rb_state != KBASE_ATOM_GPU_RB_SUBMITTED) ++ katom = kbase_gpu_inspect(kbdev, js, 1); ++ ++ if (katom && katom->gpu_rb_state == ++ KBASE_ATOM_GPU_RB_SUBMITTED) { ++ if (katom->core_req & BASE_JD_REQ_ONLY_COMPUTE) { ++ int device_nr = (katom->core_req & ++ BASE_JD_REQ_SPECIFIC_COHERENT_GROUP) ++ ? katom->device_nr : 0; ++ if (!WARN_ON(device_nr >= 2)) ++ kbdev->pm.backend.metrics. ++ active_cl_ctx[device_nr] = 1; ++ } else { ++ /* Slot 2 should not be running non-compute ++ * atoms */ ++ if (!WARN_ON(js >= 2)) ++ kbdev->pm.backend.metrics. ++ active_gl_ctx[js] = 1; ++ } ++ kbdev->pm.backend.metrics.gpu_active = true; ++ } ++ } ++} + -+ if (newline_ptr) { -+ ssize_t sres; -+ /* Newline found: collect scratchpad and exit out */ -+ int newline_off = newline_ptr - truncate_buf; ++/* called when job is submitted to or removed from a GPU slot */ ++void kbase_pm_metrics_update(struct kbase_device *kbdev, ktime_t *timestamp) ++{ ++ unsigned long flags; ++ ktime_t now; + -+ sres = collect_line(textbuf, textbuf->used_bytes); -+ if (sres < 0) -+ return sres; ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ bytes_processed += newline_off + 1; -+ break; -+ } ++ spin_lock_irqsave(&kbdev->pm.backend.metrics.lock, flags); + -+ /* Newline not yet found: advance to the next part to copy */ -+ userbuf += userbuf_copy_sz; -+ userbuf_len -= userbuf_copy_sz; -+ bytes_processed += userbuf_copy_sz; ++ if (!timestamp) { ++ now = ktime_get(); ++ timestamp = &now; + } + -+ return bytes_processed; -+} ++ /* Track how long CL and/or GL jobs have been busy for */ ++ kbase_pm_get_dvfs_utilisation_calc(kbdev, *timestamp); + -+/** -+ * kutf_helper_textbuf_consume() - 'data' file consumer function for writing to -+ * a textbuf -+ * @priv: private pointer from a kutf_userdata_exchange, which -+ * should be a pointer to a struct kutf_helper_textbuf to -+ * write into -+ * @userbuf: the userspace buffer to read from -+ * @userbuf_len: size of the userspace buffer -+ * @ppos: the current position in the buffer ++ kbase_pm_metrics_active_calc(kbdev); ++ ++ spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); ++} +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c +new file mode 100755 +index 000000000..075f020c6 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c +@@ -0,0 +1,973 @@ ++/* + * -+ * This consumer function is used as a write consumer for the 'data' file, -+ * receiving data that has been written to the 'data' file by userspace. It -+ * will read from the userspace buffer @userbuf and separates it into '\n' -+ * delimited lines for the textbuf pointed to by @priv . ++ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. + * -+ * If there is insufficient space in textbuf, then it will block until there is -+ * space - for example, a kernel-side test calls -+ * kutf_helper_textbuf_dequeue(). Since this is expected to be called in the -+ * context of a syscall, the call can only be cancelled by sending an -+ * appropriate signal to the userspace process. ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. + * -+ * The current position @ppos is advanced by the number of bytes successfully -+ * read. ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * Return: the number of bytes read, or negative value on error. + */ -+static ssize_t kutf_helper_textbuf_consume(void *priv, -+ const char __user *userbuf, size_t userbuf_len, loff_t *ppos) -+{ -+ struct kutf_helper_textbuf *textbuf = priv; -+ int userbuf_copy_sz; -+ char *next_newline_ptr; -+ size_t bytes_processed = 0; -+ int newdata_off; -+ ssize_t ret; -+ -+ ret = mutex_lock_interruptible(&textbuf->lock); -+ if (ret) -+ return -ERESTARTSYS; + -+ /* Validate input */ -+ if (*ppos < 0) { -+ ret = -EINVAL; -+ goto out_unlock; -+ } -+ if (!userbuf_len) { -+ ret = 0; -+ goto out_unlock; -+ } + -+ while (textbuf->nr_lines >= textbuf->max_nr_lines && -+ !(textbuf->flags & KUTF_HELPER_TEXTBUF_FLAG_DYING)) { -+ /* Block on kernel-side dequeue making space available -+ * NOTE: should also handle O_NONBLOCK */ -+ mutex_unlock(&textbuf->lock); -+ ret = wait_event_interruptible(textbuf->not_full_wq, -+ (textbuf->nr_lines < textbuf->max_nr_lines || -+ (textbuf->flags & KUTF_HELPER_TEXTBUF_FLAG_DYING))); -+ if (ret) -+ return -ERESTARTSYS; -+ ret = mutex_lock_interruptible(&textbuf->lock); -+ if (ret) -+ return -ERESTARTSYS; -+ } + -+ if (textbuf->flags & KUTF_HELPER_TEXTBUF_FLAG_DYING) { -+ ret = -ENODEV; -+ goto out_unlock; -+ } ++/* ++ * Power policy API implementations ++ */ + -+ if (textbuf->prev_pos != *ppos && textbuf->used_bytes) { -+ /* Seeking causes a new line to occur: -+ * Truncate what data was there into a textbuf-line, and reset -+ * the buffer */ -+ ret = collect_line(textbuf, textbuf->used_bytes); -+ if (ret < 0) -+ goto finish; -+ } else if (textbuf->used_bytes >= (textbuf->max_line_size - 1)) { -+ /* Line too long discard input until we find a '\n' */ -+ ret = collect_longline_truncate(textbuf, userbuf, userbuf_len); ++#include ++#include ++#include ++#include ++#include + -+ if (ret < 0) -+ goto finish; ++static const struct kbase_pm_policy *const policy_list[] = { ++#ifdef CONFIG_MALI_NO_MALI ++ &kbase_pm_always_on_policy_ops, ++ &kbase_pm_demand_policy_ops, ++ &kbase_pm_coarse_demand_policy_ops, ++#if !MALI_CUSTOMER_RELEASE ++ &kbase_pm_demand_always_powered_policy_ops, ++ &kbase_pm_fast_start_policy_ops, ++#endif ++#else /* CONFIG_MALI_NO_MALI */ ++#if !PLATFORM_POWER_DOWN_ONLY ++ &kbase_pm_demand_policy_ops, ++#endif /* !PLATFORM_POWER_DOWN_ONLY */ ++ &kbase_pm_coarse_demand_policy_ops, ++ &kbase_pm_always_on_policy_ops, ++#if !MALI_CUSTOMER_RELEASE ++#if !PLATFORM_POWER_DOWN_ONLY ++ &kbase_pm_demand_always_powered_policy_ops, ++ &kbase_pm_fast_start_policy_ops, ++#endif /* !PLATFORM_POWER_DOWN_ONLY */ ++#endif ++#endif /* CONFIG_MALI_NO_MALI */ ++}; + -+ /* Update userbuf with how much was processed, which may be the -+ * entire buffer now */ -+ userbuf += ret; -+ userbuf_len -= ret; -+ bytes_processed += ret; ++/* The number of policies available in the system. ++ * This is derived from the number of functions listed in policy_get_functions. ++ */ ++#define POLICY_COUNT (sizeof(policy_list)/sizeof(*policy_list)) + -+ /* If there's buffer remaining and we fault later (e.g. can't -+ * read or OOM) ensure ppos is updated */ -+ *ppos += ret; + -+ /* recheck in case entire buffer processed */ -+ if (!userbuf_len) -+ goto finish; -+ } ++/* Function IDs for looking up Timeline Trace codes in ++ * kbase_pm_change_state_trace_code */ ++enum kbase_pm_func_id { ++ KBASE_PM_FUNC_ID_REQUEST_CORES_START, ++ KBASE_PM_FUNC_ID_REQUEST_CORES_END, ++ KBASE_PM_FUNC_ID_RELEASE_CORES_START, ++ KBASE_PM_FUNC_ID_RELEASE_CORES_END, ++ /* Note: kbase_pm_unrequest_cores() is on the slow path, and we neither ++ * expect to hit it nor tend to hit it very much anyway. We can detect ++ * whether we need more instrumentation by a difference between ++ * PM_CHECKTRANS events and PM_SEND/HANDLE_EVENT. */ + -+ /* An extra line may've been added, ensure we don't overfill */ -+ if (textbuf->nr_lines >= textbuf->max_nr_lines) -+ goto finish_noerr; ++ /* Must be the last */ ++ KBASE_PM_FUNC_ID_COUNT ++}; + -+ userbuf_copy_sz = userbuf_len; + -+ /* Copy in as much as we can */ -+ if (userbuf_copy_sz > textbuf->max_line_size - textbuf->used_bytes) -+ userbuf_copy_sz = textbuf->max_line_size - textbuf->used_bytes; ++/* State changes during request/unrequest/release-ing cores */ ++enum { ++ KBASE_PM_CHANGE_STATE_SHADER = (1u << 0), ++ KBASE_PM_CHANGE_STATE_TILER = (1u << 1), + -+ ret = copy_from_user(textbuf->scratchpad + textbuf->used_bytes, userbuf, userbuf_copy_sz); -+ if (ret == userbuf_copy_sz) { -+ ret = -EFAULT; -+ goto finish; -+ } -+ userbuf_copy_sz -= ret; ++ /* These two must be last */ ++ KBASE_PM_CHANGE_STATE_MASK = (KBASE_PM_CHANGE_STATE_TILER | ++ KBASE_PM_CHANGE_STATE_SHADER), ++ KBASE_PM_CHANGE_STATE_COUNT = KBASE_PM_CHANGE_STATE_MASK + 1 ++}; ++typedef u32 kbase_pm_change_state; + -+ newdata_off = textbuf->used_bytes; -+ textbuf->used_bytes += userbuf_copy_sz; + -+ while (textbuf->used_bytes && textbuf->nr_lines < textbuf->max_nr_lines) { -+ int new_bytes_remain = textbuf->used_bytes - newdata_off; -+ /* Find a new line - only the new part should be checked */ -+ next_newline_ptr = strnchr(textbuf->scratchpad + newdata_off, new_bytes_remain, '\n'); ++#ifdef CONFIG_MALI_TRACE_TIMELINE ++/* Timeline Trace code lookups for each function */ ++static u32 kbase_pm_change_state_trace_code[KBASE_PM_FUNC_ID_COUNT] ++ [KBASE_PM_CHANGE_STATE_COUNT] = { ++ /* kbase_pm_request_cores */ ++ [KBASE_PM_FUNC_ID_REQUEST_CORES_START][0] = 0, ++ [KBASE_PM_FUNC_ID_REQUEST_CORES_START][KBASE_PM_CHANGE_STATE_SHADER] = ++ SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_START, ++ [KBASE_PM_FUNC_ID_REQUEST_CORES_START][KBASE_PM_CHANGE_STATE_TILER] = ++ SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_TILER_START, ++ [KBASE_PM_FUNC_ID_REQUEST_CORES_START][KBASE_PM_CHANGE_STATE_SHADER | ++ KBASE_PM_CHANGE_STATE_TILER] = ++ SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_TILER_START, + -+ if (next_newline_ptr) { -+ int newline_off = next_newline_ptr - textbuf->scratchpad; ++ [KBASE_PM_FUNC_ID_REQUEST_CORES_END][0] = 0, ++ [KBASE_PM_FUNC_ID_REQUEST_CORES_END][KBASE_PM_CHANGE_STATE_SHADER] = ++ SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_END, ++ [KBASE_PM_FUNC_ID_REQUEST_CORES_END][KBASE_PM_CHANGE_STATE_TILER] = ++ SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_TILER_END, ++ [KBASE_PM_FUNC_ID_REQUEST_CORES_END][KBASE_PM_CHANGE_STATE_SHADER | ++ KBASE_PM_CHANGE_STATE_TILER] = ++ SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_TILER_END, + -+ /* if found, collect up to it, then memmove the rest */ -+ /* reset positions and see if we can fill any further */ -+ /* repeat until run out of data or line is filled */ -+ ret = collect_line(textbuf, newline_off); ++ /* kbase_pm_release_cores */ ++ [KBASE_PM_FUNC_ID_RELEASE_CORES_START][0] = 0, ++ [KBASE_PM_FUNC_ID_RELEASE_CORES_START][KBASE_PM_CHANGE_STATE_SHADER] = ++ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_START, ++ [KBASE_PM_FUNC_ID_RELEASE_CORES_START][KBASE_PM_CHANGE_STATE_TILER] = ++ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_TILER_START, ++ [KBASE_PM_FUNC_ID_RELEASE_CORES_START][KBASE_PM_CHANGE_STATE_SHADER | ++ KBASE_PM_CHANGE_STATE_TILER] = ++ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_TILER_START, + -+ /* If filled up or OOM, rollback the remaining new -+ * data. Instead we'll try to grab it next time we're -+ * called */ -+ if (textbuf->nr_lines >= textbuf->max_nr_lines || ret < 0) -+ textbuf->used_bytes = newdata_off; ++ [KBASE_PM_FUNC_ID_RELEASE_CORES_END][0] = 0, ++ [KBASE_PM_FUNC_ID_RELEASE_CORES_END][KBASE_PM_CHANGE_STATE_SHADER] = ++ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_END, ++ [KBASE_PM_FUNC_ID_RELEASE_CORES_END][KBASE_PM_CHANGE_STATE_TILER] = ++ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_TILER_END, ++ [KBASE_PM_FUNC_ID_RELEASE_CORES_END][KBASE_PM_CHANGE_STATE_SHADER | ++ KBASE_PM_CHANGE_STATE_TILER] = ++ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_TILER_END ++}; + -+ if (ret < 0) -+ goto finish; ++static inline void kbase_timeline_pm_cores_func(struct kbase_device *kbdev, ++ enum kbase_pm_func_id func_id, ++ kbase_pm_change_state state) ++{ ++ int trace_code; + -+ /* Fix up ppos etc in case we'll be ending the loop */ -+ *ppos += ret - newdata_off; -+ bytes_processed += ret - newdata_off; -+ newdata_off = 0; -+ } else { -+ /* there's bytes left, but no new-line, so try to fill up next time */ -+ *ppos += new_bytes_remain; -+ bytes_processed += new_bytes_remain; -+ break; -+ } -+ } ++ KBASE_DEBUG_ASSERT(func_id >= 0 && func_id < KBASE_PM_FUNC_ID_COUNT); ++ KBASE_DEBUG_ASSERT(state != 0 && (state & KBASE_PM_CHANGE_STATE_MASK) == ++ state); + -+finish_noerr: -+ ret = bytes_processed; -+finish: -+ textbuf->prev_pos = *ppos; -+out_unlock: -+ mutex_unlock(&textbuf->lock); ++ trace_code = kbase_pm_change_state_trace_code[func_id][state]; ++ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, trace_code); ++} + -+ return ret; ++#else /* CONFIG_MALI_TRACE_TIMELINE */ ++static inline void kbase_timeline_pm_cores_func(struct kbase_device *kbdev, ++ enum kbase_pm_func_id func_id, kbase_pm_change_state state) ++{ +} + ++#endif /* CONFIG_MALI_TRACE_TIMELINE */ ++ +/** -+ * kutf_helper_textbuf_produce() - 'data' file producer function for reading -+ * from a textbuf -+ * @priv: private pointer from a kutf_userdata_exchange, which -+ * should be a pointer to a struct kutf_helper_textbuf to -+ * read from -+ * @userbuf: the userspace buffer to write to -+ * @userbuf_len: size of the userspace buffer -+ * @ppos: the current position in the buffer -+ * -+ * This producer function is used as a read producer for the 'data' file, -+ * allowing userspace to read from the 'data' file. It will write to the -+ * userspace buffer @userbuf, taking lines from the textbuf pointed to by -+ * @priv, separating each line with '\n'. -+ * -+ * If there is no data in the textbuf, then it will block until some appears - -+ * for example, a kernel-side test calls kutf_helper_textbuf_enqueue(). Since -+ * this is expected to be called in the context of a syscall, the call can only -+ * be cancelled by sending an appropriate signal to the userspace process. -+ * -+ * The current position @ppos is advanced by the number of bytes successfully -+ * written. -+ * -+ * Return: the number of bytes written, or negative value on error ++ * kbasep_pm_do_poweroff_cores - Process a poweroff request and power down any ++ * requested shader cores ++ * @kbdev: Device pointer + */ -+static ssize_t kutf_helper_textbuf_produce(void *priv, char __user *userbuf, -+ size_t userbuf_len, loff_t *ppos) ++static void kbasep_pm_do_poweroff_cores(struct kbase_device *kbdev) +{ -+ struct kutf_helper_textbuf *textbuf = priv; -+ loff_t pos_offset; -+ struct kutf_helper_textbuf_line *line = NULL; -+ int line_start_pos; -+ size_t bytes_processed = 0; -+ ssize_t ret; -+ int copy_length; ++ u64 prev_shader_state = kbdev->pm.backend.desired_shader_state; ++ u64 prev_tiler_state = kbdev->pm.backend.desired_tiler_state; + -+ ret = mutex_lock_interruptible(&textbuf->lock); -+ if (ret) -+ return -ERESTARTSYS; ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ /* Validate input */ -+ if (*ppos < 0) { -+ ret = -EINVAL; -+ goto finish; -+ } -+ if (!userbuf_len) { -+ ret = 0; -+ goto finish; -+ } ++ kbdev->pm.backend.desired_shader_state &= ++ ~kbdev->pm.backend.shader_poweroff_pending; ++ kbdev->pm.backend.desired_tiler_state &= ++ ~kbdev->pm.backend.tiler_poweroff_pending; + -+ /* Seeking to before the beginning of the line will have the effect of -+ * resetting the position to the start of the current data, since we've -+ * already discarded previous data */ -+ if (*ppos < textbuf->prev_line_pos) -+ textbuf->prev_line_pos = *ppos; ++ kbdev->pm.backend.shader_poweroff_pending = 0; ++ kbdev->pm.backend.tiler_poweroff_pending = 0; + -+ while (!line) { -+ int needs_wake = 0; ++ if (prev_shader_state != kbdev->pm.backend.desired_shader_state || ++ prev_tiler_state != ++ kbdev->pm.backend.desired_tiler_state || ++ kbdev->pm.backend.ca_in_transition) { ++ bool cores_are_available; + -+ pos_offset = *ppos - textbuf->prev_line_pos; -+ line_start_pos = 0; ++ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, ++ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_DEFERRED_START); ++ cores_are_available = kbase_pm_check_transitions_nolock(kbdev); ++ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, ++ SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_DEFERRED_END); + -+ /* Find the line for the offset, emptying the textbuf as we go */ -+ while (!list_empty(&textbuf->textbuf_list)) { -+ int line_end_pos; ++ /* Don't need 'cores_are_available', ++ * because we don't return anything */ ++ CSTD_UNUSED(cores_are_available); ++ } ++} + -+ line = list_first_entry(&textbuf->textbuf_list, struct kutf_helper_textbuf_line, node); ++static enum hrtimer_restart ++kbasep_pm_do_gpu_poweroff_callback(struct hrtimer *timer) ++{ ++ struct kbase_device *kbdev; ++ unsigned long flags; + -+ /* str_size used in line_end_pos because lines implicitly have -+ * a '\n', but we count the '\0' string terminator as that */ -+ line_end_pos = line_start_pos + line->str_size; ++ kbdev = container_of(timer, struct kbase_device, ++ pm.backend.gpu_poweroff_timer); + -+ if (pos_offset < line_end_pos) -+ break; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ line_start_pos += line->str_size; -+ /* Only discard a line when we're sure it's finished -+ * with, to avoid awkward rollback conditions if we've -+ * had to block */ -+ list_del(&line->node); -+ --(textbuf->nr_lines); -+ line = NULL; -+ needs_wake = 1; -+ } -+ -+ /* Update the start of the line pos for next time we're called */ -+ textbuf->prev_line_pos += line_start_pos; -+ -+ /* If space was freed up, wake waiters */ -+ if (needs_wake) -+ wake_up(&textbuf->not_full_wq); -+; -+ if (!line) { -+ /* Only check before waiting, to ensure if the test -+ * does the last enqueue and immediately finishes, then -+ * we'll go back round the loop to receive the line -+ * instead of just dying straight away */ -+ if (textbuf->flags & KUTF_HELPER_TEXTBUF_FLAG_DYING) { -+ /* Indicate EOF rather than an error */ -+ ret = 0; -+ goto finish; -+ } ++ /* It is safe for this call to do nothing if the work item is already ++ * queued. The worker function will read the must up-to-date state of ++ * kbdev->pm.backend.gpu_poweroff_pending under lock. ++ * ++ * If a state change occurs while the worker function is processing, ++ * this call will succeed as a work item can be requeued once it has ++ * started processing. ++ */ ++ if (kbdev->pm.backend.gpu_poweroff_pending) ++ queue_work(kbdev->pm.backend.gpu_poweroff_wq, ++ &kbdev->pm.backend.gpu_poweroff_work); + -+ /* No lines found, block for new ones -+ * NOTE: should also handle O_NONBLOCK */ -+ mutex_unlock(&textbuf->lock); -+ ret = wait_event_interruptible(textbuf->not_empty_wq, -+ (textbuf->nr_lines > 0 || -+ (textbuf->flags & KUTF_HELPER_TEXTBUF_FLAG_DYING))); ++ if (kbdev->pm.backend.shader_poweroff_pending || ++ kbdev->pm.backend.tiler_poweroff_pending) { ++ kbdev->pm.backend.shader_poweroff_pending_time--; + -+ /* signals here are not restartable */ -+ if (ret) -+ return ret; -+ ret = mutex_lock_interruptible(&textbuf->lock); -+ if (ret) -+ return ret; -+ } ++ KBASE_DEBUG_ASSERT( ++ kbdev->pm.backend.shader_poweroff_pending_time ++ >= 0); + ++ if (!kbdev->pm.backend.shader_poweroff_pending_time) ++ kbasep_pm_do_poweroff_cores(kbdev); + } + ++ if (kbdev->pm.backend.poweroff_timer_needed) { ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ /* Find offset within the line, guaranteed to be within line->str_size */ -+ pos_offset -= line_start_pos; ++ hrtimer_add_expires(timer, kbdev->pm.gpu_poweroff_time); + -+ while (userbuf_len && line) { -+ /* Copy at most to the end of string, excluding terminator */ -+ copy_length = line->str_size - 1 - pos_offset; -+ if (copy_length > userbuf_len) -+ copy_length = userbuf_len; ++ return HRTIMER_RESTART; ++ } + -+ if (copy_length) { -+ ret = copy_to_user(userbuf, &line->str[pos_offset], copy_length); -+ if (ret == copy_length) { -+ ret = -EFAULT; -+ goto finish; -+ } -+ copy_length -= ret; ++ kbdev->pm.backend.poweroff_timer_running = false; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ userbuf += copy_length; -+ userbuf_len -= copy_length; -+ bytes_processed += copy_length; -+ *ppos += copy_length; -+ if (ret) -+ goto finish_noerr; -+ } ++ return HRTIMER_NORESTART; ++} + -+ /* Add terminator if one was needed */ -+ if (userbuf_len) { -+ copy_length = 1; -+ ret = copy_to_user(userbuf, "\n", copy_length); -+ if (ret == copy_length) { -+ ret = -EFAULT; -+ goto finish; -+ } -+ copy_length -= ret; ++static void kbasep_pm_do_gpu_poweroff_wq(struct work_struct *data) ++{ ++ unsigned long flags; ++ struct kbase_device *kbdev; ++ bool do_poweroff = false; + -+ userbuf += copy_length; -+ userbuf_len -= copy_length; -+ bytes_processed += copy_length; -+ *ppos += copy_length; -+ } else { -+ /* string wasn't completely copied this time - try to -+ * finish it next call */ -+ break; -+ } ++ kbdev = container_of(data, struct kbase_device, ++ pm.backend.gpu_poweroff_work); + -+ /* Line Completed - only now can safely delete it */ -+ textbuf->prev_line_pos += line->str_size; -+ list_del(&line->node); -+ --(textbuf->nr_lines); -+ line = NULL; -+ /* Space freed up, wake up waiters */ -+ wake_up(&textbuf->not_full_wq); ++ mutex_lock(&kbdev->pm.lock); + -+ /* Pick the next line */ -+ if (!list_empty(&textbuf->textbuf_list)) { -+ line = list_first_entry(&textbuf->textbuf_list, struct kutf_helper_textbuf_line, node); -+ pos_offset = 0; -+ } -+ /* if no more lines, we've copied at least some bytes, so only -+ * need to block on new lines the next time we're called */ ++ if (kbdev->pm.backend.gpu_poweroff_pending == 0) { ++ mutex_unlock(&kbdev->pm.lock); ++ return; + } + -+finish_noerr: -+ ret = bytes_processed; -+finish: -+ mutex_unlock(&textbuf->lock); ++ kbdev->pm.backend.gpu_poweroff_pending--; + -+ return ret; -+} ++ if (kbdev->pm.backend.gpu_poweroff_pending > 0) { ++ mutex_unlock(&kbdev->pm.lock); ++ return; ++ } + -+int kutf_helper_textbuf_wait_for_user(struct kutf_helper_textbuf *textbuf) -+{ -+ int err; -+ unsigned long now; -+ unsigned long timeout_jiffies = msecs_to_jiffies(USERDATA_WAIT_TIMEOUT_MS); -+ unsigned long time_end; -+ int ret = 0; ++ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_poweroff_pending == 0); + -+ /* Mutex locking using non-interruptible variants, since a signal to -+ * the user process will generally have to wait until we finish the -+ * test, because we can't restart the test. The exception is where -+ * we're blocked on a waitq */ -+ mutex_lock(&textbuf->lock); -+ -+ now = jiffies; -+ time_end = now + timeout_jiffies; -+ -+ while (!textbuf->nr_user_clients && time_before_eq(now, time_end)) { -+ unsigned long time_to_wait = time_end - now; -+ /* No users yet, block or timeout */ -+ mutex_unlock(&textbuf->lock); -+ /* Use interruptible here - in case we block for a long time -+ * and want to kill the user process */ -+ err = wait_event_interruptible_timeout(textbuf->user_opened_wq, -+ (textbuf->nr_user_clients > 0), time_to_wait); -+ /* Any error is not restartable due to how kutf runs tests */ -+ if (err < 0) -+ return -EINTR; -+ mutex_lock(&textbuf->lock); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ now = jiffies; -+ } -+ if (!textbuf->nr_user_clients) -+ ret = -ETIMEDOUT; ++ /* Only power off the GPU if a request is still pending */ ++ if (!kbdev->pm.backend.pm_current_policy->get_core_active(kbdev)) ++ do_poweroff = true; + -+ mutex_unlock(&textbuf->lock); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ return ret; ++ if (do_poweroff) { ++ kbdev->pm.backend.poweroff_timer_needed = false; ++ hrtimer_cancel(&kbdev->pm.backend.gpu_poweroff_timer); ++ kbdev->pm.backend.poweroff_timer_running = false; ++ ++ /* Power off the GPU */ ++ kbase_pm_do_poweroff(kbdev, false); ++ } ++ ++ mutex_unlock(&kbdev->pm.lock); +} -+EXPORT_SYMBOL(kutf_helper_textbuf_wait_for_user); + -+char *kutf_helper_textbuf_dequeue(struct kutf_helper_textbuf *textbuf, -+ int *str_size) ++int kbase_pm_policy_init(struct kbase_device *kbdev) +{ -+ struct kutf_helper_textbuf_line *line; -+ char *ret = NULL; ++ struct workqueue_struct *wq; + -+ /* Mutex locking using non-interruptible variants, since a signal to -+ * the user process will generally have to wait until we finish the -+ * test, because we can't restart the test. The exception is where -+ * we're blocked on a waitq */ -+ mutex_lock(&textbuf->lock); ++ wq = alloc_workqueue("kbase_pm_do_poweroff", ++ WQ_HIGHPRI | WQ_UNBOUND, 1); ++ if (!wq) ++ return -ENOMEM; + -+ while (list_empty(&textbuf->textbuf_list)) { -+ int err; ++ kbdev->pm.backend.gpu_poweroff_wq = wq; ++ INIT_WORK(&kbdev->pm.backend.gpu_poweroff_work, ++ kbasep_pm_do_gpu_poweroff_wq); ++ hrtimer_init(&kbdev->pm.backend.gpu_poweroff_timer, ++ CLOCK_MONOTONIC, HRTIMER_MODE_REL); ++ kbdev->pm.backend.gpu_poweroff_timer.function = ++ kbasep_pm_do_gpu_poweroff_callback; ++ kbdev->pm.backend.pm_current_policy = policy_list[0]; ++ kbdev->pm.backend.pm_current_policy->init(kbdev); ++ kbdev->pm.gpu_poweroff_time = ++ HR_TIMER_DELAY_NSEC(DEFAULT_PM_GPU_POWEROFF_TICK_NS); ++ kbdev->pm.poweroff_shader_ticks = DEFAULT_PM_POWEROFF_TICK_SHADER; ++ kbdev->pm.poweroff_gpu_ticks = DEFAULT_PM_POWEROFF_TICK_GPU; + -+ if (!textbuf->nr_user_clients) { -+ /* No user-side clients - error */ -+ goto out; -+ } ++ return 0; ++} + -+ /* No lines found, block for new ones from user-side consumer */ -+ mutex_unlock(&textbuf->lock); -+ /* Use interruptible here - in case we block for a long time -+ * and want to kill the user process */ -+ err = wait_event_interruptible(textbuf->not_empty_wq, -+ (textbuf->nr_lines > 0 || !textbuf->nr_user_clients)); -+ /* Any error is not restartable due to how kutf runs tests */ -+ if (err) -+ return ERR_PTR(-EINTR); -+ mutex_lock(&textbuf->lock); -+ } ++void kbase_pm_policy_term(struct kbase_device *kbdev) ++{ ++ kbdev->pm.backend.pm_current_policy->term(kbdev); ++ destroy_workqueue(kbdev->pm.backend.gpu_poweroff_wq); ++} + -+ line = list_first_entry(&textbuf->textbuf_list, struct kutf_helper_textbuf_line, node); -+ list_del(&line->node); -+ --(textbuf->nr_lines); -+ /* Space freed up, wake up waiters */ -+ wake_up(&textbuf->not_full_wq); ++void kbase_pm_cancel_deferred_poweroff(struct kbase_device *kbdev) ++{ ++ unsigned long flags; + -+ if (str_size) -+ *str_size = line->str_size; ++ lockdep_assert_held(&kbdev->pm.lock); + -+ ret = &line->str[0]; ++ kbdev->pm.backend.poweroff_timer_needed = false; ++ hrtimer_cancel(&kbdev->pm.backend.gpu_poweroff_timer); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbdev->pm.backend.poweroff_timer_running = false; + -+out: -+ mutex_unlock(&textbuf->lock); -+ return ret; ++ /* If wq is already running but is held off by pm.lock, make sure it has ++ * no effect */ ++ kbdev->pm.backend.gpu_poweroff_pending = 0; ++ ++ kbdev->pm.backend.shader_poweroff_pending = 0; ++ kbdev->pm.backend.tiler_poweroff_pending = 0; ++ kbdev->pm.backend.shader_poweroff_pending_time = 0; ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} -+EXPORT_SYMBOL(kutf_helper_textbuf_dequeue); + -+int kutf_helper_textbuf_enqueue(struct kutf_helper_textbuf *textbuf, -+ char *enqueue_str, int buf_max_size) ++void kbase_pm_update_active(struct kbase_device *kbdev) +{ -+ struct kutf_helper_textbuf_line *textbuf_line; -+ int str_size = strnlen(enqueue_str, buf_max_size) + 1; -+ char *str_start; -+ int ret = 0; -+ -+ /* Mutex locking using non-interruptible variants, since a signal to -+ * the user process will generally have to wait until we finish the -+ * test, because we can't restart the test. The exception is where -+ * we're blocked on a waitq */ -+ mutex_lock(&textbuf->lock); ++ struct kbase_pm_device_data *pm = &kbdev->pm; ++ struct kbase_pm_backend_data *backend = &pm->backend; ++ unsigned long flags; ++ bool active; + -+ if (str_size > textbuf->max_line_size) -+ str_size = textbuf->max_line_size; ++ lockdep_assert_held(&pm->lock); + -+ while (textbuf->nr_lines >= textbuf->max_nr_lines) { -+ if (!textbuf->nr_user_clients) { -+ /* No user-side clients - error */ -+ ret = -EBUSY; -+ goto out; -+ } ++ /* pm_current_policy will never be NULL while pm.lock is held */ ++ KBASE_DEBUG_ASSERT(backend->pm_current_policy); + -+ /* Block on user-side producer making space available */ -+ mutex_unlock(&textbuf->lock); -+ /* Use interruptible here - in case we block for a long time -+ * and want to kill the user process */ -+ ret = wait_event_interruptible(textbuf->not_full_wq, -+ (textbuf->nr_lines < textbuf->max_nr_lines || !textbuf->nr_user_clients)); -+ /* Any error is not restartable due to how kutf runs tests */ -+ if (ret) -+ return -EINTR; -+ mutex_lock(&textbuf->lock); -+ } ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ /* String is stored immediately after the line */ -+ textbuf_line = kutf_mempool_alloc(textbuf->mempool, str_size + sizeof(struct kutf_helper_textbuf_line)); -+ if (!textbuf_line) { -+ ret = -ENOMEM; -+ goto out; -+ } ++ active = backend->pm_current_policy->get_core_active(kbdev); + -+ str_start = &textbuf_line->str[0]; ++ if (active) { ++ if (backend->gpu_poweroff_pending) { ++ /* Cancel any pending power off request */ ++ backend->gpu_poweroff_pending = 0; + -+ /* Copy in string */ -+ strncpy(str_start, enqueue_str, str_size); -+ /* Enforce the '\0' termination */ -+ str_start[str_size-1] = '\0'; -+ textbuf_line->str_size = str_size; ++ /* If a request was pending then the GPU was still ++ * powered, so no need to continue */ ++ if (!kbdev->poweroff_pending) { ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, ++ flags); ++ return; ++ } ++ } + -+ /* Append to the textbuf */ -+ list_add_tail(&textbuf_line->node, &textbuf->textbuf_list); -+ ++(textbuf->nr_lines); ++ if (!backend->poweroff_timer_running && !backend->gpu_powered && ++ (pm->poweroff_gpu_ticks || ++ pm->poweroff_shader_ticks)) { ++ backend->poweroff_timer_needed = true; ++ backend->poweroff_timer_running = true; ++ hrtimer_start(&backend->gpu_poweroff_timer, ++ pm->gpu_poweroff_time, ++ HRTIMER_MODE_REL); ++ } + -+ /* Wakeup anyone blocked on empty */ -+ wake_up(&textbuf->not_empty_wq); ++ /* Power on the GPU and any cores requested by the policy */ ++ if (pm->backend.poweroff_wait_in_progress) { ++ pm->backend.poweron_required = true; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } else { ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ kbase_pm_do_poweron(kbdev, false); ++ } ++ } else { ++ /* It is an error for the power policy to power off the GPU ++ * when there are contexts active */ ++ KBASE_DEBUG_ASSERT(pm->active_count == 0); + -+out: -+ mutex_unlock(&textbuf->lock); -+ return ret; -+} -+EXPORT_SYMBOL(kutf_helper_textbuf_enqueue); ++ if (backend->shader_poweroff_pending || ++ backend->tiler_poweroff_pending) { ++ backend->shader_poweroff_pending = 0; ++ backend->tiler_poweroff_pending = 0; ++ backend->shader_poweroff_pending_time = 0; ++ } + ++ /* Request power off */ ++ if (pm->backend.gpu_powered) { ++ if (pm->poweroff_gpu_ticks) { ++ backend->gpu_poweroff_pending = ++ pm->poweroff_gpu_ticks; ++ backend->poweroff_timer_needed = true; ++ if (!backend->poweroff_timer_running) { ++ /* Start timer if not running (eg if ++ * power policy has been changed from ++ * always_on to something else). This ++ * will ensure the GPU is actually ++ * powered off */ ++ backend->poweroff_timer_running ++ = true; ++ hrtimer_start( ++ &backend->gpu_poweroff_timer, ++ pm->gpu_poweroff_time, ++ HRTIMER_MODE_REL); ++ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, ++ flags); ++ } else { ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, ++ flags); + -+struct kutf_userdata_ops kutf_helper_textbuf_userdata_ops = { -+ .open = kutf_helper_textbuf_open, -+ .release = kutf_helper_textbuf_release, -+ .notify_ended = kutf_helper_textbuf_notify_test_ended, -+ .consumer = kutf_helper_textbuf_consume, -+ .producer = kutf_helper_textbuf_produce, -+}; -+EXPORT_SYMBOL(kutf_helper_textbuf_userdata_ops); -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_helpers_user.c b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_helpers_user.c -new file mode 100755 -index 000000000000..cf3b00563c5f ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_helpers_user.c -@@ -0,0 +1,460 @@ -+/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ /* Power off the GPU immediately */ ++ kbase_pm_do_poweroff(kbdev, false); ++ } ++ } else { ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } ++ } ++} + ++void kbase_pm_update_cores_state_nolock(struct kbase_device *kbdev) ++{ ++ u64 desired_bitmap; ++ u64 desired_tiler_bitmap; ++ bool cores_are_available; ++ bool do_poweroff = false; + ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+/* Kernel UTF test helpers that mirror those for kutf-userside */ -+#include -+#include ++ if (kbdev->pm.backend.pm_current_policy == NULL) ++ return; ++ if (kbdev->pm.backend.poweroff_wait_in_progress) ++ return; + -+#include -+#include ++ if (kbdev->protected_mode_transition && !kbdev->shader_needed_bitmap && ++ !kbdev->shader_inuse_bitmap && !kbdev->tiler_needed_cnt ++ && !kbdev->tiler_inuse_cnt) { ++ /* We are trying to change in/out of protected mode - force all ++ * cores off so that the L2 powers down */ ++ desired_bitmap = 0; ++ desired_tiler_bitmap = 0; ++ } else { ++ desired_bitmap = ++ kbdev->pm.backend.pm_current_policy->get_core_mask(kbdev); ++ desired_bitmap &= kbase_pm_ca_get_core_mask(kbdev); + -+const char *valtype_names[] = { -+ "INVALID", -+ "U64", -+ "STR", -+}; ++ if (kbdev->tiler_needed_cnt > 0 || kbdev->tiler_inuse_cnt > 0) ++ desired_tiler_bitmap = 1; ++ else ++ desired_tiler_bitmap = 0; + -+static const char *get_val_type_name(enum kutf_helper_valtype valtype) -+{ -+ /* enums can be signed or unsigned (implementation dependant), so -+ * enforce it to prevent: -+ * a) "<0 comparison on unsigned type" warning - if we did both upper -+ * and lower bound check -+ * b) incorrect range checking if it was a signed type - if we did -+ * upper bound check only */ -+ unsigned int type_idx = (unsigned int)valtype; ++ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_XAFFINITY)) { ++ /* Unless XAFFINITY is supported, enable core 0 if tiler ++ * required, regardless of core availability */ ++ if (kbdev->tiler_needed_cnt > 0 || ++ kbdev->tiler_inuse_cnt > 0) ++ desired_bitmap |= 1; ++ } ++ } + -+ if (type_idx >= (unsigned int)KUTF_HELPER_VALTYPE_COUNT) -+ type_idx = (unsigned int)KUTF_HELPER_VALTYPE_INVALID; ++ if (kbdev->pm.backend.desired_shader_state != desired_bitmap) ++ KBASE_TRACE_ADD(kbdev, PM_CORES_CHANGE_DESIRED, NULL, NULL, 0u, ++ (u32)desired_bitmap); ++ /* Are any cores being powered on? */ ++ if (~kbdev->pm.backend.desired_shader_state & desired_bitmap || ++ ~kbdev->pm.backend.desired_tiler_state & desired_tiler_bitmap || ++ kbdev->pm.backend.ca_in_transition) { ++ /* Check if we are powering off any cores before updating shader ++ * state */ ++ if (kbdev->pm.backend.desired_shader_state & ~desired_bitmap || ++ kbdev->pm.backend.desired_tiler_state & ++ ~desired_tiler_bitmap) { ++ /* Start timer to power off cores */ ++ kbdev->pm.backend.shader_poweroff_pending |= ++ (kbdev->pm.backend.desired_shader_state & ++ ~desired_bitmap); ++ kbdev->pm.backend.tiler_poweroff_pending |= ++ (kbdev->pm.backend.desired_tiler_state & ++ ~desired_tiler_bitmap); + -+ return valtype_names[type_idx]; -+} ++ if (kbdev->pm.poweroff_shader_ticks && ++ !kbdev->protected_mode_transition) ++ kbdev->pm.backend.shader_poweroff_pending_time = ++ kbdev->pm.poweroff_shader_ticks; ++ else ++ do_poweroff = true; ++ } + -+/* Check up to str_len chars of val_str to see if it's a valid value name: -+ * -+ * - Has between 1 and KUTF_HELPER_MAX_VAL_NAME_LEN characters before the \0 terminator -+ * - And, each char is in the character set [A-Z0-9_] */ -+static int validate_val_name(char *val_str, int str_len) -+{ -+ int i = 0; ++ kbdev->pm.backend.desired_shader_state = desired_bitmap; ++ kbdev->pm.backend.desired_tiler_state = desired_tiler_bitmap; + -+ for (i = 0; str_len && i <= KUTF_HELPER_MAX_VAL_NAME_LEN && val_str[i] != '\0'; ++i, --str_len) { -+ char val_chr = val_str[i]; ++ /* If any cores are being powered on, transition immediately */ ++ cores_are_available = kbase_pm_check_transitions_nolock(kbdev); ++ } else if (kbdev->pm.backend.desired_shader_state & ~desired_bitmap || ++ kbdev->pm.backend.desired_tiler_state & ++ ~desired_tiler_bitmap) { ++ /* Start timer to power off cores */ ++ kbdev->pm.backend.shader_poweroff_pending |= ++ (kbdev->pm.backend.desired_shader_state & ++ ~desired_bitmap); ++ kbdev->pm.backend.tiler_poweroff_pending |= ++ (kbdev->pm.backend.desired_tiler_state & ++ ~desired_tiler_bitmap); ++ if (kbdev->pm.poweroff_shader_ticks && ++ !kbdev->protected_mode_transition) ++ kbdev->pm.backend.shader_poweroff_pending_time = ++ kbdev->pm.poweroff_shader_ticks; ++ else ++ kbasep_pm_do_poweroff_cores(kbdev); ++ } else if (kbdev->pm.active_count == 0 && desired_bitmap != 0 && ++ desired_tiler_bitmap != 0 && ++ kbdev->pm.backend.poweroff_timer_needed) { ++ /* If power policy is keeping cores on despite there being no ++ * active contexts then disable poweroff timer as it isn't ++ * required. ++ * Only reset poweroff_timer_needed if we're not in the middle ++ * of the power off callback */ ++ kbdev->pm.backend.poweroff_timer_needed = false; ++ } + -+ if (val_chr >= 'A' && val_chr <= 'Z') -+ continue; -+ if (val_chr >= '0' && val_chr <= '9') -+ continue; -+ if (val_chr == '_') -+ continue; ++ /* Ensure timer does not power off wanted cores and make sure to power ++ * off unwanted cores */ ++ if (kbdev->pm.backend.shader_poweroff_pending || ++ kbdev->pm.backend.tiler_poweroff_pending) { ++ kbdev->pm.backend.shader_poweroff_pending &= ++ ~(kbdev->pm.backend.desired_shader_state & ++ desired_bitmap); ++ kbdev->pm.backend.tiler_poweroff_pending &= ++ ~(kbdev->pm.backend.desired_tiler_state & ++ desired_tiler_bitmap); + -+ /* Character not in the set [A-Z0-9_] - report error */ -+ return 1; ++ if (!kbdev->pm.backend.shader_poweroff_pending && ++ !kbdev->pm.backend.tiler_poweroff_pending) ++ kbdev->pm.backend.shader_poweroff_pending_time = 0; + } + -+ /* Names of 0 length are not valid */ -+ if (i == 0) -+ return 1; -+ /* Length greater than KUTF_HELPER_MAX_VAL_NAME_LEN not allowed */ -+ if (i > KUTF_HELPER_MAX_VAL_NAME_LEN || (i == KUTF_HELPER_MAX_VAL_NAME_LEN && val_str[i] != '\0')) -+ return 1; ++ /* Shader poweroff is deferred to the end of the function, to eliminate ++ * issues caused by the core availability policy recursing into this ++ * function */ ++ if (do_poweroff) ++ kbasep_pm_do_poweroff_cores(kbdev); + -+ return 0; ++ /* Don't need 'cores_are_available', because we don't return anything */ ++ CSTD_UNUSED(cores_are_available); +} + -+/* Find the length of the valid part of the string when it will be in quotes -+ * e.g. "str" -+ * -+ * That is, before any '\\', '\n' or '"' characters. This is so we don't have -+ * to escape the string */ -+static int find_quoted_string_valid_len(char *str) ++void kbase_pm_update_cores_state(struct kbase_device *kbdev) +{ -+ char *ptr; -+ const char *check_chars = "\\\n\""; ++ unsigned long flags; + -+ ptr = strpbrk(str, check_chars); -+ if (ptr) -+ return ptr-str; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ return strlen(str); -+} ++ kbase_pm_update_cores_state_nolock(kbdev); + -+#define MAX_U64_HEX_LEN 16 -+/* (Name size) + ("=0x" size) + (64-bit hex value size) + (terminator) */ -+#define NAMED_U64_VAL_BUF_SZ (KUTF_HELPER_MAX_VAL_NAME_LEN + 3 + MAX_U64_HEX_LEN + 1) ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++} + -+int kutf_helper_textbuf_send_named_u64(struct kutf_context *context, -+ struct kutf_helper_textbuf *textbuf, char *val_name, u64 val) ++int kbase_pm_list_policies(const struct kbase_pm_policy * const **list) +{ -+ int ret = 1; -+ char msgbuf[NAMED_U64_VAL_BUF_SZ]; -+ const char *errmsg = NULL; -+ -+ if (validate_val_name(val_name, KUTF_HELPER_MAX_VAL_NAME_LEN + 1)) { -+ errmsg = kutf_dsprintf(&context->fixture_pool, -+ "Failed to send u64 value named '%s': Invalid value name", val_name); -+ goto out_err; -+ } -+ -+ ret = snprintf(msgbuf, NAMED_U64_VAL_BUF_SZ, "%s=0x%llx", val_name, val); -+ if (ret >= NAMED_U64_VAL_BUF_SZ || ret < 0) { -+ errmsg = kutf_dsprintf(&context->fixture_pool, -+ "Failed to send u64 value named '%s': snprintf() problem buffer size==%d ret=%d", -+ val_name, NAMED_U64_VAL_BUF_SZ, ret); -+ goto out_err; -+ } -+ msgbuf[NAMED_U64_VAL_BUF_SZ-1] = '\0'; ++ if (!list) ++ return POLICY_COUNT; + -+ ret = kutf_helper_textbuf_enqueue(textbuf, msgbuf, NAMED_U64_VAL_BUF_SZ); -+ if (ret) { -+ errmsg = kutf_dsprintf(&context->fixture_pool, -+ "Failed to send u64 value named '%s': send returned %d", -+ val_name, ret); -+ goto out_err; -+ } ++ *list = policy_list; + -+ return ret; -+out_err: -+ kutf_test_fail(context, errmsg); -+ return ret; ++ return POLICY_COUNT; +} -+EXPORT_SYMBOL(kutf_helper_textbuf_send_named_u64); + -+#define NAMED_VALUE_SEP "=" -+#define NAMED_STR_START_DELIM NAMED_VALUE_SEP "\"" -+#define NAMED_STR_END_DELIM "\"" ++KBASE_EXPORT_TEST_API(kbase_pm_list_policies); + -+int kutf_helper_textbuf_max_str_len_for_kern(char *val_name, -+ int kern_buf_sz) ++const struct kbase_pm_policy *kbase_pm_get_policy(struct kbase_device *kbdev) +{ -+ int val_name_len = strlen(val_name); -+ int start_delim_len = strlen(NAMED_STR_START_DELIM); -+ int max_msg_len = kern_buf_sz - 1; -+ int max_str_len; -+ -+ /* We do not include the end delimiter. Providing there is a line -+ * ending character when sending the message, the end delimiter can be -+ * truncated off safely to allow proper NAME="value" reception when -+ * value's length is too long */ -+ max_str_len = max_msg_len - val_name_len - start_delim_len; ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ return max_str_len; ++ return kbdev->pm.backend.pm_current_policy; +} -+EXPORT_SYMBOL(kutf_helper_textbuf_max_str_len_for_kern); + -+int kutf_helper_textbuf_send_named_str(struct kutf_context *context, -+ struct kutf_helper_textbuf *textbuf, char *val_name, -+ char *val_str) -+{ -+ int val_str_len; -+ int str_buf_sz; -+ char *str_buf = NULL; -+ int ret = 1; -+ char *copy_ptr; -+ int val_name_len; -+ int start_delim_len = strlen(NAMED_STR_START_DELIM); -+ int end_delim_len = strlen(NAMED_STR_END_DELIM); -+ const char *errmsg = NULL; ++KBASE_EXPORT_TEST_API(kbase_pm_get_policy); + -+ if (validate_val_name(val_name, KUTF_HELPER_MAX_VAL_NAME_LEN + 1)) { -+ errmsg = kutf_dsprintf(&context->fixture_pool, -+ "Failed to send u64 value named '%s': Invalid value name", val_name); -+ goto out_err; -+ } -+ val_name_len = strlen(val_name); ++void kbase_pm_set_policy(struct kbase_device *kbdev, ++ const struct kbase_pm_policy *new_policy) ++{ ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ const struct kbase_pm_policy *old_policy; ++ unsigned long flags; + -+ val_str_len = find_quoted_string_valid_len(val_str); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(new_policy != NULL); + -+ /* (name length) + ("=\"" length) + (val_str len) + ("\"" length) + terminator */ -+ str_buf_sz = val_name_len + start_delim_len + val_str_len + end_delim_len + 1; ++ KBASE_TRACE_ADD(kbdev, PM_SET_POLICY, NULL, NULL, 0u, new_policy->id); + -+ /* Using kmalloc() here instead of mempool since we know we need to free -+ * before we return */ -+ str_buf = kmalloc(str_buf_sz, GFP_KERNEL); -+ if (!str_buf) { -+ errmsg = kutf_dsprintf(&context->fixture_pool, -+ "Failed to send str value named '%s': kmalloc failed, str_buf_sz=%d", -+ val_name, str_buf_sz); -+ goto out_err; -+ } -+ copy_ptr = str_buf; ++ /* During a policy change we pretend the GPU is active */ ++ /* A suspend won't happen here, because we're in a syscall from a ++ * userspace thread */ ++ kbase_pm_context_active(kbdev); + -+ /* Manually copy each string component instead of snprintf because -+ * val_str may need to end early, and less error path handling */ ++ mutex_lock(&js_devdata->runpool_mutex); ++ mutex_lock(&kbdev->pm.lock); + -+ /* name */ -+ memcpy(copy_ptr, val_name, val_name_len); -+ copy_ptr += val_name_len; ++ /* Remove the policy to prevent IRQ handlers from working on it */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ old_policy = kbdev->pm.backend.pm_current_policy; ++ kbdev->pm.backend.pm_current_policy = NULL; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ /* str start delimiter */ -+ memcpy(copy_ptr, NAMED_STR_START_DELIM, start_delim_len); -+ copy_ptr += start_delim_len; ++ KBASE_TRACE_ADD(kbdev, PM_CURRENT_POLICY_TERM, NULL, NULL, 0u, ++ old_policy->id); ++ if (old_policy->term) ++ old_policy->term(kbdev); + -+ /* str value */ -+ memcpy(copy_ptr, val_str, val_str_len); -+ copy_ptr += val_str_len; ++ KBASE_TRACE_ADD(kbdev, PM_CURRENT_POLICY_INIT, NULL, NULL, 0u, ++ new_policy->id); ++ if (new_policy->init) ++ new_policy->init(kbdev); + -+ /* str end delimiter */ -+ memcpy(copy_ptr, NAMED_STR_END_DELIM, end_delim_len); -+ copy_ptr += end_delim_len; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbdev->pm.backend.pm_current_policy = new_policy; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ /* Terminator */ -+ *copy_ptr = '\0'; ++ /* If any core power state changes were previously attempted, but ++ * couldn't be made because the policy was changing (current_policy was ++ * NULL), then re-try them here. */ ++ kbase_pm_update_active(kbdev); ++ kbase_pm_update_cores_state(kbdev); + -+ ret = kutf_helper_textbuf_enqueue(textbuf, str_buf, str_buf_sz); ++ mutex_unlock(&kbdev->pm.lock); ++ mutex_unlock(&js_devdata->runpool_mutex); + -+ if (ret) { -+ errmsg = kutf_dsprintf(&context->fixture_pool, -+ "Failed to send str value named '%s': send returned %d", -+ val_name, ret); -+ goto out_err; -+ } ++ /* Now the policy change is finished, we release our fake context active ++ * reference */ ++ kbase_pm_context_idle(kbdev); ++} + -+ kfree(str_buf); -+ return ret; ++KBASE_EXPORT_TEST_API(kbase_pm_set_policy); + -+out_err: -+ kutf_test_fail(context, errmsg); -+ kfree(str_buf); -+ return ret; ++/* Check whether a state change has finished, and trace it as completed */ ++static void ++kbase_pm_trace_check_and_finish_state_change(struct kbase_device *kbdev) ++{ ++ if ((kbdev->shader_available_bitmap & ++ kbdev->pm.backend.desired_shader_state) ++ == kbdev->pm.backend.desired_shader_state && ++ (kbdev->tiler_available_bitmap & ++ kbdev->pm.backend.desired_tiler_state) ++ == kbdev->pm.backend.desired_tiler_state) ++ kbase_timeline_pm_check_handle_event(kbdev, ++ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED); +} -+EXPORT_SYMBOL(kutf_helper_textbuf_send_named_str); + -+int kutf_helper_textbuf_receive_named_val(struct kutf_helper_named_val *named_val, -+ struct kutf_helper_textbuf *textbuf) ++void kbase_pm_request_cores(struct kbase_device *kbdev, ++ bool tiler_required, u64 shader_cores) +{ -+ int recv_sz; -+ char *recv_str; -+ char *search_ptr; -+ char *name_str = NULL; -+ int name_len; -+ int strval_len; -+ enum kutf_helper_valtype type = KUTF_HELPER_VALTYPE_INVALID; -+ char *strval = NULL; -+ u64 u64val = 0; -+ int orig_recv_sz; -+ int err = KUTF_HELPER_ERR_INVALID_VALUE; -+ -+ recv_str = kutf_helper_textbuf_dequeue(textbuf, &recv_sz); -+ if (!recv_str) -+ return -EBUSY; -+ else if (IS_ERR(recv_str)) -+ return PTR_ERR(recv_str); -+ orig_recv_sz = recv_sz; ++ u64 cores; + -+ /* Find the '=', grab the name and validate it */ -+ search_ptr = strnchr(recv_str, recv_sz, NAMED_VALUE_SEP[0]); -+ if (search_ptr) { -+ name_len = search_ptr - recv_str; -+ if (!validate_val_name(recv_str, name_len)) { -+ /* no need to reallocate - just modify string in place */ -+ name_str = recv_str; -+ name_str[name_len] = '\0'; ++ kbase_pm_change_state change_gpu_state = 0u; + -+ /* Move until after the '=' */ -+ recv_str += (name_len + 1); -+ recv_sz -= (name_len + 1); -+ } -+ } -+ if (!name_str) { -+ pr_err("Invalid name part for recevied string '%s'\n", recv_str); -+ return KUTF_HELPER_ERR_INVALID_NAME; -+ } ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ /* detect value type */ -+ if (*recv_str == NAMED_STR_START_DELIM[1]) { -+ /* string delimiter start*/ -+ ++recv_str; -+ --recv_sz; ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ /* Find end of string */ -+ search_ptr = strnchr(recv_str, recv_sz, NAMED_STR_END_DELIM[0]); -+ if (search_ptr) { -+ strval_len = search_ptr - recv_str; -+ /* Validate the string to ensure it contains no quotes */ -+ if (strval_len == find_quoted_string_valid_len(recv_str)) { -+ /* no need to reallocate - just modify string in place */ -+ strval = recv_str; -+ strval[strval_len] = '\0'; ++ cores = shader_cores; ++ while (cores) { ++ int bitnum = fls64(cores) - 1; ++ u64 bit = 1ULL << bitnum; + -+ /* Move until after the end delimiter */ -+ recv_str += (strval_len + 1); -+ recv_sz -= (strval_len + 1); -+ type = KUTF_HELPER_VALTYPE_STR; -+ } else { -+ pr_err("String value contains invalid characters in rest of received string '%s'\n", recv_str); -+ err = KUTF_HELPER_ERR_CHARS_AFTER_VAL; -+ } -+ } else if (orig_recv_sz == textbuf->max_line_size) { -+ /* No end-delimiter found, but the line is at -+ * the max line size. Assume that before -+ * truncation the line had a closing delimiter -+ * anyway */ -+ strval_len = strlen(recv_str); -+ /* Validate the string to ensure it contains no quotes */ -+ if (strval_len == find_quoted_string_valid_len(recv_str)) { -+ strval = recv_str; ++ /* It should be almost impossible for this to overflow. It would ++ * require 2^32 atoms to request a particular core, which would ++ * require 2^24 contexts to submit. This would require an amount ++ * of memory that is impossible on a 32-bit system and extremely ++ * unlikely on a 64-bit system. */ ++ int cnt = ++kbdev->shader_needed_cnt[bitnum]; + -+ /* Move to the end of the string */ -+ recv_str += strval_len; -+ recv_sz -= strval_len; -+ type = KUTF_HELPER_VALTYPE_STR; -+ } else { -+ pr_err("String value contains invalid characters in rest of received string '%s'\n", recv_str); -+ err = KUTF_HELPER_ERR_CHARS_AFTER_VAL; -+ } -+ } else { -+ pr_err("End of string delimiter not found in rest of received string '%s'\n", recv_str); -+ err = KUTF_HELPER_ERR_NO_END_DELIMITER; ++ if (1 == cnt) { ++ kbdev->shader_needed_bitmap |= bit; ++ change_gpu_state |= KBASE_PM_CHANGE_STATE_SHADER; + } -+ } else { -+ /* possibly a number value - strtoull will parse it */ -+ err = kstrtoull(recv_str, 0, &u64val); -+ /* unlike userspace can't get an end ptr, but if kstrtoull() -+ * reads characters after the number it'll report -EINVAL */ -+ if (!err) { -+ int len_remain = strnlen(recv_str, recv_sz); + -+ type = KUTF_HELPER_VALTYPE_U64; -+ recv_str += len_remain; -+ recv_sz -= len_remain; -+ } else { -+ /* special case: not a number, report as such */ -+ pr_err("Rest of received string was not a numeric value or quoted string value: '%s'\n", recv_str); -+ } ++ cores &= ~bit; + } + -+ if (type == KUTF_HELPER_VALTYPE_INVALID) -+ return err; ++ if (tiler_required) { ++ int cnt = ++kbdev->tiler_needed_cnt; + -+ /* Any remaining characters - error */ -+ if (strnlen(recv_str, recv_sz) != 0) { -+ pr_err("Characters remain after value of type %s: '%s'\n", -+ get_val_type_name(type), recv_str); -+ return KUTF_HELPER_ERR_CHARS_AFTER_VAL; -+ } ++ if (1 == cnt) ++ change_gpu_state |= KBASE_PM_CHANGE_STATE_TILER; + -+ /* Success - write into the output structure */ -+ switch (type) { -+ case KUTF_HELPER_VALTYPE_U64: -+ named_val->u.val_u64 = u64val; -+ break; -+ case KUTF_HELPER_VALTYPE_STR: -+ named_val->u.val_str = strval; -+ break; -+ default: -+ pr_err("Unreachable, fix textbuf_receive_named_val\n"); -+ /* Coding error, report as though 'data' file failed */ -+ return -EINVAL; ++ KBASE_DEBUG_ASSERT(kbdev->tiler_needed_cnt != 0); + } + -+ named_val->val_name = name_str; -+ named_val->type = type; ++ if (change_gpu_state) { ++ KBASE_TRACE_ADD(kbdev, PM_REQUEST_CHANGE_SHADER_NEEDED, NULL, ++ NULL, 0u, (u32) kbdev->shader_needed_bitmap); + -+ return KUTF_HELPER_ERR_NONE; ++ kbase_timeline_pm_cores_func(kbdev, ++ KBASE_PM_FUNC_ID_REQUEST_CORES_START, ++ change_gpu_state); ++ kbase_pm_update_cores_state_nolock(kbdev); ++ kbase_timeline_pm_cores_func(kbdev, ++ KBASE_PM_FUNC_ID_REQUEST_CORES_END, ++ change_gpu_state); ++ } +} -+EXPORT_SYMBOL(kutf_helper_textbuf_receive_named_val); + -+#define DUMMY_MSG "" -+int kutf_helper_textbuf_receive_check_val(struct kutf_helper_named_val *named_val, -+ struct kutf_context *context, struct kutf_helper_textbuf *textbuf, -+ char *expect_val_name, enum kutf_helper_valtype expect_val_type) ++KBASE_EXPORT_TEST_API(kbase_pm_request_cores); ++ ++void kbase_pm_unrequest_cores(struct kbase_device *kbdev, ++ bool tiler_required, u64 shader_cores) +{ -+ int err; ++ kbase_pm_change_state change_gpu_state = 0u; + -+ err = kutf_helper_textbuf_receive_named_val(named_val, textbuf); -+ if (err < 0) { -+ const char *msg = kutf_dsprintf(&context->fixture_pool, -+ "Failed to receive value named '%s'", -+ expect_val_name); -+ kutf_test_fail(context, msg); -+ return err; -+ } else if (err > 0) { -+ const char *msg = kutf_dsprintf(&context->fixture_pool, -+ "Named-value parse error when expecting value named '%s'", -+ expect_val_name); -+ kutf_test_fail(context, msg); -+ goto out_fail_and_fixup; -+ } ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ if (strcmp(named_val->val_name, expect_val_name) != 0) { -+ const char *msg = kutf_dsprintf(&context->fixture_pool, -+ "Expecting to receive value named '%s' but got '%s'", -+ expect_val_name, named_val->val_name); -+ kutf_test_fail(context, msg); -+ goto out_fail_and_fixup; -+ } ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ while (shader_cores) { ++ int bitnum = fls64(shader_cores) - 1; ++ u64 bit = 1ULL << bitnum; ++ int cnt; + ++ KBASE_DEBUG_ASSERT(kbdev->shader_needed_cnt[bitnum] > 0); + -+ if (named_val->type != expect_val_type) { -+ const char *msg = kutf_dsprintf(&context->fixture_pool, -+ "Expecting value named '%s' to be of type %s but got %s", -+ expect_val_name, get_val_type_name(expect_val_type), -+ get_val_type_name(named_val->type)); -+ kutf_test_fail(context, msg); -+ goto out_fail_and_fixup; ++ cnt = --kbdev->shader_needed_cnt[bitnum]; ++ ++ if (0 == cnt) { ++ kbdev->shader_needed_bitmap &= ~bit; ++ ++ change_gpu_state |= KBASE_PM_CHANGE_STATE_SHADER; ++ } ++ ++ shader_cores &= ~bit; + } + -+ return err; ++ if (tiler_required) { ++ int cnt; + -+out_fail_and_fixup: -+ /* Produce a valid but incorrect value */ -+ switch (expect_val_type) { -+ case KUTF_HELPER_VALTYPE_U64: -+ named_val->u.val_u64 = 0ull; -+ break; -+ case KUTF_HELPER_VALTYPE_STR: -+ { -+ char *str = kutf_mempool_alloc(&context->fixture_pool, sizeof(DUMMY_MSG)); ++ KBASE_DEBUG_ASSERT(kbdev->tiler_needed_cnt > 0); + -+ if (!str) -+ return -1; ++ cnt = --kbdev->tiler_needed_cnt; + -+ strcpy(str, DUMMY_MSG); -+ named_val->u.val_str = str; -+ break; -+ } -+ default: -+ break; ++ if (0 == cnt) ++ change_gpu_state |= KBASE_PM_CHANGE_STATE_TILER; + } + -+ /* Indicate that this is invalid */ -+ named_val->type = KUTF_HELPER_VALTYPE_INVALID; ++ if (change_gpu_state) { ++ KBASE_TRACE_ADD(kbdev, PM_UNREQUEST_CHANGE_SHADER_NEEDED, NULL, ++ NULL, 0u, (u32) kbdev->shader_needed_bitmap); + -+ /* But at least allow the caller to continue in the test with failures */ -+ return 0; ++ kbase_pm_update_cores_state_nolock(kbdev); ++ ++ /* Trace that any state change effectively completes immediately ++ * - no-one will wait on the state change */ ++ kbase_pm_trace_check_and_finish_state_change(kbdev); ++ } +} -+EXPORT_SYMBOL(kutf_helper_textbuf_receive_check_val); + -+void kutf_helper_output_named_val(struct kutf_helper_named_val *named_val) ++KBASE_EXPORT_TEST_API(kbase_pm_unrequest_cores); ++ ++enum kbase_pm_cores_ready ++kbase_pm_register_inuse_cores(struct kbase_device *kbdev, ++ bool tiler_required, u64 shader_cores) +{ -+ switch (named_val->type) { -+ case KUTF_HELPER_VALTYPE_U64: -+ pr_warn("%s=0x%llx\n", named_val->val_name, named_val->u.val_u64); -+ break; -+ case KUTF_HELPER_VALTYPE_STR: -+ pr_warn("%s=\"%s\"\n", named_val->val_name, named_val->u.val_str); -+ break; -+ case KUTF_HELPER_VALTYPE_INVALID: -+ pr_warn("%s is invalid\n", named_val->val_name); -+ break; -+ default: -+ pr_warn("%s has unknown type %d\n", named_val->val_name, named_val->type); -+ break; ++ u64 prev_shader_needed; /* Just for tracing */ ++ u64 prev_shader_inuse; /* Just for tracing */ ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ prev_shader_needed = kbdev->shader_needed_bitmap; ++ prev_shader_inuse = kbdev->shader_inuse_bitmap; ++ ++ /* If desired_shader_state does not contain the requested cores, then ++ * power management is not attempting to powering those cores (most ++ * likely due to core availability policy) and a new job affinity must ++ * be chosen */ ++ if ((kbdev->pm.backend.desired_shader_state & shader_cores) != ++ shader_cores) { ++ return (kbdev->pm.backend.poweroff_wait_in_progress || ++ kbdev->pm.backend.pm_current_policy == NULL) ? ++ KBASE_CORES_NOT_READY : KBASE_NEW_AFFINITY; + } -+} -+EXPORT_SYMBOL(kutf_helper_output_named_val); -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_mem.c b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_mem.c -new file mode 100755 -index 000000000000..a75e15fde05f ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_mem.c -@@ -0,0 +1,102 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ + ++ if ((kbdev->shader_available_bitmap & shader_cores) != shader_cores || ++ (tiler_required && !kbdev->tiler_available_bitmap)) { ++ /* Trace ongoing core transition */ ++ kbase_timeline_pm_l2_transition_start(kbdev); ++ return KBASE_CORES_NOT_READY; ++ } + ++ /* If we started to trace a state change, then trace it has being ++ * finished by now, at the very latest */ ++ kbase_pm_trace_check_and_finish_state_change(kbdev); ++ /* Trace core transition done */ ++ kbase_timeline_pm_l2_transition_done(kbdev); + -+/* Kernel UTF memory management functions */ ++ while (shader_cores) { ++ int bitnum = fls64(shader_cores) - 1; ++ u64 bit = 1ULL << bitnum; ++ int cnt; + -+#include -+#include ++ KBASE_DEBUG_ASSERT(kbdev->shader_needed_cnt[bitnum] > 0); + -+#include ++ cnt = --kbdev->shader_needed_cnt[bitnum]; + ++ if (0 == cnt) ++ kbdev->shader_needed_bitmap &= ~bit; + -+/** -+ * struct kutf_alloc_entry - Structure representing an allocation. -+ * @node: List node for use with kutf_mempool. -+ * @data: Data area of the allocation -+ */ -+struct kutf_alloc_entry { -+ struct list_head node; -+ u8 data[0]; -+}; ++ /* shader_inuse_cnt should not overflow because there can only ++ * be a very limited number of jobs on the h/w at one time */ + -+int kutf_mempool_init(struct kutf_mempool *pool) -+{ -+ if (!pool) { -+ pr_err("NULL pointer passed to %s\n", __func__); -+ return -1; ++ kbdev->shader_inuse_cnt[bitnum]++; ++ kbdev->shader_inuse_bitmap |= bit; ++ ++ shader_cores &= ~bit; + } + -+ INIT_LIST_HEAD(&pool->head); -+ mutex_init(&pool->lock); ++ if (tiler_required) { ++ KBASE_DEBUG_ASSERT(kbdev->tiler_needed_cnt > 0); + -+ return 0; -+} -+EXPORT_SYMBOL(kutf_mempool_init); ++ --kbdev->tiler_needed_cnt; + -+void kutf_mempool_destroy(struct kutf_mempool *pool) -+{ -+ struct list_head *remove; -+ struct list_head *tmp; ++ kbdev->tiler_inuse_cnt++; + -+ if (!pool) { -+ pr_err("NULL pointer passed to %s\n", __func__); -+ return; ++ KBASE_DEBUG_ASSERT(kbdev->tiler_inuse_cnt != 0); + } + -+ mutex_lock(&pool->lock); -+ list_for_each_safe(remove, tmp, &pool->head) { -+ struct kutf_alloc_entry *remove_alloc; ++ if (prev_shader_needed != kbdev->shader_needed_bitmap) ++ KBASE_TRACE_ADD(kbdev, PM_REGISTER_CHANGE_SHADER_NEEDED, NULL, ++ NULL, 0u, (u32) kbdev->shader_needed_bitmap); + -+ remove_alloc = list_entry(remove, struct kutf_alloc_entry, node); -+ list_del(&remove_alloc->node); -+ kfree(remove_alloc); -+ } -+ mutex_unlock(&pool->lock); ++ if (prev_shader_inuse != kbdev->shader_inuse_bitmap) ++ KBASE_TRACE_ADD(kbdev, PM_REGISTER_CHANGE_SHADER_INUSE, NULL, ++ NULL, 0u, (u32) kbdev->shader_inuse_bitmap); + ++ return KBASE_CORES_READY; +} -+EXPORT_SYMBOL(kutf_mempool_destroy); + -+void *kutf_mempool_alloc(struct kutf_mempool *pool, size_t size) -+{ -+ struct kutf_alloc_entry *ret; ++KBASE_EXPORT_TEST_API(kbase_pm_register_inuse_cores); + -+ if (!pool) { -+ pr_err("NULL pointer passed to %s\n", __func__); -+ goto fail_pool; -+ } ++void kbase_pm_release_cores(struct kbase_device *kbdev, ++ bool tiler_required, u64 shader_cores) ++{ ++ kbase_pm_change_state change_gpu_state = 0u; + -+ mutex_lock(&pool->lock); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ ret = kmalloc(sizeof(*ret) + size, GFP_KERNEL); -+ if (!ret) { -+ pr_err("Failed to allocate memory\n"); -+ goto fail_alloc; -+ } ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ INIT_LIST_HEAD(&ret->node); -+ list_add(&ret->node, &pool->head); ++ while (shader_cores) { ++ int bitnum = fls64(shader_cores) - 1; ++ u64 bit = 1ULL << bitnum; ++ int cnt; + -+ mutex_unlock(&pool->lock); ++ KBASE_DEBUG_ASSERT(kbdev->shader_inuse_cnt[bitnum] > 0); + -+ return &ret->data[0]; ++ cnt = --kbdev->shader_inuse_cnt[bitnum]; + -+fail_alloc: -+ mutex_unlock(&pool->lock); -+fail_pool: -+ return NULL; -+} -+EXPORT_SYMBOL(kutf_mempool_alloc); -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_resultset.c b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_resultset.c -new file mode 100755 -index 000000000000..5bd04969fd55 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_resultset.c -@@ -0,0 +1,95 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ if (0 == cnt) { ++ kbdev->shader_inuse_bitmap &= ~bit; ++ change_gpu_state |= KBASE_PM_CHANGE_STATE_SHADER; ++ } + ++ shader_cores &= ~bit; ++ } + ++ if (tiler_required) { ++ int cnt; + -+/* Kernel UTF result management functions */ ++ KBASE_DEBUG_ASSERT(kbdev->tiler_inuse_cnt > 0); + -+#include -+#include -+#include ++ cnt = --kbdev->tiler_inuse_cnt; + -+#include ++ if (0 == cnt) ++ change_gpu_state |= KBASE_PM_CHANGE_STATE_TILER; ++ } + -+/** -+ * struct kutf_result_set - Represents a set of results. -+ * @results: Pointer to the linked list where the results are stored. -+ */ -+struct kutf_result_set { -+ struct list_head results; -+}; ++ if (change_gpu_state) { ++ KBASE_TRACE_ADD(kbdev, PM_RELEASE_CHANGE_SHADER_INUSE, NULL, ++ NULL, 0u, (u32) kbdev->shader_inuse_bitmap); + -+struct kutf_result_set *kutf_create_result_set(void) -+{ -+ struct kutf_result_set *set; ++ kbase_timeline_pm_cores_func(kbdev, ++ KBASE_PM_FUNC_ID_RELEASE_CORES_START, ++ change_gpu_state); ++ kbase_pm_update_cores_state_nolock(kbdev); ++ kbase_timeline_pm_cores_func(kbdev, ++ KBASE_PM_FUNC_ID_RELEASE_CORES_END, ++ change_gpu_state); + -+ set = kmalloc(sizeof(*set), GFP_KERNEL); -+ if (!set) { -+ pr_err("Failed to allocate resultset"); -+ goto fail_alloc; ++ /* Trace that any state change completed immediately */ ++ kbase_pm_trace_check_and_finish_state_change(kbdev); + } ++} + -+ INIT_LIST_HEAD(&set->results); ++KBASE_EXPORT_TEST_API(kbase_pm_release_cores); + -+ return set; ++void kbase_pm_request_cores_sync(struct kbase_device *kbdev, ++ bool tiler_required, ++ u64 shader_cores) ++{ ++ unsigned long flags; + -+fail_alloc: -+ return NULL; ++ kbase_pm_wait_for_poweroff_complete(kbdev); ++ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_pm_request_cores(kbdev, tiler_required, shader_cores); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ kbase_pm_check_transitions_sync(kbdev); +} + -+void kutf_add_result(struct kutf_mempool *mempool, -+ struct kutf_result_set *set, -+ enum kutf_result_status status, -+ const char *message) ++KBASE_EXPORT_TEST_API(kbase_pm_request_cores_sync); ++ ++void kbase_pm_request_l2_caches(struct kbase_device *kbdev) +{ -+ /* Create the new result */ -+ struct kutf_result *new_result; ++ unsigned long flags; ++ u32 prior_l2_users_count; + -+ BUG_ON(set == NULL); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ new_result = kutf_mempool_alloc(mempool, sizeof(*new_result)); -+ if (!new_result) { -+ pr_err("Result allocation failed\n"); -+ return; -+ } ++ prior_l2_users_count = kbdev->l2_users_count++; + -+ INIT_LIST_HEAD(&new_result->node); -+ new_result->status = status; -+ new_result->message = message; ++ KBASE_DEBUG_ASSERT(kbdev->l2_users_count != 0); + -+ list_add_tail(&new_result->node, &set->results); ++ /* if the GPU is reset while the l2 is on, l2 will be off but ++ * prior_l2_users_count will be > 0. l2_available_bitmap will have been ++ * set to 0 though by kbase_pm_init_hw */ ++ if (!prior_l2_users_count || !kbdev->l2_available_bitmap) ++ kbase_pm_check_transitions_nolock(kbdev); ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ wait_event(kbdev->pm.backend.l2_powered_wait, ++ kbdev->pm.backend.l2_powered == 1); ++ ++ /* Trace that any state change completed immediately */ ++ kbase_pm_trace_check_and_finish_state_change(kbdev); +} + -+void kutf_destroy_result_set(struct kutf_result_set *set) ++KBASE_EXPORT_TEST_API(kbase_pm_request_l2_caches); ++ ++void kbase_pm_request_l2_caches_l2_is_on(struct kbase_device *kbdev) +{ -+ if (!list_empty(&set->results)) -+ pr_err("kutf_destroy_result_set: Unread results from test\n"); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ kfree(set); ++ kbdev->l2_users_count++; +} + -+struct kutf_result *kutf_remove_result(struct kutf_result_set *set) ++KBASE_EXPORT_TEST_API(kbase_pm_request_l2_caches_l2_is_on); ++ ++void kbase_pm_release_l2_caches(struct kbase_device *kbdev) +{ -+ if (!list_empty(&set->results)) { -+ struct kutf_result *ret; ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ ret = list_first_entry(&set->results, struct kutf_result, node); -+ list_del(&ret->node); -+ return ret; -+ } ++ KBASE_DEBUG_ASSERT(kbdev->l2_users_count > 0); + -+ return NULL; ++ --kbdev->l2_users_count; ++ ++ if (!kbdev->l2_users_count) { ++ kbase_pm_check_transitions_nolock(kbdev); ++ /* Trace that any state change completed immediately */ ++ kbase_pm_trace_check_and_finish_state_change(kbdev); ++ } +} + -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_suite.c b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_suite.c ++KBASE_EXPORT_TEST_API(kbase_pm_release_l2_caches); +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h new file mode 100755 -index 000000000000..ad30cc86a3b0 +index 000000000..611a90e66 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_suite.c -@@ -0,0 +1,1398 @@ ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h +@@ -0,0 +1,227 @@ +/* + * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2010-2015 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -337550,1608 +373510,1332 @@ index 000000000000..ad30cc86a3b0 + + + -+/* Kernel UTF suite, test and fixture management including user to kernel -+ * interaction */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+#include -+#include -+#include ++/* ++ * Power policy API definitions ++ */ + -+#if defined(CONFIG_DEBUG_FS) ++#ifndef _KBASE_PM_POLICY_H_ ++#define _KBASE_PM_POLICY_H_ + +/** -+ * struct kutf_application - Structure which represents kutf application -+ * @name: The name of this test application. -+ * @dir: The debugfs directory for this test -+ * @suite_list: List head to store all the suites which are part of this -+ * application ++ * kbase_pm_policy_init - Initialize power policy framework ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Must be called before calling any other policy function ++ * ++ * Return: 0 if the power policy framework was successfully ++ * initialized, -errno otherwise. + */ -+struct kutf_application { -+ const char *name; -+ struct dentry *dir; -+ struct list_head suite_list; -+}; ++int kbase_pm_policy_init(struct kbase_device *kbdev); + +/** -+ * struct kutf_test_function - Structure which represents kutf test function -+ * @suite: Back reference to the suite this test function -+ * belongs to -+ * @filters: Filters that apply to this test function -+ * @test_id: Test ID -+ * @execute: Function to run for this test -+ * @test_data: Static data for this test -+ * @node: List node for test_list -+ * @variant_list: List head to store all the variants which can run on -+ * this function -+ * @dir: debugfs directory for this test function -+ * @userdata_ops: Callbacks to use for sending and receiving data to -+ * userspace. ++ * kbase_pm_policy_term - Terminate power policy framework ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + */ -+struct kutf_test_function { -+ struct kutf_suite *suite; -+ unsigned int filters; -+ unsigned int test_id; -+ void (*execute)(struct kutf_context *context); -+ union kutf_callback_data test_data; -+ struct list_head node; -+ struct list_head variant_list; -+ struct dentry *dir; -+ struct kutf_userdata_ops userdata_ops; -+}; ++void kbase_pm_policy_term(struct kbase_device *kbdev); + +/** -+ * struct kutf_test_fixture - Structure which holds information on the kutf -+ * test fixture -+ * @test_func: Test function this fixture belongs to -+ * @fixture_index: Index of this fixture -+ * @node: List node for variant_list -+ * @dir: debugfs directory for this test fixture -+ * @nr_running: Current count of user-clients running this fixture ++ * kbase_pm_update_active - Update the active power state of the GPU ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Calls into the current power policy + */ -+struct kutf_test_fixture { -+ struct kutf_test_function *test_func; -+ unsigned int fixture_index; -+ struct list_head node; -+ struct dentry *dir; -+ atomic_t nr_running; -+}; -+ -+struct dentry *base_dir; ++void kbase_pm_update_active(struct kbase_device *kbdev); + +/** -+ * struct kutf_convert_table - Structure which keeps test results -+ * @result_name: Status of the test result -+ * @result: Status value for a single test ++ * kbase_pm_update_cores - Update the desired core state of the GPU ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Calls into the current power policy + */ -+struct kutf_convert_table { -+ char result_name[50]; -+ enum kutf_result_status result; -+}; ++void kbase_pm_update_cores(struct kbase_device *kbdev); + -+struct kutf_convert_table kutf_convert[] = { -+#define ADD_UTF_RESULT(_name) \ -+{ \ -+ #_name, \ -+ _name, \ -+}, -+ADD_UTF_RESULT(KUTF_RESULT_BENCHMARK) -+ADD_UTF_RESULT(KUTF_RESULT_SKIP) -+ADD_UTF_RESULT(KUTF_RESULT_UNKNOWN) -+ADD_UTF_RESULT(KUTF_RESULT_PASS) -+ADD_UTF_RESULT(KUTF_RESULT_DEBUG) -+ADD_UTF_RESULT(KUTF_RESULT_INFO) -+ADD_UTF_RESULT(KUTF_RESULT_WARN) -+ADD_UTF_RESULT(KUTF_RESULT_FAIL) -+ADD_UTF_RESULT(KUTF_RESULT_FATAL) -+ADD_UTF_RESULT(KUTF_RESULT_ABORT) ++ ++enum kbase_pm_cores_ready { ++ KBASE_CORES_NOT_READY = 0, ++ KBASE_NEW_AFFINITY = 1, ++ KBASE_CORES_READY = 2 +}; + -+#define UTF_CONVERT_SIZE (ARRAY_SIZE(kutf_convert)) + +/** -+ * kutf_create_context() - Create a test context in which a specific fixture -+ * of an application will be run and its results -+ * reported back to the user -+ * @test_fix: Test fixture to be run. ++ * kbase_pm_request_cores_sync - Synchronous variant of kbase_pm_request_cores() + * -+ * The context's refcount will be initialized to 1. ++ * @kbdev: The kbase device structure for the device ++ * @tiler_required: true if the tiler is required, false otherwise ++ * @shader_cores: A bitmask of shader cores which are necessary for the job + * -+ * Return: Returns the created test context on success or NULL on failure ++ * When this function returns, the @shader_cores will be in the READY state. ++ * ++ * This is safe variant of kbase_pm_check_transitions_sync(): it handles the ++ * work of ensuring the requested cores will remain powered until a matching ++ * call to kbase_pm_unrequest_cores()/kbase_pm_release_cores() (as appropriate) ++ * is made. + */ -+static struct kutf_context *kutf_create_context( -+ struct kutf_test_fixture *test_fix); ++void kbase_pm_request_cores_sync(struct kbase_device *kbdev, ++ bool tiler_required, u64 shader_cores); + +/** -+ * kutf_destroy_context() - Destroy a previously created test context, only -+ * once its refcount has become zero -+ * @kref: pointer to kref member within the context ++ * kbase_pm_request_cores - Mark one or more cores as being required ++ * for jobs to be submitted + * -+ * This should only be used via a kref_put() call on the context's kref member ++ * @kbdev: The kbase device structure for the device ++ * @tiler_required: true if the tiler is required, false otherwise ++ * @shader_cores: A bitmask of shader cores which are necessary for the job ++ * ++ * This function is called by the job scheduler to mark one or more cores as ++ * being required to submit jobs that are ready to run. ++ * ++ * The cores requested are reference counted and a subsequent call to ++ * kbase_pm_register_inuse_cores() or kbase_pm_unrequest_cores() should be ++ * made to dereference the cores as being 'needed'. ++ * ++ * The active power policy will meet or exceed the requirements of the ++ * requested cores in the system. Any core transitions needed will be begun ++ * immediately, but they might not complete/the cores might not be available ++ * until a Power Management IRQ. ++ * ++ * Return: 0 if the cores were successfully requested, or -errno otherwise. + */ -+static void kutf_destroy_context(struct kref *kref); ++void kbase_pm_request_cores(struct kbase_device *kbdev, ++ bool tiler_required, u64 shader_cores); + +/** -+ * kutf_context_get() - increment refcount on a context -+ * @context: the kutf context ++ * kbase_pm_unrequest_cores - Unmark one or more cores as being required for ++ * jobs to be submitted. + * -+ * This must be used when the lifetime of the context might exceed that of the -+ * thread creating @context ++ * @kbdev: The kbase device structure for the device ++ * @tiler_required: true if the tiler is required, false otherwise ++ * @shader_cores: A bitmask of shader cores (as given to ++ * kbase_pm_request_cores() ) ++ * ++ * This function undoes the effect of kbase_pm_request_cores(). It should be ++ * used when a job is not going to be submitted to the hardware (e.g. the job is ++ * cancelled before it is enqueued). ++ * ++ * The active power policy will meet or exceed the requirements of the ++ * requested cores in the system. Any core transitions needed will be begun ++ * immediately, but they might not complete until a Power Management IRQ. ++ * ++ * The policy may use this as an indication that it can power down cores. + */ -+static void kutf_context_get(struct kutf_context *context); ++void kbase_pm_unrequest_cores(struct kbase_device *kbdev, ++ bool tiler_required, u64 shader_cores); + +/** -+ * kutf_context_put() - decrement refcount on a context, destroying it when it -+ * reached zero -+ * @context: the kutf context ++ * kbase_pm_register_inuse_cores - Register a set of cores as in use by a job + * -+ * This must be used only after a corresponding kutf_context_get() call on -+ * @context, and the caller no longer needs access to @context. ++ * @kbdev: The kbase device structure for the device ++ * @tiler_required: true if the tiler is required, false otherwise ++ * @shader_cores: A bitmask of shader cores (as given to ++ * kbase_pm_request_cores() ) ++ * ++ * This function should be called after kbase_pm_request_cores() when the job ++ * is about to be submitted to the hardware. It will check that the necessary ++ * cores are available and if so update the 'needed' and 'inuse' bitmasks to ++ * reflect that the job is now committed to being run. ++ * ++ * If the necessary cores are not currently available then the function will ++ * return %KBASE_CORES_NOT_READY and have no effect. ++ * ++ * Return: %KBASE_CORES_NOT_READY if the cores are not immediately ready, ++ * ++ * %KBASE_NEW_AFFINITY if the affinity requested is not allowed, ++ * ++ * %KBASE_CORES_READY if the cores requested are already available + */ -+static void kutf_context_put(struct kutf_context *context); ++enum kbase_pm_cores_ready kbase_pm_register_inuse_cores( ++ struct kbase_device *kbdev, ++ bool tiler_required, ++ u64 shader_cores); + +/** -+ * kutf_set_result() - Set the test result against the specified test context -+ * @context: Test context -+ * @status: Result status ++ * kbase_pm_release_cores - Release cores after a job has run ++ * ++ * @kbdev: The kbase device structure for the device ++ * @tiler_required: true if the tiler is required, false otherwise ++ * @shader_cores: A bitmask of shader cores (as given to ++ * kbase_pm_register_inuse_cores() ) ++ * ++ * This function should be called when a job has finished running on the ++ * hardware. A call to kbase_pm_register_inuse_cores() must have previously ++ * occurred. The reference counts of the specified cores will be decremented ++ * which may cause the bitmask of 'inuse' cores to be reduced. The power policy ++ * may then turn off any cores which are no longer 'inuse'. + */ -+static void kutf_set_result(struct kutf_context *context, -+ enum kutf_result_status status); ++void kbase_pm_release_cores(struct kbase_device *kbdev, ++ bool tiler_required, u64 shader_cores); + +/** -+ * kutf_set_expected_result() - Set the expected test result for the specified -+ * test context -+ * @context: Test context -+ * @expected_status: Expected result status ++ * kbase_pm_request_l2_caches - Request l2 caches ++ * ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Request the use of l2 caches for all core groups, power up, wait and prevent ++ * the power manager from powering down the l2 caches. ++ * ++ * This tells the power management that the caches should be powered up, and ++ * they should remain powered, irrespective of the usage of shader cores. This ++ * does not return until the l2 caches are powered up. ++ * ++ * The caller must call kbase_pm_release_l2_caches() when they are finished ++ * to allow normal power management of the l2 caches to resume. ++ * ++ * This should only be used when power management is active. + */ -+static void kutf_set_expected_result(struct kutf_context *context, -+ enum kutf_result_status expected_status); -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)) -+/* Pre 3.4.0 kernels don't have the simple_open helper */ ++void kbase_pm_request_l2_caches(struct kbase_device *kbdev); + +/** -+ * simple_open() - Helper for file opening which stores the inode private data -+ * into the file private data -+ * @inode: File entry representation -+ * @file: A specific opening of the file ++ * kbase_pm_request_l2_caches_l2_is_on - Request l2 caches but don't power on + * -+ * Return: always 0; if inode private data do not exist, the file will not -+ * be assigned private data ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * ++ * Increment the count of l2 users but do not attempt to power on the l2 ++ * ++ * It is the callers responsibility to ensure that the l2 is already powered up ++ * and to eventually call kbase_pm_release_l2_caches() + */ -+static int simple_open(struct inode *inode, struct file *file) -+{ -+ if (inode->i_private) -+ file->private_data = inode->i_private; -+ return 0; -+} -+#endif ++void kbase_pm_request_l2_caches_l2_is_on(struct kbase_device *kbdev); + +/** -+ * kutf_result_to_string() - Converts a KUTF result into a string -+ * @result_str: Output result string -+ * @result: Result status to convert ++ * kbase_pm_request_l2_caches - Release l2 caches + * -+ * Return: 1 if test result was successfully converted to string, 0 otherwise -+ */ -+static int kutf_result_to_string(char **result_str, -+ enum kutf_result_status result) -+{ -+ int i; -+ int ret = 0; -+ -+ for (i = 0; i < UTF_CONVERT_SIZE; i++) { -+ if (result == kutf_convert[i].result) { -+ *result_str = kutf_convert[i].result_name; -+ ret = 1; -+ } -+ } -+ return ret; -+} -+ -+/** -+ * kutf_debugfs_const_string_read() - Simple debugfs read callback which -+ * returns a constant string -+ * @file: Opened file to read from -+ * @buf: User buffer to write the data into -+ * @len: Amount of data to read -+ * @ppos: Offset into file to read from ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) + * -+ * Return: On success, the number of bytes read and offset @ppos advanced by -+ * this number; on error, negative value ++ * Release the use of l2 caches for all core groups and allow the power manager ++ * to power them down when necessary. ++ * ++ * This tells the power management that the caches can be powered down if ++ * necessary, with respect to the usage of shader cores. ++ * ++ * The caller must have called kbase_pm_request_l2_caches() prior to a call ++ * to this. ++ * ++ * This should only be used when power management is active. + */ -+static ssize_t kutf_debugfs_const_string_read(struct file *file, -+ char __user *buf, size_t len, loff_t *ppos) -+{ -+ char *str = file->private_data; -+ -+ return simple_read_from_buffer(buf, len, ppos, str, strlen(str)); -+} -+ -+static const struct file_operations kutf_debugfs_const_string_ops = { -+ .owner = THIS_MODULE, -+ .open = simple_open, -+ .read = kutf_debugfs_const_string_read, -+ .llseek = default_llseek, -+}; ++void kbase_pm_release_l2_caches(struct kbase_device *kbdev); + -+/** -+ * kutf_debugfs_data_open() Debugfs open callback for the "data" entry. -+ * @inode: inode of the opened file -+ * @file: Opened file to read from ++#endif /* _KBASE_PM_POLICY_H_ */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c +new file mode 100755 +index 000000000..d08c628dd +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c +@@ -0,0 +1,103 @@ ++/* + * -+ * This function notifies the userdata callbacks that the userdata file has -+ * been opened, for tracking purposes. ++ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. + * -+ * It is called on both the context's userdata_consumer_priv and -+ * userdata_producer_priv. ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. + * -+ * This takes a refcount on the kutf_context ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * Return: 0 on success + */ -+static int kutf_debugfs_data_open(struct inode *inode, struct file *file) -+{ -+ struct kutf_context *test_context = inode->i_private; -+ struct kutf_test_fixture *test_fix = test_context->test_fix; -+ struct kutf_test_function *test_func = test_fix->test_func; -+ int err; + -+ simple_open(inode, file); + -+ /* This is not an error */ -+ if (!test_func->userdata_ops.open) -+ goto out_no_ops; + -+ /* This is safe here - the 'data' file is only openable whilst the -+ * initial refcount is still present, and the initial refcount is only -+ * dropped strictly after the 'data' file is removed */ -+ kutf_context_get(test_context); ++#include ++#include ++#include ++#include + -+ if (test_context->userdata_consumer_priv) { -+ err = test_func->userdata_ops.open(test_context->userdata_consumer_priv); -+ if (err) -+ goto out_consumer_fail; -+ } ++void kbase_backend_get_gpu_time(struct kbase_device *kbdev, u64 *cycle_counter, ++ u64 *system_time, struct timespec64 *ts) ++{ ++ u32 hi1, hi2; + -+ if (test_context->userdata_producer_priv) { -+ err = test_func->userdata_ops.open(test_context->userdata_producer_priv); -+ if (err) -+ goto out_producer_fail; -+ } ++ kbase_pm_request_gpu_cycle_counter(kbdev); + -+out_no_ops: -+ return 0; ++ /* Read hi, lo, hi to ensure that overflow from lo to hi is handled ++ * correctly */ ++ do { ++ hi1 = kbase_reg_read(kbdev, GPU_CONTROL_REG(CYCLE_COUNT_HI), ++ NULL); ++ *cycle_counter = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(CYCLE_COUNT_LO), NULL); ++ hi2 = kbase_reg_read(kbdev, GPU_CONTROL_REG(CYCLE_COUNT_HI), ++ NULL); ++ *cycle_counter |= (((u64) hi1) << 32); ++ } while (hi1 != hi2); + -+out_producer_fail: -+ if (test_func->userdata_ops.release && test_context->userdata_consumer_priv) -+ test_func->userdata_ops.release(test_context->userdata_consumer_priv); -+out_consumer_fail: -+ kutf_context_put(test_context); ++ /* Read hi, lo, hi to ensure that overflow from lo to hi is handled ++ * correctly */ ++ do { ++ hi1 = kbase_reg_read(kbdev, GPU_CONTROL_REG(TIMESTAMP_HI), ++ NULL); ++ *system_time = kbase_reg_read(kbdev, ++ GPU_CONTROL_REG(TIMESTAMP_LO), NULL); ++ hi2 = kbase_reg_read(kbdev, GPU_CONTROL_REG(TIMESTAMP_HI), ++ NULL); ++ *system_time |= (((u64) hi1) << 32); ++ } while (hi1 != hi2); + -+ return err; -+} ++ /* Record the CPU's idea of current time */ ++ ktime_get_raw_ts64(ts); + ++ kbase_pm_release_gpu_cycle_counter(kbdev); ++} + +/** -+ * kutf_debugfs_data_read() Debugfs read callback for the "data" entry. -+ * @file: Opened file to read from -+ * @buf: User buffer to write the data into -+ * @len: Amount of data to read -+ * @ppos: Offset into file to read from ++ * kbase_wait_write_flush - Wait for GPU write flush ++ * @kctx: Context pointer + * -+ * This function allows user and kernel to exchange extra data necessary for -+ * the test fixture. ++ * Wait 1000 GPU clock cycles. This delay is known to give the GPU time to flush ++ * its write buffer. + * -+ * The data is read from the first struct kutf_context running the fixture ++ * Only in use for BASE_HW_ISSUE_6367 + * -+ * Return: Number of bytes read ++ * Note : If GPU resets occur then the counters are reset to zero, the delay may ++ * not be as expected. + */ -+static ssize_t kutf_debugfs_data_read(struct file *file, char __user *buf, -+ size_t len, loff_t *ppos) ++#ifndef CONFIG_MALI_NO_MALI ++void kbase_wait_write_flush(struct kbase_context *kctx) +{ -+ struct kutf_context *test_context = file->private_data; -+ struct kutf_test_fixture *test_fix = test_context->test_fix; -+ struct kutf_test_function *test_func = test_fix->test_func; -+ ssize_t (*producer)(void *private, char __user *userbuf, -+ size_t userbuf_len, loff_t *ppos); -+ ssize_t count; ++ u32 base_count = 0; + -+ producer = test_func->userdata_ops.producer; -+ /* Can only read if there's a producer callback */ -+ if (!producer) -+ return -ENODEV; ++ /* ++ * The caller must be holding onto the kctx or the call is from ++ * userspace. ++ */ ++ kbase_pm_context_active(kctx->kbdev); ++ kbase_pm_request_gpu_cycle_counter(kctx->kbdev); + -+ count = producer(test_context->userdata_producer_priv, buf, len, ppos); ++ while (true) { ++ u32 new_count; + -+ return count; -+} ++ new_count = kbase_reg_read(kctx->kbdev, ++ GPU_CONTROL_REG(CYCLE_COUNT_LO), NULL); ++ /* First time around, just store the count. */ ++ if (base_count == 0) { ++ base_count = new_count; ++ continue; ++ } + -+/** -+ * kutf_debugfs_data_write() Debugfs write callback for the "data" entry. -+ * @file: Opened file to write to -+ * @buf: User buffer to read the data from -+ * @len: Amount of data to write -+ * @ppos: Offset into file to write to ++ /* No need to handle wrapping, unsigned maths works for this. */ ++ if ((new_count - base_count) > 1000) ++ break; ++ } ++ ++ kbase_pm_release_gpu_cycle_counter(kctx->kbdev); ++ kbase_pm_context_idle(kctx->kbdev); ++} ++#endif /* CONFIG_MALI_NO_MALI */ +diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h +new file mode 100755 +index 000000000..433aa4b9c +--- /dev/null ++++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h +@@ -0,0 +1,52 @@ ++/* + * -+ * This function allows user and kernel to exchange extra data necessary for -+ * the test fixture. ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. + * -+ * The data is added to the first struct kutf_context running the fixture ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * Return: Number of bytes written + */ -+static ssize_t kutf_debugfs_data_write(struct file *file, -+ const char __user *buf, size_t len, loff_t *ppos) -+{ -+ struct kutf_context *test_context = file->private_data; -+ struct kutf_test_fixture *test_fix = test_context->test_fix; -+ struct kutf_test_function *test_func = test_fix->test_func; -+ ssize_t (*consumer)(void *private, const char __user *userbuf, -+ size_t userbuf_len, loff_t *ppos); -+ ssize_t count; + -+ consumer = test_func->userdata_ops.consumer; -+ /* Can only write if there's a consumer callback */ -+ if (!consumer) -+ return -ENODEV; + -+ count = consumer(test_context->userdata_consumer_priv, buf, len, ppos); + -+ return count; -+} ++#ifndef _KBASE_BACKEND_TIME_H_ ++#define _KBASE_BACKEND_TIME_H_ + ++/** ++ * kbase_backend_get_gpu_time() - Get current GPU time ++ * @kbdev: Device pointer ++ * @cycle_counter: Pointer to u64 to store cycle counter in ++ * @system_time: Pointer to u64 to store system time in ++ * @ts: Pointer to struct timespec64 to store current monotonic ++ * time in ++ */ ++void kbase_backend_get_gpu_time(struct kbase_device *kbdev, u64 *cycle_counter, ++ u64 *system_time, struct timespec64 *ts); + +/** -+ * kutf_debugfs_data_release() - Debugfs release callback for the "data" entry. -+ * @inode: File entry representation -+ * @file: A specific opening of the file ++ * kbase_wait_write_flush() - Wait for GPU write flush ++ * @kctx: Context pointer + * -+ * This function notifies the userdata callbacks that the userdata file has -+ * been closed, for tracking purposes. ++ * Wait 1000 GPU clock cycles. This delay is known to give the GPU time to flush ++ * its write buffer. + * -+ * It is called on both the context's userdata_consumer_priv and -+ * userdata_producer_priv. ++ * If GPU resets occur then the counters are reset to zero, the delay may not be ++ * as expected. + * -+ * It also drops the refcount on the kutf_context that was taken during -+ * kutf_debugfs_data_open() ++ * This function is only in use for BASE_HW_ISSUE_6367 + */ -+static int kutf_debugfs_data_release(struct inode *inode, struct file *file) ++#ifdef CONFIG_MALI_NO_MALI ++static inline void kbase_wait_write_flush(struct kbase_context *kctx) +{ -+ struct kutf_context *test_context = file->private_data; -+ struct kutf_test_fixture *test_fix = test_context->test_fix; -+ struct kutf_test_function *test_func = test_fix->test_func; ++} ++#else ++void kbase_wait_write_flush(struct kbase_context *kctx); ++#endif + -+ if (!test_func->userdata_ops.release) -+ return 0; ++#endif /* _KBASE_BACKEND_TIME_H_ */ +diff --git a/drivers/gpu/arm/midgard/docs/Doxyfile b/drivers/gpu/arm/midgard/docs/Doxyfile +new file mode 100755 +index 000000000..35ff2f1ce +--- /dev/null ++++ b/drivers/gpu/arm/midgard/docs/Doxyfile +@@ -0,0 +1,126 @@ ++# ++# (C) COPYRIGHT 2011-2013, 2015 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+ if (test_context->userdata_consumer_priv) -+ test_func->userdata_ops.release(test_context->userdata_consumer_priv); -+ if (test_context->userdata_producer_priv) -+ test_func->userdata_ops.release(test_context->userdata_producer_priv); + -+ kutf_context_put(test_context); + -+ return 0; -+} ++############################################################################## + ++# This file contains per-module Doxygen configuration. Please do not add ++# extra settings to this file without consulting all stakeholders, as they ++# may cause override project-wide settings. ++# ++# Additionally, when defining aliases, macros, sections etc, use the module ++# name as a prefix e.g. gles_my_alias. + -+static const struct file_operations kutf_debugfs_data_ops = { -+ .owner = THIS_MODULE, -+ .open = kutf_debugfs_data_open, -+ .read = kutf_debugfs_data_read, -+ .write = kutf_debugfs_data_write, -+ .release = kutf_debugfs_data_release, -+ .llseek = default_llseek, -+}; ++############################################################################## + -+/** -+ * userdata_init() - Initialize userspace data exchange for a test, if -+ * specified by that test -+ * @test_context: Test context -+ * -+ * Note that this allows new refcounts to be made on test_context by userspace -+ * threads opening the 'data' file. -+ * -+ * Return: 0 on success, negative value corresponding to error code in failure -+ * and kutf result will be set appropriately to indicate the error -+ */ -+static int userdata_init(struct kutf_context *test_context) -+{ -+ struct kutf_test_fixture *test_fix = test_context->test_fix; -+ struct kutf_test_function *test_func = test_fix->test_func; -+ int err = 0; -+ struct dentry *userdata_dentry; ++@INCLUDE = ../../bldsys/Doxyfile_common + -+ /* Valid to have neither a producer or consumer, which is the case for -+ * tests not requiring usersdata */ -+ if ((!test_func->userdata_ops.consumer) && (!test_func->userdata_ops.producer)) -+ return err; ++# The INPUT tag can be used to specify the files and/or directories that contain ++# documented source files. You may enter file names like "myfile.cpp" or ++# directories like "/usr/src/myproject". Separate the files or directories ++# with spaces. + -+ if (test_func->userdata_ops.consumer && !test_context->userdata_consumer_priv) { -+ kutf_test_fatal(test_context, -+ "incorrect test setup - userdata consumer provided without private data"); -+ return -EFAULT; -+ } ++INPUT += ../../kernel/drivers/gpu/arm/midgard/ + -+ if (test_func->userdata_ops.producer && !test_context->userdata_producer_priv) { -+ kutf_test_fatal(test_context, -+ "incorrect test setup - userdata producer provided without private data"); -+ return -EFAULT; -+ } ++############################################################################## ++# Everything below here is optional, and in most cases not required ++############################################################################## + -+ userdata_dentry = debugfs_create_file("data", S_IROTH, test_fix->dir, -+ test_context, &kutf_debugfs_data_ops); ++# This tag can be used to specify a number of aliases that acts ++# as commands in the documentation. An alias has the form "name=value". ++# For example adding "sideeffect=\par Side Effects:\n" will allow you to ++# put the command \sideeffect (or @sideeffect) in the documentation, which ++# will result in a user-defined paragraph with heading "Side Effects:". ++# You can put \n's in the value part of an alias to insert newlines. + -+ if (!userdata_dentry) { -+ pr_err("Failed to create debugfs file \"data\" when running fixture\n"); -+ /* Not using Fatal (which stops other tests running), -+ * nor Abort (which indicates teardown should not be done) */ -+ kutf_test_fail(test_context, -+ "failed to create 'data' file for userside data exchange"); ++ALIASES += + -+ /* Error code is discarded by caller, but consistent with other -+ * debugfs_create_file failures */ -+ err = -EEXIST; -+ } else { -+ test_context->userdata_dentry = userdata_dentry; -+ } ++# The ENABLED_SECTIONS tag can be used to enable conditional ++# documentation sections, marked by \if sectionname ... \endif. + ++ENABLED_SECTIONS += + -+ return err; -+} ++# If the value of the INPUT tag contains directories, you can use the ++# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp ++# and *.h) to filter out the source-files in the directories. If left ++# blank the following patterns are tested: ++# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx ++# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + -+/** -+ * userdata_term() - Terminate userspace data exchange for a test, if specified -+ * by that test -+ * @test_context: Test context -+ * -+ * Note This also prevents new refcounts being made on @test_context by userspace -+ * threads opening the 'data' file for this test. Any existing open file descriptors -+ * to the 'data' file will still be safe to use by userspace. -+ */ -+static void userdata_term(struct kutf_context *test_context) -+{ -+ struct kutf_test_fixture *test_fix = test_context->test_fix; -+ struct kutf_test_function *test_func = test_fix->test_func; -+ void (*notify_ended)(void *priv) = test_func->userdata_ops.notify_ended; ++FILE_PATTERNS += + -+ /* debugfs_remove() is safe when parameter is error or NULL */ -+ debugfs_remove(test_context->userdata_dentry); ++# The EXCLUDE tag can be used to specify files and/or directories that should ++# excluded from the INPUT source files. This way you can easily exclude a ++# subdirectory from a directory tree whose root is specified with the INPUT tag. ++EXCLUDE += ../../kernel/drivers/gpu/arm/midgard/platform ../../kernel/drivers/gpu/arm/midgard/platform_dummy ../../kernel/drivers/gpu/arm/midgard/scripts ../../kernel/drivers/gpu/arm/midgard/tests ../../kernel/drivers/gpu/arm/midgard/Makefile ../../kernel/drivers/gpu/arm/midgard/Makefile.kbase ../../kernel/drivers/gpu/arm/midgard/Kbuild ../../kernel/drivers/gpu/arm/midgard/Kconfig ../../kernel/drivers/gpu/arm/midgard/sconscript ../../kernel/drivers/gpu/arm/midgard/docs ../../kernel/drivers/gpu/arm/midgard/pm_test_script.sh ../../kernel/drivers/gpu/arm/midgard/mali_uk.h ../../kernel/drivers/gpu/arm/midgard/Makefile + -+ /* debugfs_remove() doesn't kill any currently open file descriptors on -+ * this file, and such fds are still safe to use providing test_context -+ * is properly refcounted */ + -+ if (notify_ended) { -+ if (test_context->userdata_consumer_priv) -+ notify_ended(test_context->userdata_consumer_priv); -+ if (test_context->userdata_producer_priv) -+ notify_ended(test_context->userdata_producer_priv); -+ } ++# If the value of the INPUT tag contains directories, you can use the ++# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude ++# certain files from those directories. Note that the wildcards are matched ++# against the file with absolute path, so to exclude all test directories ++# for example use the pattern */test/* + -+} ++EXCLUDE_PATTERNS += + -+/** -+ * kutf_add_explicit_result() - Check if an explicit result needs to be added -+ * @context: KUTF test context -+ */ -+static void kutf_add_explicit_result(struct kutf_context *context) -+{ -+ switch (context->expected_status) { -+ case KUTF_RESULT_UNKNOWN: -+ if (context->status == KUTF_RESULT_UNKNOWN) -+ kutf_test_pass(context, "(implicit pass)"); -+ break; ++# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names ++# (namespaces, classes, functions, etc.) that should be excluded from the ++# output. The symbol name can be a fully qualified name, a word, or if the ++# wildcard * is used, a substring. Examples: ANamespace, AClass, ++# AClass::ANamespace, ANamespace::*Test + -+ case KUTF_RESULT_WARN: -+ if (context->status == KUTF_RESULT_WARN) -+ kutf_test_pass(context, -+ "Pass (expected warn occurred)"); -+ else if (context->status != KUTF_RESULT_SKIP) -+ kutf_test_fail(context, -+ "Fail (expected warn missing)"); -+ break; ++EXCLUDE_SYMBOLS += + -+ case KUTF_RESULT_FAIL: -+ if (context->status == KUTF_RESULT_FAIL) -+ kutf_test_pass(context, -+ "Pass (expected fail occurred)"); -+ else if (context->status != KUTF_RESULT_SKIP) { -+ /* Force the expected status so the fail gets logged */ -+ context->expected_status = KUTF_RESULT_PASS; -+ kutf_test_fail(context, -+ "Fail (expected fail missing)"); -+ } -+ break; ++# The EXAMPLE_PATH tag can be used to specify one or more files or ++# directories that contain example code fragments that are included (see ++# the \include command). + -+ case KUTF_RESULT_FATAL: -+ if (context->status == KUTF_RESULT_FATAL) -+ kutf_test_pass(context, -+ "Pass (expected fatal occurred)"); -+ else if (context->status != KUTF_RESULT_SKIP) -+ kutf_test_fail(context, -+ "Fail (expected fatal missing)"); -+ break; ++EXAMPLE_PATH += + -+ case KUTF_RESULT_ABORT: -+ if (context->status == KUTF_RESULT_ABORT) -+ kutf_test_pass(context, -+ "Pass (expected abort occurred)"); -+ else if (context->status != KUTF_RESULT_SKIP) -+ kutf_test_fail(context, -+ "Fail (expected abort missing)"); -+ break; -+ default: -+ break; -+ } -+} ++# The IMAGE_PATH tag can be used to specify one or more files or ++# directories that contain image that are included in the documentation (see ++# the \image command). + -+/** -+ * kutf_debugfs_run_open() Debugfs open callback for the "run" entry. -+ * @inode: inode of the opened file -+ * @file: Opened file to read from ++IMAGE_PATH += ++ ++# The INCLUDE_PATH tag can be used to specify one or more directories that ++# contain include files that are not input files but should be processed by ++# the preprocessor. ++ ++INCLUDE_PATH += ++ ++# The PREDEFINED tag can be used to specify one or more macro names that ++# are defined before the preprocessor is started (similar to the -D option of ++# gcc). The argument of the tag is a list of macros of the form: name ++# or name=definition (no spaces). If the definition and the = are ++# omitted =1 is assumed. To prevent a macro definition from being ++# undefined via #undef or recursively expanded use the := operator ++# instead of the = operator. ++ ++PREDEFINED += ++ ++# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then ++# this tag can be used to specify a list of macro names that should be expanded. ++# The macro definition that is found in the sources will be used. ++# Use the PREDEFINED tag if you want to use a different macro definition. ++ ++EXPAND_AS_DEFINED += ++ ++# The DOTFILE_DIRS tag can be used to specify one or more directories that ++# contain dot files that are included in the documentation (see the ++# \dotfile command). ++ ++DOTFILE_DIRS += ../../kernel/drivers/gpu/arm/midgard/docs ++ +diff --git a/drivers/gpu/arm/midgard/docs/policy_operation_diagram.dot b/drivers/gpu/arm/midgard/docs/policy_operation_diagram.dot +new file mode 100755 +index 000000000..7ae05c2f8 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/docs/policy_operation_diagram.dot +@@ -0,0 +1,112 @@ ++/* + * -+ * This function retrieves the test fixture data that is associated with the -+ * opened file and works back to get the test, suite and application so -+ * it can then run the test that is associated with the file entry. ++ * (C) COPYRIGHT 2010 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * Return: 0 on success + */ -+static int kutf_debugfs_run_open(struct inode *inode, struct file *file) -+{ -+ struct kutf_test_fixture *test_fix = inode->i_private; -+ struct kutf_test_function *test_func = test_fix->test_func; -+ struct kutf_suite *suite = test_func->suite; -+ struct kutf_context *test_context; -+ int err = 0; + -+ /* For the moment, only one user-client should be attempting to run -+ * this at a time. This simplifies how we lookup the kutf_context when -+ * using the 'data' file. -+ * Removing this restriction would require a rewrite of the mechanism -+ * of the 'data' file to pass data in, perhaps 'data' created here and -+ * based upon userspace thread's pid */ -+ if (atomic_inc_return(&test_fix->nr_running) != 1) { -+ err = -EBUSY; -+ goto finish; ++ ++ ++ ++ ++digraph policy_objects_diagram { ++ rankdir=LR; ++ size="12,8"; ++ compound=true; ++ ++ node [ shape = box ]; ++ ++ subgraph cluster_policy_queues { ++ low_queue [ shape=record label = "LowP | {ctx_lo | ... | ctx_i | ... | ctx_hi}" ]; ++ queues_middle_sep [ label="" shape=plaintext width=0 height=0 ]; ++ ++ rt_queue [ shape=record label = "RT | {ctx_lo | ... | ctx_j | ... | ctx_hi}" ]; ++ ++ label = "Policy's Queue(s)"; + } + -+ test_context = kutf_create_context(test_fix); -+ if (!test_context) { -+ err = -ENODEV; -+ goto finish; ++ call_enqueue [ shape=plaintext label="enqueue_ctx()" ]; ++ ++ { ++ rank=same; ++ ordering=out; ++ call_dequeue [ shape=plaintext label="dequeue_head_ctx()\n+ runpool_add_ctx()" ]; ++ call_ctxfinish [ shape=plaintext label="runpool_remove_ctx()" ]; ++ ++ call_ctxdone [ shape=plaintext label="don't requeue;\n/* ctx has no more jobs */" ]; + } + -+ file->private_data = test_context; ++ subgraph cluster_runpool { + -+ /* -+ * Call the create fixture function if required before the -+ * fixture is run -+ */ -+ if (suite->create_fixture) -+ test_context->fixture = suite->create_fixture(test_context); ++ as0 [ width=2 height = 0.25 label="AS0: Job_1, ..., Job_n" ]; ++ as1 [ width=2 height = 0.25 label="AS1: Job_1, ..., Job_m" ]; ++ as2 [ width=2 height = 0.25 label="AS2: Job_1, ..., Job_p" ]; ++ as3 [ width=2 height = 0.25 label="AS3: Job_1, ..., Job_q" ]; + -+ /* Only run the test if the fixture was created (if required) */ -+ if ((suite->create_fixture && test_context->fixture) || -+ (!suite->create_fixture)) { -+ int late_err; -+ /* Setup any userdata exchange */ -+ late_err = userdata_init(test_context); ++ label = "Policy's Run Pool"; ++ } + -+ if (!late_err) -+ /* Run this fixture */ -+ test_func->execute(test_context); ++ { ++ rank=same; ++ call_jdequeue [ shape=plaintext label="dequeue_job()" ]; ++ sstop_dotfixup [ shape=plaintext label="" width=0 height=0 ]; ++ } + -+ userdata_term(test_context); ++ { ++ rank=same; ++ ordering=out; ++ sstop [ shape=ellipse label="SS-Timer expires" ] ++ jobslots [ shape=record label="Jobslots: | <0>js[0] | <1>js[1] | <2>js[2]" ]; + -+ if (suite->remove_fixture) -+ suite->remove_fixture(test_context); ++ irq [ label="IRQ" shape=ellipse ]; + -+ kutf_add_explicit_result(test_context); ++ job_finish [ shape=plaintext label="don't requeue;\n/* job done */" ]; + } + -+finish: -+ atomic_dec(&test_fix->nr_running); -+ return err; -+} ++ hstop [ shape=ellipse label="HS-Timer expires" ] + -+/** -+ * kutf_debugfs_run_read() - Debugfs read callback for the "run" entry. -+ * @file: Opened file to read from -+ * @buf: User buffer to write the data into -+ * @len: Amount of data to read -+ * @ppos: Offset into file to read from -+ * -+ * This function emits the results which where logged during the opening of -+ * the file kutf_debugfs_run_open. -+ * Results will be emitted one at a time, once all the results have been read -+ * 0 will be returned to indicate there is no more data. -+ * -+ * Return: Number of bytes read. -+ */ -+static ssize_t kutf_debugfs_run_read(struct file *file, char __user *buf, -+ size_t len, loff_t *ppos) -+{ -+ struct kutf_context *test_context = file->private_data; -+ struct kutf_result *res; -+ unsigned long bytes_not_copied; -+ ssize_t bytes_copied = 0; ++ /* ++ * Edges ++ */ + -+ /* Note: This code assumes a result is read completely */ -+ res = kutf_remove_result(test_context->result_set); -+ if (res) { -+ char *kutf_str_ptr = NULL; -+ unsigned int kutf_str_len = 0; -+ unsigned int message_len = 0; -+ char separator = ':'; -+ char terminator = '\n'; ++ call_enqueue -> queues_middle_sep [ lhead=cluster_policy_queues ]; + -+ kutf_result_to_string(&kutf_str_ptr, res->status); -+ if (kutf_str_ptr) -+ kutf_str_len = strlen(kutf_str_ptr); ++ low_queue:qr -> call_dequeue:w; ++ rt_queue:qr -> call_dequeue:w; + -+ if (res->message) -+ message_len = strlen(res->message); ++ call_dequeue -> as1 [lhead=cluster_runpool]; + -+ if ((kutf_str_len + 1 + message_len + 1) > len) { -+ pr_err("Not enough space in user buffer for a single result"); -+ return 0; -+ } ++ as1->call_jdequeue [ltail=cluster_runpool]; ++ call_jdequeue->jobslots:0; ++ call_jdequeue->sstop_dotfixup [ arrowhead=none]; ++ sstop_dotfixup->sstop [label="Spawn SS-Timer"]; ++ sstop->jobslots [label="SoftStop"]; ++ sstop->hstop [label="Spawn HS-Timer"]; ++ hstop->jobslots:ne [label="HardStop"]; + -+ /* First copy the result string */ -+ if (kutf_str_ptr) { -+ bytes_not_copied = copy_to_user(&buf[0], kutf_str_ptr, -+ kutf_str_len); -+ bytes_copied += kutf_str_len - bytes_not_copied; -+ if (bytes_not_copied) -+ goto exit; -+ } + -+ /* Then the separator */ -+ bytes_not_copied = copy_to_user(&buf[bytes_copied], -+ &separator, 1); -+ bytes_copied += 1 - bytes_not_copied; -+ if (bytes_not_copied) -+ goto exit; ++ as3->call_ctxfinish:ne [ ltail=cluster_runpool ]; ++ call_ctxfinish:sw->rt_queue:qm [ lhead=cluster_policy_queues label="enqueue_ctx()\n/* ctx still has jobs */" ]; + -+ /* Finally Next copy the result string */ -+ if (res->message) { -+ bytes_not_copied = copy_to_user(&buf[bytes_copied], -+ res->message, message_len); -+ bytes_copied += message_len - bytes_not_copied; -+ if (bytes_not_copied) -+ goto exit; -+ } ++ call_ctxfinish->call_ctxdone [constraint=false]; + -+ /* Finally the terminator */ -+ bytes_not_copied = copy_to_user(&buf[bytes_copied], -+ &terminator, 1); -+ bytes_copied += 1 - bytes_not_copied; ++ call_ctxdone->call_enqueue [weight=0.1 labeldistance=20.0 labelangle=0.0 taillabel="Job submitted to the ctx" style=dotted constraint=false]; ++ ++ ++ { ++ jobslots->irq [constraint=false]; ++ ++ irq->job_finish [constraint=false]; + } -+exit: -+ return bytes_copied; -+} + -+/** -+ * kutf_debugfs_run_release() - Debugfs release callback for the "run" entry. -+ * @inode: File entry representation -+ * @file: A specific opening of the file ++ irq->as2 [lhead=cluster_runpool label="requeue_job()\n/* timeslice expired */" ]; ++ ++} +diff --git a/drivers/gpu/arm/midgard/docs/policy_overview.dot b/drivers/gpu/arm/midgard/docs/policy_overview.dot +new file mode 100755 +index 000000000..159b993b7 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/docs/policy_overview.dot +@@ -0,0 +1,63 @@ ++/* + * -+ * Release any resources that where created during the opening of the file ++ * (C) COPYRIGHT 2010 ARM Limited. All rights reserved. + * -+ * Note that resources may not be released immediately, that might only happen -+ * later when other users of the kutf_context release their refcount. ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. + * -+ * Return: 0 on success -+ */ -+static int kutf_debugfs_run_release(struct inode *inode, struct file *file) -+{ -+ struct kutf_context *test_context = file->private_data; -+ -+ kutf_context_put(test_context); -+ return 0; -+} -+ -+static const struct file_operations kutf_debugfs_run_ops = { -+ .owner = THIS_MODULE, -+ .open = kutf_debugfs_run_open, -+ .read = kutf_debugfs_run_read, -+ .release = kutf_debugfs_run_release, -+ .llseek = default_llseek, -+}; -+ -+/** -+ * create_fixture_variant() - Creates a fixture variant for the specified -+ * test function and index and the debugfs entries -+ * that represent it. -+ * @test_func: Test function -+ * @fixture_index: Fixture index ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * Return: 0 on success, negative value corresponding to error code in failure + */ -+static int create_fixture_variant(struct kutf_test_function *test_func, -+ unsigned int fixture_index) -+{ -+ struct kutf_test_fixture *test_fix; -+ char name[11]; /* Enough to print the MAX_UINT32 + the null terminator */ -+ struct dentry *tmp; -+ int err; + -+ test_fix = kmalloc(sizeof(*test_fix), GFP_KERNEL); -+ if (!test_fix) { -+ pr_err("Failed to create debugfs directory when adding fixture\n"); -+ err = -ENOMEM; -+ goto fail_alloc; -+ } + -+ test_fix->test_func = test_func; -+ test_fix->fixture_index = fixture_index; -+ atomic_set(&test_fix->nr_running, 0); + -+ snprintf(name, sizeof(name), "%d", fixture_index); -+ test_fix->dir = debugfs_create_dir(name, test_func->dir); -+ if (!test_func->dir) { -+ pr_err("Failed to create debugfs directory when adding fixture\n"); -+ /* Might not be the right error, we don't get it passed back to us */ -+ err = -EEXIST; -+ goto fail_dir; -+ } + -+ tmp = debugfs_create_file("type", S_IROTH, test_fix->dir, "fixture\n", -+ &kutf_debugfs_const_string_ops); -+ if (!tmp) { -+ pr_err("Failed to create debugfs file \"type\" when adding fixture\n"); -+ /* Might not be the right error, we don't get it passed back to us */ -+ err = -EEXIST; -+ goto fail_file; -+ } + -+ tmp = debugfs_create_file("run", S_IROTH, test_fix->dir, test_fix, -+ &kutf_debugfs_run_ops); -+ if (!tmp) { -+ pr_err("Failed to create debugfs file \"run\" when adding fixture\n"); -+ /* Might not be the right error, we don't get it passed back to us */ -+ err = -EEXIST; -+ goto fail_file; -+ } ++digraph policy_objects_diagram { ++ rankdir=LR ++ size="6,6" ++ compound=true; + -+ list_add(&test_fix->node, &test_func->variant_list); -+ return 0; ++ node [ shape = box ]; + -+fail_file: -+ debugfs_remove_recursive(test_fix->dir); -+fail_dir: -+ kfree(test_fix); -+fail_alloc: -+ return err; -+} ++ call_enqueue [ shape=plaintext label="enqueue ctx" ]; + -+/** -+ * kutf_remove_test_variant() - Destroy a previously created fixture variant. -+ * @test_fix: Test fixture -+ */ -+static void kutf_remove_test_variant(struct kutf_test_fixture *test_fix) -+{ -+ debugfs_remove_recursive(test_fix->dir); -+ kfree(test_fix); -+} + -+void kutf_add_test_with_filters_data_and_userdata( -+ struct kutf_suite *suite, -+ unsigned int id, -+ const char *name, -+ void (*execute)(struct kutf_context *context), -+ unsigned int filters, -+ union kutf_callback_data test_data, -+ struct kutf_userdata_ops *userdata_ops) -+{ -+ struct kutf_test_function *test_func; -+ struct dentry *tmp; -+ unsigned int i; ++ policy_queue [ label="Policy's Queue" ]; + -+ test_func = kmalloc(sizeof(*test_func), GFP_KERNEL); -+ if (!test_func) { -+ pr_err("Failed to allocate memory when adding test %s\n", name); -+ goto fail_alloc; ++ { ++ rank=same; ++ runpool [ label="Policy's Run Pool" ]; ++ ++ ctx_finish [ label="ctx finished" ]; + } + -+ INIT_LIST_HEAD(&test_func->variant_list); ++ { ++ rank=same; ++ jobslots [ shape=record label="Jobslots: | <0>js[0] | <1>js[1] | <2>js[2]" ]; + -+ test_func->dir = debugfs_create_dir(name, suite->dir); -+ if (!test_func->dir) { -+ pr_err("Failed to create debugfs directory when adding test %s\n", name); -+ goto fail_dir; ++ job_finish [ label="Job finished" ]; + } + -+ tmp = debugfs_create_file("type", S_IROTH, test_func->dir, "test\n", -+ &kutf_debugfs_const_string_ops); -+ if (!tmp) { -+ pr_err("Failed to create debugfs file \"type\" when adding test %s\n", name); -+ goto fail_file; -+ } + -+ test_func->filters = filters; -+ tmp = debugfs_create_x32("filters", S_IROTH, test_func->dir, -+ &test_func->filters); -+ if (!tmp) { -+ pr_err("Failed to create debugfs file \"filters\" when adding test %s\n", name); -+ goto fail_file; -+ } + -+ test_func->test_id = id; -+ tmp = debugfs_create_u32("test_id", S_IROTH, test_func->dir, -+ &test_func->test_id); -+ if (!tmp) { -+ pr_err("Failed to create debugfs file \"test_id\" when adding test %s\n", name); -+ goto fail_file; -+ } ++ /* ++ * Edges ++ */ + -+ for (i = 0; i < suite->fixture_variants; i++) { -+ if (create_fixture_variant(test_func, i)) { -+ pr_err("Failed to create fixture %d when adding test %s\n", i, name); -+ goto fail_file; -+ } -+ } ++ call_enqueue -> policy_queue; + -+ test_func->suite = suite; -+ test_func->execute = execute; -+ test_func->test_data = test_data; -+ memcpy(&test_func->userdata_ops, userdata_ops, sizeof(*userdata_ops)); ++ policy_queue->runpool [label="dequeue ctx" weight=0.1]; ++ runpool->policy_queue [label="requeue ctx" weight=0.1]; + -+ list_add(&test_func->node, &suite->test_list); -+ return; ++ runpool->ctx_finish [ style=dotted ]; + -+fail_file: -+ debugfs_remove_recursive(test_func->dir); -+fail_dir: -+ kfree(test_func); -+fail_alloc: -+ return; ++ runpool->jobslots [label="dequeue job" weight=0.1]; ++ jobslots->runpool [label="requeue job" weight=0.1]; ++ ++ jobslots->job_finish [ style=dotted ]; +} -+EXPORT_SYMBOL(kutf_add_test_with_filters_data_and_userdata); +diff --git a/drivers/gpu/arm/midgard/ipa/Kbuild b/drivers/gpu/arm/midgard/ipa/Kbuild +new file mode 100755 +index 000000000..602b15f52 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/ipa/Kbuild +@@ -0,0 +1,24 @@ ++# ++# (C) COPYRIGHT 2016-2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+void kutf_add_test_with_filters_and_data( -+ struct kutf_suite *suite, -+ unsigned int id, -+ const char *name, -+ void (*execute)(struct kutf_context *context), -+ unsigned int filters, -+ union kutf_callback_data test_data) -+{ -+ struct kutf_userdata_ops userdata_ops = { -+ .open = NULL, -+ .release = NULL, -+ .consumer = NULL, -+ .producer = NULL, -+ }; + -+ kutf_add_test_with_filters_data_and_userdata(suite, id, name, execute, -+ filters, test_data, &userdata_ops); -+} ++midgard_kbase-y += \ ++ ipa/mali_kbase_ipa_simple.o \ ++ ipa/mali_kbase_ipa.o + -+EXPORT_SYMBOL(kutf_add_test_with_filters_and_data); ++midgard_kbase-$(CONFIG_DEBUG_FS) += ipa/mali_kbase_ipa_debugfs.o + -+void kutf_add_test_with_filters( -+ struct kutf_suite *suite, -+ unsigned int id, -+ const char *name, -+ void (*execute)(struct kutf_context *context), -+ unsigned int filters) -+{ -+ union kutf_callback_data data; ++ifneq ($(wildcard $(src)/ipa/mali_kbase_ipa_tmix.c),) ++ midgard_kbase-y += ipa/mali_kbase_ipa_tmix.o ++endif +diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c +new file mode 100755 +index 000000000..01bdbb4e8 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c +@@ -0,0 +1,585 @@ ++/* ++ * ++ * (C) COPYRIGHT 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ data.ptr_value = NULL; + -+ kutf_add_test_with_filters_and_data(suite, -+ id, -+ name, -+ execute, -+ suite->suite_default_flags, -+ data); -+} -+EXPORT_SYMBOL(kutf_add_test_with_filters); ++#include ++#include ++#include ++#include "mali_kbase.h" ++#include "mali_kbase_ipa.h" ++#include "mali_kbase_ipa_debugfs.h" + -+void kutf_add_test(struct kutf_suite *suite, -+ unsigned int id, -+ const char *name, -+ void (*execute)(struct kutf_context *context)) -+{ -+ union kutf_callback_data data; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)) ++#include ++#else ++#include ++#define dev_pm_opp_find_freq_exact opp_find_freq_exact ++#define dev_pm_opp_get_voltage opp_get_voltage ++#define dev_pm_opp opp ++#endif ++#include + -+ data.ptr_value = NULL; ++#define KBASE_IPA_FALLBACK_MODEL_NAME "mali-simple-power-model" + -+ kutf_add_test_with_filters_and_data(suite, -+ id, -+ name, -+ execute, -+ suite->suite_default_flags, -+ data); -+} -+EXPORT_SYMBOL(kutf_add_test); ++static struct kbase_ipa_model_ops *kbase_ipa_all_model_ops[] = { ++ &kbase_simple_ipa_model_ops, ++}; + -+/** -+ * kutf_remove_test(): Remove a previously added test function. -+ * @test_func: Test function -+ */ -+static void kutf_remove_test(struct kutf_test_function *test_func) ++int kbase_ipa_model_recalculate(struct kbase_ipa_model *model) +{ -+ struct list_head *pos; -+ struct list_head *tmp; ++ int err = 0; + -+ list_for_each_safe(pos, tmp, &test_func->variant_list) { -+ struct kutf_test_fixture *test_fix; ++ lockdep_assert_held(&model->kbdev->ipa.lock); + -+ test_fix = list_entry(pos, struct kutf_test_fixture, node); -+ kutf_remove_test_variant(test_fix); ++ if (model->ops->recalculate) { ++ err = model->ops->recalculate(model); ++ if (err) { ++ dev_err(model->kbdev->dev, ++ "recalculation of power model %s returned error %d\n", ++ model->ops->name, err); ++ } + } + -+ list_del(&test_func->node); -+ debugfs_remove_recursive(test_func->dir); -+ kfree(test_func); ++ return err; +} + -+struct kutf_suite *kutf_create_suite_with_filters_and_data( -+ struct kutf_application *app, -+ const char *name, -+ unsigned int fixture_count, -+ void *(*create_fixture)(struct kutf_context *context), -+ void (*remove_fixture)(struct kutf_context *context), -+ unsigned int filters, -+ union kutf_callback_data suite_data) ++static struct kbase_ipa_model_ops *kbase_ipa_model_ops_find(struct kbase_device *kbdev, ++ const char *name) +{ -+ struct kutf_suite *suite; -+ struct dentry *tmp; -+ -+ suite = kmalloc(sizeof(*suite), GFP_KERNEL); -+ if (!suite) { -+ pr_err("Failed to allocate memory when creating suite %s\n", name); -+ goto fail_kmalloc; -+ } ++ int i; + -+ suite->dir = debugfs_create_dir(name, app->dir); -+ if (!suite->dir) { -+ pr_err("Failed to create debugfs directory when adding test %s\n", name); -+ goto fail_debugfs; -+ } ++ for (i = 0; i < ARRAY_SIZE(kbase_ipa_all_model_ops); ++i) { ++ struct kbase_ipa_model_ops *ops = kbase_ipa_all_model_ops[i]; + -+ tmp = debugfs_create_file("type", S_IROTH, suite->dir, "suite\n", -+ &kutf_debugfs_const_string_ops); -+ if (!tmp) { -+ pr_err("Failed to create debugfs file \"type\" when adding test %s\n", name); -+ goto fail_file; ++ if (!strcmp(ops->name, name)) ++ return ops; + } + -+ INIT_LIST_HEAD(&suite->test_list); -+ suite->app = app; -+ suite->name = name; -+ suite->fixture_variants = fixture_count; -+ suite->create_fixture = create_fixture; -+ suite->remove_fixture = remove_fixture; -+ suite->suite_default_flags = filters; -+ suite->suite_data = suite_data; -+ -+ list_add(&suite->node, &app->suite_list); -+ -+ return suite; ++ dev_err(kbdev->dev, "power model \'%s\' not found\n", name); + -+fail_file: -+ debugfs_remove_recursive(suite->dir); -+fail_debugfs: -+ kfree(suite); -+fail_kmalloc: + return NULL; +} -+EXPORT_SYMBOL(kutf_create_suite_with_filters_and_data); + -+struct kutf_suite *kutf_create_suite_with_filters( -+ struct kutf_application *app, -+ const char *name, -+ unsigned int fixture_count, -+ void *(*create_fixture)(struct kutf_context *context), -+ void (*remove_fixture)(struct kutf_context *context), -+ unsigned int filters) ++void kbase_ipa_model_use_fallback_locked(struct kbase_device *kbdev) +{ -+ union kutf_callback_data data; -+ -+ data.ptr_value = NULL; -+ return kutf_create_suite_with_filters_and_data(app, -+ name, -+ fixture_count, -+ create_fixture, -+ remove_fixture, -+ filters, -+ data); ++ atomic_set(&kbdev->ipa_use_configured_model, false); +} -+EXPORT_SYMBOL(kutf_create_suite_with_filters); + -+struct kutf_suite *kutf_create_suite( -+ struct kutf_application *app, -+ const char *name, -+ unsigned int fixture_count, -+ void *(*create_fixture)(struct kutf_context *context), -+ void (*remove_fixture)(struct kutf_context *context)) ++void kbase_ipa_model_use_configured_locked(struct kbase_device *kbdev) +{ -+ union kutf_callback_data data; -+ -+ data.ptr_value = NULL; -+ return kutf_create_suite_with_filters_and_data(app, -+ name, -+ fixture_count, -+ create_fixture, -+ remove_fixture, -+ KUTF_F_TEST_GENERIC, -+ data); ++ atomic_set(&kbdev->ipa_use_configured_model, true); +} -+EXPORT_SYMBOL(kutf_create_suite); + -+/** -+ * kutf_destroy_suite() - Destroy a previously added test suite. -+ * @suite: Test suite -+ */ -+static void kutf_destroy_suite(struct kutf_suite *suite) ++const char *kbase_ipa_model_name_from_id(u32 gpu_id) +{ -+ struct list_head *pos; -+ struct list_head *tmp; -+ -+ list_for_each_safe(pos, tmp, &suite->test_list) { -+ struct kutf_test_function *test_func; ++ const u32 prod_id = (gpu_id & GPU_ID_VERSION_PRODUCT_ID) >> ++ GPU_ID_VERSION_PRODUCT_ID_SHIFT; + -+ test_func = list_entry(pos, struct kutf_test_function, node); -+ kutf_remove_test(test_func); ++ if (GPU_ID_IS_NEW_FORMAT(prod_id)) { ++ switch (GPU_ID2_MODEL_MATCH_VALUE(prod_id)) { ++ case GPU_ID2_PRODUCT_TMIX: ++ return KBASE_IPA_FALLBACK_MODEL_NAME; ++ default: ++ return KBASE_IPA_FALLBACK_MODEL_NAME; ++ } + } + -+ list_del(&suite->node); -+ debugfs_remove_recursive(suite->dir); -+ kfree(suite); ++ return KBASE_IPA_FALLBACK_MODEL_NAME; +} + -+struct kutf_application *kutf_create_application(const char *name) ++static struct device_node *get_model_dt_node(struct kbase_ipa_model *model) +{ -+ struct kutf_application *app; -+ struct dentry *tmp; -+ -+ app = kmalloc(sizeof(*app), GFP_KERNEL); -+ if (!app) { -+ pr_err("Failed to create allocate memory when creating application %s\n", name); -+ goto fail_kmalloc; -+ } ++ struct device_node *model_dt_node; ++ char compat_string[64]; + -+ app->dir = debugfs_create_dir(name, base_dir); -+ if (!app->dir) { -+ pr_err("Failed to create debugfs direcotry when creating application %s\n", name); -+ goto fail_debugfs; -+ } ++ snprintf(compat_string, sizeof(compat_string), "arm,%s", ++ model->ops->name); + -+ tmp = debugfs_create_file("type", S_IROTH, app->dir, "application\n", -+ &kutf_debugfs_const_string_ops); -+ if (!tmp) { -+ pr_err("Failed to create debugfs file \"type\" when creating application %s\n", name); -+ goto fail_file; ++ model_dt_node = of_find_compatible_node(model->kbdev->dev->of_node, ++ NULL, compat_string); ++ if (!model_dt_node && !model->missing_dt_node_warning) { ++ dev_warn(model->kbdev->dev, ++ "Couldn't find power_model DT node matching \'%s\'\n", ++ compat_string); ++ model->missing_dt_node_warning = true; + } + -+ INIT_LIST_HEAD(&app->suite_list); -+ app->name = name; -+ -+ return app; -+ -+fail_file: -+ debugfs_remove_recursive(app->dir); -+fail_debugfs: -+ kfree(app); -+fail_kmalloc: -+ return NULL; ++ return model_dt_node; +} -+EXPORT_SYMBOL(kutf_create_application); + -+void kutf_destroy_application(struct kutf_application *app) ++int kbase_ipa_model_add_param_s32(struct kbase_ipa_model *model, ++ const char *name, s32 *addr, ++ size_t num_elems, bool dt_required) +{ -+ struct list_head *pos; -+ struct list_head *tmp; ++ int err, i; ++ struct device_node *model_dt_node = get_model_dt_node(model); ++ char *origin; + -+ list_for_each_safe(pos, tmp, &app->suite_list) { -+ struct kutf_suite *suite; ++ err = of_property_read_u32_array(model_dt_node, name, addr, num_elems); + -+ suite = list_entry(pos, struct kutf_suite, node); -+ kutf_destroy_suite(suite); ++ if (err && dt_required) { ++ memset(addr, 0, sizeof(s32) * num_elems); ++ dev_warn(model->kbdev->dev, ++ "Error %d, no DT entry: %s.%s = %zu*[0]\n", ++ err, model->ops->name, name, num_elems); ++ origin = "zero"; ++ } else if (err && !dt_required) { ++ origin = "default"; ++ } else /* !err */ { ++ origin = "DT"; + } + -+ debugfs_remove_recursive(app->dir); -+ kfree(app); -+} -+EXPORT_SYMBOL(kutf_destroy_application); ++ /* Create a unique debugfs entry for each element */ ++ for (i = 0; i < num_elems; ++i) { ++ char elem_name[32]; + -+static struct kutf_context *kutf_create_context( -+ struct kutf_test_fixture *test_fix) -+{ -+ struct kutf_context *new_context; ++ if (num_elems == 1) ++ snprintf(elem_name, sizeof(elem_name), "%s", name); ++ else ++ snprintf(elem_name, sizeof(elem_name), "%s.%d", ++ name, i); + -+ new_context = kmalloc(sizeof(*new_context), GFP_KERNEL); -+ if (!new_context) { -+ pr_err("Failed to allocate test context"); -+ goto fail_alloc; -+ } ++ dev_dbg(model->kbdev->dev, "%s.%s = %d (%s)\n", ++ model->ops->name, elem_name, addr[i], origin); + -+ new_context->result_set = kutf_create_result_set(); -+ if (!new_context->result_set) { -+ pr_err("Failed to create resultset"); -+ goto fail_result_set; ++ err = kbase_ipa_model_param_add(model, elem_name, ++ &addr[i], sizeof(s32), ++ PARAM_TYPE_S32); ++ if (err) ++ goto exit; + } ++exit: ++ return err; ++} + -+ new_context->test_fix = test_fix; -+ /* Save the pointer to the suite as the callbacks will require it */ -+ new_context->suite = test_fix->test_func->suite; -+ new_context->status = KUTF_RESULT_UNKNOWN; -+ new_context->expected_status = KUTF_RESULT_UNKNOWN; ++int kbase_ipa_model_add_param_string(struct kbase_ipa_model *model, ++ const char *name, char *addr, ++ size_t size, bool dt_required) ++{ ++ int err; ++ struct device_node *model_dt_node = get_model_dt_node(model); ++ const char *string_prop_value; ++ char *origin; + -+ kutf_mempool_init(&new_context->fixture_pool); -+ new_context->fixture = NULL; -+ new_context->fixture_index = test_fix->fixture_index; -+ new_context->fixture_name = NULL; -+ new_context->test_data = test_fix->test_func->test_data; -+ new_context->userdata_consumer_priv = NULL; -+ new_context->userdata_producer_priv = NULL; -+ new_context->userdata_dentry = NULL; ++ err = of_property_read_string(model_dt_node, name, ++ &string_prop_value); ++ if (err && dt_required) { ++ strncpy(addr, "", size - 1); ++ dev_warn(model->kbdev->dev, ++ "Error %d, no DT entry: %s.%s = \'%s\'\n", ++ err, model->ops->name, name, addr); ++ err = 0; ++ origin = "zero"; ++ } else if (err && !dt_required) { ++ origin = "default"; ++ } else /* !err */ { ++ strncpy(addr, string_prop_value, size - 1); ++ origin = "DT"; ++ } + -+ kref_init(&new_context->kref); ++ addr[size - 1] = '\0'; + -+ return new_context; ++ dev_dbg(model->kbdev->dev, "%s.%s = \'%s\' (%s)\n", ++ model->ops->name, name, string_prop_value, origin); + -+fail_result_set: -+ kfree(new_context); -+fail_alloc: -+ return NULL; ++ err = kbase_ipa_model_param_add(model, name, addr, size, ++ PARAM_TYPE_STRING); ++ ++ return err; +} + -+static void kutf_destroy_context(struct kref *kref) ++void kbase_ipa_term_model(struct kbase_ipa_model *model) +{ -+ struct kutf_context *context; ++ if (!model) ++ return; + -+ context = container_of(kref, struct kutf_context, kref); -+ kutf_destroy_result_set(context->result_set); -+ kutf_mempool_destroy(&context->fixture_pool); -+ kfree(context); -+} ++ lockdep_assert_held(&model->kbdev->ipa.lock); + -+static void kutf_context_get(struct kutf_context *context) -+{ -+ kref_get(&context->kref); ++ if (model->ops->term) ++ model->ops->term(model); ++ ++ kbase_ipa_model_param_free_all(model); ++ ++ kfree(model); +} ++KBASE_EXPORT_TEST_API(kbase_ipa_term_model); + -+static void kutf_context_put(struct kutf_context *context) ++struct kbase_ipa_model *kbase_ipa_init_model(struct kbase_device *kbdev, ++ struct kbase_ipa_model_ops *ops) +{ -+ kref_put(&context->kref, kutf_destroy_context); -+} ++ struct kbase_ipa_model *model; ++ int err; + ++ lockdep_assert_held(&kbdev->ipa.lock); + -+static void kutf_set_result(struct kutf_context *context, -+ enum kutf_result_status status) -+{ -+ context->status = status; -+} ++ if (!ops || !ops->name) ++ return NULL; + -+static void kutf_set_expected_result(struct kutf_context *context, -+ enum kutf_result_status expected_status) -+{ -+ context->expected_status = expected_status; -+} ++ model = kzalloc(sizeof(struct kbase_ipa_model), GFP_KERNEL); ++ if (!model) ++ return NULL; + -+/** -+ * kutf_test_log_result() - Log a result for the specified test context -+ * @context: Test context -+ * @message: Result string -+ * @new_status: Result status -+ */ -+static void kutf_test_log_result( -+ struct kutf_context *context, -+ const char *message, -+ enum kutf_result_status new_status) -+{ -+ if (context->status < new_status) -+ context->status = new_status; ++ model->kbdev = kbdev; ++ model->ops = ops; ++ INIT_LIST_HEAD(&model->params); + -+ if (context->expected_status != new_status) -+ kutf_add_result(&context->fixture_pool, context->result_set, -+ new_status, message); -+} ++ err = model->ops->init(model); ++ if (err) { ++ dev_err(kbdev->dev, ++ "init of power model \'%s\' returned error %d\n", ++ ops->name, err); ++ goto term_model; ++ } + -+void kutf_test_log_result_external( -+ struct kutf_context *context, -+ const char *message, -+ enum kutf_result_status new_status) -+{ -+ kutf_test_log_result(context, message, new_status); -+} -+EXPORT_SYMBOL(kutf_test_log_result_external); ++ err = kbase_ipa_model_recalculate(model); ++ if (err) ++ goto term_model; + -+void kutf_test_expect_abort(struct kutf_context *context) -+{ -+ kutf_set_expected_result(context, KUTF_RESULT_ABORT); -+} -+EXPORT_SYMBOL(kutf_test_expect_abort); ++ return model; + -+void kutf_test_expect_fatal(struct kutf_context *context) -+{ -+ kutf_set_expected_result(context, KUTF_RESULT_FATAL); ++term_model: ++ kbase_ipa_term_model(model); ++ return NULL; +} -+EXPORT_SYMBOL(kutf_test_expect_fatal); ++KBASE_EXPORT_TEST_API(kbase_ipa_init_model); + -+void kutf_test_expect_fail(struct kutf_context *context) ++static void kbase_ipa_term_locked(struct kbase_device *kbdev) +{ -+ kutf_set_expected_result(context, KUTF_RESULT_FAIL); -+} -+EXPORT_SYMBOL(kutf_test_expect_fail); ++ lockdep_assert_held(&kbdev->ipa.lock); + -+void kutf_test_expect_warn(struct kutf_context *context) -+{ -+ kutf_set_expected_result(context, KUTF_RESULT_WARN); -+} -+EXPORT_SYMBOL(kutf_test_expect_warn); ++ /* Clean up the models */ ++ if (kbdev->ipa.configured_model != kbdev->ipa.fallback_model) ++ kbase_ipa_term_model(kbdev->ipa.configured_model); ++ kbase_ipa_term_model(kbdev->ipa.fallback_model); + -+void kutf_test_expect_pass(struct kutf_context *context) -+{ -+ kutf_set_expected_result(context, KUTF_RESULT_PASS); ++ kbdev->ipa.configured_model = NULL; ++ kbdev->ipa.fallback_model = NULL; +} -+EXPORT_SYMBOL(kutf_test_expect_pass); + -+void kutf_test_skip(struct kutf_context *context) ++int kbase_ipa_init(struct kbase_device *kbdev) +{ -+ kutf_set_result(context, KUTF_RESULT_SKIP); -+ kutf_set_expected_result(context, KUTF_RESULT_UNKNOWN); + -+ kutf_test_log_result(context, "Test skipped", KUTF_RESULT_SKIP); -+} -+EXPORT_SYMBOL(kutf_test_skip); ++ const char *model_name; ++ struct kbase_ipa_model_ops *ops; ++ struct kbase_ipa_model *default_model = NULL; ++ int err; + -+void kutf_test_skip_msg(struct kutf_context *context, const char *message) -+{ -+ kutf_set_result(context, KUTF_RESULT_SKIP); -+ kutf_set_expected_result(context, KUTF_RESULT_UNKNOWN); ++ mutex_init(&kbdev->ipa.lock); ++ /* ++ * Lock during init to avoid warnings from lockdep_assert_held (there ++ * shouldn't be any concurrent access yet). ++ */ ++ mutex_lock(&kbdev->ipa.lock); + -+ kutf_test_log_result(context, kutf_dsprintf(&context->fixture_pool, -+ "Test skipped: %s", message), KUTF_RESULT_SKIP); -+ kutf_test_log_result(context, "!!!Test skipped!!!", KUTF_RESULT_SKIP); -+} -+EXPORT_SYMBOL(kutf_test_skip_msg); ++ /* The simple IPA model must *always* be present.*/ ++ ops = kbase_ipa_model_ops_find(kbdev, KBASE_IPA_FALLBACK_MODEL_NAME); + -+void kutf_test_debug(struct kutf_context *context, char const *message) -+{ -+ kutf_test_log_result(context, message, KUTF_RESULT_DEBUG); -+} -+EXPORT_SYMBOL(kutf_test_debug); ++ if (!ops->do_utilization_scaling_in_framework) { ++ dev_err(kbdev->dev, ++ "Fallback IPA model %s should not account for utilization\n", ++ ops->name); ++ err = -EINVAL; ++ goto end; ++ } + -+void kutf_test_pass(struct kutf_context *context, char const *message) -+{ -+ static const char explicit_message[] = "(explicit pass)"; ++ default_model = kbase_ipa_init_model(kbdev, ops); ++ if (!default_model) { ++ err = -EINVAL; ++ goto end; ++ } + -+ if (!message) -+ message = explicit_message; ++ kbdev->ipa.fallback_model = default_model; ++ err = of_property_read_string(kbdev->dev->of_node, ++ "ipa-model", ++ &model_name); ++ if (err) { ++ /* Attempt to load a match from GPU-ID */ ++ u32 gpu_id; + -+ kutf_test_log_result(context, message, KUTF_RESULT_PASS); -+} -+EXPORT_SYMBOL(kutf_test_pass); ++ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++ model_name = kbase_ipa_model_name_from_id(gpu_id); ++ dev_dbg(kbdev->dev, ++ "Inferring model from GPU ID 0x%x: \'%s\'\n", ++ gpu_id, model_name); ++ } else { ++ dev_dbg(kbdev->dev, ++ "Using ipa-model parameter from DT: \'%s\'\n", ++ model_name); ++ } + -+void kutf_test_info(struct kutf_context *context, char const *message) -+{ -+ kutf_test_log_result(context, message, KUTF_RESULT_INFO); -+} -+EXPORT_SYMBOL(kutf_test_info); ++ if (strcmp(KBASE_IPA_FALLBACK_MODEL_NAME, model_name) != 0) { ++ ops = kbase_ipa_model_ops_find(kbdev, model_name); ++ kbdev->ipa.configured_model = kbase_ipa_init_model(kbdev, ops); ++ if (!kbdev->ipa.configured_model) { ++ err = -EINVAL; ++ goto end; ++ } ++ } else { ++ kbdev->ipa.configured_model = default_model; ++ err = 0; ++ } + -+void kutf_test_warn(struct kutf_context *context, char const *message) -+{ -+ kutf_test_log_result(context, message, KUTF_RESULT_WARN); -+} -+EXPORT_SYMBOL(kutf_test_warn); ++ kbase_ipa_model_use_configured_locked(kbdev); + -+void kutf_test_fail(struct kutf_context *context, char const *message) -+{ -+ kutf_test_log_result(context, message, KUTF_RESULT_FAIL); -+} -+EXPORT_SYMBOL(kutf_test_fail); ++end: ++ if (err) ++ kbase_ipa_term_locked(kbdev); ++ else ++ dev_info(kbdev->dev, ++ "Using configured power model %s, and fallback %s\n", ++ kbdev->ipa.configured_model->ops->name, ++ kbdev->ipa.fallback_model->ops->name); + -+void kutf_test_fatal(struct kutf_context *context, char const *message) -+{ -+ kutf_test_log_result(context, message, KUTF_RESULT_FATAL); ++ mutex_unlock(&kbdev->ipa.lock); ++ return err; +} -+EXPORT_SYMBOL(kutf_test_fatal); ++KBASE_EXPORT_TEST_API(kbase_ipa_init); + -+void kutf_test_abort(struct kutf_context *context) ++void kbase_ipa_term(struct kbase_device *kbdev) +{ -+ kutf_test_log_result(context, "", KUTF_RESULT_ABORT); ++ mutex_lock(&kbdev->ipa.lock); ++ kbase_ipa_term_locked(kbdev); ++ mutex_unlock(&kbdev->ipa.lock); +} -+EXPORT_SYMBOL(kutf_test_abort); ++KBASE_EXPORT_TEST_API(kbase_ipa_term); + +/** -+ * init_kutf_core() - Module entry point. ++ * kbase_scale_dynamic_power() - Scale a dynamic power coefficient to an OPP ++ * @c: Dynamic model coefficient, in pW/(Hz V^2). Should be in range ++ * 0 < c < 2^26 to prevent overflow. ++ * @freq: Frequency, in Hz. Range: 2^23 < freq < 2^30 (~8MHz to ~1GHz) ++ * @voltage: Voltage, in mV. Range: 2^9 < voltage < 2^13 (~0.5V to ~8V) + * -+ * Create the base entry point in debugfs. ++ * Keep a record of the approximate range of each value at every stage of the ++ * calculation, to ensure we don't overflow. This makes heavy use of the ++ * approximations 1000 = 2^10 and 1000000 = 2^20, but does the actual ++ * calculations in decimal for increased accuracy. ++ * ++ * Return: Power consumption, in mW. Range: 0 < p < 2^13 (0W to ~8W) + */ -+static int __init init_kutf_core(void) ++static u32 kbase_scale_dynamic_power(const u32 c, const u32 freq, ++ const u32 voltage) +{ -+ int ret; ++ /* Range: 2^8 < v2 < 2^16 m(V^2) */ ++ const u32 v2 = (voltage * voltage) / 1000; + -+ base_dir = debugfs_create_dir("kutf_tests", NULL); -+ if (!base_dir) { -+ ret = -ENODEV; -+ goto exit_dir; -+ } ++ /* Range: 2^3 < f_MHz < 2^10 MHz */ ++ const u32 f_MHz = freq / 1000000; + -+ return 0; ++ /* Range: 2^11 < v2f_big < 2^26 kHz V^2 */ ++ const u32 v2f_big = v2 * f_MHz; + -+exit_dir: -+ return ret; ++ /* Range: 2^1 < v2f < 2^16 MHz V^2 */ ++ const u32 v2f = v2f_big / 1000; ++ ++ /* Range (working backwards from next line): 0 < v2fc < 2^23 uW. ++ * Must be < 2^42 to avoid overflowing the return value. */ ++ const u64 v2fc = (u64) c * (u64) v2f; ++ u32 remainder; ++ ++ /* Range: 0 < v2fc / 1000 < 2^13 mW */ ++ // static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder) ++ return div_u64_rem(v2fc, 1000, &remainder); +} + +/** -+ * exit_kutf_core() - Module exit point. ++ * kbase_scale_static_power() - Scale a static power coefficient to an OPP ++ * @c: Static model coefficient, in uW/V^3. Should be in range ++ * 0 < c < 2^32 to prevent overflow. ++ * @voltage: Voltage, in mV. Range: 2^9 < voltage < 2^13 (~0.5V to ~8V) + * -+ * Remove the base entry point in debugfs. ++ * Return: Power consumption, in mW. Range: 0 < p < 2^13 (0W to ~8W) + */ -+static void __exit exit_kutf_core(void) ++u32 kbase_scale_static_power(const u32 c, const u32 voltage) +{ -+ debugfs_remove_recursive(base_dir); -+} ++ /* Range: 2^8 < v2 < 2^16 m(V^2) */ ++ const u32 v2 = (voltage * voltage) / 1000; + -+#else /* defined(CONFIG_DEBUG_FS) */ ++ /* Range: 2^17 < v3_big < 2^29 m(V^2) mV */ ++ const u32 v3_big = v2 * voltage; + -+/** -+ * init_kutf_core() - Module entry point. -+ * -+ * Stub for when build against a kernel without debugfs support -+ */ -+static int __init init_kutf_core(void) -+{ -+ pr_debug("KUTF requires a kernel with debug fs support"); ++ /* Range: 2^7 < v3 < 2^19 m(V^3) */ ++ const u32 v3 = v3_big / 1000; + -+ return -ENODEV; -+} ++ /* ++ * Range (working backwards from next line): 0 < v3c_big < 2^33 nW. ++ * The result should be < 2^52 to avoid overflowing the return value. ++ */ ++ const u64 v3c_big = (u64) c * (u64) v3; ++ u32 remainder; + -+/** -+ * exit_kutf_core() - Module exit point. -+ * -+ * Stub for when build against a kernel without debugfs support -+ */ -+static void __exit exit_kutf_core(void) -+{ ++ /* Range: 0 < v3c_big / 1000000 < 2^13 mW */ ++ // return v3c_big / 1000000; ++ return div_u64_rem(v3c_big, 1000000, &remainder); +} -+#endif /* defined(CONFIG_DEBUG_FS) */ + -+MODULE_LICENSE("GPL"); ++static struct kbase_ipa_model *get_current_model(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->ipa.lock); + -+module_init(init_kutf_core); -+module_exit(exit_kutf_core); -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_utils.c b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_utils.c -new file mode 100755 -index 000000000000..a429a2dbf788 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_utils.c -@@ -0,0 +1,71 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ if (atomic_read(&kbdev->ipa_use_configured_model)) ++ return kbdev->ipa.configured_model; ++ else ++ return kbdev->ipa.fallback_model; ++} + ++static u32 get_static_power_locked(struct kbase_device *kbdev, ++ struct kbase_ipa_model *model, ++ unsigned long voltage) ++{ ++ u32 power = 0; ++ int err; ++ u32 power_coeff; + ++ lockdep_assert_held(&model->kbdev->ipa.lock); + -+/* Kernel UTF utility functions */ ++ if (!model->ops->get_static_coeff) ++ model = kbdev->ipa.fallback_model; + -+#include -+#include -+#include -+#include ++ if (model->ops->get_static_coeff) { ++ err = model->ops->get_static_coeff(model, &power_coeff); ++ if (!err) ++ power = kbase_scale_static_power(power_coeff, ++ (u32) voltage); ++ } + -+#include -+#include ++ return power; ++} + -+static char tmp_buffer[KUTF_MAX_DSPRINTF_LEN]; ++#ifdef CONFIG_MALI_PWRSOFT_765 ++static unsigned long kbase_get_static_power(struct devfreq *df, ++ unsigned long voltage) ++#else ++static unsigned long kbase_get_static_power(unsigned long voltage) ++#endif ++{ ++ struct kbase_ipa_model *model; ++ u32 power = 0; ++#ifdef CONFIG_MALI_PWRSOFT_765 ++ struct kbase_device *kbdev = dev_get_drvdata(&df->dev); ++#else ++ struct kbase_device *kbdev = kbase_find_device(-1); ++#endif + -+DEFINE_MUTEX(buffer_lock); ++ mutex_lock(&kbdev->ipa.lock); + -+const char *kutf_dsprintf(struct kutf_mempool *pool, -+ const char *fmt, ...) -+{ -+ va_list args; -+ int len; -+ int size; -+ void *buffer; ++ model = get_current_model(kbdev); ++ power = get_static_power_locked(kbdev, model, voltage); + -+ mutex_lock(&buffer_lock); -+ va_start(args, fmt); -+ len = vsnprintf(tmp_buffer, sizeof(tmp_buffer), fmt, args); -+ va_end(args); ++ mutex_unlock(&kbdev->ipa.lock); + -+ if (len < 0) { -+ pr_err("kutf_dsprintf: Bad format dsprintf format %s\n", fmt); -+ goto fail_format; -+ } ++#ifndef CONFIG_MALI_PWRSOFT_765 ++ kbase_release_device(kbdev); ++#endif + -+ if (len >= sizeof(tmp_buffer)) { -+ pr_warn("kutf_dsprintf: Truncated dsprintf message %s\n", fmt); -+ size = sizeof(tmp_buffer); -+ } else { -+ size = len + 1; -+ } ++ return power; ++} + -+ buffer = kutf_mempool_alloc(pool, size); -+ if (!buffer) -+ goto fail_alloc; ++#ifdef CONFIG_MALI_PWRSOFT_765 ++static unsigned long kbase_get_dynamic_power(struct devfreq *df, ++ unsigned long freq, ++ unsigned long voltage) ++#else ++static unsigned long kbase_get_dynamic_power(unsigned long freq, ++ unsigned long voltage) ++#endif ++{ ++ struct kbase_ipa_model *model; ++ u32 power_coeff = 0, power = 0; ++ int err = 0; ++#ifdef CONFIG_MALI_PWRSOFT_765 ++ struct kbase_device *kbdev = dev_get_drvdata(&df->dev); ++#else ++ struct kbase_device *kbdev = kbase_find_device(-1); ++#endif + -+ memcpy(buffer, tmp_buffer, size); -+ mutex_unlock(&buffer_lock); ++ mutex_lock(&kbdev->ipa.lock); + -+ return buffer; ++ model = kbdev->ipa.fallback_model; + -+fail_alloc: -+fail_format: -+ mutex_unlock(&buffer_lock); -+ return NULL; -+} -+EXPORT_SYMBOL(kutf_dsprintf); -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/sconscript b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/sconscript -new file mode 100755 -index 000000000000..d7f112448e42 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/sconscript -@@ -0,0 +1,21 @@ -+# -+# (C) COPYRIGHT 2014-2016, 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++ err = model->ops->get_dynamic_coeff(model, &power_coeff, freq); + ++ if (!err) ++ power = kbase_scale_dynamic_power(power_coeff, freq, voltage); ++ else ++ dev_err_ratelimited(kbdev->dev, ++ "Model %s returned error code %d\n", ++ model->ops->name, err); + -+Import('kutf_env') ++ mutex_unlock(&kbdev->ipa.lock); + -+make_args = kutf_env.kernel_get_config_defines(ret_list = True) ++#ifndef CONFIG_MALI_PWRSOFT_765 ++ kbase_release_device(kbdev); ++#endif + -+mod = kutf_env.BuildKernelModule('$STATIC_LIB_PATH/kutf.ko', Glob('*.c'), make_args = make_args) -+kutf_env.KernelObjTarget('kutf', mod) -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Kbuild b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Kbuild -new file mode 100755 -index 000000000000..0cd9cebe9d8b ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Kbuild -@@ -0,0 +1,20 @@ -+# -+# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++ return power; ++} + ++int kbase_get_real_power(struct devfreq *df, u32 *power, ++ unsigned long freq, ++ unsigned long voltage) ++{ ++ struct kbase_ipa_model *model; ++ u32 power_coeff = 0; ++ int err = 0; ++ struct kbase_device *kbdev = dev_get_drvdata(&df->dev); + -+ccflags-y += -I$(src)/../include -I$(src)/../../../ -I$(src)/../../ -I$(src)/../../backend/gpu -I$(srctree)/drivers/staging/android ++ mutex_lock(&kbdev->ipa.lock); + -+obj-$(CONFIG_MALI_IRQ_LATENCY) += mali_kutf_irq_test.o ++ model = get_current_model(kbdev); + -+mali_kutf_irq_test-y := mali_kutf_irq_test_main.o -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Kconfig b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Kconfig -new file mode 100755 -index 000000000000..4caa8ec8a0e2 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Kconfig -@@ -0,0 +1,23 @@ -+# -+# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++ err = model->ops->get_dynamic_coeff(model, &power_coeff, freq); + ++ /* If we switch to protected model between get_current_model() and ++ * get_dynamic_coeff(), counter reading could fail. If that happens ++ * (unlikely, but possible), revert to the fallback model. */ ++ if (err && model != kbdev->ipa.fallback_model) { ++ model = kbdev->ipa.fallback_model; ++ err = model->ops->get_dynamic_coeff(model, &power_coeff, freq); ++ } + -+config MALI_IRQ_LATENCY -+ tristate "Mali GPU IRQ latency measurement" -+ depends on MALI_BIFROST && MALI_BIFROST_DEBUG && MALI_KUTF -+ default m -+ help -+ This option will build a test module mali_kutf_irq_test that -+ can determine the latency of the Mali GPU IRQ on your system. -+ Choosing M here will generate a single module called mali_kutf_irq_test. -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Makefile b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Makefile -new file mode 100755 -index 000000000000..ced37b08e532 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Makefile -@@ -0,0 +1,47 @@ -+# -+# (C) COPYRIGHT 2015, 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++ if (err) ++ goto exit_unlock; + ++ *power = kbase_scale_dynamic_power(power_coeff, freq, voltage); + -+# linux build system bootstrap for out-of-tree module ++ if (model->ops->do_utilization_scaling_in_framework) { ++ struct devfreq_dev_status *status = &df->last_status; ++ unsigned long total_time = max(status->total_time, 1ul); ++ u64 busy_time = min(status->busy_time, total_time); ++ u32 remainder; + -+# default to building for the host -+ARCH ?= $(shell uname -m) ++ // *power = ((u64) *power * (u64) busy_time) / total_time; ++ *power = div_u64_rem(((u64) *power * (u64) busy_time), total_time, &remainder); ++ } + -+ifeq ($(KDIR),) -+$(error Must specify KDIR to point to the kernel to target)) -+endif ++ *power += get_static_power_locked(kbdev, model, voltage); + -+TEST_CCFLAGS := \ -+ -DMALI_DEBUG=$(MALI_BIFROST_DEBUG) \ -+ -DMALI_BACKEND_KERNEL=$(MALI_BACKEND_KERNEL) \ -+ -DMALI_NO_MALI=$(MALI_BIFROST_NO_MALI) \ -+ -DMALI_UNIT_TEST=$(MALI_UNIT_TEST) \ -+ -DMALI_USE_UMP=$(MALI_USE_UMP) \ -+ -DMALI_ERROR_INJECT_ON=$(MALI_ERROR_INJECT_ON) \ -+ -DMALI_CUSTOMER_RELEASE=$(MALI_CUSTOMER_RELEASE) \ -+ $(SCONS_CFLAGS) \ -+ -I$(CURDIR)/../include \ -+ -I$(CURDIR)/../../../../../../include \ -+ -I$(CURDIR)/../../../ \ -+ -I$(CURDIR)/../../ \ -+ -I$(CURDIR)/../../backend/gpu \ -+ -I$(CURDIR)/ \ -+ -I$(srctree)/drivers/staging/android \ -+ -I$(srctree)/include/linux ++exit_unlock: ++ mutex_unlock(&kbdev->ipa.lock); + -+all: -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) $(SCONS_CONFIGS) EXTRA_CFLAGS="$(TEST_CCFLAGS)" KBUILD_EXTRA_SYMBOLS="$(CURDIR)/../kutf/Module.symvers $(CURDIR)/../../Module.symvers" modules ++ return err; ++} ++KBASE_EXPORT_TEST_API(kbase_get_real_power); + -+clean: -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) ++struct devfreq_cooling_ops kbase_ipa_power_model_ops = { ++#else ++struct devfreq_cooling_power kbase_ipa_power_model_ops = { ++#endif ++ .get_static_power = &kbase_get_static_power, ++ .get_dynamic_power = &kbase_get_dynamic_power, ++}; ++KBASE_EXPORT_TEST_API(kbase_ipa_power_model_ops); +diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h new file mode 100755 -index 000000000000..c9cc4447cf37 +index 000000000..b2d3db149 --- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c -@@ -0,0 +1,269 @@ ++++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h +@@ -0,0 +1,148 @@ +/* + * -+ * (C) COPYRIGHT 2016, 2017 ARM Limited. All rights reserved. ++ * (C) COPYRIGHT 2016-2017 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software @@ -339166,155773 +374850,95068 @@ index 000000000000..c9cc4447cf37 + + + -+#include -+#include -+#include ++#ifndef _KBASE_IPA_H_ ++#define _KBASE_IPA_H_ + -+#include "mali_kbase.h" -+#include ++#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) + -+#include -+#include ++struct devfreq; + -+/* -+ * This file contains the code which is used for measuring interrupt latency -+ * of the Mali GPU IRQ. In particular, function mali_kutf_irq_latency() is -+ * used with this purpose and it is called within KUTF framework - a kernel -+ * unit test framework. The measured latency provided by this test should -+ * be representative for the latency of the Mali JOB/MMU IRQs as well. -+ */ ++struct kbase_ipa_model { ++ struct list_head link; ++ struct kbase_device *kbdev; ++ void *model_data; ++ struct kbase_ipa_model_ops *ops; ++ struct list_head params; ++ bool missing_dt_node_warning; ++}; + -+/* KUTF test application pointer for this test */ -+struct kutf_application *irq_app; ++/** ++ * kbase_ipa_model_add_param_s32 - Add an integer model parameter ++ * @model: pointer to IPA model ++ * @name: name of corresponding debugfs entry ++ * @addr: address where the value is stored ++ * @num_elems: number of elements (1 if not an array) ++ * @dt_required: if false, a corresponding devicetree entry is not required, ++ * and the current value will be used. If true, a warning is ++ * output and the data is zeroed ++ * ++ * Return: 0 on success, or an error code ++ */ ++int kbase_ipa_model_add_param_s32(struct kbase_ipa_model *model, ++ const char *name, s32 *addr, ++ size_t num_elems, bool dt_required); + +/** -+ * struct kutf_irq_fixture data - test fixture used by the test functions. -+ * @kbdev: kbase device for the GPU. ++ * kbase_ipa_model_add_param_string - Add a string model parameter ++ * @model: pointer to IPA model ++ * @name: name of corresponding debugfs entry ++ * @addr: address where the value is stored ++ * @size: size, in bytes, of the value storage (so the maximum string ++ * length is size - 1) ++ * @dt_required: if false, a corresponding devicetree entry is not required, ++ * and the current value will be used. If true, a warning is ++ * output and the data is zeroed + * ++ * Return: 0 on success, or an error code + */ -+struct kutf_irq_fixture_data { -+ struct kbase_device *kbdev; ++int kbase_ipa_model_add_param_string(struct kbase_ipa_model *model, ++ const char *name, char *addr, ++ size_t size, bool dt_required); ++ ++struct kbase_ipa_model_ops { ++ char *name; ++ /* The init, recalculate and term ops on the default model are always ++ * called. However, all the other models are only invoked if the model ++ * is selected in the device tree. Otherwise they are never ++ * initialized. Additional resources can be acquired by models in ++ * init(), however they must be terminated in the term(). ++ */ ++ int (*init)(struct kbase_ipa_model *model); ++ /* Called immediately after init(), or when a parameter is changed, so ++ * that any coefficients derived from model parameters can be ++ * recalculated. */ ++ int (*recalculate)(struct kbase_ipa_model *model); ++ void (*term)(struct kbase_ipa_model *model); ++ /* ++ * get_dynamic_coeff() - calculate dynamic power coefficient ++ * @model: pointer to model ++ * @coeffp: pointer to return value location ++ * @current_freq: frequency the GPU has been running at for the ++ * previous sampling period. ++ * ++ * Calculate a dynamic power coefficient, with units pW/(Hz V^2), which ++ * is then scaled by the IPA framework according to the current OPP's ++ * frequency and voltage. ++ * ++ * Return: 0 on success, or an error code. ++ */ ++ int (*get_dynamic_coeff)(struct kbase_ipa_model *model, u32 *coeffp, ++ u32 current_freq); ++ /* ++ * get_static_coeff() - calculate static power coefficient ++ * @model: pointer to model ++ * @coeffp: pointer to return value location ++ * ++ * Calculate a static power coefficient, with units uW/(V^3), which is ++ * scaled by the IPA framework according to the current OPP's voltage. ++ * ++ * Return: 0 on success, or an error code. ++ */ ++ int (*get_static_coeff)(struct kbase_ipa_model *model, u32 *coeffp); ++ /* If false, the model's get_dynamic_coeff() method accounts for how ++ * long the GPU was active over the sample period. If true, the ++ * framework will scale the calculated power according to the ++ * utilization stats recorded by devfreq in get_real_power(). */ ++ bool do_utilization_scaling_in_framework; +}; + -+#define SEC_TO_NANO(s) ((s)*1000000000LL) ++/* Models can be registered only in the platform's platform_init_func call */ ++int kbase_ipa_model_ops_register(struct kbase_device *kbdev, ++ struct kbase_ipa_model_ops *new_model_ops); ++struct kbase_ipa_model *kbase_ipa_get_model(struct kbase_device *kbdev, ++ const char *name); + -+/* ID for the GPU IRQ */ -+#define GPU_IRQ_HANDLER 2 ++int kbase_ipa_init(struct kbase_device *kbdev); ++void kbase_ipa_term(struct kbase_device *kbdev); ++void kbase_ipa_model_use_fallback_locked(struct kbase_device *kbdev); ++void kbase_ipa_model_use_configured_locked(struct kbase_device *kbdev); ++int kbase_ipa_model_recalculate(struct kbase_ipa_model *model); ++struct kbase_ipa_model *kbase_ipa_init_model(struct kbase_device *kbdev, ++ struct kbase_ipa_model_ops *ops); ++void kbase_ipa_term_model(struct kbase_ipa_model *model); + -+#define NR_TEST_IRQS 1000000 ++extern struct kbase_ipa_model_ops kbase_simple_ipa_model_ops; + -+/* IRQ for the test to trigger. Currently MULTIPLE_GPU_FAULTS as we would not -+ * expect to see this in normal use (e.g., when Android is running). */ -+#define TEST_IRQ MULTIPLE_GPU_FAULTS + -+#define IRQ_TIMEOUT HZ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) ++extern struct devfreq_cooling_ops kbase_ipa_power_model_ops; ++#else ++extern struct devfreq_cooling_power kbase_ipa_power_model_ops; ++#endif + -+/* Kernel API for setting irq throttle hook callback and irq time in us*/ -+extern int kbase_set_custom_irq_handler(struct kbase_device *kbdev, -+ irq_handler_t custom_handler, -+ int irq_type); -+extern irqreturn_t kbase_gpu_irq_handler(int irq, void *data); ++#else /* !(defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL)) */ + -+static DECLARE_WAIT_QUEUE_HEAD(wait); -+static bool triggered; -+static u64 irq_time; ++static inline void kbase_ipa_model_use_fallback_locked(struct kbase_device *kbdev) ++{ } + -+static void *kbase_untag(void *ptr) -+{ -+ return (void *)(((uintptr_t) ptr) & ~3); -+} ++static inline void kbase_ipa_model_use_configured_locked(struct kbase_device *kbdev) ++{ } + -+/** -+ * kbase_gpu_irq_custom_handler - Custom IRQ throttle handler -+ * @irq: IRQ number -+ * @data: Data associated with this IRQ ++#endif /* (defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL)) */ ++ ++#endif +diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c +new file mode 100755 +index 000000000..eafc14009 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c +@@ -0,0 +1,219 @@ ++/* ++ * ++ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * Return: state of the IRQ + */ -+static irqreturn_t kbase_gpu_irq_custom_handler(int irq, void *data) -+{ -+ struct kbase_device *kbdev = kbase_untag(data); -+ u32 val; + -+ val = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_STATUS), NULL); -+ if (val & TEST_IRQ) { -+ struct timespec tval; + -+ getnstimeofday(&tval); -+ irq_time = SEC_TO_NANO(tval.tv_sec) + (tval.tv_nsec); + -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), val, -+ NULL); ++#include ++#include ++#include + -+ triggered = true; -+ wake_up(&wait); ++#include "mali_kbase.h" ++#include "mali_kbase_ipa.h" ++#include "mali_kbase_ipa_debugfs.h" + -+ return IRQ_HANDLED; -+ } ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)) ++#define DEFINE_DEBUGFS_ATTRIBUTE DEFINE_SIMPLE_ATTRIBUTE ++#endif + -+ /* Trigger main irq handler */ -+ return kbase_gpu_irq_handler(irq, data); -+} ++struct kbase_ipa_model_param { ++ char *name; ++ union { ++ void *voidp; ++ s32 *s32p; ++ char *str; ++ } addr; ++ size_t size; ++ enum kbase_ipa_model_param_type type; ++ struct kbase_ipa_model *model; ++ struct list_head link; ++}; + -+/** -+ * mali_kutf_irq_default_create_fixture() - Creates the fixture data required -+ * for all the tests in the irq suite. -+ * @context: KUTF context. -+ * -+ * Return: Fixture data created on success or NULL on failure -+ */ -+static void *mali_kutf_irq_default_create_fixture( -+ struct kutf_context *context) ++static int param_int_get(void *data, u64 *val) +{ -+ struct kutf_irq_fixture_data *data; -+ -+ data = kutf_mempool_alloc(&context->fixture_pool, -+ sizeof(struct kutf_irq_fixture_data)); -+ -+ if (!data) -+ goto fail; -+ -+ /* Acquire the kbase device */ -+ data->kbdev = kbase_find_device(-1); -+ if (data->kbdev == NULL) { -+ kutf_test_fail(context, "Failed to find kbase device"); -+ goto fail; -+ } ++ struct kbase_ipa_model_param *param = data; + -+ return data; ++ mutex_lock(¶m->model->kbdev->ipa.lock); ++ *(s64 *) val = *param->addr.s32p; ++ mutex_unlock(¶m->model->kbdev->ipa.lock); + -+fail: -+ return NULL; ++ return 0; +} + -+/** -+ * mali_kutf_irq_default_remove_fixture() - Destroy fixture data previously -+ * created by mali_kutf_irq_default_create_fixture. -+ * -+ * @context: KUTF context. -+ */ -+static void mali_kutf_irq_default_remove_fixture( -+ struct kutf_context *context) -+{ -+ struct kutf_irq_fixture_data *data = context->fixture; -+ struct kbase_device *kbdev = data->kbdev; -+ -+ kbase_release_device(kbdev); -+} -+ -+/** -+ * mali_kutf_irq_latency() - measure GPU IRQ latency -+ * @context: kutf context within which to perform the test -+ * -+ * The test triggers IRQs manually, and measures the -+ * time between triggering the IRQ and the IRQ handler being executed. -+ * -+ * This is not a traditional test, in that the pass/fail status has little -+ * meaning (other than indicating that the IRQ handler executed at all). Instead -+ * the results are in the latencies provided with the test result. There is no -+ * meaningful pass/fail result that can be obtained here, instead the latencies -+ * are provided for manual analysis only. -+ */ -+static void mali_kutf_irq_latency(struct kutf_context *context) ++static int param_int_set(void *data, u64 val) +{ -+ struct kutf_irq_fixture_data *data = context->fixture; -+ struct kbase_device *kbdev = data->kbdev; -+ u64 min_time = U64_MAX, max_time = 0, average_time = 0; -+ int i; -+ bool test_failed = false; -+ -+ /* Force GPU to be powered */ -+ kbase_pm_context_active(kbdev); -+ -+ kbase_set_custom_irq_handler(kbdev, kbase_gpu_irq_custom_handler, -+ GPU_IRQ_HANDLER); -+ -+ for (i = 0; i < NR_TEST_IRQS; i++) { -+ struct timespec tval; -+ u64 start_time; -+ int ret; -+ -+ triggered = false; -+ getnstimeofday(&tval); -+ start_time = SEC_TO_NANO(tval.tv_sec) + (tval.tv_nsec); -+ -+ /* Trigger fake IRQ */ -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_RAWSTAT), -+ TEST_IRQ, NULL); -+ -+ ret = wait_event_timeout(wait, triggered != false, IRQ_TIMEOUT); ++ struct kbase_ipa_model_param *param = data; ++ struct kbase_ipa_model *model = param->model; ++ s64 sval = (s64) val; ++ int err = 0; + -+ if (ret == 0) { -+ kutf_test_fail(context, "Timed out waiting for IRQ\n"); -+ test_failed = true; -+ break; -+ } ++ if (sval < S32_MIN || sval > S32_MAX) ++ return -ERANGE; + -+ if ((irq_time - start_time) < min_time) -+ min_time = irq_time - start_time; -+ if ((irq_time - start_time) > max_time) -+ max_time = irq_time - start_time; -+ average_time += irq_time - start_time; ++ mutex_lock(¶m->model->kbdev->ipa.lock); ++ *param->addr.s32p = val; ++ err = kbase_ipa_model_recalculate(model); ++ mutex_unlock(¶m->model->kbdev->ipa.lock); + -+ udelay(10); -+ } ++ return err; ++} + -+ /* Go back to default handler */ -+ kbase_set_custom_irq_handler(kbdev, NULL, GPU_IRQ_HANDLER); ++DEFINE_DEBUGFS_ATTRIBUTE(fops_s32, param_int_get, param_int_set, "%lld\n"); + -+ kbase_pm_context_idle(kbdev); ++static ssize_t param_string_get(struct file *file, char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct kbase_ipa_model_param *param = file->private_data; ++ ssize_t ret; ++ size_t len; + -+ if (!test_failed) { -+ const char *results; ++ mutex_lock(¶m->model->kbdev->ipa.lock); ++ len = strnlen(param->addr.str, param->size - 1) + 1; ++ ret = simple_read_from_buffer(user_buf, count, ppos, ++ param->addr.str, len); ++ mutex_unlock(¶m->model->kbdev->ipa.lock); + -+ do_div(average_time, NR_TEST_IRQS); -+ results = kutf_dsprintf(&context->fixture_pool, -+ "Min latency = %lldns, Max latency = %lldns, Average latency = %lldns\n", -+ min_time, max_time, average_time); -+ kutf_test_pass(context, results); -+ } ++ return ret; +} + -+/** -+ * Module entry point for this test. -+ */ -+int mali_kutf_irq_test_main_init(void) ++static ssize_t param_string_set(struct file *file, const char __user *user_buf, ++ size_t count, loff_t *ppos) +{ -+ struct kutf_suite *suite; ++ struct kbase_ipa_model_param *param = file->private_data; ++ struct kbase_ipa_model *model = param->model; ++ ssize_t ret = count; ++ size_t buf_size; ++ int err; + -+ irq_app = kutf_create_application("irq"); ++ mutex_lock(&model->kbdev->ipa.lock); + -+ if (NULL == irq_app) { -+ pr_warn("Creation of test application failed!\n"); -+ return -ENOMEM; ++ if (count > param->size) { ++ ret = -EINVAL; ++ goto end; + } + -+ suite = kutf_create_suite(irq_app, "irq_default", -+ 1, mali_kutf_irq_default_create_fixture, -+ mali_kutf_irq_default_remove_fixture); -+ -+ if (NULL == suite) { -+ pr_warn("Creation of test suite failed!\n"); -+ kutf_destroy_application(irq_app); -+ return -ENOMEM; ++ buf_size = min(param->size - 1, count); ++ if (copy_from_user(param->addr.str, user_buf, buf_size)) { ++ ret = -EFAULT; ++ goto end; + } + -+ kutf_add_test(suite, 0x0, "irq_latency", -+ mali_kutf_irq_latency); -+ return 0; -+} -+ -+/** -+ * Module exit point for this test. -+ */ -+void mali_kutf_irq_test_main_exit(void) -+{ -+ kutf_destroy_application(irq_app); -+} -+ -+module_init(mali_kutf_irq_test_main_init); -+module_exit(mali_kutf_irq_test_main_exit); -+ -+MODULE_LICENSE("GPL"); -+MODULE_AUTHOR("ARM Ltd."); -+MODULE_VERSION("1.0"); -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/sconscript b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/sconscript -new file mode 100755 -index 000000000000..b06d9ea32924 ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/sconscript -@@ -0,0 +1,30 @@ -+# -+# (C) COPYRIGHT 2015, 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# -+ -+ -+import os -+Import('env') -+ -+src = [Glob('#kernel/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/*.c'), Glob('#kernel/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile')] -+ -+if env.GetOption('clean') : -+ env.Execute(Action("make clean", '[CLEAN] mali_kutf_irq_test')) -+ cmd = env.Command('$STATIC_LIB_PATH/mali_kutf_irq_test.ko', src, []) -+ env.KernelObjTarget('mali_kutf_irq_test', cmd) -+else: -+ makeAction=Action("cd ${SOURCE.dir} && make MALI_BIFROST_DEBUG=${debug} MALI_BACKEND_KERNEL=1 MALI_ERROR_INJECT_ON=${error_inject} MALI_BIFROST_NO_MALI=${no_mali} MALI_UNIT_TEST=${unit} MALI_USE_UMP=${ump} MALI_CUSTOMER_RELEASE=${release} %s && ( ( [ -f mali_kutf_irq_test.ko ] && cp mali_kutf_irq_test.ko $STATIC_LIB_PATH/ ) || touch $STATIC_LIB_PATH/mali_kutf_irq_test.ko)" % env.kernel_get_config_defines(), '$MAKECOMSTR') -+ cmd = env.Command('$STATIC_LIB_PATH/mali_kutf_irq_test.ko', src, [makeAction]) -+ env.Depends('$STATIC_LIB_PATH/mali_kutf_irq_test.ko', '$STATIC_LIB_PATH/kutf.ko') -+ env.Depends('$STATIC_LIB_PATH/mali_kutf_irq_test.ko', '$STATIC_LIB_PATH/mali_kbase.ko') -+ env.KernelObjTarget('mali_kutf_irq_test', cmd) -diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/sconscript b/drivers/gpu/arm/bifrost_for_linux/tests/sconscript -new file mode 100755 -index 000000000000..04584117ccef ---- /dev/null -+++ b/drivers/gpu/arm/bifrost_for_linux/tests/sconscript -@@ -0,0 +1,38 @@ -+# -+# (C) COPYRIGHT 2010-2011, 2013, 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# -+ -+ -+Import ('env') -+ -+kutf_env = env.Clone() -+kutf_env.Append(CPPPATH = '#kernel/drivers/gpu/arm/midgard/tests/include') -+Export('kutf_env') -+ -+if Glob('internal/sconscript'): -+ SConscript('internal/sconscript') -+ -+if kutf_env['debug'] == '1': -+ SConscript('kutf/sconscript') -+ SConscript('mali_kutf_irq_test/sconscript') -+ -+ if Glob('kutf_test/sconscript'): -+ SConscript('kutf_test/sconscript') -+ -+ if Glob('kutf_test_runner/sconscript'): -+ SConscript('kutf_test_runner/sconscript') -+ -+if env['unit'] == '1': -+ SConscript('mali_kutf_ipa_test/sconscript') -+ SConscript('mali_kutf_ipa_unit_test/sconscript') -+ SConscript('mali_kutf_vinstr_test/sconscript') -diff --git a/drivers/gpu/arm/mali400/.gitignore b/drivers/gpu/arm/mali400/.gitignore -new file mode 100755 -index 000000000000..d91c8078a009 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/.gitignore -@@ -0,0 +1 @@ -+./mali/__malidrv_build_info.c -diff --git a/drivers/gpu/arm/mali400/Kbuild b/drivers/gpu/arm/mali400/Kbuild -new file mode 100755 -index 000000000000..dbb7ad3e5d85 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/Kbuild -@@ -0,0 +1,2 @@ -+# SPDX-License-Identifier: GPL-2.0 -+obj-y += mali/ -diff --git a/drivers/gpu/arm/mali400/mali/.gitignore b/drivers/gpu/arm/mali400/mali/.gitignore -new file mode 100755 -index 000000000000..6b1a3ed27a7f ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/.gitignore -@@ -0,0 +1 @@ -+__malidrv_build_info.c -diff --git a/drivers/gpu/arm/mali400/mali/Kbuild b/drivers/gpu/arm/mali400/mali/Kbuild -new file mode 100755 -index 000000000000..7390ab758f22 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/Kbuild -@@ -0,0 +1,254 @@ -+# -+# Copyright (C) 2010-2011 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+# as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained from Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+# -+ -+# This file is called by the Linux build system. -+ -+# make $(src) as absolute path if it isn't already, by prefixing $(srctree) -+src:=$(if $(patsubst /%,,$(src)),$(srctree)/$(src),$(src)) -+ -+# set up defaults if not defined by the user -+TIMESTAMP ?= default -+OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB ?= 16 -+USING_GPU_UTILIZATION ?= 1 -+PROFILING_SKIP_PP_JOBS ?= 0 -+PROFILING_SKIP_PP_AND_GP_JOBS ?= 0 -+MALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP ?= 0 -+MALI_PP_SCHEDULER_KEEP_SUB_JOB_STARTS_ALIGNED ?= 0 -+MALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP_BETWEEN_APPS ?= 0 -+MALI_UPPER_HALF_SCHEDULING ?= 1 -+MALI_ENABLE_CPU_CYCLES ?= 0 -+MALI_PLATFORM ?= rk -+ -+# For customer releases the Linux Device Drivers will be provided as ARM proprietary and GPL releases: -+# The ARM proprietary product will only include the license/proprietary directory -+# The GPL product will only include the license/gpl directory -+ccflags-y += -I$(src)/linux/license/gpl -+ -+ -+ifeq ($(USING_GPU_UTILIZATION), 1) -+ ifeq ($(USING_DVFS), 1) -+ $(error USING_GPU_UTILIZATION conflict with USING_DVFS you can read the Integration Guide to choose which one do you need) -+ endif -+endif -+ -+ifneq ($(MALI_PLATFORM),) -+ EXTRA_DEFINES += -DMALI_FAKE_PLATFORM_DEVICE=1 -+ #MALI_PLATFORM_FILES = $(wildcard platform/$(MALI_PLATFORM)/*.c) -+ mali-y += \ -+ platform/$(MALI_PLATFORM)/rk.o -+endif -+ -+ifeq ($(MALI_PLATFORM_FILES),) -+ifeq ($(CONFIG_ARCH_EXYNOS4),y) -+EXTRA_DEFINES += -DMALI_FAKE_PLATFORM_DEVICE=1 -+export MALI_PLATFORM=exynos4 -+export MALI_PLATFORM_FILES_BUILDIN = $(notdir $(wildcard $(src)/platform/$(MALI_PLATFORM)/*.c)) -+export MALI_PLATFORM_FILES_ADD_PREFIX = $(addprefix platform/$(MALI_PLATFORM)/,$(MALI_PLATFORM_FILES_BUILDIN)) -+endif -+endif -+ -+mali-y += \ -+ linux/mali_osk_atomics.o \ -+ linux/mali_osk_irq.o \ -+ linux/mali_osk_wq.o \ -+ linux/mali_osk_locks.o \ -+ linux/mali_osk_wait_queue.o \ -+ linux/mali_osk_low_level_mem.o \ -+ linux/mali_osk_math.o \ -+ linux/mali_osk_memory.o \ -+ linux/mali_osk_misc.o \ -+ linux/mali_osk_mali.o \ -+ linux/mali_osk_notification.o \ -+ linux/mali_osk_time.o \ -+ linux/mali_osk_timers.o \ -+ linux/mali_osk_bitmap.o -+ -+mali-y += linux/mali_memory.o linux/mali_memory_os_alloc.o -+mali-y += linux/mali_memory_external.o -+mali-y += linux/mali_memory_block_alloc.o -+mali-y += linux/mali_memory_swap_alloc.o -+ -+mali-y += \ -+ linux/mali_memory_manager.o \ -+ linux/mali_memory_virtual.o \ -+ linux/mali_memory_util.o \ -+ linux/mali_memory_cow.o \ -+ linux/mali_memory_defer_bind.o -+ -+mali-y += \ -+ linux/mali_ukk_mem.o \ -+ linux/mali_ukk_gp.o \ -+ linux/mali_ukk_pp.o \ -+ linux/mali_ukk_core.o \ -+ linux/mali_ukk_soft_job.o \ -+ linux/mali_ukk_timeline.o -+ -+mali-$(CONFIG_MALI_DEVFREQ) += \ -+ linux/mali_devfreq.o \ -+ common/mali_pm_metrics.o -+ -+# Source files which always are included in a build -+mali-y += \ -+ common/mali_kernel_core.o \ -+ linux/mali_kernel_linux.o \ -+ common/mali_session.o \ -+ linux/mali_device_pause_resume.o \ -+ common/mali_kernel_vsync.o \ -+ linux/mali_ukk_vsync.o \ -+ linux/mali_kernel_sysfs.o \ -+ common/mali_mmu.o \ -+ common/mali_mmu_page_directory.o \ -+ common/mali_mem_validation.o \ -+ common/mali_hw_core.o \ -+ common/mali_gp.o \ -+ common/mali_pp.o \ -+ common/mali_pp_job.o \ -+ common/mali_gp_job.o \ -+ common/mali_soft_job.o \ -+ common/mali_scheduler.o \ -+ common/mali_executor.o \ -+ common/mali_group.o \ -+ common/mali_dlbu.o \ -+ common/mali_broadcast.o \ -+ common/mali_pm.o \ -+ common/mali_pmu.o \ -+ common/mali_user_settings_db.o \ -+ common/mali_kernel_utilization.o \ -+ common/mali_control_timer.o \ -+ common/mali_l2_cache.o \ -+ common/mali_timeline.o \ -+ common/mali_timeline_fence_wait.o \ -+ common/mali_timeline_sync_fence.o \ -+ common/mali_spinlock_reentrant.o \ -+ common/mali_pm_domain.o \ -+ linux/mali_osk_pm.o \ -+ linux/mali_pmu_power_up_down.o \ -+ __malidrv_build_info.o -+ -+ifneq ($(wildcard $(src)/linux/mali_slp_global_lock.c),) -+ mali-y += linux/mali_slp_global_lock.o -+endif -+ -+ifneq ($(MALI_PLATFORM_FILES),) -+ mali-y += $(MALI_PLATFORM_FILES:.c=.o) -+endif -+ -+ifneq ($(MALI_PLATFORM_FILES_ADD_PREFIX),) -+ mali-y += $(MALI_PLATFORM_FILES_ADD_PREFIX:.c=.o) -+endif -+ -+mali-$(CONFIG_MALI400_PROFILING) += linux/mali_ukk_profiling.o -+mali-$(CONFIG_MALI400_PROFILING) += linux/mali_osk_profiling.o -+ -+mali-$(CONFIG_MALI400_INTERNAL_PROFILING) += linux/mali_profiling_internal.o timestamp-$(TIMESTAMP)/mali_timestamp.o -+ccflags-$(CONFIG_MALI400_INTERNAL_PROFILING) += -I$(src)/timestamp-$(TIMESTAMP) -+ -+mali-$(CONFIG_DMA_SHARED_BUFFER) += linux/mali_memory_dma_buf.o -+mali-$(CONFIG_DMA_SHARED_BUFFER) += linux/mali_memory_secure.o -+mali-$(CONFIG_SYNC) += linux/mali_sync.o -+mali-$(CONFIG_SYNC) += linux/mali_internal_sync.o -+mali-$(CONFIG_SYNC_FILE) += linux/mali_sync.o -+mali-$(CONFIG_SYNC_FILE) += linux/mali_internal_sync.o -+mali-$(CONFIG_MALI_DMA_BUF_FENCE) += linux/mali_dma_fence.o -+ccflags-$(CONFIG_SYNC) += -Idrivers/staging/android -+ccflags-$(CONFIG_SYNC_FILE) += -Idrivers/staging/android -+ -+mali-$(CONFIG_MALI400_UMP) += linux/mali_memory_ump.o -+ -+mali-$(CONFIG_MALI_DVFS) += common/mali_dvfs_policy.o -+ -+# Tell the Linux build system from which .o file to create the kernel module -+obj-$(CONFIG_MALI400) := mali.o -+ -+ccflags-y += $(EXTRA_DEFINES) -+ -+# Set up our defines, which will be passed to gcc -+ccflags-y += -DMALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP=$(MALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP) -+ccflags-y += -DMALI_PP_SCHEDULER_KEEP_SUB_JOB_STARTS_ALIGNED=$(MALI_PP_SCHEDULER_KEEP_SUB_JOB_STARTS_ALIGNED) -+ccflags-y += -DMALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP_BETWEEN_APPS=$(MALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP_BETWEEN_APPS) -+ccflags-y += -DMALI_STATE_TRACKING=1 -+ccflags-y += -DMALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB=$(OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB) -+ccflags-y += -DUSING_GPU_UTILIZATION=$(USING_GPU_UTILIZATION) -+ccflags-y += -DMALI_ENABLE_CPU_CYCLES=$(MALI_ENABLE_CPU_CYCLES) -+ -+ifeq ($(MALI_UPPER_HALF_SCHEDULING),1) -+ ccflags-y += -DMALI_UPPER_HALF_SCHEDULING -+endif -+ -+#build-in include path is different -+ifeq ($(MALI_PLATFORM_FILES),) -+ccflags-$(CONFIG_MALI400_UMP) += -I$(src)/../ump/include/ -+else -+ccflags-$(CONFIG_MALI400_UMP) += -I$(src)/../../ump/include/ump -+endif -+ccflags-$(CONFIG_MALI400_DEBUG) += -DDEBUG -+ -+# Use our defines when compiling -+ccflags-y += -I$(src) -I$(src)/include -I$(src)/common -I$(src)/linux -I$(src)/platform -Wno-date-time -+ -+# Get subversion revision number, fall back to only ${MALI_RELEASE_NAME} if no svn info is available -+MALI_RELEASE_NAME=$(shell cat $(src)/.version 2> /dev/null) -+ -+SVN_INFO = (cd $(src); svn info 2>/dev/null) -+ -+ifneq ($(shell $(SVN_INFO) 2>/dev/null),) -+# SVN detected -+SVN_REV := $(shell $(SVN_INFO) | grep '^Revision: '| sed -e 's/^Revision: //' 2>/dev/null) -+DRIVER_REV := $(MALI_RELEASE_NAME)-r$(SVN_REV) -+CHANGE_DATE := $(shell $(SVN_INFO) | grep '^Last Changed Date: ' | cut -d: -f2- | cut -b2-) -+CHANGED_REVISION := $(shell $(SVN_INFO) | grep '^Last Changed Rev: ' | cut -d: -f2- | cut -b2-) -+REPO_URL := $(shell $(SVN_INFO) | grep '^URL: ' | cut -d: -f2- | cut -b2-) -+ -+else # SVN -+# GIT_REV := $(shell cd $(src); git describe --always 2>/dev/null) -+ifneq ($(GIT_REV),) -+# Git detected -+DRIVER_REV := $(MALI_RELEASE_NAME)-$(GIT_REV) -+CHANGE_DATE := $(shell cd $(src); git log -1 --format="%ci") -+CHANGED_REVISION := $(GIT_REV) -+REPO_URL := $(shell cd $(src); git describe --all --always 2>/dev/null) -+ -+else # Git -+# No Git or SVN detected -+DRIVER_REV := $(MALI_RELEASE_NAME) -+CHANGE_DATE := $(MALI_RELEASE_NAME) -+CHANGED_REVISION := $(MALI_RELEASE_NAME) -+endif -+endif -+ -+ccflags-y += -DSVN_REV_STRING=\"$(DRIVER_REV)\" -+ -+VERSION_STRINGS := -+VERSION_STRINGS += API_VERSION=$(shell cd $(src); grep "\#define _MALI_API_VERSION" $(FILES_PREFIX)include/linux/mali/mali_utgard_uk_types.h | cut -d' ' -f 3 ) -+VERSION_STRINGS += REPO_URL=$(REPO_URL) -+VERSION_STRINGS += REVISION=$(DRIVER_REV) -+VERSION_STRINGS += CHANGED_REVISION=$(CHANGED_REVISION) -+VERSION_STRINGS += CHANGE_DATE=$(CHANGE_DATE) -+VERSION_STRINGS += BUILD_DATE=$(shell date) -+ifdef CONFIG_MALI400_DEBUG -+VERSION_STRINGS += BUILD=debug -+else -+VERSION_STRINGS += BUILD=release -+endif -+VERSION_STRINGS += TARGET_PLATFORM=$(TARGET_PLATFORM) -+VERSION_STRINGS += MALI_PLATFORM=$(MALI_PLATFORM) -+VERSION_STRINGS += KDIR=$(KDIR) -+VERSION_STRINGS += OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB=$(OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB) -+VERSION_STRINGS += USING_UMP=$(CONFIG_MALI400_UMP) -+VERSION_STRINGS += USING_PROFILING=$(CONFIG_MALI400_PROFILING) -+VERSION_STRINGS += USING_INTERNAL_PROFILING=$(CONFIG_MALI400_INTERNAL_PROFILING) -+VERSION_STRINGS += USING_GPU_UTILIZATION=$(USING_GPU_UTILIZATION) -+VERSION_STRINGS += USING_DVFS=$(CONFIG_MALI_DVFS) -+VERSION_STRINGS += USING_DMA_BUF_FENCE = $(CONFIG_MALI_DMA_BUF_FENCE) -+VERSION_STRINGS += MALI_UPPER_HALF_SCHEDULING=$(MALI_UPPER_HALF_SCHEDULING) -+ -+# Create file with Mali driver configuration -+$(src)/__malidrv_build_info.c: -+ @echo 'const char *__malidrv_build_info(void) { return "malidrv: $(VERSION_STRINGS)";}' > $(src)/__malidrv_build_info.c -diff --git a/drivers/gpu/arm/mali400/mali/Kconfig b/drivers/gpu/arm/mali400/mali/Kconfig -new file mode 100755 -index 000000000000..34c5f72edcda ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/Kconfig -@@ -0,0 +1,118 @@ -+# SPDX-License-Identifier: GPL-2.0 -+config MALI400 -+ tristate "Mali-300/400/450 support" -+ depends on ARM || ARM64 -+ select DMA_SHARED_BUFFER -+ help -+ This enables support for the ARM Mali-300, Mali-400, and Mali-450 -+ GPUs. -+ -+ To compile this driver as a module, choose M here: the module will be -+ called mali. -+ -+config MALI450 -+ bool "Enable Mali-450 support" -+ depends on MALI400 -+ help -+ This enables support for Mali-450 specific features. -+ -+config MALI470 -+ bool "Enable Mali-470 support" -+ depends on MALI400 -+ help -+ This enables support for Mali-470 specific features. -+ -+config MALI400_DEBUG -+ bool "Enable debug in Mali driver" -+ depends on MALI400 -+ help -+ This enabled extra debug checks and messages in the Mali driver. -+ -+config MALI400_PROFILING -+ bool "Enable Mali profiling" -+ depends on MALI400 -+ select TRACEPOINTS -+ default y -+ help -+ This enables gator profiling of Mali GPU events. -+ -+config MALI400_INTERNAL_PROFILING -+ bool "Enable internal Mali profiling API" -+ depends on MALI400_PROFILING -+ default n -+ help -+ This enables the internal legacy Mali profiling API. -+ -+config MALI400_UMP -+ bool "Enable UMP support" -+ depends on MALI400 -+ help -+ This enables support for the UMP memory sharing API in the Mali driver. -+ -+config MALI_DVFS -+ bool "Enable Mali dynamically frequency change" -+ depends on MALI400 && !MALI_DEVFREQ -+ default y -+ help -+ This enables support for dynamic change frequency of Mali with the goal of lowering power consumption. -+ -+config MALI_DMA_BUF_MAP_ON_ATTACH -+ bool "Map dma-buf attachments on attach" -+ depends on MALI400 && DMA_SHARED_BUFFER -+ default y -+ help -+ This makes the Mali driver map dma-buf attachments after doing -+ attach. If this is not set the dma-buf attachments will be mapped for -+ every time the GPU need to access the buffer. -+ -+ Mapping for each access can cause lower performance. -+ -+config MALI_SHARED_INTERRUPTS -+ bool "Support for shared interrupts" -+ depends on MALI400 -+ default n -+ help -+ Adds functionality required to properly support shared interrupts. Without this support, -+ the device driver will fail during insmod if it detects shared interrupts. This also -+ works when the GPU is not using shared interrupts, but might have a slight performance -+ impact. -+ -+config MALI_PMU_PARALLEL_POWER_UP -+ bool "Power up Mali PMU domains in parallel" -+ depends on MALI400 -+ default n -+ help -+ This makes the Mali driver power up all PMU power domains in parallel, instead of -+ powering up domains one by one, with a slight delay in between. Powering on all power -+ domains at the same time may cause peak currents higher than what some systems can handle. -+ These systems must not enable this option. -+ -+config MALI_DT -+ bool "Using device tree to initialize module" -+ depends on MALI400 && OF -+ default n -+ help -+ This enable the Mali driver to choose the device tree path to get platform resoures -+ and disable the old config method. Mali driver could run on the platform which the -+ device tree is enabled in kernel and corresponding hardware description is implemented -+ properly in device DTS file. -+ -+config MALI_DEVFREQ -+ bool "Using devfreq to tuning frequency" -+ depends on MALI400 && PM_DEVFREQ -+ default n -+ help -+ Support devfreq for Mali. -+ -+ Using the devfreq framework and, by default, the simpleondemand -+ governor, the frequency of Mali will be dynamically selected from the -+ available OPPs. -+ -+config MALI_QUIET -+ bool "Make Mali driver very quiet" -+ depends on MALI400 && !MALI400_DEBUG -+ default n -+ help -+ This forces the Mali driver to never print any messages. -+ -+ If unsure, say N. -diff --git a/drivers/gpu/arm/mali400/mali/Makefile b/drivers/gpu/arm/mali400/mali/Makefile -new file mode 100755 -index 000000000000..0b91321a5af1 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/Makefile -@@ -0,0 +1,206 @@ -+# -+# Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+# as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained from Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+# -+ -+USE_UMPV2=0 -+USING_PROFILING ?= 1 -+USING_INTERNAL_PROFILING ?= 0 -+USING_DVFS ?= 1 -+USING_DMA_BUF_FENCE ?= 0 -+MALI_HEATMAPS_ENABLED ?= 0 -+MALI_DMA_BUF_MAP_ON_ATTACH ?= 1 -+MALI_PMU_PARALLEL_POWER_UP ?= 0 -+USING_DT ?= 0 -+MALI_MEM_SWAP_TRACKING ?= 0 -+USING_DEVFREQ ?= 0 -+ -+# The Makefile sets up "arch" based on the CONFIG, creates the version info -+# string and the __malidrv_build_info.c file, and then call the Linux build -+# system to actually build the driver. After that point the Kbuild file takes -+# over. -+ -+# set up defaults if not defined by the user -+ARCH ?= arm -+ -+OSKOS=linux -+FILES_PREFIX= -+ -+check_cc2 = \ -+ $(shell if $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ -+ then \ -+ echo "$(2)"; \ -+ else \ -+ echo "$(3)"; \ -+ fi ;) -+ -+# This conditional makefile exports the global definition ARM_INTERNAL_BUILD. Customer releases will not include arm_internal.mak -+-include ../../../arm_internal.mak -+ -+# Give warning of old config parameters are used -+ifneq ($(CONFIG),) -+$(warning "You have specified the CONFIG variable which is no longer in used. Use TARGET_PLATFORM instead.") -+endif -+ -+ifneq ($(CPU),) -+$(warning "You have specified the CPU variable which is no longer in used. Use TARGET_PLATFORM instead.") -+endif -+ -+# Include the mapping between TARGET_PLATFORM and KDIR + MALI_PLATFORM -+-include MALI_CONFIGURATION -+export KDIR ?= $(KDIR-$(TARGET_PLATFORM)) -+export MALI_PLATFORM ?= $(MALI_PLATFORM-$(TARGET_PLATFORM)) -+ -+ifneq ($(TARGET_PLATFORM),) -+ifeq ($(MALI_PLATFORM),) -+$(error "Invalid TARGET_PLATFORM: $(TARGET_PLATFORM)") -+endif -+endif -+ -+# validate lookup result -+ifeq ($(KDIR),) -+$(error No KDIR found for platform $(TARGET_PLATFORM)) -+endif -+ -+ifeq ($(USING_GPU_UTILIZATION), 1) -+ ifeq ($(USING_DVFS), 1) -+ $(error USING_GPU_UTILIZATION conflict with USING_DVFS you can read the Integration Guide to choose which one do you need) -+ endif -+endif -+ -+ifeq ($(USING_UMP),1) -+export CONFIG_MALI400_UMP=y -+export EXTRA_DEFINES += -DCONFIG_MALI400_UMP=1 -+ifeq ($(USE_UMPV2),1) -+UMP_SYMVERS_FILE ?= ../umpv2/Module.symvers -+else -+UMP_SYMVERS_FILE ?= ../ump/Module.symvers -+endif -+KBUILD_EXTRA_SYMBOLS = $(realpath $(UMP_SYMVERS_FILE)) -+$(warning $(KBUILD_EXTRA_SYMBOLS)) -+endif -+ -+# Define host system directory -+KDIR-$(shell uname -m):=/lib/modules/$(shell uname -r)/build -+ -+include $(KDIR)/.config -+ -+ifeq ($(ARCH), arm) -+# when compiling for ARM we're cross compiling -+export CROSS_COMPILE ?= $(call check_cc2, arm-linux-gnueabi-gcc, arm-linux-gnueabi-, arm-none-linux-gnueabi-) -+endif -+ -+# report detected/selected settings -+ifdef ARM_INTERNAL_BUILD -+$(warning TARGET_PLATFORM $(TARGET_PLATFORM)) -+$(warning KDIR $(KDIR)) -+$(warning MALI_PLATFORM $(MALI_PLATFORM)) -+endif -+ -+# Set up build config -+export CONFIG_MALI400=m -+export CONFIG_MALI450=y -+export CONFIG_MALI470=y -+ -+export EXTRA_DEFINES += -DCONFIG_MALI400=1 -+export EXTRA_DEFINES += -DCONFIG_MALI450=1 -+export EXTRA_DEFINES += -DCONFIG_MALI470=1 -+ -+ifneq ($(MALI_PLATFORM),) -+export EXTRA_DEFINES += -DMALI_FAKE_PLATFORM_DEVICE=1 -+export MALI_PLATFORM_FILES = $(wildcard platform/$(MALI_PLATFORM)/*.c) -+endif -+ -+ifeq ($(USING_PROFILING),1) -+ifeq ($(CONFIG_TRACEPOINTS),) -+$(warning CONFIG_TRACEPOINTS required for profiling) -+else -+export CONFIG_MALI400_PROFILING=y -+export EXTRA_DEFINES += -DCONFIG_MALI400_PROFILING=1 -+ifeq ($(USING_INTERNAL_PROFILING),1) -+export CONFIG_MALI400_INTERNAL_PROFILING=y -+export EXTRA_DEFINES += -DCONFIG_MALI400_INTERNAL_PROFILING=1 -+endif -+ifeq ($(MALI_HEATMAPS_ENABLED),1) -+export MALI_HEATMAPS_ENABLED=y -+export EXTRA_DEFINES += -DCONFIG_MALI400_HEATMAPS_ENABLED -+endif -+endif -+endif -+ -+ifeq ($(MALI_DMA_BUF_MAP_ON_ATTACH),1) -+export CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH=y -+export EXTRA_DEFINES += -DCONFIG_MALI_DMA_BUF_MAP_ON_ATTACH -+endif -+ -+ifeq ($(MALI_SHARED_INTERRUPTS),1) -+export CONFIG_MALI_SHARED_INTERRUPTS=y -+export EXTRA_DEFINES += -DCONFIG_MALI_SHARED_INTERRUPTS -+endif -+ -+ifeq ($(USING_DVFS),1) -+export CONFIG_MALI_DVFS=y -+export EXTRA_DEFINES += -DCONFIG_MALI_DVFS -+endif -+ -+ifeq ($(USING_DMA_BUF_FENCE),1) -+export CONFIG_MALI_DMA_BUF_FENCE=y -+export EXTRA_DEFINES += -DCONFIG_MALI_DMA_BUF_FENCE -+endif -+ -+ifeq ($(MALI_PMU_PARALLEL_POWER_UP),1) -+export CONFIG_MALI_PMU_PARALLEL_POWER_UP=y -+export EXTRA_DEFINES += -DCONFIG_MALI_PMU_PARALLEL_POWER_UP -+endif -+ -+ifdef CONFIG_OF -+ifeq ($(USING_DT),1) -+export CONFIG_MALI_DT=y -+export EXTRA_DEFINES += -DCONFIG_MALI_DT -+endif -+endif -+ -+ifeq ($(USING_DEVFREQ), 1) -+ifdef CONFIG_PM_DEVFREQ -+export CONFIG_MALI_DEVFREQ=y -+export EXTRA_DEFINES += -DCONFIG_MALI_DEVFREQ=1 -+else -+$(warning "You want to support DEVFREQ but kernel didn't support DEVFREQ.") -+endif -+endif -+ -+ifneq ($(BUILD),release) -+# Debug -+export CONFIG_MALI400_DEBUG=y -+else -+# Release -+ifeq ($(MALI_QUIET),1) -+export CONFIG_MALI_QUIET=y -+export EXTRA_DEFINES += -DCONFIG_MALI_QUIET -+endif -+endif -+ -+ifeq ($(MALI_SKIP_JOBS),1) -+EXTRA_DEFINES += -DPROFILING_SKIP_PP_JOBS=1 -DPROFILING_SKIP_GP_JOBS=1 -+endif -+ -+ifeq ($(MALI_MEM_SWAP_TRACKING),1) -+EXTRA_DEFINES += -DMALI_MEM_SWAP_TRACKING=1 -+endif -+ -+all: $(UMP_SYMVERS_FILE) -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) modules -+ @rm $(FILES_PREFIX)__malidrv_build_info.c $(FILES_PREFIX)__malidrv_build_info.o -+ -+clean: -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean -+ -+kernelrelease: -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) kernelrelease ++ param->addr.str[buf_size] = '\0'; + -+export CONFIG KBUILD_EXTRA_SYMBOLS -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c -new file mode 100755 -index 000000000000..79a418c36ccb ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c -@@ -0,0 +1,142 @@ -+/* -+ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ err = kbase_ipa_model_recalculate(model); ++ if (err < 0) ++ ret = err; + -+#include "mali_broadcast.h" -+#include "mali_kernel_common.h" -+#include "mali_osk.h" ++end: ++ mutex_unlock(&model->kbdev->ipa.lock); + -+#define MALI_BROADCAST_REGISTER_SIZE 0x1000 -+#define MALI_BROADCAST_REG_BROADCAST_MASK 0x0 -+#define MALI_BROADCAST_REG_INTERRUPT_MASK 0x4 ++ return ret; ++} + -+struct mali_bcast_unit { -+ struct mali_hw_core hw_core; -+ u32 current_mask; ++static const struct file_operations fops_string = { ++ .read = param_string_get, ++ .write = param_string_set, ++ .open = simple_open, ++ .llseek = default_llseek, +}; + -+struct mali_bcast_unit *mali_bcast_unit_create(const _mali_osk_resource_t *resource) ++int kbase_ipa_model_param_add(struct kbase_ipa_model *model, const char *name, ++ void *addr, size_t size, ++ enum kbase_ipa_model_param_type type) +{ -+ struct mali_bcast_unit *bcast_unit = NULL; -+ -+ MALI_DEBUG_ASSERT_POINTER(resource); -+ MALI_DEBUG_PRINT(2, ("Broadcast: Creating Mali Broadcast unit: %s\n", -+ resource->description)); -+ -+ bcast_unit = _mali_osk_malloc(sizeof(struct mali_bcast_unit)); -+ if (NULL == bcast_unit) { -+ MALI_PRINT_ERROR(("Broadcast: Failed to allocate memory for Broadcast unit\n")); -+ return NULL; -+ } ++ struct kbase_ipa_model_param *param; + -+ if (_MALI_OSK_ERR_OK == mali_hw_core_create(&bcast_unit->hw_core, -+ resource, MALI_BROADCAST_REGISTER_SIZE)) { -+ bcast_unit->current_mask = 0; -+ mali_bcast_reset(bcast_unit); ++ param = kzalloc(sizeof(*param), GFP_KERNEL); + -+ return bcast_unit; -+ } else { -+ MALI_PRINT_ERROR(("Broadcast: Failed map broadcast unit\n")); -+ } ++ if (!param) ++ return -ENOMEM; + -+ _mali_osk_free(bcast_unit); ++ /* 'name' is stack-allocated for array elements, so copy it into ++ * heap-allocated storage */ ++ param->name = kstrdup(name, GFP_KERNEL); ++ param->addr.voidp = addr; ++ param->size = size; ++ param->type = type; ++ param->model = model; + -+ return NULL; -+} ++ list_add(¶m->link, &model->params); + -+void mali_bcast_unit_delete(struct mali_bcast_unit *bcast_unit) -+{ -+ MALI_DEBUG_ASSERT_POINTER(bcast_unit); -+ mali_hw_core_delete(&bcast_unit->hw_core); -+ _mali_osk_free(bcast_unit); ++ return 0; +} + -+/* Call this function to add the @group's id into bcast mask -+ * Note: redundant calling this function with same @group -+ * doesn't make any difference as calling it once -+ */ -+void mali_bcast_add_group(struct mali_bcast_unit *bcast_unit, -+ struct mali_group *group) ++void kbase_ipa_model_param_free_all(struct kbase_ipa_model *model) +{ -+ u32 bcast_id; -+ u32 broadcast_mask; -+ -+ MALI_DEBUG_ASSERT_POINTER(bcast_unit); -+ MALI_DEBUG_ASSERT_POINTER(group); -+ -+ bcast_id = mali_pp_core_get_bcast_id(mali_group_get_pp_core(group)); -+ -+ broadcast_mask = bcast_unit->current_mask; -+ -+ broadcast_mask |= (bcast_id); /* add PP core to broadcast */ -+ broadcast_mask |= (bcast_id << 16); /* add MMU to broadcast */ ++ struct kbase_ipa_model_param *param_p, *param_n; + -+ /* store mask so we can restore on reset */ -+ bcast_unit->current_mask = broadcast_mask; ++ list_for_each_entry_safe(param_p, param_n, &model->params, link) { ++ list_del(¶m_p->link); ++ kfree(param_p->name); ++ kfree(param_p); ++ } +} + -+/* Call this function to remove @group's id from bcast mask -+ * Note: redundant calling this function with same @group -+ * doesn't make any difference as calling it once -+ */ -+void mali_bcast_remove_group(struct mali_bcast_unit *bcast_unit, -+ struct mali_group *group) ++static void kbase_ipa_model_debugfs_init(struct kbase_ipa_model *model) +{ -+ u32 bcast_id; -+ u32 broadcast_mask; -+ -+ MALI_DEBUG_ASSERT_POINTER(bcast_unit); -+ MALI_DEBUG_ASSERT_POINTER(group); -+ -+ bcast_id = mali_pp_core_get_bcast_id(mali_group_get_pp_core(group)); -+ -+ broadcast_mask = bcast_unit->current_mask; ++ struct list_head *it; ++ struct dentry *dir; + -+ broadcast_mask &= ~((bcast_id << 16) | bcast_id); ++ lockdep_assert_held(&model->kbdev->ipa.lock); + -+ /* store mask so we can restore on reset */ -+ bcast_unit->current_mask = broadcast_mask; -+} ++ dir = debugfs_create_dir(model->ops->name, ++ model->kbdev->mali_debugfs_directory); + -+void mali_bcast_reset(struct mali_bcast_unit *bcast_unit) -+{ -+ MALI_DEBUG_ASSERT_POINTER(bcast_unit); ++ if (!dir) { ++ dev_err(model->kbdev->dev, ++ "Couldn't create mali debugfs %s directory", ++ model->ops->name); ++ return; ++ } + -+ MALI_DEBUG_PRINT(4, -+ ("Broadcast: setting mask 0x%08X + 0x%08X (reset)\n", -+ bcast_unit->current_mask, -+ bcast_unit->current_mask & 0xFF)); ++ list_for_each(it, &model->params) { ++ struct kbase_ipa_model_param *param = ++ list_entry(it, ++ struct kbase_ipa_model_param, ++ link); ++ const struct file_operations *fops = NULL; + -+ /* set broadcast mask */ -+ mali_hw_core_register_write(&bcast_unit->hw_core, -+ MALI_BROADCAST_REG_BROADCAST_MASK, -+ bcast_unit->current_mask); ++ switch (param->type) { ++ case PARAM_TYPE_S32: ++ fops = &fops_s32; ++ break; ++ case PARAM_TYPE_STRING: ++ fops = &fops_string; ++ break; ++ } + -+ /* set IRQ override mask */ -+ mali_hw_core_register_write(&bcast_unit->hw_core, -+ MALI_BROADCAST_REG_INTERRUPT_MASK, -+ bcast_unit->current_mask & 0xFF); ++ if (unlikely(!fops)) { ++ dev_err(model->kbdev->dev, ++ "Type not set for %s parameter %s\n", ++ model->ops->name, param->name); ++ } else { ++ debugfs_create_file(param->name, S_IRUGO | S_IWUSR, ++ dir, param, fops); ++ } ++ } +} + -+void mali_bcast_disable(struct mali_bcast_unit *bcast_unit) ++void kbase_ipa_debugfs_init(struct kbase_device *kbdev) +{ -+ MALI_DEBUG_ASSERT_POINTER(bcast_unit); -+ -+ MALI_DEBUG_PRINT(4, ("Broadcast: setting mask 0x0 + 0x0 (disable)\n")); ++ mutex_lock(&kbdev->ipa.lock); + -+ /* set broadcast mask */ -+ mali_hw_core_register_write(&bcast_unit->hw_core, -+ MALI_BROADCAST_REG_BROADCAST_MASK, -+ 0x0); ++ if (kbdev->ipa.configured_model != kbdev->ipa.fallback_model) ++ kbase_ipa_model_debugfs_init(kbdev->ipa.configured_model); ++ kbase_ipa_model_debugfs_init(kbdev->ipa.fallback_model); + -+ /* set IRQ override mask */ -+ mali_hw_core_register_write(&bcast_unit->hw_core, -+ MALI_BROADCAST_REG_INTERRUPT_MASK, -+ 0x0); ++ mutex_unlock(&kbdev->ipa.lock); +} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h +diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h new file mode 100755 -index 000000000000..0475b7171d8d +index 000000000..ec06e2096 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h -@@ -0,0 +1,57 @@ -+/* -+ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef __MALI_BROADCAST_H__ -+#define __MALI_BROADCAST_H__ -+ ++++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h +@@ -0,0 +1,49 @@ +/* -+ * Interface for the broadcast unit on Mali-450. + * -+ * - Represents up to 8 × (MMU + PP) pairs. -+ * - Supports dynamically changing which (MMU + PP) pairs receive the broadcast by -+ * setting a mask. -+ */ -+ -+#include "mali_hw_core.h" -+#include "mali_group.h" -+ -+struct mali_bcast_unit; -+ -+struct mali_bcast_unit *mali_bcast_unit_create(const _mali_osk_resource_t *resource); -+void mali_bcast_unit_delete(struct mali_bcast_unit *bcast_unit); -+ -+/* Add a group to the list of (MMU + PP) pairs broadcasts go out to. */ -+void mali_bcast_add_group(struct mali_bcast_unit *bcast_unit, struct mali_group *group); -+ -+/* Remove a group to the list of (MMU + PP) pairs broadcasts go out to. */ -+void mali_bcast_remove_group(struct mali_bcast_unit *bcast_unit, struct mali_group *group); -+ -+/* Re-set cached mask. This needs to be called after having been suspended. */ -+void mali_bcast_reset(struct mali_bcast_unit *bcast_unit); -+ -+/** -+ * Disable broadcast unit ++ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. + * -+ * mali_bcast_enable must be called to re-enable the unit. Cores may not be -+ * added or removed when the unit is disabled. -+ */ -+void mali_bcast_disable(struct mali_bcast_unit *bcast_unit); -+ -+/** -+ * Re-enable broadcast unit ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * This resets the masks to include the cores present when mali_bcast_disable was called. -+ */ -+MALI_STATIC_INLINE void mali_bcast_enable(struct mali_bcast_unit *bcast_unit) -+{ -+ mali_bcast_reset(bcast_unit); -+} -+ -+#endif /* __MALI_BROADCAST_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c -new file mode 100755 -index 000000000000..5bed27a8c5c9 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c -@@ -0,0 +1,139 @@ -+/* -+ * Copyright (C) 2010-2012, 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#include "mali_kernel_utilization.h" -+#include "mali_osk.h" -+#include "mali_osk_mali.h" -+#include "mali_kernel_common.h" -+#include "mali_session.h" -+#include "mali_dvfs_policy.h" -+#include "mali_control_timer.h" -+ -+static u64 period_start_time = 0; -+ -+/** .KP : mali_control_timer */ -+static _mali_osk_timer_t *mali_control_timer = NULL; -+static mali_bool timer_running = MALI_FALSE; -+ -+/** -+ * period_of_notifying_mali_utilization_to_platform_dependent_part, -+ * ms 为å•ä½. + */ -+static u32 mali_control_timeout = 20; -+ -+void mali_control_timer_add(u32 timeout)/* 'timeout' : 以 ms 为å•ä½. */ -+{ -+ _mali_osk_timer_add(mali_control_timer, _mali_osk_time_mstoticks(timeout)); -+} -+ -+void mali_control_timer_mod(u32 timeout_in_ms) -+{ -+ _mali_osk_timer_mod(mali_control_timer, _mali_osk_time_mstoticks(timeout_in_ms)); -+} -+ -+static void mali_control_timer_callback(void *arg) -+{ -+ if (mali_utilization_enabled()) { -+ struct mali_gpu_utilization_data *util_data = NULL; -+ u64 time_period = 0; -+ mali_bool need_add_timer = MALI_TRUE; -+ -+ /* Calculate gpu utilization */ -+ util_data = mali_utilization_calculate(&period_start_time, &time_period, &need_add_timer); -+ -+ if (util_data) { -+#if defined(CONFIG_MALI_DVFS) -+ mali_dvfs_policy_realize(util_data, time_period); -+#else -+ mali_utilization_platform_realize(util_data); -+#endif -+ -+ if (MALI_TRUE == timer_running) -+ if (MALI_TRUE == need_add_timer) { -+ mali_control_timer_mod(mali_control_timeout); -+ } -+ } -+ } -+} -+ -+/* Init a timer (for now it is used for GPU utilization and dvfs) */ -+_mali_osk_errcode_t mali_control_timer_init(void) -+{ -+ _mali_osk_device_data data; -+ -+ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { -+ /* Use device specific settings (if defined) */ -+ if (0 != data.control_interval) { -+ mali_control_timeout = data.control_interval; -+ MALI_DEBUG_PRINT(2, ("Mali GPU Timer: %u\n", mali_control_timeout)); -+ } -+ } -+ -+ mali_control_timer = _mali_osk_timer_init(mali_control_timer_callback); -+ if (NULL == mali_control_timer) { -+ return _MALI_OSK_ERR_FAULT; -+ } -+ _mali_osk_timer_setcallback(mali_control_timer, mali_control_timer_callback, NULL); -+ -+ return _MALI_OSK_ERR_OK; -+} + -+void mali_control_timer_term(void) -+{ -+ if (NULL != mali_control_timer) { -+ _mali_osk_timer_del(mali_control_timer); -+ timer_running = MALI_FALSE; -+ _mali_osk_timer_term(mali_control_timer); -+ mali_control_timer = NULL; -+ } -+} + -+mali_bool mali_control_timer_resume(u64 time_now) -+{ -+ mali_utilization_data_assert_locked(); + -+ if (timer_running != MALI_TRUE) { -+ timer_running = MALI_TRUE; ++#ifndef _KBASE_IPA_DEBUGFS_H_ ++#define _KBASE_IPA_DEBUGFS_H_ + -+ period_start_time = time_now; ++enum kbase_ipa_model_param_type { ++ PARAM_TYPE_S32 = 1, ++ PARAM_TYPE_STRING, ++}; + -+ mali_utilization_reset(); ++#ifdef CONFIG_DEBUG_FS + -+ return MALI_TRUE; -+ } ++void kbase_ipa_debugfs_init(struct kbase_device *kbdev); ++int kbase_ipa_model_param_add(struct kbase_ipa_model *model, const char *name, ++ void *addr, size_t size, ++ enum kbase_ipa_model_param_type type); ++void kbase_ipa_model_param_free_all(struct kbase_ipa_model *model); + -+ return MALI_FALSE; -+} ++#else /* CONFIG_DEBUG_FS */ + -+void mali_control_timer_pause(void) ++static inline int kbase_ipa_model_param_add(struct kbase_ipa_model *model, ++ const char *name, void *addr, ++ size_t size, ++ enum kbase_ipa_model_param_type type) +{ -+ mali_utilization_data_assert_locked(); -+ if (timer_running == MALI_TRUE) { -+ timer_running = MALI_FALSE; -+ } ++ return 0; +} + -+void mali_control_timer_suspend(mali_bool suspend) -+{ -+ mali_utilization_data_lock(); -+ -+ if (timer_running == MALI_TRUE) { -+ timer_running = MALI_FALSE; ++static inline void kbase_ipa_model_param_free_all(struct kbase_ipa_model *model) ++{ } + -+ mali_utilization_data_unlock(); ++#endif /* CONFIG_DEBUG_FS */ + -+ if (suspend == MALI_TRUE) { -+ _mali_osk_timer_del(mali_control_timer); -+ mali_utilization_reset(); -+ } -+ } else { -+ mali_utilization_data_unlock(); -+ } -+} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h ++#endif /* _KBASE_IPA_DEBUGFS_H_ */ +diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c new file mode 100755 -index 000000000000..c9e6e058ea8e +index 000000000..da0a4d4a0 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h -@@ -0,0 +1,30 @@ ++++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c +@@ -0,0 +1,222 @@ +/* -+ * Copyright (C) 2010-2012, 2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2016-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef __MALI_CONTROL_TIMER_H__ -+#define __MALI_CONTROL_TIMER_H__ -+ -+#include "mali_osk.h" -+ -+_mali_osk_errcode_t mali_control_timer_init(void); -+ -+void mali_control_timer_term(void); -+ -+mali_bool mali_control_timer_resume(u64 time_now); -+ -+void mali_control_timer_suspend(mali_bool suspend); -+void mali_control_timer_pause(void); + -+void mali_control_timer_add(u32 timeout); + -+void mali_control_timer_mod(u32 timeout_in_ms); ++#include ++#ifdef CONFIG_DEVFREQ_THERMAL ++#include ++#endif ++#include ++#include + -+#endif /* __MALI_CONTROL_TIMER_H__ */ ++#include "mali_kbase.h" ++#include "mali_kbase_defs.h" + -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c -new file mode 100755 -index 000000000000..99b7f360768b ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c -@@ -0,0 +1,213 @@ +/* -+ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * This model is primarily designed for the Juno platform. It may not be ++ * suitable for other platforms. The additional resources in this model ++ * should preferably be minimal, as this model is rarely used when a dynamic ++ * model is available. + */ + -+#include "mali_dlbu.h" -+#include "mali_memory.h" -+#include "mali_pp.h" -+#include "mali_group.h" -+#include "mali_osk.h" -+#include "mali_hw_core.h" -+ +/** -+ * Size of DLBU registers in bytes ++ * struct kbase_ipa_model_simple_data - IPA context per device ++ * @dynamic_coefficient: dynamic coefficient of the model ++ * @static_coefficient: static coefficient of the model ++ * @ts: Thermal scaling coefficients of the model ++ * @tz_name: Thermal zone name ++ * @gpu_tz: thermal zone device + */ -+#define MALI_DLBU_SIZE 0x400 + -+mali_dma_addr mali_dlbu_phys_addr = 0; -+static mali_io_address mali_dlbu_cpu_addr = NULL; ++struct kbase_ipa_model_simple_data { ++ u32 dynamic_coefficient; ++ u32 static_coefficient; ++ s32 ts[4]; ++ char tz_name[16]; ++ struct thermal_zone_device *gpu_tz; ++}; ++#define FALLBACK_STATIC_TEMPERATURE 55000 + +/** -+ * DLBU register numbers -+ * Used in the register read/write routines. -+ * See the hardware documentation for more information about each register ++ * calculate_temp_scaling_factor() - Calculate temperature scaling coefficient ++ * @ts: Signed coefficients, in order t^0 to t^3, with units Deg^-N ++ * @t: Temperature, in mDeg C. Range: -2^17 < t < 2^17 ++ * ++ * Scale the temperature according to a cubic polynomial whose coefficients are ++ * provided in the device tree. The result is used to scale the static power ++ * coefficient, where 1000000 means no change. ++ * ++ * Return: Temperature scaling factor. Approx range 0 < ret < 10,000,000. + */ -+typedef enum mali_dlbu_register { -+ MALI_DLBU_REGISTER_MASTER_TLLIST_PHYS_ADDR = 0x0000, /**< Master tile list physical base address; -+ 31:12 Physical address to the page used for the DLBU -+ 0 DLBU enable - set this bit to 1 enables the AXI bus -+ between PPs and L2s, setting to 0 disables the router and -+ no further transactions are sent to DLBU */ -+ MALI_DLBU_REGISTER_MASTER_TLLIST_VADDR = 0x0004, /**< Master tile list virtual base address; -+ 31:12 Virtual address to the page used for the DLBU */ -+ MALI_DLBU_REGISTER_TLLIST_VBASEADDR = 0x0008, /**< Tile list virtual base address; -+ 31:12 Virtual address to the tile list. This address is used when -+ calculating the call address sent to PP.*/ -+ MALI_DLBU_REGISTER_FB_DIM = 0x000C, /**< Framebuffer dimension; -+ 23:16 Number of tiles in Y direction-1 -+ 7:0 Number of tiles in X direction-1 */ -+ MALI_DLBU_REGISTER_TLLIST_CONF = 0x0010, /**< Tile list configuration; -+ 29:28 select the size of each allocated block: 0=128 bytes, 1=256, 2=512, 3=1024 -+ 21:16 2^n number of tiles to be binned to one tile list in Y direction -+ 5:0 2^n number of tiles to be binned to one tile list in X direction */ -+ MALI_DLBU_REGISTER_START_TILE_POS = 0x0014, /**< Start tile positions; -+ 31:24 start position in Y direction for group 1 -+ 23:16 start position in X direction for group 1 -+ 15:8 start position in Y direction for group 0 -+ 7:0 start position in X direction for group 0 */ -+ MALI_DLBU_REGISTER_PP_ENABLE_MASK = 0x0018, /**< PP enable mask; -+ 7 enable PP7 for load balancing -+ 6 enable PP6 for load balancing -+ 5 enable PP5 for load balancing -+ 4 enable PP4 for load balancing -+ 3 enable PP3 for load balancing -+ 2 enable PP2 for load balancing -+ 1 enable PP1 for load balancing -+ 0 enable PP0 for load balancing */ -+} mali_dlbu_register; -+ -+typedef enum { -+ PP0ENABLE = 0, -+ PP1ENABLE, -+ PP2ENABLE, -+ PP3ENABLE, -+ PP4ENABLE, -+ PP5ENABLE, -+ PP6ENABLE, -+ PP7ENABLE -+} mali_dlbu_pp_enable; -+ -+struct mali_dlbu_core { -+ struct mali_hw_core hw_core; /**< Common for all HW cores */ -+ u32 pp_cores_mask; /**< This is a mask for the PP cores whose operation will be controlled by LBU -+ see MALI_DLBU_REGISTER_PP_ENABLE_MASK register */ -+}; -+ -+_mali_osk_errcode_t mali_dlbu_initialize(void) ++static u32 calculate_temp_scaling_factor(s32 ts[4], s64 t) +{ -+ MALI_DEBUG_PRINT(2, ("Mali DLBU: Initializing\n")); ++ /* Range: -2^24 < t2 < 2^24 m(Deg^2) */ ++ u32 remainder; ++ // static inline s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder) ++ const s64 t2 = div_s64_rem((t * t), 1000, &remainder); + -+ if (_MALI_OSK_ERR_OK == -+ mali_mmu_get_table_page(&mali_dlbu_phys_addr, -+ &mali_dlbu_cpu_addr)) { -+ return _MALI_OSK_ERR_OK; -+ } ++ /* Range: -2^31 < t3 < 2^31 m(Deg^3) */ ++ const s64 t3 = div_s64_rem((t * t2), 1000, &remainder); + -+ return _MALI_OSK_ERR_FAULT; -+} ++ /* ++ * Sum the parts. t^[1-3] are in m(Deg^N), but the coefficients are in ++ * Deg^-N, so we need to multiply the last coefficient by 1000. ++ * Range: -2^63 < res_big < 2^63 ++ */ ++ const s64 res_big = ts[3] * t3 /* +/- 2^62 */ ++ + ts[2] * t2 /* +/- 2^55 */ ++ + ts[1] * t /* +/- 2^48 */ ++ + ts[0] * 1000; /* +/- 2^41 */ + -+void mali_dlbu_terminate(void) -+{ -+ MALI_DEBUG_PRINT(3, ("Mali DLBU: terminating\n")); ++ /* Range: -2^60 < res_unclamped < 2^60 */ ++ s64 res_unclamped = div_s64_rem(res_big, 1000, &remainder); + -+ if (0 != mali_dlbu_phys_addr && 0 != mali_dlbu_cpu_addr) { -+ mali_mmu_release_table_page(mali_dlbu_phys_addr, -+ mali_dlbu_cpu_addr); -+ mali_dlbu_phys_addr = 0; -+ mali_dlbu_cpu_addr = 0; -+ } ++ /* Clamp to range of 0x to 10x the static power */ ++ return clamp(res_unclamped, (s64) 0, (s64) 10000000); +} + -+struct mali_dlbu_core *mali_dlbu_create(const _mali_osk_resource_t *resource) ++static int model_static_coeff(struct kbase_ipa_model *model, u32 *coeffp) +{ -+ struct mali_dlbu_core *core = NULL; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) ++ unsigned long temp; ++#else ++ int temp; ++#endif ++ u32 temp_scaling_factor; ++ struct kbase_ipa_model_simple_data *model_data = ++ (struct kbase_ipa_model_simple_data *) model->model_data; ++ struct thermal_zone_device *gpu_tz = model_data->gpu_tz; ++ u64 coeffp_big; + -+ MALI_DEBUG_PRINT(2, ("Mali DLBU: Creating Mali dynamic load balancing unit: %s\n", resource->description)); ++ if (gpu_tz) { ++ int ret; + -+ core = _mali_osk_malloc(sizeof(struct mali_dlbu_core)); -+ if (NULL != core) { -+ if (_MALI_OSK_ERR_OK == mali_hw_core_create(&core->hw_core, resource, MALI_DLBU_SIZE)) { -+ core->pp_cores_mask = 0; -+ if (_MALI_OSK_ERR_OK == mali_dlbu_reset(core)) { -+ return core; -+ } -+ MALI_PRINT_ERROR(("Failed to reset DLBU %s\n", core->hw_core.description)); -+ mali_hw_core_delete(&core->hw_core); ++ ret = gpu_tz->ops->get_temp(gpu_tz, &temp); ++ if (ret) { ++ pr_warn_ratelimited("Error reading temperature for gpu thermal zone: %d\n", ++ ret); ++ temp = FALLBACK_STATIC_TEMPERATURE; + } -+ -+ _mali_osk_free(core); + } else { -+ MALI_PRINT_ERROR(("Mali DLBU: Failed to allocate memory for DLBU core\n")); ++ temp = FALLBACK_STATIC_TEMPERATURE; + } + -+ return NULL; ++ temp_scaling_factor = calculate_temp_scaling_factor(model_data->ts, ++ temp); ++ coeffp_big = (u64)model_data->static_coefficient * temp_scaling_factor; ++ *coeffp = div_u64(coeffp_big, 1000000); ++ ++ return 0; +} + -+void mali_dlbu_delete(struct mali_dlbu_core *dlbu) ++static int model_dynamic_coeff(struct kbase_ipa_model *model, u32 *coeffp, ++ u32 current_freq) +{ -+ MALI_DEBUG_ASSERT_POINTER(dlbu); -+ mali_hw_core_delete(&dlbu->hw_core); -+ _mali_osk_free(dlbu); ++ struct kbase_ipa_model_simple_data *model_data = ++ (struct kbase_ipa_model_simple_data *) model->model_data; ++ ++ *coeffp = model_data->dynamic_coefficient; ++ ++ return 0; +} + -+_mali_osk_errcode_t mali_dlbu_reset(struct mali_dlbu_core *dlbu) ++static int add_params(struct kbase_ipa_model *model) +{ -+ u32 dlbu_registers[7]; -+ _mali_osk_errcode_t err = _MALI_OSK_ERR_FAULT; -+ MALI_DEBUG_ASSERT_POINTER(dlbu); ++ int err = 0; ++ struct kbase_ipa_model_simple_data *model_data = ++ (struct kbase_ipa_model_simple_data *)model->model_data; + -+ MALI_DEBUG_PRINT(4, ("Mali DLBU: mali_dlbu_reset: %s\n", dlbu->hw_core.description)); ++ err = kbase_ipa_model_add_param_s32(model, "static-coefficient", ++ &model_data->static_coefficient, ++ 1, true); ++ if (err) ++ goto end; + -+ dlbu_registers[0] = mali_dlbu_phys_addr | 1; /* bit 0 enables the whole core */ -+ dlbu_registers[1] = MALI_DLBU_VIRT_ADDR; -+ dlbu_registers[2] = 0; -+ dlbu_registers[3] = 0; -+ dlbu_registers[4] = 0; -+ dlbu_registers[5] = 0; -+ dlbu_registers[6] = dlbu->pp_cores_mask; ++ err = kbase_ipa_model_add_param_s32(model, "dynamic-coefficient", ++ &model_data->dynamic_coefficient, ++ 1, true); ++ if (err) ++ goto end; + -+ /* write reset values to core registers */ -+ mali_hw_core_register_write_array_relaxed(&dlbu->hw_core, MALI_DLBU_REGISTER_MASTER_TLLIST_PHYS_ADDR, dlbu_registers, 7); ++ err = kbase_ipa_model_add_param_s32(model, "ts", ++ model_data->ts, 4, true); ++ if (err) ++ goto end; + -+ err = _MALI_OSK_ERR_OK; ++ err = kbase_ipa_model_add_param_string(model, "thermal-zone", ++ model_data->tz_name, ++ sizeof(model_data->tz_name), true); + ++end: + return err; +} + -+void mali_dlbu_update_mask(struct mali_dlbu_core *dlbu) ++static int kbase_simple_power_model_init(struct kbase_ipa_model *model) +{ -+ MALI_DEBUG_ASSERT_POINTER(dlbu); -+ -+ mali_hw_core_register_write(&dlbu->hw_core, MALI_DLBU_REGISTER_PP_ENABLE_MASK, dlbu->pp_cores_mask); -+} ++ int err; ++ struct kbase_ipa_model_simple_data *model_data; + -+void mali_dlbu_add_group(struct mali_dlbu_core *dlbu, struct mali_group *group) -+{ -+ struct mali_pp_core *pp_core; -+ u32 bcast_id; ++ model_data = kzalloc(sizeof(struct kbase_ipa_model_simple_data), ++ GFP_KERNEL); ++ if (!model_data) ++ return -ENOMEM; + -+ MALI_DEBUG_ASSERT_POINTER(dlbu); -+ MALI_DEBUG_ASSERT_POINTER(group); ++ model->model_data = (void *) model_data; + -+ pp_core = mali_group_get_pp_core(group); -+ bcast_id = mali_pp_core_get_bcast_id(pp_core); ++ err = add_params(model); + -+ dlbu->pp_cores_mask |= bcast_id; -+ MALI_DEBUG_PRINT(3, ("Mali DLBU: Adding core[%d] New mask= 0x%02x\n", bcast_id , dlbu->pp_cores_mask)); ++ return err; +} + -+/* Remove a group from the DLBU */ -+void mali_dlbu_remove_group(struct mali_dlbu_core *dlbu, struct mali_group *group) ++static int kbase_simple_power_model_recalculate(struct kbase_ipa_model *model) +{ -+ struct mali_pp_core *pp_core; -+ u32 bcast_id; ++ struct kbase_ipa_model_simple_data *model_data = ++ (struct kbase_ipa_model_simple_data *)model->model_data; + -+ MALI_DEBUG_ASSERT_POINTER(dlbu); -+ MALI_DEBUG_ASSERT_POINTER(group); ++ if (!strnlen(model_data->tz_name, sizeof(model_data->tz_name))) { ++ model_data->gpu_tz = NULL; ++ } else { ++ model_data->gpu_tz = thermal_zone_get_zone_by_name(model_data->tz_name); + -+ pp_core = mali_group_get_pp_core(group); -+ bcast_id = mali_pp_core_get_bcast_id(pp_core); ++ if (IS_ERR(model_data->gpu_tz)) { ++ pr_warn_ratelimited("Error %ld getting thermal zone \'%s\', not yet ready?\n", ++ PTR_ERR(model_data->gpu_tz), ++ model_data->tz_name); ++ model_data->gpu_tz = NULL; ++ return -EPROBE_DEFER; ++ } ++ } + -+ dlbu->pp_cores_mask &= ~bcast_id; -+ MALI_DEBUG_PRINT(3, ("Mali DLBU: Removing core[%d] New mask= 0x%02x\n", bcast_id, dlbu->pp_cores_mask)); ++ return 0; +} + -+/* Configure the DLBU for \a job. This needs to be done before the job is started on the groups in the DLBU. */ -+void mali_dlbu_config_job(struct mali_dlbu_core *dlbu, struct mali_pp_job *job) ++static void kbase_simple_power_model_term(struct kbase_ipa_model *model) +{ -+ u32 *registers; -+ MALI_DEBUG_ASSERT(job); -+ registers = mali_pp_job_get_dlbu_registers(job); -+ MALI_DEBUG_PRINT(4, ("Mali DLBU: Starting job\n")); -+ -+ /* Writing 4 registers: -+ * DLBU registers except the first two (written once at DLBU initialisation / reset) and the PP_ENABLE_MASK register */ -+ mali_hw_core_register_write_array_relaxed(&dlbu->hw_core, MALI_DLBU_REGISTER_TLLIST_VBASEADDR, registers, 4); ++ struct kbase_ipa_model_simple_data *model_data = ++ (struct kbase_ipa_model_simple_data *)model->model_data; + ++ kfree(model_data); +} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h ++ ++struct kbase_ipa_model_ops kbase_simple_ipa_model_ops = { ++ .name = "mali-simple-power-model", ++ .init = &kbase_simple_power_model_init, ++ .recalculate = &kbase_simple_power_model_recalculate, ++ .term = &kbase_simple_power_model_term, ++ .get_dynamic_coeff = &model_dynamic_coeff, ++ .get_static_coeff = &model_static_coeff, ++ .do_utilization_scaling_in_framework = true, ++}; +diff --git a/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h b/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h new file mode 100755 -index 000000000000..a7ecf41471d8 +index 000000000..6be0a334f --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h -@@ -0,0 +1,45 @@ ++++ b/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h +@@ -0,0 +1,311 @@ +/* -+ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2015-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef __MALI_DLBU_H__ -+#define __MALI_DLBU_H__ -+ -+#define MALI_DLBU_VIRT_ADDR 0xFFF00000 /* master tile virtual address fixed at this value and mapped into every session */ -+ -+#include "mali_osk.h" -+ -+struct mali_pp_job; -+struct mali_group; -+struct mali_dlbu_core; -+ -+extern mali_dma_addr mali_dlbu_phys_addr; -+ -+_mali_osk_errcode_t mali_dlbu_initialize(void); -+void mali_dlbu_terminate(void); -+ -+struct mali_dlbu_core *mali_dlbu_create(const _mali_osk_resource_t *resource); -+void mali_dlbu_delete(struct mali_dlbu_core *dlbu); -+ -+_mali_osk_errcode_t mali_dlbu_reset(struct mali_dlbu_core *dlbu); + -+void mali_dlbu_add_group(struct mali_dlbu_core *dlbu, struct mali_group *group); -+void mali_dlbu_remove_group(struct mali_dlbu_core *dlbu, struct mali_group *group); + -+/** @brief Called to update HW after DLBU state changed -+ * -+ * This function must be called after \a mali_dlbu_add_group or \a -+ * mali_dlbu_remove_group to write the updated mask to hardware, unless the -+ * same is accomplished by calling \a mali_dlbu_reset. ++/* AUTOMATICALLY GENERATED FILE. If you want to amend the issues/features, ++ * please update base/tools/hwconfig_generator/hwc_{issues,features}.py ++ * For more information see base/tools/hwconfig_generator/README + */ -+void mali_dlbu_update_mask(struct mali_dlbu_core *dlbu); + -+void mali_dlbu_config_job(struct mali_dlbu_core *dlbu, struct mali_pp_job *job); ++#ifndef _BASE_HWCONFIG_FEATURES_H_ ++#define _BASE_HWCONFIG_FEATURES_H_ + -+#endif /* __MALI_DLBU_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c -new file mode 100755 -index 000000000000..55b21a410754 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c -@@ -0,0 +1,308 @@ -+/* -+ * Copyright (C) 2010-2012, 2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++enum base_hw_feature { ++ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, ++ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, ++ BASE_HW_FEATURE_33BIT_VA, ++ BASE_HW_FEATURE_XAFFINITY, ++ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, ++ BASE_HW_FEATURE_MRT, ++ BASE_HW_FEATURE_BRNDOUT_CC, ++ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, ++ BASE_HW_FEATURE_LD_ST_TILEBUFFER, ++ BASE_HW_FEATURE_MSAA_16X, ++ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, ++ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, ++ BASE_HW_FEATURE_OPTIMIZED_COVERAGE_MASK, ++ BASE_HW_FEATURE_T7XX_PAIRING_RULES, ++ BASE_HW_FEATURE_LD_ST_LEA_TEX, ++ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, ++ BASE_HW_FEATURE_WORKGROUP_ROUND_MULTIPLE_OF_4, ++ BASE_HW_FEATURE_IMAGES_IN_FRAGMENT_SHADERS, ++ BASE_HW_FEATURE_TEST4_DATUM_MODE, ++ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, ++ BASE_HW_FEATURE_BRNDOUT_KILL, ++ BASE_HW_FEATURE_WARPING, ++ BASE_HW_FEATURE_V4, ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_MODE, ++ BASE_HW_FEATURE_COHERENCY_REG, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_AARCH64_MMU, ++ BASE_HW_FEATURE_END ++}; + -+#include -+#include "mali_kernel_common.h" -+#include "mali_scheduler.h" -+#include "mali_dvfs_policy.h" -+#include "mali_osk_mali.h" -+#include "mali_osk_profiling.h" ++static const enum base_hw_feature base_hw_features_generic[] = { ++ BASE_HW_FEATURE_END ++}; + -+#define CLOCK_TUNING_TIME_DEBUG 0 ++static const enum base_hw_feature base_hw_features_t60x[] = { ++ BASE_HW_FEATURE_LD_ST_LEA_TEX, ++ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, ++ BASE_HW_FEATURE_V4, ++ BASE_HW_FEATURE_END ++}; + -+#define MAX_PERFORMANCE_VALUE 256 -+#define MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(percent) ((int) ((percent)*(MAX_PERFORMANCE_VALUE)/100.0 + 0.5)) ++static const enum base_hw_feature base_hw_features_t62x[] = { ++ BASE_HW_FEATURE_LD_ST_LEA_TEX, ++ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, ++ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, ++ BASE_HW_FEATURE_V4, ++ BASE_HW_FEATURE_END ++}; + -+/** The max fps the same as display vsync default 60, can set by module insert parameter */ -+int mali_max_system_fps = 60; -+/** A lower limit on their desired FPS default 58, can set by module insert parameter */ -+int mali_desired_fps = 58; ++static const enum base_hw_feature base_hw_features_t72x[] = { ++ BASE_HW_FEATURE_33BIT_VA, ++ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, ++ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, ++ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, ++ BASE_HW_FEATURE_OPTIMIZED_COVERAGE_MASK, ++ BASE_HW_FEATURE_T7XX_PAIRING_RULES, ++ BASE_HW_FEATURE_WORKGROUP_ROUND_MULTIPLE_OF_4, ++ BASE_HW_FEATURE_WARPING, ++ BASE_HW_FEATURE_V4, ++ BASE_HW_FEATURE_END ++}; + -+static int mali_fps_step1 = 0; -+static int mali_fps_step2 = 0; ++static const enum base_hw_feature base_hw_features_t76x[] = { ++ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, ++ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, ++ BASE_HW_FEATURE_XAFFINITY, ++ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, ++ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, ++ BASE_HW_FEATURE_BRNDOUT_CC, ++ BASE_HW_FEATURE_LD_ST_LEA_TEX, ++ BASE_HW_FEATURE_LD_ST_TILEBUFFER, ++ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, ++ BASE_HW_FEATURE_MRT, ++ BASE_HW_FEATURE_MSAA_16X, ++ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, ++ BASE_HW_FEATURE_T7XX_PAIRING_RULES, ++ BASE_HW_FEATURE_TEST4_DATUM_MODE, ++ BASE_HW_FEATURE_END ++}; + -+static int clock_step = -1; -+static int cur_clk_step = -1; -+static struct mali_gpu_clock *gpu_clk = NULL; ++static const enum base_hw_feature base_hw_features_tFxx[] = { ++ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, ++ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, ++ BASE_HW_FEATURE_XAFFINITY, ++ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, ++ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, ++ BASE_HW_FEATURE_BRNDOUT_CC, ++ BASE_HW_FEATURE_BRNDOUT_KILL, ++ BASE_HW_FEATURE_LD_ST_LEA_TEX, ++ BASE_HW_FEATURE_LD_ST_TILEBUFFER, ++ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, ++ BASE_HW_FEATURE_MRT, ++ BASE_HW_FEATURE_MSAA_16X, ++ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, ++ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, ++ BASE_HW_FEATURE_T7XX_PAIRING_RULES, ++ BASE_HW_FEATURE_TEST4_DATUM_MODE, ++ BASE_HW_FEATURE_END ++}; + -+/*Function prototype */ -+static int (*mali_gpu_set_freq)(int) = NULL; -+static int (*mali_gpu_get_freq)(void) = NULL; ++static const enum base_hw_feature base_hw_features_t83x[] = { ++ BASE_HW_FEATURE_33BIT_VA, ++ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, ++ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, ++ BASE_HW_FEATURE_XAFFINITY, ++ BASE_HW_FEATURE_WARPING, ++ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, ++ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, ++ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, ++ BASE_HW_FEATURE_BRNDOUT_CC, ++ BASE_HW_FEATURE_BRNDOUT_KILL, ++ BASE_HW_FEATURE_LD_ST_LEA_TEX, ++ BASE_HW_FEATURE_LD_ST_TILEBUFFER, ++ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, ++ BASE_HW_FEATURE_MRT, ++ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, ++ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, ++ BASE_HW_FEATURE_T7XX_PAIRING_RULES, ++ BASE_HW_FEATURE_TEST4_DATUM_MODE, ++ BASE_HW_FEATURE_END ++}; + -+static mali_bool mali_dvfs_enabled = MALI_FALSE; ++static const enum base_hw_feature base_hw_features_t82x[] = { ++ BASE_HW_FEATURE_33BIT_VA, ++ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, ++ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, ++ BASE_HW_FEATURE_XAFFINITY, ++ BASE_HW_FEATURE_WARPING, ++ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, ++ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, ++ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, ++ BASE_HW_FEATURE_BRNDOUT_CC, ++ BASE_HW_FEATURE_BRNDOUT_KILL, ++ BASE_HW_FEATURE_LD_ST_LEA_TEX, ++ BASE_HW_FEATURE_LD_ST_TILEBUFFER, ++ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, ++ BASE_HW_FEATURE_MRT, ++ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, ++ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, ++ BASE_HW_FEATURE_T7XX_PAIRING_RULES, ++ BASE_HW_FEATURE_TEST4_DATUM_MODE, ++ BASE_HW_FEATURE_END ++}; + -+#define NUMBER_OF_NANOSECONDS_PER_SECOND 1000000000ULL -+static u32 calculate_window_render_fps(u64 time_period) -+{ -+ u32 max_window_number; -+ u64 tmp; -+ u64 max = time_period; -+ u32 leading_zeroes; -+ u32 shift_val; -+ u32 time_period_shift; -+ u32 max_window_number_shift; -+ u32 ret_val; ++static const enum base_hw_feature base_hw_features_tMIx[] = { ++ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, ++ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, ++ BASE_HW_FEATURE_XAFFINITY, ++ BASE_HW_FEATURE_WARPING, ++ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, ++ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, ++ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, ++ BASE_HW_FEATURE_BRNDOUT_CC, ++ BASE_HW_FEATURE_BRNDOUT_KILL, ++ BASE_HW_FEATURE_LD_ST_LEA_TEX, ++ BASE_HW_FEATURE_LD_ST_TILEBUFFER, ++ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, ++ BASE_HW_FEATURE_MRT, ++ BASE_HW_FEATURE_MSAA_16X, ++ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, ++ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, ++ BASE_HW_FEATURE_T7XX_PAIRING_RULES, ++ BASE_HW_FEATURE_TEST4_DATUM_MODE, ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_MODE, ++ BASE_HW_FEATURE_COHERENCY_REG, ++ BASE_HW_FEATURE_END ++}; + -+ max_window_number = mali_session_max_window_num(); ++static const enum base_hw_feature base_hw_features_tHEx[] = { ++ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, ++ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, ++ BASE_HW_FEATURE_XAFFINITY, ++ BASE_HW_FEATURE_WARPING, ++ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, ++ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, ++ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, ++ BASE_HW_FEATURE_BRNDOUT_CC, ++ BASE_HW_FEATURE_BRNDOUT_KILL, ++ BASE_HW_FEATURE_LD_ST_LEA_TEX, ++ BASE_HW_FEATURE_LD_ST_TILEBUFFER, ++ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, ++ BASE_HW_FEATURE_MRT, ++ BASE_HW_FEATURE_MSAA_16X, ++ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, ++ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, ++ BASE_HW_FEATURE_T7XX_PAIRING_RULES, ++ BASE_HW_FEATURE_TEST4_DATUM_MODE, ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_MODE, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_COHERENCY_REG, ++ BASE_HW_FEATURE_END ++}; + -+ /* To avoid float division, extend the dividend to ns unit */ -+ tmp = (u64)max_window_number * NUMBER_OF_NANOSECONDS_PER_SECOND; -+ if (tmp > time_period) { -+ max = tmp; -+ } ++static const enum base_hw_feature base_hw_features_tSIx[] = { ++ BASE_HW_FEATURE_33BIT_VA, ++ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, ++ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, ++ BASE_HW_FEATURE_XAFFINITY, ++ BASE_HW_FEATURE_WARPING, ++ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, ++ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, ++ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, ++ BASE_HW_FEATURE_BRNDOUT_CC, ++ BASE_HW_FEATURE_BRNDOUT_KILL, ++ BASE_HW_FEATURE_LD_ST_LEA_TEX, ++ BASE_HW_FEATURE_LD_ST_TILEBUFFER, ++ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, ++ BASE_HW_FEATURE_MRT, ++ BASE_HW_FEATURE_MSAA_16X, ++ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, ++ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, ++ BASE_HW_FEATURE_T7XX_PAIRING_RULES, ++ BASE_HW_FEATURE_TEST4_DATUM_MODE, ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_MODE, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_COHERENCY_REG, ++ BASE_HW_FEATURE_END ++}; + -+ /* -+ * We may have 64-bit values, a dividend or a divisor or both -+ * To avoid dependencies to a 64-bit divider, we shift down the two values -+ * equally first. -+ */ -+ leading_zeroes = _mali_osk_clz((u32)(max >> 32)); -+ shift_val = 32 - leading_zeroes; + -+ time_period_shift = (u32)(time_period >> shift_val); -+ max_window_number_shift = (u32)(tmp >> shift_val); ++#ifdef MALI_INCLUDE_TKAX ++static const enum base_hw_feature base_hw_features_tKAx[] = { ++ BASE_HW_FEATURE_33BIT_VA, ++ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, ++ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, ++ BASE_HW_FEATURE_XAFFINITY, ++ BASE_HW_FEATURE_WARPING, ++ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, ++ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, ++ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, ++ BASE_HW_FEATURE_BRNDOUT_CC, ++ BASE_HW_FEATURE_BRNDOUT_KILL, ++ BASE_HW_FEATURE_LD_ST_LEA_TEX, ++ BASE_HW_FEATURE_LD_ST_TILEBUFFER, ++ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, ++ BASE_HW_FEATURE_MRT, ++ BASE_HW_FEATURE_MSAA_16X, ++ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, ++ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, ++ BASE_HW_FEATURE_T7XX_PAIRING_RULES, ++ BASE_HW_FEATURE_TEST4_DATUM_MODE, ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_MODE, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_COHERENCY_REG, ++ BASE_HW_FEATURE_END ++}; + -+ ret_val = max_window_number_shift / time_period_shift; ++#endif /* MALI_INCLUDE_TKAX */ + -+ return ret_val; -+} ++#ifdef MALI_INCLUDE_TTRX ++static const enum base_hw_feature base_hw_features_tTRx[] = { ++ BASE_HW_FEATURE_33BIT_VA, ++ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION, ++ BASE_HW_FEATURE_PWRON_DURING_PWROFF_TRANS, ++ BASE_HW_FEATURE_XAFFINITY, ++ BASE_HW_FEATURE_WARPING, ++ BASE_HW_FEATURE_INTERPIPE_REG_ALIASING, ++ BASE_HW_FEATURE_32_BIT_UNIFORM_ADDRESS, ++ BASE_HW_FEATURE_ATTR_AUTO_TYPE_INFERRAL, ++ BASE_HW_FEATURE_BRNDOUT_CC, ++ BASE_HW_FEATURE_BRNDOUT_KILL, ++ BASE_HW_FEATURE_LD_ST_LEA_TEX, ++ BASE_HW_FEATURE_LD_ST_TILEBUFFER, ++ BASE_HW_FEATURE_LINEAR_FILTER_FLOAT, ++ BASE_HW_FEATURE_MRT, ++ BASE_HW_FEATURE_MSAA_16X, ++ BASE_HW_FEATURE_NEXT_INSTRUCTION_TYPE, ++ BASE_HW_FEATURE_OUT_OF_ORDER_EXEC, ++ BASE_HW_FEATURE_T7XX_PAIRING_RULES, ++ BASE_HW_FEATURE_TEST4_DATUM_MODE, ++ BASE_HW_FEATURE_FLUSH_REDUCTION, ++ BASE_HW_FEATURE_PROTECTED_MODE, ++ BASE_HW_FEATURE_PROTECTED_DEBUG_MODE, ++ BASE_HW_FEATURE_COHERENCY_REG, ++ BASE_HW_FEATURE_END ++}; + -+static bool mali_pickup_closest_avail_clock(int target_clock_mhz, mali_bool pick_clock_up) -+{ -+ int i = 0; -+ bool clock_changed = false; ++#endif /* MALI_INCLUDE_TTRX */ + -+ /* Round up the closest available frequency step for target_clock_hz */ -+ for (i = 0; i < gpu_clk->num_of_steps; i++) { -+ /* Find the first item > target_clock_hz */ -+ if (((int)(gpu_clk->item[i].clock) - target_clock_mhz) > 0) { -+ break; -+ } -+ } ++#endif /* _BASE_HWCONFIG_FEATURES_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h b/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h +new file mode 100755 +index 000000000..6d7e5c57e +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h +@@ -0,0 +1,1098 @@ ++/* ++ * ++ * (C) COPYRIGHT 2015-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ /* If the target clock greater than the maximum clock just pick the maximum one*/ -+ if (i == gpu_clk->num_of_steps) { -+ i = gpu_clk->num_of_steps - 1; -+ } else { -+ if ((!pick_clock_up) && (i > 0)) { -+ i = i - 1; -+ } -+ } + -+ clock_step = i; -+ if (cur_clk_step != clock_step) { -+ clock_changed = true; -+ } + -+ return clock_changed; -+} ++/* AUTOMATICALLY GENERATED FILE. If you want to amend the issues/features, ++ * please update base/tools/hwconfig_generator/hwc_{issues,features}.py ++ * For more information see base/tools/hwconfig_generator/README ++ */ + -+void mali_dvfs_policy_realize(struct mali_gpu_utilization_data *data, u64 time_period) -+{ -+ int under_perform_boundary_value = 0; -+ int over_perform_boundary_value = 0; -+ int current_fps = 0; -+ int current_gpu_util = 0; -+ bool clock_changed = false; -+#if CLOCK_TUNING_TIME_DEBUG -+ struct timeval start; -+ struct timeval stop; -+ unsigned int elapse_time; -+ do_gettimeofday(&start); -+#endif -+ u32 window_render_fps; ++#ifndef _BASE_HWCONFIG_ISSUES_H_ ++#define _BASE_HWCONFIG_ISSUES_H_ + -+ if (NULL == gpu_clk) { -+ MALI_DEBUG_PRINT(2, ("Enable DVFS but patform doesn't Support freq change. \n")); -+ return; -+ } ++enum base_hw_issue { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_6367, ++ BASE_HW_ISSUE_6398, ++ BASE_HW_ISSUE_6402, ++ BASE_HW_ISSUE_6787, ++ BASE_HW_ISSUE_7027, ++ BASE_HW_ISSUE_7144, ++ BASE_HW_ISSUE_7304, ++ BASE_HW_ISSUE_8073, ++ BASE_HW_ISSUE_8186, ++ BASE_HW_ISSUE_8215, ++ BASE_HW_ISSUE_8245, ++ BASE_HW_ISSUE_8250, ++ BASE_HW_ISSUE_8260, ++ BASE_HW_ISSUE_8280, ++ BASE_HW_ISSUE_8316, ++ BASE_HW_ISSUE_8381, ++ BASE_HW_ISSUE_8394, ++ BASE_HW_ISSUE_8401, ++ BASE_HW_ISSUE_8408, ++ BASE_HW_ISSUE_8443, ++ BASE_HW_ISSUE_8456, ++ BASE_HW_ISSUE_8564, ++ BASE_HW_ISSUE_8634, ++ BASE_HW_ISSUE_8778, ++ BASE_HW_ISSUE_8791, ++ BASE_HW_ISSUE_8833, ++ BASE_HW_ISSUE_8879, ++ BASE_HW_ISSUE_8896, ++ BASE_HW_ISSUE_8975, ++ BASE_HW_ISSUE_8986, ++ BASE_HW_ISSUE_8987, ++ BASE_HW_ISSUE_9010, ++ BASE_HW_ISSUE_9418, ++ BASE_HW_ISSUE_9423, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_9510, ++ BASE_HW_ISSUE_9566, ++ BASE_HW_ISSUE_9630, ++ BASE_HW_ISSUE_10127, ++ BASE_HW_ISSUE_10327, ++ BASE_HW_ISSUE_10410, ++ BASE_HW_ISSUE_10471, ++ BASE_HW_ISSUE_10472, ++ BASE_HW_ISSUE_10487, ++ BASE_HW_ISSUE_10607, ++ BASE_HW_ISSUE_10632, ++ BASE_HW_ISSUE_10649, ++ BASE_HW_ISSUE_10676, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_10684, ++ BASE_HW_ISSUE_10797, ++ BASE_HW_ISSUE_10817, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10931, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_10959, ++ BASE_HW_ISSUE_10969, ++ BASE_HW_ISSUE_10984, ++ BASE_HW_ISSUE_10995, ++ BASE_HW_ISSUE_11012, ++ BASE_HW_ISSUE_11020, ++ BASE_HW_ISSUE_11024, ++ BASE_HW_ISSUE_11035, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T720_1386, ++ BASE_HW_ISSUE_T76X_26, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3542, ++ BASE_HW_ISSUE_T76X_3556, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3960, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_T76X_3966, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_7940, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TMIX_8138, ++ BASE_HW_ISSUE_TMIX_8206, ++ BASE_HW_ISSUE_TMIX_8343, ++ BASE_HW_ISSUE_TMIX_8463, ++ BASE_HW_ISSUE_TMIX_8456, ++ GPUCORE_1619, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ window_render_fps = calculate_window_render_fps(time_period); ++static const enum base_hw_issue base_hw_issues_generic[] = { ++ BASE_HW_ISSUE_END ++}; + -+ current_fps = window_render_fps; -+ current_gpu_util = data->utilization_gpu; ++static const enum base_hw_issue base_hw_issues_t60x_r0p0_15dev0[] = { ++ BASE_HW_ISSUE_6367, ++ BASE_HW_ISSUE_6398, ++ BASE_HW_ISSUE_6402, ++ BASE_HW_ISSUE_6787, ++ BASE_HW_ISSUE_7027, ++ BASE_HW_ISSUE_7144, ++ BASE_HW_ISSUE_7304, ++ BASE_HW_ISSUE_8073, ++ BASE_HW_ISSUE_8186, ++ BASE_HW_ISSUE_8215, ++ BASE_HW_ISSUE_8245, ++ BASE_HW_ISSUE_8250, ++ BASE_HW_ISSUE_8260, ++ BASE_HW_ISSUE_8280, ++ BASE_HW_ISSUE_8316, ++ BASE_HW_ISSUE_8381, ++ BASE_HW_ISSUE_8394, ++ BASE_HW_ISSUE_8401, ++ BASE_HW_ISSUE_8408, ++ BASE_HW_ISSUE_8443, ++ BASE_HW_ISSUE_8456, ++ BASE_HW_ISSUE_8564, ++ BASE_HW_ISSUE_8634, ++ BASE_HW_ISSUE_8778, ++ BASE_HW_ISSUE_8791, ++ BASE_HW_ISSUE_8833, ++ BASE_HW_ISSUE_8896, ++ BASE_HW_ISSUE_8975, ++ BASE_HW_ISSUE_8986, ++ BASE_HW_ISSUE_8987, ++ BASE_HW_ISSUE_9010, ++ BASE_HW_ISSUE_9418, ++ BASE_HW_ISSUE_9423, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_9510, ++ BASE_HW_ISSUE_9566, ++ BASE_HW_ISSUE_9630, ++ BASE_HW_ISSUE_10410, ++ BASE_HW_ISSUE_10471, ++ BASE_HW_ISSUE_10472, ++ BASE_HW_ISSUE_10487, ++ BASE_HW_ISSUE_10607, ++ BASE_HW_ISSUE_10632, ++ BASE_HW_ISSUE_10649, ++ BASE_HW_ISSUE_10676, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_10684, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10931, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_10969, ++ BASE_HW_ISSUE_10984, ++ BASE_HW_ISSUE_10995, ++ BASE_HW_ISSUE_11012, ++ BASE_HW_ISSUE_11020, ++ BASE_HW_ISSUE_11035, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_3964, ++ GPUCORE_1619, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ /* Get the specific under_perform_boundary_value and over_perform_boundary_value */ -+ if ((mali_desired_fps <= current_fps) && (current_fps < mali_max_system_fps)) { -+ under_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(90); -+ over_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(70); -+ } else if ((mali_fps_step1 <= current_fps) && (current_fps < mali_desired_fps)) { -+ under_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(55); -+ over_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(35); -+ } else if ((mali_fps_step2 <= current_fps) && (current_fps < mali_fps_step1)) { -+ under_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(70); -+ over_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(50); -+ } else { -+ under_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(55); -+ over_perform_boundary_value = MALI_PERCENTAGE_TO_UTILIZATION_FRACTION(35); -+ } ++static const enum base_hw_issue base_hw_issues_t60x_r0p0_eac[] = { ++ BASE_HW_ISSUE_6367, ++ BASE_HW_ISSUE_6402, ++ BASE_HW_ISSUE_6787, ++ BASE_HW_ISSUE_7027, ++ BASE_HW_ISSUE_7304, ++ BASE_HW_ISSUE_8408, ++ BASE_HW_ISSUE_8564, ++ BASE_HW_ISSUE_8778, ++ BASE_HW_ISSUE_8975, ++ BASE_HW_ISSUE_9010, ++ BASE_HW_ISSUE_9418, ++ BASE_HW_ISSUE_9423, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_9510, ++ BASE_HW_ISSUE_10410, ++ BASE_HW_ISSUE_10471, ++ BASE_HW_ISSUE_10472, ++ BASE_HW_ISSUE_10487, ++ BASE_HW_ISSUE_10607, ++ BASE_HW_ISSUE_10632, ++ BASE_HW_ISSUE_10649, ++ BASE_HW_ISSUE_10676, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_10684, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10931, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_10969, ++ BASE_HW_ISSUE_11012, ++ BASE_HW_ISSUE_11020, ++ BASE_HW_ISSUE_11035, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ MALI_DEBUG_PRINT(5, ("Using ARM power policy: gpu util = %d \n", current_gpu_util)); -+ MALI_DEBUG_PRINT(5, ("Using ARM power policy: under_perform = %d, over_perform = %d \n", under_perform_boundary_value, over_perform_boundary_value)); -+ MALI_DEBUG_PRINT(5, ("Using ARM power policy: render fps = %d, pressure render fps = %d \n", current_fps, window_render_fps)); ++static const enum base_hw_issue base_hw_issues_t60x_r0p1[] = { ++ BASE_HW_ISSUE_6367, ++ BASE_HW_ISSUE_6402, ++ BASE_HW_ISSUE_6787, ++ BASE_HW_ISSUE_7027, ++ BASE_HW_ISSUE_7304, ++ BASE_HW_ISSUE_8408, ++ BASE_HW_ISSUE_8564, ++ BASE_HW_ISSUE_8778, ++ BASE_HW_ISSUE_8975, ++ BASE_HW_ISSUE_9010, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_9510, ++ BASE_HW_ISSUE_10410, ++ BASE_HW_ISSUE_10471, ++ BASE_HW_ISSUE_10472, ++ BASE_HW_ISSUE_10487, ++ BASE_HW_ISSUE_10607, ++ BASE_HW_ISSUE_10632, ++ BASE_HW_ISSUE_10649, ++ BASE_HW_ISSUE_10676, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_10684, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10931, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11012, ++ BASE_HW_ISSUE_11020, ++ BASE_HW_ISSUE_11035, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ /* Get current clock value */ -+ cur_clk_step = mali_gpu_get_freq(); ++static const enum base_hw_issue base_hw_issues_t62x_r0p1[] = { ++ BASE_HW_ISSUE_6402, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10127, ++ BASE_HW_ISSUE_10327, ++ BASE_HW_ISSUE_10410, ++ BASE_HW_ISSUE_10471, ++ BASE_HW_ISSUE_10472, ++ BASE_HW_ISSUE_10487, ++ BASE_HW_ISSUE_10607, ++ BASE_HW_ISSUE_10632, ++ BASE_HW_ISSUE_10649, ++ BASE_HW_ISSUE_10676, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_10684, ++ BASE_HW_ISSUE_10817, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10931, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_10959, ++ BASE_HW_ISSUE_11012, ++ BASE_HW_ISSUE_11020, ++ BASE_HW_ISSUE_11024, ++ BASE_HW_ISSUE_11035, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ /* Consider offscreen */ -+ if (0 == current_fps) { -+ /* GP or PP under perform, need to give full power */ -+ if (current_gpu_util > over_perform_boundary_value) { -+ if (cur_clk_step != gpu_clk->num_of_steps - 1) { -+ clock_changed = true; -+ clock_step = gpu_clk->num_of_steps - 1; -+ } -+ } ++static const enum base_hw_issue base_hw_issues_t62x_r1p0[] = { ++ BASE_HW_ISSUE_6402, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10471, ++ BASE_HW_ISSUE_10472, ++ BASE_HW_ISSUE_10649, ++ BASE_HW_ISSUE_10684, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10931, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_10959, ++ BASE_HW_ISSUE_11012, ++ BASE_HW_ISSUE_11020, ++ BASE_HW_ISSUE_11024, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ /* If GPU is idle, use lowest power */ -+ if (0 == current_gpu_util) { -+ if (cur_clk_step != 0) { -+ clock_changed = true; -+ clock_step = 0; -+ } -+ } ++static const enum base_hw_issue base_hw_issues_t62x_r1p1[] = { ++ BASE_HW_ISSUE_6402, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10471, ++ BASE_HW_ISSUE_10472, ++ BASE_HW_ISSUE_10649, ++ BASE_HW_ISSUE_10684, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10931, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_10959, ++ BASE_HW_ISSUE_11012, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ goto real_setting; -+ } ++static const enum base_hw_issue base_hw_issues_t76x_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11020, ++ BASE_HW_ISSUE_11024, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_26, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3542, ++ BASE_HW_ISSUE_T76X_3556, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3960, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_T76X_3966, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ /* 2. Calculate target clock if the GPU clock can be tuned */ -+ if (-1 != cur_clk_step) { -+ int target_clk_mhz = -1; -+ mali_bool pick_clock_up = MALI_TRUE; ++static const enum base_hw_issue base_hw_issues_t76x_r0p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11020, ++ BASE_HW_ISSUE_11024, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_26, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3542, ++ BASE_HW_ISSUE_T76X_3556, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3960, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_T76X_3966, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ if (current_gpu_util > under_perform_boundary_value) { -+ /* when under perform, need to consider the fps part */ -+ target_clk_mhz = gpu_clk->item[cur_clk_step].clock * current_gpu_util * mali_desired_fps / under_perform_boundary_value / current_fps; -+ pick_clock_up = MALI_TRUE; -+ } else if (current_gpu_util < over_perform_boundary_value) { -+ /* when over perform, did't need to consider fps, system didn't want to reach desired fps */ -+ target_clk_mhz = gpu_clk->item[cur_clk_step].clock * current_gpu_util / under_perform_boundary_value; -+ pick_clock_up = MALI_FALSE; -+ } ++static const enum base_hw_issue base_hw_issues_t76x_r0p1_50rel0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_26, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3542, ++ BASE_HW_ISSUE_T76X_3556, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3960, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_T76X_3966, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ if (-1 != target_clk_mhz) { -+ clock_changed = mali_pickup_closest_avail_clock(target_clk_mhz, pick_clock_up); -+ } -+ } ++static const enum base_hw_issue base_hw_issues_t76x_r0p2[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11020, ++ BASE_HW_ISSUE_11024, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_26, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3542, ++ BASE_HW_ISSUE_T76X_3556, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3960, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_T76X_3966, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+real_setting: -+ if (clock_changed) { -+ mali_gpu_set_freq(clock_step); ++static const enum base_hw_issue base_hw_issues_t76x_r0p3[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_26, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3542, ++ BASE_HW_ISSUE_T76X_3556, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3960, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_T76X_3966, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_EVENT_CHANNEL_GPU | -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, -+ gpu_clk->item[clock_step].clock, -+ gpu_clk->item[clock_step].vol / 1000, -+ 0, 0, 0); -+ } ++static const enum base_hw_issue base_hw_issues_t76x_r1p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3960, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_T76X_3966, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+#if CLOCK_TUNING_TIME_DEBUG -+ do_gettimeofday(&stop); ++static const enum base_hw_issue base_hw_issues_t72x_r0p0[] = { ++ BASE_HW_ISSUE_6402, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10471, ++ BASE_HW_ISSUE_10649, ++ BASE_HW_ISSUE_10684, ++ BASE_HW_ISSUE_10797, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ elapse_time = timeval_to_ns(&stop) - timeval_to_ns(&start); -+ MALI_DEBUG_PRINT(2, ("Using ARM power policy: eclapse time = %d\n", elapse_time)); -+#endif -+} ++static const enum base_hw_issue base_hw_issues_t72x_r1p0[] = { ++ BASE_HW_ISSUE_6402, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10471, ++ BASE_HW_ISSUE_10649, ++ BASE_HW_ISSUE_10684, ++ BASE_HW_ISSUE_10797, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T720_1386, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+_mali_osk_errcode_t mali_dvfs_policy_init(void) -+{ -+ _mali_osk_device_data data; -+ _mali_osk_errcode_t err = _MALI_OSK_ERR_OK; ++static const enum base_hw_issue base_hw_issues_t72x_r1p1[] = { ++ BASE_HW_ISSUE_6402, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10471, ++ BASE_HW_ISSUE_10649, ++ BASE_HW_ISSUE_10684, ++ BASE_HW_ISSUE_10797, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T720_1386, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { -+ if ((NULL != data.get_clock_info) && (NULL != data.set_freq) && (NULL != data.get_freq)) { -+ MALI_DEBUG_PRINT(2, ("Mali DVFS init: using arm dvfs policy \n")); ++static const enum base_hw_issue base_hw_issues_model_t72x[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_6402, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10471, ++ BASE_HW_ISSUE_10649, ++ BASE_HW_ISSUE_10797, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3964, ++ GPUCORE_1619, ++ BASE_HW_ISSUE_END ++}; + ++static const enum base_hw_issue base_hw_issues_model_t76x[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_11020, ++ BASE_HW_ISSUE_11024, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ GPUCORE_1619, ++ BASE_HW_ISSUE_END ++}; + -+ mali_fps_step1 = mali_max_system_fps / 3; -+ mali_fps_step2 = mali_max_system_fps / 5; ++static const enum base_hw_issue base_hw_issues_model_t60x[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_6402, ++ BASE_HW_ISSUE_8778, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10472, ++ BASE_HW_ISSUE_10649, ++ BASE_HW_ISSUE_10931, ++ BASE_HW_ISSUE_11012, ++ BASE_HW_ISSUE_11020, ++ BASE_HW_ISSUE_11024, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3964, ++ GPUCORE_1619, ++ BASE_HW_ISSUE_END ++}; + -+ data.get_clock_info(&gpu_clk); ++static const enum base_hw_issue base_hw_issues_model_t62x[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_6402, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10472, ++ BASE_HW_ISSUE_10649, ++ BASE_HW_ISSUE_10931, ++ BASE_HW_ISSUE_11012, ++ BASE_HW_ISSUE_11020, ++ BASE_HW_ISSUE_11024, ++ BASE_HW_ISSUE_11042, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3964, ++ GPUCORE_1619, ++ BASE_HW_ISSUE_END ++}; + -+ if (gpu_clk != NULL) { -+#ifdef DEBUG -+ int i; -+ for (i = 0; i < gpu_clk->num_of_steps; i++) { -+ MALI_DEBUG_PRINT(5, ("mali gpu clock info: step%d clock(%d)Hz,vol(%d) \n", -+ i, gpu_clk->item[i].clock, gpu_clk->item[i].vol)); -+ } -+#endif -+ } else { -+ MALI_DEBUG_PRINT(2, ("Mali DVFS init: platform didn't define enough info for ddk to do DVFS \n")); -+ } ++static const enum base_hw_issue base_hw_issues_tFRx_r0p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3960, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_T76X_3966, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ mali_gpu_get_freq = data.get_freq; -+ mali_gpu_set_freq = data.set_freq; ++static const enum base_hw_issue base_hw_issues_tFRx_r0p2[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_T76X_3966, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ if ((NULL != gpu_clk) && (gpu_clk->num_of_steps > 0) -+ && (NULL != mali_gpu_get_freq) && (NULL != mali_gpu_set_freq)) { -+ mali_dvfs_enabled = MALI_TRUE; -+ } -+ } else { -+ MALI_DEBUG_PRINT(2, ("Mali DVFS init: platform function callback incomplete, need check mali_gpu_device_data in platform .\n")); -+ } -+ } else { -+ err = _MALI_OSK_ERR_FAULT; -+ MALI_DEBUG_PRINT(2, ("Mali DVFS init: get platform data error .\n")); -+ } ++static const enum base_hw_issue base_hw_issues_tFRx_r1p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3966, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ return err; -+} ++static const enum base_hw_issue base_hw_issues_tFRx_r2p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3966, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+/* -+ * Always give full power when start a new period, -+ * if mali dvfs enabled, for performance consideration -+ */ -+void mali_dvfs_policy_new_period(void) -+{ -+ /* Always give full power when start a new period */ -+ unsigned int cur_clk_step = 0; ++static const enum base_hw_issue base_hw_issues_model_tFRx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ GPUCORE_1619, ++ BASE_HW_ISSUE_END ++}; + -+ cur_clk_step = mali_gpu_get_freq(); ++static const enum base_hw_issue base_hw_issues_t86x_r0p2[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_T76X_3966, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ if (cur_clk_step != (gpu_clk->num_of_steps - 1)) { -+ mali_gpu_set_freq(gpu_clk->num_of_steps - 1); ++static const enum base_hw_issue base_hw_issues_t86x_r1p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3966, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_EVENT_CHANNEL_GPU | -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, gpu_clk->item[gpu_clk->num_of_steps - 1].clock, -+ gpu_clk->item[gpu_clk->num_of_steps - 1].vol / 1000, 0, 0, 0); -+ } -+} ++static const enum base_hw_issue base_hw_issues_t86x_r2p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3966, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+mali_bool mali_dvfs_policy_enabled(void) -+{ -+ return mali_dvfs_enabled; -+} ++static const enum base_hw_issue base_hw_issues_model_t86x[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ GPUCORE_1619, ++ BASE_HW_ISSUE_END ++}; + -+#if defined(CONFIG_MALI400_PROFILING) -+void mali_get_current_gpu_clk_item(struct mali_gpu_clk_item *clk_item) -+{ -+ if (mali_platform_device != NULL) { ++static const enum base_hw_issue base_hw_issues_t83x_r0p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T720_1386, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3960, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ struct mali_gpu_device_data *device_data = NULL; -+ device_data = (struct mali_gpu_device_data *)mali_platform_device->dev.platform_data; ++static const enum base_hw_issue base_hw_issues_t83x_r1p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T720_1386, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3960, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ if ((NULL != device_data->get_clock_info) && (NULL != device_data->get_freq)) { ++static const enum base_hw_issue base_hw_issues_model_t83x[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ GPUCORE_1619, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ int cur_clk_step = device_data->get_freq(); -+ struct mali_gpu_clock *mali_gpu_clk = NULL; ++static const enum base_hw_issue base_hw_issues_t82x_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T720_1386, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3960, ++ BASE_HW_ISSUE_T76X_3964, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+ device_data->get_clock_info(&mali_gpu_clk); -+ clk_item->clock = mali_gpu_clk->item[cur_clk_step].clock; -+ clk_item->vol = mali_gpu_clk->item[cur_clk_step].vol; -+ } else { -+ MALI_DEBUG_PRINT(2, ("Mali GPU Utilization: platform function callback incomplete, need check mali_gpu_device_data in platform .\n")); -+ } -+ } -+} -+#endif ++static const enum base_hw_issue base_hw_issues_t82x_r0p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T720_1386, ++ BASE_HW_ISSUE_T76X_1909, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3960, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h -new file mode 100755 -index 000000000000..662348c4e6ac ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h -@@ -0,0 +1,34 @@ -+/* -+ * Copyright (C) 2010-2012, 2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++static const enum base_hw_issue base_hw_issues_t82x_r1p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10821, ++ BASE_HW_ISSUE_10883, ++ BASE_HW_ISSUE_10946, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T720_1386, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_T76X_3960, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+#ifndef __MALI_DVFS_POLICY_H__ -+#define __MALI_DVFS_POLICY_H__ ++static const enum base_hw_issue base_hw_issues_model_t82x[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_11051, ++ BASE_HW_ISSUE_T76X_1963, ++ BASE_HW_ISSUE_T76X_3086, ++ BASE_HW_ISSUE_T76X_3700, ++ BASE_HW_ISSUE_T76X_3793, ++ BASE_HW_ISSUE_T76X_3979, ++ BASE_HW_ISSUE_TMIX_7891, ++ GPUCORE_1619, ++ BASE_HW_ISSUE_END ++}; + -+#ifdef __cplusplus -+extern "C" { -+#endif ++static const enum base_hw_issue base_hw_issues_tMIx_r0p0_05dev0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_T76X_3953, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TMIX_8138, ++ BASE_HW_ISSUE_TMIX_8206, ++ BASE_HW_ISSUE_TMIX_8343, ++ BASE_HW_ISSUE_TMIX_8463, ++ BASE_HW_ISSUE_TMIX_8456, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+void mali_dvfs_policy_realize(struct mali_gpu_utilization_data *data, u64 time_period); ++static const enum base_hw_issue base_hw_issues_tMIx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_11054, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_7940, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TMIX_8138, ++ BASE_HW_ISSUE_TMIX_8206, ++ BASE_HW_ISSUE_TMIX_8343, ++ BASE_HW_ISSUE_TMIX_8463, ++ BASE_HW_ISSUE_TMIX_8456, ++ BASE_HW_ISSUE_TMIX_8438, ++ BASE_HW_ISSUE_END ++}; + -+_mali_osk_errcode_t mali_dvfs_policy_init(void); ++static const enum base_hw_issue base_hw_issues_model_tMIx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_7940, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TMIX_8138, ++ BASE_HW_ISSUE_TMIX_8206, ++ BASE_HW_ISSUE_TMIX_8343, ++ BASE_HW_ISSUE_TMIX_8456, ++ BASE_HW_ISSUE_END ++}; + -+void mali_dvfs_policy_new_period(void); ++static const enum base_hw_issue base_hw_issues_tHEx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_END ++}; + -+mali_bool mali_dvfs_policy_enabled(void); ++static const enum base_hw_issue base_hw_issues_tHEx_r0p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_10682, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_END ++}; + -+#if defined(CONFIG_MALI400_PROFILING) -+void mali_get_current_gpu_clk_item(struct mali_gpu_clk_item *clk_item); -+#endif ++static const enum base_hw_issue base_hw_issues_model_tHEx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_7891, ++ BASE_HW_ISSUE_TMIX_8042, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_END ++}; + -+#ifdef __cplusplus -+} -+#endif ++static const enum base_hw_issue base_hw_issues_tSIx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_END ++}; + -+#endif/* __MALI_DVFS_POLICY_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_executor.c b/drivers/gpu/arm/mali400/mali/common/mali_executor.c -new file mode 100755 -index 000000000000..ee40520ed0ce ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.c -@@ -0,0 +1,2707 @@ -+/* -+ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++static const enum base_hw_issue base_hw_issues_tSIx_r0p1[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_END ++}; + -+#include "mali_executor.h" -+#include "mali_scheduler.h" -+#include "mali_kernel_common.h" -+#include "mali_kernel_core.h" -+#include "mali_osk.h" -+#include "mali_osk_list.h" -+#include "mali_pp.h" -+#include "mali_pp_job.h" -+#include "mali_group.h" -+#include "mali_pm.h" -+#include "mali_timeline.h" -+#include "mali_osk_profiling.h" -+#include "mali_session.h" -+#include "mali_osk_mali.h" ++static const enum base_hw_issue base_hw_issues_tSIx_r1p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_END ++}; + -+/*Add for voltage scan function*/ -+extern u32 mali_group_error; ++static const enum base_hw_issue base_hw_issues_model_tSIx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_END ++}; + -+/* -+ * If dma_buf with map on demand is used, we defer job deletion and job queue -+ * if in atomic context, since both might sleep. -+ */ -+#if defined(CONFIG_DMA_SHARED_BUFFER) && !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) -+#define MALI_EXECUTOR_USE_DEFERRED_PP_JOB_DELETE 1 -+#define MALI_EXECUTOR_USE_DEFERRED_PP_JOB_QUEUE 1 -+#endif /* !defined(CONFIG_DMA_SHARED_BUFFER) && !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) */ + -+/* -+ * ---------- static type definitions (structs, enums, etc) ---------- -+ */ + -+enum mali_executor_state_t { -+ EXEC_STATE_NOT_PRESENT, /* Virtual group on Mali-300/400 (do not use) */ -+ EXEC_STATE_DISABLED, /* Disabled by core scaling (do not use) */ -+ EXEC_STATE_EMPTY, /* No child groups for virtual group (do not use) */ -+ EXEC_STATE_INACTIVE, /* Can be used, but must be activate first */ -+ EXEC_STATE_IDLE, /* Active and ready to be used */ -+ EXEC_STATE_WORKING, /* Executing a job */ ++#ifdef MALI_INCLUDE_TKAX ++static const enum base_hw_issue base_hw_issues_tKAx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_END +}; + -+/* -+ * ---------- global variables (exported due to inline functions) ---------- -+ */ ++#endif /* MALI_INCLUDE_TKAX */ + -+/* Lock for this module (protecting all HW access except L2 caches) */ -+_mali_osk_spinlock_irq_t *mali_executor_lock_obj = NULL; ++#ifdef MALI_INCLUDE_TKAX ++static const enum base_hw_issue base_hw_issues_model_tKAx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_END ++}; + -+mali_bool mali_executor_hints[MALI_EXECUTOR_HINT_MAX]; ++#endif /* MALI_INCLUDE_TKAX */ + -+/* -+ * ---------- static variables ---------- -+ */ ++#ifdef MALI_INCLUDE_TTRX ++static const enum base_hw_issue base_hw_issues_tTRx_r0p0[] = { ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_END ++}; + -+/* Used to defer job scheduling */ -+static _mali_osk_wq_work_t *executor_wq_high_pri = NULL; ++#endif /* MALI_INCLUDE_TTRX */ + -+/* Store version from GP and PP (user space wants to know this) */ -+static u32 pp_version = 0; -+static u32 gp_version = 0; ++#ifdef MALI_INCLUDE_TTRX ++static const enum base_hw_issue base_hw_issues_model_tTRx[] = { ++ BASE_HW_ISSUE_5736, ++ BASE_HW_ISSUE_9435, ++ BASE_HW_ISSUE_TMIX_8133, ++ BASE_HW_ISSUE_TSIX_1116, ++ BASE_HW_ISSUE_END ++}; + -+/* List of physical PP groups which are disabled by some external source */ -+static _MALI_OSK_LIST_HEAD_STATIC_INIT(group_list_disabled); -+static u32 group_list_disabled_count = 0; ++#endif /* MALI_INCLUDE_TTRX */ + -+/* List of groups which can be used, but activate first */ -+static _MALI_OSK_LIST_HEAD_STATIC_INIT(group_list_inactive); -+static u32 group_list_inactive_count = 0; ++#endif /* _BASE_HWCONFIG_ISSUES_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_base_kernel.h b/drivers/gpu/arm/midgard/mali_base_kernel.h +new file mode 100755 +index 000000000..ea5e473ca +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_base_kernel.h +@@ -0,0 +1,1858 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+/* List of groups which are active and ready to be used */ -+static _MALI_OSK_LIST_HEAD_STATIC_INIT(group_list_idle); -+static u32 group_list_idle_count = 0; + -+/* List of groups which are executing a job */ -+static _MALI_OSK_LIST_HEAD_STATIC_INIT(group_list_working); -+static u32 group_list_working_count = 0; + -+/* Virtual group (if any) */ -+static struct mali_group *virtual_group = NULL; + -+/* Virtual group state is tracked with a state variable instead of 4 lists */ -+static enum mali_executor_state_t virtual_group_state = EXEC_STATE_NOT_PRESENT; + -+/* GP group */ -+static struct mali_group *gp_group = NULL; ++/** ++ * @file ++ * Base structures shared with the kernel. ++ */ + -+/* GP group state is tracked with a state variable instead of 4 lists */ -+static enum mali_executor_state_t gp_group_state = EXEC_STATE_NOT_PRESENT; ++#ifndef _BASE_KERNEL_H_ ++#define _BASE_KERNEL_H_ + -+static u32 gp_returned_cookie = 0; ++#ifndef __user ++#define __user ++#endif + -+/* Total number of physical PP cores present */ -+static u32 num_physical_pp_cores_total = 0; ++/* Support UK6 IOCTLS */ ++#define BASE_LEGACY_UK6_SUPPORT 1 + -+/* Number of physical cores which are enabled */ -+static u32 num_physical_pp_cores_enabled = 0; ++/* Support UK7 IOCTLS */ ++/* NB: To support UK6 we also need to support UK7 */ ++#define BASE_LEGACY_UK7_SUPPORT 1 + -+/* Enable or disable core scaling */ -+static mali_bool core_scaling_enabled = MALI_TRUE; ++/* Support UK8 IOCTLS */ ++#define BASE_LEGACY_UK8_SUPPORT 1 + -+/* Variables to allow safe pausing of the scheduler */ -+static _mali_osk_wait_queue_t *executor_working_wait_queue = NULL; -+static u32 pause_count = 0; ++/* Support UK9 IOCTLS */ ++#define BASE_LEGACY_UK9_SUPPORT 1 + -+/* PP cores haven't been enabled because of some pp cores haven't been disabled. */ -+static int core_scaling_delay_up_mask[MALI_MAX_NUMBER_OF_DOMAINS] = { 0 }; ++/* Support UK10_2 IOCTLS */ ++#define BASE_LEGACY_UK10_2_SUPPORT 1 + -+/* Variables used to implement notify pp core changes to userspace when core scaling -+ * is finished in mali_executor_complete_group() function. */ -+static _mali_osk_wq_work_t *executor_wq_notify_core_change = NULL; -+static _mali_osk_wait_queue_t *executor_notify_core_change_wait_queue = NULL; ++/* Support UK10_4 IOCTLS */ ++#define BASE_LEGACY_UK10_4_SUPPORT 1 + -+/* -+ * ---------- Forward declaration of static functions ---------- -+ */ -+static mali_bool mali_executor_is_suspended(void *data); -+static mali_bool mali_executor_is_working(void); -+static void mali_executor_disable_empty_virtual(void); -+static mali_bool mali_executor_physical_rejoin_virtual(struct mali_group *group); -+static mali_bool mali_executor_has_virtual_group(void); -+static mali_bool mali_executor_virtual_group_is_usable(void); -+static void mali_executor_schedule(void); -+static void mali_executor_wq_schedule(void *arg); -+static void mali_executor_send_gp_oom_to_user(struct mali_gp_job *job); -+static void mali_executor_complete_group(struct mali_group *group, -+ mali_bool success, -+ struct mali_gp_job **gp_job_done, -+ struct mali_pp_job **pp_job_done); -+static void mali_executor_change_state_pp_physical(struct mali_group *group, -+ _mali_osk_list_t *old_list, -+ u32 *old_count, -+ _mali_osk_list_t *new_list, -+ u32 *new_count); -+static mali_bool mali_executor_group_is_in_state(struct mali_group *group, -+ enum mali_executor_state_t state); ++typedef struct base_mem_handle { ++ struct { ++ u64 handle; ++ } basep; ++} base_mem_handle; + -+static void mali_executor_group_enable_internal(struct mali_group *group); -+static void mali_executor_group_disable_internal(struct mali_group *group); -+static void mali_executor_core_scale(unsigned int target_core_nr); -+static void mali_executor_core_scale_in_group_complete(struct mali_group *group); -+static void mali_executor_notify_core_change(u32 num_cores); -+static void mali_executor_wq_notify_core_change(void *arg); -+static void mali_executor_change_group_status_disabled(struct mali_group *group); -+static mali_bool mali_executor_deactivate_list_idle(mali_bool deactivate_idle_group); -+static void mali_executor_set_state_pp_physical(struct mali_group *group, -+ _mali_osk_list_t *new_list, -+ u32 *new_count); ++#include "mali_base_mem_priv.h" ++#include "mali_kbase_profiling_gator_api.h" ++#include "mali_midg_coherency.h" ++#include "mali_kbase_gpu_id.h" + +/* -+ * ---------- Actual implementation ---------- ++ * Dependency stuff, keep it private for now. May want to expose it if ++ * we decide to make the number of semaphores a configurable ++ * option. + */ ++#define BASE_JD_ATOM_COUNT 512 + -+_mali_osk_errcode_t mali_executor_initialize(void) -+{ -+ mali_executor_lock_obj = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_ORDERED, _MALI_OSK_LOCK_ORDER_EXECUTOR); -+ if (NULL == mali_executor_lock_obj) { -+ mali_executor_terminate(); -+ return _MALI_OSK_ERR_NOMEM; -+ } -+ -+ executor_wq_high_pri = _mali_osk_wq_create_work_high_pri(mali_executor_wq_schedule, NULL); -+ if (NULL == executor_wq_high_pri) { -+ mali_executor_terminate(); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++#define BASEP_JD_SEM_PER_WORD_LOG2 5 ++#define BASEP_JD_SEM_PER_WORD (1 << BASEP_JD_SEM_PER_WORD_LOG2) ++#define BASEP_JD_SEM_WORD_NR(x) ((x) >> BASEP_JD_SEM_PER_WORD_LOG2) ++#define BASEP_JD_SEM_MASK_IN_WORD(x) (1 << ((x) & (BASEP_JD_SEM_PER_WORD - 1))) ++#define BASEP_JD_SEM_ARRAY_SIZE BASEP_JD_SEM_WORD_NR(BASE_JD_ATOM_COUNT) + -+ executor_working_wait_queue = _mali_osk_wait_queue_init(); -+ if (NULL == executor_working_wait_queue) { -+ mali_executor_terminate(); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++/* Set/reset values for a software event */ ++#define BASE_JD_SOFT_EVENT_SET ((unsigned char)1) ++#define BASE_JD_SOFT_EVENT_RESET ((unsigned char)0) + -+ executor_wq_notify_core_change = _mali_osk_wq_create_work(mali_executor_wq_notify_core_change, NULL); -+ if (NULL == executor_wq_notify_core_change) { -+ mali_executor_terminate(); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++#define BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS 3 + -+ executor_notify_core_change_wait_queue = _mali_osk_wait_queue_init(); -+ if (NULL == executor_notify_core_change_wait_queue) { -+ mali_executor_terminate(); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++#define BASE_MAX_COHERENT_GROUPS 16 + -+ return _MALI_OSK_ERR_OK; -+} ++#if defined CDBG_ASSERT ++#define LOCAL_ASSERT CDBG_ASSERT ++#elif defined KBASE_DEBUG_ASSERT ++#define LOCAL_ASSERT KBASE_DEBUG_ASSERT ++#else ++#error assert macro not defined! ++#endif + -+void mali_executor_terminate(void) -+{ -+ if (NULL != executor_notify_core_change_wait_queue) { -+ _mali_osk_wait_queue_term(executor_notify_core_change_wait_queue); -+ executor_notify_core_change_wait_queue = NULL; -+ } ++#if defined PAGE_MASK ++#define LOCAL_PAGE_LSB ~PAGE_MASK ++#else ++#include + -+ if (NULL != executor_wq_notify_core_change) { -+ _mali_osk_wq_delete_work(executor_wq_notify_core_change); -+ executor_wq_notify_core_change = NULL; -+ } ++#if defined OSU_CONFIG_CPU_PAGE_SIZE_LOG2 ++#define LOCAL_PAGE_LSB ((1ul << OSU_CONFIG_CPU_PAGE_SIZE_LOG2) - 1) ++#else ++#error Failed to find page size ++#endif ++#endif + -+ if (NULL != executor_working_wait_queue) { -+ _mali_osk_wait_queue_term(executor_working_wait_queue); -+ executor_working_wait_queue = NULL; -+ } ++/** 32/64-bit neutral way to represent pointers */ ++typedef union kbase_pointer { ++ void __user *value; /**< client should store their pointers here */ ++ u32 compat_value; /**< 64-bit kernels should fetch value here when handling 32-bit clients */ ++ u64 sizer; /**< Force 64-bit storage for all clients regardless */ ++} kbase_pointer; + -+ if (NULL != executor_wq_high_pri) { -+ _mali_osk_wq_delete_work(executor_wq_high_pri); -+ executor_wq_high_pri = NULL; -+ } ++/** ++ * @addtogroup base_user_api User-side Base APIs ++ * @{ ++ */ + -+ if (NULL != mali_executor_lock_obj) { -+ _mali_osk_spinlock_irq_term(mali_executor_lock_obj); -+ mali_executor_lock_obj = NULL; -+ } -+} ++/** ++ * @addtogroup base_user_api_memory User-side Base Memory APIs ++ * @{ ++ */ + -+void mali_executor_populate(void) -+{ -+ u32 num_groups; -+ u32 i; ++/** ++ * typedef base_mem_alloc_flags - Memory allocation, access/hint flags. ++ * ++ * A combination of MEM_PROT/MEM_HINT flags must be passed to each allocator ++ * in order to determine the best cache policy. Some combinations are ++ * of course invalid (e.g. MEM_PROT_CPU_WR | MEM_HINT_CPU_RD), ++ * which defines a write-only region on the CPU side, which is ++ * heavily read by the CPU... ++ * Other flags are only meaningful to a particular allocator. ++ * More flags can be added to this list, as long as they don't clash ++ * (see BASE_MEM_FLAGS_NR_BITS for the number of the first free bit). ++ */ ++typedef u32 base_mem_alloc_flags; + -+ num_groups = mali_group_get_glob_num_groups(); ++/* Memory allocation, access/hint flags. ++ * ++ * See base_mem_alloc_flags. ++ */ + -+ /* Do we have a virtual group? */ -+ for (i = 0; i < num_groups; i++) { -+ struct mali_group *group = mali_group_get_glob_group(i); ++/* IN */ ++/* Read access CPU side ++ */ ++#define BASE_MEM_PROT_CPU_RD ((base_mem_alloc_flags)1 << 0) + -+ if (mali_group_is_virtual(group)) { -+ virtual_group = group; -+ virtual_group_state = EXEC_STATE_INACTIVE; -+ break; -+ } -+ } ++/* Write access CPU side ++ */ ++#define BASE_MEM_PROT_CPU_WR ((base_mem_alloc_flags)1 << 1) + -+ /* Find all the available physical GP and PP cores */ -+ for (i = 0; i < num_groups; i++) { -+ struct mali_group *group = mali_group_get_glob_group(i); ++/* Read access GPU side ++ */ ++#define BASE_MEM_PROT_GPU_RD ((base_mem_alloc_flags)1 << 2) + -+ if (NULL != group) { -+ struct mali_pp_core *pp_core = mali_group_get_pp_core(group); -+ struct mali_gp_core *gp_core = mali_group_get_gp_core(group); ++/* Write access GPU side ++ */ ++#define BASE_MEM_PROT_GPU_WR ((base_mem_alloc_flags)1 << 3) + -+ if (!mali_group_is_virtual(group)) { -+ if (NULL != pp_core) { -+ if (0 == pp_version) { -+ /* Retrieve PP version from the first available PP core */ -+ pp_version = mali_pp_core_get_version(pp_core); -+ } ++/* Execute allowed on the GPU side ++ */ ++#define BASE_MEM_PROT_GPU_EX ((base_mem_alloc_flags)1 << 4) + -+ if (NULL != virtual_group) { -+ mali_executor_lock(); -+ mali_group_add_group(virtual_group, group); -+ mali_executor_unlock(); -+ } else { -+ _mali_osk_list_add(&group->executor_list, &group_list_inactive); -+ group_list_inactive_count++; -+ } ++ /* BASE_MEM_HINT flags have been removed, but their values are reserved ++ * for backwards compatibility with older user-space drivers. The values ++ * can be re-used once support for r5p0 user-space drivers is removed, ++ * presumably in r7p0. ++ * ++ * RESERVED: (1U << 5) ++ * RESERVED: (1U << 6) ++ * RESERVED: (1U << 7) ++ * RESERVED: (1U << 8) ++ */ + -+ num_physical_pp_cores_total++; -+ } else { -+ MALI_DEBUG_ASSERT_POINTER(gp_core); ++/* Grow backing store on GPU Page Fault ++ */ ++#define BASE_MEM_GROW_ON_GPF ((base_mem_alloc_flags)1 << 9) + -+ if (0 == gp_version) { -+ /* Retrieve GP version */ -+ gp_version = mali_gp_core_get_version(gp_core); -+ } ++/* Page coherence Outer shareable, if available ++ */ ++#define BASE_MEM_COHERENT_SYSTEM ((base_mem_alloc_flags)1 << 10) + -+ gp_group = group; -+ gp_group_state = EXEC_STATE_INACTIVE; -+ } ++/* Page coherence Inner shareable ++ */ ++#define BASE_MEM_COHERENT_LOCAL ((base_mem_alloc_flags)1 << 11) + -+ } -+ } -+ } ++/* Should be cached on the CPU ++ */ ++#define BASE_MEM_CACHED_CPU ((base_mem_alloc_flags)1 << 12) + -+ num_physical_pp_cores_enabled = num_physical_pp_cores_total; -+} ++/* IN/OUT */ ++/* Must have same VA on both the GPU and the CPU ++ */ ++#define BASE_MEM_SAME_VA ((base_mem_alloc_flags)1 << 13) + -+void mali_executor_depopulate(void) -+{ -+ struct mali_group *group; -+ struct mali_group *temp; ++/* OUT */ ++/* Must call mmap to acquire a GPU address for the alloc ++ */ ++#define BASE_MEM_NEED_MMAP ((base_mem_alloc_flags)1 << 14) + -+ MALI_DEBUG_ASSERT(EXEC_STATE_WORKING != gp_group_state); ++/* IN */ ++/* Page coherence Outer shareable, required. ++ */ ++#define BASE_MEM_COHERENT_SYSTEM_REQUIRED ((base_mem_alloc_flags)1 << 15) + -+ if (NULL != gp_group) { -+ mali_group_delete(gp_group); -+ gp_group = NULL; -+ } ++/* Secure memory ++ */ ++#define BASE_MEM_SECURE ((base_mem_alloc_flags)1 << 16) + -+ MALI_DEBUG_ASSERT(EXEC_STATE_WORKING != virtual_group_state); ++/* Not needed physical memory ++ */ ++#define BASE_MEM_DONT_NEED ((base_mem_alloc_flags)1 << 17) + -+ if (NULL != virtual_group) { -+ mali_group_delete(virtual_group); -+ virtual_group = NULL; -+ } ++/* Must use shared CPU/GPU zone (SAME_VA zone) but doesn't require the ++ * addresses to be the same ++ */ ++#define BASE_MEM_IMPORT_SHARED ((base_mem_alloc_flags)1 << 18) + -+ MALI_DEBUG_ASSERT(_mali_osk_list_empty(&group_list_working)); ++/* Number of bits used as flags for base memory management ++ * ++ * Must be kept in sync with the base_mem_alloc_flags flags ++ */ ++#define BASE_MEM_FLAGS_NR_BITS 19 + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_idle, struct mali_group, executor_list) { -+ mali_group_delete(group); -+ } ++/* A mask for all output bits, excluding IN/OUT bits. ++ */ ++#define BASE_MEM_FLAGS_OUTPUT_MASK BASE_MEM_NEED_MMAP + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_inactive, struct mali_group, executor_list) { -+ mali_group_delete(group); -+ } ++/* A mask for all input bits, including IN/OUT bits. ++ */ ++#define BASE_MEM_FLAGS_INPUT_MASK \ ++ (((1 << BASE_MEM_FLAGS_NR_BITS) - 1) & ~BASE_MEM_FLAGS_OUTPUT_MASK) + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_disabled, struct mali_group, executor_list) { -+ mali_group_delete(group); -+ } -+} ++/* A mask for all the flags which are modifiable via the base_mem_set_flags ++ * interface. ++ */ ++#define BASE_MEM_FLAGS_MODIFIABLE \ ++ (BASE_MEM_DONT_NEED | BASE_MEM_COHERENT_SYSTEM | \ ++ BASE_MEM_COHERENT_LOCAL) + -+void mali_executor_suspend(void) -+{ -+ mali_executor_lock(); ++/** ++ * enum base_mem_import_type - Memory types supported by @a base_mem_import ++ * ++ * @BASE_MEM_IMPORT_TYPE_INVALID: Invalid type ++ * @BASE_MEM_IMPORT_TYPE_UMP: UMP import. Handle type is ump_secure_id. ++ * @BASE_MEM_IMPORT_TYPE_UMM: UMM import. Handle type is a file descriptor (int) ++ * @BASE_MEM_IMPORT_TYPE_USER_BUFFER: User buffer import. Handle is a ++ * base_mem_import_user_buffer ++ * ++ * Each type defines what the supported handle type is. ++ * ++ * If any new type is added here ARM must be contacted ++ * to allocate a numeric value for it. ++ * Do not just add a new type without synchronizing with ARM ++ * as future releases from ARM might include other new types ++ * which could clash with your custom types. ++ */ ++typedef enum base_mem_import_type { ++ BASE_MEM_IMPORT_TYPE_INVALID = 0, ++ BASE_MEM_IMPORT_TYPE_UMP = 1, ++ BASE_MEM_IMPORT_TYPE_UMM = 2, ++ BASE_MEM_IMPORT_TYPE_USER_BUFFER = 3 ++} base_mem_import_type; + -+ /* Increment the pause_count so that no more jobs will be scheduled */ -+ pause_count++; ++/** ++ * struct base_mem_import_user_buffer - Handle of an imported user buffer ++ * ++ * @ptr: kbase_pointer to imported user buffer ++ * @length: length of imported user buffer in bytes ++ * ++ * This structure is used to represent a handle of an imported user buffer. ++ */ + -+ mali_executor_unlock(); ++struct base_mem_import_user_buffer { ++ kbase_pointer ptr; ++ u64 length; ++}; + -+ _mali_osk_wait_queue_wait_event(executor_working_wait_queue, -+ mali_executor_is_suspended, NULL); ++/** ++ * @brief Invalid memory handle. ++ * ++ * Return value from functions returning @ref base_mem_handle on error. ++ * ++ * @warning @ref base_mem_handle_new_invalid must be used instead of this macro ++ * in C++ code or other situations where compound literals cannot be used. ++ */ ++#define BASE_MEM_INVALID_HANDLE ((base_mem_handle) { {BASEP_MEM_INVALID_HANDLE} }) + -+ /* -+ * mali_executor_complete_XX() leaves jobs in idle state. -+ * deactivate option is used when we are going to power down -+ * the entire GPU (OS suspend) and want a consistent SW vs HW -+ * state. -+ */ -+ mali_executor_lock(); ++/** ++ * @brief Special write-alloc memory handle. ++ * ++ * A special handle is used to represent a region where a special page is mapped ++ * with a write-alloc cache setup, typically used when the write result of the ++ * GPU isn't needed, but the GPU must write anyway. ++ * ++ * @warning @ref base_mem_handle_new_write_alloc must be used instead of this macro ++ * in C++ code or other situations where compound literals cannot be used. ++ */ ++#define BASE_MEM_WRITE_ALLOC_PAGES_HANDLE ((base_mem_handle) { {BASEP_MEM_WRITE_ALLOC_PAGES_HANDLE} }) + -+ mali_executor_deactivate_list_idle(MALI_TRUE); ++#define BASEP_MEM_INVALID_HANDLE (0ull << 12) ++#define BASE_MEM_MMU_DUMP_HANDLE (1ull << 12) ++#define BASE_MEM_TRACE_BUFFER_HANDLE (2ull << 12) ++#define BASE_MEM_MAP_TRACKING_HANDLE (3ull << 12) ++#define BASEP_MEM_WRITE_ALLOC_PAGES_HANDLE (4ull << 12) ++/* reserved handles ..-64< for future special handles */ ++#define BASE_MEM_COOKIE_BASE (64ul << 12) ++#define BASE_MEM_FIRST_FREE_ADDRESS ((BITS_PER_LONG << 12) + \ ++ BASE_MEM_COOKIE_BASE) + -+ /* -+ * The following steps are used to deactive all of activated -+ * (MALI_GROUP_STATE_ACTIVE) and activating (MALI_GROUP -+ * _STAET_ACTIVATION_PENDING) groups, to make sure the variable -+ * pd_mask_wanted is equal with 0. */ -+ if (MALI_GROUP_STATE_INACTIVE != mali_group_get_state(gp_group)) { -+ gp_group_state = EXEC_STATE_INACTIVE; -+ mali_group_deactivate(gp_group); -+ } ++/* Mask to detect 4GB boundary alignment */ ++#define BASE_MEM_MASK_4GB 0xfffff000UL + -+ if (mali_executor_has_virtual_group()) { -+ if (MALI_GROUP_STATE_INACTIVE -+ != mali_group_get_state(virtual_group)) { -+ virtual_group_state = EXEC_STATE_INACTIVE; -+ mali_group_deactivate(virtual_group); -+ } -+ } + -+ if (0 < group_list_inactive_count) { -+ struct mali_group *group; -+ struct mali_group *temp; ++/* Bit mask of cookies used for for memory allocation setup */ ++#define KBASE_COOKIE_MASK ~1UL /* bit 0 is reserved */ + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, -+ &group_list_inactive, -+ struct mali_group, executor_list) { -+ if (MALI_GROUP_STATE_ACTIVATION_PENDING -+ == mali_group_get_state(group)) { -+ mali_group_deactivate(group); -+ } + -+ /* -+ * On mali-450 platform, we may have physical group in the group inactive -+ * list, and its state is MALI_GROUP_STATE_ACTIVATION_PENDING, so we only -+ * deactivate it is not enough, we still also need add it back to virtual group. -+ * And now, virtual group must be in INACTIVE state, so it's safe to add -+ * physical group to virtual group at this point. -+ */ -+ if (NULL != virtual_group) { -+ _mali_osk_list_delinit(&group->executor_list); -+ group_list_inactive_count--; ++/** ++ * @brief Result codes of changing the size of the backing store allocated to a tmem region ++ */ ++typedef enum base_backing_threshold_status { ++ BASE_BACKING_THRESHOLD_OK = 0, /**< Resize successful */ ++ BASE_BACKING_THRESHOLD_ERROR_OOM = -2, /**< Increase failed due to an out-of-memory condition */ ++ BASE_BACKING_THRESHOLD_ERROR_INVALID_ARGUMENTS = -4 /**< Invalid arguments (not tmem, illegal size request, etc.) */ ++} base_backing_threshold_status; + -+ mali_group_add_group(virtual_group, group); -+ } -+ } -+ } ++/** ++ * @addtogroup base_user_api_memory_defered User-side Base Defered Memory Coherency APIs ++ * @{ ++ */ + -+ mali_executor_unlock(); -+} ++/** ++ * @brief a basic memory operation (sync-set). ++ * ++ * The content of this structure is private, and should only be used ++ * by the accessors. ++ */ ++typedef struct base_syncset { ++ struct basep_syncset basep_sset; ++} base_syncset; + -+void mali_executor_resume(void) -+{ -+ mali_executor_lock(); ++/** @} end group base_user_api_memory_defered */ + -+ /* Decrement pause_count to allow scheduling again (if it reaches 0) */ -+ pause_count--; -+ if (0 == pause_count) { -+ mali_executor_schedule(); -+ } ++/** ++ * Handle to represent imported memory object. ++ * Simple opague handle to imported memory, can't be used ++ * with anything but base_external_resource_init to bind to an atom. ++ */ ++typedef struct base_import_handle { ++ struct { ++ u64 handle; ++ } basep; ++} base_import_handle; + -+ mali_executor_unlock(); -+} ++/** @} end group base_user_api_memory */ + -+u32 mali_executor_get_num_cores_total(void) -+{ -+ return num_physical_pp_cores_total; -+} ++/** ++ * @addtogroup base_user_api_job_dispatch User-side Base Job Dispatcher APIs ++ * @{ ++ */ + -+u32 mali_executor_get_num_cores_enabled(void) -+{ -+ return num_physical_pp_cores_enabled; -+} ++typedef int platform_fence_type; ++#define INVALID_PLATFORM_FENCE ((platform_fence_type)-1) + -+struct mali_pp_core *mali_executor_get_virtual_pp(void) -+{ -+ MALI_DEBUG_ASSERT_POINTER(virtual_group); -+ MALI_DEBUG_ASSERT_POINTER(virtual_group->pp_core); -+ return virtual_group->pp_core; -+} ++/** ++ * Base stream handle. ++ * ++ * References an underlying base stream object. ++ */ ++typedef struct base_stream { ++ struct { ++ int fd; ++ } basep; ++} base_stream; + -+struct mali_group *mali_executor_get_virtual_group(void) -+{ -+ return virtual_group; -+} ++/** ++ * Base fence handle. ++ * ++ * References an underlying base fence object. ++ */ ++typedef struct base_fence { ++ struct { ++ int fd; ++ int stream_fd; ++ } basep; ++} base_fence; + -+void mali_executor_zap_all_active(struct mali_session_data *session) -+{ -+ struct mali_group *group; -+ struct mali_group *temp; -+ mali_bool ret; ++/** ++ * @brief Per-job data ++ * ++ * This structure is used to store per-job data, and is completely unused ++ * by the Base driver. It can be used to store things such as callback ++ * function pointer, data to handle job completion. It is guaranteed to be ++ * untouched by the Base driver. ++ */ ++typedef struct base_jd_udata { ++ u64 blob[2]; /**< per-job data array */ ++} base_jd_udata; + -+ mali_executor_lock(); ++/** ++ * @brief Memory aliasing info ++ * ++ * Describes a memory handle to be aliased. ++ * A subset of the handle can be chosen for aliasing, given an offset and a ++ * length. ++ * A special handle BASE_MEM_WRITE_ALLOC_PAGES_HANDLE is used to represent a ++ * region where a special page is mapped with a write-alloc cache setup, ++ * typically used when the write result of the GPU isn't needed, but the GPU ++ * must write anyway. ++ * ++ * Offset and length are specified in pages. ++ * Offset must be within the size of the handle. ++ * Offset+length must not overrun the size of the handle. ++ * ++ * @handle Handle to alias, can be BASE_MEM_WRITE_ALLOC_PAGES_HANDLE ++ * @offset Offset within the handle to start aliasing from, in pages. ++ * Not used with BASE_MEM_WRITE_ALLOC_PAGES_HANDLE. ++ * @length Length to alias, in pages. For BASE_MEM_WRITE_ALLOC_PAGES_HANDLE ++ * specifies the number of times the special page is needed. ++ */ ++struct base_mem_aliasing_info { ++ base_mem_handle handle; ++ u64 offset; ++ u64 length; ++}; + -+ /* -+ * This function is a bit complicated because -+ * mali_group_zap_session() can fail. This only happens because the -+ * group is in an unhandled page fault status. -+ * We need to make sure this page fault is handled before we return, -+ * so that we know every single outstanding MMU transactions have -+ * completed. This will allow caller to safely remove physical pages -+ * when we have returned. -+ */ ++/** ++ * struct base_jit_alloc_info - Structure which describes a JIT allocation ++ * request. ++ * @gpu_alloc_addr: The GPU virtual address to write the JIT ++ * allocated GPU virtual address to. ++ * @va_pages: The minimum number of virtual pages required. ++ * @commit_pages: The minimum number of physical pages which ++ * should back the allocation. ++ * @extent: Granularity of physical pages to grow the ++ * allocation by during a fault. ++ * @id: Unique ID provided by the caller, this is used ++ * to pair allocation and free requests. ++ * Zero is not a valid value. ++ */ ++struct base_jit_alloc_info { ++ u64 gpu_alloc_addr; ++ u64 va_pages; ++ u64 commit_pages; ++ u64 extent; ++ u8 id; ++}; + -+ MALI_DEBUG_ASSERT(NULL != gp_group); -+ ret = mali_group_zap_session(gp_group, session); -+ if (MALI_FALSE == ret) { -+ struct mali_gp_job *gp_job = NULL; ++/** ++ * @brief Job dependency type. ++ * ++ * A flags field will be inserted into the atom structure to specify whether a dependency is a data or ++ * ordering dependency (by putting it before/after 'core_req' in the structure it should be possible to add without ++ * changing the structure size). ++ * When the flag is set for a particular dependency to signal that it is an ordering only dependency then ++ * errors will not be propagated. ++ */ ++typedef u8 base_jd_dep_type; + -+ mali_executor_complete_group(gp_group, MALI_FALSE, &gp_job, NULL); + -+ MALI_DEBUG_ASSERT_POINTER(gp_job); ++#define BASE_JD_DEP_TYPE_INVALID (0) /**< Invalid dependency */ ++#define BASE_JD_DEP_TYPE_DATA (1U << 0) /**< Data dependency */ ++#define BASE_JD_DEP_TYPE_ORDER (1U << 1) /**< Order dependency */ + -+ /* GP job completed, make sure it is freed */ -+ mali_scheduler_complete_gp_job(gp_job, MALI_FALSE, -+ MALI_TRUE, MALI_TRUE); -+ } ++/** ++ * @brief Job chain hardware requirements. ++ * ++ * A job chain must specify what GPU features it needs to allow the ++ * driver to schedule the job correctly. By not specifying the ++ * correct settings can/will cause an early job termination. Multiple ++ * values can be ORed together to specify multiple requirements. ++ * Special case is ::BASE_JD_REQ_DEP, which is used to express complex ++ * dependencies, and that doesn't execute anything on the hardware. ++ */ ++typedef u32 base_jd_core_req; + -+ if (mali_executor_has_virtual_group()) { -+ ret = mali_group_zap_session(virtual_group, session); -+ if (MALI_FALSE == ret) { -+ struct mali_pp_job *pp_job = NULL; ++/* Requirements that come from the HW */ + -+ mali_executor_complete_group(virtual_group, MALI_FALSE, NULL, &pp_job); ++/** ++ * No requirement, dependency only ++ */ ++#define BASE_JD_REQ_DEP ((base_jd_core_req)0) + -+ if (NULL != pp_job) { -+ /* PP job completed, make sure it is freed */ -+ mali_scheduler_complete_pp_job(pp_job, 0, -+ MALI_FALSE, MALI_TRUE); -+ } -+ } -+ } ++/** ++ * Requires fragment shaders ++ */ ++#define BASE_JD_REQ_FS ((base_jd_core_req)1 << 0) + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_working, -+ struct mali_group, executor_list) { -+ ret = mali_group_zap_session(group, session); -+ if (MALI_FALSE == ret) { -+ ret = mali_group_zap_session(group, session); -+ if (MALI_FALSE == ret) { -+ struct mali_pp_job *pp_job = NULL; ++/** ++ * Requires compute shaders ++ * This covers any of the following Midgard Job types: ++ * - Vertex Shader Job ++ * - Geometry Shader Job ++ * - An actual Compute Shader Job ++ * ++ * Compare this with @ref BASE_JD_REQ_ONLY_COMPUTE, which specifies that the ++ * job is specifically just the "Compute Shader" job type, and not the "Vertex ++ * Shader" nor the "Geometry Shader" job type. ++ */ ++#define BASE_JD_REQ_CS ((base_jd_core_req)1 << 1) ++#define BASE_JD_REQ_T ((base_jd_core_req)1 << 2) /**< Requires tiling */ ++#define BASE_JD_REQ_CF ((base_jd_core_req)1 << 3) /**< Requires cache flushes */ ++#define BASE_JD_REQ_V ((base_jd_core_req)1 << 4) /**< Requires value writeback */ + -+ mali_executor_complete_group(group, MALI_FALSE, NULL, &pp_job); ++/* SW-only requirements - the HW does not expose these as part of the job slot capabilities */ + -+ if (NULL != pp_job) { -+ /* PP job completed, free it */ -+ mali_scheduler_complete_pp_job(pp_job, -+ 0, MALI_FALSE, -+ MALI_TRUE); -+ } -+ } -+ } -+ } ++/* Requires fragment job with AFBC encoding */ ++#define BASE_JD_REQ_FS_AFBC ((base_jd_core_req)1 << 13) + -+ mali_executor_unlock(); -+} ++/** ++ * SW-only requirement: coalesce completion events. ++ * If this bit is set then completion of this atom will not cause an event to ++ * be sent to userspace, whether successful or not; completion events will be ++ * deferred until an atom completes which does not have this bit set. ++ * ++ * This bit may not be used in combination with BASE_JD_REQ_EXTERNAL_RESOURCES. ++ */ ++#define BASE_JD_REQ_EVENT_COALESCE ((base_jd_core_req)1 << 5) + -+void mali_executor_schedule_from_mask(mali_scheduler_mask mask, mali_bool deferred_schedule) -+{ -+ if (MALI_SCHEDULER_MASK_EMPTY != mask) { -+ if (MALI_TRUE == deferred_schedule) { -+ _mali_osk_wq_schedule_work_high_pri(executor_wq_high_pri); -+ } else { -+ /* Schedule from this thread*/ -+ mali_executor_lock(); -+ mali_executor_schedule(); -+ mali_executor_unlock(); -+ } -+ } -+} -+ -+_mali_osk_errcode_t mali_executor_interrupt_gp(struct mali_group *group, -+ mali_bool in_upper_half) -+{ -+ enum mali_interrupt_result int_result; -+ mali_bool time_out = MALI_FALSE; -+ -+ MALI_DEBUG_PRINT(4, ("Executor: GP interrupt from %s in %s half\n", -+ mali_group_core_description(group), -+ in_upper_half ? "upper" : "bottom")); -+ -+ mali_executor_lock(); -+ if (!mali_group_is_working(group)) { -+ /* Not working, so nothing to do */ -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+ } ++/** ++ * SW Only requirement: the job chain requires a coherent core group. We don't ++ * mind which coherent core group is used. ++ */ ++#define BASE_JD_REQ_COHERENT_GROUP ((base_jd_core_req)1 << 6) + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(mali_group_is_working(group)); ++/** ++ * SW Only requirement: The performance counters should be enabled only when ++ * they are needed, to reduce power consumption. ++ */ + -+ if (mali_group_has_timed_out(group)) { -+ int_result = MALI_INTERRUPT_RESULT_ERROR; -+ time_out = MALI_TRUE; -+ MALI_PRINT(("Executor GP: Job %d Timeout on %s\n", -+ mali_gp_job_get_id(group->gp_running_job), -+ mali_group_core_description(group))); -+ } else { -+ int_result = mali_group_get_interrupt_result_gp(group); -+ if (MALI_INTERRUPT_RESULT_NONE == int_result) { -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ } ++#define BASE_JD_REQ_PERMON ((base_jd_core_req)1 << 7) + -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ if (MALI_INTERRUPT_RESULT_NONE == int_result) { -+ /* No interrupts signalled, so nothing to do */ -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+ } -+#else -+ MALI_DEBUG_ASSERT(MALI_INTERRUPT_RESULT_NONE != int_result); -+#endif ++/** ++ * SW Only requirement: External resources are referenced by this atom. ++ * When external resources are referenced no syncsets can be bundled with the atom ++ * but should instead be part of a NULL jobs inserted into the dependency tree. ++ * The first pre_dep object must be configured for the external resouces to use, ++ * the second pre_dep object can be used to create other dependencies. ++ * ++ * This bit may not be used in combination with BASE_JD_REQ_EVENT_COALESCE. ++ */ ++#define BASE_JD_REQ_EXTERNAL_RESOURCES ((base_jd_core_req)1 << 8) + -+ mali_group_mask_all_interrupts_gp(group); ++/** ++ * SW Only requirement: Software defined job. Jobs with this bit set will not be submitted ++ * to the hardware but will cause some action to happen within the driver ++ */ ++#define BASE_JD_REQ_SOFT_JOB ((base_jd_core_req)1 << 9) + -+ if (MALI_INTERRUPT_RESULT_SUCCESS_VS == int_result) { -+ if (mali_group_gp_is_active(group)) { -+ /* Only VS completed so far, while PLBU is still active */ ++#define BASE_JD_REQ_SOFT_DUMP_CPU_GPU_TIME (BASE_JD_REQ_SOFT_JOB | 0x1) ++#define BASE_JD_REQ_SOFT_FENCE_TRIGGER (BASE_JD_REQ_SOFT_JOB | 0x2) ++#define BASE_JD_REQ_SOFT_FENCE_WAIT (BASE_JD_REQ_SOFT_JOB | 0x3) + -+ /* Enable all but the current interrupt */ -+ mali_group_enable_interrupts_gp(group, int_result); ++/** ++ * SW Only requirement : Replay job. ++ * ++ * If the preceding job fails, the replay job will cause the jobs specified in ++ * the list of base_jd_replay_payload pointed to by the jc pointer to be ++ * replayed. ++ * ++ * A replay job will only cause jobs to be replayed up to BASEP_JD_REPLAY_LIMIT ++ * times. If a job fails more than BASEP_JD_REPLAY_LIMIT times then the replay ++ * job is failed, as well as any following dependencies. ++ * ++ * The replayed jobs will require a number of atom IDs. If there are not enough ++ * free atom IDs then the replay job will fail. ++ * ++ * If the preceding job does not fail, then the replay job is returned as ++ * completed. ++ * ++ * The replayed jobs will never be returned to userspace. The preceding failed ++ * job will be returned to userspace as failed; the status of this job should ++ * be ignored. Completion should be determined by the status of the replay soft ++ * job. ++ * ++ * In order for the jobs to be replayed, the job headers will have to be ++ * modified. The Status field will be reset to NOT_STARTED. If the Job Type ++ * field indicates a Vertex Shader Job then it will be changed to Null Job. ++ * ++ * The replayed jobs have the following assumptions : ++ * ++ * - No external resources. Any required external resources will be held by the ++ * replay atom. ++ * - Pre-dependencies are created based on job order. ++ * - Atom numbers are automatically assigned. ++ * - device_nr is set to 0. This is not relevant as ++ * BASE_JD_REQ_SPECIFIC_COHERENT_GROUP should not be set. ++ * - Priority is inherited from the replay job. ++ */ ++#define BASE_JD_REQ_SOFT_REPLAY (BASE_JD_REQ_SOFT_JOB | 0x4) ++/** ++ * SW only requirement: event wait/trigger job. ++ * ++ * - BASE_JD_REQ_SOFT_EVENT_WAIT: this job will block until the event is set. ++ * - BASE_JD_REQ_SOFT_EVENT_SET: this job sets the event, thus unblocks the ++ * other waiting jobs. It completes immediately. ++ * - BASE_JD_REQ_SOFT_EVENT_RESET: this job resets the event, making it ++ * possible for other jobs to wait upon. It completes immediately. ++ */ ++#define BASE_JD_REQ_SOFT_EVENT_WAIT (BASE_JD_REQ_SOFT_JOB | 0x5) ++#define BASE_JD_REQ_SOFT_EVENT_SET (BASE_JD_REQ_SOFT_JOB | 0x6) ++#define BASE_JD_REQ_SOFT_EVENT_RESET (BASE_JD_REQ_SOFT_JOB | 0x7) + -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_OK; -+ } -+ } else if (MALI_INTERRUPT_RESULT_SUCCESS_PLBU == int_result) { -+ if (mali_group_gp_is_active(group)) { -+ /* Only PLBU completed so far, while VS is still active */ ++#define BASE_JD_REQ_SOFT_DEBUG_COPY (BASE_JD_REQ_SOFT_JOB | 0x8) + -+ /* Enable all but the current interrupt */ -+ mali_group_enable_interrupts_gp(group, int_result); ++/** ++ * SW only requirement: Just In Time allocation ++ * ++ * This job requests a JIT allocation based on the request in the ++ * @base_jit_alloc_info structure which is passed via the jc element of ++ * the atom. ++ * ++ * It should be noted that the id entry in @base_jit_alloc_info must not ++ * be reused until it has been released via @BASE_JD_REQ_SOFT_JIT_FREE. ++ * ++ * Should this soft job fail it is expected that a @BASE_JD_REQ_SOFT_JIT_FREE ++ * soft job to free the JIT allocation is still made. ++ * ++ * The job will complete immediately. ++ */ ++#define BASE_JD_REQ_SOFT_JIT_ALLOC (BASE_JD_REQ_SOFT_JOB | 0x9) ++/** ++ * SW only requirement: Just In Time free ++ * ++ * This job requests a JIT allocation created by @BASE_JD_REQ_SOFT_JIT_ALLOC ++ * to be freed. The ID of the JIT allocation is passed via the jc element of ++ * the atom. ++ * ++ * The job will complete immediately. ++ */ ++#define BASE_JD_REQ_SOFT_JIT_FREE (BASE_JD_REQ_SOFT_JOB | 0xa) + -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_OK; -+ } -+ } else if (MALI_INTERRUPT_RESULT_OOM == int_result) { -+ struct mali_gp_job *job = mali_group_get_running_gp_job(group); ++/** ++ * SW only requirement: Map external resource ++ * ++ * This job requests external resource(s) are mapped once the dependencies ++ * of the job have been satisfied. The list of external resources are ++ * passed via the jc element of the atom which is a pointer to a ++ * @base_external_resource_list. ++ */ ++#define BASE_JD_REQ_SOFT_EXT_RES_MAP (BASE_JD_REQ_SOFT_JOB | 0xb) ++/** ++ * SW only requirement: Unmap external resource ++ * ++ * This job requests external resource(s) are unmapped once the dependencies ++ * of the job has been satisfied. The list of external resources are ++ * passed via the jc element of the atom which is a pointer to a ++ * @base_external_resource_list. ++ */ ++#define BASE_JD_REQ_SOFT_EXT_RES_UNMAP (BASE_JD_REQ_SOFT_JOB | 0xc) + -+ /* PLBU out of mem */ -+ MALI_DEBUG_PRINT(3, ("Executor: PLBU needs more heap memory\n")); ++/** ++ * HW Requirement: Requires Compute shaders (but not Vertex or Geometry Shaders) ++ * ++ * This indicates that the Job Chain contains Midgard Jobs of the 'Compute Shaders' type. ++ * ++ * In contrast to @ref BASE_JD_REQ_CS, this does \b not indicate that the Job ++ * Chain contains 'Geometry Shader' or 'Vertex Shader' jobs. ++ */ ++#define BASE_JD_REQ_ONLY_COMPUTE ((base_jd_core_req)1 << 10) + -+#if defined(CONFIG_MALI400_PROFILING) -+ /* Give group a chance to generate a SUSPEND event */ -+ mali_group_oom(group); -+#endif ++/** ++ * HW Requirement: Use the base_jd_atom::device_nr field to specify a ++ * particular core group ++ * ++ * If both @ref BASE_JD_REQ_COHERENT_GROUP and this flag are set, this flag takes priority ++ * ++ * This is only guaranteed to work for @ref BASE_JD_REQ_ONLY_COMPUTE atoms. ++ * ++ * If the core availability policy is keeping the required core group turned off, then ++ * the job will fail with a @ref BASE_JD_EVENT_PM_EVENT error code. ++ */ ++#define BASE_JD_REQ_SPECIFIC_COHERENT_GROUP ((base_jd_core_req)1 << 11) + -+ /* -+ * no need to hold interrupt raised while -+ * waiting for more memory. -+ */ -+ mali_executor_send_gp_oom_to_user(job); ++/** ++ * SW Flag: If this bit is set then the successful completion of this atom ++ * will not cause an event to be sent to userspace ++ */ ++#define BASE_JD_REQ_EVENT_ONLY_ON_FAILURE ((base_jd_core_req)1 << 12) + -+ mali_executor_unlock(); ++/** ++ * SW Flag: If this bit is set then completion of this atom will not cause an ++ * event to be sent to userspace, whether successful or not. ++ */ ++#define BASEP_JD_REQ_EVENT_NEVER ((base_jd_core_req)1 << 14) + -+ return _MALI_OSK_ERR_OK; -+ } ++/** ++ * SW Flag: Skip GPU cache clean and invalidation before starting a GPU job. ++ * ++ * If this bit is set then the GPU's cache will not be cleaned and invalidated ++ * until a GPU job starts which does not have this bit set or a job completes ++ * which does not have the @ref BASE_JD_REQ_SKIP_CACHE_END bit set. Do not use if ++ * the CPU may have written to memory addressed by the job since the last job ++ * without this bit set was submitted. ++ */ ++#define BASE_JD_REQ_SKIP_CACHE_START ((base_jd_core_req)1 << 15) + -+ /*Add for voltage scan function*/ -+ if (MALI_INTERRUPT_RESULT_ERROR == int_result) -+ mali_group_error++; ++/** ++ * SW Flag: Skip GPU cache clean and invalidation after a GPU job completes. ++ * ++ * If this bit is set then the GPU's cache will not be cleaned and invalidated ++ * until a GPU job completes which does not have this bit set or a job starts ++ * which does not have the @ref BASE_JD_REQ_SKIP_CACHE_START bti set. Do not use if ++ * the CPU may read from or partially overwrite memory addressed by the job ++ * before the next job without this bit set completes. ++ */ ++#define BASE_JD_REQ_SKIP_CACHE_END ((base_jd_core_req)1 << 16) + -+ /* We should now have a real interrupt to handle */ ++/** ++ * These requirement bits are currently unused in base_jd_core_req ++ */ ++#define BASEP_JD_REQ_RESERVED \ ++ (~(BASE_JD_REQ_ATOM_TYPE | BASE_JD_REQ_EXTERNAL_RESOURCES | \ ++ BASE_JD_REQ_EVENT_ONLY_ON_FAILURE | BASEP_JD_REQ_EVENT_NEVER | \ ++ BASE_JD_REQ_EVENT_COALESCE | \ ++ BASE_JD_REQ_COHERENT_GROUP | BASE_JD_REQ_SPECIFIC_COHERENT_GROUP | \ ++ BASE_JD_REQ_FS_AFBC | BASE_JD_REQ_PERMON | \ ++ BASE_JD_REQ_SKIP_CACHE_START | BASE_JD_REQ_SKIP_CACHE_END)) + -+ MALI_DEBUG_PRINT(4, ("Executor: Group %s completed with %s\n", -+ mali_group_core_description(group), -+ (MALI_INTERRUPT_RESULT_ERROR == int_result) ? -+ "ERROR" : "success")); ++/** ++ * Mask of all bits in base_jd_core_req that control the type of the atom. ++ * ++ * This allows dependency only atoms to have flags set ++ */ ++#define BASE_JD_REQ_ATOM_TYPE \ ++ (BASE_JD_REQ_FS | BASE_JD_REQ_CS | BASE_JD_REQ_T | BASE_JD_REQ_CF | \ ++ BASE_JD_REQ_V | BASE_JD_REQ_SOFT_JOB | BASE_JD_REQ_ONLY_COMPUTE) + -+ if (in_upper_half && MALI_INTERRUPT_RESULT_ERROR == int_result) { -+ /* Don't bother to do processing of errors in upper half */ -+ mali_executor_unlock(); ++/** ++ * Mask of all bits in base_jd_core_req that control the type of a soft job. ++ */ ++#define BASE_JD_REQ_SOFT_JOB_TYPE (BASE_JD_REQ_SOFT_JOB | 0x1f) + -+ if (MALI_FALSE == time_out) { -+ mali_group_schedule_bottom_half_gp(group); -+ } -+ } else { -+ struct mali_gp_job *job; -+ mali_bool success; ++/* ++ * Returns non-zero value if core requirements passed define a soft job or ++ * a dependency only job. ++ */ ++#define BASE_JD_REQ_SOFT_JOB_OR_DEP(core_req) \ ++ ((core_req & BASE_JD_REQ_SOFT_JOB) || \ ++ (core_req & BASE_JD_REQ_ATOM_TYPE) == BASE_JD_REQ_DEP) + -+ /* -+ if (MALI_TRUE == time_out) { -+ mali_group_dump_status(group); -+ } -+ */ ++/** ++ * @brief States to model state machine processed by kbasep_js_job_check_ref_cores(), which ++ * handles retaining cores for power management and affinity management. ++ * ++ * The state @ref KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY prevents an attack ++ * where lots of atoms could be submitted before powerup, and each has an ++ * affinity chosen that causes other atoms to have an affinity ++ * violation. Whilst the affinity was not causing violations at the time it ++ * was chosen, it could cause violations thereafter. For example, 1000 jobs ++ * could have had their affinity chosen during the powerup time, so any of ++ * those 1000 jobs could cause an affinity violation later on. ++ * ++ * The attack would otherwise occur because other atoms/contexts have to wait for: ++ * -# the currently running atoms (which are causing the violation) to ++ * finish ++ * -# and, the atoms that had their affinity chosen during powerup to ++ * finish. These are run preferentially because they don't cause a ++ * violation, but instead continue to cause the violation in others. ++ * -# or, the attacker is scheduled out (which might not happen for just 2 ++ * contexts) ++ * ++ * By re-choosing the affinity (which is designed to avoid violations at the ++ * time it's chosen), we break condition (2) of the wait, which minimizes the ++ * problem to just waiting for current jobs to finish (which can be bounded if ++ * the Job Scheduling Policy has a timer). ++ */ ++enum kbase_atom_coreref_state { ++ /** Starting state: No affinity chosen, and cores must be requested. kbase_jd_atom::affinity==0 */ ++ KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED, ++ /** Cores requested, but waiting for them to be powered. Requested cores given by kbase_jd_atom::affinity */ ++ KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES, ++ /** Cores given by kbase_jd_atom::affinity are powered, but affinity might be out-of-date, so must recheck */ ++ KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY, ++ /** Cores given by kbase_jd_atom::affinity are powered, and affinity is up-to-date, but must check for violations */ ++ KBASE_ATOM_COREREF_STATE_CHECK_AFFINITY_VIOLATIONS, ++ /** Cores are powered, kbase_jd_atom::affinity up-to-date, no affinity violations: atom can be submitted to HW */ ++ KBASE_ATOM_COREREF_STATE_READY ++}; + -+ success = (int_result != MALI_INTERRUPT_RESULT_ERROR) ? -+ MALI_TRUE : MALI_FALSE; ++/* ++ * Base Atom priority ++ * ++ * Only certain priority levels are actually implemented, as specified by the ++ * BASE_JD_PRIO_<...> definitions below. It is undefined to use a priority ++ * level that is not one of those defined below. ++ * ++ * Priority levels only affect scheduling between atoms of the same type within ++ * a base context, and only after the atoms have had dependencies resolved. ++ * Fragment atoms does not affect non-frament atoms with lower priorities, and ++ * the other way around. For example, a low priority atom that has had its ++ * dependencies resolved might run before a higher priority atom that has not ++ * had its dependencies resolved. ++ * ++ * The scheduling between base contexts/processes and between atoms from ++ * different base contexts/processes is unaffected by atom priority. ++ * ++ * The atoms are scheduled as follows with respect to their priorities: ++ * - Let atoms 'X' and 'Y' be for the same job slot who have dependencies ++ * resolved, and atom 'X' has a higher priority than atom 'Y' ++ * - If atom 'Y' is currently running on the HW, then it is interrupted to ++ * allow atom 'X' to run soon after ++ * - If instead neither atom 'Y' nor atom 'X' are running, then when choosing ++ * the next atom to run, atom 'X' will always be chosen instead of atom 'Y' ++ * - Any two atoms that have the same priority could run in any order with ++ * respect to each other. That is, there is no ordering constraint between ++ * atoms of the same priority. ++ */ ++typedef u8 base_jd_prio; + -+ mali_executor_complete_group(group, success, &job, NULL); ++/* Medium atom priority. This is a priority higher than BASE_JD_PRIO_LOW */ ++#define BASE_JD_PRIO_MEDIUM ((base_jd_prio)0) ++/* High atom priority. This is a priority higher than BASE_JD_PRIO_MEDIUM and ++ * BASE_JD_PRIO_LOW */ ++#define BASE_JD_PRIO_HIGH ((base_jd_prio)1) ++/* Low atom priority. */ ++#define BASE_JD_PRIO_LOW ((base_jd_prio)2) + -+ mali_executor_unlock(); ++/* Count of the number of priority levels. This itself is not a valid ++ * base_jd_prio setting */ ++#define BASE_JD_NR_PRIO_LEVELS 3 + -+ /* GP jobs always fully complete */ -+ MALI_DEBUG_ASSERT(NULL != job); ++enum kbase_jd_atom_state { ++ /** Atom is not used */ ++ KBASE_JD_ATOM_STATE_UNUSED, ++ /** Atom is queued in JD */ ++ KBASE_JD_ATOM_STATE_QUEUED, ++ /** Atom has been given to JS (is runnable/running) */ ++ KBASE_JD_ATOM_STATE_IN_JS, ++ /** Atom has been completed, but not yet handed back to job dispatcher ++ * for dependency resolution */ ++ KBASE_JD_ATOM_STATE_HW_COMPLETED, ++ /** Atom has been completed, but not yet handed back to userspace */ ++ KBASE_JD_ATOM_STATE_COMPLETED ++}; + -+ /* This will notify user space and close the job object */ -+ mali_scheduler_complete_gp_job(job, success, -+ MALI_TRUE, MALI_TRUE); -+ } ++typedef u16 base_atom_id; /**< Type big enough to store an atom number in */ + -+ return _MALI_OSK_ERR_OK; -+} ++struct base_dependency { ++ base_atom_id atom_id; /**< An atom number */ ++ base_jd_dep_type dependency_type; /**< Dependency type */ ++}; + -+_mali_osk_errcode_t mali_executor_interrupt_pp(struct mali_group *group, -+ mali_bool in_upper_half) -+{ -+ enum mali_interrupt_result int_result; -+ mali_bool time_out = MALI_FALSE; ++/* This structure has changed since UK 10.2 for which base_jd_core_req was a u16 value. ++ * In order to keep the size of the structure same, padding field has been adjusted ++ * accordingly and core_req field of a u32 type (to which UK 10.3 base_jd_core_req defines) ++ * is added at the end of the structure. Place in the structure previously occupied by u16 core_req ++ * is kept but renamed to compat_core_req and as such it can be used in ioctl call for job submission ++ * as long as UK 10.2 legacy is supported. Once when this support ends, this field can be left ++ * for possible future use. */ ++typedef struct base_jd_atom_v2 { ++ u64 jc; /**< job-chain GPU address */ ++ struct base_jd_udata udata; /**< user data */ ++ kbase_pointer extres_list; /**< list of external resources */ ++ u16 nr_extres; /**< nr of external resources */ ++ u16 compat_core_req; /**< core requirements which correspond to the legacy support for UK 10.2 */ ++ struct base_dependency pre_dep[2]; /**< pre-dependencies, one need to use SETTER function to assign this field, ++ this is done in order to reduce possibility of improper assigment of a dependency field */ ++ base_atom_id atom_number; /**< unique number to identify the atom */ ++ base_jd_prio prio; /**< Atom priority. Refer to @ref base_jd_prio for more details */ ++ u8 device_nr; /**< coregroup when BASE_JD_REQ_SPECIFIC_COHERENT_GROUP specified */ ++ u8 padding[1]; ++ base_jd_core_req core_req; /**< core requirements */ ++} base_jd_atom_v2; + -+ MALI_DEBUG_PRINT(4, ("Executor: PP interrupt from %s in %s half\n", -+ mali_group_core_description(group), -+ in_upper_half ? "upper" : "bottom")); ++#ifdef BASE_LEGACY_UK6_SUPPORT ++struct base_jd_atom_v2_uk6 { ++ u64 jc; /**< job-chain GPU address */ ++ struct base_jd_udata udata; /**< user data */ ++ kbase_pointer extres_list; /**< list of external resources */ ++ u16 nr_extres; /**< nr of external resources */ ++ u16 core_req; /**< core requirements */ ++ base_atom_id pre_dep[2]; /**< pre-dependencies */ ++ base_atom_id atom_number; /**< unique number to identify the atom */ ++ base_jd_prio prio; /**< priority - smaller is higher priority */ ++ u8 device_nr; /**< coregroup when BASE_JD_REQ_SPECIFIC_COHERENT_GROUP specified */ ++ u8 padding[7]; ++}; ++#endif /* BASE_LEGACY_UK6_SUPPORT */ + -+ mali_executor_lock(); ++typedef enum base_external_resource_access { ++ BASE_EXT_RES_ACCESS_SHARED, ++ BASE_EXT_RES_ACCESS_EXCLUSIVE ++} base_external_resource_access; + -+ if (!mali_group_is_working(group)) { -+ /* Not working, so nothing to do */ -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+ } ++typedef struct base_external_resource { ++ u64 ext_resource; ++} base_external_resource; + -+ if (in_upper_half) { -+ if (mali_group_is_in_virtual(group)) { -+ /* Child groups should never handle PP interrupts */ -+ MALI_DEBUG_ASSERT(!mali_group_has_timed_out(group)); -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ } -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(mali_group_is_working(group)); -+ MALI_DEBUG_ASSERT(!mali_group_is_in_virtual(group)); + -+ if (mali_group_has_timed_out(group)) { -+ int_result = MALI_INTERRUPT_RESULT_ERROR; -+ time_out = MALI_TRUE; -+ MALI_PRINT(("Executor PP: Job %d Timeout on %s\n", -+ mali_pp_job_get_id(group->pp_running_job), -+ mali_group_core_description(group))); -+ } else { -+ int_result = mali_group_get_interrupt_result_pp(group); -+ if (MALI_INTERRUPT_RESULT_NONE == int_result) { -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ } ++/** ++ * The maximum number of external resources which can be mapped/unmapped ++ * in a single request. ++ */ ++#define BASE_EXT_RES_COUNT_MAX 10 + -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ if (MALI_INTERRUPT_RESULT_NONE == int_result) { -+ /* No interrupts signalled, so nothing to do */ -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+ } else if (MALI_INTERRUPT_RESULT_SUCCESS == int_result) { -+ if (mali_group_is_virtual(group) && mali_group_pp_is_active(group)) { -+ /* Some child groups are still working, so nothing to do right now */ -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ } -+#else -+ MALI_DEBUG_ASSERT(MALI_INTERRUPT_RESULT_NONE != int_result); -+#endif ++/** ++ * struct base_external_resource_list - Structure which describes a list of ++ * external resources. ++ * @count: The number of resources. ++ * @ext_res: Array of external resources which is ++ * sized at allocation time. ++ */ ++struct base_external_resource_list { ++ u64 count; ++ struct base_external_resource ext_res[1]; ++}; + -+ /*Add voltage scan function*/ ++struct base_jd_debug_copy_buffer { ++ u64 address; ++ u64 size; ++ struct base_external_resource extres; ++}; + -+ if (MALI_INTERRUPT_RESULT_ERROR == int_result) -+ mali_group_error++; ++/** ++ * @brief Setter for a dependency structure ++ * ++ * @param[in] dep The kbase jd atom dependency to be initialized. ++ * @param id The atom_id to be assigned. ++ * @param dep_type The dep_type to be assigned. ++ * ++ */ ++static inline void base_jd_atom_dep_set(struct base_dependency *dep, ++ base_atom_id id, base_jd_dep_type dep_type) ++{ ++ LOCAL_ASSERT(dep != NULL); + -+ /* We should now have a real interrupt to handle */ ++ /* ++ * make sure we don't set not allowed combinations ++ * of atom_id/dependency_type. ++ */ ++ LOCAL_ASSERT((id == 0 && dep_type == BASE_JD_DEP_TYPE_INVALID) || ++ (id > 0 && dep_type != BASE_JD_DEP_TYPE_INVALID)); + -+ MALI_DEBUG_PRINT(4, ("Executor: Group %s completed with %s\n", -+ mali_group_core_description(group), -+ (MALI_INTERRUPT_RESULT_ERROR == int_result) ? -+ "ERROR" : "success")); ++ dep->atom_id = id; ++ dep->dependency_type = dep_type; ++} + -+ if (in_upper_half && MALI_INTERRUPT_RESULT_ERROR == int_result) { -+ /* Don't bother to do processing of errors in upper half */ -+ mali_group_mask_all_interrupts_pp(group); -+ mali_executor_unlock(); ++/** ++ * @brief Make a copy of a dependency structure ++ * ++ * @param[in,out] dep The kbase jd atom dependency to be written. ++ * @param[in] from The dependency to make a copy from. ++ * ++ */ ++static inline void base_jd_atom_dep_copy(struct base_dependency *dep, ++ const struct base_dependency *from) ++{ ++ LOCAL_ASSERT(dep != NULL); + -+ if (MALI_FALSE == time_out) { -+ mali_group_schedule_bottom_half_pp(group); -+ } -+ } else { -+ struct mali_pp_job *job = NULL; -+ mali_bool success; ++ base_jd_atom_dep_set(dep, from->atom_id, from->dependency_type); ++} + -+ if (MALI_TRUE == time_out) { -+ mali_group_dump_status(group); -+ } ++/** ++ * @brief Soft-atom fence trigger setup. ++ * ++ * Sets up an atom to be a SW-only atom signaling a fence ++ * when it reaches the run state. ++ * ++ * Using the existing base dependency system the fence can ++ * be set to trigger when a GPU job has finished. ++ * ++ * The base fence object must not be terminated until the atom ++ * has been submitted to @a base_jd_submit and @a base_jd_submit has returned. ++ * ++ * @a fence must be a valid fence set up with @a base_fence_init. ++ * Calling this function with a uninitialized fence results in undefined behavior. ++ * ++ * @param[out] atom A pre-allocated atom to configure as a fence trigger SW atom ++ * @param[in] fence The base fence object to trigger. ++ */ ++static inline void base_jd_fence_trigger_setup_v2(struct base_jd_atom_v2 *atom, struct base_fence *fence) ++{ ++ LOCAL_ASSERT(atom); ++ LOCAL_ASSERT(fence); ++ LOCAL_ASSERT(fence->basep.fd == INVALID_PLATFORM_FENCE); ++ LOCAL_ASSERT(fence->basep.stream_fd >= 0); ++ atom->jc = (uintptr_t) fence; ++ atom->core_req = BASE_JD_REQ_SOFT_FENCE_TRIGGER; ++} + -+ success = (int_result == MALI_INTERRUPT_RESULT_SUCCESS) ? -+ MALI_TRUE : MALI_FALSE; ++/** ++ * @brief Soft-atom fence wait setup. ++ * ++ * Sets up an atom to be a SW-only atom waiting on a fence. ++ * When the fence becomes triggered the atom becomes runnable ++ * and completes immediately. ++ * ++ * Using the existing base dependency system the fence can ++ * be set to block a GPU job until it has been triggered. ++ * ++ * The base fence object must not be terminated until the atom ++ * has been submitted to @a base_jd_submit and @a base_jd_submit has returned. ++ * ++ * @a fence must be a valid fence set up with @a base_fence_init or @a base_fence_import. ++ * Calling this function with a uninitialized fence results in undefined behavior. ++ * ++ * @param[out] atom A pre-allocated atom to configure as a fence wait SW atom ++ * @param[in] fence The base fence object to wait on ++ */ ++static inline void base_jd_fence_wait_setup_v2(struct base_jd_atom_v2 *atom, struct base_fence *fence) ++{ ++ LOCAL_ASSERT(atom); ++ LOCAL_ASSERT(fence); ++ LOCAL_ASSERT(fence->basep.fd >= 0); ++ atom->jc = (uintptr_t) fence; ++ atom->core_req = BASE_JD_REQ_SOFT_FENCE_WAIT; ++} + -+ mali_executor_complete_group(group, success, NULL, &job); ++/** ++ * @brief External resource info initialization. ++ * ++ * Sets up an external resource object to reference ++ * a memory allocation and the type of access requested. ++ * ++ * @param[in] res The resource object to initialize ++ * @param handle The handle to the imported memory object, must be ++ * obtained by calling @ref base_mem_as_import_handle(). ++ * @param access The type of access requested ++ */ ++static inline void base_external_resource_init(struct base_external_resource *res, struct base_import_handle handle, base_external_resource_access access) ++{ ++ u64 address; + -+ mali_executor_unlock(); ++ address = handle.basep.handle; + -+ if (NULL != job) { -+ /* Notify user space and close the job object */ -+ mali_scheduler_complete_pp_job(job, -+ num_physical_pp_cores_total, -+ MALI_TRUE, MALI_TRUE); -+ } -+ } ++ LOCAL_ASSERT(res != NULL); ++ LOCAL_ASSERT(0 == (address & LOCAL_PAGE_LSB)); ++ LOCAL_ASSERT(access == BASE_EXT_RES_ACCESS_SHARED || access == BASE_EXT_RES_ACCESS_EXCLUSIVE); + -+ return _MALI_OSK_ERR_OK; ++ res->ext_resource = address | (access & LOCAL_PAGE_LSB); +} + -+_mali_osk_errcode_t mali_executor_interrupt_mmu(struct mali_group *group, -+ mali_bool in_upper_half) -+{ -+ enum mali_interrupt_result int_result; ++/** ++ * @brief Job chain event code bits ++ * Defines the bits used to create ::base_jd_event_code ++ */ ++enum { ++ BASE_JD_SW_EVENT_KERNEL = (1u << 15), /**< Kernel side event */ ++ BASE_JD_SW_EVENT = (1u << 14), /**< SW defined event */ ++ BASE_JD_SW_EVENT_SUCCESS = (1u << 13), /**< Event idicates success (SW events only) */ ++ BASE_JD_SW_EVENT_JOB = (0u << 11), /**< Job related event */ ++ BASE_JD_SW_EVENT_BAG = (1u << 11), /**< Bag related event */ ++ BASE_JD_SW_EVENT_INFO = (2u << 11), /**< Misc/info event */ ++ BASE_JD_SW_EVENT_RESERVED = (3u << 11), /**< Reserved event type */ ++ BASE_JD_SW_EVENT_TYPE_MASK = (3u << 11) /**< Mask to extract the type from an event code */ ++}; + -+ MALI_DEBUG_PRINT(4, ("Executor: MMU interrupt from %s in %s half\n", -+ mali_group_core_description(group), -+ in_upper_half ? "upper" : "bottom")); ++/** ++ * @brief Job chain event codes ++ * ++ * HW and low-level SW events are represented by event codes. ++ * The status of jobs which succeeded are also represented by ++ * an event code (see ::BASE_JD_EVENT_DONE). ++ * Events are usually reported as part of a ::base_jd_event. ++ * ++ * The event codes are encoded in the following way: ++ * @li 10:0 - subtype ++ * @li 12:11 - type ++ * @li 13 - SW success (only valid if the SW bit is set) ++ * @li 14 - SW event (HW event if not set) ++ * @li 15 - Kernel event (should never be seen in userspace) ++ * ++ * Events are split up into ranges as follows: ++ * - BASE_JD_EVENT_RANGE_\_START ++ * - BASE_JD_EVENT_RANGE_\_END ++ * ++ * \a code is in \'s range when: ++ * - BASE_JD_EVENT_RANGE_\_START <= code < BASE_JD_EVENT_RANGE_\_END ++ * ++ * Ranges can be asserted for adjacency by testing that the END of the previous ++ * is equal to the START of the next. This is useful for optimizing some tests ++ * for range. ++ * ++ * A limitation is that the last member of this enum must explicitly be handled ++ * (with an assert-unreachable statement) in switch statements that use ++ * variables of this type. Otherwise, the compiler warns that we have not ++ * handled that enum value. ++ */ ++typedef enum base_jd_event_code { ++ /* HW defined exceptions */ + -+ mali_executor_lock(); -+ if (!mali_group_is_working(group)) { -+ /* Not working, so nothing to do */ -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ /** Start of HW Non-fault status codes ++ * ++ * @note Obscurely, BASE_JD_EVENT_TERMINATED indicates a real fault, ++ * because the job was hard-stopped ++ */ ++ BASE_JD_EVENT_RANGE_HW_NONFAULT_START = 0, + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(mali_group_is_working(group)); ++ /* non-fatal exceptions */ ++ BASE_JD_EVENT_NOT_STARTED = 0x00, /**< Can't be seen by userspace, treated as 'previous job done' */ ++ BASE_JD_EVENT_DONE = 0x01, ++ BASE_JD_EVENT_STOPPED = 0x03, /**< Can't be seen by userspace, becomes TERMINATED, DONE or JOB_CANCELLED */ ++ BASE_JD_EVENT_TERMINATED = 0x04, /**< This is actually a fault status code - the job was hard stopped */ ++ BASE_JD_EVENT_ACTIVE = 0x08, /**< Can't be seen by userspace, jobs only returned on complete/fail/cancel */ + -+ int_result = mali_group_get_interrupt_result_mmu(group); -+ if (MALI_INTERRUPT_RESULT_NONE == int_result) { -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ /** End of HW Non-fault status codes ++ * ++ * @note Obscurely, BASE_JD_EVENT_TERMINATED indicates a real fault, ++ * because the job was hard-stopped ++ */ ++ BASE_JD_EVENT_RANGE_HW_NONFAULT_END = 0x40, + -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ if (MALI_INTERRUPT_RESULT_NONE == int_result) { -+ /* No interrupts signalled, so nothing to do */ -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+ } -+#else -+ MALI_DEBUG_ASSERT(MALI_INTERRUPT_RESULT_ERROR == int_result); -+#endif ++ /** Start of HW fault and SW Error status codes */ ++ BASE_JD_EVENT_RANGE_HW_FAULT_OR_SW_ERROR_START = 0x40, + -+ /* We should now have a real interrupt to handle */ ++ /* job exceptions */ ++ BASE_JD_EVENT_JOB_CONFIG_FAULT = 0x40, ++ BASE_JD_EVENT_JOB_POWER_FAULT = 0x41, ++ BASE_JD_EVENT_JOB_READ_FAULT = 0x42, ++ BASE_JD_EVENT_JOB_WRITE_FAULT = 0x43, ++ BASE_JD_EVENT_JOB_AFFINITY_FAULT = 0x44, ++ BASE_JD_EVENT_JOB_BUS_FAULT = 0x48, ++ BASE_JD_EVENT_INSTR_INVALID_PC = 0x50, ++ BASE_JD_EVENT_INSTR_INVALID_ENC = 0x51, ++ BASE_JD_EVENT_INSTR_TYPE_MISMATCH = 0x52, ++ BASE_JD_EVENT_INSTR_OPERAND_FAULT = 0x53, ++ BASE_JD_EVENT_INSTR_TLS_FAULT = 0x54, ++ BASE_JD_EVENT_INSTR_BARRIER_FAULT = 0x55, ++ BASE_JD_EVENT_INSTR_ALIGN_FAULT = 0x56, ++ BASE_JD_EVENT_DATA_INVALID_FAULT = 0x58, ++ BASE_JD_EVENT_TILE_RANGE_FAULT = 0x59, ++ BASE_JD_EVENT_STATE_FAULT = 0x5A, ++ BASE_JD_EVENT_OUT_OF_MEMORY = 0x60, ++ BASE_JD_EVENT_UNKNOWN = 0x7F, + -+ if (in_upper_half) { -+ /* Don't bother to do processing of errors in upper half */ ++ /* GPU exceptions */ ++ BASE_JD_EVENT_DELAYED_BUS_FAULT = 0x80, ++ BASE_JD_EVENT_SHAREABILITY_FAULT = 0x88, + -+ struct mali_group *parent = group->parent_group; ++ /* MMU exceptions */ ++ BASE_JD_EVENT_TRANSLATION_FAULT_LEVEL1 = 0xC1, ++ BASE_JD_EVENT_TRANSLATION_FAULT_LEVEL2 = 0xC2, ++ BASE_JD_EVENT_TRANSLATION_FAULT_LEVEL3 = 0xC3, ++ BASE_JD_EVENT_TRANSLATION_FAULT_LEVEL4 = 0xC4, ++ BASE_JD_EVENT_PERMISSION_FAULT = 0xC8, ++ BASE_JD_EVENT_TRANSTAB_BUS_FAULT_LEVEL1 = 0xD1, ++ BASE_JD_EVENT_TRANSTAB_BUS_FAULT_LEVEL2 = 0xD2, ++ BASE_JD_EVENT_TRANSTAB_BUS_FAULT_LEVEL3 = 0xD3, ++ BASE_JD_EVENT_TRANSTAB_BUS_FAULT_LEVEL4 = 0xD4, ++ BASE_JD_EVENT_ACCESS_FLAG = 0xD8, + -+ mali_mmu_mask_all_interrupts(group->mmu); ++ /* SW defined exceptions */ ++ BASE_JD_EVENT_MEM_GROWTH_FAILED = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x000, ++ BASE_JD_EVENT_TIMED_OUT = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x001, ++ BASE_JD_EVENT_JOB_CANCELLED = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x002, ++ BASE_JD_EVENT_JOB_INVALID = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x003, ++ BASE_JD_EVENT_PM_EVENT = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x004, ++ BASE_JD_EVENT_FORCE_REPLAY = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_JOB | 0x005, + -+ mali_executor_unlock(); ++ BASE_JD_EVENT_BAG_INVALID = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_BAG | 0x003, + -+ if (NULL == parent) { -+ mali_group_schedule_bottom_half_mmu(group); -+ } else { -+ mali_group_schedule_bottom_half_mmu(parent); -+ } ++ /** End of HW fault and SW Error status codes */ ++ BASE_JD_EVENT_RANGE_HW_FAULT_OR_SW_ERROR_END = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_RESERVED | 0x3FF, + -+ } else { -+ struct mali_gp_job *gp_job = NULL; -+ struct mali_pp_job *pp_job = NULL; ++ /** Start of SW Success status codes */ ++ BASE_JD_EVENT_RANGE_SW_SUCCESS_START = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_SUCCESS | 0x000, + -+#ifdef DEBUG ++ BASE_JD_EVENT_PROGRESS_REPORT = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_SUCCESS | BASE_JD_SW_EVENT_JOB | 0x000, ++ BASE_JD_EVENT_BAG_DONE = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_SUCCESS | BASE_JD_SW_EVENT_BAG | 0x000, ++ BASE_JD_EVENT_DRV_TERMINATED = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_SUCCESS | BASE_JD_SW_EVENT_INFO | 0x000, + -+ u32 fault_address = mali_mmu_get_page_fault_addr(group->mmu); -+ u32 status = mali_mmu_get_status(group->mmu); -+ MALI_DEBUG_PRINT(2, ("Executor: Mali page fault detected at 0x%x from bus id %d of type %s on %s\n", -+ (void *)(uintptr_t)fault_address, -+ (status >> 6) & 0x1F, -+ (status & 32) ? "write" : "read", -+ group->mmu->hw_core.description)); -+ MALI_DEBUG_PRINT(3, ("Executor: MMU rawstat = 0x%08X, MMU status = 0x%08X\n", -+ mali_mmu_get_rawstat(group->mmu), status)); -+ mali_mmu_pagedir_diag(mali_session_get_page_directory(group->session), fault_address); -+#endif ++ /** End of SW Success status codes */ ++ BASE_JD_EVENT_RANGE_SW_SUCCESS_END = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_SUCCESS | BASE_JD_SW_EVENT_RESERVED | 0x3FF, + -+ mali_executor_complete_group(group, MALI_FALSE, &gp_job, &pp_job); ++ /** Start of Kernel-only status codes. Such codes are never returned to user-space */ ++ BASE_JD_EVENT_RANGE_KERNEL_ONLY_START = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_KERNEL | 0x000, ++ BASE_JD_EVENT_REMOVED_FROM_NEXT = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_KERNEL | BASE_JD_SW_EVENT_JOB | 0x000, + -+ mali_executor_unlock(); ++ /** End of Kernel-only status codes. */ ++ BASE_JD_EVENT_RANGE_KERNEL_ONLY_END = BASE_JD_SW_EVENT | BASE_JD_SW_EVENT_KERNEL | BASE_JD_SW_EVENT_RESERVED | 0x3FF ++} base_jd_event_code; + -+ if (NULL != gp_job) { -+ MALI_DEBUG_ASSERT(NULL == pp_job); ++/** ++ * @brief Event reporting structure ++ * ++ * This structure is used by the kernel driver to report information ++ * about GPU events. The can either be HW-specific events or low-level ++ * SW events, such as job-chain completion. ++ * ++ * The event code contains an event type field which can be extracted ++ * by ANDing with ::BASE_JD_SW_EVENT_TYPE_MASK. ++ * ++ * Based on the event type base_jd_event::data holds: ++ * @li ::BASE_JD_SW_EVENT_JOB : the offset in the ring-buffer for the completed ++ * job-chain ++ * @li ::BASE_JD_SW_EVENT_BAG : The address of the ::base_jd_bag that has ++ * been completed (ie all contained job-chains have been completed). ++ * @li ::BASE_JD_SW_EVENT_INFO : base_jd_event::data not used ++ */ ++typedef struct base_jd_event_v2 { ++ base_jd_event_code event_code; /**< event code */ ++ base_atom_id atom_number; /**< the atom number that has completed */ ++ struct base_jd_udata udata; /**< user data */ ++} base_jd_event_v2; + -+ /* Notify user space and close the job object */ -+ mali_scheduler_complete_gp_job(gp_job, MALI_FALSE, -+ MALI_TRUE, MALI_TRUE); -+ } else if (NULL != pp_job) { -+ MALI_DEBUG_ASSERT(NULL == gp_job); ++/** ++ * Padding required to ensure that the @ref struct base_dump_cpu_gpu_counters structure fills ++ * a full cache line. ++ */ + -+ /* Notify user space and close the job object */ -+ mali_scheduler_complete_pp_job(pp_job, -+ num_physical_pp_cores_total, -+ MALI_TRUE, MALI_TRUE); -+ } -+ } ++#define BASE_CPU_GPU_CACHE_LINE_PADDING (36) + -+ return _MALI_OSK_ERR_OK; -+} + -+void mali_executor_group_power_up(struct mali_group *groups[], u32 num_groups) -+{ -+ u32 i; -+ mali_bool child_groups_activated = MALI_FALSE; -+ mali_bool do_schedule = MALI_FALSE; -+#if defined(DEBUG) -+ u32 num_activated = 0; -+#endif ++/** ++ * @brief Structure for BASE_JD_REQ_SOFT_DUMP_CPU_GPU_COUNTERS jobs. ++ * ++ * This structure is stored into the memory pointed to by the @c jc field of @ref base_jd_atom. ++ * ++ * This structure must be padded to ensure that it will occupy whole cache lines. This is to avoid ++ * cases where access to pages containing the structure is shared between cached and un-cached ++ * memory regions, which would cause memory corruption. Here we set the structure size to be 64 bytes ++ * which is the cache line for ARM A15 processors. ++ */ + -+ MALI_DEBUG_ASSERT_POINTER(groups); -+ MALI_DEBUG_ASSERT(0 < num_groups); ++typedef struct base_dump_cpu_gpu_counters { ++ u64 system_time; ++ u64 cycle_counter; ++ u64 sec; ++ u32 usec; ++ u8 padding[BASE_CPU_GPU_CACHE_LINE_PADDING]; ++} base_dump_cpu_gpu_counters; + -+ mali_executor_lock(); + -+ MALI_DEBUG_PRINT(3, ("Executor: powering up %u groups\n", num_groups)); + -+ for (i = 0; i < num_groups; i++) { -+ MALI_DEBUG_PRINT(3, ("Executor: powering up group %s\n", -+ mali_group_core_description(groups[i]))); ++/** @} end group base_user_api_job_dispatch */ + -+ mali_group_power_up(groups[i]); ++#define GPU_MAX_JOB_SLOTS 16 + -+ if ((MALI_GROUP_STATE_ACTIVATION_PENDING != mali_group_get_state(groups[i]) || -+ (MALI_TRUE != mali_executor_group_is_in_state(groups[i], EXEC_STATE_INACTIVE)))) { -+ /* nothing more to do for this group */ -+ continue; -+ } ++/** ++ * @page page_base_user_api_gpuprops User-side Base GPU Property Query API ++ * ++ * The User-side Base GPU Property Query API encapsulates two ++ * sub-modules: ++ * ++ * - @ref base_user_api_gpuprops_dyn "Dynamic GPU Properties" ++ * - @ref base_plat_config_gpuprops "Base Platform Config GPU Properties" ++ * ++ * There is a related third module outside of Base, which is owned by the MIDG ++ * module: ++ * - @ref gpu_props_static "Midgard Compile-time GPU Properties" ++ * ++ * Base only deals with properties that vary between different Midgard ++ * implementations - the Dynamic GPU properties and the Platform Config ++ * properties. ++ * ++ * For properties that are constant for the Midgard Architecture, refer to the ++ * MIDG module. However, we will discuss their relevance here just to ++ * provide background information. ++ * ++ * @section sec_base_user_api_gpuprops_about About the GPU Properties in Base and MIDG modules ++ * ++ * The compile-time properties (Platform Config, Midgard Compile-time ++ * properties) are exposed as pre-processor macros. ++ * ++ * Complementing the compile-time properties are the Dynamic GPU ++ * Properties, which act as a conduit for the Midgard Configuration ++ * Discovery. ++ * ++ * In general, the dynamic properties are present to verify that the platform ++ * has been configured correctly with the right set of Platform Config ++ * Compile-time Properties. ++ * ++ * As a consistent guide across the entire DDK, the choice for dynamic or ++ * compile-time should consider the following, in order: ++ * -# Can the code be written so that it doesn't need to know the ++ * implementation limits at all? ++ * -# If you need the limits, get the information from the Dynamic Property ++ * lookup. This should be done once as you fetch the context, and then cached ++ * as part of the context data structure, so it's cheap to access. ++ * -# If there's a clear and arguable inefficiency in using Dynamic Properties, ++ * then use a Compile-Time Property (Platform Config, or Midgard Compile-time ++ * property). Examples of where this might be sensible follow: ++ * - Part of a critical inner-loop ++ * - Frequent re-use throughout the driver, causing significant extra load ++ * instructions or control flow that would be worthwhile optimizing out. ++ * ++ * We cannot provide an exhaustive set of examples, neither can we provide a ++ * rule for every possible situation. Use common sense, and think about: what ++ * the rest of the driver will be doing; how the compiler might represent the ++ * value if it is a compile-time constant; whether an OEM shipping multiple ++ * devices would benefit much more from a single DDK binary, instead of ++ * insignificant micro-optimizations. ++ * ++ * @section sec_base_user_api_gpuprops_dyn Dynamic GPU Properties ++ * ++ * Dynamic GPU properties are presented in two sets: ++ * -# the commonly used properties in @ref base_gpu_props, which have been ++ * unpacked from GPU register bitfields. ++ * -# The full set of raw, unprocessed properties in @ref gpu_raw_gpu_props ++ * (also a member of @ref base_gpu_props). All of these are presented in ++ * the packed form, as presented by the GPU registers themselves. ++ * ++ * @usecase The raw properties in @ref gpu_raw_gpu_props are necessary to ++ * allow a user of the Mali Tools (e.g. PAT) to determine "Why is this device ++ * behaving differently?". In this case, all information about the ++ * configuration is potentially useful, but it does not need to be processed ++ * by the driver. Instead, the raw registers can be processed by the Mali ++ * Tools software on the host PC. ++ * ++ * The properties returned extend the Midgard Configuration Discovery ++ * registers. For example, GPU clock speed is not specified in the Midgard ++ * Architecture, but is necessary for OpenCL's clGetDeviceInfo() function. ++ * ++ * The GPU properties are obtained by a call to ++ * _mali_base_get_gpu_props(). This simply returns a pointer to a const ++ * base_gpu_props structure. It is constant for the life of a base ++ * context. Multiple calls to _mali_base_get_gpu_props() to a base context ++ * return the same pointer to a constant structure. This avoids cache pollution ++ * of the common data. ++ * ++ * This pointer must not be freed, because it does not point to the start of a ++ * region allocated by the memory allocator; instead, just close the @ref ++ * base_context. ++ * ++ * ++ * @section sec_base_user_api_gpuprops_config Platform Config Compile-time Properties ++ * ++ * The Platform Config File sets up gpu properties that are specific to a ++ * certain platform. Properties that are 'Implementation Defined' in the ++ * Midgard Architecture spec are placed here. ++ * ++ * @note Reference configurations are provided for Midgard Implementations, such as ++ * the Mali-T600 family. The customer need not repeat this information, and can select one of ++ * these reference configurations. For example, VA_BITS, PA_BITS and the ++ * maximum number of samples per pixel might vary between Midgard Implementations, but ++ * \b not for platforms using the Mali-T604. This information is placed in ++ * the reference configuration files. ++ * ++ * The System Integrator creates the following structure: ++ * - platform_XYZ ++ * - platform_XYZ/plat ++ * - platform_XYZ/plat/plat_config.h ++ * ++ * They then edit plat_config.h, using the example plat_config.h files as a ++ * guide. ++ * ++ * At the very least, the customer must set @ref CONFIG_GPU_CORE_TYPE, and will ++ * receive a helpful \#error message if they do not do this correctly. This ++ * selects the Reference Configuration for the Midgard Implementation. The rationale ++ * behind this decision (against asking the customer to write \#include ++ * in their plat_config.h) is as follows: ++ * - This mechanism 'looks' like a regular config file (such as Linux's ++ * .config) ++ * - It is difficult to get wrong in a way that will produce strange build ++ * errors: ++ * - They need not know where the mali_t600.h, other_midg_gpu.h etc. files are stored - and ++ * so they won't accidentally pick another file with 'mali_t600' in its name ++ * - When the build doesn't work, the System Integrator may think the DDK is ++ * doesn't work, and attempt to fix it themselves: ++ * - For the @ref CONFIG_GPU_CORE_TYPE mechanism, the only way to get past the ++ * error is to set @ref CONFIG_GPU_CORE_TYPE, and this is what the \#error tells ++ * you. ++ * - For a \#include mechanism, checks must still be made elsewhere, which the ++ * System Integrator may try working around by setting \#defines (such as ++ * VA_BITS) themselves in their plat_config.h. In the worst case, they may ++ * set the prevention-mechanism \#define of ++ * "A_CORRECT_MIDGARD_CORE_WAS_CHOSEN". ++ * - In this case, they would believe they are on the right track, because ++ * the build progresses with their fix, but with errors elsewhere. ++ * ++ * However, there is nothing to prevent the customer using \#include to organize ++ * their own configurations files hierarchically. ++ * ++ * The mechanism for the header file processing is as follows: ++ * ++ * @dot ++ digraph plat_config_mechanism { ++ rankdir=BT ++ size="6,6" + -+ MALI_DEBUG_PRINT(3, ("Executor: activating group %s\n", -+ mali_group_core_description(groups[i]))); ++ "mali_base.h"; ++ "gpu/mali_gpu.h"; + -+#if defined(DEBUG) -+ num_activated++; -+#endif ++ node [ shape=box ]; ++ { ++ rank = same; ordering = out; + -+ if (mali_group_is_in_virtual(groups[i])) { -+ /* -+ * At least one child group of virtual group is powered on. -+ */ -+ child_groups_activated = MALI_TRUE; -+ } else if (MALI_FALSE == mali_group_is_virtual(groups[i])) { -+ /* Set gp and pp not in virtual to active. */ -+ mali_group_set_active(groups[i]); -+ } ++ "gpu/mali_gpu_props.h"; ++ "base/midg_gpus/mali_t600.h"; ++ "base/midg_gpus/other_midg_gpu.h"; ++ } ++ { rank = same; "plat/plat_config.h"; } ++ { ++ rank = same; ++ "gpu/mali_gpu.h" [ shape=box ]; ++ gpu_chooser [ label="" style="invisible" width=0 height=0 fixedsize=true ]; ++ select_gpu [ label="Mali-T600 | Other\n(select_gpu.h)" shape=polygon,sides=4,distortion=0.25 width=3.3 height=0.99 fixedsize=true ] ; ++ } ++ node [ shape=box ]; ++ { rank = same; "plat/plat_config.h"; } ++ { rank = same; "mali_base.h"; } + -+ /* Move group from inactive to idle list */ -+ if (groups[i] == gp_group) { -+ MALI_DEBUG_ASSERT(EXEC_STATE_INACTIVE == -+ gp_group_state); -+ gp_group_state = EXEC_STATE_IDLE; -+ } else if (MALI_FALSE == mali_group_is_in_virtual(groups[i]) -+ && MALI_FALSE == mali_group_is_virtual(groups[i])) { -+ MALI_DEBUG_ASSERT(MALI_TRUE == mali_executor_group_is_in_state(groups[i], -+ EXEC_STATE_INACTIVE)); ++ "mali_base.h" -> "gpu/mali_gpu.h" -> "gpu/mali_gpu_props.h"; ++ "mali_base.h" -> "plat/plat_config.h" ; ++ "mali_base.h" -> select_gpu ; + -+ mali_executor_change_state_pp_physical(groups[i], -+ &group_list_inactive, -+ &group_list_inactive_count, -+ &group_list_idle, -+ &group_list_idle_count); -+ } ++ "plat/plat_config.h" -> gpu_chooser [style="dotted,bold" dir=none weight=4] ; ++ gpu_chooser -> select_gpu [style="dotted,bold"] ; + -+ do_schedule = MALI_TRUE; -+ } ++ select_gpu -> "base/midg_gpus/mali_t600.h" ; ++ select_gpu -> "base/midg_gpus/other_midg_gpu.h" ; ++ } ++ @enddot ++ * ++ * ++ * @section sec_base_user_api_gpuprops_kernel Kernel Operation ++ * ++ * During Base Context Create time, user-side makes a single kernel call: ++ * - A call to fill user memory with GPU information structures ++ * ++ * The kernel-side will fill the provided the entire processed @ref base_gpu_props ++ * structure, because this information is required in both ++ * user and kernel side; it does not make sense to decode it twice. ++ * ++ * Coherency groups must be derived from the bitmasks, but this can be done ++ * kernel side, and just once at kernel startup: Coherency groups must already ++ * be known kernel-side, to support chains that specify a 'Only Coherent Group' ++ * SW requirement, or 'Only Coherent Group with Tiler' SW requirement. ++ * ++ * @section sec_base_user_api_gpuprops_cocalc Coherency Group calculation ++ * Creation of the coherent group data is done at device-driver startup, and so ++ * is one-time. This will most likely involve a loop with CLZ, shifting, and ++ * bit clearing on the L2_PRESENT mask, depending on whether the ++ * system is L2 Coherent. The number of shader cores is done by a ++ * population count, since faulty cores may be disabled during production, ++ * producing a non-contiguous mask. ++ * ++ * The memory requirements for this algorithm can be determined either by a u64 ++ * population count on the L2_PRESENT mask (a LUT helper already is ++ * required for the above), or simple assumption that there can be no more than ++ * 16 coherent groups, since core groups are typically 4 cores. ++ */ + -+ if (mali_executor_has_virtual_group() && -+ MALI_TRUE == child_groups_activated && -+ MALI_GROUP_STATE_ACTIVATION_PENDING == -+ mali_group_get_state(virtual_group)) { -+ /* -+ * Try to active virtual group while it may be not sucessful every time, -+ * because there is one situation that not all of child groups are powered on -+ * in one time and virtual group is in activation pending state. -+ */ -+ if (mali_group_set_active(virtual_group)) { -+ /* Move group from inactive to idle */ -+ MALI_DEBUG_ASSERT(EXEC_STATE_INACTIVE == -+ virtual_group_state); -+ virtual_group_state = EXEC_STATE_IDLE; ++/** ++ * @addtogroup base_user_api_gpuprops User-side Base GPU Property Query APIs ++ * @{ ++ */ + -+ MALI_DEBUG_PRINT(3, ("Executor: powering up %u groups completed, %u physical activated, 1 virtual activated.\n", num_groups, num_activated)); -+ } else { -+ MALI_DEBUG_PRINT(3, ("Executor: powering up %u groups completed, %u physical activated\n", num_groups, num_activated)); -+ } -+ } else { -+ MALI_DEBUG_PRINT(3, ("Executor: powering up %u groups completed, %u physical activated\n", num_groups, num_activated)); -+ } ++/** ++ * @addtogroup base_user_api_gpuprops_dyn Dynamic HW Properties ++ * @{ ++ */ + -+ if (MALI_TRUE == do_schedule) { -+ /* Trigger a schedule */ -+ mali_executor_schedule(); -+ } ++#define BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS 3 + -+ mali_executor_unlock(); -+} ++#define BASE_MAX_COHERENT_GROUPS 16 + -+void mali_executor_group_power_down(struct mali_group *groups[], -+ u32 num_groups) -+{ -+ u32 i; ++struct mali_base_gpu_core_props { ++ /** ++ * Product specific value. ++ */ ++ u32 product_id; + -+ MALI_DEBUG_ASSERT_POINTER(groups); -+ MALI_DEBUG_ASSERT(0 < num_groups); ++ /** ++ * Status of the GPU release. ++ * No defined values, but starts at 0 and increases by one for each ++ * release status (alpha, beta, EAC, etc.). ++ * 4 bit values (0-15). ++ */ ++ u16 version_status; + -+ mali_executor_lock(); ++ /** ++ * Minor release number of the GPU. "P" part of an "RnPn" release number. ++ * 8 bit values (0-255). ++ */ ++ u16 minor_revision; + -+ MALI_DEBUG_PRINT(3, ("Executor: powering down %u groups\n", num_groups)); ++ /** ++ * Major release number of the GPU. "R" part of an "RnPn" release number. ++ * 4 bit values (0-15). ++ */ ++ u16 major_revision; + -+ for (i = 0; i < num_groups; i++) { -+ /* Groups must be either disabled or inactive. while for virtual group, -+ * it maybe in empty state, because when we meet pm_runtime_suspend, -+ * virtual group could be powered off, and before we acquire mali_executor_lock, -+ * we must release mali_pm_state_lock, if there is a new physical job was queued, -+ * all of physical groups in virtual group could be pulled out, so we only can -+ * powered down an empty virtual group. Those physical groups will be powered -+ * up in following pm_runtime_resume callback function. -+ */ -+ MALI_DEBUG_ASSERT(mali_executor_group_is_in_state(groups[i], -+ EXEC_STATE_DISABLED) || -+ mali_executor_group_is_in_state(groups[i], -+ EXEC_STATE_INACTIVE) || -+ mali_executor_group_is_in_state(groups[i], -+ EXEC_STATE_EMPTY)); ++ u16 padding; + -+ MALI_DEBUG_PRINT(3, ("Executor: powering down group %s\n", -+ mali_group_core_description(groups[i]))); ++ /** ++ * This property is deprecated since it has not contained the real current ++ * value of GPU clock speed. It is kept here only for backwards compatibility. ++ * For the new ioctl interface, it is ignored and is treated as a padding ++ * to keep the structure of the same size and retain the placement of its ++ * members. ++ */ ++ u32 gpu_speed_mhz; + -+ mali_group_power_down(groups[i]); -+ } ++ /** ++ * @usecase GPU clock max/min speed is required for computing best/worst case ++ * in tasks as job scheduling ant irq_throttling. (It is not specified in the ++ * Midgard Architecture). ++ * Also, GPU clock max speed is used for OpenCL's clGetDeviceInfo() function. ++ */ ++ u32 gpu_freq_khz_max; ++ u32 gpu_freq_khz_min; + -+ MALI_DEBUG_PRINT(3, ("Executor: powering down %u groups completed\n", num_groups)); ++ /** ++ * Size of the shader program counter, in bits. ++ */ ++ u32 log2_program_counter_size; + -+ mali_executor_unlock(); -+} ++ /** ++ * TEXTURE_FEATURES_x registers, as exposed by the GPU. This is a ++ * bitpattern where a set bit indicates that the format is supported. ++ * ++ * Before using a texture format, it is recommended that the corresponding ++ * bit be checked. ++ */ ++ u32 texture_features[BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS]; + -+void mali_executor_abort_session(struct mali_session_data *session) -+{ -+ struct mali_group *group; -+ struct mali_group *tmp_group; ++ /** ++ * Theoretical maximum memory available to the GPU. It is unlikely that a ++ * client will be able to allocate all of this memory for their own ++ * purposes, but this at least provides an upper bound on the memory ++ * available to the GPU. ++ * ++ * This is required for OpenCL's clGetDeviceInfo() call when ++ * CL_DEVICE_GLOBAL_MEM_SIZE is requested, for OpenCL GPU devices. The ++ * client will not be expecting to allocate anywhere near this value. ++ */ ++ u64 gpu_available_memory_size; ++}; + -+ MALI_DEBUG_ASSERT_POINTER(session); -+ MALI_DEBUG_ASSERT(session->is_aborting); ++/** ++ * ++ * More information is possible - but associativity and bus width are not ++ * required by upper-level apis. ++ */ ++struct mali_base_gpu_l2_cache_props { ++ u8 log2_line_size; ++ u8 log2_cache_size; ++ u8 num_l2_slices; /* Number of L2C slices. 1 or higher */ ++ u8 padding[5]; ++}; + -+ MALI_DEBUG_PRINT(3, -+ ("Executor: Aborting all jobs from session 0x%08X.\n", -+ session)); ++struct mali_base_gpu_tiler_props { ++ u32 bin_size_bytes; /* Max is 4*2^15 */ ++ u32 max_active_levels; /* Max is 2^15 */ ++}; + -+ mali_executor_lock(); ++/** ++ * GPU threading system details. ++ */ ++struct mali_base_gpu_thread_props { ++ u32 max_threads; /* Max. number of threads per core */ ++ u32 max_workgroup_size; /* Max. number of threads per workgroup */ ++ u32 max_barrier_size; /* Max. number of threads that can synchronize on a simple barrier */ ++ u16 max_registers; /* Total size [1..65535] of the register file available per core. */ ++ u8 max_task_queue; /* Max. tasks [1..255] which may be sent to a core before it becomes blocked. */ ++ u8 max_thread_group_split; /* Max. allowed value [1..15] of the Thread Group Split field. */ ++ u8 impl_tech; /* 0 = Not specified, 1 = Silicon, 2 = FPGA, 3 = SW Model/Emulation */ ++ u8 padding[7]; ++}; + -+ if (mali_group_get_session(gp_group) == session) { -+ if (EXEC_STATE_WORKING == gp_group_state) { -+ struct mali_gp_job *gp_job = NULL; ++/** ++ * @brief descriptor for a coherent group ++ * ++ * \c core_mask exposes all cores in that coherent group, and \c num_cores ++ * provides a cached population-count for that mask. ++ * ++ * @note Whilst all cores are exposed in the mask, not all may be available to ++ * the application, depending on the Kernel Power policy. ++ * ++ * @note if u64s must be 8-byte aligned, then this structure has 32-bits of wastage. ++ */ ++struct mali_base_gpu_coherent_group { ++ u64 core_mask; /**< Core restriction mask required for the group */ ++ u16 num_cores; /**< Number of cores in the group */ ++ u16 padding[3]; ++}; + -+ mali_executor_complete_group(gp_group, MALI_FALSE, &gp_job, NULL); ++/** ++ * @brief Coherency group information ++ * ++ * Note that the sizes of the members could be reduced. However, the \c group ++ * member might be 8-byte aligned to ensure the u64 core_mask is 8-byte ++ * aligned, thus leading to wastage if the other members sizes were reduced. ++ * ++ * The groups are sorted by core mask. The core masks are non-repeating and do ++ * not intersect. ++ */ ++struct mali_base_gpu_coherent_group_info { ++ u32 num_groups; + -+ MALI_DEBUG_ASSERT_POINTER(gp_job); ++ /** ++ * Number of core groups (coherent or not) in the GPU. Equivalent to the number of L2 Caches. ++ * ++ * The GPU Counter dumping writes 2048 bytes per core group, regardless of ++ * whether the core groups are coherent or not. Hence this member is needed ++ * to calculate how much memory is required for dumping. ++ * ++ * @note Do not use it to work out how many valid elements are in the ++ * group[] member. Use num_groups instead. ++ */ ++ u32 num_core_groups; + -+ /* GP job completed, make sure it is freed */ -+ mali_scheduler_complete_gp_job(gp_job, MALI_FALSE, -+ MALI_FALSE, MALI_TRUE); -+ } else { -+ /* Same session, but not working, so just clear it */ -+ mali_group_clear_session(gp_group); -+ } -+ } ++ /** ++ * Coherency features of the memory, accessed by @ref gpu_mem_features ++ * methods ++ */ ++ u32 coherency; + -+ if (mali_executor_has_virtual_group()) { -+ if (EXEC_STATE_WORKING == virtual_group_state -+ && mali_group_get_session(virtual_group) == session) { -+ struct mali_pp_job *pp_job = NULL; ++ u32 padding; + -+ mali_executor_complete_group(virtual_group, MALI_FALSE, NULL, &pp_job); ++ /** ++ * Descriptors of coherent groups ++ */ ++ struct mali_base_gpu_coherent_group group[BASE_MAX_COHERENT_GROUPS]; ++}; + -+ if (NULL != pp_job) { -+ /* PP job completed, make sure it is freed */ -+ mali_scheduler_complete_pp_job(pp_job, 0, -+ MALI_FALSE, MALI_TRUE); -+ } -+ } -+ } ++/** ++ * A complete description of the GPU's Hardware Configuration Discovery ++ * registers. ++ * ++ * The information is presented inefficiently for access. For frequent access, ++ * the values should be better expressed in an unpacked form in the ++ * base_gpu_props structure. ++ * ++ * @usecase The raw properties in @ref gpu_raw_gpu_props are necessary to ++ * allow a user of the Mali Tools (e.g. PAT) to determine "Why is this device ++ * behaving differently?". In this case, all information about the ++ * configuration is potentially useful, but it does not need to be processed ++ * by the driver. Instead, the raw registers can be processed by the Mali ++ * Tools software on the host PC. ++ * ++ */ ++struct gpu_raw_gpu_props { ++ u64 shader_present; ++ u64 tiler_present; ++ u64 l2_present; ++ u64 stack_present; + -+ _MALI_OSK_LIST_FOREACHENTRY(group, tmp_group, &group_list_working, -+ struct mali_group, executor_list) { -+ if (mali_group_get_session(group) == session) { -+ struct mali_pp_job *pp_job = NULL; ++ u32 l2_features; ++ u32 suspend_size; /* API 8.2+ */ ++ u32 mem_features; ++ u32 mmu_features; + -+ mali_executor_complete_group(group, MALI_FALSE, NULL, &pp_job); ++ u32 as_present; + -+ if (NULL != pp_job) { -+ /* PP job completed, make sure it is freed */ -+ mali_scheduler_complete_pp_job(pp_job, 0, -+ MALI_FALSE, MALI_TRUE); -+ } -+ } -+ } ++ u32 js_present; ++ u32 js_features[GPU_MAX_JOB_SLOTS]; ++ u32 tiler_features; ++ u32 texture_features[3]; + -+ _MALI_OSK_LIST_FOREACHENTRY(group, tmp_group, &group_list_idle, struct mali_group, executor_list) { -+ mali_group_clear_session(group); -+ } ++ u32 gpu_id; + -+ _MALI_OSK_LIST_FOREACHENTRY(group, tmp_group, &group_list_inactive, struct mali_group, executor_list) { -+ mali_group_clear_session(group); -+ } ++ u32 thread_max_threads; ++ u32 thread_max_workgroup_size; ++ u32 thread_max_barrier_size; ++ u32 thread_features; + -+ _MALI_OSK_LIST_FOREACHENTRY(group, tmp_group, &group_list_disabled, struct mali_group, executor_list) { -+ mali_group_clear_session(group); -+ } ++ /* ++ * Note: This is the _selected_ coherency mode rather than the ++ * available modes as exposed in the coherency_features register. ++ */ ++ u32 coherency_mode; ++}; + -+ mali_executor_unlock(); -+} ++/** ++ * Return structure for _mali_base_get_gpu_props(). ++ * ++ * NOTE: the raw_props member in this data structure contains the register ++ * values from which the value of the other members are derived. The derived ++ * members exist to allow for efficient access and/or shielding the details ++ * of the layout of the registers. ++ * ++ */ ++typedef struct mali_base_gpu_props { ++ struct mali_base_gpu_core_props core_props; ++ struct mali_base_gpu_l2_cache_props l2_props; ++ u64 unused_1; /* keep for backwards compatibility */ ++ struct mali_base_gpu_tiler_props tiler_props; ++ struct mali_base_gpu_thread_props thread_props; + ++ /** This member is large, likely to be 128 bytes */ ++ struct gpu_raw_gpu_props raw_props; + -+void mali_executor_core_scaling_enable(void) -+{ -+ /* PS: Core scaling is by default enabled */ -+ core_scaling_enabled = MALI_TRUE; -+} ++ /** This must be last member of the structure */ ++ struct mali_base_gpu_coherent_group_info coherency_info; ++} base_gpu_props; + -+void mali_executor_core_scaling_disable(void) -+{ -+ core_scaling_enabled = MALI_FALSE; -+} ++/** @} end group base_user_api_gpuprops_dyn */ + -+mali_bool mali_executor_core_scaling_is_enabled(void) -+{ -+ return core_scaling_enabled; -+} ++/** @} end group base_user_api_gpuprops */ + -+void mali_executor_group_enable(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); ++/** ++ * @addtogroup base_user_api_core User-side Base core APIs ++ * @{ ++ */ + -+ mali_executor_lock(); ++/** ++ * \enum base_context_create_flags ++ * ++ * Flags to pass to ::base_context_init. ++ * Flags can be ORed together to enable multiple things. ++ * ++ * These share the same space as BASEP_CONTEXT_FLAG_*, and so must ++ * not collide with them. ++ */ ++enum base_context_create_flags { ++ /** No flags set */ ++ BASE_CONTEXT_CREATE_FLAG_NONE = 0, + -+ if ((NULL != mali_group_get_gp_core(group) || NULL != mali_group_get_pp_core(group)) -+ && (mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED))) { -+ mali_executor_group_enable_internal(group); -+ } ++ /** Base context is embedded in a cctx object (flag used for CINSTR software counter macros) */ ++ BASE_CONTEXT_CCTX_EMBEDDED = (1u << 0), + -+ mali_executor_schedule(); -+ mali_executor_unlock(); ++ /** Base context is a 'System Monitor' context for Hardware counters. ++ * ++ * One important side effect of this is that job submission is disabled. */ ++ BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED = (1u << 1) ++}; + -+ _mali_osk_wq_schedule_work(executor_wq_notify_core_change); -+} ++/** ++ * Bitpattern describing the ::base_context_create_flags that can be passed to base_context_init() ++ */ ++#define BASE_CONTEXT_CREATE_ALLOWED_FLAGS \ ++ (((u32)BASE_CONTEXT_CCTX_EMBEDDED) | \ ++ ((u32)BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED)) ++ ++/** ++ * Bitpattern describing the ::base_context_create_flags that can be passed to the kernel ++ */ ++#define BASE_CONTEXT_CREATE_KERNEL_FLAGS \ ++ ((u32)BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED) + +/* -+ * If a physical group is inactive or idle, we should disable it immediately, -+ * if group is in virtual, and virtual group is idle, disable given physical group in it. ++ * Private flags used on the base context ++ * ++ * These start at bit 31, and run down to zero. ++ * ++ * They share the same space as @ref base_context_create_flags, and so must ++ * not collide with them. + */ -+void mali_executor_group_disable(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); ++/** Private flag tracking whether job descriptor dumping is disabled */ ++#define BASEP_CONTEXT_FLAG_JOB_DUMP_DISABLED ((u32)(1 << 31)) + -+ mali_executor_lock(); ++/** @} end group base_user_api_core */ + -+ if ((NULL != mali_group_get_gp_core(group) || NULL != mali_group_get_pp_core(group)) -+ && (!mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED))) { -+ mali_executor_group_disable_internal(group); -+ } ++/** @} end group base_user_api */ + -+ mali_executor_schedule(); -+ mali_executor_unlock(); ++/** ++ * @addtogroup base_plat_config_gpuprops Base Platform Config GPU Properties ++ * @{ ++ * ++ * C Pre-processor macros are exposed here to do with Platform ++ * Config. ++ * ++ * These include: ++ * - GPU Properties that are constant on a particular Midgard Family ++ * Implementation e.g. Maximum samples per pixel on Mali-T600. ++ * - General platform config for the GPU, such as the GPU major and minor ++ * revison. ++ */ + -+ _mali_osk_wq_schedule_work(executor_wq_notify_core_change); -+} ++/** @} end group base_plat_config_gpuprops */ + -+mali_bool mali_executor_group_is_disabled(struct mali_group *group) -+{ -+ /* NB: This function is not optimized for time critical usage */ ++/** ++ * @addtogroup base_api Base APIs ++ * @{ ++ */ + -+ mali_bool ret; ++/** ++ * @brief The payload for a replay job. This must be in GPU memory. ++ */ ++typedef struct base_jd_replay_payload { ++ /** ++ * Pointer to the first entry in the base_jd_replay_jc list. These ++ * will be replayed in @b reverse order (so that extra ones can be added ++ * to the head in future soft jobs without affecting this soft job) ++ */ ++ u64 tiler_jc_list; + -+ MALI_DEBUG_ASSERT_POINTER(group); ++ /** ++ * Pointer to the fragment job chain. ++ */ ++ u64 fragment_jc; + -+ mali_executor_lock(); -+ ret = mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED); -+ mali_executor_unlock(); ++ /** ++ * Pointer to the tiler heap free FBD field to be modified. ++ */ ++ u64 tiler_heap_free; + -+ return ret; -+} ++ /** ++ * Hierarchy mask for the replayed fragment jobs. May be zero. ++ */ ++ u16 fragment_hierarchy_mask; + -+int mali_executor_set_perf_level(unsigned int target_core_nr, mali_bool override) -+{ -+ if (target_core_nr == num_physical_pp_cores_enabled) return 0; -+ if (MALI_FALSE == core_scaling_enabled && MALI_FALSE == override) return -EPERM; -+ if (target_core_nr > num_physical_pp_cores_total) return -EINVAL; -+ if (0 == target_core_nr) return -EINVAL; ++ /** ++ * Hierarchy mask for the replayed tiler jobs. May be zero. ++ */ ++ u16 tiler_hierarchy_mask; + -+ mali_executor_core_scale(target_core_nr); ++ /** ++ * Default weight to be used for hierarchy levels not in the original ++ * mask. ++ */ ++ u32 hierarchy_default_weight; + -+ _mali_osk_wq_schedule_work(executor_wq_notify_core_change); ++ /** ++ * Core requirements for the tiler job chain ++ */ ++ base_jd_core_req tiler_core_req; + -+ return 0; -+} ++ /** ++ * Core requirements for the fragment job chain ++ */ ++ base_jd_core_req fragment_core_req; ++} base_jd_replay_payload; + -+#if MALI_STATE_TRACKING -+u32 mali_executor_dump_state(char *buf, u32 size) -+{ -+ int n = 0; -+ struct mali_group *group; -+ struct mali_group *temp; ++#ifdef BASE_LEGACY_UK10_2_SUPPORT ++typedef struct base_jd_replay_payload_uk10_2 { ++ u64 tiler_jc_list; ++ u64 fragment_jc; ++ u64 tiler_heap_free; ++ u16 fragment_hierarchy_mask; ++ u16 tiler_hierarchy_mask; ++ u32 hierarchy_default_weight; ++ u16 tiler_core_req; ++ u16 fragment_core_req; ++ u8 padding[4]; ++} base_jd_replay_payload_uk10_2; ++#endif /* BASE_LEGACY_UK10_2_SUPPORT */ + -+ mali_executor_lock(); ++/** ++ * @brief An entry in the linked list of job chains to be replayed. This must ++ * be in GPU memory. ++ */ ++typedef struct base_jd_replay_jc { ++ /** ++ * Pointer to next entry in the list. A setting of NULL indicates the ++ * end of the list. ++ */ ++ u64 next; + -+ switch (gp_group_state) { -+ case EXEC_STATE_INACTIVE: -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "GP group is in state INACTIVE\n"); -+ break; -+ case EXEC_STATE_IDLE: -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "GP group is in state IDLE\n"); -+ break; -+ case EXEC_STATE_WORKING: -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "GP group is in state WORKING\n"); -+ break; -+ default: -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "GP group is in unknown/illegal state %u\n", -+ gp_group_state); -+ break; -+ } ++ /** ++ * Pointer to the job chain. ++ */ ++ u64 jc; + -+ n += mali_group_dump_state(gp_group, buf + n, size - n); ++} base_jd_replay_jc; + -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "Physical PP groups in WORKING state (count = %u):\n", -+ group_list_working_count); ++/* Maximum number of jobs allowed in a fragment chain in the payload of a ++ * replay job */ ++#define BASE_JD_REPLAY_F_CHAIN_JOB_LIMIT 256 + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_working, struct mali_group, executor_list) { -+ n += mali_group_dump_state(group, buf + n, size - n); -+ } ++/** @} end group base_api */ + -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "Physical PP groups in IDLE state (count = %u):\n", -+ group_list_idle_count); ++typedef struct base_profiling_controls { ++ u32 profiling_controls[FBDUMP_CONTROL_MAX]; ++} base_profiling_controls; + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_idle, struct mali_group, executor_list) { -+ n += mali_group_dump_state(group, buf + n, size - n); -+ } ++/* Enable additional tracepoints for latency measurements (TL_ATOM_READY, ++ * TL_ATOM_DONE, TL_ATOM_PRIO_CHANGE, TL_ATOM_EVENT_POST) */ ++#define BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS (1 << 0) + -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "Physical PP groups in INACTIVE state (count = %u):\n", -+ group_list_inactive_count); ++/* Indicate that job dumping is enabled. This could affect certain timers ++ * to account for the performance impact. */ ++#define BASE_TLSTREAM_JOB_DUMPING_ENABLED (1 << 1) + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_inactive, struct mali_group, executor_list) { -+ n += mali_group_dump_state(group, buf + n, size - n); -+ } ++#define BASE_TLSTREAM_FLAGS_MASK (BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS | \ ++ BASE_TLSTREAM_JOB_DUMPING_ENABLED) + -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "Physical PP groups in DISABLED state (count = %u):\n", -+ group_list_disabled_count); ++#endif /* _BASE_KERNEL_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_base_mem_priv.h b/drivers/gpu/arm/midgard/mali_base_mem_priv.h +new file mode 100755 +index 000000000..4a98a72cc +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_base_mem_priv.h +@@ -0,0 +1,52 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_disabled, struct mali_group, executor_list) { -+ n += mali_group_dump_state(group, buf + n, size - n); -+ } + -+ if (mali_executor_has_virtual_group()) { -+ switch (virtual_group_state) { -+ case EXEC_STATE_EMPTY: -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "Virtual PP group is in state EMPTY\n"); -+ break; -+ case EXEC_STATE_INACTIVE: -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "Virtual PP group is in state INACTIVE\n"); -+ break; -+ case EXEC_STATE_IDLE: -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "Virtual PP group is in state IDLE\n"); -+ break; -+ case EXEC_STATE_WORKING: -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "Virtual PP group is in state WORKING\n"); -+ break; -+ default: -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "Virtual PP group is in unknown/illegal state %u\n", -+ virtual_group_state); -+ break; -+ } + -+ n += mali_group_dump_state(virtual_group, buf + n, size - n); -+ } + -+ mali_executor_unlock(); + -+ n += _mali_osk_snprintf(buf + n, size - n, "\n"); ++#ifndef _BASE_MEM_PRIV_H_ ++#define _BASE_MEM_PRIV_H_ + -+ return n; -+} -+#endif ++#define BASE_SYNCSET_OP_MSYNC (1U << 0) ++#define BASE_SYNCSET_OP_CSYNC (1U << 1) + -+_mali_osk_errcode_t _mali_ukk_get_pp_number_of_cores(_mali_uk_get_pp_number_of_cores_s *args) -+{ -+ MALI_DEBUG_ASSERT_POINTER(args); -+ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); -+ args->number_of_total_cores = num_physical_pp_cores_total; -+ args->number_of_enabled_cores = num_physical_pp_cores_enabled; -+ return _MALI_OSK_ERR_OK; -+} ++/* ++ * This structure describe a basic memory coherency operation. ++ * It can either be: ++ * @li a sync from CPU to Memory: ++ * - type = ::BASE_SYNCSET_OP_MSYNC ++ * - mem_handle = a handle to the memory object on which the operation ++ * is taking place ++ * - user_addr = the address of the range to be synced ++ * - size = the amount of data to be synced, in bytes ++ * - offset is ignored. ++ * @li a sync from Memory to CPU: ++ * - type = ::BASE_SYNCSET_OP_CSYNC ++ * - mem_handle = a handle to the memory object on which the operation ++ * is taking place ++ * - user_addr = the address of the range to be synced ++ * - size = the amount of data to be synced, in bytes. ++ * - offset is ignored. ++ */ ++struct basep_syncset { ++ base_mem_handle mem_handle; ++ u64 user_addr; ++ u64 size; ++ u8 type; ++ u8 padding[7]; ++}; + -+_mali_osk_errcode_t _mali_ukk_get_pp_core_version(_mali_uk_get_pp_core_version_s *args) -+{ -+ MALI_DEBUG_ASSERT_POINTER(args); -+ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); -+ args->version = pp_version; -+ return _MALI_OSK_ERR_OK; -+} ++#endif +diff --git a/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h b/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h +new file mode 100755 +index 000000000..be454a216 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h +@@ -0,0 +1,24 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010, 2012-2013, 2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+_mali_osk_errcode_t _mali_ukk_get_gp_number_of_cores(_mali_uk_get_gp_number_of_cores_s *args) -+{ -+ MALI_DEBUG_ASSERT_POINTER(args); -+ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); -+ args->number_of_cores = 1; -+ return _MALI_OSK_ERR_OK; -+} + -+_mali_osk_errcode_t _mali_ukk_get_gp_core_version(_mali_uk_get_gp_core_version_s *args) -+{ -+ MALI_DEBUG_ASSERT_POINTER(args); -+ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); -+ args->version = gp_version; -+ return _MALI_OSK_ERR_OK; -+} + -+_mali_osk_errcode_t _mali_ukk_gp_suspend_response(_mali_uk_gp_suspend_response_s *args) -+{ -+ struct mali_session_data *session; -+ struct mali_gp_job *job; + -+ MALI_DEBUG_ASSERT_POINTER(args); -+ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); ++#ifndef _BASE_VENDOR_SPEC_FUNC_H_ ++#define _BASE_VENDOR_SPEC_FUNC_H_ + -+ session = (struct mali_session_data *)(uintptr_t)args->ctx; ++int kbase_get_vendor_specific_cpu_clock_speed(u32 * const); + -+ if (_MALIGP_JOB_RESUME_WITH_NEW_HEAP == args->code) { -+ _mali_osk_notification_t *new_notification = NULL; ++#endif /*_BASE_VENDOR_SPEC_FUNC_H_*/ +diff --git a/drivers/gpu/arm/midgard/mali_kbase.h b/drivers/gpu/arm/midgard/mali_kbase.h +new file mode 100755 +index 000000000..0d9bf23dc +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase.h +@@ -0,0 +1,612 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ new_notification = _mali_osk_notification_create( -+ _MALI_NOTIFICATION_GP_STALLED, -+ sizeof(_mali_uk_gp_job_suspended_s)); + -+ if (NULL != new_notification) { -+ MALI_DEBUG_PRINT(3, ("Executor: Resuming job %u with new heap; 0x%08X - 0x%08X\n", -+ args->cookie, args->arguments[0], args->arguments[1])); + -+ mali_executor_lock(); + -+ /* Resume the job in question if it is still running */ -+ job = mali_group_get_running_gp_job(gp_group); -+ if (NULL != job && -+ args->cookie == mali_gp_job_get_id(job) && -+ session == mali_gp_job_get_session(job)) { -+ /* -+ * Correct job is running, resume with new heap -+ */ + -+ mali_gp_job_set_oom_notification(job, -+ new_notification); ++#ifndef _KBASE_H_ ++#define _KBASE_H_ + -+ /* This will also re-enable interrupts */ -+ mali_group_resume_gp_with_new_heap(gp_group, -+ args->cookie, -+ args->arguments[0], -+ args->arguments[1]); ++#include + -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_OK; -+ } else { -+ MALI_DEBUG_PRINT(2, ("Executor: Unable to resume gp job becasue gp time out or any other unexpected reason!\n")); ++#include + -+ _mali_osk_notification_delete(new_notification); ++#include + -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ } else { -+ MALI_PRINT_ERROR(("Executor: Failed to allocate notification object. Will abort GP job.\n")); -+ } -+ } else { -+ MALI_DEBUG_PRINT(2, ("Executor: Aborting job %u, no new heap provided\n", args->cookie)); -+ } ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+ mali_executor_lock(); ++#include "mali_base_kernel.h" ++#include ++#include + -+ /* Abort the job in question if it is still running */ -+ job = mali_group_get_running_gp_job(gp_group); -+ if (NULL != job && -+ args->cookie == mali_gp_job_get_id(job) && -+ session == mali_gp_job_get_session(job)) { -+ /* Correct job is still running */ -+ struct mali_gp_job *job_done = NULL; ++/* ++ * Include mali_kbase_defs.h first as this provides types needed by other local ++ * header files. ++ */ ++#include "mali_kbase_defs.h" + -+ mali_executor_complete_group(gp_group, MALI_FALSE, &job_done, NULL); ++#include "mali_kbase_context.h" ++#include "mali_kbase_strings.h" ++#include "mali_kbase_mem_lowlevel.h" ++#include "mali_kbase_trace_timeline.h" ++#include "mali_kbase_js.h" ++#include "mali_kbase_mem.h" ++#include "mali_kbase_utility.h" ++#include "mali_kbase_gpu_memory_debugfs.h" ++#include "mali_kbase_mem_profile_debugfs.h" ++#include "mali_kbase_debug_job_fault.h" ++#include "mali_kbase_jd_debugfs.h" ++#include "mali_kbase_gpuprops.h" ++#include "mali_kbase_jm.h" ++#include "mali_kbase_vinstr.h" + -+ /* The same job should have completed */ -+ MALI_DEBUG_ASSERT(job_done == job); ++#include "ipa/mali_kbase_ipa.h" + -+ /* GP job completed, make sure it is freed */ -+ mali_scheduler_complete_gp_job(job_done, MALI_FALSE, -+ MALI_TRUE, MALI_TRUE); -+ } ++#ifdef CONFIG_GPU_TRACEPOINTS ++#include ++#endif ++/** ++ * @page page_base_kernel_main Kernel-side Base (KBase) APIs ++ */ + -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+} ++/** ++ * @defgroup base_kbase_api Kernel-side Base (KBase) APIs ++ */ + ++struct kbase_device *kbase_device_alloc(void); ++/* ++* note: configuration attributes member of kbdev needs to have ++* been setup before calling kbase_device_init ++*/ + +/* -+ * ---------- Implementation of static functions ---------- -+ */ ++* API to acquire device list semaphore and return pointer ++* to the device list head ++*/ ++const struct list_head *kbase_dev_list_get(void); ++/* API to release the device list semaphore */ ++void kbase_dev_list_put(const struct list_head *dev_list); + -+void mali_executor_lock(void) -+{ -+ _mali_osk_spinlock_irq_lock(mali_executor_lock_obj); -+ MALI_DEBUG_PRINT(5, ("Executor: lock taken\n")); -+} ++int kbase_device_init(struct kbase_device * const kbdev); ++void kbase_device_term(struct kbase_device *kbdev); ++void kbase_device_free(struct kbase_device *kbdev); ++int kbase_device_has_feature(struct kbase_device *kbdev, u32 feature); + -+void mali_executor_unlock(void) -+{ -+ MALI_DEBUG_PRINT(5, ("Executor: Releasing lock\n")); -+ _mali_osk_spinlock_irq_unlock(mali_executor_lock_obj); -+} ++/* Needed for gator integration and for reporting vsync information */ ++struct kbase_device *kbase_find_device(int minor); ++void kbase_release_device(struct kbase_device *kbdev); + -+static mali_bool mali_executor_is_suspended(void *data) -+{ -+ mali_bool ret; -+ -+ /* This callback does not use the data pointer. */ -+ MALI_IGNORE(data); ++void kbase_set_profiling_control(struct kbase_device *kbdev, u32 control, u32 value); + -+ mali_executor_lock(); ++struct kbase_context * ++kbase_create_context(struct kbase_device *kbdev, bool is_compat); ++void kbase_destroy_context(struct kbase_context *kctx); + -+ ret = pause_count > 0 && !mali_executor_is_working(); ++int kbase_jd_init(struct kbase_context *kctx); ++void kbase_jd_exit(struct kbase_context *kctx); + -+ mali_executor_unlock(); ++/** ++ * kbase_jd_submit - Submit atoms to the job dispatcher ++ * ++ * @kctx: The kbase context to submit to ++ * @user_addr: The address in user space of the struct base_jd_atom_v2 array ++ * @nr_atoms: The number of atoms in the array ++ * @stride: sizeof(struct base_jd_atom_v2) ++ * @uk6_atom: true if the atoms are legacy atoms (struct base_jd_atom_v2_uk6) ++ * ++ * Return: 0 on success or error code ++ */ ++int kbase_jd_submit(struct kbase_context *kctx, ++ void __user *user_addr, u32 nr_atoms, u32 stride, ++ bool uk6_atom); + -+ return ret; -+} ++/** ++ * kbase_jd_done_worker - Handle a job completion ++ * @data: a &struct work_struct ++ * ++ * This function requeues the job from the runpool (if it was soft-stopped or ++ * removed from NEXT registers). ++ * ++ * Removes it from the system if it finished/failed/was cancelled. ++ * ++ * Resolves dependencies to add dependent jobs to the context, potentially ++ * starting them if necessary (which may add more references to the context) ++ * ++ * Releases the reference to the context from the no-longer-running job. ++ * ++ * Handles retrying submission outside of IRQ context if it failed from within ++ * IRQ context. ++ */ ++void kbase_jd_done_worker(struct work_struct *data); + -+static mali_bool mali_executor_is_working() -+{ -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++void kbase_jd_done(struct kbase_jd_atom *katom, int slot_nr, ktime_t *end_timestamp, ++ kbasep_js_atom_done_code done_code); ++void kbase_jd_cancel(struct kbase_device *kbdev, struct kbase_jd_atom *katom); ++void kbase_jd_zap_context(struct kbase_context *kctx); ++bool jd_done_nolock(struct kbase_jd_atom *katom, ++ struct list_head *completed_jobs_ctx); ++void kbase_jd_free_external_resources(struct kbase_jd_atom *katom); ++bool jd_submit_atom(struct kbase_context *kctx, ++ const struct base_jd_atom_v2 *user_atom, ++ struct kbase_jd_atom *katom); ++void kbase_jd_dep_clear_locked(struct kbase_jd_atom *katom); + -+ return (0 != group_list_working_count || -+ EXEC_STATE_WORKING == gp_group_state || -+ EXEC_STATE_WORKING == virtual_group_state); -+} ++void kbase_job_done(struct kbase_device *kbdev, u32 done); + -+static void mali_executor_disable_empty_virtual(void) -+{ -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(virtual_group_state != EXEC_STATE_EMPTY); -+ MALI_DEBUG_ASSERT(virtual_group_state != EXEC_STATE_WORKING); ++/** ++ * kbase_job_slot_ctx_priority_check_locked(): - Check for lower priority atoms ++ * and soft stop them ++ * @kctx: Pointer to context to check. ++ * @katom: Pointer to priority atom. ++ * ++ * Atoms from @kctx on the same job slot as @katom, which have lower priority ++ * than @katom will be soft stopped and put back in the queue, so that atoms ++ * with higher priority can run. ++ * ++ * The hwaccess_lock must be held when calling this function. ++ */ ++void kbase_job_slot_ctx_priority_check_locked(struct kbase_context *kctx, ++ struct kbase_jd_atom *katom); + -+ if (mali_group_is_empty(virtual_group)) { -+ virtual_group_state = EXEC_STATE_EMPTY; -+ } -+} ++void kbase_job_slot_softstop(struct kbase_device *kbdev, int js, ++ struct kbase_jd_atom *target_katom); ++void kbase_job_slot_softstop_swflags(struct kbase_device *kbdev, int js, ++ struct kbase_jd_atom *target_katom, u32 sw_flags); ++void kbase_job_slot_hardstop(struct kbase_context *kctx, int js, ++ struct kbase_jd_atom *target_katom); ++void kbase_job_check_enter_disjoint(struct kbase_device *kbdev, u32 action, ++ base_jd_core_req core_reqs, struct kbase_jd_atom *target_katom); ++void kbase_job_check_leave_disjoint(struct kbase_device *kbdev, ++ struct kbase_jd_atom *target_katom); + -+static mali_bool mali_executor_physical_rejoin_virtual(struct mali_group *group) -+{ -+ mali_bool trigger_pm_update = MALI_FALSE; ++void kbase_event_post(struct kbase_context *ctx, struct kbase_jd_atom *event); ++int kbase_event_dequeue(struct kbase_context *ctx, struct base_jd_event_v2 *uevent); ++int kbase_event_pending(struct kbase_context *ctx); ++int kbase_event_init(struct kbase_context *kctx); ++void kbase_event_close(struct kbase_context *kctx); ++void kbase_event_cleanup(struct kbase_context *kctx); ++void kbase_event_wakeup(struct kbase_context *kctx); + -+ MALI_DEBUG_ASSERT_POINTER(group); -+ /* Only rejoining after job has completed (still active) */ -+ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_ACTIVE == -+ mali_group_get_state(group)); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(MALI_TRUE == mali_executor_has_virtual_group()); -+ MALI_DEBUG_ASSERT(MALI_FALSE == mali_group_is_virtual(group)); ++int kbase_process_soft_job(struct kbase_jd_atom *katom); ++int kbase_prepare_soft_job(struct kbase_jd_atom *katom); ++void kbase_finish_soft_job(struct kbase_jd_atom *katom); ++void kbase_cancel_soft_job(struct kbase_jd_atom *katom); ++void kbase_resume_suspended_soft_jobs(struct kbase_device *kbdev); ++void kbasep_remove_waiting_soft_job(struct kbase_jd_atom *katom); ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++void kbase_soft_event_wait_callback(struct kbase_jd_atom *katom); ++#endif ++int kbase_soft_event_update(struct kbase_context *kctx, ++ u64 event, ++ unsigned char new_status); + -+ /* Make sure group and virtual group have same status */ ++bool kbase_replay_process(struct kbase_jd_atom *katom); + -+ if (MALI_GROUP_STATE_INACTIVE == mali_group_get_state(virtual_group)) { -+ if (mali_group_deactivate(group)) { -+ trigger_pm_update = MALI_TRUE; -+ } ++void kbasep_soft_job_timeout_worker(struct timer_list *t); ++void kbasep_complete_triggered_soft_events(struct kbase_context *kctx, u64 evt); + -+ if (virtual_group_state == EXEC_STATE_EMPTY) { -+ virtual_group_state = EXEC_STATE_INACTIVE; -+ } -+ } else if (MALI_GROUP_STATE_ACTIVATION_PENDING == -+ mali_group_get_state(virtual_group)) { -+ /* -+ * Activation is pending for virtual group, leave -+ * this child group as active. -+ */ -+ if (virtual_group_state == EXEC_STATE_EMPTY) { -+ virtual_group_state = EXEC_STATE_INACTIVE; -+ } -+ } else { -+ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_ACTIVE == -+ mali_group_get_state(virtual_group)); ++/* api used internally for register access. Contains validation and tracing */ ++void kbase_device_trace_register_access(struct kbase_context *kctx, enum kbase_reg_access_type type, u16 reg_offset, u32 reg_value); ++int kbase_device_trace_buffer_install( ++ struct kbase_context *kctx, u32 *tb, size_t size); ++void kbase_device_trace_buffer_uninstall(struct kbase_context *kctx); + -+ if (virtual_group_state == EXEC_STATE_EMPTY) { -+ virtual_group_state = EXEC_STATE_IDLE; -+ } -+ } ++/* api to be ported per OS, only need to do the raw register access */ ++void kbase_os_reg_write(struct kbase_device *kbdev, u16 offset, u32 value); ++u32 kbase_os_reg_read(struct kbase_device *kbdev, u16 offset); + -+ /* Remove group from idle list */ -+ MALI_DEBUG_ASSERT(mali_executor_group_is_in_state(group, -+ EXEC_STATE_IDLE)); -+ _mali_osk_list_delinit(&group->executor_list); -+ group_list_idle_count--; ++void kbasep_as_do_poke(struct work_struct *work); + -+ /* -+ * And finally rejoin the virtual group -+ * group will start working on same job as virtual_group, -+ * if virtual_group is working on a job -+ */ -+ mali_group_add_group(virtual_group, group); ++/** Returns the name associated with a Mali exception code ++ * ++ * This function is called from the interrupt handler when a GPU fault occurs. ++ * It reports the details of the fault using KBASE_DEBUG_PRINT_WARN. ++ * ++ * @param[in] kbdev The kbase device that the GPU fault occurred from. ++ * @param[in] exception_code exception code ++ * @return name associated with the exception code ++ */ ++const char *kbase_exception_name(struct kbase_device *kbdev, ++ u32 exception_code); + -+ return trigger_pm_update; ++/** ++ * Check whether a system suspend is in progress, or has already been suspended ++ * ++ * The caller should ensure that either kbdev->pm.active_count_lock is held, or ++ * a dmb was executed recently (to ensure the value is most ++ * up-to-date). However, without a lock the value could change afterwards. ++ * ++ * @return false if a suspend is not in progress ++ * @return !=false otherwise ++ */ ++static inline bool kbase_pm_is_suspending(struct kbase_device *kbdev) ++{ ++ return kbdev->pm.suspending; +} + -+static mali_bool mali_executor_has_virtual_group(void) ++/** ++ * Return the atom's ID, as was originally supplied by userspace in ++ * base_jd_atom_v2::atom_number ++ */ ++static inline int kbase_jd_atom_id(struct kbase_context *kctx, struct kbase_jd_atom *katom) +{ -+#if (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) -+ return (NULL != virtual_group) ? MALI_TRUE : MALI_FALSE; -+#else -+ return MALI_FALSE; -+#endif /* (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) */ ++ int result; ++ ++ KBASE_DEBUG_ASSERT(kctx); ++ KBASE_DEBUG_ASSERT(katom); ++ KBASE_DEBUG_ASSERT(katom->kctx == kctx); ++ ++ result = katom - &kctx->jctx.atoms[0]; ++ KBASE_DEBUG_ASSERT(result >= 0 && result <= BASE_JD_ATOM_COUNT); ++ return result; +} + -+static mali_bool mali_executor_virtual_group_is_usable(void) ++/** ++ * kbase_jd_atom_from_id - Return the atom structure for the given atom ID ++ * @kctx: Context pointer ++ * @id: ID of atom to retrieve ++ * ++ * Return: Pointer to struct kbase_jd_atom associated with the supplied ID ++ */ ++static inline struct kbase_jd_atom *kbase_jd_atom_from_id( ++ struct kbase_context *kctx, int id) +{ -+#if (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ return ((EXEC_STATE_INACTIVE == virtual_group_state || -+ EXEC_STATE_IDLE == virtual_group_state) && (virtual_group->state != MALI_GROUP_STATE_ACTIVATION_PENDING)) ? -+ MALI_TRUE : MALI_FALSE; -+#else -+ return MALI_FALSE; -+#endif /* (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) */ ++ return &kctx->jctx.atoms[id]; +} + -+static mali_bool mali_executor_tackle_gp_bound(void) -+{ -+ struct mali_pp_job *job; ++/** ++ * Initialize the disjoint state ++ * ++ * The disjoint event count and state are both set to zero. ++ * ++ * Disjoint functions usage: ++ * ++ * The disjoint event count should be incremented whenever a disjoint event occurs. ++ * ++ * There are several cases which are regarded as disjoint behavior. Rather than just increment ++ * the counter during disjoint events we also increment the counter when jobs may be affected ++ * by what the GPU is currently doing. To facilitate this we have the concept of disjoint state. ++ * ++ * Disjoint state is entered during GPU reset and for the entire time that an atom is replaying ++ * (as part of the replay workaround). Increasing the disjoint state also increases the count of ++ * disjoint events. ++ * ++ * The disjoint state is then used to increase the count of disjoint events during job submission ++ * and job completion. Any atom submitted or completed while the disjoint state is greater than ++ * zero is regarded as a disjoint event. ++ * ++ * The disjoint event counter is also incremented immediately whenever a job is soft stopped ++ * and during context creation. ++ * ++ * @param kbdev The kbase device ++ */ ++void kbase_disjoint_init(struct kbase_device *kbdev); + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++/** ++ * Increase the count of disjoint events ++ * called when a disjoint event has happened ++ * ++ * @param kbdev The kbase device ++ */ ++void kbase_disjoint_event(struct kbase_device *kbdev); + -+ job = mali_scheduler_job_pp_physical_peek(); ++/** ++ * Increase the count of disjoint events only if the GPU is in a disjoint state ++ * ++ * This should be called when something happens which could be disjoint if the GPU ++ * is in a disjoint state. The state refcount keeps track of this. ++ * ++ * @param kbdev The kbase device ++ */ ++void kbase_disjoint_event_potential(struct kbase_device *kbdev); + -+ if (NULL != job && MALI_TRUE == mali_is_mali400()) { -+ if (0 < group_list_working_count && -+ mali_pp_job_is_large_and_unstarted(job)) { -+ return MALI_TRUE; -+ } -+ } ++/** ++ * Returns the count of disjoint events ++ * ++ * @param kbdev The kbase device ++ * @return the count of disjoint events ++ */ ++u32 kbase_disjoint_event_get(struct kbase_device *kbdev); + -+ return MALI_FALSE; -+} ++/** ++ * Increment the refcount state indicating that the GPU is in a disjoint state. ++ * ++ * Also Increment the disjoint event count (calls @ref kbase_disjoint_event) ++ * eventually after the disjoint state has completed @ref kbase_disjoint_state_down ++ * should be called ++ * ++ * @param kbdev The kbase device ++ */ ++void kbase_disjoint_state_up(struct kbase_device *kbdev); + -+static mali_bool mali_executor_schedule_is_early_out(mali_bool *gpu_secure_mode_is_needed) -+{ -+ struct mali_pp_job *next_pp_job_to_start = NULL; -+ struct mali_group *group; -+ struct mali_group *tmp_group; -+ struct mali_pp_job *physical_pp_job_working = NULL; -+ struct mali_pp_job *virtual_pp_job_working = NULL; -+ mali_bool gpu_working_in_protected_mode = MALI_FALSE; -+ mali_bool gpu_working_in_non_protected_mode = MALI_FALSE; ++/** ++ * Decrement the refcount state ++ * ++ * Also Increment the disjoint event count (calls @ref kbase_disjoint_event) ++ * ++ * Called after @ref kbase_disjoint_state_up once the disjoint state is over ++ * ++ * @param kbdev The kbase device ++ */ ++void kbase_disjoint_state_down(struct kbase_device *kbdev); + -+ MALI_DEBUG_ASSERT_LOCK_HELD(mali_scheduler_lock_obj); ++/** ++ * If a job is soft stopped and the number of contexts is >= this value ++ * it is reported as a disjoint event ++ */ ++#define KBASE_DISJOINT_STATE_INTERLEAVED_CONTEXT_COUNT_THRESHOLD 2 + -+ *gpu_secure_mode_is_needed = MALI_FALSE; ++#if !defined(UINT64_MAX) ++ #define UINT64_MAX ((uint64_t)0xFFFFFFFFFFFFFFFFULL) ++#endif + -+ /* Check if the gpu secure mode is supported, exit if not.*/ -+ if (MALI_FALSE == _mali_osk_gpu_secure_mode_is_supported()) { -+ return MALI_FALSE; -+ } ++#if KBASE_TRACE_ENABLE ++void kbasep_trace_debugfs_init(struct kbase_device *kbdev); + -+ /* Check if need to set gpu secure mode for the next pp job, -+ * get the next pp job that will be scheduled if exist. -+ */ -+ next_pp_job_to_start = mali_scheduler_job_pp_next(); ++#ifndef CONFIG_MALI_SYSTEM_TRACE ++/** Add trace values about a job-slot ++ * ++ * @note Any functions called through this macro will still be evaluated in ++ * Release builds (CONFIG_MALI_DEBUG not defined). Therefore, when KBASE_TRACE_ENABLE == 0 any ++ * functions called to get the parameters supplied to this macro must: ++ * - be static or static inline ++ * - must just return 0 and have no other statements present in the body. ++ */ ++#define KBASE_TRACE_ADD_SLOT(kbdev, code, ctx, katom, gpu_addr, jobslot) \ ++ kbasep_trace_add(kbdev, KBASE_TRACE_CODE(code), ctx, katom, gpu_addr, \ ++ KBASE_TRACE_FLAG_JOBSLOT, 0, jobslot, 0) + -+ /* Check current pp physical/virtual running job is protected job or not if exist.*/ -+ _MALI_OSK_LIST_FOREACHENTRY(group, tmp_group, &group_list_working, -+ struct mali_group, executor_list) { -+ physical_pp_job_working = group->pp_running_job; -+ break; -+ } ++/** Add trace values about a job-slot, with info ++ * ++ * @note Any functions called through this macro will still be evaluated in ++ * Release builds (CONFIG_MALI_DEBUG not defined). Therefore, when KBASE_TRACE_ENABLE == 0 any ++ * functions called to get the parameters supplied to this macro must: ++ * - be static or static inline ++ * - must just return 0 and have no other statements present in the body. ++ */ ++#define KBASE_TRACE_ADD_SLOT_INFO(kbdev, code, ctx, katom, gpu_addr, jobslot, info_val) \ ++ kbasep_trace_add(kbdev, KBASE_TRACE_CODE(code), ctx, katom, gpu_addr, \ ++ KBASE_TRACE_FLAG_JOBSLOT, 0, jobslot, info_val) + -+ if (EXEC_STATE_WORKING == virtual_group_state) { -+ virtual_pp_job_working = virtual_group->pp_running_job; -+ } ++/** Add trace values about a ctx refcount ++ * ++ * @note Any functions called through this macro will still be evaluated in ++ * Release builds (CONFIG_MALI_DEBUG not defined). Therefore, when KBASE_TRACE_ENABLE == 0 any ++ * functions called to get the parameters supplied to this macro must: ++ * - be static or static inline ++ * - must just return 0 and have no other statements present in the body. ++ */ ++#define KBASE_TRACE_ADD_REFCOUNT(kbdev, code, ctx, katom, gpu_addr, refcount) \ ++ kbasep_trace_add(kbdev, KBASE_TRACE_CODE(code), ctx, katom, gpu_addr, \ ++ KBASE_TRACE_FLAG_REFCOUNT, refcount, 0, 0) ++/** Add trace values about a ctx refcount, and info ++ * ++ * @note Any functions called through this macro will still be evaluated in ++ * Release builds (CONFIG_MALI_DEBUG not defined). Therefore, when KBASE_TRACE_ENABLE == 0 any ++ * functions called to get the parameters supplied to this macro must: ++ * - be static or static inline ++ * - must just return 0 and have no other statements present in the body. ++ */ ++#define KBASE_TRACE_ADD_REFCOUNT_INFO(kbdev, code, ctx, katom, gpu_addr, refcount, info_val) \ ++ kbasep_trace_add(kbdev, KBASE_TRACE_CODE(code), ctx, katom, gpu_addr, \ ++ KBASE_TRACE_FLAG_REFCOUNT, refcount, 0, info_val) + -+ if (NULL != physical_pp_job_working) { -+ if (MALI_TRUE == mali_pp_job_is_protected_job(physical_pp_job_working)) { -+ gpu_working_in_protected_mode = MALI_TRUE; -+ } else { -+ gpu_working_in_non_protected_mode = MALI_TRUE; -+ } -+ } else if (NULL != virtual_pp_job_working) { -+ if (MALI_TRUE == mali_pp_job_is_protected_job(virtual_pp_job_working)) { -+ gpu_working_in_protected_mode = MALI_TRUE; -+ } else { -+ gpu_working_in_non_protected_mode = MALI_TRUE; -+ } -+ } else if (EXEC_STATE_WORKING == gp_group_state) { -+ gpu_working_in_non_protected_mode = MALI_TRUE; -+ } ++/** Add trace values (no slot or refcount) ++ * ++ * @note Any functions called through this macro will still be evaluated in ++ * Release builds (CONFIG_MALI_DEBUG not defined). Therefore, when KBASE_TRACE_ENABLE == 0 any ++ * functions called to get the parameters supplied to this macro must: ++ * - be static or static inline ++ * - must just return 0 and have no other statements present in the body. ++ */ ++#define KBASE_TRACE_ADD(kbdev, code, ctx, katom, gpu_addr, info_val) \ ++ kbasep_trace_add(kbdev, KBASE_TRACE_CODE(code), ctx, katom, gpu_addr, \ ++ 0, 0, 0, info_val) + -+ /* If the next pp job is the protected pp job.*/ -+ if ((NULL != next_pp_job_to_start) && MALI_TRUE == mali_pp_job_is_protected_job(next_pp_job_to_start)) { -+ /* if gp is working or any non-protected pp job is working now, unable to schedule protected pp job. */ -+ if (MALI_TRUE == gpu_working_in_non_protected_mode) -+ return MALI_TRUE; ++/** Clear the trace */ ++#define KBASE_TRACE_CLEAR(kbdev) \ ++ kbasep_trace_clear(kbdev) + -+ *gpu_secure_mode_is_needed = MALI_TRUE; -+ return MALI_FALSE; ++/** Dump the slot trace */ ++#define KBASE_TRACE_DUMP(kbdev) \ ++ kbasep_trace_dump(kbdev) + -+ } ++/** PRIVATE - do not use directly. Use KBASE_TRACE_ADD() instead */ ++void kbasep_trace_add(struct kbase_device *kbdev, enum kbase_trace_code code, void *ctx, struct kbase_jd_atom *katom, u64 gpu_addr, u8 flags, int refcount, int jobslot, unsigned long info_val); ++/** PRIVATE - do not use directly. Use KBASE_TRACE_CLEAR() instead */ ++void kbasep_trace_clear(struct kbase_device *kbdev); ++#else /* #ifndef CONFIG_MALI_SYSTEM_TRACE */ ++/* Dispatch kbase trace events as system trace events */ ++#include ++#define KBASE_TRACE_ADD_SLOT(kbdev, code, ctx, katom, gpu_addr, jobslot)\ ++ trace_mali_##code(jobslot, 0) + -+ if (MALI_TRUE == gpu_working_in_protected_mode) { -+ /* Unable to schedule non-protected pp job/gp job if exist protected pp running jobs*/ -+ return MALI_TRUE; -+ } ++#define KBASE_TRACE_ADD_SLOT_INFO(kbdev, code, ctx, katom, gpu_addr, jobslot, info_val)\ ++ trace_mali_##code(jobslot, info_val) + -+ return MALI_FALSE; -+} -+/* -+ * This is where jobs are actually started. -+ */ -+static void mali_executor_schedule(void) -+{ -+ u32 i; -+ u32 num_physical_needed = 0; -+ u32 num_physical_to_process = 0; -+ mali_bool trigger_pm_update = MALI_FALSE; -+ mali_bool deactivate_idle_group = MALI_TRUE; -+ mali_bool gpu_secure_mode_is_needed = MALI_FALSE; -+ mali_bool is_gpu_secure_mode = MALI_FALSE; -+ /* Physical groups + jobs to start in this function */ -+ struct mali_group *groups_to_start[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS]; -+ struct mali_pp_job *jobs_to_start[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS]; -+ u32 sub_jobs_to_start[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS]; -+ int num_jobs_to_start = 0; ++#define KBASE_TRACE_ADD_REFCOUNT(kbdev, code, ctx, katom, gpu_addr, refcount)\ ++ trace_mali_##code(refcount, 0) + -+ /* Virtual job to start in this function */ -+ struct mali_pp_job *virtual_job_to_start = NULL; ++#define KBASE_TRACE_ADD_REFCOUNT_INFO(kbdev, code, ctx, katom, gpu_addr, refcount, info_val)\ ++ trace_mali_##code(refcount, info_val) + -+ /* GP job to start in this function */ -+ struct mali_gp_job *gp_job_to_start = NULL; ++#define KBASE_TRACE_ADD(kbdev, code, ctx, katom, gpu_addr, info_val)\ ++ trace_mali_##code(gpu_addr, info_val) + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++#define KBASE_TRACE_CLEAR(kbdev)\ ++ do {\ ++ CSTD_UNUSED(kbdev);\ ++ CSTD_NOP(0);\ ++ } while (0) ++#define KBASE_TRACE_DUMP(kbdev)\ ++ do {\ ++ CSTD_UNUSED(kbdev);\ ++ CSTD_NOP(0);\ ++ } while (0) + -+ if (pause_count > 0) { -+ /* Execution is suspended, don't schedule any jobs. */ -+ return; -+ } ++#endif /* #ifndef CONFIG_MALI_SYSTEM_TRACE */ ++#else ++#define KBASE_TRACE_ADD_SLOT(kbdev, code, ctx, katom, gpu_addr, jobslot)\ ++ do {\ ++ CSTD_UNUSED(kbdev);\ ++ CSTD_NOP(code);\ ++ CSTD_UNUSED(ctx);\ ++ CSTD_UNUSED(katom);\ ++ CSTD_UNUSED(gpu_addr);\ ++ CSTD_UNUSED(jobslot);\ ++ } while (0) + -+ /* Lock needed in order to safely handle the job queues */ -+ mali_scheduler_lock(); ++#define KBASE_TRACE_ADD_SLOT_INFO(kbdev, code, ctx, katom, gpu_addr, jobslot, info_val)\ ++ do {\ ++ CSTD_UNUSED(kbdev);\ ++ CSTD_NOP(code);\ ++ CSTD_UNUSED(ctx);\ ++ CSTD_UNUSED(katom);\ ++ CSTD_UNUSED(gpu_addr);\ ++ CSTD_UNUSED(jobslot);\ ++ CSTD_UNUSED(info_val);\ ++ CSTD_NOP(0);\ ++ } while (0) + -+ /* 1. Check the schedule if need to early out. */ -+ if (MALI_TRUE == mali_executor_schedule_is_early_out(&gpu_secure_mode_is_needed)) { -+ mali_scheduler_unlock(); -+ return; -+ } ++#define KBASE_TRACE_ADD_REFCOUNT(kbdev, code, ctx, katom, gpu_addr, refcount)\ ++ do {\ ++ CSTD_UNUSED(kbdev);\ ++ CSTD_NOP(code);\ ++ CSTD_UNUSED(ctx);\ ++ CSTD_UNUSED(katom);\ ++ CSTD_UNUSED(gpu_addr);\ ++ CSTD_UNUSED(refcount);\ ++ CSTD_NOP(0);\ ++ } while (0) + -+ /* 2. Activate gp firstly if have gp job queued. */ -+ if ((EXEC_STATE_INACTIVE == gp_group_state) -+ && (0 < mali_scheduler_job_gp_count()) -+ && (gpu_secure_mode_is_needed == MALI_FALSE)) { ++#define KBASE_TRACE_ADD_REFCOUNT_INFO(kbdev, code, ctx, katom, gpu_addr, refcount, info_val)\ ++ do {\ ++ CSTD_UNUSED(kbdev);\ ++ CSTD_NOP(code);\ ++ CSTD_UNUSED(ctx);\ ++ CSTD_UNUSED(katom);\ ++ CSTD_UNUSED(gpu_addr);\ ++ CSTD_UNUSED(info_val);\ ++ CSTD_NOP(0);\ ++ } while (0) + -+ enum mali_group_state state = -+ mali_group_activate(gp_group); -+ if (MALI_GROUP_STATE_ACTIVE == state) { -+ /* Set GP group state to idle */ -+ gp_group_state = EXEC_STATE_IDLE; -+ } else { -+ trigger_pm_update = MALI_TRUE; -+ } -+ } ++#define KBASE_TRACE_ADD(kbdev, code, subcode, ctx, katom, val)\ ++ do {\ ++ CSTD_UNUSED(kbdev);\ ++ CSTD_NOP(code);\ ++ CSTD_UNUSED(subcode);\ ++ CSTD_UNUSED(ctx);\ ++ CSTD_UNUSED(katom);\ ++ CSTD_UNUSED(val);\ ++ CSTD_NOP(0);\ ++ } while (0) + -+ /* 3. Prepare as many physical groups as needed/possible */ ++#define KBASE_TRACE_CLEAR(kbdev)\ ++ do {\ ++ CSTD_UNUSED(kbdev);\ ++ CSTD_NOP(0);\ ++ } while (0) ++#define KBASE_TRACE_DUMP(kbdev)\ ++ do {\ ++ CSTD_UNUSED(kbdev);\ ++ CSTD_NOP(0);\ ++ } while (0) ++#endif /* KBASE_TRACE_ENABLE */ ++/** PRIVATE - do not use directly. Use KBASE_TRACE_DUMP() instead */ ++void kbasep_trace_dump(struct kbase_device *kbdev); + -+ num_physical_needed = mali_scheduler_job_physical_head_count(gpu_secure_mode_is_needed); ++#ifdef CONFIG_MALI_DEBUG ++/** ++ * kbase_set_driver_inactive - Force driver to go inactive ++ * @kbdev: Device pointer ++ * @inactive: true if driver should go inactive, false otherwise ++ * ++ * Forcing the driver inactive will cause all future IOCTLs to wait until the ++ * driver is made active again. This is intended solely for the use of tests ++ * which require that no jobs are running while the test executes. ++ */ ++void kbase_set_driver_inactive(struct kbase_device *kbdev, bool inactive); ++#endif /* CONFIG_MALI_DEBUG */ + -+ /* On mali-450 platform, we don't need to enter in this block frequently. */ -+ if (0 < num_physical_needed) { + -+ if (num_physical_needed <= group_list_idle_count) { -+ /* We have enough groups on idle list already */ -+ num_physical_to_process = num_physical_needed; -+ num_physical_needed = 0; -+ } else { -+ /* We need to get a hold of some more groups */ -+ num_physical_to_process = group_list_idle_count; -+ num_physical_needed -= group_list_idle_count; -+ } ++#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_NO_MALI) + -+ if (0 < num_physical_needed) { ++/* kbase_io_history_init - initialize data struct for register access history ++ * ++ * @kbdev The register history to initialize ++ * @n The number of register accesses that the buffer could hold ++ * ++ * @return 0 if successfully initialized, failure otherwise ++ */ ++int kbase_io_history_init(struct kbase_io_history *h, u16 n); + -+ /* 3.1. Activate groups which are inactive */ ++/* kbase_io_history_term - uninit all resources for the register access history ++ * ++ * @h The register history to terminate ++ */ ++void kbase_io_history_term(struct kbase_io_history *h); + -+ struct mali_group *group; -+ struct mali_group *temp; ++/* kbase_io_history_dump - print the register history to the kernel ring buffer ++ * ++ * @kbdev Pointer to kbase_device containing the register history to dump ++ */ ++void kbase_io_history_dump(struct kbase_device *kbdev); + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_inactive, -+ struct mali_group, executor_list) { -+ enum mali_group_state state = -+ mali_group_activate(group); -+ if (MALI_GROUP_STATE_ACTIVE == state) { -+ /* Move from inactive to idle */ -+ mali_executor_change_state_pp_physical(group, -+ &group_list_inactive, -+ &group_list_inactive_count, -+ &group_list_idle, -+ &group_list_idle_count); -+ num_physical_to_process++; -+ } else { -+ trigger_pm_update = MALI_TRUE; -+ } ++/** ++ * kbase_io_history_resize - resize the register access history buffer. ++ * ++ * @h: Pointer to a valid register history to resize ++ * @new_size: Number of accesses the buffer could hold ++ * ++ * A successful resize will clear all recent register accesses. ++ * If resizing fails for any reason (e.g., could not allocate memory, invalid ++ * buffer size) then the original buffer will be kept intact. ++ * ++ * @return 0 if the buffer was resized, failure otherwise ++ */ ++int kbase_io_history_resize(struct kbase_io_history *h, u16 new_size); + -+ num_physical_needed--; -+ if (0 == num_physical_needed) { -+ /* We have activated all the groups we need */ -+ break; -+ } -+ } -+ } ++#else /* CONFIG_DEBUG_FS */ + -+ if (mali_executor_virtual_group_is_usable()) { ++#define kbase_io_history_init(...) ((int)0) + -+ /* -+ * 3.2. And finally, steal and activate groups -+ * from virtual group if we need even more -+ */ -+ while (0 < num_physical_needed) { -+ struct mali_group *group; ++#define kbase_io_history_term CSTD_NOP + -+ group = mali_group_acquire_group(virtual_group); -+ if (NULL != group) { -+ enum mali_group_state state; ++#define kbase_io_history_dump CSTD_NOP + -+ mali_executor_disable_empty_virtual(); ++#define kbase_io_history_resize CSTD_NOP + -+ state = mali_group_activate(group); -+ if (MALI_GROUP_STATE_ACTIVE == state) { -+ /* Group is ready, add to idle list */ -+ _mali_osk_list_add( -+ &group->executor_list, -+ &group_list_idle); -+ group_list_idle_count++; -+ num_physical_to_process++; -+ } else { -+ /* -+ * Group is not ready yet, -+ * add to inactive list -+ */ -+ _mali_osk_list_add( -+ &group->executor_list, -+ &group_list_inactive); -+ group_list_inactive_count++; ++#endif /* CONFIG_DEBUG_FS */ + -+ trigger_pm_update = MALI_TRUE; -+ } -+ num_physical_needed--; -+ } else { -+ /* -+ * We could not get enough groups -+ * from the virtual group. -+ */ -+ break; -+ } -+ } -+ } + -+ /* 3.3. Assign physical jobs to groups */ ++#endif + -+ if (0 < num_physical_to_process) { -+ struct mali_group *group; -+ struct mali_group *temp; + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_idle, -+ struct mali_group, executor_list) { -+ struct mali_pp_job *job = NULL; -+ u32 sub_job = MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS; + -+ MALI_DEBUG_ASSERT(num_jobs_to_start < -+ MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS); +diff --git a/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c +new file mode 100755 +index 000000000..fde0f8ff8 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c +@@ -0,0 +1,209 @@ ++/* ++ * ++ * (C) COPYRIGHT 2013-2015, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ MALI_DEBUG_ASSERT(0 < -+ mali_scheduler_job_physical_head_count(gpu_secure_mode_is_needed)); + -+ /* If the next pp job is non-protected, check if gp bound now. */ -+ if ((MALI_FALSE == gpu_secure_mode_is_needed) -+ && (mali_executor_hint_is_enabled(MALI_EXECUTOR_HINT_GP_BOUND)) -+ && (MALI_TRUE == mali_executor_tackle_gp_bound())) { -+ /* -+ * We're gp bound, -+ * don't start this right now. -+ */ -+ deactivate_idle_group = MALI_FALSE; -+ num_physical_to_process = 0; -+ break; -+ } ++#include ++#include ++#include + -+ job = mali_scheduler_job_pp_physical_get( -+ &sub_job); ++/* This function is used to solve an HW issue with single iterator GPUs. ++ * If a fragment job is soft-stopped on the edge of its bounding box, can happen that the ++ * restart index is out of bounds and the rerun causes a tile range fault. If this happens ++ * we try to clamp the restart index to a correct value and rerun the job. ++ */ ++/* Mask of X and Y coordinates for the coordinates words in the descriptors*/ ++#define X_COORDINATE_MASK 0x00000FFF ++#define Y_COORDINATE_MASK 0x0FFF0000 ++/* Max number of words needed from the fragment shader job descriptor */ ++#define JOB_HEADER_SIZE_IN_WORDS 10 ++#define JOB_HEADER_SIZE (JOB_HEADER_SIZE_IN_WORDS*sizeof(u32)) + -+ if (MALI_FALSE == gpu_secure_mode_is_needed) { -+ MALI_DEBUG_ASSERT(MALI_FALSE == mali_pp_job_is_protected_job(job)); -+ } else { -+ MALI_DEBUG_ASSERT(MALI_TRUE == mali_pp_job_is_protected_job(job)); -+ } ++/* Word 0: Status Word */ ++#define JOB_DESC_STATUS_WORD 0 ++/* Word 1: Restart Index */ ++#define JOB_DESC_RESTART_INDEX_WORD 1 ++/* Word 2: Fault address low word */ ++#define JOB_DESC_FAULT_ADDR_LOW_WORD 2 ++/* Word 8: Minimum Tile Coordinates */ ++#define FRAG_JOB_DESC_MIN_TILE_COORD_WORD 8 ++/* Word 9: Maximum Tile Coordinates */ ++#define FRAG_JOB_DESC_MAX_TILE_COORD_WORD 9 + -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT(sub_job <= MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS); ++int kbasep_10969_workaround_clamp_coordinates(struct kbase_jd_atom *katom) ++{ ++ struct device *dev = katom->kctx->kbdev->dev; ++ u32 clamped = 0; ++ struct kbase_va_region *region; ++ phys_addr_t *page_array; ++ u64 page_index; ++ u32 offset = katom->jc & (~PAGE_MASK); ++ u32 *page_1 = NULL; ++ u32 *page_2 = NULL; ++ u32 job_header[JOB_HEADER_SIZE_IN_WORDS]; ++ void *dst = job_header; ++ u32 minX, minY, maxX, maxY; ++ u32 restartX, restartY; ++ struct page *p; ++ u32 copy_size; + -+ /* Put job + group on list of jobs to start later on */ ++ dev_warn(dev, "Called TILE_RANGE_FAULT workaround clamping function.\n"); ++ if (!(katom->core_req & BASE_JD_REQ_FS)) ++ return 0; + -+ groups_to_start[num_jobs_to_start] = group; -+ jobs_to_start[num_jobs_to_start] = job; -+ sub_jobs_to_start[num_jobs_to_start] = sub_job; -+ num_jobs_to_start++; ++ kbase_gpu_vm_lock(katom->kctx); ++ region = kbase_region_tracker_find_region_enclosing_address(katom->kctx, ++ katom->jc); ++ if (!region || (region->flags & KBASE_REG_FREE)) ++ goto out_unlock; + -+ /* Move group from idle to working */ -+ mali_executor_change_state_pp_physical(group, -+ &group_list_idle, -+ &group_list_idle_count, -+ &group_list_working, -+ &group_list_working_count); ++ page_array = kbase_get_cpu_phy_pages(region); ++ if (!page_array) ++ goto out_unlock; + -+ num_physical_to_process--; -+ if (0 == num_physical_to_process) { -+ /* Got all we needed */ -+ break; -+ } -+ } -+ } -+ } ++ page_index = (katom->jc >> PAGE_SHIFT) - region->start_pfn; + -+ /* 4. Deactivate idle pp group , must put deactive here before active vitual group -+ * for cover case first only has physical job in normal queue but group inactive, -+ * so delay the job start go to active group, when group activated, -+ * call scheduler again, but now if we get high queue virtual job, -+ * we will do nothing in schedule cause executor schedule stop -+ */ ++ p = pfn_to_page(PFN_DOWN(page_array[page_index])); + -+ if (MALI_TRUE == mali_executor_deactivate_list_idle(deactivate_idle_group -+ && (!mali_timeline_has_physical_pp_job()))) { -+ trigger_pm_update = MALI_TRUE; -+ } ++ /* we need the first 10 words of the fragment shader job descriptor. ++ * We need to check that the offset + 10 words is less that the page ++ * size otherwise we need to load the next page. ++ * page_size_overflow will be equal to 0 in case the whole descriptor ++ * is within the page > 0 otherwise. ++ */ ++ copy_size = MIN(PAGE_SIZE - offset, JOB_HEADER_SIZE); + -+ /* 5. Activate virtual group, if needed */ -+ if (EXEC_STATE_INACTIVE == virtual_group_state && -+ MALI_TRUE == mali_scheduler_job_next_is_virtual()) { -+ struct mali_pp_job *virtual_job = mali_scheduler_job_pp_virtual_peek(); -+ if ((MALI_FALSE == gpu_secure_mode_is_needed && MALI_FALSE == mali_pp_job_is_protected_job(virtual_job)) -+ || (MALI_TRUE == gpu_secure_mode_is_needed && MALI_TRUE == mali_pp_job_is_protected_job(virtual_job))) { -+ enum mali_group_state state = -+ mali_group_activate(virtual_group); -+ if (MALI_GROUP_STATE_ACTIVE == state) { -+ /* Set virtual group state to idle */ -+ virtual_group_state = EXEC_STATE_IDLE; -+ } else { -+ trigger_pm_update = MALI_TRUE; -+ } -+ } -+ } ++ page_1 = kmap_atomic(p); + -+ /* 6. To power up group asap, trigger pm update only when no need to swith the gpu mode. */ ++ /* page_1 is a u32 pointer, offset is expressed in bytes */ ++ page_1 += offset>>2; + -+ is_gpu_secure_mode = _mali_osk_gpu_secure_mode_is_enabled(); ++ kbase_sync_single_for_cpu(katom->kctx->kbdev, ++ kbase_dma_addr(p) + offset, ++ copy_size, DMA_BIDIRECTIONAL); + -+ if ((MALI_FALSE == gpu_secure_mode_is_needed && MALI_FALSE == is_gpu_secure_mode) -+ || (MALI_TRUE == gpu_secure_mode_is_needed && MALI_TRUE == is_gpu_secure_mode)) { -+ if (MALI_TRUE == trigger_pm_update) { -+ trigger_pm_update = MALI_FALSE; -+ mali_pm_update_async(); -+ } -+ } ++ memcpy(dst, page_1, copy_size); + -+ /* 7. Assign jobs to idle virtual group (or deactivate if no job) */ ++ /* The data needed overflows page the dimension, ++ * need to map the subsequent page */ ++ if (copy_size < JOB_HEADER_SIZE) { ++ p = pfn_to_page(PFN_DOWN(page_array[page_index + 1])); ++ page_2 = kmap_atomic(p); + -+ if (EXEC_STATE_IDLE == virtual_group_state) { -+ if (MALI_TRUE == mali_scheduler_job_next_is_virtual()) { -+ struct mali_pp_job *virtual_job = mali_scheduler_job_pp_virtual_peek(); -+ if ((MALI_FALSE == gpu_secure_mode_is_needed && MALI_FALSE == mali_pp_job_is_protected_job(virtual_job)) -+ || (MALI_TRUE == gpu_secure_mode_is_needed && MALI_TRUE == mali_pp_job_is_protected_job(virtual_job))) { -+ virtual_job_to_start = -+ mali_scheduler_job_pp_virtual_get(); -+ virtual_group_state = EXEC_STATE_WORKING; -+ } -+ } else if (!mali_timeline_has_virtual_pp_job()) { -+ virtual_group_state = EXEC_STATE_INACTIVE; ++ kbase_sync_single_for_cpu(katom->kctx->kbdev, ++ kbase_dma_addr(p), ++ JOB_HEADER_SIZE - copy_size, DMA_BIDIRECTIONAL); + -+ if (mali_group_deactivate(virtual_group)) { -+ trigger_pm_update = MALI_TRUE; -+ } -+ } ++ memcpy(dst + copy_size, page_2, JOB_HEADER_SIZE - copy_size); + } + -+ /* 8. Assign job to idle GP group (or deactivate if no job) */ -+ -+ if (EXEC_STATE_IDLE == gp_group_state && MALI_FALSE == gpu_secure_mode_is_needed) { -+ if (0 < mali_scheduler_job_gp_count()) { -+ gp_job_to_start = mali_scheduler_job_gp_get(); -+ gp_group_state = EXEC_STATE_WORKING; -+ } else if (!mali_timeline_has_gp_job()) { -+ gp_group_state = EXEC_STATE_INACTIVE; -+ if (mali_group_deactivate(gp_group)) { -+ trigger_pm_update = MALI_TRUE; -+ } -+ } -+ } ++ /* We managed to correctly map one or two pages (in case of overflow) */ ++ /* Get Bounding Box data and restart index from fault address low word */ ++ minX = job_header[FRAG_JOB_DESC_MIN_TILE_COORD_WORD] & X_COORDINATE_MASK; ++ minY = job_header[FRAG_JOB_DESC_MIN_TILE_COORD_WORD] & Y_COORDINATE_MASK; ++ maxX = job_header[FRAG_JOB_DESC_MAX_TILE_COORD_WORD] & X_COORDINATE_MASK; ++ maxY = job_header[FRAG_JOB_DESC_MAX_TILE_COORD_WORD] & Y_COORDINATE_MASK; ++ restartX = job_header[JOB_DESC_FAULT_ADDR_LOW_WORD] & X_COORDINATE_MASK; ++ restartY = job_header[JOB_DESC_FAULT_ADDR_LOW_WORD] & Y_COORDINATE_MASK; + -+ /* 9. We no longer need the schedule/queue lock */ ++ dev_warn(dev, "Before Clamping:\n" ++ "Jobstatus: %08x\n" ++ "restartIdx: %08x\n" ++ "Fault_addr_low: %08x\n" ++ "minCoordsX: %08x minCoordsY: %08x\n" ++ "maxCoordsX: %08x maxCoordsY: %08x\n", ++ job_header[JOB_DESC_STATUS_WORD], ++ job_header[JOB_DESC_RESTART_INDEX_WORD], ++ job_header[JOB_DESC_FAULT_ADDR_LOW_WORD], ++ minX, minY, ++ maxX, maxY); + -+ mali_scheduler_unlock(); ++ /* Set the restart index to the one which generated the fault*/ ++ job_header[JOB_DESC_RESTART_INDEX_WORD] = ++ job_header[JOB_DESC_FAULT_ADDR_LOW_WORD]; + -+ /* 10. start jobs */ -+ if (NULL != virtual_job_to_start) { -+ MALI_DEBUG_ASSERT(!mali_group_pp_is_active(virtual_group)); -+ mali_group_start_pp_job(virtual_group, -+ virtual_job_to_start, 0, is_gpu_secure_mode); ++ if (restartX < minX) { ++ job_header[JOB_DESC_RESTART_INDEX_WORD] = (minX) | restartY; ++ dev_warn(dev, ++ "Clamping restart X index to minimum. %08x clamped to %08x\n", ++ restartX, minX); ++ clamped = 1; + } -+ -+ for (i = 0; i < num_jobs_to_start; i++) { -+ MALI_DEBUG_ASSERT(!mali_group_pp_is_active( -+ groups_to_start[i])); -+ mali_group_start_pp_job(groups_to_start[i], -+ jobs_to_start[i], -+ sub_jobs_to_start[i], is_gpu_secure_mode); ++ if (restartY < minY) { ++ job_header[JOB_DESC_RESTART_INDEX_WORD] = (minY) | restartX; ++ dev_warn(dev, ++ "Clamping restart Y index to minimum. %08x clamped to %08x\n", ++ restartY, minY); ++ clamped = 1; + } -+ -+ MALI_DEBUG_ASSERT_POINTER(gp_group); -+ -+ if (NULL != gp_job_to_start) { -+ MALI_DEBUG_ASSERT(!mali_group_gp_is_active(gp_group)); -+ mali_group_start_gp_job(gp_group, gp_job_to_start, is_gpu_secure_mode); ++ if (restartX > maxX) { ++ job_header[JOB_DESC_RESTART_INDEX_WORD] = (maxX) | restartY; ++ dev_warn(dev, ++ "Clamping restart X index to maximum. %08x clamped to %08x\n", ++ restartX, maxX); ++ clamped = 1; + } -+ -+ /* 11. Trigger any pending PM updates */ -+ if (MALI_TRUE == trigger_pm_update) { -+ mali_pm_update_async(); ++ if (restartY > maxY) { ++ job_header[JOB_DESC_RESTART_INDEX_WORD] = (maxY) | restartX; ++ dev_warn(dev, ++ "Clamping restart Y index to maximum. %08x clamped to %08x\n", ++ restartY, maxY); ++ clamped = 1; + } -+} -+ -+/* Handler for deferred schedule requests */ -+static void mali_executor_wq_schedule(void *arg) -+{ -+ MALI_IGNORE(arg); -+ mali_executor_lock(); -+ mali_executor_schedule(); -+ mali_executor_unlock(); -+} -+ -+static void mali_executor_send_gp_oom_to_user(struct mali_gp_job *job) -+{ -+ _mali_uk_gp_job_suspended_s *jobres; -+ _mali_osk_notification_t *notification; + -+ notification = mali_gp_job_get_oom_notification(job); ++ if (clamped) { ++ /* Reset the fault address low word ++ * and set the job status to STOPPED */ ++ job_header[JOB_DESC_FAULT_ADDR_LOW_WORD] = 0x0; ++ job_header[JOB_DESC_STATUS_WORD] = BASE_JD_EVENT_STOPPED; ++ dev_warn(dev, "After Clamping:\n" ++ "Jobstatus: %08x\n" ++ "restartIdx: %08x\n" ++ "Fault_addr_low: %08x\n" ++ "minCoordsX: %08x minCoordsY: %08x\n" ++ "maxCoordsX: %08x maxCoordsY: %08x\n", ++ job_header[JOB_DESC_STATUS_WORD], ++ job_header[JOB_DESC_RESTART_INDEX_WORD], ++ job_header[JOB_DESC_FAULT_ADDR_LOW_WORD], ++ minX, minY, ++ maxX, maxY); + -+ /* -+ * Remember the id we send to user space, so we have something to -+ * verify when we get a response -+ */ -+ gp_returned_cookie = mali_gp_job_get_id(job); ++ /* Flush CPU cache to update memory for future GPU reads*/ ++ memcpy(page_1, dst, copy_size); ++ p = pfn_to_page(PFN_DOWN(page_array[page_index])); + -+ jobres = (_mali_uk_gp_job_suspended_s *)notification->result_buffer; -+ jobres->user_job_ptr = mali_gp_job_get_user_id(job); -+ jobres->cookie = gp_returned_cookie; ++ kbase_sync_single_for_device(katom->kctx->kbdev, ++ kbase_dma_addr(p) + offset, ++ copy_size, DMA_TO_DEVICE); + -+ mali_session_send_notification(mali_gp_job_get_session(job), -+ notification); -+} -+static struct mali_gp_job *mali_executor_complete_gp(struct mali_group *group, -+ mali_bool success) -+{ -+ struct mali_gp_job *job; ++ if (copy_size < JOB_HEADER_SIZE) { ++ memcpy(page_2, dst + copy_size, ++ JOB_HEADER_SIZE - copy_size); ++ p = pfn_to_page(PFN_DOWN(page_array[page_index + 1])); + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ kbase_sync_single_for_device(katom->kctx->kbdev, ++ kbase_dma_addr(p), ++ JOB_HEADER_SIZE - copy_size, ++ DMA_TO_DEVICE); ++ } ++ } ++ if (copy_size < JOB_HEADER_SIZE) ++ kunmap_atomic(page_2); + -+ /* Extracts the needed HW status from core and reset */ -+ job = mali_group_complete_gp(group, success); ++ kunmap_atomic(page_1); + -+ MALI_DEBUG_ASSERT_POINTER(job); ++out_unlock: ++ kbase_gpu_vm_unlock(katom->kctx); ++ return clamped; ++} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h +new file mode 100755 +index 000000000..099a29861 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h +@@ -0,0 +1,23 @@ ++/* ++ * ++ * (C) COPYRIGHT 2013-2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ /* Core is now ready to go into idle list */ -+ gp_group_state = EXEC_STATE_IDLE; + -+ /* This will potentially queue more GP and PP jobs */ -+ mali_timeline_tracker_release(&job->tracker); + -+ /* Signal PP job */ -+ mali_gp_job_signal_pp_tracker(job, success); ++#ifndef _KBASE_10969_WORKAROUND_ ++#define _KBASE_10969_WORKAROUND_ + -+ return job; -+} ++int kbasep_10969_workaround_clamp_coordinates(struct kbase_jd_atom *katom); + -+static struct mali_pp_job *mali_executor_complete_pp(struct mali_group *group, -+ mali_bool success) -+{ -+ struct mali_pp_job *job; -+ u32 sub_job; -+ mali_bool job_is_done; ++#endif /* _KBASE_10969_WORKAROUND_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c +new file mode 100755 +index 000000000..f910fe970 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c +@@ -0,0 +1,102 @@ ++/* ++ * ++ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ /* Extracts the needed HW status from core and reset */ -+ job = mali_group_complete_pp(group, success, &sub_job); + -+ MALI_DEBUG_ASSERT_POINTER(job); ++#include + -+ /* Core is now ready to go into idle list */ -+ if (mali_group_is_virtual(group)) { -+ virtual_group_state = EXEC_STATE_IDLE; -+ } else { -+ /* Move from working to idle state */ -+ mali_executor_change_state_pp_physical(group, -+ &group_list_working, -+ &group_list_working_count, -+ &group_list_idle, -+ &group_list_idle_count); -+ } ++#include ++#include + -+ /* It is the executor module which owns the jobs themselves by now */ -+ mali_pp_job_mark_sub_job_completed(job, success); -+ job_is_done = mali_pp_job_is_complete(job); ++#ifdef CONFIG_DEBUG_FS ++#ifdef CONFIG_MALI_DEBUG + -+ if (job_is_done) { -+ /* This will potentially queue more GP and PP jobs */ -+ mali_timeline_tracker_release(&job->tracker); -+ } ++static int kbase_as_fault_read(struct seq_file *sfile, void *data) ++{ ++ uintptr_t as_no = (uintptr_t) sfile->private; + -+ return job; -+} ++ struct list_head *entry; ++ const struct list_head *kbdev_list; ++ struct kbase_device *kbdev = NULL; + -+static void mali_executor_complete_group(struct mali_group *group, -+ mali_bool success, -+ struct mali_gp_job **gp_job_done, -+ struct mali_pp_job **pp_job_done) -+{ -+ struct mali_gp_core *gp_core = mali_group_get_gp_core(group); -+ struct mali_pp_core *pp_core = mali_group_get_pp_core(group); -+ struct mali_gp_job *gp_job = NULL; -+ struct mali_pp_job *pp_job = NULL; -+ mali_bool pp_job_is_done = MALI_TRUE; ++ kbdev_list = kbase_dev_list_get(); + -+ if (NULL != gp_core) { -+ gp_job = mali_executor_complete_gp(group, success); -+ } else { -+ MALI_DEBUG_ASSERT_POINTER(pp_core); -+ MALI_IGNORE(pp_core); -+ pp_job = mali_executor_complete_pp(group, success); ++ list_for_each(entry, kbdev_list) { ++ kbdev = list_entry(entry, struct kbase_device, entry); + -+ pp_job_is_done = mali_pp_job_is_complete(pp_job); -+ } ++ if(kbdev->debugfs_as_read_bitmap & (1ULL << as_no)) { + -+ if (pause_count > 0) { -+ /* Execution has been suspended */ ++ /* don't show this one again until another fault occors */ ++ kbdev->debugfs_as_read_bitmap &= ~(1ULL << as_no); + -+ if (!mali_executor_is_working()) { -+ /* Last job completed, wake up sleepers */ -+ _mali_osk_wait_queue_wake_up( -+ executor_working_wait_queue); ++ /* output the last page fault addr */ ++ seq_printf(sfile, "%llu\n", (u64) kbdev->as[as_no].fault_addr); + } -+ } else if (MALI_TRUE == mali_group_disable_requested(group)) { -+ mali_executor_core_scale_in_group_complete(group); + -+ mali_executor_schedule(); -+ } else { -+ /* try to schedule new jobs */ -+ mali_executor_schedule(); + } + -+ if (NULL != gp_job) { -+ MALI_DEBUG_ASSERT_POINTER(gp_job_done); -+ *gp_job_done = gp_job; -+ } else if (pp_job_is_done) { -+ MALI_DEBUG_ASSERT_POINTER(pp_job); -+ MALI_DEBUG_ASSERT_POINTER(pp_job_done); -+ *pp_job_done = pp_job; -+ } ++ kbase_dev_list_put(kbdev_list); ++ ++ return 0; +} + -+static void mali_executor_change_state_pp_physical(struct mali_group *group, -+ _mali_osk_list_t *old_list, -+ u32 *old_count, -+ _mali_osk_list_t *new_list, -+ u32 *new_count) ++static int kbase_as_fault_debugfs_open(struct inode *in, struct file *file) +{ -+ /* -+ * It's a bit more complicated to change the state for the physical PP -+ * groups since their state is determined by the list they are on. -+ */ -+#if defined(DEBUG) -+ mali_bool found = MALI_FALSE; -+ struct mali_group *group_iter; -+ struct mali_group *temp; -+ u32 old_counted = 0; -+ u32 new_counted = 0; ++ return single_open(file, kbase_as_fault_read , in->i_private); ++} + -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(old_list); -+ MALI_DEBUG_ASSERT_POINTER(old_count); -+ MALI_DEBUG_ASSERT_POINTER(new_list); -+ MALI_DEBUG_ASSERT_POINTER(new_count); ++static const struct file_operations as_fault_fops = { ++ .open = kbase_as_fault_debugfs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; + -+ /* -+ * Verify that group is present on old list, -+ * and that the count is correct -+ */ ++#endif /* CONFIG_MALI_DEBUG */ ++#endif /* CONFIG_DEBUG_FS */ + -+ _MALI_OSK_LIST_FOREACHENTRY(group_iter, temp, old_list, -+ struct mali_group, executor_list) { -+ old_counted++; -+ if (group == group_iter) { -+ found = MALI_TRUE; -+ } -+ } ++/* ++ * Initialize debugfs entry for each address space ++ */ ++void kbase_as_fault_debugfs_init(struct kbase_device *kbdev) ++{ ++#ifdef CONFIG_DEBUG_FS ++#ifdef CONFIG_MALI_DEBUG ++ uint i; ++ char as_name[64]; ++ struct dentry *debugfs_directory; + -+ _MALI_OSK_LIST_FOREACHENTRY(group_iter, temp, new_list, -+ struct mali_group, executor_list) { -+ new_counted++; -+ } ++ kbdev->debugfs_as_read_bitmap = 0ULL; + -+ if (MALI_FALSE == found) { -+ if (old_list == &group_list_idle) { -+ MALI_DEBUG_PRINT(1, (" old Group list is idle,")); -+ } else if (old_list == &group_list_inactive) { -+ MALI_DEBUG_PRINT(1, (" old Group list is inactive,")); -+ } else if (old_list == &group_list_working) { -+ MALI_DEBUG_PRINT(1, (" old Group list is working,")); -+ } else if (old_list == &group_list_disabled) { -+ MALI_DEBUG_PRINT(1, (" old Group list is disable,")); -+ } ++ KBASE_DEBUG_ASSERT(kbdev->nr_hw_address_spaces); ++ KBASE_DEBUG_ASSERT(sizeof(kbdev->as[0].fault_addr) == sizeof(u64)); + -+ if (MALI_TRUE == mali_executor_group_is_in_state(group, EXEC_STATE_WORKING)) { -+ MALI_DEBUG_PRINT(1, (" group in working \n")); -+ } else if (MALI_TRUE == mali_executor_group_is_in_state(group, EXEC_STATE_INACTIVE)) { -+ MALI_DEBUG_PRINT(1, (" group in inactive \n")); -+ } else if (MALI_TRUE == mali_executor_group_is_in_state(group, EXEC_STATE_IDLE)) { -+ MALI_DEBUG_PRINT(1, (" group in idle \n")); -+ } else if (MALI_TRUE == mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED)) { -+ MALI_DEBUG_PRINT(1, (" but group in disabled \n")); ++ debugfs_directory = debugfs_create_dir("address_spaces", ++ kbdev->mali_debugfs_directory); ++ ++ if(debugfs_directory) { ++ for(i = 0; i < kbdev->nr_hw_address_spaces; i++) { ++ snprintf(as_name, ARRAY_SIZE(as_name), "as%u", i); ++ debugfs_create_file(as_name, S_IRUGO, ++ debugfs_directory, (void*) ((uintptr_t) i), &as_fault_fops); + } + } ++ else ++ dev_warn(kbdev->dev, "unable to create address_spaces debugfs directory"); + -+ MALI_DEBUG_ASSERT(MALI_TRUE == found); -+ MALI_DEBUG_ASSERT(0 < (*old_count)); -+ MALI_DEBUG_ASSERT((*old_count) == old_counted); -+ MALI_DEBUG_ASSERT((*new_count) == new_counted); -+#endif -+ -+ _mali_osk_list_move(&group->executor_list, new_list); -+ (*old_count)--; -+ (*new_count)++; -+} -+ -+static void mali_executor_set_state_pp_physical(struct mali_group *group, -+ _mali_osk_list_t *new_list, -+ u32 *new_count) -+{ -+ _mali_osk_list_add(&group->executor_list, new_list); -+ (*new_count)++; ++#endif /* CONFIG_MALI_DEBUG */ ++#endif /* CONFIG_DEBUG_FS */ ++ return; +} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h +new file mode 100755 +index 000000000..3ed224889 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h +@@ -0,0 +1,45 @@ ++/* ++ * ++ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+static mali_bool mali_executor_group_is_in_state(struct mali_group *group, -+ enum mali_executor_state_t state) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ -+ if (gp_group == group) { -+ if (gp_group_state == state) { -+ return MALI_TRUE; -+ } -+ } else if (virtual_group == group || mali_group_is_in_virtual(group)) { -+ if (virtual_group_state == state) { -+ return MALI_TRUE; -+ } -+ } else { -+ /* Physical PP group */ -+ struct mali_group *group_iter; -+ struct mali_group *temp; -+ _mali_osk_list_t *list; + -+ if (EXEC_STATE_DISABLED == state) { -+ list = &group_list_disabled; -+ } else if (EXEC_STATE_INACTIVE == state) { -+ list = &group_list_inactive; -+ } else if (EXEC_STATE_IDLE == state) { -+ list = &group_list_idle; -+ } else { -+ MALI_DEBUG_ASSERT(EXEC_STATE_WORKING == state); -+ list = &group_list_working; -+ } + -+ _MALI_OSK_LIST_FOREACHENTRY(group_iter, temp, list, -+ struct mali_group, executor_list) { -+ if (group_iter == group) { -+ return MALI_TRUE; -+ } -+ } -+ } ++#ifndef _KBASE_AS_FAULT_DEBUG_FS_H ++#define _KBASE_AS_FAULT_DEBUG_FS_H + -+ /* group not in correct state */ -+ return MALI_FALSE; -+} ++/** ++ * kbase_as_fault_debugfs_init() - Add debugfs files for reporting page faults ++ * ++ * @kbdev: Pointer to kbase_device ++ */ ++void kbase_as_fault_debugfs_init(struct kbase_device *kbdev); + -+static void mali_executor_group_enable_internal(struct mali_group *group) ++/** ++ * kbase_as_fault_debugfs_new() - make the last fault available on debugfs ++ * ++ * @kbdev: Pointer to kbase_device ++ * @as_no: The address space the fault occurred on ++ */ ++static inline void ++kbase_as_fault_debugfs_new(struct kbase_device *kbdev, int as_no) +{ -+ MALI_DEBUG_ASSERT(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED)); ++#ifdef CONFIG_DEBUG_FS ++#ifdef CONFIG_MALI_DEBUG ++ kbdev->debugfs_as_read_bitmap |= (1ULL << as_no); ++#endif /* CONFIG_DEBUG_FS */ ++#endif /* CONFIG_MALI_DEBUG */ ++ return; ++} + -+ /* Put into inactive state (== "lowest" enabled state) */ -+ if (group == gp_group) { -+ MALI_DEBUG_ASSERT(EXEC_STATE_DISABLED == gp_group_state); -+ gp_group_state = EXEC_STATE_INACTIVE; -+ } else { -+ mali_executor_change_state_pp_physical(group, -+ &group_list_disabled, -+ &group_list_disabled_count, -+ &group_list_inactive, -+ &group_list_inactive_count); ++#endif /*_KBASE_AS_FAULT_DEBUG_FS_H*/ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c +new file mode 100755 +index 000000000..c67b3e97f +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c +@@ -0,0 +1,64 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ ++num_physical_pp_cores_enabled; -+ MALI_DEBUG_PRINT(4, ("Enabling group id %d \n", group->pp_core->core_id)); -+ } + -+ if (MALI_GROUP_STATE_ACTIVE == mali_group_activate(group)) { -+ MALI_DEBUG_ASSERT(MALI_TRUE == mali_group_power_is_on(group)); + -+ /* Move from inactive to idle */ -+ if (group == gp_group) { -+ gp_group_state = EXEC_STATE_IDLE; -+ } else { -+ mali_executor_change_state_pp_physical(group, -+ &group_list_inactive, -+ &group_list_inactive_count, -+ &group_list_idle, -+ &group_list_idle_count); + -+ if (mali_executor_has_virtual_group()) { -+ if (mali_executor_physical_rejoin_virtual(group)) { -+ mali_pm_update_async(); -+ } -+ } -+ } -+ } else { -+ mali_pm_update_async(); -+ } -+} + -+static void mali_executor_group_disable_internal(struct mali_group *group) -+{ -+ mali_bool working; ++/* ++ * Cache Policy API. ++ */ + -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(!mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED)); ++#include "mali_kbase_cache_policy.h" + -+ working = mali_executor_group_is_in_state(group, EXEC_STATE_WORKING); -+ if (MALI_TRUE == working) { -+ /** Group to be disabled once it completes current work, -+ * when virtual group completes, also check child groups for this flag */ -+ mali_group_set_disable_request(group, MALI_TRUE); -+ return; -+ } ++/* ++ * The output flags should be a combination of the following values: ++ * KBASE_REG_CPU_CACHED: CPU cache should be enabled. ++ */ ++u32 kbase_cache_enabled(u32 flags, u32 nr_pages) ++{ ++ u32 cache_flags = 0; + -+ /* Put into disabled state */ -+ if (group == gp_group) { -+ /* GP group */ -+ MALI_DEBUG_ASSERT(EXEC_STATE_WORKING != gp_group_state); -+ gp_group_state = EXEC_STATE_DISABLED; -+ } else { -+ if (mali_group_is_in_virtual(group)) { -+ /* A child group of virtual group. move the specific group from virtual group */ -+ MALI_DEBUG_ASSERT(EXEC_STATE_WORKING != virtual_group_state); ++ CSTD_UNUSED(nr_pages); + -+ mali_executor_set_state_pp_physical(group, -+ &group_list_disabled, -+ &group_list_disabled_count); ++ if (flags & BASE_MEM_CACHED_CPU) ++ cache_flags |= KBASE_REG_CPU_CACHED; + -+ mali_group_remove_group(virtual_group, group); -+ mali_executor_disable_empty_virtual(); -+ } else { -+ mali_executor_change_group_status_disabled(group); -+ } ++ return cache_flags; ++} + -+ --num_physical_pp_cores_enabled; -+ MALI_DEBUG_PRINT(4, ("Disabling group id %d \n", group->pp_core->core_id)); -+ } + -+ if (MALI_GROUP_STATE_INACTIVE != group->state) { -+ if (MALI_TRUE == mali_group_deactivate(group)) { -+ mali_pm_update_async(); -+ } -+ } ++void kbase_sync_single_for_device(struct kbase_device *kbdev, dma_addr_t handle, ++ size_t size, enum dma_data_direction dir) ++{ ++/* Check if kernel is using coherency with GPU */ ++#ifdef CONFIG_MALI_COH_KERN ++ if (kbdev->system_coherency == COHERENCY_ACE) ++ return; ++#endif /* CONFIG_MALI_COH_KERN */ ++ dma_sync_single_for_device(kbdev->dev, handle, size, dir); +} + -+static void mali_executor_notify_core_change(u32 num_cores) -+{ -+ mali_bool done = MALI_FALSE; + -+ if (mali_is_mali450() || mali_is_mali470()) { ++void kbase_sync_single_for_cpu(struct kbase_device *kbdev, dma_addr_t handle, ++ size_t size, enum dma_data_direction dir) ++{ ++/* Check if kernel is using coherency with GPU */ ++#ifdef CONFIG_MALI_COH_KERN ++ if (kbdev->system_coherency == COHERENCY_ACE) + return; -+ } ++#endif /* CONFIG_MALI_COH_KERN */ ++ dma_sync_single_for_cpu(kbdev->dev, handle, size, dir); ++} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h +new file mode 100755 +index 000000000..0c18bdb35 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h +@@ -0,0 +1,45 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2013, 2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ /* -+ * This function gets a bit complicated because we can't hold the session lock while -+ * allocating notification objects. -+ */ -+ while (!done) { -+ u32 i; -+ u32 num_sessions_alloc; -+ u32 num_sessions_with_lock; -+ u32 used_notification_objects = 0; -+ _mali_osk_notification_t **notobjs; + -+ /* Pre allocate the number of notifications objects we need right now (might change after lock has been taken) */ -+ num_sessions_alloc = mali_session_get_count(); -+ if (0 == num_sessions_alloc) { -+ /* No sessions to report to */ -+ return; -+ } + -+ notobjs = (_mali_osk_notification_t **)_mali_osk_malloc(sizeof(_mali_osk_notification_t *) * num_sessions_alloc); -+ if (NULL == notobjs) { -+ MALI_PRINT_ERROR(("Failed to notify user space session about num PP core change (alloc failure)\n")); -+ /* there is probably no point in trying again, system must be really low on memory and probably unusable now anyway */ -+ return; -+ } + -+ for (i = 0; i < num_sessions_alloc; i++) { -+ notobjs[i] = _mali_osk_notification_create(_MALI_NOTIFICATION_PP_NUM_CORE_CHANGE, sizeof(_mali_uk_pp_num_cores_changed_s)); -+ if (NULL != notobjs[i]) { -+ _mali_uk_pp_num_cores_changed_s *data = notobjs[i]->result_buffer; -+ data->number_of_enabled_cores = num_cores; -+ } else { -+ MALI_PRINT_ERROR(("Failed to notify user space session about num PP core change (alloc failure %u)\n", i)); -+ } -+ } + -+ mali_session_lock(); ++/* ++ * Cache Policy API. ++ */ + -+ /* number of sessions will not change while we hold the lock */ -+ num_sessions_with_lock = mali_session_get_count(); ++#ifndef _KBASE_CACHE_POLICY_H_ ++#define _KBASE_CACHE_POLICY_H_ + -+ if (num_sessions_alloc >= num_sessions_with_lock) { -+ /* We have allocated enough notification objects for all the sessions atm */ -+ struct mali_session_data *session, *tmp; -+ MALI_SESSION_FOREACH(session, tmp, link) { -+ MALI_DEBUG_ASSERT(used_notification_objects < num_sessions_alloc); -+ if (NULL != notobjs[used_notification_objects]) { -+ mali_session_send_notification(session, notobjs[used_notification_objects]); -+ notobjs[used_notification_objects] = NULL; /* Don't track this notification object any more */ -+ } -+ used_notification_objects++; -+ } -+ done = MALI_TRUE; -+ } ++#include "mali_kbase.h" ++#include "mali_base_kernel.h" + -+ mali_session_unlock(); ++/** ++ * kbase_cache_enabled - Choose the cache policy for a specific region ++ * @flags: flags describing attributes of the region ++ * @nr_pages: total number of pages (backed or not) for the region ++ * ++ * Tells whether the CPU and GPU caches should be enabled or not for a specific ++ * region. ++ * This function can be modified to customize the cache policy depending on the ++ * flags and size of the region. ++ * ++ * Return: a combination of %KBASE_REG_CPU_CACHED and %KBASE_REG_GPU_CACHED ++ * depending on the cache policy ++ */ ++u32 kbase_cache_enabled(u32 flags, u32 nr_pages); + -+ /* Delete any remaining/unused notification objects */ -+ for (; used_notification_objects < num_sessions_alloc; used_notification_objects++) { -+ if (NULL != notobjs[used_notification_objects]) { -+ _mali_osk_notification_delete(notobjs[used_notification_objects]); -+ } -+ } ++#endif /* _KBASE_CACHE_POLICY_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_config.c b/drivers/gpu/arm/midgard/mali_kbase_config.c +new file mode 100755 +index 000000000..fb615ae02 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_config.c +@@ -0,0 +1,51 @@ ++/* ++ * ++ * (C) COPYRIGHT 2011-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ _mali_osk_free(notobjs); -+ } -+} + -+static mali_bool mali_executor_core_scaling_is_done(void *data) -+{ -+ u32 i; -+ u32 num_groups; -+ mali_bool ret = MALI_TRUE; + -+ MALI_IGNORE(data); + -+ mali_executor_lock(); + -+ num_groups = mali_group_get_glob_num_groups(); ++#include ++#include ++#include + -+ for (i = 0; i < num_groups; i++) { -+ struct mali_group *group = mali_group_get_glob_group(i); ++int kbasep_platform_device_init(struct kbase_device *kbdev) ++{ ++ struct kbase_platform_funcs_conf *platform_funcs_p; + -+ if (NULL != group) { -+ if (MALI_TRUE == group->disable_requested && NULL != mali_group_get_pp_core(group)) { -+ ret = MALI_FALSE; -+ break; -+ } -+ } -+ } -+ mali_executor_unlock(); ++ platform_funcs_p = (struct kbase_platform_funcs_conf *)PLATFORM_FUNCS; ++ if (platform_funcs_p && platform_funcs_p->platform_init_func) ++ return platform_funcs_p->platform_init_func(kbdev); + -+ return ret; ++ return 0; +} + -+static void mali_executor_wq_notify_core_change(void *arg) ++void kbasep_platform_device_term(struct kbase_device *kbdev) +{ -+ MALI_IGNORE(arg); ++ struct kbase_platform_funcs_conf *platform_funcs_p; + -+ if (mali_is_mali450() || mali_is_mali470()) { -+ return; -+ } ++ platform_funcs_p = (struct kbase_platform_funcs_conf *)PLATFORM_FUNCS; ++ if (platform_funcs_p && platform_funcs_p->platform_term_func) ++ platform_funcs_p->platform_term_func(kbdev); ++} + -+ _mali_osk_wait_queue_wait_event(executor_notify_core_change_wait_queue, -+ mali_executor_core_scaling_is_done, NULL); ++int kbase_cpuprops_get_default_clock_speed(u32 * const clock_speed) ++{ ++ KBASE_DEBUG_ASSERT(NULL != clock_speed); + -+ mali_executor_notify_core_change(num_physical_pp_cores_enabled); ++ *clock_speed = 100; ++ return 0; +} + -+/** -+ * Clear all disable request from the _last_ core scaling behavior. +diff --git a/drivers/gpu/arm/midgard/mali_kbase_config.h b/drivers/gpu/arm/midgard/mali_kbase_config.h +new file mode 100755 +index 000000000..356d52bcd +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_config.h +@@ -0,0 +1,345 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ -+static void mali_executor_core_scaling_reset(void) -+{ -+ u32 i; -+ u32 num_groups; -+ -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); + -+ num_groups = mali_group_get_glob_num_groups(); + -+ for (i = 0; i < num_groups; i++) { -+ struct mali_group *group = mali_group_get_glob_group(i); + -+ if (NULL != group) { -+ group->disable_requested = MALI_FALSE; -+ } -+ } + -+ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { -+ core_scaling_delay_up_mask[i] = 0; -+ } -+} + -+static void mali_executor_core_scale(unsigned int target_core_nr) -+{ -+ int current_core_scaling_mask[MALI_MAX_NUMBER_OF_DOMAINS] = { 0 }; -+ int target_core_scaling_mask[MALI_MAX_NUMBER_OF_DOMAINS] = { 0 }; -+ int i; ++/** ++ * @file mali_kbase_config.h ++ * Configuration API and Attributes for KBase ++ */ + -+ MALI_DEBUG_ASSERT(0 < target_core_nr); -+ MALI_DEBUG_ASSERT(num_physical_pp_cores_total >= target_core_nr); ++#ifndef _KBASE_CONFIG_H_ ++#define _KBASE_CONFIG_H_ + -+ mali_executor_lock(); ++#include + -+ if (target_core_nr < num_physical_pp_cores_enabled) { -+ MALI_DEBUG_PRINT(2, ("Requesting %d cores: disabling %d cores\n", target_core_nr, num_physical_pp_cores_enabled - target_core_nr)); -+ } else { -+ MALI_DEBUG_PRINT(2, ("Requesting %d cores: enabling %d cores\n", target_core_nr, target_core_nr - num_physical_pp_cores_enabled)); -+ } ++#include ++#include + -+ /* When a new core scaling request is comming, we should remove the un-doing -+ * part of the last core scaling request. It's safe because we have only one -+ * lock(executor lock) protection. */ -+ mali_executor_core_scaling_reset(); ++/** ++ * @addtogroup base_api ++ * @{ ++ */ + -+ mali_pm_get_best_power_cost_mask(num_physical_pp_cores_enabled, current_core_scaling_mask); -+ mali_pm_get_best_power_cost_mask(target_core_nr, target_core_scaling_mask); ++/** ++ * @addtogroup base_kbase_api ++ * @{ ++ */ + -+ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { -+ target_core_scaling_mask[i] = target_core_scaling_mask[i] - current_core_scaling_mask[i]; -+ MALI_DEBUG_PRINT(5, ("target_core_scaling_mask[%d] = %d\n", i, target_core_scaling_mask[i])); -+ } ++/** ++ * @addtogroup kbase_config Configuration API and Attributes ++ * @{ ++ */ + -+ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { -+ if (0 > target_core_scaling_mask[i]) { -+ struct mali_pm_domain *domain; ++#include + -+ domain = mali_pm_domain_get_from_index(i); ++/* Forward declaration of struct kbase_device */ ++struct kbase_device; + -+ /* Domain is valid and has pp cores */ -+ if ((NULL != domain) && !(_mali_osk_list_empty(&domain->group_list))) { -+ struct mali_group *group; -+ struct mali_group *temp; ++/** ++ * kbase_platform_funcs_conf - Specifies platform init/term function pointers ++ * ++ * Specifies the functions pointers for platform specific initialization and ++ * termination. By default no functions are required. No additional platform ++ * specific control is necessary. ++ */ ++struct kbase_platform_funcs_conf { ++ /** ++ * platform_init_func - platform specific init function pointer ++ * @kbdev - kbase_device pointer ++ * ++ * Returns 0 on success, negative error code otherwise. ++ * ++ * Function pointer for platform specific initialization or NULL if no ++ * initialization function is required. At the point this the GPU is ++ * not active and its power and clocks are in unknown (platform specific ++ * state) as kbase doesn't yet have control of power and clocks. ++ * ++ * The platform specific private pointer kbase_device::platform_context ++ * can be accessed (and possibly initialized) in here. ++ */ ++ int (*platform_init_func)(struct kbase_device *kbdev); ++ /** ++ * platform_term_func - platform specific termination function pointer ++ * @kbdev - kbase_device pointer ++ * ++ * Function pointer for platform specific termination or NULL if no ++ * termination function is required. At the point this the GPU will be ++ * idle but still powered and clocked. ++ * ++ * The platform specific private pointer kbase_device::platform_context ++ * can be accessed (and possibly terminated) in here. ++ */ ++ void (*platform_term_func)(struct kbase_device *kbdev); ++}; + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &domain->group_list, struct mali_group, pm_domain_list) { -+ if (NULL != mali_group_get_pp_core(group) && (!mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED)) -+ && (!mali_group_is_virtual(group))) { -+ mali_executor_group_disable_internal(group); -+ target_core_scaling_mask[i]++; -+ if ((0 == target_core_scaling_mask[i])) { -+ break; -+ } ++/* ++ * @brief Specifies the callbacks for power management ++ * ++ * By default no callbacks will be made and the GPU must not be powered off. ++ */ ++struct kbase_pm_callback_conf { ++ /** Callback for when the GPU is idle and the power to it can be switched off. ++ * ++ * The system integrator can decide whether to either do nothing, just switch off ++ * the clocks to the GPU, or to completely power down the GPU. ++ * The platform specific private pointer kbase_device::platform_context can be accessed and modified in here. It is the ++ * platform \em callbacks responsibility to initialize and terminate this pointer if used (see @ref kbase_platform_funcs_conf). ++ */ ++ void (*power_off_callback)(struct kbase_device *kbdev); + -+ } -+ } -+ } -+ } -+ } ++ /** Callback for when the GPU is about to become active and power must be supplied. ++ * ++ * This function must not return until the GPU is powered and clocked sufficiently for register access to ++ * succeed. The return value specifies whether the GPU was powered down since the call to power_off_callback. ++ * If the GPU state has been lost then this function must return 1, otherwise it should return 0. ++ * The platform specific private pointer kbase_device::platform_context can be accessed and modified in here. It is the ++ * platform \em callbacks responsibility to initialize and terminate this pointer if used (see @ref kbase_platform_funcs_conf). ++ * ++ * The return value of the first call to this function is ignored. ++ * ++ * @return 1 if the GPU state may have been lost, 0 otherwise. ++ */ ++ int (*power_on_callback)(struct kbase_device *kbdev); + -+ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { -+ /** -+ * Target_core_scaling_mask[i] is bigger than 0, -+ * means we need to enable some pp cores in -+ * this domain whose domain index is i. -+ */ -+ if (0 < target_core_scaling_mask[i]) { -+ struct mali_pm_domain *domain; ++ /** Callback for when the system is requesting a suspend and GPU power ++ * must be switched off. ++ * ++ * Note that if this callback is present, then this may be called ++ * without a preceding call to power_off_callback. Therefore this ++ * callback must be able to take any action that might otherwise happen ++ * in power_off_callback. ++ * ++ * The platform specific private pointer kbase_device::platform_context ++ * can be accessed and modified in here. It is the platform \em ++ * callbacks responsibility to initialize and terminate this pointer if ++ * used (see @ref kbase_platform_funcs_conf). ++ */ ++ void (*power_suspend_callback)(struct kbase_device *kbdev); + -+ if (num_physical_pp_cores_enabled >= target_core_nr) { -+ break; -+ } ++ /** Callback for when the system is resuming from a suspend and GPU ++ * power must be switched on. ++ * ++ * Note that if this callback is present, then this may be called ++ * without a following call to power_on_callback. Therefore this ++ * callback must be able to take any action that might otherwise happen ++ * in power_on_callback. ++ * ++ * The platform specific private pointer kbase_device::platform_context ++ * can be accessed and modified in here. It is the platform \em ++ * callbacks responsibility to initialize and terminate this pointer if ++ * used (see @ref kbase_platform_funcs_conf). ++ */ ++ void (*power_resume_callback)(struct kbase_device *kbdev); + -+ domain = mali_pm_domain_get_from_index(i); ++ /** Callback for handling runtime power management initialization. ++ * ++ * The runtime power management callbacks @ref power_runtime_off_callback and @ref power_runtime_on_callback ++ * will become active from calls made to the OS from within this function. ++ * The runtime calls can be triggered by calls from @ref power_off_callback and @ref power_on_callback. ++ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. ++ * ++ * @return 0 on success, else int error code. ++ */ ++ int (*power_runtime_init_callback)(struct kbase_device *kbdev); + -+ /* Domain is valid and has pp cores */ -+ if ((NULL != domain) && !(_mali_osk_list_empty(&domain->group_list))) { -+ struct mali_group *group; -+ struct mali_group *temp; ++ /** Callback for handling runtime power management termination. ++ * ++ * The runtime power management callbacks @ref power_runtime_off_callback and @ref power_runtime_on_callback ++ * should no longer be called by the OS on completion of this function. ++ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. ++ */ ++ void (*power_runtime_term_callback)(struct kbase_device *kbdev); + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &domain->group_list, struct mali_group, pm_domain_list) { -+ if (NULL != mali_group_get_pp_core(group) && mali_executor_group_is_in_state(group, EXEC_STATE_DISABLED) -+ && (!mali_group_is_virtual(group))) { -+ mali_executor_group_enable_internal(group); -+ target_core_scaling_mask[i]--; ++ /** Callback for runtime power-off power management callback ++ * ++ * For linux this callback will be called by the kernel runtime_suspend callback. ++ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. ++ * ++ * @return 0 on success, else OS error code. ++ */ ++ void (*power_runtime_off_callback)(struct kbase_device *kbdev); + -+ if ((0 == target_core_scaling_mask[i]) || num_physical_pp_cores_enabled == target_core_nr) { -+ break; -+ } -+ } -+ } -+ } -+ } -+ } ++ /** Callback for runtime power-on power management callback ++ * ++ * For linux this callback will be called by the kernel runtime_resume callback. ++ * Note: for linux the kernel must have CONFIG_PM_RUNTIME enabled to use this feature. ++ */ ++ int (*power_runtime_on_callback)(struct kbase_device *kbdev); + -+ /** -+ * Here, we may still have some pp cores not been enabled because of some -+ * pp cores need to be disabled are still in working state. ++ /* ++ * Optional callback for checking if GPU can be suspended when idle ++ * ++ * This callback will be called by the runtime power management core ++ * when the reference count goes to 0 to provide notification that the ++ * GPU now seems idle. ++ * ++ * If this callback finds that the GPU can't be powered off, or handles ++ * suspend by powering off directly or queueing up a power off, a ++ * non-zero value must be returned to prevent the runtime PM core from ++ * also triggering a suspend. ++ * ++ * Returning 0 will cause the runtime PM core to conduct a regular ++ * autosuspend. ++ * ++ * This callback is optional and if not provided regular autosuspend ++ * will be triggered. ++ * ++ * Note: The Linux kernel must have CONFIG_PM_RUNTIME enabled to use ++ * this feature. ++ * ++ * Return 0 if GPU can be suspended, positive value if it can not be ++ * suspeneded by runtime PM, else OS error code + */ -+ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { -+ if (0 < target_core_scaling_mask[i]) { -+ core_scaling_delay_up_mask[i] = target_core_scaling_mask[i]; -+ } -+ } ++ int (*power_runtime_idle_callback)(struct kbase_device *kbdev); ++}; + -+ mali_executor_schedule(); -+ mali_executor_unlock(); -+} ++/** ++ * kbase_cpuprops_get_default_clock_speed - default for CPU_SPEED_FUNC ++ * @clock_speed - see kbase_cpu_clk_speed_func for details on the parameters ++ * ++ * Returns 0 on success, negative error code otherwise. ++ * ++ * Default implementation of CPU_SPEED_FUNC. This function sets clock_speed ++ * to 100, so will be an underestimate for any real system. ++ */ ++int kbase_cpuprops_get_default_clock_speed(u32 * const clock_speed); + -+static void mali_executor_core_scale_in_group_complete(struct mali_group *group) -+{ -+ int num_pp_cores_disabled = 0; -+ int num_pp_cores_to_enable = 0; -+ int i; ++/** ++ * kbase_cpu_clk_speed_func - Type of the function pointer for CPU_SPEED_FUNC ++ * @param clock_speed - pointer to store the current CPU clock speed in MHz ++ * ++ * Returns 0 on success, otherwise negative error code. ++ * ++ * This is mainly used to implement OpenCL's clGetDeviceInfo(). ++ */ ++typedef int (*kbase_cpu_clk_speed_func) (u32 *clock_speed); + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(MALI_TRUE == mali_group_disable_requested(group)); ++/** ++ * kbase_gpu_clk_speed_func - Type of the function pointer for GPU_SPEED_FUNC ++ * @param clock_speed - pointer to store the current GPU clock speed in MHz ++ * ++ * Returns 0 on success, otherwise negative error code. ++ * When an error is returned the caller assumes maximum GPU speed stored in ++ * gpu_freq_khz_max. ++ * ++ * If the system timer is not available then this function is required ++ * for the OpenCL queue profiling to return correct timing information. ++ * ++ */ ++typedef int (*kbase_gpu_clk_speed_func) (u32 *clock_speed); + -+ /* Disable child group of virtual group */ -+ if (mali_group_is_virtual(group)) { -+ struct mali_group *child; -+ struct mali_group *temp; ++#ifdef CONFIG_OF ++struct kbase_platform_config { ++}; ++#else + -+ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { -+ if (MALI_TRUE == mali_group_disable_requested(child)) { -+ mali_group_set_disable_request(child, MALI_FALSE); -+ mali_executor_group_disable_internal(child); -+ num_pp_cores_disabled++; -+ } -+ } -+ mali_group_set_disable_request(group, MALI_FALSE); -+ } else { -+ mali_executor_group_disable_internal(group); -+ mali_group_set_disable_request(group, MALI_FALSE); -+ if (NULL != mali_group_get_pp_core(group)) { -+ num_pp_cores_disabled++; -+ } -+ } ++/* ++ * @brief Specifies start and end of I/O memory region. ++ */ ++struct kbase_io_memory_region { ++ u64 start; ++ u64 end; ++}; + -+ num_pp_cores_to_enable = num_pp_cores_disabled; ++/* ++ * @brief Specifies I/O related resources like IRQs and memory region for I/O operations. ++ */ ++struct kbase_io_resources { ++ u32 job_irq_number; ++ u32 mmu_irq_number; ++ u32 gpu_irq_number; ++ struct kbase_io_memory_region io_memory_region; ++}; + -+ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { -+ if (0 < core_scaling_delay_up_mask[i]) { -+ struct mali_pm_domain *domain; ++struct kbase_platform_config { ++ const struct kbase_io_resources *io_resources; ++}; + -+ if (0 == num_pp_cores_to_enable) { -+ break; -+ } ++#endif /* CONFIG_OF */ + -+ domain = mali_pm_domain_get_from_index(i); ++/** ++ * @brief Gets the pointer to platform config. ++ * ++ * @return Pointer to the platform config ++ */ ++struct kbase_platform_config *kbase_get_platform_config(void); + -+ /* Domain is valid and has pp cores */ -+ if ((NULL != domain) && !(_mali_osk_list_empty(&domain->group_list))) { -+ struct mali_group *disabled_group; -+ struct mali_group *temp; ++/** ++ * kbasep_platform_device_init: - Platform specific call to initialize hardware ++ * @kbdev: kbase device pointer ++ * ++ * Function calls a platform defined routine if specified in the configuration ++ * attributes. The routine can initialize any hardware and context state that ++ * is required for the GPU block to function. ++ * ++ * Return: 0 if no errors have been found in the config. ++ * Negative error code otherwise. ++ */ ++int kbasep_platform_device_init(struct kbase_device *kbdev); + -+ _MALI_OSK_LIST_FOREACHENTRY(disabled_group, temp, &domain->group_list, struct mali_group, pm_domain_list) { -+ if (NULL != mali_group_get_pp_core(disabled_group) && mali_executor_group_is_in_state(disabled_group, EXEC_STATE_DISABLED)) { -+ mali_executor_group_enable_internal(disabled_group); -+ core_scaling_delay_up_mask[i]--; -+ num_pp_cores_to_enable--; ++/** ++ * kbasep_platform_device_term - Platform specific call to terminate hardware ++ * @kbdev: Kbase device pointer ++ * ++ * Function calls a platform defined routine if specified in the configuration ++ * attributes. The routine can destroy any platform specific context state and ++ * shut down any hardware functionality that are outside of the Power Management ++ * callbacks. ++ * ++ */ ++void kbasep_platform_device_term(struct kbase_device *kbdev); + -+ if ((0 == core_scaling_delay_up_mask[i]) || 0 == num_pp_cores_to_enable) { -+ break; -+ } -+ } -+ } -+ } -+ } -+ } + -+ _mali_osk_wait_queue_wake_up(executor_notify_core_change_wait_queue); -+} ++/** ++ * kbase_platform_early_init - Early initialisation of the platform code ++ * ++ * This function will be called when the module is loaded to perform any ++ * early initialisation required by the platform code. Such as reading ++ * platform specific device tree entries for the GPU. ++ * ++ * Return: 0 for success, any other fail causes module initialisation to fail ++ */ ++int kbase_platform_early_init(void); + -+static void mali_executor_change_group_status_disabled(struct mali_group *group) -+{ -+ /* Physical PP group */ -+ mali_bool idle; ++#ifndef CONFIG_OF ++#ifdef CONFIG_MALI_PLATFORM_FAKE ++/** ++ * kbase_platform_fake_register - Register a platform device for the GPU ++ * ++ * This can be used to register a platform device on systems where device tree ++ * is not enabled and the platform initialisation code in the kernel doesn't ++ * create the GPU device. Where possible device tree should be used instead. ++ * ++ * Return: 0 for success, any other fail causes module initialisation to fail ++ */ ++int kbase_platform_fake_register(void); + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++/** ++ * kbase_platform_fake_unregister - Unregister a fake platform device ++ * ++ * Unregister the platform device created with kbase_platform_fake_register() ++ */ ++void kbase_platform_fake_unregister(void); ++#endif ++#endif + -+ idle = mali_executor_group_is_in_state(group, EXEC_STATE_IDLE); -+ if (MALI_TRUE == idle) { -+ mali_executor_change_state_pp_physical(group, -+ &group_list_idle, -+ &group_list_idle_count, -+ &group_list_disabled, -+ &group_list_disabled_count); -+ } else { -+ mali_executor_change_state_pp_physical(group, -+ &group_list_inactive, -+ &group_list_inactive_count, -+ &group_list_disabled, -+ &group_list_disabled_count); -+ } -+} ++ /** @} *//* end group kbase_config */ ++ /** @} *//* end group base_kbase_api */ ++ /** @} *//* end group base_api */ + -+static mali_bool mali_executor_deactivate_list_idle(mali_bool deactivate_idle_group) -+{ -+ mali_bool trigger_pm_update = MALI_FALSE; ++#endif /* _KBASE_CONFIG_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h b/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h +new file mode 100755 +index 000000000..1cf44b350 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h +@@ -0,0 +1,227 @@ ++/* ++ * ++ * (C) COPYRIGHT 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ if (group_list_idle_count > 0) { -+ if (mali_executor_has_virtual_group()) { + -+ /* Rejoin virtual group on Mali-450 */ + -+ struct mali_group *group; -+ struct mali_group *temp; ++/** ++ * @file mali_kbase_config_defaults.h ++ * ++ * Default values for configuration settings ++ * ++ */ + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, -+ &group_list_idle, -+ struct mali_group, executor_list) { -+ if (mali_executor_physical_rejoin_virtual( -+ group)) { -+ trigger_pm_update = MALI_TRUE; -+ } -+ } -+ } else if (deactivate_idle_group) { -+ struct mali_group *group; -+ struct mali_group *temp; ++#ifndef _KBASE_CONFIG_DEFAULTS_H_ ++#define _KBASE_CONFIG_DEFAULTS_H_ + -+ /* Deactivate group on Mali-300/400 */ ++/* Include mandatory definitions per platform */ ++#include + -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, -+ &group_list_idle, -+ struct mali_group, executor_list) { -+ if (mali_group_deactivate(group)) { -+ trigger_pm_update = MALI_TRUE; -+ } ++/** ++* Boolean indicating whether the driver is configured to be secure at ++* a potential loss of performance. ++* ++* This currently affects only r0p0-15dev0 HW and earlier. ++* ++* On r0p0-15dev0 HW and earlier, there are tradeoffs between security and ++* performance: ++* ++* - When this is set to true, the driver remains fully secure, ++* but potentially loses performance compared with setting this to ++* false. ++* - When set to false, the driver is open to certain security ++* attacks. ++* ++* From r0p0-00rel0 and onwards, there is no security loss by setting ++* this to false, and no performance loss by setting it to ++* true. ++*/ ++#define DEFAULT_SECURE_BUT_LOSS_OF_PERFORMANCE false + -+ /* Move from idle to inactive */ -+ mali_executor_change_state_pp_physical(group, -+ &group_list_idle, -+ &group_list_idle_count, -+ &group_list_inactive, -+ &group_list_inactive_count); -+ } -+ } -+ } ++enum { ++ /** ++ * Use unrestricted Address ID width on the AXI bus. ++ */ ++ KBASE_AID_32 = 0x0, + -+ return trigger_pm_update; -+} ++ /** ++ * Restrict GPU to a half of maximum Address ID count. ++ * This will reduce performance, but reduce bus load due to GPU. ++ */ ++ KBASE_AID_16 = 0x3, + -+void mali_executor_running_status_print(void) -+{ -+ struct mali_group *group = NULL; -+ struct mali_group *temp = NULL; ++ /** ++ * Restrict GPU to a quarter of maximum Address ID count. ++ * This will reduce performance, but reduce bus load due to GPU. ++ */ ++ KBASE_AID_8 = 0x2, + -+ MALI_PRINT(("GP running job: %p\n", gp_group->gp_running_job)); -+ if ((gp_group->gp_core) && (gp_group->is_working)) { -+ mali_group_dump_status(gp_group); -+ } -+ MALI_PRINT(("Physical PP groups in WORKING state (count = %u):\n", group_list_working_count)); -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_working, struct mali_group, executor_list) { -+ MALI_PRINT(("PP running job: %p, subjob %d \n", group->pp_running_job, group->pp_running_sub_job)); -+ mali_group_dump_status(group); -+ } -+ MALI_PRINT(("Physical PP groups in INACTIVE state (count = %u):\n", group_list_inactive_count)); -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_inactive, struct mali_group, executor_list) { -+ MALI_PRINT(("\tPP status %d, SW power: %s\n", group->state, group->power_is_on ? "On" : "Off")); -+ MALI_PRINT(("\tPP #%d: %s\n", group->pp_core->core_id, group->pp_core->hw_core.description)); -+ } -+ MALI_PRINT(("Physical PP groups in IDLE state (count = %u):\n", group_list_idle_count)); -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_idle, struct mali_group, executor_list) { -+ MALI_PRINT(("\tPP status %d, SW power: %s\n", group->state, group->power_is_on ? "On" : "Off")); -+ MALI_PRINT(("\tPP #%d: %s\n", group->pp_core->core_id, group->pp_core->hw_core.description)); -+ } -+ MALI_PRINT(("Physical PP groups in DISABLED state (count = %u):\n", group_list_disabled_count)); -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &group_list_disabled, struct mali_group, executor_list) { -+ MALI_PRINT(("\tPP status %d, SW power: %s\n", group->state, group->power_is_on ? "On" : "Off")); -+ MALI_PRINT(("\tPP #%d: %s\n", group->pp_core->core_id, group->pp_core->hw_core.description)); -+ } ++ /** ++ * Restrict GPU to an eighth of maximum Address ID count. ++ * This will reduce performance, but reduce bus load due to GPU. ++ */ ++ KBASE_AID_4 = 0x1 ++}; + -+ if (mali_executor_has_virtual_group()) { -+ MALI_PRINT(("Virtual group running job: %p\n", virtual_group->pp_running_job)); -+ MALI_PRINT(("Virtual group status: %d\n", virtual_group_state)); -+ MALI_PRINT(("Virtual group->status: %d\n", virtual_group->state)); -+ MALI_PRINT(("\tSW power: %s\n", virtual_group->power_is_on ? "On" : "Off")); -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &virtual_group->group_list, -+ struct mali_group, group_list) { -+ int i = 0; -+ MALI_PRINT(("\tchild group(%s) running job: %p\n", group->pp_core->hw_core.description, group->pp_running_job)); -+ MALI_PRINT(("\tchild group(%s)->status: %d\n", group->pp_core->hw_core.description, group->state)); -+ MALI_PRINT(("\tchild group(%s) SW power: %s\n", group->pp_core->hw_core.description, group->power_is_on ? "On" : "Off")); -+ if (group->pm_domain) { -+ MALI_PRINT(("\tPower domain: id %u\n", mali_pm_domain_get_id(group->pm_domain))); -+ MALI_PRINT(("\tMask:0x%04x \n", mali_pm_domain_get_mask(group->pm_domain))); -+ MALI_PRINT(("\tUse-count:%u \n", mali_pm_domain_get_use_count(group->pm_domain))); -+ MALI_PRINT(("\tCurrent power status:%s \n", (mali_pm_domain_get_mask(group->pm_domain)& mali_pm_get_current_mask()) ? "On" : "Off")); -+ MALI_PRINT(("\tWanted power status:%s \n", (mali_pm_domain_get_mask(group->pm_domain)& mali_pm_get_wanted_mask()) ? "On" : "Off")); -+ } ++/** ++ * Default setting for read Address ID limiting on AXI bus. ++ * ++ * Attached value: u32 register value ++ * KBASE_AID_32 - use the full 32 IDs (5 ID bits) ++ * KBASE_AID_16 - use 16 IDs (4 ID bits) ++ * KBASE_AID_8 - use 8 IDs (3 ID bits) ++ * KBASE_AID_4 - use 4 IDs (2 ID bits) ++ * Default value: KBASE_AID_32 (no limit). Note hardware implementation ++ * may limit to a lower value. ++ */ ++#define DEFAULT_ARID_LIMIT KBASE_AID_32 + -+ for (i = 0; i < 2; i++) { -+ if (NULL != group->l2_cache_core[i]) { -+ struct mali_pm_domain *domain; -+ domain = mali_l2_cache_get_pm_domain(group->l2_cache_core[i]); -+ MALI_PRINT(("\t L2(index %d) group SW power: %s\n", i, group->l2_cache_core[i]->power_is_on ? "On" : "Off")); -+ if (domain) { -+ MALI_PRINT(("\tL2 Power domain: id %u\n", mali_pm_domain_get_id(domain))); -+ MALI_PRINT(("\tL2 Mask:0x%04x \n", mali_pm_domain_get_mask(domain))); -+ MALI_PRINT(("\tL2 Use-count:%u \n", mali_pm_domain_get_use_count(domain))); -+ MALI_PRINT(("\tL2 Current power status:%s \n", (mali_pm_domain_get_mask(domain) & mali_pm_get_current_mask()) ? "On" : "Off")); -+ MALI_PRINT(("\tL2 Wanted power status:%s \n", (mali_pm_domain_get_mask(domain) & mali_pm_get_wanted_mask()) ? "On" : "Off")); -+ } -+ } -+ } -+ } -+ if (EXEC_STATE_WORKING == virtual_group_state) { -+ mali_group_dump_status(virtual_group); -+ } -+ } -+} ++/** ++ * Default setting for write Address ID limiting on AXI. ++ * ++ * Attached value: u32 register value ++ * KBASE_AID_32 - use the full 32 IDs (5 ID bits) ++ * KBASE_AID_16 - use 16 IDs (4 ID bits) ++ * KBASE_AID_8 - use 8 IDs (3 ID bits) ++ * KBASE_AID_4 - use 4 IDs (2 ID bits) ++ * Default value: KBASE_AID_32 (no limit). Note hardware implementation ++ * may limit to a lower value. ++ */ ++#define DEFAULT_AWID_LIMIT KBASE_AID_32 + -+void mali_executor_status_dump(void) -+{ -+ mali_executor_lock(); -+ mali_scheduler_lock(); ++/** ++ * Default UMP device mapping. A UMP_DEVICE__SHIFT value which ++ * defines which UMP device this GPU should be mapped to. ++ */ ++#define DEFAULT_UMP_GPU_DEVICE_SHIFT UMP_DEVICE_Z_SHIFT + -+ /* print schedule queue status */ -+ mali_scheduler_gp_pp_job_queue_print(); ++/* ++ * Default period for DVFS sampling ++ */ ++// #define DEFAULT_PM_DVFS_PERIOD 100 /* 100ms */ ++#define DEFAULT_PM_DVFS_PERIOD 20 /* 20 ms */ + -+ mali_scheduler_unlock(); -+ mali_executor_unlock(); -+} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_executor.h b/drivers/gpu/arm/mali400/mali/common/mali_executor.h -new file mode 100755 -index 000000000000..4224d6a6cdc4 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.h -@@ -0,0 +1,102 @@ +/* -+ * Copyright (C) 2012, 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * Power Management poweroff tick granuality. This is in nanoseconds to ++ * allow HR timer support. ++ * ++ * On each scheduling tick, the power manager core may decide to: ++ * -# Power off one or more shader cores ++ * -# Power off the entire GPU + */ ++#define DEFAULT_PM_GPU_POWEROFF_TICK_NS (400000) /* 400us */ + -+#ifndef __MALI_EXECUTOR_H__ -+#define __MALI_EXECUTOR_H__ ++/* ++ * Power Manager number of ticks before shader cores are powered off ++ */ ++#define DEFAULT_PM_POWEROFF_TICK_SHADER (2) /* 400-800us */ + -+#include "mali_osk.h" -+#include "mali_scheduler_types.h" -+#include "mali_kernel_common.h" ++/* ++ * Power Manager number of ticks before GPU is powered off ++ */ ++#define DEFAULT_PM_POWEROFF_TICK_GPU (2) /* 400-800us */ + -+typedef enum { -+ MALI_EXECUTOR_HINT_GP_BOUND = 0 -+#define MALI_EXECUTOR_HINT_MAX 1 -+} mali_executor_hint; ++/* ++ * Default scheduling tick granuality ++ */ ++#define DEFAULT_JS_SCHEDULING_PERIOD_NS (100000000u) /* 100ms */ + -+extern mali_bool mali_executor_hints[MALI_EXECUTOR_HINT_MAX]; ++/* ++ * Default minimum number of scheduling ticks before jobs are soft-stopped. ++ * ++ * This defines the time-slice for a job (which may be different from that of a ++ * context) ++ */ ++#define DEFAULT_JS_SOFT_STOP_TICKS (1) /* 100ms-200ms */ + -+/* forward declare struct instead of using include */ -+struct mali_session_data; -+struct mali_group; -+struct mali_pp_core; ++/* ++ * Default minimum number of scheduling ticks before CL jobs are soft-stopped. ++ */ ++#define DEFAULT_JS_SOFT_STOP_TICKS_CL (1) /* 100ms-200ms */ + -+extern _mali_osk_spinlock_irq_t *mali_executor_lock_obj; ++/* ++ * Default minimum number of scheduling ticks before jobs are hard-stopped ++ */ ++#define DEFAULT_JS_HARD_STOP_TICKS_SS (50) /* 5s */ ++#define DEFAULT_JS_HARD_STOP_TICKS_SS_8408 (300) /* 30s */ + -+#define MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD() MALI_DEBUG_ASSERT_LOCK_HELD(mali_executor_lock_obj); ++/* ++ * Default minimum number of scheduling ticks before CL jobs are hard-stopped. ++ */ ++#define DEFAULT_JS_HARD_STOP_TICKS_CL (50) /* 5s */ + -+_mali_osk_errcode_t mali_executor_initialize(void); -+void mali_executor_terminate(void); ++/* ++ * Default minimum number of scheduling ticks before jobs are hard-stopped ++ * during dumping ++ */ ++#define DEFAULT_JS_HARD_STOP_TICKS_DUMPING (15000) /* 1500s */ + -+void mali_executor_populate(void); -+void mali_executor_depopulate(void); ++/* ++ * Default timeout for some software jobs, after which the software event wait ++ * jobs will be cancelled. ++ */ ++#define DEFAULT_JS_SOFT_JOB_TIMEOUT (3000) /* 3s */ + -+void mali_executor_suspend(void); -+void mali_executor_resume(void); ++/* ++ * Default minimum number of scheduling ticks before the GPU is reset to clear a ++ * "stuck" job ++ */ ++#define DEFAULT_JS_RESET_TICKS_SS (55) /* 5.5s */ ++#define DEFAULT_JS_RESET_TICKS_SS_8408 (450) /* 45s */ + -+u32 mali_executor_get_num_cores_total(void); -+u32 mali_executor_get_num_cores_enabled(void); -+struct mali_pp_core *mali_executor_get_virtual_pp(void); -+struct mali_group *mali_executor_get_virtual_group(void); ++/* ++ * Default minimum number of scheduling ticks before the GPU is reset to clear a ++ * "stuck" CL job. ++ */ ++#define DEFAULT_JS_RESET_TICKS_CL (55) /* 5.5s */ + -+void mali_executor_zap_all_active(struct mali_session_data *session); ++/* ++ * Default minimum number of scheduling ticks before the GPU is reset to clear a ++ * "stuck" job during dumping. ++ */ ++#define DEFAULT_JS_RESET_TICKS_DUMPING (15020) /* 1502s */ + -+/** -+ * Schedule GP and PP according to bitmask. ++/* ++ * Default number of milliseconds given for other jobs on the GPU to be ++ * soft-stopped when the GPU needs to be reset. ++ */ ++#define DEFAULT_RESET_TIMEOUT_MS (3000) /* 3s */ ++ ++/* ++ * Default timeslice that a context is scheduled in for, in nanoseconds. + * -+ * @param mask A scheduling bitmask. -+ * @param deferred_schedule MALI_TRUE if schedule should be deferred, MALI_FALSE if not. ++ * When a context has used up this amount of time across its jobs, it is ++ * scheduled out to let another run. ++ * ++ * @note the resolution is nanoseconds (ns) here, because that's the format ++ * often used by the OS. + */ -+void mali_executor_schedule_from_mask(mali_scheduler_mask mask, mali_bool deferred_schedule); ++#define DEFAULT_JS_CTX_TIMESLICE_NS (50000000) /* 50ms */ + -+_mali_osk_errcode_t mali_executor_interrupt_gp(struct mali_group *group, mali_bool in_upper_half); -+_mali_osk_errcode_t mali_executor_interrupt_pp(struct mali_group *group, mali_bool in_upper_half); -+_mali_osk_errcode_t mali_executor_interrupt_mmu(struct mali_group *group, mali_bool in_upper_half); -+void mali_executor_group_power_up(struct mali_group *groups[], u32 num_groups); -+void mali_executor_group_power_down(struct mali_group *groups[], u32 num_groups); ++/* ++ * Perform GPU power down using only platform specific code, skipping DDK power ++ * management. ++ * ++ * If this is non-zero then kbase will avoid powering down shader cores, the ++ * tiler, and the L2 cache, instead just powering down the entire GPU through ++ * platform specific code. This may be required for certain platform ++ * integrations. ++ * ++ * Note that as this prevents kbase from powering down shader cores, this limits ++ * the available power policies to coarse_demand and always_on. ++ */ ++#define PLATFORM_POWER_DOWN_ONLY (1) + -+void mali_executor_abort_session(struct mali_session_data *session); ++#endif /* _KBASE_CONFIG_DEFAULTS_H_ */ + -+void mali_executor_core_scaling_enable(void); -+void mali_executor_core_scaling_disable(void); -+mali_bool mali_executor_core_scaling_is_enabled(void); +diff --git a/drivers/gpu/arm/midgard/mali_kbase_context.c b/drivers/gpu/arm/midgard/mali_kbase_context.c +new file mode 100755 +index 000000000..6338a7e22 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_context.c +@@ -0,0 +1,342 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+void mali_executor_group_enable(struct mali_group *group); -+void mali_executor_group_disable(struct mali_group *group); -+mali_bool mali_executor_group_is_disabled(struct mali_group *group); + -+int mali_executor_set_perf_level(unsigned int target_core_nr, mali_bool override); + -+#if MALI_STATE_TRACKING -+u32 mali_executor_dump_state(char *buf, u32 size); -+#endif + -+MALI_STATIC_INLINE void mali_executor_hint_enable(mali_executor_hint hint) -+{ -+ MALI_DEBUG_ASSERT(hint < MALI_EXECUTOR_HINT_MAX); -+ mali_executor_hints[hint] = MALI_TRUE; -+} + -+MALI_STATIC_INLINE void mali_executor_hint_disable(mali_executor_hint hint) -+{ -+ MALI_DEBUG_ASSERT(hint < MALI_EXECUTOR_HINT_MAX); -+ mali_executor_hints[hint] = MALI_FALSE; -+} ++/* ++ * Base kernel context APIs ++ */ + -+MALI_STATIC_INLINE mali_bool mali_executor_hint_is_enabled(mali_executor_hint hint) -+{ -+ MALI_DEBUG_ASSERT(hint < MALI_EXECUTOR_HINT_MAX); -+ return mali_executor_hints[hint]; -+} ++#include ++#include ++#include ++#include ++#include + -+void mali_executor_running_status_print(void); -+void mali_executor_status_dump(void); -+void mali_executor_lock(void); -+void mali_executor_unlock(void); -+#endif /* __MALI_EXECUTOR_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp.c b/drivers/gpu/arm/mali400/mali/common/mali_gp.c -new file mode 100755 -index 000000000000..7d3d4aff7c3f ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.c -@@ -0,0 +1,357 @@ -+/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * kbase_create_context() - Create a kernel base context. ++ * @kbdev: Kbase device ++ * @is_compat: Force creation of a 32-bit context ++ * ++ * Allocate and init a kernel base context. ++ * ++ * Return: new kbase context + */ ++struct kbase_context * ++kbase_create_context(struct kbase_device *kbdev, bool is_compat) ++{ ++ struct kbase_context *kctx; ++ int err; + -+#include "mali_gp.h" -+#include "mali_hw_core.h" -+#include "mali_group.h" -+#include "mali_osk.h" -+#include "regs/mali_gp_regs.h" -+#include "mali_kernel_common.h" -+#include "mali_kernel_core.h" -+#if defined(CONFIG_MALI400_PROFILING) -+#include "mali_osk_profiling.h" -+#endif ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+static struct mali_gp_core *mali_global_gp_core = NULL; ++ /* zero-inited as lot of code assume it's zero'ed out on create */ ++ kctx = vzalloc(sizeof(*kctx)); + -+/* Interrupt handlers */ -+static void mali_gp_irq_probe_trigger(void *data); -+static _mali_osk_errcode_t mali_gp_irq_probe_ack(void *data); ++ if (!kctx) ++ goto out; + -+struct mali_gp_core *mali_gp_create(const _mali_osk_resource_t *resource, struct mali_group *group) -+{ -+ struct mali_gp_core *core = NULL; ++ /* creating a context is considered a disjoint event */ ++ kbase_disjoint_event(kbdev); + -+ MALI_DEBUG_ASSERT(NULL == mali_global_gp_core); -+ MALI_DEBUG_PRINT(2, ("Mali GP: Creating Mali GP core: %s\n", resource->description)); ++ kctx->kbdev = kbdev; ++ kctx->as_nr = KBASEP_AS_NR_INVALID; ++ atomic_set(&kctx->refcount, 0); ++ if (is_compat) ++ kbase_ctx_flag_set(kctx, KCTX_COMPAT); ++#ifdef CONFIG_MALI_TRACE_TIMELINE ++ kctx->timeline.owner_tgid = task_tgid_nr(current); ++#endif ++ atomic_set(&kctx->setup_complete, 0); ++ atomic_set(&kctx->setup_in_progress, 0); ++ spin_lock_init(&kctx->mm_update_lock); ++ kctx->process_mm = NULL; ++ atomic_set(&kctx->nonmapped_pages, 0); ++ kctx->slots_pullable = 0; ++ kctx->tgid = current->tgid; ++ kctx->pid = current->pid; + -+ core = _mali_osk_malloc(sizeof(struct mali_gp_core)); -+ if (NULL != core) { -+ if (_MALI_OSK_ERR_OK == mali_hw_core_create(&core->hw_core, resource, MALIGP2_REGISTER_ADDRESS_SPACE_SIZE)) { -+ _mali_osk_errcode_t ret; ++ err = kbase_mem_pool_init(&kctx->mem_pool, ++ kbdev->mem_pool_max_size_default, ++ kctx->kbdev, &kbdev->mem_pool); ++ if (err) ++ goto free_kctx; + -+ ret = mali_gp_reset(core); ++ err = kbase_mem_evictable_init(kctx); ++ if (err) ++ goto free_pool; + -+ if (_MALI_OSK_ERR_OK == ret) { -+ ret = mali_group_add_gp_core(group, core); -+ if (_MALI_OSK_ERR_OK == ret) { -+ /* Setup IRQ handlers (which will do IRQ probing if needed) */ -+ core->irq = _mali_osk_irq_init(resource->irq, -+ mali_group_upper_half_gp, -+ group, -+ mali_gp_irq_probe_trigger, -+ mali_gp_irq_probe_ack, -+ core, -+ resource->description); -+ if (NULL != core->irq) { -+ MALI_DEBUG_PRINT(4, ("Mali GP: set global gp core from 0x%08X to 0x%08X\n", mali_global_gp_core, core)); -+ mali_global_gp_core = core; ++ atomic_set(&kctx->used_pages, 0); + -+ return core; -+ } else { -+ MALI_PRINT_ERROR(("Mali GP: Failed to setup interrupt handlers for GP core %s\n", core->hw_core.description)); -+ } -+ mali_group_remove_gp_core(group); -+ } else { -+ MALI_PRINT_ERROR(("Mali GP: Failed to add core %s to group\n", core->hw_core.description)); -+ } -+ } -+ mali_hw_core_delete(&core->hw_core); -+ } ++ err = kbase_jd_init(kctx); ++ if (err) ++ goto deinit_evictable; + -+ _mali_osk_free(core); -+ } else { -+ MALI_PRINT_ERROR(("Failed to allocate memory for GP core\n")); -+ } ++ err = kbasep_js_kctx_init(kctx); ++ if (err) ++ goto free_jd; /* safe to call kbasep_js_kctx_term in this case */ + -+ return NULL; -+} ++ err = kbase_event_init(kctx); ++ if (err) ++ goto free_jd; + -+void mali_gp_delete(struct mali_gp_core *core) -+{ -+ MALI_DEBUG_ASSERT_POINTER(core); ++ atomic_set(&kctx->drain_pending, 0); + -+ _mali_osk_irq_term(core->irq); -+ mali_hw_core_delete(&core->hw_core); -+ mali_global_gp_core = NULL; -+ _mali_osk_free(core); -+} ++ mutex_init(&kctx->reg_lock); + -+void mali_gp_stop_bus(struct mali_gp_core *core) -+{ -+ MALI_DEBUG_ASSERT_POINTER(core); ++ INIT_LIST_HEAD(&kctx->waiting_soft_jobs); ++ spin_lock_init(&kctx->waiting_soft_jobs_lock); ++#ifdef CONFIG_KDS ++ INIT_LIST_HEAD(&kctx->waiting_kds_resource); ++#endif ++ err = kbase_dma_fence_init(kctx); ++ if (err) ++ goto free_event; + -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_CMD, MALIGP2_REG_VAL_CMD_STOP_BUS); -+} ++ err = kbase_mmu_init(kctx); ++ if (err) ++ goto term_dma_fence; + -+_mali_osk_errcode_t mali_gp_stop_bus_wait(struct mali_gp_core *core) -+{ -+ int i; ++ do { ++ err = kbase_mem_pool_grow(&kctx->mem_pool, ++ MIDGARD_MMU_BOTTOMLEVEL); ++ if (err) ++ goto pgd_no_mem; + -+ MALI_DEBUG_ASSERT_POINTER(core); ++ mutex_lock(&kctx->mmu_lock); ++ kctx->pgd = kbase_mmu_alloc_pgd(kctx); ++ mutex_unlock(&kctx->mmu_lock); ++ } while (!kctx->pgd); + -+ /* Send the stop bus command. */ -+ mali_gp_stop_bus(core); ++ kctx->aliasing_sink_page = kbase_mem_alloc_page(kctx->kbdev); ++ if (!kctx->aliasing_sink_page) ++ goto no_sink_page; + -+ /* Wait for bus to be stopped */ -+ for (i = 0; i < MALI_REG_POLL_COUNT_SLOW; i++) { -+ if (mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_STATUS) & MALIGP2_REG_VAL_STATUS_BUS_STOPPED) { -+ break; -+ } -+ } ++ init_waitqueue_head(&kctx->event_queue); + -+ if (MALI_REG_POLL_COUNT_SLOW == i) { -+ MALI_PRINT_ERROR(("Mali GP: Failed to stop bus on %s\n", core->hw_core.description)); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ return _MALI_OSK_ERR_OK; -+} ++ kctx->cookies = KBASE_COOKIE_MASK; + -+void mali_gp_hard_reset(struct mali_gp_core *core) -+{ -+ const u32 reset_wait_target_register = MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_LIMIT; -+ const u32 reset_invalid_value = 0xC0FFE000; -+ const u32 reset_check_value = 0xC01A0000; -+ const u32 reset_default_value = 0; -+ int i; ++ /* Make sure page 0 is not used... */ ++ err = kbase_region_tracker_init(kctx); ++ if (err) ++ goto no_region_tracker; + -+ MALI_DEBUG_ASSERT_POINTER(core); -+ MALI_DEBUG_PRINT(4, ("Mali GP: Hard reset of core %s\n", core->hw_core.description)); ++ err = kbase_sticky_resource_init(kctx); ++ if (err) ++ goto no_sticky; + -+ mali_hw_core_register_write(&core->hw_core, reset_wait_target_register, reset_invalid_value); ++ err = kbase_jit_init(kctx); ++ if (err) ++ goto no_jit; ++#ifdef CONFIG_GPU_TRACEPOINTS ++ atomic_set(&kctx->jctx.work_id, 0); ++#endif ++#ifdef CONFIG_MALI_TRACE_TIMELINE ++ atomic_set(&kctx->timeline.jd_atoms_in_flight, 0); ++#endif + -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_CMD, MALIGP2_REG_VAL_CMD_RESET); ++ kctx->id = atomic_add_return(1, &(kbdev->ctx_num)) - 1; + -+ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; i++) { -+ mali_hw_core_register_write(&core->hw_core, reset_wait_target_register, reset_check_value); -+ if (reset_check_value == mali_hw_core_register_read(&core->hw_core, reset_wait_target_register)) { -+ break; -+ } -+ } ++ mutex_init(&kctx->vinstr_cli_lock); + -+ if (MALI_REG_POLL_COUNT_FAST == i) { -+ MALI_PRINT_ERROR(("Mali GP: The hard reset loop didn't work, unable to recover\n")); -+ } ++ timer_setup(&kctx->soft_job_timeout, ++ kbasep_soft_job_timeout_worker, ++ 0); + -+ mali_hw_core_register_write(&core->hw_core, reset_wait_target_register, reset_default_value); /* set it back to the default */ -+ /* Re-enable interrupts */ -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_CLEAR, MALIGP2_REG_VAL_IRQ_MASK_ALL); -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_MASK, MALIGP2_REG_VAL_IRQ_MASK_USED); ++ return kctx; + ++no_jit: ++ kbase_gpu_vm_lock(kctx); ++ kbase_sticky_resource_term(kctx); ++ kbase_gpu_vm_unlock(kctx); ++no_sticky: ++ kbase_region_tracker_term(kctx); ++no_region_tracker: ++ kbase_mem_pool_free(&kctx->mem_pool, kctx->aliasing_sink_page, false); ++no_sink_page: ++ /* VM lock needed for the call to kbase_mmu_free_pgd */ ++ kbase_gpu_vm_lock(kctx); ++ kbase_mmu_free_pgd(kctx); ++ kbase_gpu_vm_unlock(kctx); ++pgd_no_mem: ++ kbase_mmu_term(kctx); ++term_dma_fence: ++ kbase_dma_fence_term(kctx); ++free_event: ++ kbase_event_cleanup(kctx); ++free_jd: ++ /* Safe to call this one even when didn't initialize (assuming kctx was sufficiently zeroed) */ ++ kbasep_js_kctx_term(kctx); ++ kbase_jd_exit(kctx); ++deinit_evictable: ++ kbase_mem_evictable_deinit(kctx); ++free_pool: ++ kbase_mem_pool_term(&kctx->mem_pool); ++free_kctx: ++ vfree(kctx); ++out: ++ return NULL; +} ++KBASE_EXPORT_SYMBOL(kbase_create_context); + -+void mali_gp_reset_async(struct mali_gp_core *core) ++static void kbase_reg_pending_dtor(struct kbase_va_region *reg) +{ -+ MALI_DEBUG_ASSERT_POINTER(core); ++ dev_dbg(reg->kctx->kbdev->dev, "Freeing pending unmapped region\n"); ++ kbase_mem_phy_alloc_put(reg->cpu_alloc); ++ kbase_mem_phy_alloc_put(reg->gpu_alloc); ++ kfree(reg); ++} + -+ MALI_DEBUG_PRINT(4, ("Mali GP: Reset of core %s\n", core->hw_core.description)); ++/** ++ * kbase_destroy_context - Destroy a kernel base context. ++ * @kctx: Context to destroy ++ * ++ * Calls kbase_destroy_os_context() to free OS specific structures. ++ * Will release all outstanding regions. ++ */ ++void kbase_destroy_context(struct kbase_context *kctx) ++{ ++ struct kbase_device *kbdev; ++ int pages; ++ unsigned long pending_regions_to_clean; ++ unsigned long flags; + -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_MASK, 0); /* disable the IRQs */ -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_CLEAR, MALI400GP_REG_VAL_IRQ_RESET_COMPLETED); -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_CMD, MALI400GP_REG_VAL_CMD_SOFT_RESET); ++ KBASE_DEBUG_ASSERT(NULL != kctx); + -+} ++ kbdev = kctx->kbdev; ++ KBASE_DEBUG_ASSERT(NULL != kbdev); + -+_mali_osk_errcode_t mali_gp_reset_wait(struct mali_gp_core *core) -+{ -+ int i; -+ u32 rawstat = 0; ++ KBASE_TRACE_ADD(kbdev, CORE_CTX_DESTROY, kctx, NULL, 0u, 0u); + -+ MALI_DEBUG_ASSERT_POINTER(core); ++ /* Ensure the core is powered up for the destroy process */ ++ /* A suspend won't happen here, because we're in a syscall from a userspace ++ * thread. */ ++ kbase_pm_context_active(kbdev); + -+ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; i++) { -+ rawstat = mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_RAWSTAT); -+ if (rawstat & MALI400GP_REG_VAL_IRQ_RESET_COMPLETED) { -+ break; -+ } -+ } ++ kbase_jd_zap_context(kctx); + -+ if (i == MALI_REG_POLL_COUNT_FAST) { -+ MALI_PRINT_ERROR(("Mali GP: Failed to reset core %s, rawstat: 0x%08x\n", -+ core->hw_core.description, rawstat)); -+ return _MALI_OSK_ERR_FAULT; -+ } ++#ifdef CONFIG_DEBUG_FS ++ /* Removing the rest of the debugfs entries here as we want to keep the ++ * atom debugfs interface alive until all atoms have completed. This ++ * is useful for debugging hung contexts. */ ++ debugfs_remove_recursive(kctx->kctx_dentry); ++#endif + -+ /* Re-enable interrupts */ -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_CLEAR, MALIGP2_REG_VAL_IRQ_MASK_ALL); -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_MASK, MALIGP2_REG_VAL_IRQ_MASK_USED); ++ kbase_event_cleanup(kctx); + -+ return _MALI_OSK_ERR_OK; -+} ++ /* ++ * JIT must be terminated before the code below as it must be called ++ * without the region lock being held. ++ * The code above ensures no new JIT allocations can be made by ++ * by the time we get to this point of context tear down. ++ */ ++ kbase_jit_term(kctx); + -+_mali_osk_errcode_t mali_gp_reset(struct mali_gp_core *core) -+{ -+ mali_gp_reset_async(core); -+ return mali_gp_reset_wait(core); -+} ++ kbase_gpu_vm_lock(kctx); + -+void mali_gp_job_start(struct mali_gp_core *core, struct mali_gp_job *job) -+{ -+ u32 startcmd = 0; -+ u32 *frame_registers = mali_gp_job_get_frame_registers(job); -+ u32 counter_src0 = mali_gp_job_get_perf_counter_src0(job); -+ u32 counter_src1 = mali_gp_job_get_perf_counter_src1(job); ++ kbase_sticky_resource_term(kctx); + -+ MALI_DEBUG_ASSERT_POINTER(core); ++ /* MMU is disabled as part of scheduling out the context */ ++ kbase_mmu_free_pgd(kctx); + -+ if (mali_gp_job_has_vs_job(job)) { -+ startcmd |= (u32) MALIGP2_REG_VAL_CMD_START_VS; -+ } ++ /* drop the aliasing sink page now that it can't be mapped anymore */ ++ kbase_mem_pool_free(&kctx->mem_pool, kctx->aliasing_sink_page, false); + -+ if (mali_gp_job_has_plbu_job(job)) { -+ startcmd |= (u32) MALIGP2_REG_VAL_CMD_START_PLBU; -+ } ++ /* free pending region setups */ ++ pending_regions_to_clean = (~kctx->cookies) & KBASE_COOKIE_MASK; ++ while (pending_regions_to_clean) { ++ unsigned int cookie = __ffs(pending_regions_to_clean); + -+ MALI_DEBUG_ASSERT(0 != startcmd); ++ BUG_ON(!kctx->pending_regions[cookie]); + -+ mali_hw_core_register_write_array_relaxed(&core->hw_core, MALIGP2_REG_ADDR_MGMT_VSCL_START_ADDR, frame_registers, MALIGP2_NUM_REGS_FRAME); ++ kbase_reg_pending_dtor(kctx->pending_regions[cookie]); + -+ if (MALI_HW_CORE_NO_COUNTER != counter_src0) { -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_SRC, counter_src0); -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_ENABLE, MALIGP2_REG_VAL_PERF_CNT_ENABLE); -+ } -+ if (MALI_HW_CORE_NO_COUNTER != counter_src1) { -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PERF_CNT_1_SRC, counter_src1); -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PERF_CNT_1_ENABLE, MALIGP2_REG_VAL_PERF_CNT_ENABLE); ++ kctx->pending_regions[cookie] = NULL; ++ pending_regions_to_clean &= ~(1UL << cookie); + } + -+ MALI_DEBUG_PRINT(3, ("Mali GP: Starting job (0x%08x) on core %s with command 0x%08X\n", job, core->hw_core.description, startcmd)); ++ kbase_region_tracker_term(kctx); ++ kbase_gpu_vm_unlock(kctx); + -+ mali_hw_core_register_write_relaxed(&core->hw_core, MALIGP2_REG_ADDR_MGMT_CMD, MALIGP2_REG_VAL_CMD_UPDATE_PLBU_ALLOC); ++ /* Safe to call this one even when didn't initialize (assuming kctx was sufficiently zeroed) */ ++ kbasep_js_kctx_term(kctx); + -+ /* Barrier to make sure the previous register write is finished */ -+ _mali_osk_write_mem_barrier(); ++ kbase_jd_exit(kctx); + -+ /* This is the command that starts the core. -+ * -+ * Don't actually run the job if PROFILING_SKIP_PP_JOBS are set, just -+ * force core to assert the completion interrupt. -+ */ -+#if !defined(PROFILING_SKIP_GP_JOBS) -+ mali_hw_core_register_write_relaxed(&core->hw_core, MALIGP2_REG_ADDR_MGMT_CMD, startcmd); -+#else -+ { -+ u32 bits = 0; ++ kbase_pm_context_idle(kbdev); + -+ if (mali_gp_job_has_vs_job(job)) -+ bits = MALIGP2_REG_VAL_IRQ_VS_END_CMD_LST; -+ if (mali_gp_job_has_plbu_job(job)) -+ bits |= MALIGP2_REG_VAL_IRQ_PLBU_END_CMD_LST; ++ kbase_dma_fence_term(kctx); + -+ mali_hw_core_register_write_relaxed(&core->hw_core, -+ MALIGP2_REG_ADDR_MGMT_INT_RAWSTAT, bits); -+ } -+#endif ++ mutex_lock(&kbdev->mmu_hw_mutex); ++ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, flags); ++ kbase_ctx_sched_remove_ctx(kctx); ++ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); + -+ /* Barrier to make sure the previous register write is finished */ -+ _mali_osk_write_mem_barrier(); -+} ++ kbase_mmu_term(kctx); + -+void mali_gp_resume_with_new_heap(struct mali_gp_core *core, u32 start_addr, u32 end_addr) -+{ -+ u32 irq_readout; ++ pages = atomic_read(&kctx->used_pages); ++ if (pages != 0) ++ dev_warn(kbdev->dev, "%s: %d pages in use!\n", __func__, pages); + -+ MALI_DEBUG_ASSERT_POINTER(core); ++ kbase_mem_evictable_deinit(kctx); ++ kbase_mem_pool_term(&kctx->mem_pool); ++ WARN_ON(atomic_read(&kctx->nonmapped_pages) != 0); + -+ irq_readout = mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_RAWSTAT); ++ vfree(kctx); ++} ++KBASE_EXPORT_SYMBOL(kbase_destroy_context); + -+ if (irq_readout & MALIGP2_REG_VAL_IRQ_PLBU_OUT_OF_MEM) { -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_CLEAR, (MALIGP2_REG_VAL_IRQ_PLBU_OUT_OF_MEM | MALIGP2_REG_VAL_IRQ_HANG)); -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_MASK, MALIGP2_REG_VAL_IRQ_MASK_USED); /* re-enable interrupts */ -+ mali_hw_core_register_write_relaxed(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PLBU_ALLOC_START_ADDR, start_addr); -+ mali_hw_core_register_write_relaxed(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PLBU_ALLOC_END_ADDR, end_addr); ++/** ++ * kbase_context_set_create_flags - Set creation flags on a context ++ * @kctx: Kbase context ++ * @flags: Flags to set ++ * ++ * Return: 0 on success ++ */ ++int kbase_context_set_create_flags(struct kbase_context *kctx, u32 flags) ++{ ++ int err = 0; ++ struct kbasep_js_kctx_info *js_kctx_info; ++ unsigned long irq_flags; + -+ MALI_DEBUG_PRINT(3, ("Mali GP: Resuming job\n")); ++ KBASE_DEBUG_ASSERT(NULL != kctx); + -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_CMD, MALIGP2_REG_VAL_CMD_UPDATE_PLBU_ALLOC); -+ _mali_osk_write_mem_barrier(); ++ js_kctx_info = &kctx->jctx.sched_info; ++ ++ /* Validate flags */ ++ if (flags != (flags & BASE_CONTEXT_CREATE_KERNEL_FLAGS)) { ++ err = -EINVAL; ++ goto out; + } -+ /* -+ * else: core has been reset between PLBU_OUT_OF_MEM interrupt and this new heap response. -+ * A timeout or a page fault on Mali-200 PP core can cause this behaviour. -+ */ -+} + -+u32 mali_gp_core_get_version(struct mali_gp_core *core) -+{ -+ MALI_DEBUG_ASSERT_POINTER(core); -+ return mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_VERSION); -+} ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, irq_flags); + -+struct mali_gp_core *mali_gp_get_global_gp_core(void) -+{ -+ return mali_global_gp_core; -+} ++ /* Translate the flags */ ++ if ((flags & BASE_CONTEXT_SYSTEM_MONITOR_SUBMIT_DISABLED) == 0) ++ kbase_ctx_flag_clear(kctx, KCTX_SUBMIT_DISABLED); + -+/* ------------- interrupt handling below ------------------ */ -+static void mali_gp_irq_probe_trigger(void *data) -+{ -+ struct mali_gp_core *core = (struct mali_gp_core *)data; ++ /* Latch the initial attributes into the Job Scheduler */ ++ kbasep_js_ctx_attr_set_initial_attrs(kctx->kbdev, kctx); + -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_MASK, MALIGP2_REG_VAL_IRQ_MASK_USED); -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_RAWSTAT, MALIGP2_REG_VAL_IRQ_AXI_BUS_ERROR); -+ _mali_osk_mem_barrier(); ++ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, irq_flags); ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ out: ++ return err; +} ++KBASE_EXPORT_SYMBOL(kbase_context_set_create_flags); +diff --git a/drivers/gpu/arm/midgard/mali_kbase_context.h b/drivers/gpu/arm/midgard/mali_kbase_context.h +new file mode 100755 +index 000000000..a3f5bb0ce +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_context.h +@@ -0,0 +1,90 @@ ++/* ++ * ++ * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+static _mali_osk_errcode_t mali_gp_irq_probe_ack(void *data) -+{ -+ struct mali_gp_core *core = (struct mali_gp_core *)data; -+ u32 irq_readout; + -+ irq_readout = mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_STAT); -+ if (MALIGP2_REG_VAL_IRQ_AXI_BUS_ERROR & irq_readout) { -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_CLEAR, MALIGP2_REG_VAL_IRQ_AXI_BUS_ERROR); -+ _mali_osk_mem_barrier(); -+ return _MALI_OSK_ERR_OK; -+ } + -+ return _MALI_OSK_ERR_FAULT; -+} ++#ifndef _KBASE_CONTEXT_H_ ++#define _KBASE_CONTEXT_H_ + -+/* ------ local helper functions below --------- */ -+#if MALI_STATE_TRACKING -+u32 mali_gp_dump_state(struct mali_gp_core *core, char *buf, u32 size) -+{ -+ int n = 0; ++#include + -+ n += _mali_osk_snprintf(buf + n, size - n, "\tGP: %s\n", core->hw_core.description); + -+ return n; ++int kbase_context_set_create_flags(struct kbase_context *kctx, u32 flags); ++ ++/** ++ * kbase_ctx_flag - Check if @flag is set on @kctx ++ * @kctx: Pointer to kbase context to check ++ * @flag: Flag to check ++ * ++ * Return: true if @flag is set on @kctx, false if not. ++ */ ++static inline bool kbase_ctx_flag(struct kbase_context *kctx, ++ enum kbase_context_flags flag) ++{ ++ return atomic_read(&kctx->flags) & flag; +} -+#endif + -+void mali_gp_update_performance_counters(struct mali_gp_core *core, struct mali_gp_job *job) ++/** ++ * kbase_ctx_flag_clear - Clear @flag on @kctx ++ * @kctx: Pointer to kbase context ++ * @flag: Flag to clear ++ * ++ * Clear the @flag on @kctx. This is done atomically, so other flags being ++ * cleared or set at the same time will be safe. ++ * ++ * Some flags have locking requirements, check the documentation for the ++ * respective flags. ++ */ ++static inline void kbase_ctx_flag_clear(struct kbase_context *kctx, ++ enum kbase_context_flags flag) +{ -+ u32 val0 = 0; -+ u32 val1 = 0; -+ u32 counter_src0 = mali_gp_job_get_perf_counter_src0(job); -+ u32 counter_src1 = mali_gp_job_get_perf_counter_src1(job); ++#if KERNEL_VERSION(4, 3, 0) > LINUX_VERSION_CODE ++ /* ++ * Earlier kernel versions doesn't have atomic_andnot() or ++ * atomic_and(). atomic_clear_mask() was only available on some ++ * architectures and removed on arm in v3.13 on arm and arm64. ++ * ++ * Use a compare-exchange loop to clear the flag on pre 4.3 kernels, ++ * when atomic_andnot() becomes available. ++ */ ++ int old, new; + -+ if (MALI_HW_CORE_NO_COUNTER != counter_src0) { -+ val0 = mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_VALUE); -+ mali_gp_job_set_perf_counter_value0(job, val0); ++ do { ++ old = atomic_read(&kctx->flags); ++ new = old & ~flag; + -+#if defined(CONFIG_MALI400_PROFILING) -+ _mali_osk_profiling_report_hw_counter(COUNTER_VP_0_C0, val0); -+ _mali_osk_profiling_record_global_counters(COUNTER_VP_0_C0, val0); ++ } while (atomic_cmpxchg(&kctx->flags, old, new) != old); ++#else ++ atomic_andnot(flag, &kctx->flags); +#endif ++} + -+ } -+ -+ if (MALI_HW_CORE_NO_COUNTER != counter_src1) { -+ val1 = mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PERF_CNT_1_VALUE); -+ mali_gp_job_set_perf_counter_value1(job, val1); -+ -+#if defined(CONFIG_MALI400_PROFILING) -+ _mali_osk_profiling_report_hw_counter(COUNTER_VP_0_C1, val1); -+ _mali_osk_profiling_record_global_counters(COUNTER_VP_0_C1, val1); -+#endif -+ } ++/** ++ * kbase_ctx_flag_set - Set @flag on @kctx ++ * @kctx: Pointer to kbase context ++ * @flag: Flag to clear ++ * ++ * Set the @flag on @kctx. This is done atomically, so other flags being ++ * cleared or set at the same time will be safe. ++ * ++ * Some flags have locking requirements, check the documentation for the ++ * respective flags. ++ */ ++static inline void kbase_ctx_flag_set(struct kbase_context *kctx, ++ enum kbase_context_flags flag) ++{ ++ atomic_or(flag, &kctx->flags); +} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp.h b/drivers/gpu/arm/mali400/mali/common/mali_gp.h ++#endif /* _KBASE_CONTEXT_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c new file mode 100755 -index 000000000000..3156310f21c7 +index 000000000..da55cb080 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.h -@@ -0,0 +1,127 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c +@@ -0,0 +1,4990 @@ +/* -+ * Copyright (C) 2011-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef __MALI_GP_H__ -+#define __MALI_GP_H__ ++#define ENABLE_DEBUG_LOG ++#include "platform/rk/custom_log.h" + -+#include "mali_osk.h" -+#include "mali_gp_job.h" -+#include "mali_hw_core.h" -+#include "regs/mali_gp_regs.h" ++#include ++#include ++#include ++#include ++#include ++#include ++#ifdef CONFIG_MALI_DEVFREQ ++#include ++#include ++#ifdef CONFIG_DEVFREQ_THERMAL ++#include ++#endif /* CONFIG_DEVFREQ_THERMAL */ ++#endif /* CONFIG_MALI_DEVFREQ */ ++#ifdef CONFIG_MALI_NO_MALI ++#include "mali_kbase_model_linux.h" ++#endif /* CONFIG_MALI_NO_MALI */ ++#include "mali_kbase_mem_profile_debugfs_buf_size.h" ++#include "mali_kbase_debug_mem_view.h" ++#include "mali_kbase_mem.h" ++#include "mali_kbase_mem_pool_debugfs.h" ++#if !MALI_CUSTOMER_RELEASE ++#include "mali_kbase_regs_dump_debugfs.h" ++#endif /* !MALI_CUSTOMER_RELEASE */ ++#include "mali_kbase_regs_history_debugfs.h" ++#include ++#include ++#include ++#include ++#include "mali_kbase_ioctl.h" + -+struct mali_group; ++#ifdef CONFIG_KDS ++#include ++#include ++#include ++#endif /* CONFIG_KDS */ + -+/** -+ * Definition of the GP core struct -+ * Used to track a GP core in the system. -+ */ -+struct mali_gp_core { -+ struct mali_hw_core hw_core; /**< Common for all HW cores */ -+ _mali_osk_irq_t *irq; /**< IRQ handler */ -+}; ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include /* is_compat_task */ ++#include ++#include ++#ifdef CONFIG_MALI_PLATFORM_DEVICETREE ++#include ++#endif /* CONFIG_MALI_PLATFORM_DEVICETREE */ ++#include ++#include ++#ifdef CONFIG_MALI_PLATFORM_FAKE ++#include ++#endif /*CONFIG_MALI_PLATFORM_FAKE */ ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#include ++#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ ++#include ++#include + -+_mali_osk_errcode_t mali_gp_initialize(void); -+void mali_gp_terminate(void); ++#include + -+struct mali_gp_core *mali_gp_create(const _mali_osk_resource_t *resource, struct mali_group *group); -+void mali_gp_delete(struct mali_gp_core *core); + -+void mali_gp_stop_bus(struct mali_gp_core *core); -+_mali_osk_errcode_t mali_gp_stop_bus_wait(struct mali_gp_core *core); -+void mali_gp_reset_async(struct mali_gp_core *core); -+_mali_osk_errcode_t mali_gp_reset_wait(struct mali_gp_core *core); -+void mali_gp_hard_reset(struct mali_gp_core *core); -+_mali_osk_errcode_t mali_gp_reset(struct mali_gp_core *core); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)) ++#include ++#else ++#include ++#endif + -+void mali_gp_job_start(struct mali_gp_core *core, struct mali_gp_job *job); -+void mali_gp_resume_with_new_heap(struct mali_gp_core *core, u32 start_addr, u32 end_addr); ++#include + -+u32 mali_gp_core_get_version(struct mali_gp_core *core); ++#include + -+struct mali_gp_core *mali_gp_get_global_gp_core(void); ++/* GPU IRQ Tags */ ++#define JOB_IRQ_TAG 0 ++#define MMU_IRQ_TAG 1 ++#define GPU_IRQ_TAG 2 + -+#if MALI_STATE_TRACKING -+u32 mali_gp_dump_state(struct mali_gp_core *core, char *buf, u32 size); -+#endif ++#if MALI_UNIT_TEST ++static struct kbase_exported_test_data shared_kernel_test_data; ++EXPORT_SYMBOL(shared_kernel_test_data); ++#endif /* MALI_UNIT_TEST */ + -+void mali_gp_update_performance_counters(struct mali_gp_core *core, struct mali_gp_job *job); ++/** rk_ext : version of rk_ext on mali_ko, aka. rk_ko_ver. */ ++#define ROCKCHIP_VERSION (13) + -+MALI_STATIC_INLINE const char *mali_gp_core_description(struct mali_gp_core *core) ++static int kbase_dev_nr; ++ ++static DEFINE_MUTEX(kbase_dev_list_lock); ++static LIST_HEAD(kbase_dev_list); ++ ++#define KERNEL_SIDE_DDK_VERSION_STRING "K:" MALI_RELEASE_NAME "(GPL)" ++static inline void __compile_time_asserts(void) +{ -+ return core->hw_core.description; ++ CSTD_COMPILE_TIME_ASSERT(sizeof(KERNEL_SIDE_DDK_VERSION_STRING) <= KBASE_GET_VERSION_BUFFER_SIZE); +} + -+MALI_STATIC_INLINE enum mali_interrupt_result mali_gp_get_interrupt_result(struct mali_gp_core *core) ++static int kbase_api_handshake(struct kbase_context *kctx, ++ struct kbase_ioctl_version_check *version) +{ -+ u32 stat_used = mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_STAT) & -+ MALIGP2_REG_VAL_IRQ_MASK_USED; -+ -+ if (0 == stat_used) { -+ return MALI_INTERRUPT_RESULT_NONE; -+ } else if ((MALIGP2_REG_VAL_IRQ_VS_END_CMD_LST | -+ MALIGP2_REG_VAL_IRQ_PLBU_END_CMD_LST) == stat_used) { -+ return MALI_INTERRUPT_RESULT_SUCCESS; -+ } else if (MALIGP2_REG_VAL_IRQ_VS_END_CMD_LST == stat_used) { -+ return MALI_INTERRUPT_RESULT_SUCCESS_VS; -+ } else if (MALIGP2_REG_VAL_IRQ_PLBU_END_CMD_LST == stat_used) { -+ return MALI_INTERRUPT_RESULT_SUCCESS_PLBU; -+ } else if (MALIGP2_REG_VAL_IRQ_PLBU_OUT_OF_MEM & stat_used) { -+ return MALI_INTERRUPT_RESULT_OOM; ++ switch (version->major) { ++#ifdef BASE_LEGACY_UK6_SUPPORT ++ case 6: ++ /* We are backwards compatible with version 6, ++ * so pretend to be the old version */ ++ version->major = 6; ++ version->minor = 1; ++ break; ++#endif /* BASE_LEGACY_UK6_SUPPORT */ ++#ifdef BASE_LEGACY_UK7_SUPPORT ++ case 7: ++ /* We are backwards compatible with version 7, ++ * so pretend to be the old version */ ++ version->major = 7; ++ version->minor = 1; ++ break; ++#endif /* BASE_LEGACY_UK7_SUPPORT */ ++#ifdef BASE_LEGACY_UK8_SUPPORT ++ case 8: ++ /* We are backwards compatible with version 8, ++ * so pretend to be the old version */ ++ version->major = 8; ++ version->minor = 4; ++ break; ++#endif /* BASE_LEGACY_UK8_SUPPORT */ ++#ifdef BASE_LEGACY_UK9_SUPPORT ++ case 9: ++ /* We are backwards compatible with version 9, ++ * so pretend to be the old version */ ++ version->major = 9; ++ version->minor = 0; ++ break; ++#endif /* BASE_LEGACY_UK8_SUPPORT */ ++ case BASE_UK_VERSION_MAJOR: ++ /* set minor to be the lowest common */ ++ version->minor = min_t(int, BASE_UK_VERSION_MINOR, ++ (int)version->minor); ++ break; ++ default: ++ /* We return our actual version regardless if it ++ * matches the version returned by userspace - ++ * userspace can bail if it can't handle this ++ * version */ ++ version->major = BASE_UK_VERSION_MAJOR; ++ version->minor = BASE_UK_VERSION_MINOR; ++ break; + } + -+ return MALI_INTERRUPT_RESULT_ERROR; -+} ++ /* save the proposed version number for later use */ ++ kctx->api_version = KBASE_API_VERSION(version->major, version->minor); + -+MALI_STATIC_INLINE u32 mali_gp_get_rawstat(struct mali_gp_core *core) -+{ -+ MALI_DEBUG_ASSERT_POINTER(core); -+ return mali_hw_core_register_read(&core->hw_core, -+ MALIGP2_REG_ADDR_MGMT_INT_RAWSTAT); ++ return 0; +} + -+MALI_STATIC_INLINE u32 mali_gp_is_active(struct mali_gp_core *core) -+{ -+ u32 status = mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_STATUS); -+ return (status & MALIGP2_REG_VAL_STATUS_MASK_ACTIVE) ? MALI_TRUE : MALI_FALSE; -+} ++/** ++ * enum mali_error - Mali error codes shared with userspace ++ * ++ * This is subset of those common Mali errors that can be returned to userspace. ++ * Values of matching user and kernel space enumerators MUST be the same. ++ * MALI_ERROR_NONE is guaranteed to be 0. ++ * ++ * @MALI_ERROR_NONE: Success ++ * @MALI_ERROR_OUT_OF_GPU_MEMORY: Not used in the kernel driver ++ * @MALI_ERROR_OUT_OF_MEMORY: Memory allocation failure ++ * @MALI_ERROR_FUNCTION_FAILED: Generic error code ++ */ ++enum mali_error { ++ MALI_ERROR_NONE = 0, ++ MALI_ERROR_OUT_OF_GPU_MEMORY, ++ MALI_ERROR_OUT_OF_MEMORY, ++ MALI_ERROR_FUNCTION_FAILED, ++}; + -+MALI_STATIC_INLINE void mali_gp_mask_all_interrupts(struct mali_gp_core *core) -+{ -+ mali_hw_core_register_write(&core->hw_core, MALIGP2_REG_ADDR_MGMT_INT_MASK, MALIGP2_REG_VAL_IRQ_MASK_NONE); -+} ++enum { ++ inited_mem = (1u << 0), ++ inited_js = (1u << 1), ++ inited_pm_runtime_init = (1u << 2), ++#ifdef CONFIG_MALI_DEVFREQ ++ inited_devfreq = (1u << 3), ++#endif /* CONFIG_MALI_DEVFREQ */ ++ inited_tlstream = (1u << 4), ++ inited_backend_early = (1u << 5), ++ inited_backend_late = (1u << 6), ++ inited_device = (1u << 7), ++ inited_vinstr = (1u << 8), + -+MALI_STATIC_INLINE void mali_gp_enable_interrupts(struct mali_gp_core *core, enum mali_interrupt_result exceptions) -+{ -+ /* Enable all interrupts, except those specified in exceptions */ -+ u32 value; ++ inited_job_fault = (1u << 10), ++ inited_sysfs_group = (1u << 11), ++ inited_misc_register = (1u << 12), ++ inited_get_device = (1u << 13), ++ inited_dev_list = (1u << 14), ++ inited_debugfs = (1u << 15), ++ inited_gpu_device = (1u << 16), ++ inited_registers_map = (1u << 17), ++ inited_io_history = (1u << 18), ++ inited_power_control = (1u << 19), ++ inited_buslogger = (1u << 20), ++ inited_protected = (1u << 21), ++ inited_ctx_sched = (1u << 22) ++}; + -+ if (MALI_INTERRUPT_RESULT_SUCCESS_VS == exceptions) { -+ /* Enable all used except VS complete */ -+ value = MALIGP2_REG_VAL_IRQ_MASK_USED & -+ ~MALIGP2_REG_VAL_IRQ_VS_END_CMD_LST; -+ } else { -+ MALI_DEBUG_ASSERT(MALI_INTERRUPT_RESULT_SUCCESS_PLBU == -+ exceptions); -+ /* Enable all used except PLBU complete */ -+ value = MALIGP2_REG_VAL_IRQ_MASK_USED & -+ ~MALIGP2_REG_VAL_IRQ_PLBU_END_CMD_LST; -+ } + -+ mali_hw_core_register_write(&core->hw_core, -+ MALIGP2_REG_ADDR_MGMT_INT_MASK, -+ value); -+} ++#ifdef CONFIG_MALI_DEBUG ++#define INACTIVE_WAIT_MS (5000) + -+MALI_STATIC_INLINE u32 mali_gp_read_plbu_alloc_start_addr(struct mali_gp_core *core) ++void kbase_set_driver_inactive(struct kbase_device *kbdev, bool inactive) +{ -+ return mali_hw_core_register_read(&core->hw_core, MALIGP2_REG_ADDR_MGMT_PLBU_ALLOC_START_ADDR); ++ kbdev->driver_inactive = inactive; ++ wake_up(&kbdev->driver_inactive_wait); ++ ++ /* Wait for any running IOCTLs to complete */ ++ if (inactive) ++ msleep(INACTIVE_WAIT_MS); +} ++KBASE_EXPORT_TEST_API(kbase_set_driver_inactive); ++#endif /* CONFIG_MALI_DEBUG */ + -+#endif /* __MALI_GP_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c -new file mode 100755 -index 000000000000..5d4d9f2530d3 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c -@@ -0,0 +1,306 @@ -+/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * kbase_legacy_dispatch - UKK dispatch function ++ * ++ * This is the dispatch function for the legacy UKK ioctl interface. No new ++ * ioctls should be added to this function, see kbase_ioctl instead. ++ * ++ * @kctx: The kernel context structure ++ * @args: Pointer to the data structure passed from/to user space ++ * @args_size: Size of the data structure + */ ++static int kbase_legacy_dispatch(struct kbase_context *kctx, ++ void * const args, u32 args_size) ++{ ++ struct kbase_device *kbdev; ++ union uk_header *ukh = args; ++ u32 id; ++ int ret = 0; + -+#include "mali_gp_job.h" -+#include "mali_osk.h" -+#include "mali_osk_list.h" -+#include "mali_uk_types.h" -+#include "mali_memory_virtual.h" -+#include "mali_memory_defer_bind.h" ++ KBASE_DEBUG_ASSERT(ukh != NULL); + -+static u32 gp_counter_src0 = MALI_HW_CORE_NO_COUNTER; /**< Performance counter 0, MALI_HW_CORE_NO_COUNTER for disabled */ -+static u32 gp_counter_src1 = MALI_HW_CORE_NO_COUNTER; /**< Performance counter 1, MALI_HW_CORE_NO_COUNTER for disabled */ -+static void _mali_gp_del_varying_allocations(struct mali_gp_job *job); ++ kbdev = kctx->kbdev; ++ id = ukh->id; ++ ukh->ret = MALI_ERROR_NONE; /* Be optimistic */ + ++#ifdef CONFIG_MALI_DEBUG ++ wait_event(kbdev->driver_inactive_wait, ++ kbdev->driver_inactive == false); ++#endif /* CONFIG_MALI_DEBUG */ + -+static int _mali_gp_add_varying_allocations(struct mali_session_data *session, -+ struct mali_gp_job *job, -+ u32 *alloc, -+ u32 num) -+{ -+ int i = 0; -+ struct mali_gp_allocation_node *alloc_node; -+ mali_mem_allocation *mali_alloc = NULL; -+ struct mali_vma_node *mali_vma_node = NULL; ++ if (UKP_FUNC_ID_CHECK_VERSION == id) { ++ struct uku_version_check_args *version_check; ++ struct kbase_ioctl_version_check version; + -+ for (i = 0 ; i < num ; i++) { -+ MALI_DEBUG_ASSERT(alloc[i]); -+ alloc_node = _mali_osk_calloc(1, sizeof(struct mali_gp_allocation_node)); -+ if (alloc_node) { -+ INIT_LIST_HEAD(&alloc_node->node); -+ /* find mali allocation structure by vaddress*/ -+ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, alloc[i], 0); ++ if (args_size != sizeof(struct uku_version_check_args)) { ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ return 0; ++ } ++ version_check = (struct uku_version_check_args *)args; ++ version.minor = version_check->minor; ++ version.major = version_check->major; + -+ if (likely(mali_vma_node)) { -+ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); -+ MALI_DEBUG_ASSERT(alloc[i] == mali_vma_node->vm_node.start); -+ } else { -+ MALI_DEBUG_PRINT(1, ("ERROE!_mali_gp_add_varying_allocations,can't find allocation %d by address =0x%x, num=%d\n", i, alloc[i], num)); -+ _mali_osk_free(alloc_node); -+ goto fail; -+ } -+ alloc_node->alloc = mali_alloc; -+ /* add to gp job varying alloc list*/ -+ list_move(&alloc_node->node, &job->varying_alloc); -+ } else -+ goto fail; ++ kbase_api_handshake(kctx, &version); ++ ++ version_check->minor = version.minor; ++ version_check->major = version.major; ++ ukh->ret = MALI_ERROR_NONE; ++ return 0; + } + -+ return 0; -+fail: -+ MALI_DEBUG_PRINT(1, ("ERROE!_mali_gp_add_varying_allocations,failed to alloc memory!\n")); -+ _mali_gp_del_varying_allocations(job); -+ return -1; -+} ++ /* block calls until version handshake */ ++ if (kctx->api_version == 0) ++ return -EINVAL; + ++ if (!atomic_read(&kctx->setup_complete)) { ++ struct kbase_uk_set_flags *kbase_set_flags; + -+static void _mali_gp_del_varying_allocations(struct mali_gp_job *job) -+{ -+ struct mali_gp_allocation_node *alloc_node, *tmp_node; ++ /* setup pending, try to signal that we'll do the setup, ++ * if setup was already in progress, err this call ++ */ ++ if (atomic_cmpxchg(&kctx->setup_in_progress, 0, 1) != 0) ++ return -EINVAL; + -+ list_for_each_entry_safe(alloc_node, tmp_node, &job->varying_alloc, node) { -+ list_del(&alloc_node->node); -+ kfree(alloc_node); -+ } -+ INIT_LIST_HEAD(&job->varying_alloc); -+} ++ /* if unexpected call, will stay stuck in setup mode ++ * (is it the only call we accept?) ++ */ ++ if (id != KBASE_FUNC_SET_FLAGS) ++ return -EINVAL; + -+struct mali_gp_job *mali_gp_job_create(struct mali_session_data *session, _mali_uk_gp_start_job_s *uargs, u32 id, struct mali_timeline_tracker *pp_tracker) -+{ -+ struct mali_gp_job *job; -+ u32 perf_counter_flag; -+ u32 __user *memory_list = NULL; -+ struct mali_gp_allocation_node *alloc_node, *tmp_node; -+ _mali_uk_gp_start_job_s copy_of_uargs; ++ kbase_set_flags = (struct kbase_uk_set_flags *)args; + -+ job = _mali_osk_calloc(1, sizeof(struct mali_gp_job)); -+ if (NULL != job) { -+ job->finished_notification = _mali_osk_notification_create(_MALI_NOTIFICATION_GP_FINISHED, sizeof(_mali_uk_gp_job_finished_s)); -+ if (NULL == job->finished_notification) { -+ goto fail3; -+ } ++ /* if not matching the expected call, stay in setup mode */ ++ if (sizeof(*kbase_set_flags) != args_size) ++ goto bad_size; + -+ job->oom_notification = _mali_osk_notification_create(_MALI_NOTIFICATION_GP_STALLED, sizeof(_mali_uk_gp_job_suspended_s)); -+ if (NULL == job->oom_notification) { -+ goto fail2; -+ } ++ /* if bad flags, will stay stuck in setup mode */ ++ if (kbase_context_set_create_flags(kctx, ++ kbase_set_flags->create_flags) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; + -+ if (0 != _mali_osk_copy_from_user(&job->uargs, uargs, sizeof(_mali_uk_gp_start_job_s))) { -+ goto fail1; -+ } ++ atomic_set(&kctx->setup_complete, 1); ++ return 0; ++ } + -+ perf_counter_flag = mali_gp_job_get_perf_counter_flag(job); ++ /* setup complete, perform normal operation */ ++ switch (id) { ++ case KBASE_FUNC_MEM_JIT_INIT: ++ { ++ struct kbase_uk_mem_jit_init *jit_init = args; + -+ /* case when no counters came from user space -+ * so pass the debugfs / DS-5 provided global ones to the job object */ -+ if (!((perf_counter_flag & _MALI_PERFORMANCE_COUNTER_FLAG_SRC0_ENABLE) || -+ (perf_counter_flag & _MALI_PERFORMANCE_COUNTER_FLAG_SRC1_ENABLE))) { -+ mali_gp_job_set_perf_counter_src0(job, mali_gp_job_get_gp_counter_src0()); -+ mali_gp_job_set_perf_counter_src1(job, mali_gp_job_get_gp_counter_src1()); ++ if (sizeof(*jit_init) != args_size) ++ goto bad_size; ++ ++ if (kbase_region_tracker_init_jit(kctx, ++ jit_init->va_pages)) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ break; + } ++ case KBASE_FUNC_MEM_ALLOC: ++ { ++ struct kbase_uk_mem_alloc *mem = args; ++ struct kbase_va_region *reg; + -+ _mali_osk_list_init(&job->list); -+ job->session = session; -+ job->id = id; -+ job->heap_current_addr = job->uargs.frame_registers[4]; -+ job->perf_counter_value0 = 0; -+ job->perf_counter_value1 = 0; -+ job->pid = _mali_osk_get_pid(); -+ job->tid = _mali_osk_get_tid(); ++ if (sizeof(*mem) != args_size) ++ goto bad_size; + ++#if defined(CONFIG_64BIT) ++ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { ++ /* force SAME_VA if a 64-bit client */ ++ mem->flags |= BASE_MEM_SAME_VA; ++ } ++#endif + -+ INIT_LIST_HEAD(&job->varying_alloc); -+ INIT_LIST_HEAD(&job->vary_todo); -+ job->dmem = NULL; ++ reg = kbase_mem_alloc(kctx, mem->va_pages, ++ mem->commit_pages, mem->extent, ++ &mem->flags, &mem->gpu_va); ++ mem->va_alignment = 0; + -+ if (job->uargs.deferred_mem_num > session->allocation_mgr.mali_allocation_num) { -+ MALI_PRINT_ERROR(("Mali GP job: The number of varying buffer to defer bind is invalid !\n")); -+ goto fail1; ++ if (!reg) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ break; + } ++ case KBASE_FUNC_MEM_IMPORT: { ++ struct kbase_uk_mem_import *mem_import = args; ++ void __user *phandle; + -+ /* add varying allocation list*/ -+ if (job->uargs.deferred_mem_num > 0) { -+ /* copy varying list from user space*/ -+ job->varying_list = _mali_osk_calloc(1, sizeof(u32) * job->uargs.deferred_mem_num); -+ if (!job->varying_list) { -+ MALI_PRINT_ERROR(("Mali GP job: allocate varying_list failed varying_alloc_num = %d !\n", job->uargs.deferred_mem_num)); -+ goto fail1; -+ } ++ if (sizeof(*mem_import) != args_size) ++ goto bad_size; ++#ifdef CONFIG_COMPAT ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ phandle = compat_ptr(mem_import->phandle.compat_value); ++ else ++#endif ++ phandle = mem_import->phandle.value; + -+ if (0 != _mali_osk_copy_from_user(©_of_uargs, uargs, sizeof(_mali_uk_gp_start_job_s))) { -+ goto fail1; ++ if (mem_import->type == BASE_MEM_IMPORT_TYPE_INVALID) { ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ break; + } -+ memory_list = (u32 __user *)(uintptr_t)copy_of_uargs.deferred_mem_list; + -+ if (0 != _mali_osk_copy_from_user(job->varying_list, memory_list, sizeof(u32) * job->uargs.deferred_mem_num)) { -+ MALI_PRINT_ERROR(("Mali GP job: Failed to copy varying list from user space!\n")); -+ goto fail; ++ if (kbase_mem_import(kctx, ++ (enum base_mem_import_type) ++ mem_import->type, ++ phandle, ++ 0, ++ &mem_import->gpu_va, ++ &mem_import->va_pages, ++ &mem_import->flags)) { ++ mem_import->type = BASE_MEM_IMPORT_TYPE_INVALID; ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; + } ++ break; ++ } ++ case KBASE_FUNC_MEM_ALIAS: { ++ struct kbase_uk_mem_alias *alias = args; ++ struct base_mem_aliasing_info __user *user_ai; ++ struct base_mem_aliasing_info *ai; + -+ if (unlikely(_mali_gp_add_varying_allocations(session, job, job->varying_list, -+ job->uargs.deferred_mem_num))) { -+ MALI_PRINT_ERROR(("Mali GP job: _mali_gp_add_varying_allocations failed!\n")); -+ goto fail; -+ } ++ if (sizeof(*alias) != args_size) ++ goto bad_size; + -+ /* do preparetion for each allocation */ -+ list_for_each_entry_safe(alloc_node, tmp_node, &job->varying_alloc, node) { -+ if (unlikely(_MALI_OSK_ERR_OK != mali_mem_defer_bind_allocation_prepare(alloc_node->alloc, &job->vary_todo, &job->required_varying_memsize))) { -+ MALI_PRINT_ERROR(("Mali GP job: mali_mem_defer_bind_allocation_prepare failed!\n")); -+ goto fail; -+ } ++ if (alias->nents > 2048) { ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ break; ++ } ++ if (!alias->nents) { ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ break; + } + -+ _mali_gp_del_varying_allocations(job); ++#ifdef CONFIG_COMPAT ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ user_ai = compat_ptr(alias->ai.compat_value); ++ else ++#endif ++ user_ai = alias->ai.value; + -+ /* bind varying here, to avoid memory latency issue. */ -+ { -+ struct mali_defer_mem_block dmem_block; ++ ai = vmalloc(sizeof(*ai) * alias->nents); + -+ INIT_LIST_HEAD(&dmem_block.free_pages); -+ atomic_set(&dmem_block.num_free_pages, 0); ++ if (!ai) { ++ ukh->ret = MALI_ERROR_OUT_OF_MEMORY; ++ break; ++ } + -+ if (mali_mem_prepare_mem_for_job(job, &dmem_block)) { -+ MALI_PRINT_ERROR(("Mali GP job: mali_mem_prepare_mem_for_job failed!\n")); -+ goto fail; -+ } -+ if (_MALI_OSK_ERR_OK != mali_mem_defer_bind(job, &dmem_block)) { -+ MALI_PRINT_ERROR(("gp job create, mali_mem_defer_bind failed! GP %x fail!", job)); -+ goto fail; -+ } ++ if (copy_from_user(ai, user_ai, ++ sizeof(*ai) * alias->nents)) { ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ goto copy_failed; + } + -+ if (job->uargs.varying_memsize > MALI_UK_BIG_VARYING_SIZE) { -+ job->big_job = 1; ++ alias->gpu_va = kbase_mem_alias(kctx, &alias->flags, ++ alias->stride, ++ alias->nents, ai, ++ &alias->va_pages); ++ if (!alias->gpu_va) { ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ goto no_alias; + } ++no_alias: ++copy_failed: ++ vfree(ai); ++ break; + } -+ job->pp_tracker = pp_tracker; -+ if (NULL != job->pp_tracker) { -+ /* Take a reference on PP job's tracker that will be released when the GP -+ job is done. */ -+ mali_timeline_system_tracker_get(session->timeline_system, pp_tracker); -+ } ++ case KBASE_FUNC_MEM_COMMIT: ++ { ++ struct kbase_uk_mem_commit *commit = args; ++ int ret; + -+ mali_timeline_tracker_init(&job->tracker, MALI_TIMELINE_TRACKER_GP, NULL, job); -+ mali_timeline_fence_copy_uk_fence(&(job->tracker.fence), &(job->uargs.fence)); ++ if (sizeof(*commit) != args_size) ++ goto bad_size; + -+ return job; -+ } else { -+ MALI_PRINT_ERROR(("Mali GP job: _mali_osk_calloc failed!\n")); -+ return NULL; -+ } ++ ret = kbase_mem_commit(kctx, commit->gpu_addr, ++ commit->pages); + ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ commit->result_subcode = ++ BASE_BACKING_THRESHOLD_ERROR_INVALID_ARGUMENTS; + -+fail: -+ _mali_osk_free(job->varying_list); -+ /* Handle allocate fail here, free all varying node */ -+ { -+ struct mali_backend_bind_list *bkn, *bkn_tmp; -+ list_for_each_entry_safe(bkn, bkn_tmp , &job->vary_todo, node) { -+ list_del(&bkn->node); -+ _mali_osk_free(bkn); -+ } -+ } -+fail1: -+ _mali_osk_notification_delete(job->oom_notification); -+fail2: -+ _mali_osk_notification_delete(job->finished_notification); -+fail3: -+ _mali_osk_free(job); -+ return NULL; -+} ++ if (ret == 0) { ++ ukh->ret = MALI_ERROR_NONE; ++ commit->result_subcode = ++ BASE_BACKING_THRESHOLD_OK; ++ } else if (ret == -ENOMEM) { ++ commit->result_subcode = ++ BASE_BACKING_THRESHOLD_ERROR_OOM; ++ } + -+void mali_gp_job_delete(struct mali_gp_job *job) -+{ -+ struct mali_backend_bind_list *bkn, *bkn_tmp; -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT(NULL == job->pp_tracker); -+ MALI_DEBUG_ASSERT(_mali_osk_list_empty(&job->list)); -+ _mali_osk_free(job->varying_list); ++ break; ++ } + -+ /* Handle allocate fail here, free all varying node */ -+ list_for_each_entry_safe(bkn, bkn_tmp , &job->vary_todo, node) { -+ list_del(&bkn->node); -+ _mali_osk_free(bkn); -+ } ++ case KBASE_FUNC_MEM_QUERY: ++ { ++ struct kbase_uk_mem_query *query = args; + -+ mali_mem_defer_dmem_free(job); ++ if (sizeof(*query) != args_size) ++ goto bad_size; + -+ /* de-allocate the pre-allocated oom notifications */ -+ if (NULL != job->oom_notification) { -+ _mali_osk_notification_delete(job->oom_notification); -+ job->oom_notification = NULL; -+ } -+ if (NULL != job->finished_notification) { -+ _mali_osk_notification_delete(job->finished_notification); -+ job->finished_notification = NULL; -+ } ++ if (kbase_mem_query(kctx, query->gpu_addr, ++ query->query, &query->value) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ else ++ ukh->ret = MALI_ERROR_NONE; ++ break; ++ } ++ break; + -+ _mali_osk_free(job); -+} ++ case KBASE_FUNC_MEM_FLAGS_CHANGE: ++ { ++ struct kbase_uk_mem_flags_change *fc = args; + -+void mali_gp_job_list_add(struct mali_gp_job *job, _mali_osk_list_t *list) -+{ -+ struct mali_gp_job *iter; -+ struct mali_gp_job *tmp; ++ if (sizeof(*fc) != args_size) ++ goto bad_size; + -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ if (kbase_mem_flags_change(kctx, fc->gpu_va, ++ fc->flags, fc->mask) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; + -+ /* Find position in list/queue where job should be added. */ -+ _MALI_OSK_LIST_FOREACHENTRY_REVERSE(iter, tmp, list, -+ struct mali_gp_job, list) { ++ break; ++ } ++ case KBASE_FUNC_MEM_FREE: ++ { ++ struct kbase_uk_mem_free *mem = args; + -+ /* A span is used to handle job ID wrapping. */ -+ bool job_is_after = (mali_gp_job_get_id(job) - -+ mali_gp_job_get_id(iter)) < -+ MALI_SCHEDULER_JOB_ID_SPAN; ++ if (sizeof(*mem) != args_size) ++ goto bad_size; + -+ if (job_is_after) { ++ if (kbase_mem_free(kctx, mem->gpu_addr) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; + break; + } -+ } + -+ _mali_osk_list_add(&job->list, &iter->list); -+} ++ case KBASE_FUNC_JOB_SUBMIT: ++ { ++ struct kbase_uk_job_submit *job = args; ++ void __user *user_addr = NULL; + -+u32 mali_gp_job_get_gp_counter_src0(void) -+{ -+ return gp_counter_src0; -+} ++ if (sizeof(*job) != args_size) ++ goto bad_size; + -+void mali_gp_job_set_gp_counter_src0(u32 counter) -+{ -+ gp_counter_src0 = counter; -+} ++#ifdef CONFIG_COMPAT ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ user_addr = compat_ptr(job->addr.compat_value); ++ else ++#endif ++ user_addr = job->addr.value; + -+u32 mali_gp_job_get_gp_counter_src1(void) -+{ -+ return gp_counter_src1; -+} ++ if (kbase_jd_submit(kctx, user_addr, job->nr_atoms, ++ job->stride, false) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ break; ++ } + -+void mali_gp_job_set_gp_counter_src1(u32 counter) -+{ -+ gp_counter_src1 = counter; -+} ++#ifdef BASE_LEGACY_UK6_SUPPORT ++ case KBASE_FUNC_JOB_SUBMIT_UK6: ++ { ++ struct kbase_uk_job_submit *job = args; ++ void __user *user_addr = NULL; + -+mali_scheduler_mask mali_gp_job_signal_pp_tracker(struct mali_gp_job *job, mali_bool success) -+{ -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; ++ if (sizeof(*job) != args_size) ++ goto bad_size; + -+ MALI_DEBUG_ASSERT_POINTER(job); ++#ifdef CONFIG_COMPAT ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ user_addr = compat_ptr(job->addr.compat_value); ++ else ++#endif ++ user_addr = job->addr.value; + -+ if (NULL != job->pp_tracker) { -+ schedule_mask |= mali_timeline_system_tracker_put(job->session->timeline_system, job->pp_tracker, MALI_FALSE == success); -+ job->pp_tracker = NULL; -+ } ++ if (kbase_jd_submit(kctx, user_addr, job->nr_atoms, ++ job->stride, true) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ break; ++ } ++#endif + -+ return schedule_mask; -+} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h -new file mode 100755 -index 000000000000..b84333f9f810 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h -@@ -0,0 +1,324 @@ -+/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ case KBASE_FUNC_SYNC: ++ { ++ struct kbase_uk_sync_now *sn = args; + -+#ifndef __MALI_GP_JOB_H__ -+#define __MALI_GP_JOB_H__ ++ if (sizeof(*sn) != args_size) ++ goto bad_size; + -+#include "mali_osk.h" -+#include "mali_osk_list.h" -+#include "mali_uk_types.h" -+#include "mali_session.h" -+#include "mali_timeline.h" -+#include "mali_scheduler_types.h" -+#include "mali_scheduler.h" -+#include "mali_executor.h" -+#include "mali_timeline.h" ++#ifndef CONFIG_MALI_COH_USER ++ if (kbase_sync_now(kctx, &sn->sset.basep_sset) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++#endif ++ break; ++ } + -+struct mali_defer_mem; -+/** -+ * This structure represents a GP job -+ * -+ * The GP job object itself is not protected by any single lock, -+ * but relies on other locks instead (scheduler, executor and timeline lock). -+ * Think of the job object as moving between these sub systems through-out -+ * its lifetime. Different part of the GP job struct is used by different -+ * subsystems. Accessor functions ensure that correct lock is taken. -+ * Do NOT access any data members directly from outside this module! -+ */ -+struct mali_gp_job { -+ /* -+ * These members are typically only set at creation, -+ * and only read later on. -+ * They do not require any lock protection. -+ */ -+ _mali_uk_gp_start_job_s uargs; /**< Arguments from user space */ -+ struct mali_session_data *session; /**< Session which submitted this job */ -+ u32 pid; /**< Process ID of submitting process */ -+ u32 tid; /**< Thread ID of submitting thread */ -+ u32 id; /**< Identifier for this job in kernel space (sequential numbering) */ -+ u32 cache_order; /**< Cache order used for L2 cache flushing (sequential numbering) */ -+ struct mali_timeline_tracker tracker; /**< Timeline tracker for this job */ -+ struct mali_timeline_tracker *pp_tracker; /**< Pointer to Timeline tracker for PP job that depends on this job. */ -+ _mali_osk_notification_t *finished_notification; /**< Notification sent back to userspace on job complete */ ++ case KBASE_FUNC_DISJOINT_QUERY: ++ { ++ struct kbase_uk_disjoint_query *dquery = args; + -+ /* -+ * These members are used by the scheduler, -+ * protected by scheduler lock -+ */ -+ _mali_osk_list_t list; /**< Used to link jobs together in the scheduler queue */ ++ if (sizeof(*dquery) != args_size) ++ goto bad_size; + -+ /* -+ * These members are used by the executor and/or group, -+ * protected by executor lock -+ */ -+ _mali_osk_notification_t *oom_notification; /**< Notification sent back to userspace on OOM */ ++ /* Get the disjointness counter value. */ ++ dquery->counter = kbase_disjoint_event_get(kctx->kbdev); ++ break; ++ } + -+ /* -+ * Set by executor/group on job completion, read by scheduler when -+ * returning job to user. Hold executor lock when setting, -+ * no lock needed when reading -+ */ -+ u32 heap_current_addr; /**< Holds the current HEAP address when the job has completed */ -+ u32 perf_counter_value0; /**< Value of performance counter 0 (to be returned to user space) */ -+ u32 perf_counter_value1; /**< Value of performance counter 1 (to be returned to user space) */ -+ struct mali_defer_mem *dmem; /** < used for defer bind to store dmem info */ -+ struct list_head varying_alloc; /**< hold the list of varying allocations */ -+ u32 bind_flag; /** < flag for deferbind*/ -+ u32 *varying_list; /**< varying memory list need to to defer bind*/ -+ struct list_head vary_todo; /**< list of backend list need to do defer bind*/ -+ u32 required_varying_memsize; /** < size of varying memory to reallocate*/ -+ u32 big_job; /** < if the gp job have large varying output and may take long time*/ -+}; -+ -+#define MALI_DEFER_BIND_MEMORY_PREPARED (0x1 << 0) -+#define MALI_DEFER_BIND_MEMORY_BINDED (0x1 << 2) -+ -+struct mali_gp_allocation_node { -+ struct list_head node; -+ mali_mem_allocation *alloc; -+}; -+ -+struct mali_gp_job *mali_gp_job_create(struct mali_session_data *session, _mali_uk_gp_start_job_s *uargs, u32 id, struct mali_timeline_tracker *pp_tracker); -+void mali_gp_job_delete(struct mali_gp_job *job); ++ case KBASE_FUNC_POST_TERM: ++ { ++ kbase_event_close(kctx); ++ break; ++ } + -+u32 mali_gp_job_get_gp_counter_src0(void); -+void mali_gp_job_set_gp_counter_src0(u32 counter); -+u32 mali_gp_job_get_gp_counter_src1(void); -+void mali_gp_job_set_gp_counter_src1(u32 counter); ++ case KBASE_FUNC_HWCNT_SETUP: ++ { ++ struct kbase_uk_hwcnt_setup *setup = args; + -+MALI_STATIC_INLINE u32 mali_gp_job_get_id(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return (NULL == job) ? 0 : job->id; -+} ++ if (sizeof(*setup) != args_size) ++ goto bad_size; + -+MALI_STATIC_INLINE void mali_gp_job_set_cache_order(struct mali_gp_job *job, -+ u32 cache_order) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); -+ job->cache_order = cache_order; -+} ++ mutex_lock(&kctx->vinstr_cli_lock); ++ if (kbase_vinstr_legacy_hwc_setup(kbdev->vinstr_ctx, ++ &kctx->vinstr_cli, setup) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ mutex_unlock(&kctx->vinstr_cli_lock); ++ break; ++ } + -+MALI_STATIC_INLINE u32 mali_gp_job_get_cache_order(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return (NULL == job) ? 0 : job->cache_order; -+} ++ case KBASE_FUNC_HWCNT_DUMP: ++ { ++ /* args ignored */ ++ mutex_lock(&kctx->vinstr_cli_lock); ++ if (kbase_vinstr_hwc_dump(kctx->vinstr_cli, ++ BASE_HWCNT_READER_EVENT_MANUAL) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ mutex_unlock(&kctx->vinstr_cli_lock); ++ break; ++ } + -+MALI_STATIC_INLINE u64 mali_gp_job_get_user_id(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.user_job_ptr; -+} ++ case KBASE_FUNC_HWCNT_CLEAR: ++ { ++ /* args ignored */ ++ mutex_lock(&kctx->vinstr_cli_lock); ++ if (kbase_vinstr_hwc_clear(kctx->vinstr_cli) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ mutex_unlock(&kctx->vinstr_cli_lock); ++ break; ++ } + -+MALI_STATIC_INLINE u32 mali_gp_job_get_frame_builder_id(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.frame_builder_id; -+} ++ case KBASE_FUNC_HWCNT_READER_SETUP: ++ { ++ struct kbase_uk_hwcnt_reader_setup *setup = args; + -+MALI_STATIC_INLINE u32 mali_gp_job_get_flush_id(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.flush_id; -+} ++ if (sizeof(*setup) != args_size) ++ goto bad_size; + -+MALI_STATIC_INLINE u32 mali_gp_job_get_pid(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->pid; -+} ++ mutex_lock(&kctx->vinstr_cli_lock); ++ if (kbase_vinstr_hwcnt_reader_setup(kbdev->vinstr_ctx, ++ setup) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ mutex_unlock(&kctx->vinstr_cli_lock); ++ break; ++ } + -+MALI_STATIC_INLINE u32 mali_gp_job_get_tid(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->tid; -+} ++ case KBASE_FUNC_GPU_PROPS_REG_DUMP: ++ { ++ struct kbase_uk_gpuprops *setup = args; + -+MALI_STATIC_INLINE u32 *mali_gp_job_get_frame_registers(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.frame_registers; -+} ++ if (sizeof(*setup) != args_size) ++ goto bad_size; + -+MALI_STATIC_INLINE struct mali_session_data *mali_gp_job_get_session(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->session; -+} ++ if (kbase_gpuprops_uk_get_props(kctx, setup) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ break; ++ } ++ case KBASE_FUNC_FIND_CPU_OFFSET: ++ { ++ struct kbase_uk_find_cpu_offset *find = args; + -+MALI_STATIC_INLINE mali_bool mali_gp_job_has_vs_job(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return (job->uargs.frame_registers[0] != job->uargs.frame_registers[1]) ? MALI_TRUE : MALI_FALSE; -+} ++ if (sizeof(*find) != args_size) ++ goto bad_size; + -+MALI_STATIC_INLINE mali_bool mali_gp_job_has_plbu_job(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return (job->uargs.frame_registers[2] != job->uargs.frame_registers[3]) ? MALI_TRUE : MALI_FALSE; -+} ++ if (find->gpu_addr & ~PAGE_MASK) { ++ dev_warn(kbdev->dev, ++ "kbase_legacy_dispatch case KBASE_FUNC_FIND_CPU_OFFSET: find->gpu_addr: passed parameter is invalid"); ++ goto out_bad; ++ } + -+MALI_STATIC_INLINE u32 mali_gp_job_get_current_heap_addr(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->heap_current_addr; -+} ++ if (find->size > SIZE_MAX || find->cpu_addr > ULONG_MAX) { ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ } else { ++ int err; + -+MALI_STATIC_INLINE void mali_gp_job_set_current_heap_addr(struct mali_gp_job *job, u32 heap_addr) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ job->heap_current_addr = heap_addr; -+} ++ err = kbasep_find_enclosing_cpu_mapping_offset( ++ kctx, ++ find->cpu_addr, ++ find->size, ++ &find->offset); + -+MALI_STATIC_INLINE u32 mali_gp_job_get_perf_counter_flag(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.perf_counter_flag; -+} ++ if (err) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ } ++ break; ++ } ++ case KBASE_FUNC_GET_VERSION: ++ { ++ struct kbase_uk_get_ddk_version *get_version = (struct kbase_uk_get_ddk_version *)args; + -+MALI_STATIC_INLINE u32 mali_gp_job_get_perf_counter_src0(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.perf_counter_src0; -+} ++ if (sizeof(*get_version) != args_size) ++ goto bad_size; + -+MALI_STATIC_INLINE u32 mali_gp_job_get_perf_counter_src1(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.perf_counter_src1; -+} ++ /* version buffer size check is made in compile time assert */ ++ memcpy(get_version->version_buffer, ++ KERNEL_SIDE_DDK_VERSION_STRING, ++ sizeof(KERNEL_SIDE_DDK_VERSION_STRING)); ++ get_version->version_string_size = ++ sizeof(KERNEL_SIDE_DDK_VERSION_STRING); ++ get_version->rk_version = ROCKCHIP_VERSION; ++ break; ++ } + -+MALI_STATIC_INLINE u32 mali_gp_job_get_perf_counter_value0(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->perf_counter_value0; -+} ++ case KBASE_FUNC_STREAM_CREATE: ++ { ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ struct kbase_uk_stream_create *screate = (struct kbase_uk_stream_create *)args; + -+MALI_STATIC_INLINE u32 mali_gp_job_get_perf_counter_value1(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->perf_counter_value1; -+} ++ if (sizeof(*screate) != args_size) ++ goto bad_size; + -+MALI_STATIC_INLINE void mali_gp_job_set_perf_counter_src0(struct mali_gp_job *job, u32 src) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ job->uargs.perf_counter_src0 = src; -+} ++ if (strnlen(screate->name, sizeof(screate->name)) >= sizeof(screate->name)) { ++ /* not NULL terminated */ ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ break; ++ } + -+MALI_STATIC_INLINE void mali_gp_job_set_perf_counter_src1(struct mali_gp_job *job, u32 src) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ job->uargs.perf_counter_src1 = src; -+} ++ if (kbase_sync_fence_stream_create(screate->name, ++ &screate->fd) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ else ++ ukh->ret = MALI_ERROR_NONE; ++#else /* CONFIG_SYNC || CONFIG_SYNC_FILE */ ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ ++ break; ++ } ++ case KBASE_FUNC_FENCE_VALIDATE: ++ { ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ struct kbase_uk_fence_validate *fence_validate = (struct kbase_uk_fence_validate *)args; + -+MALI_STATIC_INLINE void mali_gp_job_set_perf_counter_value0(struct mali_gp_job *job, u32 value) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ job->perf_counter_value0 = value; -+} ++ if (sizeof(*fence_validate) != args_size) ++ goto bad_size; + -+MALI_STATIC_INLINE void mali_gp_job_set_perf_counter_value1(struct mali_gp_job *job, u32 value) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ job->perf_counter_value1 = value; -+} ++ if (kbase_sync_fence_validate(fence_validate->fd) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ else ++ ukh->ret = MALI_ERROR_NONE; ++#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ ++ break; ++ } + -+void mali_gp_job_list_add(struct mali_gp_job *job, _mali_osk_list_t *list); ++ case KBASE_FUNC_SET_TEST_DATA: ++ { ++#if MALI_UNIT_TEST ++ struct kbase_uk_set_test_data *set_data = args; + -+MALI_STATIC_INLINE void mali_gp_job_list_move(struct mali_gp_job *job, -+ _mali_osk_list_t *list) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(!_mali_osk_list_empty(&job->list)); -+ _mali_osk_list_move(&job->list, list); -+} ++ shared_kernel_test_data = set_data->test_data; ++ shared_kernel_test_data.kctx.value = (void __user *)kctx; ++ shared_kernel_test_data.mm.value = (void __user *)current->mm; ++ ukh->ret = MALI_ERROR_NONE; ++#endif /* MALI_UNIT_TEST */ ++ break; ++ } + -+MALI_STATIC_INLINE void mali_gp_job_list_remove(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); -+ _mali_osk_list_delinit(&job->list); -+} ++ case KBASE_FUNC_INJECT_ERROR: ++ { ++#ifdef CONFIG_MALI_ERROR_INJECT ++ unsigned long flags; ++ struct kbase_error_params params = ((struct kbase_uk_error_params *)args)->params; + -+MALI_STATIC_INLINE _mali_osk_notification_t * -+mali_gp_job_get_finished_notification(struct mali_gp_job *job) -+{ -+ _mali_osk_notification_t *notification; ++ /*mutex lock */ ++ spin_lock_irqsave(&kbdev->reg_op_lock, flags); ++ if (job_atom_inject_error(¶ms) != 0) ++ ukh->ret = MALI_ERROR_OUT_OF_MEMORY; ++ else ++ ukh->ret = MALI_ERROR_NONE; ++ spin_unlock_irqrestore(&kbdev->reg_op_lock, flags); ++ /*mutex unlock */ ++#endif /* CONFIG_MALI_ERROR_INJECT */ ++ break; ++ } + -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_POINTER(job->finished_notification); ++ case KBASE_FUNC_MODEL_CONTROL: ++ { ++#ifdef CONFIG_MALI_NO_MALI ++ unsigned long flags; ++ struct kbase_model_control_params params = ++ ((struct kbase_uk_model_control_params *)args)->params; + -+ notification = job->finished_notification; -+ job->finished_notification = NULL; ++ /*mutex lock */ ++ spin_lock_irqsave(&kbdev->reg_op_lock, flags); ++ if (gpu_model_control(kbdev->model, ¶ms) != 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ else ++ ukh->ret = MALI_ERROR_NONE; ++ spin_unlock_irqrestore(&kbdev->reg_op_lock, flags); ++ /*mutex unlock */ ++#endif /* CONFIG_MALI_NO_MALI */ ++ break; ++ } + -+ return notification; -+} ++#ifdef BASE_LEGACY_UK8_SUPPORT ++ case KBASE_FUNC_KEEP_GPU_POWERED: ++ { ++ dev_warn(kbdev->dev, "kbase_legacy_dispatch case KBASE_FUNC_KEEP_GPU_POWERED: function is deprecated and disabled\n"); ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ break; ++ } ++#endif /* BASE_LEGACY_UK8_SUPPORT */ + -+MALI_STATIC_INLINE _mali_osk_notification_t *mali_gp_job_get_oom_notification( -+ struct mali_gp_job *job) -+{ -+ _mali_osk_notification_t *notification; ++ case KBASE_FUNC_GET_PROFILING_CONTROLS: ++ { ++ struct kbase_uk_profiling_controls *controls = ++ (struct kbase_uk_profiling_controls *)args; ++ u32 i; + -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT_POINTER(job->oom_notification); ++ if (sizeof(*controls) != args_size) ++ goto bad_size; + -+ notification = job->oom_notification; -+ job->oom_notification = NULL; ++ for (i = FBDUMP_CONTROL_MIN; i < FBDUMP_CONTROL_MAX; i++) ++ controls->profiling_controls[i] = ++ kbdev->kbase_profiling_controls[i]; + -+ return notification; -+} ++ break; ++ } + -+MALI_STATIC_INLINE void mali_gp_job_set_oom_notification( -+ struct mali_gp_job *job, -+ _mali_osk_notification_t *notification) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(NULL == job->oom_notification); -+ job->oom_notification = notification; -+} ++ /* used only for testing purposes; these controls are to be set by gator through gator API */ ++ case KBASE_FUNC_SET_PROFILING_CONTROLS: ++ { ++ struct kbase_uk_profiling_controls *controls = ++ (struct kbase_uk_profiling_controls *)args; ++ u32 i; + -+MALI_STATIC_INLINE struct mali_timeline_tracker *mali_gp_job_get_tracker( -+ struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return &(job->tracker); -+} ++ if (sizeof(*controls) != args_size) ++ goto bad_size; + ++ for (i = FBDUMP_CONTROL_MIN; i < FBDUMP_CONTROL_MAX; i++) ++ _mali_profiling_control(i, controls->profiling_controls[i]); + -+MALI_STATIC_INLINE u32 *mali_gp_job_get_timeline_point_ptr( -+ struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return (u32 __user *)(uintptr_t)job->uargs.timeline_point_ptr; -+} ++ break; ++ } + ++ case KBASE_FUNC_DEBUGFS_MEM_PROFILE_ADD: ++ { ++ struct kbase_uk_debugfs_mem_profile_add *add_data = ++ (struct kbase_uk_debugfs_mem_profile_add *)args; ++ char *buf; ++ char __user *user_buf; + -+/** -+ * Release reference on tracker for PP job that depends on this GP job. -+ * -+ * @note If GP job has a reference on tracker, this function MUST be called before the GP job is -+ * deleted. -+ * -+ * @param job GP job that is done. -+ * @param success MALI_TRUE if job completed successfully, MALI_FALSE if not. -+ * @return A scheduling bitmask indicating whether scheduling needs to be done. -+ */ -+mali_scheduler_mask mali_gp_job_signal_pp_tracker(struct mali_gp_job *job, mali_bool success); ++ if (sizeof(*add_data) != args_size) ++ goto bad_size; + -+#endif /* __MALI_GP_JOB_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_group.c b/drivers/gpu/arm/mali400/mali/common/mali_group.c -new file mode 100755 -index 000000000000..47979a2f1a35 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_group.c -@@ -0,0 +1,1875 @@ -+/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#include "mali_kernel_common.h" -+#include "mali_group.h" -+#include "mali_osk.h" -+#include "mali_l2_cache.h" -+#include "mali_gp.h" -+#include "mali_pp.h" -+#include "mali_mmu.h" -+#include "mali_dlbu.h" -+#include "mali_broadcast.h" -+#include "mali_scheduler.h" -+#include "mali_osk_profiling.h" -+#include "mali_osk_mali.h" -+#include "mali_pm_domain.h" -+#include "mali_pm.h" -+#include "mali_executor.h" ++ if (add_data->len > KBASE_MEM_PROFILE_MAX_BUF_SIZE) { ++ dev_err(kbdev->dev, "buffer too big\n"); ++ goto out_bad; ++ } + -+#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) -+#include -+#include ++#ifdef CONFIG_COMPAT ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ user_buf = ++ compat_ptr(add_data->buf.compat_value); ++ else +#endif ++ user_buf = add_data->buf.value; + -+#define MALI_MAX_NUM_DOMAIN_REFS (MALI_MAX_NUMBER_OF_GROUPS * 2) -+ -+#if defined(CONFIG_MALI400_PROFILING) -+static void mali_group_report_l2_cache_counters_per_core(struct mali_group *group, u32 core_num); -+#endif /* #if defined(CONFIG_MALI400_PROFILING) */ ++ buf = kmalloc(add_data->len, GFP_KERNEL); ++ if (ZERO_OR_NULL_PTR(buf)) ++ goto out_bad; + -+static struct mali_group *mali_global_groups[MALI_MAX_NUMBER_OF_GROUPS] = { NULL, }; -+static u32 mali_global_num_groups = 0; ++ if (0 != copy_from_user(buf, user_buf, add_data->len)) { ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ kfree(buf); ++ goto out_bad; ++ } + -+/* SW timer for job execution */ -+int mali_max_job_runtime = MALI_MAX_JOB_RUNTIME_DEFAULT; ++ if (kbasep_mem_profile_debugfs_insert(kctx, buf, ++ add_data->len)) { ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ goto out_bad; ++ } + -+/* local helper functions */ -+static void mali_group_bottom_half_mmu(void *data); -+static void mali_group_bottom_half_gp(void *data); -+static void mali_group_bottom_half_pp(void *data); -+static void mali_group_timeout(void *data); -+static void mali_group_reset_pp(struct mali_group *group); -+static void mali_group_reset_mmu(struct mali_group *group); ++ break; ++ } + -+static void mali_group_activate_page_directory(struct mali_group *group, struct mali_session_data *session, mali_bool is_reload); -+static void mali_group_recovery_reset(struct mali_group *group); ++#ifdef CONFIG_MALI_NO_MALI ++ case KBASE_FUNC_SET_PRFCNT_VALUES: ++ { + -+struct mali_group *mali_group_create(struct mali_l2_cache_core *core, -+ struct mali_dlbu_core *dlbu, -+ struct mali_bcast_unit *bcast, -+ u32 domain_index) -+{ -+ struct mali_group *group = NULL; ++ struct kbase_uk_prfcnt_values *params = ++ ((struct kbase_uk_prfcnt_values *)args); ++ gpu_model_set_dummy_prfcnt_sample(params->data, ++ params->size); + -+ if (mali_global_num_groups >= MALI_MAX_NUMBER_OF_GROUPS) { -+ MALI_PRINT_ERROR(("Mali group: Too many group objects created\n")); -+ return NULL; -+ } ++ break; ++ } ++#endif /* CONFIG_MALI_NO_MALI */ ++#ifdef BASE_LEGACY_UK10_4_SUPPORT ++ case KBASE_FUNC_TLSTREAM_ACQUIRE_V10_4: ++ { ++ struct kbase_uk_tlstream_acquire_v10_4 *tlstream_acquire ++ = args; ++ int ret; + -+ group = _mali_osk_calloc(1, sizeof(struct mali_group)); -+ if (NULL != group) { -+ group->timeout_timer = _mali_osk_timer_init(mali_group_timeout); -+ if (NULL != group->timeout_timer) { -+ _mali_osk_timer_setcallback(group->timeout_timer, mali_group_timeout, (void *)group); ++ if (sizeof(*tlstream_acquire) != args_size) ++ goto bad_size; + -+ group->l2_cache_core[0] = core; -+ _mali_osk_list_init(&group->group_list); -+ _mali_osk_list_init(&group->executor_list); -+ _mali_osk_list_init(&group->pm_domain_list); -+ group->bcast_core = bcast; -+ group->dlbu_core = dlbu; ++ ret = kbase_tlstream_acquire( ++ kctx, 0); ++ if (ret < 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ else ++ tlstream_acquire->fd = ret; ++ break; ++ } ++#endif /* BASE_LEGACY_UK10_4_SUPPORT */ ++ case KBASE_FUNC_TLSTREAM_ACQUIRE: ++ { ++ struct kbase_uk_tlstream_acquire *tlstream_acquire = ++ args; ++ int ret; + -+ /* register this object as a part of the correct power domain */ -+ if ((NULL != core) || (NULL != dlbu) || (NULL != bcast)) -+ group->pm_domain = mali_pm_register_group(domain_index, group); ++ if (sizeof(*tlstream_acquire) != args_size) ++ goto bad_size; + -+ mali_global_groups[mali_global_num_groups] = group; -+ mali_global_num_groups++; ++ if (tlstream_acquire->flags & ~BASE_TLSTREAM_FLAGS_MASK) ++ goto out_bad; + -+ return group; ++ ret = kbase_tlstream_acquire( ++ kctx, tlstream_acquire->flags); ++ if (ret < 0) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; ++ else ++ tlstream_acquire->fd = ret; ++ break; + } -+ _mali_osk_free(group); -+ } -+ -+ return NULL; -+} ++ case KBASE_FUNC_TLSTREAM_FLUSH: ++ { ++ struct kbase_uk_tlstream_flush *tlstream_flush = ++ args; + -+void mali_group_delete(struct mali_group *group) -+{ -+ u32 i; ++ if (sizeof(*tlstream_flush) != args_size) ++ goto bad_size; + -+ MALI_DEBUG_PRINT(4, ("Deleting group %s\n", -+ mali_group_core_description(group))); ++ kbase_tlstream_flush_streams(); ++ break; ++ } ++#if MALI_UNIT_TEST ++ case KBASE_FUNC_TLSTREAM_TEST: ++ { ++ struct kbase_uk_tlstream_test *tlstream_test = args; + -+ MALI_DEBUG_ASSERT(NULL == group->parent_group); -+ MALI_DEBUG_ASSERT((MALI_GROUP_STATE_INACTIVE == group->state) || ((MALI_GROUP_STATE_ACTIVATION_PENDING == group->state))); ++ if (sizeof(*tlstream_test) != args_size) ++ goto bad_size; + -+ /* Delete the resources that this group owns */ -+ if (NULL != group->gp_core) { -+ mali_gp_delete(group->gp_core); -+ } ++ kbase_tlstream_test( ++ tlstream_test->tpw_count, ++ tlstream_test->msg_delay, ++ tlstream_test->msg_count, ++ tlstream_test->aux_msg); ++ break; ++ } ++ case KBASE_FUNC_TLSTREAM_STATS: ++ { ++ struct kbase_uk_tlstream_stats *tlstream_stats = args; + -+ if (NULL != group->pp_core) { -+ mali_pp_delete(group->pp_core); -+ } ++ if (sizeof(*tlstream_stats) != args_size) ++ goto bad_size; + -+ if (NULL != group->mmu) { -+ mali_mmu_delete(group->mmu); -+ } ++ kbase_tlstream_stats( ++ &tlstream_stats->bytes_collected, ++ &tlstream_stats->bytes_generated); ++ break; ++ } ++#endif /* MALI_UNIT_TEST */ + -+ if (mali_group_is_virtual(group)) { -+ /* Remove all groups from virtual group */ -+ struct mali_group *child; -+ struct mali_group *temp; ++ case KBASE_FUNC_GET_CONTEXT_ID: ++ { ++ struct kbase_uk_context_id *info = args; + -+ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { -+ child->parent_group = NULL; -+ mali_group_delete(child); ++ info->id = kctx->id; ++ break; + } + -+ mali_dlbu_delete(group->dlbu_core); ++ case KBASE_FUNC_SOFT_EVENT_UPDATE: ++ { ++ struct kbase_uk_soft_event_update *update = args; + -+ if (NULL != group->bcast_core) { -+ mali_bcast_unit_delete(group->bcast_core); -+ } -+ } ++ if (sizeof(*update) != args_size) ++ goto bad_size; + -+ for (i = 0; i < mali_global_num_groups; i++) { -+ if (mali_global_groups[i] == group) { -+ mali_global_groups[i] = NULL; -+ mali_global_num_groups--; ++ if (((update->new_status != BASE_JD_SOFT_EVENT_SET) && ++ (update->new_status != BASE_JD_SOFT_EVENT_RESET)) || ++ (update->flags != 0)) ++ goto out_bad; + -+ if (i != mali_global_num_groups) { -+ /* We removed a group from the middle of the array -- move the last -+ * group to the current position to close the gap */ -+ mali_global_groups[i] = mali_global_groups[mali_global_num_groups]; -+ mali_global_groups[mali_global_num_groups] = NULL; -+ } ++ if (kbase_soft_event_update(kctx, update->evt, ++ update->new_status)) ++ ukh->ret = MALI_ERROR_FUNCTION_FAILED; + + break; + } -+ } + -+ if (NULL != group->timeout_timer) { -+ _mali_osk_timer_del(group->timeout_timer); -+ _mali_osk_timer_term(group->timeout_timer); -+ } -+ -+ if (NULL != group->bottom_half_work_mmu) { -+ _mali_osk_wq_delete_work(group->bottom_half_work_mmu); -+ } -+ -+ if (NULL != group->bottom_half_work_gp) { -+ _mali_osk_wq_delete_work(group->bottom_half_work_gp); ++ default: ++ dev_err(kbdev->dev, "unknown ioctl %u\n", id); ++ goto out_bad; + } + -+ if (NULL != group->bottom_half_work_pp) { -+ _mali_osk_wq_delete_work(group->bottom_half_work_pp); -+ } ++ return ret; + -+ _mali_osk_free(group); ++bad_size: ++ dev_err(kbdev->dev, "Wrong syscall size (%d) for %08x\n", args_size, id); ++out_bad: ++ return -EINVAL; +} + -+_mali_osk_errcode_t mali_group_add_mmu_core(struct mali_group *group, struct mali_mmu_core *mmu_core) ++static struct kbase_device *to_kbase_device(struct device *dev) +{ -+ /* This group object now owns the MMU core object */ -+ group->mmu = mmu_core; -+ group->bottom_half_work_mmu = _mali_osk_wq_create_work(mali_group_bottom_half_mmu, group); -+ if (NULL == group->bottom_half_work_mmu) { -+ return _MALI_OSK_ERR_FAULT; -+ } -+ return _MALI_OSK_ERR_OK; ++ return dev_get_drvdata(dev); +} + -+void mali_group_remove_mmu_core(struct mali_group *group) ++static int assign_irqs(struct platform_device *pdev) +{ -+ /* This group object no longer owns the MMU core object */ -+ group->mmu = NULL; -+ if (NULL != group->bottom_half_work_mmu) { -+ _mali_osk_wq_delete_work(group->bottom_half_work_mmu); -+ } -+} ++ struct kbase_device *kbdev = to_kbase_device(&pdev->dev); ++ int i; + -+_mali_osk_errcode_t mali_group_add_gp_core(struct mali_group *group, struct mali_gp_core *gp_core) -+{ -+ /* This group object now owns the GP core object */ -+ group->gp_core = gp_core; -+ group->bottom_half_work_gp = _mali_osk_wq_create_work(mali_group_bottom_half_gp, group); -+ if (NULL == group->bottom_half_work_gp) { -+ return _MALI_OSK_ERR_FAULT; -+ } ++ if (!kbdev) ++ return -ENODEV; + -+ return _MALI_OSK_ERR_OK; -+} ++ /* 3 IRQ resources */ ++ for (i = 0; i < 3; i++) { ++ struct resource *irq_res; ++ int irqtag; + -+void mali_group_remove_gp_core(struct mali_group *group) -+{ -+ /* This group object no longer owns the GP core object */ -+ group->gp_core = NULL; -+ if (NULL != group->bottom_half_work_gp) { -+ _mali_osk_wq_delete_work(group->bottom_half_work_gp); ++ irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, i); ++ if (!irq_res) { ++ dev_err(kbdev->dev, "No IRQ resource at index %d\n", i); ++ return -ENOENT; ++ } ++ ++#ifdef CONFIG_OF ++ if (!strncasecmp(irq_res->name, "JOB", 3)) { ++ irqtag = JOB_IRQ_TAG; ++ } else if (!strncasecmp(irq_res->name, "MMU", 3)) { ++ irqtag = MMU_IRQ_TAG; ++ } else if (!strncasecmp(irq_res->name, "GPU", 3)) { ++ irqtag = GPU_IRQ_TAG; ++ } else { ++ dev_err(&pdev->dev, "Invalid irq res name: '%s'\n", ++ irq_res->name); ++ return -EINVAL; ++ } ++#else ++ irqtag = i; ++#endif /* CONFIG_OF */ ++ kbdev->irqs[irqtag].irq = irq_res->start; ++ kbdev->irqs[irqtag].flags = irq_res->flags & IRQF_TRIGGER_MASK; + } ++ ++ return 0; +} + -+_mali_osk_errcode_t mali_group_add_pp_core(struct mali_group *group, struct mali_pp_core *pp_core) ++/* ++ * API to acquire device list mutex and ++ * return pointer to the device list head ++ */ ++const struct list_head *kbase_dev_list_get(void) +{ -+ /* This group object now owns the PP core object */ -+ group->pp_core = pp_core; -+ group->bottom_half_work_pp = _mali_osk_wq_create_work(mali_group_bottom_half_pp, group); -+ if (NULL == group->bottom_half_work_pp) { -+ return _MALI_OSK_ERR_FAULT; -+ } -+ return _MALI_OSK_ERR_OK; ++ mutex_lock(&kbase_dev_list_lock); ++ return &kbase_dev_list; +} ++KBASE_EXPORT_TEST_API(kbase_dev_list_get); + -+void mali_group_remove_pp_core(struct mali_group *group) ++/* API to release the device list mutex */ ++void kbase_dev_list_put(const struct list_head *dev_list) +{ -+ /* This group object no longer owns the PP core object */ -+ group->pp_core = NULL; -+ if (NULL != group->bottom_half_work_pp) { -+ _mali_osk_wq_delete_work(group->bottom_half_work_pp); -+ } ++ mutex_unlock(&kbase_dev_list_lock); +} ++KBASE_EXPORT_TEST_API(kbase_dev_list_put); + -+enum mali_group_state mali_group_activate(struct mali_group *group) ++/* Find a particular kbase device (as specified by minor number), or find the "first" device if -1 is specified */ ++struct kbase_device *kbase_find_device(int minor) +{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ -+ MALI_DEBUG_PRINT(4, ("Group: Activating group %s\n", -+ mali_group_core_description(group))); -+ -+ if (MALI_GROUP_STATE_INACTIVE == group->state) { -+ /* Group is inactive, get PM refs in order to power up */ -+ -+ /* -+ * We'll take a maximum of 2 power domain references pr group, -+ * one for the group itself, and one for it's L2 cache. -+ */ -+ struct mali_pm_domain *domains[MALI_MAX_NUM_DOMAIN_REFS]; -+ struct mali_group *groups[MALI_MAX_NUM_DOMAIN_REFS]; -+ u32 num_domains = 0; -+ mali_bool all_groups_on; -+ -+ /* Deal with child groups first */ -+ if (mali_group_is_virtual(group)) { -+ /* -+ * The virtual group might have 0, 1 or 2 L2s in -+ * its l2_cache_core array, but we ignore these and -+ * let the child groups take the needed L2 cache ref -+ * on behalf of the virtual group. -+ * In other words; The L2 refs are taken in pair with -+ * the physical group which the L2 is attached to. -+ */ -+ struct mali_group *child; -+ struct mali_group *temp; -+ -+ /* -+ * Child group is inactive, get PM -+ * refs in order to power up. -+ */ -+ _MALI_OSK_LIST_FOREACHENTRY(child, temp, -+ &group->group_list, -+ struct mali_group, group_list) { -+ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_INACTIVE -+ == child->state); -+ -+ child->state = MALI_GROUP_STATE_ACTIVATION_PENDING; -+ -+ MALI_DEBUG_ASSERT_POINTER( -+ child->pm_domain); -+ domains[num_domains] = child->pm_domain; -+ groups[num_domains] = child; -+ num_domains++; -+ -+ /* -+ * Take L2 domain ref for child group. -+ */ -+ MALI_DEBUG_ASSERT(MALI_MAX_NUM_DOMAIN_REFS -+ > num_domains); -+ domains[num_domains] = mali_l2_cache_get_pm_domain( -+ child->l2_cache_core[0]); -+ groups[num_domains] = NULL; -+ MALI_DEBUG_ASSERT(NULL == -+ child->l2_cache_core[1]); -+ num_domains++; -+ } -+ } else { -+ /* Take L2 domain ref for physical groups. */ -+ MALI_DEBUG_ASSERT(MALI_MAX_NUM_DOMAIN_REFS > -+ num_domains); -+ -+ domains[num_domains] = mali_l2_cache_get_pm_domain( -+ group->l2_cache_core[0]); -+ groups[num_domains] = NULL; -+ MALI_DEBUG_ASSERT(NULL == group->l2_cache_core[1]); -+ num_domains++; -+ } -+ -+ /* Do the group itself last (it's dependencies first) */ -+ -+ group->state = MALI_GROUP_STATE_ACTIVATION_PENDING; -+ -+ MALI_DEBUG_ASSERT_POINTER(group->pm_domain); -+ domains[num_domains] = group->pm_domain; -+ groups[num_domains] = group; -+ num_domains++; -+ -+ all_groups_on = mali_pm_get_domain_refs(domains, groups, -+ num_domains); ++ struct kbase_device *kbdev = NULL; ++ struct list_head *entry; ++ const struct list_head *dev_list = kbase_dev_list_get(); + -+ /* -+ * Complete activation for group, include -+ * virtual group or physical group. -+ */ -+ if (MALI_TRUE == all_groups_on) { ++ list_for_each(entry, dev_list) { ++ struct kbase_device *tmp; + -+ mali_group_set_active(group); ++ tmp = list_entry(entry, struct kbase_device, entry); ++ if (tmp->mdev.minor == minor || minor == -1) { ++ kbdev = tmp; ++ get_device(kbdev->dev); ++ break; + } -+ } else if (MALI_GROUP_STATE_ACTIVE == group->state) { -+ /* Already active */ -+ MALI_DEBUG_ASSERT(MALI_TRUE == group->power_is_on); -+ } else { -+ /* -+ * Activation already pending, group->power_is_on could -+ * be both true or false. We need to wait for power up -+ * notification anyway. -+ */ -+ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_ACTIVATION_PENDING -+ == group->state); + } ++ kbase_dev_list_put(dev_list); + -+ MALI_DEBUG_PRINT(4, ("Group: group %s activation result: %s\n", -+ mali_group_core_description(group), -+ MALI_GROUP_STATE_ACTIVE == group->state ? -+ "ACTIVE" : "PENDING")); -+ -+ return group->state; ++ return kbdev; +} ++EXPORT_SYMBOL(kbase_find_device); + -+mali_bool mali_group_set_active(struct mali_group *group) ++void kbase_release_device(struct kbase_device *kbdev) +{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_ACTIVATION_PENDING == group->state); -+ MALI_DEBUG_ASSERT(MALI_TRUE == group->power_is_on); -+ -+ MALI_DEBUG_PRINT(4, ("Group: Activation completed for %s\n", -+ mali_group_core_description(group))); -+ -+ if (mali_group_is_virtual(group)) { -+ struct mali_group *child; -+ struct mali_group *temp; -+ -+ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, -+ struct mali_group, group_list) { -+ if (MALI_TRUE != child->power_is_on) { -+ return MALI_FALSE; -+ } -+ -+ child->state = MALI_GROUP_STATE_ACTIVE; -+ } -+ -+ mali_group_reset(group); -+ } -+ -+ /* Go to ACTIVE state */ -+ group->state = MALI_GROUP_STATE_ACTIVE; -+ -+ return MALI_TRUE; ++ put_device(kbdev->dev); +} ++EXPORT_SYMBOL(kbase_release_device); + -+mali_bool mali_group_deactivate(struct mali_group *group) ++#if KERNEL_VERSION(4, 4, 0) > LINUX_VERSION_CODE ++/* ++ * Older versions, before v4.6, of the kernel doesn't have ++ * kstrtobool_from_user(), except longterm 4.4.y which had it added in 4.4.28 ++ */ ++static int kstrtobool_from_user(const char __user *s, size_t count, bool *res) +{ -+ struct mali_pm_domain *domains[MALI_MAX_NUM_DOMAIN_REFS]; -+ u32 num_domains = 0; -+ mali_bool power_down = MALI_FALSE; -+ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_INACTIVE != group->state); -+ -+ MALI_DEBUG_PRINT(3, ("Group: Deactivating group %s\n", -+ mali_group_core_description(group))); -+ -+ group->state = MALI_GROUP_STATE_INACTIVE; -+ -+ MALI_DEBUG_ASSERT_POINTER(group->pm_domain); -+ domains[num_domains] = group->pm_domain; -+ num_domains++; -+ -+ if (mali_group_is_virtual(group)) { -+ /* Release refs for all child groups */ -+ struct mali_group *child; -+ struct mali_group *temp; ++ char buf[32]; + -+ _MALI_OSK_LIST_FOREACHENTRY(child, temp, -+ &group->group_list, -+ struct mali_group, group_list) { -+ child->state = MALI_GROUP_STATE_INACTIVE; ++ count = min(sizeof(buf), count); + -+ MALI_DEBUG_ASSERT_POINTER(child->pm_domain); -+ domains[num_domains] = child->pm_domain; -+ num_domains++; ++ if (copy_from_user(buf, s, count)) ++ return -EFAULT; ++ buf[count] = '\0'; + -+ /* Release L2 cache domain for child groups */ -+ MALI_DEBUG_ASSERT(MALI_MAX_NUM_DOMAIN_REFS > -+ num_domains); -+ domains[num_domains] = mali_l2_cache_get_pm_domain( -+ child->l2_cache_core[0]); -+ MALI_DEBUG_ASSERT(NULL == child->l2_cache_core[1]); -+ num_domains++; -+ } ++ return strtobool(buf, res); ++} ++#endif + -+ /* -+ * Must do mali_group_power_down() steps right here for -+ * virtual group, because virtual group itself is likely to -+ * stay powered on, however child groups are now very likely -+ * to be powered off (and thus lose their state). -+ */ ++static ssize_t write_ctx_infinite_cache(struct file *f, const char __user *ubuf, size_t size, loff_t *off) ++{ ++ struct kbase_context *kctx = f->private_data; ++ int err; ++ bool value; + -+ mali_group_clear_session(group); -+ /* -+ * Disable the broadcast unit (clear it's mask). -+ * This is needed in case the GPU isn't actually -+ * powered down at this point and groups are -+ * removed from an inactive virtual group. -+ * If not, then the broadcast unit will intercept -+ * their interrupts! -+ */ -+ mali_bcast_disable(group->bcast_core); -+ } else { -+ /* Release L2 cache domain for physical groups */ -+ MALI_DEBUG_ASSERT(MALI_MAX_NUM_DOMAIN_REFS > -+ num_domains); -+ domains[num_domains] = mali_l2_cache_get_pm_domain( -+ group->l2_cache_core[0]); -+ MALI_DEBUG_ASSERT(NULL == group->l2_cache_core[1]); -+ num_domains++; -+ } ++ err = kstrtobool_from_user(ubuf, size, &value); ++ if (err) ++ return err; + -+ power_down = mali_pm_put_domain_refs(domains, num_domains); ++ if (value) ++ kbase_ctx_flag_set(kctx, KCTX_INFINITE_CACHE); ++ else ++ kbase_ctx_flag_clear(kctx, KCTX_INFINITE_CACHE); + -+ return power_down; ++ return size; +} + -+void mali_group_power_up(struct mali_group *group) ++static ssize_t read_ctx_infinite_cache(struct file *f, char __user *ubuf, size_t size, loff_t *off) +{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ -+ MALI_DEBUG_PRINT(3, ("Group: Power up for %s\n", -+ mali_group_core_description(group))); ++ struct kbase_context *kctx = f->private_data; ++ char buf[32]; ++ int count; ++ bool value; + -+ group->power_is_on = MALI_TRUE; ++ value = kbase_ctx_flag(kctx, KCTX_INFINITE_CACHE); + -+ if (MALI_FALSE == mali_group_is_virtual(group) -+ && MALI_FALSE == mali_group_is_in_virtual(group)) { -+ mali_group_reset(group); -+ } ++ count = scnprintf(buf, sizeof(buf), "%s\n", value ? "Y" : "N"); + -+ /* -+ * When we just acquire only one physical group form virt group, -+ * we should remove the bcast&dlbu mask from virt group and -+ * reset bcast and dlbu core, although part of pp cores in virt -+ * group maybe not be powered on. -+ */ -+ if (MALI_TRUE == mali_group_is_virtual(group)) { -+ mali_bcast_reset(group->bcast_core); -+ mali_dlbu_update_mask(group->dlbu_core); -+ } ++ return simple_read_from_buffer(ubuf, size, off, buf, count); +} + -+void mali_group_power_down(struct mali_group *group) ++static const struct file_operations kbase_infinite_cache_fops = { ++ .open = simple_open, ++ .write = write_ctx_infinite_cache, ++ .read = read_ctx_infinite_cache, ++}; ++ ++static int kbase_open(struct inode *inode, struct file *filp) +{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT(MALI_TRUE == group->power_is_on); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ struct kbase_device *kbdev = NULL; ++ struct kbase_context *kctx; ++ int ret = 0; ++#ifdef CONFIG_DEBUG_FS ++ char kctx_name[64]; ++#endif + -+ MALI_DEBUG_PRINT(3, ("Group: Power down for %s\n", -+ mali_group_core_description(group))); ++ kbdev = kbase_find_device(iminor(inode)); + -+ group->power_is_on = MALI_FALSE; ++ if (!kbdev) ++ return -ENODEV; + -+ if (mali_group_is_virtual(group)) { -+ /* -+ * What we do for physical jobs in this function should -+ * already have been done in mali_group_deactivate() -+ * for virtual group. -+ */ -+ MALI_DEBUG_ASSERT(NULL == group->session); -+ } else { -+ mali_group_clear_session(group); ++ kctx = kbase_create_context(kbdev, is_compat_task()); ++ if (!kctx) { ++ ret = -ENOMEM; ++ goto out; + } -+} -+ -+MALI_DEBUG_CODE(static void mali_group_print_virtual(struct mali_group *vgroup) -+{ -+ u32 i; -+ struct mali_group *group; -+ struct mali_group *temp; + -+ MALI_DEBUG_PRINT(4, ("Virtual group %s (%p)\n", -+ mali_group_core_description(vgroup), -+ vgroup)); -+ MALI_DEBUG_PRINT(4, ("l2_cache_core[0] = %p, ref = %d\n", vgroup->l2_cache_core[0], vgroup->l2_cache_core_ref_count[0])); -+ MALI_DEBUG_PRINT(4, ("l2_cache_core[1] = %p, ref = %d\n", vgroup->l2_cache_core[1], vgroup->l2_cache_core_ref_count[1])); ++ init_waitqueue_head(&kctx->event_queue); ++ filp->f_mode |= FMODE_UNSIGNED_OFFSET; ++ filp->private_data = kctx; ++ kctx->filp = filp; + -+ i = 0; -+ _MALI_OSK_LIST_FOREACHENTRY(group, temp, &vgroup->group_list, struct mali_group, group_list) { -+ MALI_DEBUG_PRINT(4, ("[%d] %s (%p), l2_cache_core[0] = %p\n", -+ i, mali_group_core_description(group), -+ group, group->l2_cache_core[0])); -+ i++; -+ } -+}) ++ if (kbdev->infinite_cache_active_default) ++ kbase_ctx_flag_set(kctx, KCTX_INFINITE_CACHE); + -+static void mali_group_dump_core_status(struct mali_group *group) -+{ -+ u32 i; ++#ifdef CONFIG_DEBUG_FS ++ snprintf(kctx_name, 64, "%d_%d", kctx->tgid, kctx->id); + -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT(NULL != group->gp_core || (NULL != group->pp_core && !mali_group_is_virtual(group))); ++ kctx->kctx_dentry = debugfs_create_dir(kctx_name, ++ kbdev->debugfs_ctx_directory); + -+ if (NULL != group->gp_core) { -+ MALI_PRINT(("Dump Group %s\n", group->gp_core->hw_core.description)); ++ if (IS_ERR_OR_NULL(kctx->kctx_dentry)) { ++ ret = -ENOMEM; ++ goto out; ++ } + -+ for (i = 0; i < 0xA8; i += 0x10) { -+ MALI_PRINT(("0x%04x: 0x%08x 0x%08x 0x%08x 0x%08x\n", i, mali_hw_core_register_read(&group->gp_core->hw_core, i), -+ mali_hw_core_register_read(&group->gp_core->hw_core, i + 4), -+ mali_hw_core_register_read(&group->gp_core->hw_core, i + 8), -+ mali_hw_core_register_read(&group->gp_core->hw_core, i + 12))); -+ } ++#ifdef CONFIG_MALI_COH_USER ++ /* if cache is completely coherent at hardware level, then remove the ++ * infinite cache control support from debugfs. ++ */ ++#else ++ debugfs_create_file("infinite_cache", 0644, kctx->kctx_dentry, ++ kctx, &kbase_infinite_cache_fops); ++#endif /* CONFIG_MALI_COH_USER */ + ++ mutex_init(&kctx->mem_profile_lock); + -+ } else { -+ MALI_PRINT(("Dump Group %s\n", group->pp_core->hw_core.description)); ++ kbasep_jd_debugfs_ctx_init(kctx); ++ kbase_debug_mem_view_init(filp); + -+ for (i = 0; i < 0x5c; i += 0x10) { -+ MALI_PRINT(("0x%04x: 0x%08x 0x%08x 0x%08x 0x%08x\n", i, mali_hw_core_register_read(&group->pp_core->hw_core, i), -+ mali_hw_core_register_read(&group->pp_core->hw_core, i + 4), -+ mali_hw_core_register_read(&group->pp_core->hw_core, i + 8), -+ mali_hw_core_register_read(&group->pp_core->hw_core, i + 12))); -+ } ++ kbase_debug_job_fault_context_init(kctx); + -+ /* Ignore some minor registers */ -+ for (i = 0x1000; i < 0x1068; i += 0x10) { -+ MALI_PRINT(("0x%04x: 0x%08x 0x%08x 0x%08x 0x%08x\n", i, mali_hw_core_register_read(&group->pp_core->hw_core, i), -+ mali_hw_core_register_read(&group->pp_core->hw_core, i + 4), -+ mali_hw_core_register_read(&group->pp_core->hw_core, i + 8), -+ mali_hw_core_register_read(&group->pp_core->hw_core, i + 12))); -+ } -+ } ++ kbase_mem_pool_debugfs_init(kctx->kctx_dentry, &kctx->mem_pool); + -+ MALI_PRINT(("Dump Group MMU\n")); -+ for (i = 0; i < 0x24; i += 0x10) { -+ MALI_PRINT(("0x%04x: 0x%08x 0x%08x 0x%08x 0x%08x\n", i, mali_hw_core_register_read(&group->mmu->hw_core, i), -+ mali_hw_core_register_read(&group->mmu->hw_core, i + 4), -+ mali_hw_core_register_read(&group->mmu->hw_core, i + 8), -+ mali_hw_core_register_read(&group->mmu->hw_core, i + 12))); -+ } -+} ++ kbase_jit_debugfs_init(kctx); ++#endif /* CONFIG_DEBUG_FS */ + ++ dev_dbg(kbdev->dev, "created base context\n"); + -+/** -+ * @Dump group status -+ */ -+void mali_group_dump_status(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); ++ { ++ struct kbasep_kctx_list_element *element; + -+ if (mali_group_is_virtual(group)) { -+ struct mali_group *group_c; -+ struct mali_group *temp; -+ _MALI_OSK_LIST_FOREACHENTRY(group_c, temp, &group->group_list, struct mali_group, group_list) { -+ mali_group_dump_core_status(group_c); ++ element = kzalloc(sizeof(*element), GFP_KERNEL); ++ if (element) { ++ mutex_lock(&kbdev->kctx_list_lock); ++ element->kctx = kctx; ++ list_add(&element->link, &kbdev->kctx_list); ++ KBASE_TLSTREAM_TL_NEW_CTX( ++ element->kctx, ++ (u32)(element->kctx->id), ++ (u32)(element->kctx->tgid)); ++ mutex_unlock(&kbdev->kctx_list_lock); ++ } else { ++ /* we don't treat this as a fail - just warn about it */ ++ dev_warn(kbdev->dev, "couldn't add kctx to kctx_list\n"); + } -+ } else { -+ mali_group_dump_core_status(group); + } ++ return 0; ++ ++ out: ++ kbase_release_device(kbdev); ++ return ret; +} + -+/** -+ * @brief Add child group to virtual group parent -+ */ -+void mali_group_add_group(struct mali_group *parent, struct mali_group *child) ++static int kbase_release(struct inode *inode, struct file *filp) +{ -+ mali_bool found; -+ u32 i; -+ -+ MALI_DEBUG_PRINT(3, ("Adding group %s to virtual group %s\n", -+ mali_group_core_description(child), -+ mali_group_core_description(parent))); ++ struct kbase_context *kctx = filp->private_data; ++ struct kbase_device *kbdev = kctx->kbdev; ++ struct kbasep_kctx_list_element *element, *tmp; ++ bool found_element = false; + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(mali_group_is_virtual(parent)); -+ MALI_DEBUG_ASSERT(!mali_group_is_virtual(child)); -+ MALI_DEBUG_ASSERT(NULL == child->parent_group); ++ KBASE_TLSTREAM_TL_DEL_CTX(kctx); + -+ _mali_osk_list_addtail(&child->group_list, &parent->group_list); ++#ifdef CONFIG_DEBUG_FS ++ kbasep_mem_profile_debugfs_remove(kctx); ++ kbase_debug_job_fault_context_term(kctx); ++#endif + -+ child->parent_group = parent; ++ mutex_lock(&kbdev->kctx_list_lock); ++ list_for_each_entry_safe(element, tmp, &kbdev->kctx_list, link) { ++ if (element->kctx == kctx) { ++ list_del(&element->link); ++ kfree(element); ++ found_element = true; ++ } ++ } ++ mutex_unlock(&kbdev->kctx_list_lock); ++ if (!found_element) ++ dev_warn(kbdev->dev, "kctx not in kctx_list\n"); + -+ MALI_DEBUG_ASSERT_POINTER(child->l2_cache_core[0]); ++ filp->private_data = NULL; + -+ MALI_DEBUG_PRINT(4, ("parent->l2_cache_core: [0] = %p, [1] = %p\n", parent->l2_cache_core[0], parent->l2_cache_core[1])); -+ MALI_DEBUG_PRINT(4, ("child->l2_cache_core: [0] = %p, [1] = %p\n", child->l2_cache_core[0], child->l2_cache_core[1])); ++ mutex_lock(&kctx->vinstr_cli_lock); ++ /* If this client was performing hwcnt dumping and did not explicitly ++ * detach itself, remove it from the vinstr core now */ ++ if (kctx->vinstr_cli) { ++ struct kbase_uk_hwcnt_setup setup; + -+ /* Keep track of the L2 cache cores of child groups */ -+ found = MALI_FALSE; -+ for (i = 0; i < 2; i++) { -+ if (parent->l2_cache_core[i] == child->l2_cache_core[0]) { -+ MALI_DEBUG_ASSERT(parent->l2_cache_core_ref_count[i] > 0); -+ parent->l2_cache_core_ref_count[i]++; -+ found = MALI_TRUE; -+ } ++ setup.dump_buffer = 0llu; ++ kbase_vinstr_legacy_hwc_setup( ++ kbdev->vinstr_ctx, &kctx->vinstr_cli, &setup); + } ++ mutex_unlock(&kctx->vinstr_cli_lock); + -+ if (!found) { -+ /* First time we see this L2 cache, add it to our list */ -+ i = (NULL == parent->l2_cache_core[0]) ? 0 : 1; ++ kbase_destroy_context(kctx); + -+ MALI_DEBUG_PRINT(4, ("First time we see l2_cache %p. Adding to [%d] = %p\n", child->l2_cache_core[0], i, parent->l2_cache_core[i])); ++ dev_dbg(kbdev->dev, "deleted base context\n"); ++ kbase_release_device(kbdev); ++ return 0; ++} + -+ MALI_DEBUG_ASSERT(NULL == parent->l2_cache_core[i]); ++#define CALL_MAX_SIZE 536 + -+ parent->l2_cache_core[i] = child->l2_cache_core[0]; -+ parent->l2_cache_core_ref_count[i]++; -+ } ++static long kbase_legacy_ioctl(struct file *filp, unsigned int cmd, ++ unsigned long arg) ++{ ++ u64 msg[(CALL_MAX_SIZE + 7) >> 3] = { 0xdeadbeefdeadbeefull }; /* alignment fixup */ ++ u32 size = _IOC_SIZE(cmd); ++ struct kbase_context *kctx = filp->private_data; + -+ /* Update Broadcast Unit and DLBU */ -+ mali_bcast_add_group(parent->bcast_core, child); -+ mali_dlbu_add_group(parent->dlbu_core, child); ++ if (size > CALL_MAX_SIZE) ++ return -ENOTTY; + -+ if (MALI_TRUE == parent->power_is_on) { -+ mali_bcast_reset(parent->bcast_core); -+ mali_dlbu_update_mask(parent->dlbu_core); ++ if (0 != copy_from_user(&msg, (void __user *)arg, size)) { ++ dev_err(kctx->kbdev->dev, "failed to copy ioctl argument into kernel space\n"); ++ return -EFAULT; + } + -+ if (MALI_TRUE == child->power_is_on) { -+ if (NULL == parent->session) { -+ if (NULL != child->session) { -+ /* -+ * Parent has no session, so clear -+ * child session as well. -+ */ -+ mali_mmu_activate_empty_page_directory(child->mmu); -+ } -+ } else { -+ if (parent->session == child->session) { -+ /* We already have same session as parent, -+ * so a simple zap should be enough. -+ */ -+ mali_mmu_zap_tlb(child->mmu); -+ } else { -+ /* -+ * Parent has a different session, so we must -+ * switch to that sessions page table -+ */ -+ mali_mmu_activate_page_directory(child->mmu, mali_session_get_page_directory(parent->session)); -+ } ++ if (kbase_legacy_dispatch(kctx, &msg, size) != 0) ++ return -EFAULT; + -+ /* It is the parent which keeps the session from now on */ -+ child->session = NULL; -+ } -+ } else { -+ /* should have been cleared when child was powered down */ -+ MALI_DEBUG_ASSERT(NULL == child->session); ++ if (0 != copy_to_user((void __user *)arg, &msg, size)) { ++ dev_err(kctx->kbdev->dev, "failed to copy results of UK call back to user space\n"); ++ return -EFAULT; + } ++ return 0; ++} + -+ /* Start job on child when parent is active */ -+ if (NULL != parent->pp_running_job) { -+ struct mali_pp_job *job = parent->pp_running_job; -+ -+ MALI_DEBUG_PRINT(3, ("Group %x joining running job %d on virtual group %x\n", -+ child, mali_pp_job_get_id(job), parent)); ++static int kbase_api_set_flags(struct kbase_context *kctx, ++ struct kbase_ioctl_set_flags *flags) ++{ ++ int err; + -+ /* Only allowed to add active child to an active parent */ -+ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_ACTIVE == parent->state); -+ MALI_DEBUG_ASSERT(MALI_GROUP_STATE_ACTIVE == child->state); ++ /* setup pending, try to signal that we'll do the setup, ++ * if setup was already in progress, err this call ++ */ ++ if (atomic_cmpxchg(&kctx->setup_in_progress, 0, 1) != 0) ++ return -EINVAL; + -+ mali_pp_job_start(child->pp_core, job, mali_pp_core_get_id(child->pp_core), MALI_TRUE); ++ err = kbase_context_set_create_flags(kctx, flags->create_flags); ++ /* if bad flags, will stay stuck in setup mode */ ++ if (err) ++ return err; + -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(child->pp_core)) | -+ MALI_PROFILING_EVENT_REASON_SINGLE_HW_FLUSH, -+ mali_pp_job_get_frame_builder_id(job), mali_pp_job_get_flush_id(job), 0, 0, 0); ++ atomic_set(&kctx->setup_complete, 1); ++ return 0; ++} + -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | -+ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(child->pp_core)) | -+ MALI_PROFILING_EVENT_REASON_START_STOP_HW_VIRTUAL, -+ mali_pp_job_get_pid(job), mali_pp_job_get_tid(job), 0, 0, 0); -+#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) -+ if (child->pp_core) { -+ trace_gpu_sched_switch( -+ mali_pp_core_description(child->pp_core), -+ sched_clock(), mali_pp_job_get_tid(job), -+ 0, mali_pp_job_get_id(job)); -+ } -+#endif ++static int kbase_api_job_submit(struct kbase_context *kctx, ++ struct kbase_ioctl_job_submit *submit) ++{ ++ void __user *user_addr = NULL; + -+#if defined(CONFIG_MALI400_PROFILING) -+ trace_mali_core_active(mali_pp_job_get_pid(job), 1 /* active */, 0 /* PP */, mali_pp_core_get_id(child->pp_core), -+ mali_pp_job_get_frame_builder_id(job), mali_pp_job_get_flush_id(job)); ++#ifdef CONFIG_COMPAT ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ user_addr = compat_ptr(submit->addr.compat_value); ++ else +#endif -+ } ++ user_addr = submit->addr.value; + -+ MALI_DEBUG_CODE(mali_group_print_virtual(parent);) ++ return kbase_jd_submit(kctx, user_addr, submit->nr_atoms, ++ submit->stride, false); +} + -+/** -+ * @brief Remove child group from virtual group parent -+ */ -+void mali_group_remove_group(struct mali_group *parent, struct mali_group *child) ++static int kbase_api_get_gpuprops(struct kbase_context *kctx, ++ struct kbase_ioctl_get_gpuprops *get_props) +{ -+ u32 i; ++ struct kbase_gpu_props *kprops = &kctx->kbdev->gpu_props; ++ int err; + -+ MALI_DEBUG_PRINT(3, ("Removing group %s from virtual group %s\n", -+ mali_group_core_description(child), -+ mali_group_core_description(parent))); ++ if (get_props->flags != 0) { ++ dev_err(kctx->kbdev->dev, "Unsupported flags to get_gpuprops"); ++ return -EINVAL; ++ } + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(mali_group_is_virtual(parent)); -+ MALI_DEBUG_ASSERT(!mali_group_is_virtual(child)); -+ MALI_DEBUG_ASSERT(parent == child->parent_group); ++ if (get_props->size == 0) ++ return kprops->prop_buffer_size; ++ if (get_props->size < kprops->prop_buffer_size) ++ return -EINVAL; + -+ /* Update Broadcast Unit and DLBU */ -+ mali_bcast_remove_group(parent->bcast_core, child); -+ mali_dlbu_remove_group(parent->dlbu_core, child); ++ err = copy_to_user(get_props->buffer.value, kprops->prop_buffer, ++ kprops->prop_buffer_size); ++ if (err) ++ return err; ++ return kprops->prop_buffer_size; ++} + -+ if (MALI_TRUE == parent->power_is_on) { -+ mali_bcast_reset(parent->bcast_core); -+ mali_dlbu_update_mask(parent->dlbu_core); -+ } ++static int kbase_api_post_term(struct kbase_context *kctx) ++{ ++ kbase_event_close(kctx); ++ return 0; ++} + -+ child->session = parent->session; -+ child->parent_group = NULL; ++static int kbase_api_mem_alloc(struct kbase_context *kctx, ++ union kbase_ioctl_mem_alloc *alloc) ++{ ++ struct kbase_va_region *reg; ++ u64 flags = alloc->in.flags; ++ u64 gpu_va; + -+ _mali_osk_list_delinit(&child->group_list); -+ if (_mali_osk_list_empty(&parent->group_list)) { -+ parent->session = NULL; ++#if defined(CONFIG_64BIT) ++ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { ++ /* force SAME_VA if a 64-bit client */ ++ flags |= BASE_MEM_SAME_VA; + } ++#endif + -+ /* Keep track of the L2 cache cores of child groups */ -+ i = (child->l2_cache_core[0] == parent->l2_cache_core[0]) ? 0 : 1; ++ reg = kbase_mem_alloc(kctx, alloc->in.va_pages, ++ alloc->in.commit_pages, ++ alloc->in.extent, ++ &flags, &gpu_va); + -+ MALI_DEBUG_ASSERT(child->l2_cache_core[0] == parent->l2_cache_core[i]); ++ if (!reg) ++ return -ENOMEM; + -+ parent->l2_cache_core_ref_count[i]--; -+ if (parent->l2_cache_core_ref_count[i] == 0) { -+ parent->l2_cache_core[i] = NULL; -+ } ++ alloc->out.flags = flags; ++ alloc->out.gpu_va = gpu_va; + -+ MALI_DEBUG_CODE(mali_group_print_virtual(parent)); ++ return 0; +} + -+struct mali_group *mali_group_acquire_group(struct mali_group *parent) ++static int kbase_api_mem_query(struct kbase_context *kctx, ++ union kbase_ioctl_mem_query *query) +{ -+ struct mali_group *child = NULL; ++ return kbase_mem_query(kctx, query->in.gpu_addr, ++ query->in.query, &query->out.value); ++} + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(mali_group_is_virtual(parent)); ++static int kbase_api_mem_free(struct kbase_context *kctx, ++ struct kbase_ioctl_mem_free *free) ++{ ++ return kbase_mem_free(kctx, free->gpu_addr); ++} + -+ if (!_mali_osk_list_empty(&parent->group_list)) { -+ child = _MALI_OSK_LIST_ENTRY(parent->group_list.prev, struct mali_group, group_list); -+ mali_group_remove_group(parent, child); -+ } ++static int kbase_api_hwcnt_reader_setup(struct kbase_context *kctx, ++ struct kbase_ioctl_hwcnt_reader_setup *setup) ++{ ++ int ret; ++ struct kbase_uk_hwcnt_reader_setup args = { ++ .buffer_count = setup->buffer_count, ++ .jm_bm = setup->jm_bm, ++ .shader_bm = setup->shader_bm, ++ .tiler_bm = setup->tiler_bm, ++ .mmu_l2_bm = setup->mmu_l2_bm ++ }; + -+ if (NULL != child) { -+ if (MALI_GROUP_STATE_ACTIVE != parent->state -+ && MALI_TRUE == child->power_is_on) { -+ mali_group_reset(child); -+ } -+ } ++ mutex_lock(&kctx->vinstr_cli_lock); ++ ret = kbase_vinstr_hwcnt_reader_setup(kctx->kbdev->vinstr_ctx, &args); ++ mutex_unlock(&kctx->vinstr_cli_lock); + -+ return child; ++ if (ret) ++ return ret; ++ return args.fd; +} + -+void mali_group_reset(struct mali_group *group) ++static int kbase_api_hwcnt_enable(struct kbase_context *kctx, ++ struct kbase_ioctl_hwcnt_enable *enable) +{ -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(NULL == group->gp_running_job); -+ MALI_DEBUG_ASSERT(NULL == group->pp_running_job); ++ int ret; ++ struct kbase_uk_hwcnt_setup args = { ++ .dump_buffer = enable->dump_buffer, ++ .jm_bm = enable->jm_bm, ++ .shader_bm = enable->shader_bm, ++ .tiler_bm = enable->tiler_bm, ++ .mmu_l2_bm = enable->mmu_l2_bm ++ }; + -+ MALI_DEBUG_PRINT(3, ("Group: reset of %s\n", -+ mali_group_core_description(group))); ++ mutex_lock(&kctx->vinstr_cli_lock); ++ ret = kbase_vinstr_legacy_hwc_setup(kctx->kbdev->vinstr_ctx, ++ &kctx->vinstr_cli, &args); ++ mutex_unlock(&kctx->vinstr_cli_lock); + -+ if (NULL != group->dlbu_core) { -+ mali_dlbu_reset(group->dlbu_core); -+ } ++ return ret; ++} + -+ if (NULL != group->bcast_core) { -+ mali_bcast_reset(group->bcast_core); -+ } ++static int kbase_api_hwcnt_dump(struct kbase_context *kctx) ++{ ++ int ret; + -+ MALI_DEBUG_ASSERT(NULL != group->mmu); -+ mali_group_reset_mmu(group); ++ mutex_lock(&kctx->vinstr_cli_lock); ++ ret = kbase_vinstr_hwc_dump(kctx->vinstr_cli, ++ BASE_HWCNT_READER_EVENT_MANUAL); ++ mutex_unlock(&kctx->vinstr_cli_lock); + -+ if (NULL != group->gp_core) { -+ MALI_DEBUG_ASSERT(NULL == group->pp_core); -+ mali_gp_reset(group->gp_core); -+ } else { -+ MALI_DEBUG_ASSERT(NULL != group->pp_core); -+ mali_group_reset_pp(group); -+ } ++ return ret; +} + -+void mali_group_start_gp_job(struct mali_group *group, struct mali_gp_job *job, mali_bool gpu_secure_mode_pre_enabled) ++static int kbase_api_hwcnt_clear(struct kbase_context *kctx) +{ -+ struct mali_session_data *session; -+ -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ int ret; + -+ MALI_DEBUG_PRINT(3, ("Group: Starting GP job 0x%08X on group %s\n", -+ job, -+ mali_group_core_description(group))); ++ mutex_lock(&kctx->vinstr_cli_lock); ++ ret = kbase_vinstr_hwc_clear(kctx->vinstr_cli); ++ mutex_unlock(&kctx->vinstr_cli_lock); + -+ session = mali_gp_job_get_session(job); ++ return ret; ++} + -+ MALI_DEBUG_ASSERT_POINTER(group->l2_cache_core[0]); -+ mali_l2_cache_invalidate_conditional(group->l2_cache_core[0], mali_gp_job_get_cache_order(job)); ++static int kbase_api_disjoint_query(struct kbase_context *kctx, ++ struct kbase_ioctl_disjoint_query *query) ++{ ++ query->counter = kbase_disjoint_event_get(kctx->kbdev); + -+ /* Reset GPU and disable gpu secure mode if needed. */ -+ if (MALI_TRUE == _mali_osk_gpu_secure_mode_is_enabled()) { -+ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); -+ _mali_osk_gpu_reset_and_secure_mode_disable(); -+ /* Need to disable the pmu interrupt mask register */ -+ if (NULL != pmu) { -+ mali_pmu_reset(pmu); -+ } -+ } ++ return 0; ++} + -+ /* Reload mmu page table if needed */ -+ if (MALI_TRUE == gpu_secure_mode_pre_enabled) { -+ mali_group_reset(group); -+ mali_group_activate_page_directory(group, session, MALI_TRUE); -+ } else { -+ mali_group_activate_page_directory(group, session, MALI_FALSE); -+ } ++static int kbase_api_get_ddk_version(struct kbase_context *kctx, ++ struct kbase_ioctl_get_ddk_version *version) ++{ ++ int ret; ++ int len = sizeof(KERNEL_SIDE_DDK_VERSION_STRING); + -+ mali_gp_job_start(group->gp_core, job); ++ if (version->version_buffer.value == NULL) ++ return len; + -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_MAKE_EVENT_CHANNEL_GP(0) | -+ MALI_PROFILING_EVENT_REASON_SINGLE_HW_FLUSH, -+ mali_gp_job_get_frame_builder_id(job), mali_gp_job_get_flush_id(job), 0, 0, 0); -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | -+ MALI_PROFILING_MAKE_EVENT_CHANNEL_GP(0), -+ mali_gp_job_get_pid(job), mali_gp_job_get_tid(job), 0, 0, 0); ++ if (version->size < len) ++ return -EOVERFLOW; + -+#if defined(CONFIG_MALI400_PROFILING) -+ trace_mali_core_active(mali_gp_job_get_pid(job), 1 /* active */, 1 /* GP */, 0 /* core */, -+ mali_gp_job_get_frame_builder_id(job), mali_gp_job_get_flush_id(job)); -+#endif ++ ret = copy_to_user(version->version_buffer.value, ++ KERNEL_SIDE_DDK_VERSION_STRING, ++ sizeof(KERNEL_SIDE_DDK_VERSION_STRING)); + -+#if defined(CONFIG_MALI400_PROFILING) -+ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[0])) && -+ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[0]))) { -+ mali_group_report_l2_cache_counters_per_core(group, 0); -+ } -+#endif /* #if defined(CONFIG_MALI400_PROFILING) */ ++ if (ret) ++ return ret; + -+#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) -+ if (group->gp_core) { -+ trace_gpu_sched_switch(mali_gp_core_description(group->gp_core), -+ sched_clock(), mali_gp_job_get_tid(job), -+ 0, mali_gp_job_get_id(job)); -+ } -+#endif ++ return len; ++} + -+ group->gp_running_job = job; -+ group->is_working = MALI_TRUE; ++static int kbase_api_mem_jit_init(struct kbase_context *kctx, ++ struct kbase_ioctl_mem_jit_init *jit_init) ++{ ++ return kbase_region_tracker_init_jit(kctx, jit_init->va_pages); ++} + -+ /* Setup SW timer and record start time */ -+ group->start_time = _mali_osk_time_tickcount(); -+ _mali_osk_timer_mod(group->timeout_timer, _mali_osk_time_mstoticks(mali_max_job_runtime)); ++static int kbase_api_mem_sync(struct kbase_context *kctx, ++ struct kbase_ioctl_mem_sync *sync) ++{ ++#ifdef CONFIG_MALI_COH_USER ++ return 0; ++#endif ++ struct basep_syncset sset = { ++ .mem_handle.basep.handle = sync->handle, ++ .user_addr = sync->user_addr, ++ .size = sync->size, ++ .type = sync->type ++ }; + -+ MALI_DEBUG_PRINT(4, ("Group: Started GP job 0x%08X on group %s at %u\n", -+ job, -+ mali_group_core_description(group), -+ group->start_time)); ++ return kbase_sync_now(kctx, &sset); +} + -+/* Used to set all the registers except frame renderer list address and fragment shader stack address -+ * It means the caller must set these two registers properly before calling this function -+ */ -+void mali_group_start_pp_job(struct mali_group *group, struct mali_pp_job *job, u32 sub_job, mali_bool gpu_secure_mode_pre_enabled) ++static int kbase_api_mem_find_cpu_offset(struct kbase_context *kctx, ++ union kbase_ioctl_mem_find_cpu_offset *find) +{ -+ struct mali_session_data *session; -+ -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ return kbasep_find_enclosing_cpu_mapping_offset( ++ kctx, ++ find->in.cpu_addr, ++ find->in.size, ++ &find->out.offset); ++} + -+ MALI_DEBUG_PRINT(3, ("Group: Starting PP job 0x%08X part %u/%u on group %s\n", -+ job, sub_job + 1, -+ mali_pp_job_get_sub_job_count(job), -+ mali_group_core_description(group))); ++static int kbase_api_get_context_id(struct kbase_context *kctx, ++ struct kbase_ioctl_get_context_id *info) ++{ ++ info->id = kctx->id; + -+ session = mali_pp_job_get_session(job); ++ return 0; ++} + -+ if (NULL != group->l2_cache_core[0]) { -+ mali_l2_cache_invalidate_conditional(group->l2_cache_core[0], mali_pp_job_get_cache_order(job)); -+ } ++static int kbase_api_tlstream_acquire(struct kbase_context *kctx, ++ struct kbase_ioctl_tlstream_acquire *acquire) ++{ ++ return kbase_tlstream_acquire(kctx, acquire->flags); ++} + -+ if (NULL != group->l2_cache_core[1]) { -+ mali_l2_cache_invalidate_conditional(group->l2_cache_core[1], mali_pp_job_get_cache_order(job)); -+ } ++static int kbase_api_tlstream_flush(struct kbase_context *kctx) ++{ ++ kbase_tlstream_flush_streams(); + -+ /* Reset GPU and change gpu secure mode if needed. */ -+ if (MALI_TRUE == mali_pp_job_is_protected_job(job) && MALI_FALSE == _mali_osk_gpu_secure_mode_is_enabled()) { -+ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); -+ _mali_osk_gpu_reset_and_secure_mode_enable(); -+ /* Need to disable the pmu interrupt mask register */ -+ if (NULL != pmu) { -+ mali_pmu_reset(pmu); -+ } -+ } else if (MALI_FALSE == mali_pp_job_is_protected_job(job) && MALI_TRUE == _mali_osk_gpu_secure_mode_is_enabled()) { -+ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); -+ _mali_osk_gpu_reset_and_secure_mode_disable(); -+ /* Need to disable the pmu interrupt mask register */ -+ if (NULL != pmu) { -+ mali_pmu_reset(pmu); -+ } -+ } ++ return 0; ++} + -+ /* Reload the mmu page table if needed */ -+ if ((MALI_TRUE == mali_pp_job_is_protected_job(job) && MALI_FALSE == gpu_secure_mode_pre_enabled) -+ || (MALI_FALSE == mali_pp_job_is_protected_job(job) && MALI_TRUE == gpu_secure_mode_pre_enabled)) { -+ mali_group_reset(group); -+ mali_group_activate_page_directory(group, session, MALI_TRUE); -+ } else { -+ mali_group_activate_page_directory(group, session, MALI_FALSE); -+ } ++static int kbase_api_mem_commit(struct kbase_context *kctx, ++ struct kbase_ioctl_mem_commit *commit) ++{ ++ return kbase_mem_commit(kctx, commit->gpu_addr, commit->pages); ++} + -+ if (mali_group_is_virtual(group)) { -+ struct mali_group *child; -+ struct mali_group *temp; -+ u32 core_num = 0; ++static int kbase_api_mem_alias(struct kbase_context *kctx, ++ union kbase_ioctl_mem_alias *alias) ++{ ++ struct base_mem_aliasing_info *ai; ++ void __user *user_addr = NULL; ++ u64 flags; ++ int err; + -+ MALI_DEBUG_ASSERT(mali_pp_job_is_virtual(job)); ++ if (alias->in.nents == 0 || alias->in.nents > 2048) ++ return -EINVAL; + -+ /* Configure DLBU for the job */ -+ mali_dlbu_config_job(group->dlbu_core, job); ++ ai = vmalloc(sizeof(*ai) * alias->in.nents); ++ if (!ai) ++ return -ENOMEM; + -+ /* Write stack address for each child group */ -+ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { -+ mali_pp_write_addr_stack(child->pp_core, job); -+ core_num++; -+ } ++#ifdef CONFIG_COMPAT ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ user_addr = ++ compat_ptr(alias->in.aliasing_info.compat_value); ++ else ++#endif ++ user_addr = alias->in.aliasing_info.value; + -+ mali_pp_job_start(group->pp_core, job, sub_job, MALI_FALSE); -+ } else { -+ mali_pp_job_start(group->pp_core, job, sub_job, MALI_FALSE); ++ err = copy_from_user(ai, user_addr, sizeof(*ai) * alias->in.nents); ++ if (err) { ++ vfree(ai); ++ return err; + } + -+ /* if the group is virtual, loop through physical groups which belong to this group -+ * and call profiling events for its cores as virtual */ -+ if (MALI_TRUE == mali_group_is_virtual(group)) { -+ struct mali_group *child; -+ struct mali_group *temp; -+ -+ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(child->pp_core)) | -+ MALI_PROFILING_EVENT_REASON_SINGLE_HW_FLUSH, -+ mali_pp_job_get_frame_builder_id(job), mali_pp_job_get_flush_id(job), 0, 0, 0); -+ -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | -+ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(child->pp_core)) | -+ MALI_PROFILING_EVENT_REASON_START_STOP_HW_VIRTUAL, -+ mali_pp_job_get_pid(job), mali_pp_job_get_tid(job), 0, 0, 0); ++ flags = alias->in.flags; + -+#if defined(CONFIG_MALI400_PROFILING) -+ trace_mali_core_active(mali_pp_job_get_pid(job), 1 /* active */, 0 /* PP */, mali_pp_core_get_id(child->pp_core), -+ mali_pp_job_get_frame_builder_id(job), mali_pp_job_get_flush_id(job)); -+#endif -+ } ++ alias->out.gpu_va = kbase_mem_alias(kctx, &flags, ++ alias->in.stride, alias->in.nents, ++ ai, &alias->out.va_pages); + -+#if defined(CONFIG_MALI400_PROFILING) -+ if (0 != group->l2_cache_core_ref_count[0]) { -+ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[0])) && -+ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[0]))) { -+ mali_group_report_l2_cache_counters_per_core(group, mali_l2_cache_get_id(group->l2_cache_core[0])); -+ } -+ } -+ if (0 != group->l2_cache_core_ref_count[1]) { -+ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[1])) && -+ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[1]))) { -+ mali_group_report_l2_cache_counters_per_core(group, mali_l2_cache_get_id(group->l2_cache_core[1])); -+ } -+ } -+#endif /* #if defined(CONFIG_MALI400_PROFILING) */ ++ alias->out.flags = flags; + -+ } else { /* group is physical - call profiling events for physical cores */ -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(group->pp_core)) | -+ MALI_PROFILING_EVENT_REASON_SINGLE_HW_FLUSH, -+ mali_pp_job_get_frame_builder_id(job), mali_pp_job_get_flush_id(job), 0, 0, 0); ++ vfree(ai); + -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | -+ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(group->pp_core)) | -+ MALI_PROFILING_EVENT_REASON_START_STOP_HW_PHYSICAL, -+ mali_pp_job_get_pid(job), mali_pp_job_get_tid(job), 0, 0, 0); ++ if (alias->out.gpu_va == 0) ++ return -ENOMEM; + -+#if defined(CONFIG_MALI400_PROFILING) -+ trace_mali_core_active(mali_pp_job_get_pid(job), 1 /* active */, 0 /* PP */, mali_pp_core_get_id(group->pp_core), -+ mali_pp_job_get_frame_builder_id(job), mali_pp_job_get_flush_id(job)); -+#endif ++ return 0; ++} + -+#if defined(CONFIG_MALI400_PROFILING) -+ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[0])) && -+ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[0]))) { -+ mali_group_report_l2_cache_counters_per_core(group, mali_l2_cache_get_id(group->l2_cache_core[0])); -+ } -+#endif /* #if defined(CONFIG_MALI400_PROFILING) */ -+ } ++static int kbase_api_mem_import(struct kbase_context *kctx, ++ union kbase_ioctl_mem_import *import) ++{ ++ int ret; ++ u64 flags = import->in.flags; ++ void __user *phandle; + -+#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) -+ if (group->pp_core) { -+ trace_gpu_sched_switch(mali_pp_core_description(group->pp_core), -+ sched_clock(), mali_pp_job_get_tid(job), -+ 0, mali_pp_job_get_id(job)); -+ } ++#ifdef CONFIG_COMPAT ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ phandle = compat_ptr(import->in.phandle.compat_value); ++ else +#endif ++ phandle = import->in.phandle.value; + -+ group->pp_running_job = job; -+ group->pp_running_sub_job = sub_job; -+ group->is_working = MALI_TRUE; -+ -+ /* Setup SW timer and record start time */ -+ group->start_time = _mali_osk_time_tickcount(); -+ _mali_osk_timer_mod(group->timeout_timer, _mali_osk_time_mstoticks(mali_max_job_runtime)); ++ ret = kbase_mem_import(kctx, ++ import->in.type, ++ phandle, ++ import->in.padding, ++ &import->out.gpu_va, ++ &import->out.va_pages, ++ &flags); + -+ MALI_DEBUG_PRINT(4, ("Group: Started PP job 0x%08X part %u/%u on group %s at %u\n", -+ job, sub_job + 1, -+ mali_pp_job_get_sub_job_count(job), -+ mali_group_core_description(group), -+ group->start_time)); ++ import->out.flags = flags; + ++ return ret; +} + -+void mali_group_resume_gp_with_new_heap(struct mali_group *group, u32 job_id, u32 start_addr, u32 end_addr) ++static int kbase_api_mem_flags_change(struct kbase_context *kctx, ++ struct kbase_ioctl_mem_flags_change *change) +{ -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ -+ MALI_DEBUG_ASSERT_POINTER(group->l2_cache_core[0]); -+ mali_l2_cache_invalidate(group->l2_cache_core[0]); ++ return kbase_mem_flags_change(kctx, change->gpu_va, ++ change->flags, change->mask); ++} + -+ mali_mmu_zap_tlb_without_stall(group->mmu); ++static int kbase_api_stream_create(struct kbase_context *kctx, ++ struct kbase_ioctl_stream_create *stream) ++{ ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ int fd, ret; + -+ mali_gp_resume_with_new_heap(group->gp_core, start_addr, end_addr); ++ /* Name must be NULL-terminated and padded with NULLs, so check last ++ * character is NULL ++ */ ++ if (stream->name[sizeof(stream->name)-1] != 0) ++ return -EINVAL; + -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_RESUME | -+ MALI_PROFILING_MAKE_EVENT_CHANNEL_GP(0), -+ 0, 0, 0, 0, 0); ++ ret = kbase_sync_fence_stream_create(stream->name, &fd); + -+#if defined(CONFIG_MALI400_PROFILING) -+ trace_mali_core_active(mali_gp_job_get_pid(group->gp_running_job), 1 /* active */, 1 /* GP */, 0 /* core */, -+ mali_gp_job_get_frame_builder_id(group->gp_running_job), mali_gp_job_get_flush_id(group->gp_running_job)); ++ if (ret) ++ return ret; ++ return fd; ++#else ++ return -ENOENT; +#endif +} + -+static void mali_group_reset_mmu(struct mali_group *group) ++static int kbase_api_fence_validate(struct kbase_context *kctx, ++ struct kbase_ioctl_fence_validate *validate) +{ -+ struct mali_group *child; -+ struct mali_group *temp; -+ _mali_osk_errcode_t err; ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ return kbase_sync_fence_validate(validate->fd); ++#else ++ return -ENOENT; ++#endif ++} + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++static int kbase_api_get_profiling_controls(struct kbase_context *kctx, ++ struct kbase_ioctl_get_profiling_controls *controls) ++{ ++ if (controls->count > FBDUMP_CONTROL_MAX) ++ return -EINVAL; + -+ if (!mali_group_is_virtual(group)) { -+ /* This is a physical group or an idle virtual group -- simply wait for -+ * the reset to complete. */ -+ err = mali_mmu_reset(group->mmu); -+ MALI_DEBUG_ASSERT(_MALI_OSK_ERR_OK == err); -+ } else { /* virtual group */ -+ /* Loop through all members of this virtual group and wait -+ * until they are done resetting. -+ */ -+ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { -+ err = mali_mmu_reset(child->mmu); -+ MALI_DEBUG_ASSERT(_MALI_OSK_ERR_OK == err); -+ } -+ } ++ return copy_to_user(controls->buffer.value, ++ &kctx->kbdev->kbase_profiling_controls[ ++ FBDUMP_CONTROL_MIN], ++ controls->count * sizeof(u32)); +} + -+static void mali_group_reset_pp(struct mali_group *group) ++static int kbase_api_mem_profile_add(struct kbase_context *kctx, ++ struct kbase_ioctl_mem_profile_add *data) +{ -+ struct mali_group *child; -+ struct mali_group *temp; ++ char __user *user_buf; ++ char *buf; ++ int err; + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ if (data->len > KBASE_MEM_PROFILE_MAX_BUF_SIZE) { ++ dev_err(kctx->kbdev->dev, "mem_profile_add: buffer too big\n"); ++ return -EINVAL; ++ } + -+ mali_pp_reset_async(group->pp_core); ++ buf = kmalloc(data->len, GFP_KERNEL); ++ if (ZERO_OR_NULL_PTR(buf)) ++ return -ENOMEM; + -+ if (!mali_group_is_virtual(group) || NULL == group->pp_running_job) { -+ /* This is a physical group or an idle virtual group -- simply wait for -+ * the reset to complete. */ -+ mali_pp_reset_wait(group->pp_core); -+ } else { -+ /* Loop through all members of this virtual group and wait until they -+ * are done resetting. -+ */ -+ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { -+ mali_pp_reset_wait(child->pp_core); -+ } ++#ifdef CONFIG_COMPAT ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ user_buf = compat_ptr(data->buffer.compat_value); ++ else ++#endif ++ user_buf = data->buffer.value; ++ ++ err = copy_from_user(buf, user_buf, data->len); ++ if (err) { ++ kfree(buf); ++ return err; + } ++ ++ return kbasep_mem_profile_debugfs_insert(kctx, buf, data->len); +} + -+struct mali_pp_job *mali_group_complete_pp(struct mali_group *group, mali_bool success, u32 *sub_job) ++static int kbase_api_soft_event_update(struct kbase_context *kctx, ++ struct kbase_ioctl_soft_event_update *update) +{ -+ struct mali_pp_job *pp_job_to_return; ++ if (update->flags != 0) ++ return -EINVAL; + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->pp_core); -+ MALI_DEBUG_ASSERT_POINTER(group->pp_running_job); -+ MALI_DEBUG_ASSERT_POINTER(sub_job); -+ MALI_DEBUG_ASSERT(MALI_TRUE == group->is_working); ++ return kbase_soft_event_update(kctx, update->event, update->new_status); ++} + -+ /* Stop/clear the timeout timer. */ -+ _mali_osk_timer_del_async(group->timeout_timer); ++#if MALI_UNIT_TEST ++static int kbase_api_tlstream_test(struct kbase_context *kctx, ++ struct kbase_ioctl_tlstream_test *test) ++{ ++ kbase_tlstream_test( ++ test->tpw_count, ++ test->msg_delay, ++ test->msg_count, ++ test->aux_msg); + -+ if (NULL != group->pp_running_job) { ++ return 0; ++} + -+ /* Deal with HW counters and profiling */ ++static int kbase_api_tlstream_stats(struct kbase_context *kctx, ++ struct kbase_ioctl_tlstream_stats *stats) ++{ ++ kbase_tlstream_stats( ++ &stats->bytes_collected, ++ &stats->bytes_generated); + -+ if (MALI_TRUE == mali_group_is_virtual(group)) { -+ struct mali_group *child; -+ struct mali_group *temp; ++ return 0; ++} ++#endif /* MALI_UNIT_TEST */ + -+ /* update performance counters from each physical pp core within this virtual group */ -+ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { -+ mali_pp_update_performance_counters(group->pp_core, child->pp_core, group->pp_running_job, mali_pp_core_get_id(child->pp_core)); -+ } ++#define KBASE_HANDLE_IOCTL(cmd, function) \ ++ case cmd: \ ++ do { \ ++ BUILD_BUG_ON(_IOC_DIR(cmd) != _IOC_NONE); \ ++ return function(kctx); \ ++ } while (0) + -+#if defined(CONFIG_MALI400_PROFILING) -+ /* send profiling data per physical core */ -+ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | -+ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(child->pp_core)) | -+ MALI_PROFILING_EVENT_REASON_START_STOP_HW_VIRTUAL, -+ mali_pp_job_get_perf_counter_value0(group->pp_running_job, mali_pp_core_get_id(child->pp_core)), -+ mali_pp_job_get_perf_counter_value1(group->pp_running_job, mali_pp_core_get_id(child->pp_core)), -+ mali_pp_job_get_perf_counter_src0(group->pp_running_job, group->pp_running_sub_job) | (mali_pp_job_get_perf_counter_src1(group->pp_running_job, group->pp_running_sub_job) << 8), -+ 0, 0); -+ -+ trace_mali_core_active(mali_pp_job_get_pid(group->pp_running_job), -+ 0 /* active */, 0 /* PP */, mali_pp_core_get_id(child->pp_core), -+ mali_pp_job_get_frame_builder_id(group->pp_running_job), -+ mali_pp_job_get_flush_id(group->pp_running_job)); -+ } -+ if (0 != group->l2_cache_core_ref_count[0]) { -+ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[0])) && -+ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[0]))) { -+ mali_group_report_l2_cache_counters_per_core(group, mali_l2_cache_get_id(group->l2_cache_core[0])); -+ } -+ } -+ if (0 != group->l2_cache_core_ref_count[1]) { -+ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[1])) && -+ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[1]))) { -+ mali_group_report_l2_cache_counters_per_core(group, mali_l2_cache_get_id(group->l2_cache_core[1])); -+ } -+ } ++#define KBASE_HANDLE_IOCTL_IN(cmd, function, type) \ ++ case cmd: \ ++ do { \ ++ type param; \ ++ int err; \ ++ BUILD_BUG_ON(_IOC_DIR(cmd) != _IOC_WRITE); \ ++ BUILD_BUG_ON(sizeof(param) != _IOC_SIZE(cmd)); \ ++ err = copy_from_user(¶m, uarg, sizeof(param)); \ ++ if (err) \ ++ return -EFAULT; \ ++ return function(kctx, ¶m); \ ++ } while (0) + -+#endif -+ } else { -+ /* update performance counters for a physical group's pp core */ -+ mali_pp_update_performance_counters(group->pp_core, group->pp_core, group->pp_running_job, group->pp_running_sub_job); ++#define KBASE_HANDLE_IOCTL_OUT(cmd, function, type) \ ++ case cmd: \ ++ do { \ ++ type param; \ ++ int ret, err; \ ++ BUILD_BUG_ON(_IOC_DIR(cmd) != _IOC_READ); \ ++ BUILD_BUG_ON(sizeof(param) != _IOC_SIZE(cmd)); \ ++ ret = function(kctx, ¶m); \ ++ err = copy_to_user(uarg, ¶m, sizeof(param)); \ ++ if (err) \ ++ return -EFAULT; \ ++ return ret; \ ++ } while (0) + -+#if defined(CONFIG_MALI400_PROFILING) -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | -+ MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(mali_pp_core_get_id(group->pp_core)) | -+ MALI_PROFILING_EVENT_REASON_START_STOP_HW_PHYSICAL, -+ mali_pp_job_get_perf_counter_value0(group->pp_running_job, group->pp_running_sub_job), -+ mali_pp_job_get_perf_counter_value1(group->pp_running_job, group->pp_running_sub_job), -+ mali_pp_job_get_perf_counter_src0(group->pp_running_job, group->pp_running_sub_job) | (mali_pp_job_get_perf_counter_src1(group->pp_running_job, group->pp_running_sub_job) << 8), -+ 0, 0); ++#define KBASE_HANDLE_IOCTL_INOUT(cmd, function, type) \ ++ case cmd: \ ++ do { \ ++ type param; \ ++ int ret, err; \ ++ BUILD_BUG_ON(_IOC_DIR(cmd) != (_IOC_WRITE|_IOC_READ)); \ ++ BUILD_BUG_ON(sizeof(param) != _IOC_SIZE(cmd)); \ ++ err = copy_from_user(¶m, uarg, sizeof(param)); \ ++ if (err) \ ++ return -EFAULT; \ ++ ret = function(kctx, ¶m); \ ++ err = copy_to_user(uarg, ¶m, sizeof(param)); \ ++ if (err) \ ++ return -EFAULT; \ ++ return ret; \ ++ } while (0) + -+ trace_mali_core_active(mali_pp_job_get_pid(group->pp_running_job), -+ 0 /* active */, 0 /* PP */, mali_pp_core_get_id(group->pp_core), -+ mali_pp_job_get_frame_builder_id(group->pp_running_job), -+ mali_pp_job_get_flush_id(group->pp_running_job)); ++static long kbase_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ++{ ++ struct kbase_context *kctx = filp->private_data; ++ struct kbase_device *kbdev = kctx->kbdev; ++ void __user *uarg = (void __user *)arg; + -+ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[0])) && -+ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[0]))) { -+ mali_group_report_l2_cache_counters_per_core(group, mali_l2_cache_get_id(group->l2_cache_core[0])); -+ } -+#endif -+ } ++ /* The UK ioctl values overflow the cmd field causing the type to be ++ * incremented ++ */ ++ if (_IOC_TYPE(cmd) == LINUX_UK_BASE_MAGIC+2) ++ return kbase_legacy_ioctl(filp, cmd, arg); + -+#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) -+ if (group->gp_core) { -+ trace_gpu_sched_switch( -+ mali_gp_core_description(group->gp_core), -+ sched_clock(), 0, 0, 0); -+ } -+#endif ++ /* The UK version check IOCTL doesn't overflow the cmd field, so is ++ * handled separately here ++ */ ++ if (cmd == _IOC(_IOC_READ|_IOC_WRITE, LINUX_UK_BASE_MAGIC, ++ UKP_FUNC_ID_CHECK_VERSION, ++ sizeof(struct uku_version_check_args))) ++ return kbase_legacy_ioctl(filp, cmd, arg); + ++ /* Only these ioctls are available until setup is complete */ ++ switch (cmd) { ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_VERSION_CHECK, ++ kbase_api_handshake, ++ struct kbase_ioctl_version_check); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_SET_FLAGS, ++ kbase_api_set_flags, ++ struct kbase_ioctl_set_flags); + } + -+ if (success) { -+ /* Only do soft reset for successful jobs, a full recovery -+ * reset will be done for failed jobs. */ -+ mali_pp_reset_async(group->pp_core); -+ } ++ /* Block call until version handshake and setup is complete */ ++ if (kctx->api_version == 0 || !atomic_read(&kctx->setup_complete)) ++ return -EINVAL; + -+ pp_job_to_return = group->pp_running_job; -+ group->pp_running_job = NULL; -+ group->is_working = MALI_FALSE; -+ *sub_job = group->pp_running_sub_job; ++ /* Normal ioctls */ ++ switch (cmd) { ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_JOB_SUBMIT, ++ kbase_api_job_submit, ++ struct kbase_ioctl_job_submit); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_GET_GPUPROPS, ++ kbase_api_get_gpuprops, ++ struct kbase_ioctl_get_gpuprops); ++ KBASE_HANDLE_IOCTL(KBASE_IOCTL_POST_TERM, ++ kbase_api_post_term); ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_ALLOC, ++ kbase_api_mem_alloc, ++ union kbase_ioctl_mem_alloc); ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_QUERY, ++ kbase_api_mem_query, ++ union kbase_ioctl_mem_query); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_FREE, ++ kbase_api_mem_free, ++ struct kbase_ioctl_mem_free); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_HWCNT_READER_SETUP, ++ kbase_api_hwcnt_reader_setup, ++ struct kbase_ioctl_hwcnt_reader_setup); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_HWCNT_ENABLE, ++ kbase_api_hwcnt_enable, ++ struct kbase_ioctl_hwcnt_enable); ++ KBASE_HANDLE_IOCTL(KBASE_IOCTL_HWCNT_DUMP, ++ kbase_api_hwcnt_dump); ++ KBASE_HANDLE_IOCTL(KBASE_IOCTL_HWCNT_CLEAR, ++ kbase_api_hwcnt_clear); ++ KBASE_HANDLE_IOCTL_OUT(KBASE_IOCTL_DISJOINT_QUERY, ++ kbase_api_disjoint_query, ++ struct kbase_ioctl_disjoint_query); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_GET_DDK_VERSION, ++ kbase_api_get_ddk_version, ++ struct kbase_ioctl_get_ddk_version); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_JIT_INIT, ++ kbase_api_mem_jit_init, ++ struct kbase_ioctl_mem_jit_init); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_SYNC, ++ kbase_api_mem_sync, ++ struct kbase_ioctl_mem_sync); ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_FIND_CPU_OFFSET, ++ kbase_api_mem_find_cpu_offset, ++ union kbase_ioctl_mem_find_cpu_offset); ++ KBASE_HANDLE_IOCTL_OUT(KBASE_IOCTL_GET_CONTEXT_ID, ++ kbase_api_get_context_id, ++ struct kbase_ioctl_get_context_id); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_TLSTREAM_ACQUIRE, ++ kbase_api_tlstream_acquire, ++ struct kbase_ioctl_tlstream_acquire); ++ KBASE_HANDLE_IOCTL(KBASE_IOCTL_TLSTREAM_FLUSH, ++ kbase_api_tlstream_flush); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_COMMIT, ++ kbase_api_mem_commit, ++ struct kbase_ioctl_mem_commit); ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_ALIAS, ++ kbase_api_mem_alias, ++ union kbase_ioctl_mem_alias); ++ KBASE_HANDLE_IOCTL_INOUT(KBASE_IOCTL_MEM_IMPORT, ++ kbase_api_mem_import, ++ union kbase_ioctl_mem_import); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_FLAGS_CHANGE, ++ kbase_api_mem_flags_change, ++ struct kbase_ioctl_mem_flags_change); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_STREAM_CREATE, ++ kbase_api_stream_create, ++ struct kbase_ioctl_stream_create); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_FENCE_VALIDATE, ++ kbase_api_fence_validate, ++ struct kbase_ioctl_fence_validate); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_GET_PROFILING_CONTROLS, ++ kbase_api_get_profiling_controls, ++ struct kbase_ioctl_get_profiling_controls); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_MEM_PROFILE_ADD, ++ kbase_api_mem_profile_add, ++ struct kbase_ioctl_mem_profile_add); ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_SOFT_EVENT_UPDATE, ++ kbase_api_soft_event_update, ++ struct kbase_ioctl_soft_event_update); + -+ if (!success) { -+ MALI_DEBUG_PRINT(2, ("Mali group: Executing recovery reset due to job failure\n")); -+ mali_group_recovery_reset(group); -+ } else if (_MALI_OSK_ERR_OK != mali_pp_reset_wait(group->pp_core)) { -+ MALI_PRINT_ERROR(("Mali group: Executing recovery reset due to reset failure\n")); -+ mali_group_recovery_reset(group); ++#if MALI_UNIT_TEST ++ KBASE_HANDLE_IOCTL_IN(KBASE_IOCTL_TLSTREAM_TEST, ++ kbase_api_tlstream_test, ++ struct kbase_ioctl_tlstream_test); ++ KBASE_HANDLE_IOCTL_OUT(KBASE_IOCTL_TLSTREAM_STATS, ++ kbase_api_tlstream_stats, ++ struct kbase_ioctl_tlstream_stats); ++#endif + } + -+ return pp_job_to_return; ++ dev_warn(kbdev->dev, "Unknown ioctl 0x%x nr:%d", cmd, _IOC_NR(cmd)); ++ ++ return -ENOIOCTLCMD; +} + -+struct mali_gp_job *mali_group_complete_gp(struct mali_group *group, mali_bool success) ++static ssize_t kbase_read(struct file *filp, char __user *buf, size_t count, loff_t *f_pos) +{ -+ struct mali_gp_job *gp_job_to_return; -+ -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->gp_core); -+ MALI_DEBUG_ASSERT_POINTER(group->gp_running_job); -+ MALI_DEBUG_ASSERT(MALI_TRUE == group->is_working); -+ -+ /* Stop/clear the timeout timer. */ -+ _mali_osk_timer_del_async(group->timeout_timer); ++ struct kbase_context *kctx = filp->private_data; ++ struct base_jd_event_v2 uevent; ++ int out_count = 0; + -+ if (NULL != group->gp_running_job) { -+ mali_gp_update_performance_counters(group->gp_core, group->gp_running_job); ++ if (count < sizeof(uevent)) ++ return -ENOBUFS; + -+#if defined(CONFIG_MALI400_PROFILING) -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | MALI_PROFILING_MAKE_EVENT_CHANNEL_GP(0), -+ mali_gp_job_get_perf_counter_value0(group->gp_running_job), -+ mali_gp_job_get_perf_counter_value1(group->gp_running_job), -+ mali_gp_job_get_perf_counter_src0(group->gp_running_job) | (mali_gp_job_get_perf_counter_src1(group->gp_running_job) << 8), -+ 0, 0); ++ do { ++ while (kbase_event_dequeue(kctx, &uevent)) { ++ if (out_count > 0) ++ goto out; + -+ if ((MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src0(group->l2_cache_core[0])) && -+ (MALI_HW_CORE_NO_COUNTER != mali_l2_cache_core_get_counter_src1(group->l2_cache_core[0]))) -+ mali_group_report_l2_cache_counters_per_core(group, 0); -+#endif ++ if (filp->f_flags & O_NONBLOCK) ++ return -EAGAIN; + -+#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) -+ if (group->pp_core) { -+ trace_gpu_sched_switch( -+ mali_pp_core_description(group->pp_core), -+ sched_clock(), 0, 0, 0); ++ if (wait_event_interruptible(kctx->event_queue, ++ kbase_event_pending(kctx)) != 0) ++ return -ERESTARTSYS; ++ } ++ if (uevent.event_code == BASE_JD_EVENT_DRV_TERMINATED) { ++ if (out_count == 0) ++ return -EPIPE; ++ goto out; + } -+#endif + -+#if defined(CONFIG_MALI400_PROFILING) -+ trace_mali_core_active(mali_gp_job_get_pid(group->gp_running_job), 0 /* active */, 1 /* GP */, 0 /* core */, -+ mali_gp_job_get_frame_builder_id(group->gp_running_job), mali_gp_job_get_flush_id(group->gp_running_job)); -+#endif ++ if (copy_to_user(buf, &uevent, sizeof(uevent)) != 0) ++ return -EFAULT; + -+ mali_gp_job_set_current_heap_addr(group->gp_running_job, -+ mali_gp_read_plbu_alloc_start_addr(group->gp_core)); -+ } ++ buf += sizeof(uevent); ++ out_count++; ++ count -= sizeof(uevent); ++ } while (count >= sizeof(uevent)); + -+ if (success) { -+ /* Only do soft reset for successful jobs, a full recovery -+ * reset will be done for failed jobs. */ -+ mali_gp_reset_async(group->gp_core); -+ } ++ out: ++ return out_count * sizeof(uevent); ++} + -+ gp_job_to_return = group->gp_running_job; -+ group->gp_running_job = NULL; -+ group->is_working = MALI_FALSE; ++static unsigned int kbase_poll(struct file *filp, poll_table *wait) ++{ ++ struct kbase_context *kctx = filp->private_data; + -+ if (!success) { -+ MALI_DEBUG_PRINT(2, ("Mali group: Executing recovery reset due to job failure\n")); -+ mali_group_recovery_reset(group); -+ } else if (_MALI_OSK_ERR_OK != mali_gp_reset_wait(group->gp_core)) { -+ MALI_PRINT_ERROR(("Mali group: Executing recovery reset due to reset failure\n")); -+ mali_group_recovery_reset(group); -+ } ++ poll_wait(filp, &kctx->event_queue, wait); ++ if (kbase_event_pending(kctx)) ++ return POLLIN | POLLRDNORM; + -+ return gp_job_to_return; ++ return 0; +} + -+struct mali_group *mali_group_get_glob_group(u32 index) ++void kbase_event_wakeup(struct kbase_context *kctx) +{ -+ if (mali_global_num_groups > index) { -+ return mali_global_groups[index]; -+ } ++ KBASE_DEBUG_ASSERT(kctx); + -+ return NULL; ++ wake_up_interruptible(&kctx->event_queue); +} + -+u32 mali_group_get_glob_num_groups(void) -+{ -+ return mali_global_num_groups; -+} ++KBASE_EXPORT_TEST_API(kbase_event_wakeup); + -+static void mali_group_activate_page_directory(struct mali_group *group, struct mali_session_data *session, mali_bool is_reload) ++static int kbase_check_flags(int flags) +{ -+ MALI_DEBUG_PRINT(5, ("Mali group: Activating page directory 0x%08X from session 0x%08X on group %s\n", -+ mali_session_get_page_directory(session), session, -+ mali_group_core_description(group))); -+ -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ /* Enforce that the driver keeps the O_CLOEXEC flag so that execve() always ++ * closes the file descriptor in a child process. ++ */ ++ if (0 == (flags & O_CLOEXEC)) ++ return -EINVAL; + -+ if (group->session != session || MALI_TRUE == is_reload) { -+ /* Different session than last time, so we need to do some work */ -+ MALI_DEBUG_PRINT(5, ("Mali group: Activate session: %08x previous: %08x on group %s\n", -+ session, group->session, -+ mali_group_core_description(group))); -+ mali_mmu_activate_page_directory(group->mmu, mali_session_get_page_directory(session)); -+ group->session = session; -+ } else { -+ /* Same session as last time, so no work required */ -+ MALI_DEBUG_PRINT(4, ("Mali group: Activate existing session 0x%08X on group %s\n", -+ session->page_directory, -+ mali_group_core_description(group))); -+ mali_mmu_zap_tlb_without_stall(group->mmu); -+ } ++ return 0; +} + -+static void mali_group_recovery_reset(struct mali_group *group) ++ ++/** ++ * align_and_check - Align the specified pointer to the provided alignment and ++ * check that it is still in range. ++ * @gap_end: Highest possible start address for allocation (end of gap in ++ * address space) ++ * @gap_start: Start address of current memory area / gap in address space ++ * @info: vm_unmapped_area_info structure passed to caller, containing ++ * alignment, length and limits for the allocation ++ * @is_shader_code: True if the allocation is for shader code (which has ++ * additional alignment requirements) ++ * ++ * Return: true if gap_end is now aligned correctly and is still in range, ++ * false otherwise ++ */ ++static bool align_and_check(unsigned long *gap_end, unsigned long gap_start, ++ struct vm_unmapped_area_info *info, bool is_shader_code) +{ -+ _mali_osk_errcode_t err; ++ /* Compute highest gap address at the desired alignment */ ++ (*gap_end) -= info->length; ++ (*gap_end) -= (*gap_end - info->align_offset) & info->align_mask; + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ if (is_shader_code) { ++ /* Check for 4GB boundary */ ++ if (0 == (*gap_end & BASE_MEM_MASK_4GB)) ++ (*gap_end) -= (info->align_offset ? info->align_offset : ++ info->length); ++ if (0 == ((*gap_end + info->length) & BASE_MEM_MASK_4GB)) ++ (*gap_end) -= (info->align_offset ? info->align_offset : ++ info->length); + -+ /* Stop cores, bus stop */ -+ if (NULL != group->pp_core) { -+ mali_pp_stop_bus(group->pp_core); -+ } else { -+ mali_gp_stop_bus(group->gp_core); ++ if (!(*gap_end & BASE_MEM_MASK_4GB) || !((*gap_end + ++ info->length) & BASE_MEM_MASK_4GB)) ++ return false; + } + -+ /* Flush MMU and clear page fault (if any) */ -+ mali_mmu_activate_fault_flush_page_directory(group->mmu); -+ mali_mmu_page_fault_done(group->mmu); + -+ /* Wait for cores to stop bus, then do a hard reset on them */ -+ if (NULL != group->pp_core) { -+ if (mali_group_is_virtual(group)) { -+ struct mali_group *child, *temp; ++ if ((*gap_end < info->low_limit) || (*gap_end < gap_start)) ++ return false; + -+ /* Disable the broadcast unit while we do reset directly on the member cores. */ -+ mali_bcast_disable(group->bcast_core); + -+ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, struct mali_group, group_list) { -+ mali_pp_stop_bus_wait(child->pp_core); -+ mali_pp_hard_reset(child->pp_core); -+ } ++ return true; ++} + -+ mali_bcast_enable(group->bcast_core); -+ } else { -+ mali_pp_stop_bus_wait(group->pp_core); -+ mali_pp_hard_reset(group->pp_core); -+ } -+ } else { -+ mali_gp_stop_bus_wait(group->gp_core); -+ mali_gp_hard_reset(group->gp_core); -+ } ++/* The following function is taken from the kernel and just ++ * renamed. As it's not exported to modules we must copy-paste it here. ++ */ + -+ /* Reset MMU */ -+ err = mali_mmu_reset(group->mmu); -+ MALI_DEBUG_ASSERT(_MALI_OSK_ERR_OK == err); -+ MALI_IGNORE(err); ++static unsigned long kbase_unmapped_area_topdown(struct vm_unmapped_area_info ++ *info, bool is_shader_code) ++{ ++ struct mm_struct *mm = current->mm; ++ struct vm_area_struct *vma; ++ unsigned long length, low_limit, high_limit, gap_start, gap_end; + -+ group->session = NULL; -+} ++ /* Adjust search length to account for worst case alignment overhead */ ++ length = info->length + info->align_mask; ++ if (length < info->length) ++ return -ENOMEM; + -+#if MALI_STATE_TRACKING -+u32 mali_group_dump_state(struct mali_group *group, char *buf, u32 size) -+{ -+ int n = 0; -+ int i; -+ struct mali_group *child; -+ struct mali_group *temp; ++ /* ++ * Adjust search limits by the desired length. ++ * See implementation comment at top of unmapped_area(). ++ */ ++ gap_end = info->high_limit; ++ if (gap_end < length) ++ return -ENOMEM; ++ high_limit = gap_end - length; + -+ if (mali_group_is_virtual(group)) { -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "Virtual PP Group: %p\n", group); -+ } else if (mali_group_is_in_virtual(group)) { -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "Child PP Group: %p\n", group); -+ } else if (NULL != group->pp_core) { -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "Physical PP Group: %p\n", group); -+ } else { -+ MALI_DEBUG_ASSERT_POINTER(group->gp_core); -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "GP Group: %p\n", group); -+ } ++ if (info->low_limit > high_limit) ++ return -ENOMEM; ++ low_limit = info->low_limit + length; + -+ switch (group->state) { -+ case MALI_GROUP_STATE_INACTIVE: -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\tstate: INACTIVE\n"); -+ break; -+ case MALI_GROUP_STATE_ACTIVATION_PENDING: -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\tstate: ACTIVATION_PENDING\n"); -+ break; -+ case MALI_GROUP_STATE_ACTIVE: -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\tstate: MALI_GROUP_STATE_ACTIVE\n"); -+ break; -+ default: -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\tstate: UNKNOWN (%d)\n", group->state); -+ MALI_DEBUG_ASSERT(0); -+ break; ++ /* Check highest gap, which does not precede any rbtree node */ ++ gap_start = mm->highest_vm_end; ++ if (gap_start <= high_limit) { ++ if (align_and_check(&gap_end, gap_start, info, is_shader_code)) ++ return gap_end; + } + -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\tSW power: %s\n", -+ group->power_is_on ? "On" : "Off"); -+ -+ n += mali_pm_dump_state_domain(group->pm_domain, buf + n, size - n); ++ /* Check if rbtree root looks promising */ ++ if (RB_EMPTY_ROOT(&mm->mm_rb)) ++ return -ENOMEM; ++ vma = rb_entry(mm->mm_rb.rb_node, struct vm_area_struct, vm_rb); ++ if (vma->rb_subtree_gap < length) ++ return -ENOMEM; + -+ for (i = 0; i < 2; i++) { -+ if (NULL != group->l2_cache_core[i]) { -+ struct mali_pm_domain *domain; -+ domain = mali_l2_cache_get_pm_domain( -+ group->l2_cache_core[i]); -+ n += mali_pm_dump_state_domain(domain, -+ buf + n, size - n); ++ while (true) { ++ /* Visit right subtree if it looks promising */ ++ gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0; ++ if (gap_start <= high_limit && vma->vm_rb.rb_right) { ++ struct vm_area_struct *right = ++ rb_entry(vma->vm_rb.rb_right, ++ struct vm_area_struct, vm_rb); ++ if (right->rb_subtree_gap >= length) { ++ vma = right; ++ continue; ++ } + } -+ } + -+ if (group->gp_core) { -+ n += mali_gp_dump_state(group->gp_core, buf + n, size - n); -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\tGP running job: %p\n", group->gp_running_job); -+ } ++check_current: ++ /* Check if current node has a suitable gap */ ++ gap_end = vma->vm_start; ++ if (gap_end < low_limit) ++ return -ENOMEM; ++ if (gap_start <= high_limit && gap_end - gap_start >= length) { ++ /* We found a suitable gap. Clip it with the original ++ * high_limit. */ ++ if (gap_end > info->high_limit) ++ gap_end = info->high_limit; + -+ if (group->pp_core) { -+ n += mali_pp_dump_state(group->pp_core, buf + n, size - n); -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\tPP running job: %p, subjob %d \n", -+ group->pp_running_job, -+ group->pp_running_sub_job); -+ } ++ if (align_and_check(&gap_end, gap_start, info, ++ is_shader_code)) ++ return gap_end; ++ } + -+ _MALI_OSK_LIST_FOREACHENTRY(child, temp, &group->group_list, -+ struct mali_group, group_list) { -+ n += mali_group_dump_state(child, buf + n, size - n); ++ /* Visit left subtree if it looks promising */ ++ if (vma->vm_rb.rb_left) { ++ struct vm_area_struct *left = ++ rb_entry(vma->vm_rb.rb_left, ++ struct vm_area_struct, vm_rb); ++ if (left->rb_subtree_gap >= length) { ++ vma = left; ++ continue; ++ } ++ } ++ ++ /* Go back up the rbtree to find next candidate node */ ++ while (true) { ++ struct rb_node *prev = &vma->vm_rb; ++ if (!rb_parent(prev)) ++ return -ENOMEM; ++ vma = rb_entry(rb_parent(prev), ++ struct vm_area_struct, vm_rb); ++ if (prev == vma->vm_rb.rb_right) { ++ gap_start = vma->vm_prev ? ++ vma->vm_prev->vm_end : 0; ++ goto check_current; ++ } ++ } + } + -+ return n; ++ return -ENOMEM; +} -+#endif + -+_mali_osk_errcode_t mali_group_upper_half_mmu(void *data) ++static unsigned long kbase_get_unmapped_area(struct file *filp, ++ const unsigned long addr, const unsigned long len, ++ const unsigned long pgoff, const unsigned long flags) +{ -+ struct mali_group *group = (struct mali_group *)data; -+ _mali_osk_errcode_t ret; ++ /* based on get_unmapped_area, but simplified slightly due to that some ++ * values are known in advance */ ++ struct kbase_context *kctx = filp->private_data; ++ struct mm_struct *mm = current->mm; ++ struct vm_unmapped_area_info info; ++ unsigned long align_offset = 0; ++ unsigned long align_mask = 0; ++ unsigned long high_limit = mm->mmap_base; ++ unsigned long low_limit = PAGE_SIZE; ++ int cpu_va_bits = BITS_PER_LONG; ++ int gpu_pc_bits = ++ kctx->kbdev->gpu_props.props.core_props.log2_program_counter_size; ++ bool is_shader_code = false; ++ unsigned long ret; + -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->mmu); ++ /* err on fixed address */ ++ if ((flags & MAP_FIXED) || addr) ++ return -EINVAL; + -+#if defined(CONFIG_MALI400_PROFILING) && defined (CONFIG_TRACEPOINTS) -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ mali_executor_lock(); -+ if (!mali_group_is_working(group)) { -+ /* Not working, so nothing to do */ -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+ } -+#endif -+ if (NULL != group->gp_core) { -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, -+ 0, 0, /* No pid and tid for interrupt handler */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP_MMU(0), -+ mali_mmu_get_rawstat(group->mmu), 0); -+ } else { -+ MALI_DEBUG_ASSERT_POINTER(group->pp_core); -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, -+ 0, 0, /* No pid and tid for interrupt handler */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP_MMU( -+ mali_pp_core_get_id(group->pp_core)), -+ mali_mmu_get_rawstat(group->mmu), 0); -+ } -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ mali_executor_unlock(); -+#endif -+#endif ++#ifdef CONFIG_64BIT ++ /* too big? */ ++ if (len > TASK_SIZE - SZ_2M) ++ return -ENOMEM; + -+ ret = mali_executor_interrupt_mmu(group, MALI_TRUE); ++ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { + -+#if defined(CONFIG_MALI400_PROFILING) && defined (CONFIG_TRACEPOINTS) -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ mali_executor_lock(); -+ if (!mali_group_is_working(group) && (!mali_group_power_is_on(group))) { -+ /* group complete and on job shedule on it, it already power off */ -+ if (NULL != group->gp_core) { -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, -+ 0, 0, /* No pid and tid for interrupt handler */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP_MMU(0), -+ 0xFFFFFFFF, 0); ++ if (kbase_hw_has_feature(kctx->kbdev, ++ BASE_HW_FEATURE_33BIT_VA)) { ++ high_limit = kctx->same_va_end << PAGE_SHIFT; + } else { -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, -+ 0, 0, /* No pid and tid for interrupt handler */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP_MMU( -+ mali_pp_core_get_id(group->pp_core)), -+ 0xFFFFFFFF, 0); ++ high_limit = min_t(unsigned long, mm->mmap_base, ++ (kctx->same_va_end << PAGE_SHIFT)); ++ if (len >= SZ_2M) { ++ align_offset = SZ_2M; ++ align_mask = SZ_2M - 1; ++ } + } + -+ mali_executor_unlock(); -+ return ret; -+ } -+#endif -+ -+ if (NULL != group->gp_core) { -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, -+ 0, 0, /* No pid and tid for interrupt handler */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP_MMU(0), -+ mali_mmu_get_rawstat(group->mmu), 0); ++ low_limit = SZ_2M; + } else { -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, -+ 0, 0, /* No pid and tid for interrupt handler */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP_MMU( -+ mali_pp_core_get_id(group->pp_core)), -+ mali_mmu_get_rawstat(group->mmu), 0); ++ cpu_va_bits = 32; + } -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ mali_executor_unlock(); -+#endif -+#endif -+ -+ return ret; -+} -+ -+static void mali_group_bottom_half_mmu(void *data) -+{ -+ struct mali_group *group = (struct mali_group *)data; ++#endif /* CONFIG_64BIT */ ++ if ((PFN_DOWN(BASE_MEM_COOKIE_BASE) <= pgoff) && ++ (PFN_DOWN(BASE_MEM_FIRST_FREE_ADDRESS) > pgoff)) { ++ int cookie = pgoff - PFN_DOWN(BASE_MEM_COOKIE_BASE); + -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->mmu); ++ if (!kctx->pending_regions[cookie]) ++ return -EINVAL; + -+ if (NULL != group->gp_core) { -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, -+ 0, _mali_osk_get_tid(), /* pid and tid */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP_MMU(0), -+ mali_mmu_get_rawstat(group->mmu), 0); ++ if (!(kctx->pending_regions[cookie]->flags & ++ KBASE_REG_GPU_NX)) { ++ if (cpu_va_bits > gpu_pc_bits) { ++ align_offset = 1ULL << gpu_pc_bits; ++ align_mask = align_offset - 1; ++ is_shader_code = true; ++ } ++ } ++#ifndef CONFIG_64BIT + } else { -+ MALI_DEBUG_ASSERT_POINTER(group->pp_core); -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, -+ 0, _mali_osk_get_tid(), /* pid and tid */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP_MMU( -+ mali_pp_core_get_id(group->pp_core)), -+ mali_mmu_get_rawstat(group->mmu), 0); ++ return current->mm->get_unmapped_area(filp, addr, len, pgoff, ++ flags); ++#endif + } + -+ mali_executor_interrupt_mmu(group, MALI_FALSE); -+ -+ if (NULL != group->gp_core) { -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, -+ 0, _mali_osk_get_tid(), /* pid and tid */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP_MMU(0), -+ mali_mmu_get_rawstat(group->mmu), 0); -+ } else { -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, -+ 0, _mali_osk_get_tid(), /* pid and tid */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP_MMU( -+ mali_pp_core_get_id(group->pp_core)), -+ mali_mmu_get_rawstat(group->mmu), 0); -+ } -+} ++ info.flags = 0; ++ info.length = len; ++ info.low_limit = low_limit; ++ info.high_limit = high_limit; ++ info.align_offset = align_offset; ++ info.align_mask = align_mask; + -+_mali_osk_errcode_t mali_group_upper_half_gp(void *data) -+{ -+ struct mali_group *group = (struct mali_group *)data; -+ _mali_osk_errcode_t ret; ++ ret = kbase_unmapped_area_topdown(&info, is_shader_code); + -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->gp_core); -+ MALI_DEBUG_ASSERT_POINTER(group->mmu); ++ if (IS_ERR_VALUE(ret) && high_limit == mm->mmap_base && ++ high_limit < (kctx->same_va_end << PAGE_SHIFT)) { ++ /* Retry above mmap_base */ ++ info.low_limit = mm->mmap_base; ++ info.high_limit = min_t(u64, TASK_SIZE, ++ (kctx->same_va_end << PAGE_SHIFT)); + -+#if defined(CONFIG_MALI400_PROFILING) && defined (CONFIG_TRACEPOINTS) -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ mali_executor_lock(); -+ if (!mali_group_is_working(group)) { -+ /* Not working, so nothing to do */ -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; ++ ret = kbase_unmapped_area_topdown(&info, is_shader_code); + } -+#endif -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, -+ 0, 0, /* No pid and tid for interrupt handler */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP(0), -+ mali_gp_get_rawstat(group->gp_core), 0); -+ -+ MALI_DEBUG_PRINT(4, ("Group: Interrupt 0x%08X from %s\n", -+ mali_gp_get_rawstat(group->gp_core), -+ mali_group_core_description(group))); -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ mali_executor_unlock(); -+#endif -+#endif -+ ret = mali_executor_interrupt_gp(group, MALI_TRUE); + -+#if defined(CONFIG_MALI400_PROFILING) && defined (CONFIG_TRACEPOINTS) -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ mali_executor_lock(); -+ if (!mali_group_is_working(group) && (!mali_group_power_is_on(group))) { -+ /* group complete and on job shedule on it, it already power off */ -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, -+ 0, 0, /* No pid and tid for interrupt handler */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP(0), -+ 0xFFFFFFFF, 0); -+ mali_executor_unlock(); -+ return ret; -+ } -+#endif -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, -+ 0, 0, /* No pid and tid for interrupt handler */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP(0), -+ mali_gp_get_rawstat(group->gp_core), 0); -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ mali_executor_unlock(); -+#endif -+#endif + return ret; +} + -+static void mali_group_bottom_half_gp(void *data) -+{ -+ struct mali_group *group = (struct mali_group *)data; -+ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->gp_core); -+ MALI_DEBUG_ASSERT_POINTER(group->mmu); -+ -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, -+ 0, _mali_osk_get_tid(), /* pid and tid */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP(0), -+ mali_gp_get_rawstat(group->gp_core), 0); ++static const struct file_operations kbase_fops = { ++ .owner = THIS_MODULE, ++ .open = kbase_open, ++ .release = kbase_release, ++ .read = kbase_read, ++ .poll = kbase_poll, ++ .unlocked_ioctl = kbase_ioctl, ++ .compat_ioctl = kbase_ioctl, ++ .mmap = kbase_mmap, ++ .check_flags = kbase_check_flags, ++ .get_unmapped_area = kbase_get_unmapped_area, ++}; + -+ mali_executor_interrupt_gp(group, MALI_FALSE); ++#ifndef CONFIG_MALI_NO_MALI ++void kbase_os_reg_write(struct kbase_device *kbdev, u16 offset, u32 value) ++{ ++ writel(value, kbdev->reg + offset); ++} + -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, -+ 0, _mali_osk_get_tid(), /* pid and tid */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP(0), -+ mali_gp_get_rawstat(group->gp_core), 0); ++u32 kbase_os_reg_read(struct kbase_device *kbdev, u16 offset) ++{ ++ return readl(kbdev->reg + offset); +} ++#endif /* !CONFIG_MALI_NO_MALI */ + -+_mali_osk_errcode_t mali_group_upper_half_pp(void *data) ++/** ++ * show_policy - Show callback for the power_policy sysfs file. ++ * ++ * This function is called to get the contents of the power_policy sysfs ++ * file. This is a list of the available policies with the currently active one ++ * surrounded by square brackets. ++ * ++ * @dev: The device this sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The output buffer for the sysfs file contents ++ * ++ * Return: The number of bytes output to @buf. ++ */ ++static ssize_t show_policy(struct device *dev, struct device_attribute *attr, char *const buf) +{ -+ struct mali_group *group = (struct mali_group *)data; -+ _mali_osk_errcode_t ret; ++ struct kbase_device *kbdev; ++ const struct kbase_pm_policy *current_policy; ++ const struct kbase_pm_policy *const *policy_list; ++ int policy_count; ++ int i; ++ ssize_t ret = 0; + -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->pp_core); -+ MALI_DEBUG_ASSERT_POINTER(group->mmu); ++ kbdev = to_kbase_device(dev); + -+#if defined(CONFIG_MALI400_PROFILING) && defined (CONFIG_TRACEPOINTS) -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ mali_executor_lock(); -+ if (!mali_group_is_working(group)) { -+ /* Not working, so nothing to do */ -+ mali_executor_unlock(); -+ return _MALI_OSK_ERR_FAULT; -+ } -+#endif ++ if (!kbdev) ++ return -ENODEV; + -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, -+ 0, 0, /* No pid and tid for interrupt handler */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP( -+ mali_pp_core_get_id(group->pp_core)), -+ mali_pp_get_rawstat(group->pp_core), 0); ++ current_policy = kbase_pm_get_policy(kbdev); + -+ MALI_DEBUG_PRINT(4, ("Group: Interrupt 0x%08X from %s\n", -+ mali_pp_get_rawstat(group->pp_core), -+ mali_group_core_description(group))); -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ mali_executor_unlock(); -+#endif -+#endif ++ policy_count = kbase_pm_list_policies(&policy_list); + -+ ret = mali_executor_interrupt_pp(group, MALI_TRUE); ++ for (i = 0; i < policy_count && ret < PAGE_SIZE; i++) { ++ if (policy_list[i] == current_policy) ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "[%s] ", policy_list[i]->name); ++ else ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s ", policy_list[i]->name); ++ } + -+#if defined(CONFIG_MALI400_PROFILING) && defined (CONFIG_TRACEPOINTS) -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ mali_executor_lock(); -+ if (!mali_group_is_working(group) && (!mali_group_power_is_on(group))) { -+ /* group complete and on job shedule on it, it already power off */ -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, -+ 0, 0, /* No pid and tid for interrupt handler */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP( -+ mali_pp_core_get_id(group->pp_core)), -+ 0xFFFFFFFF, 0); -+ mali_executor_unlock(); -+ return ret; ++ if (ret < PAGE_SIZE - 1) { ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "\n"); ++ } else { ++ buf[PAGE_SIZE - 2] = '\n'; ++ buf[PAGE_SIZE - 1] = '\0'; ++ ret = PAGE_SIZE - 1; + } -+#endif -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF, -+ 0, 0, /* No pid and tid for interrupt handler */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP( -+ mali_pp_core_get_id(group->pp_core)), -+ mali_pp_get_rawstat(group->pp_core), 0); -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ mali_executor_unlock(); -+#endif -+#endif ++ + return ret; +} + -+static void mali_group_bottom_half_pp(void *data) ++/** ++ * set_policy - Store callback for the power_policy sysfs file. ++ * ++ * This function is called when the power_policy sysfs file is written to. ++ * It matches the requested policy against the available policies and if a ++ * matching policy is found calls kbase_pm_set_policy() to change the ++ * policy. ++ * ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t set_policy(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ -+ struct mali_group *group = (struct mali_group *)data; ++ struct kbase_device *kbdev; ++ const struct kbase_pm_policy *new_policy = NULL; ++ const struct kbase_pm_policy *const *policy_list; ++ int policy_count; ++ int i; + -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->pp_core); -+ MALI_DEBUG_ASSERT_POINTER(group->mmu); ++ kbdev = to_kbase_device(dev); + -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_START | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, -+ 0, _mali_osk_get_tid(), /* pid and tid */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP( -+ mali_pp_core_get_id(group->pp_core)), -+ mali_pp_get_rawstat(group->pp_core), 0); ++ if (!kbdev) ++ return -ENODEV; + -+ mali_executor_interrupt_pp(group, MALI_FALSE); ++ policy_count = kbase_pm_list_policies(&policy_list); + -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_STOP | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF, -+ 0, _mali_osk_get_tid(), /* pid and tid */ -+ MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP( -+ mali_pp_core_get_id(group->pp_core)), -+ mali_pp_get_rawstat(group->pp_core), 0); -+} ++ for (i = 0; i < policy_count; i++) { ++ if (sysfs_streq(policy_list[i]->name, buf)) { ++ new_policy = policy_list[i]; ++ break; ++ } ++ } + -+static void mali_group_timeout(void *data) -+{ -+ struct mali_group *group = (struct mali_group *)data; -+ MALI_DEBUG_ASSERT_POINTER(group); ++ if (!new_policy) { ++ dev_err(dev, "power_policy: policy not found\n"); ++ return -EINVAL; ++ } + -+ MALI_DEBUG_PRINT(2, ("Group: timeout handler for %s at %u\n", -+ mali_group_core_description(group), -+ _mali_osk_time_tickcount())); ++ kbase_pm_set_policy(kbdev, new_policy); + -+ if (NULL != group->gp_core) { -+ mali_group_schedule_bottom_half_gp(group); -+ } else { -+ MALI_DEBUG_ASSERT_POINTER(group->pp_core); -+ mali_group_schedule_bottom_half_pp(group); -+ } ++ return count; +} + -+mali_bool mali_group_zap_session(struct mali_group *group, -+ struct mali_session_data *session) ++/* ++ * The sysfs file power_policy. ++ * ++ * This is used for obtaining information about the available policies, ++ * determining which policy is currently active, and changing the active ++ * policy. ++ */ ++static DEVICE_ATTR(power_policy, S_IRUGO | S_IWUSR, show_policy, set_policy); ++ ++/** ++ * show_ca_policy - Show callback for the core_availability_policy sysfs file. ++ * ++ * This function is called to get the contents of the core_availability_policy ++ * sysfs file. This is a list of the available policies with the currently ++ * active one surrounded by square brackets. ++ * ++ * @dev: The device this sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The output buffer for the sysfs file contents ++ * ++ * Return: The number of bytes output to @buf. ++ */ ++static ssize_t show_ca_policy(struct device *dev, struct device_attribute *attr, char * const buf) +{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(session); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ struct kbase_device *kbdev; ++ const struct kbase_pm_ca_policy *current_policy; ++ const struct kbase_pm_ca_policy *const *policy_list; ++ int policy_count; ++ int i; ++ ssize_t ret = 0; + -+ if (group->session != session) { -+ /* not running from this session */ -+ return MALI_TRUE; /* success */ ++ kbdev = to_kbase_device(dev); ++ ++ if (!kbdev) ++ return -ENODEV; ++ ++ current_policy = kbase_pm_ca_get_policy(kbdev); ++ ++ policy_count = kbase_pm_ca_list_policies(&policy_list); ++ ++ for (i = 0; i < policy_count && ret < PAGE_SIZE; i++) { ++ if (policy_list[i] == current_policy) ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "[%s] ", policy_list[i]->name); ++ else ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s ", policy_list[i]->name); + } + -+ if (group->is_working) { -+ /* The Zap also does the stall and disable_stall */ -+ mali_bool zap_success = mali_mmu_zap_tlb(group->mmu); -+ return zap_success; ++ if (ret < PAGE_SIZE - 1) { ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "\n"); + } else { -+ /* Just remove the session instead of zapping */ -+ mali_group_clear_session(group); -+ return MALI_TRUE; /* success */ ++ buf[PAGE_SIZE - 2] = '\n'; ++ buf[PAGE_SIZE - 1] = '\0'; ++ ret = PAGE_SIZE - 1; + } ++ ++ return ret; +} + -+#if defined(CONFIG_MALI400_PROFILING) -+static void mali_group_report_l2_cache_counters_per_core(struct mali_group *group, u32 core_num) ++/** ++ * set_ca_policy - Store callback for the core_availability_policy sysfs file. ++ * ++ * This function is called when the core_availability_policy sysfs file is ++ * written to. It matches the requested policy against the available policies ++ * and if a matching policy is found calls kbase_pm_set_policy() to change ++ * the policy. ++ * ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t set_ca_policy(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ -+ u32 source0 = 0; -+ u32 value0 = 0; -+ u32 source1 = 0; -+ u32 value1 = 0; -+ u32 profiling_channel = 0; ++ struct kbase_device *kbdev; ++ const struct kbase_pm_ca_policy *new_policy = NULL; ++ const struct kbase_pm_ca_policy *const *policy_list; ++ int policy_count; ++ int i; + -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ kbdev = to_kbase_device(dev); + -+ switch (core_num) { -+ case 0: -+ profiling_channel = MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_EVENT_CHANNEL_GPU | -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_L20_COUNTERS; -+ break; -+ case 1: -+ profiling_channel = MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_EVENT_CHANNEL_GPU | -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_L21_COUNTERS; -+ break; -+ case 2: -+ profiling_channel = MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_EVENT_CHANNEL_GPU | -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_L22_COUNTERS; -+ break; -+ default: -+ profiling_channel = MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_EVENT_CHANNEL_GPU | -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_L20_COUNTERS; -+ break; -+ } ++ if (!kbdev) ++ return -ENODEV; + -+ if (0 == core_num) { -+ mali_l2_cache_core_get_counter_values(group->l2_cache_core[0], &source0, &value0, &source1, &value1); -+ } -+ if (1 == core_num) { -+ if (1 == mali_l2_cache_get_id(group->l2_cache_core[0])) { -+ mali_l2_cache_core_get_counter_values(group->l2_cache_core[0], &source0, &value0, &source1, &value1); -+ } else if (1 == mali_l2_cache_get_id(group->l2_cache_core[1])) { -+ mali_l2_cache_core_get_counter_values(group->l2_cache_core[1], &source0, &value0, &source1, &value1); ++ policy_count = kbase_pm_ca_list_policies(&policy_list); ++ ++ for (i = 0; i < policy_count; i++) { ++ if (sysfs_streq(policy_list[i]->name, buf)) { ++ new_policy = policy_list[i]; ++ break; + } + } -+ if (2 == core_num) { -+ if (2 == mali_l2_cache_get_id(group->l2_cache_core[0])) { -+ mali_l2_cache_core_get_counter_values(group->l2_cache_core[0], &source0, &value0, &source1, &value1); -+ } else if (2 == mali_l2_cache_get_id(group->l2_cache_core[1])) { -+ mali_l2_cache_core_get_counter_values(group->l2_cache_core[1], &source0, &value0, &source1, &value1); -+ } ++ ++ if (!new_policy) { ++ dev_err(dev, "core_availability_policy: policy not found\n"); ++ return -EINVAL; + } + -+ _mali_osk_profiling_add_event(profiling_channel, source1 << 8 | source0, value0, value1, 0, 0); ++ kbase_pm_ca_set_policy(kbdev, new_policy); ++ ++ return count; +} -+#endif /* #if defined(CONFIG_MALI400_PROFILING) */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_group.h b/drivers/gpu/arm/mali400/mali/common/mali_group.h -new file mode 100755 -index 000000000000..32481e4a6748 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_group.h -@@ -0,0 +1,460 @@ ++ +/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * The sysfs file core_availability_policy ++ * ++ * This is used for obtaining information about the available policies, ++ * determining which policy is currently active, and changing the active ++ * policy. + */ ++static DEVICE_ATTR(core_availability_policy, S_IRUGO | S_IWUSR, show_ca_policy, set_ca_policy); + -+#ifndef __MALI_GROUP_H__ -+#define __MALI_GROUP_H__ -+ -+#include "mali_osk.h" -+#include "mali_l2_cache.h" -+#include "mali_mmu.h" -+#include "mali_gp.h" -+#include "mali_pp.h" -+#include "mali_session.h" -+#include "mali_osk_profiling.h" -+ -+/** -+ * @brief Default max runtime [ms] for a core job - used by timeout timers ++/* ++ * show_core_mask - Show callback for the core_mask sysfs file. ++ * ++ * This function is called to get the contents of the core_mask sysfs file. ++ * ++ * @dev: The device this sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The output buffer for the sysfs file contents ++ * ++ * Return: The number of bytes output to @buf. + */ -+#define MALI_MAX_JOB_RUNTIME_DEFAULT 5000 ++static ssize_t show_core_mask(struct device *dev, struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *kbdev; ++ ssize_t ret = 0; + -+extern int mali_max_job_runtime; ++ kbdev = to_kbase_device(dev); + -+#define MALI_MAX_NUMBER_OF_GROUPS 10 -+#define MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS 8 ++ if (!kbdev) ++ return -ENODEV; + -+enum mali_group_state { -+ MALI_GROUP_STATE_INACTIVE, -+ MALI_GROUP_STATE_ACTIVATION_PENDING, -+ MALI_GROUP_STATE_ACTIVE, -+}; ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, ++ "Current core mask (JS0) : 0x%llX\n", ++ kbdev->pm.debug_core_mask[0]); ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, ++ "Current core mask (JS1) : 0x%llX\n", ++ kbdev->pm.debug_core_mask[1]); ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, ++ "Current core mask (JS2) : 0x%llX\n", ++ kbdev->pm.debug_core_mask[2]); ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, ++ "Available core mask : 0x%llX\n", ++ kbdev->gpu_props.props.raw_props.shader_present); ++ ++ return ret; ++} + +/** -+ * The structure represents a render group -+ * A render group is defined by all the cores that share the same Mali MMU ++ * set_core_mask - Store callback for the core_mask sysfs file. ++ * ++ * This function is called when the core_mask sysfs file is written to. ++ * ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file ++ * ++ * Return: @count if the function succeeded. An error code on failure. + */ ++static ssize_t set_core_mask(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_device *kbdev; ++ u64 new_core_mask[3]; ++ int items; + -+struct mali_group { -+ struct mali_mmu_core *mmu; -+ struct mali_session_data *session; -+ -+ enum mali_group_state state; -+ mali_bool power_is_on; -+ -+ mali_bool is_working; -+ unsigned long start_time; /* in ticks */ -+ -+ struct mali_gp_core *gp_core; -+ struct mali_gp_job *gp_running_job; ++ kbdev = to_kbase_device(dev); + -+ struct mali_pp_core *pp_core; -+ struct mali_pp_job *pp_running_job; -+ u32 pp_running_sub_job; ++ if (!kbdev) ++ return -ENODEV; + -+ struct mali_pm_domain *pm_domain; ++ items = sscanf(buf, "%llx %llx %llx", ++ &new_core_mask[0], &new_core_mask[1], ++ &new_core_mask[2]); + -+ struct mali_l2_cache_core *l2_cache_core[2]; -+ u32 l2_cache_core_ref_count[2]; ++ if (items == 1) ++ new_core_mask[1] = new_core_mask[2] = new_core_mask[0]; + -+ /* Parent virtual group (if any) */ -+ struct mali_group *parent_group; ++ if (items == 1 || items == 3) { ++ u64 shader_present = ++ kbdev->gpu_props.props.raw_props.shader_present; ++ u64 group0_core_mask = ++ kbdev->gpu_props.props.coherency_info.group[0]. ++ core_mask; + -+ struct mali_dlbu_core *dlbu_core; -+ struct mali_bcast_unit *bcast_core; ++ if ((new_core_mask[0] & shader_present) != new_core_mask[0] || ++ !(new_core_mask[0] & group0_core_mask) || ++ (new_core_mask[1] & shader_present) != ++ new_core_mask[1] || ++ !(new_core_mask[1] & group0_core_mask) || ++ (new_core_mask[2] & shader_present) != ++ new_core_mask[2] || ++ !(new_core_mask[2] & group0_core_mask)) { ++ dev_err(dev, "power_policy: invalid core specification\n"); ++ return -EINVAL; ++ } + -+ /* Used for working groups which needs to be disabled */ -+ mali_bool disable_requested; ++ if (kbdev->pm.debug_core_mask[0] != new_core_mask[0] || ++ kbdev->pm.debug_core_mask[1] != ++ new_core_mask[1] || ++ kbdev->pm.debug_core_mask[2] != ++ new_core_mask[2]) { ++ unsigned long flags; + -+ /* Used by group to link child groups (for virtual group) */ -+ _mali_osk_list_t group_list; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ /* Used by executor module in order to link groups of same state */ -+ _mali_osk_list_t executor_list; ++ kbase_pm_set_debug_core_mask(kbdev, new_core_mask[0], ++ new_core_mask[1], new_core_mask[2]); + -+ /* Used by PM domains to link groups of same domain */ -+ _mali_osk_list_t pm_domain_list; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ } + -+ _mali_osk_wq_work_t *bottom_half_work_mmu; -+ _mali_osk_wq_work_t *bottom_half_work_gp; -+ _mali_osk_wq_work_t *bottom_half_work_pp; ++ return count; ++ } + -+ _mali_osk_timer_t *timeout_timer; -+}; ++ dev_err(kbdev->dev, "Couldn't process set_core_mask write operation.\n" ++ "Use format \n" ++ "or \n"); ++ return -EINVAL; ++} + -+/** @brief Create a new Mali group object ++/* ++ * The sysfs file core_mask. + * -+ * @return A pointer to a new group object ++ * This is used to restrict shader core availability for debugging purposes. ++ * Reading it will show the current core mask and the mask of cores available. ++ * Writing to it will set the current core mask. + */ -+struct mali_group *mali_group_create(struct mali_l2_cache_core *core, -+ struct mali_dlbu_core *dlbu, -+ struct mali_bcast_unit *bcast, -+ u32 domain_index); -+ -+void mali_group_dump_status(struct mali_group *group); ++static DEVICE_ATTR(core_mask, S_IRUGO | S_IWUSR, show_core_mask, set_core_mask); + -+void mali_group_delete(struct mali_group *group); ++/** ++ * set_soft_job_timeout - Store callback for the soft_job_timeout sysfs ++ * file. ++ * ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The value written to the sysfs file. ++ * @count: The number of bytes written to the sysfs file. ++ * ++ * This allows setting the timeout for software jobs. Waiting soft event wait ++ * jobs will be cancelled after this period expires, while soft fence wait jobs ++ * will print debug information if the fence debug feature is enabled. ++ * ++ * This is expressed in milliseconds. ++ * ++ * Return: count if the function succeeded. An error code on failure. ++ */ ++static ssize_t set_soft_job_timeout(struct device *dev, ++ struct device_attribute *attr, ++ const char *buf, size_t count) ++{ ++ struct kbase_device *kbdev; ++ int soft_job_timeout_ms; + -+_mali_osk_errcode_t mali_group_add_mmu_core(struct mali_group *group, -+ struct mali_mmu_core *mmu_core); -+void mali_group_remove_mmu_core(struct mali_group *group); ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+_mali_osk_errcode_t mali_group_add_gp_core(struct mali_group *group, -+ struct mali_gp_core *gp_core); -+void mali_group_remove_gp_core(struct mali_group *group); ++ if ((kstrtoint(buf, 0, &soft_job_timeout_ms) != 0) || ++ (soft_job_timeout_ms <= 0)) ++ return -EINVAL; + -+_mali_osk_errcode_t mali_group_add_pp_core(struct mali_group *group, -+ struct mali_pp_core *pp_core); -+void mali_group_remove_pp_core(struct mali_group *group); ++ atomic_set(&kbdev->js_data.soft_job_timeout_ms, ++ soft_job_timeout_ms); + -+MALI_STATIC_INLINE const char *mali_group_core_description( -+ struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ if (NULL != group->pp_core) { -+ return mali_pp_core_description(group->pp_core); -+ } else { -+ MALI_DEBUG_ASSERT_POINTER(group->gp_core); -+ return mali_gp_core_description(group->gp_core); -+ } ++ return count; +} + -+MALI_STATIC_INLINE mali_bool mali_group_is_virtual(struct mali_group *group) ++/** ++ * show_soft_job_timeout - Show callback for the soft_job_timeout sysfs ++ * file. ++ * ++ * This will return the timeout for the software jobs. ++ * ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer for the sysfs file contents. ++ * ++ * Return: The number of bytes output to buf. ++ */ ++static ssize_t show_soft_job_timeout(struct device *dev, ++ struct device_attribute *attr, ++ char * const buf) +{ -+ MALI_DEBUG_ASSERT_POINTER(group); ++ struct kbase_device *kbdev; + -+#if (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) -+ return (NULL != group->dlbu_core); -+#else -+ return MALI_FALSE; -+#endif ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; ++ ++ return scnprintf(buf, PAGE_SIZE, "%i\n", ++ atomic_read(&kbdev->js_data.soft_job_timeout_ms)); +} + -+/** @brief Check if a group is a part of a virtual group or not -+ */ -+MALI_STATIC_INLINE mali_bool mali_group_is_in_virtual(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++static DEVICE_ATTR(soft_job_timeout, S_IRUGO | S_IWUSR, ++ show_soft_job_timeout, set_soft_job_timeout); + -+#if (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) -+ return (NULL != group->parent_group) ? MALI_TRUE : MALI_FALSE; -+#else -+ return MALI_FALSE; -+#endif ++static u32 timeout_ms_to_ticks(struct kbase_device *kbdev, long timeout_ms, ++ int default_ticks, u32 old_ticks) ++{ ++ if (timeout_ms > 0) { ++ u64 ticks = timeout_ms * 1000000ULL; ++ do_div(ticks, kbdev->js_data.scheduling_period_ns); ++ if (!ticks) ++ return 1; ++ return ticks; ++ } else if (timeout_ms < 0) { ++ return default_ticks; ++ } else { ++ return old_ticks; ++ } +} + -+/** @brief Reset group ++/** ++ * set_js_timeouts - Store callback for the js_timeouts sysfs file. + * -+ * This function will reset the entire group, -+ * including all the cores present in the group. ++ * This function is called to get the contents of the js_timeouts sysfs ++ * file. This file contains five values separated by whitespace. The values ++ * are basically the same as %JS_SOFT_STOP_TICKS, %JS_HARD_STOP_TICKS_SS, ++ * %JS_HARD_STOP_TICKS_DUMPING, %JS_RESET_TICKS_SS, %JS_RESET_TICKS_DUMPING ++ * configuration values (in that order), with the difference that the js_timeout ++ * values are expressed in MILLISECONDS. + * -+ * @param group Pointer to the group to reset ++ * The js_timeouts sysfile file allows the current values in ++ * use by the job scheduler to get override. Note that a value needs to ++ * be other than 0 for it to override the current job scheduler value. ++ * ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file ++ * ++ * Return: @count if the function succeeded. An error code on failure. + */ -+void mali_group_reset(struct mali_group *group); -+ -+MALI_STATIC_INLINE struct mali_session_data *mali_group_get_session( -+ struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ -+ return group->session; -+} -+ -+MALI_STATIC_INLINE void mali_group_clear_session(struct mali_group *group) ++static ssize_t set_js_timeouts(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ struct kbase_device *kbdev; ++ int items; ++ long js_soft_stop_ms; ++ long js_soft_stop_ms_cl; ++ long js_hard_stop_ms_ss; ++ long js_hard_stop_ms_cl; ++ long js_hard_stop_ms_dumping; ++ long js_reset_ms_ss; ++ long js_reset_ms_cl; ++ long js_reset_ms_dumping; + -+ if (NULL != group->session) { -+ mali_mmu_activate_empty_page_directory(group->mmu); -+ group->session = NULL; -+ } -+} ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+enum mali_group_state mali_group_activate(struct mali_group *group); ++ items = sscanf(buf, "%ld %ld %ld %ld %ld %ld %ld %ld", ++ &js_soft_stop_ms, &js_soft_stop_ms_cl, ++ &js_hard_stop_ms_ss, &js_hard_stop_ms_cl, ++ &js_hard_stop_ms_dumping, &js_reset_ms_ss, ++ &js_reset_ms_cl, &js_reset_ms_dumping); + -+/* -+ * Change state from ACTIVATION_PENDING to ACTIVE -+ * For virtual group, all childs need to be ACTIVE first -+ */ -+mali_bool mali_group_set_active(struct mali_group *group); ++ if (items == 8) { ++ struct kbasep_js_device_data *js_data = &kbdev->js_data; ++ unsigned long flags; + -+/* -+ * @return MALI_TRUE means one or more domains can now be powered off, -+ * and caller should call either mali_pm_update_async() or -+ * mali_pm_update_sync() in order to do so. -+ */ -+mali_bool mali_group_deactivate(struct mali_group *group); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+MALI_STATIC_INLINE enum mali_group_state mali_group_get_state(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ return group->state; -+} ++#define UPDATE_TIMEOUT(ticks_name, ms_name, default) do {\ ++ js_data->ticks_name = timeout_ms_to_ticks(kbdev, ms_name, \ ++ default, js_data->ticks_name); \ ++ dev_dbg(kbdev->dev, "Overriding " #ticks_name \ ++ " with %lu ticks (%lu ms)\n", \ ++ (unsigned long)js_data->ticks_name, \ ++ ms_name); \ ++ } while (0) + -+MALI_STATIC_INLINE mali_bool mali_group_power_is_on(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ return group->power_is_on; -+} ++ UPDATE_TIMEOUT(soft_stop_ticks, js_soft_stop_ms, ++ DEFAULT_JS_SOFT_STOP_TICKS); ++ UPDATE_TIMEOUT(soft_stop_ticks_cl, js_soft_stop_ms_cl, ++ DEFAULT_JS_SOFT_STOP_TICKS_CL); ++ UPDATE_TIMEOUT(hard_stop_ticks_ss, js_hard_stop_ms_ss, ++ kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8408) ? ++ DEFAULT_JS_HARD_STOP_TICKS_SS_8408 : ++ DEFAULT_JS_HARD_STOP_TICKS_SS); ++ UPDATE_TIMEOUT(hard_stop_ticks_cl, js_hard_stop_ms_cl, ++ DEFAULT_JS_HARD_STOP_TICKS_CL); ++ UPDATE_TIMEOUT(hard_stop_ticks_dumping, ++ js_hard_stop_ms_dumping, ++ DEFAULT_JS_HARD_STOP_TICKS_DUMPING); ++ UPDATE_TIMEOUT(gpu_reset_ticks_ss, js_reset_ms_ss, ++ kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8408) ? ++ DEFAULT_JS_RESET_TICKS_SS_8408 : ++ DEFAULT_JS_RESET_TICKS_SS); ++ UPDATE_TIMEOUT(gpu_reset_ticks_cl, js_reset_ms_cl, ++ DEFAULT_JS_RESET_TICKS_CL); ++ UPDATE_TIMEOUT(gpu_reset_ticks_dumping, js_reset_ms_dumping, ++ DEFAULT_JS_RESET_TICKS_DUMPING); + -+void mali_group_power_up(struct mali_group *group); -+void mali_group_power_down(struct mali_group *group); ++ kbase_js_set_timeouts(kbdev); + -+MALI_STATIC_INLINE void mali_group_set_disable_request( -+ struct mali_group *group, mali_bool disable) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ group->disable_requested = disable; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ /** -+ * When one of child group's disable_requeset is set TRUE, then -+ * the disable_request of parent group should also be set to TRUE. -+ * While, the disable_request of parent group should only be set to FALSE -+ * only when all of its child group's disable_request are set to FALSE. -+ */ -+ if (NULL != group->parent_group && MALI_TRUE == disable) { -+ group->parent_group->disable_requested = disable; ++ return count; + } ++ ++ dev_err(kbdev->dev, "Couldn't process js_timeouts write operation.\n" ++ "Use format \n" ++ "Write 0 for no change, -1 to restore default timeout\n"); ++ return -EINVAL; +} + -+MALI_STATIC_INLINE mali_bool mali_group_disable_requested( -+ struct mali_group *group) ++static unsigned long get_js_timeout_in_ms( ++ u32 scheduling_period_ns, ++ u32 ticks) +{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ return group->disable_requested; -+} ++ u64 ms = (u64)ticks * scheduling_period_ns; + -+/** @brief Virtual groups */ -+void mali_group_add_group(struct mali_group *parent, struct mali_group *child); -+struct mali_group *mali_group_acquire_group(struct mali_group *parent); -+void mali_group_remove_group(struct mali_group *parent, struct mali_group *child); ++ do_div(ms, 1000000UL); ++ return ms; ++} + -+/** @brief Checks if the group is working. ++/** ++ * show_js_timeouts - Show callback for the js_timeouts sysfs file. ++ * ++ * This function is called to get the contents of the js_timeouts sysfs ++ * file. It returns the last set values written to the js_timeouts sysfs file. ++ * If the file didn't get written yet, the values will be current setting in ++ * use. ++ * @dev: The device this sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The output buffer for the sysfs file contents ++ * ++ * Return: The number of bytes output to @buf. + */ -+MALI_STATIC_INLINE mali_bool mali_group_is_working(struct mali_group *group) ++static ssize_t show_js_timeouts(struct device *dev, struct device_attribute *attr, char * const buf) +{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ if (mali_group_is_in_virtual(group)) { -+ struct mali_group *tmp_group = mali_executor_get_virtual_group(); -+ return tmp_group->is_working; ++ struct kbase_device *kbdev; ++ ssize_t ret; ++ unsigned long js_soft_stop_ms; ++ unsigned long js_soft_stop_ms_cl; ++ unsigned long js_hard_stop_ms_ss; ++ unsigned long js_hard_stop_ms_cl; ++ unsigned long js_hard_stop_ms_dumping; ++ unsigned long js_reset_ms_ss; ++ unsigned long js_reset_ms_cl; ++ unsigned long js_reset_ms_dumping; ++ u32 scheduling_period_ns; ++ ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; ++ ++ scheduling_period_ns = kbdev->js_data.scheduling_period_ns; ++ ++#define GET_TIMEOUT(name) get_js_timeout_in_ms(\ ++ scheduling_period_ns, \ ++ kbdev->js_data.name) ++ ++ js_soft_stop_ms = GET_TIMEOUT(soft_stop_ticks); ++ js_soft_stop_ms_cl = GET_TIMEOUT(soft_stop_ticks_cl); ++ js_hard_stop_ms_ss = GET_TIMEOUT(hard_stop_ticks_ss); ++ js_hard_stop_ms_cl = GET_TIMEOUT(hard_stop_ticks_cl); ++ js_hard_stop_ms_dumping = GET_TIMEOUT(hard_stop_ticks_dumping); ++ js_reset_ms_ss = GET_TIMEOUT(gpu_reset_ticks_ss); ++ js_reset_ms_cl = GET_TIMEOUT(gpu_reset_ticks_cl); ++ js_reset_ms_dumping = GET_TIMEOUT(gpu_reset_ticks_dumping); ++ ++#undef GET_TIMEOUT ++ ++ ret = scnprintf(buf, PAGE_SIZE, "%lu %lu %lu %lu %lu %lu %lu %lu\n", ++ js_soft_stop_ms, js_soft_stop_ms_cl, ++ js_hard_stop_ms_ss, js_hard_stop_ms_cl, ++ js_hard_stop_ms_dumping, js_reset_ms_ss, ++ js_reset_ms_cl, js_reset_ms_dumping); ++ ++ if (ret >= PAGE_SIZE) { ++ buf[PAGE_SIZE - 2] = '\n'; ++ buf[PAGE_SIZE - 1] = '\0'; ++ ret = PAGE_SIZE - 1; + } -+ return group->is_working; -+} + -+MALI_STATIC_INLINE struct mali_gp_job *mali_group_get_running_gp_job(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ return group->gp_running_job; ++ return ret; +} + -+/** @brief Zap MMU TLB on all groups ++/* ++ * The sysfs file js_timeouts. + * -+ * Zap TLB on group if \a session is active. ++ * This is used to override the current job scheduler values for ++ * JS_STOP_STOP_TICKS_SS ++ * JS_STOP_STOP_TICKS_CL ++ * JS_HARD_STOP_TICKS_SS ++ * JS_HARD_STOP_TICKS_CL ++ * JS_HARD_STOP_TICKS_DUMPING ++ * JS_RESET_TICKS_SS ++ * JS_RESET_TICKS_CL ++ * JS_RESET_TICKS_DUMPING. + */ -+mali_bool mali_group_zap_session(struct mali_group *group, -+ struct mali_session_data *session); ++static DEVICE_ATTR(js_timeouts, S_IRUGO | S_IWUSR, show_js_timeouts, set_js_timeouts); + -+/** @brief Get pointer to GP core object -+ */ -+MALI_STATIC_INLINE struct mali_gp_core *mali_group_get_gp_core(struct mali_group *group) ++static u32 get_new_js_timeout( ++ u32 old_period, ++ u32 old_ticks, ++ u32 new_scheduling_period_ns) +{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ return group->gp_core; ++ u64 ticks = (u64)old_period * (u64)old_ticks; ++ do_div(ticks, new_scheduling_period_ns); ++ return ticks?ticks:1; +} + -+/** @brief Get pointer to PP core object ++/** ++ * set_js_scheduling_period - Store callback for the js_scheduling_period sysfs ++ * file ++ * @dev: The device the sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file ++ * ++ * This function is called when the js_scheduling_period sysfs file is written ++ * to. It checks the data written, and if valid updates the js_scheduling_period ++ * value ++ * ++ * Return: @count if the function succeeded. An error code on failure. + */ -+MALI_STATIC_INLINE struct mali_pp_core *mali_group_get_pp_core(struct mali_group *group) ++static ssize_t set_js_scheduling_period(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) +{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ return group->pp_core; -+} ++ struct kbase_device *kbdev; ++ int ret; ++ unsigned int js_scheduling_period; ++ u32 new_scheduling_period_ns; ++ u32 old_period; ++ struct kbasep_js_device_data *js_data; ++ unsigned long flags; + -+/** @brief Start GP job -+ */ -+void mali_group_start_gp_job(struct mali_group *group, struct mali_gp_job *job, mali_bool gpu_secure_mode_pre_enabled); ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+void mali_group_start_pp_job(struct mali_group *group, struct mali_pp_job *job, u32 sub_job, mali_bool gpu_secure_mode_pre_enabled); ++ js_data = &kbdev->js_data; + -+/** @brief Start virtual group Job on a virtual group -+*/ -+void mali_group_start_job_on_virtual(struct mali_group *group, struct mali_pp_job *job, u32 first_subjob, u32 last_subjob); ++ ret = kstrtouint(buf, 0, &js_scheduling_period); ++ if (ret || !js_scheduling_period) { ++ dev_err(kbdev->dev, "Couldn't process js_scheduling_period write operation.\n" ++ "Use format \n"); ++ return -EINVAL; ++ } + ++ new_scheduling_period_ns = js_scheduling_period * 1000000; + -+/** @brief Start a subjob from a particular on a specific PP group -+*/ -+void mali_group_start_job_on_group(struct mali_group *group, struct mali_pp_job *job, u32 subjob); ++ /* Update scheduling timeouts */ ++ mutex_lock(&js_data->runpool_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + ++ /* If no contexts have been scheduled since js_timeouts was last written ++ * to, the new timeouts might not have been latched yet. So check if an ++ * update is pending and use the new values if necessary. */ + -+/** @brief remove all the unused groups in tmp_unused group list, so that the group is in consistent status. -+ */ -+void mali_group_non_dlbu_job_done_virtual(struct mali_group *group); ++ /* Use previous 'new' scheduling period as a base if present. */ ++ old_period = js_data->scheduling_period_ns; + ++#define SET_TIMEOUT(name) \ ++ (js_data->name = get_new_js_timeout(\ ++ old_period, \ ++ kbdev->js_data.name, \ ++ new_scheduling_period_ns)) + -+/** @brief Resume GP job that suspended waiting for more heap memory -+ */ -+void mali_group_resume_gp_with_new_heap(struct mali_group *group, u32 job_id, u32 start_addr, u32 end_addr); ++ SET_TIMEOUT(soft_stop_ticks); ++ SET_TIMEOUT(soft_stop_ticks_cl); ++ SET_TIMEOUT(hard_stop_ticks_ss); ++ SET_TIMEOUT(hard_stop_ticks_cl); ++ SET_TIMEOUT(hard_stop_ticks_dumping); ++ SET_TIMEOUT(gpu_reset_ticks_ss); ++ SET_TIMEOUT(gpu_reset_ticks_cl); ++ SET_TIMEOUT(gpu_reset_ticks_dumping); + -+MALI_STATIC_INLINE enum mali_interrupt_result mali_group_get_interrupt_result_gp(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->gp_core); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ return mali_gp_get_interrupt_result(group->gp_core); -+} ++#undef SET_TIMEOUT + -+MALI_STATIC_INLINE enum mali_interrupt_result mali_group_get_interrupt_result_pp(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->pp_core); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ return mali_pp_get_interrupt_result(group->pp_core); -+} ++ js_data->scheduling_period_ns = new_scheduling_period_ns; + -+MALI_STATIC_INLINE enum mali_interrupt_result mali_group_get_interrupt_result_mmu(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->mmu); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ return mali_mmu_get_interrupt_result(group->mmu); -+} ++ kbase_js_set_timeouts(kbdev); + -+MALI_STATIC_INLINE mali_bool mali_group_gp_is_active(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->gp_core); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ return mali_gp_is_active(group->gp_core); -+} ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&js_data->runpool_mutex); + -+MALI_STATIC_INLINE mali_bool mali_group_pp_is_active(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->pp_core); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ return mali_pp_is_active(group->pp_core); ++ dev_dbg(kbdev->dev, "JS scheduling period: %dms\n", ++ js_scheduling_period); ++ ++ return count; +} + -+MALI_STATIC_INLINE mali_bool mali_group_has_timed_out(struct mali_group *group) ++/** ++ * show_js_scheduling_period - Show callback for the js_scheduling_period sysfs ++ * entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the GPU information. ++ * ++ * This function is called to get the current period used for the JS scheduling ++ * period. ++ * ++ * Return: The number of bytes output to @buf. ++ */ ++static ssize_t show_js_scheduling_period(struct device *dev, ++ struct device_attribute *attr, char * const buf) +{ -+ unsigned long time_cost; -+ struct mali_group *tmp_group = group; ++ struct kbase_device *kbdev; ++ u32 period; ++ ssize_t ret; + -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ /* if the group is in virtual need to use virtual_group's start time */ -+ if (mali_group_is_in_virtual(group)) { -+ tmp_group = mali_executor_get_virtual_group(); -+ } ++ period = kbdev->js_data.scheduling_period_ns; + -+ time_cost = _mali_osk_time_tickcount() - tmp_group->start_time; -+ if (_mali_osk_time_mstoticks(mali_max_job_runtime) <= time_cost) { -+ /* -+ * current tick is at or after timeout end time, -+ * so this is a valid timeout -+ */ -+ return MALI_TRUE; -+ } else { -+ /* -+ * Not a valid timeout. A HW interrupt probably beat -+ * us to it, and the timer wasn't properly deleted -+ * (async deletion used due to atomic context). -+ */ -+ return MALI_FALSE; -+ } -+} ++ ret = scnprintf(buf, PAGE_SIZE, "%d\n", ++ period / 1000000); + -+MALI_STATIC_INLINE void mali_group_mask_all_interrupts_gp(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->gp_core); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ return mali_gp_mask_all_interrupts(group->gp_core); ++ return ret; +} + -+MALI_STATIC_INLINE void mali_group_mask_all_interrupts_pp(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->pp_core); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ return mali_pp_mask_all_interrupts(group->pp_core); -+} ++static DEVICE_ATTR(js_scheduling_period, S_IRUGO | S_IWUSR, ++ show_js_scheduling_period, set_js_scheduling_period); + -+MALI_STATIC_INLINE void mali_group_enable_interrupts_gp( -+ struct mali_group *group, -+ enum mali_interrupt_result exceptions) ++#if !MALI_CUSTOMER_RELEASE ++/** ++ * set_force_replay - Store callback for the force_replay sysfs file. ++ * ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t set_force_replay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->gp_core); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ mali_gp_enable_interrupts(group->gp_core, exceptions); -+} ++ struct kbase_device *kbdev; + -+MALI_STATIC_INLINE void mali_group_schedule_bottom_half_gp(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->gp_core); -+ _mali_osk_wq_schedule_work(group->bottom_half_work_gp); -+} ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + ++ if (!strncmp("limit=", buf, MIN(6, count))) { ++ int force_replay_limit; ++ int items = sscanf(buf, "limit=%u", &force_replay_limit); + -+MALI_STATIC_INLINE void mali_group_schedule_bottom_half_pp(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->pp_core); -+ _mali_osk_wq_schedule_work(group->bottom_half_work_pp); -+} ++ if (items == 1) { ++ kbdev->force_replay_random = false; ++ kbdev->force_replay_limit = force_replay_limit; ++ kbdev->force_replay_count = 0; + -+MALI_STATIC_INLINE void mali_group_schedule_bottom_half_mmu(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT_POINTER(group->mmu); -+ _mali_osk_wq_schedule_work(group->bottom_half_work_mmu); -+} ++ return count; ++ } ++ } else if (!strncmp("random_limit", buf, MIN(12, count))) { ++ kbdev->force_replay_random = true; ++ kbdev->force_replay_count = 0; + -+struct mali_pp_job *mali_group_complete_pp(struct mali_group *group, mali_bool success, u32 *sub_job); ++ return count; ++ } else if (!strncmp("norandom_limit", buf, MIN(14, count))) { ++ kbdev->force_replay_random = false; ++ kbdev->force_replay_limit = KBASEP_FORCE_REPLAY_DISABLED; ++ kbdev->force_replay_count = 0; + -+struct mali_gp_job *mali_group_complete_gp(struct mali_group *group, mali_bool success); ++ return count; ++ } else if (!strncmp("core_req=", buf, MIN(9, count))) { ++ unsigned int core_req; ++ int items = sscanf(buf, "core_req=%x", &core_req); + -+#if defined(CONFIG_MALI400_PROFILING) -+MALI_STATIC_INLINE void mali_group_oom(struct mali_group *group) -+{ -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SUSPEND | -+ MALI_PROFILING_MAKE_EVENT_CHANNEL_GP(0), -+ 0, 0, 0, 0, 0); ++ if (items == 1) { ++ kbdev->force_replay_core_req = (base_jd_core_req)core_req; ++ ++ return count; ++ } ++ } ++ dev_err(kbdev->dev, "Couldn't process force_replay write operation.\nPossible settings: limit=, random_limit, norandom_limit, core_req=\n"); ++ return -EINVAL; +} -+#endif + -+struct mali_group *mali_group_get_glob_group(u32 index); -+u32 mali_group_get_glob_num_groups(void); ++/** ++ * show_force_replay - Show callback for the force_replay sysfs file. ++ * ++ * This function is called to get the contents of the force_replay sysfs ++ * file. It returns the last set value written to the force_replay sysfs file. ++ * If the file didn't get written yet, the values will be 0. ++ * ++ * @dev: The device this sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The output buffer for the sysfs file contents ++ * ++ * Return: The number of bytes output to @buf. ++ */ ++static ssize_t show_force_replay(struct device *dev, ++ struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *kbdev; ++ ssize_t ret; + -+u32 mali_group_dump_state(struct mali_group *group, char *buf, u32 size); ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + ++ if (kbdev->force_replay_random) ++ ret = scnprintf(buf, PAGE_SIZE, ++ "limit=0\nrandom_limit\ncore_req=%x\n", ++ kbdev->force_replay_core_req); ++ else ++ ret = scnprintf(buf, PAGE_SIZE, ++ "limit=%u\nnorandom_limit\ncore_req=%x\n", ++ kbdev->force_replay_limit, ++ kbdev->force_replay_core_req); + -+_mali_osk_errcode_t mali_group_upper_half_mmu(void *data); -+_mali_osk_errcode_t mali_group_upper_half_gp(void *data); -+_mali_osk_errcode_t mali_group_upper_half_pp(void *data); ++ if (ret >= PAGE_SIZE) { ++ buf[PAGE_SIZE - 2] = '\n'; ++ buf[PAGE_SIZE - 1] = '\0'; ++ ret = PAGE_SIZE - 1; ++ } + -+MALI_STATIC_INLINE mali_bool mali_group_is_empty(struct mali_group *group) -+{ -+ MALI_DEBUG_ASSERT_POINTER(group); -+ MALI_DEBUG_ASSERT(mali_group_is_virtual(group)); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ return _mali_osk_list_empty(&group->group_list); ++ return ret; +} + -+#endif /* __MALI_GROUP_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c -new file mode 100755 -index 000000000000..a813816e998d ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c -@@ -0,0 +1,47 @@ +/* -+ * Copyright (C) 2011-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * The sysfs file force_replay. + */ ++static DEVICE_ATTR(force_replay, S_IRUGO | S_IWUSR, show_force_replay, ++ set_force_replay); ++#endif /* !MALI_CUSTOMER_RELEASE */ + -+#include "mali_hw_core.h" -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_osk_mali.h" -+ -+_mali_osk_errcode_t mali_hw_core_create(struct mali_hw_core *core, const _mali_osk_resource_t *resource, u32 reg_size) ++#ifdef CONFIG_MALI_DEBUG ++static ssize_t set_js_softstop_always(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) +{ -+ core->phys_addr = resource->base; -+ core->phys_offset = resource->base - _mali_osk_resource_base_address(); -+ core->description = resource->description; -+ core->size = reg_size; ++ struct kbase_device *kbdev; ++ int ret; ++ int softstop_always; + -+ MALI_DEBUG_ASSERT(core->phys_offset < core->phys_addr); ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ if (_MALI_OSK_ERR_OK == _mali_osk_mem_reqregion(core->phys_addr, core->size, core->description)) { -+ core->mapped_registers = _mali_osk_mem_mapioregion(core->phys_addr, core->size, core->description); -+ if (NULL != core->mapped_registers) { -+ return _MALI_OSK_ERR_OK; -+ } else { -+ MALI_PRINT_ERROR(("Failed to map memory region for core %s at phys_addr 0x%08X\n", core->description, core->phys_addr)); -+ } -+ _mali_osk_mem_unreqregion(core->phys_addr, core->size); -+ } else { -+ MALI_PRINT_ERROR(("Failed to request memory region for core %s at phys_addr 0x%08X\n", core->description, core->phys_addr)); ++ ret = kstrtoint(buf, 0, &softstop_always); ++ if (ret || ((softstop_always != 0) && (softstop_always != 1))) { ++ dev_err(kbdev->dev, "Couldn't process js_softstop_always write operation.\n" ++ "Use format \n"); ++ return -EINVAL; + } + -+ return _MALI_OSK_ERR_FAULT; ++ kbdev->js_data.softstop_always = (bool) softstop_always; ++ dev_dbg(kbdev->dev, "Support for softstop on a single context: %s\n", ++ (kbdev->js_data.softstop_always) ? ++ "Enabled" : "Disabled"); ++ return count; +} + -+void mali_hw_core_delete(struct mali_hw_core *core) ++static ssize_t show_js_softstop_always(struct device *dev, ++ struct device_attribute *attr, char * const buf) +{ -+ if (NULL != core->mapped_registers) { -+ _mali_osk_mem_unmapioregion(core->phys_addr, core->size, core->mapped_registers); -+ core->mapped_registers = NULL; ++ struct kbase_device *kbdev; ++ ssize_t ret; ++ ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; ++ ++ ret = scnprintf(buf, PAGE_SIZE, "%d\n", kbdev->js_data.softstop_always); ++ ++ if (ret >= PAGE_SIZE) { ++ buf[PAGE_SIZE - 2] = '\n'; ++ buf[PAGE_SIZE - 1] = '\0'; ++ ret = PAGE_SIZE - 1; + } -+ _mali_osk_mem_unreqregion(core->phys_addr, core->size); ++ ++ return ret; +} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h -new file mode 100755 -index 000000000000..38d96e240a20 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h -@@ -0,0 +1,111 @@ ++ +/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * By default, soft-stops are disabled when only a single context is present. ++ * The ability to enable soft-stop when only a single context is present can be ++ * used for debug and unit-testing purposes. ++ * (see CL t6xx_stress_1 unit-test as an example whereby this feature is used.) + */ ++static DEVICE_ATTR(js_softstop_always, S_IRUGO | S_IWUSR, show_js_softstop_always, set_js_softstop_always); ++#endif /* CONFIG_MALI_DEBUG */ + -+#ifndef __MALI_HW_CORE_H__ -+#define __MALI_HW_CORE_H__ ++#ifdef CONFIG_MALI_DEBUG ++typedef void (kbasep_debug_command_func) (struct kbase_device *); + -+#include "mali_osk.h" -+#include "mali_kernel_common.h" ++enum kbasep_debug_command_code { ++ KBASEP_DEBUG_COMMAND_DUMPTRACE, + -+/** -+ * The common parts for all Mali HW cores (GP, PP, MMU, L2 and PMU) -+ * This struct is embedded inside all core specific structs. -+ */ -+struct mali_hw_core { -+ uintptr_t phys_addr; /**< Physical address of the registers */ -+ u32 phys_offset; /**< Offset from start of Mali to registers */ -+ u32 size; /**< Size of registers */ -+ mali_io_address mapped_registers; /**< Virtual mapping of the registers */ -+ const char *description; /**< Name of unit (as specified in device configuration) */ ++ /* This must be the last enum */ ++ KBASEP_DEBUG_COMMAND_COUNT +}; + -+#define MALI_REG_POLL_COUNT_FAST 1000000 -+#define MALI_REG_POLL_COUNT_SLOW 1000000 -+ -+/* -+ * GP and PP core translate their int_stat/rawstat into one of these -+ */ -+enum mali_interrupt_result { -+ MALI_INTERRUPT_RESULT_NONE, -+ MALI_INTERRUPT_RESULT_SUCCESS, -+ MALI_INTERRUPT_RESULT_SUCCESS_VS, -+ MALI_INTERRUPT_RESULT_SUCCESS_PLBU, -+ MALI_INTERRUPT_RESULT_OOM, -+ MALI_INTERRUPT_RESULT_ERROR ++struct kbasep_debug_command { ++ char *str; ++ kbasep_debug_command_func *func; +}; + -+_mali_osk_errcode_t mali_hw_core_create(struct mali_hw_core *core, const _mali_osk_resource_t *resource, u32 reg_size); -+void mali_hw_core_delete(struct mali_hw_core *core); ++/* Debug commands supported by the driver */ ++static const struct kbasep_debug_command debug_commands[] = { ++ { ++ .str = "dumptrace", ++ .func = &kbasep_trace_dump, ++ } ++}; + -+MALI_STATIC_INLINE u32 mali_hw_core_register_read(struct mali_hw_core *core, u32 relative_address) ++/** ++ * show_debug - Show callback for the debug_command sysfs file. ++ * ++ * This function is called to get the contents of the debug_command sysfs ++ * file. This is a list of the available debug commands, separated by newlines. ++ * ++ * @dev: The device this sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The output buffer for the sysfs file contents ++ * ++ * Return: The number of bytes output to @buf. ++ */ ++static ssize_t show_debug(struct device *dev, struct device_attribute *attr, char * const buf) +{ -+ u32 read_val; -+ read_val = _mali_osk_mem_ioread32(core->mapped_registers, relative_address); -+ MALI_DEBUG_PRINT(6, ("register_read for core %s, relative addr=0x%04X, val=0x%08X\n", -+ core->description, relative_address, read_val)); -+ return read_val; -+} ++ struct kbase_device *kbdev; ++ int i; ++ ssize_t ret = 0; + -+MALI_STATIC_INLINE void mali_hw_core_register_write_relaxed(struct mali_hw_core *core, u32 relative_address, u32 new_val) -+{ -+ MALI_DEBUG_PRINT(6, ("register_write_relaxed for core %s, relative addr=0x%04X, val=0x%08X\n", -+ core->description, relative_address, new_val)); -+ _mali_osk_mem_iowrite32_relaxed(core->mapped_registers, relative_address, new_val); -+} ++ kbdev = to_kbase_device(dev); + -+/* Conditionally write a register. -+ * The register will only be written if the new value is different from the old_value. -+ * If the new value is different, the old value will also be updated */ -+MALI_STATIC_INLINE void mali_hw_core_register_write_relaxed_conditional(struct mali_hw_core *core, u32 relative_address, u32 new_val, const u32 old_val) -+{ -+ MALI_DEBUG_PRINT(6, ("register_write_relaxed for core %s, relative addr=0x%04X, val=0x%08X\n", -+ core->description, relative_address, new_val)); -+ if (old_val != new_val) { -+ _mali_osk_mem_iowrite32_relaxed(core->mapped_registers, relative_address, new_val); ++ if (!kbdev) ++ return -ENODEV; ++ ++ for (i = 0; i < KBASEP_DEBUG_COMMAND_COUNT && ret < PAGE_SIZE; i++) ++ ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s\n", debug_commands[i].str); ++ ++ if (ret >= PAGE_SIZE) { ++ buf[PAGE_SIZE - 2] = '\n'; ++ buf[PAGE_SIZE - 1] = '\0'; ++ ret = PAGE_SIZE - 1; + } -+} + -+MALI_STATIC_INLINE void mali_hw_core_register_write(struct mali_hw_core *core, u32 relative_address, u32 new_val) -+{ -+ MALI_DEBUG_PRINT(6, ("register_write for core %s, relative addr=0x%04X, val=0x%08X\n", -+ core->description, relative_address, new_val)); -+ _mali_osk_mem_iowrite32(core->mapped_registers, relative_address, new_val); ++ return ret; +} + -+MALI_STATIC_INLINE void mali_hw_core_register_write_array_relaxed(struct mali_hw_core *core, u32 relative_address, u32 *write_array, u32 nr_of_regs) ++/** ++ * issue_debug - Store callback for the debug_command sysfs file. ++ * ++ * This function is called when the debug_command sysfs file is written to. ++ * It matches the requested command against the available commands, and if ++ * a matching command is found calls the associated function from ++ * @debug_commands to issue the command. ++ * ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t issue_debug(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ -+ u32 i; -+ MALI_DEBUG_PRINT(6, ("register_write_array: for core %s, relative addr=0x%04X, nr of regs=%u\n", -+ core->description, relative_address, nr_of_regs)); ++ struct kbase_device *kbdev; ++ int i; + -+ /* Do not use burst writes against the registers */ -+ for (i = 0; i < nr_of_regs; i++) { -+ mali_hw_core_register_write_relaxed(core, relative_address + i * 4, write_array[i]); -+ } -+} ++ kbdev = to_kbase_device(dev); + -+/* Conditionally write a set of registers. -+ * The register will only be written if the new value is different from the old_value. -+ * If the new value is different, the old value will also be updated */ -+MALI_STATIC_INLINE void mali_hw_core_register_write_array_relaxed_conditional(struct mali_hw_core *core, u32 relative_address, u32 *write_array, u32 nr_of_regs, const u32 *old_array) -+{ -+ u32 i; -+ MALI_DEBUG_PRINT(6, ("register_write_array: for core %s, relative addr=0x%04X, nr of regs=%u\n", -+ core->description, relative_address, nr_of_regs)); ++ if (!kbdev) ++ return -ENODEV; + -+ /* Do not use burst writes against the registers */ -+ for (i = 0; i < nr_of_regs; i++) { -+ if (old_array[i] != write_array[i]) { -+ mali_hw_core_register_write_relaxed(core, relative_address + i * 4, write_array[i]); ++ for (i = 0; i < KBASEP_DEBUG_COMMAND_COUNT; i++) { ++ if (sysfs_streq(debug_commands[i].str, buf)) { ++ debug_commands[i].func(kbdev); ++ return count; + } + } ++ ++ /* Debug Command not found */ ++ dev_err(dev, "debug_command: command not known\n"); ++ return -EINVAL; +} + -+#endif /* __MALI_HW_CORE_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h -new file mode 100755 -index 000000000000..6a8f0f0116a4 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h -@@ -0,0 +1,181 @@ -+/* -+ * Copyright (C) 2010, 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/* The sysfs file debug_command. ++ * ++ * This is used to issue general debug commands to the device driver. ++ * Reading it will produce a list of debug commands, separated by newlines. ++ * Writing to it with one of those commands will issue said command. + */ ++static DEVICE_ATTR(debug_command, S_IRUGO | S_IWUSR, show_debug, issue_debug); ++#endif /* CONFIG_MALI_DEBUG */ + -+#ifndef __MALI_KERNEL_COMMON_H__ -+#define __MALI_KERNEL_COMMON_H__ -+ -+#include "mali_osk.h" -+ -+/* Make sure debug is defined when it should be */ -+#ifndef DEBUG -+#if defined(_DEBUG) -+#define DEBUG -+#endif -+#endif -+ -+/* The file include several useful macros for error checking, debugging and printing. -+ * - MALI_PRINTF(...) Do not use this function: Will be included in Release builds. -+ * - MALI_DEBUG_PRINT(nr, (X) ) Prints the second argument if nr<=MALI_DEBUG_LEVEL. -+ * - MALI_DEBUG_ERROR( (X) ) Prints an errortext, a source trace, and the given error message. -+ * - MALI_DEBUG_ASSERT(exp,(X)) If the asserted expr is false, the program will exit. -+ * - MALI_DEBUG_ASSERT_POINTER(pointer) Triggers if the pointer is a zero pointer. -+ * - MALI_DEBUG_CODE( X ) The code inside the macro is only compiled in Debug builds. ++/** ++ * kbase_show_gpuinfo - Show callback for the gpuinfo sysfs entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the GPU information. + * -+ * The (X) means that you must add an extra parenthesis around the argumentlist. ++ * This function is called to get a description of the present Mali ++ * GPU via the gpuinfo sysfs entry. This includes the GPU family, the ++ * number of cores, the hardware version and the raw product id. For ++ * example + * -+ * The printf function: MALI_PRINTF(...) is routed to _mali_osk_debugmsg ++ * Mali-T60x MP4 r0p0 0x6956 + * -+ * Suggested range for the DEBUG-LEVEL is [1:6] where -+ * [1:2] Is messages with highest priority, indicate possible errors. -+ * [3:4] Is messages with medium priority, output important variables. -+ * [5:6] Is messages with low priority, used during extensive debugging. ++ * Return: The number of bytes output to @buf. + */ ++static ssize_t kbase_show_gpuinfo(struct device *dev, ++ struct device_attribute *attr, char *buf) ++{ ++ static const struct gpu_product_id_name { ++ unsigned id; ++ char *name; ++ } gpu_product_id_names[] = { ++ { .id = GPU_ID_PI_T60X, .name = "Mali-T60x" }, ++ { .id = GPU_ID_PI_T62X, .name = "Mali-T62x" }, ++ { .id = GPU_ID_PI_T72X, .name = "Mali-T72x" }, ++ { .id = GPU_ID_PI_T76X, .name = "Mali-T76x" }, ++ { .id = GPU_ID_PI_T82X, .name = "Mali-T82x" }, ++ { .id = GPU_ID_PI_T83X, .name = "Mali-T83x" }, ++ { .id = GPU_ID_PI_T86X, .name = "Mali-T86x" }, ++ { .id = GPU_ID_PI_TFRX, .name = "Mali-T88x" }, ++ { .id = GPU_ID2_PRODUCT_TMIX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G71" }, ++ { .id = GPU_ID2_PRODUCT_THEX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-THEx" }, ++ { .id = GPU_ID2_PRODUCT_TSIX >> GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ .name = "Mali-G51" }, ++ }; ++ const char *product_name = "(Unknown Mali GPU)"; ++ struct kbase_device *kbdev; ++ u32 gpu_id; ++ unsigned product_id, product_id_mask; ++ unsigned i; ++ bool is_new_format; + -+/** -+* Fundamental error macro. Reports an error code. This is abstracted to allow us to -+* easily switch to a different error reporting method if we want, and also to allow -+* us to search for error returns easily. -+* -+* Note no closing semicolon - this is supplied in typical usage: -+* -+* MALI_ERROR(MALI_ERROR_OUT_OF_MEMORY); -+*/ -+#define MALI_ERROR(error_code) return (error_code) ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+/** -+ * Basic error macro, to indicate success. -+ * Note no closing semicolon - this is supplied in typical usage: -+ * -+ * MALI_SUCCESS; -+ */ -+#define MALI_SUCCESS MALI_ERROR(_MALI_OSK_ERR_OK) ++ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++ product_id = gpu_id >> GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++ is_new_format = GPU_ID_IS_NEW_FORMAT(product_id); ++ product_id_mask = ++ (is_new_format ? ++ GPU_ID2_PRODUCT_MODEL : ++ GPU_ID_VERSION_PRODUCT_ID) >> ++ GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++ ++ for (i = 0; i < ARRAY_SIZE(gpu_product_id_names); ++i) { ++ const struct gpu_product_id_name *p = &gpu_product_id_names[i]; ++ ++ if ((GPU_ID_IS_NEW_FORMAT(p->id) == is_new_format) && ++ (p->id & product_id_mask) == ++ (product_id & product_id_mask)) { ++ product_name = p->name; ++ break; ++ } ++ } ++ ++ return scnprintf(buf, PAGE_SIZE, "%s %d cores r%dp%d 0x%04X\n", ++ product_name, kbdev->gpu_props.num_cores, ++ (gpu_id & GPU_ID_VERSION_MAJOR) >> GPU_ID_VERSION_MAJOR_SHIFT, ++ (gpu_id & GPU_ID_VERSION_MINOR) >> GPU_ID_VERSION_MINOR_SHIFT, ++ product_id); ++} ++static DEVICE_ATTR(gpuinfo, S_IRUGO, kbase_show_gpuinfo, NULL); + +/** -+ * Basic error macro. This checks whether the given condition is true, and if not returns -+ * from this function with the supplied error code. This is a macro so that we can override it -+ * for stress testing. ++ * set_dvfs_period - Store callback for the dvfs_period sysfs file. ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file + * -+ * Note that this uses the do-while-0 wrapping to ensure that we don't get problems with dangling -+ * else clauses. Note also no closing semicolon - this is supplied in typical usage: ++ * This function is called when the dvfs_period sysfs file is written to. It ++ * checks the data written, and if valid updates the DVFS period variable, + * -+ * MALI_CHECK((p!=NULL), ERROR_NO_OBJECT); ++ * Return: @count if the function succeeded. An error code on failure. + */ -+#define MALI_CHECK(condition, error_code) do { if(!(condition)) MALI_ERROR(error_code); } while(0) ++static ssize_t set_dvfs_period(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_device *kbdev; ++ int ret; ++ int dvfs_period; + -+/** -+ * Error propagation macro. If the expression given is anything other than -+ * _MALI_OSK_NO_ERROR, then the value is returned from the enclosing function -+ * as an error code. This effectively acts as a guard clause, and propagates -+ * error values up the call stack. This uses a temporary value to ensure that -+ * the error expression is not evaluated twice. -+ * If the counter for forcing a failure has been set using _mali_force_error, -+ * this error will be returned without evaluating the expression in -+ * MALI_CHECK_NO_ERROR -+ */ -+#define MALI_CHECK_NO_ERROR(expression) \ -+ do { _mali_osk_errcode_t _check_no_error_result=(expression); \ -+ if(_check_no_error_result != _MALI_OSK_ERR_OK) \ -+ MALI_ERROR(_check_no_error_result); \ -+ } while(0) ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+/** -+ * Pointer check macro. Checks non-null pointer. -+ */ -+#define MALI_CHECK_NON_NULL(pointer, error_code) MALI_CHECK( ((pointer)!=NULL), (error_code) ) ++ ret = kstrtoint(buf, 0, &dvfs_period); ++ if (ret || dvfs_period <= 0) { ++ dev_err(kbdev->dev, "Couldn't process dvfs_period write operation.\n" ++ "Use format \n"); ++ return -EINVAL; ++ } ++ ++ kbdev->pm.dvfs_period = dvfs_period; ++ dev_dbg(kbdev->dev, "DVFS period: %dms\n", dvfs_period); ++ ++ return count; ++} + +/** -+ * Error macro with goto. This checks whether the given condition is true, and if not jumps -+ * to the specified label using a goto. The label must therefore be local to the function in -+ * which this macro appears. This is most usually used to execute some clean-up code before -+ * exiting with a call to ERROR. ++ * show_dvfs_period - Show callback for the dvfs_period sysfs entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the GPU information. + * -+ * Like the other macros, this is a macro to allow us to override the condition if we wish, -+ * e.g. to force an error during stress testing. ++ * This function is called to get the current period used for the DVFS sample ++ * timer. ++ * ++ * Return: The number of bytes output to @buf. + */ -+#define MALI_CHECK_GOTO(condition, label) do { if(!(condition)) goto label; } while(0) ++static ssize_t show_dvfs_period(struct device *dev, ++ struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *kbdev; ++ ssize_t ret; + -+/** -+ * Explicitly ignore a parameter passed into a function, to suppress compiler warnings. -+ * Should only be used with parameter names. -+ */ -+#define MALI_IGNORE(x) x=x ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+#if defined(CONFIG_MALI_QUIET) -+#define MALI_PRINTF(args) -+#else -+#define MALI_PRINTF(args) _mali_osk_dbgmsg args; -+#endif ++ ret = scnprintf(buf, PAGE_SIZE, "%d\n", kbdev->pm.dvfs_period); + -+#define MALI_PRINT_ERROR(args) do{ \ -+ MALI_PRINTF(("Mali: ERR: %s\n" ,__FILE__)); \ -+ MALI_PRINTF((" %s()%4d\n ", __FUNCTION__, __LINE__)) ; \ -+ MALI_PRINTF(args); \ -+ MALI_PRINTF(("\n")); \ -+ } while(0) ++ return ret; ++} + -+#define MALI_PRINT(args) do{ \ -+ MALI_PRINTF(("Mali: ")); \ -+ MALI_PRINTF(args); \ -+ } while (0) ++static DEVICE_ATTR(dvfs_period, S_IRUGO | S_IWUSR, show_dvfs_period, ++ set_dvfs_period); + -+#ifdef DEBUG -+#ifndef mali_debug_level -+extern int mali_debug_level; -+#endif ++/** ++ * set_pm_poweroff - Store callback for the pm_poweroff sysfs file. ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file ++ * ++ * This function is called when the pm_poweroff sysfs file is written to. ++ * ++ * This file contains three values separated by whitespace. The values ++ * are gpu_poweroff_time (the period of the poweroff timer, in ns), ++ * poweroff_shader_ticks (the number of poweroff timer ticks before an idle ++ * shader is powered off), and poweroff_gpu_ticks (the number of poweroff timer ++ * ticks before the GPU is powered off), in that order. ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t set_pm_poweroff(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_device *kbdev; ++ int items; ++ s64 gpu_poweroff_time; ++ int poweroff_shader_ticks, poweroff_gpu_ticks; + -+#define MALI_DEBUG_CODE(code) code -+#define MALI_DEBUG_PRINT(level, args) do { \ -+ if((level) <= mali_debug_level)\ -+ {MALI_PRINTF(("Mali<" #level ">: ")); MALI_PRINTF(args); } \ -+ } while (0) ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+#define MALI_DEBUG_PRINT_ERROR(args) MALI_PRINT_ERROR(args) ++ items = sscanf(buf, "%llu %u %u", &gpu_poweroff_time, ++ &poweroff_shader_ticks, ++ &poweroff_gpu_ticks); ++ if (items != 3) { ++ dev_err(kbdev->dev, "Couldn't process pm_poweroff write operation.\n" ++ "Use format \n"); ++ return -EINVAL; ++ } + -+#define MALI_DEBUG_PRINT_IF(level,condition,args) \ -+ if((condition)&&((level) <= mali_debug_level))\ -+ {MALI_PRINTF(("Mali<" #level ">: ")); MALI_PRINTF(args); } ++ kbdev->pm.gpu_poweroff_time = HR_TIMER_DELAY_NSEC(gpu_poweroff_time); ++ kbdev->pm.poweroff_shader_ticks = poweroff_shader_ticks; ++ kbdev->pm.poweroff_gpu_ticks = poweroff_gpu_ticks; + -+#define MALI_DEBUG_PRINT_ELSE(level, args)\ -+ else if((level) <= mali_debug_level)\ -+ { MALI_PRINTF(("Mali<" #level ">: ")); MALI_PRINTF(args); } ++ return count; ++} + +/** -+ * @note these variants of DEBUG ASSERTS will cause a debugger breakpoint -+ * to be entered (see _mali_osk_break() ). An alternative would be to call -+ * _mali_osk_abort(), on OSs that support it. ++ * show_pm_poweroff - Show callback for the pm_poweroff sysfs entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the GPU information. ++ * ++ * This function is called to get the current period used for the DVFS sample ++ * timer. ++ * ++ * Return: The number of bytes output to @buf. + */ -+#define MALI_DEBUG_PRINT_ASSERT(condition, args) do {if( !(condition)) { MALI_PRINT_ERROR(args); _mali_osk_break(); } } while(0) -+#define MALI_DEBUG_ASSERT_POINTER(pointer) do {if( (pointer)== NULL) {MALI_PRINT_ERROR(("NULL pointer " #pointer)); _mali_osk_break();} } while(0) -+#define MALI_DEBUG_ASSERT(condition) do {if( !(condition)) {MALI_PRINT_ERROR(("ASSERT failed: " #condition )); _mali_osk_break();} } while(0) ++static ssize_t show_pm_poweroff(struct device *dev, ++ struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *kbdev; ++ ssize_t ret; + -+#else /* DEBUG */ ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+#define MALI_DEBUG_CODE(code) -+#define MALI_DEBUG_PRINT(string,args) do {} while(0) -+#define MALI_DEBUG_PRINT_ERROR(args) do {} while(0) -+#define MALI_DEBUG_PRINT_IF(level,condition,args) do {} while(0) -+#define MALI_DEBUG_PRINT_ELSE(level,condition,args) do {} while(0) -+#define MALI_DEBUG_PRINT_ASSERT(condition,args) do {} while(0) -+#define MALI_DEBUG_ASSERT_POINTER(pointer) do {} while(0) -+#define MALI_DEBUG_ASSERT(condition) do {} while(0) ++ ret = scnprintf(buf, PAGE_SIZE, "%llu %u %u\n", ++ ktime_to_ns(kbdev->pm.gpu_poweroff_time), ++ kbdev->pm.poweroff_shader_ticks, ++ kbdev->pm.poweroff_gpu_ticks); + -+#endif /* DEBUG */ ++ return ret; ++} + -+/** -+ * variables from user space cannot be dereferenced from kernel space; tagging them -+ * with __user allows the GCC compiler to generate a warning. Other compilers may -+ * not support this so we define it here as an empty macro if the compiler doesn't -+ * define it. -+ */ -+#ifndef __user -+#define __user -+#endif ++static DEVICE_ATTR(pm_poweroff, S_IRUGO | S_IWUSR, show_pm_poweroff, ++ set_pm_poweroff); + -+#endif /* __MALI_KERNEL_COMMON_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c -new file mode 100755 -index 000000000000..87f97b710257 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c -@@ -0,0 +1,1349 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * set_reset_timeout - Store callback for the reset_timeout sysfs file. ++ * @dev: The device with sysfs file is for ++ * @attr: The attributes of the sysfs file ++ * @buf: The value written to the sysfs file ++ * @count: The number of bytes written to the sysfs file ++ * ++ * This function is called when the reset_timeout sysfs file is written to. It ++ * checks the data written, and if valid updates the reset timeout. ++ * ++ * Return: @count if the function succeeded. An error code on failure. + */ ++static ssize_t set_reset_timeout(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) ++{ ++ struct kbase_device *kbdev; ++ int ret; ++ int reset_timeout; + -+#include "mali_kernel_common.h" -+#include "mali_session.h" -+#include "mali_osk.h" -+#include "mali_osk_mali.h" -+#include "mali_ukk.h" -+#include "mali_kernel_core.h" -+#include "mali_memory.h" -+#include "mali_mem_validation.h" -+#include "mali_mmu.h" -+#include "mali_mmu_page_directory.h" -+#include "mali_dlbu.h" -+#include "mali_broadcast.h" -+#include "mali_gp.h" -+#include "mali_pp.h" -+#include "mali_executor.h" -+#include "mali_pp_job.h" -+#include "mali_group.h" -+#include "mali_pm.h" -+#include "mali_pmu.h" -+#include "mali_scheduler.h" -+#include "mali_kernel_utilization.h" -+#include "mali_l2_cache.h" -+#include "mali_timeline.h" -+#include "mali_soft_job.h" -+#include "mali_pm_domain.h" -+#if defined(CONFIG_MALI400_PROFILING) -+#include "mali_osk_profiling.h" -+#endif -+#if defined(CONFIG_MALI400_INTERNAL_PROFILING) -+#include "mali_profiling_internal.h" -+#endif -+#include "mali_control_timer.h" -+#include "mali_dvfs_policy.h" -+#include -+#include -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+#include -+#else -+#include -+#endif -+#endif ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+#define MALI_SHARED_MEMORY_DEFAULT_SIZE 0xffffffff ++ ret = kstrtoint(buf, 0, &reset_timeout); ++ if (ret || reset_timeout <= 0) { ++ dev_err(kbdev->dev, "Couldn't process reset_timeout write operation.\n" ++ "Use format \n"); ++ return -EINVAL; ++ } + -+/* Mali GPU memory. Real values come from module parameter or from device specific data */ -+unsigned int mali_dedicated_mem_start = 0; -+unsigned int mali_dedicated_mem_size = 0; ++ kbdev->reset_timeout_ms = reset_timeout; ++ dev_dbg(kbdev->dev, "Reset timeout: %dms\n", reset_timeout); + -+/* Default shared memory size is set to 4G. */ -+unsigned int mali_shared_mem_size = MALI_SHARED_MEMORY_DEFAULT_SIZE; ++ return count; ++} + -+/* Frame buffer memory to be accessible by Mali GPU */ -+int mali_fb_start = 0; -+int mali_fb_size = 0; ++/** ++ * show_reset_timeout - Show callback for the reset_timeout sysfs entry. ++ * @dev: The device this sysfs file is for. ++ * @attr: The attributes of the sysfs file. ++ * @buf: The output buffer to receive the GPU information. ++ * ++ * This function is called to get the current reset timeout. ++ * ++ * Return: The number of bytes output to @buf. ++ */ ++static ssize_t show_reset_timeout(struct device *dev, ++ struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *kbdev; ++ ssize_t ret; + -+/* Mali max job runtime */ -+extern int mali_max_job_runtime; ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+/** Start profiling from module load? */ -+int mali_boot_profiling = 0; ++ ret = scnprintf(buf, PAGE_SIZE, "%d\n", kbdev->reset_timeout_ms); + -+/** Limits for the number of PP cores behind each L2 cache. */ -+int mali_max_pp_cores_group_1 = 0xFF; -+int mali_max_pp_cores_group_2 = 0xFF; ++ return ret; ++} + -+int mali_inited_pp_cores_group_1 = 0; -+int mali_inited_pp_cores_group_2 = 0; ++static DEVICE_ATTR(reset_timeout, S_IRUGO | S_IWUSR, show_reset_timeout, ++ set_reset_timeout); + -+static _mali_product_id_t global_product_id = _MALI_PRODUCT_ID_UNKNOWN; -+static uintptr_t global_gpu_base_address = 0; -+static u32 global_gpu_major_version = 0; -+static u32 global_gpu_minor_version = 0; + -+mali_bool mali_gpu_class_is_mali450 = MALI_FALSE; -+mali_bool mali_gpu_class_is_mali470 = MALI_FALSE; + -+static _mali_osk_errcode_t mali_set_global_gpu_base_address(void) ++static ssize_t show_mem_pool_size(struct device *dev, ++ struct device_attribute *attr, char * const buf) +{ -+ _mali_osk_errcode_t err = _MALI_OSK_ERR_OK; ++ struct kbase_device *kbdev; ++ ssize_t ret; + -+ global_gpu_base_address = _mali_osk_resource_base_address(); -+ if (0 == global_gpu_base_address) { -+ err = _MALI_OSK_ERR_ITEM_NOT_FOUND; -+ } ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ return err; -+} ++ ret = scnprintf(buf, PAGE_SIZE, "%zu\n", ++ kbase_mem_pool_size(&kbdev->mem_pool)); + -+static u32 mali_get_bcast_id(_mali_osk_resource_t *resource_pp) -+{ -+ switch (resource_pp->base - global_gpu_base_address) { -+ case 0x08000: -+ case 0x20000: /* fall-through for aliased mapping */ -+ return 0x01; -+ case 0x0A000: -+ case 0x22000: /* fall-through for aliased mapping */ -+ return 0x02; -+ case 0x0C000: -+ case 0x24000: /* fall-through for aliased mapping */ -+ return 0x04; -+ case 0x0E000: -+ case 0x26000: /* fall-through for aliased mapping */ -+ return 0x08; -+ case 0x28000: -+ return 0x10; -+ case 0x2A000: -+ return 0x20; -+ case 0x2C000: -+ return 0x40; -+ case 0x2E000: -+ return 0x80; -+ default: -+ return 0; -+ } ++ return ret; +} + -+static _mali_osk_errcode_t mali_parse_product_info(void) ++static ssize_t set_mem_pool_size(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) +{ -+ _mali_osk_resource_t first_pp_resource; ++ struct kbase_device *kbdev; ++ size_t new_size; ++ int err; + -+ /* Find the first PP core resource (again) */ -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI_OFFSET_PP0, &first_pp_resource)) { -+ /* Create a dummy PP object for this core so that we can read the version register */ -+ struct mali_group *group = mali_group_create(NULL, NULL, NULL, MALI_DOMAIN_INDEX_PP0); -+ if (NULL != group) { -+ struct mali_pp_core *pp_core = mali_pp_create(&first_pp_resource, group, MALI_FALSE, mali_get_bcast_id(&first_pp_resource)); -+ if (NULL != pp_core) { -+ u32 pp_version; ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ pp_version = mali_pp_core_get_version(pp_core); ++ err = kstrtoul(buf, 0, (unsigned long *)&new_size); ++ if (err) ++ return err; + -+ mali_group_delete(group); ++ kbase_mem_pool_trim(&kbdev->mem_pool, new_size); + -+ global_gpu_major_version = (pp_version >> 8) & 0xFF; -+ global_gpu_minor_version = pp_version & 0xFF; ++ return count; ++} + -+ switch (pp_version >> 16) { -+ case MALI200_PP_PRODUCT_ID: -+ global_product_id = _MALI_PRODUCT_ID_MALI200; -+ MALI_DEBUG_PRINT(2, ("Found Mali GPU Mali-200 r%up%u\n", global_gpu_major_version, global_gpu_minor_version)); -+ MALI_PRINT_ERROR(("Mali-200 is not supported by this driver.\n")); -+ _mali_osk_abort(); -+ break; -+ case MALI300_PP_PRODUCT_ID: -+ global_product_id = _MALI_PRODUCT_ID_MALI300; -+ MALI_DEBUG_PRINT(2, ("Found Mali GPU Mali-300 r%up%u\n", global_gpu_major_version, global_gpu_minor_version)); -+ break; -+ case MALI400_PP_PRODUCT_ID: -+ global_product_id = _MALI_PRODUCT_ID_MALI400; -+ MALI_DEBUG_PRINT(2, ("Found Mali GPU Mali-400 MP r%up%u\n", global_gpu_major_version, global_gpu_minor_version)); -+ break; -+ case MALI450_PP_PRODUCT_ID: -+ global_product_id = _MALI_PRODUCT_ID_MALI450; -+ MALI_DEBUG_PRINT(2, ("Found Mali GPU Mali-450 MP r%up%u\n", global_gpu_major_version, global_gpu_minor_version)); -+ break; -+ case MALI470_PP_PRODUCT_ID: -+ global_product_id = _MALI_PRODUCT_ID_MALI470; -+ MALI_DEBUG_PRINT(2, ("Found Mali GPU Mali-470 MP r%up%u\n", global_gpu_major_version, global_gpu_minor_version)); -+ break; -+ default: -+ MALI_DEBUG_PRINT(2, ("Found unknown Mali GPU (r%up%u)\n", global_gpu_major_version, global_gpu_minor_version)); -+ return _MALI_OSK_ERR_FAULT; -+ } ++static DEVICE_ATTR(mem_pool_size, S_IRUGO | S_IWUSR, show_mem_pool_size, ++ set_mem_pool_size); + -+ return _MALI_OSK_ERR_OK; -+ } else { -+ MALI_PRINT_ERROR(("Failed to create initial PP object\n")); -+ } -+ } else { -+ MALI_PRINT_ERROR(("Failed to create initial group object\n")); -+ } -+ } else { -+ MALI_PRINT_ERROR(("First PP core not specified in config file\n")); -+ } ++static ssize_t show_mem_pool_max_size(struct device *dev, ++ struct device_attribute *attr, char * const buf) ++{ ++ struct kbase_device *kbdev; ++ ssize_t ret; + -+ return _MALI_OSK_ERR_FAULT; ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; ++ ++ ret = scnprintf(buf, PAGE_SIZE, "%zu\n", ++ kbase_mem_pool_max_size(&kbdev->mem_pool)); ++ ++ return ret; +} + -+static void mali_delete_groups(void) ++static ssize_t set_mem_pool_max_size(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t count) +{ -+ struct mali_group *group; ++ struct kbase_device *kbdev; ++ size_t new_max_size; ++ int err; + -+ group = mali_group_get_glob_group(0); -+ while (NULL != group) { -+ mali_group_delete(group); -+ group = mali_group_get_glob_group(0); -+ } ++ kbdev = to_kbase_device(dev); ++ if (!kbdev) ++ return -ENODEV; + -+ MALI_DEBUG_ASSERT(0 == mali_group_get_glob_num_groups()); ++ err = kstrtoul(buf, 0, (unsigned long *)&new_max_size); ++ if (err) ++ return -EINVAL; ++ ++ kbase_mem_pool_set_max_size(&kbdev->mem_pool, new_max_size); ++ ++ return count; +} + -+static void mali_delete_l2_cache_cores(void) -+{ -+ struct mali_l2_cache_core *l2; ++static DEVICE_ATTR(mem_pool_max_size, S_IRUGO | S_IWUSR, show_mem_pool_max_size, ++ set_mem_pool_max_size); + -+ l2 = mali_l2_cache_core_get_glob_l2_core(0); -+ while (NULL != l2) { -+ mali_l2_cache_delete(l2); -+ l2 = mali_l2_cache_core_get_glob_l2_core(0); -+ } ++#ifdef CONFIG_DEBUG_FS + -+ MALI_DEBUG_ASSERT(0 == mali_l2_cache_core_get_glob_num_l2_cores()); -+} ++/* Number of entries in serialize_jobs_settings[] */ ++#define NR_SERIALIZE_JOBS_SETTINGS 5 ++/* Maximum string length in serialize_jobs_settings[].name */ ++#define MAX_SERIALIZE_JOBS_NAME_LEN 16 + -+static struct mali_l2_cache_core *mali_create_l2_cache_core(_mali_osk_resource_t *resource, u32 domain_index) ++static struct +{ -+ struct mali_l2_cache_core *l2_cache = NULL; ++ char *name; ++ u8 setting; ++} serialize_jobs_settings[NR_SERIALIZE_JOBS_SETTINGS] = { ++ {"none", 0}, ++ {"intra-slot", KBASE_SERIALIZE_INTRA_SLOT}, ++ {"inter-slot", KBASE_SERIALIZE_INTER_SLOT}, ++ {"full", KBASE_SERIALIZE_INTRA_SLOT | KBASE_SERIALIZE_INTER_SLOT}, ++ {"full-reset", KBASE_SERIALIZE_INTRA_SLOT | KBASE_SERIALIZE_INTER_SLOT | ++ KBASE_SERIALIZE_RESET} ++}; + -+ if (NULL != resource) { ++/** ++ * kbasep_serialize_jobs_seq_show - Show callback for the serialize_jobs debugfs ++ * file ++ * @sfile: seq_file pointer ++ * @data: Private callback data ++ * ++ * This function is called to get the contents of the serialize_jobs debugfs ++ * file. This is a list of the available settings with the currently active one ++ * surrounded by square brackets. ++ * ++ * Return: 0 on success, or an error code on error ++ */ ++static int kbasep_serialize_jobs_seq_show(struct seq_file *sfile, void *data) ++{ ++ struct kbase_device *kbdev = sfile->private; ++ int i; + -+ MALI_DEBUG_PRINT(3, ("Found L2 cache %s\n", resource->description)); ++ CSTD_UNUSED(data); + -+ l2_cache = mali_l2_cache_create(resource, domain_index); -+ if (NULL == l2_cache) { -+ MALI_PRINT_ERROR(("Failed to create L2 cache object\n")); -+ return NULL; -+ } ++ for (i = 0; i < NR_SERIALIZE_JOBS_SETTINGS; i++) { ++ if (kbdev->serialize_jobs == serialize_jobs_settings[i].setting) ++ seq_printf(sfile, "[%s] ", ++ serialize_jobs_settings[i].name); ++ else ++ seq_printf(sfile, "%s ", ++ serialize_jobs_settings[i].name); + } -+ MALI_DEBUG_PRINT(3, ("Created L2 cache core object\n")); + -+ return l2_cache; ++ seq_puts(sfile, "\n"); ++ ++ return 0; +} + -+static _mali_osk_errcode_t mali_parse_config_l2_cache(void) ++/** ++ * kbasep_serialize_jobs_debugfs_write - Store callback for the serialize_jobs ++ * debugfs file. ++ * @file: File pointer ++ * @ubuf: User buffer containing data to store ++ * @count: Number of bytes in user buffer ++ * @ppos: File position ++ * ++ * This function is called when the serialize_jobs debugfs file is written to. ++ * It matches the requested setting against the available settings and if a ++ * matching setting is found updates kbdev->serialize_jobs. ++ * ++ * Return: @count if the function succeeded. An error code on failure. ++ */ ++static ssize_t kbasep_serialize_jobs_debugfs_write(struct file *file, ++ const char __user *ubuf, size_t count, loff_t *ppos) +{ -+ struct mali_l2_cache_core *l2_cache = NULL; -+ -+ if (mali_is_mali400()) { -+ _mali_osk_resource_t l2_resource; -+ if (_MALI_OSK_ERR_OK != _mali_osk_resource_find(MALI400_OFFSET_L2_CACHE0, &l2_resource)) { -+ MALI_DEBUG_PRINT(3, ("Did not find required Mali L2 cache in config file\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ -+ l2_cache = mali_create_l2_cache_core(&l2_resource, MALI_DOMAIN_INDEX_L20); -+ if (NULL == l2_cache) { -+ return _MALI_OSK_ERR_FAULT; -+ } -+ } else if (mali_is_mali450()) { -+ /* -+ * L2 for GP at 0x10000 -+ * L2 for PP0-3 at 0x01000 -+ * L2 for PP4-7 at 0x11000 (optional) -+ */ ++ struct seq_file *s = file->private_data; ++ struct kbase_device *kbdev = s->private; ++ char buf[MAX_SERIALIZE_JOBS_NAME_LEN]; ++ int i; ++ bool valid = false; + -+ _mali_osk_resource_t l2_gp_resource; -+ _mali_osk_resource_t l2_pp_grp0_resource; -+ _mali_osk_resource_t l2_pp_grp1_resource; ++ CSTD_UNUSED(ppos); + -+ /* Make cluster for GP's L2 */ -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI450_OFFSET_L2_CACHE0, &l2_gp_resource)) { -+ MALI_DEBUG_PRINT(3, ("Creating Mali-450 L2 cache core for GP\n")); -+ l2_cache = mali_create_l2_cache_core(&l2_gp_resource, MALI_DOMAIN_INDEX_L20); -+ if (NULL == l2_cache) { -+ return _MALI_OSK_ERR_FAULT; -+ } -+ } else { -+ MALI_DEBUG_PRINT(3, ("Did not find required Mali L2 cache for GP in config file\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ count = min_t(size_t, sizeof(buf) - 1, count); ++ if (copy_from_user(buf, ubuf, count)) ++ return -EFAULT; + -+ /* Find corresponding l2 domain */ -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI450_OFFSET_L2_CACHE1, &l2_pp_grp0_resource)) { -+ MALI_DEBUG_PRINT(3, ("Creating Mali-450 L2 cache core for PP group 0\n")); -+ l2_cache = mali_create_l2_cache_core(&l2_pp_grp0_resource, MALI_DOMAIN_INDEX_L21); -+ if (NULL == l2_cache) { -+ return _MALI_OSK_ERR_FAULT; -+ } -+ } else { -+ MALI_DEBUG_PRINT(3, ("Did not find required Mali L2 cache for PP group 0 in config file\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ buf[count] = 0; + -+ /* Second PP core group is optional, don't fail if we don't find it */ -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI450_OFFSET_L2_CACHE2, &l2_pp_grp1_resource)) { -+ MALI_DEBUG_PRINT(3, ("Creating Mali-450 L2 cache core for PP group 1\n")); -+ l2_cache = mali_create_l2_cache_core(&l2_pp_grp1_resource, MALI_DOMAIN_INDEX_L22); -+ if (NULL == l2_cache) { -+ return _MALI_OSK_ERR_FAULT; -+ } ++ for (i = 0; i < NR_SERIALIZE_JOBS_SETTINGS; i++) { ++ if (sysfs_streq(serialize_jobs_settings[i].name, buf)) { ++ kbdev->serialize_jobs = ++ serialize_jobs_settings[i].setting; ++ valid = true; ++ break; + } -+ } else if (mali_is_mali470()) { -+ _mali_osk_resource_t l2c1_resource; ++ } + -+ /* Make cluster for L2C1 */ -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI470_OFFSET_L2_CACHE1, &l2c1_resource)) { -+ MALI_DEBUG_PRINT(3, ("Creating Mali-470 L2 cache 1\n")); -+ l2_cache = mali_create_l2_cache_core(&l2c1_resource, MALI_DOMAIN_INDEX_L21); -+ if (NULL == l2_cache) { -+ return _MALI_OSK_ERR_FAULT; -+ } -+ } else { -+ MALI_DEBUG_PRINT(3, ("Did not find required Mali L2 cache for L2C1\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ if (!valid) { ++ dev_err(kbdev->dev, "serialize_jobs: invalid setting\n"); ++ return -EINVAL; + } + -+ return _MALI_OSK_ERR_OK; ++ return count; +} + -+static struct mali_group *mali_create_group(struct mali_l2_cache_core *cache, -+ _mali_osk_resource_t *resource_mmu, -+ _mali_osk_resource_t *resource_gp, -+ _mali_osk_resource_t *resource_pp, -+ u32 domain_index) ++/** ++ * kbasep_serialize_jobs_debugfs_open - Open callback for the serialize_jobs ++ * debugfs file ++ * @in: inode pointer ++ * @file: file pointer ++ * ++ * Return: Zero on success, error code on failure ++ */ ++static int kbasep_serialize_jobs_debugfs_open(struct inode *in, ++ struct file *file) +{ -+ struct mali_mmu_core *mmu; -+ struct mali_group *group; ++ return single_open(file, kbasep_serialize_jobs_seq_show, in->i_private); ++} + -+ MALI_DEBUG_PRINT(3, ("Starting new group for MMU %s\n", resource_mmu->description)); ++static const struct file_operations kbasep_serialize_jobs_debugfs_fops = { ++ .open = kbasep_serialize_jobs_debugfs_open, ++ .read = seq_read, ++ .write = kbasep_serialize_jobs_debugfs_write, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; + -+ /* Create the group object */ -+ group = mali_group_create(cache, NULL, NULL, domain_index); -+ if (NULL == group) { -+ MALI_PRINT_ERROR(("Failed to create group object for MMU %s\n", resource_mmu->description)); -+ return NULL; -+ } ++#endif /* CONFIG_DEBUG_FS */ + -+ /* Create the MMU object inside group */ -+ mmu = mali_mmu_create(resource_mmu, group, MALI_FALSE); -+ if (NULL == mmu) { -+ MALI_PRINT_ERROR(("Failed to create MMU object\n")); -+ mali_group_delete(group); -+ return NULL; -+ } ++static int kbasep_protected_mode_init(struct kbase_device *kbdev) ++{ ++#ifdef CONFIG_OF ++ struct device_node *protected_node; ++ struct platform_device *pdev; ++ struct protected_mode_device *protected_dev; ++#endif + -+ if (NULL != resource_gp) { -+ /* Create the GP core object inside this group */ -+ struct mali_gp_core *gp_core = mali_gp_create(resource_gp, group); -+ if (NULL == gp_core) { -+ /* No need to clean up now, as we will clean up everything linked in from the cluster when we fail this function */ -+ MALI_PRINT_ERROR(("Failed to create GP object\n")); -+ mali_group_delete(group); -+ return NULL; -+ } ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_MODE)) { ++ /* Use native protected ops */ ++ kbdev->protected_dev = kzalloc(sizeof(*kbdev->protected_dev), ++ GFP_KERNEL); ++ if (!kbdev->protected_dev) ++ return -ENOMEM; ++ kbdev->protected_dev->data = kbdev; ++ kbdev->protected_ops = &kbase_native_protected_ops; ++ kbdev->protected_mode_support = true; ++ return 0; + } + -+ if (NULL != resource_pp) { -+ struct mali_pp_core *pp_core; ++ kbdev->protected_mode_support = false; + -+ /* Create the PP core object inside this group */ -+ pp_core = mali_pp_create(resource_pp, group, MALI_FALSE, mali_get_bcast_id(resource_pp)); -+ if (NULL == pp_core) { -+ /* No need to clean up now, as we will clean up everything linked in from the cluster when we fail this function */ -+ MALI_PRINT_ERROR(("Failed to create PP object\n")); -+ mali_group_delete(group); -+ return NULL; -+ } ++#ifdef CONFIG_OF ++ protected_node = of_parse_phandle(kbdev->dev->of_node, ++ "protected-mode-switcher", 0); ++ ++ if (!protected_node) ++ protected_node = of_parse_phandle(kbdev->dev->of_node, ++ "secure-mode-switcher", 0); ++ ++ if (!protected_node) { ++ /* If protected_node cannot be looked up then we assume ++ * protected mode is not supported on this platform. */ ++ dev_info(kbdev->dev, "Protected mode not available\n"); ++ return 0; + } + -+ return group; -+} ++ pdev = of_find_device_by_node(protected_node); ++ if (!pdev) ++ return -EINVAL; + -+static _mali_osk_errcode_t mali_create_virtual_group(_mali_osk_resource_t *resource_mmu_pp_bcast, -+ _mali_osk_resource_t *resource_pp_bcast, -+ _mali_osk_resource_t *resource_dlbu, -+ _mali_osk_resource_t *resource_bcast) -+{ -+ struct mali_mmu_core *mmu_pp_bcast_core; -+ struct mali_pp_core *pp_bcast_core; -+ struct mali_dlbu_core *dlbu_core; -+ struct mali_bcast_unit *bcast_core; -+ struct mali_group *group; ++ protected_dev = platform_get_drvdata(pdev); ++ if (!protected_dev) ++ return -EPROBE_DEFER; + -+ MALI_DEBUG_PRINT(2, ("Starting new virtual group for MMU PP broadcast core %s\n", resource_mmu_pp_bcast->description)); ++ kbdev->protected_ops = &protected_dev->ops; ++ kbdev->protected_dev = protected_dev; + -+ /* Create the DLBU core object */ -+ dlbu_core = mali_dlbu_create(resource_dlbu); -+ if (NULL == dlbu_core) { -+ MALI_PRINT_ERROR(("Failed to create DLBU object \n")); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ if (kbdev->protected_ops) { ++ int err; + -+ /* Create the Broadcast unit core */ -+ bcast_core = mali_bcast_unit_create(resource_bcast); -+ if (NULL == bcast_core) { -+ MALI_PRINT_ERROR(("Failed to create Broadcast unit object!\n")); -+ mali_dlbu_delete(dlbu_core); -+ return _MALI_OSK_ERR_FAULT; ++ /* Make sure protected mode is disabled on startup */ ++ mutex_lock(&kbdev->pm.lock); ++ err = kbdev->protected_ops->protected_mode_disable( ++ kbdev->protected_dev); ++ mutex_unlock(&kbdev->pm.lock); ++ ++ /* protected_mode_disable() returns -EINVAL if not supported */ ++ kbdev->protected_mode_support = (err != -EINVAL); + } ++#endif ++ return 0; ++} + -+ /* Create the group object */ -+#if defined(DEBUG) -+ /* Get a physical PP group to temporarily add to broadcast unit. IRQ -+ * verification needs a physical group in the broadcast unit to test -+ * the broadcast unit interrupt line. */ -+ { -+ struct mali_group *phys_group = NULL; -+ int i; -+ for (i = 0; i < mali_group_get_glob_num_groups(); i++) { -+ phys_group = mali_group_get_glob_group(i); -+ if (NULL != mali_group_get_pp_core(phys_group)) break; -+ } -+ MALI_DEBUG_ASSERT(NULL != mali_group_get_pp_core(phys_group)); ++static void kbasep_protected_mode_term(struct kbase_device *kbdev) ++{ ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_MODE)) ++ kfree(kbdev->protected_dev); ++} + -+ /* Add the group temporarily to the broadcast, and update the -+ * broadcast HW. Since the HW is not updated when removing the -+ * group the IRQ check will work when the virtual PP is created -+ * later. -+ * -+ * When the virtual group gets populated, the actually used -+ * groups will be added to the broadcast unit and the HW will -+ * be updated. -+ */ -+ mali_bcast_add_group(bcast_core, phys_group); -+ mali_bcast_reset(bcast_core); -+ mali_bcast_remove_group(bcast_core, phys_group); -+ } -+#endif /* DEBUG */ -+ group = mali_group_create(NULL, dlbu_core, bcast_core, MALI_DOMAIN_INDEX_DUMMY); -+ if (NULL == group) { -+ MALI_PRINT_ERROR(("Failed to create group object for MMU PP broadcast core %s\n", resource_mmu_pp_bcast->description)); -+ mali_bcast_unit_delete(bcast_core); -+ mali_dlbu_delete(dlbu_core); -+ return _MALI_OSK_ERR_FAULT; -+ } ++#ifdef CONFIG_MALI_NO_MALI ++static int kbase_common_reg_map(struct kbase_device *kbdev) ++{ ++ return 0; ++} ++static void kbase_common_reg_unmap(struct kbase_device * const kbdev) ++{ ++} ++#else /* CONFIG_MALI_NO_MALI */ ++static int kbase_common_reg_map(struct kbase_device *kbdev) ++{ ++ int err = -ENOMEM; + -+ /* Create the MMU object inside group */ -+ mmu_pp_bcast_core = mali_mmu_create(resource_mmu_pp_bcast, group, MALI_TRUE); -+ if (NULL == mmu_pp_bcast_core) { -+ MALI_PRINT_ERROR(("Failed to create MMU PP broadcast object\n")); -+ mali_group_delete(group); -+ return _MALI_OSK_ERR_FAULT; ++ if (!request_mem_region(kbdev->reg_start, kbdev->reg_size, dev_name(kbdev->dev))) { ++ dev_err(kbdev->dev, "Register window unavailable\n"); ++ err = -EIO; ++ goto out_region; + } + -+ /* Create the PP core object inside this group */ -+ pp_bcast_core = mali_pp_create(resource_pp_bcast, group, MALI_TRUE, 0); -+ if (NULL == pp_bcast_core) { -+ /* No need to clean up now, as we will clean up everything linked in from the cluster when we fail this function */ -+ MALI_PRINT_ERROR(("Failed to create PP object\n")); -+ mali_group_delete(group); -+ return _MALI_OSK_ERR_FAULT; ++ kbdev->reg = ioremap(kbdev->reg_start, kbdev->reg_size); ++ if (!kbdev->reg) { ++ dev_err(kbdev->dev, "Can't remap register window\n"); ++ err = -EINVAL; ++ goto out_ioremap; + } + -+ return _MALI_OSK_ERR_OK; ++ return 0; ++ ++ out_ioremap: ++ release_mem_region(kbdev->reg_start, kbdev->reg_size); ++ out_region: ++ return err; +} + -+static _mali_osk_errcode_t mali_parse_config_groups(void) ++static void kbase_common_reg_unmap(struct kbase_device * const kbdev) +{ -+ struct mali_group *group; -+ int cluster_id_gp = 0; -+ int cluster_id_pp_grp0 = 0; -+ int cluster_id_pp_grp1 = 0; -+ int i; ++ if (kbdev->reg) { ++ iounmap(kbdev->reg); ++ release_mem_region(kbdev->reg_start, kbdev->reg_size); ++ kbdev->reg = NULL; ++ kbdev->reg_start = 0; ++ kbdev->reg_size = 0; ++ } ++} ++#endif /* CONFIG_MALI_NO_MALI */ + -+ _mali_osk_resource_t resource_gp; -+ _mali_osk_resource_t resource_gp_mmu; -+ _mali_osk_resource_t resource_pp[8]; -+ _mali_osk_resource_t resource_pp_mmu[8]; -+ _mali_osk_resource_t resource_pp_mmu_bcast; -+ _mali_osk_resource_t resource_pp_bcast; -+ _mali_osk_resource_t resource_dlbu; -+ _mali_osk_resource_t resource_bcast; -+ _mali_osk_errcode_t resource_gp_found; -+ _mali_osk_errcode_t resource_gp_mmu_found; -+ _mali_osk_errcode_t resource_pp_found[8]; -+ _mali_osk_errcode_t resource_pp_mmu_found[8]; -+ _mali_osk_errcode_t resource_pp_mmu_bcast_found; -+ _mali_osk_errcode_t resource_pp_bcast_found; -+ _mali_osk_errcode_t resource_dlbu_found; -+ _mali_osk_errcode_t resource_bcast_found; ++static int registers_map(struct kbase_device * const kbdev) ++{ + -+ if (!(mali_is_mali400() || mali_is_mali450() || mali_is_mali470())) { -+ /* No known HW core */ -+ return _MALI_OSK_ERR_FAULT; -+ } ++ /* the first memory resource is the physical address of the GPU ++ * registers */ ++ struct platform_device *pdev = to_platform_device(kbdev->dev); ++ struct resource *reg_res; ++ int err; + -+ if (MALI_MAX_JOB_RUNTIME_DEFAULT == mali_max_job_runtime) { -+ /* Group settings are not overridden by module parameters, so use device settings */ -+ _mali_osk_device_data data = { 0, }; ++ reg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ if (!reg_res) { ++ dev_err(kbdev->dev, "Invalid register resource\n"); ++ return -ENOENT; ++ } + -+ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { -+ /* Use device specific settings (if defined) */ -+ if (0 != data.max_job_runtime) { -+ mali_max_job_runtime = data.max_job_runtime; -+ } ++ kbdev->reg_start = reg_res->start; ++ kbdev->reg_size = resource_size(reg_res); ++ ++ err = kbase_common_reg_map(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, "Failed to map registers\n"); ++ return err; + } -+ } + -+ if (mali_is_mali450()) { -+ /* Mali-450 have separate L2s for GP, and PP core group(s) */ -+ cluster_id_pp_grp0 = 1; -+ cluster_id_pp_grp1 = 2; -+ } ++ return 0; ++} + -+ resource_gp_found = _mali_osk_resource_find(MALI_OFFSET_GP, &resource_gp); -+ resource_gp_mmu_found = _mali_osk_resource_find(MALI_OFFSET_GP_MMU, &resource_gp_mmu); -+ resource_pp_found[0] = _mali_osk_resource_find(MALI_OFFSET_PP0, &(resource_pp[0])); -+ resource_pp_found[1] = _mali_osk_resource_find(MALI_OFFSET_PP1, &(resource_pp[1])); -+ resource_pp_found[2] = _mali_osk_resource_find(MALI_OFFSET_PP2, &(resource_pp[2])); -+ resource_pp_found[3] = _mali_osk_resource_find(MALI_OFFSET_PP3, &(resource_pp[3])); -+ resource_pp_found[4] = _mali_osk_resource_find(MALI_OFFSET_PP4, &(resource_pp[4])); -+ resource_pp_found[5] = _mali_osk_resource_find(MALI_OFFSET_PP5, &(resource_pp[5])); -+ resource_pp_found[6] = _mali_osk_resource_find(MALI_OFFSET_PP6, &(resource_pp[6])); -+ resource_pp_found[7] = _mali_osk_resource_find(MALI_OFFSET_PP7, &(resource_pp[7])); -+ resource_pp_mmu_found[0] = _mali_osk_resource_find(MALI_OFFSET_PP0_MMU, &(resource_pp_mmu[0])); -+ resource_pp_mmu_found[1] = _mali_osk_resource_find(MALI_OFFSET_PP1_MMU, &(resource_pp_mmu[1])); -+ resource_pp_mmu_found[2] = _mali_osk_resource_find(MALI_OFFSET_PP2_MMU, &(resource_pp_mmu[2])); -+ resource_pp_mmu_found[3] = _mali_osk_resource_find(MALI_OFFSET_PP3_MMU, &(resource_pp_mmu[3])); -+ resource_pp_mmu_found[4] = _mali_osk_resource_find(MALI_OFFSET_PP4_MMU, &(resource_pp_mmu[4])); -+ resource_pp_mmu_found[5] = _mali_osk_resource_find(MALI_OFFSET_PP5_MMU, &(resource_pp_mmu[5])); -+ resource_pp_mmu_found[6] = _mali_osk_resource_find(MALI_OFFSET_PP6_MMU, &(resource_pp_mmu[6])); -+ resource_pp_mmu_found[7] = _mali_osk_resource_find(MALI_OFFSET_PP7_MMU, &(resource_pp_mmu[7])); ++static void registers_unmap(struct kbase_device *kbdev) ++{ ++ kbase_common_reg_unmap(kbdev); ++} + ++static int power_control_init(struct platform_device *pdev) ++{ ++ struct kbase_device *kbdev = to_kbase_device(&pdev->dev); ++ int err = 0; + -+ if (mali_is_mali450() || mali_is_mali470()) { -+ resource_bcast_found = _mali_osk_resource_find(MALI_OFFSET_BCAST, &resource_bcast); -+ resource_dlbu_found = _mali_osk_resource_find(MALI_OFFSET_DLBU, &resource_dlbu); -+ resource_pp_mmu_bcast_found = _mali_osk_resource_find(MALI_OFFSET_PP_BCAST_MMU, &resource_pp_mmu_bcast); -+ resource_pp_bcast_found = _mali_osk_resource_find(MALI_OFFSET_PP_BCAST, &resource_pp_bcast); ++ if (!kbdev) ++ return -ENODEV; + -+ if (_MALI_OSK_ERR_OK != resource_bcast_found || -+ _MALI_OSK_ERR_OK != resource_dlbu_found || -+ _MALI_OSK_ERR_OK != resource_pp_mmu_bcast_found || -+ _MALI_OSK_ERR_OK != resource_pp_bcast_found) { -+ /* Missing mandatory core(s) for Mali-450 or Mali-470 */ -+ MALI_DEBUG_PRINT(2, ("Missing mandatory resources, Mali-450 needs DLBU, Broadcast unit, virtual PP core and virtual MMU\n")); -+ return _MALI_OSK_ERR_FAULT; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) && defined(CONFIG_OF) \ ++ && defined(CONFIG_REGULATOR) ++ kbdev->regulator = regulator_get_optional(kbdev->dev, "mali"); ++ if (IS_ERR_OR_NULL(kbdev->regulator)) { ++ err = PTR_ERR(kbdev->regulator); ++ kbdev->regulator = NULL; ++ if (err == -EPROBE_DEFER) { ++ dev_err(&pdev->dev, "Failed to get regulator\n"); ++ return err; + } ++ dev_info(kbdev->dev, ++ "Continuing without Mali regulator control\n"); ++ /* Allow probe to continue without regulator */ + } ++#endif /* LINUX_VERSION_CODE >= 3, 12, 0 */ + -+ if (_MALI_OSK_ERR_OK != resource_gp_found || -+ _MALI_OSK_ERR_OK != resource_gp_mmu_found || -+ _MALI_OSK_ERR_OK != resource_pp_found[0] || -+ _MALI_OSK_ERR_OK != resource_pp_mmu_found[0]) { -+ /* Missing mandatory core(s) */ -+ MALI_DEBUG_PRINT(2, ("Missing mandatory resource, need at least one GP and one PP, both with a separate MMU\n")); -+ return _MALI_OSK_ERR_FAULT; ++ kbdev->clock = clk_get(kbdev->dev, "clk_mali"); ++ if (IS_ERR_OR_NULL(kbdev->clock)) { ++ err = PTR_ERR(kbdev->clock); ++ kbdev->clock = NULL; ++ if (err == -EPROBE_DEFER) { ++ dev_err(&pdev->dev, "Failed to get clock\n"); ++ goto fail; ++ } ++ dev_info(kbdev->dev, "Continuing without Mali clock control\n"); ++ /* Allow probe to continue without clock. */ ++ } else { ++ err = clk_prepare(kbdev->clock); ++ if (err) { ++ dev_err(kbdev->dev, ++ "Failed to prepare and enable clock (%d)\n", ++ err); ++ goto fail; ++ } + } + -+ MALI_DEBUG_ASSERT(1 <= mali_l2_cache_core_get_glob_num_l2_cores()); -+ group = mali_create_group(mali_l2_cache_core_get_glob_l2_core(cluster_id_gp), &resource_gp_mmu, &resource_gp, NULL, MALI_DOMAIN_INDEX_GP); -+ if (NULL == group) { -+ return _MALI_OSK_ERR_FAULT; -+ } ++ err = kbase_platform_rk_init_opp_table(kbdev); ++ if (err) ++ dev_err(kbdev->dev, "Failed to init_opp_table (%d)\n", err); + -+ /* Create group for first (and mandatory) PP core */ -+ MALI_DEBUG_ASSERT(mali_l2_cache_core_get_glob_num_l2_cores() >= (cluster_id_pp_grp0 + 1)); /* >= 1 on Mali-300 and Mali-400, >= 2 on Mali-450 */ -+ group = mali_create_group(mali_l2_cache_core_get_glob_l2_core(cluster_id_pp_grp0), &resource_pp_mmu[0], NULL, &resource_pp[0], MALI_DOMAIN_INDEX_PP0); -+ if (NULL == group) { -+ return _MALI_OSK_ERR_FAULT; -+ } ++ return 0; + -+ mali_inited_pp_cores_group_1++; ++fail: + -+ /* Create groups for rest of the cores in the first PP core group */ -+ for (i = 1; i < 4; i++) { /* First half of the PP cores belong to first core group */ -+ if (mali_inited_pp_cores_group_1 < mali_max_pp_cores_group_1) { -+ if (_MALI_OSK_ERR_OK == resource_pp_found[i] && _MALI_OSK_ERR_OK == resource_pp_mmu_found[i]) { -+ group = mali_create_group(mali_l2_cache_core_get_glob_l2_core(cluster_id_pp_grp0), &resource_pp_mmu[i], NULL, &resource_pp[i], MALI_DOMAIN_INDEX_PP0 + i); -+ if (NULL == group) { -+ return _MALI_OSK_ERR_FAULT; -+ } ++if (kbdev->clock != NULL) { ++ clk_put(kbdev->clock); ++ kbdev->clock = NULL; ++} + -+ mali_inited_pp_cores_group_1++; -+ } -+ } ++#ifdef CONFIG_REGULATOR ++ if (NULL != kbdev->regulator) { ++ regulator_put(kbdev->regulator); ++ kbdev->regulator = NULL; + } ++#endif + -+ /* Create groups for cores in the second PP core group */ -+ for (i = 4; i < 8; i++) { /* Second half of the PP cores belong to second core group */ -+ if (mali_inited_pp_cores_group_2 < mali_max_pp_cores_group_2) { -+ if (_MALI_OSK_ERR_OK == resource_pp_found[i] && _MALI_OSK_ERR_OK == resource_pp_mmu_found[i]) { -+ MALI_DEBUG_ASSERT(mali_l2_cache_core_get_glob_num_l2_cores() >= 2); /* Only Mali-450 have a second core group */ -+ group = mali_create_group(mali_l2_cache_core_get_glob_l2_core(cluster_id_pp_grp1), &resource_pp_mmu[i], NULL, &resource_pp[i], MALI_DOMAIN_INDEX_PP0 + i); -+ if (NULL == group) { -+ return _MALI_OSK_ERR_FAULT; -+ } ++ return err; ++} + -+ mali_inited_pp_cores_group_2++; -+ } -+ } ++static void power_control_term(struct kbase_device *kbdev) ++{ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) || \ ++ defined(LSK_OPPV2_BACKPORT) ++ dev_pm_opp_of_remove_table(kbdev->dev); ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) ++ of_free_opp_table(kbdev->dev); ++#endif ++ ++ if (kbdev->clock) { ++ clk_unprepare(kbdev->clock); ++ clk_put(kbdev->clock); ++ kbdev->clock = NULL; + } + -+ if (mali_is_mali450() || mali_is_mali470()) { -+ _mali_osk_errcode_t err = mali_create_virtual_group(&resource_pp_mmu_bcast, &resource_pp_bcast, &resource_dlbu, &resource_bcast); -+ if (_MALI_OSK_ERR_OK != err) { -+ return err; -+ } ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) && defined(CONFIG_OF) \ ++ && defined(CONFIG_REGULATOR) ++ if (kbdev->regulator) { ++ regulator_put(kbdev->regulator); ++ kbdev->regulator = NULL; + } ++#endif /* LINUX_VERSION_CODE >= 3, 12, 0 */ ++} + -+ mali_max_pp_cores_group_1 = mali_inited_pp_cores_group_1; -+ mali_max_pp_cores_group_2 = mali_inited_pp_cores_group_2; -+ MALI_DEBUG_PRINT(2, ("%d+%d PP cores initialized\n", mali_inited_pp_cores_group_1, mali_inited_pp_cores_group_2)); ++#ifdef CONFIG_DEBUG_FS + -+ return _MALI_OSK_ERR_OK; -+} ++#if KBASE_GPU_RESET_EN ++#include + -+static _mali_osk_errcode_t mali_check_shared_interrupts(void) ++static void trigger_quirks_reload(struct kbase_device *kbdev) +{ -+#if !defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ if (MALI_TRUE == _mali_osk_shared_interrupts()) { -+ MALI_PRINT_ERROR(("Shared interrupts detected, but driver support is not enabled\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } -+#endif /* !defined(CONFIG_MALI_SHARED_INTERRUPTS) */ -+ -+ /* It is OK to compile support for shared interrupts even if Mali is not using it. */ -+ return _MALI_OSK_ERR_OK; ++ kbase_pm_context_active(kbdev); ++ if (kbase_prepare_to_reset_gpu(kbdev)) ++ kbase_reset_gpu(kbdev); ++ kbase_pm_context_idle(kbdev); +} + -+static _mali_osk_errcode_t mali_parse_config_pmu(void) -+{ -+ _mali_osk_resource_t resource_pmu; ++#define MAKE_QUIRK_ACCESSORS(type) \ ++static int type##_quirks_set(void *data, u64 val) \ ++{ \ ++ struct kbase_device *kbdev; \ ++ kbdev = (struct kbase_device *)data; \ ++ kbdev->hw_quirks_##type = (u32)val; \ ++ trigger_quirks_reload(kbdev); \ ++ return 0;\ ++} \ ++\ ++static int type##_quirks_get(void *data, u64 *val) \ ++{ \ ++ struct kbase_device *kbdev;\ ++ kbdev = (struct kbase_device *)data;\ ++ *val = kbdev->hw_quirks_##type;\ ++ return 0;\ ++} \ ++DEFINE_SIMPLE_ATTRIBUTE(fops_##type##_quirks, type##_quirks_get,\ ++ type##_quirks_set, "%llu\n") + -+ MALI_DEBUG_ASSERT(0 != global_gpu_base_address); ++MAKE_QUIRK_ACCESSORS(sc); ++MAKE_QUIRK_ACCESSORS(tiler); ++MAKE_QUIRK_ACCESSORS(mmu); ++MAKE_QUIRK_ACCESSORS(jm); + -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI_OFFSET_PMU, &resource_pmu)) { -+ struct mali_pmu_core *pmu; ++#endif /* KBASE_GPU_RESET_EN */ + -+ pmu = mali_pmu_create(&resource_pmu); -+ if (NULL == pmu) { -+ MALI_PRINT_ERROR(("Failed to create PMU\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ } ++/** ++ * debugfs_protected_debug_mode_read - "protected_debug_mode" debugfs read ++ * @file: File object to read is for ++ * @buf: User buffer to populate with data ++ * @len: Length of user buffer ++ * @ppos: Offset within file object ++ * ++ * Retrieves the current status of protected debug mode ++ * (0 = disabled, 1 = enabled) ++ * ++ * Return: Number of bytes added to user buffer ++ */ ++static ssize_t debugfs_protected_debug_mode_read(struct file *file, ++ char __user *buf, size_t len, loff_t *ppos) ++{ ++ struct kbase_device *kbdev = (struct kbase_device *)file->private_data; ++ u32 gpu_status; ++ ssize_t ret_val; + -+ /* It's ok if the PMU doesn't exist */ -+ return _MALI_OSK_ERR_OK; ++ kbase_pm_context_active(kbdev); ++ gpu_status = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_STATUS), NULL); ++ kbase_pm_context_idle(kbdev); ++ ++ if (gpu_status & GPU_DBGEN) ++ ret_val = simple_read_from_buffer(buf, len, ppos, "1\n", 2); ++ else ++ ret_val = simple_read_from_buffer(buf, len, ppos, "0\n", 2); ++ ++ return ret_val; +} + -+static _mali_osk_errcode_t mali_parse_config_memory(void) -+{ -+ _mali_osk_device_data data = { 0, }; -+ _mali_osk_errcode_t ret; ++/* ++ * struct fops_protected_debug_mode - "protected_debug_mode" debugfs fops ++ * ++ * Contains the file operations for the "protected_debug_mode" debugfs file ++ */ ++static const struct file_operations fops_protected_debug_mode = { ++ .open = simple_open, ++ .read = debugfs_protected_debug_mode_read, ++ .llseek = default_llseek, ++}; + -+ /* The priority of setting the value of mali_shared_mem_size, -+ * mali_dedicated_mem_start and mali_dedicated_mem_size: -+ * 1. module parameter; -+ * 2. platform data; -+ * 3. default value; -+ **/ -+ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { -+ /* Memory settings are not overridden by module parameters, so use device settings */ -+ if (0 == mali_dedicated_mem_start && 0 == mali_dedicated_mem_size) { -+ /* Use device specific settings (if defined) */ -+ mali_dedicated_mem_start = data.dedicated_mem_start; -+ mali_dedicated_mem_size = data.dedicated_mem_size; -+ } ++static int kbase_device_debugfs_init(struct kbase_device *kbdev) ++{ ++ struct dentry *debugfs_ctx_defaults_directory; ++ int err; + -+ if (MALI_SHARED_MEMORY_DEFAULT_SIZE == mali_shared_mem_size && -+ 0 != data.shared_mem_size) { -+ mali_shared_mem_size = data.shared_mem_size; -+ } ++ kbdev->mali_debugfs_directory = debugfs_create_dir(kbdev->devname, ++ NULL); ++ if (!kbdev->mali_debugfs_directory) { ++ dev_err(kbdev->dev, "Couldn't create mali debugfs directory\n"); ++ err = -ENOMEM; ++ goto out; + } + -+ if (0 < mali_dedicated_mem_size && 0 != mali_dedicated_mem_start) { -+ MALI_DEBUG_PRINT(2, ("Mali memory settings (dedicated: 0x%08X@0x%08X)\n", -+ mali_dedicated_mem_size, mali_dedicated_mem_start)); ++ kbdev->debugfs_ctx_directory = debugfs_create_dir("ctx", ++ kbdev->mali_debugfs_directory); ++ if (!kbdev->debugfs_ctx_directory) { ++ dev_err(kbdev->dev, "Couldn't create mali debugfs ctx directory\n"); ++ err = -ENOMEM; ++ goto out; ++ } + -+ /* Dedicated memory */ -+ ret = mali_memory_core_resource_dedicated_memory(mali_dedicated_mem_start, mali_dedicated_mem_size); -+ if (_MALI_OSK_ERR_OK != ret) { -+ MALI_PRINT_ERROR(("Failed to register dedicated memory\n")); -+ mali_memory_terminate(); -+ return ret; -+ } ++ debugfs_ctx_defaults_directory = debugfs_create_dir("defaults", ++ kbdev->debugfs_ctx_directory); ++ if (!debugfs_ctx_defaults_directory) { ++ dev_err(kbdev->dev, "Couldn't create mali debugfs ctx defaults directory\n"); ++ err = -ENOMEM; ++ goto out; + } + -+ if (0 < mali_shared_mem_size) { -+ MALI_DEBUG_PRINT(2, ("Mali memory settings (shared: 0x%08X)\n", mali_shared_mem_size)); ++#if !MALI_CUSTOMER_RELEASE ++ kbasep_regs_dump_debugfs_init(kbdev); ++#endif /* !MALI_CUSTOMER_RELEASE */ ++ kbasep_regs_history_debugfs_init(kbdev); + -+ /* Shared OS memory */ -+ ret = mali_memory_core_resource_os_memory(mali_shared_mem_size); -+ if (_MALI_OSK_ERR_OK != ret) { -+ MALI_PRINT_ERROR(("Failed to register shared OS memory\n")); -+ mali_memory_terminate(); -+ return ret; -+ } -+ } ++ kbase_debug_job_fault_debugfs_init(kbdev); ++ kbasep_gpu_memory_debugfs_init(kbdev); ++ kbase_as_fault_debugfs_init(kbdev); ++#if KBASE_GPU_RESET_EN ++ /* fops_* variables created by invocations of macro ++ * MAKE_QUIRK_ACCESSORS() above. */ ++ debugfs_create_file("quirks_sc", 0644, ++ kbdev->mali_debugfs_directory, kbdev, ++ &fops_sc_quirks); ++ debugfs_create_file("quirks_tiler", 0644, ++ kbdev->mali_debugfs_directory, kbdev, ++ &fops_tiler_quirks); ++ debugfs_create_file("quirks_mmu", 0644, ++ kbdev->mali_debugfs_directory, kbdev, ++ &fops_mmu_quirks); ++ debugfs_create_file("quirks_jm", 0644, ++ kbdev->mali_debugfs_directory, kbdev, ++ &fops_jm_quirks); ++#endif /* KBASE_GPU_RESET_EN */ + -+ if (0 == mali_fb_start && 0 == mali_fb_size) { -+ /* Frame buffer settings are not overridden by module parameters, so use device settings */ -+ _mali_osk_device_data data = { 0, }; ++#ifndef CONFIG_MALI_COH_USER ++ debugfs_create_bool("infinite_cache", 0644, ++ debugfs_ctx_defaults_directory, ++ (bool*)&(kbdev->infinite_cache_active_default)); ++#endif /* CONFIG_MALI_COH_USER */ + -+ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { -+ /* Use device specific settings (if defined) */ -+ mali_fb_start = data.fb_start; -+ mali_fb_size = data.fb_size; -+ } ++ debugfs_create_size_t("mem_pool_max_size", 0644, ++ debugfs_ctx_defaults_directory, ++ &kbdev->mem_pool_max_size_default); + -+ MALI_DEBUG_PRINT(2, ("Using device defined frame buffer settings (0x%08X@0x%08X)\n", -+ mali_fb_size, mali_fb_start)); -+ } else { -+ MALI_DEBUG_PRINT(2, ("Using module defined frame buffer settings (0x%08X@0x%08X)\n", -+ mali_fb_size, mali_fb_start)); ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_DEBUG_MODE)) { ++ debugfs_create_file("protected_debug_mode", S_IRUGO, ++ kbdev->mali_debugfs_directory, kbdev, ++ &fops_protected_debug_mode); + } + -+ if (0 != mali_fb_size) { -+ /* Register frame buffer */ -+ ret = mali_mem_validation_add_range(mali_fb_start, mali_fb_size); -+ if (_MALI_OSK_ERR_OK != ret) { -+ MALI_PRINT_ERROR(("Failed to register frame buffer memory region\n")); -+ mali_memory_terminate(); -+ return ret; -+ } -+ } ++#if KBASE_TRACE_ENABLE ++ kbasep_trace_debugfs_init(kbdev); ++#endif /* KBASE_TRACE_ENABLE */ + -+ return _MALI_OSK_ERR_OK; ++#ifdef CONFIG_MALI_TRACE_TIMELINE ++ kbasep_trace_timeline_debugfs_init(kbdev); ++#endif /* CONFIG_MALI_TRACE_TIMELINE */ ++ ++#ifdef CONFIG_MALI_DEVFREQ ++#ifdef CONFIG_DEVFREQ_THERMAL ++ if (kbdev->inited_subsys & inited_devfreq) ++ kbase_ipa_debugfs_init(kbdev); ++#endif /* CONFIG_DEVFREQ_THERMAL */ ++#endif /* CONFIG_MALI_DEVFREQ */ ++ ++#ifdef CONFIG_DEBUG_FS ++ debugfs_create_file("serialize_jobs", S_IRUGO | S_IWUSR, ++ kbdev->mali_debugfs_directory, kbdev, ++ &kbasep_serialize_jobs_debugfs_fops); ++#endif /* CONFIG_DEBUG_FS */ ++ ++ return 0; ++ ++out: ++ debugfs_remove_recursive(kbdev->mali_debugfs_directory); ++ return err; +} + -+static void mali_detect_gpu_class(void) ++static void kbase_device_debugfs_term(struct kbase_device *kbdev) +{ -+ if (_mali_osk_identify_gpu_resource() == 0x450) -+ mali_gpu_class_is_mali450 = MALI_TRUE; ++ debugfs_remove_recursive(kbdev->mali_debugfs_directory); ++} + -+ if (_mali_osk_identify_gpu_resource() == 0x470) -+ mali_gpu_class_is_mali470 = MALI_TRUE; ++#else /* CONFIG_DEBUG_FS */ ++static inline int kbase_device_debugfs_init(struct kbase_device *kbdev) ++{ ++ return 0; +} + -+static _mali_osk_errcode_t mali_init_hw_reset(void) ++static inline void kbase_device_debugfs_term(struct kbase_device *kbdev) { } ++#endif /* CONFIG_DEBUG_FS */ ++ ++static void kbase_device_coherency_init(struct kbase_device *kbdev, ++ unsigned prod_id) +{ -+#if (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) -+ _mali_osk_resource_t resource_bcast; ++#ifdef CONFIG_OF ++ u32 supported_coherency_bitmap = ++ kbdev->gpu_props.props.raw_props.coherency_mode; ++ const void *coherency_override_dts; ++ u32 override_coherency; + -+ /* Ensure broadcast unit is in a good state before we start creating -+ * groups and cores. ++ /* Only for tMIx : ++ * (COHERENCY_ACE_LITE | COHERENCY_ACE) was incorrectly ++ * documented for tMIx so force correct value here. + */ -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI_OFFSET_BCAST, &resource_bcast)) { -+ struct mali_bcast_unit *bcast_core; ++ if (GPU_ID_IS_NEW_FORMAT(prod_id) && ++ (GPU_ID2_MODEL_MATCH_VALUE(prod_id) == ++ GPU_ID2_PRODUCT_TMIX)) ++ if (supported_coherency_bitmap == ++ COHERENCY_FEATURE_BIT(COHERENCY_ACE)) ++ supported_coherency_bitmap |= ++ COHERENCY_FEATURE_BIT(COHERENCY_ACE_LITE); + -+ bcast_core = mali_bcast_unit_create(&resource_bcast); -+ if (NULL == bcast_core) { -+ MALI_PRINT_ERROR(("Failed to create Broadcast unit object!\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ mali_bcast_unit_delete(bcast_core); ++#endif /* CONFIG_OF */ ++ ++ kbdev->system_coherency = COHERENCY_NONE; ++ ++ /* device tree may override the coherency */ ++#ifdef CONFIG_OF ++ coherency_override_dts = of_get_property(kbdev->dev->of_node, ++ "system-coherency", ++ NULL); ++ if (coherency_override_dts) { ++ ++ override_coherency = be32_to_cpup(coherency_override_dts); ++ ++ if ((override_coherency <= COHERENCY_NONE) && ++ (supported_coherency_bitmap & ++ COHERENCY_FEATURE_BIT(override_coherency))) { ++ ++ kbdev->system_coherency = override_coherency; ++ ++ dev_info(kbdev->dev, ++ "Using coherency mode %u set from dtb", ++ override_coherency); ++ } else ++ dev_warn(kbdev->dev, ++ "Ignoring unsupported coherency mode %u set from dtb", ++ override_coherency); + } -+#endif /* (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) */ + -+ return _MALI_OSK_ERR_OK; ++#endif /* CONFIG_OF */ ++ ++ kbdev->gpu_props.props.raw_props.coherency_mode = ++ kbdev->system_coherency; +} + -+_mali_osk_errcode_t mali_initialize_subsystems(void) ++#ifdef CONFIG_MALI_FPGA_BUS_LOGGER ++ ++/* Callback used by the kbase bus logger client, to initiate a GPU reset ++ * when the bus log is restarted. GPU reset is used as reference point ++ * in HW bus log analyses. ++ */ ++static void kbase_logging_started_cb(void *data) +{ -+ _mali_osk_errcode_t err; ++ struct kbase_device *kbdev = (struct kbase_device *)data; + -+#ifdef CONFIG_MALI_DT -+ err = _mali_osk_resource_initialize(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_terminate_subsystems(); -+ return err; -+ } ++ if (kbase_prepare_to_reset_gpu(kbdev)) ++ kbase_reset_gpu(kbdev); ++ dev_info(kbdev->dev, "KBASE - Bus logger restarted\n"); ++} +#endif + -+ mali_pp_job_initialize(); ++static struct attribute *kbase_attrs[] = { ++#ifdef CONFIG_MALI_DEBUG ++ &dev_attr_debug_command.attr, ++ &dev_attr_js_softstop_always.attr, ++#endif ++#if !MALI_CUSTOMER_RELEASE ++ &dev_attr_force_replay.attr, ++#endif ++ &dev_attr_js_timeouts.attr, ++ &dev_attr_soft_job_timeout.attr, ++ &dev_attr_gpuinfo.attr, ++ &dev_attr_dvfs_period.attr, ++ &dev_attr_pm_poweroff.attr, ++ &dev_attr_reset_timeout.attr, ++ &dev_attr_js_scheduling_period.attr, ++ &dev_attr_power_policy.attr, ++ &dev_attr_core_availability_policy.attr, ++ &dev_attr_core_mask.attr, ++ &dev_attr_mem_pool_size.attr, ++ &dev_attr_mem_pool_max_size.attr, ++ NULL ++}; + -+ err = mali_timeline_initialize(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_terminate_subsystems(); -+ return err; -+ } -+ -+ err = mali_session_initialize(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_terminate_subsystems(); -+ return err; -+ } ++static const struct attribute_group kbase_attr_group = { ++ .attrs = kbase_attrs, ++}; + -+ /*Try to init gpu secure mode */ -+ _mali_osk_gpu_secure_mode_init(); ++static int kbase_platform_device_remove(struct platform_device *pdev) ++{ ++ struct kbase_device *kbdev = to_kbase_device(&pdev->dev); ++ const struct list_head *dev_list; + -+#if defined(CONFIG_MALI400_PROFILING) -+ err = _mali_osk_profiling_init(mali_boot_profiling ? MALI_TRUE : MALI_FALSE); -+ if (_MALI_OSK_ERR_OK != err) { -+ /* No biggie if we weren't able to initialize the profiling */ -+ MALI_PRINT_ERROR(("Failed to initialize profiling, feature will be unavailable\n")); ++ if (!kbdev) ++ return -ENODEV; ++ ++ kfree(kbdev->gpu_props.prop_buffer); ++ ++#ifdef CONFIG_MALI_FPGA_BUS_LOGGER ++ if (kbdev->inited_subsys & inited_buslogger) { ++ bl_core_client_unregister(kbdev->buslogger); ++ kbdev->inited_subsys &= ~inited_buslogger; + } +#endif + -+ err = mali_memory_initialize(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_terminate_subsystems(); -+ return err; -+ } + -+ err = mali_executor_initialize(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_dev_list) { ++ dev_list = kbase_dev_list_get(); ++ list_del(&kbdev->entry); ++ kbase_dev_list_put(dev_list); ++ kbdev->inited_subsys &= ~inited_dev_list; + } + -+ err = mali_scheduler_initialize(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_misc_register) { ++ misc_deregister(&kbdev->mdev); ++ kbdev->inited_subsys &= ~inited_misc_register; + } + -+ /* Configure memory early, needed by mali_mmu_initialize. */ -+ err = mali_parse_config_memory(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_sysfs_group) { ++ sysfs_remove_group(&kbdev->dev->kobj, &kbase_attr_group); ++ kbdev->inited_subsys &= ~inited_sysfs_group; + } + -+ err = mali_set_global_gpu_base_address(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_get_device) { ++ put_device(kbdev->dev); ++ kbdev->inited_subsys &= ~inited_get_device; + } + -+ /* Detect GPU class (uses L2 cache count) */ -+ mali_detect_gpu_class(); -+ -+ err = mali_check_shared_interrupts(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_debugfs) { ++ kbase_device_debugfs_term(kbdev); ++ kbdev->inited_subsys &= ~inited_debugfs; + } + -+ /* Initialize the MALI PMU (will not touch HW!) */ -+ err = mali_parse_config_pmu(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_job_fault) { ++ kbase_debug_job_fault_dev_term(kbdev); ++ kbdev->inited_subsys &= ~inited_job_fault; + } -+ -+ /* Initialize the power management module */ -+ err = mali_pm_initialize(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_vinstr) { ++ kbase_vinstr_term(kbdev->vinstr_ctx); ++ kbdev->inited_subsys &= ~inited_vinstr; + } + -+ /* Make sure the entire GPU stays on for the rest of this function */ -+ mali_pm_init_begin(); ++#ifdef CONFIG_MALI_DEVFREQ ++ if (kbdev->inited_subsys & inited_devfreq) { ++ kbase_devfreq_term(kbdev); ++ kbdev->inited_subsys &= ~inited_devfreq; ++ } ++#endif + -+ /* Ensure HW is in a good state before starting to access cores. */ -+ err = mali_init_hw_reset(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_backend_late) { ++ kbase_backend_late_term(kbdev); ++ kbdev->inited_subsys &= ~inited_backend_late; + } + -+ /* Detect which Mali GPU we are dealing with */ -+ err = mali_parse_product_info(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_pm_init_end(); -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_tlstream) { ++ kbase_tlstream_term(); ++ kbdev->inited_subsys &= ~inited_tlstream; + } + -+ /* The global_product_id is now populated with the correct Mali GPU */ ++ /* Bring job and mem sys to a halt before we continue termination */ + -+ /* Start configuring the actual Mali hardware. */ ++ if (kbdev->inited_subsys & inited_js) ++ kbasep_js_devdata_halt(kbdev); + -+ err = mali_mmu_initialize(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_pm_init_end(); -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_mem) ++ kbase_mem_halt(kbdev); ++ ++ if (kbdev->inited_subsys & inited_protected) { ++ kbasep_protected_mode_term(kbdev); ++ kbdev->inited_subsys &= ~inited_protected; + } + -+ if (mali_is_mali450() || mali_is_mali470()) { -+ err = mali_dlbu_initialize(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_pm_init_end(); -+ mali_terminate_subsystems(); -+ return err; -+ } ++ if (kbdev->inited_subsys & inited_js) { ++ kbasep_js_devdata_term(kbdev); ++ kbdev->inited_subsys &= ~inited_js; + } + -+ err = mali_parse_config_l2_cache(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_pm_init_end(); -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_mem) { ++ kbase_mem_term(kbdev); ++ kbdev->inited_subsys &= ~inited_mem; + } + -+ err = mali_parse_config_groups(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_pm_init_end(); -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_pm_runtime_init) { ++ kbdev->pm.callback_power_runtime_term(kbdev); ++ kbdev->inited_subsys &= ~inited_pm_runtime_init; + } + -+ /* Move groups into executor */ -+ mali_executor_populate(); ++ if (kbdev->inited_subsys & inited_ctx_sched) { ++ kbase_ctx_sched_term(kbdev); ++ kbdev->inited_subsys &= ~inited_ctx_sched; ++ } + -+ /* Need call after all group has assigned a domain */ -+ mali_pm_power_cost_setup(); ++ if (kbdev->inited_subsys & inited_device) { ++ kbase_device_term(kbdev); ++ kbdev->inited_subsys &= ~inited_device; ++ } + -+ /* Initialize the GPU timer */ -+ err = mali_control_timer_init(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_pm_init_end(); -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_backend_early) { ++ kbase_backend_early_term(kbdev); ++ kbdev->inited_subsys &= ~inited_backend_early; + } + -+ /* Initialize the GPU utilization tracking */ -+ err = mali_utilization_init(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_pm_init_end(); -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_io_history) { ++ kbase_io_history_term(&kbdev->io_history); ++ kbdev->inited_subsys &= ~inited_io_history; + } + -+#if defined(CONFIG_MALI_DVFS) -+ err = mali_dvfs_policy_init(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_pm_init_end(); -+ mali_terminate_subsystems(); -+ return err; ++ if (kbdev->inited_subsys & inited_power_control) { ++ power_control_term(kbdev); ++ kbdev->inited_subsys &= ~inited_power_control; + } -+#endif + -+ /* Allowing the system to be turned off */ -+ mali_pm_init_end(); ++ if (kbdev->inited_subsys & inited_registers_map) { ++ registers_unmap(kbdev); ++ kbdev->inited_subsys &= ~inited_registers_map; ++ } + -+ return _MALI_OSK_ERR_OK; /* all ok */ -+} -+ -+void mali_terminate_subsystems(void) -+{ -+ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); -+ -+ MALI_DEBUG_PRINT(2, ("terminate_subsystems() called\n")); -+ -+ mali_utilization_term(); -+ mali_control_timer_term(); -+ -+ mali_executor_depopulate(); -+ mali_delete_groups(); /* Delete groups not added to executor */ -+ mali_executor_terminate(); -+ -+ mali_scheduler_terminate(); -+ mali_pp_job_terminate(); -+ mali_delete_l2_cache_cores(); -+ mali_mmu_terminate(); -+ -+ if (mali_is_mali450() || mali_is_mali470()) { -+ mali_dlbu_terminate(); -+ } -+ -+ mali_pm_terminate(); -+ -+ if (NULL != pmu) { -+ mali_pmu_delete(pmu); ++#ifdef CONFIG_MALI_NO_MALI ++ if (kbdev->inited_subsys & inited_gpu_device) { ++ gpu_device_destroy(kbdev); ++ kbdev->inited_subsys &= ~inited_gpu_device; + } ++#endif /* CONFIG_MALI_NO_MALI */ + -+#if defined(CONFIG_MALI400_PROFILING) -+ _mali_osk_profiling_term(); -+#endif -+ -+ _mali_osk_gpu_secure_mode_deinit(); -+ -+ mali_memory_terminate(); -+ -+ mali_session_terminate(); ++ if (kbdev->inited_subsys != 0) ++ dev_err(kbdev->dev, "Missing sub system termination\n"); + -+ mali_timeline_terminate(); ++ kbase_device_free(kbdev); + -+ global_gpu_base_address = 0; ++ return 0; +} + -+_mali_product_id_t mali_kernel_core_get_product_id(void) ++extern void kbase_platform_rk_shutdown(struct kbase_device *kbdev); ++static void kbase_platform_device_shutdown(struct platform_device *pdev) +{ -+ return global_product_id; -+} ++ struct kbase_device *kbdev = to_kbase_device(&pdev->dev); + -+u32 mali_kernel_core_get_gpu_major_version(void) -+{ -+ return global_gpu_major_version; ++ kbase_platform_rk_shutdown(kbdev); +} + -+u32 mali_kernel_core_get_gpu_minor_version(void) -+{ -+ return global_gpu_minor_version; -+} ++/* Number of register accesses for the buffer that we allocate during ++ * initialization time. The buffer size can be changed later via debugfs. */ ++#define KBASEP_DEFAULT_REGISTER_HISTORY_SIZE ((u16)512) + -+_mali_osk_errcode_t _mali_ukk_get_api_version(_mali_uk_get_api_version_s *args) ++static int kbase_platform_device_probe(struct platform_device *pdev) +{ -+ MALI_DEBUG_ASSERT_POINTER(args); -+ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); ++ struct kbase_device *kbdev; ++ struct mali_base_gpu_core_props *core_props; ++ u32 gpu_id; ++ unsigned prod_id; ++ const struct list_head *dev_list; ++ int err = 0; + -+ /* check compatability */ -+ if (args->version == _MALI_UK_API_VERSION) { -+ args->compatible = 1; -+ } else { -+ args->compatible = 0; ++#ifdef CONFIG_OF ++ err = kbase_platform_early_init(); ++ if (err) { ++ dev_err(&pdev->dev, "Early platform initialization failed\n"); ++ kbase_platform_device_remove(pdev); ++ return err; + } -+ -+ args->version = _MALI_UK_API_VERSION; /* report our version */ -+ -+ /* success regardless of being compatible or not */ -+ MALI_SUCCESS; -+} -+ -+_mali_osk_errcode_t _mali_ukk_get_api_version_v2(_mali_uk_get_api_version_v2_s *args) -+{ -+ MALI_DEBUG_ASSERT_POINTER(args); -+ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); -+ -+ /* check compatability */ -+ if (args->version == _MALI_UK_API_VERSION) { -+ args->compatible = 1; -+ } else { -+ args->compatible = 0; ++#endif ++ kbdev = kbase_device_alloc(); ++ if (!kbdev) { ++ dev_err(&pdev->dev, "Allocate device failed\n"); ++ kbase_platform_device_remove(pdev); ++ return -ENOMEM; + } + -+ args->version = _MALI_UK_API_VERSION; /* report our version */ -+ -+ /* success regardless of being compatible or not */ -+ return _MALI_OSK_ERR_OK; -+} -+ -+_mali_osk_errcode_t _mali_ukk_wait_for_notification(_mali_uk_wait_for_notification_s *args) -+{ -+ _mali_osk_errcode_t err; -+ _mali_osk_notification_t *notification; -+ _mali_osk_notification_queue_t *queue; -+ struct mali_session_data *session; -+ -+ /* check input */ -+ MALI_DEBUG_ASSERT_POINTER(args); -+ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); -+ -+ session = (struct mali_session_data *)(uintptr_t)args->ctx; -+ queue = session->ioctl_queue; ++ kbdev->dev = &pdev->dev; ++ dev_set_drvdata(kbdev->dev, kbdev); + -+ /* if the queue does not exist we're currently shutting down */ -+ if (NULL == queue) { -+ MALI_DEBUG_PRINT(1, ("No notification queue registered with the session. Asking userspace to stop querying\n")); -+ args->type = _MALI_NOTIFICATION_CORE_SHUTDOWN_IN_PROGRESS; -+ return _MALI_OSK_ERR_OK; ++#ifdef CONFIG_MALI_NO_MALI ++ err = gpu_device_create(kbdev); ++ if (err) { ++ dev_err(&pdev->dev, "Dummy model initialization failed\n"); ++ kbase_platform_device_remove(pdev); ++ return err; + } ++ kbdev->inited_subsys |= inited_gpu_device; ++#endif /* CONFIG_MALI_NO_MALI */ + -+ /* receive a notification, might sleep */ -+ err = _mali_osk_notification_queue_receive(queue, ¬ification); -+ if (_MALI_OSK_ERR_OK != err) { -+ MALI_ERROR(err); /* errcode returned, pass on to caller */ ++ err = assign_irqs(pdev); ++ if (err) { ++ dev_err(&pdev->dev, "IRQ search failed\n"); ++ kbase_platform_device_remove(pdev); ++ return err; + } + -+ /* copy the buffer to the user */ -+ args->type = (_mali_uk_notification_type)notification->notification_type; -+ _mali_osk_memcpy(&args->data, notification->result_buffer, notification->result_buffer_size); -+ -+ /* finished with the notification */ -+ _mali_osk_notification_delete(notification); -+ -+ return _MALI_OSK_ERR_OK; /* all ok */ -+} -+ -+_mali_osk_errcode_t _mali_ukk_post_notification(_mali_uk_post_notification_s *args) -+{ -+ _mali_osk_notification_t *notification; -+ _mali_osk_notification_queue_t *queue; -+ struct mali_session_data *session; -+ -+ /* check input */ -+ MALI_DEBUG_ASSERT_POINTER(args); -+ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); -+ -+ session = (struct mali_session_data *)(uintptr_t)args->ctx; -+ queue = session->ioctl_queue; -+ -+ /* if the queue does not exist we're currently shutting down */ -+ if (NULL == queue) { -+ MALI_DEBUG_PRINT(1, ("No notification queue registered with the session. Asking userspace to stop querying\n")); -+ return _MALI_OSK_ERR_OK; ++ err = registers_map(kbdev); ++ if (err) { ++ dev_err(&pdev->dev, "Register map failed\n"); ++ kbase_platform_device_remove(pdev); ++ return err; + } ++ kbdev->inited_subsys |= inited_registers_map; + -+ notification = _mali_osk_notification_create(args->type, 0); -+ if (NULL == notification) { -+ MALI_PRINT_ERROR(("Failed to create notification object\n")); -+ return _MALI_OSK_ERR_NOMEM; ++ err = power_control_init(pdev); ++ if (err) { ++ dev_err(&pdev->dev, "Power control initialization failed\n"); ++ kbase_platform_device_remove(pdev); ++ return err; + } ++ kbdev->inited_subsys |= inited_power_control; + -+ _mali_osk_notification_queue_send(queue, notification); ++ err = kbase_io_history_init(&kbdev->io_history, ++ KBASEP_DEFAULT_REGISTER_HISTORY_SIZE); ++ if (err) { ++ dev_err(&pdev->dev, "Register access history initialization failed\n"); ++ kbase_platform_device_remove(pdev); ++ return -ENOMEM; ++ } ++ kbdev->inited_subsys |= inited_io_history; + -+ return _MALI_OSK_ERR_OK; /* all ok */ -+} ++ err = kbase_backend_early_init(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, "Early backend initialization failed\n"); ++ kbase_platform_device_remove(pdev); ++ return err; ++ } ++ kbdev->inited_subsys |= inited_backend_early; + -+_mali_osk_errcode_t _mali_ukk_pending_submit(_mali_uk_pending_submit_s *args) -+{ -+ wait_queue_head_t *queue; ++ scnprintf(kbdev->devname, DEVNAME_SIZE, "%s%d", kbase_drv_name, ++ kbase_dev_nr); + -+ /* check input */ -+ MALI_DEBUG_ASSERT_POINTER(args); -+ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); ++ kbase_disjoint_init(kbdev); + -+ queue = mali_session_get_wait_queue(); ++ /* obtain min/max configured gpu frequencies */ ++ core_props = &(kbdev->gpu_props.props.core_props); ++ core_props->gpu_freq_khz_min = GPU_FREQ_KHZ_MIN; ++ core_props->gpu_freq_khz_max = GPU_FREQ_KHZ_MAX; + -+ /* check pending big job number, might sleep if larger than MAX allowed number */ -+ if (wait_event_interruptible(*queue, MALI_MAX_PENDING_BIG_JOB > mali_scheduler_job_gp_big_job_count())) { -+ return _MALI_OSK_ERR_RESTARTSYSCALL; ++ err = kbase_device_init(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, "Device initialization failed (%d)\n", err); ++ kbase_platform_device_remove(pdev); ++ return err; + } ++ kbdev->inited_subsys |= inited_device; + -+ return _MALI_OSK_ERR_OK; /* all ok */ -+} -+ -+ -+_mali_osk_errcode_t _mali_ukk_request_high_priority(_mali_uk_request_high_priority_s *args) -+{ -+ struct mali_session_data *session; -+ -+ MALI_DEBUG_ASSERT_POINTER(args); -+ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); ++ err = kbase_ctx_sched_init(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, "Context scheduler initialization failed (%d)\n", ++ err); ++ kbase_platform_device_remove(pdev); ++ return err; ++ } ++ kbdev->inited_subsys |= inited_ctx_sched; + -+ session = (struct mali_session_data *)(uintptr_t)args->ctx; ++ if (kbdev->pm.callback_power_runtime_init) { ++ err = kbdev->pm.callback_power_runtime_init(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, ++ "Runtime PM initialization failed\n"); ++ kbase_platform_device_remove(pdev); ++ return err; ++ } ++ kbdev->inited_subsys |= inited_pm_runtime_init; ++ } + -+ if (!session->use_high_priority_job_queue) { -+ session->use_high_priority_job_queue = MALI_TRUE; -+ MALI_DEBUG_PRINT(2, ("Session 0x%08X with pid %d was granted higher priority.\n", session, _mali_osk_get_pid())); ++ err = kbase_mem_init(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, "Memory subsystem initialization failed\n"); ++ kbase_platform_device_remove(pdev); ++ return err; + } ++ kbdev->inited_subsys |= inited_mem; + -+ return _MALI_OSK_ERR_OK; -+} ++ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++ gpu_id &= GPU_ID_VERSION_PRODUCT_ID; ++ prod_id = gpu_id >> GPU_ID_VERSION_PRODUCT_ID_SHIFT; + -+_mali_osk_errcode_t _mali_ukk_open(void **context) -+{ -+ u32 i; -+ struct mali_session_data *session; ++ kbase_device_coherency_init(kbdev, prod_id); + -+ /* allocated struct to track this session */ -+ session = (struct mali_session_data *)_mali_osk_calloc(1, sizeof(struct mali_session_data)); -+ MALI_CHECK_NON_NULL(session, _MALI_OSK_ERR_NOMEM); ++ err = kbasep_protected_mode_init(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, "Protected mode subsystem initialization failed\n"); ++ kbase_platform_device_remove(pdev); ++ return err; ++ } ++ kbdev->inited_subsys |= inited_protected; + -+ MALI_DEBUG_PRINT(3, ("Session starting\n")); ++ dev_list = kbase_dev_list_get(); ++ list_add(&kbdev->entry, &kbase_dev_list); ++ kbase_dev_list_put(dev_list); ++ kbdev->inited_subsys |= inited_dev_list; + -+ /* create a response queue for this session */ -+ session->ioctl_queue = _mali_osk_notification_queue_init(); -+ if (NULL == session->ioctl_queue) { -+ goto err; ++ err = kbasep_js_devdata_init(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, "Job JS devdata initialization failed\n"); ++ kbase_platform_device_remove(pdev); ++ return err; + } ++ kbdev->inited_subsys |= inited_js; + -+ /*create a wait queue for this session */ -+ session->wait_queue = _mali_osk_wait_queue_init(); -+ if (NULL == session->wait_queue) { -+ goto err_wait_queue; ++ err = kbase_tlstream_init(); ++ if (err) { ++ dev_err(kbdev->dev, "Timeline stream initialization failed\n"); ++ kbase_platform_device_remove(pdev); ++ return err; + } ++ kbdev->inited_subsys |= inited_tlstream; + -+ session->page_directory = mali_mmu_pagedir_alloc(); -+ if (NULL == session->page_directory) { -+ goto err_mmu; ++ err = kbase_backend_late_init(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, "Late backend initialization failed\n"); ++ kbase_platform_device_remove(pdev); ++ return err; + } ++ kbdev->inited_subsys |= inited_backend_late; + -+ if (_MALI_OSK_ERR_OK != mali_mmu_pagedir_map(session->page_directory, MALI_DLBU_VIRT_ADDR, _MALI_OSK_MALI_PAGE_SIZE)) { -+ MALI_PRINT_ERROR(("Failed to map DLBU page into session\n")); -+ goto err_mmu; -+ } ++#ifdef CONFIG_MALI_DEVFREQ ++ err = kbase_devfreq_init(kbdev); ++ if (!err) ++ kbdev->inited_subsys |= inited_devfreq; ++ else ++ dev_err(kbdev->dev, "Continuing without devfreq\n"); ++#endif /* CONFIG_MALI_DEVFREQ */ + -+ if (0 != mali_dlbu_phys_addr) { -+ mali_mmu_pagedir_update(session->page_directory, MALI_DLBU_VIRT_ADDR, mali_dlbu_phys_addr, -+ _MALI_OSK_MALI_PAGE_SIZE, MALI_MMU_FLAGS_DEFAULT); ++ kbdev->vinstr_ctx = kbase_vinstr_init(kbdev); ++ if (!kbdev->vinstr_ctx) { ++ dev_err(kbdev->dev, ++ "Virtual instrumentation initialization failed\n"); ++ kbase_platform_device_remove(pdev); ++ return -EINVAL; + } ++ kbdev->inited_subsys |= inited_vinstr; + -+ if (_MALI_OSK_ERR_OK != mali_memory_session_begin(session)) { -+ goto err_session; ++ err = kbase_debug_job_fault_dev_init(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, "Job fault debug initialization failed\n"); ++ kbase_platform_device_remove(pdev); ++ return err; + } ++ kbdev->inited_subsys |= inited_job_fault; + -+ /* Create soft system. */ -+ session->soft_job_system = mali_soft_job_system_create(session); -+ if (NULL == session->soft_job_system) { -+ goto err_soft; ++ err = kbase_device_debugfs_init(kbdev); ++ if (err) { ++ dev_err(kbdev->dev, "DebugFS initialization failed"); ++ kbase_platform_device_remove(pdev); ++ return err; + } ++ kbdev->inited_subsys |= inited_debugfs; + -+ /* Initialize the dma fence context.*/ -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ session->fence_context = dma_fence_context_alloc(1); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) -+ session->fence_context = fence_context_alloc(1); -+ _mali_osk_atomic_init(&session->fence_seqno, 0); -+#else -+ MALI_PRINT_ERROR(("The kernel version not support dma fence!\n")); -+ goto err_time_line; -+#endif -+#endif ++ /* initialize the kctx list */ ++ mutex_init(&kbdev->kctx_list_lock); ++ INIT_LIST_HEAD(&kbdev->kctx_list); + -+ /* Create timeline system. */ -+ session->timeline_system = mali_timeline_system_create(session); -+ if (NULL == session->timeline_system) { -+ goto err_time_line; -+ } ++ kbdev->mdev.minor = MISC_DYNAMIC_MINOR; ++ kbdev->mdev.name = kbdev->devname; ++ kbdev->mdev.fops = &kbase_fops; ++ kbdev->mdev.parent = get_device(kbdev->dev); ++ kbdev->inited_subsys |= inited_get_device; + -+#if defined(CONFIG_MALI_DVFS) -+ _mali_osk_atomic_init(&session->number_of_window_jobs, 0); -+#endif ++ /* This needs to happen before registering the device with misc_register(), ++ * otherwise it causes a race condition between registering the device and a ++ * uevent event being generated for userspace, causing udev rules to run ++ * which might expect certain sysfs attributes present. As a result of the ++ * race condition we avoid, some Mali sysfs entries may have appeared to ++ * udev to not exist. + -+ _mali_osk_atomic_init(&session->number_of_pp_jobs, 0); ++ * For more information, see ++ * https://www.kernel.org/doc/Documentation/driver-model/device.txt, the ++ * paragraph that starts with "Word of warning", currently the second-last ++ * paragraph. ++ */ ++ err = sysfs_create_group(&kbdev->dev->kobj, &kbase_attr_group); ++ if (err) { ++ dev_err(&pdev->dev, "SysFS group creation failed\n"); ++ kbase_platform_device_remove(pdev); ++ return err; ++ } ++ kbdev->inited_subsys |= inited_sysfs_group; + -+ session->use_high_priority_job_queue = MALI_FALSE; ++ err = misc_register(&kbdev->mdev); ++ if (err) { ++ dev_err(kbdev->dev, "Misc device registration failed for %s\n", ++ kbdev->devname); ++ kbase_platform_device_remove(pdev); ++ return err; ++ } ++ kbdev->inited_subsys |= inited_misc_register; + -+ /* Initialize list of PP jobs on this session. */ -+ _MALI_OSK_INIT_LIST_HEAD(&session->pp_job_list); + -+ /* Initialize the pp_job_fb_lookup_list array used to quickly lookup jobs from a given frame builder */ -+ for (i = 0; i < MALI_PP_JOB_FB_LOOKUP_LIST_SIZE; ++i) { -+ _MALI_OSK_INIT_LIST_HEAD(&session->pp_job_fb_lookup_list[i]); ++#ifdef CONFIG_MALI_FPGA_BUS_LOGGER ++ err = bl_core_client_register(kbdev->devname, ++ kbase_logging_started_cb, ++ kbdev, &kbdev->buslogger, ++ THIS_MODULE, NULL); ++ if (err == 0) { ++ kbdev->inited_subsys |= inited_buslogger; ++ bl_core_set_threshold(kbdev->buslogger, 1024*1024*1024); ++ } else { ++ dev_warn(kbdev->dev, "Bus log client registration failed\n"); ++ err = 0; + } ++#endif + -+ session->pid = _mali_osk_get_pid(); -+ session->comm = _mali_osk_get_comm(); -+ session->max_mali_mem_allocated_size = 0; -+ for (i = 0; i < MALI_MEM_TYPE_MAX; i ++) { -+ atomic_set(&session->mali_mem_array[i], 0); ++ err = kbase_gpuprops_populate_user_buffer(kbdev); ++ if (err) { ++ dev_err(&pdev->dev, "GPU property population failed"); ++ kbase_platform_device_remove(pdev); ++ return err; + } -+ atomic_set(&session->mali_mem_allocated_pages, 0); -+ *context = (void *)session; + -+ /* Add session to the list of all sessions. */ -+ mali_session_add(session); -+ -+ MALI_DEBUG_PRINT(3, ("Session started\n")); -+ return _MALI_OSK_ERR_OK; ++ dev_info(kbdev->dev, ++ "Probed as %s\n", dev_name(kbdev->mdev.this_device)); + -+err_time_line: -+ mali_soft_job_system_destroy(session->soft_job_system); -+err_soft: -+ mali_memory_session_end(session); -+err_session: -+ mali_mmu_pagedir_free(session->page_directory); -+err_mmu: -+ _mali_osk_wait_queue_term(session->wait_queue); -+err_wait_queue: -+ _mali_osk_notification_queue_term(session->ioctl_queue); -+err: -+ _mali_osk_free(session); -+ MALI_ERROR(_MALI_OSK_ERR_NOMEM); ++ kbase_dev_nr++; + ++ return err; +} + -+#if defined(DEBUG) -+/* parameter used for debug */ -+extern u32 num_pm_runtime_resume; -+extern u32 num_pm_updates; -+extern u32 num_pm_updates_up; -+extern u32 num_pm_updates_down; -+#endif ++#undef KBASEP_DEFAULT_REGISTER_HISTORY_SIZE + -+_mali_osk_errcode_t _mali_ukk_close(void **context) ++/** ++ * kbase_device_suspend - Suspend callback from the OS. ++ * ++ * This is called by Linux when the device should suspend. ++ * ++ * @dev: The device to suspend ++ * ++ * Return: A standard Linux error code ++ */ ++static int kbase_device_suspend(struct device *dev) +{ -+ struct mali_session_data *session; -+ MALI_CHECK_NON_NULL(context, _MALI_OSK_ERR_INVALID_ARGS); -+ session = (struct mali_session_data *)*context; ++ struct kbase_device *kbdev = to_kbase_device(dev); + -+ MALI_DEBUG_PRINT(3, ("Session ending\n")); ++ if (!kbdev) ++ return -ENODEV; + -+ MALI_DEBUG_ASSERT_POINTER(session->soft_job_system); -+ MALI_DEBUG_ASSERT_POINTER(session->timeline_system); ++#if defined(CONFIG_MALI_DEVFREQ) && \ ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) ++ if (kbdev->inited_subsys & inited_devfreq) ++ devfreq_suspend_device(kbdev->devfreq); ++#endif + -+ /* Remove session from list of all sessions. */ -+ mali_session_remove(session); ++ kbase_pm_suspend(kbdev); ++ return 0; ++} + -+ /* This flag is used to prevent queueing of jobs due to activation. */ -+ session->is_aborting = MALI_TRUE; ++/** ++ * kbase_device_resume - Resume callback from the OS. ++ * ++ * This is called by Linux when the device should resume from suspension. ++ * ++ * @dev: The device to resume ++ * ++ * Return: A standard Linux error code ++ */ ++static int kbase_device_resume(struct device *dev) ++{ ++ struct kbase_device *kbdev = to_kbase_device(dev); + -+ /* Stop the soft job timer. */ -+ mali_timeline_system_stop_timer(session->timeline_system); ++ if (!kbdev) ++ return -ENODEV; + -+ /* Abort queued jobs */ -+ mali_scheduler_abort_session(session); ++ kbase_pm_resume(kbdev); + -+ /* Abort executing jobs */ -+ mali_executor_abort_session(session); ++#if defined(CONFIG_MALI_DEVFREQ) && \ ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) ++ if (kbdev->inited_subsys & inited_devfreq) ++ devfreq_resume_device(kbdev->devfreq); ++#endif ++ return 0; ++} + -+ /* Abort the soft job system. */ -+ mali_soft_job_system_abort(session->soft_job_system); ++/** ++ * kbase_device_runtime_suspend - Runtime suspend callback from the OS. ++ * ++ * This is called by Linux when the device should prepare for a condition in ++ * which it will not be able to communicate with the CPU(s) and RAM due to ++ * power management. ++ * ++ * @dev: The device to suspend ++ * ++ * Return: A standard Linux error code ++ */ ++#ifdef KBASE_PM_RUNTIME ++static int kbase_device_runtime_suspend(struct device *dev) ++{ ++ struct kbase_device *kbdev = to_kbase_device(dev); + -+ /* Force execution of all pending bottom half processing for GP and PP. */ -+ _mali_osk_wq_flush(); ++ if (!kbdev) ++ return -ENODEV; + -+ /* The session PP list should now be empty. */ -+ MALI_DEBUG_ASSERT(_mali_osk_list_empty(&session->pp_job_list)); ++#if defined(CONFIG_MALI_DEVFREQ) && \ ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) ++ if (kbdev->inited_subsys & inited_devfreq) ++ devfreq_suspend_device(kbdev->devfreq); ++#endif + -+ /* At this point the GP and PP scheduler no longer has any jobs queued or running from this -+ * session, and all soft jobs in the soft job system has been destroyed. */ ++ if (kbdev->pm.backend.callback_power_runtime_off) { ++ kbdev->pm.backend.callback_power_runtime_off(kbdev); ++ dev_dbg(dev, "runtime suspend\n"); ++ } ++ return 0; ++} ++#endif /* KBASE_PM_RUNTIME */ + -+ /* Any trackers left in the timeline system are directly or indirectly waiting on external -+ * sync fences. Cancel all sync fence waiters to trigger activation of all remaining -+ * trackers. This call will sleep until all timelines are empty. */ -+ mali_timeline_system_abort(session->timeline_system); ++/** ++ * kbase_device_runtime_resume - Runtime resume callback from the OS. ++ * ++ * This is called by Linux when the device should go into a fully active state. ++ * ++ * @dev: The device to suspend ++ * ++ * Return: A standard Linux error code ++ */ + -+ /* Flush pending work. -+ * Needed to make sure all bottom half processing related to this -+ * session has been completed, before we free internal data structures. -+ */ -+ _mali_osk_wq_flush(); ++#ifdef KBASE_PM_RUNTIME ++static int kbase_device_runtime_resume(struct device *dev) ++{ ++ int ret = 0; ++ struct kbase_device *kbdev = to_kbase_device(dev); + -+ /* Destroy timeline system. */ -+ mali_timeline_system_destroy(session->timeline_system); -+ session->timeline_system = NULL; ++ if (!kbdev) ++ return -ENODEV; + -+ /* Destroy soft system. */ -+ mali_soft_job_system_destroy(session->soft_job_system); -+ session->soft_job_system = NULL; ++ if (kbdev->pm.backend.callback_power_runtime_on) { ++ ret = kbdev->pm.backend.callback_power_runtime_on(kbdev); ++ dev_dbg(dev, "runtime resume\n"); ++ } + -+ /*Wait for the session job lists become empty.*/ -+ _mali_osk_wait_queue_wait_event(session->wait_queue, mali_session_pp_job_is_empty, (void *) session); ++#if defined(CONFIG_MALI_DEVFREQ) && \ ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) ++ if (kbdev->inited_subsys & inited_devfreq) ++ devfreq_resume_device(kbdev->devfreq); ++#endif + -+ /* Free remaining memory allocated to this session */ -+ mali_memory_session_end(session); ++ return ret; ++} ++#endif /* KBASE_PM_RUNTIME */ + -+#if defined(CONFIG_MALI_DVFS) -+ _mali_osk_atomic_term(&session->number_of_window_jobs); -+#endif + -+#if defined(CONFIG_MALI400_PROFILING) -+ _mali_osk_profiling_stop_sampling(session->pid); -+#endif ++#ifdef KBASE_PM_RUNTIME ++/** ++ * kbase_device_runtime_idle - Runtime idle callback from the OS. ++ * @dev: The device to suspend ++ * ++ * This is called by Linux when the device appears to be inactive and it might ++ * be placed into a low power state. ++ * ++ * Return: 0 if device can be suspended, non-zero to avoid runtime autosuspend, ++ * otherwise a standard Linux error code ++ */ ++static int kbase_device_runtime_idle(struct device *dev) ++{ ++ struct kbase_device *kbdev = to_kbase_device(dev); + -+ /* Free session data structures */ -+ mali_mmu_pagedir_unmap(session->page_directory, MALI_DLBU_VIRT_ADDR, _MALI_OSK_MALI_PAGE_SIZE); -+ mali_mmu_pagedir_free(session->page_directory); -+ _mali_osk_wait_queue_term(session->wait_queue); -+ _mali_osk_notification_queue_term(session->ioctl_queue); -+ _mali_osk_free(session); ++ if (!kbdev) ++ return -ENODEV; + -+ *context = NULL; ++ /* Use platform specific implementation if it exists. */ ++ if (kbdev->pm.backend.callback_power_runtime_idle) ++ return kbdev->pm.backend.callback_power_runtime_idle(kbdev); + -+ MALI_DEBUG_PRINT(3, ("Session has ended\n")); ++ return 0; ++} ++#endif /* KBASE_PM_RUNTIME */ + -+#if defined(DEBUG) -+ MALI_DEBUG_PRINT(3, ("Stats: # runtime resumes: %u\n", num_pm_runtime_resume)); -+ MALI_DEBUG_PRINT(3, (" # PM updates: .... %u (up %u, down %u)\n", num_pm_updates, num_pm_updates_up, num_pm_updates_down)); ++/* The power management operations for the platform driver. ++ */ ++static const struct dev_pm_ops kbase_pm_ops = { ++ .suspend = kbase_device_suspend, ++ .resume = kbase_device_resume, ++#ifdef KBASE_PM_RUNTIME ++ .runtime_suspend = kbase_device_runtime_suspend, ++ .runtime_resume = kbase_device_runtime_resume, ++ .runtime_idle = kbase_device_runtime_idle, ++#endif /* KBASE_PM_RUNTIME */ ++}; + -+ num_pm_runtime_resume = 0; -+ num_pm_updates = 0; -+ num_pm_updates_up = 0; -+ num_pm_updates_down = 0; ++#ifdef CONFIG_OF ++static const struct of_device_id kbase_dt_ids[] = { ++ { .compatible = "arm,malit7xx" }, ++ { .compatible = "arm,mali-midgard" }, ++ { /* sentinel */ } ++}; ++MODULE_DEVICE_TABLE(of, kbase_dt_ids); +#endif + -+ return _MALI_OSK_ERR_OK;; ++static struct platform_driver kbase_platform_driver = { ++ .probe = kbase_platform_device_probe, ++ .remove = kbase_platform_device_remove, ++ .shutdown = kbase_platform_device_shutdown, ++ .driver = { ++ .name = "midgard", ++ .owner = THIS_MODULE, ++ .pm = &kbase_pm_ops, ++ .of_match_table = of_match_ptr(kbase_dt_ids), ++ }, ++}; ++ ++/* ++ * The driver will not provide a shortcut to create the Mali platform device ++ * anymore when using Device Tree. ++ */ ++#ifdef CONFIG_OF ++module_platform_driver(kbase_platform_driver); ++#else ++ ++static int __init rockchip_gpu_init_driver(void) ++{ ++ return platform_driver_register(&kbase_platform_driver); +} ++late_initcall(rockchip_gpu_init_driver); + -+#if MALI_STATE_TRACKING -+u32 _mali_kernel_core_dump_state(char *buf, u32 size) ++static int __init kbase_driver_init(void) +{ -+ int n = 0; /* Number of bytes written to buf */ ++ int ret; + -+ n += mali_scheduler_dump_state(buf + n, size - n); -+ n += mali_executor_dump_state(buf + n, size - n); ++ ret = kbase_platform_early_init(); ++ if (ret) ++ return ret; + -+ return n; ++#ifdef CONFIG_MALI_PLATFORM_FAKE ++ ret = kbase_platform_fake_register(); ++ if (ret) ++ return ret; ++#endif ++ ret = platform_driver_register(&kbase_platform_driver); ++#ifdef CONFIG_MALI_PLATFORM_FAKE ++ if (ret) ++ kbase_platform_fake_unregister(); ++#endif ++ return ret; +} ++ ++static void __exit kbase_driver_exit(void) ++{ ++ platform_driver_unregister(&kbase_platform_driver); ++#ifdef CONFIG_MALI_PLATFORM_FAKE ++ kbase_platform_fake_unregister(); +#endif -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h -new file mode 100755 -index 000000000000..c471fc955107 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h -@@ -0,0 +1,57 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++} + -+#ifndef __MALI_KERNEL_CORE_H__ -+#define __MALI_KERNEL_CORE_H__ ++module_init(kbase_driver_init); ++module_exit(kbase_driver_exit); + -+#include "mali_osk.h" ++#endif /* CONFIG_OF */ + -+typedef enum { -+ _MALI_PRODUCT_ID_UNKNOWN, -+ _MALI_PRODUCT_ID_MALI200, -+ _MALI_PRODUCT_ID_MALI300, -+ _MALI_PRODUCT_ID_MALI400, -+ _MALI_PRODUCT_ID_MALI450, -+ _MALI_PRODUCT_ID_MALI470, -+} _mali_product_id_t; ++MODULE_LICENSE("GPL"); ++MODULE_VERSION(MALI_RELEASE_NAME " (UK version " \ ++ __stringify(BASE_UK_VERSION_MAJOR) "." \ ++ __stringify(BASE_UK_VERSION_MINOR) ")"); + -+extern mali_bool mali_gpu_class_is_mali450; -+extern mali_bool mali_gpu_class_is_mali470; ++#if defined(CONFIG_MALI_GATOR_SUPPORT) || defined(CONFIG_MALI_SYSTEM_TRACE) ++#define CREATE_TRACE_POINTS ++#endif + -+_mali_osk_errcode_t mali_initialize_subsystems(void); ++#ifdef CONFIG_MALI_GATOR_SUPPORT ++/* Create the trace points (otherwise we just get code to call a tracepoint) */ ++#include "mali_linux_trace.h" + -+void mali_terminate_subsystems(void); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_job_slots_event); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_pm_status); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_pm_power_on); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_pm_power_off); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_page_fault_insert_pages); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_mmu_as_in_use); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_mmu_as_released); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_total_alloc_pages_change); + -+_mali_product_id_t mali_kernel_core_get_product_id(void); ++void kbase_trace_mali_pm_status(u32 event, u64 value) ++{ ++ trace_mali_pm_status(event, value); ++} + -+u32 mali_kernel_core_get_gpu_major_version(void); ++void kbase_trace_mali_pm_power_off(u32 event, u64 value) ++{ ++ trace_mali_pm_power_off(event, value); ++} + -+u32 mali_kernel_core_get_gpu_minor_version(void); ++void kbase_trace_mali_pm_power_on(u32 event, u64 value) ++{ ++ trace_mali_pm_power_on(event, value); ++} + -+u32 _mali_kernel_core_dump_state(char *buf, u32 size); ++void kbase_trace_mali_job_slots_event(u32 event, const struct kbase_context *kctx, u8 atom_id) ++{ ++ trace_mali_job_slots_event(event, (kctx != NULL ? kctx->tgid : 0), (kctx != NULL ? kctx->pid : 0), atom_id); ++} + -+MALI_STATIC_INLINE mali_bool mali_is_mali470(void) ++void kbase_trace_mali_page_fault_insert_pages(int event, u32 value) +{ -+ return mali_gpu_class_is_mali470; ++ trace_mali_page_fault_insert_pages(event, value); +} + -+MALI_STATIC_INLINE mali_bool mali_is_mali450(void) ++void kbase_trace_mali_mmu_as_in_use(int event) +{ -+ return mali_gpu_class_is_mali450; ++ trace_mali_mmu_as_in_use(event); +} + -+MALI_STATIC_INLINE mali_bool mali_is_mali400(void) ++void kbase_trace_mali_mmu_as_released(int event) +{ -+ if (mali_gpu_class_is_mali450 || mali_gpu_class_is_mali470) -+ return MALI_FALSE; ++ trace_mali_mmu_as_released(event); ++} + -+ return MALI_TRUE; ++void kbase_trace_mali_total_alloc_pages_change(long long int event) ++{ ++ trace_mali_total_alloc_pages_change(event); +} -+#endif /* __MALI_KERNEL_CORE_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c ++#endif /* CONFIG_MALI_GATOR_SUPPORT */ ++#ifdef CONFIG_MALI_SYSTEM_TRACE ++#include "mali_linux_kbase_trace.h" ++#endif +diff --git a/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c new file mode 100755 -index 000000000000..d1b8dc3b0b0e +index 000000000..ce0048414 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c -@@ -0,0 +1,440 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c +@@ -0,0 +1,208 @@ +/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include "mali_kernel_utilization.h" -+#include "mali_osk.h" -+#include "mali_osk_mali.h" -+#include "mali_kernel_common.h" -+#include "mali_session.h" -+#include "mali_scheduler.h" -+ -+#include "mali_executor.h" -+#include "mali_dvfs_policy.h" -+#include "mali_control_timer.h" -+ -+/* Thresholds for GP bound detection. */ -+#define MALI_GP_BOUND_GP_UTILIZATION_THRESHOLD 240 -+#define MALI_GP_BOUND_PP_UTILIZATION_THRESHOLD 250 -+ -+static _mali_osk_spinlock_irq_t *utilization_data_lock; -+ -+static u32 num_running_gp_cores = 0; -+static u32 num_running_pp_cores = 0; -+ -+static u64 work_start_time_gpu = 0; -+static u64 work_start_time_gp = 0; -+static u64 work_start_time_pp = 0; -+static u64 accumulated_work_time_gpu = 0; -+static u64 accumulated_work_time_gp = 0; -+static u64 accumulated_work_time_pp = 0; + -+static u32 last_utilization_gpu = 0 ; -+static u32 last_utilization_gp = 0 ; -+static u32 last_utilization_pp = 0 ; + -+void (*mali_utilization_callback)(struct mali_gpu_utilization_data *data) = NULL; ++#include ++#include + -+/* Define the first timer control timer timeout in milliseconds */ -+static u32 mali_control_first_timeout = 100; -+static struct mali_gpu_utilization_data mali_util_data = {0, }; ++#include "mali_kbase_ctx_sched.h" + -+struct mali_gpu_utilization_data *mali_utilization_calculate(u64 *start_time, u64 *time_period, mali_bool *need_add_timer) ++int kbase_ctx_sched_init(struct kbase_device *kbdev) +{ -+ u64 time_now; -+ u32 leading_zeroes; -+ u32 shift_val; -+ u32 work_normalized_gpu; -+ u32 work_normalized_gp; -+ u32 work_normalized_pp; -+ u32 period_normalized; -+ u32 utilization_gpu; -+ u32 utilization_gp; -+ u32 utilization_pp; -+ -+ mali_utilization_data_lock(); -+ -+ time_now = _mali_osk_time_get_ns(); -+ -+ *time_period = time_now - *start_time; -+ -+ if (accumulated_work_time_gpu == 0 && work_start_time_gpu == 0) { -+ mali_control_timer_pause(); -+ /* -+ * No work done for this period -+ * - No need to reschedule timer -+ * - Report zero usage -+ */ -+ last_utilization_gpu = 0; -+ last_utilization_gp = 0; -+ last_utilization_pp = 0; -+ -+ mali_util_data.utilization_gpu = last_utilization_gpu; -+ mali_util_data.utilization_gp = last_utilization_gp; -+ mali_util_data.utilization_pp = last_utilization_pp; -+ -+ mali_utilization_data_unlock(); -+ -+ *need_add_timer = MALI_FALSE; -+ -+ mali_executor_hint_disable(MALI_EXECUTOR_HINT_GP_BOUND); -+ -+ MALI_DEBUG_PRINT(4, ("last_utilization_gpu = %d \n", last_utilization_gpu)); -+ MALI_DEBUG_PRINT(4, ("last_utilization_gp = %d \n", last_utilization_gp)); -+ MALI_DEBUG_PRINT(4, ("last_utilization_pp = %d \n", last_utilization_pp)); -+ -+ return &mali_util_data; -+ } -+ -+ /* If we are currently busy, update working period up to now */ -+ if (work_start_time_gpu != 0) { -+ accumulated_work_time_gpu += (time_now - work_start_time_gpu); -+ work_start_time_gpu = time_now; -+ -+ /* GP and/or PP will also be busy if the GPU is busy at this point */ ++ int as_present = (1U << kbdev->nr_hw_address_spaces) - 1; + -+ if (work_start_time_gp != 0) { -+ accumulated_work_time_gp += (time_now - work_start_time_gp); -+ work_start_time_gp = time_now; -+ } ++ /* These two must be recalculated if nr_hw_address_spaces changes ++ * (e.g. for HW workarounds) */ ++ kbdev->nr_user_address_spaces = kbdev->nr_hw_address_spaces; ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987)) { ++ bool use_workaround; + -+ if (work_start_time_pp != 0) { -+ accumulated_work_time_pp += (time_now - work_start_time_pp); -+ work_start_time_pp = time_now; ++ use_workaround = DEFAULT_SECURE_BUT_LOSS_OF_PERFORMANCE; ++ if (use_workaround) { ++ dev_dbg(kbdev->dev, "GPU has HW ISSUE 8987, and driver configured for security workaround: 1 address space only"); ++ kbdev->nr_user_address_spaces = 1; + } + } + -+ /* -+ * We have two 64-bit values, a dividend and a divisor. -+ * To avoid dependencies to a 64-bit divider, we shift down the two values -+ * equally first. -+ * We shift the dividend up and possibly the divisor down, making the result X in 256. -+ */ -+ -+ /* Shift the 64-bit values down so they fit inside a 32-bit integer */ -+ leading_zeroes = _mali_osk_clz((u32)(*time_period >> 32)); -+ shift_val = 32 - leading_zeroes; -+ work_normalized_gpu = (u32)(accumulated_work_time_gpu >> shift_val); -+ work_normalized_gp = (u32)(accumulated_work_time_gp >> shift_val); -+ work_normalized_pp = (u32)(accumulated_work_time_pp >> shift_val); -+ period_normalized = (u32)(*time_period >> shift_val); -+ -+ /* -+ * Now, we should report the usage in parts of 256 -+ * this means we must shift up the dividend or down the divisor by 8 -+ * (we could do a combination, but we just use one for simplicity, -+ * but the end result should be good enough anyway) -+ */ -+ if (period_normalized > 0x00FFFFFF) { -+ /* The divisor is so big that it is safe to shift it down */ -+ period_normalized >>= 8; -+ } else { -+ /* -+ * The divisor is so small that we can shift up the dividend, without loosing any data. -+ * (dividend is always smaller than the divisor) -+ */ -+ work_normalized_gpu <<= 8; -+ work_normalized_gp <<= 8; -+ work_normalized_pp <<= 8; -+ } -+ -+ utilization_gpu = work_normalized_gpu / period_normalized; -+ utilization_gp = work_normalized_gp / period_normalized; -+ utilization_pp = work_normalized_pp / period_normalized; -+ -+ last_utilization_gpu = utilization_gpu; -+ last_utilization_gp = utilization_gp; -+ last_utilization_pp = utilization_pp; -+ -+ if ((MALI_GP_BOUND_GP_UTILIZATION_THRESHOLD < last_utilization_gp) && -+ (MALI_GP_BOUND_PP_UTILIZATION_THRESHOLD > last_utilization_pp)) { -+ mali_executor_hint_enable(MALI_EXECUTOR_HINT_GP_BOUND); -+ } else { -+ mali_executor_hint_disable(MALI_EXECUTOR_HINT_GP_BOUND); -+ } -+ -+ /* starting a new period */ -+ accumulated_work_time_gpu = 0; -+ accumulated_work_time_gp = 0; -+ accumulated_work_time_pp = 0; -+ -+ *start_time = time_now; -+ -+ mali_util_data.utilization_gp = last_utilization_gp; -+ mali_util_data.utilization_gpu = last_utilization_gpu; -+ mali_util_data.utilization_pp = last_utilization_pp; -+ -+ mali_utilization_data_unlock(); -+ -+ *need_add_timer = MALI_TRUE; ++ kbdev->as_free = as_present; /* All ASs initially free */ + -+ MALI_DEBUG_PRINT(4, ("last_utilization_gpu = %d \n", last_utilization_gpu)); -+ MALI_DEBUG_PRINT(4, ("last_utilization_gp = %d \n", last_utilization_gp)); -+ MALI_DEBUG_PRINT(4, ("last_utilization_pp = %d \n", last_utilization_pp)); ++ memset(kbdev->as_to_kctx, 0, sizeof(kbdev->as_to_kctx)); + -+ return &mali_util_data; ++ return 0; +} + -+_mali_osk_errcode_t mali_utilization_init(void) ++void kbase_ctx_sched_term(struct kbase_device *kbdev) +{ -+#if USING_GPU_UTILIZATION -+ _mali_osk_device_data data; -+ -+ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { -+ if (NULL != data.utilization_callback) { -+ mali_utilization_callback = data.utilization_callback; -+ MALI_DEBUG_PRINT(2, ("Mali GPU Utilization: Utilization handler installed \n")); -+ } -+ } -+#endif /* defined(USING_GPU_UTILIZATION) */ -+ -+ if (NULL == mali_utilization_callback) { -+ MALI_DEBUG_PRINT(2, ("Mali GPU Utilization: No platform utilization handler installed\n")); -+ } -+ -+ utilization_data_lock = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_ORDERED, _MALI_OSK_LOCK_ORDER_UTILIZATION); -+ if (NULL == utilization_data_lock) { -+ return _MALI_OSK_ERR_FAULT; -+ } -+ -+ num_running_gp_cores = 0; -+ num_running_pp_cores = 0; -+ -+ return _MALI_OSK_ERR_OK; -+} ++ s8 i; + -+void mali_utilization_term(void) -+{ -+ if (NULL != utilization_data_lock) { -+ _mali_osk_spinlock_irq_term(utilization_data_lock); ++ /* Sanity checks */ ++ for (i = 0; i != kbdev->nr_hw_address_spaces; ++i) { ++ WARN_ON(kbdev->as_to_kctx[i] != NULL); ++ WARN_ON(!(kbdev->as_free & (1u << i))); + } +} + -+void mali_utilization_gp_start(void) ++/* kbasep_ctx_sched_find_as_for_ctx - Find a free address space ++ * ++ * @kbdev: The context for which to find a free address space ++ * ++ * Return: A valid AS if successful, otherwise KBASEP_AS_NR_INVALID ++ * ++ * This function returns an address space available for use. It would prefer ++ * returning an AS that has been previously assigned to the context to ++ * avoid having to reprogram the MMU. ++ */ ++static int kbasep_ctx_sched_find_as_for_ctx(struct kbase_context *kctx) +{ -+ mali_utilization_data_lock(); -+ -+ ++num_running_gp_cores; -+ if (1 == num_running_gp_cores) { -+ u64 time_now = _mali_osk_time_get_ns(); -+ -+ /* First GP core started, consider GP busy from now and onwards */ -+ work_start_time_gp = time_now; -+ -+ if (0 == num_running_pp_cores) { -+ mali_bool is_resume = MALI_FALSE; -+ /* -+ * There are no PP cores running, so this is also the point -+ * at which we consider the GPU to be busy as well. -+ */ -+ work_start_time_gpu = time_now; ++ struct kbase_device *const kbdev = kctx->kbdev; ++ int free_as; + -+ is_resume = mali_control_timer_resume(time_now); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ mali_utilization_data_unlock(); ++ /* First check if the previously assigned AS is available */ ++ if ((kctx->as_nr != KBASEP_AS_NR_INVALID) && ++ (kbdev->as_free & (1u << kctx->as_nr))) ++ return kctx->as_nr; + -+ if (is_resume) { -+ /* Do some policy in new period for performance consideration */ -+#if defined(CONFIG_MALI_DVFS) -+ /* Clear session->number_of_window_jobs, prepare parameter for dvfs */ -+ mali_session_max_window_num(); -+ if (0 == last_utilization_gpu) { -+ /* -+ * for mali_dev_pause is called in set clock, -+ * so each time we change clock, we will set clock to -+ * highest step even if under down clock case, -+ * it is not nessesary, so we only set the clock under -+ * last time utilization equal 0, we stop the timer then -+ * start the GPU again case -+ */ -+ mali_dvfs_policy_new_period(); -+ } -+#endif -+ /* -+ * First timeout using short interval for power consideration -+ * because we give full power in the new period, but if the -+ * job loading is light, finish in 10ms, the other time all keep -+ * in high freq it will wast time. -+ */ -+ mali_control_timer_add(mali_control_first_timeout); -+ } -+ } else { -+ mali_utilization_data_unlock(); -+ } ++ /* The previously assigned AS was taken, we'll be returning any free ++ * AS at this point. ++ */ ++ free_as = ffs(kbdev->as_free) - 1; ++ if (free_as >= 0 && free_as < kbdev->nr_hw_address_spaces) ++ return free_as; + -+ } else { -+ /* Nothing to do */ -+ mali_utilization_data_unlock(); -+ } ++ return KBASEP_AS_NR_INVALID; +} + -+void mali_utilization_pp_start(void) ++int kbase_ctx_sched_retain_ctx(struct kbase_context *kctx) +{ -+ mali_utilization_data_lock(); -+ -+ ++num_running_pp_cores; -+ if (1 == num_running_pp_cores) { -+ u64 time_now = _mali_osk_time_get_ns(); ++ struct kbase_device *const kbdev = kctx->kbdev; + -+ /* First PP core started, consider PP busy from now and onwards */ -+ work_start_time_pp = time_now; ++ lockdep_assert_held(&kbdev->mmu_hw_mutex); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ if (0 == num_running_gp_cores) { -+ mali_bool is_resume = MALI_FALSE; -+ /* -+ * There are no GP cores running, so this is also the point -+ * at which we consider the GPU to be busy as well. -+ */ -+ work_start_time_gpu = time_now; ++ WARN_ON(!kbdev->pm.backend.gpu_powered); + -+ /* Start a new period if stoped */ -+ is_resume = mali_control_timer_resume(time_now); ++ if (atomic_inc_return(&kctx->refcount) == 1) { ++ int const free_as = kbasep_ctx_sched_find_as_for_ctx(kctx); + -+ mali_utilization_data_unlock(); ++ if (free_as != KBASEP_AS_NR_INVALID) { ++ kbdev->as_free &= ~(1u << free_as); ++ /* Only program the MMU if the context has not been ++ * assigned the same address space before. ++ */ ++ if (free_as != kctx->as_nr) { ++ struct kbase_context *const prev_kctx = ++ kbdev->as_to_kctx[free_as]; + -+ if (is_resume) { -+#if defined(CONFIG_MALI_DVFS) -+ /* Clear session->number_of_window_jobs, prepare parameter for dvfs */ -+ mali_session_max_window_num(); -+ if (0 == last_utilization_gpu) { -+ /* -+ * for mali_dev_pause is called in set clock, -+ * so each time we change clock, we will set clock to -+ * highest step even if under down clock case, -+ * it is not nessesary, so we only set the clock under -+ * last time utilization equal 0, we stop the timer then -+ * start the GPU again case -+ */ -+ mali_dvfs_policy_new_period(); ++ if (prev_kctx) { ++ WARN_ON(atomic_read(&prev_kctx->refcount) != 0); ++ kbase_mmu_disable(prev_kctx); ++ prev_kctx->as_nr = KBASEP_AS_NR_INVALID; + } -+#endif + -+ /* -+ * First timeout using short interval for power consideration -+ * because we give full power in the new period, but if the -+ * job loading is light, finish in 10ms, the other time all keep -+ * in high freq it will wast time. -+ */ -+ mali_control_timer_add(mali_control_first_timeout); ++ kctx->as_nr = free_as; ++ kbdev->as_to_kctx[free_as] = kctx; ++ kbase_mmu_update(kctx); + } + } else { -+ mali_utilization_data_unlock(); -+ } -+ } else { -+ /* Nothing to do */ -+ mali_utilization_data_unlock(); -+ } -+} -+ -+void mali_utilization_gp_end(void) -+{ -+ mali_utilization_data_lock(); -+ -+ --num_running_gp_cores; -+ if (0 == num_running_gp_cores) { -+ u64 time_now = _mali_osk_time_get_ns(); -+ -+ /* Last GP core ended, consider GP idle from now and onwards */ -+ accumulated_work_time_gp += (time_now - work_start_time_gp); -+ work_start_time_gp = 0; ++ atomic_dec(&kctx->refcount); + -+ if (0 == num_running_pp_cores) { -+ /* -+ * There are no PP cores running, so this is also the point -+ * at which we consider the GPU to be idle as well. ++ /* Failed to find an available address space, we must ++ * be returning an error at this point. + */ -+ accumulated_work_time_gpu += (time_now - work_start_time_gpu); -+ work_start_time_gpu = 0; ++ WARN_ON(kctx->as_nr != KBASEP_AS_NR_INVALID); + } + } + -+ mali_utilization_data_unlock(); ++ return kctx->as_nr; +} + -+void mali_utilization_pp_end(void) ++int kbase_ctx_sched_retain_ctx_refcount(struct kbase_context *kctx) +{ -+ mali_utilization_data_lock(); ++ struct kbase_device *const kbdev = kctx->kbdev; + -+ --num_running_pp_cores; -+ if (0 == num_running_pp_cores) { -+ u64 time_now = _mali_osk_time_get_ns(); ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ WARN_ON(atomic_read(&kctx->refcount) == 0); ++ if (atomic_read(&kctx->refcount) == 0) ++ return -1; + -+ /* Last PP core ended, consider PP idle from now and onwards */ -+ accumulated_work_time_pp += (time_now - work_start_time_pp); -+ work_start_time_pp = 0; ++ WARN_ON(kctx->as_nr == KBASEP_AS_NR_INVALID); ++ WARN_ON(kbdev->as_to_kctx[kctx->as_nr] != kctx); + -+ if (0 == num_running_gp_cores) { -+ /* -+ * There are no GP cores running, so this is also the point -+ * at which we consider the GPU to be idle as well. -+ */ -+ accumulated_work_time_gpu += (time_now - work_start_time_gpu); -+ work_start_time_gpu = 0; -+ } -+ } ++ atomic_inc(&kctx->refcount); + -+ mali_utilization_data_unlock(); ++ return 0; +} + -+mali_bool mali_utilization_enabled(void) ++void kbase_ctx_sched_release_ctx(struct kbase_context *kctx) +{ -+#if defined(CONFIG_MALI_DVFS) -+ return mali_dvfs_policy_enabled(); -+#else -+ return (NULL != mali_utilization_callback); -+#endif /* defined(CONFIG_MALI_DVFS) */ -+} ++ struct kbase_device *const kbdev = kctx->kbdev; + -+void mali_utilization_platform_realize(struct mali_gpu_utilization_data *util_data) -+{ -+ MALI_DEBUG_ASSERT_POINTER(mali_utilization_callback); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ mali_utilization_callback(util_data); ++ if (atomic_dec_return(&kctx->refcount) == 0) ++ kbdev->as_free |= (1u << kctx->as_nr); +} + -+void mali_utilization_reset(void) ++void kbase_ctx_sched_remove_ctx(struct kbase_context *kctx) +{ -+ accumulated_work_time_gpu = 0; -+ accumulated_work_time_gp = 0; -+ accumulated_work_time_pp = 0; ++ struct kbase_device *const kbdev = kctx->kbdev; + -+ last_utilization_gpu = 0; -+ last_utilization_gp = 0; -+ last_utilization_pp = 0; -+} ++ lockdep_assert_held(&kbdev->mmu_hw_mutex); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+void mali_utilization_data_lock(void) -+{ -+ _mali_osk_spinlock_irq_lock(utilization_data_lock); -+} ++ WARN_ON(atomic_read(&kctx->refcount) != 0); + -+void mali_utilization_data_unlock(void) -+{ -+ _mali_osk_spinlock_irq_unlock(utilization_data_lock); -+} ++ if (kctx->as_nr != KBASEP_AS_NR_INVALID) { ++ if (kbdev->pm.backend.gpu_powered) ++ kbase_mmu_disable(kctx); + -+void mali_utilization_data_assert_locked(void) -+{ -+ MALI_DEBUG_ASSERT_LOCK_HELD(utilization_data_lock); ++ kbdev->as_to_kctx[kctx->as_nr] = NULL; ++ kctx->as_nr = KBASEP_AS_NR_INVALID; ++ } +} + -+u32 _mali_ukk_utilization_gp_pp(void) ++void kbase_ctx_sched_restore_all_as(struct kbase_device *kbdev) +{ -+ return last_utilization_gpu; -+} ++ s8 i; + -+u32 _mali_ukk_utilization_gp(void) -+{ -+ return last_utilization_gp; -+} ++ lockdep_assert_held(&kbdev->mmu_hw_mutex); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+u32 _mali_ukk_utilization_pp(void) -+{ -+ return last_utilization_pp; ++ WARN_ON(!kbdev->pm.backend.gpu_powered); ++ ++ for (i = 0; i != kbdev->nr_hw_address_spaces; ++i) { ++ struct kbase_context *kctx; ++ ++ kctx = kbdev->as_to_kctx[i]; ++ if (kctx) { ++ if (atomic_read(&kctx->refcount)) { ++ WARN_ON(kctx->as_nr != i); ++ ++ kbase_mmu_update(kctx); ++ } else { ++ /* This context might have been assigned an ++ * AS before, clear it. ++ */ ++ kbdev->as_to_kctx[kctx->as_nr] = NULL; ++ kctx->as_nr = KBASEP_AS_NR_INVALID; ++ } ++ } else { ++ kbase_mmu_disable_as(kbdev, i); ++ } ++ } +} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h +diff --git a/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h new file mode 100755 -index 000000000000..06f585dcb238 +index 000000000..47474fecc --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h -@@ -0,0 +1,72 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h +@@ -0,0 +1,134 @@ +/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef __MALI_KERNEL_UTILIZATION_H__ -+#define __MALI_KERNEL_UTILIZATION_H__ + -+#include -+#include "mali_osk.h" + -+/** -+ * Initialize/start the Mali GPU utilization metrics reporting. ++#ifndef _KBASE_CTX_SCHED_H_ ++#define _KBASE_CTX_SCHED_H_ ++ ++#include ++ ++/* The Context Scheduler manages address space assignment and reference ++ * counting to kbase_context. The interface has been designed to minimise ++ * interactions between the Job Scheduler and Power Management/MMU to support ++ * both the existing Job Scheduler and Command Stream Frontend interface. + * -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ * The initial implementation of the Context Scheduler does not schedule ++ * contexts. Instead it relies on the Job Scheduler/CSF to make decisions of ++ * when to schedule/evict contexts if address spaces are starved. In the ++ * future, once an interface between the CS and JS/CSF have been devised to ++ * provide enough information about how each context is consuming GPU resources, ++ * those decisions can be made in the CS itself, thereby reducing duplicated ++ * code. + */ -+_mali_osk_errcode_t mali_utilization_init(void); + -+/** -+ * Terminate the Mali GPU utilization metrics reporting ++/* base_ctx_sched_init - Initialise the context scheduler ++ * ++ * @kbdev: The device for which the context scheduler needs to be ++ * initialised ++ * ++ * Return: 0 for success, otherwise failure ++ * ++ * This must be called during device initilisation. The number of hardware ++ * address spaces must already be established before calling this function. + */ -+void mali_utilization_term(void); ++int kbase_ctx_sched_init(struct kbase_device *kbdev); + -+/** -+ * Check if Mali utilization is enabled ++/* base_ctx_sched_term - Terminate the context scheduler ++ * ++ * @kbdev: The device for which the context scheduler needs to be ++ * terminated ++ * ++ * This must be called during device termination after all contexts have been ++ * destroyed. + */ -+mali_bool mali_utilization_enabled(void); ++void kbase_ctx_sched_term(struct kbase_device *kbdev); + -+/** -+ * Should be called when a job is about to execute a GP job ++/* kbase_ctx_sched_retain_ctx - Retain a reference to the @ref kbase_context ++ * ++ * @kctx: The context to which to retain a reference ++ * ++ * Return: The address space that the context has been assigned to or ++ * KBASEP_AS_NR_INVALID if no address space was available. ++ * ++ * This function should be called whenever an address space should be assigned ++ * to a context and programmed onto the MMU. It should typically be called ++ * when jobs are ready to be submitted to the GPU. ++ * ++ * It can be called as many times as necessary. The address space will be ++ * assigned to the context for as long as there is a reference to said context. ++ * ++ * The kbase_device::mmu_hw_mutex and kbase_device::hwaccess_lock locks must be ++ * held whilst calling this function. + */ -+void mali_utilization_gp_start(void); ++int kbase_ctx_sched_retain_ctx(struct kbase_context *kctx); + -+/** -+ * Should be called when a job has completed executing a GP job ++/* kbase_ctx_sched_retain_ctx_refcount ++ * ++ * @kctx: The context to which to retain a reference ++ * ++ * This function only retains a reference to the context. It must be called ++ * only when the context already has a reference. ++ * ++ * This is typically called inside an atomic session where we know the context ++ * is already scheduled in but want to take an extra reference to ensure that ++ * it doesn't get descheduled. ++ * ++ * The kbase_device::hwaccess_lock must be held whilst calling this function ++ * @return ++ * è‹¥æˆåŠŸ, 返回 0; ++ * è‹¥ *kctx 状æ€å¼‚常, 返回 -1. + */ -+void mali_utilization_gp_end(void); ++int kbase_ctx_sched_retain_ctx_refcount(struct kbase_context *kctx); + -+/** -+ * Should be called when a job is about to execute a PP job ++/* kbase_ctx_sched_release_ctx - Release a reference to the @ref kbase_context ++ * ++ * @kctx: The context from which to release a reference ++ * ++ * This function should be called whenever an address space could be unassigned ++ * from a context. When there are no more references to said context, the ++ * address space previously assigned to this context shall be reassigned to ++ * other contexts as needed. ++ * ++ * The kbase_device::hwaccess_lock must be held whilst calling this function + */ -+void mali_utilization_pp_start(void); ++void kbase_ctx_sched_release_ctx(struct kbase_context *kctx); + -+/** -+ * Should be called when a job has completed executing a PP job ++/* kbase_ctx_sched_remove_ctx - Unassign previously assigned address space ++ * ++ * @kctx: The context to be removed ++ * ++ * This function should be called when a context is being destroyed. The ++ * context must no longer have any reference. If it has been assigned an ++ * address space before then the AS will be unprogrammed. ++ * ++ * The kbase_device::mmu_hw_mutex and kbase_device::hwaccess_lock locks must be ++ * held whilst calling this function. + */ -+void mali_utilization_pp_end(void); ++void kbase_ctx_sched_remove_ctx(struct kbase_context *kctx); + -+/** -+ * Should be called to calcution the GPU utilization ++/* kbase_ctx_sched_restore_all_as - Reprogram all address spaces ++ * ++ * @kbdev: The device for which address spaces to be reprogrammed ++ * ++ * This function shall reprogram all address spaces previously assigned to ++ * contexts. It can be used after the GPU is reset. ++ * ++ * The kbase_device::mmu_hw_mutex and kbase_device::hwaccess_lock locks must be ++ * held whilst calling this function. + */ -+struct mali_gpu_utilization_data *mali_utilization_calculate(u64 *start_time, u64 *time_period, mali_bool *need_add_timer); ++void kbase_ctx_sched_restore_all_as(struct kbase_device *kbdev); + -+_mali_osk_spinlock_irq_t *mali_utilization_get_lock(void); ++#endif /* _KBASE_CTX_SCHED_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug.c b/drivers/gpu/arm/midgard/mali_kbase_debug.c +new file mode 100755 +index 000000000..fb57ac2e3 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_debug.c +@@ -0,0 +1,39 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+void mali_utilization_platform_realize(struct mali_gpu_utilization_data *util_data); + -+void mali_utilization_data_lock(void); + -+void mali_utilization_data_unlock(void); + -+void mali_utilization_data_assert_locked(void); + -+void mali_utilization_reset(void); ++#include + ++static struct kbasep_debug_assert_cb kbasep_debug_assert_registered_cb = { ++ NULL, ++ NULL ++}; + -+#endif /* __MALI_KERNEL_UTILIZATION_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c ++void kbase_debug_assert_register_hook(kbase_debug_assert_hook *func, void *param) ++{ ++ kbasep_debug_assert_registered_cb.func = func; ++ kbasep_debug_assert_registered_cb.param = param; ++} ++ ++void kbasep_debug_assert_call_hook(void) ++{ ++ if (kbasep_debug_assert_registered_cb.func != NULL) ++ kbasep_debug_assert_registered_cb.func(kbasep_debug_assert_registered_cb.param); ++} ++KBASE_EXPORT_SYMBOL(kbasep_debug_assert_call_hook); ++ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug.h b/drivers/gpu/arm/midgard/mali_kbase_debug.h new file mode 100755 -index 000000000000..dd44e5e7fa03 +index 000000000..5fff2892b --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c -@@ -0,0 +1,45 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_debug.h +@@ -0,0 +1,164 @@ +/* -+ * Copyright (C) 2011-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2012-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_ukk.h" + -+#include "mali_osk_profiling.h" + -+_mali_osk_errcode_t _mali_ukk_vsync_event_report(_mali_uk_vsync_event_report_s *args) -+{ -+ _mali_uk_vsync_event event = (_mali_uk_vsync_event)args->event; -+ MALI_IGNORE(event); /* event is not used for release code, and that is OK */ + -+ /* -+ * Manually generate user space events in kernel space. -+ * This saves user space from calling kernel space twice in this case. -+ * We just need to remember to add pid and tid manually. -+ */ -+ if (event == _MALI_UK_VSYNC_EVENT_BEGIN_WAIT) { -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SUSPEND | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_VSYNC, -+ _mali_osk_get_pid(), _mali_osk_get_tid(), 0, 0, 0); -+ } + -+ if (event == _MALI_UK_VSYNC_EVENT_END_WAIT) { -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_RESUME | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_VSYNC, -+ _mali_osk_get_pid(), _mali_osk_get_tid(), 0, 0, 0); -+ } ++#ifndef _KBASE_DEBUG_H ++#define _KBASE_DEBUG_H + ++#include + -+ MALI_DEBUG_PRINT(4, ("Received VSYNC event: %d\n", event)); -+ MALI_SUCCESS; -+} ++/** @brief If equals to 0, a trace containing the file, line, and function will be displayed before each message. */ ++#define KBASE_DEBUG_SKIP_TRACE 0 + -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c -new file mode 100755 -index 000000000000..fe33f561b2aa ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c -@@ -0,0 +1,534 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** @brief If different from 0, the trace will only contain the file and line. */ ++#define KBASE_DEBUG_SKIP_FUNCTION_NAME 0 ++ ++/** @brief Disable the asserts tests if set to 1. Default is to disable the asserts in release. */ ++#ifndef KBASE_DEBUG_DISABLE_ASSERTS ++#ifdef CONFIG_MALI_DEBUG ++#define KBASE_DEBUG_DISABLE_ASSERTS 0 ++#else ++#define KBASE_DEBUG_DISABLE_ASSERTS 1 ++#endif ++#endif /* KBASE_DEBUG_DISABLE_ASSERTS */ ++ ++/** Function type that is called on an KBASE_DEBUG_ASSERT() or KBASE_DEBUG_ASSERT_MSG() */ ++typedef void (kbase_debug_assert_hook) (void *); ++ ++struct kbasep_debug_assert_cb { ++ kbase_debug_assert_hook *func; ++ void *param; ++}; ++ ++/** ++ * @def KBASEP_DEBUG_PRINT_TRACE ++ * @brief Private macro containing the format of the trace to display before every message ++ * @sa KBASE_DEBUG_SKIP_TRACE, KBASE_DEBUG_SKIP_FUNCTION_NAME + */ -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_l2_cache.h" -+#include "mali_hw_core.h" -+#include "mali_scheduler.h" -+#include "mali_pm.h" -+#include "mali_pm_domain.h" ++#if !KBASE_DEBUG_SKIP_TRACE ++#define KBASEP_DEBUG_PRINT_TRACE \ ++ "In file: " __FILE__ " line: " CSTD_STR2(__LINE__) ++#if !KBASE_DEBUG_SKIP_FUNCTION_NAME ++#define KBASEP_DEBUG_PRINT_FUNCTION __func__ ++#else ++#define KBASEP_DEBUG_PRINT_FUNCTION "" ++#endif ++#else ++#define KBASEP_DEBUG_PRINT_TRACE "" ++#endif + +/** -+ * Size of the Mali L2 cache registers in bytes ++ * @def KBASEP_DEBUG_ASSERT_OUT(trace, function, ...) ++ * @brief (Private) system printing function associated to the @see KBASE_DEBUG_ASSERT_MSG event. ++ * @param trace location in the code from where the message is printed ++ * @param function function from where the message is printed ++ * @param ... Format string followed by format arguments. ++ * @note function parameter cannot be concatenated with other strings + */ -+#define MALI400_L2_CACHE_REGISTERS_SIZE 0x30 ++/* Select the correct system output function*/ ++#ifdef CONFIG_MALI_DEBUG ++#define KBASEP_DEBUG_ASSERT_OUT(trace, function, ...)\ ++ do { \ ++ pr_err("Mali: %s function:%s ", trace, function);\ ++ pr_err(__VA_ARGS__);\ ++ pr_err("\n");\ ++ } while (false) ++#else ++#define KBASEP_DEBUG_ASSERT_OUT(trace, function, ...) CSTD_NOP() ++#endif ++ ++#ifdef CONFIG_MALI_DEBUG ++#define KBASE_CALL_ASSERT_HOOK() kbasep_debug_assert_call_hook() ++#else ++#define KBASE_CALL_ASSERT_HOOK() CSTD_NOP() ++#endif + +/** -+ * Mali L2 cache register numbers -+ * Used in the register read/write routines. -+ * See the hardware documentation for more information about each register ++ * @def KBASE_DEBUG_ASSERT(expr) ++ * @brief Calls @see KBASE_PRINT_ASSERT and prints the expression @a expr if @a expr is false ++ * ++ * @note This macro does nothing if the flag @see KBASE_DEBUG_DISABLE_ASSERTS is set to 1 ++ * ++ * @param expr Boolean expression + */ -+typedef enum mali_l2_cache_register { -+ MALI400_L2_CACHE_REGISTER_SIZE = 0x0004, -+ MALI400_L2_CACHE_REGISTER_STATUS = 0x0008, -+ /*unused = 0x000C */ -+ MALI400_L2_CACHE_REGISTER_COMMAND = 0x0010, -+ MALI400_L2_CACHE_REGISTER_CLEAR_PAGE = 0x0014, -+ MALI400_L2_CACHE_REGISTER_MAX_READS = 0x0018, -+ MALI400_L2_CACHE_REGISTER_ENABLE = 0x001C, -+ MALI400_L2_CACHE_REGISTER_PERFCNT_SRC0 = 0x0020, -+ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL0 = 0x0024, -+ MALI400_L2_CACHE_REGISTER_PERFCNT_SRC1 = 0x0028, -+ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL1 = 0x002C, -+} mali_l2_cache_register; ++#define KBASE_DEBUG_ASSERT(expr) \ ++ KBASE_DEBUG_ASSERT_MSG(expr, #expr) ++ ++#if KBASE_DEBUG_DISABLE_ASSERTS ++#define KBASE_DEBUG_ASSERT_MSG(expr, ...) CSTD_NOP() ++#else ++ /** ++ * @def KBASE_DEBUG_ASSERT_MSG(expr, ...) ++ * @brief Calls @see KBASEP_DEBUG_ASSERT_OUT and prints the given message if @a expr is false ++ * ++ * @note This macro does nothing if the flag @see KBASE_DEBUG_DISABLE_ASSERTS is set to 1 ++ * ++ * @param expr Boolean expression ++ * @param ... Message to display when @a expr is false, as a format string followed by format arguments. ++ */ ++#define KBASE_DEBUG_ASSERT_MSG(expr, ...) \ ++ do { \ ++ if (!(expr)) { \ ++ KBASEP_DEBUG_ASSERT_OUT(KBASEP_DEBUG_PRINT_TRACE, KBASEP_DEBUG_PRINT_FUNCTION, __VA_ARGS__);\ ++ KBASE_CALL_ASSERT_HOOK();\ ++ BUG();\ ++ } \ ++ } while (false) ++#endif /* KBASE_DEBUG_DISABLE_ASSERTS */ + +/** -+ * Mali L2 cache commands -+ * These are the commands that can be sent to the Mali L2 cache unit ++ * @def KBASE_DEBUG_CODE( X ) ++ * @brief Executes the code inside the macro only in debug mode ++ * ++ * @param X Code to compile only in debug mode. + */ -+typedef enum mali_l2_cache_command { -+ MALI400_L2_CACHE_COMMAND_CLEAR_ALL = 0x01, -+} mali_l2_cache_command; ++#ifdef CONFIG_MALI_DEBUG ++#define KBASE_DEBUG_CODE(X) X ++#else ++#define KBASE_DEBUG_CODE(X) CSTD_NOP() ++#endif /* CONFIG_MALI_DEBUG */ ++ ++/** @} */ + +/** -+ * Mali L2 cache commands -+ * These are the commands that can be sent to the Mali L2 cache unit ++ * @brief Register a function to call on ASSERT ++ * ++ * Such functions will \b only be called during Debug mode, and for debugging ++ * features \b only. Do not rely on them to be called in general use. ++ * ++ * To disable the hook, supply NULL to \a func. ++ * ++ * @note This function is not thread-safe, and should only be used to ++ * register/deregister once in the module's lifetime. ++ * ++ * @param[in] func the function to call when an assert is triggered. ++ * @param[in] param the parameter to pass to \a func when calling it + */ -+typedef enum mali_l2_cache_enable { -+ MALI400_L2_CACHE_ENABLE_DEFAULT = 0x0, /* Default */ -+ MALI400_L2_CACHE_ENABLE_ACCESS = 0x01, -+ MALI400_L2_CACHE_ENABLE_READ_ALLOCATE = 0x02, -+} mali_l2_cache_enable; ++void kbase_debug_assert_register_hook(kbase_debug_assert_hook *func, void *param); + +/** -+ * Mali L2 cache status bits ++ * @brief Call a debug assert hook previously registered with kbase_debug_assert_register_hook() ++ * ++ * @note This function is not thread-safe with respect to multiple threads ++ * registering functions and parameters with ++ * kbase_debug_assert_register_hook(). Otherwise, thread safety is the ++ * responsibility of the registered hook. + */ -+typedef enum mali_l2_cache_status { -+ MALI400_L2_CACHE_STATUS_COMMAND_BUSY = 0x01, -+ MALI400_L2_CACHE_STATUS_DATA_BUSY = 0x02, -+} mali_l2_cache_status; ++void kbasep_debug_assert_call_hook(void); + -+#define MALI400_L2_MAX_READS_NOT_SET -1 ++#endif /* _KBASE_DEBUG_H */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c +new file mode 100755 +index 000000000..f29430ddf +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c +@@ -0,0 +1,499 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+static struct mali_l2_cache_core * -+ mali_global_l2s[MALI_MAX_NUMBER_OF_L2_CACHE_CORES] = { NULL, }; -+static u32 mali_global_num_l2s = 0; + -+int mali_l2_max_reads = MALI400_L2_MAX_READS_NOT_SET; + ++#include ++#include ++#include + -+/* Local helper functions */ ++#ifdef CONFIG_DEBUG_FS + -+static void mali_l2_cache_reset(struct mali_l2_cache_core *cache); ++static bool kbase_is_job_fault_event_pending(struct kbase_device *kbdev) ++{ ++ struct list_head *event_list = &kbdev->job_fault_event_list; ++ unsigned long flags; ++ bool ret; + -+static _mali_osk_errcode_t mali_l2_cache_send_command( -+ struct mali_l2_cache_core *cache, u32 reg, u32 val); ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ ret = !list_empty(event_list); ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); + -+static void mali_l2_cache_lock(struct mali_l2_cache_core *cache) -+{ -+ MALI_DEBUG_ASSERT_POINTER(cache); -+ _mali_osk_spinlock_irq_lock(cache->lock); ++ return ret; +} + -+static void mali_l2_cache_unlock(struct mali_l2_cache_core *cache) ++static bool kbase_ctx_has_no_event_pending(struct kbase_context *kctx) +{ -+ MALI_DEBUG_ASSERT_POINTER(cache); -+ _mali_osk_spinlock_irq_unlock(cache->lock); -+} ++ struct kbase_device *kbdev = kctx->kbdev; ++ struct list_head *event_list = &kctx->kbdev->job_fault_event_list; ++ struct base_job_fault_event *event; ++ unsigned long flags; + -+/* Implementation of the L2 cache interface */ ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ if (list_empty(event_list)) { ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ return true; ++ } ++ list_for_each_entry(event, event_list, head) { ++ if (event->katom->kctx == kctx) { ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, ++ flags); ++ return false; ++ } ++ } ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ return true; ++} + -+struct mali_l2_cache_core *mali_l2_cache_create( -+ _mali_osk_resource_t *resource, u32 domain_index) ++/* wait until the fault happen and copy the event */ ++static int kbase_job_fault_event_wait(struct kbase_device *kbdev, ++ struct base_job_fault_event *event) +{ -+ struct mali_l2_cache_core *cache = NULL; -+#if defined(DEBUG) -+ u32 cache_size; -+#endif -+ -+ MALI_DEBUG_PRINT(4, ("Mali L2 cache: Creating Mali L2 cache: %s\n", -+ resource->description)); ++ struct list_head *event_list = &kbdev->job_fault_event_list; ++ struct base_job_fault_event *event_in; ++ unsigned long flags; + -+ if (mali_global_num_l2s >= MALI_MAX_NUMBER_OF_L2_CACHE_CORES) { -+ MALI_PRINT_ERROR(("Mali L2 cache: Too many L2 caches\n")); -+ return NULL; ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ if (list_empty(event_list)) { ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ if (wait_event_interruptible(kbdev->job_fault_wq, ++ kbase_is_job_fault_event_pending(kbdev))) ++ return -ERESTARTSYS; ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); + } + -+ cache = _mali_osk_malloc(sizeof(struct mali_l2_cache_core)); -+ if (NULL == cache) { -+ MALI_PRINT_ERROR(("Mali L2 cache: Failed to allocate memory for L2 cache core\n")); -+ return NULL; -+ } ++ event_in = list_entry(event_list->next, ++ struct base_job_fault_event, head); ++ event->event_code = event_in->event_code; ++ event->katom = event_in->katom; + -+ cache->core_id = mali_global_num_l2s; -+ cache->counter_src0 = MALI_HW_CORE_NO_COUNTER; -+ cache->counter_src1 = MALI_HW_CORE_NO_COUNTER; -+ cache->counter_value0_base = 0; -+ cache->counter_value1_base = 0; -+ cache->pm_domain = NULL; -+ cache->power_is_on = MALI_FALSE; -+ cache->last_invalidated_id = 0; ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); + -+ if (_MALI_OSK_ERR_OK != mali_hw_core_create(&cache->hw_core, -+ resource, MALI400_L2_CACHE_REGISTERS_SIZE)) { -+ _mali_osk_free(cache); -+ return NULL; -+ } ++ return 0; + -+#if defined(DEBUG) -+ cache_size = mali_hw_core_register_read(&cache->hw_core, -+ MALI400_L2_CACHE_REGISTER_SIZE); -+ MALI_DEBUG_PRINT(2, ("Mali L2 cache: Created %s: % 3uK, %u-way, % 2ubyte cache line, % 3ubit external bus\n", -+ resource->description, -+ 1 << (((cache_size >> 16) & 0xff) - 10), -+ 1 << ((cache_size >> 8) & 0xff), -+ 1 << (cache_size & 0xff), -+ 1 << ((cache_size >> 24) & 0xff))); -+#endif ++} + -+ cache->lock = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_ORDERED, -+ _MALI_OSK_LOCK_ORDER_L2); -+ if (NULL == cache->lock) { -+ MALI_PRINT_ERROR(("Mali L2 cache: Failed to create counter lock for L2 cache core %s\n", -+ cache->hw_core.description)); -+ mali_hw_core_delete(&cache->hw_core); -+ _mali_osk_free(cache); -+ return NULL; -+ } ++/* remove the event from the queue */ ++static struct base_job_fault_event *kbase_job_fault_event_dequeue( ++ struct kbase_device *kbdev, struct list_head *event_list) ++{ ++ struct base_job_fault_event *event; + -+ /* register with correct power domain */ -+ cache->pm_domain = mali_pm_register_l2_cache( -+ domain_index, cache); ++ event = list_entry(event_list->next, ++ struct base_job_fault_event, head); ++ list_del(event_list->next); + -+ mali_global_l2s[mali_global_num_l2s] = cache; -+ mali_global_num_l2s++; ++ return event; + -+ return cache; +} + -+void mali_l2_cache_delete(struct mali_l2_cache_core *cache) ++/* Remove all the following atoms after the failed atom in the same context ++ * Call the postponed bottom half of job done. ++ * Then, this context could be rescheduled. ++ */ ++static void kbase_job_fault_resume_event_cleanup(struct kbase_context *kctx) +{ -+ u32 i; -+ for (i = 0; i < mali_global_num_l2s; i++) { -+ if (mali_global_l2s[i] != cache) { -+ continue; -+ } -+ -+ mali_global_l2s[i] = NULL; -+ mali_global_num_l2s--; -+ -+ if (i == mali_global_num_l2s) { -+ /* Removed last element, nothing more to do */ -+ break; -+ } ++ struct list_head *event_list = &kctx->job_fault_resume_event_list; + -+ /* -+ * We removed a l2 cache from the middle of the array, -+ * so move the last l2 cache to current position -+ */ -+ mali_global_l2s[i] = mali_global_l2s[mali_global_num_l2s]; -+ mali_global_l2s[mali_global_num_l2s] = NULL; ++ while (!list_empty(event_list)) { ++ struct base_job_fault_event *event; + -+ /* All good */ -+ break; ++ event = kbase_job_fault_event_dequeue(kctx->kbdev, ++ &kctx->job_fault_resume_event_list); ++ kbase_jd_done_worker(&event->katom->work); + } + -+ _mali_osk_spinlock_irq_term(cache->lock); -+ mali_hw_core_delete(&cache->hw_core); -+ _mali_osk_free(cache); +} + -+void mali_l2_cache_power_up(struct mali_l2_cache_core *cache) ++/* Remove all the failed atoms that belong to different contexts ++ * Resume all the contexts that were suspend due to failed job ++ */ ++static void kbase_job_fault_event_cleanup(struct kbase_device *kbdev) +{ -+ MALI_DEBUG_ASSERT_POINTER(cache); -+ -+ mali_l2_cache_lock(cache); -+ -+ mali_l2_cache_reset(cache); -+ -+ if ((1 << MALI_DOMAIN_INDEX_DUMMY) != cache->pm_domain->pmu_mask) -+ MALI_DEBUG_ASSERT(MALI_FALSE == cache->power_is_on); -+ cache->power_is_on = MALI_TRUE; ++ struct list_head *event_list = &kbdev->job_fault_event_list; ++ unsigned long flags; + -+ mali_l2_cache_unlock(cache); ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ while (!list_empty(event_list)) { ++ kbase_job_fault_event_dequeue(kbdev, event_list); ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ wake_up(&kbdev->job_fault_resume_wq); ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ } ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); +} + -+void mali_l2_cache_power_down(struct mali_l2_cache_core *cache) ++static void kbase_job_fault_resume_worker(struct work_struct *data) +{ -+ MALI_DEBUG_ASSERT_POINTER(cache); ++ struct base_job_fault_event *event = container_of(data, ++ struct base_job_fault_event, job_fault_work); ++ struct kbase_context *kctx; ++ struct kbase_jd_atom *katom; + -+ mali_l2_cache_lock(cache); ++ katom = event->katom; ++ kctx = katom->kctx; + -+ MALI_DEBUG_ASSERT(MALI_TRUE == cache->power_is_on); ++ dev_info(kctx->kbdev->dev, "Job dumping wait\n"); + -+ /* -+ * The HW counters will start from zero again when we resume, -+ * but we should report counters as always increasing. -+ * Take a copy of the HW values now in order to add this to -+ * the values we report after being powered up. -+ * -+ * The physical power off of the L2 cache might be outside our -+ * own control (e.g. runtime PM). That is why we must manually -+ * set set the counter value to zero as well. ++ /* When it was waked up, it need to check if queue is empty or the ++ * failed atom belongs to different context. If yes, wake up. Both ++ * of them mean the failed job has been dumped. Please note, it ++ * should never happen that the job_fault_event_list has the two ++ * atoms belong to the same context. + */ ++ wait_event(kctx->kbdev->job_fault_resume_wq, ++ kbase_ctx_has_no_event_pending(kctx)); + -+ if (cache->counter_src0 != MALI_HW_CORE_NO_COUNTER) { -+ cache->counter_value0_base += mali_hw_core_register_read( -+ &cache->hw_core, -+ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL0); -+ mali_hw_core_register_write(&cache->hw_core, -+ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL0, 0); -+ } ++ atomic_set(&kctx->job_fault_count, 0); ++ kbase_jd_done_worker(&katom->work); + -+ if (cache->counter_src1 != MALI_HW_CORE_NO_COUNTER) { -+ cache->counter_value1_base += mali_hw_core_register_read( -+ &cache->hw_core, -+ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL1); -+ mali_hw_core_register_write(&cache->hw_core, -+ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL1, 0); -+ } ++ /* In case the following atoms were scheduled during failed job dump ++ * the job_done_worker was held. We need to rerun it after the dump ++ * was finished ++ */ ++ kbase_job_fault_resume_event_cleanup(kctx); + ++ dev_info(kctx->kbdev->dev, "Job dumping finish, resume scheduler\n"); ++} + -+ cache->power_is_on = MALI_FALSE; -+ -+ mali_l2_cache_unlock(cache); -+} -+ -+void mali_l2_cache_core_set_counter_src( -+ struct mali_l2_cache_core *cache, u32 source_id, u32 counter) ++static struct base_job_fault_event *kbase_job_fault_event_queue( ++ struct list_head *event_list, ++ struct kbase_jd_atom *atom, ++ u32 completion_code) +{ -+ u32 reg_offset_src; -+ u32 reg_offset_val; ++ struct base_job_fault_event *event; + -+ MALI_DEBUG_ASSERT_POINTER(cache); -+ MALI_DEBUG_ASSERT(source_id >= 0 && source_id <= 1); ++ event = &atom->fault_event; + -+ mali_l2_cache_lock(cache); ++ event->katom = atom; ++ event->event_code = completion_code; + -+ if (0 == source_id) { -+ /* start counting from 0 */ -+ cache->counter_value0_base = 0; -+ cache->counter_src0 = counter; -+ reg_offset_src = MALI400_L2_CACHE_REGISTER_PERFCNT_SRC0; -+ reg_offset_val = MALI400_L2_CACHE_REGISTER_PERFCNT_VAL0; -+ } else { -+ /* start counting from 0 */ -+ cache->counter_value1_base = 0; -+ cache->counter_src1 = counter; -+ reg_offset_src = MALI400_L2_CACHE_REGISTER_PERFCNT_SRC1; -+ reg_offset_val = MALI400_L2_CACHE_REGISTER_PERFCNT_VAL1; -+ } ++ list_add_tail(&event->head, event_list); + -+ if (cache->power_is_on) { -+ u32 hw_src; ++ return event; + -+ if (MALI_HW_CORE_NO_COUNTER != counter) { -+ hw_src = counter; -+ } else { -+ hw_src = 0; /* disable value for HW */ -+ } ++} + -+ /* Set counter src */ -+ mali_hw_core_register_write(&cache->hw_core, -+ reg_offset_src, hw_src); ++static void kbase_job_fault_event_post(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom, u32 completion_code) ++{ ++ struct base_job_fault_event *event; ++ unsigned long flags; + -+ /* Make sure the HW starts counting from 0 again */ -+ mali_hw_core_register_write(&cache->hw_core, -+ reg_offset_val, 0); -+ } ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ event = kbase_job_fault_event_queue(&kbdev->job_fault_event_list, ++ katom, completion_code); ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); + -+ mali_l2_cache_unlock(cache); -+} ++ wake_up_interruptible(&kbdev->job_fault_wq); + -+void mali_l2_cache_core_get_counter_values( -+ struct mali_l2_cache_core *cache, -+ u32 *src0, u32 *value0, u32 *src1, u32 *value1) -+{ -+ MALI_DEBUG_ASSERT_POINTER(cache); -+ MALI_DEBUG_ASSERT(NULL != src0); -+ MALI_DEBUG_ASSERT(NULL != value0); -+ MALI_DEBUG_ASSERT(NULL != src1); -+ MALI_DEBUG_ASSERT(NULL != value1); ++ INIT_WORK(&event->job_fault_work, kbase_job_fault_resume_worker); ++ queue_work(kbdev->job_fault_resume_workq, &event->job_fault_work); + -+ mali_l2_cache_lock(cache); ++ dev_info(katom->kctx->kbdev->dev, "Job fault happen, start dump: %d_%d", ++ katom->kctx->tgid, katom->kctx->id); + -+ *src0 = cache->counter_src0; -+ *src1 = cache->counter_src1; ++} + -+ if (cache->counter_src0 != MALI_HW_CORE_NO_COUNTER) { -+ if (MALI_TRUE == cache->power_is_on) { -+ *value0 = mali_hw_core_register_read(&cache->hw_core, -+ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL0); -+ } else { -+ *value0 = 0; -+ } ++/* ++ * This function will process the job fault ++ * Get the register copy ++ * Send the failed job dump event ++ * Create a Wait queue to wait until the job dump finish ++ */ + -+ /* Add base offset value (in case we have been power off) */ -+ *value0 += cache->counter_value0_base; ++bool kbase_debug_job_fault_process(struct kbase_jd_atom *katom, ++ u32 completion_code) ++{ ++ struct kbase_context *kctx = katom->kctx; ++ ++ /* Check if dumping is in the process ++ * only one atom of each context can be dumped at the same time ++ * If the atom belongs to different context, it can be dumped ++ */ ++ if (atomic_read(&kctx->job_fault_count) > 0) { ++ kbase_job_fault_event_queue( ++ &kctx->job_fault_resume_event_list, ++ katom, completion_code); ++ dev_info(kctx->kbdev->dev, "queue:%d\n", ++ kbase_jd_atom_id(kctx, katom)); ++ return true; + } + -+ if (cache->counter_src1 != MALI_HW_CORE_NO_COUNTER) { -+ if (MALI_TRUE == cache->power_is_on) { -+ *value1 = mali_hw_core_register_read(&cache->hw_core, -+ MALI400_L2_CACHE_REGISTER_PERFCNT_VAL1); -+ } else { -+ *value1 = 0; -+ } ++ if (kctx->kbdev->job_fault_debug == true) { + -+ /* Add base offset value (in case we have been power off) */ -+ *value1 += cache->counter_value1_base; -+ } ++ if (completion_code != BASE_JD_EVENT_DONE) { + -+ mali_l2_cache_unlock(cache); -+} ++ if (kbase_job_fault_get_reg_snapshot(kctx) == false) { ++ dev_warn(kctx->kbdev->dev, "get reg dump failed\n"); ++ return false; ++ } + -+struct mali_l2_cache_core *mali_l2_cache_core_get_glob_l2_core(u32 index) -+{ -+ if (mali_global_num_l2s > index) { -+ return mali_global_l2s[index]; ++ kbase_job_fault_event_post(kctx->kbdev, katom, ++ completion_code); ++ atomic_inc(&kctx->job_fault_count); ++ dev_info(kctx->kbdev->dev, "post:%d\n", ++ kbase_jd_atom_id(kctx, katom)); ++ return true; ++ ++ } + } ++ return false; + -+ return NULL; +} + -+u32 mali_l2_cache_core_get_glob_num_l2_cores(void) ++static int debug_job_fault_show(struct seq_file *m, void *v) +{ -+ return mali_global_num_l2s; -+} ++ struct kbase_device *kbdev = m->private; ++ struct base_job_fault_event *event = (struct base_job_fault_event *)v; ++ struct kbase_context *kctx = event->katom->kctx; ++ int i; + -+void mali_l2_cache_invalidate(struct mali_l2_cache_core *cache) -+{ -+ MALI_DEBUG_ASSERT_POINTER(cache); ++ dev_info(kbdev->dev, "debug job fault seq show:%d_%d, %d", ++ kctx->tgid, kctx->id, event->reg_offset); + -+ if (NULL == cache) { -+ return; ++ if (kctx->reg_dump == NULL) { ++ dev_warn(kbdev->dev, "reg dump is NULL"); ++ return -1; + } + -+ mali_l2_cache_lock(cache); -+ -+ cache->last_invalidated_id = mali_scheduler_get_new_cache_order(); -+ mali_l2_cache_send_command(cache, MALI400_L2_CACHE_REGISTER_COMMAND, -+ MALI400_L2_CACHE_COMMAND_CLEAR_ALL); ++ if (kctx->reg_dump[event->reg_offset] == ++ REGISTER_DUMP_TERMINATION_FLAG) { ++ /* Return the error here to stop the read. And the ++ * following next() will not be called. The stop can ++ * get the real event resource and release it ++ */ ++ return -1; ++ } + -+ mali_l2_cache_unlock(cache); -+} ++ if (event->reg_offset == 0) ++ seq_printf(m, "%d_%d\n", kctx->tgid, kctx->id); + -+void mali_l2_cache_invalidate_conditional( -+ struct mali_l2_cache_core *cache, u32 id) -+{ -+ MALI_DEBUG_ASSERT_POINTER(cache); ++ for (i = 0; i < 50; i++) { ++ if (kctx->reg_dump[event->reg_offset] == ++ REGISTER_DUMP_TERMINATION_FLAG) { ++ break; ++ } ++ seq_printf(m, "%08x: %08x\n", ++ kctx->reg_dump[event->reg_offset], ++ kctx->reg_dump[1+event->reg_offset]); ++ event->reg_offset += 2; + -+ if (NULL == cache) { -+ return; + } + -+ /* -+ * If the last cache invalidation was done by a job with a higher id we -+ * don't have to flush. Since user space will store jobs w/ their -+ * corresponding memory in sequence (first job #0, then job #1, ...), -+ * we don't have to flush for job n-1 if job n has already invalidated -+ * the cache since we know for sure that job n-1's memory was already -+ * written when job n was started. -+ */ + -+ mali_l2_cache_lock(cache); ++ return 0; ++} ++static void *debug_job_fault_next(struct seq_file *m, void *v, loff_t *pos) ++{ ++ struct kbase_device *kbdev = m->private; ++ struct base_job_fault_event *event = (struct base_job_fault_event *)v; + -+ if (((s32)id) > ((s32)cache->last_invalidated_id)) { -+ /* Set latest invalidated id to current "point in time" */ -+ cache->last_invalidated_id = -+ mali_scheduler_get_new_cache_order(); -+ mali_l2_cache_send_command(cache, -+ MALI400_L2_CACHE_REGISTER_COMMAND, -+ MALI400_L2_CACHE_COMMAND_CLEAR_ALL); -+ } ++ dev_info(kbdev->dev, "debug job fault seq next:%d, %d", ++ event->reg_offset, (int)*pos); + -+ mali_l2_cache_unlock(cache); ++ return event; +} + -+void mali_l2_cache_invalidate_all(void) ++static void *debug_job_fault_start(struct seq_file *m, loff_t *pos) +{ -+ u32 i; -+ for (i = 0; i < mali_global_num_l2s; i++) { -+ struct mali_l2_cache_core *cache = mali_global_l2s[i]; -+ _mali_osk_errcode_t ret; -+ -+ MALI_DEBUG_ASSERT_POINTER(cache); ++ struct kbase_device *kbdev = m->private; ++ struct base_job_fault_event *event; + -+ mali_l2_cache_lock(cache); ++ dev_info(kbdev->dev, "fault job seq start:%d", (int)*pos); + -+ if (MALI_TRUE != cache->power_is_on) { -+ mali_l2_cache_unlock(cache); -+ continue; ++ /* The condition is trick here. It needs make sure the ++ * fault hasn't happened and the dumping hasn't been started, ++ * or the dumping has finished ++ */ ++ if (*pos == 0) { ++ event = kmalloc(sizeof(*event), GFP_KERNEL); ++ if (!event) ++ return NULL; ++ event->reg_offset = 0; ++ if (kbase_job_fault_event_wait(kbdev, event)) { ++ kfree(event); ++ return NULL; + } + -+ cache->last_invalidated_id = -+ mali_scheduler_get_new_cache_order(); -+ -+ ret = mali_l2_cache_send_command(cache, -+ MALI400_L2_CACHE_REGISTER_COMMAND, -+ MALI400_L2_CACHE_COMMAND_CLEAR_ALL); -+ if (_MALI_OSK_ERR_OK != ret) { -+ MALI_PRINT_ERROR(("Failed to invalidate cache\n")); -+ } ++ /* The cache flush workaround is called in bottom half of ++ * job done but we delayed it. Now we should clean cache ++ * earlier. Then the GPU memory dump should be correct. ++ */ ++ kbase_backend_cacheclean(kbdev, event->katom); ++ } else ++ return NULL; + -+ mali_l2_cache_unlock(cache); -+ } ++ return event; +} + -+void mali_l2_cache_invalidate_all_pages(u32 *pages, u32 num_pages) ++static void debug_job_fault_stop(struct seq_file *m, void *v) +{ -+ u32 i; -+ for (i = 0; i < mali_global_num_l2s; i++) { -+ struct mali_l2_cache_core *cache = mali_global_l2s[i]; -+ u32 j; -+ -+ MALI_DEBUG_ASSERT_POINTER(cache); ++ struct kbase_device *kbdev = m->private; + -+ mali_l2_cache_lock(cache); ++ /* here we wake up the kbase_jd_done_worker after stop, it needs ++ * get the memory dump before the register dump in debug daemon, ++ * otherwise, the memory dump may be incorrect. ++ */ + -+ if (MALI_TRUE != cache->power_is_on) { -+ mali_l2_cache_unlock(cache); -+ continue; -+ } ++ if (v != NULL) { ++ kfree(v); ++ dev_info(kbdev->dev, "debug job fault seq stop stage 1"); + -+ for (j = 0; j < num_pages; j++) { -+ _mali_osk_errcode_t ret; ++ } else { ++ unsigned long flags; + -+ ret = mali_l2_cache_send_command(cache, -+ MALI400_L2_CACHE_REGISTER_CLEAR_PAGE, -+ pages[j]); -+ if (_MALI_OSK_ERR_OK != ret) { -+ MALI_PRINT_ERROR(("Failed to invalidate cache (page)\n")); -+ } ++ spin_lock_irqsave(&kbdev->job_fault_event_lock, flags); ++ if (!list_empty(&kbdev->job_fault_event_list)) { ++ kbase_job_fault_event_dequeue(kbdev, ++ &kbdev->job_fault_event_list); ++ wake_up(&kbdev->job_fault_resume_wq); + } -+ -+ mali_l2_cache_unlock(cache); ++ spin_unlock_irqrestore(&kbdev->job_fault_event_lock, flags); ++ dev_info(kbdev->dev, "debug job fault seq stop stage 2"); + } ++ +} + -+/* -------- local helper functions below -------- */ ++static const struct seq_operations ops = { ++ .start = debug_job_fault_start, ++ .next = debug_job_fault_next, ++ .stop = debug_job_fault_stop, ++ .show = debug_job_fault_show, ++}; + -+static void mali_l2_cache_reset(struct mali_l2_cache_core *cache) ++static int debug_job_fault_open(struct inode *in, struct file *file) +{ -+ MALI_DEBUG_ASSERT_POINTER(cache); -+ MALI_DEBUG_ASSERT_LOCK_HELD(cache->lock); -+ -+ /* Invalidate cache (just to keep it in a known state at startup) */ -+ mali_l2_cache_send_command(cache, MALI400_L2_CACHE_REGISTER_COMMAND, -+ MALI400_L2_CACHE_COMMAND_CLEAR_ALL); ++ struct kbase_device *kbdev = in->i_private; + -+ /* Enable cache */ -+ mali_hw_core_register_write(&cache->hw_core, -+ MALI400_L2_CACHE_REGISTER_ENABLE, -+ (u32)MALI400_L2_CACHE_ENABLE_ACCESS | -+ (u32)MALI400_L2_CACHE_ENABLE_READ_ALLOCATE); ++ seq_open(file, &ops); + -+ if (MALI400_L2_MAX_READS_NOT_SET != mali_l2_max_reads) { -+ mali_hw_core_register_write(&cache->hw_core, -+ MALI400_L2_CACHE_REGISTER_MAX_READS, -+ (u32)mali_l2_max_reads); -+ } ++ ((struct seq_file *)file->private_data)->private = kbdev; ++ dev_info(kbdev->dev, "debug job fault seq open"); + -+ /* Restart any performance counters (if enabled) */ -+ if (cache->counter_src0 != MALI_HW_CORE_NO_COUNTER) { ++ kbdev->job_fault_debug = true; + -+ mali_hw_core_register_write(&cache->hw_core, -+ MALI400_L2_CACHE_REGISTER_PERFCNT_SRC0, -+ cache->counter_src0); -+ } ++ return 0; + -+ if (cache->counter_src1 != MALI_HW_CORE_NO_COUNTER) { -+ mali_hw_core_register_write(&cache->hw_core, -+ MALI400_L2_CACHE_REGISTER_PERFCNT_SRC1, -+ cache->counter_src1); -+ } +} + -+static _mali_osk_errcode_t mali_l2_cache_send_command( -+ struct mali_l2_cache_core *cache, u32 reg, u32 val) ++static int debug_job_fault_release(struct inode *in, struct file *file) +{ -+ int i = 0; -+ const int loop_count = 100000; ++ struct kbase_device *kbdev = in->i_private; + -+ MALI_DEBUG_ASSERT_POINTER(cache); -+ MALI_DEBUG_ASSERT_LOCK_HELD(cache->lock); ++ seq_release(in, file); + -+ /* -+ * First, wait for L2 cache command handler to go idle. -+ * (Commands received while processing another command will be ignored) -+ */ -+ for (i = 0; i < loop_count; i++) { -+ if (!(mali_hw_core_register_read(&cache->hw_core, -+ MALI400_L2_CACHE_REGISTER_STATUS) & -+ (u32)MALI400_L2_CACHE_STATUS_COMMAND_BUSY)) { -+ break; -+ } -+ } ++ kbdev->job_fault_debug = false; + -+ if (i == loop_count) { -+ MALI_DEBUG_PRINT(1, ("Mali L2 cache: aborting wait for command interface to go idle\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ /* Clean the unprocessed job fault. After that, all the suspended ++ * contexts could be rescheduled. ++ */ ++ kbase_job_fault_event_cleanup(kbdev); + -+ /* then issue the command */ -+ mali_hw_core_register_write(&cache->hw_core, reg, val); ++ dev_info(kbdev->dev, "debug job fault seq close"); + -+ return _MALI_OSK_ERR_OK; ++ return 0; +} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h -new file mode 100755 -index 000000000000..c48a8844075f ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h -@@ -0,0 +1,124 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef __MALI_KERNEL_L2_CACHE_H__ -+#define __MALI_KERNEL_L2_CACHE_H__ -+ -+#include "mali_osk.h" -+#include "mali_hw_core.h" + -+#define MALI_MAX_NUMBER_OF_L2_CACHE_CORES 3 -+/* Maximum 1 GP and 4 PP for an L2 cache core (Mali-400 MP4) */ -+#define MALI_MAX_NUMBER_OF_GROUPS_PER_L2_CACHE 5 ++static const struct file_operations kbasep_debug_job_fault_fops = { ++ .open = debug_job_fault_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = debug_job_fault_release, ++}; + -+/** -+ * Definition of the L2 cache core struct -+ * Used to track a L2 cache unit in the system. -+ * Contains information about the mapping of the registers ++/* ++ * Initialize debugfs entry for job fault dump + */ -+struct mali_l2_cache_core { -+ /* Common HW core functionality */ -+ struct mali_hw_core hw_core; ++void kbase_debug_job_fault_debugfs_init(struct kbase_device *kbdev) ++{ ++ debugfs_create_file("job_fault", S_IRUGO, ++ kbdev->mali_debugfs_directory, kbdev, ++ &kbasep_debug_job_fault_fops); ++} + -+ /* Synchronize L2 cache access */ -+ _mali_osk_spinlock_irq_t *lock; + -+ /* Unique core ID */ -+ u32 core_id; ++int kbase_debug_job_fault_dev_init(struct kbase_device *kbdev) ++{ + -+ /* The power domain this L2 cache belongs to */ -+ struct mali_pm_domain *pm_domain; ++ INIT_LIST_HEAD(&kbdev->job_fault_event_list); + -+ /* MALI_TRUE if power is on for this L2 cache */ -+ mali_bool power_is_on; ++ init_waitqueue_head(&(kbdev->job_fault_wq)); ++ init_waitqueue_head(&(kbdev->job_fault_resume_wq)); ++ spin_lock_init(&kbdev->job_fault_event_lock); + -+ /* A "timestamp" to avoid unnecessary flushes */ -+ u32 last_invalidated_id; ++ kbdev->job_fault_resume_workq = alloc_workqueue( ++ "kbase_job_fault_resume_work_queue", WQ_MEM_RECLAIM, 1); ++ if (!kbdev->job_fault_resume_workq) ++ return -ENOMEM; + -+ /* Performance counter 0, MALI_HW_CORE_NO_COUNTER for disabled */ -+ u32 counter_src0; ++ kbdev->job_fault_debug = false; + -+ /* Performance counter 1, MALI_HW_CORE_NO_COUNTER for disabled */ -+ u32 counter_src1; ++ return 0; ++} + -+ /* -+ * Performance counter 0 value base/offset -+ * (allows accumulative reporting even after power off) -+ */ -+ u32 counter_value0_base; ++/* ++ * Release the relevant resource per device ++ */ ++void kbase_debug_job_fault_dev_term(struct kbase_device *kbdev) ++{ ++ destroy_workqueue(kbdev->job_fault_resume_workq); ++} + -+ /* -+ * Performance counter 0 value base/offset -+ * (allows accumulative reporting even after power off) -+ */ -+ u32 counter_value1_base; + -+ /* Used by PM domains to link L2 caches of same domain */ -+ _mali_osk_list_t pm_domain_list; -+}; ++/* ++ * Initialize the relevant data structure per context ++ */ ++void kbase_debug_job_fault_context_init(struct kbase_context *kctx) ++{ + -+_mali_osk_errcode_t mali_l2_cache_initialize(void); -+void mali_l2_cache_terminate(void); ++ /* We need allocate double size register range ++ * Because this memory will keep the register address and value ++ */ ++ kctx->reg_dump = vmalloc(0x4000 * 2); ++ if (kctx->reg_dump == NULL) ++ return; + -+struct mali_l2_cache_core *mali_l2_cache_create( -+ _mali_osk_resource_t *resource, u32 domain_index); -+void mali_l2_cache_delete(struct mali_l2_cache_core *cache); ++ if (kbase_debug_job_fault_reg_snapshot_init(kctx, 0x4000) == false) { ++ vfree(kctx->reg_dump); ++ kctx->reg_dump = NULL; ++ } ++ INIT_LIST_HEAD(&kctx->job_fault_resume_event_list); ++ atomic_set(&kctx->job_fault_count, 0); + -+MALI_STATIC_INLINE u32 mali_l2_cache_get_id(struct mali_l2_cache_core *cache) -+{ -+ MALI_DEBUG_ASSERT_POINTER(cache); -+ return cache->core_id; +} + -+MALI_STATIC_INLINE struct mali_pm_domain *mali_l2_cache_get_pm_domain( -+ struct mali_l2_cache_core *cache) ++/* ++ * release the relevant resource per context ++ */ ++void kbase_debug_job_fault_context_term(struct kbase_context *kctx) +{ -+ MALI_DEBUG_ASSERT_POINTER(cache); -+ return cache->pm_domain; ++ vfree(kctx->reg_dump); +} + -+void mali_l2_cache_power_up(struct mali_l2_cache_core *cache); -+void mali_l2_cache_power_down(struct mali_l2_cache_core *cache); -+ -+void mali_l2_cache_core_set_counter_src( -+ struct mali_l2_cache_core *cache, u32 source_id, u32 counter); ++#else /* CONFIG_DEBUG_FS */ + -+MALI_STATIC_INLINE u32 mali_l2_cache_core_get_counter_src0( -+ struct mali_l2_cache_core *cache) ++int kbase_debug_job_fault_dev_init(struct kbase_device *kbdev) +{ -+ MALI_DEBUG_ASSERT_POINTER(cache); -+ return cache->counter_src0; ++ kbdev->job_fault_debug = false; ++ ++ return 0; +} + -+MALI_STATIC_INLINE u32 mali_l2_cache_core_get_counter_src1( -+ struct mali_l2_cache_core *cache) ++void kbase_debug_job_fault_dev_term(struct kbase_device *kbdev) +{ -+ MALI_DEBUG_ASSERT_POINTER(cache); -+ return cache->counter_src1; +} + -+void mali_l2_cache_core_get_counter_values( -+ struct mali_l2_cache_core *cache, -+ u32 *src0, u32 *value0, u32 *src1, u32 *value1); -+ -+struct mali_l2_cache_core *mali_l2_cache_core_get_glob_l2_core(u32 index); -+u32 mali_l2_cache_core_get_glob_num_l2_cores(void); -+ -+struct mali_group *mali_l2_cache_get_group( -+ struct mali_l2_cache_core *cache, u32 index); -+ -+void mali_l2_cache_invalidate(struct mali_l2_cache_core *cache); -+void mali_l2_cache_invalidate_conditional( -+ struct mali_l2_cache_core *cache, u32 id); -+ -+void mali_l2_cache_invalidate_all(void); -+void mali_l2_cache_invalidate_all_pages(u32 *pages, u32 num_pages); -+ -+#endif /* __MALI_KERNEL_L2_CACHE_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c ++#endif /* CONFIG_DEBUG_FS */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h new file mode 100755 -index 000000000000..eb95998f1469 +index 000000000..a2bf8983c --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c -@@ -0,0 +1,68 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h +@@ -0,0 +1,96 @@ +/* -+ * Copyright (C) 2011-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include "mali_mem_validation.h" -+#include "mali_osk.h" -+#include "mali_kernel_common.h" + -+#define MALI_INVALID_MEM_ADDR 0xFFFFFFFF + -+typedef struct { -+ u32 phys_base; /**< Mali physical base of the memory, page aligned */ -+ u32 size; /**< size in bytes of the memory, multiple of page size */ -+} _mali_mem_validation_t; ++#ifndef _KBASE_DEBUG_JOB_FAULT_H ++#define _KBASE_DEBUG_JOB_FAULT_H + -+static _mali_mem_validation_t mali_mem_validator = { MALI_INVALID_MEM_ADDR, MALI_INVALID_MEM_ADDR }; ++#include ++#include + -+_mali_osk_errcode_t mali_mem_validation_add_range(u32 start, u32 size) -+{ -+ /* Check that no other MEM_VALIDATION resources exist */ -+ if (MALI_INVALID_MEM_ADDR != mali_mem_validator.phys_base) { -+ MALI_PRINT_ERROR(("Failed to add frame buffer memory; another range is already specified\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } ++#define REGISTER_DUMP_TERMINATION_FLAG 0xFFFFFFFF + -+ /* Check restrictions on page alignment */ -+ if ((0 != (start & (~_MALI_OSK_CPU_PAGE_MASK))) || -+ (0 != (size & (~_MALI_OSK_CPU_PAGE_MASK)))) { -+ MALI_PRINT_ERROR(("Failed to add frame buffer memory; incorrect alignment\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } ++/** ++ * kbase_debug_job_fault_dev_init - Create the fault event wait queue ++ * per device and initialize the required lists. ++ * @kbdev: Device pointer ++ * ++ * Return: Zero on success or a negative error code. ++ */ ++int kbase_debug_job_fault_dev_init(struct kbase_device *kbdev); + -+ mali_mem_validator.phys_base = start; -+ mali_mem_validator.size = size; -+ MALI_DEBUG_PRINT(2, ("Memory Validator installed for Mali physical address base=0x%08X, size=0x%08X\n", -+ mali_mem_validator.phys_base, mali_mem_validator.size)); ++/** ++ * kbase_debug_job_fault_debugfs_init - Initialize job fault debug sysfs ++ * @kbdev: Device pointer ++ */ ++void kbase_debug_job_fault_debugfs_init(struct kbase_device *kbdev); + -+ return _MALI_OSK_ERR_OK; -+} ++/** ++ * kbase_debug_job_fault_dev_term - Clean up resources created in ++ * kbase_debug_job_fault_dev_init. ++ * @kbdev: Device pointer ++ */ ++void kbase_debug_job_fault_dev_term(struct kbase_device *kbdev); + -+_mali_osk_errcode_t mali_mem_validation_check(u32 phys_addr, u32 size) -+{ -+#if 0 -+ if (phys_addr < (phys_addr + size)) { /* Don't allow overflow (or zero size) */ -+ if ((0 == (phys_addr & (~_MALI_OSK_CPU_PAGE_MASK))) && -+ (0 == (size & (~_MALI_OSK_CPU_PAGE_MASK)))) { -+ if ((phys_addr >= mali_mem_validator.phys_base) && -+ ((phys_addr + (size - 1)) >= mali_mem_validator.phys_base) && -+ (phys_addr <= (mali_mem_validator.phys_base + (mali_mem_validator.size - 1))) && -+ ((phys_addr + (size - 1)) <= (mali_mem_validator.phys_base + (mali_mem_validator.size - 1)))) { -+ MALI_DEBUG_PRINT(3, ("Accepted range 0x%08X + size 0x%08X (= 0x%08X)\n", phys_addr, size, (phys_addr + size - 1))); -+ return _MALI_OSK_ERR_OK; -+ } -+ } -+ } ++/** ++ * kbase_debug_job_fault_context_init - Initialize the relevant ++ * data structure per context ++ * @kctx: KBase context pointer ++ */ ++void kbase_debug_job_fault_context_init(struct kbase_context *kctx); + -+ MALI_PRINT_ERROR(("MALI PHYSICAL RANGE VALIDATION ERROR: The range supplied was: phys_base=0x%08X, size=0x%08X\n", phys_addr, size)); ++/** ++ * kbase_debug_job_fault_context_term - Release the relevant ++ * resource per context ++ * @kctx: KBase context pointer ++ */ ++void kbase_debug_job_fault_context_term(struct kbase_context *kctx); + -+ return _MALI_OSK_ERR_FAULT; -+#endif -+ return _MALI_OSK_ERR_OK; -+} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h -new file mode 100755 -index 000000000000..05013f46f901 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h -@@ -0,0 +1,19 @@ -+/* -+ * Copyright (C) 2011-2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * kbase_debug_job_fault_process - Process the failed job. ++ * It will send a event and wake up the job fault waiting queue ++ * Then create a work queue to wait for job dump finish ++ * This function should be called in the interrupt handler and before ++ * jd_done that make sure the jd_done_worker will be delayed until the ++ * job dump finish ++ * @katom: The failed atom pointer ++ * @completion_code: the job status ++ * @return true if dump is going on + */ ++bool kbase_debug_job_fault_process(struct kbase_jd_atom *katom, ++ u32 completion_code); + -+#ifndef __MALI_MEM_VALIDATION_H__ -+#define __MALI_MEM_VALIDATION_H__ + -+#include "mali_osk.h" ++/** ++ * kbase_debug_job_fault_reg_snapshot_init - Set the interested registers ++ * address during the job fault process, the relevant registers will ++ * be saved when a job fault happen ++ * @kctx: KBase context pointer ++ * @reg_range: Maximum register address space ++ * @return true if initializing successfully ++ */ ++bool kbase_debug_job_fault_reg_snapshot_init(struct kbase_context *kctx, ++ int reg_range); + -+_mali_osk_errcode_t mali_mem_validation_add_range(u32 start, u32 size); -+_mali_osk_errcode_t mali_mem_validation_check(u32 phys_addr, u32 size); ++/** ++ * kbase_job_fault_get_reg_snapshot - Read the interested registers for ++ * failed job dump ++ * @kctx: KBase context pointer ++ * @return true if getting registers successfully ++ */ ++bool kbase_job_fault_get_reg_snapshot(struct kbase_context *kctx); + -+#endif /* __MALI_MEM_VALIDATION_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu.c b/drivers/gpu/arm/mali400/mali/common/mali_mmu.c ++#endif /*_KBASE_DEBUG_JOB_FAULT_H*/ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c new file mode 100755 -index 000000000000..b82486fa66c0 +index 000000000..6f2cbdf57 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.c -@@ -0,0 +1,433 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c +@@ -0,0 +1,306 @@ +/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2013-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_osk_list.h" -+#include "mali_ukk.h" -+ -+#include "mali_mmu.h" -+#include "mali_hw_core.h" -+#include "mali_group.h" -+#include "mali_mmu_page_directory.h" + -+/** -+ * Size of the MMU registers in bytes -+ */ -+#define MALI_MMU_REGISTERS_SIZE 0x24 + -+/** -+ * MMU commands -+ * These are the commands that can be sent -+ * to the MMU unit. ++/* ++ * Debugfs interface to dump the memory visible to the GPU + */ -+typedef enum mali_mmu_command { -+ MALI_MMU_COMMAND_ENABLE_PAGING = 0x00, /**< Enable paging (memory translation) */ -+ MALI_MMU_COMMAND_DISABLE_PAGING = 0x01, /**< Disable paging (memory translation) */ -+ MALI_MMU_COMMAND_ENABLE_STALL = 0x02, /**< Enable stall on page fault */ -+ MALI_MMU_COMMAND_DISABLE_STALL = 0x03, /**< Disable stall on page fault */ -+ MALI_MMU_COMMAND_ZAP_CACHE = 0x04, /**< Zap the entire page table cache */ -+ MALI_MMU_COMMAND_PAGE_FAULT_DONE = 0x05, /**< Page fault processed */ -+ MALI_MMU_COMMAND_HARD_RESET = 0x06 /**< Reset the MMU back to power-on settings */ -+} mali_mmu_command; -+ -+static void mali_mmu_probe_trigger(void *data); -+static _mali_osk_errcode_t mali_mmu_probe_ack(void *data); -+ -+MALI_STATIC_INLINE _mali_osk_errcode_t mali_mmu_raw_reset(struct mali_mmu_core *mmu); -+ -+/* page fault queue flush helper pages -+ * note that the mapping pointers are currently unused outside of the initialization functions */ -+static mali_dma_addr mali_page_fault_flush_page_directory = MALI_INVALID_PAGE; -+static mali_io_address mali_page_fault_flush_page_directory_mapping = NULL; -+static mali_dma_addr mali_page_fault_flush_page_table = MALI_INVALID_PAGE; -+static mali_io_address mali_page_fault_flush_page_table_mapping = NULL; -+static mali_dma_addr mali_page_fault_flush_data_page = MALI_INVALID_PAGE; -+static mali_io_address mali_page_fault_flush_data_page_mapping = NULL; + -+/* an empty page directory (no address valid) which is active on any MMU not currently marked as in use */ -+static mali_dma_addr mali_empty_page_directory_phys = MALI_INVALID_PAGE; -+static mali_io_address mali_empty_page_directory_virt = NULL; ++#include "mali_kbase_debug_mem_view.h" ++#include "mali_kbase.h" + ++#include ++#include + -+_mali_osk_errcode_t mali_mmu_initialize(void) -+{ -+ /* allocate the helper pages */ -+ mali_empty_page_directory_phys = mali_allocate_empty_page(&mali_empty_page_directory_virt); -+ if (0 == mali_empty_page_directory_phys) { -+ MALI_DEBUG_PRINT_ERROR(("Mali MMU: Could not allocate empty page directory.\n")); -+ mali_empty_page_directory_phys = MALI_INVALID_PAGE; -+ return _MALI_OSK_ERR_NOMEM; -+ } ++#ifdef CONFIG_DEBUG_FS + -+ if (_MALI_OSK_ERR_OK != mali_create_fault_flush_pages(&mali_page_fault_flush_page_directory, -+ &mali_page_fault_flush_page_directory_mapping, -+ &mali_page_fault_flush_page_table, -+ &mali_page_fault_flush_page_table_mapping, -+ &mali_page_fault_flush_data_page, -+ &mali_page_fault_flush_data_page_mapping)) { -+ MALI_DEBUG_PRINT_ERROR(("Mali MMU: Could not allocate fault flush pages\n")); -+ mali_free_empty_page(mali_empty_page_directory_phys, mali_empty_page_directory_virt); -+ mali_empty_page_directory_phys = MALI_INVALID_PAGE; -+ mali_empty_page_directory_virt = NULL; -+ return _MALI_OSK_ERR_NOMEM; -+ } ++struct debug_mem_mapping { ++ struct list_head node; + -+ return _MALI_OSK_ERR_OK; -+} ++ struct kbase_mem_phy_alloc *alloc; ++ unsigned long flags; + -+void mali_mmu_terminate(void) -+{ -+ MALI_DEBUG_PRINT(3, ("Mali MMU: terminating\n")); ++ u64 start_pfn; ++ size_t nr_pages; ++}; + -+ /* Free global helper pages */ -+ mali_free_empty_page(mali_empty_page_directory_phys, mali_empty_page_directory_virt); -+ mali_empty_page_directory_phys = MALI_INVALID_PAGE; -+ mali_empty_page_directory_virt = NULL; ++struct debug_mem_data { ++ struct list_head mapping_list; ++ struct kbase_context *kctx; ++}; + -+ /* Free the page fault flush pages */ -+ mali_destroy_fault_flush_pages(&mali_page_fault_flush_page_directory, -+ &mali_page_fault_flush_page_directory_mapping, -+ &mali_page_fault_flush_page_table, -+ &mali_page_fault_flush_page_table_mapping, -+ &mali_page_fault_flush_data_page, -+ &mali_page_fault_flush_data_page_mapping); -+} ++struct debug_mem_seq_off { ++ struct list_head *lh; ++ size_t offset; ++}; + -+struct mali_mmu_core *mali_mmu_create(_mali_osk_resource_t *resource, struct mali_group *group, mali_bool is_virtual) ++static void *debug_mem_start(struct seq_file *m, loff_t *_pos) +{ -+ struct mali_mmu_core *mmu = NULL; -+ -+ MALI_DEBUG_ASSERT_POINTER(resource); -+ -+ MALI_DEBUG_PRINT(2, ("Mali MMU: Creating Mali MMU: %s\n", resource->description)); -+ -+ mmu = _mali_osk_calloc(1, sizeof(struct mali_mmu_core)); -+ if (NULL != mmu) { -+ if (_MALI_OSK_ERR_OK == mali_hw_core_create(&mmu->hw_core, resource, MALI_MMU_REGISTERS_SIZE)) { -+ if (_MALI_OSK_ERR_OK == mali_group_add_mmu_core(group, mmu)) { -+ if (is_virtual) { -+ /* Skip reset and IRQ setup for virtual MMU */ -+ return mmu; -+ } ++ struct debug_mem_data *mem_data = m->private; ++ struct debug_mem_seq_off *data; ++ struct debug_mem_mapping *map; ++ loff_t pos = *_pos; + -+ if (_MALI_OSK_ERR_OK == mali_mmu_reset(mmu)) { -+ /* Setup IRQ handlers (which will do IRQ probing if needed) */ -+ mmu->irq = _mali_osk_irq_init(resource->irq, -+ mali_group_upper_half_mmu, -+ group, -+ mali_mmu_probe_trigger, -+ mali_mmu_probe_ack, -+ mmu, -+ resource->description); -+ if (NULL != mmu->irq) { -+ return mmu; -+ } else { -+ MALI_PRINT_ERROR(("Mali MMU: Failed to setup interrupt handlers for MMU %s\n", mmu->hw_core.description)); -+ } -+ } -+ mali_group_remove_mmu_core(group); -+ } else { -+ MALI_PRINT_ERROR(("Mali MMU: Failed to add core %s to group\n", mmu->hw_core.description)); -+ } -+ mali_hw_core_delete(&mmu->hw_core); ++ list_for_each_entry(map, &mem_data->mapping_list, node) { ++ if (pos >= map->nr_pages) { ++ pos -= map->nr_pages; ++ } else { ++ data = kmalloc(sizeof(*data), GFP_KERNEL); ++ if (!data) ++ return NULL; ++ data->lh = &map->node; ++ data->offset = pos; ++ return data; + } -+ -+ _mali_osk_free(mmu); -+ } else { -+ MALI_PRINT_ERROR(("Failed to allocate memory for MMU\n")); + } + ++ /* Beyond the end */ + return NULL; +} + -+void mali_mmu_delete(struct mali_mmu_core *mmu) ++static void debug_mem_stop(struct seq_file *m, void *v) +{ -+ if (NULL != mmu->irq) { -+ _mali_osk_irq_term(mmu->irq); -+ } -+ -+ mali_hw_core_delete(&mmu->hw_core); -+ _mali_osk_free(mmu); ++ kfree(v); +} + -+static void mali_mmu_enable_paging(struct mali_mmu_core *mmu) ++static void *debug_mem_next(struct seq_file *m, void *v, loff_t *pos) +{ -+ int i; ++ struct debug_mem_data *mem_data = m->private; ++ struct debug_mem_seq_off *data = v; ++ struct debug_mem_mapping *map; + -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_ENABLE_PAGING); ++ map = list_entry(data->lh, struct debug_mem_mapping, node); + -+ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; ++i) { -+ if (mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS) & MALI_MMU_STATUS_BIT_PAGING_ENABLED) { -+ break; -+ } ++ if (data->offset < map->nr_pages - 1) { ++ data->offset++; ++ ++*pos; ++ return data; + } -+ if (MALI_REG_POLL_COUNT_FAST == i) { -+ MALI_PRINT_ERROR(("Enable paging request failed, MMU status is 0x%08X\n", mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS))); ++ ++ if (list_is_last(data->lh, &mem_data->mapping_list)) { ++ kfree(data); ++ return NULL; + } ++ ++ data->lh = data->lh->next; ++ data->offset = 0; ++ ++*pos; ++ ++ return data; +} + -+/** -+ * Issues the enable stall command to the MMU and waits for HW to complete the request -+ * @param mmu The MMU to enable paging for -+ * @return MALI_TRUE if HW stall was successfully engaged, otherwise MALI_FALSE (req timed out) -+ */ -+static mali_bool mali_mmu_enable_stall(struct mali_mmu_core *mmu) ++static int debug_mem_show(struct seq_file *m, void *v) +{ -+ int i; -+ u32 mmu_status = mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS); -+ -+ if (0 == (mmu_status & MALI_MMU_STATUS_BIT_PAGING_ENABLED)) { -+ MALI_DEBUG_PRINT(4, ("MMU stall is implicit when Paging is not enabled.\n")); -+ return MALI_TRUE; -+ } ++ struct debug_mem_data *mem_data = m->private; ++ struct debug_mem_seq_off *data = v; ++ struct debug_mem_mapping *map; ++ int i, j; ++ struct page *page; ++ uint32_t *mapping; ++ pgprot_t prot = PAGE_KERNEL; + -+ if (mmu_status & MALI_MMU_STATUS_BIT_PAGE_FAULT_ACTIVE) { -+ MALI_DEBUG_PRINT(3, ("Aborting MMU stall request since it is in pagefault state.\n")); -+ return MALI_FALSE; -+ } ++ map = list_entry(data->lh, struct debug_mem_mapping, node); + -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_ENABLE_STALL); ++ kbase_gpu_vm_lock(mem_data->kctx); + -+ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; ++i) { -+ mmu_status = mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS); -+ if (mmu_status & MALI_MMU_STATUS_BIT_PAGE_FAULT_ACTIVE) { -+ break; -+ } -+ if ((mmu_status & MALI_MMU_STATUS_BIT_STALL_ACTIVE) && (0 == (mmu_status & MALI_MMU_STATUS_BIT_STALL_NOT_ACTIVE))) { -+ break; -+ } -+ if (0 == (mmu_status & (MALI_MMU_STATUS_BIT_PAGING_ENABLED))) { -+ break; -+ } -+ } -+ if (MALI_REG_POLL_COUNT_FAST == i) { -+ MALI_DEBUG_PRINT(2, ("Enable stall request failed, MMU status is 0x%08X\n", mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS))); -+ return MALI_FALSE; ++ if (data->offset >= map->alloc->nents) { ++ seq_printf(m, "%016llx: Unbacked page\n\n", (map->start_pfn + ++ data->offset) << PAGE_SHIFT); ++ goto out; + } + -+ if (mmu_status & MALI_MMU_STATUS_BIT_PAGE_FAULT_ACTIVE) { -+ MALI_DEBUG_PRINT(2, ("Aborting MMU stall request since it has a pagefault.\n")); -+ return MALI_FALSE; -+ } ++ if (!(map->flags & KBASE_REG_CPU_CACHED)) ++ prot = pgprot_writecombine(prot); + -+ return MALI_TRUE; -+} ++ page = pfn_to_page(PFN_DOWN(map->alloc->pages[data->offset])); ++ mapping = vmap(&page, 1, VM_MAP, prot); ++ if (!mapping) ++ goto out; + -+/** -+ * Issues the disable stall command to the MMU and waits for HW to complete the request -+ * @param mmu The MMU to enable paging for -+ */ -+static void mali_mmu_disable_stall(struct mali_mmu_core *mmu) -+{ -+ int i; -+ u32 mmu_status = mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS); ++ for (i = 0; i < PAGE_SIZE; i += 4*sizeof(*mapping)) { ++ seq_printf(m, "%016llx:", i + ((map->start_pfn + ++ data->offset) << PAGE_SHIFT)); + -+ if (0 == (mmu_status & MALI_MMU_STATUS_BIT_PAGING_ENABLED)) { -+ MALI_DEBUG_PRINT(3, ("MMU disable skipped since it was not enabled.\n")); -+ return; -+ } -+ if (mmu_status & MALI_MMU_STATUS_BIT_PAGE_FAULT_ACTIVE) { -+ MALI_DEBUG_PRINT(2, ("Aborting MMU disable stall request since it is in pagefault state.\n")); -+ return; ++ for (j = 0; j < 4*sizeof(*mapping); j += sizeof(*mapping)) ++ seq_printf(m, " %08x", mapping[(i+j)/sizeof(*mapping)]); ++ seq_putc(m, '\n'); + } + -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_DISABLE_STALL); ++ vunmap(mapping); + -+ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; ++i) { -+ u32 status = mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS); -+ if (0 == (status & MALI_MMU_STATUS_BIT_STALL_ACTIVE)) { -+ break; -+ } -+ if (status & MALI_MMU_STATUS_BIT_PAGE_FAULT_ACTIVE) { -+ break; -+ } -+ if (0 == (mmu_status & MALI_MMU_STATUS_BIT_PAGING_ENABLED)) { -+ break; -+ } -+ } -+ if (MALI_REG_POLL_COUNT_FAST == i) MALI_DEBUG_PRINT(1, ("Disable stall request failed, MMU status is 0x%08X\n", mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS))); -+} ++ seq_putc(m, '\n'); + -+void mali_mmu_page_fault_done(struct mali_mmu_core *mmu) -+{ -+ MALI_DEBUG_PRINT(4, ("Mali MMU: %s: Leaving page fault mode\n", mmu->hw_core.description)); -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_PAGE_FAULT_DONE); ++out: ++ kbase_gpu_vm_unlock(mem_data->kctx); ++ return 0; +} + -+MALI_STATIC_INLINE _mali_osk_errcode_t mali_mmu_raw_reset(struct mali_mmu_core *mmu) ++static const struct seq_operations ops = { ++ .start = debug_mem_start, ++ .next = debug_mem_next, ++ .stop = debug_mem_stop, ++ .show = debug_mem_show, ++}; ++ ++static int debug_mem_zone_open(struct rb_root *rbtree, ++ struct debug_mem_data *mem_data) +{ -+ int i; ++ int ret = 0; ++ struct rb_node *p; ++ struct kbase_va_region *reg; ++ struct debug_mem_mapping *mapping; + -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_DTE_ADDR, 0xCAFEBABE); -+ MALI_DEBUG_ASSERT(0xCAFEB000 == mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_DTE_ADDR)); -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_HARD_RESET); ++ for (p = rb_first(rbtree); p; p = rb_next(p)) { ++ reg = rb_entry(p, struct kbase_va_region, rblink); + -+ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; ++i) { -+ if (mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_DTE_ADDR) == 0) { -+ break; ++ if (reg->gpu_alloc == NULL) ++ /* Empty region - ignore */ ++ continue; ++ ++ mapping = kmalloc(sizeof(*mapping), GFP_KERNEL); ++ if (!mapping) { ++ ret = -ENOMEM; ++ goto out; + } -+ } -+ if (MALI_REG_POLL_COUNT_FAST == i) { -+ MALI_PRINT_ERROR(("Reset request failed, MMU status is 0x%08X\n", mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS))); -+ return _MALI_OSK_ERR_FAULT; ++ ++ mapping->alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); ++ mapping->start_pfn = reg->start_pfn; ++ mapping->nr_pages = reg->nr_pages; ++ mapping->flags = reg->flags; ++ list_add_tail(&mapping->node, &mem_data->mapping_list); + } + -+ return _MALI_OSK_ERR_OK; ++out: ++ return ret; +} + -+_mali_osk_errcode_t mali_mmu_reset(struct mali_mmu_core *mmu) ++static int debug_mem_open(struct inode *i, struct file *file) +{ -+ _mali_osk_errcode_t err = _MALI_OSK_ERR_FAULT; -+ mali_bool stall_success; -+ MALI_DEBUG_ASSERT_POINTER(mmu); ++ struct file *kctx_file = i->i_private; ++ struct kbase_context *kctx = kctx_file->private_data; ++ struct debug_mem_data *mem_data; ++ int ret; + -+ stall_success = mali_mmu_enable_stall(mmu); -+ if (!stall_success) { -+ err = _MALI_OSK_ERR_BUSY; ++ ret = seq_open(file, &ops); ++ if (ret) ++ return ret; ++ ++ mem_data = kmalloc(sizeof(*mem_data), GFP_KERNEL); ++ if (!mem_data) { ++ ret = -ENOMEM; ++ goto out; + } + -+ MALI_DEBUG_PRINT(3, ("Mali MMU: mali_kernel_mmu_reset: %s\n", mmu->hw_core.description)); ++ mem_data->kctx = kctx; + -+ if (_MALI_OSK_ERR_OK == mali_mmu_raw_reset(mmu)) { -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_INT_MASK, MALI_MMU_INTERRUPT_PAGE_FAULT | MALI_MMU_INTERRUPT_READ_BUS_ERROR); -+ /* no session is active, so just activate the empty page directory */ -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_DTE_ADDR, mali_empty_page_directory_phys); -+ mali_mmu_enable_paging(mmu); -+ err = _MALI_OSK_ERR_OK; -+ } -+ mali_mmu_disable_stall(mmu); ++ INIT_LIST_HEAD(&mem_data->mapping_list); + -+ return err; -+} ++ get_file(kctx_file); + -+mali_bool mali_mmu_zap_tlb(struct mali_mmu_core *mmu) -+{ -+ mali_bool stall_success = mali_mmu_enable_stall(mmu); ++ kbase_gpu_vm_lock(kctx); + -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_ZAP_CACHE); ++ ret = debug_mem_zone_open(&kctx->reg_rbtree_same, mem_data); ++ if (0 != ret) { ++ kbase_gpu_vm_unlock(kctx); ++ goto out; ++ } + -+ if (MALI_FALSE == stall_success) { -+ /* False means that it is in Pagefault state. Not possible to disable_stall then */ -+ return MALI_FALSE; ++ ret = debug_mem_zone_open(&kctx->reg_rbtree_exec, mem_data); ++ if (0 != ret) { ++ kbase_gpu_vm_unlock(kctx); ++ goto out; + } + -+ mali_mmu_disable_stall(mmu); -+ return MALI_TRUE; -+} ++ ret = debug_mem_zone_open(&kctx->reg_rbtree_custom, mem_data); ++ if (0 != ret) { ++ kbase_gpu_vm_unlock(kctx); ++ goto out; ++ } + -+void mali_mmu_zap_tlb_without_stall(struct mali_mmu_core *mmu) -+{ -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_ZAP_CACHE); -+} ++ kbase_gpu_vm_unlock(kctx); + ++ ((struct seq_file *)file->private_data)->private = mem_data; + -+void mali_mmu_invalidate_page(struct mali_mmu_core *mmu, u32 mali_address) -+{ -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_ZAP_ONE_LINE, MALI_MMU_PDE_ENTRY(mali_address)); -+} ++ return 0; + -+static void mali_mmu_activate_address_space(struct mali_mmu_core *mmu, u32 page_directory) -+{ -+ /* The MMU must be in stalled or page fault mode, for this writing to work */ -+ MALI_DEBUG_ASSERT(0 != (mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS) -+ & (MALI_MMU_STATUS_BIT_STALL_ACTIVE | MALI_MMU_STATUS_BIT_PAGE_FAULT_ACTIVE))); -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_DTE_ADDR, page_directory); -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_COMMAND, MALI_MMU_COMMAND_ZAP_CACHE); ++out: ++ if (mem_data) { ++ while (!list_empty(&mem_data->mapping_list)) { ++ struct debug_mem_mapping *mapping; + ++ mapping = list_first_entry(&mem_data->mapping_list, ++ struct debug_mem_mapping, node); ++ kbase_mem_phy_alloc_put(mapping->alloc); ++ list_del(&mapping->node); ++ kfree(mapping); ++ } ++ fput(kctx_file); ++ kfree(mem_data); ++ } ++ seq_release(i, file); ++ return ret; +} + -+void mali_mmu_activate_page_directory(struct mali_mmu_core *mmu, struct mali_page_directory *pagedir) ++static int debug_mem_release(struct inode *inode, struct file *file) +{ -+ mali_bool stall_success; -+ MALI_DEBUG_ASSERT_POINTER(mmu); -+ -+ MALI_DEBUG_PRINT(5, ("Asked to activate page directory 0x%x on MMU %s\n", pagedir, mmu->hw_core.description)); -+ -+ stall_success = mali_mmu_enable_stall(mmu); -+ MALI_DEBUG_ASSERT(stall_success); -+ MALI_IGNORE(stall_success); -+ mali_mmu_activate_address_space(mmu, pagedir->page_directory); -+ mali_mmu_disable_stall(mmu); -+} ++ struct file *kctx_file = inode->i_private; ++ struct seq_file *sfile = file->private_data; ++ struct debug_mem_data *mem_data = sfile->private; ++ struct debug_mem_mapping *mapping; + -+void mali_mmu_activate_empty_page_directory(struct mali_mmu_core *mmu) -+{ -+ mali_bool stall_success; ++ seq_release(inode, file); + -+ MALI_DEBUG_ASSERT_POINTER(mmu); -+ MALI_DEBUG_PRINT(3, ("Activating the empty page directory on MMU %s\n", mmu->hw_core.description)); ++ while (!list_empty(&mem_data->mapping_list)) { ++ mapping = list_first_entry(&mem_data->mapping_list, ++ struct debug_mem_mapping, node); ++ kbase_mem_phy_alloc_put(mapping->alloc); ++ list_del(&mapping->node); ++ kfree(mapping); ++ } + -+ stall_success = mali_mmu_enable_stall(mmu); ++ kfree(mem_data); + -+ /* This function can only be called when the core is idle, so it could not fail. */ -+ MALI_DEBUG_ASSERT(stall_success); -+ MALI_IGNORE(stall_success); ++ fput(kctx_file); + -+ mali_mmu_activate_address_space(mmu, mali_empty_page_directory_phys); -+ mali_mmu_disable_stall(mmu); ++ return 0; +} + -+void mali_mmu_activate_fault_flush_page_directory(struct mali_mmu_core *mmu) -+{ -+ mali_bool stall_success; -+ MALI_DEBUG_ASSERT_POINTER(mmu); -+ -+ MALI_DEBUG_PRINT(3, ("Activating the page fault flush page directory on MMU %s\n", mmu->hw_core.description)); -+ stall_success = mali_mmu_enable_stall(mmu); -+ /* This function is expect to fail the stalling, since it might be in PageFault mode when it is called */ -+ mali_mmu_activate_address_space(mmu, mali_page_fault_flush_page_directory); -+ if (MALI_TRUE == stall_success) mali_mmu_disable_stall(mmu); -+} ++static const struct file_operations kbase_debug_mem_view_fops = { ++ .open = debug_mem_open, ++ .release = debug_mem_release, ++ .read = seq_read, ++ .llseek = seq_lseek ++}; + -+/* Is called when we want the mmu to give an interrupt */ -+static void mali_mmu_probe_trigger(void *data) ++/** ++ * kbase_debug_mem_view_init - Initialise the mem_view sysfs file ++ * @kctx_file: The /dev/mali0 file instance for the context ++ * ++ * This function creates a "mem_view" file which can be used to get a view of ++ * the context's memory as the GPU sees it (i.e. using the GPU's page tables). ++ * ++ * The file is cleaned up by a call to debugfs_remove_recursive() deleting the ++ * parent directory. ++ */ ++void kbase_debug_mem_view_init(struct file *kctx_file) +{ -+ struct mali_mmu_core *mmu = (struct mali_mmu_core *)data; -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_INT_RAWSTAT, MALI_MMU_INTERRUPT_PAGE_FAULT | MALI_MMU_INTERRUPT_READ_BUS_ERROR); ++ struct kbase_context *kctx = kctx_file->private_data; ++ ++ debugfs_create_file("mem_view", S_IRUGO, kctx->kctx_dentry, kctx_file, ++ &kbase_debug_mem_view_fops); +} + -+/* Is called when the irq probe wants the mmu to acknowledge an interrupt from the hw */ -+static _mali_osk_errcode_t mali_mmu_probe_ack(void *data) -+{ -+ struct mali_mmu_core *mmu = (struct mali_mmu_core *)data; -+ u32 int_stat; ++#endif +diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h +new file mode 100755 +index 000000000..20ab51a77 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h +@@ -0,0 +1,25 @@ ++/* ++ * ++ * (C) COPYRIGHT 2013-2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ int_stat = mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_INT_STATUS); + -+ MALI_DEBUG_PRINT(2, ("mali_mmu_probe_irq_acknowledge: intstat 0x%x\n", int_stat)); -+ if (int_stat & MALI_MMU_INTERRUPT_PAGE_FAULT) { -+ MALI_DEBUG_PRINT(2, ("Probe: Page fault detect: PASSED\n")); -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_INT_CLEAR, MALI_MMU_INTERRUPT_PAGE_FAULT); -+ } else { -+ MALI_DEBUG_PRINT(1, ("Probe: Page fault detect: FAILED\n")); -+ } + -+ if (int_stat & MALI_MMU_INTERRUPT_READ_BUS_ERROR) { -+ MALI_DEBUG_PRINT(2, ("Probe: Bus read error detect: PASSED\n")); -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_INT_CLEAR, MALI_MMU_INTERRUPT_READ_BUS_ERROR); -+ } else { -+ MALI_DEBUG_PRINT(1, ("Probe: Bus read error detect: FAILED\n")); -+ } ++#ifndef _KBASE_DEBUG_MEM_VIEW_H ++#define _KBASE_DEBUG_MEM_VIEW_H + -+ if ((int_stat & (MALI_MMU_INTERRUPT_PAGE_FAULT | MALI_MMU_INTERRUPT_READ_BUS_ERROR)) == -+ (MALI_MMU_INTERRUPT_PAGE_FAULT | MALI_MMU_INTERRUPT_READ_BUS_ERROR)) { -+ return _MALI_OSK_ERR_OK; -+ } ++#include + -+ return _MALI_OSK_ERR_FAULT; -+} ++void kbase_debug_mem_view_init(struct file *kctx_file); + -+#if 0 -+void mali_mmu_print_state(struct mali_mmu_core *mmu) -+{ -+ MALI_DEBUG_PRINT(2, ("MMU: State of %s is 0x%08x\n", mmu->hw_core.description, mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS))); -+} +#endif -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu.h b/drivers/gpu/arm/mali400/mali/common/mali_mmu.h +diff --git a/drivers/gpu/arm/midgard/mali_kbase_defs.h b/drivers/gpu/arm/midgard/mali_kbase_defs.h new file mode 100755 -index 000000000000..6ed48585f3d2 +index 000000000..f8a6f33df --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.h -@@ -0,0 +1,124 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_defs.h +@@ -0,0 +1,1602 @@ +/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef __MALI_MMU_H__ -+#define __MALI_MMU_H__ -+ -+#include "mali_osk.h" -+#include "mali_mmu_page_directory.h" -+#include "mali_hw_core.h" -+ -+/* Forward declaration from mali_group.h */ -+struct mali_group; + -+/** -+ * MMU register numbers -+ * Used in the register read/write routines. -+ * See the hardware documentation for more information about each register -+ */ -+typedef enum mali_mmu_register { -+ MALI_MMU_REGISTER_DTE_ADDR = 0x0000, /**< Current Page Directory Pointer */ -+ MALI_MMU_REGISTER_STATUS = 0x0004, /**< Status of the MMU */ -+ MALI_MMU_REGISTER_COMMAND = 0x0008, /**< Command register, used to control the MMU */ -+ MALI_MMU_REGISTER_PAGE_FAULT_ADDR = 0x000C, /**< Logical address of the last page fault */ -+ MALI_MMU_REGISTER_ZAP_ONE_LINE = 0x010, /**< Used to invalidate the mapping of a single page from the MMU */ -+ MALI_MMU_REGISTER_INT_RAWSTAT = 0x0014, /**< Raw interrupt status, all interrupts visible */ -+ MALI_MMU_REGISTER_INT_CLEAR = 0x0018, /**< Indicate to the MMU that the interrupt has been received */ -+ MALI_MMU_REGISTER_INT_MASK = 0x001C, /**< Enable/disable types of interrupts */ -+ MALI_MMU_REGISTER_INT_STATUS = 0x0020 /**< Interrupt status based on the mask */ -+} mali_mmu_register; + -+/** -+ * MMU interrupt register bits -+ * Each cause of the interrupt is reported -+ * through the (raw) interrupt status registers. -+ * Multiple interrupts can be pending, so multiple bits -+ * can be set at once. -+ */ -+typedef enum mali_mmu_interrupt { -+ MALI_MMU_INTERRUPT_PAGE_FAULT = 0x01, /**< A page fault occured */ -+ MALI_MMU_INTERRUPT_READ_BUS_ERROR = 0x02 /**< A bus read error occured */ -+} mali_mmu_interrupt; + -+typedef enum mali_mmu_status_bits { -+ MALI_MMU_STATUS_BIT_PAGING_ENABLED = 1 << 0, -+ MALI_MMU_STATUS_BIT_PAGE_FAULT_ACTIVE = 1 << 1, -+ MALI_MMU_STATUS_BIT_STALL_ACTIVE = 1 << 2, -+ MALI_MMU_STATUS_BIT_IDLE = 1 << 3, -+ MALI_MMU_STATUS_BIT_REPLAY_BUFFER_EMPTY = 1 << 4, -+ MALI_MMU_STATUS_BIT_PAGE_FAULT_IS_WRITE = 1 << 5, -+ MALI_MMU_STATUS_BIT_STALL_NOT_ACTIVE = 1 << 31, -+} mali_mmu_status_bits; + +/** -+ * Definition of the MMU struct -+ * Used to track a MMU unit in the system. -+ * Contains information about the mapping of the registers ++ * @file mali_kbase_defs.h ++ * ++ * Defintions (types, defines, etcs) common to Kbase. They are placed here to ++ * allow the hierarchy of header files to work. + */ -+struct mali_mmu_core { -+ struct mali_hw_core hw_core; /**< Common for all HW cores */ -+ _mali_osk_irq_t *irq; /**< IRQ handler */ -+}; + -+_mali_osk_errcode_t mali_mmu_initialize(void); ++#ifndef _KBASE_DEFS_H_ ++#define _KBASE_DEFS_H_ + -+void mali_mmu_terminate(void); ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+struct mali_mmu_core *mali_mmu_create(_mali_osk_resource_t *resource, struct mali_group *group, mali_bool is_virtual); -+void mali_mmu_delete(struct mali_mmu_core *mmu); ++#include ++#include ++#include ++#include + -+_mali_osk_errcode_t mali_mmu_reset(struct mali_mmu_core *mmu); -+mali_bool mali_mmu_zap_tlb(struct mali_mmu_core *mmu); -+void mali_mmu_zap_tlb_without_stall(struct mali_mmu_core *mmu); -+void mali_mmu_invalidate_page(struct mali_mmu_core *mmu, u32 mali_address); ++#ifdef CONFIG_MALI_FPGA_BUS_LOGGER ++#include ++#endif + -+void mali_mmu_activate_page_directory(struct mali_mmu_core *mmu, struct mali_page_directory *pagedir); -+void mali_mmu_activate_empty_page_directory(struct mali_mmu_core *mmu); -+void mali_mmu_activate_fault_flush_page_directory(struct mali_mmu_core *mmu); + -+void mali_mmu_page_fault_done(struct mali_mmu_core *mmu); ++#ifdef CONFIG_KDS ++#include ++#endif /* CONFIG_KDS */ + -+MALI_STATIC_INLINE enum mali_interrupt_result mali_mmu_get_interrupt_result(struct mali_mmu_core *mmu) -+{ -+ u32 rawstat_used = mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_INT_RAWSTAT); -+ if (0 == rawstat_used) { -+ return MALI_INTERRUPT_RESULT_NONE; -+ } ++#if defined(CONFIG_SYNC) ++#include ++#else ++#include "mali_kbase_fence_defs.h" ++#endif + -+ return MALI_INTERRUPT_RESULT_ERROR; -+} ++#ifdef CONFIG_DEBUG_FS ++#include ++#endif /* CONFIG_DEBUG_FS */ + ++#ifdef CONFIG_MALI_DEVFREQ ++#include ++#endif /* CONFIG_MALI_DEVFREQ */ + -+MALI_STATIC_INLINE u32 mali_mmu_get_int_status(struct mali_mmu_core *mmu) -+{ -+ return mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_INT_STATUS); -+} ++#include ++#include ++#include + -+MALI_STATIC_INLINE u32 mali_mmu_get_rawstat(struct mali_mmu_core *mmu) -+{ -+ return mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_INT_RAWSTAT); -+} ++#if defined(CONFIG_PM) ++#define KBASE_PM_RUNTIME 1 ++#endif + -+MALI_STATIC_INLINE void mali_mmu_mask_all_interrupts(struct mali_mmu_core *mmu) -+{ -+ mali_hw_core_register_write(&mmu->hw_core, MALI_MMU_REGISTER_INT_MASK, 0); -+} ++/** Enable SW tracing when set */ ++#ifdef CONFIG_MALI_MIDGARD_ENABLE_TRACE ++#define KBASE_TRACE_ENABLE 1 ++#endif + -+MALI_STATIC_INLINE u32 mali_mmu_get_status(struct mali_mmu_core *mmu) -+{ -+ return mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_STATUS); -+} ++#ifndef KBASE_TRACE_ENABLE ++#ifdef CONFIG_MALI_DEBUG ++#define KBASE_TRACE_ENABLE 1 ++#else ++#define KBASE_TRACE_ENABLE 0 ++#endif /* CONFIG_MALI_DEBUG */ ++#endif /* KBASE_TRACE_ENABLE */ + -+MALI_STATIC_INLINE u32 mali_mmu_get_page_fault_addr(struct mali_mmu_core *mmu) -+{ -+ return mali_hw_core_register_read(&mmu->hw_core, MALI_MMU_REGISTER_PAGE_FAULT_ADDR); -+} ++/** Dump Job slot trace on error (only active if KBASE_TRACE_ENABLE != 0) */ ++#define KBASE_TRACE_DUMP_ON_JOB_SLOT_ERROR 1 + -+#endif /* __MALI_MMU_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c -new file mode 100755 -index 000000000000..9ad3e8970b7d ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c -@@ -0,0 +1,495 @@ -+/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * Number of milliseconds before resetting the GPU when a job cannot be "zapped" from the hardware. ++ * Note that the time is actually ZAP_TIMEOUT+SOFT_STOP_RESET_TIMEOUT between the context zap starting and the GPU ++ * actually being reset to give other contexts time for their jobs to be soft-stopped and removed from the hardware ++ * before resetting. + */ ++#define ZAP_TIMEOUT 1000 + -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_ukk.h" -+#include "mali_uk_types.h" -+#include "mali_mmu_page_directory.h" -+#include "mali_memory.h" -+#include "mali_l2_cache.h" -+ -+static _mali_osk_errcode_t fill_page(mali_io_address mapping, u32 data); -+ -+u32 mali_allocate_empty_page(mali_io_address *virt_addr) -+{ -+ _mali_osk_errcode_t err; -+ mali_io_address mapping; -+ mali_dma_addr address; -+ -+ if (_MALI_OSK_ERR_OK != mali_mmu_get_table_page(&address, &mapping)) { -+ /* Allocation failed */ -+ MALI_DEBUG_PRINT(2, ("Mali MMU: Failed to get table page for empty pgdir\n")); -+ return 0; -+ } -+ -+ MALI_DEBUG_ASSERT_POINTER(mapping); -+ -+ err = fill_page(mapping, 0); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_mmu_release_table_page(address, mapping); -+ MALI_DEBUG_PRINT(2, ("Mali MMU: Failed to zero page\n")); -+ return 0; -+ } -+ -+ *virt_addr = mapping; -+ return address; -+} -+ -+void mali_free_empty_page(mali_dma_addr address, mali_io_address virt_addr) -+{ -+ if (MALI_INVALID_PAGE != address) { -+ mali_mmu_release_table_page(address, virt_addr); -+ } -+} ++/** Number of milliseconds before we time out on a GPU soft/hard reset */ ++#define RESET_TIMEOUT 500 + -+_mali_osk_errcode_t mali_create_fault_flush_pages(mali_dma_addr *page_directory, -+ mali_io_address *page_directory_mapping, -+ mali_dma_addr *page_table, mali_io_address *page_table_mapping, -+ mali_dma_addr *data_page, mali_io_address *data_page_mapping) -+{ -+ _mali_osk_errcode_t err; ++/** ++ * Prevent soft-stops from occuring in scheduling situations ++ * ++ * This is not due to HW issues, but when scheduling is desired to be more predictable. ++ * ++ * Therefore, soft stop may still be disabled due to HW issues. ++ * ++ * @note Soft stop will still be used for non-scheduling purposes e.g. when terminating a context. ++ * ++ * @note if not in use, define this value to 0 instead of \#undef'ing it ++ */ ++#define KBASE_DISABLE_SCHEDULING_SOFT_STOPS 0 + -+ err = mali_mmu_get_table_page(data_page, data_page_mapping); -+ if (_MALI_OSK_ERR_OK == err) { -+ err = mali_mmu_get_table_page(page_table, page_table_mapping); -+ if (_MALI_OSK_ERR_OK == err) { -+ err = mali_mmu_get_table_page(page_directory, page_directory_mapping); -+ if (_MALI_OSK_ERR_OK == err) { -+ fill_page(*data_page_mapping, 0); -+ fill_page(*page_table_mapping, *data_page | MALI_MMU_FLAGS_DEFAULT); -+ fill_page(*page_directory_mapping, *page_table | MALI_MMU_FLAGS_PRESENT); -+ MALI_SUCCESS; -+ } -+ mali_mmu_release_table_page(*page_table, *page_table_mapping); -+ *page_table = MALI_INVALID_PAGE; -+ } -+ mali_mmu_release_table_page(*data_page, *data_page_mapping); -+ *data_page = MALI_INVALID_PAGE; -+ } -+ return err; -+} ++/** ++ * Prevent hard-stops from occuring in scheduling situations ++ * ++ * This is not due to HW issues, but when scheduling is desired to be more predictable. ++ * ++ * @note Hard stop will still be used for non-scheduling purposes e.g. when terminating a context. ++ * ++ * @note if not in use, define this value to 0 instead of \#undef'ing it ++ */ ++#define KBASE_DISABLE_SCHEDULING_HARD_STOPS 0 + -+void mali_destroy_fault_flush_pages( -+ mali_dma_addr *page_directory, mali_io_address *page_directory_mapping, -+ mali_dma_addr *page_table, mali_io_address *page_table_mapping, -+ mali_dma_addr *data_page, mali_io_address *data_page_mapping) -+{ -+ if (MALI_INVALID_PAGE != *page_directory) { -+ mali_mmu_release_table_page(*page_directory, *page_directory_mapping); -+ *page_directory = MALI_INVALID_PAGE; -+ *page_directory_mapping = NULL; -+ } ++/** ++ * The maximum number of Job Slots to support in the Hardware. ++ * ++ * You can optimize this down if your target devices will only ever support a ++ * small number of job slots. ++ */ ++#define BASE_JM_MAX_NR_SLOTS 3 + -+ if (MALI_INVALID_PAGE != *page_table) { -+ mali_mmu_release_table_page(*page_table, *page_table_mapping); -+ *page_table = MALI_INVALID_PAGE; -+ *page_table_mapping = NULL; -+ } ++/** ++ * The maximum number of Address Spaces to support in the Hardware. ++ * ++ * You can optimize this down if your target devices will only ever support a ++ * small number of Address Spaces ++ */ ++#define BASE_MAX_NR_AS 16 + -+ if (MALI_INVALID_PAGE != *data_page) { -+ mali_mmu_release_table_page(*data_page, *data_page_mapping); -+ *data_page = MALI_INVALID_PAGE; -+ *data_page_mapping = NULL; -+ } -+} ++/* mmu */ ++#define MIDGARD_MMU_VA_BITS 48 + -+static _mali_osk_errcode_t fill_page(mali_io_address mapping, u32 data) -+{ -+ int i; -+ MALI_DEBUG_ASSERT_POINTER(mapping); ++#if MIDGARD_MMU_VA_BITS > 39 ++#define MIDGARD_MMU_TOPLEVEL 0 ++#else ++#define MIDGARD_MMU_TOPLEVEL 1 ++#endif + -+ for (i = 0; i < MALI_MMU_PAGE_SIZE / 4; i++) { -+ _mali_osk_mem_iowrite32_relaxed(mapping, i * sizeof(u32), data); -+ } -+ _mali_osk_mem_barrier(); -+ MALI_SUCCESS; -+} ++#define MIDGARD_MMU_BOTTOMLEVEL 3 + -+_mali_osk_errcode_t mali_mmu_pagedir_map(struct mali_page_directory *pagedir, u32 mali_address, u32 size) -+{ -+ const int first_pde = MALI_MMU_PDE_ENTRY(mali_address); -+ const int last_pde = MALI_MMU_PDE_ENTRY(mali_address + size - 1); -+ _mali_osk_errcode_t err; -+ mali_io_address pde_mapping; -+ mali_dma_addr pde_phys; -+ int i, page_count; -+ u32 start_address; -+ if (last_pde < first_pde) -+ return _MALI_OSK_ERR_INVALID_ARGS; ++#define GROWABLE_FLAGS_REQUIRED (KBASE_REG_PF_GROW | KBASE_REG_GPU_WR) + -+ for (i = first_pde; i <= last_pde; i++) { -+ if (0 == (_mali_osk_mem_ioread32(pagedir->page_directory_mapped, -+ i * sizeof(u32)) & MALI_MMU_FLAGS_PRESENT)) { -+ /* Page table not present */ -+ MALI_DEBUG_ASSERT(0 == pagedir->page_entries_usage_count[i]); -+ MALI_DEBUG_ASSERT(NULL == pagedir->page_entries_mapped[i]); ++/** setting in kbase_context::as_nr that indicates it's invalid */ ++#define KBASEP_AS_NR_INVALID (-1) + -+ err = mali_mmu_get_table_page(&pde_phys, &pde_mapping); -+ if (_MALI_OSK_ERR_OK != err) { -+ MALI_PRINT_ERROR(("Failed to allocate page table page.\n")); -+ return err; -+ } -+ pagedir->page_entries_mapped[i] = pde_mapping; ++#define KBASE_LOCK_REGION_MAX_SIZE (63) ++#define KBASE_LOCK_REGION_MIN_SIZE (11) + -+ /* Update PDE, mark as present */ -+ _mali_osk_mem_iowrite32_relaxed(pagedir->page_directory_mapped, i * sizeof(u32), -+ pde_phys | MALI_MMU_FLAGS_PRESENT); ++#define KBASE_TRACE_SIZE_LOG2 8 /* 256 entries */ ++#define KBASE_TRACE_SIZE (1 << KBASE_TRACE_SIZE_LOG2) ++#define KBASE_TRACE_MASK ((1 << KBASE_TRACE_SIZE_LOG2)-1) + -+ MALI_DEBUG_ASSERT(0 == pagedir->page_entries_usage_count[i]); -+ } ++#include "mali_kbase_js_defs.h" ++#include "mali_kbase_hwaccess_defs.h" + -+ if (first_pde == last_pde) { -+ pagedir->page_entries_usage_count[i] += size / MALI_MMU_PAGE_SIZE; -+ } else if (i == first_pde) { -+ start_address = i * MALI_MMU_VIRTUAL_PAGE_SIZE; -+ page_count = (start_address + MALI_MMU_VIRTUAL_PAGE_SIZE - mali_address) / MALI_MMU_PAGE_SIZE; -+ pagedir->page_entries_usage_count[i] += page_count; -+ } else if (i == last_pde) { -+ start_address = i * MALI_MMU_VIRTUAL_PAGE_SIZE; -+ page_count = (mali_address + size - start_address) / MALI_MMU_PAGE_SIZE; -+ pagedir->page_entries_usage_count[i] += page_count; -+ } else { -+ pagedir->page_entries_usage_count[i] = 1024; -+ } -+ } -+ _mali_osk_write_mem_barrier(); ++#define KBASEP_FORCE_REPLAY_DISABLED 0 + -+ return _MALI_OSK_ERR_OK; -+} ++/* Maximum force replay limit when randomization is enabled */ ++#define KBASEP_FORCE_REPLAY_RANDOM_LIMIT 16 + -+MALI_STATIC_INLINE void mali_mmu_zero_pte(mali_io_address page_table, u32 mali_address, u32 size) -+{ -+ int i; -+ const int first_pte = MALI_MMU_PTE_ENTRY(mali_address); -+ const int last_pte = MALI_MMU_PTE_ENTRY(mali_address + size - 1); ++/** Atom has been previously soft-stoppped */ ++#define KBASE_KATOM_FLAG_BEEN_SOFT_STOPPPED (1<<1) ++/** Atom has been previously retried to execute */ ++#define KBASE_KATOM_FLAGS_RERUN (1<<2) ++#define KBASE_KATOM_FLAGS_JOBCHAIN (1<<3) ++/** Atom has been previously hard-stopped. */ ++#define KBASE_KATOM_FLAG_BEEN_HARD_STOPPED (1<<4) ++/** Atom has caused us to enter disjoint state */ ++#define KBASE_KATOM_FLAG_IN_DISJOINT (1<<5) ++/* Atom blocked on cross-slot dependency */ ++#define KBASE_KATOM_FLAG_X_DEP_BLOCKED (1<<7) ++/* Atom has fail dependency on cross-slot dependency */ ++#define KBASE_KATOM_FLAG_FAIL_BLOCKER (1<<8) ++/* Atom is currently in the list of atoms blocked on cross-slot dependencies */ ++#define KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST (1<<9) ++/* Atom is currently holding a context reference */ ++#define KBASE_KATOM_FLAG_HOLDING_CTX_REF (1<<10) ++/* Atom requires GPU to be in protected mode */ ++#define KBASE_KATOM_FLAG_PROTECTED (1<<11) ++/* Atom has been stored in runnable_tree */ ++#define KBASE_KATOM_FLAG_JSCTX_IN_TREE (1<<12) + -+ for (i = first_pte; i <= last_pte; i++) { -+ _mali_osk_mem_iowrite32_relaxed(page_table, i * sizeof(u32), 0); -+ } -+} ++/* SW related flags about types of JS_COMMAND action ++ * NOTE: These must be masked off by JS_COMMAND_MASK */ + -+static u32 mali_page_directory_get_phys_address(struct mali_page_directory *pagedir, u32 index) -+{ -+ return (_mali_osk_mem_ioread32(pagedir->page_directory_mapped, -+ index * sizeof(u32)) & ~MALI_MMU_FLAGS_MASK); -+} ++/** This command causes a disjoint event */ ++#define JS_COMMAND_SW_CAUSES_DISJOINT 0x100 + ++/** Bitmask of all SW related flags */ ++#define JS_COMMAND_SW_BITS (JS_COMMAND_SW_CAUSES_DISJOINT) + -+_mali_osk_errcode_t mali_mmu_pagedir_unmap(struct mali_page_directory *pagedir, u32 mali_address, u32 size) -+{ -+ const int first_pde = MALI_MMU_PDE_ENTRY(mali_address); -+ const int last_pde = MALI_MMU_PDE_ENTRY(mali_address + size - 1); -+ u32 left = size; -+ int i; -+ mali_bool pd_changed = MALI_FALSE; -+ u32 pages_to_invalidate[3]; /* hard-coded to 3: max two pages from the PT level plus max one page from PD level */ -+ u32 num_pages_inv = 0; -+ mali_bool invalidate_all = MALI_FALSE; /* safety mechanism in case page_entries_usage_count is unreliable */ ++#if (JS_COMMAND_SW_BITS & JS_COMMAND_MASK) ++#error JS_COMMAND_SW_BITS not masked off by JS_COMMAND_MASK. Must update JS_COMMAND_SW_<..> bitmasks ++#endif + -+ /* For all page directory entries in range. */ -+ for (i = first_pde; i <= last_pde; i++) { -+ u32 size_in_pde, offset; ++/** Soft-stop command that causes a Disjoint event. This of course isn't ++ * entirely masked off by JS_COMMAND_MASK */ ++#define JS_COMMAND_SOFT_STOP_WITH_SW_DISJOINT \ ++ (JS_COMMAND_SW_CAUSES_DISJOINT | JS_COMMAND_SOFT_STOP) + -+ MALI_DEBUG_ASSERT_POINTER(pagedir->page_entries_mapped[i]); -+ MALI_DEBUG_ASSERT(0 != pagedir->page_entries_usage_count[i]); ++#define KBASEP_ATOM_ID_INVALID BASE_JD_ATOM_COUNT + -+ /* Offset into page table, 0 if mali_address is 4MiB aligned */ -+ offset = (mali_address & (MALI_MMU_VIRTUAL_PAGE_SIZE - 1)); -+ if (left < MALI_MMU_VIRTUAL_PAGE_SIZE - offset) { -+ size_in_pde = left; -+ } else { -+ size_in_pde = MALI_MMU_VIRTUAL_PAGE_SIZE - offset; -+ } ++/* Serialize atoms within a slot (ie only one atom per job slot) */ ++#define KBASE_SERIALIZE_INTRA_SLOT (1 << 0) ++/* Serialize atoms between slots (ie only one job slot running at any time) */ ++#define KBASE_SERIALIZE_INTER_SLOT (1 << 1) ++/* Reset the GPU after each atom completion */ ++#define KBASE_SERIALIZE_RESET (1 << 2) + -+ pagedir->page_entries_usage_count[i] -= size_in_pde / MALI_MMU_PAGE_SIZE; ++#ifdef CONFIG_DEBUG_FS ++struct base_job_fault_event { + -+ /* If entire page table is unused, free it */ -+ if (0 == pagedir->page_entries_usage_count[i]) { -+ u32 page_phys; -+ void *page_virt; -+ MALI_DEBUG_PRINT(4, ("Releasing page table as this is the last reference\n")); -+ /* last reference removed, no need to zero out each PTE */ ++ u32 event_code; ++ struct kbase_jd_atom *katom; ++ struct work_struct job_fault_work; ++ struct list_head head; ++ int reg_offset; ++}; + -+ page_phys = MALI_MMU_ENTRY_ADDRESS(_mali_osk_mem_ioread32(pagedir->page_directory_mapped, i * sizeof(u32))); -+ page_virt = pagedir->page_entries_mapped[i]; -+ pagedir->page_entries_mapped[i] = NULL; -+ _mali_osk_mem_iowrite32_relaxed(pagedir->page_directory_mapped, i * sizeof(u32), 0); ++#endif + -+ mali_mmu_release_table_page(page_phys, page_virt); -+ pd_changed = MALI_TRUE; -+ } else { -+ MALI_DEBUG_ASSERT(num_pages_inv < 2); -+ if (num_pages_inv < 2) { -+ pages_to_invalidate[num_pages_inv] = mali_page_directory_get_phys_address(pagedir, i); -+ num_pages_inv++; -+ } else { -+ invalidate_all = MALI_TRUE; -+ } ++struct kbase_jd_atom_dependency { ++ struct kbase_jd_atom *atom; ++ u8 dep_type; ++}; + -+ /* If part of the page table is still in use, zero the relevant PTEs */ -+ mali_mmu_zero_pte(pagedir->page_entries_mapped[i], mali_address, size_in_pde); -+ } ++/** ++ * struct kbase_io_access - holds information about 1 register access ++ * ++ * @addr: first bit indicates r/w (r=0, w=1) ++ * @value: value written or read ++ */ ++struct kbase_io_access { ++ uintptr_t addr; ++ u32 value; ++}; + -+ left -= size_in_pde; -+ mali_address += size_in_pde; -+ } -+ _mali_osk_write_mem_barrier(); ++/** ++ * struct kbase_io_history - keeps track of all recent register accesses ++ * ++ * @enabled: true if register accesses are recorded, false otherwise ++ * @lock: spinlock protecting kbase_io_access array ++ * @count: number of registers read/written ++ * @size: number of elements in kbase_io_access array ++ * @buf: array of kbase_io_access ++ */ ++struct kbase_io_history { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) ++ bool enabled; ++#else ++ u32 enabled; ++#endif + -+ /* L2 pages invalidation */ -+ if (MALI_TRUE == pd_changed) { -+ MALI_DEBUG_ASSERT(num_pages_inv < 3); -+ if (num_pages_inv < 3) { -+ pages_to_invalidate[num_pages_inv] = pagedir->page_directory; -+ num_pages_inv++; -+ } else { -+ invalidate_all = MALI_TRUE; -+ } -+ } ++ spinlock_t lock; ++ size_t count; ++ u16 size; ++ struct kbase_io_access *buf; ++}; + -+ if (invalidate_all) { -+ mali_l2_cache_invalidate_all(); -+ } else { -+ mali_l2_cache_invalidate_all_pages(pages_to_invalidate, num_pages_inv); -+ } ++/** ++ * @brief The function retrieves a read-only reference to the atom field from ++ * the kbase_jd_atom_dependency structure ++ * ++ * @param[in] dep kbase jd atom dependency. ++ * ++ * @return readonly reference to dependent ATOM. ++ */ ++static inline const struct kbase_jd_atom * kbase_jd_katom_dep_atom(const struct kbase_jd_atom_dependency *dep) ++{ ++ LOCAL_ASSERT(dep != NULL); + -+ MALI_SUCCESS; ++ return (const struct kbase_jd_atom *)(dep->atom); +} + -+struct mali_page_directory *mali_mmu_pagedir_alloc(void) ++/** ++ * @brief The function retrieves a read-only reference to the dependency type field from ++ * the kbase_jd_atom_dependency structure ++ * ++ * @param[in] dep kbase jd atom dependency. ++ * ++ * @return A dependency type value. ++ */ ++static inline u8 kbase_jd_katom_dep_type(const struct kbase_jd_atom_dependency *dep) +{ -+ struct mali_page_directory *pagedir; -+ _mali_osk_errcode_t err; -+ mali_dma_addr phys; ++ LOCAL_ASSERT(dep != NULL); + -+ pagedir = _mali_osk_calloc(1, sizeof(struct mali_page_directory)); -+ if (NULL == pagedir) { -+ return NULL; -+ } ++ return dep->dep_type; ++} + -+ err = mali_mmu_get_table_page(&phys, &pagedir->page_directory_mapped); -+ if (_MALI_OSK_ERR_OK != err) { -+ _mali_osk_free(pagedir); -+ return NULL; -+ } ++/** ++ * @brief Setter macro for dep_atom array entry in kbase_jd_atom ++ * ++ * @param[in] dep The kbase jd atom dependency. ++ * @param[in] a The ATOM to be set as a dependency. ++ * @param type The ATOM dependency type to be set. ++ * ++ */ ++static inline void kbase_jd_katom_dep_set(const struct kbase_jd_atom_dependency *const_dep, ++ struct kbase_jd_atom *a, u8 type) ++{ ++ struct kbase_jd_atom_dependency *dep; + -+ pagedir->page_directory = (u32)phys; ++ LOCAL_ASSERT(const_dep != NULL); + -+ /* Zero page directory */ -+ fill_page(pagedir->page_directory_mapped, 0); ++ dep = (struct kbase_jd_atom_dependency *)const_dep; + -+ return pagedir; ++ dep->atom = a; ++ dep->dep_type = type; +} + -+void mali_mmu_pagedir_free(struct mali_page_directory *pagedir) ++/** ++ * @brief Setter macro for dep_atom array entry in kbase_jd_atom ++ * ++ * @param[in] dep The kbase jd atom dependency to be cleared. ++ * ++ */ ++static inline void kbase_jd_katom_dep_clear(const struct kbase_jd_atom_dependency *const_dep) +{ -+ const int num_page_table_entries = sizeof(pagedir->page_entries_mapped) / sizeof(pagedir->page_entries_mapped[0]); -+ int i; ++ struct kbase_jd_atom_dependency *dep; + -+ /* Free referenced page tables and zero PDEs. */ -+ for (i = 0; i < num_page_table_entries; i++) { -+ if (pagedir->page_directory_mapped && (_mali_osk_mem_ioread32( -+ pagedir->page_directory_mapped, -+ sizeof(u32)*i) & MALI_MMU_FLAGS_PRESENT)) { -+ mali_dma_addr phys = _mali_osk_mem_ioread32(pagedir->page_directory_mapped, -+ i * sizeof(u32)) & ~MALI_MMU_FLAGS_MASK; -+ _mali_osk_mem_iowrite32_relaxed(pagedir->page_directory_mapped, i * sizeof(u32), 0); -+ mali_mmu_release_table_page(phys, pagedir->page_entries_mapped[i]); -+ } -+ } -+ _mali_osk_write_mem_barrier(); ++ LOCAL_ASSERT(const_dep != NULL); + -+ /* Free the page directory page. */ -+ mali_mmu_release_table_page(pagedir->page_directory, pagedir->page_directory_mapped); ++ dep = (struct kbase_jd_atom_dependency *)const_dep; + -+ _mali_osk_free(pagedir); ++ dep->atom = NULL; ++ dep->dep_type = BASE_JD_DEP_TYPE_INVALID; +} + ++enum kbase_atom_gpu_rb_state { ++ /* Atom is not currently present in slot ringbuffer */ ++ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB, ++ /* Atom is in slot ringbuffer but is blocked on a previous atom */ ++ KBASE_ATOM_GPU_RB_WAITING_BLOCKED, ++ /* Atom is in slot ringbuffer but is waiting for a previous protected ++ * mode transition to complete */ ++ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV, ++ /* Atom is in slot ringbuffer but is waiting for proected mode ++ * transition */ ++ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION, ++ /* Atom is in slot ringbuffer but is waiting for cores to become ++ * available */ ++ KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE, ++ /* Atom is in slot ringbuffer but is blocked on affinity */ ++ KBASE_ATOM_GPU_RB_WAITING_AFFINITY, ++ /* Atom is in slot ringbuffer and ready to run */ ++ KBASE_ATOM_GPU_RB_READY, ++ /* Atom is in slot ringbuffer and has been submitted to the GPU */ ++ KBASE_ATOM_GPU_RB_SUBMITTED, ++ /* Atom must be returned to JS as soon as it reaches the head of the ++ * ringbuffer due to a previous failure */ ++ KBASE_ATOM_GPU_RB_RETURN_TO_JS = -1 ++}; + -+void mali_mmu_pagedir_update(struct mali_page_directory *pagedir, u32 mali_address, -+ mali_dma_addr phys_address, u32 size, u32 permission_bits) -+{ -+ u32 end_address = mali_address + size; -+ u32 mali_phys = (u32)phys_address; -+ -+ /* Map physical pages into MMU page tables */ -+ for (; mali_address < end_address; mali_address += MALI_MMU_PAGE_SIZE, mali_phys += MALI_MMU_PAGE_SIZE) { -+ MALI_DEBUG_ASSERT_POINTER(pagedir->page_entries_mapped[MALI_MMU_PDE_ENTRY(mali_address)]); -+ _mali_osk_mem_iowrite32_relaxed(pagedir->page_entries_mapped[MALI_MMU_PDE_ENTRY(mali_address)], -+ MALI_MMU_PTE_ENTRY(mali_address) * sizeof(u32), -+ mali_phys | permission_bits); -+ } -+} -+ -+void mali_mmu_pagedir_diag(struct mali_page_directory *pagedir, u32 fault_addr) -+{ -+#if defined(DEBUG) -+ u32 pde_index, pte_index; -+ u32 pde, pte; ++enum kbase_atom_enter_protected_state { ++ /* ++ * Starting state: ++ * Check if a transition into protected mode is required. ++ * ++ * NOTE: The integer value of this must ++ * match KBASE_ATOM_EXIT_PROTECTED_CHECK. ++ */ ++ KBASE_ATOM_ENTER_PROTECTED_CHECK = 0, ++ /* Wait for vinstr to suspend. */ ++ KBASE_ATOM_ENTER_PROTECTED_VINSTR, ++ /* Wait for the L2 to become idle in preparation for ++ * the coherency change. */ ++ KBASE_ATOM_ENTER_PROTECTED_IDLE_L2, ++ /* End state; ++ * Prepare coherency change. */ ++ KBASE_ATOM_ENTER_PROTECTED_FINISHED, ++}; + -+ pde_index = MALI_MMU_PDE_ENTRY(fault_addr); -+ pte_index = MALI_MMU_PTE_ENTRY(fault_addr); ++enum kbase_atom_exit_protected_state { ++ /* ++ * Starting state: ++ * Check if a transition out of protected mode is required. ++ * ++ * NOTE: The integer value of this must ++ * match KBASE_ATOM_ENTER_PROTECTED_CHECK. ++ */ ++ KBASE_ATOM_EXIT_PROTECTED_CHECK = 0, ++ /* Wait for the L2 to become idle in preparation ++ * for the reset. */ ++ KBASE_ATOM_EXIT_PROTECTED_IDLE_L2, ++ /* Issue the protected reset. */ ++ KBASE_ATOM_EXIT_PROTECTED_RESET, ++ /* End state; ++ * Wait for the reset to complete. */ ++ KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT, ++}; + ++struct kbase_ext_res { ++ u64 gpu_address; ++ struct kbase_mem_phy_alloc *alloc; ++}; + -+ pde = _mali_osk_mem_ioread32(pagedir->page_directory_mapped, -+ pde_index * sizeof(u32)); ++struct kbase_jd_atom { ++ struct work_struct work; ++ ktime_t start_timestamp; + ++ struct base_jd_udata udata; ++ struct kbase_context *kctx; + -+ if (pde & MALI_MMU_FLAGS_PRESENT) { -+ u32 pte_addr = MALI_MMU_ENTRY_ADDRESS(pde); ++ struct list_head dep_head[2]; ++ struct list_head dep_item[2]; ++ const struct kbase_jd_atom_dependency dep[2]; ++ /* List head used during job dispatch job_done processing - as ++ * dependencies may not be entirely resolved at this point, we need to ++ * use a separate list head. */ ++ struct list_head jd_item; ++ /* true if atom's jd_item is currently on a list. Prevents atom being ++ * processed twice. */ ++ bool in_jd_list; + -+ pte = _mali_osk_mem_ioread32(pagedir->page_entries_mapped[pde_index], -+ pte_index * sizeof(u32)); ++ u16 nr_extres; ++ struct kbase_ext_res *extres; + -+ MALI_DEBUG_PRINT(2, ("\tMMU: %08x: Page table present: %08x\n" -+ "\t\tPTE: %08x, page %08x is %s\n", -+ fault_addr, pte_addr, pte, -+ MALI_MMU_ENTRY_ADDRESS(pte), -+ pte & MALI_MMU_FLAGS_DEFAULT ? "rw" : "not present")); -+ } else { -+ MALI_DEBUG_PRINT(2, ("\tMMU: %08x: Page table not present: %08x\n", -+ fault_addr, pde)); -+ } ++ u32 device_nr; ++ u64 affinity; ++ u64 jc; ++ enum kbase_atom_coreref_state coreref_state; ++#ifdef CONFIG_KDS ++ struct list_head node; ++ struct kds_resource_set *kds_rset; ++ bool kds_dep_satisfied; ++#endif /* CONFIG_KDS */ ++#if defined(CONFIG_SYNC) ++ /* Stores either an input or output fence, depending on soft-job type */ ++ struct sync_fence *fence; ++ struct sync_fence_waiter sync_waiter; ++#endif /* CONFIG_SYNC */ ++#if defined(CONFIG_MALI_DMA_FENCE) || defined(CONFIG_SYNC_FILE) ++ struct { ++ /* Use the functions/API defined in mali_kbase_fence.h to ++ * when working with this sub struct */ ++#if defined(CONFIG_SYNC_FILE) ++ /* Input fence */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ struct fence *fence_in; +#else -+ MALI_IGNORE(pagedir); -+ MALI_IGNORE(fault_addr); ++ struct dma_fence *fence_in; +#endif -+} -+ -+/* For instrumented */ -+struct dump_info { -+ u32 buffer_left; -+ u32 register_writes_size; -+ u32 page_table_dump_size; -+ u32 *buffer; -+}; ++#endif ++ /* This points to the dma-buf output fence for this atom. If ++ * this is NULL then there is no fence for this atom and the ++ * following fields related to dma_fence may have invalid data. ++ * ++ * The context and seqno fields contain the details for this ++ * fence. ++ * ++ * This fence is signaled when the katom is completed, ++ * regardless of the event_code of the katom (signal also on ++ * failure). ++ */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ struct fence *fence; ++#else ++ struct dma_fence *fence; ++#endif ++ /* The dma-buf fence context number for this atom. A unique ++ * context number is allocated to each katom in the context on ++ * context creation. ++ */ ++ unsigned int context; ++ /* The dma-buf fence sequence number for this atom. This is ++ * increased every time this katom uses dma-buf fence. ++ */ ++ atomic_t seqno; ++ /* This contains a list of all callbacks set up to wait on ++ * other fences. This atom must be held back from JS until all ++ * these callbacks have been called and dep_count have reached ++ * 0. The initial value of dep_count must be equal to the ++ * number of callbacks on this list. ++ * ++ * This list is protected by jctx.lock. Callbacks are added to ++ * this list when the atom is built and the wait are set up. ++ * All the callbacks then stay on the list until all callbacks ++ * have been called and the atom is queued, or cancelled, and ++ * then all callbacks are taken off the list and freed. ++ */ ++ struct list_head callbacks; ++ /* Atomic counter of number of outstandind dma-buf fence ++ * dependencies for this atom. When dep_count reaches 0 the ++ * atom may be queued. ++ * ++ * The special value "-1" may only be set after the count ++ * reaches 0, while holding jctx.lock. This indicates that the ++ * atom has been handled, either queued in JS or cancelled. ++ * ++ * If anyone but the dma-fence worker sets this to -1 they must ++ * ensure that any potentially queued worker must have ++ * completed before allowing the atom to be marked as unused. ++ * This can be done by flushing the fence work queue: ++ * kctx->dma_fence.wq. ++ */ ++ atomic_t dep_count; ++ } dma_fence; ++#endif /* CONFIG_MALI_DMA_FENCE || CONFIG_SYNC_FILE*/ + -+static _mali_osk_errcode_t writereg(u32 where, u32 what, const char *comment, struct dump_info *info) -+{ -+ if (NULL != info) { -+ info->register_writes_size += sizeof(u32) * 2; /* two 32-bit words */ ++ /* Note: refer to kbasep_js_atom_retained_state, which will take a copy of some of the following members */ ++ enum base_jd_event_code event_code; ++ base_jd_core_req core_req; /**< core requirements */ ++ /** Job Slot to retry submitting to if submission from IRQ handler failed ++ * ++ * NOTE: see if this can be unified into the another member e.g. the event */ ++ int retry_submit_on_slot; + -+ if (NULL != info->buffer) { -+ /* check that we have enough space */ -+ if (info->buffer_left < sizeof(u32) * 2) MALI_ERROR(_MALI_OSK_ERR_NOMEM); ++ u32 ticks; ++ /* JS atom priority with respect to other atoms on its kctx. */ ++ int sched_priority; + -+ *info->buffer = where; -+ info->buffer++; ++ int poking; /* BASE_HW_ISSUE_8316 */ + -+ *info->buffer = what; -+ info->buffer++; ++ wait_queue_head_t completed; ++ enum kbase_jd_atom_state status; ++#ifdef CONFIG_GPU_TRACEPOINTS ++ int work_id; ++#endif ++ /* Assigned after atom is completed. Used to check whether PRLAM-10676 workaround should be applied */ ++ int slot_nr; + -+ info->buffer_left -= sizeof(u32) * 2; -+ } -+ } ++ u32 atom_flags; + -+ MALI_SUCCESS; -+} ++ /* Number of times this atom has been retried. Used by replay soft job. ++ */ ++ int retry_count; + -+static _mali_osk_errcode_t mali_mmu_dump_page(mali_io_address page, u32 phys_addr, struct dump_info *info) -+{ -+ if (NULL != info) { -+ /* 4096 for the page and 4 bytes for the address */ -+ const u32 page_size_in_elements = MALI_MMU_PAGE_SIZE / 4; -+ const u32 page_size_in_bytes = MALI_MMU_PAGE_SIZE; -+ const u32 dump_size_in_bytes = MALI_MMU_PAGE_SIZE + 4; ++ enum kbase_atom_gpu_rb_state gpu_rb_state; + -+ info->page_table_dump_size += dump_size_in_bytes; ++ u64 need_cache_flush_cores_retained; + -+ if (NULL != info->buffer) { -+ if (info->buffer_left < dump_size_in_bytes) MALI_ERROR(_MALI_OSK_ERR_NOMEM); ++ atomic_t blocked; + -+ *info->buffer = phys_addr; -+ info->buffer++; ++ /* Pointer to atom that this atom has same-slot dependency on */ ++ struct kbase_jd_atom *pre_dep; ++ /* Pointer to atom that has same-slot dependency on this atom */ ++ struct kbase_jd_atom *post_dep; + -+ _mali_osk_memcpy(info->buffer, page, page_size_in_bytes); -+ info->buffer += page_size_in_elements; ++ /* Pointer to atom that this atom has cross-slot dependency on */ ++ struct kbase_jd_atom *x_pre_dep; ++ /* Pointer to atom that has cross-slot dependency on this atom */ ++ struct kbase_jd_atom *x_post_dep; + -+ info->buffer_left -= dump_size_in_bytes; -+ } -+ } ++ /* The GPU's flush count recorded at the time of submission, used for ++ * the cache flush optimisation */ ++ u32 flush_id; + -+ MALI_SUCCESS; -+} ++ struct kbase_jd_atom_backend backend; ++#ifdef CONFIG_DEBUG_FS ++ struct base_job_fault_event fault_event; ++#endif + -+static _mali_osk_errcode_t dump_mmu_page_table(struct mali_page_directory *pagedir, struct dump_info *info) -+{ -+ MALI_DEBUG_ASSERT_POINTER(pagedir); -+ MALI_DEBUG_ASSERT_POINTER(info); ++ /* List head used for three different purposes: ++ * 1. Overflow list for JS ring buffers. If an atom is ready to run, ++ * but there is no room in the JS ring buffer, then the atom is put ++ * on the ring buffer's overflow list using this list node. ++ * 2. List of waiting soft jobs. ++ */ ++ struct list_head queue; + -+ if (NULL != pagedir->page_directory_mapped) { -+ int i; ++ /* Used to keep track of all JIT free/alloc jobs in submission order ++ */ ++ struct list_head jit_node; ++ bool jit_blocked; + -+ MALI_CHECK_NO_ERROR( -+ mali_mmu_dump_page(pagedir->page_directory_mapped, pagedir->page_directory, info) -+ ); ++ /* If non-zero, this indicates that the atom will fail with the set ++ * event_code when the atom is processed. */ ++ enum base_jd_event_code will_fail_event_code; + -+ for (i = 0; i < 1024; i++) { -+ if (NULL != pagedir->page_entries_mapped[i]) { -+ MALI_CHECK_NO_ERROR( -+ mali_mmu_dump_page(pagedir->page_entries_mapped[i], -+ _mali_osk_mem_ioread32(pagedir->page_directory_mapped, -+ i * sizeof(u32)) & ~MALI_MMU_FLAGS_MASK, info) -+ ); -+ } -+ } -+ } ++ /* Atoms will only ever be transitioning into, or out of ++ * protected mode so we do not need two separate fields. ++ */ ++ union { ++ enum kbase_atom_enter_protected_state enter; ++ enum kbase_atom_exit_protected_state exit; ++ } protected_state; + -+ MALI_SUCCESS; -+} ++ struct rb_node runnable_tree_node; + -+static _mali_osk_errcode_t dump_mmu_registers(struct mali_page_directory *pagedir, struct dump_info *info) -+{ -+ MALI_CHECK_NO_ERROR(writereg(0x00000000, pagedir->page_directory, -+ "set the page directory address", info)); -+ MALI_CHECK_NO_ERROR(writereg(0x00000008, 4, "zap???", info)); -+ MALI_CHECK_NO_ERROR(writereg(0x00000008, 0, "enable paging", info)); -+ MALI_SUCCESS; -+} ++ /* 'Age' of atom relative to other atoms in the context. */ ++ u32 age; ++}; + -+_mali_osk_errcode_t _mali_ukk_query_mmu_page_table_dump_size(_mali_uk_query_mmu_page_table_dump_size_s *args) ++static inline bool kbase_jd_katom_is_protected(const struct kbase_jd_atom *katom) +{ -+ struct dump_info info = { 0, 0, 0, NULL }; -+ struct mali_session_data *session_data; -+ -+ session_data = (struct mali_session_data *)(uintptr_t)(args->ctx); -+ MALI_DEBUG_ASSERT_POINTER(session_data); -+ MALI_DEBUG_ASSERT_POINTER(args); -+ -+ MALI_CHECK_NO_ERROR(dump_mmu_registers(session_data->page_directory, &info)); -+ MALI_CHECK_NO_ERROR(dump_mmu_page_table(session_data->page_directory, &info)); -+ args->size = info.register_writes_size + info.page_table_dump_size; -+ MALI_SUCCESS; ++ return (bool)(katom->atom_flags & KBASE_KATOM_FLAG_PROTECTED); +} + -+_mali_osk_errcode_t _mali_ukk_dump_mmu_page_table(_mali_uk_dump_mmu_page_table_s *args) -+{ -+ struct dump_info info = { 0, 0, 0, NULL }; -+ struct mali_session_data *session_data; -+ -+ MALI_DEBUG_ASSERT_POINTER(args); ++/* ++ * Theory of operations: ++ * ++ * Atom objects are statically allocated within the context structure. ++ * ++ * Each atom is the head of two lists, one for the "left" set of dependencies, one for the "right" set. ++ */ + -+ session_data = (struct mali_session_data *)(uintptr_t)(args->ctx); -+ MALI_DEBUG_ASSERT_POINTER(session_data); ++#define KBASE_JD_DEP_QUEUE_SIZE 256 + -+ info.buffer_left = args->size; -+ info.buffer = (u32 *)(uintptr_t)args->buffer; ++struct kbase_jd_context { ++ struct mutex lock; ++ struct kbasep_js_kctx_info sched_info; ++ struct kbase_jd_atom atoms[BASE_JD_ATOM_COUNT]; + -+ args->register_writes = (uintptr_t)info.buffer; -+ MALI_CHECK_NO_ERROR(dump_mmu_registers(session_data->page_directory, &info)); ++ /** Tracks all job-dispatch jobs. This includes those not tracked by ++ * the scheduler: 'not ready to run' and 'dependency-only' jobs. */ ++ u32 job_nr; + -+ args->page_table_dump = (uintptr_t)info.buffer; -+ MALI_CHECK_NO_ERROR(dump_mmu_page_table(session_data->page_directory, &info)); ++ /** Waitq that reflects whether there are no jobs (including SW-only ++ * dependency jobs). This is set when no jobs are present on the ctx, ++ * and clear when there are jobs. ++ * ++ * @note: Job Dispatcher knows about more jobs than the Job Scheduler: ++ * the Job Scheduler is unaware of jobs that are blocked on dependencies, ++ * and SW-only dependency jobs. ++ * ++ * This waitq can be waited upon to find out when the context jobs are all ++ * done/cancelled (including those that might've been blocked on ++ * dependencies) - and so, whether it can be terminated. However, it should ++ * only be terminated once it is not present in the run-pool (see ++ * kbasep_js_kctx_info::ctx::is_scheduled). ++ * ++ * Since the waitq is only set under kbase_jd_context::lock, ++ * the waiter should also briefly obtain and drop kbase_jd_context::lock to ++ * guarentee that the setter has completed its work on the kbase_context ++ * ++ * This must be updated atomically with: ++ * - kbase_jd_context::job_nr */ ++ wait_queue_head_t zero_jobs_wait; + -+ args->register_writes_size = info.register_writes_size; -+ args->page_table_dump_size = info.page_table_dump_size; ++ /** Job Done workqueue. */ ++ struct workqueue_struct *job_done_wq; + -+ MALI_SUCCESS; -+} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h -new file mode 100755 -index 000000000000..3fdf07210259 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h -@@ -0,0 +1,110 @@ -+/* -+ * Copyright (C) 2011-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ spinlock_t tb_lock; ++ u32 *tb; ++ size_t tb_wrap_offset; + -+#ifndef __MALI_MMU_PAGE_DIRECTORY_H__ -+#define __MALI_MMU_PAGE_DIRECTORY_H__ ++#ifdef CONFIG_KDS ++ struct kds_callback kds_cb; ++#endif /* CONFIG_KDS */ ++#ifdef CONFIG_GPU_TRACEPOINTS ++ atomic_t work_id; ++#endif ++}; + -+#include "mali_osk.h" ++struct kbase_device_info { ++ u32 features; ++}; + -+/** -+ * Size of an MMU page in bytes -+ */ -+#define MALI_MMU_PAGE_SIZE 0x1000 ++/** Poking state for BASE_HW_ISSUE_8316 */ ++enum { ++ KBASE_AS_POKE_STATE_IN_FLIGHT = 1<<0, ++ KBASE_AS_POKE_STATE_KILLING_POKE = 1<<1 ++}; + -+/* -+ * Size of the address space referenced by a page table page -+ */ -+#define MALI_MMU_VIRTUAL_PAGE_SIZE 0x400000 /* 4 MiB */ ++/** Poking state for BASE_HW_ISSUE_8316 */ ++typedef u32 kbase_as_poke_state; + -+/** -+ * Page directory index from address -+ * Calculates the page directory index from the given address -+ */ -+#define MALI_MMU_PDE_ENTRY(address) (((address)>>22) & 0x03FF) ++struct kbase_mmu_setup { ++ u64 transtab; ++ u64 memattr; ++ u64 transcfg; ++}; + +/** -+ * Page table index from address -+ * Calculates the page table index from the given address ++ * Important: Our code makes assumptions that a struct kbase_as structure is always at ++ * kbase_device->as[number]. This is used to recover the containing ++ * struct kbase_device from a struct kbase_as structure. ++ * ++ * Therefore, struct kbase_as structures must not be allocated anywhere else. + */ -+#define MALI_MMU_PTE_ENTRY(address) (((address)>>12) & 0x03FF) ++struct kbase_as { ++ int number; + -+/** -+ * Extract the memory address from an PDE/PTE entry -+ */ -+#define MALI_MMU_ENTRY_ADDRESS(value) ((value) & 0xFFFFFC00) ++ struct workqueue_struct *pf_wq; ++ struct work_struct work_pagefault; ++ struct work_struct work_busfault; ++ enum kbase_mmu_fault_type fault_type; ++ bool protected_mode; ++ u32 fault_status; ++ u64 fault_addr; ++ u64 fault_extra_addr; + -+#define MALI_INVALID_PAGE ((u32)(~0)) ++ struct kbase_mmu_setup current_setup; + -+/** -+ * -+ */ -+typedef enum mali_mmu_entry_flags { -+ MALI_MMU_FLAGS_PRESENT = 0x01, -+ MALI_MMU_FLAGS_READ_PERMISSION = 0x02, -+ MALI_MMU_FLAGS_WRITE_PERMISSION = 0x04, -+ MALI_MMU_FLAGS_OVERRIDE_CACHE = 0x8, -+ MALI_MMU_FLAGS_WRITE_CACHEABLE = 0x10, -+ MALI_MMU_FLAGS_WRITE_ALLOCATE = 0x20, -+ MALI_MMU_FLAGS_WRITE_BUFFERABLE = 0x40, -+ MALI_MMU_FLAGS_READ_CACHEABLE = 0x80, -+ MALI_MMU_FLAGS_READ_ALLOCATE = 0x100, -+ MALI_MMU_FLAGS_MASK = 0x1FF, -+} mali_mmu_entry_flags; ++ /* BASE_HW_ISSUE_8316 */ ++ struct workqueue_struct *poke_wq; ++ struct work_struct poke_work; ++ /** Protected by hwaccess_lock */ ++ int poke_refcount; ++ /** Protected by hwaccess_lock */ ++ kbase_as_poke_state poke_state; ++ struct hrtimer poke_timer; ++}; + ++static inline int kbase_as_has_bus_fault(struct kbase_as *as) ++{ ++ return as->fault_type == KBASE_MMU_FAULT_TYPE_BUS; ++} + -+#define MALI_MMU_FLAGS_FORCE_GP_READ_ALLOCATE ( \ -+ MALI_MMU_FLAGS_PRESENT | \ -+ MALI_MMU_FLAGS_READ_PERMISSION | \ -+ MALI_MMU_FLAGS_WRITE_PERMISSION | \ -+ MALI_MMU_FLAGS_OVERRIDE_CACHE | \ -+ MALI_MMU_FLAGS_WRITE_CACHEABLE | \ -+ MALI_MMU_FLAGS_WRITE_BUFFERABLE | \ -+ MALI_MMU_FLAGS_READ_CACHEABLE | \ -+ MALI_MMU_FLAGS_READ_ALLOCATE ) ++static inline int kbase_as_has_page_fault(struct kbase_as *as) ++{ ++ return as->fault_type == KBASE_MMU_FAULT_TYPE_PAGE; ++} + -+#define MALI_MMU_FLAGS_DEFAULT ( \ -+ MALI_MMU_FLAGS_PRESENT | \ -+ MALI_MMU_FLAGS_READ_PERMISSION | \ -+ MALI_MMU_FLAGS_WRITE_PERMISSION ) ++struct kbasep_mem_device { ++ atomic_t used_pages; /* Tracks usage of OS shared memory. Updated ++ when OS memory is allocated/freed. */ + ++}; + -+struct mali_page_directory { -+ u32 page_directory; /**< Physical address of the memory session's page directory */ -+ mali_io_address page_directory_mapped; /**< Pointer to the mapped version of the page directory into the kernel's address space */ ++#define KBASE_TRACE_CODE(X) KBASE_TRACE_CODE_ ## X + -+ mali_io_address page_entries_mapped[1024]; /**< Pointers to the page tables which exists in the page directory mapped into the kernel's address space */ -+ u32 page_entries_usage_count[1024]; /**< Tracks usage count of the page table pages, so they can be releases on the last reference */ ++enum kbase_trace_code { ++ /* IMPORTANT: USE OF SPECIAL #INCLUDE OF NON-STANDARD HEADER FILE ++ * THIS MUST BE USED AT THE START OF THE ENUM */ ++#define KBASE_TRACE_CODE_MAKE_CODE(X) KBASE_TRACE_CODE(X) ++#include "mali_kbase_trace_defs.h" ++#undef KBASE_TRACE_CODE_MAKE_CODE ++ /* Comma on its own, to extend the list */ ++ , ++ /* Must be the last in the enum */ ++ KBASE_TRACE_CODE_COUNT +}; + -+/* Map Mali virtual address space (i.e. ensure page tables exist for the virtual range) */ -+_mali_osk_errcode_t mali_mmu_pagedir_map(struct mali_page_directory *pagedir, u32 mali_address, u32 size); -+_mali_osk_errcode_t mali_mmu_pagedir_unmap(struct mali_page_directory *pagedir, u32 mali_address, u32 size); -+ -+/* Back virtual address space with actual pages. Assumes input is contiguous and 4k aligned. */ -+void mali_mmu_pagedir_update(struct mali_page_directory *pagedir, u32 mali_address, -+ mali_dma_addr phys_address, u32 size, u32 permission_bits); ++#define KBASE_TRACE_FLAG_REFCOUNT (((u8)1) << 0) ++#define KBASE_TRACE_FLAG_JOBSLOT (((u8)1) << 1) + -+u32 mali_allocate_empty_page(mali_io_address *virtual); -+void mali_free_empty_page(mali_dma_addr address, mali_io_address virt_addr); -+_mali_osk_errcode_t mali_create_fault_flush_pages(mali_dma_addr *page_directory, -+ mali_io_address *page_directory_mapping, -+ mali_dma_addr *page_table, mali_io_address *page_table_mapping, -+ mali_dma_addr *data_page, mali_io_address *data_page_mapping); -+void mali_destroy_fault_flush_pages( -+ mali_dma_addr *page_directory, mali_io_address *page_directory_mapping, -+ mali_dma_addr *page_table, mali_io_address *page_table_mapping, -+ mali_dma_addr *data_page, mali_io_address *data_page_mapping); ++struct kbase_trace { ++ struct timespec64 timestamp; ++ u32 thread_id; ++ u32 cpu; ++ void *ctx; ++ bool katom; ++ int atom_number; ++ u64 atom_udata[2]; ++ u64 gpu_addr; ++ unsigned long info_val; ++ u8 code; ++ u8 jobslot; ++ u8 refcount; ++ u8 flags; ++}; + -+struct mali_page_directory *mali_mmu_pagedir_alloc(void); -+void mali_mmu_pagedir_free(struct mali_page_directory *pagedir); ++/** Event IDs for the power management framework. ++ * ++ * Any of these events might be missed, so they should not be relied upon to ++ * find the precise state of the GPU at a particular time in the ++ * trace. Overall, we should get a high percentage of these events for ++ * statisical purposes, and so a few missing should not be a problem */ ++enum kbase_timeline_pm_event { ++ /* helper for tests */ ++ KBASEP_TIMELINE_PM_EVENT_FIRST, + -+void mali_mmu_pagedir_diag(struct mali_page_directory *pagedir, u32 fault_addr); ++ /** Event reserved for backwards compatibility with 'init' events */ ++ KBASE_TIMELINE_PM_EVENT_RESERVED_0 = KBASEP_TIMELINE_PM_EVENT_FIRST, + -+#endif /* __MALI_MMU_PAGE_DIRECTORY_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk.h b/drivers/gpu/arm/mali400/mali/common/mali_osk.h -new file mode 100755 -index 000000000000..9ade362d6b28 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_osk.h -@@ -0,0 +1,1389 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ /** The power state of the device has changed. ++ * ++ * Specifically, the device has reached a desired or available state. ++ */ ++ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED, + -+/** -+ * @file mali_osk.h -+ * Defines the OS abstraction layer for the kernel device driver (OSK) -+ */ ++ /** The GPU is becoming active. ++ * ++ * This event is sent when the first context is about to use the GPU. ++ */ ++ KBASE_TIMELINE_PM_EVENT_GPU_ACTIVE, + -+#ifndef __MALI_OSK_H__ -+#define __MALI_OSK_H__ ++ /** The GPU is becoming idle. ++ * ++ * This event is sent when the last context has finished using the GPU. ++ */ ++ KBASE_TIMELINE_PM_EVENT_GPU_IDLE, + -+#include -+#include "mali_osk_types.h" -+#include "mali_osk_specific.h" /* include any per-os specifics */ -+#include "mali_osk_locks.h" ++ /** Event reserved for backwards compatibility with 'policy_change' ++ * events */ ++ KBASE_TIMELINE_PM_EVENT_RESERVED_4, + -+#ifdef __cplusplus -+extern "C" { -+#endif ++ /** Event reserved for backwards compatibility with 'system_suspend' ++ * events */ ++ KBASE_TIMELINE_PM_EVENT_RESERVED_5, + -+/** -+ * @addtogroup uddapi Unified Device Driver (UDD) APIs -+ * -+ * @{ -+ */ ++ /** Event reserved for backwards compatibility with 'system_resume' ++ * events */ ++ KBASE_TIMELINE_PM_EVENT_RESERVED_6, + -+/** -+ * @addtogroup oskapi UDD OS Abstraction for Kernel-side (OSK) APIs -+ * -+ * @{ -+ */ ++ /** The job scheduler is requesting to power up/down cores. ++ * ++ * This event is sent when: ++ * - powered down cores are needed to complete a job ++ * - powered up cores are not needed anymore ++ */ ++ KBASE_TIMELINE_PM_EVENT_CHANGE_GPU_STATE, + -+/** @addtogroup _mali_osk_lock OSK Mutual Exclusion Locks -+ * @{ */ ++ KBASEP_TIMELINE_PM_EVENT_LAST = KBASE_TIMELINE_PM_EVENT_CHANGE_GPU_STATE, ++}; + -+#ifdef DEBUG -+/** @brief Macro for asserting that the current thread holds a given lock -+ */ -+#define MALI_DEBUG_ASSERT_LOCK_HELD(l) MALI_DEBUG_ASSERT(_mali_osk_lock_get_owner((_mali_osk_lock_debug_t *)l) == _mali_osk_get_tid()); ++#ifdef CONFIG_MALI_TRACE_TIMELINE ++struct kbase_trace_kctx_timeline { ++ atomic_t jd_atoms_in_flight; ++ u32 owner_tgid; ++}; + -+/** @brief returns a lock's owner (thread id) if debugging is enabled -+ */ -+#else -+#define MALI_DEBUG_ASSERT_LOCK_HELD(l) do {} while(0) -+#endif ++struct kbase_trace_kbdev_timeline { ++ /* Note: strictly speaking, not needed, because it's in sync with ++ * kbase_device::jm_slots[]::submitted_nr ++ * ++ * But it's kept as an example of how to add global timeline tracking ++ * information ++ * ++ * The caller must hold hwaccess_lock when accessing this */ ++ u8 slot_atoms_submitted[BASE_JM_MAX_NR_SLOTS]; + -+#define _mali_osk_ctxprintf seq_printf ++ /* Last UID for each PM event */ ++ atomic_t pm_event_uid[KBASEP_TIMELINE_PM_EVENT_LAST+1]; ++ /* Counter for generating PM event UIDs */ ++ atomic_t pm_event_uid_counter; ++ /* ++ * L2 transition state - true indicates that the transition is ongoing ++ * Expected to be protected by hwaccess_lock */ ++ bool l2_transitioning; ++}; ++#endif /* CONFIG_MALI_TRACE_TIMELINE */ + -+/** @} */ /* end group _mali_osk_lock */ + -+/** @addtogroup _mali_osk_miscellaneous -+ * @{ */ ++struct kbasep_kctx_list_element { ++ struct list_head link; ++ struct kbase_context *kctx; ++}; + -+/** @brief Find the containing structure of another structure -+ * -+ * This is the reverse of the operation 'offsetof'. This means that the -+ * following condition is satisfied: -+ * -+ * ptr == _MALI_OSK_CONTAINER_OF( &ptr->member, type, member ) -+ * -+ * When ptr is of type 'type'. -+ * -+ * Its purpose it to recover a larger structure that has wrapped a smaller one. -+ * -+ * @note no type or memory checking occurs to ensure that a wrapper structure -+ * does in fact exist, and that it is being recovered with respect to the -+ * correct member. ++/** ++ * Data stored per device for power management. + * -+ * @param ptr the pointer to the member that is contained within the larger -+ * structure -+ * @param type the type of the structure that contains the member -+ * @param member the name of the member in the structure that ptr points to. -+ * @return a pointer to a \a type object which contains \a member, as pointed -+ * to by \a ptr. ++ * This structure contains data for the power management framework. There is one ++ * instance of this structure per device in the system. + */ -+#define _MALI_OSK_CONTAINER_OF(ptr, type, member) \ -+ ((type *)( ((char *)ptr) - offsetof(type,member) )) ++struct kbase_pm_device_data { ++ /** ++ * The lock protecting Power Management structures accessed outside of ++ * IRQ. ++ * ++ * This lock must also be held whenever the GPU is being powered on or ++ * off. ++ */ ++ struct mutex lock; + -+/** @addtogroup _mali_osk_wq -+ * @{ */ ++ /** The reference count of active contexts on this device. */ ++ int active_count; ++ /** Flag indicating suspending/suspended */ ++ bool suspending; ++ /* Wait queue set when active_count == 0 */ ++ wait_queue_head_t zero_active_count_wait; + -+/** @brief Initialize work queues (for deferred work) -+ * -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. -+ */ -+_mali_osk_errcode_t _mali_osk_wq_init(void); ++ /** ++ * Bit masks identifying the available shader cores that are specified ++ * via sysfs. One mask per job slot. ++ */ ++ u64 debug_core_mask[BASE_JM_MAX_NR_SLOTS]; ++ u64 debug_core_mask_all; + -+/** @brief Terminate work queues (for deferred work) -+ */ -+void _mali_osk_wq_term(void); ++ /** ++ * Callback for initializing the runtime power management. ++ * ++ * @param kbdev The kbase device ++ * ++ * @return 0 on success, else error code ++ */ ++ int (*callback_power_runtime_init)(struct kbase_device *kbdev); + -+/** @brief Create work in the work queue -+ * -+ * Creates a work object which can be scheduled in the work queue. When -+ * scheduled, \a handler will be called with \a data as the argument. -+ * -+ * Refer to \ref _mali_osk_wq_schedule_work() for details on how work -+ * is scheduled in the queue. -+ * -+ * The returned pointer must be freed with \ref _mali_osk_wq_delete_work() -+ * when no longer needed. -+ */ -+_mali_osk_wq_work_t *_mali_osk_wq_create_work(_mali_osk_wq_work_handler_t handler, void *data); ++ /** ++ * Callback for terminating the runtime power management. ++ * ++ * @param kbdev The kbase device ++ */ ++ void (*callback_power_runtime_term)(struct kbase_device *kbdev); + -+/** @brief A high priority version of \a _mali_osk_wq_create_work() -+ * -+ * Creates a work object which can be scheduled in the high priority work queue. -+ * -+ * This is unfortunately needed to get low latency scheduling of the Mali cores. Normally we would -+ * schedule the next job in hw_irq or tasklet, but often we can't since we need to synchronously map -+ * and unmap shared memory when a job is connected to external fences (timelines). And this requires -+ * taking a mutex. -+ * -+ * We do signal a lot of other (low priority) work also as part of the job being finished, and if we -+ * don't set this Mali scheduling thread as high priority, we see that the CPU scheduler often runs -+ * random things instead of starting the next GPU job when the GPU is idle. So setting the gpu -+ * scheduler to high priority does give a visually more responsive system. -+ * -+ * Start the high priority work with: \a _mali_osk_wq_schedule_work_high_pri() -+ */ -+_mali_osk_wq_work_t *_mali_osk_wq_create_work_high_pri(_mali_osk_wq_work_handler_t handler, void *data); ++ /* Time in milliseconds between each dvfs sample */ ++ u32 dvfs_period; + -+/** @brief Delete a work object -+ * -+ * This will flush the work queue to ensure that the work handler will not -+ * be called after deletion. -+ */ -+void _mali_osk_wq_delete_work(_mali_osk_wq_work_t *work); ++ /* Period of GPU poweroff timer */ ++ ktime_t gpu_poweroff_time; + -+/** @brief Delete a work object -+ * -+ * This will NOT flush the work queue, so only call this if you are sure that the work handler will -+ * not be called after deletion. -+ */ -+void _mali_osk_wq_delete_work_nonflush(_mali_osk_wq_work_t *work); ++ /* Number of ticks of GPU poweroff timer before shader is powered off */ ++ int poweroff_shader_ticks; + -+/** @brief Cause a queued, deferred call of the work handler -+ * -+ * _mali_osk_wq_schedule_work provides a mechanism for enqueuing deferred calls -+ * to the work handler. After calling \ref _mali_osk_wq_schedule_work(), the -+ * work handler will be scheduled to run at some point in the future. -+ * -+ * Typically this is called by the IRQ upper-half to defer further processing of -+ * IRQ-related work to the IRQ bottom-half handler. This is necessary for work -+ * that cannot be done in an IRQ context by the IRQ upper-half handler. Timer -+ * callbacks also use this mechanism, because they are treated as though they -+ * operate in an IRQ context. Refer to \ref _mali_osk_timer_t for more -+ * information. -+ * -+ * Code that operates in a kernel-process context (with no IRQ context -+ * restrictions) may also enqueue deferred calls to the IRQ bottom-half. The -+ * advantage over direct calling is that deferred calling allows the caller and -+ * IRQ bottom half to hold the same mutex, with a guarantee that they will not -+ * deadlock just by using this mechanism. -+ * -+ * _mali_osk_wq_schedule_work() places deferred call requests on a queue, to -+ * allow for more than one thread to make a deferred call. Therfore, if it is -+ * called 'K' times, then the IRQ bottom-half will be scheduled 'K' times too. -+ * 'K' is a number that is implementation-specific. -+ * -+ * _mali_osk_wq_schedule_work() is guaranteed to not block on: -+ * - enqueuing a deferred call request. -+ * - the completion of the work handler. -+ * -+ * This is to prevent deadlock. For example, if _mali_osk_wq_schedule_work() -+ * blocked, then it would cause a deadlock when the following two conditions -+ * hold: -+ * - The work handler callback (of type _mali_osk_wq_work_handler_t) locks -+ * a mutex -+ * - And, at the same time, the caller of _mali_osk_wq_schedule_work() also -+ * holds the same mutex -+ * -+ * @note care must be taken to not overflow the queue that -+ * _mali_osk_wq_schedule_work() operates on. Code must be structured to -+ * ensure that the number of requests made to the queue is bounded. Otherwise, -+ * work will be lost. -+ * -+ * The queue that _mali_osk_wq_schedule_work implements is a FIFO of N-writer, -+ * 1-reader type. The writers are the callers of _mali_osk_wq_schedule_work -+ * (all OSK-registered IRQ upper-half handlers in the system, watchdog timers, -+ * callers from a Kernel-process context). The reader is a single thread that -+ * handles all OSK-registered work. -+ * -+ * @param work a pointer to the _mali_osk_wq_work_t object corresponding to the -+ * work to begin processing. -+ */ -+void _mali_osk_wq_schedule_work(_mali_osk_wq_work_t *work); ++ /* Number of ticks of GPU poweroff timer before GPU is powered off */ ++ int poweroff_gpu_ticks; + -+/** @brief Cause a queued, deferred call of the high priority work handler -+ * -+ * Function is the same as \a _mali_osk_wq_schedule_work() with the only -+ * difference that it runs in a high (real time) priority on the system. -+ * -+ * Should only be used as a substitue for doing the same work in interrupts. -+ * -+ * This is allowed to sleep, but the work should be small since it will block -+ * all other applications. -+*/ -+void _mali_osk_wq_schedule_work_high_pri(_mali_osk_wq_work_t *work); ++ struct kbase_pm_backend_data backend; ++}; + -+/** @brief Flush the work queue -+ * -+ * This will flush the OSK work queue, ensuring all work in the queue has -+ * completed before returning. -+ * -+ * Since this blocks on the completion of work in the work-queue, the -+ * caller of this function \b must \b not hold any mutexes that are taken by -+ * any registered work handler. To do so may cause a deadlock. -+ * ++/** ++ * struct kbase_mem_pool - Page based memory pool for kctx/kbdev ++ * @kbdev: Kbase device where memory is used ++ * @cur_size: Number of free pages currently in the pool (may exceed @max_size ++ * in some corner cases) ++ * @max_size: Maximum number of free pages in the pool ++ * @pool_lock: Lock protecting the pool - must be held when modifying @cur_size ++ * and @page_list ++ * @page_list: List of free pages in the pool ++ * @reclaim: Shrinker for kernel reclaim of free pages ++ * @next_pool: Pointer to next pool where pages can be allocated when this pool ++ * is empty. Pages will spill over to the next pool when this pool ++ * is full. Can be NULL if there is no next pool. + */ -+void _mali_osk_wq_flush(void); ++struct kbase_mem_pool { ++ struct kbase_device *kbdev; ++ size_t cur_size; ++ size_t max_size; ++ spinlock_t pool_lock; ++ struct list_head page_list; ++ struct shrinker reclaim; + -+/** @brief Create work in the delayed work queue -+ * -+ * Creates a work object which can be scheduled in the work queue. When -+ * scheduled, a timer will be start and the \a handler will be called with -+ * \a data as the argument when timer out -+ * -+ * Refer to \ref _mali_osk_wq_delayed_schedule_work() for details on how work -+ * is scheduled in the queue. -+ * -+ * The returned pointer must be freed with \ref _mali_osk_wq_delayed_delete_work_nonflush() -+ * when no longer needed. -+ */ -+_mali_osk_wq_delayed_work_t *_mali_osk_wq_delayed_create_work(_mali_osk_wq_work_handler_t handler, void *data); ++ struct kbase_mem_pool *next_pool; ++}; + -+/** @brief Delete a work object -+ * -+ * This will NOT flush the work queue, so only call this if you are sure that the work handler will -+ * not be called after deletion. ++/** ++ * struct kbase_devfreq_opp - Lookup table for converting between nominal OPP ++ * frequency, and real frequency and core mask ++ * @opp_freq: Nominal OPP frequency ++ * @real_freq: Real GPU frequency ++ * @core_mask: Shader core mask + */ -+void _mali_osk_wq_delayed_delete_work_nonflush(_mali_osk_wq_delayed_work_t *work); ++struct kbase_devfreq_opp { ++ u64 opp_freq; ++ u64 real_freq; ++ u64 core_mask; ++}; + -+/** @brief Cancel a delayed work without waiting for it to finish -+ * -+ * Note that the \a work callback function may still be running on return from -+ * _mali_osk_wq_delayed_cancel_work_async(). -+ * -+ * @param work The delayed work to be cancelled -+ */ -+void _mali_osk_wq_delayed_cancel_work_async(_mali_osk_wq_delayed_work_t *work); ++#define DEVNAME_SIZE 16 + -+/** @brief Cancel a delayed work and wait for it to finish -+ * -+ * When this function returns, the \a work was either cancelled or it finished running. -+ * -+ * @param work The delayed work to be cancelled -+ */ -+void _mali_osk_wq_delayed_cancel_work_sync(_mali_osk_wq_delayed_work_t *work); ++struct kbase_device { ++ s8 slot_submit_count_irq[BASE_JM_MAX_NR_SLOTS]; + -+/** @brief Put \a work task in global workqueue after delay -+ * -+ * After waiting for a given time this puts a job in the kernel-global -+ * workqueue. -+ * -+ * If \a work was already on a queue, this function will return without doing anything -+ * -+ * @param work job to be done -+ * @param delay number of jiffies to wait or 0 for immediate execution -+ */ -+void _mali_osk_wq_delayed_schedule_work(_mali_osk_wq_delayed_work_t *work, u32 delay); ++ u32 hw_quirks_sc; ++ u32 hw_quirks_tiler; ++ u32 hw_quirks_mmu; ++ u32 hw_quirks_jm; + -+/** @} */ /* end group _mali_osk_wq */ ++ struct list_head entry; ++ struct device *dev; ++ unsigned int kbase_group_error; ++ struct miscdevice mdev; ++ u64 reg_start; ++ size_t reg_size; ++ void __iomem *reg; + ++ struct { ++ int irq; ++ int flags; ++ } irqs[3]; + -+/** @addtogroup _mali_osk_irq -+ * @{ */ ++ struct clk *clock; ++#ifdef CONFIG_REGULATOR ++ struct regulator *regulator; ++#endif ++ char devname[DEVNAME_SIZE]; + -+/** @brief Initialize IRQ handling for a resource -+ * -+ * Registers an interrupt handler \a uhandler for the given IRQ number \a irqnum. -+ * \a data will be passed as argument to the handler when an interrupt occurs. -+ * -+ * If \a irqnum is -1, _mali_osk_irq_init will probe for the IRQ number using -+ * the supplied \a trigger_func and \a ack_func. These functions will also -+ * receive \a data as their argument. -+ * -+ * @param irqnum The IRQ number that the resource uses, as seen by the CPU. -+ * The value -1 has a special meaning which indicates the use of probing, and -+ * trigger_func and ack_func must be non-NULL. -+ * @param uhandler The interrupt handler, corresponding to a ISR handler for -+ * the resource -+ * @param int_data resource specific data, which will be passed to uhandler -+ * @param trigger_func Optional: a function to trigger the resource's irq, to -+ * probe for the interrupt. Use NULL if irqnum != -1. -+ * @param ack_func Optional: a function to acknowledge the resource's irq, to -+ * probe for the interrupt. Use NULL if irqnum != -1. -+ * @param probe_data resource-specific data, which will be passed to -+ * (if present) trigger_func and ack_func -+ * @param description textual description of the IRQ resource. -+ * @return on success, a pointer to a _mali_osk_irq_t object, which represents -+ * the IRQ handling on this resource. NULL on failure. -+ */ -+_mali_osk_irq_t *_mali_osk_irq_init(u32 irqnum, _mali_osk_irq_uhandler_t uhandler, void *int_data, _mali_osk_irq_trigger_t trigger_func, _mali_osk_irq_ack_t ack_func, void *probe_data, const char *description); ++#ifdef CONFIG_MALI_NO_MALI ++ void *model; ++ struct kmem_cache *irq_slab; ++ struct workqueue_struct *irq_workq; ++ atomic_t serving_job_irq; ++ atomic_t serving_gpu_irq; ++ atomic_t serving_mmu_irq; ++ spinlock_t reg_op_lock; ++#endif /* CONFIG_MALI_NO_MALI */ + -+/** @brief Terminate IRQ handling on a resource. -+ * -+ * This will disable the interrupt from the device, and then waits for any -+ * currently executing IRQ handlers to complete. -+ * -+ * @note If work is deferred to an IRQ bottom-half handler through -+ * \ref _mali_osk_wq_schedule_work(), be sure to flush any remaining work -+ * with \ref _mali_osk_wq_flush() or (implicitly) with \ref _mali_osk_wq_delete_work() -+ * -+ * @param irq a pointer to the _mali_osk_irq_t object corresponding to the -+ * resource whose IRQ handling is to be terminated. -+ */ -+void _mali_osk_irq_term(_mali_osk_irq_t *irq); ++ struct kbase_pm_device_data pm; ++ struct kbasep_js_device_data js_data; ++ struct kbase_mem_pool mem_pool; ++ struct kbasep_mem_device memdev; ++ struct kbase_mmu_mode const *mmu_mode; + -+/** @} */ /* end group _mali_osk_irq */ ++ struct kbase_as as[BASE_MAX_NR_AS]; ++ /* The below variables (as_free and as_to_kctx) are managed by the ++ * Context Scheduler. The kbasep_js_device_data::runpool_irq::lock must ++ * be held whilst accessing these. ++ */ ++ u16 as_free; /* Bitpattern of free Address Spaces */ ++ /* Mapping from active Address Spaces to kbase_context */ ++ struct kbase_context *as_to_kctx[BASE_MAX_NR_AS]; + + -+/** @addtogroup _mali_osk_atomic -+ * @{ */ ++ spinlock_t mmu_mask_change; + -+/** @brief Decrement an atomic counter -+ * -+ * @note It is an error to decrement the counter beyond -(1<<23) -+ * -+ * @param atom pointer to an atomic counter */ -+void _mali_osk_atomic_dec(_mali_osk_atomic_t *atom); ++ struct kbase_gpu_props gpu_props; + -+/** @brief Decrement an atomic counter, return new value -+ * -+ * @param atom pointer to an atomic counter -+ * @return The new value, after decrement */ -+u32 _mali_osk_atomic_dec_return(_mali_osk_atomic_t *atom); ++ /** List of SW workarounds for HW issues */ ++ unsigned long hw_issues_mask[(BASE_HW_ISSUE_END + BITS_PER_LONG - 1) / BITS_PER_LONG]; ++ /** List of features available */ ++ unsigned long hw_features_mask[(BASE_HW_FEATURE_END + BITS_PER_LONG - 1) / BITS_PER_LONG]; + -+/** @brief Increment an atomic counter -+ * -+ * @note It is an error to increment the counter beyond (1<<23)-1 -+ * -+ * @param atom pointer to an atomic counter */ -+void _mali_osk_atomic_inc(_mali_osk_atomic_t *atom); ++ /* Bitmaps of cores that are currently in use (running jobs). ++ * These should be kept up to date by the job scheduler. ++ * ++ * pm.power_change_lock should be held when accessing these members. ++ * ++ * kbase_pm_check_transitions_nolock() should be called when bits are ++ * cleared to update the power management system and allow transitions to ++ * occur. */ ++ u64 shader_inuse_bitmap; + -+/** @brief Increment an atomic counter, return new value -+ * -+ * @param atom pointer to an atomic counter */ -+u32 _mali_osk_atomic_inc_return(_mali_osk_atomic_t *atom); ++ /* Refcount for cores in use */ ++ u32 shader_inuse_cnt[64]; + -+/** @brief Initialize an atomic counter -+ * -+ * @note the parameter required is a u32, and so signed integers should be -+ * cast to u32. -+ * -+ * @param atom pointer to an atomic counter -+ * @param val the value to initialize the atomic counter. -+ */ -+void _mali_osk_atomic_init(_mali_osk_atomic_t *atom, u32 val); ++ /* Bitmaps of cores the JS needs for jobs ready to run */ ++ u64 shader_needed_bitmap; + -+/** @brief Read a value from an atomic counter -+ * -+ * This can only be safely used to determine the value of the counter when it -+ * is guaranteed that other threads will not be modifying the counter. This -+ * makes its usefulness limited. -+ * -+ * @param atom pointer to an atomic counter -+ */ -+u32 _mali_osk_atomic_read(_mali_osk_atomic_t *atom); ++ /* Refcount for cores needed */ ++ u32 shader_needed_cnt[64]; + -+/** @brief Terminate an atomic counter -+ * -+ * @param atom pointer to an atomic counter -+ */ -+void _mali_osk_atomic_term(_mali_osk_atomic_t *atom); ++ u32 tiler_inuse_cnt; + -+/** @brief Assign a new val to atomic counter, and return the old atomic counter -+ * -+ * @param atom pointer to an atomic counter -+ * @param val the new value assign to the atomic counter -+ * @return the old value of the atomic counter -+ */ -+u32 _mali_osk_atomic_xchg(_mali_osk_atomic_t *atom, u32 val); -+/** @} */ /* end group _mali_osk_atomic */ ++ u32 tiler_needed_cnt; + ++ /* struct for keeping track of the disjoint information ++ * ++ * The state is > 0 if the GPU is in a disjoint state. Otherwise 0 ++ * The count is the number of disjoint events that have occurred on the GPU ++ */ ++ struct { ++ atomic_t count; ++ atomic_t state; ++ } disjoint_event; + -+/** @defgroup _mali_osk_memory OSK Memory Allocation -+ * @{ */ ++ /* Refcount for tracking users of the l2 cache, e.g. when using hardware counter instrumentation. */ ++ u32 l2_users_count; + -+/** @brief Allocate zero-initialized memory. -+ * -+ * Returns a buffer capable of containing at least \a n elements of \a size -+ * bytes each. The buffer is initialized to zero. -+ * -+ * If there is a need for a bigger block of memory (16KB or bigger), then -+ * consider to use _mali_osk_vmalloc() instead, as this function might -+ * map down to a OS function with size limitations. -+ * -+ * The buffer is suitably aligned for storage and subsequent access of every -+ * type that the compiler supports. Therefore, the pointer to the start of the -+ * buffer may be cast into any pointer type, and be subsequently accessed from -+ * such a pointer, without loss of information. -+ * -+ * When the buffer is no longer in use, it must be freed with _mali_osk_free(). -+ * Failure to do so will cause a memory leak. -+ * -+ * @note Most toolchains supply memory allocation functions that meet the -+ * compiler's alignment requirements. -+ * -+ * @param n Number of elements to allocate -+ * @param size Size of each element -+ * @return On success, the zero-initialized buffer allocated. NULL on failure -+ */ -+void *_mali_osk_calloc(u32 n, u32 size); ++ /* Bitmaps of cores that are currently available (powered up and the power policy is happy for jobs to be ++ * submitted to these cores. These are updated by the power management code. The job scheduler should avoid ++ * submitting new jobs to any cores that are not marked as available. ++ * ++ * pm.power_change_lock should be held when accessing these members. ++ */ ++ u64 shader_available_bitmap; ++ u64 tiler_available_bitmap; ++ u64 l2_available_bitmap; ++ u64 stack_available_bitmap; + -+/** @brief Allocate memory. -+ * -+ * Returns a buffer capable of containing at least \a size bytes. The -+ * contents of the buffer are undefined. -+ * -+ * If there is a need for a bigger block of memory (16KB or bigger), then -+ * consider to use _mali_osk_vmalloc() instead, as this function might -+ * map down to a OS function with size limitations. -+ * -+ * The buffer is suitably aligned for storage and subsequent access of every -+ * type that the compiler supports. Therefore, the pointer to the start of the -+ * buffer may be cast into any pointer type, and be subsequently accessed from -+ * such a pointer, without loss of information. -+ * -+ * When the buffer is no longer in use, it must be freed with _mali_osk_free(). -+ * Failure to do so will cause a memory leak. -+ * -+ * @note Most toolchains supply memory allocation functions that meet the -+ * compiler's alignment requirements. -+ * -+ * Remember to free memory using _mali_osk_free(). -+ * @param size Number of bytes to allocate -+ * @return On success, the buffer allocated. NULL on failure. -+ */ -+void *_mali_osk_malloc(u32 size); ++ u64 shader_ready_bitmap; ++ u64 shader_transitioning_bitmap; + -+/** @brief Free memory. -+ * -+ * Reclaims the buffer pointed to by the parameter \a ptr for the system. -+ * All memory returned from _mali_osk_malloc() and _mali_osk_calloc() -+ * must be freed before the application exits. Otherwise, -+ * a memory leak will occur. -+ * -+ * Memory must be freed once. It is an error to free the same non-NULL pointer -+ * more than once. -+ * -+ * It is legal to free the NULL pointer. -+ * -+ * @param ptr Pointer to buffer to free -+ */ -+void _mali_osk_free(void *ptr); ++ s8 nr_hw_address_spaces; /**< Number of address spaces in the GPU (constant after driver initialisation) */ ++ s8 nr_user_address_spaces; /**< Number of address spaces available to user contexts */ + -+/** @brief Allocate memory. -+ * -+ * Returns a buffer capable of containing at least \a size bytes. The -+ * contents of the buffer are undefined. -+ * -+ * This function is potentially slower than _mali_osk_malloc() and _mali_osk_calloc(), -+ * but do support bigger sizes. -+ * -+ * The buffer is suitably aligned for storage and subsequent access of every -+ * type that the compiler supports. Therefore, the pointer to the start of the -+ * buffer may be cast into any pointer type, and be subsequently accessed from -+ * such a pointer, without loss of information. -+ * -+ * When the buffer is no longer in use, it must be freed with _mali_osk_free(). -+ * Failure to do so will cause a memory leak. -+ * -+ * @note Most toolchains supply memory allocation functions that meet the -+ * compiler's alignment requirements. -+ * -+ * Remember to free memory using _mali_osk_free(). -+ * @param size Number of bytes to allocate -+ * @return On success, the buffer allocated. NULL on failure. -+ */ -+void *_mali_osk_valloc(u32 size); ++ /* Structure used for instrumentation and HW counters dumping */ ++ struct kbase_hwcnt { ++ /* The lock should be used when accessing any of the following members */ ++ spinlock_t lock; + -+/** @brief Free memory. -+ * -+ * Reclaims the buffer pointed to by the parameter \a ptr for the system. -+ * All memory returned from _mali_osk_valloc() must be freed before the -+ * application exits. Otherwise a memory leak will occur. -+ * -+ * Memory must be freed once. It is an error to free the same non-NULL pointer -+ * more than once. -+ * -+ * It is legal to free the NULL pointer. -+ * -+ * @param ptr Pointer to buffer to free -+ */ -+void _mali_osk_vfree(void *ptr); ++ struct kbase_context *kctx; ++ u64 addr; + -+/** @brief Copies memory. -+ * -+ * Copies the \a len bytes from the buffer pointed by the parameter \a src -+ * directly to the buffer pointed by \a dst. -+ * -+ * It is an error for \a src to overlap \a dst anywhere in \a len bytes. -+ * -+ * @param dst Pointer to the destination array where the content is to be -+ * copied. -+ * @param src Pointer to the source of data to be copied. -+ * @param len Number of bytes to copy. -+ * @return \a dst is always passed through unmodified. -+ */ -+void *_mali_osk_memcpy(void *dst, const void *src, u32 len); ++ struct kbase_instr_backend backend; ++ } hwcnt; + -+/** @brief Fills memory. -+ * -+ * Sets the first \a n bytes of the block of memory pointed to by \a s to -+ * the specified value -+ * @param s Pointer to the block of memory to fill. -+ * @param c Value to be set, passed as u32. Only the 8 Least Significant Bits (LSB) -+ * are used. -+ * @param n Number of bytes to be set to the value. -+ * @return \a s is always passed through unmodified -+ */ -+void *_mali_osk_memset(void *s, u32 c, u32 n); -+/** @} */ /* end group _mali_osk_memory */ ++ struct kbase_vinstr_context *vinstr_ctx; + ++#if KBASE_TRACE_ENABLE ++ spinlock_t trace_lock; ++ u16 trace_first_out; ++ u16 trace_next_in; ++ struct kbase_trace *trace_rbuf; ++#endif + -+/** @brief Checks the amount of memory allocated -+ * -+ * Checks that not more than \a max_allocated bytes are allocated. -+ * -+ * Some OS bring up an interactive out of memory dialogue when the -+ * system runs out of memory. This can stall non-interactive -+ * apps (e.g. automated test runs). This function can be used to -+ * not trigger the OOM dialogue by keeping allocations -+ * within a certain limit. -+ * -+ * @return MALI_TRUE when \a max_allocated bytes are not in use yet. MALI_FALSE -+ * when at least \a max_allocated bytes are in use. -+ */ -+mali_bool _mali_osk_mem_check_allocated(u32 max_allocated); ++ u32 reset_timeout_ms; + ++ struct mutex cacheclean_lock; + -+/** @addtogroup _mali_osk_low_level_memory -+ * @{ */ ++ /* Platform specific private data to be accessed by mali_kbase_config_xxx.c only */ ++ void *platform_context; + -+/** @brief Issue a memory barrier -+ * -+ * This defines an arbitrary memory barrier operation, which forces an ordering constraint -+ * on memory read and write operations. -+ */ -+void _mali_osk_mem_barrier(void); ++ /* List of kbase_contexts created */ ++ struct list_head kctx_list; ++ struct mutex kctx_list_lock; + -+/** @brief Issue a write memory barrier -+ * -+ * This defines an write memory barrier operation which forces an ordering constraint -+ * on memory write operations. -+ */ -+void _mali_osk_write_mem_barrier(void); ++ struct rockchip_opp_info opp_info; ++#ifdef CONFIG_MALI_DEVFREQ ++ struct devfreq_dev_profile devfreq_profile; ++ struct devfreq *devfreq; ++ unsigned long current_freq; ++ unsigned long current_nominal_freq; ++ unsigned long current_voltage; ++ u64 current_core_mask; ++ struct kbase_devfreq_opp *opp_table; ++ int num_opps; ++ struct monitor_dev_info *mdev_info; ++#ifdef CONFIG_DEVFREQ_THERMAL ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) ++ struct devfreq_cooling_device *devfreq_cooling; ++#else ++ struct thermal_cooling_device *devfreq_cooling; ++#endif ++ /* Current IPA model - true for configured model, false for fallback */ ++ atomic_t ipa_use_configured_model; ++ struct { ++ /* Access to this struct must be with ipa.lock held */ ++ struct mutex lock; ++ struct kbase_ipa_model *configured_model; ++ struct kbase_ipa_model *fallback_model; ++ } ipa; ++#endif /* CONFIG_DEVFREQ_THERMAL */ ++#endif /* CONFIG_MALI_DEVFREQ */ + -+/** @brief Map a physically contiguous region into kernel space -+ * -+ * This is primarily used for mapping in registers from resources, and Mali-MMU -+ * page tables. The mapping is only visable from kernel-space. -+ * -+ * Access has to go through _mali_osk_mem_ioread32 and _mali_osk_mem_iowrite32 -+ * -+ * @param phys CPU-physical base address of the memory to map in. This must -+ * be aligned to the system's page size, which is assumed to be 4K. -+ * @param size the number of bytes of physically contiguous address space to -+ * map in -+ * @param description A textual description of the memory being mapped in. -+ * @return On success, a Mali IO address through which the mapped-in -+ * memory/registers can be accessed. NULL on failure. -+ */ -+mali_io_address _mali_osk_mem_mapioregion(uintptr_t phys, u32 size, const char *description); + -+/** @brief Unmap a physically contiguous address range from kernel space. -+ * -+ * The address range should be one previously mapped in through -+ * _mali_osk_mem_mapioregion. -+ * -+ * It is a programming error to do (but not limited to) the following: -+ * - attempt an unmap twice -+ * - unmap only part of a range obtained through _mali_osk_mem_mapioregion -+ * - unmap more than the range obtained through _mali_osk_mem_mapioregion -+ * - unmap an address range that was not successfully mapped using -+ * _mali_osk_mem_mapioregion -+ * - provide a mapping that does not map to phys. -+ * -+ * @param phys CPU-physical base address of the memory that was originally -+ * mapped in. This must be aligned to the system's page size, which is assumed -+ * to be 4K -+ * @param size The number of bytes that were originally mapped in. -+ * @param mapping The Mali IO address through which the mapping is -+ * accessed. -+ */ -+void _mali_osk_mem_unmapioregion(uintptr_t phys, u32 size, mali_io_address mapping); ++#ifdef CONFIG_MALI_TRACE_TIMELINE ++ struct kbase_trace_kbdev_timeline timeline; ++#endif + -+/** @brief Allocate and Map a physically contiguous region into kernel space -+ * -+ * This is used for allocating physically contiguous regions (such as Mali-MMU -+ * page tables) and mapping them into kernel space. The mapping is only -+ * visible from kernel-space. -+ * -+ * The alignment of the returned memory is guaranteed to be at least -+ * _MALI_OSK_CPU_PAGE_SIZE. -+ * -+ * Access must go through _mali_osk_mem_ioread32 and _mali_osk_mem_iowrite32 -+ * -+ * @note This function is primarily to provide support for OSs that are -+ * incapable of separating the tasks 'allocate physically contiguous memory' -+ * and 'map it into kernel space' -+ * -+ * @param[out] phys CPU-physical base address of memory that was allocated. -+ * (*phys) will be guaranteed to be aligned to at least -+ * _MALI_OSK_CPU_PAGE_SIZE on success. -+ * -+ * @param[in] size the number of bytes of physically contiguous memory to -+ * allocate. This must be a multiple of _MALI_OSK_CPU_PAGE_SIZE. -+ * -+ * @return On success, a Mali IO address through which the mapped-in -+ * memory/registers can be accessed. NULL on failure, and (*phys) is unmodified. -+ */ -+mali_io_address _mali_osk_mem_allocioregion(u32 *phys, u32 size); ++ /* ++ * Control for enabling job dump on failure, set when control debugfs ++ * is opened. ++ */ ++ bool job_fault_debug; + -+/** @brief Free a physically contiguous address range from kernel space. -+ * -+ * The address range should be one previously mapped in through -+ * _mali_osk_mem_allocioregion. -+ * -+ * It is a programming error to do (but not limited to) the following: -+ * - attempt a free twice on the same ioregion -+ * - free only part of a range obtained through _mali_osk_mem_allocioregion -+ * - free more than the range obtained through _mali_osk_mem_allocioregion -+ * - free an address range that was not successfully mapped using -+ * _mali_osk_mem_allocioregion -+ * - provide a mapping that does not map to phys. -+ * -+ * @param phys CPU-physical base address of the memory that was originally -+ * mapped in, which was aligned to _MALI_OSK_CPU_PAGE_SIZE. -+ * @param size The number of bytes that were originally mapped in, which was -+ * a multiple of _MALI_OSK_CPU_PAGE_SIZE. -+ * @param mapping The Mali IO address through which the mapping is -+ * accessed. -+ */ -+void _mali_osk_mem_freeioregion(u32 phys, u32 size, mali_io_address mapping); ++#ifdef CONFIG_DEBUG_FS ++ /* directory for debugfs entries */ ++ struct dentry *mali_debugfs_directory; ++ /* Root directory for per context entry */ ++ struct dentry *debugfs_ctx_directory; + -+/** @brief Request a region of physically contiguous memory -+ * -+ * This is used to ensure exclusive access to a region of physically contigous -+ * memory. -+ * -+ * It is acceptable to implement this as a stub. However, it is then the job -+ * of the System Integrator to ensure that no other device driver will be using -+ * the physical address ranges used by Mali, while the Mali device driver is -+ * loaded. -+ * -+ * @param phys CPU-physical base address of the memory to request. This must -+ * be aligned to the system's page size, which is assumed to be 4K. -+ * @param size the number of bytes of physically contiguous address space to -+ * request. -+ * @param description A textual description of the memory being requested. -+ * @return _MALI_OSK_ERR_OK on success. Otherwise, a suitable -+ * _mali_osk_errcode_t on failure. -+ */ -+_mali_osk_errcode_t _mali_osk_mem_reqregion(uintptr_t phys, u32 size, const char *description); ++#ifdef CONFIG_MALI_DEBUG ++ /* bit for each as, set if there is new data to report */ ++ u64 debugfs_as_read_bitmap; ++#endif /* CONFIG_MALI_DEBUG */ + -+/** @brief Un-request a region of physically contiguous memory -+ * -+ * This is used to release a regious of physically contiguous memory previously -+ * requested through _mali_osk_mem_reqregion, so that other device drivers may -+ * use it. This will be called at time of Mali device driver termination. -+ * -+ * It is a programming error to attempt to: -+ * - unrequest a region twice -+ * - unrequest only part of a range obtained through _mali_osk_mem_reqregion -+ * - unrequest more than the range obtained through _mali_osk_mem_reqregion -+ * - unrequest an address range that was not successfully requested using -+ * _mali_osk_mem_reqregion -+ * -+ * @param phys CPU-physical base address of the memory to un-request. This must -+ * be aligned to the system's page size, which is assumed to be 4K -+ * @param size the number of bytes of physically contiguous address space to -+ * un-request. -+ */ -+void _mali_osk_mem_unreqregion(uintptr_t phys, u32 size); ++ /* failed job dump, used for separate debug process */ ++ wait_queue_head_t job_fault_wq; ++ wait_queue_head_t job_fault_resume_wq; ++ struct workqueue_struct *job_fault_resume_workq; ++ struct list_head job_fault_event_list; ++ spinlock_t job_fault_event_lock; ++ struct kbase_context *kctx_fault; + -+/** @brief Read from a location currently mapped in through -+ * _mali_osk_mem_mapioregion -+ * -+ * This reads a 32-bit word from a 32-bit aligned location. It is a programming -+ * error to provide unaligned locations, or to read from memory that is not -+ * mapped in, or not mapped through either _mali_osk_mem_mapioregion() or -+ * _mali_osk_mem_allocioregion(). -+ * -+ * @param mapping Mali IO address to read from -+ * @param offset Byte offset from the given IO address to operate on, must be a multiple of 4 -+ * @return the 32-bit word from the specified location. -+ */ -+u32 _mali_osk_mem_ioread32(volatile mali_io_address mapping, u32 offset); ++#if !MALI_CUSTOMER_RELEASE ++ /* Per-device data for register dumping interface */ ++ struct { ++ u16 reg_offset; /* Offset of a GPU_CONTROL register to be ++ dumped upon request */ ++ } regs_dump_debugfs_data; ++#endif /* !MALI_CUSTOMER_RELEASE */ ++#endif /* CONFIG_DEBUG_FS */ + -+/** @brief Write to a location currently mapped in through -+ * _mali_osk_mem_mapioregion without memory barriers -+ * -+ * This write a 32-bit word to a 32-bit aligned location without using memory barrier. -+ * It is a programming error to provide unaligned locations, or to write to memory that is not -+ * mapped in, or not mapped through either _mali_osk_mem_mapioregion() or -+ * _mali_osk_mem_allocioregion(). -+ * -+ * @param mapping Mali IO address to write to -+ * @param offset Byte offset from the given IO address to operate on, must be a multiple of 4 -+ * @param val the 32-bit word to write. -+ */ -+void _mali_osk_mem_iowrite32_relaxed(volatile mali_io_address addr, u32 offset, u32 val); ++ /* fbdump profiling controls set by gator */ ++ u32 kbase_profiling_controls[FBDUMP_CONTROL_MAX]; + -+/** @brief Write to a location currently mapped in through -+ * _mali_osk_mem_mapioregion with write memory barrier -+ * -+ * This write a 32-bit word to a 32-bit aligned location. It is a programming -+ * error to provide unaligned locations, or to write to memory that is not -+ * mapped in, or not mapped through either _mali_osk_mem_mapioregion() or -+ * _mali_osk_mem_allocioregion(). -+ * -+ * @param mapping Mali IO address to write to -+ * @param offset Byte offset from the given IO address to operate on, must be a multiple of 4 -+ * @param val the 32-bit word to write. -+ */ -+void _mali_osk_mem_iowrite32(volatile mali_io_address mapping, u32 offset, u32 val); + -+/** @brief Flush all CPU caches -+ * -+ * This should only be implemented if flushing of the cache is required for -+ * memory mapped in through _mali_osk_mem_mapregion. -+ */ -+void _mali_osk_cache_flushall(void); ++#if MALI_CUSTOMER_RELEASE == 0 ++ /* Number of jobs that are run before a job is forced to fail and ++ * replay. May be KBASEP_FORCE_REPLAY_DISABLED, to disable forced ++ * failures. */ ++ int force_replay_limit; ++ /* Count of jobs between forced failures. Incremented on each job. A ++ * job is forced to fail once this is greater than or equal to ++ * force_replay_limit. */ ++ int force_replay_count; ++ /* Core requirement for jobs to be failed and replayed. May be zero. */ ++ base_jd_core_req force_replay_core_req; ++ /* true if force_replay_limit should be randomized. The random ++ * value will be in the range of 1 - KBASEP_FORCE_REPLAY_RANDOM_LIMIT. ++ */ ++ bool force_replay_random; ++#endif + -+/** @brief Flush any caches necessary for the CPU and MALI to have the same view of a range of uncached mapped memory -+ * -+ * This should only be implemented if your OS doesn't do a full cache flush (inner & outer) -+ * after allocating uncached mapped memory. -+ * -+ * Some OS do not perform a full cache flush (including all outer caches) for uncached mapped memory. -+ * They zero the memory through a cached mapping, then flush the inner caches but not the outer caches. -+ * This is required for MALI to have the correct view of the memory. -+ */ -+void _mali_osk_cache_ensure_uncached_range_flushed(void *uncached_mapping, u32 offset, u32 size); ++ /* Total number of created contexts */ ++ atomic_t ctx_num; + -+/** @brief Safely copy as much data as possible from src to dest -+ * -+ * Do not crash if src or dest isn't available. -+ * -+ * @param dest Destination buffer (limited to user space mapped Mali memory) -+ * @param src Source buffer -+ * @param size Number of bytes to copy -+ * @return Number of bytes actually copied -+ */ -+u32 _mali_osk_mem_write_safe(void *dest, const void *src, u32 size); ++#ifdef CONFIG_DEBUG_FS ++ /* Holds the most recent register accesses */ ++ struct kbase_io_history io_history; ++#endif /* CONFIG_DEBUG_FS */ + -+/** @} */ /* end group _mali_osk_low_level_memory */ ++ struct kbase_hwaccess_data hwaccess; + ++ /* Count of page/bus faults waiting for workqueues to process */ ++ atomic_t faults_pending; + -+/** @addtogroup _mali_osk_notification -+ * -+ * User space notification framework -+ * -+ * Communication with user space of asynchronous events is performed through a -+ * synchronous call to the \ref u_k_api. -+ * -+ * Since the events are asynchronous, the events have to be queued until a -+ * synchronous U/K API call can be made by user-space. A U/K API call might also -+ * be received before any event has happened. Therefore the notifications the -+ * different subsystems wants to send to user space has to be queued for later -+ * reception, or a U/K API call has to be blocked until an event has occured. -+ * -+ * Typical uses of notifications are after running of jobs on the hardware or -+ * when changes to the system is detected that needs to be relayed to user -+ * space. -+ * -+ * After an event has occured user space has to be notified using some kind of -+ * message. The notification framework supports sending messages to waiting -+ * threads or queueing of messages until a U/K API call is made. -+ * -+ * The notification queue is a FIFO. There are no restrictions on the numbers -+ * of readers or writers in the queue. -+ * -+ * A message contains what user space needs to identifiy how to handle an -+ * event. This includes a type field and a possible type specific payload. -+ * -+ * A notification to user space is represented by a -+ * \ref _mali_osk_notification_t object. A sender gets hold of such an object -+ * using _mali_osk_notification_create(). The buffer given by the -+ * _mali_osk_notification_t::result_buffer field in the object is used to store -+ * any type specific data. The other fields are internal to the queue system -+ * and should not be touched. -+ * -+ * @{ */ ++ /* true if GPU is powered off or power off operation is in progress */ ++ bool poweroff_pending; + -+/** @brief Create a notification object -+ * -+ * Returns a notification object which can be added to the queue of -+ * notifications pending for user space transfer. -+ * -+ * The implementation will initialize all members of the -+ * \ref _mali_osk_notification_t object. In particular, the -+ * _mali_osk_notification_t::result_buffer member will be initialized to point -+ * to \a size bytes of storage, and that storage will be suitably aligned for -+ * storage of any structure. That is, the created buffer meets the same -+ * requirements as _mali_osk_malloc(). -+ * -+ * The notification object must be deleted when not in use. Use -+ * _mali_osk_notification_delete() for deleting it. -+ * -+ * @note You \b must \b not call _mali_osk_free() on a \ref _mali_osk_notification_t, -+ * object, or on a _mali_osk_notification_t::result_buffer. You must only use -+ * _mali_osk_notification_delete() to free the resources assocaited with a -+ * \ref _mali_osk_notification_t object. -+ * -+ * @param type The notification type -+ * @param size The size of the type specific buffer to send -+ * @return Pointer to a notification object with a suitable buffer, or NULL on error. -+ */ -+_mali_osk_notification_t *_mali_osk_notification_create(u32 type, u32 size); + -+/** @brief Delete a notification object -+ * -+ * This must be called to reclaim the resources of a notification object. This -+ * includes: -+ * - The _mali_osk_notification_t::result_buffer -+ * - The \ref _mali_osk_notification_t itself. -+ * -+ * A notification object \b must \b not be used after it has been deleted by -+ * _mali_osk_notification_delete(). -+ * -+ * In addition, the notification object may not be deleted while it is in a -+ * queue. That is, if it has been placed on a queue with -+ * _mali_osk_notification_queue_send(), then it must not be deleted until -+ * it has been received by a call to _mali_osk_notification_queue_receive(). -+ * Otherwise, the queue may be corrupted. -+ * -+ * @param object the notification object to delete. -+ */ -+void _mali_osk_notification_delete(_mali_osk_notification_t *object); ++ /* defaults for new context created for this device */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) ++ bool infinite_cache_active_default; ++#else ++ u32 infinite_cache_active_default; ++#endif ++ size_t mem_pool_max_size_default; + -+/** @brief Create a notification queue -+ * -+ * Creates a notification queue which can be used to queue messages for user -+ * delivery and get queued messages from -+ * -+ * The queue is a FIFO, and has no restrictions on the numbers of readers or -+ * writers. -+ * -+ * When the queue is no longer in use, it must be terminated with -+ * \ref _mali_osk_notification_queue_term(). Failure to do so will result in a -+ * memory leak. -+ * -+ * @return Pointer to a new notification queue or NULL on error. -+ */ -+_mali_osk_notification_queue_t *_mali_osk_notification_queue_init(void); ++ /* current gpu coherency mode */ ++ u32 current_gpu_coherency_mode; ++ /* system coherency mode */ ++ u32 system_coherency; ++ /* Flag to track when cci snoops have been enabled on the interface */ ++ bool cci_snoop_enabled; + -+/** @brief Destroy a notification queue -+ * -+ * Destroys a notification queue and frees associated resources from the queue. -+ * -+ * A notification queue \b must \b not be destroyed in the following cases: -+ * - while there are \ref _mali_osk_notification_t objects in the queue. -+ * - while there are writers currently acting upon the queue. That is, while -+ * a thread is currently calling \ref _mali_osk_notification_queue_send() on -+ * the queue, or while a thread may call -+ * \ref _mali_osk_notification_queue_send() on the queue in the future. -+ * - while there are readers currently waiting upon the queue. That is, while -+ * a thread is currently calling \ref _mali_osk_notification_queue_receive() on -+ * the queue, or while a thread may call -+ * \ref _mali_osk_notification_queue_receive() on the queue in the future. -+ * -+ * Therefore, all \ref _mali_osk_notification_t objects must be flushed and -+ * deleted by the code that makes use of the notification queues, since only -+ * they know the structure of the _mali_osk_notification_t::result_buffer -+ * (even if it may only be a flat sturcture). -+ * -+ * @note Since the queue is a FIFO, the code using notification queues may -+ * create its own 'flush' type of notification, to assist in flushing the -+ * queue. -+ * -+ * Once the queue has been destroyed, it must not be used again. -+ * -+ * @param queue The queue to destroy -+ */ -+void _mali_osk_notification_queue_term(_mali_osk_notification_queue_t *queue); ++ /* SMC function IDs to call into Trusted firmware to enable/disable ++ * cache snooping. Value of 0 indicates that they are not used ++ */ ++ u32 snoop_enable_smc; ++ u32 snoop_disable_smc; + -+/** @brief Schedule notification for delivery -+ * -+ * When a \ref _mali_osk_notification_t object has been created successfully -+ * and set up, it may be added to the queue of objects waiting for user space -+ * transfer. -+ * -+ * The sending will not block if the queue is full. -+ * -+ * A \ref _mali_osk_notification_t object \b must \b not be put on two different -+ * queues at the same time, or enqueued twice onto a single queue before -+ * reception. However, it is acceptable for it to be requeued \em after reception -+ * from a call to _mali_osk_notification_queue_receive(), even onto the same queue. -+ * -+ * Again, requeuing must also not enqueue onto two different queues at the same -+ * time, or enqueue onto the same queue twice before reception. -+ * -+ * @param queue The notification queue to add this notification to -+ * @param object The entry to add -+ */ -+void _mali_osk_notification_queue_send(_mali_osk_notification_queue_t *queue, _mali_osk_notification_t *object); ++ /* Protected mode operations */ ++ struct protected_mode_ops *protected_ops; + -+/** @brief Receive a notification from a queue -+ * -+ * Receives a single notification from the given queue. -+ * -+ * If no notifciations are ready the thread will sleep until one becomes ready. -+ * Therefore, notifications may not be received into an -+ * IRQ or 'atomic' context (that is, a context where sleeping is disallowed). -+ * -+ * @param queue The queue to receive from -+ * @param result Pointer to storage of a pointer of type -+ * \ref _mali_osk_notification_t*. \a result will be written to such that the -+ * expression \a (*result) will evaluate to a pointer to a valid -+ * \ref _mali_osk_notification_t object, or NULL if none were received. -+ * @return _MALI_OSK_ERR_OK on success. _MALI_OSK_ERR_RESTARTSYSCALL if the sleep was interrupted. -+ */ -+_mali_osk_errcode_t _mali_osk_notification_queue_receive(_mali_osk_notification_queue_t *queue, _mali_osk_notification_t **result); ++ /* Protected device attached to this kbase device */ ++ struct protected_mode_device *protected_dev; + -+/** @brief Dequeues a notification from a queue -+ * -+ * Receives a single notification from the given queue. -+ * -+ * If no notifciations are ready the function call will return an error code. -+ * -+ * @param queue The queue to receive from -+ * @param result Pointer to storage of a pointer of type -+ * \ref _mali_osk_notification_t*. \a result will be written to such that the -+ * expression \a (*result) will evaluate to a pointer to a valid -+ * \ref _mali_osk_notification_t object, or NULL if none were received. -+ * @return _MALI_OSK_ERR_OK on success, _MALI_OSK_ERR_ITEM_NOT_FOUND if queue was empty. -+ */ -+_mali_osk_errcode_t _mali_osk_notification_queue_dequeue(_mali_osk_notification_queue_t *queue, _mali_osk_notification_t **result); ++ /* ++ * true when GPU is put into protected mode ++ */ ++ bool protected_mode; + -+/** @} */ /* end group _mali_osk_notification */ ++ /* ++ * true when GPU is transitioning into or out of protected mode ++ */ ++ bool protected_mode_transition; + ++ /* ++ * true if protected mode is supported ++ */ ++ bool protected_mode_support; + -+/** @addtogroup _mali_osk_timer -+ * -+ * Timers use the OS's representation of time, which are 'ticks'. This is to -+ * prevent aliasing problems between the internal timer time, and the time -+ * asked for. -+ * -+ * @{ */ + -+/** @brief Initialize a timer -+ * -+ * Allocates resources for a new timer, and initializes them. This does not -+ * start the timer. -+ * -+ * @return a pointer to the allocated timer object, or NULL on failure. -+ */ -+_mali_osk_timer_t *_mali_osk_timer_init(_mali_osk_timer_callback_t callback); ++#ifdef CONFIG_MALI_DEBUG ++ wait_queue_head_t driver_inactive_wait; ++ bool driver_inactive; ++#endif /* CONFIG_MALI_DEBUG */ + -+/** @brief Start a timer -+ * -+ * It is an error to start a timer without setting the callback via -+ * _mali_osk_timer_setcallback(). -+ * -+ * It is an error to use this to start an already started timer. -+ * -+ * The timer will expire in \a ticks_to_expire ticks, at which point, the -+ * callback function will be invoked with the callback-specific data, -+ * as registered by _mali_osk_timer_setcallback(). -+ * -+ * @param tim the timer to start -+ * @param ticks_to_expire the amount of time in ticks for the timer to run -+ * before triggering. -+ */ -+void _mali_osk_timer_add(_mali_osk_timer_t *tim, unsigned long ticks_to_expire); ++#ifdef CONFIG_MALI_FPGA_BUS_LOGGER ++ /* ++ * Bus logger integration. ++ */ ++ struct bus_logger_client *buslogger; ++#endif ++ /* Boolean indicating if an IRQ flush during reset is in progress. */ ++ bool irq_reset_flush; + -+/** @brief Modify a timer -+ * -+ * Set the relative time at which a timer will expire, and start it if it is -+ * stopped. If \a ticks_to_expire 0 the timer fires immediately. -+ * -+ * It is an error to modify a timer without setting the callback via -+ * _mali_osk_timer_setcallback(). -+ * -+ * The timer will expire at \a ticks_to_expire from the time of the call, at -+ * which point, the callback function will be invoked with the -+ * callback-specific data, as set by _mali_osk_timer_setcallback(). -+ * -+ * @param tim the timer to modify, and start if necessary -+ * @param ticks_to_expire the \em absolute time in ticks at which this timer -+ * should trigger. -+ * -+ */ -+void _mali_osk_timer_mod(_mali_osk_timer_t *tim, unsigned long ticks_to_expire); ++ /* list of inited sub systems. Used during terminate/error recovery */ ++ u32 inited_subsys; + -+/** @brief Stop a timer, and block on its completion. -+ * -+ * Stop the timer. When the function returns, it is guaranteed that the timer's -+ * callback will not be running on any CPU core. -+ * -+ * Since stoping the timer blocks on compeletion of the callback, the callback -+ * may not obtain any mutexes that the caller holds. Otherwise, a deadlock will -+ * occur. -+ * -+ * @note While the callback itself is guaranteed to not be running, work -+ * enqueued on the work-queue by the timer (with -+ * \ref _mali_osk_wq_schedule_work()) may still run. The timer callback and -+ * work handler must take this into account. -+ * -+ * It is legal to stop an already stopped timer. -+ * -+ * @param tim the timer to stop. -+ * -+ */ -+void _mali_osk_timer_del(_mali_osk_timer_t *tim); ++ spinlock_t hwaccess_lock; + -+/** @brief Stop a timer. -+ * -+ * Stop the timer. When the function returns, the timer's callback may still be -+ * running on any CPU core. -+ * -+ * It is legal to stop an already stopped timer. -+ * -+ * @param tim the timer to stop. -+ */ -+void _mali_osk_timer_del_async(_mali_osk_timer_t *tim); ++ /* Protects access to MMU operations */ ++ struct mutex mmu_hw_mutex; + -+/** @brief Check if timer is pending. -+ * -+ * Check if timer is active. -+ * -+ * @param tim the timer to check -+ * @return MALI_TRUE if time is active, MALI_FALSE if it is not active -+ */ -+mali_bool _mali_osk_timer_pending(_mali_osk_timer_t *tim); ++ /* Current serialization mode. See KBASE_SERIALIZE_* for details */ ++ u8 serialize_jobs; ++}; + -+/** @brief Set a timer's callback parameters. -+ * -+ * This must be called at least once before a timer is started/modified. -+ * -+ * After a timer has been stopped or expires, the callback remains set. This -+ * means that restarting the timer will call the same function with the same -+ * parameters on expiry. ++/** ++ * struct jsctx_queue - JS context atom queue ++ * @runnable_tree: Root of RB-tree containing currently runnable atoms on this ++ * job slot. ++ * @x_dep_head: Head item of the linked list of atoms blocked on cross-slot ++ * dependencies. Atoms on this list will be moved to the ++ * runnable_tree when the blocking atom completes. + * -+ * @param tim the timer to set callback on. -+ * @param callback Function to call when timer expires -+ * @param data Function-specific data to supply to the function on expiry. ++ * hwaccess_lock must be held when accessing this structure. + */ -+void _mali_osk_timer_setcallback(_mali_osk_timer_t *tim, _mali_osk_timer_callback_t callback, void *data); ++struct jsctx_queue { ++ struct rb_root runnable_tree; ++ struct list_head x_dep_head; ++}; + -+/** @brief Terminate a timer, and deallocate resources. -+ * -+ * The timer must first be stopped by calling _mali_osk_timer_del(). -+ * -+ * It is a programming error for _mali_osk_timer_term() to be called on: -+ * - timer that is currently running -+ * - a timer that is currently executing its callback. -+ * -+ * @param tim the timer to deallocate. -+ */ -+void _mali_osk_timer_term(_mali_osk_timer_t *tim); -+/** @} */ /* end group _mali_osk_timer */ + ++#define KBASE_API_VERSION(major, minor) ((((major) & 0xFFF) << 20) | \ ++ (((minor) & 0xFFF) << 8) | \ ++ ((0 & 0xFF) << 0)) + -+/** @defgroup _mali_osk_time OSK Time functions ++/** ++ * enum kbase_context_flags - Flags for kbase contexts + * -+ * \ref _mali_osk_time use the OS's representation of time, which are -+ * 'ticks'. This is to prevent aliasing problems between the internal timer -+ * time, and the time asked for. ++ * @KCTX_COMPAT: Set when the context process is a compat process, 32-bit ++ * process on a 64-bit kernel. + * -+ * OS tick time is measured as a u32. The time stored in a u32 may either be -+ * an absolute time, or a time delta between two events. Whilst it is valid to -+ * use math opeartors to \em change the tick value represented as a u32, it -+ * is often only meaningful to do such operations on time deltas, rather than -+ * on absolute time. However, it is meaningful to add/subtract time deltas to -+ * absolute times. ++ * @KCTX_RUNNABLE_REF: Set when context is counted in ++ * kbdev->js_data.nr_contexts_runnable. Must hold queue_mutex when accessing. + * -+ * Conversion between tick time and milliseconds (ms) may not be loss-less, -+ * and are \em implementation \em depenedant. ++ * @KCTX_ACTIVE: Set when the context is active. + * -+ * Code use OS time must take this into account, since: -+ * - a small OS time may (or may not) be rounded -+ * - a large time may (or may not) overflow ++ * @KCTX_PULLED: Set when last kick() caused atoms to be pulled from this ++ * context. + * -+ * @{ */ -+ -+/** @brief Return whether ticka occurs after or at the same time as tickb ++ * @KCTX_MEM_PROFILE_INITIALIZED: Set when the context's memory profile has been ++ * initialized. + * -+ * Systems where ticks can wrap must handle that. ++ * @KCTX_INFINITE_CACHE: Set when infinite cache is to be enabled for new ++ * allocations. Existing allocations will not change. + * -+ * @param ticka ticka -+ * @param tickb tickb -+ * @return MALI_TRUE if ticka represents a time that occurs at or after tickb. -+ */ -+mali_bool _mali_osk_time_after_eq(unsigned long ticka, unsigned long tickb); -+ -+/** @brief Convert milliseconds to OS 'ticks' ++ * @KCTX_SUBMIT_DISABLED: Set to prevent context from submitting any jobs. + * -+ * @param ms time interval in milliseconds -+ * @return the corresponding time interval in OS ticks. -+ */ -+unsigned long _mali_osk_time_mstoticks(u32 ms); -+ -+/** @brief Convert OS 'ticks' to milliseconds ++ * @KCTX_PRIVILEGED:Set if the context uses an address space and should be kept ++ * scheduled in. + * -+ * @param ticks time interval in OS ticks. -+ * @return the corresponding time interval in milliseconds -+ */ -+u32 _mali_osk_time_tickstoms(unsigned long ticks); -+ -+ -+/** @brief Get the current time in OS 'ticks'. -+ * @return the current time in OS 'ticks'. -+ */ -+unsigned long _mali_osk_time_tickcount(void); -+ -+/** @brief Cause a microsecond delay ++ * @KCTX_SCHEDULED: Set when the context is scheduled on the Run Pool. ++ * This is only ever updated whilst the jsctx_mutex is held. + * -+ * The delay will have microsecond resolution, and is necessary for correct -+ * operation of the driver. At worst, the delay will be \b at least \a usecs -+ * microseconds, and so may be (significantly) more. ++ * @KCTX_DYING: Set when the context process is in the process of being evicted. + * -+ * This function may be implemented as a busy-wait, which is the most sensible -+ * implementation. On OSs where there are situations in which a thread must not -+ * sleep, this is definitely implemented as a busy-wait. ++ * @KCTX_NO_IMPLICIT_SYNC: Set when explicit Android fences are in use on this ++ * context, to disable use of implicit dma-buf fences. This is used to avoid ++ * potential synchronization deadlocks. + * -+ * @param usecs the number of microseconds to wait for. ++ * All members need to be separate bits. This enum is intended for use in a ++ * bitmask where multiple values get OR-ed together. + */ -+void _mali_osk_time_ubusydelay(u32 usecs); ++enum kbase_context_flags { ++ KCTX_COMPAT = 1U << 0, ++ KCTX_RUNNABLE_REF = 1U << 1, ++ KCTX_ACTIVE = 1U << 2, ++ KCTX_PULLED = 1U << 3, ++ KCTX_MEM_PROFILE_INITIALIZED = 1U << 4, ++ KCTX_INFINITE_CACHE = 1U << 5, ++ KCTX_SUBMIT_DISABLED = 1U << 6, ++ KCTX_PRIVILEGED = 1U << 7, ++ KCTX_SCHEDULED = 1U << 8, ++ KCTX_DYING = 1U << 9, ++ KCTX_NO_IMPLICIT_SYNC = 1U << 10, ++}; + -+/** @brief Return time in nano seconds, since any given reference. -+ * -+ * @return Time in nano seconds -+ */ -+u64 _mali_osk_time_get_ns(void); ++struct kbase_context { ++ struct file *filp; ++ struct kbase_device *kbdev; ++ int id; /* System wide unique id */ ++ unsigned long api_version; ++ phys_addr_t pgd; ++ struct list_head event_list; ++ struct list_head event_coalesce_list; ++ struct mutex event_mutex; ++ atomic_t event_closed; ++ struct workqueue_struct *event_workq; ++ atomic_t event_count; ++ int event_coalesce_count; + -+/** @brief Return time in nano seconds, since boot time. -+ * -+ * @return Time in nano seconds -+ */ -+u64 _mali_osk_boot_time_get_ns(void); ++ atomic_t flags; + -+/** @} */ /* end group _mali_osk_time */ ++ atomic_t setup_complete; ++ atomic_t setup_in_progress; + -+/** @defgroup _mali_osk_math OSK Math -+ * @{ */ ++ u64 *mmu_teardown_pages; + -+/** @brief Count Leading Zeros (Little-endian) -+ * -+ * @note This function must be implemented to support the reference -+ * implementation of _mali_osk_find_first_zero_bit, as defined in -+ * mali_osk_bitops.h. -+ * -+ * @param val 32-bit words to count leading zeros on -+ * @return the number of leading zeros. -+ */ -+u32 _mali_osk_clz(u32 val); ++ struct page *aliasing_sink_page; + -+/** @brief find last (most-significant) bit set -+ * -+ * @param val 32-bit words to count last bit set on -+ * @return last bit set. -+ */ -+u32 _mali_osk_fls(u32 val); ++ struct mutex mmu_lock; ++ struct mutex reg_lock; /* To be converted to a rwlock? */ ++ struct rb_root reg_rbtree_same; /* RB tree of GPU (live) regions, ++ * SAME_VA zone */ ++ struct rb_root reg_rbtree_exec; /* RB tree of GPU (live) regions, ++ * EXEC zone */ ++ struct rb_root reg_rbtree_custom; /* RB tree of GPU (live) regions, ++ * CUSTOM_VA zone */ + -+/** @} */ /* end group _mali_osk_math */ ++ unsigned long cookies; ++ struct kbase_va_region *pending_regions[BITS_PER_LONG]; + -+/** @addtogroup _mali_osk_wait_queue OSK Wait Queue functionality -+ * @{ */ ++ wait_queue_head_t event_queue; ++ pid_t tgid; ++ pid_t pid; + -+/** @brief Initialize an empty Wait Queue */ -+_mali_osk_wait_queue_t *_mali_osk_wait_queue_init(void); ++ struct kbase_jd_context jctx; ++ atomic_t used_pages; ++ atomic_t nonmapped_pages; + -+/** @brief Sleep if condition is false -+ * -+ * @param queue the queue to use -+ * @param condition function pointer to a boolean function -+ * @param data data parameter for condition function -+ * -+ * Put thread to sleep if the given \a condition function returns false. When -+ * being asked to wake up again, the condition will be re-checked and the -+ * thread only woken up if the condition is now true. -+ */ -+void _mali_osk_wait_queue_wait_event(_mali_osk_wait_queue_t *queue, mali_bool(*condition)(void *), void *data); ++ struct kbase_mem_pool mem_pool; + -+/** @brief Sleep if condition is false -+ * -+ * @param queue the queue to use -+ * @param condition function pointer to a boolean function -+ * @param data data parameter for condition function -+ * @param timeout timeout in ms -+ * -+ * Put thread to sleep if the given \a condition function returns false. When -+ * being asked to wake up again, the condition will be re-checked and the -+ * thread only woken up if the condition is now true. Will return if time -+ * exceeds timeout. -+ */ -+void _mali_osk_wait_queue_wait_event_timeout(_mali_osk_wait_queue_t *queue, mali_bool(*condition)(void *), void *data, u32 timeout); -+ -+/** @brief Wake up all threads in wait queue if their respective conditions are -+ * true -+ * -+ * @param queue the queue whose threads should be woken up -+ * -+ * Wake up all threads in wait queue \a queue whose condition is now true. -+ */ -+void _mali_osk_wait_queue_wake_up(_mali_osk_wait_queue_t *queue); ++ struct shrinker reclaim; ++ struct list_head evict_list; + -+/** @brief terminate a wait queue -+ * -+ * @param queue the queue to terminate. -+ */ -+void _mali_osk_wait_queue_term(_mali_osk_wait_queue_t *queue); -+/** @} */ /* end group _mali_osk_wait_queue */ ++ struct list_head waiting_soft_jobs; ++ spinlock_t waiting_soft_jobs_lock; ++#ifdef CONFIG_KDS ++ struct list_head waiting_kds_resource; ++#endif ++#ifdef CONFIG_MALI_DMA_FENCE ++ struct { ++ struct list_head waiting_resource; ++ struct workqueue_struct *wq; ++ } dma_fence; ++#endif /* CONFIG_MALI_DMA_FENCE */ ++ /** This is effectively part of the Run Pool, because it only has a valid ++ * setting (!=KBASEP_AS_NR_INVALID) whilst the context is scheduled in ++ * ++ * The hwaccess_lock must be held whilst accessing this. ++ * ++ * If the context relating to this as_nr is required, you must use ++ * kbasep_js_runpool_retain_ctx() to ensure that the context doesn't disappear ++ * whilst you're using it. Alternatively, just hold the hwaccess_lock ++ * to ensure the context doesn't disappear (but this has restrictions on what other locks ++ * you can take whilst doing this) */ ++ int as_nr; + ++ /* Keeps track of the number of users of this context. A user can be a ++ * job that is available for execution, instrumentation needing to 'pin' ++ * a context for counter collection, etc. If the refcount reaches 0 then ++ * this context is considered inactive and the previously programmed ++ * AS might be cleared at any point. ++ */ ++ atomic_t refcount; + -+/** @addtogroup _mali_osk_miscellaneous -+ * @{ */ ++ /* NOTE: ++ * ++ * Flags are in jctx.sched_info.ctx.flags ++ * Mutable flags *must* be accessed under jctx.sched_info.ctx.jsctx_mutex ++ * ++ * All other flags must be added there */ ++ spinlock_t mm_update_lock; ++ struct mm_struct *process_mm; ++ /* End of the SAME_VA zone */ ++ u64 same_va_end; + -+/** @brief Output a device driver debug message. -+ * -+ * The interpretation of \a fmt is the same as the \c format parameter in -+ * _mali_osu_vsnprintf(). -+ * -+ * @param fmt a _mali_osu_vsnprintf() style format string -+ * @param ... a variable-number of parameters suitable for \a fmt -+ */ -+void _mali_osk_dbgmsg(const char *fmt, ...); ++#ifdef CONFIG_MALI_TRACE_TIMELINE ++ struct kbase_trace_kctx_timeline timeline; ++#endif ++#ifdef CONFIG_DEBUG_FS ++ /* Content of mem_profile file */ ++ char *mem_profile_data; ++ /* Size of @c mem_profile_data */ ++ size_t mem_profile_size; ++ /* Mutex guarding memory profile state */ ++ struct mutex mem_profile_lock; ++ /* Memory profile directory under debugfs */ ++ struct dentry *kctx_dentry; + -+/** @brief Print fmt into buf. -+ * -+ * The interpretation of \a fmt is the same as the \c format parameter in -+ * _mali_osu_vsnprintf(). -+ * -+ * @param buf a pointer to the result buffer -+ * @param size the total number of bytes allowed to write to \a buf -+ * @param fmt a _mali_osu_vsnprintf() style format string -+ * @param ... a variable-number of parameters suitable for \a fmt -+ * @return The number of bytes written to \a buf -+ */ -+u32 _mali_osk_snprintf(char *buf, u32 size, const char *fmt, ...); ++ /* for job fault debug */ ++ unsigned int *reg_dump; ++ atomic_t job_fault_count; ++ /* This list will keep the following atoms during the dump ++ * in the same context ++ */ ++ struct list_head job_fault_resume_event_list; + -+/** @brief Abnormal process abort. -+ * -+ * Terminates the caller-process if this function is called. -+ * -+ * This function will be called from Debug assert-macros in mali_kernel_common.h. -+ * -+ * This function will never return - because to continue from a Debug assert -+ * could cause even more problems, and hinder debugging of the initial problem. -+ * -+ * This function is only used in Debug builds, and is not used in Release builds. -+ */ -+void _mali_osk_abort(void); ++#endif /* CONFIG_DEBUG_FS */ + -+/** @brief Sets breakpoint at point where function is called. -+ * -+ * This function will be called from Debug assert-macros in mali_kernel_common.h, -+ * to assist in debugging. If debugging at this level is not required, then this -+ * function may be implemented as a stub. -+ * -+ * This function is only used in Debug builds, and is not used in Release builds. -+ */ -+void _mali_osk_break(void); ++ struct jsctx_queue jsctx_queue ++ [KBASE_JS_ATOM_SCHED_PRIO_COUNT][BASE_JM_MAX_NR_SLOTS]; + -+/** @brief Return an identificator for calling process. -+ * -+ * @return Identificator for calling process. -+ */ -+u32 _mali_osk_get_pid(void); ++ /* Number of atoms currently pulled from this context */ ++ atomic_t atoms_pulled; ++ /* Number of atoms currently pulled from this context, per slot */ ++ atomic_t atoms_pulled_slot[BASE_JM_MAX_NR_SLOTS]; ++ /* Number of atoms currently pulled from this context, per slot and ++ * priority. Hold hwaccess_lock when accessing */ ++ int atoms_pulled_slot_pri[BASE_JM_MAX_NR_SLOTS][ ++ KBASE_JS_ATOM_SCHED_PRIO_COUNT]; + -+/** @brief Return an name for calling process. -+ * -+ * @return name for calling process. -+ */ -+char *_mali_osk_get_comm(void); ++ /* true if slot is blocked on the given priority. This will be set on a ++ * soft-stop */ ++ bool blocked_js[BASE_JM_MAX_NR_SLOTS][KBASE_JS_ATOM_SCHED_PRIO_COUNT]; + -+/** @brief Return an identificator for calling thread. -+ * -+ * @return Identificator for calling thread. -+ */ -+u32 _mali_osk_get_tid(void); ++ /* Bitmask of slots that can be pulled from */ ++ u32 slots_pullable; + ++ /* Backend specific data */ ++ struct kbase_context_backend backend; + -+/** @brief Take a reference to the power manager system for the Mali device (synchronously). -+ * -+ * When function returns successfully, Mali is ON. -+ * -+ * @note Call \a _mali_osk_pm_dev_ref_put() to release this reference. -+ */ -+_mali_osk_errcode_t _mali_osk_pm_dev_ref_get_sync(void); ++ /* Work structure used for deferred ASID assignment */ ++ struct work_struct work; + -+/** @brief Take a reference to the external power manager system for the Mali device (asynchronously). -+ * -+ * Mali might not yet be on after this function as returned. -+ * Please use \a _mali_osk_pm_dev_barrier() or \a _mali_osk_pm_dev_ref_get_sync() -+ * to wait for Mali to be powered on. -+ * -+ * @note Call \a _mali_osk_pm_dev_ref_dec() to release this reference. -+ */ -+_mali_osk_errcode_t _mali_osk_pm_dev_ref_get_async(void); ++ /* Only one userspace vinstr client per kbase context */ ++ struct kbase_vinstr_client *vinstr_cli; ++ struct mutex vinstr_cli_lock; + -+/** @brief Release the reference to the external power manger system for the Mali device. -+ * -+ * When reference count reach zero, the cores can be off. -+ * -+ * @note This must be used to release references taken with -+ * \a _mali_osk_pm_dev_ref_get_sync() or \a _mali_osk_pm_dev_ref_get_sync(). -+ */ -+void _mali_osk_pm_dev_ref_put(void); ++ /* List of completed jobs waiting for events to be posted */ ++ struct list_head completed_jobs; ++ /* Number of work items currently pending on job_done_wq */ ++ atomic_t work_count; + -+/** @brief Block until pending PM operations are done -+ */ -+void _mali_osk_pm_dev_barrier(void); ++ /* Waiting soft-jobs will fail when this timer expires */ ++ struct timer_list soft_job_timeout; + -+/** @} */ /* end group _mali_osk_miscellaneous */ ++ /* JIT allocation management */ ++ struct kbase_va_region *jit_alloc[256]; ++ struct list_head jit_active_head; ++ struct list_head jit_pool_head; ++ struct list_head jit_destroy_head; ++ struct mutex jit_evict_lock; ++ struct work_struct jit_work; + -+/** @defgroup _mali_osk_bitmap OSK Bitmap -+ * @{ */ ++ /* A list of the JIT soft-jobs in submission order ++ * (protected by kbase_jd_context.lock) ++ */ ++ struct list_head jit_atoms_head; ++ /* A list of pending JIT alloc soft-jobs (using the 'queue' list_head) ++ * (protected by kbase_jd_context.lock) ++ */ ++ struct list_head jit_pending_alloc; + -+/** @brief Allocate a unique number from the bitmap object. -+ * -+ * @param bitmap Initialized bitmap object. -+ * @return An unique existence in the bitmap object. -+ */ -+u32 _mali_osk_bitmap_alloc(struct _mali_osk_bitmap *bitmap); ++ /* External sticky resource management */ ++ struct list_head ext_res_meta_head; + -+/** @brief Free a interger to the bitmap object. -+ * -+ * @param bitmap Initialized bitmap object. -+ * @param obj An number allocated from bitmap object. -+ */ -+void _mali_osk_bitmap_free(struct _mali_osk_bitmap *bitmap, u32 obj); ++ /* Used to record that a drain was requested from atomic context */ ++ atomic_t drain_pending; + -+/** @brief Allocate continuous number from the bitmap object. -+ * -+ * @param bitmap Initialized bitmap object. -+ * @return start number of the continuous number block. -+ */ -+u32 _mali_osk_bitmap_alloc_range(struct _mali_osk_bitmap *bitmap, int cnt); ++ /* Current age count, used to determine age for newly submitted atoms */ ++ u32 age_count; ++}; + -+/** @brief Free a block of continuous number block to the bitmap object. ++/** ++ * struct kbase_ctx_ext_res_meta - Structure which binds an external resource ++ * to a @kbase_context. ++ * @ext_res_node: List head for adding the metadata to a ++ * @kbase_context. ++ * @alloc: The physical memory allocation structure ++ * which is mapped. ++ * @gpu_addr: The GPU virtual address the resource is ++ * mapped to. + * -+ * @param bitmap Initialized bitmap object. -+ * @param obj Start number. -+ * @param cnt The size of the continuous number block. ++ * External resources can be mapped into multiple contexts as well as the same ++ * context multiple times. ++ * As kbase_va_region itself isn't refcounted we can't attach our extra ++ * information to it as it could be removed under our feet leaving external ++ * resources pinned. ++ * This metadata structure binds a single external resource to a single ++ * context, ensuring that per context mapping is tracked separately so it can ++ * be overridden when needed and abuses by the application (freeing the resource ++ * multiple times) don't effect the refcount of the physical allocation. + */ -+void _mali_osk_bitmap_free_range(struct _mali_osk_bitmap *bitmap, u32 obj, int cnt); ++struct kbase_ctx_ext_res_meta { ++ struct list_head ext_res_node; ++ struct kbase_mem_phy_alloc *alloc; ++ u64 gpu_addr; ++}; + -+/** @brief Available count could be used to allocate in the given bitmap object. -+ * -+ */ -+u32 _mali_osk_bitmap_avail(struct _mali_osk_bitmap *bitmap); ++enum kbase_reg_access_type { ++ REG_READ, ++ REG_WRITE ++}; + -+/** @brief Initialize an bitmap object.. -+ * -+ * @param bitmap An poiter of uninitialized bitmap object. -+ * @param num Size of thei bitmap object and decide the memory size allocated. -+ * @param reserve start number used to allocate. -+ */ -+int _mali_osk_bitmap_init(struct _mali_osk_bitmap *bitmap, u32 num, u32 reserve); ++enum kbase_share_attr_bits { ++ /* (1ULL << 8) bit is reserved */ ++ SHARE_BOTH_BITS = (2ULL << 8), /* inner and outer shareable coherency */ ++ SHARE_INNER_BITS = (3ULL << 8) /* inner shareable coherency */ ++}; + -+/** @brief Free the given bitmap object. ++/** ++ * kbase_device_is_cpu_coherent - Returns if the device is CPU coherent. ++ * @kbdev: kbase device + * -+ * @param bitmap Initialized bitmap object. ++ * Return: true if the device access are coherent, false if not. + */ -+void _mali_osk_bitmap_term(struct _mali_osk_bitmap *bitmap); -+/** @} */ /* end group _mali_osk_bitmap */ -+ -+/** @} */ /* end group osuapi */ -+ -+/** @} */ /* end group uddapi */ ++static inline bool kbase_device_is_cpu_coherent(struct kbase_device *kbdev) ++{ ++ if ((kbdev->system_coherency == COHERENCY_ACE_LITE) || ++ (kbdev->system_coherency == COHERENCY_ACE)) ++ return true; + ++ return false; ++} + ++/* Conversion helpers for setting up high resolution timers */ ++#define HR_TIMER_DELAY_MSEC(x) (ns_to_ktime(((u64)(x))*1000000U)) ++#define HR_TIMER_DELAY_NSEC(x) (ns_to_ktime(x)) + -+#ifdef __cplusplus -+} -+#endif ++/* Maximum number of loops polling the GPU for a cache flush before we assume it must have completed */ ++#define KBASE_CLEAN_CACHE_MAX_LOOPS 100000 ++/* Maximum number of loops polling the GPU for an AS command to complete before we assume the GPU has hung */ ++#define KBASE_AS_INACTIVE_MAX_LOOPS 100000 + -+/* Check standard inlines */ -+#ifndef MALI_STATIC_INLINE -+#error MALI_STATIC_INLINE not defined on your OS -+#endif ++/* Maximum number of times a job can be replayed */ ++#define BASEP_JD_REPLAY_LIMIT 15 + -+#ifndef MALI_NON_STATIC_INLINE -+#error MALI_NON_STATIC_INLINE not defined on your OS -+#endif ++/* JobDescriptorHeader - taken from the architecture specifications, the layout ++ * is currently identical for all GPU archs. */ ++struct job_descriptor_header { ++ u32 exception_status; ++ u32 first_incomplete_task; ++ u64 fault_pointer; ++ u8 job_descriptor_size : 1; ++ u8 job_type : 7; ++ u8 job_barrier : 1; ++ u8 _reserved_01 : 1; ++ u8 _reserved_1 : 1; ++ u8 _reserved_02 : 1; ++ u8 _reserved_03 : 1; ++ u8 _reserved_2 : 1; ++ u8 _reserved_04 : 1; ++ u8 _reserved_05 : 1; ++ u16 job_index; ++ u16 job_dependency_index_1; ++ u16 job_dependency_index_2; ++ union { ++ u64 _64; ++ u32 _32; ++ } next_job; ++}; + -+#endif /* __MALI_OSK_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h ++#endif /* _KBASE_DEFS_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_device.c b/drivers/gpu/arm/midgard/mali_kbase_device.c new file mode 100755 -index 000000000000..bb1831753a40 +index 000000000..b0eb67da8 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h -@@ -0,0 +1,162 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_device.c +@@ -0,0 +1,674 @@ +/* -+ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+/** -+ * @file mali_osk_bitops.h -+ * Implementation of the OS abstraction layer for the kernel device driver ++ ++ ++ ++ ++/* ++ * Base kernel device APIs + */ + -+#ifndef __MALI_OSK_BITOPS_H__ -+#define __MALI_OSK_BITOPS_H__ ++#include ++#include ++#include ++#include ++#include ++#include + -+#ifdef __cplusplus -+extern "C" { -+#endif ++#include ++#include ++#include ++#include ++#include + -+MALI_STATIC_INLINE void _mali_internal_clear_bit(u32 bit, u32 *addr) -+{ -+ MALI_DEBUG_ASSERT(bit < 32); -+ MALI_DEBUG_ASSERT(NULL != addr); ++#include + -+ (*addr) &= ~(1 << bit); -+} ++/* NOTE: Magic - 0x45435254 (TRCE in ASCII). ++ * Supports tracing feature provided in the base module. ++ * Please keep it in sync with the value of base module. ++ */ ++#define TRACE_BUFFER_HEADER_SPECIAL 0x45435254 + -+MALI_STATIC_INLINE void _mali_internal_set_bit(u32 bit, u32 *addr) -+{ -+ MALI_DEBUG_ASSERT(bit < 32); -+ MALI_DEBUG_ASSERT(NULL != addr); ++#if KBASE_TRACE_ENABLE ++static const char *kbasep_trace_code_string[] = { ++ /* IMPORTANT: USE OF SPECIAL #INCLUDE OF NON-STANDARD HEADER FILE ++ * THIS MUST BE USED AT THE START OF THE ARRAY */ ++#define KBASE_TRACE_CODE_MAKE_CODE(X) # X ++#include "mali_kbase_trace_defs.h" ++#undef KBASE_TRACE_CODE_MAKE_CODE ++}; ++#endif + -+ (*addr) |= (1 << bit); -+} ++#define DEBUG_MESSAGE_SIZE 256 + -+MALI_STATIC_INLINE u32 _mali_internal_test_bit(u32 bit, u32 value) ++static int kbasep_trace_init(struct kbase_device *kbdev); ++static void kbasep_trace_term(struct kbase_device *kbdev); ++static void kbasep_trace_hook_wrapper(void *param); ++ ++struct kbase_device *kbase_device_alloc(void) +{ -+ MALI_DEBUG_ASSERT(bit < 32); -+ return value & (1 << bit); ++ return kzalloc(sizeof(struct kbase_device), GFP_KERNEL); +} + -+MALI_STATIC_INLINE int _mali_internal_find_first_zero_bit(u32 value) ++static int kbase_device_as_init(struct kbase_device *kbdev, int i) +{ -+ u32 inverted; -+ u32 negated; -+ u32 isolated; -+ u32 leading_zeros; ++ const char format[] = "mali_mmu%d"; ++ char name[sizeof(format)]; ++ const char poke_format[] = "mali_mmu%d_poker"; ++ char poke_name[sizeof(poke_format)]; + -+ /* Begin with xxx...x0yyy...y, where ys are 1, number of ys is in range 0..31 */ -+ inverted = ~value; /* zzz...z1000...0 */ -+ /* Using count_trailing_zeros on inverted value - -+ * See ARM System Developers Guide for details of count_trailing_zeros */ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8316)) ++ snprintf(poke_name, sizeof(poke_name), poke_format, i); + -+ /* Isolate the zero: it is preceeded by a run of 1s, so add 1 to it */ -+ negated = (u32) - inverted ; /* -a == ~a + 1 (mod 2^n) for n-bit numbers */ -+ /* negated = xxx...x1000...0 */ ++ snprintf(name, sizeof(name), format, i); + -+ isolated = negated & inverted ; /* xxx...x1000...0 & zzz...z1000...0, zs are ~xs */ -+ /* And so the first zero bit is in the same position as the 1 == number of 1s that preceeded it -+ * Note that the output is zero if value was all 1s */ ++ kbdev->as[i].number = i; ++ kbdev->as[i].fault_addr = 0ULL; + -+ leading_zeros = _mali_osk_clz(isolated); ++ kbdev->as[i].pf_wq = alloc_workqueue(name, 0, 1); ++ if (!kbdev->as[i].pf_wq) ++ return -EINVAL; + -+ return 31 - leading_zeros; -+} ++ INIT_WORK(&kbdev->as[i].work_pagefault, page_fault_worker); ++ INIT_WORK(&kbdev->as[i].work_busfault, bus_fault_worker); + ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8316)) { ++ struct hrtimer *poke_timer = &kbdev->as[i].poke_timer; ++ struct work_struct *poke_work = &kbdev->as[i].poke_work; + -+/** @defgroup _mali_osk_bitops OSK Non-atomic Bit-operations -+ * @{ */ ++ kbdev->as[i].poke_wq = alloc_workqueue(poke_name, 0, 1); ++ if (!kbdev->as[i].poke_wq) { ++ destroy_workqueue(kbdev->as[i].pf_wq); ++ return -EINVAL; ++ } ++ KBASE_DEBUG_ASSERT(!object_is_on_stack(poke_work)); ++ INIT_WORK(poke_work, kbasep_as_do_poke); + -+/** -+ * These bit-operations do not work atomically, and so locks must be used if -+ * atomicity is required. -+ * -+ * Reference implementations for Little Endian are provided, and so it should -+ * not normally be necessary to re-implement these. Efficient bit-twiddling -+ * techniques are used where possible, implemented in portable C. -+ * -+ * Note that these reference implementations rely on _mali_osk_clz() being -+ * implemented. -+ */ ++ hrtimer_init(poke_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + -+/** @brief Clear a bit in a sequence of 32-bit words -+ * @param nr bit number to clear, starting from the (Little-endian) least -+ * significant bit -+ * @param addr starting point for counting. -+ */ -+MALI_STATIC_INLINE void _mali_osk_clear_nonatomic_bit(u32 nr, u32 *addr) -+{ -+ addr += nr >> 5; /* find the correct word */ -+ nr = nr & ((1 << 5) - 1); /* The bit number within the word */ ++ poke_timer->function = kbasep_as_poke_timer_callback; + -+ _mali_internal_clear_bit(nr, addr); ++ kbdev->as[i].poke_refcount = 0; ++ kbdev->as[i].poke_state = 0u; ++ } ++ ++ return 0; +} + -+/** @brief Set a bit in a sequence of 32-bit words -+ * @param nr bit number to set, starting from the (Little-endian) least -+ * significant bit -+ * @param addr starting point for counting. -+ */ -+MALI_STATIC_INLINE void _mali_osk_set_nonatomic_bit(u32 nr, u32 *addr) ++static void kbase_device_as_term(struct kbase_device *kbdev, int i) +{ -+ addr += nr >> 5; /* find the correct word */ -+ nr = nr & ((1 << 5) - 1); /* The bit number within the word */ -+ -+ _mali_internal_set_bit(nr, addr); ++ destroy_workqueue(kbdev->as[i].pf_wq); ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8316)) ++ destroy_workqueue(kbdev->as[i].poke_wq); +} + -+/** @brief Test a bit in a sequence of 32-bit words -+ * @param nr bit number to test, starting from the (Little-endian) least -+ * significant bit -+ * @param addr starting point for counting. -+ * @return zero if bit was clear, non-zero if set. Do not rely on the return -+ * value being related to the actual word under test. -+ */ -+MALI_STATIC_INLINE u32 _mali_osk_test_bit(u32 nr, u32 *addr) ++static int kbase_device_all_as_init(struct kbase_device *kbdev) +{ -+ addr += nr >> 5; /* find the correct word */ -+ nr = nr & ((1 << 5) - 1); /* The bit number within the word */ ++ int i, err; + -+ return _mali_internal_test_bit(nr, *addr); ++ for (i = 0; i < kbdev->nr_hw_address_spaces; i++) { ++ err = kbase_device_as_init(kbdev, i); ++ if (err) ++ goto free_workqs; ++ } ++ ++ return 0; ++ ++free_workqs: ++ for (; i > 0; i--) ++ kbase_device_as_term(kbdev, i); ++ ++ return err; +} + -+/* Return maxbit if not found */ -+/** @brief Find the first zero bit in a sequence of 32-bit words -+ * @param addr starting point for search. -+ * @param maxbit the maximum number of bits to search -+ * @return the number of the first zero bit found, or maxbit if none were found -+ * in the specified range. -+ */ -+MALI_STATIC_INLINE u32 _mali_osk_find_first_zero_bit(const u32 *addr, u32 maxbit) ++static void kbase_device_all_as_term(struct kbase_device *kbdev) +{ -+ u32 total; ++ int i; + -+ for (total = 0; total < maxbit; total += 32, ++addr) { -+ int result; -+ result = _mali_internal_find_first_zero_bit(*addr); ++ for (i = 0; i < kbdev->nr_hw_address_spaces; i++) ++ kbase_device_as_term(kbdev, i); ++} + -+ /* non-negative signifies the bit was found */ -+ if (result >= 0) { -+ total += (u32)result; -+ break; ++int kbase_device_init(struct kbase_device * const kbdev) ++{ ++ int i, err; ++#ifdef CONFIG_ARM64 ++ struct device_node *np = NULL; ++#endif /* CONFIG_ARM64 */ ++ ++ spin_lock_init(&kbdev->mmu_mask_change); ++ mutex_init(&kbdev->mmu_hw_mutex); ++#ifdef CONFIG_ARM64 ++ kbdev->cci_snoop_enabled = false; ++ np = kbdev->dev->of_node; ++ if (np != NULL) { ++ if (of_property_read_u32(np, "snoop_enable_smc", ++ &kbdev->snoop_enable_smc)) ++ kbdev->snoop_enable_smc = 0; ++ if (of_property_read_u32(np, "snoop_disable_smc", ++ &kbdev->snoop_disable_smc)) ++ kbdev->snoop_disable_smc = 0; ++ /* Either both or none of the calls should be provided. */ ++ if (!((kbdev->snoop_disable_smc == 0 ++ && kbdev->snoop_enable_smc == 0) ++ || (kbdev->snoop_disable_smc != 0 ++ && kbdev->snoop_enable_smc != 0))) { ++ WARN_ON(1); ++ err = -EINVAL; ++ goto fail; + } + } ++#endif /* CONFIG_ARM64 */ ++ /* Get the list of workarounds for issues on the current HW ++ * (identified by the GPU_ID register) ++ */ ++ err = kbase_hw_set_issues_mask(kbdev); ++ if (err) ++ goto fail; + -+ /* Now check if we reached maxbit or above */ -+ if (total >= maxbit) { -+ total = maxbit; -+ } ++ /* Set the list of features available on the current HW ++ * (identified by the GPU_ID register) ++ */ ++ kbase_hw_set_features_mask(kbdev); + -+ return total; /* either the found bit nr, or maxbit if not found */ -+} -+/** @} */ /* end group _mali_osk_bitops */ ++ kbase_gpuprops_set_features(kbdev); + -+#ifdef __cplusplus -+} ++ /* On Linux 4.0+, dma coherency is determined from device tree */ ++#if defined(CONFIG_ARM64) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) ++ set_dma_ops(kbdev->dev, &noncoherent_swiotlb_dma_ops); +#endif + -+#endif /* __MALI_OSK_BITOPS_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h -new file mode 100755 -index 000000000000..9af2d7d4d621 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h -@@ -0,0 +1,273 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ /* Workaround a pre-3.13 Linux issue, where dma_mask is NULL when our ++ * device structure was created by device-tree ++ */ ++ if (!kbdev->dev->dma_mask) ++ kbdev->dev->dma_mask = &kbdev->dev->coherent_dma_mask; + -+/** -+ * @file mali_osk_list.h -+ * Implementation of the OS abstraction layer for the kernel device driver -+ */ ++ err = dma_set_mask(kbdev->dev, ++ DMA_BIT_MASK(kbdev->gpu_props.mmu.pa_bits)); ++ if (err) ++ goto dma_set_mask_failed; + -+#ifndef __MALI_OSK_LIST_H__ -+#define __MALI_OSK_LIST_H__ ++ err = dma_set_coherent_mask(kbdev->dev, ++ DMA_BIT_MASK(kbdev->gpu_props.mmu.pa_bits)); ++ if (err) ++ goto dma_set_mask_failed; + -+#include "mali_osk.h" -+#include "mali_kernel_common.h" ++ kbdev->nr_hw_address_spaces = kbdev->gpu_props.num_address_spaces; + -+#ifdef __cplusplus -+extern "C" { -+#endif ++ err = kbase_device_all_as_init(kbdev); ++ if (err) ++ goto as_init_failed; + -+MALI_STATIC_INLINE void __mali_osk_list_add(_mali_osk_list_t *new_entry, _mali_osk_list_t *prev, _mali_osk_list_t *next) -+{ -+ next->prev = new_entry; -+ new_entry->next = next; -+ new_entry->prev = prev; -+ prev->next = new_entry; -+} ++ spin_lock_init(&kbdev->hwcnt.lock); + -+MALI_STATIC_INLINE void __mali_osk_list_del(_mali_osk_list_t *prev, _mali_osk_list_t *next) -+{ -+ next->prev = prev; -+ prev->next = next; -+} ++ err = kbasep_trace_init(kbdev); ++ if (err) ++ goto term_as; + -+/** @addtogroup _mali_osk_list OSK Doubly-Linked Circular Lists -+ * @{ */ ++ mutex_init(&kbdev->cacheclean_lock); + -+/** Reference implementations of Doubly-linked Circular Lists are provided. -+ * There is often no need to re-implement these. -+ * -+ * @note The implementation may differ subtly from any lists the OS provides. -+ * For this reason, these lists should not be mixed with OS-specific lists -+ * inside the OSK/UKK implementation. */ ++#ifdef CONFIG_MALI_TRACE_TIMELINE ++ for (i = 0; i < BASE_JM_MAX_NR_SLOTS; ++i) ++ kbdev->timeline.slot_atoms_submitted[i] = 0; + -+/** @brief Initialize a list to be a head of an empty list -+ * @param exp the list to initialize. */ -+#define _MALI_OSK_INIT_LIST_HEAD(exp) _mali_osk_list_init(exp) ++ for (i = 0; i <= KBASEP_TIMELINE_PM_EVENT_LAST; ++i) ++ atomic_set(&kbdev->timeline.pm_event_uid[i], 0); ++#endif /* CONFIG_MALI_TRACE_TIMELINE */ + -+/** @brief Define a list variable, which is uninitialized. -+ * @param exp the name of the variable that the list will be defined as. */ -+#define _MALI_OSK_LIST_HEAD(exp) _mali_osk_list_t exp ++ /* fbdump profiling controls set to 0 - fbdump not enabled until changed by gator */ ++ for (i = 0; i < FBDUMP_CONTROL_MAX; i++) ++ kbdev->kbase_profiling_controls[i] = 0; + -+/** @brief Define a list variable, which is initialized. -+ * @param exp the name of the variable that the list will be defined as. */ -+#define _MALI_OSK_LIST_HEAD_STATIC_INIT(exp) _mali_osk_list_t exp = { &exp, &exp } ++ kbase_debug_assert_register_hook(&kbasep_trace_hook_wrapper, kbdev); + -+/** @brief Initialize a list element. -+ * -+ * All list elements must be initialized before use. -+ * -+ * Do not use on any list element that is present in a list without using -+ * _mali_osk_list_del first, otherwise this will break the list. -+ * -+ * @param list the list element to initialize -+ */ -+MALI_STATIC_INLINE void _mali_osk_list_init(_mali_osk_list_t *list) -+{ -+ list->next = list; -+ list->prev = list; -+} ++ atomic_set(&kbdev->ctx_num, 0); + -+/** @brief Insert a single list element after an entry in a list -+ * -+ * As an example, if this is inserted to the head of a list, then this becomes -+ * the first element of the list. -+ * -+ * Do not use to move list elements from one list to another, as it will break -+ * the originating list. -+ * -+ * -+ * @param newlist the list element to insert -+ * @param list the list in which to insert. The new element will be the next -+ * entry in this list -+ */ -+MALI_STATIC_INLINE void _mali_osk_list_add(_mali_osk_list_t *new_entry, _mali_osk_list_t *list) -+{ -+ __mali_osk_list_add(new_entry, list, list->next); -+} ++ err = kbase_instr_backend_init(kbdev); ++ if (err) ++ goto term_trace; + -+/** @brief Insert a single list element before an entry in a list -+ * -+ * As an example, if this is inserted to the head of a list, then this becomes -+ * the last element of the list. -+ * -+ * Do not use to move list elements from one list to another, as it will break -+ * the originating list. -+ * -+ * @param newlist the list element to insert -+ * @param list the list in which to insert. The new element will be the previous -+ * entry in this list -+ */ -+MALI_STATIC_INLINE void _mali_osk_list_addtail(_mali_osk_list_t *new_entry, _mali_osk_list_t *list) -+{ -+ __mali_osk_list_add(new_entry, list->prev, list); -+} ++ kbdev->pm.dvfs_period = DEFAULT_PM_DVFS_PERIOD; + -+/** @brief Remove a single element from a list -+ * -+ * The element will no longer be present in the list. The removed list element -+ * will be uninitialized, and so should not be traversed. It must be -+ * initialized before further use. -+ * -+ * @param list the list element to remove. -+ */ -+MALI_STATIC_INLINE void _mali_osk_list_del(_mali_osk_list_t *list) -+{ -+ __mali_osk_list_del(list->prev, list->next); -+} ++ kbdev->reset_timeout_ms = DEFAULT_RESET_TIMEOUT_MS; + -+/** @brief Remove a single element from a list, and re-initialize it -+ * -+ * The element will no longer be present in the list. The removed list element -+ * will initialized, and so can be used as normal. -+ * -+ * @param list the list element to remove and initialize. -+ */ -+MALI_STATIC_INLINE void _mali_osk_list_delinit(_mali_osk_list_t *list) -+{ -+ __mali_osk_list_del(list->prev, list->next); -+ _mali_osk_list_init(list); ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) ++ kbdev->mmu_mode = kbase_mmu_mode_get_aarch64(); ++ else ++ kbdev->mmu_mode = kbase_mmu_mode_get_lpae(); ++ ++#ifdef CONFIG_MALI_DEBUG ++ init_waitqueue_head(&kbdev->driver_inactive_wait); ++#endif /* CONFIG_MALI_DEBUG */ ++ ++ return 0; ++term_trace: ++ kbasep_trace_term(kbdev); ++term_as: ++ kbase_device_all_as_term(kbdev); ++as_init_failed: ++dma_set_mask_failed: ++fail: ++ return err; +} + -+/** @brief Determine whether a list is empty. -+ * -+ * An empty list is one that contains a single element that points to itself. -+ * -+ * @param list the list to check. -+ * @return non-zero if the list is empty, and zero otherwise. -+ */ -+MALI_STATIC_INLINE mali_bool _mali_osk_list_empty(_mali_osk_list_t *list) ++void kbase_device_term(struct kbase_device *kbdev) +{ -+ return list->next == list; ++ KBASE_DEBUG_ASSERT(kbdev); ++ ++#if KBASE_TRACE_ENABLE ++ kbase_debug_assert_register_hook(NULL, NULL); ++#endif ++ ++ kbase_instr_backend_term(kbdev); ++ ++ kbasep_trace_term(kbdev); ++ ++ kbase_device_all_as_term(kbdev); +} + -+/** @brief Move a list element from one list to another. -+ * -+ * The list element must be initialized. -+ * -+ * As an example, moving a list item to the head of a new list causes this item -+ * to be the first element in the new list. -+ * -+ * @param move the list element to move -+ * @param list the new list into which the element will be inserted, as the next -+ * element in the list. -+ */ -+MALI_STATIC_INLINE void _mali_osk_list_move(_mali_osk_list_t *move_entry, _mali_osk_list_t *list) ++void kbase_device_free(struct kbase_device *kbdev) +{ -+ __mali_osk_list_del(move_entry->prev, move_entry->next); -+ _mali_osk_list_add(move_entry, list); ++ kfree(kbdev); +} + -+/** @brief Move an entire list -+ * -+ * The list element must be initialized. -+ * -+ * Allows you to move a list from one list head to another list head -+ * -+ * @param old_list The existing list head -+ * @param new_list The new list head (must be an empty list) -+ */ -+MALI_STATIC_INLINE void _mali_osk_list_move_list(_mali_osk_list_t *old_list, _mali_osk_list_t *new_list) ++int kbase_device_trace_buffer_install( ++ struct kbase_context *kctx, u32 *tb, size_t size) +{ -+ MALI_DEBUG_ASSERT(_mali_osk_list_empty(new_list)); -+ if (!_mali_osk_list_empty(old_list)) { -+ new_list->next = old_list->next; -+ new_list->prev = old_list->prev; -+ new_list->next->prev = new_list; -+ new_list->prev->next = new_list; -+ old_list->next = old_list; -+ old_list->prev = old_list; -+ } -+} ++ unsigned long flags; + -+/** @brief Find the containing structure of a list -+ * -+ * When traversing a list, this is used to recover the containing structure, -+ * given that is contains a _mali_osk_list_t member. -+ * -+ * Each list must be of structures of one type, and must link the same members -+ * together, otherwise it will not be possible to correctly recover the -+ * sturctures that the lists link. -+ * -+ * @note no type or memory checking occurs to ensure that a structure does in -+ * fact exist for the list entry, and that it is being recovered with respect -+ * to the correct list member. -+ * -+ * @param ptr the pointer to the _mali_osk_list_t member in this structure -+ * @param type the type of the structure that contains the member -+ * @param member the member of the structure that ptr points to. -+ * @return a pointer to a \a type object which contains the _mali_osk_list_t -+ * \a member, as pointed to by the _mali_osk_list_t \a *ptr. -+ */ -+#define _MALI_OSK_LIST_ENTRY(ptr, type, member) \ -+ _MALI_OSK_CONTAINER_OF(ptr, type, member) ++ KBASE_DEBUG_ASSERT(kctx); ++ KBASE_DEBUG_ASSERT(tb); + -+/** @brief Enumerate a list safely -+ * -+ * With this macro, lists can be enumerated in a 'safe' manner. That is, -+ * entries can be deleted from the list without causing an error during -+ * enumeration. To achieve this, a 'temporary' pointer is required, which must -+ * be provided to the macro. -+ * -+ * Use it like a 'for()', 'while()' or 'do()' construct, and so it must be -+ * followed by a statement or compound-statement which will be executed for -+ * each list entry. -+ * -+ * Upon loop completion, providing that an early out was not taken in the -+ * loop body, then it is guaranteed that ptr->member == list, even if the loop -+ * body never executed. -+ * -+ * @param ptr a pointer to an object of type 'type', which points to the -+ * structure that contains the currently enumerated list entry. -+ * @param tmp a pointer to an object of type 'type', which must not be used -+ * inside the list-execution statement. -+ * @param list a pointer to a _mali_osk_list_t, from which enumeration will -+ * begin -+ * @param type the type of the structure that contains the _mali_osk_list_t -+ * member that is part of the list to be enumerated. -+ * @param member the _mali_osk_list_t member of the structure that is part of -+ * the list to be enumerated. -+ */ -+#define _MALI_OSK_LIST_FOREACHENTRY(ptr, tmp, list, type, member) \ -+ for (ptr = _MALI_OSK_LIST_ENTRY((list)->next, type, member), \ -+ tmp = _MALI_OSK_LIST_ENTRY(ptr->member.next, type, member); \ -+ &ptr->member != (list); \ -+ ptr = tmp, \ -+ tmp = _MALI_OSK_LIST_ENTRY(tmp->member.next, type, member)) ++ /* Interface uses 16-bit value to track last accessed entry. Each entry ++ * is composed of two 32-bit words. ++ * This limits the size that can be handled without an overflow. */ ++ if (0xFFFF * (2 * sizeof(u32)) < size) ++ return -EINVAL; + -+/** @brief Enumerate a list in reverse order safely -+ * -+ * This macro is identical to @ref _MALI_OSK_LIST_FOREACHENTRY, except that -+ * entries are enumerated in reverse order. -+ * -+ * @param ptr a pointer to an object of type 'type', which points to the -+ * structure that contains the currently enumerated list entry. -+ * @param tmp a pointer to an object of type 'type', which must not be used -+ * inside the list-execution statement. -+ * @param list a pointer to a _mali_osk_list_t, from which enumeration will -+ * begin -+ * @param type the type of the structure that contains the _mali_osk_list_t -+ * member that is part of the list to be enumerated. -+ * @param member the _mali_osk_list_t member of the structure that is part of -+ * the list to be enumerated. -+ */ -+#define _MALI_OSK_LIST_FOREACHENTRY_REVERSE(ptr, tmp, list, type, member) \ -+ for (ptr = _MALI_OSK_LIST_ENTRY((list)->prev, type, member), \ -+ tmp = _MALI_OSK_LIST_ENTRY(ptr->member.prev, type, member); \ -+ &ptr->member != (list); \ -+ ptr = tmp, \ -+ tmp = _MALI_OSK_LIST_ENTRY(tmp->member.prev, type, member)) ++ /* set up the header */ ++ /* magic number in the first 4 bytes */ ++ tb[0] = TRACE_BUFFER_HEADER_SPECIAL; ++ /* Store (write offset = 0, wrap counter = 0, transaction active = no) ++ * write offset 0 means never written. ++ * Offsets 1 to (wrap_offset - 1) used to store values when trace started ++ */ ++ tb[1] = 0; + -+/** @} */ /* end group _mali_osk_list */ ++ /* install trace buffer */ ++ spin_lock_irqsave(&kctx->jctx.tb_lock, flags); ++ kctx->jctx.tb_wrap_offset = size / 8; ++ kctx->jctx.tb = tb; ++ spin_unlock_irqrestore(&kctx->jctx.tb_lock, flags); + -+#ifdef __cplusplus ++ return 0; +} -+#endif -+ -+#endif /* __MALI_OSK_LIST_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h -new file mode 100755 -index 000000000000..bf69925a43a7 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h -@@ -0,0 +1,152 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ + -+/** -+ * @file mali_osk_mali.h -+ * Defines the OS abstraction layer which is specific for the Mali kernel device driver (OSK) -+ */ ++void kbase_device_trace_buffer_uninstall(struct kbase_context *kctx) ++{ ++ unsigned long flags; + -+#ifndef __MALI_OSK_MALI_H__ -+#define __MALI_OSK_MALI_H__ ++ KBASE_DEBUG_ASSERT(kctx); ++ spin_lock_irqsave(&kctx->jctx.tb_lock, flags); ++ kctx->jctx.tb = NULL; ++ kctx->jctx.tb_wrap_offset = 0; ++ spin_unlock_irqrestore(&kctx->jctx.tb_lock, flags); ++} + -+#include -+#include ++void kbase_device_trace_register_access(struct kbase_context *kctx, enum kbase_reg_access_type type, u16 reg_offset, u32 reg_value) ++{ ++ unsigned long flags; + -+#ifdef __cplusplus -+extern "C" { -+#endif ++ spin_lock_irqsave(&kctx->jctx.tb_lock, flags); ++ if (kctx->jctx.tb) { ++ u16 wrap_count; ++ u16 write_offset; ++ u32 *tb = kctx->jctx.tb; ++ u32 header_word; + -+#ifdef CONFIG_MALI_DEVFREQ -+struct mali_device { -+ struct device *dev; -+#ifdef CONFIG_HAVE_CLK -+ struct clk *clock; -+#endif -+#ifdef CONFIG_REGULATOR -+ struct regulator *regulator; -+#endif -+#ifdef CONFIG_PM_DEVFREQ -+ struct devfreq_dev_profile devfreq_profile; -+ struct devfreq *devfreq; -+ unsigned long current_freq; -+ unsigned long current_voltage; -+ struct monitor_dev_info *mdev_info; -+#ifdef CONFIG_DEVFREQ_THERMAL -+ struct thermal_cooling_device *devfreq_cooling; -+#endif -+#endif -+ struct mali_pm_metrics_data mali_metrics; -+}; -+#endif ++ header_word = tb[1]; ++ KBASE_DEBUG_ASSERT(0 == (header_word & 0x1)); + -+/** @addtogroup _mali_osk_miscellaneous -+ * @{ */ ++ wrap_count = (header_word >> 1) & 0x7FFF; ++ write_offset = (header_word >> 16) & 0xFFFF; + -+/** @brief Struct with device specific configuration data -+ */ -+typedef struct mali_gpu_device_data _mali_osk_device_data; ++ /* mark as transaction in progress */ ++ tb[1] |= 0x1; ++ mb(); + -+#ifdef CONFIG_MALI_DT -+/** @brief Initialize those device resources when we use device tree -+ * -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. -+ */ -+_mali_osk_errcode_t _mali_osk_resource_initialize(void); -+#endif ++ /* calculate new offset */ ++ write_offset++; ++ if (write_offset == kctx->jctx.tb_wrap_offset) { ++ /* wrap */ ++ write_offset = 1; ++ wrap_count++; ++ wrap_count &= 0x7FFF; /* 15bit wrap counter */ ++ } + -+/** @brief Find Mali GPU HW resource -+ * -+ * @param addr Address of Mali GPU resource to find -+ * @param res Storage for resource information if resource is found. -+ * @return _MALI_OSK_ERR_OK on success, _MALI_OSK_ERR_ITEM_NOT_FOUND if resource is not found -+ */ -+_mali_osk_errcode_t _mali_osk_resource_find(u32 addr, _mali_osk_resource_t *res); ++ /* store the trace entry at the selected offset */ ++ tb[write_offset * 2 + 0] = (reg_offset & ~0x3) | ((type == REG_WRITE) ? 0x1 : 0x0); ++ tb[write_offset * 2 + 1] = reg_value; ++ mb(); + ++ /* new header word */ ++ header_word = (write_offset << 16) | (wrap_count << 1) | 0x0; /* transaction complete */ ++ tb[1] = header_word; ++ } ++ spin_unlock_irqrestore(&kctx->jctx.tb_lock, flags); ++} + -+/** @brief Find Mali GPU HW base address -+ * -+ * @return 0 if resources are found, otherwise the Mali GPU component with lowest address. ++/* ++ * Device trace functions + */ -+uintptr_t _mali_osk_resource_base_address(void); ++#if KBASE_TRACE_ENABLE + -+/** @brief Find the specific GPU resource. -+ * -+ * @return value -+ * 0x400 if Mali 400 specific GPU resource identified -+ * 0x450 if Mali 450 specific GPU resource identified -+ * 0x470 if Mali 470 specific GPU resource identified -+ * -+ */ -+u32 _mali_osk_identify_gpu_resource(void); ++static int kbasep_trace_init(struct kbase_device *kbdev) ++{ ++ struct kbase_trace *rbuf; + -+/** @brief Retrieve the Mali GPU specific data -+ * -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. -+ */ -+_mali_osk_errcode_t _mali_osk_device_data_get(_mali_osk_device_data *data); ++ rbuf = kmalloc_array(KBASE_TRACE_SIZE, sizeof(*rbuf), GFP_KERNEL); + -+/** @brief Find the pmu domain config from device data. -+ * -+ * @param domain_config_array used to store pmu domain config found in device data. -+ * @param array_size is the size of array domain_config_array. -+ */ -+void _mali_osk_device_data_pmu_config_get(u16 *domain_config_array, int array_size); ++ if (!rbuf) ++ return -EINVAL; + -+/** @brief Get Mali PMU switch delay -+ * -+ *@return pmu switch delay if it is configured -+ */ -+u32 _mali_osk_get_pmu_switch_delay(void); ++ kbdev->trace_rbuf = rbuf; ++ spin_lock_init(&kbdev->trace_lock); ++ return 0; ++} + -+/** @brief Determines if Mali GPU has been configured with shared interrupts. -+ * -+ * @return MALI_TRUE if shared interrupts, MALI_FALSE if not. -+ */ -+mali_bool _mali_osk_shared_interrupts(void); ++static void kbasep_trace_term(struct kbase_device *kbdev) ++{ ++ kfree(kbdev->trace_rbuf); ++} + -+/** @brief Initialize the gpu secure mode. -+ * The gpu secure mode will initially be in a disabled state. -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. -+ */ -+_mali_osk_errcode_t _mali_osk_gpu_secure_mode_init(void); ++static void kbasep_trace_format_msg(struct kbase_trace *trace_msg, char *buffer, int len) ++{ ++ s32 written = 0; + -+/** @brief Deinitialize the gpu secure mode. -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. -+ */ -+_mali_osk_errcode_t _mali_osk_gpu_secure_mode_deinit(void); ++ /* Initial part of message */ ++ written += MAX(snprintf(buffer + written, MAX(len - written, 0), "%d.%.6d,%d,%d,%s,%p,", (int)trace_msg->timestamp.tv_sec, (int)(trace_msg->timestamp.tv_nsec / 1000), trace_msg->thread_id, trace_msg->cpu, kbasep_trace_code_string[trace_msg->code], trace_msg->ctx), 0); + -+/** @brief Reset GPU and enable the gpu secure mode. -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. -+ */ -+_mali_osk_errcode_t _mali_osk_gpu_reset_and_secure_mode_enable(void); ++ if (trace_msg->katom) ++ written += MAX(snprintf(buffer + written, MAX(len - written, 0), "atom %d (ud: 0x%llx 0x%llx)", trace_msg->atom_number, trace_msg->atom_udata[0], trace_msg->atom_udata[1]), 0); + -+/** @brief Reset GPU and disable the gpu secure mode. -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. -+ */ -+_mali_osk_errcode_t _mali_osk_gpu_reset_and_secure_mode_disable(void); ++ written += MAX(snprintf(buffer + written, MAX(len - written, 0), ",%.8llx,", trace_msg->gpu_addr), 0); + -+/** @brief Check if the gpu secure mode has been enabled. -+ * @return MALI_TRUE if enabled, otherwise MALI_FALSE. -+ */ -+mali_bool _mali_osk_gpu_secure_mode_is_enabled(void); ++ /* NOTE: Could add function callbacks to handle different message types */ ++ /* Jobslot present */ ++ if (trace_msg->flags & KBASE_TRACE_FLAG_JOBSLOT) ++ written += MAX(snprintf(buffer + written, MAX(len - written, 0), "%d", trace_msg->jobslot), 0); + -+/** @brief Check if the gpu secure mode is supported. -+ * @return MALI_TRUE if supported, otherwise MALI_FALSE. -+ */ -+mali_bool _mali_osk_gpu_secure_mode_is_supported(void); ++ written += MAX(snprintf(buffer + written, MAX(len - written, 0), ","), 0); + ++ /* Refcount present */ ++ if (trace_msg->flags & KBASE_TRACE_FLAG_REFCOUNT) ++ written += MAX(snprintf(buffer + written, MAX(len - written, 0), "%d", trace_msg->refcount), 0); + -+/** @} */ /* end group _mali_osk_miscellaneous */ ++ written += MAX(snprintf(buffer + written, MAX(len - written, 0), ","), 0); + -+#ifdef __cplusplus ++ /* Rest of message */ ++ written += MAX(snprintf(buffer + written, MAX(len - written, 0), "0x%.8lx", trace_msg->info_val), 0); +} -+#endif + -+#endif /* __MALI_OSK_MALI_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h -new file mode 100755 -index 000000000000..6e4583db1c80 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h -@@ -0,0 +1,146 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++static void kbasep_trace_dump_msg(struct kbase_device *kbdev, struct kbase_trace *trace_msg) ++{ ++ char buffer[DEBUG_MESSAGE_SIZE]; + -+#ifndef __MALI_OSK_PROFILING_H__ -+#define __MALI_OSK_PROFILING_H__ ++ kbasep_trace_format_msg(trace_msg, buffer, DEBUG_MESSAGE_SIZE); ++ dev_dbg(kbdev->dev, "%s", buffer); ++} + -+#if defined(CONFIG_MALI400_PROFILING) && defined (CONFIG_TRACEPOINTS) ++void kbasep_trace_add(struct kbase_device *kbdev, enum kbase_trace_code code, void *ctx, struct kbase_jd_atom *katom, u64 gpu_addr, u8 flags, int refcount, int jobslot, unsigned long info_val) ++{ ++ unsigned long irqflags; ++ struct kbase_trace *trace_msg; + -+#include "mali_linux_trace.h" -+#include "mali_profiling_events.h" -+#include "mali_profiling_gator_api.h" ++ spin_lock_irqsave(&kbdev->trace_lock, irqflags); + -+#define MALI_PROFILING_MAX_BUFFER_ENTRIES 1048576 ++ trace_msg = &kbdev->trace_rbuf[kbdev->trace_next_in]; + -+#define MALI_PROFILING_NO_HW_COUNTER = ((u32)-1) ++ /* Fill the message */ ++ trace_msg->thread_id = task_pid_nr(current); ++ trace_msg->cpu = task_cpu(current); + -+/** @defgroup _mali_osk_profiling External profiling connectivity -+ * @{ */ ++ ktime_get_real_ts64(&trace_msg->timestamp); + -+/** -+ * Initialize the profiling module. -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. -+ */ -+_mali_osk_errcode_t _mali_osk_profiling_init(mali_bool auto_start); ++ trace_msg->code = code; ++ trace_msg->ctx = ctx; + -+/* -+ * Terminate the profiling module. -+ */ -+void _mali_osk_profiling_term(void); ++ if (NULL == katom) { ++ trace_msg->katom = false; ++ } else { ++ trace_msg->katom = true; ++ trace_msg->atom_number = kbase_jd_atom_id(katom->kctx, katom); ++ trace_msg->atom_udata[0] = katom->udata.blob[0]; ++ trace_msg->atom_udata[1] = katom->udata.blob[1]; ++ } + -+/** -+ * Stop the profile sampling operation. -+ */ -+void _mali_osk_profiling_stop_sampling(u32 pid); ++ trace_msg->gpu_addr = gpu_addr; ++ trace_msg->jobslot = jobslot; ++ trace_msg->refcount = MIN((unsigned int)refcount, 0xFF); ++ trace_msg->info_val = info_val; ++ trace_msg->flags = flags; + -+/** -+ * Start recording profiling data -+ * -+ * The specified limit will determine how large the capture buffer is. -+ * MALI_PROFILING_MAX_BUFFER_ENTRIES determines the maximum size allowed by the device driver. -+ * -+ * @param limit The desired maximum number of events to record on input, the actual maximum on output. -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. -+ */ -+_mali_osk_errcode_t _mali_osk_profiling_start(u32 *limit); ++ /* Update the ringbuffer indices */ ++ kbdev->trace_next_in = (kbdev->trace_next_in + 1) & KBASE_TRACE_MASK; ++ if (kbdev->trace_next_in == kbdev->trace_first_out) ++ kbdev->trace_first_out = (kbdev->trace_first_out + 1) & KBASE_TRACE_MASK; + -+/** -+ * Add an profiling event -+ * -+ * @param event_id The event identificator. -+ * @param data0 First data parameter, depending on event_id specified. -+ * @param data1 Second data parameter, depending on event_id specified. -+ * @param data2 Third data parameter, depending on event_id specified. -+ * @param data3 Fourth data parameter, depending on event_id specified. -+ * @param data4 Fifth data parameter, depending on event_id specified. -+ */ -+void _mali_osk_profiling_add_event(u32 event_id, u32 data0, u32 data1, u32 data2, u32 data3, u32 data4); ++ /* Done */ + -+/** -+ * Report a hardware counter event. -+ * -+ * @param counter_id The ID of the counter. -+ * @param value The value of the counter. -+ */ ++ spin_unlock_irqrestore(&kbdev->trace_lock, irqflags); ++} + -+/* Call Linux tracepoint directly */ -+#define _mali_osk_profiling_report_hw_counter(counter_id, value) trace_mali_hw_counter(counter_id, value) ++void kbasep_trace_clear(struct kbase_device *kbdev) ++{ ++ unsigned long flags; + -+/** -+ * Report SW counters -+ * -+ * @param counters array of counter values -+ */ -+void _mali_osk_profiling_report_sw_counters(u32 *counters); ++ spin_lock_irqsave(&kbdev->trace_lock, flags); ++ kbdev->trace_first_out = kbdev->trace_next_in; ++ spin_unlock_irqrestore(&kbdev->trace_lock, flags); ++} + -+void _mali_osk_profiling_record_global_counters(int counter_id, u32 value); ++void kbasep_trace_dump(struct kbase_device *kbdev) ++{ ++ unsigned long flags; ++ u32 start; ++ u32 end; + -+/** -+ * Stop recording profiling data -+ * -+ * @param count Returns the number of recorded events. -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. -+ */ -+_mali_osk_errcode_t _mali_osk_profiling_stop(u32 *count); ++ dev_dbg(kbdev->dev, "Dumping trace:\nsecs,nthread,cpu,code,ctx,katom,gpu_addr,jobslot,refcount,info_val"); ++ spin_lock_irqsave(&kbdev->trace_lock, flags); ++ start = kbdev->trace_first_out; ++ end = kbdev->trace_next_in; + -+/** -+ * Retrieves the number of events that can be retrieved -+ * -+ * @return The number of recorded events that can be retrieved. -+ */ -+u32 _mali_osk_profiling_get_count(void); ++ while (start != end) { ++ struct kbase_trace *trace_msg = &kbdev->trace_rbuf[start]; + -+/** -+ * Retrieve an event -+ * -+ * @param index Event index (start with 0 and continue until this function fails to retrieve all events) -+ * @param timestamp The timestamp for the retrieved event will be stored here. -+ * @param event_id The event ID for the retrieved event will be stored here. -+ * @param data The 5 data values for the retrieved event will be stored here. -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. -+ */ -+_mali_osk_errcode_t _mali_osk_profiling_get_event(u32 index, u64 *timestamp, u32 *event_id, u32 data[5]); ++ kbasep_trace_dump_msg(kbdev, trace_msg); + -+/** -+ * Clear the recorded buffer. -+ * -+ * This is needed in order to start another recording. -+ * -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. -+ */ -+_mali_osk_errcode_t _mali_osk_profiling_clear(void); ++ start = (start + 1) & KBASE_TRACE_MASK; ++ } ++ dev_dbg(kbdev->dev, "TRACE_END"); + -+/** -+ * Checks if a recording of profiling data is in progress -+ * -+ * @return MALI_TRUE if recording of profiling data is in progress, MALI_FALSE if not -+ */ -+mali_bool _mali_osk_profiling_is_recording(void); ++ spin_unlock_irqrestore(&kbdev->trace_lock, flags); + -+/** -+ * Checks if profiling data is available for retrival -+ * -+ * @return MALI_TRUE if profiling data is avaiable, MALI_FALSE if not -+ */ -+mali_bool _mali_osk_profiling_have_recording(void); ++ KBASE_TRACE_CLEAR(kbdev); ++} + -+/** @} */ /* end group _mali_osk_profiling */ ++static void kbasep_trace_hook_wrapper(void *param) ++{ ++ struct kbase_device *kbdev = (struct kbase_device *)param; + -+#else /* defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_TRACEPOINTS) */ ++ kbasep_trace_dump(kbdev); ++} + -+/* Dummy add_event, for when profiling is disabled. */ ++#ifdef CONFIG_DEBUG_FS ++struct trace_seq_state { ++ struct kbase_trace trace_buf[KBASE_TRACE_SIZE]; ++ u32 start; ++ u32 end; ++}; + -+#define _mali_osk_profiling_add_event(event_id, data0, data1, data2, data3, data4) ++static void *kbasep_trace_seq_start(struct seq_file *s, loff_t *pos) ++{ ++ struct trace_seq_state *state = s->private; ++ int i; + -+#endif /* defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_TRACEPOINTS) */ ++ if (*pos > KBASE_TRACE_SIZE) ++ return NULL; ++ i = state->start + *pos; ++ if ((state->end >= state->start && i >= state->end) || ++ i >= state->end + KBASE_TRACE_SIZE) ++ return NULL; + -+#endif /* __MALI_OSK_PROFILING_H__ */ ++ i &= KBASE_TRACE_MASK; + ++ return &state->trace_buf[i]; ++} + -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h -new file mode 100755 -index 000000000000..b6fa94ce16b3 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h -@@ -0,0 +1,471 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++static void kbasep_trace_seq_stop(struct seq_file *s, void *data) ++{ ++} + -+/** -+ * @file mali_osk_types.h -+ * Defines types of the OS abstraction layer for the kernel device driver (OSK) -+ */ ++static void *kbasep_trace_seq_next(struct seq_file *s, void *data, loff_t *pos) ++{ ++ struct trace_seq_state *state = s->private; ++ int i; + -+#ifndef __MALI_OSK_TYPES_H__ -+#define __MALI_OSK_TYPES_H__ ++ (*pos)++; + -+#ifdef __cplusplus -+extern "C" { -+#endif ++ i = (state->start + *pos) & KBASE_TRACE_MASK; ++ if (i == state->end) ++ return NULL; + -+/** -+ * @addtogroup uddapi Unified Device Driver (UDD) APIs -+ * -+ * @{ -+ */ ++ return &state->trace_buf[i]; ++} + -+/** -+ * @addtogroup oskapi UDD OS Abstraction for Kernel-side (OSK) APIs -+ * -+ * @{ -+ */ ++static int kbasep_trace_seq_show(struct seq_file *s, void *data) ++{ ++ struct kbase_trace *trace_msg = data; ++ char buffer[DEBUG_MESSAGE_SIZE]; + -+/** @defgroup _mali_osk_miscellaneous OSK Miscellaneous functions, constants and types -+ * @{ */ ++ kbasep_trace_format_msg(trace_msg, buffer, DEBUG_MESSAGE_SIZE); ++ seq_printf(s, "%s\n", buffer); ++ return 0; ++} + -+/* Define integer types used by OSK. Note: these currently clash with Linux so we only define them if not defined already */ -+#ifndef __KERNEL__ -+typedef unsigned char u8; -+typedef signed char s8; -+typedef unsigned short u16; -+typedef signed short s16; -+typedef unsigned int u32; -+typedef signed int s32; -+typedef unsigned long long u64; -+#define BITS_PER_LONG (sizeof(long)*8) -+#else -+/* Ensure Linux types u32, etc. are defined */ -+#include -+#endif ++static const struct seq_operations kbasep_trace_seq_ops = { ++ .start = kbasep_trace_seq_start, ++ .next = kbasep_trace_seq_next, ++ .stop = kbasep_trace_seq_stop, ++ .show = kbasep_trace_seq_show, ++}; + -+/** @brief Mali Boolean type which uses MALI_TRUE and MALI_FALSE -+ */ -+typedef unsigned long mali_bool; ++static int kbasep_trace_debugfs_open(struct inode *inode, struct file *file) ++{ ++ struct kbase_device *kbdev = inode->i_private; ++ unsigned long flags; + -+#ifndef MALI_TRUE -+#define MALI_TRUE ((mali_bool)1) -+#endif ++ struct trace_seq_state *state; + -+#ifndef MALI_FALSE -+#define MALI_FALSE ((mali_bool)0) -+#endif ++ state = __seq_open_private(file, &kbasep_trace_seq_ops, sizeof(*state)); ++ if (!state) ++ return -ENOMEM; + -+#define MALI_HW_CORE_NO_COUNTER ((u32)-1) ++ spin_lock_irqsave(&kbdev->trace_lock, flags); ++ state->start = kbdev->trace_first_out; ++ state->end = kbdev->trace_next_in; ++ memcpy(state->trace_buf, kbdev->trace_rbuf, sizeof(state->trace_buf)); ++ spin_unlock_irqrestore(&kbdev->trace_lock, flags); + ++ return 0; ++} + -+#define MALI_S32_MAX 0x7fffffff ++static const struct file_operations kbasep_trace_debugfs_fops = { ++ .open = kbasep_trace_debugfs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = seq_release_private, ++}; + -+/** -+ * @brief OSK Error codes -+ * -+ * Each OS may use its own set of error codes, and may require that the -+ * User/Kernel interface take certain error code. This means that the common -+ * error codes need to be sufficiently rich to pass the correct error code -+ * thorugh from the OSK to U/K layer, across all OSs. -+ * -+ * The result is that some error codes will appear redundant on some OSs. -+ * Under all OSs, the OSK layer must translate native OS error codes to -+ * _mali_osk_errcode_t codes. Similarly, the U/K layer must translate from -+ * _mali_osk_errcode_t codes to native OS error codes. -+ */ -+typedef enum { -+ _MALI_OSK_ERR_OK = 0, /**< Success. */ -+ _MALI_OSK_ERR_FAULT = -1, /**< General non-success */ -+ _MALI_OSK_ERR_INVALID_FUNC = -2, /**< Invalid function requested through User/Kernel interface (e.g. bad IOCTL number) */ -+ _MALI_OSK_ERR_INVALID_ARGS = -3, /**< Invalid arguments passed through User/Kernel interface */ -+ _MALI_OSK_ERR_NOMEM = -4, /**< Insufficient memory */ -+ _MALI_OSK_ERR_TIMEOUT = -5, /**< Timeout occurred */ -+ _MALI_OSK_ERR_RESTARTSYSCALL = -6, /**< Special: On certain OSs, must report when an interruptable mutex is interrupted. Ignore otherwise. */ -+ _MALI_OSK_ERR_ITEM_NOT_FOUND = -7, /**< Table Lookup failed */ -+ _MALI_OSK_ERR_BUSY = -8, /**< Device/operation is busy. Try again later */ -+ _MALI_OSK_ERR_UNSUPPORTED = -9, /**< Optional part of the interface used, and is unsupported */ -+} _mali_osk_errcode_t; ++void kbasep_trace_debugfs_init(struct kbase_device *kbdev) ++{ ++ debugfs_create_file("mali_trace", S_IRUGO, ++ kbdev->mali_debugfs_directory, kbdev, ++ &kbasep_trace_debugfs_fops); ++} + -+/** @} */ /* end group _mali_osk_miscellaneous */ ++#else ++void kbasep_trace_debugfs_init(struct kbase_device *kbdev) ++{ ++} ++#endif /* CONFIG_DEBUG_FS */ + -+/** @defgroup _mali_osk_wq OSK work queues -+ * @{ */ ++#else /* KBASE_TRACE_ENABLE */ ++static int kbasep_trace_init(struct kbase_device *kbdev) ++{ ++ CSTD_UNUSED(kbdev); ++ return 0; ++} + -+/** @brief Private type for work objects */ -+typedef struct _mali_osk_wq_work_s _mali_osk_wq_work_t; -+typedef struct _mali_osk_wq_delayed_work_s _mali_osk_wq_delayed_work_t; ++static void kbasep_trace_term(struct kbase_device *kbdev) ++{ ++ CSTD_UNUSED(kbdev); ++} + -+/** @brief Work queue handler function -+ * -+ * This function type is called when the work is scheduled by the work queue, -+ * e.g. as an IRQ bottom-half handler. -+ * -+ * Refer to \ref _mali_osk_wq_schedule_work() for more information on the -+ * work-queue and work handlers. -+ * -+ * @param arg resource-specific data -+ */ -+typedef void (*_mali_osk_wq_work_handler_t)(void *arg); ++static void kbasep_trace_hook_wrapper(void *param) ++{ ++ CSTD_UNUSED(param); ++} + -+/* @} */ /* end group _mali_osk_wq */ ++void kbasep_trace_dump(struct kbase_device *kbdev) ++{ ++ CSTD_UNUSED(kbdev); ++} ++#endif /* KBASE_TRACE_ENABLE */ + -+/** @defgroup _mali_osk_irq OSK IRQ handling -+ * @{ */ ++void kbase_set_profiling_control(struct kbase_device *kbdev, u32 control, u32 value) ++{ ++ switch (control) { ++ case FBDUMP_CONTROL_ENABLE: ++ /* fall through */ ++ case FBDUMP_CONTROL_RATE: ++ /* fall through */ ++ case SW_COUNTER_ENABLE: ++ /* fall through */ ++ case FBDUMP_CONTROL_RESIZE_FACTOR: ++ kbdev->kbase_profiling_controls[control] = value; ++ break; ++ default: ++ dev_err(kbdev->dev, "Profiling control %d not found\n", control); ++ break; ++ } ++} + -+/** @brief Private type for IRQ handling objects */ -+typedef struct _mali_osk_irq_t_struct _mali_osk_irq_t; ++/* ++ * Called by gator to control the production of ++ * profiling information at runtime ++ * */ + -+/** @brief Optional function to trigger an irq from a resource -+ * -+ * This function is implemented by the common layer to allow probing of a resource's IRQ. -+ * @param arg resource-specific data */ -+typedef void (*_mali_osk_irq_trigger_t)(void *arg); ++void _mali_profiling_control(u32 action, u32 value) ++{ ++ struct kbase_device *kbdev = NULL; + -+/** @brief Optional function to acknowledge an irq from a resource -+ * -+ * This function is implemented by the common layer to allow probing of a resource's IRQ. -+ * @param arg resource-specific data -+ * @return _MALI_OSK_ERR_OK if the IRQ was successful, or a suitable _mali_osk_errcode_t on failure. */ -+typedef _mali_osk_errcode_t (*_mali_osk_irq_ack_t)(void *arg); ++ /* find the first i.e. call with -1 */ ++ kbdev = kbase_find_device(-1); + -+/** @brief IRQ 'upper-half' handler callback. -+ * -+ * This function is implemented by the common layer to do the initial handling of a -+ * resource's IRQ. This maps on to the concept of an ISR that does the minimum -+ * work necessary before handing off to an IST. ++ if (NULL != kbdev) ++ kbase_set_profiling_control(kbdev, action, value); ++} ++KBASE_EXPORT_SYMBOL(_mali_profiling_control); ++ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c b/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c +new file mode 100755 +index 000000000..f70bcccf4 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c +@@ -0,0 +1,76 @@ ++/* + * -+ * The communication of the resource-specific data from the ISR to the IST is -+ * handled by the OSK implementation. ++ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. + * -+ * On most systems, the IRQ upper-half handler executes in IRQ context. -+ * Therefore, the system may have restrictions about what can be done in this -+ * context ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. + * -+ * If an IRQ upper-half handler requires more work to be done than can be -+ * acheived in an IRQ context, then it may defer the work with -+ * _mali_osk_wq_schedule_work(). Refer to \ref _mali_osk_wq_create_work() for -+ * more information. ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * @param arg resource-specific data -+ * @return _MALI_OSK_ERR_OK if the IRQ was correctly handled, or a suitable -+ * _mali_osk_errcode_t otherwise. + */ -+typedef _mali_osk_errcode_t (*_mali_osk_irq_uhandler_t)(void *arg); + + -+/** @} */ /* end group _mali_osk_irq */ + ++/* ++ * Base kernel disjoint events helper functions ++ */ + -+/** @defgroup _mali_osk_atomic OSK Atomic counters -+ * @{ */ ++#include + -+/** @brief Public type of atomic counters -+ * -+ * This is public for allocation on stack. On systems that support it, this is just a single 32-bit value. -+ * On others, it could be encapsulating an object stored elsewhere. -+ * -+ * Regardless of implementation, the \ref _mali_osk_atomic functions \b must be used -+ * for all accesses to the variable's value, even if atomicity is not required. -+ * Do not access u.val or u.obj directly. -+ */ -+typedef struct { -+ union { -+ u32 val; -+ void *obj; -+ } u; -+} _mali_osk_atomic_t; -+/** @} */ /* end group _mali_osk_atomic */ ++void kbase_disjoint_init(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + ++ atomic_set(&kbdev->disjoint_event.count, 0); ++ atomic_set(&kbdev->disjoint_event.state, 0); ++} + -+/** @defgroup _mali_osk_lock OSK Mutual Exclusion Locks -+ * @{ */ ++/* increment the disjoint event count */ ++void kbase_disjoint_event(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + ++ atomic_inc(&kbdev->disjoint_event.count); ++} + -+/** @brief OSK Mutual Exclusion Lock ordered list -+ * -+ * This lists the various types of locks in the system and is used to check -+ * that locks are taken in the correct order. -+ * -+ * - Holding more than one lock of the same order at the same time is not -+ * allowed. -+ * - Taking a lock of a lower order than the highest-order lock currently held -+ * is not allowed. -+ * -+ */ -+typedef enum { -+ /* || Locks || */ -+ /* || must be || */ -+ /* _||_ taken in _||_ */ -+ /* \ / this \ / */ -+ /* \/ order! \/ */ ++/* increment the state and the event counter */ ++void kbase_disjoint_state_up(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ _MALI_OSK_LOCK_ORDER_FIRST = 0, ++ atomic_inc(&kbdev->disjoint_event.state); + -+ _MALI_OSK_LOCK_ORDER_SESSIONS, -+ _MALI_OSK_LOCK_ORDER_MEM_SESSION, -+ _MALI_OSK_LOCK_ORDER_MEM_INFO, -+ _MALI_OSK_LOCK_ORDER_MEM_PT_CACHE, -+ _MALI_OSK_LOCK_ORDER_DESCRIPTOR_MAP, -+ _MALI_OSK_LOCK_ORDER_PM_EXECUTION, -+ _MALI_OSK_LOCK_ORDER_EXECUTOR, -+ _MALI_OSK_LOCK_ORDER_TIMELINE_SYSTEM, -+ _MALI_OSK_LOCK_ORDER_SCHEDULER, -+ _MALI_OSK_LOCK_ORDER_SCHEDULER_DEFERRED, -+ _MALI_OSK_LOCK_ORDER_PROFILING, -+ _MALI_OSK_LOCK_ORDER_L2, -+ _MALI_OSK_LOCK_ORDER_L2_COMMAND, -+ _MALI_OSK_LOCK_ORDER_UTILIZATION, -+ _MALI_OSK_LOCK_ORDER_SESSION_PENDING_JOBS, -+ _MALI_OSK_LOCK_ORDER_PM_STATE, ++ kbase_disjoint_event(kbdev); ++} + -+ _MALI_OSK_LOCK_ORDER_LAST, -+} _mali_osk_lock_order_t; ++/* decrement the state */ ++void kbase_disjoint_state_down(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(atomic_read(&kbdev->disjoint_event.state) > 0); + ++ kbase_disjoint_event(kbdev); + -+/** @brief OSK Mutual Exclusion Lock flags type -+ * -+ * - Any lock can use the order parameter. -+ */ -+typedef enum { -+ _MALI_OSK_LOCKFLAG_UNORDERED = 0x1, /**< Indicate that the order of this lock should not be checked */ -+ _MALI_OSK_LOCKFLAG_ORDERED = 0x2, -+ /** @enum _mali_osk_lock_flags_t -+ * -+ * Flags from 0x10000--0x80000000 are RESERVED for User-mode */ ++ atomic_dec(&kbdev->disjoint_event.state); ++} + -+} _mali_osk_lock_flags_t; ++/* increments the count only if the state is > 0 */ ++void kbase_disjoint_event_potential(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+/** @brief Mutual Exclusion Lock Mode Optimization hint ++ if (atomic_read(&kbdev->disjoint_event.state)) ++ kbase_disjoint_event(kbdev); ++} ++ ++u32 kbase_disjoint_event_get(struct kbase_device *kbdev) ++{ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ ++ return atomic_read(&kbdev->disjoint_event.count); ++} ++KBASE_EXPORT_TEST_API(kbase_disjoint_event_get); +diff --git a/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c +new file mode 100755 +index 000000000..9197743c8 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c +@@ -0,0 +1,449 @@ ++/* + * -+ * The lock mode is used to implement the read/write locking of locks when we call -+ * functions _mali_osk_mutex_rw_init/wait/signal/term/. In this case, the RO mode can -+ * be used to allow multiple concurrent readers, but no writers. The RW mode is used for -+ * writers, and so will wait for all readers to release the lock (if any present). -+ * Further readers and writers will wait until the writer releases the lock. ++ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. + * -+ * The mode is purely an optimization hint: for example, it is permissible for -+ * all locks to behave in RW mode, regardless of that supplied. ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. + * -+ * It is an error to attempt to use locks in anything other that RW mode when -+ * call functions _mali_osk_mutex_rw_wait/signal(). ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * + */ -+typedef enum { -+ _MALI_OSK_LOCKMODE_UNDEF = -1, /**< Undefined lock mode. For internal use only */ -+ _MALI_OSK_LOCKMODE_RW = 0x0, /**< Read-write mode, default. All readers and writers are mutually-exclusive */ -+ _MALI_OSK_LOCKMODE_RO, /**< Read-only mode, to support multiple concurrent readers, but mutual exclusion in the presence of writers. */ -+ /** @enum _mali_osk_lock_mode_t -+ * -+ * Lock modes 0x40--0x7F are RESERVED for User-mode */ -+} _mali_osk_lock_mode_t; + -+/** @brief Private types for Mutual Exclusion lock objects */ -+typedef struct _mali_osk_lock_debug_s _mali_osk_lock_debug_t; -+typedef struct _mali_osk_spinlock_s _mali_osk_spinlock_t; -+typedef struct _mali_osk_spinlock_irq_s _mali_osk_spinlock_irq_t; -+typedef struct _mali_osk_mutex_s _mali_osk_mutex_t; -+typedef struct _mali_osk_mutex_rw_s _mali_osk_mutex_rw_t; + -+/** @} */ /* end group _mali_osk_lock */ + -+/** @defgroup _mali_osk_low_level_memory OSK Low-level Memory Operations -+ * @{ */ + -+/** -+ * @brief Private data type for use in IO accesses to/from devices. -+ * -+ * This represents some range that is accessible from the device. Examples -+ * include: -+ * - Device Registers, which could be readable and/or writeable. -+ * - Memory that the device has access to, for storing configuration structures. -+ * -+ * Access to this range must be made through the _mali_osk_mem_ioread32() and -+ * _mali_osk_mem_iowrite32() functions. ++/* Include mali_kbase_dma_fence.h before checking for CONFIG_MALI_DMA_FENCE as ++ * it will be set there. + */ -+typedef struct _mali_io_address *mali_io_address; ++#include "mali_kbase_dma_fence.h" + -+/** @defgroup _MALI_OSK_CPU_PAGE CPU Physical page size macros. -+ * -+ * The order of the page size is supplied for -+ * ease of use by algorithms that might require it, since it is easier to know -+ * it ahead of time rather than calculating it. -+ * -+ * The Mali Page Mask macro masks off the lower bits of a physical address to -+ * give the start address of the page for that physical address. -+ * -+ * @note The Mali device driver code is designed for systems with 4KB page size. -+ * Changing these macros will not make the entire Mali device driver work with -+ * page sizes other than 4KB. -+ * -+ * @note The CPU Physical Page Size has been assumed to be the same as the Mali -+ * Physical Page Size. -+ * -+ * @{ -+ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+/** CPU Page Order, as log to base 2 of the Page size. @see _MALI_OSK_CPU_PAGE_SIZE */ -+#define _MALI_OSK_CPU_PAGE_ORDER ((u32)12) -+/** CPU Page Size, in bytes. */ -+#define _MALI_OSK_CPU_PAGE_SIZE (((u32)1) << (_MALI_OSK_CPU_PAGE_ORDER)) -+/** CPU Page Mask, which masks off the offset within a page */ -+#define _MALI_OSK_CPU_PAGE_MASK (~((((u32)1) << (_MALI_OSK_CPU_PAGE_ORDER)) - ((u32)1))) -+/** @} */ /* end of group _MALI_OSK_CPU_PAGE */ ++#include + -+/** @defgroup _MALI_OSK_MALI_PAGE Mali Physical Page size macros -+ * -+ * Mali Physical page size macros. The order of the page size is supplied for -+ * ease of use by algorithms that might require it, since it is easier to know -+ * it ahead of time rather than calculating it. -+ * -+ * The Mali Page Mask macro masks off the lower bits of a physical address to -+ * give the start address of the page for that physical address. -+ * -+ * @note The Mali device driver code is designed for systems with 4KB page size. -+ * Changing these macros will not make the entire Mali device driver work with -+ * page sizes other than 4KB. -+ * -+ * @note The Mali Physical Page Size has been assumed to be the same as the CPU -+ * Physical Page Size. -+ * -+ * @{ -+ */ ++static void ++kbase_dma_fence_work(struct work_struct *pwork); + -+/** Mali Page Order, as log to base 2 of the Page size. @see _MALI_OSK_MALI_PAGE_SIZE */ -+#define _MALI_OSK_MALI_PAGE_ORDER PAGE_SHIFT -+/** Mali Page Size, in bytes. */ -+#define _MALI_OSK_MALI_PAGE_SIZE PAGE_SIZE -+/** Mali Page Mask, which masks off the offset within a page */ -+#define _MALI_OSK_MALI_PAGE_MASK PAGE_MASK -+/** @} */ /* end of group _MALI_OSK_MALI_PAGE*/ ++static void ++kbase_dma_fence_waiters_add(struct kbase_jd_atom *katom) ++{ ++ struct kbase_context *kctx = katom->kctx; + -+/** @brief flags for mapping a user-accessible memory range -+ * -+ * Where a function with prefix '_mali_osk_mem_mapregion' accepts flags as one -+ * of the function parameters, it will use one of these. These allow per-page -+ * control over mappings. Compare with the mali_memory_allocation_flag type, -+ * which acts over an entire range -+ * -+ * These may be OR'd together with bitwise OR (|), but must be cast back into -+ * the type after OR'ing. -+ */ -+typedef enum { -+ _MALI_OSK_MEM_MAPREGION_FLAG_OS_ALLOCATED_PHYSADDR = 0x1, /**< Physical address is OS Allocated */ -+} _mali_osk_mem_mapregion_flags_t; -+/** @} */ /* end group _mali_osk_low_level_memory */ ++ list_add_tail(&katom->queue, &kctx->dma_fence.waiting_resource); ++} + -+/** @defgroup _mali_osk_notification OSK Notification Queues -+ * @{ */ ++static void ++kbase_dma_fence_waiters_remove(struct kbase_jd_atom *katom) ++{ ++ list_del(&katom->queue); ++} + -+/** @brief Private type for notification queue objects */ -+typedef struct _mali_osk_notification_queue_t_struct _mali_osk_notification_queue_t; ++static int ++kbase_dma_fence_lock_reservations(struct kbase_dma_fence_resv_info *info, ++ struct ww_acquire_ctx *ctx) ++{ ++ struct reservation_object *content_res = NULL; ++ unsigned int content_res_idx = 0; ++ unsigned int r; ++ int err = 0; + -+/** @brief Public notification data object type */ -+typedef struct _mali_osk_notification_t_struct { -+ u32 notification_type; /**< The notification type */ -+ u32 result_buffer_size; /**< Size of the result buffer to copy to user space */ -+ void *result_buffer; /**< Buffer containing any type specific data */ -+} _mali_osk_notification_t; ++ ww_acquire_init(ctx, &reservation_ww_class); + -+/** @} */ /* end group _mali_osk_notification */ ++retry: ++ for (r = 0; r < info->dma_fence_resv_count; r++) { ++ if (info->resv_objs[r] == content_res) { ++ content_res = NULL; ++ continue; ++ } + ++ err = ww_mutex_lock(&info->resv_objs[r]->lock, ctx); ++ if (err) ++ goto error; ++ } + -+/** @defgroup _mali_osk_timer OSK Timer Callbacks -+ * @{ */ ++ ww_acquire_done(ctx); ++ return err; + -+/** @brief Function to call when a timer expires -+ * -+ * When a timer expires, this function is called. Note that on many systems, -+ * a timer callback will be executed in IRQ context. Therefore, restrictions -+ * may apply on what can be done inside the timer callback. -+ * -+ * If a timer requires more work to be done than can be acheived in an IRQ -+ * context, then it may defer the work with a work-queue. For example, it may -+ * use \ref _mali_osk_wq_schedule_work() to make use of a bottom-half handler -+ * to carry out the remaining work. -+ * -+ * Stopping the timer with \ref _mali_osk_timer_del() blocks on compeletion of -+ * the callback. Therefore, the callback may not obtain any mutexes also held -+ * by any callers of _mali_osk_timer_del(). Otherwise, a deadlock may occur. -+ * -+ * @param arg Function-specific data */ -+typedef void (*_mali_osk_timer_callback_t)(void *arg); ++error: ++ content_res_idx = r; + -+/** @brief Private type for Timer Callback Objects */ -+typedef struct _mali_osk_timer_t_struct _mali_osk_timer_t; -+/** @} */ /* end group _mali_osk_timer */ ++ /* Unlock the locked one ones */ ++ while (r--) ++ ww_mutex_unlock(&info->resv_objs[r]->lock); + ++ if (content_res) ++ ww_mutex_unlock(&content_res->lock); + -+/** @addtogroup _mali_osk_list OSK Doubly-Linked Circular Lists -+ * @{ */ ++ /* If we deadlock try with lock_slow and retry */ ++ if (err == -EDEADLK) { ++ content_res = info->resv_objs[content_res_idx]; ++ ww_mutex_lock_slow(&content_res->lock, ctx); ++ goto retry; ++ } + -+/** @brief Public List objects. -+ * -+ * To use, add a _mali_osk_list_t member to the structure that may become part -+ * of a list. When traversing the _mali_osk_list_t objects, use the -+ * _MALI_OSK_CONTAINER_OF() macro to recover the structure from its -+ *_mali_osk_list_t member ++ /* If we are here the function failed */ ++ ww_acquire_fini(ctx); ++ return err; ++} ++ ++static void ++kbase_dma_fence_unlock_reservations(struct kbase_dma_fence_resv_info *info, ++ struct ww_acquire_ctx *ctx) ++{ ++ unsigned int r; ++ ++ for (r = 0; r < info->dma_fence_resv_count; r++) ++ ww_mutex_unlock(&info->resv_objs[r]->lock); ++ ww_acquire_fini(ctx); ++} ++ ++/** ++ * kbase_dma_fence_queue_work() - Queue work to handle @katom ++ * @katom: Pointer to atom for which to queue work + * -+ * Each structure may have multiple _mali_osk_list_t members, so that the -+ * structure is part of multiple lists. When traversing lists, ensure that the -+ * correct _mali_osk_list_t member is used, because type-checking will be -+ * lost by the compiler. ++ * Queue kbase_dma_fence_work() for @katom to clean up the fence callbacks and ++ * submit the atom. + */ -+typedef struct _mali_osk_list_s { -+ struct _mali_osk_list_s *next; -+ struct _mali_osk_list_s *prev; -+} _mali_osk_list_t; -+/** @} */ /* end group _mali_osk_list */ ++static void ++kbase_dma_fence_queue_work(struct kbase_jd_atom *katom) ++{ ++ struct kbase_context *kctx = katom->kctx; ++ bool ret; + -+/** @addtogroup _mali_osk_miscellaneous -+ * @{ */ ++ INIT_WORK(&katom->work, kbase_dma_fence_work); ++ ret = queue_work(kctx->dma_fence.wq, &katom->work); ++ /* Warn if work was already queued, that should not happen. */ ++ WARN_ON(!ret); ++} + -+/** @brief resource description struct ++/** ++ * kbase_dma_fence_cancel_atom() - Cancels waiting on an atom ++ * @katom: Katom to cancel + * -+ * Platform independent representation of a Mali HW resource ++ * Locking: katom->dma_fence.callbacks list assumes jctx.lock is held. + */ -+typedef struct _mali_osk_resource { -+ const char *description; /**< short description of the resource */ -+ uintptr_t base; /**< Physical base address of the resource, as seen by Mali resources. */ -+ const char *irq_name; /**< Name of irq belong to this resource */ -+ u32 irq; /**< IRQ number delivered to the CPU, or -1 to tell the driver to probe for it (if possible) */ -+} _mali_osk_resource_t; -+/** @} */ /* end group _mali_osk_miscellaneous */ ++static void ++kbase_dma_fence_cancel_atom(struct kbase_jd_atom *katom) ++{ ++ lockdep_assert_held(&katom->kctx->jctx.lock); + -+/** @defgroup _mali_osk_wait_queue OSK Wait Queue functionality -+ * @{ */ -+/** @brief Private type for wait queue objects */ -+typedef struct _mali_osk_wait_queue_t_struct _mali_osk_wait_queue_t; -+/** @} */ /* end group _mali_osk_wait_queue */ ++ /* Cancel callbacks and clean up. */ ++ kbase_fence_free_callbacks(katom); + -+/** @} */ /* end group osuapi */ ++ /* Mark the atom as handled in case all fences signaled just before ++ * canceling the callbacks and the worker was queued. ++ */ ++ kbase_fence_dep_count_set(katom, -1); + -+/** @} */ /* end group uddapi */ ++ /* Prevent job_done_nolock from being called twice on an atom when ++ * there is a race between job completion and cancellation. ++ */ + -+/** @brief Mali print ctx type which uses seq_file -+ */ -+typedef struct seq_file _mali_osk_print_ctx; -+ -+#define _MALI_OSK_BITMAP_INVALIDATE_INDEX -1 -+ -+typedef struct _mali_osk_bitmap { -+ u32 reserve; -+ u32 last; -+ u32 max; -+ u32 avail; -+ _mali_osk_spinlock_t *lock; -+ unsigned long *table; -+} _mali_osk_bitmap_t; -+ -+ -+#ifdef __cplusplus ++ if (katom->status == KBASE_JD_ATOM_STATE_QUEUED) { ++ /* Wait was cancelled - zap the atom */ ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ if (jd_done_nolock(katom, NULL)) ++ kbase_js_sched_all(katom->kctx->kbdev); ++ } +} -+#endif + -+#endif /* __MALI_OSK_TYPES_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm.c b/drivers/gpu/arm/mali400/mali/common/mali_pm.c -new file mode 100755 -index 000000000000..3989a33aeaef ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.c -@@ -0,0 +1,1362 @@ -+/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * kbase_dma_fence_work() - Worker thread called when a fence is signaled ++ * @pwork: work_struct containing a pointer to a katom ++ * ++ * This function will clean and mark all dependencies as satisfied + */ ++static void ++kbase_dma_fence_work(struct work_struct *pwork) ++{ ++ struct kbase_jd_atom *katom; ++ struct kbase_jd_context *ctx; + -+#include "mali_pm.h" -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_osk_mali.h" -+#include "mali_scheduler.h" -+#include "mali_group.h" -+#include "mali_pm_domain.h" -+#include "mali_pmu.h" -+ -+#include "mali_executor.h" -+#include "mali_control_timer.h" -+ -+#if defined(DEBUG) -+u32 num_pm_runtime_resume = 0; -+u32 num_pm_updates = 0; -+u32 num_pm_updates_up = 0; -+u32 num_pm_updates_down = 0; -+#endif -+ -+#define MALI_PM_DOMAIN_DUMMY_MASK (1 << MALI_DOMAIN_INDEX_DUMMY) -+ -+/* lock protecting power state (including pm_domains) */ -+static _mali_osk_spinlock_irq_t *pm_lock_state = NULL; ++ katom = container_of(pwork, struct kbase_jd_atom, work); ++ ctx = &katom->kctx->jctx; + -+/* the wanted domain mask (protected by pm_lock_state) */ -+static u32 pd_mask_wanted = 0; ++ mutex_lock(&ctx->lock); ++ if (kbase_fence_dep_count_read(katom) != 0) ++ goto out; + -+/* used to deferring the actual power changes */ -+static _mali_osk_wq_work_t *pm_work = NULL; ++ kbase_fence_dep_count_set(katom, -1); + -+/* lock protecting power change execution */ -+static _mali_osk_mutex_t *pm_lock_exec = NULL; ++ /* Remove atom from list of dma-fence waiting atoms. */ ++ kbase_dma_fence_waiters_remove(katom); ++ /* Cleanup callbacks. */ ++ kbase_fence_free_callbacks(katom); ++ /* ++ * Queue atom on GPU, unless it has already completed due to a failing ++ * dependency. Run jd_done_nolock() on the katom if it is completed. ++ */ ++ if (unlikely(katom->status == KBASE_JD_ATOM_STATE_COMPLETED)) ++ jd_done_nolock(katom, NULL); ++ else ++ kbase_jd_dep_clear_locked(katom); + -+/* PMU domains which are actually powered on (protected by pm_lock_exec) */ -+static u32 pmu_mask_current = 0; ++out: ++ mutex_unlock(&ctx->lock); ++} + -+/* -+ * domains which marked as powered on (protected by pm_lock_exec) -+ * This can be different from pmu_mask_current right after GPU power on -+ * if the PMU domains default to powered up. -+ */ -+static u32 pd_mask_current = 0; ++static void ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++kbase_dma_fence_cb(struct fence *fence, struct fence_cb *cb) ++#else ++kbase_dma_fence_cb(struct dma_fence *fence, struct dma_fence_cb *cb) ++#endif ++{ ++ struct kbase_fence_cb *kcb = container_of(cb, ++ struct kbase_fence_cb, ++ fence_cb); ++ struct kbase_jd_atom *katom = kcb->katom; + -+static u16 domain_config[MALI_MAX_NUMBER_OF_DOMAINS] = { -+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -+ 1 << MALI_DOMAIN_INDEX_DUMMY -+}; ++ /* If the atom is zapped dep_count will be forced to a negative number ++ * preventing this callback from ever scheduling work. Which in turn ++ * would reschedule the atom. ++ */ + -+/* The relative core power cost */ -+#define MALI_GP_COST 3 -+#define MALI_PP_COST 6 -+#define MALI_L2_COST 1 ++ if (kbase_fence_dep_count_dec_and_test(katom)) ++ kbase_dma_fence_queue_work(katom); ++} + -+/* -+ *We have MALI_MAX_NUMBER_OF_PP_PHYSICAL_CORES + 1 rows in this matrix -+ *because we mush store the mask of different pp cores: 0, 1, 2, 3, 4, 5, 6, 7, 8. -+ */ -+static int mali_pm_domain_power_cost_result[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS + 1][MALI_MAX_NUMBER_OF_DOMAINS]; -+/* -+ * Keep track of runtime PM state, so that we know -+ * how to resume during OS resume. -+ */ -+#ifdef CONFIG_PM_RUNTIME -+static mali_bool mali_pm_runtime_active = MALI_FALSE; ++static int ++kbase_dma_fence_add_reservation_callback(struct kbase_jd_atom *katom, ++ struct reservation_object *resv, ++ bool exclusive) ++{ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ struct fence *excl_fence = NULL; ++ struct fence **shared_fences = NULL; +#else -+/* when kernel don't enable PM_RUNTIME, set the flag always true, -+ * for GPU will not power off by runtime */ -+static mali_bool mali_pm_runtime_active = MALI_TRUE; ++ struct dma_fence *excl_fence = NULL; ++ struct dma_fence **shared_fences = NULL; +#endif ++ unsigned int shared_count = 0; ++ int err, i; + -+static void mali_pm_state_lock(void); -+static void mali_pm_state_unlock(void); -+static _mali_osk_errcode_t mali_pm_create_pm_domains(void); -+static void mali_pm_set_pmu_domain_config(void); -+static u32 mali_pm_get_registered_cores_mask(void); -+static void mali_pm_update_sync_internal(void); -+static mali_bool mali_pm_common_suspend(void); -+static void mali_pm_update_work(void *data); -+#if defined(DEBUG) -+const char *mali_pm_mask_to_string(u32 mask); -+const char *mali_pm_group_stats_to_string(void); -+#endif ++ err = reservation_object_get_fences_rcu(resv, ++ &excl_fence, ++ &shared_count, ++ &shared_fences); ++ if (err) ++ return err; + -+_mali_osk_errcode_t mali_pm_initialize(void) -+{ -+ _mali_osk_errcode_t err; -+ struct mali_pmu_core *pmu; ++ if (excl_fence) { ++ err = kbase_fence_add_callback(katom, ++ excl_fence, ++ kbase_dma_fence_cb); + -+ pm_lock_state = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_ORDERED, -+ _MALI_OSK_LOCK_ORDER_PM_STATE); -+ if (NULL == pm_lock_state) { -+ mali_pm_terminate(); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ /* Release our reference, taken by reservation_object_get_fences_rcu(), ++ * to the fence. We have set up our callback (if that was possible), ++ * and it's the fence's owner is responsible for singling the fence ++ * before allowing it to disappear. ++ */ ++ dma_fence_put(excl_fence); + -+ pm_lock_exec = _mali_osk_mutex_init(_MALI_OSK_LOCKFLAG_ORDERED, -+ _MALI_OSK_LOCK_ORDER_PM_STATE); -+ if (NULL == pm_lock_exec) { -+ mali_pm_terminate(); -+ return _MALI_OSK_ERR_FAULT; ++ if (err) ++ goto out; + } + -+ pm_work = _mali_osk_wq_create_work(mali_pm_update_work, NULL); -+ if (NULL == pm_work) { -+ mali_pm_terminate(); -+ return _MALI_OSK_ERR_FAULT; ++ if (exclusive) { ++ for (i = 0; i < shared_count; i++) { ++ err = kbase_fence_add_callback(katom, ++ shared_fences[i], ++ kbase_dma_fence_cb); ++ if (err) ++ goto out; ++ } + } + -+ pmu = mali_pmu_get_global_pmu_core(); -+ if (NULL != pmu) { ++ /* Release all our references to the shared fences, taken by ++ * reservation_object_get_fences_rcu(). We have set up our callback (if ++ * that was possible), and it's the fence's owner is responsible for ++ * signaling the fence before allowing it to disappear. ++ */ ++out: ++ for (i = 0; i < shared_count; i++) ++ dma_fence_put(shared_fences[i]); ++ kfree(shared_fences); ++ ++ if (err) { + /* -+ * We have a Mali PMU, set the correct domain -+ * configuration (default or custom) ++ * On error, cancel and clean up all callbacks that was set up ++ * before the error. + */ -+ -+ u32 registered_cores_mask; -+ -+ mali_pm_set_pmu_domain_config(); -+ -+ registered_cores_mask = mali_pm_get_registered_cores_mask(); -+ mali_pmu_set_registered_cores_mask(pmu, registered_cores_mask); -+ -+ MALI_DEBUG_ASSERT(0 == pd_mask_wanted); -+ } -+ -+ /* Create all power domains needed (at least one dummy domain) */ -+ err = mali_pm_create_pm_domains(); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_pm_terminate(); -+ return err; ++ kbase_fence_free_callbacks(katom); + } + -+ return _MALI_OSK_ERR_OK; ++ return err; +} + -+void mali_pm_terminate(void) ++void kbase_dma_fence_add_reservation(struct reservation_object *resv, ++ struct kbase_dma_fence_resv_info *info, ++ bool exclusive) +{ -+ if (NULL != pm_work) { -+ _mali_osk_wq_delete_work(pm_work); -+ pm_work = NULL; -+ } -+ -+ mali_pm_domain_terminate(); ++ unsigned int i; + -+ if (NULL != pm_lock_exec) { -+ _mali_osk_mutex_term(pm_lock_exec); -+ pm_lock_exec = NULL; ++ for (i = 0; i < info->dma_fence_resv_count; i++) { ++ /* Duplicate resource, ignore */ ++ if (info->resv_objs[i] == resv) ++ return; + } + -+ if (NULL != pm_lock_state) { -+ _mali_osk_spinlock_irq_term(pm_lock_state); -+ pm_lock_state = NULL; -+ } ++ info->resv_objs[info->dma_fence_resv_count] = resv; ++ if (exclusive) ++ set_bit(info->dma_fence_resv_count, ++ info->dma_fence_excl_bitmap); ++ (info->dma_fence_resv_count)++; +} + -+struct mali_pm_domain *mali_pm_register_l2_cache(u32 domain_index, -+ struct mali_l2_cache_core *l2_cache) ++int kbase_dma_fence_wait(struct kbase_jd_atom *katom, ++ struct kbase_dma_fence_resv_info *info) +{ -+ struct mali_pm_domain *domain; -+ -+ domain = mali_pm_domain_get_from_mask(domain_config[domain_index]); -+ if (NULL == domain) { -+ MALI_DEBUG_ASSERT(0 == domain_config[domain_index]); -+ domain = mali_pm_domain_get_from_index( -+ MALI_DOMAIN_INDEX_DUMMY); -+ domain_config[domain_index] = MALI_PM_DOMAIN_DUMMY_MASK; -+ } else { -+ MALI_DEBUG_ASSERT(0 != domain_config[domain_index]); -+ } -+ -+ MALI_DEBUG_ASSERT(NULL != domain); -+ -+ mali_pm_domain_add_l2_cache(domain, l2_cache); -+ -+ return domain; /* return the actual domain this was registered in */ -+} ++ int err, i; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ struct fence *fence; ++#else ++ struct dma_fence *fence; ++#endif ++ struct ww_acquire_ctx ww_ctx; + -+struct mali_pm_domain *mali_pm_register_group(u32 domain_index, -+ struct mali_group *group) -+{ -+ struct mali_pm_domain *domain; ++ lockdep_assert_held(&katom->kctx->jctx.lock); + -+ domain = mali_pm_domain_get_from_mask(domain_config[domain_index]); -+ if (NULL == domain) { -+ MALI_DEBUG_ASSERT(0 == domain_config[domain_index]); -+ domain = mali_pm_domain_get_from_index( -+ MALI_DOMAIN_INDEX_DUMMY); -+ domain_config[domain_index] = MALI_PM_DOMAIN_DUMMY_MASK; -+ } else { -+ MALI_DEBUG_ASSERT(0 != domain_config[domain_index]); ++ fence = kbase_fence_out_new(katom); ++ if (!fence) { ++ err = -ENOMEM; ++ dev_err(katom->kctx->kbdev->dev, ++ "Error %d creating fence.\n", err); ++ return err; + } + -+ MALI_DEBUG_ASSERT(NULL != domain); ++ kbase_fence_dep_count_set(katom, 1); + -+ mali_pm_domain_add_group(domain, group); ++ err = kbase_dma_fence_lock_reservations(info, &ww_ctx); ++ if (err) { ++ dev_err(katom->kctx->kbdev->dev, ++ "Error %d locking reservations.\n", err); ++ kbase_fence_dep_count_set(katom, -1); ++ kbase_fence_out_remove(katom); ++ return err; ++ } + -+ return domain; /* return the actual domain this was registered in */ -+} ++ for (i = 0; i < info->dma_fence_resv_count; i++) { ++ struct reservation_object *obj = info->resv_objs[i]; + -+mali_bool mali_pm_get_domain_refs(struct mali_pm_domain **domains, -+ struct mali_group **groups, -+ u32 num_domains) -+{ -+ mali_bool ret = MALI_TRUE; /* Assume all is powered on instantly */ -+ u32 i; ++ if (!test_bit(i, info->dma_fence_excl_bitmap)) { ++ err = reservation_object_reserve_shared(obj); ++ if (err) { ++ dev_err(katom->kctx->kbdev->dev, ++ "Error %d reserving space for shared fence.\n", err); ++ goto end; ++ } + -+ mali_pm_state_lock(); ++ err = kbase_dma_fence_add_reservation_callback(katom, obj, false); ++ if (err) { ++ dev_err(katom->kctx->kbdev->dev, ++ "Error %d adding reservation to callback.\n", err); ++ goto end; ++ } + -+ for (i = 0; i < num_domains; i++) { -+ MALI_DEBUG_ASSERT_POINTER(domains[i]); -+ pd_mask_wanted |= mali_pm_domain_ref_get(domains[i]); -+ if (MALI_FALSE == mali_pm_domain_power_is_on(domains[i])) { -+ /* -+ * Tell caller that the corresponding group -+ * was not already powered on. -+ */ -+ ret = MALI_FALSE; ++ reservation_object_add_shared_fence(obj, fence); + } else { -+ /* -+ * There is a time gap between we power on the domain and -+ * set the power state of the corresponding groups to be on. -+ */ -+ if (NULL != groups[i] && -+ MALI_FALSE == mali_group_power_is_on(groups[i])) { -+ ret = MALI_FALSE; ++ err = kbase_dma_fence_add_reservation_callback(katom, obj, true); ++ if (err) { ++ dev_err(katom->kctx->kbdev->dev, ++ "Error %d adding reservation to callback.\n", err); ++ goto end; + } ++ ++ reservation_object_add_excl_fence(obj, fence); + } + } + -+ MALI_DEBUG_PRINT(3, ("PM: wanted domain mask = 0x%08X (get refs)\n", pd_mask_wanted)); ++end: ++ kbase_dma_fence_unlock_reservations(info, &ww_ctx); + -+ mali_pm_state_unlock(); ++ if (likely(!err)) { ++ /* Test if the callbacks are already triggered */ ++ if (kbase_fence_dep_count_dec_and_test(katom)) { ++ kbase_fence_dep_count_set(katom, -1); ++ kbase_fence_free_callbacks(katom); ++ } else { ++ /* Add katom to the list of dma-buf fence waiting atoms ++ * only if it is still waiting. ++ */ ++ kbase_dma_fence_waiters_add(katom); ++ } ++ } else { ++ /* There was an error, cancel callbacks, set dep_count to -1 to ++ * indicate that the atom has been handled (the caller will ++ * kill it for us), signal the fence, free callbacks and the ++ * fence. ++ */ ++ kbase_fence_free_callbacks(katom); ++ kbase_fence_dep_count_set(katom, -1); ++ kbase_dma_fence_signal(katom); ++ } + -+ return ret; ++ return err; +} + -+mali_bool mali_pm_put_domain_refs(struct mali_pm_domain **domains, -+ u32 num_domains) ++void kbase_dma_fence_cancel_all_atoms(struct kbase_context *kctx) +{ -+ u32 mask = 0; -+ mali_bool ret; -+ u32 i; ++ struct list_head *list = &kctx->dma_fence.waiting_resource; + -+ mali_pm_state_lock(); ++ while (!list_empty(list)) { ++ struct kbase_jd_atom *katom; + -+ for (i = 0; i < num_domains; i++) { -+ MALI_DEBUG_ASSERT_POINTER(domains[i]); -+ mask |= mali_pm_domain_ref_put(domains[i]); ++ katom = list_first_entry(list, struct kbase_jd_atom, queue); ++ kbase_dma_fence_waiters_remove(katom); ++ kbase_dma_fence_cancel_atom(katom); + } ++} + -+ if (0 == mask) { -+ /* return false, all domains should still stay on */ -+ ret = MALI_FALSE; -+ } else { -+ /* Assert that we are dealing with a change */ -+ MALI_DEBUG_ASSERT((pd_mask_wanted & mask) == mask); -+ -+ /* Update our desired domain mask */ -+ pd_mask_wanted &= ~mask; ++void kbase_dma_fence_cancel_callbacks(struct kbase_jd_atom *katom) ++{ ++ /* Cancel callbacks and clean up. */ ++ if (kbase_fence_free_callbacks(katom)) ++ kbase_dma_fence_queue_work(katom); ++} + -+ /* return true; one or more domains can now be powered down */ -+ ret = MALI_TRUE; -+ } ++void kbase_dma_fence_signal(struct kbase_jd_atom *katom) ++{ ++ if (!katom->dma_fence.fence) ++ return; + -+ MALI_DEBUG_PRINT(3, ("PM: wanted domain mask = 0x%08X (put refs)\n", pd_mask_wanted)); ++ /* Signal the atom's fence. */ ++ dma_fence_signal(katom->dma_fence.fence); + -+ mali_pm_state_unlock(); ++ kbase_fence_out_remove(katom); + -+ return ret; ++ kbase_fence_free_callbacks(katom); +} + -+void mali_pm_init_begin(void) ++void kbase_dma_fence_term(struct kbase_context *kctx) +{ -+ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); -+ -+ _mali_osk_pm_dev_ref_get_sync(); -+ -+ /* Ensure all PMU domains are on */ -+ if (NULL != pmu) { -+ mali_pmu_power_up_all(pmu); -+ } ++ destroy_workqueue(kctx->dma_fence.wq); ++ kctx->dma_fence.wq = NULL; +} + -+void mali_pm_init_end(void) ++int kbase_dma_fence_init(struct kbase_context *kctx) +{ -+ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); ++ INIT_LIST_HEAD(&kctx->dma_fence.waiting_resource); + -+ /* Ensure all PMU domains are off */ -+ if (NULL != pmu) { -+ mali_pmu_power_down_all(pmu); -+ } ++ kctx->dma_fence.wq = alloc_workqueue("mali-fence-%d", ++ WQ_UNBOUND, 1, kctx->pid); ++ if (!kctx->dma_fence.wq) ++ return -ENOMEM; + -+ _mali_osk_pm_dev_ref_put(); ++ return 0; +} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h +new file mode 100755 +index 000000000..c9ab40350 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h +@@ -0,0 +1,131 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+void mali_pm_update_sync(void) -+{ -+ mali_pm_exec_lock(); + -+ if (MALI_TRUE == mali_pm_runtime_active) { -+ /* -+ * Only update if GPU is powered on. -+ * Deactivation of the last group will result in both a -+ * deferred runtime PM suspend operation and -+ * deferred execution of this function. -+ * mali_pm_runtime_active will be false if runtime PM -+ * executed first and thus the GPU is now fully powered off. -+ */ -+ mali_pm_update_sync_internal(); -+ } + -+ mali_pm_exec_unlock(); -+} ++#ifndef _KBASE_DMA_FENCE_H_ ++#define _KBASE_DMA_FENCE_H_ + -+void mali_pm_update_async(void) -+{ -+ _mali_osk_wq_schedule_work(pm_work); -+} ++#ifdef CONFIG_MALI_DMA_FENCE + -+void mali_pm_os_suspend(mali_bool os_suspend) -+{ -+ int ret; ++#include ++#include ++#include + -+ MALI_DEBUG_PRINT(3, ("Mali PM: OS suspend\n")); + -+ /* Suspend execution of all jobs, and go to inactive state */ -+ mali_executor_suspend(); ++/* Forward declaration from mali_kbase_defs.h */ ++struct kbase_jd_atom; ++struct kbase_context; + -+ if (os_suspend) { -+ mali_control_timer_suspend(MALI_TRUE); -+ } ++/** ++ * struct kbase_dma_fence_resv_info - Structure with list of reservation objects ++ * @resv_objs: Array of reservation objects to attach the ++ * new fence to. ++ * @dma_fence_resv_count: Number of reservation objects in the array. ++ * @dma_fence_excl_bitmap: Specifies which resv_obj are exclusive. ++ * ++ * This is used by some functions to pass around a collection of data about ++ * reservation objects. ++ */ ++struct kbase_dma_fence_resv_info { ++ struct reservation_object **resv_objs; ++ unsigned int dma_fence_resv_count; ++ unsigned long *dma_fence_excl_bitmap; ++}; + -+ mali_pm_exec_lock(); ++/** ++ * kbase_dma_fence_add_reservation() - Adds a resv to the array of resv_objs ++ * @resv: Reservation object to add to the array. ++ * @info: Pointer to struct with current reservation info ++ * @exclusive: Boolean indicating if exclusive access is needed ++ * ++ * The function adds a new reservation_object to an existing array of ++ * reservation_objects. At the same time keeps track of which objects require ++ * exclusive access in dma_fence_excl_bitmap. ++ */ ++void kbase_dma_fence_add_reservation(struct reservation_object *resv, ++ struct kbase_dma_fence_resv_info *info, ++ bool exclusive); + -+ ret = mali_pm_common_suspend(); ++/** ++ * kbase_dma_fence_wait() - Creates a new fence and attaches it to the resv_objs ++ * @katom: Katom with the external dependency. ++ * @info: Pointer to struct with current reservation info ++ * ++ * Return: An error code or 0 if succeeds ++ */ ++int kbase_dma_fence_wait(struct kbase_jd_atom *katom, ++ struct kbase_dma_fence_resv_info *info); + -+ MALI_DEBUG_ASSERT(MALI_TRUE == ret); -+ MALI_IGNORE(ret); ++/** ++ * kbase_dma_fence_cancel_ctx() - Cancel all dma-fences blocked atoms on kctx ++ * @kctx: Pointer to kbase context ++ * ++ * This function will cancel and clean up all katoms on @kctx that is waiting ++ * on dma-buf fences. ++ * ++ * Locking: jctx.lock needs to be held when calling this function. ++ */ ++void kbase_dma_fence_cancel_all_atoms(struct kbase_context *kctx); + -+ mali_pm_exec_unlock(); -+} ++/** ++ * kbase_dma_fence_cancel_callbacks() - Cancel only callbacks on katom ++ * @katom: Pointer to katom whose callbacks are to be canceled ++ * ++ * This function cancels all dma-buf fence callbacks on @katom, but does not ++ * cancel the katom itself. ++ * ++ * The caller is responsible for ensuring that jd_done_nolock is called on ++ * @katom. ++ * ++ * Locking: jctx.lock must be held when calling this function. ++ */ ++void kbase_dma_fence_cancel_callbacks(struct kbase_jd_atom *katom); + -+void mali_pm_os_resume(void) -+{ -+ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); ++/** ++ * kbase_dma_fence_signal() - Signal katom's fence and clean up after wait ++ * @katom: Pointer to katom to signal and clean up ++ * ++ * This function will signal the @katom's fence, if it has one, and clean up ++ * the callback data from the katom's wait on earlier fences. ++ * ++ * Locking: jctx.lock must be held while calling this function. ++ */ ++void kbase_dma_fence_signal(struct kbase_jd_atom *katom); + -+ MALI_DEBUG_PRINT(3, ("Mali PM: OS resume\n")); ++/** ++ * kbase_dma_fence_term() - Terminate Mali dma-fence context ++ * @kctx: kbase context to terminate ++ */ ++void kbase_dma_fence_term(struct kbase_context *kctx); + -+ mali_pm_exec_lock(); ++/** ++ * kbase_dma_fence_init() - Initialize Mali dma-fence context ++ * @kctx: kbase context to initialize ++ */ ++int kbase_dma_fence_init(struct kbase_context *kctx); + -+#if defined(DEBUG) -+ mali_pm_state_lock(); + -+ /* Assert that things are as we left them in os_suspend(). */ -+ MALI_DEBUG_ASSERT(0 == pd_mask_wanted); -+ MALI_DEBUG_ASSERT(0 == pd_mask_current); -+ MALI_DEBUG_ASSERT(0 == pmu_mask_current); ++#else /* CONFIG_MALI_DMA_FENCE */ ++/* Dummy functions for when dma-buf fence isn't enabled. */ + -+ MALI_DEBUG_ASSERT(MALI_TRUE == mali_pm_domain_all_unused()); ++static inline int kbase_dma_fence_init(struct kbase_context *kctx) ++{ ++ return 0; ++} + -+ mali_pm_state_unlock(); ++static inline void kbase_dma_fence_term(struct kbase_context *kctx) {} ++#endif /* CONFIG_MALI_DMA_FENCE */ +#endif +diff --git a/drivers/gpu/arm/midgard/mali_kbase_event.c b/drivers/gpu/arm/midgard/mali_kbase_event.c +new file mode 100755 +index 000000000..188148645 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_event.c +@@ -0,0 +1,259 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ if (MALI_TRUE == mali_pm_runtime_active) { -+ /* Runtime PM was active, so reset PMU */ -+ if (NULL != pmu) { -+ mali_pmu_reset(pmu); -+ pmu_mask_current = mali_pmu_get_mask(pmu); + -+ MALI_DEBUG_PRINT(3, ("Mali PM: OS resume 0x%x \n", pmu_mask_current)); -+ } + -+ mali_pm_update_sync_internal(); -+ } + -+ mali_pm_exec_unlock(); + -+ /* Start executing jobs again */ -+ mali_executor_resume(); -+} ++#include ++#include ++#include + -+mali_bool mali_pm_runtime_suspend(void) ++static struct base_jd_udata kbase_event_process(struct kbase_context *kctx, struct kbase_jd_atom *katom) +{ -+ mali_bool ret; ++ struct base_jd_udata data; + -+ MALI_DEBUG_PRINT(3, ("Mali PM: Runtime suspend\n")); ++ lockdep_assert_held(&kctx->jctx.lock); + -+ mali_pm_exec_lock(); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(katom != NULL); ++ KBASE_DEBUG_ASSERT(katom->status == KBASE_JD_ATOM_STATE_COMPLETED); + -+ /* -+ * Put SW state directly into "off" state, and do not bother to power -+ * down each power domain, because entire GPU will be powered off -+ * when we return. -+ * For runtime PM suspend, in contrast to OS suspend, there is a race -+ * between this function and the mali_pm_update_sync_internal(), which -+ * is fine... -+ */ -+ ret = mali_pm_common_suspend(); -+ if (MALI_TRUE == ret) { -+ mali_pm_runtime_active = MALI_FALSE; -+ } else { -+ /* -+ * Process the "power up" instead, -+ * which could have been "lost" -+ */ -+ mali_pm_update_sync_internal(); -+ } ++ data = katom->udata; + -+ mali_pm_exec_unlock(); ++ KBASE_TIMELINE_ATOMS_IN_FLIGHT(kctx, atomic_sub_return(1, &kctx->timeline.jd_atoms_in_flight)); + -+ return ret; -+} ++ KBASE_TLSTREAM_TL_NRET_ATOM_CTX(katom, kctx); ++ KBASE_TLSTREAM_TL_DEL_ATOM(katom); + -+void mali_pm_runtime_resume(void) -+{ -+ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); ++ katom->status = KBASE_JD_ATOM_STATE_UNUSED; + -+ mali_pm_exec_lock(); ++ wake_up(&katom->completed); + -+ mali_pm_runtime_active = MALI_TRUE; ++ return data; ++} + -+#if defined(DEBUG) -+ ++num_pm_runtime_resume; ++int kbase_event_pending(struct kbase_context *ctx) ++{ ++ KBASE_DEBUG_ASSERT(ctx); + -+ mali_pm_state_lock(); ++ return (atomic_read(&ctx->event_count) != 0) || ++ (atomic_read(&ctx->event_closed) != 0); ++} + -+ /* -+ * Assert that things are as we left them in runtime_suspend(), -+ * except for pd_mask_wanted which normally will be the reason we -+ * got here (job queued => domains wanted) -+ */ -+ MALI_DEBUG_ASSERT(0 == pd_mask_current); -+ MALI_DEBUG_ASSERT(0 == pmu_mask_current); ++KBASE_EXPORT_TEST_API(kbase_event_pending); + -+ mali_pm_state_unlock(); -+#endif ++int kbase_event_dequeue(struct kbase_context *ctx, struct base_jd_event_v2 *uevent) ++{ ++ struct kbase_jd_atom *atom; + -+ if (NULL != pmu) { -+ mali_pmu_reset(pmu); -+ pmu_mask_current = mali_pmu_get_mask(pmu); -+ MALI_DEBUG_PRINT(3, ("Mali PM: Runtime resume 0x%x \n", pmu_mask_current)); -+ } ++ KBASE_DEBUG_ASSERT(ctx); + -+ /* -+ * Normally we are resumed because a job has just been queued. -+ * pd_mask_wanted should thus be != 0. -+ * It is however possible for others to take a Mali Runtime PM ref -+ * without having a job queued. -+ * We should however always call mali_pm_update_sync_internal(), -+ * because this will take care of any potential mismatch between -+ * pmu_mask_current and pd_mask_current. -+ */ -+ mali_pm_update_sync_internal(); ++ mutex_lock(&ctx->event_mutex); + -+ mali_pm_exec_unlock(); -+} ++ if (list_empty(&ctx->event_list)) { ++ if (!atomic_read(&ctx->event_closed)) { ++ mutex_unlock(&ctx->event_mutex); ++ return -1; ++ } + -+#if MALI_STATE_TRACKING -+u32 mali_pm_dump_state_domain(struct mali_pm_domain *domain, -+ char *buf, u32 size) -+{ -+ int n = 0; ++ /* generate the BASE_JD_EVENT_DRV_TERMINATED message on the fly */ ++ mutex_unlock(&ctx->event_mutex); ++ uevent->event_code = BASE_JD_EVENT_DRV_TERMINATED; ++ memset(&uevent->udata, 0, sizeof(uevent->udata)); ++ dev_dbg(ctx->kbdev->dev, ++ "event system closed, returning BASE_JD_EVENT_DRV_TERMINATED(0x%X)\n", ++ BASE_JD_EVENT_DRV_TERMINATED); ++ return 0; ++ } + -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\tPower domain: id %u\n", -+ mali_pm_domain_get_id(domain)); ++ /* normal event processing */ ++ atomic_dec(&ctx->event_count); ++ atom = list_entry(ctx->event_list.next, struct kbase_jd_atom, dep_item[0]); ++ list_del(ctx->event_list.next); + -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\t\tMask: 0x%04x\n", -+ mali_pm_domain_get_mask(domain)); ++ mutex_unlock(&ctx->event_mutex); + -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\t\tUse count: %u\n", -+ mali_pm_domain_get_use_count(domain)); ++ dev_dbg(ctx->kbdev->dev, "event dequeuing %p\n", (void *)atom); ++ uevent->event_code = atom->event_code; ++ uevent->atom_number = (atom - ctx->jctx.atoms); + -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\t\tCurrent power state: %s\n", -+ (mali_pm_domain_get_mask(domain) & pd_mask_current) ? -+ "On" : "Off"); ++ if (atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) ++ kbase_jd_free_external_resources(atom); + -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\t\tWanted power state: %s\n", -+ (mali_pm_domain_get_mask(domain) & pd_mask_wanted) ? -+ "On" : "Off"); ++ mutex_lock(&ctx->jctx.lock); ++ uevent->udata = kbase_event_process(ctx, atom); ++ mutex_unlock(&ctx->jctx.lock); + -+ return n; ++ return 0; +} -+#endif + -+static void mali_pm_state_lock(void) -+{ -+ _mali_osk_spinlock_irq_lock(pm_lock_state); -+} ++KBASE_EXPORT_TEST_API(kbase_event_dequeue); + -+static void mali_pm_state_unlock(void) ++/** ++ * kbase_event_process_noreport_worker - Worker for processing atoms that do not ++ * return an event but do have external ++ * resources ++ * @data: Work structure ++ */ ++static void kbase_event_process_noreport_worker(struct work_struct *data) +{ -+ _mali_osk_spinlock_irq_unlock(pm_lock_state); -+} ++ struct kbase_jd_atom *katom = container_of(data, struct kbase_jd_atom, ++ work); ++ struct kbase_context *kctx = katom->kctx; + -+void mali_pm_exec_lock(void) -+{ -+ _mali_osk_mutex_wait(pm_lock_exec); ++ if (katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) ++ kbase_jd_free_external_resources(katom); ++ ++ mutex_lock(&kctx->jctx.lock); ++ kbase_event_process(kctx, katom); ++ mutex_unlock(&kctx->jctx.lock); +} + -+void mali_pm_exec_unlock(void) ++/** ++ * kbase_event_process_noreport - Process atoms that do not return an event ++ * @kctx: Context pointer ++ * @katom: Atom to be processed ++ * ++ * Atoms that do not have external resources will be processed immediately. ++ * Atoms that do have external resources will be processed on a workqueue, in ++ * order to avoid locking issues. ++ */ ++static void kbase_event_process_noreport(struct kbase_context *kctx, ++ struct kbase_jd_atom *katom) +{ -+ _mali_osk_mutex_signal(pm_lock_exec); ++ if (katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) { ++ INIT_WORK(&katom->work, kbase_event_process_noreport_worker); ++ queue_work(kctx->event_workq, &katom->work); ++ } else { ++ kbase_event_process(kctx, katom); ++ } +} + -+static void mali_pm_domain_power_up(u32 power_up_mask, -+ struct mali_group *groups_up[MALI_MAX_NUMBER_OF_GROUPS], -+ u32 *num_groups_up, -+ struct mali_l2_cache_core *l2_up[MALI_MAX_NUMBER_OF_L2_CACHE_CORES], -+ u32 *num_l2_up) ++/** ++ * kbase_event_coalesce - Move pending events to the main event list ++ * @kctx: Context pointer ++ * ++ * kctx->event_list and kctx->event_coalesce_count must be protected ++ * by a lock unless this is the last thread using them ++ * (and we're about to terminate the lock). ++ * ++ * Return: The number of pending events moved to the main event list ++ */ ++static int kbase_event_coalesce(struct kbase_context *kctx) +{ -+ u32 domain_bit; -+ u32 notify_mask = power_up_mask; -+ -+ MALI_DEBUG_ASSERT(0 != power_up_mask); -+ MALI_DEBUG_ASSERT_POINTER(groups_up); -+ MALI_DEBUG_ASSERT_POINTER(num_groups_up); -+ MALI_DEBUG_ASSERT(0 == *num_groups_up); -+ MALI_DEBUG_ASSERT_POINTER(l2_up); -+ MALI_DEBUG_ASSERT_POINTER(num_l2_up); -+ MALI_DEBUG_ASSERT(0 == *num_l2_up); -+ -+ MALI_DEBUG_ASSERT_LOCK_HELD(pm_lock_exec); -+ MALI_DEBUG_ASSERT_LOCK_HELD(pm_lock_state); -+ -+ MALI_DEBUG_PRINT(5, -+ ("PM update: Powering up domains: . [%s]\n", -+ mali_pm_mask_to_string(power_up_mask))); -+ -+ pd_mask_current |= power_up_mask; -+ -+ domain_bit = _mali_osk_fls(notify_mask); -+ while (0 != domain_bit) { -+ u32 domain_id = domain_bit - 1; -+ struct mali_pm_domain *domain = -+ mali_pm_domain_get_from_index( -+ domain_id); -+ struct mali_l2_cache_core *l2_cache; -+ struct mali_l2_cache_core *l2_cache_tmp; -+ struct mali_group *group; -+ struct mali_group *group_tmp; ++ const int event_count = kctx->event_coalesce_count; + -+ /* Mark domain as powered up */ -+ mali_pm_domain_set_power_on(domain, MALI_TRUE); ++ /* Join the list of pending events onto the tail of the main list ++ and reset it */ ++ list_splice_tail_init(&kctx->event_coalesce_list, &kctx->event_list); ++ kctx->event_coalesce_count = 0; + -+ /* -+ * Make a note of the L2 and/or group(s) to notify -+ * (need to release the PM state lock before doing so) -+ */ ++ /* Return the number of events moved */ ++ return event_count; ++} + -+ _MALI_OSK_LIST_FOREACHENTRY(l2_cache, -+ l2_cache_tmp, -+ mali_pm_domain_get_l2_cache_list( -+ domain), -+ struct mali_l2_cache_core, -+ pm_domain_list) { -+ MALI_DEBUG_ASSERT(*num_l2_up < -+ MALI_MAX_NUMBER_OF_L2_CACHE_CORES); -+ l2_up[*num_l2_up] = l2_cache; -+ (*num_l2_up)++; ++void kbase_event_post(struct kbase_context *ctx, struct kbase_jd_atom *atom) ++{ ++ if (atom->core_req & BASE_JD_REQ_EVENT_ONLY_ON_FAILURE) { ++ if (atom->event_code == BASE_JD_EVENT_DONE) { ++ /* Don't report the event */ ++ kbase_event_process_noreport(ctx, atom); ++ return; + } ++ } + -+ _MALI_OSK_LIST_FOREACHENTRY(group, -+ group_tmp, -+ mali_pm_domain_get_group_list(domain), -+ struct mali_group, -+ pm_domain_list) { -+ MALI_DEBUG_ASSERT(*num_groups_up < -+ MALI_MAX_NUMBER_OF_GROUPS); -+ groups_up[*num_groups_up] = group; ++ if (atom->core_req & BASEP_JD_REQ_EVENT_NEVER) { ++ /* Don't report the event */ ++ kbase_event_process_noreport(ctx, atom); ++ return; ++ } ++ KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(atom, TL_ATOM_STATE_POSTED); ++ if (atom->core_req & BASE_JD_REQ_EVENT_COALESCE) { ++ /* Don't report the event until other event(s) have completed */ ++ mutex_lock(&ctx->event_mutex); ++ list_add_tail(&atom->dep_item[0], &ctx->event_coalesce_list); ++ ++ctx->event_coalesce_count; ++ mutex_unlock(&ctx->event_mutex); ++ } else { ++ /* Report the event and any pending events now */ ++ int event_count = 1; + -+ (*num_groups_up)++; -+ } ++ mutex_lock(&ctx->event_mutex); ++ event_count += kbase_event_coalesce(ctx); ++ list_add_tail(&atom->dep_item[0], &ctx->event_list); ++ atomic_add(event_count, &ctx->event_count); ++ mutex_unlock(&ctx->event_mutex); + -+ /* Remove current bit and find next */ -+ notify_mask &= ~(1 << (domain_id)); -+ domain_bit = _mali_osk_fls(notify_mask); ++ kbase_event_wakeup(ctx); + } +} -+static void mali_pm_domain_power_down(u32 power_down_mask, -+ struct mali_group *groups_down[MALI_MAX_NUMBER_OF_GROUPS], -+ u32 *num_groups_down, -+ struct mali_l2_cache_core *l2_down[MALI_MAX_NUMBER_OF_L2_CACHE_CORES], -+ u32 *num_l2_down) ++KBASE_EXPORT_TEST_API(kbase_event_post); ++ ++void kbase_event_close(struct kbase_context *kctx) +{ -+ u32 domain_bit; -+ u32 notify_mask = power_down_mask; ++ mutex_lock(&kctx->event_mutex); ++ atomic_set(&kctx->event_closed, true); ++ mutex_unlock(&kctx->event_mutex); ++ kbase_event_wakeup(kctx); ++} + -+ MALI_DEBUG_ASSERT(0 != power_down_mask); -+ MALI_DEBUG_ASSERT_POINTER(groups_down); -+ MALI_DEBUG_ASSERT_POINTER(num_groups_down); -+ MALI_DEBUG_ASSERT(0 == *num_groups_down); -+ MALI_DEBUG_ASSERT_POINTER(l2_down); -+ MALI_DEBUG_ASSERT_POINTER(num_l2_down); -+ MALI_DEBUG_ASSERT(0 == *num_l2_down); ++int kbase_event_init(struct kbase_context *kctx) ++{ ++ KBASE_DEBUG_ASSERT(kctx); + -+ MALI_DEBUG_ASSERT_LOCK_HELD(pm_lock_exec); -+ MALI_DEBUG_ASSERT_LOCK_HELD(pm_lock_state); ++ INIT_LIST_HEAD(&kctx->event_list); ++ INIT_LIST_HEAD(&kctx->event_coalesce_list); ++ mutex_init(&kctx->event_mutex); ++ atomic_set(&kctx->event_count, 0); ++ kctx->event_coalesce_count = 0; ++ atomic_set(&kctx->event_closed, false); ++ kctx->event_workq = alloc_workqueue("kbase_event", WQ_MEM_RECLAIM, 1); + -+ MALI_DEBUG_PRINT(5, -+ ("PM update: Powering down domains: [%s]\n", -+ mali_pm_mask_to_string(power_down_mask))); ++ if (NULL == kctx->event_workq) ++ return -EINVAL; + -+ pd_mask_current &= ~power_down_mask; ++ return 0; ++} + -+ domain_bit = _mali_osk_fls(notify_mask); -+ while (0 != domain_bit) { -+ u32 domain_id = domain_bit - 1; -+ struct mali_pm_domain *domain = -+ mali_pm_domain_get_from_index(domain_id); -+ struct mali_l2_cache_core *l2_cache; -+ struct mali_l2_cache_core *l2_cache_tmp; -+ struct mali_group *group; -+ struct mali_group *group_tmp; ++KBASE_EXPORT_TEST_API(kbase_event_init); + -+ /* Mark domain as powered down */ -+ mali_pm_domain_set_power_on(domain, MALI_FALSE); ++void kbase_event_cleanup(struct kbase_context *kctx) ++{ ++ int event_count; + -+ /* -+ * Make a note of the L2s and/or groups to notify -+ * (need to release the PM state lock before doing so) -+ */ ++ KBASE_DEBUG_ASSERT(kctx); ++ KBASE_DEBUG_ASSERT(kctx->event_workq); + -+ _MALI_OSK_LIST_FOREACHENTRY(l2_cache, -+ l2_cache_tmp, -+ mali_pm_domain_get_l2_cache_list(domain), -+ struct mali_l2_cache_core, -+ pm_domain_list) { -+ MALI_DEBUG_ASSERT(*num_l2_down < -+ MALI_MAX_NUMBER_OF_L2_CACHE_CORES); -+ l2_down[*num_l2_down] = l2_cache; -+ (*num_l2_down)++; -+ } ++ flush_workqueue(kctx->event_workq); ++ destroy_workqueue(kctx->event_workq); + -+ _MALI_OSK_LIST_FOREACHENTRY(group, -+ group_tmp, -+ mali_pm_domain_get_group_list(domain), -+ struct mali_group, -+ pm_domain_list) { -+ MALI_DEBUG_ASSERT(*num_groups_down < -+ MALI_MAX_NUMBER_OF_GROUPS); -+ groups_down[*num_groups_down] = group; -+ (*num_groups_down)++; -+ } ++ /* We use kbase_event_dequeue to remove the remaining events as that ++ * deals with all the cleanup needed for the atoms. ++ * ++ * Note: use of kctx->event_list without a lock is safe because this must be the last ++ * thread using it (because we're about to terminate the lock) ++ */ ++ event_count = kbase_event_coalesce(kctx); ++ atomic_add(event_count, &kctx->event_count); + -+ /* Remove current bit and find next */ -+ notify_mask &= ~(1 << (domain_id)); -+ domain_bit = _mali_osk_fls(notify_mask); ++ while (!list_empty(&kctx->event_list)) { ++ struct base_jd_event_v2 event; ++ ++ kbase_event_dequeue(kctx, &event); + } +} + ++KBASE_EXPORT_TEST_API(kbase_event_cleanup); +diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence.c b/drivers/gpu/arm/midgard/mali_kbase_fence.c +new file mode 100755 +index 000000000..3bcfb38c3 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_fence.c +@@ -0,0 +1,200 @@ +/* -+ * Execute pending power domain changes -+ * pm_lock_exec lock must be taken by caller. ++ * ++ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ -+static void mali_pm_update_sync_internal(void) -+{ -+ /* -+ * This should only be called in non-atomic context -+ * (normally as deferred work) -+ * -+ * Look at the pending power domain changes, and execute these. -+ * Make sure group and schedulers are notified about changes. -+ */ -+ -+ struct mali_pmu_core *pmu = mali_pmu_get_global_pmu_core(); + -+ u32 power_down_mask; -+ u32 power_up_mask; + -+ MALI_DEBUG_ASSERT_LOCK_HELD(pm_lock_exec); + -+#if defined(DEBUG) -+ ++num_pm_updates; -+#endif ++#include ++#include ++#include ++#include ++#include ++#include + -+ /* Hold PM state lock while we look at (and obey) the wanted state */ -+ mali_pm_state_lock(); ++/* Spin lock protecting all Mali fences as fence->lock. */ ++static DEFINE_SPINLOCK(kbase_fence_lock); + -+ MALI_DEBUG_PRINT(5, ("PM update pre: Wanted domain mask: .. [%s]\n", -+ mali_pm_mask_to_string(pd_mask_wanted))); -+ MALI_DEBUG_PRINT(5, ("PM update pre: Current domain mask: . [%s]\n", -+ mali_pm_mask_to_string(pd_mask_current))); -+ MALI_DEBUG_PRINT(5, ("PM update pre: Current PMU mask: .... [%s]\n", -+ mali_pm_mask_to_string(pmu_mask_current))); -+ MALI_DEBUG_PRINT(5, ("PM update pre: Group power stats: ... <%s>\n", -+ mali_pm_group_stats_to_string())); ++static const char * ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++kbase_fence_get_driver_name(struct fence *fence) ++#else ++kbase_fence_get_driver_name(struct dma_fence *fence) ++#endif ++{ ++ return kbase_drv_name; ++} + -+ /* Figure out which cores we need to power on */ -+ power_up_mask = pd_mask_wanted & -+ (pd_mask_wanted ^ pd_mask_current); ++static const char * ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++kbase_fence_get_timeline_name(struct fence *fence) ++#else ++kbase_fence_get_timeline_name(struct dma_fence *fence) ++#endif ++{ ++ return kbase_timeline_name; ++} + -+ if (0 != power_up_mask) { -+ u32 power_up_mask_pmu; -+ struct mali_group *groups_up[MALI_MAX_NUMBER_OF_GROUPS]; -+ u32 num_groups_up = 0; -+ struct mali_l2_cache_core * -+ l2_up[MALI_MAX_NUMBER_OF_L2_CACHE_CORES]; -+ u32 num_l2_up = 0; -+ u32 i; ++static bool ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++kbase_fence_enable_signaling(struct fence *fence) ++#else ++kbase_fence_enable_signaling(struct dma_fence *fence) ++#endif ++{ ++ return true; ++} + -+#if defined(DEBUG) -+ ++num_pm_updates_up; ++static void ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++kbase_fence_fence_value_str(struct fence *fence, char *str, int size) ++#else ++kbase_fence_fence_value_str(struct dma_fence *fence, char *str, int size) ++#endif ++{ ++#if (KERNEL_VERSION(5, 1, 0) > LINUX_VERSION_CODE) ++ snprintf(str, size, "%u", fence->seqno); ++#else ++ snprintf(str, size, "%llu", fence->seqno); +#endif ++} + -+ /* -+ * Make sure dummy/global domain is always included when -+ * powering up, since this is controlled by runtime PM, -+ * and device power is on at this stage. -+ */ -+ power_up_mask |= MALI_PM_DOMAIN_DUMMY_MASK; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++const struct fence_ops kbase_fence_ops = { ++ .wait = fence_default_wait, ++#else ++const struct dma_fence_ops kbase_fence_ops = { ++ .wait = dma_fence_default_wait, ++#endif ++ .get_driver_name = kbase_fence_get_driver_name, ++ .get_timeline_name = kbase_fence_get_timeline_name, ++ .enable_signaling = kbase_fence_enable_signaling, ++ .fence_value_str = kbase_fence_fence_value_str ++}; + -+ /* Power up only real PMU domains */ -+ power_up_mask_pmu = power_up_mask & ~MALI_PM_DOMAIN_DUMMY_MASK; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++struct fence * ++kbase_fence_out_new(struct kbase_jd_atom *katom) ++#else ++struct dma_fence * ++kbase_fence_out_new(struct kbase_jd_atom *katom) ++#endif ++{ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ struct fence *fence; ++#else ++ struct dma_fence *fence; ++#endif + -+ /* But not those that happen to be powered on already */ -+ power_up_mask_pmu &= (power_up_mask ^ pmu_mask_current) & -+ power_up_mask; ++ WARN_ON(katom->dma_fence.fence); + -+ if (0 != power_up_mask_pmu) { -+ MALI_DEBUG_ASSERT(NULL != pmu); -+ pmu_mask_current |= power_up_mask_pmu; -+ mali_pmu_power_up(pmu, power_up_mask_pmu); -+ } ++ fence = kzalloc(sizeof(*fence), GFP_KERNEL); ++ if (!fence) ++ return NULL; + -+ /* -+ * Put the domains themselves in power up state. -+ * We get the groups and L2s to notify in return. -+ */ -+ mali_pm_domain_power_up(power_up_mask, -+ groups_up, &num_groups_up, -+ l2_up, &num_l2_up); ++ dma_fence_init(fence, ++ &kbase_fence_ops, ++ &kbase_fence_lock, ++ katom->dma_fence.context, ++ atomic_inc_return(&katom->dma_fence.seqno)); + -+ /* Need to unlock PM state lock before notifying L2 + groups */ -+ mali_pm_state_unlock(); ++ katom->dma_fence.fence = fence; + -+ /* Notify each L2 cache that we have be powered up */ -+ for (i = 0; i < num_l2_up; i++) { -+ mali_l2_cache_power_up(l2_up[i]); -+ } ++ return fence; ++} + -+ /* -+ * Tell execution module about all the groups we have -+ * powered up. Groups will be notified as a result of this. -+ */ -+ mali_executor_group_power_up(groups_up, num_groups_up); ++bool ++kbase_fence_free_callbacks(struct kbase_jd_atom *katom) ++{ ++ struct kbase_fence_cb *cb, *tmp; ++ bool res = false; + -+ /* Lock state again before checking for power down */ -+ mali_pm_state_lock(); -+ } ++ lockdep_assert_held(&katom->kctx->jctx.lock); + -+ /* Figure out which cores we need to power off */ -+ power_down_mask = pd_mask_current & -+ (pd_mask_wanted ^ pd_mask_current); ++ /* Clean up and free callbacks. */ ++ list_for_each_entry_safe(cb, tmp, &katom->dma_fence.callbacks, node) { ++ bool ret; + -+ /* -+ * Never power down the dummy/global domain here. This is to be done -+ * from a suspend request (since this domain is only physicall powered -+ * down at that point) -+ */ -+ power_down_mask &= ~MALI_PM_DOMAIN_DUMMY_MASK; ++ /* Cancel callbacks that hasn't been called yet. */ ++ ret = dma_fence_remove_callback(cb->fence, &cb->fence_cb); ++ if (ret) { ++ int ret; + -+ if (0 != power_down_mask) { -+ u32 power_down_mask_pmu; -+ struct mali_group *groups_down[MALI_MAX_NUMBER_OF_GROUPS]; -+ u32 num_groups_down = 0; -+ struct mali_l2_cache_core * -+ l2_down[MALI_MAX_NUMBER_OF_L2_CACHE_CORES]; -+ u32 num_l2_down = 0; -+ u32 i; ++ /* Fence had not signaled, clean up after ++ * canceling. ++ */ ++ ret = atomic_dec_return(&katom->dma_fence.dep_count); + -+#if defined(DEBUG) -+ ++num_pm_updates_down; -+#endif ++ if (unlikely(ret == 0)) ++ res = true; ++ } + + /* -+ * Put the domains themselves in power down state. -+ * We get the groups and L2s to notify in return. ++ * Release the reference taken in ++ * kbase_fence_add_callback(). + */ -+ mali_pm_domain_power_down(power_down_mask, -+ groups_down, &num_groups_down, -+ l2_down, &num_l2_down); ++ dma_fence_put(cb->fence); ++ list_del(&cb->node); ++ kfree(cb); ++ } + -+ /* Need to unlock PM state lock before notifying L2 + groups */ -+ mali_pm_state_unlock(); ++ return res; ++} + -+ /* -+ * Tell execution module about all the groups we will be -+ * powering down. Groups will be notified as a result of this. -+ */ -+ if (0 < num_groups_down) { -+ mali_executor_group_power_down(groups_down, num_groups_down); -+ } ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++int ++kbase_fence_add_callback(struct kbase_jd_atom *katom, ++ struct fence *fence, ++ fence_func_t callback) ++#else ++int ++kbase_fence_add_callback(struct kbase_jd_atom *katom, ++ struct dma_fence *fence, ++ dma_fence_func_t callback) ++#endif ++{ ++ int err = 0; ++ struct kbase_fence_cb *kbase_fence_cb; + -+ /* Notify each L2 cache that we will be powering down */ -+ for (i = 0; i < num_l2_down; i++) { -+ mali_l2_cache_power_down(l2_down[i]); -+ } ++ if (!fence) ++ return -EINVAL; + -+ /* -+ * Power down only PMU domains which should not stay on -+ * Some domains might for instance currently be incorrectly -+ * powered up if default domain power state is all on. -+ */ -+ power_down_mask_pmu = pmu_mask_current & (~pd_mask_current); ++ kbase_fence_cb = kmalloc(sizeof(*kbase_fence_cb), GFP_KERNEL); ++ if (!kbase_fence_cb) ++ return -ENOMEM; + -+ if (0 != power_down_mask_pmu) { -+ MALI_DEBUG_ASSERT(NULL != pmu); -+ pmu_mask_current &= ~power_down_mask_pmu; -+ mali_pmu_power_down(pmu, power_down_mask_pmu); ++ kbase_fence_cb->fence = fence; ++ kbase_fence_cb->katom = katom; ++ INIT_LIST_HEAD(&kbase_fence_cb->node); + -+ } ++ err = dma_fence_add_callback(fence, &kbase_fence_cb->fence_cb, ++ callback); ++ if (err == -ENOENT) { ++ /* Fence signaled, clear the error and return */ ++ err = 0; ++ kfree(kbase_fence_cb); ++ } else if (err) { ++ kfree(kbase_fence_cb); + } else { + /* -+ * Power down only PMU domains which should not stay on -+ * Some domains might for instance currently be incorrectly -+ * powered up if default domain power state is all on. ++ * Get reference to fence that will be kept until callback gets ++ * cleaned up in kbase_fence_free_callbacks(). + */ -+ u32 power_down_mask_pmu; -+ -+ /* No need for state lock since we'll only update PMU */ -+ mali_pm_state_unlock(); -+ -+ power_down_mask_pmu = pmu_mask_current & (~pd_mask_current); -+ -+ if (0 != power_down_mask_pmu) { -+ MALI_DEBUG_ASSERT(NULL != pmu); -+ pmu_mask_current &= ~power_down_mask_pmu; -+ mali_pmu_power_down(pmu, power_down_mask_pmu); -+ } ++ dma_fence_get(fence); ++ atomic_inc(&katom->dma_fence.dep_count); ++ /* Add callback to katom's list of callbacks */ ++ list_add(&kbase_fence_cb->node, &katom->dma_fence.callbacks); + } + -+ MALI_DEBUG_PRINT(5, ("PM update post: Current domain mask: . [%s]\n", -+ mali_pm_mask_to_string(pd_mask_current))); -+ MALI_DEBUG_PRINT(5, ("PM update post: Current PMU mask: .... [%s]\n", -+ mali_pm_mask_to_string(pmu_mask_current))); -+ MALI_DEBUG_PRINT(5, ("PM update post: Group power stats: ... <%s>\n", -+ mali_pm_group_stats_to_string())); ++ return err; +} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence.h b/drivers/gpu/arm/midgard/mali_kbase_fence.h +new file mode 100755 +index 000000000..639cc2ef4 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_fence.h +@@ -0,0 +1,275 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+static mali_bool mali_pm_common_suspend(void) -+{ -+ mali_pm_state_lock(); -+ -+ if (0 != pd_mask_wanted) { -+ MALI_DEBUG_PRINT(5, ("PM: Aborting suspend operation\n\n\n")); -+ mali_pm_state_unlock(); -+ return MALI_FALSE; -+ } -+ -+ MALI_DEBUG_PRINT(5, ("PM suspend pre: Wanted domain mask: .. [%s]\n", -+ mali_pm_mask_to_string(pd_mask_wanted))); -+ MALI_DEBUG_PRINT(5, ("PM suspend pre: Current domain mask: . [%s]\n", -+ mali_pm_mask_to_string(pd_mask_current))); -+ MALI_DEBUG_PRINT(5, ("PM suspend pre: Current PMU mask: .... [%s]\n", -+ mali_pm_mask_to_string(pmu_mask_current))); -+ MALI_DEBUG_PRINT(5, ("PM suspend pre: Group power stats: ... <%s>\n", -+ mali_pm_group_stats_to_string())); + -+ if (0 != pd_mask_current) { -+ /* -+ * We have still some domains powered on. -+ * It is for instance very normal that at least the -+ * dummy/global domain is marked as powered on at this point. -+ * (because it is physically powered on until this function -+ * returns) -+ */ + -+ struct mali_group *groups_down[MALI_MAX_NUMBER_OF_GROUPS]; -+ u32 num_groups_down = 0; -+ struct mali_l2_cache_core * -+ l2_down[MALI_MAX_NUMBER_OF_L2_CACHE_CORES]; -+ u32 num_l2_down = 0; -+ u32 i; ++#ifndef _KBASE_FENCE_H_ ++#define _KBASE_FENCE_H_ + -+ /* -+ * Put the domains themselves in power down state. -+ * We get the groups and L2s to notify in return. -+ */ -+ mali_pm_domain_power_down(pd_mask_current, -+ groups_down, -+ &num_groups_down, -+ l2_down, -+ &num_l2_down); ++/* ++ * mali_kbase_fence.[hc] has common fence code used by both ++ * - CONFIG_MALI_DMA_FENCE - implicit DMA fences ++ * - CONFIG_SYNC_FILE - explicit fences beginning with 4.9 kernel ++ */ + -+ MALI_DEBUG_ASSERT(0 == pd_mask_current); -+ MALI_DEBUG_ASSERT(MALI_TRUE == mali_pm_domain_all_unused()); ++#if defined(CONFIG_MALI_DMA_FENCE) || defined(CONFIG_SYNC_FILE) + -+ /* Need to unlock PM state lock before notifying L2 + groups */ -+ mali_pm_state_unlock(); ++#include ++#include "mali_kbase_fence_defs.h" ++#include "mali_kbase.h" + -+ /* -+ * Tell execution module about all the groups we will be -+ * powering down. Groups will be notified as a result of this. -+ */ -+ if (0 < num_groups_down) { -+ mali_executor_group_power_down(groups_down, num_groups_down); -+ } ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++extern const struct fence_ops kbase_fence_ops; ++#else ++extern const struct dma_fence_ops kbase_fence_ops; ++#endif + -+ /* Notify each L2 cache that we will be powering down */ -+ for (i = 0; i < num_l2_down; i++) { -+ mali_l2_cache_power_down(l2_down[i]); -+ } ++/** ++* struct kbase_fence_cb - Mali dma-fence callback data struct ++* @fence_cb: Callback function ++* @katom: Pointer to katom that is waiting on this callback ++* @fence: Pointer to the fence object on which this callback is waiting ++* @node: List head for linking this callback to the katom ++*/ ++struct kbase_fence_cb { ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ struct fence_cb fence_cb; ++ struct fence *fence; ++#else ++ struct dma_fence_cb fence_cb; ++ struct dma_fence *fence; ++#endif ++ struct kbase_jd_atom *katom; ++ struct list_head node; ++}; + -+ pmu_mask_current = 0; -+ } else { -+ MALI_DEBUG_ASSERT(0 == pmu_mask_current); ++/** ++ * kbase_fence_out_new() - Creates a new output fence and puts it on the atom ++ * @katom: Atom to create an output fence for ++ * ++ * return: A new fence object on success, NULL on failure. ++ */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++struct fence *kbase_fence_out_new(struct kbase_jd_atom *katom); ++#else ++struct dma_fence *kbase_fence_out_new(struct kbase_jd_atom *katom); ++#endif + -+ MALI_DEBUG_ASSERT(MALI_TRUE == mali_pm_domain_all_unused()); ++#if defined(CONFIG_SYNC_FILE) ++/** ++ * kbase_fence_fence_in_set() - Assign input fence to atom ++ * @katom: Atom to assign input fence to ++ * @fence: Input fence to assign to atom ++ * ++ * This function will take ownership of one fence reference! ++ */ ++#define kbase_fence_fence_in_set(katom, fence) \ ++ do { \ ++ WARN_ON((katom)->dma_fence.fence_in); \ ++ (katom)->dma_fence.fence_in = fence; \ ++ } while (0) ++#endif + -+ mali_pm_state_unlock(); ++/** ++ * kbase_fence_out_remove() - Removes the output fence from atom ++ * @katom: Atom to remove output fence for ++ * ++ * This will also release the reference to this fence which the atom keeps ++ */ ++static inline void kbase_fence_out_remove(struct kbase_jd_atom *katom) ++{ ++ if (katom->dma_fence.fence) { ++ dma_fence_put(katom->dma_fence.fence); ++ katom->dma_fence.fence = NULL; + } ++} + -+ MALI_DEBUG_PRINT(5, ("PM suspend post: Current domain mask: [%s]\n", -+ mali_pm_mask_to_string(pd_mask_current))); -+ MALI_DEBUG_PRINT(5, ("PM suspend post: Current PMU mask: ... [%s]\n", -+ mali_pm_mask_to_string(pmu_mask_current))); -+ MALI_DEBUG_PRINT(5, ("PM suspend post: Group power stats: .. <%s>\n", -+ mali_pm_group_stats_to_string())); -+ -+ return MALI_TRUE; ++#if defined(CONFIG_SYNC_FILE) ++/** ++ * kbase_fence_out_remove() - Removes the input fence from atom ++ * @katom: Atom to remove input fence for ++ * ++ * This will also release the reference to this fence which the atom keeps ++ */ ++static inline void kbase_fence_in_remove(struct kbase_jd_atom *katom) ++{ ++ if (katom->dma_fence.fence_in) { ++ dma_fence_put(katom->dma_fence.fence_in); ++ katom->dma_fence.fence_in = NULL; ++ } +} ++#endif + -+static void mali_pm_update_work(void *data) ++/** ++ * kbase_fence_out_is_ours() - Check if atom has a valid fence created by us ++ * @katom: Atom to check output fence for ++ * ++ * Return: true if fence exists and is valid, otherwise false ++ */ ++static inline bool kbase_fence_out_is_ours(struct kbase_jd_atom *katom) +{ -+ MALI_IGNORE(data); -+ mali_pm_update_sync(); ++ return katom->dma_fence.fence && ++ katom->dma_fence.fence->ops == &kbase_fence_ops; +} + -+static _mali_osk_errcode_t mali_pm_create_pm_domains(void) ++/** ++ * kbase_fence_out_signal() - Signal output fence of atom ++ * @katom: Atom to signal output fence for ++ * @status: Status to signal with (0 for success, < 0 for error) ++ * ++ * Return: 0 on success, < 0 on error ++ */ ++static inline int kbase_fence_out_signal(struct kbase_jd_atom *katom, ++ int status) +{ -+ int i; ++ if (status) { ++#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE && \ ++ KERNEL_VERSION(4, 9, 68) <= LINUX_VERSION_CODE) ++ fence_set_error(katom->dma_fence.fence, status); ++#elif (KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE) ++ dma_fence_set_error(katom->dma_fence.fence, status); ++#else ++ katom->dma_fence.fence->status = status; ++#endif ++ } ++ return dma_fence_signal(katom->dma_fence.fence); ++} + -+ /* Create all domains (including dummy domain) */ -+ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { -+ if (0x0 == domain_config[i]) continue; ++/** ++ * kbase_fence_add_callback() - Add callback on @fence to block @katom ++ * @katom: Pointer to katom that will be blocked by @fence ++ * @fence: Pointer to fence on which to set up the callback ++ * @callback: Pointer to function to be called when fence is signaled ++ * ++ * Caller needs to hold a reference to @fence when calling this function, and ++ * the caller is responsible for releasing that reference. An additional ++ * reference to @fence will be taken when the callback was successfully set up ++ * and @fence needs to be kept valid until the callback has been called and ++ * cleanup have been done. ++ * ++ * Return: 0 on success: fence was either already signaled, or callback was ++ * set up. Negative error code is returned on error. ++ */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++int kbase_fence_add_callback(struct kbase_jd_atom *katom, ++ struct fence *fence, ++ fence_func_t callback); ++#else ++int kbase_fence_add_callback(struct kbase_jd_atom *katom, ++ struct dma_fence *fence, ++ dma_fence_func_t callback); ++#endif + -+ if (NULL == mali_pm_domain_create(domain_config[i])) { -+ return _MALI_OSK_ERR_NOMEM; -+ } -+ } ++/** ++ * kbase_fence_dep_count_set() - Set dep_count value on atom to specified value ++ * @katom: Atom to set dep_count for ++ * @val: value to set dep_count to ++ * ++ * The dep_count is available to the users of this module so that they can ++ * synchronize completion of the wait with cancellation and adding of more ++ * callbacks. For instance, a user could do the following: ++ * ++ * dep_count set to 1 ++ * callback #1 added, dep_count is increased to 2 ++ * callback #1 happens, dep_count decremented to 1 ++ * since dep_count > 0, no completion is done ++ * callback #2 is added, dep_count is increased to 2 ++ * dep_count decremented to 1 ++ * callback #2 happens, dep_count decremented to 0 ++ * since dep_count now is zero, completion executes ++ * ++ * The dep_count can also be used to make sure that the completion only ++ * executes once. This is typically done by setting dep_count to -1 for the ++ * thread that takes on this responsibility. ++ */ ++static inline void ++kbase_fence_dep_count_set(struct kbase_jd_atom *katom, int val) ++{ ++ atomic_set(&katom->dma_fence.dep_count, val); ++} + -+ return _MALI_OSK_ERR_OK; ++/** ++ * kbase_fence_dep_count_dec_and_test() - Decrements dep_count ++ * @katom: Atom to decrement dep_count for ++ * ++ * See @kbase_fence_dep_count_set for general description about dep_count ++ * ++ * Return: true if value was decremented to zero, otherwise false ++ */ ++static inline bool ++kbase_fence_dep_count_dec_and_test(struct kbase_jd_atom *katom) ++{ ++ return atomic_dec_and_test(&katom->dma_fence.dep_count); +} + -+static void mali_pm_set_default_pm_domain_config(void) ++/** ++ * kbase_fence_dep_count_read() - Returns the current dep_count value ++ * @katom: Pointer to katom ++ * ++ * See @kbase_fence_dep_count_set for general description about dep_count ++ * ++ * Return: The current dep_count value ++ */ ++static inline int kbase_fence_dep_count_read(struct kbase_jd_atom *katom) +{ -+ MALI_DEBUG_ASSERT(0 != _mali_osk_resource_base_address()); ++ return atomic_read(&katom->dma_fence.dep_count); ++} + -+ /* GP core */ -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( -+ MALI_OFFSET_GP, NULL)) { -+ domain_config[MALI_DOMAIN_INDEX_GP] = 0x01; -+ } ++/** ++ * kbase_fence_free_callbacks() - Free dma-fence callbacks on a katom ++ * @katom: Pointer to katom ++ * ++ * This function will free all fence callbacks on the katom's list of ++ * callbacks. Callbacks that have not yet been called, because their fence ++ * hasn't yet signaled, will first be removed from the fence. ++ * ++ * Locking: katom->dma_fence.callbacks list assumes jctx.lock is held. ++ * ++ * Return: true if dep_count reached 0, otherwise false. ++ */ ++bool kbase_fence_free_callbacks(struct kbase_jd_atom *katom); + -+ /* PP0 - PP3 core */ -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( -+ MALI_OFFSET_PP0, NULL)) { -+ if (mali_is_mali400()) { -+ domain_config[MALI_DOMAIN_INDEX_PP0] = 0x01 << 2; -+ } else if (mali_is_mali450()) { -+ domain_config[MALI_DOMAIN_INDEX_PP0] = 0x01 << 1; -+ } else if (mali_is_mali470()) { -+ domain_config[MALI_DOMAIN_INDEX_PP0] = 0x01 << 0; -+ } -+ } ++#if defined(CONFIG_SYNC_FILE) ++/** ++ * kbase_fence_in_get() - Retrieve input fence for atom. ++ * @katom: Atom to get input fence from ++ * ++ * A ref will be taken for the fence, so use @kbase_fence_put() to release it ++ * ++ * Return: The fence, or NULL if there is no input fence for atom ++ */ ++#define kbase_fence_in_get(katom) dma_fence_get((katom)->dma_fence.fence_in) ++#endif + -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( -+ MALI_OFFSET_PP1, NULL)) { -+ if (mali_is_mali400()) { -+ domain_config[MALI_DOMAIN_INDEX_PP1] = 0x01 << 3; -+ } else if (mali_is_mali450()) { -+ domain_config[MALI_DOMAIN_INDEX_PP1] = 0x01 << 2; -+ } else if (mali_is_mali470()) { -+ domain_config[MALI_DOMAIN_INDEX_PP1] = 0x01 << 1; -+ } -+ } ++/** ++ * kbase_fence_out_get() - Retrieve output fence for atom. ++ * @katom: Atom to get output fence from ++ * ++ * A ref will be taken for the fence, so use @kbase_fence_put() to release it ++ * ++ * Return: The fence, or NULL if there is no output fence for atom ++ */ ++#define kbase_fence_out_get(katom) dma_fence_get((katom)->dma_fence.fence) + -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( -+ MALI_OFFSET_PP2, NULL)) { -+ if (mali_is_mali400()) { -+ domain_config[MALI_DOMAIN_INDEX_PP2] = 0x01 << 4; -+ } else if (mali_is_mali450()) { -+ domain_config[MALI_DOMAIN_INDEX_PP2] = 0x01 << 2; -+ } else if (mali_is_mali470()) { -+ domain_config[MALI_DOMAIN_INDEX_PP2] = 0x01 << 1; -+ } -+ } ++/** ++ * kbase_fence_put() - Releases a reference to a fence ++ * @fence: Fence to release reference for. ++ */ ++#define kbase_fence_put(fence) dma_fence_put(fence) + -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( -+ MALI_OFFSET_PP3, NULL)) { -+ if (mali_is_mali400()) { -+ domain_config[MALI_DOMAIN_INDEX_PP3] = 0x01 << 5; -+ } else if (mali_is_mali450()) { -+ domain_config[MALI_DOMAIN_INDEX_PP3] = 0x01 << 2; -+ } else if (mali_is_mali470()) { -+ domain_config[MALI_DOMAIN_INDEX_PP3] = 0x01 << 1; -+ } -+ } + -+ /* PP4 - PP7 */ -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( -+ MALI_OFFSET_PP4, NULL)) { -+ domain_config[MALI_DOMAIN_INDEX_PP4] = 0x01 << 3; -+ } ++#endif /* CONFIG_MALI_DMA_FENCE || defined(CONFIG_SYNC_FILE */ + -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( -+ MALI_OFFSET_PP5, NULL)) { -+ domain_config[MALI_DOMAIN_INDEX_PP5] = 0x01 << 3; -+ } ++#endif /* _KBASE_FENCE_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h b/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h +new file mode 100755 +index 000000000..fa2c6dfe9 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h +@@ -0,0 +1,51 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( -+ MALI_OFFSET_PP6, NULL)) { -+ domain_config[MALI_DOMAIN_INDEX_PP6] = 0x01 << 3; -+ } + -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( -+ MALI_OFFSET_PP7, NULL)) { -+ domain_config[MALI_DOMAIN_INDEX_PP7] = 0x01 << 3; -+ } + -+ /* L2gp/L2PP0/L2PP4 */ -+ if (mali_is_mali400()) { -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( -+ MALI400_OFFSET_L2_CACHE0, NULL)) { -+ domain_config[MALI_DOMAIN_INDEX_L20] = 0x01 << 1; -+ } -+ } else if (mali_is_mali450()) { -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( -+ MALI450_OFFSET_L2_CACHE0, NULL)) { -+ domain_config[MALI_DOMAIN_INDEX_L20] = 0x01 << 0; -+ } ++#ifndef _KBASE_FENCE_DEFS_H_ ++#define _KBASE_FENCE_DEFS_H_ + -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( -+ MALI450_OFFSET_L2_CACHE1, NULL)) { -+ domain_config[MALI_DOMAIN_INDEX_L21] = 0x01 << 1; -+ } ++/* ++ * There was a big rename in the 4.10 kernel (fence* -> dma_fence*) ++ * This file hides the compatibility issues with this for the rest the driver ++ */ + -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( -+ MALI450_OFFSET_L2_CACHE2, NULL)) { -+ domain_config[MALI_DOMAIN_INDEX_L22] = 0x01 << 3; -+ } -+ } else if (mali_is_mali470()) { -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find( -+ MALI470_OFFSET_L2_CACHE1, NULL)) { -+ domain_config[MALI_DOMAIN_INDEX_L21] = 0x01 << 0; -+ } -+ } -+} ++#if defined(CONFIG_MALI_DMA_FENCE) || defined(CONFIG_SYNC_FILE) + -+static u32 mali_pm_get_registered_cores_mask(void) -+{ -+ int i = 0; -+ u32 mask = 0; ++#include + -+ for (i = 0; i < MALI_DOMAIN_INDEX_DUMMY; i++) { -+ mask |= domain_config[i]; -+ } ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) + -+ return mask; -+} ++#include + -+static void mali_pm_set_pmu_domain_config(void) -+{ -+ int i = 0; ++#define dma_fence_context_alloc(a) fence_context_alloc(a) ++#define dma_fence_init(a, b, c, d, e) fence_init(a, b, c, d, e) ++#define dma_fence_get(a) fence_get(a) ++#define dma_fence_put(a) fence_put(a) ++#define dma_fence_signal(a) fence_signal(a) ++#define dma_fence_is_signaled(a) fence_is_signaled(a) ++#define dma_fence_add_callback(a, b, c) fence_add_callback(a, b, c) ++#define dma_fence_remove_callback(a, b) fence_remove_callback(a, b) + -+ _mali_osk_device_data_pmu_config_get(domain_config, MALI_MAX_NUMBER_OF_DOMAINS - 1); ++#else + -+ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS - 1; i++) { -+ if (0 != domain_config[i]) { -+ MALI_DEBUG_PRINT(2, ("Using customer pmu config:\n")); -+ break; -+ } -+ } ++#include + -+ if (MALI_MAX_NUMBER_OF_DOMAINS - 1 == i) { -+ MALI_DEBUG_PRINT(2, ("Using hw detect pmu config:\n")); -+ mali_pm_set_default_pm_domain_config(); -+ } ++#endif /* < 4.10.0 */ + -+ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS - 1; i++) { -+ if (domain_config[i]) { -+ MALI_DEBUG_PRINT(2, ("domain_config[%d] = 0x%x \n", i, domain_config[i])); -+ } -+ } -+ /* Can't override dummy domain mask */ -+ domain_config[MALI_DOMAIN_INDEX_DUMMY] = -+ 1 << MALI_DOMAIN_INDEX_DUMMY; -+} ++#endif /* CONFIG_MALI_DMA_FENCE || CONFIG_SYNC_FILE */ + -+#if defined(DEBUG) -+const char *mali_pm_mask_to_string(u32 mask) -+{ -+ static char bit_str[MALI_MAX_NUMBER_OF_DOMAINS + 1]; -+ int bit; -+ int str_pos = 0; ++#endif /* _KBASE_FENCE_DEFS_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator.h b/drivers/gpu/arm/midgard/mali_kbase_gator.h +new file mode 100755 +index 000000000..ce65b5562 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_gator.h +@@ -0,0 +1,45 @@ ++/* ++ * ++ * (C) COPYRIGHT 2011-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ /* Must be protected by lock since we use shared string buffer */ -+ if (NULL != pm_lock_exec) { -+ MALI_DEBUG_ASSERT_LOCK_HELD(pm_lock_exec); -+ } + -+ for (bit = MALI_MAX_NUMBER_OF_DOMAINS - 1; bit >= 0; bit--) { -+ if (mask & (1 << bit)) { -+ bit_str[str_pos] = 'X'; -+ } else { -+ bit_str[str_pos] = '-'; -+ } -+ str_pos++; -+ } + -+ bit_str[MALI_MAX_NUMBER_OF_DOMAINS] = '\0'; ++/* NB taken from gator */ ++/* ++ * List of possible actions to be controlled by DS-5 Streamline. ++ * The following numbers are used by gator to control the frame buffer dumping ++ * and s/w counter reporting. We cannot use the enums in mali_uk_types.h because ++ * they are unknown inside gator. ++ */ ++#ifndef _KBASE_GATOR_H_ ++#define _KBASE_GATOR_H_ + -+ return bit_str; -+} ++#ifdef CONFIG_MALI_GATOR_SUPPORT ++#define GATOR_MAKE_EVENT(type, number) (((type) << 24) | ((number) << 16)) ++#define GATOR_JOB_SLOT_START 1 ++#define GATOR_JOB_SLOT_STOP 2 ++#define GATOR_JOB_SLOT_SOFT_STOPPED 3 + -+const char *mali_pm_group_stats_to_string(void) -+{ -+ static char bit_str[MALI_MAX_NUMBER_OF_GROUPS + 1]; -+ u32 num_groups = mali_group_get_glob_num_groups(); -+ u32 i; ++void kbase_trace_mali_job_slots_event(u32 event, const struct kbase_context *kctx, u8 atom_id); ++void kbase_trace_mali_pm_status(u32 event, u64 value); ++void kbase_trace_mali_pm_power_off(u32 event, u64 value); ++void kbase_trace_mali_pm_power_on(u32 event, u64 value); ++void kbase_trace_mali_page_fault_insert_pages(int event, u32 value); ++void kbase_trace_mali_mmu_as_in_use(int event); ++void kbase_trace_mali_mmu_as_released(int event); ++void kbase_trace_mali_total_alloc_pages_change(long long int event); + -+ /* Must be protected by lock since we use shared string buffer */ -+ if (NULL != pm_lock_exec) { -+ MALI_DEBUG_ASSERT_LOCK_HELD(pm_lock_exec); -+ } ++#endif /* CONFIG_MALI_GATOR_SUPPORT */ + -+ for (i = 0; i < num_groups && i < MALI_MAX_NUMBER_OF_GROUPS; i++) { -+ struct mali_group *group; ++#endif /* _KBASE_GATOR_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_api.c b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c +new file mode 100755 +index 000000000..860e10159 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c +@@ -0,0 +1,334 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ group = mali_group_get_glob_group(i); + -+ if (MALI_TRUE == mali_group_power_is_on(group)) { -+ bit_str[i] = 'X'; -+ } else { -+ bit_str[i] = '-'; -+ } -+ } + -+ bit_str[i] = '\0'; ++#include "mali_kbase.h" ++#include "mali_kbase_hw.h" ++#include "mali_kbase_mem_linux.h" ++#include "mali_kbase_gator_api.h" ++#include "mali_kbase_gator_hwcnt_names.h" + -+ return bit_str; -+} -+#endif ++#define MALI_MAX_CORES_PER_GROUP 4 ++#define MALI_MAX_NUM_BLOCKS_PER_GROUP 8 ++#define MALI_COUNTERS_PER_BLOCK 64 ++#define MALI_BYTES_PER_COUNTER 4 + -+/* -+ * num_pp is the number of PP cores which will be powered on given this mask -+ * cost is the total power cost of cores which will be powered on given this mask -+ */ -+static void mali_pm_stat_from_mask(u32 mask, u32 *num_pp, u32 *cost) ++struct kbase_gator_hwcnt_handles { ++ struct kbase_device *kbdev; ++ struct kbase_vinstr_client *vinstr_cli; ++ void *vinstr_buffer; ++ struct work_struct dump_work; ++ int dump_complete; ++ spinlock_t dump_lock; ++}; ++ ++static void dump_worker(struct work_struct *work); ++ ++const char * const *kbase_gator_hwcnt_init_names(uint32_t *total_counters) +{ -+ u32 i; ++ const char * const *hardware_counters; ++ struct kbase_device *kbdev; ++ uint32_t product_id; ++ uint32_t count; + -+ /* loop through all cores */ -+ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { -+ if (!(domain_config[i] & mask)) { -+ continue; -+ } ++ if (!total_counters) ++ return NULL; + -+ switch (i) { -+ case MALI_DOMAIN_INDEX_GP: -+ *cost += MALI_GP_COST; ++ /* Get the first device - it doesn't matter in this case */ ++ kbdev = kbase_find_device(-1); ++ if (!kbdev) ++ return NULL; ++ ++ product_id = kbdev->gpu_props.props.core_props.product_id; + ++ if (GPU_ID_IS_NEW_FORMAT(product_id)) { ++ switch (GPU_ID2_MODEL_MATCH_VALUE(product_id)) { ++ case GPU_ID2_PRODUCT_TMIX: ++ hardware_counters = hardware_counters_mali_tMIx; ++ count = ARRAY_SIZE(hardware_counters_mali_tMIx); + break; -+ case MALI_DOMAIN_INDEX_PP0: /* Fall through */ -+ case MALI_DOMAIN_INDEX_PP1: /* Fall through */ -+ case MALI_DOMAIN_INDEX_PP2: /* Fall through */ -+ case MALI_DOMAIN_INDEX_PP3: -+ if (mali_is_mali400()) { -+ if ((domain_config[MALI_DOMAIN_INDEX_L20] & mask) -+ || (domain_config[MALI_DOMAIN_INDEX_DUMMY] -+ == domain_config[MALI_DOMAIN_INDEX_L20])) { -+ *num_pp += 1; -+ } -+ } else { -+ if ((domain_config[MALI_DOMAIN_INDEX_L21] & mask) -+ || (domain_config[MALI_DOMAIN_INDEX_DUMMY] -+ == domain_config[MALI_DOMAIN_INDEX_L21])) { -+ *num_pp += 1; -+ } -+ } -+ -+ *cost += MALI_PP_COST; ++ case GPU_ID2_PRODUCT_THEX: ++ hardware_counters = hardware_counters_mali_tHEx; ++ count = ARRAY_SIZE(hardware_counters_mali_tHEx); + break; -+ case MALI_DOMAIN_INDEX_PP4: /* Fall through */ -+ case MALI_DOMAIN_INDEX_PP5: /* Fall through */ -+ case MALI_DOMAIN_INDEX_PP6: /* Fall through */ -+ case MALI_DOMAIN_INDEX_PP7: -+ MALI_DEBUG_ASSERT(mali_is_mali450()); -+ -+ if ((domain_config[MALI_DOMAIN_INDEX_L22] & mask) -+ || (domain_config[MALI_DOMAIN_INDEX_DUMMY] -+ == domain_config[MALI_DOMAIN_INDEX_L22])) { -+ *num_pp += 1; -+ } -+ -+ *cost += MALI_PP_COST; ++ case GPU_ID2_PRODUCT_TSIX: ++ hardware_counters = hardware_counters_mali_tSIx; ++ count = ARRAY_SIZE(hardware_counters_mali_tSIx); + break; -+ case MALI_DOMAIN_INDEX_L20: /* Fall through */ -+ case MALI_DOMAIN_INDEX_L21: /* Fall through */ -+ case MALI_DOMAIN_INDEX_L22: -+ *cost += MALI_L2_COST; -+ ++ default: ++ hardware_counters = NULL; ++ count = 0; ++ dev_err(kbdev->dev, "Unrecognized product ID: %u\n", ++ product_id); + break; + } -+ } -+} -+ -+void mali_pm_power_cost_setup(void) -+{ -+ /* -+ * Two parallel arrays which store the best domain mask and its cost -+ * The index is the number of PP cores, E.g. Index 0 is for 1 PP option, -+ * might have mask 0x2 and with cost of 1, lower cost is better -+ */ -+ u32 best_mask[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS] = { 0 }; -+ u32 best_cost[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS] = { 0 }; -+ /* Array cores_in_domain is used to store the total pp cores in each pm domain. */ -+ u32 cores_in_domain[MALI_MAX_NUMBER_OF_DOMAINS] = { 0 }; -+ /* Domain_count is used to represent the max domain we have.*/ -+ u32 max_domain_mask = 0; -+ u32 max_domain_id = 0; -+ u32 always_on_pp_cores = 0; -+ -+ u32 num_pp, cost, mask; -+ u32 i, j , k; -+ -+ /* Initialize statistics */ -+ for (i = 0; i < MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS; i++) { -+ best_mask[i] = 0; -+ best_cost[i] = 0xFFFFFFFF; /* lower cost is better */ -+ } -+ -+ for (i = 0; i < MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS + 1; i++) { -+ for (j = 0; j < MALI_MAX_NUMBER_OF_DOMAINS; j++) { -+ mali_pm_domain_power_cost_result[i][j] = 0; -+ } -+ } -+ -+ /* Caculate number of pp cores of a given domain config. */ -+ for (i = MALI_DOMAIN_INDEX_PP0; i <= MALI_DOMAIN_INDEX_PP7; i++) { -+ if (0 < domain_config[i]) { -+ /* Get the max domain mask value used to caculate power cost -+ * and we don't count in always on pp cores. */ -+ if (MALI_PM_DOMAIN_DUMMY_MASK != domain_config[i] -+ && max_domain_mask < domain_config[i]) { -+ max_domain_mask = domain_config[i]; -+ } -+ -+ if (MALI_PM_DOMAIN_DUMMY_MASK == domain_config[i]) { -+ always_on_pp_cores++; -+ } -+ } -+ } -+ max_domain_id = _mali_osk_fls(max_domain_mask); -+ -+ /* -+ * Try all combinations of power domains and check how many PP cores -+ * they have and their power cost. -+ */ -+ for (mask = 0; mask < (1 << max_domain_id); mask++) { -+ num_pp = 0; -+ cost = 0; -+ -+ mali_pm_stat_from_mask(mask, &num_pp, &cost); -+ -+ /* This mask is usable for all MP1 up to num_pp PP cores, check statistics for all */ -+ for (i = 0; i < num_pp; i++) { -+ if (best_cost[i] >= cost) { -+ best_cost[i] = cost; -+ best_mask[i] = mask; -+ } -+ } -+ } -+ -+ /* -+ * If we want to enable x pp cores, if x is less than number of always_on pp cores, -+ * all of pp cores we will enable must be always_on pp cores. -+ */ -+ for (i = 0; i < mali_executor_get_num_cores_total(); i++) { -+ if (i < always_on_pp_cores) { -+ mali_pm_domain_power_cost_result[i + 1][MALI_MAX_NUMBER_OF_DOMAINS - 1] -+ = i + 1; -+ } else { -+ mali_pm_domain_power_cost_result[i + 1][MALI_MAX_NUMBER_OF_DOMAINS - 1] -+ = always_on_pp_cores; -+ } -+ } -+ -+ /* In this loop, variable i represent for the number of non-always on pp cores we want to enabled. */ -+ for (i = 0; i < (mali_executor_get_num_cores_total() - always_on_pp_cores); i++) { -+ if (best_mask[i] == 0) { -+ /* This MP variant is not available */ -+ continue; -+ } -+ -+ for (j = 0; j < MALI_MAX_NUMBER_OF_DOMAINS; j++) { -+ cores_in_domain[j] = 0; -+ } -+ -+ for (j = MALI_DOMAIN_INDEX_PP0; j <= MALI_DOMAIN_INDEX_PP7; j++) { -+ if (0 < domain_config[j] -+ && (MALI_PM_DOMAIN_DUMMY_MASK != domain_config[i])) { -+ cores_in_domain[_mali_osk_fls(domain_config[j]) - 1]++; -+ } -+ } -+ -+ /* In this loop, j represent for the number we have already enabled.*/ -+ for (j = 0; j <= i;) { -+ /* j used to visit all of domain to get the number of pp cores remained in it. */ -+ for (k = 0; k < max_domain_id; k++) { -+ /* If domain k in best_mask[i] is enabled and this domain has extra pp cores, -+ * we know we must pick at least one pp core from this domain. -+ * And then we move to next enabled pm domain. */ -+ if ((best_mask[i] & (0x1 << k)) && (0 < cores_in_domain[k])) { -+ cores_in_domain[k]--; -+ mali_pm_domain_power_cost_result[always_on_pp_cores + i + 1][k]++; -+ j++; -+ if (j > i) { -+ break; -+ } -+ } -+ } -+ } -+ } -+} -+ -+/* -+ * When we are doing core scaling, -+ * this function is called to return the best mask to -+ * achieve the best pp group power cost. -+ */ -+void mali_pm_get_best_power_cost_mask(int num_requested, int *dst) -+{ -+ MALI_DEBUG_ASSERT((mali_executor_get_num_cores_total() >= num_requested) && (0 <= num_requested)); -+ -+ _mali_osk_memcpy(dst, mali_pm_domain_power_cost_result[num_requested], MALI_MAX_NUMBER_OF_DOMAINS * sizeof(int)); -+} -+ -+u32 mali_pm_get_current_mask(void) -+{ -+ return pd_mask_current; -+} -+ -+u32 mali_pm_get_wanted_mask(void) -+{ -+ return pd_mask_wanted; -+} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm.h b/drivers/gpu/arm/mali400/mali/common/mali_pm.h -new file mode 100755 -index 000000000000..dac69958e034 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.h -@@ -0,0 +1,91 @@ -+/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef __MALI_PM_H__ -+#define __MALI_PM_H__ -+ -+#include "mali_osk.h" -+#include "mali_pm_domain.h" -+ -+#define MALI_DOMAIN_INDEX_GP 0 -+#define MALI_DOMAIN_INDEX_PP0 1 -+#define MALI_DOMAIN_INDEX_PP1 2 -+#define MALI_DOMAIN_INDEX_PP2 3 -+#define MALI_DOMAIN_INDEX_PP3 4 -+#define MALI_DOMAIN_INDEX_PP4 5 -+#define MALI_DOMAIN_INDEX_PP5 6 -+#define MALI_DOMAIN_INDEX_PP6 7 -+#define MALI_DOMAIN_INDEX_PP7 8 -+#define MALI_DOMAIN_INDEX_L20 9 -+#define MALI_DOMAIN_INDEX_L21 10 -+#define MALI_DOMAIN_INDEX_L22 11 -+/* -+ * The dummy domain is used when there is no physical power domain -+ * (e.g. no PMU or always on cores) -+ */ -+#define MALI_DOMAIN_INDEX_DUMMY 12 -+#define MALI_MAX_NUMBER_OF_DOMAINS 13 -+ -+/** -+ * Initialize the Mali PM module -+ * -+ * PM module covers Mali PM core, PM domains and Mali PMU -+ */ -+_mali_osk_errcode_t mali_pm_initialize(void); -+ -+/** -+ * Terminate the Mali PM module -+ */ -+void mali_pm_terminate(void); -+ -+void mali_pm_exec_lock(void); -+void mali_pm_exec_unlock(void); -+ -+ -+struct mali_pm_domain *mali_pm_register_l2_cache(u32 domain_index, -+ struct mali_l2_cache_core *l2_cache); -+struct mali_pm_domain *mali_pm_register_group(u32 domain_index, -+ struct mali_group *group); -+ -+mali_bool mali_pm_get_domain_refs(struct mali_pm_domain **domains, -+ struct mali_group **groups, -+ u32 num_domains); -+mali_bool mali_pm_put_domain_refs(struct mali_pm_domain **domains, -+ u32 num_domains); -+ -+void mali_pm_init_begin(void); -+void mali_pm_init_end(void); -+ -+void mali_pm_update_sync(void); -+void mali_pm_update_async(void); -+ -+/* Callback functions for system power management */ -+void mali_pm_os_suspend(mali_bool os_suspend); -+void mali_pm_os_resume(void); -+ -+mali_bool mali_pm_runtime_suspend(void); -+void mali_pm_runtime_resume(void); -+ -+#if MALI_STATE_TRACKING -+u32 mali_pm_dump_state_domain(struct mali_pm_domain *domain, -+ char *buf, u32 size); -+#endif -+ -+void mali_pm_power_cost_setup(void); -+ -+void mali_pm_get_best_power_cost_mask(int num_requested, int *dst); -+ -+#if defined(DEBUG) -+const char *mali_pm_mask_to_string(u32 mask); -+#endif -+ -+u32 mali_pm_get_current_mask(void); -+u32 mali_pm_get_wanted_mask(void); -+#endif /* __MALI_PM_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c -new file mode 100755 -index 000000000000..8290f7d88f6a ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c -@@ -0,0 +1,209 @@ -+/* -+ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_pm_domain.h" -+#include "mali_pmu.h" -+#include "mali_group.h" -+#include "mali_pm.h" -+ -+static struct mali_pm_domain *mali_pm_domains[MALI_MAX_NUMBER_OF_DOMAINS] = -+{ NULL, }; -+ -+void mali_pm_domain_initialize(void) -+{ -+ /* Domains will be initialized/created on demand */ -+} -+ -+void mali_pm_domain_terminate(void) -+{ -+ int i; -+ -+ /* Delete all domains that has been created */ -+ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { -+ mali_pm_domain_delete(mali_pm_domains[i]); -+ mali_pm_domains[i] = NULL; -+ } -+} -+ -+struct mali_pm_domain *mali_pm_domain_create(u32 pmu_mask) -+{ -+ struct mali_pm_domain *domain = NULL; -+ u32 domain_id = 0; -+ -+ domain = mali_pm_domain_get_from_mask(pmu_mask); -+ if (NULL != domain) return domain; -+ -+ MALI_DEBUG_PRINT(2, -+ ("Mali PM domain: Creating Mali PM domain (mask=0x%08X)\n", -+ pmu_mask)); -+ -+ domain = (struct mali_pm_domain *)_mali_osk_malloc( -+ sizeof(struct mali_pm_domain)); -+ if (NULL != domain) { -+ domain->power_is_on = MALI_FALSE; -+ domain->pmu_mask = pmu_mask; -+ domain->use_count = 0; -+ _mali_osk_list_init(&domain->group_list); -+ _mali_osk_list_init(&domain->l2_cache_list); -+ -+ domain_id = _mali_osk_fls(pmu_mask) - 1; -+ /* Verify the domain_id */ -+ MALI_DEBUG_ASSERT(MALI_MAX_NUMBER_OF_DOMAINS > domain_id); -+ /* Verify that pmu_mask only one bit is set */ -+ MALI_DEBUG_ASSERT((1 << domain_id) == pmu_mask); -+ mali_pm_domains[domain_id] = domain; -+ -+ return domain; + } else { -+ MALI_DEBUG_PRINT_ERROR(("Unable to create PM domain\n")); ++ switch (product_id) { ++ /* If we are using a Mali-T60x device */ ++ case GPU_ID_PI_T60X: ++ hardware_counters = hardware_counters_mali_t60x; ++ count = ARRAY_SIZE(hardware_counters_mali_t60x); ++ break; ++ /* If we are using a Mali-T62x device */ ++ case GPU_ID_PI_T62X: ++ hardware_counters = hardware_counters_mali_t62x; ++ count = ARRAY_SIZE(hardware_counters_mali_t62x); ++ break; ++ /* If we are using a Mali-T72x device */ ++ case GPU_ID_PI_T72X: ++ hardware_counters = hardware_counters_mali_t72x; ++ count = ARRAY_SIZE(hardware_counters_mali_t72x); ++ break; ++ /* If we are using a Mali-T76x device */ ++ case GPU_ID_PI_T76X: ++ hardware_counters = hardware_counters_mali_t76x; ++ count = ARRAY_SIZE(hardware_counters_mali_t76x); ++ break; ++ /* If we are using a Mali-T82x device */ ++ case GPU_ID_PI_T82X: ++ hardware_counters = hardware_counters_mali_t82x; ++ count = ARRAY_SIZE(hardware_counters_mali_t82x); ++ break; ++ /* If we are using a Mali-T83x device */ ++ case GPU_ID_PI_T83X: ++ hardware_counters = hardware_counters_mali_t83x; ++ count = ARRAY_SIZE(hardware_counters_mali_t83x); ++ break; ++ /* If we are using a Mali-T86x device */ ++ case GPU_ID_PI_T86X: ++ hardware_counters = hardware_counters_mali_t86x; ++ count = ARRAY_SIZE(hardware_counters_mali_t86x); ++ break; ++ /* If we are using a Mali-T88x device */ ++ case GPU_ID_PI_TFRX: ++ hardware_counters = hardware_counters_mali_t88x; ++ count = ARRAY_SIZE(hardware_counters_mali_t88x); ++ break; ++ default: ++ hardware_counters = NULL; ++ count = 0; ++ dev_err(kbdev->dev, "Unrecognized product ID: %u\n", ++ product_id); ++ break; ++ } + } + -+ return NULL; -+} ++ /* Release the kbdev reference. */ ++ kbase_release_device(kbdev); + -+void mali_pm_domain_delete(struct mali_pm_domain *domain) -+{ -+ if (NULL == domain) { -+ return; -+ } ++ *total_counters = count; + -+ _mali_osk_list_delinit(&domain->group_list); -+ _mali_osk_list_delinit(&domain->l2_cache_list); ++ /* If we return a string array take a reference on the module (or fail). */ ++ if (hardware_counters && !try_module_get(THIS_MODULE)) ++ return NULL; + -+ _mali_osk_free(domain); ++ return hardware_counters; +} ++KBASE_EXPORT_SYMBOL(kbase_gator_hwcnt_init_names); + -+void mali_pm_domain_add_group(struct mali_pm_domain *domain, -+ struct mali_group *group) ++void kbase_gator_hwcnt_term_names(void) +{ -+ MALI_DEBUG_ASSERT_POINTER(domain); -+ MALI_DEBUG_ASSERT_POINTER(group); -+ -+ /* -+ * Use addtail because virtual group is created last and it needs -+ * to be at the end of the list (in order to be activated after -+ * all children. -+ */ -+ _mali_osk_list_addtail(&group->pm_domain_list, &domain->group_list); ++ /* Release the module reference. */ ++ module_put(THIS_MODULE); +} ++KBASE_EXPORT_SYMBOL(kbase_gator_hwcnt_term_names); + -+void mali_pm_domain_add_l2_cache(struct mali_pm_domain *domain, -+ struct mali_l2_cache_core *l2_cache) ++struct kbase_gator_hwcnt_handles *kbase_gator_hwcnt_init(struct kbase_gator_hwcnt_info *in_out_info) +{ -+ MALI_DEBUG_ASSERT_POINTER(domain); -+ MALI_DEBUG_ASSERT_POINTER(l2_cache); -+ _mali_osk_list_add(&l2_cache->pm_domain_list, &domain->l2_cache_list); -+} ++ struct kbase_gator_hwcnt_handles *hand; ++ struct kbase_uk_hwcnt_reader_setup setup; ++ uint32_t dump_size = 0, i = 0; + -+struct mali_pm_domain *mali_pm_domain_get_from_mask(u32 mask) -+{ -+ u32 id = 0; ++ if (!in_out_info) ++ return NULL; + -+ if (0 == mask) { ++ hand = kzalloc(sizeof(*hand), GFP_KERNEL); ++ if (!hand) + return NULL; -+ } + -+ id = _mali_osk_fls(mask) - 1; ++ INIT_WORK(&hand->dump_work, dump_worker); ++ spin_lock_init(&hand->dump_lock); + -+ MALI_DEBUG_ASSERT(MALI_MAX_NUMBER_OF_DOMAINS > id); -+ /* Verify that pmu_mask only one bit is set */ -+ MALI_DEBUG_ASSERT((1 << id) == mask); ++ /* Get the first device */ ++ hand->kbdev = kbase_find_device(-1); ++ if (!hand->kbdev) ++ goto free_hand; + -+ return mali_pm_domains[id]; -+} ++ dump_size = kbase_vinstr_dump_size(hand->kbdev); ++ hand->vinstr_buffer = kzalloc(dump_size, GFP_KERNEL); ++ if (!hand->vinstr_buffer) ++ goto release_device; ++ in_out_info->kernel_dump_buffer = hand->vinstr_buffer; + -+struct mali_pm_domain *mali_pm_domain_get_from_index(u32 id) -+{ -+ MALI_DEBUG_ASSERT(MALI_MAX_NUMBER_OF_DOMAINS > id); ++ in_out_info->nr_cores = hand->kbdev->gpu_props.num_cores; ++ in_out_info->nr_core_groups = hand->kbdev->gpu_props.num_core_groups; ++ in_out_info->gpu_id = hand->kbdev->gpu_props.props.core_props.product_id; + -+ return mali_pm_domains[id]; -+} ++ /* If we are using a v4 device (Mali-T6xx or Mali-T72x) */ ++ if (kbase_hw_has_feature(hand->kbdev, BASE_HW_FEATURE_V4)) { ++ uint32_t cg, j; ++ uint64_t core_mask; + -+u32 mali_pm_domain_ref_get(struct mali_pm_domain *domain) -+{ -+ MALI_DEBUG_ASSERT_POINTER(domain); ++ /* There are 8 hardware counters blocks per core group */ ++ in_out_info->hwc_layout = kmalloc(sizeof(enum hwc_type) * ++ MALI_MAX_NUM_BLOCKS_PER_GROUP * ++ in_out_info->nr_core_groups, GFP_KERNEL); + -+ if (0 == domain->use_count) { -+ _mali_osk_pm_dev_ref_get_async(); -+ } ++ if (!in_out_info->hwc_layout) ++ goto free_vinstr_buffer; + -+ ++domain->use_count; -+ MALI_DEBUG_PRINT(4, ("PM domain %p: ref_get, use_count => %u\n", domain, domain->use_count)); ++ dump_size = in_out_info->nr_core_groups * ++ MALI_MAX_NUM_BLOCKS_PER_GROUP * ++ MALI_COUNTERS_PER_BLOCK * ++ MALI_BYTES_PER_COUNTER; + -+ /* Return our mask so caller can check this against wanted mask */ -+ return domain->pmu_mask; -+} ++ for (cg = 0; cg < in_out_info->nr_core_groups; cg++) { ++ core_mask = hand->kbdev->gpu_props.props.coherency_info.group[cg].core_mask; + -+u32 mali_pm_domain_ref_put(struct mali_pm_domain *domain) -+{ -+ MALI_DEBUG_ASSERT_POINTER(domain); ++ for (j = 0; j < MALI_MAX_CORES_PER_GROUP; j++) { ++ if (core_mask & (1u << j)) ++ in_out_info->hwc_layout[i++] = SHADER_BLOCK; ++ else ++ in_out_info->hwc_layout[i++] = RESERVED_BLOCK; ++ } + -+ --domain->use_count; -+ MALI_DEBUG_PRINT(4, ("PM domain %p: ref_put, use_count => %u\n", domain, domain->use_count)); ++ in_out_info->hwc_layout[i++] = TILER_BLOCK; ++ in_out_info->hwc_layout[i++] = MMU_L2_BLOCK; + -+ if (0 == domain->use_count) { -+ _mali_osk_pm_dev_ref_put(); -+ } ++ in_out_info->hwc_layout[i++] = RESERVED_BLOCK; + -+ /* -+ * Return the PMU mask which now could be be powered down -+ * (the bit for this domain). -+ * This is the responsibility of the caller (mali_pm) -+ */ -+ return (0 == domain->use_count ? domain->pmu_mask : 0); -+} ++ if (0 == cg) ++ in_out_info->hwc_layout[i++] = JM_BLOCK; ++ else ++ in_out_info->hwc_layout[i++] = RESERVED_BLOCK; ++ } ++ /* If we are using any other device */ ++ } else { ++ uint32_t nr_l2, nr_sc_bits, j; ++ uint64_t core_mask; + -+#if MALI_STATE_TRACKING -+u32 mali_pm_domain_get_id(struct mali_pm_domain *domain) -+{ -+ u32 id = 0; ++ nr_l2 = hand->kbdev->gpu_props.props.l2_props.num_l2_slices; + -+ MALI_DEBUG_ASSERT_POINTER(domain); -+ MALI_DEBUG_ASSERT(0 != domain->pmu_mask); ++ core_mask = hand->kbdev->gpu_props.props.coherency_info.group[0].core_mask; + -+ id = _mali_osk_fls(domain->pmu_mask) - 1; ++ nr_sc_bits = fls64(core_mask); + -+ MALI_DEBUG_ASSERT(MALI_MAX_NUMBER_OF_DOMAINS > id); -+ /* Verify that pmu_mask only one bit is set */ -+ MALI_DEBUG_ASSERT((1 << id) == domain->pmu_mask); -+ /* Verify that we have stored the domain at right id/index */ -+ MALI_DEBUG_ASSERT(domain == mali_pm_domains[id]); ++ /* The job manager and tiler sets of counters ++ * are always present */ ++ in_out_info->hwc_layout = kmalloc(sizeof(enum hwc_type) * (2 + nr_sc_bits + nr_l2), GFP_KERNEL); + -+ return id; -+} -+#endif ++ if (!in_out_info->hwc_layout) ++ goto free_vinstr_buffer; + -+#if defined(DEBUG) -+mali_bool mali_pm_domain_all_unused(void) -+{ -+ int i; ++ dump_size = (2 + nr_sc_bits + nr_l2) * MALI_COUNTERS_PER_BLOCK * MALI_BYTES_PER_COUNTER; + -+ for (i = 0; i < MALI_MAX_NUMBER_OF_DOMAINS; i++) { -+ if (NULL == mali_pm_domains[i]) { -+ /* Nothing to check */ -+ continue; -+ } ++ in_out_info->hwc_layout[i++] = JM_BLOCK; ++ in_out_info->hwc_layout[i++] = TILER_BLOCK; + -+ if (MALI_TRUE == mali_pm_domains[i]->power_is_on) { -+ /* Not ready for suspend! */ -+ return MALI_FALSE; -+ } ++ for (j = 0; j < nr_l2; j++) ++ in_out_info->hwc_layout[i++] = MMU_L2_BLOCK; + -+ if (0 != mali_pm_domains[i]->use_count) { -+ /* Not ready for suspend! */ -+ return MALI_FALSE; ++ while (core_mask != 0ull) { ++ if ((core_mask & 1ull) != 0ull) ++ in_out_info->hwc_layout[i++] = SHADER_BLOCK; ++ else ++ in_out_info->hwc_layout[i++] = RESERVED_BLOCK; ++ core_mask >>= 1; + } + } + -+ return MALI_TRUE; -+} -+#endif -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h -new file mode 100755 -index 000000000000..5776abe39f3d ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h -@@ -0,0 +1,104 @@ -+/* -+ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef __MALI_PM_DOMAIN_H__ -+#define __MALI_PM_DOMAIN_H__ -+ -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+ -+#include "mali_l2_cache.h" -+#include "mali_group.h" -+#include "mali_pmu.h" -+ -+/* Instances are protected by PM state lock */ -+struct mali_pm_domain { -+ mali_bool power_is_on; -+ s32 use_count; -+ u32 pmu_mask; -+ -+ /* Zero or more groups can belong to this domain */ -+ _mali_osk_list_t group_list; -+ -+ /* Zero or more L2 caches can belong to this domain */ -+ _mali_osk_list_t l2_cache_list; -+}; -+ -+ -+void mali_pm_domain_initialize(void); -+void mali_pm_domain_terminate(void); -+ -+struct mali_pm_domain *mali_pm_domain_create(u32 pmu_mask); -+void mali_pm_domain_delete(struct mali_pm_domain *domain); -+ -+void mali_pm_domain_add_l2_cache( -+ struct mali_pm_domain *domain, -+ struct mali_l2_cache_core *l2_cache); -+void mali_pm_domain_add_group(struct mali_pm_domain *domain, -+ struct mali_group *group); -+ -+struct mali_pm_domain *mali_pm_domain_get_from_mask(u32 mask); -+struct mali_pm_domain *mali_pm_domain_get_from_index(u32 id); -+ -+/* Ref counting */ -+u32 mali_pm_domain_ref_get(struct mali_pm_domain *domain); -+u32 mali_pm_domain_ref_put(struct mali_pm_domain *domain); -+ -+MALI_STATIC_INLINE _mali_osk_list_t *mali_pm_domain_get_group_list( -+ struct mali_pm_domain *domain) -+{ -+ MALI_DEBUG_ASSERT_POINTER(domain); -+ return &domain->group_list; -+} -+ -+MALI_STATIC_INLINE _mali_osk_list_t *mali_pm_domain_get_l2_cache_list( -+ struct mali_pm_domain *domain) -+{ -+ MALI_DEBUG_ASSERT_POINTER(domain); -+ return &domain->l2_cache_list; -+} -+ -+MALI_STATIC_INLINE mali_bool mali_pm_domain_power_is_on( -+ struct mali_pm_domain *domain) -+{ -+ MALI_DEBUG_ASSERT_POINTER(domain); -+ return domain->power_is_on; -+} -+ -+MALI_STATIC_INLINE void mali_pm_domain_set_power_on( -+ struct mali_pm_domain *domain, -+ mali_bool power_is_on) -+{ -+ MALI_DEBUG_ASSERT_POINTER(domain); -+ domain->power_is_on = power_is_on; -+} -+ -+MALI_STATIC_INLINE u32 mali_pm_domain_get_use_count( -+ struct mali_pm_domain *domain) -+{ -+ MALI_DEBUG_ASSERT_POINTER(domain); -+ return domain->use_count; -+} -+ -+#if MALI_STATE_TRACKING -+u32 mali_pm_domain_get_id(struct mali_pm_domain *domain); -+ -+MALI_STATIC_INLINE u32 mali_pm_domain_get_mask(struct mali_pm_domain *domain) -+{ -+ MALI_DEBUG_ASSERT_POINTER(domain); -+ return domain->pmu_mask; -+} -+#endif -+ -+#if defined(DEBUG) -+mali_bool mali_pm_domain_all_unused(void); -+#endif -+ -+#endif /* __MALI_PM_DOMAIN_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c -new file mode 100755 -index 000000000000..cf74823230f7 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c -@@ -0,0 +1,255 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#include "mali_pm_metrics.h" -+#include "mali_osk_locks.h" -+#include "mali_osk_mali.h" -+#include -+ -+#define MALI_PM_TIME_SHIFT 0 -+#define MALI_UTILIZATION_MAX_PERIOD 80000000/* ns = 100ms */ -+ -+_mali_osk_errcode_t mali_pm_metrics_init(struct mali_device *mdev) -+{ -+ int i = 0; -+ -+ MALI_DEBUG_ASSERT(mdev != NULL); -+ -+ mdev->mali_metrics.time_period_start = ktime_get(); -+ mdev->mali_metrics.time_period_start_gp = mdev->mali_metrics.time_period_start; -+ mdev->mali_metrics.time_period_start_pp = mdev->mali_metrics.time_period_start; -+ -+ mdev->mali_metrics.time_busy = 0; -+ mdev->mali_metrics.time_idle = 0; -+ mdev->mali_metrics.prev_busy = 0; -+ mdev->mali_metrics.prev_idle = 0; -+ mdev->mali_metrics.num_running_gp_cores = 0; -+ mdev->mali_metrics.num_running_pp_cores = 0; -+ mdev->mali_metrics.time_busy_gp = 0; -+ mdev->mali_metrics.time_idle_gp = 0; -+ -+ for (i = 0; i < MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS; i++) { -+ mdev->mali_metrics.time_busy_pp[i] = 0; -+ mdev->mali_metrics.time_idle_pp[i] = 0; -+ } -+ mdev->mali_metrics.gpu_active = MALI_FALSE; ++ in_out_info->nr_hwc_blocks = i; ++ in_out_info->size = dump_size; + -+ mdev->mali_metrics.lock = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_UNORDERED, _MALI_OSK_LOCK_ORDER_FIRST); -+ if (NULL == mdev->mali_metrics.lock) { -+ return _MALI_OSK_ERR_NOMEM; ++ setup.jm_bm = in_out_info->bitmask[0]; ++ setup.tiler_bm = in_out_info->bitmask[1]; ++ setup.shader_bm = in_out_info->bitmask[2]; ++ setup.mmu_l2_bm = in_out_info->bitmask[3]; ++ hand->vinstr_cli = kbase_vinstr_hwcnt_kernel_setup(hand->kbdev->vinstr_ctx, ++ &setup, hand->vinstr_buffer); ++ if (!hand->vinstr_cli) { ++ dev_err(hand->kbdev->dev, "Failed to register gator with vinstr core"); ++ goto free_layout; + } + -+ return _MALI_OSK_ERR_OK; -+} -+ -+void mali_pm_metrics_term(struct mali_device *mdev) -+{ -+ _mali_osk_spinlock_irq_term(mdev->mali_metrics.lock); -+} -+ -+/*caller needs to hold mdev->mali_metrics.lock before calling this function*/ -+void mali_pm_record_job_status(struct mali_device *mdev) -+{ -+ ktime_t now; -+ ktime_t diff; -+ u64 ns_time; -+ -+ MALI_DEBUG_ASSERT(mdev != NULL); -+ -+ now = ktime_get(); -+ diff = ktime_sub(now, mdev->mali_metrics.time_period_start); -+ -+ ns_time = (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); -+ mdev->mali_metrics.time_busy += ns_time; -+ mdev->mali_metrics.time_period_start = now; -+} -+ -+void mali_pm_record_gpu_idle(mali_bool is_gp) -+{ -+ ktime_t now; -+ ktime_t diff; -+ u64 ns_time; -+ struct mali_device *mdev = dev_get_drvdata(&mali_platform_device->dev); -+ -+ MALI_DEBUG_ASSERT(mdev != NULL); -+ -+ _mali_osk_spinlock_irq_lock(mdev->mali_metrics.lock); -+ now = ktime_get(); ++ return hand; + -+ if (MALI_TRUE == is_gp) { -+ --mdev->mali_metrics.num_running_gp_cores; -+ if (0 == mdev->mali_metrics.num_running_gp_cores) { -+ diff = ktime_sub(now, mdev->mali_metrics.time_period_start_gp); -+ ns_time = (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); -+ mdev->mali_metrics.time_busy_gp += ns_time; -+ mdev->mali_metrics.time_period_start_gp = now; ++free_layout: ++ kfree(in_out_info->hwc_layout); + -+ if (0 == mdev->mali_metrics.num_running_pp_cores) { -+ MALI_DEBUG_ASSERT(mdev->mali_metrics.gpu_active == MALI_TRUE); -+ diff = ktime_sub(now, mdev->mali_metrics.time_period_start); -+ ns_time = (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); -+ mdev->mali_metrics.time_busy += ns_time; -+ mdev->mali_metrics.time_period_start = now; -+ mdev->mali_metrics.gpu_active = MALI_FALSE; -+ } -+ } -+ } else { -+ --mdev->mali_metrics.num_running_pp_cores; -+ if (0 == mdev->mali_metrics.num_running_pp_cores) { -+ diff = ktime_sub(now, mdev->mali_metrics.time_period_start_pp); -+ ns_time = (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); -+ mdev->mali_metrics.time_busy_pp[0] += ns_time; -+ mdev->mali_metrics.time_period_start_pp = now; ++free_vinstr_buffer: ++ kfree(hand->vinstr_buffer); + -+ if (0 == mdev->mali_metrics.num_running_gp_cores) { -+ MALI_DEBUG_ASSERT(mdev->mali_metrics.gpu_active == MALI_TRUE); -+ diff = ktime_sub(now, mdev->mali_metrics.time_period_start); -+ ns_time = (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); -+ mdev->mali_metrics.time_busy += ns_time; -+ mdev->mali_metrics.time_period_start = now; -+ mdev->mali_metrics.gpu_active = MALI_FALSE; -+ } -+ } -+ } ++release_device: ++ kbase_release_device(hand->kbdev); + -+ _mali_osk_spinlock_irq_unlock(mdev->mali_metrics.lock); ++free_hand: ++ kfree(hand); ++ return NULL; +} ++KBASE_EXPORT_SYMBOL(kbase_gator_hwcnt_init); + -+void mali_pm_record_gpu_active(mali_bool is_gp) ++void kbase_gator_hwcnt_term(struct kbase_gator_hwcnt_info *in_out_info, struct kbase_gator_hwcnt_handles *opaque_handles) +{ -+ ktime_t now; -+ ktime_t diff; -+ struct mali_device *mdev = dev_get_drvdata(&mali_platform_device->dev); -+ -+ MALI_DEBUG_ASSERT(mdev != NULL); -+ -+ _mali_osk_spinlock_irq_lock(mdev->mali_metrics.lock); -+ now = ktime_get(); ++ if (in_out_info) ++ kfree(in_out_info->hwc_layout); + -+ if (MALI_TRUE == is_gp) { -+ mdev->mali_metrics.num_running_gp_cores++; -+ if (1 == mdev->mali_metrics.num_running_gp_cores) { -+ diff = ktime_sub(now, mdev->mali_metrics.time_period_start_gp); -+ mdev->mali_metrics.time_idle_gp += (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); -+ mdev->mali_metrics.time_period_start_gp = now; -+ if (0 == mdev->mali_metrics.num_running_pp_cores) { -+ MALI_DEBUG_ASSERT(mdev->mali_metrics.gpu_active == MALI_FALSE); -+ diff = ktime_sub(now, mdev->mali_metrics.time_period_start); -+ mdev->mali_metrics.time_idle += (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); -+ mdev->mali_metrics.time_period_start = now; -+ mdev->mali_metrics.gpu_active = MALI_TRUE; -+ } -+ } else { -+ MALI_DEBUG_ASSERT(mdev->mali_metrics.gpu_active == MALI_TRUE); -+ } -+ } else { -+ mdev->mali_metrics.num_running_pp_cores++; -+ if (1 == mdev->mali_metrics.num_running_pp_cores) { -+ diff = ktime_sub(now, mdev->mali_metrics.time_period_start_pp); -+ mdev->mali_metrics.time_idle_pp[0] += (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); -+ mdev->mali_metrics.time_period_start_pp = now; -+ if (0 == mdev->mali_metrics.num_running_gp_cores) { -+ MALI_DEBUG_ASSERT(mdev->mali_metrics.gpu_active == MALI_FALSE); -+ diff = ktime_sub(now, mdev->mali_metrics.time_period_start); -+ mdev->mali_metrics.time_idle += (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); -+ mdev->mali_metrics.time_period_start = now; -+ mdev->mali_metrics.gpu_active = MALI_TRUE; -+ } -+ } else { -+ MALI_DEBUG_ASSERT(mdev->mali_metrics.gpu_active == MALI_TRUE); -+ } ++ if (opaque_handles) { ++ cancel_work_sync(&opaque_handles->dump_work); ++ kbase_vinstr_detach_client(opaque_handles->vinstr_cli); ++ kfree(opaque_handles->vinstr_buffer); ++ kbase_release_device(opaque_handles->kbdev); ++ kfree(opaque_handles); + } -+ -+ _mali_osk_spinlock_irq_unlock(mdev->mali_metrics.lock); +} ++KBASE_EXPORT_SYMBOL(kbase_gator_hwcnt_term); + -+ -+/*caller needs to hold mdev->mali_metrics.lock before calling this function*/ -+static void mali_pm_get_dvfs_utilisation_calc(struct mali_device *mdev, ktime_t now) ++static void dump_worker(struct work_struct *work) +{ -+ ktime_t diff; -+ -+ MALI_DEBUG_ASSERT(mdev != NULL); -+ -+ diff = ktime_sub(now, mdev->mali_metrics.time_period_start); ++ struct kbase_gator_hwcnt_handles *hand; + -+ if (mdev->mali_metrics.gpu_active) { -+ mdev->mali_metrics.time_busy += (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); ++ hand = container_of(work, struct kbase_gator_hwcnt_handles, dump_work); ++ if (!kbase_vinstr_hwc_dump(hand->vinstr_cli, ++ BASE_HWCNT_READER_EVENT_MANUAL)) { ++ spin_lock_bh(&hand->dump_lock); ++ hand->dump_complete = 1; ++ spin_unlock_bh(&hand->dump_lock); + } else { -+ mdev->mali_metrics.time_idle += (u64)(ktime_to_ns(diff) >> MALI_PM_TIME_SHIFT); ++ schedule_work(&hand->dump_work); + } +} + -+/* Caller needs to hold mdev->mali_metrics.lock before calling this function. */ -+static void mali_pm_reset_dvfs_utilisation_unlocked(struct mali_device *mdev, ktime_t now) -+{ -+ /* Store previous value */ -+ mdev->mali_metrics.prev_idle = mdev->mali_metrics.time_idle; -+ mdev->mali_metrics.prev_busy = mdev->mali_metrics.time_busy; -+ -+ /* Reset current values */ -+ mdev->mali_metrics.time_period_start = now; -+ mdev->mali_metrics.time_period_start_gp = now; -+ mdev->mali_metrics.time_period_start_pp = now; -+ mdev->mali_metrics.time_idle = 0; -+ mdev->mali_metrics.time_busy = 0; -+ -+ mdev->mali_metrics.time_busy_gp = 0; -+ mdev->mali_metrics.time_idle_gp = 0; -+ mdev->mali_metrics.time_busy_pp[0] = 0; -+ mdev->mali_metrics.time_idle_pp[0] = 0; -+} -+ -+void mali_pm_reset_dvfs_utilisation(struct mali_device *mdev) -+{ -+ _mali_osk_spinlock_irq_lock(mdev->mali_metrics.lock); -+ mali_pm_reset_dvfs_utilisation_unlocked(mdev, ktime_get()); -+ _mali_osk_spinlock_irq_unlock(mdev->mali_metrics.lock); -+} -+ -+void mali_pm_get_dvfs_utilisation(struct mali_device *mdev, -+ unsigned long *total_out, unsigned long *busy_out) ++uint32_t kbase_gator_instr_hwcnt_dump_complete( ++ struct kbase_gator_hwcnt_handles *opaque_handles, ++ uint32_t * const success) +{ -+ ktime_t now = ktime_get(); -+ u64 busy = 0; -+ u64 total = 0; -+ -+ _mali_osk_spinlock_irq_lock(mdev->mali_metrics.lock); -+ -+ mali_pm_get_dvfs_utilisation_calc(mdev, now); -+ -+ busy = mdev->mali_metrics.time_busy; -+ total = busy + mdev->mali_metrics.time_idle; + -+ /* Reset stats if older than MALI_UTILIZATION_MAX_PERIOD (default -+ * 100ms) */ -+ if (total >= MALI_UTILIZATION_MAX_PERIOD) { -+ mali_pm_reset_dvfs_utilisation_unlocked(mdev, now); -+ } else if (total < (MALI_UTILIZATION_MAX_PERIOD / 2)) { -+ total += mdev->mali_metrics.prev_idle + -+ mdev->mali_metrics.prev_busy; -+ busy += mdev->mali_metrics.prev_busy; ++ if (opaque_handles && success) { ++ *success = opaque_handles->dump_complete; ++ opaque_handles->dump_complete = 0; ++ return *success; + } -+ -+ *total_out = (unsigned long)total; -+ *busy_out = (unsigned long)busy; -+ _mali_osk_spinlock_irq_unlock(mdev->mali_metrics.lock); -+} -+ -+void mali_pm_metrics_spin_lock(void) -+{ -+ struct mali_device *mdev = dev_get_drvdata(&mali_platform_device->dev); -+ _mali_osk_spinlock_irq_lock(mdev->mali_metrics.lock); ++ return 0; +} ++KBASE_EXPORT_SYMBOL(kbase_gator_instr_hwcnt_dump_complete); + -+void mali_pm_metrics_spin_unlock(void) ++uint32_t kbase_gator_instr_hwcnt_dump_irq(struct kbase_gator_hwcnt_handles *opaque_handles) +{ -+ struct mali_device *mdev = dev_get_drvdata(&mali_platform_device->dev); -+ _mali_osk_spinlock_irq_unlock(mdev->mali_metrics.lock); ++ if (opaque_handles) ++ schedule_work(&opaque_handles->dump_work); ++ return 0; +} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h ++KBASE_EXPORT_SYMBOL(kbase_gator_instr_hwcnt_dump_irq); +diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_api.h b/drivers/gpu/arm/midgard/mali_kbase_gator_api.h new file mode 100755 -index 000000000000..2b136b0de4e3 +index 000000000..ef9ac0f7b --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h -@@ -0,0 +1,74 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.h +@@ -0,0 +1,219 @@ +/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef __MALI_PM_METRICS_H__ -+#define __MALI_PM_METRICS_H__ -+ -+#ifdef CONFIG_MALI_DEVFREQ -+#include "mali_osk_locks.h" -+#include "mali_group.h" -+ -+struct mali_device; -+ -+/** -+ * Metrics data collected for use by the power management framework. -+ */ -+struct mali_pm_metrics_data { -+ ktime_t time_period_start; -+ u64 time_busy; -+ u64 time_idle; -+ u64 prev_busy; -+ u64 prev_idle; -+ u32 num_running_gp_cores; -+ u32 num_running_pp_cores; -+ ktime_t time_period_start_gp; -+ u64 time_busy_gp; -+ u64 time_idle_gp; -+ ktime_t time_period_start_pp; -+ u64 time_busy_pp[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS]; -+ u64 time_idle_pp[MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS]; -+ mali_bool gpu_active; -+ _mali_osk_spinlock_irq_t *lock; -+}; -+ -+/** -+ * Initialize/start the Mali GPU pm_metrics metrics reporting. + * -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. -+ */ -+_mali_osk_errcode_t mali_pm_metrics_init(struct mali_device *mdev); -+ -+/** -+ * Terminate the Mali GPU pm_metrics metrics reporting -+ */ -+void mali_pm_metrics_term(struct mali_device *mdev); -+ -+/** -+ * Should be called when a job is about to execute a GPU job -+ */ -+void mali_pm_record_gpu_active(mali_bool is_gp); -+ -+/** -+ * Should be called when a job is finished ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ -+void mali_pm_record_gpu_idle(mali_bool is_gp); -+ -+void mali_pm_reset_dvfs_utilisation(struct mali_device *mdev); + -+void mali_pm_get_dvfs_utilisation(struct mali_device *mdev, unsigned long *total_out, unsigned long *busy_out); + -+void mali_pm_metrics_spin_lock(void); + -+void mali_pm_metrics_spin_unlock(void); -+#else -+void mali_pm_record_gpu_idle(mali_bool is_gp) {} -+void mali_pm_record_gpu_active(mali_bool is_gp) {} -+#endif -+#endif /* __MALI_PM_METRICS_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pmu.c b/drivers/gpu/arm/mali400/mali/common/mali_pmu.c -new file mode 100755 -index 000000000000..6f0af59f6fd4 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.c -@@ -0,0 +1,270 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++#ifndef _KBASE_GATOR_API_H_ ++#define _KBASE_GATOR_API_H_ + +/** -+ * @file mali_pmu.c -+ * Mali driver functions for Mali 400 PMU hardware ++ * @brief This file describes the API used by Gator to fetch hardware counters. + */ -+#include "mali_hw_core.h" -+#include "mali_pmu.h" -+#include "mali_pp.h" -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_pm.h" -+#include "mali_osk_mali.h" -+ -+struct mali_pmu_core *mali_global_pmu_core = NULL; -+ -+static _mali_osk_errcode_t mali_pmu_wait_for_command_finish( -+ struct mali_pmu_core *pmu); -+ -+struct mali_pmu_core *mali_pmu_create(_mali_osk_resource_t *resource) -+{ -+ struct mali_pmu_core *pmu; -+ -+ MALI_DEBUG_ASSERT(NULL == mali_global_pmu_core); -+ MALI_DEBUG_PRINT(2, ("Mali PMU: Creating Mali PMU core\n")); -+ -+ pmu = (struct mali_pmu_core *)_mali_osk_malloc( -+ sizeof(struct mali_pmu_core)); -+ if (NULL != pmu) { -+ pmu->registered_cores_mask = 0; /* to be set later */ -+ -+ if (_MALI_OSK_ERR_OK == mali_hw_core_create(&pmu->hw_core, -+ resource, PMU_REGISTER_ADDRESS_SPACE_SIZE)) { -+ -+ pmu->switch_delay = _mali_osk_get_pmu_switch_delay(); -+ -+ mali_global_pmu_core = pmu; -+ -+ return pmu; -+ } -+ _mali_osk_free(pmu); -+ } -+ -+ return NULL; -+} -+ -+void mali_pmu_delete(struct mali_pmu_core *pmu) -+{ -+ MALI_DEBUG_ASSERT_POINTER(pmu); -+ MALI_DEBUG_ASSERT(pmu == mali_global_pmu_core); -+ -+ MALI_DEBUG_PRINT(2, ("Mali PMU: Deleting Mali PMU core\n")); -+ -+ mali_global_pmu_core = NULL; -+ -+ mali_hw_core_delete(&pmu->hw_core); -+ _mali_osk_free(pmu); -+} -+ -+void mali_pmu_set_registered_cores_mask(struct mali_pmu_core *pmu, u32 mask) -+{ -+ pmu->registered_cores_mask = mask; -+} -+ -+void mali_pmu_reset(struct mali_pmu_core *pmu) -+{ -+ MALI_DEBUG_ASSERT_POINTER(pmu); -+ MALI_DEBUG_ASSERT(pmu->registered_cores_mask != 0); -+ -+ /* Setup the desired defaults */ -+ mali_hw_core_register_write_relaxed(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_INT_MASK, 0); -+ mali_hw_core_register_write_relaxed(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_SW_DELAY, pmu->switch_delay); -+} -+ -+void mali_pmu_power_up_all(struct mali_pmu_core *pmu) -+{ -+ u32 stat; -+ -+ MALI_DEBUG_ASSERT_POINTER(pmu); -+ MALI_DEBUG_ASSERT(pmu->registered_cores_mask != 0); -+ -+ mali_pm_exec_lock(); -+ -+ mali_pmu_reset(pmu); -+ -+ /* Now simply power up the domains which are marked as powered down */ -+ stat = mali_hw_core_register_read(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_STATUS); -+ mali_pmu_power_up(pmu, stat); -+ -+ mali_pm_exec_unlock(); -+} -+ -+void mali_pmu_power_down_all(struct mali_pmu_core *pmu) -+{ -+ u32 stat; -+ -+ MALI_DEBUG_ASSERT_POINTER(pmu); -+ MALI_DEBUG_ASSERT(pmu->registered_cores_mask != 0); -+ -+ mali_pm_exec_lock(); -+ -+ /* Now simply power down the domains which are marked as powered up */ -+ stat = mali_hw_core_register_read(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_STATUS); -+ mali_pmu_power_down(pmu, (~stat) & pmu->registered_cores_mask); -+ -+ mali_pm_exec_unlock(); -+} -+ -+_mali_osk_errcode_t mali_pmu_power_down(struct mali_pmu_core *pmu, u32 mask) -+{ -+ u32 stat; -+ _mali_osk_errcode_t err; -+ -+ MALI_DEBUG_ASSERT_POINTER(pmu); -+ MALI_DEBUG_ASSERT(pmu->registered_cores_mask != 0); -+ MALI_DEBUG_ASSERT(mask <= pmu->registered_cores_mask); -+ MALI_DEBUG_ASSERT(0 == (mali_hw_core_register_read(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_INT_RAWSTAT) & -+ PMU_REG_VAL_IRQ)); -+ -+ MALI_DEBUG_PRINT(3, -+ ("PMU power down: ...................... [%s]\n", -+ mali_pm_mask_to_string(mask))); -+ -+ stat = mali_hw_core_register_read(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_STATUS); -+ -+ /* -+ * Assert that we are not powering down domains which are already -+ * powered down. -+ */ -+ MALI_DEBUG_ASSERT(0 == (stat & mask)); -+ -+ mask &= ~(0x1 << MALI_DOMAIN_INDEX_DUMMY); -+ -+ if (0 == mask || 0 == ((~stat) & mask)) return _MALI_OSK_ERR_OK; -+ -+ mali_hw_core_register_write(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_POWER_DOWN, mask); -+ -+ /* -+ * Do not wait for interrupt on Mali-300/400 if all domains are -+ * powered off by our power down command, because the HW will simply -+ * not generate an interrupt in this case. -+ */ -+ if (mali_is_mali450() || mali_is_mali470() || pmu->registered_cores_mask != (mask | stat)) { -+ err = mali_pmu_wait_for_command_finish(pmu); -+ if (_MALI_OSK_ERR_OK != err) { -+ return err; -+ } -+ } else { -+ mali_hw_core_register_write(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_INT_CLEAR, PMU_REG_VAL_IRQ); -+ } -+ -+#if defined(DEBUG) -+ /* Verify power status of domains after power down */ -+ stat = mali_hw_core_register_read(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_STATUS); -+ MALI_DEBUG_ASSERT(mask == (stat & mask)); -+#endif -+ -+ return _MALI_OSK_ERR_OK; -+} -+ -+_mali_osk_errcode_t mali_pmu_power_up(struct mali_pmu_core *pmu, u32 mask) -+{ -+ u32 stat; -+ _mali_osk_errcode_t err; -+#if !defined(CONFIG_MALI_PMU_PARALLEL_POWER_UP) -+ u32 current_domain; -+#endif -+ -+ MALI_DEBUG_ASSERT_POINTER(pmu); -+ MALI_DEBUG_ASSERT(pmu->registered_cores_mask != 0); -+ MALI_DEBUG_ASSERT(mask <= pmu->registered_cores_mask); -+ MALI_DEBUG_ASSERT(0 == (mali_hw_core_register_read(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_INT_RAWSTAT) & -+ PMU_REG_VAL_IRQ)); -+ -+ MALI_DEBUG_PRINT(3, -+ ("PMU power up: ........................ [%s]\n", -+ mali_pm_mask_to_string(mask))); -+ -+ stat = mali_hw_core_register_read(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_STATUS); -+ stat &= pmu->registered_cores_mask; -+ -+ mask &= ~(0x1 << MALI_DOMAIN_INDEX_DUMMY); -+ if (0 == mask || 0 == (stat & mask)) return _MALI_OSK_ERR_OK; -+ -+ /* -+ * Assert that we are only powering up domains which are currently -+ * powered down. -+ */ -+ MALI_DEBUG_ASSERT(mask == (stat & mask)); -+ -+#if defined(CONFIG_MALI_PMU_PARALLEL_POWER_UP) -+ mali_hw_core_register_write(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_POWER_UP, mask); -+ -+ err = mali_pmu_wait_for_command_finish(pmu); -+ if (_MALI_OSK_ERR_OK != err) { -+ return err; -+ } -+#else -+ for (current_domain = 1; -+ current_domain <= pmu->registered_cores_mask; -+ current_domain <<= 1) { -+ if (current_domain & mask & stat) { -+ mali_hw_core_register_write(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_POWER_UP, -+ current_domain); -+ -+ err = mali_pmu_wait_for_command_finish(pmu); -+ if (_MALI_OSK_ERR_OK != err) { -+ return err; -+ } -+ } -+ } -+#endif + -+#if defined(DEBUG) -+ /* Verify power status of domains after power up */ -+ stat = mali_hw_core_register_read(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_STATUS); -+ MALI_DEBUG_ASSERT(0 == (stat & mask)); -+#endif /* defined(DEBUG) */ ++/* This define is used by the gator kernel module compile to select which DDK ++ * API calling convention to use. If not defined (legacy DDK) gator assumes ++ * version 1. The version to DDK release mapping is: ++ * Version 1 API: DDK versions r1px, r2px ++ * Version 2 API: DDK versions r3px, r4px ++ * Version 3 API: DDK version r5p0 and newer ++ * ++ * API Usage ++ * ========= ++ * ++ * 1] Call kbase_gator_hwcnt_init_names() to return the list of short counter ++ * names for the GPU present in this device. ++ * ++ * 2] Create a kbase_gator_hwcnt_info structure and set the counter enables for ++ * the counters you want enabled. The enables can all be set for simplicity in ++ * most use cases, but disabling some will let you minimize bandwidth impact. ++ * ++ * 3] Call kbase_gator_hwcnt_init() using the above structure, to create a ++ * counter context. On successful return the DDK will have populated the ++ * structure with a variety of useful information. ++ * ++ * 4] Call kbase_gator_hwcnt_dump_irq() to queue a non-blocking request for a ++ * counter dump. If this returns a non-zero value the request has been queued, ++ * otherwise the driver has been unable to do so (typically because of another ++ * user of the instrumentation exists concurrently). ++ * ++ * 5] Call kbase_gator_hwcnt_dump_complete() to test whether the previously ++ * requested dump has been succesful. If this returns non-zero the counter dump ++ * has resolved, but the value of *success must also be tested as the dump ++ * may have not been successful. If it returns zero the counter dump was ++ * abandoned due to the device being busy (typically because of another ++ * user of the instrumentation exists concurrently). ++ * ++ * 6] Process the counters stored in the buffer pointed to by ... ++ * ++ * kbase_gator_hwcnt_info->kernel_dump_buffer ++ * ++ * In pseudo code you can find all of the counters via this approach: ++ * ++ * ++ * hwcnt_info # pointer to kbase_gator_hwcnt_info structure ++ * hwcnt_name # pointer to name list ++ * ++ * u32 * hwcnt_data = (u32*)hwcnt_info->kernel_dump_buffer ++ * ++ * # Iterate over each 64-counter block in this GPU configuration ++ * for( i = 0; i < hwcnt_info->nr_hwc_blocks; i++) { ++ * hwc_type type = hwcnt_info->hwc_layout[i]; ++ * ++ * # Skip reserved type blocks - they contain no counters at all ++ * if( type == RESERVED_BLOCK ) { ++ * continue; ++ * } ++ * ++ * size_t name_offset = type * 64; ++ * size_t data_offset = i * 64; ++ * ++ * # Iterate over the names of the counters in this block type ++ * for( j = 0; j < 64; j++) { ++ * const char * name = hwcnt_name[name_offset+j]; ++ * ++ * # Skip empty name strings - there is no counter here ++ * if( name[0] == '\0' ) { ++ * continue; ++ * } ++ * ++ * u32 data = hwcnt_data[data_offset+j]; ++ * ++ * printk( "COUNTER: %s DATA: %u\n", name, data ); ++ * } ++ * } ++ * ++ * ++ * Note that in most implementations you typically want to either SUM or ++ * AVERAGE multiple instances of the same counter if, for example, you have ++ * multiple shader cores or multiple L2 caches. The most sensible view for ++ * analysis is to AVERAGE shader core counters, but SUM L2 cache and MMU ++ * counters. ++ * ++ * 7] Goto 4, repeating until you want to stop collecting counters. ++ * ++ * 8] Release the dump resources by calling kbase_gator_hwcnt_term(). ++ * ++ * 9] Release the name table resources by calling ++ * kbase_gator_hwcnt_term_names(). This function must only be called if ++ * init_names() returned a non-NULL value. ++ **/ + -+ return _MALI_OSK_ERR_OK; -+} ++#define MALI_DDK_GATOR_API_VERSION 3 + -+static _mali_osk_errcode_t mali_pmu_wait_for_command_finish( -+ struct mali_pmu_core *pmu) -+{ -+ u32 rawstat; -+ u32 timeout = MALI_REG_POLL_COUNT_SLOW; ++enum hwc_type { ++ JM_BLOCK = 0, ++ TILER_BLOCK, ++ SHADER_BLOCK, ++ MMU_L2_BLOCK, ++ RESERVED_BLOCK ++}; + -+ MALI_DEBUG_ASSERT(pmu); ++struct kbase_gator_hwcnt_info { ++ /* Passed from Gator to kbase */ + -+ /* Wait for the command to complete */ -+ do { -+ rawstat = mali_hw_core_register_read(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_INT_RAWSTAT); -+ --timeout; -+ } while (0 == (rawstat & PMU_REG_VAL_IRQ) && 0 < timeout); ++ /* the bitmask of enabled hardware counters for each counter block */ ++ uint16_t bitmask[4]; + -+ MALI_DEBUG_ASSERT(0 < timeout); ++ /* Passed from kbase to Gator */ + -+ if (0 == timeout) { -+ return _MALI_OSK_ERR_TIMEOUT; -+ } ++ /* ptr to counter dump memory */ ++ void *kernel_dump_buffer; + -+ mali_hw_core_register_write(&pmu->hw_core, -+ PMU_REG_ADDR_MGMT_INT_CLEAR, PMU_REG_VAL_IRQ); ++ /* size of counter dump memory */ ++ uint32_t size; + -+ return _MALI_OSK_ERR_OK; -+} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pmu.h b/drivers/gpu/arm/mali400/mali/common/mali_pmu.h -new file mode 100755 -index 000000000000..5b856240fdac ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.h -@@ -0,0 +1,123 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ /* the ID of the Mali device */ ++ uint32_t gpu_id; + -+/** -+ * @file mali_platform.h -+ * Platform specific Mali driver functions -+ */ ++ /* the number of shader cores in the GPU */ ++ uint32_t nr_cores; + -+#ifndef __MALI_PMU_H__ -+#define __MALI_PMU_H__ ++ /* the number of core groups */ ++ uint32_t nr_core_groups; + -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_hw_core.h" ++ /* the memory layout of the performance counters */ ++ enum hwc_type *hwc_layout; + -+/** @brief MALI inbuilt PMU hardware info and PMU hardware has knowledge of cores power mask -+ */ -+struct mali_pmu_core { -+ struct mali_hw_core hw_core; -+ u32 registered_cores_mask; -+ u32 switch_delay; ++ /* the total number of hardware couter blocks */ ++ uint32_t nr_hwc_blocks; +}; + -+/** @brief Register layout for hardware PMU ++/** ++ * @brief Opaque block of Mali data which Gator needs to return to the API later. + */ -+typedef enum { -+ PMU_REG_ADDR_MGMT_POWER_UP = 0x00, /*< Power up register */ -+ PMU_REG_ADDR_MGMT_POWER_DOWN = 0x04, /*< Power down register */ -+ PMU_REG_ADDR_MGMT_STATUS = 0x08, /*< Core sleep status register */ -+ PMU_REG_ADDR_MGMT_INT_MASK = 0x0C, /*< Interrupt mask register */ -+ PMU_REG_ADDR_MGMT_INT_RAWSTAT = 0x10, /*< Interrupt raw status register */ -+ PMU_REG_ADDR_MGMT_INT_CLEAR = 0x18, /*< Interrupt clear register */ -+ PMU_REG_ADDR_MGMT_SW_DELAY = 0x1C, /*< Switch delay register */ -+ PMU_REGISTER_ADDRESS_SPACE_SIZE = 0x28, /*< Size of register space */ -+} pmu_reg_addr_mgmt_addr; -+ -+#define PMU_REG_VAL_IRQ 1 -+ -+extern struct mali_pmu_core *mali_global_pmu_core; ++struct kbase_gator_hwcnt_handles; + -+/** @brief Initialisation of MALI PMU ++/** ++ * @brief Initialize the resources Gator needs for performance profiling. + * -+ * This is called from entry point of the driver in order to create and intialize the PMU resource ++ * @param in_out_info A pointer to a structure containing the enabled counters passed from Gator and all the Mali ++ * specific information that will be returned to Gator. On entry Gator must have populated the ++ * 'bitmask' field with the counters it wishes to enable for each class of counter block. ++ * Each entry in the array corresponds to a single counter class based on the "hwc_type" ++ * enumeration, and each bit corresponds to an enable for 4 sequential counters (LSB enables ++ * the first 4 counters in the block, and so on). See the GPU counter array as returned by ++ * kbase_gator_hwcnt_get_names() for the index values of each counter for the curernt GPU. + * -+ * @param resource it will be a pointer to a PMU resource -+ * @param number_of_pp_cores Number of found PP resources in configuration -+ * @param number_of_l2_caches Number of found L2 cache resources in configuration -+ * @return The created PMU object, or NULL in case of failure. ++ * @return Pointer to an opaque handle block on success, NULL on error. + */ -+struct mali_pmu_core *mali_pmu_create(_mali_osk_resource_t *resource); ++extern struct kbase_gator_hwcnt_handles *kbase_gator_hwcnt_init(struct kbase_gator_hwcnt_info *in_out_info); + -+/** @brief It deallocates the PMU resource -+ * -+ * This is called on the exit of the driver to terminate the PMU resource ++/** ++ * @brief Free all resources once Gator has finished using performance counters. + * -+ * @param pmu Pointer to PMU core object to delete ++ * @param in_out_info A pointer to a structure containing the enabled counters passed from Gator and all the ++ * Mali specific information that will be returned to Gator. ++ * @param opaque_handles A wrapper structure for kbase structures. + */ -+void mali_pmu_delete(struct mali_pmu_core *pmu); ++extern void kbase_gator_hwcnt_term(struct kbase_gator_hwcnt_info *in_out_info, struct kbase_gator_hwcnt_handles *opaque_handles); + -+/** @brief Set registered cores mask ++/** ++ * @brief Poll whether a counter dump is successful. + * -+ * @param pmu Pointer to PMU core object -+ * @param mask All available/valid domain bits -+ */ -+void mali_pmu_set_registered_cores_mask(struct mali_pmu_core *pmu, u32 mask); -+ -+/** @brief Retrieves the Mali PMU core object (if any) ++ * @param opaque_handles A wrapper structure for kbase structures. ++ * @param[out] success Non-zero on success, zero on failure. + * -+ * @return The Mali PMU object, or NULL if no PMU exists. ++ * @return Zero if the dump is still pending, non-zero if the dump has completed. Note that a ++ * completed dump may not have dumped succesfully, so the caller must test for both ++ * a completed and successful dump before processing counters. + */ -+MALI_STATIC_INLINE struct mali_pmu_core *mali_pmu_get_global_pmu_core(void) -+{ -+ return mali_global_pmu_core; -+} ++extern uint32_t kbase_gator_instr_hwcnt_dump_complete(struct kbase_gator_hwcnt_handles *opaque_handles, uint32_t * const success); + -+/** @brief Reset PMU core ++/** ++ * @brief Request the generation of a new counter dump. + * -+ * @param pmu Pointer to PMU core object to reset -+ */ -+void mali_pmu_reset(struct mali_pmu_core *pmu); -+ -+void mali_pmu_power_up_all(struct mali_pmu_core *pmu); -+ -+void mali_pmu_power_down_all(struct mali_pmu_core *pmu); -+ -+/** @brief Returns a mask of the currently powered up domains ++ * @param opaque_handles A wrapper structure for kbase structures. + * -+ * @param pmu Pointer to PMU core object ++ * @return Zero if the hardware device is busy and cannot handle the request, non-zero otherwise. + */ -+MALI_STATIC_INLINE u32 mali_pmu_get_mask(struct mali_pmu_core *pmu) -+{ -+ u32 stat = mali_hw_core_register_read(&pmu->hw_core, PMU_REG_ADDR_MGMT_STATUS); -+ return ((~stat) & pmu->registered_cores_mask); -+} ++extern uint32_t kbase_gator_instr_hwcnt_dump_irq(struct kbase_gator_hwcnt_handles *opaque_handles); + -+/** @brief MALI GPU power down using MALI in-built PMU ++/** ++ * @brief This function is used to fetch the names table based on the Mali device in use. + * -+ * Called to power down the specified cores. ++ * @param[out] total_counters The total number of counters short names in the Mali devices' list. + * -+ * @param pmu Pointer to PMU core object to power down -+ * @param mask Mask specifying which power domains to power down -+ * @return _MALI_OSK_ERR_OK on success otherwise, a suitable _mali_osk_errcode_t error. ++ * @return Pointer to an array of strings of length *total_counters. + */ -+_mali_osk_errcode_t mali_pmu_power_down(struct mali_pmu_core *pmu, u32 mask); ++extern const char * const *kbase_gator_hwcnt_init_names(uint32_t *total_counters); + -+/** @brief MALI GPU power up using MALI in-built PMU -+ * -+ * Called to power up the specified cores. ++/** ++ * @brief This function is used to terminate the use of the names table. + * -+ * @param pmu Pointer to PMU core object to power up -+ * @param mask Mask specifying which power domains to power up -+ * @return _MALI_OSK_ERR_OK on success otherwise, a suitable _mali_osk_errcode_t error. ++ * This function must only be called if the initial call to kbase_gator_hwcnt_init_names returned a non-NULL value. + */ -+_mali_osk_errcode_t mali_pmu_power_up(struct mali_pmu_core *pmu, u32 mask); ++extern void kbase_gator_hwcnt_term_names(void); + -+#endif /* __MALI_PMU_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp.c b/drivers/gpu/arm/mali400/mali/common/mali_pp.c ++#endif +diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h new file mode 100755 -index 000000000000..2dd8b8766f8e +index 000000000..cad19b662 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.c -@@ -0,0 +1,502 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h +@@ -0,0 +1,2170 @@ +/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include "mali_pp_job.h" -+#include "mali_pp.h" -+#include "mali_hw_core.h" -+#include "mali_group.h" -+#include "regs/mali_200_regs.h" -+#include "mali_kernel_common.h" -+#include "mali_kernel_core.h" -+ -+#if defined(CONFIG_MALI400_PROFILING) -+#include "mali_osk_profiling.h" -+#endif -+ -+/* Number of frame registers on Mali-200 */ -+#define MALI_PP_MALI200_NUM_FRAME_REGISTERS ((0x04C/4)+1) -+/* Number of frame registers on Mali-300 and later */ -+#define MALI_PP_MALI400_NUM_FRAME_REGISTERS ((0x058/4)+1) -+ -+static struct mali_pp_core *mali_global_pp_cores[MALI_MAX_NUMBER_OF_PP_CORES] = { NULL }; -+static u32 mali_global_num_pp_cores = 0; -+ -+/* Interrupt handlers */ -+static void mali_pp_irq_probe_trigger(void *data); -+static _mali_osk_errcode_t mali_pp_irq_probe_ack(void *data); -+ -+struct mali_pp_core *mali_pp_create(const _mali_osk_resource_t *resource, struct mali_group *group, mali_bool is_virtual, u32 bcast_id) -+{ -+ struct mali_pp_core *core = NULL; -+ -+ MALI_DEBUG_PRINT(2, ("Mali PP: Creating Mali PP core: %s\n", resource->description)); -+ MALI_DEBUG_PRINT(2, ("Mali PP: Base address of PP core: 0x%x\n", resource->base)); -+ -+ if (mali_global_num_pp_cores >= MALI_MAX_NUMBER_OF_PP_CORES) { -+ MALI_PRINT_ERROR(("Mali PP: Too many PP core objects created\n")); -+ return NULL; -+ } -+ -+ core = _mali_osk_calloc(1, sizeof(struct mali_pp_core)); -+ if (NULL != core) { -+ core->core_id = mali_global_num_pp_cores; -+ core->bcast_id = bcast_id; -+ -+ if (_MALI_OSK_ERR_OK == mali_hw_core_create(&core->hw_core, resource, MALI200_REG_SIZEOF_REGISTER_BANK)) { -+ _mali_osk_errcode_t ret; -+ -+ if (!is_virtual) { -+ ret = mali_pp_reset(core); -+ } else { -+ ret = _MALI_OSK_ERR_OK; -+ } + -+ if (_MALI_OSK_ERR_OK == ret) { -+ ret = mali_group_add_pp_core(group, core); -+ if (_MALI_OSK_ERR_OK == ret) { -+ /* Setup IRQ handlers (which will do IRQ probing if needed) */ -+ MALI_DEBUG_ASSERT(!is_virtual || -1 != resource->irq); + -+ core->irq = _mali_osk_irq_init(resource->irq, -+ mali_group_upper_half_pp, -+ group, -+ mali_pp_irq_probe_trigger, -+ mali_pp_irq_probe_ack, -+ core, -+ resource->description); -+ if (NULL != core->irq) { -+ mali_global_pp_cores[mali_global_num_pp_cores] = core; -+ mali_global_num_pp_cores++; ++#ifndef _KBASE_GATOR_HWCNT_NAMES_H_ ++#define _KBASE_GATOR_HWCNT_NAMES_H_ + -+ return core; -+ } else { -+ MALI_PRINT_ERROR(("Mali PP: Failed to setup interrupt handlers for PP core %s\n", core->hw_core.description)); -+ } -+ mali_group_remove_pp_core(group); -+ } else { -+ MALI_PRINT_ERROR(("Mali PP: Failed to add core %s to group\n", core->hw_core.description)); -+ } -+ } -+ mali_hw_core_delete(&core->hw_core); -+ } ++/* ++ * "Short names" for hardware counters used by Streamline. Counters names are ++ * stored in accordance with their memory layout in the binary counter block ++ * emitted by the Mali GPU. Each "master" in the GPU emits a fixed-size block ++ * of 64 counters, and each GPU implements the same set of "masters" although ++ * the counters each master exposes within its block of 64 may vary. ++ * ++ * Counters which are an empty string are simply "holes" in the counter memory ++ * where no counter exists. ++ */ + -+ _mali_osk_free(core); -+ } else { -+ MALI_PRINT_ERROR(("Mali PP: Failed to allocate memory for PP core\n")); -+ } ++static const char * const hardware_counters_mali_t60x[] = { ++ /* Job Manager */ ++ "", ++ "", ++ "", ++ "", ++ "T60x_MESSAGES_SENT", ++ "T60x_MESSAGES_RECEIVED", ++ "T60x_GPU_ACTIVE", ++ "T60x_IRQ_ACTIVE", ++ "T60x_JS0_JOBS", ++ "T60x_JS0_TASKS", ++ "T60x_JS0_ACTIVE", ++ "", ++ "T60x_JS0_WAIT_READ", ++ "T60x_JS0_WAIT_ISSUE", ++ "T60x_JS0_WAIT_DEPEND", ++ "T60x_JS0_WAIT_FINISH", ++ "T60x_JS1_JOBS", ++ "T60x_JS1_TASKS", ++ "T60x_JS1_ACTIVE", ++ "", ++ "T60x_JS1_WAIT_READ", ++ "T60x_JS1_WAIT_ISSUE", ++ "T60x_JS1_WAIT_DEPEND", ++ "T60x_JS1_WAIT_FINISH", ++ "T60x_JS2_JOBS", ++ "T60x_JS2_TASKS", ++ "T60x_JS2_ACTIVE", ++ "", ++ "T60x_JS2_WAIT_READ", ++ "T60x_JS2_WAIT_ISSUE", ++ "T60x_JS2_WAIT_DEPEND", ++ "T60x_JS2_WAIT_FINISH", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+ return NULL; -+} ++ /*Tiler */ ++ "", ++ "", ++ "", ++ "T60x_TI_JOBS_PROCESSED", ++ "T60x_TI_TRIANGLES", ++ "T60x_TI_QUADS", ++ "T60x_TI_POLYGONS", ++ "T60x_TI_POINTS", ++ "T60x_TI_LINES", ++ "T60x_TI_VCACHE_HIT", ++ "T60x_TI_VCACHE_MISS", ++ "T60x_TI_FRONT_FACING", ++ "T60x_TI_BACK_FACING", ++ "T60x_TI_PRIM_VISIBLE", ++ "T60x_TI_PRIM_CULLED", ++ "T60x_TI_PRIM_CLIPPED", ++ "T60x_TI_LEVEL0", ++ "T60x_TI_LEVEL1", ++ "T60x_TI_LEVEL2", ++ "T60x_TI_LEVEL3", ++ "T60x_TI_LEVEL4", ++ "T60x_TI_LEVEL5", ++ "T60x_TI_LEVEL6", ++ "T60x_TI_LEVEL7", ++ "T60x_TI_COMMAND_1", ++ "T60x_TI_COMMAND_2", ++ "T60x_TI_COMMAND_3", ++ "T60x_TI_COMMAND_4", ++ "T60x_TI_COMMAND_4_7", ++ "T60x_TI_COMMAND_8_15", ++ "T60x_TI_COMMAND_16_63", ++ "T60x_TI_COMMAND_64", ++ "T60x_TI_COMPRESS_IN", ++ "T60x_TI_COMPRESS_OUT", ++ "T60x_TI_COMPRESS_FLUSH", ++ "T60x_TI_TIMESTAMPS", ++ "T60x_TI_PCACHE_HIT", ++ "T60x_TI_PCACHE_MISS", ++ "T60x_TI_PCACHE_LINE", ++ "T60x_TI_PCACHE_STALL", ++ "T60x_TI_WRBUF_HIT", ++ "T60x_TI_WRBUF_MISS", ++ "T60x_TI_WRBUF_LINE", ++ "T60x_TI_WRBUF_PARTIAL", ++ "T60x_TI_WRBUF_STALL", ++ "T60x_TI_ACTIVE", ++ "T60x_TI_LOADING_DESC", ++ "T60x_TI_INDEX_WAIT", ++ "T60x_TI_INDEX_RANGE_WAIT", ++ "T60x_TI_VERTEX_WAIT", ++ "T60x_TI_PCACHE_WAIT", ++ "T60x_TI_WRBUF_WAIT", ++ "T60x_TI_BUS_READ", ++ "T60x_TI_BUS_WRITE", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T60x_TI_UTLB_STALL", ++ "T60x_TI_UTLB_REPLAY_MISS", ++ "T60x_TI_UTLB_REPLAY_FULL", ++ "T60x_TI_UTLB_NEW_MISS", ++ "T60x_TI_UTLB_HIT", + -+void mali_pp_delete(struct mali_pp_core *core) -+{ -+ u32 i; ++ /* Shader Core */ ++ "", ++ "", ++ "", ++ "", ++ "T60x_FRAG_ACTIVE", ++ "T60x_FRAG_PRIMITIVES", ++ "T60x_FRAG_PRIMITIVES_DROPPED", ++ "T60x_FRAG_CYCLES_DESC", ++ "T60x_FRAG_CYCLES_PLR", ++ "T60x_FRAG_CYCLES_VERT", ++ "T60x_FRAG_CYCLES_TRISETUP", ++ "T60x_FRAG_CYCLES_RAST", ++ "T60x_FRAG_THREADS", ++ "T60x_FRAG_DUMMY_THREADS", ++ "T60x_FRAG_QUADS_RAST", ++ "T60x_FRAG_QUADS_EZS_TEST", ++ "T60x_FRAG_QUADS_EZS_KILLED", ++ "T60x_FRAG_THREADS_LZS_TEST", ++ "T60x_FRAG_THREADS_LZS_KILLED", ++ "T60x_FRAG_CYCLES_NO_TILE", ++ "T60x_FRAG_NUM_TILES", ++ "T60x_FRAG_TRANS_ELIM", ++ "T60x_COMPUTE_ACTIVE", ++ "T60x_COMPUTE_TASKS", ++ "T60x_COMPUTE_THREADS", ++ "T60x_COMPUTE_CYCLES_DESC", ++ "T60x_TRIPIPE_ACTIVE", ++ "T60x_ARITH_WORDS", ++ "T60x_ARITH_CYCLES_REG", ++ "T60x_ARITH_CYCLES_L0", ++ "T60x_ARITH_FRAG_DEPEND", ++ "T60x_LS_WORDS", ++ "T60x_LS_ISSUES", ++ "T60x_LS_RESTARTS", ++ "T60x_LS_REISSUES_MISS", ++ "T60x_LS_REISSUES_VD", ++ "T60x_LS_REISSUE_ATTRIB_MISS", ++ "T60x_LS_NO_WB", ++ "T60x_TEX_WORDS", ++ "T60x_TEX_BUBBLES", ++ "T60x_TEX_WORDS_L0", ++ "T60x_TEX_WORDS_DESC", ++ "T60x_TEX_ISSUES", ++ "T60x_TEX_RECIRC_FMISS", ++ "T60x_TEX_RECIRC_DESC", ++ "T60x_TEX_RECIRC_MULTI", ++ "T60x_TEX_RECIRC_PMISS", ++ "T60x_TEX_RECIRC_CONF", ++ "T60x_LSC_READ_HITS", ++ "T60x_LSC_READ_MISSES", ++ "T60x_LSC_WRITE_HITS", ++ "T60x_LSC_WRITE_MISSES", ++ "T60x_LSC_ATOMIC_HITS", ++ "T60x_LSC_ATOMIC_MISSES", ++ "T60x_LSC_LINE_FETCHES", ++ "T60x_LSC_DIRTY_LINE", ++ "T60x_LSC_SNOOPS", ++ "T60x_AXI_TLB_STALL", ++ "T60x_AXI_TLB_MISS", ++ "T60x_AXI_TLB_TRANSACTION", ++ "T60x_LS_TLB_MISS", ++ "T60x_LS_TLB_HIT", ++ "T60x_AXI_BEATS_READ", ++ "T60x_AXI_BEATS_WRITTEN", + -+ MALI_DEBUG_ASSERT_POINTER(core); ++ /*L2 and MMU */ ++ "", ++ "", ++ "", ++ "", ++ "T60x_MMU_HIT", ++ "T60x_MMU_NEW_MISS", ++ "T60x_MMU_REPLAY_FULL", ++ "T60x_MMU_REPLAY_MISS", ++ "T60x_MMU_TABLE_WALK", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T60x_UTLB_HIT", ++ "T60x_UTLB_NEW_MISS", ++ "T60x_UTLB_REPLAY_FULL", ++ "T60x_UTLB_REPLAY_MISS", ++ "T60x_UTLB_STALL", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T60x_L2_EXT_WRITE_BEATS", ++ "T60x_L2_EXT_READ_BEATS", ++ "T60x_L2_ANY_LOOKUP", ++ "T60x_L2_READ_LOOKUP", ++ "T60x_L2_SREAD_LOOKUP", ++ "T60x_L2_READ_REPLAY", ++ "T60x_L2_READ_SNOOP", ++ "T60x_L2_READ_HIT", ++ "T60x_L2_CLEAN_MISS", ++ "T60x_L2_WRITE_LOOKUP", ++ "T60x_L2_SWRITE_LOOKUP", ++ "T60x_L2_WRITE_REPLAY", ++ "T60x_L2_WRITE_SNOOP", ++ "T60x_L2_WRITE_HIT", ++ "T60x_L2_EXT_READ_FULL", ++ "T60x_L2_EXT_READ_HALF", ++ "T60x_L2_EXT_WRITE_FULL", ++ "T60x_L2_EXT_WRITE_HALF", ++ "T60x_L2_EXT_READ", ++ "T60x_L2_EXT_READ_LINE", ++ "T60x_L2_EXT_WRITE", ++ "T60x_L2_EXT_WRITE_LINE", ++ "T60x_L2_EXT_WRITE_SMALL", ++ "T60x_L2_EXT_BARRIER", ++ "T60x_L2_EXT_AR_STALL", ++ "T60x_L2_EXT_R_BUF_FULL", ++ "T60x_L2_EXT_RD_BUF_FULL", ++ "T60x_L2_EXT_R_RAW", ++ "T60x_L2_EXT_W_STALL", ++ "T60x_L2_EXT_W_BUF_FULL", ++ "T60x_L2_EXT_R_W_HAZARD", ++ "T60x_L2_TAG_HAZARD", ++ "T60x_L2_SNOOP_FULL", ++ "T60x_L2_REPLAY_FULL" ++}; ++static const char * const hardware_counters_mali_t62x[] = { ++ /* Job Manager */ ++ "", ++ "", ++ "", ++ "", ++ "T62x_MESSAGES_SENT", ++ "T62x_MESSAGES_RECEIVED", ++ "T62x_GPU_ACTIVE", ++ "T62x_IRQ_ACTIVE", ++ "T62x_JS0_JOBS", ++ "T62x_JS0_TASKS", ++ "T62x_JS0_ACTIVE", ++ "", ++ "T62x_JS0_WAIT_READ", ++ "T62x_JS0_WAIT_ISSUE", ++ "T62x_JS0_WAIT_DEPEND", ++ "T62x_JS0_WAIT_FINISH", ++ "T62x_JS1_JOBS", ++ "T62x_JS1_TASKS", ++ "T62x_JS1_ACTIVE", ++ "", ++ "T62x_JS1_WAIT_READ", ++ "T62x_JS1_WAIT_ISSUE", ++ "T62x_JS1_WAIT_DEPEND", ++ "T62x_JS1_WAIT_FINISH", ++ "T62x_JS2_JOBS", ++ "T62x_JS2_TASKS", ++ "T62x_JS2_ACTIVE", ++ "", ++ "T62x_JS2_WAIT_READ", ++ "T62x_JS2_WAIT_ISSUE", ++ "T62x_JS2_WAIT_DEPEND", ++ "T62x_JS2_WAIT_FINISH", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+ _mali_osk_irq_term(core->irq); -+ mali_hw_core_delete(&core->hw_core); -+ -+ /* Remove core from global list */ -+ for (i = 0; i < mali_global_num_pp_cores; i++) { -+ if (mali_global_pp_cores[i] == core) { -+ mali_global_pp_cores[i] = NULL; -+ mali_global_num_pp_cores--; ++ /*Tiler */ ++ "", ++ "", ++ "", ++ "T62x_TI_JOBS_PROCESSED", ++ "T62x_TI_TRIANGLES", ++ "T62x_TI_QUADS", ++ "T62x_TI_POLYGONS", ++ "T62x_TI_POINTS", ++ "T62x_TI_LINES", ++ "T62x_TI_VCACHE_HIT", ++ "T62x_TI_VCACHE_MISS", ++ "T62x_TI_FRONT_FACING", ++ "T62x_TI_BACK_FACING", ++ "T62x_TI_PRIM_VISIBLE", ++ "T62x_TI_PRIM_CULLED", ++ "T62x_TI_PRIM_CLIPPED", ++ "T62x_TI_LEVEL0", ++ "T62x_TI_LEVEL1", ++ "T62x_TI_LEVEL2", ++ "T62x_TI_LEVEL3", ++ "T62x_TI_LEVEL4", ++ "T62x_TI_LEVEL5", ++ "T62x_TI_LEVEL6", ++ "T62x_TI_LEVEL7", ++ "T62x_TI_COMMAND_1", ++ "T62x_TI_COMMAND_2", ++ "T62x_TI_COMMAND_3", ++ "T62x_TI_COMMAND_4", ++ "T62x_TI_COMMAND_5_7", ++ "T62x_TI_COMMAND_8_15", ++ "T62x_TI_COMMAND_16_63", ++ "T62x_TI_COMMAND_64", ++ "T62x_TI_COMPRESS_IN", ++ "T62x_TI_COMPRESS_OUT", ++ "T62x_TI_COMPRESS_FLUSH", ++ "T62x_TI_TIMESTAMPS", ++ "T62x_TI_PCACHE_HIT", ++ "T62x_TI_PCACHE_MISS", ++ "T62x_TI_PCACHE_LINE", ++ "T62x_TI_PCACHE_STALL", ++ "T62x_TI_WRBUF_HIT", ++ "T62x_TI_WRBUF_MISS", ++ "T62x_TI_WRBUF_LINE", ++ "T62x_TI_WRBUF_PARTIAL", ++ "T62x_TI_WRBUF_STALL", ++ "T62x_TI_ACTIVE", ++ "T62x_TI_LOADING_DESC", ++ "T62x_TI_INDEX_WAIT", ++ "T62x_TI_INDEX_RANGE_WAIT", ++ "T62x_TI_VERTEX_WAIT", ++ "T62x_TI_PCACHE_WAIT", ++ "T62x_TI_WRBUF_WAIT", ++ "T62x_TI_BUS_READ", ++ "T62x_TI_BUS_WRITE", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T62x_TI_UTLB_STALL", ++ "T62x_TI_UTLB_REPLAY_MISS", ++ "T62x_TI_UTLB_REPLAY_FULL", ++ "T62x_TI_UTLB_NEW_MISS", ++ "T62x_TI_UTLB_HIT", + -+ if (i != mali_global_num_pp_cores) { -+ /* We removed a PP core from the middle of the array -- move the last -+ * PP core to the current position to close the gap */ -+ mali_global_pp_cores[i] = mali_global_pp_cores[mali_global_num_pp_cores]; -+ mali_global_pp_cores[mali_global_num_pp_cores] = NULL; -+ } ++ /* Shader Core */ ++ "", ++ "", ++ "", ++ "T62x_SHADER_CORE_ACTIVE", ++ "T62x_FRAG_ACTIVE", ++ "T62x_FRAG_PRIMITIVES", ++ "T62x_FRAG_PRIMITIVES_DROPPED", ++ "T62x_FRAG_CYCLES_DESC", ++ "T62x_FRAG_CYCLES_FPKQ_ACTIVE", ++ "T62x_FRAG_CYCLES_VERT", ++ "T62x_FRAG_CYCLES_TRISETUP", ++ "T62x_FRAG_CYCLES_EZS_ACTIVE", ++ "T62x_FRAG_THREADS", ++ "T62x_FRAG_DUMMY_THREADS", ++ "T62x_FRAG_QUADS_RAST", ++ "T62x_FRAG_QUADS_EZS_TEST", ++ "T62x_FRAG_QUADS_EZS_KILLED", ++ "T62x_FRAG_THREADS_LZS_TEST", ++ "T62x_FRAG_THREADS_LZS_KILLED", ++ "T62x_FRAG_CYCLES_NO_TILE", ++ "T62x_FRAG_NUM_TILES", ++ "T62x_FRAG_TRANS_ELIM", ++ "T62x_COMPUTE_ACTIVE", ++ "T62x_COMPUTE_TASKS", ++ "T62x_COMPUTE_THREADS", ++ "T62x_COMPUTE_CYCLES_DESC", ++ "T62x_TRIPIPE_ACTIVE", ++ "T62x_ARITH_WORDS", ++ "T62x_ARITH_CYCLES_REG", ++ "T62x_ARITH_CYCLES_L0", ++ "T62x_ARITH_FRAG_DEPEND", ++ "T62x_LS_WORDS", ++ "T62x_LS_ISSUES", ++ "T62x_LS_RESTARTS", ++ "T62x_LS_REISSUES_MISS", ++ "T62x_LS_REISSUES_VD", ++ "T62x_LS_REISSUE_ATTRIB_MISS", ++ "T62x_LS_NO_WB", ++ "T62x_TEX_WORDS", ++ "T62x_TEX_BUBBLES", ++ "T62x_TEX_WORDS_L0", ++ "T62x_TEX_WORDS_DESC", ++ "T62x_TEX_ISSUES", ++ "T62x_TEX_RECIRC_FMISS", ++ "T62x_TEX_RECIRC_DESC", ++ "T62x_TEX_RECIRC_MULTI", ++ "T62x_TEX_RECIRC_PMISS", ++ "T62x_TEX_RECIRC_CONF", ++ "T62x_LSC_READ_HITS", ++ "T62x_LSC_READ_MISSES", ++ "T62x_LSC_WRITE_HITS", ++ "T62x_LSC_WRITE_MISSES", ++ "T62x_LSC_ATOMIC_HITS", ++ "T62x_LSC_ATOMIC_MISSES", ++ "T62x_LSC_LINE_FETCHES", ++ "T62x_LSC_DIRTY_LINE", ++ "T62x_LSC_SNOOPS", ++ "T62x_AXI_TLB_STALL", ++ "T62x_AXI_TLB_MISS", ++ "T62x_AXI_TLB_TRANSACTION", ++ "T62x_LS_TLB_MISS", ++ "T62x_LS_TLB_HIT", ++ "T62x_AXI_BEATS_READ", ++ "T62x_AXI_BEATS_WRITTEN", + -+ break; -+ } -+ } ++ /*L2 and MMU */ ++ "", ++ "", ++ "", ++ "", ++ "T62x_MMU_HIT", ++ "T62x_MMU_NEW_MISS", ++ "T62x_MMU_REPLAY_FULL", ++ "T62x_MMU_REPLAY_MISS", ++ "T62x_MMU_TABLE_WALK", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T62x_UTLB_HIT", ++ "T62x_UTLB_NEW_MISS", ++ "T62x_UTLB_REPLAY_FULL", ++ "T62x_UTLB_REPLAY_MISS", ++ "T62x_UTLB_STALL", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T62x_L2_EXT_WRITE_BEATS", ++ "T62x_L2_EXT_READ_BEATS", ++ "T62x_L2_ANY_LOOKUP", ++ "T62x_L2_READ_LOOKUP", ++ "T62x_L2_SREAD_LOOKUP", ++ "T62x_L2_READ_REPLAY", ++ "T62x_L2_READ_SNOOP", ++ "T62x_L2_READ_HIT", ++ "T62x_L2_CLEAN_MISS", ++ "T62x_L2_WRITE_LOOKUP", ++ "T62x_L2_SWRITE_LOOKUP", ++ "T62x_L2_WRITE_REPLAY", ++ "T62x_L2_WRITE_SNOOP", ++ "T62x_L2_WRITE_HIT", ++ "T62x_L2_EXT_READ_FULL", ++ "T62x_L2_EXT_READ_HALF", ++ "T62x_L2_EXT_WRITE_FULL", ++ "T62x_L2_EXT_WRITE_HALF", ++ "T62x_L2_EXT_READ", ++ "T62x_L2_EXT_READ_LINE", ++ "T62x_L2_EXT_WRITE", ++ "T62x_L2_EXT_WRITE_LINE", ++ "T62x_L2_EXT_WRITE_SMALL", ++ "T62x_L2_EXT_BARRIER", ++ "T62x_L2_EXT_AR_STALL", ++ "T62x_L2_EXT_R_BUF_FULL", ++ "T62x_L2_EXT_RD_BUF_FULL", ++ "T62x_L2_EXT_R_RAW", ++ "T62x_L2_EXT_W_STALL", ++ "T62x_L2_EXT_W_BUF_FULL", ++ "T62x_L2_EXT_R_W_HAZARD", ++ "T62x_L2_TAG_HAZARD", ++ "T62x_L2_SNOOP_FULL", ++ "T62x_L2_REPLAY_FULL" ++}; + -+ _mali_osk_free(core); -+} ++static const char * const hardware_counters_mali_t72x[] = { ++ /* Job Manager */ ++ "", ++ "", ++ "", ++ "", ++ "T72x_GPU_ACTIVE", ++ "T72x_IRQ_ACTIVE", ++ "T72x_JS0_JOBS", ++ "T72x_JS0_TASKS", ++ "T72x_JS0_ACTIVE", ++ "T72x_JS1_JOBS", ++ "T72x_JS1_TASKS", ++ "T72x_JS1_ACTIVE", ++ "T72x_JS2_JOBS", ++ "T72x_JS2_TASKS", ++ "T72x_JS2_ACTIVE", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+void mali_pp_stop_bus(struct mali_pp_core *core) -+{ -+ MALI_DEBUG_ASSERT_POINTER(core); -+ /* Will only send the stop bus command, and not wait for it to complete */ -+ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_CTRL_MGMT, MALI200_REG_VAL_CTRL_MGMT_STOP_BUS); -+} ++ /*Tiler */ ++ "", ++ "", ++ "", ++ "T72x_TI_JOBS_PROCESSED", ++ "T72x_TI_TRIANGLES", ++ "T72x_TI_QUADS", ++ "T72x_TI_POLYGONS", ++ "T72x_TI_POINTS", ++ "T72x_TI_LINES", ++ "T72x_TI_FRONT_FACING", ++ "T72x_TI_BACK_FACING", ++ "T72x_TI_PRIM_VISIBLE", ++ "T72x_TI_PRIM_CULLED", ++ "T72x_TI_PRIM_CLIPPED", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T72x_TI_ACTIVE", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+_mali_osk_errcode_t mali_pp_stop_bus_wait(struct mali_pp_core *core) -+{ -+ int i; ++ /* Shader Core */ ++ "", ++ "", ++ "", ++ "", ++ "T72x_FRAG_ACTIVE", ++ "T72x_FRAG_PRIMITIVES", ++ "T72x_FRAG_PRIMITIVES_DROPPED", ++ "T72x_FRAG_THREADS", ++ "T72x_FRAG_DUMMY_THREADS", ++ "T72x_FRAG_QUADS_RAST", ++ "T72x_FRAG_QUADS_EZS_TEST", ++ "T72x_FRAG_QUADS_EZS_KILLED", ++ "T72x_FRAG_THREADS_LZS_TEST", ++ "T72x_FRAG_THREADS_LZS_KILLED", ++ "T72x_FRAG_CYCLES_NO_TILE", ++ "T72x_FRAG_NUM_TILES", ++ "T72x_FRAG_TRANS_ELIM", ++ "T72x_COMPUTE_ACTIVE", ++ "T72x_COMPUTE_TASKS", ++ "T72x_COMPUTE_THREADS", ++ "T72x_TRIPIPE_ACTIVE", ++ "T72x_ARITH_WORDS", ++ "T72x_ARITH_CYCLES_REG", ++ "T72x_LS_WORDS", ++ "T72x_LS_ISSUES", ++ "T72x_LS_RESTARTS", ++ "T72x_LS_REISSUES_MISS", ++ "T72x_TEX_WORDS", ++ "T72x_TEX_BUBBLES", ++ "T72x_TEX_ISSUES", ++ "T72x_LSC_READ_HITS", ++ "T72x_LSC_READ_MISSES", ++ "T72x_LSC_WRITE_HITS", ++ "T72x_LSC_WRITE_MISSES", ++ "T72x_LSC_ATOMIC_HITS", ++ "T72x_LSC_ATOMIC_MISSES", ++ "T72x_LSC_LINE_FETCHES", ++ "T72x_LSC_DIRTY_LINE", ++ "T72x_LSC_SNOOPS", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+ MALI_DEBUG_ASSERT_POINTER(core); ++ /*L2 and MMU */ ++ "", ++ "", ++ "", ++ "", ++ "T72x_L2_EXT_WRITE_BEAT", ++ "T72x_L2_EXT_READ_BEAT", ++ "T72x_L2_READ_SNOOP", ++ "T72x_L2_READ_HIT", ++ "T72x_L2_WRITE_SNOOP", ++ "T72x_L2_WRITE_HIT", ++ "T72x_L2_EXT_WRITE_SMALL", ++ "T72x_L2_EXT_BARRIER", ++ "T72x_L2_EXT_AR_STALL", ++ "T72x_L2_EXT_W_STALL", ++ "T72x_L2_SNOOP_FULL", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "" ++}; + -+ /* Send the stop bus command. */ -+ mali_pp_stop_bus(core); ++static const char * const hardware_counters_mali_t76x[] = { ++ /* Job Manager */ ++ "", ++ "", ++ "", ++ "", ++ "T76x_MESSAGES_SENT", ++ "T76x_MESSAGES_RECEIVED", ++ "T76x_GPU_ACTIVE", ++ "T76x_IRQ_ACTIVE", ++ "T76x_JS0_JOBS", ++ "T76x_JS0_TASKS", ++ "T76x_JS0_ACTIVE", ++ "", ++ "T76x_JS0_WAIT_READ", ++ "T76x_JS0_WAIT_ISSUE", ++ "T76x_JS0_WAIT_DEPEND", ++ "T76x_JS0_WAIT_FINISH", ++ "T76x_JS1_JOBS", ++ "T76x_JS1_TASKS", ++ "T76x_JS1_ACTIVE", ++ "", ++ "T76x_JS1_WAIT_READ", ++ "T76x_JS1_WAIT_ISSUE", ++ "T76x_JS1_WAIT_DEPEND", ++ "T76x_JS1_WAIT_FINISH", ++ "T76x_JS2_JOBS", ++ "T76x_JS2_TASKS", ++ "T76x_JS2_ACTIVE", ++ "", ++ "T76x_JS2_WAIT_READ", ++ "T76x_JS2_WAIT_ISSUE", ++ "T76x_JS2_WAIT_DEPEND", ++ "T76x_JS2_WAIT_FINISH", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+ /* Wait for bus to be stopped */ -+ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; i++) { -+ if (mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_STATUS) & MALI200_REG_VAL_STATUS_BUS_STOPPED) -+ break; -+ } ++ /*Tiler */ ++ "", ++ "", ++ "", ++ "T76x_TI_JOBS_PROCESSED", ++ "T76x_TI_TRIANGLES", ++ "T76x_TI_QUADS", ++ "T76x_TI_POLYGONS", ++ "T76x_TI_POINTS", ++ "T76x_TI_LINES", ++ "T76x_TI_VCACHE_HIT", ++ "T76x_TI_VCACHE_MISS", ++ "T76x_TI_FRONT_FACING", ++ "T76x_TI_BACK_FACING", ++ "T76x_TI_PRIM_VISIBLE", ++ "T76x_TI_PRIM_CULLED", ++ "T76x_TI_PRIM_CLIPPED", ++ "T76x_TI_LEVEL0", ++ "T76x_TI_LEVEL1", ++ "T76x_TI_LEVEL2", ++ "T76x_TI_LEVEL3", ++ "T76x_TI_LEVEL4", ++ "T76x_TI_LEVEL5", ++ "T76x_TI_LEVEL6", ++ "T76x_TI_LEVEL7", ++ "T76x_TI_COMMAND_1", ++ "T76x_TI_COMMAND_2", ++ "T76x_TI_COMMAND_3", ++ "T76x_TI_COMMAND_4", ++ "T76x_TI_COMMAND_5_7", ++ "T76x_TI_COMMAND_8_15", ++ "T76x_TI_COMMAND_16_63", ++ "T76x_TI_COMMAND_64", ++ "T76x_TI_COMPRESS_IN", ++ "T76x_TI_COMPRESS_OUT", ++ "T76x_TI_COMPRESS_FLUSH", ++ "T76x_TI_TIMESTAMPS", ++ "T76x_TI_PCACHE_HIT", ++ "T76x_TI_PCACHE_MISS", ++ "T76x_TI_PCACHE_LINE", ++ "T76x_TI_PCACHE_STALL", ++ "T76x_TI_WRBUF_HIT", ++ "T76x_TI_WRBUF_MISS", ++ "T76x_TI_WRBUF_LINE", ++ "T76x_TI_WRBUF_PARTIAL", ++ "T76x_TI_WRBUF_STALL", ++ "T76x_TI_ACTIVE", ++ "T76x_TI_LOADING_DESC", ++ "T76x_TI_INDEX_WAIT", ++ "T76x_TI_INDEX_RANGE_WAIT", ++ "T76x_TI_VERTEX_WAIT", ++ "T76x_TI_PCACHE_WAIT", ++ "T76x_TI_WRBUF_WAIT", ++ "T76x_TI_BUS_READ", ++ "T76x_TI_BUS_WRITE", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T76x_TI_UTLB_HIT", ++ "T76x_TI_UTLB_NEW_MISS", ++ "T76x_TI_UTLB_REPLAY_FULL", ++ "T76x_TI_UTLB_REPLAY_MISS", ++ "T76x_TI_UTLB_STALL", + -+ if (MALI_REG_POLL_COUNT_FAST == i) { -+ MALI_PRINT_ERROR(("Mali PP: Failed to stop bus on %s. Status: 0x%08x\n", core->hw_core.description, mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_STATUS))); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ return _MALI_OSK_ERR_OK; -+} ++ /* Shader Core */ ++ "", ++ "", ++ "", ++ "", ++ "T76x_FRAG_ACTIVE", ++ "T76x_FRAG_PRIMITIVES", ++ "T76x_FRAG_PRIMITIVES_DROPPED", ++ "T76x_FRAG_CYCLES_DESC", ++ "T76x_FRAG_CYCLES_FPKQ_ACTIVE", ++ "T76x_FRAG_CYCLES_VERT", ++ "T76x_FRAG_CYCLES_TRISETUP", ++ "T76x_FRAG_CYCLES_EZS_ACTIVE", ++ "T76x_FRAG_THREADS", ++ "T76x_FRAG_DUMMY_THREADS", ++ "T76x_FRAG_QUADS_RAST", ++ "T76x_FRAG_QUADS_EZS_TEST", ++ "T76x_FRAG_QUADS_EZS_KILLED", ++ "T76x_FRAG_THREADS_LZS_TEST", ++ "T76x_FRAG_THREADS_LZS_KILLED", ++ "T76x_FRAG_CYCLES_NO_TILE", ++ "T76x_FRAG_NUM_TILES", ++ "T76x_FRAG_TRANS_ELIM", ++ "T76x_COMPUTE_ACTIVE", ++ "T76x_COMPUTE_TASKS", ++ "T76x_COMPUTE_THREADS", ++ "T76x_COMPUTE_CYCLES_DESC", ++ "T76x_TRIPIPE_ACTIVE", ++ "T76x_ARITH_WORDS", ++ "T76x_ARITH_CYCLES_REG", ++ "T76x_ARITH_CYCLES_L0", ++ "T76x_ARITH_FRAG_DEPEND", ++ "T76x_LS_WORDS", ++ "T76x_LS_ISSUES", ++ "T76x_LS_REISSUE_ATTR", ++ "T76x_LS_REISSUES_VARY", ++ "T76x_LS_VARY_RV_MISS", ++ "T76x_LS_VARY_RV_HIT", ++ "T76x_LS_NO_UNPARK", ++ "T76x_TEX_WORDS", ++ "T76x_TEX_BUBBLES", ++ "T76x_TEX_WORDS_L0", ++ "T76x_TEX_WORDS_DESC", ++ "T76x_TEX_ISSUES", ++ "T76x_TEX_RECIRC_FMISS", ++ "T76x_TEX_RECIRC_DESC", ++ "T76x_TEX_RECIRC_MULTI", ++ "T76x_TEX_RECIRC_PMISS", ++ "T76x_TEX_RECIRC_CONF", ++ "T76x_LSC_READ_HITS", ++ "T76x_LSC_READ_OP", ++ "T76x_LSC_WRITE_HITS", ++ "T76x_LSC_WRITE_OP", ++ "T76x_LSC_ATOMIC_HITS", ++ "T76x_LSC_ATOMIC_OP", ++ "T76x_LSC_LINE_FETCHES", ++ "T76x_LSC_DIRTY_LINE", ++ "T76x_LSC_SNOOPS", ++ "T76x_AXI_TLB_STALL", ++ "T76x_AXI_TLB_MISS", ++ "T76x_AXI_TLB_TRANSACTION", ++ "T76x_LS_TLB_MISS", ++ "T76x_LS_TLB_HIT", ++ "T76x_AXI_BEATS_READ", ++ "T76x_AXI_BEATS_WRITTEN", + -+/* Frame register reset values. -+ * Taken from the Mali400 TRM, 3.6. Pixel processor control register summary */ -+static const u32 mali_frame_registers_reset_values[_MALI_PP_MAX_FRAME_REGISTERS] = { -+ 0x0, /* Renderer List Address Register */ -+ 0x0, /* Renderer State Word Base Address Register */ -+ 0x0, /* Renderer Vertex Base Register */ -+ 0x2, /* Feature Enable Register */ -+ 0x0, /* Z Clear Value Register */ -+ 0x0, /* Stencil Clear Value Register */ -+ 0x0, /* ABGR Clear Value 0 Register */ -+ 0x0, /* ABGR Clear Value 1 Register */ -+ 0x0, /* ABGR Clear Value 2 Register */ -+ 0x0, /* ABGR Clear Value 3 Register */ -+ 0x0, /* Bounding Box Left Right Register */ -+ 0x0, /* Bounding Box Bottom Register */ -+ 0x0, /* FS Stack Address Register */ -+ 0x0, /* FS Stack Size and Initial Value Register */ -+ 0x0, /* Reserved */ -+ 0x0, /* Reserved */ -+ 0x0, /* Origin Offset X Register */ -+ 0x0, /* Origin Offset Y Register */ -+ 0x75, /* Subpixel Specifier Register */ -+ 0x0, /* Tiebreak mode Register */ -+ 0x0, /* Polygon List Format Register */ -+ 0x0, /* Scaling Register */ -+ 0x0 /* Tilebuffer configuration Register */ ++ /*L2 and MMU */ ++ "", ++ "", ++ "", ++ "", ++ "T76x_MMU_HIT", ++ "T76x_MMU_NEW_MISS", ++ "T76x_MMU_REPLAY_FULL", ++ "T76x_MMU_REPLAY_MISS", ++ "T76x_MMU_TABLE_WALK", ++ "T76x_MMU_REQUESTS", ++ "", ++ "", ++ "T76x_UTLB_HIT", ++ "T76x_UTLB_NEW_MISS", ++ "T76x_UTLB_REPLAY_FULL", ++ "T76x_UTLB_REPLAY_MISS", ++ "T76x_UTLB_STALL", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T76x_L2_EXT_WRITE_BEATS", ++ "T76x_L2_EXT_READ_BEATS", ++ "T76x_L2_ANY_LOOKUP", ++ "T76x_L2_READ_LOOKUP", ++ "T76x_L2_SREAD_LOOKUP", ++ "T76x_L2_READ_REPLAY", ++ "T76x_L2_READ_SNOOP", ++ "T76x_L2_READ_HIT", ++ "T76x_L2_CLEAN_MISS", ++ "T76x_L2_WRITE_LOOKUP", ++ "T76x_L2_SWRITE_LOOKUP", ++ "T76x_L2_WRITE_REPLAY", ++ "T76x_L2_WRITE_SNOOP", ++ "T76x_L2_WRITE_HIT", ++ "T76x_L2_EXT_READ_FULL", ++ "", ++ "T76x_L2_EXT_WRITE_FULL", ++ "T76x_L2_EXT_R_W_HAZARD", ++ "T76x_L2_EXT_READ", ++ "T76x_L2_EXT_READ_LINE", ++ "T76x_L2_EXT_WRITE", ++ "T76x_L2_EXT_WRITE_LINE", ++ "T76x_L2_EXT_WRITE_SMALL", ++ "T76x_L2_EXT_BARRIER", ++ "T76x_L2_EXT_AR_STALL", ++ "T76x_L2_EXT_R_BUF_FULL", ++ "T76x_L2_EXT_RD_BUF_FULL", ++ "T76x_L2_EXT_R_RAW", ++ "T76x_L2_EXT_W_STALL", ++ "T76x_L2_EXT_W_BUF_FULL", ++ "T76x_L2_EXT_R_BUF_FULL", ++ "T76x_L2_TAG_HAZARD", ++ "T76x_L2_SNOOP_FULL", ++ "T76x_L2_REPLAY_FULL" +}; + -+/* WBx register reset values */ -+static const u32 mali_wb_registers_reset_values[_MALI_PP_MAX_WB_REGISTERS] = { -+ 0x0, /* WBx Source Select Register */ -+ 0x0, /* WBx Target Address Register */ -+ 0x0, /* WBx Target Pixel Format Register */ -+ 0x0, /* WBx Target AA Format Register */ -+ 0x0, /* WBx Target Layout */ -+ 0x0, /* WBx Target Scanline Length */ -+ 0x0, /* WBx Target Flags Register */ -+ 0x0, /* WBx MRT Enable Register */ -+ 0x0, /* WBx MRT Offset Register */ -+ 0x0, /* WBx Global Test Enable Register */ -+ 0x0, /* WBx Global Test Reference Value Register */ -+ 0x0 /* WBx Global Test Compare Function Register */ -+}; ++static const char * const hardware_counters_mali_t82x[] = { ++ /* Job Manager */ ++ "", ++ "", ++ "", ++ "", ++ "T82x_MESSAGES_SENT", ++ "T82x_MESSAGES_RECEIVED", ++ "T82x_GPU_ACTIVE", ++ "T82x_IRQ_ACTIVE", ++ "T82x_JS0_JOBS", ++ "T82x_JS0_TASKS", ++ "T82x_JS0_ACTIVE", ++ "", ++ "T82x_JS0_WAIT_READ", ++ "T82x_JS0_WAIT_ISSUE", ++ "T82x_JS0_WAIT_DEPEND", ++ "T82x_JS0_WAIT_FINISH", ++ "T82x_JS1_JOBS", ++ "T82x_JS1_TASKS", ++ "T82x_JS1_ACTIVE", ++ "", ++ "T82x_JS1_WAIT_READ", ++ "T82x_JS1_WAIT_ISSUE", ++ "T82x_JS1_WAIT_DEPEND", ++ "T82x_JS1_WAIT_FINISH", ++ "T82x_JS2_JOBS", ++ "T82x_JS2_TASKS", ++ "T82x_JS2_ACTIVE", ++ "", ++ "T82x_JS2_WAIT_READ", ++ "T82x_JS2_WAIT_ISSUE", ++ "T82x_JS2_WAIT_DEPEND", ++ "T82x_JS2_WAIT_FINISH", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+/* Performance Counter 0 Enable Register reset value */ -+static const u32 mali_perf_cnt_enable_reset_value = 0; ++ /*Tiler */ ++ "", ++ "", ++ "", ++ "T82x_TI_JOBS_PROCESSED", ++ "T82x_TI_TRIANGLES", ++ "T82x_TI_QUADS", ++ "T82x_TI_POLYGONS", ++ "T82x_TI_POINTS", ++ "T82x_TI_LINES", ++ "T82x_TI_FRONT_FACING", ++ "T82x_TI_BACK_FACING", ++ "T82x_TI_PRIM_VISIBLE", ++ "T82x_TI_PRIM_CULLED", ++ "T82x_TI_PRIM_CLIPPED", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T82x_TI_ACTIVE", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+_mali_osk_errcode_t mali_pp_hard_reset(struct mali_pp_core *core) -+{ -+ /* Bus must be stopped before calling this function */ -+ const u32 reset_wait_target_register = MALI200_REG_ADDR_MGMT_PERF_CNT_0_LIMIT; -+ const u32 reset_invalid_value = 0xC0FFE000; -+ const u32 reset_check_value = 0xC01A0000; -+ int i; ++ /* Shader Core */ ++ "", ++ "", ++ "", ++ "", ++ "T82x_FRAG_ACTIVE", ++ "T82x_FRAG_PRIMITIVES", ++ "T82x_FRAG_PRIMITIVES_DROPPED", ++ "T82x_FRAG_CYCLES_DESC", ++ "T82x_FRAG_CYCLES_FPKQ_ACTIVE", ++ "T82x_FRAG_CYCLES_VERT", ++ "T82x_FRAG_CYCLES_TRISETUP", ++ "T82x_FRAG_CYCLES_EZS_ACTIVE", ++ "T82x_FRAG_THREADS", ++ "T82x_FRAG_DUMMY_THREADS", ++ "T82x_FRAG_QUADS_RAST", ++ "T82x_FRAG_QUADS_EZS_TEST", ++ "T82x_FRAG_QUADS_EZS_KILLED", ++ "T82x_FRAG_THREADS_LZS_TEST", ++ "T82x_FRAG_THREADS_LZS_KILLED", ++ "T82x_FRAG_CYCLES_NO_TILE", ++ "T82x_FRAG_NUM_TILES", ++ "T82x_FRAG_TRANS_ELIM", ++ "T82x_COMPUTE_ACTIVE", ++ "T82x_COMPUTE_TASKS", ++ "T82x_COMPUTE_THREADS", ++ "T82x_COMPUTE_CYCLES_DESC", ++ "T82x_TRIPIPE_ACTIVE", ++ "T82x_ARITH_WORDS", ++ "T82x_ARITH_CYCLES_REG", ++ "T82x_ARITH_CYCLES_L0", ++ "T82x_ARITH_FRAG_DEPEND", ++ "T82x_LS_WORDS", ++ "T82x_LS_ISSUES", ++ "T82x_LS_REISSUE_ATTR", ++ "T82x_LS_REISSUES_VARY", ++ "T82x_LS_VARY_RV_MISS", ++ "T82x_LS_VARY_RV_HIT", ++ "T82x_LS_NO_UNPARK", ++ "T82x_TEX_WORDS", ++ "T82x_TEX_BUBBLES", ++ "T82x_TEX_WORDS_L0", ++ "T82x_TEX_WORDS_DESC", ++ "T82x_TEX_ISSUES", ++ "T82x_TEX_RECIRC_FMISS", ++ "T82x_TEX_RECIRC_DESC", ++ "T82x_TEX_RECIRC_MULTI", ++ "T82x_TEX_RECIRC_PMISS", ++ "T82x_TEX_RECIRC_CONF", ++ "T82x_LSC_READ_HITS", ++ "T82x_LSC_READ_OP", ++ "T82x_LSC_WRITE_HITS", ++ "T82x_LSC_WRITE_OP", ++ "T82x_LSC_ATOMIC_HITS", ++ "T82x_LSC_ATOMIC_OP", ++ "T82x_LSC_LINE_FETCHES", ++ "T82x_LSC_DIRTY_LINE", ++ "T82x_LSC_SNOOPS", ++ "T82x_AXI_TLB_STALL", ++ "T82x_AXI_TLB_MISS", ++ "T82x_AXI_TLB_TRANSACTION", ++ "T82x_LS_TLB_MISS", ++ "T82x_LS_TLB_HIT", ++ "T82x_AXI_BEATS_READ", ++ "T82x_AXI_BEATS_WRITTEN", + -+ MALI_DEBUG_ASSERT_POINTER(core); -+ MALI_DEBUG_PRINT(2, ("Mali PP: Hard reset of core %s\n", core->hw_core.description)); ++ /*L2 and MMU */ ++ "", ++ "", ++ "", ++ "", ++ "T82x_MMU_HIT", ++ "T82x_MMU_NEW_MISS", ++ "T82x_MMU_REPLAY_FULL", ++ "T82x_MMU_REPLAY_MISS", ++ "T82x_MMU_TABLE_WALK", ++ "T82x_MMU_REQUESTS", ++ "", ++ "", ++ "T82x_UTLB_HIT", ++ "T82x_UTLB_NEW_MISS", ++ "T82x_UTLB_REPLAY_FULL", ++ "T82x_UTLB_REPLAY_MISS", ++ "T82x_UTLB_STALL", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T82x_L2_EXT_WRITE_BEATS", ++ "T82x_L2_EXT_READ_BEATS", ++ "T82x_L2_ANY_LOOKUP", ++ "T82x_L2_READ_LOOKUP", ++ "T82x_L2_SREAD_LOOKUP", ++ "T82x_L2_READ_REPLAY", ++ "T82x_L2_READ_SNOOP", ++ "T82x_L2_READ_HIT", ++ "T82x_L2_CLEAN_MISS", ++ "T82x_L2_WRITE_LOOKUP", ++ "T82x_L2_SWRITE_LOOKUP", ++ "T82x_L2_WRITE_REPLAY", ++ "T82x_L2_WRITE_SNOOP", ++ "T82x_L2_WRITE_HIT", ++ "T82x_L2_EXT_READ_FULL", ++ "", ++ "T82x_L2_EXT_WRITE_FULL", ++ "T82x_L2_EXT_R_W_HAZARD", ++ "T82x_L2_EXT_READ", ++ "T82x_L2_EXT_READ_LINE", ++ "T82x_L2_EXT_WRITE", ++ "T82x_L2_EXT_WRITE_LINE", ++ "T82x_L2_EXT_WRITE_SMALL", ++ "T82x_L2_EXT_BARRIER", ++ "T82x_L2_EXT_AR_STALL", ++ "T82x_L2_EXT_R_BUF_FULL", ++ "T82x_L2_EXT_RD_BUF_FULL", ++ "T82x_L2_EXT_R_RAW", ++ "T82x_L2_EXT_W_STALL", ++ "T82x_L2_EXT_W_BUF_FULL", ++ "T82x_L2_EXT_R_BUF_FULL", ++ "T82x_L2_TAG_HAZARD", ++ "T82x_L2_SNOOP_FULL", ++ "T82x_L2_REPLAY_FULL" ++}; + -+ /* Set register to a bogus value. The register will be used to detect when reset is complete */ -+ mali_hw_core_register_write_relaxed(&core->hw_core, reset_wait_target_register, reset_invalid_value); -+ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK, MALI200_REG_VAL_IRQ_MASK_NONE); ++static const char * const hardware_counters_mali_t83x[] = { ++ /* Job Manager */ ++ "", ++ "", ++ "", ++ "", ++ "T83x_MESSAGES_SENT", ++ "T83x_MESSAGES_RECEIVED", ++ "T83x_GPU_ACTIVE", ++ "T83x_IRQ_ACTIVE", ++ "T83x_JS0_JOBS", ++ "T83x_JS0_TASKS", ++ "T83x_JS0_ACTIVE", ++ "", ++ "T83x_JS0_WAIT_READ", ++ "T83x_JS0_WAIT_ISSUE", ++ "T83x_JS0_WAIT_DEPEND", ++ "T83x_JS0_WAIT_FINISH", ++ "T83x_JS1_JOBS", ++ "T83x_JS1_TASKS", ++ "T83x_JS1_ACTIVE", ++ "", ++ "T83x_JS1_WAIT_READ", ++ "T83x_JS1_WAIT_ISSUE", ++ "T83x_JS1_WAIT_DEPEND", ++ "T83x_JS1_WAIT_FINISH", ++ "T83x_JS2_JOBS", ++ "T83x_JS2_TASKS", ++ "T83x_JS2_ACTIVE", ++ "", ++ "T83x_JS2_WAIT_READ", ++ "T83x_JS2_WAIT_ISSUE", ++ "T83x_JS2_WAIT_DEPEND", ++ "T83x_JS2_WAIT_FINISH", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+ /* Force core to reset */ -+ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_CTRL_MGMT, MALI200_REG_VAL_CTRL_MGMT_FORCE_RESET); ++ /*Tiler */ ++ "", ++ "", ++ "", ++ "T83x_TI_JOBS_PROCESSED", ++ "T83x_TI_TRIANGLES", ++ "T83x_TI_QUADS", ++ "T83x_TI_POLYGONS", ++ "T83x_TI_POINTS", ++ "T83x_TI_LINES", ++ "T83x_TI_FRONT_FACING", ++ "T83x_TI_BACK_FACING", ++ "T83x_TI_PRIM_VISIBLE", ++ "T83x_TI_PRIM_CULLED", ++ "T83x_TI_PRIM_CLIPPED", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T83x_TI_ACTIVE", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+ /* Wait for reset to be complete */ -+ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; i++) { -+ mali_hw_core_register_write(&core->hw_core, reset_wait_target_register, reset_check_value); -+ if (reset_check_value == mali_hw_core_register_read(&core->hw_core, reset_wait_target_register)) { -+ break; -+ } -+ } ++ /* Shader Core */ ++ "", ++ "", ++ "", ++ "", ++ "T83x_FRAG_ACTIVE", ++ "T83x_FRAG_PRIMITIVES", ++ "T83x_FRAG_PRIMITIVES_DROPPED", ++ "T83x_FRAG_CYCLES_DESC", ++ "T83x_FRAG_CYCLES_FPKQ_ACTIVE", ++ "T83x_FRAG_CYCLES_VERT", ++ "T83x_FRAG_CYCLES_TRISETUP", ++ "T83x_FRAG_CYCLES_EZS_ACTIVE", ++ "T83x_FRAG_THREADS", ++ "T83x_FRAG_DUMMY_THREADS", ++ "T83x_FRAG_QUADS_RAST", ++ "T83x_FRAG_QUADS_EZS_TEST", ++ "T83x_FRAG_QUADS_EZS_KILLED", ++ "T83x_FRAG_THREADS_LZS_TEST", ++ "T83x_FRAG_THREADS_LZS_KILLED", ++ "T83x_FRAG_CYCLES_NO_TILE", ++ "T83x_FRAG_NUM_TILES", ++ "T83x_FRAG_TRANS_ELIM", ++ "T83x_COMPUTE_ACTIVE", ++ "T83x_COMPUTE_TASKS", ++ "T83x_COMPUTE_THREADS", ++ "T83x_COMPUTE_CYCLES_DESC", ++ "T83x_TRIPIPE_ACTIVE", ++ "T83x_ARITH_WORDS", ++ "T83x_ARITH_CYCLES_REG", ++ "T83x_ARITH_CYCLES_L0", ++ "T83x_ARITH_FRAG_DEPEND", ++ "T83x_LS_WORDS", ++ "T83x_LS_ISSUES", ++ "T83x_LS_REISSUE_ATTR", ++ "T83x_LS_REISSUES_VARY", ++ "T83x_LS_VARY_RV_MISS", ++ "T83x_LS_VARY_RV_HIT", ++ "T83x_LS_NO_UNPARK", ++ "T83x_TEX_WORDS", ++ "T83x_TEX_BUBBLES", ++ "T83x_TEX_WORDS_L0", ++ "T83x_TEX_WORDS_DESC", ++ "T83x_TEX_ISSUES", ++ "T83x_TEX_RECIRC_FMISS", ++ "T83x_TEX_RECIRC_DESC", ++ "T83x_TEX_RECIRC_MULTI", ++ "T83x_TEX_RECIRC_PMISS", ++ "T83x_TEX_RECIRC_CONF", ++ "T83x_LSC_READ_HITS", ++ "T83x_LSC_READ_OP", ++ "T83x_LSC_WRITE_HITS", ++ "T83x_LSC_WRITE_OP", ++ "T83x_LSC_ATOMIC_HITS", ++ "T83x_LSC_ATOMIC_OP", ++ "T83x_LSC_LINE_FETCHES", ++ "T83x_LSC_DIRTY_LINE", ++ "T83x_LSC_SNOOPS", ++ "T83x_AXI_TLB_STALL", ++ "T83x_AXI_TLB_MISS", ++ "T83x_AXI_TLB_TRANSACTION", ++ "T83x_LS_TLB_MISS", ++ "T83x_LS_TLB_HIT", ++ "T83x_AXI_BEATS_READ", ++ "T83x_AXI_BEATS_WRITTEN", + -+ if (MALI_REG_POLL_COUNT_FAST == i) { -+ MALI_PRINT_ERROR(("Mali PP: The hard reset loop didn't work, unable to recover\n")); -+ } ++ /*L2 and MMU */ ++ "", ++ "", ++ "", ++ "", ++ "T83x_MMU_HIT", ++ "T83x_MMU_NEW_MISS", ++ "T83x_MMU_REPLAY_FULL", ++ "T83x_MMU_REPLAY_MISS", ++ "T83x_MMU_TABLE_WALK", ++ "T83x_MMU_REQUESTS", ++ "", ++ "", ++ "T83x_UTLB_HIT", ++ "T83x_UTLB_NEW_MISS", ++ "T83x_UTLB_REPLAY_FULL", ++ "T83x_UTLB_REPLAY_MISS", ++ "T83x_UTLB_STALL", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T83x_L2_EXT_WRITE_BEATS", ++ "T83x_L2_EXT_READ_BEATS", ++ "T83x_L2_ANY_LOOKUP", ++ "T83x_L2_READ_LOOKUP", ++ "T83x_L2_SREAD_LOOKUP", ++ "T83x_L2_READ_REPLAY", ++ "T83x_L2_READ_SNOOP", ++ "T83x_L2_READ_HIT", ++ "T83x_L2_CLEAN_MISS", ++ "T83x_L2_WRITE_LOOKUP", ++ "T83x_L2_SWRITE_LOOKUP", ++ "T83x_L2_WRITE_REPLAY", ++ "T83x_L2_WRITE_SNOOP", ++ "T83x_L2_WRITE_HIT", ++ "T83x_L2_EXT_READ_FULL", ++ "", ++ "T83x_L2_EXT_WRITE_FULL", ++ "T83x_L2_EXT_R_W_HAZARD", ++ "T83x_L2_EXT_READ", ++ "T83x_L2_EXT_READ_LINE", ++ "T83x_L2_EXT_WRITE", ++ "T83x_L2_EXT_WRITE_LINE", ++ "T83x_L2_EXT_WRITE_SMALL", ++ "T83x_L2_EXT_BARRIER", ++ "T83x_L2_EXT_AR_STALL", ++ "T83x_L2_EXT_R_BUF_FULL", ++ "T83x_L2_EXT_RD_BUF_FULL", ++ "T83x_L2_EXT_R_RAW", ++ "T83x_L2_EXT_W_STALL", ++ "T83x_L2_EXT_W_BUF_FULL", ++ "T83x_L2_EXT_R_BUF_FULL", ++ "T83x_L2_TAG_HAZARD", ++ "T83x_L2_SNOOP_FULL", ++ "T83x_L2_REPLAY_FULL" ++}; + -+ mali_hw_core_register_write(&core->hw_core, reset_wait_target_register, 0x00000000); /* set it back to the default */ -+ /* Re-enable interrupts */ -+ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_CLEAR, MALI200_REG_VAL_IRQ_MASK_ALL); -+ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK, MALI200_REG_VAL_IRQ_MASK_USED); ++static const char * const hardware_counters_mali_t86x[] = { ++ /* Job Manager */ ++ "", ++ "", ++ "", ++ "", ++ "T86x_MESSAGES_SENT", ++ "T86x_MESSAGES_RECEIVED", ++ "T86x_GPU_ACTIVE", ++ "T86x_IRQ_ACTIVE", ++ "T86x_JS0_JOBS", ++ "T86x_JS0_TASKS", ++ "T86x_JS0_ACTIVE", ++ "", ++ "T86x_JS0_WAIT_READ", ++ "T86x_JS0_WAIT_ISSUE", ++ "T86x_JS0_WAIT_DEPEND", ++ "T86x_JS0_WAIT_FINISH", ++ "T86x_JS1_JOBS", ++ "T86x_JS1_TASKS", ++ "T86x_JS1_ACTIVE", ++ "", ++ "T86x_JS1_WAIT_READ", ++ "T86x_JS1_WAIT_ISSUE", ++ "T86x_JS1_WAIT_DEPEND", ++ "T86x_JS1_WAIT_FINISH", ++ "T86x_JS2_JOBS", ++ "T86x_JS2_TASKS", ++ "T86x_JS2_ACTIVE", ++ "", ++ "T86x_JS2_WAIT_READ", ++ "T86x_JS2_WAIT_ISSUE", ++ "T86x_JS2_WAIT_DEPEND", ++ "T86x_JS2_WAIT_FINISH", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+ return _MALI_OSK_ERR_OK; -+} ++ /*Tiler */ ++ "", ++ "", ++ "", ++ "T86x_TI_JOBS_PROCESSED", ++ "T86x_TI_TRIANGLES", ++ "T86x_TI_QUADS", ++ "T86x_TI_POLYGONS", ++ "T86x_TI_POINTS", ++ "T86x_TI_LINES", ++ "T86x_TI_VCACHE_HIT", ++ "T86x_TI_VCACHE_MISS", ++ "T86x_TI_FRONT_FACING", ++ "T86x_TI_BACK_FACING", ++ "T86x_TI_PRIM_VISIBLE", ++ "T86x_TI_PRIM_CULLED", ++ "T86x_TI_PRIM_CLIPPED", ++ "T86x_TI_LEVEL0", ++ "T86x_TI_LEVEL1", ++ "T86x_TI_LEVEL2", ++ "T86x_TI_LEVEL3", ++ "T86x_TI_LEVEL4", ++ "T86x_TI_LEVEL5", ++ "T86x_TI_LEVEL6", ++ "T86x_TI_LEVEL7", ++ "T86x_TI_COMMAND_1", ++ "T86x_TI_COMMAND_2", ++ "T86x_TI_COMMAND_3", ++ "T86x_TI_COMMAND_4", ++ "T86x_TI_COMMAND_5_7", ++ "T86x_TI_COMMAND_8_15", ++ "T86x_TI_COMMAND_16_63", ++ "T86x_TI_COMMAND_64", ++ "T86x_TI_COMPRESS_IN", ++ "T86x_TI_COMPRESS_OUT", ++ "T86x_TI_COMPRESS_FLUSH", ++ "T86x_TI_TIMESTAMPS", ++ "T86x_TI_PCACHE_HIT", ++ "T86x_TI_PCACHE_MISS", ++ "T86x_TI_PCACHE_LINE", ++ "T86x_TI_PCACHE_STALL", ++ "T86x_TI_WRBUF_HIT", ++ "T86x_TI_WRBUF_MISS", ++ "T86x_TI_WRBUF_LINE", ++ "T86x_TI_WRBUF_PARTIAL", ++ "T86x_TI_WRBUF_STALL", ++ "T86x_TI_ACTIVE", ++ "T86x_TI_LOADING_DESC", ++ "T86x_TI_INDEX_WAIT", ++ "T86x_TI_INDEX_RANGE_WAIT", ++ "T86x_TI_VERTEX_WAIT", ++ "T86x_TI_PCACHE_WAIT", ++ "T86x_TI_WRBUF_WAIT", ++ "T86x_TI_BUS_READ", ++ "T86x_TI_BUS_WRITE", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T86x_TI_UTLB_HIT", ++ "T86x_TI_UTLB_NEW_MISS", ++ "T86x_TI_UTLB_REPLAY_FULL", ++ "T86x_TI_UTLB_REPLAY_MISS", ++ "T86x_TI_UTLB_STALL", + -+void mali_pp_reset_async(struct mali_pp_core *core) -+{ -+ MALI_DEBUG_ASSERT_POINTER(core); ++ /* Shader Core */ ++ "", ++ "", ++ "", ++ "", ++ "T86x_FRAG_ACTIVE", ++ "T86x_FRAG_PRIMITIVES", ++ "T86x_FRAG_PRIMITIVES_DROPPED", ++ "T86x_FRAG_CYCLES_DESC", ++ "T86x_FRAG_CYCLES_FPKQ_ACTIVE", ++ "T86x_FRAG_CYCLES_VERT", ++ "T86x_FRAG_CYCLES_TRISETUP", ++ "T86x_FRAG_CYCLES_EZS_ACTIVE", ++ "T86x_FRAG_THREADS", ++ "T86x_FRAG_DUMMY_THREADS", ++ "T86x_FRAG_QUADS_RAST", ++ "T86x_FRAG_QUADS_EZS_TEST", ++ "T86x_FRAG_QUADS_EZS_KILLED", ++ "T86x_FRAG_THREADS_LZS_TEST", ++ "T86x_FRAG_THREADS_LZS_KILLED", ++ "T86x_FRAG_CYCLES_NO_TILE", ++ "T86x_FRAG_NUM_TILES", ++ "T86x_FRAG_TRANS_ELIM", ++ "T86x_COMPUTE_ACTIVE", ++ "T86x_COMPUTE_TASKS", ++ "T86x_COMPUTE_THREADS", ++ "T86x_COMPUTE_CYCLES_DESC", ++ "T86x_TRIPIPE_ACTIVE", ++ "T86x_ARITH_WORDS", ++ "T86x_ARITH_CYCLES_REG", ++ "T86x_ARITH_CYCLES_L0", ++ "T86x_ARITH_FRAG_DEPEND", ++ "T86x_LS_WORDS", ++ "T86x_LS_ISSUES", ++ "T86x_LS_REISSUE_ATTR", ++ "T86x_LS_REISSUES_VARY", ++ "T86x_LS_VARY_RV_MISS", ++ "T86x_LS_VARY_RV_HIT", ++ "T86x_LS_NO_UNPARK", ++ "T86x_TEX_WORDS", ++ "T86x_TEX_BUBBLES", ++ "T86x_TEX_WORDS_L0", ++ "T86x_TEX_WORDS_DESC", ++ "T86x_TEX_ISSUES", ++ "T86x_TEX_RECIRC_FMISS", ++ "T86x_TEX_RECIRC_DESC", ++ "T86x_TEX_RECIRC_MULTI", ++ "T86x_TEX_RECIRC_PMISS", ++ "T86x_TEX_RECIRC_CONF", ++ "T86x_LSC_READ_HITS", ++ "T86x_LSC_READ_OP", ++ "T86x_LSC_WRITE_HITS", ++ "T86x_LSC_WRITE_OP", ++ "T86x_LSC_ATOMIC_HITS", ++ "T86x_LSC_ATOMIC_OP", ++ "T86x_LSC_LINE_FETCHES", ++ "T86x_LSC_DIRTY_LINE", ++ "T86x_LSC_SNOOPS", ++ "T86x_AXI_TLB_STALL", ++ "T86x_AXI_TLB_MISS", ++ "T86x_AXI_TLB_TRANSACTION", ++ "T86x_LS_TLB_MISS", ++ "T86x_LS_TLB_HIT", ++ "T86x_AXI_BEATS_READ", ++ "T86x_AXI_BEATS_WRITTEN", + -+ MALI_DEBUG_PRINT(4, ("Mali PP: Reset of core %s\n", core->hw_core.description)); ++ /*L2 and MMU */ ++ "", ++ "", ++ "", ++ "", ++ "T86x_MMU_HIT", ++ "T86x_MMU_NEW_MISS", ++ "T86x_MMU_REPLAY_FULL", ++ "T86x_MMU_REPLAY_MISS", ++ "T86x_MMU_TABLE_WALK", ++ "T86x_MMU_REQUESTS", ++ "", ++ "", ++ "T86x_UTLB_HIT", ++ "T86x_UTLB_NEW_MISS", ++ "T86x_UTLB_REPLAY_FULL", ++ "T86x_UTLB_REPLAY_MISS", ++ "T86x_UTLB_STALL", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T86x_L2_EXT_WRITE_BEATS", ++ "T86x_L2_EXT_READ_BEATS", ++ "T86x_L2_ANY_LOOKUP", ++ "T86x_L2_READ_LOOKUP", ++ "T86x_L2_SREAD_LOOKUP", ++ "T86x_L2_READ_REPLAY", ++ "T86x_L2_READ_SNOOP", ++ "T86x_L2_READ_HIT", ++ "T86x_L2_CLEAN_MISS", ++ "T86x_L2_WRITE_LOOKUP", ++ "T86x_L2_SWRITE_LOOKUP", ++ "T86x_L2_WRITE_REPLAY", ++ "T86x_L2_WRITE_SNOOP", ++ "T86x_L2_WRITE_HIT", ++ "T86x_L2_EXT_READ_FULL", ++ "", ++ "T86x_L2_EXT_WRITE_FULL", ++ "T86x_L2_EXT_R_W_HAZARD", ++ "T86x_L2_EXT_READ", ++ "T86x_L2_EXT_READ_LINE", ++ "T86x_L2_EXT_WRITE", ++ "T86x_L2_EXT_WRITE_LINE", ++ "T86x_L2_EXT_WRITE_SMALL", ++ "T86x_L2_EXT_BARRIER", ++ "T86x_L2_EXT_AR_STALL", ++ "T86x_L2_EXT_R_BUF_FULL", ++ "T86x_L2_EXT_RD_BUF_FULL", ++ "T86x_L2_EXT_R_RAW", ++ "T86x_L2_EXT_W_STALL", ++ "T86x_L2_EXT_W_BUF_FULL", ++ "T86x_L2_EXT_R_BUF_FULL", ++ "T86x_L2_TAG_HAZARD", ++ "T86x_L2_SNOOP_FULL", ++ "T86x_L2_REPLAY_FULL" ++}; + -+ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK, 0); /* disable the IRQs */ -+ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_RAWSTAT, MALI200_REG_VAL_IRQ_MASK_ALL); -+ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_CTRL_MGMT, MALI400PP_REG_VAL_CTRL_MGMT_SOFT_RESET); -+} ++static const char * const hardware_counters_mali_t88x[] = { ++ /* Job Manager */ ++ "", ++ "", ++ "", ++ "", ++ "T88x_MESSAGES_SENT", ++ "T88x_MESSAGES_RECEIVED", ++ "T88x_GPU_ACTIVE", ++ "T88x_IRQ_ACTIVE", ++ "T88x_JS0_JOBS", ++ "T88x_JS0_TASKS", ++ "T88x_JS0_ACTIVE", ++ "", ++ "T88x_JS0_WAIT_READ", ++ "T88x_JS0_WAIT_ISSUE", ++ "T88x_JS0_WAIT_DEPEND", ++ "T88x_JS0_WAIT_FINISH", ++ "T88x_JS1_JOBS", ++ "T88x_JS1_TASKS", ++ "T88x_JS1_ACTIVE", ++ "", ++ "T88x_JS1_WAIT_READ", ++ "T88x_JS1_WAIT_ISSUE", ++ "T88x_JS1_WAIT_DEPEND", ++ "T88x_JS1_WAIT_FINISH", ++ "T88x_JS2_JOBS", ++ "T88x_JS2_TASKS", ++ "T88x_JS2_ACTIVE", ++ "", ++ "T88x_JS2_WAIT_READ", ++ "T88x_JS2_WAIT_ISSUE", ++ "T88x_JS2_WAIT_DEPEND", ++ "T88x_JS2_WAIT_FINISH", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+_mali_osk_errcode_t mali_pp_reset_wait(struct mali_pp_core *core) -+{ -+ int i; -+ u32 rawstat = 0; ++ /*Tiler */ ++ "", ++ "", ++ "", ++ "T88x_TI_JOBS_PROCESSED", ++ "T88x_TI_TRIANGLES", ++ "T88x_TI_QUADS", ++ "T88x_TI_POLYGONS", ++ "T88x_TI_POINTS", ++ "T88x_TI_LINES", ++ "T88x_TI_VCACHE_HIT", ++ "T88x_TI_VCACHE_MISS", ++ "T88x_TI_FRONT_FACING", ++ "T88x_TI_BACK_FACING", ++ "T88x_TI_PRIM_VISIBLE", ++ "T88x_TI_PRIM_CULLED", ++ "T88x_TI_PRIM_CLIPPED", ++ "T88x_TI_LEVEL0", ++ "T88x_TI_LEVEL1", ++ "T88x_TI_LEVEL2", ++ "T88x_TI_LEVEL3", ++ "T88x_TI_LEVEL4", ++ "T88x_TI_LEVEL5", ++ "T88x_TI_LEVEL6", ++ "T88x_TI_LEVEL7", ++ "T88x_TI_COMMAND_1", ++ "T88x_TI_COMMAND_2", ++ "T88x_TI_COMMAND_3", ++ "T88x_TI_COMMAND_4", ++ "T88x_TI_COMMAND_5_7", ++ "T88x_TI_COMMAND_8_15", ++ "T88x_TI_COMMAND_16_63", ++ "T88x_TI_COMMAND_64", ++ "T88x_TI_COMPRESS_IN", ++ "T88x_TI_COMPRESS_OUT", ++ "T88x_TI_COMPRESS_FLUSH", ++ "T88x_TI_TIMESTAMPS", ++ "T88x_TI_PCACHE_HIT", ++ "T88x_TI_PCACHE_MISS", ++ "T88x_TI_PCACHE_LINE", ++ "T88x_TI_PCACHE_STALL", ++ "T88x_TI_WRBUF_HIT", ++ "T88x_TI_WRBUF_MISS", ++ "T88x_TI_WRBUF_LINE", ++ "T88x_TI_WRBUF_PARTIAL", ++ "T88x_TI_WRBUF_STALL", ++ "T88x_TI_ACTIVE", ++ "T88x_TI_LOADING_DESC", ++ "T88x_TI_INDEX_WAIT", ++ "T88x_TI_INDEX_RANGE_WAIT", ++ "T88x_TI_VERTEX_WAIT", ++ "T88x_TI_PCACHE_WAIT", ++ "T88x_TI_WRBUF_WAIT", ++ "T88x_TI_BUS_READ", ++ "T88x_TI_BUS_WRITE", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T88x_TI_UTLB_HIT", ++ "T88x_TI_UTLB_NEW_MISS", ++ "T88x_TI_UTLB_REPLAY_FULL", ++ "T88x_TI_UTLB_REPLAY_MISS", ++ "T88x_TI_UTLB_STALL", + -+ for (i = 0; i < MALI_REG_POLL_COUNT_FAST; i++) { -+ u32 status = mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_STATUS); -+ if (!(status & MALI200_REG_VAL_STATUS_RENDERING_ACTIVE)) { -+ rawstat = mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_RAWSTAT); -+ if (rawstat == MALI400PP_REG_VAL_IRQ_RESET_COMPLETED) { -+ break; -+ } -+ } -+ } ++ /* Shader Core */ ++ "", ++ "", ++ "", ++ "", ++ "T88x_FRAG_ACTIVE", ++ "T88x_FRAG_PRIMITIVES", ++ "T88x_FRAG_PRIMITIVES_DROPPED", ++ "T88x_FRAG_CYCLES_DESC", ++ "T88x_FRAG_CYCLES_FPKQ_ACTIVE", ++ "T88x_FRAG_CYCLES_VERT", ++ "T88x_FRAG_CYCLES_TRISETUP", ++ "T88x_FRAG_CYCLES_EZS_ACTIVE", ++ "T88x_FRAG_THREADS", ++ "T88x_FRAG_DUMMY_THREADS", ++ "T88x_FRAG_QUADS_RAST", ++ "T88x_FRAG_QUADS_EZS_TEST", ++ "T88x_FRAG_QUADS_EZS_KILLED", ++ "T88x_FRAG_THREADS_LZS_TEST", ++ "T88x_FRAG_THREADS_LZS_KILLED", ++ "T88x_FRAG_CYCLES_NO_TILE", ++ "T88x_FRAG_NUM_TILES", ++ "T88x_FRAG_TRANS_ELIM", ++ "T88x_COMPUTE_ACTIVE", ++ "T88x_COMPUTE_TASKS", ++ "T88x_COMPUTE_THREADS", ++ "T88x_COMPUTE_CYCLES_DESC", ++ "T88x_TRIPIPE_ACTIVE", ++ "T88x_ARITH_WORDS", ++ "T88x_ARITH_CYCLES_REG", ++ "T88x_ARITH_CYCLES_L0", ++ "T88x_ARITH_FRAG_DEPEND", ++ "T88x_LS_WORDS", ++ "T88x_LS_ISSUES", ++ "T88x_LS_REISSUE_ATTR", ++ "T88x_LS_REISSUES_VARY", ++ "T88x_LS_VARY_RV_MISS", ++ "T88x_LS_VARY_RV_HIT", ++ "T88x_LS_NO_UNPARK", ++ "T88x_TEX_WORDS", ++ "T88x_TEX_BUBBLES", ++ "T88x_TEX_WORDS_L0", ++ "T88x_TEX_WORDS_DESC", ++ "T88x_TEX_ISSUES", ++ "T88x_TEX_RECIRC_FMISS", ++ "T88x_TEX_RECIRC_DESC", ++ "T88x_TEX_RECIRC_MULTI", ++ "T88x_TEX_RECIRC_PMISS", ++ "T88x_TEX_RECIRC_CONF", ++ "T88x_LSC_READ_HITS", ++ "T88x_LSC_READ_OP", ++ "T88x_LSC_WRITE_HITS", ++ "T88x_LSC_WRITE_OP", ++ "T88x_LSC_ATOMIC_HITS", ++ "T88x_LSC_ATOMIC_OP", ++ "T88x_LSC_LINE_FETCHES", ++ "T88x_LSC_DIRTY_LINE", ++ "T88x_LSC_SNOOPS", ++ "T88x_AXI_TLB_STALL", ++ "T88x_AXI_TLB_MISS", ++ "T88x_AXI_TLB_TRANSACTION", ++ "T88x_LS_TLB_MISS", ++ "T88x_LS_TLB_HIT", ++ "T88x_AXI_BEATS_READ", ++ "T88x_AXI_BEATS_WRITTEN", + -+ if (i == MALI_REG_POLL_COUNT_FAST) { -+ MALI_PRINT_ERROR(("Mali PP: Failed to reset core %s, rawstat: 0x%08x\n", -+ core->hw_core.description, rawstat)); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ /*L2 and MMU */ ++ "", ++ "", ++ "", ++ "", ++ "T88x_MMU_HIT", ++ "T88x_MMU_NEW_MISS", ++ "T88x_MMU_REPLAY_FULL", ++ "T88x_MMU_REPLAY_MISS", ++ "T88x_MMU_TABLE_WALK", ++ "T88x_MMU_REQUESTS", ++ "", ++ "", ++ "T88x_UTLB_HIT", ++ "T88x_UTLB_NEW_MISS", ++ "T88x_UTLB_REPLAY_FULL", ++ "T88x_UTLB_REPLAY_MISS", ++ "T88x_UTLB_STALL", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "T88x_L2_EXT_WRITE_BEATS", ++ "T88x_L2_EXT_READ_BEATS", ++ "T88x_L2_ANY_LOOKUP", ++ "T88x_L2_READ_LOOKUP", ++ "T88x_L2_SREAD_LOOKUP", ++ "T88x_L2_READ_REPLAY", ++ "T88x_L2_READ_SNOOP", ++ "T88x_L2_READ_HIT", ++ "T88x_L2_CLEAN_MISS", ++ "T88x_L2_WRITE_LOOKUP", ++ "T88x_L2_SWRITE_LOOKUP", ++ "T88x_L2_WRITE_REPLAY", ++ "T88x_L2_WRITE_SNOOP", ++ "T88x_L2_WRITE_HIT", ++ "T88x_L2_EXT_READ_FULL", ++ "", ++ "T88x_L2_EXT_WRITE_FULL", ++ "T88x_L2_EXT_R_W_HAZARD", ++ "T88x_L2_EXT_READ", ++ "T88x_L2_EXT_READ_LINE", ++ "T88x_L2_EXT_WRITE", ++ "T88x_L2_EXT_WRITE_LINE", ++ "T88x_L2_EXT_WRITE_SMALL", ++ "T88x_L2_EXT_BARRIER", ++ "T88x_L2_EXT_AR_STALL", ++ "T88x_L2_EXT_R_BUF_FULL", ++ "T88x_L2_EXT_RD_BUF_FULL", ++ "T88x_L2_EXT_R_RAW", ++ "T88x_L2_EXT_W_STALL", ++ "T88x_L2_EXT_W_BUF_FULL", ++ "T88x_L2_EXT_R_BUF_FULL", ++ "T88x_L2_TAG_HAZARD", ++ "T88x_L2_SNOOP_FULL", ++ "T88x_L2_REPLAY_FULL" ++}; + -+ /* Re-enable interrupts */ -+ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_CLEAR, MALI200_REG_VAL_IRQ_MASK_ALL); -+ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK, MALI200_REG_VAL_IRQ_MASK_USED); ++#include "mali_kbase_gator_hwcnt_names_tmix.h" + -+ return _MALI_OSK_ERR_OK; -+} ++#include "mali_kbase_gator_hwcnt_names_thex.h" + -+_mali_osk_errcode_t mali_pp_reset(struct mali_pp_core *core) -+{ -+ mali_pp_reset_async(core); -+ return mali_pp_reset_wait(core); -+} ++#include "mali_kbase_gator_hwcnt_names_tsix.h" + -+void mali_pp_job_start(struct mali_pp_core *core, struct mali_pp_job *job, u32 sub_job, mali_bool restart_virtual) -+{ -+ u32 relative_address; -+ u32 start_index; -+ u32 nr_of_regs; -+ u32 *frame_registers = mali_pp_job_get_frame_registers(job); -+ u32 *wb0_registers = mali_pp_job_get_wb0_registers(job); -+ u32 *wb1_registers = mali_pp_job_get_wb1_registers(job); -+ u32 *wb2_registers = mali_pp_job_get_wb2_registers(job); -+ u32 counter_src0 = mali_pp_job_get_perf_counter_src0(job, sub_job); -+ u32 counter_src1 = mali_pp_job_get_perf_counter_src1(job, sub_job); + -+ MALI_DEBUG_ASSERT_POINTER(core); ++#ifdef MALI_INCLUDE_TKAX ++#include "mali_kbase_gator_hwcnt_names_tkax.h" ++#endif /* MALI_INCLUDE_TKAX */ + -+ /* Write frame registers */ ++#endif +diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h +new file mode 100755 +index 000000000..bcceef4fc +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h +@@ -0,0 +1,291 @@ ++/* ++ * ++ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ /* -+ * There are two frame registers which are different for each sub job: -+ * 1. The Renderer List Address Register (MALI200_REG_ADDR_FRAME) -+ * 2. The FS Stack Address Register (MALI200_REG_ADDR_STACK) -+ */ -+ mali_hw_core_register_write_relaxed_conditional(&core->hw_core, MALI200_REG_ADDR_FRAME, mali_pp_job_get_addr_frame(job, sub_job), mali_frame_registers_reset_values[MALI200_REG_ADDR_FRAME / sizeof(u32)]); + -+ /* For virtual jobs, the stack address shouldn't be broadcast but written individually */ -+ if (!mali_pp_job_is_virtual(job) || restart_virtual) { -+ mali_hw_core_register_write_relaxed_conditional(&core->hw_core, MALI200_REG_ADDR_STACK, mali_pp_job_get_addr_stack(job, sub_job), mali_frame_registers_reset_values[MALI200_REG_ADDR_STACK / sizeof(u32)]); -+ } + -+ /* Write registers between MALI200_REG_ADDR_FRAME and MALI200_REG_ADDR_STACK */ -+ relative_address = MALI200_REG_ADDR_RSW; -+ start_index = MALI200_REG_ADDR_RSW / sizeof(u32); -+ nr_of_regs = (MALI200_REG_ADDR_STACK - MALI200_REG_ADDR_RSW) / sizeof(u32); ++/* ++ * This header was autogenerated, it should not be edited. ++ */ + -+ mali_hw_core_register_write_array_relaxed_conditional(&core->hw_core, -+ relative_address, &frame_registers[start_index], -+ nr_of_regs, &mali_frame_registers_reset_values[start_index]); ++#ifndef _KBASE_GATOR_HWCNT_NAMES_THEX_H_ ++#define _KBASE_GATOR_HWCNT_NAMES_THEX_H_ + -+ /* MALI200_REG_ADDR_STACK_SIZE */ -+ relative_address = MALI200_REG_ADDR_STACK_SIZE; -+ start_index = MALI200_REG_ADDR_STACK_SIZE / sizeof(u32); ++static const char * const hardware_counters_mali_tHEx[] = { ++ /* Performance counters for the Job Manager */ ++ "", ++ "", ++ "", ++ "", ++ "THEx_MESSAGES_SENT", ++ "THEx_MESSAGES_RECEIVED", ++ "THEx_GPU_ACTIVE", ++ "THEx_IRQ_ACTIVE", ++ "THEx_JS0_JOBS", ++ "THEx_JS0_TASKS", ++ "THEx_JS0_ACTIVE", ++ "", ++ "THEx_JS0_WAIT_READ", ++ "THEx_JS0_WAIT_ISSUE", ++ "THEx_JS0_WAIT_DEPEND", ++ "THEx_JS0_WAIT_FINISH", ++ "THEx_JS1_JOBS", ++ "THEx_JS1_TASKS", ++ "THEx_JS1_ACTIVE", ++ "", ++ "THEx_JS1_WAIT_READ", ++ "THEx_JS1_WAIT_ISSUE", ++ "THEx_JS1_WAIT_DEPEND", ++ "THEx_JS1_WAIT_FINISH", ++ "THEx_JS2_JOBS", ++ "THEx_JS2_TASKS", ++ "THEx_JS2_ACTIVE", ++ "", ++ "THEx_JS2_WAIT_READ", ++ "THEx_JS2_WAIT_ISSUE", ++ "THEx_JS2_WAIT_DEPEND", ++ "THEx_JS2_WAIT_FINISH", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+ mali_hw_core_register_write_relaxed_conditional(&core->hw_core, -+ relative_address, frame_registers[start_index], -+ mali_frame_registers_reset_values[start_index]); -+ -+ /* Skip 2 reserved registers */ -+ -+ /* Write remaining registers */ -+ relative_address = MALI200_REG_ADDR_ORIGIN_OFFSET_X; -+ start_index = MALI200_REG_ADDR_ORIGIN_OFFSET_X / sizeof(u32); -+ nr_of_regs = MALI_PP_MALI400_NUM_FRAME_REGISTERS - MALI200_REG_ADDR_ORIGIN_OFFSET_X / sizeof(u32); -+ -+ mali_hw_core_register_write_array_relaxed_conditional(&core->hw_core, -+ relative_address, &frame_registers[start_index], -+ nr_of_regs, &mali_frame_registers_reset_values[start_index]); -+ -+ /* Write WBx registers */ -+ if (wb0_registers[0]) { /* M200_WB0_REG_SOURCE_SELECT register */ -+ mali_hw_core_register_write_array_relaxed_conditional(&core->hw_core, MALI200_REG_ADDR_WB0, wb0_registers, _MALI_PP_MAX_WB_REGISTERS, mali_wb_registers_reset_values); -+ } -+ -+ if (wb1_registers[0]) { /* M200_WB1_REG_SOURCE_SELECT register */ -+ mali_hw_core_register_write_array_relaxed_conditional(&core->hw_core, MALI200_REG_ADDR_WB1, wb1_registers, _MALI_PP_MAX_WB_REGISTERS, mali_wb_registers_reset_values); -+ } -+ -+ if (wb2_registers[0]) { /* M200_WB2_REG_SOURCE_SELECT register */ -+ mali_hw_core_register_write_array_relaxed_conditional(&core->hw_core, MALI200_REG_ADDR_WB2, wb2_registers, _MALI_PP_MAX_WB_REGISTERS, mali_wb_registers_reset_values); -+ } -+ -+ if (MALI_HW_CORE_NO_COUNTER != counter_src0) { -+ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_0_SRC, counter_src0); -+ mali_hw_core_register_write_relaxed_conditional(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_0_ENABLE, MALI200_REG_VAL_PERF_CNT_ENABLE, mali_perf_cnt_enable_reset_value); -+ } -+ if (MALI_HW_CORE_NO_COUNTER != counter_src1) { -+ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_1_SRC, counter_src1); -+ mali_hw_core_register_write_relaxed_conditional(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_1_ENABLE, MALI200_REG_VAL_PERF_CNT_ENABLE, mali_perf_cnt_enable_reset_value); -+ } -+ -+#ifdef CONFIG_MALI400_HEATMAPS_ENABLED -+ if (job->uargs.perf_counter_flag & _MALI_PERFORMANCE_COUNTER_FLAG_HEATMAP_ENABLE) { -+ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_MGMT_PERFMON_CONTR, ((job->uargs.tilesx & 0x3FF) << 16) | 1); -+ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_MGMT_PERFMON_BASE, job->uargs.heatmap_mem & 0xFFFFFFF8); -+ } -+#endif /* CONFIG_MALI400_HEATMAPS_ENABLED */ -+ -+ MALI_DEBUG_PRINT(3, ("Mali PP: Starting job 0x%08X part %u/%u on PP core %s\n", job, sub_job + 1, mali_pp_job_get_sub_job_count(job), core->hw_core.description)); -+ -+ /* Adding barrier to make sure all rester writes are finished */ -+ _mali_osk_write_mem_barrier(); ++ /* Performance counters for the Tiler */ ++ "", ++ "", ++ "", ++ "", ++ "THEx_TILER_ACTIVE", ++ "THEx_JOBS_PROCESSED", ++ "THEx_TRIANGLES", ++ "THEx_LINES", ++ "THEx_POINTS", ++ "THEx_FRONT_FACING", ++ "THEx_BACK_FACING", ++ "THEx_PRIM_VISIBLE", ++ "THEx_PRIM_CULLED", ++ "THEx_PRIM_CLIPPED", ++ "THEx_PRIM_SAT_CULLED", ++ "", ++ "", ++ "THEx_BUS_READ", ++ "", ++ "THEx_BUS_WRITE", ++ "THEx_LOADING_DESC", ++ "THEx_IDVS_POS_SHAD_REQ", ++ "THEx_IDVS_POS_SHAD_WAIT", ++ "THEx_IDVS_POS_SHAD_STALL", ++ "THEx_IDVS_POS_FIFO_FULL", ++ "THEx_PREFETCH_STALL", ++ "THEx_VCACHE_HIT", ++ "THEx_VCACHE_MISS", ++ "THEx_VCACHE_LINE_WAIT", ++ "THEx_VFETCH_POS_READ_WAIT", ++ "THEx_VFETCH_VERTEX_WAIT", ++ "THEx_VFETCH_STALL", ++ "THEx_PRIMASSY_STALL", ++ "THEx_BBOX_GEN_STALL", ++ "THEx_IDVS_VBU_HIT", ++ "THEx_IDVS_VBU_MISS", ++ "THEx_IDVS_VBU_LINE_DEALLOCATE", ++ "THEx_IDVS_VAR_SHAD_REQ", ++ "THEx_IDVS_VAR_SHAD_STALL", ++ "THEx_BINNER_STALL", ++ "THEx_ITER_STALL", ++ "THEx_COMPRESS_MISS", ++ "THEx_COMPRESS_STALL", ++ "THEx_PCACHE_HIT", ++ "THEx_PCACHE_MISS", ++ "THEx_PCACHE_MISS_STALL", ++ "THEx_PCACHE_EVICT_STALL", ++ "THEx_PMGR_PTR_WR_STALL", ++ "THEx_PMGR_PTR_RD_STALL", ++ "THEx_PMGR_CMD_WR_STALL", ++ "THEx_WRBUF_ACTIVE", ++ "THEx_WRBUF_HIT", ++ "THEx_WRBUF_MISS", ++ "THEx_WRBUF_NO_FREE_LINE_STALL", ++ "THEx_WRBUF_NO_AXI_ID_STALL", ++ "THEx_WRBUF_AXI_STALL", ++ "", ++ "", ++ "", ++ "THEx_UTLB_TRANS", ++ "THEx_UTLB_TRANS_HIT", ++ "THEx_UTLB_TRANS_STALL", ++ "THEx_UTLB_TRANS_MISS_DELAY", ++ "THEx_UTLB_MMU_REQ", + -+ /* This is the command that starts the core. -+ * -+ * Don't actually run the job if PROFILING_SKIP_PP_JOBS are set, just -+ * force core to assert the completion interrupt. -+ */ -+#if !defined(PROFILING_SKIP_PP_JOBS) -+ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_MGMT_CTRL_MGMT, MALI200_REG_VAL_CTRL_MGMT_START_RENDERING); -+#else -+ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_RAWSTAT, MALI200_REG_VAL_IRQ_END_OF_FRAME); -+#endif ++ /* Performance counters for the Shader Core */ ++ "", ++ "", ++ "", ++ "", ++ "THEx_FRAG_ACTIVE", ++ "THEx_FRAG_PRIMITIVES", ++ "THEx_FRAG_PRIM_RAST", ++ "THEx_FRAG_FPK_ACTIVE", ++ "THEx_FRAG_STARVING", ++ "THEx_FRAG_WARPS", ++ "THEx_FRAG_PARTIAL_WARPS", ++ "THEx_FRAG_QUADS_RAST", ++ "THEx_FRAG_QUADS_EZS_TEST", ++ "THEx_FRAG_QUADS_EZS_UPDATE", ++ "THEx_FRAG_QUADS_EZS_KILL", ++ "THEx_FRAG_LZS_TEST", ++ "THEx_FRAG_LZS_KILL", ++ "", ++ "THEx_FRAG_PTILES", ++ "THEx_FRAG_TRANS_ELIM", ++ "THEx_QUAD_FPK_KILLER", ++ "", ++ "THEx_COMPUTE_ACTIVE", ++ "THEx_COMPUTE_TASKS", ++ "THEx_COMPUTE_WARPS", ++ "THEx_COMPUTE_STARVING", ++ "THEx_EXEC_CORE_ACTIVE", ++ "THEx_EXEC_ACTIVE", ++ "THEx_EXEC_INSTR_COUNT", ++ "THEx_EXEC_INSTR_DIVERGED", ++ "THEx_EXEC_INSTR_STARVING", ++ "THEx_ARITH_INSTR_SINGLE_FMA", ++ "THEx_ARITH_INSTR_DOUBLE", ++ "THEx_ARITH_INSTR_MSG", ++ "THEx_ARITH_INSTR_MSG_ONLY", ++ "THEx_TEX_INSTR", ++ "THEx_TEX_INSTR_MIPMAP", ++ "THEx_TEX_INSTR_COMPRESSED", ++ "THEx_TEX_INSTR_3D", ++ "THEx_TEX_INSTR_TRILINEAR", ++ "THEx_TEX_COORD_ISSUE", ++ "THEx_TEX_COORD_STALL", ++ "THEx_TEX_STARVE_CACHE", ++ "THEx_TEX_STARVE_FILTER", ++ "THEx_LS_MEM_READ_FULL", ++ "THEx_LS_MEM_READ_SHORT", ++ "THEx_LS_MEM_WRITE_FULL", ++ "THEx_LS_MEM_WRITE_SHORT", ++ "THEx_LS_MEM_ATOMIC", ++ "THEx_VARY_INSTR", ++ "THEx_VARY_SLOT_32", ++ "THEx_VARY_SLOT_16", ++ "THEx_ATTR_INSTR", ++ "THEx_ARITH_INSTR_FP_MUL", ++ "THEx_BEATS_RD_FTC", ++ "THEx_BEATS_RD_FTC_EXT", ++ "THEx_BEATS_RD_LSC", ++ "THEx_BEATS_RD_LSC_EXT", ++ "THEx_BEATS_RD_TEX", ++ "THEx_BEATS_RD_TEX_EXT", ++ "THEx_BEATS_RD_OTHER", ++ "THEx_BEATS_WR_LSC", ++ "THEx_BEATS_WR_TIB", ++ "", + -+ /* Adding barrier to make sure previous rester writes is finished */ -+ _mali_osk_write_mem_barrier(); -+} ++ /* Performance counters for the Memory System */ ++ "", ++ "", ++ "", ++ "", ++ "THEx_MMU_REQUESTS", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "THEx_L2_RD_MSG_IN", ++ "THEx_L2_RD_MSG_IN_STALL", ++ "THEx_L2_WR_MSG_IN", ++ "THEx_L2_WR_MSG_IN_STALL", ++ "THEx_L2_SNP_MSG_IN", ++ "THEx_L2_SNP_MSG_IN_STALL", ++ "THEx_L2_RD_MSG_OUT", ++ "THEx_L2_RD_MSG_OUT_STALL", ++ "THEx_L2_WR_MSG_OUT", ++ "THEx_L2_ANY_LOOKUP", ++ "THEx_L2_READ_LOOKUP", ++ "THEx_L2_WRITE_LOOKUP", ++ "THEx_L2_EXT_SNOOP_LOOKUP", ++ "THEx_L2_EXT_READ", ++ "THEx_L2_EXT_READ_NOSNP", ++ "THEx_L2_EXT_READ_UNIQUE", ++ "THEx_L2_EXT_READ_BEATS", ++ "THEx_L2_EXT_AR_STALL", ++ "THEx_L2_EXT_AR_CNT_Q1", ++ "THEx_L2_EXT_AR_CNT_Q2", ++ "THEx_L2_EXT_AR_CNT_Q3", ++ "THEx_L2_EXT_RRESP_0_127", ++ "THEx_L2_EXT_RRESP_128_191", ++ "THEx_L2_EXT_RRESP_192_255", ++ "THEx_L2_EXT_RRESP_256_319", ++ "THEx_L2_EXT_RRESP_320_383", ++ "THEx_L2_EXT_WRITE", ++ "THEx_L2_EXT_WRITE_NOSNP_FULL", ++ "THEx_L2_EXT_WRITE_NOSNP_PTL", ++ "THEx_L2_EXT_WRITE_SNP_FULL", ++ "THEx_L2_EXT_WRITE_SNP_PTL", ++ "THEx_L2_EXT_WRITE_BEATS", ++ "THEx_L2_EXT_W_STALL", ++ "THEx_L2_EXT_AW_CNT_Q1", ++ "THEx_L2_EXT_AW_CNT_Q2", ++ "THEx_L2_EXT_AW_CNT_Q3", ++ "THEx_L2_EXT_SNOOP", ++ "THEx_L2_EXT_SNOOP_STALL", ++ "THEx_L2_EXT_SNOOP_RESP_CLEAN", ++ "THEx_L2_EXT_SNOOP_RESP_DATA", ++ "THEx_L2_EXT_SNOOP_INTERNAL", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++}; + -+u32 mali_pp_core_get_version(struct mali_pp_core *core) -+{ -+ MALI_DEBUG_ASSERT_POINTER(core); -+ return mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_VERSION); -+} ++#endif /* _KBASE_GATOR_HWCNT_NAMES_THEX_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h +new file mode 100755 +index 000000000..5ea06770f +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h +@@ -0,0 +1,291 @@ ++/* ++ * ++ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+struct mali_pp_core *mali_pp_get_global_pp_core(u32 index) -+{ -+ if (mali_global_num_pp_cores > index) { -+ return mali_global_pp_cores[index]; -+ } + -+ return NULL; -+} + -+u32 mali_pp_get_glob_num_pp_cores(void) -+{ -+ return mali_global_num_pp_cores; -+} ++/* ++ * This header was autogenerated, it should not be edited. ++ */ + -+/* ------------- interrupt handling below ------------------ */ -+static void mali_pp_irq_probe_trigger(void *data) -+{ -+ struct mali_pp_core *core = (struct mali_pp_core *)data; -+ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK, MALI200_REG_VAL_IRQ_MASK_USED); -+ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_RAWSTAT, MALI200_REG_VAL_IRQ_BUS_ERROR); -+ _mali_osk_mem_barrier(); -+} ++#ifndef _KBASE_GATOR_HWCNT_NAMES_TMIX_H_ ++#define _KBASE_GATOR_HWCNT_NAMES_TMIX_H_ + -+static _mali_osk_errcode_t mali_pp_irq_probe_ack(void *data) -+{ -+ struct mali_pp_core *core = (struct mali_pp_core *)data; -+ u32 irq_readout; ++static const char * const hardware_counters_mali_tMIx[] = { ++ /* Performance counters for the Job Manager */ ++ "", ++ "", ++ "", ++ "", ++ "TMIx_MESSAGES_SENT", ++ "TMIx_MESSAGES_RECEIVED", ++ "TMIx_GPU_ACTIVE", ++ "TMIx_IRQ_ACTIVE", ++ "TMIx_JS0_JOBS", ++ "TMIx_JS0_TASKS", ++ "TMIx_JS0_ACTIVE", ++ "", ++ "TMIx_JS0_WAIT_READ", ++ "TMIx_JS0_WAIT_ISSUE", ++ "TMIx_JS0_WAIT_DEPEND", ++ "TMIx_JS0_WAIT_FINISH", ++ "TMIx_JS1_JOBS", ++ "TMIx_JS1_TASKS", ++ "TMIx_JS1_ACTIVE", ++ "", ++ "TMIx_JS1_WAIT_READ", ++ "TMIx_JS1_WAIT_ISSUE", ++ "TMIx_JS1_WAIT_DEPEND", ++ "TMIx_JS1_WAIT_FINISH", ++ "TMIx_JS2_JOBS", ++ "TMIx_JS2_TASKS", ++ "TMIx_JS2_ACTIVE", ++ "", ++ "TMIx_JS2_WAIT_READ", ++ "TMIx_JS2_WAIT_ISSUE", ++ "TMIx_JS2_WAIT_DEPEND", ++ "TMIx_JS2_WAIT_FINISH", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+ irq_readout = mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_STATUS); -+ if (MALI200_REG_VAL_IRQ_BUS_ERROR & irq_readout) { -+ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_CLEAR, MALI200_REG_VAL_IRQ_BUS_ERROR); -+ _mali_osk_mem_barrier(); -+ return _MALI_OSK_ERR_OK; -+ } ++ /* Performance counters for the Tiler */ ++ "", ++ "", ++ "", ++ "", ++ "TMIx_TILER_ACTIVE", ++ "TMIx_JOBS_PROCESSED", ++ "TMIx_TRIANGLES", ++ "TMIx_LINES", ++ "TMIx_POINTS", ++ "TMIx_FRONT_FACING", ++ "TMIx_BACK_FACING", ++ "TMIx_PRIM_VISIBLE", ++ "TMIx_PRIM_CULLED", ++ "TMIx_PRIM_CLIPPED", ++ "TMIx_PRIM_SAT_CULLED", ++ "", ++ "", ++ "TMIx_BUS_READ", ++ "", ++ "TMIx_BUS_WRITE", ++ "TMIx_LOADING_DESC", ++ "TMIx_IDVS_POS_SHAD_REQ", ++ "TMIx_IDVS_POS_SHAD_WAIT", ++ "TMIx_IDVS_POS_SHAD_STALL", ++ "TMIx_IDVS_POS_FIFO_FULL", ++ "TMIx_PREFETCH_STALL", ++ "TMIx_VCACHE_HIT", ++ "TMIx_VCACHE_MISS", ++ "TMIx_VCACHE_LINE_WAIT", ++ "TMIx_VFETCH_POS_READ_WAIT", ++ "TMIx_VFETCH_VERTEX_WAIT", ++ "TMIx_VFETCH_STALL", ++ "TMIx_PRIMASSY_STALL", ++ "TMIx_BBOX_GEN_STALL", ++ "TMIx_IDVS_VBU_HIT", ++ "TMIx_IDVS_VBU_MISS", ++ "TMIx_IDVS_VBU_LINE_DEALLOCATE", ++ "TMIx_IDVS_VAR_SHAD_REQ", ++ "TMIx_IDVS_VAR_SHAD_STALL", ++ "TMIx_BINNER_STALL", ++ "TMIx_ITER_STALL", ++ "TMIx_COMPRESS_MISS", ++ "TMIx_COMPRESS_STALL", ++ "TMIx_PCACHE_HIT", ++ "TMIx_PCACHE_MISS", ++ "TMIx_PCACHE_MISS_STALL", ++ "TMIx_PCACHE_EVICT_STALL", ++ "TMIx_PMGR_PTR_WR_STALL", ++ "TMIx_PMGR_PTR_RD_STALL", ++ "TMIx_PMGR_CMD_WR_STALL", ++ "TMIx_WRBUF_ACTIVE", ++ "TMIx_WRBUF_HIT", ++ "TMIx_WRBUF_MISS", ++ "TMIx_WRBUF_NO_FREE_LINE_STALL", ++ "TMIx_WRBUF_NO_AXI_ID_STALL", ++ "TMIx_WRBUF_AXI_STALL", ++ "", ++ "", ++ "", ++ "TMIx_UTLB_TRANS", ++ "TMIx_UTLB_TRANS_HIT", ++ "TMIx_UTLB_TRANS_STALL", ++ "TMIx_UTLB_TRANS_MISS_DELAY", ++ "TMIx_UTLB_MMU_REQ", + -+ return _MALI_OSK_ERR_FAULT; -+} ++ /* Performance counters for the Shader Core */ ++ "", ++ "", ++ "", ++ "", ++ "TMIx_FRAG_ACTIVE", ++ "TMIx_FRAG_PRIMITIVES", ++ "TMIx_FRAG_PRIM_RAST", ++ "TMIx_FRAG_FPK_ACTIVE", ++ "TMIx_FRAG_STARVING", ++ "TMIx_FRAG_WARPS", ++ "TMIx_FRAG_PARTIAL_WARPS", ++ "TMIx_FRAG_QUADS_RAST", ++ "TMIx_FRAG_QUADS_EZS_TEST", ++ "TMIx_FRAG_QUADS_EZS_UPDATE", ++ "TMIx_FRAG_QUADS_EZS_KILL", ++ "TMIx_FRAG_LZS_TEST", ++ "TMIx_FRAG_LZS_KILL", ++ "", ++ "TMIx_FRAG_PTILES", ++ "TMIx_FRAG_TRANS_ELIM", ++ "TMIx_QUAD_FPK_KILLER", ++ "", ++ "TMIx_COMPUTE_ACTIVE", ++ "TMIx_COMPUTE_TASKS", ++ "TMIx_COMPUTE_WARPS", ++ "TMIx_COMPUTE_STARVING", ++ "TMIx_EXEC_CORE_ACTIVE", ++ "TMIx_EXEC_ACTIVE", ++ "TMIx_EXEC_INSTR_COUNT", ++ "TMIx_EXEC_INSTR_DIVERGED", ++ "TMIx_EXEC_INSTR_STARVING", ++ "TMIx_ARITH_INSTR_SINGLE_FMA", ++ "TMIx_ARITH_INSTR_DOUBLE", ++ "TMIx_ARITH_INSTR_MSG", ++ "TMIx_ARITH_INSTR_MSG_ONLY", ++ "TMIx_TEX_INSTR", ++ "TMIx_TEX_INSTR_MIPMAP", ++ "TMIx_TEX_INSTR_COMPRESSED", ++ "TMIx_TEX_INSTR_3D", ++ "TMIx_TEX_INSTR_TRILINEAR", ++ "TMIx_TEX_COORD_ISSUE", ++ "TMIx_TEX_COORD_STALL", ++ "TMIx_TEX_STARVE_CACHE", ++ "TMIx_TEX_STARVE_FILTER", ++ "TMIx_LS_MEM_READ_FULL", ++ "TMIx_LS_MEM_READ_SHORT", ++ "TMIx_LS_MEM_WRITE_FULL", ++ "TMIx_LS_MEM_WRITE_SHORT", ++ "TMIx_LS_MEM_ATOMIC", ++ "TMIx_VARY_INSTR", ++ "TMIx_VARY_SLOT_32", ++ "TMIx_VARY_SLOT_16", ++ "TMIx_ATTR_INSTR", ++ "TMIx_ARITH_INSTR_FP_MUL", ++ "TMIx_BEATS_RD_FTC", ++ "TMIx_BEATS_RD_FTC_EXT", ++ "TMIx_BEATS_RD_LSC", ++ "TMIx_BEATS_RD_LSC_EXT", ++ "TMIx_BEATS_RD_TEX", ++ "TMIx_BEATS_RD_TEX_EXT", ++ "TMIx_BEATS_RD_OTHER", ++ "TMIx_BEATS_WR_LSC", ++ "TMIx_BEATS_WR_TIB", ++ "", + ++ /* Performance counters for the Memory System */ ++ "", ++ "", ++ "", ++ "", ++ "TMIx_MMU_REQUESTS", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "TMIx_L2_RD_MSG_IN", ++ "TMIx_L2_RD_MSG_IN_STALL", ++ "TMIx_L2_WR_MSG_IN", ++ "TMIx_L2_WR_MSG_IN_STALL", ++ "TMIx_L2_SNP_MSG_IN", ++ "TMIx_L2_SNP_MSG_IN_STALL", ++ "TMIx_L2_RD_MSG_OUT", ++ "TMIx_L2_RD_MSG_OUT_STALL", ++ "TMIx_L2_WR_MSG_OUT", ++ "TMIx_L2_ANY_LOOKUP", ++ "TMIx_L2_READ_LOOKUP", ++ "TMIx_L2_WRITE_LOOKUP", ++ "TMIx_L2_EXT_SNOOP_LOOKUP", ++ "TMIx_L2_EXT_READ", ++ "TMIx_L2_EXT_READ_NOSNP", ++ "TMIx_L2_EXT_READ_UNIQUE", ++ "TMIx_L2_EXT_READ_BEATS", ++ "TMIx_L2_EXT_AR_STALL", ++ "TMIx_L2_EXT_AR_CNT_Q1", ++ "TMIx_L2_EXT_AR_CNT_Q2", ++ "TMIx_L2_EXT_AR_CNT_Q3", ++ "TMIx_L2_EXT_RRESP_0_127", ++ "TMIx_L2_EXT_RRESP_128_191", ++ "TMIx_L2_EXT_RRESP_192_255", ++ "TMIx_L2_EXT_RRESP_256_319", ++ "TMIx_L2_EXT_RRESP_320_383", ++ "TMIx_L2_EXT_WRITE", ++ "TMIx_L2_EXT_WRITE_NOSNP_FULL", ++ "TMIx_L2_EXT_WRITE_NOSNP_PTL", ++ "TMIx_L2_EXT_WRITE_SNP_FULL", ++ "TMIx_L2_EXT_WRITE_SNP_PTL", ++ "TMIx_L2_EXT_WRITE_BEATS", ++ "TMIx_L2_EXT_W_STALL", ++ "TMIx_L2_EXT_AW_CNT_Q1", ++ "TMIx_L2_EXT_AW_CNT_Q2", ++ "TMIx_L2_EXT_AW_CNT_Q3", ++ "TMIx_L2_EXT_SNOOP", ++ "TMIx_L2_EXT_SNOOP_STALL", ++ "TMIx_L2_EXT_SNOOP_RESP_CLEAN", ++ "TMIx_L2_EXT_SNOOP_RESP_DATA", ++ "TMIx_L2_EXT_SNOOP_INTERNAL", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++}; + -+#if 0 -+static void mali_pp_print_registers(struct mali_pp_core *core) -+{ -+ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_VERSION = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_VERSION))); -+ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_CURRENT_REND_LIST_ADDR = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_CURRENT_REND_LIST_ADDR))); -+ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_STATUS = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_STATUS))); -+ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_INT_RAWSTAT = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_RAWSTAT))); -+ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_INT_MASK = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK))); -+ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_INT_STATUS = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_STATUS))); -+ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_BUS_ERROR_STATUS = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_BUS_ERROR_STATUS))); -+ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_PERF_CNT_0_ENABLE = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_0_ENABLE))); -+ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_PERF_CNT_0_SRC = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_0_SRC))); -+ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_PERF_CNT_0_VALUE = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_0_VALUE))); -+ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_PERF_CNT_1_ENABLE = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_1_ENABLE))); -+ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_PERF_CNT_1_SRC = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_1_SRC))); -+ MALI_DEBUG_PRINT(2, ("Mali PP: Register MALI200_REG_ADDR_MGMT_PERF_CNT_1_VALUE = 0x%08X\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_1_VALUE))); -+} -+#endif ++#endif /* _KBASE_GATOR_HWCNT_NAMES_TMIX_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h +new file mode 100755 +index 000000000..be09c4556 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h +@@ -0,0 +1,291 @@ ++/* ++ * ++ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+#if 0 -+void mali_pp_print_state(struct mali_pp_core *core) -+{ -+ MALI_DEBUG_PRINT(2, ("Mali PP: State: 0x%08x\n", mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_STATUS))); -+} -+#endif + -+void mali_pp_update_performance_counters(struct mali_pp_core *parent, struct mali_pp_core *child, struct mali_pp_job *job, u32 subjob) -+{ -+ u32 val0 = 0; -+ u32 val1 = 0; -+ u32 counter_src0 = mali_pp_job_get_perf_counter_src0(job, subjob); -+ u32 counter_src1 = mali_pp_job_get_perf_counter_src1(job, subjob); -+#if defined(CONFIG_MALI400_PROFILING) -+ int counter_index = COUNTER_FP_0_C0 + (2 * child->core_id); -+#endif + -+ if (MALI_HW_CORE_NO_COUNTER != counter_src0) { -+ val0 = mali_hw_core_register_read(&child->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_0_VALUE); -+ mali_pp_job_set_perf_counter_value0(job, subjob, val0); ++/* ++ * This header was autogenerated, it should not be edited. ++ */ + -+#if defined(CONFIG_MALI400_PROFILING) -+ _mali_osk_profiling_report_hw_counter(counter_index, val0); -+ _mali_osk_profiling_record_global_counters(counter_index, val0); -+#endif -+ } ++#ifndef _KBASE_GATOR_HWCNT_NAMES_TSIX_H_ ++#define _KBASE_GATOR_HWCNT_NAMES_TSIX_H_ + -+ if (MALI_HW_CORE_NO_COUNTER != counter_src1) { -+ val1 = mali_hw_core_register_read(&child->hw_core, MALI200_REG_ADDR_MGMT_PERF_CNT_1_VALUE); -+ mali_pp_job_set_perf_counter_value1(job, subjob, val1); ++static const char * const hardware_counters_mali_tSIx[] = { ++ /* Performance counters for the Job Manager */ ++ "", ++ "", ++ "", ++ "", ++ "TSIx_MESSAGES_SENT", ++ "TSIx_MESSAGES_RECEIVED", ++ "TSIx_GPU_ACTIVE", ++ "TSIx_IRQ_ACTIVE", ++ "TSIx_JS0_JOBS", ++ "TSIx_JS0_TASKS", ++ "TSIx_JS0_ACTIVE", ++ "", ++ "TSIx_JS0_WAIT_READ", ++ "TSIx_JS0_WAIT_ISSUE", ++ "TSIx_JS0_WAIT_DEPEND", ++ "TSIx_JS0_WAIT_FINISH", ++ "TSIx_JS1_JOBS", ++ "TSIx_JS1_TASKS", ++ "TSIx_JS1_ACTIVE", ++ "", ++ "TSIx_JS1_WAIT_READ", ++ "TSIx_JS1_WAIT_ISSUE", ++ "TSIx_JS1_WAIT_DEPEND", ++ "TSIx_JS1_WAIT_FINISH", ++ "TSIx_JS2_JOBS", ++ "TSIx_JS2_TASKS", ++ "TSIx_JS2_ACTIVE", ++ "", ++ "TSIx_JS2_WAIT_READ", ++ "TSIx_JS2_WAIT_ISSUE", ++ "TSIx_JS2_WAIT_DEPEND", ++ "TSIx_JS2_WAIT_FINISH", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", + -+#if defined(CONFIG_MALI400_PROFILING) -+ _mali_osk_profiling_report_hw_counter(counter_index + 1, val1); -+ _mali_osk_profiling_record_global_counters(counter_index + 1, val1); -+#endif -+ } -+} ++ /* Performance counters for the Tiler */ ++ "", ++ "", ++ "", ++ "", ++ "TSIx_TILER_ACTIVE", ++ "TSIx_JOBS_PROCESSED", ++ "TSIx_TRIANGLES", ++ "TSIx_LINES", ++ "TSIx_POINTS", ++ "TSIx_FRONT_FACING", ++ "TSIx_BACK_FACING", ++ "TSIx_PRIM_VISIBLE", ++ "TSIx_PRIM_CULLED", ++ "TSIx_PRIM_CLIPPED", ++ "TSIx_PRIM_SAT_CULLED", ++ "", ++ "", ++ "TSIx_BUS_READ", ++ "", ++ "TSIx_BUS_WRITE", ++ "TSIx_LOADING_DESC", ++ "TSIx_IDVS_POS_SHAD_REQ", ++ "TSIx_IDVS_POS_SHAD_WAIT", ++ "TSIx_IDVS_POS_SHAD_STALL", ++ "TSIx_IDVS_POS_FIFO_FULL", ++ "TSIx_PREFETCH_STALL", ++ "TSIx_VCACHE_HIT", ++ "TSIx_VCACHE_MISS", ++ "TSIx_VCACHE_LINE_WAIT", ++ "TSIx_VFETCH_POS_READ_WAIT", ++ "TSIx_VFETCH_VERTEX_WAIT", ++ "TSIx_VFETCH_STALL", ++ "TSIx_PRIMASSY_STALL", ++ "TSIx_BBOX_GEN_STALL", ++ "TSIx_IDVS_VBU_HIT", ++ "TSIx_IDVS_VBU_MISS", ++ "TSIx_IDVS_VBU_LINE_DEALLOCATE", ++ "TSIx_IDVS_VAR_SHAD_REQ", ++ "TSIx_IDVS_VAR_SHAD_STALL", ++ "TSIx_BINNER_STALL", ++ "TSIx_ITER_STALL", ++ "TSIx_COMPRESS_MISS", ++ "TSIx_COMPRESS_STALL", ++ "TSIx_PCACHE_HIT", ++ "TSIx_PCACHE_MISS", ++ "TSIx_PCACHE_MISS_STALL", ++ "TSIx_PCACHE_EVICT_STALL", ++ "TSIx_PMGR_PTR_WR_STALL", ++ "TSIx_PMGR_PTR_RD_STALL", ++ "TSIx_PMGR_CMD_WR_STALL", ++ "TSIx_WRBUF_ACTIVE", ++ "TSIx_WRBUF_HIT", ++ "TSIx_WRBUF_MISS", ++ "TSIx_WRBUF_NO_FREE_LINE_STALL", ++ "TSIx_WRBUF_NO_AXI_ID_STALL", ++ "TSIx_WRBUF_AXI_STALL", ++ "", ++ "", ++ "", ++ "TSIx_UTLB_TRANS", ++ "TSIx_UTLB_TRANS_HIT", ++ "TSIx_UTLB_TRANS_STALL", ++ "TSIx_UTLB_TRANS_MISS_DELAY", ++ "TSIx_UTLB_MMU_REQ", + -+#if MALI_STATE_TRACKING -+u32 mali_pp_dump_state(struct mali_pp_core *core, char *buf, u32 size) -+{ -+ int n = 0; ++ /* Performance counters for the Shader Core */ ++ "", ++ "", ++ "", ++ "", ++ "TSIx_FRAG_ACTIVE", ++ "TSIx_FRAG_PRIMITIVES", ++ "TSIx_FRAG_PRIM_RAST", ++ "TSIx_FRAG_FPK_ACTIVE", ++ "TSIx_FRAG_STARVING", ++ "TSIx_FRAG_WARPS", ++ "TSIx_FRAG_PARTIAL_WARPS", ++ "TSIx_FRAG_QUADS_RAST", ++ "TSIx_FRAG_QUADS_EZS_TEST", ++ "TSIx_FRAG_QUADS_EZS_UPDATE", ++ "TSIx_FRAG_QUADS_EZS_KILL", ++ "TSIx_FRAG_LZS_TEST", ++ "TSIx_FRAG_LZS_KILL", ++ "", ++ "TSIx_FRAG_PTILES", ++ "TSIx_FRAG_TRANS_ELIM", ++ "TSIx_QUAD_FPK_KILLER", ++ "", ++ "TSIx_COMPUTE_ACTIVE", ++ "TSIx_COMPUTE_TASKS", ++ "TSIx_COMPUTE_WARPS", ++ "TSIx_COMPUTE_STARVING", ++ "TSIx_EXEC_CORE_ACTIVE", ++ "TSIx_EXEC_ACTIVE", ++ "TSIx_EXEC_INSTR_COUNT", ++ "TSIx_EXEC_INSTR_DIVERGED", ++ "TSIx_EXEC_INSTR_STARVING", ++ "TSIx_ARITH_INSTR_SINGLE_FMA", ++ "TSIx_ARITH_INSTR_DOUBLE", ++ "TSIx_ARITH_INSTR_MSG", ++ "TSIx_ARITH_INSTR_MSG_ONLY", ++ "TSIx_TEX_MSGI_NUM_QUADS", ++ "TSIx_TEX_DFCH_NUM_PASSES", ++ "TSIx_TEX_DFCH_NUM_PASSES_MISS", ++ "TSIx_TEX_DFCH_NUM_PASSES_MIP_MAP", ++ "TSIx_TEX_TIDX_NUM_SPLIT_MIP_MAP", ++ "TSIx_TEX_TFCH_NUM_LINES_FETCHED", ++ "TSIx_TEX_TFCH_NUM_LINES_FETCHED_BLOCK_COMPRESSED", ++ "TSIx_TEX_TFCH_NUM_OPERATIONS", ++ "TSIx_TEX_FILT_NUM_OPERATIONS", ++ "TSIx_LS_MEM_READ_FULL", ++ "TSIx_LS_MEM_READ_SHORT", ++ "TSIx_LS_MEM_WRITE_FULL", ++ "TSIx_LS_MEM_WRITE_SHORT", ++ "TSIx_LS_MEM_ATOMIC", ++ "TSIx_VARY_INSTR", ++ "TSIx_VARY_SLOT_32", ++ "TSIx_VARY_SLOT_16", ++ "TSIx_ATTR_INSTR", ++ "TSIx_ARITH_INSTR_FP_MUL", ++ "TSIx_BEATS_RD_FTC", ++ "TSIx_BEATS_RD_FTC_EXT", ++ "TSIx_BEATS_RD_LSC", ++ "TSIx_BEATS_RD_LSC_EXT", ++ "TSIx_BEATS_RD_TEX", ++ "TSIx_BEATS_RD_TEX_EXT", ++ "TSIx_BEATS_RD_OTHER", ++ "TSIx_BEATS_WR_LSC", ++ "TSIx_BEATS_WR_TIB", ++ "", + -+ n += _mali_osk_snprintf(buf + n, size - n, "\tPP #%d: %s\n", core->core_id, core->hw_core.description); ++ /* Performance counters for the Memory System */ ++ "", ++ "", ++ "", ++ "", ++ "TSIx_MMU_REQUESTS", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "TSIx_L2_RD_MSG_IN", ++ "TSIx_L2_RD_MSG_IN_STALL", ++ "TSIx_L2_WR_MSG_IN", ++ "TSIx_L2_WR_MSG_IN_STALL", ++ "TSIx_L2_SNP_MSG_IN", ++ "TSIx_L2_SNP_MSG_IN_STALL", ++ "TSIx_L2_RD_MSG_OUT", ++ "TSIx_L2_RD_MSG_OUT_STALL", ++ "TSIx_L2_WR_MSG_OUT", ++ "TSIx_L2_ANY_LOOKUP", ++ "TSIx_L2_READ_LOOKUP", ++ "TSIx_L2_WRITE_LOOKUP", ++ "TSIx_L2_EXT_SNOOP_LOOKUP", ++ "TSIx_L2_EXT_READ", ++ "TSIx_L2_EXT_READ_NOSNP", ++ "TSIx_L2_EXT_READ_UNIQUE", ++ "TSIx_L2_EXT_READ_BEATS", ++ "TSIx_L2_EXT_AR_STALL", ++ "TSIx_L2_EXT_AR_CNT_Q1", ++ "TSIx_L2_EXT_AR_CNT_Q2", ++ "TSIx_L2_EXT_AR_CNT_Q3", ++ "TSIx_L2_EXT_RRESP_0_127", ++ "TSIx_L2_EXT_RRESP_128_191", ++ "TSIx_L2_EXT_RRESP_192_255", ++ "TSIx_L2_EXT_RRESP_256_319", ++ "TSIx_L2_EXT_RRESP_320_383", ++ "TSIx_L2_EXT_WRITE", ++ "TSIx_L2_EXT_WRITE_NOSNP_FULL", ++ "TSIx_L2_EXT_WRITE_NOSNP_PTL", ++ "TSIx_L2_EXT_WRITE_SNP_FULL", ++ "TSIx_L2_EXT_WRITE_SNP_PTL", ++ "TSIx_L2_EXT_WRITE_BEATS", ++ "TSIx_L2_EXT_W_STALL", ++ "TSIx_L2_EXT_AW_CNT_Q1", ++ "TSIx_L2_EXT_AW_CNT_Q2", ++ "TSIx_L2_EXT_AW_CNT_Q3", ++ "TSIx_L2_EXT_SNOOP", ++ "TSIx_L2_EXT_SNOOP_STALL", ++ "TSIx_L2_EXT_SNOOP_RESP_CLEAN", ++ "TSIx_L2_EXT_SNOOP_RESP_DATA", ++ "TSIx_L2_EXT_SNOOP_INTERNAL", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++}; + -+ return n; -+} -+#endif -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp.h b/drivers/gpu/arm/mali400/mali/common/mali_pp.h ++#endif /* _KBASE_GATOR_HWCNT_NAMES_TSIX_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h b/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h new file mode 100755 -index 000000000000..f98b29866ffa +index 000000000..42f0111c4 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.h -@@ -0,0 +1,138 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h +@@ -0,0 +1,123 @@ +/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2015-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef __MALI_PP_H__ -+#define __MALI_PP_H__ + -+#include "mali_osk.h" -+#include "mali_pp_job.h" -+#include "mali_hw_core.h" ++#ifndef _KBASE_GPU_ID_H_ ++#define _KBASE_GPU_ID_H_ + -+struct mali_group; ++/* GPU_ID register */ ++#define GPU_ID_VERSION_STATUS_SHIFT 0 ++#define GPU_ID_VERSION_MINOR_SHIFT 4 ++#define GPU_ID_VERSION_MAJOR_SHIFT 12 ++#define GPU_ID_VERSION_PRODUCT_ID_SHIFT 16 ++#define GPU_ID_VERSION_STATUS (0xF << GPU_ID_VERSION_STATUS_SHIFT) ++#define GPU_ID_VERSION_MINOR (0xFF << GPU_ID_VERSION_MINOR_SHIFT) ++#define GPU_ID_VERSION_MAJOR (0xF << GPU_ID_VERSION_MAJOR_SHIFT) ++#define GPU_ID_VERSION_PRODUCT_ID (0xFFFF << GPU_ID_VERSION_PRODUCT_ID_SHIFT) + -+#define MALI_MAX_NUMBER_OF_PP_CORES 9 ++/* Values for GPU_ID_VERSION_PRODUCT_ID bitfield */ ++#define GPU_ID_PI_T60X 0x6956 ++#define GPU_ID_PI_T62X 0x0620 ++#define GPU_ID_PI_T76X 0x0750 ++#define GPU_ID_PI_T72X 0x0720 ++#define GPU_ID_PI_TFRX 0x0880 ++#define GPU_ID_PI_T86X 0x0860 ++#define GPU_ID_PI_T82X 0x0820 ++#define GPU_ID_PI_T83X 0x0830 + -+/** -+ * Definition of the PP core struct -+ * Used to track a PP core in the system. -+ */ -+struct mali_pp_core { -+ struct mali_hw_core hw_core; /**< Common for all HW cores */ -+ _mali_osk_irq_t *irq; /**< IRQ handler */ -+ u32 core_id; /**< Unique core ID */ -+ u32 bcast_id; /**< The "flag" value used by the Mali-450 broadcast and DLBU unit */ -+}; ++/* New GPU ID format when PRODUCT_ID is >= 0x1000 (and not 0x6956) */ ++#define GPU_ID_PI_NEW_FORMAT_START 0x1000 ++#define GPU_ID_IS_NEW_FORMAT(product_id) ((product_id) != GPU_ID_PI_T60X && \ ++ (product_id) >= \ ++ GPU_ID_PI_NEW_FORMAT_START) + -+_mali_osk_errcode_t mali_pp_initialize(void); -+void mali_pp_terminate(void); ++#define GPU_ID2_VERSION_STATUS_SHIFT 0 ++#define GPU_ID2_VERSION_MINOR_SHIFT 4 ++#define GPU_ID2_VERSION_MAJOR_SHIFT 12 ++#define GPU_ID2_PRODUCT_MAJOR_SHIFT 16 ++#define GPU_ID2_ARCH_REV_SHIFT 20 ++#define GPU_ID2_ARCH_MINOR_SHIFT 24 ++#define GPU_ID2_ARCH_MAJOR_SHIFT 28 ++#define GPU_ID2_VERSION_STATUS (0xF << GPU_ID2_VERSION_STATUS_SHIFT) ++#define GPU_ID2_VERSION_MINOR (0xFF << GPU_ID2_VERSION_MINOR_SHIFT) ++#define GPU_ID2_VERSION_MAJOR (0xF << GPU_ID2_VERSION_MAJOR_SHIFT) ++#define GPU_ID2_PRODUCT_MAJOR (0xF << GPU_ID2_PRODUCT_MAJOR_SHIFT) ++#define GPU_ID2_ARCH_REV (0xF << GPU_ID2_ARCH_REV_SHIFT) ++#define GPU_ID2_ARCH_MINOR (0xF << GPU_ID2_ARCH_MINOR_SHIFT) ++#define GPU_ID2_ARCH_MAJOR (0xF << GPU_ID2_ARCH_MAJOR_SHIFT) ++#define GPU_ID2_PRODUCT_MODEL (GPU_ID2_ARCH_MAJOR | GPU_ID2_PRODUCT_MAJOR) ++#define GPU_ID2_VERSION (GPU_ID2_VERSION_MAJOR | \ ++ GPU_ID2_VERSION_MINOR | \ ++ GPU_ID2_VERSION_STATUS) + -+struct mali_pp_core *mali_pp_create(const _mali_osk_resource_t *resource, struct mali_group *group, mali_bool is_virtual, u32 bcast_id); -+void mali_pp_delete(struct mali_pp_core *core); ++/* Helper macro to create a partial GPU_ID (new format) that defines ++ a product ignoring its version. */ ++#define GPU_ID2_PRODUCT_MAKE(arch_major, arch_minor, arch_rev, product_major) \ ++ (((arch_major) << GPU_ID2_ARCH_MAJOR_SHIFT) | \ ++ ((arch_minor) << GPU_ID2_ARCH_MINOR_SHIFT) | \ ++ ((arch_rev) << GPU_ID2_ARCH_REV_SHIFT) | \ ++ ((product_major) << GPU_ID2_PRODUCT_MAJOR_SHIFT)) + -+void mali_pp_stop_bus(struct mali_pp_core *core); -+_mali_osk_errcode_t mali_pp_stop_bus_wait(struct mali_pp_core *core); -+void mali_pp_reset_async(struct mali_pp_core *core); -+_mali_osk_errcode_t mali_pp_reset_wait(struct mali_pp_core *core); -+_mali_osk_errcode_t mali_pp_reset(struct mali_pp_core *core); -+_mali_osk_errcode_t mali_pp_hard_reset(struct mali_pp_core *core); ++/* Helper macro to create a partial GPU_ID (new format) that specifies the ++ revision (major, minor, status) of a product */ ++#define GPU_ID2_VERSION_MAKE(version_major, version_minor, version_status) \ ++ (((version_major) << GPU_ID2_VERSION_MAJOR_SHIFT) | \ ++ ((version_minor) << GPU_ID2_VERSION_MINOR_SHIFT) | \ ++ ((version_status) << GPU_ID2_VERSION_STATUS_SHIFT)) + -+void mali_pp_job_start(struct mali_pp_core *core, struct mali_pp_job *job, u32 sub_job, mali_bool restart_virtual); ++/* Helper macro to create a complete GPU_ID (new format) */ ++#define GPU_ID2_MAKE(arch_major, arch_minor, arch_rev, product_major, \ ++ version_major, version_minor, version_status) \ ++ (GPU_ID2_PRODUCT_MAKE(arch_major, arch_minor, arch_rev, \ ++ product_major) | \ ++ GPU_ID2_VERSION_MAKE(version_major, version_minor, \ ++ version_status)) + -+u32 mali_pp_core_get_version(struct mali_pp_core *core); ++/* Helper macro to create a partial GPU_ID (new format) that identifies ++ a particular GPU model by its arch_major and product_major. */ ++#define GPU_ID2_MODEL_MAKE(arch_major, product_major) \ ++ (((arch_major) << GPU_ID2_ARCH_MAJOR_SHIFT) | \ ++ ((product_major) << GPU_ID2_PRODUCT_MAJOR_SHIFT)) + -+MALI_STATIC_INLINE u32 mali_pp_core_get_id(struct mali_pp_core *core) -+{ -+ MALI_DEBUG_ASSERT_POINTER(core); -+ return core->core_id; -+} ++/* Strip off the non-relevant bits from a product_id value and make it suitable ++ for comparison against the GPU_ID2_PRODUCT_xxx values which identify a GPU ++ model. */ ++#define GPU_ID2_MODEL_MATCH_VALUE(product_id) \ ++ (((product_id) << GPU_ID2_PRODUCT_MAJOR_SHIFT) & \ ++ GPU_ID2_PRODUCT_MODEL) + -+MALI_STATIC_INLINE u32 mali_pp_core_get_bcast_id(struct mali_pp_core *core) -+{ -+ MALI_DEBUG_ASSERT_POINTER(core); -+ return core->bcast_id; -+} ++#define GPU_ID2_PRODUCT_TMIX GPU_ID2_MODEL_MAKE(6u, 0) ++#define GPU_ID2_PRODUCT_THEX GPU_ID2_MODEL_MAKE(6u, 1) ++#define GPU_ID2_PRODUCT_TSIX GPU_ID2_MODEL_MAKE(7u, 0) ++#ifdef MALI_INCLUDE_TKAX ++#define GPU_ID2_PRODUCT_TKAX GPU_ID2_MODEL_MAKE(9u, 0) ++#endif /* MALI_INCLUDE_TKAX */ ++#ifdef MALI_INCLUDE_TTRX ++#define GPU_ID2_PRODUCT_TTRX GPU_ID2_MODEL_MAKE(10u, 0) ++#endif /* MALI_INCLUDE_TTRX */ + -+struct mali_pp_core *mali_pp_get_global_pp_core(u32 index); -+u32 mali_pp_get_glob_num_pp_cores(void); ++/* Values for GPU_ID_VERSION_STATUS field for PRODUCT_ID GPU_ID_PI_T60X */ ++#define GPU_ID_S_15DEV0 0x1 ++#define GPU_ID_S_EAC 0x2 + -+/* Debug */ -+u32 mali_pp_dump_state(struct mali_pp_core *core, char *buf, u32 size); ++/* Helper macro to create a GPU_ID assuming valid values for id, major, ++ minor, status */ ++#define GPU_ID_MAKE(id, major, minor, status) \ ++ (((id) << GPU_ID_VERSION_PRODUCT_ID_SHIFT) | \ ++ ((major) << GPU_ID_VERSION_MAJOR_SHIFT) | \ ++ ((minor) << GPU_ID_VERSION_MINOR_SHIFT) | \ ++ ((status) << GPU_ID_VERSION_STATUS_SHIFT)) + -+/** -+ * Put instrumented HW counters from the core(s) to the job object (if enabled) ++#endif /* _KBASE_GPU_ID_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c +new file mode 100755 +index 000000000..6df0a1cb1 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c +@@ -0,0 +1,97 @@ ++/* + * -+ * parent and child is always the same, except for virtual jobs on Mali-450. -+ * In this case, the counters will be enabled on the virtual core (parent), -+ * but values need to be read from the child cores. ++ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * @param parent The core used to see if the counters was enabled -+ * @param child The core to actually read the values from -+ * @job Job object to update with counter values (if enabled) -+ * @subjob Which subjob the counters are applicable for (core ID for virtual jobs) + */ -+void mali_pp_update_performance_counters(struct mali_pp_core *parent, struct mali_pp_core *child, struct mali_pp_job *job, u32 subjob); + -+MALI_STATIC_INLINE const char *mali_pp_core_description(struct mali_pp_core *core) -+{ -+ return core->hw_core.description; -+} + -+MALI_STATIC_INLINE enum mali_interrupt_result mali_pp_get_interrupt_result(struct mali_pp_core *core) -+{ -+ u32 rawstat_used = mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_RAWSTAT) & -+ MALI200_REG_VAL_IRQ_MASK_USED; -+ if (0 == rawstat_used) { -+ return MALI_INTERRUPT_RESULT_NONE; -+ } else if (MALI200_REG_VAL_IRQ_END_OF_FRAME == rawstat_used) { -+ return MALI_INTERRUPT_RESULT_SUCCESS; -+ } + -+ return MALI_INTERRUPT_RESULT_ERROR; -+} ++#include + -+MALI_STATIC_INLINE u32 mali_pp_get_rawstat(struct mali_pp_core *core) ++#ifdef CONFIG_DEBUG_FS ++/** Show callback for the @c gpu_memory debugfs file. ++ * ++ * This function is called to get the contents of the @c gpu_memory debugfs ++ * file. This is a report of current gpu memory usage. ++ * ++ * @param sfile The debugfs entry ++ * @param data Data associated with the entry ++ * ++ * @return 0 if successfully prints data in debugfs entry file ++ * -1 if it encountered an error ++ */ ++ ++static int kbasep_gpu_memory_seq_show(struct seq_file *sfile, void *data) +{ -+ MALI_DEBUG_ASSERT_POINTER(core); -+ return mali_hw_core_register_read(&core->hw_core, -+ MALI200_REG_ADDR_MGMT_INT_RAWSTAT); -+} ++ struct list_head *entry; ++ const struct list_head *kbdev_list; + ++ kbdev_list = kbase_dev_list_get(); ++ list_for_each(entry, kbdev_list) { ++ struct kbase_device *kbdev = NULL; ++ struct kbasep_kctx_list_element *element; + -+MALI_STATIC_INLINE u32 mali_pp_is_active(struct mali_pp_core *core) -+{ -+ u32 status = mali_hw_core_register_read(&core->hw_core, MALI200_REG_ADDR_MGMT_STATUS); -+ return (status & MALI200_REG_VAL_STATUS_RENDERING_ACTIVE) ? MALI_TRUE : MALI_FALSE; ++ kbdev = list_entry(entry, struct kbase_device, entry); ++ /* output the total memory usage and cap for this device */ ++ seq_printf(sfile, "%-16s %10u\n", ++ kbdev->devname, ++ atomic_read(&(kbdev->memdev.used_pages))); ++ mutex_lock(&kbdev->kctx_list_lock); ++ list_for_each_entry(element, &kbdev->kctx_list, link) { ++ /* output the memory usage and cap for each kctx ++ * opened on this device */ ++ seq_printf(sfile, " %s-0x%p %10u\n", ++ "kctx", ++ element->kctx, ++ atomic_read(&(element->kctx->used_pages))); ++ } ++ mutex_unlock(&kbdev->kctx_list_lock); ++ } ++ kbase_dev_list_put(kbdev_list); ++ return 0; +} + -+MALI_STATIC_INLINE void mali_pp_mask_all_interrupts(struct mali_pp_core *core) ++/* ++ * File operations related to debugfs entry for gpu_memory ++ */ ++static int kbasep_gpu_memory_debugfs_open(struct inode *in, struct file *file) +{ -+ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK, MALI200_REG_VAL_IRQ_MASK_NONE); ++ return single_open(file, kbasep_gpu_memory_seq_show , NULL); +} + -+MALI_STATIC_INLINE void mali_pp_enable_interrupts(struct mali_pp_core *core) -+{ -+ mali_hw_core_register_write(&core->hw_core, MALI200_REG_ADDR_MGMT_INT_MASK, MALI200_REG_VAL_IRQ_MASK_USED); -+} ++static const struct file_operations kbasep_gpu_memory_debugfs_fops = { ++ .open = kbasep_gpu_memory_debugfs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; + -+MALI_STATIC_INLINE void mali_pp_write_addr_renderer_list(struct mali_pp_core *core, -+ struct mali_pp_job *job, u32 subjob) ++/* ++ * Initialize debugfs entry for gpu_memory ++ */ ++void kbasep_gpu_memory_debugfs_init(struct kbase_device *kbdev) +{ -+ u32 addr = mali_pp_job_get_addr_frame(job, subjob); -+ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_FRAME, addr); ++ debugfs_create_file("gpu_memory", S_IRUGO, ++ kbdev->mali_debugfs_directory, NULL, ++ &kbasep_gpu_memory_debugfs_fops); ++ return; +} + -+ -+MALI_STATIC_INLINE void mali_pp_write_addr_stack(struct mali_pp_core *core, struct mali_pp_job *job) ++#else ++/* ++ * Stub functions for when debugfs is disabled ++ */ ++void kbasep_gpu_memory_debugfs_init(struct kbase_device *kbdev) +{ -+ u32 addr = mali_pp_job_get_addr_stack(job, core->core_id); -+ mali_hw_core_register_write_relaxed(&core->hw_core, MALI200_REG_ADDR_STACK, addr); ++ return; +} -+ -+#endif /* __MALI_PP_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c ++#endif +diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h new file mode 100755 -index 000000000000..b0216d4c1ac8 +index 000000000..7045693eb --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c -@@ -0,0 +1,316 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h +@@ -0,0 +1,37 @@ +/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2012-2014, 2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include "mali_pp.h" -+#include "mali_pp_job.h" -+#include "mali_osk.h" -+#include "mali_osk_list.h" -+#include "mali_kernel_common.h" -+#include "mali_uk_types.h" -+#include "mali_executor.h" -+#if defined(CONFIG_DMA_SHARED_BUFFER) && !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) -+#include "linux/mali_memory_dma_buf.h" -+#endif -+#include "mali_memory_swap_alloc.h" -+#include "mali_scheduler.h" -+ -+static u32 pp_counter_src0 = MALI_HW_CORE_NO_COUNTER; /**< Performance counter 0, MALI_HW_CORE_NO_COUNTER for disabled */ -+static u32 pp_counter_src1 = MALI_HW_CORE_NO_COUNTER; /**< Performance counter 1, MALI_HW_CORE_NO_COUNTER for disabled */ -+static _mali_osk_atomic_t pp_counter_per_sub_job_count; /**< Number of values in the two arrays which is != MALI_HW_CORE_NO_COUNTER */ -+static u32 pp_counter_per_sub_job_src0[_MALI_PP_MAX_SUB_JOBS] = { MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER }; -+static u32 pp_counter_per_sub_job_src1[_MALI_PP_MAX_SUB_JOBS] = { MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER, MALI_HW_CORE_NO_COUNTER }; -+ -+void mali_pp_job_initialize(void) -+{ -+ _mali_osk_atomic_init(&pp_counter_per_sub_job_count, 0); -+} + -+void mali_pp_job_terminate(void) -+{ -+ _mali_osk_atomic_term(&pp_counter_per_sub_job_count); -+} + -+struct mali_pp_job *mali_pp_job_create(struct mali_session_data *session, -+ _mali_uk_pp_start_job_s __user *uargs, u32 id) -+{ -+ struct mali_pp_job *job; -+ u32 perf_counter_flag; + -+ job = _mali_osk_calloc(1, sizeof(struct mali_pp_job)); -+ if (NULL != job) { -+ -+ _mali_osk_list_init(&job->list); -+ _mali_osk_list_init(&job->session_fb_lookup_list); -+ _mali_osk_atomic_inc(&session->number_of_pp_jobs); + -+ if (0 != _mali_osk_copy_from_user(&job->uargs, uargs, sizeof(_mali_uk_pp_start_job_s))) { -+ goto fail; -+ } ++/** ++ * @file mali_kbase_gpu_memory_debugfs.h ++ * Header file for gpu_memory entry in debugfs ++ * ++ */ + -+ if (job->uargs.num_cores > _MALI_PP_MAX_SUB_JOBS) { -+ MALI_PRINT_ERROR(("Mali PP job: Too many sub jobs specified in job object\n")); -+ goto fail; -+ } ++#ifndef _KBASE_GPU_MEMORY_DEBUGFS_H ++#define _KBASE_GPU_MEMORY_DEBUGFS_H + -+ if (!mali_pp_job_use_no_notification(job)) { -+ job->finished_notification = _mali_osk_notification_create(_MALI_NOTIFICATION_PP_FINISHED, sizeof(_mali_uk_pp_job_finished_s)); -+ if (NULL == job->finished_notification) goto fail; -+ } ++#include ++#include + -+ perf_counter_flag = mali_pp_job_get_perf_counter_flag(job); ++/** ++ * @brief Initialize gpu_memory debugfs entry ++ */ ++void kbasep_gpu_memory_debugfs_init(struct kbase_device *kbdev); + -+ /* case when no counters came from user space -+ * so pass the debugfs / DS-5 provided global ones to the job object */ -+ if (!((perf_counter_flag & _MALI_PERFORMANCE_COUNTER_FLAG_SRC0_ENABLE) || -+ (perf_counter_flag & _MALI_PERFORMANCE_COUNTER_FLAG_SRC1_ENABLE))) { -+ u32 sub_job_count = _mali_osk_atomic_read(&pp_counter_per_sub_job_count); ++#endif /*_KBASE_GPU_MEMORY_DEBUGFS_H*/ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c +new file mode 100755 +index 000000000..a947a2e03 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c +@@ -0,0 +1,510 @@ ++/* ++ * ++ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ /* These counters apply for all virtual jobs, and where no per sub job counter is specified */ -+ job->uargs.perf_counter_src0 = pp_counter_src0; -+ job->uargs.perf_counter_src1 = pp_counter_src1; + -+ /* We only copy the per sub job array if it is enabled with at least one counter */ -+ if (0 < sub_job_count) { -+ job->perf_counter_per_sub_job_count = sub_job_count; -+ _mali_osk_memcpy(job->perf_counter_per_sub_job_src0, pp_counter_per_sub_job_src0, sizeof(pp_counter_per_sub_job_src0)); -+ _mali_osk_memcpy(job->perf_counter_per_sub_job_src1, pp_counter_per_sub_job_src1, sizeof(pp_counter_per_sub_job_src1)); -+ } -+ } + -+ job->session = session; -+ job->id = id; + -+ job->sub_jobs_num = job->uargs.num_cores ? job->uargs.num_cores : 1; -+ job->pid = _mali_osk_get_pid(); -+ job->tid = _mali_osk_get_tid(); + -+ _mali_osk_atomic_init(&job->sub_jobs_completed, 0); -+ _mali_osk_atomic_init(&job->sub_job_errors, 0); -+ job->swap_status = MALI_NO_SWAP_IN; -+ job->user_notification = MALI_FALSE; -+ job->num_pp_cores_in_virtual = 0; ++/* ++ * Base kernel property query APIs ++ */ + -+ if (job->uargs.num_memory_cookies > session->allocation_mgr.mali_allocation_num) { -+ MALI_PRINT_ERROR(("Mali PP job: The number of memory cookies is invalid !\n")); -+ goto fail; -+ } ++#include ++#include ++#include ++#include ++#include ++#include "mali_kbase_ioctl.h" ++#include + -+ if (job->uargs.num_memory_cookies > 0) { -+ u32 size; -+ u32 __user *memory_cookies = (u32 __user *)(uintptr_t)job->uargs.memory_cookies; ++/** ++ * KBASE_UBFX32 - Extracts bits from a 32-bit bitfield. ++ * @value: The value from which to extract bits. ++ * @offset: The first bit to extract (0 being the LSB). ++ * @size: The number of bits to extract. ++ * ++ * Context: @offset + @size <= 32. ++ * ++ * Return: Bits [@offset, @offset + @size) from @value. ++ */ ++/* from mali_cdsb.h */ ++#define KBASE_UBFX32(value, offset, size) \ ++ (((u32)(value) >> (u32)(offset)) & (u32)((1ULL << (u32)(size)) - 1)) + -+ size = sizeof(*memory_cookies) * (job->uargs.num_memory_cookies); ++int kbase_gpuprops_uk_get_props(struct kbase_context *kctx, struct kbase_uk_gpuprops * const kbase_props) ++{ ++ kbase_gpu_clk_speed_func get_gpu_speed_mhz; ++ u32 gpu_speed_mhz; ++ int rc = 1; + -+ job->memory_cookies = _mali_osk_malloc(size); -+ if (NULL == job->memory_cookies) { -+ MALI_PRINT_ERROR(("Mali PP job: Failed to allocate %d bytes of memory cookies!\n", size)); -+ goto fail; -+ } ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ KBASE_DEBUG_ASSERT(NULL != kbase_props); + -+ if (0 != _mali_osk_copy_from_user(job->memory_cookies, memory_cookies, size)) { -+ MALI_PRINT_ERROR(("Mali PP job: Failed to copy %d bytes of memory cookies from user!\n", size)); -+ goto fail; -+ } -+ } ++ /* Current GPU speed is requested from the system integrator via the GPU_SPEED_FUNC function. ++ * If that function fails, or the function is not provided by the system integrator, we report the maximum ++ * GPU speed as specified by GPU_FREQ_KHZ_MAX. ++ */ ++ get_gpu_speed_mhz = (kbase_gpu_clk_speed_func) GPU_SPEED_FUNC; ++ if (get_gpu_speed_mhz != NULL) { ++ rc = get_gpu_speed_mhz(&gpu_speed_mhz); ++#ifdef CONFIG_MALI_DEBUG ++ /* Issue a warning message when the reported GPU speed falls outside the min/max range */ ++ if (rc == 0) { ++ u32 gpu_speed_khz = gpu_speed_mhz * 1000; + -+ if (_MALI_OSK_ERR_OK != mali_pp_job_check(job)) { -+ /* Not a valid job. */ -+ goto fail; ++ if (gpu_speed_khz < kctx->kbdev->gpu_props.props.core_props.gpu_freq_khz_min || ++ gpu_speed_khz > kctx->kbdev->gpu_props.props.core_props.gpu_freq_khz_max) ++ dev_warn(kctx->kbdev->dev, "GPU Speed is outside of min/max range (got %lu Khz, min %lu Khz, max %lu Khz)\n", ++ (unsigned long)gpu_speed_khz, ++ (unsigned long)kctx->kbdev->gpu_props.props.core_props.gpu_freq_khz_min, ++ (unsigned long)kctx->kbdev->gpu_props.props.core_props.gpu_freq_khz_max); + } -+ -+ mali_timeline_tracker_init(&job->tracker, MALI_TIMELINE_TRACKER_PP, NULL, job); -+ mali_timeline_fence_copy_uk_fence(&(job->tracker.fence), &(job->uargs.fence)); -+ -+ mali_mem_swap_in_pages(job); -+ -+ return job; ++#endif /* CONFIG_MALI_DEBUG */ + } -+ -+fail: -+ if (NULL != job) { -+ mali_pp_job_delete(job); ++ if (kctx->kbdev->clock) { ++ gpu_speed_mhz = clk_get_rate(kctx->kbdev->clock) / 1000000; ++ rc = 0; + } ++ if (rc != 0) ++ gpu_speed_mhz = kctx->kbdev->gpu_props.props.core_props.gpu_freq_khz_max / 1000; + -+ return NULL; -+} ++ kctx->kbdev->gpu_props.props.core_props.gpu_speed_mhz = gpu_speed_mhz; + -+void mali_pp_job_delete(struct mali_pp_job *job) -+{ -+ struct mali_session_data *session; ++ memcpy(&kbase_props->props, &kctx->kbdev->gpu_props.props, sizeof(kbase_props->props)); + -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT(_mali_osk_list_empty(&job->list)); -+ MALI_DEBUG_ASSERT(_mali_osk_list_empty(&job->session_fb_lookup_list)); ++ /* Before API 8.2 they expect L3 cache info here, which was always 0 */ ++ if (kctx->api_version < KBASE_API_VERSION(8, 2)) ++ kbase_props->props.raw_props.suspend_size = 0; + -+ session = mali_pp_job_get_session(job); -+ MALI_DEBUG_ASSERT_POINTER(session); ++ return 0; ++} + -+ if (NULL != job->memory_cookies) { -+#if defined(CONFIG_DMA_SHARED_BUFFER) && !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) -+ /* Unmap buffers attached to job */ -+ mali_dma_buf_unmap_job(job); -+#endif -+ if (MALI_NO_SWAP_IN != job->swap_status) { -+ mali_mem_swap_out_pages(job); -+ } ++static void kbase_gpuprops_construct_coherent_groups(base_gpu_props * const props) ++{ ++ struct mali_base_gpu_coherent_group *current_group; ++ u64 group_present; ++ u64 group_mask; ++ u64 first_set, first_set_prev; ++ u32 num_groups = 0; + -+ _mali_osk_free(job->memory_cookies); -+ } ++ KBASE_DEBUG_ASSERT(NULL != props); + -+ if (job->user_notification) { -+ mali_scheduler_return_pp_job_to_user(job, -+ job->num_pp_cores_in_virtual); -+ } ++ props->coherency_info.coherency = props->raw_props.mem_features; ++ props->coherency_info.num_core_groups = hweight64(props->raw_props.l2_present); + -+ if (NULL != job->finished_notification) { -+ _mali_osk_notification_delete(job->finished_notification); ++ if (props->coherency_info.coherency & GROUPS_L2_COHERENT) { ++ /* Group is l2 coherent */ ++ group_present = props->raw_props.l2_present; ++ } else { ++ /* Group is l1 coherent */ ++ group_present = props->raw_props.shader_present; + } + -+ _mali_osk_atomic_term(&job->sub_jobs_completed); -+ _mali_osk_atomic_term(&job->sub_job_errors); -+ _mali_osk_atomic_dec(&session->number_of_pp_jobs); -+ _mali_osk_free(job); ++ /* ++ * The coherent group mask can be computed from the l2 present ++ * register. ++ * ++ * For the coherent group n: ++ * group_mask[n] = (first_set[n] - 1) & ~(first_set[n-1] - 1) ++ * where first_set is group_present with only its nth set-bit kept ++ * (i.e. the position from where a new group starts). ++ * ++ * For instance if the groups are l2 coherent and l2_present=0x0..01111: ++ * The first mask is: ++ * group_mask[1] = (first_set[1] - 1) & ~(first_set[0] - 1) ++ * = (0x0..010 - 1) & ~(0x0..01 - 1) ++ * = 0x0..00f ++ * The second mask is: ++ * group_mask[2] = (first_set[2] - 1) & ~(first_set[1] - 1) ++ * = (0x0..100 - 1) & ~(0x0..010 - 1) ++ * = 0x0..0f0 ++ * And so on until all the bits from group_present have been cleared ++ * (i.e. there is no group left). ++ */ + -+ _mali_osk_wait_queue_wake_up(session->wait_queue); -+} ++ current_group = props->coherency_info.group; ++ first_set = group_present & ~(group_present - 1); + -+void mali_pp_job_list_add(struct mali_pp_job *job, _mali_osk_list_t *list) -+{ -+ struct mali_pp_job *iter; -+ struct mali_pp_job *tmp; ++ while (group_present != 0 && num_groups < BASE_MAX_COHERENT_GROUPS) { ++ group_present -= first_set; /* Clear the current group bit */ ++ first_set_prev = first_set; + -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ first_set = group_present & ~(group_present - 1); ++ group_mask = (first_set - 1) & ~(first_set_prev - 1); + -+ /* Find position in list/queue where job should be added. */ -+ _MALI_OSK_LIST_FOREACHENTRY_REVERSE(iter, tmp, list, -+ struct mali_pp_job, list) { -+ /* job should be started after iter if iter is in progress. */ -+ if (0 < iter->sub_jobs_started) { -+ break; -+ } ++ /* Populate the coherent_group structure for each group */ ++ current_group->core_mask = group_mask & props->raw_props.shader_present; ++ current_group->num_cores = hweight64(current_group->core_mask); + -+ /* -+ * job should be started after iter if it has a higher -+ * job id. A span is used to handle job id wrapping. -+ */ -+ if ((mali_pp_job_get_id(job) - -+ mali_pp_job_get_id(iter)) < -+ MALI_SCHEDULER_JOB_ID_SPAN) { -+ break; -+ } ++ num_groups++; ++ current_group++; + } + -+ _mali_osk_list_add(&job->list, &iter->list); -+} ++ if (group_present != 0) ++ pr_warn("Too many coherent groups (keeping only %d groups).\n", BASE_MAX_COHERENT_GROUPS); + ++ props->coherency_info.num_groups = num_groups; ++} + -+u32 mali_pp_job_get_perf_counter_src0(struct mali_pp_job *job, u32 sub_job) ++/** ++ * kbase_gpuprops_get_props - Get the GPU configuration ++ * @gpu_props: The &base_gpu_props structure ++ * @kbdev: The &struct kbase_device structure for the device ++ * ++ * Fill the &base_gpu_props structure with values from the GPU configuration ++ * registers. Only the raw properties are filled in this function ++ */ ++static void kbase_gpuprops_get_props(base_gpu_props * const gpu_props, struct kbase_device *kbdev) +{ -+ /* Virtual jobs always use the global job counter (or if there are per sub job counters at all) */ -+ if (mali_pp_job_is_virtual(job) || 0 == job->perf_counter_per_sub_job_count) { -+ return job->uargs.perf_counter_src0; -+ } ++ struct kbase_gpuprops_regdump regdump; ++ int i; + -+ /* Use per sub job counter if enabled... */ -+ if (MALI_HW_CORE_NO_COUNTER != job->perf_counter_per_sub_job_src0[sub_job]) { -+ return job->perf_counter_per_sub_job_src0[sub_job]; -+ } ++ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ KBASE_DEBUG_ASSERT(NULL != gpu_props); + -+ /* ...else default to global job counter */ -+ return job->uargs.perf_counter_src0; -+} ++ /* Dump relevant registers */ ++ kbase_backend_gpuprops_get(kbdev, ®dump); + -+u32 mali_pp_job_get_perf_counter_src1(struct mali_pp_job *job, u32 sub_job) -+{ -+ /* Virtual jobs always use the global job counter (or if there are per sub job counters at all) */ -+ if (mali_pp_job_is_virtual(job) || 0 == job->perf_counter_per_sub_job_count) { -+ /* Virtual jobs always use the global job counter */ -+ return job->uargs.perf_counter_src1; -+ } ++ gpu_props->raw_props.gpu_id = regdump.gpu_id; ++ gpu_props->raw_props.tiler_features = regdump.tiler_features; ++ gpu_props->raw_props.mem_features = regdump.mem_features; ++ gpu_props->raw_props.mmu_features = regdump.mmu_features; ++ gpu_props->raw_props.l2_features = regdump.l2_features; ++ gpu_props->raw_props.suspend_size = regdump.suspend_size; + -+ /* Use per sub job counter if enabled... */ -+ if (MALI_HW_CORE_NO_COUNTER != job->perf_counter_per_sub_job_src1[sub_job]) { -+ return job->perf_counter_per_sub_job_src1[sub_job]; -+ } ++ gpu_props->raw_props.as_present = regdump.as_present; ++ gpu_props->raw_props.js_present = regdump.js_present; ++ gpu_props->raw_props.shader_present = ++ ((u64) regdump.shader_present_hi << 32) + ++ regdump.shader_present_lo; ++ gpu_props->raw_props.tiler_present = ++ ((u64) regdump.tiler_present_hi << 32) + ++ regdump.tiler_present_lo; ++ gpu_props->raw_props.l2_present = ++ ((u64) regdump.l2_present_hi << 32) + ++ regdump.l2_present_lo; ++#ifdef CONFIG_MALI_CORESTACK ++ gpu_props->raw_props.stack_present = ++ ((u64) regdump.stack_present_hi << 32) + ++ regdump.stack_present_lo; ++#else /* CONFIG_MALI_CORESTACK */ ++ gpu_props->raw_props.stack_present = 0; ++#endif /* CONFIG_MALI_CORESTACK */ + -+ /* ...else default to global job counter */ -+ return job->uargs.perf_counter_src1; -+} ++ for (i = 0; i < GPU_MAX_JOB_SLOTS; i++) ++ gpu_props->raw_props.js_features[i] = regdump.js_features[i]; + -+void mali_pp_job_set_pp_counter_global_src0(u32 counter) -+{ -+ pp_counter_src0 = counter; ++ for (i = 0; i < BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS; i++) ++ gpu_props->raw_props.texture_features[i] = regdump.texture_features[i]; ++ ++ gpu_props->raw_props.thread_max_barrier_size = regdump.thread_max_barrier_size; ++ gpu_props->raw_props.thread_max_threads = regdump.thread_max_threads; ++ gpu_props->raw_props.thread_max_workgroup_size = regdump.thread_max_workgroup_size; ++ gpu_props->raw_props.thread_features = regdump.thread_features; +} + -+void mali_pp_job_set_pp_counter_global_src1(u32 counter) ++void kbase_gpuprops_update_core_props_gpu_id(base_gpu_props * const gpu_props) +{ -+ pp_counter_src1 = counter; ++ gpu_props->core_props.version_status = KBASE_UBFX32(gpu_props->raw_props.gpu_id, 0U, 4); ++ gpu_props->core_props.minor_revision = KBASE_UBFX32(gpu_props->raw_props.gpu_id, 4U, 8); ++ gpu_props->core_props.major_revision = KBASE_UBFX32(gpu_props->raw_props.gpu_id, 12U, 4); ++ gpu_props->core_props.product_id = KBASE_UBFX32(gpu_props->raw_props.gpu_id, 16U, 16); +} + -+void mali_pp_job_set_pp_counter_sub_job_src0(u32 sub_job, u32 counter) ++/** ++ * kbase_gpuprops_calculate_props - Calculate the derived properties ++ * @gpu_props: The &base_gpu_props structure ++ * @kbdev: The &struct kbase_device structure for the device ++ * ++ * Fill the &base_gpu_props structure with values derived from the GPU ++ * configuration registers ++ */ ++static void kbase_gpuprops_calculate_props(base_gpu_props * const gpu_props, struct kbase_device *kbdev) +{ -+ MALI_DEBUG_ASSERT(sub_job < _MALI_PP_MAX_SUB_JOBS); -+ -+ if (MALI_HW_CORE_NO_COUNTER == pp_counter_per_sub_job_src0[sub_job]) { -+ /* increment count since existing counter was disabled */ -+ _mali_osk_atomic_inc(&pp_counter_per_sub_job_count); -+ } ++ int i; + -+ if (MALI_HW_CORE_NO_COUNTER == counter) { -+ /* decrement count since new counter is disabled */ -+ _mali_osk_atomic_dec(&pp_counter_per_sub_job_count); -+ } ++ /* Populate the base_gpu_props structure */ ++ kbase_gpuprops_update_core_props_gpu_id(gpu_props); ++ gpu_props->core_props.log2_program_counter_size = KBASE_GPU_PC_SIZE_LOG2; ++ gpu_props->core_props.gpu_available_memory_size = totalram_pages() << PAGE_SHIFT; + -+ /* PS: A change from MALI_HW_CORE_NO_COUNTER to MALI_HW_CORE_NO_COUNTER will inc and dec, result will be 0 change */ ++ for (i = 0; i < BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS; i++) ++ gpu_props->core_props.texture_features[i] = gpu_props->raw_props.texture_features[i]; + -+ pp_counter_per_sub_job_src0[sub_job] = counter; -+} ++ gpu_props->l2_props.log2_line_size = KBASE_UBFX32(gpu_props->raw_props.l2_features, 0U, 8); ++ gpu_props->l2_props.log2_cache_size = KBASE_UBFX32(gpu_props->raw_props.l2_features, 16U, 8); + -+void mali_pp_job_set_pp_counter_sub_job_src1(u32 sub_job, u32 counter) -+{ -+ MALI_DEBUG_ASSERT(sub_job < _MALI_PP_MAX_SUB_JOBS); ++ /* Field with number of l2 slices is added to MEM_FEATURES register ++ * since t76x. Below code assumes that for older GPU reserved bits will ++ * be read as zero. */ ++ gpu_props->l2_props.num_l2_slices = ++ KBASE_UBFX32(gpu_props->raw_props.mem_features, 8U, 4) + 1; + -+ if (MALI_HW_CORE_NO_COUNTER == pp_counter_per_sub_job_src1[sub_job]) { -+ /* increment count since existing counter was disabled */ -+ _mali_osk_atomic_inc(&pp_counter_per_sub_job_count); -+ } ++ gpu_props->tiler_props.bin_size_bytes = 1 << KBASE_UBFX32(gpu_props->raw_props.tiler_features, 0U, 6); ++ gpu_props->tiler_props.max_active_levels = KBASE_UBFX32(gpu_props->raw_props.tiler_features, 8U, 4); + -+ if (MALI_HW_CORE_NO_COUNTER == counter) { -+ /* decrement count since new counter is disabled */ -+ _mali_osk_atomic_dec(&pp_counter_per_sub_job_count); -+ } ++ if (gpu_props->raw_props.thread_max_threads == 0) ++ gpu_props->thread_props.max_threads = THREAD_MT_DEFAULT; ++ else ++ gpu_props->thread_props.max_threads = gpu_props->raw_props.thread_max_threads; + -+ /* PS: A change from MALI_HW_CORE_NO_COUNTER to MALI_HW_CORE_NO_COUNTER will inc and dec, result will be 0 change */ ++ if (gpu_props->raw_props.thread_max_workgroup_size == 0) ++ gpu_props->thread_props.max_workgroup_size = THREAD_MWS_DEFAULT; ++ else ++ gpu_props->thread_props.max_workgroup_size = gpu_props->raw_props.thread_max_workgroup_size; + -+ pp_counter_per_sub_job_src1[sub_job] = counter; -+} ++ if (gpu_props->raw_props.thread_max_barrier_size == 0) ++ gpu_props->thread_props.max_barrier_size = THREAD_MBS_DEFAULT; ++ else ++ gpu_props->thread_props.max_barrier_size = gpu_props->raw_props.thread_max_barrier_size; + -+u32 mali_pp_job_get_pp_counter_global_src0(void) -+{ -+ return pp_counter_src0; -+} ++ gpu_props->thread_props.max_registers = KBASE_UBFX32(gpu_props->raw_props.thread_features, 0U, 16); ++ gpu_props->thread_props.max_task_queue = KBASE_UBFX32(gpu_props->raw_props.thread_features, 16U, 8); ++ gpu_props->thread_props.max_thread_group_split = KBASE_UBFX32(gpu_props->raw_props.thread_features, 24U, 6); ++ gpu_props->thread_props.impl_tech = KBASE_UBFX32(gpu_props->raw_props.thread_features, 30U, 2); + -+u32 mali_pp_job_get_pp_counter_global_src1(void) -+{ -+ return pp_counter_src1; ++ /* If values are not specified, then use defaults */ ++ if (gpu_props->thread_props.max_registers == 0) { ++ gpu_props->thread_props.max_registers = THREAD_MR_DEFAULT; ++ gpu_props->thread_props.max_task_queue = THREAD_MTQ_DEFAULT; ++ gpu_props->thread_props.max_thread_group_split = THREAD_MTGS_DEFAULT; ++ } ++ /* Initialize the coherent_group structure for each group */ ++ kbase_gpuprops_construct_coherent_groups(gpu_props); +} + -+u32 mali_pp_job_get_pp_counter_sub_job_src0(u32 sub_job) ++void kbase_gpuprops_set(struct kbase_device *kbdev) +{ -+ MALI_DEBUG_ASSERT(sub_job < _MALI_PP_MAX_SUB_JOBS); -+ return pp_counter_per_sub_job_src0[sub_job]; -+} ++ struct kbase_gpu_props *gpu_props; ++ struct gpu_raw_gpu_props *raw; + -+u32 mali_pp_job_get_pp_counter_sub_job_src1(u32 sub_job) -+{ -+ MALI_DEBUG_ASSERT(sub_job < _MALI_PP_MAX_SUB_JOBS); -+ return pp_counter_per_sub_job_src1[sub_job]; -+} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h -new file mode 100755 -index 000000000000..d0331f398ff9 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h -@@ -0,0 +1,594 @@ -+/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ gpu_props = &kbdev->gpu_props; ++ raw = &gpu_props->props.raw_props; + -+#ifndef __MALI_PP_JOB_H__ -+#define __MALI_PP_JOB_H__ ++ /* Initialize the base_gpu_props structure from the hardware */ ++ kbase_gpuprops_get_props(&gpu_props->props, kbdev); + -+#include "mali_osk.h" -+#include "mali_osk_list.h" -+#include "mali_uk_types.h" -+#include "mali_session.h" -+#include "mali_kernel_common.h" -+#include "regs/mali_200_regs.h" -+#include "mali_kernel_core.h" -+#include "mali_dlbu.h" -+#include "mali_timeline.h" -+#include "mali_scheduler.h" -+#include "mali_executor.h" -+#if defined(CONFIG_DMA_SHARED_BUFFER) && !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) -+#include "linux/mali_memory_dma_buf.h" -+#endif -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+#include "linux/mali_dma_fence.h" -+#endif ++ /* Populate the derived properties */ ++ kbase_gpuprops_calculate_props(&gpu_props->props, kbdev); + -+typedef enum pp_job_status { -+ MALI_NO_SWAP_IN, -+ MALI_SWAP_IN_FAIL, -+ MALI_SWAP_IN_SUCC, -+} pp_job_status; ++ /* Populate kbase-only fields */ ++ gpu_props->l2_props.associativity = KBASE_UBFX32(raw->l2_features, 8U, 8); ++ gpu_props->l2_props.external_bus_width = KBASE_UBFX32(raw->l2_features, 24U, 8); + -+/** -+ * This structure represents a PP job, including all sub jobs. -+ * -+ * The PP job object itself is not protected by any single lock, -+ * but relies on other locks instead (scheduler, executor and timeline lock). -+ * Think of the job object as moving between these sub systems through-out -+ * its lifetime. Different part of the PP job struct is used by different -+ * subsystems. Accessor functions ensure that correct lock is taken. -+ * Do NOT access any data members directly from outside this module! -+ */ -+struct mali_pp_job { -+ /* -+ * These members are typically only set at creation, -+ * and only read later on. -+ * They do not require any lock protection. -+ */ -+ _mali_uk_pp_start_job_s uargs; /**< Arguments from user space */ -+ struct mali_session_data *session; /**< Session which submitted this job */ -+ u32 pid; /**< Process ID of submitting process */ -+ u32 tid; /**< Thread ID of submitting thread */ -+ u32 id; /**< Identifier for this job in kernel space (sequential numbering) */ -+ u32 cache_order; /**< Cache order used for L2 cache flushing (sequential numbering) */ -+ struct mali_timeline_tracker tracker; /**< Timeline tracker for this job */ -+ _mali_osk_notification_t *finished_notification; /**< Notification sent back to userspace on job complete */ -+ u32 perf_counter_per_sub_job_count; /**< Number of values in the two arrays which is != MALI_HW_CORE_NO_COUNTER */ -+ u32 perf_counter_per_sub_job_src0[_MALI_PP_MAX_SUB_JOBS]; /**< Per sub job counters src0 */ -+ u32 perf_counter_per_sub_job_src1[_MALI_PP_MAX_SUB_JOBS]; /**< Per sub job counters src1 */ -+ u32 sub_jobs_num; /**< Number of subjobs; set to 1 for Mali-450 if DLBU is used, otherwise equals number of PP cores */ ++ gpu_props->mem.core_group = KBASE_UBFX32(raw->mem_features, 0U, 1); + -+ pp_job_status swap_status; /**< Used to track each PP job swap status, if fail, we need to drop them in scheduler part */ -+ mali_bool user_notification; /**< When we deferred delete PP job, we need to judge if we need to send job finish notification to user space */ -+ u32 num_pp_cores_in_virtual; /**< How many PP cores we have when job finished */ ++ gpu_props->mmu.va_bits = KBASE_UBFX32(raw->mmu_features, 0U, 8); ++ gpu_props->mmu.pa_bits = KBASE_UBFX32(raw->mmu_features, 8U, 8); + -+ /* -+ * These members are used by both scheduler and executor. -+ * They are "protected" by atomic operations. -+ */ -+ _mali_osk_atomic_t sub_jobs_completed; /**< Number of completed sub-jobs in this superjob */ -+ _mali_osk_atomic_t sub_job_errors; /**< Bitfield with errors (errors for each single sub-job is or'ed together) */ ++ gpu_props->num_cores = hweight64(raw->shader_present); ++ gpu_props->num_core_groups = hweight64(raw->l2_present); ++ gpu_props->num_address_spaces = hweight32(raw->as_present); ++ gpu_props->num_job_slots = hweight32(raw->js_present); ++} + -+ /* -+ * These members are used by scheduler, but only when no one else -+ * knows about this job object but the working function. -+ * No lock is thus needed for these. -+ */ -+ u32 *memory_cookies; /**< Memory cookies attached to job */ ++void kbase_gpuprops_set_features(struct kbase_device *kbdev) ++{ ++ base_gpu_props *gpu_props; ++ struct kbase_gpuprops_regdump regdump; + -+ /* -+ * These members are used by the scheduler, -+ * protected by scheduler lock -+ */ -+ _mali_osk_list_t list; /**< Used to link jobs together in the scheduler queue */ -+ _mali_osk_list_t session_fb_lookup_list; /**< Used to link jobs together from the same frame builder in the session */ ++ gpu_props = &kbdev->gpu_props.props; + -+ u32 sub_jobs_started; /**< Total number of sub-jobs started (always started in ascending order) */ ++ /* Dump relevant registers */ ++ kbase_backend_gpuprops_get_features(kbdev, ®dump); + + /* -+ * Set by executor/group on job completion, read by scheduler when -+ * returning job to user. Hold executor lock when setting, -+ * no lock needed when reading ++ * Copy the raw value from the register, later this will get turned ++ * into the selected coherency mode. ++ * Additionally, add non-coherent mode, as this is always supported. + */ -+ u32 perf_counter_value0[_MALI_PP_MAX_SUB_JOBS]; /**< Value of performance counter 0 (to be returned to user space), one for each sub job */ -+ u32 perf_counter_value1[_MALI_PP_MAX_SUB_JOBS]; /**< Value of performance counter 1 (to be returned to user space), one for each sub job */ -+ -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+ struct mali_dma_fence_context dma_fence_context; /**< The mali dma fence context to record dma fence waiters that this job wait for */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ struct dma_fence *rendered_dma_fence; /**< the new dma fence link to this job */ -+#else -+ struct fence *rendered_dma_fence; /**< the new dma fence link to this job */ -+#endif -+#endif -+}; -+ -+void mali_pp_job_initialize(void); -+void mali_pp_job_terminate(void); ++ gpu_props->raw_props.coherency_mode = regdump.coherency_features | ++ COHERENCY_FEATURE_BIT(COHERENCY_NONE); ++} + -+struct mali_pp_job *mali_pp_job_create(struct mali_session_data *session, _mali_uk_pp_start_job_s *uargs, u32 id); -+void mali_pp_job_delete(struct mali_pp_job *job); ++static struct { ++ u32 type; ++ size_t offset; ++ int size; ++} gpu_property_mapping[] = { ++#define PROP(name, member) \ ++ {KBASE_GPUPROP_ ## name, offsetof(struct mali_base_gpu_props, member), \ ++ sizeof(((struct mali_base_gpu_props *)0)->member)} ++ PROP(PRODUCT_ID, core_props.product_id), ++ PROP(VERSION_STATUS, core_props.version_status), ++ PROP(MINOR_REVISION, core_props.minor_revision), ++ PROP(MAJOR_REVISION, core_props.major_revision), ++ PROP(GPU_SPEED_MHZ, core_props.gpu_speed_mhz), ++ PROP(GPU_FREQ_KHZ_MAX, core_props.gpu_freq_khz_max), ++ PROP(GPU_FREQ_KHZ_MIN, core_props.gpu_freq_khz_min), ++ PROP(LOG2_PROGRAM_COUNTER_SIZE, core_props.log2_program_counter_size), ++ PROP(TEXTURE_FEATURES_0, core_props.texture_features[0]), ++ PROP(TEXTURE_FEATURES_1, core_props.texture_features[1]), ++ PROP(TEXTURE_FEATURES_2, core_props.texture_features[2]), ++ PROP(GPU_AVAILABLE_MEMORY_SIZE, core_props.gpu_available_memory_size), + -+u32 mali_pp_job_get_perf_counter_src0(struct mali_pp_job *job, u32 sub_job); -+u32 mali_pp_job_get_perf_counter_src1(struct mali_pp_job *job, u32 sub_job); ++ PROP(L2_LOG2_LINE_SIZE, l2_props.log2_line_size), ++ PROP(L2_LOG2_CACHE_SIZE, l2_props.log2_cache_size), ++ PROP(L2_NUM_L2_SLICES, l2_props.num_l2_slices), + -+void mali_pp_job_set_pp_counter_global_src0(u32 counter); -+void mali_pp_job_set_pp_counter_global_src1(u32 counter); -+void mali_pp_job_set_pp_counter_sub_job_src0(u32 sub_job, u32 counter); -+void mali_pp_job_set_pp_counter_sub_job_src1(u32 sub_job, u32 counter); ++ PROP(TILER_BIN_SIZE_BYTES, tiler_props.bin_size_bytes), ++ PROP(TILER_MAX_ACTIVE_LEVELS, tiler_props.max_active_levels), + -+u32 mali_pp_job_get_pp_counter_global_src0(void); -+u32 mali_pp_job_get_pp_counter_global_src1(void); -+u32 mali_pp_job_get_pp_counter_sub_job_src0(u32 sub_job); -+u32 mali_pp_job_get_pp_counter_sub_job_src1(u32 sub_job); ++ PROP(MAX_THREADS, thread_props.max_threads), ++ PROP(MAX_WORKGROUP_SIZE, thread_props.max_workgroup_size), ++ PROP(MAX_BARRIER_SIZE, thread_props.max_barrier_size), ++ PROP(MAX_REGISTERS, thread_props.max_registers), ++ PROP(MAX_TASK_QUEUE, thread_props.max_task_queue), ++ PROP(MAX_THREAD_GROUP_SPLIT, thread_props.max_thread_group_split), ++ PROP(IMPL_TECH, thread_props.impl_tech), + -+MALI_STATIC_INLINE u32 mali_pp_job_get_id(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return (NULL == job) ? 0 : job->id; -+} ++ PROP(RAW_SHADER_PRESENT, raw_props.shader_present), ++ PROP(RAW_TILER_PRESENT, raw_props.tiler_present), ++ PROP(RAW_L2_PRESENT, raw_props.l2_present), ++ PROP(RAW_STACK_PRESENT, raw_props.stack_present), ++ PROP(RAW_L2_FEATURES, raw_props.l2_features), ++ PROP(RAW_SUSPEND_SIZE, raw_props.suspend_size), ++ PROP(RAW_MEM_FEATURES, raw_props.mem_features), ++ PROP(RAW_MMU_FEATURES, raw_props.mmu_features), ++ PROP(RAW_AS_PRESENT, raw_props.as_present), ++ PROP(RAW_JS_PRESENT, raw_props.js_present), ++ PROP(RAW_JS_FEATURES_0, raw_props.js_features[0]), ++ PROP(RAW_JS_FEATURES_1, raw_props.js_features[1]), ++ PROP(RAW_JS_FEATURES_2, raw_props.js_features[2]), ++ PROP(RAW_JS_FEATURES_3, raw_props.js_features[3]), ++ PROP(RAW_JS_FEATURES_4, raw_props.js_features[4]), ++ PROP(RAW_JS_FEATURES_5, raw_props.js_features[5]), ++ PROP(RAW_JS_FEATURES_6, raw_props.js_features[6]), ++ PROP(RAW_JS_FEATURES_7, raw_props.js_features[7]), ++ PROP(RAW_JS_FEATURES_8, raw_props.js_features[8]), ++ PROP(RAW_JS_FEATURES_9, raw_props.js_features[9]), ++ PROP(RAW_JS_FEATURES_10, raw_props.js_features[10]), ++ PROP(RAW_JS_FEATURES_11, raw_props.js_features[11]), ++ PROP(RAW_JS_FEATURES_12, raw_props.js_features[12]), ++ PROP(RAW_JS_FEATURES_13, raw_props.js_features[13]), ++ PROP(RAW_JS_FEATURES_14, raw_props.js_features[14]), ++ PROP(RAW_JS_FEATURES_15, raw_props.js_features[15]), ++ PROP(RAW_TILER_FEATURES, raw_props.tiler_features), ++ PROP(RAW_TEXTURE_FEATURES_0, raw_props.texture_features[0]), ++ PROP(RAW_TEXTURE_FEATURES_1, raw_props.texture_features[1]), ++ PROP(RAW_TEXTURE_FEATURES_2, raw_props.texture_features[2]), ++ PROP(RAW_GPU_ID, raw_props.gpu_id), ++ PROP(RAW_THREAD_MAX_THREADS, raw_props.thread_max_threads), ++ PROP(RAW_THREAD_MAX_WORKGROUP_SIZE, ++ raw_props.thread_max_workgroup_size), ++ PROP(RAW_THREAD_MAX_BARRIER_SIZE, raw_props.thread_max_barrier_size), ++ PROP(RAW_THREAD_FEATURES, raw_props.thread_features), ++ PROP(RAW_COHERENCY_MODE, raw_props.coherency_mode), + -+MALI_STATIC_INLINE void mali_pp_job_set_cache_order(struct mali_pp_job *job, -+ u32 cache_order) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); -+ job->cache_order = cache_order; -+} ++ PROP(COHERENCY_NUM_GROUPS, coherency_info.num_groups), ++ PROP(COHERENCY_NUM_CORE_GROUPS, coherency_info.num_core_groups), ++ PROP(COHERENCY_COHERENCY, coherency_info.coherency), ++ PROP(COHERENCY_GROUP_0, coherency_info.group[0].core_mask), ++ PROP(COHERENCY_GROUP_1, coherency_info.group[1].core_mask), ++ PROP(COHERENCY_GROUP_2, coherency_info.group[2].core_mask), ++ PROP(COHERENCY_GROUP_3, coherency_info.group[3].core_mask), ++ PROP(COHERENCY_GROUP_4, coherency_info.group[4].core_mask), ++ PROP(COHERENCY_GROUP_5, coherency_info.group[5].core_mask), ++ PROP(COHERENCY_GROUP_6, coherency_info.group[6].core_mask), ++ PROP(COHERENCY_GROUP_7, coherency_info.group[7].core_mask), ++ PROP(COHERENCY_GROUP_8, coherency_info.group[8].core_mask), ++ PROP(COHERENCY_GROUP_9, coherency_info.group[9].core_mask), ++ PROP(COHERENCY_GROUP_10, coherency_info.group[10].core_mask), ++ PROP(COHERENCY_GROUP_11, coherency_info.group[11].core_mask), ++ PROP(COHERENCY_GROUP_12, coherency_info.group[12].core_mask), ++ PROP(COHERENCY_GROUP_13, coherency_info.group[13].core_mask), ++ PROP(COHERENCY_GROUP_14, coherency_info.group[14].core_mask), ++ PROP(COHERENCY_GROUP_15, coherency_info.group[15].core_mask), + -+MALI_STATIC_INLINE u32 mali_pp_job_get_cache_order(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return (NULL == job) ? 0 : job->cache_order; -+} ++#undef PROP ++}; + -+MALI_STATIC_INLINE u64 mali_pp_job_get_user_id(struct mali_pp_job *job) ++int kbase_gpuprops_populate_user_buffer(struct kbase_device *kbdev) +{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.user_job_ptr; -+} ++ struct kbase_gpu_props *kprops = &kbdev->gpu_props; ++ struct mali_base_gpu_props *props = &kprops->props; ++ u32 count = ARRAY_SIZE(gpu_property_mapping); ++ u32 i; ++ u32 size = 0; ++ u8 *p; + -+MALI_STATIC_INLINE u32 mali_pp_job_get_frame_builder_id(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.frame_builder_id; -+} ++ for (i = 0; i < count; i++) { ++ /* 4 bytes for the ID, and the size of the property */ ++ size += 4 + gpu_property_mapping[i].size; ++ } + -+MALI_STATIC_INLINE u32 mali_pp_job_get_flush_id(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.flush_id; -+} ++ kprops->prop_buffer_size = size; ++ kprops->prop_buffer = kmalloc(size, GFP_KERNEL); + -+MALI_STATIC_INLINE u32 mali_pp_job_get_pid(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->pid; -+} ++ if (!kprops->prop_buffer) { ++ kprops->prop_buffer_size = 0; ++ return -ENOMEM; ++ } + -+MALI_STATIC_INLINE u32 mali_pp_job_get_tid(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->tid; -+} ++ p = kprops->prop_buffer; + -+MALI_STATIC_INLINE u32 *mali_pp_job_get_frame_registers(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.frame_registers; -+} ++#define WRITE_U8(v) (*p++ = (v) & 0xFF) ++#define WRITE_U16(v) do { WRITE_U8(v); WRITE_U8((v) >> 8); } while (0) ++#define WRITE_U32(v) do { WRITE_U16(v); WRITE_U16((v) >> 16); } while (0) ++#define WRITE_U64(v) do { WRITE_U32(v); WRITE_U32((v) >> 32); } while (0) + -+MALI_STATIC_INLINE u32 *mali_pp_job_get_dlbu_registers(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.dlbu_registers; -+} ++ for (i = 0; i < count; i++) { ++ u32 type = gpu_property_mapping[i].type; ++ u8 type_size; ++ void *field = ((u8 *)props) + gpu_property_mapping[i].offset; + -+MALI_STATIC_INLINE mali_bool mali_pp_job_is_virtual(struct mali_pp_job *job) -+{ -+#if (defined(CONFIG_MALI450) || defined(CONFIG_MALI470)) -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return (0 == job->uargs.num_cores) ? MALI_TRUE : MALI_FALSE; -+#else -+ return MALI_FALSE; -+#endif -+} ++ switch (gpu_property_mapping[i].size) { ++ case 1: ++ type_size = KBASE_GPUPROP_VALUE_SIZE_U8; ++ break; ++ case 2: ++ type_size = KBASE_GPUPROP_VALUE_SIZE_U16; ++ break; ++ case 4: ++ type_size = KBASE_GPUPROP_VALUE_SIZE_U32; ++ break; ++ case 8: ++ type_size = KBASE_GPUPROP_VALUE_SIZE_U64; ++ break; ++ default: ++ dev_err(kbdev->dev, ++ "Invalid gpu_property_mapping type=%d size=%d", ++ type, gpu_property_mapping[i].size); ++ return -EINVAL; ++ } + -+MALI_STATIC_INLINE u32 mali_pp_job_get_addr_frame(struct mali_pp_job *job, u32 sub_job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); ++ WRITE_U32((type<<2) | type_size); + -+ if (mali_pp_job_is_virtual(job)) { -+ return MALI_DLBU_VIRT_ADDR; -+ } else if (0 == sub_job) { -+ return job->uargs.frame_registers[MALI200_REG_ADDR_FRAME / sizeof(u32)]; -+ } else if (sub_job < _MALI_PP_MAX_SUB_JOBS) { -+ return job->uargs.frame_registers_addr_frame[sub_job - 1]; ++ switch (type_size) { ++ case KBASE_GPUPROP_VALUE_SIZE_U8: ++ WRITE_U8(*((u8 *)field)); ++ break; ++ case KBASE_GPUPROP_VALUE_SIZE_U16: ++ WRITE_U16(*((u16 *)field)); ++ break; ++ case KBASE_GPUPROP_VALUE_SIZE_U32: ++ WRITE_U32(*((u32 *)field)); ++ break; ++ case KBASE_GPUPROP_VALUE_SIZE_U64: ++ WRITE_U64(*((u64 *)field)); ++ break; ++ default: /* Cannot be reached */ ++ WARN_ON(1); ++ return -EINVAL; ++ } + } + + return 0; +} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h +new file mode 100755 +index 000000000..57b3eaf9c +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h +@@ -0,0 +1,84 @@ ++/* ++ * ++ * (C) COPYRIGHT 2011-2015,2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+MALI_STATIC_INLINE u32 mali_pp_job_get_addr_stack(struct mali_pp_job *job, u32 sub_job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); + -+ if (0 == sub_job) { -+ return job->uargs.frame_registers[MALI200_REG_ADDR_STACK / sizeof(u32)]; -+ } else if (sub_job < _MALI_PP_MAX_SUB_JOBS) { -+ return job->uargs.frame_registers_addr_stack[sub_job - 1]; -+ } + -+ return 0; -+} + -+void mali_pp_job_list_add(struct mali_pp_job *job, _mali_osk_list_t *list); + -+MALI_STATIC_INLINE void mali_pp_job_list_addtail(struct mali_pp_job *job, -+ _mali_osk_list_t *list) -+{ -+ _mali_osk_list_addtail(&job->list, list); -+} ++/** ++ * @file mali_kbase_gpuprops.h ++ * Base kernel property query APIs ++ */ + -+MALI_STATIC_INLINE void mali_pp_job_list_move(struct mali_pp_job *job, -+ _mali_osk_list_t *list) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(!_mali_osk_list_empty(&job->list)); -+ _mali_osk_list_move(&job->list, list); -+} ++#ifndef _KBASE_GPUPROPS_H_ ++#define _KBASE_GPUPROPS_H_ + -+MALI_STATIC_INLINE void mali_pp_job_list_remove(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); -+ _mali_osk_list_delinit(&job->list); -+} ++#include "mali_kbase_gpuprops_types.h" + -+MALI_STATIC_INLINE u32 *mali_pp_job_get_wb0_registers(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.wb0_registers; -+} ++/* Forward definition - see mali_kbase.h */ ++struct kbase_device; + -+MALI_STATIC_INLINE u32 *mali_pp_job_get_wb1_registers(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.wb1_registers; -+} ++/** ++ * @brief Set up Kbase GPU properties. ++ * ++ * Set up Kbase GPU properties with information from the GPU registers ++ * ++ * @param kbdev The struct kbase_device structure for the device ++ */ ++void kbase_gpuprops_set(struct kbase_device *kbdev); + -+MALI_STATIC_INLINE u32 *mali_pp_job_get_wb2_registers(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.wb2_registers; -+} ++/** ++ * kbase_gpuprops_set_features - Set up Kbase GPU properties ++ * @kbdev: Device pointer ++ * ++ * This function sets up GPU properties that are dependent on the hardware ++ * features bitmask. This function must be preceeded by a call to ++ * kbase_hw_set_features_mask(). ++ */ ++void kbase_gpuprops_set_features(struct kbase_device *kbdev); + -+MALI_STATIC_INLINE u32 mali_pp_job_get_wb0_source_addr(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.wb0_registers[MALI200_REG_ADDR_WB_SOURCE_ADDR / sizeof(u32)]; -+} ++/** ++ * @brief Provide GPU properties to userside through UKU call. ++ * ++ * Fill the struct kbase_uk_gpuprops with values from GPU configuration registers. ++ * ++ * @param kctx The struct kbase_context structure ++ * @param kbase_props A copy of the struct kbase_uk_gpuprops structure from userspace ++ * ++ * @return 0 on success. Any other value indicates failure. ++ */ ++int kbase_gpuprops_uk_get_props(struct kbase_context *kctx, struct kbase_uk_gpuprops * const kbase_props); + -+MALI_STATIC_INLINE u32 mali_pp_job_get_wb1_source_addr(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.wb1_registers[MALI200_REG_ADDR_WB_SOURCE_ADDR / sizeof(u32)]; -+} ++/** ++ * kbase_gpuprops_populate_user_buffer - Populate the GPU properties buffer ++ * @kbdev: The kbase device ++ * ++ * Fills kbdev->gpu_props->prop_buffer with the GPU properties for user ++ * space to read. ++ */ ++int kbase_gpuprops_populate_user_buffer(struct kbase_device *kbdev); + -+MALI_STATIC_INLINE u32 mali_pp_job_get_wb2_source_addr(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.wb2_registers[MALI200_REG_ADDR_WB_SOURCE_ADDR / sizeof(u32)]; -+} ++/** ++ * kbase_gpuprops_update_core_props_gpu_id - break down gpu id value ++ * @gpu_props: the &base_gpu_props structure ++ * ++ * Break down gpu_id value stored in base_gpu_props::raw_props.gpu_id into ++ * separate fields (version_status, minor_revision, major_revision, product_id) ++ * stored in base_gpu_props::core_props. ++ */ ++void kbase_gpuprops_update_core_props_gpu_id(base_gpu_props * const gpu_props); + -+MALI_STATIC_INLINE void mali_pp_job_disable_wb0(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ job->uargs.wb0_registers[MALI200_REG_ADDR_WB_SOURCE_SELECT] = 0; -+} + -+MALI_STATIC_INLINE void mali_pp_job_disable_wb1(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ job->uargs.wb1_registers[MALI200_REG_ADDR_WB_SOURCE_SELECT] = 0; -+} ++#endif /* _KBASE_GPUPROPS_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h b/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h +new file mode 100755 +index 000000000..10794fc27 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h +@@ -0,0 +1,92 @@ ++/* ++ * ++ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+MALI_STATIC_INLINE void mali_pp_job_disable_wb2(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ job->uargs.wb2_registers[MALI200_REG_ADDR_WB_SOURCE_SELECT] = 0; -+} + -+MALI_STATIC_INLINE mali_bool mali_pp_job_all_writeback_unit_disabled(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); + -+ if (job->uargs.wb0_registers[MALI200_REG_ADDR_WB_SOURCE_SELECT] || -+ job->uargs.wb1_registers[MALI200_REG_ADDR_WB_SOURCE_SELECT] || -+ job->uargs.wb2_registers[MALI200_REG_ADDR_WB_SOURCE_SELECT] -+ ) { -+ /* At least one output unit active */ -+ return MALI_FALSE; -+ } + -+ /* All outputs are disabled - we can abort the job */ -+ return MALI_TRUE; -+} + -+MALI_STATIC_INLINE void mali_pp_job_fb_lookup_add(struct mali_pp_job *job) -+{ -+ u32 fb_lookup_id; ++/** ++ * @file mali_kbase_gpuprops_types.h ++ * Base kernel property query APIs ++ */ + -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++#ifndef _KBASE_GPUPROPS_TYPES_H_ ++#define _KBASE_GPUPROPS_TYPES_H_ + -+ fb_lookup_id = MALI_PP_JOB_FB_LOOKUP_LIST_MASK & job->uargs.frame_builder_id; ++#include "mali_base_kernel.h" + -+ MALI_DEBUG_ASSERT(MALI_PP_JOB_FB_LOOKUP_LIST_SIZE > fb_lookup_id); ++#define KBASE_GPU_SPEED_MHZ 123 ++#define KBASE_GPU_PC_SIZE_LOG2 24U + -+ _mali_osk_list_addtail(&job->session_fb_lookup_list, -+ &job->session->pp_job_fb_lookup_list[fb_lookup_id]); -+} ++struct kbase_gpuprops_regdump { ++ u32 gpu_id; ++ u32 l2_features; ++ u32 suspend_size; /* API 8.2+ */ ++ u32 tiler_features; ++ u32 mem_features; ++ u32 mmu_features; ++ u32 as_present; ++ u32 js_present; ++ u32 thread_max_threads; ++ u32 thread_max_workgroup_size; ++ u32 thread_max_barrier_size; ++ u32 thread_features; ++ u32 texture_features[BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS]; ++ u32 js_features[GPU_MAX_JOB_SLOTS]; ++ u32 shader_present_lo; ++ u32 shader_present_hi; ++ u32 tiler_present_lo; ++ u32 tiler_present_hi; ++ u32 l2_present_lo; ++ u32 l2_present_hi; ++ u32 stack_present_lo; ++ u32 stack_present_hi; ++ u32 coherency_features; ++}; + -+MALI_STATIC_INLINE void mali_pp_job_fb_lookup_remove(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); -+ _mali_osk_list_delinit(&job->session_fb_lookup_list); -+} ++struct kbase_gpu_cache_props { ++ u8 associativity; ++ u8 external_bus_width; ++}; + -+MALI_STATIC_INLINE struct mali_session_data *mali_pp_job_get_session(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->session; -+} ++struct kbase_gpu_mem_props { ++ u8 core_group; ++}; + -+MALI_STATIC_INLINE mali_bool mali_pp_job_has_started_sub_jobs(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); -+ return (0 < job->sub_jobs_started) ? MALI_TRUE : MALI_FALSE; -+} ++struct kbase_gpu_mmu_props { ++ u8 va_bits; ++ u8 pa_bits; ++}; + -+MALI_STATIC_INLINE mali_bool mali_pp_job_has_unstarted_sub_jobs(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); -+ return (job->sub_jobs_started < job->sub_jobs_num) ? MALI_TRUE : MALI_FALSE; -+} ++struct kbase_gpu_props { ++ /* kernel-only properties */ ++ u8 num_cores; ++ u8 num_core_groups; ++ u8 num_address_spaces; ++ u8 num_job_slots; + -+/* Function used when we are terminating a session with jobs. Return TRUE if it has a rendering job. -+ Makes sure that no new subjobs are started. */ -+MALI_STATIC_INLINE void mali_pp_job_mark_unstarted_failed(struct mali_pp_job *job) -+{ -+ u32 jobs_remaining; -+ u32 i; ++ struct kbase_gpu_cache_props l2_props; + -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ struct kbase_gpu_mem_props mem; ++ struct kbase_gpu_mmu_props mmu; + -+ jobs_remaining = job->sub_jobs_num - job->sub_jobs_started; -+ job->sub_jobs_started += jobs_remaining; ++ /* Properties shared with userspace */ ++ base_gpu_props props; + -+ /* Not the most optimal way, but this is only used in error cases */ -+ for (i = 0; i < jobs_remaining; i++) { -+ _mali_osk_atomic_inc(&job->sub_jobs_completed); -+ _mali_osk_atomic_inc(&job->sub_job_errors); -+ } -+} ++ u32 prop_buffer_size; ++ void *prop_buffer; ++}; + -+MALI_STATIC_INLINE mali_bool mali_pp_job_is_complete(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return (job->sub_jobs_num == -+ _mali_osk_atomic_read(&job->sub_jobs_completed)) ? -+ MALI_TRUE : MALI_FALSE; -+} ++#endif /* _KBASE_GPUPROPS_TYPES_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_hw.c b/drivers/gpu/arm/midgard/mali_kbase_hw.c +new file mode 100755 +index 000000000..9a390d233 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_hw.c +@@ -0,0 +1,453 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+MALI_STATIC_INLINE u32 mali_pp_job_get_first_unstarted_sub_job(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); -+ return job->sub_jobs_started; -+} + -+MALI_STATIC_INLINE u32 mali_pp_job_get_sub_job_count(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->sub_jobs_num; -+} + -+MALI_STATIC_INLINE u32 mali_pp_job_unstarted_sub_job_count(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(job->sub_jobs_num >= job->sub_jobs_started); -+ return (job->sub_jobs_num - job->sub_jobs_started); -+} + -+MALI_STATIC_INLINE u32 mali_pp_job_num_memory_cookies(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.num_memory_cookies; -+} + -+MALI_STATIC_INLINE u32 mali_pp_job_get_memory_cookie( -+ struct mali_pp_job *job, u32 index) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT(index < job->uargs.num_memory_cookies); -+ MALI_DEBUG_ASSERT_POINTER(job->memory_cookies); -+ return job->memory_cookies[index]; -+} ++/* ++ * Run-time work-arounds helpers ++ */ + -+MALI_STATIC_INLINE mali_bool mali_pp_job_needs_dma_buf_mapping(struct mali_pp_job *job) ++#include ++#include ++#include ++#include "mali_kbase.h" ++#include "mali_kbase_hw.h" ++ ++void kbase_hw_set_features_mask(struct kbase_device *kbdev) +{ -+ MALI_DEBUG_ASSERT_POINTER(job); ++ const enum base_hw_feature *features; ++ u32 gpu_id; ++ u32 product_id; + -+ if (0 < job->uargs.num_memory_cookies) { -+ return MALI_TRUE; ++ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++ product_id = gpu_id & GPU_ID_VERSION_PRODUCT_ID; ++ product_id >>= GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++ ++ if (GPU_ID_IS_NEW_FORMAT(product_id)) { ++ switch (gpu_id & GPU_ID2_PRODUCT_MODEL) { ++ case GPU_ID2_PRODUCT_TMIX: ++ features = base_hw_features_tMIx; ++ break; ++ case GPU_ID2_PRODUCT_THEX: ++ features = base_hw_features_tHEx; ++ break; ++ case GPU_ID2_PRODUCT_TSIX: ++ features = base_hw_features_tSIx; ++ break; ++#ifdef MALI_INCLUDE_TKAX ++ case GPU_ID2_PRODUCT_TKAX: ++ features = base_hw_features_tKAx; ++ break; ++#endif /* MALI_INCLUDE_TKAX */ ++#ifdef MALI_INCLUDE_TTRX ++ case GPU_ID2_PRODUCT_TTRX: ++ features = base_hw_features_tTRx; ++ break; ++#endif /* MALI_INCLUDE_TTRX */ ++ default: ++ features = base_hw_features_generic; ++ break; ++ } ++ } else { ++ switch (product_id) { ++ case GPU_ID_PI_TFRX: ++ /* FALLTHROUGH */ ++ case GPU_ID_PI_T86X: ++ features = base_hw_features_tFxx; ++ break; ++ case GPU_ID_PI_T83X: ++ features = base_hw_features_t83x; ++ break; ++ case GPU_ID_PI_T82X: ++ features = base_hw_features_t82x; ++ break; ++ case GPU_ID_PI_T76X: ++ features = base_hw_features_t76x; ++ break; ++ case GPU_ID_PI_T72X: ++ features = base_hw_features_t72x; ++ break; ++ case GPU_ID_PI_T62X: ++ features = base_hw_features_t62x; ++ break; ++ case GPU_ID_PI_T60X: ++ features = base_hw_features_t60x; ++ break; ++ default: ++ features = base_hw_features_generic; ++ break; ++ } + } + -+ return MALI_FALSE; ++ for (; *features != BASE_HW_FEATURE_END; features++) ++ set_bit(*features, &kbdev->hw_features_mask[0]); +} + -+MALI_STATIC_INLINE void mali_pp_job_mark_sub_job_started(struct mali_pp_job *job, u32 sub_job) ++/** ++ * kbase_hw_get_issues_for_new_id - Get the hardware issues for a new GPU ID ++ * @kbdev: Device pointer ++ * ++ * Return: pointer to an array of hardware issues, terminated by ++ * BASE_HW_ISSUE_END. ++ * ++ * This function can only be used on new-format GPU IDs, i.e. those for which ++ * GPU_ID_IS_NEW_FORMAT evaluates as true. The GPU ID is read from the @kbdev. ++ * ++ * In debugging versions of the driver, unknown versions of a known GPU will ++ * be treated as the most recent known version not later than the actual ++ * version. In such circumstances, the GPU ID in @kbdev will also be replaced ++ * with the most recent known version. ++ * ++ * Note: The GPU configuration must have been read by kbase_gpuprops_get_props() ++ * before calling this function. ++ */ ++static const enum base_hw_issue *kbase_hw_get_issues_for_new_id( ++ struct kbase_device *kbdev) +{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); ++ const enum base_hw_issue *issues = NULL; + -+ /* Assert that we are marking the "first unstarted sub job" as started */ -+ MALI_DEBUG_ASSERT(job->sub_jobs_started == sub_job); ++ struct base_hw_product { ++ u32 product_model; ++ struct { ++ u32 version; ++ const enum base_hw_issue *issues; ++ } map[7]; ++ }; + -+ job->sub_jobs_started++; -+} ++ static const struct base_hw_product base_hw_products[] = { ++ {GPU_ID2_PRODUCT_TMIX, ++ {{GPU_ID2_VERSION_MAKE(0, 0, 1), ++ base_hw_issues_tMIx_r0p0_05dev0}, ++ {GPU_ID2_VERSION_MAKE(0, 0, 2), base_hw_issues_tMIx_r0p0}, ++ {U32_MAX /* sentinel value */, NULL} } }, + -+MALI_STATIC_INLINE void mali_pp_job_mark_sub_job_completed(struct mali_pp_job *job, mali_bool success) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); ++ {GPU_ID2_PRODUCT_THEX, ++ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tHEx_r0p0}, ++ {GPU_ID2_VERSION_MAKE(0, 0, 1), base_hw_issues_tHEx_r0p0}, ++ {GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tHEx_r0p1}, ++ {U32_MAX, NULL} } }, + -+ _mali_osk_atomic_inc(&job->sub_jobs_completed); -+ if (MALI_FALSE == success) { -+ _mali_osk_atomic_inc(&job->sub_job_errors); -+ } -+} ++ {GPU_ID2_PRODUCT_TSIX, ++ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tSIx_r0p0}, ++ {GPU_ID2_VERSION_MAKE(0, 0, 1), base_hw_issues_tSIx_r0p0}, ++ {GPU_ID2_VERSION_MAKE(0, 1, 0), base_hw_issues_tSIx_r0p1}, ++ {GPU_ID2_VERSION_MAKE(0, 1, 1), base_hw_issues_tSIx_r0p1}, ++ {GPU_ID2_VERSION_MAKE(1, 0, 0), base_hw_issues_tSIx_r1p0}, ++ {GPU_ID2_VERSION_MAKE(1, 0, 1), base_hw_issues_tSIx_r1p0}, ++ {U32_MAX, NULL} } }, + -+MALI_STATIC_INLINE mali_bool mali_pp_job_was_success(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ if (0 == _mali_osk_atomic_read(&job->sub_job_errors)) { -+ return MALI_TRUE; -+ } -+ return MALI_FALSE; -+} + -+MALI_STATIC_INLINE mali_bool mali_pp_job_use_no_notification( -+ struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return (job->uargs.flags & _MALI_PP_JOB_FLAG_NO_NOTIFICATION) ? -+ MALI_TRUE : MALI_FALSE; -+} ++#ifdef MALI_INCLUDE_TKAX ++ {GPU_ID2_PRODUCT_TKAX, ++ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tKAx_r0p0}, ++ {U32_MAX, NULL} } }, ++#endif /* MALI_INCLUDE_TKAX */ + -+MALI_STATIC_INLINE mali_bool mali_pp_job_is_pilot_job(struct mali_pp_job *job) -+{ -+ /* -+ * A pilot job is currently identified as jobs which -+ * require no callback notification. -+ */ -+ return mali_pp_job_use_no_notification(job); -+} ++#ifdef MALI_INCLUDE_TTRX ++ {GPU_ID2_PRODUCT_TTRX, ++ {{GPU_ID2_VERSION_MAKE(0, 0, 0), base_hw_issues_tTRx_r0p0}, ++ {U32_MAX, NULL} } }, ++#endif /* MALI_INCLUDE_TTRX */ ++ }; + -+MALI_STATIC_INLINE _mali_osk_notification_t * -+mali_pp_job_get_finished_notification(struct mali_pp_job *job) -+{ -+ _mali_osk_notification_t *notification; ++ u32 gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++ const u32 product_model = gpu_id & GPU_ID2_PRODUCT_MODEL; ++ const struct base_hw_product *product = NULL; ++ size_t p; + -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_POINTER(job->finished_notification); ++ /* Stop when we reach the end of the products array. */ ++ for (p = 0; p < ARRAY_SIZE(base_hw_products); ++p) { ++ if (product_model == base_hw_products[p].product_model) { ++ product = &base_hw_products[p]; ++ break; ++ } ++ } + -+ notification = job->finished_notification; -+ job->finished_notification = NULL; ++ if (product != NULL) { ++ /* Found a matching product. */ ++ const u32 version = gpu_id & GPU_ID2_VERSION; ++ u32 fallback_version = 0; ++ const enum base_hw_issue *fallback_issues = NULL; ++ size_t v; + -+ return notification; -+} ++ /* Stop when we reach the end of the map. */ ++ for (v = 0; product->map[v].version != U32_MAX; ++v) { + -+MALI_STATIC_INLINE mali_bool mali_pp_job_is_window_surface( -+ struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return (job->uargs.flags & _MALI_PP_JOB_FLAG_IS_WINDOW_SURFACE) -+ ? MALI_TRUE : MALI_FALSE; -+} ++ if (version == product->map[v].version) { ++ /* Exact match so stop. */ ++ issues = product->map[v].issues; ++ break; ++ } + -+MALI_STATIC_INLINE mali_bool mali_pp_job_is_protected_job(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return (job->uargs.flags & _MALI_PP_JOB_FLAG_PROTECTED) -+ ? MALI_TRUE : MALI_FALSE; -+} ++ /* Check whether this is a candidate for most recent ++ known version not later than the actual ++ version. */ ++ if ((version > product->map[v].version) && ++ (product->map[v].version >= fallback_version)) { ++ fallback_version = product->map[v].version; ++ fallback_issues = product->map[v].issues; ++ } ++ } + -+MALI_STATIC_INLINE u32 mali_pp_job_get_perf_counter_flag(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->uargs.perf_counter_flag; -+} ++ if ((issues == NULL) && (fallback_issues != NULL)) { ++ /* Fall back to the issue set of the most recent known ++ version not later than the actual version. */ ++ issues = fallback_issues; + -+MALI_STATIC_INLINE u32 mali_pp_job_get_perf_counter_value0(struct mali_pp_job *job, u32 sub_job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->perf_counter_value0[sub_job]; -+} ++ dev_info(kbdev->dev, ++ "r%dp%d status %d is unknown; treating as r%dp%d status %d", ++ (gpu_id & GPU_ID2_VERSION_MAJOR) >> ++ GPU_ID2_VERSION_MAJOR_SHIFT, ++ (gpu_id & GPU_ID2_VERSION_MINOR) >> ++ GPU_ID2_VERSION_MINOR_SHIFT, ++ (gpu_id & GPU_ID2_VERSION_STATUS) >> ++ GPU_ID2_VERSION_STATUS_SHIFT, ++ (fallback_version & GPU_ID2_VERSION_MAJOR) >> ++ GPU_ID2_VERSION_MAJOR_SHIFT, ++ (fallback_version & GPU_ID2_VERSION_MINOR) >> ++ GPU_ID2_VERSION_MINOR_SHIFT, ++ (fallback_version & GPU_ID2_VERSION_STATUS) >> ++ GPU_ID2_VERSION_STATUS_SHIFT); + -+MALI_STATIC_INLINE u32 mali_pp_job_get_perf_counter_value1(struct mali_pp_job *job, u32 sub_job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return job->perf_counter_value1[sub_job]; -+} ++ gpu_id &= ~GPU_ID2_VERSION; ++ gpu_id |= fallback_version; ++ kbdev->gpu_props.props.raw_props.gpu_id = gpu_id; + -+MALI_STATIC_INLINE void mali_pp_job_set_perf_counter_value0(struct mali_pp_job *job, u32 sub_job, u32 value) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ job->perf_counter_value0[sub_job] = value; ++ kbase_gpuprops_update_core_props_gpu_id(&kbdev->gpu_props.props); ++ } ++ } ++ return issues; +} + -+MALI_STATIC_INLINE void mali_pp_job_set_perf_counter_value1(struct mali_pp_job *job, u32 sub_job, u32 value) ++int kbase_hw_set_issues_mask(struct kbase_device *kbdev) +{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_EXECUTOR_LOCK_HELD(); -+ job->perf_counter_value1[sub_job] = value; -+} ++ const enum base_hw_issue *issues; ++ u32 gpu_id; ++ u32 product_id; ++ u32 impl_tech; + -+MALI_STATIC_INLINE _mali_osk_errcode_t mali_pp_job_check(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ if (mali_pp_job_is_virtual(job) && job->sub_jobs_num != 1) { -+ return _MALI_OSK_ERR_FAULT; -+ } -+ return _MALI_OSK_ERR_OK; -+} ++ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; ++ product_id = gpu_id & GPU_ID_VERSION_PRODUCT_ID; ++ product_id >>= GPU_ID_VERSION_PRODUCT_ID_SHIFT; ++ impl_tech = kbdev->gpu_props.props.thread_props.impl_tech; + -+/** -+ * Returns MALI_TRUE if this job has more than two sub jobs and all sub jobs are unstarted. -+ * -+ * @param job Job to check. -+ * @return MALI_TRUE if job has more than two sub jobs and all sub jobs are unstarted, MALI_FALSE if not. -+ */ -+MALI_STATIC_INLINE mali_bool mali_pp_job_is_large_and_unstarted(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); -+ MALI_DEBUG_ASSERT(!mali_pp_job_is_virtual(job)); ++ if (impl_tech != IMPLEMENTATION_MODEL) { ++ if (GPU_ID_IS_NEW_FORMAT(product_id)) { ++ issues = kbase_hw_get_issues_for_new_id(kbdev); ++ if (issues == NULL) { ++ dev_err(kbdev->dev, ++ "Unknown GPU ID %x", gpu_id); ++ return -EINVAL; ++ } + -+ return (0 == job->sub_jobs_started && 2 < job->sub_jobs_num); -+} ++ /* The GPU ID might have been replaced with the last ++ known version of the same GPU. */ ++ gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; + -+/** -+ * Get PP job's Timeline tracker. -+ * -+ * @param job PP job. -+ * @return Pointer to Timeline tracker for the job. -+ */ -+MALI_STATIC_INLINE struct mali_timeline_tracker *mali_pp_job_get_tracker(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return &(job->tracker); -+} ++ } else { ++ switch (gpu_id) { ++ case GPU_ID_MAKE(GPU_ID_PI_T60X, 0, 0, GPU_ID_S_15DEV0): ++ issues = base_hw_issues_t60x_r0p0_15dev0; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T60X, 0, 0, GPU_ID_S_EAC): ++ issues = base_hw_issues_t60x_r0p0_eac; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T60X, 0, 1, 0): ++ issues = base_hw_issues_t60x_r0p1; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T62X, 0, 1, 0): ++ issues = base_hw_issues_t62x_r0p1; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T62X, 1, 0, 0): ++ case GPU_ID_MAKE(GPU_ID_PI_T62X, 1, 0, 1): ++ issues = base_hw_issues_t62x_r1p0; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T62X, 1, 1, 0): ++ issues = base_hw_issues_t62x_r1p1; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T76X, 0, 0, 1): ++ issues = base_hw_issues_t76x_r0p0; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T76X, 0, 1, 1): ++ issues = base_hw_issues_t76x_r0p1; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T76X, 0, 1, 9): ++ issues = base_hw_issues_t76x_r0p1_50rel0; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T76X, 0, 2, 1): ++ issues = base_hw_issues_t76x_r0p2; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T76X, 0, 3, 1): ++ issues = base_hw_issues_t76x_r0p3; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T76X, 1, 0, 0): ++ issues = base_hw_issues_t76x_r1p0; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T72X, 0, 0, 0): ++ case GPU_ID_MAKE(GPU_ID_PI_T72X, 0, 0, 1): ++ case GPU_ID_MAKE(GPU_ID_PI_T72X, 0, 0, 2): ++ issues = base_hw_issues_t72x_r0p0; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T72X, 1, 0, 0): ++ issues = base_hw_issues_t72x_r1p0; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T72X, 1, 1, 0): ++ issues = base_hw_issues_t72x_r1p1; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_TFRX, 0, 1, 2): ++ issues = base_hw_issues_tFRx_r0p1; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_TFRX, 0, 2, 0): ++ issues = base_hw_issues_tFRx_r0p2; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_TFRX, 1, 0, 0): ++ case GPU_ID_MAKE(GPU_ID_PI_TFRX, 1, 0, 8): ++ issues = base_hw_issues_tFRx_r1p0; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_TFRX, 2, 0, 0): ++ issues = base_hw_issues_tFRx_r2p0; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T86X, 0, 2, 0): ++ issues = base_hw_issues_t86x_r0p2; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T86X, 1, 0, 0): ++ case GPU_ID_MAKE(GPU_ID_PI_T86X, 1, 0, 8): ++ issues = base_hw_issues_t86x_r1p0; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T86X, 2, 0, 0): ++ issues = base_hw_issues_t86x_r2p0; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T83X, 0, 1, 0): ++ issues = base_hw_issues_t83x_r0p1; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T83X, 1, 0, 0): ++ case GPU_ID_MAKE(GPU_ID_PI_T83X, 1, 0, 8): ++ issues = base_hw_issues_t83x_r1p0; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T82X, 0, 0, 0): ++ issues = base_hw_issues_t82x_r0p0; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T82X, 0, 1, 0): ++ issues = base_hw_issues_t82x_r0p1; ++ break; ++ case GPU_ID_MAKE(GPU_ID_PI_T82X, 1, 0, 0): ++ case GPU_ID_MAKE(GPU_ID_PI_T82X, 1, 0, 8): ++ issues = base_hw_issues_t82x_r1p0; ++ break; ++ default: ++ dev_err(kbdev->dev, ++ "Unknown GPU ID %x", gpu_id); ++ return -EINVAL; ++ } ++ } ++ } else { ++ /* Software model */ ++ if (GPU_ID_IS_NEW_FORMAT(product_id)) { ++ switch (gpu_id & GPU_ID2_PRODUCT_MODEL) { ++ case GPU_ID2_PRODUCT_TMIX: ++ issues = base_hw_issues_model_tMIx; ++ break; ++ case GPU_ID2_PRODUCT_THEX: ++ issues = base_hw_issues_model_tHEx; ++ break; ++ case GPU_ID2_PRODUCT_TSIX: ++ issues = base_hw_issues_model_tSIx; ++ break; ++#ifdef MALI_INCLUDE_TKAX ++ case GPU_ID2_PRODUCT_TKAX: ++ issues = base_hw_issues_model_tKAx; ++ break; ++#endif /* MALI_INCLUDE_TKAX */ ++#ifdef MALI_INCLUDE_TTRX ++ case GPU_ID2_PRODUCT_TTRX: ++ issues = base_hw_issues_model_tTRx; ++ break; ++#endif /* MALI_INCLUDE_TTRX */ ++ default: ++ dev_err(kbdev->dev, ++ "Unknown GPU ID %x", gpu_id); ++ return -EINVAL; ++ } ++ } else { ++ switch (product_id) { ++ case GPU_ID_PI_T60X: ++ issues = base_hw_issues_model_t60x; ++ break; ++ case GPU_ID_PI_T62X: ++ issues = base_hw_issues_model_t62x; ++ break; ++ case GPU_ID_PI_T72X: ++ issues = base_hw_issues_model_t72x; ++ break; ++ case GPU_ID_PI_T76X: ++ issues = base_hw_issues_model_t76x; ++ break; ++ case GPU_ID_PI_TFRX: ++ issues = base_hw_issues_model_tFRx; ++ break; ++ case GPU_ID_PI_T86X: ++ issues = base_hw_issues_model_t86x; ++ break; ++ case GPU_ID_PI_T83X: ++ issues = base_hw_issues_model_t83x; ++ break; ++ case GPU_ID_PI_T82X: ++ issues = base_hw_issues_model_t82x; ++ break; ++ default: ++ dev_err(kbdev->dev, "Unknown GPU ID %x", ++ gpu_id); ++ return -EINVAL; ++ } ++ } ++ } + -+MALI_STATIC_INLINE u32 *mali_pp_job_get_timeline_point_ptr( -+ struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ return (u32 __user *)(uintptr_t)job->uargs.timeline_point_ptr; -+} ++ if (GPU_ID_IS_NEW_FORMAT(product_id)) { ++ dev_info(kbdev->dev, ++ "GPU identified as 0x%x arch %d.%d.%d r%dp%d status %d", ++ (gpu_id & GPU_ID2_PRODUCT_MAJOR) >> ++ GPU_ID2_PRODUCT_MAJOR_SHIFT, ++ (gpu_id & GPU_ID2_ARCH_MAJOR) >> ++ GPU_ID2_ARCH_MAJOR_SHIFT, ++ (gpu_id & GPU_ID2_ARCH_MINOR) >> ++ GPU_ID2_ARCH_MINOR_SHIFT, ++ (gpu_id & GPU_ID2_ARCH_REV) >> ++ GPU_ID2_ARCH_REV_SHIFT, ++ (gpu_id & GPU_ID2_VERSION_MAJOR) >> ++ GPU_ID2_VERSION_MAJOR_SHIFT, ++ (gpu_id & GPU_ID2_VERSION_MINOR) >> ++ GPU_ID2_VERSION_MINOR_SHIFT, ++ (gpu_id & GPU_ID2_VERSION_STATUS) >> ++ GPU_ID2_VERSION_STATUS_SHIFT); ++ } else { ++ dev_info(kbdev->dev, ++ "GPU identified as 0x%04x r%dp%d status %d", ++ (gpu_id & GPU_ID_VERSION_PRODUCT_ID) >> ++ GPU_ID_VERSION_PRODUCT_ID_SHIFT, ++ (gpu_id & GPU_ID_VERSION_MAJOR) >> ++ GPU_ID_VERSION_MAJOR_SHIFT, ++ (gpu_id & GPU_ID_VERSION_MINOR) >> ++ GPU_ID_VERSION_MINOR_SHIFT, ++ (gpu_id & GPU_ID_VERSION_STATUS) >> ++ GPU_ID_VERSION_STATUS_SHIFT); ++ } + ++ for (; *issues != BASE_HW_ISSUE_END; issues++) ++ set_bit(*issues, &kbdev->hw_issues_mask[0]); + -+#endif /* __MALI_PP_JOB_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c ++ return 0; ++} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_hw.h b/drivers/gpu/arm/midgard/mali_kbase_hw.h new file mode 100755 -index 000000000000..b5e6cfddbb0e +index 000000000..754250ce9 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c -@@ -0,0 +1,1548 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_hw.h +@@ -0,0 +1,65 @@ +/* -+ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include "mali_scheduler.h" -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_osk_profiling.h" -+#include "mali_kernel_utilization.h" -+#include "mali_timeline.h" -+#include "mali_gp_job.h" -+#include "mali_pp_job.h" -+#include "mali_executor.h" -+#include "mali_group.h" -+#include -+#include -+#include "mali_pm_metrics.h" + -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+#include "mali_memory_dma_buf.h" -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+#include "mali_dma_fence.h" -+#include -+#endif -+#endif + -+#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) -+#include -+#include -+#endif -+/* -+ * ---------- static defines/constants ---------- -+ */ + -+/* -+ * If dma_buf with map on demand is used, we defer job queue -+ * if in atomic context, since both might sleep. ++ ++/** ++ * @file ++ * Run-time work-arounds helpers + */ -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+#if !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) -+#define MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE 1 -+#endif -+#endif + ++#ifndef _KBASE_HW_H_ ++#define _KBASE_HW_H_ ++ ++#include "mali_kbase_defs.h" + -+/* -+ * ---------- global variables (exported due to inline functions) ---------- ++/** ++ * @brief Tell whether a work-around should be enabled + */ ++#define kbase_hw_has_issue(kbdev, issue)\ ++ test_bit(issue, &(kbdev)->hw_issues_mask[0]) + -+/* Lock protecting this module */ -+_mali_osk_spinlock_irq_t *mali_scheduler_lock_obj = NULL; ++/** ++ * @brief Tell whether a feature is supported ++ */ ++#define kbase_hw_has_feature(kbdev, feature)\ ++ test_bit(feature, &(kbdev)->hw_features_mask[0]) + -+/* Queue of jobs to be executed on the GP group */ -+struct mali_scheduler_job_queue job_queue_gp; ++/** ++ * kbase_hw_set_issues_mask - Set the hardware issues mask based on the GPU ID ++ * @kbdev: Device pointer ++ * ++ * Return: 0 if the GPU ID was recognized, otherwise -EINVAL. ++ * ++ * The GPU ID is read from the @kbdev. ++ * ++ * In debugging versions of the driver, unknown versions of a known GPU with a ++ * new-format ID will be treated as the most recent known version not later ++ * than the actual version. In such circumstances, the GPU ID in @kbdev will ++ * also be replaced with the most recent known version. ++ * ++ * Note: The GPU configuration must have been read by ++ * kbase_gpuprops_get_props() before calling this function. ++ */ ++int kbase_hw_set_issues_mask(struct kbase_device *kbdev); + -+/* Queue of PP jobs */ -+struct mali_scheduler_job_queue job_queue_pp; ++/** ++ * @brief Set the features mask depending on the GPU ID ++ */ ++void kbase_hw_set_features_mask(struct kbase_device *kbdev); + -+_mali_osk_atomic_t mali_job_id_autonumber; -+_mali_osk_atomic_t mali_job_cache_order_autonumber; ++#endif /* _KBASE_HW_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h +new file mode 100755 +index 000000000..b09be99e6 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h +@@ -0,0 +1,54 @@ +/* -+ * ---------- static variables ---------- ++ * ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+_mali_osk_wq_work_t *scheduler_wq_pp_job_delete = NULL; -+_mali_osk_spinlock_irq_t *scheduler_pp_job_delete_lock = NULL; -+static _MALI_OSK_LIST_HEAD_STATIC_INIT(scheduler_pp_job_deletion_queue); + -+#if defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) -+static _mali_osk_wq_work_t *scheduler_wq_pp_job_queue = NULL; -+static _mali_osk_spinlock_irq_t *scheduler_pp_job_queue_lock = NULL; -+static _MALI_OSK_LIST_HEAD_STATIC_INIT(scheduler_pp_job_queue_list); -+#endif ++ + +/* -+ * ---------- Forward declaration of static functions ---------- ++ * HW access backend common APIs + */ + -+static mali_timeline_point mali_scheduler_submit_gp_job( -+ struct mali_session_data *session, struct mali_gp_job *job); -+static _mali_osk_errcode_t mali_scheduler_submit_pp_job( -+ struct mali_session_data *session, struct mali_pp_job *job, mali_timeline_point *point); ++#ifndef _KBASE_HWACCESS_BACKEND_H_ ++#define _KBASE_HWACCESS_BACKEND_H_ + -+static mali_bool mali_scheduler_queue_gp_job(struct mali_gp_job *job); -+static mali_bool mali_scheduler_queue_pp_job(struct mali_pp_job *job); ++/** ++ * kbase_backend_early_init - Perform any backend-specific initialization. ++ * @kbdev: Device pointer ++ * ++ * Return: 0 on success, or an error code on failure. ++ */ ++int kbase_backend_early_init(struct kbase_device *kbdev); + -+static void mali_scheduler_return_gp_job_to_user(struct mali_gp_job *job, -+ mali_bool success); ++/** ++ * kbase_backend_late_init - Perform any backend-specific initialization. ++ * @kbdev: Device pointer ++ * ++ * Return: 0 on success, or an error code on failure. ++ */ ++int kbase_backend_late_init(struct kbase_device *kbdev); + -+static void mali_scheduler_deferred_pp_job_delete(struct mali_pp_job *job); -+void mali_scheduler_do_pp_job_delete(void *arg); ++/** ++ * kbase_backend_early_term - Perform any backend-specific termination. ++ * @kbdev: Device pointer ++ */ ++void kbase_backend_early_term(struct kbase_device *kbdev); + -+#if defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) -+static void mali_scheduler_deferred_pp_job_queue(struct mali_pp_job *job); -+static void mali_scheduler_do_pp_job_queue(void *arg); -+#endif /* defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) */ ++/** ++ * kbase_backend_late_term - Perform any backend-specific termination. ++ * @kbdev: Device pointer ++ */ ++void kbase_backend_late_term(struct kbase_device *kbdev); + ++#endif /* _KBASE_HWACCESS_BACKEND_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h +new file mode 100755 +index 000000000..0acf29719 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h +@@ -0,0 +1,36 @@ +/* -+ * ---------- Actual implementation ---------- ++ * ++ * (C) COPYRIGHT 2014, 2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+_mali_osk_errcode_t mali_scheduler_initialize(void) -+{ -+ _mali_osk_atomic_init(&mali_job_id_autonumber, 0); -+ _mali_osk_atomic_init(&mali_job_cache_order_autonumber, 0); -+ -+ _MALI_OSK_INIT_LIST_HEAD(&job_queue_gp.normal_pri); -+ _MALI_OSK_INIT_LIST_HEAD(&job_queue_gp.high_pri); -+ job_queue_gp.depth = 0; -+ job_queue_gp.big_job_num = 0; -+ -+ _MALI_OSK_INIT_LIST_HEAD(&job_queue_pp.normal_pri); -+ _MALI_OSK_INIT_LIST_HEAD(&job_queue_pp.high_pri); -+ job_queue_pp.depth = 0; -+ job_queue_pp.big_job_num = 0; + -+ mali_scheduler_lock_obj = _mali_osk_spinlock_irq_init( -+ _MALI_OSK_LOCKFLAG_ORDERED, -+ _MALI_OSK_LOCK_ORDER_SCHEDULER); -+ if (NULL == mali_scheduler_lock_obj) { -+ mali_scheduler_terminate(); -+ } + -+ scheduler_wq_pp_job_delete = _mali_osk_wq_create_work( -+ mali_scheduler_do_pp_job_delete, NULL); -+ if (NULL == scheduler_wq_pp_job_delete) { -+ mali_scheduler_terminate(); -+ return _MALI_OSK_ERR_FAULT; -+ } + -+ scheduler_pp_job_delete_lock = _mali_osk_spinlock_irq_init( -+ _MALI_OSK_LOCKFLAG_ORDERED, -+ _MALI_OSK_LOCK_ORDER_SCHEDULER_DEFERRED); -+ if (NULL == scheduler_pp_job_delete_lock) { -+ mali_scheduler_terminate(); -+ return _MALI_OSK_ERR_FAULT; -+ } ++/** ++ * @file mali_kbase_hwaccess_gpu_defs.h ++ * HW access common definitions ++ */ + -+#if defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) -+ scheduler_wq_pp_job_queue = _mali_osk_wq_create_work( -+ mali_scheduler_do_pp_job_queue, NULL); -+ if (NULL == scheduler_wq_pp_job_queue) { -+ mali_scheduler_terminate(); -+ return _MALI_OSK_ERR_FAULT; -+ } ++#ifndef _KBASE_HWACCESS_DEFS_H_ ++#define _KBASE_HWACCESS_DEFS_H_ + -+ scheduler_pp_job_queue_lock = _mali_osk_spinlock_irq_init( -+ _MALI_OSK_LOCKFLAG_ORDERED, -+ _MALI_OSK_LOCK_ORDER_SCHEDULER_DEFERRED); -+ if (NULL == scheduler_pp_job_queue_lock) { -+ mali_scheduler_terminate(); -+ return _MALI_OSK_ERR_FAULT; -+ } -+#endif /* defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) */ ++#include + -+ return _MALI_OSK_ERR_OK; -+} ++/* The hwaccess_lock (a spinlock) must be held when accessing this structure */ ++struct kbase_hwaccess_data { ++ struct kbase_context *active_kctx; + -+void mali_scheduler_terminate(void) -+{ -+#if defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) -+ if (NULL != scheduler_pp_job_queue_lock) { -+ _mali_osk_spinlock_irq_term(scheduler_pp_job_queue_lock); -+ scheduler_pp_job_queue_lock = NULL; -+ } ++ struct kbase_backend_data backend; ++}; + -+ if (NULL != scheduler_wq_pp_job_queue) { -+ _mali_osk_wq_delete_work(scheduler_wq_pp_job_queue); -+ scheduler_wq_pp_job_queue = NULL; -+ } -+#endif /* defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) */ ++#endif /* _KBASE_HWACCESS_DEFS_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h +new file mode 100755 +index 000000000..cf8a8131c +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h +@@ -0,0 +1,47 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ if (NULL != scheduler_pp_job_delete_lock) { -+ _mali_osk_spinlock_irq_term(scheduler_pp_job_delete_lock); -+ scheduler_pp_job_delete_lock = NULL; -+ } + -+ if (NULL != scheduler_wq_pp_job_delete) { -+ _mali_osk_wq_delete_work(scheduler_wq_pp_job_delete); -+ scheduler_wq_pp_job_delete = NULL; -+ } + -+ if (NULL != mali_scheduler_lock_obj) { -+ _mali_osk_spinlock_irq_term(mali_scheduler_lock_obj); -+ mali_scheduler_lock_obj = NULL; -+ } + -+ _mali_osk_atomic_term(&mali_job_cache_order_autonumber); -+ _mali_osk_atomic_term(&mali_job_id_autonumber); -+} ++/** ++ * Base kernel property query backend APIs ++ */ + -+u32 mali_scheduler_job_physical_head_count(mali_bool gpu_mode_is_secure) -+{ -+ /* -+ * Count how many physical sub jobs are present from the head of queue -+ * until the first virtual job is present. -+ * Early out when we have reached maximum number of PP cores (8) -+ */ -+ u32 count = 0; -+ struct mali_pp_job *job; -+ struct mali_pp_job *temp; ++#ifndef _KBASE_HWACCESS_GPUPROPS_H_ ++#define _KBASE_HWACCESS_GPUPROPS_H_ + -+ /* Check for partially started normal pri jobs */ -+ if (!_mali_osk_list_empty(&job_queue_pp.normal_pri)) { -+ MALI_DEBUG_ASSERT(0 < job_queue_pp.depth); ++/** ++ * kbase_backend_gpuprops_get() - Fill @regdump with GPU properties read from ++ * GPU ++ * @kbdev: Device pointer ++ * @regdump: Pointer to struct kbase_gpuprops_regdump structure ++ */ ++void kbase_backend_gpuprops_get(struct kbase_device *kbdev, ++ struct kbase_gpuprops_regdump *regdump); + -+ job = _MALI_OSK_LIST_ENTRY(job_queue_pp.normal_pri.next, -+ struct mali_pp_job, list); ++/** ++ * kbase_backend_gpuprops_get - Fill @regdump with GPU properties read from GPU ++ * @kbdev: Device pointer ++ * @regdump: Pointer to struct kbase_gpuprops_regdump structure ++ * ++ * This function reads GPU properties that are dependent on the hardware ++ * features bitmask ++ */ ++void kbase_backend_gpuprops_get_features(struct kbase_device *kbdev, ++ struct kbase_gpuprops_regdump *regdump); + -+ MALI_DEBUG_ASSERT_POINTER(job); + -+ if (MALI_TRUE == mali_pp_job_has_started_sub_jobs(job)) { -+ /* -+ * Remember; virtual jobs can't be queued and started -+ * at the same time, so this must be a physical job -+ */ -+ if ((MALI_FALSE == gpu_mode_is_secure && MALI_FALSE == mali_pp_job_is_protected_job(job)) -+ || (MALI_TRUE == gpu_mode_is_secure && MALI_TRUE == mali_pp_job_is_protected_job(job))) { ++#endif /* _KBASE_HWACCESS_GPUPROPS_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h +new file mode 100755 +index 000000000..5de2b7535 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h +@@ -0,0 +1,116 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ count += mali_pp_job_unstarted_sub_job_count(job); -+ if (MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS <= count) { -+ return MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS; -+ } -+ } -+ } -+ } + -+ _MALI_OSK_LIST_FOREACHENTRY(job, temp, &job_queue_pp.high_pri, -+ struct mali_pp_job, list) { -+ if ((MALI_FALSE == mali_pp_job_is_virtual(job)) -+ && ((MALI_FALSE == gpu_mode_is_secure && MALI_FALSE == mali_pp_job_is_protected_job(job)) -+ || (MALI_TRUE == gpu_mode_is_secure && MALI_TRUE == mali_pp_job_is_protected_job(job)))) { + -+ count += mali_pp_job_unstarted_sub_job_count(job); -+ if (MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS <= count) { -+ return MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS; -+ } -+ } else { -+ /* Came across a virtual job, so stop counting */ -+ return count; -+ } -+ } + -+ _MALI_OSK_LIST_FOREACHENTRY(job, temp, &job_queue_pp.normal_pri, -+ struct mali_pp_job, list) { -+ if ((MALI_FALSE == mali_pp_job_is_virtual(job)) -+ && (MALI_FALSE == mali_pp_job_has_started_sub_jobs(job)) -+ && ((MALI_FALSE == gpu_mode_is_secure && MALI_FALSE == mali_pp_job_is_protected_job(job)) -+ || (MALI_TRUE == gpu_mode_is_secure && MALI_TRUE == mali_pp_job_is_protected_job(job)))) { + -+ count += mali_pp_job_unstarted_sub_job_count(job); -+ if (MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS <= count) { -+ return MALI_MAX_NUMBER_OF_PHYSICAL_PP_GROUPS; -+ } -+ } else { -+ /* Came across a virtual job, so stop counting */ -+ return count; -+ } -+ } -+ return count; -+} ++/* ++ * HW Access instrumentation common APIs ++ */ + -+struct mali_pp_job *mali_scheduler_job_pp_next(void) -+{ -+ struct mali_pp_job *job; -+ struct mali_pp_job *temp; ++#ifndef _KBASE_HWACCESS_INSTR_H_ ++#define _KBASE_HWACCESS_INSTR_H_ + -+ MALI_DEBUG_ASSERT_LOCK_HELD(mali_scheduler_lock_obj); ++#include + -+ /* Check for partially started normal pri jobs */ -+ if (!_mali_osk_list_empty(&job_queue_pp.normal_pri)) { -+ MALI_DEBUG_ASSERT(0 < job_queue_pp.depth); ++/** ++ * kbase_instr_hwcnt_enable_internal - Enable HW counters collection ++ * @kbdev: Kbase device ++ * @kctx: Kbase context ++ * @setup: HW counter setup parameters ++ * ++ * Context: might sleep, waiting for reset to complete ++ * ++ * Return: 0 on success ++ */ ++int kbase_instr_hwcnt_enable_internal(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ struct kbase_uk_hwcnt_setup *setup); + -+ job = _MALI_OSK_LIST_ENTRY(job_queue_pp.normal_pri.next, -+ struct mali_pp_job, list); ++/** ++ * kbase_instr_hwcnt_disable_internal - Disable HW counters collection ++ * @kctx: Kbase context ++ * ++ * Context: might sleep, waiting for an ongoing dump to complete ++ * ++ * Return: 0 on success ++ */ ++int kbase_instr_hwcnt_disable_internal(struct kbase_context *kctx); + -+ MALI_DEBUG_ASSERT_POINTER(job); ++/** ++ * kbase_instr_hwcnt_request_dump() - Request HW counter dump from GPU ++ * @kctx: Kbase context ++ * ++ * Caller must either wait for kbase_instr_hwcnt_dump_complete() to return true, ++ * of call kbase_instr_hwcnt_wait_for_dump(). ++ * ++ * Return: 0 on success ++ */ ++int kbase_instr_hwcnt_request_dump(struct kbase_context *kctx); + -+ if (MALI_TRUE == mali_pp_job_has_started_sub_jobs(job)) { -+ return job; -+ } -+ } ++/** ++ * kbase_instr_hwcnt_wait_for_dump() - Wait until pending HW counter dump has ++ * completed. ++ * @kctx: Kbase context ++ * ++ * Context: will sleep, waiting for dump to complete ++ * ++ * Return: 0 on success ++ */ ++int kbase_instr_hwcnt_wait_for_dump(struct kbase_context *kctx); + -+ _MALI_OSK_LIST_FOREACHENTRY(job, temp, &job_queue_pp.high_pri, -+ struct mali_pp_job, list) { -+ return job; -+ } ++/** ++ * kbase_instr_hwcnt_dump_complete - Tell whether the HW counters dump has ++ * completed ++ * @kctx: Kbase context ++ * @success: Set to true if successful ++ * ++ * Context: does not sleep. ++ * ++ * Return: true if the dump is complete ++ */ ++bool kbase_instr_hwcnt_dump_complete(struct kbase_context *kctx, ++ bool * const success); + -+ _MALI_OSK_LIST_FOREACHENTRY(job, temp, &job_queue_pp.normal_pri, -+ struct mali_pp_job, list) { -+ return job; -+ } ++/** ++ * kbase_instr_hwcnt_clear() - Clear HW counters ++ * @kctx: Kbase context ++ * ++ * Context: might sleep, waiting for reset to complete ++ * ++ * Return: 0 on success ++ */ ++int kbase_instr_hwcnt_clear(struct kbase_context *kctx); + -+ return NULL; -+} ++/** ++ * kbase_instr_backend_init() - Initialise the instrumentation backend ++ * @kbdev: Kbase device ++ * ++ * This function should be called during driver initialization. ++ * ++ * Return: 0 on success ++ */ ++int kbase_instr_backend_init(struct kbase_device *kbdev); + -+mali_bool mali_scheduler_job_next_is_virtual(void) -+{ -+ struct mali_pp_job *job; ++/** ++ * kbase_instr_backend_init() - Terminate the instrumentation backend ++ * @kbdev: Kbase device ++ * ++ * This function should be called during driver termination. ++ */ ++void kbase_instr_backend_term(struct kbase_device *kbdev); + -+ job = mali_scheduler_job_pp_virtual_peek(); -+ if (NULL != job) { -+ MALI_DEBUG_ASSERT(mali_pp_job_is_virtual(job)); ++#endif /* _KBASE_HWACCESS_INSTR_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h +new file mode 100755 +index 000000000..750fda2cd +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h +@@ -0,0 +1,381 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ return MALI_TRUE; -+ } + -+ return MALI_FALSE; -+} + -+struct mali_gp_job *mali_scheduler_job_gp_get(void) -+{ -+ _mali_osk_list_t *queue; -+ struct mali_gp_job *job = NULL; + -+ MALI_DEBUG_ASSERT_LOCK_HELD(mali_scheduler_lock_obj); -+ MALI_DEBUG_ASSERT(0 < job_queue_gp.depth); -+ MALI_DEBUG_ASSERT(job_queue_gp.big_job_num <= job_queue_gp.depth); ++/* ++ * HW access job manager common APIs ++ */ + -+ if (!_mali_osk_list_empty(&job_queue_gp.high_pri)) { -+ queue = &job_queue_gp.high_pri; -+ } else { -+ queue = &job_queue_gp.normal_pri; -+ MALI_DEBUG_ASSERT(!_mali_osk_list_empty(queue)); -+ } ++#ifndef _KBASE_HWACCESS_JM_H_ ++#define _KBASE_HWACCESS_JM_H_ + -+ job = _MALI_OSK_LIST_ENTRY(queue->next, struct mali_gp_job, list); ++/** ++ * kbase_backend_run_atom() - Run an atom on the GPU ++ * @kbdev: Device pointer ++ * @atom: Atom to run ++ * ++ * Caller must hold the HW access lock ++ */ ++void kbase_backend_run_atom(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom); + -+ MALI_DEBUG_ASSERT_POINTER(job); ++/** ++ * kbase_backend_slot_update - Update state based on slot ringbuffers ++ * ++ * @kbdev: Device pointer ++ * ++ * Inspect the jobs in the slot ringbuffers and update state. ++ * ++ * This will cause jobs to be submitted to hardware if they are unblocked ++ */ ++void kbase_backend_slot_update(struct kbase_device *kbdev); + -+ mali_gp_job_list_remove(job); -+ job_queue_gp.depth--; -+ if (job->big_job) { -+ job_queue_gp.big_job_num --; -+ if (job_queue_gp.big_job_num < MALI_MAX_PENDING_BIG_JOB) { -+ /* wake up process */ -+ wait_queue_head_t *queue = mali_session_get_wait_queue(); -+ wake_up(queue); -+ } -+ } -+ return job; -+} ++/** ++ * kbase_backend_find_and_release_free_address_space() - Release a free AS ++ * @kbdev: Device pointer ++ * @kctx: Context pointer ++ * ++ * This function can evict an idle context from the runpool, freeing up the ++ * address space it was using. ++ * ++ * The address space is marked as in use. The caller must either assign a ++ * context using kbase_gpu_use_ctx(), or release it using ++ * kbase_ctx_sched_release() ++ * ++ * Return: Number of free address space, or KBASEP_AS_NR_INVALID if none ++ * available ++ */ ++int kbase_backend_find_and_release_free_address_space( ++ struct kbase_device *kbdev, struct kbase_context *kctx); + -+struct mali_pp_job *mali_scheduler_job_pp_physical_peek(void) -+{ -+ struct mali_pp_job *job = NULL; -+ struct mali_pp_job *tmp_job = NULL; ++/** ++ * kbase_backend_use_ctx() - Activate a currently unscheduled context, using the ++ * provided address space. ++ * @kbdev: Device pointer ++ * @kctx: Context pointer. May be NULL ++ * @as_nr: Free address space to use ++ * ++ * kbase_gpu_next_job() will pull atoms from the active context. ++ * ++ * Return: true if successful, false if ASID not assigned. ++ */ ++bool kbase_backend_use_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ int as_nr); + -+ MALI_DEBUG_ASSERT_LOCK_HELD(mali_scheduler_lock_obj); ++/** ++ * kbase_backend_use_ctx_sched() - Activate a context. ++ * @kbdev: Device pointer ++ * @kctx: Context pointer ++ * ++ * kbase_gpu_next_job() will pull atoms from the active context. ++ * ++ * The context must already be scheduled and assigned to an address space. If ++ * the context is not scheduled, then kbase_gpu_use_ctx() should be used ++ * instead. ++ * ++ * Caller must hold hwaccess_lock ++ * ++ * Return: true if context is now active, false otherwise (ie if context does ++ * not have an address space assigned) ++ */ ++bool kbase_backend_use_ctx_sched(struct kbase_device *kbdev, ++ struct kbase_context *kctx); + -+ /* -+ * For PP jobs we favour partially started jobs in normal -+ * priority queue over unstarted jobs in high priority queue -+ */ ++/** ++ * kbase_backend_release_ctx_irq - Release a context from the GPU. This will ++ * de-assign the assigned address space. ++ * @kbdev: Device pointer ++ * @kctx: Context pointer ++ * ++ * Caller must hold kbase_device->mmu_hw_mutex and hwaccess_lock ++ */ ++void kbase_backend_release_ctx_irq(struct kbase_device *kbdev, ++ struct kbase_context *kctx); + -+ if (!_mali_osk_list_empty(&job_queue_pp.normal_pri)) { -+ MALI_DEBUG_ASSERT(0 < job_queue_pp.depth); ++/** ++ * kbase_backend_release_ctx_noirq - Release a context from the GPU. This will ++ * de-assign the assigned address space. ++ * @kbdev: Device pointer ++ * @kctx: Context pointer ++ * ++ * Caller must hold kbase_device->mmu_hw_mutex ++ * ++ * This function must perform any operations that could not be performed in IRQ ++ * context by kbase_backend_release_ctx_irq(). ++ */ ++void kbase_backend_release_ctx_noirq(struct kbase_device *kbdev, ++ struct kbase_context *kctx); + -+ tmp_job = _MALI_OSK_LIST_ENTRY(job_queue_pp.normal_pri.next, -+ struct mali_pp_job, list); -+ MALI_DEBUG_ASSERT(NULL != tmp_job); ++/** ++ * kbase_backend_cacheclean - Perform a cache clean if the given atom requires ++ * one ++ * @kbdev: Device pointer ++ * @katom: Pointer to the failed atom ++ * ++ * On some GPUs, the GPU cache must be cleaned following a failed atom. This ++ * function performs a clean if it is required by @katom. ++ */ ++void kbase_backend_cacheclean(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom); + -+ if (MALI_FALSE == mali_pp_job_is_virtual(tmp_job)) { -+ job = tmp_job; -+ } -+ } + -+ if (NULL == job || -+ MALI_FALSE == mali_pp_job_has_started_sub_jobs(job)) { -+ /* -+ * There isn't a partially started job in normal queue, so -+ * look in high priority queue. -+ */ -+ if (!_mali_osk_list_empty(&job_queue_pp.high_pri)) { -+ MALI_DEBUG_ASSERT(0 < job_queue_pp.depth); ++/** ++ * kbase_backend_complete_wq() - Perform backend-specific actions required on ++ * completing an atom. ++ * @kbdev: Device pointer ++ * @katom: Pointer to the atom to complete ++ * ++ * This function should only be called from kbase_jd_done_worker() or ++ * js_return_worker(). ++ * ++ * Return: true if atom has completed, false if atom should be re-submitted ++ */ ++void kbase_backend_complete_wq(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom); + -+ tmp_job = _MALI_OSK_LIST_ENTRY(job_queue_pp.high_pri.next, -+ struct mali_pp_job, list); -+ MALI_DEBUG_ASSERT(NULL != tmp_job); ++/** ++ * kbase_backend_complete_wq_post_sched - Perform backend-specific actions ++ * required on completing an atom, after ++ * any scheduling has taken place. ++ * @kbdev: Device pointer ++ * @core_req: Core requirements of atom ++ * @affinity: Affinity of atom ++ * @coreref_state: Coreref state of atom ++ * ++ * This function should only be called from kbase_jd_done_worker() or ++ * js_return_worker(). ++ */ ++void kbase_backend_complete_wq_post_sched(struct kbase_device *kbdev, ++ base_jd_core_req core_req, u64 affinity, ++ enum kbase_atom_coreref_state coreref_state); + -+ if (MALI_FALSE == mali_pp_job_is_virtual(tmp_job)) { -+ job = tmp_job; -+ } -+ } -+ } ++/** ++ * kbase_backend_reset() - The GPU is being reset. Cancel all jobs on the GPU ++ * and remove any others from the ringbuffers. ++ * @kbdev: Device pointer ++ * @end_timestamp: Timestamp of reset ++ */ ++void kbase_backend_reset(struct kbase_device *kbdev, ktime_t *end_timestamp); + -+ return job; -+} ++/** ++ * kbase_backend_inspect_head() - Return the atom currently at the head of slot ++ * @js ++ * @kbdev: Device pointer ++ * @js: Job slot to inspect ++ * ++ * Return : Atom currently at the head of slot @js, or NULL ++ */ ++struct kbase_jd_atom *kbase_backend_inspect_head(struct kbase_device *kbdev, ++ int js); + -+struct mali_pp_job *mali_scheduler_job_pp_virtual_peek(void) -+{ -+ struct mali_pp_job *job = NULL; -+ struct mali_pp_job *tmp_job = NULL; ++/** ++ * kbase_backend_inspect_tail - Return the atom currently at the tail of slot ++ * @js ++ * @kbdev: Device pointer ++ * @js: Job slot to inspect ++ * ++ * Return : Atom currently at the head of slot @js, or NULL ++ */ ++struct kbase_jd_atom *kbase_backend_inspect_tail(struct kbase_device *kbdev, ++ int js); + -+ MALI_DEBUG_ASSERT_LOCK_HELD(mali_scheduler_lock_obj); ++/** ++ * kbase_backend_nr_atoms_on_slot() - Return the number of atoms currently on a ++ * slot. ++ * @kbdev: Device pointer ++ * @js: Job slot to inspect ++ * ++ * Return : Number of atoms currently on slot ++ */ ++int kbase_backend_nr_atoms_on_slot(struct kbase_device *kbdev, int js); + -+ if (!_mali_osk_list_empty(&job_queue_pp.high_pri)) { -+ MALI_DEBUG_ASSERT(0 < job_queue_pp.depth); ++/** ++ * kbase_backend_nr_atoms_submitted() - Return the number of atoms on a slot ++ * that are currently on the GPU. ++ * @kbdev: Device pointer ++ * @js: Job slot to inspect ++ * ++ * Return : Number of atoms currently on slot @js that are currently on the GPU. ++ */ ++int kbase_backend_nr_atoms_submitted(struct kbase_device *kbdev, int js); + -+ tmp_job = _MALI_OSK_LIST_ENTRY(job_queue_pp.high_pri.next, -+ struct mali_pp_job, list); ++/** ++ * kbase_backend_ctx_count_changed() - Number of contexts ready to submit jobs ++ * has changed. ++ * @kbdev: Device pointer ++ * ++ * Perform any required backend-specific actions (eg starting/stopping ++ * scheduling timers). ++ */ ++void kbase_backend_ctx_count_changed(struct kbase_device *kbdev); + -+ if (MALI_TRUE == mali_pp_job_is_virtual(tmp_job)) { -+ job = tmp_job; -+ } -+ } ++/** ++ * kbase_backend_timeouts_changed() - Job Scheduler timeouts have changed. ++ * @kbdev: Device pointer ++ * ++ * Perform any required backend-specific actions (eg updating timeouts of ++ * currently running atoms). ++ */ ++void kbase_backend_timeouts_changed(struct kbase_device *kbdev); + -+ if (NULL == job) { -+ if (!_mali_osk_list_empty(&job_queue_pp.normal_pri)) { -+ MALI_DEBUG_ASSERT(0 < job_queue_pp.depth); ++/** ++ * kbase_backend_slot_free() - Return the number of jobs that can be currently ++ * submitted to slot @js. ++ * @kbdev: Device pointer ++ * @js: Job slot to inspect ++ * ++ * Return : Number of jobs that can be submitted. ++ */ ++int kbase_backend_slot_free(struct kbase_device *kbdev, int js); + -+ tmp_job = _MALI_OSK_LIST_ENTRY(job_queue_pp.normal_pri.next, -+ struct mali_pp_job, list); ++/** ++ * kbase_job_check_enter_disjoint - potentially leave disjoint state ++ * @kbdev: kbase device ++ * @target_katom: atom which is finishing ++ * ++ * Work out whether to leave disjoint state when finishing an atom that was ++ * originated by kbase_job_check_enter_disjoint(). ++ */ ++void kbase_job_check_leave_disjoint(struct kbase_device *kbdev, ++ struct kbase_jd_atom *target_katom); + -+ if (MALI_TRUE == mali_pp_job_is_virtual(tmp_job)) { -+ job = tmp_job; -+ } -+ } -+ } ++/** ++ * kbase_backend_jm_kill_jobs_from_kctx - Kill all jobs that are currently ++ * running from a context ++ * @kctx: Context pointer ++ * ++ * This is used in response to a page fault to remove all jobs from the faulting ++ * context from the hardware. ++ */ ++void kbase_backend_jm_kill_jobs_from_kctx(struct kbase_context *kctx); + -+ return job; -+} ++/** ++ * kbase_jm_wait_for_zero_jobs - Wait for context to have zero jobs running, and ++ * to be descheduled. ++ * @kctx: Context pointer ++ * ++ * This should be called following kbase_js_zap_context(), to ensure the context ++ * can be safely destroyed. ++ */ ++void kbase_jm_wait_for_zero_jobs(struct kbase_context *kctx); + -+struct mali_pp_job *mali_scheduler_job_pp_physical_get(u32 *sub_job) -+{ -+ struct mali_pp_job *job = mali_scheduler_job_pp_physical_peek(); ++/** ++ * kbase_backend_get_current_flush_id - Return the current flush ID ++ * ++ * @kbdev: Device pointer ++ * ++ * Return: the current flush ID to be recorded for each job chain ++ */ ++u32 kbase_backend_get_current_flush_id(struct kbase_device *kbdev); + -+ MALI_DEBUG_ASSERT(MALI_FALSE == mali_pp_job_is_virtual(job)); ++#if KBASE_GPU_RESET_EN ++/** ++ * kbase_prepare_to_reset_gpu - Prepare for resetting the GPU. ++ * @kbdev: Device pointer ++ * ++ * This function just soft-stops all the slots to ensure that as many jobs as ++ * possible are saved. ++ * ++ * Return: a boolean which should be interpreted as follows: ++ * - true - Prepared for reset, kbase_reset_gpu should be called. ++ * - false - Another thread is performing a reset, kbase_reset_gpu should ++ * not be called. ++ */ ++bool kbase_prepare_to_reset_gpu(struct kbase_device *kbdev); + -+ if (NULL != job) { -+ *sub_job = mali_pp_job_get_first_unstarted_sub_job(job); ++/** ++ * kbase_reset_gpu - Reset the GPU ++ * @kbdev: Device pointer ++ * ++ * This function should be called after kbase_prepare_to_reset_gpu if it returns ++ * true. It should never be called without a corresponding call to ++ * kbase_prepare_to_reset_gpu. ++ * ++ * After this function is called (or not called if kbase_prepare_to_reset_gpu ++ * returned false), the caller should wait for kbdev->reset_waitq to be ++ * signalled to know when the reset has completed. ++ */ ++void kbase_reset_gpu(struct kbase_device *kbdev); + -+ mali_pp_job_mark_sub_job_started(job, *sub_job); -+ if (MALI_FALSE == mali_pp_job_has_unstarted_sub_jobs(job)) { -+ /* Remove from queue when last sub job has been retrieved */ -+ mali_pp_job_list_remove(job); -+ } ++/** ++ * kbase_prepare_to_reset_gpu_locked - Prepare for resetting the GPU. ++ * @kbdev: Device pointer ++ * ++ * This function just soft-stops all the slots to ensure that as many jobs as ++ * possible are saved. ++ * ++ * Return: a boolean which should be interpreted as follows: ++ * - true - Prepared for reset, kbase_reset_gpu should be called. ++ * - false - Another thread is performing a reset, kbase_reset_gpu should ++ * not be called. ++ */ ++bool kbase_prepare_to_reset_gpu_locked(struct kbase_device *kbdev); + -+ job_queue_pp.depth--; ++/** ++ * kbase_reset_gpu_locked - Reset the GPU ++ * @kbdev: Device pointer ++ * ++ * This function should be called after kbase_prepare_to_reset_gpu if it ++ * returns true. It should never be called without a corresponding call to ++ * kbase_prepare_to_reset_gpu. ++ * ++ * After this function is called (or not called if kbase_prepare_to_reset_gpu ++ * returned false), the caller should wait for kbdev->reset_waitq to be ++ * signalled to know when the reset has completed. ++ */ ++void kbase_reset_gpu_locked(struct kbase_device *kbdev); + -+ /* -+ * Job about to start so it is no longer be -+ * possible to discard WB -+ */ -+ mali_pp_job_fb_lookup_remove(job); -+ } ++/** ++ * kbase_reset_gpu_silent - Reset the GPU silently ++ * @kbdev: Device pointer ++ * ++ * Reset the GPU without trying to cancel jobs and don't emit messages into ++ * the kernel log while doing the reset. ++ * ++ * This function should be used in cases where we are doing a controlled reset ++ * of the GPU as part of normal processing (e.g. exiting protected mode) where ++ * the driver will have ensured the scheduler has been idled and all other ++ * users of the GPU (e.g. instrumentation) have been suspended. ++ */ ++void kbase_reset_gpu_silent(struct kbase_device *kbdev); + -+ return job; -+} ++/** ++ * kbase_reset_gpu_active - Reports if the GPU is being reset ++ * @kbdev: Device pointer ++ * ++ * Return: True if the GPU is in the process of being reset. ++ */ ++bool kbase_reset_gpu_active(struct kbase_device *kbdev); ++#endif + -+struct mali_pp_job *mali_scheduler_job_pp_virtual_get(void) -+{ -+ struct mali_pp_job *job = mali_scheduler_job_pp_virtual_peek(); ++/** ++ * kbase_job_slot_hardstop - Hard-stop the specified job slot ++ * @kctx: The kbase context that contains the job(s) that should ++ * be hard-stopped ++ * @js: The job slot to hard-stop ++ * @target_katom: The job that should be hard-stopped (or NULL for all ++ * jobs from the context) ++ * Context: ++ * The job slot lock must be held when calling this function. ++ */ ++void kbase_job_slot_hardstop(struct kbase_context *kctx, int js, ++ struct kbase_jd_atom *target_katom); + -+ MALI_DEBUG_ASSERT(MALI_TRUE == mali_pp_job_is_virtual(job)); ++extern struct protected_mode_ops kbase_native_protected_ops; + -+ if (NULL != job) { -+ MALI_DEBUG_ASSERT(0 == -+ mali_pp_job_get_first_unstarted_sub_job(job)); -+ MALI_DEBUG_ASSERT(1 == -+ mali_pp_job_get_sub_job_count(job)); ++#endif /* _KBASE_HWACCESS_JM_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h +new file mode 100755 +index 000000000..71c7d495c +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h +@@ -0,0 +1,209 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ mali_pp_job_mark_sub_job_started(job, 0); + -+ mali_pp_job_list_remove(job); + -+ job_queue_pp.depth--; + -+ /* -+ * Job about to start so it is no longer be -+ * possible to discard WB -+ */ -+ mali_pp_job_fb_lookup_remove(job); -+ } ++/** ++ * @file mali_kbase_hwaccess_pm.h ++ * HW access power manager common APIs ++ */ + -+ return job; -+} ++#ifndef _KBASE_HWACCESS_PM_H_ ++#define _KBASE_HWACCESS_PM_H_ + -+mali_scheduler_mask mali_scheduler_activate_gp_job(struct mali_gp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); ++#include ++#include + -+ MALI_DEBUG_PRINT(4, ("Mali GP scheduler: Timeline activation for job %u (0x%08X).\n", -+ mali_gp_job_get_id(job), job)); ++#include + -+ mali_scheduler_lock(); ++/* Forward definition - see mali_kbase.h */ ++struct kbase_device; + -+ if (!mali_scheduler_queue_gp_job(job)) { -+ /* Failed to enqueue job, release job (with error) */ ++/* Functions common to all HW access backends */ + -+ mali_scheduler_unlock(); ++/** ++ * Initialize the power management framework. ++ * ++ * Must be called before any other power management function ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid ++ * pointer) ++ * ++ * @return 0 if the power management framework was successfully ++ * initialized. ++ */ ++int kbase_hwaccess_pm_init(struct kbase_device *kbdev); + -+ mali_timeline_tracker_release(mali_gp_job_get_tracker(job)); -+ mali_gp_job_signal_pp_tracker(job, MALI_FALSE); ++/** ++ * Terminate the power management framework. ++ * ++ * No power management functions may be called after this (except ++ * @ref kbase_pm_init) ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid ++ * pointer) ++ */ ++void kbase_hwaccess_pm_term(struct kbase_device *kbdev); + -+ /* This will notify user space and close the job object */ -+ mali_scheduler_complete_gp_job(job, MALI_FALSE, -+ MALI_TRUE, MALI_FALSE); ++/** ++ * kbase_hwaccess_pm_powerup - Power up the GPU. ++ * @kbdev: The kbase device structure for the device (must be a valid pointer) ++ * @flags: Flags to pass on to kbase_pm_init_hw ++ * ++ * Power up GPU after all modules have been initialized and interrupt handlers ++ * installed. ++ * ++ * Return: 0 if powerup was successful. ++ */ ++int kbase_hwaccess_pm_powerup(struct kbase_device *kbdev, ++ unsigned int flags); + -+ return MALI_SCHEDULER_MASK_EMPTY; -+ } ++/** ++ * Halt the power management framework. ++ * ++ * Should ensure that no new interrupts are generated, but allow any currently ++ * running interrupt handlers to complete successfully. The GPU is forced off by ++ * the time this function returns, regardless of whether or not the active power ++ * policy asks for the GPU to be powered off. ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid ++ * pointer) ++ */ ++void kbase_hwaccess_pm_halt(struct kbase_device *kbdev); + -+ mali_scheduler_unlock(); ++/** ++ * Perform any backend-specific actions to suspend the GPU ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid ++ * pointer) ++ */ ++void kbase_hwaccess_pm_suspend(struct kbase_device *kbdev); + -+ return MALI_SCHEDULER_MASK_GP; -+} ++/** ++ * Perform any backend-specific actions to resume the GPU from a suspend ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid ++ * pointer) ++ */ ++void kbase_hwaccess_pm_resume(struct kbase_device *kbdev); + -+mali_scheduler_mask mali_scheduler_activate_pp_job(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); ++/** ++ * Perform any required actions for activating the GPU. Called when the first ++ * context goes active. ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid ++ * pointer) ++ */ ++void kbase_hwaccess_pm_gpu_active(struct kbase_device *kbdev); + -+ MALI_DEBUG_PRINT(4, ("Mali PP scheduler: Timeline activation for job %u (0x%08X).\n", -+ mali_pp_job_get_id(job), job)); ++/** ++ * Perform any required actions for idling the GPU. Called when the last ++ * context goes idle. ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid ++ * pointer) ++ */ ++void kbase_hwaccess_pm_gpu_idle(struct kbase_device *kbdev); + -+ if (MALI_TRUE == mali_timeline_tracker_activation_error( -+ mali_pp_job_get_tracker(job))) { -+ MALI_DEBUG_PRINT(3, ("Mali PP scheduler: Job %u (0x%08X) activated with error, aborting.\n", -+ mali_pp_job_get_id(job), job)); + -+ mali_scheduler_lock(); -+ mali_pp_job_fb_lookup_remove(job); -+ mali_pp_job_mark_unstarted_failed(job); -+ mali_scheduler_unlock(); ++/** ++ * Set the debug core mask. ++ * ++ * This determines which cores the power manager is allowed to use. ++ * ++ * @param kbdev The kbase device structure for the device (must be a ++ * valid pointer) ++ * @param new_core_mask_js0 The core mask to use for job slot 0 ++ * @param new_core_mask_js0 The core mask to use for job slot 1 ++ * @param new_core_mask_js0 The core mask to use for job slot 2 ++ */ ++void kbase_pm_set_debug_core_mask(struct kbase_device *kbdev, ++ u64 new_core_mask_js0, u64 new_core_mask_js1, ++ u64 new_core_mask_js2); + -+ mali_timeline_tracker_release(mali_pp_job_get_tracker(job)); + -+ /* This will notify user space and close the job object */ -+ mali_scheduler_complete_pp_job(job, 0, MALI_TRUE, MALI_FALSE); ++/** ++ * Get the current policy. ++ * ++ * Returns the policy that is currently active. ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid ++ * pointer) ++ * ++ * @return The current policy ++ */ ++const struct kbase_pm_ca_policy ++*kbase_pm_ca_get_policy(struct kbase_device *kbdev); + -+ return MALI_SCHEDULER_MASK_EMPTY; -+ } ++/** ++ * Change the policy to the one specified. ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid ++ * pointer) ++ * @param policy The policy to change to (valid pointer returned from ++ * @ref kbase_pm_ca_list_policies) ++ */ ++void kbase_pm_ca_set_policy(struct kbase_device *kbdev, ++ const struct kbase_pm_ca_policy *policy); + -+#if defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) -+ if (mali_pp_job_needs_dma_buf_mapping(job)) { -+ mali_scheduler_deferred_pp_job_queue(job); -+ return MALI_SCHEDULER_MASK_EMPTY; -+ } -+#endif /* defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) */ ++/** ++ * Retrieve a static list of the available policies. ++ * ++ * @param[out] policies An array pointer to take the list of policies. This may ++ * be NULL. The contents of this array must not be ++ * modified. ++ * ++ * @return The number of policies ++ */ ++int ++kbase_pm_ca_list_policies(const struct kbase_pm_ca_policy * const **policies); + -+ mali_scheduler_lock(); + -+ if (!mali_scheduler_queue_pp_job(job)) { -+ /* Failed to enqueue job, release job (with error) */ -+ mali_pp_job_fb_lookup_remove(job); -+ mali_pp_job_mark_unstarted_failed(job); -+ mali_scheduler_unlock(); ++/** ++ * Get the current policy. ++ * ++ * Returns the policy that is currently active. ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid ++ * pointer) ++ * ++ * @return The current policy ++ */ ++const struct kbase_pm_policy *kbase_pm_get_policy(struct kbase_device *kbdev); + -+ mali_timeline_tracker_release(mali_pp_job_get_tracker(job)); ++/** ++ * Change the policy to the one specified. ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid ++ * pointer) ++ * @param policy The policy to change to (valid pointer returned from ++ * @ref kbase_pm_list_policies) ++ */ ++void kbase_pm_set_policy(struct kbase_device *kbdev, ++ const struct kbase_pm_policy *policy); + -+ /* This will notify user space and close the job object */ -+ mali_scheduler_complete_pp_job(job, 0, MALI_TRUE, MALI_FALSE); ++/** ++ * Retrieve a static list of the available policies. ++ * ++ * @param[out] policies An array pointer to take the list of policies. This may ++ * be NULL. The contents of this array must not be ++ * modified. ++ * ++ * @return The number of policies ++ */ ++int kbase_pm_list_policies(const struct kbase_pm_policy * const **policies); + -+ return MALI_SCHEDULER_MASK_EMPTY; -+ } ++#endif /* _KBASE_HWACCESS_PM_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h +new file mode 100755 +index 000000000..10b65798e +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h +@@ -0,0 +1,53 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ mali_scheduler_unlock(); -+ return MALI_SCHEDULER_MASK_PP; -+} + -+void mali_scheduler_complete_gp_job(struct mali_gp_job *job, -+ mali_bool success, -+ mali_bool user_notification, -+ mali_bool dequeued) -+{ -+ if (user_notification) { -+ mali_scheduler_return_gp_job_to_user(job, success); -+ } + -+ if (dequeued) { -+ _mali_osk_pm_dev_ref_put(); + -+ if (mali_utilization_enabled()) { -+ mali_utilization_gp_end(); -+ } -+ mali_pm_record_gpu_idle(MALI_TRUE); -+ } ++/** ++ * ++ */ + -+ mali_gp_job_delete(job); -+} ++#ifndef _KBASE_BACKEND_TIME_H_ ++#define _KBASE_BACKEND_TIME_H_ + -+void mali_scheduler_complete_pp_job(struct mali_pp_job *job, -+ u32 num_cores_in_virtual, -+ mali_bool user_notification, -+ mali_bool dequeued) -+{ -+ job->user_notification = user_notification; -+ job->num_pp_cores_in_virtual = num_cores_in_virtual; ++/** ++ * kbase_backend_get_gpu_time() - Get current GPU time ++ * @kbdev: Device pointer ++ * @cycle_counter: Pointer to u64 to store cycle counter in ++ * @system_time: Pointer to u64 to store system time in ++ * @ts: Pointer to struct timespec64 to store current monotonic ++ * time in ++ */ ++void kbase_backend_get_gpu_time(struct kbase_device *kbdev, u64 *cycle_counter, ++ u64 *system_time, struct timespec64 *ts); + -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+ if (NULL != job->rendered_dma_fence) -+ mali_dma_fence_signal_and_put(&job->rendered_dma_fence); ++/** ++ * kbase_wait_write_flush() - Wait for GPU write flush ++ * @kctx: Context pointer ++ * ++ * Wait 1000 GPU clock cycles. This delay is known to give the GPU time to flush ++ * its write buffer. ++ * ++ * If GPU resets occur then the counters are reset to zero, the delay may not be ++ * as expected. ++ * ++ * This function is only in use for BASE_HW_ISSUE_6367 ++ */ ++#ifndef CONFIG_MALI_NO_MALI ++void kbase_wait_write_flush(struct kbase_context *kctx); +#endif + -+ if (dequeued) { -+#if defined(CONFIG_MALI_DVFS) -+ if (mali_pp_job_is_window_surface(job)) { -+ struct mali_session_data *session; -+ session = mali_pp_job_get_session(job); -+ mali_session_inc_num_window_jobs(session); -+ } -+#endif -+ _mali_osk_pm_dev_ref_put(); ++#endif /* _KBASE_BACKEND_TIME_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h b/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h +new file mode 100755 +index 000000000..cf7bf1b35 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h +@@ -0,0 +1,66 @@ ++/* ++ * ++ * (C) COPYRIGHT 2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ if (mali_utilization_enabled()) { -+ mali_utilization_pp_end(); -+ } -+ mali_pm_record_gpu_idle(MALI_FALSE); -+ } + -+ /* With ZRAM feature enabled, all pp jobs will be force to use deferred delete. */ -+ mali_scheduler_deferred_pp_job_delete(job); -+} + -+void mali_scheduler_abort_session(struct mali_session_data *session) -+{ -+ struct mali_gp_job *gp_job; -+ struct mali_gp_job *gp_tmp; -+ struct mali_pp_job *pp_job; -+ struct mali_pp_job *pp_tmp; -+ _MALI_OSK_LIST_HEAD_STATIC_INIT(removed_jobs_gp); -+ _MALI_OSK_LIST_HEAD_STATIC_INIT(removed_jobs_pp); ++#ifndef _KBASE_HWCNT_READER_H_ ++#define _KBASE_HWCNT_READER_H_ + -+ MALI_DEBUG_ASSERT_POINTER(session); -+ MALI_DEBUG_ASSERT(session->is_aborting); ++/* The ids of ioctl commands. */ ++#define KBASE_HWCNT_READER 0xBE ++#define KBASE_HWCNT_READER_GET_HWVER _IOR(KBASE_HWCNT_READER, 0x00, u32) ++#define KBASE_HWCNT_READER_GET_BUFFER_SIZE _IOR(KBASE_HWCNT_READER, 0x01, u32) ++#define KBASE_HWCNT_READER_DUMP _IOW(KBASE_HWCNT_READER, 0x10, u32) ++#define KBASE_HWCNT_READER_CLEAR _IOW(KBASE_HWCNT_READER, 0x11, u32) ++#define KBASE_HWCNT_READER_GET_BUFFER _IOR(KBASE_HWCNT_READER, 0x20,\ ++ struct kbase_hwcnt_reader_metadata) ++#define KBASE_HWCNT_READER_PUT_BUFFER _IOW(KBASE_HWCNT_READER, 0x21,\ ++ struct kbase_hwcnt_reader_metadata) ++#define KBASE_HWCNT_READER_SET_INTERVAL _IOW(KBASE_HWCNT_READER, 0x30, u32) ++#define KBASE_HWCNT_READER_ENABLE_EVENT _IOW(KBASE_HWCNT_READER, 0x40, u32) ++#define KBASE_HWCNT_READER_DISABLE_EVENT _IOW(KBASE_HWCNT_READER, 0x41, u32) ++#define KBASE_HWCNT_READER_GET_API_VERSION _IOW(KBASE_HWCNT_READER, 0xFF, u32) + -+ MALI_DEBUG_PRINT(3, ("Mali scheduler: Aborting all queued jobs from session 0x%08X.\n", -+ session)); ++/** ++ * struct kbase_hwcnt_reader_metadata - hwcnt reader sample buffer metadata ++ * @timestamp: time when sample was collected ++ * @event_id: id of an event that triggered sample collection ++ * @buffer_idx: position in sampling area where sample buffer was stored ++ */ ++struct kbase_hwcnt_reader_metadata { ++ u64 timestamp; ++ u32 event_id; ++ u32 buffer_idx; ++}; + -+ mali_scheduler_lock(); ++/** ++ * enum base_hwcnt_reader_event - hwcnt dumping events ++ * @BASE_HWCNT_READER_EVENT_MANUAL: manual request for dump ++ * @BASE_HWCNT_READER_EVENT_PERIODIC: periodic dump ++ * @BASE_HWCNT_READER_EVENT_PREJOB: prejob dump request ++ * @BASE_HWCNT_READER_EVENT_POSTJOB: postjob dump request ++ * @BASE_HWCNT_READER_EVENT_COUNT: number of supported events ++ */ ++enum base_hwcnt_reader_event { ++ BASE_HWCNT_READER_EVENT_MANUAL, ++ BASE_HWCNT_READER_EVENT_PERIODIC, ++ BASE_HWCNT_READER_EVENT_PREJOB, ++ BASE_HWCNT_READER_EVENT_POSTJOB, + -+ /* Remove from GP normal priority queue */ -+ _MALI_OSK_LIST_FOREACHENTRY(gp_job, gp_tmp, &job_queue_gp.normal_pri, -+ struct mali_gp_job, list) { -+ if (mali_gp_job_get_session(gp_job) == session) { -+ mali_gp_job_list_move(gp_job, &removed_jobs_gp); -+ job_queue_gp.depth--; -+ job_queue_gp.big_job_num -= gp_job->big_job ? 1 : 0; -+ } -+ } ++ BASE_HWCNT_READER_EVENT_COUNT ++}; + -+ /* Remove from GP high priority queue */ -+ _MALI_OSK_LIST_FOREACHENTRY(gp_job, gp_tmp, &job_queue_gp.high_pri, -+ struct mali_gp_job, list) { -+ if (mali_gp_job_get_session(gp_job) == session) { -+ mali_gp_job_list_move(gp_job, &removed_jobs_gp); -+ job_queue_gp.depth--; -+ job_queue_gp.big_job_num -= gp_job->big_job ? 1 : 0; -+ } -+ } ++#endif /* _KBASE_HWCNT_READER_H_ */ + -+ /* Remove from PP normal priority queue */ -+ _MALI_OSK_LIST_FOREACHENTRY(pp_job, pp_tmp, -+ &job_queue_pp.normal_pri, -+ struct mali_pp_job, list) { -+ if (mali_pp_job_get_session(pp_job) == session) { -+ mali_pp_job_fb_lookup_remove(pp_job); +diff --git a/drivers/gpu/arm/midgard/mali_kbase_ioctl.h b/drivers/gpu/arm/midgard/mali_kbase_ioctl.h +new file mode 100755 +index 000000000..dcbed9c77 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_ioctl.h +@@ -0,0 +1,656 @@ ++/* ++ * ++ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ job_queue_pp.depth -= -+ mali_pp_job_unstarted_sub_job_count( -+ pp_job); -+ mali_pp_job_mark_unstarted_failed(pp_job); + -+ if (MALI_FALSE == mali_pp_job_has_unstarted_sub_jobs(pp_job)) { -+ if (mali_pp_job_is_complete(pp_job)) { -+ mali_pp_job_list_move(pp_job, -+ &removed_jobs_pp); -+ } else { -+ mali_pp_job_list_remove(pp_job); -+ } -+ } -+ } -+ } + -+ /* Remove from PP high priority queue */ -+ _MALI_OSK_LIST_FOREACHENTRY(pp_job, pp_tmp, -+ &job_queue_pp.high_pri, -+ struct mali_pp_job, list) { -+ if (mali_pp_job_get_session(pp_job) == session) { -+ mali_pp_job_fb_lookup_remove(pp_job); ++#ifndef _KBASE_IOCTL_H_ ++#define _KBASE_IOCTL_H_ + -+ job_queue_pp.depth -= -+ mali_pp_job_unstarted_sub_job_count( -+ pp_job); -+ mali_pp_job_mark_unstarted_failed(pp_job); ++#ifdef __cpluscplus ++extern "C" { ++#endif + -+ if (MALI_FALSE == mali_pp_job_has_unstarted_sub_jobs(pp_job)) { -+ if (mali_pp_job_is_complete(pp_job)) { -+ mali_pp_job_list_move(pp_job, -+ &removed_jobs_pp); -+ } else { -+ mali_pp_job_list_remove(pp_job); -+ } -+ } -+ } -+ } ++#include + -+ /* -+ * Release scheduler lock so we can release trackers -+ * (which will potentially queue new jobs) -+ */ -+ mali_scheduler_unlock(); ++#define KBASE_IOCTL_TYPE 0x80 + -+ /* Release and complete all (non-running) found GP jobs */ -+ _MALI_OSK_LIST_FOREACHENTRY(gp_job, gp_tmp, &removed_jobs_gp, -+ struct mali_gp_job, list) { -+ mali_timeline_tracker_release(mali_gp_job_get_tracker(gp_job)); -+ mali_gp_job_signal_pp_tracker(gp_job, MALI_FALSE); -+ _mali_osk_list_delinit(&gp_job->list); -+ mali_scheduler_complete_gp_job(gp_job, -+ MALI_FALSE, MALI_FALSE, MALI_TRUE); -+ } ++#ifdef ANDROID ++/* Android's definition of ioctl is incorrect, specifying the type argument as ++ * 'int'. This creates a warning when using _IOWR (as the top bit is set). Work ++ * round this by redefining _IOC to include a case to 'int'. ++ */ ++#undef _IOC ++#define _IOC(dir, type, nr, size) \ ++ ((int)(((dir) << _IOC_DIRSHIFT) | ((type) << _IOC_TYPESHIFT) | \ ++ ((nr) << _IOC_NRSHIFT) | ((size) << _IOC_SIZESHIFT))) ++#endif + -+ /* Release and complete non-running PP jobs */ -+ _MALI_OSK_LIST_FOREACHENTRY(pp_job, pp_tmp, &removed_jobs_pp, -+ struct mali_pp_job, list) { -+ mali_timeline_tracker_release(mali_pp_job_get_tracker(pp_job)); -+ _mali_osk_list_delinit(&pp_job->list); -+ mali_scheduler_complete_pp_job(pp_job, 0, -+ MALI_FALSE, MALI_TRUE); -+ } -+} ++/** ++ * struct kbase_ioctl_version_check - Check version compatibility with kernel ++ * ++ * @major: Major version number ++ * @minor: Minor version number ++ */ ++struct kbase_ioctl_version_check { ++ __u16 major; ++ __u16 minor; ++}; + -+_mali_osk_errcode_t _mali_ukk_gp_start_job(void *ctx, -+ _mali_uk_gp_start_job_s *uargs) -+{ -+ struct mali_session_data *session; -+ struct mali_gp_job *job; -+ mali_timeline_point point; -+ u32 __user *point_ptr = NULL; ++#define KBASE_IOCTL_VERSION_CHECK \ ++ _IOWR(KBASE_IOCTL_TYPE, 0, struct kbase_ioctl_version_check) + -+ MALI_DEBUG_ASSERT_POINTER(uargs); -+ MALI_DEBUG_ASSERT_POINTER(ctx); ++/** ++ * struct kbase_ioctl_set_flags - Set kernel context creation flags ++ * ++ * @create_flags: Flags - see base_context_create_flags ++ */ ++struct kbase_ioctl_set_flags { ++ __u32 create_flags; ++}; + -+ session = (struct mali_session_data *)(uintptr_t)ctx; ++#define KBASE_IOCTL_SET_FLAGS \ ++ _IOW(KBASE_IOCTL_TYPE, 1, struct kbase_ioctl_set_flags) + -+ job = mali_gp_job_create(session, uargs, mali_scheduler_get_new_id(), -+ NULL); -+ if (NULL == job) { -+ MALI_PRINT_ERROR(("Failed to create GP job.\n")); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++/** ++ * struct kbase_ioctl_job_submit - Submit jobs/atoms to the kernel ++ * ++ * @addr: Memory address of an array of struct base_jd_atom_v2 ++ * @nr_atoms: Number of entries in the array ++ * @stride: sizeof(struct base_jd_atom_v2) ++ */ ++struct kbase_ioctl_job_submit { ++ union kbase_pointer addr; ++ __u32 nr_atoms; ++ __u32 stride; ++}; + -+ point_ptr = (u32 __user *)(uintptr_t)mali_gp_job_get_timeline_point_ptr(job); ++#define KBASE_IOCTL_JOB_SUBMIT \ ++ _IOW(KBASE_IOCTL_TYPE, 2, struct kbase_ioctl_job_submit) + -+ point = mali_scheduler_submit_gp_job(session, job); ++/** ++ * struct kbase_ioctl_get_gpuprops - Read GPU properties from the kernel ++ * ++ * @buffer: Pointer to the buffer to store properties into ++ * @size: Size of the buffer ++ * @flags: Flags - must be zero for now ++ * ++ * The ioctl will return the number of bytes stored into @buffer or an error ++ * on failure (e.g. @size is too small). If @size is specified as 0 then no ++ * data will be written but the return value will be the number of bytes needed ++ * for all the properties. ++ * ++ * @flags may be used in the future to request a different format for the ++ * buffer. With @flags == 0 the following format is used. ++ * ++ * The buffer will be filled with pairs of values, a u32 key identifying the ++ * property followed by the value. The size of the value is identified using ++ * the bottom bits of the key. The value then immediately followed the key and ++ * is tightly packed (there is no padding). All keys and values are ++ * little-endian. ++ * ++ * 00 = u8 ++ * 01 = u16 ++ * 10 = u32 ++ * 11 = u64 ++ */ ++struct kbase_ioctl_get_gpuprops { ++ union kbase_pointer buffer; ++ __u32 size; ++ __u32 flags; ++}; + -+ if (0 != _mali_osk_put_user(((u32) point), point_ptr)) { -+ /* -+ * Let user space know that something failed -+ * after the job was started. -+ */ -+ return _MALI_OSK_ERR_ITEM_NOT_FOUND; -+ } ++#define KBASE_IOCTL_GET_GPUPROPS \ ++ _IOW(KBASE_IOCTL_TYPE, 3, struct kbase_ioctl_get_gpuprops) + -+ return _MALI_OSK_ERR_OK; -+} ++#define KBASE_IOCTL_POST_TERM \ ++ _IO(KBASE_IOCTL_TYPE, 4) + -+_mali_osk_errcode_t _mali_ukk_pp_start_job(void *ctx, -+ _mali_uk_pp_start_job_s *uargs) -+{ -+ _mali_osk_errcode_t ret; -+ struct mali_session_data *session; -+ struct mali_pp_job *job; -+ mali_timeline_point point; -+ u32 __user *point_ptr = NULL; ++/** ++ * union kbase_ioctl_mem_alloc - Allocate memory on the GPU ++ * ++ * @va_pages: The number of pages of virtual address space to reserve ++ * @commit_pages: The number of physical pages to allocate ++ * @extent: The number of extra pages to allocate on each GPU fault which grows ++ * the region ++ * @flags: Flags ++ * @gpu_va: The GPU virtual address which is allocated ++ * ++ * @in: Input parameters ++ * @out: Output parameters ++ */ ++union kbase_ioctl_mem_alloc { ++ struct { ++ __u64 va_pages; ++ __u64 commit_pages; ++ __u64 extent; ++ __u64 flags; ++ } in; ++ struct { ++ __u64 flags; ++ __u64 gpu_va; ++ } out; ++}; + -+ MALI_DEBUG_ASSERT_POINTER(uargs); -+ MALI_DEBUG_ASSERT_POINTER(ctx); ++#define KBASE_IOCTL_MEM_ALLOC \ ++ _IOWR(KBASE_IOCTL_TYPE, 5, union kbase_ioctl_mem_alloc) + -+ session = (struct mali_session_data *)(uintptr_t)ctx; ++/** ++ * struct kbase_ioctl_mem_query - Query properties of a GPU memory region ++ * @gpu_addr: A GPU address contained within the region ++ * @query: The type of query ++ * @value: The result of the query ++ * ++ * Use a %KBASE_MEM_QUERY_xxx flag as input for @query. ++ * ++ * @in: Input parameters ++ * @out: Output parameters ++ */ ++union kbase_ioctl_mem_query { ++ struct { ++ __u64 gpu_addr; ++ __u64 query; ++ } in; ++ struct { ++ __u64 value; ++ } out; ++}; + -+ job = mali_pp_job_create(session, uargs, mali_scheduler_get_new_id()); -+ if (NULL == job) { -+ MALI_PRINT_ERROR(("Failed to create PP job.\n")); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++#define KBASE_IOCTL_MEM_QUERY \ ++ _IOWR(KBASE_IOCTL_TYPE, 6, union kbase_ioctl_mem_query) + -+ point_ptr = (u32 __user *)(uintptr_t)mali_pp_job_get_timeline_point_ptr(job); ++#define KBASE_MEM_QUERY_COMMIT_SIZE 1 ++#define KBASE_MEM_QUERY_VA_SIZE 2 ++#define KBASE_MEM_QUERY_FLAGS 3 + -+ /* Submit PP job. */ -+ ret = mali_scheduler_submit_pp_job(session, job, &point); -+ job = NULL; ++/** ++ * struct kbase_ioctl_mem_free - Free a memory region ++ * @gpu_addr: Handle to the region to free ++ */ ++struct kbase_ioctl_mem_free { ++ __u64 gpu_addr; ++}; + -+ if (_MALI_OSK_ERR_OK == ret) { -+ if (0 != _mali_osk_put_user(((u32) point), point_ptr)) { -+ /* -+ * Let user space know that something failed -+ * after the jobs were started. -+ */ -+ return _MALI_OSK_ERR_ITEM_NOT_FOUND; -+ } -+ } ++#define KBASE_IOCTL_MEM_FREE \ ++ _IOW(KBASE_IOCTL_TYPE, 7, struct kbase_ioctl_mem_free) + -+ return ret; -+} ++/** ++ * struct kbase_ioctl_hwcnt_reader_setup - Setup HWC dumper/reader ++ * @buffer_count: requested number of dumping buffers ++ * @jm_bm: counters selection bitmask (JM) ++ * @shader_bm: counters selection bitmask (Shader) ++ * @tiler_bm: counters selection bitmask (Tiler) ++ * @mmu_l2_bm: counters selection bitmask (MMU_L2) ++ * ++ * A fd is returned from the ioctl if successful, or a negative value on error ++ */ ++struct kbase_ioctl_hwcnt_reader_setup { ++ __u32 buffer_count; ++ __u32 jm_bm; ++ __u32 shader_bm; ++ __u32 tiler_bm; ++ __u32 mmu_l2_bm; ++}; + -+_mali_osk_errcode_t _mali_ukk_pp_and_gp_start_job(void *ctx, -+ _mali_uk_pp_and_gp_start_job_s *uargs) -+{ -+ _mali_osk_errcode_t ret; -+ struct mali_session_data *session; -+ _mali_uk_pp_and_gp_start_job_s kargs; -+ struct mali_pp_job *pp_job; -+ struct mali_gp_job *gp_job; -+ u32 __user *point_ptr = NULL; -+ mali_timeline_point point; -+ _mali_uk_pp_start_job_s __user *pp_args; -+ _mali_uk_gp_start_job_s __user *gp_args; ++#define KBASE_IOCTL_HWCNT_READER_SETUP \ ++ _IOW(KBASE_IOCTL_TYPE, 8, struct kbase_ioctl_hwcnt_reader_setup) + -+ MALI_DEBUG_ASSERT_POINTER(ctx); -+ MALI_DEBUG_ASSERT_POINTER(uargs); ++/** ++ * struct kbase_ioctl_hwcnt_enable - Enable hardware counter collection ++ * @dump_buffer: GPU address to write counters to ++ * @jm_bm: counters selection bitmask (JM) ++ * @shader_bm: counters selection bitmask (Shader) ++ * @tiler_bm: counters selection bitmask (Tiler) ++ * @mmu_l2_bm: counters selection bitmask (MMU_L2) ++ */ ++struct kbase_ioctl_hwcnt_enable { ++ __u64 dump_buffer; ++ __u32 jm_bm; ++ __u32 shader_bm; ++ __u32 tiler_bm; ++ __u32 mmu_l2_bm; ++}; + -+ session = (struct mali_session_data *) ctx; ++#define KBASE_IOCTL_HWCNT_ENABLE \ ++ _IOW(KBASE_IOCTL_TYPE, 9, struct kbase_ioctl_hwcnt_enable) + -+ if (0 != _mali_osk_copy_from_user(&kargs, uargs, -+ sizeof(_mali_uk_pp_and_gp_start_job_s))) { -+ return _MALI_OSK_ERR_NOMEM; -+ } ++#define KBASE_IOCTL_HWCNT_DUMP \ ++ _IO(KBASE_IOCTL_TYPE, 10) + -+ pp_args = (_mali_uk_pp_start_job_s __user *)(uintptr_t)kargs.pp_args; -+ gp_args = (_mali_uk_gp_start_job_s __user *)(uintptr_t)kargs.gp_args; ++#define KBASE_IOCTL_HWCNT_CLEAR \ ++ _IO(KBASE_IOCTL_TYPE, 11) + -+ pp_job = mali_pp_job_create(session, pp_args, -+ mali_scheduler_get_new_id()); -+ if (NULL == pp_job) { -+ MALI_PRINT_ERROR(("Failed to create PP job.\n")); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++/** ++ * struct kbase_ioctl_disjoint_query - Query the disjoint counter ++ * @counter: A counter of disjoint events in the kernel ++ */ ++struct kbase_ioctl_disjoint_query { ++ __u32 counter; ++}; + -+ gp_job = mali_gp_job_create(session, gp_args, -+ mali_scheduler_get_new_id(), -+ mali_pp_job_get_tracker(pp_job)); -+ if (NULL == gp_job) { -+ MALI_PRINT_ERROR(("Failed to create GP job.\n")); -+ mali_pp_job_delete(pp_job); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++#define KBASE_IOCTL_DISJOINT_QUERY \ ++ _IOR(KBASE_IOCTL_TYPE, 12, struct kbase_ioctl_disjoint_query) + -+ point_ptr = (u32 __user *)(uintptr_t)mali_pp_job_get_timeline_point_ptr(pp_job); ++/** ++ * struct kbase_ioctl_get_ddk_version - Query the kernel version ++ * @version_buffer: Buffer to receive the kernel version string ++ * @size: Size of the buffer ++ * ++ * The ioctl will return the number of bytes written into version_buffer ++ * (which includes a NULL byte) or a negative error code ++ */ ++struct kbase_ioctl_get_ddk_version { ++ union kbase_pointer version_buffer; ++ __u32 size; ++}; + -+ /* Submit GP job. */ -+ mali_scheduler_submit_gp_job(session, gp_job); -+ gp_job = NULL; ++#define KBASE_IOCTL_GET_DDK_VERSION \ ++ _IOW(KBASE_IOCTL_TYPE, 13, struct kbase_ioctl_get_ddk_version) + -+ /* Submit PP job. */ -+ ret = mali_scheduler_submit_pp_job(session, pp_job, &point); -+ pp_job = NULL; ++/** ++ * struct kbase_ioctl_mem_jit_init - Initialise the JIT memory allocator ++ * ++ * @va_pages: Number of VA pages to reserve for JIT ++ * ++ * Note that depending on the VA size of the application and GPU, the value ++ * specified in @va_pages may be ignored. ++ */ ++struct kbase_ioctl_mem_jit_init { ++ __u64 va_pages; ++}; + -+ if (_MALI_OSK_ERR_OK == ret) { -+ if (0 != _mali_osk_put_user(((u32) point), point_ptr)) { -+ /* -+ * Let user space know that something failed -+ * after the jobs were started. -+ */ -+ return _MALI_OSK_ERR_ITEM_NOT_FOUND; -+ } -+ } ++#define KBASE_IOCTL_MEM_JIT_INIT \ ++ _IOW(KBASE_IOCTL_TYPE, 14, struct kbase_ioctl_mem_jit_init) + -+ return ret; -+} ++/** ++ * struct kbase_ioctl_mem_sync - Perform cache maintenance on memory ++ * ++ * @handle: GPU memory handle (GPU VA) ++ * @user_addr: The address where it is mapped in user space ++ * @size: The number of bytes to synchronise ++ * @type: The direction to synchronise: 0 is sync to memory (clean), ++ * 1 is sync from memory (invalidate). Use the BASE_SYNCSET_OP_xxx constants. ++ * @padding: Padding to round up to a multiple of 8 bytes, must be zero ++ */ ++struct kbase_ioctl_mem_sync { ++ __u64 handle; ++ __u64 user_addr; ++ __u64 size; ++ __u8 type; ++ __u8 padding[7]; ++}; + -+void _mali_ukk_pp_job_disable_wb(_mali_uk_pp_disable_wb_s *args) -+{ -+ struct mali_session_data *session; -+ struct mali_pp_job *job; -+ struct mali_pp_job *tmp; -+ u32 fb_lookup_id; ++#define KBASE_IOCTL_MEM_SYNC \ ++ _IOW(KBASE_IOCTL_TYPE, 15, struct kbase_ioctl_mem_sync) + -+ MALI_DEBUG_ASSERT_POINTER(args); -+ MALI_DEBUG_ASSERT(NULL != (void *)(uintptr_t)args->ctx); ++/** ++ * union kbase_ioctl_mem_find_cpu_offset - Find the offset of a CPU pointer ++ * ++ * @gpu_addr: The GPU address of the memory region ++ * @cpu_addr: The CPU address to locate ++ * @size: A size in bytes to validate is contained within the region ++ * @offset: The offset from the start of the memory region to @cpu_addr ++ * ++ * @in: Input parameters ++ * @out: Output parameters ++ */ ++union kbase_ioctl_mem_find_cpu_offset { ++ struct { ++ __u64 gpu_addr; ++ __u64 cpu_addr; ++ __u64 size; ++ } in; ++ struct { ++ __u64 offset; ++ } out; ++}; + -+ session = (struct mali_session_data *)(uintptr_t)args->ctx; ++#define KBASE_IOCTL_MEM_FIND_CPU_OFFSET \ ++ _IOWR(KBASE_IOCTL_TYPE, 16, union kbase_ioctl_mem_find_cpu_offset) + -+ fb_lookup_id = args->fb_id & MALI_PP_JOB_FB_LOOKUP_LIST_MASK; ++/** ++ * struct kbase_ioctl_get_context_id - Get the kernel context ID ++ * ++ * @id: The kernel context ID ++ */ ++struct kbase_ioctl_get_context_id { ++ int id; /* This should really be __u32, but see GPUCORE-10048 */ ++}; + -+ mali_scheduler_lock(); ++#define KBASE_IOCTL_GET_CONTEXT_ID \ ++ _IOR(KBASE_IOCTL_TYPE, 17, struct kbase_ioctl_get_context_id) + -+ /* Iterate over all jobs for given frame builder_id. */ -+ _MALI_OSK_LIST_FOREACHENTRY(job, tmp, -+ &session->pp_job_fb_lookup_list[fb_lookup_id], -+ struct mali_pp_job, session_fb_lookup_list) { -+ MALI_DEBUG_CODE(u32 disable_mask = 0); ++/** ++ * struct kbase_ioctl_tlstream_acquire - Acquire a tlstream fd ++ * ++ * @flags: Flags ++ * ++ * The ioctl returns a file descriptor when successful ++ */ ++struct kbase_ioctl_tlstream_acquire { ++ __u32 flags; ++}; + -+ if (mali_pp_job_get_frame_builder_id(job) != -+ (u32) args->fb_id) { -+ MALI_DEBUG_PRINT(4, ("Mali PP scheduler: Disable WB mismatching FB.\n")); -+ continue; -+ } ++#define KBASE_IOCTL_TLSTREAM_ACQUIRE \ ++ _IOW(KBASE_IOCTL_TYPE, 18, struct kbase_ioctl_tlstream_acquire) + -+ MALI_DEBUG_CODE(disable_mask |= 0xD << (4 * 3)); ++#define KBASE_IOCTL_TLSTREAM_FLUSH \ ++ _IO(KBASE_IOCTL_TYPE, 19) + -+ if (mali_pp_job_get_wb0_source_addr(job) == args->wb0_memory) { -+ MALI_DEBUG_CODE(disable_mask |= 0x1 << (4 * 1)); -+ mali_pp_job_disable_wb0(job); -+ } ++/** ++ * struct kbase_ioctl_mem_commit - Change the amount of memory backing a region ++ * ++ * @gpu_addr: The memory region to modify ++ * @pages: The number of physical pages that should be present ++ * ++ * The ioctl may return on the following error codes or 0 for success: ++ * -ENOMEM: Out of memory ++ * -EINVAL: Invalid arguments ++ */ ++struct kbase_ioctl_mem_commit { ++ __u64 gpu_addr; ++ __u64 pages; ++}; + -+ if (mali_pp_job_get_wb1_source_addr(job) == args->wb1_memory) { -+ MALI_DEBUG_CODE(disable_mask |= 0x2 << (4 * 2)); -+ mali_pp_job_disable_wb1(job); -+ } ++#define KBASE_IOCTL_MEM_COMMIT \ ++ _IOW(KBASE_IOCTL_TYPE, 20, struct kbase_ioctl_mem_commit) + -+ if (mali_pp_job_get_wb2_source_addr(job) == args->wb2_memory) { -+ MALI_DEBUG_CODE(disable_mask |= 0x3 << (4 * 3)); -+ mali_pp_job_disable_wb2(job); -+ } -+ MALI_DEBUG_PRINT(3, ("Mali PP scheduler: Disable WB: 0x%X.\n", -+ disable_mask)); -+ } ++/** ++ * union kbase_ioctl_mem_alias - Create an alias of memory regions ++ * @flags: Flags, see BASE_MEM_xxx ++ * @stride: Bytes between start of each memory region ++ * @nents: The number of regions to pack together into the alias ++ * @aliasing_info: Pointer to an array of struct base_mem_aliasing_info ++ * @gpu_va: Address of the new alias ++ * @va_pages: Size of the new alias ++ * ++ * @in: Input parameters ++ * @out: Output parameters ++ */ ++union kbase_ioctl_mem_alias { ++ struct { ++ __u64 flags; ++ __u64 stride; ++ __u64 nents; ++ union kbase_pointer aliasing_info; ++ } in; ++ struct { ++ __u64 flags; ++ __u64 gpu_va; ++ __u64 va_pages; ++ } out; ++}; + -+ mali_scheduler_unlock(); -+} ++#define KBASE_IOCTL_MEM_ALIAS \ ++ _IOWR(KBASE_IOCTL_TYPE, 21, union kbase_ioctl_mem_alias) + -+#if MALI_STATE_TRACKING -+u32 mali_scheduler_dump_state(char *buf, u32 size) -+{ -+ int n = 0; ++/** ++ * union kbase_ioctl_mem_import - Import memory for use by the GPU ++ * @flags: Flags, see BASE_MEM_xxx ++ * @phandle: Handle to the external memory ++ * @type: Type of external memory, see base_mem_import_type ++ * @padding: Amount of extra VA pages to append to the imported buffer ++ * @gpu_va: Address of the new alias ++ * @va_pages: Size of the new alias ++ * ++ * @in: Input parameters ++ * @out: Output parameters ++ */ ++union kbase_ioctl_mem_import { ++ struct { ++ __u64 flags; ++ union kbase_pointer phandle; ++ __u32 type; ++ __u32 padding; ++ } in; ++ struct { ++ __u64 flags; ++ __u64 gpu_va; ++ __u64 va_pages; ++ } out; ++}; + -+ n += _mali_osk_snprintf(buf + n, size - n, "GP queues\n"); -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\tQueue depth: %u\n", job_queue_gp.depth); -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\tNormal priority queue is %s\n", -+ _mali_osk_list_empty(&job_queue_gp.normal_pri) ? -+ "empty" : "not empty"); -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\tHigh priority queue is %s\n", -+ _mali_osk_list_empty(&job_queue_gp.high_pri) ? -+ "empty" : "not empty"); ++#define KBASE_IOCTL_MEM_IMPORT \ ++ _IOWR(KBASE_IOCTL_TYPE, 22, union kbase_ioctl_mem_import) + -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "PP queues\n"); -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\tQueue depth: %u\n", job_queue_pp.depth); -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\tNormal priority queue is %s\n", -+ _mali_osk_list_empty(&job_queue_pp.normal_pri) -+ ? "empty" : "not empty"); -+ n += _mali_osk_snprintf(buf + n, size - n, -+ "\tHigh priority queue is %s\n", -+ _mali_osk_list_empty(&job_queue_pp.high_pri) -+ ? "empty" : "not empty"); ++/** ++ * struct kbase_ioctl_mem_flags_change - Change the flags for a memory region ++ * @gpu_va: The GPU region to modify ++ * @flags: The new flags to set ++ * @mask: Mask of the flags to modify ++ */ ++struct kbase_ioctl_mem_flags_change { ++ __u64 gpu_va; ++ __u64 flags; ++ __u64 mask; ++}; + -+ n += _mali_osk_snprintf(buf + n, size - n, "\n"); ++#define KBASE_IOCTL_MEM_FLAGS_CHANGE \ ++ _IOW(KBASE_IOCTL_TYPE, 23, struct kbase_ioctl_mem_flags_change) + -+ return n; -+} -+#endif ++/** ++ * struct kbase_ioctl_stream_create - Create a synchronisation stream ++ * @name: A name to identify this stream. Must be NULL-terminated. ++ * ++ * Note that this is also called a "timeline", but is named stream to avoid ++ * confusion with other uses of the word. ++ * ++ * Unused bytes in @name (after the first NULL byte) must be also be NULL bytes. ++ * ++ * The ioctl returns a file descriptor. ++ */ ++struct kbase_ioctl_stream_create { ++ char name[32]; ++}; + -+/* -+ * ---------- Implementation of static functions ---------- ++#define KBASE_IOCTL_STREAM_CREATE \ ++ _IOW(KBASE_IOCTL_TYPE, 24, struct kbase_ioctl_stream_create) ++ ++/** ++ * struct kbase_ioctl_fence_validate - Validate a fd refers to a fence ++ * @fd: The file descriptor to validate + */ ++struct kbase_ioctl_fence_validate { ++ int fd; ++}; + -+static mali_timeline_point mali_scheduler_submit_gp_job( -+ struct mali_session_data *session, struct mali_gp_job *job) -+{ -+ mali_timeline_point point; ++#define KBASE_IOCTL_FENCE_VALIDATE \ ++ _IOW(KBASE_IOCTL_TYPE, 25, struct kbase_ioctl_fence_validate) + -+ MALI_DEBUG_ASSERT_POINTER(session); -+ MALI_DEBUG_ASSERT_POINTER(job); ++/** ++ * struct kbase_ioctl_get_profiling_controls - Get the profiling controls ++ * @count: The size of @buffer in u32 words ++ * @buffer: The buffer to receive the profiling controls ++ */ ++struct kbase_ioctl_get_profiling_controls { ++ union kbase_pointer buffer; ++ __u32 count; ++}; + -+ /* Add job to Timeline system. */ -+ point = mali_timeline_system_add_tracker(session->timeline_system, -+ mali_gp_job_get_tracker(job), MALI_TIMELINE_GP); ++#define KBASE_IOCTL_GET_PROFILING_CONTROLS \ ++ _IOW(KBASE_IOCTL_TYPE, 26, struct kbase_ioctl_get_profiling_controls) + -+ return point; -+} ++/** ++ * struct kbase_ioctl_mem_profile_add - Provide profiling information to kernel ++ * @buffer: Pointer to the information ++ * @len: Length ++ * @padding: Padding ++ * ++ * The data provided is accessible through a debugfs file ++ */ ++struct kbase_ioctl_mem_profile_add { ++ union kbase_pointer buffer; ++ __u32 len; ++ __u32 padding; ++}; + -+static _mali_osk_errcode_t mali_scheduler_submit_pp_job( -+ struct mali_session_data *session, struct mali_pp_job *job, mali_timeline_point *point) ++#define KBASE_IOCTL_MEM_PROFILE_ADD \ ++ _IOW(KBASE_IOCTL_TYPE, 27, struct kbase_ioctl_mem_profile_add) + -+{ -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_OK; ++/** ++ * struct kbase_ioctl_soft_event_update - Update the status of a soft-event ++ * @event: GPU address of the event which has been updated ++ * @new_status: The new status to set ++ * @flags: Flags for future expansion ++ */ ++struct kbase_ioctl_soft_event_update { ++ __u64 event; ++ __u32 new_status; ++ __u32 flags; ++}; + -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+ struct ww_acquire_ctx ww_actx; -+ u32 i; -+ u32 num_memory_cookies = 0; -+ struct reservation_object **reservation_object_list = NULL; -+ unsigned int num_reservation_object = 0; -+#endif ++#define KBASE_IOCTL_SOFT_EVENT_UPDATE \ ++ _IOW(KBASE_IOCTL_TYPE, 28, struct kbase_ioctl_soft_event_update) + -+ MALI_DEBUG_ASSERT_POINTER(session); -+ MALI_DEBUG_ASSERT_POINTER(job); ++/*************** ++ * test ioctls * ++ ***************/ ++#if MALI_UNIT_TEST ++/* These ioctls are purely for test purposes and are not used in the production ++ * driver, they therefore may change without notice ++ */ + -+ mali_scheduler_lock(); -+ /* -+ * Adding job to the lookup list used to quickly discard -+ * writeback units of queued jobs. -+ */ -+ mali_pp_job_fb_lookup_add(job); -+ mali_scheduler_unlock(); ++#define KBASE_IOCTL_TEST_TYPE (KBASE_IOCTL_TYPE + 1) + -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) ++/** ++ * struct kbase_ioctl_tlstream_test - Start a timeline stream test ++ * ++ * @tpw_count: number of trace point writers in each context ++ * @msg_delay: time delay between tracepoints from one writer in milliseconds ++ * @msg_count: number of trace points written by one writer ++ * @aux_msg: if non-zero aux messages will be included ++ */ ++struct kbase_ioctl_tlstream_test { ++ __u32 tpw_count; ++ __u32 msg_delay; ++ __u32 msg_count; ++ __u32 aux_msg; ++}; + -+ /* Allocate the reservation_object_list to list the dma reservation object of dependent dma buffer */ -+ num_memory_cookies = mali_pp_job_num_memory_cookies(job); -+ if (0 < num_memory_cookies) { -+ reservation_object_list = kzalloc(sizeof(struct reservation_object *) * num_memory_cookies, GFP_KERNEL); -+ if (NULL == reservation_object_list) { -+ MALI_PRINT_ERROR(("Failed to alloc the reservation object list.\n")); -+ ret = _MALI_OSK_ERR_NOMEM; -+ goto failed_to_alloc_reservation_object_list; -+ } -+ } ++#define KBASE_IOCTL_TLSTREAM_TEST \ ++ _IOW(KBASE_IOCTL_TEST_TYPE, 1, struct kbase_ioctl_tlstream_test) + -+ /* Add the dma reservation object into reservation_object_list*/ -+ for (i = 0; i < num_memory_cookies; i++) { -+ mali_mem_backend *mem_backend = NULL; -+ struct reservation_object *tmp_reservation_object = NULL; -+ u32 mali_addr = mali_pp_job_get_memory_cookie(job, i); ++/** ++ * struct kbase_ioctl_tlstream_stats - Read tlstream stats for test purposes ++ * @bytes_collected: number of bytes read by user ++ * @bytes_generated: number of bytes generated by tracepoints ++ */ ++struct kbase_ioctl_tlstream_stats { ++ __u32 bytes_collected; ++ __u32 bytes_generated; ++}; + -+ mem_backend = mali_mem_backend_struct_search(session, mali_addr); ++#define KBASE_IOCTL_TLSTREAM_STATS \ ++ _IOR(KBASE_IOCTL_TEST_TYPE, 2, struct kbase_ioctl_tlstream_stats) + -+ MALI_DEBUG_ASSERT_POINTER(mem_backend); ++#endif + -+ if (NULL == mem_backend) { -+ MALI_PRINT_ERROR(("Failed to find the memory backend for memory cookie[%d].\n", i)); -+ goto failed_to_find_mem_backend; -+ } ++/********************************** ++ * Definitions for GPU properties * ++ **********************************/ ++#define KBASE_GPUPROP_VALUE_SIZE_U8 (0x0) ++#define KBASE_GPUPROP_VALUE_SIZE_U16 (0x1) ++#define KBASE_GPUPROP_VALUE_SIZE_U32 (0x2) ++#define KBASE_GPUPROP_VALUE_SIZE_U64 (0x3) + -+ if (MALI_MEM_DMA_BUF != mem_backend->type) -+ continue; ++#define KBASE_GPUPROP_PRODUCT_ID 1 ++#define KBASE_GPUPROP_VERSION_STATUS 2 ++#define KBASE_GPUPROP_MINOR_REVISION 3 ++#define KBASE_GPUPROP_MAJOR_REVISION 4 ++#define KBASE_GPUPROP_GPU_SPEED_MHZ 5 ++#define KBASE_GPUPROP_GPU_FREQ_KHZ_MAX 6 ++#define KBASE_GPUPROP_GPU_FREQ_KHZ_MIN 7 ++#define KBASE_GPUPROP_LOG2_PROGRAM_COUNTER_SIZE 8 ++#define KBASE_GPUPROP_TEXTURE_FEATURES_0 9 ++#define KBASE_GPUPROP_TEXTURE_FEATURES_1 10 ++#define KBASE_GPUPROP_TEXTURE_FEATURES_2 11 ++#define KBASE_GPUPROP_GPU_AVAILABLE_MEMORY_SIZE 12 + -+ tmp_reservation_object = mem_backend->dma_buf.attachment->buf->resv; ++#define KBASE_GPUPROP_L2_LOG2_LINE_SIZE 13 ++#define KBASE_GPUPROP_L2_LOG2_CACHE_SIZE 14 ++#define KBASE_GPUPROP_L2_NUM_L2_SLICES 15 + -+ if (NULL != tmp_reservation_object) { -+ mali_dma_fence_add_reservation_object_list(tmp_reservation_object, -+ reservation_object_list, &num_reservation_object); -+ } -+ } ++#define KBASE_GPUPROP_TILER_BIN_SIZE_BYTES 16 ++#define KBASE_GPUPROP_TILER_MAX_ACTIVE_LEVELS 17 + -+ /* -+ * Add the mali dma fence callback to wait for all dependent dma buf, -+ * and extend the timeline system to support dma fence, -+ * then create the new internal dma fence to replace all last dma fence for dependent dma buf. -+ */ -+ if (0 < num_reservation_object) { -+ int error; -+ int num_dma_fence_waiter = 0; -+ /* Create one new dma fence.*/ -+ job->rendered_dma_fence = mali_dma_fence_new(job->session->fence_context, -+ _mali_osk_atomic_inc_return(&job->session->fence_seqno)); ++#define KBASE_GPUPROP_MAX_THREADS 18 ++#define KBASE_GPUPROP_MAX_WORKGROUP_SIZE 19 ++#define KBASE_GPUPROP_MAX_BARRIER_SIZE 20 ++#define KBASE_GPUPROP_MAX_REGISTERS 21 ++#define KBASE_GPUPROP_MAX_TASK_QUEUE 22 ++#define KBASE_GPUPROP_MAX_THREAD_GROUP_SPLIT 23 ++#define KBASE_GPUPROP_IMPL_TECH 24 + -+ if (NULL == job->rendered_dma_fence) { -+ MALI_PRINT_ERROR(("Failed to creat one new dma fence.\n")); -+ ret = _MALI_OSK_ERR_FAULT; -+ goto failed_to_create_dma_fence; -+ } ++#define KBASE_GPUPROP_RAW_SHADER_PRESENT 25 ++#define KBASE_GPUPROP_RAW_TILER_PRESENT 26 ++#define KBASE_GPUPROP_RAW_L2_PRESENT 27 ++#define KBASE_GPUPROP_RAW_STACK_PRESENT 28 ++#define KBASE_GPUPROP_RAW_L2_FEATURES 29 ++#define KBASE_GPUPROP_RAW_SUSPEND_SIZE 30 ++#define KBASE_GPUPROP_RAW_MEM_FEATURES 31 ++#define KBASE_GPUPROP_RAW_MMU_FEATURES 32 ++#define KBASE_GPUPROP_RAW_AS_PRESENT 33 ++#define KBASE_GPUPROP_RAW_JS_PRESENT 34 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_0 35 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_1 36 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_2 37 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_3 38 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_4 39 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_5 40 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_6 41 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_7 42 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_8 43 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_9 44 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_10 45 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_11 46 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_12 47 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_13 48 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_14 49 ++#define KBASE_GPUPROP_RAW_JS_FEATURES_15 50 ++#define KBASE_GPUPROP_RAW_TILER_FEATURES 51 ++#define KBASE_GPUPROP_RAW_TEXTURE_FEATURES_0 52 ++#define KBASE_GPUPROP_RAW_TEXTURE_FEATURES_1 53 ++#define KBASE_GPUPROP_RAW_TEXTURE_FEATURES_2 54 ++#define KBASE_GPUPROP_RAW_GPU_ID 55 ++#define KBASE_GPUPROP_RAW_THREAD_MAX_THREADS 56 ++#define KBASE_GPUPROP_RAW_THREAD_MAX_WORKGROUP_SIZE 57 ++#define KBASE_GPUPROP_RAW_THREAD_MAX_BARRIER_SIZE 58 ++#define KBASE_GPUPROP_RAW_THREAD_FEATURES 59 ++#define KBASE_GPUPROP_RAW_COHERENCY_MODE 60 + -+ /* In order to avoid deadlock, wait/wound mutex lock to lock all dma buffers*/ ++#define KBASE_GPUPROP_COHERENCY_NUM_GROUPS 61 ++#define KBASE_GPUPROP_COHERENCY_NUM_CORE_GROUPS 62 ++#define KBASE_GPUPROP_COHERENCY_COHERENCY 63 ++#define KBASE_GPUPROP_COHERENCY_GROUP_0 64 ++#define KBASE_GPUPROP_COHERENCY_GROUP_1 65 ++#define KBASE_GPUPROP_COHERENCY_GROUP_2 66 ++#define KBASE_GPUPROP_COHERENCY_GROUP_3 67 ++#define KBASE_GPUPROP_COHERENCY_GROUP_4 68 ++#define KBASE_GPUPROP_COHERENCY_GROUP_5 69 ++#define KBASE_GPUPROP_COHERENCY_GROUP_6 70 ++#define KBASE_GPUPROP_COHERENCY_GROUP_7 71 ++#define KBASE_GPUPROP_COHERENCY_GROUP_8 72 ++#define KBASE_GPUPROP_COHERENCY_GROUP_9 73 ++#define KBASE_GPUPROP_COHERENCY_GROUP_10 74 ++#define KBASE_GPUPROP_COHERENCY_GROUP_11 75 ++#define KBASE_GPUPROP_COHERENCY_GROUP_12 76 ++#define KBASE_GPUPROP_COHERENCY_GROUP_13 77 ++#define KBASE_GPUPROP_COHERENCY_GROUP_14 78 ++#define KBASE_GPUPROP_COHERENCY_GROUP_15 79 + -+ error = mali_dma_fence_lock_reservation_object_list(reservation_object_list, -+ num_reservation_object, &ww_actx); ++#ifdef __cpluscplus ++} ++#endif + -+ if (0 != error) { -+ MALI_PRINT_ERROR(("Failed to lock all reservation objects.\n")); -+ ret = _MALI_OSK_ERR_FAULT; -+ goto failed_to_lock_reservation_object_list; -+ } ++#endif +diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd.c b/drivers/gpu/arm/midgard/mali_kbase_jd.c +new file mode 100755 +index 000000000..d9d8658d3 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_jd.c +@@ -0,0 +1,1903 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ mali_dma_fence_context_init(&job->dma_fence_context, -+ mali_timeline_dma_fence_callback, (void *)job); + -+ /* Add dma fence waiters and dma fence callback. */ -+ for (i = 0; i < num_reservation_object; i++) { -+ ret = mali_dma_fence_context_add_waiters(&job->dma_fence_context, reservation_object_list[i]); -+ if (_MALI_OSK_ERR_OK != ret) { -+ MALI_PRINT_ERROR(("Failed to add waiter into mali dma fence context.\n")); -+ goto failed_to_add_dma_fence_waiter; -+ } -+ } + -+ for (i = 0; i < num_reservation_object; i++) { -+ reservation_object_add_excl_fence(reservation_object_list[i], job->rendered_dma_fence); -+ } + -+ num_dma_fence_waiter = job->dma_fence_context.num_dma_fence_waiter; + -+ /* Add job to Timeline system. */ -+ (*point) = mali_timeline_system_add_tracker(session->timeline_system, -+ mali_pp_job_get_tracker(job), MALI_TIMELINE_PP); ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++#include ++#endif /* defined(CONFIG_DMA_SHARED_BUFFER) */ ++#ifdef CONFIG_COMPAT ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include + -+ if (0 != num_dma_fence_waiter) { -+ mali_dma_fence_context_dec_count(&job->dma_fence_context); -+ } ++#include ++#include ++#include + -+ /* Unlock all wait/wound mutex lock. */ -+ mali_dma_fence_unlock_reservation_object_list(reservation_object_list, -+ num_reservation_object, &ww_actx); -+ } else { -+ /* Add job to Timeline system. */ -+ (*point) = mali_timeline_system_add_tracker(session->timeline_system, -+ mali_pp_job_get_tracker(job), MALI_TIMELINE_PP); -+ } ++#include "mali_kbase_dma_fence.h" + -+ kfree(reservation_object_list); -+ return ret; -+#else -+ /* Add job to Timeline system. */ -+ (*point) = mali_timeline_system_add_tracker(session->timeline_system, -+ mali_pp_job_get_tracker(job), MALI_TIMELINE_PP); ++#define beenthere(kctx, f, a...) dev_dbg(kctx->kbdev->dev, "%s:" f, __func__, ##a) ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) ++/* random32 was renamed to prandom_u32 in 3.8 */ ++#define prandom_u32 random32 +#endif + -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+failed_to_add_dma_fence_waiter: -+ mali_dma_fence_context_term(&job->dma_fence_context); -+ mali_dma_fence_unlock_reservation_object_list(reservation_object_list, -+ num_reservation_object, &ww_actx); -+failed_to_lock_reservation_object_list: -+ mali_dma_fence_signal_and_put(&job->rendered_dma_fence); -+failed_to_create_dma_fence: -+failed_to_find_mem_backend: -+ if (NULL != reservation_object_list) -+ kfree(reservation_object_list); -+failed_to_alloc_reservation_object_list: -+ mali_pp_job_fb_lookup_remove(job); ++/* Return whether katom will run on the GPU or not. Currently only soft jobs and ++ * dependency-only atoms do not run on the GPU */ ++#define IS_GPU_ATOM(katom) (!((katom->core_req & BASE_JD_REQ_SOFT_JOB) || \ ++ ((katom->core_req & BASE_JD_REQ_ATOM_TYPE) == \ ++ BASE_JD_REQ_DEP))) ++/* ++ * This is the kernel side of the API. Only entry points are: ++ * - kbase_jd_submit(): Called from userspace to submit a single bag ++ * - kbase_jd_done(): Called from interrupt context to track the ++ * completion of a job. ++ * Callouts: ++ * - to the job manager (enqueue a job) ++ * - to the event subsystem (signals the completion/failure of bag/job-chains). ++ */ ++ ++static void __user * ++get_compat_pointer(struct kbase_context *kctx, const union kbase_pointer *p) ++{ ++#ifdef CONFIG_COMPAT ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ return compat_ptr(p->compat_value); +#endif -+ return ret; ++ return p->value; +} + -+static mali_bool mali_scheduler_queue_gp_job(struct mali_gp_job *job) ++/* Runs an atom, either by handing to the JS or by immediately running it in the case of soft-jobs ++ * ++ * Returns whether the JS needs a reschedule. ++ * ++ * Note that the caller must also check the atom status and ++ * if it is KBASE_JD_ATOM_STATE_COMPLETED must call jd_done_nolock ++ */ ++static int jd_run_atom(struct kbase_jd_atom *katom) +{ -+ struct mali_session_data *session; -+ _mali_osk_list_t *queue; -+ -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); -+ MALI_DEBUG_ASSERT_POINTER(job); ++ struct kbase_context *kctx = katom->kctx; + -+ session = mali_gp_job_get_session(job); -+ MALI_DEBUG_ASSERT_POINTER(session); ++ KBASE_DEBUG_ASSERT(katom->status != KBASE_JD_ATOM_STATE_UNUSED); + -+ if (unlikely(session->is_aborting)) { -+ MALI_DEBUG_PRINT(4, ("Mali GP scheduler: Job %u (0x%08X) queued while session is aborting.\n", -+ mali_gp_job_get_id(job), job)); -+ return MALI_FALSE; /* job not queued */ ++ if ((katom->core_req & BASE_JD_REQ_ATOM_TYPE) == BASE_JD_REQ_DEP) { ++ /* Dependency only atom */ ++ katom->status = KBASE_JD_ATOM_STATE_COMPLETED; ++ return 0; ++ } else if (katom->core_req & BASE_JD_REQ_SOFT_JOB) { ++ /* Soft-job */ ++ if (katom->will_fail_event_code) { ++ katom->status = KBASE_JD_ATOM_STATE_COMPLETED; ++ return 0; ++ } ++ if ((katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) ++ == BASE_JD_REQ_SOFT_REPLAY) { ++ if (!kbase_replay_process(katom)) ++ katom->status = KBASE_JD_ATOM_STATE_COMPLETED; ++ } else if (kbase_process_soft_job(katom) == 0) { ++ kbase_finish_soft_job(katom); ++ katom->status = KBASE_JD_ATOM_STATE_COMPLETED; ++ } ++ return 0; + } + -+ mali_gp_job_set_cache_order(job, mali_scheduler_get_new_cache_order()); -+ -+ /* Determine which queue the job should be added to. */ -+ if (session->use_high_priority_job_queue) { -+ queue = &job_queue_gp.high_pri; -+ } else { -+ queue = &job_queue_gp.normal_pri; -+ } ++ katom->status = KBASE_JD_ATOM_STATE_IN_JS; ++ /* Queue an action about whether we should try scheduling a context */ ++ return kbasep_js_add_job(kctx, katom); ++} + -+ job_queue_gp.depth += 1; -+ job_queue_gp.big_job_num += (job->big_job) ? 1 : 0; ++#if defined(CONFIG_KDS) || defined(CONFIG_MALI_DMA_FENCE) ++void kbase_jd_dep_clear_locked(struct kbase_jd_atom *katom) ++{ ++ struct kbase_device *kbdev; + -+ /* Add job to queue (mali_gp_job_queue_add find correct place). */ -+ mali_gp_job_list_add(job, queue); ++ KBASE_DEBUG_ASSERT(katom); ++ kbdev = katom->kctx->kbdev; ++ KBASE_DEBUG_ASSERT(kbdev); + -+ /* -+ * We hold a PM reference for every job we hold queued (and running) -+ * It is important that we take this reference after job has been -+ * added the the queue so that any runtime resume could schedule this -+ * job right there and then. ++ /* Check whether the atom's other dependencies were already met. If ++ * katom is a GPU atom then the job scheduler may be able to represent ++ * the dependencies, hence we may attempt to submit it before they are ++ * met. Other atoms must have had both dependencies resolved. + */ -+ _mali_osk_pm_dev_ref_get_async(); -+ -+ if (mali_utilization_enabled()) { -+ /* -+ * We cheat a little bit by counting the GP as busy from the -+ * time a GP job is queued. This will be fine because we only -+ * loose the tiny idle gap between jobs, but we will instead -+ * get less utilization work to do (less locks taken) -+ */ -+ mali_utilization_gp_start(); -+ } ++ if (IS_GPU_ATOM(katom) || ++ (!kbase_jd_katom_dep_atom(&katom->dep[0]) && ++ !kbase_jd_katom_dep_atom(&katom->dep[1]))) { ++ /* katom dep complete, attempt to run it */ ++ bool resched = false; + -+ mali_pm_record_gpu_active(MALI_TRUE); ++ resched = jd_run_atom(katom); + -+ /* Add profiling events for job enqueued */ -+ _mali_osk_profiling_add_event( -+ MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_GP_ENQUEUE, -+ mali_gp_job_get_pid(job), -+ mali_gp_job_get_tid(job), -+ mali_gp_job_get_frame_builder_id(job), -+ mali_gp_job_get_flush_id(job), -+ 0); ++ if (katom->status == KBASE_JD_ATOM_STATE_COMPLETED) { ++ /* The atom has already finished */ ++ resched |= jd_done_nolock(katom, NULL); ++ } + -+#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) -+ trace_gpu_job_enqueue(mali_gp_job_get_tid(job), -+ mali_gp_job_get_id(job), "GP"); ++ if (resched) ++ kbase_js_sched_all(kbdev); ++ } ++} +#endif + -+ MALI_DEBUG_PRINT(3, ("Mali GP scheduler: Job %u (0x%08X) queued\n", -+ mali_gp_job_get_id(job), job)); ++#ifdef CONFIG_KDS + -+ return MALI_TRUE; /* job queued */ -+} ++/* Add the katom to the kds waiting list. ++ * Atoms must be added to the waiting list after a successful call to kds_async_waitall. ++ * The caller must hold the kbase_jd_context.lock */ + -+static mali_bool mali_scheduler_queue_pp_job(struct mali_pp_job *job) ++static void kbase_jd_kds_waiters_add(struct kbase_jd_atom *katom) +{ -+ struct mali_session_data *session; -+ _mali_osk_list_t *queue = NULL; ++ struct kbase_context *kctx; + -+ MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD(); -+ MALI_DEBUG_ASSERT_POINTER(job); ++ KBASE_DEBUG_ASSERT(katom); + -+ session = mali_pp_job_get_session(job); -+ MALI_DEBUG_ASSERT_POINTER(session); ++ kctx = katom->kctx; + -+ if (unlikely(session->is_aborting)) { -+ MALI_DEBUG_PRINT(2, ("Mali PP scheduler: Job %u (0x%08X) queued while session is aborting.\n", -+ mali_pp_job_get_id(job), job)); -+ return MALI_FALSE; /* job not queued */ -+ } else if (unlikely(MALI_SWAP_IN_FAIL == job->swap_status)) { -+ MALI_DEBUG_PRINT(2, ("Mali PP scheduler: Job %u (0x%08X) queued while swap in failed.\n", -+ mali_pp_job_get_id(job), job)); -+ return MALI_FALSE; -+ } ++ list_add_tail(&katom->node, &kctx->waiting_kds_resource); ++} + -+ mali_pp_job_set_cache_order(job, mali_scheduler_get_new_cache_order()); ++/* Remove the katom from the kds waiting list. ++ * Atoms must be removed from the waiting list before a call to kds_resource_set_release_sync. ++ * The supplied katom must first have been added to the list with a call to kbase_jd_kds_waiters_add. ++ * The caller must hold the kbase_jd_context.lock */ + -+ if (session->use_high_priority_job_queue) { -+ queue = &job_queue_pp.high_pri; -+ } else { -+ queue = &job_queue_pp.normal_pri; -+ } ++static void kbase_jd_kds_waiters_remove(struct kbase_jd_atom *katom) ++{ ++ KBASE_DEBUG_ASSERT(katom); ++ list_del(&katom->node); ++} + -+ job_queue_pp.depth += -+ mali_pp_job_get_sub_job_count(job); ++static void kds_dep_clear(void *callback_parameter, void *callback_extra_parameter) ++{ ++ struct kbase_jd_atom *katom; ++ struct kbase_jd_context *ctx; + -+ /* Add job to queue (mali_gp_job_queue_add find correct place). */ -+ mali_pp_job_list_add(job, queue); ++ katom = (struct kbase_jd_atom *)callback_parameter; ++ KBASE_DEBUG_ASSERT(katom); + -+ /* -+ * We hold a PM reference for every job we hold queued (and running) -+ * It is important that we take this reference after job has been -+ * added the the queue so that any runtime resume could schedule this -+ * job right there and then. ++ ctx = &katom->kctx->jctx; ++ ++ /* If KDS resource has already been satisfied (e.g. due to zapping) ++ * do nothing. + */ -+ _mali_osk_pm_dev_ref_get_async(); ++ mutex_lock(&ctx->lock); ++ if (!katom->kds_dep_satisfied) { ++ katom->kds_dep_satisfied = true; ++ kbase_jd_dep_clear_locked(katom); ++ } ++ mutex_unlock(&ctx->lock); ++} + -+ if (mali_utilization_enabled()) { -+ /* -+ * We cheat a little bit by counting the PP as busy from the -+ * time a PP job is queued. This will be fine because we only -+ * loose the tiny idle gap between jobs, but we will instead -+ * get less utilization work to do (less locks taken) -+ */ -+ mali_utilization_pp_start(); ++static void kbase_cancel_kds_wait_job(struct kbase_jd_atom *katom) ++{ ++ KBASE_DEBUG_ASSERT(katom); ++ ++ /* Prevent job_done_nolock from being called twice on an atom when ++ * there is a race between job completion and cancellation */ ++ ++ if (katom->status == KBASE_JD_ATOM_STATE_QUEUED) { ++ /* Wait was cancelled - zap the atom */ ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ if (jd_done_nolock(katom, NULL)) ++ kbase_js_sched_all(katom->kctx->kbdev); + } ++} ++#endif /* CONFIG_KDS */ + -+ mali_pm_record_gpu_active(MALI_FALSE); ++void kbase_jd_free_external_resources(struct kbase_jd_atom *katom) ++{ ++#ifdef CONFIG_KDS ++ if (katom->kds_rset) { ++ struct kbase_jd_context *jctx = &katom->kctx->jctx; + -+ /* Add profiling events for job enqueued */ -+ _mali_osk_profiling_add_event( -+ MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_PP_ENQUEUE, -+ mali_pp_job_get_pid(job), -+ mali_pp_job_get_tid(job), -+ mali_pp_job_get_frame_builder_id(job), -+ mali_pp_job_get_flush_id(job), -+ 0); ++ /* ++ * As the atom is no longer waiting, remove it from ++ * the waiting list. ++ */ + -+#if defined(CONFIG_GPU_TRACEPOINTS) && defined(CONFIG_TRACEPOINTS) -+ trace_gpu_job_enqueue(mali_pp_job_get_tid(job), -+ mali_pp_job_get_id(job), "PP"); -+#endif ++ mutex_lock(&jctx->lock); ++ kbase_jd_kds_waiters_remove(katom); ++ mutex_unlock(&jctx->lock); + -+ MALI_DEBUG_PRINT(3, ("Mali PP scheduler: %s job %u (0x%08X) with %u parts queued.\n", -+ mali_pp_job_is_virtual(job) -+ ? "Virtual" : "Physical", -+ mali_pp_job_get_id(job), job, -+ mali_pp_job_get_sub_job_count(job))); ++ /* Release the kds resource or cancel if zapping */ ++ kds_resource_set_release_sync(&katom->kds_rset); ++ } ++#endif /* CONFIG_KDS */ + -+ return MALI_TRUE; /* job queued */ ++#ifdef CONFIG_MALI_DMA_FENCE ++ /* Flush dma-fence workqueue to ensure that any callbacks that may have ++ * been queued are done before continuing. ++ * Any successfully completed atom would have had all it's callbacks ++ * completed before the atom was run, so only flush for failed atoms. ++ */ ++ if (katom->event_code != BASE_JD_EVENT_DONE) ++ flush_workqueue(katom->kctx->dma_fence.wq); ++#endif /* CONFIG_MALI_DMA_FENCE */ +} + -+static void mali_scheduler_return_gp_job_to_user(struct mali_gp_job *job, -+ mali_bool success) ++static void kbase_jd_post_external_resources(struct kbase_jd_atom *katom) +{ -+ _mali_uk_gp_job_finished_s *jobres; -+ struct mali_session_data *session; -+ _mali_osk_notification_t *notification; -+ -+ MALI_DEBUG_ASSERT_POINTER(job); ++ KBASE_DEBUG_ASSERT(katom); ++ KBASE_DEBUG_ASSERT(katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES); + -+ session = mali_gp_job_get_session(job); -+ MALI_DEBUG_ASSERT_POINTER(session); ++#ifdef CONFIG_KDS ++ /* Prevent the KDS resource from triggering the atom in case of zapping */ ++ if (katom->kds_rset) ++ katom->kds_dep_satisfied = true; ++#endif /* CONFIG_KDS */ + -+ notification = mali_gp_job_get_finished_notification(job); -+ MALI_DEBUG_ASSERT_POINTER(notification); ++#ifdef CONFIG_MALI_DMA_FENCE ++ kbase_dma_fence_signal(katom); ++#endif /* CONFIG_MALI_DMA_FENCE */ + -+ jobres = notification->result_buffer; -+ MALI_DEBUG_ASSERT_POINTER(jobres); ++ kbase_gpu_vm_lock(katom->kctx); ++ /* only roll back if extres is non-NULL */ ++ if (katom->extres) { ++ u32 res_no; + -+ jobres->pending_big_job_num = mali_scheduler_job_gp_big_job_count(); ++ res_no = katom->nr_extres; ++ while (res_no-- > 0) { ++ struct kbase_mem_phy_alloc *alloc = katom->extres[res_no].alloc; ++ struct kbase_va_region *reg; + -+ jobres->user_job_ptr = mali_gp_job_get_user_id(job); -+ if (MALI_TRUE == success) { -+ jobres->status = _MALI_UK_JOB_STATUS_END_SUCCESS; -+ } else { -+ jobres->status = _MALI_UK_JOB_STATUS_END_UNKNOWN_ERR; ++ reg = kbase_region_tracker_find_region_base_address( ++ katom->kctx, ++ katom->extres[res_no].gpu_address); ++ kbase_unmap_external_resource(katom->kctx, reg, alloc); ++ } ++ kfree(katom->extres); ++ katom->extres = NULL; + } -+ jobres->heap_current_addr = mali_gp_job_get_current_heap_addr(job); -+ jobres->perf_counter0 = mali_gp_job_get_perf_counter_value0(job); -+ jobres->perf_counter1 = mali_gp_job_get_perf_counter_value1(job); -+ -+ mali_session_send_notification(session, notification); ++ kbase_gpu_vm_unlock(katom->kctx); +} + -+void mali_scheduler_return_pp_job_to_user(struct mali_pp_job *job, -+ u32 num_cores_in_virtual) -+{ -+ u32 i; -+ u32 num_counters_to_copy; -+ _mali_uk_pp_job_finished_s *jobres; -+ struct mali_session_data *session; -+ _mali_osk_notification_t *notification; ++/* ++ * Set up external resources needed by this job. ++ * ++ * jctx.lock must be held when this is called. ++ */ + -+ if (MALI_TRUE == mali_pp_job_use_no_notification(job)) { -+ return; -+ } ++static int kbase_jd_pre_external_resources(struct kbase_jd_atom *katom, const struct base_jd_atom_v2 *user_atom) ++{ ++ int err_ret_val = -EINVAL; ++ u32 res_no; ++#ifdef CONFIG_KDS ++ u32 kds_res_count = 0; ++ struct kds_resource **kds_resources = NULL; ++ unsigned long *kds_access_bitmap = NULL; ++#endif /* CONFIG_KDS */ ++#ifdef CONFIG_MALI_DMA_FENCE ++ struct kbase_dma_fence_resv_info info = { ++ .dma_fence_resv_count = 0, ++ }; ++#ifdef CONFIG_SYNC ++ /* ++ * When both dma-buf fence and Android native sync is enabled, we ++ * disable dma-buf fence for contexts that are using Android native ++ * fences. ++ */ ++ const bool implicit_sync = !kbase_ctx_flag(katom->kctx, ++ KCTX_NO_IMPLICIT_SYNC); ++#else /* CONFIG_SYNC */ ++ const bool implicit_sync = true; ++#endif /* CONFIG_SYNC */ ++#endif /* CONFIG_MALI_DMA_FENCE */ ++ struct base_external_resource *input_extres; + -+ MALI_DEBUG_ASSERT_POINTER(job); ++ KBASE_DEBUG_ASSERT(katom); ++ KBASE_DEBUG_ASSERT(katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES); + -+ session = mali_pp_job_get_session(job); -+ MALI_DEBUG_ASSERT_POINTER(session); ++ /* no resources encoded, early out */ ++ if (!katom->nr_extres) ++ return -EINVAL; + -+ notification = mali_pp_job_get_finished_notification(job); -+ MALI_DEBUG_ASSERT_POINTER(notification); ++ katom->extres = kmalloc_array(katom->nr_extres, sizeof(*katom->extres), GFP_KERNEL); ++ if (NULL == katom->extres) { ++ err_ret_val = -ENOMEM; ++ goto early_err_out; ++ } + -+ jobres = notification->result_buffer; -+ MALI_DEBUG_ASSERT_POINTER(jobres); ++ /* copy user buffer to the end of our real buffer. ++ * Make sure the struct sizes haven't changed in a way ++ * we don't support */ ++ BUILD_BUG_ON(sizeof(*input_extres) > sizeof(*katom->extres)); ++ input_extres = (struct base_external_resource *) ++ (((unsigned char *)katom->extres) + ++ (sizeof(*katom->extres) - sizeof(*input_extres)) * ++ katom->nr_extres); + -+ jobres->user_job_ptr = mali_pp_job_get_user_id(job); -+ if (MALI_TRUE == mali_pp_job_was_success(job)) { -+ jobres->status = _MALI_UK_JOB_STATUS_END_SUCCESS; -+ } else { -+ jobres->status = _MALI_UK_JOB_STATUS_END_UNKNOWN_ERR; ++ if (copy_from_user(input_extres, ++ get_compat_pointer(katom->kctx, &user_atom->extres_list), ++ sizeof(*input_extres) * katom->nr_extres) != 0) { ++ err_ret_val = -EINVAL; ++ goto early_err_out; + } ++#ifdef CONFIG_KDS ++ /* assume we have to wait for all */ ++ KBASE_DEBUG_ASSERT(0 != katom->nr_extres); ++ kds_resources = kmalloc_array(katom->nr_extres, sizeof(struct kds_resource *), GFP_KERNEL); + -+ if (mali_pp_job_is_virtual(job)) { -+ num_counters_to_copy = num_cores_in_virtual; -+ } else { -+ num_counters_to_copy = mali_pp_job_get_sub_job_count(job); ++ if (!kds_resources) { ++ err_ret_val = -ENOMEM; ++ goto early_err_out; + } + -+ for (i = 0; i < num_counters_to_copy; i++) { -+ jobres->perf_counter0[i] = -+ mali_pp_job_get_perf_counter_value0(job, i); -+ jobres->perf_counter1[i] = -+ mali_pp_job_get_perf_counter_value1(job, i); -+ jobres->perf_counter_src0 = -+ mali_pp_job_get_pp_counter_global_src0(); -+ jobres->perf_counter_src1 = -+ mali_pp_job_get_pp_counter_global_src1(); ++ KBASE_DEBUG_ASSERT(0 != katom->nr_extres); ++ kds_access_bitmap = kcalloc(BITS_TO_LONGS(katom->nr_extres), ++ sizeof(unsigned long), ++ GFP_KERNEL); ++ if (!kds_access_bitmap) { ++ err_ret_val = -ENOMEM; ++ goto early_err_out; + } ++#endif /* CONFIG_KDS */ + -+ mali_session_send_notification(session, notification); -+} ++#ifdef CONFIG_MALI_DMA_FENCE ++ if (implicit_sync) { ++ info.resv_objs = kmalloc_array(katom->nr_extres, ++ sizeof(struct reservation_object *), ++ GFP_KERNEL); ++ if (!info.resv_objs) { ++ err_ret_val = -ENOMEM; ++ goto early_err_out; ++ } + -+static void mali_scheduler_deferred_pp_job_delete(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); ++ info.dma_fence_excl_bitmap = ++ kcalloc(BITS_TO_LONGS(katom->nr_extres), ++ sizeof(unsigned long), GFP_KERNEL); ++ if (!info.dma_fence_excl_bitmap) { ++ err_ret_val = -ENOMEM; ++ goto early_err_out; ++ } ++ } ++#endif /* CONFIG_MALI_DMA_FENCE */ + -+ _mali_osk_spinlock_irq_lock(scheduler_pp_job_delete_lock); -+ mali_pp_job_list_addtail(job, &scheduler_pp_job_deletion_queue); -+ _mali_osk_spinlock_irq_unlock(scheduler_pp_job_delete_lock); ++ /* Take the processes mmap lock */ ++ down_read(¤t->mm->mmap_lock); + -+ _mali_osk_wq_schedule_work(scheduler_wq_pp_job_delete); -+} ++ /* need to keep the GPU VM locked while we set up UMM buffers */ ++ kbase_gpu_vm_lock(katom->kctx); ++ for (res_no = 0; res_no < katom->nr_extres; res_no++) { ++ struct base_external_resource *res; ++ struct kbase_va_region *reg; ++ struct kbase_mem_phy_alloc *alloc; ++ bool exclusive; + -+void mali_scheduler_do_pp_job_delete(void *arg) -+{ -+ _MALI_OSK_LIST_HEAD_STATIC_INIT(list); -+ struct mali_pp_job *job; -+ struct mali_pp_job *tmp; ++ res = &input_extres[res_no]; ++ exclusive = (res->ext_resource & BASE_EXT_RES_ACCESS_EXCLUSIVE) ++ ? true : false; ++ reg = kbase_region_tracker_find_region_enclosing_address( ++ katom->kctx, ++ res->ext_resource & ~BASE_EXT_RES_ACCESS_EXCLUSIVE); ++ /* did we find a matching region object? */ ++ if (NULL == reg || (reg->flags & KBASE_REG_FREE)) { ++ /* roll back */ ++ goto failed_loop; ++ } + -+ MALI_IGNORE(arg); ++ if (!(katom->core_req & BASE_JD_REQ_SOFT_JOB) && ++ (reg->flags & KBASE_REG_SECURE)) { ++ katom->atom_flags |= KBASE_KATOM_FLAG_PROTECTED; ++ } + -+ /* -+ * Quickly "unhook" the jobs pending to be deleted, so we can release -+ * the lock before we start deleting the job objects -+ * (without any locks held) -+ */ -+ _mali_osk_spinlock_irq_lock(scheduler_pp_job_delete_lock); -+ _mali_osk_list_move_list(&scheduler_pp_job_deletion_queue, &list); -+ _mali_osk_spinlock_irq_unlock(scheduler_pp_job_delete_lock); ++ alloc = kbase_map_external_resource(katom->kctx, reg, ++ current->mm ++#ifdef CONFIG_KDS ++ , &kds_res_count, kds_resources, ++ kds_access_bitmap, exclusive ++#endif ++ ); ++ if (!alloc) { ++ err_ret_val = -EINVAL; ++ goto failed_loop; ++ } + -+ _MALI_OSK_LIST_FOREACHENTRY(job, tmp, &list, -+ struct mali_pp_job, list) { -+ _mali_osk_list_delinit(&job->list); ++#ifdef CONFIG_MALI_DMA_FENCE ++ if (implicit_sync && ++ reg->gpu_alloc->type == KBASE_MEM_TYPE_IMPORTED_UMM) { ++ struct reservation_object *resv; + -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+ mali_dma_fence_context_term(&job->dma_fence_context); -+#endif ++ resv = reg->gpu_alloc->imported.umm.dma_buf->resv; ++ if (resv) ++ kbase_dma_fence_add_reservation(resv, &info, ++ exclusive); ++ } ++#endif /* CONFIG_MALI_DMA_FENCE */ + -+ mali_pp_job_delete(job); /* delete the job object itself */ ++ /* finish with updating out array with the data we found */ ++ /* NOTE: It is important that this is the last thing we do (or ++ * at least not before the first write) as we overwrite elements ++ * as we loop and could be overwriting ourself, so no writes ++ * until the last read for an element. ++ * */ ++ katom->extres[res_no].gpu_address = reg->start_pfn << PAGE_SHIFT; /* save the start_pfn (as an address, not pfn) to use fast lookup later */ ++ katom->extres[res_no].alloc = alloc; + } -+} -+ -+#if defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) ++ /* successfully parsed the extres array */ ++ /* drop the vm lock before we call into kds */ ++ kbase_gpu_vm_unlock(katom->kctx); + -+static void mali_scheduler_deferred_pp_job_queue(struct mali_pp_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); ++ /* Release the processes mmap lock */ ++ up_read(¤t->mm->mmap_lock); + -+ _mali_osk_spinlock_irq_lock(scheduler_pp_job_queue_lock); -+ mali_pp_job_list_addtail(job, &scheduler_pp_job_queue_list); -+ _mali_osk_spinlock_irq_unlock(scheduler_pp_job_queue_lock); ++#ifdef CONFIG_KDS ++ if (kds_res_count) { ++ int wait_failed; + -+ _mali_osk_wq_schedule_work(scheduler_wq_pp_job_queue); -+} ++ /* We have resources to wait for with kds */ ++ katom->kds_dep_satisfied = false; + -+static void mali_scheduler_do_pp_job_queue(void *arg) -+{ -+ _MALI_OSK_LIST_HEAD_STATIC_INIT(list); -+ struct mali_pp_job *job; -+ struct mali_pp_job *tmp; -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; ++ wait_failed = kds_async_waitall(&katom->kds_rset, ++ &katom->kctx->jctx.kds_cb, katom, NULL, ++ kds_res_count, kds_access_bitmap, ++ kds_resources); + -+ MALI_IGNORE(arg); ++ if (wait_failed) ++ goto failed_kds_setup; ++ else ++ kbase_jd_kds_waiters_add(katom); ++ } else { ++ /* Nothing to wait for, so kds dep met */ ++ katom->kds_dep_satisfied = true; ++ } ++ kfree(kds_resources); ++ kfree(kds_access_bitmap); ++#endif /* CONFIG_KDS */ + -+ /* -+ * Quickly "unhook" the jobs pending to be queued, so we can release -+ * the lock before we start queueing the job objects -+ * (without any locks held) -+ */ -+ _mali_osk_spinlock_irq_lock(scheduler_pp_job_queue_lock); -+ _mali_osk_list_move_list(&scheduler_pp_job_queue_list, &list); -+ _mali_osk_spinlock_irq_unlock(scheduler_pp_job_queue_lock); ++#ifdef CONFIG_MALI_DMA_FENCE ++ if (implicit_sync) { ++ if (info.dma_fence_resv_count) { ++ int ret; + -+ /* First loop through all jobs and do the pre-work (no locks needed) */ -+ _MALI_OSK_LIST_FOREACHENTRY(job, tmp, &list, -+ struct mali_pp_job, list) { -+ if (mali_pp_job_needs_dma_buf_mapping(job)) { -+ /* -+ * This operation could fail, but we continue anyway, -+ * because the worst that could happen is that this -+ * job will fail due to a Mali page fault. -+ */ -+ mali_dma_buf_map_job(job); ++ ret = kbase_dma_fence_wait(katom, &info); ++ if (ret < 0) ++ goto failed_dma_fence_setup; + } -+ } + -+ mali_scheduler_lock(); ++ kfree(info.resv_objs); ++ kfree(info.dma_fence_excl_bitmap); ++ } ++#endif /* CONFIG_MALI_DMA_FENCE */ + -+ /* Then loop through all jobs again to queue them (lock needed) */ -+ _MALI_OSK_LIST_FOREACHENTRY(job, tmp, &list, -+ struct mali_pp_job, list) { ++ /* all done OK */ ++ return 0; + -+ /* Remove from scheduler_pp_job_queue_list before queueing */ -+ mali_pp_job_list_remove(job); ++/* error handling section */ + -+ if (mali_scheduler_queue_pp_job(job)) { -+ /* Job queued successfully */ -+ schedule_mask |= MALI_SCHEDULER_MASK_PP; -+ } else { -+ /* Failed to enqueue job, release job (with error) */ -+ mali_pp_job_fb_lookup_remove(job); -+ mali_pp_job_mark_unstarted_failed(job); ++#ifdef CONFIG_MALI_DMA_FENCE ++failed_dma_fence_setup: ++#ifdef CONFIG_KDS ++ /* If we are here, dma_fence setup failed but KDS didn't. ++ * Revert KDS setup if any. ++ */ ++ if (kds_res_count) { ++ mutex_unlock(&katom->kctx->jctx.lock); ++ kds_resource_set_release_sync(&katom->kds_rset); ++ mutex_lock(&katom->kctx->jctx.lock); + -+ /* unlock scheduler in this uncommon case */ -+ mali_scheduler_unlock(); ++ kbase_jd_kds_waiters_remove(katom); ++ katom->kds_dep_satisfied = true; ++ } ++#endif /* CONFIG_KDS */ ++#endif /* CONFIG_MALI_DMA_FENCE */ ++#ifdef CONFIG_KDS ++failed_kds_setup: ++#endif ++#if defined(CONFIG_KDS) || defined(CONFIG_MALI_DMA_FENCE) ++ /* Lock the processes mmap lock */ ++ down_read(¤t->mm->mmap_lock); + -+ schedule_mask |= mali_timeline_tracker_release( -+ mali_pp_job_get_tracker(job)); ++ /* lock before we unmap */ ++ kbase_gpu_vm_lock(katom->kctx); ++#endif + -+ /* Notify user space and close the job object */ -+ mali_scheduler_complete_pp_job(job, 0, MALI_TRUE, -+ MALI_FALSE); ++ failed_loop: ++ /* undo the loop work */ ++ while (res_no-- > 0) { ++ struct kbase_mem_phy_alloc *alloc = katom->extres[res_no].alloc; + -+ mali_scheduler_lock(); -+ } ++ kbase_unmap_external_resource(katom->kctx, NULL, alloc); + } ++ kbase_gpu_vm_unlock(katom->kctx); + -+ mali_scheduler_unlock(); ++ /* Release the processes mmap lock */ ++ up_read(¤t->mm->mmap_lock); + -+ /* Trigger scheduling of jobs */ -+ mali_executor_schedule_from_mask(schedule_mask, MALI_FALSE); ++ early_err_out: ++ kfree(katom->extres); ++ katom->extres = NULL; ++#ifdef CONFIG_KDS ++ kfree(kds_resources); ++ kfree(kds_access_bitmap); ++#endif /* CONFIG_KDS */ ++#ifdef CONFIG_MALI_DMA_FENCE ++ if (implicit_sync) { ++ kfree(info.resv_objs); ++ kfree(info.dma_fence_excl_bitmap); ++ } ++#endif ++ return err_ret_val; +} + -+#endif /* defined(MALI_SCHEDULER_USE_DEFERRED_PP_JOB_QUEUE) */ -+ -+void mali_scheduler_gp_pp_job_queue_print(void) ++static inline void jd_resolve_dep(struct list_head *out_list, ++ struct kbase_jd_atom *katom, ++ u8 d, bool ctx_is_dying) +{ -+ struct mali_gp_job *gp_job = NULL; -+ struct mali_gp_job *tmp_gp_job = NULL; -+ struct mali_pp_job *pp_job = NULL; -+ struct mali_pp_job *tmp_pp_job = NULL; ++ u8 other_d = !d; + -+ MALI_DEBUG_ASSERT_LOCK_HELD(mali_scheduler_lock_obj); -+ MALI_DEBUG_ASSERT_LOCK_HELD(mali_executor_lock_obj); ++ while (!list_empty(&katom->dep_head[d])) { ++ struct kbase_jd_atom *dep_atom; ++ struct kbase_jd_atom *other_dep_atom; ++ u8 dep_type; + -+ /* dump job queup status */ -+ if ((0 == job_queue_gp.depth) && (0 == job_queue_pp.depth)) { -+ MALI_PRINT(("No GP&PP job in the job queue.\n")); -+ return; -+ } ++ dep_atom = list_entry(katom->dep_head[d].next, ++ struct kbase_jd_atom, dep_item[d]); ++ list_del(katom->dep_head[d].next); + -+ MALI_PRINT(("Total (%d) GP job in the job queue.\n", job_queue_gp.depth)); -+ if (job_queue_gp.depth > 0) { -+ if (!_mali_osk_list_empty(&job_queue_gp.high_pri)) { -+ _MALI_OSK_LIST_FOREACHENTRY(gp_job, tmp_gp_job, &job_queue_gp.high_pri, -+ struct mali_gp_job, list) { -+ MALI_PRINT(("GP job(%p) id = %d tid = %d pid = %d in the gp job high_pri queue\n", gp_job, gp_job->id, gp_job->tid, gp_job->pid)); -+ } -+ } ++ dep_type = kbase_jd_katom_dep_type(&dep_atom->dep[d]); ++ kbase_jd_katom_dep_clear(&dep_atom->dep[d]); + -+ if (!_mali_osk_list_empty(&job_queue_gp.normal_pri)) { -+ _MALI_OSK_LIST_FOREACHENTRY(gp_job, tmp_gp_job, &job_queue_gp.normal_pri, -+ struct mali_gp_job, list) { -+ MALI_PRINT(("GP job(%p) id = %d tid = %d pid = %d in the gp job normal_pri queue\n", gp_job, gp_job->id, gp_job->tid, gp_job->pid)); ++ if (katom->event_code != BASE_JD_EVENT_DONE && ++ (dep_type != BASE_JD_DEP_TYPE_ORDER)) { ++#ifdef CONFIG_KDS ++ if (!dep_atom->kds_dep_satisfied) { ++ /* Just set kds_dep_satisfied to true. If the callback happens after this then it will early out and ++ * do nothing. If the callback doesn't happen then kbase_jd_post_external_resources will clean up ++ */ ++ dep_atom->kds_dep_satisfied = true; + } -+ } -+ } ++#endif + -+ MALI_PRINT(("Total (%d) PP job in the job queue.\n", job_queue_pp.depth)); -+ if (job_queue_pp.depth > 0) { -+ if (!_mali_osk_list_empty(&job_queue_pp.high_pri)) { -+ _MALI_OSK_LIST_FOREACHENTRY(pp_job, tmp_pp_job, &job_queue_pp.high_pri, -+ struct mali_pp_job, list) { -+ if (mali_pp_job_is_virtual(pp_job)) { -+ MALI_PRINT(("PP Virtual job(%p) id = %d tid = %d pid = %d in the pp job high_pri queue\n", pp_job, pp_job->id, pp_job->tid, pp_job->pid)); -+ } else { -+ MALI_PRINT(("PP Physical job(%p) id = %d tid = %d pid = %d in the pp job high_pri queue\n", pp_job, pp_job->id, pp_job->tid, pp_job->pid)); -+ } ++#ifdef CONFIG_MALI_DMA_FENCE ++ kbase_dma_fence_cancel_callbacks(dep_atom); ++#endif ++ ++ dep_atom->event_code = katom->event_code; ++ KBASE_DEBUG_ASSERT(dep_atom->status != ++ KBASE_JD_ATOM_STATE_UNUSED); ++ ++ if ((dep_atom->core_req & BASE_JD_REQ_SOFT_REPLAY) ++ != BASE_JD_REQ_SOFT_REPLAY) { ++ dep_atom->will_fail_event_code = ++ dep_atom->event_code; ++ } else { ++ dep_atom->status = ++ KBASE_JD_ATOM_STATE_COMPLETED; + } + } ++ other_dep_atom = (struct kbase_jd_atom *) ++ kbase_jd_katom_dep_atom(&dep_atom->dep[other_d]); + -+ if (!_mali_osk_list_empty(&job_queue_pp.normal_pri)) { -+ _MALI_OSK_LIST_FOREACHENTRY(pp_job, tmp_pp_job, &job_queue_pp.normal_pri, -+ struct mali_pp_job, list) { -+ if (mali_pp_job_is_virtual(pp_job)) { -+ MALI_PRINT(("PP Virtual job(%p) id = %d tid = %d pid = %d in the pp job normal_pri queue\n", pp_job, pp_job->id, pp_job->tid, pp_job->pid)); -+ } else { -+ MALI_PRINT(("PP Physical job(%p) id = %d tid = %d pid = %d in the pp job normal_pri queue\n", pp_job, pp_job->id, pp_job->tid, pp_job->pid)); -+ } ++ if (!dep_atom->in_jd_list && (!other_dep_atom || ++ (IS_GPU_ATOM(dep_atom) && !ctx_is_dying && ++ !dep_atom->will_fail_event_code && ++ !other_dep_atom->will_fail_event_code))) { ++ bool dep_satisfied = true; ++#ifdef CONFIG_MALI_DMA_FENCE ++ int dep_count; ++ ++ dep_count = kbase_fence_dep_count_read(dep_atom); ++ if (likely(dep_count == -1)) { ++ dep_satisfied = true; ++ } else { ++ /* ++ * There are either still active callbacks, or ++ * all fences for this @dep_atom has signaled, ++ * but the worker that will queue the atom has ++ * not yet run. ++ * ++ * Wait for the fences to signal and the fence ++ * worker to run and handle @dep_atom. If ++ * @dep_atom was completed due to error on ++ * @katom, then the fence worker will pick up ++ * the complete status and error code set on ++ * @dep_atom above. ++ */ ++ dep_satisfied = false; ++ } ++#endif /* CONFIG_MALI_DMA_FENCE */ ++ ++#ifdef CONFIG_KDS ++ dep_satisfied = dep_satisfied && dep_atom->kds_dep_satisfied; ++#endif ++ ++ if (dep_satisfied) { ++ dep_atom->in_jd_list = true; ++ list_add_tail(&dep_atom->jd_item, out_list); + } + } + } -+ -+ /* dump group running job status */ -+ mali_executor_running_status_print(); +} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h -new file mode 100755 -index 000000000000..de81a421ea9a ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h -@@ -0,0 +1,131 @@ -+/* -+ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef __MALI_SCHEDULER_H__ -+#define __MALI_SCHEDULER_H__ + -+#include "mali_osk.h" -+#include "mali_osk_list.h" -+#include "mali_scheduler_types.h" -+#include "mali_session.h" ++KBASE_EXPORT_TEST_API(jd_resolve_dep); + -+struct mali_scheduler_job_queue { -+ _MALI_OSK_LIST_HEAD(normal_pri); /* Queued jobs with normal priority */ -+ _MALI_OSK_LIST_HEAD(high_pri); /* Queued jobs with high priority */ -+ u32 depth; /* Depth of combined queues. */ -+ u32 big_job_num; -+}; ++#if MALI_CUSTOMER_RELEASE == 0 ++static void jd_force_failure(struct kbase_device *kbdev, struct kbase_jd_atom *katom) ++{ ++ kbdev->force_replay_count++; + -+extern _mali_osk_spinlock_irq_t *mali_scheduler_lock_obj; ++ if (kbdev->force_replay_count >= kbdev->force_replay_limit) { ++ kbdev->force_replay_count = 0; ++ katom->event_code = BASE_JD_EVENT_FORCE_REPLAY; + -+/* Queue of jobs to be executed on the GP group */ -+extern struct mali_scheduler_job_queue job_queue_gp; ++ if (kbdev->force_replay_random) ++ kbdev->force_replay_limit = ++ (prandom_u32() % KBASEP_FORCE_REPLAY_RANDOM_LIMIT) + 1; + -+/* Queue of PP jobs */ -+extern struct mali_scheduler_job_queue job_queue_pp; ++ dev_info(kbdev->dev, "force_replay : promoting to error\n"); ++ } ++} + -+extern _mali_osk_atomic_t mali_job_id_autonumber; -+extern _mali_osk_atomic_t mali_job_cache_order_autonumber; ++/** Test to see if atom should be forced to fail. ++ * ++ * This function will check if an atom has a replay job as a dependent. If so ++ * then it will be considered for forced failure. */ ++static void jd_check_force_failure(struct kbase_jd_atom *katom) ++{ ++ struct kbase_context *kctx = katom->kctx; ++ struct kbase_device *kbdev = kctx->kbdev; ++ int i; + -+#define MALI_DEBUG_ASSERT_SCHEDULER_LOCK_HELD() MALI_DEBUG_ASSERT_LOCK_HELD(mali_scheduler_lock_obj); ++ if ((kbdev->force_replay_limit == KBASEP_FORCE_REPLAY_DISABLED) || ++ (katom->core_req & BASEP_JD_REQ_EVENT_NEVER)) ++ return; + -+_mali_osk_errcode_t mali_scheduler_initialize(void); -+void mali_scheduler_terminate(void); ++ for (i = 1; i < BASE_JD_ATOM_COUNT; i++) { ++ if (kbase_jd_katom_dep_atom(&kctx->jctx.atoms[i].dep[0]) == katom || ++ kbase_jd_katom_dep_atom(&kctx->jctx.atoms[i].dep[1]) == katom) { ++ struct kbase_jd_atom *dep_atom = &kctx->jctx.atoms[i]; + -+MALI_STATIC_INLINE void mali_scheduler_lock(void) -+{ -+ _mali_osk_spinlock_irq_lock(mali_scheduler_lock_obj); -+ MALI_DEBUG_PRINT(5, ("Mali scheduler: scheduler lock taken.\n")); ++ if ((dep_atom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) == ++ BASE_JD_REQ_SOFT_REPLAY && ++ (dep_atom->core_req & kbdev->force_replay_core_req) ++ == kbdev->force_replay_core_req) { ++ jd_force_failure(kbdev, katom); ++ return; ++ } ++ } ++ } +} ++#endif + -+MALI_STATIC_INLINE void mali_scheduler_unlock(void) ++/** ++ * is_dep_valid - Validate that a dependency is valid for early dependency ++ * submission ++ * @katom: Dependency atom to validate ++ * ++ * A dependency is valid if any of the following are true : ++ * - It does not exist (a non-existent dependency does not block submission) ++ * - It is in the job scheduler ++ * - It has completed, does not have a failure event code, and has not been ++ * marked to fail in the future ++ * ++ * Return: true if valid, false otherwise ++ */ ++static bool is_dep_valid(struct kbase_jd_atom *katom) +{ -+ MALI_DEBUG_PRINT(5, ("Mali scheduler: Releasing scheduler lock.\n")); -+ _mali_osk_spinlock_irq_unlock(mali_scheduler_lock_obj); -+} ++ /* If there's no dependency then this is 'valid' from the perspective of ++ * early dependency submission */ ++ if (!katom) ++ return true; + -+MALI_STATIC_INLINE u32 mali_scheduler_job_gp_count(void) -+{ -+ return job_queue_gp.depth; ++ /* Dependency must have reached the job scheduler */ ++ if (katom->status < KBASE_JD_ATOM_STATE_IN_JS) ++ return false; ++ ++ /* If dependency has completed and has failed or will fail then it is ++ * not valid */ ++ if (katom->status >= KBASE_JD_ATOM_STATE_HW_COMPLETED && ++ (katom->event_code != BASE_JD_EVENT_DONE || ++ katom->will_fail_event_code)) ++ return false; ++ ++ return true; +} -+MALI_STATIC_INLINE u32 mali_scheduler_job_gp_big_job_count(void) ++ ++static void jd_try_submitting_deps(struct list_head *out_list, ++ struct kbase_jd_atom *node) +{ -+ return job_queue_gp.big_job_num; -+} ++ int i; + -+u32 mali_scheduler_job_physical_head_count(mali_bool gpu_mode_is_secure); ++ for (i = 0; i < 2; i++) { ++ struct list_head *pos; + -+mali_bool mali_scheduler_job_next_is_virtual(void); -+struct mali_pp_job *mali_scheduler_job_pp_next(void); ++ list_for_each(pos, &node->dep_head[i]) { ++ struct kbase_jd_atom *dep_atom = list_entry(pos, ++ struct kbase_jd_atom, dep_item[i]); + -+struct mali_gp_job *mali_scheduler_job_gp_get(void); -+struct mali_pp_job *mali_scheduler_job_pp_physical_peek(void); -+struct mali_pp_job *mali_scheduler_job_pp_virtual_peek(void); -+struct mali_pp_job *mali_scheduler_job_pp_physical_get(u32 *sub_job); -+struct mali_pp_job *mali_scheduler_job_pp_virtual_get(void); ++ if (IS_GPU_ATOM(dep_atom) && !dep_atom->in_jd_list) { ++ /*Check if atom deps look sane*/ ++ bool dep0_valid = is_dep_valid( ++ dep_atom->dep[0].atom); ++ bool dep1_valid = is_dep_valid( ++ dep_atom->dep[1].atom); ++ bool dep_satisfied = true; ++#ifdef CONFIG_MALI_DMA_FENCE ++ int dep_count; + -+MALI_STATIC_INLINE u32 mali_scheduler_get_new_id(void) -+{ -+ return _mali_osk_atomic_inc_return(&mali_job_id_autonumber); -+} ++ dep_count = kbase_fence_dep_count_read( ++ dep_atom); ++ if (likely(dep_count == -1)) { ++ dep_satisfied = true; ++ } else { ++ /* ++ * There are either still active callbacks, or ++ * all fences for this @dep_atom has signaled, ++ * but the worker that will queue the atom has ++ * not yet run. ++ * ++ * Wait for the fences to signal and the fence ++ * worker to run and handle @dep_atom. If ++ * @dep_atom was completed due to error on ++ * @katom, then the fence worker will pick up ++ * the complete status and error code set on ++ * @dep_atom above. ++ */ ++ dep_satisfied = false; ++ } ++#endif /* CONFIG_MALI_DMA_FENCE */ ++#ifdef CONFIG_KDS ++ dep_satisfied = dep_satisfied && ++ dep_atom->kds_dep_satisfied; ++#endif + -+MALI_STATIC_INLINE u32 mali_scheduler_get_new_cache_order(void) -+{ -+ return _mali_osk_atomic_inc_return(&mali_job_cache_order_autonumber); ++ if (dep0_valid && dep1_valid && dep_satisfied) { ++ dep_atom->in_jd_list = true; ++ list_add(&dep_atom->jd_item, out_list); ++ } ++ } ++ } ++ } +} + -+/** -+ * @brief Used by the Timeline system to queue a GP job. -+ * -+ * @note @ref mali_executor_schedule_from_mask() should be called if this -+ * function returns non-zero. -+ * -+ * @param job The GP job that is being activated. -+ * -+ * @return A scheduling bitmask that can be used to decide if scheduling is -+ * necessary after this call. -+ */ -+mali_scheduler_mask mali_scheduler_activate_gp_job(struct mali_gp_job *job); -+ -+/** -+ * @brief Used by the Timeline system to queue a PP job. -+ * -+ * @note @ref mali_executor_schedule_from_mask() should be called if this -+ * function returns non-zero. ++/* ++ * Perform the necessary handling of an atom that has finished running ++ * on the GPU. + * -+ * @param job The PP job that is being activated. ++ * Note that if this is a soft-job that has had kbase_prepare_soft_job called on it then the caller ++ * is responsible for calling kbase_finish_soft_job *before* calling this function. + * -+ * @return A scheduling bitmask that can be used to decide if scheduling is -+ * necessary after this call. ++ * The caller must hold the kbase_jd_context.lock. + */ -+mali_scheduler_mask mali_scheduler_activate_pp_job(struct mali_pp_job *job); ++bool jd_done_nolock(struct kbase_jd_atom *katom, ++ struct list_head *completed_jobs_ctx) ++{ ++ struct kbase_context *kctx = katom->kctx; ++ struct kbase_device *kbdev = kctx->kbdev; ++ struct list_head completed_jobs; ++ struct list_head runnable_jobs; ++ bool need_to_try_schedule_context = false; ++ int i; + -+void mali_scheduler_complete_gp_job(struct mali_gp_job *job, -+ mali_bool success, -+ mali_bool user_notification, -+ mali_bool dequeued); ++ INIT_LIST_HEAD(&completed_jobs); ++ INIT_LIST_HEAD(&runnable_jobs); + -+void mali_scheduler_complete_pp_job(struct mali_pp_job *job, -+ u32 num_cores_in_virtual, -+ mali_bool user_notification, -+ mali_bool dequeued); ++ KBASE_DEBUG_ASSERT(katom->status != KBASE_JD_ATOM_STATE_UNUSED); + -+void mali_scheduler_abort_session(struct mali_session_data *session); ++#if MALI_CUSTOMER_RELEASE == 0 ++ jd_check_force_failure(katom); ++#endif + -+void mali_scheduler_return_pp_job_to_user(struct mali_pp_job *job, -+ u32 num_cores_in_virtual); ++ /* This is needed in case an atom is failed due to being invalid, this ++ * can happen *before* the jobs that the atom depends on have completed */ ++ for (i = 0; i < 2; i++) { ++ if (kbase_jd_katom_dep_atom(&katom->dep[i])) { ++ list_del(&katom->dep_item[i]); ++ kbase_jd_katom_dep_clear(&katom->dep[i]); ++ } ++ } + -+#if MALI_STATE_TRACKING -+u32 mali_scheduler_dump_state(char *buf, u32 size); -+#endif ++ /* With PRLAM-10817 or PRLAM-10959 the last tile of a fragment job being soft-stopped can fail with ++ * BASE_JD_EVENT_TILE_RANGE_FAULT. ++ * ++ * So here if the fragment job failed with TILE_RANGE_FAULT and it has been soft-stopped, then we promote the ++ * error code to BASE_JD_EVENT_DONE ++ */ + -+void mali_scheduler_gp_pp_job_queue_print(void); ++ if ((kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10817) || kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10959)) && ++ katom->event_code == BASE_JD_EVENT_TILE_RANGE_FAULT) { ++ if ((katom->core_req & BASE_JD_REQ_FS) && (katom->atom_flags & KBASE_KATOM_FLAG_BEEN_SOFT_STOPPPED)) { ++ /* Promote the failure to job done */ ++ katom->event_code = BASE_JD_EVENT_DONE; ++ katom->atom_flags = katom->atom_flags & (~KBASE_KATOM_FLAG_BEEN_SOFT_STOPPPED); ++ } ++ } + -+#endif /* __MALI_SCHEDULER_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h b/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h -new file mode 100755 -index 000000000000..ba1d71d01d46 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h -@@ -0,0 +1,29 @@ -+/* -+ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ katom->status = KBASE_JD_ATOM_STATE_COMPLETED; ++ list_add_tail(&katom->jd_item, &completed_jobs); + -+#ifndef __MALI_SCHEDULER_TYPES_H__ -+#define __MALI_SCHEDULER_TYPES_H__ ++ while (!list_empty(&completed_jobs)) { ++ katom = list_entry(completed_jobs.prev, struct kbase_jd_atom, jd_item); ++ list_del(completed_jobs.prev); ++ KBASE_DEBUG_ASSERT(katom->status == KBASE_JD_ATOM_STATE_COMPLETED); + -+#include "mali_osk.h" ++ for (i = 0; i < 2; i++) ++ jd_resolve_dep(&runnable_jobs, katom, i, ++ kbase_ctx_flag(kctx, KCTX_DYING)); + -+#define MALI_SCHEDULER_JOB_ID_SPAN 65535 ++ if (katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) ++ kbase_jd_post_external_resources(katom); + -+/** -+ * Bitmask used for defered scheduling of subsystems. -+ */ -+typedef u32 mali_scheduler_mask; ++ while (!list_empty(&runnable_jobs)) { ++ struct kbase_jd_atom *node; + -+#define MALI_SCHEDULER_MASK_GP (1<<0) -+#define MALI_SCHEDULER_MASK_PP (1<<1) ++ node = list_entry(runnable_jobs.next, ++ struct kbase_jd_atom, jd_item); ++ list_del(runnable_jobs.next); ++ node->in_jd_list = false; + -+#define MALI_SCHEDULER_MASK_EMPTY 0 -+#define MALI_SCHEDULER_MASK_ALL (MALI_SCHEDULER_MASK_GP | MALI_SCHEDULER_MASK_PP) ++ KBASE_DEBUG_ASSERT(node->status != KBASE_JD_ATOM_STATE_UNUSED); + -+#endif /* __MALI_SCHEDULER_TYPES_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_session.c b/drivers/gpu/arm/mali400/mali/common/mali_session.c -new file mode 100755 -index 000000000000..7504fb108779 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_session.c -@@ -0,0 +1,155 @@ -+/* -+ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ if (node->status != KBASE_JD_ATOM_STATE_COMPLETED && ++ !kbase_ctx_flag(kctx, KCTX_DYING)) { ++ need_to_try_schedule_context |= jd_run_atom(node); ++ } else { ++ node->event_code = katom->event_code; + -+#include "mali_osk.h" -+#include "mali_osk_list.h" -+#include "mali_session.h" -+#include "mali_ukk.h" -+#ifdef MALI_MEM_SWAP_TRACKING -+#include "mali_memory_swap_alloc.h" -+#endif ++ if ((node->core_req & ++ BASE_JD_REQ_SOFT_JOB_TYPE) == ++ BASE_JD_REQ_SOFT_REPLAY) { ++ if (kbase_replay_process(node)) ++ /* Don't complete this atom */ ++ continue; ++ } else if (node->core_req & ++ BASE_JD_REQ_SOFT_JOB) { ++ /* If this is a fence wait soft job ++ * then remove it from the list of sync ++ * waiters. ++ */ ++ if (BASE_JD_REQ_SOFT_FENCE_WAIT == node->core_req) ++ kbasep_remove_waiting_soft_job(node); + -+_MALI_OSK_LIST_HEAD(mali_sessions); -+static u32 mali_session_count = 0; ++ kbase_finish_soft_job(node); ++ } ++ node->status = KBASE_JD_ATOM_STATE_COMPLETED; ++ } + -+_mali_osk_spinlock_irq_t *mali_sessions_lock = NULL; -+wait_queue_head_t pending_queue; ++ if (node->status == KBASE_JD_ATOM_STATE_COMPLETED) { ++ list_add_tail(&node->jd_item, &completed_jobs); ++ } else if (node->status == KBASE_JD_ATOM_STATE_IN_JS && ++ !node->will_fail_event_code) { ++ /* Node successfully submitted, try submitting ++ * dependencies as they may now be representable ++ * in JS */ ++ jd_try_submitting_deps(&runnable_jobs, node); ++ } ++ } + -+_mali_osk_errcode_t mali_session_initialize(void) -+{ -+ _MALI_OSK_INIT_LIST_HEAD(&mali_sessions); -+ /* init wait queue for big varying job */ -+ init_waitqueue_head(&pending_queue); ++ /* Register a completed job as a disjoint event when the GPU ++ * is in a disjoint state (ie. being reset or replaying jobs). ++ */ ++ kbase_disjoint_event_potential(kctx->kbdev); ++ if (completed_jobs_ctx) ++ list_add_tail(&katom->jd_item, completed_jobs_ctx); ++ else ++ kbase_event_post(kctx, katom); + -+ mali_sessions_lock = _mali_osk_spinlock_irq_init( -+ _MALI_OSK_LOCKFLAG_ORDERED, -+ _MALI_OSK_LOCK_ORDER_SESSIONS); -+ if (NULL == mali_sessions_lock) { -+ return _MALI_OSK_ERR_NOMEM; ++ /* Decrement and check the TOTAL number of jobs. This includes ++ * those not tracked by the scheduler: 'not ready to run' and ++ * 'dependency-only' jobs. */ ++ if (--kctx->jctx.job_nr == 0) ++ wake_up(&kctx->jctx.zero_jobs_wait); /* All events are safely queued now, and we can signal any waiter ++ * that we've got no more jobs (so we can be safely terminated) */ + } + -+ return _MALI_OSK_ERR_OK; ++ return need_to_try_schedule_context; +} + -+void mali_session_terminate(void) ++KBASE_EXPORT_TEST_API(jd_done_nolock); ++ ++#ifdef CONFIG_GPU_TRACEPOINTS ++enum { ++ CORE_REQ_DEP_ONLY, ++ CORE_REQ_SOFT, ++ CORE_REQ_COMPUTE, ++ CORE_REQ_FRAGMENT, ++ CORE_REQ_VERTEX, ++ CORE_REQ_TILER, ++ CORE_REQ_FRAGMENT_VERTEX, ++ CORE_REQ_FRAGMENT_VERTEX_TILER, ++ CORE_REQ_FRAGMENT_TILER, ++ CORE_REQ_VERTEX_TILER, ++ CORE_REQ_UNKNOWN ++}; ++static const char * const core_req_strings[] = { ++ "Dependency Only Job", ++ "Soft Job", ++ "Compute Shader Job", ++ "Fragment Shader Job", ++ "Vertex/Geometry Shader Job", ++ "Tiler Job", ++ "Fragment Shader + Vertex/Geometry Shader Job", ++ "Fragment Shader + Vertex/Geometry Shader Job + Tiler Job", ++ "Fragment Shader + Tiler Job", ++ "Vertex/Geometry Shader Job + Tiler Job", ++ "Unknown Job" ++}; ++static const char *kbasep_map_core_reqs_to_string(base_jd_core_req core_req) +{ -+ if (NULL != mali_sessions_lock) { -+ _mali_osk_spinlock_irq_term(mali_sessions_lock); -+ mali_sessions_lock = NULL; ++ if (core_req & BASE_JD_REQ_SOFT_JOB) ++ return core_req_strings[CORE_REQ_SOFT]; ++ if (core_req & BASE_JD_REQ_ONLY_COMPUTE) ++ return core_req_strings[CORE_REQ_COMPUTE]; ++ switch (core_req & (BASE_JD_REQ_FS | BASE_JD_REQ_CS | BASE_JD_REQ_T)) { ++ case BASE_JD_REQ_DEP: ++ return core_req_strings[CORE_REQ_DEP_ONLY]; ++ case BASE_JD_REQ_FS: ++ return core_req_strings[CORE_REQ_FRAGMENT]; ++ case BASE_JD_REQ_CS: ++ return core_req_strings[CORE_REQ_VERTEX]; ++ case BASE_JD_REQ_T: ++ return core_req_strings[CORE_REQ_TILER]; ++ case (BASE_JD_REQ_FS | BASE_JD_REQ_CS): ++ return core_req_strings[CORE_REQ_FRAGMENT_VERTEX]; ++ case (BASE_JD_REQ_FS | BASE_JD_REQ_T): ++ return core_req_strings[CORE_REQ_FRAGMENT_TILER]; ++ case (BASE_JD_REQ_CS | BASE_JD_REQ_T): ++ return core_req_strings[CORE_REQ_VERTEX_TILER]; ++ case (BASE_JD_REQ_FS | BASE_JD_REQ_CS | BASE_JD_REQ_T): ++ return core_req_strings[CORE_REQ_FRAGMENT_VERTEX_TILER]; + } ++ return core_req_strings[CORE_REQ_UNKNOWN]; +} ++#endif + -+void mali_session_add(struct mali_session_data *session) ++bool jd_submit_atom(struct kbase_context *kctx, const struct base_jd_atom_v2 *user_atom, struct kbase_jd_atom *katom) +{ -+ mali_session_lock(); -+ _mali_osk_list_add(&session->link, &mali_sessions); -+ mali_session_count++; -+ mali_session_unlock(); -+} ++ struct kbase_jd_context *jctx = &kctx->jctx; ++ int queued = 0; ++ int i; ++ int sched_prio; ++ bool ret; ++ bool will_fail = false; + -+void mali_session_remove(struct mali_session_data *session) -+{ -+ mali_session_lock(); -+ _mali_osk_list_delinit(&session->link); -+ mali_session_count--; -+ mali_session_unlock(); -+} ++ /* Update the TOTAL number of jobs. This includes those not tracked by ++ * the scheduler: 'not ready to run' and 'dependency-only' jobs. */ ++ jctx->job_nr++; + -+u32 mali_session_get_count(void) -+{ -+ return mali_session_count; -+} ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++ katom->start_timestamp.tv64 = 0; ++#else ++ katom->start_timestamp = 0; ++#endif ++ katom->udata = user_atom->udata; ++ katom->kctx = kctx; ++ katom->nr_extres = user_atom->nr_extres; ++ katom->extres = NULL; ++ katom->device_nr = user_atom->device_nr; ++ katom->affinity = 0; ++ katom->jc = user_atom->jc; ++ katom->coreref_state = KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED; ++ katom->core_req = user_atom->core_req; ++ katom->atom_flags = 0; ++ katom->retry_count = 0; ++ katom->need_cache_flush_cores_retained = 0; ++ katom->pre_dep = NULL; ++ katom->post_dep = NULL; ++ katom->x_pre_dep = NULL; ++ katom->x_post_dep = NULL; ++ katom->will_fail_event_code = BASE_JD_EVENT_NOT_STARTED; + -+mali_bool mali_session_pp_job_is_empty(void *data) -+{ -+ struct mali_session_data *session = (struct mali_session_data *)data; -+ MALI_DEBUG_ASSERT_POINTER(session); ++ /* Implicitly sets katom->protected_state.enter as well. */ ++ katom->protected_state.exit = KBASE_ATOM_EXIT_PROTECTED_CHECK; + -+ if ( 0 == _mali_osk_atomic_read(&session->number_of_pp_jobs)) { -+ return MALI_TRUE; -+ } -+ return MALI_FALSE; -+} ++ katom->age = kctx->age_count++; + -+wait_queue_head_t *mali_session_get_wait_queue(void) -+{ -+ return &pending_queue; -+} ++ INIT_LIST_HEAD(&katom->jd_item); ++#ifdef CONFIG_KDS ++ /* Start by assuming that the KDS dependencies are satisfied, ++ * kbase_jd_pre_external_resources will correct this if there are dependencies */ ++ katom->kds_dep_satisfied = true; ++ katom->kds_rset = NULL; ++#endif /* CONFIG_KDS */ ++#ifdef CONFIG_MALI_DMA_FENCE ++ kbase_fence_dep_count_set(katom, -1); ++#endif + -+/* -+ * Get the max completed window jobs from all active session, -+ * which will be used in window render frame per sec calculate -+ */ -+#if defined(CONFIG_MALI_DVFS) -+u32 mali_session_max_window_num(void) -+{ -+ struct mali_session_data *session, *tmp; -+ u32 max_window_num = 0; -+ u32 tmp_number = 0; ++ /* Don't do anything if there is a mess up with dependencies. ++ This is done in a separate cycle to check both the dependencies at ones, otherwise ++ it will be extra complexity to deal with 1st dependency ( just added to the list ) ++ if only the 2nd one has invalid config. ++ */ ++ for (i = 0; i < 2; i++) { ++ int dep_atom_number = user_atom->pre_dep[i].atom_id; ++ base_jd_dep_type dep_atom_type = user_atom->pre_dep[i].dependency_type; + -+ mali_session_lock(); ++ if (dep_atom_number) { ++ if (dep_atom_type != BASE_JD_DEP_TYPE_ORDER && ++ dep_atom_type != BASE_JD_DEP_TYPE_DATA) { ++ katom->event_code = BASE_JD_EVENT_JOB_CONFIG_FAULT; ++ katom->status = KBASE_JD_ATOM_STATE_COMPLETED; + -+ MALI_SESSION_FOREACH(session, tmp, link) { -+ tmp_number = _mali_osk_atomic_xchg( -+ &session->number_of_window_jobs, 0); -+ if (max_window_num < tmp_number) { -+ max_window_num = tmp_number; ++ /* Wrong dependency setup. Atom will be sent ++ * back to user space. Do not record any ++ * dependencies. */ ++ KBASE_TLSTREAM_TL_NEW_ATOM( ++ katom, ++ kbase_jd_atom_id(kctx, katom)); ++ KBASE_TLSTREAM_TL_RET_ATOM_CTX( ++ katom, kctx); ++ KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(katom, ++ TL_ATOM_STATE_IDLE); ++ ++ ret = jd_done_nolock(katom, NULL); ++ goto out; ++ } + } + } + -+ mali_session_unlock(); ++ /* Add dependencies */ ++ for (i = 0; i < 2; i++) { ++ int dep_atom_number = user_atom->pre_dep[i].atom_id; ++ base_jd_dep_type dep_atom_type; ++ struct kbase_jd_atom *dep_atom = &jctx->atoms[dep_atom_number]; + -+ return max_window_num; -+} -+#endif ++ dep_atom_type = user_atom->pre_dep[i].dependency_type; ++ kbase_jd_katom_dep_clear(&katom->dep[i]); + -+void mali_session_memory_tracking(_mali_osk_print_ctx *print_ctx) -+{ -+ struct mali_session_data *session, *tmp; -+ u32 mali_mem_usage; -+ u32 total_mali_mem_size; -+#ifdef MALI_MEM_SWAP_TRACKING -+ u32 swap_pool_size; -+ u32 swap_unlock_size; -+#endif ++ if (!dep_atom_number) ++ continue; + -+ MALI_DEBUG_ASSERT_POINTER(print_ctx); -+ mali_session_lock(); -+ MALI_SESSION_FOREACH(session, tmp, link) { -+#ifdef MALI_MEM_SWAP_TRACKING -+ _mali_osk_ctxprintf(print_ctx, " %-25s %-10u %-10u %-15u %-15u %-10u %-10u %-10u\n", -+ session->comm, session->pid, -+ (atomic_read(&session->mali_mem_allocated_pages)) * _MALI_OSK_MALI_PAGE_SIZE, -+ (unsigned int)session->max_mali_mem_allocated_size, -+ (unsigned int)((atomic_read(&session->mali_mem_array[MALI_MEM_EXTERNAL])) * _MALI_OSK_MALI_PAGE_SIZE), -+ (unsigned int)((atomic_read(&session->mali_mem_array[MALI_MEM_UMP])) * _MALI_OSK_MALI_PAGE_SIZE), -+ (unsigned int)((atomic_read(&session->mali_mem_array[MALI_MEM_DMA_BUF])) * _MALI_OSK_MALI_PAGE_SIZE), -+ (unsigned int)((atomic_read(&session->mali_mem_array[MALI_MEM_SWAP])) * _MALI_OSK_MALI_PAGE_SIZE) -+ ); -+#else -+ _mali_osk_ctxprintf(print_ctx, " %-25s %-10u %-10u %-15u %-15u %-10u %-10u \n", -+ session->comm, session->pid, -+ (unsigned int)((atomic_read(&session->mali_mem_allocated_pages)) * _MALI_OSK_MALI_PAGE_SIZE), -+ (unsigned int)session->max_mali_mem_allocated_size, -+ (unsigned int)((atomic_read(&session->mali_mem_array[MALI_MEM_EXTERNAL])) * _MALI_OSK_MALI_PAGE_SIZE), -+ (unsigned int)((atomic_read(&session->mali_mem_array[MALI_MEM_UMP])) * _MALI_OSK_MALI_PAGE_SIZE), -+ (unsigned int)((atomic_read(&session->mali_mem_array[MALI_MEM_DMA_BUF])) * _MALI_OSK_MALI_PAGE_SIZE) -+ ); -+#endif ++ if (dep_atom->status == KBASE_JD_ATOM_STATE_UNUSED || ++ dep_atom->status == KBASE_JD_ATOM_STATE_COMPLETED) { ++ ++ if (dep_atom->event_code == BASE_JD_EVENT_DONE) ++ continue; ++ /* don't stop this atom if it has an order dependency ++ * only to the failed one, try to submit it through ++ * the normal path ++ */ ++ if (dep_atom_type == BASE_JD_DEP_TYPE_ORDER && ++ dep_atom->event_code > BASE_JD_EVENT_ACTIVE) { ++ continue; ++ } ++ ++ /* Atom has completed, propagate the error code if any */ ++ katom->event_code = dep_atom->event_code; ++ katom->status = KBASE_JD_ATOM_STATE_QUEUED; ++ ++ /* This atom is going through soft replay or ++ * will be sent back to user space. Do not record any ++ * dependencies. */ ++ KBASE_TLSTREAM_TL_NEW_ATOM( ++ katom, ++ kbase_jd_atom_id(kctx, katom)); ++ KBASE_TLSTREAM_TL_RET_ATOM_CTX(katom, kctx); ++ KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(katom, ++ TL_ATOM_STATE_IDLE); ++ ++ if ((katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) ++ == BASE_JD_REQ_SOFT_REPLAY) { ++ if (kbase_replay_process(katom)) { ++ ret = false; ++ goto out; ++ } ++ } ++ will_fail = true; ++ ++ } else { ++ /* Atom is in progress, add this atom to the list */ ++ list_add_tail(&katom->dep_item[i], &dep_atom->dep_head[i]); ++ kbase_jd_katom_dep_set(&katom->dep[i], dep_atom, dep_atom_type); ++ queued = 1; ++ } + } -+ mali_session_unlock(); -+ mali_mem_usage = _mali_ukk_report_memory_usage(); -+ total_mali_mem_size = _mali_ukk_report_total_memory_size(); -+ _mali_osk_ctxprintf(print_ctx, "Mali mem usage: %u\nMali mem limit: %u\n", mali_mem_usage, total_mali_mem_size); -+#ifdef MALI_MEM_SWAP_TRACKING -+ mali_mem_swap_tracking(&swap_pool_size, &swap_unlock_size); -+ _mali_osk_ctxprintf(print_ctx, "Mali swap mem pool : %u\nMali swap mem unlock: %u\n", swap_pool_size, swap_unlock_size); -+#endif -+} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_session.h b/drivers/gpu/arm/mali400/mali/common/mali_session.h -new file mode 100755 -index 000000000000..da8b9927ee60 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_session.h -@@ -0,0 +1,136 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ + -+#ifndef __MALI_SESSION_H__ -+#define __MALI_SESSION_H__ ++ if (will_fail) { ++ if (!queued) { ++ ret = jd_done_nolock(katom, NULL); + -+#include "mali_mmu_page_directory.h" -+#include "mali_osk.h" -+#include "mali_osk_list.h" -+#include "mali_memory_types.h" -+#include "mali_memory_manager.h" ++ goto out; ++ } else { ++ katom->will_fail_event_code = katom->event_code; ++ ret = false; + -+struct mali_timeline_system; -+struct mali_soft_system; ++ goto out; ++ } ++ } else { ++ /* These must occur after the above loop to ensure that an atom ++ * that depends on a previous atom with the same number behaves ++ * as expected */ ++ katom->event_code = BASE_JD_EVENT_DONE; ++ katom->status = KBASE_JD_ATOM_STATE_QUEUED; ++ } + -+/* Number of frame builder job lists per session. */ -+#define MALI_PP_JOB_FB_LOOKUP_LIST_SIZE 16 -+#define MALI_PP_JOB_FB_LOOKUP_LIST_MASK (MALI_PP_JOB_FB_LOOKUP_LIST_SIZE - 1) -+/*Max pending big job allowed in kernel*/ -+#define MALI_MAX_PENDING_BIG_JOB (2) ++ /* For invalid priority, be most lenient and choose the default */ ++ sched_prio = kbasep_js_atom_prio_to_sched_prio(user_atom->prio); ++ if (sched_prio == KBASE_JS_ATOM_SCHED_PRIO_INVALID) ++ sched_prio = KBASE_JS_ATOM_SCHED_PRIO_DEFAULT; ++ katom->sched_priority = sched_prio; + -+struct mali_session_data { -+ _mali_osk_notification_queue_t *ioctl_queue; ++ /* Create a new atom recording all dependencies it was set up with. */ ++ KBASE_TLSTREAM_TL_NEW_ATOM( ++ katom, ++ kbase_jd_atom_id(kctx, katom)); ++ KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(katom, TL_ATOM_STATE_IDLE); ++ KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY(katom, katom->sched_priority); ++ KBASE_TLSTREAM_TL_RET_ATOM_CTX(katom, kctx); ++ for (i = 0; i < 2; i++) ++ if (BASE_JD_DEP_TYPE_INVALID != kbase_jd_katom_dep_type( ++ &katom->dep[i])) { ++ KBASE_TLSTREAM_TL_DEP_ATOM_ATOM( ++ (void *)kbase_jd_katom_dep_atom( ++ &katom->dep[i]), ++ (void *)katom); ++ } else if (BASE_JD_DEP_TYPE_INVALID != ++ user_atom->pre_dep[i].dependency_type) { ++ /* Resolved dependency. */ ++ int dep_atom_number = ++ user_atom->pre_dep[i].atom_id; ++ struct kbase_jd_atom *dep_atom = ++ &jctx->atoms[dep_atom_number]; + -+ _mali_osk_wait_queue_t *wait_queue; /**The wait queue to wait for the number of pp job become 0.*/ ++ KBASE_TLSTREAM_TL_RDEP_ATOM_ATOM( ++ (void *)dep_atom, ++ (void *)katom); ++ } + -+ _mali_osk_mutex_t *memory_lock; /**< Lock protecting the vm manipulation */ -+ _mali_osk_mutex_t *cow_lock; /** < Lock protecting the cow memory free manipulation */ -+#if 0 -+ _mali_osk_list_t memory_head; /**< Track all the memory allocated in this session, for freeing on abnormal termination */ -+#endif -+ struct mali_page_directory *page_directory; /**< MMU page directory for this session */ ++ /* Reject atoms with job chain = NULL, as these cause issues with soft-stop */ ++ if (!katom->jc && (katom->core_req & BASE_JD_REQ_ATOM_TYPE) != BASE_JD_REQ_DEP) { ++ dev_warn(kctx->kbdev->dev, "Rejecting atom with jc = NULL"); ++ katom->event_code = BASE_JD_EVENT_JOB_INVALID; ++ ret = jd_done_nolock(katom, NULL); ++ goto out; ++ } + -+ _MALI_OSK_LIST_HEAD(link); /**< Link for list of all sessions */ -+ _MALI_OSK_LIST_HEAD(pp_job_list); /**< List of all PP jobs on this session */ ++ /* Reject atoms with an invalid device_nr */ ++ if ((katom->core_req & BASE_JD_REQ_SPECIFIC_COHERENT_GROUP) && ++ (katom->device_nr >= kctx->kbdev->gpu_props.num_core_groups)) { ++ dev_warn(kctx->kbdev->dev, ++ "Rejecting atom with invalid device_nr %d", ++ katom->device_nr); ++ katom->event_code = BASE_JD_EVENT_JOB_INVALID; ++ ret = jd_done_nolock(katom, NULL); ++ goto out; ++ } + -+#if defined(CONFIG_MALI_DVFS) -+ _mali_osk_atomic_t number_of_window_jobs; /**< Record the window jobs completed on this session in a period */ -+#endif -+ _mali_osk_atomic_t number_of_pp_jobs; /** < Record the pp jobs on this session */ ++ /* Reject atoms with invalid core requirements */ ++ if ((katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) && ++ (katom->core_req & BASE_JD_REQ_EVENT_COALESCE)) { ++ dev_warn(kctx->kbdev->dev, ++ "Rejecting atom with invalid core requirements"); ++ katom->event_code = BASE_JD_EVENT_JOB_INVALID; ++ katom->core_req &= ~BASE_JD_REQ_EVENT_COALESCE; ++ ret = jd_done_nolock(katom, NULL); ++ goto out; ++ } + -+ _mali_osk_list_t pp_job_fb_lookup_list[MALI_PP_JOB_FB_LOOKUP_LIST_SIZE]; /**< List of PP job lists per frame builder id. Used to link jobs from same frame builder. */ -+ struct mali_soft_job_system *soft_job_system; /**< Soft job system for this session. */ -+ struct mali_timeline_system *timeline_system; /**< Timeline system for this session. */ ++ if (katom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) { ++ /* handle what we need to do to access the external resources */ ++ if (kbase_jd_pre_external_resources(katom, user_atom) != 0) { ++ /* setup failed (no access, bad resource, unknown resource types, etc.) */ ++ katom->event_code = BASE_JD_EVENT_JOB_INVALID; ++ ret = jd_done_nolock(katom, NULL); ++ goto out; ++ } ++ } + -+ mali_bool is_aborting; /**< MALI_TRUE if the session is aborting, MALI_FALSE if not. */ -+ mali_bool use_high_priority_job_queue; /**< If MALI_TRUE, jobs added from this session will use the high priority job queues. */ -+ u32 pid; -+ char *comm; -+ atomic_t mali_mem_array[MALI_MEM_TYPE_MAX]; /**< The array to record mem types' usage for this session. */ -+ atomic_t mali_mem_allocated_pages; /** The current allocated mali memory pages, which include mali os memory and mali dedicated memory.*/ -+ size_t max_mali_mem_allocated_size; /**< The past max mali memory allocated size, which include mali os memory and mali dedicated memory. */ -+ /* Added for new memroy system */ -+ struct mali_allocation_manager allocation_mgr; ++ /* Validate the atom. Function will return error if the atom is ++ * malformed. ++ * ++ * Soft-jobs never enter the job scheduler but have their own initialize method. ++ * ++ * If either fail then we immediately complete the atom with an error. ++ */ ++ if ((katom->core_req & BASE_JD_REQ_SOFT_JOB) == 0) { ++ if (!kbase_js_is_atom_valid(kctx->kbdev, katom)) { ++ katom->event_code = BASE_JD_EVENT_JOB_INVALID; ++ ret = jd_done_nolock(katom, NULL); ++ goto out; ++ } ++ } else { ++ /* Soft-job */ ++ if (kbase_prepare_soft_job(katom) != 0) { ++ katom->event_code = BASE_JD_EVENT_JOB_INVALID; ++ ret = jd_done_nolock(katom, NULL); ++ goto out; ++ } ++ } + -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+ u32 fence_context; /** < The execution dma fence context this fence is run on. */ -+ _mali_osk_atomic_t fence_seqno; /** < Alinear increasing sequence number for this dma fence context. */ ++#ifdef CONFIG_GPU_TRACEPOINTS ++ katom->work_id = atomic_inc_return(&jctx->work_id); ++ trace_gpu_job_enqueue((u32)kctx->id, katom->work_id, ++ kbasep_map_core_reqs_to_string(katom->core_req)); +#endif -+}; + -+_mali_osk_errcode_t mali_session_initialize(void); -+void mali_session_terminate(void); ++ if (queued && !IS_GPU_ATOM(katom)) { ++ ret = false; ++ goto out; ++ } ++#ifdef CONFIG_KDS ++ if (!katom->kds_dep_satisfied) { ++ /* Queue atom due to KDS dependency */ ++ ret = false; ++ goto out; ++ } ++#endif /* CONFIG_KDS */ + -+/* List of all sessions. Actual list head in mali_kernel_core.c */ -+extern _mali_osk_list_t mali_sessions; -+/* Lock to protect modification and access to the mali_sessions list */ -+extern _mali_osk_spinlock_irq_t *mali_sessions_lock; + -+MALI_STATIC_INLINE void mali_session_lock(void) -+{ -+ _mali_osk_spinlock_irq_lock(mali_sessions_lock); -+} ++#ifdef CONFIG_MALI_DMA_FENCE ++ if (kbase_fence_dep_count_read(katom) != -1) { ++ ret = false; ++ goto out; ++ } ++#endif /* CONFIG_MALI_DMA_FENCE */ + -+MALI_STATIC_INLINE void mali_session_unlock(void) -+{ -+ _mali_osk_spinlock_irq_unlock(mali_sessions_lock); -+} ++ if ((katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) ++ == BASE_JD_REQ_SOFT_REPLAY) { ++ if (kbase_replay_process(katom)) ++ ret = false; ++ else ++ ret = jd_done_nolock(katom, NULL); + -+void mali_session_add(struct mali_session_data *session); -+void mali_session_remove(struct mali_session_data *session); -+u32 mali_session_get_count(void); -+mali_bool mali_session_pp_job_is_empty(void *data); -+wait_queue_head_t *mali_session_get_wait_queue(void); ++ goto out; ++ } else if (katom->core_req & BASE_JD_REQ_SOFT_JOB) { ++ if (kbase_process_soft_job(katom) == 0) { ++ kbase_finish_soft_job(katom); ++ ret = jd_done_nolock(katom, NULL); ++ goto out; ++ } + -+#define MALI_SESSION_FOREACH(session, tmp, link) \ -+ _MALI_OSK_LIST_FOREACHENTRY(session, tmp, &mali_sessions, struct mali_session_data, link) ++ ret = false; ++ } else if ((katom->core_req & BASE_JD_REQ_ATOM_TYPE) != BASE_JD_REQ_DEP) { ++ katom->status = KBASE_JD_ATOM_STATE_IN_JS; ++ ret = kbasep_js_add_job(kctx, katom); ++ /* If job was cancelled then resolve immediately */ ++ if (katom->event_code == BASE_JD_EVENT_JOB_CANCELLED) ++ ret = jd_done_nolock(katom, NULL); ++ } else { ++ /* This is a pure dependency. Resolve it immediately */ ++ ret = jd_done_nolock(katom, NULL); ++ } + -+MALI_STATIC_INLINE struct mali_page_directory *mali_session_get_page_directory(struct mali_session_data *session) -+{ -+ return session->page_directory; ++ out: ++ return ret; +} + -+MALI_STATIC_INLINE void mali_session_memory_lock(struct mali_session_data *session) ++int kbase_jd_submit(struct kbase_context *kctx, ++ void __user *user_addr, u32 nr_atoms, u32 stride, ++ bool uk6_atom) +{ -+ MALI_DEBUG_ASSERT_POINTER(session); -+ _mali_osk_mutex_wait(session->memory_lock); -+} ++ struct kbase_jd_context *jctx = &kctx->jctx; ++ int err = 0; ++ int i; ++ bool need_to_try_schedule_context = false; ++ struct kbase_device *kbdev; ++ u32 latest_flush; + -+MALI_STATIC_INLINE void mali_session_memory_unlock(struct mali_session_data *session) -+{ -+ MALI_DEBUG_ASSERT_POINTER(session); -+ _mali_osk_mutex_signal(session->memory_lock); -+} ++ /* ++ * kbase_jd_submit isn't expected to fail and so all errors with the ++ * jobs are reported by immediately failing them (through event system) ++ */ ++ kbdev = kctx->kbdev; + -+MALI_STATIC_INLINE void mali_session_send_notification(struct mali_session_data *session, _mali_osk_notification_t *object) -+{ -+ _mali_osk_notification_queue_send(session->ioctl_queue, object); -+} ++ beenthere(kctx, "%s", "Enter"); + -+#if defined(CONFIG_MALI_DVFS) ++ if (kbase_ctx_flag(kctx, KCTX_SUBMIT_DISABLED)) { ++ dev_err(kbdev->dev, "Attempt to submit to a context that has SUBMIT_DISABLED set on it"); ++ return -EINVAL; ++ } + -+MALI_STATIC_INLINE void mali_session_inc_num_window_jobs(struct mali_session_data *session) -+{ -+ MALI_DEBUG_ASSERT_POINTER(session); -+ _mali_osk_atomic_inc(&session->number_of_window_jobs); -+} ++ if (stride != sizeof(base_jd_atom_v2)) { ++ dev_err(kbdev->dev, "Stride passed to job_submit doesn't match kernel"); ++ return -EINVAL; ++ } + -+/* -+ * Get the max completed window jobs from all active session, -+ * which will be used in window render frame per sec calculate -+ */ -+u32 mali_session_max_window_num(void); ++ KBASE_TIMELINE_ATOMS_IN_FLIGHT(kctx, atomic_add_return(nr_atoms, ++ &kctx->timeline.jd_atoms_in_flight)); + -+#endif ++ /* All atoms submitted in this call have the same flush ID */ ++ latest_flush = kbase_backend_get_current_flush_id(kbdev); + -+void mali_session_memory_tracking(_mali_osk_print_ctx *print_ctx); ++ for (i = 0; i < nr_atoms; i++) { ++ struct base_jd_atom_v2 user_atom; ++ struct kbase_jd_atom *katom; + -+#endif /* __MALI_SESSION_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c -new file mode 100755 -index 000000000000..35cd830bc83a ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c -@@ -0,0 +1,438 @@ -+/* -+ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++#ifdef BASE_LEGACY_UK6_SUPPORT ++ BUILD_BUG_ON(sizeof(struct base_jd_atom_v2_uk6) != ++ sizeof(base_jd_atom_v2)); + -+#include "mali_soft_job.h" -+#include "mali_osk.h" -+#include "mali_timeline.h" -+#include "mali_session.h" -+#include "mali_kernel_common.h" -+#include "mali_uk_types.h" -+#include "mali_scheduler.h" -+#include "mali_executor.h" ++ if (uk6_atom) { ++ struct base_jd_atom_v2_uk6 user_atom_v6; ++ base_jd_dep_type dep_types[2] = {BASE_JD_DEP_TYPE_DATA, BASE_JD_DEP_TYPE_DATA}; + -+MALI_STATIC_INLINE void mali_soft_job_system_lock(struct mali_soft_job_system *system) -+{ -+ MALI_DEBUG_ASSERT_POINTER(system); -+ _mali_osk_spinlock_irq_lock(system->lock); -+ MALI_DEBUG_PRINT(5, ("Mali Soft Job: soft system %p lock taken\n", system)); -+ MALI_DEBUG_ASSERT(0 == system->lock_owner); -+ MALI_DEBUG_CODE(system->lock_owner = _mali_osk_get_tid()); -+} ++ if (copy_from_user(&user_atom_v6, user_addr, ++ sizeof(user_atom_v6))) { ++ err = -EINVAL; ++ KBASE_TIMELINE_ATOMS_IN_FLIGHT(kctx, ++ atomic_sub_return( ++ nr_atoms - i, ++ &kctx->timeline.jd_atoms_in_flight)); ++ break; ++ } ++ /* Convert from UK6 atom format to UK7 format */ ++ user_atom.jc = user_atom_v6.jc; ++ user_atom.udata = user_atom_v6.udata; ++ user_atom.extres_list = user_atom_v6.extres_list; ++ user_atom.nr_extres = user_atom_v6.nr_extres; ++ user_atom.core_req = (u32)(user_atom_v6.core_req & 0x7fff); + -+MALI_STATIC_INLINE void mali_soft_job_system_unlock(struct mali_soft_job_system *system) -+{ -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_PRINT(5, ("Mali Soft Job: releasing soft system %p lock\n", system)); -+ MALI_DEBUG_ASSERT(_mali_osk_get_tid() == system->lock_owner); -+ MALI_DEBUG_CODE(system->lock_owner = 0); -+ _mali_osk_spinlock_irq_unlock(system->lock); -+} ++ /* atom number 0 is used for no dependency atoms */ ++ if (!user_atom_v6.pre_dep[0]) ++ dep_types[0] = BASE_JD_DEP_TYPE_INVALID; + -+#if defined(DEBUG) -+MALI_STATIC_INLINE void mali_soft_job_system_assert_locked(struct mali_soft_job_system *system) -+{ -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT(_mali_osk_get_tid() == system->lock_owner); -+} -+#define MALI_ASSERT_SOFT_JOB_SYSTEM_LOCKED(system) mali_soft_job_system_assert_locked(system) -+#else -+#define MALI_ASSERT_SOFT_JOB_SYSTEM_LOCKED(system) -+#endif /* defined(DEBUG) */ ++ base_jd_atom_dep_set(&user_atom.pre_dep[0], ++ user_atom_v6.pre_dep[0], ++ dep_types[0]); + -+struct mali_soft_job_system *mali_soft_job_system_create(struct mali_session_data *session) -+{ -+ struct mali_soft_job_system *system; ++ /* atom number 0 is used for no dependency atoms */ ++ if (!user_atom_v6.pre_dep[1]) ++ dep_types[1] = BASE_JD_DEP_TYPE_INVALID; + -+ MALI_DEBUG_ASSERT_POINTER(session); ++ base_jd_atom_dep_set(&user_atom.pre_dep[1], ++ user_atom_v6.pre_dep[1], ++ dep_types[1]); + -+ system = (struct mali_soft_job_system *) _mali_osk_calloc(1, sizeof(struct mali_soft_job_system)); -+ if (NULL == system) { -+ return NULL; -+ } ++ user_atom.atom_number = user_atom_v6.atom_number; ++ user_atom.prio = user_atom_v6.prio; ++ user_atom.device_nr = user_atom_v6.device_nr; ++ } else { ++#endif /* BASE_LEGACY_UK6_SUPPORT */ ++ if (copy_from_user(&user_atom, user_addr, ++ sizeof(user_atom)) != 0) { ++ err = -EINVAL; ++ KBASE_TIMELINE_ATOMS_IN_FLIGHT(kctx, ++ atomic_sub_return(nr_atoms - i, ++ &kctx->timeline.jd_atoms_in_flight)); ++ break; ++ } ++#ifdef BASE_LEGACY_UK6_SUPPORT ++ } ++#endif + -+ system->session = session; ++#ifdef BASE_LEGACY_UK10_2_SUPPORT ++ if (KBASE_API_VERSION(10, 3) > kctx->api_version) ++ user_atom.core_req = (u32)(user_atom.compat_core_req ++ & 0x7fff); ++#endif /* BASE_LEGACY_UK10_2_SUPPORT */ + -+ system->lock = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_ORDERED, _MALI_OSK_LOCK_ORDER_SCHEDULER); -+ if (NULL == system->lock) { -+ mali_soft_job_system_destroy(system); -+ return NULL; -+ } -+ system->lock_owner = 0; -+ system->last_job_id = 0; ++ user_addr = (void __user *)((uintptr_t) user_addr + stride); + -+ _MALI_OSK_INIT_LIST_HEAD(&(system->jobs_used)); ++ mutex_lock(&jctx->lock); ++#ifndef compiletime_assert ++#define compiletime_assert_defined ++#define compiletime_assert(x, msg) do { switch (0) { case 0: case (x):; } } \ ++while (false) ++#endif ++ compiletime_assert((1 << (8*sizeof(user_atom.atom_number))) >= ++ BASE_JD_ATOM_COUNT, ++ "BASE_JD_ATOM_COUNT and base_atom_id type out of sync"); ++ compiletime_assert(sizeof(user_atom.pre_dep[0].atom_id) == ++ sizeof(user_atom.atom_number), ++ "BASE_JD_ATOM_COUNT and base_atom_id type out of sync"); ++#ifdef compiletime_assert_defined ++#undef compiletime_assert ++#undef compiletime_assert_defined ++#endif ++ if (user_atom.atom_number >= BASE_JD_ATOM_COUNT) { ++ err = -EINVAL; ++ break; ++ } ++ user_atom.atom_number = ++ array_index_nospec(user_atom.atom_number, ++ BASE_JD_ATOM_COUNT); ++ katom = &jctx->atoms[user_atom.atom_number]; + -+ return system; -+} ++ /* Record the flush ID for the cache flush optimisation */ ++ katom->flush_id = latest_flush; + -+void mali_soft_job_system_destroy(struct mali_soft_job_system *system) -+{ -+ MALI_DEBUG_ASSERT_POINTER(system); ++ while (katom->status != KBASE_JD_ATOM_STATE_UNUSED) { ++ /* Atom number is already in use, wait for the atom to ++ * complete ++ */ ++ mutex_unlock(&jctx->lock); + -+ /* All jobs should be free at this point. */ -+ MALI_DEBUG_ASSERT(_mali_osk_list_empty(&(system->jobs_used))); ++ /* This thread will wait for the atom to complete. Due ++ * to thread scheduling we are not sure that the other ++ * thread that owns the atom will also schedule the ++ * context, so we force the scheduler to be active and ++ * hence eventually schedule this context at some point ++ * later. ++ */ ++ kbase_js_sched_all(kbdev); + -+ if (NULL != system) { -+ if (NULL != system->lock) { -+ _mali_osk_spinlock_irq_term(system->lock); ++ if (wait_event_killable(katom->completed, ++ katom->status == ++ KBASE_JD_ATOM_STATE_UNUSED) != 0) { ++ /* We're being killed so the result code ++ * doesn't really matter ++ */ ++ return 0; ++ } ++ mutex_lock(&jctx->lock); + } -+ _mali_osk_free(system); -+ } -+} -+ -+static void mali_soft_job_system_free_job(struct mali_soft_job_system *system, struct mali_soft_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_POINTER(system); + -+ mali_soft_job_system_lock(job->system); ++ need_to_try_schedule_context |= ++ jd_submit_atom(kctx, &user_atom, katom); + -+ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_INVALID_ID != job->id); -+ MALI_DEBUG_ASSERT(system == job->system); ++ /* Register a completed job as a disjoint event when the GPU is in a disjoint state ++ * (ie. being reset or replaying jobs). ++ */ ++ kbase_disjoint_event_potential(kbdev); + -+ _mali_osk_list_del(&(job->system_list)); ++ mutex_unlock(&jctx->lock); ++ } + -+ mali_soft_job_system_unlock(job->system); ++ if (need_to_try_schedule_context) ++ kbase_js_sched_all(kbdev); + -+ _mali_osk_free(job); ++ return err; +} + -+MALI_STATIC_INLINE struct mali_soft_job *mali_soft_job_system_lookup_job(struct mali_soft_job_system *system, u32 job_id) -+{ -+ struct mali_soft_job *job, *tmp; ++KBASE_EXPORT_TEST_API(kbase_jd_submit); + -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_ASSERT_SOFT_JOB_SYSTEM_LOCKED(system); ++void kbase_jd_done_worker(struct work_struct *data) ++{ ++ struct kbase_jd_atom *katom = container_of(data, struct kbase_jd_atom, work); ++ struct kbase_jd_context *jctx; ++ struct kbase_context *kctx; ++ struct kbasep_js_kctx_info *js_kctx_info; ++ struct kbase_device *kbdev; ++ struct kbasep_js_device_data *js_devdata; ++ u64 cache_jc = katom->jc; ++ struct kbasep_js_atom_retained_state katom_retained_state; ++ bool context_idle; ++ base_jd_core_req core_req = katom->core_req; ++ u64 affinity = katom->affinity; ++ enum kbase_atom_coreref_state coreref_state = katom->coreref_state; + -+ _MALI_OSK_LIST_FOREACHENTRY(job, tmp, &system->jobs_used, struct mali_soft_job, system_list) { -+ if (job->id == job_id) -+ return job; -+ } ++ /* Soft jobs should never reach this function */ ++ KBASE_DEBUG_ASSERT((katom->core_req & BASE_JD_REQ_SOFT_JOB) == 0); + -+ return NULL; -+} ++ kctx = katom->kctx; ++ jctx = &kctx->jctx; ++ kbdev = kctx->kbdev; ++ js_kctx_info = &kctx->jctx.sched_info; ++ js_devdata = &kbdev->js_data; + -+void mali_soft_job_destroy(struct mali_soft_job *job) -+{ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_POINTER(job->system); ++ KBASE_TRACE_ADD(kbdev, JD_DONE_WORKER, kctx, katom, katom->jc, 0); + -+ MALI_DEBUG_PRINT(4, ("Mali Soft Job: destroying soft job %u (0x%08X)\n", job->id, job)); ++ kbase_backend_complete_wq(kbdev, katom); + -+ if (NULL != job) { -+ if (0 < _mali_osk_atomic_dec_return(&job->refcount)) return; ++ /* ++ * Begin transaction on JD context and JS context ++ */ ++ mutex_lock(&jctx->lock); ++ KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(katom, TL_ATOM_STATE_DONE); ++ mutex_lock(&js_devdata->queue_mutex); ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); + -+ _mali_osk_atomic_term(&job->refcount); ++ /* This worker only gets called on contexts that are scheduled *in*. This is ++ * because it only happens in response to an IRQ from a job that was ++ * running. ++ */ ++ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); + -+ if (NULL != job->activated_notification) { -+ _mali_osk_notification_delete(job->activated_notification); -+ job->activated_notification = NULL; -+ } ++ if (katom->event_code == BASE_JD_EVENT_STOPPED) { ++ /* Atom has been promoted to stopped */ ++ unsigned long flags; + -+ mali_soft_job_system_free_job(job->system, job); -+ } -+} ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ mutex_unlock(&js_devdata->queue_mutex); + -+struct mali_soft_job *mali_soft_job_create(struct mali_soft_job_system *system, mali_soft_job_type type, u64 user_job) -+{ -+ struct mali_soft_job *job; -+ _mali_osk_notification_t *notification = NULL; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT((MALI_SOFT_JOB_TYPE_USER_SIGNALED == type) || -+ (MALI_SOFT_JOB_TYPE_SELF_SIGNALED == type)); ++ katom->status = KBASE_JD_ATOM_STATE_IN_JS; ++ kbase_js_unpull(kctx, katom); + -+ notification = _mali_osk_notification_create(_MALI_NOTIFICATION_SOFT_ACTIVATED, sizeof(_mali_uk_soft_job_activated_s)); -+ if (unlikely(NULL == notification)) { -+ MALI_PRINT_ERROR(("Mali Soft Job: failed to allocate notification")); -+ return NULL; -+ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&jctx->lock); + -+ job = _mali_osk_malloc(sizeof(struct mali_soft_job)); -+ if (unlikely(NULL == job)) { -+ MALI_DEBUG_PRINT(2, ("Mali Soft Job: system alloc job failed. \n")); -+ return NULL; ++ return; + } + -+ mali_soft_job_system_lock(system); ++ if (katom->event_code != BASE_JD_EVENT_DONE) ++ dev_err(kbdev->dev, ++ "t6xx: GPU fault 0x%02lx from job slot %d\n", ++ (unsigned long)katom->event_code, ++ katom->slot_nr); + -+ job->system = system; -+ job->id = system->last_job_id++; -+ job->state = MALI_SOFT_JOB_STATE_ALLOCATED; ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8316)) ++ kbase_as_poking_timer_release_atom(kbdev, kctx, katom); + -+ _mali_osk_list_add(&(job->system_list), &(system->jobs_used)); ++ /* Retain state before the katom disappears */ ++ kbasep_js_atom_retained_state_copy(&katom_retained_state, katom); + -+ job->type = type; -+ job->user_job = user_job; -+ job->activated = MALI_FALSE; ++ context_idle = kbase_js_complete_atom_wq(kctx, katom); + -+ job->activated_notification = notification; ++ KBASE_DEBUG_ASSERT(kbasep_js_has_atom_finished(&katom_retained_state)); + -+ _mali_osk_atomic_init(&job->refcount, 1); ++ kbasep_js_remove_job(kbdev, kctx, katom); ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ mutex_unlock(&js_devdata->queue_mutex); ++ katom->atom_flags &= ~KBASE_KATOM_FLAG_HOLDING_CTX_REF; ++ /* jd_done_nolock() requires the jsctx_mutex lock to be dropped */ ++ jd_done_nolock(katom, &kctx->completed_jobs); + -+ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_ALLOCATED == job->state); -+ MALI_DEBUG_ASSERT(system == job->system); -+ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_INVALID_ID != job->id); ++ /* katom may have been freed now, do not use! */ + -+ mali_soft_job_system_unlock(system); ++ if (context_idle) { ++ unsigned long flags; + -+ return job; -+} ++ context_idle = false; ++ mutex_lock(&js_devdata->queue_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+mali_timeline_point mali_soft_job_start(struct mali_soft_job *job, struct mali_timeline_fence *fence) -+{ -+ mali_timeline_point point; -+ struct mali_soft_job_system *system; ++ /* If kbase_sched() has scheduled this context back in then ++ * KCTX_ACTIVE will have been set after we marked it as ++ * inactive, and another pm reference will have been taken, so ++ * drop our reference. But do not call kbase_jm_idle_ctx(), as ++ * the context is active and fast-starting is allowed. ++ * ++ * If an atom has been fast-started then kctx->atoms_pulled will ++ * be non-zero but KCTX_ACTIVE will still be false (as the ++ * previous pm reference has been inherited). Do NOT drop our ++ * reference, as it has been re-used, and leave the context as ++ * active. ++ * ++ * If no new atoms have been started then KCTX_ACTIVE will still ++ * be false and atoms_pulled will be zero, so drop the reference ++ * and call kbase_jm_idle_ctx(). ++ * ++ * As the checks are done under both the queue_mutex and ++ * hwaccess_lock is should be impossible for this to race ++ * with the scheduler code. ++ */ ++ if (kbase_ctx_flag(kctx, KCTX_ACTIVE) || ++ !atomic_read(&kctx->atoms_pulled)) { ++ /* Calling kbase_jm_idle_ctx() here will ensure that ++ * atoms are not fast-started when we drop the ++ * hwaccess_lock. This is not performed if ++ * KCTX_ACTIVE is set as in that case another pm ++ * reference has been taken and a fast-start would be ++ * valid. ++ */ ++ if (!kbase_ctx_flag(kctx, KCTX_ACTIVE)) ++ kbase_jm_idle_ctx(kbdev, kctx); ++ context_idle = true; ++ } else { ++ kbase_ctx_flag_set(kctx, KCTX_ACTIVE); ++ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&js_devdata->queue_mutex); ++ } + -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_POINTER(fence); ++ /* ++ * Transaction complete ++ */ ++ mutex_unlock(&jctx->lock); + -+ MALI_DEBUG_ASSERT_POINTER(job->system); -+ system = job->system; ++ /* Job is now no longer running, so can now safely release the context ++ * reference, and handle any actions that were logged against the atom's retained state */ + -+ MALI_DEBUG_ASSERT_POINTER(system->session); -+ MALI_DEBUG_ASSERT_POINTER(system->session->timeline_system); ++ kbasep_js_runpool_release_ctx_and_katom_retained_state(kbdev, kctx, &katom_retained_state); + -+ mali_soft_job_system_lock(system); ++ kbase_js_sched_all(kbdev); + -+ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_ALLOCATED == job->state); -+ job->state = MALI_SOFT_JOB_STATE_STARTED; ++ if (!atomic_dec_return(&kctx->work_count)) { ++ /* If worker now idle then post all events that jd_done_nolock() ++ * has queued */ ++ mutex_lock(&jctx->lock); ++ while (!list_empty(&kctx->completed_jobs)) { ++ struct kbase_jd_atom *atom = list_entry( ++ kctx->completed_jobs.next, ++ struct kbase_jd_atom, jd_item); ++ list_del(kctx->completed_jobs.next); + -+ mali_soft_job_system_unlock(system); ++ kbase_event_post(kctx, atom); ++ } ++ mutex_unlock(&jctx->lock); ++ } + -+ MALI_DEBUG_PRINT(4, ("Mali Soft Job: starting soft job %u (0x%08X)\n", job->id, job)); ++ kbase_backend_complete_wq_post_sched(kbdev, core_req, affinity, ++ coreref_state); + -+ mali_timeline_tracker_init(&job->tracker, MALI_TIMELINE_TRACKER_SOFT, fence, job); -+ point = mali_timeline_system_add_tracker(system->session->timeline_system, &job->tracker, MALI_TIMELINE_SOFT); ++ if (context_idle) ++ kbase_pm_context_idle(kbdev); + -+ return point; ++ KBASE_TRACE_ADD(kbdev, JD_DONE_WORKER_END, kctx, NULL, cache_jc, 0); +} + -+static mali_bool mali_soft_job_is_activated(void *data) ++/** ++ * jd_cancel_worker - Work queue job cancel function. ++ * @data: a &struct work_struct ++ * ++ * Only called as part of 'Zapping' a context (which occurs on termination). ++ * Operates serially with the kbase_jd_done_worker() on the work queue. ++ * ++ * This can only be called on contexts that aren't scheduled. ++ * ++ * We don't need to release most of the resources that would occur on ++ * kbase_jd_done() or kbase_jd_done_worker(), because the atoms here must not be ++ * running (by virtue of only being called on contexts that aren't ++ * scheduled). ++ */ ++static void jd_cancel_worker(struct work_struct *data) +{ -+ struct mali_soft_job *job; ++ struct kbase_jd_atom *katom = container_of(data, struct kbase_jd_atom, work); ++ struct kbase_jd_context *jctx; ++ struct kbase_context *kctx; ++ struct kbasep_js_kctx_info *js_kctx_info; ++ bool need_to_try_schedule_context; ++ bool attr_state_changed; ++ struct kbase_device *kbdev; + -+ job = (struct mali_soft_job *) data; -+ MALI_DEBUG_ASSERT_POINTER(job); ++ /* Soft jobs should never reach this function */ ++ KBASE_DEBUG_ASSERT((katom->core_req & BASE_JD_REQ_SOFT_JOB) == 0); + -+ return job->activated; ++ kctx = katom->kctx; ++ kbdev = kctx->kbdev; ++ jctx = &kctx->jctx; ++ js_kctx_info = &kctx->jctx.sched_info; ++ ++ KBASE_TRACE_ADD(kbdev, JD_CANCEL_WORKER, kctx, katom, katom->jc, 0); ++ ++ /* This only gets called on contexts that are scheduled out. Hence, we must ++ * make sure we don't de-ref the number of running jobs (there aren't ++ * any), nor must we try to schedule out the context (it's already ++ * scheduled out). ++ */ ++ KBASE_DEBUG_ASSERT(!kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ ++ /* Scheduler: Remove the job from the system */ ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++ attr_state_changed = kbasep_js_remove_cancelled_job(kbdev, kctx, katom); ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ ++ mutex_lock(&jctx->lock); ++ ++ need_to_try_schedule_context = jd_done_nolock(katom, NULL); ++ /* Because we're zapping, we're not adding any more jobs to this ctx, so no need to ++ * schedule the context. There's also no need for the jsctx_mutex to have been taken ++ * around this too. */ ++ KBASE_DEBUG_ASSERT(!need_to_try_schedule_context); ++ ++ /* katom may have been freed now, do not use! */ ++ mutex_unlock(&jctx->lock); ++ ++ if (attr_state_changed) ++ kbase_js_sched_all(kbdev); +} + -+_mali_osk_errcode_t mali_soft_job_system_signal_job(struct mali_soft_job_system *system, u32 job_id) ++/** ++ * kbase_jd_done - Complete a job that has been removed from the Hardware ++ * @katom: atom which has been completed ++ * @slot_nr: slot the atom was on ++ * @end_timestamp: completion time ++ * @done_code: completion code ++ * ++ * This must be used whenever a job has been removed from the Hardware, e.g.: ++ * An IRQ indicates that the job finished (for both error and 'done' codes), or ++ * the job was evicted from the JS_HEAD_NEXT registers during a Soft/Hard stop. ++ * ++ * Some work is carried out immediately, and the rest is deferred onto a ++ * workqueue ++ * ++ * Context: ++ * This can be called safely from atomic context. ++ * The caller must hold kbdev->hwaccess_lock ++ */ ++void kbase_jd_done(struct kbase_jd_atom *katom, int slot_nr, ++ ktime_t *end_timestamp, kbasep_js_atom_done_code done_code) +{ -+ struct mali_soft_job *job; -+ struct mali_timeline_system *timeline_system; -+ mali_scheduler_mask schedule_mask; ++ struct kbase_context *kctx; ++ struct kbase_device *kbdev; + -+ MALI_DEBUG_ASSERT_POINTER(system); ++ KBASE_DEBUG_ASSERT(katom); ++ kctx = katom->kctx; ++ KBASE_DEBUG_ASSERT(kctx); ++ kbdev = kctx->kbdev; ++ KBASE_DEBUG_ASSERT(kbdev); + -+ mali_soft_job_system_lock(system); ++ if (done_code & KBASE_JS_ATOM_DONE_EVICTED_FROM_NEXT) ++ katom->event_code = BASE_JD_EVENT_REMOVED_FROM_NEXT; + -+ job = mali_soft_job_system_lookup_job(system, job_id); ++ KBASE_TRACE_ADD(kbdev, JD_DONE, kctx, katom, katom->jc, 0); + -+ if ((NULL == job) || (MALI_SOFT_JOB_TYPE_USER_SIGNALED != job->type) -+ || !(MALI_SOFT_JOB_STATE_STARTED == job->state || MALI_SOFT_JOB_STATE_TIMED_OUT == job->state)) { -+ mali_soft_job_system_unlock(system); -+ MALI_PRINT_ERROR(("Mali Soft Job: invalid soft job id %u", job_id)); -+ return _MALI_OSK_ERR_ITEM_NOT_FOUND; -+ } ++ kbase_job_check_leave_disjoint(kbdev, katom); + -+ if (MALI_SOFT_JOB_STATE_TIMED_OUT == job->state) { -+ job->state = MALI_SOFT_JOB_STATE_SIGNALED; -+ mali_soft_job_system_unlock(system); ++ katom->slot_nr = slot_nr; + -+ MALI_DEBUG_ASSERT(MALI_TRUE == job->activated); -+ MALI_DEBUG_PRINT(4, ("Mali Soft Job: soft job %u (0x%08X) was timed out\n", job->id, job)); -+ mali_soft_job_destroy(job); ++ atomic_inc(&kctx->work_count); + -+ return _MALI_OSK_ERR_TIMEOUT; -+ } ++#ifdef CONFIG_DEBUG_FS ++ /* a failed job happened and is waiting for dumping*/ ++ if (!katom->will_fail_event_code && ++ kbase_debug_job_fault_process(katom, katom->event_code)) ++ return; ++#endif + -+ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_STARTED == job->state); ++ WARN_ON(work_pending(&katom->work)); ++ KBASE_DEBUG_ASSERT(0 == object_is_on_stack(&katom->work)); ++ INIT_WORK(&katom->work, kbase_jd_done_worker); ++ queue_work(kctx->jctx.job_done_wq, &katom->work); ++} + -+ job->state = MALI_SOFT_JOB_STATE_SIGNALED; -+ mali_soft_job_system_unlock(system); ++KBASE_EXPORT_TEST_API(kbase_jd_done); + -+ /* Since the job now is in signaled state, timeouts from the timeline system will be -+ * ignored, and it is not possible to signal this job again. */ ++void kbase_jd_cancel(struct kbase_device *kbdev, struct kbase_jd_atom *katom) ++{ ++ struct kbase_context *kctx; + -+ timeline_system = system->session->timeline_system; -+ MALI_DEBUG_ASSERT_POINTER(timeline_system); ++ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ KBASE_DEBUG_ASSERT(NULL != katom); ++ kctx = katom->kctx; ++ KBASE_DEBUG_ASSERT(NULL != kctx); + -+ /* Wait until activated. */ -+ _mali_osk_wait_queue_wait_event(timeline_system->wait_queue, mali_soft_job_is_activated, (void *) job); ++ KBASE_TRACE_ADD(kbdev, JD_CANCEL, kctx, katom, katom->jc, 0); + -+ MALI_DEBUG_PRINT(4, ("Mali Soft Job: signaling soft job %u (0x%08X)\n", job->id, job)); ++ /* This should only be done from a context that is not scheduled */ ++ KBASE_DEBUG_ASSERT(!kbase_ctx_flag(kctx, KCTX_SCHEDULED)); + -+ schedule_mask = mali_timeline_tracker_release(&job->tracker); -+ mali_executor_schedule_from_mask(schedule_mask, MALI_FALSE); ++ WARN_ON(work_pending(&katom->work)); + -+ mali_soft_job_destroy(job); ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; + -+ return _MALI_OSK_ERR_OK; ++ KBASE_DEBUG_ASSERT(0 == object_is_on_stack(&katom->work)); ++ INIT_WORK(&katom->work, jd_cancel_worker); ++ queue_work(kctx->jctx.job_done_wq, &katom->work); +} + -+static void mali_soft_job_send_activated_notification(struct mali_soft_job *job) -+{ -+ if (NULL != job->activated_notification) { -+ _mali_uk_soft_job_activated_s *res = job->activated_notification->result_buffer; -+ res->user_job = job->user_job; -+ mali_session_send_notification(job->system->session, job->activated_notification); -+ } -+ job->activated_notification = NULL; -+} + -+mali_scheduler_mask mali_soft_job_system_activate_job(struct mali_soft_job *job) ++void kbase_jd_zap_context(struct kbase_context *kctx) +{ -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; ++ struct kbase_jd_atom *katom; ++ struct list_head *entry, *tmp; ++ struct kbase_device *kbdev; + -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_POINTER(job->system); -+ MALI_DEBUG_ASSERT_POINTER(job->system->session); ++ KBASE_DEBUG_ASSERT(kctx); + -+ MALI_DEBUG_PRINT(4, ("Mali Soft Job: Timeline activation for soft job %u (0x%08X).\n", job->id, job)); ++ kbdev = kctx->kbdev; + -+ mali_soft_job_system_lock(job->system); ++ KBASE_TRACE_ADD(kbdev, JD_ZAP_CONTEXT, kctx, NULL, 0u, 0u); + -+ if (unlikely(job->system->session->is_aborting)) { -+ MALI_DEBUG_PRINT(3, ("Mali Soft Job: Soft job %u (0x%08X) activated while session is aborting.\n", job->id, job)); ++ kbase_js_zap_context(kctx); + -+ mali_soft_job_system_unlock(job->system); ++ mutex_lock(&kctx->jctx.lock); + -+ /* Since we are in shutdown, we can ignore the scheduling bitmask. */ -+ mali_timeline_tracker_release(&job->tracker); -+ mali_soft_job_destroy(job); -+ return schedule_mask; ++ /* ++ * While holding the struct kbase_jd_context lock clean up jobs which are known to kbase but are ++ * queued outside the job scheduler. ++ */ ++ ++ del_timer_sync(&kctx->soft_job_timeout); ++ list_for_each_safe(entry, tmp, &kctx->waiting_soft_jobs) { ++ katom = list_entry(entry, struct kbase_jd_atom, queue); ++ kbase_cancel_soft_job(katom); + } + -+ /* Send activated notification. */ -+ mali_soft_job_send_activated_notification(job); + -+ /* Wake up sleeping signaler. */ -+ job->activated = MALI_TRUE; ++#ifdef CONFIG_KDS + -+ /* If job type is self signaled, release tracker, move soft job to free list, and scheduler at once */ -+ if (MALI_SOFT_JOB_TYPE_SELF_SIGNALED == job->type) { -+ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_STARTED == job->state); ++ /* For each job waiting on a kds resource, cancel the wait and force the job to ++ * complete early, this is done so that we don't leave jobs outstanding waiting ++ * on kds resources which may never be released when contexts are zapped, resulting ++ * in a hang. ++ * ++ * Note that we can safely iterate over the list as the struct kbase_jd_context lock is held, ++ * this prevents items being removed when calling job_done_nolock in kbase_cancel_kds_wait_job. ++ */ + -+ job->state = MALI_SOFT_JOB_STATE_SIGNALED; -+ mali_soft_job_system_unlock(job->system); ++ list_for_each(entry, &kctx->waiting_kds_resource) { ++ katom = list_entry(entry, struct kbase_jd_atom, node); + -+ schedule_mask |= mali_timeline_tracker_release(&job->tracker); ++ kbase_cancel_kds_wait_job(katom); ++ } ++#endif + -+ mali_soft_job_destroy(job); -+ } else { -+ _mali_osk_wait_queue_wake_up(job->tracker.system->wait_queue); ++#ifdef CONFIG_MALI_DMA_FENCE ++ kbase_dma_fence_cancel_all_atoms(kctx); ++#endif + -+ mali_soft_job_system_unlock(job->system); -+ } ++ mutex_unlock(&kctx->jctx.lock); + -+ return schedule_mask; ++#ifdef CONFIG_MALI_DMA_FENCE ++ /* Flush dma-fence workqueue to ensure that any callbacks that may have ++ * been queued are done before continuing. ++ */ ++ flush_workqueue(kctx->dma_fence.wq); ++#endif ++ ++ kbase_jm_wait_for_zero_jobs(kctx); +} + -+mali_scheduler_mask mali_soft_job_system_timeout_job(struct mali_soft_job *job) ++KBASE_EXPORT_TEST_API(kbase_jd_zap_context); ++ ++int kbase_jd_init(struct kbase_context *kctx) +{ -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; ++ int i; ++ int mali_err = 0; ++#ifdef CONFIG_KDS ++ int err; ++#endif /* CONFIG_KDS */ + -+ MALI_DEBUG_ASSERT_POINTER(job); -+ MALI_DEBUG_ASSERT_POINTER(job->system); -+ MALI_DEBUG_ASSERT_POINTER(job->system->session); -+ MALI_DEBUG_ASSERT(MALI_TRUE == job->activated); ++ KBASE_DEBUG_ASSERT(kctx); + -+ MALI_DEBUG_PRINT(4, ("Mali Soft Job: Timeline timeout for soft job %u (0x%08X).\n", job->id, job)); ++ kctx->jctx.job_done_wq = alloc_workqueue("mali_jd", ++ WQ_HIGHPRI | WQ_UNBOUND, 1); ++ if (NULL == kctx->jctx.job_done_wq) { ++ mali_err = -ENOMEM; ++ goto out1; ++ } + -+ mali_soft_job_system_lock(job->system); ++ for (i = 0; i < BASE_JD_ATOM_COUNT; i++) { ++ init_waitqueue_head(&kctx->jctx.atoms[i].completed); + -+ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_STARTED == job->state || -+ MALI_SOFT_JOB_STATE_SIGNALED == job->state); ++ INIT_LIST_HEAD(&kctx->jctx.atoms[i].dep_head[0]); ++ INIT_LIST_HEAD(&kctx->jctx.atoms[i].dep_head[1]); + -+ if (unlikely(job->system->session->is_aborting)) { -+ /* The session is aborting. This job will be released and destroyed by @ref -+ * mali_soft_job_system_abort(). */ -+ mali_soft_job_system_unlock(job->system); ++ /* Catch userspace attempting to use an atom which doesn't exist as a pre-dependency */ ++ kctx->jctx.atoms[i].event_code = BASE_JD_EVENT_JOB_INVALID; ++ kctx->jctx.atoms[i].status = KBASE_JD_ATOM_STATE_UNUSED; + -+ return MALI_SCHEDULER_MASK_EMPTY; ++#if defined(CONFIG_MALI_DMA_FENCE) || defined(CONFIG_SYNC_FILE) ++ kctx->jctx.atoms[i].dma_fence.context = ++ dma_fence_context_alloc(1); ++ atomic_set(&kctx->jctx.atoms[i].dma_fence.seqno, 0); ++ INIT_LIST_HEAD(&kctx->jctx.atoms[i].dma_fence.callbacks); ++#endif + } + -+ if (MALI_SOFT_JOB_STATE_STARTED != job->state) { -+ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_SIGNALED == job->state); ++ mutex_init(&kctx->jctx.lock); + -+ /* The job is about to be signaled, ignore timeout. */ -+ MALI_DEBUG_PRINT(4, ("Mali Soft Job: Timeout on soft job %u (0x%08X) in signaled state.\n", job->id, job)); -+ mali_soft_job_system_unlock(job->system); -+ return schedule_mask; ++ init_waitqueue_head(&kctx->jctx.zero_jobs_wait); ++ ++ spin_lock_init(&kctx->jctx.tb_lock); ++ ++#ifdef CONFIG_KDS ++ err = kds_callback_init(&kctx->jctx.kds_cb, 0, kds_dep_clear); ++ if (0 != err) { ++ mali_err = -EINVAL; ++ goto out2; + } ++#endif /* CONFIG_KDS */ + -+ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_STARTED == job->state); ++ kctx->jctx.job_nr = 0; ++ INIT_LIST_HEAD(&kctx->completed_jobs); ++ atomic_set(&kctx->work_count, 0); + -+ job->state = MALI_SOFT_JOB_STATE_TIMED_OUT; -+ _mali_osk_atomic_inc(&job->refcount); ++ return 0; + -+ mali_soft_job_system_unlock(job->system); ++#ifdef CONFIG_KDS ++ out2: ++ destroy_workqueue(kctx->jctx.job_done_wq); ++#endif /* CONFIG_KDS */ ++ out1: ++ return mali_err; ++} + -+ schedule_mask = mali_timeline_tracker_release(&job->tracker); ++KBASE_EXPORT_TEST_API(kbase_jd_init); + -+ mali_soft_job_destroy(job); ++void kbase_jd_exit(struct kbase_context *kctx) ++{ ++ KBASE_DEBUG_ASSERT(kctx); + -+ return schedule_mask; ++#ifdef CONFIG_KDS ++ kds_callback_term(&kctx->jctx.kds_cb); ++#endif /* CONFIG_KDS */ ++ /* Work queue is emptied by this */ ++ destroy_workqueue(kctx->jctx.job_done_wq); +} + -+void mali_soft_job_system_abort(struct mali_soft_job_system *system) -+{ -+ struct mali_soft_job *job, *tmp; -+ _MALI_OSK_LIST_HEAD_STATIC_INIT(jobs); ++KBASE_EXPORT_TEST_API(kbase_jd_exit); +diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c +new file mode 100755 +index 000000000..44643abf8 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c +@@ -0,0 +1,233 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(system->session); -+ MALI_DEBUG_ASSERT(system->session->is_aborting); + -+ MALI_DEBUG_PRINT(3, ("Mali Soft Job: Aborting soft job system for session 0x%08X.\n", system->session)); + -+ mali_soft_job_system_lock(system); ++#ifdef CONFIG_DEBUG_FS + -+ _MALI_OSK_LIST_FOREACHENTRY(job, tmp, &system->jobs_used, struct mali_soft_job, system_list) { -+ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_STARTED == job->state || -+ MALI_SOFT_JOB_STATE_TIMED_OUT == job->state); ++#include ++#include ++#include ++#include ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#include ++#endif + -+ if (MALI_SOFT_JOB_STATE_STARTED == job->state) { -+ /* If the job has been activated, we have to release the tracker and destroy -+ * the job. If not, the tracker will be released and the job destroyed when -+ * it is activated. */ -+ if (MALI_TRUE == job->activated) { -+ MALI_DEBUG_PRINT(3, ("Mali Soft Job: Aborting unsignaled soft job %u (0x%08X).\n", job->id, job)); ++struct kbase_jd_debugfs_depinfo { ++ u8 id; ++ char type; ++}; + -+ job->state = MALI_SOFT_JOB_STATE_SIGNALED; -+ _mali_osk_list_move(&job->system_list, &jobs); -+ } -+ } else if (MALI_SOFT_JOB_STATE_TIMED_OUT == job->state) { -+ MALI_DEBUG_PRINT(3, ("Mali Soft Job: Aborting timed out soft job %u (0x%08X).\n", job->id, job)); ++static void kbase_jd_debugfs_fence_info(struct kbase_jd_atom *atom, ++ struct seq_file *sfile) ++{ ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ struct kbase_sync_fence_info info; ++ int res; + -+ /* We need to destroy this soft job. */ -+ _mali_osk_list_move(&job->system_list, &jobs); -+ } ++ switch (atom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { ++ case BASE_JD_REQ_SOFT_FENCE_TRIGGER: ++ res = kbase_sync_fence_out_info_get(atom, &info); ++ if (res == 0) ++ seq_printf(sfile, "Sa([%p]%d) ", ++ info.fence, info.status); ++ break; ++ case BASE_JD_REQ_SOFT_FENCE_WAIT: ++ res = kbase_sync_fence_in_info_get(atom, &info); ++ if (res == 0) ++ seq_printf(sfile, "Wa([%p]%d) ", ++ info.fence, info.status); ++ break; ++ default: ++ break; + } ++#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ + -+ mali_soft_job_system_unlock(system); ++#ifdef CONFIG_MALI_DMA_FENCE ++ if (atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) { ++ struct kbase_fence_cb *cb; + -+ /* Release and destroy jobs. */ -+ _MALI_OSK_LIST_FOREACHENTRY(job, tmp, &jobs, struct mali_soft_job, system_list) { -+ MALI_DEBUG_ASSERT(MALI_SOFT_JOB_STATE_SIGNALED == job->state || -+ MALI_SOFT_JOB_STATE_TIMED_OUT == job->state); ++ if (atom->dma_fence.fence) { ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ struct fence *fence = atom->dma_fence.fence; ++#else ++ struct dma_fence *fence = atom->dma_fence.fence; ++#endif + -+ if (MALI_SOFT_JOB_STATE_SIGNALED == job->state) { -+ mali_timeline_tracker_release(&job->tracker); ++ seq_printf(sfile, ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) ++ "Sd(%u#%u: %s) ", ++#else ++ "Sd(%llu#%u: %s) ", ++#endif ++ fence->context, ++ fence->seqno, ++ dma_fence_is_signaled(fence) ? ++ "signaled" : "active"); + } + -+ /* Move job back to used list before destroying. */ -+ _mali_osk_list_move(&job->system_list, &system->jobs_used); ++ list_for_each_entry(cb, &atom->dma_fence.callbacks, ++ node) { ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ struct fence *fence = cb->fence; ++#else ++ struct dma_fence *fence = cb->fence; ++#endif + -+ mali_soft_job_destroy(job); ++ seq_printf(sfile, ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) ++ "Wd(%u#%u: %s) ", ++#else ++ "Wd(%llu#%u: %s) ", ++#endif ++ fence->context, ++ fence->seqno, ++ dma_fence_is_signaled(fence) ? ++ "signaled" : "active"); ++ } + } -+} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h -new file mode 100755 -index 000000000000..018ef4c527d9 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h -@@ -0,0 +1,190 @@ -+/* -+ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef __MALI_SOFT_JOB_H__ -+#define __MALI_SOFT_JOB_H__ -+ -+#include "mali_osk.h" ++#endif /* CONFIG_MALI_DMA_FENCE */ + -+#include "mali_timeline.h" ++} + -+struct mali_timeline_fence; -+struct mali_session_data; -+struct mali_soft_job; -+struct mali_soft_job_system; ++static void kbasep_jd_debugfs_atom_deps( ++ struct kbase_jd_debugfs_depinfo *deps, ++ struct kbase_jd_atom *atom) ++{ ++ struct kbase_context *kctx = atom->kctx; ++ int i; + -+/** -+ * Soft job types. -+ * -+ * Soft jobs of type MALI_SOFT_JOB_TYPE_USER_SIGNALED will only complete after activation if either -+ * they are signaled by user-space (@ref mali_soft_job_system_signaled_job) or if they are timed out -+ * by the Timeline system. -+ * Soft jobs of type MALI_SOFT_JOB_TYPE_SELF_SIGNALED will release job resource automatically -+ * in kernel when the job is activated. -+ */ -+typedef enum mali_soft_job_type { -+ MALI_SOFT_JOB_TYPE_SELF_SIGNALED, -+ MALI_SOFT_JOB_TYPE_USER_SIGNALED, -+} mali_soft_job_type; ++ for (i = 0; i < 2; i++) { ++ deps[i].id = (unsigned)(atom->dep[i].atom ? ++ kbase_jd_atom_id(kctx, atom->dep[i].atom) : 0); + ++ switch (atom->dep[i].dep_type) { ++ case BASE_JD_DEP_TYPE_INVALID: ++ deps[i].type = ' '; ++ break; ++ case BASE_JD_DEP_TYPE_DATA: ++ deps[i].type = 'D'; ++ break; ++ case BASE_JD_DEP_TYPE_ORDER: ++ deps[i].type = '>'; ++ break; ++ default: ++ deps[i].type = '?'; ++ break; ++ } ++ } ++} +/** -+ * Soft job state. -+ * -+ * mali_soft_job_system_start_job a job will first be allocated.The job's state set to MALI_SOFT_JOB_STATE_ALLOCATED. -+ * Once the job is added to the timeline system, the state changes to MALI_SOFT_JOB_STATE_STARTED. -+ * -+ * For soft jobs of type MALI_SOFT_JOB_TYPE_USER_SIGNALED the state is changed to -+ * MALI_SOFT_JOB_STATE_SIGNALED when @ref mali_soft_job_system_signal_job is called and the soft -+ * job's state is MALI_SOFT_JOB_STATE_STARTED or MALI_SOFT_JOB_STATE_TIMED_OUT. ++ * kbasep_jd_debugfs_atoms_show - Show callback for the JD atoms debugfs file. ++ * @sfile: The debugfs entry ++ * @data: Data associated with the entry + * -+ * If a soft job of type MALI_SOFT_JOB_TYPE_USER_SIGNALED is timed out before being signaled, the -+ * state is changed to MALI_SOFT_JOB_STATE_TIMED_OUT. This can only happen to soft jobs in state -+ * MALI_SOFT_JOB_STATE_STARTED. ++ * This function is called to get the contents of the JD atoms debugfs file. ++ * This is a report of all atoms managed by kbase_jd_context.atoms + * ++ * Return: 0 if successfully prints data in debugfs entry file, failure ++ * otherwise + */ -+typedef enum mali_soft_job_state { -+ MALI_SOFT_JOB_STATE_ALLOCATED, -+ MALI_SOFT_JOB_STATE_STARTED, -+ MALI_SOFT_JOB_STATE_SIGNALED, -+ MALI_SOFT_JOB_STATE_TIMED_OUT, -+} mali_soft_job_state; ++static int kbasep_jd_debugfs_atoms_show(struct seq_file *sfile, void *data) ++{ ++ struct kbase_context *kctx = sfile->private; ++ struct kbase_jd_atom *atoms; ++ unsigned long irq_flags; ++ int i; + -+#define MALI_SOFT_JOB_INVALID_ID ((u32) -1) ++ KBASE_DEBUG_ASSERT(kctx != NULL); + -+/** -+ * Soft job struct. -+ * -+ * Soft job can be used to represent any kind of CPU work done in kernel-space. -+ */ -+typedef struct mali_soft_job { -+ mali_soft_job_type type; /**< Soft job type. Must be one of MALI_SOFT_JOB_TYPE_*. */ -+ u64 user_job; /**< Identifier for soft job in user space. */ -+ _mali_osk_atomic_t refcount; /**< Soft jobs are reference counted to prevent premature deletion. */ -+ struct mali_timeline_tracker tracker; /**< Timeline tracker for soft job. */ -+ mali_bool activated; /**< MALI_TRUE if the job has been activated, MALI_FALSE if not. */ -+ _mali_osk_notification_t *activated_notification; /**< Pre-allocated notification object for ACTIVATED_NOTIFICATION. */ ++ /* Print version */ ++ seq_printf(sfile, "v%u\n", MALI_JD_DEBUGFS_VERSION); + -+ /* Protected by soft job system lock. */ -+ u32 id; /**< Used by user-space to find corresponding soft job in kernel-space. */ -+ mali_soft_job_state state; /**< State of soft job, must be one of MALI_SOFT_JOB_STATE_*. */ -+ struct mali_soft_job_system *system; /**< The soft job system this job is in. */ -+ _mali_osk_list_t system_list; /**< List element used by soft job system. */ -+} mali_soft_job; ++ /* Print U/K API version */ ++ seq_printf(sfile, "ukv%u.%u\n", BASE_UK_VERSION_MAJOR, ++ BASE_UK_VERSION_MINOR); + -+/** -+ * Per-session soft job system. -+ * -+ * The soft job system is used to manage all soft jobs that belongs to a session. -+ */ -+typedef struct mali_soft_job_system { -+ struct mali_session_data *session; /**< The session this soft job system belongs to. */ -+ _MALI_OSK_LIST_HEAD(jobs_used); /**< List of all allocated soft jobs. */ ++ /* Print table heading */ ++ seq_puts(sfile, " ID, Core req, St, CR, Predeps, Start time, Additional info...\n"); + -+ _mali_osk_spinlock_irq_t *lock; /**< Lock used to protect soft job system and its soft jobs. */ -+ u32 lock_owner; /**< Contains tid of thread that locked the system or 0, if not locked. */ -+ u32 last_job_id; /**< Recored the last job id protected by lock. */ -+} mali_soft_job_system; ++ atoms = kctx->jctx.atoms; ++ /* General atom states */ ++ mutex_lock(&kctx->jctx.lock); ++ /* JS-related states */ ++ spin_lock_irqsave(&kctx->kbdev->hwaccess_lock, irq_flags); ++ for (i = 0; i != BASE_JD_ATOM_COUNT; ++i) { ++ struct kbase_jd_atom *atom = &atoms[i]; ++ s64 start_timestamp = 0; ++ struct kbase_jd_debugfs_depinfo deps[2]; ++ ++ if (atom->status == KBASE_JD_ATOM_STATE_UNUSED) ++ continue; ++ ++ /* start_timestamp is cleared as soon as the atom leaves UNUSED state ++ * and set before a job is submitted to the h/w, a non-zero value means ++ * it is valid */ ++ if (ktime_to_ns(atom->start_timestamp)) ++ start_timestamp = ktime_to_ns( ++ ktime_sub(ktime_get(), atom->start_timestamp)); ++ ++ kbasep_jd_debugfs_atom_deps(deps, atom); ++ ++ seq_printf(sfile, ++ "%3u, %8x, %2u, %2u, %c%3u %c%3u, %20lld, ", ++ i, atom->core_req, atom->status, ++ atom->coreref_state, ++ deps[0].type, deps[0].id, ++ deps[1].type, deps[1].id, ++ start_timestamp); ++ ++ ++ kbase_jd_debugfs_fence_info(atom, sfile); ++ ++ seq_puts(sfile, "\n"); ++ } ++ spin_unlock_irqrestore(&kctx->kbdev->hwaccess_lock, irq_flags); ++ mutex_unlock(&kctx->jctx.lock); ++ ++ return 0; ++} + -+/** -+ * Create a soft job system. -+ * -+ * @param session The session this soft job system will belong to. -+ * @return The new soft job system, or NULL if unsuccessful. -+ */ -+struct mali_soft_job_system *mali_soft_job_system_create(struct mali_session_data *session); + +/** -+ * Destroy a soft job system. -+ * -+ * @note The soft job must not have any started or activated jobs. Call @ref -+ * mali_soft_job_system_abort first. ++ * kbasep_jd_debugfs_atoms_open - open operation for atom debugfs file ++ * @in: &struct inode pointer ++ * @file: &struct file pointer + * -+ * @param system The soft job system we are destroying. ++ * Return: file descriptor + */ -+void mali_soft_job_system_destroy(struct mali_soft_job_system *system); ++static int kbasep_jd_debugfs_atoms_open(struct inode *in, struct file *file) ++{ ++ return single_open(file, kbasep_jd_debugfs_atoms_show, in->i_private); ++} + -+/** -+ * Create a soft job. ++static const struct file_operations kbasep_jd_debugfs_atoms_fops = { ++ .open = kbasep_jd_debugfs_atoms_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++ ++void kbasep_jd_debugfs_ctx_init(struct kbase_context *kctx) ++{ ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ ++ /* Expose all atoms */ ++ debugfs_create_file("atoms", S_IRUGO, kctx->kctx_dentry, kctx, ++ &kbasep_jd_debugfs_atoms_fops); ++ ++} ++ ++#endif /* CONFIG_DEBUG_FS */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h +new file mode 100755 +index 000000000..0935f1db7 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h +@@ -0,0 +1,39 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * @param system Soft job system to create soft job from. -+ * @param type Type of the soft job. -+ * @param user_job Identifier for soft job in user space. -+ * @return New soft job if successful, NULL if not. + */ -+struct mali_soft_job *mali_soft_job_create(struct mali_soft_job_system *system, mali_soft_job_type type, u64 user_job); ++ ++ + +/** -+ * Destroy soft job. -+ * -+ * @param job Soft job to destroy. ++ * @file mali_kbase_jd_debugfs.h ++ * Header file for job dispatcher-related entries in debugfs + */ -+void mali_soft_job_destroy(struct mali_soft_job *job); ++ ++#ifndef _KBASE_JD_DEBUGFS_H ++#define _KBASE_JD_DEBUGFS_H ++ ++#include ++ ++#include ++ ++#define MALI_JD_DEBUGFS_VERSION 2 + +/** -+ * Start a soft job. -+ * -+ * The soft job will be added to the Timeline system which will then activate it after all -+ * dependencies have been resolved. -+ * -+ * Create soft jobs with @ref mali_soft_job_create before starting them. ++ * kbasep_jd_debugfs_ctx_init() - Add debugfs entries for JD system + * -+ * @param job Soft job to start. -+ * @param fence Fence representing dependencies for this soft job. -+ * @return Point on soft job timeline. ++ * @kctx Pointer to kbase_context + */ -+mali_timeline_point mali_soft_job_start(struct mali_soft_job *job, struct mali_timeline_fence *fence); ++void kbasep_jd_debugfs_ctx_init(struct kbase_context *kctx); + -+/** -+ * Use by user-space to signal that a soft job has completed. -+ * -+ * @note Only valid for soft jobs with type MALI_SOFT_JOB_TYPE_USER_SIGNALED. -+ * -+ * @note The soft job must be in state MALI_SOFT_JOB_STATE_STARTED for the signal to be successful. ++#endif /*_KBASE_JD_DEBUGFS_H*/ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_jm.c b/drivers/gpu/arm/midgard/mali_kbase_jm.c +new file mode 100755 +index 000000000..0c5c6a6f7 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_jm.c +@@ -0,0 +1,131 @@ ++/* + * -+ * @note If the soft job was signaled successfully, or it received a time out, the soft job will be -+ * destroyed after this call and should no longer be used. ++ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. + * -+ * @note This function will block until the soft job has been activated. ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. + * -+ * @param system The soft job system the job was started in. -+ * @param job_id ID of soft job we are signaling. ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * @return _MALI_OSK_ERR_ITEM_NOT_FOUND if the soft job ID was invalid, _MALI_OSK_ERR_TIMEOUT if the -+ * soft job was timed out or _MALI_OSK_ERR_OK if we successfully signaled the soft job. + */ -+_mali_osk_errcode_t mali_soft_job_system_signal_job(struct mali_soft_job_system *system, u32 job_id); + -+/** -+ * Used by the Timeline system to activate a soft job. -+ * -+ * @param job The soft job that is being activated. -+ * @return A scheduling bitmask. -+ */ -+mali_scheduler_mask mali_soft_job_system_activate_job(struct mali_soft_job *job); + -+/** -+ * Used by the Timeline system to timeout a soft job. -+ * -+ * A soft job is timed out if it completes or is signaled later than MALI_TIMELINE_TIMEOUT_HZ after -+ * activation. -+ * -+ * @param job The soft job that is being timed out. -+ * @return A scheduling bitmask. ++ ++ ++/* ++ * HW access job manager common APIs + */ -+mali_scheduler_mask mali_soft_job_system_timeout_job(struct mali_soft_job *job); ++ ++#include ++#include "mali_kbase_hwaccess_jm.h" ++#include "mali_kbase_jm.h" + +/** -+ * Used to cleanup activated soft jobs in the soft job system on session abort. ++ * kbase_jm_next_job() - Attempt to run the next @nr_jobs_to_submit jobs on slot ++ * @js on the active context. ++ * @kbdev: Device pointer ++ * @js: Job slot to run on ++ * @nr_jobs_to_submit: Number of jobs to attempt to submit + * -+ * @param system The soft job system that is being aborted. ++ * Return: true if slot can still be submitted on, false if slot is now full. + */ -+void mali_soft_job_system_abort(struct mali_soft_job_system *system); ++static bool kbase_jm_next_job(struct kbase_device *kbdev, int js, ++ int nr_jobs_to_submit) ++{ ++ struct kbase_context *kctx; ++ int i; + -+#endif /* __MALI_SOFT_JOB_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c -new file mode 100755 -index 000000000000..f829e99f02ab ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c -@@ -0,0 +1,77 @@ -+/* -+ * Copyright (C) 2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ kctx = kbdev->hwaccess.active_kctx; + -+#include "mali_spinlock_reentrant.h" ++ if (!kctx) ++ return true; + -+#include "mali_osk.h" -+#include "mali_kernel_common.h" ++ for (i = 0; i < nr_jobs_to_submit; i++) { ++ struct kbase_jd_atom *katom = kbase_js_pull(kctx, js); + -+struct mali_spinlock_reentrant *mali_spinlock_reentrant_init(_mali_osk_lock_order_t lock_order) -+{ -+ struct mali_spinlock_reentrant *spinlock; ++ if (!katom) ++ return true; /* Context has no jobs on this slot */ + -+ spinlock = _mali_osk_calloc(1, sizeof(struct mali_spinlock_reentrant)); -+ if (NULL == spinlock) { -+ return NULL; ++ kbase_backend_run_atom(kbdev, katom); + } + -+ spinlock->lock = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_ORDERED, lock_order); -+ if (NULL == spinlock->lock) { -+ mali_spinlock_reentrant_term(spinlock); -+ return NULL; ++ return false; /* Slot ringbuffer should now be full */ ++} ++ ++u32 kbase_jm_kick(struct kbase_device *kbdev, u32 js_mask) ++{ ++ u32 ret_mask = 0; ++ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ while (js_mask) { ++ int js = ffs(js_mask) - 1; ++ int nr_jobs_to_submit = kbase_backend_slot_free(kbdev, js); ++ ++ if (kbase_jm_next_job(kbdev, js, nr_jobs_to_submit)) ++ ret_mask |= (1 << js); ++ ++ js_mask &= ~(1 << js); + } + -+ return spinlock; ++ return ret_mask; +} + -+void mali_spinlock_reentrant_term(struct mali_spinlock_reentrant *spinlock) ++void kbase_jm_try_kick(struct kbase_device *kbdev, u32 js_mask) +{ -+ MALI_DEBUG_ASSERT_POINTER(spinlock); -+ MALI_DEBUG_ASSERT(0 == spinlock->counter && 0 == spinlock->owner); ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; + -+ if (NULL != spinlock->lock) { -+ _mali_osk_spinlock_irq_term(spinlock->lock); -+ } ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ _mali_osk_free(spinlock); ++ if (!down_trylock(&js_devdata->schedule_sem)) { ++ kbase_jm_kick(kbdev, js_mask); ++ up(&js_devdata->schedule_sem); ++ } +} + -+void mali_spinlock_reentrant_wait(struct mali_spinlock_reentrant *spinlock, u32 tid) ++void kbase_jm_try_kick_all(struct kbase_device *kbdev) +{ -+ MALI_DEBUG_ASSERT_POINTER(spinlock); -+ MALI_DEBUG_ASSERT_POINTER(spinlock->lock); -+ MALI_DEBUG_ASSERT(0 != tid); ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; + -+ MALI_DEBUG_PRINT(5, ("%s ^\n", __FUNCTION__)); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ if (tid != spinlock->owner) { -+ _mali_osk_spinlock_irq_lock(spinlock->lock); -+ MALI_DEBUG_ASSERT(0 == spinlock->owner && 0 == spinlock->counter); -+ spinlock->owner = tid; ++ if (!down_trylock(&js_devdata->schedule_sem)) { ++ kbase_jm_kick_all(kbdev); ++ up(&js_devdata->schedule_sem); + } ++} + -+ MALI_DEBUG_PRINT(5, ("%s v\n", __FUNCTION__)); ++void kbase_jm_idle_ctx(struct kbase_device *kbdev, struct kbase_context *kctx) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ ++spinlock->counter; ++ if (kbdev->hwaccess.active_kctx == kctx) ++ kbdev->hwaccess.active_kctx = NULL; +} + -+void mali_spinlock_reentrant_signal(struct mali_spinlock_reentrant *spinlock, u32 tid) ++struct kbase_jd_atom *kbase_jm_return_atom_to_js(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom) +{ -+ MALI_DEBUG_ASSERT_POINTER(spinlock); -+ MALI_DEBUG_ASSERT_POINTER(spinlock->lock); -+ MALI_DEBUG_ASSERT(0 != tid && tid == spinlock->owner); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ --spinlock->counter; -+ if (0 == spinlock->counter) { -+ spinlock->owner = 0; -+ MALI_DEBUG_PRINT(5, ("%s release last\n", __FUNCTION__)); -+ _mali_osk_spinlock_irq_unlock(spinlock->lock); ++ if (katom->event_code != BASE_JD_EVENT_STOPPED && ++ katom->event_code != BASE_JD_EVENT_REMOVED_FROM_NEXT) { ++ return kbase_js_complete_atom(katom, NULL); ++ } else { ++ kbase_js_unpull(katom->kctx, katom); ++ return NULL; + } +} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h ++ ++struct kbase_jd_atom *kbase_jm_complete(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom, ktime_t *end_timestamp) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ return kbase_js_complete_atom(katom, end_timestamp); ++} ++ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_jm.h b/drivers/gpu/arm/midgard/mali_kbase_jm.h new file mode 100755 -index 000000000000..4d788ec1bbe4 +index 000000000..a74ee24c8 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h -@@ -0,0 +1,70 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_jm.h +@@ -0,0 +1,110 @@ +/* -+ * Copyright (C) 2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2014, 2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef __MALI_SPINLOCK_REENTRANT_H__ -+#define __MALI_SPINLOCK_REENTRANT_H__ + -+#include "mali_osk.h" -+#include "mali_kernel_common.h" ++ ++ ++/* ++ * Job manager common APIs ++ */ ++ ++#ifndef _KBASE_JM_H_ ++#define _KBASE_JM_H_ + +/** -+ * Reentrant spinlock. ++ * kbase_jm_kick() - Indicate that there are jobs ready to run. ++ * @kbdev: Device pointer ++ * @js_mask: Mask of the job slots that can be pulled from. ++ * ++ * Caller must hold the hwaccess_lock and schedule_sem semaphore ++ * ++ * Return: Mask of the job slots that can still be submitted to. + */ -+struct mali_spinlock_reentrant { -+ _mali_osk_spinlock_irq_t *lock; -+ u32 owner; -+ u32 counter; -+}; ++u32 kbase_jm_kick(struct kbase_device *kbdev, u32 js_mask); + +/** -+ * Create a new reentrant spinlock. ++ * kbase_jm_kick_all() - Indicate that there are jobs ready to run on all job ++ * slots. ++ * @kbdev: Device pointer + * -+ * @param lock_order Lock order. -+ * @return New reentrant spinlock. ++ * Caller must hold the hwaccess_lock and schedule_sem semaphore ++ * ++ * Return: Mask of the job slots that can still be submitted to. + */ -+struct mali_spinlock_reentrant *mali_spinlock_reentrant_init(_mali_osk_lock_order_t lock_order); ++static inline u32 kbase_jm_kick_all(struct kbase_device *kbdev) ++{ ++ return kbase_jm_kick(kbdev, (1 << kbdev->gpu_props.num_job_slots) - 1); ++} + +/** -+ * Terminate reentrant spinlock and free any associated resources. ++ * kbase_jm_try_kick - Attempt to call kbase_jm_kick ++ * @kbdev: Device pointer ++ * @js_mask: Mask of the job slots that can be pulled from ++ * Context: Caller must hold hwaccess_lock + * -+ * @param spinlock Reentrant spinlock to terminate. ++ * If schedule_sem can be immediately obtained then this function will call ++ * kbase_jm_kick() otherwise it will do nothing. + */ -+void mali_spinlock_reentrant_term(struct mali_spinlock_reentrant *spinlock); ++void kbase_jm_try_kick(struct kbase_device *kbdev, u32 js_mask); + +/** -+ * Wait for reentrant spinlock to be signaled. ++ * kbase_jm_try_kick_all() - Attempt to call kbase_jm_kick_all ++ * @kbdev: Device pointer ++ * Context: Caller must hold hwaccess_lock + * -+ * @param spinlock Reentrant spinlock. -+ * @param tid Thread ID. ++ * If schedule_sem can be immediately obtained then this function will call ++ * kbase_jm_kick_all() otherwise it will do nothing. + */ -+void mali_spinlock_reentrant_wait(struct mali_spinlock_reentrant *spinlock, u32 tid); ++void kbase_jm_try_kick_all(struct kbase_device *kbdev); + +/** -+ * Signal reentrant spinlock. ++ * kbase_jm_idle_ctx() - Mark a context as idle. ++ * @kbdev: Device pointer ++ * @kctx: Context to mark as idle + * -+ * @param spinlock Reentrant spinlock. -+ * @param tid Thread ID. ++ * No more atoms will be pulled from this context until it is marked as active ++ * by kbase_js_use_ctx(). ++ * ++ * The context should have no atoms currently pulled from it ++ * (kctx->atoms_pulled == 0). ++ * ++ * Caller must hold the hwaccess_lock + */ -+void mali_spinlock_reentrant_signal(struct mali_spinlock_reentrant *spinlock, u32 tid); ++void kbase_jm_idle_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); + +/** -+ * Check if thread is holding reentrant spinlock. ++ * kbase_jm_return_atom_to_js() - Return an atom to the job scheduler that has ++ * been soft-stopped or will fail due to a ++ * dependency ++ * @kbdev: Device pointer ++ * @katom: Atom that has been stopped or will be failed + * -+ * @param spinlock Reentrant spinlock. -+ * @param tid Thread ID. -+ * @return MALI_TRUE if thread is holding spinlock, MALI_FALSE if not. ++ * Return: Atom that has now been unblocked and can now be run, or NULL if none + */ -+MALI_STATIC_INLINE mali_bool mali_spinlock_reentrant_is_held(struct mali_spinlock_reentrant *spinlock, u32 tid) -+{ -+ MALI_DEBUG_ASSERT_POINTER(spinlock->lock); -+ return (tid == spinlock->owner && 0 < spinlock->counter); -+} ++struct kbase_jd_atom *kbase_jm_return_atom_to_js(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom); + -+#endif /* __MALI_SPINLOCK_REENTRANT_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c ++/** ++ * kbase_jm_complete() - Complete an atom ++ * @kbdev: Device pointer ++ * @katom: Atom that has completed ++ * @end_timestamp: Timestamp of atom completion ++ * ++ * Return: Atom that has now been unblocked and can now be run, or NULL if none ++ */ ++struct kbase_jd_atom *kbase_jm_complete(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom, ktime_t *end_timestamp); ++ ++#endif /* _KBASE_JM_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_js.c b/drivers/gpu/arm/midgard/mali_kbase_js.c new file mode 100755 -index 000000000000..ffffee9306ce +index 000000000..10a1d5909 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c -@@ -0,0 +1,1964 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_js.c +@@ -0,0 +1,2834 @@ +/* -+ * Copyright (C) 2013-2018 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ -+#include -+#include "mali_timeline.h" -+#include "mali_kernel_common.h" -+#include "mali_scheduler.h" -+#include "mali_soft_job.h" -+#include "mali_timeline_fence_wait.h" -+#include "mali_timeline_sync_fence.h" -+#include "mali_executor.h" -+#include "mali_pp_job.h" + -+#define MALI_TIMELINE_SYSTEM_LOCKED(system) (mali_spinlock_reentrant_is_held((system)->spinlock, _mali_osk_get_tid())) ++/* #define ENABLE_DEBUG_LOG */ ++#include "./platform/rk/custom_log.h" + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+_mali_osk_wq_work_t *sync_fence_callback_work_t = NULL; -+_mali_osk_spinlock_irq_t *sync_fence_callback_list_lock = NULL; -+static _MALI_OSK_LIST_HEAD_STATIC_INIT(sync_fence_callback_queue); ++/* ++ * Job Scheduler Implementation ++ */ ++#include ++#include ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++#include +#endif ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include "mali_kbase_jm.h" ++#include "mali_kbase_hwaccess_jm.h" + +/* -+ * Following three elements are used to record how many -+ * gp, physical pp or virtual pp jobs are delayed in the whole -+ * timeline system, we can use these three value to decide -+ * if need to deactivate idle group. ++ * Private types + */ -+_mali_osk_atomic_t gp_tracker_count; -+_mali_osk_atomic_t phy_pp_tracker_count; -+_mali_osk_atomic_t virt_pp_tracker_count; + -+static mali_scheduler_mask mali_timeline_system_release_waiter(struct mali_timeline_system *system, -+ struct mali_timeline_waiter *waiter); ++/* Bitpattern indicating the result of releasing a context */ ++enum { ++ /* The context was descheduled - caller should try scheduling in a new ++ * one to keep the runpool full */ ++ KBASEP_JS_RELEASE_RESULT_WAS_DESCHEDULED = (1u << 0), ++ /* Ctx attributes were changed - caller should try scheduling all ++ * contexts */ ++ KBASEP_JS_RELEASE_RESULT_SCHED_ALL = (1u << 1) ++}; + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) -+#include -+#include -+#include ++typedef u32 kbasep_js_release_result; + -+struct mali_deferred_fence_put_entry { -+ struct hlist_node list; -+ struct sync_fence *fence; ++const int kbasep_js_atom_priority_to_relative[BASE_JD_NR_PRIO_LEVELS] = { ++ KBASE_JS_ATOM_SCHED_PRIO_MED, /* BASE_JD_PRIO_MEDIUM */ ++ KBASE_JS_ATOM_SCHED_PRIO_HIGH, /* BASE_JD_PRIO_HIGH */ ++ KBASE_JS_ATOM_SCHED_PRIO_LOW /* BASE_JD_PRIO_LOW */ +}; + -+static HLIST_HEAD(mali_timeline_sync_fence_to_free_list); -+static DEFINE_SPINLOCK(mali_timeline_sync_fence_to_free_lock); ++const base_jd_prio ++kbasep_js_relative_priority_to_atom[KBASE_JS_ATOM_SCHED_PRIO_COUNT] = { ++ BASE_JD_PRIO_HIGH, /* KBASE_JS_ATOM_SCHED_PRIO_HIGH */ ++ BASE_JD_PRIO_MEDIUM, /* KBASE_JS_ATOM_SCHED_PRIO_MED */ ++ BASE_JD_PRIO_LOW /* KBASE_JS_ATOM_SCHED_PRIO_LOW */ ++}; + -+static void put_sync_fences(struct work_struct *ignore) -+{ -+ struct hlist_head list; -+ struct hlist_node *tmp, *pos; -+ unsigned long flags; -+ struct mali_deferred_fence_put_entry *o; + -+ spin_lock_irqsave(&mali_timeline_sync_fence_to_free_lock, flags); -+ hlist_move_list(&mali_timeline_sync_fence_to_free_list, &list); -+ spin_unlock_irqrestore(&mali_timeline_sync_fence_to_free_lock, flags); ++/* ++ * Private function prototypes ++ */ ++static kbasep_js_release_result kbasep_js_runpool_release_ctx_internal( ++ struct kbase_device *kbdev, struct kbase_context *kctx, ++ struct kbasep_js_atom_retained_state *katom_retained_state); + -+ hlist_for_each_entry_safe(o, pos, tmp, &list, list) { -+ sync_fence_put(o->fence); -+ kfree(o); -+ } ++static int kbase_js_get_slot(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom); ++ ++static void kbase_js_foreach_ctx_job(struct kbase_context *kctx, ++ kbasep_js_ctx_job_cb callback); ++ ++/* Helper for trace subcodes */ ++#if KBASE_TRACE_ENABLE ++static int kbasep_js_trace_get_refcnt(struct kbase_device *kbdev, ++ struct kbase_context *kctx) ++{ ++ return atomic_read(&kctx->refcount); ++} ++#else /* KBASE_TRACE_ENABLE */ ++static int kbasep_js_trace_get_refcnt(struct kbase_device *kbdev, ++ struct kbase_context *kctx) ++{ ++ CSTD_UNUSED(kbdev); ++ CSTD_UNUSED(kctx); ++ return 0; +} ++#endif /* KBASE_TRACE_ENABLE */ + -+static DECLARE_DELAYED_WORK(delayed_sync_fence_put, put_sync_fences); -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) */ ++/* ++ * Private functions ++ */ + -+/* Callback that is called when a sync fence a tracker is waiting on is signaled. */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+static void mali_timeline_sync_fence_callback(struct sync_fence *sync_fence, struct sync_fence_waiter *sync_fence_waiter) -+#else -+static void mali_timeline_sync_fence_callback(struct mali_internal_sync_fence *sync_fence, struct mali_internal_sync_fence_waiter *sync_fence_waiter) -+#endif ++/** ++ * core_reqs_from_jsn_features - Convert JSn_FEATURES to core requirements ++ * @features: JSn_FEATURE register value ++ * ++ * Given a JSn_FEATURE register value returns the core requirements that match ++ * ++ * Return: Core requirement bit mask ++ */ ++static base_jd_core_req core_reqs_from_jsn_features(u16 features) +{ -+ struct mali_timeline_tracker *tracker; ++ base_jd_core_req core_req = 0u; + -+ MALI_IGNORE(sync_fence); -+ MALI_DEBUG_ASSERT_POINTER(sync_fence_waiter); ++ if ((features & JS_FEATURE_SET_VALUE_JOB) != 0) ++ core_req |= BASE_JD_REQ_V; + -+ tracker = _MALI_OSK_CONTAINER_OF(sync_fence_waiter, struct mali_timeline_tracker, sync_fence_waiter); -+ MALI_DEBUG_ASSERT_POINTER(tracker); ++ if ((features & JS_FEATURE_CACHE_FLUSH_JOB) != 0) ++ core_req |= BASE_JD_REQ_CF; + -+ _mali_osk_spinlock_irq_lock(sync_fence_callback_list_lock); -+ _mali_osk_list_addtail(&tracker->sync_fence_signal_list, &sync_fence_callback_queue); -+ _mali_osk_spinlock_irq_unlock(sync_fence_callback_list_lock); ++ if ((features & JS_FEATURE_COMPUTE_JOB) != 0) ++ core_req |= BASE_JD_REQ_CS; + -+ _mali_osk_wq_schedule_work(sync_fence_callback_work_t); -+} -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ if ((features & JS_FEATURE_TILER_JOB) != 0) ++ core_req |= BASE_JD_REQ_T; + -+static mali_scheduler_mask mali_timeline_tracker_time_out(struct mali_timeline_tracker *tracker) -+{ -+ MALI_DEBUG_ASSERT_POINTER(tracker); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_TRACKER_SOFT == tracker->type); ++ if ((features & JS_FEATURE_FRAGMENT_JOB) != 0) ++ core_req |= BASE_JD_REQ_FS; + -+ return mali_soft_job_system_timeout_job((struct mali_soft_job *) tracker->job); ++ return core_req; +} + -+static void mali_timeline_timer_callback(void *data) ++static void kbase_js_sync_timers(struct kbase_device *kbdev) +{ -+ struct mali_timeline_system *system; -+ struct mali_timeline_tracker *tracker; -+ struct mali_timeline *timeline; -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; -+ u32 tid = _mali_osk_get_tid(); -+ -+ timeline = (struct mali_timeline *) data; -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ -+ system = timeline->system; -+ MALI_DEBUG_ASSERT_POINTER(system); ++ mutex_lock(&kbdev->js_data.runpool_mutex); ++ kbase_backend_ctx_count_changed(kbdev); ++ mutex_unlock(&kbdev->js_data.runpool_mutex); ++} + -+ mali_spinlock_reentrant_wait(system->spinlock, tid); ++/* Hold the mmu_hw_mutex and hwaccess_lock for this */ ++bool kbasep_js_runpool_retain_ctx_nolock(struct kbase_device *kbdev, ++ struct kbase_context *kctx) ++{ ++ struct kbasep_js_device_data *js_devdata; ++ bool result = false; ++ int as_nr; + -+ if (!system->timer_enabled) { -+ mali_spinlock_reentrant_signal(system->spinlock, tid); -+ return; -+ } ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ js_devdata = &kbdev->js_data; + -+ tracker = timeline->tracker_tail; -+ timeline->timer_active = MALI_FALSE; ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ if (NULL != tracker && MALI_TRUE == tracker->timer_active) { -+ /* This is likely the delayed work that has been schedule out before cancelled. */ -+ if (MALI_TIMELINE_TIMEOUT_HZ > (_mali_osk_time_tickcount() - tracker->os_tick_activate)) { -+ mali_spinlock_reentrant_signal(system->spinlock, tid); -+ return; -+ } ++ as_nr = kctx->as_nr; ++ if (atomic_read(&kctx->refcount) > 0) { ++ KBASE_DEBUG_ASSERT(as_nr >= 0); + -+ schedule_mask = mali_timeline_tracker_time_out(tracker); -+ tracker->timer_active = MALI_FALSE; -+ } else { -+ MALI_PRINT_ERROR(("Mali Timeline: Soft job timer callback without a waiting tracker.\n")); ++ kbase_ctx_sched_retain_ctx_refcount(kctx); ++ KBASE_TRACE_ADD_REFCOUNT(kbdev, JS_RETAIN_CTX_NOLOCK, kctx, ++ NULL, 0u, atomic_read(&kctx->refcount)); ++ result = true; + } + -+ mali_spinlock_reentrant_signal(system->spinlock, tid); -+ -+ mali_executor_schedule_from_mask(schedule_mask, MALI_FALSE); ++ return result; +} + -+void mali_timeline_system_stop_timer(struct mali_timeline_system *system) ++/** ++ * jsctx_rb_none_to_pull_prio(): - Check if there are no pullable atoms ++ * @kctx: Pointer to kbase context with ring buffer. ++ * @js: Job slot id to check. ++ * @prio: Priority to check. ++ * ++ * Return true if there are no atoms to pull. There may be running atoms in the ++ * ring buffer even if there are no atoms to pull. It is also possible for the ++ * ring buffer to be full (with running atoms) when this functions returns ++ * true. ++ * ++ * Return: true if there are no atoms to pull, false otherwise. ++ */ ++static inline bool ++jsctx_rb_none_to_pull_prio(struct kbase_context *kctx, int js, int prio) +{ -+ u32 i; -+ u32 tid = _mali_osk_get_tid(); -+ -+ MALI_DEBUG_ASSERT_POINTER(system); -+ -+ mali_spinlock_reentrant_wait(system->spinlock, tid); -+ system->timer_enabled = MALI_FALSE; -+ mali_spinlock_reentrant_signal(system->spinlock, tid); -+ -+ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { -+ struct mali_timeline *timeline = system->timelines[i]; ++ struct jsctx_queue *rb = &kctx->jsctx_queue[prio][js]; + -+ MALI_DEBUG_ASSERT_POINTER(timeline); ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ if (NULL != timeline->delayed_work) { -+ _mali_osk_wq_delayed_cancel_work_sync(timeline->delayed_work); -+ timeline->timer_active = MALI_FALSE; -+ } -+ } ++ return RB_EMPTY_ROOT(&rb->runnable_tree); +} + -+static void mali_timeline_destroy(struct mali_timeline *timeline) ++/** ++ * jsctx_rb_none_to_pull(): - Check if all priority ring buffers have no ++ * pullable atoms ++ * @kctx: Pointer to kbase context with ring buffer. ++ * @js: Job slot id to check. ++ * ++ * Caller must hold hwaccess_lock ++ * ++ * Return: true if the ring buffers for all priorities have no pullable atoms, ++ * false otherwise. ++ */ ++static inline bool ++jsctx_rb_none_to_pull(struct kbase_context *kctx, int js) +{ -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ if (NULL != timeline) { -+ /* Assert that the timeline object has been properly cleaned up before destroying it. */ -+ MALI_DEBUG_ASSERT(timeline->point_oldest == timeline->point_next); -+ MALI_DEBUG_ASSERT(NULL == timeline->tracker_head); -+ MALI_DEBUG_ASSERT(NULL == timeline->tracker_tail); -+ MALI_DEBUG_ASSERT(NULL == timeline->waiter_head); -+ MALI_DEBUG_ASSERT(NULL == timeline->waiter_tail); -+ MALI_DEBUG_ASSERT(NULL != timeline->system); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_MAX > timeline->id); ++ int prio; + -+ if (NULL != timeline->delayed_work) { -+ _mali_osk_wq_delayed_cancel_work_sync(timeline->delayed_work); -+ _mali_osk_wq_delayed_delete_work_nonflush(timeline->delayed_work); -+ } ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ if (NULL != timeline->sync_tl) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ sync_timeline_destroy(timeline->sync_tl); -+#else -+ mali_internal_sync_timeline_destroy(timeline->sync_tl); -+#endif -+ } -+#else -+ _mali_osk_free(timeline); -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ for (prio = 0; prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT; prio++) { ++ if (!jsctx_rb_none_to_pull_prio(kctx, js, prio)) ++ return false; + } ++ ++ return true; +} + -+static struct mali_timeline *mali_timeline_create(struct mali_timeline_system *system, enum mali_timeline_id id) ++/** ++ * jsctx_queue_foreach_prio(): - Execute callback for each entry in the queue. ++ * @kctx: Pointer to kbase context with the queue. ++ * @js: Job slot id to iterate. ++ * @prio: Priority id to iterate. ++ * @callback: Function pointer to callback. ++ * ++ * Iterate over a queue and invoke @callback for each entry in the queue, and ++ * remove the entry from the queue. ++ * ++ * If entries are added to the queue while this is running those entries may, or ++ * may not be covered. To ensure that all entries in the buffer have been ++ * enumerated when this function returns jsctx->lock must be held when calling ++ * this function. ++ * ++ * The HW access lock must always be held when calling this function. ++ */ ++static void ++jsctx_queue_foreach_prio(struct kbase_context *kctx, int js, int prio, ++ kbasep_js_ctx_job_cb callback) +{ -+ struct mali_timeline *timeline; ++ struct jsctx_queue *queue = &kctx->jsctx_queue[prio][js]; + -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT(id < MALI_TIMELINE_MAX); ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ timeline = (struct mali_timeline *) _mali_osk_calloc(1, sizeof(struct mali_timeline)); -+ if (NULL == timeline) { -+ return NULL; -+ } ++ while (!RB_EMPTY_ROOT(&queue->runnable_tree)) { ++ struct rb_node *node = rb_first(&queue->runnable_tree); ++ struct kbase_jd_atom *entry = rb_entry(node, ++ struct kbase_jd_atom, runnable_tree_node); + -+ /* Initially the timeline is empty. */ -+#if defined(MALI_TIMELINE_DEBUG_START_POINT) -+ /* Start the timeline a bit before wrapping when debugging. */ -+ timeline->point_next = UINT_MAX - MALI_TIMELINE_MAX_POINT_SPAN - 128; -+#else -+ timeline->point_next = 1; -+#endif -+ timeline->point_oldest = timeline->point_next; ++ rb_erase(node, &queue->runnable_tree); ++ callback(kctx->kbdev, entry); ++ } + -+ /* The tracker and waiter lists will initially be empty. */ ++ while (!list_empty(&queue->x_dep_head)) { ++ struct kbase_jd_atom *entry = list_entry(queue->x_dep_head.next, ++ struct kbase_jd_atom, queue); + -+ timeline->system = system; -+ timeline->id = id; ++ list_del(queue->x_dep_head.next); + -+ timeline->delayed_work = _mali_osk_wq_delayed_create_work(mali_timeline_timer_callback, timeline); -+ if (NULL == timeline->delayed_work) { -+ mali_timeline_destroy(timeline); -+ return NULL; ++ callback(kctx->kbdev, entry); + } ++} + -+ timeline->timer_active = MALI_FALSE; -+ -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ { -+ char timeline_name[32]; ++/** ++ * jsctx_queue_foreach(): - Execute callback for each entry in every queue ++ * @kctx: Pointer to kbase context with queue. ++ * @js: Job slot id to iterate. ++ * @callback: Function pointer to callback. ++ * ++ * Iterate over all the different priorities, and for each call ++ * jsctx_queue_foreach_prio() to iterate over the queue and invoke @callback ++ * for each entry, and remove the entry from the queue. ++ */ ++static inline void ++jsctx_queue_foreach(struct kbase_context *kctx, int js, ++ kbasep_js_ctx_job_cb callback) ++{ ++ int prio; + -+ switch (id) { -+ case MALI_TIMELINE_GP: -+ _mali_osk_snprintf(timeline_name, 32, "mali-%u-gp", _mali_osk_get_pid()); -+ break; -+ case MALI_TIMELINE_PP: -+ _mali_osk_snprintf(timeline_name, 32, "mali-%u-pp", _mali_osk_get_pid()); -+ break; -+ case MALI_TIMELINE_SOFT: -+ _mali_osk_snprintf(timeline_name, 32, "mali-%u-soft", _mali_osk_get_pid()); -+ break; -+ default: -+ MALI_PRINT_ERROR(("Mali Timeline: Invalid timeline id %d\n", id)); -+ mali_timeline_destroy(timeline); -+ return NULL; -+ } ++ for (prio = 0; prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT; prio++) ++ jsctx_queue_foreach_prio(kctx, js, prio, callback); ++} + -+ timeline->destroyed = MALI_FALSE; ++/** ++ * jsctx_rb_peek_prio(): - Check buffer and get next atom ++ * @kctx: Pointer to kbase context with ring buffer. ++ * @js: Job slot id to check. ++ * @prio: Priority id to check. ++ * ++ * Check the ring buffer for the specified @js and @prio and return a pointer to ++ * the next atom, unless the ring buffer is empty. ++ * ++ * Return: Pointer to next atom in buffer, or NULL if there is no atom. ++ */ ++static inline struct kbase_jd_atom * ++jsctx_rb_peek_prio(struct kbase_context *kctx, int js, int prio) ++{ ++ struct jsctx_queue *rb = &kctx->jsctx_queue[prio][js]; ++ struct rb_node *node; + -+ timeline->sync_tl = mali_sync_timeline_create(timeline, timeline_name); -+ if (NULL == timeline->sync_tl) { -+ mali_timeline_destroy(timeline); -+ return NULL; -+ } ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ timeline->spinlock = mali_spinlock_reentrant_init(_MALI_OSK_LOCK_ORDER_TIMELINE_SYSTEM); -+ if (NULL == timeline->spinlock) { -+ mali_timeline_destroy(timeline); -+ return NULL; -+ } -+ } -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ node = rb_first(&rb->runnable_tree); ++ if (!node) ++ return NULL; + -+ return timeline; ++ return rb_entry(node, struct kbase_jd_atom, runnable_tree_node); +} + -+static void mali_timeline_insert_tracker(struct mali_timeline *timeline, struct mali_timeline_tracker *tracker) ++/** ++ * jsctx_rb_peek(): - Check all priority buffers and get next atom ++ * @kctx: Pointer to kbase context with ring buffer. ++ * @js: Job slot id to check. ++ * ++ * Check the ring buffers for all priorities, starting from ++ * KBASE_JS_ATOM_SCHED_PRIO_HIGH, for the specified @js and @prio and return a ++ * pointer to the next atom, unless all the priority's ring buffers are empty. ++ * ++ * Caller must hold the hwaccess_lock. ++ * ++ * Return: Pointer to next atom in buffer, or NULL if there is no atom. ++ */ ++static inline struct kbase_jd_atom * ++jsctx_rb_peek(struct kbase_context *kctx, int js) +{ -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ MALI_DEBUG_ASSERT_POINTER(tracker); -+ -+ if (mali_timeline_is_full(timeline)) { -+ /* Don't add tracker if timeline is full. */ -+ tracker->point = MALI_TIMELINE_NO_POINT; -+ return; -+ } -+ -+ tracker->timeline = timeline; -+ tracker->point = timeline->point_next; ++ int prio; + -+ /* Find next available point. */ -+ timeline->point_next++; -+ if (MALI_TIMELINE_NO_POINT == timeline->point_next) { -+ timeline->point_next++; -+ } ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ MALI_DEBUG_ASSERT(!mali_timeline_is_empty(timeline)); ++ for (prio = 0; prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT; prio++) { ++ struct kbase_jd_atom *katom; + -+ if (MALI_TIMELINE_TRACKER_GP == tracker->type) { -+ _mali_osk_atomic_inc(&gp_tracker_count); -+ } else if (MALI_TIMELINE_TRACKER_PP == tracker->type) { -+ if (mali_pp_job_is_virtual((struct mali_pp_job *)tracker->job)) { -+ _mali_osk_atomic_inc(&virt_pp_tracker_count); -+ } else { -+ _mali_osk_atomic_inc(&phy_pp_tracker_count); -+ } ++ katom = jsctx_rb_peek_prio(kctx, js, prio); ++ if (katom) ++ return katom; + } + -+ /* Add tracker as new head on timeline's tracker list. */ -+ if (NULL == timeline->tracker_head) { -+ /* Tracker list is empty. */ -+ MALI_DEBUG_ASSERT(NULL == timeline->tracker_tail); -+ -+ timeline->tracker_tail = tracker; ++ return NULL; ++} + -+ MALI_DEBUG_ASSERT(NULL == tracker->timeline_next); -+ MALI_DEBUG_ASSERT(NULL == tracker->timeline_prev); -+ } else { -+ MALI_DEBUG_ASSERT(NULL == timeline->tracker_head->timeline_next); ++/** ++ * jsctx_rb_pull(): - Mark atom in list as running ++ * @kctx: Pointer to kbase context with ring buffer. ++ * @katom: Pointer to katom to pull. ++ * ++ * Mark an atom previously obtained from jsctx_rb_peek() as running. ++ * ++ * @katom must currently be at the head of the ring buffer. ++ */ ++static inline void ++jsctx_rb_pull(struct kbase_context *kctx, struct kbase_jd_atom *katom) ++{ ++ int prio = katom->sched_priority; ++ int js = katom->slot_nr; ++ struct jsctx_queue *rb = &kctx->jsctx_queue[prio][js]; + -+ tracker->timeline_prev = timeline->tracker_head; -+ timeline->tracker_head->timeline_next = tracker; ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ MALI_DEBUG_ASSERT(NULL == tracker->timeline_next); -+ } -+ timeline->tracker_head = tracker; ++ /* Atoms must be pulled in the correct order. */ ++ WARN_ON(katom != jsctx_rb_peek_prio(kctx, js, prio)); + -+ MALI_DEBUG_ASSERT(NULL == timeline->tracker_head->timeline_next); -+ MALI_DEBUG_ASSERT(NULL == timeline->tracker_tail->timeline_prev); ++ rb_erase(&katom->runnable_tree_node, &rb->runnable_tree); +} + -+/* Inserting the waiter object into the given timeline */ -+static void mali_timeline_insert_waiter(struct mali_timeline *timeline, struct mali_timeline_waiter *waiter_new) ++#define LESS_THAN_WRAP(a, b) ((s32)(a - b) < 0) ++ ++static void ++jsctx_tree_add(struct kbase_context *kctx, struct kbase_jd_atom *katom) +{ -+ struct mali_timeline_waiter *waiter_prev; -+ struct mali_timeline_waiter *waiter_next; ++ int prio = katom->sched_priority; ++ int js = katom->slot_nr; ++ struct jsctx_queue *queue = &kctx->jsctx_queue[prio][js]; ++ struct rb_node **new = &(queue->runnable_tree.rb_node), *parent = NULL; + -+ /* Waiter time must be between timeline head and tail, and there must -+ * be less than MALI_TIMELINE_MAX_POINT_SPAN elements between */ -+ MALI_DEBUG_ASSERT((waiter_new->point - timeline->point_oldest) < MALI_TIMELINE_MAX_POINT_SPAN); -+ MALI_DEBUG_ASSERT((-waiter_new->point + timeline->point_next) < MALI_TIMELINE_MAX_POINT_SPAN); ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ /* Finding out where to put this waiter, in the linked waiter list of the given timeline **/ -+ waiter_prev = timeline->waiter_head; /* Insert new after waiter_prev */ -+ waiter_next = NULL; /* Insert new before waiter_next */ ++ while (*new) { ++ struct kbase_jd_atom *entry = container_of(*new, ++ struct kbase_jd_atom, runnable_tree_node); + -+ /* Iterating backwards from head (newest) to tail (oldest) until we -+ * find the correct spot to insert the new waiter */ -+ while (waiter_prev && mali_timeline_point_after(waiter_prev->point, waiter_new->point)) { -+ waiter_next = waiter_prev; -+ waiter_prev = waiter_prev->timeline_prev; ++ parent = *new; ++ if (LESS_THAN_WRAP(katom->age, entry->age)) ++ new = &((*new)->rb_left); ++ else ++ new = &((*new)->rb_right); + } + -+ if (NULL == waiter_prev && NULL == waiter_next) { -+ /* list is empty */ -+ timeline->waiter_head = waiter_new; -+ timeline->waiter_tail = waiter_new; -+ } else if (NULL == waiter_next) { -+ /* insert at head */ -+ waiter_new->timeline_prev = timeline->waiter_head; -+ timeline->waiter_head->timeline_next = waiter_new; -+ timeline->waiter_head = waiter_new; -+ } else if (NULL == waiter_prev) { -+ /* insert at tail */ -+ waiter_new->timeline_next = timeline->waiter_tail; -+ timeline->waiter_tail->timeline_prev = waiter_new; -+ timeline->waiter_tail = waiter_new; -+ } else { -+ /* insert between */ -+ waiter_new->timeline_next = waiter_next; -+ waiter_new->timeline_prev = waiter_prev; -+ waiter_next->timeline_prev = waiter_new; -+ waiter_prev->timeline_next = waiter_new; -+ } ++ /* Add new node and rebalance tree. */ ++ rb_link_node(&katom->runnable_tree_node, parent, new); ++ rb_insert_color(&katom->runnable_tree_node, &queue->runnable_tree); +} + -+static void mali_timeline_update_delayed_work(struct mali_timeline *timeline) ++/** ++ * jsctx_rb_unpull(): - Undo marking of atom in list as running ++ * @kctx: Pointer to kbase context with ring buffer. ++ * @katom: Pointer to katom to unpull. ++ * ++ * Undo jsctx_rb_pull() and put @katom back in the queue. ++ * ++ * jsctx_rb_unpull() must be called on atoms in the same order the atoms were ++ * pulled. ++ */ ++static inline void ++jsctx_rb_unpull(struct kbase_context *kctx, struct kbase_jd_atom *katom) +{ -+ struct mali_timeline_system *system; -+ struct mali_timeline_tracker *oldest_tracker; -+ -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SOFT == timeline->id); ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ system = timeline->system; -+ MALI_DEBUG_ASSERT_POINTER(system); ++ jsctx_tree_add(kctx, katom); ++} + -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++static bool kbase_js_ctx_pullable(struct kbase_context *kctx, ++ int js, ++ bool is_scheduled); ++static bool kbase_js_ctx_list_add_pullable_nolock(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ int js); ++static bool kbase_js_ctx_list_add_unpullable_nolock(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ int js); + -+ /* Timer is disabled, early out. */ -+ if (!system->timer_enabled) return; ++/* ++ * Functions private to KBase ('Protected' functions) ++ */ ++int kbasep_js_devdata_init(struct kbase_device * const kbdev) ++{ ++ struct kbasep_js_device_data *jsdd; ++ int i; + -+ oldest_tracker = timeline->tracker_tail; -+ if (NULL != oldest_tracker && 0 == oldest_tracker->trigger_ref_count) { -+ if (MALI_FALSE == oldest_tracker->timer_active) { -+ if (MALI_TRUE == timeline->timer_active) { -+ _mali_osk_wq_delayed_cancel_work_async(timeline->delayed_work); -+ } -+ _mali_osk_wq_delayed_schedule_work(timeline->delayed_work, MALI_TIMELINE_TIMEOUT_HZ); -+ oldest_tracker->timer_active = MALI_TRUE; -+ timeline->timer_active = MALI_TRUE; -+ } -+ } else if (MALI_TRUE == timeline->timer_active) { -+ _mali_osk_wq_delayed_cancel_work_async(timeline->delayed_work); -+ timeline->timer_active = MALI_FALSE; -+ } -+} ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+static mali_scheduler_mask mali_timeline_update_oldest_point(struct mali_timeline *timeline) -+{ -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; ++ jsdd = &kbdev->js_data; + -+ MALI_DEBUG_ASSERT_POINTER(timeline); ++#ifdef CONFIG_MALI_DEBUG ++ /* Soft-stop will be disabled on a single context by default unless ++ * softstop_always is set */ ++ jsdd->softstop_always = false; ++#endif /* CONFIG_MALI_DEBUG */ ++ jsdd->nr_all_contexts_running = 0; ++ jsdd->nr_user_contexts_running = 0; ++ jsdd->nr_contexts_pullable = 0; ++ atomic_set(&jsdd->nr_contexts_runnable, 0); ++ /* No ctx allowed to submit */ ++ jsdd->runpool_irq.submit_allowed = 0u; ++ memset(jsdd->runpool_irq.ctx_attr_ref_count, 0, ++ sizeof(jsdd->runpool_irq.ctx_attr_ref_count)); ++ memset(jsdd->runpool_irq.slot_affinities, 0, ++ sizeof(jsdd->runpool_irq.slot_affinities)); ++ memset(jsdd->runpool_irq.slot_affinity_refcount, 0, ++ sizeof(jsdd->runpool_irq.slot_affinity_refcount)); ++ INIT_LIST_HEAD(&jsdd->suspended_soft_jobs_list); + -+ MALI_DEBUG_CODE({ -+ struct mali_timeline_system *system = timeline->system; -+ MALI_DEBUG_ASSERT_POINTER(system); ++ /* Config attributes */ ++ jsdd->scheduling_period_ns = DEFAULT_JS_SCHEDULING_PERIOD_NS; ++ jsdd->soft_stop_ticks = DEFAULT_JS_SOFT_STOP_TICKS; ++ jsdd->soft_stop_ticks_cl = DEFAULT_JS_SOFT_STOP_TICKS_CL; ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8408)) ++ jsdd->hard_stop_ticks_ss = DEFAULT_JS_HARD_STOP_TICKS_SS_8408; ++ else ++ jsdd->hard_stop_ticks_ss = DEFAULT_JS_HARD_STOP_TICKS_SS; ++ jsdd->hard_stop_ticks_cl = DEFAULT_JS_HARD_STOP_TICKS_CL; ++ jsdd->hard_stop_ticks_dumping = DEFAULT_JS_HARD_STOP_TICKS_DUMPING; ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8408)) ++ jsdd->gpu_reset_ticks_ss = DEFAULT_JS_RESET_TICKS_SS_8408; ++ else ++ jsdd->gpu_reset_ticks_ss = DEFAULT_JS_RESET_TICKS_SS; ++ jsdd->gpu_reset_ticks_cl = DEFAULT_JS_RESET_TICKS_CL; ++ jsdd->gpu_reset_ticks_dumping = DEFAULT_JS_RESET_TICKS_DUMPING; ++ jsdd->ctx_timeslice_ns = DEFAULT_JS_CTX_TIMESLICE_NS; ++ atomic_set(&jsdd->soft_job_timeout_ms, DEFAULT_JS_SOFT_JOB_TIMEOUT); + -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); -+ }); ++ dev_dbg(kbdev->dev, "JS Config Attribs: "); ++ dev_dbg(kbdev->dev, "\tscheduling_period_ns:%u", ++ jsdd->scheduling_period_ns); ++ dev_dbg(kbdev->dev, "\tsoft_stop_ticks:%u", ++ jsdd->soft_stop_ticks); ++ dev_dbg(kbdev->dev, "\tsoft_stop_ticks_cl:%u", ++ jsdd->soft_stop_ticks_cl); ++ dev_dbg(kbdev->dev, "\thard_stop_ticks_ss:%u", ++ jsdd->hard_stop_ticks_ss); ++ dev_dbg(kbdev->dev, "\thard_stop_ticks_cl:%u", ++ jsdd->hard_stop_ticks_cl); ++ dev_dbg(kbdev->dev, "\thard_stop_ticks_dumping:%u", ++ jsdd->hard_stop_ticks_dumping); ++ dev_dbg(kbdev->dev, "\tgpu_reset_ticks_ss:%u", ++ jsdd->gpu_reset_ticks_ss); ++ dev_dbg(kbdev->dev, "\tgpu_reset_ticks_cl:%u", ++ jsdd->gpu_reset_ticks_cl); ++ dev_dbg(kbdev->dev, "\tgpu_reset_ticks_dumping:%u", ++ jsdd->gpu_reset_ticks_dumping); ++ dev_dbg(kbdev->dev, "\tctx_timeslice_ns:%u", ++ jsdd->ctx_timeslice_ns); ++ dev_dbg(kbdev->dev, "\tsoft_job_timeout:%i", ++ atomic_read(&jsdd->soft_job_timeout_ms)); + -+ if (NULL != timeline->tracker_tail) { -+ /* Set oldest point to oldest tracker's point */ -+ timeline->point_oldest = timeline->tracker_tail->point; -+ } else { -+ /* No trackers, mark point list as empty */ -+ timeline->point_oldest = timeline->point_next; ++ if (!(jsdd->soft_stop_ticks < jsdd->hard_stop_ticks_ss && ++ jsdd->hard_stop_ticks_ss < jsdd->gpu_reset_ticks_ss && ++ jsdd->soft_stop_ticks < jsdd->hard_stop_ticks_dumping && ++ jsdd->hard_stop_ticks_dumping < ++ jsdd->gpu_reset_ticks_dumping)) { ++ dev_err(kbdev->dev, "Job scheduler timeouts invalid; soft/hard/reset tick counts should be in increasing order\n"); ++ return -EINVAL; + } + -+ /* Release all waiters no longer on the timeline's point list. -+ * Releasing a waiter can trigger this function to be called again, so -+ * we do not store any pointers on stack. */ -+ while (NULL != timeline->waiter_tail) { -+ u32 waiter_time_relative; -+ u32 time_head_relative; -+ struct mali_timeline_waiter *waiter = timeline->waiter_tail; ++#if KBASE_DISABLE_SCHEDULING_SOFT_STOPS ++ dev_dbg(kbdev->dev, "Job Scheduling Soft-stops disabled, ignoring value for soft_stop_ticks==%u at %uns per tick. Other soft-stops may still occur.", ++ jsdd->soft_stop_ticks, ++ jsdd->scheduling_period_ns); ++#endif ++#if KBASE_DISABLE_SCHEDULING_HARD_STOPS ++ dev_dbg(kbdev->dev, "Job Scheduling Hard-stops disabled, ignoring values for hard_stop_ticks_ss==%d and hard_stop_ticks_dumping==%u at %uns per tick. Other hard-stops may still occur.", ++ jsdd->hard_stop_ticks_ss, ++ jsdd->hard_stop_ticks_dumping, ++ jsdd->scheduling_period_ns); ++#endif ++#if KBASE_DISABLE_SCHEDULING_SOFT_STOPS && KBASE_DISABLE_SCHEDULING_HARD_STOPS ++ dev_dbg(kbdev->dev, "Note: The JS tick timer (if coded) will still be run, but do nothing."); ++#endif + -+ time_head_relative = timeline->point_next - timeline->point_oldest; -+ waiter_time_relative = waiter->point - timeline->point_oldest; ++ for (i = 0; i < kbdev->gpu_props.num_job_slots; ++i) ++ jsdd->js_reqs[i] = core_reqs_from_jsn_features( ++ kbdev->gpu_props.props.raw_props.js_features[i]); + -+ if (waiter_time_relative < time_head_relative) { -+ /* This and all following waiters are on the point list, so we are done. */ -+ break; -+ } ++ /* On error, we could continue on: providing none of the below resources ++ * rely on the ones above */ + -+ /* Remove waiter from timeline's waiter list. */ -+ if (NULL != waiter->timeline_next) { -+ waiter->timeline_next->timeline_prev = NULL; -+ } else { -+ /* This was the last waiter */ -+ timeline->waiter_head = NULL; -+ } -+ timeline->waiter_tail = waiter->timeline_next; ++ mutex_init(&jsdd->runpool_mutex); ++ mutex_init(&jsdd->queue_mutex); ++ spin_lock_init(&kbdev->hwaccess_lock); ++ sema_init(&jsdd->schedule_sem, 1); + -+ /* Release waiter. This could activate a tracker, if this was -+ * the last waiter for the tracker. */ -+ schedule_mask |= mali_timeline_system_release_waiter(timeline->system, waiter); ++ for (i = 0; i < kbdev->gpu_props.num_job_slots; ++i) { ++ INIT_LIST_HEAD(&jsdd->ctx_list_pullable[i]); ++ INIT_LIST_HEAD(&jsdd->ctx_list_unpullable[i]); + } + -+ return schedule_mask; ++ return 0; +} + -+static mali_scheduler_mask mali_timeline_release_with_depended_point(struct mali_timeline_tracker *tracker) ++void kbasep_js_devdata_halt(struct kbase_device *kbdev) +{ -+ struct mali_timeline *timeline; -+ struct mali_timeline_waiter *waiter; -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; ++ CSTD_UNUSED(kbdev); ++} + -+ timeline = tracker->timeline; -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SOFT == timeline->id); ++void kbasep_js_devdata_term(struct kbase_device *kbdev) ++{ ++ struct kbasep_js_device_data *js_devdata; ++ s8 zero_ctx_attr_ref_count[KBASEP_JS_CTX_ATTR_COUNT] = { 0, }; + -+ MALI_DEBUG_CODE({ -+ struct mali_timeline_system *system = timeline->system; -+ MALI_DEBUG_ASSERT_POINTER(system); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); -+ }); ++ js_devdata = &kbdev->js_data; + -+ /* Only release the waiter that wait for the tracker. */ -+ waiter = timeline->waiter_tail; -+ while (NULL != waiter) { -+ if (waiter->point == tracker->point) { ++ /* The caller must de-register all contexts before calling this ++ */ ++ KBASE_DEBUG_ASSERT(js_devdata->nr_all_contexts_running == 0); ++ KBASE_DEBUG_ASSERT(memcmp( ++ js_devdata->runpool_irq.ctx_attr_ref_count, ++ zero_ctx_attr_ref_count, ++ sizeof(zero_ctx_attr_ref_count)) == 0); ++ CSTD_UNUSED(zero_ctx_attr_ref_count); ++} + -+ struct mali_timeline_waiter *waiter_next; -+ struct mali_timeline_waiter *waiter_prev; ++int kbasep_js_kctx_init(struct kbase_context * const kctx) ++{ ++ struct kbase_device *kbdev; ++ struct kbasep_js_kctx_info *js_kctx_info; ++ int i, j; + -+ waiter_next = waiter->timeline_next; -+ waiter_prev = waiter->timeline_prev; -+ waiter->timeline_next = NULL; -+ waiter->timeline_prev = NULL; ++ KBASE_DEBUG_ASSERT(kctx != NULL); + -+ if (NULL != waiter_prev) { -+ waiter_prev->timeline_next = waiter_next; -+ } ++ kbdev = kctx->kbdev; ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ if (NULL != waiter_next) { -+ waiter_next->timeline_prev = waiter_prev; -+ } ++ for (i = 0; i < BASE_JM_MAX_NR_SLOTS; ++i) ++ INIT_LIST_HEAD(&kctx->jctx.sched_info.ctx.ctx_list_entry[i]); + -+ if (waiter == timeline->waiter_tail) -+ timeline->waiter_tail = waiter_next; ++ js_kctx_info = &kctx->jctx.sched_info; + -+ if (waiter == timeline->waiter_head) -+ timeline->waiter_head = NULL; ++ js_kctx_info->ctx.nr_jobs = 0; ++ kbase_ctx_flag_clear(kctx, KCTX_SCHEDULED); ++ kbase_ctx_flag_clear(kctx, KCTX_DYING); ++ memset(js_kctx_info->ctx.ctx_attr_ref_count, 0, ++ sizeof(js_kctx_info->ctx.ctx_attr_ref_count)); + -+ schedule_mask |= mali_timeline_system_release_waiter(timeline->system, waiter); -+ waiter = waiter_next; -+ }else { ++ /* Initially, the context is disabled from submission until the create ++ * flags are set */ ++ kbase_ctx_flag_set(kctx, KCTX_SUBMIT_DISABLED); + -+ waiter = waiter->timeline_next; ++ /* On error, we could continue on: providing none of the below resources ++ * rely on the ones above */ ++ mutex_init(&js_kctx_info->ctx.jsctx_mutex); ++ ++ init_waitqueue_head(&js_kctx_info->ctx.is_scheduled_wait); ++ ++ for (i = 0; i < KBASE_JS_ATOM_SCHED_PRIO_COUNT; i++) { ++ for (j = 0; j < BASE_JM_MAX_NR_SLOTS; j++) { ++ INIT_LIST_HEAD(&kctx->jsctx_queue[i][j].x_dep_head); ++ kctx->jsctx_queue[i][j].runnable_tree = RB_ROOT; + } + } + -+ return schedule_mask; ++ return 0; +} + -+void mali_timeline_tracker_init(struct mali_timeline_tracker *tracker, -+ mali_timeline_tracker_type type, -+ struct mali_timeline_fence *fence, -+ void *job) ++void kbasep_js_kctx_term(struct kbase_context *kctx) +{ -+ MALI_DEBUG_ASSERT_POINTER(tracker); -+ MALI_DEBUG_ASSERT_POINTER(job); -+ -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_TRACKER_MAX > type); -+ -+ /* Zero out all tracker members. */ -+ _mali_osk_memset(tracker, 0, sizeof(*tracker)); -+ -+ tracker->type = type; -+ tracker->job = job; -+ tracker->trigger_ref_count = 1; /* Prevents any callback from trigging while adding it */ -+ tracker->os_tick_create = _mali_osk_time_tickcount(); -+ MALI_DEBUG_CODE(tracker->magic = MALI_TIMELINE_TRACKER_MAGIC); -+ -+ tracker->activation_error = MALI_TIMELINE_ACTIVATION_ERROR_NONE; ++ struct kbase_device *kbdev; ++ struct kbasep_js_kctx_info *js_kctx_info; ++ int js; ++ bool update_ctx_count = false; + -+ /* Copy fence. */ -+ if (NULL != fence) { -+ _mali_osk_memcpy(&tracker->fence, fence, sizeof(struct mali_timeline_fence)); -+ } -+} ++ KBASE_DEBUG_ASSERT(kctx != NULL); + -+mali_scheduler_mask mali_timeline_tracker_release(struct mali_timeline_tracker *tracker) -+{ -+ struct mali_timeline *timeline; -+ struct mali_timeline_system *system; -+ struct mali_timeline_tracker *tracker_next, *tracker_prev; -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; -+ u32 tid = _mali_osk_get_tid(); ++ kbdev = kctx->kbdev; ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ /* Upon entry a group lock will be held, but not a scheduler lock. */ -+ MALI_DEBUG_ASSERT_POINTER(tracker); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_TRACKER_MAGIC == tracker->magic); ++ js_kctx_info = &kctx->jctx.sched_info; + -+ /* Tracker should have been triggered */ -+ MALI_DEBUG_ASSERT(0 == tracker->trigger_ref_count); ++ /* The caller must de-register all jobs before calling this */ ++ KBASE_DEBUG_ASSERT(!kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ KBASE_DEBUG_ASSERT(js_kctx_info->ctx.nr_jobs == 0); + -+ /* All waiters should have been released at this point */ -+ MALI_DEBUG_ASSERT(NULL == tracker->waiter_head); -+ MALI_DEBUG_ASSERT(NULL == tracker->waiter_tail); ++ mutex_lock(&kbdev->js_data.queue_mutex); ++ mutex_lock(&kctx->jctx.sched_info.ctx.jsctx_mutex); + -+ MALI_DEBUG_PRINT(3, ("Mali Timeline: releasing tracker for job 0x%08X\n", tracker->job)); ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) ++ list_del_init(&kctx->jctx.sched_info.ctx.ctx_list_entry[js]); + -+ timeline = tracker->timeline; -+ if (NULL == timeline) { -+ /* Tracker was not on a timeline, there is nothing to release. */ -+ return MALI_SCHEDULER_MASK_EMPTY; ++ if (kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)) { ++ WARN_ON(atomic_read(&kbdev->js_data.nr_contexts_runnable) <= 0); ++ atomic_dec(&kbdev->js_data.nr_contexts_runnable); ++ update_ctx_count = true; ++ kbase_ctx_flag_clear(kctx, KCTX_RUNNABLE_REF); + } + -+ system = timeline->system; -+ MALI_DEBUG_ASSERT_POINTER(system); ++ mutex_unlock(&kctx->jctx.sched_info.ctx.jsctx_mutex); ++ mutex_unlock(&kbdev->js_data.queue_mutex); + -+ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ if (update_ctx_count) { ++ mutex_lock(&kbdev->js_data.runpool_mutex); ++ kbase_backend_ctx_count_changed(kbdev); ++ mutex_unlock(&kbdev->js_data.runpool_mutex); ++ } ++} + -+ /* Tracker should still be on timeline */ -+ MALI_DEBUG_ASSERT(!mali_timeline_is_empty(timeline)); -+ MALI_DEBUG_ASSERT(mali_timeline_is_point_on(timeline, tracker->point)); ++/** ++ * kbase_js_ctx_list_add_pullable_nolock - Variant of ++ * kbase_jd_ctx_list_add_pullable() ++ * where the caller must hold ++ * hwaccess_lock ++ * @kbdev: Device pointer ++ * @kctx: Context to add to queue ++ * @js: Job slot to use ++ * ++ * Caller must hold hwaccess_lock ++ * ++ * Return: true if caller should call kbase_backend_ctx_count_changed() ++ */ ++static bool kbase_js_ctx_list_add_pullable_nolock(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ int js) ++{ ++ bool ret = false; + -+ /* Tracker is no longer valid. */ -+ MALI_DEBUG_CODE(tracker->magic = 0); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ tracker_next = tracker->timeline_next; -+ tracker_prev = tracker->timeline_prev; -+ tracker->timeline_next = NULL; -+ tracker->timeline_prev = NULL; ++ if (!list_empty(&kctx->jctx.sched_info.ctx.ctx_list_entry[js])) ++ list_del_init(&kctx->jctx.sched_info.ctx.ctx_list_entry[js]); + -+ /* Removing tracker from timeline's tracker list */ -+ if (NULL == tracker_next) { -+ /* This tracker was the head */ -+ timeline->tracker_head = tracker_prev; -+ } else { -+ tracker_next->timeline_prev = tracker_prev; -+ } ++ list_add_tail(&kctx->jctx.sched_info.ctx.ctx_list_entry[js], ++ &kbdev->js_data.ctx_list_pullable[js]); + -+ if (NULL == tracker_prev) { -+ /* This tracker was the tail */ -+ timeline->tracker_tail = tracker_next; -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); -+ /* Update the timeline's oldest time and release any waiters */ -+ schedule_mask |= mali_timeline_update_oldest_point(timeline); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); -+ } else { -+ tracker_prev->timeline_next = tracker_next; -+ if (MALI_TIMELINE_SOFT == tracker->timeline->id) { -+ /* Use the signaled soft tracker to release the depended soft waiter */ -+ schedule_mask |= mali_timeline_release_with_depended_point(tracker); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++ if (!kctx->slots_pullable) { ++ kbdev->js_data.nr_contexts_pullable++; ++ ret = true; ++ if (!atomic_read(&kctx->atoms_pulled)) { ++ WARN_ON(kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); ++ kbase_ctx_flag_set(kctx, KCTX_RUNNABLE_REF); ++ atomic_inc(&kbdev->js_data.nr_contexts_runnable); + } + } ++ kctx->slots_pullable |= (1 << js); + -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); -+ -+ /* Update delayed work only when it is the soft job timeline */ -+ if (MALI_TIMELINE_SOFT == tracker->timeline->id) { -+ mali_timeline_update_delayed_work(tracker->timeline); -+ } -+ -+ mali_spinlock_reentrant_signal(system->spinlock, tid); -+ -+ return schedule_mask; -+} -+ -+void mali_timeline_system_release_waiter_list(struct mali_timeline_system *system, -+ struct mali_timeline_waiter *tail, -+ struct mali_timeline_waiter *head) -+{ -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(head); -+ MALI_DEBUG_ASSERT_POINTER(tail); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); -+ -+ head->tracker_next = system->waiter_empty_list; -+ system->waiter_empty_list = tail; ++ return ret; +} + -+static mali_scheduler_mask mali_timeline_tracker_activate(struct mali_timeline_tracker *tracker) ++/** ++ * kbase_js_ctx_list_add_pullable_head_nolock - Variant of ++ * kbase_js_ctx_list_add_pullable_head() ++ * where the caller must hold ++ * hwaccess_lock ++ * @kbdev: Device pointer ++ * @kctx: Context to add to queue ++ * @js: Job slot to use ++ * ++ * Caller must hold hwaccess_lock ++ * ++ * Return: true if caller should call kbase_backend_ctx_count_changed() ++ */ ++static bool kbase_js_ctx_list_add_pullable_head_nolock( ++ struct kbase_device *kbdev, struct kbase_context *kctx, int js) +{ -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; -+ struct mali_timeline_system *system; -+ struct mali_timeline *timeline; -+ u32 tid = _mali_osk_get_tid(); -+ -+ MALI_DEBUG_ASSERT_POINTER(tracker); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_TRACKER_MAGIC == tracker->magic); -+ -+ system = tracker->system; -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++ bool ret = false; + -+ tracker->os_tick_activate = _mali_osk_time_tickcount(); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ if (NULL != tracker->waiter_head) { -+ mali_timeline_system_release_waiter_list(system, tracker->waiter_tail, tracker->waiter_head); -+ tracker->waiter_head = NULL; -+ tracker->waiter_tail = NULL; -+ } ++ if (!list_empty(&kctx->jctx.sched_info.ctx.ctx_list_entry[js])) ++ list_del_init(&kctx->jctx.sched_info.ctx.ctx_list_entry[js]); + -+ switch (tracker->type) { -+ case MALI_TIMELINE_TRACKER_GP: -+ schedule_mask = mali_scheduler_activate_gp_job((struct mali_gp_job *) tracker->job); ++ list_add(&kctx->jctx.sched_info.ctx.ctx_list_entry[js], ++ &kbdev->js_data.ctx_list_pullable[js]); + -+ _mali_osk_atomic_dec(&gp_tracker_count); -+ break; -+ case MALI_TIMELINE_TRACKER_PP: -+ if (mali_pp_job_is_virtual((struct mali_pp_job *)tracker->job)) { -+ _mali_osk_atomic_dec(&virt_pp_tracker_count); -+ } else { -+ _mali_osk_atomic_dec(&phy_pp_tracker_count); ++ if (!kctx->slots_pullable) { ++ kbdev->js_data.nr_contexts_pullable++; ++ ret = true; ++ if (!atomic_read(&kctx->atoms_pulled)) { ++ WARN_ON(kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); ++ kbase_ctx_flag_set(kctx, KCTX_RUNNABLE_REF); ++ atomic_inc(&kbdev->js_data.nr_contexts_runnable); + } -+ schedule_mask = mali_scheduler_activate_pp_job((struct mali_pp_job *) tracker->job); -+ break; -+ case MALI_TIMELINE_TRACKER_SOFT: -+ timeline = tracker->timeline; -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ -+ schedule_mask |= mali_soft_job_system_activate_job((struct mali_soft_job *) tracker->job); -+ -+ /* Start a soft timer to make sure the soft job be released in a limited time */ -+ mali_spinlock_reentrant_wait(system->spinlock, tid); -+ mali_timeline_update_delayed_work(timeline); -+ mali_spinlock_reentrant_signal(system->spinlock, tid); -+ break; -+ case MALI_TIMELINE_TRACKER_WAIT: -+ mali_timeline_fence_wait_activate((struct mali_timeline_fence_wait_tracker *) tracker->job); -+ break; -+ case MALI_TIMELINE_TRACKER_SYNC: -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ mali_timeline_sync_fence_activate((struct mali_timeline_sync_fence_tracker *) tracker->job); -+#else -+ MALI_PRINT_ERROR(("Mali Timeline: sync tracker not supported\n", tracker->type)); -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ -+ break; -+ default: -+ MALI_PRINT_ERROR(("Mali Timeline - Illegal tracker type: %d\n", tracker->type)); -+ break; + } ++ kctx->slots_pullable |= (1 << js); + -+ return schedule_mask; ++ return ret; +} + -+void mali_timeline_system_tracker_get(struct mali_timeline_system *system, struct mali_timeline_tracker *tracker) ++/** ++ * kbase_js_ctx_list_add_pullable_head - Add context to the head of the ++ * per-slot pullable context queue ++ * @kbdev: Device pointer ++ * @kctx: Context to add to queue ++ * @js: Job slot to use ++ * ++ * If the context is on either the pullable or unpullable queues, then it is ++ * removed before being added to the head. ++ * ++ * This function should be used when a context has been scheduled, but no jobs ++ * can currently be pulled from it. ++ * ++ * Return: true if caller should call kbase_backend_ctx_count_changed() ++ */ ++static bool kbase_js_ctx_list_add_pullable_head(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ int js) +{ -+ u32 tid = _mali_osk_get_tid(); -+ -+ MALI_DEBUG_ASSERT_POINTER(tracker); -+ MALI_DEBUG_ASSERT_POINTER(system); -+ -+ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ bool ret; ++ unsigned long flags; + -+ MALI_DEBUG_ASSERT(0 < tracker->trigger_ref_count); -+ tracker->trigger_ref_count++; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ret = kbase_js_ctx_list_add_pullable_head_nolock(kbdev, kctx, js); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ return ret; +} + -+mali_scheduler_mask mali_timeline_system_tracker_put(struct mali_timeline_system *system, struct mali_timeline_tracker *tracker, mali_timeline_activation_error activation_error) ++/** ++ * kbase_js_ctx_list_add_unpullable_nolock - Add context to the tail of the ++ * per-slot unpullable context queue ++ * @kbdev: Device pointer ++ * @kctx: Context to add to queue ++ * @js: Job slot to use ++ * ++ * The context must already be on the per-slot pullable queue. It will be ++ * removed from the pullable queue before being added to the unpullable queue. ++ * ++ * This function should be used when a context has been pulled from, and there ++ * are no jobs remaining on the specified slot. ++ * ++ * Caller must hold hwaccess_lock ++ * ++ * Return: true if caller should call kbase_backend_ctx_count_changed() ++ */ ++static bool kbase_js_ctx_list_add_unpullable_nolock(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ int js) +{ -+ u32 tid = _mali_osk_get_tid(); -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; -+ -+ MALI_DEBUG_ASSERT_POINTER(tracker); -+ MALI_DEBUG_ASSERT_POINTER(system); -+ -+ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ bool ret = false; + -+ MALI_DEBUG_ASSERT(0 < tracker->trigger_ref_count); -+ tracker->trigger_ref_count--; ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ tracker->activation_error |= activation_error; ++ list_move_tail(&kctx->jctx.sched_info.ctx.ctx_list_entry[js], ++ &kbdev->js_data.ctx_list_unpullable[js]); + -+ if (0 == tracker->trigger_ref_count) { -+ schedule_mask |= mali_timeline_tracker_activate(tracker); -+ tracker = NULL; ++ if (kctx->slots_pullable == (1 << js)) { ++ kbdev->js_data.nr_contexts_pullable--; ++ ret = true; ++ if (!atomic_read(&kctx->atoms_pulled)) { ++ WARN_ON(!kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); ++ kbase_ctx_flag_clear(kctx, KCTX_RUNNABLE_REF); ++ atomic_dec(&kbdev->js_data.nr_contexts_runnable); ++ } + } ++ kctx->slots_pullable &= ~(1 << js); + -+ mali_spinlock_reentrant_signal(system->spinlock, tid); -+ -+ return schedule_mask; ++ return ret; +} + -+void mali_timeline_fence_copy_uk_fence(struct mali_timeline_fence *fence, _mali_uk_fence_t *uk_fence) ++/** ++ * kbase_js_ctx_list_remove_nolock - Remove context from the per-slot pullable ++ * or unpullable context queues ++ * @kbdev: Device pointer ++ * @kctx: Context to remove from queue ++ * @js: Job slot to use ++ * ++ * The context must already be on one of the queues. ++ * ++ * This function should be used when a context has no jobs on the GPU, and no ++ * jobs remaining for the specified slot. ++ * ++ * Caller must hold hwaccess_lock ++ * ++ * Return: true if caller should call kbase_backend_ctx_count_changed() ++ */ ++static bool kbase_js_ctx_list_remove_nolock(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ int js) +{ -+ u32 i; ++ bool ret = false; + -+ MALI_DEBUG_ASSERT_POINTER(fence); -+ MALI_DEBUG_ASSERT_POINTER(uk_fence); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { -+ fence->points[i] = uk_fence->points[i]; ++ WARN_ON(list_empty(&kctx->jctx.sched_info.ctx.ctx_list_entry[js])); ++ ++ list_del_init(&kctx->jctx.sched_info.ctx.ctx_list_entry[js]); ++ ++ if (kctx->slots_pullable == (1 << js)) { ++ kbdev->js_data.nr_contexts_pullable--; ++ ret = true; ++ if (!atomic_read(&kctx->atoms_pulled)) { ++ WARN_ON(!kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); ++ kbase_ctx_flag_clear(kctx, KCTX_RUNNABLE_REF); ++ atomic_dec(&kbdev->js_data.nr_contexts_runnable); ++ } + } ++ kctx->slots_pullable &= ~(1 << js); + -+ fence->sync_fd = uk_fence->sync_fd; ++ return ret; +} + -+struct mali_timeline_system *mali_timeline_system_create(struct mali_session_data *session) ++/** ++ * kbase_js_ctx_list_pop_head_nolock - Variant of kbase_js_ctx_list_pop_head() ++ * where the caller must hold ++ * hwaccess_lock ++ * @kbdev: Device pointer ++ * @js: Job slot to use ++ * ++ * Caller must hold hwaccess_lock ++ * ++ * Return: Context to use for specified slot. ++ * NULL if no contexts present for specified slot ++ */ ++static struct kbase_context *kbase_js_ctx_list_pop_head_nolock( ++ struct kbase_device *kbdev, ++ int js) +{ -+ u32 i; -+ struct mali_timeline_system *system; -+ -+ MALI_DEBUG_ASSERT_POINTER(session); -+ MALI_DEBUG_PRINT(4, ("Mali Timeline: creating timeline system\n")); -+ -+ system = (struct mali_timeline_system *) _mali_osk_calloc(1, sizeof(struct mali_timeline_system)); -+ if (NULL == system) { -+ return NULL; -+ } -+ -+ system->spinlock = mali_spinlock_reentrant_init(_MALI_OSK_LOCK_ORDER_TIMELINE_SYSTEM); -+ if (NULL == system->spinlock) { -+ mali_timeline_system_destroy(system); -+ return NULL; -+ } ++ struct kbase_context *kctx; + -+ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { -+ system->timelines[i] = mali_timeline_create(system, (enum mali_timeline_id)i); -+ if (NULL == system->timelines[i]) { -+ mali_timeline_system_destroy(system); -+ return NULL; -+ } -+ } ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ system->signaled_sync_tl = mali_sync_timeline_create(NULL, "mali-always-signaled"); -+ if (NULL == system->signaled_sync_tl) { -+ mali_timeline_system_destroy(system); ++ if (list_empty(&kbdev->js_data.ctx_list_pullable[js])) + return NULL; -+ } -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ + -+ system->waiter_empty_list = NULL; -+ system->session = session; -+ system->timer_enabled = MALI_TRUE; ++ kctx = list_entry(kbdev->js_data.ctx_list_pullable[js].next, ++ struct kbase_context, ++ jctx.sched_info.ctx.ctx_list_entry[js]); + -+ system->wait_queue = _mali_osk_wait_queue_init(); -+ if (NULL == system->wait_queue) { -+ mali_timeline_system_destroy(system); -+ return NULL; -+ } ++ list_del_init(&kctx->jctx.sched_info.ctx.ctx_list_entry[js]); + -+ return system; ++ return kctx; +} + -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) ||defined(CONFIG_SYNC) ||defined(CONFIG_SYNC_FILE) +/** -+ * Check if there are any trackers left on timeline. -+ * -+ * Used as a wait queue conditional. ++ * kbase_js_ctx_list_pop_head - Pop the head context off the per-slot pullable ++ * queue. ++ * @kbdev: Device pointer ++ * @js: Job slot to use + * -+ * @param data Timeline. -+ * @return MALI_TRUE if there are no trackers on timeline, MALI_FALSE if not. ++ * Return: Context to use for specified slot. ++ * NULL if no contexts present for specified slot + */ -+static mali_bool mali_timeline_has_no_trackers(void *data) ++static struct kbase_context *kbase_js_ctx_list_pop_head( ++ struct kbase_device *kbdev, int js) +{ -+ struct mali_timeline *timeline = (struct mali_timeline *) data; ++ struct kbase_context *kctx; ++ unsigned long flags; + -+ MALI_DEBUG_ASSERT_POINTER(timeline); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kctx = kbase_js_ctx_list_pop_head_nolock(kbdev, js); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ return mali_timeline_is_empty(timeline); ++ return kctx; +} -+#if defined(CONFIG_SYNC) ||defined(CONFIG_SYNC_FILE) ++ +/** -+ * Cancel sync fence waiters waited upon by trackers on all timelines. ++ * kbase_js_ctx_pullable - Return if a context can be pulled from on the ++ * specified slot ++ * @kctx: Context pointer ++ * @js: Job slot to use ++ * @is_scheduled: true if the context is currently scheduled + * -+ * Will return after all timelines have no trackers left. ++ * Caller must hold hwaccess_lock + * -+ * @param system Timeline system. ++ * Return: true if context can be pulled from on specified slot ++ * false otherwise + */ -+static void mali_timeline_cancel_sync_fence_waiters(struct mali_timeline_system *system) ++static bool kbase_js_ctx_pullable(struct kbase_context *kctx, int js, ++ bool is_scheduled) +{ -+ u32 i; -+ u32 tid = _mali_osk_get_tid(); -+ struct mali_timeline_tracker *tracker, *tracker_next; -+ _MALI_OSK_LIST_HEAD_STATIC_INIT(tracker_list); ++ struct kbasep_js_device_data *js_devdata; ++ struct kbase_jd_atom *katom; + -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(system->session); -+ MALI_DEBUG_ASSERT(system->session->is_aborting); ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ js_devdata = &kctx->kbdev->js_data; + -+ /* Cancel sync fence waiters. */ -+ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { -+ struct mali_timeline *timeline = system->timelines[i]; ++ if (is_scheduled) { ++ if (!kbasep_js_is_submit_allowed(js_devdata, kctx)) ++ return false; ++ } ++ katom = jsctx_rb_peek(kctx, js); ++ if (!katom) ++ return false; /* No pullable atoms */ ++ if (kctx->blocked_js[js][katom->sched_priority]) ++ return false; ++ if (atomic_read(&katom->blocked)) ++ return false; /* next atom blocked */ ++ if (katom->atom_flags & KBASE_KATOM_FLAG_X_DEP_BLOCKED) { ++ if (katom->x_pre_dep->gpu_rb_state == ++ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB || ++ katom->x_pre_dep->will_fail_event_code) ++ return false; ++ if ((katom->atom_flags & KBASE_KATOM_FLAG_FAIL_BLOCKER) && ++ kbase_backend_nr_atoms_on_slot(kctx->kbdev, js)) ++ return false; ++ } + -+ MALI_DEBUG_ASSERT_POINTER(timeline); ++ return true; ++} + -+ tracker_next = timeline->tracker_tail; -+ while (NULL != tracker_next) { -+ tracker = tracker_next; -+ tracker_next = tracker->timeline_next; ++static bool kbase_js_dep_validate(struct kbase_context *kctx, ++ struct kbase_jd_atom *katom) ++{ ++ struct kbase_device *kbdev = kctx->kbdev; ++ bool ret = true; ++ bool has_dep = false, has_x_dep = false; ++ int js = kbase_js_get_slot(kbdev, katom); ++ int prio = katom->sched_priority; ++ int i; + -+ if (NULL == tracker->sync_fence) continue; ++ for (i = 0; i < 2; i++) { ++ struct kbase_jd_atom *dep_atom = katom->dep[i].atom; + -+ MALI_DEBUG_PRINT(3, ("Mali Timeline: Cancelling sync fence wait for tracker 0x%08X.\n", tracker)); ++ if (dep_atom) { ++ int dep_js = kbase_js_get_slot(kbdev, dep_atom); ++ int dep_prio = dep_atom->sched_priority; + -+ /* Cancel sync fence waiter. */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ if (0 == sync_fence_cancel_async(tracker->sync_fence, &tracker->sync_fence_waiter)) { -+#else -+ if (0 == mali_internal_sync_fence_cancel_async(tracker->sync_fence, &tracker->sync_fence_waiter)) { -+#endif -+ /* Callback was not called, move tracker to local list. */ -+ _mali_osk_list_add(&tracker->sync_fence_cancel_list, &tracker_list); ++ /* Dependent atom must already have been submitted */ ++ if (!(dep_atom->atom_flags & ++ KBASE_KATOM_FLAG_JSCTX_IN_TREE)) { ++ ret = false; ++ break; ++ } ++ ++ /* Dependencies with different priorities can't ++ be represented in the ringbuffer */ ++ if (prio != dep_prio) { ++ ret = false; ++ break; ++ } ++ ++ if (js == dep_js) { ++ /* Only one same-slot dependency can be ++ * represented in the ringbuffer */ ++ if (has_dep) { ++ ret = false; ++ break; ++ } ++ /* Each dependee atom can only have one ++ * same-slot dependency */ ++ if (dep_atom->post_dep) { ++ ret = false; ++ break; ++ } ++ has_dep = true; ++ } else { ++ /* Only one cross-slot dependency can be ++ * represented in the ringbuffer */ ++ if (has_x_dep) { ++ ret = false; ++ break; ++ } ++ /* Each dependee atom can only have one ++ * cross-slot dependency */ ++ if (dep_atom->x_post_dep) { ++ ret = false; ++ break; ++ } ++ /* The dependee atom can not already be in the ++ * HW access ringbuffer */ ++ if (dep_atom->gpu_rb_state != ++ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { ++ ret = false; ++ break; ++ } ++ /* The dependee atom can not already have ++ * completed */ ++ if (dep_atom->status != ++ KBASE_JD_ATOM_STATE_IN_JS) { ++ ret = false; ++ break; ++ } ++ /* Cross-slot dependencies must not violate ++ * PRLAM-8987 affinity restrictions */ ++ if (kbase_hw_has_issue(kbdev, ++ BASE_HW_ISSUE_8987) && ++ (js == 2 || dep_js == 2)) { ++ ret = false; ++ break; ++ } ++ has_x_dep = true; + } ++ ++ /* Dependency can be represented in ringbuffers */ + } + } + -+ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ /* If dependencies can be represented by ringbuffer then clear them from ++ * atom structure */ ++ if (ret) { ++ for (i = 0; i < 2; i++) { ++ struct kbase_jd_atom *dep_atom = katom->dep[i].atom; + -+ /* Manually call sync fence callback in order to release waiter and trigger activation of tracker. */ -+ _MALI_OSK_LIST_FOREACHENTRY(tracker, tracker_next, &tracker_list, struct mali_timeline_tracker, sync_fence_cancel_list) { -+ mali_timeline_sync_fence_callback(tracker->sync_fence, &tracker->sync_fence_waiter); -+ } ++ if (dep_atom) { ++ int dep_js = kbase_js_get_slot(kbdev, dep_atom); + -+ /* Sleep until all sync fence callbacks are done and all timelines are empty. */ -+ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { -+ struct mali_timeline *timeline = system->timelines[i]; ++ if ((js != dep_js) && ++ (dep_atom->status != ++ KBASE_JD_ATOM_STATE_COMPLETED) ++ && (dep_atom->status != ++ KBASE_JD_ATOM_STATE_HW_COMPLETED) ++ && (dep_atom->status != ++ KBASE_JD_ATOM_STATE_UNUSED)) { + -+ MALI_DEBUG_ASSERT_POINTER(timeline); ++ katom->atom_flags |= ++ KBASE_KATOM_FLAG_X_DEP_BLOCKED; ++ katom->x_pre_dep = dep_atom; ++ dep_atom->x_post_dep = katom; ++ if (kbase_jd_katom_dep_type( ++ &katom->dep[i]) == ++ BASE_JD_DEP_TYPE_DATA) ++ katom->atom_flags |= ++ KBASE_KATOM_FLAG_FAIL_BLOCKER; ++ } ++ if ((kbase_jd_katom_dep_type(&katom->dep[i]) ++ == BASE_JD_DEP_TYPE_DATA) && ++ (js == dep_js)) { ++ katom->pre_dep = dep_atom; ++ dep_atom->post_dep = katom; ++ } + -+ _mali_osk_wait_queue_wait_event(system->wait_queue, mali_timeline_has_no_trackers, (void *) timeline); ++ list_del(&katom->dep_item[i]); ++ kbase_jd_katom_dep_clear(&katom->dep[i]); ++ } ++ } + } -+} + -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ return ret; ++} + -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+static void mali_timeline_cancel_dma_fence_waiters(struct mali_timeline_system *system) ++bool kbasep_js_add_job(struct kbase_context *kctx, ++ struct kbase_jd_atom *atom) +{ -+ u32 i, j; -+ u32 tid = _mali_osk_get_tid(); -+ struct mali_pp_job *pp_job = NULL; -+ struct mali_pp_job *next_pp_job = NULL; -+ struct mali_timeline *timeline = NULL; -+ struct mali_timeline_tracker *tracker, *tracker_next; -+ _MALI_OSK_LIST_HEAD_STATIC_INIT(pp_job_list); -+ -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(system->session); -+ MALI_DEBUG_ASSERT(system->session->is_aborting); ++ unsigned long flags; ++ struct kbasep_js_kctx_info *js_kctx_info; ++ struct kbase_device *kbdev; ++ struct kbasep_js_device_data *js_devdata; + -+ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ bool enqueue_required = false; ++ bool timer_sync = false; + -+ /* Cancel dma fence waiters. */ -+ timeline = system->timelines[MALI_TIMELINE_PP]; -+ MALI_DEBUG_ASSERT_POINTER(timeline); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(atom != NULL); ++ lockdep_assert_held(&kctx->jctx.lock); + -+ tracker_next = timeline->tracker_tail; -+ while (NULL != tracker_next) { -+ mali_bool fence_is_signaled = MALI_TRUE; -+ tracker = tracker_next; -+ tracker_next = tracker->timeline_next; ++ kbdev = kctx->kbdev; ++ js_devdata = &kbdev->js_data; ++ js_kctx_info = &kctx->jctx.sched_info; + -+ if (NULL == tracker->waiter_dma_fence) continue; -+ pp_job = (struct mali_pp_job *)tracker->job; -+ MALI_DEBUG_ASSERT_POINTER(pp_job); -+ MALI_DEBUG_PRINT(3, ("Mali Timeline: Cancelling dma fence waiter for tracker 0x%08X.\n", tracker)); ++ mutex_lock(&js_devdata->queue_mutex); ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); + -+ for (j = 0; j < pp_job->dma_fence_context.num_dma_fence_waiter; j++) { -+ if (pp_job->dma_fence_context.mali_dma_fence_waiters[j]) { -+ /* Cancel a previously callback from the fence. -+ * This function returns true if the callback is successfully removed, -+ * or false if the fence has already been signaled. -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ bool ret = dma_fence_remove_callback(pp_job->dma_fence_context.mali_dma_fence_waiters[j]->fence, -+ &pp_job->dma_fence_context.mali_dma_fence_waiters[j]->base); ++ /* ++ * Begin Runpool transaction ++ */ ++ mutex_lock(&js_devdata->runpool_mutex); + -+#else -+ bool ret = fence_remove_callback(pp_job->dma_fence_context.mali_dma_fence_waiters[j]->fence, -+ &pp_job->dma_fence_context.mali_dma_fence_waiters[j]->base); -+#endif -+ if (ret) { -+ fence_is_signaled = MALI_FALSE; -+ } -+ } -+ } ++ /* Refcount ctx.nr_jobs */ ++ KBASE_DEBUG_ASSERT(js_kctx_info->ctx.nr_jobs < U32_MAX); ++ ++(js_kctx_info->ctx.nr_jobs); + -+ /* Callbacks were not called, move pp job to local list. */ -+ if (MALI_FALSE == fence_is_signaled) -+ _mali_osk_list_add(&pp_job->list, &pp_job_list); -+ } ++ /* Setup any scheduling information */ ++ kbasep_js_clear_job_retry_submit(atom); + -+ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ /* Lock for state available during IRQ */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ /* Manually call dma fence callback in order to release waiter and trigger activation of tracker. */ -+ _MALI_OSK_LIST_FOREACHENTRY(pp_job, next_pp_job, &pp_job_list, struct mali_pp_job, list) { -+ mali_timeline_dma_fence_callback((void *)pp_job); -+ } ++ if (!kbase_js_dep_validate(kctx, atom)) { ++ /* Dependencies could not be represented */ ++ --(js_kctx_info->ctx.nr_jobs); + -+ /* Sleep until all dma fence callbacks are done and all timelines are empty. */ -+ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { -+ struct mali_timeline *timeline = system->timelines[i]; -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ _mali_osk_wait_queue_wait_event(system->wait_queue, mali_timeline_has_no_trackers, (void *) timeline); -+ } -+} -+#endif -+#endif -+void mali_timeline_system_abort(struct mali_timeline_system *system) -+{ -+ MALI_DEBUG_CODE(u32 tid = _mali_osk_get_tid();); ++ /* Setting atom status back to queued as it still has unresolved ++ * dependencies */ ++ atom->status = KBASE_JD_ATOM_STATE_QUEUED; + -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(system->session); -+ MALI_DEBUG_ASSERT(system->session->is_aborting); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&js_devdata->runpool_mutex); + -+ MALI_DEBUG_PRINT(3, ("Mali Timeline: Aborting timeline system for session 0x%08X.\n", system->session)); ++ goto out_unlock; ++ } + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ mali_timeline_cancel_sync_fence_waiters(system); -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(atom, TL_ATOM_STATE_READY); ++ KBASE_TIMELINE_ATOM_READY(kctx, kbase_jd_atom_id(kctx, atom)); + -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+ mali_timeline_cancel_dma_fence_waiters(system); -+#endif ++ enqueue_required = kbase_js_dep_resolved_submit(kctx, atom); + -+ /* Should not be any waiters or trackers left at this point. */ -+ MALI_DEBUG_CODE({ -+ u32 i; -+ mali_spinlock_reentrant_wait(system->spinlock, tid); -+ for (i = 0; i < MALI_TIMELINE_MAX; ++i) -+ { -+ struct mali_timeline *timeline = system->timelines[i]; -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ MALI_DEBUG_ASSERT(timeline->point_oldest == timeline->point_next); -+ MALI_DEBUG_ASSERT(NULL == timeline->tracker_head); -+ MALI_DEBUG_ASSERT(NULL == timeline->tracker_tail); -+ MALI_DEBUG_ASSERT(NULL == timeline->waiter_head); -+ MALI_DEBUG_ASSERT(NULL == timeline->waiter_tail); -+ } -+ mali_spinlock_reentrant_signal(system->spinlock, tid); -+ }); -+} ++ KBASE_TRACE_ADD_REFCOUNT(kbdev, JS_ADD_JOB, kctx, atom, atom->jc, ++ kbasep_js_trace_get_refcnt(kbdev, kctx)); + -+void mali_timeline_system_destroy(struct mali_timeline_system *system) -+{ -+ u32 i; -+ struct mali_timeline_waiter *waiter, *next; -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ u32 tid = _mali_osk_get_tid(); -+#endif ++ /* Context Attribute Refcounting */ ++ kbasep_js_ctx_attr_ctx_retain_atom(kbdev, kctx, atom); + -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(system->session); ++ if (enqueue_required) { ++ if (kbase_js_ctx_pullable(kctx, atom->slot_nr, false)) ++ timer_sync = kbase_js_ctx_list_add_pullable_nolock( ++ kbdev, kctx, atom->slot_nr); ++ else ++ timer_sync = kbase_js_ctx_list_add_unpullable_nolock( ++ kbdev, kctx, atom->slot_nr); ++ } ++ /* If this context is active and the atom is the first on its slot, ++ * kick the job manager to attempt to fast-start the atom */ ++ if (enqueue_required && kctx == kbdev->hwaccess.active_kctx) ++ kbase_jm_try_kick(kbdev, 1 << atom->slot_nr); + -+ MALI_DEBUG_PRINT(4, ("Mali Timeline: destroying timeline system\n")); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ if (timer_sync) ++ kbase_backend_ctx_count_changed(kbdev); ++ mutex_unlock(&js_devdata->runpool_mutex); ++ /* End runpool transaction */ + -+ if (NULL != system) { ++ if (!kbase_ctx_flag(kctx, KCTX_SCHEDULED)) { ++ if (kbase_ctx_flag(kctx, KCTX_DYING)) { ++ /* A job got added while/after kbase_job_zap_context() ++ * was called on a non-scheduled context (e.g. KDS ++ * dependency resolved). Kill that job by killing the ++ * context. */ ++ kbasep_js_runpool_requeue_or_kill_ctx(kbdev, kctx, ++ false); ++ } else if (js_kctx_info->ctx.nr_jobs == 1) { ++ /* Handle Refcount going from 0 to 1: schedule the ++ * context on the Queue */ ++ KBASE_DEBUG_ASSERT(!kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ dev_dbg(kbdev->dev, "JS: Enqueue Context %p", kctx); + -+ /* There should be no waiters left on this queue. */ -+ if (NULL != system->wait_queue) { -+ _mali_osk_wait_queue_term(system->wait_queue); -+ system->wait_queue = NULL; ++ /* Queue was updated - caller must try to ++ * schedule the head context */ ++ WARN_ON(!enqueue_required); + } ++ } ++out_unlock: ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); + -+ /* Free all waiters in empty list */ -+ waiter = system->waiter_empty_list; -+ while (NULL != waiter) { -+ next = waiter->tracker_next; -+ _mali_osk_free(waiter); -+ waiter = next; -+ } ++ mutex_unlock(&js_devdata->queue_mutex); + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ if (NULL != system->signaled_sync_tl) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ sync_timeline_destroy(system->signaled_sync_tl); -+#else -+ mali_internal_sync_timeline_destroy(system->signaled_sync_tl); -+#endif -+ } ++ return enqueue_required; ++} + -+ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { -+ if ((NULL != system->timelines[i]) && (NULL != system->timelines[i]->spinlock)) { -+ mali_spinlock_reentrant_wait(system->timelines[i]->spinlock, tid); -+ system->timelines[i]->destroyed = MALI_TRUE; -+ mali_spinlock_reentrant_signal(system->timelines[i]->spinlock, tid); -+ } -+ } -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++void kbasep_js_remove_job(struct kbase_device *kbdev, ++ struct kbase_context *kctx, struct kbase_jd_atom *atom) ++{ ++ struct kbasep_js_kctx_info *js_kctx_info; ++ struct kbasep_js_device_data *js_devdata; + -+ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { -+ if (NULL != system->timelines[i]) { -+ mali_timeline_destroy(system->timelines[i]); -+ } -+ } ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(atom != NULL); + -+ if (NULL != system->spinlock) { -+ mali_spinlock_reentrant_term(system->spinlock); -+ } ++ js_devdata = &kbdev->js_data; ++ js_kctx_info = &kctx->jctx.sched_info; + -+ _mali_osk_free(system); -+ } ++ KBASE_TRACE_ADD_REFCOUNT(kbdev, JS_REMOVE_JOB, kctx, atom, atom->jc, ++ kbasep_js_trace_get_refcnt(kbdev, kctx)); ++ ++ /* De-refcount ctx.nr_jobs */ ++ KBASE_DEBUG_ASSERT(js_kctx_info->ctx.nr_jobs > 0); ++ --(js_kctx_info->ctx.nr_jobs); +} + -+/** -+ * Find how many waiters are needed for a given fence. -+ * -+ * @param fence The fence to check. -+ * @return Number of waiters needed for fence. -+ */ -+static u32 mali_timeline_fence_num_waiters(struct mali_timeline_fence *fence) ++bool kbasep_js_remove_cancelled_job(struct kbase_device *kbdev, ++ struct kbase_context *kctx, struct kbase_jd_atom *katom) +{ -+ u32 i, num_waiters = 0; ++ unsigned long flags; ++ struct kbasep_js_atom_retained_state katom_retained_state; ++ struct kbasep_js_device_data *js_devdata; ++ bool attr_state_changed; + -+ MALI_DEBUG_ASSERT_POINTER(fence); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(katom != NULL); + -+ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { -+ if (MALI_TIMELINE_NO_POINT != fence->points[i]) { -+ ++num_waiters; -+ } -+ } ++ js_devdata = &kbdev->js_data; + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ if (-1 != fence->sync_fd) ++num_waiters; -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ kbasep_js_atom_retained_state_copy(&katom_retained_state, katom); ++ kbasep_js_remove_job(kbdev, kctx, katom); + -+ return num_waiters; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ++ /* The atom has 'finished' (will not be re-run), so no need to call ++ * kbasep_js_has_atom_finished(). ++ * ++ * This is because it returns false for soft-stopped atoms, but we ++ * want to override that, because we're cancelling an atom regardless of ++ * whether it was soft-stopped or not */ ++ attr_state_changed = kbasep_js_ctx_attr_ctx_release_atom(kbdev, kctx, ++ &katom_retained_state); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ return attr_state_changed; +} + -+static struct mali_timeline_waiter *mali_timeline_system_get_zeroed_waiter(struct mali_timeline_system *system) ++bool kbasep_js_runpool_retain_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx) +{ -+ struct mali_timeline_waiter *waiter; ++ unsigned long flags; ++ struct kbasep_js_device_data *js_devdata; ++ bool result; + -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ js_devdata = &kbdev->js_data; + -+ waiter = system->waiter_empty_list; -+ if (NULL != waiter) { -+ /* Remove waiter from empty list and zero it */ -+ system->waiter_empty_list = waiter->tracker_next; -+ _mali_osk_memset(waiter, 0, sizeof(*waiter)); -+ } ++ mutex_lock(&kbdev->mmu_hw_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ result = kbasep_js_runpool_retain_ctx_nolock(kbdev, kctx); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); + -+ /* Return NULL if list was empty. */ -+ return waiter; ++ return result; +} + -+static void mali_timeline_system_allocate_waiters(struct mali_timeline_system *system, -+ struct mali_timeline_waiter **tail, -+ struct mali_timeline_waiter **head, -+ int max_num_waiters) ++struct kbase_context *kbasep_js_runpool_lookup_ctx(struct kbase_device *kbdev, ++ int as_nr) +{ -+ u32 i, tid = _mali_osk_get_tid(); -+ mali_bool do_alloc; -+ struct mali_timeline_waiter *waiter; ++ int ret = 0; ++ unsigned long flags; ++ struct kbasep_js_device_data *js_devdata; ++ struct kbase_context *found_kctx = NULL; + -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(tail); -+ MALI_DEBUG_ASSERT_POINTER(head); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(0 <= as_nr && as_nr < BASE_MAX_NR_AS); ++ js_devdata = &kbdev->js_data; + -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ *head = *tail = NULL; -+ do_alloc = MALI_FALSE; -+ i = 0; -+ while (i < max_num_waiters) { -+ if (MALI_FALSE == do_alloc) { -+ waiter = mali_timeline_system_get_zeroed_waiter(system); -+ if (NULL == waiter) { -+ do_alloc = MALI_TRUE; -+ mali_spinlock_reentrant_signal(system->spinlock, tid); -+ continue; -+ } -+ } else { -+ waiter = _mali_osk_calloc(1, sizeof(struct mali_timeline_waiter)); -+ if (NULL == waiter) break; -+ } -+ ++i; -+ if (NULL == *tail) { -+ *tail = waiter; -+ *head = waiter; -+ } else { -+ (*head)->tracker_next = waiter; -+ *head = waiter; ++ found_kctx = kbdev->as_to_kctx[as_nr]; ++ ++ if (found_kctx != NULL) { ++ ret = kbase_ctx_sched_retain_ctx_refcount(found_kctx); ++ if (ret != 0) { ++ E("fail to retain ctx_refcount, ret : %d.", ret); ++ found_kctx = NULL; + } + } -+ if (MALI_TRUE == do_alloc) { -+ mali_spinlock_reentrant_wait(system->spinlock, tid); -+ } ++ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ return found_kctx; +} + +/** -+ * Create waiters for the given tracker. The tracker is activated when all waiters are release. ++ * kbasep_js_release_result - Try running more jobs after releasing a context ++ * and/or atom + * -+ * @note Tracker can potentially be activated before this function returns. ++ * @kbdev: The kbase_device to operate on ++ * @kctx: The kbase_context to operate on ++ * @katom_retained_state: Retained state from the atom ++ * @runpool_ctx_attr_change: True if the runpool context attributes have changed + * -+ * @param system Timeline system. -+ * @param tracker Tracker we will create waiters for. -+ * @param waiter_tail List of pre-allocated waiters. -+ * @param waiter_head List of pre-allocated waiters. ++ * This collates a set of actions that must happen whilst hwaccess_lock is held. ++ * ++ * This includes running more jobs when: ++ * - The previously released kctx caused a ctx attribute change, ++ * - The released atom caused a ctx attribute change, ++ * - Slots were previously blocked due to affinity restrictions, ++ * - Submission during IRQ handling failed. ++ * ++ * Return: %KBASEP_JS_RELEASE_RESULT_SCHED_ALL if context attributes were ++ * changed. The caller should try scheduling all contexts + */ -+static void mali_timeline_system_create_waiters_and_unlock(struct mali_timeline_system *system, -+ struct mali_timeline_tracker *tracker, -+ struct mali_timeline_waiter *waiter_tail, -+ struct mali_timeline_waiter *waiter_head) ++static kbasep_js_release_result kbasep_js_run_jobs_after_ctx_and_atom_release( ++ struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ struct kbasep_js_atom_retained_state *katom_retained_state, ++ bool runpool_ctx_attr_change) +{ -+ int i; -+ u32 tid = _mali_osk_get_tid(); -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ struct sync_fence *sync_fence = NULL; -+#else -+ struct mali_internal_sync_fence *sync_fence = NULL; -+#endif -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ struct kbasep_js_device_data *js_devdata; ++ kbasep_js_release_result result = 0; + -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(tracker); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(katom_retained_state != NULL); ++ js_devdata = &kbdev->js_data; + -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++ lockdep_assert_held(&kctx->jctx.sched_info.ctx.jsctx_mutex); ++ lockdep_assert_held(&js_devdata->runpool_mutex); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ MALI_DEBUG_ASSERT(NULL == tracker->waiter_head); -+ MALI_DEBUG_ASSERT(NULL == tracker->waiter_tail); -+ MALI_DEBUG_ASSERT(NULL != tracker->job); ++ if (js_devdata->nr_user_contexts_running != 0) { ++ bool retry_submit = false; ++ int retry_jobslot = 0; + -+ /* Creating waiter object for all the timelines the fence is put on. Inserting this waiter -+ * into the timelines sorted list of waiters */ -+ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { -+ mali_timeline_point point; -+ struct mali_timeline *timeline; -+ struct mali_timeline_waiter *waiter; ++ if (katom_retained_state) ++ retry_submit = kbasep_js_get_atom_retry_submit_slot( ++ katom_retained_state, &retry_jobslot); + -+ /* Get point on current timeline from tracker's fence. */ -+ point = tracker->fence.points[i]; ++ if (runpool_ctx_attr_change || retry_submit) { ++ /* A change in runpool ctx attributes might mean we can ++ * run more jobs than before */ ++ result = KBASEP_JS_RELEASE_RESULT_SCHED_ALL; + -+ if (likely(MALI_TIMELINE_NO_POINT == point)) { -+ /* Fence contains no point on this timeline so we don't need a waiter. */ -+ continue; ++ KBASE_TRACE_ADD_SLOT(kbdev, JD_DONE_TRY_RUN_NEXT_JOB, ++ kctx, NULL, 0u, retry_jobslot); + } ++ } ++ return result; ++} + -+ timeline = system->timelines[i]; -+ MALI_DEBUG_ASSERT_POINTER(timeline); ++/* ++ * Internal function to release the reference on a ctx and an atom's "retained ++ * state", only taking the runpool and as transaction mutexes ++ * ++ * This also starts more jobs running in the case of an ctx-attribute state ++ * change ++ * ++ * This does none of the followup actions for scheduling: ++ * - It does not schedule in a new context ++ * - It does not requeue or handle dying contexts ++ * ++ * For those tasks, just call kbasep_js_runpool_release_ctx() instead ++ * ++ * Requires: ++ * - Context is scheduled in, and kctx->as_nr matches kctx_as_nr ++ * - Context has a non-zero refcount ++ * - Caller holds js_kctx_info->ctx.jsctx_mutex ++ * - Caller holds js_devdata->runpool_mutex ++ */ ++static kbasep_js_release_result kbasep_js_runpool_release_ctx_internal( ++ struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ struct kbasep_js_atom_retained_state *katom_retained_state) ++{ ++ unsigned long flags; ++ struct kbasep_js_device_data *js_devdata; ++ struct kbasep_js_kctx_info *js_kctx_info; + -+ if (unlikely(!mali_timeline_is_point_valid(timeline, point))) { -+ MALI_PRINT_ERROR(("Mali Timeline: point %d is not valid (oldest=%d, next=%d)\n", -+ point, timeline->point_oldest, timeline->point_next)); -+ continue; -+ } ++ kbasep_js_release_result release_result = 0u; ++ bool runpool_ctx_attr_change = false; ++ int kctx_as_nr; ++ struct kbase_as *current_as; ++ int new_ref_count; + -+ if (likely(mali_timeline_is_point_released(timeline, point))) { -+ /* Tracker representing the point has been released so we don't need a -+ * waiter. */ -+ continue; -+ } ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ js_kctx_info = &kctx->jctx.sched_info; ++ js_devdata = &kbdev->js_data; + -+ if ((MALI_TIMELINE_SOFT == timeline->id) && mali_timeline_is_tracker_released(timeline, point)) { -+ /* The tracker that the point related to has already been released, so no need to a waiter. */ -+ continue; -+ } ++ /* Ensure context really is scheduled in */ ++ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); + -+ /* The point is on timeline. */ -+ MALI_DEBUG_ASSERT(mali_timeline_is_point_on(timeline, point)); ++ kctx_as_nr = kctx->as_nr; ++ KBASE_DEBUG_ASSERT(kctx_as_nr != KBASEP_AS_NR_INVALID); ++ KBASE_DEBUG_ASSERT(atomic_read(&kctx->refcount) > 0); + -+ /* Get a new zeroed waiter object. */ -+ if (likely(NULL != waiter_tail)) { -+ waiter = waiter_tail; -+ waiter_tail = waiter_tail->tracker_next; -+ } else { -+ MALI_PRINT_ERROR(("Mali Timeline: failed to allocate memory for waiter\n")); -+ continue; -+ } ++ /* ++ * Transaction begins on AS and runpool_irq ++ * ++ * Assert about out calling contract ++ */ ++ current_as = &kbdev->as[kctx_as_nr]; ++ mutex_lock(&kbdev->pm.lock); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ /* Yanking the trigger ref count of the tracker. */ -+ tracker->trigger_ref_count++; ++ KBASE_DEBUG_ASSERT(kctx_as_nr == kctx->as_nr); ++ KBASE_DEBUG_ASSERT(atomic_read(&kctx->refcount) > 0); + -+ waiter->point = point; -+ waiter->tracker = tracker; ++ /* Update refcount */ ++ kbase_ctx_sched_release_ctx(kctx); ++ new_ref_count = atomic_read(&kctx->refcount); + -+ /* Insert waiter on tracker's singly-linked waiter list. */ -+ if (NULL == tracker->waiter_head) { -+ /* list is empty */ -+ MALI_DEBUG_ASSERT(NULL == tracker->waiter_tail); -+ tracker->waiter_tail = waiter; -+ } else { -+ tracker->waiter_head->tracker_next = waiter; -+ } -+ tracker->waiter_head = waiter; ++ /* Release the atom if it finished (i.e. wasn't soft-stopped) */ ++ if (kbasep_js_has_atom_finished(katom_retained_state)) ++ runpool_ctx_attr_change |= kbasep_js_ctx_attr_ctx_release_atom( ++ kbdev, kctx, katom_retained_state); + -+ /* Add waiter to timeline. */ -+ mali_timeline_insert_waiter(timeline, waiter); -+ } -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ if (-1 != tracker->fence.sync_fd) { -+ int ret; -+ struct mali_timeline_waiter *waiter; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ sync_fence = sync_fence_fdget(tracker->fence.sync_fd); -+#else -+ sync_fence = mali_internal_sync_fence_fdget(tracker->fence.sync_fd); -+#endif -+ if (unlikely(NULL == sync_fence)) { -+ MALI_PRINT_ERROR(("Mali Timeline: failed to get sync fence from fd %d\n", tracker->fence.sync_fd)); -+ goto exit; -+ } ++ KBASE_TRACE_ADD_REFCOUNT(kbdev, JS_RELEASE_CTX, kctx, NULL, 0u, ++ new_ref_count); + -+ /* Check if we have a zeroed waiter object available. */ -+ if (unlikely(NULL == waiter_tail)) { -+ MALI_PRINT_ERROR(("Mali Timeline: failed to allocate memory for waiter\n")); -+ goto exit; -+ } ++ if (new_ref_count == 2 && kbase_ctx_flag(kctx, KCTX_PRIVILEGED) && ++ !kbase_pm_is_suspending(kbdev)) { ++ /* Context is kept scheduled into an address space even when ++ * there are no jobs, in this case we have to handle the ++ * situation where all jobs have been evicted from the GPU and ++ * submission is disabled. ++ * ++ * At this point we re-enable submission to allow further jobs ++ * to be executed ++ */ ++ kbasep_js_set_submit_allowed(js_devdata, kctx); ++ } + -+ /* Start asynchronous wait that will release waiter when the fence is signaled. */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ sync_fence_waiter_init(&tracker->sync_fence_waiter, mali_timeline_sync_fence_callback); -+ ret = sync_fence_wait_async(sync_fence, &tracker->sync_fence_waiter); -+#else -+ mali_internal_sync_fence_waiter_init(&tracker->sync_fence_waiter, mali_timeline_sync_fence_callback); -+ ret = mali_internal_sync_fence_wait_async(sync_fence, &tracker->sync_fence_waiter); -+#endif -+ if (1 == ret) { -+ /* Fence already signaled, no waiter needed. */ -+ tracker->fence.sync_fd = -1; -+ goto exit; -+ } else if (0 != ret) { -+ MALI_PRINT_ERROR(("Mali Timeline: sync fence fd %d signaled with error %d\n", tracker->fence.sync_fd, ret)); -+ tracker->activation_error |= MALI_TIMELINE_ACTIVATION_ERROR_SYNC_BIT; -+ goto exit; -+ } ++ /* Make a set of checks to see if the context should be scheduled out. ++ * Note that there'll always be at least 1 reference to the context ++ * which was previously acquired by kbasep_js_schedule_ctx(). */ ++ if (new_ref_count == 1 && ++ (!kbasep_js_is_submit_allowed(js_devdata, kctx) || ++ kbdev->pm.suspending)) { ++ int num_slots = kbdev->gpu_props.num_job_slots; ++ int slot; + -+ /* Grab new zeroed waiter object. */ -+ waiter = waiter_tail; -+ waiter_tail = waiter_tail->tracker_next; ++ /* Last reference, and we've been told to remove this context ++ * from the Run Pool */ ++ dev_dbg(kbdev->dev, "JS: RunPool Remove Context %p because refcount=%d, jobs=%d, allowed=%d", ++ kctx, new_ref_count, js_kctx_info->ctx.nr_jobs, ++ kbasep_js_is_submit_allowed(js_devdata, kctx)); + -+ /* Increase the trigger ref count of the tracker. */ -+ tracker->trigger_ref_count++; ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++ kbase_trace_mali_mmu_as_released(kctx->as_nr); ++#endif ++ KBASE_TLSTREAM_TL_NRET_AS_CTX(&kbdev->as[kctx->as_nr], kctx); + -+ waiter->point = MALI_TIMELINE_NO_POINT; -+ waiter->tracker = tracker; ++ kbase_backend_release_ctx_irq(kbdev, kctx); + -+ /* Insert waiter on tracker's singly-linked waiter list. */ -+ if (NULL == tracker->waiter_head) { -+ /* list is empty */ -+ MALI_DEBUG_ASSERT(NULL == tracker->waiter_tail); -+ tracker->waiter_tail = waiter; -+ } else { -+ tracker->waiter_head->tracker_next = waiter; -+ } -+ tracker->waiter_head = waiter; ++ if (kbdev->hwaccess.active_kctx == kctx) ++ kbdev->hwaccess.active_kctx = NULL; + -+ /* Also store waiter in separate field for easy access by sync callback. */ -+ tracker->waiter_sync = waiter; ++ /* Ctx Attribute handling ++ * ++ * Releasing atoms attributes must either happen before this, or ++ * after the KCTX_SHEDULED flag is changed, otherwise we ++ * double-decount the attributes ++ */ ++ runpool_ctx_attr_change |= ++ kbasep_js_ctx_attr_runpool_release_ctx(kbdev, kctx); + -+ /* Store the sync fence in tracker so we can retrieve in abort session, if needed. */ -+ tracker->sync_fence = sync_fence; ++ /* Releasing the context and katom retained state can allow ++ * more jobs to run */ ++ release_result |= ++ kbasep_js_run_jobs_after_ctx_and_atom_release(kbdev, ++ kctx, katom_retained_state, ++ runpool_ctx_attr_change); + -+ sync_fence = NULL; -+ } -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE)*/ -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+ if ((NULL != tracker->timeline) && (MALI_TIMELINE_PP == tracker->timeline->id)) { ++ /* ++ * Transaction ends on AS and runpool_irq: ++ * ++ * By this point, the AS-related data is now clear and ready ++ * for re-use. ++ * ++ * Since releases only occur once for each previous successful ++ * retain, and no more retains are allowed on this context, no ++ * other thread will be operating in this ++ * code whilst we are ++ */ + -+ struct mali_pp_job *job = (struct mali_pp_job *)tracker->job; ++ /* Recalculate pullable status for all slots */ ++ for (slot = 0; slot < num_slots; slot++) { ++ if (kbase_js_ctx_pullable(kctx, slot, false)) ++ kbase_js_ctx_list_add_pullable_nolock(kbdev, ++ kctx, slot); ++ } + -+ if (0 < job->dma_fence_context.num_dma_fence_waiter) { -+ struct mali_timeline_waiter *waiter; -+ /* Check if we have a zeroed waiter object available. */ -+ if (unlikely(NULL == waiter_tail)) { -+ MALI_PRINT_ERROR(("Mali Timeline: failed to allocate memory for waiter\n")); -+ goto exit; -+ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ /* Grab new zeroed waiter object. */ -+ waiter = waiter_tail; -+ waiter_tail = waiter_tail->tracker_next; ++ kbase_backend_release_ctx_noirq(kbdev, kctx); + -+ /* Increase the trigger ref count of the tracker. */ -+ tracker->trigger_ref_count++; ++ mutex_unlock(&kbdev->pm.lock); + -+ waiter->point = MALI_TIMELINE_NO_POINT; -+ waiter->tracker = tracker; ++ /* Note: Don't reuse kctx_as_nr now */ + -+ /* Insert waiter on tracker's singly-linked waiter list. */ -+ if (NULL == tracker->waiter_head) { -+ /* list is empty */ -+ MALI_DEBUG_ASSERT(NULL == tracker->waiter_tail); -+ tracker->waiter_tail = waiter; -+ } else { -+ tracker->waiter_head->tracker_next = waiter; -+ } -+ tracker->waiter_head = waiter; ++ /* Synchronize with any timers */ ++ kbase_backend_ctx_count_changed(kbdev); + -+ /* Also store waiter in separate field for easy access by sync callback. */ -+ tracker->waiter_dma_fence = waiter; -+ } -+ } -+#endif /* defined(CONFIG_MALI_DMA_BUF_FENCE)*/ ++ /* update book-keeping info */ ++ kbase_ctx_flag_clear(kctx, KCTX_SCHEDULED); ++ /* Signal any waiter that the context is not scheduled, so is ++ * safe for termination - once the jsctx_mutex is also dropped, ++ * and jobs have finished. */ ++ wake_up(&js_kctx_info->ctx.is_scheduled_wait); + -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) ||defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+exit: -+#endif /* defined(CONFIG_MALI_DMA_BUF_FENCE) || defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ /* Queue an action to occur after we've dropped the lock */ ++ release_result |= KBASEP_JS_RELEASE_RESULT_WAS_DESCHEDULED | ++ KBASEP_JS_RELEASE_RESULT_SCHED_ALL; ++ } else { ++ kbasep_js_run_jobs_after_ctx_and_atom_release(kbdev, kctx, ++ katom_retained_state, runpool_ctx_attr_change); + -+ if (NULL != waiter_tail) { -+ mali_timeline_system_release_waiter_list(system, waiter_tail, waiter_head); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->pm.lock); + } + -+ /* Release the initial trigger ref count. */ -+ tracker->trigger_ref_count--; -+ -+ /* If there were no waiters added to this tracker we activate immediately. */ -+ if (0 == tracker->trigger_ref_count) { -+ schedule_mask |= mali_timeline_tracker_activate(tracker); -+ } ++ return release_result; ++} + -+ mali_spinlock_reentrant_signal(system->spinlock, tid); ++void kbasep_js_runpool_release_ctx_nolock(struct kbase_device *kbdev, ++ struct kbase_context *kctx) ++{ ++ struct kbasep_js_atom_retained_state katom_retained_state; + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ if (NULL != sync_fence) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ sync_fence_put(sync_fence); -+#else -+ fput(sync_fence->file); -+#endif -+ } -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ /* Setup a dummy katom_retained_state */ ++ kbasep_js_atom_retained_state_init_invalid(&katom_retained_state); + -+ mali_executor_schedule_from_mask(schedule_mask, MALI_FALSE); ++ kbasep_js_runpool_release_ctx_internal(kbdev, kctx, ++ &katom_retained_state); +} + -+mali_timeline_point mali_timeline_system_add_tracker(struct mali_timeline_system *system, -+ struct mali_timeline_tracker *tracker, -+ enum mali_timeline_id timeline_id) ++void kbasep_js_runpool_requeue_or_kill_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx, bool has_pm_ref) +{ -+ int num_waiters = 0; -+ struct mali_timeline_waiter *waiter_tail, *waiter_head; -+ u32 tid = _mali_osk_get_tid(); ++ struct kbasep_js_device_data *js_devdata; + -+ mali_timeline_point point = MALI_TIMELINE_NO_POINT; ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ js_devdata = &kbdev->js_data; + -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(system->session); -+ MALI_DEBUG_ASSERT_POINTER(tracker); ++ /* This is called if and only if you've you've detached the context from ++ * the Runpool Queue, and not added it back to the Runpool ++ */ ++ KBASE_DEBUG_ASSERT(!kbase_ctx_flag(kctx, KCTX_SCHEDULED)); + -+ MALI_DEBUG_ASSERT(MALI_FALSE == system->session->is_aborting); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_TRACKER_MAX > tracker->type); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_TRACKER_MAGIC == tracker->magic); ++ if (kbase_ctx_flag(kctx, KCTX_DYING)) { ++ /* Dying: don't requeue, but kill all jobs on the context. This ++ * happens asynchronously */ ++ dev_dbg(kbdev->dev, ++ "JS: ** Killing Context %p on RunPool Remove **", kctx); ++ kbase_js_foreach_ctx_job(kctx, &kbase_jd_cancel); ++ } ++} + -+ MALI_DEBUG_PRINT(4, ("Mali Timeline: adding tracker for job %p, timeline: %d\n", tracker->job, timeline_id)); ++void kbasep_js_runpool_release_ctx_and_katom_retained_state( ++ struct kbase_device *kbdev, struct kbase_context *kctx, ++ struct kbasep_js_atom_retained_state *katom_retained_state) ++{ ++ struct kbasep_js_device_data *js_devdata; ++ struct kbasep_js_kctx_info *js_kctx_info; ++ kbasep_js_release_result release_result; + -+ MALI_DEBUG_ASSERT(0 < tracker->trigger_ref_count); -+ tracker->system = system; ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ js_kctx_info = &kctx->jctx.sched_info; ++ js_devdata = &kbdev->js_data; + -+ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ mutex_lock(&js_devdata->queue_mutex); ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++ mutex_lock(&js_devdata->runpool_mutex); + -+ num_waiters = mali_timeline_fence_num_waiters(&tracker->fence); ++ release_result = kbasep_js_runpool_release_ctx_internal(kbdev, kctx, ++ katom_retained_state); + -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+ if (MALI_TIMELINE_PP == timeline_id) { -+ struct mali_pp_job *job = (struct mali_pp_job *)tracker->job; -+ if (0 < job->dma_fence_context.num_dma_fence_waiter) -+ num_waiters++; -+ } -+#endif ++ /* Drop the runpool mutex to allow requeing kctx */ ++ mutex_unlock(&js_devdata->runpool_mutex); + -+ /* Allocate waiters. */ -+ mali_timeline_system_allocate_waiters(system, &waiter_tail, &waiter_head, num_waiters); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++ if ((release_result & KBASEP_JS_RELEASE_RESULT_WAS_DESCHEDULED) != 0u) ++ kbasep_js_runpool_requeue_or_kill_ctx(kbdev, kctx, true); + -+ /* Add tracker to timeline. This will allocate a point for the tracker on the timeline. If -+ * timeline ID is MALI_TIMELINE_NONE the tracker will NOT be added to a timeline and the -+ * point will be MALI_TIMELINE_NO_POINT. -+ * -+ * NOTE: the tracker can fail to be added if the timeline is full. If this happens, the -+ * point will be MALI_TIMELINE_NO_POINT. */ -+ MALI_DEBUG_ASSERT(timeline_id < MALI_TIMELINE_MAX || timeline_id == MALI_TIMELINE_NONE); -+ if (likely(timeline_id < MALI_TIMELINE_MAX)) { -+ struct mali_timeline *timeline = system->timelines[timeline_id]; -+ mali_timeline_insert_tracker(timeline, tracker); -+ MALI_DEBUG_ASSERT(!mali_timeline_is_empty(timeline)); -+ } ++ /* Drop the jsctx_mutex to allow scheduling in a new context */ + -+ point = tracker->point; ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ mutex_unlock(&js_devdata->queue_mutex); + -+ /* Create waiters for tracker based on supplied fence. Each waiter will increase the -+ * trigger ref count. */ -+ mali_timeline_system_create_waiters_and_unlock(system, tracker, waiter_tail, waiter_head); -+ tracker = NULL; ++ if (release_result & KBASEP_JS_RELEASE_RESULT_SCHED_ALL) ++ kbase_js_sched_all(kbdev); ++} + -+ /* At this point the tracker object might have been freed so we should no longer -+ * access it. */ ++void kbasep_js_runpool_release_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx) ++{ ++ struct kbasep_js_atom_retained_state katom_retained_state; + ++ kbasep_js_atom_retained_state_init_invalid(&katom_retained_state); + -+ /* The tracker will always be activated after calling add_tracker, even if NO_POINT is -+ * returned. */ -+ return point; ++ kbasep_js_runpool_release_ctx_and_katom_retained_state(kbdev, kctx, ++ &katom_retained_state); +} + -+static mali_scheduler_mask mali_timeline_system_release_waiter(struct mali_timeline_system *system, -+ struct mali_timeline_waiter *waiter) ++/* Variant of kbasep_js_runpool_release_ctx() that doesn't call into ++ * kbase_js_sched_all() */ ++static void kbasep_js_runpool_release_ctx_no_schedule( ++ struct kbase_device *kbdev, struct kbase_context *kctx) +{ -+ struct mali_timeline_tracker *tracker; -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; -+ -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(waiter); ++ struct kbasep_js_device_data *js_devdata; ++ struct kbasep_js_kctx_info *js_kctx_info; ++ kbasep_js_release_result release_result; ++ struct kbasep_js_atom_retained_state katom_retained_state_struct; ++ struct kbasep_js_atom_retained_state *katom_retained_state = ++ &katom_retained_state_struct; + -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_SYSTEM_LOCKED(system)); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ js_kctx_info = &kctx->jctx.sched_info; ++ js_devdata = &kbdev->js_data; ++ kbasep_js_atom_retained_state_init_invalid(katom_retained_state); + -+ tracker = waiter->tracker; -+ MALI_DEBUG_ASSERT_POINTER(tracker); ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++ mutex_lock(&js_devdata->runpool_mutex); + -+ /* At this point the waiter has been removed from the timeline's waiter list, but it is -+ * still on the tracker's waiter list. All of the tracker's waiters will be released when -+ * the tracker is activated. */ ++ release_result = kbasep_js_runpool_release_ctx_internal(kbdev, kctx, ++ katom_retained_state); + -+ waiter->point = MALI_TIMELINE_NO_POINT; -+ waiter->tracker = NULL; ++ /* Drop the runpool mutex to allow requeing kctx */ ++ mutex_unlock(&js_devdata->runpool_mutex); ++ if ((release_result & KBASEP_JS_RELEASE_RESULT_WAS_DESCHEDULED) != 0u) ++ kbasep_js_runpool_requeue_or_kill_ctx(kbdev, kctx, true); + -+ tracker->trigger_ref_count--; -+ if (0 == tracker->trigger_ref_count) { -+ /* This was the last waiter; activate tracker */ -+ schedule_mask |= mali_timeline_tracker_activate(tracker); -+ tracker = NULL; -+ } ++ /* Drop the jsctx_mutex to allow scheduling in a new context */ ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); + -+ return schedule_mask; ++ /* NOTE: could return release_result if the caller would like to know ++ * whether it should schedule a new context, but currently no callers do ++ */ +} + -+mali_timeline_point mali_timeline_system_get_latest_point(struct mali_timeline_system *system, -+ enum mali_timeline_id timeline_id) ++void kbase_js_set_timeouts(struct kbase_device *kbdev) +{ -+ mali_timeline_point point; -+ struct mali_timeline *timeline; -+ u32 tid = _mali_osk_get_tid(); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ MALI_DEBUG_ASSERT_POINTER(system); ++ kbase_backend_timeouts_changed(kbdev); ++} + -+ if (MALI_TIMELINE_MAX <= timeline_id) { -+ return MALI_TIMELINE_NO_POINT; -+ } ++static bool kbasep_js_schedule_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx) ++{ ++ struct kbasep_js_device_data *js_devdata; ++ struct kbasep_js_kctx_info *js_kctx_info; ++ struct kbase_as *new_address_space = NULL; ++ unsigned long flags; ++ bool kctx_suspended = false; ++ int as_nr; + -+ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ js_devdata = &kbdev->js_data; ++ js_kctx_info = &kctx->jctx.sched_info; + -+ timeline = system->timelines[timeline_id]; -+ MALI_DEBUG_ASSERT_POINTER(timeline); ++ /* Pick available address space for this context */ ++ mutex_lock(&kbdev->mmu_hw_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ as_nr = kbase_ctx_sched_retain_ctx(kctx); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++ if (as_nr == KBASEP_AS_NR_INVALID) { ++ as_nr = kbase_backend_find_and_release_free_address_space( ++ kbdev, kctx); ++ if (as_nr != KBASEP_AS_NR_INVALID) { ++ /* Attempt to retain the context again, this should ++ * succeed */ ++ mutex_lock(&kbdev->mmu_hw_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ as_nr = kbase_ctx_sched_retain_ctx(kctx); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); + -+ point = MALI_TIMELINE_NO_POINT; -+ if (timeline->point_oldest != timeline->point_next) { -+ point = timeline->point_next - 1; -+ if (MALI_TIMELINE_NO_POINT == point) point--; ++ WARN_ON(as_nr == KBASEP_AS_NR_INVALID); ++ } + } ++ if (as_nr == KBASEP_AS_NR_INVALID) ++ return false; /* No address spaces currently available */ + -+ mali_spinlock_reentrant_signal(system->spinlock, tid); -+ -+ return point; -+} -+ -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+static void mali_timeline_do_sync_fence_callback(void *arg) -+{ -+ _MALI_OSK_LIST_HEAD_STATIC_INIT(list); -+ struct mali_timeline_tracker *tracker; -+ struct mali_timeline_tracker *tmp_tracker; -+ u32 tid = _mali_osk_get_tid(); -+ -+ MALI_IGNORE(arg); ++ new_address_space = &kbdev->as[as_nr]; + + /* -+ * Quickly "unhook" the jobs pending to be deleted, so we can release -+ * the lock before we start deleting the job objects -+ * (without any locks held) ++ * Atomic transaction on the Context and Run Pool begins + */ -+ _mali_osk_spinlock_irq_lock(sync_fence_callback_list_lock); -+ _mali_osk_list_move_list(&sync_fence_callback_queue, &list); -+ _mali_osk_spinlock_irq_unlock(sync_fence_callback_list_lock); ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++ mutex_lock(&js_devdata->runpool_mutex); ++ mutex_lock(&kbdev->mmu_hw_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ _MALI_OSK_LIST_FOREACHENTRY(tracker, tmp_tracker, &list, -+ struct mali_timeline_tracker, sync_fence_signal_list) { -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; -+ mali_bool is_aborting = MALI_FALSE; -+ int fence_status = 0; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ struct sync_fence *sync_fence = NULL; -+#else -+ struct mali_internal_sync_fence *sync_fence = NULL; -+#endif -+ struct mali_timeline_system *system = NULL; -+ struct mali_timeline_waiter *waiter = NULL; ++ /* Check to see if context is dying due to kbase_job_zap_context() */ ++ if (kbase_ctx_flag(kctx, KCTX_DYING)) { ++ /* Roll back the transaction so far and return */ ++ kbase_ctx_sched_release_ctx(kctx); + -+ _mali_osk_list_delinit(&tracker->sync_fence_signal_list); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++ mutex_unlock(&js_devdata->runpool_mutex); ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); + -+ sync_fence = tracker->sync_fence; -+ MALI_DEBUG_ASSERT_POINTER(sync_fence); ++ return false; ++ } + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) -+ fence_status = sync_fence->status; -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) -+ fence_status = atomic_read(&sync_fence->status); -+#else -+ fence_status = sync_fence->fence->ops->signaled(sync_fence->fence); -+#endif ++ KBASE_TRACE_ADD_REFCOUNT(kbdev, JS_TRY_SCHEDULE_HEAD_CTX, kctx, NULL, ++ 0u, ++ kbasep_js_trace_get_refcnt(kbdev, kctx)); + -+ system = tracker->system; -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(system->session); ++ kbase_ctx_flag_set(kctx, KCTX_SCHEDULED); + -+ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ /* Assign context to previously chosen address space */ ++ if (!kbase_backend_use_ctx(kbdev, kctx, as_nr)) { ++ /* Roll back the transaction so far and return */ ++ kbase_ctx_sched_release_ctx(kctx); ++ kbase_ctx_flag_clear(kctx, KCTX_SCHEDULED); + -+ is_aborting = system->session->is_aborting; -+ if (!is_aborting && (0 > fence_status)) { -+ MALI_PRINT_ERROR(("Mali Timeline: sync fence fd %d signaled with error %d\n", tracker->fence.sync_fd, fence_status)); -+ tracker->activation_error |= MALI_TIMELINE_ACTIVATION_ERROR_SYNC_BIT; -+ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++ mutex_unlock(&js_devdata->runpool_mutex); ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); + -+ waiter = tracker->waiter_sync; -+ MALI_DEBUG_ASSERT_POINTER(waiter); ++ return false; ++ } + -+ tracker->sync_fence = NULL; -+ tracker->fence.sync_fd = -1; ++ kbdev->hwaccess.active_kctx = kctx; + -+ schedule_mask |= mali_timeline_system_release_waiter(system, waiter); ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++ kbase_trace_mali_mmu_as_in_use(kctx->as_nr); ++#endif ++ KBASE_TLSTREAM_TL_RET_AS_CTX(&kbdev->as[kctx->as_nr], kctx); + -+ /* If aborting, wake up sleepers that are waiting for sync fence callbacks to complete. */ -+ if (is_aborting) { -+ _mali_osk_wait_queue_wake_up(system->wait_queue); -+ } ++ /* Cause any future waiter-on-termination to wait until the context is ++ * descheduled */ ++ wake_up(&js_kctx_info->ctx.is_scheduled_wait); + -+ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ /* Re-check for suspending: a suspend could've occurred, and all the ++ * contexts could've been removed from the runpool before we took this ++ * lock. In this case, we don't want to allow this context to run jobs, ++ * we just want it out immediately. ++ * ++ * The DMB required to read the suspend flag was issued recently as part ++ * of the hwaccess_lock locking. If a suspend occurs *after* that lock ++ * was taken (i.e. this condition doesn't execute), then the ++ * kbasep_js_suspend() code will cleanup this context instead (by virtue ++ * of it being called strictly after the suspend flag is set, and will ++ * wait for this lock to drop) */ ++ if (kbase_pm_is_suspending(kbdev)) { ++ /* Cause it to leave at some later point */ ++ bool retained; + -+ /* -+ * Older versions of Linux, before 3.5, doesn't support fput() in interrupt -+ * context. For those older kernels, allocate a list object and put the -+ * fence object on that and defer the call to sync_fence_put() to a workqueue. -+ */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) -+ { -+ struct mali_deferred_fence_put_entry *obj; ++ retained = kbasep_js_runpool_retain_ctx_nolock(kbdev, kctx); ++ KBASE_DEBUG_ASSERT(retained); + -+ obj = kzalloc(sizeof(struct mali_deferred_fence_put_entry), GFP_ATOMIC); -+ if (obj) { -+ unsigned long flags; -+ mali_bool schedule = MALI_FALSE; ++ kbasep_js_clear_submit_allowed(js_devdata, kctx); ++ kctx_suspended = true; ++ } + -+ obj->fence = sync_fence; ++ /* Transaction complete */ ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kbdev->mmu_hw_mutex); + -+ spin_lock_irqsave(&mali_timeline_sync_fence_to_free_lock, flags); -+ if (hlist_empty(&mali_timeline_sync_fence_to_free_list)) -+ schedule = MALI_TRUE; -+ hlist_add_head(&obj->list, &mali_timeline_sync_fence_to_free_list); -+ spin_unlock_irqrestore(&mali_timeline_sync_fence_to_free_lock, flags); ++ /* Synchronize with any timers */ ++ kbase_backend_ctx_count_changed(kbdev); + -+ if (schedule) -+ schedule_delayed_work(&delayed_sync_fence_put, 0); -+ } -+ } -+#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ sync_fence_put(sync_fence); -+#else -+ fput(sync_fence->file); -+#endif -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) */ ++ mutex_unlock(&js_devdata->runpool_mutex); ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ /* Note: after this point, the context could potentially get scheduled ++ * out immediately */ + -+ if (!is_aborting) { -+ mali_executor_schedule_from_mask(schedule_mask, MALI_TRUE); -+ } ++ if (kctx_suspended) { ++ /* Finishing forcing out the context due to a suspend. Use a ++ * variant of kbasep_js_runpool_release_ctx() that doesn't ++ * schedule a new context, to prevent a risk of recursion back ++ * into this function */ ++ kbasep_js_runpool_release_ctx_no_schedule(kbdev, kctx); ++ return false; + } ++ return true; +} -+#endif -+_mali_osk_errcode_t mali_timeline_initialize(void) ++ ++static bool kbase_js_use_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx) +{ -+ _mali_osk_atomic_init(&gp_tracker_count, 0); -+ _mali_osk_atomic_init(&phy_pp_tracker_count, 0); -+ _mali_osk_atomic_init(&virt_pp_tracker_count, 0); ++ unsigned long flags; + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ sync_fence_callback_list_lock = _mali_osk_spinlock_irq_init(_MALI_OSK_LOCKFLAG_UNORDERED, _MALI_OSK_LOCK_ORDER_FIRST); -+ if (NULL == sync_fence_callback_list_lock) { -+ return _MALI_OSK_ERR_NOMEM; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ ++ if (kbase_ctx_flag(kctx, KCTX_SCHEDULED) && ++ kbase_backend_use_ctx_sched(kbdev, kctx)) { ++ /* Context already has ASID - mark as active */ ++ kbdev->hwaccess.active_kctx = kctx; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ return true; /* Context already scheduled */ + } + -+ sync_fence_callback_work_t = _mali_osk_wq_create_work( -+ mali_timeline_do_sync_fence_callback, NULL); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ if (NULL == sync_fence_callback_work_t) { -+ return _MALI_OSK_ERR_FAULT; -+ } -+#endif -+ return _MALI_OSK_ERR_OK; ++ return kbasep_js_schedule_ctx(kbdev, kctx); +} + -+ -+void mali_timeline_terminate(void) ++void kbasep_js_schedule_privileged_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx) +{ -+ _mali_osk_atomic_term(&gp_tracker_count); -+ _mali_osk_atomic_term(&phy_pp_tracker_count); -+ _mali_osk_atomic_term(&virt_pp_tracker_count); ++ struct kbasep_js_kctx_info *js_kctx_info; ++ struct kbasep_js_device_data *js_devdata; ++ bool is_scheduled; + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ if (NULL != sync_fence_callback_list_lock) { -+ _mali_osk_spinlock_irq_term(sync_fence_callback_list_lock); -+ sync_fence_callback_list_lock = NULL; -+ } ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); + -+ if (NULL != sync_fence_callback_work_t) { -+ _mali_osk_wq_delete_work(sync_fence_callback_work_t); -+ sync_fence_callback_work_t = NULL; -+ } -+#endif -+} ++ js_devdata = &kbdev->js_data; ++ js_kctx_info = &kctx->jctx.sched_info; + -+#if defined(MALI_TIMELINE_DEBUG_FUNCTIONS) ++ /* This must never be attempted whilst suspending - i.e. it should only ++ * happen in response to a syscall from a user-space thread */ ++ BUG_ON(kbase_pm_is_suspending(kbdev)); + -+static mali_bool is_waiting_on_timeline(struct mali_timeline_tracker *tracker, enum mali_timeline_id id) -+{ -+ struct mali_timeline *timeline; -+ struct mali_timeline_system *system; ++ mutex_lock(&js_devdata->queue_mutex); ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); + -+ MALI_DEBUG_ASSERT_POINTER(tracker); ++ /* Mark the context as privileged */ ++ kbase_ctx_flag_set(kctx, KCTX_PRIVILEGED); + -+ MALI_DEBUG_ASSERT_POINTER(tracker->timeline); -+ timeline = tracker->timeline; ++ is_scheduled = kbase_ctx_flag(kctx, KCTX_SCHEDULED); ++ if (!is_scheduled) { ++ /* Add the context to the pullable list */ ++ if (kbase_js_ctx_list_add_pullable_head(kbdev, kctx, 0)) ++ kbase_js_sync_timers(kbdev); + -+ MALI_DEBUG_ASSERT_POINTER(timeline->system); -+ system = timeline->system; ++ /* Fast-starting requires the jsctx_mutex to be dropped, ++ * because it works on multiple ctxs */ ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ mutex_unlock(&js_devdata->queue_mutex); + -+ if (MALI_TIMELINE_MAX > id) { -+ if (MALI_TIMELINE_NO_POINT != tracker->fence.points[id]) { -+ return mali_timeline_is_point_on(system->timelines[id], tracker->fence.points[id]); -+ } else { -+ return MALI_FALSE; -+ } ++ /* Try to schedule the context in */ ++ kbase_js_sched_all(kbdev); ++ ++ /* Wait for the context to be scheduled in */ ++ wait_event(kctx->jctx.sched_info.ctx.is_scheduled_wait, ++ kbase_ctx_flag(kctx, KCTX_SCHEDULED)); + } else { -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_NONE == id); -+ return MALI_FALSE; ++ /* Already scheduled in - We need to retain it to keep the ++ * corresponding address space */ ++ kbasep_js_runpool_retain_ctx(kbdev, kctx); ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ mutex_unlock(&js_devdata->queue_mutex); + } +} ++KBASE_EXPORT_TEST_API(kbasep_js_schedule_privileged_ctx); + -+static const char *timeline_id_to_string(enum mali_timeline_id id) ++void kbasep_js_release_privileged_ctx(struct kbase_device *kbdev, ++ struct kbase_context *kctx) +{ -+ switch (id) { -+ case MALI_TIMELINE_GP: -+ return "GP"; -+ case MALI_TIMELINE_PP: -+ return "PP"; -+ case MALI_TIMELINE_SOFT: -+ return "SOFT"; -+ default: -+ return "NONE"; -+ } -+} ++ struct kbasep_js_kctx_info *js_kctx_info; + -+static const char *timeline_tracker_type_to_string(enum mali_timeline_tracker_type type) -+{ -+ switch (type) { -+ case MALI_TIMELINE_TRACKER_GP: -+ return "GP"; -+ case MALI_TIMELINE_TRACKER_PP: -+ return "PP"; -+ case MALI_TIMELINE_TRACKER_SOFT: -+ return "SOFT"; -+ case MALI_TIMELINE_TRACKER_WAIT: -+ return "WAIT"; -+ case MALI_TIMELINE_TRACKER_SYNC: -+ return "SYNC"; -+ default: -+ return "INVALID"; -+ } ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ js_kctx_info = &kctx->jctx.sched_info; ++ ++ /* We don't need to use the address space anymore */ ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++ kbase_ctx_flag_clear(kctx, KCTX_PRIVILEGED); ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ ++ /* Release the context - it will be scheduled out */ ++ kbasep_js_runpool_release_ctx(kbdev, kctx); ++ ++ kbase_js_sched_all(kbdev); +} ++KBASE_EXPORT_TEST_API(kbasep_js_release_privileged_ctx); + -+mali_timeline_tracker_state mali_timeline_debug_get_tracker_state(struct mali_timeline_tracker *tracker) ++void kbasep_js_suspend(struct kbase_device *kbdev) +{ -+ struct mali_timeline *timeline = NULL; -+ -+ MALI_DEBUG_ASSERT_POINTER(tracker); -+ timeline = tracker->timeline; ++ unsigned long flags; ++ struct kbasep_js_device_data *js_devdata; ++ int i; ++ u16 retained = 0u; ++ int nr_privileged_ctx = 0; + -+ if (0 != tracker->trigger_ref_count) { -+ return MALI_TIMELINE_TS_WAITING; -+ } ++ KBASE_DEBUG_ASSERT(kbdev); ++ KBASE_DEBUG_ASSERT(kbase_pm_is_suspending(kbdev)); ++ js_devdata = &kbdev->js_data; + -+ if (timeline && (timeline->tracker_tail == tracker || NULL != tracker->timeline_prev)) { -+ return MALI_TIMELINE_TS_ACTIVE; -+ } ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ if (timeline && (MALI_TIMELINE_NO_POINT == tracker->point)) { -+ return MALI_TIMELINE_TS_INIT; -+ } ++ /* Prevent all contexts from submitting */ ++ js_devdata->runpool_irq.submit_allowed = 0; + -+ return MALI_TIMELINE_TS_FINISH; -+} ++ /* Retain each of the contexts, so we can cause it to leave even if it ++ * had no refcount to begin with */ ++ for (i = BASE_MAX_NR_AS - 1; i >= 0; --i) { ++ struct kbase_context *kctx = kbdev->as_to_kctx[i]; + -+void mali_timeline_debug_print_tracker(struct mali_timeline_tracker *tracker, _mali_osk_print_ctx *print_ctx) -+{ -+ const char *tracker_state = "IWAF"; -+ char state_char = 'I'; -+ char tracker_type[32] = {0}; ++ retained = retained << 1; + -+ MALI_DEBUG_ASSERT_POINTER(tracker); ++ if (kctx) { ++ kbase_ctx_sched_retain_ctx_refcount(kctx); ++ retained |= 1u; ++ /* We can only cope with up to 1 privileged context - ++ * the instrumented context. It'll be suspended by ++ * disabling instrumentation */ ++ if (kbase_ctx_flag(kctx, KCTX_PRIVILEGED)) { ++ ++nr_privileged_ctx; ++ WARN_ON(nr_privileged_ctx != 1); ++ } ++ } ++ } ++ CSTD_UNUSED(nr_privileged_ctx); + -+ state_char = *(tracker_state + mali_timeline_debug_get_tracker_state(tracker)); -+ _mali_osk_snprintf(tracker_type, sizeof(tracker_type), "%s", timeline_tracker_type_to_string(tracker->type)); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ if (0 != tracker->trigger_ref_count) { -+ if (print_ctx) -+ _mali_osk_ctxprintf(print_ctx, "TL: %s %u %c - ref_wait:%u [%s(%u),%s(%u),%s(%u), fd:%d, fence:(0x%08X)] job:(0x%08X)\n", -+ tracker_type, tracker->point, state_char, tracker->trigger_ref_count, -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_GP) ? "WaitGP" : " ", tracker->fence.points[0], -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_PP) ? "WaitPP" : " ", tracker->fence.points[1], -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_SOFT) ? "WaitSOFT" : " ", tracker->fence.points[2], -+ tracker->fence.sync_fd, (unsigned int)(uintptr_t)(tracker->sync_fence), (unsigned int)(uintptr_t)(tracker->job)); -+ else -+ MALI_DEBUG_PRINT(2, ("TL: %s %u %c - ref_wait:%u [%s(%u),%s(%u),%s(%u), fd:%d, fence:(0x%08X)] job:(0x%08X)\n", -+ tracker_type, tracker->point, state_char, tracker->trigger_ref_count, -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_GP) ? "WaitGP" : " ", tracker->fence.points[0], -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_PP) ? "WaitPP" : " ", tracker->fence.points[1], -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_SOFT) ? "WaitSOFT" : " ", tracker->fence.points[2], -+ tracker->fence.sync_fd, (unsigned int)(uintptr_t)(tracker->sync_fence), (unsigned int)(uintptr_t)(tracker->job))); -+ } else { -+ if (print_ctx) -+ _mali_osk_ctxprintf(print_ctx, "TL: %s %u %c fd:%d fence:(0x%08X) job:(0x%08X)\n", -+ tracker_type, tracker->point, state_char, -+ tracker->fence.sync_fd, (unsigned int)(uintptr_t)(tracker->sync_fence), (unsigned int)(uintptr_t)(tracker->job)); -+ else -+ MALI_DEBUG_PRINT(2, ("TL: %s %u %c fd:%d fence:(0x%08X) job:(0x%08X)\n", -+ tracker_type, tracker->point, state_char, -+ tracker->fence.sync_fd, (unsigned int)(uintptr_t)(tracker->sync_fence), (unsigned int)(uintptr_t)(tracker->job))); ++ /* De-ref the previous retain to ensure each context gets pulled out ++ * sometime later. */ ++ for (i = 0; ++ i < BASE_MAX_NR_AS; ++ ++i, retained = retained >> 1) { ++ struct kbase_context *kctx = kbdev->as_to_kctx[i]; + ++ if (retained & 1u) ++ kbasep_js_runpool_release_ctx(kbdev, kctx); + } -+#else -+ if (0 != tracker->trigger_ref_count) { -+ if (print_ctx) -+ _mali_osk_ctxprintf(print_ctx, "TL: %s %u %c - ref_wait:%u [%s(%u),%s(%u),%s(%u)] job:(0x%08X)\n", -+ tracker_type, tracker->point, state_char, tracker->trigger_ref_count, -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_GP) ? "WaitGP" : " ", tracker->fence.points[0], -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_PP) ? "WaitPP" : " ", tracker->fence.points[1], -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_SOFT) ? "WaitSOFT" : " ", tracker->fence.points[2], -+ (unsigned int)(uintptr_t)(tracker->job)); -+ else -+ MALI_DEBUG_PRINT(2, ("TL: %s %u %c - ref_wait:%u [%s(%u),%s(%u),%s(%u)] job:(0x%08X)\n", -+ tracker_type, tracker->point, state_char, tracker->trigger_ref_count, -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_GP) ? "WaitGP" : " ", tracker->fence.points[0], -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_PP) ? "WaitPP" : " ", tracker->fence.points[1], -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_SOFT) ? "WaitSOFT" : " ", tracker->fence.points[2], -+ (unsigned int)(uintptr_t)(tracker->job))); -+ } else { -+ if (print_ctx) -+ _mali_osk_ctxprintf(print_ctx, "TL: %s %u %c job:(0x%08X)\n", -+ tracker_type, tracker->point, state_char, -+ (unsigned int)(uintptr_t)(tracker->job)); -+ else -+ MALI_DEBUG_PRINT(2, ("TL: %s %u %c job:(0x%08X)\n", -+ tracker_type, tracker->point, state_char, -+ (unsigned int)(uintptr_t)(tracker->job))); + -+ } -+#endif ++ /* Caller must wait for all Power Manager active references to be ++ * dropped */ +} + -+void mali_timeline_debug_print_timeline(struct mali_timeline *timeline, _mali_osk_print_ctx *print_ctx) ++void kbasep_js_resume(struct kbase_device *kbdev) +{ -+ struct mali_timeline_tracker *tracker = NULL; ++ struct kbasep_js_device_data *js_devdata; ++ int js; + -+ MALI_DEBUG_ASSERT_POINTER(timeline); ++ KBASE_DEBUG_ASSERT(kbdev); ++ js_devdata = &kbdev->js_data; ++ KBASE_DEBUG_ASSERT(!kbase_pm_is_suspending(kbdev)); + -+ tracker = timeline->tracker_tail; -+ while (NULL != tracker) { -+ mali_timeline_debug_print_tracker(tracker, print_ctx); -+ tracker = tracker->timeline_next; -+ } -+} ++ mutex_lock(&js_devdata->queue_mutex); ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { ++ struct kbase_context *kctx, *n; + -+#if !(LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)) -+void mali_timeline_debug_direct_print_tracker(struct mali_timeline_tracker *tracker) -+{ -+ const char *tracker_state = "IWAF"; -+ char state_char = 'I'; -+ char tracker_type[32] = {0}; ++ list_for_each_entry_safe(kctx, n, ++ &kbdev->js_data.ctx_list_unpullable[js], ++ jctx.sched_info.ctx.ctx_list_entry[js]) { ++ struct kbasep_js_kctx_info *js_kctx_info; ++ unsigned long flags; ++ bool timer_sync = false; + -+ MALI_DEBUG_ASSERT_POINTER(tracker); ++ js_kctx_info = &kctx->jctx.sched_info; + -+ state_char = *(tracker_state + mali_timeline_debug_get_tracker_state(tracker)); -+ _mali_osk_snprintf(tracker_type, sizeof(tracker_type), "%s", timeline_tracker_type_to_string(tracker->type)); ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++ mutex_lock(&js_devdata->runpool_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ if (0 != tracker->trigger_ref_count) { -+ MALI_PRINT(("TL: %s %u %c - ref_wait:%u [%s(%u),%s(%u),%s(%u), fd:%d, fence:(0x%08X)] job:(0x%08X)\n", -+ tracker_type, tracker->point, state_char, tracker->trigger_ref_count, -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_GP) ? "WaitGP" : " ", tracker->fence.points[0], -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_PP) ? "WaitPP" : " ", tracker->fence.points[1], -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_SOFT) ? "WaitSOFT" : " ", tracker->fence.points[2], -+ tracker->fence.sync_fd, tracker->sync_fence, tracker->job)); -+ } else { -+ MALI_PRINT(("TL: %s %u %c fd:%d fence:(0x%08X) job:(0x%08X)\n", -+ tracker_type, tracker->point, state_char, -+ tracker->fence.sync_fd, tracker->sync_fence, tracker->job)); -+ } -+#else -+ if (0 != tracker->trigger_ref_count) { -+ MALI_PRINT(("TL: %s %u %c - ref_wait:%u [%s(%u),%s(%u),%s(%u)] job:(0x%08X)\n", -+ tracker_type, tracker->point, state_char, tracker->trigger_ref_count, -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_GP) ? "WaitGP" : " ", tracker->fence.points[0], -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_PP) ? "WaitPP" : " ", tracker->fence.points[1], -+ is_waiting_on_timeline(tracker, MALI_TIMELINE_SOFT) ? "WaitSOFT" : " ", tracker->fence.points[2], -+ tracker->job)); -+ } else { -+ MALI_PRINT(("TL: %s %u %c job:(0x%08X)\n", -+ tracker_type, tracker->point, state_char, -+ tracker->job)); ++ if (!kbase_ctx_flag(kctx, KCTX_SCHEDULED) && ++ kbase_js_ctx_pullable(kctx, js, false)) ++ timer_sync = ++ kbase_js_ctx_list_add_pullable_nolock( ++ kbdev, kctx, js); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ if (timer_sync) ++ kbase_backend_ctx_count_changed(kbdev); ++ mutex_unlock(&js_devdata->runpool_mutex); ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ } + } -+#endif ++ mutex_unlock(&js_devdata->queue_mutex); ++ ++ /* Restart atom processing */ ++ kbase_js_sched_all(kbdev); ++ ++ /* JS Resume complete */ +} + -+void mali_timeline_debug_direct_print_timeline(struct mali_timeline *timeline) ++bool kbase_js_is_atom_valid(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom) +{ -+ struct mali_timeline_tracker *tracker = NULL; ++ if ((katom->core_req & BASE_JD_REQ_FS) && ++ (katom->core_req & (BASE_JD_REQ_CS | BASE_JD_REQ_ONLY_COMPUTE | ++ BASE_JD_REQ_T))) ++ return false; + -+ MALI_DEBUG_ASSERT_POINTER(timeline); ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987) && ++ (katom->core_req & BASE_JD_REQ_ONLY_COMPUTE) && ++ (katom->core_req & (BASE_JD_REQ_CS | BASE_JD_REQ_T))) ++ return false; + -+ tracker = timeline->tracker_tail; -+ while (NULL != tracker) { -+ mali_timeline_debug_direct_print_tracker(tracker); -+ tracker = tracker->timeline_next; -+ } ++ return true; +} + -+#endif -+ -+void mali_timeline_debug_print_system(struct mali_timeline_system *system, _mali_osk_print_ctx *print_ctx) ++static int kbase_js_get_slot(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom) +{ -+ int i; -+ int num_printed = 0; -+ u32 tid = _mali_osk_get_tid(); ++ if (katom->core_req & BASE_JD_REQ_FS) ++ return 0; + -+ MALI_DEBUG_ASSERT_POINTER(system); ++ if (katom->core_req & BASE_JD_REQ_ONLY_COMPUTE) { ++ if (katom->device_nr == 1 && ++ kbdev->gpu_props.num_core_groups == 2) ++ return 2; ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987)) ++ return 2; ++ } + -+ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ return 1; ++} + -+ /* Print all timelines */ -+ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { -+ struct mali_timeline *timeline = system->timelines[i]; ++bool kbase_js_dep_resolved_submit(struct kbase_context *kctx, ++ struct kbase_jd_atom *katom) ++{ ++ bool enqueue_required; + -+ MALI_DEBUG_ASSERT_POINTER(timeline); ++ katom->slot_nr = kbase_js_get_slot(kctx->kbdev, katom); + -+ if (NULL == timeline->tracker_head) continue; -+ if (print_ctx) -+ _mali_osk_ctxprintf(print_ctx, "TL: Timeline %s:\n", -+ timeline_id_to_string((enum mali_timeline_id)i)); -+ else -+ MALI_DEBUG_PRINT(2, ("TL: Timeline %s: oldest (%u) next(%u)\n", -+ timeline_id_to_string((enum mali_timeline_id)i), timeline->point_oldest, timeline->point_next)); ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ lockdep_assert_held(&kctx->jctx.lock); + -+ mali_timeline_debug_print_timeline(timeline, print_ctx); -+ num_printed++; ++ /* If slot will transition from unpullable to pullable then add to ++ * pullable list */ ++ if (jsctx_rb_none_to_pull(kctx, katom->slot_nr)) { ++ enqueue_required = true; ++ } else { ++ enqueue_required = false; + } ++ if ((katom->atom_flags & KBASE_KATOM_FLAG_X_DEP_BLOCKED) || ++ (katom->pre_dep && (katom->pre_dep->atom_flags & ++ KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST))) { ++ int prio = katom->sched_priority; ++ int js = katom->slot_nr; ++ struct jsctx_queue *queue = &kctx->jsctx_queue[prio][js]; + -+ if (0 == num_printed) { -+ if (print_ctx) -+ _mali_osk_ctxprintf(print_ctx, "TL: All timelines empty\n"); -+ else -+ MALI_DEBUG_PRINT(2, ("TL: All timelines empty\n")); ++ list_add_tail(&katom->queue, &queue->x_dep_head); ++ katom->atom_flags |= KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST; ++ enqueue_required = false; ++ } else { ++ /* Check if there are lower priority jobs to soft stop */ ++ kbase_job_slot_ctx_priority_check_locked(kctx, katom); ++ ++ /* Add atom to ring buffer. */ ++ jsctx_tree_add(kctx, katom); ++ katom->atom_flags |= KBASE_KATOM_FLAG_JSCTX_IN_TREE; + } + -+ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ return enqueue_required; +} + -+#endif /* defined(MALI_TIMELINE_DEBUG_FUNCTIONS) */ -+ -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+void mali_timeline_dma_fence_callback(void *pp_job_ptr) ++/** ++ * kbase_js_move_to_tree - Move atom (and any dependent atoms) to the ++ * runnable_tree, ready for execution ++ * @katom: Atom to submit ++ * ++ * It is assumed that @katom does not have KBASE_KATOM_FLAG_X_DEP_BLOCKED set, ++ * but is still present in the x_dep list. If @katom has a same-slot dependent ++ * atom then that atom (and any dependents) will also be moved. ++ */ ++static void kbase_js_move_to_tree(struct kbase_jd_atom *katom) +{ -+ struct mali_timeline_system *system; -+ struct mali_timeline_waiter *waiter; -+ struct mali_timeline_tracker *tracker; -+ struct mali_pp_job *pp_job = (struct mali_pp_job *)pp_job_ptr; -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; -+ u32 tid = _mali_osk_get_tid(); -+ mali_bool is_aborting = MALI_FALSE; ++ lockdep_assert_held(&katom->kctx->kbdev->hwaccess_lock); + -+ MALI_DEBUG_ASSERT_POINTER(pp_job); ++ while (katom) { ++ WARN_ON(!(katom->atom_flags & ++ KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST)); + -+ tracker = &pp_job->tracker; -+ MALI_DEBUG_ASSERT_POINTER(tracker); ++ if (!(katom->atom_flags & KBASE_KATOM_FLAG_X_DEP_BLOCKED)) { ++ list_del(&katom->queue); ++ katom->atom_flags &= ++ ~KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST; ++ jsctx_tree_add(katom->kctx, katom); ++ katom->atom_flags |= KBASE_KATOM_FLAG_JSCTX_IN_TREE; ++ } else { ++ break; ++ } + -+ system = tracker->system; -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(system->session); ++ katom = katom->post_dep; ++ } ++} + -+ mali_spinlock_reentrant_wait(system->spinlock, tid); + -+ waiter = tracker->waiter_dma_fence; -+ MALI_DEBUG_ASSERT_POINTER(waiter); ++/** ++ * kbase_js_evict_deps - Evict dependencies of a failed atom. ++ * @kctx: Context pointer ++ * @katom: Pointer to the atom that has failed. ++ * @js: The job slot the katom was run on. ++ * @prio: Priority of the katom. ++ * ++ * Remove all post dependencies of an atom from the context ringbuffers. ++ * ++ * The original atom's event_code will be propogated to all dependent atoms. ++ * ++ * Context: Caller must hold the HW access lock ++ */ ++static void kbase_js_evict_deps(struct kbase_context *kctx, ++ struct kbase_jd_atom *katom, int js, int prio) ++{ ++ struct kbase_jd_atom *x_dep = katom->x_post_dep; ++ struct kbase_jd_atom *next_katom = katom->post_dep; + -+ schedule_mask |= mali_timeline_system_release_waiter(system, waiter); ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ is_aborting = system->session->is_aborting; ++ if (next_katom) { ++ KBASE_DEBUG_ASSERT(next_katom->status != ++ KBASE_JD_ATOM_STATE_HW_COMPLETED); ++ next_katom->will_fail_event_code = katom->event_code; + -+ /* If aborting, wake up sleepers that are waiting for dma fence callbacks to complete. */ -+ if (is_aborting) { -+ _mali_osk_wait_queue_wake_up(system->wait_queue); + } + -+ mali_spinlock_reentrant_signal(system->spinlock, tid); ++ /* Has cross slot depenency. */ ++ if (x_dep && (x_dep->atom_flags & (KBASE_KATOM_FLAG_JSCTX_IN_TREE | ++ KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST))) { ++ /* Remove dependency.*/ ++ x_dep->atom_flags &= ~KBASE_KATOM_FLAG_X_DEP_BLOCKED; + -+ if (!is_aborting) { -+ mali_executor_schedule_from_mask(schedule_mask, MALI_TRUE); ++ /* Fail if it had a data dependency. */ ++ if (x_dep->atom_flags & KBASE_KATOM_FLAG_FAIL_BLOCKER) { ++ x_dep->will_fail_event_code = katom->event_code; ++ } ++ if (x_dep->atom_flags & KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST) ++ kbase_js_move_to_tree(x_dep); + } +} -+#endif -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline.h -new file mode 100755 -index 000000000000..3e8bfc8fb733 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.h -@@ -0,0 +1,587 @@ -+/* -+ * Copyright (C) 2013-2018 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ + -+#ifndef __MALI_TIMELINE_H__ -+#define __MALI_TIMELINE_H__ ++struct kbase_jd_atom *kbase_js_pull(struct kbase_context *kctx, int js) ++{ ++ struct kbase_jd_atom *katom; ++ struct kbasep_js_device_data *js_devdata; ++ struct kbase_device *kbdev; ++ int pulled; + -+#include "mali_osk.h" -+#include "mali_ukk.h" -+#include "mali_session.h" -+#include "mali_kernel_common.h" -+#include "mali_spinlock_reentrant.h" -+#include "mali_sync.h" -+#include "mali_scheduler_types.h" -+#include ++ KBASE_DEBUG_ASSERT(kctx); + -+/** -+ * Soft job timeout. -+ * -+ * Soft jobs have to be signaled as complete after activation. Normally this is done by user space, -+ * but in order to guarantee that every soft job is completed, we also have a timer. -+ */ -+#define MALI_TIMELINE_TIMEOUT_HZ ((unsigned long) (HZ * 3 / 2)) /* 1500 ms. */ ++ kbdev = kctx->kbdev; + -+/** -+ * Timeline type. -+ */ -+typedef enum mali_timeline_id { -+ MALI_TIMELINE_GP = MALI_UK_TIMELINE_GP, /**< GP job timeline. */ -+ MALI_TIMELINE_PP = MALI_UK_TIMELINE_PP, /**< PP job timeline. */ -+ MALI_TIMELINE_SOFT = MALI_UK_TIMELINE_SOFT, /**< Soft job timeline. */ -+ MALI_TIMELINE_MAX = MALI_UK_TIMELINE_MAX -+} mali_timeline_id; ++ js_devdata = &kbdev->js_data; ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+/** -+ * Used by trackers that should not be added to a timeline (@ref mali_timeline_system_add_tracker). -+ */ -+#define MALI_TIMELINE_NONE MALI_TIMELINE_MAX ++ if (!kbasep_js_is_submit_allowed(js_devdata, kctx)) ++ return NULL; ++ if (kbase_pm_is_suspending(kbdev)) ++ return NULL; + -+/** -+ * Tracker type. -+ */ -+typedef enum mali_timeline_tracker_type { -+ MALI_TIMELINE_TRACKER_GP = 0, /**< Tracker used by GP jobs. */ -+ MALI_TIMELINE_TRACKER_PP = 1, /**< Tracker used by PP jobs. */ -+ MALI_TIMELINE_TRACKER_SOFT = 2, /**< Tracker used by soft jobs. */ -+ MALI_TIMELINE_TRACKER_WAIT = 3, /**< Tracker used for fence wait. */ -+ MALI_TIMELINE_TRACKER_SYNC = 4, /**< Tracker used for sync fence. */ -+ MALI_TIMELINE_TRACKER_MAX = 5, -+} mali_timeline_tracker_type; ++ katom = jsctx_rb_peek(kctx, js); ++ if (!katom) ++ return NULL; ++ if (kctx->blocked_js[js][katom->sched_priority]) ++ return NULL; ++ if (atomic_read(&katom->blocked)) ++ return NULL; + -+/** -+ * Tracker activation error. -+ */ -+typedef u32 mali_timeline_activation_error; -+#define MALI_TIMELINE_ACTIVATION_ERROR_NONE 0 -+#define MALI_TIMELINE_ACTIVATION_ERROR_SYNC_BIT (1<<1) -+#define MALI_TIMELINE_ACTIVATION_ERROR_FATAL_BIT (1<<0) ++ /* Due to ordering restrictions when unpulling atoms on failure, we do ++ * not allow multiple runs of fail-dep atoms from the same context to be ++ * present on the same slot */ ++ if (katom->pre_dep && atomic_read(&kctx->atoms_pulled_slot[js])) { ++ struct kbase_jd_atom *prev_atom = ++ kbase_backend_inspect_tail(kbdev, js); + -+/** -+ * Type used to represent a point on a timeline. -+ */ -+typedef u32 mali_timeline_point; ++ if (prev_atom && prev_atom->kctx != kctx) ++ return NULL; ++ } + -+/** -+ * Used to represent that no point on a timeline. -+ */ -+#define MALI_TIMELINE_NO_POINT ((mali_timeline_point) 0) ++ if (katom->atom_flags & KBASE_KATOM_FLAG_X_DEP_BLOCKED) { ++ if (katom->x_pre_dep->gpu_rb_state == ++ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB || ++ katom->x_pre_dep->will_fail_event_code) ++ return NULL; ++ if ((katom->atom_flags & KBASE_KATOM_FLAG_FAIL_BLOCKER) && ++ kbase_backend_nr_atoms_on_slot(kbdev, js)) ++ return NULL; ++ } + -+/** -+ * The maximum span of points on a timeline. A timeline will be considered full if the difference -+ * between the oldest and newest points is equal or larger to this value. -+ */ -+#define MALI_TIMELINE_MAX_POINT_SPAN 65536 ++ kbase_ctx_flag_set(kctx, KCTX_PULLED); + -+/** -+ * Magic value used to assert on validity of trackers. -+ */ -+#define MALI_TIMELINE_TRACKER_MAGIC 0xabcdabcd ++ pulled = atomic_inc_return(&kctx->atoms_pulled); ++ if (pulled == 1 && !kctx->slots_pullable) { ++ WARN_ON(kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); ++ kbase_ctx_flag_set(kctx, KCTX_RUNNABLE_REF); ++ atomic_inc(&kbdev->js_data.nr_contexts_runnable); ++ } ++ atomic_inc(&kctx->atoms_pulled_slot[katom->slot_nr]); ++ kctx->atoms_pulled_slot_pri[katom->slot_nr][katom->sched_priority]++; ++ jsctx_rb_pull(kctx, katom); + -+struct mali_timeline; -+struct mali_timeline_waiter; -+struct mali_timeline_tracker; ++ kbasep_js_runpool_retain_ctx_nolock(kbdev, kctx); + -+/** -+ * Timeline fence. -+ */ -+struct mali_timeline_fence { -+ mali_timeline_point points[MALI_TIMELINE_MAX]; /**< For each timeline, a point or MALI_TIMELINE_NO_POINT. */ -+ s32 sync_fd; /**< A file descriptor representing a sync fence, or -1. */ -+}; ++ katom->atom_flags |= KBASE_KATOM_FLAG_HOLDING_CTX_REF; + -+/** -+ * Timeline system. -+ * -+ * The Timeline system has a set of timelines associated with a session. -+ */ -+struct mali_timeline_system { -+ struct mali_spinlock_reentrant *spinlock; /**< Spin lock protecting the timeline system */ -+ struct mali_timeline *timelines[MALI_TIMELINE_MAX]; /**< The timelines in this system */ ++ katom->ticks = 0; + -+ /* Single-linked list of unused waiter objects. Uses the tracker_next field in tracker. */ -+ struct mali_timeline_waiter *waiter_empty_list; ++ return katom; ++} + -+ struct mali_session_data *session; /**< Session that owns this system. */ + -+ mali_bool timer_enabled; /**< Set to MALI_TRUE if soft job timer should be enabled, MALI_FALSE if not. */ ++static void js_return_worker(struct work_struct *data) ++{ ++ struct kbase_jd_atom *katom = container_of(data, struct kbase_jd_atom, ++ work); ++ struct kbase_context *kctx = katom->kctx; ++ struct kbase_device *kbdev = kctx->kbdev; ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ struct kbasep_js_kctx_info *js_kctx_info = &kctx->jctx.sched_info; ++ struct kbasep_js_atom_retained_state retained_state; ++ int js = katom->slot_nr; ++ int prio = katom->sched_priority; ++ bool timer_sync = false; ++ bool context_idle = false; ++ unsigned long flags; ++ base_jd_core_req core_req = katom->core_req; ++ u64 affinity = katom->affinity; ++ enum kbase_atom_coreref_state coreref_state = katom->coreref_state; + -+ _mali_osk_wait_queue_t *wait_queue; /**< Wait queue. */ ++ KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_EX(katom); + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ struct sync_timeline *signaled_sync_tl; /**< Special sync timeline used to create pre-signaled sync fences */ -+#else -+ struct mali_internal_sync_timeline *signaled_sync_tl; /**< Special sync timeline used to create pre-signaled sync fences */ -+#endif -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ -+}; ++ kbase_backend_complete_wq(kbdev, katom); + -+/** -+ * Timeline. Each Timeline system will have MALI_TIMELINE_MAX timelines. -+ */ -+struct mali_timeline { -+ mali_timeline_point point_next; /**< The next available point. */ -+ mali_timeline_point point_oldest; /**< The oldest point not released. */ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8316)) ++ kbase_as_poking_timer_release_atom(kbdev, kctx, katom); + -+ /* Double-linked list of trackers. Sorted in ascending order by tracker->time_number with -+ * tail pointing to the tracker with the oldest time. */ -+ struct mali_timeline_tracker *tracker_head; -+ struct mali_timeline_tracker *tracker_tail; ++ kbasep_js_atom_retained_state_copy(&retained_state, katom); + -+ /* Double-linked list of waiters. Sorted in ascending order by waiter->time_number_wait -+ * with tail pointing to the waiter with oldest wait time. */ -+ struct mali_timeline_waiter *waiter_head; -+ struct mali_timeline_waiter *waiter_tail; ++ mutex_lock(&js_devdata->queue_mutex); ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); + -+ struct mali_timeline_system *system; /**< Timeline system this timeline belongs to. */ -+ enum mali_timeline_id id; /**< Timeline type. */ ++ atomic_dec(&kctx->atoms_pulled); ++ atomic_dec(&kctx->atoms_pulled_slot[js]); + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ struct sync_timeline *sync_tl; /**< Sync timeline that corresponds to this timeline. */ -+#else -+ struct mali_internal_sync_timeline *sync_tl; -+#endif -+ mali_bool destroyed; -+ struct mali_spinlock_reentrant *spinlock; /**< Spin lock protecting the timeline system */ -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ atomic_dec(&katom->blocked); + -+ /* The following fields are used to time out soft job trackers. */ -+ _mali_osk_wq_delayed_work_t *delayed_work; -+ mali_bool timer_active; -+}; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+/** -+ * Timeline waiter. -+ */ -+struct mali_timeline_waiter { -+ mali_timeline_point point; /**< Point on timeline we are waiting for to be released. */ -+ struct mali_timeline_tracker *tracker; /**< Tracker that is waiting. */ ++ kctx->atoms_pulled_slot_pri[js][katom->sched_priority]--; + -+ struct mali_timeline_waiter *timeline_next; /**< Next waiter on timeline's waiter list. */ -+ struct mali_timeline_waiter *timeline_prev; /**< Previous waiter on timeline's waiter list. */ ++ if (!atomic_read(&kctx->atoms_pulled_slot[js]) && ++ jsctx_rb_none_to_pull(kctx, js)) ++ timer_sync |= kbase_js_ctx_list_remove_nolock(kbdev, kctx, js); + -+ struct mali_timeline_waiter *tracker_next; /**< Next waiter on tracker's waiter list. */ -+}; ++ /* If this slot has been blocked due to soft-stopped atoms, and all ++ * atoms have now been processed, then unblock the slot */ ++ if (!kctx->atoms_pulled_slot_pri[js][prio] && ++ kctx->blocked_js[js][prio]) { ++ kctx->blocked_js[js][prio] = false; + -+/** -+ * Timeline tracker. -+ */ -+struct mali_timeline_tracker { -+ MALI_DEBUG_CODE(u32 magic); /**< Should always be MALI_TIMELINE_TRACKER_MAGIC for a valid tracker. */ ++ /* Only mark the slot as pullable if the context is not idle - ++ * that case is handled below */ ++ if (atomic_read(&kctx->atoms_pulled) && ++ kbase_js_ctx_pullable(kctx, js, true)) ++ timer_sync |= kbase_js_ctx_list_add_pullable_nolock( ++ kbdev, kctx, js); ++ } + -+ mali_timeline_point point; /**< Point on timeline for this tracker */ ++ if (!atomic_read(&kctx->atoms_pulled)) { ++ if (!kctx->slots_pullable) { ++ WARN_ON(!kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); ++ kbase_ctx_flag_clear(kctx, KCTX_RUNNABLE_REF); ++ atomic_dec(&kbdev->js_data.nr_contexts_runnable); ++ timer_sync = true; ++ } + -+ struct mali_timeline_tracker *timeline_next; /**< Next tracker on timeline's tracker list */ -+ struct mali_timeline_tracker *timeline_prev; /**< Previous tracker on timeline's tracker list */ ++ if (kctx->as_nr != KBASEP_AS_NR_INVALID && ++ !kbase_ctx_flag(kctx, KCTX_DYING)) { ++ int num_slots = kbdev->gpu_props.num_job_slots; ++ int slot; + -+ u32 trigger_ref_count; /**< When zero tracker will be activated */ -+ mali_timeline_activation_error activation_error; /**< Activation error. */ -+ struct mali_timeline_fence fence; /**< Fence used to create this tracker */ ++ if (!kbasep_js_is_submit_allowed(js_devdata, kctx)) ++ kbasep_js_set_submit_allowed(js_devdata, kctx); + -+ /* Single-linked list of waiters. Sorted in order of insertions with -+ * tail pointing to first waiter. */ -+ struct mali_timeline_waiter *waiter_head; -+ struct mali_timeline_waiter *waiter_tail; ++ for (slot = 0; slot < num_slots; slot++) { ++ if (kbase_js_ctx_pullable(kctx, slot, true)) ++ timer_sync |= ++ kbase_js_ctx_list_add_pullable_nolock( ++ kbdev, kctx, slot); ++ } ++ } + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ /* These are only used if the tracker is waiting on a sync fence. */ -+ struct mali_timeline_waiter *waiter_sync; /**< A direct pointer to timeline waiter representing sync fence. */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ struct sync_fence_waiter sync_fence_waiter; /**< Used to connect sync fence and tracker in sync fence wait callback. */ -+ struct sync_fence *sync_fence; /**< The sync fence this tracker is waiting on. */ -+#else -+ struct mali_internal_sync_fence_waiter sync_fence_waiter; /**< Used to connect sync fence and tracker in sync fence wait callback. */ -+ struct mali_internal_sync_fence *sync_fence; /**< The sync fence this tracker is waiting on. */ -+#endif -+ _mali_osk_list_t sync_fence_cancel_list; /**< List node used to cancel sync fence waiters. */ -+ _mali_osk_list_t sync_fence_signal_list; /** < List node used to singal sync fence callback function. */ ++ kbase_jm_idle_ctx(kbdev, kctx); + -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ context_idle = true; ++ } + -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+ struct mali_timeline_waiter *waiter_dma_fence; /**< A direct pointer to timeline waiter representing dma fence. */ -+#endif ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ struct mali_timeline_system *system; /**< Timeline system. */ -+ struct mali_timeline *timeline; /**< Timeline, or NULL if not on a timeline. */ -+ enum mali_timeline_tracker_type type; /**< Type of tracker. */ -+ void *job; /**< Owner of tracker. */ ++ if (context_idle) { ++ WARN_ON(!kbase_ctx_flag(kctx, KCTX_ACTIVE)); ++ kbase_ctx_flag_clear(kctx, KCTX_ACTIVE); ++ kbase_pm_context_idle(kbdev); ++ } + -+ /* The following fields are used to time out soft job trackers. */ -+ unsigned long os_tick_create; -+ unsigned long os_tick_activate; -+ mali_bool timer_active; -+}; ++ if (timer_sync) ++ kbase_js_sync_timers(kbdev); + -+extern _mali_osk_atomic_t gp_tracker_count; -+extern _mali_osk_atomic_t phy_pp_tracker_count; -+extern _mali_osk_atomic_t virt_pp_tracker_count; ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ mutex_unlock(&js_devdata->queue_mutex); + -+/** -+ * What follows is a set of functions to check the state of a timeline and to determine where on a -+ * timeline a given point is. Most of these checks will translate the timeline so the oldest point -+ * on the timeline is aligned with zero. Remember that all of these calculation are done on -+ * unsigned integers. -+ * -+ * The following example illustrates the three different states a point can be in. The timeline has -+ * been translated to put the oldest point at zero: -+ * -+ * -+ * -+ * [ point is in forbidden zone ] -+ * 64k wide -+ * MALI_TIMELINE_MAX_POINT_SPAN -+ * -+ * [ point is on timeline ) ( point is released ] -+ * -+ * 0--------------------------##############################--------------------2^32 - 1 -+ * ^ ^ -+ * \ | -+ * oldest point on timeline | -+ * \ -+ * next point on timeline -+ */ ++ katom->atom_flags &= ~KBASE_KATOM_FLAG_HOLDING_CTX_REF; ++ kbasep_js_runpool_release_ctx_and_katom_retained_state(kbdev, kctx, ++ &retained_state); + -+/** -+ * Compare two timeline points -+ * -+ * Returns true if a is after b, false if a is before or equal to b. -+ * -+ * This funcion ignores MALI_TIMELINE_MAX_POINT_SPAN. Wrapping is supported and -+ * the result will be correct if the points is less then UINT_MAX/2 apart. -+ * -+ * @param a Point on timeline -+ * @param b Point on timeline -+ * @return MALI_TRUE if a is after b -+ */ -+MALI_STATIC_INLINE mali_bool mali_timeline_point_after(mali_timeline_point a, mali_timeline_point b) -+{ -+ return 0 > ((s32)b) - ((s32)a); ++ kbase_js_sched_all(kbdev); ++ ++ kbase_backend_complete_wq_post_sched(kbdev, core_req, affinity, ++ coreref_state); +} + -+/** -+ * Check if a point is on timeline. A point is on a timeline if it is greater than, or equal to, -+ * the oldest point, and less than the next point. -+ * -+ * @param timeline Timeline. -+ * @param point Point on timeline. -+ * @return MALI_TRUE if point is on timeline, MALI_FALSE if not. -+ */ -+MALI_STATIC_INLINE mali_bool mali_timeline_is_point_on(struct mali_timeline *timeline, mali_timeline_point point) ++void kbase_js_unpull(struct kbase_context *kctx, struct kbase_jd_atom *katom) +{ -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_NO_POINT != point); ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ return (point - timeline->point_oldest) < (timeline->point_next - timeline->point_oldest); -+} ++ jsctx_rb_unpull(kctx, katom); + -+/** -+ * Check if a point has been released. A point is released if it is older than the oldest point on -+ * the timeline, newer than the next point, and also not in the forbidden zone. -+ * -+ * @param timeline Timeline. -+ * @param point Point on timeline. -+ * @return MALI_TRUE if point has been release, MALI_FALSE if not. -+ */ -+MALI_STATIC_INLINE mali_bool mali_timeline_is_point_released(struct mali_timeline *timeline, mali_timeline_point point) -+{ -+ mali_timeline_point point_normalized; -+ mali_timeline_point next_normalized; ++ WARN_ON(work_pending(&katom->work)); + -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_NO_POINT != point); ++ /* Block re-submission until workqueue has run */ ++ atomic_inc(&katom->blocked); + -+ point_normalized = point - timeline->point_oldest; -+ next_normalized = timeline->point_next - timeline->point_oldest; ++ kbase_job_check_leave_disjoint(kctx->kbdev, katom); + -+ return point_normalized > (next_normalized + MALI_TIMELINE_MAX_POINT_SPAN); ++ KBASE_DEBUG_ASSERT(0 == object_is_on_stack(&katom->work)); ++ INIT_WORK(&katom->work, js_return_worker); ++ queue_work(kctx->jctx.job_done_wq, &katom->work); +} + -+/** -+ * Check if the tracker that the point relate to has been released. A point is released if the tracker is not on the timeline. -+ * @param timeline Timeline. -+ * @param point Point on timeline. -+ * @return MALI_TRUE if the tracker has been release, MALI_FALSE if not. -+ */ -+MALI_STATIC_INLINE mali_bool mali_timeline_is_tracker_released(struct mali_timeline *timeline, mali_timeline_point point) ++bool kbase_js_complete_atom_wq(struct kbase_context *kctx, ++ struct kbase_jd_atom *katom) +{ -+ struct mali_timeline_tracker *tracker; ++ struct kbasep_js_kctx_info *js_kctx_info; ++ struct kbasep_js_device_data *js_devdata; ++ struct kbase_device *kbdev; ++ unsigned long flags; ++ bool timer_sync = false; ++ int atom_slot; ++ bool context_idle = false; ++ int prio = katom->sched_priority; + -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_NO_POINT != point); ++ kbdev = kctx->kbdev; ++ atom_slot = katom->slot_nr; + -+ tracker = timeline->tracker_tail; ++ js_kctx_info = &kctx->jctx.sched_info; ++ js_devdata = &kbdev->js_data; + -+ while (NULL != tracker) { -+ if (point == tracker->point) -+ return MALI_FALSE; -+ tracker = tracker->timeline_next; -+ } ++ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); + -+ return MALI_TRUE; -+} ++ mutex_lock(&js_devdata->runpool_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+/** -+ * Check if a point is valid. A point is valid if is on the timeline or has been released. -+ * -+ * @param timeline Timeline. -+ * @param point Point on timeline. -+ * @return MALI_TRUE if point is valid, MALI_FALSE if not. -+ */ -+MALI_STATIC_INLINE mali_bool mali_timeline_is_point_valid(struct mali_timeline *timeline, mali_timeline_point point) -+{ -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ return mali_timeline_is_point_on(timeline, point) || mali_timeline_is_point_released(timeline, point); -+} ++ if (katom->atom_flags & KBASE_KATOM_FLAG_JSCTX_IN_TREE) { ++ context_idle = !atomic_dec_return(&kctx->atoms_pulled); ++ atomic_dec(&kctx->atoms_pulled_slot[atom_slot]); ++ kctx->atoms_pulled_slot_pri[atom_slot][prio]--; + -+/** -+ * Check if timeline is empty (has no points on it). A timeline is empty if next == oldest. -+ * -+ * @param timeline Timeline. -+ * @return MALI_TRUE if timeline is empty, MALI_FALSE if not. -+ */ -+MALI_STATIC_INLINE mali_bool mali_timeline_is_empty(struct mali_timeline *timeline) -+{ -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ return timeline->point_next == timeline->point_oldest; -+} ++ if (!atomic_read(&kctx->atoms_pulled) && ++ !kctx->slots_pullable) { ++ WARN_ON(!kbase_ctx_flag(kctx, KCTX_RUNNABLE_REF)); ++ kbase_ctx_flag_clear(kctx, KCTX_RUNNABLE_REF); ++ atomic_dec(&kbdev->js_data.nr_contexts_runnable); ++ timer_sync = true; ++ } + -+/** -+ * Check if timeline is full. A valid timeline cannot span more than 64k points (@ref -+ * MALI_TIMELINE_MAX_POINT_SPAN). -+ * -+ * @param timeline Timeline. -+ * @return MALI_TRUE if timeline is full, MALI_FALSE if not. -+ */ -+MALI_STATIC_INLINE mali_bool mali_timeline_is_full(struct mali_timeline *timeline) -+{ -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ return MALI_TIMELINE_MAX_POINT_SPAN <= (timeline->point_next - timeline->point_oldest); -+} -+ -+/** -+ * Create a new timeline system. -+ * -+ * @param session The session this timeline system will belong to. -+ * @return New timeline system. -+ */ -+struct mali_timeline_system *mali_timeline_system_create(struct mali_session_data *session); -+ -+/** -+ * Abort timeline system. -+ * -+ * This will release all pending waiters in the timeline system causing all trackers to be -+ * activated. -+ * -+ * @param system Timeline system to abort all jobs from. -+ */ -+void mali_timeline_system_abort(struct mali_timeline_system *system); -+ -+/** -+ * Destroy an empty timeline system. -+ * -+ * @note @ref mali_timeline_system_abort() should be called prior to this function. -+ * -+ * @param system Timeline system to destroy. -+ */ -+void mali_timeline_system_destroy(struct mali_timeline_system *system); -+ -+/** -+ * Stop the soft job timer. -+ * -+ * @param system Timeline system -+ */ -+void mali_timeline_system_stop_timer(struct mali_timeline_system *system); -+ -+/** -+ * Add a tracker to a timeline system and optionally also on a timeline. -+ * -+ * Once added to the timeline system, the tracker is guaranteed to be activated. The tracker can be -+ * activated before this function returns. Thus, it is also possible that the tracker is released -+ * before this function returns, depending on the tracker type. -+ * -+ * @note Tracker must be initialized (@ref mali_timeline_tracker_init) before being added to the -+ * timeline system. -+ * -+ * @param system Timeline system the tracker will be added to. -+ * @param tracker The tracker to be added. -+ * @param timeline_id Id of the timeline the tracker will be added to, or -+ * MALI_TIMELINE_NONE if it should not be added on a timeline. -+ * @return Point on timeline identifying this tracker, or MALI_TIMELINE_NO_POINT if not on timeline. -+ */ -+mali_timeline_point mali_timeline_system_add_tracker(struct mali_timeline_system *system, -+ struct mali_timeline_tracker *tracker, -+ enum mali_timeline_id timeline_id); -+ -+/** -+ * Get latest point on timeline. -+ * -+ * @param system Timeline system. -+ * @param timeline_id Id of timeline to get latest point from. -+ * @return Latest point on timeline, or MALI_TIMELINE_NO_POINT if the timeline is empty. -+ */ -+mali_timeline_point mali_timeline_system_get_latest_point(struct mali_timeline_system *system, -+ enum mali_timeline_id timeline_id); -+ -+/** -+ * Initialize tracker. -+ * -+ * Must be called before tracker is added to timeline system (@ref mali_timeline_system_add_tracker). -+ * -+ * @param tracker Tracker to initialize. -+ * @param type Type of tracker. -+ * @param fence Fence used to set up dependencies for tracker. -+ * @param job Pointer to job struct this tracker is associated with. -+ */ -+void mali_timeline_tracker_init(struct mali_timeline_tracker *tracker, -+ mali_timeline_tracker_type type, -+ struct mali_timeline_fence *fence, -+ void *job); ++ /* If this slot has been blocked due to soft-stopped atoms, and ++ * all atoms have now been processed, then unblock the slot */ ++ if (!kctx->atoms_pulled_slot_pri[atom_slot][prio] ++ && kctx->blocked_js[atom_slot][prio]) { ++ kctx->blocked_js[atom_slot][prio] = false; ++ if (kbase_js_ctx_pullable(kctx, atom_slot, true)) ++ timer_sync |= ++ kbase_js_ctx_list_add_pullable_nolock( ++ kbdev, kctx, atom_slot); ++ } ++ } ++ WARN_ON(!(katom->atom_flags & KBASE_KATOM_FLAG_JSCTX_IN_TREE)); + -+/** -+ * Grab trigger ref count on tracker. -+ * -+ * This will prevent tracker from being activated until the trigger ref count reaches zero. -+ * -+ * @note Tracker must have been initialized (@ref mali_timeline_tracker_init). -+ * -+ * @param system Timeline system. -+ * @param tracker Tracker. -+ */ -+void mali_timeline_system_tracker_get(struct mali_timeline_system *system, struct mali_timeline_tracker *tracker); ++ if (!atomic_read(&kctx->atoms_pulled_slot[atom_slot]) && ++ jsctx_rb_none_to_pull(kctx, atom_slot)) { ++ if (!list_empty( ++ &kctx->jctx.sched_info.ctx.ctx_list_entry[atom_slot])) ++ timer_sync |= kbase_js_ctx_list_remove_nolock( ++ kctx->kbdev, kctx, atom_slot); ++ } + -+/** -+ * Release trigger ref count on tracker. -+ * -+ * If the trigger ref count reaches zero, the tracker will be activated. -+ * -+ * @param system Timeline system. -+ * @param tracker Tracker. -+ * @param activation_error Error bitmask if activated with error, or MALI_TIMELINE_ACTIVATION_ERROR_NONE if no error. -+ * @return Scheduling bitmask. -+ */ -+mali_scheduler_mask mali_timeline_system_tracker_put(struct mali_timeline_system *system, struct mali_timeline_tracker *tracker, mali_timeline_activation_error activation_error); ++ /* ++ * If submission is disabled on this context (most likely due to an ++ * atom failure) and there are now no atoms left in the system then ++ * re-enable submission so that context can be scheduled again. ++ */ ++ if (!kbasep_js_is_submit_allowed(js_devdata, kctx) && ++ !atomic_read(&kctx->atoms_pulled) && ++ !kbase_ctx_flag(kctx, KCTX_DYING)) { ++ int js; + -+/** -+ * Release a tracker from the timeline system. -+ * -+ * This is used to signal that the job being tracker is finished, either due to normal circumstances -+ * (job complete/abort) or due to a timeout. -+ * -+ * We may need to schedule some subsystems after a tracker has been released and the returned -+ * bitmask will tell us if it is necessary. If the return value is non-zero, this value needs to be -+ * sent as an input parameter to @ref mali_scheduler_schedule_from_mask() to do the scheduling. -+ * -+ * @note Tracker must have been activated before being released. -+ * @warning Not calling @ref mali_scheduler_schedule_from_mask() after releasing a tracker can lead -+ * to a deadlock. -+ * -+ * @param tracker Tracker being released. -+ * @return Scheduling bitmask. -+ */ -+mali_scheduler_mask mali_timeline_tracker_release(struct mali_timeline_tracker *tracker); ++ kbasep_js_set_submit_allowed(js_devdata, kctx); + -+MALI_STATIC_INLINE mali_bool mali_timeline_tracker_activation_error( -+ struct mali_timeline_tracker *tracker) -+{ -+ MALI_DEBUG_ASSERT_POINTER(tracker); -+ return (MALI_TIMELINE_ACTIVATION_ERROR_FATAL_BIT & -+ tracker->activation_error) ? MALI_TRUE : MALI_FALSE; -+} ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { ++ if (kbase_js_ctx_pullable(kctx, js, true)) ++ timer_sync |= ++ kbase_js_ctx_list_add_pullable_nolock( ++ kbdev, kctx, js); ++ } ++ } else if (katom->x_post_dep && ++ kbasep_js_is_submit_allowed(js_devdata, kctx)) { ++ int js; + -+/** -+ * Copy data from a UK fence to a Timeline fence. -+ * -+ * @param fence Timeline fence. -+ * @param uk_fence UK fence. -+ */ -+void mali_timeline_fence_copy_uk_fence(struct mali_timeline_fence *fence, _mali_uk_fence_t *uk_fence); ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { ++ if (kbase_js_ctx_pullable(kctx, js, true)) ++ timer_sync |= ++ kbase_js_ctx_list_add_pullable_nolock( ++ kbdev, kctx, js); ++ } ++ } + -+_mali_osk_errcode_t mali_timeline_initialize(void); ++ /* Mark context as inactive. The pm reference will be dropped later in ++ * jd_done_worker(). ++ */ ++ if (context_idle) ++ kbase_ctx_flag_clear(kctx, KCTX_ACTIVE); + -+void mali_timeline_terminate(void); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ if (timer_sync) ++ kbase_backend_ctx_count_changed(kbdev); ++ mutex_unlock(&js_devdata->runpool_mutex); + -+MALI_STATIC_INLINE mali_bool mali_timeline_has_gp_job(void) -+{ -+ return 0 < _mali_osk_atomic_read(&gp_tracker_count); ++ return context_idle; +} + -+MALI_STATIC_INLINE mali_bool mali_timeline_has_physical_pp_job(void) ++struct kbase_jd_atom *kbase_js_complete_atom(struct kbase_jd_atom *katom, ++ ktime_t *end_timestamp) +{ -+ return 0 < _mali_osk_atomic_read(&phy_pp_tracker_count); -+} ++ u64 microseconds_spent = 0; ++ struct kbase_device *kbdev; ++ struct kbase_context *kctx = katom->kctx; ++ struct kbase_jd_atom *x_dep = katom->x_post_dep; + -+MALI_STATIC_INLINE mali_bool mali_timeline_has_virtual_pp_job(void) -+{ -+ return 0 < _mali_osk_atomic_read(&virt_pp_tracker_count); -+} ++ kbdev = kctx->kbdev; + -+#if defined(DEBUG) -+#define MALI_TIMELINE_DEBUG_FUNCTIONS -+#endif /* DEBUG */ -+#if defined(MALI_TIMELINE_DEBUG_FUNCTIONS) + -+/** -+ * Tracker state. Used for debug printing. -+ */ -+typedef enum mali_timeline_tracker_state { -+ MALI_TIMELINE_TS_INIT = 0, -+ MALI_TIMELINE_TS_WAITING = 1, -+ MALI_TIMELINE_TS_ACTIVE = 2, -+ MALI_TIMELINE_TS_FINISH = 3, -+} mali_timeline_tracker_state; ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+/** -+ * Get tracker state. -+ * -+ * @param tracker Tracker to check. -+ * @return State of tracker. -+ */ -+mali_timeline_tracker_state mali_timeline_debug_get_tracker_state(struct mali_timeline_tracker *tracker); ++ if (katom->will_fail_event_code) ++ katom->event_code = katom->will_fail_event_code; + -+/** -+ * Print debug information about tracker. -+ * -+ * @param tracker Tracker to print. -+ */ -+void mali_timeline_debug_print_tracker(struct mali_timeline_tracker *tracker, _mali_osk_print_ctx *print_ctx); ++ katom->status = KBASE_JD_ATOM_STATE_HW_COMPLETED; + -+/** -+ * Print debug information about timeline. -+ * -+ * @param timeline Timeline to print. -+ */ -+void mali_timeline_debug_print_timeline(struct mali_timeline *timeline, _mali_osk_print_ctx *print_ctx); ++ if (katom->event_code != BASE_JD_EVENT_DONE) { ++ kbase_js_evict_deps(kctx, katom, katom->slot_nr, ++ katom->sched_priority); ++ } + -+#if !(LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)) -+void mali_timeline_debug_direct_print_tracker(struct mali_timeline_tracker *tracker); -+void mali_timeline_debug_direct_print_timeline(struct mali_timeline *timeline); ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++ kbase_trace_mali_job_slots_event(GATOR_MAKE_EVENT(GATOR_JOB_SLOT_STOP, ++ katom->slot_nr), NULL, 0); +#endif + -+/** -+ * Print debug information about timeline system. -+ * -+ * @param system Timeline system to print. -+ */ -+void mali_timeline_debug_print_system(struct mali_timeline_system *system, _mali_osk_print_ctx *print_ctx); ++ /* Calculate the job's time used */ ++ if (end_timestamp != NULL) { ++ /* Only calculating it for jobs that really run on the HW (e.g. ++ * removed from next jobs never actually ran, so really did take ++ * zero time) */ ++ ktime_t tick_diff = ktime_sub(*end_timestamp, ++ katom->start_timestamp); + -+#endif /* defined(MALI_TIMELINE_DEBUG_FUNCTIONS) */ ++ microseconds_spent = ktime_to_ns(tick_diff); + -+#if defined(CONFIG_MALI_DMA_BUF_FENCE) -+/** -+ * The timeline dma fence callback when dma fence signal. -+ * -+ * @param pp_job_ptr The pointer to pp job that link to the signaled dma fence. -+ */ -+void mali_timeline_dma_fence_callback(void *pp_job_ptr); -+#endif ++ do_div(microseconds_spent, 1000); + -+#endif /* __MALI_TIMELINE_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c -new file mode 100755 -index 000000000000..1ab13f50997f ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c -@@ -0,0 +1,218 @@ -+/* -+ * Copyright (C) 2013-2014, 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#include -+#include "mali_timeline_fence_wait.h" -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_spinlock_reentrant.h" ++ /* Round up time spent to the minimum timer resolution */ ++ if (microseconds_spent < KBASEP_JS_TICK_RESOLUTION_US) ++ microseconds_spent = KBASEP_JS_TICK_RESOLUTION_US; ++ } + -+/** -+ * Allocate a fence waiter tracker. -+ * -+ * @return New fence waiter if successful, NULL if not. -+ */ -+static struct mali_timeline_fence_wait_tracker *mali_timeline_fence_wait_tracker_alloc(void) -+{ -+ return (struct mali_timeline_fence_wait_tracker *) _mali_osk_calloc(1, sizeof(struct mali_timeline_fence_wait_tracker)); -+} + -+/** -+ * Free fence waiter tracker. -+ * -+ * @param wait Fence wait tracker to free. -+ */ -+static void mali_timeline_fence_wait_tracker_free(struct mali_timeline_fence_wait_tracker *wait) -+{ -+ MALI_DEBUG_ASSERT_POINTER(wait); -+ _mali_osk_atomic_term(&wait->refcount); -+ _mali_osk_free(wait); -+} ++ kbase_jd_done(katom, katom->slot_nr, end_timestamp, 0); + -+/** -+ * Check if fence wait tracker has been activated. Used as a wait queue condition. -+ * -+ * @param data Fence waiter. -+ * @return MALI_TRUE if tracker has been activated, MALI_FALSE if not. -+ */ -+static mali_bool mali_timeline_fence_wait_tracker_is_activated(void *data) -+{ -+ struct mali_timeline_fence_wait_tracker *wait; ++ /* Unblock cross dependency if present */ ++ if (x_dep && (katom->event_code == BASE_JD_EVENT_DONE || ++ !(x_dep->atom_flags & KBASE_KATOM_FLAG_FAIL_BLOCKER)) && ++ (x_dep->atom_flags & KBASE_KATOM_FLAG_X_DEP_BLOCKED)) { ++ bool was_pullable = kbase_js_ctx_pullable(kctx, x_dep->slot_nr, ++ false); ++ x_dep->atom_flags &= ~KBASE_KATOM_FLAG_X_DEP_BLOCKED; ++ kbase_js_move_to_tree(x_dep); ++ if (!was_pullable && kbase_js_ctx_pullable(kctx, x_dep->slot_nr, ++ false)) ++ kbase_js_ctx_list_add_pullable_nolock(kbdev, kctx, ++ x_dep->slot_nr); + -+ wait = (struct mali_timeline_fence_wait_tracker *) data; -+ MALI_DEBUG_ASSERT_POINTER(wait); ++ if (x_dep->atom_flags & KBASE_KATOM_FLAG_JSCTX_IN_TREE) ++ return x_dep; ++ } + -+ return wait->activated; ++ return NULL; +} + -+/** -+ * Check if fence has been signaled. -+ * -+ * @param system Timeline system. -+ * @param fence Timeline fence. -+ * @return MALI_TRUE if fence is signaled, MALI_FALSE if not. -+ */ -+static mali_bool mali_timeline_fence_wait_check_status(struct mali_timeline_system *system, struct mali_timeline_fence *fence) ++void kbase_js_sched(struct kbase_device *kbdev, int js_mask) +{ -+ int i; -+ u32 tid = _mali_osk_get_tid(); -+ mali_bool ret = MALI_TRUE; -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ struct sync_fence *sync_fence = NULL; -+#else -+ struct mali_internal_sync_fence *sync_fence = NULL; -+#endif -+#endif ++ struct kbasep_js_device_data *js_devdata; ++ struct kbase_context *last_active; ++ bool timer_sync = false; ++ bool ctx_waiting = false; + -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(fence); ++ js_devdata = &kbdev->js_data; + -+ mali_spinlock_reentrant_wait(system->spinlock, tid); ++ down(&js_devdata->schedule_sem); ++ mutex_lock(&js_devdata->queue_mutex); + -+ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { -+ struct mali_timeline *timeline; -+ mali_timeline_point point; ++ last_active = kbdev->hwaccess.active_kctx; + -+ point = fence->points[i]; ++ while (js_mask) { ++ int js; + -+ if (likely(MALI_TIMELINE_NO_POINT == point)) { -+ /* Fence contains no point on this timeline. */ -+ continue; -+ } ++ js = ffs(js_mask) - 1; + -+ timeline = system->timelines[i]; -+ MALI_DEBUG_ASSERT_POINTER(timeline); ++ while (1) { ++ struct kbase_context *kctx; ++ unsigned long flags; ++ bool context_idle = false; + -+ if (unlikely(!mali_timeline_is_point_valid(timeline, point))) { -+ MALI_PRINT_ERROR(("Mali Timeline: point %d is not valid (oldest=%d, next=%d)\n", point, timeline->point_oldest, timeline->point_next)); -+ } ++ kctx = kbase_js_ctx_list_pop_head(kbdev, js); + -+ if (!mali_timeline_is_point_released(timeline, point)) { -+ ret = MALI_FALSE; -+ goto exit; -+ } -+ } ++ if (!kctx) { ++ js_mask &= ~(1 << js); ++ break; /* No contexts on pullable list */ ++ } + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ if (-1 != fence->sync_fd) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ sync_fence = sync_fence_fdget(fence->sync_fd); -+#else -+ sync_fence = mali_internal_sync_fence_fdget(fence->sync_fd); -+#endif -+ if (likely(NULL != sync_fence)) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) -+ if (0 == sync_fence->status) { -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) -+ if (0 < atomic_read(&sync_fence->status)) { -+#else -+ if (0 == sync_fence->fence->ops->signaled(sync_fence->fence)) { -+#endif -+ ret = MALI_FALSE; ++ if (!kbase_ctx_flag(kctx, KCTX_ACTIVE)) { ++ context_idle = true; + -+ } else { -+ ret = MALI_TRUE; ++ if (kbase_pm_context_active_handle_suspend( ++ kbdev, ++ KBASE_PM_SUSPEND_HANDLER_DONT_INCREASE)) { ++ /* Suspend pending - return context to ++ * queue and stop scheduling */ ++ mutex_lock( ++ &kctx->jctx.sched_info.ctx.jsctx_mutex); ++ if (kbase_js_ctx_list_add_pullable_head( ++ kctx->kbdev, kctx, js)) ++ kbase_js_sync_timers(kbdev); ++ mutex_unlock( ++ &kctx->jctx.sched_info.ctx.jsctx_mutex); ++ mutex_unlock(&js_devdata->queue_mutex); ++ up(&js_devdata->schedule_sem); ++ return; ++ } ++ kbase_ctx_flag_set(kctx, KCTX_ACTIVE); + } -+ } else { -+ MALI_PRINT_ERROR(("Mali Timeline: failed to get sync fence from fd %d\n", fence->sync_fd)); -+ } -+ } -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ -+ -+exit: -+ mali_spinlock_reentrant_signal(system->spinlock, tid); + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ if (NULL != sync_fence) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ sync_fence_put(sync_fence); -+#else -+ fput(sync_fence->file); -+#endif -+ } -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ if (!kbase_js_use_ctx(kbdev, kctx)) { ++ mutex_lock( ++ &kctx->jctx.sched_info.ctx.jsctx_mutex); ++ /* Context can not be used at this time */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ if (kbase_js_ctx_pullable(kctx, js, false) ++ || kbase_ctx_flag(kctx, KCTX_PRIVILEGED)) ++ timer_sync |= ++ kbase_js_ctx_list_add_pullable_head_nolock( ++ kctx->kbdev, kctx, js); ++ else ++ timer_sync |= ++ kbase_js_ctx_list_add_unpullable_nolock( ++ kctx->kbdev, kctx, js); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, ++ flags); ++ mutex_unlock( ++ &kctx->jctx.sched_info.ctx.jsctx_mutex); ++ if (context_idle) { ++ WARN_ON(!kbase_ctx_flag(kctx, KCTX_ACTIVE)); ++ kbase_ctx_flag_clear(kctx, KCTX_ACTIVE); ++ kbase_pm_context_idle(kbdev); ++ } + -+ return ret; -+} ++ /* No more jobs can be submitted on this slot */ ++ js_mask &= ~(1 << js); ++ break; ++ } ++ mutex_lock(&kctx->jctx.sched_info.ctx.jsctx_mutex); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+mali_bool mali_timeline_fence_wait(struct mali_timeline_system *system, struct mali_timeline_fence *fence, u32 timeout) -+{ -+ struct mali_timeline_fence_wait_tracker *wait; -+ mali_timeline_point point; -+ mali_bool ret; ++ kbase_ctx_flag_clear(kctx, KCTX_PULLED); + -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(fence); ++ if (!kbase_jm_kick(kbdev, 1 << js)) ++ /* No more jobs can be submitted on this slot */ ++ js_mask &= ~(1 << js); + -+ MALI_DEBUG_PRINT(4, ("Mali Timeline: wait on fence\n")); ++ if (!kbase_ctx_flag(kctx, KCTX_PULLED)) { ++ bool pullable = kbase_js_ctx_pullable(kctx, js, ++ true); + -+ if (MALI_TIMELINE_FENCE_WAIT_TIMEOUT_IMMEDIATELY == timeout) { -+ return mali_timeline_fence_wait_check_status(system, fence); -+ } ++ /* Failed to pull jobs - push to head of list. ++ * Unless this context is already 'active', in ++ * which case it's effectively already scheduled ++ * so push it to the back of the list. */ ++ if (pullable && kctx == last_active) ++ timer_sync |= ++ kbase_js_ctx_list_add_pullable_nolock( ++ kctx->kbdev, ++ kctx, js); ++ else if (pullable) ++ timer_sync |= ++ kbase_js_ctx_list_add_pullable_head_nolock( ++ kctx->kbdev, ++ kctx, js); ++ else ++ timer_sync |= ++ kbase_js_ctx_list_add_unpullable_nolock( ++ kctx->kbdev, ++ kctx, js); + -+ wait = mali_timeline_fence_wait_tracker_alloc(); -+ if (unlikely(NULL == wait)) { -+ MALI_PRINT_ERROR(("Mali Timeline: failed to allocate data for fence wait\n")); -+ return MALI_FALSE; -+ } ++ /* If this context is not the active context, ++ * but the active context is pullable on this ++ * slot, then we need to remove the active ++ * marker to prevent it from submitting atoms in ++ * the IRQ handler, which would prevent this ++ * context from making progress. */ ++ if (last_active && kctx != last_active && ++ kbase_js_ctx_pullable( ++ last_active, js, true)) ++ ctx_waiting = true; + -+ wait->activated = MALI_FALSE; -+ wait->system = system; ++ if (context_idle) { ++ kbase_jm_idle_ctx(kbdev, kctx); ++ spin_unlock_irqrestore( ++ &kbdev->hwaccess_lock, ++ flags); ++ WARN_ON(!kbase_ctx_flag(kctx, KCTX_ACTIVE)); ++ kbase_ctx_flag_clear(kctx, KCTX_ACTIVE); ++ kbase_pm_context_idle(kbdev); ++ } else { ++ spin_unlock_irqrestore( ++ &kbdev->hwaccess_lock, ++ flags); ++ } ++ mutex_unlock( ++ &kctx->jctx.sched_info.ctx.jsctx_mutex); + -+ /* Initialize refcount to two references. The reference first will be released by this -+ * function after the wait is over. The second reference will be released when the tracker -+ * is activated. */ -+ _mali_osk_atomic_init(&wait->refcount, 2); ++ js_mask &= ~(1 << js); ++ break; /* Could not run atoms on this slot */ ++ } + -+ /* Add tracker to timeline system, but not to a timeline. */ -+ mali_timeline_tracker_init(&wait->tracker, MALI_TIMELINE_TRACKER_WAIT, fence, wait); -+ point = mali_timeline_system_add_tracker(system, &wait->tracker, MALI_TIMELINE_NONE); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_NO_POINT == point); -+ MALI_IGNORE(point); ++ /* Push to back of list */ ++ if (kbase_js_ctx_pullable(kctx, js, true)) ++ timer_sync |= ++ kbase_js_ctx_list_add_pullable_nolock( ++ kctx->kbdev, kctx, js); ++ else ++ timer_sync |= ++ kbase_js_ctx_list_add_unpullable_nolock( ++ kctx->kbdev, kctx, js); + -+ /* Wait for the tracker to be activated or time out. */ -+ if (MALI_TIMELINE_FENCE_WAIT_TIMEOUT_NEVER == timeout) { -+ _mali_osk_wait_queue_wait_event(system->wait_queue, mali_timeline_fence_wait_tracker_is_activated, (void *) wait); -+ } else { -+ _mali_osk_wait_queue_wait_event_timeout(system->wait_queue, mali_timeline_fence_wait_tracker_is_activated, (void *) wait, timeout); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&kctx->jctx.sched_info.ctx.jsctx_mutex); ++ } + } + -+ ret = wait->activated; ++ if (timer_sync) ++ kbase_js_sync_timers(kbdev); + -+ if (0 == _mali_osk_atomic_dec_return(&wait->refcount)) { -+ mali_timeline_fence_wait_tracker_free(wait); -+ } ++ if (kbdev->hwaccess.active_kctx == last_active && ctx_waiting) ++ kbdev->hwaccess.active_kctx = NULL; + -+ return ret; ++ mutex_unlock(&js_devdata->queue_mutex); ++ up(&js_devdata->schedule_sem); +} + -+void mali_timeline_fence_wait_activate(struct mali_timeline_fence_wait_tracker *wait) ++void kbase_js_zap_context(struct kbase_context *kctx) +{ -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; -+ -+ MALI_DEBUG_ASSERT_POINTER(wait); -+ MALI_DEBUG_ASSERT_POINTER(wait->system); -+ -+ MALI_DEBUG_PRINT(4, ("Mali Timeline: activation for fence wait tracker\n")); ++ struct kbase_device *kbdev = kctx->kbdev; ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ struct kbasep_js_kctx_info *js_kctx_info = &kctx->jctx.sched_info; ++ int js; + -+ MALI_DEBUG_ASSERT(MALI_FALSE == wait->activated); -+ wait->activated = MALI_TRUE; ++ /* ++ * Critical assumption: No more submission is possible outside of the ++ * workqueue. This is because the OS *must* prevent U/K calls (IOCTLs) ++ * whilst the struct kbase_context is terminating. ++ */ + -+ _mali_osk_wait_queue_wake_up(wait->system->wait_queue); ++ /* First, atomically do the following: ++ * - mark the context as dying ++ * - try to evict it from the queue */ ++ mutex_lock(&kctx->jctx.lock); ++ mutex_lock(&js_devdata->queue_mutex); ++ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); ++ kbase_ctx_flag_set(kctx, KCTX_DYING); + -+ /* Nothing can wait on this tracker, so nothing to schedule after release. */ -+ schedule_mask = mali_timeline_tracker_release(&wait->tracker); -+ MALI_DEBUG_ASSERT(MALI_SCHEDULER_MASK_EMPTY == schedule_mask); -+ MALI_IGNORE(schedule_mask); ++ dev_dbg(kbdev->dev, "Zap: Try Evict Ctx %p", kctx); + -+ if (0 == _mali_osk_atomic_dec_return(&wait->refcount)) { -+ mali_timeline_fence_wait_tracker_free(wait); -+ } -+} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h -new file mode 100755 -index 000000000000..9da12baeef1a ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h -@@ -0,0 +1,67 @@ -+/* -+ * Copyright (C) 2013, 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ /* ++ * At this point we know: ++ * - If eviction succeeded, it was in the queue, but now no ++ * longer is ++ * - We must cancel the jobs here. No Power Manager active reference to ++ * release. ++ * - This happens asynchronously - kbase_jd_zap_context() will wait for ++ * those jobs to be killed. ++ * - If eviction failed, then it wasn't in the queue. It is one ++ * of the following: ++ * - a. it didn't have any jobs, and so is not in the Queue or ++ * the Run Pool (not scheduled) ++ * - Hence, no more work required to cancel jobs. No Power Manager ++ * active reference to release. ++ * - b. it was in the middle of a scheduling transaction (and thus must ++ * have at least 1 job). This can happen from a syscall or a ++ * kernel thread. We still hold the jsctx_mutex, and so the thread ++ * must be waiting inside kbasep_js_try_schedule_head_ctx(), ++ * before checking whether the runpool is full. That thread will ++ * continue after we drop the mutex, and will notice the context ++ * is dying. It will rollback the transaction, killing all jobs at ++ * the same time. kbase_jd_zap_context() will wait for those jobs ++ * to be killed. ++ * - Hence, no more work required to cancel jobs, or to release the ++ * Power Manager active reference. ++ * - c. it is scheduled, and may or may not be running jobs ++ * - We must cause it to leave the runpool by stopping it from ++ * submitting any more jobs. When it finally does leave, ++ * kbasep_js_runpool_requeue_or_kill_ctx() will kill all remaining jobs ++ * (because it is dying), release the Power Manager active reference, ++ * and will not requeue the context in the queue. ++ * kbase_jd_zap_context() will wait for those jobs to be killed. ++ * - Hence, work required just to make it leave the runpool. Cancelling ++ * jobs and releasing the Power manager active reference will be ++ * handled when it leaves the runpool. ++ */ ++ if (!kbase_ctx_flag(kctx, KCTX_SCHEDULED)) { ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { ++ if (!list_empty( ++ &kctx->jctx.sched_info.ctx.ctx_list_entry[js])) ++ list_del_init( ++ &kctx->jctx.sched_info.ctx.ctx_list_entry[js]); ++ } + -+/** -+ * @file mali_timeline_fence_wait.h -+ * -+ * This file contains functions used to wait until a Timeline fence is signaled. -+ */ ++ /* The following events require us to kill off remaining jobs ++ * and update PM book-keeping: ++ * - we evicted it correctly (it must have jobs to be in the ++ * Queue) ++ * ++ * These events need no action, but take this path anyway: ++ * - Case a: it didn't have any jobs, and was never in the Queue ++ * - Case b: scheduling transaction will be partially rolled- ++ * back (this already cancels the jobs) ++ */ + -+#ifndef __MALI_TIMELINE_FENCE_WAIT_H__ -+#define __MALI_TIMELINE_FENCE_WAIT_H__ ++ KBASE_TRACE_ADD(kbdev, JM_ZAP_NON_SCHEDULED, kctx, NULL, 0u, ++ kbase_ctx_flag(kctx, KCTX_SCHEDULED)); + -+#include "mali_osk.h" -+#include "mali_timeline.h" ++ dev_dbg(kbdev->dev, "Zap: Ctx %p scheduled=0", kctx); + -+/** -+ * If used as the timeout argument in @ref mali_timeline_fence_wait, a timer is not used and the -+ * function only returns when the fence is signaled. -+ */ -+#define MALI_TIMELINE_FENCE_WAIT_TIMEOUT_NEVER ((u32) -1) ++ /* Only cancel jobs when we evicted from the ++ * queue. No Power Manager active reference was held. ++ * ++ * Having is_dying set ensures that this kills, and ++ * doesn't requeue */ ++ kbasep_js_runpool_requeue_or_kill_ctx(kbdev, kctx, false); + -+/** -+ * If used as the timeout argument in @ref mali_timeline_fence_wait, the function will return -+ * immediately with the current state of the fence. -+ */ -+#define MALI_TIMELINE_FENCE_WAIT_TIMEOUT_IMMEDIATELY 0 ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ mutex_unlock(&js_devdata->queue_mutex); ++ mutex_unlock(&kctx->jctx.lock); ++ } else { ++ unsigned long flags; ++ bool was_retained; + -+/** -+ * Fence wait tracker. -+ * -+ * The fence wait tracker is added to the Timeline system with the fence we are waiting on as a -+ * dependency. We will then perform a blocking wait, possibly with a timeout, until the tracker is -+ * activated, which happens when the fence is signaled. -+ */ -+struct mali_timeline_fence_wait_tracker { -+ mali_bool activated; /**< MALI_TRUE if the tracker has been activated, MALI_FALSE if not. */ -+ _mali_osk_atomic_t refcount; /**< Reference count. */ -+ struct mali_timeline_system *system; /**< Timeline system. */ -+ struct mali_timeline_tracker tracker; /**< Timeline tracker. */ -+}; ++ /* Case c: didn't evict, but it is scheduled - it's in the Run ++ * Pool */ ++ KBASE_TRACE_ADD(kbdev, JM_ZAP_SCHEDULED, kctx, NULL, 0u, ++ kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ dev_dbg(kbdev->dev, "Zap: Ctx %p is in RunPool", kctx); + -+/** -+ * Wait for a fence to be signaled, or timeout is reached. -+ * -+ * @param system Timeline system. -+ * @param fence Fence to wait on. -+ * @param timeout Timeout in ms, or MALI_TIMELINE_FENCE_WAIT_TIMEOUT_NEVER or -+ * MALI_TIMELINE_FENCE_WAIT_TIMEOUT_IMMEDIATELY. -+ * @return MALI_TRUE if signaled, MALI_FALSE if timed out. -+ */ -+mali_bool mali_timeline_fence_wait(struct mali_timeline_system *system, struct mali_timeline_fence *fence, u32 timeout); ++ /* Disable the ctx from submitting any more jobs */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+/** -+ * Used by the Timeline system to activate a fence wait tracker. -+ * -+ * @param fence_wait_tracker Fence waiter tracker. -+ */ -+void mali_timeline_fence_wait_activate(struct mali_timeline_fence_wait_tracker *fence_wait_tracker); ++ kbasep_js_clear_submit_allowed(js_devdata, kctx); + -+#endif /* __MALI_TIMELINE_FENCE_WAIT_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c -new file mode 100755 -index 000000000000..bb7f6a04e8bd ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c -@@ -0,0 +1,179 @@ -+/* -+ * Copyright (C) 2013, 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#include -+#include "mali_timeline_sync_fence.h" ++ /* Retain and (later) release the context whilst it is is now ++ * disallowed from submitting jobs - ensures that someone ++ * somewhere will be removing the context later on */ ++ was_retained = kbasep_js_runpool_retain_ctx_nolock(kbdev, kctx); + -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_sync.h" ++ /* Since it's scheduled and we have the jsctx_mutex, it must be ++ * retained successfully */ ++ KBASE_DEBUG_ASSERT(was_retained); + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+/** -+ * Creates a sync fence tracker and a sync fence. Adds sync fence tracker to Timeline system and -+ * returns sync fence. The sync fence will be signaled when the sync fence tracker is activated. -+ * -+ * @param timeline Timeline. -+ * @param point Point on timeline. -+ * @return Sync fence that will be signaled when tracker is activated. -+ */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+static struct sync_fence *mali_timeline_sync_fence_create_and_add_tracker(struct mali_timeline *timeline, mali_timeline_point point) -+#else -+static struct mali_internal_sync_fence *mali_timeline_sync_fence_create_and_add_tracker(struct mali_timeline *timeline, mali_timeline_point point) -+#endif -+{ -+ struct mali_timeline_sync_fence_tracker *sync_fence_tracker; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ struct sync_fence *sync_fence; -+#else -+ struct mali_internal_sync_fence *sync_fence; -+#endif -+ struct mali_timeline_fence fence; ++ dev_dbg(kbdev->dev, "Zap: Ctx %p Kill Any Running jobs", kctx); + -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_NO_POINT != point); ++ /* Cancel any remaining running jobs for this kctx - if any. ++ * Submit is disallowed which takes effect immediately, so no ++ * more new jobs will appear after we do this. */ ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) ++ kbase_job_slot_hardstop(kctx, js, NULL); + -+ /* Allocate sync fence tracker. */ -+ sync_fence_tracker = _mali_osk_calloc(1, sizeof(struct mali_timeline_sync_fence_tracker)); -+ if (NULL == sync_fence_tracker) { -+ MALI_PRINT_ERROR(("Mali Timeline: sync_fence_tracker allocation failed\n")); -+ return NULL; -+ } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ mutex_unlock(&js_devdata->queue_mutex); ++ mutex_unlock(&kctx->jctx.lock); + -+ /* Create sync flag. */ -+ MALI_DEBUG_ASSERT_POINTER(timeline->sync_tl); -+ sync_fence_tracker->flag = mali_sync_flag_create(timeline->sync_tl, point); -+ if (NULL == sync_fence_tracker->flag) { -+ MALI_PRINT_ERROR(("Mali Timeline: sync_flag creation failed\n")); -+ _mali_osk_free(sync_fence_tracker); -+ return NULL; -+ } ++ dev_dbg(kbdev->dev, "Zap: Ctx %p Release (may or may not schedule out immediately)", ++ kctx); + -+ /* Create sync fence from sync flag. */ -+ sync_fence = mali_sync_flag_create_fence(sync_fence_tracker->flag); -+ if (NULL == sync_fence) { -+ MALI_PRINT_ERROR(("Mali Timeline: sync_fence creation failed\n")); -+ mali_sync_flag_put(sync_fence_tracker->flag); -+ _mali_osk_free(sync_fence_tracker); -+ return NULL; ++ kbasep_js_runpool_release_ctx(kbdev, kctx); + } + -+ /* Setup fence for tracker. */ -+ _mali_osk_memset(&fence, 0, sizeof(struct mali_timeline_fence)); -+ fence.sync_fd = -1; -+ fence.points[timeline->id] = point; -+ -+ /* Finally, add the tracker to Timeline system. */ -+ mali_timeline_tracker_init(&sync_fence_tracker->tracker, MALI_TIMELINE_TRACKER_SYNC, &fence, sync_fence_tracker); -+ point = mali_timeline_system_add_tracker(timeline->system, &sync_fence_tracker->tracker, MALI_TIMELINE_NONE); -+ MALI_DEBUG_ASSERT(MALI_TIMELINE_NO_POINT == point); ++ KBASE_TRACE_ADD(kbdev, JM_ZAP_DONE, kctx, NULL, 0u, 0u); + -+ return sync_fence; ++ /* After this, you must wait on both the ++ * kbase_jd_context::zero_jobs_wait and the ++ * kbasep_js_kctx_info::ctx::is_scheduled_waitq - to wait for the jobs ++ * to be destroyed, and the context to be de-scheduled (if it was on the ++ * runpool). ++ * ++ * kbase_jd_zap_context() will do this. */ +} + -+s32 mali_timeline_sync_fence_create(struct mali_timeline_system *system, struct mali_timeline_fence *fence) ++static inline int trace_get_refcnt(struct kbase_device *kbdev, ++ struct kbase_context *kctx) +{ -+ u32 i; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ struct sync_fence *sync_fence_acc = NULL; -+#else -+ struct mali_internal_sync_fence *sync_fence_acc = NULL; -+#endif -+ MALI_DEBUG_ASSERT_POINTER(system); -+ MALI_DEBUG_ASSERT_POINTER(fence); -+ -+ for (i = 0; i < MALI_TIMELINE_MAX; ++i) { -+ struct mali_timeline *timeline; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ struct sync_fence *sync_fence; -+#else -+ struct mali_internal_sync_fence *sync_fence; -+#endif -+ if (MALI_TIMELINE_NO_POINT == fence->points[i]) continue; -+ -+ timeline = system->timelines[i]; -+ MALI_DEBUG_ASSERT_POINTER(timeline); -+ -+ sync_fence = mali_timeline_sync_fence_create_and_add_tracker(timeline, fence->points[i]); -+ if (NULL == sync_fence) goto error; -+ -+ if (NULL != sync_fence_acc) { -+ /* Merge sync fences. */ -+ sync_fence_acc = mali_sync_fence_merge(sync_fence_acc, sync_fence); -+ if (NULL == sync_fence_acc) goto error; -+ } else { -+ /* This was the first sync fence created. */ -+ sync_fence_acc = sync_fence; -+ } -+ } -+ -+ if (-1 != fence->sync_fd) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ struct sync_fence *sync_fence; -+ sync_fence = sync_fence_fdget(fence->sync_fd); -+#else -+ struct mali_internal_sync_fence *sync_fence; -+ sync_fence = mali_internal_sync_fence_fdget(fence->sync_fd); -+#endif -+ -+ if (NULL == sync_fence) goto error; -+ -+ if (NULL != sync_fence_acc) { -+ sync_fence_acc = mali_sync_fence_merge(sync_fence_acc, sync_fence); -+ if (NULL == sync_fence_acc) goto error; -+ } else { -+ sync_fence_acc = sync_fence; -+ } -+ } -+ -+ if (NULL == sync_fence_acc) { -+ MALI_DEBUG_ASSERT_POINTER(system->signaled_sync_tl); -+ -+ /* There was nothing to wait on, so return an already signaled fence. */ -+ -+ sync_fence_acc = mali_sync_timeline_create_signaled_fence(system->signaled_sync_tl); -+ if (NULL == sync_fence_acc) goto error; -+ } -+ -+ /* Return file descriptor for the accumulated sync fence. */ -+ return mali_sync_fence_fd_alloc(sync_fence_acc); -+ -+error: -+ if (NULL != sync_fence_acc) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ sync_fence_put(sync_fence_acc); -+#else -+ fput(sync_fence_acc->file); -+#endif -+ } -+ -+ return -1; ++ return atomic_read(&kctx->refcount); +} + -+void mali_timeline_sync_fence_activate(struct mali_timeline_sync_fence_tracker *sync_fence_tracker) ++/** ++ * kbase_js_foreach_ctx_job(): - Call a function on all jobs in context ++ * @kctx: Pointer to context. ++ * @callback: Pointer to function to call for each job. ++ * ++ * Call a function on all jobs belonging to a non-queued, non-running ++ * context, and detach the jobs from the context as it goes. ++ * ++ * Due to the locks that might be held at the time of the call, the callback ++ * may need to defer work on a workqueue to complete its actions (e.g. when ++ * cancelling jobs) ++ * ++ * Atoms will be removed from the queue, so this must only be called when ++ * cancelling jobs (which occurs as part of context destruction). ++ * ++ * The locking conditions on the caller are as follows: ++ * - it will be holding kbasep_js_kctx_info::ctx::jsctx_mutex. ++ */ ++static void kbase_js_foreach_ctx_job(struct kbase_context *kctx, ++ kbasep_js_ctx_job_cb callback) +{ -+ mali_scheduler_mask schedule_mask = MALI_SCHEDULER_MASK_EMPTY; ++ struct kbase_device *kbdev; ++ struct kbasep_js_device_data *js_devdata; ++ unsigned long flags; ++ u32 js; + -+ MALI_DEBUG_ASSERT_POINTER(sync_fence_tracker); -+ MALI_DEBUG_ASSERT_POINTER(sync_fence_tracker->flag); ++ kbdev = kctx->kbdev; ++ js_devdata = &kbdev->js_data; + -+ MALI_DEBUG_PRINT(4, ("Mali Timeline: activation for sync fence tracker\n")); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ /* Signal flag and release reference. */ -+ mali_sync_flag_signal(sync_fence_tracker->flag, 0); -+ mali_sync_flag_put(sync_fence_tracker->flag); ++ KBASE_TRACE_ADD_REFCOUNT(kbdev, JS_POLICY_FOREACH_CTX_JOBS, kctx, NULL, ++ 0u, trace_get_refcnt(kbdev, kctx)); + -+ /* Nothing can wait on this tracker, so nothing to schedule after release. */ -+ schedule_mask = mali_timeline_tracker_release(&sync_fence_tracker->tracker); -+ MALI_DEBUG_ASSERT(MALI_SCHEDULER_MASK_EMPTY == schedule_mask); ++ /* Invoke callback on jobs on each slot in turn */ ++ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) ++ jsctx_queue_foreach(kctx, js, callback); + -+ _mali_osk_free(sync_fence_tracker); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h +diff --git a/drivers/gpu/arm/midgard/mali_kbase_js.h b/drivers/gpu/arm/midgard/mali_kbase_js.h new file mode 100755 -index 000000000000..65e368ae7c9e +index 000000000..ddada8e46 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h -@@ -0,0 +1,51 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_js.h +@@ -0,0 +1,925 @@ +/* -+ * Copyright (C) 2013, 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + ++ ++ ++ ++ +/** -+ * @file mali_timeline_sync_fence.h -+ * -+ * This file contains code related to creating sync fences from timeline fences. ++ * @file mali_kbase_js.h ++ * Job Scheduler APIs. + */ + -+#ifndef __MALI_TIMELINE_SYNC_FENCE_H__ -+#define __MALI_TIMELINE_SYNC_FENCE_H__ ++#ifndef _KBASE_JS_H_ ++#define _KBASE_JS_H_ + -+#include "mali_timeline.h" ++#include "mali_kbase_js_defs.h" ++#include "mali_kbase_context.h" ++#include "mali_kbase_defs.h" ++#include "mali_kbase_debug.h" + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#include "mali_kbase_js_ctx_attr.h" + +/** -+ * Sync fence tracker. ++ * @addtogroup base_api ++ * @{ + */ -+struct mali_timeline_sync_fence_tracker { -+ struct mali_sync_flag *flag; /**< Sync flag used to connect tracker and sync fence. */ -+ struct mali_timeline_tracker tracker; /**< Timeline tracker. */ -+}; + +/** -+ * Create a sync fence that will be signaled when @ref fence is signaled. -+ * -+ * @param system Timeline system. -+ * @param fence Fence to create sync fence from. -+ * @return File descriptor for new sync fence, or -1 on error. ++ * @addtogroup base_kbase_api ++ * @{ + */ -+s32 mali_timeline_sync_fence_create(struct mali_timeline_system *system, struct mali_timeline_fence *fence); + +/** -+ * Used by the Timeline system to activate a sync fence tracker. -+ * -+ * @param sync_fence_tracker Sync fence tracker. ++ * @addtogroup kbase_js Job Scheduler Internal APIs ++ * @{ + * -+ */ -+void mali_timeline_sync_fence_activate(struct mali_timeline_sync_fence_tracker *sync_fence_tracker); -+ -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ -+ -+#endif /* __MALI_TIMELINE_SYNC_FENCE_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_ukk.h b/drivers/gpu/arm/mali400/mali/common/mali_ukk.h -new file mode 100755 -index 000000000000..55a05c50436a ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_ukk.h -@@ -0,0 +1,551 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * These APIs are Internal to KBase. + */ + +/** -+ * @file mali_ukk.h -+ * Defines the kernel-side interface of the user-kernel interface ++ * @brief Initialize the Job Scheduler ++ * ++ * The struct kbasep_js_device_data sub-structure of \a kbdev must be zero ++ * initialized before passing to the kbasep_js_devdata_init() function. This is ++ * to give efficient error path code. + */ -+ -+#ifndef __MALI_UKK_H__ -+#define __MALI_UKK_H__ -+ -+#include "mali_osk.h" -+#include "mali_uk_types.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif ++int kbasep_js_devdata_init(struct kbase_device * const kbdev); + +/** -+ * @addtogroup uddapi Unified Device Driver (UDD) APIs ++ * @brief Halt the Job Scheduler. ++ * ++ * It is safe to call this on \a kbdev even if it the kbasep_js_device_data ++ * sub-structure was never initialized/failed initialization, to give efficient ++ * error-path code. ++ * ++ * For this to work, the struct kbasep_js_device_data sub-structure of \a kbdev must ++ * be zero initialized before passing to the kbasep_js_devdata_init() ++ * function. This is to give efficient error path code. ++ * ++ * It is a Programming Error to call this whilst there are still kbase_context ++ * structures registered with this scheduler. + * -+ * @{ + */ ++void kbasep_js_devdata_halt(struct kbase_device *kbdev); + +/** -+ * @addtogroup u_k_api UDD User/Kernel Interface (U/K) APIs ++ * @brief Terminate the Job Scheduler + * -+ * - The _mali_uk functions are an abstraction of the interface to the device -+ * driver. On certain OSs, this would be implemented via the IOCTL interface. -+ * On other OSs, it could be via extension of some Device Driver Class, or -+ * direct function call for Bare metal/RTOSs. -+ * - It is important to note that: -+ * - The Device Driver has implemented the _mali_ukk set of functions -+ * - The Base Driver calls the corresponding set of _mali_uku functions. -+ * - What requires porting is solely the calling mechanism from User-side to -+ * Kernel-side, and propagating back the results. -+ * - Each U/K function is associated with a (group, number) pair from -+ * \ref _mali_uk_functions to make it possible for a common function in the -+ * Base Driver and Device Driver to route User/Kernel calls from/to the -+ * correct _mali_uk function. For example, in an IOCTL system, the IOCTL number -+ * would be formed based on the group and number assigned to the _mali_uk -+ * function, as listed in \ref _mali_uk_functions. On the user-side, each -+ * _mali_uku function would just make an IOCTL with the IOCTL-code being an -+ * encoded form of the (group, number) pair. On the kernel-side, the Device -+ * Driver's IOCTL handler decodes the IOCTL-code back into a (group, number) -+ * pair, and uses this to determine which corresponding _mali_ukk should be -+ * called. -+ * - Refer to \ref _mali_uk_functions for more information about this -+ * (group, number) pairing. -+ * - In a system where there is no distinction between user and kernel-side, -+ * the U/K interface may be implemented as:@code -+ * MALI_STATIC_INLINE _mali_osk_errcode_t _mali_uku_examplefunction( _mali_uk_examplefunction_s *args ) -+ * { -+ * return mali_ukk_examplefunction( args ); -+ * } -+ * @endcode -+ * - Therefore, all U/K calls behave \em as \em though they were direct -+ * function calls (but the \b implementation \em need \em not be a direct -+ * function calls) ++ * It is safe to call this on \a kbdev even if it the kbasep_js_device_data ++ * sub-structure was never initialized/failed initialization, to give efficient ++ * error-path code. + * -+ * @note Naming the _mali_uk functions the same on both User and Kernel sides -+ * on non-RTOS systems causes debugging issues when setting breakpoints. In -+ * this case, it is not clear which function the breakpoint is put on. -+ * Therefore the _mali_uk functions in user space are prefixed with \c _mali_uku -+ * and in kernel space with \c _mali_ukk. The naming for the argument -+ * structures is unaffected. ++ * For this to work, the struct kbasep_js_device_data sub-structure of \a kbdev must ++ * be zero initialized before passing to the kbasep_js_devdata_init() ++ * function. This is to give efficient error path code. + * -+ * - The _mali_uk functions are synchronous. -+ * - Arguments to the _mali_uk functions are passed in a structure. The only -+ * parameter passed to the _mali_uk functions is a pointer to this structure. -+ * This first member of this structure, ctx, is a pointer to a context returned -+ * by _mali_uku_open(). For example:@code -+ * typedef struct -+ * { -+ * void *ctx; -+ * u32 number_of_cores; -+ * } _mali_uk_get_gp_number_of_cores_s; -+ * @endcode ++ * It is a Programming Error to call this whilst there are still kbase_context ++ * structures registered with this scheduler. ++ */ ++void kbasep_js_devdata_term(struct kbase_device *kbdev); ++ ++/** ++ * @brief Initialize the Scheduling Component of a struct kbase_context on the Job Scheduler. + * -+ * - Each _mali_uk function has its own argument structure named after the -+ * function. The argument is distinguished by the _s suffix. -+ * - The argument types are defined by the base driver and user-kernel -+ * interface. -+ * - All _mali_uk functions return a standard \ref _mali_osk_errcode_t. -+ * - Only arguments of type input or input/output need be initialized before -+ * calling a _mali_uk function. -+ * - Arguments of type output and input/output are only valid when the -+ * _mali_uk function returns \ref _MALI_OSK_ERR_OK. -+ * - The \c ctx member is always invalid after it has been used by a -+ * _mali_uk function, except for the context management functions ++ * This effectively registers a struct kbase_context with a Job Scheduler. + * ++ * It does not register any jobs owned by the struct kbase_context with the scheduler. ++ * Those must be separately registered by kbasep_js_add_job(). + * -+ * \b Interface \b restrictions ++ * The struct kbase_context must be zero intitialized before passing to the ++ * kbase_js_init() function. This is to give efficient error path code. ++ */ ++int kbasep_js_kctx_init(struct kbase_context * const kctx); ++ ++/** ++ * @brief Terminate the Scheduling Component of a struct kbase_context on the Job Scheduler + * -+ * The requirements of the interface mean that an implementation of the -+ * User-kernel interface may do no 'real' work. For example, the following are -+ * illegal in the User-kernel implementation: -+ * - Calling functions necessary for operation on all systems, which would -+ * not otherwise get called on RTOS systems. -+ * - For example, a U/K interface that calls multiple _mali_ukk functions -+ * during one particular U/K call. This could not be achieved by the same code -+ * which uses direct function calls for the U/K interface. -+ * - Writing in values to the args members, when otherwise these members would -+ * not hold a useful value for a direct function call U/K interface. -+ * - For example, U/K interface implementation that take NULL members in -+ * their arguments structure from the user side, but those members are -+ * replaced with non-NULL values in the kernel-side of the U/K interface -+ * implementation. A scratch area for writing data is one such example. In this -+ * case, a direct function call U/K interface would segfault, because no code -+ * would be present to replace the NULL pointer with a meaningful pointer. -+ * - Note that we discourage the case where the U/K implementation changes -+ * a NULL argument member to non-NULL, and then the Device Driver code (outside -+ * of the U/K layer) re-checks this member for NULL, and corrects it when -+ * necessary. Whilst such code works even on direct function call U/K -+ * intefaces, it reduces the testing coverage of the Device Driver code. This -+ * is because we have no way of testing the NULL == value path on an OS -+ * implementation. ++ * This effectively de-registers a struct kbase_context from its Job Scheduler + * -+ * A number of allowable examples exist where U/K interfaces do 'real' work: -+ * - The 'pointer switching' technique for \ref _mali_ukk_get_system_info -+ * - In this case, without the pointer switching on direct function call -+ * U/K interface, the Device Driver code still sees the same thing: a pointer -+ * to which it can write memory. This is because such a system has no -+ * distinction between a user and kernel pointer. -+ * - Writing an OS-specific value into the ukk_private member for -+ * _mali_ukk_mem_mmap(). -+ * - In this case, this value is passed around by Device Driver code, but -+ * its actual value is never checked. Device Driver code simply passes it from -+ * the U/K layer to the OSK layer, where it can be acted upon. In this case, -+ * \em some OS implementations of the U/K (_mali_ukk_mem_mmap()) and OSK -+ * (_mali_osk_mem_mapregion_init()) functions will collaborate on the -+ * meaning of ukk_private member. On other OSs, it may be unused by both -+ * U/K and OSK layers -+ * - Therefore, on error inside the U/K interface implementation itself, -+ * it will be as though the _mali_ukk function itself had failed, and cleaned -+ * up after itself. -+ * - Compare this to a direct function call U/K implementation, where all -+ * error cleanup is handled by the _mali_ukk function itself. The direct -+ * function call U/K interface implementation is automatically atomic. ++ * It is safe to call this on a struct kbase_context that has never had or failed ++ * initialization of its jctx.sched_info member, to give efficient error-path ++ * code. + * -+ * The last example highlights a consequence of all U/K interface -+ * implementations: they must be atomic with respect to the Device Driver code. -+ * And therefore, should Device Driver code succeed but the U/K implementation -+ * fail afterwards (but before return to user-space), then the U/K -+ * implementation must cause appropriate cleanup actions to preserve the -+ * atomicity of the interface. ++ * For this to work, the struct kbase_context must be zero intitialized before passing ++ * to the kbase_js_init() function. + * -+ * @{ ++ * It is a Programming Error to call this whilst there are still jobs ++ * registered with this context. + */ ++void kbasep_js_kctx_term(struct kbase_context *kctx); + -+ -+/** @defgroup _mali_uk_context U/K Context management ++/** ++ * @brief Add a job chain to the Job Scheduler, and take necessary actions to ++ * schedule the context/run the job. + * -+ * These functions allow for initialisation of the user-kernel interface once per process. ++ * This atomically does the following: ++ * - Update the numbers of jobs information ++ * - Add the job to the run pool if necessary (part of init_job) + * -+ * Generally the context will store the OS specific object to communicate with the kernel device driver and further -+ * state information required by the specific implementation. The context is shareable among all threads in the caller process. ++ * Once this is done, then an appropriate action is taken: ++ * - If the ctx is scheduled, it attempts to start the next job (which might be ++ * this added job) ++ * - Otherwise, and if this is the first job on the context, it enqueues it on ++ * the Policy Queue + * -+ * On IOCTL systems, this is likely to be a file descriptor as a result of opening the kernel device driver. ++ * The Policy's Queue can be updated by this in the following ways: ++ * - In the above case that this is the first job on the context ++ * - If the context is high priority and the context is not scheduled, then it ++ * could cause the Policy to schedule out a low-priority context, allowing ++ * this context to be scheduled in. + * -+ * On a bare-metal/RTOS system with no distinction between kernel and -+ * user-space, the U/K interface simply calls the _mali_ukk variant of the -+ * function by direct function call. In this case, the context returned is the -+ * mali_session_data from _mali_ukk_open(). ++ * If the context is already scheduled on the RunPool, then adding a job to it ++ * is guarenteed not to update the Policy Queue. And so, the caller is ++ * guarenteed to not need to try scheduling a context from the Run Pool - it ++ * can safely assert that the result is false. + * -+ * The kernel side implementations of the U/K interface expect the first member of the argument structure to -+ * be the context created by _mali_uku_open(). On some OS implementations, the meaning of this context -+ * will be different between user-side and kernel-side. In which case, the kernel-side will need to replace this context -+ * with the kernel-side equivalent, because user-side will not have access to kernel-side data. The context parameter -+ * in the argument structure therefore has to be of type input/output. ++ * It is a programming error to have more than U32_MAX jobs in flight at a time. + * -+ * It should be noted that the caller cannot reuse the \c ctx member of U/K -+ * argument structure after a U/K call, because it may be overwritten. Instead, -+ * the context handle must always be stored elsewhere, and copied into -+ * the appropriate U/K argument structure for each user-side call to -+ * the U/K interface. This is not usually a problem, since U/K argument -+ * structures are usually placed on the stack. ++ * The following locking conditions are made on the caller: ++ * - it must \em not hold kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * - it must \em not hold hwaccess_lock (as this will be obtained internally) ++ * - it must \em not hold kbasep_js_device_data::runpool_mutex (as this will be ++ * obtained internally) ++ * - it must \em not hold kbasep_jd_device_data::queue_mutex (again, it's used internally). + * -+ * @{ */ ++ * @return true indicates that the Policy Queue was updated, and so the ++ * caller will need to try scheduling a context onto the Run Pool. ++ * @return false indicates that no updates were made to the Policy Queue, ++ * so no further action is required from the caller. This is \b always returned ++ * when the context is currently scheduled. ++ */ ++bool kbasep_js_add_job(struct kbase_context *kctx, struct kbase_jd_atom *atom); + -+/** @brief Begin a new Mali Device Driver session ++/** ++ * @brief Remove a job chain from the Job Scheduler, except for its 'retained state'. + * -+ * This is used to obtain a per-process context handle for all future U/K calls. ++ * Completely removing a job requires several calls: ++ * - kbasep_js_copy_atom_retained_state(), to capture the 'retained state' of ++ * the atom ++ * - kbasep_js_remove_job(), to partially remove the atom from the Job Scheduler ++ * - kbasep_js_runpool_release_ctx_and_katom_retained_state(), to release the ++ * remaining state held as part of the job having been run. + * -+ * @param context pointer to storage to return a (void*)context handle. -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. -+ */ -+_mali_osk_errcode_t _mali_ukk_open(void **context); -+ -+/** @brief End a Mali Device Driver session ++ * In the common case of atoms completing normally, this set of actions is more optimal for spinlock purposes than having kbasep_js_remove_job() handle all of the actions. + * -+ * This should be called when the process no longer requires use of the Mali Device Driver. ++ * In the case of cancelling atoms, it is easier to call kbasep_js_remove_cancelled_job(), which handles all the necessary actions. + * -+ * The context handle must not be used after it has been closed. ++ * It is a programming error to call this when: ++ * - \a atom is not a job belonging to kctx. ++ * - \a atom has already been removed from the Job Scheduler. ++ * - \a atom is still in the runpool ++ * ++ * Do not use this for removing jobs being killed by kbase_jd_cancel() - use ++ * kbasep_js_remove_cancelled_job() instead. ++ * ++ * The following locking conditions are made on the caller: ++ * - it must hold kbasep_js_kctx_info::ctx::jsctx_mutex. + * -+ * @param context pointer to a stored (void*)context handle. -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+_mali_osk_errcode_t _mali_ukk_close(void **context); -+ -+/** @} */ /* end group _mali_uk_context */ -+ ++void kbasep_js_remove_job(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *atom); + -+/** @addtogroup _mali_uk_core U/K Core ++/** ++ * @brief Completely remove a job chain from the Job Scheduler, in the case ++ * where the job chain was cancelled. + * -+ * The core functions provide the following functionality: -+ * - verify that the user and kernel API are compatible -+ * - retrieve information about the cores and memory banks in the system -+ * - wait for the result of jobs started on a core ++ * This is a variant of kbasep_js_remove_job() that takes care of removing all ++ * of the retained state too. This is generally useful for cancelled atoms, ++ * which need not be handled in an optimal way. + * -+ * @{ */ -+ -+/** @brief Waits for a job notification. ++ * It is a programming error to call this when: ++ * - \a atom is not a job belonging to kctx. ++ * - \a atom has already been removed from the Job Scheduler. ++ * - \a atom is still in the runpool: ++ * - it is not being killed with kbasep_jd_cancel() + * -+ * Sleeps until notified or a timeout occurs. Returns information about the notification. ++ * The following locking conditions are made on the caller: ++ * - it must hold kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * - it must \em not hold the hwaccess_lock, (as this will be obtained ++ * internally) ++ * - it must \em not hold kbasep_js_device_data::runpool_mutex (as this could be ++ * obtained internally) + * -+ * @param args see _mali_uk_wait_for_notification_s in "mali_utgard_uk_types.h" -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ * @return true indicates that ctx attributes have changed and the caller ++ * should call kbase_js_sched_all() to try to run more jobs ++ * @return false otherwise + */ -+_mali_osk_errcode_t _mali_ukk_wait_for_notification(_mali_uk_wait_for_notification_s *args); ++bool kbasep_js_remove_cancelled_job(struct kbase_device *kbdev, ++ struct kbase_context *kctx, ++ struct kbase_jd_atom *katom); + -+/** @brief Post a notification to the notification queue of this application. ++/** ++ * @brief Refcount a context as being busy, preventing it from being scheduled ++ * out. + * -+ * @param args see _mali_uk_post_notification_s in "mali_utgard_uk_types.h" -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. -+ */ -+_mali_osk_errcode_t _mali_ukk_post_notification(_mali_uk_post_notification_s *args); -+ -+/** @brief Verifies if the user and kernel side of this API are compatible. ++ * @note This function can safely be called from IRQ context. + * -+ * This function is obsolete, but kept to allow old, incompatible user space -+ * clients to robustly detect the incompatibility. ++ * The following locking conditions are made on the caller: ++ * - it must \em not hold mmu_hw_mutex and hwaccess_lock, because they will be ++ * used internally. + * -+ * @param args see _mali_uk_get_api_version_s in "mali_utgard_uk_types.h" -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ * @return value != false if the retain succeeded, and the context will not be scheduled out. ++ * @return false if the retain failed (because the context is being/has been scheduled out). + */ -+_mali_osk_errcode_t _mali_ukk_get_api_version(_mali_uk_get_api_version_s *args); ++bool kbasep_js_runpool_retain_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); + -+/** @brief Verifies if the user and kernel side of this API are compatible. ++/** ++ * @brief Refcount a context as being busy, preventing it from being scheduled ++ * out. + * -+ * @param args see _mali_uk_get_api_version_v2_s in "mali_utgard_uk_types.h" -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. -+ */ -+_mali_osk_errcode_t _mali_ukk_get_api_version_v2(_mali_uk_get_api_version_v2_s *args); -+ -+/** @brief Get the user space settings applicable for calling process. ++ * @note This function can safely be called from IRQ context. + * -+ * @param args see _mali_uk_get_user_settings_s in "mali_utgard_uk_types.h" -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. -+ */ -+_mali_osk_errcode_t _mali_ukk_get_user_settings(_mali_uk_get_user_settings_s *args); -+ -+/** @brief Get a user space setting applicable for calling process. ++ * The following locks must be held by the caller: ++ * - mmu_hw_mutex, hwaccess_lock + * -+ * @param args see _mali_uk_get_user_setting_s in "mali_utgard_uk_types.h" -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ * @return value != false if the retain succeeded, and the context will not be scheduled out. ++ * @return false if the retain failed (because the context is being/has been scheduled out). + */ -+_mali_osk_errcode_t _mali_ukk_get_user_setting(_mali_uk_get_user_setting_s *args); ++bool kbasep_js_runpool_retain_ctx_nolock(struct kbase_device *kbdev, struct kbase_context *kctx); + -+/* @brief Grant or deny high priority scheduling for this session. ++/** ++ * @brief Lookup a context in the Run Pool based upon its current address space ++ * and ensure that is stays scheduled in. + * -+ * @param args see _mali_uk_request_high_priority_s in "mali_utgard_uk_types.h" -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. -+ */ -+_mali_osk_errcode_t _mali_ukk_request_high_priority(_mali_uk_request_high_priority_s *args); -+ -+/** @brief Make process sleep if the pending big job in kernel >= MALI_MAX_PENDING_BIG_JOB ++ * The context is refcounted as being busy to prevent it from scheduling ++ * out. It must be released with kbasep_js_runpool_release_ctx() when it is no ++ * longer required to stay scheduled in. ++ * ++ * @note This function can safely be called from IRQ context. ++ * ++ * The following locking conditions are made on the caller: ++ * - it must \em not hold the hwaccess_lock, because it will be used internally. ++ * If the hwaccess_lock is already held, then the caller should use ++ * kbasep_js_runpool_lookup_ctx_nolock() instead. + * ++ * @return a valid struct kbase_context on success, which has been refcounted as being busy. ++ * @return NULL on failure, indicating that no context was found in \a as_nr + */ -+_mali_osk_errcode_t _mali_ukk_pending_submit(_mali_uk_pending_submit_s *args); -+ -+/** @} */ /* end group _mali_uk_core */ -+ ++struct kbase_context *kbasep_js_runpool_lookup_ctx(struct kbase_device *kbdev, int as_nr); + -+/** @addtogroup _mali_uk_memory U/K Memory ++/** ++ * @brief Handling the requeuing/killing of a context that was evicted from the ++ * policy queue or runpool. + * -+ * The memory functions provide functionality with and without a Mali-MMU present. ++ * This should be used whenever handing off a context that has been evicted ++ * from the policy queue or the runpool: ++ * - If the context is not dying and has jobs, it gets re-added to the policy ++ * queue ++ * - Otherwise, it is not added + * -+ * For Mali-MMU based systems, the following functionality is provided: -+ * - Initialize and terminate MALI virtual address space -+ * - Allocate/deallocate physical memory to a MALI virtual address range and map into/unmap from the -+ * current process address space -+ * - Map/unmap external physical memory into the MALI virtual address range ++ * In addition, if the context is dying the jobs are killed asynchronously. + * -+ * For Mali-nonMMU based systems: -+ * - Allocate/deallocate MALI memory ++ * In all cases, the Power Manager active reference is released ++ * (kbase_pm_context_idle()) whenever the has_pm_ref parameter is true. \a ++ * has_pm_ref must be set to false whenever the context was not previously in ++ * the runpool and does not hold a Power Manager active refcount. Note that ++ * contexts in a rollback of kbasep_js_try_schedule_head_ctx() might have an ++ * active refcount even though they weren't in the runpool. + * -+ * @{ */ ++ * The following locking conditions are made on the caller: ++ * - it must hold kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * - it must \em not hold kbasep_jd_device_data::queue_mutex (as this will be ++ * obtained internally) ++ */ ++void kbasep_js_runpool_requeue_or_kill_ctx(struct kbase_device *kbdev, struct kbase_context *kctx, bool has_pm_ref); + -+/** @brief Map Mali Memory into the current user process ++/** ++ * @brief Release a refcount of a context being busy, allowing it to be ++ * scheduled out. + * -+ * Maps Mali memory into the current user process in a generic way. ++ * When the refcount reaches zero and the context \em might be scheduled out ++ * (depending on whether the Scheudling Policy has deemed it so, or if it has run ++ * out of jobs). + * -+ * This function is to be used for Mali-MMU mode. The function is available in both Mali-MMU and Mali-nonMMU modes, -+ * but should not be called by a user process in Mali-nonMMU mode. ++ * If the context does get scheduled out, then The following actions will be ++ * taken as part of deschduling a context: ++ * - For the context being descheduled: ++ * - If the context is in the processing of dying (all the jobs are being ++ * removed from it), then descheduling also kills off any jobs remaining in the ++ * context. ++ * - If the context is not dying, and any jobs remain after descheduling the ++ * context then it is re-enqueued to the Policy's Queue. ++ * - Otherwise, the context is still known to the scheduler, but remains absent ++ * from the Policy Queue until a job is next added to it. ++ * - In all descheduling cases, the Power Manager active reference (obtained ++ * during kbasep_js_try_schedule_head_ctx()) is released (kbase_pm_context_idle()). + * -+ * The implementation and operation of _mali_ukk_mem_mmap() is dependant on whether the driver is built for Mali-MMU -+ * or Mali-nonMMU: -+ * - In the nonMMU case, _mali_ukk_mem_mmap() requires a physical address to be specified. For this reason, an OS U/K -+ * implementation should not allow this to be called from user-space. In any case, nonMMU implementations are -+ * inherently insecure, and so the overall impact is minimal. Mali-MMU mode should be used if security is desired. -+ * - In the MMU case, _mali_ukk_mem_mmap() the _mali_uk_mem_mmap_s::phys_addr -+ * member is used for the \em Mali-virtual address desired for the mapping. The -+ * implementation of _mali_ukk_mem_mmap() will allocate both the CPU-virtual -+ * and CPU-physical addresses, and can cope with mapping a contiguous virtual -+ * address range to a sequence of non-contiguous physical pages. In this case, -+ * the CPU-physical addresses are not communicated back to the user-side, as -+ * they are unnecsessary; the \em Mali-virtual address range must be used for -+ * programming Mali structures. ++ * Whilst the context is being descheduled, this also handles actions that ++ * cause more atoms to be run: ++ * - Attempt submitting atoms when the Context Attributes on the Runpool have ++ * changed. This is because the context being scheduled out could mean that ++ * there are more opportunities to run atoms. ++ * - Attempt submitting to a slot that was previously blocked due to affinity ++ * restrictions. This is usually only necessary when releasing a context ++ * happens as part of completing a previous job, but is harmless nonetheless. ++ * - Attempt scheduling in a new context (if one is available), and if necessary, ++ * running a job from that new context. + * -+ * In the second (MMU) case, _mali_ukk_mem_mmap() handles management of -+ * CPU-virtual and CPU-physical ranges, but the \em caller must manage the -+ * \em Mali-virtual address range from the user-side. ++ * Unlike retaining a context in the runpool, this function \b cannot be called ++ * from IRQ context. + * -+ * @note Mali-virtual address ranges are entirely separate between processes. -+ * It is not possible for a process to accidentally corrupt another process' -+ * \em Mali-virtual address space. ++ * It is a programming error to call this on a \a kctx that is not currently ++ * scheduled, or that already has a zero refcount. ++ * ++ * The following locking conditions are made on the caller: ++ * - it must \em not hold the hwaccess_lock, because it will be used internally. ++ * - it must \em not hold kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * - it must \em not hold kbasep_js_device_data::runpool_mutex (as this will be ++ * obtained internally) ++ * - it must \em not hold the kbase_device::mmu_hw_mutex (as this will be ++ * obtained internally) ++ * - it must \em not hold kbasep_jd_device_data::queue_mutex (as this will be ++ * obtained internally) + * -+ * @param args see _mali_uk_mem_mmap_s in "mali_utgard_uk_types.h" -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+_mali_osk_errcode_t _mali_ukk_mem_mmap(_mali_uk_mem_mmap_s *args); ++void kbasep_js_runpool_release_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); + -+/** @brief Unmap Mali Memory from the current user process ++/** ++ * @brief Variant of kbasep_js_runpool_release_ctx() that handles additional ++ * actions from completing an atom. + * -+ * Unmaps Mali memory from the current user process in a generic way. This only operates on Mali memory supplied -+ * from _mali_ukk_mem_mmap(). ++ * This is usually called as part of completing an atom and releasing the ++ * refcount on the context held by the atom. + * -+ * @param args see _mali_uk_mem_munmap_s in "mali_utgard_uk_types.h" -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. -+ */ -+_mali_osk_errcode_t _mali_ukk_mem_munmap(_mali_uk_mem_munmap_s *args); -+ -+/** @brief Determine the buffer size necessary for an MMU page table dump. -+ * @param args see _mali_uk_query_mmu_page_table_dump_size_s in mali_utgard_uk_types.h -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. -+ */ -+_mali_osk_errcode_t _mali_ukk_query_mmu_page_table_dump_size(_mali_uk_query_mmu_page_table_dump_size_s *args); -+/** @brief Dump MMU Page tables. -+ * @param args see _mali_uk_dump_mmu_page_table_s in mali_utgard_uk_types.h -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ * Therefore, the extra actions carried out are part of handling actions queued ++ * on a completed atom, namely: ++ * - Releasing the atom's context attributes ++ * - Retrying the submission on a particular slot, because we couldn't submit ++ * on that slot from an IRQ handler. ++ * ++ * The locking conditions of this function are the same as those for ++ * kbasep_js_runpool_release_ctx() + */ -+_mali_osk_errcode_t _mali_ukk_dump_mmu_page_table(_mali_uk_dump_mmu_page_table_s *args); ++void kbasep_js_runpool_release_ctx_and_katom_retained_state(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbasep_js_atom_retained_state *katom_retained_state); + -+/** @brief Write user data to specified Mali memory without causing segfaults. -+ * @param args see _mali_uk_mem_write_safe_s in mali_utgard_uk_types.h -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++/** ++ * @brief Variant of kbase_js_runpool_release_ctx() that assumes that ++ * kbasep_js_device_data::runpool_mutex and ++ * kbasep_js_kctx_info::ctx::jsctx_mutex are held by the caller, and does not ++ * attempt to schedule new contexts. + */ -+_mali_osk_errcode_t _mali_ukk_mem_write_safe(_mali_uk_mem_write_safe_s *args); -+ -+/** @} */ /* end group _mali_uk_memory */ -+ -+ -+/** @addtogroup _mali_uk_pp U/K Fragment Processor -+ * -+ * The Fragment Processor (aka PP (Pixel Processor)) functions provide the following functionality: -+ * - retrieving version of the fragment processors -+ * - determine number of fragment processors -+ * - starting a job on a fragment processor -+ * -+ * @{ */ ++void kbasep_js_runpool_release_ctx_nolock(struct kbase_device *kbdev, ++ struct kbase_context *kctx); + -+/** @brief Issue a request to start a new job on a Fragment Processor. -+ * -+ * If the request fails args->status is set to _MALI_UK_START_JOB_NOT_STARTED_DO_REQUEUE and you can -+ * try to start the job again. ++/** ++ * @brief Schedule in a privileged context + * -+ * An existing job could be returned for requeueing if the new job has a higher priority than a previously started job -+ * which the hardware hasn't actually started processing yet. In this case the new job will be started instead and the -+ * existing one returned, otherwise the new job is started and the status field args->status is set to -+ * _MALI_UK_START_JOB_STARTED. ++ * This schedules a context in regardless of the context priority. ++ * If the runpool is full, a context will be forced out of the runpool and the function will wait ++ * for the new context to be scheduled in. ++ * The context will be kept scheduled in (and the corresponding address space reserved) until ++ * kbasep_js_release_privileged_ctx is called). + * -+ * Job completion can be awaited with _mali_ukk_wait_for_notification(). ++ * The following locking conditions are made on the caller: ++ * - it must \em not hold the hwaccess_lock, because it will be used internally. ++ * - it must \em not hold kbasep_js_device_data::runpool_mutex (as this will be ++ * obtained internally) ++ * - it must \em not hold the kbase_device::mmu_hw_mutex (as this will be ++ * obtained internally) ++ * - it must \em not hold kbasep_jd_device_data::queue_mutex (again, it's used internally). ++ * - it must \em not hold kbasep_js_kctx_info::ctx::jsctx_mutex, because it will ++ * be used internally. + * -+ * @param ctx user-kernel context (mali_session) -+ * @param uargs see _mali_uk_pp_start_job_s in "mali_utgard_uk_types.h". Use _mali_osk_copy_from_user to retrieve data! -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+_mali_osk_errcode_t _mali_ukk_pp_start_job(void *ctx, _mali_uk_pp_start_job_s *uargs); ++void kbasep_js_schedule_privileged_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); + +/** -+ * @brief Issue a request to start new jobs on both Vertex Processor and Fragment Processor. ++ * @brief Release a privileged context, allowing it to be scheduled out. + * -+ * @note Will call into @ref _mali_ukk_pp_start_job and @ref _mali_ukk_gp_start_job. ++ * See kbasep_js_runpool_release_ctx for potential side effects. ++ * ++ * The following locking conditions are made on the caller: ++ * - it must \em not hold the hwaccess_lock, because it will be used internally. ++ * - it must \em not hold kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * - it must \em not hold kbasep_js_device_data::runpool_mutex (as this will be ++ * obtained internally) ++ * - it must \em not hold the kbase_device::mmu_hw_mutex (as this will be ++ * obtained internally) + * -+ * @param ctx user-kernel context (mali_session) -+ * @param uargs see _mali_uk_pp_and_gp_start_job_s in "mali_utgard_uk_types.h". Use _mali_osk_copy_from_user to retrieve data! -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. + */ -+_mali_osk_errcode_t _mali_ukk_pp_and_gp_start_job(void *ctx, _mali_uk_pp_and_gp_start_job_s *uargs); ++void kbasep_js_release_privileged_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); + -+/** @brief Returns the number of Fragment Processors in the system ++/** ++ * @brief Try to submit the next job on each slot + * -+ * @param args see _mali_uk_get_pp_number_of_cores_s in "mali_utgard_uk_types.h" -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ * The following locks may be used: ++ * - kbasep_js_device_data::runpool_mutex ++ * - hwaccess_lock + */ -+_mali_osk_errcode_t _mali_ukk_get_pp_number_of_cores(_mali_uk_get_pp_number_of_cores_s *args); ++void kbase_js_try_run_jobs(struct kbase_device *kbdev); + -+/** @brief Returns the version that all Fragment Processor cores are compatible with. ++/** ++ * @brief Suspend the job scheduler during a Power Management Suspend event. + * -+ * This function may only be called when _mali_ukk_get_pp_number_of_cores() indicated at least one Fragment -+ * Processor core is available. ++ * Causes all contexts to be removed from the runpool, and prevents any ++ * contexts from (re)entering the runpool. + * -+ * @param args see _mali_uk_get_pp_core_version_s in "mali_utgard_uk_types.h" -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ * This does not handle suspending the one privileged context: the caller must ++ * instead do this by by suspending the GPU HW Counter Instrumentation. ++ * ++ * This will eventually cause all Power Management active references held by ++ * contexts on the runpool to be released, without running any more atoms. ++ * ++ * The caller must then wait for all Power Mangement active refcount to become ++ * zero before completing the suspend. ++ * ++ * The emptying mechanism may take some time to complete, since it can wait for ++ * jobs to complete naturally instead of forcing them to end quickly. However, ++ * this is bounded by the Job Scheduler's Job Timeouts. Hence, this ++ * function is guaranteed to complete in a finite time. + */ -+_mali_osk_errcode_t _mali_ukk_get_pp_core_version(_mali_uk_get_pp_core_version_s *args); ++void kbasep_js_suspend(struct kbase_device *kbdev); + -+/** @brief Disable Write-back unit(s) on specified job ++/** ++ * @brief Resume the Job Scheduler after a Power Management Resume event. + * -+ * @param args see _mali_uk_get_pp_core_version_s in "mali_utgard_uk_types.h" ++ * This restores the actions from kbasep_js_suspend(): ++ * - Schedules contexts back into the runpool ++ * - Resumes running atoms on the GPU + */ -+void _mali_ukk_pp_job_disable_wb(_mali_uk_pp_disable_wb_s *args); -+ -+ -+/** @} */ /* end group _mali_uk_pp */ ++void kbasep_js_resume(struct kbase_device *kbdev); + ++/** ++ * @brief Submit an atom to the job scheduler. ++ * ++ * The atom is enqueued on the context's ringbuffer. The caller must have ++ * ensured that all dependencies can be represented in the ringbuffer. ++ * ++ * Caller must hold jctx->lock ++ * ++ * @param[in] kctx Context pointer ++ * @param[in] atom Pointer to the atom to submit ++ * ++ * @return Whether the context requires to be enqueued. */ ++bool kbase_js_dep_resolved_submit(struct kbase_context *kctx, ++ struct kbase_jd_atom *katom); + -+/** @addtogroup _mali_uk_gp U/K Vertex Processor ++/** ++ * jsctx_ll_flush_to_rb() - Pushes atoms from the linked list to ringbuffer. ++ * @kctx: Context Pointer ++ * @prio: Priority (specifies the queue together with js). ++ * @js: Job slot (specifies the queue together with prio). ++ * ++ * Pushes all possible atoms from the linked list to the ringbuffer. ++ * Number of atoms are limited to free space in the ringbuffer and ++ * number of available atoms in the linked list. ++ * ++ */ ++void jsctx_ll_flush_to_rb(struct kbase_context *kctx, int prio, int js); ++/** ++ * @brief Pull an atom from a context in the job scheduler for execution. + * -+ * The Vertex Processor (aka GP (Geometry Processor)) functions provide the following functionality: -+ * - retrieving version of the Vertex Processors -+ * - determine number of Vertex Processors available -+ * - starting a job on a Vertex Processor ++ * The atom will not be removed from the ringbuffer at this stage. + * -+ * @{ */ ++ * The HW access lock must be held when calling this function. ++ * ++ * @param[in] kctx Context to pull from ++ * @param[in] js Job slot to pull from ++ * @return Pointer to an atom, or NULL if there are no atoms for this ++ * slot that can be currently run. ++ */ ++struct kbase_jd_atom *kbase_js_pull(struct kbase_context *kctx, int js); + -+/** @brief Issue a request to start a new job on a Vertex Processor. ++/** ++ * @brief Return an atom to the job scheduler ringbuffer. + * -+ * If the request fails args->status is set to _MALI_UK_START_JOB_NOT_STARTED_DO_REQUEUE and you can -+ * try to start the job again. ++ * An atom is 'unpulled' if execution is stopped but intended to be returned to ++ * later. The most common reason for this is that the atom has been ++ * soft-stopped. + * -+ * An existing job could be returned for requeueing if the new job has a higher priority than a previously started job -+ * which the hardware hasn't actually started processing yet. In this case the new job will be started and the -+ * existing one returned, otherwise the new job is started and the status field args->status is set to -+ * _MALI_UK_START_JOB_STARTED. ++ * Note that if multiple atoms are to be 'unpulled', they must be returned in ++ * the reverse order to which they were originally pulled. It is a programming ++ * error to return atoms in any other order. + * -+ * Job completion can be awaited with _mali_ukk_wait_for_notification(). ++ * The HW access lock must be held when calling this function. + * -+ * @param ctx user-kernel context (mali_session) -+ * @param uargs see _mali_uk_gp_start_job_s in "mali_utgard_uk_types.h". Use _mali_osk_copy_from_user to retrieve data! -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ * @param[in] kctx Context pointer ++ * @param[in] atom Pointer to the atom to unpull + */ -+_mali_osk_errcode_t _mali_ukk_gp_start_job(void *ctx, _mali_uk_gp_start_job_s *uargs); ++void kbase_js_unpull(struct kbase_context *kctx, struct kbase_jd_atom *katom); + -+/** @brief Returns the number of Vertex Processors in the system. ++/** ++ * @brief Complete an atom from jd_done_worker(), removing it from the job ++ * scheduler ringbuffer. + * -+ * @param args see _mali_uk_get_gp_number_of_cores_s in "mali_utgard_uk_types.h" -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ * If the atom failed then all dependee atoms marked for failure propagation ++ * will also fail. ++ * ++ * @param[in] kctx Context pointer ++ * @param[in] katom Pointer to the atom to complete ++ * @return true if the context is now idle (no jobs pulled) ++ * false otherwise + */ -+_mali_osk_errcode_t _mali_ukk_get_gp_number_of_cores(_mali_uk_get_gp_number_of_cores_s *args); ++bool kbase_js_complete_atom_wq(struct kbase_context *kctx, ++ struct kbase_jd_atom *katom); + -+/** @brief Returns the version that all Vertex Processor cores are compatible with. ++/** ++ * @brief Complete an atom. + * -+ * This function may only be called when _mali_uk_get_gp_number_of_cores() indicated at least one Vertex -+ * Processor core is available. ++ * Most of the work required to complete an atom will be performed by ++ * jd_done_worker(). + * -+ * @param args see _mali_uk_get_gp_core_version_s in "mali_utgard_uk_types.h" -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ * The HW access lock must be held when calling this function. ++ * ++ * @param[in] katom Pointer to the atom to complete ++ * @param[in] end_timestamp The time that the atom completed (may be NULL) ++ * ++ * Return: Atom that has now been unblocked and can now be run, or NULL if none + */ -+_mali_osk_errcode_t _mali_ukk_get_gp_core_version(_mali_uk_get_gp_core_version_s *args); ++struct kbase_jd_atom *kbase_js_complete_atom(struct kbase_jd_atom *katom, ++ ktime_t *end_timestamp); + -+/** @brief Resume or abort suspended Vertex Processor jobs. ++/** ++ * @brief Submit atoms from all available contexts. + * -+ * After receiving notification that a Vertex Processor job was suspended from -+ * _mali_ukk_wait_for_notification() you can use this function to resume or abort the job. ++ * This will attempt to submit as many jobs as possible to the provided job ++ * slots. It will exit when either all job slots are full, or all contexts have ++ * been used. + * -+ * @param args see _mali_uk_gp_suspend_response_s in "mali_utgard_uk_types.h" -+ * @return _MALI_OSK_ERR_OK on success, otherwise a suitable _mali_osk_errcode_t on failure. ++ * @param[in] kbdev Device pointer ++ * @param[in] js_mask Mask of job slots to submit to + */ -+_mali_osk_errcode_t _mali_ukk_gp_suspend_response(_mali_uk_gp_suspend_response_s *args); -+ -+/** @} */ /* end group _mali_uk_gp */ -+ -+#if defined(CONFIG_MALI400_PROFILING) -+/** @addtogroup _mali_uk_profiling U/K Timeline profiling module -+ * @{ */ ++void kbase_js_sched(struct kbase_device *kbdev, int js_mask); + -+/** @brief Add event to profiling buffer. ++/** ++ * kbase_jd_zap_context - Attempt to deschedule a context that is being ++ * destroyed ++ * @kctx: Context pointer + * -+ * @param args see _mali_uk_profiling_add_event_s in "mali_utgard_uk_types.h" ++ * This will attempt to remove a context from any internal job scheduler queues ++ * and perform any other actions to ensure a context will not be submitted ++ * from. ++ * ++ * If the context is currently scheduled, then the caller must wait for all ++ * pending jobs to complete before taking any further action. + */ -+_mali_osk_errcode_t _mali_ukk_profiling_add_event(_mali_uk_profiling_add_event_s *args); ++void kbase_js_zap_context(struct kbase_context *kctx); + -+/** @brief Get profiling stream fd. ++/** ++ * @brief Validate an atom + * -+ * @param args see _mali_uk_profiling_stream_fd_get_s in "mali_utgard_uk_types.h" ++ * This will determine whether the atom can be scheduled onto the GPU. Atoms ++ * with invalid combinations of core requirements will be rejected. ++ * ++ * @param[in] kbdev Device pointer ++ * @param[in] katom Atom to validate ++ * @return true if atom is valid ++ * false otherwise + */ -+_mali_osk_errcode_t _mali_ukk_profiling_stream_fd_get(_mali_uk_profiling_stream_fd_get_s *args); ++bool kbase_js_is_atom_valid(struct kbase_device *kbdev, ++ struct kbase_jd_atom *katom); + -+/** @brief Profiling control set. ++/** ++ * kbase_js_set_timeouts - update all JS timeouts with user specified data ++ * @kbdev: Device pointer + * -+ * @param args see _mali_uk_profiling_control_set_s in "mali_utgard_uk_types.h" ++ * Timeouts are specified through the 'js_timeouts' sysfs file. If a timeout is ++ * set to a positive number then that becomes the new value used, if a timeout ++ * is negative then the default is set. + */ -+_mali_osk_errcode_t _mali_ukk_profiling_control_set(_mali_uk_profiling_control_set_s *args); -+ -+/** @} */ /* end group _mali_uk_profiling */ -+#endif ++void kbase_js_set_timeouts(struct kbase_device *kbdev); + -+/** @addtogroup _mali_uk_vsync U/K VSYNC reporting module -+ * @{ */ ++/* ++ * Helpers follow ++ */ + -+/** @brief Report events related to vsync. ++/** ++ * @brief Check that a context is allowed to submit jobs on this policy + * -+ * @note Events should be reported when starting to wait for vsync and when the -+ * waiting is finished. This information can then be used in kernel space to -+ * complement the GPU utilization metric. ++ * The purpose of this abstraction is to hide the underlying data size, and wrap up ++ * the long repeated line of code. + * -+ * @param args see _mali_uk_vsync_event_report_s in "mali_utgard_uk_types.h" ++ * As with any bool, never test the return value with true. ++ * ++ * The caller must hold hwaccess_lock. + */ -+_mali_osk_errcode_t _mali_ukk_vsync_event_report(_mali_uk_vsync_event_report_s *args); ++static inline bool kbasep_js_is_submit_allowed(struct kbasep_js_device_data *js_devdata, struct kbase_context *kctx) ++{ ++ u16 test_bit; + -+/** @} */ /* end group _mali_uk_vsync */ ++ /* Ensure context really is scheduled in */ ++ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); ++ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); + -+/** @addtogroup _mali_sw_counters_report U/K Software counter reporting -+ * @{ */ ++ test_bit = (u16) (1u << kctx->as_nr); + -+/** @brief Report software counters. ++ return (bool) (js_devdata->runpool_irq.submit_allowed & test_bit); ++} ++ ++/** ++ * @brief Allow a context to submit jobs on this policy + * -+ * @param args see _mali_uk_sw_counters_report_s in "mali_uk_types.h" ++ * The purpose of this abstraction is to hide the underlying data size, and wrap up ++ * the long repeated line of code. ++ * ++ * The caller must hold hwaccess_lock. + */ -+_mali_osk_errcode_t _mali_ukk_sw_counters_report(_mali_uk_sw_counters_report_s *args); ++static inline void kbasep_js_set_submit_allowed(struct kbasep_js_device_data *js_devdata, struct kbase_context *kctx) ++{ ++ u16 set_bit; + -+/** @} */ /* end group _mali_sw_counters_report */ ++ /* Ensure context really is scheduled in */ ++ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); ++ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); + -+/** @} */ /* end group u_k_api */ ++ set_bit = (u16) (1u << kctx->as_nr); + -+/** @} */ /* end group uddapi */ ++ dev_dbg(kctx->kbdev->dev, "JS: Setting Submit Allowed on %p (as=%d)", kctx, kctx->as_nr); + -+u32 _mali_ukk_report_memory_usage(void); ++ js_devdata->runpool_irq.submit_allowed |= set_bit; ++} + -+u32 _mali_ukk_report_total_memory_size(void); ++/** ++ * @brief Prevent a context from submitting more jobs on this policy ++ * ++ * The purpose of this abstraction is to hide the underlying data size, and wrap up ++ * the long repeated line of code. ++ * ++ * The caller must hold hwaccess_lock. ++ */ ++static inline void kbasep_js_clear_submit_allowed(struct kbasep_js_device_data *js_devdata, struct kbase_context *kctx) ++{ ++ u16 clear_bit; ++ u16 clear_mask; + -+u32 _mali_ukk_utilization_gp_pp(void); ++ /* Ensure context really is scheduled in */ ++ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); ++ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); + -+u32 _mali_ukk_utilization_gp(void); ++ clear_bit = (u16) (1u << kctx->as_nr); ++ clear_mask = ~clear_bit; + -+u32 _mali_ukk_utilization_pp(void); ++ dev_dbg(kctx->kbdev->dev, "JS: Clearing Submit Allowed on %p (as=%d)", kctx, kctx->as_nr); + -+#ifdef __cplusplus ++ js_devdata->runpool_irq.submit_allowed &= clear_mask; +} -+#endif + -+#endif /* __MALI_UKK_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c -new file mode 100755 -index 000000000000..1911eff87a72 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c -@@ -0,0 +1,147 @@ +/** -+ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * @brief Manage the 'retry_submit_on_slot' part of a kbase_jd_atom + */ ++static inline void kbasep_js_clear_job_retry_submit(struct kbase_jd_atom *atom) ++{ ++ atom->retry_submit_on_slot = KBASEP_JS_RETRY_SUBMIT_SLOT_INVALID; ++} + -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_ukk.h" -+#include "mali_uk_types.h" -+#include "mali_user_settings_db.h" -+#include "mali_session.h" ++/** ++ * Mark a slot as requiring resubmission by carrying that information on a ++ * completing atom. ++ * ++ * @note This can ASSERT in debug builds if the submit slot has been set to ++ * something other than the current value for @a js. This is because you might ++ * be unintentionally stopping more jobs being submitted on the old submit ++ * slot, and that might cause a scheduling-hang. ++ * ++ * @note If you can guarantee that the atoms for the original slot will be ++ * submitted on some other slot, then call kbasep_js_clear_job_retry_submit() ++ * first to silence the ASSERT. ++ */ ++static inline void kbasep_js_set_job_retry_submit_slot(struct kbase_jd_atom *atom, int js) ++{ ++ KBASE_DEBUG_ASSERT(0 <= js && js <= BASE_JM_MAX_NR_SLOTS); ++ KBASE_DEBUG_ASSERT((atom->retry_submit_on_slot == ++ KBASEP_JS_RETRY_SUBMIT_SLOT_INVALID) ++ || (atom->retry_submit_on_slot == js)); + -+static u32 mali_user_settings[_MALI_UK_USER_SETTING_MAX]; -+const char *_mali_uk_user_setting_descriptions[] = _MALI_UK_USER_SETTING_DESCRIPTIONS; ++ atom->retry_submit_on_slot = js; ++} + -+static void mali_user_settings_notify(_mali_uk_user_setting_t setting, u32 value) ++/** ++ * Create an initial 'invalid' atom retained state, that requires no ++ * atom-related work to be done on releasing with ++ * kbasep_js_runpool_release_ctx_and_katom_retained_state() ++ */ ++static inline void kbasep_js_atom_retained_state_init_invalid(struct kbasep_js_atom_retained_state *retained_state) +{ -+ mali_bool done = MALI_FALSE; -+ -+ /* -+ * This function gets a bit complicated because we can't hold the session lock while -+ * allocating notification objects. -+ */ ++ retained_state->event_code = BASE_JD_EVENT_NOT_STARTED; ++ retained_state->core_req = KBASEP_JS_ATOM_RETAINED_STATE_CORE_REQ_INVALID; ++ retained_state->retry_submit_on_slot = KBASEP_JS_RETRY_SUBMIT_SLOT_INVALID; ++} + -+ while (!done) { -+ u32 i; -+ u32 num_sessions_alloc; -+ u32 num_sessions_with_lock; -+ u32 used_notification_objects = 0; -+ _mali_osk_notification_t **notobjs; ++/** ++ * Copy atom state that can be made available after jd_done_nolock() is called ++ * on that atom. ++ */ ++static inline void kbasep_js_atom_retained_state_copy(struct kbasep_js_atom_retained_state *retained_state, const struct kbase_jd_atom *katom) ++{ ++ retained_state->event_code = katom->event_code; ++ retained_state->core_req = katom->core_req; ++ retained_state->retry_submit_on_slot = katom->retry_submit_on_slot; ++ retained_state->sched_priority = katom->sched_priority; ++ retained_state->device_nr = katom->device_nr; ++} + -+ /* Pre allocate the number of notifications objects we need right now (might change after lock has been taken) */ -+ num_sessions_alloc = mali_session_get_count(); -+ if (0 == num_sessions_alloc) { -+ /* No sessions to report to */ -+ return; -+ } -+ -+ notobjs = (_mali_osk_notification_t **)_mali_osk_malloc(sizeof(_mali_osk_notification_t *) * num_sessions_alloc); -+ if (NULL == notobjs) { -+ MALI_PRINT_ERROR(("Failed to notify user space session about num PP core change (alloc failure)\n")); -+ return; -+ } -+ -+ for (i = 0; i < num_sessions_alloc; i++) { -+ notobjs[i] = _mali_osk_notification_create(_MALI_NOTIFICATION_SETTINGS_CHANGED, -+ sizeof(_mali_uk_settings_changed_s)); -+ if (NULL != notobjs[i]) { -+ _mali_uk_settings_changed_s *data; -+ data = notobjs[i]->result_buffer; ++/** ++ * @brief Determine whether an atom has finished (given its retained state), ++ * and so should be given back to userspace/removed from the system. ++ * ++ * Reasons for an atom not finishing include: ++ * - Being soft-stopped (and so, the atom should be resubmitted sometime later) ++ * ++ * @param[in] katom_retained_state the retained state of the atom to check ++ * @return false if the atom has not finished ++ * @return !=false if the atom has finished ++ */ ++static inline bool kbasep_js_has_atom_finished(const struct kbasep_js_atom_retained_state *katom_retained_state) ++{ ++ return (bool) (katom_retained_state->event_code != BASE_JD_EVENT_STOPPED && katom_retained_state->event_code != BASE_JD_EVENT_REMOVED_FROM_NEXT); ++} + -+ data->setting = setting; -+ data->value = value; -+ } else { -+ MALI_PRINT_ERROR(("Failed to notify user space session about setting change (alloc failure %u)\n", i)); -+ } -+ } ++/** ++ * @brief Determine whether a struct kbasep_js_atom_retained_state is valid ++ * ++ * An invalid struct kbasep_js_atom_retained_state is allowed, and indicates that the ++ * code should just ignore it. ++ * ++ * @param[in] katom_retained_state the atom's retained state to check ++ * @return false if the retained state is invalid, and can be ignored ++ * @return !=false if the retained state is valid ++ */ ++static inline bool kbasep_js_atom_retained_state_is_valid(const struct kbasep_js_atom_retained_state *katom_retained_state) ++{ ++ return (bool) (katom_retained_state->core_req != KBASEP_JS_ATOM_RETAINED_STATE_CORE_REQ_INVALID); ++} + -+ mali_session_lock(); ++static inline bool kbasep_js_get_atom_retry_submit_slot(const struct kbasep_js_atom_retained_state *katom_retained_state, int *res) ++{ ++ int js = katom_retained_state->retry_submit_on_slot; + -+ /* number of sessions will not change while we hold the lock */ -+ num_sessions_with_lock = mali_session_get_count(); ++ *res = js; ++ return (bool) (js >= 0); ++} + -+ if (num_sessions_alloc >= num_sessions_with_lock) { -+ /* We have allocated enough notification objects for all the sessions atm */ -+ struct mali_session_data *session, *tmp; -+ MALI_SESSION_FOREACH(session, tmp, link) { -+ MALI_DEBUG_ASSERT(used_notification_objects < num_sessions_alloc); -+ if (NULL != notobjs[used_notification_objects]) { -+ mali_session_send_notification(session, notobjs[used_notification_objects]); -+ notobjs[used_notification_objects] = NULL; /* Don't track this notification object any more */ -+ } -+ used_notification_objects++; -+ } -+ done = MALI_TRUE; -+ } ++/** ++ * @brief Variant of kbasep_js_runpool_lookup_ctx() that can be used when the ++ * context is guaranteed to be already previously retained. ++ * ++ * It is a programming error to supply the \a as_nr of a context that has not ++ * been previously retained/has a busy refcount of zero. The only exception is ++ * when there is no ctx in \a as_nr (NULL returned). ++ * ++ * The following locking conditions are made on the caller: ++ * - it must \em not hold the hwaccess_lock, because it will be used internally. ++ * ++ * @return a valid struct kbase_context on success, with a refcount that is guaranteed ++ * to be non-zero and unmodified by this function. ++ * @return NULL on failure, indicating that no context was found in \a as_nr ++ */ ++static inline struct kbase_context *kbasep_js_runpool_lookup_ctx_noretain(struct kbase_device *kbdev, int as_nr) ++{ ++ struct kbase_context *found_kctx; + -+ mali_session_unlock(); ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(0 <= as_nr && as_nr < BASE_MAX_NR_AS); + -+ /* Delete any remaining/unused notification objects */ -+ for (; used_notification_objects < num_sessions_alloc; used_notification_objects++) { -+ if (NULL != notobjs[used_notification_objects]) { -+ _mali_osk_notification_delete(notobjs[used_notification_objects]); -+ } -+ } ++ found_kctx = kbdev->as_to_kctx[as_nr]; ++ KBASE_DEBUG_ASSERT(found_kctx == NULL || ++ atomic_read(&found_kctx->refcount) > 0); + -+ _mali_osk_free(notobjs); -+ } ++ return found_kctx; +} + -+void mali_set_user_setting(_mali_uk_user_setting_t setting, u32 value) ++/* ++ * The following locking conditions are made on the caller: ++ * - The caller must hold the kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * - The caller must hold the kbasep_js_device_data::runpool_mutex ++ */ ++static inline void kbase_js_runpool_inc_context_count( ++ struct kbase_device *kbdev, ++ struct kbase_context *kctx) +{ -+ mali_bool notify = MALI_FALSE; ++ struct kbasep_js_device_data *js_devdata; ++ struct kbasep_js_kctx_info *js_kctx_info; + -+ if (setting >= _MALI_UK_USER_SETTING_MAX) { -+ MALI_DEBUG_PRINT_ERROR(("Invalid user setting %ud\n")); -+ return; -+ } ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); + -+ if (mali_user_settings[setting] != value) { -+ notify = MALI_TRUE; -+ } ++ js_devdata = &kbdev->js_data; ++ js_kctx_info = &kctx->jctx.sched_info; + -+ mali_user_settings[setting] = value; ++ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); ++ lockdep_assert_held(&js_devdata->runpool_mutex); + -+ if (notify) { -+ mali_user_settings_notify(setting, value); ++ /* Track total contexts */ ++ KBASE_DEBUG_ASSERT(js_devdata->nr_all_contexts_running < S8_MAX); ++ ++(js_devdata->nr_all_contexts_running); ++ ++ if (!kbase_ctx_flag(kctx, KCTX_SUBMIT_DISABLED)) { ++ /* Track contexts that can submit jobs */ ++ KBASE_DEBUG_ASSERT(js_devdata->nr_user_contexts_running < ++ S8_MAX); ++ ++(js_devdata->nr_user_contexts_running); + } +} + -+u32 mali_get_user_setting(_mali_uk_user_setting_t setting) ++/* ++ * The following locking conditions are made on the caller: ++ * - The caller must hold the kbasep_js_kctx_info::ctx::jsctx_mutex. ++ * - The caller must hold the kbasep_js_device_data::runpool_mutex ++ */ ++static inline void kbase_js_runpool_dec_context_count( ++ struct kbase_device *kbdev, ++ struct kbase_context *kctx) +{ -+ if (setting >= _MALI_UK_USER_SETTING_MAX) { -+ return 0; -+ } ++ struct kbasep_js_device_data *js_devdata; ++ struct kbasep_js_kctx_info *js_kctx_info; + -+ return mali_user_settings[setting]; -+} ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); + -+_mali_osk_errcode_t _mali_ukk_get_user_setting(_mali_uk_get_user_setting_s *args) -+{ -+ _mali_uk_user_setting_t setting; -+ MALI_DEBUG_ASSERT_POINTER(args); ++ js_devdata = &kbdev->js_data; ++ js_kctx_info = &kctx->jctx.sched_info; + -+ setting = args->setting; ++ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); ++ lockdep_assert_held(&js_devdata->runpool_mutex); + -+ if (_MALI_UK_USER_SETTING_MAX > setting) { -+ args->value = mali_user_settings[setting]; -+ return _MALI_OSK_ERR_OK; -+ } else { -+ return _MALI_OSK_ERR_INVALID_ARGS; ++ /* Track total contexts */ ++ --(js_devdata->nr_all_contexts_running); ++ KBASE_DEBUG_ASSERT(js_devdata->nr_all_contexts_running >= 0); ++ ++ if (!kbase_ctx_flag(kctx, KCTX_SUBMIT_DISABLED)) { ++ /* Track contexts that can submit jobs */ ++ --(js_devdata->nr_user_contexts_running); ++ KBASE_DEBUG_ASSERT(js_devdata->nr_user_contexts_running >= 0); + } +} + -+_mali_osk_errcode_t _mali_ukk_get_user_settings(_mali_uk_get_user_settings_s *args) -+{ -+ MALI_DEBUG_ASSERT_POINTER(args); -+ -+ _mali_osk_memcpy(args->settings, mali_user_settings, sizeof(mali_user_settings)); + -+ return _MALI_OSK_ERR_OK; -+} -diff --git a/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h -new file mode 100755 -index 000000000000..da9c0630e371 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h -@@ -0,0 +1,39 @@ +/** -+ * Copyright (C) 2012-2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * @brief Submit atoms from all available contexts to all job slots. ++ * ++ * This will attempt to submit as many jobs as possible. It will exit when ++ * either all job slots are full, or all contexts have been used. ++ * ++ * @param[in] kbdev Device pointer + */ ++static inline void kbase_js_sched_all(struct kbase_device *kbdev) ++{ ++ kbase_js_sched(kbdev, (1 << kbdev->gpu_props.num_job_slots) - 1); ++} + -+#ifndef __MALI_USER_SETTINGS_DB_H__ -+#define __MALI_USER_SETTINGS_DB_H__ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif ++extern const int ++kbasep_js_atom_priority_to_relative[BASE_JD_NR_PRIO_LEVELS]; + -+#include "mali_uk_types.h" ++extern const base_jd_prio ++kbasep_js_relative_priority_to_atom[KBASE_JS_ATOM_SCHED_PRIO_COUNT]; + -+/** @brief Set Mali user setting in DB ++/** ++ * kbasep_js_atom_prio_to_sched_prio(): - Convert atom priority (base_jd_prio) ++ * to relative ordering ++ * @atom_prio: Priority ID to translate. + * -+ * Update the DB with a new value for \a setting. If the value is different from theprevious set value running sessions will be notified of the change. ++ * Atom priority values for @ref base_jd_prio cannot be compared directly to ++ * find out which are higher or lower. + * -+ * @param setting the setting to be changed -+ * @param value the new value to set -+ */ -+void mali_set_user_setting(_mali_uk_user_setting_t setting, u32 value); -+ -+/** @brief Get current Mali user setting value from DB ++ * This function will convert base_jd_prio values for successively lower ++ * priorities into a monotonically increasing sequence. That is, the lower the ++ * base_jd_prio priority, the higher the value produced by this function. This ++ * is in accordance with how the rest of the kernel treates priority. + * -+ * @param setting the setting to extract -+ * @return the value of the selected setting ++ * The mapping is 1:1 and the size of the valid input range is the same as the ++ * size of the valid output range, i.e. ++ * KBASE_JS_ATOM_SCHED_PRIO_COUNT == BASE_JD_NR_PRIO_LEVELS ++ * ++ * Note This must be kept in sync with BASE_JD_PRIO_<...> definitions ++ * ++ * Return: On success: a value in the inclusive range ++ * 0..KBASE_JS_ATOM_SCHED_PRIO_COUNT-1. On failure: ++ * KBASE_JS_ATOM_SCHED_PRIO_INVALID + */ -+u32 mali_get_user_setting(_mali_uk_user_setting_t setting); ++static inline int kbasep_js_atom_prio_to_sched_prio(base_jd_prio atom_prio) ++{ ++ if (atom_prio >= BASE_JD_NR_PRIO_LEVELS) ++ return KBASE_JS_ATOM_SCHED_PRIO_INVALID; + -+#ifdef __cplusplus ++ return kbasep_js_atom_priority_to_relative[atom_prio]; +} -+#endif -+#endif /* __MALI_KERNEL_USER_SETTING__ */ -diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h -new file mode 100755 -index 000000000000..7df55c951d6f ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h -@@ -0,0 +1,526 @@ -+/* -+ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+/** -+ * @file mali_utgard.h -+ * Defines types and interface exposed by the Mali Utgard device driver -+ */ -+ -+#ifndef __MALI_UTGARD_H__ -+#define __MALI_UTGARD_H__ -+ -+#include "mali_osk_types.h" -+#ifdef CONFIG_MALI_DEVFREQ -+#include -+#include "mali_pm_metrics.h" -+#ifdef CONFIG_DEVFREQ_THERMAL -+#include -+#endif -+#endif -+ -+#define MALI_GPU_NAME_UTGARD "mali-utgard" + ++static inline base_jd_prio kbasep_js_sched_prio_to_atom_prio(int sched_prio) ++{ ++ unsigned int prio_idx; + -+#define MALI_OFFSET_GP 0x00000 -+#define MALI_OFFSET_GP_MMU 0x03000 ++ KBASE_DEBUG_ASSERT(0 <= sched_prio ++ && sched_prio < KBASE_JS_ATOM_SCHED_PRIO_COUNT); + -+#define MALI_OFFSET_PP0 0x08000 -+#define MALI_OFFSET_PP0_MMU 0x04000 -+#define MALI_OFFSET_PP1 0x0A000 -+#define MALI_OFFSET_PP1_MMU 0x05000 -+#define MALI_OFFSET_PP2 0x0C000 -+#define MALI_OFFSET_PP2_MMU 0x06000 -+#define MALI_OFFSET_PP3 0x0E000 -+#define MALI_OFFSET_PP3_MMU 0x07000 ++ prio_idx = (unsigned int)sched_prio; + -+#define MALI_OFFSET_PP4 0x28000 -+#define MALI_OFFSET_PP4_MMU 0x1C000 -+#define MALI_OFFSET_PP5 0x2A000 -+#define MALI_OFFSET_PP5_MMU 0x1D000 -+#define MALI_OFFSET_PP6 0x2C000 -+#define MALI_OFFSET_PP6_MMU 0x1E000 -+#define MALI_OFFSET_PP7 0x2E000 -+#define MALI_OFFSET_PP7_MMU 0x1F000 ++ return kbasep_js_relative_priority_to_atom[prio_idx]; ++} + -+#define MALI_OFFSET_L2_RESOURCE0 0x01000 -+#define MALI_OFFSET_L2_RESOURCE1 0x10000 -+#define MALI_OFFSET_L2_RESOURCE2 0x11000 ++ /** @} *//* end group kbase_js */ ++ /** @} *//* end group base_kbase_api */ ++ /** @} *//* end group base_api */ + -+#define MALI400_OFFSET_L2_CACHE0 MALI_OFFSET_L2_RESOURCE0 -+#define MALI450_OFFSET_L2_CACHE0 MALI_OFFSET_L2_RESOURCE1 -+#define MALI450_OFFSET_L2_CACHE1 MALI_OFFSET_L2_RESOURCE0 -+#define MALI450_OFFSET_L2_CACHE2 MALI_OFFSET_L2_RESOURCE2 -+#define MALI470_OFFSET_L2_CACHE1 MALI_OFFSET_L2_RESOURCE0 ++#endif /* _KBASE_JS_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c +new file mode 100755 +index 000000000..321506ada +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c +@@ -0,0 +1,301 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+#define MALI_OFFSET_BCAST 0x13000 -+#define MALI_OFFSET_DLBU 0x14000 + -+#define MALI_OFFSET_PP_BCAST 0x16000 -+#define MALI_OFFSET_PP_BCAST_MMU 0x15000 + -+#define MALI_OFFSET_PMU 0x02000 -+#define MALI_OFFSET_DMA 0x12000 + -+/* Mali-300 */ ++#include ++#include + -+#define MALI_GPU_RESOURCES_MALI300(base_addr, gp_irq, gp_mmu_irq, pp_irq, pp_mmu_irq) \ -+ MALI_GPU_RESOURCES_MALI400_MP1(base_addr, gp_irq, gp_mmu_irq, pp_irq, pp_mmu_irq) ++/* ++ * Private functions follow ++ */ + -+#define MALI_GPU_RESOURCES_MALI300_PMU(base_addr, gp_irq, gp_mmu_irq, pp_irq, pp_mmu_irq) \ -+ MALI_GPU_RESOURCES_MALI400_MP1_PMU(base_addr, gp_irq, gp_mmu_irq, pp_irq, pp_mmu_irq) ++/** ++ * @brief Check whether a ctx has a certain attribute, and if so, retain that ++ * attribute on the runpool. ++ * ++ * Requires: ++ * - jsctx mutex ++ * - runpool_irq spinlock ++ * - ctx is scheduled on the runpool ++ * ++ * @return true indicates a change in ctx attributes state of the runpool. ++ * In this state, the scheduler might be able to submit more jobs than ++ * previously, and so the caller should ensure kbasep_js_try_run_next_job_nolock() ++ * or similar is called sometime later. ++ * @return false indicates no change in ctx attributes state of the runpool. ++ */ ++static bool kbasep_js_ctx_attr_runpool_retain_attr(struct kbase_device *kbdev, struct kbase_context *kctx, enum kbasep_js_ctx_attr attribute) ++{ ++ struct kbasep_js_device_data *js_devdata; ++ struct kbasep_js_kctx_info *js_kctx_info; ++ bool runpool_state_changed = false; + -+/* Mali-400 */ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(attribute < KBASEP_JS_CTX_ATTR_COUNT); ++ js_devdata = &kbdev->js_data; ++ js_kctx_info = &kctx->jctx.sched_info; + -+#define MALI_GPU_RESOURCES_MALI400_MP1(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI400_OFFSET_L2_CACHE0) \ -+ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) ++ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+#define MALI_GPU_RESOURCES_MALI400_MP1_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCES_MALI400_MP1(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) ++ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); + -+#define MALI_GPU_RESOURCES_MALI400_MP2(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI400_OFFSET_L2_CACHE0) \ -+ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) ++ if (kbasep_js_ctx_attr_is_attr_on_ctx(kctx, attribute) != false) { ++ KBASE_DEBUG_ASSERT(js_devdata->runpool_irq.ctx_attr_ref_count[attribute] < S8_MAX); ++ ++(js_devdata->runpool_irq.ctx_attr_ref_count[attribute]); + -+#define MALI_GPU_RESOURCES_MALI400_MP2_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq) \ -+ MALI_GPU_RESOURCES_MALI400_MP2(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq) \ -+ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) ++ if (js_devdata->runpool_irq.ctx_attr_ref_count[attribute] == 1) { ++ /* First refcount indicates a state change */ ++ runpool_state_changed = true; ++ KBASE_TRACE_ADD(kbdev, JS_CTX_ATTR_NOW_ON_RUNPOOL, kctx, NULL, 0u, attribute); ++ } ++ } + -+#define MALI_GPU_RESOURCES_MALI400_MP3(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI400_OFFSET_L2_CACHE0) \ -+ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) ++ return runpool_state_changed; ++} + -+#define MALI_GPU_RESOURCES_MALI400_MP3_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq) \ -+ MALI_GPU_RESOURCES_MALI400_MP3(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq) \ -+ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) ++/** ++ * @brief Check whether a ctx has a certain attribute, and if so, release that ++ * attribute on the runpool. ++ * ++ * Requires: ++ * - jsctx mutex ++ * - runpool_irq spinlock ++ * - ctx is scheduled on the runpool ++ * ++ * @return true indicates a change in ctx attributes state of the runpool. ++ * In this state, the scheduler might be able to submit more jobs than ++ * previously, and so the caller should ensure kbasep_js_try_run_next_job_nolock() ++ * or similar is called sometime later. ++ * @return false indicates no change in ctx attributes state of the runpool. ++ */ ++static bool kbasep_js_ctx_attr_runpool_release_attr(struct kbase_device *kbdev, struct kbase_context *kctx, enum kbasep_js_ctx_attr attribute) ++{ ++ struct kbasep_js_device_data *js_devdata; ++ struct kbasep_js_kctx_info *js_kctx_info; ++ bool runpool_state_changed = false; + -+#define MALI_GPU_RESOURCES_MALI400_MP4(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI400_OFFSET_L2_CACHE0) \ -+ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(3, base_addr + MALI_OFFSET_PP3, pp3_irq, base_addr + MALI_OFFSET_PP3_MMU, pp3_mmu_irq) ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(attribute < KBASEP_JS_CTX_ATTR_COUNT); ++ js_devdata = &kbdev->js_data; ++ js_kctx_info = &kctx->jctx.sched_info; + -+#define MALI_GPU_RESOURCES_MALI400_MP4_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq) \ -+ MALI_GPU_RESOURCES_MALI400_MP4(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq) \ -+ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ ++ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ KBASE_DEBUG_ASSERT(kbase_ctx_flag(kctx, KCTX_SCHEDULED)); + -+ /* Mali-450 */ -+#define MALI_GPU_RESOURCES_MALI450_MP2(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE0) \ -+ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE1) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ -+ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ -+ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ -+ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) \ -+ MALI_GPU_RESOURCE_DMA(base_addr + MALI_OFFSET_DMA) ++ if (kbasep_js_ctx_attr_is_attr_on_ctx(kctx, attribute) != false) { ++ KBASE_DEBUG_ASSERT(js_devdata->runpool_irq.ctx_attr_ref_count[attribute] > 0); ++ --(js_devdata->runpool_irq.ctx_attr_ref_count[attribute]); + -+#define MALI_GPU_RESOURCES_MALI450_MP2_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCES_MALI450_MP2(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ ++ if (js_devdata->runpool_irq.ctx_attr_ref_count[attribute] == 0) { ++ /* Last de-refcount indicates a state change */ ++ runpool_state_changed = true; ++ KBASE_TRACE_ADD(kbdev, JS_CTX_ATTR_NOW_OFF_RUNPOOL, kctx, NULL, 0u, attribute); ++ } ++ } + -+#define MALI_GPU_RESOURCES_MALI450_MP3(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE0) \ -+ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE1) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) \ -+ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ -+ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ -+ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) ++ return runpool_state_changed; ++} + -+#define MALI_GPU_RESOURCES_MALI450_MP3_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCES_MALI450_MP3(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ ++/** ++ * @brief Retain a certain attribute on a ctx, also retaining it on the runpool ++ * if the context is scheduled. ++ * ++ * Requires: ++ * - jsctx mutex ++ * - If the context is scheduled, then runpool_irq spinlock must also be held ++ * ++ * @return true indicates a change in ctx attributes state of the runpool. ++ * This may allow the scheduler to submit more jobs than previously. ++ * @return false indicates no change in ctx attributes state of the runpool. ++ */ ++static bool kbasep_js_ctx_attr_ctx_retain_attr(struct kbase_device *kbdev, struct kbase_context *kctx, enum kbasep_js_ctx_attr attribute) ++{ ++ struct kbasep_js_kctx_info *js_kctx_info; ++ bool runpool_state_changed = false; + -+#define MALI_GPU_RESOURCES_MALI450_MP4(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE0) \ -+ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE1) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(3, base_addr + MALI_OFFSET_PP3, pp3_irq, base_addr + MALI_OFFSET_PP3_MMU, pp3_mmu_irq) \ -+ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ -+ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ -+ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) \ -+ MALI_GPU_RESOURCE_DMA(base_addr + MALI_OFFSET_DMA) ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(attribute < KBASEP_JS_CTX_ATTR_COUNT); ++ js_kctx_info = &kctx->jctx.sched_info; + -+#define MALI_GPU_RESOURCES_MALI450_MP4_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCES_MALI450_MP4(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); ++ KBASE_DEBUG_ASSERT(js_kctx_info->ctx.ctx_attr_ref_count[attribute] < U32_MAX); + -+#define MALI_GPU_RESOURCES_MALI450_MP6(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp4_irq, pp4_mmu_irq, pp5_irq, pp5_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE0) \ -+ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE1) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE2) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(3, base_addr + MALI_OFFSET_PP4, pp3_irq, base_addr + MALI_OFFSET_PP4_MMU, pp3_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(4, base_addr + MALI_OFFSET_PP5, pp4_irq, base_addr + MALI_OFFSET_PP5_MMU, pp4_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(5, base_addr + MALI_OFFSET_PP6, pp5_irq, base_addr + MALI_OFFSET_PP6_MMU, pp5_mmu_irq) \ -+ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ -+ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ -+ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) \ -+ MALI_GPU_RESOURCE_DMA(base_addr + MALI_OFFSET_DMA) ++ ++(js_kctx_info->ctx.ctx_attr_ref_count[attribute]); + -+#define MALI_GPU_RESOURCES_MALI450_MP6_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp4_irq, pp4_mmu_irq, pp5_irq, pp5_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCES_MALI450_MP6(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp4_irq, pp4_mmu_irq, pp5_irq, pp5_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ ++ if (kbase_ctx_flag(kctx, KCTX_SCHEDULED) && js_kctx_info->ctx.ctx_attr_ref_count[attribute] == 1) { ++ /* Only ref-count the attribute on the runpool for the first time this contexts sees this attribute */ ++ KBASE_TRACE_ADD(kbdev, JS_CTX_ATTR_NOW_ON_CTX, kctx, NULL, 0u, attribute); ++ runpool_state_changed = kbasep_js_ctx_attr_runpool_retain_attr(kbdev, kctx, attribute); ++ } + -+#define MALI_GPU_RESOURCES_MALI450_MP8(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp4_irq, pp4_mmu_irq, pp5_irq, pp5_mmu_irq, pp6_irq, pp6_mmu_irq, pp7_irq, pp7_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE0) \ -+ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE1) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(3, base_addr + MALI_OFFSET_PP3, pp3_irq, base_addr + MALI_OFFSET_PP3_MMU, pp3_mmu_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI450_OFFSET_L2_CACHE2) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(4, base_addr + MALI_OFFSET_PP4, pp4_irq, base_addr + MALI_OFFSET_PP4_MMU, pp4_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(5, base_addr + MALI_OFFSET_PP5, pp5_irq, base_addr + MALI_OFFSET_PP5_MMU, pp5_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(6, base_addr + MALI_OFFSET_PP6, pp6_irq, base_addr + MALI_OFFSET_PP6_MMU, pp6_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(7, base_addr + MALI_OFFSET_PP7, pp7_irq, base_addr + MALI_OFFSET_PP7_MMU, pp7_mmu_irq) \ -+ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ -+ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ -+ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) \ -+ MALI_GPU_RESOURCE_DMA(base_addr + MALI_OFFSET_DMA) ++ return runpool_state_changed; ++} + -+#define MALI_GPU_RESOURCES_MALI450_MP8_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp4_irq, pp4_mmu_irq, pp5_irq, pp5_mmu_irq, pp6_irq, pp6_mmu_irq, pp7_irq, pp7_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCES_MALI450_MP8(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp4_irq, pp4_mmu_irq, pp5_irq, pp5_mmu_irq, pp6_irq, pp6_mmu_irq, pp7_irq, pp7_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ ++/* ++ * @brief Release a certain attribute on a ctx, also releasing it from the runpool ++ * if the context is scheduled. ++ * ++ * Requires: ++ * - jsctx mutex ++ * - If the context is scheduled, then runpool_irq spinlock must also be held ++ * ++ * @return true indicates a change in ctx attributes state of the runpool. ++ * This may allow the scheduler to submit more jobs than previously. ++ * @return false indicates no change in ctx attributes state of the runpool. ++ */ ++static bool kbasep_js_ctx_attr_ctx_release_attr(struct kbase_device *kbdev, struct kbase_context *kctx, enum kbasep_js_ctx_attr attribute) ++{ ++ struct kbasep_js_kctx_info *js_kctx_info; ++ bool runpool_state_changed = false; + -+ /* Mali - 470 */ -+#define MALI_GPU_RESOURCES_MALI470_MP1(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI470_OFFSET_L2_CACHE1) \ -+ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ -+ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ -+ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(attribute < KBASEP_JS_CTX_ATTR_COUNT); ++ js_kctx_info = &kctx->jctx.sched_info; + -+#define MALI_GPU_RESOURCES_MALI470_MP1_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCES_MALI470_MP1(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ ++ lockdep_assert_held(&js_kctx_info->ctx.jsctx_mutex); ++ KBASE_DEBUG_ASSERT(js_kctx_info->ctx.ctx_attr_ref_count[attribute] > 0); + -+#define MALI_GPU_RESOURCES_MALI470_MP2(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI470_OFFSET_L2_CACHE1) \ -+ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ -+ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ -+ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ -+ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) ++ if (kbase_ctx_flag(kctx, KCTX_SCHEDULED) && js_kctx_info->ctx.ctx_attr_ref_count[attribute] == 1) { ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ /* Only de-ref-count the attribute on the runpool when this is the last ctx-reference to it */ ++ runpool_state_changed = kbasep_js_ctx_attr_runpool_release_attr(kbdev, kctx, attribute); ++ KBASE_TRACE_ADD(kbdev, JS_CTX_ATTR_NOW_OFF_CTX, kctx, NULL, 0u, attribute); ++ } + -+#define MALI_GPU_RESOURCES_MALI470_MP2_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCES_MALI470_MP2(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ ++ /* De-ref must happen afterwards, because kbasep_js_ctx_attr_runpool_release() needs to check it too */ ++ --(js_kctx_info->ctx.ctx_attr_ref_count[attribute]); + -+#define MALI_GPU_RESOURCES_MALI470_MP3(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI470_OFFSET_L2_CACHE1) \ -+ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) \ -+ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ -+ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ -+ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) ++ return runpool_state_changed; ++} + -+#define MALI_GPU_RESOURCES_MALI470_MP3_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCES_MALI470_MP3(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ ++/* ++ * More commonly used public functions ++ */ + -+#define MALI_GPU_RESOURCES_MALI470_MP4(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_L2(base_addr + MALI470_OFFSET_L2_CACHE1) \ -+ MALI_GPU_RESOURCE_GP_WITH_MMU(base_addr + MALI_OFFSET_GP, gp_irq, base_addr + MALI_OFFSET_GP_MMU, gp_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(0, base_addr + MALI_OFFSET_PP0, pp0_irq, base_addr + MALI_OFFSET_PP0_MMU, pp0_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(1, base_addr + MALI_OFFSET_PP1, pp1_irq, base_addr + MALI_OFFSET_PP1_MMU, pp1_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(2, base_addr + MALI_OFFSET_PP2, pp2_irq, base_addr + MALI_OFFSET_PP2_MMU, pp2_mmu_irq) \ -+ MALI_GPU_RESOURCE_PP_WITH_MMU(3, base_addr + MALI_OFFSET_PP3, pp3_irq, base_addr + MALI_OFFSET_PP3_MMU, pp3_mmu_irq) \ -+ MALI_GPU_RESOURCE_BCAST(base_addr + MALI_OFFSET_BCAST) \ -+ MALI_GPU_RESOURCE_DLBU(base_addr + MALI_OFFSET_DLBU) \ -+ MALI_GPU_RESOURCE_PP_BCAST(base_addr + MALI_OFFSET_PP_BCAST, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PP_MMU_BCAST(base_addr + MALI_OFFSET_PP_BCAST_MMU) ++void kbasep_js_ctx_attr_set_initial_attrs(struct kbase_device *kbdev, struct kbase_context *kctx) ++{ ++ bool runpool_state_changed = false; + -+#define MALI_GPU_RESOURCES_MALI470_MP4_PMU(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCES_MALI470_MP4(base_addr, gp_irq, gp_mmu_irq, pp0_irq, pp0_mmu_irq, pp1_irq, pp1_mmu_irq, pp2_irq, pp2_mmu_irq, pp3_irq, pp3_mmu_irq, pp_bcast_irq) \ -+ MALI_GPU_RESOURCE_PMU(base_addr + MALI_OFFSET_PMU) \ ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(kctx != NULL); + -+#define MALI_GPU_RESOURCE_L2(addr) \ -+ { \ -+ .name = "Mali_L2", \ -+ .flags = IORESOURCE_MEM, \ -+ .start = addr, \ -+ .end = addr + 0x200, \ -+ }, ++ if (kbase_ctx_flag(kctx, KCTX_SUBMIT_DISABLED)) { ++ /* This context never submits, so don't track any scheduling attributes */ ++ return; ++ } + -+#define MALI_GPU_RESOURCE_GP(gp_addr, gp_irq) \ -+ { \ -+ .name = "Mali_GP", \ -+ .flags = IORESOURCE_MEM, \ -+ .start = gp_addr, \ -+ .end = gp_addr + 0x100, \ -+ }, \ -+ { \ -+ .name = "Mali_GP_IRQ", \ -+ .flags = IORESOURCE_IRQ, \ -+ .start = gp_irq, \ -+ .end = gp_irq, \ -+ }, \ ++ /* Transfer attributes held in the context flags for contexts that have submit enabled */ + -+#define MALI_GPU_RESOURCE_GP_WITH_MMU(gp_addr, gp_irq, gp_mmu_addr, gp_mmu_irq) \ -+ { \ -+ .name = "Mali_GP", \ -+ .flags = IORESOURCE_MEM, \ -+ .start = gp_addr, \ -+ .end = gp_addr + 0x100, \ -+ }, \ -+ { \ -+ .name = "Mali_GP_IRQ", \ -+ .flags = IORESOURCE_IRQ, \ -+ .start = gp_irq, \ -+ .end = gp_irq, \ -+ }, \ -+ { \ -+ .name = "Mali_GP_MMU", \ -+ .flags = IORESOURCE_MEM, \ -+ .start = gp_mmu_addr, \ -+ .end = gp_mmu_addr + 0x100, \ -+ }, \ -+ { \ -+ .name = "Mali_GP_MMU_IRQ", \ -+ .flags = IORESOURCE_IRQ, \ -+ .start = gp_mmu_irq, \ -+ .end = gp_mmu_irq, \ -+ }, ++ /* ... More attributes can be added here ... */ + -+#define MALI_GPU_RESOURCE_PP(pp_addr, pp_irq) \ -+ { \ -+ .name = "Mali_PP", \ -+ .flags = IORESOURCE_MEM, \ -+ .start = pp_addr, \ -+ .end = pp_addr + 0x1100, \ -+ }, \ -+ { \ -+ .name = "Mali_PP_IRQ", \ -+ .flags = IORESOURCE_IRQ, \ -+ .start = pp_irq, \ -+ .end = pp_irq, \ -+ }, \ ++ /* The context should not have been scheduled yet, so ASSERT if this caused ++ * runpool state changes (note that other threads *can't* affect the value ++ * of runpool_state_changed, due to how it's calculated) */ ++ KBASE_DEBUG_ASSERT(runpool_state_changed == false); ++ CSTD_UNUSED(runpool_state_changed); ++} + -+#define MALI_GPU_RESOURCE_PP_WITH_MMU(id, pp_addr, pp_irq, pp_mmu_addr, pp_mmu_irq) \ -+ { \ -+ .name = "Mali_PP" #id, \ -+ .flags = IORESOURCE_MEM, \ -+ .start = pp_addr, \ -+ .end = pp_addr + 0x1100, \ -+ }, \ -+ { \ -+ .name = "Mali_PP" #id "_IRQ", \ -+ .flags = IORESOURCE_IRQ, \ -+ .start = pp_irq, \ -+ .end = pp_irq, \ -+ }, \ -+ { \ -+ .name = "Mali_PP" #id "_MMU", \ -+ .flags = IORESOURCE_MEM, \ -+ .start = pp_mmu_addr, \ -+ .end = pp_mmu_addr + 0x100, \ -+ }, \ -+ { \ -+ .name = "Mali_PP" #id "_MMU_IRQ", \ -+ .flags = IORESOURCE_IRQ, \ -+ .start = pp_mmu_irq, \ -+ .end = pp_mmu_irq, \ -+ }, ++void kbasep_js_ctx_attr_runpool_retain_ctx(struct kbase_device *kbdev, struct kbase_context *kctx) ++{ ++ bool runpool_state_changed; ++ int i; + -+#define MALI_GPU_RESOURCE_MMU(mmu_addr, mmu_irq) \ -+ { \ -+ .name = "Mali_MMU", \ -+ .flags = IORESOURCE_MEM, \ -+ .start = mmu_addr, \ -+ .end = mmu_addr + 0x100, \ -+ }, \ -+ { \ -+ .name = "Mali_MMU_IRQ", \ -+ .flags = IORESOURCE_IRQ, \ -+ .start = mmu_irq, \ -+ .end = mmu_irq, \ -+ }, ++ /* Retain any existing attributes */ ++ for (i = 0; i < KBASEP_JS_CTX_ATTR_COUNT; ++i) { ++ if (kbasep_js_ctx_attr_is_attr_on_ctx(kctx, (enum kbasep_js_ctx_attr) i) != false) { ++ /* The context is being scheduled in, so update the runpool with the new attributes */ ++ runpool_state_changed = kbasep_js_ctx_attr_runpool_retain_attr(kbdev, kctx, (enum kbasep_js_ctx_attr) i); + -+#define MALI_GPU_RESOURCE_PMU(pmu_addr) \ -+ { \ -+ .name = "Mali_PMU", \ -+ .flags = IORESOURCE_MEM, \ -+ .start = pmu_addr, \ -+ .end = pmu_addr + 0x100, \ -+ }, ++ /* We don't need to know about state changed, because retaining a ++ * context occurs on scheduling it, and that itself will also try ++ * to run new atoms */ ++ CSTD_UNUSED(runpool_state_changed); ++ } ++ } ++} + -+#define MALI_GPU_RESOURCE_DMA(dma_addr) \ -+ { \ -+ .name = "Mali_DMA", \ -+ .flags = IORESOURCE_MEM, \ -+ .start = dma_addr, \ -+ .end = dma_addr + 0x100, \ -+ }, ++bool kbasep_js_ctx_attr_runpool_release_ctx(struct kbase_device *kbdev, struct kbase_context *kctx) ++{ ++ bool runpool_state_changed = false; ++ int i; + -+#define MALI_GPU_RESOURCE_DLBU(dlbu_addr) \ -+ { \ -+ .name = "Mali_DLBU", \ -+ .flags = IORESOURCE_MEM, \ -+ .start = dlbu_addr, \ -+ .end = dlbu_addr + 0x100, \ -+ }, ++ /* Release any existing attributes */ ++ for (i = 0; i < KBASEP_JS_CTX_ATTR_COUNT; ++i) { ++ if (kbasep_js_ctx_attr_is_attr_on_ctx(kctx, (enum kbasep_js_ctx_attr) i) != false) { ++ /* The context is being scheduled out, so update the runpool on the removed attributes */ ++ runpool_state_changed |= kbasep_js_ctx_attr_runpool_release_attr(kbdev, kctx, (enum kbasep_js_ctx_attr) i); ++ } ++ } + -+#define MALI_GPU_RESOURCE_BCAST(bcast_addr) \ -+ { \ -+ .name = "Mali_Broadcast", \ -+ .flags = IORESOURCE_MEM, \ -+ .start = bcast_addr, \ -+ .end = bcast_addr + 0x100, \ -+ }, ++ return runpool_state_changed; ++} + -+#define MALI_GPU_RESOURCE_PP_BCAST(pp_addr, pp_irq) \ -+ { \ -+ .name = "Mali_PP_Broadcast", \ -+ .flags = IORESOURCE_MEM, \ -+ .start = pp_addr, \ -+ .end = pp_addr + 0x1100, \ -+ }, \ -+ { \ -+ .name = "Mali_PP_Broadcast_IRQ", \ -+ .flags = IORESOURCE_IRQ, \ -+ .start = pp_irq, \ -+ .end = pp_irq, \ -+ }, \ ++void kbasep_js_ctx_attr_ctx_retain_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *katom) ++{ ++ bool runpool_state_changed = false; ++ base_jd_core_req core_req; + -+#define MALI_GPU_RESOURCE_PP_MMU_BCAST(pp_mmu_bcast_addr) \ -+ { \ -+ .name = "Mali_PP_MMU_Broadcast", \ -+ .flags = IORESOURCE_MEM, \ -+ .start = pp_mmu_bcast_addr, \ -+ .end = pp_mmu_bcast_addr + 0x100, \ -+ }, ++ KBASE_DEBUG_ASSERT(katom); ++ core_req = katom->core_req; + -+ struct mali_gpu_utilization_data { -+ unsigned int utilization_gpu; /* Utilization for GP and all PP cores combined, 0 = no utilization, 256 = full utilization */ -+ unsigned int utilization_gp; /* Utilization for GP core only, 0 = no utilization, 256 = full utilization */ -+ unsigned int utilization_pp; /* Utilization for all PP cores combined, 0 = no utilization, 256 = full utilization */ -+ }; ++ if (core_req & BASE_JD_REQ_ONLY_COMPUTE) ++ runpool_state_changed |= kbasep_js_ctx_attr_ctx_retain_attr(kbdev, kctx, KBASEP_JS_CTX_ATTR_COMPUTE); ++ else ++ runpool_state_changed |= kbasep_js_ctx_attr_ctx_retain_attr(kbdev, kctx, KBASEP_JS_CTX_ATTR_NON_COMPUTE); + -+ struct mali_gpu_clk_item { -+ unsigned int clock; /* unit(MHz) */ -+ unsigned int vol; -+ }; ++ if ((core_req & (BASE_JD_REQ_CS | BASE_JD_REQ_ONLY_COMPUTE | BASE_JD_REQ_T)) != 0 && (core_req & (BASE_JD_REQ_COHERENT_GROUP | BASE_JD_REQ_SPECIFIC_COHERENT_GROUP)) == 0) { ++ /* Atom that can run on slot1 or slot2, and can use all cores */ ++ runpool_state_changed |= kbasep_js_ctx_attr_ctx_retain_attr(kbdev, kctx, KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES); ++ } + -+ struct mali_gpu_clock { -+ struct mali_gpu_clk_item *item; -+ unsigned int num_of_steps; -+ }; ++ /* We don't need to know about state changed, because retaining an ++ * atom occurs on adding it, and that itself will also try to run ++ * new atoms */ ++ CSTD_UNUSED(runpool_state_changed); ++} + -+ struct mali_gpu_device_data { -+ /* Shared GPU memory */ -+ unsigned long shared_mem_size; ++bool kbasep_js_ctx_attr_ctx_release_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbasep_js_atom_retained_state *katom_retained_state) ++{ ++ bool runpool_state_changed = false; ++ base_jd_core_req core_req; + -+ /* -+ * Mali PMU switch delay. -+ * Only needed if the power gates are connected to the PMU in a high fanout -+ * network. This value is the number of Mali clock cycles it takes to -+ * enable the power gates and turn on the power mesh. -+ * This value will have no effect if a daisy chain implementation is used. -+ */ -+ u32 pmu_switch_delay; ++ KBASE_DEBUG_ASSERT(katom_retained_state); ++ core_req = katom_retained_state->core_req; + -+ /* Mali Dynamic power domain configuration in sequence from 0-11 -+ * GP PP0 PP1 PP2 PP3 PP4 PP5 PP6 PP7, L2$0 L2$1 L2$2 -+ */ -+ u16 pmu_domain_config[12]; ++ /* No-op for invalid atoms */ ++ if (kbasep_js_atom_retained_state_is_valid(katom_retained_state) == false) ++ return false; + -+ /* Dedicated GPU memory range (physical). */ -+ unsigned long dedicated_mem_start; -+ unsigned long dedicated_mem_size; ++ if (core_req & BASE_JD_REQ_ONLY_COMPUTE) ++ runpool_state_changed |= kbasep_js_ctx_attr_ctx_release_attr(kbdev, kctx, KBASEP_JS_CTX_ATTR_COMPUTE); ++ else ++ runpool_state_changed |= kbasep_js_ctx_attr_ctx_release_attr(kbdev, kctx, KBASEP_JS_CTX_ATTR_NON_COMPUTE); + -+ /* Frame buffer memory to be accessible by Mali GPU (physical) */ -+ unsigned long fb_start; -+ unsigned long fb_size; ++ if ((core_req & (BASE_JD_REQ_CS | BASE_JD_REQ_ONLY_COMPUTE | BASE_JD_REQ_T)) != 0 && (core_req & (BASE_JD_REQ_COHERENT_GROUP | BASE_JD_REQ_SPECIFIC_COHERENT_GROUP)) == 0) { ++ /* Atom that can run on slot1 or slot2, and can use all cores */ ++ runpool_state_changed |= kbasep_js_ctx_attr_ctx_release_attr(kbdev, kctx, KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES); ++ } + -+ /* Max runtime [ms] for jobs */ -+ int max_job_runtime; ++ return runpool_state_changed; ++} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h +new file mode 100755 +index 000000000..ce9183326 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h +@@ -0,0 +1,158 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ /* Report GPU utilization and related control in this interval (specified in ms) */ -+ unsigned long control_interval; + -+ /* Function that will receive periodic GPU utilization numbers */ -+ void (*utilization_callback)(struct mali_gpu_utilization_data *data); + -+ /* Fuction that platform callback for freq setting, needed when CONFIG_MALI_DVFS enabled */ -+ int (*set_freq)(int setting_clock_step); -+ /* Function that platfrom report it's clock info which driver can set, needed when CONFIG_MALI_DVFS enabled */ -+ void (*get_clock_info)(struct mali_gpu_clock **data); -+ /* Function that get the current clock info, needed when CONFIG_MALI_DVFS enabled */ -+ int (*get_freq)(void); -+ /* Function that init the mali gpu secure mode */ -+ int (*secure_mode_init)(void); -+ /* Function that deinit the mali gpu secure mode */ -+ void (*secure_mode_deinit)(void); -+ /* Function that reset GPU and enable gpu secure mode */ -+ int (*gpu_reset_and_secure_mode_enable)(void); -+ /* Function that Reset GPU and disable gpu secure mode */ -+ int (*gpu_reset_and_secure_mode_disable)(void); -+ /* ipa related interface customer need register */ -+#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) -+ struct devfreq_cooling_power *gpu_cooling_ops; -+#endif -+ }; + -+ /** -+ * Pause the scheduling and power state changes of Mali device driver. -+ * mali_dev_resume() must always be called as soon as possible after this function -+ * in order to resume normal operation of the Mali driver. -+ */ -+ void mali_dev_pause(void); + -+ /** -+ * Resume scheduling and allow power changes in Mali device driver. -+ * This must always be called after mali_dev_pause(). -+ */ -+ void mali_dev_resume(void); ++/** ++ * @file mali_kbase_js_ctx_attr.h ++ * Job Scheduler Context Attribute APIs ++ */ + -+ /** @brief Set the desired number of PP cores to use. -+ * -+ * The internal Mali PMU will be used, if present, to physically power off the PP cores. -+ * -+ * @param num_cores The number of desired cores -+ * @return 0 on success, otherwise error. -EINVAL means an invalid number of cores was specified. -+ */ -+ int mali_perf_set_num_pp_cores(unsigned int num_cores); ++#ifndef _KBASE_JS_CTX_ATTR_H_ ++#define _KBASE_JS_CTX_ATTR_H_ + -+#endif -diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h -new file mode 100755 -index 000000000000..686708eaef75 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h -@@ -0,0 +1,97 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * @addtogroup base_api ++ * @{ + */ + -+#ifndef __MALI_UTGARD_IOCTL_H__ -+#define __MALI_UTGARD_IOCTL_H__ ++/** ++ * @addtogroup base_kbase_api ++ * @{ ++ */ + -+#include -+#include -+#include /* file system operations */ ++/** ++ * @addtogroup kbase_js ++ * @{ ++ */ + -+#ifdef __cplusplus -+extern "C" { -+#endif ++/** ++ * Set the initial attributes of a context (when context create flags are set) ++ * ++ * Requires: ++ * - Hold the jsctx_mutex ++ */ ++void kbasep_js_ctx_attr_set_initial_attrs(struct kbase_device *kbdev, struct kbase_context *kctx); + +/** -+ * @file mali_kernel_ioctl.h -+ * Interface to the Linux device driver. -+ * This file describes the interface needed to use the Linux device driver. -+ * Its interface is designed to used by the HAL implementation through a thin arch layer. ++ * Retain all attributes of a context ++ * ++ * This occurs on scheduling in the context on the runpool (but after ++ * is_scheduled is set) ++ * ++ * Requires: ++ * - jsctx mutex ++ * - runpool_irq spinlock ++ * - ctx->is_scheduled is true + */ ++void kbasep_js_ctx_attr_runpool_retain_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); + +/** -+ * ioctl commands ++ * Release all attributes of a context ++ * ++ * This occurs on scheduling out the context from the runpool (but before ++ * is_scheduled is cleared) ++ * ++ * Requires: ++ * - jsctx mutex ++ * - runpool_irq spinlock ++ * - ctx->is_scheduled is true ++ * ++ * @return true indicates a change in ctx attributes state of the runpool. ++ * In this state, the scheduler might be able to submit more jobs than ++ * previously, and so the caller should ensure kbasep_js_try_run_next_job_nolock() ++ * or similar is called sometime later. ++ * @return false indicates no change in ctx attributes state of the runpool. + */ ++bool kbasep_js_ctx_attr_runpool_release_ctx(struct kbase_device *kbdev, struct kbase_context *kctx); + -+#define MALI_IOC_BASE 0x82 -+#define MALI_IOC_CORE_BASE (_MALI_UK_CORE_SUBSYSTEM + MALI_IOC_BASE) -+#define MALI_IOC_MEMORY_BASE (_MALI_UK_MEMORY_SUBSYSTEM + MALI_IOC_BASE) -+#define MALI_IOC_PP_BASE (_MALI_UK_PP_SUBSYSTEM + MALI_IOC_BASE) -+#define MALI_IOC_GP_BASE (_MALI_UK_GP_SUBSYSTEM + MALI_IOC_BASE) -+#define MALI_IOC_PROFILING_BASE (_MALI_UK_PROFILING_SUBSYSTEM + MALI_IOC_BASE) -+#define MALI_IOC_VSYNC_BASE (_MALI_UK_VSYNC_SUBSYSTEM + MALI_IOC_BASE) ++/** ++ * Retain all attributes of an atom ++ * ++ * This occurs on adding an atom to a context ++ * ++ * Requires: ++ * - jsctx mutex ++ * - If the context is scheduled, then runpool_irq spinlock must also be held ++ */ ++void kbasep_js_ctx_attr_ctx_retain_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *katom); + -+#define MALI_IOC_WAIT_FOR_NOTIFICATION _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_WAIT_FOR_NOTIFICATION, _mali_uk_wait_for_notification_s) -+#define MALI_IOC_GET_API_VERSION _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_GET_API_VERSION, u32) -+#define MALI_IOC_GET_API_VERSION_V2 _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_GET_API_VERSION, _mali_uk_get_api_version_v2_s) -+/* rk_ext. */ -+#define MALI_IOC_GET_RK_KO_VERSION _IOWR(MALI_IOC_CORE_BASE, _MALI_GET_RK_KO_VERSION, _mali_rk_ko_version_s) -+#define MALI_IOC_POST_NOTIFICATION _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_POST_NOTIFICATION, _mali_uk_post_notification_s) -+#define MALI_IOC_GET_USER_SETTING _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_GET_USER_SETTING, _mali_uk_get_user_setting_s) -+#define MALI_IOC_GET_USER_SETTINGS _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_GET_USER_SETTINGS, _mali_uk_get_user_settings_s) -+#define MALI_IOC_REQUEST_HIGH_PRIORITY _IOW (MALI_IOC_CORE_BASE, _MALI_UK_REQUEST_HIGH_PRIORITY, _mali_uk_request_high_priority_s) -+#define MALI_IOC_TIMELINE_GET_LATEST_POINT _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_TIMELINE_GET_LATEST_POINT, _mali_uk_timeline_get_latest_point_s) -+#define MALI_IOC_TIMELINE_WAIT _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_TIMELINE_WAIT, _mali_uk_timeline_wait_s) -+#define MALI_IOC_TIMELINE_CREATE_SYNC_FENCE _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_TIMELINE_CREATE_SYNC_FENCE, _mali_uk_timeline_create_sync_fence_s) -+#define MALI_IOC_SOFT_JOB_START _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_SOFT_JOB_START, _mali_uk_soft_job_start_s) -+#define MALI_IOC_SOFT_JOB_SIGNAL _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_SOFT_JOB_SIGNAL, _mali_uk_soft_job_signal_s) -+#define MALI_IOC_PENDING_SUBMIT _IOWR(MALI_IOC_CORE_BASE, _MALI_UK_PENDING_SUBMIT, _mali_uk_pending_submit_s) ++/** ++ * Release all attributes of an atom, given its retained state. ++ * ++ * This occurs after (permanently) removing an atom from a context ++ * ++ * Requires: ++ * - jsctx mutex ++ * - If the context is scheduled, then runpool_irq spinlock must also be held ++ * ++ * This is a no-op when \a katom_retained_state is invalid. ++ * ++ * @return true indicates a change in ctx attributes state of the runpool. ++ * In this state, the scheduler might be able to submit more jobs than ++ * previously, and so the caller should ensure kbasep_js_try_run_next_job_nolock() ++ * or similar is called sometime later. ++ * @return false indicates no change in ctx attributes state of the runpool. ++ */ ++bool kbasep_js_ctx_attr_ctx_release_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbasep_js_atom_retained_state *katom_retained_state); + -+#define MALI_IOC_MEM_ALLOC _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_ALLOC_MEM, _mali_uk_alloc_mem_s) -+#define MALI_IOC_MEM_FREE _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_FREE_MEM, _mali_uk_free_mem_s) -+#define MALI_IOC_MEM_BIND _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_BIND_MEM, _mali_uk_bind_mem_s) -+#define MALI_IOC_MEM_UNBIND _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_UNBIND_MEM, _mali_uk_unbind_mem_s) -+#define MALI_IOC_MEM_COW _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_COW_MEM, _mali_uk_cow_mem_s) -+#define MALI_IOC_MEM_COW_MODIFY_RANGE _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_COW_MODIFY_RANGE, _mali_uk_cow_modify_range_s) -+#define MALI_IOC_MEM_RESIZE _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_RESIZE_MEM, _mali_uk_mem_resize_s) -+#define MALI_IOC_MEM_DMA_BUF_GET_SIZE _IOR(MALI_IOC_MEMORY_BASE, _MALI_UK_DMA_BUF_GET_SIZE, _mali_uk_dma_buf_get_size_s) -+#define MALI_IOC_MEM_QUERY_MMU_PAGE_TABLE_DUMP_SIZE _IOR (MALI_IOC_MEMORY_BASE, _MALI_UK_QUERY_MMU_PAGE_TABLE_DUMP_SIZE, _mali_uk_query_mmu_page_table_dump_size_s) -+#define MALI_IOC_MEM_DUMP_MMU_PAGE_TABLE _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_DUMP_MMU_PAGE_TABLE, _mali_uk_dump_mmu_page_table_s) -+#define MALI_IOC_MEM_WRITE_SAFE _IOWR(MALI_IOC_MEMORY_BASE, _MALI_UK_MEM_WRITE_SAFE, _mali_uk_mem_write_safe_s) ++/** ++ * Requires: ++ * - runpool_irq spinlock ++ */ ++static inline s8 kbasep_js_ctx_attr_count_on_runpool(struct kbase_device *kbdev, enum kbasep_js_ctx_attr attribute) ++{ ++ struct kbasep_js_device_data *js_devdata; + -+#define MALI_IOC_PP_START_JOB _IOWR(MALI_IOC_PP_BASE, _MALI_UK_PP_START_JOB, _mali_uk_pp_start_job_s) -+#define MALI_IOC_PP_AND_GP_START_JOB _IOWR(MALI_IOC_PP_BASE, _MALI_UK_PP_AND_GP_START_JOB, _mali_uk_pp_and_gp_start_job_s) -+#define MALI_IOC_PP_NUMBER_OF_CORES_GET _IOR (MALI_IOC_PP_BASE, _MALI_UK_GET_PP_NUMBER_OF_CORES, _mali_uk_get_pp_number_of_cores_s) -+#define MALI_IOC_PP_CORE_VERSION_GET _IOR (MALI_IOC_PP_BASE, _MALI_UK_GET_PP_CORE_VERSION, _mali_uk_get_pp_core_version_s) -+#define MALI_IOC_PP_DISABLE_WB _IOW (MALI_IOC_PP_BASE, _MALI_UK_PP_DISABLE_WB, _mali_uk_pp_disable_wb_s) ++ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ KBASE_DEBUG_ASSERT(attribute < KBASEP_JS_CTX_ATTR_COUNT); ++ js_devdata = &kbdev->js_data; + -+#define MALI_IOC_GP2_START_JOB _IOWR(MALI_IOC_GP_BASE, _MALI_UK_GP_START_JOB, _mali_uk_gp_start_job_s) -+#define MALI_IOC_GP2_NUMBER_OF_CORES_GET _IOR (MALI_IOC_GP_BASE, _MALI_UK_GET_GP_NUMBER_OF_CORES, _mali_uk_get_gp_number_of_cores_s) -+#define MALI_IOC_GP2_CORE_VERSION_GET _IOR (MALI_IOC_GP_BASE, _MALI_UK_GET_GP_CORE_VERSION, _mali_uk_get_gp_core_version_s) -+#define MALI_IOC_GP2_SUSPEND_RESPONSE _IOW (MALI_IOC_GP_BASE, _MALI_UK_GP_SUSPEND_RESPONSE,_mali_uk_gp_suspend_response_s) ++ return js_devdata->runpool_irq.ctx_attr_ref_count[attribute]; ++} + -+#define MALI_IOC_PROFILING_ADD_EVENT _IOWR(MALI_IOC_PROFILING_BASE, _MALI_UK_PROFILING_ADD_EVENT, _mali_uk_profiling_add_event_s) -+#define MALI_IOC_PROFILING_REPORT_SW_COUNTERS _IOW (MALI_IOC_PROFILING_BASE, _MALI_UK_PROFILING_REPORT_SW_COUNTERS, _mali_uk_sw_counters_report_s) -+#define MALI_IOC_PROFILING_MEMORY_USAGE_GET _IOR(MALI_IOC_PROFILING_BASE, _MALI_UK_PROFILING_MEMORY_USAGE_GET, _mali_uk_profiling_memory_usage_get_s) -+#define MALI_IOC_PROFILING_STREAM_FD_GET _IOR(MALI_IOC_PROFILING_BASE, _MALI_UK_PROFILING_STREAM_FD_GET, _mali_uk_profiling_stream_fd_get_s) -+#define MALI_IOC_PROILING_CONTROL_SET _IOR(MALI_IOC_PROFILING_BASE, _MALI_UK_PROFILING_CONTROL_SET, _mali_uk_profiling_control_set_s) ++/** ++ * Requires: ++ * - runpool_irq spinlock ++ */ ++static inline bool kbasep_js_ctx_attr_is_attr_on_runpool(struct kbase_device *kbdev, enum kbasep_js_ctx_attr attribute) ++{ ++ /* In general, attributes are 'on' when they have a non-zero refcount (note: the refcount will never be < 0) */ ++ return (bool) kbasep_js_ctx_attr_count_on_runpool(kbdev, attribute); ++} + -+#define MALI_IOC_VSYNC_EVENT_REPORT _IOW (MALI_IOC_VSYNC_BASE, _MALI_UK_VSYNC_EVENT_REPORT, _mali_uk_vsync_event_report_s) ++/** ++ * Requires: ++ * - jsctx mutex ++ */ ++static inline bool kbasep_js_ctx_attr_is_attr_on_ctx(struct kbase_context *kctx, enum kbasep_js_ctx_attr attribute) ++{ ++ struct kbasep_js_kctx_info *js_kctx_info; + -+/* rk_ext : 对 r5p0 集æˆä¹‹åŽ, mali_so ä¸å†ä½¿ç”¨ä¸‹é¢çš„ ioctl, 而使用 MALI_IOC_GET_RK_KO_VERSION. */ -+#if 0 -+#define MALI_IOC_GET_MALI_VERSION_IN_RK30 _IOWR(MALI_IOC_CORE_BASE,_MALI_UK_GET_MALI_VERSION_IN_RK30,_mali_uk_get_mali_version_in_rk30_s *) -+#endif ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(attribute < KBASEP_JS_CTX_ATTR_COUNT); ++ js_kctx_info = &kctx->jctx.sched_info; + -+#ifdef __cplusplus ++ /* In general, attributes are 'on' when they have a refcount (which should never be < 0) */ ++ return (bool) (js_kctx_info->ctx.ctx_attr_ref_count[attribute]); +} -+#endif + -+#endif /* __MALI_UTGARD_IOCTL_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h ++ /** @} *//* end group kbase_js */ ++ /** @} *//* end group base_kbase_api */ ++ /** @} *//* end group base_api */ ++ ++#endif /* _KBASE_JS_DEFS_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_defs.h b/drivers/gpu/arm/midgard/mali_kbase_js_defs.h new file mode 100755 -index 000000000000..17d31de931d0 +index 000000000..ba8b64415 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h -@@ -0,0 +1,190 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_js_defs.h +@@ -0,0 +1,386 @@ +/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef _MALI_UTGARD_PROFILING_EVENTS_H_ -+#define _MALI_UTGARD_PROFILING_EVENTS_H_ + -+/* -+ * The event ID is a 32 bit value consisting of different fields -+ * reserved, 4 bits, for future use -+ * event type, 4 bits, cinstr_profiling_event_type_t -+ * event channel, 8 bits, the source of the event. -+ * event data, 16 bit field, data depending on event type -+ */ + -+/** -+ * Specifies what kind of event this is -+ */ -+typedef enum { -+ MALI_PROFILING_EVENT_TYPE_SINGLE = 0 << 24, -+ MALI_PROFILING_EVENT_TYPE_START = 1 << 24, -+ MALI_PROFILING_EVENT_TYPE_STOP = 2 << 24, -+ MALI_PROFILING_EVENT_TYPE_SUSPEND = 3 << 24, -+ MALI_PROFILING_EVENT_TYPE_RESUME = 4 << 24, -+} cinstr_profiling_event_type_t; + + +/** -+ * Secifies the channel/source of the event ++ * @file mali_kbase_js.h ++ * Job Scheduler Type Definitions + */ -+typedef enum { -+ MALI_PROFILING_EVENT_CHANNEL_SOFTWARE = 0 << 16, -+ MALI_PROFILING_EVENT_CHANNEL_GP0 = 1 << 16, -+ MALI_PROFILING_EVENT_CHANNEL_PP0 = 5 << 16, -+ MALI_PROFILING_EVENT_CHANNEL_PP1 = 6 << 16, -+ MALI_PROFILING_EVENT_CHANNEL_PP2 = 7 << 16, -+ MALI_PROFILING_EVENT_CHANNEL_PP3 = 8 << 16, -+ MALI_PROFILING_EVENT_CHANNEL_PP4 = 9 << 16, -+ MALI_PROFILING_EVENT_CHANNEL_PP5 = 10 << 16, -+ MALI_PROFILING_EVENT_CHANNEL_PP6 = 11 << 16, -+ MALI_PROFILING_EVENT_CHANNEL_PP7 = 12 << 16, -+ MALI_PROFILING_EVENT_CHANNEL_GPU = 21 << 16, -+} cinstr_profiling_event_channel_t; + -+ -+#define MALI_PROFILING_MAKE_EVENT_CHANNEL_GP(num) (((MALI_PROFILING_EVENT_CHANNEL_GP0 >> 16) + (num)) << 16) -+#define MALI_PROFILING_MAKE_EVENT_CHANNEL_PP(num) (((MALI_PROFILING_EVENT_CHANNEL_PP0 >> 16) + (num)) << 16) ++#ifndef _KBASE_JS_DEFS_H_ ++#define _KBASE_JS_DEFS_H_ + +/** -+ * These events are applicable when the type MALI_PROFILING_EVENT_TYPE_SINGLE is used from software channel ++ * @addtogroup base_api ++ * @{ + */ -+typedef enum { -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_NONE = 0, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_NEW_FRAME = 1, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_FLUSH = 2, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_SWAP_BUFFERS = 3, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_FB_EVENT = 4, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_GP_ENQUEUE = 5, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_PP_ENQUEUE = 6, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_READBACK = 7, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_WRITEBACK = 8, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_ENTER_API_FUNC = 10, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_LEAVE_API_FUNC = 11, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_DISCARD_ATTACHMENTS = 13, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_UMP_TRY_LOCK = 53, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_UMP_LOCK = 54, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_UMP_UNLOCK = 55, -+ MALI_PROFILING_EVENT_REASON_SINGLE_LOCK_CONTENDED = 56, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_MALI_FENCE_DUP = 57, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_SET_PP_JOB_FENCE = 58, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_WAIT_SYNC = 59, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_CREATE_FENCE_SYNC = 60, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_CREATE_NATIVE_FENCE_SYNC = 61, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_FENCE_FLUSH = 62, -+ MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_FLUSH_SERVER_WAITS = 63, -+} cinstr_profiling_event_reason_single_sw_t; + +/** -+ * These events are applicable when the type MALI_PROFILING_EVENT_TYPE_START/STOP is used from software channel -+ * to inform whether the core is physical or virtual ++ * @addtogroup base_kbase_api ++ * @{ + */ -+typedef enum { -+ MALI_PROFILING_EVENT_REASON_START_STOP_HW_PHYSICAL = 0, -+ MALI_PROFILING_EVENT_REASON_START_STOP_HW_VIRTUAL = 1, -+} cinstr_profiling_event_reason_start_stop_hw_t; + +/** -+ * These events are applicable when the type MALI_PROFILING_EVENT_TYPE_START/STOP is used from software channel ++ * @addtogroup kbase_js ++ * @{ + */ -+typedef enum { -+ /*MALI_PROFILING_EVENT_REASON_START_STOP_SW_NONE = 0,*/ -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_MALI = 1, -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_CALLBACK_THREAD = 2, -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_WORKER_THREAD = 3, -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_BOTTOM_HALF = 4, -+ MALI_PROFILING_EVENT_REASON_START_STOP_SW_UPPER_HALF = 5, -+} cinstr_profiling_event_reason_start_stop_sw_t; ++/* Forward decls */ ++struct kbase_device; ++struct kbase_jd_atom; + -+/** -+ * These events are applicable when the type MALI_PROFILING_EVENT_TYPE_SUSPEND/RESUME is used from software channel -+ */ -+typedef enum { -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_NONE = 0, /* used */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_PIPELINE_FULL = 1, /* NOT used */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_VSYNC = 26, /* used in some build configurations */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_FB_IFRAME_WAIT = 27, /* USED */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_FB_IFRAME_SYNC = 28, /* USED */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_VG_WAIT_FILTER_CLEANUP = 29, /* used */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_VG_WAIT_TEXTURE = 30, /* used */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_GLES_WAIT_MIPLEVEL = 31, /* used */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_GLES_WAIT_READPIXELS = 32, /* used */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_EGL_WAIT_SWAP_IMMEDIATE = 33, /* NOT used */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_ICS_QUEUE_BUFFER = 34, /* USED */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_ICS_DEQUEUE_BUFFER = 35, /* USED */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_UMP_LOCK = 36, /* Not currently used */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_X11_GLOBAL_LOCK = 37, /* Not currently used */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_X11_SWAP = 38, /* Not currently used */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_MALI_EGL_IMAGE_SYNC_WAIT = 39, /* USED */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_GP_JOB_HANDLING = 40, /* USED */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_PP_JOB_HANDLING = 41, /* USED */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_EGL_MALI_FENCE_MERGE = 42, /* USED */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_EGL_MALI_FENCE_DUP = 43, -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_EGL_FLUSH_SERVER_WAITS = 44, -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_EGL_WAIT_SYNC = 45, /* USED */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_FB_JOBS_WAIT = 46, /* USED */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_FB_NOFRAMES_WAIT = 47, /* USED */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_FB_NOJOBS_WAIT = 48, /* USED */ -+ MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_SUBMIT_LIMITER_WAIT = 49, /* USED */ -+} cinstr_profiling_event_reason_suspend_resume_sw_t; + -+/** -+ * These events are applicable when the type MALI_PROFILING_EVENT_TYPE_SINGLE is used from a HW channel (GPx+PPx) -+ */ -+typedef enum { -+ MALI_PROFILING_EVENT_REASON_SINGLE_HW_NONE = 0, -+ MALI_PROFILING_EVENT_REASON_SINGLE_HW_INTERRUPT = 1, -+ MALI_PROFILING_EVENT_REASON_SINGLE_HW_FLUSH = 2, -+} cinstr_profiling_event_reason_single_hw_t; ++typedef u32 kbase_context_flags; ++ ++struct kbasep_atom_req { ++ base_jd_core_req core_req; ++ kbase_context_flags ctx_req; ++ u32 device_nr; ++}; ++ ++/** Callback function run on all of a context's jobs registered with the Job ++ * Scheduler */ ++typedef void (*kbasep_js_ctx_job_cb)(struct kbase_device *kbdev, struct kbase_jd_atom *katom); + +/** -+ * These events are applicable when the type MALI_PROFILING_EVENT_TYPE_SINGLE is used from the GPU channel ++ * @brief Maximum number of jobs that can be submitted to a job slot whilst ++ * inside the IRQ handler. ++ * ++ * This is important because GPU NULL jobs can complete whilst the IRQ handler ++ * is running. Otherwise, it potentially allows an unlimited number of GPU NULL ++ * jobs to be submitted inside the IRQ handler, which increases IRQ latency. + */ -+typedef enum { -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_NONE = 0, -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE = 1, -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_L20_COUNTERS = 2, -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_L21_COUNTERS = 3, -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_L22_COUNTERS = 4, -+} cinstr_profiling_event_reason_single_gpu_t; ++#define KBASE_JS_MAX_JOB_SUBMIT_PER_SLOT_PER_IRQ 2 + +/** -+ * These values are applicable for the 3rd data parameter when -+ * the type MALI_PROFILING_EVENT_TYPE_START is used from the software channel -+ * with the MALI_PROFILING_EVENT_REASON_START_STOP_BOTTOM_HALF reason. ++ * @brief Context attributes ++ * ++ * Each context attribute can be thought of as a boolean value that caches some ++ * state information about either the runpool, or the context: ++ * - In the case of the runpool, it is a cache of "Do any contexts owned by ++ * the runpool have attribute X?" ++ * - In the case of a context, it is a cache of "Do any atoms owned by the ++ * context have attribute X?" ++ * ++ * The boolean value of the context attributes often affect scheduling ++ * decisions, such as affinities to use and job slots to use. ++ * ++ * To accomodate changes of state in the context, each attribute is refcounted ++ * in the context, and in the runpool for all running contexts. Specifically: ++ * - The runpool holds a refcount of how many contexts in the runpool have this ++ * attribute. ++ * - The context holds a refcount of how many atoms have this attribute. + */ -+typedef enum { -+ MALI_PROFILING_EVENT_DATA_CORE_GP0 = 1, -+ MALI_PROFILING_EVENT_DATA_CORE_PP0 = 5, -+ MALI_PROFILING_EVENT_DATA_CORE_PP1 = 6, -+ MALI_PROFILING_EVENT_DATA_CORE_PP2 = 7, -+ MALI_PROFILING_EVENT_DATA_CORE_PP3 = 8, -+ MALI_PROFILING_EVENT_DATA_CORE_PP4 = 9, -+ MALI_PROFILING_EVENT_DATA_CORE_PP5 = 10, -+ MALI_PROFILING_EVENT_DATA_CORE_PP6 = 11, -+ MALI_PROFILING_EVENT_DATA_CORE_PP7 = 12, -+ MALI_PROFILING_EVENT_DATA_CORE_GP0_MMU = 22, /* GP0 + 21 */ -+ MALI_PROFILING_EVENT_DATA_CORE_PP0_MMU = 26, /* PP0 + 21 */ -+ MALI_PROFILING_EVENT_DATA_CORE_PP1_MMU = 27, /* PP1 + 21 */ -+ MALI_PROFILING_EVENT_DATA_CORE_PP2_MMU = 28, /* PP2 + 21 */ -+ MALI_PROFILING_EVENT_DATA_CORE_PP3_MMU = 29, /* PP3 + 21 */ -+ MALI_PROFILING_EVENT_DATA_CORE_PP4_MMU = 30, /* PP4 + 21 */ -+ MALI_PROFILING_EVENT_DATA_CORE_PP5_MMU = 31, /* PP5 + 21 */ -+ MALI_PROFILING_EVENT_DATA_CORE_PP6_MMU = 32, /* PP6 + 21 */ -+ MALI_PROFILING_EVENT_DATA_CORE_PP7_MMU = 33, /* PP7 + 21 */ -+ -+} cinstr_profiling_event_data_core_t; ++enum kbasep_js_ctx_attr { ++ /** Attribute indicating a context that contains Compute jobs. That is, ++ * the context has jobs of type @ref BASE_JD_REQ_ONLY_COMPUTE ++ * ++ * @note A context can be both 'Compute' and 'Non Compute' if it contains ++ * both types of jobs. ++ */ ++ KBASEP_JS_CTX_ATTR_COMPUTE, + -+#define MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP(num) (MALI_PROFILING_EVENT_DATA_CORE_GP0 + (num)) -+#define MALI_PROFILING_MAKE_EVENT_DATA_CORE_GP_MMU(num) (MALI_PROFILING_EVENT_DATA_CORE_GP0_MMU + (num)) -+#define MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP(num) (MALI_PROFILING_EVENT_DATA_CORE_PP0 + (num)) -+#define MALI_PROFILING_MAKE_EVENT_DATA_CORE_PP_MMU(num) (MALI_PROFILING_EVENT_DATA_CORE_PP0_MMU + (num)) ++ /** Attribute indicating a context that contains Non-Compute jobs. That is, ++ * the context has some jobs that are \b not of type @ref ++ * BASE_JD_REQ_ONLY_COMPUTE. ++ * ++ * @note A context can be both 'Compute' and 'Non Compute' if it contains ++ * both types of jobs. ++ */ ++ KBASEP_JS_CTX_ATTR_NON_COMPUTE, + ++ /** Attribute indicating that a context contains compute-job atoms that ++ * aren't restricted to a coherent group, and can run on all cores. ++ * ++ * Specifically, this is when the atom's \a core_req satisfy: ++ * - (\a core_req & (BASE_JD_REQ_CS | BASE_JD_REQ_ONLY_COMPUTE | BASE_JD_REQ_T) // uses slot 1 or slot 2 ++ * - && !(\a core_req & BASE_JD_REQ_COHERENT_GROUP) // not restricted to coherent groups ++ * ++ * Such atoms could be blocked from running if one of the coherent groups ++ * is being used by another job slot, so tracking this context attribute ++ * allows us to prevent such situations. ++ * ++ * @note This doesn't take into account the 1-coregroup case, where all ++ * compute atoms would effectively be able to run on 'all cores', but ++ * contexts will still not always get marked with this attribute. Instead, ++ * it is the caller's responsibility to take into account the number of ++ * coregroups when interpreting this attribute. ++ * ++ * @note Whilst Tiler atoms are normally combined with ++ * BASE_JD_REQ_COHERENT_GROUP, it is possible to send such atoms without ++ * BASE_JD_REQ_COHERENT_GROUP set. This is an unlikely case, but it's easy ++ * enough to handle anyway. ++ */ ++ KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES, + -+#endif /*_MALI_UTGARD_PROFILING_EVENTS_H_*/ -diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h -new file mode 100755 -index 000000000000..c1927d1450dc ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h -@@ -0,0 +1,305 @@ -+/* -+ * Copyright (C) 2013, 2015-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ /** Must be the last in the enum */ ++ KBASEP_JS_CTX_ATTR_COUNT ++}; + -+#ifndef __MALI_UTGARD_PROFILING_GATOR_API_H__ -+#define __MALI_UTGARD_PROFILING_GATOR_API_H__ ++enum { ++ /** Bit indicating that new atom should be started because this atom completed */ ++ KBASE_JS_ATOM_DONE_START_NEW_ATOMS = (1u << 0), ++ /** Bit indicating that the atom was evicted from the JS_NEXT registers */ ++ KBASE_JS_ATOM_DONE_EVICTED_FROM_NEXT = (1u << 1) ++}; + -+#ifdef __cplusplus -+extern "C" { -+#endif ++/** Combination of KBASE_JS_ATOM_DONE_<...> bits */ ++typedef u32 kbasep_js_atom_done_code; + -+#define MALI_PROFILING_API_VERSION 4 ++/** ++ * @brief KBase Device Data Job Scheduler sub-structure ++ * ++ * This encapsulates the current context of the Job Scheduler on a particular ++ * device. This context is global to the device, and is not tied to any ++ * particular struct kbase_context running on the device. ++ * ++ * nr_contexts_running and as_free are optimized for packing together (by making ++ * them smaller types than u32). The operations on them should rarely involve ++ * masking. The use of signed types for arithmetic indicates to the compiler that ++ * the value will not rollover (which would be undefined behavior), and so under ++ * the Total License model, it is free to make optimizations based on that (i.e. ++ * to remove masking). ++ */ ++struct kbasep_js_device_data { ++ /* Sub-structure to collect together Job Scheduling data used in IRQ ++ * context. The hwaccess_lock must be held when accessing. */ ++ struct runpool_irq { ++ /** Bitvector indicating whether a currently scheduled context is allowed to submit jobs. ++ * When bit 'N' is set in this, it indicates whether the context bound to address space ++ * 'N' is allowed to submit jobs. ++ */ ++ u16 submit_allowed; + -+#define MAX_NUM_L2_CACHE_CORES 3 -+#define MAX_NUM_FP_CORES 8 -+#define MAX_NUM_VP_CORES 1 ++ /** Context Attributes: ++ * Each is large enough to hold a refcount of the number of contexts ++ * that can fit into the runpool. This is currently BASE_MAX_NR_AS ++ * ++ * Note that when BASE_MAX_NR_AS==16 we need 5 bits (not 4) to store ++ * the refcount. Hence, it's not worthwhile reducing this to ++ * bit-manipulation on u32s to save space (where in contrast, 4 bit ++ * sub-fields would be easy to do and would save space). ++ * ++ * Whilst this must not become negative, the sign bit is used for: ++ * - error detection in debug builds ++ * - Optimization: it is undefined for a signed int to overflow, and so ++ * the compiler can optimize for that never happening (thus, no masking ++ * is required on updating the variable) */ ++ s8 ctx_attr_ref_count[KBASEP_JS_CTX_ATTR_COUNT]; + -+#define _MALI_SPCIAL_COUNTER_DESCRIPTIONS \ -+ { \ -+ "Filmstrip_cnt0", \ -+ "Frequency", \ -+ "Voltage", \ -+ "vertex", \ -+ "fragment", \ -+ "Total_alloc_pages", \ -+ }; ++ /* ++ * Affinity management and tracking ++ */ ++ /** Bitvector to aid affinity checking. Element 'n' bit 'i' indicates ++ * that slot 'n' is using core i (i.e. slot_affinity_refcount[n][i] > 0) */ ++ u64 slot_affinities[BASE_JM_MAX_NR_SLOTS]; ++ /** Refcount for each core owned by each slot. Used to generate the ++ * slot_affinities array of bitvectors ++ * ++ * The value of the refcount will not exceed BASE_JM_SUBMIT_SLOTS, ++ * because it is refcounted only when a job is definitely about to be ++ * submitted to a slot, and is de-refcounted immediately after a job ++ * finishes */ ++ s8 slot_affinity_refcount[BASE_JM_MAX_NR_SLOTS][64]; ++ } runpool_irq; + -+#define _MALI_MEM_COUTNER_DESCRIPTIONS \ -+ { \ -+ "untyped_memory", \ -+ "vertex_index_buffer", \ -+ "texture_buffer", \ -+ "varying_buffer", \ -+ "render_target", \ -+ "pbuffer_buffer", \ -+ "plbu_heap", \ -+ "pointer_array_buffer", \ -+ "slave_tilelist", \ -+ "untyped_gp_cmdlist", \ -+ "polygon_cmdlist", \ -+ "texture_descriptor", \ -+ "render_state_word", \ -+ "shader", \ -+ "stream_buffer", \ -+ "fragment_stack", \ -+ "uniform", \ -+ "untyped_frame_pool", \ -+ "untyped_surface", \ -+ }; ++ /** ++ * Run Pool mutex, for managing contexts within the runpool. ++ * Unless otherwise specified, you must hold this lock whilst accessing any ++ * members that follow ++ * ++ * In addition, this is used to access: ++ * - the kbasep_js_kctx_info::runpool substructure ++ */ ++ struct mutex runpool_mutex; + -+/** The list of events supported by the Mali DDK. */ -+typedef enum { -+ /* Vertex processor activity */ -+ ACTIVITY_VP_0 = 0, ++ /** ++ * Queue Lock, used to access the Policy's queue of contexts independently ++ * of the Run Pool. ++ * ++ * Of course, you don't need the Run Pool lock to access this. ++ */ ++ struct mutex queue_mutex; + -+ /* Fragment processor activity */ -+ ACTIVITY_FP_0, -+ ACTIVITY_FP_1, -+ ACTIVITY_FP_2, -+ ACTIVITY_FP_3, -+ ACTIVITY_FP_4, -+ ACTIVITY_FP_5, -+ ACTIVITY_FP_6, -+ ACTIVITY_FP_7, ++ /** ++ * Scheduling semaphore. This must be held when calling ++ * kbase_jm_kick() ++ */ ++ struct semaphore schedule_sem; + -+ /* L2 cache counters */ -+ COUNTER_L2_0_C0, -+ COUNTER_L2_0_C1, -+ COUNTER_L2_1_C0, -+ COUNTER_L2_1_C1, -+ COUNTER_L2_2_C0, -+ COUNTER_L2_2_C1, ++ /** ++ * List of contexts that can currently be pulled from ++ */ ++ struct list_head ctx_list_pullable[BASE_JM_MAX_NR_SLOTS]; ++ /** ++ * List of contexts that can not currently be pulled from, but have ++ * jobs currently running. ++ */ ++ struct list_head ctx_list_unpullable[BASE_JM_MAX_NR_SLOTS]; + -+ /* Vertex processor counters */ -+ COUNTER_VP_0_C0, -+ COUNTER_VP_0_C1, ++ /** Number of currently scheduled user contexts (excluding ones that are not submitting jobs) */ ++ s8 nr_user_contexts_running; ++ /** Number of currently scheduled contexts (including ones that are not submitting jobs) */ ++ s8 nr_all_contexts_running; + -+ /* Fragment processor counters */ -+ COUNTER_FP_0_C0, -+ COUNTER_FP_0_C1, -+ COUNTER_FP_1_C0, -+ COUNTER_FP_1_C1, -+ COUNTER_FP_2_C0, -+ COUNTER_FP_2_C1, -+ COUNTER_FP_3_C0, -+ COUNTER_FP_3_C1, -+ COUNTER_FP_4_C0, -+ COUNTER_FP_4_C1, -+ COUNTER_FP_5_C0, -+ COUNTER_FP_5_C1, -+ COUNTER_FP_6_C0, -+ COUNTER_FP_6_C1, -+ COUNTER_FP_7_C0, -+ COUNTER_FP_7_C1, ++ /** Core Requirements to match up with base_js_atom's core_req memeber ++ * @note This is a write-once member, and so no locking is required to read */ ++ base_jd_core_req js_reqs[BASE_JM_MAX_NR_SLOTS]; + -+ /* -+ * If more hardware counters are added, the _mali_osk_hw_counter_table -+ * below should also be updated. -+ */ ++ u32 scheduling_period_ns; /*< Value for JS_SCHEDULING_PERIOD_NS */ ++ u32 soft_stop_ticks; /*< Value for JS_SOFT_STOP_TICKS */ ++ u32 soft_stop_ticks_cl; /*< Value for JS_SOFT_STOP_TICKS_CL */ ++ u32 hard_stop_ticks_ss; /*< Value for JS_HARD_STOP_TICKS_SS */ ++ u32 hard_stop_ticks_cl; /*< Value for JS_HARD_STOP_TICKS_CL */ ++ u32 hard_stop_ticks_dumping; /*< Value for JS_HARD_STOP_TICKS_DUMPING */ ++ u32 gpu_reset_ticks_ss; /*< Value for JS_RESET_TICKS_SS */ ++ u32 gpu_reset_ticks_cl; /*< Value for JS_RESET_TICKS_CL */ ++ u32 gpu_reset_ticks_dumping; /*< Value for JS_RESET_TICKS_DUMPING */ ++ u32 ctx_timeslice_ns; /**< Value for JS_CTX_TIMESLICE_NS */ + -+ /* EGL software counters */ -+ COUNTER_EGL_BLIT_TIME, ++ /**< Value for JS_SOFT_JOB_TIMEOUT */ ++ atomic_t soft_job_timeout_ms; + -+ /* GLES software counters */ -+ COUNTER_GLES_DRAW_ELEMENTS_CALLS, -+ COUNTER_GLES_DRAW_ELEMENTS_NUM_INDICES, -+ COUNTER_GLES_DRAW_ELEMENTS_NUM_TRANSFORMED, -+ COUNTER_GLES_DRAW_ARRAYS_CALLS, -+ COUNTER_GLES_DRAW_ARRAYS_NUM_TRANSFORMED, -+ COUNTER_GLES_DRAW_POINTS, -+ COUNTER_GLES_DRAW_LINES, -+ COUNTER_GLES_DRAW_LINE_LOOP, -+ COUNTER_GLES_DRAW_LINE_STRIP, -+ COUNTER_GLES_DRAW_TRIANGLES, -+ COUNTER_GLES_DRAW_TRIANGLE_STRIP, -+ COUNTER_GLES_DRAW_TRIANGLE_FAN, -+ COUNTER_GLES_NON_VBO_DATA_COPY_TIME, -+ COUNTER_GLES_UNIFORM_BYTES_COPIED_TO_MALI, -+ COUNTER_GLES_UPLOAD_TEXTURE_TIME, -+ COUNTER_GLES_UPLOAD_VBO_TIME, -+ COUNTER_GLES_NUM_FLUSHES, -+ COUNTER_GLES_NUM_VSHADERS_GENERATED, -+ COUNTER_GLES_NUM_FSHADERS_GENERATED, -+ COUNTER_GLES_VSHADER_GEN_TIME, -+ COUNTER_GLES_FSHADER_GEN_TIME, -+ COUNTER_GLES_INPUT_TRIANGLES, -+ COUNTER_GLES_VXCACHE_HIT, -+ COUNTER_GLES_VXCACHE_MISS, -+ COUNTER_GLES_VXCACHE_COLLISION, -+ COUNTER_GLES_CULLED_TRIANGLES, -+ COUNTER_GLES_CULLED_LINES, -+ COUNTER_GLES_BACKFACE_TRIANGLES, -+ COUNTER_GLES_GBCLIP_TRIANGLES, -+ COUNTER_GLES_GBCLIP_LINES, -+ COUNTER_GLES_TRIANGLES_DRAWN, -+ COUNTER_GLES_DRAWCALL_TIME, -+ COUNTER_GLES_TRIANGLES_COUNT, -+ COUNTER_GLES_INDEPENDENT_TRIANGLES_COUNT, -+ COUNTER_GLES_STRIP_TRIANGLES_COUNT, -+ COUNTER_GLES_FAN_TRIANGLES_COUNT, -+ COUNTER_GLES_LINES_COUNT, -+ COUNTER_GLES_INDEPENDENT_LINES_COUNT, -+ COUNTER_GLES_STRIP_LINES_COUNT, -+ COUNTER_GLES_LOOP_LINES_COUNT, ++ /** List of suspended soft jobs */ ++ struct list_head suspended_soft_jobs_list; + -+ /* Special counter */ ++#ifdef CONFIG_MALI_DEBUG ++ /* Support soft-stop on a single context */ ++ bool softstop_always; ++#endif /* CONFIG_MALI_DEBUG */ + -+ /* Framebuffer capture pseudo-counter */ -+ COUNTER_FILMSTRIP, -+ COUNTER_FREQUENCY, -+ COUNTER_VOLTAGE, -+ COUNTER_VP_ACTIVITY, -+ COUNTER_FP_ACTIVITY, -+ COUNTER_TOTAL_ALLOC_PAGES, ++ /** The initalized-flag is placed at the end, to avoid cache-pollution (we should ++ * only be using this during init/term paths). ++ * @note This is a write-once member, and so no locking is required to read */ ++ int init_status; + -+ /* Memory usage counter */ -+ COUNTER_MEM_UNTYPED, -+ COUNTER_MEM_VB_IB, -+ COUNTER_MEM_TEXTURE, -+ COUNTER_MEM_VARYING, -+ COUNTER_MEM_RT, -+ COUNTER_MEM_PBUFFER, -+ /* memory usages for gp command */ -+ COUNTER_MEM_PLBU_HEAP, -+ COUNTER_MEM_POINTER_ARRAY, -+ COUNTER_MEM_SLAVE_TILELIST, -+ COUNTER_MEM_UNTYPE_GP_CMDLIST, -+ /* memory usages for polygon list command */ -+ COUNTER_MEM_POLYGON_CMDLIST, -+ /* memory usages for pp command */ -+ COUNTER_MEM_TD, -+ COUNTER_MEM_RSW, -+ /* other memory usages */ -+ COUNTER_MEM_SHADER, -+ COUNTER_MEM_STREAMS, -+ COUNTER_MEM_FRAGMENT_STACK, -+ COUNTER_MEM_UNIFORM, -+ /* Special mem usage, which is used for mem pool allocation */ -+ COUNTER_MEM_UNTYPE_MEM_POOL, -+ COUNTER_MEM_UNTYPE_SURFACE, ++ /* Number of contexts that can currently be pulled from */ ++ u32 nr_contexts_pullable; + -+ NUMBER_OF_EVENTS -+} _mali_osk_counter_id; ++ /* Number of contexts that can either be pulled from or are currently ++ * running */ ++ atomic_t nr_contexts_runnable; ++}; + -+#define FIRST_ACTIVITY_EVENT ACTIVITY_VP_0 -+#define LAST_ACTIVITY_EVENT ACTIVITY_FP_7 ++/** ++ * @brief KBase Context Job Scheduling information structure ++ * ++ * This is a substructure in the struct kbase_context that encapsulates all the ++ * scheduling information. ++ */ ++struct kbasep_js_kctx_info { + -+#define FIRST_HW_COUNTER COUNTER_L2_0_C0 -+#define LAST_HW_COUNTER COUNTER_FP_7_C1 ++ /** ++ * Job Scheduler Context information sub-structure. These members are ++ * accessed regardless of whether the context is: ++ * - In the Policy's Run Pool ++ * - In the Policy's Queue ++ * - Not queued nor in the Run Pool. ++ * ++ * You must obtain the jsctx_mutex before accessing any other members of ++ * this substructure. ++ * ++ * You may not access any of these members from IRQ context. ++ */ ++ struct kbase_jsctx { ++ struct mutex jsctx_mutex; /**< Job Scheduler Context lock */ + -+#define FIRST_SW_COUNTER COUNTER_EGL_BLIT_TIME -+#define LAST_SW_COUNTER COUNTER_GLES_LOOP_LINES_COUNT ++ /** Number of jobs ready to run - does \em not include the jobs waiting in ++ * the dispatcher, and dependency-only jobs. See kbase_jd_context::job_nr ++ * for such jobs*/ ++ u32 nr_jobs; + -+#define FIRST_SPECIAL_COUNTER COUNTER_FILMSTRIP -+#define LAST_SPECIAL_COUNTER COUNTER_TOTAL_ALLOC_PAGES ++ /** Context Attributes: ++ * Each is large enough to hold a refcount of the number of atoms on ++ * the context. **/ ++ u32 ctx_attr_ref_count[KBASEP_JS_CTX_ATTR_COUNT]; + -+#define FIRST_MEM_COUNTER COUNTER_MEM_UNTYPED -+#define LAST_MEM_COUNTER COUNTER_MEM_UNTYPE_SURFACE ++ /** ++ * Wait queue to wait for KCTX_SHEDULED flag state changes. ++ * */ ++ wait_queue_head_t is_scheduled_wait; + -+#define MALI_PROFILING_MEM_COUNTERS_NUM (LAST_MEM_COUNTER - FIRST_MEM_COUNTER + 1) -+#define MALI_PROFILING_SPECIAL_COUNTERS_NUM (LAST_SPECIAL_COUNTER - FIRST_SPECIAL_COUNTER + 1) -+#define MALI_PROFILING_SW_COUNTERS_NUM (LAST_SW_COUNTER - FIRST_SW_COUNTER + 1) ++ /** Link implementing JS queues. Context can be present on one ++ * list per job slot ++ */ ++ struct list_head ctx_list_entry[BASE_JM_MAX_NR_SLOTS]; ++ } ctx; + -+/** -+ * Define the stream header type for porfiling stream. -+ */ -+#define STREAM_HEADER_FRAMEBUFFER 0x05 /* The stream packet header type for framebuffer dumping. */ -+#define STREAM_HEADER_COUNTER_VALUE 0x09 /* The stream packet header type for hw/sw/memory counter sampling. */ -+#define STREAM_HEADER_CORE_ACTIVITY 0x0a /* The stream packet header type for activity counter sampling. */ -+#define STREAM_HEADER_SIZE 5 ++ /* The initalized-flag is placed at the end, to avoid cache-pollution (we should ++ * only be using this during init/term paths) */ ++ int init_status; ++}; + -+/** -+ * Define the packet header type of profiling control packet. -+ */ -+#define PACKET_HEADER_ERROR 0x80 /* The response packet header type if error. */ -+#define PACKET_HEADER_ACK 0x81 /* The response packet header type if OK. */ -+#define PACKET_HEADER_COUNTERS_REQUEST 0x82 /* The control packet header type to request counter information from ddk. */ -+#define PACKET_HEADER_COUNTERS_ACK 0x83 /* The response packet header type to send out counter information. */ -+#define PACKET_HEADER_COUNTERS_ENABLE 0x84 /* The control packet header type to enable counters. */ -+#define PACKET_HEADER_START_CAPTURE_VALUE 0x85 /* The control packet header type to start capture values. */ ++/** Subset of atom state that can be available after jd_done_nolock() is called ++ * on that atom. A copy must be taken via kbasep_js_atom_retained_state_copy(), ++ * because the original atom could disappear. */ ++struct kbasep_js_atom_retained_state { ++ /** Event code - to determine whether the atom has finished */ ++ enum base_jd_event_code event_code; ++ /** core requirements */ ++ base_jd_core_req core_req; ++ /* priority */ ++ int sched_priority; ++ /** Job Slot to retry submitting to if submission from IRQ handler failed */ ++ int retry_submit_on_slot; ++ /* Core group atom was executed on */ ++ u32 device_nr; + -+#define PACKET_HEADER_SIZE 5 ++}; + +/** -+ * Structure to pass performance counter data of a Mali core ++ * Value signifying 'no retry on a slot required' for: ++ * - kbase_js_atom_retained_state::retry_submit_on_slot ++ * - kbase_jd_atom::retry_submit_on_slot + */ -+typedef struct _mali_profiling_core_counters { -+ u32 source0; -+ u32 value0; -+ u32 source1; -+ u32 value1; -+} _mali_profiling_core_counters; ++#define KBASEP_JS_RETRY_SUBMIT_SLOT_INVALID (-1) + +/** -+ * Structure to pass performance counter data of Mali L2 cache cores ++ * base_jd_core_req value signifying 'invalid' for a kbase_jd_atom_retained_state. ++ * ++ * @see kbase_atom_retained_state_is_valid() + */ -+typedef struct _mali_profiling_l2_counter_values { -+ struct _mali_profiling_core_counters cores[MAX_NUM_L2_CACHE_CORES]; -+} _mali_profiling_l2_counter_values; ++#define KBASEP_JS_ATOM_RETAINED_STATE_CORE_REQ_INVALID BASE_JD_REQ_DEP + +/** -+ * Structure to pass data defining Mali instance in use: ++ * @brief The JS timer resolution, in microseconds + * -+ * mali_product_id - Mali product id -+ * mali_version_major - Mali version major number -+ * mali_version_minor - Mali version minor number -+ * num_of_l2_cores - number of L2 cache cores -+ * num_of_fp_cores - number of fragment processor cores -+ * num_of_vp_cores - number of vertex processor cores ++ * Any non-zero difference in time will be at least this size. + */ -+typedef struct _mali_profiling_mali_version { -+ u32 mali_product_id; -+ u32 mali_version_major; -+ u32 mali_version_minor; -+ u32 num_of_l2_cores; -+ u32 num_of_fp_cores; -+ u32 num_of_vp_cores; -+} _mali_profiling_mali_version; ++#define KBASEP_JS_TICK_RESOLUTION_US 1 + -+/** -+ * Structure to define the mali profiling counter struct. ++/* ++ * Internal atom priority defines for kbase_jd_atom::sched_prio + */ -+typedef struct mali_profiling_counter { -+ char counter_name[40]; -+ u32 counter_id; -+ u32 counter_event; -+ u32 prev_counter_value; -+ u32 current_counter_value; -+ u32 key; -+ int enabled; -+} mali_profiling_counter; ++enum { ++ KBASE_JS_ATOM_SCHED_PRIO_HIGH = 0, ++ KBASE_JS_ATOM_SCHED_PRIO_MED, ++ KBASE_JS_ATOM_SCHED_PRIO_LOW, ++ KBASE_JS_ATOM_SCHED_PRIO_COUNT, ++}; ++ ++/* Invalid priority for kbase_jd_atom::sched_prio */ ++#define KBASE_JS_ATOM_SCHED_PRIO_INVALID -1 + ++/* Default priority in the case of contexts with no atoms, or being lenient ++ * about invalid priorities from userspace */ ++#define KBASE_JS_ATOM_SCHED_PRIO_DEFAULT KBASE_JS_ATOM_SCHED_PRIO_MED ++ ++ /** @} *//* end group kbase_js */ ++ /** @} *//* end group base_kbase_api */ ++ /** @} *//* end group base_api */ ++ ++#endif /* _KBASE_JS_DEFS_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_linux.h b/drivers/gpu/arm/midgard/mali_kbase_linux.h +new file mode 100755 +index 000000000..6d1e61fd4 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_linux.h +@@ -0,0 +1,43 @@ +/* -+ * List of possible actions to be controlled by Streamline. -+ * The following numbers are used by gator to control the frame buffer dumping and s/w counter reporting. -+ * We cannot use the enums in mali_uk_types.h because they are unknown inside gator. ++ * ++ * (C) COPYRIGHT 2010-2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ -+#define FBDUMP_CONTROL_ENABLE (1) -+#define FBDUMP_CONTROL_RATE (2) -+#define SW_COUNTER_ENABLE (3) -+#define FBDUMP_CONTROL_RESIZE_FACTOR (4) -+#define MEM_COUNTER_ENABLE (5) -+#define ANNOTATE_PROFILING_ENABLE (6) + -+void _mali_profiling_control(u32 action, u32 value); + -+u32 _mali_profiling_get_l2_counters(_mali_profiling_l2_counter_values *values); + -+int _mali_profiling_set_event(u32 counter_id, s32 event_id); + -+u32 _mali_profiling_get_api_version(void); + -+void _mali_profiling_get_mali_version(struct _mali_profiling_mali_version *values); ++/** ++ * @file mali_kbase_linux.h ++ * Base kernel APIs, Linux implementation. ++ */ + -+#ifdef __cplusplus -+} ++#ifndef _KBASE_LINUX_H_ ++#define _KBASE_LINUX_H_ ++ ++/* All things that are needed for the Linux port. */ ++#include ++#include ++#include ++#include ++#include ++ ++#if (defined(MALI_KERNEL_TEST_API) && (1 == MALI_KERNEL_TEST_API)) ++ #define KBASE_EXPORT_TEST_API(func) EXPORT_SYMBOL(func) ++#else ++ #define KBASE_EXPORT_TEST_API(func) +#endif + -+#endif /* __MALI_UTGARD_PROFILING_GATOR_API_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h ++#define KBASE_EXPORT_SYMBOL(func) EXPORT_SYMBOL(func) ++ ++#endif /* _KBASE_LINUX_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.c b/drivers/gpu/arm/midgard/mali_kbase_mem.c new file mode 100755 -index 000000000000..34656f09b2ab +index 000000000..8cbb5f676 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h -@@ -0,0 +1,1108 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_mem.c +@@ -0,0 +1,2657 @@ +/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+/** -+ * @file mali_uk_types.h -+ * Defines the types and constants used in the user-kernel interface ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef __MALI_UTGARD_UK_TYPES_H__ -+#define __MALI_UTGARD_UK_TYPES_H__ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif + -+/* Iteration functions depend on these values being consecutive. */ -+#define MALI_UK_TIMELINE_GP 0 -+#define MALI_UK_TIMELINE_PP 1 -+#define MALI_UK_TIMELINE_SOFT 2 -+#define MALI_UK_TIMELINE_MAX 3 + -+#define MALI_UK_BIG_VARYING_SIZE (1024*1024*2) + -+typedef struct { -+ u32 points[MALI_UK_TIMELINE_MAX]; -+ s32 sync_fd; -+} _mali_uk_fence_t; + +/** -+ * @addtogroup uddapi Unified Device Driver (UDD) APIs -+ * -+ * @{ ++ * @file mali_kbase_mem.c ++ * Base kernel memory APIs + */ ++#ifdef CONFIG_DMA_SHARED_BUFFER ++#include ++#endif /* CONFIG_DMA_SHARED_BUFFER */ ++#ifdef CONFIG_UMP ++#include ++#endif /* CONFIG_UMP */ ++#include ++#include ++#include ++#include ++#include + -+/** -+ * @addtogroup u_k_api UDD User/Kernel Interface (U/K) APIs -+ * -+ * @{ -+ */ -+ -+/** @defgroup _mali_uk_core U/K Core -+ * @{ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+/** Definition of subsystem numbers, to assist in creating a unique identifier -+ * for each U/K call. -+ * -+ * @see _mali_uk_functions */ -+typedef enum { -+ _MALI_UK_CORE_SUBSYSTEM, /**< Core Group of U/K calls */ -+ _MALI_UK_MEMORY_SUBSYSTEM, /**< Memory Group of U/K calls */ -+ _MALI_UK_PP_SUBSYSTEM, /**< Fragment Processor Group of U/K calls */ -+ _MALI_UK_GP_SUBSYSTEM, /**< Vertex Processor Group of U/K calls */ -+ _MALI_UK_PROFILING_SUBSYSTEM, /**< Profiling Group of U/K calls */ -+ _MALI_UK_VSYNC_SUBSYSTEM, /**< VSYNC Group of U/K calls */ -+} _mali_uk_subsystem_t; ++/* This function finds out which RB tree the given GPU VA region belongs to ++ * based on the region zone */ ++static struct rb_root *kbase_reg_flags_to_rbtree(struct kbase_context *kctx, ++ struct kbase_va_region *reg) ++{ ++ struct rb_root *rbtree = NULL; + -+/** Within a function group each function has its unique sequence number -+ * to assist in creating a unique identifier for each U/K call. -+ * -+ * An ordered pair of numbers selected from -+ * ( \ref _mali_uk_subsystem_t,\ref _mali_uk_functions) will uniquely identify the -+ * U/K call across all groups of functions, and all functions. */ -+typedef enum { -+ /** Core functions */ ++ switch (reg->flags & KBASE_REG_ZONE_MASK) { ++ case KBASE_REG_ZONE_CUSTOM_VA: ++ rbtree = &kctx->reg_rbtree_custom; ++ break; ++ case KBASE_REG_ZONE_EXEC: ++ rbtree = &kctx->reg_rbtree_exec; ++ break; ++ case KBASE_REG_ZONE_SAME_VA: ++ rbtree = &kctx->reg_rbtree_same; ++ /* fall through */ ++ default: ++ rbtree = &kctx->reg_rbtree_same; ++ break; ++ } + -+ _MALI_UK_OPEN = 0, /**< _mali_ukk_open() */ -+ _MALI_UK_CLOSE, /**< _mali_ukk_close() */ -+ _MALI_UK_WAIT_FOR_NOTIFICATION, /**< _mali_ukk_wait_for_notification() */ -+ _MALI_UK_GET_API_VERSION, /**< _mali_ukk_get_api_version() */ -+ _MALI_UK_POST_NOTIFICATION, /**< _mali_ukk_post_notification() */ -+ _MALI_UK_GET_USER_SETTING, /**< _mali_ukk_get_user_setting() *//**< [out] */ -+ _MALI_UK_GET_USER_SETTINGS, /**< _mali_ukk_get_user_settings() *//**< [out] */ -+ _MALI_UK_REQUEST_HIGH_PRIORITY, /**< _mali_ukk_request_high_priority() */ -+ _MALI_UK_TIMELINE_GET_LATEST_POINT, /**< _mali_ukk_timeline_get_latest_point() */ -+ _MALI_UK_TIMELINE_WAIT, /**< _mali_ukk_timeline_wait() */ -+ _MALI_UK_TIMELINE_CREATE_SYNC_FENCE, /**< _mali_ukk_timeline_create_sync_fence() */ -+ _MALI_UK_SOFT_JOB_START, /**< _mali_ukk_soft_job_start() */ -+ _MALI_UK_SOFT_JOB_SIGNAL, /**< _mali_ukk_soft_job_signal() */ -+ _MALI_UK_PENDING_SUBMIT, /**< _mali_ukk_pending_submit() */ ++ return rbtree; ++} + -+ _MALI_GET_RK_KO_VERSION, /* rk_ext */ -+ _MALI_UK_GET_MALI_VERSION_IN_RK30, ++/* This function finds out which RB tree the given pfn from the GPU VA belongs ++ * to based on the memory zone the pfn refers to */ ++static struct rb_root *kbase_gpu_va_to_rbtree(struct kbase_context *kctx, ++ u64 gpu_pfn) ++{ ++ struct rb_root *rbtree = NULL; + -+ /** Memory functions */ ++#ifdef CONFIG_64BIT ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) { ++#endif /* CONFIG_64BIT */ ++ if (gpu_pfn >= KBASE_REG_ZONE_CUSTOM_VA_BASE) ++ rbtree = &kctx->reg_rbtree_custom; ++ else if (gpu_pfn >= KBASE_REG_ZONE_EXEC_BASE) ++ rbtree = &kctx->reg_rbtree_exec; ++ else ++ rbtree = &kctx->reg_rbtree_same; ++#ifdef CONFIG_64BIT ++ } else { ++ if (gpu_pfn >= kctx->same_va_end) ++ rbtree = &kctx->reg_rbtree_custom; ++ else ++ rbtree = &kctx->reg_rbtree_same; ++ } ++#endif /* CONFIG_64BIT */ + -+ _MALI_UK_ALLOC_MEM = 0, /**< _mali_ukk_alloc_mem() */ -+ _MALI_UK_FREE_MEM, /**< _mali_ukk_free_mem() */ -+ _MALI_UK_BIND_MEM, /**< _mali_ukk_mem_bind() */ -+ _MALI_UK_UNBIND_MEM, /**< _mali_ukk_mem_unbind() */ -+ _MALI_UK_COW_MEM, /**< _mali_ukk_mem_cow() */ -+ _MALI_UK_COW_MODIFY_RANGE, /**< _mali_ukk_mem_cow_modify_range() */ -+ _MALI_UK_RESIZE_MEM, /**<._mali_ukk_mem_resize() */ -+ _MALI_UK_QUERY_MMU_PAGE_TABLE_DUMP_SIZE, /**< _mali_ukk_mem_get_mmu_page_table_dump_size() */ -+ _MALI_UK_DUMP_MMU_PAGE_TABLE, /**< _mali_ukk_mem_dump_mmu_page_table() */ -+ _MALI_UK_DMA_BUF_GET_SIZE, /**< _mali_ukk_dma_buf_get_size() */ -+ _MALI_UK_MEM_WRITE_SAFE, /**< _mali_uku_mem_write_safe() */ ++ return rbtree; ++} + -+ /** Common functions for each core */ ++/* This function inserts a region into the tree. */ ++static void kbase_region_tracker_insert(struct kbase_context *kctx, ++ struct kbase_va_region *new_reg) ++{ ++ u64 start_pfn = new_reg->start_pfn; ++ struct rb_node **link = NULL; ++ struct rb_node *parent = NULL; ++ struct rb_root *rbtree = NULL; + -+ _MALI_UK_START_JOB = 0, /**< Start a Fragment/Vertex Processor Job on a core */ -+ _MALI_UK_GET_NUMBER_OF_CORES, /**< Get the number of Fragment/Vertex Processor cores */ -+ _MALI_UK_GET_CORE_VERSION, /**< Get the Fragment/Vertex Processor version compatible with all cores */ ++ rbtree = kbase_reg_flags_to_rbtree(kctx, new_reg); + -+ /** Fragment Processor Functions */ ++ link = &(rbtree->rb_node); ++ /* Find the right place in the tree using tree search */ ++ while (*link) { ++ struct kbase_va_region *old_reg; + -+ _MALI_UK_PP_START_JOB = _MALI_UK_START_JOB, /**< _mali_ukk_pp_start_job() */ -+ _MALI_UK_GET_PP_NUMBER_OF_CORES = _MALI_UK_GET_NUMBER_OF_CORES, /**< _mali_ukk_get_pp_number_of_cores() */ -+ _MALI_UK_GET_PP_CORE_VERSION = _MALI_UK_GET_CORE_VERSION, /**< _mali_ukk_get_pp_core_version() */ -+ _MALI_UK_PP_DISABLE_WB, /**< _mali_ukk_pp_job_disable_wb() */ -+ _MALI_UK_PP_AND_GP_START_JOB, /**< _mali_ukk_pp_and_gp_start_job() */ ++ parent = *link; ++ old_reg = rb_entry(parent, struct kbase_va_region, rblink); + -+ /** Vertex Processor Functions */ ++ /* RBTree requires no duplicate entries. */ ++ KBASE_DEBUG_ASSERT(old_reg->start_pfn != start_pfn); + -+ _MALI_UK_GP_START_JOB = _MALI_UK_START_JOB, /**< _mali_ukk_gp_start_job() */ -+ _MALI_UK_GET_GP_NUMBER_OF_CORES = _MALI_UK_GET_NUMBER_OF_CORES, /**< _mali_ukk_get_gp_number_of_cores() */ -+ _MALI_UK_GET_GP_CORE_VERSION = _MALI_UK_GET_CORE_VERSION, /**< _mali_ukk_get_gp_core_version() */ -+ _MALI_UK_GP_SUSPEND_RESPONSE, /**< _mali_ukk_gp_suspend_response() */ ++ if (old_reg->start_pfn > start_pfn) ++ link = &(*link)->rb_left; ++ else ++ link = &(*link)->rb_right; ++ } + -+ /** Profiling functions */ ++ /* Put the new node there, and rebalance tree */ ++ rb_link_node(&(new_reg->rblink), parent, link); + -+ _MALI_UK_PROFILING_ADD_EVENT = 0, /**< __mali_uku_profiling_add_event() */ -+ _MALI_UK_PROFILING_REPORT_SW_COUNTERS,/**< __mali_uku_profiling_report_sw_counters() */ -+ _MALI_UK_PROFILING_MEMORY_USAGE_GET, /**< __mali_uku_profiling_memory_usage_get() */ -+ _MALI_UK_PROFILING_STREAM_FD_GET, /** < __mali_uku_profiling_stream_fd_get() */ -+ _MALI_UK_PROFILING_CONTROL_SET, /** < __mali_uku_profiling_control_set() */ ++ rb_insert_color(&(new_reg->rblink), rbtree); ++} + -+ /** VSYNC reporting fuctions */ -+ _MALI_UK_VSYNC_EVENT_REPORT = 0, /**< _mali_ukk_vsync_event_report() */ -+} _mali_uk_functions; ++/* Find allocated region enclosing free range. */ ++static struct kbase_va_region *kbase_region_tracker_find_region_enclosing_range_free( ++ struct kbase_context *kctx, u64 start_pfn, size_t nr_pages) ++{ ++ struct rb_node *rbnode = NULL; ++ struct kbase_va_region *reg = NULL; ++ struct rb_root *rbtree = NULL; + -+/** @defgroup _mali_uk_getsysteminfo U/K Get System Info -+ * @{ */ ++ u64 end_pfn = start_pfn + nr_pages; + -+/** -+ * Type definition for the core version number. -+ * Used when returning the version number read from a core -+ * -+ * Its format is that of the 32-bit Version register for a particular core. -+ * Refer to the "Mali200 and MaliGP2 3D Graphics Processor Technical Reference -+ * Manual", ARM DDI 0415C, for more information. -+ */ -+typedef u32 _mali_core_version; ++ rbtree = kbase_gpu_va_to_rbtree(kctx, start_pfn); + -+/** @} */ /* end group _mali_uk_core */ ++ rbnode = rbtree->rb_node; + ++ while (rbnode) { ++ u64 tmp_start_pfn, tmp_end_pfn; + -+/** @defgroup _mali_uk_gp U/K Vertex Processor -+ * @{ */ ++ reg = rb_entry(rbnode, struct kbase_va_region, rblink); ++ tmp_start_pfn = reg->start_pfn; ++ tmp_end_pfn = reg->start_pfn + reg->nr_pages; + -+/** @defgroup _mali_uk_gp_suspend_response_s Vertex Processor Suspend Response -+ * @{ */ ++ /* If start is lower than this, go left. */ ++ if (start_pfn < tmp_start_pfn) ++ rbnode = rbnode->rb_left; ++ /* If end is higher than this, then go right. */ ++ else if (end_pfn > tmp_end_pfn) ++ rbnode = rbnode->rb_right; ++ else /* Enclosing */ ++ return reg; ++ } + -+/** @brief Arguments for _mali_ukk_gp_suspend_response() -+ * -+ * When _mali_wait_for_notification() receives notification that a -+ * Vertex Processor job was suspended, you need to send a response to indicate -+ * what needs to happen with this job. You can either abort or resume the job. -+ * -+ * - set @c code to indicate response code. This is either @c _MALIGP_JOB_ABORT or -+ * @c _MALIGP_JOB_RESUME_WITH_NEW_HEAP to indicate you will provide a new heap -+ * for the job that will resolve the out of memory condition for the job. -+ * - copy the @c cookie value from the @c _mali_uk_gp_job_suspended_s notification; -+ * this is an identifier for the suspended job -+ * - set @c arguments[0] and @c arguments[1] to zero if you abort the job. If -+ * you resume it, @c argument[0] should specify the Mali start address for the new -+ * heap and @c argument[1] the Mali end address of the heap. -+ * - pass in the user-kernel context @c ctx that was returned from _mali_ukk_open() -+ * -+ */ -+typedef enum _maligp_job_suspended_response_code { -+ _MALIGP_JOB_ABORT, /**< Abort the Vertex Processor job */ -+ _MALIGP_JOB_RESUME_WITH_NEW_HEAP /**< Resume the Vertex Processor job with a new heap */ -+} _maligp_job_suspended_response_code; ++ return NULL; ++} + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 cookie; /**< [in] cookie from the _mali_uk_gp_job_suspended_s notification */ -+ _maligp_job_suspended_response_code code; /**< [in] abort or resume response code, see \ref _maligp_job_suspended_response_code */ -+ u32 arguments[2]; /**< [in] 0 when aborting a job. When resuming a job, the Mali start and end address for a new heap to resume the job with */ -+} _mali_uk_gp_suspend_response_s; ++/* Find region enclosing given address. */ ++struct kbase_va_region *kbase_region_tracker_find_region_enclosing_address(struct kbase_context *kctx, u64 gpu_addr) ++{ ++ struct rb_node *rbnode; ++ struct kbase_va_region *reg; ++ u64 gpu_pfn = gpu_addr >> PAGE_SHIFT; ++ struct rb_root *rbtree = NULL; + -+/** @} */ /* end group _mali_uk_gp_suspend_response_s */ ++ KBASE_DEBUG_ASSERT(NULL != kctx); + -+/** @defgroup _mali_uk_gpstartjob_s Vertex Processor Start Job -+ * @{ */ ++ lockdep_assert_held(&kctx->reg_lock); + -+/** @brief Status indicating the result of the execution of a Vertex or Fragment processor job */ -+typedef enum { -+ _MALI_UK_JOB_STATUS_END_SUCCESS = 1 << (16 + 0), -+ _MALI_UK_JOB_STATUS_END_OOM = 1 << (16 + 1), -+ _MALI_UK_JOB_STATUS_END_ABORT = 1 << (16 + 2), -+ _MALI_UK_JOB_STATUS_END_TIMEOUT_SW = 1 << (16 + 3), -+ _MALI_UK_JOB_STATUS_END_HANG = 1 << (16 + 4), -+ _MALI_UK_JOB_STATUS_END_SEG_FAULT = 1 << (16 + 5), -+ _MALI_UK_JOB_STATUS_END_ILLEGAL_JOB = 1 << (16 + 6), -+ _MALI_UK_JOB_STATUS_END_UNKNOWN_ERR = 1 << (16 + 7), -+ _MALI_UK_JOB_STATUS_END_SHUTDOWN = 1 << (16 + 8), -+ _MALI_UK_JOB_STATUS_END_SYSTEM_UNUSABLE = 1 << (16 + 9) -+} _mali_uk_job_status; ++ rbtree = kbase_gpu_va_to_rbtree(kctx, gpu_pfn); + -+#define MALIGP2_NUM_REGS_FRAME (6) ++ rbnode = rbtree->rb_node; + -+/** @brief Arguments for _mali_ukk_gp_start_job() -+ * -+ * To start a Vertex Processor job -+ * - associate the request with a reference to a @c mali_gp_job_info by setting -+ * user_job_ptr to the address of the @c mali_gp_job_info of the job. -+ * - set @c priority to the priority of the @c mali_gp_job_info -+ * - specify a timeout for the job by setting @c watchdog_msecs to the number of -+ * milliseconds the job is allowed to run. Specifying a value of 0 selects the -+ * default timeout in use by the device driver. -+ * - copy the frame registers from the @c mali_gp_job_info into @c frame_registers. -+ * - set the @c perf_counter_flag, @c perf_counter_src0 and @c perf_counter_src1 to zero -+ * for a non-instrumented build. For an instrumented build you can use up -+ * to two performance counters. Set the corresponding bit in @c perf_counter_flag -+ * to enable them. @c perf_counter_src0 and @c perf_counter_src1 specify -+ * the source of what needs to get counted (e.g. number of vertex loader -+ * cache hits). For source id values, see ARM DDI0415A, Table 3-60. -+ * - pass in the user-kernel context @c ctx that was returned from _mali_ukk_open() -+ * -+ * When @c _mali_ukk_gp_start_job() returns @c _MALI_OSK_ERR_OK, status contains the -+ * result of the request (see \ref _mali_uk_start_job_status). If the job could -+ * not get started (@c _MALI_UK_START_JOB_NOT_STARTED_DO_REQUEUE) it should be -+ * tried again. -+ * -+ * After the job has started, @c _mali_wait_for_notification() will be notified -+ * that the job finished or got suspended. It may get suspended due to -+ * resource shortage. If it finished (see _mali_ukk_wait_for_notification()) -+ * the notification will contain a @c _mali_uk_gp_job_finished_s result. If -+ * it got suspended the notification will contain a @c _mali_uk_gp_job_suspended_s -+ * result. -+ * -+ * The @c _mali_uk_gp_job_finished_s contains the job status (see \ref _mali_uk_job_status), -+ * the number of milliseconds the job took to render, and values of core registers -+ * when the job finished (irq status, performance counters, renderer list -+ * address). A job has finished succesfully when its status is -+ * @c _MALI_UK_JOB_STATUS_FINISHED. If the hardware detected a timeout while rendering -+ * the job, or software detected the job is taking more than watchdog_msecs to -+ * complete, the status will indicate @c _MALI_UK_JOB_STATUS_HANG. -+ * If the hardware detected a bus error while accessing memory associated with the -+ * job, status will indicate @c _MALI_UK_JOB_STATUS_SEG_FAULT. -+ * status will indicate @c _MALI_UK_JOB_STATUS_NOT_STARTED if the driver had to -+ * stop the job but the job didn't start on the hardware yet, e.g. when the -+ * driver shutdown. -+ * -+ * In case the job got suspended, @c _mali_uk_gp_job_suspended_s contains -+ * the @c user_job_ptr identifier used to start the job with, the @c reason -+ * why the job stalled (see \ref _maligp_job_suspended_reason) and a @c cookie -+ * to identify the core on which the job stalled. This @c cookie will be needed -+ * when responding to this nofication by means of _mali_ukk_gp_suspend_response(). -+ * (see _mali_ukk_gp_suspend_response()). The response is either to abort or -+ * resume the job. If the job got suspended due to an out of memory condition -+ * you may be able to resolve this by providing more memory and resuming the job. -+ * -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u64 user_job_ptr; /**< [in] identifier for the job in user space, a @c mali_gp_job_info* */ -+ u32 priority; /**< [in] job priority. A lower number means higher priority */ -+ u32 frame_registers[MALIGP2_NUM_REGS_FRAME]; /**< [in] core specific registers associated with this job */ -+ u32 perf_counter_flag; /**< [in] bitmask indicating which performance counters to enable, see \ref _MALI_PERFORMANCE_COUNTER_FLAG_SRC0_ENABLE and related macro definitions */ -+ u32 perf_counter_src0; /**< [in] source id for performance counter 0 (see ARM DDI0415A, Table 3-60) */ -+ u32 perf_counter_src1; /**< [in] source id for performance counter 1 (see ARM DDI0415A, Table 3-60) */ -+ u32 frame_builder_id; /**< [in] id of the originating frame builder */ -+ u32 flush_id; /**< [in] flush id within the originating frame builder */ -+ _mali_uk_fence_t fence; /**< [in] fence this job must wait on */ -+ u64 timeline_point_ptr; /**< [in,out] pointer to u32: location where point on gp timeline for this job will be written */ -+ u32 varying_memsize; /** < [in] size of varying memory to use deffer bind*/ -+ u32 deferred_mem_num; -+ u64 deferred_mem_list; /** < [in] memory hanlde list of varying buffer to use deffer bind */ -+} _mali_uk_gp_start_job_s; ++ while (rbnode) { ++ u64 tmp_start_pfn, tmp_end_pfn; + -+#define _MALI_PERFORMANCE_COUNTER_FLAG_SRC0_ENABLE (1<<0) /**< Enable performance counter SRC0 for a job */ -+#define _MALI_PERFORMANCE_COUNTER_FLAG_SRC1_ENABLE (1<<1) /**< Enable performance counter SRC1 for a job */ -+#define _MALI_PERFORMANCE_COUNTER_FLAG_HEATMAP_ENABLE (1<<2) /**< Enable per tile (aka heatmap) generation with for a job (using the enabled counter sources) */ ++ reg = rb_entry(rbnode, struct kbase_va_region, rblink); ++ tmp_start_pfn = reg->start_pfn; ++ tmp_end_pfn = reg->start_pfn + reg->nr_pages; + -+/** @} */ /* end group _mali_uk_gpstartjob_s */ ++ /* If start is lower than this, go left. */ ++ if (gpu_pfn < tmp_start_pfn) ++ rbnode = rbnode->rb_left; ++ /* If end is higher than this, then go right. */ ++ else if (gpu_pfn >= tmp_end_pfn) ++ rbnode = rbnode->rb_right; ++ else /* Enclosing */ ++ return reg; ++ } + -+typedef struct { -+ u64 user_job_ptr; /**< [out] identifier for the job in user space */ -+ _mali_uk_job_status status; /**< [out] status of finished job */ -+ u32 heap_current_addr; /**< [out] value of the GP PLB PL heap start address register */ -+ u32 perf_counter0; /**< [out] value of performance counter 0 (see ARM DDI0415A) */ -+ u32 perf_counter1; /**< [out] value of performance counter 1 (see ARM DDI0415A) */ -+ u32 pending_big_job_num; -+} _mali_uk_gp_job_finished_s; ++ return NULL; ++} + -+typedef struct { -+ u64 user_job_ptr; /**< [out] identifier for the job in user space */ -+ u32 cookie; /**< [out] identifier for the core in kernel space on which the job stalled */ -+} _mali_uk_gp_job_suspended_s; ++KBASE_EXPORT_TEST_API(kbase_region_tracker_find_region_enclosing_address); + -+/** @} */ /* end group _mali_uk_gp */ ++/* Find region with given base address */ ++struct kbase_va_region *kbase_region_tracker_find_region_base_address(struct kbase_context *kctx, u64 gpu_addr) ++{ ++ u64 gpu_pfn = gpu_addr >> PAGE_SHIFT; ++ struct rb_node *rbnode = NULL; ++ struct kbase_va_region *reg = NULL; ++ struct rb_root *rbtree = NULL; + ++ KBASE_DEBUG_ASSERT(NULL != kctx); + -+/** @defgroup _mali_uk_pp U/K Fragment Processor -+ * @{ */ ++ lockdep_assert_held(&kctx->reg_lock); + -+#define _MALI_PP_MAX_SUB_JOBS 8 ++ rbtree = kbase_gpu_va_to_rbtree(kctx, gpu_pfn); + -+#define _MALI_PP_MAX_FRAME_REGISTERS ((0x058/4)+1) ++ rbnode = rbtree->rb_node; + -+#define _MALI_PP_MAX_WB_REGISTERS ((0x02C/4)+1) ++ while (rbnode) { ++ reg = rb_entry(rbnode, struct kbase_va_region, rblink); ++ if (reg->start_pfn > gpu_pfn) ++ rbnode = rbnode->rb_left; ++ else if (reg->start_pfn < gpu_pfn) ++ rbnode = rbnode->rb_right; ++ else ++ return reg; + -+#define _MALI_DLBU_MAX_REGISTERS 4 ++ } + -+/** Flag for _mali_uk_pp_start_job_s */ -+#define _MALI_PP_JOB_FLAG_NO_NOTIFICATION (1<<0) -+#define _MALI_PP_JOB_FLAG_IS_WINDOW_SURFACE (1<<1) -+#define _MALI_PP_JOB_FLAG_PROTECTED (1<<2) ++ return NULL; ++} + -+/** @defgroup _mali_uk_ppstartjob_s Fragment Processor Start Job -+ * @{ */ ++KBASE_EXPORT_TEST_API(kbase_region_tracker_find_region_base_address); + -+/** @brief Arguments for _mali_ukk_pp_start_job() -+ * -+ * To start a Fragment Processor job -+ * - associate the request with a reference to a mali_pp_job by setting -+ * @c user_job_ptr to the address of the @c mali_pp_job of the job. -+ * - set @c priority to the priority of the mali_pp_job -+ * - specify a timeout for the job by setting @c watchdog_msecs to the number of -+ * milliseconds the job is allowed to run. Specifying a value of 0 selects the -+ * default timeout in use by the device driver. -+ * - copy the frame registers from the @c mali_pp_job into @c frame_registers. -+ * For MALI200 you also need to copy the write back 0,1 and 2 registers. -+ * - set the @c perf_counter_flag, @c perf_counter_src0 and @c perf_counter_src1 to zero -+ * for a non-instrumented build. For an instrumented build you can use up -+ * to two performance counters. Set the corresponding bit in @c perf_counter_flag -+ * to enable them. @c perf_counter_src0 and @c perf_counter_src1 specify -+ * the source of what needs to get counted (e.g. number of vertex loader -+ * cache hits). For source id values, see ARM DDI0415A, Table 3-60. -+ * - pass in the user-kernel context in @c ctx that was returned from _mali_ukk_open() -+ * -+ * When _mali_ukk_pp_start_job() returns @c _MALI_OSK_ERR_OK, @c status contains the -+ * result of the request (see \ref _mali_uk_start_job_status). If the job could -+ * not get started (@c _MALI_UK_START_JOB_NOT_STARTED_DO_REQUEUE) it should be -+ * tried again. -+ * -+ * After the job has started, _mali_wait_for_notification() will be notified -+ * when the job finished. The notification will contain a -+ * @c _mali_uk_pp_job_finished_s result. It contains the @c user_job_ptr -+ * identifier used to start the job with, the job @c status (see \ref _mali_uk_job_status), -+ * the number of milliseconds the job took to render, and values of core registers -+ * when the job finished (irq status, performance counters, renderer list -+ * address). A job has finished succesfully when its status is -+ * @c _MALI_UK_JOB_STATUS_FINISHED. If the hardware detected a timeout while rendering -+ * the job, or software detected the job is taking more than @c watchdog_msecs to -+ * complete, the status will indicate @c _MALI_UK_JOB_STATUS_HANG. -+ * If the hardware detected a bus error while accessing memory associated with the -+ * job, status will indicate @c _MALI_UK_JOB_STATUS_SEG_FAULT. -+ * status will indicate @c _MALI_UK_JOB_STATUS_NOT_STARTED if the driver had to -+ * stop the job but the job didn't start on the hardware yet, e.g. when the -+ * driver shutdown. -+ * -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u64 user_job_ptr; /**< [in] identifier for the job in user space */ -+ u32 priority; /**< [in] job priority. A lower number means higher priority */ -+ u32 frame_registers[_MALI_PP_MAX_FRAME_REGISTERS]; /**< [in] core specific registers associated with first sub job, see ARM DDI0415A */ -+ u32 frame_registers_addr_frame[_MALI_PP_MAX_SUB_JOBS - 1]; /**< [in] ADDR_FRAME registers for sub job 1-7 */ -+ u32 frame_registers_addr_stack[_MALI_PP_MAX_SUB_JOBS - 1]; /**< [in] ADDR_STACK registers for sub job 1-7 */ -+ u32 wb0_registers[_MALI_PP_MAX_WB_REGISTERS]; -+ u32 wb1_registers[_MALI_PP_MAX_WB_REGISTERS]; -+ u32 wb2_registers[_MALI_PP_MAX_WB_REGISTERS]; -+ u32 dlbu_registers[_MALI_DLBU_MAX_REGISTERS]; /**< [in] Dynamic load balancing unit registers */ -+ u32 num_cores; /**< [in] Number of cores to set up (valid range: 1-8(M450) or 4(M400)) */ -+ u32 perf_counter_flag; /**< [in] bitmask indicating which performance counters to enable, see \ref _MALI_PERFORMANCE_COUNTER_FLAG_SRC0_ENABLE and related macro definitions */ -+ u32 perf_counter_src0; /**< [in] source id for performance counter 0 (see ARM DDI0415A, Table 3-60) */ -+ u32 perf_counter_src1; /**< [in] source id for performance counter 1 (see ARM DDI0415A, Table 3-60) */ -+ u32 frame_builder_id; /**< [in] id of the originating frame builder */ -+ u32 flush_id; /**< [in] flush id within the originating frame builder */ -+ u32 flags; /**< [in] See _MALI_PP_JOB_FLAG_* for a list of avaiable flags */ -+ u32 tilesx; /**< [in] number of tiles in the x direction (needed for heatmap generation */ -+ u32 tilesy; /**< [in] number of tiles in y direction (needed for reading the heatmap memory) */ -+ u32 heatmap_mem; /**< [in] memory address to store counter values per tile (aka heatmap) */ -+ u32 num_memory_cookies; /**< [in] number of memory cookies attached to job */ -+ u64 memory_cookies; /**< [in] pointer to array of u32 memory cookies attached to job */ -+ _mali_uk_fence_t fence; /**< [in] fence this job must wait on */ -+ u64 timeline_point_ptr; /**< [in,out] pointer to location of u32 where point on pp timeline for this job will be written */ -+} _mali_uk_pp_start_job_s; ++/* Find region meeting given requirements */ ++static struct kbase_va_region *kbase_region_tracker_find_region_meeting_reqs(struct kbase_context *kctx, struct kbase_va_region *reg_reqs, size_t nr_pages, size_t align) ++{ ++ struct rb_node *rbnode = NULL; ++ struct kbase_va_region *reg = NULL; ++ struct rb_root *rbtree = NULL; + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u64 gp_args; /**< [in,out] GP uk arguments (see _mali_uk_gp_start_job_s) */ -+ u64 pp_args; /**< [in,out] PP uk arguments (see _mali_uk_pp_start_job_s) */ -+} _mali_uk_pp_and_gp_start_job_s; ++ /* Note that this search is a linear search, as we do not have a target ++ address in mind, so does not benefit from the rbtree search */ + -+/** @} */ /* end group _mali_uk_ppstartjob_s */ ++ rbtree = kbase_reg_flags_to_rbtree(kctx, reg_reqs); + -+typedef struct { -+ u64 user_job_ptr; /**< [out] identifier for the job in user space */ -+ _mali_uk_job_status status; /**< [out] status of finished job */ -+ u32 perf_counter0[_MALI_PP_MAX_SUB_JOBS]; /**< [out] value of perfomance counter 0 (see ARM DDI0415A), one for each sub job */ -+ u32 perf_counter1[_MALI_PP_MAX_SUB_JOBS]; /**< [out] value of perfomance counter 1 (see ARM DDI0415A), one for each sub job */ -+ u32 perf_counter_src0; -+ u32 perf_counter_src1; -+} _mali_uk_pp_job_finished_s; ++ rbnode = rb_first(rbtree); + -+typedef struct { -+ u32 number_of_enabled_cores; /**< [out] the new number of enabled cores */ -+} _mali_uk_pp_num_cores_changed_s; ++ while (rbnode) { ++ reg = rb_entry(rbnode, struct kbase_va_region, rblink); ++ if ((reg->nr_pages >= nr_pages) && ++ (reg->flags & KBASE_REG_FREE)) { ++ /* Check alignment */ ++ u64 start_pfn = (reg->start_pfn + align - 1) & ~(align - 1); + ++ if ((start_pfn >= reg->start_pfn) && ++ (start_pfn <= (reg->start_pfn + reg->nr_pages - 1)) && ++ ((start_pfn + nr_pages - 1) <= (reg->start_pfn + reg->nr_pages - 1))) ++ return reg; ++ } ++ rbnode = rb_next(rbnode); ++ } + ++ return NULL; ++} + +/** -+ * Flags to indicate write-back units ++ * @brief Remove a region object from the global list. ++ * ++ * The region reg is removed, possibly by merging with other free and ++ * compatible adjacent regions. It must be called with the context ++ * region lock held. The associated memory is not released (see ++ * kbase_free_alloced_region). Internal use only. + */ -+typedef enum { -+ _MALI_UK_PP_JOB_WB0 = 1, -+ _MALI_UK_PP_JOB_WB1 = 2, -+ _MALI_UK_PP_JOB_WB2 = 4, -+} _mali_uk_pp_job_wbx_flag; ++static int kbase_remove_va_region(struct kbase_context *kctx, struct kbase_va_region *reg) ++{ ++ struct rb_node *rbprev; ++ struct kbase_va_region *prev = NULL; ++ struct rb_node *rbnext; ++ struct kbase_va_region *next = NULL; ++ struct rb_root *reg_rbtree = NULL; + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 fb_id; /**< [in] Frame builder ID of job to disable WB units for */ -+ u32 wb0_memory; -+ u32 wb1_memory; -+ u32 wb2_memory; -+} _mali_uk_pp_disable_wb_s; ++ int merged_front = 0; ++ int merged_back = 0; ++ int err = 0; + ++ reg_rbtree = kbase_reg_flags_to_rbtree(kctx, reg); + -+/** @} */ /* end group _mali_uk_pp */ ++ /* Try to merge with the previous block first */ ++ rbprev = rb_prev(&(reg->rblink)); ++ if (rbprev) { ++ prev = rb_entry(rbprev, struct kbase_va_region, rblink); ++ if (prev->flags & KBASE_REG_FREE) { ++ /* We're compatible with the previous VMA, ++ * merge with it */ ++ WARN_ON((prev->flags & KBASE_REG_ZONE_MASK) != ++ (reg->flags & KBASE_REG_ZONE_MASK)); ++ prev->nr_pages += reg->nr_pages; ++ rb_erase(&(reg->rblink), reg_rbtree); ++ reg = prev; ++ merged_front = 1; ++ } ++ } + -+/** @defgroup _mali_uk_soft_job U/K Soft Job -+ * @{ */ ++ /* Try to merge with the next block second */ ++ /* Note we do the lookup here as the tree may have been rebalanced. */ ++ rbnext = rb_next(&(reg->rblink)); ++ if (rbnext) { ++ /* We're compatible with the next VMA, merge with it */ ++ next = rb_entry(rbnext, struct kbase_va_region, rblink); ++ if (next->flags & KBASE_REG_FREE) { ++ WARN_ON((next->flags & KBASE_REG_ZONE_MASK) != ++ (reg->flags & KBASE_REG_ZONE_MASK)); ++ next->start_pfn = reg->start_pfn; ++ next->nr_pages += reg->nr_pages; ++ rb_erase(&(reg->rblink), reg_rbtree); ++ merged_back = 1; ++ if (merged_front) { ++ /* We already merged with prev, free it */ ++ kbase_free_alloced_region(reg); ++ } ++ } ++ } + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u64 user_job; /**< [in] identifier for the job in user space */ -+ u64 job_id_ptr; /**< [in,out] pointer to location of u32 where job id will be written */ -+ _mali_uk_fence_t fence; /**< [in] fence this job must wait on */ -+ u32 point; /**< [out] point on soft timeline for this job */ -+ u32 type; /**< [in] type of soft job */ -+} _mali_uk_soft_job_start_s; ++ /* If we failed to merge then we need to add a new block */ ++ if (!(merged_front || merged_back)) { ++ /* ++ * We didn't merge anything. Add a new free ++ * placeholder and remove the original one. ++ */ ++ struct kbase_va_region *free_reg; + -+typedef struct { -+ u64 user_job; /**< [out] identifier for the job in user space */ -+} _mali_uk_soft_job_activated_s; ++ free_reg = kbase_alloc_free_region(kctx, reg->start_pfn, reg->nr_pages, reg->flags & KBASE_REG_ZONE_MASK); ++ if (!free_reg) { ++ err = -ENOMEM; ++ goto out; ++ } ++ rb_replace_node(&(reg->rblink), &(free_reg->rblink), reg_rbtree); ++ } + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 job_id; /**< [in] id for soft job */ -+} _mali_uk_soft_job_signal_s; ++ out: ++ return err; ++} + -+/** @} */ /* end group _mali_uk_soft_job */ ++KBASE_EXPORT_TEST_API(kbase_remove_va_region); + -+typedef struct { -+ u32 counter_id; -+ u32 key; -+ int enable; -+} _mali_uk_annotate_profiling_mem_counter_s; ++/** ++ * @brief Insert a VA region to the list, replacing the current at_reg. ++ */ ++static int kbase_insert_va_region_nolock(struct kbase_context *kctx, struct kbase_va_region *new_reg, struct kbase_va_region *at_reg, u64 start_pfn, size_t nr_pages) ++{ ++ struct rb_root *reg_rbtree = NULL; ++ int err = 0; + -+typedef struct { -+ u32 sampling_rate; -+ int enable; -+} _mali_uk_annotate_profiling_enable_s; ++ reg_rbtree = kbase_reg_flags_to_rbtree(kctx, at_reg); + ++ /* Must be a free region */ ++ KBASE_DEBUG_ASSERT((at_reg->flags & KBASE_REG_FREE) != 0); ++ /* start_pfn should be contained within at_reg */ ++ KBASE_DEBUG_ASSERT((start_pfn >= at_reg->start_pfn) && (start_pfn < at_reg->start_pfn + at_reg->nr_pages)); ++ /* at least nr_pages from start_pfn should be contained within at_reg */ ++ KBASE_DEBUG_ASSERT(start_pfn + nr_pages <= at_reg->start_pfn + at_reg->nr_pages); + -+/** @addtogroup _mali_uk_core U/K Core -+ * @{ */ ++ new_reg->start_pfn = start_pfn; ++ new_reg->nr_pages = nr_pages; + -+/** @defgroup _mali_uk_waitfornotification_s Wait For Notification -+ * @{ */ ++ /* Regions are a whole use, so swap and delete old one. */ ++ if (at_reg->start_pfn == start_pfn && at_reg->nr_pages == nr_pages) { ++ rb_replace_node(&(at_reg->rblink), &(new_reg->rblink), ++ reg_rbtree); ++ kbase_free_alloced_region(at_reg); ++ } ++ /* New region replaces the start of the old one, so insert before. */ ++ else if (at_reg->start_pfn == start_pfn) { ++ at_reg->start_pfn += nr_pages; ++ KBASE_DEBUG_ASSERT(at_reg->nr_pages >= nr_pages); ++ at_reg->nr_pages -= nr_pages; + -+/** @brief Notification type encodings -+ * -+ * Each Notification type is an ordered pair of (subsystem,id), and is unique. -+ * -+ * The encoding of subsystem,id into a 32-bit word is: -+ * encoding = (( subsystem << _MALI_NOTIFICATION_SUBSYSTEM_SHIFT ) & _MALI_NOTIFICATION_SUBSYSTEM_MASK) -+ * | (( id << _MALI_NOTIFICATION_ID_SHIFT ) & _MALI_NOTIFICATION_ID_MASK) -+ * -+ * @see _mali_uk_wait_for_notification_s -+ */ -+typedef enum { -+ /** core notifications */ ++ kbase_region_tracker_insert(kctx, new_reg); ++ } ++ /* New region replaces the end of the old one, so insert after. */ ++ else if ((at_reg->start_pfn + at_reg->nr_pages) == (start_pfn + nr_pages)) { ++ at_reg->nr_pages -= nr_pages; + -+ _MALI_NOTIFICATION_CORE_SHUTDOWN_IN_PROGRESS = (_MALI_UK_CORE_SUBSYSTEM << 16) | 0x20, -+ _MALI_NOTIFICATION_APPLICATION_QUIT = (_MALI_UK_CORE_SUBSYSTEM << 16) | 0x40, -+ _MALI_NOTIFICATION_SETTINGS_CHANGED = (_MALI_UK_CORE_SUBSYSTEM << 16) | 0x80, -+ _MALI_NOTIFICATION_SOFT_ACTIVATED = (_MALI_UK_CORE_SUBSYSTEM << 16) | 0x100, ++ kbase_region_tracker_insert(kctx, new_reg); ++ } ++ /* New region splits the old one, so insert and create new */ ++ else { ++ struct kbase_va_region *new_front_reg; + -+ /** Fragment Processor notifications */ ++ new_front_reg = kbase_alloc_free_region(kctx, ++ at_reg->start_pfn, ++ start_pfn - at_reg->start_pfn, ++ at_reg->flags & KBASE_REG_ZONE_MASK); + -+ _MALI_NOTIFICATION_PP_FINISHED = (_MALI_UK_PP_SUBSYSTEM << 16) | 0x10, -+ _MALI_NOTIFICATION_PP_NUM_CORE_CHANGE = (_MALI_UK_PP_SUBSYSTEM << 16) | 0x20, ++ if (new_front_reg) { ++ at_reg->nr_pages -= nr_pages + new_front_reg->nr_pages; ++ at_reg->start_pfn = start_pfn + nr_pages; + -+ /** Vertex Processor notifications */ ++ kbase_region_tracker_insert(kctx, new_front_reg); ++ kbase_region_tracker_insert(kctx, new_reg); ++ } else { ++ err = -ENOMEM; ++ } ++ } + -+ _MALI_NOTIFICATION_GP_FINISHED = (_MALI_UK_GP_SUBSYSTEM << 16) | 0x10, -+ _MALI_NOTIFICATION_GP_STALLED = (_MALI_UK_GP_SUBSYSTEM << 16) | 0x20, ++ return err; ++} + -+ /** Profiling notifications */ -+ _MALI_NOTIFICATION_ANNOTATE_PROFILING_MEM_COUNTER = (_MALI_UK_PROFILING_SUBSYSTEM << 16) | 0x10, -+ _MALI_NOTIFICATION_ANNOTATE_PROFILING_ENABLE = (_MALI_UK_PROFILING_SUBSYSTEM << 16) | 0x20, -+} _mali_uk_notification_type; ++/** ++ * @brief Add a VA region to the list. ++ */ ++int kbase_add_va_region(struct kbase_context *kctx, ++ struct kbase_va_region *reg, u64 addr, ++ size_t nr_pages, size_t align) ++{ ++ struct kbase_va_region *tmp; ++ u64 gpu_pfn = addr >> PAGE_SHIFT; ++ int err = 0; + -+/** to assist in splitting up 32-bit notification value in subsystem and id value */ -+#define _MALI_NOTIFICATION_SUBSYSTEM_MASK 0xFFFF0000 -+#define _MALI_NOTIFICATION_SUBSYSTEM_SHIFT 16 -+#define _MALI_NOTIFICATION_ID_MASK 0x0000FFFF -+#define _MALI_NOTIFICATION_ID_SHIFT 0 ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ KBASE_DEBUG_ASSERT(NULL != reg); + ++ lockdep_assert_held(&kctx->reg_lock); + -+/** @brief Enumeration of possible settings which match mali_setting_t in user space -+ * -+ * -+ */ -+typedef enum { -+ _MALI_UK_USER_SETTING_SW_EVENTS_ENABLE = 0, -+ _MALI_UK_USER_SETTING_COLORBUFFER_CAPTURE_ENABLED, -+ _MALI_UK_USER_SETTING_DEPTHBUFFER_CAPTURE_ENABLED, -+ _MALI_UK_USER_SETTING_STENCILBUFFER_CAPTURE_ENABLED, -+ _MALI_UK_USER_SETTING_PER_TILE_COUNTERS_CAPTURE_ENABLED, -+ _MALI_UK_USER_SETTING_BUFFER_CAPTURE_COMPOSITOR, -+ _MALI_UK_USER_SETTING_BUFFER_CAPTURE_WINDOW, -+ _MALI_UK_USER_SETTING_BUFFER_CAPTURE_OTHER, -+ _MALI_UK_USER_SETTING_BUFFER_CAPTURE_N_FRAMES, -+ _MALI_UK_USER_SETTING_BUFFER_CAPTURE_RESIZE_FACTOR, -+ _MALI_UK_USER_SETTING_SW_COUNTER_ENABLED, -+ _MALI_UK_USER_SETTING_MAX, -+} _mali_uk_user_setting_t; ++ if (!align) ++ align = 1; + -+/* See mali_user_settings_db.c */ -+extern const char *_mali_uk_user_setting_descriptions[]; -+#define _MALI_UK_USER_SETTING_DESCRIPTIONS \ -+ { \ -+ "sw_events_enable", \ -+ "colorbuffer_capture_enable", \ -+ "depthbuffer_capture_enable", \ -+ "stencilbuffer_capture_enable", \ -+ "per_tile_counters_enable", \ -+ "buffer_capture_compositor", \ -+ "buffer_capture_window", \ -+ "buffer_capture_other", \ -+ "buffer_capture_n_frames", \ -+ "buffer_capture_resize_factor", \ -+ "sw_counters_enable", \ -+ }; ++ /* must be a power of 2 */ ++ KBASE_DEBUG_ASSERT((align & (align - 1)) == 0); ++ KBASE_DEBUG_ASSERT(nr_pages > 0); + -+/** @brief struct to hold the value to a particular setting as seen in the kernel space -+ */ -+typedef struct { -+ _mali_uk_user_setting_t setting; -+ u32 value; -+} _mali_uk_settings_changed_s; ++ /* Path 1: Map a specific address. Find the enclosing region, which *must* be free. */ ++ if (gpu_pfn) { ++ struct device *dev = kctx->kbdev->dev; + -+/** @brief Arguments for _mali_ukk_wait_for_notification() -+ * -+ * On successful return from _mali_ukk_wait_for_notification(), the members of -+ * this structure will indicate the reason for notification. -+ * -+ * Specifically, the source of the notification can be identified by the -+ * subsystem and id fields of the mali_uk_notification_type in the code.type -+ * member. The type member is encoded in a way to divide up the types into a -+ * subsystem field, and a per-subsystem ID field. See -+ * _mali_uk_notification_type for more information. -+ * -+ * Interpreting the data union member depends on the notification type: -+ * -+ * - type == _MALI_NOTIFICATION_CORE_SHUTDOWN_IN_PROGRESS -+ * - The kernel side is shutting down. No further -+ * _mali_uk_wait_for_notification() calls should be made. -+ * - In this case, the value of the data union member is undefined. -+ * - This is used to indicate to the user space client that it should close -+ * the connection to the Mali Device Driver. -+ * - type == _MALI_NOTIFICATION_PP_FINISHED -+ * - The notification data is of type _mali_uk_pp_job_finished_s. It contains the user_job_ptr -+ * identifier used to start the job with, the job status, the number of milliseconds the job took to render, -+ * and values of core registers when the job finished (irq status, performance counters, renderer list -+ * address). -+ * - A job has finished succesfully when its status member is _MALI_UK_JOB_STATUS_FINISHED. -+ * - If the hardware detected a timeout while rendering the job, or software detected the job is -+ * taking more than watchdog_msecs (see _mali_ukk_pp_start_job()) to complete, the status member will -+ * indicate _MALI_UK_JOB_STATUS_HANG. -+ * - If the hardware detected a bus error while accessing memory associated with the job, status will -+ * indicate _MALI_UK_JOB_STATUS_SEG_FAULT. -+ * - Status will indicate MALI_UK_JOB_STATUS_NOT_STARTED if the driver had to stop the job but the job -+ * didn't start the hardware yet, e.g. when the driver closes. -+ * - type == _MALI_NOTIFICATION_GP_FINISHED -+ * - The notification data is of type _mali_uk_gp_job_finished_s. The notification is similar to that of -+ * type == _MALI_NOTIFICATION_PP_FINISHED, except that several other GP core register values are returned. -+ * The status values have the same meaning for type == _MALI_NOTIFICATION_PP_FINISHED. -+ * - type == _MALI_NOTIFICATION_GP_STALLED -+ * - The nofication data is of type _mali_uk_gp_job_suspended_s. It contains the user_job_ptr -+ * identifier used to start the job with, the reason why the job stalled and a cookie to identify the core on -+ * which the job stalled. -+ * - The reason member of gp_job_suspended is set to _MALIGP_JOB_SUSPENDED_OUT_OF_MEMORY -+ * when the polygon list builder unit has run out of memory. -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ _mali_uk_notification_type type; /**< [out] Type of notification available */ -+ union { -+ _mali_uk_gp_job_suspended_s gp_job_suspended;/**< [out] Notification data for _MALI_NOTIFICATION_GP_STALLED notification type */ -+ _mali_uk_gp_job_finished_s gp_job_finished; /**< [out] Notification data for _MALI_NOTIFICATION_GP_FINISHED notification type */ -+ _mali_uk_pp_job_finished_s pp_job_finished; /**< [out] Notification data for _MALI_NOTIFICATION_PP_FINISHED notification type */ -+ _mali_uk_settings_changed_s setting_changed;/**< [out] Notification data for _MALI_NOTIFICAATION_SETTINGS_CHANGED notification type */ -+ _mali_uk_soft_job_activated_s soft_job_activated; /**< [out] Notification data for _MALI_NOTIFICATION_SOFT_ACTIVATED notification type */ -+ _mali_uk_annotate_profiling_mem_counter_s profiling_mem_counter; -+ _mali_uk_annotate_profiling_enable_s profiling_enable; -+ } data; -+} _mali_uk_wait_for_notification_s; ++ KBASE_DEBUG_ASSERT(!(gpu_pfn & (align - 1))); + -+/** @brief Arguments for _mali_ukk_post_notification() -+ * -+ * Posts the specified notification to the notification queue for this application. -+ * This is used to send a quit message to the callback thread. -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ _mali_uk_notification_type type; /**< [in] Type of notification to post */ -+} _mali_uk_post_notification_s; ++ tmp = kbase_region_tracker_find_region_enclosing_range_free(kctx, gpu_pfn, nr_pages); ++ if (!tmp) { ++ dev_warn(dev, "Enclosing region not found: 0x%08llx gpu_pfn, %zu nr_pages", gpu_pfn, nr_pages); ++ err = -ENOMEM; ++ goto exit; ++ } ++ if (!(tmp->flags & KBASE_REG_FREE)) { ++ dev_warn(dev, "Zone mismatch: %lu != %lu", tmp->flags & KBASE_REG_ZONE_MASK, reg->flags & KBASE_REG_ZONE_MASK); ++ dev_warn(dev, "!(tmp->flags & KBASE_REG_FREE): tmp->start_pfn=0x%llx tmp->flags=0x%lx tmp->nr_pages=0x%zx gpu_pfn=0x%llx nr_pages=0x%zx\n", tmp->start_pfn, tmp->flags, tmp->nr_pages, gpu_pfn, nr_pages); ++ dev_warn(dev, "in function %s (%p, %p, 0x%llx, 0x%zx, 0x%zx)\n", __func__, kctx, reg, addr, nr_pages, align); ++ err = -ENOMEM; ++ goto exit; ++ } + -+/** @} */ /* end group _mali_uk_waitfornotification_s */ ++ err = kbase_insert_va_region_nolock(kctx, reg, tmp, gpu_pfn, nr_pages); ++ if (err) { ++ dev_warn(dev, "Failed to insert va region"); ++ err = -ENOMEM; ++ goto exit; ++ } + -+/** @defgroup _mali_uk_getapiversion_s Get API Version -+ * @{ */ ++ goto exit; ++ } + -+/** helpers for Device Driver API version handling */ ++ /* Path 2: Map any free address which meets the requirements. */ ++ { ++ u64 start_pfn; + -+/** @brief Encode a version ID from a 16-bit input -+ * -+ * @note the input is assumed to be 16 bits. It must not exceed 16 bits. */ -+#define _MAKE_VERSION_ID(x) (((x) << 16UL) | (x)) ++ /* ++ * Depending on the zone the allocation request is for ++ * we might need to retry it. ++ */ ++ do { ++ tmp = kbase_region_tracker_find_region_meeting_reqs( ++ kctx, reg, nr_pages, align); ++ if (tmp) { ++ start_pfn = (tmp->start_pfn + align - 1) & ++ ~(align - 1); ++ err = kbase_insert_va_region_nolock(kctx, reg, ++ tmp, start_pfn, nr_pages); ++ break; ++ } + -+/** @brief Check whether a 32-bit value is likely to be Device Driver API -+ * version ID. */ -+#define _IS_VERSION_ID(x) (((x) & 0xFFFF) == (((x) >> 16UL) & 0xFFFF)) ++ /* ++ * If the allocation is not from the same zone as JIT ++ * then don't retry, we're out of VA and there is ++ * nothing which can be done about it. ++ */ ++ if ((reg->flags & KBASE_REG_ZONE_MASK) != ++ KBASE_REG_ZONE_CUSTOM_VA) ++ break; ++ } while (kbase_jit_evict(kctx)); + -+/** @brief Decode a 16-bit version number from a 32-bit Device Driver API version -+ * ID */ -+#define _GET_VERSION(x) (((x) >> 16UL) & 0xFFFF) ++ if (!tmp) ++ err = -ENOMEM; ++ } + -+/** @brief Determine whether two 32-bit encoded version IDs match */ -+#define _IS_API_MATCH(x, y) (IS_VERSION_ID((x)) && IS_VERSION_ID((y)) && (GET_VERSION((x)) == GET_VERSION((y)))) -+ /** -+ * RK MALI version code -+ */ -+#define _MALI_RK_LIBS_VERSION 1 ++ exit: ++ return err; ++} + -+/** -+ * API version define. -+ * Indicates the version of the kernel API -+ * The version is a 16bit integer incremented on each API change. -+ * The 16bit integer is stored twice in a 32bit integer -+ * For example, for version 1 the value would be 0x00010001 -+ */ -+#define _MALI_API_VERSION 900 -+#define _MALI_UK_API_VERSION _MAKE_VERSION_ID(_MALI_API_VERSION) ++KBASE_EXPORT_TEST_API(kbase_add_va_region); + +/** -+ * The API version is a 16-bit integer stored in both the lower and upper 16-bits -+ * of a 32-bit value. The 16-bit API version value is incremented on each API -+ * change. Version 1 would be 0x00010001. Used in _mali_uk_get_api_version_s. ++ * @brief Initialize the internal region tracker data structure. + */ -+typedef u32 _mali_uk_api_version; ++static void kbase_region_tracker_ds_init(struct kbase_context *kctx, ++ struct kbase_va_region *same_va_reg, ++ struct kbase_va_region *exec_reg, ++ struct kbase_va_region *custom_va_reg) ++{ ++ kctx->reg_rbtree_same = RB_ROOT; ++ kbase_region_tracker_insert(kctx, same_va_reg); + -+/** @brief Arguments for _mali_uk_get_api_version() -+ * -+ * The user-side interface version must be written into the version member, -+ * encoded using _MAKE_VERSION_ID(). It will be compared to the API version of -+ * the kernel-side interface. -+ * -+ * On successful return, the version member will be the API version of the -+ * kernel-side interface. _MALI_UK_API_VERSION macro defines the current version -+ * of the API. -+ * -+ * The compatible member must be checked to see if the version of the user-side -+ * interface is compatible with the kernel-side interface, since future versions -+ * of the interface may be backwards compatible. -+ */ -+typedef struct { -+ u32 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ _mali_uk_api_version version; /**< [in,out] API version of user-side interface. */ -+ int compatible; /**< [out] @c 1 when @version is compatible, @c 0 otherwise */ -+} _mali_uk_get_api_version_s; ++ /* Although exec and custom_va_reg don't always exist, ++ * initialize unconditionally because of the mem_view debugfs ++ * implementation which relies on these being empty */ ++ kctx->reg_rbtree_exec = RB_ROOT; ++ kctx->reg_rbtree_custom = RB_ROOT; + -+/** @brief Arguments for _mali_uk_get_api_version_v2() -+ * -+ * The user-side interface version must be written into the version member, -+ * encoded using _MAKE_VERSION_ID(). It will be compared to the API version of -+ * the kernel-side interface. -+ * -+ * On successful return, the version member will be the API version of the -+ * kernel-side interface. _MALI_UK_API_VERSION macro defines the current version -+ * of the API. -+ * -+ * The compatible member must be checked to see if the version of the user-side -+ * interface is compatible with the kernel-side interface, since future versions -+ * of the interface may be backwards compatible. -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ _mali_uk_api_version version; /**< [in,out] API version of user-side interface. */ -+ int compatible; /**< [out] @c 1 when @version is compatible, @c 0 otherwise */ -+} _mali_uk_get_api_version_v2_s; ++ if (exec_reg) ++ kbase_region_tracker_insert(kctx, exec_reg); ++ if (custom_va_reg) ++ kbase_region_tracker_insert(kctx, custom_va_reg); ++} + -+typedef struct ++static void kbase_region_tracker_erase_rbtree(struct rb_root *rbtree) +{ -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ _mali_uk_api_version version; /**< [in,out] API version of user-side interface. */ -+} _mali_uk_get_mali_version_in_rk30_s; -+ -+/* rk_ext : rk_ko_ver_t. */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ _mali_uk_api_version version; /**< [in,out] API version of user-side interface. */ -+} _mali_rk_ko_version_s; -+/** @} */ /* end group _mali_uk_getapiversion_s */ ++ struct rb_node *rbnode; ++ struct kbase_va_region *reg; + -+/** @defgroup _mali_uk_get_user_settings_s Get user space settings */ ++ do { ++ rbnode = rb_first(rbtree); ++ if (rbnode) { ++ rb_erase(rbnode, rbtree); ++ reg = rb_entry(rbnode, struct kbase_va_region, rblink); ++ kbase_free_alloced_region(reg); ++ } ++ } while (rbnode); ++} + -+/** @brief struct to keep the matching values of the user space settings within certain context -+ * -+ * Each member of the settings array corresponds to a matching setting in the user space and its value is the value -+ * of that particular setting. -+ * -+ * All settings are given reference to the context pointed to by the ctx pointer. -+ * -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 settings[_MALI_UK_USER_SETTING_MAX]; /**< [out] The values for all settings */ -+} _mali_uk_get_user_settings_s; ++void kbase_region_tracker_term(struct kbase_context *kctx) ++{ ++ kbase_region_tracker_erase_rbtree(&kctx->reg_rbtree_same); ++ kbase_region_tracker_erase_rbtree(&kctx->reg_rbtree_exec); ++ kbase_region_tracker_erase_rbtree(&kctx->reg_rbtree_custom); ++} + -+/** @brief struct to hold the value of a particular setting from the user space within a given context ++/** ++ * Initialize the region tracker data structure. + */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ _mali_uk_user_setting_t setting; /**< [in] setting to get */ -+ u32 value; /**< [out] value of setting */ -+} _mali_uk_get_user_setting_s; ++int kbase_region_tracker_init(struct kbase_context *kctx) ++{ ++ struct kbase_va_region *same_va_reg; ++ struct kbase_va_region *exec_reg = NULL; ++ struct kbase_va_region *custom_va_reg = NULL; ++ size_t same_va_bits = sizeof(void *) * BITS_PER_BYTE; ++ u64 custom_va_size = KBASE_REG_ZONE_CUSTOM_VA_SIZE; ++ u64 gpu_va_limit = (1ULL << kctx->kbdev->gpu_props.mmu.va_bits) >> PAGE_SHIFT; ++ u64 same_va_pages; ++ int err; + -+/** @brief Arguments for _mali_ukk_request_high_priority() */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+} _mali_uk_request_high_priority_s; ++ /* Take the lock as kbase_free_alloced_region requires it */ ++ kbase_gpu_vm_lock(kctx); + -+/** @brief Arguments for _mali_ukk_pending_submit() */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+} _mali_uk_pending_submit_s; ++#if defined(CONFIG_ARM64) ++ same_va_bits = VA_BITS; ++#elif defined(CONFIG_X86_64) ++ same_va_bits = 47; ++#elif defined(CONFIG_64BIT) ++#error Unsupported 64-bit architecture ++#endif + -+/** @} */ /* end group _mali_uk_core */ ++#ifdef CONFIG_64BIT ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ same_va_bits = 32; ++ else if (kbase_hw_has_feature(kctx->kbdev, BASE_HW_FEATURE_33BIT_VA)) ++ same_va_bits = 33; ++#endif + ++ if (kctx->kbdev->gpu_props.mmu.va_bits < same_va_bits) { ++ err = -EINVAL; ++ goto fail_unlock; ++ } + -+/** @defgroup _mali_uk_memory U/K Memory -+ * @{ */ ++ same_va_pages = (1ULL << (same_va_bits - PAGE_SHIFT)) - 1; ++ /* all have SAME_VA */ ++ same_va_reg = kbase_alloc_free_region(kctx, 1, ++ same_va_pages, ++ KBASE_REG_ZONE_SAME_VA); + -+#define _MALI_MEMORY_ALLOCATE_RESIZEABLE (1<<4) /* BUFFER can trim dow/grow*/ -+#define _MALI_MEMORY_ALLOCATE_NO_BIND_GPU (1<<5) /*Not map to GPU when allocate, must call bind later*/ -+#define _MALI_MEMORY_ALLOCATE_SWAPPABLE (1<<6) /* Allocate swappale memory. */ -+#define _MALI_MEMORY_ALLOCATE_DEFER_BIND (1<<7) /*Not map to GPU when allocate, must call bind later*/ -+#define _MALI_MEMORY_ALLOCATE_SECURE (1<<8) /* Allocate secure memory. */ ++ if (!same_va_reg) { ++ err = -ENOMEM; ++ goto fail_unlock; ++ } + ++#ifdef CONFIG_64BIT ++ /* 32-bit clients have exec and custom VA zones */ ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) { ++#endif ++ if (gpu_va_limit <= KBASE_REG_ZONE_CUSTOM_VA_BASE) { ++ err = -EINVAL; ++ goto fail_free_same_va; ++ } ++ /* If the current size of TMEM is out of range of the ++ * virtual address space addressable by the MMU then ++ * we should shrink it to fit ++ */ ++ if ((KBASE_REG_ZONE_CUSTOM_VA_BASE + KBASE_REG_ZONE_CUSTOM_VA_SIZE) >= gpu_va_limit) ++ custom_va_size = gpu_va_limit - KBASE_REG_ZONE_CUSTOM_VA_BASE; + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 gpu_vaddr; /**< [in] GPU virtual address */ -+ u32 vsize; /**< [in] vitrual size of the allocation */ -+ u32 psize; /**< [in] physical size of the allocation */ -+ u32 flags; -+ u64 backend_handle; /**< [out] backend handle */ -+ s32 secure_shared_fd; /** < [in] the mem handle for secure mem */ -+} _mali_uk_alloc_mem_s; ++ exec_reg = kbase_alloc_free_region(kctx, ++ KBASE_REG_ZONE_EXEC_BASE, ++ KBASE_REG_ZONE_EXEC_SIZE, ++ KBASE_REG_ZONE_EXEC); + ++ if (!exec_reg) { ++ err = -ENOMEM; ++ goto fail_free_same_va; ++ } + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 gpu_vaddr; /**< [in] use as handle to free allocation */ -+ u32 free_pages_nr; /** < [out] record the number of free pages */ -+} _mali_uk_free_mem_s; ++ custom_va_reg = kbase_alloc_free_region(kctx, ++ KBASE_REG_ZONE_CUSTOM_VA_BASE, ++ custom_va_size, KBASE_REG_ZONE_CUSTOM_VA); + ++ if (!custom_va_reg) { ++ err = -ENOMEM; ++ goto fail_free_exec; ++ } ++#ifdef CONFIG_64BIT ++ } ++#endif + -+#define _MALI_MEMORY_BIND_BACKEND_UMP (1<<8) -+#define _MALI_MEMORY_BIND_BACKEND_DMA_BUF (1<<9) -+#define _MALI_MEMORY_BIND_BACKEND_MALI_MEMORY (1<<10) -+#define _MALI_MEMORY_BIND_BACKEND_EXTERNAL_MEMORY (1<<11) -+#define _MALI_MEMORY_BIND_BACKEND_EXT_COW (1<<12) -+#define _MALI_MEMORY_BIND_BACKEND_HAVE_ALLOCATION (1<<13) ++ kbase_region_tracker_ds_init(kctx, same_va_reg, exec_reg, custom_va_reg); + ++ kctx->same_va_end = same_va_pages + 1; + -+#define _MALI_MEMORY_BIND_BACKEND_MASK (_MALI_MEMORY_BIND_BACKEND_UMP| \ -+ _MALI_MEMORY_BIND_BACKEND_DMA_BUF |\ -+ _MALI_MEMORY_BIND_BACKEND_MALI_MEMORY |\ -+ _MALI_MEMORY_BIND_BACKEND_EXTERNAL_MEMORY |\ -+ _MALI_MEMORY_BIND_BACKEND_EXT_COW |\ -+ _MALI_MEMORY_BIND_BACKEND_HAVE_ALLOCATION) ++ kbase_gpu_vm_unlock(kctx); ++ return 0; + ++fail_free_exec: ++ kbase_free_alloced_region(exec_reg); ++fail_free_same_va: ++ kbase_free_alloced_region(same_va_reg); ++fail_unlock: ++ kbase_gpu_vm_unlock(kctx); ++ return err; ++} + -+#define _MALI_MEMORY_GPU_READ_ALLOCATE (1<<16) ++int kbase_region_tracker_init_jit(struct kbase_context *kctx, u64 jit_va_pages) ++{ ++#ifdef CONFIG_64BIT ++ struct kbase_va_region *same_va; ++ struct kbase_va_region *custom_va_reg; ++ u64 same_va_bits; ++ u64 total_va_size; ++ int err; + ++ /* ++ * Nothing to do for 32-bit clients, JIT uses the existing ++ * custom VA zone. ++ */ ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ return 0; + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 vaddr; /**< [in] mali address to map the physical memory to */ -+ u32 size; /**< [in] size */ -+ u32 flags; /**< [in] see_MALI_MEMORY_BIND_BACKEND_* */ -+ u32 padding; /** padding for 32/64 struct alignment */ -+ union { -+ struct { -+ u32 secure_id; /**< [in] secure id */ -+ u32 rights; /**< [in] rights necessary for accessing memory */ -+ u32 flags; /**< [in] flags, see \ref _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE */ -+ } bind_ump; -+ struct { -+ u32 mem_fd; /**< [in] Memory descriptor */ -+ u32 rights; /**< [in] rights necessary for accessing memory */ -+ u32 flags; /**< [in] flags, see \ref _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE */ -+ } bind_dma_buf; -+ struct { -+ u32 phys_addr; /**< [in] physical address */ -+ u32 rights; /**< [in] rights necessary for accessing memory */ -+ u32 flags; /**< [in] flags, see \ref _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE */ -+ } bind_ext_memory; -+ } mem_union; -+} _mali_uk_bind_mem_s; ++#if defined(CONFIG_ARM64) ++ same_va_bits = VA_BITS; ++#elif defined(CONFIG_X86_64) ++ same_va_bits = 47; ++#elif defined(CONFIG_64BIT) ++#error Unsupported 64-bit architecture ++#endif + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 flags; /**< [in] see_MALI_MEMORY_BIND_BACKEND_* */ -+ u32 vaddr; /**< [in] identifier for mapped memory object in kernel space */ -+} _mali_uk_unbind_mem_s; ++ if (kbase_hw_has_feature(kctx->kbdev, BASE_HW_FEATURE_33BIT_VA)) ++ same_va_bits = 33; + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 target_handle; /**< [in] handle of allocation need to do COW */ -+ u32 target_offset; /**< [in] offset in target allocation to do COW(for support COW a memory allocated from memory_bank, PAGE_SIZE align)*/ -+ u32 target_size; /**< [in] size of target allocation to do COW (for support memory bank, PAGE_SIZE align)(in byte) */ -+ u32 range_start; /**< [in] re allocate range start offset, offset from the start of allocation (PAGE_SIZE align)*/ -+ u32 range_size; /**< [in] re allocate size (PAGE_SIZE align)*/ -+ u32 vaddr; /**< [in] mali address for the new allocaiton */ -+ u32 backend_handle; /**< [out] backend handle */ -+ u32 flags; -+} _mali_uk_cow_mem_s; ++ total_va_size = (1ULL << (same_va_bits - PAGE_SHIFT)) - 1; + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 range_start; /**< [in] re allocate range start offset, offset from the start of allocation */ -+ u32 size; /**< [in] re allocate size*/ -+ u32 vaddr; /**< [in] mali address for the new allocaiton */ -+ s32 change_pages_nr; /**< [out] record the page number change for cow operation */ -+} _mali_uk_cow_modify_range_s; ++ kbase_gpu_vm_lock(kctx); + ++ /* ++ * Modify the same VA free region after creation. Be careful to ensure ++ * that allocations haven't been made as they could cause an overlap ++ * to happen with existing same VA allocations and the custom VA zone. ++ */ ++ same_va = kbase_region_tracker_find_region_base_address(kctx, ++ PAGE_SIZE); ++ if (!same_va) { ++ err = -ENOMEM; ++ goto fail_unlock; ++ } + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 mem_fd; /**< [in] Memory descriptor */ -+ u32 size; /**< [out] size */ -+} _mali_uk_dma_buf_get_size_s; ++ /* The region flag or region size has changed since creation so bail. */ ++ if ((!(same_va->flags & KBASE_REG_FREE)) || ++ (same_va->nr_pages != total_va_size)) { ++ err = -ENOMEM; ++ goto fail_unlock; ++ } + -+/** Flag for _mali_uk_map_external_mem_s, _mali_uk_attach_ump_mem_s and _mali_uk_attach_dma_buf_s */ -+#define _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE (1<<0) ++ if (same_va->nr_pages < jit_va_pages || ++ kctx->same_va_end < jit_va_pages) { ++ err = -ENOMEM; ++ goto fail_unlock; ++ } + ++ /* It's safe to adjust the same VA zone now */ ++ same_va->nr_pages -= jit_va_pages; ++ kctx->same_va_end -= jit_va_pages; + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u64 vaddr; /* the buffer to do resize*/ -+ u32 psize; /* wanted physical size of this memory */ -+} _mali_uk_mem_resize_s; ++ /* ++ * Create a custom VA zone at the end of the VA for allocations which ++ * JIT can use so it doesn't have to allocate VA from the kernel. ++ */ ++ custom_va_reg = kbase_alloc_free_region(kctx, ++ kctx->same_va_end, ++ jit_va_pages, ++ KBASE_REG_ZONE_CUSTOM_VA); + -+/** -+ * @brief Arguments for _mali_uk[uk]_mem_write_safe() -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u64 src; /**< [in] Pointer to source data */ -+ u64 dest; /**< [in] Destination Mali buffer */ -+ u32 size; /**< [in,out] Number of bytes to write/copy on input, number of bytes actually written/copied on output */ -+} _mali_uk_mem_write_safe_s; ++ if (!custom_va_reg) { ++ /* ++ * The context will be destroyed if we fail here so no point ++ * reverting the change we made to same_va. ++ */ ++ err = -ENOMEM; ++ goto fail_unlock; ++ } + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 size; /**< [out] size of MMU page table information (registers + page tables) */ -+} _mali_uk_query_mmu_page_table_dump_size_s; ++ kbase_region_tracker_insert(kctx, custom_va_reg); + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 size; /**< [in] size of buffer to receive mmu page table information */ -+ u64 buffer; /**< [in,out] buffer to receive mmu page table information */ -+ u32 register_writes_size; /**< [out] size of MMU register dump */ -+ u64 register_writes; /**< [out] pointer within buffer where MMU register dump is stored */ -+ u32 page_table_dump_size; /**< [out] size of MMU page table dump */ -+ u64 page_table_dump; /**< [out] pointer within buffer where MMU page table dump is stored */ -+} _mali_uk_dump_mmu_page_table_s; ++ kbase_gpu_vm_unlock(kctx); ++ return 0; + -+/** @} */ /* end group _mali_uk_memory */ ++fail_unlock: ++ kbase_gpu_vm_unlock(kctx); ++ return err; ++#else ++ return 0; ++#endif ++} + ++int kbase_mem_init(struct kbase_device *kbdev) ++{ ++ struct kbasep_mem_device *memdev; + -+/** @addtogroup _mali_uk_pp U/K Fragment Processor -+ * @{ */ ++ KBASE_DEBUG_ASSERT(kbdev); + -+/** @brief Arguments for _mali_ukk_get_pp_number_of_cores() -+ * -+ * - pass in the user-kernel context @c ctx that was returned from _mali_ukk_open() -+ * - Upon successful return from _mali_ukk_get_pp_number_of_cores(), @c number_of_cores -+ * will contain the number of Fragment Processor cores in the system. -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 number_of_total_cores; /**< [out] Total number of Fragment Processor cores in the system */ -+ u32 number_of_enabled_cores; /**< [out] Number of enabled Fragment Processor cores */ -+} _mali_uk_get_pp_number_of_cores_s; ++ memdev = &kbdev->memdev; ++ kbdev->mem_pool_max_size_default = KBASE_MEM_POOL_MAX_SIZE_KCTX; + -+/** @brief Arguments for _mali_ukk_get_pp_core_version() -+ * -+ * - pass in the user-kernel context @c ctx that was returned from _mali_ukk_open() -+ * - Upon successful return from _mali_ukk_get_pp_core_version(), @c version contains -+ * the version that all Fragment Processor cores are compatible with. -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ _mali_core_version version; /**< [out] version returned from core, see \ref _mali_core_version */ -+ u32 padding; -+} _mali_uk_get_pp_core_version_s; ++ /* Initialize memory usage */ ++ atomic_set(&memdev->used_pages, 0); + -+/** @} */ /* end group _mali_uk_pp */ ++ return kbase_mem_pool_init(&kbdev->mem_pool, ++ KBASE_MEM_POOL_MAX_SIZE_KBDEV, kbdev, NULL); ++} + ++void kbase_mem_halt(struct kbase_device *kbdev) ++{ ++ CSTD_UNUSED(kbdev); ++} + -+/** @addtogroup _mali_uk_gp U/K Vertex Processor -+ * @{ */ ++void kbase_mem_term(struct kbase_device *kbdev) ++{ ++ struct kbasep_mem_device *memdev; ++ int pages; + -+/** @brief Arguments for _mali_ukk_get_gp_number_of_cores() -+ * -+ * - pass in the user-kernel context @c ctx that was returned from _mali_ukk_open() -+ * - Upon successful return from _mali_ukk_get_gp_number_of_cores(), @c number_of_cores -+ * will contain the number of Vertex Processor cores in the system. -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 number_of_cores; /**< [out] number of Vertex Processor cores in the system */ -+} _mali_uk_get_gp_number_of_cores_s; ++ KBASE_DEBUG_ASSERT(kbdev); + -+/** @brief Arguments for _mali_ukk_get_gp_core_version() -+ * -+ * - pass in the user-kernel context @c ctx that was returned from _mali_ukk_open() -+ * - Upon successful return from _mali_ukk_get_gp_core_version(), @c version contains -+ * the version that all Vertex Processor cores are compatible with. -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ _mali_core_version version; /**< [out] version returned from core, see \ref _mali_core_version */ -+} _mali_uk_get_gp_core_version_s; ++ memdev = &kbdev->memdev; + -+/** @} */ /* end group _mali_uk_gp */ ++ pages = atomic_read(&memdev->used_pages); ++ if (pages != 0) ++ dev_warn(kbdev->dev, "%s: %d pages in use!\n", __func__, pages); + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 event_id; /**< [in] event id to register (see enum mali_profiling_events for values) */ -+ u32 data[5]; /**< [in] event specific data */ -+} _mali_uk_profiling_add_event_s; ++ kbase_mem_pool_term(&kbdev->mem_pool); ++} + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 memory_usage; /**< [out] total memory usage */ -+ u32 vaddr; /**< [in] mali address for the cow allocaiton */ -+ s32 change_pages_nr; /**< [out] record the page number change for cow operation */ -+} _mali_uk_profiling_memory_usage_get_s; ++KBASE_EXPORT_TEST_API(kbase_mem_term); + + -+/** @addtogroup _mali_uk_memory U/K Memory -+ * @{ */ + -+/** @brief Arguments to _mali_ukk_mem_mmap() -+ * -+ * Use of the phys_addr member depends on whether the driver is compiled for -+ * Mali-MMU or nonMMU: -+ * - in the nonMMU case, this is the physical address of the memory as seen by -+ * the CPU (which may be a constant offset from that used by Mali) -+ * - in the MMU case, this is the Mali Virtual base address of the memory to -+ * allocate, and the particular physical pages used to back the memory are -+ * entirely determined by _mali_ukk_mem_mmap(). The details of the physical pages -+ * are not reported to user-space for security reasons. -+ * -+ * The cookie member must be stored for use later when freeing the memory by -+ * calling _mali_ukk_mem_munmap(). In the Mali-MMU case, the cookie is secure. -+ * -+ * The ukk_private word must be set to zero when calling from user-space. On -+ * Kernel-side, the OS implementation of the U/K interface can use it to -+ * communicate data to the OS implementation of the OSK layer. In particular, -+ * _mali_ukk_get_big_block() directly calls _mali_ukk_mem_mmap directly, and -+ * will communicate its own ukk_private word through the ukk_private member -+ * here. The common code itself will not inspect or modify the ukk_private -+ * word, and so it may be safely used for whatever purposes necessary to -+ * integrate Mali Memory handling into the OS. -+ * -+ * The uku_private member is currently reserved for use by the user-side -+ * implementation of the U/K interface. Its value must be zero. -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ void *mapping; /**< [out] Returns user-space virtual address for the mapping */ -+ u32 size; /**< [in] Size of the requested mapping */ -+ u32 phys_addr; /**< [in] Physical address - could be offset, depending on caller+callee convention */ -+ mali_bool writeable; -+} _mali_uk_mem_mmap_s; + -+/** @brief Arguments to _mali_ukk_mem_munmap() ++/** ++ * @brief Allocate a free region object. + * -+ * The cookie and mapping members must be that returned from the same previous -+ * call to _mali_ukk_mem_mmap(). The size member must correspond to cookie -+ * and mapping - that is, it must be the value originally supplied to a call to -+ * _mali_ukk_mem_mmap that returned the values of mapping and cookie. ++ * The allocated object is not part of any list yet, and is flagged as ++ * KBASE_REG_FREE. No mapping is allocated yet. + * -+ * An error will be returned if an attempt is made to unmap only part of the -+ * originally obtained range, or to unmap more than was originally obtained. -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ void *mapping; /**< [in] The mapping returned from mmap call */ -+ u32 size; /**< [in] The size passed to mmap call */ -+} _mali_uk_mem_munmap_s; -+/** @} */ /* end group _mali_uk_memory */ -+ -+/** @defgroup _mali_uk_vsync U/K VSYNC Wait Reporting Module -+ * @{ */ -+ -+/** @brief VSYNC events ++ * zone is KBASE_REG_ZONE_CUSTOM_VA, KBASE_REG_ZONE_SAME_VA, or KBASE_REG_ZONE_EXEC + * -+ * These events are reported when DDK starts to wait for vsync and when the -+ * vsync has occured and the DDK can continue on the next frame. + */ -+typedef enum _mali_uk_vsync_event { -+ _MALI_UK_VSYNC_EVENT_BEGIN_WAIT = 0, -+ _MALI_UK_VSYNC_EVENT_END_WAIT -+} _mali_uk_vsync_event; ++struct kbase_va_region *kbase_alloc_free_region(struct kbase_context *kctx, u64 start_pfn, size_t nr_pages, int zone) ++{ ++ struct kbase_va_region *new_reg; + -+/** @brief Arguments to _mali_ukk_vsync_event() -+ * -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ _mali_uk_vsync_event event; /**< [in] VSYNCH event type */ -+} _mali_uk_vsync_event_report_s; ++ KBASE_DEBUG_ASSERT(kctx != NULL); + -+/** @} */ /* end group _mali_uk_vsync */ ++ /* zone argument should only contain zone related region flags */ ++ KBASE_DEBUG_ASSERT((zone & ~KBASE_REG_ZONE_MASK) == 0); ++ KBASE_DEBUG_ASSERT(nr_pages > 0); ++ /* 64-bit address range is the max */ ++ KBASE_DEBUG_ASSERT(start_pfn + nr_pages <= (U64_MAX / PAGE_SIZE)); + -+/** @defgroup _mali_uk_sw_counters_report U/K Software Counter Reporting -+ * @{ */ ++ new_reg = kzalloc(sizeof(*new_reg), GFP_KERNEL); + -+/** @brief Software counter values -+ * -+ * Values recorded for each of the software counters during a single renderpass. -+ */ -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u64 counters; /**< [in] The array of u32 counter values */ -+ u32 num_counters; /**< [in] The number of elements in counters array */ -+} _mali_uk_sw_counters_report_s; ++ if (!new_reg) ++ return NULL; + -+/** @} */ /* end group _mali_uk_sw_counters_report */ ++ new_reg->cpu_alloc = NULL; /* no alloc bound yet */ ++ new_reg->gpu_alloc = NULL; /* no alloc bound yet */ ++ new_reg->kctx = kctx; ++ new_reg->flags = zone | KBASE_REG_FREE; + -+/** @defgroup _mali_uk_timeline U/K Mali Timeline -+ * @{ */ ++ new_reg->flags |= KBASE_REG_GROWABLE; + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 timeline; /**< [in] timeline id */ -+ u32 point; /**< [out] latest point on timeline */ -+} _mali_uk_timeline_get_latest_point_s; ++ new_reg->start_pfn = start_pfn; ++ new_reg->nr_pages = nr_pages; + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ _mali_uk_fence_t fence; /**< [in] fence */ -+ u32 timeout; /**< [in] timeout (0 for no wait, -1 for blocking) */ -+ u32 status; /**< [out] status of fence (1 if signaled, 0 if timeout) */ -+} _mali_uk_timeline_wait_s; ++ return new_reg; ++} + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ _mali_uk_fence_t fence; /**< [in] mali fence to create linux sync fence from */ -+ s32 sync_fd; /**< [out] file descriptor for new linux sync fence */ -+} _mali_uk_timeline_create_sync_fence_s; ++KBASE_EXPORT_TEST_API(kbase_alloc_free_region); + -+/** @} */ /* end group _mali_uk_timeline */ ++/** ++ * @brief Free a region object. ++ * ++ * The described region must be freed of any mapping. ++ * ++ * If the region is not flagged as KBASE_REG_FREE, the region's ++ * alloc object will be released. ++ * It is a bug if no alloc object exists for non-free regions. ++ * ++ */ ++void kbase_free_alloced_region(struct kbase_va_region *reg) ++{ ++ if (!(reg->flags & KBASE_REG_FREE)) { ++ /* ++ * The physical allocation should have been removed from the ++ * eviction list before this function is called. However, in the ++ * case of abnormal process termination or the app leaking the ++ * memory kbase_mem_free_region is not called so it can still be ++ * on the list at termination time of the region tracker. ++ */ ++ if (!list_empty(®->gpu_alloc->evict_node)) { ++ /* ++ * Unlink the physical allocation before unmaking it ++ * evictable so that the allocation isn't grown back to ++ * its last backed size as we're going to unmap it ++ * anyway. ++ */ ++ reg->cpu_alloc->reg = NULL; ++ if (reg->cpu_alloc != reg->gpu_alloc) ++ reg->gpu_alloc->reg = NULL; + -+/** @} */ /* end group u_k_api */ ++ /* ++ * If a region has been made evictable then we must ++ * unmake it before trying to free it. ++ * If the memory hasn't been reclaimed it will be ++ * unmapped and freed below, if it has been reclaimed ++ * then the operations below are no-ops. ++ */ ++ if (reg->flags & KBASE_REG_DONT_NEED) { ++ KBASE_DEBUG_ASSERT(reg->cpu_alloc->type == ++ KBASE_MEM_TYPE_NATIVE); ++ kbase_mem_evictable_unmake(reg->gpu_alloc); ++ } ++ } + -+/** @} */ /* end group uddapi */ ++ /* ++ * Remove the region from the sticky resource metadata ++ * list should it be there. ++ */ ++ kbase_sticky_resource_release(reg->kctx, NULL, ++ reg->start_pfn << PAGE_SHIFT); + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ s32 stream_fd; /**< [in] The profiling kernel base stream fd handle */ -+} _mali_uk_profiling_stream_fd_get_s; ++ kbase_mem_phy_alloc_put(reg->cpu_alloc); ++ kbase_mem_phy_alloc_put(reg->gpu_alloc); ++ /* To detect use-after-free in debug builds */ ++ KBASE_DEBUG_CODE(reg->flags |= KBASE_REG_FREE); ++ } ++ kfree(reg); ++} + -+typedef struct { -+ u64 ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u64 control_packet_data; /**< [in] the control packet data for control settings */ -+ u32 control_packet_size; /**< [in] The control packet size */ -+ u64 response_packet_data; /** < [out] The response packet data */ -+ u32 response_packet_size; /** < [in,out] The response packet data */ -+} _mali_uk_profiling_control_set_s; ++KBASE_EXPORT_TEST_API(kbase_free_alloced_region); + -+#ifdef __cplusplus -+} -+#endif ++int kbase_gpu_mmap(struct kbase_context *kctx, struct kbase_va_region *reg, u64 addr, size_t nr_pages, size_t align) ++{ ++ int err; ++ size_t i = 0; ++ unsigned long attr; ++ unsigned long mask = ~KBASE_REG_MEMATTR_MASK; + -+#endif /* __MALI_UTGARD_UK_TYPES_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h b/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h -new file mode 100755 -index 000000000000..6fafc6777e48 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h -@@ -0,0 +1,30 @@ -+/* -+ * Copyright (C) 2010, 2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ if ((kctx->kbdev->system_coherency == COHERENCY_ACE) && ++ (reg->flags & KBASE_REG_SHARE_BOTH)) ++ attr = KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_OUTER_WA); ++ else ++ attr = KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_WRITE_ALLOC); + -+/** -+ * @file mali_kernel_license.h -+ * Defines for the macro MODULE_LICENSE. -+ */ ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ KBASE_DEBUG_ASSERT(NULL != reg); + -+#ifndef __MALI_KERNEL_LICENSE_H__ -+#define __MALI_KERNEL_LICENSE_H__ ++ err = kbase_add_va_region(kctx, reg, addr, nr_pages, align); ++ if (err) ++ return err; + -+#ifdef __cplusplus -+extern "C" { -+#endif ++ if (reg->gpu_alloc->type == KBASE_MEM_TYPE_ALIAS) { ++ u64 stride; ++ struct kbase_mem_phy_alloc *alloc; + -+#define MALI_KERNEL_LINUX_LICENSE "GPL" -+#define MALI_LICENSE_IS_GPL 1 ++ alloc = reg->gpu_alloc; ++ stride = alloc->imported.alias.stride; ++ KBASE_DEBUG_ASSERT(alloc->imported.alias.aliased); ++ for (i = 0; i < alloc->imported.alias.nents; i++) { ++ if (alloc->imported.alias.aliased[i].alloc) { ++ err = kbase_mmu_insert_pages(kctx, ++ reg->start_pfn + (i * stride), ++ alloc->imported.alias.aliased[i].alloc->pages + alloc->imported.alias.aliased[i].offset, ++ alloc->imported.alias.aliased[i].length, ++ reg->flags); ++ if (err) ++ goto bad_insert; + -+#ifdef __cplusplus -+} -+#endif ++ kbase_mem_phy_alloc_gpu_mapped(alloc->imported.alias.aliased[i].alloc); ++ } else { ++ err = kbase_mmu_insert_single_page(kctx, ++ reg->start_pfn + i * stride, ++ page_to_phys(kctx->aliasing_sink_page), ++ alloc->imported.alias.aliased[i].length, ++ (reg->flags & mask) | attr); + -+#endif /* __MALI_KERNEL_LICENSE_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c -new file mode 100755 -index 000000000000..260c2a8227a9 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c -@@ -0,0 +1,354 @@ -+/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ if (err) ++ goto bad_insert; ++ } ++ } ++ } else { ++ err = kbase_mmu_insert_pages(kctx, reg->start_pfn, ++ kbase_get_gpu_phy_pages(reg), ++ kbase_reg_current_backed_size(reg), ++ reg->flags); ++ if (err) ++ goto bad_insert; ++ kbase_mem_phy_alloc_gpu_mapped(reg->gpu_alloc); ++ } + -+#include "mali_osk_mali.h" -+#include "mali_kernel_common.h" ++ return err; + -+#include -+#include -+#include -+#include -+#ifdef CONFIG_DEVFREQ_THERMAL -+#include -+#endif ++bad_insert: ++ if (reg->gpu_alloc->type == KBASE_MEM_TYPE_ALIAS) { ++ u64 stride; + -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) -+#include -+#else /* Linux >= 3.13 */ -+/* In 3.13 the OPP include header file, types, and functions were all -+ * renamed. Use the old filename for the include, and define the new names to -+ * the old, when an old kernel is detected. -+ */ -+#include -+#define dev_pm_opp opp -+#define dev_pm_opp_get_voltage opp_get_voltage -+#define dev_pm_opp_get_opp_count opp_get_opp_count -+#define dev_pm_opp_find_freq_ceil opp_find_freq_ceil -+#endif /* Linux >= 3.13 */ ++ stride = reg->gpu_alloc->imported.alias.stride; ++ KBASE_DEBUG_ASSERT(reg->gpu_alloc->imported.alias.aliased); ++ while (i--) ++ if (reg->gpu_alloc->imported.alias.aliased[i].alloc) { ++ kbase_mmu_teardown_pages(kctx, reg->start_pfn + (i * stride), reg->gpu_alloc->imported.alias.aliased[i].length); ++ kbase_mem_phy_alloc_gpu_unmapped(reg->gpu_alloc->imported.alias.aliased[i].alloc); ++ } ++ } + -+#include "mali_pm_metrics.h" ++ kbase_remove_va_region(kctx, reg); + -+#include -+#include ++ return err; ++} + -+static struct monitor_dev_profile mali_mdevp = { -+ .type = MONITOR_TPYE_DEV, -+ .low_temp_adjust = rockchip_monitor_dev_low_temp_adjust, -+ .high_temp_adjust = rockchip_monitor_dev_high_temp_adjust, -+}; ++KBASE_EXPORT_TEST_API(kbase_gpu_mmap); + -+static struct devfreq_simple_ondemand_data ondemand_data; ++static void kbase_jd_user_buf_unmap(struct kbase_context *kctx, ++ struct kbase_mem_phy_alloc *alloc, bool writeable); + -+static int -+mali_devfreq_target(struct device *dev, unsigned long *target_freq, u32 flags) ++int kbase_gpu_munmap(struct kbase_context *kctx, struct kbase_va_region *reg) +{ -+ struct mali_device *mdev = dev_get_drvdata(dev); -+ struct dev_pm_opp *opp; -+ unsigned long freq = 0; -+ unsigned long old_freq = mdev->current_freq; -+ unsigned long voltage; + int err; + -+ freq = *target_freq; ++ if (reg->start_pfn == 0) ++ return 0; + -+ opp = devfreq_recommended_opp(dev, &freq, flags); -+ if (IS_ERR(opp)) { -+ MALI_PRINT_ERROR(("Failed to get opp (%ld)\n", PTR_ERR(opp))); -+ return PTR_ERR(opp); -+ } -+ voltage = dev_pm_opp_get_voltage(opp); -+ dev_pm_opp_put(opp); ++ if (reg->gpu_alloc && reg->gpu_alloc->type == KBASE_MEM_TYPE_ALIAS) { ++ size_t i; + -+ MALI_DEBUG_PRINT(2, ("mali_devfreq_target:set_freq = %lld flags = 0x%x\n", freq, flags)); -+ /* -+ * Only update if there is a change of frequency -+ */ -+ if (old_freq == freq) { -+ *target_freq = freq; -+ mali_pm_reset_dvfs_utilisation(mdev); -+#ifdef CONFIG_REGULATOR -+ if (mdev->current_voltage == voltage) -+ return 0; -+ err = regulator_set_voltage(mdev->regulator, voltage, INT_MAX); -+ if (err) { -+ dev_err(dev, "Failed to set voltage (%d)\n", err); -+ return err; -+ } -+ mdev->current_voltage = voltage; -+#endif -+ return 0; ++ err = kbase_mmu_teardown_pages(kctx, reg->start_pfn, reg->nr_pages); ++ KBASE_DEBUG_ASSERT(reg->gpu_alloc->imported.alias.aliased); ++ for (i = 0; i < reg->gpu_alloc->imported.alias.nents; i++) ++ if (reg->gpu_alloc->imported.alias.aliased[i].alloc) ++ kbase_mem_phy_alloc_gpu_unmapped(reg->gpu_alloc->imported.alias.aliased[i].alloc); ++ } else { ++ err = kbase_mmu_teardown_pages(kctx, reg->start_pfn, kbase_reg_current_backed_size(reg)); ++ kbase_mem_phy_alloc_gpu_unmapped(reg->gpu_alloc); + } + -+#ifdef CONFIG_REGULATOR -+ if (mdev->regulator && mdev->current_voltage != voltage && -+ old_freq < freq) { -+ err = regulator_set_voltage(mdev->regulator, voltage, INT_MAX); -+ if (err) { -+ MALI_PRINT_ERROR(("Failed to increase voltage (%d)\n", err)); -+ return err; -+ } -+ } -+#endif ++ if (reg->gpu_alloc && reg->gpu_alloc->type == ++ KBASE_MEM_TYPE_IMPORTED_USER_BUF) { ++ struct kbase_alloc_import_user_buf *user_buf = ++ ®->gpu_alloc->imported.user_buf; + -+ err = clk_set_rate(mdev->clock, freq); -+ if (err) { -+ MALI_PRINT_ERROR(("Failed to set clock %lu (target %lu)\n", freq, *target_freq)); -+ return err; -+ } -+ *target_freq = freq; -+ mdev->current_freq = freq; -+ if (mdev->devfreq) -+ mdev->devfreq->last_status.current_frequency = freq; ++ if (user_buf->current_mapping_usage_count & PINNED_ON_IMPORT) { ++ user_buf->current_mapping_usage_count &= ++ ~PINNED_ON_IMPORT; + -+#ifdef CONFIG_REGULATOR -+ if (mdev->regulator && mdev->current_voltage != voltage && -+ old_freq > freq) { -+ err = regulator_set_voltage(mdev->regulator, voltage, INT_MAX); -+ if (err) { -+ MALI_PRINT_ERROR(("Failed to decrease voltage (%d)\n", err)); -+ return err; ++ kbase_jd_user_buf_unmap(kctx, reg->gpu_alloc, ++ (reg->flags & KBASE_REG_GPU_WR)); + } + } -+#endif -+ -+ mdev->current_voltage = voltage; + -+ mali_pm_reset_dvfs_utilisation(mdev); ++ if (err) ++ return err; + ++ err = kbase_remove_va_region(kctx, reg); + return err; +} + -+static int -+mali_devfreq_cur_freq(struct device *dev, unsigned long *freq) ++static struct kbase_cpu_mapping *kbasep_find_enclosing_cpu_mapping( ++ struct kbase_context *kctx, ++ unsigned long uaddr, size_t size, u64 *offset) +{ -+ struct mali_device *mdev = dev_get_drvdata(dev); ++ struct vm_area_struct *vma; ++ struct kbase_cpu_mapping *map; ++ unsigned long vm_pgoff_in_region; ++ unsigned long vm_off_in_region; ++ unsigned long map_start; ++ size_t map_size; + -+ *freq = mdev->current_freq; ++ lockdep_assert_held(¤t->mm->mmap_lock); + -+ MALI_DEBUG_PRINT(2, ("mali_devfreq_cur_freq: freq = %d \n", *freq)); -+ return 0; -+} ++ if ((uintptr_t) uaddr + size < (uintptr_t) uaddr) /* overflow check */ ++ return NULL; + -+static int -+mali_devfreq_status(struct device *dev, struct devfreq_dev_status *stat) -+{ -+ struct mali_device *mdev = dev_get_drvdata(dev); ++ vma = find_vma_intersection(current->mm, uaddr, uaddr+size); + -+ stat->current_frequency = mdev->current_freq; ++ if (!vma || vma->vm_start > uaddr) ++ return NULL; ++ if (vma->vm_ops != &kbase_vm_ops) ++ /* Not ours! */ ++ return NULL; + -+ mali_pm_get_dvfs_utilisation(mdev, -+ &stat->total_time, &stat->busy_time); ++ map = vma->vm_private_data; + -+ stat->private_data = NULL; ++ if (map->kctx != kctx) ++ /* Not from this context! */ ++ return NULL; + -+#ifdef CONFIG_DEVFREQ_THERMAL -+ memcpy(&mdev->devfreq->last_status, stat, sizeof(*stat)); -+#endif ++ vm_pgoff_in_region = vma->vm_pgoff - map->region->start_pfn; ++ vm_off_in_region = vm_pgoff_in_region << PAGE_SHIFT; ++ map_start = vma->vm_start - vm_off_in_region; ++ map_size = map->region->nr_pages << PAGE_SHIFT; + -+ return 0; -+} ++ if ((uaddr + size) > (map_start + map_size)) ++ /* Not within the CPU mapping */ ++ return NULL; + -+/* setup platform specific opp in platform.c*/ -+int __weak setup_opps(void) -+{ -+ return 0; -+} ++ *offset = (uaddr - vma->vm_start) + vm_off_in_region; + -+/* term platform specific opp in platform.c*/ -+int __weak term_opps(struct device *dev) -+{ -+ return 0; ++ return map; +} + -+static int mali_devfreq_init_freq_table(struct mali_device *mdev, -+ struct devfreq_dev_profile *dp) ++int kbasep_find_enclosing_cpu_mapping_offset( ++ struct kbase_context *kctx, ++ unsigned long uaddr, size_t size, u64 *offset) +{ -+ int err, count; -+ int i = 0; -+ unsigned long freq = 0; -+ struct dev_pm_opp *opp; -+ -+ err = setup_opps(); -+ if (err) -+ return err; -+ -+ count = dev_pm_opp_get_opp_count(mdev->dev); -+ if (count < 0) { -+ return count; -+ } -+ -+ MALI_DEBUG_PRINT(2, ("mali devfreq table count %d\n", count)); -+ -+ dp->freq_table = kmalloc_array(count, sizeof(dp->freq_table[0]), -+ GFP_KERNEL); -+ if (!dp->freq_table) -+ return -ENOMEM; ++ struct kbase_cpu_mapping *map; + -+ for (i = 0; i < count; i++, freq++) { -+ opp = dev_pm_opp_find_freq_ceil(mdev->dev, &freq); -+ if (IS_ERR(opp)) -+ break; -+ dev_pm_opp_put(opp); ++ kbase_os_mem_map_lock(kctx); + -+ dp->freq_table[i] = freq; -+ MALI_DEBUG_PRINT(2, ("mali devfreq table array[%d] = %d\n", i, freq)); -+ } ++ map = kbasep_find_enclosing_cpu_mapping(kctx, uaddr, size, offset); + -+ if (count != i) -+ MALI_PRINT_ERROR(("Unable to enumerate all OPPs (%d!=%d)\n", -+ count, i)); ++ kbase_os_mem_map_unlock(kctx); + -+ dp->max_state = i; ++ if (!map) ++ return -EINVAL; + + return 0; +} + -+static void mali_devfreq_term_freq_table(struct mali_device *mdev) -+{ -+ struct devfreq_dev_profile *dp = mdev->devfreq->profile; -+ -+ kfree(dp->freq_table); -+ term_opps(mdev->dev); -+} ++KBASE_EXPORT_TEST_API(kbasep_find_enclosing_cpu_mapping_offset); + -+static void mali_devfreq_exit(struct device *dev) ++void kbase_sync_single(struct kbase_context *kctx, ++ phys_addr_t cpu_pa, phys_addr_t gpu_pa, ++ off_t offset, size_t size, enum kbase_sync_type sync_fn) +{ -+ struct mali_device *mdev = dev_get_drvdata(dev); ++ struct page *cpu_page; + -+ mali_devfreq_term_freq_table(mdev); -+} ++ cpu_page = pfn_to_page(PFN_DOWN(cpu_pa)); + -+int mali_devfreq_init(struct mali_device *mdev) -+{ -+ struct device_node *np = mdev->dev->of_node; -+#ifdef CONFIG_DEVFREQ_THERMAL -+ struct devfreq_cooling_power *callbacks = NULL; -+ _mali_osk_device_data data; -+#endif -+ struct devfreq_dev_profile *dp; -+ struct dev_pm_opp *opp; -+ unsigned long opp_rate; -+ int err; ++ if (likely(cpu_pa == gpu_pa)) { ++ dma_addr_t dma_addr; + -+ MALI_DEBUG_PRINT(2, ("Init Mali devfreq\n")); ++ BUG_ON(!cpu_page); ++ BUG_ON(offset + size > PAGE_SIZE); + -+ if (!mdev->clock) -+ return -ENODEV; ++ dma_addr = kbase_dma_addr(cpu_page) + offset; ++ if (sync_fn == KBASE_SYNC_TO_CPU) ++ dma_sync_single_for_cpu(kctx->kbdev->dev, dma_addr, ++ size, DMA_BIDIRECTIONAL); ++ else if (sync_fn == KBASE_SYNC_TO_DEVICE) ++ dma_sync_single_for_device(kctx->kbdev->dev, dma_addr, ++ size, DMA_BIDIRECTIONAL); ++ } else { ++ void *src = NULL; ++ void *dst = NULL; ++ struct page *gpu_page; + -+ mdev->current_freq = clk_get_rate(mdev->clock); ++ if (WARN(!gpu_pa, "No GPU PA found for infinite cache op")) ++ return; + -+ dp = &mdev->devfreq_profile; ++ gpu_page = pfn_to_page(PFN_DOWN(gpu_pa)); + -+ dp->initial_freq = mdev->current_freq; -+ dp->polling_ms = 100; -+ dp->target = mali_devfreq_target; -+ dp->get_dev_status = mali_devfreq_status; -+ dp->get_cur_freq = mali_devfreq_cur_freq; -+ dp->exit = mali_devfreq_exit; ++ if (sync_fn == KBASE_SYNC_TO_DEVICE) { ++ src = ((unsigned char *)kmap(cpu_page)) + offset; ++ dst = ((unsigned char *)kmap(gpu_page)) + offset; ++ } else if (sync_fn == KBASE_SYNC_TO_CPU) { ++ dma_sync_single_for_cpu(kctx->kbdev->dev, ++ kbase_dma_addr(gpu_page) + offset, ++ size, DMA_BIDIRECTIONAL); ++ src = ((unsigned char *)kmap(gpu_page)) + offset; ++ dst = ((unsigned char *)kmap(cpu_page)) + offset; ++ } ++ memcpy(dst, src, size); ++ kunmap(gpu_page); ++ kunmap(cpu_page); ++ if (sync_fn == KBASE_SYNC_TO_DEVICE) ++ dma_sync_single_for_device(kctx->kbdev->dev, ++ kbase_dma_addr(gpu_page) + offset, ++ size, DMA_BIDIRECTIONAL); ++ } ++} + -+ if (mali_devfreq_init_freq_table(mdev, dp)) -+ return -EFAULT; ++static int kbase_do_syncset(struct kbase_context *kctx, ++ struct basep_syncset *sset, enum kbase_sync_type sync_fn) ++{ ++ int err = 0; ++ struct kbase_va_region *reg; ++ struct kbase_cpu_mapping *map; ++ unsigned long start; ++ size_t size; ++ phys_addr_t *cpu_pa; ++ phys_addr_t *gpu_pa; ++ u64 page_off, page_count; ++ u64 i; ++ u64 offset; + -+ of_property_read_u32(np, "upthreshold", -+ &ondemand_data.upthreshold); -+ of_property_read_u32(np, "downdifferential", -+ &ondemand_data.downdifferential); ++ kbase_os_mem_map_lock(kctx); ++ kbase_gpu_vm_lock(kctx); + -+ mdev->devfreq = devfreq_add_device(mdev->dev, dp, -+ "simple_ondemand", &ondemand_data); -+ if (IS_ERR(mdev->devfreq)) { -+ mali_devfreq_term_freq_table(mdev); -+ return PTR_ERR(mdev->devfreq); ++ /* find the region where the virtual address is contained */ ++ reg = kbase_region_tracker_find_region_enclosing_address(kctx, ++ sset->mem_handle.basep.handle); ++ if (!reg) { ++ dev_warn(kctx->kbdev->dev, "Can't find region at VA 0x%016llX", ++ sset->mem_handle.basep.handle); ++ err = -EINVAL; ++ goto out_unlock; + } + -+ err = devfreq_register_opp_notifier(mdev->dev, mdev->devfreq); -+ if (err) { -+ MALI_PRINT_ERROR(("Failed to register OPP notifier (%d)\n", err)); -+ goto opp_notifier_failed; -+ } ++ if (!(reg->flags & KBASE_REG_CPU_CACHED)) ++ goto out_unlock; + -+ opp_rate = mdev->current_freq; -+ opp = devfreq_recommended_opp(mdev->dev, &opp_rate, 0); -+ if (!IS_ERR(opp)) -+ dev_pm_opp_put(opp); -+ mdev->devfreq->last_status.current_frequency = opp_rate; ++ start = (uintptr_t)sset->user_addr; ++ size = (size_t)sset->size; + -+ mali_mdevp.data = mdev->devfreq; -+ mdev->mdev_info = rockchip_system_monitor_register(mdev->dev, -+ &mali_mdevp); -+ if (IS_ERR(mdev->mdev_info)) { -+ dev_dbg(mdev->dev, "without system monitor\n"); -+ mdev->mdev_info = NULL; ++ map = kbasep_find_enclosing_cpu_mapping(kctx, start, size, &offset); ++ if (!map) { ++ dev_warn(kctx->kbdev->dev, "Can't find CPU mapping 0x%016lX for VA 0x%016llX", ++ start, sset->mem_handle.basep.handle); ++ err = -EINVAL; ++ goto out_unlock; + } -+#ifdef CONFIG_DEVFREQ_THERMAL -+ if (of_machine_is_compatible("rockchip,rk3036")) -+ return 0; + -+ /* Initilization last_status it will be used when first power allocate called */ -+ mdev->devfreq->last_status.current_frequency = mdev->current_freq; ++ page_off = offset >> PAGE_SHIFT; ++ offset &= ~PAGE_MASK; ++ page_count = (size + offset + (PAGE_SIZE - 1)) >> PAGE_SHIFT; ++ cpu_pa = kbase_get_cpu_phy_pages(reg); ++ gpu_pa = kbase_get_gpu_phy_pages(reg); + -+ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { -+ if (NULL != data.gpu_cooling_ops) { -+ callbacks = data.gpu_cooling_ops; -+ MALI_DEBUG_PRINT(2, ("Mali GPU Thermal: Callback handler installed \n")); -+ } ++ if (page_off > reg->nr_pages || ++ page_off + page_count > reg->nr_pages) { ++ /* Sync overflows the region */ ++ err = -EINVAL; ++ goto out_unlock; + } + -+ if (callbacks) { -+ mdev->devfreq_cooling = of_devfreq_cooling_register_power( -+ mdev->dev->of_node, -+ mdev->devfreq, -+ callbacks); -+ if (IS_ERR_OR_NULL(mdev->devfreq_cooling)) { -+ err = PTR_ERR(mdev->devfreq_cooling); -+ MALI_PRINT_ERROR(("Failed to register cooling device (%d)\n", err)); -+ goto cooling_failed; -+ } else { -+ MALI_DEBUG_PRINT(2, ("Mali GPU Thermal Cooling installed \n")); -+ } ++ /* Sync first page */ ++ if (cpu_pa[page_off]) { ++ size_t sz = MIN(((size_t) PAGE_SIZE - offset), size); ++ ++ kbase_sync_single(kctx, cpu_pa[page_off], gpu_pa[page_off], ++ offset, sz, sync_fn); + } -+#endif + -+ return 0; ++ /* Sync middle pages (if any) */ ++ for (i = 1; page_count > 2 && i < page_count - 1; i++) { ++ /* we grow upwards, so bail on first non-present page */ ++ if (!cpu_pa[page_off + i]) ++ break; + -+#ifdef CONFIG_DEVFREQ_THERMAL -+cooling_failed: -+ devfreq_unregister_opp_notifier(mdev->dev, mdev->devfreq); -+#endif /* CONFIG_DEVFREQ_THERMAL */ -+opp_notifier_failed: -+ err = devfreq_remove_device(mdev->devfreq); -+ if (err) -+ MALI_PRINT_ERROR(("Failed to terminate devfreq (%d)\n", err)); -+ else -+ mdev->devfreq = NULL; ++ kbase_sync_single(kctx, cpu_pa[page_off + i], ++ gpu_pa[page_off + i], 0, PAGE_SIZE, sync_fn); ++ } ++ ++ /* Sync last page (if any) */ ++ if (page_count > 1 && cpu_pa[page_off + page_count - 1]) { ++ size_t sz = ((start + size - 1) & ~PAGE_MASK) + 1; + ++ kbase_sync_single(kctx, cpu_pa[page_off + page_count - 1], ++ gpu_pa[page_off + page_count - 1], 0, sz, ++ sync_fn); ++ } ++ ++out_unlock: ++ kbase_gpu_vm_unlock(kctx); ++ kbase_os_mem_map_unlock(kctx); + return err; +} + -+void mali_devfreq_term(struct mali_device *mdev) ++int kbase_sync_now(struct kbase_context *kctx, struct basep_syncset *sset) +{ -+ int err; ++ int err = -EINVAL; + -+ MALI_DEBUG_PRINT(2, ("Term Mali devfreq\n")); ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(sset != NULL); + -+ rockchip_system_monitor_unregister(mdev->mdev_info); -+#ifdef CONFIG_DEVFREQ_THERMAL -+ devfreq_cooling_unregister(mdev->devfreq_cooling); -+#endif ++ if (sset->mem_handle.basep.handle & ~PAGE_MASK) { ++ dev_warn(kctx->kbdev->dev, ++ "mem_handle: passed parameter is invalid"); ++ return -EINVAL; ++ } + -+ devfreq_unregister_opp_notifier(mdev->dev, mdev->devfreq); ++ switch (sset->type) { ++ case BASE_SYNCSET_OP_MSYNC: ++ err = kbase_do_syncset(kctx, sset, KBASE_SYNC_TO_DEVICE); ++ break; + -+ err = devfreq_remove_device(mdev->devfreq); -+ if (err) -+ MALI_PRINT_ERROR(("Failed to terminate devfreq (%d)\n", err)); -+ else -+ mdev->devfreq = NULL; -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h -new file mode 100755 -index 000000000000..ba7c017d88dc ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h -@@ -0,0 +1,17 @@ -+/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#ifndef _MALI_DEVFREQ_H_ -+#define _MALI_DEVFREQ_H_ ++ case BASE_SYNCSET_OP_CSYNC: ++ err = kbase_do_syncset(kctx, sset, KBASE_SYNC_TO_CPU); ++ break; + -+int mali_devfreq_init(struct mali_device *mdev); ++ default: ++ dev_warn(kctx->kbdev->dev, "Unknown msync op %d\n", sset->type); ++ break; ++ } + -+void mali_devfreq_term(struct mali_device *mdev); ++ return err; ++} + -+#endif -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c b/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c -new file mode 100755 -index 000000000000..95c3ea12d645 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c -@@ -0,0 +1,36 @@ -+/** -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++KBASE_EXPORT_TEST_API(kbase_sync_now); + -+/** -+ * @file mali_device_pause_resume.c -+ * Implementation of the Mali pause/resume functionality -+ */ ++/* vm lock must be held */ ++int kbase_mem_free_region(struct kbase_context *kctx, struct kbase_va_region *reg) ++{ ++ int err; + -+#include -+#include -+#include "mali_pm.h" ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ KBASE_DEBUG_ASSERT(NULL != reg); ++ lockdep_assert_held(&kctx->reg_lock); + -+void mali_dev_pause(void) -+{ + /* -+ * Deactive all groups to prevent hardware being touched -+ * during the period of mali device pausing ++ * Unlink the physical allocation before unmaking it evictable so ++ * that the allocation isn't grown back to its last backed size ++ * as we're going to unmap it anyway. + */ -+ mali_pm_os_suspend(MALI_FALSE); -+} -+ -+EXPORT_SYMBOL(mali_dev_pause); -+ -+void mali_dev_resume(void) -+{ -+ mali_pm_os_resume(); -+} ++ reg->cpu_alloc->reg = NULL; ++ if (reg->cpu_alloc != reg->gpu_alloc) ++ reg->gpu_alloc->reg = NULL; + -+EXPORT_SYMBOL(mali_dev_resume); -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c -new file mode 100755 -index 000000000000..e026e11e4bc5 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c -@@ -0,0 +1,439 @@ -+/* -+ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#include -+#include "mali_osk.h" -+#include "mali_kernel_common.h" ++ /* ++ * If a region has been made evictable then we must unmake it ++ * before trying to free it. ++ * If the memory hasn't been reclaimed it will be unmapped and freed ++ * below, if it has been reclaimed then the operations below are no-ops. ++ */ ++ if (reg->flags & KBASE_REG_DONT_NEED) { ++ KBASE_DEBUG_ASSERT(reg->cpu_alloc->type == ++ KBASE_MEM_TYPE_NATIVE); ++ kbase_mem_evictable_unmake(reg->gpu_alloc); ++ } + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) -+#include "mali_dma_fence.h" -+#include -+#include -+#endif ++ err = kbase_gpu_munmap(kctx, reg); ++ if (err) { ++ dev_warn(reg->kctx->kbdev->dev, "Could not unmap from the GPU...\n"); ++ goto out; ++ } + -+static DEFINE_SPINLOCK(mali_dma_fence_lock); ++ /* This will also free the physical pages */ ++ kbase_free_alloced_region(reg); + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+static bool mali_dma_fence_enable_signaling(struct dma_fence *fence) -+{ -+ MALI_IGNORE(fence); -+ return true; ++ out: ++ return err; +} + -+static const char *mali_dma_fence_get_driver_name(struct dma_fence *fence) -+{ -+ MALI_IGNORE(fence); -+ return "mali"; -+} ++KBASE_EXPORT_TEST_API(kbase_mem_free_region); + -+static const char *mali_dma_fence_get_timeline_name(struct dma_fence *fence) ++/** ++ * @brief Free the region from the GPU and unregister it. ++ * ++ * This function implements the free operation on a memory segment. ++ * It will loudly fail if called with outstanding mappings. ++ */ ++int kbase_mem_free(struct kbase_context *kctx, u64 gpu_addr) +{ -+ MALI_IGNORE(fence); -+ return "mali_dma_fence"; -+} ++ int err = 0; ++ struct kbase_va_region *reg; + -+static const struct dma_fence_ops mali_dma_fence_ops = { -+ .get_driver_name = mali_dma_fence_get_driver_name, -+ .get_timeline_name = mali_dma_fence_get_timeline_name, -+ .enable_signaling = mali_dma_fence_enable_signaling, -+ .signaled = NULL, -+ .wait = dma_fence_default_wait, -+ .release = NULL -+}; -+#else -+static bool mali_dma_fence_enable_signaling(struct fence *fence) -+{ -+ MALI_IGNORE(fence); -+ return true; -+} ++ KBASE_DEBUG_ASSERT(kctx != NULL); + -+static const char *mali_dma_fence_get_driver_name(struct fence *fence) -+{ -+ MALI_IGNORE(fence); -+ return "mali"; -+} ++ if ((gpu_addr & ~PAGE_MASK) && (gpu_addr >= PAGE_SIZE)) { ++ dev_warn(kctx->kbdev->dev, "kbase_mem_free: gpu_addr parameter is invalid"); ++ return -EINVAL; ++ } + -+static const char *mali_dma_fence_get_timeline_name(struct fence *fence) -+{ -+ MALI_IGNORE(fence); -+ return "mali_dma_fence"; -+} ++ if (0 == gpu_addr) { ++ dev_warn(kctx->kbdev->dev, "gpu_addr 0 is reserved for the ringbuffer and it's an error to try to free it using kbase_mem_free\n"); ++ return -EINVAL; ++ } ++ kbase_gpu_vm_lock(kctx); + -+static const struct fence_ops mali_dma_fence_ops = { -+ .get_driver_name = mali_dma_fence_get_driver_name, -+ .get_timeline_name = mali_dma_fence_get_timeline_name, -+ .enable_signaling = mali_dma_fence_enable_signaling, -+ .signaled = NULL, -+ .wait = fence_default_wait, -+ .release = NULL -+}; -+#endif ++ if (gpu_addr >= BASE_MEM_COOKIE_BASE && ++ gpu_addr < BASE_MEM_FIRST_FREE_ADDRESS) { ++ int cookie = PFN_DOWN(gpu_addr - BASE_MEM_COOKIE_BASE); + -+static void mali_dma_fence_context_cleanup(struct mali_dma_fence_context *dma_fence_context) -+{ -+ u32 i; ++ reg = kctx->pending_regions[cookie]; ++ if (!reg) { ++ err = -EINVAL; ++ goto out_unlock; ++ } + -+ MALI_DEBUG_ASSERT_POINTER(dma_fence_context); ++ /* ask to unlink the cookie as we'll free it */ + -+ for (i = 0; i < dma_fence_context->num_dma_fence_waiter; i++) { -+ if (dma_fence_context->mali_dma_fence_waiters[i]) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ dma_fence_remove_callback(dma_fence_context->mali_dma_fence_waiters[i]->fence, -+ &dma_fence_context->mali_dma_fence_waiters[i]->base); -+ dma_fence_put(dma_fence_context->mali_dma_fence_waiters[i]->fence); ++ kctx->pending_regions[cookie] = NULL; ++ kctx->cookies |= (1UL << cookie); + -+#else -+ fence_remove_callback(dma_fence_context->mali_dma_fence_waiters[i]->fence, -+ &dma_fence_context->mali_dma_fence_waiters[i]->base); -+ fence_put(dma_fence_context->mali_dma_fence_waiters[i]->fence); -+#endif -+ kfree(dma_fence_context->mali_dma_fence_waiters[i]); -+ dma_fence_context->mali_dma_fence_waiters[i] = NULL; ++ kbase_free_alloced_region(reg); ++ } else { ++ /* A real GPU va */ ++ /* Validate the region */ ++ reg = kbase_region_tracker_find_region_base_address(kctx, gpu_addr); ++ if (!reg || (reg->flags & KBASE_REG_FREE)) { ++ dev_warn(kctx->kbdev->dev, "kbase_mem_free called with nonexistent gpu_addr 0x%llX", ++ gpu_addr); ++ err = -EINVAL; ++ goto out_unlock; + } -+ } + -+ if (NULL != dma_fence_context->mali_dma_fence_waiters) -+ kfree(dma_fence_context->mali_dma_fence_waiters); ++ if ((reg->flags & KBASE_REG_ZONE_MASK) == KBASE_REG_ZONE_SAME_VA) { ++ /* SAME_VA must be freed through munmap */ ++ dev_warn(kctx->kbdev->dev, "%s called on SAME_VA memory 0x%llX", __func__, ++ gpu_addr); ++ err = -EINVAL; ++ goto out_unlock; ++ } ++ err = kbase_mem_free_region(kctx, reg); ++ } + -+ dma_fence_context->mali_dma_fence_waiters = NULL; -+ dma_fence_context->num_dma_fence_waiter = 0; ++ out_unlock: ++ kbase_gpu_vm_unlock(kctx); ++ return err; +} + -+static void mali_dma_fence_context_work_func(struct work_struct *work_handle) ++KBASE_EXPORT_TEST_API(kbase_mem_free); ++ ++int kbase_update_region_flags(struct kbase_context *kctx, ++ struct kbase_va_region *reg, unsigned long flags) +{ -+ struct mali_dma_fence_context *dma_fence_context; ++ KBASE_DEBUG_ASSERT(NULL != reg); ++ KBASE_DEBUG_ASSERT((flags & ~((1ul << BASE_MEM_FLAGS_NR_BITS) - 1)) == 0); + -+ MALI_DEBUG_ASSERT_POINTER(work_handle); ++ reg->flags |= kbase_cache_enabled(flags, reg->nr_pages); ++ /* all memory is now growable */ ++ reg->flags |= KBASE_REG_GROWABLE; + -+ dma_fence_context = container_of(work_handle, struct mali_dma_fence_context, work_handle); ++ if (flags & BASE_MEM_GROW_ON_GPF) ++ reg->flags |= KBASE_REG_PF_GROW; + -+ dma_fence_context->cb_func(dma_fence_context->pp_job_ptr); -+} ++ if (flags & BASE_MEM_PROT_CPU_WR) ++ reg->flags |= KBASE_REG_CPU_WR; + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+static void mali_dma_fence_callback(struct dma_fence *fence, struct dma_fence_cb *cb) -+#else -+static void mali_dma_fence_callback(struct fence *fence, struct fence_cb *cb) -+#endif -+{ -+ struct mali_dma_fence_waiter *dma_fence_waiter = NULL; -+ struct mali_dma_fence_context *dma_fence_context = NULL; ++ if (flags & BASE_MEM_PROT_CPU_RD) ++ reg->flags |= KBASE_REG_CPU_RD; + -+ MALI_DEBUG_ASSERT_POINTER(fence); -+ MALI_DEBUG_ASSERT_POINTER(cb); ++ if (flags & BASE_MEM_PROT_GPU_WR) ++ reg->flags |= KBASE_REG_GPU_WR; + -+ MALI_IGNORE(fence); ++ if (flags & BASE_MEM_PROT_GPU_RD) ++ reg->flags |= KBASE_REG_GPU_RD; + -+ dma_fence_waiter = container_of(cb, struct mali_dma_fence_waiter, base); -+ dma_fence_context = dma_fence_waiter->parent; ++ if (0 == (flags & BASE_MEM_PROT_GPU_EX)) ++ reg->flags |= KBASE_REG_GPU_NX; + -+ MALI_DEBUG_ASSERT_POINTER(dma_fence_context); ++ if (!kbase_device_is_cpu_coherent(kctx->kbdev)) { ++ if (flags & BASE_MEM_COHERENT_SYSTEM_REQUIRED) ++ return -EINVAL; ++ } else if (flags & (BASE_MEM_COHERENT_SYSTEM | ++ BASE_MEM_COHERENT_SYSTEM_REQUIRED)) { ++ reg->flags |= KBASE_REG_SHARE_BOTH; ++ } + -+ if (atomic_dec_and_test(&dma_fence_context->count)) -+ schedule_work(&dma_fence_context->work_handle); ++ if (!(reg->flags & KBASE_REG_SHARE_BOTH) && ++ flags & BASE_MEM_COHERENT_LOCAL) { ++ reg->flags |= KBASE_REG_SHARE_IN; ++ } ++ ++ /* Set up default MEMATTR usage */ ++ if (kctx->kbdev->system_coherency == COHERENCY_ACE && ++ (reg->flags & KBASE_REG_SHARE_BOTH)) { ++ reg->flags |= ++ KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_DEFAULT_ACE); ++ } else { ++ reg->flags |= ++ KBASE_REG_MEMATTR_INDEX(AS_MEMATTR_INDEX_DEFAULT); ++ } ++ ++ return 0; +} + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+static _mali_osk_errcode_t mali_dma_fence_add_callback(struct mali_dma_fence_context *dma_fence_context, struct dma_fence *fence) -+#else -+static _mali_osk_errcode_t mali_dma_fence_add_callback(struct mali_dma_fence_context *dma_fence_context, struct fence *fence) -+#endif ++int kbase_alloc_phy_pages_helper( ++ struct kbase_mem_phy_alloc *alloc, ++ size_t nr_pages_requested) +{ -+ int ret = 0; -+ struct mali_dma_fence_waiter *dma_fence_waiter; -+ struct mali_dma_fence_waiter **dma_fence_waiters; ++ int new_page_count __maybe_unused; ++ size_t old_page_count = alloc->nents; + -+ MALI_DEBUG_ASSERT_POINTER(dma_fence_context); -+ MALI_DEBUG_ASSERT_POINTER(fence); ++ KBASE_DEBUG_ASSERT(alloc->type == KBASE_MEM_TYPE_NATIVE); ++ KBASE_DEBUG_ASSERT(alloc->imported.kctx); + -+ dma_fence_waiters = krealloc(dma_fence_context->mali_dma_fence_waiters, -+ (dma_fence_context->num_dma_fence_waiter + 1) -+ * sizeof(struct mali_dma_fence_waiter *), -+ GFP_KERNEL); ++ if (nr_pages_requested == 0) ++ goto done; /*nothing to do*/ + -+ if (NULL == dma_fence_waiters) { -+ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to realloc the dma fence waiters.\n")); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++ new_page_count = kbase_atomic_add_pages( ++ nr_pages_requested, &alloc->imported.kctx->used_pages); ++ kbase_atomic_add_pages(nr_pages_requested, &alloc->imported.kctx->kbdev->memdev.used_pages); + -+ dma_fence_context->mali_dma_fence_waiters = dma_fence_waiters; ++ /* Increase mm counters before we allocate pages so that this ++ * allocation is visible to the OOM killer */ ++ kbase_process_page_usage_inc(alloc->imported.kctx, nr_pages_requested); + -+ dma_fence_waiter = kzalloc(sizeof(struct mali_dma_fence_waiter), GFP_KERNEL); ++ if (kbase_mem_pool_alloc_pages(&alloc->imported.kctx->mem_pool, ++ nr_pages_requested, alloc->pages + old_page_count) != 0) ++ goto no_alloc; + -+ if (NULL == dma_fence_waiter) { -+ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to create mali dma fence waiter.\n")); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++ KBASE_TLSTREAM_AUX_PAGESALLOC( ++ (u32)alloc->imported.kctx->id, ++ (u64)new_page_count); + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ dma_fence_get(fence); -+#else -+ fence_get(fence); -+#endif -+ dma_fence_waiter->fence = fence; -+ dma_fence_waiter->parent = dma_fence_context; -+ atomic_inc(&dma_fence_context->count); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ ret = dma_fence_add_callback(fence, &dma_fence_waiter->base, -+ mali_dma_fence_callback); -+#else -+ ret = fence_add_callback(fence, &dma_fence_waiter->base, -+ mali_dma_fence_callback); -+#endif -+ if (0 > ret) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ dma_fence_put(fence); -+#else -+ fence_put(fence); -+#endif -+ kfree(dma_fence_waiter); -+ atomic_dec(&dma_fence_context->count); -+ if (-ENOENT == ret) { -+ /*-ENOENT if fence has already been signaled, return _MALI_OSK_ERR_OK*/ -+ return _MALI_OSK_ERR_OK; -+ } -+ /* Failed to add the fence callback into fence, return _MALI_OSK_ERR_FAULT*/ -+ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to add callback into fence.\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ alloc->nents += nr_pages_requested; ++done: ++ return 0; + -+ dma_fence_context->mali_dma_fence_waiters[dma_fence_context->num_dma_fence_waiter] = dma_fence_waiter; -+ dma_fence_context->num_dma_fence_waiter++; ++no_alloc: ++ kbase_process_page_usage_dec(alloc->imported.kctx, nr_pages_requested); ++ kbase_atomic_sub_pages(nr_pages_requested, &alloc->imported.kctx->used_pages); ++ kbase_atomic_sub_pages(nr_pages_requested, &alloc->imported.kctx->kbdev->memdev.used_pages); + -+ return _MALI_OSK_ERR_OK; ++ return -ENOMEM; +} + -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+struct dma_fence *mali_dma_fence_new(u32 context, u32 seqno) -+#else -+struct fence *mali_dma_fence_new(u32 context, u32 seqno) -+#endif ++int kbase_free_phy_pages_helper( ++ struct kbase_mem_phy_alloc *alloc, ++ size_t nr_pages_to_free) +{ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ struct dma_fence *fence = NULL; -+ fence = kzalloc(sizeof(struct dma_fence), GFP_KERNEL); -+#else -+ struct fence *fence = NULL; -+ fence = kzalloc(sizeof(struct fence), GFP_KERNEL); -+#endif -+ if (NULL == fence) { -+ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to create dma fence.\n")); -+ return fence; -+ } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ dma_fence_init(fence, -+ &mali_dma_fence_ops, -+ &mali_dma_fence_lock, -+ context, seqno); -+#else -+ fence_init(fence, -+ &mali_dma_fence_ops, -+ &mali_dma_fence_lock, -+ context, seqno); -+#endif -+ return fence; -+} ++ struct kbase_context *kctx = alloc->imported.kctx; ++ bool syncback; ++ bool reclaimed = (alloc->evicted != 0); ++ phys_addr_t *start_free; ++ int new_page_count __maybe_unused; + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+void mali_dma_fence_signal_and_put(struct dma_fence **fence) -+#else -+void mali_dma_fence_signal_and_put(struct fence **fence) -+#endif -+{ -+ MALI_DEBUG_ASSERT_POINTER(fence); -+ MALI_DEBUG_ASSERT_POINTER(*fence); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ dma_fence_signal(*fence); -+ dma_fence_put(*fence); -+#else -+ fence_signal(*fence); -+ fence_put(*fence); -+#endif -+ *fence = NULL; -+} ++ KBASE_DEBUG_ASSERT(alloc->type == KBASE_MEM_TYPE_NATIVE); ++ KBASE_DEBUG_ASSERT(alloc->imported.kctx); ++ KBASE_DEBUG_ASSERT(alloc->nents >= nr_pages_to_free); + -+void mali_dma_fence_context_init(struct mali_dma_fence_context *dma_fence_context, -+ mali_dma_fence_context_callback_func_t cb_func, -+ void *pp_job_ptr) -+{ -+ MALI_DEBUG_ASSERT_POINTER(dma_fence_context); ++ /* early out if nothing to do */ ++ if (0 == nr_pages_to_free) ++ return 0; + -+ INIT_WORK(&dma_fence_context->work_handle, mali_dma_fence_context_work_func); -+ atomic_set(&dma_fence_context->count, 1); -+ dma_fence_context->num_dma_fence_waiter = 0; -+ dma_fence_context->mali_dma_fence_waiters = NULL; -+ dma_fence_context->cb_func = cb_func; -+ dma_fence_context->pp_job_ptr = pp_job_ptr; ++ start_free = alloc->pages + alloc->nents - nr_pages_to_free; ++ ++ syncback = alloc->properties & KBASE_MEM_PHY_ALLOC_ACCESSED_CACHED; ++ ++ kbase_mem_pool_free_pages(&kctx->mem_pool, ++ nr_pages_to_free, ++ start_free, ++ syncback, ++ reclaimed); ++ ++ alloc->nents -= nr_pages_to_free; ++ ++ /* ++ * If the allocation was not evicted (i.e. evicted == 0) then ++ * the page accounting needs to be done. ++ */ ++ if (!reclaimed) { ++ kbase_process_page_usage_dec(kctx, nr_pages_to_free); ++ new_page_count = kbase_atomic_sub_pages(nr_pages_to_free, ++ &kctx->used_pages); ++ kbase_atomic_sub_pages(nr_pages_to_free, ++ &kctx->kbdev->memdev.used_pages); ++ ++ KBASE_TLSTREAM_AUX_PAGESALLOC( ++ (u32)kctx->id, ++ (u64)new_page_count); ++ } ++ ++ return 0; +} + -+_mali_osk_errcode_t mali_dma_fence_context_add_waiters(struct mali_dma_fence_context *dma_fence_context, -+ struct reservation_object *dma_reservation_object) ++void kbase_mem_kref_free(struct kref *kref) +{ -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_OK; -+ u32 shared_count = 0, i; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ struct dma_fence *exclusive_fence = NULL; -+ struct dma_fence **shared_fences = NULL; -+#else -+ struct fence *exclusive_fence = NULL; -+ struct fence **shared_fences = NULL; -+#endif -+ MALI_DEBUG_ASSERT_POINTER(dma_fence_context); -+ MALI_DEBUG_ASSERT_POINTER(dma_reservation_object); ++ struct kbase_mem_phy_alloc *alloc; + -+ /* Get all the shared/exclusive fences in the reservation object of dma buf*/ -+ ret = reservation_object_get_fences_rcu(dma_reservation_object, &exclusive_fence, -+ &shared_count, &shared_fences); -+ if (ret < 0) { -+ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to get shared or exclusive_fence dma fences from the reservation object of dma buf.\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ alloc = container_of(kref, struct kbase_mem_phy_alloc, kref); + -+ if (exclusive_fence) { -+ ret = mali_dma_fence_add_callback(dma_fence_context, exclusive_fence); -+ if (_MALI_OSK_ERR_OK != ret) { -+ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to add callback into exclusive fence.\n")); -+ mali_dma_fence_context_cleanup(dma_fence_context); -+ goto ended; -+ } ++ switch (alloc->type) { ++ case KBASE_MEM_TYPE_NATIVE: { ++ WARN_ON(!alloc->imported.kctx); ++ /* ++ * The physical allocation must have been removed from the ++ * eviction list before trying to free it. ++ */ ++ WARN_ON(!list_empty(&alloc->evict_node)); ++ kbase_free_phy_pages_helper(alloc, alloc->nents); ++ break; + } ++ case KBASE_MEM_TYPE_ALIAS: { ++ /* just call put on the underlying phy allocs */ ++ size_t i; ++ struct kbase_aliased *aliased; + -+ -+ for (i = 0; i < shared_count; i++) { -+ ret = mali_dma_fence_add_callback(dma_fence_context, shared_fences[i]); -+ if (_MALI_OSK_ERR_OK != ret) { -+ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to add callback into shared fence [%d].\n", i)); -+ mali_dma_fence_context_cleanup(dma_fence_context); -+ break; ++ aliased = alloc->imported.alias.aliased; ++ if (aliased) { ++ for (i = 0; i < alloc->imported.alias.nents; i++) ++ if (aliased[i].alloc) ++ kbase_mem_phy_alloc_put(aliased[i].alloc); ++ vfree(aliased); + } ++ break; + } -+ -+ended: -+ -+ if (exclusive_fence) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ dma_fence_put(exclusive_fence); -+#else -+ fence_put(exclusive_fence); ++ case KBASE_MEM_TYPE_RAW: ++ /* raw pages, external cleanup */ ++ break; ++ #ifdef CONFIG_UMP ++ case KBASE_MEM_TYPE_IMPORTED_UMP: ++ ump_dd_release(alloc->imported.ump_handle); ++ break; +#endif -+ -+ if (shared_fences) { -+ for (i = 0; i < shared_count; i++) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ dma_fence_put(shared_fences[i]); -+#else -+ fence_put(shared_fences[i]); ++#ifdef CONFIG_DMA_SHARED_BUFFER ++ case KBASE_MEM_TYPE_IMPORTED_UMM: ++ dma_buf_detach(alloc->imported.umm.dma_buf, ++ alloc->imported.umm.dma_attachment); ++ dma_buf_put(alloc->imported.umm.dma_buf); ++ break; +#endif -+ } -+ kfree(shared_fences); ++ case KBASE_MEM_TYPE_IMPORTED_USER_BUF: ++ if (alloc->imported.user_buf.mm) ++ mmdrop(alloc->imported.user_buf.mm); ++ kfree(alloc->imported.user_buf.pages); ++ break; ++ case KBASE_MEM_TYPE_TB:{ ++ void *tb; ++ ++ tb = alloc->imported.kctx->jctx.tb; ++ kbase_device_trace_buffer_uninstall(alloc->imported.kctx); ++ vfree(tb); ++ break; ++ } ++ default: ++ WARN(1, "Unexecpted free of type %d\n", alloc->type); ++ break; + } + -+ return ret; ++ /* Free based on allocation type */ ++ if (alloc->properties & KBASE_MEM_PHY_ALLOC_LARGE) ++ vfree(alloc); ++ else ++ kfree(alloc); +} + ++KBASE_EXPORT_TEST_API(kbase_mem_kref_free); + -+void mali_dma_fence_context_term(struct mali_dma_fence_context *dma_fence_context) -+{ -+ MALI_DEBUG_ASSERT_POINTER(dma_fence_context); -+ atomic_set(&dma_fence_context->count, 0); -+ if (dma_fence_context->work_handle.func) { -+ cancel_work_sync(&dma_fence_context->work_handle); -+ } -+ mali_dma_fence_context_cleanup(dma_fence_context); -+} -+ -+void mali_dma_fence_context_dec_count(struct mali_dma_fence_context *dma_fence_context) ++int kbase_alloc_phy_pages(struct kbase_va_region *reg, size_t vsize, size_t size) +{ -+ MALI_DEBUG_ASSERT_POINTER(dma_fence_context); ++ KBASE_DEBUG_ASSERT(NULL != reg); ++ KBASE_DEBUG_ASSERT(vsize > 0); + -+ if (atomic_dec_and_test(&dma_fence_context->count)) -+ schedule_work(&dma_fence_context->work_handle); -+} ++ /* validate user provided arguments */ ++ if (size > vsize || vsize > reg->nr_pages) ++ goto out_term; + ++ /* Prevent vsize*sizeof from wrapping around. ++ * For instance, if vsize is 2**29+1, we'll allocate 1 byte and the alloc won't fail. ++ */ ++ if ((size_t) vsize > ((size_t) -1 / sizeof(*reg->cpu_alloc->pages))) ++ goto out_term; + -+void mali_dma_fence_add_reservation_object_list(struct reservation_object *dma_reservation_object, -+ struct reservation_object **dma_reservation_object_list, -+ u32 *num_dma_reservation_object) -+{ -+ u32 i; ++ KBASE_DEBUG_ASSERT(0 != vsize); + -+ MALI_DEBUG_ASSERT_POINTER(dma_reservation_object); -+ MALI_DEBUG_ASSERT_POINTER(dma_reservation_object_list); -+ MALI_DEBUG_ASSERT_POINTER(num_dma_reservation_object); ++ if (kbase_alloc_phy_pages_helper(reg->cpu_alloc, size) != 0) ++ goto out_term; + -+ for (i = 0; i < *num_dma_reservation_object; i++) { -+ if (dma_reservation_object_list[i] == dma_reservation_object) -+ return; ++ reg->cpu_alloc->reg = reg; ++ if (reg->cpu_alloc != reg->gpu_alloc) { ++ if (kbase_alloc_phy_pages_helper(reg->gpu_alloc, size) != 0) ++ goto out_rollback; ++ reg->gpu_alloc->reg = reg; + } + -+ dma_reservation_object_list[*num_dma_reservation_object] = dma_reservation_object; -+ (*num_dma_reservation_object)++; -+} -+ -+int mali_dma_fence_lock_reservation_object_list(struct reservation_object **dma_reservation_object_list, -+ u32 num_dma_reservation_object, struct ww_acquire_ctx *ww_actx) -+{ -+ u32 i; -+ -+ struct reservation_object *reservation_object_to_slow_lock = NULL; ++ return 0; + -+ MALI_DEBUG_ASSERT_POINTER(dma_reservation_object_list); -+ MALI_DEBUG_ASSERT_POINTER(ww_actx); ++out_rollback: ++ kbase_free_phy_pages_helper(reg->cpu_alloc, size); ++out_term: ++ return -1; ++} + -+ ww_acquire_init(ww_actx, &reservation_ww_class); ++KBASE_EXPORT_TEST_API(kbase_alloc_phy_pages); + -+again: -+ for (i = 0; i < num_dma_reservation_object; i++) { -+ int ret; ++bool kbase_check_alloc_flags(unsigned long flags) ++{ ++ /* Only known input flags should be set. */ ++ if (flags & ~BASE_MEM_FLAGS_INPUT_MASK) ++ return false; + -+ if (dma_reservation_object_list[i] == reservation_object_to_slow_lock) { -+ reservation_object_to_slow_lock = NULL; -+ continue; -+ } ++ /* At least one flag should be set */ ++ if (flags == 0) ++ return false; + -+ ret = ww_mutex_lock(&dma_reservation_object_list[i]->lock, ww_actx); ++ /* Either the GPU or CPU must be reading from the allocated memory */ ++ if ((flags & (BASE_MEM_PROT_CPU_RD | BASE_MEM_PROT_GPU_RD)) == 0) ++ return false; + -+ if (ret < 0) { -+ u32 slow_lock_index = i; ++ /* Either the GPU or CPU must be writing to the allocated memory */ ++ if ((flags & (BASE_MEM_PROT_CPU_WR | BASE_MEM_PROT_GPU_WR)) == 0) ++ return false; + -+ /* unlock all pre locks we have already locked.*/ -+ while (i > 0) { -+ i--; -+ ww_mutex_unlock(&dma_reservation_object_list[i]->lock); -+ } ++ /* GPU cannot be writing to GPU executable memory and cannot grow the memory on page fault. */ ++ if ((flags & BASE_MEM_PROT_GPU_EX) && (flags & (BASE_MEM_PROT_GPU_WR | BASE_MEM_GROW_ON_GPF))) ++ return false; + -+ if (NULL != reservation_object_to_slow_lock) -+ ww_mutex_unlock(&reservation_object_to_slow_lock->lock); ++ /* GPU should have at least read or write access otherwise there is no ++ reason for allocating. */ ++ if ((flags & (BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR)) == 0) ++ return false; + -+ if (ret == -EDEADLK) { -+ reservation_object_to_slow_lock = dma_reservation_object_list[slow_lock_index]; -+ ww_mutex_lock_slow(&reservation_object_to_slow_lock->lock, ww_actx); -+ goto again; -+ } -+ ww_acquire_fini(ww_actx); -+ MALI_DEBUG_PRINT(1, ("Mali dma fence: failed to lock all dma reservation objects.\n", i)); -+ return ret; -+ } -+ } ++ /* BASE_MEM_IMPORT_SHARED is only valid for imported memory */ ++ if ((flags & BASE_MEM_IMPORT_SHARED) == BASE_MEM_IMPORT_SHARED) ++ return false; + -+ ww_acquire_done(ww_actx); -+ return 0; ++ return true; +} + -+void mali_dma_fence_unlock_reservation_object_list(struct reservation_object **dma_reservation_object_list, -+ u32 num_dma_reservation_object, struct ww_acquire_ctx *ww_actx) ++bool kbase_check_import_flags(unsigned long flags) +{ -+ u32 i; -+ -+ for (i = 0; i < num_dma_reservation_object; i++) -+ ww_mutex_unlock(&dma_reservation_object_list[i]->lock); -+ -+ ww_acquire_fini(ww_actx); -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h -new file mode 100755 -index 000000000000..d44f6d1a8926 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h -@@ -0,0 +1,124 @@ -+/* -+ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+/** -+ * @file mali_dma_fence.h -+ * -+ * Mali interface for Linux dma buf fence objects. -+ */ -+ -+#ifndef _MALI_DMA_FENCE_H_ -+#define _MALI_DMA_FENCE_H_ ++ /* Only known input flags should be set. */ ++ if (flags & ~BASE_MEM_FLAGS_INPUT_MASK) ++ return false; + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+#include -+#else -+#include -+#endif -+#include -+#endif ++ /* At least one flag should be set */ ++ if (flags == 0) ++ return false; + -+struct mali_dma_fence_context; ++ /* Imported memory cannot be GPU executable */ ++ if (flags & BASE_MEM_PROT_GPU_EX) ++ return false; + -+/* The mali dma fence context callback function */ -+typedef void (*mali_dma_fence_context_callback_func_t)(void *pp_job_ptr); ++ /* Imported memory cannot grow on page fault */ ++ if (flags & BASE_MEM_GROW_ON_GPF) ++ return false; + -+struct mali_dma_fence_waiter { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ struct dma_fence *fence; -+ struct dma_fence_cb base; -+#else -+ struct fence_cb base; -+ struct fence *fence; -+#endif -+ struct mali_dma_fence_context *parent; -+}; ++ /* GPU should have at least read or write access otherwise there is no ++ reason for importing. */ ++ if ((flags & (BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR)) == 0) ++ return false; + -+struct mali_dma_fence_context { -+ struct work_struct work_handle; -+ struct mali_dma_fence_waiter **mali_dma_fence_waiters; -+ u32 num_dma_fence_waiter; -+ atomic_t count; -+ void *pp_job_ptr; /* the mali pp job pointer */; -+ mali_dma_fence_context_callback_func_t cb_func; -+}; ++ /* Secure memory cannot be read by the CPU */ ++ if ((flags & BASE_MEM_SECURE) && (flags & BASE_MEM_PROT_CPU_RD)) ++ return false; + -+/* Create a dma fence -+ * @param context The execution context this fence is run on -+ * @param seqno A linearly increasing sequence number for this context -+ * @return the new dma fence if success, or NULL on failure. -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+struct dma_fence *mali_dma_fence_new(u32 context, u32 seqno); -+#else -+struct fence *mali_dma_fence_new(u32 context, u32 seqno); -+#endif -+/* Signal and put dma fence -+ * @param fence The dma fence to signal and put -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+void mali_dma_fence_signal_and_put(struct dma_fence **fence); -+#else -+void mali_dma_fence_signal_and_put(struct fence **fence); -+#endif -+/** -+ * Initialize a mali dma fence context for pp job. -+ * @param dma_fence_context The mali dma fence context to initialize. -+ * @param cb_func The dma fence context callback function to call when all dma fence release. -+ * @param pp_job_ptr The pp_job to call function with. -+ */ -+void mali_dma_fence_context_init(struct mali_dma_fence_context *dma_fence_context, -+ mali_dma_fence_context_callback_func_t cb_func, -+ void *pp_job_ptr); ++ return true; ++} + +/** -+ * Add new mali dma fence waiter into mali dma fence context -+ * @param dma_fence_context The mali dma fence context -+ * @param dma_reservation_object the reservation object to create new mali dma fence waiters -+ * @return _MALI_OSK_ERR_OK if success, or not. ++ * @brief Acquire the per-context region list lock + */ -+_mali_osk_errcode_t mali_dma_fence_context_add_waiters(struct mali_dma_fence_context *dma_fence_context, -+ struct reservation_object *dma_reservation_object); ++void kbase_gpu_vm_lock(struct kbase_context *kctx) ++{ ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ mutex_lock(&kctx->reg_lock); ++} + -+/** -+ * Release the dma fence context -+ * @param dma_fence_text The mali dma fence context. -+ */ -+void mali_dma_fence_context_term(struct mali_dma_fence_context *dma_fence_context); ++KBASE_EXPORT_TEST_API(kbase_gpu_vm_lock); + +/** -+ * Decrease the dma fence context atomic count -+ * @param dma_fence_text The mali dma fence context. ++ * @brief Release the per-context region list lock + */ -+void mali_dma_fence_context_dec_count(struct mali_dma_fence_context *dma_fence_context); ++void kbase_gpu_vm_unlock(struct kbase_context *kctx) ++{ ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ mutex_unlock(&kctx->reg_lock); ++} + -+/** -+ * Get all reservation object -+ * @param dma_reservation_object The reservation object to add into the reservation object list -+ * @param dma_reservation_object_list The reservation object list to store all reservation object -+ * @param num_dma_reservation_object The number of all reservation object -+ */ -+void mali_dma_fence_add_reservation_object_list(struct reservation_object *dma_reservation_object, -+ struct reservation_object **dma_reservation_object_list, -+ u32 *num_dma_reservation_object); ++KBASE_EXPORT_TEST_API(kbase_gpu_vm_unlock); + -+/** -+ * Wait/wound mutex lock to lock all reservation object. -+ */ -+int mali_dma_fence_lock_reservation_object_list(struct reservation_object **dma_reservation_object_list, -+ u32 num_dma_reservation_object, struct ww_acquire_ctx *ww_actx); ++#ifdef CONFIG_DEBUG_FS ++struct kbase_jit_debugfs_data { ++ int (*func)(struct kbase_jit_debugfs_data *); ++ struct mutex lock; ++ struct kbase_context *kctx; ++ u64 active_value; ++ u64 pool_value; ++ u64 destroy_value; ++ char buffer[50]; ++}; + -+/** -+ * Wait/wound mutex lock to unlock all reservation object. -+ */ -+void mali_dma_fence_unlock_reservation_object_list(struct reservation_object **dma_reservation_object_list, -+ u32 num_dma_reservation_object, struct ww_acquire_ctx *ww_actx); -+#endif -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c -new file mode 100755 -index 000000000000..e13cbad3e513 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c -@@ -0,0 +1,783 @@ -+/* -+ * Copyright (C) 2012-2018 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++static int kbase_jit_debugfs_common_open(struct inode *inode, ++ struct file *file, int (*func)(struct kbase_jit_debugfs_data *)) ++{ ++ struct kbase_jit_debugfs_data *data; + -+#include "mali_internal_sync.h" -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++ data = kzalloc(sizeof(*data), GFP_KERNEL); ++ if (!data) ++ return -ENOMEM; + -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#if defined(DEBUG) -+#include "mali_session.h" -+#include "mali_timeline.h" -+#endif ++ data->func = func; ++ mutex_init(&data->lock); ++ data->kctx = (struct kbase_context *) inode->i_private; + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+static const struct dma_fence_ops fence_ops; -+#else -+static const struct fence_ops fence_ops; -+#endif ++ file->private_data = data; + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+static struct mali_internal_sync_point *mali_internal_fence_to_sync_pt(struct dma_fence *fence) -+#else -+static struct mali_internal_sync_point *mali_internal_fence_to_sync_pt(struct fence *fence) -+#endif -+{ -+ MALI_DEBUG_ASSERT_POINTER(fence); -+ return container_of(fence, struct mali_internal_sync_point, base); ++ return nonseekable_open(inode, file); +} + -+static inline struct mali_internal_sync_timeline *mali_internal_sync_pt_to_sync_timeline(struct mali_internal_sync_point *sync_pt) ++static ssize_t kbase_jit_debugfs_common_read(struct file *file, ++ char __user *buf, size_t len, loff_t *ppos) +{ -+ MALI_DEBUG_ASSERT_POINTER(sync_pt); -+ return container_of(sync_pt->base.lock, struct mali_internal_sync_timeline, sync_pt_list_lock); -+} ++ struct kbase_jit_debugfs_data *data; ++ size_t size; ++ int ret; + -+static void mali_internal_sync_timeline_free(struct kref *kref_count) -+{ -+ struct mali_internal_sync_timeline *sync_timeline; ++ data = (struct kbase_jit_debugfs_data *) file->private_data; ++ mutex_lock(&data->lock); + -+ MALI_DEBUG_ASSERT_POINTER(kref_count); ++ if (*ppos) { ++ size = strnlen(data->buffer, sizeof(data->buffer)); ++ } else { ++ if (!data->func) { ++ ret = -EACCES; ++ goto out_unlock; ++ } + -+ sync_timeline = container_of(kref_count, struct mali_internal_sync_timeline, kref_count); ++ if (data->func(data)) { ++ ret = -EACCES; ++ goto out_unlock; ++ } + -+ if (sync_timeline->ops->release_obj) -+ sync_timeline->ops->release_obj(sync_timeline); ++ size = scnprintf(data->buffer, sizeof(data->buffer), ++ "%llu,%llu,%llu", data->active_value, ++ data->pool_value, data->destroy_value); ++ } + -+ kfree(sync_timeline); ++ ret = simple_read_from_buffer(buf, len, ppos, data->buffer, size); ++ ++out_unlock: ++ mutex_unlock(&data->lock); ++ return ret; +} + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+static void mali_internal_fence_check_cb_func(struct fence *fence, struct fence_cb *cb) -+#else -+static void mali_internal_fence_check_cb_func(struct dma_fence *fence, struct dma_fence_cb *cb) -+#endif ++static int kbase_jit_debugfs_common_release(struct inode *inode, ++ struct file *file) +{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) -+ struct mali_internal_sync_fence_cb *check; -+#else -+ struct mali_internal_sync_fence_waiter *waiter; -+#endif -+ struct mali_internal_sync_fence *sync_fence; -+ int ret; -+ MALI_DEBUG_ASSERT_POINTER(cb); -+ MALI_IGNORE(fence); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) -+ check = container_of(cb, struct mali_internal_sync_fence_cb, cb); -+ sync_fence = check->sync_file; -+#else -+ waiter = container_of(cb, struct mali_internal_sync_fence_waiter, cb); -+ sync_fence = (struct mali_internal_sync_fence *)waiter->work.private; -+#endif -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) -+ ret = atomic_dec_and_test(&sync_fence->status); -+ if (ret) -+ wake_up_all(&sync_fence->wq); -+#else -+ ret = sync_fence->fence->ops->signaled(sync_fence->fence); ++ kfree(file->private_data); ++ return 0; ++} + -+ if (0 > ret) -+ MALI_PRINT_ERROR(("Mali internal sync:Failed to wait fence 0x%x for sync_fence 0x%x.\n", fence, sync_fence)); -+ if (1 == ret) -+ wake_up_all(&sync_fence->wq); -+#endif ++#define KBASE_JIT_DEBUGFS_DECLARE(__fops, __func) \ ++static int __fops ## _open(struct inode *inode, struct file *file) \ ++{ \ ++ return kbase_jit_debugfs_common_open(inode, file, __func); \ ++} \ ++static const struct file_operations __fops = { \ ++ .owner = THIS_MODULE, \ ++ .open = __fops ## _open, \ ++ .release = kbase_jit_debugfs_common_release, \ ++ .read = kbase_jit_debugfs_common_read, \ ++ .write = NULL, \ ++ .llseek = generic_file_llseek, \ +} + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) -+static void mali_internal_sync_fence_add_fence(struct mali_internal_sync_fence *sync_fence, struct fence *sync_pt) ++static int kbase_jit_debugfs_count_get(struct kbase_jit_debugfs_data *data) +{ -+ int fence_num = 0; -+ MALI_DEBUG_ASSERT_POINTER(sync_fence); -+ MALI_DEBUG_ASSERT_POINTER(sync_pt); ++ struct kbase_context *kctx = data->kctx; ++ struct list_head *tmp; + -+ fence_num = sync_fence->num_fences; ++ mutex_lock(&kctx->jit_evict_lock); ++ list_for_each(tmp, &kctx->jit_active_head) { ++ data->active_value++; ++ } + -+ sync_fence->cbs[fence_num].fence = sync_pt; -+ sync_fence->cbs[fence_num].sync_file = sync_fence; ++ list_for_each(tmp, &kctx->jit_pool_head) { ++ data->pool_value++; ++ } + -+ if (!fence_add_callback(sync_pt, &sync_fence->cbs[fence_num].cb, mali_internal_fence_check_cb_func)) { -+ fence_get(sync_pt); -+ sync_fence->num_fences++; -+ atomic_inc(&sync_fence->status); ++ list_for_each(tmp, &kctx->jit_destroy_head) { ++ data->destroy_value++; + } -+} -+#endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) -+static int mali_internal_sync_fence_wake_up_wq(wait_queue_entry_t *curr, unsigned mode, -+ int wake_flags, void *key) -+#else -+static int mali_internal_sync_fence_wake_up_wq(wait_queue_t *curr, unsigned mode, -+ int wake_flags, void *key) -+#endif -+{ -+ struct mali_internal_sync_fence_waiter *wait; -+ MALI_IGNORE(mode); -+ MALI_IGNORE(wake_flags); -+ MALI_IGNORE(key); ++ mutex_unlock(&kctx->jit_evict_lock); + -+ wait = container_of(curr, struct mali_internal_sync_fence_waiter, work); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) -+ list_del_init(&wait->work.entry); -+#else -+ list_del_init(&wait->work.task_list); -+#endif -+ wait->callback(wait->work.private, wait); -+ return 1; ++ return 0; +} ++KBASE_JIT_DEBUGFS_DECLARE(kbase_jit_debugfs_count_fops, ++ kbase_jit_debugfs_count_get); + -+struct mali_internal_sync_timeline *mali_internal_sync_timeline_create(const struct mali_internal_sync_timeline_ops *ops, -+ int size, const char *name) ++static int kbase_jit_debugfs_vm_get(struct kbase_jit_debugfs_data *data) +{ -+ struct mali_internal_sync_timeline *sync_timeline = NULL; -+ -+ MALI_DEBUG_ASSERT_POINTER(ops); ++ struct kbase_context *kctx = data->kctx; ++ struct kbase_va_region *reg; + -+ if (size < sizeof(struct mali_internal_sync_timeline)) { -+ MALI_PRINT_ERROR(("Mali internal sync:Invalid size to create the mali internal sync timeline.\n")); -+ goto err; ++ mutex_lock(&kctx->jit_evict_lock); ++ list_for_each_entry(reg, &kctx->jit_active_head, jit_node) { ++ data->active_value += reg->nr_pages; + } + -+ sync_timeline = kzalloc(size, GFP_KERNEL); -+ if (NULL == sync_timeline) { -+ MALI_PRINT_ERROR(("Mali internal sync:Failed to allocate buffer for the mali internal sync timeline.\n")); -+ goto err; ++ list_for_each_entry(reg, &kctx->jit_pool_head, jit_node) { ++ data->pool_value += reg->nr_pages; + } -+ kref_init(&sync_timeline->kref_count); -+ sync_timeline->ops = ops; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ sync_timeline->fence_context = dma_fence_context_alloc(1); -+#else -+ sync_timeline->fence_context = fence_context_alloc(1); -+#endif -+ strlcpy(sync_timeline->name, name, sizeof(sync_timeline->name)); -+ -+ INIT_LIST_HEAD(&sync_timeline->sync_pt_list_head); -+ spin_lock_init(&sync_timeline->sync_pt_list_lock); + -+ return sync_timeline; -+err: -+ if (NULL != sync_timeline) { -+ kfree(sync_timeline); ++ list_for_each_entry(reg, &kctx->jit_destroy_head, jit_node) { ++ data->destroy_value += reg->nr_pages; + } -+ return NULL; ++ mutex_unlock(&kctx->jit_evict_lock); ++ ++ return 0; +} ++KBASE_JIT_DEBUGFS_DECLARE(kbase_jit_debugfs_vm_fops, ++ kbase_jit_debugfs_vm_get); + -+void mali_internal_sync_timeline_destroy(struct mali_internal_sync_timeline *sync_timeline) ++static int kbase_jit_debugfs_phys_get(struct kbase_jit_debugfs_data *data) +{ -+ MALI_DEBUG_ASSERT_POINTER(sync_timeline); ++ struct kbase_context *kctx = data->kctx; ++ struct kbase_va_region *reg; + -+ sync_timeline->destroyed = MALI_TRUE; ++ mutex_lock(&kctx->jit_evict_lock); ++ list_for_each_entry(reg, &kctx->jit_active_head, jit_node) { ++ data->active_value += reg->gpu_alloc->nents; ++ } + -+ smp_wmb(); ++ list_for_each_entry(reg, &kctx->jit_pool_head, jit_node) { ++ data->pool_value += reg->gpu_alloc->nents; ++ } + -+ mali_internal_sync_timeline_signal(sync_timeline); -+ kref_put(&sync_timeline->kref_count, mali_internal_sync_timeline_free); ++ list_for_each_entry(reg, &kctx->jit_destroy_head, jit_node) { ++ data->destroy_value += reg->gpu_alloc->nents; ++ } ++ mutex_unlock(&kctx->jit_evict_lock); ++ ++ return 0; +} ++KBASE_JIT_DEBUGFS_DECLARE(kbase_jit_debugfs_phys_fops, ++ kbase_jit_debugfs_phys_get); + -+void mali_internal_sync_timeline_signal(struct mali_internal_sync_timeline *sync_timeline) ++void kbase_jit_debugfs_init(struct kbase_context *kctx) +{ -+ unsigned long flags; -+ struct mali_internal_sync_point *sync_pt, *next; -+ -+ MALI_DEBUG_ASSERT_POINTER(sync_timeline); -+ -+ spin_lock_irqsave(&sync_timeline->sync_pt_list_lock, flags); ++ /* Debugfs entry for getting the number of JIT allocations. */ ++ debugfs_create_file("mem_jit_count", S_IRUGO, kctx->kctx_dentry, ++ kctx, &kbase_jit_debugfs_count_fops); + -+ list_for_each_entry_safe(sync_pt, next, &sync_timeline->sync_pt_list_head, -+ sync_pt_list) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ if (dma_fence_is_signaled_locked(&sync_pt->base)) -+#else -+ if (fence_is_signaled_locked(&sync_pt->base)) -+#endif -+ list_del_init(&sync_pt->sync_pt_list); -+ } ++ /* ++ * Debugfs entry for getting the total number of virtual pages ++ * used by JIT allocations. ++ */ ++ debugfs_create_file("mem_jit_vm", S_IRUGO, kctx->kctx_dentry, ++ kctx, &kbase_jit_debugfs_vm_fops); + -+ spin_unlock_irqrestore(&sync_timeline->sync_pt_list_lock, flags); ++ /* ++ * Debugfs entry for getting the number of physical pages used ++ * by JIT allocations. ++ */ ++ debugfs_create_file("mem_jit_phys", S_IRUGO, kctx->kctx_dentry, ++ kctx, &kbase_jit_debugfs_phys_fops); +} ++#endif /* CONFIG_DEBUG_FS */ + -+struct mali_internal_sync_point *mali_internal_sync_point_create(struct mali_internal_sync_timeline *sync_timeline, int size) ++/** ++ * kbase_jit_destroy_worker - Deferred worker which frees JIT allocations ++ * @work: Work item ++ * ++ * This function does the work of freeing JIT allocations whose physical ++ * backing has been released. ++ */ ++static void kbase_jit_destroy_worker(struct work_struct *work) +{ -+ unsigned long flags; -+ struct mali_internal_sync_point *sync_pt = NULL; ++ struct kbase_context *kctx; ++ struct kbase_va_region *reg; + -+ MALI_DEBUG_ASSERT_POINTER(sync_timeline); ++ kctx = container_of(work, struct kbase_context, jit_work); ++ do { ++ mutex_lock(&kctx->jit_evict_lock); ++ if (list_empty(&kctx->jit_destroy_head)) { ++ mutex_unlock(&kctx->jit_evict_lock); ++ break; ++ } + -+ if (size < sizeof(struct mali_internal_sync_point)) { -+ MALI_PRINT_ERROR(("Mali internal sync:Invalid size to create the mali internal sync point.\n")); -+ goto err; -+ } ++ reg = list_first_entry(&kctx->jit_destroy_head, ++ struct kbase_va_region, jit_node); + -+ sync_pt = kzalloc(size, GFP_KERNEL); -+ if (NULL == sync_pt) { -+ MALI_PRINT_ERROR(("Mali internal sync:Failed to allocate buffer for the mali internal sync point.\n")); -+ goto err; -+ } -+ spin_lock_irqsave(&sync_timeline->sync_pt_list_lock, flags); -+ kref_get(&sync_timeline->kref_count); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ dma_fence_init(&sync_pt->base, &fence_ops, &sync_timeline->sync_pt_list_lock, -+ sync_timeline->fence_context, ++sync_timeline->value); -+#else -+ fence_init(&sync_pt->base, &fence_ops, &sync_timeline->sync_pt_list_lock, -+ sync_timeline->fence_context, ++sync_timeline->value); -+#endif -+ INIT_LIST_HEAD(&sync_pt->sync_pt_list); -+ spin_unlock_irqrestore(&sync_timeline->sync_pt_list_lock, flags); ++ list_del(®->jit_node); ++ mutex_unlock(&kctx->jit_evict_lock); + -+ return sync_pt; -+err: -+ if (NULL != sync_pt) { -+ kfree(sync_pt); -+ } -+ return NULL; ++ kbase_gpu_vm_lock(kctx); ++ kbase_mem_free_region(kctx, reg); ++ kbase_gpu_vm_unlock(kctx); ++ } while (1); +} + -+struct mali_internal_sync_fence *mali_internal_sync_fence_fdget(int fd) ++int kbase_jit_init(struct kbase_context *kctx) +{ -+ struct file *file = fget(fd); ++ INIT_LIST_HEAD(&kctx->jit_active_head); ++ INIT_LIST_HEAD(&kctx->jit_pool_head); ++ INIT_LIST_HEAD(&kctx->jit_destroy_head); ++ INIT_WORK(&kctx->jit_work, kbase_jit_destroy_worker); + -+ if (NULL == file) { -+ return NULL; -+ } ++ INIT_LIST_HEAD(&kctx->jit_pending_alloc); ++ INIT_LIST_HEAD(&kctx->jit_atoms_head); + -+ return file->private_data; ++ return 0; +} + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) -+struct mali_internal_sync_fence *mali_internal_sync_fence_merge( -+ struct mali_internal_sync_fence *sync_fence1, struct mali_internal_sync_fence *sync_fence2) ++struct kbase_va_region *kbase_jit_allocate(struct kbase_context *kctx, ++ struct base_jit_alloc_info *info) +{ -+ struct mali_internal_sync_fence *new_sync_fence; -+ int i, j, num_fence1, num_fence2, total_fences; -+ struct fence *fence0 = NULL; ++ struct kbase_va_region *reg = NULL; ++ struct kbase_va_region *walker; ++ struct kbase_va_region *temp; ++ size_t current_diff = SIZE_MAX; + -+ MALI_DEBUG_ASSERT_POINTER(sync_fence1); -+ MALI_DEBUG_ASSERT_POINTER(sync_fence2); ++ int ret; + -+ num_fence1 = sync_fence1->num_fences; -+ num_fence2 = sync_fence2->num_fences; ++ mutex_lock(&kctx->jit_evict_lock); ++ /* ++ * Scan the pool for an existing allocation which meets our ++ * requirements and remove it. ++ */ ++ list_for_each_entry_safe(walker, temp, &kctx->jit_pool_head, jit_node) { + -+ total_fences = num_fence1 + num_fence2; ++ if (walker->nr_pages >= info->va_pages) { ++ size_t min_size, max_size, diff; + -+ i = 0; -+ j = 0; ++ /* ++ * The JIT allocations VA requirements have been ++ * meet, it's suitable but other allocations ++ * might be a better fit. ++ */ ++ min_size = min_t(size_t, walker->gpu_alloc->nents, ++ info->commit_pages); ++ max_size = max_t(size_t, walker->gpu_alloc->nents, ++ info->commit_pages); ++ diff = max_size - min_size; + -+ if (num_fence1 > 0) { -+ fence0 = sync_fence1->cbs[i].fence; -+ i = 1; -+ } else if (num_fence2 > 0) { -+ fence0 = sync_fence2->cbs[i].fence; -+ j = 1; -+ } ++ if (current_diff > diff) { ++ current_diff = diff; ++ reg = walker; ++ } + -+ new_sync_fence = (struct mali_internal_sync_fence *)sync_file_create(fence0); -+ if (NULL == new_sync_fence) { -+ MALI_PRINT_ERROR(("Mali internal sync:Failed to create the mali internal sync fence when merging sync fence.\n")); -+ return NULL; ++ /* The allocation is an exact match, stop looking */ ++ if (current_diff == 0) ++ break; ++ } + } + -+ fence_remove_callback(new_sync_fence->cb[0].fence, &new_sync_fence->cb[0].cb); -+ new_sync_fence->num_fences = 0; -+ atomic_dec(&new_sync_fence->status); ++ if (reg) { ++ /* ++ * Remove the found region from the pool and add it to the ++ * active list. ++ */ ++ list_move(®->jit_node, &kctx->jit_active_head); + -+ for (; i < num_fence1 && j < num_fence2;) { -+ struct fence *fence1 = sync_fence1->cbs[i].fence; -+ struct fence *fence2 = sync_fence2->cbs[j].fence; ++ /* ++ * Remove the allocation from the eviction list as it's no ++ * longer eligible for eviction. This must be done before ++ * dropping the jit_evict_lock ++ */ ++ list_del_init(®->gpu_alloc->evict_node); ++ mutex_unlock(&kctx->jit_evict_lock); + -+ if (fence1->context < fence2->context) { -+ mali_internal_sync_fence_add_fence(new_sync_fence, fence1); ++ kbase_gpu_vm_lock(kctx); + -+ i++; -+ } else if (fence1->context > fence2->context) { -+ mali_internal_sync_fence_add_fence(new_sync_fence, fence2); ++ /* Make the physical backing no longer reclaimable */ ++ if (!kbase_mem_evictable_unmake(reg->gpu_alloc)) ++ goto update_failed; + -+ j++; -+ } else { -+ if (fence1->seqno - fence2->seqno <= INT_MAX) -+ mali_internal_sync_fence_add_fence(new_sync_fence, fence1); -+ else -+ mali_internal_sync_fence_add_fence(new_sync_fence, fence2); -+ i++; -+ j++; ++ /* Grow the backing if required */ ++ if (reg->gpu_alloc->nents < info->commit_pages) { ++ size_t delta; ++ size_t old_size = reg->gpu_alloc->nents; ++ ++ /* Allocate some more pages */ ++ delta = info->commit_pages - reg->gpu_alloc->nents; ++ if (kbase_alloc_phy_pages_helper(reg->gpu_alloc, delta) ++ != 0) ++ goto update_failed; ++ ++ if (reg->cpu_alloc != reg->gpu_alloc) { ++ if (kbase_alloc_phy_pages_helper( ++ reg->cpu_alloc, delta) != 0) { ++ kbase_free_phy_pages_helper( ++ reg->gpu_alloc, delta); ++ goto update_failed; ++ } ++ } ++ ++ ret = kbase_mem_grow_gpu_mapping(kctx, reg, ++ info->commit_pages, old_size); ++ /* ++ * The grow failed so put the allocation back in the ++ * pool and return failure. ++ */ ++ if (ret) ++ goto update_failed; + } -+ } ++ kbase_gpu_vm_unlock(kctx); ++ } else { ++ /* No suitable JIT allocation was found so create a new one */ ++ u64 flags = BASE_MEM_PROT_CPU_RD | BASE_MEM_PROT_GPU_RD | ++ BASE_MEM_PROT_GPU_WR | BASE_MEM_GROW_ON_GPF | ++ BASE_MEM_COHERENT_LOCAL; ++ u64 gpu_addr; + -+ for (; i < num_fence1; i++) -+ mali_internal_sync_fence_add_fence(new_sync_fence, sync_fence1->cbs[i].fence); ++ mutex_unlock(&kctx->jit_evict_lock); + -+ for (; j < num_fence2; j++) -+ mali_internal_sync_fence_add_fence(new_sync_fence, sync_fence2->cbs[j].fence); ++ reg = kbase_mem_alloc(kctx, info->va_pages, info->commit_pages, ++ info->extent, &flags, &gpu_addr); ++ if (!reg) ++ goto out_unlocked; + -+ return new_sync_fence; -+} -+#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+static struct fence **mali_internal_get_fences(struct mali_internal_sync_fence *sync_fence, int *num_fences) -+#else -+static struct dma_fence **mali_internal_get_fences(struct mali_internal_sync_fence *sync_fence, int *num_fences) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+ if (sync_fence->fence->ops == &fence_array_ops) { -+ struct fence_array *fence_array = container_of(sync_fence->fence, struct fence_array, base); -+ *num_fences = fence_array->num_fences; -+ return fence_array->fences; -+ } -+#else -+ if (sync_fence->fence->ops == &dma_fence_array_ops) { -+ struct dma_fence_array *fence_array = container_of(sync_fence->fence, struct dma_fence_array, base); -+ *num_fences = fence_array->num_fences; -+ return fence_array->fences; ++ mutex_lock(&kctx->jit_evict_lock); ++ list_add(®->jit_node, &kctx->jit_active_head); ++ mutex_unlock(&kctx->jit_evict_lock); + } -+#endif -+ *num_fences = 1; -+ return &sync_fence->fence; -+} + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+static void mali_internal_add_fence_array(struct fence **fences, int *num_fences, struct fence *fence) -+#else -+static void mali_internal_add_fence_array(struct dma_fence **fences, int *num_fences, struct dma_fence *fence) -+#endif -+{ -+ fences[*num_fences] = fence; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+ if (!fence_is_signaled(fence)) { -+ fence_get(fence); -+ (*num_fences)++; -+ } -+#else -+ if (!dma_fence_is_signaled(fence)) { -+ dma_fence_get(fence); -+ (*num_fences)++; -+ } -+#endif ++ return reg; ++ ++update_failed: ++ /* ++ * An update to an allocation from the pool failed, chances ++ * are slim a new allocation would fair any better so return ++ * the allocation to the pool and return the function with failure. ++ */ ++ kbase_gpu_vm_unlock(kctx); ++ mutex_lock(&kctx->jit_evict_lock); ++ list_move(®->jit_node, &kctx->jit_pool_head); ++ mutex_unlock(&kctx->jit_evict_lock); ++out_unlocked: ++ return NULL; +} + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+static int mali_internal_sync_fence_set_fence_array(struct mali_internal_sync_fence *sync_fence, -+ struct fence **fences, int num_fences) -+#else -+static int mali_internal_sync_fence_set_fence_array(struct mali_internal_sync_fence *sync_fence, -+ struct dma_fence **fences, int num_fences) -+#endif ++void kbase_jit_free(struct kbase_context *kctx, struct kbase_va_region *reg) +{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+ struct fence_array *array; -+#else -+ struct dma_fence_array *array; -+#endif -+ if(num_fences == 1) { -+ sync_fence->fence =fences[0]; -+ kfree(fences); -+ } else { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+ array = fence_array_create(num_fences, fences, -+ fence_context_alloc(1), 1, false); -+#else -+ array = dma_fence_array_create(num_fences, fences, -+ dma_fence_context_alloc(1), 1, false); -+#endif -+ if (!array){ -+ return -ENOMEM; -+ } -+ sync_fence->fence = &array->base; -+ } -+ return 0; ++ /* The physical backing of memory in the pool is always reclaimable */ ++ kbase_gpu_vm_lock(kctx); ++ kbase_mem_evictable_make(reg->gpu_alloc); ++ kbase_gpu_vm_unlock(kctx); ++ ++ mutex_lock(&kctx->jit_evict_lock); ++ list_move(®->jit_node, &kctx->jit_pool_head); ++ mutex_unlock(&kctx->jit_evict_lock); +} + -+struct mali_internal_sync_fence *mali_internal_sync_fence_merge( -+ struct mali_internal_sync_fence *sync_fence1, struct mali_internal_sync_fence *sync_fence2) ++void kbase_jit_backing_lost(struct kbase_va_region *reg) +{ -+ struct mali_internal_sync_fence *sync_fence; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+ struct fence **fences, **nfences, **fences1, **fences2; -+#else -+ struct dma_fence **fences, **nfences, **fences1, **fences2; -+#endif -+ int real_num_fences, i, j, num_fences, num_fences1, num_fences2; ++ struct kbase_context *kctx = reg->kctx; + -+ fences1 = mali_internal_get_fences(sync_fence1, &num_fences1); -+ fences2 = mali_internal_get_fences(sync_fence2, &num_fences2); ++ lockdep_assert_held(&kctx->jit_evict_lock); + -+ num_fences = num_fences1 + num_fences2; ++ /* ++ * JIT allocations will always be on a list, if the region ++ * is not on a list then it's not a JIT allocation. ++ */ ++ if (list_empty(®->jit_node)) ++ return; + -+ fences = kcalloc(num_fences, sizeof(*fences), GFP_KERNEL); -+ if (!fences) { -+ MALI_PRINT_ERROR(("Mali internal sync:Failed to alloc buffer for fences.\n")); -+ goto fences_alloc_failed; -+ } ++ /* ++ * Freeing the allocation requires locks we might not be able ++ * to take now, so move the allocation to the free list and kick ++ * the worker which will do the freeing. ++ */ ++ list_move(®->jit_node, &kctx->jit_destroy_head); + -+ for (real_num_fences = i = j = 0; i < num_fences1 && j < num_fences2;) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+ struct fence *fence1 = fences1[i]; -+ struct fence *fence2 = fences2[j]; -+#else -+ struct dma_fence *fence1 = fences1[i]; -+ struct dma_fence *fence2 = fences2[j]; -+#endif -+ if (fence1->context < fence2->context) { -+ mali_internal_add_fence_array(fences, &real_num_fences, fence1); ++ schedule_work(&kctx->jit_work); ++} + -+ i++; -+ } else if (fence1->context > fence2->context) { -+ mali_internal_add_fence_array(fences, &real_num_fences, fence2); ++bool kbase_jit_evict(struct kbase_context *kctx) ++{ ++ struct kbase_va_region *reg = NULL; + -+ j++; -+ } else { -+ if (fence1->seqno - fence2->seqno <= INT_MAX) -+ mali_internal_add_fence_array(fences, &real_num_fences, fence1); -+ else -+ mali_internal_add_fence_array(fences, &real_num_fences, fence2); ++ lockdep_assert_held(&kctx->reg_lock); + -+ i++; -+ j++; -+ } ++ /* Free the oldest allocation from the pool */ ++ mutex_lock(&kctx->jit_evict_lock); ++ if (!list_empty(&kctx->jit_pool_head)) { ++ reg = list_entry(kctx->jit_pool_head.prev, ++ struct kbase_va_region, jit_node); ++ list_del(®->jit_node); + } ++ mutex_unlock(&kctx->jit_evict_lock); + -+ for (; i < num_fences1; i++) -+ mali_internal_add_fence_array(fences, &real_num_fences, fences1[i]); ++ if (reg) ++ kbase_mem_free_region(kctx, reg); + -+ for (; j < num_fences2; j++) -+ mali_internal_add_fence_array(fences, &real_num_fences, fences2[j]); ++ return (reg != NULL); ++} + -+ if (0 == real_num_fences) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+ fences[real_num_fences++] = fence_get(fences1[0]); -+#else -+ fences[real_num_fences++] = dma_fence_get(fences1[0]); -+#endif ++void kbase_jit_term(struct kbase_context *kctx) ++{ ++ struct kbase_va_region *walker; + -+ if (num_fences > real_num_fences) { -+ nfences = krealloc(fences, real_num_fences * sizeof(*fences), -+ GFP_KERNEL); -+ if (!nfences) -+ goto nfences_alloc_failed; ++ /* Free all allocations for this context */ + -+ fences = nfences; -+ } ++ /* ++ * Flush the freeing of allocations whose backing has been freed ++ * (i.e. everything in jit_destroy_head). ++ */ ++ cancel_work_sync(&kctx->jit_work); + -+ sync_fence = (struct mali_internal_sync_fence *)sync_file_create(fences[0]); -+ if (NULL == sync_fence) { -+ MALI_PRINT_ERROR(("Mali internal sync:Failed to create the mali internal sync fence when merging sync fence.\n")); -+ goto sync_fence_alloc_failed; ++ kbase_gpu_vm_lock(kctx); ++ mutex_lock(&kctx->jit_evict_lock); ++ /* Free all allocations from the pool */ ++ while (!list_empty(&kctx->jit_pool_head)) { ++ walker = list_first_entry(&kctx->jit_pool_head, ++ struct kbase_va_region, jit_node); ++ list_del(&walker->jit_node); ++ mutex_unlock(&kctx->jit_evict_lock); ++ kbase_mem_free_region(kctx, walker); ++ mutex_lock(&kctx->jit_evict_lock); + } + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+ fence_put(fences[0]); -+#else -+ dma_fence_put(fences[0]); -+#endif -+ -+ if (mali_internal_sync_fence_set_fence_array(sync_fence, fences, real_num_fences) < 0) { -+ MALI_PRINT_ERROR(("Mali internal sync:Failed to set fence for sync fence.\n")); -+ goto sync_fence_set_failed; ++ /* Free all allocations from active list */ ++ while (!list_empty(&kctx->jit_active_head)) { ++ walker = list_first_entry(&kctx->jit_active_head, ++ struct kbase_va_region, jit_node); ++ list_del(&walker->jit_node); ++ mutex_unlock(&kctx->jit_evict_lock); ++ kbase_mem_free_region(kctx, walker); ++ mutex_lock(&kctx->jit_evict_lock); + } -+ -+ return sync_fence; -+ -+sync_fence_set_failed: -+ fput(sync_fence->file); -+sync_fence_alloc_failed: -+ for (i = 0; i < real_num_fences; i++) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+ fence_put(fences[i]); -+#else -+ dma_fence_put(fences[i]); -+#endif -+nfences_alloc_failed: -+ kfree(fences); -+fences_alloc_failed: -+ return NULL; ++ mutex_unlock(&kctx->jit_evict_lock); ++ kbase_gpu_vm_unlock(kctx); +} -+#endif + -+void mali_internal_sync_fence_waiter_init(struct mali_internal_sync_fence_waiter *waiter, -+ mali_internal_sync_callback_t callback) ++static int kbase_jd_user_buf_map(struct kbase_context *kctx, ++ struct kbase_va_region *reg) +{ -+ MALI_DEBUG_ASSERT_POINTER(waiter); -+ MALI_DEBUG_ASSERT_POINTER(callback); ++ long pinned_pages; ++ struct kbase_mem_phy_alloc *alloc; ++ struct page **pages; ++ phys_addr_t *pa; ++ long i; ++ int err = -ENOMEM; ++ unsigned long address; ++ struct mm_struct *mm; ++ struct device *dev; ++ unsigned long offset; ++ unsigned long local_size; + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) -+ INIT_LIST_HEAD(&waiter->work.entry); -+#else -+ INIT_LIST_HEAD(&waiter->work.task_list); -+#endif -+ waiter->callback = callback; -+} ++ alloc = reg->gpu_alloc; ++ pa = kbase_get_gpu_phy_pages(reg); ++ address = alloc->imported.user_buf.address; ++ mm = alloc->imported.user_buf.mm; + -+int mali_internal_sync_fence_wait_async(struct mali_internal_sync_fence *sync_fence, -+ struct mali_internal_sync_fence_waiter *waiter) -+{ -+ int err; -+ unsigned long flags; ++ KBASE_DEBUG_ASSERT(alloc->type == KBASE_MEM_TYPE_IMPORTED_USER_BUF); + -+ MALI_DEBUG_ASSERT_POINTER(sync_fence); -+ MALI_DEBUG_ASSERT_POINTER(waiter); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) -+ err = atomic_read(&sync_fence->status); ++ pages = alloc->imported.user_buf.pages; + -+ if (0 > err) -+ return err; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ pinned_pages = get_user_pages(NULL, mm, ++ address, ++ alloc->imported.user_buf.nr_pages, ++ reg->flags & KBASE_REG_GPU_WR, ++ 0, pages, NULL); ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ pinned_pages = get_user_pages_remote(NULL, mm, ++ address, ++ alloc->imported.user_buf.nr_pages, ++ reg->flags & KBASE_REG_GPU_WR, ++ 0, pages, NULL); ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++ pinned_pages = get_user_pages_remote(NULL, mm, ++ address, ++ alloc->imported.user_buf.nr_pages, ++ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, ++ pages, NULL); ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0) ++ pinned_pages = get_user_pages_remote(NULL, mm, ++ address, ++ alloc->imported.user_buf.nr_pages, ++ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, ++ pages, NULL, NULL); ++#else ++ pinned_pages = get_user_pages_remote(mm, ++ address, ++ alloc->imported.user_buf.nr_pages, ++ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, ++ pages, NULL, NULL); ++#endif + -+ if (!err) -+ return 1; ++ if (pinned_pages <= 0) ++ return pinned_pages; + -+ init_waitqueue_func_entry(&waiter->work, mali_internal_sync_fence_wake_up_wq); -+ waiter->work.private = sync_fence; ++ if (pinned_pages != alloc->imported.user_buf.nr_pages) { ++ for (i = 0; i < pinned_pages; i++) ++ put_page(pages[i]); ++ return -ENOMEM; ++ } + -+ spin_lock_irqsave(&sync_fence->wq.lock, flags); -+ err = atomic_read(&sync_fence->status); ++ dev = kctx->kbdev->dev; ++ offset = address & ~PAGE_MASK; ++ local_size = alloc->imported.user_buf.size; + -+ if (0 < err) -+ __add_wait_queue_tail(&sync_fence->wq, &waiter->work); -+ spin_unlock_irqrestore(&sync_fence->wq.lock, flags); ++ for (i = 0; i < pinned_pages; i++) { ++ dma_addr_t dma_addr; ++ unsigned long min; + -+ if (0 > err) -+ return err; ++ min = MIN(PAGE_SIZE - offset, local_size); ++ dma_addr = dma_map_page(dev, pages[i], ++ offset, min, ++ DMA_BIDIRECTIONAL); ++ if (dma_mapping_error(dev, dma_addr)) ++ goto unwind; + -+ return !err; -+#else -+ if ((sync_fence->fence) && (sync_fence->fence->ops) && (sync_fence->fence->ops->signaled)) -+ err = sync_fence->fence->ops->signaled(sync_fence->fence); -+ else -+ err = -1; ++ alloc->imported.user_buf.dma_addrs[i] = dma_addr; ++ pa[i] = page_to_phys(pages[i]); + -+ if (0 > err) -+ return err; ++ local_size -= min; ++ offset = 0; ++ } + -+ if (1 == err) -+ return err; ++ alloc->nents = pinned_pages; + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ err = dma_fence_add_callback(sync_fence->fence, &waiter->cb, mali_internal_fence_check_cb_func); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) -+ err = fence_add_callback(sync_fence->fence, &waiter->cb, mali_internal_fence_check_cb_func); -+#endif ++ err = kbase_mmu_insert_pages(kctx, reg->start_pfn, pa, ++ kbase_reg_current_backed_size(reg), ++ reg->flags); ++ if (err == 0) ++ return 0; + -+ if (0 != err) { -+ if (-ENOENT == err) -+ err = 1; -+ return err; ++ alloc->nents = 0; ++ /* fall down */ ++unwind: ++ while (i--) { ++ dma_unmap_page(kctx->kbdev->dev, ++ alloc->imported.user_buf.dma_addrs[i], ++ PAGE_SIZE, DMA_BIDIRECTIONAL); ++ put_page(pages[i]); ++ pages[i] = NULL; + } -+ init_waitqueue_func_entry(&waiter->work, mali_internal_sync_fence_wake_up_wq); -+ waiter->work.private = sync_fence; -+ -+ spin_lock_irqsave(&sync_fence->wq.lock, flags); -+ err = sync_fence->fence->ops->signaled(sync_fence->fence); -+ -+ if (0 == err){ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) -+ __add_wait_queue_entry_tail(&sync_fence->wq, &waiter->work); -+#else -+ __add_wait_queue_tail(&sync_fence->wq, &waiter->work); -+#endif -+ } -+ spin_unlock_irqrestore(&sync_fence->wq.lock, flags); + + return err; -+#endif +} + -+int mali_internal_sync_fence_cancel_async(struct mali_internal_sync_fence *sync_fence, -+ struct mali_internal_sync_fence_waiter *waiter) ++static void kbase_jd_user_buf_unmap(struct kbase_context *kctx, ++ struct kbase_mem_phy_alloc *alloc, bool writeable) +{ -+ unsigned long flags; -+ int ret = 0; -+ -+ MALI_DEBUG_ASSERT_POINTER(sync_fence); -+ MALI_DEBUG_ASSERT_POINTER(waiter); ++ long i; ++ struct page **pages; ++ unsigned long size = alloc->imported.user_buf.size; + -+ spin_lock_irqsave(&sync_fence->wq.lock, flags); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) -+ if (!list_empty(&waiter->work.entry)) -+ list_del_init(&waiter->work.entry); -+#else -+ if (!list_empty(&waiter->work.task_list)) -+ list_del_init(&waiter->work.task_list); -+#endif -+ else -+ ret = -ENOENT; -+ spin_unlock_irqrestore(&sync_fence->wq.lock, flags); ++ KBASE_DEBUG_ASSERT(alloc->type == KBASE_MEM_TYPE_IMPORTED_USER_BUF); ++ pages = alloc->imported.user_buf.pages; ++ for (i = 0; i < alloc->imported.user_buf.nr_pages; i++) { ++ unsigned long local_size; ++ dma_addr_t dma_addr = alloc->imported.user_buf.dma_addrs[i]; + -+ if (0 == ret) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ dma_fence_remove_callback(sync_fence->fence, &waiter->cb); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) -+ fence_remove_callback(sync_fence->fence, &waiter->cb); -+#endif ++ local_size = MIN(size, PAGE_SIZE - (dma_addr & ~PAGE_MASK)); ++ dma_unmap_page(kctx->kbdev->dev, dma_addr, local_size, ++ DMA_BIDIRECTIONAL); ++ if (writeable) ++ set_page_dirty_lock(pages[i]); ++ put_page(pages[i]); ++ pages[i] = NULL; + ++ size -= local_size; + } -+ -+ return ret; ++ alloc->nents = 0; +} + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+static const char *mali_internal_fence_get_driver_name(struct dma_fence *fence) -+#else -+static const char *mali_internal_fence_get_driver_name(struct fence *fence) -+#endif -+{ -+ struct mali_internal_sync_point *sync_pt; -+ struct mali_internal_sync_timeline *parent; -+ -+ MALI_DEBUG_ASSERT_POINTER(fence); -+ -+ sync_pt = mali_internal_fence_to_sync_pt(fence); -+ parent = mali_internal_sync_pt_to_sync_timeline(sync_pt); + -+ return parent->ops->driver_name; -+} ++/* to replace sg_dma_len. */ ++#define MALI_SG_DMA_LEN(sg) ((sg)->length) + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+static const char *mali_internal_fence_get_timeline_name(struct dma_fence *fence) -+#else -+static const char *mali_internal_fence_get_timeline_name(struct fence *fence) -+#endif ++#ifdef CONFIG_DMA_SHARED_BUFFER ++static int kbase_jd_umm_map(struct kbase_context *kctx, ++ struct kbase_va_region *reg) +{ -+ struct mali_internal_sync_point *sync_pt; -+ struct mali_internal_sync_timeline *parent; ++ struct sg_table *sgt; ++ struct scatterlist *s; ++ int i; ++ phys_addr_t *pa; ++ int err; ++ size_t count = 0; ++ struct kbase_mem_phy_alloc *alloc; + -+ MALI_DEBUG_ASSERT_POINTER(fence); ++ alloc = reg->gpu_alloc; + -+ sync_pt = mali_internal_fence_to_sync_pt(fence); -+ parent = mali_internal_sync_pt_to_sync_timeline(sync_pt); ++ KBASE_DEBUG_ASSERT(alloc->type == KBASE_MEM_TYPE_IMPORTED_UMM); ++ KBASE_DEBUG_ASSERT(NULL == alloc->imported.umm.sgt); ++ sgt = dma_buf_map_attachment(alloc->imported.umm.dma_attachment, ++ DMA_BIDIRECTIONAL); + -+ return parent->name; -+} ++ if (IS_ERR_OR_NULL(sgt)) ++ return -EINVAL; + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+static void mali_internal_fence_release(struct dma_fence *fence) -+#else -+static void mali_internal_fence_release(struct fence *fence) -+#endif -+{ -+ unsigned long flags; -+ struct mali_internal_sync_point *sync_pt; -+ struct mali_internal_sync_timeline *parent; ++ /* save for later */ ++ alloc->imported.umm.sgt = sgt; + -+ MALI_DEBUG_ASSERT_POINTER(fence); ++ pa = kbase_get_gpu_phy_pages(reg); ++ KBASE_DEBUG_ASSERT(pa); + -+ sync_pt = mali_internal_fence_to_sync_pt(fence); -+ parent = mali_internal_sync_pt_to_sync_timeline(sync_pt); ++ for_each_sg(sgt->sgl, s, sgt->nents, i) { ++ int j; ++ size_t pages = PFN_UP(MALI_SG_DMA_LEN(s)); + ++ WARN_ONCE(MALI_SG_DMA_LEN(s) & (PAGE_SIZE-1), ++ "MALI_SG_DMA_LEN(s)=%u is not a multiple of PAGE_SIZE\n", ++ MALI_SG_DMA_LEN(s)); + -+ spin_lock_irqsave(fence->lock, flags); -+ if (WARN_ON_ONCE(!list_empty(&sync_pt->sync_pt_list))) -+ list_del(&sync_pt->sync_pt_list); -+ spin_unlock_irqrestore(fence->lock, flags); ++ WARN_ONCE(sg_dma_address(s) & (PAGE_SIZE-1), ++ "sg_dma_address(s)=%llx is not aligned to PAGE_SIZE\n", ++ (unsigned long long) sg_dma_address(s)); + -+ if (parent->ops->free_pt) -+ parent->ops->free_pt(sync_pt); ++ for (j = 0; (j < pages) && (count < reg->nr_pages); j++, ++ count++) ++ *pa++ = sg_dma_address(s) + (j << PAGE_SHIFT); ++ WARN_ONCE(j < pages, ++ "sg list from dma_buf_map_attachment > dma_buf->size=%zu\n", ++ alloc->imported.umm.dma_buf->size); ++ } + -+ kref_put(&parent->kref_count, mali_internal_sync_timeline_free); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ dma_fence_free(&sync_pt->base); -+#else -+ fence_free(&sync_pt->base); -+#endif -+} ++ if (!(reg->flags & KBASE_REG_IMPORT_PAD) && ++ WARN_ONCE(count < reg->nr_pages, ++ "sg list from dma_buf_map_attachment < dma_buf->size=%zu\n", ++ alloc->imported.umm.dma_buf->size)) { ++ err = -EINVAL; ++ goto err_unmap_attachment; ++ } + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+static bool mali_internal_fence_signaled(struct dma_fence *fence) -+#else -+static bool mali_internal_fence_signaled(struct fence *fence) -+#endif -+{ -+ int ret; -+ struct mali_internal_sync_point *sync_pt; -+ struct mali_internal_sync_timeline *parent; ++ /* Update nents as we now have pages to map */ ++ alloc->nents = reg->nr_pages; + -+ MALI_DEBUG_ASSERT_POINTER(fence); ++ err = kbase_mmu_insert_pages(kctx, reg->start_pfn, ++ kbase_get_gpu_phy_pages(reg), ++ count, ++ reg->flags | KBASE_REG_GPU_WR | KBASE_REG_GPU_RD); ++ if (err) ++ goto err_unmap_attachment; + -+ sync_pt = mali_internal_fence_to_sync_pt(fence); -+ parent = mali_internal_sync_pt_to_sync_timeline(sync_pt); ++ if (reg->flags & KBASE_REG_IMPORT_PAD) { ++ err = kbase_mmu_insert_single_page(kctx, ++ reg->start_pfn + count, ++ page_to_phys(kctx->aliasing_sink_page), ++ reg->nr_pages - count, ++ (reg->flags | KBASE_REG_GPU_RD) & ++ ~KBASE_REG_GPU_WR); ++ if (err) ++ goto err_teardown_orig_pages; ++ } + -+ ret = parent->ops->has_signaled(sync_pt); -+ if (0 > ret) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) \ -+ || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 68))) -+ fence->error = ret; -+#else -+ fence->status = ret; -+#endif -+ return ret; ++ return 0; ++ ++err_teardown_orig_pages: ++ kbase_mmu_teardown_pages(kctx, reg->start_pfn, count); ++err_unmap_attachment: ++ dma_buf_unmap_attachment(alloc->imported.umm.dma_attachment, ++ alloc->imported.umm.sgt, DMA_BIDIRECTIONAL); ++ alloc->imported.umm.sgt = NULL; ++ ++ return err; +} + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+static bool mali_internal_fence_enable_signaling(struct dma_fence *fence) -+#else -+static bool mali_internal_fence_enable_signaling(struct fence *fence) -+#endif ++static void kbase_jd_umm_unmap(struct kbase_context *kctx, ++ struct kbase_mem_phy_alloc *alloc) +{ -+ struct mali_internal_sync_point *sync_pt; -+ struct mali_internal_sync_timeline *parent; -+ -+ MALI_DEBUG_ASSERT_POINTER(fence); ++ KBASE_DEBUG_ASSERT(kctx); ++ KBASE_DEBUG_ASSERT(alloc); ++ KBASE_DEBUG_ASSERT(alloc->imported.umm.dma_attachment); ++ KBASE_DEBUG_ASSERT(alloc->imported.umm.sgt); ++ dma_buf_unmap_attachment(alloc->imported.umm.dma_attachment, ++ alloc->imported.umm.sgt, DMA_BIDIRECTIONAL); ++ alloc->imported.umm.sgt = NULL; ++ alloc->nents = 0; ++} ++#endif /* CONFIG_DMA_SHARED_BUFFER */ + -+ sync_pt = mali_internal_fence_to_sync_pt(fence); -+ parent = mali_internal_sync_pt_to_sync_timeline(sync_pt); ++#if (defined(CONFIG_KDS) && defined(CONFIG_UMP)) \ ++ || defined(CONFIG_DMA_SHARED_BUFFER_USES_KDS) ++static void add_kds_resource(struct kds_resource *kds_res, ++ struct kds_resource **kds_resources, u32 *kds_res_count, ++ unsigned long *kds_access_bitmap, bool exclusive) ++{ ++ u32 i; + -+ if (mali_internal_fence_signaled(fence)) -+ return false; ++ for (i = 0; i < *kds_res_count; i++) { ++ /* Duplicate resource, ignore */ ++ if (kds_resources[i] == kds_res) ++ return; ++ } + -+ list_add_tail(&sync_pt->sync_pt_list, &parent->sync_pt_list_head); -+ return true; ++ kds_resources[*kds_res_count] = kds_res; ++ if (exclusive) ++ set_bit(*kds_res_count, kds_access_bitmap); ++ (*kds_res_count)++; +} ++#endif + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+static void mali_internal_fence_value_str(struct dma_fence *fence, char *str, int size) -+#else -+static void mali_internal_fence_value_str(struct fence *fence, char *str, int size) ++struct kbase_mem_phy_alloc *kbase_map_external_resource( ++ struct kbase_context *kctx, struct kbase_va_region *reg, ++ struct mm_struct *locked_mm ++#ifdef CONFIG_KDS ++ , u32 *kds_res_count, struct kds_resource **kds_resources, ++ unsigned long *kds_access_bitmap, bool exclusive +#endif ++ ) +{ -+ struct mali_internal_sync_point *sync_pt; -+ struct mali_internal_sync_timeline *parent; ++ int err; + -+ MALI_DEBUG_ASSERT_POINTER(fence); -+ MALI_IGNORE(str); -+ MALI_IGNORE(size); ++ /* decide what needs to happen for this resource */ ++ switch (reg->gpu_alloc->type) { ++ case KBASE_MEM_TYPE_IMPORTED_USER_BUF: { ++ if (reg->gpu_alloc->imported.user_buf.mm != locked_mm) ++ goto exit; + -+ sync_pt = mali_internal_fence_to_sync_pt(fence); -+ parent = mali_internal_sync_pt_to_sync_timeline(sync_pt); ++ reg->gpu_alloc->imported.user_buf.current_mapping_usage_count++; ++ if (1 == reg->gpu_alloc->imported.user_buf.current_mapping_usage_count) { ++ err = kbase_jd_user_buf_map(kctx, reg); ++ if (err) { ++ reg->gpu_alloc->imported.user_buf.current_mapping_usage_count--; ++ goto exit; ++ } ++ } ++ } ++ break; ++ case KBASE_MEM_TYPE_IMPORTED_UMP: { ++#if defined(CONFIG_KDS) && defined(CONFIG_UMP) ++ if (kds_res_count) { ++ struct kds_resource *kds_res; + -+ parent->ops->print_sync_pt(sync_pt); -+} ++ kds_res = ump_dd_kds_resource_get( ++ reg->gpu_alloc->imported.ump_handle); ++ if (kds_res) ++ add_kds_resource(kds_res, kds_resources, ++ kds_res_count, ++ kds_access_bitmap, exclusive); ++ } ++#endif /*defined(CONFIG_KDS) && defined(CONFIG_UMP) */ ++ break; ++ } ++#ifdef CONFIG_DMA_SHARED_BUFFER ++ case KBASE_MEM_TYPE_IMPORTED_UMM: { ++#ifdef CONFIG_DMA_SHARED_BUFFER_USES_KDS ++ if (kds_res_count) { ++ struct kds_resource *kds_res; + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+static const struct dma_fence_ops fence_ops = { -+#else -+static const struct fence_ops fence_ops = { -+#endif -+ .get_driver_name = mali_internal_fence_get_driver_name, -+ .get_timeline_name = mali_internal_fence_get_timeline_name, -+ .enable_signaling = mali_internal_fence_enable_signaling, -+ .signaled = mali_internal_fence_signaled, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ .wait = dma_fence_default_wait, -+#else -+ .wait = fence_default_wait, ++ kds_res = get_dma_buf_kds_resource( ++ reg->gpu_alloc->imported.umm.dma_buf); ++ if (kds_res) ++ add_kds_resource(kds_res, kds_resources, ++ kds_res_count, ++ kds_access_bitmap, exclusive); ++ } +#endif -+ .release = mali_internal_fence_release, -+ .fence_value_str = mali_internal_fence_value_str, -+}; ++ reg->gpu_alloc->imported.umm.current_mapping_usage_count++; ++ if (1 == reg->gpu_alloc->imported.umm.current_mapping_usage_count) { ++ err = kbase_jd_umm_map(kctx, reg); ++ if (err) { ++ reg->gpu_alloc->imported.umm.current_mapping_usage_count--; ++ goto exit; ++ } ++ } ++ break; ++ } +#endif -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h -new file mode 100755 -index 000000000000..dbb29222ba98 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h -@@ -0,0 +1,191 @@ -+/* -+ * Copyright (C) 2012-2015, 2017-2018 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ default: ++ goto exit; ++ } + -+/** -+ * @file mali_internal_sync.h -+ * -+ * Mali internal structure/interface for sync. -+ */ ++ return kbase_mem_phy_alloc_get(reg->gpu_alloc); ++exit: ++ return NULL; ++} + -+#ifndef _MALI_INTERNAL_SYNC_H -+#define _MALI_INTERNAL_SYNC_H -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+#include -+#include -+#include -+#include -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) -+#include -+#else -+#include -+#endif ++void kbase_unmap_external_resource(struct kbase_context *kctx, ++ struct kbase_va_region *reg, struct kbase_mem_phy_alloc *alloc) ++{ ++ switch (alloc->type) { ++#ifdef CONFIG_DMA_SHARED_BUFFER ++ case KBASE_MEM_TYPE_IMPORTED_UMM: { ++ alloc->imported.umm.current_mapping_usage_count--; + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+#include -+#else -+#include -+#endif ++ if (0 == alloc->imported.umm.current_mapping_usage_count) { ++ if (reg && reg->gpu_alloc == alloc) { ++ int err; + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+#include -+#else -+#include -+#endif -+#endif ++ err = kbase_mmu_teardown_pages( ++ kctx, ++ reg->start_pfn, ++ alloc->nents); ++ WARN_ON(err); ++ } + -+struct mali_internal_sync_timeline; -+struct mali_internal_sync_point; -+struct mali_internal_sync_fence; ++ kbase_jd_umm_unmap(kctx, alloc); ++ } ++ } ++ break; ++#endif /* CONFIG_DMA_SHARED_BUFFER */ ++ case KBASE_MEM_TYPE_IMPORTED_USER_BUF: { ++ alloc->imported.user_buf.current_mapping_usage_count--; + -+struct mali_internal_sync_timeline_ops { -+ const char *driver_name; -+ int (*has_signaled)(struct mali_internal_sync_point *pt); -+ void (*free_pt)(struct mali_internal_sync_point *sync_pt); -+ void (*release_obj)(struct mali_internal_sync_timeline *sync_timeline); -+ void (*print_sync_pt)(struct mali_internal_sync_point *sync_pt); -+}; ++ if (0 == alloc->imported.user_buf.current_mapping_usage_count) { ++ bool writeable = true; + -+struct mali_internal_sync_timeline { -+ struct kref kref_count; -+ const struct mali_internal_sync_timeline_ops *ops; -+ char name[32]; -+ bool destroyed; -+ int fence_context; -+ int value; -+ spinlock_t sync_pt_list_lock; -+ struct list_head sync_pt_list_head; -+}; ++ if (reg && reg->gpu_alloc == alloc) ++ kbase_mmu_teardown_pages( ++ kctx, ++ reg->start_pfn, ++ kbase_reg_current_backed_size(reg)); + -+struct mali_internal_sync_point { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ struct dma_fence base; -+#else -+ struct fence base; -+#endif -+ struct list_head sync_pt_list; -+}; ++ if (reg && ((reg->flags & KBASE_REG_GPU_WR) == 0)) ++ writeable = false; + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) -+struct mali_internal_sync_fence_cb { -+ struct fence_cb cb; -+ struct fence *fence; -+ struct mali_internal_sync_fence *sync_file; -+}; -+#endif ++ kbase_jd_user_buf_unmap(kctx, alloc, writeable); ++ } ++ } ++ break; ++ default: ++ break; ++ } ++ kbase_mem_phy_alloc_put(alloc); ++} + -+struct mali_internal_sync_fence { -+ struct file *file; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) -+ struct kref kref; -+#endif -+ char name[32]; -+#ifdef CONFIG_DEBUG_FS -+ struct list_head sync_file_list; -+#endif -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) -+ int num_fences; -+#endif -+ wait_queue_head_t wq; -+#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 12, 0) -+ unsigned long flags; -+#endif -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) -+ atomic_t status; -+ struct mali_internal_sync_fence_cb cbs[]; -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+ struct fence *fence; -+ struct fence_cb cb; -+#else -+ struct dma_fence *fence; -+ struct dma_fence_cb cb; -+#endif -+}; ++struct kbase_ctx_ext_res_meta *kbase_sticky_resource_acquire( ++ struct kbase_context *kctx, u64 gpu_addr) ++{ ++ struct kbase_ctx_ext_res_meta *meta = NULL; ++ struct kbase_ctx_ext_res_meta *walker; + -+struct mali_internal_sync_fence_waiter; ++ lockdep_assert_held(&kctx->reg_lock); + -+typedef void (*mali_internal_sync_callback_t)(struct mali_internal_sync_fence *sync_fence, -+ struct mali_internal_sync_fence_waiter *waiter); ++ /* ++ * Walk the per context external resource metadata list for the ++ * metadata which matches the region which is being acquired. ++ */ ++ list_for_each_entry(walker, &kctx->ext_res_meta_head, ext_res_node) { ++ if (walker->gpu_addr == gpu_addr) { ++ meta = walker; ++ break; ++ } ++ } + -+struct mali_internal_sync_fence_waiter { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) -+ wait_queue_entry_t work; -+#else -+ wait_queue_t work; -+#endif -+ mali_internal_sync_callback_t callback; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -+ struct fence_cb cb; -+#else -+ struct dma_fence_cb cb; -+#endif ++ /* No metadata exists so create one. */ ++ if (!meta) { ++ struct kbase_va_region *reg; ++ ++ /* Find the region */ ++ reg = kbase_region_tracker_find_region_enclosing_address( ++ kctx, gpu_addr); ++ if (NULL == reg || (reg->flags & KBASE_REG_FREE)) ++ goto failed; ++ ++ /* Allocate the metadata object */ ++ meta = kzalloc(sizeof(*meta), GFP_KERNEL); ++ if (!meta) ++ goto failed; ++ ++ /* ++ * Fill in the metadata object and acquire a reference ++ * for the physical resource. ++ */ ++ meta->alloc = kbase_map_external_resource(kctx, reg, NULL ++#ifdef CONFIG_KDS ++ , NULL, NULL, ++ NULL, false +#endif -+}; ++ ); + -+/** -+ * Create a mali internal sync timeline. -+ * @param ops The implementation ops for the mali internal sync timeline -+ * @param size The size to allocate -+ * @param name The sync_timeline name -+ * @return The new mali internal sync timeline if successful, NULL if not. -+ */ -+struct mali_internal_sync_timeline *mali_internal_sync_timeline_create(const struct mali_internal_sync_timeline_ops *ops, -+ int size, const char *name); ++ if (!meta->alloc) ++ goto fail_map; + -+/** -+ * Destroy one mali internal sync timeline. -+ * @param sync_timeline The mali internal sync timeline to destroy. -+ */ -+void mali_internal_sync_timeline_destroy(struct mali_internal_sync_timeline *sync_timeline); ++ meta->gpu_addr = reg->start_pfn << PAGE_SHIFT; + -+/** -+ * Signal one mali internal sync timeline. -+ * @param sync_timeline The mali internal sync timeline to signal. -+ */ -+void mali_internal_sync_timeline_signal(struct mali_internal_sync_timeline *sync_timeline); ++ list_add(&meta->ext_res_node, &kctx->ext_res_meta_head); ++ } + -+/** -+ * Create one mali internal sync point. -+ * @param sync_timeline The mali internal sync timeline to add this mali internal sync point. -+ * @return the new mali internal sync point if successful, NULL if not. -+ */ -+struct mali_internal_sync_point *mali_internal_sync_point_create(struct mali_internal_sync_timeline *sync_timeline, int size); ++ return meta; + -+/** -+ * Merge mali internal sync fences -+ * @param sync_fence1 The mali internal sync fence to merge -+ * @param sync_fence2 The mali internal sync fence to merge -+ * @return the new mali internal sync fence if successful, NULL if not. -+ */ -+struct mali_internal_sync_fence *mali_internal_sync_fence_merge(struct mali_internal_sync_fence *sync_fence1, -+ struct mali_internal_sync_fence *sync_fence2); ++fail_map: ++ kfree(meta); ++failed: ++ return NULL; ++} + -+/** -+ * Get the mali internal sync fence from sync fd -+ * @param fd The sync handle to get the mali internal sync fence -+ * @return the mali internal sync fence if successful, NULL if not. -+ */ -+struct mali_internal_sync_fence *mali_internal_sync_fence_fdget(int fd); ++bool kbase_sticky_resource_release(struct kbase_context *kctx, ++ struct kbase_ctx_ext_res_meta *meta, u64 gpu_addr) ++{ ++ struct kbase_ctx_ext_res_meta *walker; ++ struct kbase_va_region *reg; + ++ lockdep_assert_held(&kctx->reg_lock); + -+void mali_internal_sync_fence_waiter_init(struct mali_internal_sync_fence_waiter *waiter, -+ mali_internal_sync_callback_t callback); ++ /* Search of the metadata if one isn't provided. */ ++ if (!meta) { ++ /* ++ * Walk the per context external resource metadata list for the ++ * metadata which matches the region which is being released. ++ */ ++ list_for_each_entry(walker, &kctx->ext_res_meta_head, ++ ext_res_node) { ++ if (walker->gpu_addr == gpu_addr) { ++ meta = walker; ++ break; ++ } ++ } ++ } + -+int mali_internal_sync_fence_wait_async(struct mali_internal_sync_fence *sync_fence, -+ struct mali_internal_sync_fence_waiter *waiter); ++ /* No metadata so just return. */ ++ if (!meta) ++ return false; + -+int mali_internal_sync_fence_cancel_async(struct mali_internal_sync_fence *sync_fence, -+ struct mali_internal_sync_fence_waiter *waiter); ++ /* Drop the physical memory reference and free the metadata. */ ++ reg = kbase_region_tracker_find_region_enclosing_address( ++ kctx, ++ meta->gpu_addr); + -+#endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)*/ -+#endif /* _MALI_INTERNAL_SYNC_H */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c ++ kbase_unmap_external_resource(kctx, reg, meta->alloc); ++ list_del(&meta->ext_res_node); ++ kfree(meta); ++ ++ return true; ++} ++ ++int kbase_sticky_resource_init(struct kbase_context *kctx) ++{ ++ INIT_LIST_HEAD(&kctx->ext_res_meta_head); ++ ++ return 0; ++} ++ ++void kbase_sticky_resource_term(struct kbase_context *kctx) ++{ ++ struct kbase_ctx_ext_res_meta *walker; ++ ++ lockdep_assert_held(&kctx->reg_lock); ++ ++ /* ++ * Free any sticky resources which haven't been unmapped. ++ * ++ * Note: ++ * We don't care about refcounts at this point as no future ++ * references to the meta data will be made. ++ * Region termination would find these if we didn't free them ++ * here, but it's more efficient if we do the clean up here. ++ */ ++ while (!list_empty(&kctx->ext_res_meta_head)) { ++ walker = list_first_entry(&kctx->ext_res_meta_head, ++ struct kbase_ctx_ext_res_meta, ext_res_node); ++ ++ kbase_sticky_resource_release(kctx, walker, 0); ++ } ++} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.h b/drivers/gpu/arm/midgard/mali_kbase_mem.h new file mode 100755 -index 000000000000..e45c7d2f2b1e +index 000000000..3f3eaa3fd --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c -@@ -0,0 +1,1154 @@ -+/** -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++++ b/drivers/gpu/arm/midgard/mali_kbase_mem.h +@@ -0,0 +1,1068 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + + ++ ++ ++ +/** -+ * @file mali_kernel_linux.c -+ * Implementation of the Linux device driver entrypoints ++ * @file mali_kbase_mem.h ++ * Base kernel memory APIs + */ -+#include "../platform/rk/custom_log.h" -+#include "../platform/rk/rk_ext.h" + -+#include /* kernel module definitions */ -+#include /* file system operations */ -+#include /* character device definitions */ -+#include /* memory manager definitions */ -+#include -+#include -+#include -+#include "mali_kernel_license.h" -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++#ifndef _KBASE_MEM_H_ ++#define _KBASE_MEM_H_ + -+#include "mali_kernel_common.h" -+#include "mali_session.h" -+#include "mali_kernel_core.h" -+#include "mali_osk.h" -+#include "mali_kernel_linux.h" -+#include "mali_ukk.h" -+#include "mali_ukk_wrappers.h" -+#include "mali_kernel_sysfs.h" -+#include "mali_pm.h" -+#include "mali_kernel_license.h" -+#include "mali_memory.h" -+#include "mali_memory_dma_buf.h" -+#include "mali_memory_manager.h" -+#include "mali_memory_swap_alloc.h" -+#if defined(CONFIG_MALI400_INTERNAL_PROFILING) -+#include "mali_profiling_internal.h" ++#ifndef _KBASE_H_ ++#error "Don't include this file directly, use mali_kbase.h instead" +#endif -+#if defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_MALI_DVFS) -+#include "mali_osk_profiling.h" -+#include "mali_dvfs_policy.h" + -+static int is_first_resume = 1; -+/*Store the clk and vol for boot/insmod and mali_resume*/ -+static struct mali_gpu_clk_item mali_gpu_clk[2]; ++#include ++#ifdef CONFIG_KDS ++#include ++#endif /* CONFIG_KDS */ ++#ifdef CONFIG_UMP ++#include ++#endif /* CONFIG_UMP */ ++#include "mali_base_kernel.h" ++#include ++#include "mali_kbase_pm.h" ++#include "mali_kbase_defs.h" ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++#include "mali_kbase_gator.h" +#endif ++/* Required for kbase_mem_evictable_unmake */ ++#include "mali_kbase_mem_linux.h" + -+/* Streamline support for the Mali driver */ -+#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_MALI400_PROFILING) -+/* Ask Linux to create the tracepoints */ -+#define CREATE_TRACE_POINTS -+#include "mali_linux_trace.h" ++/* Part of the workaround for uTLB invalid pages is to ensure we grow/shrink tmem by 4 pages at a time */ ++#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2_HW_ISSUE_8316 (2) /* round to 4 pages */ + -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_event); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_hw_counter); -+EXPORT_TRACEPOINT_SYMBOL_GPL(mali_sw_counters); -+#endif /* CONFIG_TRACEPOINTS */ ++/* Part of the workaround for PRLAM-9630 requires us to grow/shrink memory by 8 pages. ++The MMU reads in 8 page table entries from memory at a time, if we have more than one page fault within the same 8 pages and ++page tables are updated accordingly, the MMU does not re-read the page table entries from memory for the subsequent page table ++updates and generates duplicate page faults as the page table information used by the MMU is not valid. */ ++#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2_HW_ISSUE_9630 (3) /* round to 8 pages */ + -+#ifdef CONFIG_MALI_DEVFREQ -+#include "mali_devfreq.h" -+#include "mali_osk_mali.h" ++#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2 (0) /* round to 1 page */ + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) -+#include -+#else -+/* In 3.13 the OPP include header file, types, and functions were all -+ * renamed. Use the old filename for the include, and define the new names to -+ * the old, when an old kernel is detected. ++/* This must always be a power of 2 */ ++#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES (1u << KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2) ++#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_HW_ISSUE_8316 (1u << KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2_HW_ISSUE_8316) ++#define KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_HW_ISSUE_9630 (1u << KBASEP_TMEM_GROWABLE_BLOCKSIZE_PAGES_LOG2_HW_ISSUE_9630) ++/** ++ * A CPU mapping + */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) -+#include -+#else -+#include -+#endif /* Linux >= 3.13*/ -+#define dev_pm_opp_of_add_table of_init_opp_table -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+#define dev_pm_opp_of_remove_table of_free_opp_table -+#endif /* Linux >= 3.19 */ -+#endif /* Linux >= 4.4.0 */ -+#endif -+ -+/* from the __malidrv_build_info.c file that is generated during build */ -+extern const char *__malidrv_build_info(void); -+ -+/* Module parameter to control log level */ -+int mali_debug_level = 2; -+module_param(mali_debug_level, int, S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP | S_IROTH); /* rw-rw-r-- */ -+MODULE_PARM_DESC(mali_debug_level, "Higher number, more dmesg output"); ++struct kbase_cpu_mapping { ++ struct list_head mappings_list; ++ struct kbase_mem_phy_alloc *alloc; ++ struct kbase_context *kctx; ++ struct kbase_va_region *region; ++ int count; ++ int free_on_close; ++}; + -+extern int mali_max_job_runtime; -+module_param(mali_max_job_runtime, int, S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP | S_IROTH); -+MODULE_PARM_DESC(mali_max_job_runtime, "Maximum allowed job runtime in msecs.\nJobs will be killed after this no matter what"); ++enum kbase_memory_type { ++ KBASE_MEM_TYPE_NATIVE, ++ KBASE_MEM_TYPE_IMPORTED_UMP, ++ KBASE_MEM_TYPE_IMPORTED_UMM, ++ KBASE_MEM_TYPE_IMPORTED_USER_BUF, ++ KBASE_MEM_TYPE_ALIAS, ++ KBASE_MEM_TYPE_TB, ++ KBASE_MEM_TYPE_RAW ++}; + -+extern int mali_l2_max_reads; -+module_param(mali_l2_max_reads, int, S_IRUSR | S_IRGRP | S_IROTH); -+MODULE_PARM_DESC(mali_l2_max_reads, "Maximum reads for Mali L2 cache"); ++/* internal structure, mirroring base_mem_aliasing_info, ++ * but with alloc instead of a gpu va (handle) */ ++struct kbase_aliased { ++ struct kbase_mem_phy_alloc *alloc; /* NULL for special, non-NULL for native */ ++ u64 offset; /* in pages */ ++ u64 length; /* in pages */ ++}; + -+extern unsigned int mali_dedicated_mem_start; -+module_param(mali_dedicated_mem_start, uint, S_IRUSR | S_IRGRP | S_IROTH); -+MODULE_PARM_DESC(mali_dedicated_mem_start, "Physical start address of dedicated Mali GPU memory."); ++/** ++ * @brief Physical pages tracking object properties ++ */ ++#define KBASE_MEM_PHY_ALLOC_ACCESSED_CACHED (1ul << 0) ++#define KBASE_MEM_PHY_ALLOC_LARGE (1ul << 1) + -+extern unsigned int mali_dedicated_mem_size; -+module_param(mali_dedicated_mem_size, uint, S_IRUSR | S_IRGRP | S_IROTH); -+MODULE_PARM_DESC(mali_dedicated_mem_size, "Size of dedicated Mali GPU memory."); ++/* physical pages tracking object. ++ * Set up to track N pages. ++ * N not stored here, the creator holds that info. ++ * This object only tracks how many elements are actually valid (present). ++ * Changing of nents or *pages should only happen if the kbase_mem_phy_alloc is not ++ * shared with another region or client. CPU mappings are OK to exist when changing, as ++ * long as the tracked mappings objects are updated as part of the change. ++ */ ++struct kbase_mem_phy_alloc { ++ struct kref kref; /* number of users of this alloc */ ++ atomic_t gpu_mappings; ++ size_t nents; /* 0..N */ ++ phys_addr_t *pages; /* N elements, only 0..nents are valid */ + -+extern unsigned int mali_shared_mem_size; -+module_param(mali_shared_mem_size, uint, S_IRUSR | S_IRGRP | S_IROTH); -+MODULE_PARM_DESC(mali_shared_mem_size, "Size of shared Mali GPU memory."); ++ /* kbase_cpu_mappings */ ++ struct list_head mappings; + -+#if defined(CONFIG_MALI400_PROFILING) -+extern int mali_boot_profiling; -+module_param(mali_boot_profiling, int, S_IRUSR | S_IRGRP | S_IROTH); -+MODULE_PARM_DESC(mali_boot_profiling, "Start profiling as a part of Mali driver initialization"); -+#endif ++ /* Node used to store this allocation on the eviction list */ ++ struct list_head evict_node; ++ /* Physical backing size when the pages where evicted */ ++ size_t evicted; ++ /* ++ * Back reference to the region structure which created this ++ * allocation, or NULL if it has been freed. ++ */ ++ struct kbase_va_region *reg; + -+extern int mali_max_pp_cores_group_1; -+module_param(mali_max_pp_cores_group_1, int, S_IRUSR | S_IRGRP | S_IROTH); -+MODULE_PARM_DESC(mali_max_pp_cores_group_1, "Limit the number of PP cores to use from first PP group."); ++ /* type of buffer */ ++ enum kbase_memory_type type; + -+extern int mali_max_pp_cores_group_2; -+module_param(mali_max_pp_cores_group_2, int, S_IRUSR | S_IRGRP | S_IROTH); -+MODULE_PARM_DESC(mali_max_pp_cores_group_2, "Limit the number of PP cores to use from second PP group (Mali-450 only)."); ++ unsigned long properties; + -+extern unsigned int mali_mem_swap_out_threshold_value; -+module_param(mali_mem_swap_out_threshold_value, uint, S_IRUSR | S_IRGRP | S_IROTH); -+MODULE_PARM_DESC(mali_mem_swap_out_threshold_value, "Threshold value used to limit how much swappable memory cached in Mali driver."); ++ /* member in union valid based on @a type */ ++ union { ++#ifdef CONFIG_UMP ++ ump_dd_handle ump_handle; ++#endif /* CONFIG_UMP */ ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++ struct { ++ struct dma_buf *dma_buf; ++ struct dma_buf_attachment *dma_attachment; ++ unsigned int current_mapping_usage_count; ++ struct sg_table *sgt; ++ } umm; ++#endif /* defined(CONFIG_DMA_SHARED_BUFFER) */ ++ struct { ++ u64 stride; ++ size_t nents; ++ struct kbase_aliased *aliased; ++ } alias; ++ /* Used by type = (KBASE_MEM_TYPE_NATIVE, KBASE_MEM_TYPE_TB) */ ++ struct kbase_context *kctx; ++ struct kbase_alloc_import_user_buf { ++ unsigned long address; ++ unsigned long size; ++ unsigned long nr_pages; ++ struct page **pages; ++ /* top bit (1<<31) of current_mapping_usage_count ++ * specifies that this import was pinned on import ++ * See PINNED_ON_IMPORT ++ */ ++ u32 current_mapping_usage_count; ++ struct mm_struct *mm; ++ dma_addr_t *dma_addrs; ++ } user_buf; ++ } imported; ++}; + -+#if defined(CONFIG_MALI_DVFS) -+/** the max fps the same as display vsync default 60, can set by module insert parameter */ -+extern int mali_max_system_fps; -+module_param(mali_max_system_fps, int, S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP | S_IROTH); -+MODULE_PARM_DESC(mali_max_system_fps, "Max system fps the same as display VSYNC."); ++/* The top bit of kbase_alloc_import_user_buf::current_mapping_usage_count is ++ * used to signify that a buffer was pinned when it was imported. Since the ++ * reference count is limited by the number of atoms that can be submitted at ++ * once there should be no danger of overflowing into this bit. ++ * Stealing the top bit also has the benefit that ++ * current_mapping_usage_count != 0 if and only if the buffer is mapped. ++ */ ++#define PINNED_ON_IMPORT (1<<31) + -+/** a lower limit on their desired FPS default 58, can set by module insert parameter*/ -+extern int mali_desired_fps; -+module_param(mali_desired_fps, int, S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP | S_IROTH); -+MODULE_PARM_DESC(mali_desired_fps, "A bit lower than max_system_fps which user desired fps"); -+#endif ++static inline void kbase_mem_phy_alloc_gpu_mapped(struct kbase_mem_phy_alloc *alloc) ++{ ++ KBASE_DEBUG_ASSERT(alloc); ++ /* we only track mappings of NATIVE buffers */ ++ if (alloc->type == KBASE_MEM_TYPE_NATIVE) ++ atomic_inc(&alloc->gpu_mappings); ++} + -+#if MALI_ENABLE_CPU_CYCLES -+#include -+#include -+#include -+static struct timer_list mali_init_cpu_clock_timers[8]; -+static u32 mali_cpu_clock_last_value[8] = {0,}; -+#endif ++static inline void kbase_mem_phy_alloc_gpu_unmapped(struct kbase_mem_phy_alloc *alloc) ++{ ++ KBASE_DEBUG_ASSERT(alloc); ++ /* we only track mappings of NATIVE buffers */ ++ if (alloc->type == KBASE_MEM_TYPE_NATIVE) ++ if (0 > atomic_dec_return(&alloc->gpu_mappings)) { ++ pr_err("Mismatched %s:\n", __func__); ++ dump_stack(); ++ } ++} + -+/* Export symbols from common code: mali_user_settings.c */ -+#include "mali_user_settings_db.h" -+EXPORT_SYMBOL(mali_set_user_setting); -+EXPORT_SYMBOL(mali_get_user_setting); ++void kbase_mem_kref_free(struct kref *kref); + -+static char mali_dev_name[] = "mali"; /* should be const, but the functions we call requires non-cost */ ++int kbase_mem_init(struct kbase_device *kbdev); ++void kbase_mem_halt(struct kbase_device *kbdev); ++void kbase_mem_term(struct kbase_device *kbdev); + -+/* This driver only supports one Mali device, and this variable stores this single platform device */ -+struct platform_device *mali_platform_device = NULL; ++static inline struct kbase_mem_phy_alloc *kbase_mem_phy_alloc_get(struct kbase_mem_phy_alloc *alloc) ++{ ++ kref_get(&alloc->kref); ++ return alloc; ++} + -+/* This driver only supports one Mali device, and this variable stores the exposed misc device (/dev/mali) */ -+static struct miscdevice mali_miscdevice = { 0, }; ++static inline struct kbase_mem_phy_alloc *kbase_mem_phy_alloc_put(struct kbase_mem_phy_alloc *alloc) ++{ ++ kref_put(&alloc->kref, kbase_mem_kref_free); ++ return NULL; ++} + -+static int mali_miscdevice_register(struct platform_device *pdev); -+static void mali_miscdevice_unregister(void); ++/** ++ * A GPU memory region, and attributes for CPU mappings. ++ */ ++struct kbase_va_region { ++ struct rb_node rblink; ++ struct list_head link; + -+static int mali_open(struct inode *inode, struct file *filp); -+static int mali_release(struct inode *inode, struct file *filp); -+static long mali_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); ++ struct kbase_context *kctx; /* Backlink to base context */ + -+static int mali_probe(struct platform_device *pdev); -+static int mali_remove(struct platform_device *pdev); ++ u64 start_pfn; /* The PFN in GPU space */ ++ size_t nr_pages; + -+static int mali_driver_suspend_scheduler(struct device *dev); -+static int mali_driver_resume_scheduler(struct device *dev); ++/* Free region */ ++#define KBASE_REG_FREE (1ul << 0) ++/* CPU write access */ ++#define KBASE_REG_CPU_WR (1ul << 1) ++/* GPU write access */ ++#define KBASE_REG_GPU_WR (1ul << 2) ++/* No eXecute flag */ ++#define KBASE_REG_GPU_NX (1ul << 3) ++/* Is CPU cached? */ ++#define KBASE_REG_CPU_CACHED (1ul << 4) ++/* Is GPU cached? */ ++#define KBASE_REG_GPU_CACHED (1ul << 5) + -+#ifdef CONFIG_PM_RUNTIME -+static int mali_driver_runtime_suspend(struct device *dev); -+static int mali_driver_runtime_resume(struct device *dev); -+static int mali_driver_runtime_idle(struct device *dev); -+#endif ++#define KBASE_REG_GROWABLE (1ul << 6) ++/* Can grow on pf? */ ++#define KBASE_REG_PF_GROW (1ul << 7) + -+#if defined(MALI_FAKE_PLATFORM_DEVICE) -+#if defined(CONFIG_MALI_DT) -+extern int mali_platform_device_init(struct platform_device *device); -+extern int mali_platform_device_deinit(struct platform_device *device); -+#else -+extern int mali_platform_device_register(void); -+extern int mali_platform_device_unregister(void); -+#endif -+#endif ++/* VA managed by us */ ++#define KBASE_REG_CUSTOM_VA (1ul << 8) + -+extern int rk_platform_init_opp_table(struct device *dev); ++/* inner shareable coherency */ ++#define KBASE_REG_SHARE_IN (1ul << 9) ++/* inner & outer shareable coherency */ ++#define KBASE_REG_SHARE_BOTH (1ul << 10) + -+/* Linux power management operations provided by the Mali device driver */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)) -+struct pm_ext_ops mali_dev_ext_pm_ops = { -+ .base = -+ { -+ .suspend = mali_driver_suspend_scheduler, -+ .resume = mali_driver_resume_scheduler, -+ .freeze = mali_driver_suspend_scheduler, -+ .thaw = mali_driver_resume_scheduler, -+ }, -+}; -+#else -+static const struct dev_pm_ops mali_dev_pm_ops = { -+#ifdef CONFIG_PM_RUNTIME -+ .runtime_suspend = mali_driver_runtime_suspend, -+ .runtime_resume = mali_driver_runtime_resume, -+ .runtime_idle = mali_driver_runtime_idle, -+#endif -+ .suspend = mali_driver_suspend_scheduler, -+ .resume = mali_driver_resume_scheduler, -+ .freeze = mali_driver_suspend_scheduler, -+ .thaw = mali_driver_resume_scheduler, -+ .poweroff = mali_driver_suspend_scheduler, -+}; -+#endif ++/* Space for 4 different zones */ ++#define KBASE_REG_ZONE_MASK (3ul << 11) ++#define KBASE_REG_ZONE(x) (((x) & 3) << 11) + -+#ifdef CONFIG_MALI_DT -+static struct of_device_id base_dt_ids[] = { -+ {.compatible = "arm,mali-300"}, -+ /*-------------------------------------------------------*/ -+ /* rk_ext : to use dts_for_mali_ko_befor_r5p0-01rel0. */ -+ // {.compatible = "arm,mali-400"}, -+ {.compatible = "arm,mali400"}, -+ /*-------------------------------------------------------*/ -+ {.compatible = "arm,mali-450"}, -+ {.compatible = "arm,mali-470"}, -+ {}, -+}; ++/* GPU read access */ ++#define KBASE_REG_GPU_RD (1ul<<13) ++/* CPU read access */ ++#define KBASE_REG_CPU_RD (1ul<<14) + -+MODULE_DEVICE_TABLE(of, base_dt_ids); -+#endif ++/* Index of chosen MEMATTR for this region (0..7) */ ++#define KBASE_REG_MEMATTR_MASK (7ul << 16) ++#define KBASE_REG_MEMATTR_INDEX(x) (((x) & 7) << 16) ++#define KBASE_REG_MEMATTR_VALUE(x) (((x) & KBASE_REG_MEMATTR_MASK) >> 16) + -+/* The Mali device driver struct */ -+static struct platform_driver mali_platform_driver = { -+ .probe = mali_probe, -+ .remove = mali_remove, -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)) -+ .pm = &mali_dev_ext_pm_ops, -+#endif -+ .driver = -+ { -+ .name = MALI_GPU_NAME_UTGARD, -+ .owner = THIS_MODULE, -+ .bus = &platform_bus_type, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)) -+ .pm = &mali_dev_pm_ops, -+#endif -+#ifdef CONFIG_MALI_DT -+ .of_match_table = of_match_ptr(base_dt_ids), -+#endif -+ }, -+}; ++#define KBASE_REG_SECURE (1ul << 19) + -+/* Linux misc device operations (/dev/mali) */ -+struct file_operations mali_fops = { -+ .owner = THIS_MODULE, -+ .open = mali_open, -+ .release = mali_release, -+ .unlocked_ioctl = mali_ioctl, -+ .compat_ioctl = mali_ioctl, -+ .mmap = mali_mmap -+}; ++#define KBASE_REG_DONT_NEED (1ul << 20) + -+#if MALI_ENABLE_CPU_CYCLES -+void mali_init_cpu_time_counters(int reset, int enable_divide_by_64) -+{ -+ /* The CPU assembly reference used is: ARM Architecture Reference Manual ARMv7-AR C.b */ -+ u32 write_value; ++/* Imported buffer is padded? */ ++#define KBASE_REG_IMPORT_PAD (1ul << 21) + -+ /* See B4.1.116 PMCNTENSET, Performance Monitors Count Enable Set register, VMSA */ -+ /* setting p15 c9 c12 1 to 0x8000000f==CPU_CYCLE_ENABLE |EVENT_3_ENABLE|EVENT_2_ENABLE|EVENT_1_ENABLE|EVENT_0_ENABLE */ -+ asm volatile("mcr p15, 0, %0, c9, c12, 1" :: "r"(0x8000000f)); ++#define KBASE_REG_ZONE_SAME_VA KBASE_REG_ZONE(0) + ++/* only used with 32-bit clients */ ++/* ++ * On a 32bit platform, custom VA should be wired from (4GB + shader region) ++ * to the VA limit of the GPU. Unfortunately, the Linux mmap() interface ++ * limits us to 2^32 pages (2^44 bytes, see mmap64 man page for reference). ++ * So we put the default limit to the maximum possible on Linux and shrink ++ * it down, if required by the GPU, during initialization. ++ */ + -+ /* See B4.1.117 PMCR, Performance Monitors Control Register. Writing to p15, c9, c12, 0 */ -+ write_value = 1 << 0; /* Bit 0 set. Enable counters */ -+ if (reset) { -+ write_value |= 1 << 1; /* Reset event counters */ -+ write_value |= 1 << 2; /* Reset cycle counter */ -+ } -+ if (enable_divide_by_64) { -+ write_value |= 1 << 3; /* Enable the Clock divider by 64 */ -+ } -+ write_value |= 1 << 4; /* Export enable. Not needed */ -+ asm volatile("MCR p15, 0, %0, c9, c12, 0\t\n" :: "r"(write_value)); ++/* ++ * Dedicated 16MB region for shader code: ++ * VA range 0x101000000-0x102000000 ++ */ ++#define KBASE_REG_ZONE_EXEC KBASE_REG_ZONE(1) ++#define KBASE_REG_ZONE_EXEC_BASE (0x101000000ULL >> PAGE_SHIFT) ++#define KBASE_REG_ZONE_EXEC_SIZE ((16ULL * 1024 * 1024) >> PAGE_SHIFT) + -+ /* PMOVSR Overflow Flag Status Register - Clear Clock and Event overflows */ -+ asm volatile("MCR p15, 0, %0, c9, c12, 3\t\n" :: "r"(0x8000000f)); ++#define KBASE_REG_ZONE_CUSTOM_VA KBASE_REG_ZONE(2) ++#define KBASE_REG_ZONE_CUSTOM_VA_BASE (KBASE_REG_ZONE_EXEC_BASE + KBASE_REG_ZONE_EXEC_SIZE) /* Starting after KBASE_REG_ZONE_EXEC */ ++#define KBASE_REG_ZONE_CUSTOM_VA_SIZE (((1ULL << 44) >> PAGE_SHIFT) - KBASE_REG_ZONE_CUSTOM_VA_BASE) ++/* end 32-bit clients only */ + ++ unsigned long flags; + -+ /* See B4.1.124 PMUSERENR - setting p15 c9 c14 to 1" */ -+ /* User mode access to the Performance Monitors enabled. */ -+ /* Lets User space read cpu clock cycles */ -+ asm volatile("mcr p15, 0, %0, c9, c14, 0" :: "r"(1)); -+} ++ size_t extent; /* nr of pages alloc'd on PF */ + -+/** A timer function that configures the cycle clock counter on current CPU. -+ * The function \a mali_init_cpu_time_counters_on_all_cpus sets up this -+ * function to trigger on all Cpus during module load. -+ */ -+static void mali_init_cpu_clock_timer_func(unsigned long data) -+{ -+ int reset_counters, enable_divide_clock_counter_by_64; -+ int current_cpu = raw_smp_processor_id(); -+ unsigned int sample0; -+ unsigned int sample1; ++ struct kbase_mem_phy_alloc *cpu_alloc; /* the one alloc object we mmap to the CPU when mapping this region */ ++ struct kbase_mem_phy_alloc *gpu_alloc; /* the one alloc object we mmap to the GPU when mapping this region */ + -+ MALI_IGNORE(data); ++ /* non-NULL if this memory object is a kds_resource */ ++ struct kds_resource *kds_res; + -+ reset_counters = 1; -+ enable_divide_clock_counter_by_64 = 0; -+ mali_init_cpu_time_counters(reset_counters, enable_divide_clock_counter_by_64); ++ /* List head used to store the region in the JIT allocation pool */ ++ struct list_head jit_node; ++}; + -+ sample0 = mali_get_cpu_cyclecount(); -+ sample1 = mali_get_cpu_cyclecount(); ++/* Common functions */ ++static inline phys_addr_t *kbase_get_cpu_phy_pages(struct kbase_va_region *reg) ++{ ++ KBASE_DEBUG_ASSERT(reg); ++ KBASE_DEBUG_ASSERT(reg->cpu_alloc); ++ KBASE_DEBUG_ASSERT(reg->gpu_alloc); ++ KBASE_DEBUG_ASSERT(reg->cpu_alloc->nents == reg->gpu_alloc->nents); + -+ MALI_DEBUG_PRINT(3, ("Init Cpu %d cycle counter- First two samples: %08x %08x \n", current_cpu, sample0, sample1)); ++ return reg->cpu_alloc->pages; +} + -+/** A timer functions for storing current time on all cpus. -+ * Used for checking if the clocks have similar values or if they are drifting. -+ */ -+static void mali_print_cpu_clock_timer_func(unsigned long data) ++static inline phys_addr_t *kbase_get_gpu_phy_pages(struct kbase_va_region *reg) +{ -+ int current_cpu = raw_smp_processor_id(); -+ unsigned int sample0; ++ KBASE_DEBUG_ASSERT(reg); ++ KBASE_DEBUG_ASSERT(reg->cpu_alloc); ++ KBASE_DEBUG_ASSERT(reg->gpu_alloc); ++ KBASE_DEBUG_ASSERT(reg->cpu_alloc->nents == reg->gpu_alloc->nents); + -+ MALI_IGNORE(data); -+ sample0 = mali_get_cpu_cyclecount(); -+ if (current_cpu < 8) { -+ mali_cpu_clock_last_value[current_cpu] = sample0; -+ } ++ return reg->gpu_alloc->pages; +} + -+/** Init the performance registers on all CPUs to count clock cycles. -+ * For init \a print_only should be 0. -+ * If \a print_only is 1, it will intead print the current clock value of all CPUs. -+ */ -+void mali_init_cpu_time_counters_on_all_cpus(int print_only) ++static inline size_t kbase_reg_current_backed_size(struct kbase_va_region *reg) +{ -+ int i = 0; -+ int cpu_number; -+ int jiffies_trigger; -+ int jiffies_wait; ++ KBASE_DEBUG_ASSERT(reg); ++ /* if no alloc object the backed size naturally is 0 */ ++ if (!reg->cpu_alloc) ++ return 0; + -+ jiffies_wait = 2; -+ jiffies_trigger = jiffies + jiffies_wait; ++ KBASE_DEBUG_ASSERT(reg->cpu_alloc); ++ KBASE_DEBUG_ASSERT(reg->gpu_alloc); ++ KBASE_DEBUG_ASSERT(reg->cpu_alloc->nents == reg->gpu_alloc->nents); + -+ for (i = 0 ; i < 8 ; i++) { -+ init_timer(&mali_init_cpu_clock_timers[i]); -+ if (print_only) mali_init_cpu_clock_timers[i].function = mali_print_cpu_clock_timer_func; -+ else mali_init_cpu_clock_timers[i].function = mali_init_cpu_clock_timer_func; -+ mali_init_cpu_clock_timers[i].expires = jiffies_trigger ; -+ } -+ cpu_number = cpumask_first(cpu_online_mask); -+ for (i = 0 ; i < 8 ; i++) { -+ int next_cpu; -+ add_timer_on(&mali_init_cpu_clock_timers[i], cpu_number); -+ next_cpu = cpumask_next(cpu_number, cpu_online_mask); -+ if (next_cpu >= nr_cpu_ids) break; -+ cpu_number = next_cpu; -+ } ++ return reg->cpu_alloc->nents; ++} + -+ while (jiffies_wait) jiffies_wait = schedule_timeout_uninterruptible(jiffies_wait); ++#define KBASE_MEM_PHY_ALLOC_LARGE_THRESHOLD ((size_t)(4*1024)) /* size above which vmalloc is used over kmalloc */ + -+ for (i = 0 ; i < 8 ; i++) { -+ del_timer_sync(&mali_init_cpu_clock_timers[i]); -+ } ++static inline struct kbase_mem_phy_alloc *kbase_alloc_create(size_t nr_pages, enum kbase_memory_type type) ++{ ++ struct kbase_mem_phy_alloc *alloc; ++ size_t alloc_size = sizeof(*alloc) + sizeof(*alloc->pages) * nr_pages; ++ size_t per_page_size = sizeof(*alloc->pages); + -+ if (print_only) { -+ if ((0 == mali_cpu_clock_last_value[2]) && (0 == mali_cpu_clock_last_value[3])) { -+ /* Diff can be printed if we want to check if the clocks are in sync -+ int diff = mali_cpu_clock_last_value[0] - mali_cpu_clock_last_value[1];*/ -+ MALI_DEBUG_PRINT(2, ("CPU cycle counters readout all: %08x %08x\n", mali_cpu_clock_last_value[0], mali_cpu_clock_last_value[1])); -+ } else { -+ MALI_DEBUG_PRINT(2, ("CPU cycle counters readout all: %08x %08x %08x %08x\n", mali_cpu_clock_last_value[0], mali_cpu_clock_last_value[1], mali_cpu_clock_last_value[2], mali_cpu_clock_last_value[3])); -+ } ++ /* Imported pages may have page private data already in use */ ++ if (type == KBASE_MEM_TYPE_IMPORTED_USER_BUF) { ++ alloc_size += nr_pages * ++ sizeof(*alloc->imported.user_buf.dma_addrs); ++ per_page_size += sizeof(*alloc->imported.user_buf.dma_addrs); + } -+} -+#endif + -+int mali_module_init(void) -+{ -+ int err = 0; ++ /* ++ * Prevent nr_pages*per_page_size + sizeof(*alloc) from ++ * wrapping around. ++ */ ++ if (nr_pages > ((((size_t) -1) - sizeof(*alloc)) ++ / per_page_size)) ++ return ERR_PTR(-ENOMEM); + -+ MALI_DEBUG_PRINT(2, ("Inserting Mali v%d device driver. \n", _MALI_API_VERSION)); -+ MALI_DEBUG_PRINT(2, ("Compiled: %s, time: %s.\n", __DATE__, __TIME__)); -+ MALI_DEBUG_PRINT(2, ("Driver revision: %s\n", SVN_REV_STRING)); -+ -+ I("svn_rev_string_from_arm of this mali_ko is '%s', rk_ko_ver is '%d', built at '%s', on '%s'.", -+ SVN_REV_STRING, -+ RK_KO_VER, -+ __TIME__, -+ __DATE__); ++ /* Allocate based on the size to reduce internal fragmentation of vmem */ ++ if (alloc_size > KBASE_MEM_PHY_ALLOC_LARGE_THRESHOLD) ++ alloc = vzalloc(alloc_size); ++ else ++ alloc = kzalloc(alloc_size, GFP_KERNEL); + -+#if MALI_ENABLE_CPU_CYCLES -+ mali_init_cpu_time_counters_on_all_cpus(0); -+ MALI_DEBUG_PRINT(2, ("CPU cycle counter setup complete\n")); -+ /* Printing the current cpu counters */ -+ mali_init_cpu_time_counters_on_all_cpus(1); -+#endif ++ if (!alloc) ++ return ERR_PTR(-ENOMEM); + -+ /* Initialize module wide settings */ -+#ifdef MALI_FAKE_PLATFORM_DEVICE -+#ifndef CONFIG_MALI_DT -+ MALI_DEBUG_PRINT(2, ("mali_module_init() registering device\n")); -+ err = mali_platform_device_register(); -+ if (0 != err) { -+ return err; -+ } -+#endif -+#endif ++ /* Store allocation method */ ++ if (alloc_size > KBASE_MEM_PHY_ALLOC_LARGE_THRESHOLD) ++ alloc->properties |= KBASE_MEM_PHY_ALLOC_LARGE; + -+ MALI_DEBUG_PRINT(2, ("mali_module_init() registering driver\n")); ++ kref_init(&alloc->kref); ++ atomic_set(&alloc->gpu_mappings, 0); ++ alloc->nents = 0; ++ alloc->pages = (void *)(alloc + 1); ++ INIT_LIST_HEAD(&alloc->mappings); ++ alloc->type = type; + -+ err = platform_driver_register(&mali_platform_driver); ++ if (type == KBASE_MEM_TYPE_IMPORTED_USER_BUF) ++ alloc->imported.user_buf.dma_addrs = ++ (void *) (alloc->pages + nr_pages); + -+ if (0 != err) { -+ MALI_DEBUG_PRINT(2, ("mali_module_init() Failed to register driver (%d)\n", err)); -+#ifdef MALI_FAKE_PLATFORM_DEVICE -+#ifndef CONFIG_MALI_DT -+ mali_platform_device_unregister(); -+#endif -+#endif -+ mali_platform_device = NULL; -+ return err; -+ } ++ return alloc; ++} + -+#if defined(CONFIG_MALI400_INTERNAL_PROFILING) -+ err = _mali_internal_profiling_init(mali_boot_profiling ? MALI_TRUE : MALI_FALSE); -+ if (0 != err) { -+ /* No biggie if we wheren't able to initialize the profiling */ -+ MALI_PRINT_ERROR(("Failed to initialize profiling, feature will be unavailable\n")); -+ } -+#endif ++static inline int kbase_reg_prepare_native(struct kbase_va_region *reg, ++ struct kbase_context *kctx) ++{ ++ KBASE_DEBUG_ASSERT(reg); ++ KBASE_DEBUG_ASSERT(!reg->cpu_alloc); ++ KBASE_DEBUG_ASSERT(!reg->gpu_alloc); ++ KBASE_DEBUG_ASSERT(reg->flags & KBASE_REG_FREE); + -+ /* Tracing the current frequency and voltage from boot/insmod*/ -+#if defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_MALI_DVFS) -+ /* Just call mali_get_current_gpu_clk_item(),to record current clk info.*/ -+ mali_get_current_gpu_clk_item(&mali_gpu_clk[0]); -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_EVENT_CHANNEL_GPU | -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, -+ mali_gpu_clk[0].clock, -+ mali_gpu_clk[0].vol / 1000, -+ 0, 0, 0); -+#endif ++ reg->cpu_alloc = kbase_alloc_create(reg->nr_pages, ++ KBASE_MEM_TYPE_NATIVE); ++ if (IS_ERR(reg->cpu_alloc)) ++ return PTR_ERR(reg->cpu_alloc); ++ else if (!reg->cpu_alloc) ++ return -ENOMEM; ++ reg->cpu_alloc->imported.kctx = kctx; ++ INIT_LIST_HEAD(®->cpu_alloc->evict_node); ++ if (kbase_ctx_flag(kctx, KCTX_INFINITE_CACHE) ++ && (reg->flags & KBASE_REG_CPU_CACHED)) { ++ reg->gpu_alloc = kbase_alloc_create(reg->nr_pages, ++ KBASE_MEM_TYPE_NATIVE); ++ reg->gpu_alloc->imported.kctx = kctx; ++ INIT_LIST_HEAD(®->gpu_alloc->evict_node); ++ } else { ++ reg->gpu_alloc = kbase_mem_phy_alloc_get(reg->cpu_alloc); ++ } + -+ MALI_PRINT(("Mali device driver loaded\n")); ++ INIT_LIST_HEAD(®->jit_node); ++ reg->flags &= ~KBASE_REG_FREE; ++ return 0; ++} + -+ return 0; /* Success */ ++static inline int kbase_atomic_add_pages(int num_pages, atomic_t *used_pages) ++{ ++ int new_val = atomic_add_return(num_pages, used_pages); ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++ kbase_trace_mali_total_alloc_pages_change((long long int)new_val); ++#endif ++ return new_val; +} + -+void mali_module_exit(void) ++static inline int kbase_atomic_sub_pages(int num_pages, atomic_t *used_pages) +{ -+ MALI_DEBUG_PRINT(2, ("Unloading Mali v%d device driver.\n", _MALI_API_VERSION)); ++ int new_val = atomic_sub_return(num_pages, used_pages); ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++ kbase_trace_mali_total_alloc_pages_change((long long int)new_val); ++#endif ++ return new_val; ++} + -+ MALI_DEBUG_PRINT(2, ("mali_module_exit() unregistering driver\n")); ++/* ++ * Max size for kbdev memory pool (in pages) ++ */ ++#define KBASE_MEM_POOL_MAX_SIZE_KBDEV (SZ_64M >> PAGE_SHIFT) + -+ platform_driver_unregister(&mali_platform_driver); ++/* ++ * Max size for kctx memory pool (in pages) ++ */ ++#define KBASE_MEM_POOL_MAX_SIZE_KCTX (SZ_64M >> PAGE_SHIFT) + -+#if defined(MALI_FAKE_PLATFORM_DEVICE) -+#ifndef CONFIG_MALI_DT -+ MALI_DEBUG_PRINT(2, ("mali_module_exit() unregistering device\n")); -+ mali_platform_device_unregister(); -+#endif -+#endif ++/** ++ * kbase_mem_pool_init - Create a memory pool for a kbase device ++ * @pool: Memory pool to initialize ++ * @max_size: Maximum number of free pages the pool can hold ++ * @kbdev: Kbase device where memory is used ++ * @next_pool: Pointer to the next pool or NULL. ++ * ++ * Allocations from @pool are in whole pages. Each @pool has a free list where ++ * pages can be quickly allocated from. The free list is initially empty and ++ * filled whenever pages are freed back to the pool. The number of free pages ++ * in the pool will in general not exceed @max_size, but the pool may in ++ * certain corner cases grow above @max_size. ++ * ++ * If @next_pool is not NULL, we will allocate from @next_pool before going to ++ * the kernel allocator. Similarily pages can spill over to @next_pool when ++ * @pool is full. Pages are zeroed before they spill over to another pool, to ++ * prevent leaking information between applications. ++ * ++ * A shrinker is registered so that Linux mm can reclaim pages from the pool as ++ * needed. ++ * ++ * Return: 0 on success, negative -errno on error ++ */ ++int kbase_mem_pool_init(struct kbase_mem_pool *pool, ++ size_t max_size, ++ struct kbase_device *kbdev, ++ struct kbase_mem_pool *next_pool); + -+ /* Tracing the current frequency and voltage from rmmod*/ -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_EVENT_CHANNEL_GPU | -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, -+ 0, -+ 0, -+ 0, 0, 0); ++/** ++ * kbase_mem_pool_term - Destroy a memory pool ++ * @pool: Memory pool to destroy ++ * ++ * Pages in the pool will spill over to @next_pool (if available) or freed to ++ * the kernel. ++ */ ++void kbase_mem_pool_term(struct kbase_mem_pool *pool); + -+#if defined(CONFIG_MALI400_INTERNAL_PROFILING) -+ _mali_internal_profiling_term(); -+#endif ++/** ++ * kbase_mem_pool_alloc - Allocate a page from memory pool ++ * @pool: Memory pool to allocate from ++ * ++ * Allocations from the pool are made as follows: ++ * 1. If there are free pages in the pool, allocate a page from @pool. ++ * 2. Otherwise, if @next_pool is not NULL and has free pages, allocate a page ++ * from @next_pool. ++ * 3. Return NULL if no memory in the pool ++ * ++ * Return: Pointer to allocated page, or NULL if allocation failed. ++ */ ++struct page *kbase_mem_pool_alloc(struct kbase_mem_pool *pool); + -+ MALI_PRINT(("Mali device driver unloaded\n")); -+} ++/** ++ * kbase_mem_pool_free - Free a page to memory pool ++ * @pool: Memory pool where page should be freed ++ * @page: Page to free to the pool ++ * @dirty: Whether some of the page may be dirty in the cache. ++ * ++ * Pages are freed to the pool as follows: ++ * 1. If @pool is not full, add @page to @pool. ++ * 2. Otherwise, if @next_pool is not NULL and not full, add @page to ++ * @next_pool. ++ * 3. Finally, free @page to the kernel. ++ */ ++void kbase_mem_pool_free(struct kbase_mem_pool *pool, struct page *page, ++ bool dirty); + -+#ifdef CONFIG_MALI_DEVFREQ -+struct mali_device *mali_device_alloc(void) ++/** ++ * kbase_mem_pool_alloc_pages - Allocate pages from memory pool ++ * @pool: Memory pool to allocate from ++ * @nr_pages: Number of pages to allocate ++ * @pages: Pointer to array where the physical address of the allocated ++ * pages will be stored. ++ * ++ * Like kbase_mem_pool_alloc() but optimized for allocating many pages. ++ * ++ * Return: 0 on success, negative -errno on error ++ */ ++int kbase_mem_pool_alloc_pages(struct kbase_mem_pool *pool, size_t nr_pages, ++ phys_addr_t *pages); ++ ++/** ++ * kbase_mem_pool_free_pages - Free pages to memory pool ++ * @pool: Memory pool where pages should be freed ++ * @nr_pages: Number of pages to free ++ * @pages: Pointer to array holding the physical addresses of the pages to ++ * free. ++ * @dirty: Whether any pages may be dirty in the cache. ++ * @reclaimed: Whether the pages where reclaimable and thus should bypass ++ * the pool and go straight to the kernel. ++ * ++ * Like kbase_mem_pool_free() but optimized for freeing many pages. ++ */ ++void kbase_mem_pool_free_pages(struct kbase_mem_pool *pool, size_t nr_pages, ++ phys_addr_t *pages, bool dirty, bool reclaimed); ++ ++/** ++ * kbase_mem_pool_size - Get number of free pages in memory pool ++ * @pool: Memory pool to inspect ++ * ++ * Note: the size of the pool may in certain corner cases exceed @max_size! ++ * ++ * Return: Number of free pages in the pool ++ */ ++static inline size_t kbase_mem_pool_size(struct kbase_mem_pool *pool) +{ -+ return kzalloc(sizeof(struct mali_device), GFP_KERNEL); ++ return READ_ONCE(pool->cur_size); +} + -+void mali_device_free(struct mali_device *mdev) ++/** ++ * kbase_mem_pool_max_size - Get maximum number of free pages in memory pool ++ * @pool: Memory pool to inspect ++ * ++ * Return: Maximum number of free pages in the pool ++ */ ++static inline size_t kbase_mem_pool_max_size(struct kbase_mem_pool *pool) +{ -+ kfree(mdev); ++ return pool->max_size; +} -+#endif + -+static int mali_probe(struct platform_device *pdev) -+{ -+ int err; -+#ifdef CONFIG_MALI_DEVFREQ -+ struct mali_device *mdev; -+#endif + -+ MALI_DEBUG_PRINT(2, ("mali_probe(): Called for platform device %s\n", pdev->name)); ++/** ++ * kbase_mem_pool_set_max_size - Set maximum number of free pages in memory pool ++ * @pool: Memory pool to inspect ++ * @max_size: Maximum number of free pages the pool can hold ++ * ++ * If @max_size is reduced, the pool will be shrunk to adhere to the new limit. ++ * For details see kbase_mem_pool_shrink(). ++ */ ++void kbase_mem_pool_set_max_size(struct kbase_mem_pool *pool, size_t max_size); + -+ if (NULL != mali_platform_device) { -+ /* Already connected to a device, return error */ -+ MALI_PRINT_ERROR(("mali_probe(): The Mali driver is already connected with a Mali device.")); -+ return -EEXIST; -+ } ++/** ++ * kbase_mem_pool_grow - Grow the pool ++ * @pool: Memory pool to grow ++ * @nr_to_grow: Number of pages to add to the pool ++ * ++ * Adds @nr_to_grow pages to the pool. Note that this may cause the pool to ++ * become larger than the maximum size specified. ++ * ++ * Returns: 0 on success, -ENOMEM if unable to allocate sufficent pages ++ */ ++int kbase_mem_pool_grow(struct kbase_mem_pool *pool, size_t nr_to_grow); + -+ mali_platform_device = pdev; ++/** ++ * kbase_mem_pool_trim - Grow or shrink the pool to a new size ++ * @pool: Memory pool to trim ++ * @new_size: New number of pages in the pool ++ * ++ * If @new_size > @cur_size, fill the pool with new pages from the kernel, but ++ * not above the max_size for the pool. ++ * If @new_size < @cur_size, shrink the pool by freeing pages to the kernel. ++ */ ++void kbase_mem_pool_trim(struct kbase_mem_pool *pool, size_t new_size); + -+ dev_info(&pdev->dev, "mali_platform_device->num_resources = %d\n", -+ mali_platform_device->num_resources); -+ -+ { -+ int i = 0; ++/* ++ * kbase_mem_alloc_page - Allocate a new page for a device ++ * @kbdev: The kbase device ++ * ++ * Most uses should use kbase_mem_pool_alloc to allocate a page. However that ++ * function can fail in the event the pool is empty. ++ * ++ * Return: A new page or NULL if no memory ++ */ ++struct page *kbase_mem_alloc_page(struct kbase_device *kbdev); + -+ for(i = 0; i < mali_platform_device->num_resources; i++) -+ dev_info(&pdev->dev, -+ "resource[%d].start = 0x%pa\n", -+ i, -+ &mali_platform_device->resource[i].start); -+ } ++int kbase_region_tracker_init(struct kbase_context *kctx); ++int kbase_region_tracker_init_jit(struct kbase_context *kctx, u64 jit_va_pages); ++void kbase_region_tracker_term(struct kbase_context *kctx); + -+#ifdef CONFIG_MALI_DT -+ /* If we use DT to initialize our DDK, we have to prepare somethings. */ -+ err = mali_platform_device_init(mali_platform_device); -+ if (0 != err) { -+ MALI_PRINT_ERROR(("mali_probe(): Failed to initialize platform device.")); -+ mali_platform_device = NULL; -+ return -EFAULT; -+ } -+#endif ++struct kbase_va_region *kbase_region_tracker_find_region_enclosing_address(struct kbase_context *kctx, u64 gpu_addr); + -+#ifdef CONFIG_MALI_DEVFREQ -+ mdev = mali_device_alloc(); -+ if (!mdev) { -+ MALI_PRINT_ERROR(("Can't allocate mali device private data\n")); -+ return -ENOMEM; -+ } ++/** ++ * @brief Check that a pointer is actually a valid region. ++ * ++ * Must be called with context lock held. ++ */ ++struct kbase_va_region *kbase_region_tracker_find_region_base_address(struct kbase_context *kctx, u64 gpu_addr); + -+ mdev->dev = &pdev->dev; -+ dev_set_drvdata(mdev->dev, mdev); ++struct kbase_va_region *kbase_alloc_free_region(struct kbase_context *kctx, u64 start_pfn, size_t nr_pages, int zone); ++void kbase_free_alloced_region(struct kbase_va_region *reg); ++int kbase_add_va_region(struct kbase_context *kctx, struct kbase_va_region *reg, u64 addr, size_t nr_pages, size_t align); + -+ /*Initilization clock and regulator*/ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) && defined(CONFIG_OF) \ -+ && defined(CONFIG_REGULATOR) -+ mdev->regulator = regulator_get_optional(mdev->dev, "mali"); -+ if (IS_ERR_OR_NULL(mdev->regulator)) { -+ MALI_DEBUG_PRINT(2, ("Continuing without Mali regulator control\n")); -+ mdev->regulator = NULL; -+ /* Allow probe to continue without regulator */ -+ } -+#endif /* LINUX_VERSION_CODE >= 3, 12, 0 */ ++bool kbase_check_alloc_flags(unsigned long flags); ++bool kbase_check_import_flags(unsigned long flags); + -+ err = rk_platform_init_opp_table(mdev->dev); -+ if (err) -+ MALI_DEBUG_PRINT(3, ("Failed to init_opp_table\n")); ++/** ++ * kbase_update_region_flags - Convert user space flags to kernel region flags ++ * ++ * @kctx: kbase context ++ * @reg: The region to update the flags on ++ * @flags: The flags passed from user space ++ * ++ * The user space flag BASE_MEM_COHERENT_SYSTEM_REQUIRED will be rejected and ++ * this function will fail if the system does not support system coherency. ++ * ++ * Return: 0 if successful, -EINVAL if the flags are not supported ++ */ ++int kbase_update_region_flags(struct kbase_context *kctx, ++ struct kbase_va_region *reg, unsigned long flags); + -+ /* Need to name the gpu clock "clk_mali" in the device tree */ -+ mdev->clock = clk_get(mdev->dev, "clk_mali"); -+ if (IS_ERR_OR_NULL(mdev->clock)) { -+ MALI_DEBUG_PRINT(2, ("Continuing without Mali clock control\n")); -+ mdev->clock = NULL; -+ /* Allow probe to continue without clock. */ -+ } else { -+ err = clk_prepare(mdev->clock); -+ if (err) { -+ MALI_PRINT_ERROR(("Failed to prepare clock (%d)\n", err)); -+ goto clock_prepare_failed; -+ } -+ } ++void kbase_gpu_vm_lock(struct kbase_context *kctx); ++void kbase_gpu_vm_unlock(struct kbase_context *kctx); + -+ /* initilize pm metrics related */ -+ if (mali_pm_metrics_init(mdev) < 0) { -+ MALI_DEBUG_PRINT(2, ("mali pm metrics init failed\n")); -+ goto pm_metrics_init_failed; -+ } ++int kbase_alloc_phy_pages(struct kbase_va_region *reg, size_t vsize, size_t size); + -+ if (mali_devfreq_init(mdev) < 0) { -+ MALI_DEBUG_PRINT(2, ("mali devfreq init failed\n")); -+ goto devfreq_init_failed; -+ } -+#endif ++int kbase_mmu_init(struct kbase_context *kctx); ++void kbase_mmu_term(struct kbase_context *kctx); + ++phys_addr_t kbase_mmu_alloc_pgd(struct kbase_context *kctx); ++void kbase_mmu_free_pgd(struct kbase_context *kctx); ++int kbase_mmu_insert_pages_no_flush(struct kbase_context *kctx, u64 vpfn, ++ phys_addr_t *phys, size_t nr, ++ unsigned long flags); ++int kbase_mmu_insert_pages(struct kbase_context *kctx, u64 vpfn, ++ phys_addr_t *phys, size_t nr, ++ unsigned long flags); ++int kbase_mmu_insert_single_page(struct kbase_context *kctx, u64 vpfn, ++ phys_addr_t phys, size_t nr, ++ unsigned long flags); + -+ if (_MALI_OSK_ERR_OK == _mali_osk_wq_init()) { -+ /* Initialize the Mali GPU HW specified by pdev */ -+ if (_MALI_OSK_ERR_OK == mali_initialize_subsystems()) { -+ /* Register a misc device (so we are accessible from user space) */ -+ err = mali_miscdevice_register(pdev); -+ if (0 == err) { -+ /* Setup sysfs entries */ -+ err = mali_sysfs_register(mali_dev_name); ++int kbase_mmu_teardown_pages(struct kbase_context *kctx, u64 vpfn, size_t nr); ++int kbase_mmu_update_pages(struct kbase_context *kctx, u64 vpfn, phys_addr_t *phys, size_t nr, unsigned long flags); + -+ if (0 == err) { -+ MALI_DEBUG_PRINT(2, ("mali_probe(): Successfully initialized driver for platform device %s\n", pdev->name)); ++/** ++ * @brief Register region and map it on the GPU. ++ * ++ * Call kbase_add_va_region() and map the region on the GPU. ++ */ ++int kbase_gpu_mmap(struct kbase_context *kctx, struct kbase_va_region *reg, u64 addr, size_t nr_pages, size_t align); + -+ return 0; -+ } else { -+ MALI_PRINT_ERROR(("mali_probe(): failed to register sysfs entries")); -+ } -+ mali_miscdevice_unregister(); -+ } else { -+ MALI_PRINT_ERROR(("mali_probe(): failed to register Mali misc device.")); -+ } -+ mali_terminate_subsystems(); -+ } else { -+ MALI_PRINT_ERROR(("mali_probe(): Failed to initialize Mali device driver.")); -+ } -+ _mali_osk_wq_term(); -+ } ++/** ++ * @brief Remove the region from the GPU and unregister it. ++ * ++ * Must be called with context lock held. ++ */ ++int kbase_gpu_munmap(struct kbase_context *kctx, struct kbase_va_region *reg); + -+#ifdef CONFIG_MALI_DEVFREQ -+ mali_devfreq_term(mdev); -+devfreq_init_failed: -+ mali_pm_metrics_term(mdev); -+pm_metrics_init_failed: -+ clk_unprepare(mdev->clock); -+clock_prepare_failed: -+ clk_put(mdev->clock); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && defined(CONFIG_OF) \ -+ && defined(CONFIG_PM_OPP) -+ dev_pm_opp_of_remove_table(mdev->dev); -+#endif ++/** ++ * The caller has the following locking conditions: ++ * - It must hold kbase_device->mmu_hw_mutex ++ * - It must hold the hwaccess_lock ++ */ ++void kbase_mmu_update(struct kbase_context *kctx); + -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) && defined(CONFIG_OF) \ -+ && defined(CONFIG_REGULATOR) -+ regulator_put(mdev->regulator); -+#endif /* LINUX_VERSION_CODE >= 3, 12, 0 */ -+ mali_device_free(mdev); -+#endif ++/** ++ * kbase_mmu_disable() - Disable the MMU for a previously active kbase context. ++ * @kctx: Kbase context ++ * ++ * Disable and perform the required cache maintenance to remove the all ++ * data from provided kbase context from the GPU caches. ++ * ++ * The caller has the following locking conditions: ++ * - It must hold kbase_device->mmu_hw_mutex ++ * - It must hold the hwaccess_lock ++ */ ++void kbase_mmu_disable(struct kbase_context *kctx); + -+#ifdef CONFIG_MALI_DT -+ mali_platform_device_deinit(mali_platform_device); -+#endif -+ mali_platform_device = NULL; -+ return -EFAULT; -+} ++/** ++ * kbase_mmu_disable_as() - Set the MMU to unmapped mode for the specified ++ * address space. ++ * @kbdev: Kbase device ++ * @as_nr: The address space number to set to unmapped. ++ * ++ * This function must only be called during reset/power-up and it used to ++ * ensure the registers are in a known state. ++ * ++ * The caller must hold kbdev->mmu_hw_mutex. ++ */ ++void kbase_mmu_disable_as(struct kbase_device *kbdev, int as_nr); + -+static int mali_remove(struct platform_device *pdev) -+{ -+#ifdef CONFIG_MALI_DEVFREQ -+ struct mali_device *mdev = dev_get_drvdata(&pdev->dev); -+#endif ++void kbase_mmu_interrupt(struct kbase_device *kbdev, u32 irq_stat); + -+ MALI_DEBUG_PRINT(2, ("mali_remove() called for platform device %s\n", pdev->name)); -+ mali_sysfs_unregister(); -+ mali_miscdevice_unregister(); -+ mali_terminate_subsystems(); -+ _mali_osk_wq_term(); ++/** Dump the MMU tables to a buffer ++ * ++ * This function allocates a buffer (of @c nr_pages pages) to hold a dump of the MMU tables and fills it. If the ++ * buffer is too small then the return value will be NULL. ++ * ++ * The GPU vm lock must be held when calling this function. ++ * ++ * The buffer returned should be freed with @ref vfree when it is no longer required. ++ * ++ * @param[in] kctx The kbase context to dump ++ * @param[in] nr_pages The number of pages to allocate for the buffer. ++ * ++ * @return The address of the buffer containing the MMU dump or NULL on error (including if the @c nr_pages is too ++ * small) ++ */ ++void *kbase_mmu_dump(struct kbase_context *kctx, int nr_pages); + -+#ifdef CONFIG_MALI_DEVFREQ -+ mali_devfreq_term(mdev); ++/** ++ * kbase_sync_now - Perform cache maintenance on a memory region ++ * ++ * @kctx: The kbase context of the region ++ * @sset: A syncset structure describing the region and direction of the ++ * synchronisation required ++ * ++ * Return: 0 on success or error code ++ */ ++int kbase_sync_now(struct kbase_context *kctx, struct basep_syncset *sset); ++void kbase_sync_single(struct kbase_context *kctx, phys_addr_t cpu_pa, ++ phys_addr_t gpu_pa, off_t offset, size_t size, ++ enum kbase_sync_type sync_fn); ++void kbase_pre_job_sync(struct kbase_context *kctx, struct base_syncset *syncsets, size_t nr); ++void kbase_post_job_sync(struct kbase_context *kctx, struct base_syncset *syncsets, size_t nr); + -+ mali_pm_metrics_term(mdev); ++/* OS specific functions */ ++int kbase_mem_free(struct kbase_context *kctx, u64 gpu_addr); ++int kbase_mem_free_region(struct kbase_context *kctx, struct kbase_va_region *reg); ++void kbase_os_mem_map_lock(struct kbase_context *kctx); ++void kbase_os_mem_map_unlock(struct kbase_context *kctx); + -+ if (mdev->clock) { -+ clk_unprepare(mdev->clock); -+ clk_put(mdev->clock); -+ mdev->clock = NULL; -+ } -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && defined(CONFIG_OF) \ -+ && defined(CONFIG_PM_OPP) -+ dev_pm_opp_of_remove_table(mdev->dev); -+#endif ++/** ++ * @brief Update the memory allocation counters for the current process ++ * ++ * OS specific call to updates the current memory allocation counters for the current process with ++ * the supplied delta. ++ * ++ * @param[in] kctx The kbase context ++ * @param[in] pages The desired delta to apply to the memory usage counters. ++ */ + -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) && defined(CONFIG_OF) \ -+ && defined(CONFIG_REGULATOR) -+ regulator_put(mdev->regulator); -+#endif /* LINUX_VERSION_CODE >= 3, 12, 0 */ -+ mali_device_free(mdev); -+#endif ++void kbasep_os_process_page_usage_update(struct kbase_context *kctx, int pages); + -+#ifdef CONFIG_MALI_DT -+ mali_platform_device_deinit(mali_platform_device); -+#endif -+ mali_platform_device = NULL; -+ return 0; -+} ++/** ++ * @brief Add to the memory allocation counters for the current process ++ * ++ * OS specific call to add to the current memory allocation counters for the current process by ++ * the supplied amount. ++ * ++ * @param[in] kctx The kernel base context used for the allocation. ++ * @param[in] pages The desired delta to apply to the memory usage counters. ++ */ + -+static int mali_miscdevice_register(struct platform_device *pdev) ++static inline void kbase_process_page_usage_inc(struct kbase_context *kctx, int pages) +{ -+ int err; -+ -+ mali_miscdevice.minor = MISC_DYNAMIC_MINOR; -+ mali_miscdevice.name = mali_dev_name; -+ mali_miscdevice.fops = &mali_fops; -+ mali_miscdevice.parent = get_device(&pdev->dev); -+ -+ err = misc_register(&mali_miscdevice); -+ if (0 != err) { -+ MALI_PRINT_ERROR(("Failed to register misc device, misc_register() returned %d\n", err)); -+ } -+ -+ return err; ++ kbasep_os_process_page_usage_update(kctx, pages); +} + -+static void mali_miscdevice_unregister(void) -+{ -+ misc_deregister(&mali_miscdevice); -+} ++/** ++ * @brief Subtract from the memory allocation counters for the current process ++ * ++ * OS specific call to subtract from the current memory allocation counters for the current process by ++ * the supplied amount. ++ * ++ * @param[in] kctx The kernel base context used for the allocation. ++ * @param[in] pages The desired delta to apply to the memory usage counters. ++ */ + -+static int mali_driver_suspend_scheduler(struct device *dev) ++static inline void kbase_process_page_usage_dec(struct kbase_context *kctx, int pages) +{ -+#ifdef CONFIG_MALI_DEVFREQ -+ struct mali_device *mdev = dev_get_drvdata(dev); -+ if (!mdev) -+ return -ENODEV; -+#endif -+ -+#if defined(CONFIG_MALI_DEVFREQ) && \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+ devfreq_suspend_device(mdev->devfreq); -+#endif -+ -+ mali_pm_os_suspend(MALI_TRUE); -+ /* Tracing the frequency and voltage after mali is suspended */ -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_EVENT_CHANNEL_GPU | -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, -+ 0, -+ 0, -+ 0, 0, 0); -+ return 0; ++ kbasep_os_process_page_usage_update(kctx, 0 - pages); +} + -+static int mali_driver_resume_scheduler(struct device *dev) -+{ -+#ifdef CONFIG_MALI_DEVFREQ -+ struct mali_device *mdev = dev_get_drvdata(dev); -+ if (!mdev) -+ return -ENODEV; -+#endif ++/** ++ * kbasep_find_enclosing_cpu_mapping_offset() - Find the offset of the CPU ++ * mapping of a memory allocation containing a given address range ++ * ++ * Searches for a CPU mapping of any part of any region that fully encloses the ++ * CPU virtual address range specified by @uaddr and @size. Returns a failure ++ * indication if only part of the address range lies within a CPU mapping. ++ * ++ * @kctx: The kernel base context used for the allocation. ++ * @uaddr: Start of the CPU virtual address range. ++ * @size: Size of the CPU virtual address range (in bytes). ++ * @offset: The offset from the start of the allocation to the specified CPU ++ * virtual address. ++ * ++ * Return: 0 if offset was obtained successfully. Error code otherwise. ++ */ ++int kbasep_find_enclosing_cpu_mapping_offset( ++ struct kbase_context *kctx, ++ unsigned long uaddr, size_t size, u64 *offset); + -+ /* Tracing the frequency and voltage after mali is resumed */ -+#if defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_MALI_DVFS) -+ /* Just call mali_get_current_gpu_clk_item() once,to record current clk info.*/ -+ if (is_first_resume == 1) { -+ mali_get_current_gpu_clk_item(&mali_gpu_clk[1]); -+ is_first_resume = 0; -+ } -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_EVENT_CHANNEL_GPU | -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, -+ mali_gpu_clk[1].clock, -+ mali_gpu_clk[1].vol / 1000, -+ 0, 0, 0); -+#endif -+ mali_pm_os_resume(); ++enum hrtimer_restart kbasep_as_poke_timer_callback(struct hrtimer *timer); ++void kbase_as_poking_timer_retain_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *katom); ++void kbase_as_poking_timer_release_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *katom); + -+#if defined(CONFIG_MALI_DEVFREQ) && \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+ devfreq_resume_device(mdev->devfreq); -+#endif ++/** ++* @brief Allocates physical pages. ++* ++* Allocates \a nr_pages_requested and updates the alloc object. ++* ++* @param[in] alloc allocation object to add pages to ++* @param[in] nr_pages_requested number of physical pages to allocate ++* ++* @return 0 if all pages have been successfully allocated. Error code otherwise ++*/ ++int kbase_alloc_phy_pages_helper(struct kbase_mem_phy_alloc *alloc, size_t nr_pages_requested); + -+ return 0; -+} ++/** ++* @brief Free physical pages. ++* ++* Frees \a nr_pages and updates the alloc object. ++* ++* @param[in] alloc allocation object to free pages from ++* @param[in] nr_pages_to_free number of physical pages to free ++*/ ++int kbase_free_phy_pages_helper(struct kbase_mem_phy_alloc *alloc, size_t nr_pages_to_free); + -+#ifdef CONFIG_PM_RUNTIME -+static int mali_driver_runtime_suspend(struct device *dev) ++static inline void kbase_set_dma_addr(struct page *p, dma_addr_t dma_addr) +{ -+#ifdef CONFIG_MALI_DEVFREQ -+ struct mali_device *mdev = dev_get_drvdata(dev); -+ if (!mdev) -+ return -ENODEV; -+#endif -+ -+ if (MALI_TRUE == mali_pm_runtime_suspend()) { -+ /* Tracing the frequency and voltage after mali is suspended */ -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_EVENT_CHANNEL_GPU | -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, -+ 0, -+ 0, -+ 0, 0, 0); -+ -+#if defined(CONFIG_MALI_DEVFREQ) && \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+ MALI_DEBUG_PRINT(4, ("devfreq_suspend_device: stop devfreq monitor\n")); -+ devfreq_suspend_device(mdev->devfreq); -+#endif -+ -+ return 0; ++ SetPagePrivate(p); ++ if (sizeof(dma_addr_t) > sizeof(p->private)) { ++ /* on 32-bit ARM with LPAE dma_addr_t becomes larger, but the ++ * private field stays the same. So we have to be clever and ++ * use the fact that we only store DMA addresses of whole pages, ++ * so the low bits should be zero */ ++ KBASE_DEBUG_ASSERT(!(dma_addr & (PAGE_SIZE - 1))); ++ set_page_private(p, dma_addr >> PAGE_SHIFT); + } else { -+ return -EBUSY; ++ set_page_private(p, dma_addr); + } +} + -+static int mali_driver_runtime_resume(struct device *dev) ++static inline dma_addr_t kbase_dma_addr(struct page *p) +{ -+#ifdef CONFIG_MALI_DEVFREQ -+ struct mali_device *mdev = dev_get_drvdata(dev); -+ if (!mdev) -+ return -ENODEV; -+#endif -+ -+ /* Tracing the frequency and voltage after mali is resumed */ -+#if defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_MALI_DVFS) -+ /* Just call mali_get_current_gpu_clk_item() once,to record current clk info.*/ -+ if (is_first_resume == 1) { -+ mali_get_current_gpu_clk_item(&mali_gpu_clk[1]); -+ is_first_resume = 0; -+ } -+ _mali_osk_profiling_add_event(MALI_PROFILING_EVENT_TYPE_SINGLE | -+ MALI_PROFILING_EVENT_CHANNEL_GPU | -+ MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE, -+ mali_gpu_clk[1].clock, -+ mali_gpu_clk[1].vol / 1000, -+ 0, 0, 0); -+#endif -+ -+ mali_pm_runtime_resume(); ++ if (sizeof(dma_addr_t) > sizeof(p->private)) ++ return ((dma_addr_t)page_private(p)) << PAGE_SHIFT; + -+#if defined(CONFIG_MALI_DEVFREQ) && \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+ MALI_DEBUG_PRINT(4, ("devfreq_resume_device: start devfreq monitor\n")); -+ devfreq_resume_device(mdev->devfreq); -+#endif -+ return 0; ++ return (dma_addr_t)page_private(p); +} + -+static int mali_driver_runtime_idle(struct device *dev) ++static inline void kbase_clear_dma_addr(struct page *p) +{ -+ /* Nothing to do */ -+ return 0; ++ ClearPagePrivate(p); +} -+#endif + -+static int mali_open(struct inode *inode, struct file *filp) -+{ -+ struct mali_session_data *session_data; -+ _mali_osk_errcode_t err; ++/** ++* @brief Process a bus or page fault. ++* ++* This function will process a fault on a specific address space ++* ++* @param[in] kbdev The @ref kbase_device the fault happened on ++* @param[in] kctx The @ref kbase_context for the faulting address space if ++* one was found. ++* @param[in] as The address space that has the fault ++*/ ++void kbase_mmu_interrupt_process(struct kbase_device *kbdev, ++ struct kbase_context *kctx, struct kbase_as *as); + -+ /* input validation */ -+ if (mali_miscdevice.minor != iminor(inode)) { -+ MALI_PRINT_ERROR(("mali_open() Minor does not match\n")); -+ return -ENODEV; -+ } ++/** ++ * @brief Process a page fault. ++ * ++ * @param[in] data work_struct passed by queue_work() ++ */ ++void page_fault_worker(struct work_struct *data); + -+ /* allocated struct to track this session */ -+ err = _mali_ukk_open((void **)&session_data); -+ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); ++/** ++ * @brief Process a bus fault. ++ * ++ * @param[in] data work_struct passed by queue_work() ++ */ ++void bus_fault_worker(struct work_struct *data); + -+ /* initialize file pointer */ -+ filp->f_pos = 0; ++/** ++ * @brief Flush MMU workqueues. ++ * ++ * This function will cause any outstanding page or bus faults to be processed. ++ * It should be called prior to powering off the GPU. ++ * ++ * @param[in] kbdev Device pointer ++ */ ++void kbase_flush_mmu_wqs(struct kbase_device *kbdev); + -+ /* link in our session data */ -+ filp->private_data = (void *)session_data; ++/** ++ * kbase_sync_single_for_device - update physical memory and give GPU ownership ++ * @kbdev: Device pointer ++ * @handle: DMA address of region ++ * @size: Size of region to sync ++ * @dir: DMA data direction ++ */ + -+ filp->f_mapping = mali_mem_swap_get_global_swap_file()->f_mapping; ++void kbase_sync_single_for_device(struct kbase_device *kbdev, dma_addr_t handle, ++ size_t size, enum dma_data_direction dir); + -+ return 0; -+} ++/** ++ * kbase_sync_single_for_cpu - update physical memory and give CPU ownership ++ * @kbdev: Device pointer ++ * @handle: DMA address of region ++ * @size: Size of region to sync ++ * @dir: DMA data direction ++ */ + -+static int mali_release(struct inode *inode, struct file *filp) -+{ -+ _mali_osk_errcode_t err; ++void kbase_sync_single_for_cpu(struct kbase_device *kbdev, dma_addr_t handle, ++ size_t size, enum dma_data_direction dir); + -+ /* input validation */ -+ if (mali_miscdevice.minor != iminor(inode)) { -+ MALI_PRINT_ERROR(("mali_release() Minor does not match\n")); -+ return -ENODEV; -+ } ++#ifdef CONFIG_DEBUG_FS ++/** ++ * kbase_jit_debugfs_init - Add per context debugfs entry for JIT. ++ * @kctx: kbase context ++ */ ++void kbase_jit_debugfs_init(struct kbase_context *kctx); ++#endif /* CONFIG_DEBUG_FS */ + -+ err = _mali_ukk_close((void **)&filp->private_data); -+ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); ++/** ++ * kbase_jit_init - Initialize the JIT memory pool management ++ * @kctx: kbase context ++ * ++ * Returns zero on success or negative error number on failure. ++ */ ++int kbase_jit_init(struct kbase_context *kctx); + -+ return 0; -+} ++/** ++ * kbase_jit_allocate - Allocate JIT memory ++ * @kctx: kbase context ++ * @info: JIT allocation information ++ * ++ * Return: JIT allocation on success or NULL on failure. ++ */ ++struct kbase_va_region *kbase_jit_allocate(struct kbase_context *kctx, ++ struct base_jit_alloc_info *info); + -+int map_errcode(_mali_osk_errcode_t err) -+{ -+ switch (err) { -+ case _MALI_OSK_ERR_OK : -+ return 0; -+ case _MALI_OSK_ERR_FAULT: -+ return -EFAULT; -+ case _MALI_OSK_ERR_INVALID_FUNC: -+ return -ENOTTY; -+ case _MALI_OSK_ERR_INVALID_ARGS: -+ return -EINVAL; -+ case _MALI_OSK_ERR_NOMEM: -+ return -ENOMEM; -+ case _MALI_OSK_ERR_TIMEOUT: -+ return -ETIMEDOUT; -+ case _MALI_OSK_ERR_RESTARTSYSCALL: -+ return -ERESTARTSYS; -+ case _MALI_OSK_ERR_ITEM_NOT_FOUND: -+ return -ENOENT; -+ default: -+ return -EFAULT; -+ } -+} -+ -+static long mali_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) -+{ -+ int err; -+ struct mali_session_data *session_data; ++/** ++ * kbase_jit_free - Free a JIT allocation ++ * @kctx: kbase context ++ * @reg: JIT allocation ++ * ++ * Frees a JIT allocation and places it into the free pool for later reuse. ++ */ ++void kbase_jit_free(struct kbase_context *kctx, struct kbase_va_region *reg); + -+ MALI_DEBUG_PRINT(7, ("Ioctl received 0x%08X 0x%08lX\n", cmd, arg)); ++/** ++ * kbase_jit_backing_lost - Inform JIT that an allocation has lost backing ++ * @reg: JIT allocation ++ */ ++void kbase_jit_backing_lost(struct kbase_va_region *reg); + -+ session_data = (struct mali_session_data *)filp->private_data; -+ if (NULL == session_data) { -+ MALI_DEBUG_PRINT(7, ("filp->private_data was NULL\n")); -+ return -ENOTTY; -+ } ++/** ++ * kbase_jit_evict - Evict a JIT allocation from the pool ++ * @kctx: kbase context ++ * ++ * Evict the least recently used JIT allocation from the pool. This can be ++ * required if normal VA allocations are failing due to VA exhaustion. ++ * ++ * Return: True if a JIT allocation was freed, false otherwise. ++ */ ++bool kbase_jit_evict(struct kbase_context *kctx); + -+ if (NULL == (void *)arg) { -+ MALI_DEBUG_PRINT(7, ("arg was NULL\n")); -+ return -ENOTTY; -+ } ++/** ++ * kbase_jit_term - Terminate the JIT memory pool management ++ * @kctx: kbase context ++ */ ++void kbase_jit_term(struct kbase_context *kctx); + -+ switch (cmd) { -+ case MALI_IOC_WAIT_FOR_NOTIFICATION: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_wait_for_notification_s), sizeof(u64))); -+ err = wait_for_notification_wrapper(session_data, (_mali_uk_wait_for_notification_s __user *)arg); -+ break; ++/** ++ * kbase_map_external_resource - Map an external resource to the GPU. ++ * @kctx: kbase context. ++ * @reg: The region to map. ++ * @locked_mm: The mm_struct which has been locked for this operation. ++ * @kds_res_count: The number of KDS resources. ++ * @kds_resources: Array of KDS resources. ++ * @kds_access_bitmap: Access bitmap for KDS. ++ * @exclusive: If the KDS resource requires exclusive access. ++ * ++ * Return: The physical allocation which backs the region on success or NULL ++ * on failure. ++ */ ++struct kbase_mem_phy_alloc *kbase_map_external_resource( ++ struct kbase_context *kctx, struct kbase_va_region *reg, ++ struct mm_struct *locked_mm ++#ifdef CONFIG_KDS ++ , u32 *kds_res_count, struct kds_resource **kds_resources, ++ unsigned long *kds_access_bitmap, bool exclusive ++#endif ++ ); + -+ case MALI_IOC_GET_API_VERSION_V2: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_get_api_version_v2_s), sizeof(u64))); -+ err = get_api_version_v2_wrapper(session_data, (_mali_uk_get_api_version_v2_s __user *)arg); -+ break; ++/** ++ * kbase_unmap_external_resource - Unmap an external resource from the GPU. ++ * @kctx: kbase context. ++ * @reg: The region to unmap or NULL if it has already been released. ++ * @alloc: The physical allocation being unmapped. ++ */ ++void kbase_unmap_external_resource(struct kbase_context *kctx, ++ struct kbase_va_region *reg, struct kbase_mem_phy_alloc *alloc); + -+ case MALI_IOC_GET_API_VERSION: -+ err = get_api_version_wrapper(session_data, (_mali_uk_get_api_version_s __user *)arg); -+ break; ++/** ++ * kbase_sticky_resource_init - Initialize sticky resource management. ++ * @kctx: kbase context ++ * ++ * Returns zero on success or negative error number on failure. ++ */ ++int kbase_sticky_resource_init(struct kbase_context *kctx); + -+ case MALI_IOC_POST_NOTIFICATION: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_post_notification_s), sizeof(u64))); -+ err = post_notification_wrapper(session_data, (_mali_uk_post_notification_s __user *)arg); -+ break; ++/** ++ * kbase_sticky_resource_acquire - Acquire a reference on a sticky resource. ++ * @kctx: kbase context. ++ * @gpu_addr: The GPU address of the external resource. ++ * ++ * Return: The metadata object which represents the binding between the ++ * external resource and the kbase context on success or NULL on failure. ++ */ ++struct kbase_ctx_ext_res_meta *kbase_sticky_resource_acquire( ++ struct kbase_context *kctx, u64 gpu_addr); + -+ /* rk_ext : 从对 r5p0-01rel0 集æˆå¼€å§‹, ä¸å†ä½¿ç”¨. */ -+#if 0 -+ case MALI_IOC_GET_MALI_VERSION_IN_RK30: -+ err = get_mali_version_in_rk30_wrapper(session_data, (_mali_uk_get_mali_version_in_rk30_s __user *)arg); -+ break; -+#else -+ case MALI_IOC_GET_RK_KO_VERSION: -+ err = get_rk_ko_version_wrapper(session_data, (_mali_rk_ko_version_s __user *)arg); -+ break; -+#endif -+ -+ case MALI_IOC_GET_USER_SETTINGS: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_get_user_settings_s), sizeof(u64))); -+ err = get_user_settings_wrapper(session_data, (_mali_uk_get_user_settings_s __user *)arg); -+ break; ++/** ++ * kbase_sticky_resource_release - Release a reference on a sticky resource. ++ * @kctx: kbase context. ++ * @meta: Binding metadata. ++ * @gpu_addr: GPU address of the external resource. ++ * ++ * If meta is NULL then gpu_addr will be used to scan the metadata list and ++ * find the matching metadata (if any), otherwise the provided meta will be ++ * used and gpu_addr will be ignored. ++ * ++ * Return: True if the release found the metadata and the reference was dropped. ++ */ ++bool kbase_sticky_resource_release(struct kbase_context *kctx, ++ struct kbase_ctx_ext_res_meta *meta, u64 gpu_addr); + -+ case MALI_IOC_REQUEST_HIGH_PRIORITY: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_request_high_priority_s), sizeof(u64))); -+ err = request_high_priority_wrapper(session_data, (_mali_uk_request_high_priority_s __user *)arg); -+ break; ++/** ++ * kbase_sticky_resource_term - Terminate sticky resource management. ++ * @kctx: kbase context ++ */ ++void kbase_sticky_resource_term(struct kbase_context *kctx); + -+ case MALI_IOC_PENDING_SUBMIT: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_pending_submit_s), sizeof(u64))); -+ err = pending_submit_wrapper(session_data, (_mali_uk_pending_submit_s __user *)arg); -+ break; ++#endif /* _KBASE_MEM_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c +new file mode 100755 +index 000000000..e20315e67 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c +@@ -0,0 +1,2578 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+#if defined(CONFIG_MALI400_PROFILING) -+ case MALI_IOC_PROFILING_ADD_EVENT: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_profiling_add_event_s), sizeof(u64))); -+ err = profiling_add_event_wrapper(session_data, (_mali_uk_profiling_add_event_s __user *)arg); -+ break; + -+ case MALI_IOC_PROFILING_REPORT_SW_COUNTERS: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_sw_counters_report_s), sizeof(u64))); -+ err = profiling_report_sw_counters_wrapper(session_data, (_mali_uk_sw_counters_report_s __user *)arg); -+ break; + -+ case MALI_IOC_PROFILING_STREAM_FD_GET: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_profiling_stream_fd_get_s), sizeof(u64))); -+ err = profiling_get_stream_fd_wrapper(session_data, (_mali_uk_profiling_stream_fd_get_s __user *)arg); -+ break; + -+ case MALI_IOC_PROILING_CONTROL_SET: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_profiling_control_set_s), sizeof(u64))); -+ err = profiling_control_set_wrapper(session_data, (_mali_uk_profiling_control_set_s __user *)arg); -+ break; -+#else + -+ case MALI_IOC_PROFILING_ADD_EVENT: /* FALL-THROUGH */ -+ case MALI_IOC_PROFILING_REPORT_SW_COUNTERS: /* FALL-THROUGH */ -+ MALI_DEBUG_PRINT(2, ("Profiling not supported\n")); -+ err = -ENOTTY; -+ break; -+#endif ++/** ++ * @file mali_kbase_mem_linux.c ++ * Base kernel memory APIs, Linux implementation. ++ */ + -+ case MALI_IOC_PROFILING_MEMORY_USAGE_GET: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_profiling_memory_usage_get_s), sizeof(u64))); -+ err = mem_usage_get_wrapper(session_data, (_mali_uk_profiling_memory_usage_get_s __user *)arg); -+ break; ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) && \ ++ (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) ++#include ++#endif /* LINUX_VERSION_CODE >= 3.5.0 && < 4.8.0 */ ++#ifdef CONFIG_DMA_SHARED_BUFFER ++#include ++#endif /* defined(CONFIG_DMA_SHARED_BUFFER) */ ++#include ++#include + -+ case MALI_IOC_MEM_ALLOC: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_alloc_mem_s), sizeof(u64))); -+ err = mem_alloc_wrapper(session_data, (_mali_uk_alloc_mem_s __user *)arg); -+ break; ++#include ++#include ++#include ++#include ++#include + -+ case MALI_IOC_MEM_FREE: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_free_mem_s), sizeof(u64))); -+ err = mem_free_wrapper(session_data, (_mali_uk_free_mem_s __user *)arg); -+ break; ++static int kbase_tracking_page_setup(struct kbase_context *kctx, struct vm_area_struct *vma); + -+ case MALI_IOC_MEM_BIND: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_bind_mem_s), sizeof(u64))); -+ err = mem_bind_wrapper(session_data, (_mali_uk_bind_mem_s __user *)arg); -+ break; ++/** ++ * kbase_mem_shrink_cpu_mapping - Shrink the CPU mapping(s) of an allocation ++ * @kctx: Context the region belongs to ++ * @reg: The GPU region ++ * @new_pages: The number of pages after the shrink ++ * @old_pages: The number of pages before the shrink ++ * ++ * Shrink (or completely remove) all CPU mappings which reference the shrunk ++ * part of the allocation. ++ * ++ * Note: Caller must be holding the processes mmap_lock lock. ++ */ ++static void kbase_mem_shrink_cpu_mapping(struct kbase_context *kctx, ++ struct kbase_va_region *reg, ++ u64 new_pages, u64 old_pages); + -+ case MALI_IOC_MEM_UNBIND: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_unbind_mem_s), sizeof(u64))); -+ err = mem_unbind_wrapper(session_data, (_mali_uk_unbind_mem_s __user *)arg); -+ break; ++/** ++ * kbase_mem_shrink_gpu_mapping - Shrink the GPU mapping of an allocation ++ * @kctx: Context the region belongs to ++ * @reg: The GPU region or NULL if there isn't one ++ * @new_pages: The number of pages after the shrink ++ * @old_pages: The number of pages before the shrink ++ * ++ * Return: 0 on success, negative -errno on error ++ * ++ * Unmap the shrunk pages from the GPU mapping. Note that the size of the region ++ * itself is unmodified as we still need to reserve the VA, only the page tables ++ * will be modified by this function. ++ */ ++static int kbase_mem_shrink_gpu_mapping(struct kbase_context *kctx, ++ struct kbase_va_region *reg, ++ u64 new_pages, u64 old_pages); + -+ case MALI_IOC_MEM_COW: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_cow_mem_s), sizeof(u64))); -+ err = mem_cow_wrapper(session_data, (_mali_uk_cow_mem_s __user *)arg); -+ break; ++struct kbase_va_region *kbase_mem_alloc(struct kbase_context *kctx, ++ u64 va_pages, u64 commit_pages, u64 extent, u64 *flags, ++ u64 *gpu_va) ++{ ++ int zone; ++ int gpu_pc_bits; ++ int cpu_va_bits; ++ struct kbase_va_region *reg; ++ struct device *dev; + -+ case MALI_IOC_MEM_COW_MODIFY_RANGE: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_cow_modify_range_s), sizeof(u64))); -+ err = mem_cow_modify_range_wrapper(session_data, (_mali_uk_cow_modify_range_s __user *)arg); -+ break; ++ KBASE_DEBUG_ASSERT(kctx); ++ KBASE_DEBUG_ASSERT(flags); ++ KBASE_DEBUG_ASSERT(gpu_va); + -+ case MALI_IOC_MEM_RESIZE: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_mem_resize_s), sizeof(u64))); -+ err = mem_resize_mem_wrapper(session_data, (_mali_uk_mem_resize_s __user *)arg); -+ break; ++ dev = kctx->kbdev->dev; ++ *gpu_va = 0; /* return 0 on failure */ + -+ case MALI_IOC_MEM_WRITE_SAFE: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_mem_write_safe_s), sizeof(u64))); -+ err = mem_write_safe_wrapper(session_data, (_mali_uk_mem_write_safe_s __user *)arg); -+ break; ++ gpu_pc_bits = kctx->kbdev->gpu_props.props.core_props.log2_program_counter_size; ++ cpu_va_bits = BITS_PER_LONG; + -+ case MALI_IOC_MEM_QUERY_MMU_PAGE_TABLE_DUMP_SIZE: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_query_mmu_page_table_dump_size_s), sizeof(u64))); -+ err = mem_query_mmu_page_table_dump_size_wrapper(session_data, (_mali_uk_query_mmu_page_table_dump_size_s __user *)arg); -+ break; ++ if (0 == va_pages) { ++ dev_warn(dev, "kbase_mem_alloc called with 0 va_pages!"); ++ goto bad_size; ++ } + -+ case MALI_IOC_MEM_DUMP_MMU_PAGE_TABLE: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_dump_mmu_page_table_s), sizeof(u64))); -+ err = mem_dump_mmu_page_table_wrapper(session_data, (_mali_uk_dump_mmu_page_table_s __user *)arg); -+ break; ++ if (va_pages > (U64_MAX / PAGE_SIZE)) ++ /* 64-bit address range is the max */ ++ goto bad_size; + -+ case MALI_IOC_MEM_DMA_BUF_GET_SIZE: -+#ifdef CONFIG_DMA_SHARED_BUFFER -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_dma_buf_get_size_s), sizeof(u64))); -+ err = mali_dma_buf_get_size(session_data, (_mali_uk_dma_buf_get_size_s __user *)arg); -+#else -+ MALI_DEBUG_PRINT(2, ("DMA-BUF not supported\n")); -+ err = -ENOTTY; ++#if defined(CONFIG_64BIT) ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ cpu_va_bits = 32; +#endif -+ break; + -+ case MALI_IOC_PP_START_JOB: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_pp_start_job_s), sizeof(u64))); -+ err = pp_start_job_wrapper(session_data, (_mali_uk_pp_start_job_s __user *)arg); -+ break; ++ if (!kbase_check_alloc_flags(*flags)) { ++ dev_warn(dev, ++ "kbase_mem_alloc called with bad flags (%llx)", ++ (unsigned long long)*flags); ++ goto bad_flags; ++ } + -+ case MALI_IOC_PP_AND_GP_START_JOB: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_pp_and_gp_start_job_s), sizeof(u64))); -+ err = pp_and_gp_start_job_wrapper(session_data, (_mali_uk_pp_and_gp_start_job_s __user *)arg); -+ break; ++ if ((*flags & BASE_MEM_COHERENT_SYSTEM_REQUIRED) != 0 && ++ !kbase_device_is_cpu_coherent(kctx->kbdev)) { ++ dev_warn(dev, "kbase_mem_alloc call required coherent mem when unavailable"); ++ goto bad_flags; ++ } ++ if ((*flags & BASE_MEM_COHERENT_SYSTEM) != 0 && ++ !kbase_device_is_cpu_coherent(kctx->kbdev)) { ++ /* Remove COHERENT_SYSTEM flag if coherent mem is unavailable */ ++ *flags &= ~BASE_MEM_COHERENT_SYSTEM; ++ } + -+ case MALI_IOC_PP_NUMBER_OF_CORES_GET: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_get_pp_number_of_cores_s), sizeof(u64))); -+ err = pp_get_number_of_cores_wrapper(session_data, (_mali_uk_get_pp_number_of_cores_s __user *)arg); -+ break; ++ /* Limit GPU executable allocs to GPU PC size */ ++ if ((*flags & BASE_MEM_PROT_GPU_EX) && ++ (va_pages > (1ULL << gpu_pc_bits >> PAGE_SHIFT))) ++ goto bad_ex_size; + -+ case MALI_IOC_PP_CORE_VERSION_GET: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_get_pp_core_version_s), sizeof(u64))); -+ err = pp_get_core_version_wrapper(session_data, (_mali_uk_get_pp_core_version_s __user *)arg); -+ break; ++ /* find out which VA zone to use */ ++ if (*flags & BASE_MEM_SAME_VA) ++ zone = KBASE_REG_ZONE_SAME_VA; ++ else if (*flags & BASE_MEM_PROT_GPU_EX) ++ zone = KBASE_REG_ZONE_EXEC; ++ else ++ zone = KBASE_REG_ZONE_CUSTOM_VA; + -+ case MALI_IOC_PP_DISABLE_WB: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_pp_disable_wb_s), sizeof(u64))); -+ err = pp_disable_wb_wrapper(session_data, (_mali_uk_pp_disable_wb_s __user *)arg); -+ break; ++ reg = kbase_alloc_free_region(kctx, 0, va_pages, zone); ++ if (!reg) { ++ dev_err(dev, "Failed to allocate free region"); ++ goto no_region; ++ } + -+ case MALI_IOC_GP2_START_JOB: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_gp_start_job_s), sizeof(u64))); -+ err = gp_start_job_wrapper(session_data, (_mali_uk_gp_start_job_s __user *)arg); -+ break; ++ if (kbase_update_region_flags(kctx, reg, *flags) != 0) ++ goto invalid_flags; + -+ case MALI_IOC_GP2_NUMBER_OF_CORES_GET: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_get_gp_number_of_cores_s), sizeof(u64))); -+ err = gp_get_number_of_cores_wrapper(session_data, (_mali_uk_get_gp_number_of_cores_s __user *)arg); -+ break; ++ if (kbase_reg_prepare_native(reg, kctx) != 0) { ++ dev_err(dev, "Failed to prepare region"); ++ goto prepare_failed; ++ } + -+ case MALI_IOC_GP2_CORE_VERSION_GET: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_get_gp_core_version_s), sizeof(u64))); -+ err = gp_get_core_version_wrapper(session_data, (_mali_uk_get_gp_core_version_s __user *)arg); -+ break; ++ if (*flags & BASE_MEM_GROW_ON_GPF) ++ reg->extent = extent; ++ else ++ reg->extent = 0; + -+ case MALI_IOC_GP2_SUSPEND_RESPONSE: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_gp_suspend_response_s), sizeof(u64))); -+ err = gp_suspend_response_wrapper(session_data, (_mali_uk_gp_suspend_response_s __user *)arg); -+ break; ++ if (kbase_alloc_phy_pages(reg, va_pages, commit_pages) != 0) { ++ dev_warn(dev, "Failed to allocate %lld pages (va_pages=%lld)", ++ (unsigned long long)commit_pages, ++ (unsigned long long)va_pages); ++ goto no_mem; ++ } + -+ case MALI_IOC_VSYNC_EVENT_REPORT: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_vsync_event_report_s), sizeof(u64))); -+ err = vsync_event_report_wrapper(session_data, (_mali_uk_vsync_event_report_s __user *)arg); -+ break; ++ kbase_gpu_vm_lock(kctx); + -+ case MALI_IOC_TIMELINE_GET_LATEST_POINT: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_timeline_get_latest_point_s), sizeof(u64))); -+ err = timeline_get_latest_point_wrapper(session_data, (_mali_uk_timeline_get_latest_point_s __user *)arg); -+ break; -+ case MALI_IOC_TIMELINE_WAIT: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_timeline_wait_s), sizeof(u64))); -+ err = timeline_wait_wrapper(session_data, (_mali_uk_timeline_wait_s __user *)arg); -+ break; -+ case MALI_IOC_TIMELINE_CREATE_SYNC_FENCE: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_timeline_create_sync_fence_s), sizeof(u64))); -+ err = timeline_create_sync_fence_wrapper(session_data, (_mali_uk_timeline_create_sync_fence_s __user *)arg); -+ break; -+ case MALI_IOC_SOFT_JOB_START: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_soft_job_start_s), sizeof(u64))); -+ err = soft_job_start_wrapper(session_data, (_mali_uk_soft_job_start_s __user *)arg); -+ break; -+ case MALI_IOC_SOFT_JOB_SIGNAL: -+ BUILD_BUG_ON(!IS_ALIGNED(sizeof(_mali_uk_soft_job_signal_s), sizeof(u64))); -+ err = soft_job_signal_wrapper(session_data, (_mali_uk_soft_job_signal_s __user *)arg); -+ break; ++ /* mmap needed to setup VA? */ ++ if (*flags & BASE_MEM_SAME_VA) { ++ unsigned long prot = PROT_NONE; ++ unsigned long va_size = va_pages << PAGE_SHIFT; ++ unsigned long va_map = va_size; ++ unsigned long cookie, cookie_nr; ++ unsigned long cpu_addr; + -+ default: -+ MALI_DEBUG_PRINT(2, ("No handler for ioctl 0x%08X 0x%08lX\n", cmd, arg)); -+ err = -ENOTTY; -+ }; ++ /* Bind to a cookie */ ++ if (!kctx->cookies) { ++ dev_err(dev, "No cookies available for allocation!"); ++ kbase_gpu_vm_unlock(kctx); ++ goto no_cookie; ++ } ++ /* return a cookie */ ++ cookie_nr = __ffs(kctx->cookies); ++ kctx->cookies &= ~(1UL << cookie_nr); ++ BUG_ON(kctx->pending_regions[cookie_nr]); ++ kctx->pending_regions[cookie_nr] = reg; + -+ return err; ++ kbase_gpu_vm_unlock(kctx); ++ ++ /* relocate to correct base */ ++ cookie = cookie_nr + PFN_DOWN(BASE_MEM_COOKIE_BASE); ++ cookie <<= PAGE_SHIFT; ++ ++ /* ++ * 10.1-10.4 UKU userland relies on the kernel to call mmap. ++ * For all other versions we can just return the cookie ++ */ ++ if (kctx->api_version < KBASE_API_VERSION(10, 1) || ++ kctx->api_version > KBASE_API_VERSION(10, 4)) { ++ *gpu_va = (u64) cookie; ++ return reg; ++ } ++ if (*flags & BASE_MEM_PROT_CPU_RD) ++ prot |= PROT_READ; ++ if (*flags & BASE_MEM_PROT_CPU_WR) ++ prot |= PROT_WRITE; ++ ++ cpu_addr = vm_mmap(kctx->filp, 0, va_map, prot, ++ MAP_SHARED, cookie); ++ ++ if (IS_ERR_VALUE(cpu_addr)) { ++ kbase_gpu_vm_lock(kctx); ++ kctx->pending_regions[cookie_nr] = NULL; ++ kctx->cookies |= (1UL << cookie_nr); ++ kbase_gpu_vm_unlock(kctx); ++ goto no_mmap; ++ } ++ ++ *gpu_va = (u64) cpu_addr; ++ } else /* we control the VA */ { ++ if (kbase_gpu_mmap(kctx, reg, 0, va_pages, 1) != 0) { ++ dev_warn(dev, "Failed to map memory on GPU"); ++ kbase_gpu_vm_unlock(kctx); ++ goto no_mmap; ++ } ++ /* return real GPU VA */ ++ *gpu_va = reg->start_pfn << PAGE_SHIFT; ++ ++ kbase_gpu_vm_unlock(kctx); ++ } ++ ++ return reg; ++ ++no_mmap: ++no_cookie: ++no_mem: ++ kbase_mem_phy_alloc_put(reg->cpu_alloc); ++ kbase_mem_phy_alloc_put(reg->gpu_alloc); ++invalid_flags: ++prepare_failed: ++ kfree(reg); ++no_region: ++bad_ex_size: ++bad_flags: ++bad_size: ++ return NULL; +} ++KBASE_EXPORT_TEST_API(kbase_mem_alloc); + -+late_initcall_sync(mali_module_init); -+module_exit(mali_module_exit); ++int kbase_mem_query(struct kbase_context *kctx, u64 gpu_addr, int query, u64 * const out) ++{ ++ struct kbase_va_region *reg; ++ int ret = -EINVAL; + -+MODULE_LICENSE(MALI_KERNEL_LINUX_LICENSE); -+MODULE_AUTHOR("ARM Ltd."); -+MODULE_VERSION(SVN_REV_STRING); -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h -new file mode 100755 -index 000000000000..be754cb15646 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h -@@ -0,0 +1,36 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ KBASE_DEBUG_ASSERT(kctx); ++ KBASE_DEBUG_ASSERT(out); + -+#ifndef __MALI_KERNEL_LINUX_H__ -+#define __MALI_KERNEL_LINUX_H__ ++ if (gpu_addr & ~PAGE_MASK) { ++ dev_warn(kctx->kbdev->dev, "mem_query: gpu_addr: passed parameter is invalid"); ++ return -EINVAL; ++ } + -+#ifdef __cplusplus -+extern "C" { -+#endif ++ kbase_gpu_vm_lock(kctx); + -+#include /* character device definitions */ -+#include -+#include -+#include "mali_kernel_license.h" -+#include "mali_osk_types.h" -+#include ++ /* Validate the region */ ++ reg = kbase_region_tracker_find_region_base_address(kctx, gpu_addr); ++ if (!reg || (reg->flags & KBASE_REG_FREE)) ++ goto out_unlock; + -+extern struct platform_device *mali_platform_device; ++ switch (query) { ++ case KBASE_MEM_QUERY_COMMIT_SIZE: ++ if (reg->cpu_alloc->type != KBASE_MEM_TYPE_ALIAS) { ++ *out = kbase_reg_current_backed_size(reg); ++ } else { ++ size_t i; ++ struct kbase_aliased *aliased; ++ *out = 0; ++ aliased = reg->cpu_alloc->imported.alias.aliased; ++ for (i = 0; i < reg->cpu_alloc->imported.alias.nents; i++) ++ *out += aliased[i].length; ++ } ++ break; ++ case KBASE_MEM_QUERY_VA_SIZE: ++ *out = reg->nr_pages; ++ break; ++ case KBASE_MEM_QUERY_FLAGS: ++ { ++ *out = 0; ++ if (KBASE_REG_CPU_WR & reg->flags) ++ *out |= BASE_MEM_PROT_CPU_WR; ++ if (KBASE_REG_CPU_RD & reg->flags) ++ *out |= BASE_MEM_PROT_CPU_RD; ++ if (KBASE_REG_CPU_CACHED & reg->flags) ++ *out |= BASE_MEM_CACHED_CPU; ++ if (KBASE_REG_GPU_WR & reg->flags) ++ *out |= BASE_MEM_PROT_GPU_WR; ++ if (KBASE_REG_GPU_RD & reg->flags) ++ *out |= BASE_MEM_PROT_GPU_RD; ++ if (!(KBASE_REG_GPU_NX & reg->flags)) ++ *out |= BASE_MEM_PROT_GPU_EX; ++ if (KBASE_REG_SHARE_BOTH & reg->flags) ++ *out |= BASE_MEM_COHERENT_SYSTEM; ++ if (KBASE_REG_SHARE_IN & reg->flags) ++ *out |= BASE_MEM_COHERENT_LOCAL; ++ break; ++ } ++ default: ++ *out = 0; ++ goto out_unlock; ++ } + -+/* After 3.19.0 kenrel droped CONFIG_PM_RUNTIME define,define by ourself */ -+#if defined(CONFIG_PM) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+#define CONFIG_PM_RUNTIME 1 -+#endif ++ ret = 0; + -+#ifdef __cplusplus ++out_unlock: ++ kbase_gpu_vm_unlock(kctx); ++ return ret; +} -+#endif + -+#endif /* __MALI_KERNEL_LINUX_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c -new file mode 100755 -index 000000000000..7bda438fef50 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c -@@ -0,0 +1,1410 @@ +/** -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * kbase_mem_evictable_reclaim_count_objects - Count number of pages in the ++ * Ephemeral memory eviction list. ++ * @s: Shrinker ++ * @sc: Shrinker control ++ * ++ * Return: Number of pages which can be freed. + */ ++static ++unsigned long kbase_mem_evictable_reclaim_count_objects(struct shrinker *s, ++ struct shrink_control *sc) ++{ ++ struct kbase_context *kctx; ++ struct kbase_mem_phy_alloc *alloc; ++ unsigned long pages = 0; ++ ++ kctx = container_of(s, struct kbase_context, reclaim); ++ ++ mutex_lock(&kctx->jit_evict_lock); ++ ++ list_for_each_entry(alloc, &kctx->evict_list, evict_node) ++ pages += alloc->nents; + ++ mutex_unlock(&kctx->jit_evict_lock); ++ return pages; ++} + +/** -+ * @file mali_kernel_sysfs.c -+ * Implementation of some sysfs data exports ++ * kbase_mem_evictable_reclaim_scan_objects - Scan the Ephemeral memory eviction ++ * list for pages and try to reclaim them. ++ * @s: Shrinker ++ * @sc: Shrinker control ++ * ++ * Return: Number of pages freed (can be less then requested) or -1 if the ++ * shrinker failed to free pages in its pool. ++ * ++ * Note: ++ * This function accesses region structures without taking the region lock, ++ * this is required as the OOM killer can call the shrinker after the region ++ * lock has already been held. ++ * This is safe as we can guarantee that a region on the eviction list will ++ * not be freed (kbase_mem_free_region removes the allocation from the list ++ * before destroying it), or modified by other parts of the driver. ++ * The eviction list itself is guarded by the eviction lock and the MMU updates ++ * are protected by their own lock. + */ ++static ++unsigned long kbase_mem_evictable_reclaim_scan_objects(struct shrinker *s, ++ struct shrink_control *sc) ++{ ++ struct kbase_context *kctx; ++ struct kbase_mem_phy_alloc *alloc; ++ struct kbase_mem_phy_alloc *tmp; ++ unsigned long freed = 0; + -+#include -+#include -+#include -+#include -+#include "mali_kernel_license.h" -+#include "mali_kernel_common.h" -+#include "mali_ukk.h" ++ kctx = container_of(s, struct kbase_context, reclaim); ++ mutex_lock(&kctx->jit_evict_lock); + -+#if MALI_LICENSE_IS_GPL ++ list_for_each_entry_safe(alloc, tmp, &kctx->evict_list, evict_node) { ++ int err; + -+#include -+#include -+#include -+#include -+#include -+#include "mali_kernel_sysfs.h" -+#if defined(CONFIG_MALI400_INTERNAL_PROFILING) -+#include -+#include "mali_osk_profiling.h" -+#endif ++ err = kbase_mem_shrink_gpu_mapping(kctx, alloc->reg, ++ 0, alloc->nents); ++ if (err != 0) { ++ /* ++ * Failed to remove GPU mapping, tell the shrinker ++ * to stop trying to shrink our slab even though we ++ * have pages in it. ++ */ ++ freed = -1; ++ goto out_unlock; ++ } + -+#include -+#include "mali_pm.h" -+#include "mali_pmu.h" -+#include "mali_group.h" -+#include "mali_gp.h" -+#include "mali_pp.h" -+#include "mali_l2_cache.h" -+#include "mali_hw_core.h" -+#include "mali_kernel_core.h" -+#include "mali_user_settings_db.h" -+#include "mali_profiling_internal.h" -+#include "mali_gp_job.h" -+#include "mali_pp_job.h" -+#include "mali_executor.h" ++ /* ++ * Update alloc->evicted before freeing the backing so the ++ * helper can determine that it needs to bypass the accounting ++ * and memory pool. ++ */ ++ alloc->evicted = alloc->nents; + -+#define PRIVATE_DATA_COUNTER_MAKE_GP(src) (src) -+#define PRIVATE_DATA_COUNTER_MAKE_PP(src) ((1 << 24) | src) -+#define PRIVATE_DATA_COUNTER_MAKE_PP_SUB_JOB(src, sub_job) ((1 << 24) | (1 << 16) | (sub_job << 8) | src) -+#define PRIVATE_DATA_COUNTER_IS_PP(a) ((((a) >> 24) & 0xFF) ? MALI_TRUE : MALI_FALSE) -+#define PRIVATE_DATA_COUNTER_GET_SRC(a) (a & 0xFF) -+#define PRIVATE_DATA_COUNTER_IS_SUB_JOB(a) ((((a) >> 16) & 0xFF) ? MALI_TRUE : MALI_FALSE) -+#define PRIVATE_DATA_COUNTER_GET_SUB_JOB(a) (((a) >> 8) & 0xFF) ++ kbase_free_phy_pages_helper(alloc, alloc->evicted); ++ freed += alloc->evicted; ++ list_del_init(&alloc->evict_node); + -+#define POWER_BUFFER_SIZE 3 ++ /* ++ * Inform the JIT allocator this region has lost backing ++ * as it might need to free the allocation. ++ */ ++ kbase_jit_backing_lost(alloc->reg); + -+static struct dentry *mali_debugfs_dir = NULL; ++ /* Enough pages have been freed so stop now */ ++ if (freed > sc->nr_to_scan) ++ break; ++ } ++out_unlock: ++ mutex_unlock(&kctx->jit_evict_lock); + -+typedef enum { -+ _MALI_DEVICE_SUSPEND, -+ _MALI_DEVICE_RESUME, -+ _MALI_DEVICE_DVFS_PAUSE, -+ _MALI_DEVICE_DVFS_RESUME, -+ _MALI_MAX_EVENTS -+} _mali_device_debug_power_events; ++ return freed; ++} + -+static const char *const mali_power_events[_MALI_MAX_EVENTS] = { -+ [_MALI_DEVICE_SUSPEND] = "suspend", -+ [_MALI_DEVICE_RESUME] = "resume", -+ [_MALI_DEVICE_DVFS_PAUSE] = "dvfs_pause", -+ [_MALI_DEVICE_DVFS_RESUME] = "dvfs_resume", -+}; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) ++static int kbase_mem_evictable_reclaim_shrink(struct shrinker *s, ++ struct shrink_control *sc) ++{ ++ if (sc->nr_to_scan == 0) ++ return kbase_mem_evictable_reclaim_count_objects(s, sc); + -+static mali_bool power_always_on_enabled = MALI_FALSE; ++ return kbase_mem_evictable_reclaim_scan_objects(s, sc); ++} ++#endif + -+static int open_copy_private_data(struct inode *inode, struct file *filp) ++int kbase_mem_evictable_init(struct kbase_context *kctx) +{ -+ filp->private_data = inode->i_private; ++ INIT_LIST_HEAD(&kctx->evict_list); ++ mutex_init(&kctx->jit_evict_lock); ++ ++ /* Register shrinker */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) ++ kctx->reclaim.shrink = kbase_mem_evictable_reclaim_shrink; ++#else ++ kctx->reclaim.count_objects = kbase_mem_evictable_reclaim_count_objects; ++ kctx->reclaim.scan_objects = kbase_mem_evictable_reclaim_scan_objects; ++#endif ++ kctx->reclaim.seeks = DEFAULT_SEEKS; ++ /* Kernel versions prior to 3.1 : ++ * struct shrinker does not define batch */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) ++ kctx->reclaim.batch = 0; ++#endif ++ register_shrinker(&kctx->reclaim); + return 0; +} + -+static ssize_t group_enabled_read(struct file *filp, char __user *buf, size_t count, loff_t *offp) ++void kbase_mem_evictable_deinit(struct kbase_context *kctx) +{ -+ int r; -+ char buffer[64]; -+ struct mali_group *group; -+ -+ group = (struct mali_group *)filp->private_data; -+ MALI_DEBUG_ASSERT_POINTER(group); -+ -+ r = snprintf(buffer, 64, "%u\n", -+ mali_executor_group_is_disabled(group) ? 0 : 1); -+ -+ return simple_read_from_buffer(buf, count, offp, buffer, r); ++ unregister_shrinker(&kctx->reclaim); +} + -+static ssize_t group_enabled_write(struct file *filp, const char __user *buf, size_t count, loff_t *offp) ++/** ++ * kbase_mem_evictable_mark_reclaim - Mark the pages as reclaimable. ++ * @alloc: The physical allocation ++ */ ++static void kbase_mem_evictable_mark_reclaim(struct kbase_mem_phy_alloc *alloc) +{ -+ int r; -+ char buffer[64]; -+ unsigned long val; -+ struct mali_group *group; ++ struct kbase_context *kctx = alloc->imported.kctx; ++ int __maybe_unused new_page_count; + -+ group = (struct mali_group *)filp->private_data; -+ MALI_DEBUG_ASSERT_POINTER(group); ++ kbase_process_page_usage_dec(kctx, alloc->nents); ++ new_page_count = kbase_atomic_sub_pages(alloc->nents, ++ &kctx->used_pages); ++ kbase_atomic_sub_pages(alloc->nents, &kctx->kbdev->memdev.used_pages); + -+ if (count >= sizeof(buffer)) { -+ return -ENOMEM; -+ } ++ KBASE_TLSTREAM_AUX_PAGESALLOC( ++ (u32)kctx->id, ++ (u64)new_page_count); ++} + -+ if (copy_from_user(&buffer[0], buf, count)) { -+ return -EFAULT; -+ } -+ buffer[count] = '\0'; ++/** ++ * kbase_mem_evictable_unmark_reclaim - Mark the pages as no longer reclaimable. ++ * @alloc: The physical allocation ++ */ ++static ++void kbase_mem_evictable_unmark_reclaim(struct kbase_mem_phy_alloc *alloc) ++{ ++ struct kbase_context *kctx = alloc->imported.kctx; ++ int __maybe_unused new_page_count; + -+ r = kstrtoul(&buffer[0], 10, &val); -+ if (0 != r) { -+ return -EINVAL; -+ } ++ new_page_count = kbase_atomic_add_pages(alloc->nents, ++ &kctx->used_pages); ++ kbase_atomic_add_pages(alloc->nents, &kctx->kbdev->memdev.used_pages); + -+ switch (val) { -+ case 1: -+ mali_executor_group_enable(group); -+ break; -+ case 0: -+ mali_executor_group_disable(group); -+ break; -+ default: -+ return -EINVAL; -+ break; -+ } ++ /* Increase mm counters so that the allocation is accounted for ++ * against the process and thus is visible to the OOM killer. ++ */ ++ kbase_process_page_usage_inc(kctx, alloc->nents); + -+ *offp += count; -+ return count; ++ KBASE_TLSTREAM_AUX_PAGESALLOC( ++ (u32)kctx->id, ++ (u64)new_page_count); +} + -+static const struct file_operations group_enabled_fops = { -+ .owner = THIS_MODULE, -+ .open = open_copy_private_data, -+ .read = group_enabled_read, -+ .write = group_enabled_write, -+}; -+ -+static ssize_t hw_core_base_addr_read(struct file *filp, char __user *buf, size_t count, loff_t *offp) ++int kbase_mem_evictable_make(struct kbase_mem_phy_alloc *gpu_alloc) +{ -+ int r; -+ char buffer[64]; -+ struct mali_hw_core *hw_core; ++ struct kbase_context *kctx = gpu_alloc->imported.kctx; + -+ hw_core = (struct mali_hw_core *)filp->private_data; -+ MALI_DEBUG_ASSERT_POINTER(hw_core); ++ lockdep_assert_held(&kctx->reg_lock); + -+ r = snprintf(buffer, 64, "0x%lX\n", hw_core->phys_addr); ++ /* This alloction can't already be on a list. */ ++ WARN_ON(!list_empty(&gpu_alloc->evict_node)); + -+ return simple_read_from_buffer(buf, count, offp, buffer, r); -+} ++ kbase_mem_shrink_cpu_mapping(kctx, gpu_alloc->reg, ++ 0, gpu_alloc->nents); + -+static const struct file_operations hw_core_base_addr_fops = { -+ .owner = THIS_MODULE, -+ .open = open_copy_private_data, -+ .read = hw_core_base_addr_read, -+}; ++ /* ++ * Add the allocation to the eviction list, after this point the shrink ++ * can reclaim it. ++ */ ++ mutex_lock(&kctx->jit_evict_lock); ++ list_add(&gpu_alloc->evict_node, &kctx->evict_list); ++ mutex_unlock(&kctx->jit_evict_lock); ++ kbase_mem_evictable_mark_reclaim(gpu_alloc); + -+static ssize_t profiling_counter_src_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++ gpu_alloc->reg->flags |= KBASE_REG_DONT_NEED; ++ return 0; ++} ++ ++bool kbase_mem_evictable_unmake(struct kbase_mem_phy_alloc *gpu_alloc) +{ -+ u32 is_pp = PRIVATE_DATA_COUNTER_IS_PP((uintptr_t)filp->private_data); -+ u32 src_id = PRIVATE_DATA_COUNTER_GET_SRC((uintptr_t)filp->private_data); -+ mali_bool is_sub_job = PRIVATE_DATA_COUNTER_IS_SUB_JOB((uintptr_t)filp->private_data); -+ u32 sub_job = PRIVATE_DATA_COUNTER_GET_SUB_JOB((uintptr_t)filp->private_data); -+ char buf[64]; -+ int r; -+ u32 val; ++ struct kbase_context *kctx = gpu_alloc->imported.kctx; ++ int err = 0; + -+ if (MALI_TRUE == is_pp) { -+ /* PP counter */ -+ if (MALI_TRUE == is_sub_job) { -+ /* Get counter for a particular sub job */ -+ if (0 == src_id) { -+ val = mali_pp_job_get_pp_counter_sub_job_src0(sub_job); -+ } else { -+ val = mali_pp_job_get_pp_counter_sub_job_src1(sub_job); -+ } -+ } else { -+ /* Get default counter for all PP sub jobs */ -+ if (0 == src_id) { -+ val = mali_pp_job_get_pp_counter_global_src0(); -+ } else { -+ val = mali_pp_job_get_pp_counter_global_src1(); -+ } -+ } ++ lockdep_assert_held(&kctx->reg_lock); ++ ++ /* ++ * First remove the allocation from the eviction list as it's no ++ * longer eligible for eviction. ++ */ ++ list_del_init(&gpu_alloc->evict_node); ++ ++ if (gpu_alloc->evicted == 0) { ++ /* ++ * The backing is still present, update the VM stats as it's ++ * in use again. ++ */ ++ kbase_mem_evictable_unmark_reclaim(gpu_alloc); + } else { -+ /* GP counter */ -+ if (0 == src_id) { -+ val = mali_gp_job_get_gp_counter_src0(); -+ } else { -+ val = mali_gp_job_get_gp_counter_src1(); ++ /* If the region is still alive ... */ ++ if (gpu_alloc->reg) { ++ /* ... allocate replacement backing ... */ ++ err = kbase_alloc_phy_pages_helper(gpu_alloc, ++ gpu_alloc->evicted); ++ ++ /* ++ * ... and grow the mapping back to its ++ * pre-eviction size. ++ */ ++ if (!err) ++ err = kbase_mem_grow_gpu_mapping(kctx, ++ gpu_alloc->reg, ++ gpu_alloc->evicted, 0); ++ ++ gpu_alloc->evicted = 0; + } + } + -+ if (MALI_HW_CORE_NO_COUNTER == val) { -+ r = snprintf(buf, 64, "-1\n"); -+ } else { -+ r = snprintf(buf, 64, "%u\n", val); -+ } ++ /* If the region is still alive remove the DONT_NEED attribute. */ ++ if (gpu_alloc->reg) ++ gpu_alloc->reg->flags &= ~KBASE_REG_DONT_NEED; + -+ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); ++ return (err == 0); +} + -+static ssize_t profiling_counter_src_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) ++int kbase_mem_flags_change(struct kbase_context *kctx, u64 gpu_addr, unsigned int flags, unsigned int mask) +{ -+ u32 is_pp = PRIVATE_DATA_COUNTER_IS_PP((uintptr_t)filp->private_data); -+ u32 src_id = PRIVATE_DATA_COUNTER_GET_SRC((uintptr_t)filp->private_data); -+ mali_bool is_sub_job = PRIVATE_DATA_COUNTER_IS_SUB_JOB((uintptr_t)filp->private_data); -+ u32 sub_job = PRIVATE_DATA_COUNTER_GET_SUB_JOB((uintptr_t)filp->private_data); -+ char buf[64]; -+ long val; -+ int ret; ++ struct kbase_va_region *reg; ++ int ret = -EINVAL; ++ unsigned int real_flags = 0; ++ unsigned int prev_flags = 0; ++ bool prev_needed, new_needed; + -+ if (cnt >= sizeof(buf)) { ++ KBASE_DEBUG_ASSERT(kctx); ++ ++ if (!gpu_addr) + return -EINVAL; -+ } + -+ if (copy_from_user(&buf, ubuf, cnt)) { -+ return -EFAULT; -+ } ++ if ((gpu_addr & ~PAGE_MASK) && (gpu_addr >= PAGE_SIZE)) ++ return -EINVAL; + -+ buf[cnt] = 0; ++ /* nuke other bits */ ++ flags &= mask; + -+ ret = kstrtol(buf, 10, &val); -+ if (ret < 0) { -+ return ret; -+ } ++ /* check for only supported flags */ ++ if (flags & ~(BASE_MEM_FLAGS_MODIFIABLE)) ++ goto out; + -+ if (val < 0) { -+ /* any negative input will disable counter */ -+ val = MALI_HW_CORE_NO_COUNTER; -+ } ++ /* mask covers bits we don't support? */ ++ if (mask & ~(BASE_MEM_FLAGS_MODIFIABLE)) ++ goto out; + -+ if (MALI_TRUE == is_pp) { -+ /* PP counter */ -+ if (MALI_TRUE == is_sub_job) { -+ /* Set counter for a particular sub job */ -+ if (0 == src_id) { -+ mali_pp_job_set_pp_counter_sub_job_src0(sub_job, (u32)val); -+ } else { -+ mali_pp_job_set_pp_counter_sub_job_src1(sub_job, (u32)val); -+ } -+ } else { -+ /* Set default counter for all PP sub jobs */ -+ if (0 == src_id) { -+ mali_pp_job_set_pp_counter_global_src0((u32)val); -+ } else { -+ mali_pp_job_set_pp_counter_global_src1((u32)val); ++ /* convert flags */ ++ if (BASE_MEM_COHERENT_SYSTEM & flags) ++ real_flags |= KBASE_REG_SHARE_BOTH; ++ else if (BASE_MEM_COHERENT_LOCAL & flags) ++ real_flags |= KBASE_REG_SHARE_IN; ++ ++ /* now we can lock down the context, and find the region */ ++ down_write(¤t->mm->mmap_lock); ++ kbase_gpu_vm_lock(kctx); ++ ++ /* Validate the region */ ++ reg = kbase_region_tracker_find_region_base_address(kctx, gpu_addr); ++ if (!reg || (reg->flags & KBASE_REG_FREE)) ++ goto out_unlock; ++ ++ /* Is the region being transitioning between not needed and needed? */ ++ prev_needed = (KBASE_REG_DONT_NEED & reg->flags) == KBASE_REG_DONT_NEED; ++ new_needed = (BASE_MEM_DONT_NEED & flags) == BASE_MEM_DONT_NEED; ++ if (prev_needed != new_needed) { ++ /* Aliased allocations can't be made ephemeral */ ++ if (atomic_read(®->cpu_alloc->gpu_mappings) > 1) ++ goto out_unlock; ++ ++ if (new_needed) { ++ /* Only native allocations can be marked not needed */ ++ if (reg->cpu_alloc->type != KBASE_MEM_TYPE_NATIVE) { ++ ret = -EINVAL; ++ goto out_unlock; + } -+ } -+ } else { -+ /* GP counter */ -+ if (0 == src_id) { -+ mali_gp_job_set_gp_counter_src0((u32)val); ++ ret = kbase_mem_evictable_make(reg->gpu_alloc); ++ if (ret) ++ goto out_unlock; + } else { -+ mali_gp_job_set_gp_counter_src1((u32)val); ++ kbase_mem_evictable_unmake(reg->gpu_alloc); + } + } + -+ *ppos += cnt; -+ return cnt; -+} ++ /* limit to imported memory */ ++ if ((reg->gpu_alloc->type != KBASE_MEM_TYPE_IMPORTED_UMP) && ++ (reg->gpu_alloc->type != KBASE_MEM_TYPE_IMPORTED_UMM)) ++ goto out_unlock; + -+static const struct file_operations profiling_counter_src_fops = { -+ .owner = THIS_MODULE, -+ .open = open_copy_private_data, -+ .read = profiling_counter_src_read, -+ .write = profiling_counter_src_write, -+}; ++ /* no change? */ ++ if (real_flags == (reg->flags & (KBASE_REG_SHARE_IN | KBASE_REG_SHARE_BOTH))) { ++ ret = 0; ++ goto out_unlock; ++ } + -+static ssize_t l2_l2x_counter_srcx_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos, u32 src_id) -+{ -+ char buf[64]; -+ int r; -+ u32 val; -+ struct mali_l2_cache_core *l2_core = (struct mali_l2_cache_core *)filp->private_data; ++ /* save for roll back */ ++ prev_flags = reg->flags; ++ reg->flags &= ~(KBASE_REG_SHARE_IN | KBASE_REG_SHARE_BOTH); ++ reg->flags |= real_flags; + -+ if (0 == src_id) { -+ val = mali_l2_cache_core_get_counter_src0(l2_core); -+ } else { -+ val = mali_l2_cache_core_get_counter_src1(l2_core); ++ /* Currently supporting only imported memory */ ++ switch (reg->gpu_alloc->type) { ++#ifdef CONFIG_UMP ++ case KBASE_MEM_TYPE_IMPORTED_UMP: ++ ret = kbase_mmu_update_pages(kctx, reg->start_pfn, kbase_get_cpu_phy_pages(reg), reg->gpu_alloc->nents, reg->flags); ++ break; ++#endif ++#ifdef CONFIG_DMA_SHARED_BUFFER ++ case KBASE_MEM_TYPE_IMPORTED_UMM: ++ /* Future use will use the new flags, existing mapping will NOT be updated ++ * as memory should not be in use by the GPU when updating the flags. ++ */ ++ ret = 0; ++ WARN_ON(reg->gpu_alloc->imported.umm.current_mapping_usage_count); ++ break; ++#endif ++ default: ++ break; + } + -+ if (MALI_HW_CORE_NO_COUNTER == val) { -+ r = snprintf(buf, 64, "-1\n"); -+ } else { -+ r = snprintf(buf, 64, "%u\n", val); -+ } -+ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); ++ /* roll back on error, i.e. not UMP */ ++ if (ret) ++ reg->flags = prev_flags; ++ ++out_unlock: ++ kbase_gpu_vm_unlock(kctx); ++ up_write(¤t->mm->mmap_lock); ++out: ++ return ret; +} + -+static ssize_t l2_l2x_counter_srcx_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos, u32 src_id) ++#define KBASE_MEM_IMPORT_HAVE_PAGES (1UL << BASE_MEM_FLAGS_NR_BITS) ++ ++#ifdef CONFIG_UMP ++static struct kbase_va_region *kbase_mem_from_ump(struct kbase_context *kctx, ump_secure_id id, u64 *va_pages, u64 *flags) +{ -+ struct mali_l2_cache_core *l2_core = (struct mali_l2_cache_core *)filp->private_data; -+ char buf[64]; -+ long val; -+ int ret; ++ struct kbase_va_region *reg; ++ ump_dd_handle umph; ++ u64 block_count; ++ const ump_dd_physical_block_64 *block_array; ++ u64 i, j; ++ int page = 0; ++ ump_alloc_flags ump_flags; ++ ump_alloc_flags cpu_flags; ++ ump_alloc_flags gpu_flags; + -+ if (cnt >= sizeof(buf)) { -+ return -EINVAL; -+ } ++ if (*flags & BASE_MEM_SECURE) ++ goto bad_flags; + -+ if (copy_from_user(&buf, ubuf, cnt)) { -+ return -EFAULT; -+ } ++ umph = ump_dd_from_secure_id(id); ++ if (UMP_DD_INVALID_MEMORY_HANDLE == umph) ++ goto bad_id; + -+ buf[cnt] = 0; ++ ump_flags = ump_dd_allocation_flags_get(umph); ++ cpu_flags = (ump_flags >> UMP_DEVICE_CPU_SHIFT) & UMP_DEVICE_MASK; ++ gpu_flags = (ump_flags >> DEFAULT_UMP_GPU_DEVICE_SHIFT) & ++ UMP_DEVICE_MASK; + -+ ret = kstrtol(buf, 10, &val); -+ if (ret < 0) { -+ return ret; -+ } ++ *va_pages = ump_dd_size_get_64(umph); ++ *va_pages >>= PAGE_SHIFT; + -+ if (val < 0) { -+ /* any negative input will disable counter */ -+ val = MALI_HW_CORE_NO_COUNTER; -+ } ++ if (!*va_pages) ++ goto bad_size; + -+ mali_l2_cache_core_set_counter_src(l2_core, src_id, (u32)val); ++ if (*va_pages > (U64_MAX / PAGE_SIZE)) ++ /* 64-bit address range is the max */ ++ goto bad_size; + -+ *ppos += cnt; -+ return cnt; -+} ++ if (*flags & BASE_MEM_SAME_VA) ++ reg = kbase_alloc_free_region(kctx, 0, *va_pages, KBASE_REG_ZONE_SAME_VA); ++ else ++ reg = kbase_alloc_free_region(kctx, 0, *va_pages, KBASE_REG_ZONE_CUSTOM_VA); + -+static ssize_t l2_all_counter_srcx_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos, u32 src_id) -+{ -+ char buf[64]; -+ long val; -+ int ret; -+ u32 l2_id; -+ struct mali_l2_cache_core *l2_cache; ++ if (!reg) ++ goto no_region; + -+ if (cnt >= sizeof(buf)) { -+ return -EINVAL; -+ } ++ /* we've got pages to map now, and support SAME_VA */ ++ *flags |= KBASE_MEM_IMPORT_HAVE_PAGES; + -+ if (copy_from_user(&buf, ubuf, cnt)) { -+ return -EFAULT; -+ } ++ reg->gpu_alloc = kbase_alloc_create(*va_pages, KBASE_MEM_TYPE_IMPORTED_UMP); ++ if (IS_ERR_OR_NULL(reg->gpu_alloc)) ++ goto no_alloc_obj; + -+ buf[cnt] = 0; ++ reg->cpu_alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); + -+ ret = kstrtol(buf, 10, &val); -+ if (ret < 0) { -+ return ret; ++ reg->gpu_alloc->imported.ump_handle = umph; ++ ++ reg->flags &= ~KBASE_REG_FREE; ++ reg->flags |= KBASE_REG_GPU_NX; /* UMP is always No eXecute */ ++ reg->flags &= ~KBASE_REG_GROWABLE; /* UMP cannot be grown */ ++ ++ /* Override import flags based on UMP flags */ ++ *flags &= ~(BASE_MEM_CACHED_CPU); ++ *flags &= ~(BASE_MEM_PROT_CPU_RD | BASE_MEM_PROT_CPU_WR); ++ *flags &= ~(BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR); ++ ++ if ((cpu_flags & (UMP_HINT_DEVICE_RD | UMP_HINT_DEVICE_WR)) == ++ (UMP_HINT_DEVICE_RD | UMP_HINT_DEVICE_WR)) { ++ reg->flags |= KBASE_REG_CPU_CACHED; ++ *flags |= BASE_MEM_CACHED_CPU; + } + -+ if (val < 0) { -+ /* any negative input will disable counter */ -+ val = MALI_HW_CORE_NO_COUNTER; ++ if (cpu_flags & UMP_PROT_CPU_WR) { ++ reg->flags |= KBASE_REG_CPU_WR; ++ *flags |= BASE_MEM_PROT_CPU_WR; + } + -+ l2_id = 0; -+ l2_cache = mali_l2_cache_core_get_glob_l2_core(l2_id); -+ while (NULL != l2_cache) { -+ mali_l2_cache_core_set_counter_src(l2_cache, src_id, (u32)val); ++ if (cpu_flags & UMP_PROT_CPU_RD) { ++ reg->flags |= KBASE_REG_CPU_RD; ++ *flags |= BASE_MEM_PROT_CPU_RD; ++ } + -+ /* try next L2 */ -+ l2_id++; -+ l2_cache = mali_l2_cache_core_get_glob_l2_core(l2_id); ++ if ((gpu_flags & (UMP_HINT_DEVICE_RD | UMP_HINT_DEVICE_WR)) == ++ (UMP_HINT_DEVICE_RD | UMP_HINT_DEVICE_WR)) ++ reg->flags |= KBASE_REG_GPU_CACHED; ++ ++ if (gpu_flags & UMP_PROT_DEVICE_WR) { ++ reg->flags |= KBASE_REG_GPU_WR; ++ *flags |= BASE_MEM_PROT_GPU_WR; + } + -+ *ppos += cnt; -+ return cnt; -+} ++ if (gpu_flags & UMP_PROT_DEVICE_RD) { ++ reg->flags |= KBASE_REG_GPU_RD; ++ *flags |= BASE_MEM_PROT_GPU_RD; ++ } + -+static ssize_t l2_l2x_counter_src0_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ return l2_l2x_counter_srcx_read(filp, ubuf, cnt, ppos, 0); -+} ++ /* ump phys block query */ ++ ump_dd_phys_blocks_get_64(umph, &block_count, &block_array); + -+static ssize_t l2_l2x_counter_src1_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ return l2_l2x_counter_srcx_read(filp, ubuf, cnt, ppos, 1); -+} ++ for (i = 0; i < block_count; i++) { ++ for (j = 0; j < (block_array[i].size >> PAGE_SHIFT); j++) { ++ reg->gpu_alloc->pages[page] = block_array[i].addr + (j << PAGE_SHIFT); ++ page++; ++ } ++ } ++ reg->gpu_alloc->nents = *va_pages; ++ reg->extent = 0; + -+static ssize_t l2_l2x_counter_src0_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ return l2_l2x_counter_srcx_write(filp, ubuf, cnt, ppos, 0); -+} ++ return reg; + -+static ssize_t l2_l2x_counter_src1_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ return l2_l2x_counter_srcx_write(filp, ubuf, cnt, ppos, 1); ++no_alloc_obj: ++ kfree(reg); ++no_region: ++bad_size: ++ ump_dd_release(umph); ++bad_id: ++bad_flags: ++ return NULL; +} ++#endif /* CONFIG_UMP */ + -+static ssize_t l2_all_counter_src0_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) ++#ifdef CONFIG_DMA_SHARED_BUFFER ++static struct kbase_va_region *kbase_mem_from_umm(struct kbase_context *kctx, ++ int fd, u64 *va_pages, u64 *flags, u32 padding) +{ -+ return l2_all_counter_srcx_write(filp, ubuf, cnt, ppos, 0); -+} ++ struct kbase_va_region *reg; ++ struct dma_buf *dma_buf; ++ struct dma_buf_attachment *dma_attachment; ++ bool shared_zone = false; + -+static ssize_t l2_all_counter_src1_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ return l2_all_counter_srcx_write(filp, ubuf, cnt, ppos, 1); -+} ++ dma_buf = dma_buf_get(fd); ++ if (IS_ERR_OR_NULL(dma_buf)) ++ goto no_buf; + -+static const struct file_operations l2_l2x_counter_src0_fops = { -+ .owner = THIS_MODULE, -+ .open = open_copy_private_data, -+ .read = l2_l2x_counter_src0_read, -+ .write = l2_l2x_counter_src0_write, -+}; ++ dma_attachment = dma_buf_attach(dma_buf, kctx->kbdev->dev); ++ if (!dma_attachment) ++ goto no_attachment; + -+static const struct file_operations l2_l2x_counter_src1_fops = { -+ .owner = THIS_MODULE, -+ .open = open_copy_private_data, -+ .read = l2_l2x_counter_src1_read, -+ .write = l2_l2x_counter_src1_write, -+}; ++ *va_pages = (PAGE_ALIGN(dma_buf->size) >> PAGE_SHIFT) + padding; ++ if (!*va_pages) ++ goto bad_size; + -+static const struct file_operations l2_all_counter_src0_fops = { -+ .owner = THIS_MODULE, -+ .write = l2_all_counter_src0_write, -+}; ++ if (*va_pages > (U64_MAX / PAGE_SIZE)) ++ /* 64-bit address range is the max */ ++ goto bad_size; + -+static const struct file_operations l2_all_counter_src1_fops = { -+ .owner = THIS_MODULE, -+ .write = l2_all_counter_src1_write, -+}; ++ /* ignore SAME_VA */ ++ *flags &= ~BASE_MEM_SAME_VA; + -+static ssize_t l2_l2x_counter_valx_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos, u32 src_id) -+{ -+ char buf[64]; -+ int r; -+ u32 src0 = 0; -+ u32 val0 = 0; -+ u32 src1 = 0; -+ u32 val1 = 0; -+ u32 val = -1; -+ struct mali_l2_cache_core *l2_core = (struct mali_l2_cache_core *)filp->private_data; ++ if (*flags & BASE_MEM_IMPORT_SHARED) ++ shared_zone = true; + -+ mali_l2_cache_core_get_counter_values(l2_core, &src0, &val0, &src1, &val1); ++#ifdef CONFIG_64BIT ++ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { ++ /* ++ * 64-bit tasks require us to reserve VA on the CPU that we use ++ * on the GPU. ++ */ ++ shared_zone = true; ++ } ++#endif + -+ if (0 == src_id) { -+ if (MALI_HW_CORE_NO_COUNTER != val0) { -+ val = val0; -+ } ++ if (shared_zone) { ++ *flags |= BASE_MEM_NEED_MMAP; ++ reg = kbase_alloc_free_region(kctx, 0, *va_pages, KBASE_REG_ZONE_SAME_VA); + } else { -+ if (MALI_HW_CORE_NO_COUNTER != val1) { -+ val = val1; -+ } ++ reg = kbase_alloc_free_region(kctx, 0, *va_pages, KBASE_REG_ZONE_CUSTOM_VA); + } + -+ r = snprintf(buf, 64, "%u\n", val); ++ if (!reg) ++ goto no_region; + -+ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); -+} ++ reg->gpu_alloc = kbase_alloc_create(*va_pages, KBASE_MEM_TYPE_IMPORTED_UMM); ++ if (IS_ERR_OR_NULL(reg->gpu_alloc)) ++ goto no_alloc_obj; + -+static ssize_t l2_l2x_counter_val0_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ return l2_l2x_counter_valx_read(filp, ubuf, cnt, ppos, 0); -+} ++ reg->cpu_alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); + -+static ssize_t l2_l2x_counter_val1_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ return l2_l2x_counter_valx_read(filp, ubuf, cnt, ppos, 1); -+} ++ /* No pages to map yet */ ++ reg->gpu_alloc->nents = 0; + -+static const struct file_operations l2_l2x_counter_val0_fops = { -+ .owner = THIS_MODULE, -+ .open = open_copy_private_data, -+ .read = l2_l2x_counter_val0_read, -+}; ++ if (kbase_update_region_flags(kctx, reg, *flags) != 0) ++ goto invalid_flags; + -+static const struct file_operations l2_l2x_counter_val1_fops = { -+ .owner = THIS_MODULE, -+ .open = open_copy_private_data, -+ .read = l2_l2x_counter_val1_read, -+}; ++ reg->flags &= ~KBASE_REG_FREE; ++ reg->flags |= KBASE_REG_GPU_NX; /* UMM is always No eXecute */ ++ reg->flags &= ~KBASE_REG_GROWABLE; /* UMM cannot be grown */ ++ reg->flags |= KBASE_REG_GPU_CACHED; + -+static ssize_t power_always_on_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ unsigned long val; -+ int ret; -+ char buf[32]; ++ if (*flags & BASE_MEM_SECURE) ++ reg->flags |= KBASE_REG_SECURE; + -+ cnt = min(cnt, sizeof(buf) - 1); -+ if (copy_from_user(buf, ubuf, cnt)) { -+ return -EFAULT; -+ } -+ buf[cnt] = '\0'; ++ if (padding) ++ reg->flags |= KBASE_REG_IMPORT_PAD; + -+ ret = kstrtoul(buf, 10, &val); -+ if (0 != ret) { -+ return ret; -+ } ++ reg->gpu_alloc->type = KBASE_MEM_TYPE_IMPORTED_UMM; ++ reg->gpu_alloc->imported.umm.sgt = NULL; ++ reg->gpu_alloc->imported.umm.dma_buf = dma_buf; ++ reg->gpu_alloc->imported.umm.dma_attachment = dma_attachment; ++ reg->gpu_alloc->imported.umm.current_mapping_usage_count = 0; ++ reg->extent = 0; + -+ /* Update setting (not exactly thread safe) */ -+ if (1 == val && MALI_FALSE == power_always_on_enabled) { -+ power_always_on_enabled = MALI_TRUE; -+ _mali_osk_pm_dev_ref_get_sync(); -+ } else if (0 == val && MALI_TRUE == power_always_on_enabled) { -+ power_always_on_enabled = MALI_FALSE; -+ _mali_osk_pm_dev_ref_put(); -+ } ++ return reg; + -+ *ppos += cnt; -+ return cnt; ++invalid_flags: ++ kbase_mem_phy_alloc_put(reg->gpu_alloc); ++no_alloc_obj: ++ kfree(reg); ++no_region: ++bad_size: ++ dma_buf_detach(dma_buf, dma_attachment); ++no_attachment: ++ dma_buf_put(dma_buf); ++no_buf: ++ return NULL; +} ++#endif /* CONFIG_DMA_SHARED_BUFFER */ + -+static ssize_t power_always_on_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++static u32 kbase_get_cache_line_alignment(struct kbase_context *kctx) +{ -+ if (MALI_TRUE == power_always_on_enabled) { -+ return simple_read_from_buffer(ubuf, cnt, ppos, "1\n", 2); -+ } else { -+ return simple_read_from_buffer(ubuf, cnt, ppos, "0\n", 2); -+ } -+} ++ u32 cpu_cache_line_size = cache_line_size(); ++ u32 gpu_cache_line_size = ++ (1UL << kctx->kbdev->gpu_props.props.l2_props.log2_line_size); + -+static const struct file_operations power_always_on_fops = { -+ .owner = THIS_MODULE, -+ .read = power_always_on_read, -+ .write = power_always_on_write, -+}; ++ return ((cpu_cache_line_size > gpu_cache_line_size) ? ++ cpu_cache_line_size : ++ gpu_cache_line_size); ++} + -+static ssize_t power_power_events_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) ++static struct kbase_va_region *kbase_mem_from_user_buffer( ++ struct kbase_context *kctx, unsigned long address, ++ unsigned long size, u64 *va_pages, u64 *flags) +{ -+ if (!strncmp(ubuf, mali_power_events[_MALI_DEVICE_SUSPEND], strlen(mali_power_events[_MALI_DEVICE_SUSPEND]) - 1)) { -+ mali_pm_os_suspend(MALI_TRUE); -+ } else if (!strncmp(ubuf, mali_power_events[_MALI_DEVICE_RESUME], strlen(mali_power_events[_MALI_DEVICE_RESUME]) - 1)) { -+ mali_pm_os_resume(); -+ } else if (!strncmp(ubuf, mali_power_events[_MALI_DEVICE_DVFS_PAUSE], strlen(mali_power_events[_MALI_DEVICE_DVFS_PAUSE]) - 1)) { -+ mali_dev_pause(); -+ } else if (!strncmp(ubuf, mali_power_events[_MALI_DEVICE_DVFS_RESUME], strlen(mali_power_events[_MALI_DEVICE_DVFS_RESUME]) - 1)) { -+ mali_dev_resume(); ++ long i; ++ struct kbase_va_region *reg; ++ long faulted_pages; ++ int zone = KBASE_REG_ZONE_CUSTOM_VA; ++ bool shared_zone = false; ++ u32 cache_line_alignment = kbase_get_cache_line_alignment(kctx); ++ struct kbase_alloc_import_user_buf *user_buf; ++ struct page **pages = NULL; ++ ++ if ((address & (cache_line_alignment - 1)) != 0 || ++ (size & (cache_line_alignment - 1)) != 0) { ++ /* Coherency must be enabled to handle partial cache lines */ ++ if (*flags & (BASE_MEM_COHERENT_SYSTEM | ++ BASE_MEM_COHERENT_SYSTEM_REQUIRED)) { ++ /* Force coherent system required flag, import will ++ * then fail if coherency isn't available ++ */ ++ *flags |= BASE_MEM_COHERENT_SYSTEM_REQUIRED; ++ } else { ++ dev_warn(kctx->kbdev->dev, ++ "User buffer is not cache line aligned and no coherency enabled\n"); ++ goto bad_size; ++ } + } -+ *ppos += cnt; -+ return cnt; -+} + -+static loff_t power_power_events_seek(struct file *file, loff_t offset, int orig) -+{ -+ file->f_pos = offset; -+ return 0; -+} ++ *va_pages = (PAGE_ALIGN(address + size) >> PAGE_SHIFT) - ++ PFN_DOWN(address); ++ if (!*va_pages) ++ goto bad_size; + -+static const struct file_operations power_power_events_fops = { -+ .owner = THIS_MODULE, -+ .write = power_power_events_write, -+ .llseek = power_power_events_seek, -+}; ++ if (*va_pages > (UINT64_MAX / PAGE_SIZE)) ++ /* 64-bit address range is the max */ ++ goto bad_size; + -+#if MALI_STATE_TRACKING -+static int mali_seq_internal_state_show(struct seq_file *seq_file, void *v) -+{ -+ u32 len = 0; -+ u32 size; -+ char *buf; ++ /* SAME_VA generally not supported with imported memory (no known use cases) */ ++ *flags &= ~BASE_MEM_SAME_VA; + -+ size = seq_get_buf(seq_file, &buf); ++ if (*flags & BASE_MEM_IMPORT_SHARED) ++ shared_zone = true; + -+ if (!size) { -+ return -ENOMEM; ++#ifdef CONFIG_64BIT ++ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { ++ /* ++ * 64-bit tasks require us to reserve VA on the CPU that we use ++ * on the GPU. ++ */ ++ shared_zone = true; + } ++#endif + -+ /* Create the internal state dump. */ -+ len = snprintf(buf + len, size - len, "Mali device driver %s\n", SVN_REV_STRING); -+ len += snprintf(buf + len, size - len, "License: %s\n\n", MALI_KERNEL_LINUX_LICENSE); ++ if (shared_zone) { ++ *flags |= BASE_MEM_NEED_MMAP; ++ zone = KBASE_REG_ZONE_SAME_VA; ++ } + -+ len += _mali_kernel_core_dump_state(buf + len, size - len); ++ reg = kbase_alloc_free_region(kctx, 0, *va_pages, zone); + -+ seq_commit(seq_file, len); ++ if (!reg) ++ goto no_region; + -+ return 0; -+} ++ reg->gpu_alloc = kbase_alloc_create(*va_pages, ++ KBASE_MEM_TYPE_IMPORTED_USER_BUF); ++ if (IS_ERR_OR_NULL(reg->gpu_alloc)) ++ goto no_alloc_obj; + -+static int mali_seq_internal_state_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, mali_seq_internal_state_show, NULL); -+} ++ reg->cpu_alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); + -+static const struct file_operations mali_seq_internal_state_fops = { -+ .owner = THIS_MODULE, -+ .open = mali_seq_internal_state_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+#endif /* MALI_STATE_TRACKING */ ++ if (kbase_update_region_flags(kctx, reg, *flags) != 0) ++ goto invalid_flags; + -+#if defined(CONFIG_MALI400_INTERNAL_PROFILING) -+static ssize_t profiling_record_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ char buf[64]; -+ int r; ++ reg->flags &= ~KBASE_REG_FREE; ++ reg->flags |= KBASE_REG_GPU_NX; /* User-buffers are always No eXecute */ ++ reg->flags &= ~KBASE_REG_GROWABLE; /* Cannot be grown */ ++ reg->flags &= ~KBASE_REG_CPU_CACHED; + -+ r = snprintf(buf, 64, "%u\n", _mali_internal_profiling_is_recording() ? 1 : 0); -+ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); -+} ++ user_buf = ®->gpu_alloc->imported.user_buf; + -+static ssize_t profiling_record_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ char buf[64]; -+ unsigned long val; -+ int ret; ++ user_buf->size = size; ++ user_buf->address = address; ++ user_buf->nr_pages = *va_pages; ++ user_buf->mm = current->mm; ++ user_buf->pages = kmalloc_array(*va_pages, sizeof(struct page *), ++ GFP_KERNEL); + -+ if (cnt >= sizeof(buf)) { -+ return -EINVAL; -+ } ++ if (!user_buf->pages) ++ goto no_page_array; + -+ if (copy_from_user(&buf, ubuf, cnt)) { -+ return -EFAULT; ++ /* If the region is coherent with the CPU then the memory is imported ++ * and mapped onto the GPU immediately. ++ * Otherwise get_user_pages is called as a sanity check, but with ++ * NULL as the pages argument which will fault the pages, but not ++ * pin them. The memory will then be pinned only around the jobs that ++ * specify the region as an external resource. ++ */ ++ if (reg->flags & KBASE_REG_SHARE_BOTH) { ++ pages = user_buf->pages; ++ *flags |= KBASE_MEM_IMPORT_HAVE_PAGES; + } + -+ buf[cnt] = 0; ++ down_read(¤t->mm->mmap_lock); + -+ ret = kstrtoul(buf, 10, &val); -+ if (ret < 0) { -+ return ret; -+ } ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++ faulted_pages = get_user_pages(current, current->mm, address, *va_pages, ++ reg->flags & KBASE_REG_GPU_WR, 0, pages, NULL); ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ faulted_pages = get_user_pages(address, *va_pages, ++ reg->flags & KBASE_REG_GPU_WR, 0, pages, NULL); ++#else ++ faulted_pages = get_user_pages(address, *va_pages, ++ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, ++ pages, NULL); ++#endif + -+ if (val != 0) { -+ u32 limit = MALI_PROFILING_MAX_BUFFER_ENTRIES; /* This can be made configurable at a later stage if we need to */ ++ up_read(¤t->mm->mmap_lock); + -+ /* check if we are already recording */ -+ if (MALI_TRUE == _mali_internal_profiling_is_recording()) { -+ MALI_DEBUG_PRINT(3, ("Recording of profiling events already in progress\n")); -+ return -EFAULT; -+ } ++ if (faulted_pages != *va_pages) ++ goto fault_mismatch; + -+ /* check if we need to clear out an old recording first */ -+ if (MALI_TRUE == _mali_internal_profiling_have_recording()) { -+ if (_MALI_OSK_ERR_OK != _mali_internal_profiling_clear()) { -+ MALI_DEBUG_PRINT(3, ("Failed to clear existing recording of profiling events\n")); -+ return -EFAULT; -+ } -+ } ++ atomic_inc(¤t->mm->mm_count); + -+ /* start recording profiling data */ -+ if (_MALI_OSK_ERR_OK != _mali_internal_profiling_start(&limit)) { -+ MALI_DEBUG_PRINT(3, ("Failed to start recording of profiling events\n")); -+ return -EFAULT; -+ } ++ reg->gpu_alloc->nents = 0; ++ reg->extent = 0; + -+ MALI_DEBUG_PRINT(3, ("Profiling recording started (max %u events)\n", limit)); -+ } else { -+ /* stop recording profiling data */ -+ u32 count = 0; -+ if (_MALI_OSK_ERR_OK != _mali_internal_profiling_stop(&count)) { -+ MALI_DEBUG_PRINT(2, ("Failed to stop recording of profiling events\n")); -+ return -EFAULT; -+ } ++ if (pages) { ++ struct device *dev = kctx->kbdev->dev; ++ unsigned long local_size = user_buf->size; ++ unsigned long offset = user_buf->address & ~PAGE_MASK; ++ phys_addr_t *pa = kbase_get_gpu_phy_pages(reg); + -+ MALI_DEBUG_PRINT(2, ("Profiling recording stopped (recorded %u events)\n", count)); -+ } ++ /* Top bit signifies that this was pinned on import */ ++ user_buf->current_mapping_usage_count |= PINNED_ON_IMPORT; + -+ *ppos += cnt; -+ return cnt; -+} ++ for (i = 0; i < faulted_pages; i++) { ++ dma_addr_t dma_addr; ++ unsigned long min; + -+static const struct file_operations profiling_record_fops = { -+ .owner = THIS_MODULE, -+ .read = profiling_record_read, -+ .write = profiling_record_write, -+}; ++ min = MIN(PAGE_SIZE - offset, local_size); ++ dma_addr = dma_map_page(dev, pages[i], ++ offset, min, ++ DMA_BIDIRECTIONAL); ++ if (dma_mapping_error(dev, dma_addr)) ++ goto unwind_dma_map; + -+static void *profiling_events_start(struct seq_file *s, loff_t *pos) -+{ -+ loff_t *spos; ++ user_buf->dma_addrs[i] = dma_addr; ++ pa[i] = page_to_phys(pages[i]); + -+ /* check if we have data avaiable */ -+ if (MALI_TRUE != _mali_internal_profiling_have_recording()) { -+ return NULL; -+ } ++ local_size -= min; ++ offset = 0; ++ } + -+ spos = kmalloc(sizeof(loff_t), GFP_KERNEL); -+ if (NULL == spos) { -+ return NULL; ++ reg->gpu_alloc->nents = faulted_pages; + } + -+ *spos = *pos; -+ return spos; -+} -+ -+static void *profiling_events_next(struct seq_file *s, void *v, loff_t *pos) -+{ -+ loff_t *spos = v; ++ return reg; + -+ /* check if we have data avaiable */ -+ if (MALI_TRUE != _mali_internal_profiling_have_recording()) { -+ return NULL; ++unwind_dma_map: ++ while (i--) { ++ dma_unmap_page(kctx->kbdev->dev, ++ user_buf->dma_addrs[i], ++ PAGE_SIZE, DMA_BIDIRECTIONAL); + } -+ -+ /* check if the next entry actually is avaiable */ -+ if (_mali_internal_profiling_get_count() <= (u32)(*spos + 1)) { -+ return NULL; ++fault_mismatch: ++ if (pages) { ++ for (i = 0; i < faulted_pages; i++) ++ put_page(pages[i]); + } ++ kfree(user_buf->pages); ++no_page_array: ++invalid_flags: ++ kbase_mem_phy_alloc_put(reg->cpu_alloc); ++ kbase_mem_phy_alloc_put(reg->gpu_alloc); ++no_alloc_obj: ++ kfree(reg); ++no_region: ++bad_size: ++ return NULL; + -+ *pos = ++*spos; -+ return spos; +} + -+static void profiling_events_stop(struct seq_file *s, void *v) -+{ -+ kfree(v); -+} + -+static int profiling_events_show(struct seq_file *seq_file, void *v) ++u64 kbase_mem_alias(struct kbase_context *kctx, u64 *flags, u64 stride, ++ u64 nents, struct base_mem_aliasing_info *ai, ++ u64 *num_pages) +{ -+ loff_t *spos = v; -+ u32 index; -+ u64 timestamp; -+ u32 event_id; -+ u32 data[5]; ++ struct kbase_va_region *reg; ++ u64 gpu_va; ++ size_t i; ++ bool coherent; + -+ index = (u32) * spos; ++ KBASE_DEBUG_ASSERT(kctx); ++ KBASE_DEBUG_ASSERT(flags); ++ KBASE_DEBUG_ASSERT(ai); ++ KBASE_DEBUG_ASSERT(num_pages); + -+ /* Retrieve all events */ -+ if (_MALI_OSK_ERR_OK == _mali_internal_profiling_get_event(index, ×tamp, &event_id, data)) { -+ seq_printf(seq_file, "%llu %u %u %u %u %u %u\n", timestamp, event_id, data[0], data[1], data[2], data[3], data[4]); -+ return 0; -+ } ++ /* mask to only allowed flags */ ++ *flags &= (BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR | ++ BASE_MEM_COHERENT_SYSTEM | BASE_MEM_COHERENT_LOCAL | ++ BASE_MEM_COHERENT_SYSTEM_REQUIRED); + -+ return 0; -+} ++ if (!(*flags & (BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR))) { ++ dev_warn(kctx->kbdev->dev, ++ "kbase_mem_alias called with bad flags (%llx)", ++ (unsigned long long)*flags); ++ goto bad_flags; ++ } ++ coherent = (*flags & BASE_MEM_COHERENT_SYSTEM) != 0 || ++ (*flags & BASE_MEM_COHERENT_SYSTEM_REQUIRED) != 0; + -+static int profiling_events_show_human_readable(struct seq_file *seq_file, void *v) -+{ -+#define MALI_EVENT_ID_IS_HW(event_id) (((event_id & 0x00FF0000) >= MALI_PROFILING_EVENT_CHANNEL_GP0) && ((event_id & 0x00FF0000) <= MALI_PROFILING_EVENT_CHANNEL_PP7)) ++ if (!stride) ++ goto bad_stride; + -+ static u64 start_time = 0; -+ loff_t *spos = v; -+ u32 index; -+ u64 timestamp; -+ u32 event_id; -+ u32 data[5]; ++ if (!nents) ++ goto bad_nents; + -+ index = (u32) * spos; ++ if ((nents * stride) > (U64_MAX / PAGE_SIZE)) ++ /* 64-bit address range is the max */ ++ goto bad_size; + -+ /* Retrieve all events */ -+ if (_MALI_OSK_ERR_OK == _mali_internal_profiling_get_event(index, ×tamp, &event_id, data)) { -+ seq_printf(seq_file, "%llu %u %u %u %u %u %u # ", timestamp, event_id, data[0], data[1], data[2], data[3], data[4]); ++ /* calculate the number of pages this alias will cover */ ++ *num_pages = nents * stride; + -+ if (0 == index) { -+ start_time = timestamp; -+ } ++#ifdef CONFIG_64BIT ++ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { ++ /* 64-bit tasks must MMAP anyway, but not expose this address to ++ * clients */ ++ *flags |= BASE_MEM_NEED_MMAP; ++ reg = kbase_alloc_free_region(kctx, 0, *num_pages, ++ KBASE_REG_ZONE_SAME_VA); ++ } else { ++#else ++ if (1) { ++#endif ++ reg = kbase_alloc_free_region(kctx, 0, *num_pages, ++ KBASE_REG_ZONE_CUSTOM_VA); ++ } + -+ seq_printf(seq_file, "[%06u] ", index); ++ if (!reg) ++ goto no_reg; + -+ switch (event_id & 0x0F000000) { -+ case MALI_PROFILING_EVENT_TYPE_SINGLE: -+ seq_printf(seq_file, "SINGLE | "); -+ break; -+ case MALI_PROFILING_EVENT_TYPE_START: -+ seq_printf(seq_file, "START | "); -+ break; -+ case MALI_PROFILING_EVENT_TYPE_STOP: -+ seq_printf(seq_file, "STOP | "); -+ break; -+ case MALI_PROFILING_EVENT_TYPE_SUSPEND: -+ seq_printf(seq_file, "SUSPEND | "); -+ break; -+ case MALI_PROFILING_EVENT_TYPE_RESUME: -+ seq_printf(seq_file, "RESUME | "); -+ break; -+ default: -+ seq_printf(seq_file, "0x%01X | ", (event_id & 0x0F000000) >> 24); -+ break; -+ } ++ /* zero-sized page array, as we don't need one/can support one */ ++ reg->gpu_alloc = kbase_alloc_create(0, KBASE_MEM_TYPE_ALIAS); ++ if (IS_ERR_OR_NULL(reg->gpu_alloc)) ++ goto no_alloc_obj; + -+ switch (event_id & 0x00FF0000) { -+ case MALI_PROFILING_EVENT_CHANNEL_SOFTWARE: -+ seq_printf(seq_file, "SW | "); -+ break; -+ case MALI_PROFILING_EVENT_CHANNEL_GP0: -+ seq_printf(seq_file, "GP0 | "); -+ break; -+ case MALI_PROFILING_EVENT_CHANNEL_PP0: -+ seq_printf(seq_file, "PP0 | "); -+ break; -+ case MALI_PROFILING_EVENT_CHANNEL_PP1: -+ seq_printf(seq_file, "PP1 | "); -+ break; -+ case MALI_PROFILING_EVENT_CHANNEL_PP2: -+ seq_printf(seq_file, "PP2 | "); -+ break; -+ case MALI_PROFILING_EVENT_CHANNEL_PP3: -+ seq_printf(seq_file, "PP3 | "); -+ break; -+ case MALI_PROFILING_EVENT_CHANNEL_PP4: -+ seq_printf(seq_file, "PP4 | "); -+ break; -+ case MALI_PROFILING_EVENT_CHANNEL_PP5: -+ seq_printf(seq_file, "PP5 | "); -+ break; -+ case MALI_PROFILING_EVENT_CHANNEL_PP6: -+ seq_printf(seq_file, "PP6 | "); -+ break; -+ case MALI_PROFILING_EVENT_CHANNEL_PP7: -+ seq_printf(seq_file, "PP7 | "); -+ break; -+ case MALI_PROFILING_EVENT_CHANNEL_GPU: -+ seq_printf(seq_file, "GPU | "); -+ break; -+ default: -+ seq_printf(seq_file, "0x%02X | ", (event_id & 0x00FF0000) >> 16); -+ break; -+ } ++ reg->cpu_alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); + -+ if (MALI_EVENT_ID_IS_HW(event_id)) { -+ if (((event_id & 0x0F000000) == MALI_PROFILING_EVENT_TYPE_START) || ((event_id & 0x0F000000) == MALI_PROFILING_EVENT_TYPE_STOP)) { -+ switch (event_id & 0x0000FFFF) { -+ case MALI_PROFILING_EVENT_REASON_START_STOP_HW_PHYSICAL: -+ seq_printf(seq_file, "PHYSICAL | "); -+ break; -+ case MALI_PROFILING_EVENT_REASON_START_STOP_HW_VIRTUAL: -+ seq_printf(seq_file, "VIRTUAL | "); -+ break; -+ default: -+ seq_printf(seq_file, "0x%04X | ", event_id & 0x0000FFFF); -+ break; -+ } -+ } else { -+ seq_printf(seq_file, "0x%04X | ", event_id & 0x0000FFFF); -+ } -+ } else { -+ seq_printf(seq_file, "0x%04X | ", event_id & 0x0000FFFF); -+ } ++ if (kbase_update_region_flags(kctx, reg, *flags) != 0) ++ goto invalid_flags; + -+ seq_printf(seq_file, "T0 + 0x%016llX\n", timestamp - start_time); ++ reg->gpu_alloc->imported.alias.nents = nents; ++ reg->gpu_alloc->imported.alias.stride = stride; ++ reg->gpu_alloc->imported.alias.aliased = vzalloc(sizeof(*reg->gpu_alloc->imported.alias.aliased) * nents); ++ if (!reg->gpu_alloc->imported.alias.aliased) ++ goto no_aliased_array; + -+ return 0; -+ } ++ kbase_gpu_vm_lock(kctx); + -+ return 0; -+} ++ /* validate and add src handles */ ++ for (i = 0; i < nents; i++) { ++ if (ai[i].handle.basep.handle < BASE_MEM_FIRST_FREE_ADDRESS) { ++ if (ai[i].handle.basep.handle != ++ BASEP_MEM_WRITE_ALLOC_PAGES_HANDLE) ++ goto bad_handle; /* unsupported magic handle */ ++ if (!ai[i].length) ++ goto bad_handle; /* must be > 0 */ ++ if (ai[i].length > stride) ++ goto bad_handle; /* can't be larger than the ++ stride */ ++ reg->gpu_alloc->imported.alias.aliased[i].length = ai[i].length; ++ } else { ++ struct kbase_va_region *aliasing_reg; ++ struct kbase_mem_phy_alloc *alloc; + -+static const struct seq_operations profiling_events_seq_ops = { -+ .start = profiling_events_start, -+ .next = profiling_events_next, -+ .stop = profiling_events_stop, -+ .show = profiling_events_show -+}; ++ aliasing_reg = kbase_region_tracker_find_region_base_address( ++ kctx, ++ (ai[i].handle.basep.handle >> PAGE_SHIFT) << PAGE_SHIFT); + -+static int profiling_events_open(struct inode *inode, struct file *file) -+{ -+ return seq_open(file, &profiling_events_seq_ops); -+} ++ /* validate found region */ ++ if (!aliasing_reg) ++ goto bad_handle; /* Not found */ ++ if (aliasing_reg->flags & KBASE_REG_FREE) ++ goto bad_handle; /* Free region */ ++ if (aliasing_reg->flags & KBASE_REG_DONT_NEED) ++ goto bad_handle; /* Ephemeral region */ ++ if (!aliasing_reg->gpu_alloc) ++ goto bad_handle; /* No alloc */ ++ if (aliasing_reg->gpu_alloc->type != KBASE_MEM_TYPE_NATIVE) ++ goto bad_handle; /* Not a native alloc */ ++ if (coherent != ((aliasing_reg->flags & KBASE_REG_SHARE_BOTH) != 0)) ++ goto bad_handle; ++ /* Non-coherent memory cannot alias ++ coherent memory, and vice versa.*/ + -+static const struct file_operations profiling_events_fops = { -+ .owner = THIS_MODULE, -+ .open = profiling_events_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = seq_release, -+}; ++ /* check size against stride */ ++ if (!ai[i].length) ++ goto bad_handle; /* must be > 0 */ ++ if (ai[i].length > stride) ++ goto bad_handle; /* can't be larger than the ++ stride */ + -+static const struct seq_operations profiling_events_human_readable_seq_ops = { -+ .start = profiling_events_start, -+ .next = profiling_events_next, -+ .stop = profiling_events_stop, -+ .show = profiling_events_show_human_readable -+}; ++ alloc = aliasing_reg->gpu_alloc; + -+static int profiling_events_human_readable_open(struct inode *inode, struct file *file) -+{ -+ return seq_open(file, &profiling_events_human_readable_seq_ops); -+} ++ /* check against the alloc's size */ ++ if (ai[i].offset > alloc->nents) ++ goto bad_handle; /* beyond end */ ++ if (ai[i].offset + ai[i].length > alloc->nents) ++ goto bad_handle; /* beyond end */ + -+static const struct file_operations profiling_events_human_readable_fops = { -+ .owner = THIS_MODULE, -+ .open = profiling_events_human_readable_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = seq_release, -+}; ++ reg->gpu_alloc->imported.alias.aliased[i].alloc = kbase_mem_phy_alloc_get(alloc); ++ reg->gpu_alloc->imported.alias.aliased[i].length = ai[i].length; ++ reg->gpu_alloc->imported.alias.aliased[i].offset = ai[i].offset; ++ } ++ } + -+#endif ++#ifdef CONFIG_64BIT ++ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { ++ /* Bind to a cookie */ ++ if (!kctx->cookies) { ++ dev_err(kctx->kbdev->dev, "No cookies available for allocation!"); ++ goto no_cookie; ++ } ++ /* return a cookie */ ++ gpu_va = __ffs(kctx->cookies); ++ kctx->cookies &= ~(1UL << gpu_va); ++ BUG_ON(kctx->pending_regions[gpu_va]); ++ kctx->pending_regions[gpu_va] = reg; + -+static int memory_debugfs_show(struct seq_file *s, void *private_data) -+{ -+#ifdef MALI_MEM_SWAP_TRACKING -+ seq_printf(s, " %-25s %-10s %-10s %-15s %-15s %-10s %-10s %-10s \n"\ -+ "=================================================================================================================================\n", -+ "Name (:bytes)", "pid", "mali_mem", "max_mali_mem", -+ "external_mem", "ump_mem", "dma_mem", "swap_mem"); ++ /* relocate to correct base */ ++ gpu_va += PFN_DOWN(BASE_MEM_COOKIE_BASE); ++ gpu_va <<= PAGE_SHIFT; ++ } else /* we control the VA */ { +#else -+ seq_printf(s, " %-25s %-10s %-10s %-15s %-15s %-10s %-10s \n"\ -+ "========================================================================================================================\n", -+ "Name (:bytes)", "pid", "mali_mem", "max_mali_mem", -+ "external_mem", "ump_mem", "dma_mem"); ++ if (1) { +#endif -+ mali_session_memory_tracking(s); -+ return 0; -+} -+ -+static int memory_debugfs_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, memory_debugfs_show, inode->i_private); -+} -+ -+static const struct file_operations memory_usage_fops = { -+ .owner = THIS_MODULE, -+ .open = memory_debugfs_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; ++ if (kbase_gpu_mmap(kctx, reg, 0, *num_pages, 1) != 0) { ++ dev_warn(kctx->kbdev->dev, "Failed to map memory on GPU"); ++ goto no_mmap; ++ } ++ /* return real GPU VA */ ++ gpu_va = reg->start_pfn << PAGE_SHIFT; ++ } + -+static ssize_t utilization_gp_pp_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ char buf[64]; -+ size_t r; -+ u32 uval = _mali_ukk_utilization_gp_pp(); ++ reg->flags &= ~KBASE_REG_FREE; ++ reg->flags &= ~KBASE_REG_GROWABLE; + -+ r = snprintf(buf, 64, "%u\n", uval); -+ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); -+} ++ kbase_gpu_vm_unlock(kctx); + -+static ssize_t utilization_gp_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ char buf[64]; -+ size_t r; -+ u32 uval = _mali_ukk_utilization_gp(); ++ return gpu_va; + -+ r = snprintf(buf, 64, "%u\n", uval); -+ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); ++#ifdef CONFIG_64BIT ++no_cookie: ++#endif ++no_mmap: ++bad_handle: ++ kbase_gpu_vm_unlock(kctx); ++no_aliased_array: ++invalid_flags: ++ kbase_mem_phy_alloc_put(reg->cpu_alloc); ++ kbase_mem_phy_alloc_put(reg->gpu_alloc); ++no_alloc_obj: ++ kfree(reg); ++no_reg: ++bad_size: ++bad_nents: ++bad_stride: ++bad_flags: ++ return 0; +} + -+static ssize_t utilization_pp_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) ++int kbase_mem_import(struct kbase_context *kctx, enum base_mem_import_type type, ++ void __user *phandle, u32 padding, u64 *gpu_va, u64 *va_pages, ++ u64 *flags) +{ -+ char buf[64]; -+ size_t r; -+ u32 uval = _mali_ukk_utilization_pp(); ++ struct kbase_va_region *reg; + -+ r = snprintf(buf, 64, "%u\n", uval); -+ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); -+} ++ KBASE_DEBUG_ASSERT(kctx); ++ KBASE_DEBUG_ASSERT(gpu_va); ++ KBASE_DEBUG_ASSERT(va_pages); ++ KBASE_DEBUG_ASSERT(flags); + ++#ifdef CONFIG_64BIT ++ if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ *flags |= BASE_MEM_SAME_VA; ++#endif + -+static const struct file_operations utilization_gp_pp_fops = { -+ .owner = THIS_MODULE, -+ .read = utilization_gp_pp_read, -+}; ++ if (!kbase_check_import_flags(*flags)) { ++ dev_warn(kctx->kbdev->dev, ++ "kbase_mem_import called with bad flags (%llx)", ++ (unsigned long long)*flags); ++ goto bad_flags; ++ } + -+static const struct file_operations utilization_gp_fops = { -+ .owner = THIS_MODULE, -+ .read = utilization_gp_read, -+}; ++ if ((*flags & BASE_MEM_COHERENT_SYSTEM_REQUIRED) != 0 && ++ !kbase_device_is_cpu_coherent(kctx->kbdev)) { ++ dev_warn(kctx->kbdev->dev, ++ "kbase_mem_import call required coherent mem when unavailable"); ++ goto bad_flags; ++ } ++ if ((*flags & BASE_MEM_COHERENT_SYSTEM) != 0 && ++ !kbase_device_is_cpu_coherent(kctx->kbdev)) { ++ /* Remove COHERENT_SYSTEM flag if coherent mem is unavailable */ ++ *flags &= ~BASE_MEM_COHERENT_SYSTEM; ++ } + -+static const struct file_operations utilization_pp_fops = { -+ .owner = THIS_MODULE, -+ .read = utilization_pp_read, -+}; ++ if ((padding != 0) && (type != BASE_MEM_IMPORT_TYPE_UMM)) { ++ dev_warn(kctx->kbdev->dev, ++ "padding is only supported for UMM"); ++ goto bad_flags; ++ } + -+static ssize_t user_settings_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ unsigned long val; -+ int ret; -+ _mali_uk_user_setting_t setting; -+ char buf[32]; ++ switch (type) { ++#ifdef CONFIG_UMP ++ case BASE_MEM_IMPORT_TYPE_UMP: { ++ ump_secure_id id; + -+ cnt = min(cnt, sizeof(buf) - 1); -+ if (copy_from_user(buf, ubuf, cnt)) { -+ return -EFAULT; ++ if (get_user(id, (ump_secure_id __user *)phandle)) ++ reg = NULL; ++ else ++ reg = kbase_mem_from_ump(kctx, id, va_pages, flags); + } -+ buf[cnt] = '\0'; ++ break; ++#endif /* CONFIG_UMP */ ++#ifdef CONFIG_DMA_SHARED_BUFFER ++ case BASE_MEM_IMPORT_TYPE_UMM: { ++ int fd; + -+ ret = kstrtoul(buf, 10, &val); -+ if (0 != ret) { -+ return ret; ++ if (get_user(fd, (int __user *)phandle)) ++ reg = NULL; ++ else ++ reg = kbase_mem_from_umm(kctx, fd, va_pages, flags, ++ padding); + } ++ break; ++#endif /* CONFIG_DMA_SHARED_BUFFER */ ++ case BASE_MEM_IMPORT_TYPE_USER_BUFFER: { ++ struct base_mem_import_user_buffer user_buffer; ++ void __user *uptr; + -+ /* Update setting */ -+ setting = (_mali_uk_user_setting_t)(filp->private_data); -+ mali_set_user_setting(setting, val); -+ -+ *ppos += cnt; -+ return cnt; -+} ++ if (copy_from_user(&user_buffer, phandle, ++ sizeof(user_buffer))) { ++ reg = NULL; ++ } else { ++#ifdef CONFIG_COMPAT ++ if (kbase_ctx_flag(kctx, KCTX_COMPAT)) ++ uptr = compat_ptr(user_buffer.ptr.compat_value); ++ else ++#endif ++ uptr = user_buffer.ptr.value; + -+static ssize_t user_settings_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ char buf[64]; -+ size_t r; -+ u32 value; -+ _mali_uk_user_setting_t setting; ++ reg = kbase_mem_from_user_buffer(kctx, ++ (unsigned long)uptr, user_buffer.length, ++ va_pages, flags); ++ } ++ break; ++ } ++ default: { ++ reg = NULL; ++ break; ++ } ++ } + -+ setting = (_mali_uk_user_setting_t)(filp->private_data); -+ value = mali_get_user_setting(setting); ++ if (!reg) ++ goto no_reg; + -+ r = snprintf(buf, 64, "%u\n", value); -+ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); -+} ++ kbase_gpu_vm_lock(kctx); + -+static const struct file_operations user_settings_fops = { -+ .owner = THIS_MODULE, -+ .open = open_copy_private_data, -+ .read = user_settings_read, -+ .write = user_settings_write, -+}; ++ /* mmap needed to setup VA? */ ++ if (*flags & (BASE_MEM_SAME_VA | BASE_MEM_NEED_MMAP)) { ++ /* Bind to a cookie */ ++ if (!kctx->cookies) ++ goto no_cookie; ++ /* return a cookie */ ++ *gpu_va = __ffs(kctx->cookies); ++ kctx->cookies &= ~(1UL << *gpu_va); ++ BUG_ON(kctx->pending_regions[*gpu_va]); ++ kctx->pending_regions[*gpu_va] = reg; + -+static int mali_sysfs_user_settings_register(void) -+{ -+ struct dentry *mali_user_settings_dir = debugfs_create_dir("userspace_settings", mali_debugfs_dir); ++ /* relocate to correct base */ ++ *gpu_va += PFN_DOWN(BASE_MEM_COOKIE_BASE); ++ *gpu_va <<= PAGE_SHIFT; + -+ if (mali_user_settings_dir != NULL) { -+ long i; -+ for (i = 0; i < _MALI_UK_USER_SETTING_MAX; i++) { -+ debugfs_create_file(_mali_uk_user_setting_descriptions[i], -+ 0600, mali_user_settings_dir, (void *)i, -+ &user_settings_fops); -+ } ++ } else if (*flags & KBASE_MEM_IMPORT_HAVE_PAGES) { ++ /* we control the VA, mmap now to the GPU */ ++ if (kbase_gpu_mmap(kctx, reg, 0, *va_pages, 1) != 0) ++ goto no_gpu_va; ++ /* return real GPU VA */ ++ *gpu_va = reg->start_pfn << PAGE_SHIFT; ++ } else { ++ /* we control the VA, but nothing to mmap yet */ ++ if (kbase_add_va_region(kctx, reg, 0, *va_pages, 1) != 0) ++ goto no_gpu_va; ++ /* return real GPU VA */ ++ *gpu_va = reg->start_pfn << PAGE_SHIFT; + } + ++ /* clear out private flags */ ++ *flags &= ((1UL << BASE_MEM_FLAGS_NR_BITS) - 1); ++ ++ kbase_gpu_vm_unlock(kctx); ++ + return 0; ++ ++no_gpu_va: ++no_cookie: ++ kbase_gpu_vm_unlock(kctx); ++ kbase_mem_phy_alloc_put(reg->cpu_alloc); ++ kbase_mem_phy_alloc_put(reg->gpu_alloc); ++ kfree(reg); ++no_reg: ++bad_flags: ++ *gpu_va = 0; ++ *va_pages = 0; ++ *flags = 0; ++ return -ENOMEM; +} + -+static ssize_t pp_num_cores_enabled_write(struct file *filp, const char __user *buf, size_t count, loff_t *offp) ++int kbase_mem_grow_gpu_mapping(struct kbase_context *kctx, ++ struct kbase_va_region *reg, ++ u64 new_pages, u64 old_pages) +{ -+ int ret; -+ char buffer[32]; -+ unsigned long val; -+ -+ if (count >= sizeof(buffer)) { -+ return -ENOMEM; -+ } -+ -+ if (copy_from_user(&buffer[0], buf, count)) { -+ return -EFAULT; -+ } -+ buffer[count] = '\0'; ++ phys_addr_t *phy_pages; ++ u64 delta = new_pages - old_pages; ++ int ret = 0; + -+ ret = kstrtoul(&buffer[0], 10, &val); -+ if (0 != ret) { -+ return -EINVAL; -+ } ++ lockdep_assert_held(&kctx->reg_lock); + -+ ret = mali_executor_set_perf_level(val, MALI_TRUE); /* override even if core scaling is disabled */ -+ if (ret) { -+ return ret; -+ } ++ /* Map the new pages into the GPU */ ++ phy_pages = kbase_get_gpu_phy_pages(reg); ++ ret = kbase_mmu_insert_pages(kctx, reg->start_pfn + old_pages, ++ phy_pages + old_pages, delta, reg->flags); + -+ *offp += count; -+ return count; ++ return ret; +} + -+static ssize_t pp_num_cores_enabled_read(struct file *filp, char __user *buf, size_t count, loff_t *offp) ++static void kbase_mem_shrink_cpu_mapping(struct kbase_context *kctx, ++ struct kbase_va_region *reg, ++ u64 new_pages, u64 old_pages) +{ -+ int r; -+ char buffer[64]; ++ u64 gpu_va_start = reg->start_pfn; + -+ r = snprintf(buffer, 64, "%u\n", mali_executor_get_num_cores_enabled()); ++ if (new_pages == old_pages) ++ /* Nothing to do */ ++ return; + -+ return simple_read_from_buffer(buf, count, offp, buffer, r); ++ unmap_mapping_range(kctx->filp->f_inode->i_mapping, ++ (gpu_va_start + new_pages)<start_pfn + new_pages, delta); + -+ return simple_read_from_buffer(buf, count, offp, buffer, r); ++ return ret; +} + -+static const struct file_operations pp_num_cores_total_fops = { -+ .owner = THIS_MODULE, -+ .read = pp_num_cores_total_read, -+}; -+ -+static ssize_t pp_core_scaling_enabled_write(struct file *filp, const char __user *buf, size_t count, loff_t *offp) ++int kbase_mem_commit(struct kbase_context *kctx, u64 gpu_addr, u64 new_pages) +{ -+ int ret; -+ char buffer[32]; -+ unsigned long val; -+ -+ if (count >= sizeof(buffer)) { -+ return -ENOMEM; -+ } ++ u64 old_pages; ++ u64 delta; ++ int res = -EINVAL; ++ struct kbase_va_region *reg; ++ bool read_locked = false; + -+ if (copy_from_user(&buffer[0], buf, count)) { -+ return -EFAULT; -+ } -+ buffer[count] = '\0'; ++ KBASE_DEBUG_ASSERT(kctx); ++ KBASE_DEBUG_ASSERT(gpu_addr != 0); + -+ ret = kstrtoul(&buffer[0], 10, &val); -+ if (0 != ret) { ++ if (gpu_addr & ~PAGE_MASK) { ++ dev_warn(kctx->kbdev->dev, "kbase:mem_commit: gpu_addr: passed parameter is invalid"); + return -EINVAL; + } + -+ switch (val) { -+ case 1: -+ mali_executor_core_scaling_enable(); -+ break; -+ case 0: -+ mali_executor_core_scaling_disable(); -+ break; -+ default: -+ return -EINVAL; -+ break; -+ } ++ down_write(¤t->mm->mmap_lock); ++ kbase_gpu_vm_lock(kctx); + -+ *offp += count; -+ return count; -+} ++ /* Validate the region */ ++ reg = kbase_region_tracker_find_region_base_address(kctx, gpu_addr); ++ if (!reg || (reg->flags & KBASE_REG_FREE)) ++ goto out_unlock; + -+static ssize_t pp_core_scaling_enabled_read(struct file *filp, char __user *buf, size_t count, loff_t *offp) -+{ -+ return simple_read_from_buffer(buf, count, offp, mali_executor_core_scaling_is_enabled() ? "1\n" : "0\n", 2); -+} -+static const struct file_operations pp_core_scaling_enabled_fops = { -+ .owner = THIS_MODULE, -+ .write = pp_core_scaling_enabled_write, -+ .read = pp_core_scaling_enabled_read, -+ .llseek = default_llseek, -+}; ++ KBASE_DEBUG_ASSERT(reg->cpu_alloc); ++ KBASE_DEBUG_ASSERT(reg->gpu_alloc); + -+static ssize_t version_read(struct file *filp, char __user *buf, size_t count, loff_t *offp) -+{ -+ int r = 0; -+ char buffer[64]; ++ if (reg->gpu_alloc->type != KBASE_MEM_TYPE_NATIVE) ++ goto out_unlock; + -+ switch (mali_kernel_core_get_product_id()) { -+ case _MALI_PRODUCT_ID_MALI200: -+ r = snprintf(buffer, 64, "Mali-200\n"); -+ break; -+ case _MALI_PRODUCT_ID_MALI300: -+ r = snprintf(buffer, 64, "Mali-300\n"); -+ break; -+ case _MALI_PRODUCT_ID_MALI400: -+ r = snprintf(buffer, 64, "Mali-400 MP\n"); -+ break; -+ case _MALI_PRODUCT_ID_MALI450: -+ r = snprintf(buffer, 64, "Mali-450 MP\n"); -+ break; -+ case _MALI_PRODUCT_ID_MALI470: -+ r = snprintf(buffer, 64, "Mali-470 MP\n"); -+ break; -+ case _MALI_PRODUCT_ID_UNKNOWN: -+ return -EINVAL; -+ break; -+ }; ++ if (0 == (reg->flags & KBASE_REG_GROWABLE)) ++ goto out_unlock; + -+ return simple_read_from_buffer(buf, count, offp, buffer, r); -+} ++ /* Would overflow the VA region */ ++ if (new_pages > reg->nr_pages) ++ goto out_unlock; + -+static const struct file_operations version_fops = { -+ .owner = THIS_MODULE, -+ .read = version_read, -+}; ++ /* can't be mapped more than once on the GPU */ ++ if (atomic_read(®->gpu_alloc->gpu_mappings) > 1) ++ goto out_unlock; ++ /* can't grow regions which are ephemeral */ ++ if (reg->flags & KBASE_REG_DONT_NEED) ++ goto out_unlock; + -+#if defined(DEBUG) -+static int timeline_debugfs_show(struct seq_file *s, void *private_data) -+{ -+ struct mali_session_data *session, *tmp; -+ u32 session_seq = 1; ++ if (new_pages == reg->gpu_alloc->nents) { ++ /* no change */ ++ res = 0; ++ goto out_unlock; ++ } + -+ seq_printf(s, "timeline system info: \n=================\n\n"); ++ old_pages = kbase_reg_current_backed_size(reg); ++ if (new_pages > old_pages) { ++ delta = new_pages - old_pages; + -+ mali_session_lock(); -+ MALI_SESSION_FOREACH(session, tmp, link) { -+ seq_printf(s, "session %d <%p> start:\n", session_seq, session); -+ mali_timeline_debug_print_system(session->timeline_system, s); -+ seq_printf(s, "session %d end\n\n\n", session_seq++); -+ } -+ mali_session_unlock(); ++ /* ++ * No update to the mm so downgrade the writer lock to a read ++ * lock so other readers aren't blocked after this point. ++ */ ++ downgrade_write(¤t->mm->mmap_lock); ++ read_locked = true; + -+ return 0; -+} ++ /* Allocate some more pages */ ++ if (kbase_alloc_phy_pages_helper(reg->cpu_alloc, delta) != 0) { ++ res = -ENOMEM; ++ goto out_unlock; ++ } ++ if (reg->cpu_alloc != reg->gpu_alloc) { ++ if (kbase_alloc_phy_pages_helper( ++ reg->gpu_alloc, delta) != 0) { ++ res = -ENOMEM; ++ kbase_free_phy_pages_helper(reg->cpu_alloc, ++ delta); ++ goto out_unlock; ++ } ++ } + -+static int timeline_debugfs_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, timeline_debugfs_show, inode->i_private); -+} ++ /* No update required for CPU mappings, that's done on fault. */ + -+static const struct file_operations timeline_dump_fops = { -+ .owner = THIS_MODULE, -+ .open = timeline_debugfs_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release -+}; -+#endif ++ /* Update GPU mapping. */ ++ res = kbase_mem_grow_gpu_mapping(kctx, reg, ++ new_pages, old_pages); + -+int mali_sysfs_register(const char *mali_dev_name) -+{ -+ mali_debugfs_dir = debugfs_create_dir(mali_dev_name, NULL); -+ if (ERR_PTR(-ENODEV) == mali_debugfs_dir) { -+ /* Debugfs not supported. */ -+ mali_debugfs_dir = NULL; ++ /* On error free the new pages */ ++ if (res) { ++ kbase_free_phy_pages_helper(reg->cpu_alloc, delta); ++ if (reg->cpu_alloc != reg->gpu_alloc) ++ kbase_free_phy_pages_helper(reg->gpu_alloc, ++ delta); ++ res = -ENOMEM; ++ goto out_unlock; ++ } + } else { -+ if (NULL != mali_debugfs_dir) { -+ /* Debugfs directory created successfully; create files now */ -+ struct dentry *mali_power_dir; -+ struct dentry *mali_gp_dir; -+ struct dentry *mali_pp_dir; -+ struct dentry *mali_l2_dir; -+ struct dentry *mali_profiling_dir; ++ delta = old_pages - new_pages; + -+ debugfs_create_file("version", 0400, mali_debugfs_dir, NULL, &version_fops); ++ /* Update all CPU mapping(s) */ ++ kbase_mem_shrink_cpu_mapping(kctx, reg, ++ new_pages, old_pages); + -+ mali_power_dir = debugfs_create_dir("power", mali_debugfs_dir); -+ if (mali_power_dir != NULL) { -+ debugfs_create_file("always_on", 0600, mali_power_dir, NULL, &power_always_on_fops); -+ debugfs_create_file("power_events", 0200, mali_power_dir, NULL, &power_power_events_fops); -+ } ++ /* Update the GPU mapping */ ++ res = kbase_mem_shrink_gpu_mapping(kctx, reg, ++ new_pages, old_pages); ++ if (res) { ++ res = -ENOMEM; ++ goto out_unlock; ++ } + -+ mali_gp_dir = debugfs_create_dir("gp", mali_debugfs_dir); -+ if (mali_gp_dir != NULL) { -+ u32 num_groups; -+ long i; ++ kbase_free_phy_pages_helper(reg->cpu_alloc, delta); ++ if (reg->cpu_alloc != reg->gpu_alloc) ++ kbase_free_phy_pages_helper(reg->gpu_alloc, delta); ++ } + -+ num_groups = mali_group_get_glob_num_groups(); -+ for (i = 0; i < num_groups; i++) { -+ struct mali_group *group = mali_group_get_glob_group(i); ++out_unlock: ++ kbase_gpu_vm_unlock(kctx); ++ if (read_locked) ++ up_read(¤t->mm->mmap_lock); ++ else ++ up_write(¤t->mm->mmap_lock); + -+ struct mali_gp_core *gp_core = mali_group_get_gp_core(group); -+ if (NULL != gp_core) { -+ struct dentry *mali_gp_gpx_dir; -+ mali_gp_gpx_dir = debugfs_create_dir("gp0", mali_gp_dir); -+ if (NULL != mali_gp_gpx_dir) { -+ debugfs_create_file("base_addr", 0400, mali_gp_gpx_dir, &gp_core->hw_core, &hw_core_base_addr_fops); -+ debugfs_create_file("enabled", 0600, mali_gp_gpx_dir, group, &group_enabled_fops); -+ } -+ break; /* no need to look for any other GP cores */ -+ } ++ return res; ++} + -+ } -+ } ++static void kbase_cpu_vm_open(struct vm_area_struct *vma) ++{ ++ struct kbase_cpu_mapping *map = vma->vm_private_data; + -+ mali_pp_dir = debugfs_create_dir("pp", mali_debugfs_dir); -+ if (mali_pp_dir != NULL) { -+ u32 num_groups; -+ long i; ++ KBASE_DEBUG_ASSERT(map); ++ KBASE_DEBUG_ASSERT(map->count > 0); ++ /* non-atomic as we're under Linux' mm lock */ ++ map->count++; ++} + -+ debugfs_create_file("num_cores_total", 0400, mali_pp_dir, NULL, &pp_num_cores_total_fops); -+ debugfs_create_file("num_cores_enabled", 0600, mali_pp_dir, NULL, &pp_num_cores_enabled_fops); -+ debugfs_create_file("core_scaling_enabled", 0600, mali_pp_dir, NULL, &pp_core_scaling_enabled_fops); ++static void kbase_cpu_vm_close(struct vm_area_struct *vma) ++{ ++ struct kbase_cpu_mapping *map = vma->vm_private_data; + -+ num_groups = mali_group_get_glob_num_groups(); -+ for (i = 0; i < num_groups; i++) { -+ struct mali_group *group = mali_group_get_glob_group(i); ++ KBASE_DEBUG_ASSERT(map); ++ KBASE_DEBUG_ASSERT(map->count > 0); + -+ struct mali_pp_core *pp_core = mali_group_get_pp_core(group); -+ if (NULL != pp_core) { -+ char buf[16]; -+ struct dentry *mali_pp_ppx_dir; -+ _mali_osk_snprintf(buf, sizeof(buf), "pp%u", mali_pp_core_get_id(pp_core)); -+ mali_pp_ppx_dir = debugfs_create_dir(buf, mali_pp_dir); -+ if (NULL != mali_pp_ppx_dir) { -+ debugfs_create_file("base_addr", 0400, mali_pp_ppx_dir, &pp_core->hw_core, &hw_core_base_addr_fops); -+ if (!mali_group_is_virtual(group)) { -+ debugfs_create_file("enabled", 0600, mali_pp_ppx_dir, group, &group_enabled_fops); -+ } -+ } -+ } -+ } -+ } ++ /* non-atomic as we're under Linux' mm lock */ ++ if (--map->count) ++ return; + -+ mali_l2_dir = debugfs_create_dir("l2", mali_debugfs_dir); -+ if (mali_l2_dir != NULL) { -+ struct dentry *mali_l2_all_dir; -+ u32 l2_id; -+ struct mali_l2_cache_core *l2_cache; ++ KBASE_DEBUG_ASSERT(map->kctx); ++ KBASE_DEBUG_ASSERT(map->alloc); + -+ mali_l2_all_dir = debugfs_create_dir("all", mali_l2_dir); -+ if (mali_l2_all_dir != NULL) { -+ debugfs_create_file("counter_src0", 0200, mali_l2_all_dir, NULL, &l2_all_counter_src0_fops); -+ debugfs_create_file("counter_src1", 0200, mali_l2_all_dir, NULL, &l2_all_counter_src1_fops); -+ } ++ kbase_gpu_vm_lock(map->kctx); + -+ l2_id = 0; -+ l2_cache = mali_l2_cache_core_get_glob_l2_core(l2_id); -+ while (NULL != l2_cache) { -+ char buf[16]; -+ struct dentry *mali_l2_l2x_dir; -+ _mali_osk_snprintf(buf, sizeof(buf), "l2%u", l2_id); -+ mali_l2_l2x_dir = debugfs_create_dir(buf, mali_l2_dir); -+ if (NULL != mali_l2_l2x_dir) { -+ debugfs_create_file("counter_src0", 0600, mali_l2_l2x_dir, l2_cache, &l2_l2x_counter_src0_fops); -+ debugfs_create_file("counter_src1", 0600, mali_l2_l2x_dir, l2_cache, &l2_l2x_counter_src1_fops); -+ debugfs_create_file("counter_val0", 0600, mali_l2_l2x_dir, l2_cache, &l2_l2x_counter_val0_fops); -+ debugfs_create_file("counter_val1", 0600, mali_l2_l2x_dir, l2_cache, &l2_l2x_counter_val1_fops); -+ debugfs_create_file("base_addr", 0400, mali_l2_l2x_dir, &l2_cache->hw_core, &hw_core_base_addr_fops); -+ } ++ if (map->free_on_close) { ++ KBASE_DEBUG_ASSERT((map->region->flags & KBASE_REG_ZONE_MASK) == ++ KBASE_REG_ZONE_SAME_VA); ++ /* Avoid freeing memory on the process death which results in ++ * GPU Page Fault. Memory will be freed in kbase_destroy_context ++ */ ++ if (!(current->flags & PF_EXITING)) ++ kbase_mem_free_region(map->kctx, map->region); ++ } + -+ /* try next L2 */ -+ l2_id++; -+ l2_cache = mali_l2_cache_core_get_glob_l2_core(l2_id); -+ } -+ } ++ list_del(&map->mappings_list); + -+ debugfs_create_file("gpu_memory", 0444, mali_debugfs_dir, NULL, &memory_usage_fops); ++ kbase_gpu_vm_unlock(map->kctx); + -+ debugfs_create_file("utilization_gp_pp", 0400, mali_debugfs_dir, NULL, &utilization_gp_pp_fops); -+ debugfs_create_file("utilization_gp", 0400, mali_debugfs_dir, NULL, &utilization_gp_fops); -+ debugfs_create_file("utilization_pp", 0400, mali_debugfs_dir, NULL, &utilization_pp_fops); ++ kbase_mem_phy_alloc_put(map->alloc); ++ kfree(map); ++} + -+ mali_profiling_dir = debugfs_create_dir("profiling", mali_debugfs_dir); -+ if (mali_profiling_dir != NULL) { -+ u32 max_sub_jobs; -+ long i; -+ struct dentry *mali_profiling_gp_dir; -+ struct dentry *mali_profiling_pp_dir; -+#if defined(CONFIG_MALI400_INTERNAL_PROFILING) -+ struct dentry *mali_profiling_proc_dir; ++KBASE_EXPORT_TEST_API(kbase_cpu_vm_close); ++ ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)) ++static vm_fault_t kbase_cpu_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) ++{ ++#else ++static vm_fault_t kbase_cpu_vm_fault(struct vm_fault *vmf) ++{ ++ struct vm_area_struct *vma = vmf->vma; +#endif -+ /* -+ * Create directory where we can set GP HW counters. -+ */ -+ mali_profiling_gp_dir = debugfs_create_dir("gp", mali_profiling_dir); -+ if (mali_profiling_gp_dir != NULL) { -+ debugfs_create_file("counter_src0", 0600, mali_profiling_gp_dir, (void *)PRIVATE_DATA_COUNTER_MAKE_GP(0), &profiling_counter_src_fops); -+ debugfs_create_file("counter_src1", 0600, mali_profiling_gp_dir, (void *)PRIVATE_DATA_COUNTER_MAKE_GP(1), &profiling_counter_src_fops); -+ } ++ struct kbase_cpu_mapping *map = vma->vm_private_data; ++ pgoff_t rel_pgoff; ++ size_t i; ++ pgoff_t addr; ++ vm_fault_t ret = VM_FAULT_SIGBUS; + -+ /* -+ * Create directory where we can set PP HW counters. -+ * Possible override with specific HW counters for a particular sub job -+ * (Disable core scaling before using the override!) -+ */ -+ mali_profiling_pp_dir = debugfs_create_dir("pp", mali_profiling_dir); -+ if (mali_profiling_pp_dir != NULL) { -+ debugfs_create_file("counter_src0", 0600, mali_profiling_pp_dir, (void *)PRIVATE_DATA_COUNTER_MAKE_PP(0), &profiling_counter_src_fops); -+ debugfs_create_file("counter_src1", 0600, mali_profiling_pp_dir, (void *)PRIVATE_DATA_COUNTER_MAKE_PP(1), &profiling_counter_src_fops); -+ } ++ KBASE_DEBUG_ASSERT(map); ++ KBASE_DEBUG_ASSERT(map->count > 0); ++ KBASE_DEBUG_ASSERT(map->kctx); ++ KBASE_DEBUG_ASSERT(map->alloc); + -+ max_sub_jobs = mali_executor_get_num_cores_total(); -+ for (i = 0; i < max_sub_jobs; i++) { -+ char buf[16]; -+ struct dentry *mali_profiling_pp_x_dir; -+ _mali_osk_snprintf(buf, sizeof(buf), "%u", i); -+ mali_profiling_pp_x_dir = debugfs_create_dir(buf, mali_profiling_pp_dir); -+ if (NULL != mali_profiling_pp_x_dir) { -+ debugfs_create_file("counter_src0", -+ 0600, mali_profiling_pp_x_dir, -+ (void *)PRIVATE_DATA_COUNTER_MAKE_PP_SUB_JOB(0, i), -+ &profiling_counter_src_fops); -+ debugfs_create_file("counter_src1", -+ 0600, mali_profiling_pp_x_dir, -+ (void *)PRIVATE_DATA_COUNTER_MAKE_PP_SUB_JOB(1, i), -+ &profiling_counter_src_fops); -+ } -+ } ++ rel_pgoff = vmf->pgoff - map->region->start_pfn; + -+#if defined(CONFIG_MALI400_INTERNAL_PROFILING) -+ mali_profiling_proc_dir = debugfs_create_dir("proc", mali_profiling_dir); -+ if (mali_profiling_proc_dir != NULL) { -+ struct dentry *mali_profiling_proc_default_dir = debugfs_create_dir("default", mali_profiling_proc_dir); -+ if (mali_profiling_proc_default_dir != NULL) { -+ debugfs_create_file("enable", 0600, mali_profiling_proc_default_dir, (void *)_MALI_UK_USER_SETTING_SW_EVENTS_ENABLE, &user_settings_fops); -+ } -+ } -+ debugfs_create_file("record", 0600, mali_profiling_dir, NULL, &profiling_record_fops); -+ debugfs_create_file("events", 0400, mali_profiling_dir, NULL, &profiling_events_fops); -+ debugfs_create_file("events_human_readable", 0400, mali_profiling_dir, NULL, &profiling_events_human_readable_fops); -+#endif -+ } ++ kbase_gpu_vm_lock(map->kctx); ++ if (rel_pgoff >= map->alloc->nents) ++ goto locked_bad_fault; + -+#if MALI_STATE_TRACKING -+ debugfs_create_file("state_dump", 0400, mali_debugfs_dir, NULL, &mali_seq_internal_state_fops); -+#endif ++ /* Fault on access to DONT_NEED regions */ ++ if (map->alloc->reg && (map->alloc->reg->flags & KBASE_REG_DONT_NEED)) ++ goto locked_bad_fault; + -+#if defined(DEBUG) -+ debugfs_create_file("timeline_dump", 0400, mali_debugfs_dir, NULL, &timeline_dump_fops); ++ /* insert all valid pages from the fault location */ ++ i = rel_pgoff; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ addr = (pgoff_t)((uintptr_t)vmf->virtual_address >> PAGE_SHIFT); ++#else ++ addr = (pgoff_t)(vmf->address >> PAGE_SHIFT); +#endif -+ if (mali_sysfs_user_settings_register()) { -+ /* Failed to create the debugfs entries for the user settings DB. */ -+ MALI_DEBUG_PRINT(2, ("Failed to create user setting debugfs files. Ignoring...\n")); -+ } -+ } ++ while (i < map->alloc->nents && (addr < vma->vm_end >> PAGE_SHIFT)) { ++ ret = vmf_insert_pfn(vma, addr << PAGE_SHIFT, ++ PFN_DOWN(map->alloc->pages[i])); ++ if (ret != VM_FAULT_NOPAGE) ++ goto locked_bad_fault; ++ ++ i++; addr++; + } + -+ /* Success! */ -+ return 0; -+} ++ kbase_gpu_vm_unlock(map->kctx); ++ /* we resolved it, nothing for VM to do */ ++ return VM_FAULT_NOPAGE; + -+int mali_sysfs_unregister(void) -+{ -+ if (NULL != mali_debugfs_dir) { -+ debugfs_remove_recursive(mali_debugfs_dir); -+ } -+ return 0; ++locked_bad_fault: ++ kbase_gpu_vm_unlock(map->kctx); ++ return ret; +} + -+#else /* MALI_LICENSE_IS_GPL */ -+ -+/* Dummy implementations for non-GPL */ ++const struct vm_operations_struct kbase_vm_ops = { ++ .open = kbase_cpu_vm_open, ++ .close = kbase_cpu_vm_close, ++ .fault = kbase_cpu_vm_fault ++}; + -+int mali_sysfs_register(struct mali_dev *device, dev_t dev, const char *mali_dev_name) ++static int kbase_cpu_mmap(struct kbase_va_region *reg, struct vm_area_struct *vma, void *kaddr, size_t nr_pages, unsigned long aligned_offset, int free_on_close) +{ -+ return 0; -+} ++ struct kbase_cpu_mapping *map; ++ phys_addr_t *page_array; ++ int err = 0; ++ int i; + -+int mali_sysfs_unregister(void) -+{ -+ return 0; -+} ++ map = kzalloc(sizeof(*map), GFP_KERNEL); + -+#endif /* MALI_LICENSE_IS_GPL */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h -new file mode 100755 -index 000000000000..91580a87c1e1 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h -@@ -0,0 +1,29 @@ -+/* -+ * Copyright (C) 2011-2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ if (!map) { ++ WARN_ON(1); ++ err = -ENOMEM; ++ goto out; ++ } + -+#ifndef __MALI_KERNEL_SYSFS_H__ -+#define __MALI_KERNEL_SYSFS_H__ ++ /* ++ * VM_DONTCOPY - don't make this mapping available in fork'ed processes ++ * VM_DONTEXPAND - disable mremap on this region ++ * VM_IO - disables paging ++ * VM_DONTDUMP - Don't include in core dumps (3.7 only) ++ * VM_MIXEDMAP - Support mixing struct page*s and raw pfns. ++ * This is needed to support using the dedicated and ++ * the OS based memory backends together. ++ */ ++ /* ++ * This will need updating to propagate coherency flags ++ * See MIDBASE-1057 ++ */ + -+#ifdef __cplusplus -+extern "C" { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)) ++ vma->vm_flags |= VM_DONTCOPY | VM_DONTDUMP | VM_DONTEXPAND | VM_IO; ++#else ++ vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED | VM_IO; +#endif ++ vma->vm_ops = &kbase_vm_ops; ++ vma->vm_private_data = map; + -+#include -+ -+#define MALI_PROC_DIR "driver/mali" -+ -+int mali_sysfs_register(const char *mali_dev_name); -+int mali_sysfs_unregister(void); -+ -+#ifdef __cplusplus -+} -+#endif ++ page_array = kbase_get_cpu_phy_pages(reg); + -+#endif /* __MALI_KERNEL_LINUX_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h b/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h -new file mode 100755 -index 000000000000..222260823c81 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h -@@ -0,0 +1,161 @@ -+/* -+ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ if (!(reg->flags & KBASE_REG_CPU_CACHED) && ++ (reg->flags & (KBASE_REG_CPU_WR|KBASE_REG_CPU_RD))) { ++ /* We can't map vmalloc'd memory uncached. ++ * Other memory will have been returned from ++ * kbase_mem_pool which would be ++ * suitable for mapping uncached. ++ */ ++ BUG_ON(kaddr); ++ vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); ++ } + -+#if !defined (MALI_LINUX_TRACE_H) || defined (TRACE_HEADER_MULTI_READ) -+#define MALI_LINUX_TRACE_H ++ if (!kaddr) { ++ unsigned long addr = vma->vm_start + aligned_offset; ++ u64 start_off = vma->vm_pgoff - reg->start_pfn + ++ (aligned_offset>>PAGE_SHIFT); + -+#include ++ vma->vm_flags |= VM_PFNMAP; ++ for (i = 0; i < nr_pages; i++) { ++ unsigned long pfn = PFN_DOWN(page_array[i + start_off]); ++ vm_fault_t ret; + -+#include -+#include ++ ret = vmf_insert_pfn(vma, addr, pfn); ++ if (WARN_ON(ret != VM_FAULT_NOPAGE)) { ++ if (ret == VM_FAULT_OOM) ++ err = -ENOMEM; ++ else ++ err = -EFAULT; ++ break; ++ } + -+#undef TRACE_SYSTEM -+#define TRACE_SYSTEM mali ++ addr += PAGE_SIZE; ++ } ++ } else { ++ WARN_ON(aligned_offset); ++ /* MIXEDMAP so we can vfree the kaddr early and not track it after map time */ ++ vma->vm_flags |= VM_MIXEDMAP; ++ /* vmalloc remaping is easy... */ ++ err = remap_vmalloc_range(vma, kaddr, 0); ++ WARN_ON(err); ++ } + -+#define TRACE_INCLUDE_PATH . -+#define TRACE_INCLUDE_FILE mali_linux_trace ++ if (err) { ++ kfree(map); ++ goto out; ++ } + -+/** -+ * Define the tracepoint used to communicate the status of a GPU. Called -+ * when a GPU turns on or turns off. -+ * -+ * @param event_id The type of the event. This parameter is a bitfield -+ * encoding the type of the event. -+ * -+ * @param d0 First data parameter. -+ * @param d1 Second data parameter. -+ * @param d2 Third data parameter. -+ * @param d3 Fourth data parameter. -+ * @param d4 Fifth data parameter. -+ */ -+TRACE_EVENT(mali_timeline_event, ++ map->region = reg; ++ map->free_on_close = free_on_close; ++ map->kctx = reg->kctx; ++ map->alloc = kbase_mem_phy_alloc_get(reg->cpu_alloc); ++ map->count = 1; /* start with one ref */ + -+ TP_PROTO(unsigned int event_id, unsigned int d0, unsigned int d1, -+ unsigned int d2, unsigned int d3, unsigned int d4), ++ if (reg->flags & KBASE_REG_CPU_CACHED) ++ map->alloc->properties |= KBASE_MEM_PHY_ALLOC_ACCESSED_CACHED; + -+ TP_ARGS(event_id, d0, d1, d2, d3, d4), ++ list_add(&map->mappings_list, &map->alloc->mappings); + -+ TP_STRUCT__entry( -+ __field(unsigned int, event_id) -+ __field(unsigned int, d0) -+ __field(unsigned int, d1) -+ __field(unsigned int, d2) -+ __field(unsigned int, d3) -+ __field(unsigned int, d4) -+ ), ++ out: ++ return err; ++} + -+ TP_fast_assign( -+ __entry->event_id = event_id; -+ __entry->d0 = d0; -+ __entry->d1 = d1; -+ __entry->d2 = d2; -+ __entry->d3 = d3; -+ __entry->d4 = d4; -+ ), ++static int kbase_trace_buffer_mmap(struct kbase_context *kctx, struct vm_area_struct *vma, struct kbase_va_region **const reg, void **const kaddr) ++{ ++ struct kbase_va_region *new_reg; ++ u32 nr_pages; ++ size_t size; ++ int err = 0; ++ u32 *tb; ++ int owns_tb = 1; + -+ TP_printk("event=%d", __entry->event_id) -+ ); ++ dev_dbg(kctx->kbdev->dev, "in %s\n", __func__); ++ size = (vma->vm_end - vma->vm_start); ++ nr_pages = size >> PAGE_SHIFT; + -+/** -+ * Define a tracepoint used to regsiter the value of a hardware counter. -+ * Hardware counters belonging to the vertex or fragment processor are -+ * reported via this tracepoint each frame, whilst L2 cache hardware -+ * counters are reported continuously. -+ * -+ * @param counter_id The counter ID. -+ * @param value The value of the counter. -+ */ -+TRACE_EVENT(mali_hw_counter, ++ if (!kctx->jctx.tb) { ++ KBASE_DEBUG_ASSERT(0 != size); ++ tb = vmalloc_user(size); + -+ TP_PROTO(unsigned int counter_id, unsigned int value), ++ if (NULL == tb) { ++ err = -ENOMEM; ++ goto out; ++ } + -+ TP_ARGS(counter_id, value), ++ err = kbase_device_trace_buffer_install(kctx, tb, size); ++ if (err) { ++ vfree(tb); ++ goto out; ++ } ++ } else { ++ err = -EINVAL; ++ goto out; ++ } + -+ TP_STRUCT__entry( -+ __field(unsigned int, counter_id) -+ __field(unsigned int, value) -+ ), ++ *kaddr = kctx->jctx.tb; + -+ TP_fast_assign( -+ __entry->counter_id = counter_id; -+ ), ++ new_reg = kbase_alloc_free_region(kctx, 0, nr_pages, KBASE_REG_ZONE_SAME_VA); ++ if (!new_reg) { ++ err = -ENOMEM; ++ WARN_ON(1); ++ goto out_no_region; ++ } + -+ TP_printk("event %d = %d", __entry->counter_id, __entry->value) -+ ); ++ new_reg->cpu_alloc = kbase_alloc_create(0, KBASE_MEM_TYPE_TB); ++ if (IS_ERR_OR_NULL(new_reg->cpu_alloc)) { ++ err = -ENOMEM; ++ new_reg->cpu_alloc = NULL; ++ WARN_ON(1); ++ goto out_no_alloc; ++ } + -+/** -+ * Define a tracepoint used to send a bundle of software counters. -+ * -+ * @param counters The bundle of counters. -+ */ -+TRACE_EVENT(mali_sw_counters, ++ new_reg->gpu_alloc = kbase_mem_phy_alloc_get(new_reg->cpu_alloc); + -+ TP_PROTO(pid_t pid, pid_t tid, void *surface_id, unsigned int *counters), ++ new_reg->cpu_alloc->imported.kctx = kctx; ++ new_reg->flags &= ~KBASE_REG_FREE; ++ new_reg->flags |= KBASE_REG_CPU_CACHED; + -+ TP_ARGS(pid, tid, surface_id, counters), ++ /* alloc now owns the tb */ ++ owns_tb = 0; + -+ TP_STRUCT__entry( -+ __field(pid_t, pid) -+ __field(pid_t, tid) -+ __field(void *, surface_id) -+ __field(unsigned int *, counters) -+ ), ++ if (kbase_add_va_region(kctx, new_reg, vma->vm_start, nr_pages, 1) != 0) { ++ err = -ENOMEM; ++ WARN_ON(1); ++ goto out_no_va_region; ++ } + -+ TP_fast_assign( -+ __entry->pid = pid; -+ __entry->tid = tid; -+ __entry->surface_id = surface_id; -+ __entry->counters = counters; -+ ), ++ *reg = new_reg; + -+ TP_printk("counters were %s", __entry->counters == NULL ? "NULL" : "not NULL") -+ ); ++ /* map read only, noexec */ ++ vma->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_EXEC | VM_MAYEXEC); ++ /* the rest of the flags is added by the cpu_mmap handler */ + -+/** -+ * Define a tracepoint used to gather core activity for systrace -+ * @param pid The process id for which the core activity originates from -+ * @param active If the core is active (1) or not (0) -+ * @param core_type The type of core active, either GP (1) or PP (0) -+ * @param core_id The core id that is active for the core_type -+ * @param frame_builder_id The frame builder id associated with this core activity -+ * @param flush_id The flush id associated with this core activity -+ */ -+TRACE_EVENT(mali_core_active, ++ dev_dbg(kctx->kbdev->dev, "%s done\n", __func__); ++ return 0; + -+ TP_PROTO(pid_t pid, unsigned int active, unsigned int core_type, unsigned int core_id, unsigned int frame_builder_id, unsigned int flush_id), ++out_no_va_region: ++out_no_alloc: ++ kbase_free_alloced_region(new_reg); ++out_no_region: ++ if (owns_tb) { ++ kbase_device_trace_buffer_uninstall(kctx); ++ vfree(tb); ++ } ++out: ++ return err; ++} + -+ TP_ARGS(pid, active, core_type, core_id, frame_builder_id, flush_id), ++static int kbase_mmu_dump_mmap(struct kbase_context *kctx, struct vm_area_struct *vma, struct kbase_va_region **const reg, void **const kmap_addr) ++{ ++ struct kbase_va_region *new_reg; ++ void *kaddr; ++ u32 nr_pages; ++ size_t size; ++ int err = 0; + -+ TP_STRUCT__entry( -+ __field(pid_t, pid) -+ __field(unsigned int, active) -+ __field(unsigned int, core_type) -+ __field(unsigned int, core_id) -+ __field(unsigned int, frame_builder_id) -+ __field(unsigned int, flush_id) -+ ), ++ dev_dbg(kctx->kbdev->dev, "in kbase_mmu_dump_mmap\n"); ++ size = (vma->vm_end - vma->vm_start); ++ nr_pages = size >> PAGE_SHIFT; + -+ TP_fast_assign( -+ __entry->pid = pid; -+ __entry->active = active; -+ __entry->core_type = core_type; -+ __entry->core_id = core_id; -+ __entry->frame_builder_id = frame_builder_id; -+ __entry->flush_id = flush_id; -+ ), ++ kaddr = kbase_mmu_dump(kctx, nr_pages); + -+ TP_printk("%s|%d|%s%i:%x|%d", __entry->active ? "S" : "F", __entry->pid, __entry->core_type ? "GP" : "PP", __entry->core_id, __entry->flush_id, __entry->frame_builder_id) -+ ); ++ if (!kaddr) { ++ err = -ENOMEM; ++ goto out; ++ } + -+#endif /* MALI_LINUX_TRACE_H */ ++ new_reg = kbase_alloc_free_region(kctx, 0, nr_pages, KBASE_REG_ZONE_SAME_VA); ++ if (!new_reg) { ++ err = -ENOMEM; ++ WARN_ON(1); ++ goto out; ++ } + -+/* This part must exist outside the header guard. */ -+#include ++ new_reg->cpu_alloc = kbase_alloc_create(0, KBASE_MEM_TYPE_RAW); ++ if (IS_ERR_OR_NULL(new_reg->cpu_alloc)) { ++ err = -ENOMEM; ++ new_reg->cpu_alloc = NULL; ++ WARN_ON(1); ++ goto out_no_alloc; ++ } + -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory.c -new file mode 100755 -index 000000000000..dfc769e6cc40 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.c -@@ -0,0 +1,531 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ new_reg->gpu_alloc = kbase_mem_phy_alloc_get(new_reg->cpu_alloc); + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++ new_reg->flags &= ~KBASE_REG_FREE; ++ new_reg->flags |= KBASE_REG_CPU_CACHED; ++ if (kbase_add_va_region(kctx, new_reg, vma->vm_start, nr_pages, 1) != 0) { ++ err = -ENOMEM; ++ WARN_ON(1); ++ goto out_va_region; ++ } + -+#include "mali_osk.h" -+#include "mali_executor.h" ++ *kmap_addr = kaddr; ++ *reg = new_reg; + -+#include "mali_memory.h" -+#include "mali_memory_os_alloc.h" -+#include "mali_memory_block_alloc.h" -+#include "mali_memory_util.h" -+#include "mali_memory_virtual.h" -+#include "mali_memory_manager.h" -+#include "mali_memory_cow.h" -+#include "mali_memory_swap_alloc.h" -+#include "mali_memory_defer_bind.h" -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+#include "mali_memory_secure.h" -+#endif ++ dev_dbg(kctx->kbdev->dev, "kbase_mmu_dump_mmap done\n"); ++ return 0; + -+extern unsigned int mali_dedicated_mem_size; -+extern unsigned int mali_shared_mem_size; ++out_no_alloc: ++out_va_region: ++ kbase_free_alloced_region(new_reg); ++out: ++ return err; ++} + -+#define MALI_VM_NUM_FAULT_PREFETCH (0x8) + -+static void mali_mem_vma_open(struct vm_area_struct *vma) ++void kbase_os_mem_map_lock(struct kbase_context *kctx) +{ -+ mali_mem_allocation *alloc = (mali_mem_allocation *)vma->vm_private_data; -+ MALI_DEBUG_PRINT(4, ("Open called on vma %p\n", vma)); -+ -+ /* If need to share the allocation, add ref_count here */ -+ mali_allocation_ref(alloc); -+ return; ++ struct mm_struct *mm = current->mm; ++ (void)kctx; ++ down_read(&mm->mmap_lock); +} -+static void mali_mem_vma_close(struct vm_area_struct *vma) -+{ -+ /* If need to share the allocation, unref ref_count here */ -+ mali_mem_allocation *alloc = (mali_mem_allocation *)vma->vm_private_data; + -+ mali_allocation_unref(&alloc); -+ vma->vm_private_data = NULL; ++void kbase_os_mem_map_unlock(struct kbase_context *kctx) ++{ ++ struct mm_struct *mm = current->mm; ++ (void)kctx; ++ up_read(&mm->mmap_lock); +} + -+static vm_fault_t mali_mem_vma_fault(struct vm_fault *vmf) -+{ -+ struct vm_area_struct *vma = vmf->vma; -+ mali_mem_allocation *alloc = (mali_mem_allocation *)vma->vm_private_data; -+ mali_mem_backend *mem_bkend = NULL; -+ int ret; -+ int prefetch_num = MALI_VM_NUM_FAULT_PREFETCH; ++static int kbasep_reg_mmap(struct kbase_context *kctx, ++ struct vm_area_struct *vma, ++ struct kbase_va_region **regm, ++ size_t *nr_pages, size_t *aligned_offset) + -+ unsigned long address = (unsigned long)vmf->address; -+ MALI_DEBUG_ASSERT(alloc->backend_handle); -+ MALI_DEBUG_ASSERT((unsigned long)alloc->cpu_mapping.addr <= address); ++{ ++ int cookie = vma->vm_pgoff - PFN_DOWN(BASE_MEM_COOKIE_BASE); ++ struct kbase_va_region *reg; ++ int err = 0; + -+ /* Get backend memory & Map on CPU */ -+ mutex_lock(&mali_idr_mutex); -+ if (!(mem_bkend = idr_find(&mali_backend_idr, alloc->backend_handle))) { -+ MALI_DEBUG_PRINT(1, ("Can't find memory backend in mmap!\n")); -+ mutex_unlock(&mali_idr_mutex); -+ return VM_FAULT_SIGBUS; -+ } -+ mutex_unlock(&mali_idr_mutex); -+ MALI_DEBUG_ASSERT(mem_bkend->type == alloc->type); ++ *aligned_offset = 0; + -+ if ((mem_bkend->type == MALI_MEM_COW && (MALI_MEM_BACKEND_FLAG_SWAP_COWED != -+ (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED))) && -+ (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_COW_CPU_NO_WRITE)) { -+ /*check if use page fault to do COW*/ -+ MALI_DEBUG_PRINT(4, ("mali_vma_fault: do cow allocate on demand!, address=0x%x\n", address)); -+ mutex_lock(&mem_bkend->mutex); -+ ret = mali_mem_cow_allocate_on_demand(mem_bkend, -+ (address - vma->vm_start) / PAGE_SIZE); -+ mutex_unlock(&mem_bkend->mutex); ++ dev_dbg(kctx->kbdev->dev, "in kbasep_reg_mmap\n"); + -+ if (ret != _MALI_OSK_ERR_OK) { -+ return VM_FAULT_OOM; -+ } -+ prefetch_num = 1; ++ /* SAME_VA stuff, fetch the right region */ ++ reg = kctx->pending_regions[cookie]; ++ if (!reg) { ++ err = -ENOMEM; ++ goto out; ++ } + -+ /* handle COW modified range cpu mapping -+ we zap the mapping in cow_modify_range, it will trigger page fault -+ when CPU access it, so here we map it to CPU*/ -+ mutex_lock(&mem_bkend->mutex); -+ ret = mali_mem_cow_cpu_map_pages_locked(mem_bkend, vma, address, prefetch_num); -+ mutex_unlock(&mem_bkend->mutex); ++ if ((reg->flags & KBASE_REG_GPU_NX) && (reg->nr_pages != *nr_pages)) { ++ /* incorrect mmap size */ ++ /* leave the cookie for a potential later ++ * mapping, or to be reclaimed later when the ++ * context is freed */ ++ err = -ENOMEM; ++ goto out; ++ } + -+ if (unlikely(ret != _MALI_OSK_ERR_OK)) { -+ return VM_FAULT_SIGBUS; -+ } -+ } else if ((mem_bkend->type == MALI_MEM_SWAP) || -+ (mem_bkend->type == MALI_MEM_COW && (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED))) { -+ u32 offset_in_bkend = (address - vma->vm_start) / PAGE_SIZE; -+ int ret = _MALI_OSK_ERR_OK; ++ if ((vma->vm_flags & VM_READ && !(reg->flags & KBASE_REG_CPU_RD)) || ++ (vma->vm_flags & VM_WRITE && !(reg->flags & KBASE_REG_CPU_WR))) { ++ /* VM flags inconsistent with region flags */ ++ err = -EPERM; ++ dev_err(kctx->kbdev->dev, "%s:%d inconsistent VM flags\n", ++ __FILE__, __LINE__); ++ goto out; ++ } + -+ mutex_lock(&mem_bkend->mutex); -+ if (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_COW_CPU_NO_WRITE) { -+ ret = mali_mem_swap_cow_page_on_demand(mem_bkend, offset_in_bkend, &vmf->page); -+ } else { -+ ret = mali_mem_swap_allocate_page_on_demand(mem_bkend, offset_in_bkend, &vmf->page); -+ } -+ mutex_unlock(&mem_bkend->mutex); ++ /* adjust down nr_pages to what we have physically */ ++ *nr_pages = kbase_reg_current_backed_size(reg); + -+ if (ret != _MALI_OSK_ERR_OK) { -+ MALI_DEBUG_PRINT(2, ("Mali swap memory page fault process failed, address=0x%x\n", address)); -+ return VM_FAULT_OOM; -+ } else { -+ return VM_FAULT_LOCKED; -+ } -+ } else { -+ MALI_PRINT_ERROR(("Mali vma fault! It never happen, indicating some logic errors in caller.\n")); -+ /*NOT support yet or OOM*/ -+ return VM_FAULT_OOM; ++ if (kbase_gpu_mmap(kctx, reg, vma->vm_start + *aligned_offset, ++ reg->nr_pages, 1) != 0) { ++ dev_err(kctx->kbdev->dev, "%s:%d\n", __FILE__, __LINE__); ++ /* Unable to map in GPU space. */ ++ WARN_ON(1); ++ err = -ENOMEM; ++ goto out; + } -+ return VM_FAULT_NOPAGE; -+} ++ /* no need for the cookie anymore */ ++ kctx->pending_regions[cookie] = NULL; ++ kctx->cookies |= (1UL << cookie); + -+static struct vm_operations_struct mali_kernel_vm_ops = { -+ .open = mali_mem_vma_open, -+ .close = mali_mem_vma_close, -+ .fault = mali_mem_vma_fault, -+}; ++ /* ++ * Overwrite the offset with the region start_pfn, so we effectively ++ * map from offset 0 in the region. However subtract the aligned ++ * offset so that when user space trims the mapping the beginning of ++ * the trimmed VMA has the correct vm_pgoff; ++ */ ++ vma->vm_pgoff = reg->start_pfn - ((*aligned_offset)>>PAGE_SHIFT); ++out: ++ *regm = reg; ++ dev_dbg(kctx->kbdev->dev, "kbasep_reg_mmap done\n"); + ++ return err; ++} + -+/** @ map mali allocation to CPU address -+* -+* Supported backend types: -+* --MALI_MEM_OS -+* -- need to add COW? -+ *Not supported backend types: -+* -_MALI_MEMORY_BIND_BACKEND_UMP -+* -_MALI_MEMORY_BIND_BACKEND_DMA_BUF -+* -_MALI_MEMORY_BIND_BACKEND_EXTERNAL_MEMORY -+* -+*/ -+int mali_mmap(struct file *filp, struct vm_area_struct *vma) ++int kbase_mmap(struct file *file, struct vm_area_struct *vma) +{ -+ struct mali_session_data *session; -+ mali_mem_allocation *mali_alloc = NULL; -+ u32 mali_addr = vma->vm_pgoff << PAGE_SHIFT; -+ struct mali_vma_node *mali_vma_node = NULL; -+ mali_mem_backend *mem_bkend = NULL; -+ int ret = -EFAULT; ++ struct kbase_context *kctx = file->private_data; ++ struct kbase_va_region *reg = NULL; ++ void *kaddr = NULL; ++ size_t nr_pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; ++ int err = 0; ++ int free_on_close = 0; ++ struct device *dev = kctx->kbdev->dev; ++ size_t aligned_offset = 0; + -+ session = (struct mali_session_data *)filp->private_data; -+ if (NULL == session) { -+ MALI_PRINT_ERROR(("mmap called without any session data available\n")); -+ return -EFAULT; -+ } ++ dev_dbg(dev, "kbase_mmap\n"); + -+ MALI_DEBUG_PRINT(4, ("MMap() handler: start=0x%08X, phys=0x%08X, size=0x%08X vma->flags 0x%08x\n", -+ (unsigned int)vma->vm_start, (unsigned int)(vma->vm_pgoff << PAGE_SHIFT), -+ (unsigned int)(vma->vm_end - vma->vm_start), vma->vm_flags)); ++ /* strip away corresponding VM_MAY% flags to the VM_% flags requested */ ++ vma->vm_flags &= ~((vma->vm_flags & (VM_READ | VM_WRITE)) << 4); + -+ /* Operations used on any memory system */ -+ /* do not need to anything in vm open/close now */ ++ if (0 == nr_pages) { ++ err = -EINVAL; ++ goto out; ++ } + -+ /* find mali allocation structure by vaddress*/ -+ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, mali_addr, 0); -+ if (likely(mali_vma_node)) { -+ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); -+ MALI_DEBUG_ASSERT(mali_addr == mali_vma_node->vm_node.start); -+ if (unlikely(mali_addr != mali_vma_node->vm_node.start)) { -+ /* only allow to use start address for mmap */ -+ MALI_DEBUG_PRINT(1, ("mali_addr != mali_vma_node->vm_node.start\n")); -+ return -EFAULT; -+ } -+ } else { -+ MALI_DEBUG_ASSERT(NULL == mali_vma_node); -+ return -EFAULT; ++ if (!(vma->vm_flags & VM_SHARED)) { ++ err = -EINVAL; ++ goto out; + } + -+ mali_alloc->cpu_mapping.addr = (void __user *)vma->vm_start; ++ kbase_gpu_vm_lock(kctx); + -+ if (mali_alloc->flags & _MALI_MEMORY_ALLOCATE_DEFER_BIND) { -+ MALI_DEBUG_PRINT(1, ("ERROR : trying to access varying memory by CPU!\n")); -+ return -EFAULT; ++ if (vma->vm_pgoff == PFN_DOWN(BASE_MEM_MAP_TRACKING_HANDLE)) { ++ /* The non-mapped tracking helper page */ ++ err = kbase_tracking_page_setup(kctx, vma); ++ goto out_unlock; + } + -+ /* Get backend memory & Map on CPU */ -+ mutex_lock(&mali_idr_mutex); -+ if (!(mem_bkend = idr_find(&mali_backend_idr, mali_alloc->backend_handle))) { -+ MALI_DEBUG_PRINT(1, ("Can't find memory backend in mmap!\n")); -+ mutex_unlock(&mali_idr_mutex); -+ return -EFAULT; ++ /* if not the MTP, verify that the MTP has been mapped */ ++ rcu_read_lock(); ++ /* catches both when the special page isn't present or ++ * when we've forked */ ++ if (rcu_dereference(kctx->process_mm) != current->mm) { ++ err = -EINVAL; ++ rcu_read_unlock(); ++ goto out_unlock; + } -+ mutex_unlock(&mali_idr_mutex); ++ rcu_read_unlock(); + -+ if (!(MALI_MEM_SWAP == mali_alloc->type || -+ (MALI_MEM_COW == mali_alloc->type && (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED)))) { -+ /* Set some bits which indicate that, the memory is IO memory, meaning -+ * that no paging is to be performed and the memory should not be -+ * included in crash dumps. And that the memory is reserved, meaning -+ * that it's present and can never be paged out (see also previous -+ * entry) -+ */ -+ vma->vm_flags |= VM_IO; -+ vma->vm_flags |= VM_DONTCOPY; -+ vma->vm_flags |= VM_PFNMAP; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0) -+ vma->vm_flags |= VM_RESERVED; -+#else -+ vma->vm_flags |= VM_DONTDUMP; -+ vma->vm_flags |= VM_DONTEXPAND; -+#endif -+ } else if (MALI_MEM_SWAP == mali_alloc->type) { -+ vma->vm_pgoff = mem_bkend->start_idx; ++ switch (vma->vm_pgoff) { ++ case PFN_DOWN(BASEP_MEM_INVALID_HANDLE): ++ case PFN_DOWN(BASEP_MEM_WRITE_ALLOC_PAGES_HANDLE): ++ /* Illegal handle for direct map */ ++ err = -EINVAL; ++ goto out_unlock; ++ case PFN_DOWN(BASE_MEM_TRACE_BUFFER_HANDLE): ++ err = kbase_trace_buffer_mmap(kctx, vma, ®, &kaddr); ++ if (0 != err) ++ goto out_unlock; ++ dev_dbg(dev, "kbase_trace_buffer_mmap ok\n"); ++ /* free the region on munmap */ ++ free_on_close = 1; ++ break; ++ case PFN_DOWN(BASE_MEM_MMU_DUMP_HANDLE): ++ /* MMU dump */ ++ err = kbase_mmu_dump_mmap(kctx, vma, ®, &kaddr); ++ if (0 != err) ++ goto out_unlock; ++ /* free the region on munmap */ ++ free_on_close = 1; ++ break; ++ case PFN_DOWN(BASE_MEM_COOKIE_BASE) ... ++ PFN_DOWN(BASE_MEM_FIRST_FREE_ADDRESS) - 1: { ++ err = kbasep_reg_mmap(kctx, vma, ®, &nr_pages, ++ &aligned_offset); ++ if (0 != err) ++ goto out_unlock; ++ /* free the region on munmap */ ++ free_on_close = 1; ++ break; + } ++ default: { ++ reg = kbase_region_tracker_find_region_enclosing_address(kctx, ++ (u64)vma->vm_pgoff << PAGE_SHIFT); + -+ vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); -+ vma->vm_ops = &mali_kernel_vm_ops; ++ if (reg && !(reg->flags & KBASE_REG_FREE)) { ++ /* will this mapping overflow the size of the region? */ ++ if (nr_pages > (reg->nr_pages - ++ (vma->vm_pgoff - reg->start_pfn))) { ++ err = -ENOMEM; ++ goto out_unlock; ++ } + -+ mali_alloc->cpu_mapping.addr = (void __user *)vma->vm_start; ++ if ((vma->vm_flags & VM_READ && ++ !(reg->flags & KBASE_REG_CPU_RD)) || ++ (vma->vm_flags & VM_WRITE && ++ !(reg->flags & KBASE_REG_CPU_WR))) { ++ /* VM flags inconsistent with region flags */ ++ err = -EPERM; ++ dev_err(dev, "%s:%d inconsistent VM flags\n", ++ __FILE__, __LINE__); ++ goto out_unlock; ++ } + -+ /* If it's a copy-on-write mapping, map to read only */ -+ if (!(vma->vm_flags & VM_WRITE)) { -+ MALI_DEBUG_PRINT(4, ("mmap allocation with read only !\n")); -+ /* add VM_WRITE for do_page_fault will check this when a write fault */ -+ vma->vm_flags |= VM_WRITE | VM_READ; -+ vma->vm_page_prot = PAGE_READONLY; -+ vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); -+ mem_bkend->flags |= MALI_MEM_BACKEND_FLAG_COW_CPU_NO_WRITE; -+ goto out; -+ } ++#ifdef CONFIG_DMA_SHARED_BUFFER ++ if (KBASE_MEM_TYPE_IMPORTED_UMM == ++ reg->cpu_alloc->type) { ++ err = dma_buf_mmap( ++ reg->cpu_alloc->imported.umm.dma_buf, ++ vma, vma->vm_pgoff - reg->start_pfn); ++ goto out_unlock; ++ } ++#endif /* CONFIG_DMA_SHARED_BUFFER */ + -+ if (mem_bkend->type == MALI_MEM_OS) { -+ ret = mali_mem_os_cpu_map(mem_bkend, vma); -+ } else if (mem_bkend->type == MALI_MEM_COW && -+ (MALI_MEM_BACKEND_FLAG_SWAP_COWED != (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED))) { -+ ret = mali_mem_cow_cpu_map(mem_bkend, vma); -+ } else if (mem_bkend->type == MALI_MEM_BLOCK) { -+ ret = mali_mem_block_cpu_map(mem_bkend, vma); -+ } else if ((mem_bkend->type == MALI_MEM_SWAP) || (mem_bkend->type == MALI_MEM_COW && -+ (MALI_MEM_BACKEND_FLAG_SWAP_COWED == (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED)))) { -+ /*For swappable memory, CPU page table will be created by page fault handler. */ -+ ret = 0; -+ } else if (mem_bkend->type == MALI_MEM_SECURE) { -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+ ret = mali_mem_secure_cpu_map(mem_bkend, vma); -+#else -+ MALI_DEBUG_PRINT(1, ("DMA not supported for mali secure memory\n")); -+ return -EFAULT; -+#endif -+ } else { -+ /* Not support yet*/ -+ MALI_DEBUG_PRINT_ERROR(("Invalid type of backend memory! \n")); -+ return -EFAULT; -+ } ++ /* limit what we map to the amount currently backed */ ++ if (reg->cpu_alloc->nents < (vma->vm_pgoff - reg->start_pfn + nr_pages)) { ++ if ((vma->vm_pgoff - reg->start_pfn) >= reg->cpu_alloc->nents) ++ nr_pages = 0; ++ else ++ nr_pages = reg->cpu_alloc->nents - (vma->vm_pgoff - reg->start_pfn); ++ } ++ } else { ++ err = -ENOMEM; ++ goto out_unlock; ++ } ++ } /* default */ ++ } /* switch */ + -+ if (ret != 0) { -+ MALI_DEBUG_PRINT(1, ("ret != 0\n")); -+ return -EFAULT; -+ } -+out: -+ MALI_DEBUG_ASSERT(MALI_MEM_ALLOCATION_VALID_MAGIC == mali_alloc->magic); ++ err = kbase_cpu_mmap(reg, vma, kaddr, nr_pages, aligned_offset, free_on_close); + -+ vma->vm_private_data = (void *)mali_alloc; -+ mali_alloc->cpu_mapping.vma = vma; ++ if (vma->vm_pgoff == PFN_DOWN(BASE_MEM_MMU_DUMP_HANDLE)) { ++ /* MMU dump - userspace should now have a reference on ++ * the pages, so we can now free the kernel mapping */ ++ vfree(kaddr); ++ } + -+ mali_allocation_ref(mali_alloc); ++out_unlock: ++ kbase_gpu_vm_unlock(kctx); ++out: ++ if (err) ++ dev_err(dev, "mmap failed %d\n", err); + -+ return 0; ++ return err; +} + -+_mali_osk_errcode_t mali_mem_mali_map_prepare(mali_mem_allocation *descriptor) ++KBASE_EXPORT_TEST_API(kbase_mmap); ++ ++void *kbase_vmap_prot(struct kbase_context *kctx, u64 gpu_addr, size_t size, ++ unsigned long prot_request, struct kbase_vmap_struct *map) +{ -+ u32 size = descriptor->psize; -+ struct mali_session_data *session = descriptor->session; ++ struct kbase_va_region *reg; ++ unsigned long page_index; ++ unsigned int offset = gpu_addr & ~PAGE_MASK; ++ size_t page_count = PFN_UP(offset + size); ++ phys_addr_t *page_array; ++ struct page **pages; ++ void *cpu_addr = NULL; ++ pgprot_t prot; ++ size_t i; ++ bool sync_needed; + -+ MALI_DEBUG_ASSERT(MALI_MEM_ALLOCATION_VALID_MAGIC == descriptor->magic); ++ if (!size || !map) ++ return NULL; + -+ /* Map dma-buf into this session's page tables */ ++ /* check if page_count calculation will wrap */ ++ if (size > ((size_t)-1 / PAGE_SIZE)) ++ return NULL; + -+ if (descriptor->flags & MALI_MEM_FLAG_MALI_GUARD_PAGE) { -+ size += MALI_MMU_PAGE_SIZE; -+ } ++ kbase_gpu_vm_lock(kctx); + -+ return mali_mmu_pagedir_map(session->page_directory, descriptor->mali_vma_node.vm_node.start, size); -+} ++ reg = kbase_region_tracker_find_region_enclosing_address(kctx, gpu_addr); ++ if (!reg || (reg->flags & KBASE_REG_FREE)) ++ goto out_unlock; + -+_mali_osk_errcode_t mali_mem_mali_map_resize(mali_mem_allocation *descriptor, u32 new_size) -+{ -+ u32 old_size = descriptor->psize; -+ struct mali_session_data *session = descriptor->session; ++ page_index = (gpu_addr >> PAGE_SHIFT) - reg->start_pfn; + -+ MALI_DEBUG_ASSERT(MALI_MEM_ALLOCATION_VALID_MAGIC == descriptor->magic); ++ /* check if page_index + page_count will wrap */ ++ if (-1UL - page_count < page_index) ++ goto out_unlock; + -+ if (descriptor->flags & MALI_MEM_FLAG_MALI_GUARD_PAGE) { -+ new_size += MALI_MMU_PAGE_SIZE; -+ } ++ if (page_index + page_count > kbase_reg_current_backed_size(reg)) ++ goto out_unlock; + -+ if (new_size > old_size) { -+ MALI_DEBUG_ASSERT(new_size <= descriptor->mali_vma_node.vm_node.size); -+ return mali_mmu_pagedir_map(session->page_directory, descriptor->mali_vma_node.vm_node.start + old_size, new_size - old_size); -+ } -+ return _MALI_OSK_ERR_OK; -+} ++ if (reg->flags & KBASE_REG_DONT_NEED) ++ goto out_unlock; + -+void mali_mem_mali_map_free(struct mali_session_data *session, u32 size, mali_address_t vaddr, u32 flags) -+{ -+ if (flags & MALI_MEM_FLAG_MALI_GUARD_PAGE) { -+ size += MALI_MMU_PAGE_SIZE; -+ } ++ /* check access permissions can be satisfied ++ * Intended only for checking KBASE_REG_{CPU,GPU}_{RD,WR} */ ++ if ((reg->flags & prot_request) != prot_request) ++ goto out_unlock; + -+ /* Umap and flush L2 */ -+ mali_mmu_pagedir_unmap(session->page_directory, vaddr, size); -+ mali_executor_zap_all_active(session); -+} ++ page_array = kbase_get_cpu_phy_pages(reg); ++ if (!page_array) ++ goto out_unlock; + -+u32 _mali_ukk_report_memory_usage(void) -+{ -+ u32 sum = 0; ++ pages = kmalloc_array(page_count, sizeof(struct page *), GFP_KERNEL); ++ if (!pages) ++ goto out_unlock; + -+ if (MALI_TRUE == mali_memory_have_dedicated_memory()) { -+ sum += mali_mem_block_allocator_stat(); ++ for (i = 0; i < page_count; i++) ++ pages[i] = pfn_to_page(PFN_DOWN(page_array[page_index + i])); ++ ++ prot = PAGE_KERNEL; ++ if (!(reg->flags & KBASE_REG_CPU_CACHED)) { ++ /* Map uncached */ ++ prot = pgprot_writecombine(prot); + } ++ /* Note: enforcing a RO prot_request onto prot is not done, since: ++ * - CPU-arch-specific integration required ++ * - kbase_vmap() requires no access checks to be made/enforced */ + -+ sum += mali_mem_os_stat(); ++ cpu_addr = vmap(pages, page_count, VM_MAP, prot); + -+ return sum; -+} ++ kfree(pages); + -+u32 _mali_ukk_report_total_memory_size(void) -+{ -+ return mali_dedicated_mem_size + mali_shared_mem_size; -+} ++ if (!cpu_addr) ++ goto out_unlock; + ++ map->gpu_addr = gpu_addr; ++ map->cpu_alloc = kbase_mem_phy_alloc_get(reg->cpu_alloc); ++ map->cpu_pages = &kbase_get_cpu_phy_pages(reg)[page_index]; ++ map->gpu_alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); ++ map->gpu_pages = &kbase_get_gpu_phy_pages(reg)[page_index]; ++ map->addr = (void *)((uintptr_t)cpu_addr + offset); ++ map->size = size; ++ map->is_cached = (reg->flags & KBASE_REG_CPU_CACHED) != 0; ++ sync_needed = map->is_cached; + -+/** -+ * Per-session memory descriptor mapping table sizes -+ */ -+#define MALI_MEM_DESCRIPTORS_INIT 64 -+#define MALI_MEM_DESCRIPTORS_MAX 65536 ++#ifdef CONFIG_MALI_COH_KERN ++ /* kernel can use coherent memory if supported */ ++ if (kctx->kbdev->system_coherency == COHERENCY_ACE) ++ sync_needed = false; ++#endif + -+_mali_osk_errcode_t mali_memory_session_begin(struct mali_session_data *session_data) -+{ -+ MALI_DEBUG_PRINT(5, ("Memory session begin\n")); ++ if (sync_needed) { ++ /* Sync first page */ ++ size_t sz = MIN(((size_t) PAGE_SIZE - offset), size); ++ phys_addr_t cpu_pa = map->cpu_pages[0]; ++ phys_addr_t gpu_pa = map->gpu_pages[0]; + -+ session_data->memory_lock = _mali_osk_mutex_init(_MALI_OSK_LOCKFLAG_ORDERED, -+ _MALI_OSK_LOCK_ORDER_MEM_SESSION); ++ kbase_sync_single(kctx, cpu_pa, gpu_pa, offset, sz, ++ KBASE_SYNC_TO_CPU); + -+ if (NULL == session_data->memory_lock) { -+ MALI_ERROR(_MALI_OSK_ERR_FAULT); -+ } ++ /* Sync middle pages (if any) */ ++ for (i = 1; page_count > 2 && i < page_count - 1; i++) { ++ cpu_pa = map->cpu_pages[i]; ++ gpu_pa = map->gpu_pages[i]; ++ kbase_sync_single(kctx, cpu_pa, gpu_pa, 0, PAGE_SIZE, ++ KBASE_SYNC_TO_CPU); ++ } + -+ session_data->cow_lock = _mali_osk_mutex_init(_MALI_OSK_LOCKFLAG_UNORDERED, 0); -+ if (NULL == session_data->cow_lock) { -+ _mali_osk_mutex_term(session_data->memory_lock); -+ MALI_ERROR(_MALI_OSK_ERR_FAULT); ++ /* Sync last page (if any) */ ++ if (page_count > 1) { ++ cpu_pa = map->cpu_pages[page_count - 1]; ++ gpu_pa = map->gpu_pages[page_count - 1]; ++ sz = ((offset + size - 1) & ~PAGE_MASK) + 1; ++ kbase_sync_single(kctx, cpu_pa, gpu_pa, 0, sz, ++ KBASE_SYNC_TO_CPU); ++ } + } ++ kbase_gpu_vm_unlock(kctx); + -+ mali_memory_manager_init(&session_data->allocation_mgr); ++ return map->addr; + -+ MALI_DEBUG_PRINT(5, ("MMU session begin: success\n")); -+ MALI_SUCCESS; ++out_unlock: ++ kbase_gpu_vm_unlock(kctx); ++ return NULL; +} + -+void mali_memory_session_end(struct mali_session_data *session) ++void *kbase_vmap(struct kbase_context *kctx, u64 gpu_addr, size_t size, ++ struct kbase_vmap_struct *map) +{ -+ MALI_DEBUG_PRINT(3, ("MMU session end\n")); -+ -+ if (NULL == session) { -+ MALI_DEBUG_PRINT(1, ("No session data found during session end\n")); -+ return; -+ } -+ /* free allocation */ -+ mali_free_session_allocations(session); -+ /* do some check in unint*/ -+ mali_memory_manager_uninit(&session->allocation_mgr); -+ -+ /* Free the lock */ -+ _mali_osk_mutex_term(session->memory_lock); -+ _mali_osk_mutex_term(session->cow_lock); -+ return; ++ /* 0 is specified for prot_request to indicate no access checks should ++ * be made. ++ * ++ * As mentioned in kbase_vmap_prot() this means that a kernel-side ++ * CPU-RO mapping is not enforced to allow this to work */ ++ return kbase_vmap_prot(kctx, gpu_addr, size, 0u, map); +} ++KBASE_EXPORT_TEST_API(kbase_vmap); + -+_mali_osk_errcode_t mali_memory_initialize(void) ++void kbase_vunmap(struct kbase_context *kctx, struct kbase_vmap_struct *map) +{ -+ _mali_osk_errcode_t err; ++ void *addr = (void *)((uintptr_t)map->addr & PAGE_MASK); ++ bool sync_needed = map->is_cached; ++ vunmap(addr); ++#ifdef CONFIG_MALI_COH_KERN ++ /* kernel can use coherent memory if supported */ ++ if (kctx->kbdev->system_coherency == COHERENCY_ACE) ++ sync_needed = false; ++#endif ++ if (sync_needed) { ++ off_t offset = (uintptr_t)map->addr & ~PAGE_MASK; ++ size_t size = map->size; ++ size_t page_count = PFN_UP(offset + size); ++ size_t i; + -+ idr_init(&mali_backend_idr); -+ mutex_init(&mali_idr_mutex); ++ /* Sync first page */ ++ size_t sz = MIN(((size_t) PAGE_SIZE - offset), size); ++ phys_addr_t cpu_pa = map->cpu_pages[0]; ++ phys_addr_t gpu_pa = map->gpu_pages[0]; + -+ err = mali_mem_swap_init(); -+ if (err != _MALI_OSK_ERR_OK) { -+ return err; -+ } -+ err = mali_mem_os_init(); -+ if (_MALI_OSK_ERR_OK == err) { -+ err = mali_mem_defer_bind_manager_init(); -+ } ++ kbase_sync_single(kctx, cpu_pa, gpu_pa, offset, sz, ++ KBASE_SYNC_TO_DEVICE); + -+ return err; -+} ++ /* Sync middle pages (if any) */ ++ for (i = 1; page_count > 2 && i < page_count - 1; i++) { ++ cpu_pa = map->cpu_pages[i]; ++ gpu_pa = map->gpu_pages[i]; ++ kbase_sync_single(kctx, cpu_pa, gpu_pa, 0, PAGE_SIZE, ++ KBASE_SYNC_TO_DEVICE); ++ } + -+void mali_memory_terminate(void) -+{ -+ mali_mem_swap_term(); -+ mali_mem_defer_bind_manager_destory(); -+ mali_mem_os_term(); -+ if (mali_memory_have_dedicated_memory()) { -+ mali_mem_block_allocator_destroy(); ++ /* Sync last page (if any) */ ++ if (page_count > 1) { ++ cpu_pa = map->cpu_pages[page_count - 1]; ++ gpu_pa = map->gpu_pages[page_count - 1]; ++ sz = ((offset + size - 1) & ~PAGE_MASK) + 1; ++ kbase_sync_single(kctx, cpu_pa, gpu_pa, 0, sz, ++ KBASE_SYNC_TO_DEVICE); ++ } + } ++ map->gpu_addr = 0; ++ map->cpu_alloc = kbase_mem_phy_alloc_put(map->cpu_alloc); ++ map->gpu_alloc = kbase_mem_phy_alloc_put(map->gpu_alloc); ++ map->cpu_pages = NULL; ++ map->gpu_pages = NULL; ++ map->addr = NULL; ++ map->size = 0; ++ map->is_cached = false; +} ++KBASE_EXPORT_TEST_API(kbase_vunmap); + -+ -+struct mali_page_node *_mali_page_node_allocate(mali_page_node_type type) ++void kbasep_os_process_page_usage_update(struct kbase_context *kctx, int pages) +{ -+ mali_page_node *page_node = NULL; -+ -+ page_node = kzalloc(sizeof(mali_page_node), GFP_KERNEL); -+ MALI_DEBUG_ASSERT(NULL != page_node); ++ struct mm_struct *mm; + -+ if (page_node) { -+ page_node->type = type; -+ INIT_LIST_HEAD(&page_node->list); ++ rcu_read_lock(); ++ mm = rcu_dereference(kctx->process_mm); ++ if (mm) { ++ atomic_add(pages, &kctx->nonmapped_pages); ++#ifdef SPLIT_RSS_COUNTING ++ add_mm_counter(mm, MM_FILEPAGES, pages); ++#else ++ spin_lock(&mm->page_table_lock); ++ add_mm_counter(mm, MM_FILEPAGES, pages); ++ spin_unlock(&mm->page_table_lock); ++#endif + } -+ -+ return page_node; ++ rcu_read_unlock(); +} + -+void _mali_page_node_ref(struct mali_page_node *node) ++static void kbasep_os_process_page_usage_drain(struct kbase_context *kctx) +{ -+ if (node->type == MALI_PAGE_NODE_OS) { -+ /* add ref to this page */ -+ get_page(node->page); -+ } else if (node->type == MALI_PAGE_NODE_BLOCK) { -+ mali_mem_block_add_ref(node); -+ } else if (node->type == MALI_PAGE_NODE_SWAP) { -+ atomic_inc(&node->swap_it->ref_count); -+ } else { -+ MALI_DEBUG_PRINT_ERROR(("Invalid type of mali page node! \n")); -+ } -+} ++ int pages; ++ struct mm_struct *mm; + -+void _mali_page_node_unref(struct mali_page_node *node) -+{ -+ if (node->type == MALI_PAGE_NODE_OS) { -+ /* unref to this page */ -+ put_page(node->page); -+ } else if (node->type == MALI_PAGE_NODE_BLOCK) { -+ mali_mem_block_dec_ref(node); -+ } else { -+ MALI_DEBUG_PRINT_ERROR(("Invalid type of mali page node! \n")); ++ spin_lock(&kctx->mm_update_lock); ++ mm = rcu_dereference_protected(kctx->process_mm, lockdep_is_held(&kctx->mm_update_lock)); ++ if (!mm) { ++ spin_unlock(&kctx->mm_update_lock); ++ return; + } -+} + ++ rcu_assign_pointer(kctx->process_mm, NULL); ++ spin_unlock(&kctx->mm_update_lock); ++ synchronize_rcu(); + -+void _mali_page_node_add_page(struct mali_page_node *node, struct page *page) -+{ -+ MALI_DEBUG_ASSERT(MALI_PAGE_NODE_OS == node->type); -+ node->page = page; ++ pages = atomic_xchg(&kctx->nonmapped_pages, 0); ++#ifdef SPLIT_RSS_COUNTING ++ add_mm_counter(mm, MM_FILEPAGES, -pages); ++#else ++ spin_lock(&mm->page_table_lock); ++ add_mm_counter(mm, MM_FILEPAGES, -pages); ++ spin_unlock(&mm->page_table_lock); ++#endif +} + -+ -+void _mali_page_node_add_swap_item(struct mali_page_node *node, struct mali_swap_item *item) ++static void kbase_special_vm_close(struct vm_area_struct *vma) +{ -+ MALI_DEBUG_ASSERT(MALI_PAGE_NODE_SWAP == node->type); -+ node->swap_it = item; -+} ++ struct kbase_context *kctx; + -+void _mali_page_node_add_block_item(struct mali_page_node *node, mali_block_item *item) -+{ -+ MALI_DEBUG_ASSERT(MALI_PAGE_NODE_BLOCK == node->type); -+ node->blk_it = item; ++ kctx = vma->vm_private_data; ++ kbasep_os_process_page_usage_drain(kctx); +} + ++static const struct vm_operations_struct kbase_vm_special_ops = { ++ .close = kbase_special_vm_close, ++}; + -+int _mali_page_node_get_ref_count(struct mali_page_node *node) ++static int kbase_tracking_page_setup(struct kbase_context *kctx, struct vm_area_struct *vma) +{ -+ if (node->type == MALI_PAGE_NODE_OS) { -+ /* get ref count of this page */ -+ return page_count(node->page); -+ } else if (node->type == MALI_PAGE_NODE_BLOCK) { -+ return mali_mem_block_get_ref_count(node); -+ } else if (node->type == MALI_PAGE_NODE_SWAP) { -+ return atomic_read(&node->swap_it->ref_count); -+ } else { -+ MALI_DEBUG_PRINT_ERROR(("Invalid type of mali page node! \n")); ++ /* check that this is the only tracking page */ ++ spin_lock(&kctx->mm_update_lock); ++ if (rcu_dereference_protected(kctx->process_mm, lockdep_is_held(&kctx->mm_update_lock))) { ++ spin_unlock(&kctx->mm_update_lock); ++ return -EFAULT; + } -+ return -1; -+} + ++ rcu_assign_pointer(kctx->process_mm, current->mm); + -+dma_addr_t _mali_page_node_get_dma_addr(struct mali_page_node *node) -+{ -+ if (node->type == MALI_PAGE_NODE_OS) { -+ return page_private(node->page); -+ } else if (node->type == MALI_PAGE_NODE_BLOCK) { -+ return _mali_blk_item_get_phy_addr(node->blk_it); -+ } else if (node->type == MALI_PAGE_NODE_SWAP) { -+ return node->swap_it->dma_addr; -+ } else { -+ MALI_DEBUG_PRINT_ERROR(("Invalid type of mali page node! \n")); -+ } -+ return 0; -+} ++ spin_unlock(&kctx->mm_update_lock); + ++ /* no real access */ ++ vma->vm_flags &= ~(VM_READ | VM_MAYREAD | VM_WRITE | VM_MAYWRITE | VM_EXEC | VM_MAYEXEC); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)) ++ vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND | VM_DONTDUMP | VM_IO; ++#else ++ vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED | VM_IO; ++#endif ++ vma->vm_ops = &kbase_vm_special_ops; ++ vma->vm_private_data = kctx; + -+unsigned long _mali_page_node_get_pfn(struct mali_page_node *node) -+{ -+ if (node->type == MALI_PAGE_NODE_OS) { -+ return page_to_pfn(node->page); -+ } else if (node->type == MALI_PAGE_NODE_BLOCK) { -+ /* get phy addr for BLOCK page*/ -+ return _mali_blk_item_get_pfn(node->blk_it); -+ } else if (node->type == MALI_PAGE_NODE_SWAP) { -+ return page_to_pfn(node->swap_it->page); -+ } else { -+ MALI_DEBUG_PRINT_ERROR(("Invalid type of mali page node! \n")); -+ } + return 0; +} ++void *kbase_va_alloc(struct kbase_context *kctx, u32 size, struct kbase_hwc_dma_mapping *handle) ++{ ++ int i; ++ int res; ++ void *va; ++ dma_addr_t dma_pa; ++ struct kbase_va_region *reg; ++ phys_addr_t *page_array; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) ++ unsigned long attrs = DMA_ATTR_WRITE_COMBINE; ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) ++ DEFINE_DMA_ATTRS(attrs); ++#endif + ++ u32 pages = ((size - 1) >> PAGE_SHIFT) + 1; ++ u32 flags = BASE_MEM_PROT_CPU_RD | BASE_MEM_PROT_CPU_WR | ++ BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR; + -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h -new file mode 100755 -index 000000000000..efebbef235d8 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h -@@ -0,0 +1,143 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(0 != size); ++ KBASE_DEBUG_ASSERT(0 != pages); + -+#ifndef __MALI_MEMORY_H__ -+#define __MALI_MEMORY_H__ ++ if (size == 0) ++ goto err; + -+#include "mali_osk.h" -+#include "mali_session.h" ++ /* All the alloc calls return zeroed memory */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) ++ va = dma_alloc_attrs(kctx->kbdev->dev, size, &dma_pa, GFP_KERNEL, ++ attrs); ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) ++ dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs); ++ va = dma_alloc_attrs(kctx->kbdev->dev, size, &dma_pa, GFP_KERNEL, ++ &attrs); ++#else ++ va = dma_alloc_writecombine(kctx->kbdev->dev, size, &dma_pa, GFP_KERNEL); ++#endif ++ if (!va) ++ goto err; + -+#include -+#include ++ /* Store the state so we can free it later. */ ++ handle->cpu_va = va; ++ handle->dma_pa = dma_pa; ++ handle->size = size; + -+#include "mali_memory_types.h" -+#include "mali_memory_os_alloc.h" + -+_mali_osk_errcode_t mali_memory_initialize(void); -+void mali_memory_terminate(void); ++ reg = kbase_alloc_free_region(kctx, 0, pages, KBASE_REG_ZONE_SAME_VA); ++ if (!reg) ++ goto no_reg; + -+/** @brief Allocate a page table page ++ reg->flags &= ~KBASE_REG_FREE; ++ if (kbase_update_region_flags(kctx, reg, flags) != 0) ++ goto invalid_flags; ++ ++ reg->cpu_alloc = kbase_alloc_create(pages, KBASE_MEM_TYPE_RAW); ++ if (IS_ERR_OR_NULL(reg->cpu_alloc)) ++ goto no_alloc; ++ ++ reg->gpu_alloc = kbase_mem_phy_alloc_get(reg->cpu_alloc); ++ ++ page_array = kbase_get_cpu_phy_pages(reg); ++ ++ for (i = 0; i < pages; i++) ++ page_array[i] = dma_pa + (i << PAGE_SHIFT); ++ ++ reg->cpu_alloc->nents = pages; ++ ++ kbase_gpu_vm_lock(kctx); ++ res = kbase_gpu_mmap(kctx, reg, (uintptr_t) va, pages, 1); ++ kbase_gpu_vm_unlock(kctx); ++ if (res) ++ goto no_mmap; ++ ++ return va; ++ ++no_mmap: ++ kbase_mem_phy_alloc_put(reg->cpu_alloc); ++ kbase_mem_phy_alloc_put(reg->gpu_alloc); ++no_alloc: ++invalid_flags: ++ kfree(reg); ++no_reg: ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) ++ dma_free_attrs(kctx->kbdev->dev, size, va, dma_pa, attrs); ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) ++ dma_free_attrs(kctx->kbdev->dev, size, va, dma_pa, &attrs); ++#else ++ dma_free_writecombine(kctx->kbdev->dev, size, va, dma_pa); ++#endif ++err: ++ return NULL; ++} ++KBASE_EXPORT_SYMBOL(kbase_va_alloc); ++ ++void kbase_va_free(struct kbase_context *kctx, struct kbase_hwc_dma_mapping *handle) ++{ ++ struct kbase_va_region *reg; ++ int err; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) && \ ++ (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) ++ DEFINE_DMA_ATTRS(attrs); ++#endif ++ ++ KBASE_DEBUG_ASSERT(kctx != NULL); ++ KBASE_DEBUG_ASSERT(handle->cpu_va != NULL); ++ ++ kbase_gpu_vm_lock(kctx); ++ reg = kbase_region_tracker_find_region_base_address(kctx, (uintptr_t)handle->cpu_va); ++ KBASE_DEBUG_ASSERT(reg); ++ err = kbase_gpu_munmap(kctx, reg); ++ kbase_gpu_vm_unlock(kctx); ++ KBASE_DEBUG_ASSERT(!err); ++ ++ kbase_mem_phy_alloc_put(reg->cpu_alloc); ++ kbase_mem_phy_alloc_put(reg->gpu_alloc); ++ kfree(reg); ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) ++ dma_free_attrs(kctx->kbdev->dev, handle->size, ++ handle->cpu_va, handle->dma_pa, DMA_ATTR_WRITE_COMBINE); ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) ++ dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs); ++ dma_free_attrs(kctx->kbdev->dev, handle->size, ++ handle->cpu_va, handle->dma_pa, &attrs); ++#else ++ dma_free_writecombine(kctx->kbdev->dev, handle->size, ++ handle->cpu_va, handle->dma_pa); ++#endif ++} ++KBASE_EXPORT_SYMBOL(kbase_va_free); ++ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h +new file mode 100755 +index 000000000..33b3554f9 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h +@@ -0,0 +1,231 @@ ++/* + * -+ * Allocate a page for use as a page directory or page table. The page is -+ * mapped into kernel space. ++ * (C) COPYRIGHT 2010, 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * @return _MALI_OSK_ERR_OK on success, otherwise an error code -+ * @param table_page GPU pointer to the allocated page -+ * @param mapping CPU pointer to the mapping of the allocated page + */ -+MALI_STATIC_INLINE _mali_osk_errcode_t -+mali_mmu_get_table_page(mali_dma_addr *table_page, mali_io_address *mapping) -+{ -+ return mali_mem_os_get_table_page(table_page, mapping); -+} + -+/** @brief Release a page table page ++ ++ ++ ++ ++/** ++ * @file mali_kbase_mem_linux.h ++ * Base kernel memory APIs, Linux implementation. ++ */ ++ ++#ifndef _KBASE_MEM_LINUX_H_ ++#define _KBASE_MEM_LINUX_H_ ++ ++/** A HWC dump mapping */ ++struct kbase_hwc_dma_mapping { ++ void *cpu_va; ++ dma_addr_t dma_pa; ++ size_t size; ++}; ++ ++struct kbase_va_region *kbase_mem_alloc(struct kbase_context *kctx, ++ u64 va_pages, u64 commit_pages, u64 extent, u64 *flags, ++ u64 *gpu_va); ++int kbase_mem_query(struct kbase_context *kctx, u64 gpu_addr, int query, u64 *const pages); ++int kbase_mem_import(struct kbase_context *kctx, enum base_mem_import_type type, ++ void __user *phandle, u32 padding, u64 *gpu_va, u64 *va_pages, ++ u64 *flags); ++u64 kbase_mem_alias(struct kbase_context *kctx, u64 *flags, u64 stride, u64 nents, struct base_mem_aliasing_info *ai, u64 *num_pages); ++int kbase_mem_flags_change(struct kbase_context *kctx, u64 gpu_addr, unsigned int flags, unsigned int mask); ++ ++/** ++ * kbase_mem_commit - Change the physical backing size of a region + * -+ * Release a page table page allocated through \a mali_mmu_get_table_page ++ * @kctx: The kernel context ++ * @gpu_addr: Handle to the memory region ++ * @new_pages: Number of physical pages to back the region with + * -+ * @param pa the GPU address of the page to release ++ * Return: 0 on success or error code + */ -+MALI_STATIC_INLINE void -+mali_mmu_release_table_page(mali_dma_addr phys, void *virt) -+{ -+ mali_mem_os_release_table_page(phys, virt); -+} ++int kbase_mem_commit(struct kbase_context *kctx, u64 gpu_addr, u64 new_pages); + -+/** @brief mmap function ++int kbase_mmap(struct file *file, struct vm_area_struct *vma); ++ ++/** ++ * kbase_mem_evictable_init - Initialize the Ephemeral memory the eviction ++ * mechanism. ++ * @kctx: The kbase context to initialize. + * -+ * mmap syscalls on the Mali device node will end up here. ++ * Return: Zero on success or -errno on failure. ++ */ ++int kbase_mem_evictable_init(struct kbase_context *kctx); ++ ++/** ++ * kbase_mem_evictable_deinit - De-initialize the Ephemeral memory eviction ++ * mechanism. ++ * @kctx: The kbase context to de-initialize. ++ */ ++void kbase_mem_evictable_deinit(struct kbase_context *kctx); ++ ++/** ++ * kbase_mem_grow_gpu_mapping - Grow the GPU mapping of an allocation ++ * @kctx: Context the region belongs to ++ * @reg: The GPU region ++ * @new_pages: The number of pages after the grow ++ * @old_pages: The number of pages before the grow + * -+ * This function allocates Mali memory and maps it on CPU and Mali. ++ * Return: 0 on success, -errno on error. ++ * ++ * Expand the GPU mapping to encompass the new psychical pages which have ++ * been added to the allocation. ++ * ++ * Note: Caller must be holding the region lock. + */ -+int mali_mmap(struct file *filp, struct vm_area_struct *vma); ++int kbase_mem_grow_gpu_mapping(struct kbase_context *kctx, ++ struct kbase_va_region *reg, ++ u64 new_pages, u64 old_pages); + -+/** @brief Start a new memory session ++/** ++ * kbase_mem_evictable_make - Make a physical allocation eligible for eviction ++ * @gpu_alloc: The physical allocation to make evictable + * -+ * Called when a process opens the Mali device node. ++ * Return: 0 on success, -errno on error. + * -+ * @param session Pointer to session to initialize ++ * Take the provided region and make all the physical pages within it ++ * reclaimable by the kernel, updating the per-process VM stats as well. ++ * Remove any CPU mappings (as these can't be removed in the shrinker callback ++ * as mmap_lock might already be taken) but leave the GPU mapping intact as ++ * and until the shrinker reclaims the allocation. ++ * ++ * Note: Must be called with the region lock of the containing context. + */ -+_mali_osk_errcode_t mali_memory_session_begin(struct mali_session_data *session); ++int kbase_mem_evictable_make(struct kbase_mem_phy_alloc *gpu_alloc); + -+/** @brief Close a memory session ++/** ++ * kbase_mem_evictable_unmake - Remove a physical allocations eligibility for ++ * eviction. ++ * @alloc: The physical allocation to remove eviction eligibility from. + * -+ * Called when a process closes the Mali device node. ++ * Return: True if the allocation had its backing restored and false if ++ * it hasn't. + * -+ * Memory allocated by the session will be freed ++ * Make the physical pages in the region no longer reclaimable and update the ++ * per-process stats, if the shrinker has already evicted the memory then ++ * re-allocate it if the region is still alive. + * -+ * @param session Pointer to the session to terminate ++ * Note: Must be called with the region lock of the containing context. + */ -+void mali_memory_session_end(struct mali_session_data *session); ++bool kbase_mem_evictable_unmake(struct kbase_mem_phy_alloc *alloc); + -+/** @brief Prepare Mali page tables for mapping ++struct kbase_vmap_struct { ++ u64 gpu_addr; ++ struct kbase_mem_phy_alloc *cpu_alloc; ++ struct kbase_mem_phy_alloc *gpu_alloc; ++ phys_addr_t *cpu_pages; ++ phys_addr_t *gpu_pages; ++ void *addr; ++ size_t size; ++ bool is_cached; ++}; ++ ++ ++/** ++ * kbase_vmap_prot - Map a GPU VA range into the kernel safely, only if the ++ * requested access permissions are supported ++ * @kctx: Context the VA range belongs to ++ * @gpu_addr: Start address of VA range ++ * @size: Size of VA range ++ * @prot_request: Flags indicating how the caller will then access the memory ++ * @map: Structure to be given to kbase_vunmap() on freeing + * -+ * This function will prepare the Mali page tables for mapping the memory -+ * described by \a descriptor. ++ * Return: Kernel-accessible CPU pointer to the VA range, or NULL on error + * -+ * Page tables will be reference counted and allocated, if not yet present. ++ * Map a GPU VA Range into the kernel. The VA range must be contained within a ++ * GPU memory region. Appropriate CPU cache-flushing operations are made as ++ * required, dependent on the CPU mapping for the memory region. ++ * ++ * This is safer than using kmap() on the pages directly, ++ * because the pages here are refcounted to prevent freeing (and hence reuse ++ * elsewhere in the system) until an kbase_vunmap() ++ * ++ * The flags in @prot_request should use KBASE_REG_{CPU,GPU}_{RD,WR}, to check ++ * whether the region should allow the intended access, and return an error if ++ * disallowed. This is essential for security of imported memory, particularly ++ * a user buf from SHM mapped into the process as RO. In that case, write ++ * access must be checked if the intention is for kernel to write to the ++ * memory. ++ * ++ * The checks are also there to help catch access errors on memory where ++ * security is not a concern: imported memory that is always RW, and memory ++ * that was allocated and owned by the process attached to @kctx. In this case, ++ * it helps to identify memory that was was mapped with the wrong access type. ++ * ++ * Note: KBASE_REG_GPU_{RD,WR} flags are currently supported for legacy cases ++ * where either the security of memory is solely dependent on those flags, or ++ * when userspace code was expecting only the GPU to access the memory (e.g. HW ++ * workarounds). + * -+ * @param descriptor Pointer to the memory descriptor to the mapping + */ -+_mali_osk_errcode_t mali_mem_mali_map_prepare(mali_mem_allocation *descriptor); ++void *kbase_vmap_prot(struct kbase_context *kctx, u64 gpu_addr, size_t size, ++ unsigned long prot_request, struct kbase_vmap_struct *map); + -+/** @brief Resize Mali page tables for mapping ++/** ++ * kbase_vmap - Map a GPU VA range into the kernel safely ++ * @kctx: Context the VA range belongs to ++ * @gpu_addr: Start address of VA range ++ * @size: Size of VA range ++ * @map: Structure to be given to kbase_vunmap() on freeing + * -+ * This function will Resize the Mali page tables for mapping the memory -+ * described by \a descriptor. ++ * Return: Kernel-accessible CPU pointer to the VA range, or NULL on error + * -+ * Page tables will be reference counted and allocated, if not yet present. ++ * Map a GPU VA Range into the kernel. The VA range must be contained within a ++ * GPU memory region. Appropriate CPU cache-flushing operations are made as ++ * required, dependent on the CPU mapping for the memory region. + * -+ * @param descriptor Pointer to the memory descriptor to the mapping -+ * @param new_size The new size of descriptor ++ * This is safer than using kmap() on the pages directly, ++ * because the pages here are refcounted to prevent freeing (and hence reuse ++ * elsewhere in the system) until an kbase_vunmap() ++ * ++ * kbase_vmap_prot() should be used in preference, since kbase_vmap() makes no ++ * checks to ensure the security of e.g. imported user bufs from RO SHM. + */ -+_mali_osk_errcode_t mali_mem_mali_map_resize(mali_mem_allocation *descriptor, u32 new_size); ++void *kbase_vmap(struct kbase_context *kctx, u64 gpu_addr, size_t size, ++ struct kbase_vmap_struct *map); + -+/** @brief Free Mali page tables for mapping ++/** ++ * kbase_vunmap - Unmap a GPU VA range from the kernel ++ * @kctx: Context the VA range belongs to ++ * @map: Structure describing the mapping from the corresponding kbase_vmap() ++ * call + * -+ * This function will unmap pages from Mali memory and free the page tables -+ * that are now unused. ++ * Unmaps a GPU VA range from the kernel, given its @map structure obtained ++ * from kbase_vmap(). Appropriate CPU cache-flushing operations are made as ++ * required, dependent on the CPU mapping for the memory region. + * -+ * The updated pages in the Mali L2 cache will be invalidated, and the MMU TLBs will be zapped if necessary. ++ * The reference taken on pages during kbase_vmap() is released. ++ */ ++void kbase_vunmap(struct kbase_context *kctx, struct kbase_vmap_struct *map); ++ ++/** @brief Allocate memory from kernel space and map it onto the GPU + * -+ * @param descriptor Pointer to the memory descriptor to unmap ++ * @param kctx The context used for the allocation/mapping ++ * @param size The size of the allocation in bytes ++ * @param handle An opaque structure used to contain the state needed to free the memory ++ * @return the VA for kernel space and GPU MMU + */ -+void mali_mem_mali_map_free(struct mali_session_data *session, u32 size, mali_address_t vaddr, u32 flags); ++void *kbase_va_alloc(struct kbase_context *kctx, u32 size, struct kbase_hwc_dma_mapping *handle); + -+/** @brief Parse resource and prepare the OS memory allocator ++/** @brief Free/unmap memory allocated by kbase_va_alloc + * -+ * @param size Maximum size to allocate for Mali GPU. -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. ++ * @param kctx The context used for the allocation/mapping ++ * @param handle An opaque structure returned by the kbase_va_alloc function. + */ -+_mali_osk_errcode_t mali_memory_core_resource_os_memory(u32 size); ++void kbase_va_free(struct kbase_context *kctx, struct kbase_hwc_dma_mapping *handle); + -+/** @brief Parse resource and prepare the dedicated memory allocator ++extern const struct vm_operations_struct kbase_vm_ops; ++ ++#endif /* _KBASE_MEM_LINUX_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h b/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h +new file mode 100755 +index 000000000..9725fd3f0 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h +@@ -0,0 +1,45 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2014, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * @param start Physical start address of dedicated Mali GPU memory. -+ * @param size Size of dedicated Mali GPU memory. -+ * @return _MALI_OSK_ERR_OK on success, otherwise failure. + */ -+_mali_osk_errcode_t mali_memory_core_resource_dedicated_memory(u32 start, u32 size); + + -+struct mali_page_node *_mali_page_node_allocate(mali_page_node_type type); + -+void _mali_page_node_ref(struct mali_page_node *node); -+void _mali_page_node_unref(struct mali_page_node *node); -+void _mali_page_node_add_page(struct mali_page_node *node, struct page *page); + -+void _mali_page_node_add_block_item(struct mali_page_node *node, mali_block_item *item); + -+void _mali_page_node_add_swap_item(struct mali_page_node *node, struct mali_swap_item *item); ++#ifndef _KBASE_MEM_LOWLEVEL_H ++#define _KBASE_MEM_LOWLEVEL_H + -+int _mali_page_node_get_ref_count(struct mali_page_node *node); -+dma_addr_t _mali_page_node_get_dma_addr(struct mali_page_node *node); -+unsigned long _mali_page_node_get_pfn(struct mali_page_node *node); ++#ifndef _KBASE_H_ ++#error "Don't include this file directly, use mali_kbase.h instead" ++#endif + -+#endif /* __MALI_MEMORY_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c ++#include ++ ++/** ++ * @brief Flags for kbase_phy_allocator_pages_alloc ++ */ ++#define KBASE_PHY_PAGES_FLAG_DEFAULT (0) /** Default allocation flag */ ++#define KBASE_PHY_PAGES_FLAG_CLEAR (1 << 0) /** Clear the pages after allocation */ ++#define KBASE_PHY_PAGES_FLAG_POISON (1 << 1) /** Fill the memory with a poison value */ ++ ++#define KBASE_PHY_PAGES_SUPPORTED_FLAGS (KBASE_PHY_PAGES_FLAG_DEFAULT|KBASE_PHY_PAGES_FLAG_CLEAR|KBASE_PHY_PAGES_FLAG_POISON) ++ ++#define KBASE_PHY_PAGES_POISON_VALUE 0xFD /** Value to fill the memory with when KBASE_PHY_PAGES_FLAG_POISON is set */ ++ ++enum kbase_sync_type { ++ KBASE_SYNC_TO_CPU, ++ KBASE_SYNC_TO_DEVICE ++}; ++ ++#endif /* _KBASE_LOWLEVEL_H */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c b/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c new file mode 100755 -index 000000000000..bccef3576914 +index 000000000..a8269940a --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c -@@ -0,0 +1,362 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c +@@ -0,0 +1,569 @@ +/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2015-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include "mali_kernel_common.h" -+#include "mali_memory.h" -+#include "mali_memory_block_alloc.h" -+#include "mali_osk.h" -+#include + + -+static mali_block_allocator *mali_mem_block_gobal_allocator = NULL; ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+unsigned long _mali_blk_item_get_phy_addr(mali_block_item *item) ++#define pool_dbg(pool, format, ...) \ ++ dev_dbg(pool->kbdev->dev, "%s-pool [%zu/%zu]: " format, \ ++ (pool->next_pool) ? "kctx" : "kbdev", \ ++ kbase_mem_pool_size(pool), \ ++ kbase_mem_pool_max_size(pool), \ ++ ##__VA_ARGS__) ++ ++#define NOT_DIRTY false ++#define NOT_RECLAIMED false ++ ++static inline void kbase_mem_pool_lock(struct kbase_mem_pool *pool) +{ -+ return (item->phy_addr & ~(MALI_BLOCK_REF_MASK)); ++ spin_lock(&pool->pool_lock); +} + ++static inline void kbase_mem_pool_unlock(struct kbase_mem_pool *pool) ++{ ++ spin_unlock(&pool->pool_lock); ++} + -+unsigned long _mali_blk_item_get_pfn(mali_block_item *item) ++static size_t kbase_mem_pool_capacity(struct kbase_mem_pool *pool) +{ -+ return (item->phy_addr / MALI_BLOCK_SIZE); ++ ssize_t max_size = kbase_mem_pool_max_size(pool); ++ ssize_t cur_size = kbase_mem_pool_size(pool); ++ ++ return max(max_size - cur_size, (ssize_t)0); +} + ++static bool kbase_mem_pool_is_full(struct kbase_mem_pool *pool) ++{ ++ return kbase_mem_pool_size(pool) >= kbase_mem_pool_max_size(pool); ++} + -+u32 mali_mem_block_get_ref_count(mali_page_node *node) ++static bool kbase_mem_pool_is_empty(struct kbase_mem_pool *pool) +{ -+ MALI_DEBUG_ASSERT(node->type == MALI_PAGE_NODE_BLOCK); -+ return (node->blk_it->phy_addr & MALI_BLOCK_REF_MASK); ++ return kbase_mem_pool_size(pool) == 0; +} + ++static void kbase_mem_pool_add_locked(struct kbase_mem_pool *pool, ++ struct page *p) ++{ ++ lockdep_assert_held(&pool->pool_lock); + -+/* Increase the refence count -+* It not atomic, so it need to get sp_lock before call this function -+*/ ++ list_add(&p->lru, &pool->page_list); ++ pool->cur_size++; + -+u32 mali_mem_block_add_ref(mali_page_node *node) ++ pool_dbg(pool, "added page\n"); ++} ++ ++static void kbase_mem_pool_add(struct kbase_mem_pool *pool, struct page *p) +{ -+ MALI_DEBUG_ASSERT(node->type == MALI_PAGE_NODE_BLOCK); -+ MALI_DEBUG_ASSERT(mali_mem_block_get_ref_count(node) < MALI_BLOCK_MAX_REF_COUNT); -+ return (node->blk_it->phy_addr++ & MALI_BLOCK_REF_MASK); ++ kbase_mem_pool_lock(pool); ++ kbase_mem_pool_add_locked(pool, p); ++ kbase_mem_pool_unlock(pool); +} + -+/* Decase the refence count -+* It not atomic, so it need to get sp_lock before call this function -+*/ -+u32 mali_mem_block_dec_ref(mali_page_node *node) ++static void kbase_mem_pool_add_list_locked(struct kbase_mem_pool *pool, ++ struct list_head *page_list, size_t nr_pages) +{ -+ MALI_DEBUG_ASSERT(node->type == MALI_PAGE_NODE_BLOCK); -+ MALI_DEBUG_ASSERT(mali_mem_block_get_ref_count(node) > 0); -+ return (node->blk_it->phy_addr-- & MALI_BLOCK_REF_MASK); ++ lockdep_assert_held(&pool->pool_lock); ++ ++ list_splice(page_list, &pool->page_list); ++ pool->cur_size += nr_pages; ++ ++ pool_dbg(pool, "added %zu pages\n", nr_pages); +} + ++static void kbase_mem_pool_add_list(struct kbase_mem_pool *pool, ++ struct list_head *page_list, size_t nr_pages) ++{ ++ kbase_mem_pool_lock(pool); ++ kbase_mem_pool_add_list_locked(pool, page_list, nr_pages); ++ kbase_mem_pool_unlock(pool); ++} + -+static mali_block_allocator *mali_mem_block_allocator_create(u32 base_address, u32 size) ++static struct page *kbase_mem_pool_remove_locked(struct kbase_mem_pool *pool) +{ -+ mali_block_allocator *info; -+ u32 usable_size; -+ u32 num_blocks; -+ mali_page_node *m_node; -+ mali_block_item *mali_blk_items = NULL; -+ int i = 0; ++ struct page *p; + -+ usable_size = size & ~(MALI_BLOCK_SIZE - 1); -+ MALI_DEBUG_PRINT(3, ("Mali block allocator create for region starting at 0x%08X length 0x%08X\n", base_address, size)); -+ MALI_DEBUG_PRINT(4, ("%d usable bytes\n", usable_size)); -+ num_blocks = usable_size / MALI_BLOCK_SIZE; -+ MALI_DEBUG_PRINT(4, ("which becomes %d blocks\n", num_blocks)); ++ lockdep_assert_held(&pool->pool_lock); + -+ if (usable_size == 0) { -+ MALI_DEBUG_PRINT(1, ("Memory block of size %d is unusable\n", size)); ++ if (kbase_mem_pool_is_empty(pool)) + return NULL; ++ ++ p = list_first_entry(&pool->page_list, struct page, lru); ++ list_del_init(&p->lru); ++ pool->cur_size--; ++ ++ pool_dbg(pool, "removed page\n"); ++ ++ return p; ++} ++ ++static struct page *kbase_mem_pool_remove(struct kbase_mem_pool *pool) ++{ ++ struct page *p; ++ ++ kbase_mem_pool_lock(pool); ++ p = kbase_mem_pool_remove_locked(pool); ++ kbase_mem_pool_unlock(pool); ++ ++ return p; ++} ++ ++static void kbase_mem_pool_sync_page(struct kbase_mem_pool *pool, ++ struct page *p) ++{ ++ struct device *dev = pool->kbdev->dev; ++ ++ dma_sync_single_for_device(dev, kbase_dma_addr(p), ++ PAGE_SIZE, DMA_BIDIRECTIONAL); ++} ++ ++static void kbase_mem_pool_zero_page(struct kbase_mem_pool *pool, ++ struct page *p) ++{ ++ clear_highpage(p); ++ kbase_mem_pool_sync_page(pool, p); ++} ++ ++static void kbase_mem_pool_spill(struct kbase_mem_pool *next_pool, ++ struct page *p) ++{ ++ /* Zero page before spilling */ ++ kbase_mem_pool_zero_page(next_pool, p); ++ ++ kbase_mem_pool_add(next_pool, p); ++} ++ ++struct page *kbase_mem_alloc_page(struct kbase_device *kbdev) ++{ ++ struct page *p; ++ gfp_t gfp; ++ struct device *dev = kbdev->dev; ++ dma_addr_t dma_addr; ++ ++#if defined(CONFIG_ARM) && !defined(CONFIG_HAVE_DMA_ATTRS) && \ ++ LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) ++ /* DMA cache sync fails for HIGHMEM before 3.5 on ARM */ ++ gfp = GFP_USER | __GFP_ZERO; ++#else ++ gfp = GFP_HIGHUSER | __GFP_ZERO; ++#endif ++ ++ if (current->flags & PF_KTHREAD) { ++ /* Don't trigger OOM killer from kernel threads, e.g. when ++ * growing memory on GPU page fault */ ++ gfp |= __GFP_NORETRY; + } + -+ info = _mali_osk_calloc(1, sizeof(mali_block_allocator)); -+ if (NULL != info) { -+ INIT_LIST_HEAD(&info->free); -+ spin_lock_init(&info->sp_lock); -+ info->total_num = num_blocks; -+ mali_blk_items = _mali_osk_calloc(1, sizeof(mali_block_item) * num_blocks); ++ p = alloc_page(gfp); ++ if (!p) ++ return NULL; + -+ if (mali_blk_items) { -+ info->items = mali_blk_items; -+ /* add blocks(4k size) to free list*/ -+ for (i = 0 ; i < num_blocks ; i++) { -+ /* add block information*/ -+ mali_blk_items[i].phy_addr = base_address + (i * MALI_BLOCK_SIZE); -+ /* add to free list */ -+ m_node = _mali_page_node_allocate(MALI_PAGE_NODE_BLOCK); -+ if (m_node == NULL) -+ goto fail; -+ _mali_page_node_add_block_item(m_node, &(mali_blk_items[i])); -+ list_add_tail(&m_node->list, &info->free); -+ atomic_add(1, &info->free_num); -+ } -+ return info; -+ } ++ dma_addr = dma_map_page(dev, p, 0, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ if (dma_mapping_error(dev, dma_addr)) { ++ __free_page(p); ++ return NULL; + } -+fail: -+ mali_mem_block_allocator_destroy(); -+ return NULL; ++ ++ WARN_ON(dma_addr != page_to_phys(p)); ++ ++ kbase_set_dma_addr(p, dma_addr); ++ ++ return p; +} + -+void mali_mem_block_allocator_destroy(void) ++static void kbase_mem_pool_free_page(struct kbase_mem_pool *pool, ++ struct page *p) +{ -+ struct mali_page_node *m_page, *m_tmp; -+ mali_block_allocator *info = mali_mem_block_gobal_allocator; -+ MALI_DEBUG_ASSERT_POINTER(info); -+ MALI_DEBUG_PRINT(4, ("Memory block destroy !\n")); ++ struct device *dev = pool->kbdev->dev; ++ dma_addr_t dma_addr = kbase_dma_addr(p); + -+ if (NULL == info) -+ return; ++ dma_unmap_page(dev, dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ kbase_clear_dma_addr(p); ++ __free_page(p); + -+ list_for_each_entry_safe(m_page, m_tmp , &info->free, list) { -+ MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_BLOCK); -+ list_del(&m_page->list); -+ kfree(m_page); ++ pool_dbg(pool, "freed page to kernel\n"); ++} ++ ++static size_t kbase_mem_pool_shrink_locked(struct kbase_mem_pool *pool, ++ size_t nr_to_shrink) ++{ ++ struct page *p; ++ size_t i; ++ ++ lockdep_assert_held(&pool->pool_lock); ++ ++ for (i = 0; i < nr_to_shrink && !kbase_mem_pool_is_empty(pool); i++) { ++ p = kbase_mem_pool_remove_locked(pool); ++ kbase_mem_pool_free_page(pool, p); + } + -+ _mali_osk_free(info->items); -+ _mali_osk_free(info); ++ return i; +} + -+u32 mali_mem_block_release(mali_mem_backend *mem_bkend) ++static size_t kbase_mem_pool_shrink(struct kbase_mem_pool *pool, ++ size_t nr_to_shrink) +{ -+ mali_mem_allocation *alloc = mem_bkend->mali_allocation; -+ u32 free_pages_nr = 0; -+ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_BLOCK); ++ size_t nr_freed; + -+ /* Unmap the memory from the mali virtual address space. */ -+ mali_mem_block_mali_unmap(alloc); -+ mutex_lock(&mem_bkend->mutex); -+ free_pages_nr = mali_mem_block_free(&mem_bkend->block_mem); -+ mutex_unlock(&mem_bkend->mutex); -+ return free_pages_nr; ++ kbase_mem_pool_lock(pool); ++ nr_freed = kbase_mem_pool_shrink_locked(pool, nr_to_shrink); ++ kbase_mem_pool_unlock(pool); ++ ++ return nr_freed; +} + ++int kbase_mem_pool_grow(struct kbase_mem_pool *pool, ++ size_t nr_to_grow) ++{ ++ struct page *p; ++ size_t i; + -+int mali_mem_block_alloc(mali_mem_block_mem *block_mem, u32 size) ++ for (i = 0; i < nr_to_grow; i++) { ++ p = kbase_mem_alloc_page(pool->kbdev); ++ if (!p) ++ return -ENOMEM; ++ kbase_mem_pool_add(pool, p); ++ } ++ ++ return 0; ++} ++ ++void kbase_mem_pool_trim(struct kbase_mem_pool *pool, size_t new_size) +{ -+ struct mali_page_node *m_page, *m_tmp; -+ size_t page_count = PAGE_ALIGN(size) / _MALI_OSK_MALI_PAGE_SIZE; -+ mali_block_allocator *info = mali_mem_block_gobal_allocator; -+ MALI_DEBUG_ASSERT_POINTER(info); ++ size_t cur_size; + -+ MALI_DEBUG_PRINT(4, ("BLOCK Mem: Allocate size = 0x%x\n", size)); -+ /*do some init */ -+ INIT_LIST_HEAD(&block_mem->pfns); ++ cur_size = kbase_mem_pool_size(pool); + -+ spin_lock(&info->sp_lock); -+ /*check if have enough space*/ -+ if (atomic_read(&info->free_num) > page_count) { -+ list_for_each_entry_safe(m_page, m_tmp , &info->free, list) { -+ if (page_count > 0) { -+ MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_BLOCK); -+ MALI_DEBUG_ASSERT(mali_mem_block_get_ref_count(m_page) == 0); -+ list_move(&m_page->list, &block_mem->pfns); -+ block_mem->count++; -+ atomic_dec(&info->free_num); -+ _mali_page_node_ref(m_page); -+ } else { -+ break; -+ } -+ page_count--; -+ } -+ } else { -+ /* can't allocate from BLOCK memory*/ -+ spin_unlock(&info->sp_lock); -+ return -1; ++ if (new_size > pool->max_size) ++ new_size = pool->max_size; ++ ++ if (new_size < cur_size) ++ kbase_mem_pool_shrink(pool, cur_size - new_size); ++ else if (new_size > cur_size) ++ kbase_mem_pool_grow(pool, new_size - cur_size); ++} ++ ++void kbase_mem_pool_set_max_size(struct kbase_mem_pool *pool, size_t max_size) ++{ ++ size_t cur_size; ++ size_t nr_to_shrink; ++ ++ kbase_mem_pool_lock(pool); ++ ++ pool->max_size = max_size; ++ ++ cur_size = kbase_mem_pool_size(pool); ++ if (max_size < cur_size) { ++ nr_to_shrink = cur_size - max_size; ++ kbase_mem_pool_shrink_locked(pool, nr_to_shrink); + } + -+ spin_unlock(&info->sp_lock); -+ return 0; ++ kbase_mem_pool_unlock(pool); +} + -+u32 mali_mem_block_free(mali_mem_block_mem *block_mem) ++ ++static unsigned long kbase_mem_pool_reclaim_count_objects(struct shrinker *s, ++ struct shrink_control *sc) +{ -+ u32 free_pages_nr = 0; ++ struct kbase_mem_pool *pool; + -+ free_pages_nr = mali_mem_block_free_list(&block_mem->pfns); -+ MALI_DEBUG_PRINT(4, ("BLOCK Mem free : allocated size = 0x%x, free size = 0x%x\n", block_mem->count * _MALI_OSK_MALI_PAGE_SIZE, -+ free_pages_nr * _MALI_OSK_MALI_PAGE_SIZE)); -+ block_mem->count = 0; -+ MALI_DEBUG_ASSERT(list_empty(&block_mem->pfns)); ++ pool = container_of(s, struct kbase_mem_pool, reclaim); ++ pool_dbg(pool, "reclaim count: %zu\n", kbase_mem_pool_size(pool)); ++ return kbase_mem_pool_size(pool); ++} + -+ return free_pages_nr; ++static unsigned long kbase_mem_pool_reclaim_scan_objects(struct shrinker *s, ++ struct shrink_control *sc) ++{ ++ struct kbase_mem_pool *pool; ++ unsigned long freed; ++ ++ pool = container_of(s, struct kbase_mem_pool, reclaim); ++ ++ pool_dbg(pool, "reclaim scan %ld:\n", sc->nr_to_scan); ++ ++ freed = kbase_mem_pool_shrink(pool, sc->nr_to_scan); ++ ++ pool_dbg(pool, "reclaim freed %ld pages\n", freed); ++ ++ return freed; +} + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) ++static int kbase_mem_pool_reclaim_shrink(struct shrinker *s, ++ struct shrink_control *sc) ++{ ++ if (sc->nr_to_scan == 0) ++ return kbase_mem_pool_reclaim_count_objects(s, sc); + -+u32 mali_mem_block_free_list(struct list_head *list) ++ return kbase_mem_pool_reclaim_scan_objects(s, sc); ++} ++#endif ++ ++int kbase_mem_pool_init(struct kbase_mem_pool *pool, ++ size_t max_size, ++ struct kbase_device *kbdev, ++ struct kbase_mem_pool *next_pool) +{ -+ struct mali_page_node *m_page, *m_tmp; -+ mali_block_allocator *info = mali_mem_block_gobal_allocator; -+ u32 free_pages_nr = 0; ++ pool->cur_size = 0; ++ pool->max_size = max_size; ++ pool->kbdev = kbdev; ++ pool->next_pool = next_pool; + -+ if (info) { -+ spin_lock(&info->sp_lock); -+ list_for_each_entry_safe(m_page, m_tmp , list, list) { -+ if (1 == _mali_page_node_get_ref_count(m_page)) { -+ free_pages_nr++; -+ } -+ mali_mem_block_free_node(m_page); ++ spin_lock_init(&pool->pool_lock); ++ INIT_LIST_HEAD(&pool->page_list); ++ ++ /* Register shrinker */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) ++ pool->reclaim.shrink = kbase_mem_pool_reclaim_shrink; ++#else ++ pool->reclaim.count_objects = kbase_mem_pool_reclaim_count_objects; ++ pool->reclaim.scan_objects = kbase_mem_pool_reclaim_scan_objects; ++#endif ++ pool->reclaim.seeks = DEFAULT_SEEKS; ++ /* Kernel versions prior to 3.1 : ++ * struct shrinker does not define batch */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) ++ pool->reclaim.batch = 0; ++#endif ++ register_shrinker(&pool->reclaim); ++ ++ pool_dbg(pool, "initialized\n"); ++ ++ return 0; ++} ++ ++void kbase_mem_pool_term(struct kbase_mem_pool *pool) ++{ ++ struct kbase_mem_pool *next_pool = pool->next_pool; ++ struct page *p; ++ size_t nr_to_spill = 0; ++ LIST_HEAD(spill_list); ++ int i; ++ ++ pool_dbg(pool, "terminate()\n"); ++ ++ unregister_shrinker(&pool->reclaim); ++ ++ kbase_mem_pool_lock(pool); ++ pool->max_size = 0; ++ ++ if (next_pool && !kbase_mem_pool_is_full(next_pool)) { ++ /* Spill to next pool (may overspill) */ ++ nr_to_spill = kbase_mem_pool_capacity(next_pool); ++ nr_to_spill = min(kbase_mem_pool_size(pool), nr_to_spill); ++ ++ /* Zero pages first without holding the next_pool lock */ ++ for (i = 0; i < nr_to_spill; i++) { ++ p = kbase_mem_pool_remove_locked(pool); ++ kbase_mem_pool_zero_page(pool, p); ++ list_add(&p->lru, &spill_list); + } -+ spin_unlock(&info->sp_lock); + } -+ return free_pages_nr; ++ ++ while (!kbase_mem_pool_is_empty(pool)) { ++ /* Free remaining pages to kernel */ ++ p = kbase_mem_pool_remove_locked(pool); ++ kbase_mem_pool_free_page(pool, p); ++ } ++ ++ kbase_mem_pool_unlock(pool); ++ ++ if (next_pool && nr_to_spill) { ++ /* Add new page list to next_pool */ ++ kbase_mem_pool_add_list(next_pool, &spill_list, nr_to_spill); ++ ++ pool_dbg(pool, "terminate() spilled %zu pages\n", nr_to_spill); ++ } ++ ++ pool_dbg(pool, "terminated\n"); +} + -+/* free the node,*/ -+void mali_mem_block_free_node(struct mali_page_node *node) ++struct page *kbase_mem_pool_alloc(struct kbase_mem_pool *pool) +{ -+ mali_block_allocator *info = mali_mem_block_gobal_allocator; ++ struct page *p; + -+ /* only handle BLOCK node */ -+ if (node->type == MALI_PAGE_NODE_BLOCK && info) { -+ /*Need to make this atomic?*/ -+ if (1 == _mali_page_node_get_ref_count(node)) { -+ /*Move to free list*/ -+ _mali_page_node_unref(node); -+ list_move_tail(&node->list, &info->free); -+ atomic_add(1, &info->free_num); -+ } else { -+ _mali_page_node_unref(node); -+ list_del(&node->list); -+ kfree(node); -+ } ++ do { ++ pool_dbg(pool, "alloc()\n"); ++ p = kbase_mem_pool_remove(pool); ++ ++ if (p) ++ return p; ++ ++ pool = pool->next_pool; ++ } while (pool); ++ ++ return NULL; ++} ++ ++void kbase_mem_pool_free(struct kbase_mem_pool *pool, struct page *p, ++ bool dirty) ++{ ++ struct kbase_mem_pool *next_pool = pool->next_pool; ++ ++ pool_dbg(pool, "free()\n"); ++ ++ if (!kbase_mem_pool_is_full(pool)) { ++ /* Add to our own pool */ ++ if (dirty) ++ kbase_mem_pool_sync_page(pool, p); ++ ++ kbase_mem_pool_add(pool, p); ++ } else if (next_pool && !kbase_mem_pool_is_full(next_pool)) { ++ /* Spill to next pool */ ++ kbase_mem_pool_spill(next_pool, p); ++ } else { ++ /* Free page */ ++ kbase_mem_pool_free_page(pool, p); + } +} + -+/* unref the node, but not free it */ -+_mali_osk_errcode_t mali_mem_block_unref_node(struct mali_page_node *node) ++int kbase_mem_pool_alloc_pages(struct kbase_mem_pool *pool, size_t nr_pages, ++ phys_addr_t *pages) +{ -+ mali_block_allocator *info = mali_mem_block_gobal_allocator; -+ mali_page_node *new_node; ++ struct page *p; ++ size_t nr_from_pool; ++ size_t i; ++ int err = -ENOMEM; + -+ /* only handle BLOCK node */ -+ if (node->type == MALI_PAGE_NODE_BLOCK && info) { -+ /*Need to make this atomic?*/ -+ if (1 == _mali_page_node_get_ref_count(node)) { -+ /* allocate a new node, Add to free list, keep the old node*/ -+ _mali_page_node_unref(node); -+ new_node = _mali_page_node_allocate(MALI_PAGE_NODE_BLOCK); -+ if (new_node) { -+ memcpy(new_node, node, sizeof(mali_page_node)); -+ list_add(&new_node->list, &info->free); -+ atomic_add(1, &info->free_num); -+ } else -+ return _MALI_OSK_ERR_FAULT; ++ pool_dbg(pool, "alloc_pages(%zu):\n", nr_pages); + -+ } else { -+ _mali_page_node_unref(node); -+ } ++ /* Get pages from this pool */ ++ kbase_mem_pool_lock(pool); ++ nr_from_pool = min(nr_pages, kbase_mem_pool_size(pool)); ++ for (i = 0; i < nr_from_pool; i++) { ++ p = kbase_mem_pool_remove_locked(pool); ++ pages[i] = page_to_phys(p); + } -+ return _MALI_OSK_ERR_OK; ++ kbase_mem_pool_unlock(pool); ++ ++ if (i != nr_pages && pool->next_pool) { ++ /* Allocate via next pool */ ++ err = kbase_mem_pool_alloc_pages(pool->next_pool, ++ nr_pages - i, pages + i); ++ ++ if (err) ++ goto err_rollback; ++ ++ i += nr_pages - i; ++ } ++ ++ /* Get any remaining pages from kernel */ ++ for (; i < nr_pages; i++) { ++ p = kbase_mem_alloc_page(pool->kbdev); ++ if (!p) ++ goto err_rollback; ++ pages[i] = page_to_phys(p); ++ } ++ ++ pool_dbg(pool, "alloc_pages(%zu) done\n", nr_pages); ++ ++ return 0; ++ ++err_rollback: ++ kbase_mem_pool_free_pages(pool, i, pages, NOT_DIRTY, NOT_RECLAIMED); ++ return err; +} + ++static void kbase_mem_pool_add_array(struct kbase_mem_pool *pool, ++ size_t nr_pages, phys_addr_t *pages, bool zero, bool sync) ++{ ++ struct page *p; ++ size_t nr_to_pool = 0; ++ LIST_HEAD(new_page_list); ++ size_t i; + -+int mali_mem_block_mali_map(mali_mem_block_mem *block_mem, struct mali_session_data *session, u32 vaddr, u32 props) ++ if (!nr_pages) ++ return; ++ ++ pool_dbg(pool, "add_array(%zu, zero=%d, sync=%d):\n", ++ nr_pages, zero, sync); ++ ++ /* Zero/sync pages first without holding the pool lock */ ++ for (i = 0; i < nr_pages; i++) { ++ if (unlikely(!pages[i])) ++ continue; ++ ++ p = phys_to_page(pages[i]); ++ ++ if (zero) ++ kbase_mem_pool_zero_page(pool, p); ++ else if (sync) ++ kbase_mem_pool_sync_page(pool, p); ++ ++ list_add(&p->lru, &new_page_list); ++ nr_to_pool++; ++ pages[i] = 0; ++ } ++ ++ /* Add new page list to pool */ ++ kbase_mem_pool_add_list(pool, &new_page_list, nr_to_pool); ++ ++ pool_dbg(pool, "add_array(%zu) added %zu pages\n", ++ nr_pages, nr_to_pool); ++} ++ ++void kbase_mem_pool_free_pages(struct kbase_mem_pool *pool, size_t nr_pages, ++ phys_addr_t *pages, bool dirty, bool reclaimed) +{ -+ struct mali_page_directory *pagedir = session->page_directory; -+ struct mali_page_node *m_page; -+ dma_addr_t phys; -+ u32 virt = vaddr; -+ u32 prop = props; ++ struct kbase_mem_pool *next_pool = pool->next_pool; ++ struct page *p; ++ size_t nr_to_pool; ++ LIST_HEAD(to_pool_list); ++ size_t i = 0; + -+ list_for_each_entry(m_page, &block_mem->pfns, list) { -+ MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_BLOCK); -+ phys = _mali_page_node_get_dma_addr(m_page); -+#if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT) -+ /* Verify that the "physical" address is 32-bit and -+ * usable for Mali, when on a system with bus addresses -+ * wider than 32-bit. */ -+ MALI_DEBUG_ASSERT(0 == (phys >> 32)); -+#endif -+ mali_mmu_pagedir_update(pagedir, virt, (mali_dma_addr)phys, MALI_MMU_PAGE_SIZE, prop); -+ virt += MALI_MMU_PAGE_SIZE; ++ pool_dbg(pool, "free_pages(%zu):\n", nr_pages); ++ ++ if (!reclaimed) { ++ /* Add to this pool */ ++ nr_to_pool = kbase_mem_pool_capacity(pool); ++ nr_to_pool = min(nr_pages, nr_to_pool); ++ ++ kbase_mem_pool_add_array(pool, nr_to_pool, pages, false, dirty); ++ ++ i += nr_to_pool; ++ ++ if (i != nr_pages && next_pool) { ++ /* Spill to next pool (may overspill) */ ++ nr_to_pool = kbase_mem_pool_capacity(next_pool); ++ nr_to_pool = min(nr_pages - i, nr_to_pool); ++ ++ kbase_mem_pool_add_array(next_pool, nr_to_pool, ++ pages + i, true, dirty); ++ i += nr_to_pool; ++ } ++ } ++ ++ /* Free any remaining pages to kernel */ ++ for (; i < nr_pages; i++) { ++ if (unlikely(!pages[i])) ++ continue; ++ ++ p = phys_to_page(pages[i]); ++ ++ kbase_mem_pool_free_page(pool, p); ++ pages[i] = 0; + } + ++ pool_dbg(pool, "free_pages(%zu) done\n", nr_pages); ++} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c +new file mode 100755 +index 000000000..585fba036 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c +@@ -0,0 +1,81 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ ++ ++ ++ ++#include ++#include ++ ++#include ++ ++#ifdef CONFIG_DEBUG_FS ++ ++static int kbase_mem_pool_debugfs_size_get(void *data, u64 *val) ++{ ++ struct kbase_mem_pool *pool = (struct kbase_mem_pool *)data; ++ ++ *val = kbase_mem_pool_size(pool); ++ + return 0; +} + -+void mali_mem_block_mali_unmap(mali_mem_allocation *alloc) ++static int kbase_mem_pool_debugfs_size_set(void *data, u64 val) +{ -+ struct mali_session_data *session; -+ MALI_DEBUG_ASSERT_POINTER(alloc); -+ session = alloc->session; -+ MALI_DEBUG_ASSERT_POINTER(session); ++ struct kbase_mem_pool *pool = (struct kbase_mem_pool *)data; + -+ mali_session_memory_lock(session); -+ mali_mem_mali_map_free(session, alloc->psize, alloc->mali_vma_node.vm_node.start, -+ alloc->flags); -+ mali_session_memory_unlock(session); ++ kbase_mem_pool_trim(pool, val); ++ ++ return 0; +} + ++DEFINE_SIMPLE_ATTRIBUTE(kbase_mem_pool_debugfs_size_fops, ++ kbase_mem_pool_debugfs_size_get, ++ kbase_mem_pool_debugfs_size_set, ++ "%llu\n"); + -+int mali_mem_block_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma) ++static int kbase_mem_pool_debugfs_max_size_get(void *data, u64 *val) +{ -+ int ret; -+ mali_mem_block_mem *block_mem = &mem_bkend->block_mem; -+ unsigned long addr = vma->vm_start; -+ struct mali_page_node *m_page; -+ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_BLOCK); ++ struct kbase_mem_pool *pool = (struct kbase_mem_pool *)data; + -+ list_for_each_entry(m_page, &block_mem->pfns, list) { -+ MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_BLOCK); -+ ret = vmf_insert_pfn(vma, addr, _mali_page_node_get_pfn(m_page)); ++ *val = kbase_mem_pool_max_size(pool); + -+ if (unlikely(0 != ret)) { -+ return -EFAULT; -+ } -+ addr += _MALI_OSK_MALI_PAGE_SIZE; ++ return 0; ++} + -+ } ++static int kbase_mem_pool_debugfs_max_size_set(void *data, u64 val) ++{ ++ struct kbase_mem_pool *pool = (struct kbase_mem_pool *)data; ++ ++ kbase_mem_pool_set_max_size(pool, val); + + return 0; +} + ++DEFINE_SIMPLE_ATTRIBUTE(kbase_mem_pool_debugfs_max_size_fops, ++ kbase_mem_pool_debugfs_max_size_get, ++ kbase_mem_pool_debugfs_max_size_set, ++ "%llu\n"); + -+_mali_osk_errcode_t mali_memory_core_resource_dedicated_memory(u32 start, u32 size) ++void kbase_mem_pool_debugfs_init(struct dentry *parent, ++ struct kbase_mem_pool *pool) +{ -+ mali_block_allocator *allocator; ++ debugfs_create_file("mem_pool_size", S_IRUGO | S_IWUSR, parent, ++ pool, &kbase_mem_pool_debugfs_size_fops); + -+ /* Do the low level linux operation first */ ++ debugfs_create_file("mem_pool_max_size", S_IRUGO | S_IWUSR, parent, ++ pool, &kbase_mem_pool_debugfs_max_size_fops); ++} + -+ /* Request ownership of the memory */ -+ if (_MALI_OSK_ERR_OK != _mali_osk_mem_reqregion(start, size, "Dedicated Mali GPU memory")) { -+ MALI_DEBUG_PRINT(1, ("Failed to request memory region for frame buffer (0x%08X - 0x%08X)\n", start, start + size - 1)); -+ return _MALI_OSK_ERR_FAULT; -+ } ++#endif /* CONFIG_DEBUG_FS */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h +new file mode 100755 +index 000000000..1442854e8 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h +@@ -0,0 +1,36 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ /* Create generic block allocator object to handle it */ -+ allocator = mali_mem_block_allocator_create(start, size); + -+ if (NULL == allocator) { -+ MALI_DEBUG_PRINT(1, ("Memory bank registration failed\n")); -+ _mali_osk_mem_unreqregion(start, size); -+ MALI_ERROR(_MALI_OSK_ERR_FAULT); -+ } + -+ mali_mem_block_gobal_allocator = (mali_block_allocator *)allocator; ++#ifndef _KBASE_MEM_POOL_DEBUGFS_H ++#define _KBASE_MEM_POOL_DEBUGFS_H + -+ return _MALI_OSK_ERR_OK; ++#include ++ ++/** ++ * kbase_mem_pool_debugfs_init - add debugfs knobs for @pool ++ * @parent: Parent debugfs dentry ++ * @pool: Memory pool to control ++ * ++ * Adds two debugfs files under @parent: ++ * - mem_pool_size: get/set the current size of @pool ++ * - mem_pool_max_size: get/set the max size of @pool ++ */ ++void kbase_mem_pool_debugfs_init(struct dentry *parent, ++ struct kbase_mem_pool *pool); ++ ++#endif /*_KBASE_MEM_POOL_DEBUGFS_H*/ ++ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c +new file mode 100755 +index 000000000..d58fd8d62 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c +@@ -0,0 +1,121 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ ++ ++ ++ ++#include ++ ++#ifdef CONFIG_DEBUG_FS ++ ++/** Show callback for the @c mem_profile debugfs file. ++ * ++ * This function is called to get the contents of the @c mem_profile debugfs ++ * file. This is a report of current memory usage and distribution in userspace. ++ * ++ * @param sfile The debugfs entry ++ * @param data Data associated with the entry ++ * ++ * @return 0 if it successfully prints data in debugfs entry file, non-zero otherwise ++ */ ++static int kbasep_mem_profile_seq_show(struct seq_file *sfile, void *data) ++{ ++ struct kbase_context *kctx = sfile->private; ++ ++ mutex_lock(&kctx->mem_profile_lock); ++ ++ seq_write(sfile, kctx->mem_profile_data, kctx->mem_profile_size); ++ ++ seq_putc(sfile, '\n'); ++ ++ mutex_unlock(&kctx->mem_profile_lock); ++ ++ return 0; +} + -+mali_bool mali_memory_have_dedicated_memory(void) ++/* ++ * File operations related to debugfs entry for mem_profile ++ */ ++static int kbasep_mem_profile_debugfs_open(struct inode *in, struct file *file) +{ -+ return mali_mem_block_gobal_allocator ? MALI_TRUE : MALI_FALSE; ++ return single_open(file, kbasep_mem_profile_seq_show, in->i_private); +} + -+u32 mali_mem_block_allocator_stat(void) ++static const struct file_operations kbasep_mem_profile_debugfs_fops = { ++ .open = kbasep_mem_profile_debugfs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++ ++int kbasep_mem_profile_debugfs_insert(struct kbase_context *kctx, char *data, ++ size_t size) +{ -+ mali_block_allocator *allocator = mali_mem_block_gobal_allocator; -+ MALI_DEBUG_ASSERT_POINTER(allocator); ++ int err = 0; + -+ return (allocator->total_num - atomic_read(&allocator->free_num)) * _MALI_OSK_MALI_PAGE_SIZE; ++ mutex_lock(&kctx->mem_profile_lock); ++ ++ dev_dbg(kctx->kbdev->dev, "initialised: %d", ++ kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED)); ++ ++ if (!kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED)) { ++ if (!debugfs_create_file("mem_profile", S_IRUGO, ++ kctx->kctx_dentry, kctx, ++ &kbasep_mem_profile_debugfs_fops)) { ++ err = -EAGAIN; ++ } else { ++ kbase_ctx_flag_set(kctx, ++ KCTX_MEM_PROFILE_INITIALIZED); ++ } ++ } ++ ++ if (kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED)) { ++ kfree(kctx->mem_profile_data); ++ kctx->mem_profile_data = data; ++ kctx->mem_profile_size = size; ++ } else { ++ kfree(data); ++ } ++ ++ dev_dbg(kctx->kbdev->dev, "returning: %d, initialised: %d", ++ err, kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED)); ++ ++ mutex_unlock(&kctx->mem_profile_lock); ++ ++ return err; +} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h ++ ++void kbasep_mem_profile_debugfs_remove(struct kbase_context *kctx) ++{ ++ mutex_lock(&kctx->mem_profile_lock); ++ ++ dev_dbg(kctx->kbdev->dev, "initialised: %d", ++ kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED)); ++ ++ kfree(kctx->mem_profile_data); ++ kctx->mem_profile_data = NULL; ++ kctx->mem_profile_size = 0; ++ ++ mutex_unlock(&kctx->mem_profile_lock); ++} ++ ++#else /* CONFIG_DEBUG_FS */ ++ ++int kbasep_mem_profile_debugfs_insert(struct kbase_context *kctx, char *data, ++ size_t size) ++{ ++ kfree(data); ++ return 0; ++} ++#endif /* CONFIG_DEBUG_FS */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h new file mode 100755 -index 000000000000..70fd9ec25f50 +index 000000000..a1dc2e0b1 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h -@@ -0,0 +1,58 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h +@@ -0,0 +1,59 @@ +/* -+ * Copyright (C) 2010, 2013, 2015-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef __MALI_BLOCK_ALLOCATOR_H__ -+#define __MALI_BLOCK_ALLOCATOR_H__ + -+#include "mali_session.h" -+#include "mali_memory.h" -+#include + -+#include "mali_memory_types.h" + -+#define MALI_BLOCK_SIZE (PAGE_SIZE) /* 4 kB, manage BLOCK memory as page size */ -+#define MALI_BLOCK_REF_MASK (0xFFF) -+#define MALI_BLOCK_MAX_REF_COUNT (0xFFF) + ++/** ++ * @file mali_kbase_mem_profile_debugfs.h ++ * Header file for mem profiles entries in debugfs ++ * ++ */ + ++#ifndef _KBASE_MEM_PROFILE_DEBUGFS_H ++#define _KBASE_MEM_PROFILE_DEBUGFS_H + -+typedef struct mali_block_allocator { -+ /* -+ * In free list, each node's ref_count is 0, -+ * ref_count added when allocated or referenced in COW -+ */ -+ mali_block_item *items; /* information for each block item*/ -+ struct list_head free; /*free list of mali_memory_node*/ -+ spinlock_t sp_lock; /*lock for reference count & free list opertion*/ -+ u32 total_num; /* Number of total pages*/ -+ atomic_t free_num; /*number of free pages*/ -+} mali_block_allocator; ++#include ++#include + -+unsigned long _mali_blk_item_get_phy_addr(mali_block_item *item); -+unsigned long _mali_blk_item_get_pfn(mali_block_item *item); -+u32 mali_mem_block_get_ref_count(mali_page_node *node); -+u32 mali_mem_block_add_ref(mali_page_node *node); -+u32 mali_mem_block_dec_ref(mali_page_node *node); -+u32 mali_mem_block_release(mali_mem_backend *mem_bkend); -+int mali_mem_block_alloc(mali_mem_block_mem *block_mem, u32 size); -+int mali_mem_block_mali_map(mali_mem_block_mem *block_mem, struct mali_session_data *session, u32 vaddr, u32 props); -+void mali_mem_block_mali_unmap(mali_mem_allocation *alloc); ++/** ++ * @brief Remove entry from Mali memory profile debugfs ++ */ ++void kbasep_mem_profile_debugfs_remove(struct kbase_context *kctx); + -+int mali_mem_block_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma); -+_mali_osk_errcode_t mali_memory_core_resource_dedicated_memory(u32 start, u32 size); -+mali_bool mali_memory_have_dedicated_memory(void); -+u32 mali_mem_block_free(mali_mem_block_mem *block_mem); -+u32 mali_mem_block_free_list(struct list_head *list); -+void mali_mem_block_free_node(struct mali_page_node *node); -+void mali_mem_block_allocator_destroy(void); -+_mali_osk_errcode_t mali_mem_block_unref_node(struct mali_page_node *node); -+u32 mali_mem_block_allocator_stat(void); ++/** ++ * @brief Insert @p data to the debugfs file so it can be read by userspace ++ * ++ * The function takes ownership of @p data and frees it later when new data ++ * is inserted. ++ * ++ * If the debugfs entry corresponding to the @p kctx doesn't exist, ++ * an attempt will be made to create it. ++ * ++ * @param kctx The context whose debugfs file @p data should be inserted to ++ * @param data A NULL-terminated string to be inserted to the debugfs file, ++ * without the trailing new line character ++ * @param size The length of the @p data string ++ * @return 0 if @p data inserted correctly ++ * -EAGAIN in case of error ++ * @post @ref mem_profile_initialized will be set to @c true ++ * the first time this function succeeds. ++ */ ++int kbasep_mem_profile_debugfs_insert(struct kbase_context *kctx, char *data, ++ size_t size); + -+#endif /* __MALI_BLOCK_ALLOCATOR_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c ++#endif /*_KBASE_MEM_PROFILE_DEBUGFS_H*/ ++ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h new file mode 100755 -index 000000000000..0bdf90b167d6 +index 000000000..82f070297 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c -@@ -0,0 +1,776 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#ifdef CONFIG_ARM -+#include -+#endif -+#include -+ -+#include "mali_memory.h" -+#include "mali_kernel_common.h" -+#include "mali_uk_types.h" -+#include "mali_osk.h" -+#include "mali_kernel_linux.h" -+#include "mali_memory_cow.h" -+#include "mali_memory_block_alloc.h" -+#include "mali_memory_swap_alloc.h" -+ -+/** -+* allocate pages for COW backend and flush cache -+*/ -+static struct page *mali_mem_cow_alloc_page(void) -+ -+{ -+ mali_mem_os_mem os_mem; -+ struct mali_page_node *node; -+ struct page *new_page; -+ -+ int ret = 0; -+ /* allocate pages from os mem */ -+ ret = mali_mem_os_alloc_pages(&os_mem, _MALI_OSK_MALI_PAGE_SIZE); -+ -+ if (ret) { -+ return NULL; -+ } -+ -+ MALI_DEBUG_ASSERT(1 == os_mem.count); -+ -+ node = _MALI_OSK_CONTAINER_OF(os_mem.pages.next, struct mali_page_node, list); -+ new_page = node->page; -+ node->page = NULL; -+ list_del(&node->list); -+ kfree(node); -+ -+ return new_page; -+} -+ -+ -+static struct list_head *_mali_memory_cow_get_node_list(mali_mem_backend *target_bk, -+ u32 target_offset, -+ u32 target_size) -+{ -+ MALI_DEBUG_ASSERT(MALI_MEM_OS == target_bk->type || MALI_MEM_COW == target_bk->type || -+ MALI_MEM_BLOCK == target_bk->type || MALI_MEM_SWAP == target_bk->type); -+ -+ if (MALI_MEM_OS == target_bk->type) { -+ MALI_DEBUG_ASSERT(&target_bk->os_mem); -+ MALI_DEBUG_ASSERT(((target_size + target_offset) / _MALI_OSK_MALI_PAGE_SIZE) <= target_bk->os_mem.count); -+ return &target_bk->os_mem.pages; -+ } else if (MALI_MEM_COW == target_bk->type) { -+ MALI_DEBUG_ASSERT(&target_bk->cow_mem); -+ MALI_DEBUG_ASSERT(((target_size + target_offset) / _MALI_OSK_MALI_PAGE_SIZE) <= target_bk->cow_mem.count); -+ return &target_bk->cow_mem.pages; -+ } else if (MALI_MEM_BLOCK == target_bk->type) { -+ MALI_DEBUG_ASSERT(&target_bk->block_mem); -+ MALI_DEBUG_ASSERT(((target_size + target_offset) / _MALI_OSK_MALI_PAGE_SIZE) <= target_bk->block_mem.count); -+ return &target_bk->block_mem.pfns; -+ } else if (MALI_MEM_SWAP == target_bk->type) { -+ MALI_DEBUG_ASSERT(&target_bk->swap_mem); -+ MALI_DEBUG_ASSERT(((target_size + target_offset) / _MALI_OSK_MALI_PAGE_SIZE) <= target_bk->swap_mem.count); -+ return &target_bk->swap_mem.pages; -+ } -+ -+ return NULL; -+} -+ -+/** -+* Do COW for os memory - support do COW for memory from bank memory -+* The range_start/size can be zero, which means it will call cow_modify_range -+* latter. -+* This function allocate new pages for COW backend from os mem for a modified range -+* It will keep the page which not in the modified range and Add ref to it -+* -+* @target_bk - target allocation's backend(the allocation need to do COW) -+* @target_offset - the offset in target allocation to do COW(for support COW a memory allocated from memory_bank, 4K align) -+* @target_size - size of target allocation to do COW (for support memory bank) -+* @backend -COW backend -+* @range_start - offset of modified range (4K align) -+* @range_size - size of modified range -+*/ -+_mali_osk_errcode_t mali_memory_cow_os_memory(mali_mem_backend *target_bk, -+ u32 target_offset, -+ u32 target_size, -+ mali_mem_backend *backend, -+ u32 range_start, -+ u32 range_size) -+{ -+ mali_mem_cow *cow = &backend->cow_mem; -+ struct mali_page_node *m_page, *m_tmp, *page_node; -+ int target_page = 0; -+ struct page *new_page; -+ struct list_head *pages = NULL; -+ -+ pages = _mali_memory_cow_get_node_list(target_bk, target_offset, target_size); -+ -+ if (NULL == pages) { -+ MALI_DEBUG_PRINT_ERROR(("No memory page need to cow ! \n")); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ -+ MALI_DEBUG_ASSERT(0 == cow->count); -+ -+ INIT_LIST_HEAD(&cow->pages); -+ mutex_lock(&target_bk->mutex); -+ list_for_each_entry_safe(m_page, m_tmp, pages, list) { -+ /* add page from (target_offset,target_offset+size) to cow backend */ -+ if ((target_page >= target_offset / _MALI_OSK_MALI_PAGE_SIZE) && -+ (target_page < ((target_size + target_offset) / _MALI_OSK_MALI_PAGE_SIZE))) { -+ -+ /* allocate a new page node, alway use OS memory for COW */ -+ page_node = _mali_page_node_allocate(MALI_PAGE_NODE_OS); -+ -+ if (NULL == page_node) { -+ mutex_unlock(&target_bk->mutex); -+ goto error; -+ } -+ -+ INIT_LIST_HEAD(&page_node->list); -+ -+ /* check if in the modified range*/ -+ if ((cow->count >= range_start / _MALI_OSK_MALI_PAGE_SIZE) && -+ (cow->count < (range_start + range_size) / _MALI_OSK_MALI_PAGE_SIZE)) { -+ /* need to allocate a new page */ -+ /* To simplify the case, All COW memory is allocated from os memory ?*/ -+ new_page = mali_mem_cow_alloc_page(); -+ -+ if (NULL == new_page) { -+ kfree(page_node); -+ mutex_unlock(&target_bk->mutex); -+ goto error; -+ } -+ -+ _mali_page_node_add_page(page_node, new_page); -+ } else { -+ /*Add Block memory case*/ -+ if (m_page->type != MALI_PAGE_NODE_BLOCK) { -+ _mali_page_node_add_page(page_node, m_page->page); -+ } else { -+ page_node->type = MALI_PAGE_NODE_BLOCK; -+ _mali_page_node_add_block_item(page_node, m_page->blk_it); -+ } -+ -+ /* add ref to this page */ -+ _mali_page_node_ref(m_page); -+ } -+ -+ /* add it to COW backend page list */ -+ list_add_tail(&page_node->list, &cow->pages); -+ cow->count++; -+ } -+ target_page++; -+ } -+ mutex_unlock(&target_bk->mutex); -+ return _MALI_OSK_ERR_OK; -+error: -+ mali_mem_cow_release(backend, MALI_FALSE); -+ return _MALI_OSK_ERR_FAULT; -+} -+ -+_mali_osk_errcode_t mali_memory_cow_swap_memory(mali_mem_backend *target_bk, -+ u32 target_offset, -+ u32 target_size, -+ mali_mem_backend *backend, -+ u32 range_start, -+ u32 range_size) -+{ -+ mali_mem_cow *cow = &backend->cow_mem; -+ struct mali_page_node *m_page, *m_tmp, *page_node; -+ int target_page = 0; -+ struct mali_swap_item *swap_item; -+ struct list_head *pages = NULL; -+ -+ pages = _mali_memory_cow_get_node_list(target_bk, target_offset, target_size); -+ if (NULL == pages) { -+ MALI_DEBUG_PRINT_ERROR(("No swap memory page need to cow ! \n")); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ -+ MALI_DEBUG_ASSERT(0 == cow->count); -+ -+ INIT_LIST_HEAD(&cow->pages); -+ mutex_lock(&target_bk->mutex); -+ -+ backend->flags |= MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN; -+ -+ list_for_each_entry_safe(m_page, m_tmp, pages, list) { -+ /* add page from (target_offset,target_offset+size) to cow backend */ -+ if ((target_page >= target_offset / _MALI_OSK_MALI_PAGE_SIZE) && -+ (target_page < ((target_size + target_offset) / _MALI_OSK_MALI_PAGE_SIZE))) { -+ -+ /* allocate a new page node, use swap memory for COW memory swap cowed flag. */ -+ page_node = _mali_page_node_allocate(MALI_PAGE_NODE_SWAP); -+ -+ if (NULL == page_node) { -+ mutex_unlock(&target_bk->mutex); -+ goto error; -+ } -+ -+ /* check if in the modified range*/ -+ if ((cow->count >= range_start / _MALI_OSK_MALI_PAGE_SIZE) && -+ (cow->count < (range_start + range_size) / _MALI_OSK_MALI_PAGE_SIZE)) { -+ /* need to allocate a new page */ -+ /* To simplify the case, All COW memory is allocated from os memory ?*/ -+ swap_item = mali_mem_swap_alloc_swap_item(); -+ -+ if (NULL == swap_item) { -+ kfree(page_node); -+ mutex_unlock(&target_bk->mutex); -+ goto error; -+ } -+ -+ swap_item->idx = mali_mem_swap_idx_alloc(); -+ -+ if (_MALI_OSK_BITMAP_INVALIDATE_INDEX == swap_item->idx) { -+ MALI_DEBUG_PRINT(1, ("Failed to allocate swap index in swap CoW.\n")); -+ kfree(page_node); -+ kfree(swap_item); -+ mutex_unlock(&target_bk->mutex); -+ goto error; -+ } -+ -+ _mali_page_node_add_swap_item(page_node, swap_item); -+ } else { -+ _mali_page_node_add_swap_item(page_node, m_page->swap_it); -+ -+ /* add ref to this page */ -+ _mali_page_node_ref(m_page); -+ } -+ -+ list_add_tail(&page_node->list, &cow->pages); -+ cow->count++; -+ } -+ target_page++; -+ } -+ mutex_unlock(&target_bk->mutex); -+ -+ return _MALI_OSK_ERR_OK; -+error: -+ mali_mem_swap_release(backend, MALI_FALSE); -+ return _MALI_OSK_ERR_FAULT; -+ -+} -+ -+ -+_mali_osk_errcode_t _mali_mem_put_page_node(mali_page_node *node) -+{ -+ if (node->type == MALI_PAGE_NODE_OS) { -+ return mali_mem_os_put_page(node->page); -+ } else if (node->type == MALI_PAGE_NODE_BLOCK) { -+ return mali_mem_block_unref_node(node); -+ } else if (node->type == MALI_PAGE_NODE_SWAP) { -+ return _mali_mem_swap_put_page_node(node); -+ } else -+ MALI_DEBUG_ASSERT(0); -+ return _MALI_OSK_ERR_FAULT; -+} -+ -+ -+/** -+* Modify a range of a exist COW backend -+* @backend -COW backend -+* @range_start - offset of modified range (4K align) -+* @range_size - size of modified range(in byte) -+*/ -+_mali_osk_errcode_t mali_memory_cow_modify_range(mali_mem_backend *backend, -+ u32 range_start, -+ u32 range_size) -+{ -+ mali_mem_allocation *alloc = NULL; -+ struct mali_session_data *session; -+ mali_mem_cow *cow = &backend->cow_mem; -+ struct mali_page_node *m_page, *m_tmp; -+ LIST_HEAD(pages); -+ struct page *new_page; -+ u32 count = 0; -+ s32 change_pages_nr = 0; -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_OK; -+ -+ if (range_start % _MALI_OSK_MALI_PAGE_SIZE) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); -+ if (range_size % _MALI_OSK_MALI_PAGE_SIZE) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); -+ -+ alloc = backend->mali_allocation; -+ MALI_DEBUG_ASSERT_POINTER(alloc); -+ -+ session = alloc->session; -+ MALI_DEBUG_ASSERT_POINTER(session); -+ -+ MALI_DEBUG_ASSERT(MALI_MEM_COW == backend->type); -+ MALI_DEBUG_ASSERT(((range_start + range_size) / _MALI_OSK_MALI_PAGE_SIZE) <= cow->count); -+ -+ mutex_lock(&backend->mutex); -+ -+ /* free pages*/ -+ list_for_each_entry_safe(m_page, m_tmp, &cow->pages, list) { -+ -+ /* check if in the modified range*/ -+ if ((count >= range_start / _MALI_OSK_MALI_PAGE_SIZE) && -+ (count < (range_start + range_size) / _MALI_OSK_MALI_PAGE_SIZE)) { -+ if (MALI_PAGE_NODE_SWAP != m_page->type) { -+ new_page = mali_mem_cow_alloc_page(); -+ -+ if (NULL == new_page) { -+ goto error; -+ } -+ if (1 != _mali_page_node_get_ref_count(m_page)) -+ change_pages_nr++; -+ /* unref old page*/ -+ _mali_osk_mutex_wait(session->cow_lock); -+ if (_mali_mem_put_page_node(m_page)) { -+ __free_page(new_page); -+ _mali_osk_mutex_signal(session->cow_lock); -+ goto error; -+ } -+ _mali_osk_mutex_signal(session->cow_lock); -+ /* add new page*/ -+ /* always use OS for COW*/ -+ m_page->type = MALI_PAGE_NODE_OS; -+ _mali_page_node_add_page(m_page, new_page); -+ } else { -+ struct mali_swap_item *swap_item; -+ -+ swap_item = mali_mem_swap_alloc_swap_item(); -+ -+ if (NULL == swap_item) { -+ goto error; -+ } -+ -+ swap_item->idx = mali_mem_swap_idx_alloc(); -+ -+ if (_MALI_OSK_BITMAP_INVALIDATE_INDEX == swap_item->idx) { -+ MALI_DEBUG_PRINT(1, ("Failed to allocate swap index in swap CoW modify range.\n")); -+ kfree(swap_item); -+ goto error; -+ } -+ -+ if (1 != _mali_page_node_get_ref_count(m_page)) { -+ change_pages_nr++; -+ } -+ -+ if (_mali_mem_put_page_node(m_page)) { -+ mali_mem_swap_free_swap_item(swap_item); -+ goto error; -+ } -+ -+ _mali_page_node_add_swap_item(m_page, swap_item); -+ } -+ } -+ count++; -+ } -+ cow->change_pages_nr = change_pages_nr; -+ -+ MALI_DEBUG_ASSERT(MALI_MEM_COW == alloc->type); -+ -+ /* ZAP cpu mapping(modified range), and do cpu mapping here if need */ -+ if (NULL != alloc->cpu_mapping.vma) { -+ MALI_DEBUG_ASSERT(0 != alloc->backend_handle); -+ MALI_DEBUG_ASSERT(NULL != alloc->cpu_mapping.vma); -+ MALI_DEBUG_ASSERT(alloc->cpu_mapping.vma->vm_end - alloc->cpu_mapping.vma->vm_start >= range_size); -+ -+ if (MALI_MEM_BACKEND_FLAG_SWAP_COWED != (backend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED)) { -+ zap_vma_ptes(alloc->cpu_mapping.vma, alloc->cpu_mapping.vma->vm_start + range_start, range_size); -+ -+ ret = mali_mem_cow_cpu_map_pages_locked(backend, alloc->cpu_mapping.vma, alloc->cpu_mapping.vma->vm_start + range_start, range_size / _MALI_OSK_MALI_PAGE_SIZE); -+ -+ if (unlikely(ret != _MALI_OSK_ERR_OK)) { -+ MALI_DEBUG_PRINT(2, ("mali_memory_cow_modify_range: cpu mapping failed !\n")); -+ ret = _MALI_OSK_ERR_FAULT; -+ } -+ } else { -+ /* used to trigger page fault for swappable cowed memory. */ -+ alloc->cpu_mapping.vma->vm_flags |= VM_PFNMAP; -+ alloc->cpu_mapping.vma->vm_flags |= VM_MIXEDMAP; -+ -+ zap_vma_ptes(alloc->cpu_mapping.vma, alloc->cpu_mapping.vma->vm_start + range_start, range_size); -+ /* delete this flag to let swappble is ummapped regard to stauct page not page frame. */ -+ alloc->cpu_mapping.vma->vm_flags &= ~VM_PFNMAP; -+ alloc->cpu_mapping.vma->vm_flags &= ~VM_MIXEDMAP; -+ } -+ } -+ -+error: -+ mutex_unlock(&backend->mutex); -+ return ret; -+ -+} -+ -+ -+/** -+* Allocate pages for COW backend -+* @alloc -allocation for COW allocation -+* @target_bk - target allocation's backend(the allocation need to do COW) -+* @target_offset - the offset in target allocation to do COW(for support COW a memory allocated from memory_bank, 4K align) -+* @target_size - size of target allocation to do COW (for support memory bank)(in byte) -+* @backend -COW backend -+* @range_start - offset of modified range (4K align) -+* @range_size - size of modified range(in byte) -+*/ -+_mali_osk_errcode_t mali_memory_do_cow(mali_mem_backend *target_bk, -+ u32 target_offset, -+ u32 target_size, -+ mali_mem_backend *backend, -+ u32 range_start, -+ u32 range_size) -+{ -+ struct mali_session_data *session = backend->mali_allocation->session; -+ -+ MALI_CHECK_NON_NULL(session, _MALI_OSK_ERR_INVALID_ARGS); -+ -+ /* size & offset must be a multiple of the system page size */ -+ if (target_size % _MALI_OSK_MALI_PAGE_SIZE) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); -+ if (range_size % _MALI_OSK_MALI_PAGE_SIZE) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); -+ if (target_offset % _MALI_OSK_MALI_PAGE_SIZE) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); -+ if (range_start % _MALI_OSK_MALI_PAGE_SIZE) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); -+ -+ /* check backend type */ -+ MALI_DEBUG_ASSERT(MALI_MEM_COW == backend->type); -+ -+ switch (target_bk->type) { -+ case MALI_MEM_OS: -+ case MALI_MEM_BLOCK: -+ return mali_memory_cow_os_memory(target_bk, target_offset, target_size, backend, range_start, range_size); -+ break; -+ case MALI_MEM_COW: -+ if (backend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED) { -+ return mali_memory_cow_swap_memory(target_bk, target_offset, target_size, backend, range_start, range_size); -+ } else { -+ return mali_memory_cow_os_memory(target_bk, target_offset, target_size, backend, range_start, range_size); -+ } -+ break; -+ case MALI_MEM_SWAP: -+ return mali_memory_cow_swap_memory(target_bk, target_offset, target_size, backend, range_start, range_size); -+ break; -+ case MALI_MEM_EXTERNAL: -+ /*NOT support yet*/ -+ MALI_DEBUG_PRINT_ERROR(("External physical memory not supported ! \n")); -+ return _MALI_OSK_ERR_UNSUPPORTED; -+ break; -+ case MALI_MEM_DMA_BUF: -+ /*NOT support yet*/ -+ MALI_DEBUG_PRINT_ERROR(("DMA buffer not supported ! \n")); -+ return _MALI_OSK_ERR_UNSUPPORTED; -+ break; -+ case MALI_MEM_UMP: -+ /*NOT support yet*/ -+ MALI_DEBUG_PRINT_ERROR(("UMP buffer not supported ! \n")); -+ return _MALI_OSK_ERR_UNSUPPORTED; -+ break; -+ default: -+ /*Not support yet*/ -+ MALI_DEBUG_PRINT_ERROR(("Invalid memory type not supported ! \n")); -+ return _MALI_OSK_ERR_UNSUPPORTED; -+ break; -+ } -+ return _MALI_OSK_ERR_OK; -+} -+ -+ -+/** -+* Map COW backend memory to mali -+* Support OS/BLOCK for mali_page_node -+*/ -+int mali_mem_cow_mali_map(mali_mem_backend *mem_bkend, u32 range_start, u32 range_size) -+{ -+ mali_mem_allocation *cow_alloc; -+ struct mali_page_node *m_page; -+ struct mali_session_data *session; -+ struct mali_page_directory *pagedir; -+ u32 virt, start; -+ -+ cow_alloc = mem_bkend->mali_allocation; -+ virt = cow_alloc->mali_vma_node.vm_node.start; -+ start = virt; -+ -+ MALI_DEBUG_ASSERT_POINTER(mem_bkend); -+ MALI_DEBUG_ASSERT(MALI_MEM_COW == mem_bkend->type); -+ MALI_DEBUG_ASSERT_POINTER(cow_alloc); -+ -+ session = cow_alloc->session; -+ pagedir = session->page_directory; -+ MALI_CHECK_NON_NULL(session, _MALI_OSK_ERR_INVALID_ARGS); -+ list_for_each_entry(m_page, &mem_bkend->cow_mem.pages, list) { -+ if ((virt - start >= range_start) && (virt - start < range_start + range_size)) { -+ dma_addr_t phys = _mali_page_node_get_dma_addr(m_page); -+#if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT) -+ MALI_DEBUG_ASSERT(0 == (phys >> 32)); -+#endif -+ mali_mmu_pagedir_update(pagedir, virt, (mali_dma_addr)phys, -+ MALI_MMU_PAGE_SIZE, MALI_MMU_FLAGS_DEFAULT); -+ } -+ virt += MALI_MMU_PAGE_SIZE; -+ } -+ return 0; -+} -+ -+/** -+* Map COW backend to cpu -+* support OS/BLOCK memory -+*/ -+int mali_mem_cow_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma) -+{ -+ mali_mem_cow *cow = &mem_bkend->cow_mem; -+ struct mali_page_node *m_page; -+ int ret; -+ unsigned long addr = vma->vm_start; -+ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_COW); -+ -+ list_for_each_entry(m_page, &cow->pages, list) { -+ /* We should use vm_insert_page, but it does a dcache -+ * flush which makes it way slower than remap_pfn_range or vmf_insert_pfn. -+ ret = vm_insert_page(vma, addr, page); -+ */ -+ ret = vmf_insert_pfn(vma, addr, _mali_page_node_get_pfn(m_page)); -+ -+ if (unlikely(0 != ret)) { -+ return ret; -+ } -+ addr += _MALI_OSK_MALI_PAGE_SIZE; -+ } -+ -+ return 0; -+} -+ -+/** -+* Map some pages(COW backend) to CPU vma@vaddr -+*@ mem_bkend - COW backend -+*@ vma -+*@ vaddr -start CPU vaddr mapped to -+*@ num - max number of pages to map to CPU vaddr -+*/ -+_mali_osk_errcode_t mali_mem_cow_cpu_map_pages_locked(mali_mem_backend *mem_bkend, -+ struct vm_area_struct *vma, -+ unsigned long vaddr, -+ int num) -+{ -+ mali_mem_cow *cow = &mem_bkend->cow_mem; -+ struct mali_page_node *m_page; -+ int ret; -+ int offset; -+ int count ; -+ unsigned long vstart = vma->vm_start; -+ count = 0; -+ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_COW); -+ MALI_DEBUG_ASSERT(0 == vaddr % _MALI_OSK_MALI_PAGE_SIZE); -+ MALI_DEBUG_ASSERT(0 == vstart % _MALI_OSK_MALI_PAGE_SIZE); -+ offset = (vaddr - vstart) / _MALI_OSK_MALI_PAGE_SIZE; -+ -+ list_for_each_entry(m_page, &cow->pages, list) { -+ if ((count >= offset) && (count < offset + num)) { -+ ret = vmf_insert_pfn(vma, vaddr, _mali_page_node_get_pfn(m_page)); -+ -+ if (unlikely(0 != ret)) { -+ if (count == offset) { -+ return _MALI_OSK_ERR_FAULT; -+ } else { -+ /* ret is EBUSY when page isn't in modify range, but now it's OK*/ -+ return _MALI_OSK_ERR_OK; -+ } -+ } -+ vaddr += _MALI_OSK_MALI_PAGE_SIZE; -+ } -+ count++; -+ } -+ return _MALI_OSK_ERR_OK; -+} -+ -+/** -+* Release COW backend memory -+* free it directly(put_page--unref page), not put into pool -+*/ -+u32 mali_mem_cow_release(mali_mem_backend *mem_bkend, mali_bool is_mali_mapped) -+{ -+ mali_mem_allocation *alloc; -+ struct mali_session_data *session; -+ u32 free_pages_nr = 0; -+ MALI_DEBUG_ASSERT_POINTER(mem_bkend); -+ MALI_DEBUG_ASSERT(MALI_MEM_COW == mem_bkend->type); -+ alloc = mem_bkend->mali_allocation; -+ MALI_DEBUG_ASSERT_POINTER(alloc); -+ -+ session = alloc->session; -+ MALI_DEBUG_ASSERT_POINTER(session); -+ -+ if (MALI_MEM_BACKEND_FLAG_SWAP_COWED != (MALI_MEM_BACKEND_FLAG_SWAP_COWED & mem_bkend->flags)) { -+ /* Unmap the memory from the mali virtual address space. */ -+ if (MALI_TRUE == is_mali_mapped) -+ mali_mem_os_mali_unmap(alloc); -+ /* free cow backend list*/ -+ _mali_osk_mutex_wait(session->cow_lock); -+ free_pages_nr = mali_mem_os_free(&mem_bkend->cow_mem.pages, mem_bkend->cow_mem.count, MALI_TRUE); -+ _mali_osk_mutex_signal(session->cow_lock); -+ -+ free_pages_nr += mali_mem_block_free_list(&mem_bkend->cow_mem.pages); -+ -+ MALI_DEBUG_ASSERT(list_empty(&mem_bkend->cow_mem.pages)); -+ } else { -+ free_pages_nr = mali_mem_swap_release(mem_bkend, is_mali_mapped); -+ } -+ -+ -+ MALI_DEBUG_PRINT(4, ("COW Mem free : allocated size = 0x%x, free size = 0x%x\n", mem_bkend->cow_mem.count * _MALI_OSK_MALI_PAGE_SIZE, -+ free_pages_nr * _MALI_OSK_MALI_PAGE_SIZE)); -+ -+ mem_bkend->cow_mem.count = 0; -+ return free_pages_nr; -+} -+ -+ -+/* Dst node could os node or swap node. */ -+void _mali_mem_cow_copy_page(mali_page_node *src_node, mali_page_node *dst_node) -+{ -+ void *dst, *src; -+ struct page *dst_page; -+ dma_addr_t dma_addr; -+ -+ MALI_DEBUG_ASSERT(src_node != NULL); -+ MALI_DEBUG_ASSERT(dst_node != NULL); -+ MALI_DEBUG_ASSERT(dst_node->type == MALI_PAGE_NODE_OS -+ || dst_node->type == MALI_PAGE_NODE_SWAP); -+ -+ if (dst_node->type == MALI_PAGE_NODE_OS) { -+ dst_page = dst_node->page; -+ } else { -+ dst_page = dst_node->swap_it->page; -+ } -+ -+ dma_unmap_page(&mali_platform_device->dev, _mali_page_node_get_dma_addr(dst_node), -+ _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); -+ -+ /* map it , and copy the content*/ -+ dst = kmap_atomic(dst_page); -+ -+ if (src_node->type == MALI_PAGE_NODE_OS || -+ src_node->type == MALI_PAGE_NODE_SWAP) { -+ struct page *src_page; -+ -+ if (src_node->type == MALI_PAGE_NODE_OS) { -+ src_page = src_node->page; -+ } else { -+ src_page = src_node->swap_it->page; -+ } -+ -+ /* Clear and invaliate cache */ -+ /* In ARM architecture, speculative read may pull stale data into L1 cache -+ * for kernel linear mapping page table. DMA_BIDIRECTIONAL could -+ * invalidate the L1 cache so that following read get the latest data -+ */ -+ dma_unmap_page(&mali_platform_device->dev, _mali_page_node_get_dma_addr(src_node), -+ _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); -+ -+ src = kmap_atomic(src_page); -+ memcpy(dst, src , _MALI_OSK_MALI_PAGE_SIZE); -+ kunmap_atomic(src); -+ dma_addr = dma_map_page(&mali_platform_device->dev, src_page, -+ 0, _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); -+ -+ if (src_node->type == MALI_PAGE_NODE_SWAP) { -+ src_node->swap_it->dma_addr = dma_addr; -+ } -+ } else if (src_node->type == MALI_PAGE_NODE_BLOCK) { -+ /* -+ * use ioremap to map src for BLOCK memory -+ */ -+ src = ioremap(_mali_page_node_get_dma_addr(src_node), _MALI_OSK_MALI_PAGE_SIZE); -+ memcpy(dst, src , _MALI_OSK_MALI_PAGE_SIZE); -+ iounmap(src); -+ } -+ kunmap_atomic(dst); -+ dma_addr = dma_map_page(&mali_platform_device->dev, dst_page, -+ 0, _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); -+ -+ if (dst_node->type == MALI_PAGE_NODE_SWAP) { -+ dst_node->swap_it->dma_addr = dma_addr; -+ } -+} -+ -+ -+/* -+* allocate page on demand when CPU access it, -+* THis used in page fault handler -+*/ -+_mali_osk_errcode_t mali_mem_cow_allocate_on_demand(mali_mem_backend *mem_bkend, u32 offset_page) -+{ -+ struct page *new_page = NULL; -+ struct mali_page_node *new_node = NULL; -+ int i = 0; -+ struct mali_page_node *m_page, *found_node = NULL; -+ struct mali_session_data *session = NULL; -+ mali_mem_cow *cow = &mem_bkend->cow_mem; -+ MALI_DEBUG_ASSERT(MALI_MEM_COW == mem_bkend->type); -+ MALI_DEBUG_ASSERT(offset_page < mem_bkend->size / _MALI_OSK_MALI_PAGE_SIZE); -+ MALI_DEBUG_PRINT(4, ("mali_mem_cow_allocate_on_demand !, offset_page =0x%x\n", offset_page)); -+ -+ /* allocate new page here */ -+ new_page = mali_mem_cow_alloc_page(); -+ if (!new_page) -+ return _MALI_OSK_ERR_NOMEM; -+ -+ new_node = _mali_page_node_allocate(MALI_PAGE_NODE_OS); -+ if (!new_node) { -+ __free_page(new_page); -+ return _MALI_OSK_ERR_NOMEM; -+ } -+ -+ /* find the page in backend*/ -+ list_for_each_entry(m_page, &cow->pages, list) { -+ if (i == offset_page) { -+ found_node = m_page; -+ break; -+ } -+ i++; -+ } -+ MALI_DEBUG_ASSERT(found_node); -+ if (NULL == found_node) { -+ __free_page(new_page); -+ kfree(new_node); -+ return _MALI_OSK_ERR_ITEM_NOT_FOUND; -+ } -+ -+ _mali_page_node_add_page(new_node, new_page); -+ -+ /* Copy the src page's content to new page */ -+ _mali_mem_cow_copy_page(found_node, new_node); -+ -+ MALI_DEBUG_ASSERT_POINTER(mem_bkend->mali_allocation); -+ session = mem_bkend->mali_allocation->session; -+ MALI_DEBUG_ASSERT_POINTER(session); -+ if (1 != _mali_page_node_get_ref_count(found_node)) { -+ atomic_add(1, &session->mali_mem_allocated_pages); -+ if (atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE > session->max_mali_mem_allocated_size) { -+ session->max_mali_mem_allocated_size = atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE; -+ } -+ mem_bkend->cow_mem.change_pages_nr++; -+ } -+ -+ _mali_osk_mutex_wait(session->cow_lock); -+ if (_mali_mem_put_page_node(found_node)) { -+ __free_page(new_page); -+ kfree(new_node); -+ _mali_osk_mutex_signal(session->cow_lock); -+ return _MALI_OSK_ERR_NOMEM; -+ } -+ _mali_osk_mutex_signal(session->cow_lock); -+ -+ list_replace(&found_node->list, &new_node->list); -+ -+ kfree(found_node); -+ -+ /* map to GPU side*/ -+ _mali_osk_mutex_wait(session->memory_lock); -+ mali_mem_cow_mali_map(mem_bkend, offset_page * _MALI_OSK_MALI_PAGE_SIZE, _MALI_OSK_MALI_PAGE_SIZE); -+ _mali_osk_mutex_signal(session->memory_lock); -+ return _MALI_OSK_ERR_OK; -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h -new file mode 100755 -index 000000000000..5f83a37fc8f8 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h -@@ -0,0 +1,48 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef __MALI_MEMORY_COW_H__ -+#define __MALI_MEMORY_COW_H__ -+ -+#include "mali_osk.h" -+#include "mali_session.h" -+#include "mali_memory_types.h" -+ -+int mali_mem_cow_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma); -+_mali_osk_errcode_t mali_mem_cow_cpu_map_pages_locked(mali_mem_backend *mem_bkend, -+ struct vm_area_struct *vma, -+ unsigned long vaddr, -+ int num); -+ -+_mali_osk_errcode_t mali_memory_do_cow(mali_mem_backend *target_bk, -+ u32 target_offset, -+ u32 target_size, -+ mali_mem_backend *backend, -+ u32 range_start, -+ u32 range_size); -+ -+_mali_osk_errcode_t mali_memory_cow_modify_range(mali_mem_backend *backend, -+ u32 range_start, -+ u32 range_size); -+ -+_mali_osk_errcode_t mali_memory_cow_os_memory(mali_mem_backend *target_bk, -+ u32 target_offset, -+ u32 target_size, -+ mali_mem_backend *backend, -+ u32 range_start, -+ u32 range_size); -+ -+void _mali_mem_cow_copy_page(mali_page_node *src_node, mali_page_node *dst_node); -+ -+int mali_mem_cow_mali_map(mali_mem_backend *mem_bkend, u32 range_start, u32 range_size); -+u32 mali_mem_cow_release(mali_mem_backend *mem_bkend, mali_bool is_mali_mapped); -+_mali_osk_errcode_t mali_mem_cow_allocate_on_demand(mali_mem_backend *mem_bkend, u32 offset_page); -+#endif -+ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c -new file mode 100755 -index 000000000000..a9db577cb851 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c -@@ -0,0 +1,262 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#ifdef CONFIG_ARM -+#include -+#endif -+#include -+ -+#include "mali_memory.h" -+#include "mali_kernel_common.h" -+#include "mali_uk_types.h" -+#include "mali_osk.h" -+#include "mali_kernel_linux.h" -+#include "mali_memory_defer_bind.h" -+#include "mali_executor.h" -+#include "mali_osk.h" -+#include "mali_scheduler.h" -+#include "mali_gp_job.h" -+ -+mali_defer_bind_manager *mali_dmem_man = NULL; -+ -+static u32 mali_dmem_get_gp_varying_size(struct mali_gp_job *gp_job) -+{ -+ return gp_job->required_varying_memsize / _MALI_OSK_MALI_PAGE_SIZE; -+} -+ -+_mali_osk_errcode_t mali_mem_defer_bind_manager_init(void) -+{ -+ mali_dmem_man = _mali_osk_calloc(1, sizeof(struct mali_defer_bind_manager)); -+ if (!mali_dmem_man) -+ return _MALI_OSK_ERR_NOMEM; -+ -+ atomic_set(&mali_dmem_man->num_used_pages, 0); -+ atomic_set(&mali_dmem_man->num_dmem, 0); -+ -+ return _MALI_OSK_ERR_OK; -+} -+ -+ -+void mali_mem_defer_bind_manager_destory(void) -+{ -+ if (mali_dmem_man) { -+ MALI_DEBUG_ASSERT(0 == atomic_read(&mali_dmem_man->num_dmem)); -+ kfree(mali_dmem_man); -+ } -+ mali_dmem_man = NULL; -+} -+ -+ -+/*allocate pages from OS memory*/ -+_mali_osk_errcode_t mali_mem_defer_alloc_mem(u32 require, struct mali_session_data *session, mali_defer_mem_block *dblock) -+{ -+ int retval = 0; -+ u32 num_pages = require; -+ mali_mem_os_mem os_mem; -+ -+ retval = mali_mem_os_alloc_pages(&os_mem, num_pages * _MALI_OSK_MALI_PAGE_SIZE); -+ -+ /* add to free pages list */ -+ if (0 == retval) { -+ MALI_DEBUG_PRINT(4, ("mali_mem_defer_alloc_mem ,,*** pages allocate = 0x%x \n", num_pages)); -+ list_splice(&os_mem.pages, &dblock->free_pages); -+ atomic_add(os_mem.count, &dblock->num_free_pages); -+ atomic_add(os_mem.count, &session->mali_mem_allocated_pages); -+ if (atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE > session->max_mali_mem_allocated_size) { -+ session->max_mali_mem_allocated_size = atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE; -+ } -+ return _MALI_OSK_ERR_OK; -+ } else -+ return _MALI_OSK_ERR_FAULT; -+} -+ -+_mali_osk_errcode_t mali_mem_prepare_mem_for_job(struct mali_gp_job *next_gp_job, mali_defer_mem_block *dblock) -+{ -+ u32 require_page; -+ -+ if (!next_gp_job) -+ return _MALI_OSK_ERR_FAULT; -+ -+ require_page = mali_dmem_get_gp_varying_size(next_gp_job); -+ -+ MALI_DEBUG_PRINT(4, ("mali_mem_defer_prepare_mem_work, require alloc page 0x%x\n", -+ require_page)); -+ /* allocate more pages from OS */ -+ if (_MALI_OSK_ERR_OK != mali_mem_defer_alloc_mem(require_page, next_gp_job->session, dblock)) { -+ MALI_DEBUG_PRINT(1, ("ERROR##mali_mem_defer_prepare_mem_work, allocate page failed!!")); -+ return _MALI_OSK_ERR_NOMEM; -+ } -+ -+ next_gp_job->bind_flag = MALI_DEFER_BIND_MEMORY_PREPARED; -+ -+ return _MALI_OSK_ERR_OK; -+} -+ -+ -+/* do preparetion for allocation before defer bind */ -+_mali_osk_errcode_t mali_mem_defer_bind_allocation_prepare(mali_mem_allocation *alloc, struct list_head *list, u32 *required_varying_memsize) -+{ -+ mali_mem_backend *mem_bkend = NULL; -+ struct mali_backend_bind_list *bk_list = _mali_osk_calloc(1, sizeof(struct mali_backend_bind_list)); -+ if (NULL == bk_list) -+ return _MALI_OSK_ERR_FAULT; -+ -+ INIT_LIST_HEAD(&bk_list->node); -+ /* Get backend memory */ -+ mutex_lock(&mali_idr_mutex); -+ if (!(mem_bkend = idr_find(&mali_backend_idr, alloc->backend_handle))) { -+ MALI_DEBUG_PRINT(1, ("Can't find memory backend in defer bind!\n")); -+ mutex_unlock(&mali_idr_mutex); -+ _mali_osk_free(bk_list); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ mutex_unlock(&mali_idr_mutex); -+ -+ /* If the mem backend has already been bound, no need to bind again.*/ -+ if (mem_bkend->os_mem.count > 0) { -+ _mali_osk_free(bk_list); -+ return _MALI_OSK_ERR_OK; -+ } -+ -+ MALI_DEBUG_PRINT(4, ("bind_allocation_prepare:: allocation =%x vaddr=0x%x!\n", alloc, alloc->mali_vma_node.vm_node.start)); -+ -+ INIT_LIST_HEAD(&mem_bkend->os_mem.pages); -+ -+ bk_list->bkend = mem_bkend; -+ bk_list->vaddr = alloc->mali_vma_node.vm_node.start; -+ bk_list->session = alloc->session; -+ bk_list->page_num = mem_bkend->size / _MALI_OSK_MALI_PAGE_SIZE; -+ *required_varying_memsize += mem_bkend->size; -+ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_OS); -+ -+ /* add to job to do list */ -+ list_add(&bk_list->node, list); -+ -+ return _MALI_OSK_ERR_OK; -+} -+ -+ -+ -+/* bind phyiscal memory to allocation -+This function will be called in IRQ handler*/ -+static _mali_osk_errcode_t mali_mem_defer_bind_allocation(struct mali_backend_bind_list *bk_node, -+ struct list_head *pages) -+{ -+ struct mali_session_data *session = bk_node->session; -+ mali_mem_backend *mem_bkend = bk_node->bkend; -+ MALI_DEBUG_PRINT(4, ("mali_mem_defer_bind_allocation, bind bkend = %x page num=0x%x vaddr=%x session=%x\n", mem_bkend, bk_node->page_num, bk_node->vaddr, session)); -+ -+ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_OS); -+ list_splice(pages, &mem_bkend->os_mem.pages); -+ mem_bkend->os_mem.count = bk_node->page_num; -+ -+ if (mem_bkend->type == MALI_MEM_OS) { -+ mali_mem_os_mali_map(&mem_bkend->os_mem, session, bk_node->vaddr, 0, -+ mem_bkend->os_mem.count, MALI_MMU_FLAGS_DEFAULT); -+ } -+ smp_wmb(); -+ bk_node->flag = MALI_DEFER_BIND_MEMORY_BINDED; -+ mem_bkend->flags &= ~MALI_MEM_BACKEND_FLAG_NOT_BINDED; -+ mem_bkend->flags |= MALI_MEM_BACKEND_FLAG_BINDED; -+ return _MALI_OSK_ERR_OK; -+} -+ -+ -+static struct list_head *mali_mem_defer_get_free_page_list(u32 count, struct list_head *pages, mali_defer_mem_block *dblock) -+{ -+ int i = 0; -+ struct mali_page_node *m_page, *m_tmp; -+ -+ if (atomic_read(&dblock->num_free_pages) < count) { -+ return NULL; -+ } else { -+ list_for_each_entry_safe(m_page, m_tmp, &dblock->free_pages, list) { -+ if (i < count) { -+ list_move_tail(&m_page->list, pages); -+ } else { -+ break; -+ } -+ i++; -+ } -+ MALI_DEBUG_ASSERT(i == count); -+ atomic_sub(count, &dblock->num_free_pages); -+ return pages; -+ } -+} -+ -+ -+/* called in job start IOCTL to bind physical memory for each allocations -+@ bk_list backend list to do defer bind -+@ pages page list to do this bind -+@ count number of pages -+*/ -+_mali_osk_errcode_t mali_mem_defer_bind(struct mali_gp_job *gp, -+ struct mali_defer_mem_block *dmem_block) -+{ -+ struct mali_defer_mem *dmem = NULL; -+ struct mali_backend_bind_list *bkn, *bkn_tmp; -+ LIST_HEAD(pages); -+ -+ if (gp->required_varying_memsize != (atomic_read(&dmem_block->num_free_pages) * _MALI_OSK_MALI_PAGE_SIZE)) { -+ MALI_DEBUG_PRINT_ERROR(("#BIND: The memsize of varying buffer not match to the pagesize of the dmem_block!!## \n")); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ -+ MALI_DEBUG_PRINT(4, ("#BIND: GP job=%x## \n", gp)); -+ dmem = (mali_defer_mem *)_mali_osk_calloc(1, sizeof(struct mali_defer_mem)); -+ if (dmem) { -+ INIT_LIST_HEAD(&dmem->node); -+ gp->dmem = dmem; -+ } else { -+ return _MALI_OSK_ERR_NOMEM; -+ } -+ -+ atomic_add(1, &mali_dmem_man->num_dmem); -+ /* for each bk_list backend, do bind */ -+ list_for_each_entry_safe(bkn, bkn_tmp , &gp->vary_todo, node) { -+ INIT_LIST_HEAD(&pages); -+ if (likely(mali_mem_defer_get_free_page_list(bkn->page_num, &pages, dmem_block))) { -+ list_del(&bkn->node); -+ mali_mem_defer_bind_allocation(bkn, &pages); -+ _mali_osk_free(bkn); -+ } else { -+ /* not enough memory will not happen */ -+ MALI_DEBUG_PRINT_ERROR(("#BIND: NOT enough memory when binded !!## \n")); -+ _mali_osk_free(gp->dmem); -+ return _MALI_OSK_ERR_NOMEM; -+ } -+ } -+ -+ if (!list_empty(&gp->vary_todo)) { -+ MALI_DEBUG_PRINT_ERROR(("#BIND: The deferbind backend list isn't empty !!## \n")); -+ _mali_osk_free(gp->dmem); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ -+ dmem->flag = MALI_DEFER_BIND_MEMORY_BINDED; -+ -+ return _MALI_OSK_ERR_OK; -+} -+ -+void mali_mem_defer_dmem_free(struct mali_gp_job *gp) -+{ -+ if (gp->dmem) { -+ atomic_dec(&mali_dmem_man->num_dmem); -+ _mali_osk_free(gp->dmem); -+ } -+} -+ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h -new file mode 100755 -index 000000000000..defa08d52a46 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h -@@ -0,0 +1,64 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#ifndef __MALI_MEMORY_DEFER_BIND_H_ -+#define __MALI_MEMORY_DEFER_BIND_H_ -+ -+ -+#include "mali_osk.h" -+#include "mali_session.h" -+ -+#include -+#include -+#include -+#include -+#include -+ -+ -+#include "mali_memory_types.h" -+#include "mali_memory_os_alloc.h" -+#include "mali_uk_types.h" -+ -+struct mali_gp_job; -+ -+typedef struct mali_defer_mem { -+ struct list_head node; /*dlist node in bind manager */ -+ u32 flag; -+} mali_defer_mem; -+ -+ -+typedef struct mali_defer_mem_block { -+ struct list_head free_pages; /* page pool */ -+ atomic_t num_free_pages; -+} mali_defer_mem_block; -+ -+/* varying memory list need to bind */ -+typedef struct mali_backend_bind_list { -+ struct list_head node; -+ struct mali_mem_backend *bkend; -+ u32 vaddr; -+ u32 page_num; -+ struct mali_session_data *session; -+ u32 flag; -+} mali_backend_bind_lists; -+ -+ -+typedef struct mali_defer_bind_manager { -+ atomic_t num_used_pages; -+ atomic_t num_dmem; -+} mali_defer_bind_manager; -+ -+_mali_osk_errcode_t mali_mem_defer_bind_manager_init(void); -+void mali_mem_defer_bind_manager_destory(void); -+_mali_osk_errcode_t mali_mem_defer_bind(struct mali_gp_job *gp, struct mali_defer_mem_block *dmem_block); -+_mali_osk_errcode_t mali_mem_defer_bind_allocation_prepare(mali_mem_allocation *alloc, struct list_head *list, u32 *required_varying_memsize); -+_mali_osk_errcode_t mali_mem_prepare_mem_for_job(struct mali_gp_job *next_gp_job, mali_defer_mem_block *dblock); -+void mali_mem_defer_dmem_free(struct mali_gp_job *gp); -+ -+#endif -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c -new file mode 100755 -index 000000000000..1f4565127a6b ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c -@@ -0,0 +1,369 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h +@@ -0,0 +1,33 @@ +/* -+ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include /* file system operations */ -+#include /* user space access */ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "mali_ukk.h" -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_session.h" -+#include "mali_kernel_linux.h" + -+#include "mali_memory.h" -+#include "mali_memory_dma_buf.h" -+#include "mali_memory_virtual.h" -+#include "mali_pp_job.h" + -+/* -+ * Map DMA buf attachment \a mem into \a session at virtual address \a virt. ++/** ++ * @file mali_kbase_mem_profile_debugfs_buf_size.h ++ * Header file for the size of the buffer to accumulate the histogram report text in + */ -+static int mali_dma_buf_map(mali_mem_backend *mem_backend) -+{ -+ mali_mem_allocation *alloc; -+ struct mali_dma_buf_attachment *mem; -+ struct mali_session_data *session; -+ struct mali_page_directory *pagedir; -+ _mali_osk_errcode_t err; -+ struct scatterlist *sg; -+ u32 virt, flags; -+ int i; -+ -+ MALI_DEBUG_ASSERT_POINTER(mem_backend); + -+ alloc = mem_backend->mali_allocation; -+ MALI_DEBUG_ASSERT_POINTER(alloc); ++#ifndef _KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_ ++#define _KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_ + -+ mem = mem_backend->dma_buf.attachment; -+ MALI_DEBUG_ASSERT_POINTER(mem); ++/** ++ * The size of the buffer to accumulate the histogram report text in ++ * @see @ref CCTXP_HIST_BUF_SIZE_MAX_LENGTH_REPORT ++ */ ++#define KBASE_MEM_PROFILE_MAX_BUF_SIZE ((size_t) (64 + ((80 + (56 * 64)) * 15) + 56)) + -+ session = alloc->session; -+ MALI_DEBUG_ASSERT_POINTER(session); -+ MALI_DEBUG_ASSERT(mem->session == session); ++#endif /*_KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_*/ + -+ virt = alloc->mali_vma_node.vm_node.start; -+ flags = alloc->flags; +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu.c b/drivers/gpu/arm/midgard/mali_kbase_mmu.c +new file mode 100755 +index 000000000..26144850a +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_mmu.c +@@ -0,0 +1,2088 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ mali_session_memory_lock(session); -+ mem->map_ref++; + -+ MALI_DEBUG_PRINT(5, ("Mali DMA-buf: map attachment %p, new map_ref = %d\n", mem, mem->map_ref)); + -+ if (1 == mem->map_ref) { + -+ /* First reference taken, so we need to map the dma buf */ -+ MALI_DEBUG_ASSERT(!mem->is_mapped); + -+ mem->sgt = dma_buf_map_attachment(mem->attachment, DMA_BIDIRECTIONAL); -+ if (IS_ERR_OR_NULL(mem->sgt)) { -+ MALI_DEBUG_PRINT_ERROR(("Failed to map dma-buf attachment\n")); -+ mem->map_ref--; -+ mali_session_memory_unlock(session); -+ return -EFAULT; -+ } ++/** ++ * @file mali_kbase_mmu.c ++ * Base kernel MMU management. ++ */ + -+ err = mali_mem_mali_map_prepare(alloc); -+ if (_MALI_OSK_ERR_OK != err) { -+ MALI_DEBUG_PRINT(1, ("Mapping of DMA memory failed\n")); -+ mem->map_ref--; -+ mali_session_memory_unlock(session); -+ return -ENOMEM; -+ } ++/* #define DEBUG 1 */ ++#include ++#include ++#include ++#include ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++#include ++#endif ++#include ++#include ++#include + -+ pagedir = mali_session_get_page_directory(session); -+ MALI_DEBUG_ASSERT_POINTER(pagedir); ++#define beenthere(kctx, f, a...) dev_dbg(kctx->kbdev->dev, "%s:" f, __func__, ##a) + -+ for_each_sg(mem->sgt->sgl, sg, mem->sgt->nents, i) { -+ u32 size = sg_dma_len(sg); -+ dma_addr_t phys = sg_dma_address(sg); ++#include ++#include ++#include ++#include ++#include ++#include + -+ /* sg must be page aligned. */ -+ MALI_DEBUG_ASSERT(0 == size % MALI_MMU_PAGE_SIZE); -+ MALI_DEBUG_ASSERT(0 == (phys & ~(uintptr_t)0xFFFFFFFF)); ++#define KBASE_MMU_PAGE_ENTRIES 512 + -+ mali_mmu_pagedir_update(pagedir, virt, phys, size, MALI_MMU_FLAGS_DEFAULT); ++/** ++ * kbase_mmu_flush_invalidate() - Flush and invalidate the GPU caches. ++ * @kctx: The KBase context. ++ * @vpfn: The virtual page frame number to start the flush on. ++ * @nr: The number of pages to flush. ++ * @sync: Set if the operation should be synchronous or not. ++ * ++ * Issue a cache flush + invalidate to the GPU caches and invalidate the TLBs. ++ * ++ * If sync is not set then transactions still in flight when the flush is issued ++ * may use the old page tables and the data they write will not be written out ++ * to memory, this function returns after the flush has been issued but ++ * before all accesses which might effect the flushed region have completed. ++ * ++ * If sync is set then accesses in the flushed region will be drained ++ * before data is flush and invalidated through L1, L2 and into memory, ++ * after which point this function will return. ++ */ ++static void kbase_mmu_flush_invalidate(struct kbase_context *kctx, ++ u64 vpfn, size_t nr, bool sync); + -+ virt += size; -+ } ++/** ++ * kbase_mmu_sync_pgd - sync page directory to memory ++ * @kbdev: Device pointer. ++ * @handle: Address of DMA region. ++ * @size: Size of the region to sync. ++ * ++ * This should be called after each page directory update. ++ */ + -+ if (flags & MALI_MEM_FLAG_MALI_GUARD_PAGE) { -+ u32 guard_phys; -+ MALI_DEBUG_PRINT(7, ("Mapping in extra guard page\n")); ++static void kbase_mmu_sync_pgd(struct kbase_device *kbdev, ++ dma_addr_t handle, size_t size) ++{ ++ /* If page table is not coherent then ensure the gpu can read ++ * the pages from memory ++ */ ++ if (kbdev->system_coherency != COHERENCY_ACE) ++ dma_sync_single_for_device(kbdev->dev, handle, size, ++ DMA_TO_DEVICE); ++} + -+ guard_phys = sg_dma_address(mem->sgt->sgl); -+ mali_mmu_pagedir_update(pagedir, virt, guard_phys, MALI_MMU_PAGE_SIZE, MALI_MMU_FLAGS_DEFAULT); -+ } ++/* ++ * Definitions: ++ * - PGD: Page Directory. ++ * - PTE: Page Table Entry. A 64bit value pointing to the next ++ * level of translation ++ * - ATE: Address Transation Entry. A 64bit value pointing to ++ * a 4kB physical page. ++ */ + -+ mem->is_mapped = MALI_TRUE; -+ mali_session_memory_unlock(session); -+ /* Wake up any thread waiting for buffer to become mapped */ -+ wake_up_all(&mem->wait_queue); -+ } else { -+ MALI_DEBUG_ASSERT(mem->is_mapped); -+ mali_session_memory_unlock(session); -+ } ++static void kbase_mmu_report_fault_and_kill(struct kbase_context *kctx, ++ struct kbase_as *as, const char *reason_str); + -+ return 0; -+} + -+static void mali_dma_buf_unmap(mali_mem_allocation *alloc, struct mali_dma_buf_attachment *mem) ++static size_t make_multiple(size_t minimum, size_t multiple) +{ -+ MALI_DEBUG_ASSERT_POINTER(alloc); -+ MALI_DEBUG_ASSERT_POINTER(mem); -+ MALI_DEBUG_ASSERT_POINTER(mem->attachment); -+ MALI_DEBUG_ASSERT_POINTER(mem->buf); -+ MALI_DEBUG_ASSERT_POINTER(alloc->session); -+ -+ mali_session_memory_lock(alloc->session); -+ mem->map_ref--; ++ size_t remainder = minimum % multiple; + -+ MALI_DEBUG_PRINT(5, ("Mali DMA-buf: unmap attachment %p, new map_ref = %d\n", mem, mem->map_ref)); ++ if (remainder == 0) ++ return minimum; + -+ if (0 == mem->map_ref) { -+ dma_buf_unmap_attachment(mem->attachment, mem->sgt, DMA_BIDIRECTIONAL); -+ if (MALI_TRUE == mem->is_mapped) { -+ mali_mem_mali_map_free(alloc->session, alloc->psize, alloc->mali_vma_node.vm_node.start, -+ alloc->flags); -+ } -+ mem->is_mapped = MALI_FALSE; -+ } -+ mali_session_memory_unlock(alloc->session); -+ /* Wake up any thread waiting for buffer to become unmapped */ -+ wake_up_all(&mem->wait_queue); ++ return minimum + multiple - remainder; +} + -+#if !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) -+int mali_dma_buf_map_job(struct mali_pp_job *job) ++void page_fault_worker(struct work_struct *data) +{ -+ struct mali_dma_buf_attachment *mem; -+ _mali_osk_errcode_t err; -+ int i; -+ int ret = 0; -+ u32 num_memory_cookies; -+ struct mali_session_data *session; -+ struct mali_vma_node *mali_vma_node = NULL; -+ mali_mem_allocation *mali_alloc = NULL; -+ mali_mem_backend *mem_bkend = NULL; -+ -+ MALI_DEBUG_ASSERT_POINTER(job); -+ -+ num_memory_cookies = mali_pp_job_num_memory_cookies(job); -+ -+ session = mali_pp_job_get_session(job); ++ u64 fault_pfn; ++ u32 fault_status; ++ size_t new_pages; ++ size_t fault_rel_pfn; ++ struct kbase_as *faulting_as; ++ int as_no; ++ struct kbase_context *kctx; ++ struct kbase_device *kbdev; ++ struct kbase_va_region *region; ++ int err; ++ bool grown = false; + -+ MALI_DEBUG_ASSERT_POINTER(session); ++ faulting_as = container_of(data, struct kbase_as, work_pagefault); ++ fault_pfn = faulting_as->fault_addr >> PAGE_SHIFT; ++ as_no = faulting_as->number; + -+ for (i = 0; i < num_memory_cookies; i++) { -+ u32 mali_addr = mali_pp_job_get_memory_cookie(job, i); -+ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, mali_addr, 0); -+ MALI_DEBUG_ASSERT(NULL != mali_vma_node); -+ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); -+ MALI_DEBUG_ASSERT(NULL != mali_alloc); -+ if (MALI_MEM_DMA_BUF != mali_alloc->type) { -+ continue; -+ } ++ kbdev = container_of(faulting_as, struct kbase_device, as[as_no]); + -+ /* Get backend memory & Map on CPU */ -+ mutex_lock(&mali_idr_mutex); -+ mem_bkend = idr_find(&mali_backend_idr, mali_alloc->backend_handle); -+ mutex_unlock(&mali_idr_mutex); -+ MALI_DEBUG_ASSERT(NULL != mem_bkend); ++ /* Grab the context that was already refcounted in kbase_mmu_interrupt(). ++ * Therefore, it cannot be scheduled out of this AS until we explicitly release it ++ */ ++ kctx = kbasep_js_runpool_lookup_ctx_noretain(kbdev, as_no); ++ if (WARN_ON(!kctx)) { ++ atomic_dec(&kbdev->faults_pending); ++ return; ++ } + -+ mem = mem_bkend->dma_buf.attachment; ++ KBASE_DEBUG_ASSERT(kctx->kbdev == kbdev); + -+ MALI_DEBUG_ASSERT_POINTER(mem); -+ MALI_DEBUG_ASSERT(mem->session == mali_pp_job_get_session(job)); ++ if (unlikely(faulting_as->protected_mode)) ++ { ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Protected mode fault"); ++ kbase_mmu_hw_clear_fault(kbdev, faulting_as, kctx, ++ KBASE_MMU_FAULT_TYPE_PAGE); + -+ err = mali_dma_buf_map(mem_bkend); -+ if (0 != err) { -+ MALI_DEBUG_PRINT_ERROR(("Mali DMA-buf: Failed to map dma-buf for mali address %x\n", mali_addr)); -+ ret = -EFAULT; -+ continue; -+ } ++ goto fault_done; + } -+ return ret; -+} -+ -+void mali_dma_buf_unmap_job(struct mali_pp_job *job) -+{ -+ struct mali_dma_buf_attachment *mem; -+ int i; -+ u32 num_memory_cookies; -+ struct mali_session_data *session; -+ struct mali_vma_node *mali_vma_node = NULL; -+ mali_mem_allocation *mali_alloc = NULL; -+ mali_mem_backend *mem_bkend = NULL; + -+ MALI_DEBUG_ASSERT_POINTER(job); ++ fault_status = faulting_as->fault_status; ++ switch (fault_status & AS_FAULTSTATUS_EXCEPTION_CODE_MASK) { + -+ num_memory_cookies = mali_pp_job_num_memory_cookies(job); ++ case AS_FAULTSTATUS_EXCEPTION_CODE_TRANSLATION_FAULT: ++ /* need to check against the region to handle this one */ ++ break; + -+ session = mali_pp_job_get_session(job); ++ case AS_FAULTSTATUS_EXCEPTION_CODE_PERMISSION_FAULT: ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Permission failure"); ++ goto fault_done; + -+ MALI_DEBUG_ASSERT_POINTER(session); ++ case AS_FAULTSTATUS_EXCEPTION_CODE_TRANSTAB_BUS_FAULT: ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Translation table bus fault"); ++ goto fault_done; + -+ for (i = 0; i < num_memory_cookies; i++) { -+ u32 mali_addr = mali_pp_job_get_memory_cookie(job, i); -+ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, mali_addr, 0); -+ MALI_DEBUG_ASSERT(NULL != mali_vma_node); -+ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); -+ MALI_DEBUG_ASSERT(NULL != mali_alloc); -+ if (MALI_MEM_DMA_BUF != mali_alloc->type) { -+ continue; -+ } ++ case AS_FAULTSTATUS_EXCEPTION_CODE_ACCESS_FLAG: ++ /* nothing to do, but we don't expect this fault currently */ ++ dev_warn(kbdev->dev, "Access flag unexpectedly set"); ++ goto fault_done; + -+ /* Get backend memory & Map on CPU */ -+ mutex_lock(&mali_idr_mutex); -+ mem_bkend = idr_find(&mali_backend_idr, mali_alloc->backend_handle); -+ mutex_unlock(&mali_idr_mutex); -+ MALI_DEBUG_ASSERT(NULL != mem_bkend); ++ case AS_FAULTSTATUS_EXCEPTION_CODE_ADDRESS_SIZE_FAULT: ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Address size fault"); ++ else ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Unknown fault code"); ++ goto fault_done; + -+ mem = mem_bkend->dma_buf.attachment; ++ case AS_FAULTSTATUS_EXCEPTION_CODE_MEMORY_ATTRIBUTES_FAULT: ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Memory attributes fault"); ++ else ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Unknown fault code"); ++ goto fault_done; + -+ MALI_DEBUG_ASSERT_POINTER(mem); -+ MALI_DEBUG_ASSERT(mem->session == mali_pp_job_get_session(job)); -+ mali_dma_buf_unmap(mem_bkend->mali_allocation, mem); ++ default: ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Unknown fault code"); ++ goto fault_done; + } -+} -+#endif /* !CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH */ + -+int mali_dma_buf_get_size(struct mali_session_data *session, _mali_uk_dma_buf_get_size_s __user *user_arg) -+{ -+ _mali_uk_dma_buf_get_size_s args; -+ int fd; -+ struct dma_buf *buf; ++ /* so we have a translation fault, let's see if it is for growable ++ * memory */ ++ kbase_gpu_vm_lock(kctx); + -+ /* get call arguments from user space. copy_from_user returns how many bytes which where NOT copied */ -+ if (0 != copy_from_user(&args, (void __user *)user_arg, sizeof(_mali_uk_dma_buf_get_size_s))) { -+ return -EFAULT; ++ region = kbase_region_tracker_find_region_enclosing_address(kctx, ++ faulting_as->fault_addr); ++ if (!region || region->flags & KBASE_REG_FREE) { ++ kbase_gpu_vm_unlock(kctx); ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Memory is not mapped on the GPU"); ++ goto fault_done; + } + -+ /* Do DMA-BUF stuff */ -+ fd = args.mem_fd; ++ if (region->gpu_alloc->type == KBASE_MEM_TYPE_IMPORTED_UMM) { ++ kbase_gpu_vm_unlock(kctx); ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "DMA-BUF is not mapped on the GPU"); ++ goto fault_done; ++ } + -+ buf = dma_buf_get(fd); -+ if (IS_ERR_OR_NULL(buf)) { -+ MALI_DEBUG_PRINT_ERROR(("Failed to get dma-buf from fd: %d\n", fd)); -+ return PTR_ERR_OR_ZERO(buf); ++ if ((region->flags & GROWABLE_FLAGS_REQUIRED) ++ != GROWABLE_FLAGS_REQUIRED) { ++ kbase_gpu_vm_unlock(kctx); ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Memory is not growable"); ++ goto fault_done; + } + -+ if (0 != put_user(buf->size, &user_arg->size)) { -+ dma_buf_put(buf); -+ return -EFAULT; ++ if ((region->flags & KBASE_REG_DONT_NEED)) { ++ kbase_gpu_vm_unlock(kctx); ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Don't need memory can't be grown"); ++ goto fault_done; + } + -+ dma_buf_put(buf); ++ /* find the size we need to grow it by */ ++ /* we know the result fit in a size_t due to kbase_region_tracker_find_region_enclosing_address ++ * validating the fault_adress to be within a size_t from the start_pfn */ ++ fault_rel_pfn = fault_pfn - region->start_pfn; + -+ return 0; -+} ++ if (fault_rel_pfn < kbase_reg_current_backed_size(region)) { ++ dev_dbg(kbdev->dev, "Page fault @ 0x%llx in allocated region 0x%llx-0x%llx of growable TMEM: Ignoring", ++ faulting_as->fault_addr, region->start_pfn, ++ region->start_pfn + ++ kbase_reg_current_backed_size(region)); + -+_mali_osk_errcode_t mali_mem_bind_dma_buf(mali_mem_allocation *alloc, -+ mali_mem_backend *mem_backend, -+ int fd, u32 flags) -+{ -+ struct dma_buf *buf; -+ struct mali_dma_buf_attachment *dma_mem; -+ struct mali_session_data *session = alloc->session; ++ mutex_lock(&kbdev->mmu_hw_mutex); + -+ MALI_DEBUG_ASSERT_POINTER(session); -+ MALI_DEBUG_ASSERT_POINTER(mem_backend); -+ MALI_DEBUG_ASSERT_POINTER(alloc); ++ kbase_mmu_hw_clear_fault(kbdev, faulting_as, kctx, ++ KBASE_MMU_FAULT_TYPE_PAGE); ++ /* [1] in case another page fault occurred while we were ++ * handling the (duplicate) page fault we need to ensure we ++ * don't loose the other page fault as result of us clearing ++ * the MMU IRQ. Therefore, after we clear the MMU IRQ we send ++ * an UNLOCK command that will retry any stalled memory ++ * transaction (which should cause the other page fault to be ++ * raised again). ++ */ ++ kbase_mmu_hw_do_operation(kbdev, faulting_as, NULL, 0, 0, ++ AS_COMMAND_UNLOCK, 1); + -+ /* get dma buffer */ -+ buf = dma_buf_get(fd); -+ if (IS_ERR_OR_NULL(buf)) { -+ return _MALI_OSK_ERR_FAULT; -+ } ++ mutex_unlock(&kbdev->mmu_hw_mutex); + -+ /* Currently, mapping of the full buffer are supported. */ -+ if (alloc->psize != buf->size) { -+ goto failed_alloc_mem; -+ } ++ kbase_mmu_hw_enable_fault(kbdev, faulting_as, kctx, ++ KBASE_MMU_FAULT_TYPE_PAGE); ++ kbase_gpu_vm_unlock(kctx); + -+ dma_mem = _mali_osk_calloc(1, sizeof(struct mali_dma_buf_attachment)); -+ if (NULL == dma_mem) { -+ goto failed_alloc_mem; ++ goto fault_done; + } + -+ dma_mem->buf = buf; -+ dma_mem->session = session; -+ dma_mem->map_ref = 0; -+ init_waitqueue_head(&dma_mem->wait_queue); ++ new_pages = make_multiple(fault_rel_pfn - ++ kbase_reg_current_backed_size(region) + 1, ++ region->extent); + -+ dma_mem->attachment = dma_buf_attach(dma_mem->buf, &mali_platform_device->dev); -+ if (NULL == dma_mem->attachment) { -+ goto failed_dma_attach; -+ } ++ /* cap to max vsize */ ++ if (new_pages + kbase_reg_current_backed_size(region) > ++ region->nr_pages) ++ new_pages = region->nr_pages - ++ kbase_reg_current_backed_size(region); + -+ mem_backend->dma_buf.attachment = dma_mem; ++ if (0 == new_pages) { ++ mutex_lock(&kbdev->mmu_hw_mutex); + -+ alloc->flags |= MALI_MEM_FLAG_DONT_CPU_MAP; -+ if (flags & _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE) { -+ alloc->flags |= MALI_MEM_FLAG_MALI_GUARD_PAGE; -+ } ++ /* Duplicate of a fault we've already handled, nothing to do */ ++ kbase_mmu_hw_clear_fault(kbdev, faulting_as, kctx, ++ KBASE_MMU_FAULT_TYPE_PAGE); ++ /* See comment [1] about UNLOCK usage */ ++ kbase_mmu_hw_do_operation(kbdev, faulting_as, NULL, 0, 0, ++ AS_COMMAND_UNLOCK, 1); + ++ mutex_unlock(&kbdev->mmu_hw_mutex); + -+#if defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) -+ /* Map memory into session's Mali virtual address space. */ -+ if (0 != mali_dma_buf_map(mem_backend)) { -+ goto Failed_dma_map; ++ kbase_mmu_hw_enable_fault(kbdev, faulting_as, kctx, ++ KBASE_MMU_FAULT_TYPE_PAGE); ++ kbase_gpu_vm_unlock(kctx); ++ goto fault_done; + } -+#endif + -+ return _MALI_OSK_ERR_OK; ++ if (kbase_alloc_phy_pages_helper(region->gpu_alloc, new_pages) == 0) { ++ if (region->gpu_alloc != region->cpu_alloc) { ++ if (kbase_alloc_phy_pages_helper( ++ region->cpu_alloc, new_pages) == 0) { ++ grown = true; ++ } else { ++ kbase_free_phy_pages_helper(region->gpu_alloc, ++ new_pages); ++ } ++ } else { ++ grown = true; ++ } ++ } + -+#if defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) -+Failed_dma_map: -+ mali_dma_buf_unmap(alloc, dma_mem); -+#endif -+ /* Wait for buffer to become unmapped */ -+ wait_event(dma_mem->wait_queue, !dma_mem->is_mapped); -+ MALI_DEBUG_ASSERT(!dma_mem->is_mapped); -+ dma_buf_detach(dma_mem->buf, dma_mem->attachment); -+failed_dma_attach: -+ _mali_osk_free(dma_mem); -+failed_alloc_mem: -+ dma_buf_put(buf); -+ return _MALI_OSK_ERR_FAULT; -+} + -+void mali_mem_unbind_dma_buf(mali_mem_backend *mem_backend) -+{ -+ struct mali_dma_buf_attachment *mem; -+ MALI_DEBUG_ASSERT_POINTER(mem_backend); -+ MALI_DEBUG_ASSERT(MALI_MEM_DMA_BUF == mem_backend->type); ++ if (grown) { ++ u64 pfn_offset; ++ u32 op; + -+ mem = mem_backend->dma_buf.attachment; -+ MALI_DEBUG_ASSERT_POINTER(mem); -+ MALI_DEBUG_ASSERT_POINTER(mem->attachment); -+ MALI_DEBUG_ASSERT_POINTER(mem->buf); -+ MALI_DEBUG_PRINT(3, ("Mali DMA-buf: release attachment %p\n", mem)); ++ /* alloc success */ ++ KBASE_DEBUG_ASSERT(kbase_reg_current_backed_size(region) <= region->nr_pages); + -+#if defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) -+ MALI_DEBUG_ASSERT_POINTER(mem_backend->mali_allocation); -+ /* We mapped implicitly on attach, so we need to unmap on release */ -+ mali_dma_buf_unmap(mem_backend->mali_allocation, mem); ++ /* set up the new pages */ ++ pfn_offset = kbase_reg_current_backed_size(region) - new_pages; ++ /* ++ * Note: ++ * Issuing an MMU operation will unlock the MMU and cause the ++ * translation to be replayed. If the page insertion fails then ++ * rather then trying to continue the context should be killed ++ * so the no_flush version of insert_pages is used which allows ++ * us to unlock the MMU as we see fit. ++ */ ++ err = kbase_mmu_insert_pages_no_flush(kctx, ++ region->start_pfn + pfn_offset, ++ &kbase_get_gpu_phy_pages(region)[pfn_offset], ++ new_pages, region->flags); ++ if (err) { ++ kbase_free_phy_pages_helper(region->gpu_alloc, new_pages); ++ if (region->gpu_alloc != region->cpu_alloc) ++ kbase_free_phy_pages_helper(region->cpu_alloc, ++ new_pages); ++ kbase_gpu_vm_unlock(kctx); ++ /* The locked VA region will be unlocked and the cache invalidated in here */ ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Page table update failure"); ++ goto fault_done; ++ } ++#if defined(CONFIG_MALI_GATOR_SUPPORT) ++ kbase_trace_mali_page_fault_insert_pages(as_no, new_pages); +#endif -+ /* Wait for buffer to become unmapped */ -+ wait_event(mem->wait_queue, !mem->is_mapped); -+ MALI_DEBUG_ASSERT(!mem->is_mapped); ++ KBASE_TLSTREAM_AUX_PAGEFAULT(kctx->id, (u64)new_pages); + -+ dma_buf_detach(mem->buf, mem->attachment); -+ dma_buf_put(mem->buf); ++ /* AS transaction begin */ ++ mutex_lock(&kbdev->mmu_hw_mutex); + -+ _mali_osk_free(mem); -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h -new file mode 100755 -index 000000000000..a9b2870389ff ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h -@@ -0,0 +1,53 @@ -+/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ /* flush L2 and unlock the VA (resumes the MMU) */ ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_6367)) ++ op = AS_COMMAND_FLUSH; ++ else ++ op = AS_COMMAND_FLUSH_PT; + -+#ifndef __MALI_MEMORY_DMA_BUF_H__ -+#define __MALI_MEMORY_DMA_BUF_H__ ++ /* clear MMU interrupt - this needs to be done after updating ++ * the page tables but before issuing a FLUSH command. The ++ * FLUSH cmd has a side effect that it restarts stalled memory ++ * transactions in other address spaces which may cause ++ * another fault to occur. If we didn't clear the interrupt at ++ * this stage a new IRQ might not be raised when the GPU finds ++ * a MMU IRQ is already pending. ++ */ ++ kbase_mmu_hw_clear_fault(kbdev, faulting_as, kctx, ++ KBASE_MMU_FAULT_TYPE_PAGE); + -+#ifdef __cplusplus -+extern "C" { -+#endif ++ kbase_mmu_hw_do_operation(kbdev, faulting_as, kctx, ++ faulting_as->fault_addr >> PAGE_SHIFT, ++ new_pages, ++ op, 1); + -+#include "mali_uk_types.h" -+#include "mali_osk.h" -+#include "mali_memory.h" ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++ /* AS transaction end */ + -+struct mali_pp_job; ++ /* reenable this in the mask */ ++ kbase_mmu_hw_enable_fault(kbdev, faulting_as, kctx, ++ KBASE_MMU_FAULT_TYPE_PAGE); ++ kbase_gpu_vm_unlock(kctx); ++ } else { ++ /* failed to extend, handle as a normal PF */ ++ kbase_gpu_vm_unlock(kctx); ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Page allocation failure"); ++ } + -+struct mali_dma_buf_attachment; -+struct mali_dma_buf_attachment { -+ struct dma_buf *buf; -+ struct dma_buf_attachment *attachment; -+ struct sg_table *sgt; -+ struct mali_session_data *session; -+ int map_ref; -+ struct mutex map_lock; -+ mali_bool is_mapped; -+ wait_queue_head_t wait_queue; -+}; ++fault_done: ++ /* ++ * By this point, the fault was handled in some way, ++ * so release the ctx refcount ++ */ ++ kbasep_js_runpool_release_ctx(kbdev, kctx); + -+int mali_dma_buf_get_size(struct mali_session_data *session, _mali_uk_dma_buf_get_size_s __user *arg); ++ atomic_dec(&kbdev->faults_pending); ++} + -+void mali_mem_unbind_dma_buf(mali_mem_backend *mem_backend); ++phys_addr_t kbase_mmu_alloc_pgd(struct kbase_context *kctx) ++{ ++ u64 *page; ++ int i; ++ struct page *p; ++ int new_page_count __maybe_unused; + -+_mali_osk_errcode_t mali_mem_bind_dma_buf(mali_mem_allocation *alloc, -+ mali_mem_backend *mem_backend, -+ int fd, u32 flags); ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ new_page_count = kbase_atomic_add_pages(1, &kctx->used_pages); ++ kbase_atomic_add_pages(1, &kctx->kbdev->memdev.used_pages); + -+#if !defined(CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH) -+int mali_dma_buf_map_job(struct mali_pp_job *job); -+void mali_dma_buf_unmap_job(struct mali_pp_job *job); -+#endif ++ p = kbase_mem_pool_alloc(&kctx->mem_pool); ++ if (!p) ++ goto sub_pages; + -+#ifdef __cplusplus -+} -+#endif ++ KBASE_TLSTREAM_AUX_PAGESALLOC( ++ (u32)kctx->id, ++ (u64)new_page_count); + -+#endif /* __MALI_MEMORY_DMA_BUF_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c -new file mode 100755 -index 000000000000..76018b7ab90b ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c -@@ -0,0 +1,89 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ page = kmap(p); ++ if (NULL == page) ++ goto alloc_free; + -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_ukk.h" -+#include "mali_memory.h" -+#include "mali_mem_validation.h" -+#include "mali_uk_types.h" ++ kbase_process_page_usage_inc(kctx, 1); + -+void mali_mem_unbind_ext_buf(mali_mem_backend *mem_backend) -+{ -+ mali_mem_allocation *alloc; -+ struct mali_session_data *session; -+ MALI_DEBUG_ASSERT_POINTER(mem_backend); -+ alloc = mem_backend->mali_allocation; -+ MALI_DEBUG_ASSERT_POINTER(alloc); -+ MALI_DEBUG_ASSERT(MALI_MEM_EXTERNAL == mem_backend->type); ++ for (i = 0; i < KBASE_MMU_PAGE_ENTRIES; i++) ++ kctx->kbdev->mmu_mode->entry_invalidate(&page[i]); + -+ session = alloc->session; -+ MALI_DEBUG_ASSERT_POINTER(session); -+ mali_session_memory_lock(session); -+ mali_mem_mali_map_free(session, alloc->psize, alloc->mali_vma_node.vm_node.start, -+ alloc->flags); -+ mali_session_memory_unlock(session); ++ kbase_mmu_sync_pgd(kctx->kbdev, kbase_dma_addr(p), PAGE_SIZE); ++ ++ kunmap(p); ++ return page_to_phys(p); ++ ++alloc_free: ++ kbase_mem_pool_free(&kctx->mem_pool, p, false); ++sub_pages: ++ kbase_atomic_sub_pages(1, &kctx->used_pages); ++ kbase_atomic_sub_pages(1, &kctx->kbdev->memdev.used_pages); ++ ++ return 0; +} + -+_mali_osk_errcode_t mali_mem_bind_ext_buf(mali_mem_allocation *alloc, -+ mali_mem_backend *mem_backend, -+ u32 phys_addr, -+ u32 flag) ++KBASE_EXPORT_TEST_API(kbase_mmu_alloc_pgd); ++ ++/* Given PGD PFN for level N, return PGD PFN for level N+1, allocating the ++ * new table from the pool if needed and possible ++ */ ++static int mmu_get_next_pgd(struct kbase_context *kctx, ++ phys_addr_t *pgd, u64 vpfn, int level) +{ -+ struct mali_session_data *session; -+ _mali_osk_errcode_t err; -+ u32 virt, phys, size; -+ MALI_DEBUG_ASSERT_POINTER(mem_backend); -+ MALI_DEBUG_ASSERT_POINTER(alloc); -+ size = alloc->psize; -+ session = (struct mali_session_data *)(uintptr_t)alloc->session; -+ MALI_CHECK_NON_NULL(session, _MALI_OSK_ERR_INVALID_ARGS); ++ u64 *page; ++ phys_addr_t target_pgd; ++ struct page *p; + -+ /* check arguments */ -+ /* NULL might be a valid Mali address */ -+ if (!size) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); ++ KBASE_DEBUG_ASSERT(*pgd); ++ KBASE_DEBUG_ASSERT(NULL != kctx); + -+ /* size must be a multiple of the system page size */ -+ if (size % _MALI_OSK_MALI_PAGE_SIZE) MALI_ERROR(_MALI_OSK_ERR_INVALID_ARGS); ++ lockdep_assert_held(&kctx->mmu_lock); + -+ /* Validate the mali physical range */ -+ if (_MALI_OSK_ERR_OK != mali_mem_validation_check(phys_addr, size)) { -+ return _MALI_OSK_ERR_FAULT; -+ } ++ /* ++ * Architecture spec defines level-0 as being the top-most. ++ * This is a bit unfortunate here, but we keep the same convention. ++ */ ++ vpfn >>= (3 - level) * 9; ++ vpfn &= 0x1FF; + -+ if (flag & _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE) { -+ alloc->flags |= MALI_MEM_FLAG_MALI_GUARD_PAGE; ++ p = pfn_to_page(PFN_DOWN(*pgd)); ++ page = kmap(p); ++ if (NULL == page) { ++ dev_warn(kctx->kbdev->dev, "mmu_get_next_pgd: kmap failure\n"); ++ return -EINVAL; + } + -+ mali_session_memory_lock(session); -+ -+ virt = alloc->mali_vma_node.vm_node.start; -+ phys = phys_addr; ++ target_pgd = kctx->kbdev->mmu_mode->pte_to_phy_addr(page[vpfn]); + -+ err = mali_mem_mali_map_prepare(alloc); -+ if (_MALI_OSK_ERR_OK != err) { -+ mali_session_memory_unlock(session); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++ if (!target_pgd) { ++ target_pgd = kbase_mmu_alloc_pgd(kctx); ++ if (!target_pgd) { ++ dev_dbg(kctx->kbdev->dev, "mmu_get_next_pgd: kbase_mmu_alloc_pgd failure\n"); ++ kunmap(p); ++ return -ENOMEM; ++ } + -+ mali_mmu_pagedir_update(session->page_directory, virt, phys, size, MALI_MMU_FLAGS_DEFAULT); ++ kctx->kbdev->mmu_mode->entry_set_pte(&page[vpfn], target_pgd); + -+ if (alloc->flags & MALI_MEM_FLAG_MALI_GUARD_PAGE) { -+ mali_mmu_pagedir_update(session->page_directory, virt + size, phys, _MALI_OSK_MALI_PAGE_SIZE, MALI_MMU_FLAGS_DEFAULT); ++ kbase_mmu_sync_pgd(kctx->kbdev, kbase_dma_addr(p), PAGE_SIZE); ++ /* Rely on the caller to update the address space flags. */ + } -+ MALI_DEBUG_PRINT(3, -+ ("Requested to map physical memory 0x%x-0x%x into virtual memory 0x%x\n", -+ phys_addr, (phys_addr + size - 1), -+ virt)); -+ mali_session_memory_unlock(session); + -+ MALI_SUCCESS; -+} ++ kunmap(p); ++ *pgd = target_pgd; + -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h -new file mode 100755 -index 000000000000..2db178d96233 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h -@@ -0,0 +1,29 @@ ++ return 0; ++} + -+/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++static int mmu_get_bottom_pgd(struct kbase_context *kctx, ++ u64 vpfn, phys_addr_t *out_pgd) ++{ ++ phys_addr_t pgd; ++ int l; + -+#ifndef __MALI_MEMORY_EXTERNAL_H__ -+#define __MALI_MEMORY_EXTERNAL_H__ ++ lockdep_assert_held(&kctx->mmu_lock); + -+#ifdef __cplusplus -+extern "C" { -+#endif ++ pgd = kctx->pgd; ++ for (l = MIDGARD_MMU_TOPLEVEL; l < MIDGARD_MMU_BOTTOMLEVEL; l++) { ++ int err = mmu_get_next_pgd(kctx, &pgd, vpfn, l); ++ /* Handle failure condition */ ++ if (err) { ++ dev_dbg(kctx->kbdev->dev, "mmu_get_bottom_pgd: mmu_get_next_pgd failure\n"); ++ return err; ++ } ++ } + -+_mali_osk_errcode_t mali_mem_bind_ext_buf(mali_mem_allocation *alloc, -+ mali_mem_backend *mem_backend, -+ u32 phys_addr, -+ u32 flag); -+void mali_mem_unbind_ext_buf(mali_mem_backend *mem_backend); ++ *out_pgd = pgd; + -+#ifdef __cplusplus ++ return 0; +} -+#endif -+ -+#endif -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c -new file mode 100755 -index 000000000000..27dee0f19c81 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c -@@ -0,0 +1,993 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+#include -+#endif -+#include + -+#include "mali_osk.h" -+#include "mali_osk_mali.h" -+#include "mali_kernel_linux.h" -+#include "mali_scheduler.h" -+#include "mali_memory.h" -+#include "mali_memory_os_alloc.h" -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+#include "mali_memory_dma_buf.h" -+#include "mali_memory_secure.h" -+#endif -+#if defined(CONFIG_MALI400_UMP) -+#include "mali_memory_ump.h" -+#endif -+#include "mali_memory_manager.h" -+#include "mali_memory_virtual.h" -+#include "mali_memory_util.h" -+#include "mali_memory_external.h" -+#include "mali_memory_cow.h" -+#include "mali_memory_block_alloc.h" -+#include "mali_ukk.h" -+#include "mali_memory_swap_alloc.h" ++static phys_addr_t mmu_insert_pages_recover_get_next_pgd(struct kbase_context *kctx, phys_addr_t pgd, u64 vpfn, int level) ++{ ++ u64 *page; ++ phys_addr_t target_pgd; + -+/* -+* New memory system interface -+*/ ++ KBASE_DEBUG_ASSERT(pgd); ++ KBASE_DEBUG_ASSERT(NULL != kctx); + -+/*inti idr for backend memory */ -+struct idr mali_backend_idr; -+struct mutex mali_idr_mutex; ++ lockdep_assert_held(&kctx->mmu_lock); ++ lockdep_assert_held(&kctx->reg_lock); + -+/* init allocation manager */ -+int mali_memory_manager_init(struct mali_allocation_manager *mgr) -+{ -+ /* init Locks */ -+ rwlock_init(&mgr->vm_lock); -+ mutex_init(&mgr->list_mutex); ++ /* ++ * Architecture spec defines level-0 as being the top-most. ++ * This is a bit unfortunate here, but we keep the same convention. ++ */ ++ vpfn >>= (3 - level) * 9; ++ vpfn &= 0x1FF; + -+ /* init link */ -+ INIT_LIST_HEAD(&mgr->head); ++ page = kmap_atomic(pfn_to_page(PFN_DOWN(pgd))); ++ /* kmap_atomic should NEVER fail */ ++ KBASE_DEBUG_ASSERT(NULL != page); + -+ /* init RB tree */ -+ mgr->allocation_mgr_rb = RB_ROOT; -+ mgr->mali_allocation_num = 0; -+ return 0; ++ target_pgd = kctx->kbdev->mmu_mode->pte_to_phy_addr(page[vpfn]); ++ /* As we are recovering from what has already been set up, we should have a target_pgd */ ++ KBASE_DEBUG_ASSERT(0 != target_pgd); ++ kunmap_atomic(page); ++ return target_pgd; +} + -+/* Deinit allocation manager -+* Do some check for debug -+*/ -+void mali_memory_manager_uninit(struct mali_allocation_manager *mgr) ++static phys_addr_t mmu_insert_pages_recover_get_bottom_pgd(struct kbase_context *kctx, u64 vpfn) +{ -+ /* check RB tree is empty */ -+ MALI_DEBUG_ASSERT(((void *)(mgr->allocation_mgr_rb.rb_node) == (void *)rb_last(&mgr->allocation_mgr_rb))); -+ /* check allocation List */ -+ MALI_DEBUG_ASSERT(list_empty(&mgr->head)); -+} ++ phys_addr_t pgd; ++ int l; + -+/* Prepare memory descriptor */ -+static mali_mem_allocation *mali_mem_allocation_struct_create(struct mali_session_data *session) -+{ -+ mali_mem_allocation *mali_allocation; ++ lockdep_assert_held(&kctx->mmu_lock); + -+ /* Allocate memory */ -+ mali_allocation = (mali_mem_allocation *)kzalloc(sizeof(mali_mem_allocation), GFP_KERNEL); -+ if (NULL == mali_allocation) { -+ MALI_DEBUG_PRINT(1, ("mali_mem_allocation_struct_create: descriptor was NULL\n")); -+ return NULL; -+ } ++ pgd = kctx->pgd; + -+ MALI_DEBUG_CODE(mali_allocation->magic = MALI_MEM_ALLOCATION_VALID_MAGIC); ++ for (l = MIDGARD_MMU_TOPLEVEL; l < MIDGARD_MMU_BOTTOMLEVEL; l++) { ++ pgd = mmu_insert_pages_recover_get_next_pgd(kctx, pgd, vpfn, l); ++ /* Should never fail */ ++ KBASE_DEBUG_ASSERT(0 != pgd); ++ } + -+ /* do init */ -+ mali_allocation->flags = 0; -+ mali_allocation->session = session; ++ return pgd; ++} + -+ INIT_LIST_HEAD(&mali_allocation->list); -+ _mali_osk_atomic_init(&mali_allocation->mem_alloc_refcount, 1); ++static void mmu_insert_pages_failure_recovery(struct kbase_context *kctx, u64 vpfn, ++ size_t nr) ++{ ++ phys_addr_t pgd; ++ u64 *pgd_page; ++ struct kbase_mmu_mode const *mmu_mode; + -+ /** -+ *add to session list -+ */ -+ mutex_lock(&session->allocation_mgr.list_mutex); -+ list_add_tail(&mali_allocation->list, &session->allocation_mgr.head); -+ session->allocation_mgr.mali_allocation_num++; -+ mutex_unlock(&session->allocation_mgr.list_mutex); ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ KBASE_DEBUG_ASSERT(0 != vpfn); ++ /* 64-bit address range is the max */ ++ KBASE_DEBUG_ASSERT(vpfn <= (U64_MAX / PAGE_SIZE)); + -+ return mali_allocation; -+} ++ lockdep_assert_held(&kctx->mmu_lock); ++ lockdep_assert_held(&kctx->reg_lock); + -+void mali_mem_allocation_struct_destory(mali_mem_allocation *alloc) -+{ -+ MALI_DEBUG_ASSERT_POINTER(alloc); -+ MALI_DEBUG_ASSERT_POINTER(alloc->session); -+ mutex_lock(&alloc->session->allocation_mgr.list_mutex); -+ list_del(&alloc->list); -+ alloc->session->allocation_mgr.mali_allocation_num--; -+ mutex_unlock(&alloc->session->allocation_mgr.list_mutex); ++ mmu_mode = kctx->kbdev->mmu_mode; + -+ kfree(alloc); -+} ++ while (nr) { ++ unsigned int i; ++ unsigned int index = vpfn & 0x1FF; ++ unsigned int count = KBASE_MMU_PAGE_ENTRIES - index; ++ struct page *p; + -+int mali_mem_backend_struct_create(mali_mem_backend **backend, u32 psize) -+{ -+ mali_mem_backend *mem_backend = NULL; -+ s32 ret = -ENOSPC; -+ s32 index = -1; -+ *backend = (mali_mem_backend *)kzalloc(sizeof(mali_mem_backend), GFP_KERNEL); -+ if (NULL == *backend) { -+ MALI_DEBUG_PRINT(1, ("mali_mem_backend_struct_create: backend descriptor was NULL\n")); -+ return -1; -+ } -+ mem_backend = *backend; -+ mem_backend->size = psize; -+ mutex_init(&mem_backend->mutex); -+ INIT_LIST_HEAD(&mem_backend->list); -+ mem_backend->using_count = 0; ++ if (count > nr) ++ count = nr; + ++ pgd = mmu_insert_pages_recover_get_bottom_pgd(kctx, vpfn); ++ KBASE_DEBUG_ASSERT(0 != pgd); + -+ /* link backend with id */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) -+again: -+ if (!idr_pre_get(&mali_backend_idr, GFP_KERNEL)) { -+ kfree(mem_backend); -+ return -ENOMEM; -+ } -+ mutex_lock(&mali_idr_mutex); -+ ret = idr_get_new_above(&mali_backend_idr, mem_backend, 1, &index); -+ mutex_unlock(&mali_idr_mutex); ++ p = pfn_to_page(PFN_DOWN(pgd)); + -+ if (-ENOSPC == ret) { -+ kfree(mem_backend); -+ return -ENOSPC; -+ } -+ if (-EAGAIN == ret) -+ goto again; -+#else -+ mutex_lock(&mali_idr_mutex); -+ ret = idr_alloc(&mali_backend_idr, mem_backend, 1, MALI_S32_MAX, GFP_KERNEL); -+ mutex_unlock(&mali_idr_mutex); -+ index = ret; -+ if (ret < 0) { -+ MALI_DEBUG_PRINT(1, ("mali_mem_backend_struct_create: Can't allocate idr for backend! \n")); -+ kfree(mem_backend); -+ return -ENOSPC; -+ } -+#endif -+ return index; -+} ++ pgd_page = kmap_atomic(p); ++ KBASE_DEBUG_ASSERT(NULL != pgd_page); + ++ /* Invalidate the entries we added */ ++ for (i = 0; i < count; i++) ++ mmu_mode->entry_invalidate(&pgd_page[index + i]); + -+static void mali_mem_backend_struct_destory(mali_mem_backend **backend, s32 backend_handle) -+{ -+ mali_mem_backend *mem_backend = *backend; ++ vpfn += count; ++ nr -= count; + -+ mutex_lock(&mali_idr_mutex); -+ idr_remove(&mali_backend_idr, backend_handle); -+ mutex_unlock(&mali_idr_mutex); -+ kfree(mem_backend); -+ *backend = NULL; -+} ++ kbase_mmu_sync_pgd(kctx->kbdev, kbase_dma_addr(p), PAGE_SIZE); + -+mali_mem_backend *mali_mem_backend_struct_search(struct mali_session_data *session, u32 mali_address) -+{ -+ struct mali_vma_node *mali_vma_node = NULL; -+ mali_mem_backend *mem_bkend = NULL; -+ mali_mem_allocation *mali_alloc = NULL; -+ MALI_DEBUG_ASSERT_POINTER(session); -+ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, mali_address, 0); -+ if (NULL == mali_vma_node) { -+ MALI_DEBUG_PRINT(1, ("mali_mem_backend_struct_search:vma node was NULL\n")); -+ return NULL; ++ kunmap_atomic(pgd_page); + } -+ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); -+ /* Get backend memory & Map on CPU */ -+ mutex_lock(&mali_idr_mutex); -+ mem_bkend = idr_find(&mali_backend_idr, mali_alloc->backend_handle); -+ mutex_unlock(&mali_idr_mutex); -+ MALI_DEBUG_ASSERT(NULL != mem_bkend); -+ return mem_bkend; +} + -+static _mali_osk_errcode_t mali_mem_resize(struct mali_session_data *session, mali_mem_backend *mem_backend, u32 physical_size) ++/* ++ * Map the single page 'phys' 'nr' of times, starting at GPU PFN 'vpfn' ++ */ ++int kbase_mmu_insert_single_page(struct kbase_context *kctx, u64 vpfn, ++ phys_addr_t phys, size_t nr, ++ unsigned long flags) +{ -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; -+ int retval = 0; -+ mali_mem_allocation *mali_allocation = NULL; -+ mali_mem_os_mem tmp_os_mem; -+ s32 change_page_count; -+ -+ MALI_DEBUG_ASSERT_POINTER(session); -+ MALI_DEBUG_ASSERT_POINTER(mem_backend); -+ MALI_DEBUG_PRINT(4, (" mali_mem_resize_memory called! \n")); -+ MALI_DEBUG_ASSERT(0 == physical_size % MALI_MMU_PAGE_SIZE); -+ -+ mali_allocation = mem_backend->mali_allocation; -+ MALI_DEBUG_ASSERT_POINTER(mali_allocation); ++ phys_addr_t pgd; ++ u64 *pgd_page; ++ /* In case the insert_single_page only partially completes we need to be ++ * able to recover */ ++ bool recover_required = false; ++ u64 recover_vpfn = vpfn; ++ size_t recover_count = 0; ++ size_t remain = nr; ++ int err; + -+ MALI_DEBUG_ASSERT(MALI_MEM_FLAG_CAN_RESIZE & mali_allocation->flags); -+ MALI_DEBUG_ASSERT(MALI_MEM_OS == mali_allocation->type); ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ KBASE_DEBUG_ASSERT(0 != vpfn); ++ /* 64-bit address range is the max */ ++ KBASE_DEBUG_ASSERT(vpfn <= (U64_MAX / PAGE_SIZE)); + -+ mutex_lock(&mem_backend->mutex); ++ /* Early out if there is nothing to do */ ++ if (nr == 0) ++ return 0; + -+ /* Do resize*/ -+ if (physical_size > mem_backend->size) { -+ u32 add_size = physical_size - mem_backend->size; ++ mutex_lock(&kctx->mmu_lock); + -+ MALI_DEBUG_ASSERT(0 == add_size % MALI_MMU_PAGE_SIZE); ++ while (remain) { ++ unsigned int i; ++ unsigned int index = vpfn & 0x1FF; ++ unsigned int count = KBASE_MMU_PAGE_ENTRIES - index; ++ struct page *p; + -+ /* Allocate new pages from os mem */ -+ retval = mali_mem_os_alloc_pages(&tmp_os_mem, add_size); ++ if (count > remain) ++ count = remain; + -+ if (retval) { -+ if (-ENOMEM == retval) { -+ ret = _MALI_OSK_ERR_NOMEM; -+ } else { -+ ret = _MALI_OSK_ERR_FAULT; ++ /* ++ * Repeatedly calling mmu_get_bottom_pte() is clearly ++ * suboptimal. We don't have to re-parse the whole tree ++ * each time (just cache the l0-l2 sequence). ++ * On the other hand, it's only a gain when we map more than ++ * 256 pages at once (on average). Do we really care? ++ */ ++ do { ++ err = mmu_get_bottom_pgd(kctx, vpfn, &pgd); ++ if (err != -ENOMEM) ++ break; ++ /* Fill the memory pool with enough pages for ++ * the page walk to succeed ++ */ ++ mutex_unlock(&kctx->mmu_lock); ++ err = kbase_mem_pool_grow(&kctx->mem_pool, ++ MIDGARD_MMU_BOTTOMLEVEL); ++ mutex_lock(&kctx->mmu_lock); ++ } while (!err); ++ if (err) { ++ dev_warn(kctx->kbdev->dev, "kbase_mmu_insert_pages: mmu_get_bottom_pgd failure\n"); ++ if (recover_required) { ++ /* Invalidate the pages we have partially ++ * completed */ ++ mmu_insert_pages_failure_recovery(kctx, ++ recover_vpfn, ++ recover_count); + } -+ MALI_DEBUG_PRINT(2, ("_mali_ukk_mem_resize: memory allocation failed !\n")); -+ goto failed_alloc_memory; ++ goto fail_unlock; + } + -+ MALI_DEBUG_ASSERT(tmp_os_mem.count == add_size / MALI_MMU_PAGE_SIZE); ++ p = pfn_to_page(PFN_DOWN(pgd)); ++ pgd_page = kmap(p); ++ if (!pgd_page) { ++ dev_warn(kctx->kbdev->dev, "kbase_mmu_insert_pages: kmap failure\n"); ++ if (recover_required) { ++ /* Invalidate the pages we have partially ++ * completed */ ++ mmu_insert_pages_failure_recovery(kctx, ++ recover_vpfn, ++ recover_count); ++ } ++ err = -ENOMEM; ++ goto fail_unlock; ++ } + -+ /* Resize the memory of the backend */ -+ ret = mali_mem_os_resize_pages(&tmp_os_mem, &mem_backend->os_mem, 0, tmp_os_mem.count); ++ for (i = 0; i < count; i++) { ++ unsigned int ofs = index + i; + -+ if (ret) { -+ MALI_DEBUG_PRINT(2, ("_mali_ukk_mem_resize: memory resizing failed !\n")); -+ goto failed_resize_pages; ++ KBASE_DEBUG_ASSERT(0 == (pgd_page[ofs] & 1UL)); ++ kctx->kbdev->mmu_mode->entry_set_ate(&pgd_page[ofs], ++ phys, flags); + } + -+ /*Resize cpu mapping */ -+ if (NULL != mali_allocation->cpu_mapping.vma) { -+ ret = mali_mem_os_resize_cpu_map_locked(mem_backend, mali_allocation->cpu_mapping.vma, mali_allocation->cpu_mapping.vma->vm_start + mem_backend->size, add_size); -+ if (unlikely(ret != _MALI_OSK_ERR_OK)) { -+ MALI_DEBUG_PRINT(2, ("_mali_ukk_mem_resize: cpu mapping failed !\n")); -+ goto failed_cpu_map; -+ } -+ } ++ vpfn += count; ++ remain -= count; + -+ /* Resize mali mapping */ -+ _mali_osk_mutex_wait(session->memory_lock); -+ ret = mali_mem_mali_map_resize(mali_allocation, physical_size); ++ kbase_mmu_sync_pgd(kctx->kbdev, ++ kbase_dma_addr(p) + (index * sizeof(u64)), ++ count * sizeof(u64)); + -+ if (ret) { -+ MALI_DEBUG_PRINT(1, ("_mali_ukk_mem_resize: mali map resize fail !\n")); -+ goto failed_gpu_map; -+ } ++ kunmap(p); ++ /* We have started modifying the page table. ++ * If further pages need inserting and fail we need to undo what ++ * has already taken place */ ++ recover_required = true; ++ recover_count += count; ++ } ++ mutex_unlock(&kctx->mmu_lock); ++ kbase_mmu_flush_invalidate(kctx, vpfn, nr, false); ++ return 0; + -+ ret = mali_mem_os_mali_map(&mem_backend->os_mem, session, mali_allocation->mali_vma_node.vm_node.start, -+ mali_allocation->psize / MALI_MMU_PAGE_SIZE, add_size / MALI_MMU_PAGE_SIZE, mali_allocation->mali_mapping.properties); -+ if (ret) { -+ MALI_DEBUG_PRINT(2, ("_mali_ukk_mem_resize: mali mapping failed !\n")); -+ goto failed_gpu_map; -+ } ++fail_unlock: ++ mutex_unlock(&kctx->mmu_lock); ++ kbase_mmu_flush_invalidate(kctx, vpfn, nr, false); ++ return err; ++} + -+ _mali_osk_mutex_signal(session->memory_lock); -+ } else { -+ u32 dec_size, page_count; -+ u32 vaddr = 0; -+ INIT_LIST_HEAD(&tmp_os_mem.pages); -+ tmp_os_mem.count = 0; ++int kbase_mmu_insert_pages_no_flush(struct kbase_context *kctx, u64 vpfn, ++ phys_addr_t *phys, size_t nr, ++ unsigned long flags) ++{ ++ phys_addr_t pgd; ++ u64 *pgd_page; ++ /* In case the insert_pages only partially completes we need to be able ++ * to recover */ ++ bool recover_required = false; ++ u64 recover_vpfn = vpfn; ++ size_t recover_count = 0; ++ size_t remain = nr; ++ int err; + -+ dec_size = mem_backend->size - physical_size; -+ MALI_DEBUG_ASSERT(0 == dec_size % MALI_MMU_PAGE_SIZE); ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ KBASE_DEBUG_ASSERT(0 != vpfn); ++ /* 64-bit address range is the max */ ++ KBASE_DEBUG_ASSERT(vpfn <= (U64_MAX / PAGE_SIZE)); + -+ page_count = dec_size / MALI_MMU_PAGE_SIZE; -+ vaddr = mali_allocation->mali_vma_node.vm_node.start + physical_size; ++ /* Early out if there is nothing to do */ ++ if (nr == 0) ++ return 0; + -+ /* Resize the memory of the backend */ -+ ret = mali_mem_os_resize_pages(&mem_backend->os_mem, &tmp_os_mem, physical_size / MALI_MMU_PAGE_SIZE, page_count); ++ mutex_lock(&kctx->mmu_lock); + -+ if (ret) { -+ MALI_DEBUG_PRINT(4, ("_mali_ukk_mem_resize: mali map resize failed!\n")); -+ goto failed_resize_pages; -+ } ++ while (remain) { ++ unsigned int i; ++ unsigned int index = vpfn & 0x1FF; ++ unsigned int count = KBASE_MMU_PAGE_ENTRIES - index; ++ struct page *p; + -+ /* Resize mali map */ -+ _mali_osk_mutex_wait(session->memory_lock); -+ mali_mem_mali_map_free(session, dec_size, vaddr, mali_allocation->flags); -+ _mali_osk_mutex_signal(session->memory_lock); ++ if (count > remain) ++ count = remain; + -+ /* Zap cpu mapping */ -+ if (0 != mali_allocation->cpu_mapping.addr) { -+ MALI_DEBUG_ASSERT(NULL != mali_allocation->cpu_mapping.vma); -+ zap_vma_ptes(mali_allocation->cpu_mapping.vma, mali_allocation->cpu_mapping.vma->vm_start + physical_size, dec_size); ++ /* ++ * Repeatedly calling mmu_get_bottom_pte() is clearly ++ * suboptimal. We don't have to re-parse the whole tree ++ * each time (just cache the l0-l2 sequence). ++ * On the other hand, it's only a gain when we map more than ++ * 256 pages at once (on average). Do we really care? ++ */ ++ do { ++ err = mmu_get_bottom_pgd(kctx, vpfn, &pgd); ++ if (err != -ENOMEM) ++ break; ++ /* Fill the memory pool with enough pages for ++ * the page walk to succeed ++ */ ++ mutex_unlock(&kctx->mmu_lock); ++ err = kbase_mem_pool_grow(&kctx->mem_pool, ++ MIDGARD_MMU_BOTTOMLEVEL); ++ mutex_lock(&kctx->mmu_lock); ++ } while (!err); ++ if (err) { ++ dev_warn(kctx->kbdev->dev, "kbase_mmu_insert_pages: mmu_get_bottom_pgd failure\n"); ++ if (recover_required) { ++ /* Invalidate the pages we have partially ++ * completed */ ++ mmu_insert_pages_failure_recovery(kctx, ++ recover_vpfn, ++ recover_count); ++ } ++ goto fail_unlock; + } + -+ /* Free those extra pages */ -+ mali_mem_os_free(&tmp_os_mem.pages, tmp_os_mem.count, MALI_FALSE); -+ } ++ p = pfn_to_page(PFN_DOWN(pgd)); ++ pgd_page = kmap(p); ++ if (!pgd_page) { ++ dev_warn(kctx->kbdev->dev, "kbase_mmu_insert_pages: kmap failure\n"); ++ if (recover_required) { ++ /* Invalidate the pages we have partially ++ * completed */ ++ mmu_insert_pages_failure_recovery(kctx, ++ recover_vpfn, ++ recover_count); ++ } ++ err = -ENOMEM; ++ goto fail_unlock; ++ } + -+ /* Resize memory allocation and memory backend */ -+ change_page_count = (s32)(physical_size - mem_backend->size) / MALI_MMU_PAGE_SIZE; -+ mali_allocation->psize = physical_size; -+ mem_backend->size = physical_size; -+ mutex_unlock(&mem_backend->mutex); ++ for (i = 0; i < count; i++) { ++ unsigned int ofs = index + i; + -+ if (change_page_count > 0) { -+ atomic_add(change_page_count, &session->mali_mem_allocated_pages); -+ if (atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE > session->max_mali_mem_allocated_size) { -+ session->max_mali_mem_allocated_size = atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE; ++ KBASE_DEBUG_ASSERT(0 == (pgd_page[ofs] & 1UL)); ++ kctx->kbdev->mmu_mode->entry_set_ate(&pgd_page[ofs], ++ phys[i], flags); + } + -+ } else { -+ atomic_sub((s32)(-change_page_count), &session->mali_mem_allocated_pages); -+ } ++ phys += count; ++ vpfn += count; ++ remain -= count; + -+ return _MALI_OSK_ERR_OK; ++ kbase_mmu_sync_pgd(kctx->kbdev, ++ kbase_dma_addr(p) + (index * sizeof(u64)), ++ count * sizeof(u64)); + -+failed_gpu_map: -+ _mali_osk_mutex_signal(session->memory_lock); -+failed_cpu_map: -+ if (physical_size > mem_backend->size) { -+ mali_mem_os_resize_pages(&mem_backend->os_mem, &tmp_os_mem, mem_backend->size / MALI_MMU_PAGE_SIZE, -+ (physical_size - mem_backend->size) / MALI_MMU_PAGE_SIZE); -+ } else { -+ mali_mem_os_resize_pages(&tmp_os_mem, &mem_backend->os_mem, 0, tmp_os_mem.count); ++ kunmap(p); ++ /* We have started modifying the page table. If further pages ++ * need inserting and fail we need to undo what has already ++ * taken place */ ++ recover_required = true; ++ recover_count += count; + } -+failed_resize_pages: -+ if (0 != tmp_os_mem.count) -+ mali_mem_os_free(&tmp_os_mem.pages, tmp_os_mem.count, MALI_FALSE); -+failed_alloc_memory: -+ -+ mutex_unlock(&mem_backend->mutex); -+ return ret; -+} + ++ mutex_unlock(&kctx->mmu_lock); ++ return 0; + -+/* Set GPU MMU properties */ -+static void _mali_memory_gpu_map_property_set(u32 *properties, u32 flags) -+{ -+ if (_MALI_MEMORY_GPU_READ_ALLOCATE & flags) { -+ *properties = MALI_MMU_FLAGS_FORCE_GP_READ_ALLOCATE; -+ } else { -+ *properties = MALI_MMU_FLAGS_DEFAULT; -+ } ++fail_unlock: ++ mutex_unlock(&kctx->mmu_lock); ++ return err; +} + -+_mali_osk_errcode_t mali_mem_add_mem_size(struct mali_session_data *session, u32 mali_addr, u32 add_size) ++/* ++ * Map 'nr' pages pointed to by 'phys' at GPU PFN 'vpfn' ++ */ ++int kbase_mmu_insert_pages(struct kbase_context *kctx, u64 vpfn, ++ phys_addr_t *phys, size_t nr, ++ unsigned long flags) +{ -+ mali_mem_backend *mem_backend = NULL; -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; -+ mali_mem_allocation *mali_allocation = NULL; -+ u32 new_physical_size; -+ MALI_DEBUG_ASSERT_POINTER(session); -+ MALI_DEBUG_ASSERT(0 == add_size % MALI_MMU_PAGE_SIZE); ++ int err; + -+ /* Get the memory backend that need to be resize. */ -+ mem_backend = mali_mem_backend_struct_search(session, mali_addr); ++ err = kbase_mmu_insert_pages_no_flush(kctx, vpfn, phys, nr, flags); ++ kbase_mmu_flush_invalidate(kctx, vpfn, nr, false); ++ return err; ++} + -+ if (NULL == mem_backend) { -+ MALI_DEBUG_PRINT(2, ("_mali_ukk_mem_resize: memory backend = NULL!\n")); -+ return ret; -+ } -+ -+ mali_allocation = mem_backend->mali_allocation; -+ -+ MALI_DEBUG_ASSERT_POINTER(mali_allocation); -+ -+ new_physical_size = add_size + mem_backend->size; -+ -+ if (new_physical_size > (mali_allocation->mali_vma_node.vm_node.size)) -+ return ret; -+ -+ MALI_DEBUG_ASSERT(new_physical_size != mem_backend->size); -+ -+ ret = mali_mem_resize(session, mem_backend, new_physical_size); -+ -+ return ret; -+} ++KBASE_EXPORT_TEST_API(kbase_mmu_insert_pages); + +/** -+* function@_mali_ukk_mem_allocate - allocate mali memory -+*/ -+_mali_osk_errcode_t _mali_ukk_mem_allocate(_mali_uk_alloc_mem_s *args) ++ * kbase_mmu_flush_invalidate_noretain() - Flush and invalidate the GPU caches ++ * without retaining the kbase context. ++ * @kctx: The KBase context. ++ * @vpfn: The virtual page frame number to start the flush on. ++ * @nr: The number of pages to flush. ++ * @sync: Set if the operation should be synchronous or not. ++ * ++ * As per kbase_mmu_flush_invalidate but doesn't retain the kctx or do any ++ * other locking. ++ */ ++static void kbase_mmu_flush_invalidate_noretain(struct kbase_context *kctx, ++ u64 vpfn, size_t nr, bool sync) +{ -+ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; -+ mali_mem_backend *mem_backend = NULL; -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; -+ int retval = 0; -+ mali_mem_allocation *mali_allocation = NULL; -+ struct mali_vma_node *mali_vma_node = NULL; -+ -+ MALI_DEBUG_PRINT(4, (" _mali_ukk_mem_allocate, vaddr=0x%x, size =0x%x! \n", args->gpu_vaddr, args->psize)); ++ struct kbase_device *kbdev = kctx->kbdev; ++ int err; ++ u32 op; + -+ /* Check if the address is allocated -+ */ -+ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, args->gpu_vaddr, 0); ++ /* Early out if there is nothing to do */ ++ if (nr == 0) ++ return; + -+ if (unlikely(mali_vma_node)) { -+ MALI_DEBUG_PRINT_ERROR(("The mali virtual address has already been used ! \n")); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ /** -+ *create mali memory allocation -+ */ ++ if (sync) ++ op = AS_COMMAND_FLUSH_MEM; ++ else ++ op = AS_COMMAND_FLUSH_PT; + -+ mali_allocation = mali_mem_allocation_struct_create(session); ++ err = kbase_mmu_hw_do_operation(kbdev, ++ &kbdev->as[kctx->as_nr], ++ kctx, vpfn, nr, op, 0); ++#if KBASE_GPU_RESET_EN ++ if (err) { ++ /* Flush failed to complete, assume the ++ * GPU has hung and perform a reset to ++ * recover */ ++ dev_err(kbdev->dev, "Flush for GPU page table update did not complete. Issuing GPU soft-reset to recover\n"); + -+ if (mali_allocation == NULL) { -+ MALI_DEBUG_PRINT(1, ("_mali_ukk_mem_allocate: Failed to create allocation struct! \n")); -+ return _MALI_OSK_ERR_NOMEM; ++ if (kbase_prepare_to_reset_gpu_locked(kbdev)) ++ kbase_reset_gpu_locked(kbdev); + } -+ mali_allocation->psize = args->psize; -+ mali_allocation->vsize = args->vsize; ++#endif /* KBASE_GPU_RESET_EN */ + -+ /* MALI_MEM_OS if need to support mem resize, -+ * or MALI_MEM_BLOCK if have dedicated memory, -+ * or MALI_MEM_OS, -+ * or MALI_MEM_SWAP. ++#ifndef CONFIG_MALI_NO_MALI ++ /* ++ * As this function could be called in interrupt context the sync ++ * request can't block. Instead log the request and the next flush ++ * request will pick it up. + */ -+ if (args->flags & _MALI_MEMORY_ALLOCATE_SWAPPABLE) { -+ mali_allocation->type = MALI_MEM_SWAP; -+ } else if (args->flags & _MALI_MEMORY_ALLOCATE_RESIZEABLE) { -+ mali_allocation->type = MALI_MEM_OS; -+ mali_allocation->flags |= MALI_MEM_FLAG_CAN_RESIZE; -+ } else if (args->flags & _MALI_MEMORY_ALLOCATE_SECURE) { -+ mali_allocation->type = MALI_MEM_SECURE; -+ } else if (MALI_TRUE == mali_memory_have_dedicated_memory()) { -+ mali_allocation->type = MALI_MEM_BLOCK; -+ } else { -+ mali_allocation->type = MALI_MEM_OS; -+ } -+ -+ /** -+ *add allocation node to RB tree for index -+ */ -+ mali_allocation->mali_vma_node.vm_node.start = args->gpu_vaddr; -+ mali_allocation->mali_vma_node.vm_node.size = args->vsize; -+ -+ mali_vma_offset_add(&session->allocation_mgr, &mali_allocation->mali_vma_node); ++ if ((!err) && sync && ++ kbase_hw_has_issue(kctx->kbdev, BASE_HW_ISSUE_6367)) ++ atomic_set(&kctx->drain_pending, 1); ++#endif /* !CONFIG_MALI_NO_MALI */ ++} + -+ mali_allocation->backend_handle = mali_mem_backend_struct_create(&mem_backend, args->psize); -+ if (mali_allocation->backend_handle < 0) { -+ ret = _MALI_OSK_ERR_NOMEM; -+ MALI_DEBUG_PRINT(1, ("mali_allocation->backend_handle < 0! \n")); -+ goto failed_alloc_backend; -+ } ++static void kbase_mmu_flush_invalidate(struct kbase_context *kctx, ++ u64 vpfn, size_t nr, bool sync) ++{ ++ struct kbase_device *kbdev; ++ bool ctx_is_in_runpool; ++#ifndef CONFIG_MALI_NO_MALI ++ bool drain_pending = false; + ++ if (atomic_xchg(&kctx->drain_pending, 0)) ++ drain_pending = true; ++#endif /* !CONFIG_MALI_NO_MALI */ + -+ mem_backend->mali_allocation = mali_allocation; -+ mem_backend->type = mali_allocation->type; ++ /* Early out if there is nothing to do */ ++ if (nr == 0) ++ return; + -+ mali_allocation->mali_mapping.addr = args->gpu_vaddr; ++ kbdev = kctx->kbdev; ++ mutex_lock(&kbdev->js_data.queue_mutex); ++ ctx_is_in_runpool = kbasep_js_runpool_retain_ctx(kbdev, kctx); ++ mutex_unlock(&kbdev->js_data.queue_mutex); + -+ /* set gpu mmu propery */ -+ _mali_memory_gpu_map_property_set(&mali_allocation->mali_mapping.properties, args->flags); -+ /* do prepare for MALI mapping */ -+ if (!(args->flags & _MALI_MEMORY_ALLOCATE_NO_BIND_GPU) && mali_allocation->psize > 0) { -+ _mali_osk_mutex_wait(session->memory_lock); ++ if (ctx_is_in_runpool) { ++ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); + -+ ret = mali_mem_mali_map_prepare(mali_allocation); -+ if (0 != ret) { -+ _mali_osk_mutex_signal(session->memory_lock); -+ goto failed_prepare_map; -+ } -+ _mali_osk_mutex_signal(session->memory_lock); -+ } ++ if (!kbase_pm_context_active_handle_suspend(kbdev, ++ KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE)) { ++ int err; ++ u32 op; + -+ if (mali_allocation->psize == 0) { -+ mem_backend->os_mem.count = 0; -+ INIT_LIST_HEAD(&mem_backend->os_mem.pages); -+ goto done; -+ } ++ /* AS transaction begin */ ++ mutex_lock(&kbdev->mmu_hw_mutex); + -+ if (args->flags & _MALI_MEMORY_ALLOCATE_DEFER_BIND) { -+ mali_allocation->flags |= _MALI_MEMORY_ALLOCATE_DEFER_BIND; -+ mem_backend->flags |= MALI_MEM_BACKEND_FLAG_NOT_BINDED; -+ /* init for defer bind backend*/ -+ mem_backend->os_mem.count = 0; -+ INIT_LIST_HEAD(&mem_backend->os_mem.pages); ++ if (sync) ++ op = AS_COMMAND_FLUSH_MEM; ++ else ++ op = AS_COMMAND_FLUSH_PT; + -+ goto done; -+ } ++ err = kbase_mmu_hw_do_operation(kbdev, ++ &kbdev->as[kctx->as_nr], ++ kctx, vpfn, nr, op, 0); + -+ if (likely(mali_allocation->psize > 0)) { ++#if KBASE_GPU_RESET_EN ++ if (err) { ++ /* Flush failed to complete, assume the ++ * GPU has hung and perform a reset to ++ * recover */ ++ dev_err(kbdev->dev, "Flush for GPU page table update did not complete. Issueing GPU soft-reset to recover\n"); + -+ if (MALI_MEM_SECURE == mem_backend->type) { -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+ ret = mali_mem_secure_attach_dma_buf(&mem_backend->secure_mem, mem_backend->size, args->secure_shared_fd); -+ if (_MALI_OSK_ERR_OK != ret) { -+ MALI_DEBUG_PRINT(1, ("Failed to attach dma buf for secure memory! \n")); -+ goto failed_alloc_pages; ++ if (kbase_prepare_to_reset_gpu(kbdev)) ++ kbase_reset_gpu(kbdev); + } -+#else -+ ret = _MALI_OSK_ERR_UNSUPPORTED; -+ MALI_DEBUG_PRINT(1, ("DMA not supported for mali secure memory! \n")); -+ goto failed_alloc_pages; -+#endif -+ } else { ++#endif /* KBASE_GPU_RESET_EN */ + -+ /** -+ *allocate physical memory -+ */ -+ if (mem_backend->type == MALI_MEM_OS) { -+ retval = mali_mem_os_alloc_pages(&mem_backend->os_mem, mem_backend->size); -+ } else if (mem_backend->type == MALI_MEM_BLOCK) { -+ /* try to allocated from BLOCK memory first, then try OS memory if failed.*/ -+ if (mali_mem_block_alloc(&mem_backend->block_mem, mem_backend->size)) { -+ retval = mali_mem_os_alloc_pages(&mem_backend->os_mem, mem_backend->size); -+ mem_backend->type = MALI_MEM_OS; -+ mali_allocation->type = MALI_MEM_OS; -+ } -+ } else if (MALI_MEM_SWAP == mem_backend->type) { -+ retval = mali_mem_swap_alloc_pages(&mem_backend->swap_mem, mali_allocation->mali_vma_node.vm_node.size, &mem_backend->start_idx); -+ } else { -+ /* ONLY support mem_os type */ -+ MALI_DEBUG_ASSERT(0); -+ } ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++ /* AS transaction end */ + -+ if (retval) { -+ ret = _MALI_OSK_ERR_NOMEM; -+ MALI_DEBUG_PRINT(1, (" can't allocate enough pages! \n")); -+ goto failed_alloc_pages; ++#ifndef CONFIG_MALI_NO_MALI ++ /* ++ * The transaction lock must be dropped before here ++ * as kbase_wait_write_flush could take it if ++ * the GPU was powered down (static analysis doesn't ++ * know this can't happen). ++ */ ++ drain_pending |= (!err) && sync && ++ kbase_hw_has_issue(kctx->kbdev, ++ BASE_HW_ISSUE_6367); ++ if (drain_pending) { ++ /* Wait for GPU to flush write buffer */ ++ kbase_wait_write_flush(kctx); + } -+ } -+ } -+ -+ /** -+ *map to GPU side -+ */ -+ if (!(args->flags & _MALI_MEMORY_ALLOCATE_NO_BIND_GPU) && mali_allocation->psize > 0) { -+ _mali_osk_mutex_wait(session->memory_lock); -+ /* Map on Mali */ -+ -+ if (mem_backend->type == MALI_MEM_OS) { -+ ret = mali_mem_os_mali_map(&mem_backend->os_mem, session, args->gpu_vaddr, 0, -+ mem_backend->size / MALI_MMU_PAGE_SIZE, mali_allocation->mali_mapping.properties); ++#endif /* !CONFIG_MALI_NO_MALI */ + -+ } else if (mem_backend->type == MALI_MEM_BLOCK) { -+ mali_mem_block_mali_map(&mem_backend->block_mem, session, args->gpu_vaddr, -+ mali_allocation->mali_mapping.properties); -+ } else if (mem_backend->type == MALI_MEM_SWAP) { -+ ret = mali_mem_swap_mali_map(&mem_backend->swap_mem, session, args->gpu_vaddr, -+ mali_allocation->mali_mapping.properties); -+ } else if (mem_backend->type == MALI_MEM_SECURE) { -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+ ret = mali_mem_secure_mali_map(&mem_backend->secure_mem, session, args->gpu_vaddr, mali_allocation->mali_mapping.properties); -+#endif -+ } else { /* unsupport type */ -+ MALI_DEBUG_ASSERT(0); ++ kbase_pm_context_idle(kbdev); + } -+ -+ _mali_osk_mutex_signal(session->memory_lock); -+ } -+done: -+ if (MALI_MEM_OS == mem_backend->type) { -+ atomic_add(mem_backend->os_mem.count, &session->mali_mem_allocated_pages); -+ } else if (MALI_MEM_BLOCK == mem_backend->type) { -+ atomic_add(mem_backend->block_mem.count, &session->mali_mem_allocated_pages); -+ } else if (MALI_MEM_SECURE == mem_backend->type) { -+ atomic_add(mem_backend->secure_mem.count, &session->mali_mem_allocated_pages); -+ } else { -+ MALI_DEBUG_ASSERT(MALI_MEM_SWAP == mem_backend->type); -+ atomic_add(mem_backend->swap_mem.count, &session->mali_mem_allocated_pages); -+ atomic_add(mem_backend->swap_mem.count, &session->mali_mem_array[mem_backend->type]); ++ kbasep_js_runpool_release_ctx(kbdev, kctx); + } ++} + -+ if (atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE > session->max_mali_mem_allocated_size) { -+ session->max_mali_mem_allocated_size = atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE; -+ } -+ return _MALI_OSK_ERR_OK; ++void kbase_mmu_update(struct kbase_context *kctx) ++{ ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); ++ lockdep_assert_held(&kctx->kbdev->mmu_hw_mutex); ++ /* ASSERT that the context has a valid as_nr, which is only the case ++ * when it's scheduled in. ++ * ++ * as_nr won't change because the caller has the hwaccess_lock */ ++ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); + -+failed_alloc_pages: -+ mali_mem_mali_map_free(session, mali_allocation->psize, mali_allocation->mali_vma_node.vm_node.start, mali_allocation->flags); -+failed_prepare_map: -+ mali_mem_backend_struct_destory(&mem_backend, mali_allocation->backend_handle); -+failed_alloc_backend: ++ kctx->kbdev->mmu_mode->update(kctx); ++} ++KBASE_EXPORT_TEST_API(kbase_mmu_update); + -+ mali_vma_offset_remove(&session->allocation_mgr, &mali_allocation->mali_vma_node); -+ mali_mem_allocation_struct_destory(mali_allocation); ++void kbase_mmu_disable_as(struct kbase_device *kbdev, int as_nr) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ lockdep_assert_held(&kbdev->mmu_hw_mutex); + -+ return ret; ++ kbdev->mmu_mode->disable_as(kbdev, as_nr); +} + -+ -+_mali_osk_errcode_t _mali_ukk_mem_free(_mali_uk_free_mem_s *args) ++void kbase_mmu_disable(struct kbase_context *kctx) +{ -+ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; -+ u32 vaddr = args->gpu_vaddr; -+ mali_mem_allocation *mali_alloc = NULL; -+ struct mali_vma_node *mali_vma_node = NULL; ++ /* ASSERT that the context has a valid as_nr, which is only the case ++ * when it's scheduled in. ++ * ++ * as_nr won't change because the caller has the hwaccess_lock */ ++ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); + -+ /* find mali allocation structure by vaddress*/ -+ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, vaddr, 0); -+ if (NULL == mali_vma_node) { -+ MALI_DEBUG_PRINT(1, ("_mali_ukk_mem_free: invalid addr: 0x%x\n", vaddr)); -+ return _MALI_OSK_ERR_INVALID_ARGS; -+ } -+ MALI_DEBUG_ASSERT(NULL != mali_vma_node); -+ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); ++ lockdep_assert_held(&kctx->kbdev->hwaccess_lock); + -+ if (mali_alloc) -+ /* check ref_count */ -+ args->free_pages_nr = mali_allocation_unref(&mali_alloc); ++ /* ++ * The address space is being disabled, drain all knowledge of it out ++ * from the caches as pages and page tables might be freed after this. ++ * ++ * The job scheduler code will already be holding the locks and context ++ * so just do the flush. ++ */ ++ kbase_mmu_flush_invalidate_noretain(kctx, 0, ~0, true); + -+ return _MALI_OSK_ERR_OK; ++ kctx->kbdev->mmu_mode->disable_as(kctx->kbdev, kctx->as_nr); +} ++KBASE_EXPORT_TEST_API(kbase_mmu_disable); + -+ -+/** -+* Function _mali_ukk_mem_bind -- bind a external memory to a new GPU address -+* It will allocate a new mem allocation and bind external memory to it. -+* Supported backend type are: -+* _MALI_MEMORY_BIND_BACKEND_UMP -+* _MALI_MEMORY_BIND_BACKEND_DMA_BUF -+* _MALI_MEMORY_BIND_BACKEND_EXTERNAL_MEMORY -+* CPU access is not supported yet -+*/ -+_mali_osk_errcode_t _mali_ukk_mem_bind(_mali_uk_bind_mem_s *args) ++/* ++ * We actually only discard the ATE, and not the page table ++ * pages. There is a potential DoS here, as we'll leak memory by ++ * having PTEs that are potentially unused. Will require physical ++ * page accounting, so MMU pages are part of the process allocation. ++ * ++ * IMPORTANT: This uses kbasep_js_runpool_release_ctx() when the context is ++ * currently scheduled into the runpool, and so potentially uses a lot of locks. ++ * These locks must be taken in the correct order with respect to others ++ * already held by the caller. Refer to kbasep_js_runpool_release_ctx() for more ++ * information. ++ */ ++int kbase_mmu_teardown_pages(struct kbase_context *kctx, u64 vpfn, size_t nr) +{ -+ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; -+ mali_mem_backend *mem_backend = NULL; -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; -+ mali_mem_allocation *mali_allocation = NULL; -+ MALI_DEBUG_PRINT(5, (" _mali_ukk_mem_bind, vaddr=0x%x, size =0x%x! \n", args->vaddr, args->size)); ++ phys_addr_t pgd; ++ u64 *pgd_page; ++ struct kbase_device *kbdev; ++ size_t requested_nr = nr; ++ struct kbase_mmu_mode const *mmu_mode; ++ int err; + -+ /** -+ * allocate mali allocation. -+ */ -+ mali_allocation = mali_mem_allocation_struct_create(session); ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ beenthere(kctx, "kctx %p vpfn %lx nr %zd", (void *)kctx, (unsigned long)vpfn, nr); + -+ if (mali_allocation == NULL) { -+ return _MALI_OSK_ERR_NOMEM; ++ if (0 == nr) { ++ /* early out if nothing to do */ ++ return 0; + } -+ mali_allocation->psize = args->size; -+ mali_allocation->vsize = args->size; -+ mali_allocation->mali_mapping.addr = args->vaddr; + -+ /* add allocation node to RB tree for index */ -+ mali_allocation->mali_vma_node.vm_node.start = args->vaddr; -+ mali_allocation->mali_vma_node.vm_node.size = args->size; -+ mali_vma_offset_add(&session->allocation_mgr, &mali_allocation->mali_vma_node); ++ mutex_lock(&kctx->mmu_lock); + -+ /* allocate backend*/ -+ if (mali_allocation->psize > 0) { -+ mali_allocation->backend_handle = mali_mem_backend_struct_create(&mem_backend, mali_allocation->psize); -+ if (mali_allocation->backend_handle < 0) { -+ goto Failed_alloc_backend; -+ } ++ kbdev = kctx->kbdev; ++ mmu_mode = kbdev->mmu_mode; + -+ } else { -+ goto Failed_alloc_backend; -+ } ++ while (nr) { ++ unsigned int i; ++ unsigned int index = vpfn & 0x1FF; ++ unsigned int count = KBASE_MMU_PAGE_ENTRIES - index; ++ struct page *p; + -+ mem_backend->size = mali_allocation->psize; -+ mem_backend->mali_allocation = mali_allocation; ++ if (count > nr) ++ count = nr; + -+ switch (args->flags & _MALI_MEMORY_BIND_BACKEND_MASK) { -+ case _MALI_MEMORY_BIND_BACKEND_UMP: -+#if defined(CONFIG_MALI400_UMP) -+ mali_allocation->type = MALI_MEM_UMP; -+ mem_backend->type = MALI_MEM_UMP; -+ ret = mali_mem_bind_ump_buf(mali_allocation, mem_backend, -+ args->mem_union.bind_ump.secure_id, args->mem_union.bind_ump.flags); -+ if (_MALI_OSK_ERR_OK != ret) { -+ MALI_DEBUG_PRINT(1, ("Bind ump buf failed\n")); -+ goto Failed_bind_backend; -+ } -+#else -+ MALI_DEBUG_PRINT(1, ("UMP not supported\n")); -+ goto Failed_bind_backend; -+#endif -+ break; -+ case _MALI_MEMORY_BIND_BACKEND_DMA_BUF: -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+ mali_allocation->type = MALI_MEM_DMA_BUF; -+ mem_backend->type = MALI_MEM_DMA_BUF; -+ ret = mali_mem_bind_dma_buf(mali_allocation, mem_backend, -+ args->mem_union.bind_dma_buf.mem_fd, args->mem_union.bind_dma_buf.flags); -+ if (_MALI_OSK_ERR_OK != ret) { -+ MALI_DEBUG_PRINT(1, ("Bind dma buf failed\n")); -+ goto Failed_bind_backend; ++ err = mmu_get_bottom_pgd(kctx, vpfn, &pgd); ++ if (err) { ++ dev_warn(kbdev->dev, "kbase_mmu_teardown_pages: mmu_get_bottom_pgd failure\n"); ++ err = -EINVAL; ++ goto fail_unlock; + } -+#else -+ MALI_DEBUG_PRINT(1, ("DMA not supported\n")); -+ goto Failed_bind_backend; -+#endif -+ break; -+ case _MALI_MEMORY_BIND_BACKEND_MALI_MEMORY: -+ /* not allowed */ -+ MALI_DEBUG_PRINT_ERROR(("Mali internal memory type not supported !\n")); -+ goto Failed_bind_backend; -+ break; + -+ case _MALI_MEMORY_BIND_BACKEND_EXTERNAL_MEMORY: -+ mali_allocation->type = MALI_MEM_EXTERNAL; -+ mem_backend->type = MALI_MEM_EXTERNAL; -+ ret = mali_mem_bind_ext_buf(mali_allocation, mem_backend, args->mem_union.bind_ext_memory.phys_addr, -+ args->mem_union.bind_ext_memory.flags); -+ if (_MALI_OSK_ERR_OK != ret) { -+ MALI_DEBUG_PRINT(1, ("Bind external buf failed\n")); -+ goto Failed_bind_backend; ++ p = pfn_to_page(PFN_DOWN(pgd)); ++ pgd_page = kmap(p); ++ if (!pgd_page) { ++ dev_warn(kbdev->dev, "kbase_mmu_teardown_pages: kmap failure\n"); ++ err = -ENOMEM; ++ goto fail_unlock; + } -+ break; + -+ case _MALI_MEMORY_BIND_BACKEND_EXT_COW: -+ /* not allowed */ -+ MALI_DEBUG_PRINT_ERROR(("External cow memory type not supported !\n")); -+ goto Failed_bind_backend; -+ break; ++ for (i = 0; i < count; i++) ++ mmu_mode->entry_invalidate(&pgd_page[index + i]); + -+ default: -+ MALI_DEBUG_PRINT_ERROR(("Invalid memory type not supported !\n")); -+ goto Failed_bind_backend; -+ break; -+ } -+ MALI_DEBUG_ASSERT(0 == mem_backend->size % MALI_MMU_PAGE_SIZE); -+ atomic_add(mem_backend->size / MALI_MMU_PAGE_SIZE, &session->mali_mem_array[mem_backend->type]); -+ return _MALI_OSK_ERR_OK; ++ vpfn += count; ++ nr -= count; + -+Failed_bind_backend: -+ mali_mem_backend_struct_destory(&mem_backend, mali_allocation->backend_handle); ++ kbase_mmu_sync_pgd(kctx->kbdev, ++ kbase_dma_addr(p) + (index * sizeof(u64)), ++ count * sizeof(u64)); + -+Failed_alloc_backend: -+ mali_vma_offset_remove(&session->allocation_mgr, &mali_allocation->mali_vma_node); -+ mali_mem_allocation_struct_destory(mali_allocation); ++ kunmap(p); ++ } + -+ MALI_DEBUG_PRINT(1, (" _mali_ukk_mem_bind, return ERROR! \n")); -+ return ret; ++ mutex_unlock(&kctx->mmu_lock); ++ kbase_mmu_flush_invalidate(kctx, vpfn, requested_nr, true); ++ return 0; ++ ++fail_unlock: ++ mutex_unlock(&kctx->mmu_lock); ++ kbase_mmu_flush_invalidate(kctx, vpfn, requested_nr, true); ++ return err; +} + ++KBASE_EXPORT_TEST_API(kbase_mmu_teardown_pages); + -+/* -+* Function _mali_ukk_mem_unbind -- unbind a external memory to a new GPU address -+* This function unbind the backend memory and free the allocation -+* no ref_count for this type of memory -+*/ -+_mali_osk_errcode_t _mali_ukk_mem_unbind(_mali_uk_unbind_mem_s *args) ++/** ++ * Update the entries for specified number of pages pointed to by 'phys' at GPU PFN 'vpfn'. ++ * This call is being triggered as a response to the changes of the mem attributes ++ * ++ * @pre : The caller is responsible for validating the memory attributes ++ * ++ * IMPORTANT: This uses kbasep_js_runpool_release_ctx() when the context is ++ * currently scheduled into the runpool, and so potentially uses a lot of locks. ++ * These locks must be taken in the correct order with respect to others ++ * already held by the caller. Refer to kbasep_js_runpool_release_ctx() for more ++ * information. ++ */ ++int kbase_mmu_update_pages(struct kbase_context *kctx, u64 vpfn, phys_addr_t *phys, size_t nr, unsigned long flags) +{ -+ /**/ -+ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; -+ mali_mem_allocation *mali_allocation = NULL; -+ struct mali_vma_node *mali_vma_node = NULL; -+ u32 mali_addr = args->vaddr; -+ MALI_DEBUG_PRINT(5, (" _mali_ukk_mem_unbind, vaddr=0x%x! \n", args->vaddr)); -+ -+ /* find the allocation by vaddr */ -+ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, mali_addr, 0); -+ if (likely(mali_vma_node)) { -+ MALI_DEBUG_ASSERT(mali_addr == mali_vma_node->vm_node.start); -+ mali_allocation = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); -+ } else { -+ MALI_DEBUG_ASSERT(NULL != mali_vma_node); -+ return _MALI_OSK_ERR_INVALID_ARGS; -+ } ++ phys_addr_t pgd; ++ u64 *pgd_page; ++ size_t requested_nr = nr; ++ struct kbase_mmu_mode const *mmu_mode; ++ int err; + -+ if (NULL != mali_allocation) -+ /* check ref_count */ -+ mali_allocation_unref(&mali_allocation); -+ return _MALI_OSK_ERR_OK; -+} ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ KBASE_DEBUG_ASSERT(0 != vpfn); ++ KBASE_DEBUG_ASSERT(vpfn <= (U64_MAX / PAGE_SIZE)); + -+/* -+* Function _mali_ukk_mem_cow -- COW for an allocation -+* This function allocate new pages for a range (range, range+size) of allocation -+* And Map it(keep use the not in range pages from target allocation ) to an GPU vaddr -+*/ -+_mali_osk_errcode_t _mali_ukk_mem_cow(_mali_uk_cow_mem_s *args) -+{ -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; -+ mali_mem_backend *target_backend = NULL; -+ mali_mem_backend *mem_backend = NULL; -+ struct mali_vma_node *mali_vma_node = NULL; -+ mali_mem_allocation *mali_allocation = NULL; ++ /* Early out if there is nothing to do */ ++ if (nr == 0) ++ return 0; + -+ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; -+ /* Get the target backend for cow */ -+ target_backend = mali_mem_backend_struct_search(session, args->target_handle); ++ mutex_lock(&kctx->mmu_lock); + -+ if (NULL == target_backend || 0 == target_backend->size) { -+ MALI_DEBUG_ASSERT_POINTER(target_backend); -+ MALI_DEBUG_ASSERT(0 != target_backend->size); -+ return ret; -+ } ++ mmu_mode = kctx->kbdev->mmu_mode; + -+ /*Cow not support resized mem */ -+ MALI_DEBUG_ASSERT(MALI_MEM_FLAG_CAN_RESIZE != (MALI_MEM_FLAG_CAN_RESIZE & target_backend->mali_allocation->flags)); ++ dev_warn(kctx->kbdev->dev, "kbase_mmu_update_pages(): updating page share flags on GPU PFN 0x%llx from phys %p, %zu pages", ++ vpfn, phys, nr); + -+ /* Check if the new mali address is allocated */ -+ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, args->vaddr, 0); ++ while (nr) { ++ unsigned int i; ++ unsigned int index = vpfn & 0x1FF; ++ size_t count = KBASE_MMU_PAGE_ENTRIES - index; ++ struct page *p; + -+ if (unlikely(mali_vma_node)) { -+ MALI_DEBUG_PRINT_ERROR(("The mali virtual address has already been used ! \n")); -+ return ret; -+ } ++ if (count > nr) ++ count = nr; + -+ /* create new alloction for COW*/ -+ mali_allocation = mali_mem_allocation_struct_create(session); -+ if (mali_allocation == NULL) { -+ MALI_DEBUG_PRINT(1, ("_mali_ukk_mem_cow: Failed to create allocation struct!\n")); -+ return _MALI_OSK_ERR_NOMEM; -+ } -+ mali_allocation->psize = args->target_size; -+ mali_allocation->vsize = args->target_size; -+ mali_allocation->type = MALI_MEM_COW; ++ do { ++ err = mmu_get_bottom_pgd(kctx, vpfn, &pgd); ++ if (err != -ENOMEM) ++ break; ++ /* Fill the memory pool with enough pages for ++ * the page walk to succeed ++ */ ++ mutex_unlock(&kctx->mmu_lock); ++ err = kbase_mem_pool_grow(&kctx->mem_pool, ++ MIDGARD_MMU_BOTTOMLEVEL); ++ mutex_lock(&kctx->mmu_lock); ++ } while (!err); ++ if (err) { ++ dev_warn(kctx->kbdev->dev, "mmu_get_bottom_pgd failure\n"); ++ goto fail_unlock; ++ } + -+ /*add allocation node to RB tree for index*/ -+ mali_allocation->mali_vma_node.vm_node.start = args->vaddr; -+ mali_allocation->mali_vma_node.vm_node.size = mali_allocation->vsize; -+ mali_vma_offset_add(&session->allocation_mgr, &mali_allocation->mali_vma_node); ++ p = pfn_to_page(PFN_DOWN(pgd)); ++ pgd_page = kmap(p); ++ if (!pgd_page) { ++ dev_warn(kctx->kbdev->dev, "kmap failure\n"); ++ err = -ENOMEM; ++ goto fail_unlock; ++ } + -+ /* create new backend for COW memory */ -+ mali_allocation->backend_handle = mali_mem_backend_struct_create(&mem_backend, mali_allocation->psize); -+ if (mali_allocation->backend_handle < 0) { -+ ret = _MALI_OSK_ERR_NOMEM; -+ MALI_DEBUG_PRINT(1, ("mali_allocation->backend_handle < 0! \n")); -+ goto failed_alloc_backend; -+ } -+ mem_backend->mali_allocation = mali_allocation; -+ mem_backend->type = mali_allocation->type; ++ for (i = 0; i < count; i++) ++ mmu_mode->entry_set_ate(&pgd_page[index + i], phys[i], ++ flags); + -+ if (target_backend->type == MALI_MEM_SWAP || -+ (MALI_MEM_COW == target_backend->type && (MALI_MEM_BACKEND_FLAG_SWAP_COWED & target_backend->flags))) { -+ mem_backend->flags |= MALI_MEM_BACKEND_FLAG_SWAP_COWED; -+ /** -+ * CoWed swap backends couldn't be mapped as non-linear vma, because if one -+ * vma is set with flag VM_NONLINEAR, the vma->vm_private_data will be used by kernel, -+ * while in mali driver, we use this variable to store the pointer of mali_allocation, so there -+ * is a conflict. -+ * To resolve this problem, we have to do some fake things, we reserved about 64MB -+ * space from index 0, there isn't really page's index will be set from 0 to (64MB>>PAGE_SHIFT_NUM), -+ * and all of CoWed swap memory backends' start_idx will be assigned with 0, and these -+ * backends will be mapped as linear and will add to priority tree of global swap file, while -+ * these vmas will never be found by using normal page->index, these pages in those vma -+ * also couldn't be swapped out. -+ */ -+ mem_backend->start_idx = 0; -+ } ++ phys += count; ++ vpfn += count; ++ nr -= count; + -+ /* Add the target backend's cow count, also allocate new pages for COW backend from os mem -+ *for a modified range and keep the page which not in the modified range and Add ref to it -+ */ -+ MALI_DEBUG_PRINT(3, ("Cow mapping: target_addr: 0x%x; cow_addr: 0x%x, size: %u\n", target_backend->mali_allocation->mali_vma_node.vm_node.start, -+ mali_allocation->mali_vma_node.vm_node.start, mali_allocation->mali_vma_node.vm_node.size)); ++ kbase_mmu_sync_pgd(kctx->kbdev, ++ kbase_dma_addr(p) + (index * sizeof(u64)), ++ count * sizeof(u64)); + -+ ret = mali_memory_do_cow(target_backend, args->target_offset, args->target_size, mem_backend, args->range_start, args->range_size); -+ if (_MALI_OSK_ERR_OK != ret) { -+ MALI_DEBUG_PRINT(1, ("_mali_ukk_mem_cow: Failed to cow!\n")); -+ goto failed_do_cow; ++ kunmap(pfn_to_page(PFN_DOWN(pgd))); + } + -+ /** -+ *map to GPU side -+ */ -+ mali_allocation->mali_mapping.addr = args->vaddr; -+ /* set gpu mmu propery */ -+ _mali_memory_gpu_map_property_set(&mali_allocation->mali_mapping.properties, args->flags); ++ mutex_unlock(&kctx->mmu_lock); ++ kbase_mmu_flush_invalidate(kctx, vpfn, requested_nr, true); ++ return 0; + -+ _mali_osk_mutex_wait(session->memory_lock); -+ /* Map on Mali */ -+ ret = mali_mem_mali_map_prepare(mali_allocation); -+ if (0 != ret) { -+ MALI_DEBUG_PRINT(1, (" prepare map fail! \n")); -+ goto failed_gpu_map; -+ } ++fail_unlock: ++ mutex_unlock(&kctx->mmu_lock); ++ kbase_mmu_flush_invalidate(kctx, vpfn, requested_nr, true); ++ return err; ++} + -+ if (!(mem_backend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED)) { -+ mali_mem_cow_mali_map(mem_backend, 0, mem_backend->size); -+ } ++/* This is a debug feature only */ ++static void mmu_check_unused(struct kbase_context *kctx, phys_addr_t pgd) ++{ ++ u64 *page; ++ int i; + -+ _mali_osk_mutex_signal(session->memory_lock); ++ lockdep_assert_held(&kctx->reg_lock); + -+ mutex_lock(&target_backend->mutex); -+ target_backend->flags |= MALI_MEM_BACKEND_FLAG_COWED; -+ mutex_unlock(&target_backend->mutex); ++ page = kmap_atomic(pfn_to_page(PFN_DOWN(pgd))); ++ /* kmap_atomic should NEVER fail. */ ++ KBASE_DEBUG_ASSERT(NULL != page); + -+ atomic_add(args->range_size / MALI_MMU_PAGE_SIZE, &session->mali_mem_allocated_pages); -+ if (atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE > session->max_mali_mem_allocated_size) { -+ session->max_mali_mem_allocated_size = atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE; ++ for (i = 0; i < KBASE_MMU_PAGE_ENTRIES; i++) { ++ if (kctx->kbdev->mmu_mode->ate_is_valid(page[i])) ++ beenthere(kctx, "live pte %016lx", (unsigned long)page[i]); + } -+ return _MALI_OSK_ERR_OK; -+ -+failed_gpu_map: -+ _mali_osk_mutex_signal(session->memory_lock); -+ mali_mem_cow_release(mem_backend, MALI_FALSE); -+ mem_backend->cow_mem.count = 0; -+failed_do_cow: -+ mali_mem_backend_struct_destory(&mem_backend, mali_allocation->backend_handle); -+failed_alloc_backend: -+ mali_vma_offset_remove(&session->allocation_mgr, &mali_allocation->mali_vma_node); -+ mali_mem_allocation_struct_destory(mali_allocation); -+ -+ return ret; ++ kunmap_atomic(page); +} + -+_mali_osk_errcode_t _mali_ukk_mem_cow_modify_range(_mali_uk_cow_modify_range_s *args) ++static void mmu_teardown_level(struct kbase_context *kctx, phys_addr_t pgd, int level, int zap, u64 *pgd_page_buffer) +{ -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; -+ mali_mem_backend *mem_backend = NULL; -+ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; ++ phys_addr_t target_pgd; ++ u64 *pgd_page; ++ int i; ++ struct kbase_mmu_mode const *mmu_mode; + -+ MALI_DEBUG_PRINT(4, (" _mali_ukk_mem_cow_modify_range called! \n")); -+ /* Get the backend that need to be modified. */ -+ mem_backend = mali_mem_backend_struct_search(session, args->vaddr); ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ lockdep_assert_held(&kctx->mmu_lock); ++ lockdep_assert_held(&kctx->reg_lock); + -+ if (NULL == mem_backend || 0 == mem_backend->size) { -+ MALI_DEBUG_ASSERT_POINTER(mem_backend); -+ MALI_DEBUG_ASSERT(0 != mem_backend->size); -+ return ret; -+ } ++ pgd_page = kmap_atomic(pfn_to_page(PFN_DOWN(pgd))); ++ /* kmap_atomic should NEVER fail. */ ++ KBASE_DEBUG_ASSERT(NULL != pgd_page); ++ /* Copy the page to our preallocated buffer so that we can minimize kmap_atomic usage */ ++ memcpy(pgd_page_buffer, pgd_page, PAGE_SIZE); ++ kunmap_atomic(pgd_page); ++ pgd_page = pgd_page_buffer; + -+ MALI_DEBUG_ASSERT(MALI_MEM_COW == mem_backend->type); ++ mmu_mode = kctx->kbdev->mmu_mode; + -+ ret = mali_memory_cow_modify_range(mem_backend, args->range_start, args->size); -+ args->change_pages_nr = mem_backend->cow_mem.change_pages_nr; -+ if (_MALI_OSK_ERR_OK != ret) -+ return ret; -+ _mali_osk_mutex_wait(session->memory_lock); -+ if (!(mem_backend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED)) { -+ mali_mem_cow_mali_map(mem_backend, args->range_start, args->size); -+ } -+ _mali_osk_mutex_signal(session->memory_lock); ++ for (i = 0; i < KBASE_MMU_PAGE_ENTRIES; i++) { ++ target_pgd = mmu_mode->pte_to_phy_addr(pgd_page[i]); + -+ atomic_add(args->change_pages_nr, &session->mali_mem_allocated_pages); -+ if (atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE > session->max_mali_mem_allocated_size) { -+ session->max_mali_mem_allocated_size = atomic_read(&session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE; -+ } ++ if (target_pgd) { ++ if (level < (MIDGARD_MMU_BOTTOMLEVEL - 1)) { ++ mmu_teardown_level(kctx, target_pgd, level + 1, zap, pgd_page_buffer + (PAGE_SIZE / sizeof(u64))); ++ } else { ++ /* ++ * So target_pte is a level-3 page. ++ * As a leaf, it is safe to free it. ++ * Unless we have live pages attached to it! ++ */ ++ mmu_check_unused(kctx, target_pgd); ++ } + -+ return _MALI_OSK_ERR_OK; -+} ++ beenthere(kctx, "pte %lx level %d", (unsigned long)target_pgd, level + 1); ++ if (zap) { ++ struct page *p = phys_to_page(target_pgd); + ++ kbase_mem_pool_free(&kctx->mem_pool, p, true); ++ kbase_process_page_usage_dec(kctx, 1); ++ kbase_atomic_sub_pages(1, &kctx->used_pages); ++ kbase_atomic_sub_pages(1, &kctx->kbdev->memdev.used_pages); ++ } ++ } ++ } ++} + -+_mali_osk_errcode_t _mali_ukk_mem_resize(_mali_uk_mem_resize_s *args) ++int kbase_mmu_init(struct kbase_context *kctx) +{ -+ mali_mem_backend *mem_backend = NULL; -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; -+ -+ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; -+ -+ MALI_DEBUG_ASSERT_POINTER(session); -+ MALI_DEBUG_PRINT(4, (" mali_mem_resize_memory called! \n")); -+ MALI_DEBUG_ASSERT(0 == args->psize % MALI_MMU_PAGE_SIZE); -+ -+ /* Get the memory backend that need to be resize. */ -+ mem_backend = mali_mem_backend_struct_search(session, args->vaddr); ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ KBASE_DEBUG_ASSERT(NULL == kctx->mmu_teardown_pages); + -+ if (NULL == mem_backend) { -+ MALI_DEBUG_PRINT(2, ("_mali_ukk_mem_resize: memory backend = NULL!\n")); -+ return ret; -+ } ++ mutex_init(&kctx->mmu_lock); + -+ MALI_DEBUG_ASSERT(args->psize != mem_backend->size); ++ /* Preallocate MMU depth of four pages for mmu_teardown_level to use */ ++ kctx->mmu_teardown_pages = kmalloc(PAGE_SIZE * 4, GFP_KERNEL); + -+ ret = mali_mem_resize(session, mem_backend, args->psize); ++ if (NULL == kctx->mmu_teardown_pages) ++ return -ENOMEM; + -+ return ret; ++ return 0; +} + -+_mali_osk_errcode_t _mali_ukk_mem_usage_get(_mali_uk_profiling_memory_usage_get_s *args) ++void kbase_mmu_term(struct kbase_context *kctx) +{ -+ args->memory_usage = _mali_ukk_report_memory_usage(); -+ if (0 != args->vaddr) { -+ mali_mem_backend *mem_backend = NULL; -+ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; -+ /* Get the backend that need to be modified. */ -+ mem_backend = mali_mem_backend_struct_search(session, args->vaddr); -+ if (NULL == mem_backend) { -+ MALI_DEBUG_ASSERT_POINTER(mem_backend); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ KBASE_DEBUG_ASSERT(NULL != kctx->mmu_teardown_pages); + -+ if (MALI_MEM_COW == mem_backend->type) -+ args->change_pages_nr = mem_backend->cow_mem.change_pages_nr; -+ } -+ return _MALI_OSK_ERR_OK; ++ kfree(kctx->mmu_teardown_pages); ++ kctx->mmu_teardown_pages = NULL; +} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h -new file mode 100755 -index 000000000000..23d8cde753a1 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h -@@ -0,0 +1,51 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef __MALI_MEMORY_MANAGER_H__ -+#define __MALI_MEMORY_MANAGER_H__ -+ -+#include "mali_osk.h" -+#include -+#include -+#include -+#include -+#include -+#include "mali_memory_types.h" -+#include "mali_memory_os_alloc.h" -+#include "mali_uk_types.h" -+ -+struct mali_allocation_manager { -+ rwlock_t vm_lock; -+ struct rb_root allocation_mgr_rb; -+ struct list_head head; -+ struct mutex list_mutex; -+ u32 mali_allocation_num; -+}; -+ -+extern struct idr mali_backend_idr; -+extern struct mutex mali_idr_mutex; -+ -+int mali_memory_manager_init(struct mali_allocation_manager *mgr); -+void mali_memory_manager_uninit(struct mali_allocation_manager *mgr); -+ -+void mali_mem_allocation_struct_destory(mali_mem_allocation *alloc); -+_mali_osk_errcode_t mali_mem_add_mem_size(struct mali_session_data *session, u32 mali_addr, u32 add_size); -+mali_mem_backend *mali_mem_backend_struct_search(struct mali_session_data *session, u32 mali_address); -+_mali_osk_errcode_t _mali_ukk_mem_allocate(_mali_uk_alloc_mem_s *args); -+_mali_osk_errcode_t _mali_ukk_mem_free(_mali_uk_free_mem_s *args); -+_mali_osk_errcode_t _mali_ukk_mem_bind(_mali_uk_bind_mem_s *args); -+_mali_osk_errcode_t _mali_ukk_mem_unbind(_mali_uk_unbind_mem_s *args); -+_mali_osk_errcode_t _mali_ukk_mem_cow(_mali_uk_cow_mem_s *args); -+_mali_osk_errcode_t _mali_ukk_mem_cow_modify_range(_mali_uk_cow_modify_range_s *args); -+_mali_osk_errcode_t _mali_ukk_mem_usage_get(_mali_uk_profiling_memory_usage_get_s *args); -+_mali_osk_errcode_t _mali_ukk_mem_resize(_mali_uk_mem_resize_s *args); -+ -+#endif -+ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c -new file mode 100755 -index 000000000000..1e1f5eb4a0f7 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c -@@ -0,0 +1,810 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#include "../platform/rk/custom_log.h" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include + -+#include "mali_osk.h" -+#include "mali_memory.h" -+#include "mali_memory_os_alloc.h" -+#include "mali_kernel_linux.h" ++void kbase_mmu_free_pgd(struct kbase_context *kctx) ++{ ++ int new_page_count __maybe_unused; + -+/* Minimum size of allocator page pool */ -+#define MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES (MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB * 256) -+#define MALI_OS_MEMORY_POOL_TRIM_JIFFIES (10 * CONFIG_HZ) /* Default to 10s */ ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ KBASE_DEBUG_ASSERT(NULL != kctx->mmu_teardown_pages); + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) -+static int mali_mem_os_shrink(int nr_to_scan, gfp_t gfp_mask); -+#else -+static int mali_mem_os_shrink(struct shrinker *shrinker, int nr_to_scan, gfp_t gfp_mask); -+#endif -+#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) -+static int mali_mem_os_shrink(struct shrinker *shrinker, struct shrink_control *sc); -+#else -+static unsigned long mali_mem_os_shrink(struct shrinker *shrinker, struct shrink_control *sc); -+static unsigned long mali_mem_os_shrink_count(struct shrinker *shrinker, struct shrink_control *sc); -+#endif -+#endif -+static void mali_mem_os_trim_pool(struct work_struct *work); ++ mutex_lock(&kctx->mmu_lock); ++ mmu_teardown_level(kctx, kctx->pgd, MIDGARD_MMU_TOPLEVEL, 1, kctx->mmu_teardown_pages); ++ mutex_unlock(&kctx->mmu_lock); + -+struct mali_mem_os_allocator mali_mem_os_allocator = { -+ .pool_lock = __SPIN_LOCK_UNLOCKED(pool_lock), -+ .pool_pages = LIST_HEAD_INIT(mali_mem_os_allocator.pool_pages), -+ .pool_count = 0, ++ beenthere(kctx, "pgd %lx", (unsigned long)kctx->pgd); ++ kbase_mem_pool_free(&kctx->mem_pool, phys_to_page(kctx->pgd), true); ++ kbase_process_page_usage_dec(kctx, 1); ++ new_page_count = kbase_atomic_sub_pages(1, &kctx->used_pages); ++ kbase_atomic_sub_pages(1, &kctx->kbdev->memdev.used_pages); + -+ .allocated_pages = ATOMIC_INIT(0), -+ .allocation_limit = 0, ++ KBASE_TLSTREAM_AUX_PAGESALLOC( ++ (u32)kctx->id, ++ (u64)new_page_count); ++} + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) -+ .shrinker.shrink = mali_mem_os_shrink, -+#else -+ .shrinker.count_objects = mali_mem_os_shrink_count, -+ .shrinker.scan_objects = mali_mem_os_shrink, -+#endif -+ .shrinker.seeks = DEFAULT_SEEKS, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) -+ .timed_shrinker = __DELAYED_WORK_INITIALIZER(mali_mem_os_allocator.timed_shrinker, mali_mem_os_trim_pool, TIMER_DEFERRABLE), -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) -+ .timed_shrinker = __DEFERRED_WORK_INITIALIZER(mali_mem_os_allocator.timed_shrinker, mali_mem_os_trim_pool), -+#else -+ .timed_shrinker = __DELAYED_WORK_INITIALIZER(mali_mem_os_allocator.timed_shrinker, mali_mem_os_trim_pool), -+#endif -+}; ++KBASE_EXPORT_TEST_API(kbase_mmu_free_pgd); + -+u32 mali_mem_os_free(struct list_head *os_pages, u32 pages_count, mali_bool cow_flag) ++static size_t kbasep_mmu_dump_level(struct kbase_context *kctx, phys_addr_t pgd, int level, char ** const buffer, size_t *size_left) +{ -+ LIST_HEAD(pages); -+ struct mali_page_node *m_page, *m_tmp; -+ u32 free_pages_nr = 0; ++ phys_addr_t target_pgd; ++ u64 *pgd_page; ++ int i; ++ size_t size = KBASE_MMU_PAGE_ENTRIES * sizeof(u64) + sizeof(u64); ++ size_t dump_size; ++ struct kbase_mmu_mode const *mmu_mode; + -+ if (MALI_TRUE == cow_flag) { -+ list_for_each_entry_safe(m_page, m_tmp, os_pages, list) { -+ /*only handle OS node here */ -+ if (m_page->type == MALI_PAGE_NODE_OS) { -+ if (1 == _mali_page_node_get_ref_count(m_page)) { -+ list_move(&m_page->list, &pages); -+ atomic_sub(1, &mali_mem_os_allocator.allocated_pages); -+ free_pages_nr ++; -+ } else { -+ _mali_page_node_unref(m_page); -+ m_page->page = NULL; -+ list_del(&m_page->list); -+ kfree(m_page); -+ } -+ } -+ } -+ } else { -+ list_cut_position(&pages, os_pages, os_pages->prev); -+ atomic_sub(pages_count, &mali_mem_os_allocator.allocated_pages); -+ free_pages_nr = pages_count; -+ } ++ KBASE_DEBUG_ASSERT(NULL != kctx); ++ lockdep_assert_held(&kctx->mmu_lock); + -+ /* Put pages on pool. */ -+ spin_lock(&mali_mem_os_allocator.pool_lock); -+ list_splice(&pages, &mali_mem_os_allocator.pool_pages); -+ mali_mem_os_allocator.pool_count += free_pages_nr; -+ spin_unlock(&mali_mem_os_allocator.pool_lock); ++ mmu_mode = kctx->kbdev->mmu_mode; + -+ if (MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES < mali_mem_os_allocator.pool_count) { -+ MALI_DEBUG_PRINT(5, ("OS Mem: Starting pool trim timer %u\n", mali_mem_os_allocator.pool_count)); -+ queue_delayed_work(mali_mem_os_allocator.wq, &mali_mem_os_allocator.timed_shrinker, MALI_OS_MEMORY_POOL_TRIM_JIFFIES); ++ pgd_page = kmap(pfn_to_page(PFN_DOWN(pgd))); ++ if (!pgd_page) { ++ dev_warn(kctx->kbdev->dev, "kbasep_mmu_dump_level: kmap failure\n"); ++ return 0; + } -+ return free_pages_nr; -+} + -+/** -+* put page without put it into page pool -+*/ -+_mali_osk_errcode_t mali_mem_os_put_page(struct page *page) -+{ -+ MALI_DEBUG_ASSERT_POINTER(page); -+ if (1 == page_count(page)) { -+ atomic_sub(1, &mali_mem_os_allocator.allocated_pages); -+ dma_unmap_page(&mali_platform_device->dev, page_private(page), -+ _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); -+ ClearPagePrivate(page); -+ } -+ put_page(page); -+ return _MALI_OSK_ERR_OK; -+} ++ if (*size_left >= size) { ++ /* A modified physical address that contains the page table level */ ++ u64 m_pgd = pgd | level; + -+_mali_osk_errcode_t mali_mem_os_resize_pages(mali_mem_os_mem *mem_from, mali_mem_os_mem *mem_to, u32 start_page, u32 page_count) -+{ -+ struct mali_page_node *m_page, *m_tmp; -+ u32 i = 0; ++ /* Put the modified physical address in the output buffer */ ++ memcpy(*buffer, &m_pgd, sizeof(m_pgd)); ++ *buffer += sizeof(m_pgd); + -+ MALI_DEBUG_ASSERT_POINTER(mem_from); -+ MALI_DEBUG_ASSERT_POINTER(mem_to); ++ /* Followed by the page table itself */ ++ memcpy(*buffer, pgd_page, sizeof(u64) * KBASE_MMU_PAGE_ENTRIES); ++ *buffer += sizeof(u64) * KBASE_MMU_PAGE_ENTRIES; + -+ if (mem_from->count < start_page + page_count) { -+ return _MALI_OSK_ERR_INVALID_ARGS; ++ *size_left -= size; + } + -+ list_for_each_entry_safe(m_page, m_tmp, &mem_from->pages, list) { -+ if (i >= start_page && i < start_page + page_count) { -+ list_move_tail(&m_page->list, &mem_to->pages); -+ mem_from->count--; -+ mem_to->count++; ++ if (level < MIDGARD_MMU_BOTTOMLEVEL) { ++ for (i = 0; i < KBASE_MMU_PAGE_ENTRIES; i++) { ++ if (mmu_mode->pte_is_valid(pgd_page[i])) { ++ target_pgd = mmu_mode->pte_to_phy_addr( ++ pgd_page[i]); ++ ++ dump_size = kbasep_mmu_dump_level(kctx, ++ target_pgd, level + 1, ++ buffer, size_left); ++ if (!dump_size) { ++ kunmap(pfn_to_page(PFN_DOWN(pgd))); ++ return 0; ++ } ++ size += dump_size; ++ } + } -+ i++; + } + -+ return _MALI_OSK_ERR_OK; -+} ++ kunmap(pfn_to_page(PFN_DOWN(pgd))); + ++ return size; ++} + -+int mali_mem_os_alloc_pages(mali_mem_os_mem *os_mem, u32 size) ++void *kbase_mmu_dump(struct kbase_context *kctx, int nr_pages) +{ -+ struct page *new_page; -+ LIST_HEAD(pages_list); -+ size_t page_count = PAGE_ALIGN(size) / _MALI_OSK_MALI_PAGE_SIZE; -+ size_t remaining = page_count; -+ struct mali_page_node *m_page, *m_tmp; -+ u32 i; ++ void *kaddr; ++ size_t size_left; + -+ MALI_DEBUG_ASSERT_POINTER(os_mem); ++ KBASE_DEBUG_ASSERT(kctx); + -+ if (atomic_read(&mali_mem_os_allocator.allocated_pages) * _MALI_OSK_MALI_PAGE_SIZE + size > mali_mem_os_allocator.allocation_limit) { -+ MALI_DEBUG_PRINT(2, ("Mali Mem: Unable to allocate %u bytes. Currently allocated: %lu, max limit %lu\n", -+ size, -+ atomic_read(&mali_mem_os_allocator.allocated_pages) * _MALI_OSK_MALI_PAGE_SIZE, -+ mali_mem_os_allocator.allocation_limit)); -+ return -ENOMEM; ++ if (0 == nr_pages) { ++ /* can't dump in a 0 sized buffer, early out */ ++ return NULL; + } + -+ INIT_LIST_HEAD(&os_mem->pages); -+ os_mem->count = page_count; -+ -+ /* Grab pages from pool. */ -+ { -+ size_t pool_pages; -+ spin_lock(&mali_mem_os_allocator.pool_lock); -+ pool_pages = min(remaining, mali_mem_os_allocator.pool_count); -+ for (i = pool_pages; i > 0; i--) { -+ BUG_ON(list_empty(&mali_mem_os_allocator.pool_pages)); -+ list_move(mali_mem_os_allocator.pool_pages.next, &pages_list); -+ } -+ mali_mem_os_allocator.pool_count -= pool_pages; -+ remaining -= pool_pages; -+ spin_unlock(&mali_mem_os_allocator.pool_lock); -+ } ++ size_left = nr_pages * PAGE_SIZE; + -+ /* Process pages from pool. */ -+ i = 0; -+ list_for_each_entry_safe(m_page, m_tmp, &pages_list, list) { -+ BUG_ON(NULL == m_page); ++ KBASE_DEBUG_ASSERT(0 != size_left); ++ kaddr = vmalloc_user(size_left); + -+ list_move_tail(&m_page->list, &os_mem->pages); -+ } ++ mutex_lock(&kctx->mmu_lock); + -+ /* Allocate new pages, if needed. */ -+ for (i = 0; i < remaining; i++) { -+ dma_addr_t dma_addr; -+ gfp_t flags = __GFP_ZERO | GFP_HIGHUSER; -+ int err; ++ if (kaddr) { ++ u64 end_marker = 0xFFULL; ++ char *buffer; ++ char *mmu_dump_buffer; ++ u64 config[3]; ++ size_t size; + -+#if defined(CONFIG_ARM) && !defined(CONFIG_ARM_LPAE) -+ flags |= GFP_HIGHUSER; -+#else -+#ifdef CONFIG_ZONE_DMA32 -+ flags |= GFP_DMA32; -+#else -+#ifdef CONFIG_ZONE_DMA -+#else -+ /* arm64 utgard only work on < 4G, but the kernel -+ * didn't provide method to allocte memory < 4G -+ */ -+ MALI_DEBUG_ASSERT(0); -+#endif -+#endif -+#endif ++ buffer = (char *)kaddr; ++ mmu_dump_buffer = buffer; + -+ new_page = alloc_page(flags); ++ if (kctx->api_version >= KBASE_API_VERSION(8, 4)) { ++ struct kbase_mmu_setup as_setup; + -+ if (unlikely(NULL == new_page)) { -+ E("err."); -+ /* Calculate the number of pages actually allocated, and free them. */ -+ os_mem->count = (page_count - remaining) + i; -+ atomic_add(os_mem->count, &mali_mem_os_allocator.allocated_pages); -+ mali_mem_os_free(&os_mem->pages, os_mem->count, MALI_FALSE); -+ return -ENOMEM; ++ kctx->kbdev->mmu_mode->get_as_setup(kctx, &as_setup); ++ config[0] = as_setup.transtab; ++ config[1] = as_setup.memattr; ++ config[2] = as_setup.transcfg; ++ memcpy(buffer, &config, sizeof(config)); ++ mmu_dump_buffer += sizeof(config); ++ size_left -= sizeof(config); + } + -+ /* Ensure page is flushed from CPU caches. */ -+ dma_addr = dma_map_page(&mali_platform_device->dev, new_page, -+ 0, _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); -+ dma_unmap_page(&mali_platform_device->dev, dma_addr, -+ _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); -+ dma_addr = dma_map_page(&mali_platform_device->dev, new_page, -+ 0, _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); + -+ err = dma_mapping_error(&mali_platform_device->dev, dma_addr); -+ if (unlikely(err)) { -+ MALI_DEBUG_PRINT_ERROR(("OS Mem: Failed to DMA map page %p: %u", -+ new_page, err)); -+ __free_page(new_page); -+ os_mem->count = (page_count - remaining) + i; -+ atomic_add(os_mem->count, &mali_mem_os_allocator.allocated_pages); -+ mali_mem_os_free(&os_mem->pages, os_mem->count, MALI_FALSE); -+ return -EFAULT; -+ } + -+ /* Store page phys addr */ -+ SetPagePrivate(new_page); -+ set_page_private(new_page, dma_addr); ++ size = kbasep_mmu_dump_level(kctx, ++ kctx->pgd, ++ MIDGARD_MMU_TOPLEVEL, ++ &mmu_dump_buffer, ++ &size_left); + -+ m_page = _mali_page_node_allocate(MALI_PAGE_NODE_OS); -+ if (unlikely(NULL == m_page)) { -+ MALI_PRINT_ERROR(("OS Mem: Can't allocate mali_page node! \n")); -+ dma_unmap_page(&mali_platform_device->dev, page_private(new_page), -+ _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); -+ ClearPagePrivate(new_page); -+ __free_page(new_page); -+ os_mem->count = (page_count - remaining) + i; -+ atomic_add(os_mem->count, &mali_mem_os_allocator.allocated_pages); -+ mali_mem_os_free(&os_mem->pages, os_mem->count, MALI_FALSE); -+ return -EFAULT; -+ } -+ m_page->page = new_page; ++ if (!size) ++ goto fail_free; + -+ list_add_tail(&m_page->list, &os_mem->pages); -+ } ++ /* Add on the size for the end marker */ ++ size += sizeof(u64); ++ /* Add on the size for the config */ ++ if (kctx->api_version >= KBASE_API_VERSION(8, 4)) ++ size += sizeof(config); + -+ atomic_add(page_count, &mali_mem_os_allocator.allocated_pages); + -+ if (MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES > mali_mem_os_allocator.pool_count) { -+ MALI_DEBUG_PRINT(4, ("OS Mem: Stopping pool trim timer, only %u pages on pool\n", mali_mem_os_allocator.pool_count)); -+ cancel_delayed_work(&mali_mem_os_allocator.timed_shrinker); ++ if (size > nr_pages * PAGE_SIZE || size_left < sizeof(u64)) { ++ /* The buffer isn't big enough - free the memory and return failure */ ++ goto fail_free; ++ } ++ ++ /* Add the end marker */ ++ memcpy(mmu_dump_buffer, &end_marker, sizeof(u64)); + } + -+ return 0; -+} ++ mutex_unlock(&kctx->mmu_lock); ++ return kaddr; + ++fail_free: ++ vfree(kaddr); ++ mutex_unlock(&kctx->mmu_lock); ++ return NULL; ++} ++KBASE_EXPORT_TEST_API(kbase_mmu_dump); + -+_mali_osk_errcode_t mali_mem_os_mali_map(mali_mem_os_mem *os_mem, struct mali_session_data *session, u32 vaddr, u32 start_page, u32 mapping_pgae_num, u32 props) ++void bus_fault_worker(struct work_struct *data) +{ -+ struct mali_page_directory *pagedir = session->page_directory; -+ struct mali_page_node *m_page; -+ u32 virt; -+ u32 prop = props; ++ struct kbase_as *faulting_as; ++ int as_no; ++ struct kbase_context *kctx; ++ struct kbase_device *kbdev; ++#if KBASE_GPU_RESET_EN ++ bool reset_status = false; ++#endif /* KBASE_GPU_RESET_EN */ + -+ MALI_DEBUG_ASSERT_POINTER(session); -+ MALI_DEBUG_ASSERT_POINTER(os_mem); ++ faulting_as = container_of(data, struct kbase_as, work_busfault); + -+ MALI_DEBUG_ASSERT(start_page <= os_mem->count); -+ MALI_DEBUG_ASSERT((start_page + mapping_pgae_num) <= os_mem->count); ++ as_no = faulting_as->number; + -+ if ((start_page + mapping_pgae_num) == os_mem->count) { ++ kbdev = container_of(faulting_as, struct kbase_device, as[as_no]); + -+ virt = vaddr + MALI_MMU_PAGE_SIZE * (start_page + mapping_pgae_num); ++ /* Grab the context that was already refcounted in kbase_mmu_interrupt(). ++ * Therefore, it cannot be scheduled out of this AS until we explicitly release it ++ */ ++ kctx = kbasep_js_runpool_lookup_ctx_noretain(kbdev, as_no); ++ if (WARN_ON(!kctx)) { ++ atomic_dec(&kbdev->faults_pending); ++ return; ++ } + -+ list_for_each_entry_reverse(m_page, &os_mem->pages, list) { ++ if (unlikely(faulting_as->protected_mode)) ++ { ++ kbase_mmu_report_fault_and_kill(kctx, faulting_as, ++ "Permission failure"); ++ kbase_mmu_hw_clear_fault(kbdev, faulting_as, kctx, ++ KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED); ++ kbasep_js_runpool_release_ctx(kbdev, kctx); ++ atomic_dec(&kbdev->faults_pending); ++ return; + -+ virt -= MALI_MMU_PAGE_SIZE; -+ if (mapping_pgae_num > 0) { -+ dma_addr_t phys = page_private(m_page->page); -+#if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT) -+ /* Verify that the "physical" address is 32-bit and -+ * usable for Mali, when on a system with bus addresses -+ * wider than 32-bit. */ -+ MALI_DEBUG_ASSERT(0 == (phys >> 32)); -+#endif -+ mali_mmu_pagedir_update(pagedir, virt, (mali_dma_addr)phys, MALI_MMU_PAGE_SIZE, prop); -+ } else { -+ break; -+ } -+ mapping_pgae_num--; -+ } ++ } + -+ } else { -+ u32 i = 0; -+ virt = vaddr; -+ list_for_each_entry(m_page, &os_mem->pages, list) { ++#if KBASE_GPU_RESET_EN ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8245)) { ++ /* Due to H/W issue 8245 we need to reset the GPU after using UNMAPPED mode. ++ * We start the reset before switching to UNMAPPED to ensure that unrelated jobs ++ * are evicted from the GPU before the switch. ++ */ ++ dev_err(kbdev->dev, "GPU bus error occurred. For this GPU version we now soft-reset as part of bus error recovery\n"); ++ reset_status = kbase_prepare_to_reset_gpu(kbdev); ++ } ++#endif /* KBASE_GPU_RESET_EN */ ++ /* NOTE: If GPU already powered off for suspend, we don't need to switch to unmapped */ ++ if (!kbase_pm_context_active_handle_suspend(kbdev, KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE)) { ++ unsigned long flags; + -+ if (i >= start_page) { -+ dma_addr_t phys = page_private(m_page->page); ++ /* switch to UNMAPPED mode, will abort all jobs and stop any hw counter dumping */ ++ /* AS transaction begin */ ++ mutex_lock(&kbdev->mmu_hw_mutex); + -+#if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT) -+ /* Verify that the "physical" address is 32-bit and -+ * usable for Mali, when on a system with bus addresses -+ * wider than 32-bit. */ -+ MALI_DEBUG_ASSERT(0 == (phys >> 32)); -+#endif -+ mali_mmu_pagedir_update(pagedir, virt, (mali_dma_addr)phys, MALI_MMU_PAGE_SIZE, prop); -+ } -+ i++; -+ virt += MALI_MMU_PAGE_SIZE; -+ } ++ /* Set the MMU into unmapped mode */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_mmu_disable(kctx); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++ /* AS transaction end */ ++ ++ kbase_mmu_hw_clear_fault(kbdev, faulting_as, kctx, ++ KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED); ++ kbase_mmu_hw_enable_fault(kbdev, faulting_as, kctx, ++ KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED); ++ ++ kbase_pm_context_idle(kbdev); + } -+ return _MALI_OSK_ERR_OK; -+} + ++#if KBASE_GPU_RESET_EN ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8245) && reset_status) ++ kbase_reset_gpu(kbdev); ++#endif /* KBASE_GPU_RESET_EN */ + -+void mali_mem_os_mali_unmap(mali_mem_allocation *alloc) -+{ -+ struct mali_session_data *session; -+ MALI_DEBUG_ASSERT_POINTER(alloc); -+ session = alloc->session; -+ MALI_DEBUG_ASSERT_POINTER(session); ++ kbasep_js_runpool_release_ctx(kbdev, kctx); + -+ mali_session_memory_lock(session); -+ mali_mem_mali_map_free(session, alloc->psize, alloc->mali_vma_node.vm_node.start, -+ alloc->flags); -+ mali_session_memory_unlock(session); ++ atomic_dec(&kbdev->faults_pending); +} + -+int mali_mem_os_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma) ++const char *kbase_exception_name(struct kbase_device *kbdev, u32 exception_code) +{ -+ mali_mem_os_mem *os_mem = &mem_bkend->os_mem; -+ struct mali_page_node *m_page; -+ struct page *page; -+ int ret; -+ unsigned long addr = vma->vm_start; -+ MALI_DEBUG_ASSERT(MALI_MEM_OS == mem_bkend->type); -+ -+ list_for_each_entry(m_page, &os_mem->pages, list) { -+ /* We should use vm_insert_page, but it does a dcache -+ * flush which makes it way slower than remap_pfn_range or vmf_insert_pfn. -+ ret = vm_insert_page(vma, addr, page); -+ */ -+ page = m_page->page; -+ ret = vmf_insert_pfn(vma, addr, page_to_pfn(page)); ++ const char *e; + -+ if (unlikely(0 != ret)) { -+ return -EFAULT; -+ } -+ addr += _MALI_OSK_MALI_PAGE_SIZE; -+ } ++ switch (exception_code) { ++ /* Non-Fault Status code */ ++ case 0x00: ++ e = "NOT_STARTED/IDLE/OK"; ++ break; ++ case 0x01: ++ e = "DONE"; ++ break; ++ case 0x02: ++ e = "INTERRUPTED"; ++ break; ++ case 0x03: ++ e = "STOPPED"; ++ break; ++ case 0x04: ++ e = "TERMINATED"; ++ break; ++ case 0x08: ++ e = "ACTIVE"; ++ break; ++ /* Job exceptions */ ++ case 0x40: ++ e = "JOB_CONFIG_FAULT"; ++ break; ++ case 0x41: ++ e = "JOB_POWER_FAULT"; ++ break; ++ case 0x42: ++ e = "JOB_READ_FAULT"; ++ break; ++ case 0x43: ++ e = "JOB_WRITE_FAULT"; ++ break; ++ case 0x44: ++ e = "JOB_AFFINITY_FAULT"; ++ break; ++ case 0x48: ++ e = "JOB_BUS_FAULT"; ++ break; ++ case 0x50: ++ e = "INSTR_INVALID_PC"; ++ break; ++ case 0x51: ++ e = "INSTR_INVALID_ENC"; ++ break; ++ case 0x52: ++ e = "INSTR_TYPE_MISMATCH"; ++ break; ++ case 0x53: ++ e = "INSTR_OPERAND_FAULT"; ++ break; ++ case 0x54: ++ e = "INSTR_TLS_FAULT"; ++ break; ++ case 0x55: ++ e = "INSTR_BARRIER_FAULT"; ++ break; ++ case 0x56: ++ e = "INSTR_ALIGN_FAULT"; ++ break; ++ case 0x58: ++ e = "DATA_INVALID_FAULT"; ++ break; ++ case 0x59: ++ e = "TILE_RANGE_FAULT"; ++ break; ++ case 0x5A: ++ e = "ADDR_RANGE_FAULT"; ++ break; ++ case 0x60: ++ e = "OUT_OF_MEMORY"; ++ break; ++ /* GPU exceptions */ ++ case 0x80: ++ e = "DELAYED_BUS_FAULT"; ++ break; ++ case 0x88: ++ e = "SHAREABILITY_FAULT"; ++ break; ++ /* MMU exceptions */ ++ case 0xC0: ++ case 0xC1: ++ case 0xC2: ++ case 0xC3: ++ case 0xC4: ++ case 0xC5: ++ case 0xC6: ++ case 0xC7: ++ e = "TRANSLATION_FAULT"; ++ break; ++ case 0xC8: ++ e = "PERMISSION_FAULT"; ++ break; ++ case 0xC9: ++ case 0xCA: ++ case 0xCB: ++ case 0xCC: ++ case 0xCD: ++ case 0xCE: ++ case 0xCF: ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) ++ e = "PERMISSION_FAULT"; ++ else ++ e = "UNKNOWN"; ++ break; ++ case 0xD0: ++ case 0xD1: ++ case 0xD2: ++ case 0xD3: ++ case 0xD4: ++ case 0xD5: ++ case 0xD6: ++ case 0xD7: ++ e = "TRANSTAB_BUS_FAULT"; ++ break; ++ case 0xD8: ++ e = "ACCESS_FLAG"; ++ break; ++ case 0xD9: ++ case 0xDA: ++ case 0xDB: ++ case 0xDC: ++ case 0xDD: ++ case 0xDE: ++ case 0xDF: ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) ++ e = "ACCESS_FLAG"; ++ else ++ e = "UNKNOWN"; ++ break; ++ case 0xE0: ++ case 0xE1: ++ case 0xE2: ++ case 0xE3: ++ case 0xE4: ++ case 0xE5: ++ case 0xE6: ++ case 0xE7: ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) ++ e = "ADDRESS_SIZE_FAULT"; ++ else ++ e = "UNKNOWN"; ++ break; ++ case 0xE8: ++ case 0xE9: ++ case 0xEA: ++ case 0xEB: ++ case 0xEC: ++ case 0xED: ++ case 0xEE: ++ case 0xEF: ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) ++ e = "MEMORY_ATTRIBUTES_FAULT"; ++ else ++ e = "UNKNOWN"; ++ break; ++ default: ++ e = "UNKNOWN"; ++ break; ++ }; + -+ return 0; ++ return e; +} + -+_mali_osk_errcode_t mali_mem_os_resize_cpu_map_locked(mali_mem_backend *mem_bkend, struct vm_area_struct *vma, unsigned long start_vaddr, u32 mappig_size) ++static const char *access_type_name(struct kbase_device *kbdev, ++ u32 fault_status) +{ -+ mali_mem_os_mem *os_mem = &mem_bkend->os_mem; -+ struct mali_page_node *m_page; -+ int ret; -+ int offset; -+ int mapping_page_num; -+ int count ; -+ -+ unsigned long vstart = vma->vm_start; -+ count = 0; -+ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_OS); -+ MALI_DEBUG_ASSERT(0 == start_vaddr % _MALI_OSK_MALI_PAGE_SIZE); -+ MALI_DEBUG_ASSERT(0 == vstart % _MALI_OSK_MALI_PAGE_SIZE); -+ offset = (start_vaddr - vstart) / _MALI_OSK_MALI_PAGE_SIZE; -+ MALI_DEBUG_ASSERT(offset <= os_mem->count); -+ mapping_page_num = mappig_size / _MALI_OSK_MALI_PAGE_SIZE; -+ MALI_DEBUG_ASSERT((offset + mapping_page_num) <= os_mem->count); -+ -+ if ((offset + mapping_page_num) == os_mem->count) { ++ switch (fault_status & AS_FAULTSTATUS_ACCESS_TYPE_MASK) { ++ case AS_FAULTSTATUS_ACCESS_TYPE_ATOMIC: ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) ++ return "ATOMIC"; ++ else ++ return "UNKNOWN"; ++ case AS_FAULTSTATUS_ACCESS_TYPE_READ: ++ return "READ"; ++ case AS_FAULTSTATUS_ACCESS_TYPE_WRITE: ++ return "WRITE"; ++ case AS_FAULTSTATUS_ACCESS_TYPE_EX: ++ return "EXECUTE"; ++ default: ++ WARN_ON(1); ++ return NULL; ++ } ++} + -+ unsigned long vm_end = start_vaddr + mappig_size; ++/** ++ * The caller must ensure it's retained the ctx to prevent it from being scheduled out whilst it's being worked on. ++ */ ++static void kbase_mmu_report_fault_and_kill(struct kbase_context *kctx, ++ struct kbase_as *as, const char *reason_str) ++{ ++ unsigned long flags; ++ int exception_type; ++ int access_type; ++ int source_id; ++ int as_no; ++ struct kbase_device *kbdev; ++ struct kbasep_js_device_data *js_devdata; + -+ list_for_each_entry_reverse(m_page, &os_mem->pages, list) { ++#if KBASE_GPU_RESET_EN ++ bool reset_status = false; ++#endif + -+ vm_end -= _MALI_OSK_MALI_PAGE_SIZE; -+ if (mapping_page_num > 0) { -+ ret = vmf_insert_pfn(vma, vm_end, page_to_pfn(m_page->page)); ++ as_no = as->number; ++ kbdev = kctx->kbdev; ++ js_devdata = &kbdev->js_data; + -+ if (unlikely(0 != ret)) { -+ /*will return -EBUSY If the page has already been mapped into table, but it's OK*/ -+ if (-EBUSY == ret) { -+ break; -+ } else { -+ MALI_DEBUG_PRINT(1, ("OS Mem: mali_mem_os_resize_cpu_map_locked failed, ret = %d, offset is %d,page_count is %d\n", -+ ret, offset + mapping_page_num, os_mem->count)); -+ } -+ return _MALI_OSK_ERR_FAULT; -+ } -+ } else { -+ break; -+ } -+ mapping_page_num--; ++ /* ASSERT that the context won't leave the runpool */ ++ KBASE_DEBUG_ASSERT(atomic_read(&kctx->refcount) > 0); + -+ } -+ } else { ++ /* decode the fault status */ ++ exception_type = as->fault_status & 0xFF; ++ access_type = (as->fault_status >> 8) & 0x3; ++ source_id = (as->fault_status >> 16); + -+ list_for_each_entry(m_page, &os_mem->pages, list) { -+ if (count >= offset) { ++ /* terminal fault, print info about the fault */ ++ dev_err(kbdev->dev, ++ "Unhandled Page fault in AS%d at VA 0x%016llX\n" ++ "Reason: %s\n" ++ "raw fault status: 0x%X\n" ++ "decoded fault status: %s\n" ++ "exception type 0x%X: %s\n" ++ "access type 0x%X: %s\n" ++ "source id 0x%X\n" ++ "pid: %d\n", ++ as_no, as->fault_addr, ++ reason_str, ++ as->fault_status, ++ (as->fault_status & (1 << 10) ? "DECODER FAULT" : "SLAVE FAULT"), ++ exception_type, kbase_exception_name(kbdev, exception_type), ++ access_type, access_type_name(kbdev, as->fault_status), ++ source_id, ++ kctx->pid); + -+ ret = vmf_insert_pfn(vma, vstart, page_to_pfn(m_page->page)); ++ /* hardware counters dump fault handling */ ++ if ((kbdev->hwcnt.kctx) && (kbdev->hwcnt.kctx->as_nr == as_no) && ++ (kbdev->hwcnt.backend.state == ++ KBASE_INSTR_STATE_DUMPING)) { ++ unsigned int num_core_groups = kbdev->gpu_props.num_core_groups; + -+ if (unlikely(0 != ret)) { -+ /*will return -EBUSY If the page has already been mapped into table, but it's OK*/ -+ if (-EBUSY == ret) { -+ break; -+ } else { -+ MALI_DEBUG_PRINT(1, ("OS Mem: mali_mem_os_resize_cpu_map_locked failed, ret = %d, count is %d, offset is %d,page_count is %d\n", -+ ret, count, offset, os_mem->count)); -+ } -+ return _MALI_OSK_ERR_FAULT; -+ } -+ } -+ count++; -+ vstart += _MALI_OSK_MALI_PAGE_SIZE; -+ } ++ if ((as->fault_addr >= kbdev->hwcnt.addr) && ++ (as->fault_addr < (kbdev->hwcnt.addr + ++ (num_core_groups * 2048)))) ++ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_FAULT; + } -+ return _MALI_OSK_ERR_OK; -+} -+ -+u32 mali_mem_os_release(mali_mem_backend *mem_bkend) -+{ -+ -+ mali_mem_allocation *alloc; -+ struct mali_session_data *session; -+ u32 free_pages_nr = 0; -+ MALI_DEBUG_ASSERT_POINTER(mem_bkend); -+ MALI_DEBUG_ASSERT(MALI_MEM_OS == mem_bkend->type); -+ -+ alloc = mem_bkend->mali_allocation; -+ MALI_DEBUG_ASSERT_POINTER(alloc); + -+ session = alloc->session; -+ MALI_DEBUG_ASSERT_POINTER(session); ++ /* Stop the kctx from submitting more jobs and cause it to be scheduled ++ * out/rescheduled - this will occur on releasing the context's refcount */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbasep_js_clear_submit_allowed(js_devdata, kctx); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ /* Unmap the memory from the mali virtual address space. */ -+ mali_mem_os_mali_unmap(alloc); -+ mutex_lock(&mem_bkend->mutex); -+ /* Free pages */ -+ if (MALI_MEM_BACKEND_FLAG_COWED & mem_bkend->flags) { -+ /* Lock to avoid the free race condition for the cow shared memory page node. */ -+ _mali_osk_mutex_wait(session->cow_lock); -+ free_pages_nr = mali_mem_os_free(&mem_bkend->os_mem.pages, mem_bkend->os_mem.count, MALI_TRUE); -+ _mali_osk_mutex_signal(session->cow_lock); -+ } else { -+ free_pages_nr = mali_mem_os_free(&mem_bkend->os_mem.pages, mem_bkend->os_mem.count, MALI_FALSE); ++ /* Kill any running jobs from the context. Submit is disallowed, so no more jobs from this ++ * context can appear in the job slots from this point on */ ++ kbase_backend_jm_kill_jobs_from_kctx(kctx); ++ /* AS transaction begin */ ++ mutex_lock(&kbdev->mmu_hw_mutex); ++#if KBASE_GPU_RESET_EN ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8245)) { ++ /* Due to H/W issue 8245 we need to reset the GPU after using UNMAPPED mode. ++ * We start the reset before switching to UNMAPPED to ensure that unrelated jobs ++ * are evicted from the GPU before the switch. ++ */ ++ dev_err(kbdev->dev, "Unhandled page fault. For this GPU version we now soft-reset the GPU as part of page fault recovery."); ++ reset_status = kbase_prepare_to_reset_gpu(kbdev); + } -+ mutex_unlock(&mem_bkend->mutex); ++#endif /* KBASE_GPU_RESET_EN */ ++ /* switch to UNMAPPED mode, will abort all jobs and stop any hw counter dumping */ ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_mmu_disable(kctx); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ MALI_DEBUG_PRINT(4, ("OS Mem free : allocated size = 0x%x, free size = 0x%x\n", mem_bkend->os_mem.count * _MALI_OSK_MALI_PAGE_SIZE, -+ free_pages_nr * _MALI_OSK_MALI_PAGE_SIZE)); ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++ /* AS transaction end */ ++ /* Clear down the fault */ ++ kbase_mmu_hw_clear_fault(kbdev, as, kctx, ++ KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED); ++ kbase_mmu_hw_enable_fault(kbdev, as, kctx, ++ KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED); + -+ mem_bkend->os_mem.count = 0; -+ return free_pages_nr; ++#if KBASE_GPU_RESET_EN ++ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8245) && reset_status) ++ kbase_reset_gpu(kbdev); ++#endif /* KBASE_GPU_RESET_EN */ +} + -+ -+#define MALI_MEM_OS_PAGE_TABLE_PAGE_POOL_SIZE 128 -+static struct { -+ struct { -+ mali_dma_addr phys; -+ mali_io_address mapping; -+ } page[MALI_MEM_OS_PAGE_TABLE_PAGE_POOL_SIZE]; -+ size_t count; -+ spinlock_t lock; -+} mali_mem_page_table_page_pool = { -+ .count = 0, -+ .lock = __SPIN_LOCK_UNLOCKED(pool_lock), -+}; -+ -+_mali_osk_errcode_t mali_mem_os_get_table_page(mali_dma_addr *phys, mali_io_address *mapping) ++void kbasep_as_do_poke(struct work_struct *work) +{ -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_NOMEM; -+ dma_addr_t tmp_phys; ++ struct kbase_as *as; ++ struct kbase_device *kbdev; ++ struct kbase_context *kctx; ++ unsigned long flags; + -+ spin_lock(&mali_mem_page_table_page_pool.lock); -+ if (0 < mali_mem_page_table_page_pool.count) { -+ u32 i = --mali_mem_page_table_page_pool.count; -+ *phys = mali_mem_page_table_page_pool.page[i].phys; -+ *mapping = mali_mem_page_table_page_pool.page[i].mapping; ++ KBASE_DEBUG_ASSERT(work); ++ as = container_of(work, struct kbase_as, poke_work); ++ kbdev = container_of(as, struct kbase_device, as[as->number]); ++ KBASE_DEBUG_ASSERT(as->poke_state & KBASE_AS_POKE_STATE_IN_FLIGHT); + -+ ret = _MALI_OSK_ERR_OK; -+ } -+ spin_unlock(&mali_mem_page_table_page_pool.lock); ++ /* GPU power will already be active by virtue of the caller holding a JS ++ * reference on the address space, and will not release it until this worker ++ * has finished */ + -+ if (_MALI_OSK_ERR_OK != ret) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) -+ *mapping = dma_alloc_attrs(&mali_platform_device->dev, -+ _MALI_OSK_MALI_PAGE_SIZE, &tmp_phys, -+ GFP_KERNEL, DMA_ATTR_WRITE_COMBINE); -+#else -+ *mapping = dma_alloc_writecombine(&mali_platform_device->dev, -+ _MALI_OSK_MALI_PAGE_SIZE, &tmp_phys, GFP_KERNEL); -+#endif -+ if (NULL != *mapping) { -+ ret = _MALI_OSK_ERR_OK; ++ /* Further to the comment above, we know that while this function is running ++ * the AS will not be released as before the atom is released this workqueue ++ * is flushed (in kbase_as_poking_timer_release_atom) ++ */ ++ kctx = kbasep_js_runpool_lookup_ctx_noretain(kbdev, as->number); + -+#if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT) -+ /* Verify that the "physical" address is 32-bit and -+ * usable for Mali, when on a system with bus addresses -+ * wider than 32-bit. */ -+ MALI_DEBUG_ASSERT(0 == (tmp_phys >> 32)); -+#endif ++ /* AS transaction begin */ ++ mutex_lock(&kbdev->mmu_hw_mutex); ++ /* Force a uTLB invalidate */ ++ kbase_mmu_hw_do_operation(kbdev, as, kctx, 0, 0, ++ AS_COMMAND_UNLOCK, 0); ++ mutex_unlock(&kbdev->mmu_hw_mutex); ++ /* AS transaction end */ + -+ *phys = (mali_dma_addr)tmp_phys; -+ } ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ if (as->poke_refcount && ++ !(as->poke_state & KBASE_AS_POKE_STATE_KILLING_POKE)) { ++ /* Only queue up the timer if we need it, and we're not trying to kill it */ ++ hrtimer_start(&as->poke_timer, HR_TIMER_DELAY_MSEC(5), HRTIMER_MODE_REL); + } -+ -+ return ret; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} + -+void mali_mem_os_release_table_page(mali_dma_addr phys, void *virt) ++enum hrtimer_restart kbasep_as_poke_timer_callback(struct hrtimer *timer) +{ -+ spin_lock(&mali_mem_page_table_page_pool.lock); -+ if (MALI_MEM_OS_PAGE_TABLE_PAGE_POOL_SIZE > mali_mem_page_table_page_pool.count) { -+ u32 i = mali_mem_page_table_page_pool.count; -+ mali_mem_page_table_page_pool.page[i].phys = phys; -+ mali_mem_page_table_page_pool.page[i].mapping = virt; -+ -+ ++mali_mem_page_table_page_pool.count; ++ struct kbase_as *as; ++ int queue_work_ret; + -+ spin_unlock(&mali_mem_page_table_page_pool.lock); -+ } else { -+ spin_unlock(&mali_mem_page_table_page_pool.lock); ++ KBASE_DEBUG_ASSERT(NULL != timer); ++ as = container_of(timer, struct kbase_as, poke_timer); ++ KBASE_DEBUG_ASSERT(as->poke_state & KBASE_AS_POKE_STATE_IN_FLIGHT); + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) -+ dma_free_attrs(&mali_platform_device->dev, -+ _MALI_OSK_MALI_PAGE_SIZE, virt, phys, -+ DMA_ATTR_WRITE_COMBINE); -+#else -+ dma_free_writecombine(&mali_platform_device->dev, -+ _MALI_OSK_MALI_PAGE_SIZE, virt, phys); -+#endif -+ } ++ queue_work_ret = queue_work(as->poke_wq, &as->poke_work); ++ KBASE_DEBUG_ASSERT(queue_work_ret); ++ return HRTIMER_NORESTART; +} + -+void mali_mem_os_free_page_node(struct mali_page_node *m_page) ++/** ++ * Retain the poking timer on an atom's context (if the atom hasn't already ++ * done so), and start the timer (if it's not already started). ++ * ++ * This must only be called on a context that's scheduled in, and an atom ++ * that's running on the GPU. ++ * ++ * The caller must hold hwaccess_lock ++ * ++ * This can be called safely from atomic context ++ */ ++void kbase_as_poking_timer_retain_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *katom) +{ -+ struct page *page = m_page->page; -+ MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_OS); ++ struct kbase_as *as; + -+ if (1 == page_count(page)) { -+ dma_unmap_page(&mali_platform_device->dev, page_private(page), -+ _MALI_OSK_MALI_PAGE_SIZE, DMA_BIDIRECTIONAL); -+ ClearPagePrivate(page); ++ KBASE_DEBUG_ASSERT(kbdev); ++ KBASE_DEBUG_ASSERT(kctx); ++ KBASE_DEBUG_ASSERT(katom); ++ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ ++ if (katom->poking) ++ return; ++ ++ katom->poking = 1; ++ ++ /* It's safe to work on the as/as_nr without an explicit reference, ++ * because the caller holds the hwaccess_lock, and the atom itself ++ * was also running and had already taken a reference */ ++ as = &kbdev->as[kctx->as_nr]; ++ ++ if (++(as->poke_refcount) == 1) { ++ /* First refcount for poke needed: check if not already in flight */ ++ if (!as->poke_state) { ++ /* need to start poking */ ++ as->poke_state |= KBASE_AS_POKE_STATE_IN_FLIGHT; ++ queue_work(as->poke_wq, &as->poke_work); ++ } + } -+ __free_page(page); -+ m_page->page = NULL; -+ list_del(&m_page->list); -+ kfree(m_page); +} + -+/* The maximum number of page table pool pages to free in one go. */ -+#define MALI_MEM_OS_CHUNK_TO_FREE 64UL -+ -+/* Free a certain number of pages from the page table page pool. -+ * The pool lock must be held when calling the function, and the lock will be -+ * released before returning. ++/** ++ * If an atom holds a poking timer, release it and wait for it to finish ++ * ++ * This must only be called on a context that's scheduled in, and an atom ++ * that still has a JS reference on the context ++ * ++ * This must \b not be called from atomic context, since it can sleep. + */ -+static void mali_mem_os_page_table_pool_free(size_t nr_to_free) ++void kbase_as_poking_timer_release_atom(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_jd_atom *katom) +{ -+ mali_dma_addr phys_arr[MALI_MEM_OS_CHUNK_TO_FREE]; -+ void *virt_arr[MALI_MEM_OS_CHUNK_TO_FREE]; -+ u32 i; -+ -+ MALI_DEBUG_ASSERT(nr_to_free <= MALI_MEM_OS_CHUNK_TO_FREE); ++ struct kbase_as *as; ++ unsigned long flags; + -+ /* Remove nr_to_free pages from the pool and store them locally on stack. */ -+ for (i = 0; i < nr_to_free; i++) { -+ u32 pool_index = mali_mem_page_table_page_pool.count - i - 1; ++ KBASE_DEBUG_ASSERT(kbdev); ++ KBASE_DEBUG_ASSERT(kctx); ++ KBASE_DEBUG_ASSERT(katom); ++ KBASE_DEBUG_ASSERT(kctx->as_nr != KBASEP_AS_NR_INVALID); + -+ phys_arr[i] = mali_mem_page_table_page_pool.page[pool_index].phys; -+ virt_arr[i] = mali_mem_page_table_page_pool.page[pool_index].mapping; -+ } ++ if (!katom->poking) ++ return; + -+ mali_mem_page_table_page_pool.count -= nr_to_free; ++ as = &kbdev->as[kctx->as_nr]; + -+ spin_unlock(&mali_mem_page_table_page_pool.lock); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ KBASE_DEBUG_ASSERT(as->poke_refcount > 0); ++ KBASE_DEBUG_ASSERT(as->poke_state & KBASE_AS_POKE_STATE_IN_FLIGHT); + -+ /* After releasing the spinlock: free the pages we removed from the pool. */ -+ for (i = 0; i < nr_to_free; i++) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) -+ dma_free_attrs(&mali_platform_device->dev, _MALI_OSK_MALI_PAGE_SIZE, -+ virt_arr[i], (dma_addr_t)phys_arr[i], -+ DMA_ATTR_WRITE_COMBINE); -+#else -+ dma_free_writecombine(&mali_platform_device->dev, -+ _MALI_OSK_MALI_PAGE_SIZE, -+ virt_arr[i], (dma_addr_t)phys_arr[i]); -+#endif -+ } -+} ++ if (--(as->poke_refcount) == 0) { ++ as->poke_state |= KBASE_AS_POKE_STATE_KILLING_POKE; ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+static void mali_mem_os_trim_page_table_page_pool(void) -+{ -+ size_t nr_to_free = 0; -+ size_t nr_to_keep; ++ hrtimer_cancel(&as->poke_timer); ++ flush_workqueue(as->poke_wq); + -+ /* Keep 2 page table pages for each 1024 pages in the page cache. */ -+ nr_to_keep = mali_mem_os_allocator.pool_count / 512; -+ /* And a minimum of eight pages, to accomodate new sessions. */ -+ nr_to_keep += 8; ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + -+ if (0 == spin_trylock(&mali_mem_page_table_page_pool.lock)) return; ++ /* Re-check whether it's still needed */ ++ if (as->poke_refcount) { ++ int queue_work_ret; ++ /* Poking still needed: ++ * - Another retain will not be starting the timer or queueing work, ++ * because it's still marked as in-flight ++ * - The hrtimer has finished, and has not started a new timer or ++ * queued work because it's been marked as killing ++ * ++ * So whatever happens now, just queue the work again */ ++ as->poke_state &= ~((kbase_as_poke_state)KBASE_AS_POKE_STATE_KILLING_POKE); ++ queue_work_ret = queue_work(as->poke_wq, &as->poke_work); ++ KBASE_DEBUG_ASSERT(queue_work_ret); ++ } else { ++ /* It isn't - so mark it as not in flight, and not killing */ ++ as->poke_state = 0u; + -+ if (nr_to_keep < mali_mem_page_table_page_pool.count) { -+ nr_to_free = mali_mem_page_table_page_pool.count - nr_to_keep; -+ nr_to_free = min((size_t)MALI_MEM_OS_CHUNK_TO_FREE, nr_to_free); ++ /* The poke associated with the atom has now finished. If this is ++ * also the last atom on the context, then we can guarentee no more ++ * pokes (and thus no more poking register accesses) will occur on ++ * the context until new atoms are run */ ++ } + } ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); + -+ /* Pool lock will be released by the callee. */ -+ mali_mem_os_page_table_pool_free(nr_to_free); ++ katom->poking = 0; +} + -+static unsigned long mali_mem_os_shrink_count(struct shrinker *shrinker, struct shrink_control *sc) ++void kbase_mmu_interrupt_process(struct kbase_device *kbdev, struct kbase_context *kctx, struct kbase_as *as) +{ -+ return mali_mem_os_allocator.pool_count; -+} ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) -+static int mali_mem_os_shrink(int nr_to_scan, gfp_t gfp_mask) -+#else -+static int mali_mem_os_shrink(struct shrinker *shrinker, int nr_to_scan, gfp_t gfp_mask) -+#endif /* Linux < 2.6.35 */ -+#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) -+static int mali_mem_os_shrink(struct shrinker *shrinker, struct shrink_control *sc) -+#else -+static unsigned long mali_mem_os_shrink(struct shrinker *shrinker, struct shrink_control *sc) -+#endif /* Linux < 3.12.0 */ -+#endif /* Linux < 3.0.0 */ -+{ -+ struct mali_page_node *m_page, *m_tmp; -+ unsigned long flags; -+ struct list_head *le, pages; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) -+ int nr = nr_to_scan; -+#else -+ int nr = sc->nr_to_scan; -+#endif ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ if (0 == nr) { -+ return mali_mem_os_shrink_count(shrinker, sc); -+ } ++ if (!kctx) { ++ dev_warn(kbdev->dev, "%s in AS%d at 0x%016llx with no context present! Suprious IRQ or SW Design Error?\n", ++ kbase_as_has_bus_fault(as) ? "Bus error" : "Page fault", ++ as->number, as->fault_addr); + -+ if (0 == spin_trylock_irqsave(&mali_mem_os_allocator.pool_lock, flags)) { -+ /* Not able to lock. */ -+ return -1; -+ } -+ -+ if (0 == mali_mem_os_allocator.pool_count) { -+ /* No pages availble */ -+ spin_unlock_irqrestore(&mali_mem_os_allocator.pool_lock, flags); -+ return 0; -+ } -+ -+ /* Release from general page pool */ -+ nr = min((size_t)nr, mali_mem_os_allocator.pool_count); -+ mali_mem_os_allocator.pool_count -= nr; -+ list_for_each(le, &mali_mem_os_allocator.pool_pages) { -+ --nr; -+ if (0 == nr) break; -+ } -+ list_cut_position(&pages, &mali_mem_os_allocator.pool_pages, le); -+ spin_unlock_irqrestore(&mali_mem_os_allocator.pool_lock, flags); -+ -+ list_for_each_entry_safe(m_page, m_tmp, &pages, list) { -+ mali_mem_os_free_page_node(m_page); -+ } -+ -+ if (MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES > mali_mem_os_allocator.pool_count) { -+ /* Pools are empty, stop timer */ -+ MALI_DEBUG_PRINT(5, ("Stopping timer, only %u pages on pool\n", mali_mem_os_allocator.pool_count)); -+ cancel_delayed_work(&mali_mem_os_allocator.timed_shrinker); -+ } -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) -+ return mali_mem_os_shrink_count(shrinker, sc); -+#else -+ return nr; -+#endif -+} -+ -+static void mali_mem_os_trim_pool(struct work_struct *data) -+{ -+ struct mali_page_node *m_page, *m_tmp; -+ struct list_head *le; -+ LIST_HEAD(pages); -+ size_t nr_to_free; -+ -+ MALI_IGNORE(data); -+ -+ MALI_DEBUG_PRINT(3, ("OS Mem: Trimming pool %u\n", mali_mem_os_allocator.pool_count)); -+ -+ /* Release from general page pool */ -+ spin_lock(&mali_mem_os_allocator.pool_lock); -+ if (MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES < mali_mem_os_allocator.pool_count) { -+ size_t count = mali_mem_os_allocator.pool_count - MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES; -+ const size_t min_to_free = min(64, MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES); ++ /* Since no ctx was found, the MMU must be disabled. */ ++ WARN_ON(as->current_setup.transtab); + -+ /* Free half the pages on the pool above the static limit. Or 64 pages, 256KB. */ -+ nr_to_free = max(count / 2, min_to_free); ++ if (kbase_as_has_bus_fault(as)) { ++ kbase_mmu_hw_clear_fault(kbdev, as, kctx, ++ KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED); ++ kbase_mmu_hw_enable_fault(kbdev, as, kctx, ++ KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED); ++ } else if (kbase_as_has_page_fault(as)) { ++ kbase_mmu_hw_clear_fault(kbdev, as, kctx, ++ KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED); ++ kbase_mmu_hw_enable_fault(kbdev, as, kctx, ++ KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED); ++ } + -+ mali_mem_os_allocator.pool_count -= nr_to_free; -+ list_for_each(le, &mali_mem_os_allocator.pool_pages) { -+ --nr_to_free; -+ if (0 == nr_to_free) break; ++#if KBASE_GPU_RESET_EN ++ if (kbase_as_has_bus_fault(as) && ++ kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8245)) { ++ bool reset_status; ++ /* ++ * Reset the GPU, like in bus_fault_worker, in case an ++ * earlier error hasn't been properly cleared by this ++ * point. ++ */ ++ dev_err(kbdev->dev, "GPU bus error occurred. For this GPU version we now soft-reset as part of bus error recovery\n"); ++ reset_status = kbase_prepare_to_reset_gpu_locked(kbdev); ++ if (reset_status) ++ kbase_reset_gpu_locked(kbdev); + } -+ list_cut_position(&pages, &mali_mem_os_allocator.pool_pages, le); -+ } -+ spin_unlock(&mali_mem_os_allocator.pool_lock); ++#endif /* KBASE_GPU_RESET_EN */ + -+ list_for_each_entry_safe(m_page, m_tmp, &pages, list) { -+ mali_mem_os_free_page_node(m_page); ++ return; + } + -+ /* Release some pages from page table page pool */ -+ mali_mem_os_trim_page_table_page_pool(); -+ -+ if (MALI_OS_MEMORY_KERNEL_BUFFER_SIZE_IN_PAGES < mali_mem_os_allocator.pool_count) { -+ MALI_DEBUG_PRINT(4, ("OS Mem: Starting pool trim timer %u\n", mali_mem_os_allocator.pool_count)); -+ queue_delayed_work(mali_mem_os_allocator.wq, &mali_mem_os_allocator.timed_shrinker, MALI_OS_MEMORY_POOL_TRIM_JIFFIES); -+ } -+} ++ if (kbase_as_has_bus_fault(as)) { ++ /* ++ * hw counters dumping in progress, signal the ++ * other thread that it failed ++ */ ++ if ((kbdev->hwcnt.kctx == kctx) && ++ (kbdev->hwcnt.backend.state == ++ KBASE_INSTR_STATE_DUMPING)) ++ kbdev->hwcnt.backend.state = ++ KBASE_INSTR_STATE_FAULT; + -+_mali_osk_errcode_t mali_mem_os_init(void) -+{ -+ mali_mem_os_allocator.wq = alloc_workqueue("mali-mem", WQ_UNBOUND, 1); -+ if (NULL == mali_mem_os_allocator.wq) { -+ return _MALI_OSK_ERR_NOMEM; -+ } ++ /* ++ * Stop the kctx from submitting more jobs and cause it ++ * to be scheduled out/rescheduled when all references ++ * to it are released ++ */ ++ kbasep_js_clear_submit_allowed(js_devdata, kctx); + -+ register_shrinker(&mali_mem_os_allocator.shrinker); ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) ++ dev_warn(kbdev->dev, ++ "Bus error in AS%d at VA=0x%016llx, IPA=0x%016llx\n", ++ as->number, as->fault_addr, ++ as->fault_extra_addr); ++ else ++ dev_warn(kbdev->dev, "Bus error in AS%d at 0x%016llx\n", ++ as->number, as->fault_addr); + -+ return _MALI_OSK_ERR_OK; ++ /* ++ * We need to switch to UNMAPPED mode - but we do this in a ++ * worker so that we can sleep ++ */ ++ kbdev->kbase_group_error++; ++ KBASE_DEBUG_ASSERT(0 == object_is_on_stack(&as->work_busfault)); ++ WARN_ON(work_pending(&as->work_busfault)); ++ queue_work(as->pf_wq, &as->work_busfault); ++ atomic_inc(&kbdev->faults_pending); ++ } else { ++ kbdev->kbase_group_error++; ++ KBASE_DEBUG_ASSERT(0 == object_is_on_stack(&as->work_pagefault)); ++ WARN_ON(work_pending(&as->work_pagefault)); ++ queue_work(as->pf_wq, &as->work_pagefault); ++ atomic_inc(&kbdev->faults_pending); ++ } +} + -+void mali_mem_os_term(void) ++void kbase_flush_mmu_wqs(struct kbase_device *kbdev) +{ -+ struct mali_page_node *m_page, *m_tmp; -+ unregister_shrinker(&mali_mem_os_allocator.shrinker); -+ cancel_delayed_work_sync(&mali_mem_os_allocator.timed_shrinker); -+ -+ if (NULL != mali_mem_os_allocator.wq) { -+ destroy_workqueue(mali_mem_os_allocator.wq); -+ mali_mem_os_allocator.wq = NULL; -+ } ++ int i; + -+ spin_lock(&mali_mem_os_allocator.pool_lock); -+ list_for_each_entry_safe(m_page, m_tmp, &mali_mem_os_allocator.pool_pages, list) { -+ mali_mem_os_free_page_node(m_page); ++ for (i = 0; i < kbdev->nr_hw_address_spaces; i++) { ++ struct kbase_as *as = &kbdev->as[i]; + -+ --mali_mem_os_allocator.pool_count; ++ flush_workqueue(as->pf_wq); + } -+ BUG_ON(mali_mem_os_allocator.pool_count); -+ spin_unlock(&mali_mem_os_allocator.pool_lock); ++} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h b/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h +new file mode 100755 +index 000000000..986e959e9 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h +@@ -0,0 +1,123 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ /* Release from page table page pool */ -+ do { -+ u32 nr_to_free; + -+ spin_lock(&mali_mem_page_table_page_pool.lock); + -+ nr_to_free = min((size_t)MALI_MEM_OS_CHUNK_TO_FREE, mali_mem_page_table_page_pool.count); ++/** ++ * @file ++ * Interface file for accessing MMU hardware functionality ++ */ + -+ /* Pool lock will be released by the callee. */ -+ mali_mem_os_page_table_pool_free(nr_to_free); -+ } while (0 != mali_mem_page_table_page_pool.count); -+} ++/** ++ * @page mali_kbase_mmu_hw_page MMU hardware interface ++ * ++ * @section mali_kbase_mmu_hw_intro_sec Introduction ++ * This module provides an abstraction for accessing the functionality provided ++ * by the midgard MMU and thus allows all MMU HW access to be contained within ++ * one common place and allows for different backends (implementations) to ++ * be provided. ++ */ + -+_mali_osk_errcode_t mali_memory_core_resource_os_memory(u32 size) -+{ -+ mali_mem_os_allocator.allocation_limit = size; ++#ifndef _MALI_KBASE_MMU_HW_H_ ++#define _MALI_KBASE_MMU_HW_H_ + -+ MALI_SUCCESS; -+} ++/* Forward declarations */ ++struct kbase_device; ++struct kbase_as; ++struct kbase_context; + -+u32 mali_mem_os_stat(void) -+{ -+ return atomic_read(&mali_mem_os_allocator.allocated_pages) * _MALI_OSK_MALI_PAGE_SIZE; -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h -new file mode 100755 -index 000000000000..8c9b35d0b230 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h -@@ -0,0 +1,54 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * @addtogroup base_kbase_api ++ * @{ + */ + -+#ifndef __MALI_MEMORY_OS_ALLOC_H__ -+#define __MALI_MEMORY_OS_ALLOC_H__ -+ -+#include "mali_osk.h" -+#include "mali_memory_types.h" ++/** ++ * @addtogroup mali_kbase_mmu_hw MMU access APIs ++ * @{ ++ */ + ++/** @brief MMU fault type descriptor. ++ */ ++enum kbase_mmu_fault_type { ++ KBASE_MMU_FAULT_TYPE_UNKNOWN = 0, ++ KBASE_MMU_FAULT_TYPE_PAGE, ++ KBASE_MMU_FAULT_TYPE_BUS, ++ KBASE_MMU_FAULT_TYPE_PAGE_UNEXPECTED, ++ KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED ++}; + -+/** @brief Release Mali OS memory ++/** @brief Configure an address space for use. + * -+ * The session memory_lock must be held when calling this function. ++ * Configure the MMU using the address space details setup in the ++ * @ref kbase_context structure. + * -+ * @param mem_bkend Pointer to the mali_mem_backend to release ++ * @param[in] kbdev kbase device to configure. ++ * @param[in] as address space to configure. ++ * @param[in] kctx kbase context to configure. + */ -+u32 mali_mem_os_release(mali_mem_backend *mem_bkend); ++void kbase_mmu_hw_configure(struct kbase_device *kbdev, ++ struct kbase_as *as, struct kbase_context *kctx); + -+_mali_osk_errcode_t mali_mem_os_get_table_page(mali_dma_addr *phys, mali_io_address *mapping); ++/** @brief Issue an operation to the MMU. ++ * ++ * Issue an operation (MMU invalidate, MMU flush, etc) on the address space that ++ * is associated with the provided @ref kbase_context over the specified range ++ * ++ * @param[in] kbdev kbase device to issue the MMU operation on. ++ * @param[in] as address space to issue the MMU operation on. ++ * @param[in] kctx kbase context to issue the MMU operation on. ++ * @param[in] vpfn MMU Virtual Page Frame Number to start the ++ * operation on. ++ * @param[in] nr Number of pages to work on. ++ * @param[in] type Operation type (written to ASn_COMMAND). ++ * @param[in] handling_irq Is this operation being called during the handling ++ * of an interrupt? ++ * ++ * @return Zero if the operation was successful, non-zero otherwise. ++ */ ++int kbase_mmu_hw_do_operation(struct kbase_device *kbdev, struct kbase_as *as, ++ struct kbase_context *kctx, u64 vpfn, u32 nr, u32 type, ++ unsigned int handling_irq); + -+void mali_mem_os_release_table_page(mali_dma_addr phys, void *virt); ++/** @brief Clear a fault that has been previously reported by the MMU. ++ * ++ * Clear a bus error or page fault that has been reported by the MMU. ++ * ++ * @param[in] kbdev kbase device to clear the fault from. ++ * @param[in] as address space to clear the fault from. ++ * @param[in] kctx kbase context to clear the fault from or NULL. ++ * @param[in] type The type of fault that needs to be cleared. ++ */ ++void kbase_mmu_hw_clear_fault(struct kbase_device *kbdev, struct kbase_as *as, ++ struct kbase_context *kctx, enum kbase_mmu_fault_type type); + -+_mali_osk_errcode_t mali_mem_os_init(void); ++/** @brief Enable fault that has been previously reported by the MMU. ++ * ++ * After a page fault or bus error has been reported by the MMU these ++ * will be disabled. After these are handled this function needs to be ++ * called to enable the page fault or bus error fault again. ++ * ++ * @param[in] kbdev kbase device to again enable the fault from. ++ * @param[in] as address space to again enable the fault from. ++ * @param[in] kctx kbase context to again enable the fault from. ++ * @param[in] type The type of fault that needs to be enabled again. ++ */ ++void kbase_mmu_hw_enable_fault(struct kbase_device *kbdev, struct kbase_as *as, ++ struct kbase_context *kctx, enum kbase_mmu_fault_type type); + -+void mali_mem_os_term(void); ++/** @} *//* end group mali_kbase_mmu_hw */ ++/** @} *//* end group base_kbase_api */ + -+u32 mali_mem_os_stat(void); ++#endif /* _MALI_KBASE_MMU_HW_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h +new file mode 100755 +index 000000000..b487c0042 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h +@@ -0,0 +1,47 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2015, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+void mali_mem_os_free_page_node(struct mali_page_node *m_page); + -+int mali_mem_os_alloc_pages(mali_mem_os_mem *os_mem, u32 size); + -+u32 mali_mem_os_free(struct list_head *os_pages, u32 pages_count, mali_bool cow_flag); + -+_mali_osk_errcode_t mali_mem_os_put_page(struct page *page); + -+_mali_osk_errcode_t mali_mem_os_resize_pages(mali_mem_os_mem *mem_from, mali_mem_os_mem *mem_to, u32 start_page, u32 page_count); ++#ifndef _MALI_KBASE_MMU_MODE_ ++#define _MALI_KBASE_MMU_MODE_ + -+_mali_osk_errcode_t mali_mem_os_mali_map(mali_mem_os_mem *os_mem, struct mali_session_data *session, u32 vaddr, u32 start_page, u32 mapping_pgae_num, u32 props); ++#include + -+void mali_mem_os_mali_unmap(mali_mem_allocation *alloc); ++/* Forward declarations */ ++struct kbase_context; ++struct kbase_device; ++struct kbase_as; ++struct kbase_mmu_setup; + -+int mali_mem_os_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma); ++struct kbase_mmu_mode { ++ void (*update)(struct kbase_context *kctx); ++ void (*get_as_setup)(struct kbase_context *kctx, ++ struct kbase_mmu_setup * const setup); ++ void (*disable_as)(struct kbase_device *kbdev, int as_nr); ++ phys_addr_t (*pte_to_phy_addr)(u64 entry); ++ int (*ate_is_valid)(u64 ate); ++ int (*pte_is_valid)(u64 pte); ++ void (*entry_set_ate)(u64 *entry, phys_addr_t phy, unsigned long flags); ++ void (*entry_set_pte)(u64 *entry, phys_addr_t phy); ++ void (*entry_invalidate)(u64 *entry); ++}; + -+_mali_osk_errcode_t mali_mem_os_resize_cpu_map_locked(mali_mem_backend *mem_bkend, struct vm_area_struct *vma, unsigned long start_vaddr, u32 mappig_size); ++struct kbase_mmu_mode const *kbase_mmu_mode_get_lpae(void); ++struct kbase_mmu_mode const *kbase_mmu_mode_get_aarch64(void); + -+#endif /* __MALI_MEMORY_OS_ALLOC_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c ++#endif /* _MALI_KBASE_MMU_MODE_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c new file mode 100755 -index 000000000000..0b4f828680d0 +index 000000000..60df17116 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c -@@ -0,0 +1,170 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c +@@ -0,0 +1,200 @@ +/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2010-2014, 2016, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include "mali_kernel_common.h" -+#include "mali_memory.h" -+#include "mali_memory_secure.h" -+#include "mali_osk.h" -+#include -+#include -+#include -+#include + -+_mali_osk_errcode_t mali_mem_secure_attach_dma_buf(mali_mem_secure *secure_mem, u32 size, int mem_fd) -+{ -+ struct dma_buf *buf; -+ MALI_DEBUG_ASSERT_POINTER(secure_mem); + -+ /* get dma buffer */ -+ buf = dma_buf_get(mem_fd); -+ if (IS_ERR_OR_NULL(buf)) { -+ MALI_DEBUG_PRINT_ERROR(("Failed to get dma buf!\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } + -+ if (size != buf->size) { -+ MALI_DEBUG_PRINT_ERROR(("The secure mem size not match to the dma buf size!\n")); -+ goto failed_alloc_mem; -+ } + -+ secure_mem->buf = buf; -+ secure_mem->attachment = dma_buf_attach(secure_mem->buf, &mali_platform_device->dev); -+ if (NULL == secure_mem->attachment) { -+ MALI_DEBUG_PRINT_ERROR(("Failed to get dma buf attachment!\n")); -+ goto failed_dma_attach; -+ } ++#include "mali_kbase_mmu_mode.h" + -+ secure_mem->sgt = dma_buf_map_attachment(secure_mem->attachment, DMA_BIDIRECTIONAL); -+ if (IS_ERR_OR_NULL(secure_mem->sgt)) { -+ MALI_DEBUG_PRINT_ERROR(("Failed to map dma buf attachment\n")); -+ goto failed_dma_map; -+ } ++#include "mali_kbase.h" ++#include "mali_midg_regmap.h" + -+ secure_mem->count = size / MALI_MMU_PAGE_SIZE; ++#define ENTRY_TYPE_MASK 3ULL ++/* For valid ATEs bit 1 = (level == 3) ? 1 : 0. ++ * The MMU is only ever configured by the driver so that ATEs ++ * are at level 3, so bit 1 should always be set ++ */ ++#define ENTRY_IS_ATE 3ULL ++#define ENTRY_IS_INVAL 2ULL ++#define ENTRY_IS_PTE 3ULL + -+ return _MALI_OSK_ERR_OK; ++#define ENTRY_ATTR_BITS (7ULL << 2) /* bits 4:2 */ ++#define ENTRY_ACCESS_RW (1ULL << 6) /* bits 6:7 */ ++#define ENTRY_ACCESS_RO (3ULL << 6) ++#define ENTRY_SHARE_BITS (3ULL << 8) /* bits 9:8 */ ++#define ENTRY_ACCESS_BIT (1ULL << 10) ++#define ENTRY_NX_BIT (1ULL << 54) + -+failed_dma_map: -+ dma_buf_detach(secure_mem->buf, secure_mem->attachment); -+failed_dma_attach: -+failed_alloc_mem: -+ dma_buf_put(buf); -+ return _MALI_OSK_ERR_FAULT; ++/* Helper Function to perform assignment of page table entries, to ++ * ensure the use of strd, which is required on LPAE systems. ++ */ ++static inline void page_table_entry_set(u64 *pte, u64 phy) ++{ ++#ifdef CONFIG_64BIT ++ *pte = phy; ++#elif defined(CONFIG_ARM) ++ /* ++ * In order to prevent the compiler keeping cached copies of ++ * memory, we have to explicitly say that we have updated memory. ++ * ++ * Note: We could manually move the data ourselves into R0 and ++ * R1 by specifying register variables that are explicitly ++ * given registers assignments, the down side of this is that ++ * we have to assume cpu endianness. To avoid this we can use ++ * the ldrd to read the data from memory into R0 and R1 which ++ * will respect the cpu endianness, we then use strd to make ++ * the 64 bit assignment to the page table entry. ++ */ ++ asm volatile("ldrd r0, r1, [%[ptemp]]\n\t" ++ "strd r0, r1, [%[pte]]\n\t" ++ : "=m" (*pte) ++ : [ptemp] "r" (&phy), [pte] "r" (pte), "m" (phy) ++ : "r0", "r1"); ++#else ++#error "64-bit atomic write must be implemented for your architecture" ++#endif +} + -+_mali_osk_errcode_t mali_mem_secure_mali_map(mali_mem_secure *secure_mem, struct mali_session_data *session, u32 vaddr, u32 props) ++static void mmu_get_as_setup(struct kbase_context *kctx, ++ struct kbase_mmu_setup * const setup) +{ -+ struct mali_page_directory *pagedir; -+ struct scatterlist *sg; -+ u32 virt = vaddr; -+ u32 prop = props; -+ int i; ++ /* Set up the required caching policies at the correct indices ++ * in the memattr register. ++ */ ++ setup->memattr = ++ (AS_MEMATTR_IMPL_DEF_CACHE_POLICY << ++ (AS_MEMATTR_INDEX_IMPL_DEF_CACHE_POLICY * 8)) | ++ (AS_MEMATTR_FORCE_TO_CACHE_ALL << ++ (AS_MEMATTR_INDEX_FORCE_TO_CACHE_ALL * 8)) | ++ (AS_MEMATTR_WRITE_ALLOC << ++ (AS_MEMATTR_INDEX_WRITE_ALLOC * 8)) | ++ (AS_MEMATTR_AARCH64_OUTER_IMPL_DEF << ++ (AS_MEMATTR_INDEX_OUTER_IMPL_DEF * 8)) | ++ (AS_MEMATTR_AARCH64_OUTER_WA << ++ (AS_MEMATTR_INDEX_OUTER_WA * 8)); + -+ MALI_DEBUG_ASSERT_POINTER(secure_mem); -+ MALI_DEBUG_ASSERT_POINTER(secure_mem->sgt); -+ MALI_DEBUG_ASSERT_POINTER(session); ++ setup->transtab = (u64)kctx->pgd & AS_TRANSTAB_BASE_MASK; ++ setup->transcfg = AS_TRANSCFG_ADRMODE_AARCH64_4K; ++} + -+ pagedir = session->page_directory; ++static void mmu_update(struct kbase_context *kctx) ++{ ++ struct kbase_device * const kbdev = kctx->kbdev; ++ struct kbase_as * const as = &kbdev->as[kctx->as_nr]; ++ struct kbase_mmu_setup * const current_setup = &as->current_setup; + -+ for_each_sg(secure_mem->sgt->sgl, sg, secure_mem->sgt->nents, i) { -+ u32 size = sg_dma_len(sg); -+ dma_addr_t phys = sg_dma_address(sg); ++ mmu_get_as_setup(kctx, current_setup); + -+ /* sg must be page aligned. */ -+ MALI_DEBUG_ASSERT(0 == size % MALI_MMU_PAGE_SIZE); -+ MALI_DEBUG_ASSERT(0 == (phys & ~(uintptr_t)0xFFFFFFFF)); ++ /* Apply the address space setting */ ++ kbase_mmu_hw_configure(kbdev, as, kctx); ++} + -+ mali_mmu_pagedir_update(pagedir, virt, phys, size, prop); ++static void mmu_disable_as(struct kbase_device *kbdev, int as_nr) ++{ ++ struct kbase_as * const as = &kbdev->as[as_nr]; ++ struct kbase_mmu_setup * const current_setup = &as->current_setup; + -+ MALI_DEBUG_PRINT(3, ("The secure mem physical address: 0x%x gpu virtual address: 0x%x! \n", phys, virt)); -+ virt += size; -+ } ++ current_setup->transtab = 0ULL; ++ current_setup->transcfg = AS_TRANSCFG_ADRMODE_UNMAPPED; + -+ return _MALI_OSK_ERR_OK; ++ /* Apply the address space setting */ ++ kbase_mmu_hw_configure(kbdev, as, NULL); +} + -+void mali_mem_secure_mali_unmap(mali_mem_allocation *alloc) ++static phys_addr_t pte_to_phy_addr(u64 entry) +{ -+ struct mali_session_data *session; -+ MALI_DEBUG_ASSERT_POINTER(alloc); -+ session = alloc->session; -+ MALI_DEBUG_ASSERT_POINTER(session); ++ if (!(entry & 1)) ++ return 0; + -+ mali_session_memory_lock(session); -+ mali_mem_mali_map_free(session, alloc->psize, alloc->mali_vma_node.vm_node.start, -+ alloc->flags); -+ mali_session_memory_unlock(session); ++ return entry & ~0xFFF; +} + -+ -+int mali_mem_secure_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma) ++static int ate_is_valid(u64 ate) +{ ++ return ((ate & ENTRY_TYPE_MASK) == ENTRY_IS_ATE); ++} + -+ int ret = 0; -+ struct scatterlist *sg; -+ mali_mem_secure *secure_mem = &mem_bkend->secure_mem; -+ unsigned long addr = vma->vm_start; -+ int i; ++static int pte_is_valid(u64 pte) ++{ ++ return ((pte & ENTRY_TYPE_MASK) == ENTRY_IS_PTE); ++} + -+ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_SECURE); ++/* ++ * Map KBASE_REG flags to MMU flags ++ */ ++static u64 get_mmu_flags(unsigned long flags) ++{ ++ u64 mmu_flags; + -+ for_each_sg(secure_mem->sgt->sgl, sg, secure_mem->sgt->nents, i) { -+ phys_addr_t phys; -+ dma_addr_t dev_addr; -+ u32 size, j; -+ dev_addr = sg_dma_address(sg); -+#if defined(CONFIG_ARM64) ||LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) -+ phys = dma_to_phys(&mali_platform_device->dev, dev_addr); -+#else -+ phys = page_to_phys(pfn_to_page(dma_to_pfn(&mali_platform_device->dev, dev_addr))); -+#endif -+ size = sg_dma_len(sg); -+ MALI_DEBUG_ASSERT(0 == size % _MALI_OSK_MALI_PAGE_SIZE); ++ /* store mem_attr index as 4:2 (macro called ensures 3 bits already) */ ++ mmu_flags = KBASE_REG_MEMATTR_VALUE(flags) << 2; + -+ for (j = 0; j < size / _MALI_OSK_MALI_PAGE_SIZE; j++) { -+ ret = vmf_insert_pfn(vma, addr, PFN_DOWN(phys)); ++ /* Set access flags - note that AArch64 stage 1 does not support ++ * write-only access, so we use read/write instead ++ */ ++ if (flags & KBASE_REG_GPU_WR) ++ mmu_flags |= ENTRY_ACCESS_RW; ++ else if (flags & KBASE_REG_GPU_RD) ++ mmu_flags |= ENTRY_ACCESS_RO; + -+ if (unlikely(0 != ret)) { -+ return -EFAULT; -+ } -+ addr += _MALI_OSK_MALI_PAGE_SIZE; -+ phys += _MALI_OSK_MALI_PAGE_SIZE; ++ /* nx if requested */ ++ mmu_flags |= (flags & KBASE_REG_GPU_NX) ? ENTRY_NX_BIT : 0; + -+ MALI_DEBUG_PRINT(3, ("The secure mem physical address: 0x%x , cpu virtual address: 0x%x! \n", phys, addr)); -+ } ++ if (flags & KBASE_REG_SHARE_BOTH) { ++ /* inner and outer shareable */ ++ mmu_flags |= SHARE_BOTH_BITS; ++ } else if (flags & KBASE_REG_SHARE_IN) { ++ /* inner shareable coherency */ ++ mmu_flags |= SHARE_INNER_BITS; + } -+ return ret; ++ ++ return mmu_flags; +} + -+u32 mali_mem_secure_release(mali_mem_backend *mem_bkend) ++static void entry_set_ate(u64 *entry, phys_addr_t phy, unsigned long flags) +{ -+ struct mali_mem_secure *mem; -+ mali_mem_allocation *alloc = mem_bkend->mali_allocation; -+ u32 free_pages_nr = 0; -+ MALI_DEBUG_ASSERT(mem_bkend->type == MALI_MEM_SECURE); -+ -+ mem = &mem_bkend->secure_mem; -+ MALI_DEBUG_ASSERT_POINTER(mem->attachment); -+ MALI_DEBUG_ASSERT_POINTER(mem->buf); -+ MALI_DEBUG_ASSERT_POINTER(mem->sgt); -+ /* Unmap the memory from the mali virtual address space. */ -+ mali_mem_secure_mali_unmap(alloc); -+ mutex_lock(&mem_bkend->mutex); -+ dma_buf_unmap_attachment(mem->attachment, mem->sgt, DMA_BIDIRECTIONAL); -+ dma_buf_detach(mem->buf, mem->attachment); -+ dma_buf_put(mem->buf); -+ mutex_unlock(&mem_bkend->mutex); ++ page_table_entry_set(entry, (phy & ~0xFFF) | ++ get_mmu_flags(flags) | ++ ENTRY_ACCESS_BIT | ENTRY_IS_ATE); ++} + -+ free_pages_nr = mem->count; ++static void entry_set_pte(u64 *entry, phys_addr_t phy) ++{ ++ page_table_entry_set(entry, (phy & ~0xFFF) | ++ ENTRY_ACCESS_BIT | ENTRY_IS_PTE); ++} + -+ return free_pages_nr; ++static void entry_invalidate(u64 *entry) ++{ ++ page_table_entry_set(entry, ENTRY_IS_INVAL); +} + ++static struct kbase_mmu_mode const aarch64_mode = { ++ .update = mmu_update, ++ .get_as_setup = mmu_get_as_setup, ++ .disable_as = mmu_disable_as, ++ .pte_to_phy_addr = pte_to_phy_addr, ++ .ate_is_valid = ate_is_valid, ++ .pte_is_valid = pte_is_valid, ++ .entry_set_ate = entry_set_ate, ++ .entry_set_pte = entry_set_pte, ++ .entry_invalidate = entry_invalidate ++}; + -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h ++struct kbase_mmu_mode const *kbase_mmu_mode_get_aarch64(void) ++{ ++ return &aarch64_mode; ++} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c new file mode 100755 -index 000000000000..48691d4790fe +index 000000000..53fbbc73a --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h -@@ -0,0 +1,30 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c +@@ -0,0 +1,198 @@ +/* -+ * Copyright (C) 2010, 2013, 2015-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef __MALI_MEMORY_SECURE_H__ -+#define __MALI_MEMORY_SECURE_H__ -+ -+#include "mali_session.h" -+#include "mali_memory.h" -+#include -+ -+#include "mali_memory_types.h" + -+_mali_osk_errcode_t mali_mem_secure_attach_dma_buf(mali_mem_secure *secure_mem, u32 size, int mem_fd); + -+_mali_osk_errcode_t mali_mem_secure_mali_map(mali_mem_secure *secure_mem, struct mali_session_data *session, u32 vaddr, u32 props); + -+void mali_mem_secure_mali_unmap(mali_mem_allocation *alloc); + -+int mali_mem_secure_cpu_map(mali_mem_backend *mem_bkend, struct vm_area_struct *vma); ++#include "mali_kbase_mmu_mode.h" + -+u32 mali_mem_secure_release(mali_mem_backend *mem_bkend); ++#include "mali_kbase.h" ++#include "mali_midg_regmap.h" + -+#endif /* __MALI_MEMORY_SECURE_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c -new file mode 100755 -index 000000000000..d682785b9673 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c -@@ -0,0 +1,943 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++#define ENTRY_TYPE_MASK 3ULL ++#define ENTRY_IS_ATE 1ULL ++#define ENTRY_IS_INVAL 2ULL ++#define ENTRY_IS_PTE 3ULL + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "mali_osk.h" -+#include "mali_osk_mali.h" -+#include "mali_memory.h" -+#include "mali_memory_manager.h" -+#include "mali_memory_virtual.h" -+#include "mali_memory_cow.h" -+#include "mali_ukk.h" -+#include "mali_kernel_utilization.h" -+#include "mali_memory_swap_alloc.h" ++#define ENTRY_ATTR_BITS (7ULL << 2) /* bits 4:2 */ ++#define ENTRY_RD_BIT (1ULL << 6) ++#define ENTRY_WR_BIT (1ULL << 7) ++#define ENTRY_SHARE_BITS (3ULL << 8) /* bits 9:8 */ ++#define ENTRY_ACCESS_BIT (1ULL << 10) ++#define ENTRY_NX_BIT (1ULL << 54) + ++#define ENTRY_FLAGS_MASK (ENTRY_ATTR_BITS | ENTRY_RD_BIT | ENTRY_WR_BIT | \ ++ ENTRY_SHARE_BITS | ENTRY_ACCESS_BIT | ENTRY_NX_BIT) + -+static struct _mali_osk_bitmap idx_mgr; -+static struct file *global_swap_file; -+static struct address_space *global_swap_space; -+static _mali_osk_wq_work_t *mali_mem_swap_out_workq = NULL; -+static u32 mem_backend_swapped_pool_size; -+#ifdef MALI_MEM_SWAP_TRACKING -+static u32 mem_backend_swapped_unlock_size; ++/* Helper Function to perform assignment of page table entries, to ++ * ensure the use of strd, which is required on LPAE systems. ++ */ ++static inline void page_table_entry_set(u64 *pte, u64 phy) ++{ ++#ifdef CONFIG_64BIT ++ *pte = phy; ++#elif defined(CONFIG_ARM) ++ /* ++ * In order to prevent the compiler keeping cached copies of ++ * memory, we have to explicitly say that we have updated ++ * memory. ++ * ++ * Note: We could manually move the data ourselves into R0 and ++ * R1 by specifying register variables that are explicitly ++ * given registers assignments, the down side of this is that ++ * we have to assume cpu endianness. To avoid this we can use ++ * the ldrd to read the data from memory into R0 and R1 which ++ * will respect the cpu endianness, we then use strd to make ++ * the 64 bit assignment to the page table entry. ++ */ ++ asm volatile("ldrd r0, r1, [%[ptemp]]\n\t" ++ "strd r0, r1, [%[pte]]\n\t" ++ : "=m" (*pte) ++ : [ptemp] "r" (&phy), [pte] "r" (pte), "m" (phy) ++ : "r0", "r1"); ++#else ++#error "64-bit atomic write must be implemented for your architecture" +#endif -+/* Lock order: mem_backend_swapped_pool_lock > each memory backend's mutex lock. -+ * This lock used to protect mem_backend_swapped_pool_size and mem_backend_swapped_pool. */ -+static struct mutex mem_backend_swapped_pool_lock; -+static struct list_head mem_backend_swapped_pool; -+ -+extern struct mali_mem_os_allocator mali_mem_os_allocator; -+ -+#define MALI_SWAP_LOW_MEM_DEFAULT_VALUE (60*1024*1024) -+#define MALI_SWAP_INVALIDATE_MALI_ADDRESS (0) /* Used to mark the given memory cookie is invalidate. */ -+#define MALI_SWAP_GLOBAL_SWAP_FILE_SIZE (0xFFFFFFFF) -+#define MALI_SWAP_GLOBAL_SWAP_FILE_INDEX \ -+ ((MALI_SWAP_GLOBAL_SWAP_FILE_SIZE) >> PAGE_SHIFT) -+#define MALI_SWAP_GLOBAL_SWAP_FILE_INDEX_RESERVE (1 << 15) /* Reserved for CoW nonlinear swap backend memory, the space size is 128MB. */ ++} + -+unsigned int mali_mem_swap_out_threshold_value = MALI_SWAP_LOW_MEM_DEFAULT_VALUE; ++static void mmu_get_as_setup(struct kbase_context *kctx, ++ struct kbase_mmu_setup * const setup) ++{ ++ /* Set up the required caching policies at the correct indices ++ * in the memattr register. */ ++ setup->memattr = ++ (AS_MEMATTR_LPAE_IMPL_DEF_CACHE_POLICY << ++ (AS_MEMATTR_INDEX_IMPL_DEF_CACHE_POLICY * 8)) | ++ (AS_MEMATTR_LPAE_FORCE_TO_CACHE_ALL << ++ (AS_MEMATTR_INDEX_FORCE_TO_CACHE_ALL * 8)) | ++ (AS_MEMATTR_LPAE_WRITE_ALLOC << ++ (AS_MEMATTR_INDEX_WRITE_ALLOC * 8)) | ++ (AS_MEMATTR_LPAE_OUTER_IMPL_DEF << ++ (AS_MEMATTR_INDEX_OUTER_IMPL_DEF * 8)) | ++ (AS_MEMATTR_LPAE_OUTER_WA << ++ (AS_MEMATTR_INDEX_OUTER_WA * 8)) | ++ 0; /* The other indices are unused for now */ + -+/** -+ * We have two situations to do shrinking things, one is we met low GPU utilization which shows GPU needn't touch too -+ * swappable backends in short time, and the other one is we add new swappable backends, the total pool size exceed -+ * the threshold value of the swapped pool size. -+ */ -+typedef enum { -+ MALI_MEM_SWAP_SHRINK_WITH_LOW_UTILIZATION = 100, -+ MALI_MEM_SWAP_SHRINK_FOR_ADDING_NEW_BACKENDS = 257, -+} _mali_mem_swap_pool_shrink_type_t; ++ setup->transtab = ((u64)kctx->pgd & ++ ((0xFFFFFFFFULL << 32) | AS_TRANSTAB_LPAE_ADDR_SPACE_MASK)) | ++ AS_TRANSTAB_LPAE_ADRMODE_TABLE | ++ AS_TRANSTAB_LPAE_READ_INNER; + -+static void mali_mem_swap_swapped_bkend_pool_check_for_low_utilization(void *arg); ++ setup->transcfg = 0; ++} + -+_mali_osk_errcode_t mali_mem_swap_init(void) ++static void mmu_update(struct kbase_context *kctx) +{ -+ gfp_t flags = __GFP_NORETRY | __GFP_NOWARN; ++ struct kbase_device * const kbdev = kctx->kbdev; ++ struct kbase_as * const as = &kbdev->as[kctx->as_nr]; ++ struct kbase_mmu_setup * const current_setup = &as->current_setup; + -+ if (_MALI_OSK_ERR_OK != _mali_osk_bitmap_init(&idx_mgr, MALI_SWAP_GLOBAL_SWAP_FILE_INDEX, MALI_SWAP_GLOBAL_SWAP_FILE_INDEX_RESERVE)) { -+ return _MALI_OSK_ERR_NOMEM; -+ } ++ mmu_get_as_setup(kctx, current_setup); + -+ global_swap_file = shmem_file_setup("mali_swap", MALI_SWAP_GLOBAL_SWAP_FILE_SIZE, VM_NORESERVE); -+ if (IS_ERR(global_swap_file)) { -+ _mali_osk_bitmap_term(&idx_mgr); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++ /* Apply the address space setting */ ++ kbase_mmu_hw_configure(kbdev, as, kctx); ++} + -+ global_swap_space = global_swap_file->f_path.dentry->d_inode->i_mapping; ++static void mmu_disable_as(struct kbase_device *kbdev, int as_nr) ++{ ++ struct kbase_as * const as = &kbdev->as[as_nr]; ++ struct kbase_mmu_setup * const current_setup = &as->current_setup; + -+ mali_mem_swap_out_workq = _mali_osk_wq_create_work(mali_mem_swap_swapped_bkend_pool_check_for_low_utilization, NULL); -+ if (NULL == mali_mem_swap_out_workq) { -+ _mali_osk_bitmap_term(&idx_mgr); -+ fput(global_swap_file); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++ current_setup->transtab = AS_TRANSTAB_LPAE_ADRMODE_UNMAPPED; + -+#if defined(CONFIG_ARM) && !defined(CONFIG_ARM_LPAE) -+ flags |= GFP_HIGHUSER; -+#else -+#ifdef CONFIG_ZONE_DMA32 -+ flags |= GFP_DMA32; -+#else -+#ifdef CONFIG_ZONE_DMA -+ flags |= GFP_DMA; -+#else -+ /* arm64 utgard only work on < 4G, but the kernel -+ * didn't provide method to allocte memory < 4G -+ */ -+ MALI_DEBUG_ASSERT(0); -+#endif -+#endif -+#endif ++ /* Apply the address space setting */ ++ kbase_mmu_hw_configure(kbdev, as, NULL); ++} + -+ /* When we use shmem_read_mapping_page to allocate/swap-in, it will -+ * use these flags to allocate new page if need.*/ -+ mapping_set_gfp_mask(global_swap_space, flags); ++static phys_addr_t pte_to_phy_addr(u64 entry) ++{ ++ if (!(entry & 1)) ++ return 0; + -+ mem_backend_swapped_pool_size = 0; -+#ifdef MALI_MEM_SWAP_TRACKING -+ mem_backend_swapped_unlock_size = 0; -+#endif -+ mutex_init(&mem_backend_swapped_pool_lock); -+ INIT_LIST_HEAD(&mem_backend_swapped_pool); ++ return entry & ~0xFFF; ++} + -+ MALI_DEBUG_PRINT(2, ("Mali SWAP: Swap out threshold vaule is %uM\n", mali_mem_swap_out_threshold_value >> 20)); ++static int ate_is_valid(u64 ate) ++{ ++ return ((ate & ENTRY_TYPE_MASK) == ENTRY_IS_ATE); ++} + -+ return _MALI_OSK_ERR_OK; ++static int pte_is_valid(u64 pte) ++{ ++ return ((pte & ENTRY_TYPE_MASK) == ENTRY_IS_PTE); +} + -+void mali_mem_swap_term(void) ++/* ++ * Map KBASE_REG flags to MMU flags ++ */ ++static u64 get_mmu_flags(unsigned long flags) +{ -+ _mali_osk_bitmap_term(&idx_mgr); ++ u64 mmu_flags; + -+ fput(global_swap_file); ++ /* store mem_attr index as 4:2 (macro called ensures 3 bits already) */ ++ mmu_flags = KBASE_REG_MEMATTR_VALUE(flags) << 2; + -+ _mali_osk_wq_delete_work(mali_mem_swap_out_workq); ++ /* write perm if requested */ ++ mmu_flags |= (flags & KBASE_REG_GPU_WR) ? ENTRY_WR_BIT : 0; ++ /* read perm if requested */ ++ mmu_flags |= (flags & KBASE_REG_GPU_RD) ? ENTRY_RD_BIT : 0; ++ /* nx if requested */ ++ mmu_flags |= (flags & KBASE_REG_GPU_NX) ? ENTRY_NX_BIT : 0; + -+ MALI_DEBUG_ASSERT(list_empty(&mem_backend_swapped_pool)); -+ MALI_DEBUG_ASSERT(0 == mem_backend_swapped_pool_size); ++ if (flags & KBASE_REG_SHARE_BOTH) { ++ /* inner and outer shareable */ ++ mmu_flags |= SHARE_BOTH_BITS; ++ } else if (flags & KBASE_REG_SHARE_IN) { ++ /* inner shareable coherency */ ++ mmu_flags |= SHARE_INNER_BITS; ++ } + -+ return; ++ return mmu_flags; +} + -+struct file *mali_mem_swap_get_global_swap_file(void) ++static void entry_set_ate(u64 *entry, phys_addr_t phy, unsigned long flags) +{ -+ return global_swap_file; ++ page_table_entry_set(entry, (phy & ~0xFFF) | ++ get_mmu_flags(flags) | ++ ENTRY_IS_ATE); +} + -+/* Judge if swappable backend in swapped pool. */ -+static mali_bool mali_memory_swap_backend_in_swapped_pool(mali_mem_backend *mem_bkend) ++static void entry_set_pte(u64 *entry, phys_addr_t phy) +{ -+ MALI_DEBUG_ASSERT_POINTER(mem_bkend); -+ -+ return !list_empty(&mem_bkend->list); ++ page_table_entry_set(entry, (phy & ~0xFFF) | ENTRY_IS_PTE); +} + -+void mali_memory_swap_list_backend_delete(mali_mem_backend *mem_bkend) ++static void entry_invalidate(u64 *entry) +{ -+ MALI_DEBUG_ASSERT_POINTER(mem_bkend); -+ -+ mutex_lock(&mem_backend_swapped_pool_lock); -+ mutex_lock(&mem_bkend->mutex); ++ page_table_entry_set(entry, ENTRY_IS_INVAL); ++} + -+ if (MALI_FALSE == mali_memory_swap_backend_in_swapped_pool(mem_bkend)) { -+ mutex_unlock(&mem_bkend->mutex); -+ mutex_unlock(&mem_backend_swapped_pool_lock); -+ return; -+ } ++static struct kbase_mmu_mode const lpae_mode = { ++ .update = mmu_update, ++ .get_as_setup = mmu_get_as_setup, ++ .disable_as = mmu_disable_as, ++ .pte_to_phy_addr = pte_to_phy_addr, ++ .ate_is_valid = ate_is_valid, ++ .pte_is_valid = pte_is_valid, ++ .entry_set_ate = entry_set_ate, ++ .entry_set_pte = entry_set_pte, ++ .entry_invalidate = entry_invalidate ++}; + -+ MALI_DEBUG_ASSERT(!list_empty(&mem_bkend->list)); ++struct kbase_mmu_mode const *kbase_mmu_mode_get_lpae(void) ++{ ++ return &lpae_mode; ++} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c b/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c +new file mode 100755 +index 000000000..1a44957fe +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c +@@ -0,0 +1,124 @@ ++/* ++ * ++ * (C) COPYRIGHT 2011-2014, 2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ list_del_init(&mem_bkend->list); + -+ mutex_unlock(&mem_bkend->mutex); + -+ mem_backend_swapped_pool_size -= mem_bkend->size; ++#ifdef CONFIG_MALI_PLATFORM_FAKE + -+ mutex_unlock(&mem_backend_swapped_pool_lock); -+} ++#include ++#include ++#include ++#include ++#include + -+static void mali_mem_swap_out_page_node(mali_page_node *page_node) -+{ -+ MALI_DEBUG_ASSERT(page_node); + -+ dma_unmap_page(&mali_platform_device->dev, page_node->swap_it->dma_addr, -+ _MALI_OSK_MALI_PAGE_SIZE, DMA_TO_DEVICE); -+ set_page_dirty(page_node->swap_it->page); -+ put_page(page_node->swap_it->page); -+} ++/* ++ * This file is included only for type definitions and functions belonging to ++ * specific platform folders. Do not add dependencies with symbols that are ++ * defined somewhere else. ++ */ ++#include + -+void mali_mem_swap_unlock_single_mem_backend(mali_mem_backend *mem_bkend) -+{ -+ mali_page_node *m_page; ++#define PLATFORM_CONFIG_RESOURCE_COUNT 4 ++#define PLATFORM_CONFIG_IRQ_RES_COUNT 3 + -+ MALI_DEBUG_ASSERT(1 == mutex_is_locked(&mem_bkend->mutex)); ++static struct platform_device *mali_device; + -+ if (MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN == (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN)) { ++#ifndef CONFIG_OF ++/** ++ * @brief Convert data in struct kbase_io_resources struct to Linux-specific resources ++ * ++ * Function converts data in struct kbase_io_resources struct to an array of Linux resource structures. Note that function ++ * assumes that size of linux_resource array is at least PLATFORM_CONFIG_RESOURCE_COUNT. ++ * Resources are put in fixed order: I/O memory region, job IRQ, MMU IRQ, GPU IRQ. ++ * ++ * @param[in] io_resource Input IO resource data ++ * @param[out] linux_resources Pointer to output array of Linux resource structures ++ */ ++static void kbasep_config_parse_io_resources(const struct kbase_io_resources *io_resources, struct resource *const linux_resources) ++{ ++ if (!io_resources || !linux_resources) { ++ pr_err("%s: couldn't find proper resources\n", __func__); + return; + } + -+ mem_bkend->flags |= MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN; -+ -+ list_for_each_entry(m_page, &mem_bkend->swap_mem.pages, list) { -+ mali_mem_swap_out_page_node(m_page); -+ } ++ memset(linux_resources, 0, PLATFORM_CONFIG_RESOURCE_COUNT * sizeof(struct resource)); + -+ return; -+} ++ linux_resources[0].start = io_resources->io_memory_region.start; ++ linux_resources[0].end = io_resources->io_memory_region.end; ++ linux_resources[0].flags = IORESOURCE_MEM; + -+static void mali_mem_swap_unlock_partial_locked_mem_backend(mali_mem_backend *mem_bkend, mali_page_node *page_node) -+{ -+ mali_page_node *m_page; ++ linux_resources[1].start = io_resources->job_irq_number; ++ linux_resources[1].end = io_resources->job_irq_number; ++ linux_resources[1].flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL; + -+ MALI_DEBUG_ASSERT(1 == mutex_is_locked(&mem_bkend->mutex)); ++ linux_resources[2].start = io_resources->mmu_irq_number; ++ linux_resources[2].end = io_resources->mmu_irq_number; ++ linux_resources[2].flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL; + -+ list_for_each_entry(m_page, &mem_bkend->swap_mem.pages, list) { -+ if (m_page == page_node) { -+ break; -+ } -+ mali_mem_swap_out_page_node(m_page); -+ } ++ linux_resources[3].start = io_resources->gpu_irq_number; ++ linux_resources[3].end = io_resources->gpu_irq_number; ++ linux_resources[3].flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL; +} ++#endif /* CONFIG_OF */ + -+static void mali_mem_swap_swapped_bkend_pool_shrink(_mali_mem_swap_pool_shrink_type_t shrink_type) ++int kbase_platform_fake_register(void) +{ -+ mali_mem_backend *bkend, *tmp_bkend; -+ long system_free_size; -+ u32 last_gpu_utilization, gpu_utilization_threshold_value, temp_swap_out_threshold_value; -+ -+ MALI_DEBUG_ASSERT(1 == mutex_is_locked(&mem_backend_swapped_pool_lock)); ++ struct kbase_platform_config *config; ++#ifndef CONFIG_OF ++ struct resource resources[PLATFORM_CONFIG_RESOURCE_COUNT]; ++#endif ++ int err; + -+ if (MALI_MEM_SWAP_SHRINK_WITH_LOW_UTILIZATION == shrink_type) { -+ /** -+ * When we met that system memory is very low and Mali locked swappable memory size is less than -+ * threshold value, and at the same time, GPU load is very low and don't need high performance, -+ * at this condition, we can unlock more swap memory backend from swapped backends pool. -+ */ -+ gpu_utilization_threshold_value = MALI_MEM_SWAP_SHRINK_WITH_LOW_UTILIZATION; -+ temp_swap_out_threshold_value = (mali_mem_swap_out_threshold_value >> 2); -+ } else { -+ /* When we add swappable memory backends to swapped pool, we need to think that we couldn't -+ * hold too much swappable backends in Mali driver, and also we need considering performance. -+ * So there is a balance for swapping out memory backend, we should follow the following conditions: -+ * 1. Total memory size in global mem backend swapped pool is more than the defined threshold value. -+ * 2. System level free memory size is less than the defined threshold value. -+ * 3. Please note that GPU utilization problem isn't considered in this condition. -+ */ -+ gpu_utilization_threshold_value = MALI_MEM_SWAP_SHRINK_FOR_ADDING_NEW_BACKENDS; -+ temp_swap_out_threshold_value = mali_mem_swap_out_threshold_value; ++ config = kbase_get_platform_config(); /* declared in midgard/mali_kbase_config.h but defined in platform folder */ ++ if (config == NULL) { ++ pr_err("%s: couldn't get platform config\n", __func__); ++ return -ENODEV; + } + -+ /* Get system free pages number. */ -+ system_free_size = global_zone_page_state(NR_FREE_PAGES) * PAGE_SIZE; -+ last_gpu_utilization = _mali_ukk_utilization_gp_pp(); -+ -+ if ((last_gpu_utilization < gpu_utilization_threshold_value) -+ && (system_free_size < mali_mem_swap_out_threshold_value) -+ && (mem_backend_swapped_pool_size > temp_swap_out_threshold_value)) { -+ list_for_each_entry_safe(bkend, tmp_bkend, &mem_backend_swapped_pool, list) { -+ if (mem_backend_swapped_pool_size <= temp_swap_out_threshold_value) { -+ break; -+ } -+ -+ mutex_lock(&bkend->mutex); ++ mali_device = platform_device_alloc("mali", 0); ++ if (mali_device == NULL) ++ return -ENOMEM; + -+ /* check if backend is in use. */ -+ if (0 < bkend->using_count) { -+ mutex_unlock(&bkend->mutex); -+ continue; -+ } ++#ifndef CONFIG_OF ++ kbasep_config_parse_io_resources(config->io_resources, resources); ++ err = platform_device_add_resources(mali_device, resources, PLATFORM_CONFIG_RESOURCE_COUNT); ++ if (err) { ++ platform_device_put(mali_device); ++ mali_device = NULL; ++ return err; ++ } ++#endif /* CONFIG_OF */ + -+ mali_mem_swap_unlock_single_mem_backend(bkend); -+ list_del_init(&bkend->list); -+ mem_backend_swapped_pool_size -= bkend->size; -+#ifdef MALI_MEM_SWAP_TRACKING -+ mem_backend_swapped_unlock_size += bkend->size; -+#endif -+ mutex_unlock(&bkend->mutex); -+ } ++ err = platform_device_add(mali_device); ++ if (err) { ++ platform_device_unregister(mali_device); ++ mali_device = NULL; ++ return err; + } + -+ return; ++ return 0; +} ++EXPORT_SYMBOL(kbase_platform_fake_register); + -+static void mali_mem_swap_swapped_bkend_pool_check_for_low_utilization(void *arg) ++void kbase_platform_fake_unregister(void) +{ -+ MALI_IGNORE(arg); -+ -+ mutex_lock(&mem_backend_swapped_pool_lock); -+ -+ mali_mem_swap_swapped_bkend_pool_shrink(MALI_MEM_SWAP_SHRINK_WITH_LOW_UTILIZATION); -+ -+ mutex_unlock(&mem_backend_swapped_pool_lock); ++ if (mali_device) ++ platform_device_unregister(mali_device); +} ++EXPORT_SYMBOL(kbase_platform_fake_unregister); + -+/** -+ * After PP job finished, we add all of swappable memory backend used by this PP -+ * job to the tail of the global swapped pool, and if the total size of swappable memory is more than threshold -+ * value, we also need to shrink the swapped pool start from the head of the list. ++#endif /* CONFIG_MALI_PLATFORM_FAKE */ ++ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_pm.c b/drivers/gpu/arm/midgard/mali_kbase_pm.c +new file mode 100755 +index 000000000..97d543464 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_pm.c +@@ -0,0 +1,205 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ -+void mali_memory_swap_list_backend_add(mali_mem_backend *mem_bkend) -+{ -+ mutex_lock(&mem_backend_swapped_pool_lock); -+ mutex_lock(&mem_bkend->mutex); + -+ if (mali_memory_swap_backend_in_swapped_pool(mem_bkend)) { -+ MALI_DEBUG_ASSERT(!list_empty(&mem_bkend->list)); + -+ list_del_init(&mem_bkend->list); -+ list_add_tail(&mem_bkend->list, &mem_backend_swapped_pool); -+ mutex_unlock(&mem_bkend->mutex); -+ mutex_unlock(&mem_backend_swapped_pool_lock); -+ return; -+ } + -+ list_add_tail(&mem_bkend->list, &mem_backend_swapped_pool); + -+ mutex_unlock(&mem_bkend->mutex); -+ mem_backend_swapped_pool_size += mem_bkend->size; + -+ mali_mem_swap_swapped_bkend_pool_shrink(MALI_MEM_SWAP_SHRINK_FOR_ADDING_NEW_BACKENDS); ++/** ++ * @file mali_kbase_pm.c ++ * Base kernel power management APIs ++ */ + -+ mutex_unlock(&mem_backend_swapped_pool_lock); -+ return; -+} ++#include ++#include ++#include + ++#include + -+u32 mali_mem_swap_idx_alloc(void) ++int kbase_pm_powerup(struct kbase_device *kbdev, unsigned int flags) +{ -+ return _mali_osk_bitmap_alloc(&idx_mgr); ++ return kbase_hwaccess_pm_powerup(kbdev, flags); +} + -+void mali_mem_swap_idx_free(u32 idx) ++void kbase_pm_halt(struct kbase_device *kbdev) +{ -+ _mali_osk_bitmap_free(&idx_mgr, idx); ++ kbase_hwaccess_pm_halt(kbdev); +} + -+static u32 mali_mem_swap_idx_range_alloc(u32 count) ++void kbase_pm_context_active(struct kbase_device *kbdev) +{ -+ u32 index; -+ -+ index = _mali_osk_bitmap_alloc_range(&idx_mgr, count); -+ -+ return index; ++ (void)kbase_pm_context_active_handle_suspend(kbdev, KBASE_PM_SUSPEND_HANDLER_NOT_POSSIBLE); +} + -+static void mali_mem_swap_idx_range_free(u32 idx, int num) ++int kbase_pm_context_active_handle_suspend(struct kbase_device *kbdev, enum kbase_pm_suspend_handler suspend_handler) +{ -+ _mali_osk_bitmap_free_range(&idx_mgr, idx, num); -+} ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ int c; ++ int old_count; + -+struct mali_swap_item *mali_mem_swap_alloc_swap_item(void) -+{ -+ mali_swap_item *swap_item; ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ swap_item = kzalloc(sizeof(mali_swap_item), GFP_KERNEL); ++ /* Trace timeline information about how long it took to handle the decision ++ * to powerup. Sometimes the event might be missed due to reading the count ++ * outside of mutex, but this is necessary to get the trace timing ++ * correct. */ ++ old_count = kbdev->pm.active_count; ++ if (old_count == 0) ++ kbase_timeline_pm_send_event(kbdev, KBASE_TIMELINE_PM_EVENT_GPU_ACTIVE); + -+ if (NULL == swap_item) { -+ return NULL; ++ mutex_lock(&js_devdata->runpool_mutex); ++ mutex_lock(&kbdev->pm.lock); ++ if (kbase_pm_is_suspending(kbdev)) { ++ switch (suspend_handler) { ++ case KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE: ++ if (kbdev->pm.active_count != 0) ++ break; ++ /* FALLTHROUGH */ ++ case KBASE_PM_SUSPEND_HANDLER_DONT_INCREASE: ++ mutex_unlock(&kbdev->pm.lock); ++ mutex_unlock(&js_devdata->runpool_mutex); ++ if (old_count == 0) ++ kbase_timeline_pm_handle_event(kbdev, KBASE_TIMELINE_PM_EVENT_GPU_ACTIVE); ++ return 1; ++ ++ case KBASE_PM_SUSPEND_HANDLER_NOT_POSSIBLE: ++ /* FALLTHROUGH */ ++ default: ++ KBASE_DEBUG_ASSERT_MSG(false, "unreachable"); ++ break; ++ } + } ++ c = ++kbdev->pm.active_count; ++ KBASE_TIMELINE_CONTEXT_ACTIVE(kbdev, c); ++ KBASE_TRACE_ADD_REFCOUNT(kbdev, PM_CONTEXT_ACTIVE, NULL, NULL, 0u, c); + -+ atomic_set(&swap_item->ref_count, 1); -+ swap_item->page = NULL; -+ atomic_add(1, &mali_mem_os_allocator.allocated_pages); ++ /* Trace the event being handled */ ++ if (old_count == 0) ++ kbase_timeline_pm_handle_event(kbdev, KBASE_TIMELINE_PM_EVENT_GPU_ACTIVE); + -+ return swap_item; ++ if (c == 1) ++ /* First context active: Power on the GPU and any cores requested by ++ * the policy */ ++ kbase_hwaccess_pm_gpu_active(kbdev); ++ ++ mutex_unlock(&kbdev->pm.lock); ++ mutex_unlock(&js_devdata->runpool_mutex); ++ ++ return 0; +} + -+void mali_mem_swap_free_swap_item(mali_swap_item *swap_item) ++KBASE_EXPORT_TEST_API(kbase_pm_context_active); ++ ++void kbase_pm_context_idle(struct kbase_device *kbdev) +{ -+ struct inode *file_node; -+ long long start, end; ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ int c; ++ int old_count; + -+ /* If this swap item is shared, we just reduce the reference counter. */ -+ if (0 == atomic_dec_return(&swap_item->ref_count)) { -+ file_node = global_swap_file->f_path.dentry->d_inode; -+ start = swap_item->idx; -+ start = start << 12; -+ end = start + PAGE_SIZE; ++ KBASE_DEBUG_ASSERT(kbdev != NULL); + -+ shmem_truncate_range(file_node, start, (end - 1)); ++ /* Trace timeline information about how long it took to handle the decision ++ * to powerdown. Sometimes the event might be missed due to reading the ++ * count outside of mutex, but this is necessary to get the trace timing ++ * correct. */ ++ old_count = kbdev->pm.active_count; ++ if (old_count == 0) ++ kbase_timeline_pm_send_event(kbdev, KBASE_TIMELINE_PM_EVENT_GPU_IDLE); + -+ mali_mem_swap_idx_free(swap_item->idx); ++ mutex_lock(&js_devdata->runpool_mutex); ++ mutex_lock(&kbdev->pm.lock); + -+ atomic_sub(1, &mali_mem_os_allocator.allocated_pages); ++ c = --kbdev->pm.active_count; ++ KBASE_TIMELINE_CONTEXT_ACTIVE(kbdev, c); ++ KBASE_TRACE_ADD_REFCOUNT(kbdev, PM_CONTEXT_IDLE, NULL, NULL, 0u, c); + -+ kfree(swap_item); ++ KBASE_DEBUG_ASSERT(c >= 0); ++ ++ /* Trace the event being handled */ ++ if (old_count == 0) ++ kbase_timeline_pm_handle_event(kbdev, KBASE_TIMELINE_PM_EVENT_GPU_IDLE); ++ ++ if (c == 0) { ++ /* Last context has gone idle */ ++ kbase_hwaccess_pm_gpu_idle(kbdev); ++ ++ /* Wake up anyone waiting for this to become 0 (e.g. suspend). The ++ * waiters must synchronize with us by locking the pm.lock after ++ * waiting */ ++ wake_up(&kbdev->pm.zero_active_count_wait); + } ++ ++ mutex_unlock(&kbdev->pm.lock); ++ mutex_unlock(&js_devdata->runpool_mutex); +} + -+/* Used to allocate new swap item for new memory allocation and cow page for write. */ -+struct mali_page_node *_mali_mem_swap_page_node_allocate(void) ++KBASE_EXPORT_TEST_API(kbase_pm_context_idle); ++ ++void kbase_pm_suspend(struct kbase_device *kbdev) +{ -+ struct mali_page_node *m_page; ++ KBASE_DEBUG_ASSERT(kbdev); + -+ m_page = _mali_page_node_allocate(MALI_PAGE_NODE_SWAP); ++ /* Suspend vinstr. ++ * This call will block until vinstr is suspended. */ ++ kbase_vinstr_suspend(kbdev->vinstr_ctx); + -+ if (NULL == m_page) { -+ return NULL; -+ } ++ mutex_lock(&kbdev->pm.lock); ++ KBASE_DEBUG_ASSERT(!kbase_pm_is_suspending(kbdev)); ++ kbdev->pm.suspending = true; ++ mutex_unlock(&kbdev->pm.lock); + -+ m_page->swap_it = mali_mem_swap_alloc_swap_item(); ++ /* From now on, the active count will drop towards zero. Sometimes, it'll ++ * go up briefly before going down again. However, once it reaches zero it ++ * will stay there - guaranteeing that we've idled all pm references */ + -+ if (NULL == m_page->swap_it) { -+ kfree(m_page); -+ return NULL; -+ } ++ /* Suspend job scheduler and associated components, so that it releases all ++ * the PM active count references */ ++ kbasep_js_suspend(kbdev); + -+ return m_page; ++ /* Wait for the active count to reach zero. This is not the same as ++ * waiting for a power down, since not all policies power down when this ++ * reaches zero. */ ++ wait_event(kbdev->pm.zero_active_count_wait, kbdev->pm.active_count == 0); ++ ++ /* NOTE: We synchronize with anything that was just finishing a ++ * kbase_pm_context_idle() call by locking the pm.lock below */ ++ ++ kbase_hwaccess_pm_suspend(kbdev); +} + -+_mali_osk_errcode_t _mali_mem_swap_put_page_node(struct mali_page_node *m_page) ++void kbase_pm_resume(struct kbase_device *kbdev) +{ ++ /* MUST happen before any pm_context_active calls occur */ ++ kbase_hwaccess_pm_resume(kbdev); + -+ mali_mem_swap_free_swap_item(m_page->swap_it); ++ /* Initial active call, to power on the GPU/cores if needed */ ++ kbase_pm_context_active(kbdev); + -+ return _MALI_OSK_ERR_OK; -+} ++ /* Resume any blocked atoms (which may cause contexts to be scheduled in ++ * and dependent atoms to run) */ ++ kbase_resume_suspended_soft_jobs(kbdev); + -+void _mali_mem_swap_page_node_free(struct mali_page_node *m_page) -+{ -+ _mali_mem_swap_put_page_node(m_page); ++ /* Resume the Job Scheduler and associated components, and start running ++ * atoms */ ++ kbasep_js_resume(kbdev); + -+ kfree(m_page); ++ /* Matching idle call, to power off the GPU/cores if we didn't actually ++ * need it and the policy doesn't want it on */ ++ kbase_pm_context_idle(kbdev); + -+ return; ++ /* Resume vinstr operation */ ++ kbase_vinstr_resume(kbdev->vinstr_ctx); +} + -+u32 mali_mem_swap_free(mali_mem_swap *swap_mem) -+{ -+ struct mali_page_node *m_page, *m_tmp; -+ u32 free_pages_nr = 0; +diff --git a/drivers/gpu/arm/midgard/mali_kbase_pm.h b/drivers/gpu/arm/midgard/mali_kbase_pm.h +new file mode 100755 +index 000000000..37fa2479d +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_pm.h +@@ -0,0 +1,171 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ MALI_DEBUG_ASSERT_POINTER(swap_mem); + -+ list_for_each_entry_safe(m_page, m_tmp, &swap_mem->pages, list) { -+ MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_SWAP); + -+ /* free the page node and release the swap item, if the ref count is 1, -+ * then need also free the swap item. */ -+ list_del(&m_page->list); -+ if (1 == _mali_page_node_get_ref_count(m_page)) { -+ free_pages_nr++; -+ } + -+ _mali_mem_swap_page_node_free(m_page); -+ } + -+ return free_pages_nr; -+} ++/** ++ * @file mali_kbase_pm.h ++ * Power management API definitions ++ */ + -+static u32 mali_mem_swap_cow_free(mali_mem_cow *cow_mem) -+{ -+ struct mali_page_node *m_page, *m_tmp; -+ u32 free_pages_nr = 0; ++#ifndef _KBASE_PM_H_ ++#define _KBASE_PM_H_ + -+ MALI_DEBUG_ASSERT_POINTER(cow_mem); ++#include "mali_kbase_hwaccess_pm.h" + -+ list_for_each_entry_safe(m_page, m_tmp, &cow_mem->pages, list) { -+ MALI_DEBUG_ASSERT(m_page->type == MALI_PAGE_NODE_SWAP); ++#define PM_ENABLE_IRQS 0x01 ++#define PM_HW_ISSUES_DETECT 0x02 + -+ /* free the page node and release the swap item, if the ref count is 1, -+ * then need also free the swap item. */ -+ list_del(&m_page->list); -+ if (1 == _mali_page_node_get_ref_count(m_page)) { -+ free_pages_nr++; -+ } + -+ _mali_mem_swap_page_node_free(m_page); -+ } ++/** Initialize the power management framework. ++ * ++ * Must be called before any other power management function ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid pointer) ++ * ++ * @return 0 if the power management framework was successfully initialized. ++ */ ++int kbase_pm_init(struct kbase_device *kbdev); + -+ return free_pages_nr; -+} ++/** Power up GPU after all modules have been initialized and interrupt handlers installed. ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid pointer) ++ * ++ * @param flags Flags to pass on to kbase_pm_init_hw ++ * ++ * @return 0 if powerup was successful. ++ */ ++int kbase_pm_powerup(struct kbase_device *kbdev, unsigned int flags); + -+u32 mali_mem_swap_release(mali_mem_backend *mem_bkend, mali_bool is_mali_mapped) -+{ -+ mali_mem_allocation *alloc; -+ u32 free_pages_nr = 0; ++/** ++ * Halt the power management framework. ++ * Should ensure that no new interrupts are generated, ++ * but allow any currently running interrupt handlers to complete successfully. ++ * The GPU is forced off by the time this function returns, regardless of ++ * whether or not the active power policy asks for the GPU to be powered off. ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid pointer) ++ */ ++void kbase_pm_halt(struct kbase_device *kbdev); + -+ MALI_DEBUG_ASSERT_POINTER(mem_bkend); -+ alloc = mem_bkend->mali_allocation; -+ MALI_DEBUG_ASSERT_POINTER(alloc); ++/** Terminate the power management framework. ++ * ++ * No power management functions may be called after this ++ * (except @ref kbase_pm_init) ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid pointer) ++ */ ++void kbase_pm_term(struct kbase_device *kbdev); + -+ if (is_mali_mapped) { -+ mali_mem_swap_mali_unmap(alloc); -+ } ++/** Increment the count of active contexts. ++ * ++ * This function should be called when a context is about to submit a job. It informs the active power policy that the ++ * GPU is going to be in use shortly and the policy is expected to start turning on the GPU. ++ * ++ * This function will block until the GPU is available. ++ * ++ * This function ASSERTS if a suspend is occuring/has occurred whilst this is ++ * in use. Use kbase_pm_contect_active_unless_suspending() instead. ++ * ++ * @note a Suspend is only visible to Kernel threads; user-space threads in a ++ * syscall cannot witness a suspend, because they are frozen before the suspend ++ * begins. ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid pointer) ++ */ ++void kbase_pm_context_active(struct kbase_device *kbdev); + -+ mali_memory_swap_list_backend_delete(mem_bkend); + -+ mutex_lock(&mem_bkend->mutex); -+ /* To make sure the given memory backend was unlocked from Mali side, -+ * and then free this memory block. */ -+ mali_mem_swap_unlock_single_mem_backend(mem_bkend); -+ mutex_unlock(&mem_bkend->mutex); ++/** Handler codes for doing kbase_pm_context_active_handle_suspend() */ ++enum kbase_pm_suspend_handler { ++ /** A suspend is not expected/not possible - this is the same as ++ * kbase_pm_context_active() */ ++ KBASE_PM_SUSPEND_HANDLER_NOT_POSSIBLE, ++ /** If we're suspending, fail and don't increase the active count */ ++ KBASE_PM_SUSPEND_HANDLER_DONT_INCREASE, ++ /** If we're suspending, succeed and allow the active count to increase iff ++ * it didn't go from 0->1 (i.e., we didn't re-activate the GPU). ++ * ++ * This should only be used when there is a bounded time on the activation ++ * (e.g. guarantee it's going to be idled very soon after) */ ++ KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE ++}; + -+ if (MALI_MEM_SWAP == mem_bkend->type) { -+ free_pages_nr = mali_mem_swap_free(&mem_bkend->swap_mem); -+ } else { -+ free_pages_nr = mali_mem_swap_cow_free(&mem_bkend->cow_mem); -+ } ++/** Suspend 'safe' variant of kbase_pm_context_active() ++ * ++ * If a suspend is in progress, this allows for various different ways of ++ * handling the suspend. Refer to @ref enum kbase_pm_suspend_handler for details. ++ * ++ * We returns a status code indicating whether we're allowed to keep the GPU ++ * active during the suspend, depending on the handler code. If the status code ++ * indicates a failure, the caller must abort whatever operation it was ++ * attempting, and potentially queue it up for after the OS has resumed. ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid pointer) ++ * @param suspend_handler The handler code for how to handle a suspend that might occur ++ * @return zero Indicates success ++ * @return non-zero Indicates failure due to the system being suspending/suspended. ++ */ ++int kbase_pm_context_active_handle_suspend(struct kbase_device *kbdev, enum kbase_pm_suspend_handler suspend_handler); + -+ return free_pages_nr; -+} ++/** Decrement the reference count of active contexts. ++ * ++ * This function should be called when a context becomes idle. After this call the GPU may be turned off by the power ++ * policy so the calling code should ensure that it does not access the GPU's registers. ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid pointer) ++ */ ++void kbase_pm_context_idle(struct kbase_device *kbdev); + -+mali_bool mali_mem_swap_in_page_node(struct mali_page_node *page_node) -+{ -+ MALI_DEBUG_ASSERT(NULL != page_node); ++/** ++ * Suspend the GPU and prevent any further register accesses to it from Kernel ++ * threads. ++ * ++ * This is called in response to an OS suspend event, and calls into the various ++ * kbase components to complete the suspend. ++ * ++ * @note the mechanisms used here rely on all user-space threads being frozen ++ * by the OS before we suspend. Otherwise, an IOCTL could occur that powers up ++ * the GPU e.g. via atom submission. ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid pointer) ++ */ ++void kbase_pm_suspend(struct kbase_device *kbdev); + -+ page_node->swap_it->page = shmem_read_mapping_page(global_swap_space, page_node->swap_it->idx); ++/** ++ * Resume the GPU, allow register accesses to it, and resume running atoms on ++ * the GPU. ++ * ++ * This is called in response to an OS resume event, and calls into the various ++ * kbase components to complete the resume. ++ * ++ * @param kbdev The kbase device structure for the device (must be a valid pointer) ++ */ ++void kbase_pm_resume(struct kbase_device *kbdev); + -+ if (IS_ERR(page_node->swap_it->page)) { -+ MALI_DEBUG_PRINT_ERROR(("SWAP Mem: failed to swap in page with index: %d.\n", page_node->swap_it->idx)); -+ return MALI_FALSE; -+ } ++/** ++ * kbase_pm_vsync_callback - vsync callback ++ * ++ * @buffer_updated: 1 if a new frame was displayed, 0 otherwise ++ * @data: Pointer to the kbase device as returned by kbase_find_device() ++ * ++ * Callback function used to notify the power management code that a vsync has ++ * occurred on the display. ++ */ ++void kbase_pm_vsync_callback(int buffer_updated, void *data); + -+ /* Ensure page is flushed from CPU caches. */ -+ page_node->swap_it->dma_addr = dma_map_page(&mali_platform_device->dev, page_node->swap_it->page, -+ 0, _MALI_OSK_MALI_PAGE_SIZE, DMA_TO_DEVICE); ++#endif /* _KBASE_PM_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h b/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h +new file mode 100755 +index 000000000..7fb674ede +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h +@@ -0,0 +1,40 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010, 2013 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ return MALI_TRUE; -+} + -+int mali_mem_swap_alloc_pages(mali_mem_swap *swap_mem, u32 size, u32 *bkend_idx) -+{ -+ size_t page_count = PAGE_ALIGN(size) / PAGE_SIZE; -+ struct mali_page_node *m_page; -+ long system_free_size; -+ u32 i, index; -+ mali_bool ret; + -+ MALI_DEBUG_ASSERT(NULL != swap_mem); -+ MALI_DEBUG_ASSERT(NULL != bkend_idx); -+ MALI_DEBUG_ASSERT(page_count <= MALI_SWAP_GLOBAL_SWAP_FILE_INDEX_RESERVE); ++/** ++ * @file mali_kbase_profiling_gator_api.h ++ * Model interface ++ */ + -+ if (atomic_read(&mali_mem_os_allocator.allocated_pages) * _MALI_OSK_MALI_PAGE_SIZE + size > mali_mem_os_allocator.allocation_limit) { -+ MALI_DEBUG_PRINT(2, ("Mali Mem: Unable to allocate %u bytes. Currently allocated: %lu, max limit %lu\n", -+ size, -+ atomic_read(&mali_mem_os_allocator.allocated_pages) * _MALI_OSK_MALI_PAGE_SIZE, -+ mali_mem_os_allocator.allocation_limit)); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++#ifndef _KBASE_PROFILING_GATOR_API_H_ ++#define _KBASE_PROFILING_GATOR_API_H_ + -+ INIT_LIST_HEAD(&swap_mem->pages); -+ swap_mem->count = page_count; -+ index = mali_mem_swap_idx_range_alloc(page_count); ++/* ++ * List of possible actions to be controlled by Streamline. ++ * The following numbers are used by gator to control ++ * the frame buffer dumping and s/w counter reporting. ++ */ ++#define FBDUMP_CONTROL_ENABLE (1) ++#define FBDUMP_CONTROL_RATE (2) ++#define SW_COUNTER_ENABLE (3) ++#define FBDUMP_CONTROL_RESIZE_FACTOR (4) ++#define FBDUMP_CONTROL_MAX (5) ++#define FBDUMP_CONTROL_MIN FBDUMP_CONTROL_ENABLE + -+ if (_MALI_OSK_BITMAP_INVALIDATE_INDEX == index) { -+ MALI_PRINT_ERROR(("Mali Swap: Failed to allocate continuous index for swappable Mali memory.")); -+ return _MALI_OSK_ERR_FAULT; -+ } ++void _mali_profiling_control(u32 action, u32 value); + -+ for (i = 0; i < page_count; i++) { -+ m_page = _mali_mem_swap_page_node_allocate(); ++#endif /* _KBASE_PROFILING_GATOR_API */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c +new file mode 100755 +index 000000000..c97065006 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c +@@ -0,0 +1,130 @@ ++/* ++ * ++ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ if (NULL == m_page) { -+ MALI_DEBUG_PRINT_ERROR(("SWAP Mem: Failed to allocate mali page node.")); -+ swap_mem->count = i; + -+ mali_mem_swap_free(swap_mem); -+ mali_mem_swap_idx_range_free(index + i, page_count - i); -+ return _MALI_OSK_ERR_FAULT; -+ } + -+ m_page->swap_it->idx = index + i; ++#include "mali_kbase.h" + -+ ret = mali_mem_swap_in_page_node(m_page); ++#include "mali_kbase_regs_history_debugfs.h" + -+ if (MALI_FALSE == ret) { -+ MALI_DEBUG_PRINT_ERROR(("SWAP Mem: Allocate new page from SHMEM file failed.")); -+ _mali_mem_swap_page_node_free(m_page); -+ mali_mem_swap_idx_range_free(index + i + 1, page_count - i - 1); ++#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_NO_MALI) + -+ swap_mem->count = i; -+ mali_mem_swap_free(swap_mem); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++#include + -+ list_add_tail(&m_page->list, &swap_mem->pages); -+ } + -+ system_free_size = global_zone_page_state(NR_FREE_PAGES) * PAGE_SIZE; ++static int regs_history_size_get(void *data, u64 *val) ++{ ++ struct kbase_io_history *const h = data; + -+ if ((system_free_size < mali_mem_swap_out_threshold_value) -+ && (mem_backend_swapped_pool_size > (mali_mem_swap_out_threshold_value >> 2)) -+ && mali_utilization_enabled()) { -+ _mali_osk_wq_schedule_work(mali_mem_swap_out_workq); -+ } ++ *val = h->size; + -+ *bkend_idx = index; + return 0; +} + -+void mali_mem_swap_mali_unmap(mali_mem_allocation *alloc) ++static int regs_history_size_set(void *data, u64 val) +{ -+ struct mali_session_data *session; -+ -+ MALI_DEBUG_ASSERT_POINTER(alloc); -+ session = alloc->session; -+ MALI_DEBUG_ASSERT_POINTER(session); ++ struct kbase_io_history *const h = data; + -+ mali_session_memory_lock(session); -+ mali_mem_mali_map_free(session, alloc->psize, alloc->mali_vma_node.vm_node.start, -+ alloc->flags); -+ mali_session_memory_unlock(session); ++ return kbase_io_history_resize(h, (u16)val); +} + + -+/* Insert these pages from shmem to mali page table*/ -+_mali_osk_errcode_t mali_mem_swap_mali_map(mali_mem_swap *swap_mem, struct mali_session_data *session, u32 vaddr, u32 props) ++DEFINE_SIMPLE_ATTRIBUTE(regs_history_size_fops, ++ regs_history_size_get, ++ regs_history_size_set, ++ "%llu\n"); ++ ++ ++/** ++ * regs_history_show - show callback for the register access history file. ++ * ++ * @sfile: The debugfs entry ++ * @data: Data associated with the entry ++ * ++ * This function is called to dump all recent accesses to the GPU registers. ++ * ++ * @return 0 if successfully prints data in debugfs entry file, failure ++ * otherwise ++ */ ++static int regs_history_show(struct seq_file *sfile, void *data) +{ -+ struct mali_page_directory *pagedir = session->page_directory; -+ struct mali_page_node *m_page; -+ dma_addr_t phys; -+ u32 virt = vaddr; -+ u32 prop = props; ++ struct kbase_io_history *const h = sfile->private; ++ u16 i; ++ size_t iters; ++ unsigned long flags; + -+ list_for_each_entry(m_page, &swap_mem->pages, list) { -+ MALI_DEBUG_ASSERT(NULL != m_page->swap_it->page); -+ phys = m_page->swap_it->dma_addr; ++ if (!h->enabled) { ++ seq_puts(sfile, "The register access history is disabled\n"); ++ goto out; ++ } + -+ mali_mmu_pagedir_update(pagedir, virt, phys, MALI_MMU_PAGE_SIZE, prop); -+ virt += MALI_MMU_PAGE_SIZE; ++ spin_lock_irqsave(&h->lock, flags); ++ ++ iters = (h->size > h->count) ? h->count : h->size; ++ seq_printf(sfile, "Last %zu register accesses of %zu total:\n", iters, ++ h->count); ++ for (i = 0; i < iters; ++i) { ++ struct kbase_io_access *io = ++ &h->buf[(h->count - iters + i) % h->size]; ++ char const access = (io->addr & 1) ? 'w' : 'r'; ++ ++ seq_printf(sfile, "%6i: %c: reg 0x%p val %08x\n", i, access, ++ (void *)(io->addr & ~0x1), io->value); + } + -+ return _MALI_OSK_ERR_OK; ++ spin_unlock_irqrestore(&h->lock, flags); ++ ++out: ++ return 0; +} + -+int mali_mem_swap_in_pages(struct mali_pp_job *job) ++ ++/** ++ * regs_history_open - open operation for regs_history debugfs file ++ * ++ * @in: &struct inode pointer ++ * @file: &struct file pointer ++ * ++ * @return file descriptor ++ */ ++static int regs_history_open(struct inode *in, struct file *file) +{ -+ u32 num_memory_cookies; -+ struct mali_session_data *session; -+ struct mali_vma_node *mali_vma_node = NULL; -+ mali_mem_allocation *mali_alloc = NULL; -+ mali_mem_backend *mem_bkend = NULL; -+ struct mali_page_node *m_page; -+ mali_bool swap_in_success = MALI_TRUE; -+ int i; ++ return single_open(file, ®s_history_show, in->i_private); ++} + -+ MALI_DEBUG_ASSERT_POINTER(job); + -+ num_memory_cookies = mali_pp_job_num_memory_cookies(job); -+ session = mali_pp_job_get_session(job); ++static const struct file_operations regs_history_fops = { ++ .open = ®s_history_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; + -+ MALI_DEBUG_ASSERT_POINTER(session); + -+ for (i = 0; i < num_memory_cookies; i++) { ++void kbasep_regs_history_debugfs_init(struct kbase_device *kbdev) ++{ ++ debugfs_create_bool("regs_history_enabled", S_IRUGO | S_IWUSR, ++ kbdev->mali_debugfs_directory, ++ &kbdev->io_history.enabled); ++ debugfs_create_file("regs_history_size", S_IRUGO | S_IWUSR, ++ kbdev->mali_debugfs_directory, ++ &kbdev->io_history, ®s_history_size_fops); ++ debugfs_create_file("regs_history", S_IRUGO, ++ kbdev->mali_debugfs_directory, &kbdev->io_history, ++ ®s_history_fops); ++} + -+ u32 mali_addr = mali_pp_job_get_memory_cookie(job, i); + -+ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, mali_addr, 0); -+ if (NULL == mali_vma_node) { -+ job->memory_cookies[i] = MALI_SWAP_INVALIDATE_MALI_ADDRESS; -+ swap_in_success = MALI_FALSE; -+ MALI_PRINT_ERROR(("SWAP Mem: failed to find mali_vma_node through Mali address: 0x%08x.\n", mali_addr)); -+ continue; -+ } ++#endif /* CONFIG_DEBUG_FS */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h +new file mode 100755 +index 000000000..f10837002 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h +@@ -0,0 +1,50 @@ ++/* ++ * ++ * (C) COPYRIGHT 2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); -+ MALI_DEBUG_ASSERT(NULL != mali_alloc); + -+ if (MALI_MEM_SWAP != mali_alloc->type && -+ MALI_MEM_COW != mali_alloc->type) { -+ continue; -+ } + -+ /* Get backend memory & Map on GPU */ -+ mutex_lock(&mali_idr_mutex); -+ mem_bkend = idr_find(&mali_backend_idr, mali_alloc->backend_handle); -+ mutex_unlock(&mali_idr_mutex); -+ MALI_DEBUG_ASSERT(NULL != mem_bkend); ++/** ++ * Header file for register access history support via debugfs ++ * ++ * This interface is made available via /sys/kernel/debug/mali#/regs_history*. ++ * ++ * Usage: ++ * - regs_history_enabled: whether recording of register accesses is enabled. ++ * Write 'y' to enable, 'n' to disable. ++ * - regs_history_size: size of the register history buffer, must be > 0 ++ * - regs_history: return the information about last accesses to the registers. ++ */ + -+ /* We neednot hold backend's lock here, race safe.*/ -+ if ((MALI_MEM_COW == mem_bkend->type) && -+ (!(mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED))) { -+ continue; -+ } ++#ifndef _KBASE_REGS_HISTORY_DEBUGFS_H ++#define _KBASE_REGS_HISTORY_DEBUGFS_H + -+ mutex_lock(&mem_bkend->mutex); ++struct kbase_device; + -+ /* When swap_in_success is MALI_FALSE, it means this job has memory backend that could not be swapped in, -+ * and it will be aborted in mali scheduler, so here, we just mark those memory cookies which -+ * should not be swapped out when delete job to invalide */ -+ if (MALI_FALSE == swap_in_success) { -+ job->memory_cookies[i] = MALI_SWAP_INVALIDATE_MALI_ADDRESS; -+ mutex_unlock(&mem_bkend->mutex); -+ continue; -+ } ++#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_NO_MALI) + -+ /* Before swap in, checking if this memory backend has been swapped in by the latest flushed jobs. */ -+ ++mem_bkend->using_count; ++/** ++ * kbasep_regs_history_debugfs_init - add debugfs entries for register history ++ * ++ * @kbdev: Pointer to kbase_device containing the register history ++ */ ++void kbasep_regs_history_debugfs_init(struct kbase_device *kbdev); + -+ if (1 < mem_bkend->using_count) { -+ MALI_DEBUG_ASSERT(MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN != (MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN & mem_bkend->flags)); -+ mutex_unlock(&mem_bkend->mutex); -+ continue; -+ } ++#else /* CONFIG_DEBUG_FS */ + -+ if (MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN != (MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN & mem_bkend->flags)) { -+ mutex_unlock(&mem_bkend->mutex); -+ continue; -+ } ++#define kbasep_regs_history_debugfs_init CSTD_NOP + ++#endif /* CONFIG_DEBUG_FS */ + -+ list_for_each_entry(m_page, &mem_bkend->swap_mem.pages, list) { -+ if (MALI_FALSE == mali_mem_swap_in_page_node(m_page)) { -+ /* Don't have enough memory to swap in page, so release pages have already been swapped -+ * in and then mark this pp job to be fail. */ -+ mali_mem_swap_unlock_partial_locked_mem_backend(mem_bkend, m_page); -+ swap_in_success = MALI_FALSE; -+ break; -+ } -+ } ++#endif /*_KBASE_REGS_HISTORY_DEBUGFS_H*/ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_replay.c b/drivers/gpu/arm/midgard/mali_kbase_replay.c +new file mode 100755 +index 000000000..84aa3316e +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_replay.c +@@ -0,0 +1,1166 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ if (swap_in_success) { -+#ifdef MALI_MEM_SWAP_TRACKING -+ mem_backend_swapped_unlock_size -= mem_bkend->size; -+#endif -+ _mali_osk_mutex_wait(session->memory_lock); -+ mali_mem_swap_mali_map(&mem_bkend->swap_mem, session, mali_alloc->mali_mapping.addr, mali_alloc->mali_mapping.properties); -+ _mali_osk_mutex_signal(session->memory_lock); + -+ /* Remove the unlock flag from mem backend flags, mark this backend has been swapped in. */ -+ mem_bkend->flags &= ~(MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN); -+ mutex_unlock(&mem_bkend->mutex); -+ } else { -+ --mem_bkend->using_count; -+ /* Marking that this backend is not swapped in, need not to be processed anymore. */ -+ job->memory_cookies[i] = MALI_SWAP_INVALIDATE_MALI_ADDRESS; -+ mutex_unlock(&mem_bkend->mutex); -+ } -+ } + -+ job->swap_status = swap_in_success ? MALI_SWAP_IN_SUCC : MALI_SWAP_IN_FAIL; ++/** ++ * @file mali_kbase_replay.c ++ * Replay soft job handlers ++ */ + -+ return _MALI_OSK_ERR_OK; -+} ++#include ++#include ++#include ++#include ++#include + -+int mali_mem_swap_out_pages(struct mali_pp_job *job) -+{ -+ u32 num_memory_cookies; -+ struct mali_session_data *session; -+ struct mali_vma_node *mali_vma_node = NULL; -+ mali_mem_allocation *mali_alloc = NULL; -+ mali_mem_backend *mem_bkend = NULL; -+ int i; ++#define JOB_NOT_STARTED 0 ++#define JOB_TYPE_NULL (1) ++#define JOB_TYPE_VERTEX (5) ++#define JOB_TYPE_TILER (7) ++#define JOB_TYPE_FUSED (8) ++#define JOB_TYPE_FRAGMENT (9) + -+ MALI_DEBUG_ASSERT_POINTER(job); ++#define JOB_HEADER_32_FBD_OFFSET (31*4) ++#define JOB_HEADER_64_FBD_OFFSET (44*4) + -+ num_memory_cookies = mali_pp_job_num_memory_cookies(job); -+ session = mali_pp_job_get_session(job); ++#define FBD_POINTER_MASK (~0x3f) + -+ MALI_DEBUG_ASSERT_POINTER(session); ++#define SFBD_TILER_OFFSET (48*4) + ++#define MFBD_TILER_OFFSET (14*4) + -+ for (i = 0; i < num_memory_cookies; i++) { -+ u32 mali_addr = mali_pp_job_get_memory_cookie(job, i); ++#define FBD_HIERARCHY_WEIGHTS 8 ++#define FBD_HIERARCHY_MASK_MASK 0x1fff + -+ if (MALI_SWAP_INVALIDATE_MALI_ADDRESS == mali_addr) { -+ continue; -+ } ++#define FBD_TYPE 1 + -+ mali_vma_node = mali_vma_offset_search(&session->allocation_mgr, mali_addr, 0); ++#define HIERARCHY_WEIGHTS 13 + -+ if (NULL == mali_vma_node) { -+ MALI_PRINT_ERROR(("SWAP Mem: failed to find mali_vma_node through Mali address: 0x%08x.\n", mali_addr)); -+ continue; -+ } ++#define JOB_HEADER_ID_MAX 0xffff + -+ mali_alloc = container_of(mali_vma_node, struct mali_mem_allocation, mali_vma_node); -+ MALI_DEBUG_ASSERT(NULL != mali_alloc); ++#define JOB_SOURCE_ID(status) (((status) >> 16) & 0xFFFF) ++#define JOB_POLYGON_LIST (0x03) + -+ if (MALI_MEM_SWAP != mali_alloc->type && -+ MALI_MEM_COW != mali_alloc->type) { -+ continue; -+ } ++struct fragment_job { ++ struct job_descriptor_header header; + -+ mutex_lock(&mali_idr_mutex); -+ mem_bkend = idr_find(&mali_backend_idr, mali_alloc->backend_handle); -+ mutex_unlock(&mali_idr_mutex); -+ MALI_DEBUG_ASSERT(NULL != mem_bkend); ++ u32 x[2]; ++ union { ++ u64 _64; ++ u32 _32; ++ } fragment_fbd; ++}; + -+ /* We neednot hold backend's lock here, race safe.*/ -+ if ((MALI_MEM_COW == mem_bkend->type) && -+ (!(mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED))) { -+ continue; ++static void dump_job_head(struct kbase_context *kctx, char *head_str, ++ struct job_descriptor_header *job) ++{ ++#ifdef CONFIG_MALI_DEBUG ++ dev_dbg(kctx->kbdev->dev, "%s\n", head_str); ++ dev_dbg(kctx->kbdev->dev, ++ "addr = %p\n" ++ "exception_status = %x (Source ID: 0x%x Access: 0x%x Exception: 0x%x)\n" ++ "first_incomplete_task = %x\n" ++ "fault_pointer = %llx\n" ++ "job_descriptor_size = %x\n" ++ "job_type = %x\n" ++ "job_barrier = %x\n" ++ "_reserved_01 = %x\n" ++ "_reserved_02 = %x\n" ++ "_reserved_03 = %x\n" ++ "_reserved_04/05 = %x,%x\n" ++ "job_index = %x\n" ++ "dependencies = %x,%x\n", ++ job, job->exception_status, ++ JOB_SOURCE_ID(job->exception_status), ++ (job->exception_status >> 8) & 0x3, ++ job->exception_status & 0xFF, ++ job->first_incomplete_task, ++ job->fault_pointer, job->job_descriptor_size, ++ job->job_type, job->job_barrier, job->_reserved_01, ++ job->_reserved_02, job->_reserved_03, ++ job->_reserved_04, job->_reserved_05, ++ job->job_index, ++ job->job_dependency_index_1, ++ job->job_dependency_index_2); ++ ++ if (job->job_descriptor_size) ++ dev_dbg(kctx->kbdev->dev, "next = %llx\n", ++ job->next_job._64); ++ else ++ dev_dbg(kctx->kbdev->dev, "next = %x\n", ++ job->next_job._32); ++#endif ++} ++ ++static int kbasep_replay_reset_sfbd(struct kbase_context *kctx, ++ u64 fbd_address, u64 tiler_heap_free, ++ u16 hierarchy_mask, u32 default_weight) ++{ ++ struct { ++ u32 padding_1[1]; ++ u32 flags; ++ u64 padding_2[2]; ++ u64 heap_free_address; ++ u32 padding[8]; ++ u32 weights[FBD_HIERARCHY_WEIGHTS]; ++ } *fbd_tiler; ++ struct kbase_vmap_struct map; ++ ++ dev_dbg(kctx->kbdev->dev, "fbd_address: %llx\n", fbd_address); ++ ++ fbd_tiler = kbase_vmap(kctx, fbd_address + SFBD_TILER_OFFSET, ++ sizeof(*fbd_tiler), &map); ++ if (!fbd_tiler) { ++ dev_err(kctx->kbdev->dev, "kbasep_replay_reset_fbd: failed to map fbd\n"); ++ return -EINVAL; ++ } ++ ++#ifdef CONFIG_MALI_DEBUG ++ dev_dbg(kctx->kbdev->dev, ++ "FBD tiler:\n" ++ "flags = %x\n" ++ "heap_free_address = %llx\n", ++ fbd_tiler->flags, fbd_tiler->heap_free_address); ++#endif ++ if (hierarchy_mask) { ++ u32 weights[HIERARCHY_WEIGHTS]; ++ u16 old_hierarchy_mask = fbd_tiler->flags & ++ FBD_HIERARCHY_MASK_MASK; ++ int i, j = 0; ++ ++ for (i = 0; i < HIERARCHY_WEIGHTS; i++) { ++ if (old_hierarchy_mask & (1 << i)) { ++ KBASE_DEBUG_ASSERT(j < FBD_HIERARCHY_WEIGHTS); ++ weights[i] = fbd_tiler->weights[j++]; ++ } else { ++ weights[i] = default_weight; ++ } + } + -+ mutex_lock(&mem_bkend->mutex); + -+ MALI_DEBUG_ASSERT(0 < mem_bkend->using_count); ++ dev_dbg(kctx->kbdev->dev, "Old hierarchy mask=%x New hierarchy mask=%x\n", ++ old_hierarchy_mask, hierarchy_mask); + -+ /* Reducing the using_count of mem backend means less pp job are using this memory backend, -+ * if this count get to zero, it means no pp job is using it now, could put it to swap out list. */ -+ --mem_bkend->using_count; ++ for (i = 0; i < HIERARCHY_WEIGHTS; i++) ++ dev_dbg(kctx->kbdev->dev, " Hierarchy weight %02d: %08x\n", ++ i, weights[i]); + -+ if (0 < mem_bkend->using_count) { -+ mutex_unlock(&mem_bkend->mutex); -+ continue; ++ j = 0; ++ ++ for (i = 0; i < HIERARCHY_WEIGHTS; i++) { ++ if (hierarchy_mask & (1 << i)) { ++ KBASE_DEBUG_ASSERT(j < FBD_HIERARCHY_WEIGHTS); ++ ++ dev_dbg(kctx->kbdev->dev, " Writing hierarchy level %02d (%08x) to %d\n", ++ i, weights[i], j); ++ ++ fbd_tiler->weights[j++] = weights[i]; ++ } + } -+ mutex_unlock(&mem_bkend->mutex); + -+ mali_memory_swap_list_backend_add(mem_bkend); ++ for (; j < FBD_HIERARCHY_WEIGHTS; j++) ++ fbd_tiler->weights[j] = 0; ++ ++ fbd_tiler->flags = hierarchy_mask | (1 << 16); + } + -+ return _MALI_OSK_ERR_OK; ++ fbd_tiler->heap_free_address = tiler_heap_free; ++ ++ dev_dbg(kctx->kbdev->dev, "heap_free_address=%llx flags=%x\n", ++ fbd_tiler->heap_free_address, fbd_tiler->flags); ++ ++ kbase_vunmap(kctx, &map); ++ ++ return 0; +} + -+int mali_mem_swap_allocate_page_on_demand(mali_mem_backend *mem_bkend, u32 offset, struct page **pagep) ++static int kbasep_replay_reset_mfbd(struct kbase_context *kctx, ++ u64 fbd_address, u64 tiler_heap_free, ++ u16 hierarchy_mask, u32 default_weight) +{ -+ struct mali_page_node *m_page, *found_node = NULL; -+ struct page *found_page; -+ mali_mem_swap *swap = NULL; -+ mali_mem_cow *cow = NULL; -+ dma_addr_t dma_addr; -+ u32 i = 0; ++ struct kbase_vmap_struct map; ++ struct { ++ u32 padding_0; ++ u32 flags; ++ u64 padding_1[2]; ++ u64 heap_free_address; ++ u64 padding_2; ++ u32 weights[FBD_HIERARCHY_WEIGHTS]; ++ } *fbd_tiler; + -+ if (MALI_MEM_SWAP == mem_bkend->type) { -+ swap = &mem_bkend->swap_mem; -+ list_for_each_entry(m_page, &swap->pages, list) { -+ if (i == offset) { -+ found_node = m_page; -+ break; ++ dev_dbg(kctx->kbdev->dev, "fbd_address: %llx\n", fbd_address); ++ ++ fbd_tiler = kbase_vmap(kctx, fbd_address + MFBD_TILER_OFFSET, ++ sizeof(*fbd_tiler), &map); ++ if (!fbd_tiler) { ++ dev_err(kctx->kbdev->dev, ++ "kbasep_replay_reset_fbd: failed to map fbd\n"); ++ return -EINVAL; ++ } ++ ++#ifdef CONFIG_MALI_DEBUG ++ dev_dbg(kctx->kbdev->dev, "FBD tiler:\n" ++ "flags = %x\n" ++ "heap_free_address = %llx\n", ++ fbd_tiler->flags, ++ fbd_tiler->heap_free_address); ++#endif ++ if (hierarchy_mask) { ++ u32 weights[HIERARCHY_WEIGHTS]; ++ u16 old_hierarchy_mask = (fbd_tiler->flags) & ++ FBD_HIERARCHY_MASK_MASK; ++ int i, j = 0; ++ ++ for (i = 0; i < HIERARCHY_WEIGHTS; i++) { ++ if (old_hierarchy_mask & (1 << i)) { ++ KBASE_DEBUG_ASSERT(j < FBD_HIERARCHY_WEIGHTS); ++ weights[i] = fbd_tiler->weights[j++]; ++ } else { ++ weights[i] = default_weight; + } -+ i++; + } -+ } else { -+ MALI_DEBUG_ASSERT(MALI_MEM_COW == mem_bkend->type); -+ MALI_DEBUG_ASSERT(MALI_MEM_BACKEND_FLAG_SWAP_COWED == (MALI_MEM_BACKEND_FLAG_SWAP_COWED & mem_bkend->flags)); + -+ cow = &mem_bkend->cow_mem; -+ list_for_each_entry(m_page, &cow->pages, list) { -+ if (i == offset) { -+ found_node = m_page; -+ break; ++ ++ dev_dbg(kctx->kbdev->dev, "Old hierarchy mask=%x New hierarchy mask=%x\n", ++ old_hierarchy_mask, hierarchy_mask); ++ ++ for (i = 0; i < HIERARCHY_WEIGHTS; i++) ++ dev_dbg(kctx->kbdev->dev, " Hierarchy weight %02d: %08x\n", ++ i, weights[i]); ++ ++ j = 0; ++ ++ for (i = 0; i < HIERARCHY_WEIGHTS; i++) { ++ if (hierarchy_mask & (1 << i)) { ++ KBASE_DEBUG_ASSERT(j < FBD_HIERARCHY_WEIGHTS); ++ ++ dev_dbg(kctx->kbdev->dev, ++ " Writing hierarchy level %02d (%08x) to %d\n", ++ i, weights[i], j); ++ ++ fbd_tiler->weights[j++] = weights[i]; + } -+ i++; + } -+ } + -+ if (NULL == found_node) { -+ return _MALI_OSK_ERR_FAULT; -+ } ++ for (; j < FBD_HIERARCHY_WEIGHTS; j++) ++ fbd_tiler->weights[j] = 0; + -+ found_page = shmem_read_mapping_page(global_swap_space, found_node->swap_it->idx); ++ fbd_tiler->flags = hierarchy_mask | (1 << 16); ++ } + -+ if (!IS_ERR(found_page)) { -+ lock_page(found_page); -+ dma_addr = dma_map_page(&mali_platform_device->dev, found_page, -+ 0, _MALI_OSK_MALI_PAGE_SIZE, DMA_TO_DEVICE); -+ dma_unmap_page(&mali_platform_device->dev, dma_addr, -+ _MALI_OSK_MALI_PAGE_SIZE, DMA_TO_DEVICE); ++ fbd_tiler->heap_free_address = tiler_heap_free; + -+ *pagep = found_page; -+ } else { -+ return _MALI_OSK_ERR_NOMEM; -+ } ++ kbase_vunmap(kctx, &map); + -+ return _MALI_OSK_ERR_OK; ++ return 0; +} + -+int mali_mem_swap_cow_page_on_demand(mali_mem_backend *mem_bkend, u32 offset, struct page **pagep) ++/** ++ * @brief Reset the status of an FBD pointed to by a tiler job ++ * ++ * This performs two functions : ++ * - Set the hierarchy mask ++ * - Reset the tiler free heap address ++ * ++ * @param[in] kctx Context pointer ++ * @param[in] job_header Address of job header to reset. ++ * @param[in] tiler_heap_free The value to reset Tiler Heap Free to ++ * @param[in] hierarchy_mask The hierarchy mask to use ++ * @param[in] default_weight Default hierarchy weight to write when no other ++ * weight is given in the FBD ++ * @param[in] job_64 true if this job is using 64-bit ++ * descriptors ++ * ++ * @return 0 on success, error code on failure ++ */ ++static int kbasep_replay_reset_tiler_job(struct kbase_context *kctx, ++ u64 job_header, u64 tiler_heap_free, ++ u16 hierarchy_mask, u32 default_weight, bool job_64) +{ -+ struct mali_page_node *m_page, *found_node = NULL, *new_node = NULL; -+ mali_mem_cow *cow = NULL; -+ u32 i = 0; ++ struct kbase_vmap_struct map; ++ u64 fbd_address; + -+ MALI_DEBUG_ASSERT(MALI_MEM_COW == mem_bkend->type); -+ MALI_DEBUG_ASSERT(MALI_MEM_BACKEND_FLAG_SWAP_COWED == (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED)); -+ MALI_DEBUG_ASSERT(MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN == (MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN & mem_bkend->flags)); -+ MALI_DEBUG_ASSERT(!mali_memory_swap_backend_in_swapped_pool(mem_bkend)); ++ if (job_64) { ++ u64 *job_ext; + -+ cow = &mem_bkend->cow_mem; -+ list_for_each_entry(m_page, &cow->pages, list) { -+ if (i == offset) { -+ found_node = m_page; -+ break; ++ job_ext = kbase_vmap(kctx, ++ job_header + JOB_HEADER_64_FBD_OFFSET, ++ sizeof(*job_ext), &map); ++ ++ if (!job_ext) { ++ dev_err(kctx->kbdev->dev, "kbasep_replay_reset_tiler_job: failed to map jc\n"); ++ return -EINVAL; + } -+ i++; ++ ++ fbd_address = *job_ext; ++ ++ kbase_vunmap(kctx, &map); ++ } else { ++ u32 *job_ext; ++ ++ job_ext = kbase_vmap(kctx, ++ job_header + JOB_HEADER_32_FBD_OFFSET, ++ sizeof(*job_ext), &map); ++ ++ if (!job_ext) { ++ dev_err(kctx->kbdev->dev, "kbasep_replay_reset_tiler_job: failed to map jc\n"); ++ return -EINVAL; ++ } ++ ++ fbd_address = *job_ext; ++ ++ kbase_vunmap(kctx, &map); + } + -+ if (NULL == found_node) { -+ return _MALI_OSK_ERR_FAULT; ++ if (fbd_address & FBD_TYPE) { ++ return kbasep_replay_reset_mfbd(kctx, ++ fbd_address & FBD_POINTER_MASK, ++ tiler_heap_free, ++ hierarchy_mask, ++ default_weight); ++ } else { ++ return kbasep_replay_reset_sfbd(kctx, ++ fbd_address & FBD_POINTER_MASK, ++ tiler_heap_free, ++ hierarchy_mask, ++ default_weight); + } ++} + -+ new_node = _mali_mem_swap_page_node_allocate(); ++/** ++ * @brief Reset the status of a job ++ * ++ * This performs the following functions : ++ * ++ * - Reset the Job Status field of each job to NOT_STARTED. ++ * - Set the Job Type field of any Vertex Jobs to Null Job. ++ * - For any jobs using an FBD, set the Tiler Heap Free field to the value of ++ * the tiler_heap_free parameter, and set the hierarchy level mask to the ++ * hier_mask parameter. ++ * - Offset HW dependencies by the hw_job_id_offset parameter ++ * - Set the Perform Job Barrier flag if this job is the first in the chain ++ * - Read the address of the next job header ++ * ++ * @param[in] kctx Context pointer ++ * @param[in,out] job_header Address of job header to reset. Set to address ++ * of next job header on exit. ++ * @param[in] prev_jc Previous job chain to link to, if this job is ++ * the last in the chain. ++ * @param[in] hw_job_id_offset Offset for HW job IDs ++ * @param[in] tiler_heap_free The value to reset Tiler Heap Free to ++ * @param[in] hierarchy_mask The hierarchy mask to use ++ * @param[in] default_weight Default hierarchy weight to write when no other ++ * weight is given in the FBD ++ * @param[in] first_in_chain true if this job is the first in the chain ++ * @param[in] fragment_chain true if this job is in the fragment chain ++ * ++ * @return 0 on success, error code on failure ++ */ ++static int kbasep_replay_reset_job(struct kbase_context *kctx, ++ u64 *job_header, u64 prev_jc, ++ u64 tiler_heap_free, u16 hierarchy_mask, ++ u32 default_weight, u16 hw_job_id_offset, ++ bool first_in_chain, bool fragment_chain) ++{ ++ struct fragment_job *frag_job; ++ struct job_descriptor_header *job; ++ u64 new_job_header; ++ struct kbase_vmap_struct map; + -+ if (NULL == new_node) { -+ return _MALI_OSK_ERR_FAULT; ++ frag_job = kbase_vmap(kctx, *job_header, sizeof(*frag_job), &map); ++ if (!frag_job) { ++ dev_err(kctx->kbdev->dev, ++ "kbasep_replay_parse_jc: failed to map jc\n"); ++ return -EINVAL; + } ++ job = &frag_job->header; + -+ new_node->swap_it->idx = mali_mem_swap_idx_alloc(); ++ dump_job_head(kctx, "Job header:", job); + -+ if (_MALI_OSK_BITMAP_INVALIDATE_INDEX == new_node->swap_it->idx) { -+ MALI_DEBUG_PRINT(1, ("Failed to allocate swap index in swap CoW on demand.\n")); -+ kfree(new_node->swap_it); -+ kfree(new_node); -+ return _MALI_OSK_ERR_FAULT; ++ if (job->exception_status == JOB_NOT_STARTED && !fragment_chain) { ++ dev_err(kctx->kbdev->dev, "Job already not started\n"); ++ goto out_unmap; + } ++ job->exception_status = JOB_NOT_STARTED; + -+ if (MALI_FALSE == mali_mem_swap_in_page_node(new_node)) { -+ _mali_mem_swap_page_node_free(new_node); -+ return _MALI_OSK_ERR_FAULT; ++ if (job->job_type == JOB_TYPE_VERTEX) ++ job->job_type = JOB_TYPE_NULL; ++ ++ if (job->job_type == JOB_TYPE_FUSED) { ++ dev_err(kctx->kbdev->dev, "Fused jobs can not be replayed\n"); ++ goto out_unmap; + } + -+ /* swap in found node for copy in kernel. */ -+ if (MALI_FALSE == mali_mem_swap_in_page_node(found_node)) { -+ mali_mem_swap_out_page_node(new_node); -+ _mali_mem_swap_page_node_free(new_node); -+ return _MALI_OSK_ERR_FAULT; ++ if (first_in_chain) ++ job->job_barrier = 1; ++ ++ if ((job->job_dependency_index_1 + hw_job_id_offset) > ++ JOB_HEADER_ID_MAX || ++ (job->job_dependency_index_2 + hw_job_id_offset) > ++ JOB_HEADER_ID_MAX || ++ (job->job_index + hw_job_id_offset) > JOB_HEADER_ID_MAX) { ++ dev_err(kctx->kbdev->dev, ++ "Job indicies/dependencies out of valid range\n"); ++ goto out_unmap; + } + -+ _mali_mem_cow_copy_page(found_node, new_node); ++ if (job->job_dependency_index_1) ++ job->job_dependency_index_1 += hw_job_id_offset; ++ if (job->job_dependency_index_2) ++ job->job_dependency_index_2 += hw_job_id_offset; + -+ list_replace(&found_node->list, &new_node->list); ++ job->job_index += hw_job_id_offset; + -+ if (1 != _mali_page_node_get_ref_count(found_node)) { -+ atomic_add(1, &mem_bkend->mali_allocation->session->mali_mem_allocated_pages); -+ if (atomic_read(&mem_bkend->mali_allocation->session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE > mem_bkend->mali_allocation->session->max_mali_mem_allocated_size) { -+ mem_bkend->mali_allocation->session->max_mali_mem_allocated_size = atomic_read(&mem_bkend->mali_allocation->session->mali_mem_allocated_pages) * MALI_MMU_PAGE_SIZE; -+ } -+ mem_bkend->cow_mem.change_pages_nr++; ++ if (job->job_descriptor_size) { ++ new_job_header = job->next_job._64; ++ if (!job->next_job._64) ++ job->next_job._64 = prev_jc; ++ } else { ++ new_job_header = job->next_job._32; ++ if (!job->next_job._32) ++ job->next_job._32 = prev_jc; + } ++ dump_job_head(kctx, "Updated to:", job); + -+ mali_mem_swap_out_page_node(found_node); -+ _mali_mem_swap_page_node_free(found_node); ++ if (job->job_type == JOB_TYPE_TILER) { ++ bool job_64 = job->job_descriptor_size != 0; + -+ /* When swap in the new page node, we have called dma_map_page for this page.\n */ -+ dma_unmap_page(&mali_platform_device->dev, new_node->swap_it->dma_addr, -+ _MALI_OSK_MALI_PAGE_SIZE, DMA_TO_DEVICE); ++ if (kbasep_replay_reset_tiler_job(kctx, *job_header, ++ tiler_heap_free, hierarchy_mask, ++ default_weight, job_64) != 0) ++ goto out_unmap; + -+ lock_page(new_node->swap_it->page); ++ } else if (job->job_type == JOB_TYPE_FRAGMENT) { ++ u64 fbd_address; + -+ *pagep = new_node->swap_it->page; ++ if (job->job_descriptor_size) ++ fbd_address = frag_job->fragment_fbd._64; ++ else ++ fbd_address = (u64)frag_job->fragment_fbd._32; + -+ return _MALI_OSK_ERR_OK; ++ if (fbd_address & FBD_TYPE) { ++ if (kbasep_replay_reset_mfbd(kctx, ++ fbd_address & FBD_POINTER_MASK, ++ tiler_heap_free, ++ hierarchy_mask, ++ default_weight) != 0) ++ goto out_unmap; ++ } else { ++ if (kbasep_replay_reset_sfbd(kctx, ++ fbd_address & FBD_POINTER_MASK, ++ tiler_heap_free, ++ hierarchy_mask, ++ default_weight) != 0) ++ goto out_unmap; ++ } ++ } ++ ++ kbase_vunmap(kctx, &map); ++ ++ *job_header = new_job_header; ++ ++ return 0; ++ ++out_unmap: ++ kbase_vunmap(kctx, &map); ++ return -EINVAL; +} + -+#ifdef MALI_MEM_SWAP_TRACKING -+void mali_mem_swap_tracking(u32 *swap_pool_size, u32 *unlock_size) ++/** ++ * @brief Find the highest job ID in a job chain ++ * ++ * @param[in] kctx Context pointer ++ * @param[in] jc Job chain start address ++ * @param[out] hw_job_id Highest job ID in chain ++ * ++ * @return 0 on success, error code on failure ++ */ ++static int kbasep_replay_find_hw_job_id(struct kbase_context *kctx, ++ u64 jc, u16 *hw_job_id) +{ -+ *swap_pool_size = mem_backend_swapped_pool_size; -+ *unlock_size = mem_backend_swapped_unlock_size; ++ while (jc) { ++ struct job_descriptor_header *job; ++ struct kbase_vmap_struct map; ++ ++ dev_dbg(kctx->kbdev->dev, ++ "kbasep_replay_find_hw_job_id: parsing jc=%llx\n", jc); ++ ++ job = kbase_vmap(kctx, jc, sizeof(*job), &map); ++ if (!job) { ++ dev_err(kctx->kbdev->dev, "failed to map jc\n"); ++ ++ return -EINVAL; ++ } ++ ++ if (job->job_index > *hw_job_id) ++ *hw_job_id = job->job_index; ++ ++ if (job->job_descriptor_size) ++ jc = job->next_job._64; ++ else ++ jc = job->next_job._32; ++ ++ kbase_vunmap(kctx, &map); ++ } ++ ++ return 0; +} -+#endif -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h -new file mode 100755 -index 000000000000..5810960e204a ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h -@@ -0,0 +1,121 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef __MALI_MEMORY_SWAP_ALLOC_H__ -+#define __MALI_MEMORY_SWAP_ALLOC_H__ -+ -+#include "mali_osk.h" -+#include "mali_session.h" -+ -+#include "mali_memory_types.h" -+#include "mali_pp_job.h" -+ -+/** -+ * Initialize memory swapping module. -+ */ -+_mali_osk_errcode_t mali_mem_swap_init(void); -+ -+void mali_mem_swap_term(void); -+ -+/** -+ * Return global share memory file to other modules. -+ */ -+struct file *mali_mem_swap_get_global_swap_file(void); -+ -+/** -+ * Unlock the given memory backend and pages in it could be swapped out by kernel. -+ */ -+void mali_mem_swap_unlock_single_mem_backend(mali_mem_backend *mem_bkend); -+ -+/** -+ * Remove the given memory backend from global swap list. -+ */ -+void mali_memory_swap_list_backend_delete(mali_mem_backend *mem_bkend); -+ -+/** -+ * Add the given memory backend to global swap list. -+ */ -+void mali_memory_swap_list_backend_add(mali_mem_backend *mem_bkend); -+ -+/** -+ * Allocate 1 index from bitmap used as page index in global swap file. -+ */ -+u32 mali_mem_swap_idx_alloc(void); -+ -+void mali_mem_swap_idx_free(u32 idx); -+ -+/** -+ * Allocate a new swap item without page index. -+ */ -+struct mali_swap_item *mali_mem_swap_alloc_swap_item(void); -+ -+/** -+ * Free a swap item, truncate the corresponding space in page cache and free index of page. -+ */ -+void mali_mem_swap_free_swap_item(mali_swap_item *swap_item); -+ -+/** -+ * Allocate a page node with swap item. -+ */ -+struct mali_page_node *_mali_mem_swap_page_node_allocate(void); -+ -+/** -+ * Reduce the reference count of given page node and if return 0, just free this page node. -+ */ -+_mali_osk_errcode_t _mali_mem_swap_put_page_node(struct mali_page_node *m_page); -+ -+void _mali_mem_swap_page_node_free(struct mali_page_node *m_page); -+ -+/** -+ * Free a swappable memory backend. -+ */ -+u32 mali_mem_swap_free(mali_mem_swap *swap_mem); -+ -+/** -+ * Ummap and free. -+ */ -+u32 mali_mem_swap_release(mali_mem_backend *mem_bkend, mali_bool is_mali_mapped); -+ -+/** -+ * Read in a page from global swap file with the pre-allcated page index. -+ */ -+mali_bool mali_mem_swap_in_page_node(struct mali_page_node *page_node); -+ -+int mali_mem_swap_alloc_pages(mali_mem_swap *swap_mem, u32 size, u32 *bkend_idx); -+ -+_mali_osk_errcode_t mali_mem_swap_mali_map(mali_mem_swap *swap_mem, struct mali_session_data *session, u32 vaddr, u32 props); -+ -+void mali_mem_swap_mali_unmap(mali_mem_allocation *alloc); -+ -+/** -+ * When pp job created, we need swap in all of memory backend needed by this pp job. -+ */ -+int mali_mem_swap_in_pages(struct mali_pp_job *job); -+ -+/** -+ * Put all of memory backends used this pp job to the global swap list. -+ */ -+int mali_mem_swap_out_pages(struct mali_pp_job *job); -+ -+/** -+ * This will be called in page fault to process CPU read&write. -+ */ -+int mali_mem_swap_allocate_page_on_demand(mali_mem_backend *mem_bkend, u32 offset, struct page **pagep) ; -+ -+/** -+ * Used to process cow on demand for swappable memory backend. -+ */ -+int mali_mem_swap_cow_page_on_demand(mali_mem_backend *mem_bkend, u32 offset, struct page **pagep); -+ -+#ifdef MALI_MEM_SWAP_TRACKING -+void mali_mem_swap_tracking(u32 *swap_pool_size, u32 *unlock_size); -+#endif -+#endif /* __MALI_MEMORY_SWAP_ALLOC_H__ */ -+ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h -new file mode 100755 -index 000000000000..33db40929642 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h -@@ -0,0 +1,219 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ ++/** ++ * @brief Reset the status of a number of jobs ++ * ++ * This function walks the provided job chain, and calls ++ * kbasep_replay_reset_job for each job. It also links the job chain to the ++ * provided previous job chain. ++ * ++ * The function will fail if any of the jobs passed already have status of ++ * NOT_STARTED. ++ * ++ * @param[in] kctx Context pointer ++ * @param[in] jc Job chain to be processed ++ * @param[in] prev_jc Job chain to be added to. May be NULL ++ * @param[in] tiler_heap_free The value to reset Tiler Heap Free to ++ * @param[in] hierarchy_mask The hierarchy mask to use ++ * @param[in] default_weight Default hierarchy weight to write when no other ++ * weight is given in the FBD ++ * @param[in] hw_job_id_offset Offset for HW job IDs ++ * @param[in] fragment_chain true if this chain is the fragment chain ++ * ++ * @return 0 on success, error code otherwise + */ ++static int kbasep_replay_parse_jc(struct kbase_context *kctx, ++ u64 jc, u64 prev_jc, ++ u64 tiler_heap_free, u16 hierarchy_mask, ++ u32 default_weight, u16 hw_job_id_offset, ++ bool fragment_chain) ++{ ++ bool first_in_chain = true; ++ int nr_jobs = 0; + -+#ifndef __MALI_MEMORY_TYPES_H__ -+#define __MALI_MEMORY_TYPES_H__ ++ dev_dbg(kctx->kbdev->dev, "kbasep_replay_parse_jc: jc=%llx hw_job_id=%x\n", ++ jc, hw_job_id_offset); + -+#include ++ while (jc) { ++ dev_dbg(kctx->kbdev->dev, "kbasep_replay_parse_jc: parsing jc=%llx\n", jc); + -+#if defined(CONFIG_MALI400_UMP) -+#include "ump_kernel_interface.h" -+#endif ++ if (kbasep_replay_reset_job(kctx, &jc, prev_jc, ++ tiler_heap_free, hierarchy_mask, ++ default_weight, hw_job_id_offset, ++ first_in_chain, fragment_chain) != 0) ++ return -EINVAL; + -+typedef u32 mali_address_t; ++ first_in_chain = false; + -+typedef enum mali_mem_type { -+ MALI_MEM_OS, -+ MALI_MEM_EXTERNAL, -+ MALI_MEM_SWAP, -+ MALI_MEM_DMA_BUF, -+ MALI_MEM_UMP, -+ MALI_MEM_BLOCK, -+ MALI_MEM_COW, -+ MALI_MEM_SECURE, -+ MALI_MEM_TYPE_MAX, -+} mali_mem_type; ++ nr_jobs++; ++ if (fragment_chain && ++ nr_jobs >= BASE_JD_REPLAY_F_CHAIN_JOB_LIMIT) { ++ dev_err(kctx->kbdev->dev, ++ "Exceeded maximum number of jobs in fragment chain\n"); ++ return -EINVAL; ++ } ++ } + -+typedef struct mali_block_item { -+ /* for block type, the block_phy is alway page size align -+ * so use low 12bit used for ref_cout. -+ */ -+ unsigned long phy_addr; -+} mali_block_item; ++ return 0; ++} + +/** -+ * idx is used to locate the given page in the address space of swap file. -+ * ref_count is used to mark how many memory backends are using this item. ++ * @brief Reset the status of a replay job, and set up dependencies ++ * ++ * This performs the actions to allow the replay job to be re-run following ++ * completion of the passed dependency. ++ * ++ * @param[in] katom The atom to be reset ++ * @param[in] dep_atom The dependency to be attached to the atom + */ -+typedef struct mali_swap_item { -+ u32 idx; -+ atomic_t ref_count; -+ struct page *page; -+ dma_addr_t dma_addr; -+} mali_swap_item; ++static void kbasep_replay_reset_softjob(struct kbase_jd_atom *katom, ++ struct kbase_jd_atom *dep_atom) ++{ ++ katom->status = KBASE_JD_ATOM_STATE_QUEUED; ++ kbase_jd_katom_dep_set(&katom->dep[0], dep_atom, BASE_JD_DEP_TYPE_DATA); ++ list_add_tail(&katom->dep_item[0], &dep_atom->dep_head[0]); ++} + -+typedef enum mali_page_node_type { -+ MALI_PAGE_NODE_OS, -+ MALI_PAGE_NODE_BLOCK, -+ MALI_PAGE_NODE_SWAP, -+} mali_page_node_type; ++/** ++ * @brief Allocate an unused katom ++ * ++ * This will search the provided context for an unused katom, and will mark it ++ * as KBASE_JD_ATOM_STATE_QUEUED. ++ * ++ * If no atoms are available then the function will fail. ++ * ++ * @param[in] kctx Context pointer ++ * @return An atom ID, or -1 on failure ++ */ ++static int kbasep_allocate_katom(struct kbase_context *kctx) ++{ ++ struct kbase_jd_context *jctx = &kctx->jctx; ++ int i; + -+typedef struct mali_page_node { -+ struct list_head list; -+ union { -+ struct page *page; -+ mali_block_item *blk_it; /*pointer to block item*/ -+ mali_swap_item *swap_it; -+ }; ++ for (i = BASE_JD_ATOM_COUNT-1; i > 0; i--) { ++ if (jctx->atoms[i].status == KBASE_JD_ATOM_STATE_UNUSED) { ++ jctx->atoms[i].status = KBASE_JD_ATOM_STATE_QUEUED; ++ dev_dbg(kctx->kbdev->dev, ++ "kbasep_allocate_katom: Allocated atom %d\n", ++ i); ++ return i; ++ } ++ } + -+ u32 type; -+} mali_page_node; ++ return -1; ++} + -+typedef struct mali_mem_os_mem { -+ struct list_head pages; -+ u32 count; -+} mali_mem_os_mem; ++/** ++ * @brief Release a katom ++ * ++ * This will mark the provided atom as available, and remove any dependencies. ++ * ++ * For use on error path. ++ * ++ * @param[in] kctx Context pointer ++ * @param[in] atom_id ID of atom to release ++ */ ++static void kbasep_release_katom(struct kbase_context *kctx, int atom_id) ++{ ++ struct kbase_jd_context *jctx = &kctx->jctx; + -+typedef struct mali_mem_dma_buf { -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+ struct mali_dma_buf_attachment *attachment; -+#endif -+} mali_mem_dma_buf; ++ dev_dbg(kctx->kbdev->dev, "kbasep_release_katom: Released atom %d\n", ++ atom_id); + -+typedef struct mali_mem_external { -+ dma_addr_t phys; -+ u32 size; -+} mali_mem_external; ++ while (!list_empty(&jctx->atoms[atom_id].dep_head[0])) ++ list_del(jctx->atoms[atom_id].dep_head[0].next); + -+typedef struct mali_mem_ump { -+#if defined(CONFIG_MALI400_UMP) -+ ump_dd_handle handle; -+#endif -+} mali_mem_ump; ++ while (!list_empty(&jctx->atoms[atom_id].dep_head[1])) ++ list_del(jctx->atoms[atom_id].dep_head[1].next); + -+typedef struct block_allocator_allocation { -+ /* The list will be released in reverse order */ -+ struct block_info *last_allocated; -+ u32 mapping_length; -+ struct block_allocator *info; -+} block_allocator_allocation; ++ jctx->atoms[atom_id].status = KBASE_JD_ATOM_STATE_UNUSED; ++} + -+typedef struct mali_mem_block_mem { -+ struct list_head pfns; -+ u32 count; -+} mali_mem_block_mem; ++static void kbasep_replay_create_atom(struct kbase_context *kctx, ++ struct base_jd_atom_v2 *atom, ++ int atom_nr, ++ base_jd_prio prio) ++{ ++ atom->nr_extres = 0; ++ atom->extres_list.value = NULL; ++ atom->device_nr = 0; ++ atom->prio = prio; ++ atom->atom_number = atom_nr; + -+typedef struct mali_mem_virt_mali_mapping { -+ mali_address_t addr; /* Virtual Mali address */ -+ u32 properties; /* MMU Permissions + cache, must match MMU HW */ -+} mali_mem_virt_mali_mapping; ++ base_jd_atom_dep_set(&atom->pre_dep[0], 0 , BASE_JD_DEP_TYPE_INVALID); ++ base_jd_atom_dep_set(&atom->pre_dep[1], 0 , BASE_JD_DEP_TYPE_INVALID); + -+typedef struct mali_mem_virt_cpu_mapping { -+ void __user *addr; -+ struct vm_area_struct *vma; -+} mali_mem_virt_cpu_mapping; ++ atom->udata.blob[0] = 0; ++ atom->udata.blob[1] = 0; ++} + -+#define MALI_MEM_ALLOCATION_VALID_MAGIC 0xdeda110c -+#define MALI_MEM_ALLOCATION_FREED_MAGIC 0x10101010 ++/** ++ * @brief Create two atoms for the purpose of replaying jobs ++ * ++ * Two atoms are allocated and created. The jc pointer is not set at this ++ * stage. The second atom has a dependency on the first. The remaining fields ++ * are set up as follows : ++ * ++ * - No external resources. Any required external resources will be held by the ++ * replay atom. ++ * - device_nr is set to 0. This is not relevant as ++ * BASE_JD_REQ_SPECIFIC_COHERENT_GROUP should not be set. ++ * - Priority is inherited from the replay job. ++ * ++ * @param[out] t_atom Atom to use for tiler jobs ++ * @param[out] f_atom Atom to use for fragment jobs ++ * @param[in] prio Priority of new atom (inherited from replay soft ++ * job) ++ * @return 0 on success, error code on failure ++ */ ++static int kbasep_replay_create_atoms(struct kbase_context *kctx, ++ struct base_jd_atom_v2 *t_atom, ++ struct base_jd_atom_v2 *f_atom, ++ base_jd_prio prio) ++{ ++ int t_atom_nr, f_atom_nr; + -+typedef struct mali_mm_node { -+ /* MALI GPU vaddr start, use u32 for mmu only support 32bit address*/ -+ uint32_t start; /* GPU vaddr */ -+ uint32_t size; /* GPU allocation virtual size */ -+ unsigned allocated : 1; -+} mali_mm_node; ++ t_atom_nr = kbasep_allocate_katom(kctx); ++ if (t_atom_nr < 0) { ++ dev_err(kctx->kbdev->dev, "Failed to allocate katom\n"); ++ return -EINVAL; ++ } + -+typedef struct mali_vma_node { -+ struct mali_mm_node vm_node; -+ struct rb_node vm_rb; -+} mali_vma_node; ++ f_atom_nr = kbasep_allocate_katom(kctx); ++ if (f_atom_nr < 0) { ++ dev_err(kctx->kbdev->dev, "Failed to allocate katom\n"); ++ kbasep_release_katom(kctx, t_atom_nr); ++ return -EINVAL; ++ } + ++ kbasep_replay_create_atom(kctx, t_atom, t_atom_nr, prio); ++ kbasep_replay_create_atom(kctx, f_atom, f_atom_nr, prio); + -+typedef struct mali_mem_allocation { -+ MALI_DEBUG_CODE(u32 magic); -+ mali_mem_type type; /**< Type of memory */ -+ u32 flags; /**< Flags for this allocation */ ++ base_jd_atom_dep_set(&f_atom->pre_dep[0], t_atom_nr , BASE_JD_DEP_TYPE_DATA); + -+ struct mali_session_data *session; /**< Pointer to session that owns the allocation */ ++ return 0; ++} + -+ mali_mem_virt_cpu_mapping cpu_mapping; /**< CPU mapping */ -+ mali_mem_virt_mali_mapping mali_mapping; /**< Mali mapping */ ++#ifdef CONFIG_MALI_DEBUG ++static void payload_dump(struct kbase_context *kctx, base_jd_replay_payload *payload) ++{ ++ u64 next; + -+ /* add for new memory system */ -+ struct mali_vma_node mali_vma_node; -+ u32 vsize; /* virtual size*/ -+ u32 psize; /* physical backend memory size*/ -+ struct list_head list; -+ s32 backend_handle; /* idr for mem_backend */ -+ _mali_osk_atomic_t mem_alloc_refcount; -+} mali_mem_allocation; ++ dev_dbg(kctx->kbdev->dev, "Tiler jc list :\n"); ++ next = payload->tiler_jc_list; + -+struct mali_mem_os_allocator { -+ spinlock_t pool_lock; -+ struct list_head pool_pages; -+ size_t pool_count; ++ while (next) { ++ struct kbase_vmap_struct map; ++ base_jd_replay_jc *jc_struct; + -+ atomic_t allocated_pages; -+ size_t allocation_limit; ++ jc_struct = kbase_vmap(kctx, next, sizeof(*jc_struct), &map); + -+ struct shrinker shrinker; -+ struct delayed_work timed_shrinker; -+ struct workqueue_struct *wq; -+}; ++ if (!jc_struct) ++ return; + -+/* COW backend memory type */ -+typedef struct mali_mem_cow { -+ struct list_head pages; /**< all pages for this cow backend allocation, -+ including new allocated pages for modified range*/ -+ u32 count; /**< number of pages */ -+ s32 change_pages_nr; -+} mali_mem_cow; ++ dev_dbg(kctx->kbdev->dev, "* jc_struct=%p jc=%llx next=%llx\n", ++ jc_struct, jc_struct->jc, jc_struct->next); + -+typedef struct mali_mem_swap { -+ struct list_head pages; -+ u32 count; -+} mali_mem_swap; ++ next = jc_struct->next; + -+typedef struct mali_mem_secure { -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+ struct dma_buf *buf; -+ struct dma_buf_attachment *attachment; -+ struct sg_table *sgt; ++ kbase_vunmap(kctx, &map); ++ } ++} +#endif -+ u32 count; -+} mali_mem_secure; -+ -+#define MALI_MEM_BACKEND_FLAG_COWED (0x1) /* COW has happen on this backend */ -+#define MALI_MEM_BACKEND_FLAG_COW_CPU_NO_WRITE (0x2) /* This is an COW backend, mapped as not allowed cpu to write */ -+#define MALI_MEM_BACKEND_FLAG_SWAP_COWED (0x4) /* Mark the given backend is cowed from swappable memory. */ -+/* Mark this backend is not swapped_in in MALI driver, and before using it, -+ * we should swap it in and set up corresponding page table. */ -+#define MALI_MEM_BACKEND_FLAG_UNSWAPPED_IN (0x8) -+#define MALI_MEM_BACKEND_FLAG_NOT_BINDED (0x1 << 5) /* this backend it not back with physical memory, used for defer bind */ -+#define MALI_MEM_BACKEND_FLAG_BINDED (0x1 << 6) /* this backend it back with physical memory, used for defer bind */ + -+typedef struct mali_mem_backend { -+ mali_mem_type type; /**< Type of backend memory */ -+ u32 flags; /**< Flags for this allocation */ -+ u32 size; -+ /* Union selected by type. */ -+ union { -+ mali_mem_os_mem os_mem; /**< MALI_MEM_OS */ -+ mali_mem_external ext_mem; /**< MALI_MEM_EXTERNAL */ -+ mali_mem_dma_buf dma_buf; /**< MALI_MEM_DMA_BUF */ -+ mali_mem_ump ump_mem; /**< MALI_MEM_UMP */ -+ mali_mem_block_mem block_mem; /**< MALI_MEM_BLOCK */ -+ mali_mem_cow cow_mem; -+ mali_mem_swap swap_mem; -+ mali_mem_secure secure_mem; -+ }; -+ mali_mem_allocation *mali_allocation; -+ struct mutex mutex; -+ mali_mem_type cow_type; ++/** ++ * @brief Parse a base_jd_replay_payload provided by userspace ++ * ++ * This will read the payload from userspace, and parse the job chains. ++ * ++ * @param[in] kctx Context pointer ++ * @param[in] replay_atom Replay soft job atom ++ * @param[in] t_atom Atom to use for tiler jobs ++ * @param[in] f_atom Atom to use for fragment jobs ++ * @return 0 on success, error code on failure ++ */ ++static int kbasep_replay_parse_payload(struct kbase_context *kctx, ++ struct kbase_jd_atom *replay_atom, ++ struct base_jd_atom_v2 *t_atom, ++ struct base_jd_atom_v2 *f_atom) ++{ ++ base_jd_replay_payload *payload = NULL; ++ u64 next; ++ u64 prev_jc = 0; ++ u16 hw_job_id_offset = 0; ++ int ret = -EINVAL; ++ struct kbase_vmap_struct map; + -+ struct list_head list; /**< Used to link swappable memory backend to the global swappable list */ -+ int using_count; /**< Mark how many PP jobs are using this memory backend */ -+ u32 start_idx; /**< If the correspondign vma of this backend is linear, this value will be used to set vma->vm_pgoff */ -+} mali_mem_backend; ++ dev_dbg(kctx->kbdev->dev, "kbasep_replay_parse_payload: replay_atom->jc = %llx sizeof(payload) = %zu\n", ++ replay_atom->jc, sizeof(payload)); + -+#define MALI_MEM_FLAG_MALI_GUARD_PAGE (_MALI_MAP_EXTERNAL_MAP_GUARD_PAGE) -+#define MALI_MEM_FLAG_DONT_CPU_MAP (1 << 1) -+#define MALI_MEM_FLAG_CAN_RESIZE (_MALI_MEMORY_ALLOCATE_RESIZEABLE) -+#endif /* __MALI_MEMORY_TYPES__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c -new file mode 100755 -index 000000000000..666d4b0fb1cd ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c -@@ -0,0 +1,154 @@ -+/* -+ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ payload = kbase_vmap(kctx, replay_atom->jc, sizeof(*payload), &map); ++ if (!payload) { ++ dev_err(kctx->kbdev->dev, "kbasep_replay_parse_payload: failed to map payload into kernel space\n"); ++ return -EINVAL; ++ } + -+#include "mali_ukk.h" -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_session.h" -+#include "mali_kernel_linux.h" -+#include "mali_memory.h" -+#include "ump_kernel_interface.h" ++#ifdef BASE_LEGACY_UK10_2_SUPPORT ++ if (KBASE_API_VERSION(10, 3) > replay_atom->kctx->api_version) { ++ base_jd_replay_payload_uk10_2 *payload_uk10_2; ++ u16 tiler_core_req; ++ u16 fragment_core_req; + -+static int mali_mem_ump_map(mali_mem_backend *mem_backend) -+{ -+ ump_dd_handle ump_mem; -+ mali_mem_allocation *alloc; -+ struct mali_session_data *session; -+ u32 nr_blocks; -+ u32 i; -+ ump_dd_physical_block *ump_blocks; -+ struct mali_page_directory *pagedir; -+ u32 offset = 0; -+ _mali_osk_errcode_t err; ++ payload_uk10_2 = (base_jd_replay_payload_uk10_2 *) payload; ++ memcpy(&tiler_core_req, &payload_uk10_2->tiler_core_req, ++ sizeof(tiler_core_req)); ++ memcpy(&fragment_core_req, &payload_uk10_2->fragment_core_req, ++ sizeof(fragment_core_req)); ++ payload->tiler_core_req = (u32)(tiler_core_req & 0x7fff); ++ payload->fragment_core_req = (u32)(fragment_core_req & 0x7fff); ++ } ++#endif /* BASE_LEGACY_UK10_2_SUPPORT */ + -+ MALI_DEBUG_ASSERT_POINTER(mem_backend); -+ MALI_DEBUG_ASSERT(MALI_MEM_UMP == mem_backend->type); ++#ifdef CONFIG_MALI_DEBUG ++ dev_dbg(kctx->kbdev->dev, "kbasep_replay_parse_payload: payload=%p\n", payload); ++ dev_dbg(kctx->kbdev->dev, "Payload structure:\n" ++ "tiler_jc_list = %llx\n" ++ "fragment_jc = %llx\n" ++ "tiler_heap_free = %llx\n" ++ "fragment_hierarchy_mask = %x\n" ++ "tiler_hierarchy_mask = %x\n" ++ "hierarchy_default_weight = %x\n" ++ "tiler_core_req = %x\n" ++ "fragment_core_req = %x\n", ++ payload->tiler_jc_list, ++ payload->fragment_jc, ++ payload->tiler_heap_free, ++ payload->fragment_hierarchy_mask, ++ payload->tiler_hierarchy_mask, ++ payload->hierarchy_default_weight, ++ payload->tiler_core_req, ++ payload->fragment_core_req); ++ payload_dump(kctx, payload); ++#endif ++ t_atom->core_req = payload->tiler_core_req | BASEP_JD_REQ_EVENT_NEVER; ++ f_atom->core_req = payload->fragment_core_req | BASEP_JD_REQ_EVENT_NEVER; + -+ alloc = mem_backend->mali_allocation; -+ MALI_DEBUG_ASSERT_POINTER(alloc); ++ /* Sanity check core requirements*/ ++ if ((t_atom->core_req & BASE_JD_REQ_ATOM_TYPE) != BASE_JD_REQ_T || ++ (f_atom->core_req & BASE_JD_REQ_ATOM_TYPE) != BASE_JD_REQ_FS || ++ t_atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES || ++ f_atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES) { + -+ session = alloc->session; -+ MALI_DEBUG_ASSERT_POINTER(session); ++ int t_atom_type = t_atom->core_req & BASE_JD_REQ_ATOM_TYPE & ~BASE_JD_REQ_COHERENT_GROUP; ++ int f_atom_type = f_atom->core_req & BASE_JD_REQ_ATOM_TYPE & ~BASE_JD_REQ_COHERENT_GROUP & ~BASE_JD_REQ_FS_AFBC; ++ int t_has_ex_res = t_atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES; ++ int f_has_ex_res = f_atom->core_req & BASE_JD_REQ_EXTERNAL_RESOURCES; + -+ ump_mem = mem_backend->ump_mem.handle; -+ MALI_DEBUG_ASSERT(UMP_DD_HANDLE_INVALID != ump_mem); ++ if (t_atom_type != BASE_JD_REQ_T) { ++ dev_err(kctx->kbdev->dev, "Invalid core requirement: Tiler atom not a tiler job. Was: 0x%x\n Expected: 0x%x", ++ t_atom_type, BASE_JD_REQ_T); ++ } ++ if (f_atom_type != BASE_JD_REQ_FS) { ++ dev_err(kctx->kbdev->dev, "Invalid core requirement: Fragment shader atom not a fragment shader. Was 0x%x Expected: 0x%x\n", ++ f_atom_type, BASE_JD_REQ_FS); ++ } ++ if (t_has_ex_res) { ++ dev_err(kctx->kbdev->dev, "Invalid core requirement: Tiler atom has external resources.\n"); ++ } ++ if (f_has_ex_res) { ++ dev_err(kctx->kbdev->dev, "Invalid core requirement: Fragment shader atom has external resources.\n"); ++ } + -+ nr_blocks = ump_dd_phys_block_count_get(ump_mem); -+ if (nr_blocks == 0) { -+ MALI_DEBUG_PRINT(1, ("No block count\n")); -+ return -EINVAL; ++ goto out; + } + -+ ump_blocks = _mali_osk_malloc(sizeof(*ump_blocks) * nr_blocks); -+ if (NULL == ump_blocks) { -+ return -ENOMEM; ++ /* Process tiler job chains */ ++ next = payload->tiler_jc_list; ++ if (!next) { ++ dev_err(kctx->kbdev->dev, "Invalid tiler JC list\n"); ++ goto out; + } + -+ if (UMP_DD_INVALID == ump_dd_phys_blocks_get(ump_mem, ump_blocks, nr_blocks)) { -+ _mali_osk_free(ump_blocks); -+ return -EFAULT; -+ } ++ while (next) { ++ base_jd_replay_jc *jc_struct; ++ struct kbase_vmap_struct jc_map; ++ u64 jc; + -+ pagedir = session->page_directory; ++ jc_struct = kbase_vmap(kctx, next, sizeof(*jc_struct), &jc_map); + -+ mali_session_memory_lock(session); ++ if (!jc_struct) { ++ dev_err(kctx->kbdev->dev, "Failed to map jc struct\n"); ++ goto out; ++ } + -+ err = mali_mem_mali_map_prepare(alloc); -+ if (_MALI_OSK_ERR_OK != err) { -+ MALI_DEBUG_PRINT(1, ("Mapping of UMP memory failed\n")); ++ jc = jc_struct->jc; ++ next = jc_struct->next; ++ if (next) ++ jc_struct->jc = 0; + -+ _mali_osk_free(ump_blocks); -+ mali_session_memory_unlock(session); -+ return -ENOMEM; -+ } ++ kbase_vunmap(kctx, &jc_map); + -+ for (i = 0; i < nr_blocks; ++i) { -+ u32 virt = alloc->mali_vma_node.vm_node.start + offset; ++ if (jc) { ++ u16 max_hw_job_id = 0; + -+ MALI_DEBUG_PRINT(7, ("Mapping in 0x%08x size %d\n", ump_blocks[i].addr , ump_blocks[i].size)); ++ if (kbasep_replay_find_hw_job_id(kctx, jc, ++ &max_hw_job_id) != 0) ++ goto out; + -+ mali_mmu_pagedir_update(pagedir, virt, ump_blocks[i].addr, -+ ump_blocks[i].size, MALI_MMU_FLAGS_DEFAULT); ++ if (kbasep_replay_parse_jc(kctx, jc, prev_jc, ++ payload->tiler_heap_free, ++ payload->tiler_hierarchy_mask, ++ payload->hierarchy_default_weight, ++ hw_job_id_offset, false) != 0) { ++ goto out; ++ } + -+ offset += ump_blocks[i].size; ++ hw_job_id_offset += max_hw_job_id; ++ ++ prev_jc = jc; ++ } + } ++ t_atom->jc = prev_jc; + -+ if (alloc->flags & _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE) { -+ u32 virt = alloc->mali_vma_node.vm_node.start + offset; ++ /* Process fragment job chain */ ++ f_atom->jc = payload->fragment_jc; ++ if (kbasep_replay_parse_jc(kctx, payload->fragment_jc, 0, ++ payload->tiler_heap_free, ++ payload->fragment_hierarchy_mask, ++ payload->hierarchy_default_weight, 0, ++ true) != 0) { ++ goto out; ++ } + -+ /* Map in an extra virtual guard page at the end of the VMA */ -+ MALI_DEBUG_PRINT(6, ("Mapping in extra guard page\n")); ++ if (!t_atom->jc || !f_atom->jc) { ++ dev_err(kctx->kbdev->dev, "Invalid payload\n"); ++ goto out; ++ } + -+ mali_mmu_pagedir_update(pagedir, virt, ump_blocks[0].addr, _MALI_OSK_MALI_PAGE_SIZE, MALI_MMU_FLAGS_DEFAULT); ++ dev_dbg(kctx->kbdev->dev, "t_atom->jc=%llx f_atom->jc=%llx\n", ++ t_atom->jc, f_atom->jc); ++ ret = 0; + -+ offset += _MALI_OSK_MALI_PAGE_SIZE; -+ } -+ mali_session_memory_unlock(session); -+ _mali_osk_free(ump_blocks); -+ return 0; -+} ++out: ++ kbase_vunmap(kctx, &map); + -+static void mali_mem_ump_unmap(mali_mem_allocation *alloc) -+{ -+ struct mali_session_data *session; -+ MALI_DEBUG_ASSERT_POINTER(alloc); -+ session = alloc->session; -+ MALI_DEBUG_ASSERT_POINTER(session); -+ mali_session_memory_lock(session); -+ mali_mem_mali_map_free(session, alloc->psize, alloc->mali_vma_node.vm_node.start, -+ alloc->flags); -+ mali_session_memory_unlock(session); ++ return ret; +} + -+int mali_mem_bind_ump_buf(mali_mem_allocation *alloc, mali_mem_backend *mem_backend, u32 secure_id, u32 flags) ++static void kbase_replay_process_worker(struct work_struct *data) +{ -+ ump_dd_handle ump_mem; -+ int ret; -+ MALI_DEBUG_ASSERT_POINTER(alloc); -+ MALI_DEBUG_ASSERT_POINTER(mem_backend); -+ MALI_DEBUG_ASSERT(MALI_MEM_UMP == mem_backend->type); ++ struct kbase_jd_atom *katom; ++ struct kbase_context *kctx; ++ struct kbase_jd_context *jctx; ++ bool need_to_try_schedule_context = false; + -+ MALI_DEBUG_PRINT(3, -+ ("Requested to map ump memory with secure id %d into virtual memory 0x%08X, size 0x%08X\n", -+ secure_id, alloc->mali_vma_node.vm_node.start, alloc->mali_vma_node.vm_node.size)); ++ struct base_jd_atom_v2 t_atom, f_atom; ++ struct kbase_jd_atom *t_katom, *f_katom; ++ base_jd_prio atom_prio; + -+ ump_mem = ump_dd_handle_create_from_secure_id(secure_id); -+ if (UMP_DD_HANDLE_INVALID == ump_mem) MALI_ERROR(_MALI_OSK_ERR_FAULT); -+ alloc->flags |= MALI_MEM_FLAG_DONT_CPU_MAP; -+ if (flags & _MALI_MAP_EXTERNAL_MAP_GUARD_PAGE) { -+ alloc->flags |= MALI_MEM_FLAG_MALI_GUARD_PAGE; ++ katom = container_of(data, struct kbase_jd_atom, work); ++ kctx = katom->kctx; ++ jctx = &kctx->jctx; ++ ++ mutex_lock(&jctx->lock); ++ ++ atom_prio = kbasep_js_sched_prio_to_atom_prio(katom->sched_priority); ++ ++ if (kbasep_replay_create_atoms( ++ kctx, &t_atom, &f_atom, atom_prio) != 0) { ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ goto out; + } + -+ mem_backend->ump_mem.handle = ump_mem; ++ t_katom = &jctx->atoms[t_atom.atom_number]; ++ f_katom = &jctx->atoms[f_atom.atom_number]; + -+ ret = mali_mem_ump_map(mem_backend); -+ if (0 != ret) { -+ ump_dd_reference_release(ump_mem); -+ return _MALI_OSK_ERR_FAULT; ++ if (kbasep_replay_parse_payload(kctx, katom, &t_atom, &f_atom) != 0) { ++ kbasep_release_katom(kctx, t_atom.atom_number); ++ kbasep_release_katom(kctx, f_atom.atom_number); ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ goto out; + } -+ MALI_DEBUG_PRINT(3, ("Returning from UMP bind\n")); -+ return _MALI_OSK_ERR_OK; -+} + -+void mali_mem_unbind_ump_buf(mali_mem_backend *mem_backend) -+{ -+ ump_dd_handle ump_mem; -+ mali_mem_allocation *alloc; -+ MALI_DEBUG_ASSERT_POINTER(mem_backend); -+ MALI_DEBUG_ASSERT(MALI_MEM_UMP == mem_backend->type); -+ ump_mem = mem_backend->ump_mem.handle; -+ MALI_DEBUG_ASSERT(UMP_DD_HANDLE_INVALID != ump_mem); ++ kbasep_replay_reset_softjob(katom, f_katom); + -+ alloc = mem_backend->mali_allocation; -+ MALI_DEBUG_ASSERT_POINTER(alloc); -+ mali_mem_ump_unmap(alloc); -+ ump_dd_reference_release(ump_mem); ++ need_to_try_schedule_context |= jd_submit_atom(kctx, &t_atom, t_katom); ++ if (t_katom->event_code == BASE_JD_EVENT_JOB_INVALID) { ++ dev_err(kctx->kbdev->dev, "Replay failed to submit atom\n"); ++ kbasep_release_katom(kctx, f_atom.atom_number); ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ goto out; ++ } ++ need_to_try_schedule_context |= jd_submit_atom(kctx, &f_atom, f_katom); ++ if (f_katom->event_code == BASE_JD_EVENT_JOB_INVALID) { ++ dev_err(kctx->kbdev->dev, "Replay failed to submit atom\n"); ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ goto out; ++ } ++ ++ katom->event_code = BASE_JD_EVENT_DONE; ++ ++out: ++ if (katom->event_code != BASE_JD_EVENT_DONE) { ++ kbase_disjoint_state_down(kctx->kbdev); ++ ++ need_to_try_schedule_context |= jd_done_nolock(katom, NULL); ++ } ++ ++ if (need_to_try_schedule_context) ++ kbase_js_sched_all(kctx->kbdev); ++ ++ mutex_unlock(&jctx->lock); +} + -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h -new file mode 100755 -index 000000000000..c314c8dcbf1c ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h -@@ -0,0 +1,29 @@ -+/* -+ * Copyright (C) 2011-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * @brief Check job replay fault ++ * ++ * This will read the job payload, checks fault type and source, then decides ++ * whether replay is required. ++ * ++ * @param[in] katom The atom to be processed ++ * @return true (success) if replay required or false on failure. + */ ++static bool kbase_replay_fault_check(struct kbase_jd_atom *katom) ++{ ++ struct kbase_context *kctx = katom->kctx; ++ struct device *dev = kctx->kbdev->dev; ++ base_jd_replay_payload *payload; ++ u64 job_header; ++ u64 job_loop_detect; ++ struct job_descriptor_header *job; ++ struct kbase_vmap_struct job_map; ++ struct kbase_vmap_struct map; ++ bool err = false; + -+#ifndef __MALI_MEMORY_UMP_BUF_H__ -+#define __MALI_MEMORY_UMP_BUF_H__ ++ /* Replay job if fault is of type BASE_JD_EVENT_JOB_WRITE_FAULT or ++ * if force_replay is enabled. ++ */ ++ if (BASE_JD_EVENT_TERMINATED == katom->event_code) { ++ return false; ++ } else if (BASE_JD_EVENT_JOB_WRITE_FAULT == katom->event_code) { ++ return true; ++ } else if (BASE_JD_EVENT_FORCE_REPLAY == katom->event_code) { ++ katom->event_code = BASE_JD_EVENT_DATA_INVALID_FAULT; ++ return true; ++ } else if (BASE_JD_EVENT_DATA_INVALID_FAULT != katom->event_code) { ++ /* No replay for faults of type other than ++ * BASE_JD_EVENT_DATA_INVALID_FAULT. ++ */ ++ return false; ++ } + -+#ifdef __cplusplus -+extern "C" { ++ /* Job fault is BASE_JD_EVENT_DATA_INVALID_FAULT, now scan fragment jc ++ * to find out whether the source of exception is POLYGON_LIST. Replay ++ * is required if the source of fault is POLYGON_LIST. ++ */ ++ payload = kbase_vmap(kctx, katom->jc, sizeof(*payload), &map); ++ if (!payload) { ++ dev_err(dev, "kbase_replay_fault_check: failed to map payload.\n"); ++ return false; ++ } ++ ++#ifdef CONFIG_MALI_DEBUG ++ dev_dbg(dev, "kbase_replay_fault_check: payload=%p\n", payload); ++ dev_dbg(dev, "\nPayload structure:\n" ++ "fragment_jc = 0x%llx\n" ++ "fragment_hierarchy_mask = 0x%x\n" ++ "fragment_core_req = 0x%x\n", ++ payload->fragment_jc, ++ payload->fragment_hierarchy_mask, ++ payload->fragment_core_req); +#endif ++ /* Process fragment job chain */ ++ job_header = (u64) payload->fragment_jc; ++ job_loop_detect = job_header; ++ while (job_header) { ++ job = kbase_vmap(kctx, job_header, sizeof(*job), &job_map); ++ if (!job) { ++ dev_err(dev, "failed to map jc\n"); ++ /* unmap payload*/ ++ kbase_vunmap(kctx, &map); ++ return false; ++ } + -+#include "mali_uk_types.h" -+#include "mali_osk.h" -+#include "mali_memory.h" + -+int mali_mem_bind_ump_buf(mali_mem_allocation *alloc, mali_mem_backend *mem_backend, u32 secure_id, u32 flags); -+void mali_mem_unbind_ump_buf(mali_mem_backend *mem_backend); ++ dump_job_head(kctx, "\njob_head structure:\n", job); + -+#ifdef __cplusplus -+} -+#endif ++ /* Replay only when the polygon list reader caused the ++ * DATA_INVALID_FAULT */ ++ if ((BASE_JD_EVENT_DATA_INVALID_FAULT == katom->event_code) && ++ (JOB_POLYGON_LIST == JOB_SOURCE_ID(job->exception_status))) { ++ err = true; ++ kbase_vunmap(kctx, &job_map); ++ break; ++ } + -+#endif /* __MALI_MEMORY_DMA_BUF_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c -new file mode 100755 -index 000000000000..8e13e923c3fb ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c -@@ -0,0 +1,158 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ /* Move on to next fragment job in the list */ ++ if (job->job_descriptor_size) ++ job_header = job->next_job._64; ++ else ++ job_header = job->next_job._32; + -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++ kbase_vunmap(kctx, &job_map); + -+#include "mali_osk.h" -+#include "mali_osk_mali.h" -+#include "mali_kernel_linux.h" -+#include "mali_scheduler.h" ++ /* Job chain loop detected */ ++ if (job_header == job_loop_detect) ++ break; ++ } + -+#include "mali_memory.h" -+#include "mali_memory_os_alloc.h" -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+#include "mali_memory_dma_buf.h" -+#include "mali_memory_secure.h" -+#endif -+#if defined(CONFIG_MALI400_UMP) -+#include "mali_memory_ump.h" -+#endif -+#include "mali_memory_external.h" -+#include "mali_memory_manager.h" -+#include "mali_memory_virtual.h" -+#include "mali_memory_cow.h" -+#include "mali_memory_block_alloc.h" -+#include "mali_memory_swap_alloc.h" ++ /* unmap payload*/ ++ kbase_vunmap(kctx, &map); + ++ return err; ++} + + +/** -+*function @_mali_free_allocation_mem - free a memory allocation -+*/ -+static u32 _mali_free_allocation_mem(mali_mem_allocation *mali_alloc) ++ * @brief Process a replay job ++ * ++ * Called from kbase_process_soft_job. ++ * ++ * On exit, if the job has completed, katom->event_code will have been updated. ++ * If the job has not completed, and is replaying jobs, then the atom status ++ * will have been reset to KBASE_JD_ATOM_STATE_QUEUED. ++ * ++ * @param[in] katom The atom to be processed ++ * @return false if the atom has completed ++ * true if the atom is replaying jobs ++ */ ++bool kbase_replay_process(struct kbase_jd_atom *katom) +{ -+ mali_mem_backend *mem_bkend = NULL; -+ u32 free_pages_nr = 0; ++ struct kbase_context *kctx = katom->kctx; ++ struct kbase_device *kbdev = kctx->kbdev; + -+ struct mali_session_data *session = mali_alloc->session; -+ MALI_DEBUG_PRINT(4, (" _mali_free_allocation_mem, psize =0x%x! \n", mali_alloc->psize)); -+ if (0 == mali_alloc->psize) -+ goto out; ++ /* Don't replay this atom if these issues are not present in the ++ * hardware */ ++ if (!kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_11020) && ++ !kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_11024)) { ++ dev_dbg(kbdev->dev, "Hardware does not need replay workaround"); + -+ /* Get backend memory & Map on CPU */ -+ mutex_lock(&mali_idr_mutex); -+ mem_bkend = idr_find(&mali_backend_idr, mali_alloc->backend_handle); -+ mutex_unlock(&mali_idr_mutex); -+ MALI_DEBUG_ASSERT(NULL != mem_bkend); ++ /* Signal failure to userspace */ ++ katom->event_code = BASE_JD_EVENT_JOB_INVALID; + -+ switch (mem_bkend->type) { -+ case MALI_MEM_OS: -+ free_pages_nr = mali_mem_os_release(mem_bkend); -+ atomic_sub(free_pages_nr, &session->mali_mem_allocated_pages); -+ break; -+ case MALI_MEM_UMP: -+#if defined(CONFIG_MALI400_UMP) -+ mali_mem_unbind_ump_buf(mem_bkend); -+ atomic_sub(mem_bkend->size / MALI_MMU_PAGE_SIZE, &session->mali_mem_array[mem_bkend->type]); -+#else -+ MALI_DEBUG_PRINT(1, ("UMP not supported\n")); -+#endif -+ break; -+ case MALI_MEM_DMA_BUF: -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+ mali_mem_unbind_dma_buf(mem_bkend); -+ atomic_sub(mem_bkend->size / MALI_MMU_PAGE_SIZE, &session->mali_mem_array[mem_bkend->type]); -+#else -+ MALI_DEBUG_PRINT(1, ("DMA not supported\n")); -+#endif -+ break; -+ case MALI_MEM_EXTERNAL: -+ mali_mem_unbind_ext_buf(mem_bkend); -+ atomic_sub(mem_bkend->size / MALI_MMU_PAGE_SIZE, &session->mali_mem_array[mem_bkend->type]); -+ break; ++ return false; ++ } + -+ case MALI_MEM_BLOCK: -+ free_pages_nr = mali_mem_block_release(mem_bkend); -+ atomic_sub(free_pages_nr, &session->mali_mem_allocated_pages); -+ break; ++ if (katom->event_code == BASE_JD_EVENT_DONE) { ++ dev_dbg(kbdev->dev, "Previous job succeeded - not replaying\n"); + -+ case MALI_MEM_COW: -+ if (mem_bkend->flags & MALI_MEM_BACKEND_FLAG_SWAP_COWED) { -+ free_pages_nr = mali_mem_swap_release(mem_bkend, MALI_TRUE); -+ } else { -+ free_pages_nr = mali_mem_cow_release(mem_bkend, MALI_TRUE); -+ } -+ atomic_sub(free_pages_nr, &session->mali_mem_allocated_pages); -+ break; -+ case MALI_MEM_SWAP: -+ free_pages_nr = mali_mem_swap_release(mem_bkend, MALI_TRUE); -+ atomic_sub(free_pages_nr, &session->mali_mem_allocated_pages); -+ atomic_sub(free_pages_nr, &session->mali_mem_array[mem_bkend->type]); -+ break; -+ case MALI_MEM_SECURE: -+#if defined(CONFIG_DMA_SHARED_BUFFER) -+ free_pages_nr = mali_mem_secure_release(mem_bkend); -+ atomic_sub(free_pages_nr, &session->mali_mem_allocated_pages); -+#else -+ MALI_DEBUG_PRINT(1, ("DMA not supported for mali secure memory\n")); -+#endif -+ break; -+ default: -+ MALI_DEBUG_PRINT(1, ("mem type %d is not in the mali_mem_type enum.\n", mem_bkend->type)); -+ break; ++ if (katom->retry_count) ++ kbase_disjoint_state_down(kbdev); ++ ++ return false; + } + -+ /*Remove backend memory idex */ -+ mutex_lock(&mali_idr_mutex); -+ idr_remove(&mali_backend_idr, mali_alloc->backend_handle); -+ mutex_unlock(&mali_idr_mutex); -+ kfree(mem_bkend); -+out: -+ /* remove memory allocation */ -+ mali_vma_offset_remove(&session->allocation_mgr, &mali_alloc->mali_vma_node); -+ mali_mem_allocation_struct_destory(mali_alloc); -+ return free_pages_nr; -+} ++ if (kbase_ctx_flag(kctx, KCTX_DYING)) { ++ dev_dbg(kbdev->dev, "Not replaying; context is dying\n"); + -+/** -+* ref_count for allocation -+*/ -+u32 mali_allocation_unref(struct mali_mem_allocation **alloc) -+{ -+ u32 free_pages_nr = 0; -+ mali_mem_allocation *mali_alloc = *alloc; -+ *alloc = NULL; -+ if (0 == _mali_osk_atomic_dec_return(&mali_alloc->mem_alloc_refcount)) { -+ free_pages_nr = _mali_free_allocation_mem(mali_alloc); ++ if (katom->retry_count) ++ kbase_disjoint_state_down(kbdev); ++ ++ return false; + } -+ return free_pages_nr; -+} + -+void mali_allocation_ref(struct mali_mem_allocation *alloc) -+{ -+ _mali_osk_atomic_inc(&alloc->mem_alloc_refcount); -+} ++ /* Check job exception type and source before replaying. */ ++ if (!kbase_replay_fault_check(katom)) { ++ dev_dbg(kbdev->dev, ++ "Replay cancelled on event %x\n", katom->event_code); ++ /* katom->event_code is already set to the failure code of the ++ * previous job. ++ */ ++ return false; ++ } + -+void mali_free_session_allocations(struct mali_session_data *session) -+{ -+ struct mali_mem_allocation *entry, *next; ++ dev_warn(kbdev->dev, "Replaying jobs retry=%d\n", ++ katom->retry_count); + -+ MALI_DEBUG_PRINT(4, (" mali_free_session_allocations! \n")); ++ katom->retry_count++; + -+ list_for_each_entry_safe(entry, next, &session->allocation_mgr.head, list) { -+ mali_allocation_unref(&entry); ++ if (katom->retry_count > BASEP_JD_REPLAY_LIMIT) { ++ dev_err(kbdev->dev, "Replay exceeded limit - failing jobs\n"); ++ ++ kbase_disjoint_state_down(kbdev); ++ ++ /* katom->event_code is already set to the failure code of the ++ previous job */ ++ return false; + } ++ ++ /* only enter the disjoint state once for the whole time while the replay is ongoing */ ++ if (katom->retry_count == 1) ++ kbase_disjoint_state_up(kbdev); ++ ++ INIT_WORK(&katom->work, kbase_replay_process_worker); ++ queue_work(kctx->event_workq, &katom->work); ++ ++ return true; +} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h -new file mode 100755 -index 000000000000..33ac99509740 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h -@@ -0,0 +1,20 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef __MALI_MEMORY_UTIL_H__ -+#define __MALI_MEMORY_UTIL_H__ -+ -+u32 mali_allocation_unref(struct mali_mem_allocation **alloc); -+ -+void mali_allocation_ref(struct mali_mem_allocation *alloc); -+ -+void mali_free_session_allocations(struct mali_session_data *session); -+ -+#endif -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c -new file mode 100755 -index 000000000000..0b31e3a23432 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c -@@ -0,0 +1,127 @@ -+/* -+ * Copyright (C) 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "mali_osk.h" -+#include "mali_osk_mali.h" -+#include "mali_kernel_linux.h" -+#include "mali_scheduler.h" -+#include "mali_memory_os_alloc.h" -+#include "mali_memory_manager.h" -+#include "mali_memory_virtual.h" -+ -+ -+/** -+*internal helper to link node into the rb-tree -+*/ -+static inline void _mali_vma_offset_add_rb(struct mali_allocation_manager *mgr, -+ struct mali_vma_node *node) -+{ -+ struct rb_node **iter = &mgr->allocation_mgr_rb.rb_node; -+ struct rb_node *parent = NULL; -+ struct mali_vma_node *iter_node; -+ -+ while (likely(*iter)) { -+ parent = *iter; -+ iter_node = rb_entry(*iter, struct mali_vma_node, vm_rb); -+ -+ if (node->vm_node.start < iter_node->vm_node.start) -+ iter = &(*iter)->rb_left; -+ else if (node->vm_node.start > iter_node->vm_node.start) -+ iter = &(*iter)->rb_right; -+ else -+ MALI_DEBUG_ASSERT(0); -+ } -+ -+ rb_link_node(&node->vm_rb, parent, iter); -+ rb_insert_color(&node->vm_rb, &mgr->allocation_mgr_rb); -+} -+ -+/** -+ * mali_vma_offset_add() - Add offset node to RB Tree -+ */ -+int mali_vma_offset_add(struct mali_allocation_manager *mgr, -+ struct mali_vma_node *node) -+{ -+ int ret = 0; -+ write_lock(&mgr->vm_lock); -+ -+ if (node->vm_node.allocated) { -+ goto out; -+ } -+ -+ _mali_vma_offset_add_rb(mgr, node); -+ /* set to allocated */ -+ node->vm_node.allocated = 1; -+ -+out: -+ write_unlock(&mgr->vm_lock); -+ return ret; -+} -+ -+/** -+ * mali_vma_offset_remove() - Remove offset node from RB tree -+ */ -+void mali_vma_offset_remove(struct mali_allocation_manager *mgr, -+ struct mali_vma_node *node) -+{ -+ write_lock(&mgr->vm_lock); -+ -+ if (node->vm_node.allocated) { -+ rb_erase(&node->vm_rb, &mgr->allocation_mgr_rb); -+ memset(&node->vm_node, 0, sizeof(node->vm_node)); -+ } -+ write_unlock(&mgr->vm_lock); -+} -+ -+/** -+* mali_vma_offset_search - Search the node in RB tree -+*/ -+struct mali_vma_node *mali_vma_offset_search(struct mali_allocation_manager *mgr, -+ unsigned long start, unsigned long pages) -+{ -+ struct mali_vma_node *node, *best; -+ struct rb_node *iter; -+ unsigned long offset; -+ read_lock(&mgr->vm_lock); -+ -+ iter = mgr->allocation_mgr_rb.rb_node; -+ best = NULL; -+ -+ while (likely(iter)) { -+ node = rb_entry(iter, struct mali_vma_node, vm_rb); -+ offset = node->vm_node.start; -+ if (start >= offset) { -+ iter = iter->rb_right; -+ best = node; -+ if (start == offset) -+ break; -+ } else { -+ iter = iter->rb_left; -+ } -+ } -+ -+ if (best) { -+ offset = best->vm_node.start + best->vm_node.size; -+ if (offset <= start + pages) -+ best = NULL; -+ } -+ read_unlock(&mgr->vm_lock); -+ -+ return best; -+} -+ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h -new file mode 100755 -index 000000000000..fd03ed9f2bbb ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h -@@ -0,0 +1,35 @@ -+/* -+ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#ifndef __MALI_GPU_VMEM_H__ -+#define __MALI_GPU_VMEM_H__ -+ -+#include "mali_osk.h" -+#include "mali_session.h" -+#include -+#include -+#include -+#include -+#include -+#include "mali_memory_types.h" -+#include "mali_memory_os_alloc.h" -+#include "mali_memory_manager.h" -+ -+ -+ -+int mali_vma_offset_add(struct mali_allocation_manager *mgr, -+ struct mali_vma_node *node); -+ -+void mali_vma_offset_remove(struct mali_allocation_manager *mgr, -+ struct mali_vma_node *node); -+ -+struct mali_vma_node *mali_vma_offset_search(struct mali_allocation_manager *mgr, -+ unsigned long start, unsigned long pages); -+ -+#endif -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c +diff --git a/drivers/gpu/arm/midgard/mali_kbase_smc.c b/drivers/gpu/arm/midgard/mali_kbase_smc.c new file mode 100755 -index 000000000000..5bc0e52ebe23 +index 000000000..6c8cf73ae --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c -@@ -0,0 +1,59 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_smc.c +@@ -0,0 +1,86 @@ +/* -+ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+/** -+ * @file mali_osk_atomics.c -+ * Implementation of the OS abstraction layer for the kernel device driver -+ */ + -+#include "mali_osk.h" -+#include -+#include "mali_kernel_common.h" + -+void _mali_osk_atomic_dec(_mali_osk_atomic_t *atom) -+{ -+ atomic_dec((atomic_t *)&atom->u.val); -+} ++#ifdef CONFIG_ARM64 + -+u32 _mali_osk_atomic_dec_return(_mali_osk_atomic_t *atom) -+{ -+ return atomic_dec_return((atomic_t *)&atom->u.val); -+} ++#include ++#include + -+void _mali_osk_atomic_inc(_mali_osk_atomic_t *atom) -+{ -+ atomic_inc((atomic_t *)&atom->u.val); -+} ++#include + -+u32 _mali_osk_atomic_inc_return(_mali_osk_atomic_t *atom) -+{ -+ return atomic_inc_return((atomic_t *)&atom->u.val); -+} ++/* __asmeq is not available on Kernel versions >= 4.20 */ ++#ifndef __asmeq ++/* ++ * This is used to ensure the compiler did actually allocate the register we ++ * asked it for some inline assembly sequences. Apparently we can't trust the ++ * compiler from one version to another so a bit of paranoia won't hurt. This ++ * string is meant to be concatenated with the inline asm string and will ++ * cause compilation to stop on mismatch. (for details, see gcc PR 15089) ++ */ ++#define __asmeq(x, y) ".ifnc " x "," y " ; .err ; .endif\n\t" ++#endif + -+void _mali_osk_atomic_init(_mali_osk_atomic_t *atom, u32 val) ++static noinline u64 invoke_smc_fid(u64 function_id, ++ u64 arg0, u64 arg1, u64 arg2) +{ -+ MALI_DEBUG_ASSERT_POINTER(atom); -+ atomic_set((atomic_t *)&atom->u.val, val); -+} ++ register u64 x0 asm("x0") = function_id; ++ register u64 x1 asm("x1") = arg0; ++ register u64 x2 asm("x2") = arg1; ++ register u64 x3 asm("x3") = arg2; + -+u32 _mali_osk_atomic_read(_mali_osk_atomic_t *atom) -+{ -+ return atomic_read((atomic_t *)&atom->u.val); ++ asm volatile( ++ __asmeq("%0", "x0") ++ __asmeq("%1", "x1") ++ __asmeq("%2", "x2") ++ __asmeq("%3", "x3") ++ "smc #0\n" ++ : "+r" (x0) ++ : "r" (x1), "r" (x2), "r" (x3)); ++ ++ return x0; +} + -+void _mali_osk_atomic_term(_mali_osk_atomic_t *atom) ++u64 kbase_invoke_smc_fid(u32 fid, u64 arg0, u64 arg1, u64 arg2) +{ -+ MALI_IGNORE(atom); ++ /* Is fast call (bit 31 set) */ ++ KBASE_DEBUG_ASSERT(fid & ~SMC_FAST_CALL); ++ /* bits 16-23 must be zero for fast calls */ ++ KBASE_DEBUG_ASSERT((fid & (0xFF << 16)) == 0); ++ ++ return invoke_smc_fid(fid, arg0, arg1, arg2); +} + -+u32 _mali_osk_atomic_xchg(_mali_osk_atomic_t *atom, u32 val) ++u64 kbase_invoke_smc(u32 oen, u16 function_number, bool smc64, ++ u64 arg0, u64 arg1, u64 arg2) +{ -+ return atomic_xchg((atomic_t *)&atom->u.val, val); ++ u32 fid = 0; ++ ++ /* Only the six bits allowed should be used. */ ++ KBASE_DEBUG_ASSERT((oen & ~SMC_OEN_MASK) == 0); ++ ++ fid |= SMC_FAST_CALL; /* Bit 31: Fast call */ ++ if (smc64) ++ fid |= SMC_64; /* Bit 30: 1=SMC64, 0=SMC32 */ ++ fid |= oen; /* Bit 29:24: OEN */ ++ /* Bit 23:16: Must be zero for fast calls */ ++ fid |= (function_number); /* Bit 15:0: function number */ ++ ++ return kbase_invoke_smc_fid(fid, arg0, arg1, arg2); +} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c ++ ++#endif /* CONFIG_ARM64 */ ++ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_smc.h b/drivers/gpu/arm/midgard/mali_kbase_smc.h new file mode 100755 -index 000000000000..fb9ccd2ad1e2 +index 000000000..9bff3d2e8 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c -@@ -0,0 +1,152 @@ -+/* -+ * Copyright (C) 2010, 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+/** -+ * @file mali_osk_bitmap.c -+ * Implementation of the OS abstraction layer for the kernel device driver -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include "common/mali_kernel_common.h" -+#include "mali_osk_types.h" -+#include "mali_osk.h" -+ -+u32 _mali_osk_bitmap_alloc(struct _mali_osk_bitmap *bitmap) -+{ -+ u32 obj; -+ -+ MALI_DEBUG_ASSERT_POINTER(bitmap); -+ -+ _mali_osk_spinlock_lock(bitmap->lock); -+ -+ obj = find_next_zero_bit(bitmap->table, bitmap->max, bitmap->reserve); -+ -+ if (obj < bitmap->max) { -+ set_bit(obj, bitmap->table); -+ } else { -+ obj = -1; -+ } -+ -+ if (obj != -1) -+ --bitmap->avail; -+ _mali_osk_spinlock_unlock(bitmap->lock); -+ -+ return obj; -+} -+ -+void _mali_osk_bitmap_free(struct _mali_osk_bitmap *bitmap, u32 obj) -+{ -+ MALI_DEBUG_ASSERT_POINTER(bitmap); -+ -+ _mali_osk_bitmap_free_range(bitmap, obj, 1); -+} -+ -+u32 _mali_osk_bitmap_alloc_range(struct _mali_osk_bitmap *bitmap, int cnt) -+{ -+ u32 obj; -+ -+ MALI_DEBUG_ASSERT_POINTER(bitmap); -+ -+ if (0 >= cnt) { -+ return -1; -+ } -+ -+ if (1 == cnt) { -+ return _mali_osk_bitmap_alloc(bitmap); -+ } -+ -+ _mali_osk_spinlock_lock(bitmap->lock); -+ obj = bitmap_find_next_zero_area(bitmap->table, bitmap->max, -+ bitmap->last, cnt, 0); -+ -+ if (obj >= bitmap->max) { -+ obj = bitmap_find_next_zero_area(bitmap->table, bitmap->max, -+ bitmap->reserve, cnt, 0); -+ } -+ -+ if (obj < bitmap->max) { -+ bitmap_set(bitmap->table, obj, cnt); -+ -+ bitmap->last = (obj + cnt); -+ if (bitmap->last >= bitmap->max) { -+ bitmap->last = bitmap->reserve; -+ } -+ } else { -+ obj = -1; -+ } -+ -+ if (obj != -1) { -+ bitmap->avail -= cnt; -+ } -+ -+ _mali_osk_spinlock_unlock(bitmap->lock); -+ -+ return obj; -+} -+ -+u32 _mali_osk_bitmap_avail(struct _mali_osk_bitmap *bitmap) -+{ -+ MALI_DEBUG_ASSERT_POINTER(bitmap); -+ -+ return bitmap->avail; -+} -+ -+void _mali_osk_bitmap_free_range(struct _mali_osk_bitmap *bitmap, u32 obj, int cnt) -+{ -+ MALI_DEBUG_ASSERT_POINTER(bitmap); -+ -+ _mali_osk_spinlock_lock(bitmap->lock); -+ bitmap_clear(bitmap->table, obj, cnt); -+ bitmap->last = min(bitmap->last, obj); -+ -+ bitmap->avail += cnt; -+ _mali_osk_spinlock_unlock(bitmap->lock); -+} -+ -+int _mali_osk_bitmap_init(struct _mali_osk_bitmap *bitmap, u32 num, u32 reserve) -+{ -+ MALI_DEBUG_ASSERT_POINTER(bitmap); -+ MALI_DEBUG_ASSERT(reserve <= num); -+ -+ bitmap->reserve = reserve; -+ bitmap->last = reserve; -+ bitmap->max = num; -+ bitmap->avail = num - reserve; -+ bitmap->lock = _mali_osk_spinlock_init(_MALI_OSK_LOCKFLAG_UNORDERED, _MALI_OSK_LOCK_ORDER_FIRST); -+ if (!bitmap->lock) { -+ return _MALI_OSK_ERR_NOMEM; -+ } -+ bitmap->table = kzalloc(BITS_TO_LONGS(bitmap->max) * -+ sizeof(long), GFP_KERNEL); -+ if (!bitmap->table) { -+ _mali_osk_spinlock_term(bitmap->lock); -+ return _MALI_OSK_ERR_NOMEM; -+ } -+ -+ return _MALI_OSK_ERR_OK; -+} -+ -+void _mali_osk_bitmap_term(struct _mali_osk_bitmap *bitmap) -+{ -+ MALI_DEBUG_ASSERT_POINTER(bitmap); -+ -+ if (NULL != bitmap->lock) { -+ _mali_osk_spinlock_term(bitmap->lock); -+ } -+ -+ if (NULL != bitmap->table) { -+ kfree(bitmap->table); -+ } -+} -+ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c -new file mode 100755 -index 000000000000..5c8b9ceab9ab ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c -@@ -0,0 +1,200 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_smc.h +@@ -0,0 +1,67 @@ +/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+/** -+ * @file mali_osk_irq.c -+ * Implementation of the OS abstraction layer for the kernel device driver -+ */ + -+#include /* For memory allocation */ -+#include -+#include -+#include + -+#include "mali_osk.h" -+#include "mali_kernel_common.h" + -+typedef struct _mali_osk_irq_t_struct { -+ u32 irqnum; -+ void *data; -+ _mali_osk_irq_uhandler_t uhandler; -+} mali_osk_irq_object_t; + -+typedef irqreturn_t (*irq_handler_func_t)(int, void *, struct pt_regs *); -+static irqreturn_t irq_handler_upper_half(int port_name, void *dev_id); /* , struct pt_regs *regs*/ ++#ifndef _KBASE_SMC_H_ ++#define _KBASE_SMC_H_ + -+#if defined(DEBUG) ++#ifdef CONFIG_ARM64 + -+struct test_interrupt_data { -+ _mali_osk_irq_ack_t ack_func; -+ void *probe_data; -+ mali_bool interrupt_received; -+ wait_queue_head_t wq; -+}; ++#include + -+static irqreturn_t test_interrupt_upper_half(int port_name, void *dev_id) -+{ -+ irqreturn_t ret = IRQ_NONE; -+ struct test_interrupt_data *data = (struct test_interrupt_data *)dev_id; ++#define SMC_FAST_CALL (1 << 31) ++#define SMC_64 (1 << 30) + -+ if (_MALI_OSK_ERR_OK == data->ack_func(data->probe_data)) { -+ data->interrupt_received = MALI_TRUE; -+ wake_up(&data->wq); -+ ret = IRQ_HANDLED; -+ } ++#define SMC_OEN_OFFSET 24 ++#define SMC_OEN_MASK (0x3F << SMC_OEN_OFFSET) /* 6 bits */ ++#define SMC_OEN_SIP (2 << SMC_OEN_OFFSET) ++#define SMC_OEN_STD (4 << SMC_OEN_OFFSET) + -+ return ret; -+} + -+static _mali_osk_errcode_t test_interrupt(u32 irqnum, -+ _mali_osk_irq_trigger_t trigger_func, -+ _mali_osk_irq_ack_t ack_func, -+ void *probe_data, -+ const char *description) -+{ -+ unsigned long irq_flags = 0; -+ struct test_interrupt_data data = { -+ .ack_func = ack_func, -+ .probe_data = probe_data, -+ .interrupt_received = MALI_FALSE, -+ }; ++/** ++ * kbase_invoke_smc_fid - Perform a secure monitor call ++ * @fid: The SMC function to call, see SMC Calling convention. ++ * @arg0: First argument to the SMC. ++ * @arg1: Second argument to the SMC. ++ * @arg2: Third argument to the SMC. ++ * ++ * See SMC Calling Convention for details. ++ * ++ * Return: the return value from the SMC. ++ */ ++u64 kbase_invoke_smc_fid(u32 fid, u64 arg0, u64 arg1, u64 arg2); + -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ irq_flags |= IRQF_SHARED; -+#endif /* defined(CONFIG_MALI_SHARED_INTERRUPTS) */ ++/** ++ * kbase_invoke_smc_fid - Perform a secure monitor call ++ * @oen: Owning Entity number (SIP, STD etc). ++ * @function_number: The function number within the OEN. ++ * @smc64: use SMC64 calling convention instead of SMC32. ++ * @arg0: First argument to the SMC. ++ * @arg1: Second argument to the SMC. ++ * @arg2: Third argument to the SMC. ++ * ++ * See SMC Calling Convention for details. ++ * ++ * Return: the return value from the SMC call. ++ */ ++u64 kbase_invoke_smc(u32 oen, u16 function_number, bool smc64, ++ u64 arg0, u64 arg1, u64 arg2); + -+ if (0 != request_irq(irqnum, test_interrupt_upper_half, irq_flags, description, &data)) { -+ MALI_DEBUG_PRINT(2, ("Unable to install test IRQ handler for core '%s'\n", description)); -+ return _MALI_OSK_ERR_FAULT; -+ } ++#endif /* CONFIG_ARM64 */ + -+ init_waitqueue_head(&data.wq); ++#endif /* _KBASE_SMC_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_softjobs.c b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c +new file mode 100755 +index 000000000..396953e78 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c +@@ -0,0 +1,1549 @@ ++/* ++ * ++ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ trigger_func(probe_data); -+ wait_event_timeout(data.wq, data.interrupt_received, 100); + -+ free_irq(irqnum, &data); + -+ if (data.interrupt_received) { -+ MALI_DEBUG_PRINT(3, ("%s: Interrupt test OK\n", description)); -+ return _MALI_OSK_ERR_OK; -+ } else { -+ MALI_PRINT_ERROR(("%s: Failed interrupt test on %u\n", description, irqnum)); -+ return _MALI_OSK_ERR_FAULT; -+ } -+} + -+#endif /* defined(DEBUG) */ + -+_mali_osk_irq_t *_mali_osk_irq_init(u32 irqnum, _mali_osk_irq_uhandler_t uhandler, void *int_data, _mali_osk_irq_trigger_t trigger_func, _mali_osk_irq_ack_t ack_func, void *probe_data, const char *description) -+{ -+ mali_osk_irq_object_t *irq_object; -+ unsigned long irq_flags = 0; ++#include + -+#if defined(CONFIG_MALI_SHARED_INTERRUPTS) -+ irq_flags |= IRQF_SHARED; -+#endif /* defined(CONFIG_MALI_SHARED_INTERRUPTS) */ ++#if defined(CONFIG_DMA_SHARED_BUFFER) ++#include ++#include ++#endif /* defined(CONFIG_DMA_SHARED_BUFFER) */ ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+ irq_object = kmalloc(sizeof(mali_osk_irq_object_t), GFP_KERNEL); -+ if (NULL == irq_object) { -+ return NULL; -+ } ++/* Mask to check cache alignment of data structures */ ++#define KBASE_CACHE_ALIGNMENT_MASK ((1<kctx; ++ unsigned long lflags; + -+ do { -+ unsigned long mask; ++ spin_lock_irqsave(&kctx->waiting_soft_jobs_lock, lflags); ++ list_add_tail(&katom->queue, &kctx->waiting_soft_jobs); ++ spin_unlock_irqrestore(&kctx->waiting_soft_jobs_lock, lflags); ++} + -+ mask = probe_irq_on(); -+ trigger_func(probe_data); ++void kbasep_remove_waiting_soft_job(struct kbase_jd_atom *katom) ++{ ++ struct kbase_context *kctx = katom->kctx; ++ unsigned long lflags; + -+ _mali_osk_time_ubusydelay(5); ++ spin_lock_irqsave(&kctx->waiting_soft_jobs_lock, lflags); ++ list_del(&katom->queue); ++ spin_unlock_irqrestore(&kctx->waiting_soft_jobs_lock, lflags); ++} + -+ irq = probe_irq_off(mask); -+ err = ack_func(probe_data); -+ } while (irq < 0 && (err == _MALI_OSK_ERR_OK) && probe_count--); ++static void kbasep_add_waiting_with_timeout(struct kbase_jd_atom *katom) ++{ ++ struct kbase_context *kctx = katom->kctx; + -+ if (irq < 0 || (_MALI_OSK_ERR_OK != err)) irqnum = -1; -+ else irqnum = irq; -+ } else irqnum = -1; /* no probe functions, fault */ ++ /* Record the start time of this atom so we could cancel it at ++ * the right time. ++ */ ++ katom->start_timestamp = ktime_get(); + -+ if (-1 != irqnum) { -+ /* found an irq */ -+ MALI_DEBUG_PRINT(2, ("Found irq %d\n", irqnum)); -+ } else { -+ MALI_DEBUG_PRINT(2, ("Probe for irq failed\n")); -+ } ++ /* Add the atom to the waiting list before the timer is ++ * (re)started to make sure that it gets processed. ++ */ ++ kbasep_add_waiting_soft_job(katom); ++ ++ /* Schedule timeout of this atom after a period if it is not active */ ++ if (!timer_pending(&kctx->soft_job_timeout)) { ++ int timeout_ms = atomic_read( ++ &kctx->kbdev->js_data.soft_job_timeout_ms); ++ mod_timer(&kctx->soft_job_timeout, ++ jiffies + msecs_to_jiffies(timeout_ms)); + } ++} + -+ irq_object->irqnum = irqnum; -+ irq_object->uhandler = uhandler; -+ irq_object->data = int_data; ++static int kbasep_read_soft_event_status( ++ struct kbase_context *kctx, u64 evt, unsigned char *status) ++{ ++ unsigned char *mapped_evt; ++ struct kbase_vmap_struct map; + -+ if (-1 == irqnum) { -+ MALI_DEBUG_PRINT(2, ("No IRQ for core '%s' found during probe\n", description)); -+ kfree(irq_object); -+ return NULL; -+ } ++ mapped_evt = kbase_vmap(kctx, evt, sizeof(*mapped_evt), &map); ++ if (!mapped_evt) ++ return -EFAULT; + -+#if defined(DEBUG) -+ /* Verify that the configured interrupt settings are working */ -+ if (_MALI_OSK_ERR_OK != test_interrupt(irqnum, trigger_func, ack_func, probe_data, description)) { -+ MALI_DEBUG_PRINT(2, ("Test of IRQ(%d) handler for core '%s' failed\n", irqnum, description)); -+ kfree(irq_object); -+ return NULL; -+ } -+#endif ++ *status = *mapped_evt; + -+ if (0 != request_irq(irqnum, irq_handler_upper_half, irq_flags, description, irq_object)) { -+ MALI_DEBUG_PRINT(2, ("Unable to install IRQ handler for core '%s'\n", description)); -+ kfree(irq_object); -+ return NULL; -+ } ++ kbase_vunmap(kctx, &map); + -+ return irq_object; ++ return 0; +} + -+void _mali_osk_irq_term(_mali_osk_irq_t *irq) ++static int kbasep_write_soft_event_status( ++ struct kbase_context *kctx, u64 evt, unsigned char new_status) +{ -+ mali_osk_irq_object_t *irq_object = (mali_osk_irq_object_t *)irq; -+ free_irq(irq_object->irqnum, irq_object); -+ kfree(irq_object); -+} ++ unsigned char *mapped_evt; ++ struct kbase_vmap_struct map; + ++ if ((new_status != BASE_JD_SOFT_EVENT_SET) && ++ (new_status != BASE_JD_SOFT_EVENT_RESET)) ++ return -EINVAL; + -+/** This function is called directly in interrupt context from the OS just after -+ * the CPU get the hw-irq from mali, or other devices on the same IRQ-channel. -+ * It is registered one of these function for each mali core. When an interrupt -+ * arrives this function will be called equal times as registered mali cores. -+ * That means that we only check one mali core in one function call, and the -+ * core we check for each turn is given by the \a dev_id variable. -+ * If we detect an pending interrupt on the given core, we mask the interrupt -+ * out by settging the core's IRQ_MASK register to zero. -+ * Then we schedule the mali_core_irq_handler_bottom_half to run as high priority -+ * work queue job. -+ */ -+static irqreturn_t irq_handler_upper_half(int port_name, void *dev_id) /* , struct pt_regs *regs*/ ++ mapped_evt = kbase_vmap(kctx, evt, sizeof(*mapped_evt), &map); ++ if (!mapped_evt) ++ return -EFAULT; ++ ++ *mapped_evt = new_status; ++ ++ kbase_vunmap(kctx, &map); ++ ++ return 0; ++} ++ ++static int kbase_dump_cpu_gpu_time(struct kbase_jd_atom *katom) +{ -+ irqreturn_t ret = IRQ_NONE; -+ mali_osk_irq_object_t *irq_object = (mali_osk_irq_object_t *)dev_id; ++ struct kbase_vmap_struct map; ++ void *user_result; ++ struct timespec64 ts; ++ struct base_dump_cpu_gpu_counters data; ++ u64 system_time; ++ u64 cycle_counter; ++ u64 jc = katom->jc; ++ struct kbase_context *kctx = katom->kctx; ++ int pm_active_err; + -+ if (_MALI_OSK_ERR_OK == irq_object->uhandler(irq_object->data)) { -+ ret = IRQ_HANDLED; ++ memset(&data, 0, sizeof(data)); ++ ++ /* Take the PM active reference as late as possible - otherwise, it could ++ * delay suspend until we process the atom (which may be at the end of a ++ * long chain of dependencies */ ++ pm_active_err = kbase_pm_context_active_handle_suspend(kctx->kbdev, KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE); ++ if (pm_active_err) { ++ struct kbasep_js_device_data *js_devdata = &kctx->kbdev->js_data; ++ ++ /* We're suspended - queue this on the list of suspended jobs ++ * Use dep_item[1], because dep_item[0] was previously in use ++ * for 'waiting_soft_jobs'. ++ */ ++ mutex_lock(&js_devdata->runpool_mutex); ++ list_add_tail(&katom->dep_item[1], &js_devdata->suspended_soft_jobs_list); ++ mutex_unlock(&js_devdata->runpool_mutex); ++ ++ /* Also adding this to the list of waiting soft job */ ++ kbasep_add_waiting_soft_job(katom); ++ ++ return pm_active_err; + } + -+ return ret; -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c -new file mode 100755 -index 000000000000..ed5f0b0da7cb ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c -@@ -0,0 +1,287 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ kbase_backend_get_gpu_time(kctx->kbdev, &cycle_counter, &system_time, ++ &ts); + -+/** -+ * @file mali_osk_locks.c -+ * Implemenation of the OS abstraction layer for the kernel device driver -+ */ ++ kbase_pm_context_idle(kctx->kbdev); + -+#include "mali_osk_locks.h" -+#include "mali_kernel_common.h" -+#include "mali_osk.h" ++ data.sec = ts.tv_sec; ++ data.usec = ts.tv_nsec / 1000; ++ data.system_time = system_time; ++ data.cycle_counter = cycle_counter; + ++ /* Assume this atom will be cancelled until we know otherwise */ ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; + -+#ifdef DEBUG -+#ifdef LOCK_ORDER_CHECKING -+static DEFINE_SPINLOCK(lock_tracking_lock); -+static mali_bool add_lock_to_log_and_check(struct _mali_osk_lock_debug_s *lock, uint32_t tid); -+static void remove_lock_from_log(struct _mali_osk_lock_debug_s *lock, uint32_t tid); -+static const char *const lock_order_to_string(_mali_osk_lock_order_t order); -+#endif /* LOCK_ORDER_CHECKING */ ++ /* GPU_WR access is checked on the range for returning the result to ++ * userspace for the following reasons: ++ * - security, this is currently how imported user bufs are checked. ++ * - userspace ddk guaranteed to assume region was mapped as GPU_WR */ ++ user_result = kbase_vmap_prot(kctx, jc, sizeof(data), KBASE_REG_GPU_WR, &map); ++ if (!user_result) ++ return 0; + -+void _mali_osk_locks_debug_init(struct _mali_osk_lock_debug_s *checker, _mali_osk_lock_flags_t flags, _mali_osk_lock_order_t order) -+{ -+ checker->orig_flags = flags; -+ checker->owner = 0; ++ memcpy(user_result, &data, sizeof(data)); + -+#ifdef LOCK_ORDER_CHECKING -+ checker->order = order; -+ checker->next = NULL; -+#endif -+} ++ kbase_vunmap(kctx, &map); + -+void _mali_osk_locks_debug_add(struct _mali_osk_lock_debug_s *checker) -+{ -+ checker->owner = _mali_osk_get_tid(); ++ /* Atom was fine - mark it as done */ ++ katom->event_code = BASE_JD_EVENT_DONE; + -+#ifdef LOCK_ORDER_CHECKING -+ if (!(checker->orig_flags & _MALI_OSK_LOCKFLAG_UNORDERED)) { -+ if (!add_lock_to_log_and_check(checker, _mali_osk_get_tid())) { -+ printk(KERN_ERR "%d: ERROR lock %p taken while holding a lock of a higher order.\n", -+ _mali_osk_get_tid(), checker); -+ dump_stack(); -+ } -+ } -+#endif ++ return 0; +} + -+void _mali_osk_locks_debug_remove(struct _mali_osk_lock_debug_s *checker) ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++/* Called by the explicit fence mechanism when a fence wait has completed */ ++void kbase_soft_event_wait_callback(struct kbase_jd_atom *katom) +{ ++ struct kbase_context *kctx = katom->kctx; + -+#ifdef LOCK_ORDER_CHECKING -+ if (!(checker->orig_flags & _MALI_OSK_LOCKFLAG_UNORDERED)) { -+ remove_lock_from_log(checker, _mali_osk_get_tid()); -+ } -+#endif -+ checker->owner = 0; ++ mutex_lock(&kctx->jctx.lock); ++ kbasep_remove_waiting_soft_job(katom); ++ kbase_finish_soft_job(katom); ++ if (jd_done_nolock(katom, NULL)) ++ kbase_js_sched_all(kctx->kbdev); ++ mutex_unlock(&kctx->jctx.lock); +} ++#endif + ++static void kbasep_soft_event_complete_job(struct work_struct *work) ++{ ++ struct kbase_jd_atom *katom = container_of(work, struct kbase_jd_atom, ++ work); ++ struct kbase_context *kctx = katom->kctx; ++ int resched; + -+#ifdef LOCK_ORDER_CHECKING -+/* Lock order checking -+ * ------------------- -+ * -+ * To assure that lock ordering scheme defined by _mali_osk_lock_order_t is strictly adhered to, the -+ * following function will, together with a linked list and some extra members in _mali_osk_lock_debug_s, -+ * make sure that a lock that is taken has a higher order than the current highest-order lock a -+ * thread holds. -+ * -+ * This is done in the following manner: -+ * - A linked list keeps track of locks held by a thread. -+ * - A `next' pointer is added to each lock. This is used to chain the locks together. -+ * - When taking a lock, the `add_lock_to_log_and_check' makes sure that taking -+ * the given lock is legal. It will follow the linked list to find the last -+ * lock taken by this thread. If the last lock's order was lower than the -+ * lock that is to be taken, it appends the new lock to the list and returns -+ * true, if not, it return false. This return value is assert()'ed on in -+ * _mali_osk_lock_wait(). -+ */ ++ mutex_lock(&kctx->jctx.lock); ++ resched = jd_done_nolock(katom, NULL); ++ mutex_unlock(&kctx->jctx.lock); + -+static struct _mali_osk_lock_debug_s *lock_lookup_list; ++ if (resched) ++ kbase_js_sched_all(kctx->kbdev); ++} + -+static void dump_lock_tracking_list(void) ++void kbasep_complete_triggered_soft_events(struct kbase_context *kctx, u64 evt) +{ -+ struct _mali_osk_lock_debug_s *l; -+ u32 n = 1; ++ int cancel_timer = 1; ++ struct list_head *entry, *tmp; ++ unsigned long lflags; + -+ /* print list for debugging purposes */ -+ l = lock_lookup_list; ++ spin_lock_irqsave(&kctx->waiting_soft_jobs_lock, lflags); ++ list_for_each_safe(entry, tmp, &kctx->waiting_soft_jobs) { ++ struct kbase_jd_atom *katom = list_entry( ++ entry, struct kbase_jd_atom, queue); + -+ while (NULL != l) { -+ printk(" [lock: %p, tid_owner: %d, order: %d] ->", l, l->owner, l->order); -+ l = l->next; -+ MALI_DEBUG_ASSERT(n++ < 100); ++ switch (katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { ++ case BASE_JD_REQ_SOFT_EVENT_WAIT: ++ if (katom->jc == evt) { ++ list_del(&katom->queue); ++ ++ katom->event_code = BASE_JD_EVENT_DONE; ++ INIT_WORK(&katom->work, ++ kbasep_soft_event_complete_job); ++ queue_work(kctx->jctx.job_done_wq, ++ &katom->work); ++ } else { ++ /* There are still other waiting jobs, we cannot ++ * cancel the timer yet. ++ */ ++ cancel_timer = 0; ++ } ++ break; ++#ifdef CONFIG_MALI_FENCE_DEBUG ++ case BASE_JD_REQ_SOFT_FENCE_WAIT: ++ /* Keep the timer running if fence debug is enabled and ++ * there are waiting fence jobs. ++ */ ++ cancel_timer = 0; ++ break; ++#endif ++ } + } -+ printk(" NULL\n"); ++ ++ if (cancel_timer) ++ del_timer(&kctx->soft_job_timeout); ++ spin_unlock_irqrestore(&kctx->waiting_soft_jobs_lock, lflags); +} + -+static int tracking_list_length(void) ++#ifdef CONFIG_MALI_FENCE_DEBUG ++static void kbase_fence_debug_check_atom(struct kbase_jd_atom *katom) +{ -+ struct _mali_osk_lock_debug_s *l; -+ u32 n = 0; -+ l = lock_lookup_list; ++ struct kbase_context *kctx = katom->kctx; ++ struct device *dev = kctx->kbdev->dev; ++ int i; + -+ while (NULL != l) { -+ l = l->next; -+ n++; -+ MALI_DEBUG_ASSERT(n < 100); -+ } -+ return n; -+} ++ for (i = 0; i < 2; i++) { ++ struct kbase_jd_atom *dep; + -+static mali_bool add_lock_to_log_and_check(struct _mali_osk_lock_debug_s *lock, uint32_t tid) -+{ -+ mali_bool ret = MALI_FALSE; -+ _mali_osk_lock_order_t highest_order_for_tid = _MALI_OSK_LOCK_ORDER_FIRST; -+ struct _mali_osk_lock_debug_s *highest_order_lock = (struct _mali_osk_lock_debug_s *)0xbeefbabe; -+ struct _mali_osk_lock_debug_s *l; -+ unsigned long local_lock_flag; -+ u32 len; ++ list_for_each_entry(dep, &katom->dep_head[i], dep_item[i]) { ++ if (dep->status == KBASE_JD_ATOM_STATE_UNUSED || ++ dep->status == KBASE_JD_ATOM_STATE_COMPLETED) ++ continue; + -+ spin_lock_irqsave(&lock_tracking_lock, local_lock_flag); -+ len = tracking_list_length(); ++ if ((dep->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) ++ == BASE_JD_REQ_SOFT_FENCE_TRIGGER) { ++ /* Found blocked trigger fence. */ ++ struct kbase_sync_fence_info info; + -+ l = lock_lookup_list; -+ if (NULL == l) { /* This is the first lock taken by this thread -- record and return true */ -+ lock_lookup_list = lock; -+ spin_unlock_irqrestore(&lock_tracking_lock, local_lock_flag); -+ return MALI_TRUE; -+ } else { -+ /* Traverse the locks taken and find the lock of the highest order. -+ * Since several threads may hold locks, each lock's owner must be -+ * checked so that locks not owned by this thread can be ignored. */ -+ for (;;) { -+ MALI_DEBUG_ASSERT_POINTER(l); -+ if (tid == l->owner && l->order >= highest_order_for_tid) { -+ highest_order_for_tid = l->order; -+ highest_order_lock = l; ++ if (!kbase_sync_fence_in_info_get(dep, &info)) { ++ dev_warn(dev, ++ "\tVictim trigger atom %d fence [%p] %s: %s\n", ++ kbase_jd_atom_id(kctx, dep), ++ info.fence, ++ info.name, ++ kbase_sync_status_string(info.status)); ++ } + } + -+ if (NULL != l->next) { -+ l = l->next; -+ } else { -+ break; -+ } ++ kbase_fence_debug_check_atom(dep); + } -+ -+ l->next = lock; -+ l->next = NULL; + } ++} + -+ /* We have now found the highest order lock currently held by this thread and can see if it is -+ * legal to take the requested lock. */ -+ ret = highest_order_for_tid < lock->order; ++static void kbase_fence_debug_wait_timeout(struct kbase_jd_atom *katom) ++{ ++ struct kbase_context *kctx = katom->kctx; ++ struct device *dev = katom->kctx->kbdev->dev; ++ int timeout_ms = atomic_read(&kctx->kbdev->js_data.soft_job_timeout_ms); ++ unsigned long lflags; ++ struct kbase_sync_fence_info info; + -+ if (!ret) { -+ printk(KERN_ERR "Took lock of order %d (%s) while holding lock of order %d (%s)\n", -+ lock->order, lock_order_to_string(lock->order), -+ highest_order_for_tid, lock_order_to_string(highest_order_for_tid)); -+ dump_lock_tracking_list(); -+ } ++ spin_lock_irqsave(&kctx->waiting_soft_jobs_lock, lflags); + -+ if (len + 1 != tracking_list_length()) { -+ printk(KERN_ERR "************ lock: %p\n", lock); -+ printk(KERN_ERR "************ before: %d *** after: %d ****\n", len, tracking_list_length()); -+ dump_lock_tracking_list(); -+ MALI_DEBUG_ASSERT_POINTER(NULL); ++ if (kbase_sync_fence_in_info_get(katom, &info)) { ++ /* Fence must have signaled just after timeout. */ ++ spin_unlock_irqrestore(&kctx->waiting_soft_jobs_lock, lflags); ++ return; + } + -+ spin_unlock_irqrestore(&lock_tracking_lock, local_lock_flag); -+ return ret; ++ dev_warn(dev, "ctx %d_%d: Atom %d still waiting for fence [%p] after %dms\n", ++ kctx->tgid, kctx->id, ++ kbase_jd_atom_id(kctx, katom), ++ info.fence, timeout_ms); ++ dev_warn(dev, "\tGuilty fence [%p] %s: %s\n", ++ info.fence, info.name, ++ kbase_sync_status_string(info.status)); ++ ++ /* Search for blocked trigger atoms */ ++ kbase_fence_debug_check_atom(katom); ++ ++ spin_unlock_irqrestore(&kctx->waiting_soft_jobs_lock, lflags); ++ ++ kbase_sync_fence_in_dump(katom); +} + -+static void remove_lock_from_log(struct _mali_osk_lock_debug_s *lock, uint32_t tid) ++struct kbase_fence_debug_work { ++ struct kbase_jd_atom *katom; ++ struct work_struct work; ++}; ++ ++static void kbase_fence_debug_wait_timeout_worker(struct work_struct *work) +{ -+ struct _mali_osk_lock_debug_s *curr; -+ struct _mali_osk_lock_debug_s *prev = NULL; -+ unsigned long local_lock_flag; -+ u32 len; -+ u32 n = 0; ++ struct kbase_fence_debug_work *w = container_of(work, ++ struct kbase_fence_debug_work, work); ++ struct kbase_jd_atom *katom = w->katom; ++ struct kbase_context *kctx = katom->kctx; + -+ spin_lock_irqsave(&lock_tracking_lock, local_lock_flag); -+ len = tracking_list_length(); -+ curr = lock_lookup_list; ++ mutex_lock(&kctx->jctx.lock); ++ kbase_fence_debug_wait_timeout(katom); ++ mutex_unlock(&kctx->jctx.lock); + -+ if (NULL == curr) { -+ printk(KERN_ERR "Error: Lock tracking list was empty on call to remove_lock_from_log\n"); -+ dump_lock_tracking_list(); ++ kfree(w); ++} ++ ++static void kbase_fence_debug_timeout(struct kbase_jd_atom *katom) ++{ ++ struct kbase_fence_debug_work *work; ++ struct kbase_context *kctx = katom->kctx; ++ ++ /* Enqueue fence debug worker. Use job_done_wq to get ++ * debug print ordered with job completion. ++ */ ++ work = kzalloc(sizeof(struct kbase_fence_debug_work), GFP_ATOMIC); ++ /* Ignore allocation failure. */ ++ if (work) { ++ work->katom = katom; ++ INIT_WORK(&work->work, kbase_fence_debug_wait_timeout_worker); ++ queue_work(kctx->jctx.job_done_wq, &work->work); + } ++} ++#endif /* CONFIG_MALI_FENCE_DEBUG */ + -+ MALI_DEBUG_ASSERT_POINTER(curr); ++void kbasep_soft_job_timeout_worker(struct timer_list *t) ++{ ++ struct kbase_context *kctx = from_timer(kctx, t, soft_job_timeout); ++ u32 timeout_ms = (u32)atomic_read( ++ &kctx->kbdev->js_data.soft_job_timeout_ms); ++ struct timer_list *timer = &kctx->soft_job_timeout; ++ ktime_t cur_time = ktime_get(); ++ bool restarting = false; ++ unsigned long lflags; ++ struct list_head *entry, *tmp; ++ ++ spin_lock_irqsave(&kctx->waiting_soft_jobs_lock, lflags); ++ list_for_each_safe(entry, tmp, &kctx->waiting_soft_jobs) { ++ struct kbase_jd_atom *katom = list_entry(entry, ++ struct kbase_jd_atom, queue); ++ s64 elapsed_time = ktime_to_ms(ktime_sub(cur_time, ++ katom->start_timestamp)); + ++ if (elapsed_time < (s64)timeout_ms) { ++ restarting = true; ++ continue; ++ } + -+ while (lock != curr) { -+ prev = curr; ++ switch (katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { ++ case BASE_JD_REQ_SOFT_EVENT_WAIT: ++ /* Take it out of the list to ensure that it ++ * will be cancelled in all cases ++ */ ++ list_del(&katom->queue); + -+ MALI_DEBUG_ASSERT_POINTER(curr); -+ curr = curr->next; -+ MALI_DEBUG_ASSERT(n++ < 100); ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ INIT_WORK(&katom->work, kbasep_soft_event_complete_job); ++ queue_work(kctx->jctx.job_done_wq, &katom->work); ++ break; ++#ifdef CONFIG_MALI_FENCE_DEBUG ++ case BASE_JD_REQ_SOFT_FENCE_WAIT: ++ kbase_fence_debug_timeout(katom); ++ break; ++#endif ++ } + } + -+ if (NULL == prev) { -+ lock_lookup_list = curr->next; -+ } else { -+ MALI_DEBUG_ASSERT_POINTER(curr); -+ MALI_DEBUG_ASSERT_POINTER(prev); -+ prev->next = curr->next; -+ } ++ if (restarting) ++ mod_timer(timer, jiffies + msecs_to_jiffies(timeout_ms)); ++ spin_unlock_irqrestore(&kctx->waiting_soft_jobs_lock, lflags); ++} + -+ lock->next = NULL; ++static int kbasep_soft_event_wait(struct kbase_jd_atom *katom) ++{ ++ struct kbase_context *kctx = katom->kctx; ++ unsigned char status; + -+ if (len - 1 != tracking_list_length()) { -+ printk(KERN_ERR "************ lock: %p\n", lock); -+ printk(KERN_ERR "************ before: %d *** after: %d ****\n", len, tracking_list_length()); -+ dump_lock_tracking_list(); -+ MALI_DEBUG_ASSERT_POINTER(NULL); ++ /* The status of this soft-job is stored in jc */ ++ if (kbasep_read_soft_event_status(kctx, katom->jc, &status)) { ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ return 0; + } + -+ spin_unlock_irqrestore(&lock_tracking_lock, local_lock_flag); ++ if (status == BASE_JD_SOFT_EVENT_SET) ++ return 0; /* Event already set, nothing to do */ ++ ++ kbasep_add_waiting_with_timeout(katom); ++ ++ return 1; +} + -+static const char *const lock_order_to_string(_mali_osk_lock_order_t order) ++static void kbasep_soft_event_update_locked(struct kbase_jd_atom *katom, ++ unsigned char new_status) +{ -+ switch (order) { -+ case _MALI_OSK_LOCK_ORDER_SESSIONS: -+ return "_MALI_OSK_LOCK_ORDER_SESSIONS"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_MEM_SESSION: -+ return "_MALI_OSK_LOCK_ORDER_MEM_SESSION"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_MEM_INFO: -+ return "_MALI_OSK_LOCK_ORDER_MEM_INFO"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_MEM_PT_CACHE: -+ return "_MALI_OSK_LOCK_ORDER_MEM_PT_CACHE"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_DESCRIPTOR_MAP: -+ return "_MALI_OSK_LOCK_ORDER_DESCRIPTOR_MAP"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_PM_EXECUTION: -+ return "_MALI_OSK_LOCK_ORDER_PM_EXECUTION"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_EXECUTOR: -+ return "_MALI_OSK_LOCK_ORDER_EXECUTOR"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_TIMELINE_SYSTEM: -+ return "_MALI_OSK_LOCK_ORDER_TIMELINE_SYSTEM"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_SCHEDULER: -+ return "_MALI_OSK_LOCK_ORDER_SCHEDULER"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_SCHEDULER_DEFERRED: -+ return "_MALI_OSK_LOCK_ORDER_SCHEDULER_DEFERRED"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_DMA_COMMAND: -+ return "_MALI_OSK_LOCK_ORDER_DMA_COMMAND"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_PROFILING: -+ return "_MALI_OSK_LOCK_ORDER_PROFILING"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_L2: -+ return "_MALI_OSK_LOCK_ORDER_L2"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_L2_COMMAND: -+ return "_MALI_OSK_LOCK_ORDER_L2_COMMAND"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_UTILIZATION: -+ return "_MALI_OSK_LOCK_ORDER_UTILIZATION"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_SESSION_PENDING_JOBS: -+ return "_MALI_OSK_LOCK_ORDER_SESSION_PENDING_JOBS"; -+ break; -+ case _MALI_OSK_LOCK_ORDER_PM_STATE: -+ return "_MALI_OSK_LOCK_ORDER_PM_STATE"; -+ break; -+ default: -+ return ""; ++ /* Complete jobs waiting on the same event */ ++ struct kbase_context *kctx = katom->kctx; ++ ++ if (kbasep_write_soft_event_status(kctx, katom->jc, new_status) != 0) { ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ return; + } ++ ++ if (new_status == BASE_JD_SOFT_EVENT_SET) ++ kbasep_complete_triggered_soft_events(kctx, katom->jc); +} -+#endif /* LOCK_ORDER_CHECKING */ -+#endif /* DEBUG */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h -new file mode 100755 -index 000000000000..6fd5af95285b ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h -@@ -0,0 +1,326 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ + +/** -+ * @file mali_osk_locks.h -+ * Defines OS abstraction of lock and mutex ++ * kbase_soft_event_update() - Update soft event state ++ * @kctx: Pointer to context ++ * @event: Event to update ++ * @new_status: New status value of event ++ * ++ * Update the event, and wake up any atoms waiting for the event. ++ * ++ * Return: 0 on success, a negative error code on failure. + */ -+#ifndef _MALI_OSK_LOCKS_H -+#define _MALI_OSK_LOCKS_H -+ -+#include -+#include -+#include -+ -+#include -+ -+#include "mali_osk_types.h" ++int kbase_soft_event_update(struct kbase_context *kctx, ++ u64 event, ++ unsigned char new_status) ++{ ++ int err = 0; + -+#ifdef _cplusplus -+extern "C" { -+#endif ++ mutex_lock(&kctx->jctx.lock); + -+ /* When DEBUG is enabled, this struct will be used to track owner, mode and order checking */ -+#ifdef DEBUG -+ struct _mali_osk_lock_debug_s { -+ u32 owner; -+ _mali_osk_lock_flags_t orig_flags; -+ _mali_osk_lock_order_t order; -+ struct _mali_osk_lock_debug_s *next; -+ }; -+#endif ++ if (kbasep_write_soft_event_status(kctx, event, new_status)) { ++ err = -ENOENT; ++ goto out; ++ } + -+ /* Anstraction of spinlock_t */ -+ struct _mali_osk_spinlock_s { -+#ifdef DEBUG -+ struct _mali_osk_lock_debug_s checker; -+#endif -+ spinlock_t spinlock; -+ }; ++ if (new_status == BASE_JD_SOFT_EVENT_SET) ++ kbasep_complete_triggered_soft_events(kctx, event); + -+ /* Abstration of spinlock_t and lock flag which is used to store register's state before locking */ -+ struct _mali_osk_spinlock_irq_s { -+#ifdef DEBUG -+ struct _mali_osk_lock_debug_s checker; -+#endif ++out: ++ mutex_unlock(&kctx->jctx.lock); + -+ spinlock_t spinlock; -+ unsigned long flags; -+ }; ++ return err; ++} + -+ /* Abstraction of rw_semaphore in OS */ -+ struct _mali_osk_mutex_rw_s { -+#ifdef DEBUG -+ struct _mali_osk_lock_debug_s checker; -+ _mali_osk_lock_mode_t mode; -+#endif ++static void kbasep_soft_event_cancel_job(struct kbase_jd_atom *katom) ++{ ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ if (jd_done_nolock(katom, NULL)) ++ kbase_js_sched_all(katom->kctx->kbdev); ++} + -+ struct rw_semaphore rw_sema; -+ }; ++struct kbase_debug_copy_buffer { ++ size_t size; ++ struct page **pages; ++ int nr_pages; ++ size_t offset; ++ struct kbase_mem_phy_alloc *gpu_alloc; + -+ /* Mutex and mutex_interruptible functions share the same osk mutex struct */ -+ struct _mali_osk_mutex_s { -+#ifdef DEBUG -+ struct _mali_osk_lock_debug_s checker; -+#endif -+ struct mutex mutex; -+ }; ++ struct page **extres_pages; ++ int nr_extres_pages; ++}; + -+#ifdef DEBUG -+ /** @brief _mali_osk_locks_debug_init/add/remove() functions are declared when DEBUG is enabled and -+ * defined in file mali_osk_locks.c. When LOCK_ORDER_CHECKING is enabled, calling these functions when we -+ * init/lock/unlock a lock/mutex, we could track lock order of a given tid. */ -+ void _mali_osk_locks_debug_init(struct _mali_osk_lock_debug_s *checker, _mali_osk_lock_flags_t flags, _mali_osk_lock_order_t order); -+ void _mali_osk_locks_debug_add(struct _mali_osk_lock_debug_s *checker); -+ void _mali_osk_locks_debug_remove(struct _mali_osk_lock_debug_s *checker); ++static inline void free_user_buffer(struct kbase_debug_copy_buffer *buffer) ++{ ++ struct page **pages = buffer->extres_pages; ++ int nr_pages = buffer->nr_extres_pages; + -+ /** @brief This function can return a given lock's owner when DEBUG is enabled. */ -+ static inline u32 _mali_osk_lock_get_owner(struct _mali_osk_lock_debug_s *lock) -+ { -+ return lock->owner; -+ } -+#else -+#define _mali_osk_locks_debug_init(x, y, z) do {} while (0) -+#define _mali_osk_locks_debug_add(x) do {} while (0) -+#define _mali_osk_locks_debug_remove(x) do {} while (0) -+#endif ++ if (pages) { ++ int i; + -+ /** @brief Before use _mali_osk_spin_lock, init function should be used to allocate memory and initial spinlock*/ -+ static inline _mali_osk_spinlock_t *_mali_osk_spinlock_init(_mali_osk_lock_flags_t flags, _mali_osk_lock_order_t order) -+ { -+ _mali_osk_spinlock_t *lock = NULL; ++ for (i = 0; i < nr_pages; i++) { ++ struct page *pg = pages[i]; + -+ lock = kmalloc(sizeof(_mali_osk_spinlock_t), GFP_KERNEL); -+ if (NULL == lock) { -+ return NULL; ++ if (pg) ++ put_page(pg); + } -+ spin_lock_init(&lock->spinlock); -+ _mali_osk_locks_debug_init((struct _mali_osk_lock_debug_s *)lock, flags, order); -+ return lock; -+ } -+ -+ /** @brief Lock a spinlock */ -+ static inline void _mali_osk_spinlock_lock(_mali_osk_spinlock_t *lock) -+ { -+ BUG_ON(NULL == lock); -+ spin_lock(&lock->spinlock); -+ _mali_osk_locks_debug_add((struct _mali_osk_lock_debug_s *)lock); ++ kfree(pages); + } ++} + -+ /** @brief Unlock a spinlock */ -+ static inline void _mali_osk_spinlock_unlock(_mali_osk_spinlock_t *lock) -+ { -+ BUG_ON(NULL == lock); -+ _mali_osk_locks_debug_remove((struct _mali_osk_lock_debug_s *)lock); -+ spin_unlock(&lock->spinlock); -+ } ++static void kbase_debug_copy_finish(struct kbase_jd_atom *katom) ++{ ++ struct kbase_debug_copy_buffer *buffers = ++ (struct kbase_debug_copy_buffer *)(uintptr_t)katom->jc; ++ unsigned int i; ++ unsigned int nr = katom->nr_extres; + -+ /** @brief Free a memory block which the argument lock pointed to and its type must be -+ * _mali_osk_spinlock_t *. */ -+ static inline void _mali_osk_spinlock_term(_mali_osk_spinlock_t *lock) -+ { -+ /* Parameter validation */ -+ BUG_ON(NULL == lock); ++ if (!buffers) ++ return; + -+ /* Linux requires no explicit termination of spinlocks, semaphores, or rw_semaphores */ -+ kfree(lock); -+ } ++ kbase_gpu_vm_lock(katom->kctx); ++ for (i = 0; i < nr; i++) { ++ int p; ++ struct kbase_mem_phy_alloc *gpu_alloc = buffers[i].gpu_alloc; + -+ /** @brief Before _mali_osk_spinlock_irq_lock/unlock/term() is called, init function should be -+ * called to initial spinlock and flags in struct _mali_osk_spinlock_irq_t. */ -+ static inline _mali_osk_spinlock_irq_t *_mali_osk_spinlock_irq_init(_mali_osk_lock_flags_t flags, _mali_osk_lock_order_t order) -+ { -+ _mali_osk_spinlock_irq_t *lock = NULL; -+ lock = kmalloc(sizeof(_mali_osk_spinlock_irq_t), GFP_KERNEL); ++ if (!buffers[i].pages) ++ break; ++ for (p = 0; p < buffers[i].nr_pages; p++) { ++ struct page *pg = buffers[i].pages[p]; + -+ if (NULL == lock) { -+ return NULL; ++ if (pg) ++ put_page(pg); ++ } ++ kfree(buffers[i].pages); ++ if (gpu_alloc) { ++ switch (gpu_alloc->type) { ++ case KBASE_MEM_TYPE_IMPORTED_USER_BUF: ++ { ++ free_user_buffer(&buffers[i]); ++ break; ++ } ++ default: ++ /* Nothing to be done. */ ++ break; ++ } ++ kbase_mem_phy_alloc_put(gpu_alloc); + } -+ -+ lock->flags = 0; -+ spin_lock_init(&lock->spinlock); -+ _mali_osk_locks_debug_init((struct _mali_osk_lock_debug_s *)lock, flags, order); -+ return lock; + } ++ kbase_gpu_vm_unlock(katom->kctx); ++ kfree(buffers); + -+ /** @brief Lock spinlock and save the register's state */ -+ static inline void _mali_osk_spinlock_irq_lock(_mali_osk_spinlock_irq_t *lock) -+ { -+ unsigned long tmp_flags; ++ katom->jc = 0; ++} + -+ BUG_ON(NULL == lock); -+ spin_lock_irqsave(&lock->spinlock, tmp_flags); -+ lock->flags = tmp_flags; -+ _mali_osk_locks_debug_add((struct _mali_osk_lock_debug_s *)lock); -+ } ++static int kbase_debug_copy_prepare(struct kbase_jd_atom *katom) ++{ ++ struct kbase_debug_copy_buffer *buffers; ++ struct base_jd_debug_copy_buffer *user_buffers = NULL; ++ unsigned int i; ++ unsigned int nr = katom->nr_extres; ++ int ret = 0; ++ void __user *user_structs = (void __user *)(uintptr_t)katom->jc; + -+ /** @brief Unlock spinlock with saved register's state */ -+ static inline void _mali_osk_spinlock_irq_unlock(_mali_osk_spinlock_irq_t *lock) -+ { -+ BUG_ON(NULL == lock); -+ _mali_osk_locks_debug_remove((struct _mali_osk_lock_debug_s *)lock); -+ spin_unlock_irqrestore(&lock->spinlock, lock->flags); ++ if (!user_structs) ++ return -EINVAL; ++ ++ buffers = kcalloc(nr, sizeof(*buffers), GFP_KERNEL); ++ if (!buffers) { ++ ret = -ENOMEM; ++ katom->jc = 0; ++ goto out_cleanup; + } ++ katom->jc = (u64)(uintptr_t)buffers; + -+ /** @brief Destroy a given memory block which lock pointed to, and the lock type must be -+ * _mali_osk_spinlock_irq_t *. */ -+ static inline void _mali_osk_spinlock_irq_term(_mali_osk_spinlock_irq_t *lock) -+ { -+ /* Parameter validation */ -+ BUG_ON(NULL == lock); ++ user_buffers = kmalloc_array(nr, sizeof(*user_buffers), GFP_KERNEL); + -+ /* Linux requires no explicit termination of spinlocks, semaphores, or rw_semaphores */ -+ kfree(lock); ++ if (!user_buffers) { ++ ret = -ENOMEM; ++ goto out_cleanup; + } + -+ /** @brief Before _mali_osk_mutex_rw_wait/signal/term() is called, we should call -+ * _mali_osk_mutex_rw_init() to kmalloc a memory block and initial part of elements in it. */ -+ static inline _mali_osk_mutex_rw_t *_mali_osk_mutex_rw_init(_mali_osk_lock_flags_t flags, _mali_osk_lock_order_t order) -+ { -+ _mali_osk_mutex_rw_t *lock = NULL; -+ -+ lock = kmalloc(sizeof(_mali_osk_mutex_rw_t), GFP_KERNEL); ++ ret = copy_from_user(user_buffers, user_structs, ++ sizeof(*user_buffers)*nr); ++ if (ret) ++ goto out_cleanup; + -+ if (NULL == lock) { -+ return NULL; -+ } ++ for (i = 0; i < nr; i++) { ++ u64 addr = user_buffers[i].address; ++ u64 page_addr = addr & PAGE_MASK; ++ u64 end_page_addr = addr + user_buffers[i].size - 1; ++ u64 last_page_addr = end_page_addr & PAGE_MASK; ++ int nr_pages = (last_page_addr-page_addr)/PAGE_SIZE+1; ++ int pinned_pages; ++ struct kbase_va_region *reg; ++ struct base_external_resource user_extres; + -+ init_rwsem(&lock->rw_sema); -+ _mali_osk_locks_debug_init((struct _mali_osk_lock_debug_s *)lock, flags, order); -+ return lock; -+ } ++ if (!addr) ++ continue; + -+ /** @brief When call _mali_osk_mutex_rw_wait/signal() functions, the second argument mode -+ * should be assigned with value _MALI_OSK_LOCKMODE_RO or _MALI_OSK_LOCKMODE_RW */ -+ static inline void _mali_osk_mutex_rw_wait(_mali_osk_mutex_rw_t *lock, _mali_osk_lock_mode_t mode) -+ { -+ BUG_ON(NULL == lock); -+ BUG_ON(!(_MALI_OSK_LOCKMODE_RO == mode || _MALI_OSK_LOCKMODE_RW == mode)); ++ buffers[i].nr_pages = nr_pages; ++ buffers[i].offset = addr & ~PAGE_MASK; ++ if (buffers[i].offset >= PAGE_SIZE) { ++ ret = -EINVAL; ++ goto out_cleanup; ++ } ++ buffers[i].size = user_buffers[i].size; + -+ if (mode == _MALI_OSK_LOCKMODE_RO) { -+ down_read(&lock->rw_sema); -+ } else { -+ down_write(&lock->rw_sema); ++ buffers[i].pages = kcalloc(nr_pages, sizeof(struct page *), ++ GFP_KERNEL); ++ if (!buffers[i].pages) { ++ ret = -ENOMEM; ++ goto out_cleanup; + } + -+#ifdef DEBUG -+ if (mode == _MALI_OSK_LOCKMODE_RW) { -+ lock->mode = mode; -+ } else { /* mode == _MALI_OSK_LOCKMODE_RO */ -+ lock->mode = mode; ++ pinned_pages = get_user_pages_fast(page_addr, ++ nr_pages, ++ 1, /* Write */ ++ buffers[i].pages); ++ if (pinned_pages < 0) { ++ ret = pinned_pages; ++ goto out_cleanup; ++ } ++ if (pinned_pages != nr_pages) { ++ ret = -EINVAL; ++ goto out_cleanup; + } -+ _mali_osk_locks_debug_add((struct _mali_osk_lock_debug_s *)lock); -+#endif -+ } + -+ /** @brief Up lock->rw_sema with up_read/write() accordinf argument mode's value. */ -+ static inline void _mali_osk_mutex_rw_signal(_mali_osk_mutex_rw_t *lock, _mali_osk_lock_mode_t mode) -+ { -+ BUG_ON(NULL == lock); -+ BUG_ON(!(_MALI_OSK_LOCKMODE_RO == mode || _MALI_OSK_LOCKMODE_RW == mode)); -+#ifdef DEBUG -+ /* make sure the thread releasing the lock actually was the owner */ -+ if (mode == _MALI_OSK_LOCKMODE_RW) { -+ _mali_osk_locks_debug_remove((struct _mali_osk_lock_debug_s *)lock); -+ /* This lock now has no owner */ -+ lock->checker.owner = 0; ++ user_extres = user_buffers[i].extres; ++ if (user_extres.ext_resource == 0ULL) { ++ ret = -EINVAL; ++ goto out_cleanup; + } -+#endif + -+ if (mode == _MALI_OSK_LOCKMODE_RO) { -+ up_read(&lock->rw_sema); -+ } else { -+ up_write(&lock->rw_sema); ++ kbase_gpu_vm_lock(katom->kctx); ++ reg = kbase_region_tracker_find_region_enclosing_address( ++ katom->kctx, user_extres.ext_resource & ++ ~BASE_EXT_RES_ACCESS_EXCLUSIVE); ++ ++ if (NULL == reg || NULL == reg->gpu_alloc || ++ (reg->flags & KBASE_REG_FREE)) { ++ ret = -EINVAL; ++ goto out_unlock; + } -+ } + -+ /** @brief Free a given memory block which lock pointed to and its type must be -+ * _mali_sok_mutex_rw_t *. */ -+ static inline void _mali_osk_mutex_rw_term(_mali_osk_mutex_rw_t *lock) -+ { -+ /* Parameter validation */ -+ BUG_ON(NULL == lock); ++ buffers[i].gpu_alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); ++ buffers[i].nr_extres_pages = reg->nr_pages; + -+ /* Linux requires no explicit termination of spinlocks, semaphores, or rw_semaphores */ -+ kfree(lock); -+ } ++ if (reg->nr_pages*PAGE_SIZE != buffers[i].size) ++ dev_warn(katom->kctx->kbdev->dev, "Copy buffer is not of same size as the external resource to copy.\n"); + -+ /** @brief Mutex & mutex_interruptible share the same init and term function, because they have the -+ * same osk mutex struct, and the difference between them is which locking function they use */ -+ static inline _mali_osk_mutex_t *_mali_osk_mutex_init(_mali_osk_lock_flags_t flags, _mali_osk_lock_order_t order) -+ { -+ _mali_osk_mutex_t *lock = NULL; ++ switch (reg->gpu_alloc->type) { ++ case KBASE_MEM_TYPE_IMPORTED_USER_BUF: ++ { ++ struct kbase_mem_phy_alloc *alloc = reg->gpu_alloc; ++ unsigned long nr_pages = ++ alloc->imported.user_buf.nr_pages; + -+ lock = kmalloc(sizeof(_mali_osk_mutex_t), GFP_KERNEL); ++ if (alloc->imported.user_buf.mm != current->mm) { ++ ret = -EINVAL; ++ goto out_unlock; ++ } ++ buffers[i].extres_pages = kcalloc(nr_pages, ++ sizeof(struct page *), GFP_KERNEL); ++ if (!buffers[i].extres_pages) { ++ ret = -ENOMEM; ++ goto out_unlock; ++ } + -+ if (NULL == lock) { -+ return NULL; ++ ret = get_user_pages_fast( ++ alloc->imported.user_buf.address, ++ nr_pages, 0, ++ buffers[i].extres_pages); ++ if (ret != nr_pages) ++ goto out_unlock; ++ ret = 0; ++ break; + } -+ mutex_init(&lock->mutex); -+ -+ _mali_osk_locks_debug_init((struct _mali_osk_lock_debug_s *)lock, flags, order); -+ return lock; ++ case KBASE_MEM_TYPE_IMPORTED_UMP: ++ { ++ dev_warn(katom->kctx->kbdev->dev, ++ "UMP is not supported for debug_copy jobs\n"); ++ ret = -EINVAL; ++ goto out_unlock; ++ } ++ default: ++ /* Nothing to be done. */ ++ break; ++ } ++ kbase_gpu_vm_unlock(katom->kctx); + } ++ kfree(user_buffers); + -+ /** @brief Lock the lock->mutex with mutex_lock_interruptible function */ -+ static inline _mali_osk_errcode_t _mali_osk_mutex_wait_interruptible(_mali_osk_mutex_t *lock) -+ { -+ _mali_osk_errcode_t err = _MALI_OSK_ERR_OK; ++ return ret; + -+ BUG_ON(NULL == lock); ++out_unlock: ++ kbase_gpu_vm_unlock(katom->kctx); + -+ if (mutex_lock_interruptible(&lock->mutex)) { -+ printk(KERN_WARNING "Mali: Can not lock mutex\n"); -+ err = _MALI_OSK_ERR_RESTARTSYSCALL; -+ } ++out_cleanup: ++ kfree(buffers); ++ kfree(user_buffers); + -+ _mali_osk_locks_debug_add((struct _mali_osk_lock_debug_s *)lock); -+ return err; -+ } ++ /* Frees allocated memory for kbase_debug_copy_job struct, including ++ * members, and sets jc to 0 */ ++ kbase_debug_copy_finish(katom); ++ return ret; ++} + -+ /** @brief Unlock the lock->mutex which is locked with mutex_lock_interruptible() function. */ -+ static inline void _mali_osk_mutex_signal_interruptible(_mali_osk_mutex_t *lock) -+ { -+ BUG_ON(NULL == lock); -+ _mali_osk_locks_debug_remove((struct _mali_osk_lock_debug_s *)lock); -+ mutex_unlock(&lock->mutex); -+ } ++static void kbase_mem_copy_from_extres_page(struct kbase_context *kctx, ++ void *extres_page, struct page **pages, unsigned int nr_pages, ++ unsigned int *target_page_nr, size_t offset, size_t *to_copy) ++{ ++ void *target_page = kmap(pages[*target_page_nr]); ++ size_t chunk = PAGE_SIZE-offset; + -+ /** @brief Lock the lock->mutex just with mutex_lock() function which could not be interruptted. */ -+ static inline void _mali_osk_mutex_wait(_mali_osk_mutex_t *lock) -+ { -+ BUG_ON(NULL == lock); -+ mutex_lock(&lock->mutex); -+ _mali_osk_locks_debug_add((struct _mali_osk_lock_debug_s *)lock); -+ } ++ lockdep_assert_held(&kctx->reg_lock); + -+ /** @brief Unlock the lock->mutex which is locked with mutex_lock() function. */ -+ static inline void _mali_osk_mutex_signal(_mali_osk_mutex_t *lock) -+ { -+ BUG_ON(NULL == lock); -+ _mali_osk_locks_debug_remove((struct _mali_osk_lock_debug_s *)lock); -+ mutex_unlock(&lock->mutex); ++ if (!target_page) { ++ *target_page_nr += 1; ++ dev_warn(kctx->kbdev->dev, "kmap failed in debug_copy job."); ++ return; + } + -+ /** @brief Free a given memory block which lock point. */ -+ static inline void _mali_osk_mutex_term(_mali_osk_mutex_t *lock) -+ { -+ /* Parameter validation */ -+ BUG_ON(NULL == lock); ++ chunk = min(chunk, *to_copy); + -+ /* Linux requires no explicit termination of spinlocks, semaphores, or rw_semaphores */ -+ kfree(lock); -+ } ++ memcpy(target_page + offset, extres_page, chunk); ++ *to_copy -= chunk; + -+#ifdef _cplusplus -+} -+#endif ++ kunmap(pages[*target_page_nr]); + -+#endif -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c -new file mode 100755 -index 000000000000..994b04dad745 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c -@@ -0,0 +1,146 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ *target_page_nr += 1; ++ if (*target_page_nr >= nr_pages) ++ return; + -+/** -+ * @file mali_osk_low_level_mem.c -+ * Implementation of the OS abstraction layer for the kernel device driver -+ */ ++ target_page = kmap(pages[*target_page_nr]); ++ if (!target_page) { ++ *target_page_nr += 1; ++ dev_warn(kctx->kbdev->dev, "kmap failed in debug_copy job."); ++ return; ++ } + -+#include -+#include -+#include ++ KBASE_DEBUG_ASSERT(target_page); + -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_ukk.h" ++ chunk = min(offset, *to_copy); ++ memcpy(target_page, extres_page + PAGE_SIZE-offset, chunk); ++ *to_copy -= chunk; + -+void _mali_osk_mem_barrier(void) -+{ -+ mb(); ++ kunmap(pages[*target_page_nr]); +} + -+void _mali_osk_write_mem_barrier(void) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++static void *dma_buf_kmap_page(struct kbase_mem_phy_alloc *gpu_alloc, ++ unsigned long page_num, struct page **page) +{ -+ wmb(); -+} ++ struct sg_table *sgt = gpu_alloc->imported.umm.sgt; ++ struct sg_page_iter sg_iter; ++ unsigned long page_index = 0; + -+mali_io_address _mali_osk_mem_mapioregion(uintptr_t phys, u32 size, const char *description) -+{ -+ return (mali_io_address)ioremap(phys, size); -+} ++ if (WARN_ON(gpu_alloc->type != KBASE_MEM_TYPE_IMPORTED_UMM)) ++ return NULL; + -+void _mali_osk_mem_unmapioregion(uintptr_t phys, u32 size, mali_io_address virt) -+{ -+ iounmap((void *)virt); -+} ++ if (!sgt) ++ return NULL; + -+_mali_osk_errcode_t inline _mali_osk_mem_reqregion(uintptr_t phys, u32 size, const char *description) -+{ -+#if MALI_LICENSE_IS_GPL -+ return _MALI_OSK_ERR_OK; /* GPL driver gets the mem region for the resources registered automatically */ -+#else -+ return ((NULL == request_mem_region(phys, size, description)) ? _MALI_OSK_ERR_NOMEM : _MALI_OSK_ERR_OK); -+#endif -+} ++ if (WARN_ON(page_num >= gpu_alloc->nents)) ++ return NULL; + -+void inline _mali_osk_mem_unreqregion(uintptr_t phys, u32 size) -+{ -+#if !MALI_LICENSE_IS_GPL -+ release_mem_region(phys, size); -+#endif -+} ++ for_each_sg_page(sgt->sgl, &sg_iter, sgt->nents, 0) { ++ if (page_index == page_num) { ++ *page = sg_page_iter_page(&sg_iter); + -+void inline _mali_osk_mem_iowrite32_relaxed(volatile mali_io_address addr, u32 offset, u32 val) -+{ -+ __raw_writel(cpu_to_le32(val), ((u8 *)addr) + offset); -+} ++ return kmap(*page); ++ } ++ page_index++; ++ } + -+u32 inline _mali_osk_mem_ioread32(volatile mali_io_address addr, u32 offset) -+{ -+ return ioread32(((u8 *)addr) + offset); ++ return NULL; +} ++#endif + -+void inline _mali_osk_mem_iowrite32(volatile mali_io_address addr, u32 offset, u32 val) ++static int kbase_mem_copy_from_extres(struct kbase_context *kctx, ++ struct kbase_debug_copy_buffer *buf_data) +{ -+ iowrite32(val, ((u8 *)addr) + offset); -+} ++ unsigned int i; ++ unsigned int target_page_nr = 0; ++ struct page **pages = buf_data->pages; ++ u64 offset = buf_data->offset; ++ size_t extres_size = buf_data->nr_extres_pages*PAGE_SIZE; ++ size_t to_copy = min(extres_size, buf_data->size); ++ struct kbase_mem_phy_alloc *gpu_alloc = buf_data->gpu_alloc; ++ int ret = 0; + -+void _mali_osk_cache_flushall(void) -+{ -+ /** @note Cached memory is not currently supported in this implementation */ -+} ++ KBASE_DEBUG_ASSERT(pages != NULL); + -+void _mali_osk_cache_ensure_uncached_range_flushed(void *uncached_mapping, u32 offset, u32 size) -+{ -+ _mali_osk_write_mem_barrier(); -+} ++ kbase_gpu_vm_lock(kctx); ++ if (!gpu_alloc) { ++ ret = -EINVAL; ++ goto out_unlock; ++ } + -+u32 _mali_osk_mem_write_safe(void __user *dest, const void __user *src, u32 size) -+{ -+#define MALI_MEM_SAFE_COPY_BLOCK_SIZE 4096 -+ u32 retval = 0; -+ void *temp_buf; ++ switch (gpu_alloc->type) { ++ case KBASE_MEM_TYPE_IMPORTED_USER_BUF: ++ { ++ for (i = 0; i < buf_data->nr_extres_pages; i++) { ++ struct page *pg = buf_data->extres_pages[i]; ++ void *extres_page = kmap(pg); + -+ temp_buf = kmalloc(MALI_MEM_SAFE_COPY_BLOCK_SIZE, GFP_KERNEL); -+ if (NULL != temp_buf) { -+ u32 bytes_left_to_copy = size; -+ u32 i; -+ for (i = 0; i < size; i += MALI_MEM_SAFE_COPY_BLOCK_SIZE) { -+ u32 size_to_copy; -+ u32 size_copied; -+ u32 bytes_left; ++ if (extres_page) ++ kbase_mem_copy_from_extres_page(kctx, ++ extres_page, pages, ++ buf_data->nr_pages, ++ &target_page_nr, ++ offset, &to_copy); + -+ if (bytes_left_to_copy > MALI_MEM_SAFE_COPY_BLOCK_SIZE) { -+ size_to_copy = MALI_MEM_SAFE_COPY_BLOCK_SIZE; -+ } else { -+ size_to_copy = bytes_left_to_copy; -+ } ++ kunmap(pg); ++ if (target_page_nr >= buf_data->nr_pages) ++ break; ++ } ++ break; ++ } ++ break; ++#ifdef CONFIG_DMA_SHARED_BUFFER ++ case KBASE_MEM_TYPE_IMPORTED_UMM: { ++ struct dma_buf *dma_buf = gpu_alloc->imported.umm.dma_buf; + -+ bytes_left = copy_from_user(temp_buf, ((char *)src) + i, size_to_copy); -+ size_copied = size_to_copy - bytes_left; ++ KBASE_DEBUG_ASSERT(dma_buf != NULL); ++ KBASE_DEBUG_ASSERT(dma_buf->size == ++ buf_data->nr_extres_pages * PAGE_SIZE); + -+ bytes_left = copy_to_user(((char *)dest) + i, temp_buf, size_copied); -+ size_copied -= bytes_left; ++ ret = dma_buf_begin_cpu_access(dma_buf, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) && !defined(CONFIG_CHROMEOS) ++ 0, buf_data->nr_extres_pages*PAGE_SIZE, ++#endif ++ DMA_FROM_DEVICE); ++ if (ret) ++ goto out_unlock; + -+ bytes_left_to_copy -= size_copied; -+ retval += size_copied; ++ for (i = 0; i < buf_data->nr_extres_pages; i++) { + -+ if (size_copied != size_to_copy) { -+ break; /* Early out, we was not able to copy this entire block */ -+ } -+ } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ struct page *pg; ++ void *extres_page = dma_buf_kmap_page(gpu_alloc, i, &pg); ++#else ++ void *extres_page = dma_buf_kmap(dma_buf, i); ++#endif + -+ kfree(temp_buf); ++ if (extres_page) ++ kbase_mem_copy_from_extres_page(kctx, ++ extres_page, pages, ++ buf_data->nr_pages, ++ &target_page_nr, ++ offset, &to_copy); ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ kunmap(pg); ++#else ++ dma_buf_kunmap(dma_buf, i, extres_page); ++#endif ++ if (target_page_nr >= buf_data->nr_pages) ++ break; ++ } ++ dma_buf_end_cpu_access(dma_buf, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) && !defined(CONFIG_CHROMEOS) ++ 0, buf_data->nr_extres_pages*PAGE_SIZE, ++#endif ++ DMA_FROM_DEVICE); ++ break; ++ } ++#endif ++ default: ++ ret = -EINVAL; + } ++out_unlock: ++ kbase_gpu_vm_unlock(kctx); ++ return ret; + -+ return retval; +} + -+_mali_osk_errcode_t _mali_ukk_mem_write_safe(_mali_uk_mem_write_safe_s *args) ++static int kbase_debug_copy(struct kbase_jd_atom *katom) +{ -+ void __user *src; -+ void __user *dst; -+ struct mali_session_data *session; -+ -+ MALI_DEBUG_ASSERT_POINTER(args); ++ struct kbase_debug_copy_buffer *buffers = ++ (struct kbase_debug_copy_buffer *)(uintptr_t)katom->jc; ++ unsigned int i; + -+ session = (struct mali_session_data *)(uintptr_t)args->ctx; ++ for (i = 0; i < katom->nr_extres; i++) { ++ int res = kbase_mem_copy_from_extres(katom->kctx, &buffers[i]); + -+ if (NULL == session) { -+ return _MALI_OSK_ERR_INVALID_ARGS; ++ if (res) ++ return res; + } + -+ src = (void __user *)(uintptr_t)args->src; -+ dst = (void __user *)(uintptr_t)args->dest; -+ -+ /* Return number of bytes actually copied */ -+ args->size = _mali_osk_mem_write_safe(dst, src, args->size); -+ return _MALI_OSK_ERR_OK; ++ return 0; +} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c -new file mode 100755 -index 000000000000..a729d0499869 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c -@@ -0,0 +1,505 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+ -+/** -+ * @file mali_osk_mali.c -+ * Implementation of the OS abstraction layer which is specific for the Mali kernel device driver -+ */ -+#include "../platform/rk/custom_log.h" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "mali_osk_mali.h" -+#include "mali_kernel_common.h" /* MALI_xxx macros */ -+#include "mali_osk.h" /* kernel side OS functions */ -+#include "mali_kernel_linux.h" + -+static mali_bool mali_secure_mode_enabled = MALI_FALSE; -+static mali_bool mali_secure_mode_supported = MALI_FALSE; -+ -+/* Function that init the mali gpu secure mode */ -+void (*mali_secure_mode_deinit)(void) = NULL; -+/* Function that reset GPU and enable the mali gpu secure mode */ -+int (*mali_gpu_reset_and_secure_mode_enable)(void) = NULL; -+/* Function that reset GPU and disable the mali gpu secure mode */ -+int (*mali_gpu_reset_and_secure_mode_disable)(void) = NULL; ++static int kbase_jit_allocate_prepare(struct kbase_jd_atom *katom) ++{ ++ __user void *data = (__user void *)(uintptr_t) katom->jc; ++ struct base_jit_alloc_info *info; ++ struct kbase_context *kctx = katom->kctx; ++ int ret; + ++ /* Fail the job if there is no info structure */ ++ if (!data) { ++ ret = -EINVAL; ++ goto fail; ++ } + -+#ifdef CONFIG_MALI_DT ++ /* Copy the information for safe access and future storage */ ++ info = kzalloc(sizeof(*info), GFP_KERNEL); ++ if (!info) { ++ ret = -ENOMEM; ++ goto fail; ++ } + -+#define MALI_OSK_INVALID_RESOURCE_ADDRESS 0xFFFFFFFF ++ if (copy_from_user(info, data, sizeof(*info)) != 0) { ++ ret = -EINVAL; ++ goto free_info; ++ } + -+/** -+ * Define the max number of resource we could have. -+ */ -+#define MALI_OSK_MAX_RESOURCE_NUMBER 27 ++ /* If the ID is zero then fail the job */ ++ if (info->id == 0) { ++ ret = -EINVAL; ++ goto free_info; ++ } + -+/** -+ * Define the max number of resource with interrupts, and they are -+ * the first 20 elements in array mali_osk_resource_bank. -+ */ -+#define MALI_OSK_RESOURCE_WITH_IRQ_NUMBER 20 ++ /* Sanity check that the PA fits within the VA */ ++ if (info->va_pages < info->commit_pages) { ++ ret = -EINVAL; ++ goto free_info; ++ } + -+/** -+ * pp core start and end location in mali_osk_resource_bank array. -+ */ -+#define MALI_OSK_RESOURCE_PP_LOCATION_START 2 -+#define MALI_OSK_RESOURCE_PP_LOCATION_END 17 ++ /* Ensure the GPU address is correctly aligned */ ++ if ((info->gpu_alloc_addr & 0x7) != 0) { ++ ret = -EINVAL; ++ goto free_info; ++ } + -+/** -+ * L2 cache start and end location in mali_osk_resource_bank array. -+ */ -+#define MALI_OSK_RESOURCE_L2_LOCATION_START 20 -+#define MALI_OSK_RESOURCE_l2_LOCATION_END 22 ++ /* Replace the user pointer with our kernel allocated info structure */ ++ katom->jc = (u64)(uintptr_t) info; ++ katom->jit_blocked = false; + -+/** -+ * DMA unit location. -+ */ -+#define MALI_OSK_RESOURCE_DMA_LOCATION 26 ++ lockdep_assert_held(&kctx->jctx.lock); ++ list_add_tail(&katom->jit_node, &kctx->jit_atoms_head); + -+static _mali_osk_resource_t mali_osk_resource_bank[MALI_OSK_MAX_RESOURCE_NUMBER] = { -+ /*-------------------------------------------------------*/ -+ /* rk_ext : to use dts_for_mali_ko_befor_r5p0-01rel0. */ -+ /* {.description = "Mali_GP", .base = MALI_OFFSET_GP, .irq_name = "IRQGP",}, */ -+ {.description = "Mali_GP", .base = MALI_OFFSET_GP, .irq_name = "Mali_GP_IRQ",}, -+ /* {.description = "Mali_GP_MMU", .base = MALI_OFFSET_GP_MMU, .irq_name = "IRQGPMMU",}, */ -+ {.description = "Mali_GP_MMU", .base = MALI_OFFSET_GP_MMU, .irq_name = "Mali_GP_MMU_IRQ",}, -+ /* {.description = "Mali_PP0", .base = MALI_OFFSET_PP0, .irq_name = "IRQPP0",}, */ -+ {.description = "Mali_PP0", .base = MALI_OFFSET_PP0, .irq_name = "Mali_PP0_IRQ",}, -+ /* {.description = "Mali_PP0_MMU", .base = MALI_OFFSET_PP0_MMU, .irq_name = "IRQPPMMU0",}, */ -+ {.description = "Mali_PP0_MMU", .base = MALI_OFFSET_PP0_MMU, .irq_name = "Mali_PP0_MMU_IRQ",}, -+ /* {.description = "Mali_PP1", .base = MALI_OFFSET_PP1, .irq_name = "IRQPP1",}, */ -+ {.description = "Mali_PP1", .base = MALI_OFFSET_PP1, .irq_name = "Mali_PP1_IRQ",}, -+ /* {.description = "Mali_PP1_MMU", .base = MALI_OFFSET_PP1_MMU, .irq_name = "IRQPPMMU1",}, */ -+ {.description = "Mali_PP1_MMU", .base = MALI_OFFSET_PP1_MMU, .irq_name = "Mali_PP1_MMU_IRQ",}, ++ /* ++ * Note: ++ * The provided info->gpu_alloc_addr isn't validated here as ++ * userland can cache allocations which means that even ++ * though the region is valid it doesn't represent the ++ * same thing it used to. ++ * ++ * Complete validation of va_pages, commit_pages and extent ++ * isn't done here as it will be done during the call to ++ * kbase_mem_alloc. ++ */ ++ return 0; + -+ {.description = "Mali_PP2", .base = MALI_OFFSET_PP2, .irq_name = "Mali_PP2_IRQ",}, -+ {.description = "Mali_PP2_MMU", .base = MALI_OFFSET_PP2_MMU, .irq_name = "Mali_PP2_MMU_IRQ",}, -+ {.description = "Mali_PP3", .base = MALI_OFFSET_PP3, .irq_name = "Mali_PP3_IRQ",}, -+ {.description = "Mali_PP3_MMU", .base = MALI_OFFSET_PP3_MMU, .irq_name = "Mali_PP3_MMU_IRQ",}, -+ /*-------------------------------------------------------*/ -+ {.description = "Mali_PP4", .base = MALI_OFFSET_PP4, .irq_name = "IRQPP4",}, -+ {.description = "Mali_PP4_MMU", .base = MALI_OFFSET_PP4_MMU, .irq_name = "IRQPPMMU4",}, -+ {.description = "Mali_PP5", .base = MALI_OFFSET_PP5, .irq_name = "IRQPP5",}, -+ {.description = "Mali_PP5_MMU", .base = MALI_OFFSET_PP5_MMU, .irq_name = "IRQPPMMU5",}, -+ {.description = "Mali_PP6", .base = MALI_OFFSET_PP6, .irq_name = "IRQPP6",}, -+ {.description = "Mali_PP6_MMU", .base = MALI_OFFSET_PP6_MMU, .irq_name = "IRQPPMMU6",}, -+ {.description = "Mali_PP7", .base = MALI_OFFSET_PP7, .irq_name = "IRQPP7",}, -+ {.description = "Mali_PP7_MMU", .base = MALI_OFFSET_PP7_MMU, .irq_name = "IRQPPMMU",}, -+ {.description = "Mali_PP_Broadcast", .base = MALI_OFFSET_PP_BCAST, .irq_name = "IRQPP",}, -+ {.description = "Mali_PMU", .base = MALI_OFFSET_PMU, .irq_name = "IRQPMU",}, -+ {.description = "Mali_L2", .base = MALI_OFFSET_L2_RESOURCE0,}, -+ {.description = "Mali_L2", .base = MALI_OFFSET_L2_RESOURCE1,}, -+ {.description = "Mali_L2", .base = MALI_OFFSET_L2_RESOURCE2,}, -+ {.description = "Mali_PP_MMU_Broadcast", .base = MALI_OFFSET_PP_BCAST_MMU,}, -+ {.description = "Mali_Broadcast", .base = MALI_OFFSET_BCAST,}, -+ {.description = "Mali_DLBU", .base = MALI_OFFSET_DLBU,}, -+ {.description = "Mali_DMA", .base = MALI_OFFSET_DMA,}, -+}; ++free_info: ++ kfree(info); ++fail: ++ katom->jc = 0; ++ return ret; ++} + -+static int _mali_osk_get_compatible_name(const char **out_string) ++static u8 kbase_jit_free_get_id(struct kbase_jd_atom *katom) +{ -+ struct device_node *node = mali_platform_device->dev.of_node; -+ -+ MALI_DEBUG_ASSERT(NULL != node); ++ if (WARN_ON(katom->core_req != BASE_JD_REQ_SOFT_JIT_FREE)) ++ return 0; + -+ return of_property_read_string(node, "compatible", out_string); ++ return (u8) katom->jc; +} + -+_mali_osk_errcode_t _mali_osk_resource_initialize(void) ++static int kbase_jit_allocate_process(struct kbase_jd_atom *katom) +{ -+ mali_bool mali_is_450 = MALI_FALSE, mali_is_470 = MALI_FALSE; -+ int i, pp_core_num = 0, l2_core_num = 0; -+ struct resource *res; -+ const char *compatible_name = NULL; ++ struct kbase_context *kctx = katom->kctx; ++ struct base_jit_alloc_info *info; ++ struct kbase_va_region *reg; ++ struct kbase_vmap_struct mapping; ++ u64 *ptr, new_addr; + -+ if (0 == _mali_osk_get_compatible_name(&compatible_name)) { -+ if (0 == strncmp(compatible_name, "arm,mali-450", strlen("arm,mali-450"))) { -+ mali_is_450 = MALI_TRUE; -+ MALI_DEBUG_PRINT(2, ("mali-450 device tree detected.")); -+ } else if (0 == strncmp(compatible_name, "arm,mali-470", strlen("arm,mali-470"))) { -+ mali_is_470 = MALI_TRUE; -+ MALI_DEBUG_PRINT(2, ("mali-470 device tree detected.")); -+ } ++ if (katom->jit_blocked) { ++ list_del(&katom->queue); ++ katom->jit_blocked = false; + } + -+ for (i = 0; i < MALI_OSK_RESOURCE_WITH_IRQ_NUMBER; i++) { -+ res = platform_get_resource_byname(mali_platform_device, IORESOURCE_IRQ, mali_osk_resource_bank[i].irq_name); -+ if (res) { -+ mali_osk_resource_bank[i].irq = res->start; -+ } else { -+ mali_osk_resource_bank[i].base = MALI_OSK_INVALID_RESOURCE_ADDRESS; -+ } -+ } ++ info = (struct base_jit_alloc_info *) (uintptr_t) katom->jc; + -+ for (i = MALI_OSK_RESOURCE_PP_LOCATION_START; i <= MALI_OSK_RESOURCE_PP_LOCATION_END; i++) { -+ if (MALI_OSK_INVALID_RESOURCE_ADDRESS != mali_osk_resource_bank[i].base) { -+ pp_core_num++; -+ } ++ /* The JIT ID is still in use so fail the allocation */ ++ if (kctx->jit_alloc[info->id]) { ++ katom->event_code = BASE_JD_EVENT_MEM_GROWTH_FAILED; ++ return 0; + } + -+ /* We have to divide by 2, because we caculate twice for only one pp(pp_core and pp_mmu_core). */ -+ if (0 != pp_core_num % 2) { -+ MALI_DEBUG_PRINT(2, ("The value of pp core number isn't normal.")); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ /* Create a JIT allocation */ ++ reg = kbase_jit_allocate(kctx, info); ++ if (!reg) { ++ struct kbase_jd_atom *jit_atom; ++ bool can_block = false; + -+ pp_core_num /= 2; ++ lockdep_assert_held(&kctx->jctx.lock); + -+ /** -+ * we can caculate the number of l2 cache core according the number of pp core number -+ * and device type(mali400/mali450/mali470). -+ */ -+ l2_core_num = 1; -+ if (mali_is_450) { -+ if (pp_core_num > 4) { -+ l2_core_num = 3; -+ } else if (pp_core_num <= 4) { -+ l2_core_num = 2; -+ } -+ } ++ jit_atom = list_first_entry(&kctx->jit_atoms_head, ++ struct kbase_jd_atom, jit_node); + -+ for (i = MALI_OSK_RESOURCE_l2_LOCATION_END; i > MALI_OSK_RESOURCE_L2_LOCATION_START + l2_core_num - 1; i--) { -+ mali_osk_resource_bank[i].base = MALI_OSK_INVALID_RESOURCE_ADDRESS; -+ } ++ list_for_each_entry(jit_atom, &kctx->jit_atoms_head, jit_node) { ++ if (jit_atom == katom) ++ break; ++ if (jit_atom->core_req == BASE_JD_REQ_SOFT_JIT_FREE) { ++ u8 free_id = kbase_jit_free_get_id(jit_atom); + -+ /* If device is not mali-450 type, we have to remove related resource from resource bank. */ -+ if (!(mali_is_450 || mali_is_470)) { -+ for (i = MALI_OSK_RESOURCE_l2_LOCATION_END + 1; i < MALI_OSK_MAX_RESOURCE_NUMBER; i++) { -+ mali_osk_resource_bank[i].base = MALI_OSK_INVALID_RESOURCE_ADDRESS; ++ if (free_id && kctx->jit_alloc[free_id]) { ++ /* A JIT free which is active and ++ * submitted before this atom ++ */ ++ can_block = true; ++ break; ++ } ++ } + } -+ } + -+ if (mali_is_470) -+ mali_osk_resource_bank[MALI_OSK_RESOURCE_DMA_LOCATION].base = MALI_OSK_INVALID_RESOURCE_ADDRESS; ++ if (!can_block) { ++ /* Mark the allocation so we know it's in use even if ++ * the allocation itself fails. ++ */ ++ kctx->jit_alloc[info->id] = ++ (struct kbase_va_region *) -1; + -+ return _MALI_OSK_ERR_OK; -+} ++ katom->event_code = BASE_JD_EVENT_MEM_GROWTH_FAILED; ++ return 0; ++ } + -+_mali_osk_errcode_t _mali_osk_resource_find(u32 addr, _mali_osk_resource_t *res) -+{ -+ int i; ++ /* There are pending frees for an active allocation ++ * so we should wait to see whether they free the memory. ++ * Add to the beginning of the list to ensure that the atom is ++ * processed only once in kbase_jit_free_finish ++ */ ++ list_add(&katom->queue, &kctx->jit_pending_alloc); ++ katom->jit_blocked = true; + -+ if (NULL == mali_platform_device) { -+ return _MALI_OSK_ERR_ITEM_NOT_FOUND; ++ return 1; + } + -+ /* Traverse all of resources in resources bank to find the matching one. */ -+ for (i = 0; i < MALI_OSK_MAX_RESOURCE_NUMBER; i++) { -+ if (mali_osk_resource_bank[i].base == addr) { -+ if (NULL != res) { -+ res->base = addr + _mali_osk_resource_base_address(); -+ res->description = mali_osk_resource_bank[i].description; -+ res->irq = mali_osk_resource_bank[i].irq; -+ } -+ return _MALI_OSK_ERR_OK; -+ } ++ /* ++ * Write the address of the JIT allocation to the user provided ++ * GPU allocation. ++ */ ++ ptr = kbase_vmap(kctx, info->gpu_alloc_addr, sizeof(*ptr), ++ &mapping); ++ if (!ptr) { ++ /* ++ * Leave the allocation "live" as the JIT free jit will be ++ * submitted anyway. ++ */ ++ katom->event_code = BASE_JD_EVENT_JOB_INVALID; ++ return 0; + } + -+ return _MALI_OSK_ERR_ITEM_NOT_FOUND; ++ new_addr = reg->start_pfn << PAGE_SHIFT; ++ *ptr = new_addr; ++ KBASE_TLSTREAM_TL_ATTRIB_ATOM_JIT( ++ katom, info->gpu_alloc_addr, new_addr); ++ kbase_vunmap(kctx, &mapping); ++ ++ katom->event_code = BASE_JD_EVENT_DONE; ++ ++ /* ++ * Bind it to the user provided ID. Do this last so we can check for ++ * the JIT free racing this JIT alloc job. ++ */ ++ kctx->jit_alloc[info->id] = reg; ++ ++ return 0; +} + -+uintptr_t _mali_osk_resource_base_address(void) ++static void kbase_jit_allocate_finish(struct kbase_jd_atom *katom) +{ -+ struct resource *reg_res = NULL; -+ uintptr_t ret = 0; ++ struct base_jit_alloc_info *info; + -+ reg_res = platform_get_resource(mali_platform_device, IORESOURCE_MEM, 0); ++ lockdep_assert_held(&katom->kctx->jctx.lock); + -+ if (NULL != reg_res) { -+ ret = reg_res->start; ++ /* Remove atom from jit_atoms_head list */ ++ list_del(&katom->jit_node); ++ ++ if (katom->jit_blocked) { ++ list_del(&katom->queue); ++ katom->jit_blocked = false; + } + -+ return ret; ++ info = (struct base_jit_alloc_info *) (uintptr_t) katom->jc; ++ /* Free the info structure */ ++ kfree(info); +} + -+void _mali_osk_device_data_pmu_config_get(u16 *domain_config_array, int array_size) ++static int kbase_jit_free_prepare(struct kbase_jd_atom *katom) +{ -+ struct device_node *node = mali_platform_device->dev.of_node; -+ struct property *prop; -+ const __be32 *p; -+ int length = 0, i = 0; -+ u32 u; ++ struct kbase_context *kctx = katom->kctx; + -+ MALI_DEBUG_PRINT(2, ("Get pmu config from device tree configuration.\n")); ++ lockdep_assert_held(&kctx->jctx.lock); ++ list_add_tail(&katom->jit_node, &kctx->jit_atoms_head); + -+ MALI_DEBUG_ASSERT(NULL != node); ++ return 0; ++} + -+ if (!of_get_property(node, "pmu_domain_config", &length)) { -+ return; -+ } ++static void kbase_jit_free_process(struct kbase_jd_atom *katom) ++{ ++ struct kbase_context *kctx = katom->kctx; ++ u8 id = kbase_jit_free_get_id(katom); + -+ if (array_size != length / sizeof(u32)) { -+ MALI_PRINT_ERROR(("Wrong pmu domain config in device tree.")); ++ /* ++ * If the ID is zero or it is not in use yet then fail the job. ++ */ ++ if ((id == 0) || (kctx->jit_alloc[id] == NULL)) { ++ katom->event_code = BASE_JD_EVENT_JOB_INVALID; + return; + } + -+ of_property_for_each_u32(node, "pmu_domain_config", prop, p, u) { -+ domain_config_array[i] = (u16)u; -+ i++; -+ } ++ /* ++ * If the ID is valid but the allocation request failed still succeed ++ * this soft job but don't try and free the allocation. ++ */ ++ if (kctx->jit_alloc[id] != (struct kbase_va_region *) -1) ++ kbase_jit_free(kctx, kctx->jit_alloc[id]); + -+ return; ++ kctx->jit_alloc[id] = NULL; +} + -+u32 _mali_osk_get_pmu_switch_delay(void) ++static void kbasep_jit_free_finish_worker(struct work_struct *work) +{ -+ struct device_node *node = mali_platform_device->dev.of_node; -+ u32 switch_delay; -+ -+ MALI_DEBUG_ASSERT(NULL != node); ++ struct kbase_jd_atom *katom = container_of(work, struct kbase_jd_atom, ++ work); ++ struct kbase_context *kctx = katom->kctx; ++ int resched; + -+ if (0 == of_property_read_u32(node, "pmu_switch_delay", &switch_delay)) { -+ return switch_delay; -+ } else { -+ MALI_DEBUG_PRINT(2, ("Couldn't find pmu_switch_delay in device tree configuration.\n")); -+ } ++ mutex_lock(&kctx->jctx.lock); ++ kbase_finish_soft_job(katom); ++ resched = jd_done_nolock(katom, NULL); ++ mutex_unlock(&kctx->jctx.lock); + -+ return 0; ++ if (resched) ++ kbase_js_sched_all(kctx->kbdev); +} + -+#else /* CONFIG_MALI_DT */ /* 若未 定义 CONFIG_MALI_DT. */ -+ -+_mali_osk_errcode_t _mali_osk_resource_find(u32 addr, _mali_osk_resource_t *res) ++static void kbase_jit_free_finish(struct kbase_jd_atom *katom) +{ -+ int i; -+ uintptr_t phys_addr; ++ struct list_head *i, *tmp; ++ struct kbase_context *kctx = katom->kctx; + -+ if (NULL == mali_platform_device) { -+ /* Not connected to a device */ -+ return _MALI_OSK_ERR_ITEM_NOT_FOUND; -+ } -+ -+ phys_addr = addr + _mali_osk_resource_base_address(); -+ for (i = 0; i < mali_platform_device->num_resources; i++) { -+ if (IORESOURCE_MEM == resource_type(&(mali_platform_device->resource[i])) && -+ mali_platform_device->resource[i].start == phys_addr) { -+ if (NULL != res) { -+ res->base = phys_addr; -+ res->description = mali_platform_device->resource[i].name; ++ lockdep_assert_held(&kctx->jctx.lock); ++ /* Remove this atom from the kctx->jit_atoms_head list */ ++ list_del(&katom->jit_node); + -+ /* Any (optional) IRQ resource belonging to this resource will follow */ -+ if ((i + 1) < mali_platform_device->num_resources && -+ IORESOURCE_IRQ == resource_type(&(mali_platform_device->resource[i + 1]))) { -+ res->irq = mali_platform_device->resource[i + 1].start; -+ } else { -+ res->irq = -1; -+ } -+ } -+ return _MALI_OSK_ERR_OK; ++ list_for_each_safe(i, tmp, &kctx->jit_pending_alloc) { ++ struct kbase_jd_atom *pending_atom = list_entry(i, ++ struct kbase_jd_atom, queue); ++ if (kbase_jit_allocate_process(pending_atom) == 0) { ++ /* Atom has completed */ ++ INIT_WORK(&pending_atom->work, ++ kbasep_jit_free_finish_worker); ++ queue_work(kctx->jctx.job_done_wq, &pending_atom->work); + } + } -+ -+ return _MALI_OSK_ERR_ITEM_NOT_FOUND; +} + -+uintptr_t _mali_osk_resource_base_address(void) ++static int kbase_ext_res_prepare(struct kbase_jd_atom *katom) +{ -+ uintptr_t lowest_addr = (uintptr_t)(0 - 1); -+ uintptr_t ret = 0; ++ __user struct base_external_resource_list *user_ext_res; ++ struct base_external_resource_list *ext_res; ++ u64 count = 0; ++ size_t copy_size; ++ int ret; + -+ if (NULL != mali_platform_device) { -+ int i; -+ for (i = 0; i < mali_platform_device->num_resources; i++) { -+ if (mali_platform_device->resource[i].flags & IORESOURCE_MEM && -+ mali_platform_device->resource[i].start < lowest_addr) { -+ lowest_addr = mali_platform_device->resource[i].start; -+ ret = lowest_addr; -+ } -+ } ++ user_ext_res = (__user struct base_external_resource_list *) ++ (uintptr_t) katom->jc; ++ ++ /* Fail the job if there is no info structure */ ++ if (!user_ext_res) { ++ ret = -EINVAL; ++ goto fail; + } + -+ return ret; -+} ++ if (copy_from_user(&count, &user_ext_res->count, sizeof(u64)) != 0) { ++ ret = -EINVAL; ++ goto fail; ++ } + -+void _mali_osk_device_data_pmu_config_get(u16 *domain_config_array, int array_size) -+{ -+ _mali_osk_device_data data = { 0, }; ++ /* Is the number of external resources in range? */ ++ if (!count || count > BASE_EXT_RES_COUNT_MAX) { ++ ret = -EINVAL; ++ goto fail; ++ } + -+ MALI_DEBUG_PRINT(2, ("Get pmu config from platform device data.\n")); -+ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { -+ /* Copy the custom customer power domain config */ -+ _mali_osk_memcpy(domain_config_array, data.pmu_domain_config, sizeof(data.pmu_domain_config)); ++ /* Copy the information for safe access and future storage */ ++ copy_size = sizeof(*ext_res); ++ copy_size += sizeof(struct base_external_resource) * (count - 1); ++ ext_res = kzalloc(copy_size, GFP_KERNEL); ++ if (!ext_res) { ++ ret = -ENOMEM; ++ goto fail; + } + -+ return; ++ if (copy_from_user(ext_res, user_ext_res, copy_size) != 0) { ++ ret = -EINVAL; ++ goto free_info; ++ } ++ ++ /* ++ * Overwrite the count with the first value incase it was changed ++ * after the fact. ++ */ ++ ext_res->count = count; ++ ++ /* ++ * Replace the user pointer with our kernel allocated ++ * ext_res structure. ++ */ ++ katom->jc = (u64)(uintptr_t) ext_res; ++ ++ return 0; ++ ++free_info: ++ kfree(ext_res); ++fail: ++ return ret; +} + -+u32 _mali_osk_get_pmu_switch_delay(void) ++static void kbase_ext_res_process(struct kbase_jd_atom *katom, bool map) +{ -+ _mali_osk_errcode_t err; -+ _mali_osk_device_data data = { 0, }; ++ struct base_external_resource_list *ext_res; ++ int i; ++ bool failed = false; + -+ err = _mali_osk_device_data_get(&data); ++ ext_res = (struct base_external_resource_list *) (uintptr_t) katom->jc; ++ if (!ext_res) ++ goto failed_jc; + -+ if (_MALI_OSK_ERR_OK == err) { -+ return data.pmu_switch_delay; ++ kbase_gpu_vm_lock(katom->kctx); ++ ++ for (i = 0; i < ext_res->count; i++) { ++ u64 gpu_addr; ++ ++ gpu_addr = ext_res->ext_res[i].ext_resource & ++ ~BASE_EXT_RES_ACCESS_EXCLUSIVE; ++ if (map) { ++ if (!kbase_sticky_resource_acquire(katom->kctx, ++ gpu_addr)) ++ goto failed_loop; ++ } else ++ if (!kbase_sticky_resource_release(katom->kctx, NULL, ++ gpu_addr)) ++ failed = true; + } + -+ return 0; -+} -+#endif /* CONFIG_MALI_DT */ ++ /* ++ * In the case of unmap we continue unmapping other resources in the ++ * case of failure but will always report failure if _any_ unmap ++ * request fails. ++ */ ++ if (failed) ++ katom->event_code = BASE_JD_EVENT_JOB_INVALID; ++ else ++ katom->event_code = BASE_JD_EVENT_DONE; + -+_mali_osk_errcode_t _mali_osk_device_data_get(_mali_osk_device_data *data) -+{ -+ MALI_DEBUG_ASSERT_POINTER(data); ++ kbase_gpu_vm_unlock(katom->kctx); + -+ if (NULL != mali_platform_device) { -+ struct mali_gpu_device_data *os_data = NULL; ++ return; + -+ os_data = (struct mali_gpu_device_data *)mali_platform_device->dev.platform_data; -+ if (NULL != os_data) { -+ /* Copy data from OS dependant struct to Mali neutral struct (identical!) */ -+ BUILD_BUG_ON(sizeof(*os_data) != sizeof(*data)); -+ _mali_osk_memcpy(data, os_data, sizeof(*os_data)); ++failed_loop: ++ while (--i > 0) { ++ u64 gpu_addr; + -+ return _MALI_OSK_ERR_OK; -+ } ++ gpu_addr = ext_res->ext_res[i].ext_resource & ++ ~BASE_EXT_RES_ACCESS_EXCLUSIVE; ++ ++ kbase_sticky_resource_release(katom->kctx, NULL, gpu_addr); + } + -+ return _MALI_OSK_ERR_ITEM_NOT_FOUND; ++ katom->event_code = BASE_JD_EVENT_JOB_INVALID; ++ kbase_gpu_vm_unlock(katom->kctx); ++ ++failed_jc: ++ return; +} + -+u32 _mali_osk_identify_gpu_resource(void) ++static void kbase_ext_res_finish(struct kbase_jd_atom *katom) +{ -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI_OFFSET_L2_RESOURCE1, NULL)) -+ /* Mali 450 */ -+ return 0x450; -+ -+ if (_MALI_OSK_ERR_OK == _mali_osk_resource_find(MALI_OFFSET_DLBU, NULL)) -+ /* Mali 470 */ -+ return 0x470; ++ struct base_external_resource_list *ext_res; + -+ /* Mali 400 */ -+ return 0x400; ++ ext_res = (struct base_external_resource_list *) (uintptr_t) katom->jc; ++ /* Free the info structure */ ++ kfree(ext_res); +} + -+mali_bool _mali_osk_shared_interrupts(void) ++int kbase_process_soft_job(struct kbase_jd_atom *katom) +{ -+ u32 irqs[128]; -+ u32 i, j, irq, num_irqs_found = 0; ++ switch (katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { ++ case BASE_JD_REQ_SOFT_DUMP_CPU_GPU_TIME: ++ return kbase_dump_cpu_gpu_time(katom); + -+ MALI_DEBUG_ASSERT_POINTER(mali_platform_device); -+ MALI_DEBUG_ASSERT(128 >= mali_platform_device->num_resources); ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ case BASE_JD_REQ_SOFT_FENCE_TRIGGER: ++ katom->event_code = kbase_sync_fence_out_trigger(katom, ++ katom->event_code == BASE_JD_EVENT_DONE ? ++ 0 : -EFAULT); ++ break; ++ case BASE_JD_REQ_SOFT_FENCE_WAIT: ++ { ++ int ret = kbase_sync_fence_in_wait(katom); + -+ for (i = 0; i < mali_platform_device->num_resources; i++) { -+ if (IORESOURCE_IRQ & mali_platform_device->resource[i].flags) { -+ irq = mali_platform_device->resource[i].start; ++ if (ret == 1) { ++#ifdef CONFIG_MALI_FENCE_DEBUG ++ kbasep_add_waiting_with_timeout(katom); ++#else ++ kbasep_add_waiting_soft_job(katom); ++#endif ++ } ++ return ret; ++ } ++#endif + -+ for (j = 0; j < num_irqs_found; ++j) { -+ if (irq == irqs[j]) { -+ return MALI_TRUE; -+ } -+ } ++ case BASE_JD_REQ_SOFT_REPLAY: ++ return kbase_replay_process(katom); ++ case BASE_JD_REQ_SOFT_EVENT_WAIT: ++ return kbasep_soft_event_wait(katom); ++ case BASE_JD_REQ_SOFT_EVENT_SET: ++ kbasep_soft_event_update_locked(katom, BASE_JD_SOFT_EVENT_SET); ++ break; ++ case BASE_JD_REQ_SOFT_EVENT_RESET: ++ kbasep_soft_event_update_locked(katom, BASE_JD_SOFT_EVENT_RESET); ++ break; ++ case BASE_JD_REQ_SOFT_DEBUG_COPY: ++ { ++ int res = kbase_debug_copy(katom); + -+ irqs[num_irqs_found++] = irq; -+ } ++ if (res) ++ katom->event_code = BASE_JD_EVENT_JOB_INVALID; ++ break; ++ } ++ case BASE_JD_REQ_SOFT_JIT_ALLOC: ++ return kbase_jit_allocate_process(katom); ++ case BASE_JD_REQ_SOFT_JIT_FREE: ++ kbase_jit_free_process(katom); ++ break; ++ case BASE_JD_REQ_SOFT_EXT_RES_MAP: ++ kbase_ext_res_process(katom, true); ++ break; ++ case BASE_JD_REQ_SOFT_EXT_RES_UNMAP: ++ kbase_ext_res_process(katom, false); ++ break; + } + -+ return MALI_FALSE; ++ /* Atom is complete */ ++ return 0; +} + -+_mali_osk_errcode_t _mali_osk_gpu_secure_mode_init(void) ++void kbase_cancel_soft_job(struct kbase_jd_atom *katom) +{ -+ _mali_osk_device_data data = { 0, }; ++ switch (katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ case BASE_JD_REQ_SOFT_FENCE_WAIT: ++ kbase_sync_fence_in_cancel_wait(katom); ++ break; ++#endif ++ case BASE_JD_REQ_SOFT_EVENT_WAIT: ++ kbasep_soft_event_cancel_job(katom); ++ break; ++ default: ++ /* This soft-job doesn't support cancellation! */ ++ KBASE_DEBUG_ASSERT(0); ++ } ++} + -+ if (_MALI_OSK_ERR_OK == _mali_osk_device_data_get(&data)) { -+ if ((NULL != data.secure_mode_init) && (NULL != data.secure_mode_deinit) -+ && (NULL != data.gpu_reset_and_secure_mode_enable) && (NULL != data.gpu_reset_and_secure_mode_disable)) { -+ int err = data.secure_mode_init(); -+ if (err) { -+ MALI_DEBUG_PRINT(1, ("Failed to init gpu secure mode.\n")); -+ return _MALI_OSK_ERR_FAULT; ++int kbase_prepare_soft_job(struct kbase_jd_atom *katom) ++{ ++ switch (katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { ++ case BASE_JD_REQ_SOFT_DUMP_CPU_GPU_TIME: ++ { ++ if (0 != (katom->jc & KBASE_CACHE_ALIGNMENT_MASK)) ++ return -EINVAL; ++ } ++ break; ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ case BASE_JD_REQ_SOFT_FENCE_TRIGGER: ++ { ++ struct base_fence fence; ++ int fd; ++ ++ if (0 != copy_from_user(&fence, (__user void *)(uintptr_t) katom->jc, sizeof(fence))) ++ return -EINVAL; ++ ++ fd = kbase_sync_fence_out_create(katom, ++ fence.basep.stream_fd); ++ if (fd < 0) ++ return -EINVAL; ++ ++ fence.basep.fd = fd; ++ if (0 != copy_to_user((__user void *)(uintptr_t) katom->jc, &fence, sizeof(fence))) { ++ kbase_sync_fence_out_remove(katom); ++ kbase_sync_fence_close_fd(fd); ++ fence.basep.fd = -EINVAL; ++ return -EINVAL; + } ++ } ++ break; ++ case BASE_JD_REQ_SOFT_FENCE_WAIT: ++ { ++ struct base_fence fence; ++ int ret; + -+ mali_secure_mode_deinit = data.secure_mode_deinit; -+ mali_gpu_reset_and_secure_mode_enable = data.gpu_reset_and_secure_mode_enable; -+ mali_gpu_reset_and_secure_mode_disable = data.gpu_reset_and_secure_mode_disable; ++ if (0 != copy_from_user(&fence, (__user void *)(uintptr_t) katom->jc, sizeof(fence))) ++ return -EINVAL; + -+ mali_secure_mode_supported = MALI_TRUE; -+ mali_secure_mode_enabled = MALI_FALSE; -+ return _MALI_OSK_ERR_OK; ++ /* Get a reference to the fence object */ ++ ret = kbase_sync_fence_in_from_fd(katom, ++ fence.basep.fd); ++ if (ret < 0) ++ return ret; ++ ++#ifdef CONFIG_MALI_DMA_FENCE ++ /* ++ * Set KCTX_NO_IMPLICIT_FENCE in the context the first ++ * time a soft fence wait job is observed. This will ++ * prevent the implicit dma-buf fence to conflict with ++ * the Android native sync fences. ++ */ ++ if (!kbase_ctx_flag(katom->kctx, KCTX_NO_IMPLICIT_SYNC)) ++ kbase_ctx_flag_set(katom->kctx, KCTX_NO_IMPLICIT_SYNC); ++#endif /* CONFIG_MALI_DMA_FENCE */ + } ++ break; ++#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ ++ case BASE_JD_REQ_SOFT_JIT_ALLOC: ++ return kbase_jit_allocate_prepare(katom); ++ case BASE_JD_REQ_SOFT_REPLAY: ++ break; ++ case BASE_JD_REQ_SOFT_JIT_FREE: ++ return kbase_jit_free_prepare(katom); ++ case BASE_JD_REQ_SOFT_EVENT_WAIT: ++ case BASE_JD_REQ_SOFT_EVENT_SET: ++ case BASE_JD_REQ_SOFT_EVENT_RESET: ++ if (katom->jc == 0) ++ return -EINVAL; ++ break; ++ case BASE_JD_REQ_SOFT_DEBUG_COPY: ++ return kbase_debug_copy_prepare(katom); ++ case BASE_JD_REQ_SOFT_EXT_RES_MAP: ++ return kbase_ext_res_prepare(katom); ++ case BASE_JD_REQ_SOFT_EXT_RES_UNMAP: ++ return kbase_ext_res_prepare(katom); ++ default: ++ /* Unsupported soft-job */ ++ return -EINVAL; + } -+ MALI_DEBUG_PRINT(3, ("GPU secure mode not supported.\n")); -+ return _MALI_OSK_ERR_UNSUPPORTED; -+ ++ return 0; +} + -+_mali_osk_errcode_t _mali_osk_gpu_secure_mode_deinit(void) ++void kbase_finish_soft_job(struct kbase_jd_atom *katom) +{ -+ if (NULL != mali_secure_mode_deinit) { -+ mali_secure_mode_deinit(); -+ mali_secure_mode_enabled = MALI_FALSE; -+ mali_secure_mode_supported = MALI_FALSE; -+ return _MALI_OSK_ERR_OK; ++ switch (katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) { ++ case BASE_JD_REQ_SOFT_DUMP_CPU_GPU_TIME: ++ /* Nothing to do */ ++ break; ++#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) ++ case BASE_JD_REQ_SOFT_FENCE_TRIGGER: ++ /* If fence has not yet been signaled, do it now */ ++ kbase_sync_fence_out_trigger(katom, katom->event_code == ++ BASE_JD_EVENT_DONE ? 0 : -EFAULT); ++ break; ++ case BASE_JD_REQ_SOFT_FENCE_WAIT: ++ /* Release katom's reference to fence object */ ++ kbase_sync_fence_in_remove(katom); ++ break; ++#endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ ++ case BASE_JD_REQ_SOFT_DEBUG_COPY: ++ kbase_debug_copy_finish(katom); ++ break; ++ case BASE_JD_REQ_SOFT_JIT_ALLOC: ++ kbase_jit_allocate_finish(katom); ++ break; ++ case BASE_JD_REQ_SOFT_EXT_RES_MAP: ++ kbase_ext_res_finish(katom); ++ break; ++ case BASE_JD_REQ_SOFT_EXT_RES_UNMAP: ++ kbase_ext_res_finish(katom); ++ break; ++ case BASE_JD_REQ_SOFT_JIT_FREE: ++ kbase_jit_free_finish(katom); ++ break; + } -+ MALI_DEBUG_PRINT(3, ("GPU secure mode not supported.\n")); -+ return _MALI_OSK_ERR_UNSUPPORTED; -+ +} + -+ -+_mali_osk_errcode_t _mali_osk_gpu_reset_and_secure_mode_enable(void) ++void kbase_resume_suspended_soft_jobs(struct kbase_device *kbdev) +{ -+ /* the mali executor lock must be held before enter this function. */ ++ LIST_HEAD(local_suspended_soft_jobs); ++ struct kbase_jd_atom *tmp_iter; ++ struct kbase_jd_atom *katom_iter; ++ struct kbasep_js_device_data *js_devdata; ++ bool resched = false; + -+ MALI_DEBUG_ASSERT(MALI_FALSE == mali_secure_mode_enabled); ++ KBASE_DEBUG_ASSERT(kbdev); + -+ if (NULL != mali_gpu_reset_and_secure_mode_enable) { -+ if (mali_gpu_reset_and_secure_mode_enable()) { -+ MALI_DEBUG_PRINT(1, ("Failed to reset GPU or enable gpu secure mode.\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ mali_secure_mode_enabled = MALI_TRUE; -+ return _MALI_OSK_ERR_OK; -+ } -+ MALI_DEBUG_PRINT(1, ("GPU secure mode not supported.\n")); -+ return _MALI_OSK_ERR_UNSUPPORTED; -+} ++ js_devdata = &kbdev->js_data; + -+_mali_osk_errcode_t _mali_osk_gpu_reset_and_secure_mode_disable(void) -+{ -+ /* the mali executor lock must be held before enter this function. */ ++ /* Move out the entire list */ ++ mutex_lock(&js_devdata->runpool_mutex); ++ list_splice_init(&js_devdata->suspended_soft_jobs_list, ++ &local_suspended_soft_jobs); ++ mutex_unlock(&js_devdata->runpool_mutex); + -+ MALI_DEBUG_ASSERT(MALI_TRUE == mali_secure_mode_enabled); ++ /* ++ * Each atom must be detached from the list and ran separately - ++ * it could be re-added to the old list, but this is unlikely ++ */ ++ list_for_each_entry_safe(katom_iter, tmp_iter, ++ &local_suspended_soft_jobs, dep_item[1]) { ++ struct kbase_context *kctx = katom_iter->kctx; + -+ if (NULL != mali_gpu_reset_and_secure_mode_disable) { -+ if (mali_gpu_reset_and_secure_mode_disable()) { -+ MALI_DEBUG_PRINT(1, ("Failed to reset GPU or disable gpu secure mode.\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ mali_secure_mode_enabled = MALI_FALSE; ++ mutex_lock(&kctx->jctx.lock); + -+ return _MALI_OSK_ERR_OK; ++ /* Remove from the global list */ ++ list_del(&katom_iter->dep_item[1]); ++ /* Remove from the context's list of waiting soft jobs */ ++ kbasep_remove_waiting_soft_job(katom_iter); ++ ++ if (kbase_process_soft_job(katom_iter) == 0) { ++ kbase_finish_soft_job(katom_iter); ++ resched |= jd_done_nolock(katom_iter, NULL); ++ } else { ++ KBASE_DEBUG_ASSERT((katom_iter->core_req & ++ BASE_JD_REQ_SOFT_JOB_TYPE) ++ != BASE_JD_REQ_SOFT_REPLAY); ++ } + ++ mutex_unlock(&kctx->jctx.lock); + } -+ MALI_DEBUG_PRINT(1, ("GPU secure mode not supported.\n")); -+ return _MALI_OSK_ERR_UNSUPPORTED; + ++ if (resched) ++ kbase_js_sched_all(kbdev); +} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_strings.c b/drivers/gpu/arm/midgard/mali_kbase_strings.c +new file mode 100755 +index 000000000..c98762cec +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_strings.c +@@ -0,0 +1,23 @@ ++ /* ++ * ++ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+mali_bool _mali_osk_gpu_secure_mode_is_enabled(void) -+{ -+ return mali_secure_mode_enabled; -+} + -+mali_bool _mali_osk_gpu_secure_mode_is_supported(void) -+{ -+ return mali_secure_mode_supported; -+} ++#include "mali_kbase_strings.h" + ++#define KBASE_DRV_NAME "mali" ++#define KBASE_TIMELINE_NAME KBASE_DRV_NAME ".timeline" + -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c ++const char kbase_drv_name[] = KBASE_DRV_NAME; ++const char kbase_timeline_name[] = KBASE_TIMELINE_NAME; +diff --git a/drivers/gpu/arm/midgard/mali_kbase_strings.h b/drivers/gpu/arm/midgard/mali_kbase_strings.h new file mode 100755 -index 000000000000..0b2d00762771 +index 000000000..41b8fdbec --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c -@@ -0,0 +1,27 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_strings.h +@@ -0,0 +1,19 @@ +/* -+ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+/** -+ * @file mali_osk_math.c -+ * Implementation of the OS abstraction layer for the kernel device driver ++ * ++ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include "mali_osk.h" -+#include + -+u32 _mali_osk_clz(u32 input) -+{ -+ return 32 - fls(input); -+} + -+u32 _mali_osk_fls(u32 input) -+{ -+ return fls(input); -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c ++extern const char kbase_drv_name[]; ++extern const char kbase_timeline_name[]; +diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync.h b/drivers/gpu/arm/midgard/mali_kbase_sync.h new file mode 100755 -index 000000000000..174616b566c4 +index 000000000..33b580595 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c -@@ -0,0 +1,61 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_sync.h +@@ -0,0 +1,203 @@ +/* -+ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + ++ ++ +/** -+ * @file mali_osk_memory.c -+ * Implementation of the OS abstraction layer for the kernel device driver ++ * @file mali_kbase_sync.h ++ * ++ * This file contains our internal "API" for explicit fences. ++ * It hides the implementation details of the actual explicit fence mechanism ++ * used (Android fences or sync file with DMA fences). + */ + -+#include "mali_osk.h" -+#include -+#include ++#ifndef MALI_KBASE_SYNC_H ++#define MALI_KBASE_SYNC_H + -+void inline *_mali_osk_calloc(u32 n, u32 size) -+{ -+ return kcalloc(n, size, GFP_KERNEL); -+} ++#include ++#ifdef CONFIG_SYNC ++#include ++#endif ++#ifdef CONFIG_SYNC_FILE ++#include "mali_kbase_fence_defs.h" ++#include ++#endif + -+void inline *_mali_osk_malloc(u32 size) -+{ -+ return kmalloc(size, GFP_KERNEL); -+} ++#include "mali_kbase.h" + -+void inline _mali_osk_free(void *ptr) -+{ -+ kfree(ptr); -+} ++/** ++ * struct kbase_sync_fence_info - Information about a fence ++ * @fence: Pointer to fence (type is void*, as underlaying struct can differ) ++ * @name: The name given to this fence when it was created ++ * @status: < 0 means error, 0 means active, 1 means signaled ++ * ++ * Use kbase_sync_fence_in_info_get() or kbase_sync_fence_out_info_get() ++ * to get the information. ++ */ ++struct kbase_sync_fence_info { ++ void *fence; ++ char name[32]; ++ int status; ++}; + -+void inline *_mali_osk_valloc(u32 size) -+{ -+ return vmalloc(size); -+} ++/** ++ * kbase_sync_fence_stream_create() - Create a stream object ++ * @name: Name of stream (only used to ease debugging/visualization) ++ * @out_fd: A file descriptor representing the created stream object ++ * ++ * Can map down to a timeline implementation in some implementations. ++ * Exposed as a file descriptor. ++ * Life-time controlled via the file descriptor: ++ * - dup to add a ref ++ * - close to remove a ref ++ * ++ * return: 0 on success, < 0 on error ++ */ ++int kbase_sync_fence_stream_create(const char *name, int *const out_fd); + -+void inline _mali_osk_vfree(void *ptr) -+{ -+ vfree(ptr); -+} ++/** ++ * kbase_sync_fence_out_create Create an explicit output fence to specified atom ++ * @katom: Atom to assign the new explicit fence to ++ * @stream_fd: File descriptor for stream object to create fence on ++ * ++ * return: Valid file descriptor to fence or < 0 on error ++ */ ++int kbase_sync_fence_out_create(struct kbase_jd_atom *katom, int stream_fd); + -+void inline *_mali_osk_memcpy(void *dst, const void *src, u32 len) -+{ -+ return memcpy(dst, src, len); -+} ++/** ++ * kbase_sync_fence_in_from_fd() Assigns an existing fence to specified atom ++ * @katom: Atom to assign the existing explicit fence to ++ * @fd: File descriptor to an existing fence ++ * ++ * Assigns an explicit input fence to atom. ++ * This can later be waited for by calling @kbase_sync_fence_in_wait ++ * ++ * return: 0 on success, < 0 on error ++ */ ++int kbase_sync_fence_in_from_fd(struct kbase_jd_atom *katom, int fd); + -+void inline *_mali_osk_memset(void *s, u32 c, u32 n) -+{ -+ return memset(s, c, n); -+} ++/** ++ * kbase_sync_fence_validate() - Validate a fd to be a valid fence ++ * @fd: File descriptor to check ++ * ++ * This function is only usable to catch unintentional user errors early, ++ * it does not stop malicious code changing the fd after this function returns. ++ * ++ * return 0: if fd is for a valid fence, < 0 if invalid ++ */ ++int kbase_sync_fence_validate(int fd); + -+mali_bool _mali_osk_mem_check_allocated(u32 max_allocated) ++/** ++ * kbase_sync_fence_out_trigger - Signal explicit output fence attached on katom ++ * @katom: Atom with an explicit fence to signal ++ * @result: < 0 means signal with error, 0 >= indicates success ++ * ++ * Signal output fence attached on katom and remove the fence from the atom. ++ * ++ * return: The "next" event code for atom, typically JOB_CANCELLED or EVENT_DONE ++ */ ++enum base_jd_event_code ++kbase_sync_fence_out_trigger(struct kbase_jd_atom *katom, int result); ++ ++/** ++ * kbase_sync_fence_in_wait() - Wait for explicit input fence to be signaled ++ * @katom: Atom with explicit fence to wait for ++ * ++ * If the fence is already signaled, then 0 is returned, and the caller must ++ * continue processing of the katom. ++ * ++ * If the fence isn't already signaled, then this kbase_sync framework will ++ * take responsibility to continue the processing once the fence is signaled. ++ * ++ * return: 0 if already signaled, otherwise 1 ++ */ ++int kbase_sync_fence_in_wait(struct kbase_jd_atom *katom); ++ ++/** ++ * kbase_sync_fence_in_cancel_wait() - Cancel explicit input fence waits ++ * @katom: Atom to cancel wait for ++ * ++ * This function is fully responsible for continuing processing of this atom ++ * (remove_waiting_soft_job + finish_soft_job + jd_done + js_sched_all) ++ */ ++void kbase_sync_fence_in_cancel_wait(struct kbase_jd_atom *katom); ++ ++/** ++ * kbase_sync_fence_in_remove() - Remove the input fence from the katom ++ * @katom: Atom to remove explicit input fence for ++ * ++ * This will also release the corresponding reference. ++ */ ++void kbase_sync_fence_in_remove(struct kbase_jd_atom *katom); ++ ++/** ++ * kbase_sync_fence_out_remove() - Remove the output fence from the katom ++ * @katom: Atom to remove explicit output fence for ++ * ++ * This will also release the corresponding reference. ++ */ ++void kbase_sync_fence_out_remove(struct kbase_jd_atom *katom); ++ ++/** ++ * kbase_sync_fence_close_fd() - Close a file descriptor representing a fence ++ * @fd: File descriptor to close ++ */ ++static inline void kbase_sync_fence_close_fd(int fd) +{ -+ /* No need to prevent an out-of-memory dialogue appearing on Linux, -+ * so we always return MALI_TRUE. -+ */ -+ return MALI_TRUE; ++ ksys_close(fd); +} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c ++ ++/** ++ * kbase_sync_fence_in_info_get() - Retrieves information about input fence ++ * @katom: Atom to get fence information from ++ * @info: Struct to be filled with fence information ++ * ++ * return: 0 on success, < 0 on error ++ */ ++int kbase_sync_fence_in_info_get(struct kbase_jd_atom *katom, ++ struct kbase_sync_fence_info *info); ++ ++/** ++ * kbase_sync_fence_out_info_get() - Retrieves information about output fence ++ * @katom: Atom to get fence information from ++ * @info: Struct to be filled with fence information ++ * ++ * return: 0 on success, < 0 on error ++ */ ++int kbase_sync_fence_out_info_get(struct kbase_jd_atom *katom, ++ struct kbase_sync_fence_info *info); ++ ++/** ++ * kbase_sync_status_string() - Get string matching @status ++ * @status: Value of fence status. ++ * ++ * return: Pointer to string describing @status. ++ */ ++const char *kbase_sync_status_string(int status); ++ ++/* ++ * Internal worker used to continue processing of atom. ++ */ ++void kbase_sync_fence_wait_worker(struct work_struct *data); ++ ++#ifdef CONFIG_MALI_FENCE_DEBUG ++/** ++ * kbase_sync_fence_in_dump() Trigger a debug dump of atoms input fence state ++ * @katom: Atom to trigger fence debug dump for ++ */ ++void kbase_sync_fence_in_dump(struct kbase_jd_atom *katom); ++#endif ++ ++#endif /* MALI_KBASE_SYNC_H */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_android.c b/drivers/gpu/arm/midgard/mali_kbase_sync_android.c new file mode 100755 -index 000000000000..9845187f8122 +index 000000000..d7349dcae --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c -@@ -0,0 +1,81 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_sync_android.c +@@ -0,0 +1,537 @@ +/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+/** -+ * @file mali_osk_misc.c -+ * Implementation of the OS abstraction layer for the kernel device driver ++ ++ ++/* ++ * Code for supporting explicit Android fences (CONFIG_SYNC) ++ * Known to be good for kernels 4.5 and earlier. ++ * Replaced with CONFIG_SYNC_FILE for 4.9 and later kernels ++ * (see mali_kbase_sync_file.c) + */ -+#include -+#include -+#include ++ +#include -+#include ++#include ++#include ++#include +#include -+#include "mali_osk.h" -+ -+#if !defined(CONFIG_MALI_QUIET) -+void _mali_osk_dbgmsg(const char *fmt, ...) -+{ -+ va_list args; -+ va_start(args, fmt); -+ vprintk(fmt, args); -+ va_end(args); -+} -+#endif /* !defined(CONFIG_MALI_QUIET) */ -+ -+u32 _mali_osk_snprintf(char *buf, u32 size, const char *fmt, ...) -+{ -+ int res; -+ va_list args; -+ va_start(args, fmt); ++#include ++#include ++#include "sync.h" ++#include ++#include + -+ res = vscnprintf(buf, (size_t)size, fmt, args); ++struct mali_sync_timeline { ++ struct sync_timeline timeline; ++ atomic_t counter; ++ atomic_t signaled; ++}; + -+ va_end(args); -+ return res; -+} ++struct mali_sync_pt { ++ struct sync_pt pt; ++ int order; ++ int result; ++}; + -+void _mali_osk_abort(void) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) ++/* For backwards compatibility with kernels before 3.17. After 3.17 ++ * sync_pt_parent is included in the kernel. */ ++static inline struct sync_timeline *sync_pt_parent(struct sync_pt *pt) +{ -+ /* make a simple fault by dereferencing a NULL pointer */ -+ dump_stack(); -+ *(volatile int *)0 = 0; ++ return pt->parent; +} ++#endif + -+void _mali_osk_break(void) ++static struct mali_sync_timeline *to_mali_sync_timeline( ++ struct sync_timeline *timeline) +{ -+ _mali_osk_abort(); ++ return container_of(timeline, struct mali_sync_timeline, timeline); +} + -+u32 _mali_osk_get_pid(void) ++static struct mali_sync_pt *to_mali_sync_pt(struct sync_pt *pt) +{ -+ /* Thread group ID is the process ID on Linux */ -+ return (u32)current->tgid; ++ return container_of(pt, struct mali_sync_pt, pt); +} + -+char *_mali_osk_get_comm(void) ++static struct sync_pt *timeline_dup(struct sync_pt *pt) +{ -+ return (char *)current->comm; -+} ++ struct mali_sync_pt *mpt = to_mali_sync_pt(pt); ++ struct mali_sync_pt *new_mpt; ++ struct sync_pt *new_pt = sync_pt_create(sync_pt_parent(pt), ++ sizeof(struct mali_sync_pt)); + ++ if (!new_pt) ++ return NULL; + -+u32 _mali_osk_get_tid(void) ++ new_mpt = to_mali_sync_pt(new_pt); ++ new_mpt->order = mpt->order; ++ new_mpt->result = mpt->result; ++ ++ return new_pt; ++} ++ ++static int timeline_has_signaled(struct sync_pt *pt) +{ -+ /* pid is actually identifying the thread on Linux */ -+ u32 tid = current->pid; ++ struct mali_sync_pt *mpt = to_mali_sync_pt(pt); ++ struct mali_sync_timeline *mtl = to_mali_sync_timeline( ++ sync_pt_parent(pt)); ++ int result = mpt->result; + -+ /* If the pid is 0 the core was idle. Instead of returning 0 we return a special number -+ * identifying which core we are on. */ -+ if (0 == tid) { -+ tid = -(1 + raw_smp_processor_id()); -+ } ++ int diff = atomic_read(&mtl->signaled) - mpt->order; + -+ return tid; -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c -new file mode 100755 -index 000000000000..a05f8f066964 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c -@@ -0,0 +1,182 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ if (diff >= 0) ++ return (result < 0) ? result : 1; + -+/** -+ * @file mali_osk_notification.c -+ * Implementation of the OS abstraction layer for the kernel device driver -+ */ ++ return 0; ++} + -+#include "mali_osk.h" -+#include "mali_kernel_common.h" ++static int timeline_compare(struct sync_pt *a, struct sync_pt *b) ++{ ++ struct mali_sync_pt *ma = container_of(a, struct mali_sync_pt, pt); ++ struct mali_sync_pt *mb = container_of(b, struct mali_sync_pt, pt); + -+#include -+#include -+#include ++ int diff = ma->order - mb->order; + -+/** -+ * Declaration of the notification queue object type -+ * Contains a linked list of notification pending delivery to user space. -+ * It also contains a wait queue of exclusive waiters blocked in the ioctl -+ * When a new notification is posted a single thread is resumed. -+ */ -+struct _mali_osk_notification_queue_t_struct { -+ spinlock_t mutex; /**< Mutex protecting the list */ -+ wait_queue_head_t receive_queue; /**< Threads waiting for new entries to the queue */ -+ struct list_head head; /**< List of notifications waiting to be picked up */ -+}; ++ if (diff == 0) ++ return 0; + -+typedef struct _mali_osk_notification_wrapper_t_struct { -+ struct list_head list; /**< Internal linked list variable */ -+ _mali_osk_notification_t data; /**< Notification data */ -+} _mali_osk_notification_wrapper_t; ++ return (diff < 0) ? -1 : 1; ++} + -+_mali_osk_notification_queue_t *_mali_osk_notification_queue_init(void) ++static void timeline_value_str(struct sync_timeline *timeline, char *str, ++ int size) +{ -+ _mali_osk_notification_queue_t *result; ++ struct mali_sync_timeline *mtl = to_mali_sync_timeline(timeline); + -+ result = (_mali_osk_notification_queue_t *)kmalloc(sizeof(_mali_osk_notification_queue_t), GFP_KERNEL); -+ if (NULL == result) return NULL; ++ snprintf(str, size, "%d", atomic_read(&mtl->signaled)); ++} + -+ spin_lock_init(&result->mutex); -+ init_waitqueue_head(&result->receive_queue); -+ INIT_LIST_HEAD(&result->head); ++static void pt_value_str(struct sync_pt *pt, char *str, int size) ++{ ++ struct mali_sync_pt *mpt = to_mali_sync_pt(pt); + -+ return result; ++ snprintf(str, size, "%d(%d)", mpt->order, mpt->result); +} + -+_mali_osk_notification_t *_mali_osk_notification_create(u32 type, u32 size) ++static struct sync_timeline_ops mali_timeline_ops = { ++ .driver_name = "Mali", ++ .dup = timeline_dup, ++ .has_signaled = timeline_has_signaled, ++ .compare = timeline_compare, ++ .timeline_value_str = timeline_value_str, ++ .pt_value_str = pt_value_str, ++}; ++ ++/* Allocates a timeline for Mali ++ * ++ * One timeline should be allocated per API context. ++ */ ++static struct sync_timeline *mali_sync_timeline_alloc(const char *name) +{ -+ /* OPT Recycling of notification objects */ -+ _mali_osk_notification_wrapper_t *notification; ++ struct sync_timeline *tl; ++ struct mali_sync_timeline *mtl; + -+ notification = (_mali_osk_notification_wrapper_t *)kmalloc(sizeof(_mali_osk_notification_wrapper_t) + size, -+ GFP_KERNEL | __GFP_HIGH | __GFP_RETRY_MAYFAIL); -+ if (NULL == notification) { -+ MALI_DEBUG_PRINT(1, ("Failed to create a notification object\n")); ++ tl = sync_timeline_create(&mali_timeline_ops, ++ sizeof(struct mali_sync_timeline), name); ++ if (!tl) + return NULL; -+ } + -+ /* Init the list */ -+ INIT_LIST_HEAD(¬ification->list); ++ /* Set the counter in our private struct */ ++ mtl = to_mali_sync_timeline(tl); ++ atomic_set(&mtl->counter, 0); ++ atomic_set(&mtl->signaled, 0); + -+ if (0 != size) { -+ notification->data.result_buffer = ((u8 *)notification) + sizeof(_mali_osk_notification_wrapper_t); -+ } else { -+ notification->data.result_buffer = NULL; -+ } ++ return tl; ++} + -+ /* set up the non-allocating fields */ -+ notification->data.notification_type = type; -+ notification->data.result_buffer_size = size; ++static int kbase_stream_close(struct inode *inode, struct file *file) ++{ ++ struct sync_timeline *tl; + -+ /* all ok */ -+ return &(notification->data); ++ tl = (struct sync_timeline *)file->private_data; ++ sync_timeline_destroy(tl); ++ return 0; +} + -+void _mali_osk_notification_delete(_mali_osk_notification_t *object) ++static const struct file_operations stream_fops = { ++ .owner = THIS_MODULE, ++ .release = kbase_stream_close, ++}; ++ ++int kbase_sync_fence_stream_create(const char *name, int *const out_fd) +{ -+ _mali_osk_notification_wrapper_t *notification; -+ MALI_DEBUG_ASSERT_POINTER(object); ++ struct sync_timeline *tl; + -+ notification = container_of(object, _mali_osk_notification_wrapper_t, data); ++ if (!out_fd) ++ return -EINVAL; + -+ /* Free the container */ -+ kfree(notification); -+} ++ tl = mali_sync_timeline_alloc(name); ++ if (!tl) ++ return -EINVAL; + -+void _mali_osk_notification_queue_term(_mali_osk_notification_queue_t *queue) -+{ -+ _mali_osk_notification_t *result; -+ MALI_DEBUG_ASSERT_POINTER(queue); ++ *out_fd = anon_inode_getfd(name, &stream_fops, tl, O_RDONLY|O_CLOEXEC); + -+ while (_MALI_OSK_ERR_OK == _mali_osk_notification_queue_dequeue(queue, &result)) { -+ _mali_osk_notification_delete(result); ++ if (*out_fd < 0) { ++ sync_timeline_destroy(tl); ++ return -EINVAL; + } + -+ /* not much to do, just free the memory */ -+ kfree(queue); ++ return 0; +} -+void _mali_osk_notification_queue_send(_mali_osk_notification_queue_t *queue, _mali_osk_notification_t *object) ++ ++/* Allocates a sync point within the timeline. ++ * ++ * The timeline must be the one allocated by kbase_sync_timeline_alloc ++ * ++ * Sync points must be triggered in *exactly* the same order as they are ++ * allocated. ++ */ ++static struct sync_pt *kbase_sync_pt_alloc(struct sync_timeline *parent) +{ -+#if defined(MALI_UPPER_HALF_SCHEDULING) -+ unsigned long irq_flags; -+#endif ++ struct sync_pt *pt = sync_pt_create(parent, ++ sizeof(struct mali_sync_pt)); ++ struct mali_sync_timeline *mtl = to_mali_sync_timeline(parent); ++ struct mali_sync_pt *mpt; + -+ _mali_osk_notification_wrapper_t *notification; -+ MALI_DEBUG_ASSERT_POINTER(queue); -+ MALI_DEBUG_ASSERT_POINTER(object); ++ if (!pt) ++ return NULL; + -+ notification = container_of(object, _mali_osk_notification_wrapper_t, data); ++ mpt = to_mali_sync_pt(pt); ++ mpt->order = atomic_inc_return(&mtl->counter); ++ mpt->result = 0; + -+#if defined(MALI_UPPER_HALF_SCHEDULING) -+ spin_lock_irqsave(&queue->mutex, irq_flags); -+#else -+ spin_lock(&queue->mutex); ++ return pt; ++} ++ ++int kbase_sync_fence_out_create(struct kbase_jd_atom *katom, int tl_fd) ++{ ++ struct sync_timeline *tl; ++ struct sync_pt *pt; ++ struct sync_fence *fence; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0) ++ struct files_struct *files; ++ struct fdtable *fdt; +#endif ++ int fd; ++ struct file *tl_file; + -+ list_add_tail(¬ification->list, &queue->head); ++ tl_file = fget(tl_fd); ++ if (tl_file == NULL) ++ return -EBADF; + -+#if defined(MALI_UPPER_HALF_SCHEDULING) -+ spin_unlock_irqrestore(&queue->mutex, irq_flags); -+#else -+ spin_unlock(&queue->mutex); -+#endif ++ if (tl_file->f_op != &stream_fops) { ++ fd = -EBADF; ++ goto out; ++ } + -+ /* and wake up one possible exclusive waiter */ -+ wake_up(&queue->receive_queue); -+} ++ tl = tl_file->private_data; + -+_mali_osk_errcode_t _mali_osk_notification_queue_dequeue(_mali_osk_notification_queue_t *queue, _mali_osk_notification_t **result) -+{ -+#if defined(MALI_UPPER_HALF_SCHEDULING) -+ unsigned long irq_flags; -+#endif ++ pt = kbase_sync_pt_alloc(tl); ++ if (!pt) { ++ fd = -EFAULT; ++ goto out; ++ } + -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_ITEM_NOT_FOUND; -+ _mali_osk_notification_wrapper_t *wrapper_object; ++ fence = sync_fence_create("mali_fence", pt); ++ if (!fence) { ++ sync_pt_free(pt); ++ fd = -EFAULT; ++ goto out; ++ } + -+#if defined(MALI_UPPER_HALF_SCHEDULING) -+ spin_lock_irqsave(&queue->mutex, irq_flags); -+#else -+ spin_lock(&queue->mutex); -+#endif ++ /* from here the fence owns the sync_pt */ + -+ if (!list_empty(&queue->head)) { -+ wrapper_object = list_entry(queue->head.next, _mali_osk_notification_wrapper_t, list); -+ *result = &(wrapper_object->data); -+ list_del_init(&wrapper_object->list); -+ ret = _MALI_OSK_ERR_OK; ++ /* create a fd representing the fence */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) ++ fd = get_unused_fd_flags(O_RDWR | O_CLOEXEC); ++ if (fd < 0) { ++ sync_fence_put(fence); ++ goto out; ++ } ++#else ++ fd = get_unused_fd(); ++ if (fd < 0) { ++ sync_fence_put(fence); ++ goto out; + } + -+#if defined(MALI_UPPER_HALF_SCHEDULING) -+ spin_unlock_irqrestore(&queue->mutex, irq_flags); ++ files = current->files; ++ spin_lock(&files->file_lock); ++ fdt = files_fdtable(files); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) ++ __set_close_on_exec(fd, fdt); +#else -+ spin_unlock(&queue->mutex); ++ FD_SET(fd, fdt->close_on_exec); +#endif ++ spin_unlock(&files->file_lock); ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) */ + -+ return ret; ++ /* bind fence to the new fd */ ++ sync_fence_install(fence, fd); ++ ++ katom->fence = sync_fence_fdget(fd); ++ if (katom->fence == NULL) { ++ /* The only way the fence can be NULL is if userspace closed it ++ * for us, so we don't need to clear it up */ ++ fd = -EINVAL; ++ goto out; ++ } ++ ++out: ++ fput(tl_file); ++ ++ return fd; +} + -+_mali_osk_errcode_t _mali_osk_notification_queue_receive(_mali_osk_notification_queue_t *queue, _mali_osk_notification_t **result) ++int kbase_sync_fence_in_from_fd(struct kbase_jd_atom *katom, int fd) +{ -+ /* check input */ -+ MALI_DEBUG_ASSERT_POINTER(queue); -+ MALI_DEBUG_ASSERT_POINTER(result); ++ katom->fence = sync_fence_fdget(fd); ++ return katom->fence ? 0 : -ENOENT; ++} + -+ /* default result */ -+ *result = NULL; ++int kbase_sync_fence_validate(int fd) ++{ ++ struct sync_fence *fence; + -+ if (wait_event_interruptible(queue->receive_queue, -+ _MALI_OSK_ERR_OK == _mali_osk_notification_queue_dequeue(queue, result))) { -+ return _MALI_OSK_ERR_RESTARTSYSCALL; -+ } ++ fence = sync_fence_fdget(fd); ++ if (!fence) ++ return -EINVAL; + -+ return _MALI_OSK_ERR_OK; /* all ok */ ++ sync_fence_put(fence); ++ return 0; +} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c -new file mode 100755 -index 000000000000..e28e2eb21fe2 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c -@@ -0,0 +1,83 @@ -+/** -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ + -+/** -+ * @file mali_osk_pm.c -+ * Implementation of the callback functions from common power management ++/* Returns true if the specified timeline is allocated by Mali */ ++static int kbase_sync_timeline_is_ours(struct sync_timeline *timeline) ++{ ++ return timeline->ops == &mali_timeline_ops; ++} ++ ++/* Signals a particular sync point ++ * ++ * Sync points must be triggered in *exactly* the same order as they are ++ * allocated. ++ * ++ * If they are signaled in the wrong order then a message will be printed in ++ * debug builds and otherwise attempts to signal order sync_pts will be ignored. ++ * ++ * result can be negative to indicate error, any other value is interpreted as ++ * success. + */ ++static void kbase_sync_signal_pt(struct sync_pt *pt, int result) ++{ ++ struct mali_sync_pt *mpt = to_mali_sync_pt(pt); ++ struct mali_sync_timeline *mtl = to_mali_sync_timeline( ++ sync_pt_parent(pt)); ++ int signaled; ++ int diff; + -+#include ++ mpt->result = result; + -+#include "mali_kernel_linux.h" -+#ifdef CONFIG_PM_RUNTIME -+#include -+#endif /* CONFIG_PM_RUNTIME */ -+#include -+#include -+#include "mali_osk.h" -+#include "mali_kernel_common.h" ++ do { ++ signaled = atomic_read(&mtl->signaled); + -+/* Can NOT run in atomic context */ -+_mali_osk_errcode_t _mali_osk_pm_dev_ref_get_sync(void) -+{ -+#ifdef CONFIG_PM_RUNTIME -+ int err; -+ MALI_DEBUG_ASSERT_POINTER(mali_platform_device); -+ err = pm_runtime_get_sync(&(mali_platform_device->dev)); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) -+ pm_runtime_mark_last_busy(&(mali_platform_device->dev)); -+#endif -+ if (0 > err) { -+ MALI_PRINT_ERROR(("Mali OSK PM: pm_runtime_get_sync() returned error code %d\n", err)); -+ return _MALI_OSK_ERR_FAULT; -+ } -+#endif -+ return _MALI_OSK_ERR_OK; ++ diff = signaled - mpt->order; ++ ++ if (diff > 0) { ++ /* The timeline is already at or ahead of this point. ++ * This should not happen unless userspace has been ++ * signaling fences out of order, so warn but don't ++ * violate the sync_pt API. ++ * The warning is only in debug builds to prevent ++ * a malicious user being able to spam dmesg. ++ */ ++#ifdef CONFIG_MALI_DEBUG ++ pr_err("Fences were triggered in a different order to allocation!"); ++#endif /* CONFIG_MALI_DEBUG */ ++ return; ++ } ++ } while (atomic_cmpxchg(&mtl->signaled, ++ signaled, mpt->order) != signaled); +} + -+/* Can run in atomic context */ -+_mali_osk_errcode_t _mali_osk_pm_dev_ref_get_async(void) ++enum base_jd_event_code ++kbase_sync_fence_out_trigger(struct kbase_jd_atom *katom, int result) +{ -+#ifdef CONFIG_PM_RUNTIME -+ int err; -+ MALI_DEBUG_ASSERT_POINTER(mali_platform_device); -+ err = pm_runtime_get(&(mali_platform_device->dev)); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) -+ pm_runtime_mark_last_busy(&(mali_platform_device->dev)); ++ struct sync_pt *pt; ++ struct sync_timeline *timeline; ++ ++ if (!katom->fence) ++ return BASE_JD_EVENT_JOB_CANCELLED; ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) ++ if (!list_is_singular(&katom->fence->pt_list_head)) { ++#else ++ if (katom->fence->num_fences != 1) { +#endif -+ if (0 > err && -EINPROGRESS != err) { -+ MALI_PRINT_ERROR(("Mali OSK PM: pm_runtime_get() returned error code %d\n", err)); -+ return _MALI_OSK_ERR_FAULT; ++ /* Not exactly one item in the list - so it didn't (directly) ++ * come from us */ ++ return BASE_JD_EVENT_JOB_CANCELLED; + } ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) ++ pt = list_first_entry(&katom->fence->pt_list_head, ++ struct sync_pt, pt_list); ++#else ++ pt = container_of(katom->fence->cbs[0].sync_pt, struct sync_pt, base); +#endif -+ return _MALI_OSK_ERR_OK; -+} ++ timeline = sync_pt_parent(pt); ++ ++ if (!kbase_sync_timeline_is_ours(timeline)) { ++ /* Fence has a sync_pt which isn't ours! */ ++ return BASE_JD_EVENT_JOB_CANCELLED; ++ } + ++ kbase_sync_signal_pt(pt, result); + -+/* Can run in atomic context */ -+void _mali_osk_pm_dev_ref_put(void) ++ sync_timeline_signal(timeline); ++ ++ kbase_sync_fence_out_remove(katom); ++ ++ return (result < 0) ? BASE_JD_EVENT_JOB_CANCELLED : BASE_JD_EVENT_DONE; ++} ++ ++static inline int kbase_fence_get_status(struct sync_fence *fence) +{ -+#ifdef CONFIG_PM_RUNTIME -+ MALI_DEBUG_ASSERT_POINTER(mali_platform_device); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) -+ pm_runtime_mark_last_busy(&(mali_platform_device->dev)); -+ pm_runtime_put_autosuspend(&(mali_platform_device->dev)); ++ if (!fence) ++ return -ENOENT; ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) ++ return fence->status; +#else -+ pm_runtime_put(&(mali_platform_device->dev)); -+#endif ++ return atomic_read(&fence->status); +#endif +} + -+void _mali_osk_pm_dev_barrier(void) ++static void kbase_fence_wait_callback(struct sync_fence *fence, ++ struct sync_fence_waiter *waiter) +{ -+#ifdef CONFIG_PM_RUNTIME -+ pm_runtime_barrier(&(mali_platform_device->dev)); -+#endif -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c -new file mode 100755 -index 000000000000..9e977ea4d0ff ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c -@@ -0,0 +1,1282 @@ -+/* -+ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#include -+#include -+#include -+#include -+#include -+#include ++ struct kbase_jd_atom *katom = container_of(waiter, ++ struct kbase_jd_atom, sync_waiter); ++ struct kbase_context *kctx = katom->kctx; + -+#include -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_ukk.h" -+#include "mali_uk_types.h" -+#include "mali_osk_profiling.h" -+#include "mali_linux_trace.h" -+#include "mali_gp.h" -+#include "mali_pp.h" -+#include "mali_l2_cache.h" -+#include "mali_user_settings_db.h" -+#include "mali_executor.h" -+#include "mali_memory_manager.h" ++ /* Propagate the fence status to the atom. ++ * If negative then cancel this atom and its dependencies. ++ */ ++ if (kbase_fence_get_status(fence) < 0) ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; + -+#define MALI_PROFILING_STREAM_DATA_DEFAULT_SIZE 100 -+#define MALI_PROFILING_STREAM_HOLD_TIME 1000000 /*1 ms */ ++ /* To prevent a potential deadlock we schedule the work onto the ++ * job_done_wq workqueue ++ * ++ * The issue is that we may signal the timeline while holding ++ * kctx->jctx.lock and the callbacks are run synchronously from ++ * sync_timeline_signal. So we simply defer the work. ++ */ + -+#define MALI_PROFILING_STREAM_BUFFER_SIZE (1 << 12) -+#define MALI_PROFILING_STREAM_BUFFER_NUM 100 ++ INIT_WORK(&katom->work, kbase_sync_fence_wait_worker); ++ queue_work(kctx->jctx.job_done_wq, &katom->work); ++} + -+/** -+ * Define the mali profiling stream struct. -+ */ -+typedef struct mali_profiling_stream { -+ u8 data[MALI_PROFILING_STREAM_BUFFER_SIZE]; -+ u32 used_size; -+ struct list_head list; -+} mali_profiling_stream; ++int kbase_sync_fence_in_wait(struct kbase_jd_atom *katom) ++{ ++ int ret; + -+typedef struct mali_profiling_stream_list { -+ spinlock_t spin_lock; -+ struct list_head free_list; -+ struct list_head queue_list; -+} mali_profiling_stream_list; ++ sync_fence_waiter_init(&katom->sync_waiter, kbase_fence_wait_callback); + -+static const char mali_name[] = "4xx"; -+static const char utgard_setup_version[] = "ANNOTATE_SETUP 1\n"; ++ ret = sync_fence_wait_async(katom->fence, &katom->sync_waiter); + -+static u32 profiling_sample_rate = 0; -+static u32 first_sw_counter_index = 0; ++ if (ret == 1) { ++ /* Already signaled */ ++ return 0; ++ } + -+static mali_bool l2_cache_counter_if_enabled = MALI_FALSE; -+static u32 num_counters_enabled = 0; -+static u32 mem_counters_enabled = 0; ++ if (ret < 0) { ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; ++ /* We should cause the dependent jobs in the bag to be failed, ++ * to do this we schedule the work queue to complete this job */ ++ INIT_WORK(&katom->work, kbase_sync_fence_wait_worker); ++ queue_work(katom->kctx->jctx.job_done_wq, &katom->work); ++ } + -+static _mali_osk_atomic_t stream_fd_if_used; ++ return 1; ++} + -+static wait_queue_head_t stream_fd_wait_queue; -+static mali_profiling_counter *global_mali_profiling_counters = NULL; -+static u32 num_global_mali_profiling_counters = 0; ++void kbase_sync_fence_in_cancel_wait(struct kbase_jd_atom *katom) ++{ ++ if (sync_fence_cancel_async(katom->fence, &katom->sync_waiter) != 0) { ++ /* The wait wasn't cancelled - leave the cleanup for ++ * kbase_fence_wait_callback */ ++ return; ++ } + -+static mali_profiling_stream_list *global_mali_stream_list = NULL; -+static mali_profiling_stream *mali_counter_stream = NULL; -+static mali_profiling_stream *mali_core_activity_stream = NULL; -+static u64 mali_core_activity_stream_dequeue_time = 0; -+static spinlock_t mali_activity_lock; -+static u32 mali_activity_cores_num = 0; -+static struct hrtimer profiling_sampling_timer; ++ /* Wait was cancelled - zap the atoms */ ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; + -+const char *_mali_mem_counter_descriptions[] = _MALI_MEM_COUTNER_DESCRIPTIONS; -+const char *_mali_special_counter_descriptions[] = _MALI_SPCIAL_COUNTER_DESCRIPTIONS; ++ kbasep_remove_waiting_soft_job(katom); ++ kbase_finish_soft_job(katom); + -+static u32 current_profiling_pid = 0; ++ if (jd_done_nolock(katom, NULL)) ++ kbase_js_sched_all(katom->kctx->kbdev); ++} + -+static void _mali_profiling_stream_list_destory(mali_profiling_stream_list *profiling_stream_list) ++void kbase_sync_fence_out_remove(struct kbase_jd_atom *katom) +{ -+ mali_profiling_stream *profiling_stream, *tmp_profiling_stream; -+ MALI_DEBUG_ASSERT_POINTER(profiling_stream_list); -+ -+ list_for_each_entry_safe(profiling_stream, tmp_profiling_stream, &profiling_stream_list->free_list, list) { -+ list_del(&profiling_stream->list); -+ kfree(profiling_stream); ++ if (katom->fence) { ++ sync_fence_put(katom->fence); ++ katom->fence = NULL; + } ++} + -+ list_for_each_entry_safe(profiling_stream, tmp_profiling_stream, &profiling_stream_list->queue_list, list) { -+ list_del(&profiling_stream->list); -+ kfree(profiling_stream); ++void kbase_sync_fence_in_remove(struct kbase_jd_atom *katom) ++{ ++ if (katom->fence) { ++ sync_fence_put(katom->fence); ++ katom->fence = NULL; + } ++} + -+ kfree(profiling_stream_list); ++int kbase_sync_fence_in_info_get(struct kbase_jd_atom *katom, ++ struct kbase_sync_fence_info *info) ++{ ++ if (!katom->fence) ++ return -ENOENT; ++ ++ info->fence = katom->fence; ++ info->status = kbase_fence_get_status(katom->fence); ++ strlcpy(info->name, katom->fence->name, sizeof(info->name)); ++ ++ return 0; +} + -+static void _mali_profiling_global_stream_list_free(void) ++int kbase_sync_fence_out_info_get(struct kbase_jd_atom *katom, ++ struct kbase_sync_fence_info *info) +{ -+ mali_profiling_stream *profiling_stream, *tmp_profiling_stream; -+ unsigned long irq_flags; ++ if (!katom->fence) ++ return -ENOENT; + -+ MALI_DEBUG_ASSERT_POINTER(global_mali_stream_list); -+ spin_lock_irqsave(&global_mali_stream_list->spin_lock, irq_flags); -+ list_for_each_entry_safe(profiling_stream, tmp_profiling_stream, &global_mali_stream_list->queue_list, list) { -+ profiling_stream->used_size = 0; -+ list_move(&profiling_stream->list, &global_mali_stream_list->free_list); -+ } -+ spin_unlock_irqrestore(&global_mali_stream_list->spin_lock, irq_flags); ++ info->fence = katom->fence; ++ info->status = kbase_fence_get_status(katom->fence); ++ strlcpy(info->name, katom->fence->name, sizeof(info->name)); ++ ++ return 0; +} + -+static _mali_osk_errcode_t _mali_profiling_global_stream_list_dequeue(struct list_head *stream_list, mali_profiling_stream **new_mali_profiling_stream) ++#ifdef CONFIG_MALI_FENCE_DEBUG ++void kbase_sync_fence_in_dump(struct kbase_jd_atom *katom) +{ -+ unsigned long irq_flags; -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_OK; -+ MALI_DEBUG_ASSERT_POINTER(global_mali_stream_list); -+ MALI_DEBUG_ASSERT_POINTER(stream_list); ++ /* Dump out the full state of all the Android sync fences. ++ * The function sync_dump() isn't exported to modules, so force ++ * sync_fence_wait() to time out to trigger sync_dump(). ++ */ ++ if (katom->fence) ++ sync_fence_wait(katom->fence, 1); ++} ++#endif +diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_common.c b/drivers/gpu/arm/midgard/mali_kbase_sync_common.c +new file mode 100755 +index 000000000..457def296 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_sync_common.c +@@ -0,0 +1,43 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ spin_lock_irqsave(&global_mali_stream_list->spin_lock, irq_flags); + -+ if (!list_empty(stream_list)) { -+ *new_mali_profiling_stream = list_entry(stream_list->next, mali_profiling_stream, list); -+ list_del_init(&(*new_mali_profiling_stream)->list); -+ } else { -+ ret = _MALI_OSK_ERR_NOMEM; -+ } + -+ spin_unlock_irqrestore(&global_mali_stream_list->spin_lock, irq_flags); ++/* ++ * @file mali_kbase_sync_common.c ++ * ++ * Common code for our explicit fence functionality ++ */ + -+ return ret; -+} ++#include ++#include "mali_kbase.h" + -+static void _mali_profiling_global_stream_list_queue(struct list_head *stream_list, mali_profiling_stream *current_mali_profiling_stream) ++void kbase_sync_fence_wait_worker(struct work_struct *data) +{ -+ unsigned long irq_flags; -+ MALI_DEBUG_ASSERT_POINTER(global_mali_stream_list); -+ MALI_DEBUG_ASSERT_POINTER(stream_list); ++ struct kbase_jd_atom *katom; + -+ spin_lock_irqsave(&global_mali_stream_list->spin_lock, irq_flags); -+ list_add_tail(¤t_mali_profiling_stream->list, stream_list); -+ spin_unlock_irqrestore(&global_mali_stream_list->spin_lock, irq_flags); ++ katom = container_of(data, struct kbase_jd_atom, work); ++ kbase_soft_event_wait_callback(katom); +} + -+static mali_bool _mali_profiling_global_stream_queue_list_if_empty(void) ++const char *kbase_sync_status_string(int status) +{ -+ MALI_DEBUG_ASSERT_POINTER(global_mali_stream_list); -+ return list_empty(&global_mali_stream_list->queue_list); ++ if (status == 0) ++ return "signaled"; ++ else if (status > 0) ++ return "active"; ++ else ++ return "error"; +} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_file.c b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c +new file mode 100755 +index 000000000..60b5d74db +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c +@@ -0,0 +1,359 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+static u32 _mali_profiling_global_stream_queue_list_next_size(void) -+{ -+ unsigned long irq_flags; -+ u32 size = 0; -+ MALI_DEBUG_ASSERT_POINTER(global_mali_stream_list); -+ -+ spin_lock_irqsave(&global_mali_stream_list->spin_lock, irq_flags); -+ if (!list_empty(&global_mali_stream_list->queue_list)) { -+ mali_profiling_stream *next_mali_profiling_stream = -+ list_entry(global_mali_stream_list->queue_list.next, mali_profiling_stream, list); -+ size = next_mali_profiling_stream->used_size; -+ } -+ spin_unlock_irqrestore(&global_mali_stream_list->spin_lock, irq_flags); -+ return size; -+} + -+/* The mali profiling stream file operations functions. */ -+static ssize_t _mali_profiling_stream_read( -+ struct file *filp, -+ char __user *buffer, -+ size_t size, -+ loff_t *f_pos); + -+static unsigned int _mali_profiling_stream_poll(struct file *filp, poll_table *wait); ++/* ++ * Code for supporting explicit Linux fences (CONFIG_SYNC_FILE) ++ * Introduced in kernel 4.9. ++ * Android explicit fences (CONFIG_SYNC) can be used for older kernels ++ * (see mali_kbase_sync_android.c) ++ */ + -+static int _mali_profiling_stream_release(struct inode *inode, struct file *filp); ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "mali_kbase_fence_defs.h" ++#include "mali_kbase_sync.h" ++#include "mali_kbase_fence.h" ++#include "mali_kbase.h" + -+/* The timeline stream file operations structure. */ -+static const struct file_operations mali_profiling_stream_fops = { -+ .release = _mali_profiling_stream_release, -+ .read = _mali_profiling_stream_read, -+ .poll = _mali_profiling_stream_poll, ++static const struct file_operations stream_fops = { ++ .owner = THIS_MODULE +}; + -+static ssize_t _mali_profiling_stream_read( -+ struct file *filp, -+ char __user *buffer, -+ size_t size, -+ loff_t *f_pos) ++int kbase_sync_fence_stream_create(const char *name, int *const out_fd) +{ -+ u32 copy_len = 0; -+ mali_profiling_stream *current_mali_profiling_stream; -+ u32 used_size; -+ MALI_DEBUG_ASSERT_POINTER(global_mali_stream_list); ++ if (!out_fd) ++ return -EINVAL; + -+ while (!_mali_profiling_global_stream_queue_list_if_empty()) { -+ used_size = _mali_profiling_global_stream_queue_list_next_size(); -+ if (used_size <= ((u32)size - copy_len)) { -+ current_mali_profiling_stream = NULL; -+ _mali_profiling_global_stream_list_dequeue(&global_mali_stream_list->queue_list, -+ ¤t_mali_profiling_stream); -+ MALI_DEBUG_ASSERT_POINTER(current_mali_profiling_stream); -+ if (copy_to_user(&buffer[copy_len], current_mali_profiling_stream->data, current_mali_profiling_stream->used_size)) { -+ current_mali_profiling_stream->used_size = 0; -+ _mali_profiling_global_stream_list_queue(&global_mali_stream_list->free_list, current_mali_profiling_stream); -+ return -EFAULT; -+ } -+ copy_len += current_mali_profiling_stream->used_size; -+ current_mali_profiling_stream->used_size = 0; -+ _mali_profiling_global_stream_list_queue(&global_mali_stream_list->free_list, current_mali_profiling_stream); -+ } else { -+ break; -+ } -+ } -+ return (ssize_t)copy_len; -+} ++ *out_fd = anon_inode_getfd(name, &stream_fops, NULL, ++ O_RDONLY | O_CLOEXEC); ++ if (*out_fd < 0) ++ return -EINVAL; + -+static unsigned int _mali_profiling_stream_poll(struct file *filp, poll_table *wait) -+{ -+ poll_wait(filp, &stream_fd_wait_queue, wait); -+ if (!_mali_profiling_global_stream_queue_list_if_empty()) -+ return POLLIN; + return 0; +} + -+static int _mali_profiling_stream_release(struct inode *inode, struct file *filp) ++int kbase_sync_fence_out_create(struct kbase_jd_atom *katom, int stream_fd) +{ -+ _mali_osk_atomic_init(&stream_fd_if_used, 0); -+ return 0; -+} ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ struct fence *fence; ++#else ++ struct dma_fence *fence; ++#endif ++ struct sync_file *sync_file; ++ int fd; + -+/* The funs for control packet and stream data.*/ -+static void _mali_profiling_set_packet_size(unsigned char *const buf, const u32 size) -+{ -+ u32 i; ++ fence = kbase_fence_out_new(katom); ++ if (!fence) ++ return -ENOMEM; + -+ for (i = 0; i < sizeof(size); ++i) -+ buf[i] = (size >> 8 * i) & 0xFF; -+} ++#if (KERNEL_VERSION(4, 9, 67) >= LINUX_VERSION_CODE) ++ /* Take an extra reference to the fence on behalf of the sync_file. ++ * This is only needed on older kernels where sync_file_create() ++ * does not take its own reference. This was changed in v4.9.68, ++ * where sync_file_create() now takes its own reference. ++ */ ++ dma_fence_get(fence); ++#endif + -+static u32 _mali_profiling_get_packet_size(unsigned char *const buf) -+{ -+ u32 i; -+ u32 size = 0; -+ for (i = 0; i < sizeof(size); ++i) -+ size |= (u32)buf[i] << 8 * i; -+ return size; ++ /* create a sync_file fd representing the fence */ ++ sync_file = sync_file_create(fence); ++ if (!sync_file) { ++ dma_fence_put(fence); ++ kbase_fence_out_remove(katom); ++ return -ENOMEM; ++ } ++ ++ fd = get_unused_fd_flags(O_CLOEXEC); ++ if (fd < 0) { ++ fput(sync_file->file); ++ kbase_fence_out_remove(katom); ++ return fd; ++ } ++ ++ fd_install(fd, sync_file->file); ++ ++ return fd; +} + -+static u32 _mali_profiling_read_packet_int(unsigned char *const buf, u32 *const pos, u32 const packet_size) ++int kbase_sync_fence_in_from_fd(struct kbase_jd_atom *katom, int fd) +{ -+ u64 int_value = 0; -+ u8 shift = 0; -+ u8 byte_value = ~0; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ struct fence *fence = sync_file_get_fence(fd); ++#else ++ struct dma_fence *fence = sync_file_get_fence(fd); ++#endif + -+ while ((byte_value & 0x80) != 0) { -+ if ((*pos) >= packet_size) -+ return -1; -+ byte_value = buf[*pos]; -+ *pos += 1; -+ int_value |= (u32)(byte_value & 0x7f) << shift; -+ shift += 7; -+ } ++ if (!fence) ++ return -ENOENT; + -+ if (shift < 8 * sizeof(int_value) && (byte_value & 0x40) != 0) { -+ int_value |= -(1 << shift); -+ } ++ kbase_fence_fence_in_set(katom, fence); + -+ return int_value; ++ return 0; +} + -+static u32 _mali_profiling_pack_int(u8 *const buf, u32 const buf_size, u32 const pos, s32 value) ++int kbase_sync_fence_validate(int fd) +{ -+ u32 add_bytes = 0; -+ int more = 1; -+ while (more) { -+ /* low order 7 bits of val */ -+ char byte_value = value & 0x7f; -+ value >>= 7; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ struct fence *fence = sync_file_get_fence(fd); ++#else ++ struct dma_fence *fence = sync_file_get_fence(fd); ++#endif + -+ if ((value == 0 && (byte_value & 0x40) == 0) || (value == -1 && (byte_value & 0x40) != 0)) { -+ more = 0; -+ } else { -+ byte_value |= 0x80; -+ } ++ if (!fence) ++ return -EINVAL; + -+ if ((pos + add_bytes) >= buf_size) -+ return 0; -+ buf[pos + add_bytes] = byte_value; -+ add_bytes++; -+ } ++ dma_fence_put(fence); + -+ return add_bytes; ++ return 0; /* valid */ +} + -+static int _mali_profiling_pack_long(uint8_t *const buf, u32 const buf_size, u32 const pos, s64 val) ++enum base_jd_event_code ++kbase_sync_fence_out_trigger(struct kbase_jd_atom *katom, int result) +{ -+ int add_bytes = 0; -+ int more = 1; -+ while (more) { -+ /* low order 7 bits of x */ -+ char byte_value = val & 0x7f; -+ val >>= 7; ++ int res; + -+ if ((val == 0 && (byte_value & 0x40) == 0) || (val == -1 && (byte_value & 0x40) != 0)) { -+ more = 0; -+ } else { -+ byte_value |= 0x80; -+ } ++ if (!kbase_fence_out_is_ours(katom)) { ++ /* Not our fence */ ++ return BASE_JD_EVENT_JOB_CANCELLED; ++ } + -+ MALI_DEBUG_ASSERT((pos + add_bytes) < buf_size); -+ buf[pos + add_bytes] = byte_value; -+ add_bytes++; ++ res = kbase_fence_out_signal(katom, result); ++ if (unlikely(res < 0)) { ++ dev_warn(katom->kctx->kbdev->dev, ++ "fence_signal() failed with %d\n", res); + } + -+ return add_bytes; ++ kbase_sync_fence_out_remove(katom); ++ ++ return (result != 0) ? BASE_JD_EVENT_JOB_CANCELLED : BASE_JD_EVENT_DONE; +} + -+static void _mali_profiling_stream_add_counter(mali_profiling_stream *profiling_stream, s64 current_time, u32 key, u32 counter_value) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++static void kbase_fence_wait_callback(struct fence *fence, ++ struct fence_cb *cb) ++#else ++static void kbase_fence_wait_callback(struct dma_fence *fence, ++ struct dma_fence_cb *cb) ++#endif +{ -+ u32 add_size = STREAM_HEADER_SIZE; -+ MALI_DEBUG_ASSERT_POINTER(profiling_stream); -+ MALI_DEBUG_ASSERT((profiling_stream->used_size) < MALI_PROFILING_STREAM_BUFFER_SIZE); -+ -+ profiling_stream->data[profiling_stream->used_size] = STREAM_HEADER_COUNTER_VALUE; ++ struct kbase_fence_cb *kcb = container_of(cb, ++ struct kbase_fence_cb, ++ fence_cb); ++ struct kbase_jd_atom *katom = kcb->katom; ++ struct kbase_context *kctx = katom->kctx; + -+ add_size += _mali_profiling_pack_long(profiling_stream->data, MALI_PROFILING_STREAM_BUFFER_SIZE, -+ profiling_stream->used_size + add_size, current_time); -+ add_size += _mali_profiling_pack_int(profiling_stream->data, MALI_PROFILING_STREAM_BUFFER_SIZE, -+ profiling_stream->used_size + add_size, (s32)0); -+ add_size += _mali_profiling_pack_int(profiling_stream->data, MALI_PROFILING_STREAM_BUFFER_SIZE, -+ profiling_stream->used_size + add_size, (s32)key); -+ add_size += _mali_profiling_pack_int(profiling_stream->data, MALI_PROFILING_STREAM_BUFFER_SIZE, -+ profiling_stream->used_size + add_size, (s32)counter_value); ++ /* Cancel atom if fence is erroneous */ ++#if (KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE || \ ++ (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE && \ ++ KERNEL_VERSION(4, 9, 68) <= LINUX_VERSION_CODE)) ++ if (dma_fence_is_signaled(kcb->fence) && kcb->fence->error) ++#else ++ if (dma_fence_is_signaled(kcb->fence) && kcb->fence->status < 0) ++#endif ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; + -+ _mali_profiling_set_packet_size(profiling_stream->data + profiling_stream->used_size + 1, -+ add_size - STREAM_HEADER_SIZE); ++ if (kbase_fence_dep_count_dec_and_test(katom)) { ++ /* We take responsibility of handling this */ ++ kbase_fence_dep_count_set(katom, -1); + -+ profiling_stream->used_size += add_size; ++ /* To prevent a potential deadlock we schedule the work onto the ++ * job_done_wq workqueue ++ * ++ * The issue is that we may signal the timeline while holding ++ * kctx->jctx.lock and the callbacks are run synchronously from ++ * sync_timeline_signal. So we simply defer the work. ++ */ ++ INIT_WORK(&katom->work, kbase_sync_fence_wait_worker); ++ queue_work(kctx->jctx.job_done_wq, &katom->work); ++ } +} + -+/* The callback function for sampling timer.*/ -+static enum hrtimer_restart _mali_profiling_sampling_counters(struct hrtimer *timer) ++int kbase_sync_fence_in_wait(struct kbase_jd_atom *katom) +{ -+ u32 counter_index; -+ s64 current_time; -+ MALI_DEBUG_ASSERT_POINTER(global_mali_profiling_counters); -+ MALI_DEBUG_ASSERT_POINTER(global_mali_stream_list); ++ int err; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ struct fence *fence; ++#else ++ struct dma_fence *fence; ++#endif + -+ MALI_DEBUG_ASSERT(NULL == mali_counter_stream); -+ if (_MALI_OSK_ERR_OK == _mali_profiling_global_stream_list_dequeue( -+ &global_mali_stream_list->free_list, &mali_counter_stream)) { ++ fence = kbase_fence_in_get(katom); ++ if (!fence) ++ return 0; /* no input fence to wait for, good to go! */ + -+ MALI_DEBUG_ASSERT_POINTER(mali_counter_stream); -+ MALI_DEBUG_ASSERT(0 == mali_counter_stream->used_size); ++ kbase_fence_dep_count_set(katom, 1); + -+ /* Capture l2 cache counter values if enabled */ -+ if (MALI_TRUE == l2_cache_counter_if_enabled) { -+ int i, j = 0; -+ _mali_profiling_l2_counter_values l2_counters_values; -+ _mali_profiling_get_l2_counters(&l2_counters_values); ++ err = kbase_fence_add_callback(katom, fence, kbase_fence_wait_callback); + -+ for (i = COUNTER_L2_0_C0; i <= COUNTER_L2_2_C1; i++) { -+ if (0 == (j % 2)) -+ _mali_osk_profiling_record_global_counters(i, l2_counters_values.cores[j / 2].value0); -+ else -+ _mali_osk_profiling_record_global_counters(i, l2_counters_values.cores[j / 2].value1); -+ j++; -+ } ++ kbase_fence_put(fence); ++ ++ if (likely(!err)) { ++ /* Test if the callbacks are already triggered */ ++ if (kbase_fence_dep_count_dec_and_test(katom)) { ++ kbase_fence_free_callbacks(katom); ++ kbase_fence_dep_count_set(katom, -1); ++ return 0; /* Already signaled, good to go right now */ + } + -+ current_time = (s64)_mali_osk_boot_time_get_ns(); ++ /* Callback installed, so we just need to wait for it... */ ++ } else { ++ /* Failure */ ++ kbase_fence_free_callbacks(katom); ++ kbase_fence_dep_count_set(katom, -1); + -+ /* Add all enabled counter values into stream */ -+ for (counter_index = 0; counter_index < num_global_mali_profiling_counters; counter_index++) { -+ /* No need to sample these couners here. */ -+ if (global_mali_profiling_counters[counter_index].enabled) { -+ if ((global_mali_profiling_counters[counter_index].counter_id >= FIRST_MEM_COUNTER && -+ global_mali_profiling_counters[counter_index].counter_id <= LAST_MEM_COUNTER) -+ || (global_mali_profiling_counters[counter_index].counter_id == COUNTER_VP_ACTIVITY) -+ || (global_mali_profiling_counters[counter_index].counter_id == COUNTER_FP_ACTIVITY) -+ || (global_mali_profiling_counters[counter_index].counter_id == COUNTER_FILMSTRIP)) { ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; + -+ continue; -+ } ++ /* We should cause the dependent jobs in the bag to be failed, ++ * to do this we schedule the work queue to complete this job */ + -+ if (global_mali_profiling_counters[counter_index].counter_id >= COUNTER_L2_0_C0 && -+ global_mali_profiling_counters[counter_index].counter_id <= COUNTER_L2_2_C1) { ++ INIT_WORK(&katom->work, kbase_sync_fence_wait_worker); ++ queue_work(katom->kctx->jctx.job_done_wq, &katom->work); ++ } + -+ u32 prev_val = global_mali_profiling_counters[counter_index].prev_counter_value; ++ return 1; /* completion to be done later by callback/worker */ ++} + -+ _mali_profiling_stream_add_counter(mali_counter_stream, current_time, global_mali_profiling_counters[counter_index].key, -+ global_mali_profiling_counters[counter_index].current_counter_value - prev_val); ++void kbase_sync_fence_in_cancel_wait(struct kbase_jd_atom *katom) ++{ ++ if (!kbase_fence_free_callbacks(katom)) { ++ /* The wait wasn't cancelled - ++ * leave the cleanup for kbase_fence_wait_callback */ ++ return; ++ } + -+ prev_val = global_mali_profiling_counters[counter_index].current_counter_value; ++ /* Take responsibility of completion */ ++ kbase_fence_dep_count_set(katom, -1); + -+ global_mali_profiling_counters[counter_index].prev_counter_value = prev_val; -+ } else { ++ /* Wait was cancelled - zap the atoms */ ++ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; + -+ if (global_mali_profiling_counters[counter_index].counter_id == COUNTER_TOTAL_ALLOC_PAGES) { -+ u32 total_alloc_mem = _mali_ukk_report_memory_usage(); -+ global_mali_profiling_counters[counter_index].current_counter_value = total_alloc_mem / _MALI_OSK_MALI_PAGE_SIZE; -+ } -+ _mali_profiling_stream_add_counter(mali_counter_stream, current_time, global_mali_profiling_counters[counter_index].key, -+ global_mali_profiling_counters[counter_index].current_counter_value); -+ if (global_mali_profiling_counters[counter_index].counter_id < FIRST_SPECIAL_COUNTER) -+ global_mali_profiling_counters[counter_index].current_counter_value = 0; -+ } -+ } -+ } -+ _mali_profiling_global_stream_list_queue(&global_mali_stream_list->queue_list, mali_counter_stream); -+ mali_counter_stream = NULL; -+ } else { -+ MALI_DEBUG_PRINT(1, ("Not enough mali profiling stream buffer!\n")); -+ } ++ kbasep_remove_waiting_soft_job(katom); ++ kbase_finish_soft_job(katom); + -+ wake_up_interruptible(&stream_fd_wait_queue); ++ if (jd_done_nolock(katom, NULL)) ++ kbase_js_sched_all(katom->kctx->kbdev); ++} + -+ /*Enable the sampling timer again*/ -+ if (0 != num_counters_enabled && 0 != profiling_sample_rate) { -+ hrtimer_forward_now(&profiling_sampling_timer, ns_to_ktime(profiling_sample_rate)); -+ return HRTIMER_RESTART; -+ } -+ return HRTIMER_NORESTART; ++void kbase_sync_fence_out_remove(struct kbase_jd_atom *katom) ++{ ++ kbase_fence_out_remove(katom); +} + -+static void _mali_profiling_sampling_core_activity_switch(int counter_id, int core, u32 activity, u32 pid) ++void kbase_sync_fence_in_remove(struct kbase_jd_atom *katom) +{ -+ unsigned long irq_flags; ++ kbase_fence_free_callbacks(katom); ++ kbase_fence_in_remove(katom); ++} + -+ spin_lock_irqsave(&mali_activity_lock, irq_flags); -+ if (activity == 0) -+ mali_activity_cores_num--; -+ else -+ mali_activity_cores_num++; -+ spin_unlock_irqrestore(&mali_activity_lock, irq_flags); ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++static void kbase_sync_fence_info_get(struct fence *fence, ++ struct kbase_sync_fence_info *info) ++#else ++static void kbase_sync_fence_info_get(struct dma_fence *fence, ++ struct kbase_sync_fence_info *info) ++#endif ++{ ++ info->fence = fence; + -+ if (NULL != global_mali_profiling_counters) { -+ int i ; -+ for (i = 0; i < num_global_mali_profiling_counters; i++) { -+ if (counter_id == global_mali_profiling_counters[i].counter_id && global_mali_profiling_counters[i].enabled) { -+ u64 current_time = _mali_osk_boot_time_get_ns(); -+ u32 add_size = STREAM_HEADER_SIZE; ++ /* translate into CONFIG_SYNC status: ++ * < 0 : error ++ * 0 : active ++ * 1 : signaled ++ */ ++ if (dma_fence_is_signaled(fence)) { ++#if (KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE || \ ++ (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE && \ ++ KERNEL_VERSION(4, 9, 68) <= LINUX_VERSION_CODE)) ++ int status = fence->error; ++#else ++ int status = fence->status; ++#endif ++ if (status < 0) ++ info->status = status; /* signaled with error */ ++ else ++ info->status = 1; /* signaled with success */ ++ } else { ++ info->status = 0; /* still active (unsignaled) */ ++ } + -+ if (NULL != mali_core_activity_stream) { -+ if ((mali_core_activity_stream_dequeue_time + MALI_PROFILING_STREAM_HOLD_TIME < current_time) || -+ (MALI_PROFILING_STREAM_DATA_DEFAULT_SIZE > MALI_PROFILING_STREAM_BUFFER_SIZE -+ - mali_core_activity_stream->used_size)) { -+ _mali_profiling_global_stream_list_queue(&global_mali_stream_list->queue_list, mali_core_activity_stream); -+ mali_core_activity_stream = NULL; -+ wake_up_interruptible(&stream_fd_wait_queue); -+ } -+ } ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) ++ scnprintf(info->name, sizeof(info->name), "%u#%u", ++ fence->context, fence->seqno); ++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)) ++ scnprintf(info->name, sizeof(info->name), "%llu#%u", ++ fence->context, fence->seqno); ++#else ++ scnprintf(info->name, sizeof(info->name), "%llu#%llu", ++ fence->context, fence->seqno); ++#endif ++} + -+ if (NULL == mali_core_activity_stream) { -+ if (_MALI_OSK_ERR_OK == _mali_profiling_global_stream_list_dequeue( -+ &global_mali_stream_list->free_list, &mali_core_activity_stream)) { -+ mali_core_activity_stream_dequeue_time = current_time; -+ } else { -+ MALI_DEBUG_PRINT(1, ("Not enough mali profiling stream buffer!\n")); -+ wake_up_interruptible(&stream_fd_wait_queue); -+ break; -+ } ++int kbase_sync_fence_in_info_get(struct kbase_jd_atom *katom, ++ struct kbase_sync_fence_info *info) ++{ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ struct fence *fence; ++#else ++ struct dma_fence *fence; ++#endif + -+ } ++ fence = kbase_fence_in_get(katom); ++ if (!fence) ++ return -ENOENT; + -+ mali_core_activity_stream->data[mali_core_activity_stream->used_size] = STREAM_HEADER_CORE_ACTIVITY; ++ kbase_sync_fence_info_get(fence, info); + -+ add_size += _mali_profiling_pack_long(mali_core_activity_stream->data, -+ MALI_PROFILING_STREAM_BUFFER_SIZE, mali_core_activity_stream->used_size + add_size, (s64)current_time); -+ add_size += _mali_profiling_pack_int(mali_core_activity_stream->data, -+ MALI_PROFILING_STREAM_BUFFER_SIZE, mali_core_activity_stream->used_size + add_size, core); -+ add_size += _mali_profiling_pack_int(mali_core_activity_stream->data, -+ MALI_PROFILING_STREAM_BUFFER_SIZE, mali_core_activity_stream->used_size + add_size, (s32)global_mali_profiling_counters[i].key); -+ add_size += _mali_profiling_pack_int(mali_core_activity_stream->data, -+ MALI_PROFILING_STREAM_BUFFER_SIZE, mali_core_activity_stream->used_size + add_size, activity); -+ add_size += _mali_profiling_pack_int(mali_core_activity_stream->data, -+ MALI_PROFILING_STREAM_BUFFER_SIZE, mali_core_activity_stream->used_size + add_size, pid); ++ kbase_fence_put(fence); + -+ _mali_profiling_set_packet_size(mali_core_activity_stream->data + mali_core_activity_stream->used_size + 1, -+ add_size - STREAM_HEADER_SIZE); ++ return 0; ++} + -+ mali_core_activity_stream->used_size += add_size; ++int kbase_sync_fence_out_info_get(struct kbase_jd_atom *katom, ++ struct kbase_sync_fence_info *info) ++{ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) ++ struct fence *fence; ++#else ++ struct dma_fence *fence; ++#endif + -+ if (0 == mali_activity_cores_num) { -+ _mali_profiling_global_stream_list_queue(&global_mali_stream_list->queue_list, mali_core_activity_stream); -+ mali_core_activity_stream = NULL; -+ wake_up_interruptible(&stream_fd_wait_queue); -+ } ++ fence = kbase_fence_out_get(katom); ++ if (!fence) ++ return -ENOENT; + -+ break; -+ } -+ } -+ } ++ kbase_sync_fence_info_get(fence, info); ++ ++ kbase_fence_put(fence); ++ ++ return 0; +} + -+static mali_bool _mali_profiling_global_counters_init(void) ++ ++#ifdef CONFIG_MALI_FENCE_DEBUG ++void kbase_sync_fence_in_dump(struct kbase_jd_atom *katom) +{ -+ int core_id, counter_index, counter_number, counter_id; -+ u32 num_l2_cache_cores; -+ u32 num_pp_cores; -+ u32 num_gp_cores = 1; ++ /* Not implemented */ ++} ++#endif +diff --git a/drivers/gpu/arm/midgard/mali_kbase_tlstream.c b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c +new file mode 100755 +index 000000000..c8310c45f +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c +@@ -0,0 +1,2572 @@ ++/* ++ * ++ * (C) COPYRIGHT 2015-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ MALI_DEBUG_ASSERT(NULL == global_mali_profiling_counters); -+ num_pp_cores = mali_pp_get_glob_num_pp_cores(); -+ num_l2_cache_cores = mali_l2_cache_core_get_glob_num_l2_cores(); + -+ num_global_mali_profiling_counters = 3 * (num_gp_cores + num_pp_cores) + 2 * num_l2_cache_cores -+ + MALI_PROFILING_SW_COUNTERS_NUM -+ + MALI_PROFILING_SPECIAL_COUNTERS_NUM -+ + MALI_PROFILING_MEM_COUNTERS_NUM; -+ global_mali_profiling_counters = _mali_osk_calloc(num_global_mali_profiling_counters, sizeof(mali_profiling_counter)); + -+ if (NULL == global_mali_profiling_counters) -+ return MALI_FALSE; ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+ counter_index = 0; -+ /*Vertex processor counters */ -+ for (core_id = 0; core_id < num_gp_cores; core_id ++) { -+ global_mali_profiling_counters[counter_index].counter_id = ACTIVITY_VP_0 + core_id; -+ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, -+ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_VP_%d_active", mali_name, core_id); ++#include ++#include ++#include + -+ for (counter_number = 0; counter_number < 2; counter_number++) { -+ counter_index++; -+ global_mali_profiling_counters[counter_index].counter_id = COUNTER_VP_0_C0 + (2 * core_id) + counter_number; -+ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, -+ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_VP_%d_cnt%d", mali_name, core_id, counter_number); -+ } -+ } ++/*****************************************************************************/ + -+ /* Fragment processors' counters */ -+ for (core_id = 0; core_id < num_pp_cores; core_id++) { -+ counter_index++; -+ global_mali_profiling_counters[counter_index].counter_id = ACTIVITY_FP_0 + core_id; -+ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, -+ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_FP_%d_active", mali_name, core_id); ++/* The version of swtrace protocol used in timeline stream. */ ++#define SWTRACE_VERSION 3 + -+ for (counter_number = 0; counter_number < 2; counter_number++) { -+ counter_index++; -+ global_mali_profiling_counters[counter_index].counter_id = COUNTER_FP_0_C0 + (2 * core_id) + counter_number; -+ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, -+ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_FP_%d_cnt%d", mali_name, core_id, counter_number); -+ } -+ } ++/* The maximum expected length of string in tracepoint descriptor. */ ++#define STRLEN_MAX 64 /* bytes */ + -+ /* L2 Cache counters */ -+ for (core_id = 0; core_id < num_l2_cache_cores; core_id++) { -+ for (counter_number = 0; counter_number < 2; counter_number++) { -+ counter_index++; -+ global_mali_profiling_counters[counter_index].counter_id = COUNTER_L2_0_C0 + (2 * core_id) + counter_number; -+ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, -+ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_L2_%d_cnt%d", mali_name, core_id, counter_number); -+ } -+ } ++/* The number of nanoseconds in a second. */ ++#define NSECS_IN_SEC 1000000000ull /* ns */ + -+ /* Now set up the software counter entries */ -+ for (counter_id = FIRST_SW_COUNTER; counter_id <= LAST_SW_COUNTER; counter_id++) { -+ counter_index++; ++/* The period of autoflush checker execution in milliseconds. */ ++#define AUTOFLUSH_INTERVAL 1000 /* ms */ + -+ if (0 == first_sw_counter_index) -+ first_sw_counter_index = counter_index; ++/* The maximum size of a single packet used by timeline. */ ++#define PACKET_SIZE 4096 /* bytes */ + -+ global_mali_profiling_counters[counter_index].counter_id = counter_id; -+ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, -+ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_SW_%d", mali_name, counter_id - FIRST_SW_COUNTER); -+ } ++/* The number of packets used by one timeline stream. */ ++#define PACKET_COUNT 16 + -+ /* Now set up the special counter entries */ -+ for (counter_id = FIRST_SPECIAL_COUNTER; counter_id <= LAST_SPECIAL_COUNTER; counter_id++) { ++/* The number of bytes reserved for packet header. ++ * These value must be defined according to MIPE documentation. */ ++#define PACKET_HEADER_SIZE 8 /* bytes */ + -+ counter_index++; -+ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, -+ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_%s", -+ mali_name, _mali_special_counter_descriptions[counter_id - FIRST_SPECIAL_COUNTER]); ++/* The number of bytes reserved for packet sequence number. ++ * These value must be defined according to MIPE documentation. */ ++#define PACKET_NUMBER_SIZE 4 /* bytes */ + -+ global_mali_profiling_counters[counter_index].counter_id = counter_id; -+ } ++/* Packet header - first word. ++ * These values must be defined according to MIPE documentation. */ ++#define PACKET_STREAMID_POS 0 ++#define PACKET_STREAMID_LEN 8 ++#define PACKET_RSVD1_POS (PACKET_STREAMID_POS + PACKET_STREAMID_LEN) ++#define PACKET_RSVD1_LEN 8 ++#define PACKET_TYPE_POS (PACKET_RSVD1_POS + PACKET_RSVD1_LEN) ++#define PACKET_TYPE_LEN 3 ++#define PACKET_CLASS_POS (PACKET_TYPE_POS + PACKET_TYPE_LEN) ++#define PACKET_CLASS_LEN 7 ++#define PACKET_FAMILY_POS (PACKET_CLASS_POS + PACKET_CLASS_LEN) ++#define PACKET_FAMILY_LEN 6 + -+ /* Now set up the mem counter entries*/ -+ for (counter_id = FIRST_MEM_COUNTER; counter_id <= LAST_MEM_COUNTER; counter_id++) { ++/* Packet header - second word ++ * These values must be defined according to MIPE documentation. */ ++#define PACKET_LENGTH_POS 0 ++#define PACKET_LENGTH_LEN 24 ++#define PACKET_SEQBIT_POS (PACKET_LENGTH_POS + PACKET_LENGTH_LEN) ++#define PACKET_SEQBIT_LEN 1 ++#define PACKET_RSVD2_POS (PACKET_SEQBIT_POS + PACKET_SEQBIT_LEN) ++#define PACKET_RSVD2_LEN 7 + -+ counter_index++; -+ _mali_osk_snprintf(global_mali_profiling_counters[counter_index].counter_name, -+ sizeof(global_mali_profiling_counters[counter_index].counter_name), "ARM_Mali-%s_%s", -+ mali_name, _mali_mem_counter_descriptions[counter_id - FIRST_MEM_COUNTER]); ++/* Types of streams generated by timeline. ++ * Order is significant! Header streams must precede respective body streams. */ ++enum tl_stream_type { ++ TL_STREAM_TYPE_OBJ_HEADER, ++ TL_STREAM_TYPE_OBJ_SUMMARY, ++ TL_STREAM_TYPE_OBJ, ++ TL_STREAM_TYPE_AUX_HEADER, ++ TL_STREAM_TYPE_AUX, + -+ global_mali_profiling_counters[counter_index].counter_id = counter_id; -+ } ++ TL_STREAM_TYPE_COUNT ++}; + -+ MALI_DEBUG_ASSERT((counter_index + 1) == num_global_mali_profiling_counters); ++/* Timeline packet family ids. ++ * Values are significant! Check MIPE documentation. */ ++enum tl_packet_family { ++ TL_PACKET_FAMILY_CTRL = 0, /* control packets */ ++ TL_PACKET_FAMILY_TL = 1, /* timeline packets */ + -+ return MALI_TRUE; -+} ++ TL_PACKET_FAMILY_COUNT ++}; + -+void _mali_profiling_notification_mem_counter(struct mali_session_data *session, u32 counter_id, u32 key, int enable) -+{ ++/* Packet classes used in timeline streams. ++ * Values are significant! Check MIPE documentation. */ ++enum tl_packet_class { ++ TL_PACKET_CLASS_OBJ = 0, /* timeline objects packet */ ++ TL_PACKET_CLASS_AUX = 1, /* auxiliary events packet */ ++}; + -+ MALI_DEBUG_ASSERT_POINTER(session); ++/* Packet types used in timeline streams. ++ * Values are significant! Check MIPE documentation. */ ++enum tl_packet_type { ++ TL_PACKET_TYPE_HEADER = 0, /* stream's header/directory */ ++ TL_PACKET_TYPE_BODY = 1, /* stream's body */ ++ TL_PACKET_TYPE_SUMMARY = 2, /* stream's summary */ ++}; + -+ if (NULL != session) { -+ _mali_osk_notification_t *notification; -+ _mali_osk_notification_queue_t *queue; ++/* Message ids of trace events that are recorded in the timeline stream. */ ++enum tl_msg_id_obj { ++ /* Timeline object events. */ ++ KBASE_TL_NEW_CTX, ++ KBASE_TL_NEW_GPU, ++ KBASE_TL_NEW_LPU, ++ KBASE_TL_NEW_ATOM, ++ KBASE_TL_NEW_AS, ++ KBASE_TL_DEL_CTX, ++ KBASE_TL_DEL_ATOM, ++ KBASE_TL_LIFELINK_LPU_GPU, ++ KBASE_TL_LIFELINK_AS_GPU, ++ KBASE_TL_RET_CTX_LPU, ++ KBASE_TL_RET_ATOM_CTX, ++ KBASE_TL_RET_ATOM_LPU, ++ KBASE_TL_NRET_CTX_LPU, ++ KBASE_TL_NRET_ATOM_CTX, ++ KBASE_TL_NRET_ATOM_LPU, ++ KBASE_TL_RET_AS_CTX, ++ KBASE_TL_NRET_AS_CTX, ++ KBASE_TL_RET_ATOM_AS, ++ KBASE_TL_NRET_ATOM_AS, ++ KBASE_TL_DEP_ATOM_ATOM, ++ KBASE_TL_NDEP_ATOM_ATOM, ++ KBASE_TL_RDEP_ATOM_ATOM, ++ KBASE_TL_ATTRIB_ATOM_CONFIG, ++ KBASE_TL_ATTRIB_ATOM_PRIORITY, ++ KBASE_TL_ATTRIB_ATOM_STATE, ++ KBASE_TL_ATTRIB_ATOM_PRIORITY_CHANGE, ++ KBASE_TL_ATTRIB_ATOM_JIT, ++ KBASE_TL_ATTRIB_AS_CONFIG, ++ KBASE_TL_EVENT_LPU_SOFTSTOP, ++ KBASE_TL_EVENT_ATOM_SOFTSTOP_EX, ++ KBASE_TL_EVENT_ATOM_SOFTSTOP_ISSUE, + -+ queue = session->ioctl_queue; -+ MALI_DEBUG_ASSERT(NULL != queue); ++ /* Job dump specific events. */ ++ KBASE_JD_GPU_SOFT_RESET ++}; + -+ notification = _mali_osk_notification_create(_MALI_NOTIFICATION_ANNOTATE_PROFILING_MEM_COUNTER, -+ sizeof(_mali_uk_annotate_profiling_mem_counter_s)); ++/* Message ids of trace events that are recorded in the auxiliary stream. */ ++enum tl_msg_id_aux { ++ KBASE_AUX_PM_STATE, ++ KBASE_AUX_PAGEFAULT, ++ KBASE_AUX_PAGESALLOC, ++ KBASE_AUX_DEVFREQ_TARGET, ++ KBASE_AUX_PROTECTED_ENTER_START, ++ KBASE_AUX_PROTECTED_ENTER_END, ++ KBASE_AUX_PROTECTED_LEAVE_START, ++ KBASE_AUX_PROTECTED_LEAVE_END ++}; + -+ if (NULL != notification) { -+ _mali_uk_annotate_profiling_mem_counter_s *data = notification->result_buffer; -+ data->counter_id = counter_id; -+ data->key = key; -+ data->enable = enable; ++/*****************************************************************************/ + -+ _mali_osk_notification_queue_send(queue, notification); -+ } else { -+ MALI_PRINT_ERROR(("Failed to create notification object!\n")); -+ } -+ } else { -+ MALI_PRINT_ERROR(("Failed to find the right session!\n")); -+ } -+} ++/** ++ * struct tl_stream - timeline stream structure ++ * @lock: message order lock ++ * @buffer: array of buffers ++ * @wbi: write buffer index ++ * @rbi: read buffer index ++ * @numbered: if non-zero stream's packets are sequentially numbered ++ * @autoflush_counter: counter tracking stream's autoflush state ++ * ++ * This structure holds information needed to construct proper packets in the ++ * timeline stream. Each message in sequence must bear timestamp that is greater ++ * to one in previous message in the same stream. For this reason lock is held ++ * throughout the process of message creation. Each stream contains set of ++ * buffers. Each buffer will hold one MIPE packet. In case there is no free ++ * space required to store incoming message the oldest buffer is discarded. ++ * Each packet in timeline body stream has sequence number embedded (this value ++ * must increment monotonically and is used by packets receiver to discover ++ * buffer overflows. ++ * Autoflush counter is set to negative number when there is no data pending ++ * for flush and it is set to zero on every update of the buffer. Autoflush ++ * timer will increment the counter by one on every expiry. In case there will ++ * be no activity on the buffer during two consecutive timer expiries, stream ++ * buffer will be flushed. ++ */ ++struct tl_stream { ++ spinlock_t lock; + -+void _mali_profiling_notification_enable(struct mali_session_data *session, u32 sampling_rate, int enable) -+{ -+ MALI_DEBUG_ASSERT_POINTER(session); ++ struct { ++ atomic_t size; /* number of bytes in buffer */ ++ char data[PACKET_SIZE]; /* buffer's data */ ++ } buffer[PACKET_COUNT]; + -+ if (NULL != session) { -+ _mali_osk_notification_t *notification; -+ _mali_osk_notification_queue_t *queue; ++ atomic_t wbi; ++ atomic_t rbi; + -+ queue = session->ioctl_queue; -+ MALI_DEBUG_ASSERT(NULL != queue); ++ int numbered; ++ atomic_t autoflush_counter; ++}; + -+ notification = _mali_osk_notification_create(_MALI_NOTIFICATION_ANNOTATE_PROFILING_ENABLE, -+ sizeof(_mali_uk_annotate_profiling_enable_s)); ++/** ++ * struct tp_desc - tracepoint message descriptor structure ++ * @id: tracepoint ID identifying message in stream ++ * @id_str: human readable version of tracepoint ID ++ * @name: tracepoint description ++ * @arg_types: tracepoint's arguments types declaration ++ * @arg_names: comma separated list of tracepoint's arguments names ++ */ ++struct tp_desc { ++ u32 id; ++ const char *id_str; ++ const char *name; ++ const char *arg_types; ++ const char *arg_names; ++}; + -+ if (NULL != notification) { -+ _mali_uk_annotate_profiling_enable_s *data = notification->result_buffer; -+ data->sampling_rate = sampling_rate; -+ data->enable = enable; ++/*****************************************************************************/ + -+ _mali_osk_notification_queue_send(queue, notification); -+ } else { -+ MALI_PRINT_ERROR(("Failed to create notification object!\n")); -+ } -+ } else { -+ MALI_PRINT_ERROR(("Failed to find the right session!\n")); -+ } -+} ++/* Configuration of timeline streams generated by kernel. ++ * Kernel emit only streams containing either timeline object events or ++ * auxiliary events. All streams have stream id value of 1 (as opposed to user ++ * space streams that have value of 0). */ ++static const struct { ++ enum tl_packet_family pkt_family; ++ enum tl_packet_class pkt_class; ++ enum tl_packet_type pkt_type; ++ unsigned int stream_id; ++} tl_stream_cfg[TL_STREAM_TYPE_COUNT] = { ++ {TL_PACKET_FAMILY_TL, TL_PACKET_CLASS_OBJ, TL_PACKET_TYPE_HEADER, 1}, ++ {TL_PACKET_FAMILY_TL, TL_PACKET_CLASS_OBJ, TL_PACKET_TYPE_SUMMARY, 1}, ++ {TL_PACKET_FAMILY_TL, TL_PACKET_CLASS_OBJ, TL_PACKET_TYPE_BODY, 1}, ++ {TL_PACKET_FAMILY_TL, TL_PACKET_CLASS_AUX, TL_PACKET_TYPE_HEADER, 1}, ++ {TL_PACKET_FAMILY_TL, TL_PACKET_CLASS_AUX, TL_PACKET_TYPE_BODY, 1} ++}; + ++/* The timeline streams generated by kernel. */ ++static struct tl_stream *tl_stream[TL_STREAM_TYPE_COUNT]; + -+_mali_osk_errcode_t _mali_osk_profiling_init(mali_bool auto_start) -+{ -+ int i; -+ mali_profiling_stream *new_mali_profiling_stream = NULL; -+ mali_profiling_stream_list *new_mali_profiling_stream_list = NULL; -+ if (MALI_TRUE == auto_start) { -+ mali_set_user_setting(_MALI_UK_USER_SETTING_SW_EVENTS_ENABLE, MALI_TRUE); -+ } ++/* Autoflush timer. */ ++static struct timer_list autoflush_timer; + -+ /*Init the global_mali_stream_list*/ -+ MALI_DEBUG_ASSERT(NULL == global_mali_stream_list); -+ new_mali_profiling_stream_list = (mali_profiling_stream_list *)kmalloc(sizeof(mali_profiling_stream_list), GFP_KERNEL); ++/* If non-zero autoflush timer is active. */ ++static atomic_t autoflush_timer_active; + -+ if (NULL == new_mali_profiling_stream_list) { -+ return _MALI_OSK_ERR_NOMEM; -+ } ++/* Reader lock. Only one reader is allowed to have access to the timeline ++ * streams at any given time. */ ++static DEFINE_MUTEX(tl_reader_lock); + -+ spin_lock_init(&new_mali_profiling_stream_list->spin_lock); -+ INIT_LIST_HEAD(&new_mali_profiling_stream_list->free_list); -+ INIT_LIST_HEAD(&new_mali_profiling_stream_list->queue_list); ++/* Timeline stream event queue. */ ++static DECLARE_WAIT_QUEUE_HEAD(tl_event_queue); + -+ spin_lock_init(&mali_activity_lock); -+ mali_activity_cores_num = 0; ++/* The timeline stream file operations functions. */ ++static ssize_t kbasep_tlstream_read( ++ struct file *filp, ++ char __user *buffer, ++ size_t size, ++ loff_t *f_pos); ++static unsigned int kbasep_tlstream_poll(struct file *filp, poll_table *wait); ++static int kbasep_tlstream_release(struct inode *inode, struct file *filp); + -+ for (i = 0; i < MALI_PROFILING_STREAM_BUFFER_NUM; i++) { -+ new_mali_profiling_stream = (mali_profiling_stream *)kmalloc(sizeof(mali_profiling_stream), GFP_KERNEL); -+ if (NULL == new_mali_profiling_stream) { -+ _mali_profiling_stream_list_destory(new_mali_profiling_stream_list); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++/* The timeline stream file operations structure. */ ++static const struct file_operations kbasep_tlstream_fops = { ++ .release = kbasep_tlstream_release, ++ .read = kbasep_tlstream_read, ++ .poll = kbasep_tlstream_poll, ++}; + -+ INIT_LIST_HEAD(&new_mali_profiling_stream->list); -+ new_mali_profiling_stream->used_size = 0; -+ list_add_tail(&new_mali_profiling_stream->list, &new_mali_profiling_stream_list->free_list); ++/* Descriptors of timeline messages transmitted in object events stream. */ ++static const struct tp_desc tp_desc_obj[] = { ++ { ++ KBASE_TL_NEW_CTX, ++ __stringify(KBASE_TL_NEW_CTX), ++ "object ctx is created", ++ "@pII", ++ "ctx,ctx_nr,tgid" ++ }, ++ { ++ KBASE_TL_NEW_GPU, ++ __stringify(KBASE_TL_NEW_GPU), ++ "object gpu is created", ++ "@pII", ++ "gpu,gpu_id,core_count" ++ }, ++ { ++ KBASE_TL_NEW_LPU, ++ __stringify(KBASE_TL_NEW_LPU), ++ "object lpu is created", ++ "@pII", ++ "lpu,lpu_nr,lpu_fn" ++ }, ++ { ++ KBASE_TL_NEW_ATOM, ++ __stringify(KBASE_TL_NEW_ATOM), ++ "object atom is created", ++ "@pI", ++ "atom,atom_nr" ++ }, ++ { ++ KBASE_TL_NEW_AS, ++ __stringify(KBASE_TL_NEW_AS), ++ "address space object is created", ++ "@pI", ++ "address_space,as_nr" ++ }, ++ { ++ KBASE_TL_DEL_CTX, ++ __stringify(KBASE_TL_DEL_CTX), ++ "context is destroyed", ++ "@p", ++ "ctx" ++ }, ++ { ++ KBASE_TL_DEL_ATOM, ++ __stringify(KBASE_TL_DEL_ATOM), ++ "atom is destroyed", ++ "@p", ++ "atom" ++ }, ++ { ++ KBASE_TL_LIFELINK_LPU_GPU, ++ __stringify(KBASE_TL_LIFELINK_LPU_GPU), ++ "lpu is deleted with gpu", ++ "@pp", ++ "lpu,gpu" ++ }, ++ { ++ KBASE_TL_LIFELINK_AS_GPU, ++ __stringify(KBASE_TL_LIFELINK_AS_GPU), ++ "address space is deleted with gpu", ++ "@pp", ++ "address_space,gpu" ++ }, ++ { ++ KBASE_TL_RET_CTX_LPU, ++ __stringify(KBASE_TL_RET_CTX_LPU), ++ "context is retained by lpu", ++ "@pp", ++ "ctx,lpu" ++ }, ++ { ++ KBASE_TL_RET_ATOM_CTX, ++ __stringify(KBASE_TL_RET_ATOM_CTX), ++ "atom is retained by context", ++ "@pp", ++ "atom,ctx" ++ }, ++ { ++ KBASE_TL_RET_ATOM_LPU, ++ __stringify(KBASE_TL_RET_ATOM_LPU), ++ "atom is retained by lpu", ++ "@pps", ++ "atom,lpu,attrib_match_list" ++ }, ++ { ++ KBASE_TL_NRET_CTX_LPU, ++ __stringify(KBASE_TL_NRET_CTX_LPU), ++ "context is released by lpu", ++ "@pp", ++ "ctx,lpu" ++ }, ++ { ++ KBASE_TL_NRET_ATOM_CTX, ++ __stringify(KBASE_TL_NRET_ATOM_CTX), ++ "atom is released by context", ++ "@pp", ++ "atom,ctx" ++ }, ++ { ++ KBASE_TL_NRET_ATOM_LPU, ++ __stringify(KBASE_TL_NRET_ATOM_LPU), ++ "atom is released by lpu", ++ "@pp", ++ "atom,lpu" ++ }, ++ { ++ KBASE_TL_RET_AS_CTX, ++ __stringify(KBASE_TL_RET_AS_CTX), ++ "address space is retained by context", ++ "@pp", ++ "address_space,ctx" ++ }, ++ { ++ KBASE_TL_NRET_AS_CTX, ++ __stringify(KBASE_TL_NRET_AS_CTX), ++ "address space is released by context", ++ "@pp", ++ "address_space,ctx" ++ }, ++ { ++ KBASE_TL_RET_ATOM_AS, ++ __stringify(KBASE_TL_RET_ATOM_AS), ++ "atom is retained by address space", ++ "@pp", ++ "atom,address_space" ++ }, ++ { ++ KBASE_TL_NRET_ATOM_AS, ++ __stringify(KBASE_TL_NRET_ATOM_AS), ++ "atom is released by address space", ++ "@pp", ++ "atom,address_space" ++ }, ++ { ++ KBASE_TL_DEP_ATOM_ATOM, ++ __stringify(KBASE_TL_DEP_ATOM_ATOM), ++ "atom2 depends on atom1", ++ "@pp", ++ "atom1,atom2" ++ }, ++ { ++ KBASE_TL_NDEP_ATOM_ATOM, ++ __stringify(KBASE_TL_NDEP_ATOM_ATOM), ++ "atom2 no longer depends on atom1", ++ "@pp", ++ "atom1,atom2" ++ }, ++ { ++ KBASE_TL_RDEP_ATOM_ATOM, ++ __stringify(KBASE_TL_RDEP_ATOM_ATOM), ++ "resolved dependecy of atom2 depending on atom1", ++ "@pp", ++ "atom1,atom2" ++ }, ++ { ++ KBASE_TL_ATTRIB_ATOM_CONFIG, ++ __stringify(KBASE_TL_ATTRIB_ATOM_CONFIG), ++ "atom job slot attributes", ++ "@pLLI", ++ "atom,descriptor,affinity,config" ++ }, ++ { ++ KBASE_TL_ATTRIB_ATOM_PRIORITY, ++ __stringify(KBASE_TL_ATTRIB_ATOM_PRIORITY), ++ "atom priority", ++ "@pI", ++ "atom,prio" ++ }, ++ { ++ KBASE_TL_ATTRIB_ATOM_STATE, ++ __stringify(KBASE_TL_ATTRIB_ATOM_STATE), ++ "atom state", ++ "@pI", ++ "atom,state" ++ }, ++ { ++ KBASE_TL_ATTRIB_ATOM_PRIORITY_CHANGE, ++ __stringify(KBASE_TL_ATTRIB_ATOM_PRIORITY_CHANGE), ++ "atom caused priority change", ++ "@p", ++ "atom" ++ }, ++ { ++ KBASE_TL_ATTRIB_ATOM_JIT, ++ __stringify(KBASE_TL_ATTRIB_ATOM_JIT), ++ "jit done for atom", ++ "@pLL", ++ "atom,edit_addr,new_addr" ++ }, ++ { ++ KBASE_TL_ATTRIB_AS_CONFIG, ++ __stringify(KBASE_TL_ATTRIB_AS_CONFIG), ++ "address space attributes", ++ "@pLLL", ++ "address_space,transtab,memattr,transcfg" ++ }, ++ { ++ KBASE_TL_EVENT_LPU_SOFTSTOP, ++ __stringify(KBASE_TL_EVENT_LPU_SOFTSTOP), ++ "softstop event on given lpu", ++ "@p", ++ "lpu" ++ }, ++ { ++ KBASE_TL_EVENT_ATOM_SOFTSTOP_EX, ++ __stringify(KBASE_TL_EVENT_ATOM_SOFTSTOP_EX), ++ "atom softstopped", ++ "@p", ++ "atom" ++ }, ++ { ++ KBASE_TL_EVENT_ATOM_SOFTSTOP_ISSUE, ++ __stringify(KBASE_TL_EVENT_SOFTSTOP_ISSUE), ++ "atom softstop issued", ++ "@p", ++ "atom" ++ }, ++ { ++ KBASE_JD_GPU_SOFT_RESET, ++ __stringify(KBASE_JD_GPU_SOFT_RESET), ++ "gpu soft reset", ++ "@p", ++ "gpu" ++ }, ++}; + ++/* Descriptors of timeline messages transmitted in auxiliary events stream. */ ++static const struct tp_desc tp_desc_aux[] = { ++ { ++ KBASE_AUX_PM_STATE, ++ __stringify(KBASE_AUX_PM_STATE), ++ "PM state", ++ "@IL", ++ "core_type,core_state_bitset" ++ }, ++ { ++ KBASE_AUX_PAGEFAULT, ++ __stringify(KBASE_AUX_PAGEFAULT), ++ "Page fault", ++ "@IL", ++ "ctx_nr,page_cnt_change" ++ }, ++ { ++ KBASE_AUX_PAGESALLOC, ++ __stringify(KBASE_AUX_PAGESALLOC), ++ "Total alloc pages change", ++ "@IL", ++ "ctx_nr,page_cnt" ++ }, ++ { ++ KBASE_AUX_DEVFREQ_TARGET, ++ __stringify(KBASE_AUX_DEVFREQ_TARGET), ++ "New device frequency target", ++ "@L", ++ "target_freq" ++ }, ++ { ++ KBASE_AUX_PROTECTED_ENTER_START, ++ __stringify(KBASE_AUX_PROTECTED_ENTER_START), ++ "enter protected mode start", ++ "@p", ++ "gpu" ++ }, ++ { ++ KBASE_AUX_PROTECTED_ENTER_END, ++ __stringify(KBASE_AUX_PROTECTED_ENTER_END), ++ "enter protected mode end", ++ "@p", ++ "gpu" ++ }, ++ { ++ KBASE_AUX_PROTECTED_LEAVE_START, ++ __stringify(KBASE_AUX_PROTECTED_LEAVE_START), ++ "leave protected mode start", ++ "@p", ++ "gpu" ++ }, ++ { ++ KBASE_AUX_PROTECTED_LEAVE_END, ++ __stringify(KBASE_AUX_PROTECTED_LEAVE_END), ++ "leave protected mode end", ++ "@p", ++ "gpu" + } ++}; + -+ _mali_osk_atomic_init(&stream_fd_if_used, 0); -+ init_waitqueue_head(&stream_fd_wait_queue); ++#if MALI_UNIT_TEST ++/* Number of bytes read by user. */ ++static atomic_t tlstream_bytes_collected = {0}; + -+ hrtimer_init(&profiling_sampling_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); ++/* Number of bytes generated by tracepoint messages. */ ++static atomic_t tlstream_bytes_generated = {0}; ++#endif /* MALI_UNIT_TEST */ + -+ profiling_sampling_timer.function = _mali_profiling_sampling_counters; ++/*****************************************************************************/ + -+ global_mali_stream_list = new_mali_profiling_stream_list; ++/* Indicator of whether the timeline stream file descriptor is used. */ ++atomic_t kbase_tlstream_enabled = {0}; + -+ return _MALI_OSK_ERR_OK; -+} ++/*****************************************************************************/ + -+void _mali_osk_profiling_term(void) ++/** ++ * kbasep_tlstream_get_timestamp - return timestamp ++ * ++ * Function returns timestamp value based on raw monotonic timer. Value will ++ * wrap around zero in case of overflow. ++ * Return: timestamp value ++ */ ++static u64 kbasep_tlstream_get_timestamp(void) +{ -+ if (0 != profiling_sample_rate) { -+ hrtimer_cancel(&profiling_sampling_timer); -+ profiling_sample_rate = 0; -+ } -+ _mali_osk_atomic_term(&stream_fd_if_used); -+ -+ if (NULL != global_mali_profiling_counters) { -+ _mali_osk_free(global_mali_profiling_counters); -+ global_mali_profiling_counters = NULL; -+ num_global_mali_profiling_counters = 0; -+ } -+ -+ if (NULL != global_mali_stream_list) { -+ _mali_profiling_stream_list_destory(global_mali_stream_list); -+ global_mali_stream_list = NULL; -+ } ++ struct timespec64 ts; ++ u64 timestamp; + ++ ktime_get_raw_ts64(&ts); ++ timestamp = (u64)ts.tv_sec * NSECS_IN_SEC + ts.tv_nsec; ++ return timestamp; +} + -+void _mali_osk_profiling_stop_sampling(u32 pid) ++/** ++ * kbasep_tlstream_write_bytes - write data to message buffer ++ * @buffer: buffer where data will be written ++ * @pos: position in the buffer where to place data ++ * @bytes: pointer to buffer holding data ++ * @len: length of data to be written ++ * ++ * Return: updated position in the buffer ++ */ ++static size_t kbasep_tlstream_write_bytes( ++ char *buffer, ++ size_t pos, ++ const void *bytes, ++ size_t len) +{ -+ if (pid == current_profiling_pid) { ++ KBASE_DEBUG_ASSERT(buffer); ++ KBASE_DEBUG_ASSERT(bytes); + -+ int i; -+ /* Reset all counter states when closing connection.*/ -+ for (i = 0; i < num_global_mali_profiling_counters; ++i) { -+ _mali_profiling_set_event(global_mali_profiling_counters[i].counter_id, MALI_HW_CORE_NO_COUNTER); -+ global_mali_profiling_counters[i].enabled = 0; -+ global_mali_profiling_counters[i].prev_counter_value = 0; -+ global_mali_profiling_counters[i].current_counter_value = 0; -+ } -+ l2_cache_counter_if_enabled = MALI_FALSE; -+ num_counters_enabled = 0; -+ mem_counters_enabled = 0; -+ _mali_profiling_control(FBDUMP_CONTROL_ENABLE, 0); -+ _mali_profiling_control(SW_COUNTER_ENABLE, 0); -+ /* Delete sampling timer when closing connection. */ -+ if (0 != profiling_sample_rate) { -+ hrtimer_cancel(&profiling_sampling_timer); -+ profiling_sample_rate = 0; -+ } -+ current_profiling_pid = 0; -+ } ++ memcpy(&buffer[pos], bytes, len); ++ ++ return pos + len; +} + -+void _mali_osk_profiling_add_event(u32 event_id, u32 data0, u32 data1, u32 data2, u32 data3, u32 data4) ++/** ++ * kbasep_tlstream_write_string - write string to message buffer ++ * @buffer: buffer where data will be written ++ * @pos: position in the buffer where to place data ++ * @string: pointer to buffer holding the source string ++ * @max_write_size: number of bytes that can be stored in buffer ++ * ++ * Return: updated position in the buffer ++ */ ++static size_t kbasep_tlstream_write_string( ++ char *buffer, ++ size_t pos, ++ const char *string, ++ size_t max_write_size) +{ -+ /*Record the freq & volt to global_mali_profiling_counters here. */ -+ if (0 != profiling_sample_rate) { -+ u32 channel; -+ u32 state; -+ channel = (event_id >> 16) & 0xFF; -+ state = ((event_id >> 24) & 0xF) << 24; ++ u32 string_len; + -+ switch (state) { -+ case MALI_PROFILING_EVENT_TYPE_SINGLE: -+ if ((MALI_PROFILING_EVENT_CHANNEL_GPU >> 16) == channel) { -+ u32 reason = (event_id & 0xFFFF); -+ if (MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE == reason) { -+ _mali_osk_profiling_record_global_counters(COUNTER_FREQUENCY, data0); -+ _mali_osk_profiling_record_global_counters(COUNTER_VOLTAGE, data1); -+ } -+ } -+ break; -+ case MALI_PROFILING_EVENT_TYPE_START: -+ if ((MALI_PROFILING_EVENT_CHANNEL_GP0 >> 16) == channel) { -+ _mali_profiling_sampling_core_activity_switch(COUNTER_VP_ACTIVITY, 0, 1, data1); -+ } else if (channel >= (MALI_PROFILING_EVENT_CHANNEL_PP0 >> 16) && -+ (MALI_PROFILING_EVENT_CHANNEL_PP7 >> 16) >= channel) { -+ u32 core_id = channel - (MALI_PROFILING_EVENT_CHANNEL_PP0 >> 16); -+ _mali_profiling_sampling_core_activity_switch(COUNTER_FP_ACTIVITY, core_id, 1, data1); -+ } -+ break; -+ case MALI_PROFILING_EVENT_TYPE_STOP: -+ if ((MALI_PROFILING_EVENT_CHANNEL_GP0 >> 16) == channel) { -+ _mali_profiling_sampling_core_activity_switch(COUNTER_VP_ACTIVITY, 0, 0, 0); -+ } else if (channel >= (MALI_PROFILING_EVENT_CHANNEL_PP0 >> 16) && -+ (MALI_PROFILING_EVENT_CHANNEL_PP7 >> 16) >= channel) { -+ u32 core_id = channel - (MALI_PROFILING_EVENT_CHANNEL_PP0 >> 16); -+ _mali_profiling_sampling_core_activity_switch(COUNTER_FP_ACTIVITY, core_id, 0, 0); -+ } -+ break; -+ default: -+ break; -+ } -+ } -+ trace_mali_timeline_event(event_id, data0, data1, data2, data3, data4); ++ KBASE_DEBUG_ASSERT(buffer); ++ KBASE_DEBUG_ASSERT(string); ++ /* Timeline string consists of at least string length and nul ++ * terminator. */ ++ KBASE_DEBUG_ASSERT(max_write_size >= sizeof(string_len) + sizeof(char)); ++ max_write_size -= sizeof(string_len); ++ ++ string_len = strlcpy( ++ &buffer[pos + sizeof(string_len)], ++ string, ++ max_write_size); ++ string_len += sizeof(char); ++ ++ /* Make sure that the source string fit into the buffer. */ ++ KBASE_DEBUG_ASSERT(string_len <= max_write_size); ++ ++ /* Update string length. */ ++ memcpy(&buffer[pos], &string_len, sizeof(string_len)); ++ ++ return pos + sizeof(string_len) + string_len; +} + -+void _mali_osk_profiling_report_sw_counters(u32 *counters) ++/** ++ * kbasep_tlstream_write_timestamp - write timestamp to message buffer ++ * @buffer: buffer where data will be written ++ * @pos: position in the buffer where to place data ++ * ++ * Return: updated position in the buffer ++ */ ++static size_t kbasep_tlstream_write_timestamp(void *buffer, size_t pos) +{ -+ trace_mali_sw_counters(_mali_osk_get_pid(), _mali_osk_get_tid(), NULL, counters); ++ u64 timestamp = kbasep_tlstream_get_timestamp(); ++ ++ return kbasep_tlstream_write_bytes( ++ buffer, pos, ++ ×tamp, sizeof(timestamp)); +} + -+void _mali_osk_profiling_record_global_counters(int counter_id, u32 value) ++/** ++ * kbasep_tlstream_put_bits - put bits in a word ++ * @word: pointer to the words being modified ++ * @value: value that shall be written to given position ++ * @bitpos: position where value shall be written (in bits) ++ * @bitlen: length of value (in bits) ++ */ ++static void kbasep_tlstream_put_bits( ++ u32 *word, ++ u32 value, ++ unsigned int bitpos, ++ unsigned int bitlen) +{ -+ if (NULL != global_mali_profiling_counters) { -+ int i ; -+ for (i = 0; i < num_global_mali_profiling_counters; i++) { -+ if (counter_id == global_mali_profiling_counters[i].counter_id && global_mali_profiling_counters[i].enabled) { -+ global_mali_profiling_counters[i].current_counter_value = value; -+ break; -+ } -+ } -+ } ++ const u32 mask = ((1 << bitlen) - 1) << bitpos; ++ ++ KBASE_DEBUG_ASSERT(word); ++ KBASE_DEBUG_ASSERT((0 != bitlen) && (32 >= bitlen)); ++ KBASE_DEBUG_ASSERT((bitpos + bitlen) <= 32); ++ ++ *word &= ~mask; ++ *word |= ((value << bitpos) & mask); +} + -+_mali_osk_errcode_t _mali_ukk_profiling_add_event(_mali_uk_profiling_add_event_s *args) ++/** ++ * kbasep_tlstream_packet_header_setup - setup the packet header ++ * @buffer: pointer to the buffer ++ * @pkt_family: packet's family ++ * @pkt_type: packet's type ++ * @pkt_class: packet's class ++ * @stream_id: stream id ++ * @numbered: non-zero if this stream is numbered ++ * ++ * Function sets up immutable part of packet header in the given buffer. ++ */ ++static void kbasep_tlstream_packet_header_setup( ++ char *buffer, ++ enum tl_packet_family pkt_family, ++ enum tl_packet_class pkt_class, ++ enum tl_packet_type pkt_type, ++ unsigned int stream_id, ++ int numbered) +{ -+ /* Always add process and thread identificator in the first two data elements for events from user space */ -+ _mali_osk_profiling_add_event(args->event_id, _mali_osk_get_pid(), _mali_osk_get_tid(), args->data[2], args->data[3], args->data[4]); ++ u32 word0 = 0; ++ u32 word1 = 0; + -+ return _MALI_OSK_ERR_OK; ++ KBASE_DEBUG_ASSERT(buffer); ++ KBASE_DEBUG_ASSERT(pkt_family == TL_PACKET_FAMILY_TL); ++ KBASE_DEBUG_ASSERT( ++ (pkt_type == TL_PACKET_TYPE_HEADER) || ++ (pkt_type == TL_PACKET_TYPE_SUMMARY) || ++ (pkt_type == TL_PACKET_TYPE_BODY)); ++ KBASE_DEBUG_ASSERT( ++ (pkt_class == TL_PACKET_CLASS_OBJ) || ++ (pkt_class == TL_PACKET_CLASS_AUX)); ++ ++ kbasep_tlstream_put_bits( ++ &word0, pkt_family, ++ PACKET_FAMILY_POS, PACKET_FAMILY_LEN); ++ kbasep_tlstream_put_bits( ++ &word0, pkt_class, ++ PACKET_CLASS_POS, PACKET_CLASS_LEN); ++ kbasep_tlstream_put_bits( ++ &word0, pkt_type, ++ PACKET_TYPE_POS, PACKET_TYPE_LEN); ++ kbasep_tlstream_put_bits( ++ &word0, stream_id, ++ PACKET_STREAMID_POS, PACKET_STREAMID_LEN); ++ ++ if (numbered) ++ kbasep_tlstream_put_bits( ++ &word1, 1, ++ PACKET_SEQBIT_POS, PACKET_SEQBIT_LEN); ++ ++ memcpy(&buffer[0], &word0, sizeof(word0)); ++ memcpy(&buffer[sizeof(word0)], &word1, sizeof(word1)); +} + -+_mali_osk_errcode_t _mali_ukk_sw_counters_report(_mali_uk_sw_counters_report_s *args) ++/** ++ * kbasep_tlstream_packet_header_update - update the packet header ++ * @buffer: pointer to the buffer ++ * @data_size: amount of data carried in this packet ++ * ++ * Function updates mutable part of packet header in the given buffer. ++ * Note that value of data_size must not including size of the header. ++ */ ++static void kbasep_tlstream_packet_header_update( ++ char *buffer, ++ size_t data_size) +{ -+ u32 *counters = (u32 *)(uintptr_t)args->counters; ++ u32 word0; ++ u32 word1; + -+ _mali_osk_profiling_report_sw_counters(counters); ++ KBASE_DEBUG_ASSERT(buffer); ++ CSTD_UNUSED(word0); + -+ if (NULL != global_mali_profiling_counters) { -+ int i; -+ for (i = 0; i < MALI_PROFILING_SW_COUNTERS_NUM; i ++) { -+ if (global_mali_profiling_counters[first_sw_counter_index + i].enabled) { -+ global_mali_profiling_counters[first_sw_counter_index + i].current_counter_value = *(counters + i); -+ } -+ } -+ } ++ memcpy(&word1, &buffer[sizeof(word0)], sizeof(word1)); + -+ return _MALI_OSK_ERR_OK; ++ kbasep_tlstream_put_bits( ++ &word1, data_size, ++ PACKET_LENGTH_POS, PACKET_LENGTH_LEN); ++ ++ memcpy(&buffer[sizeof(word0)], &word1, sizeof(word1)); +} + -+_mali_osk_errcode_t _mali_ukk_profiling_stream_fd_get(_mali_uk_profiling_stream_fd_get_s *args) ++/** ++ * kbasep_tlstream_packet_number_update - update the packet number ++ * @buffer: pointer to the buffer ++ * @counter: value of packet counter for this packet's stream ++ * ++ * Function updates packet number embedded within the packet placed in the ++ * given buffer. ++ */ ++static void kbasep_tlstream_packet_number_update(char *buffer, u32 counter) +{ -+ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; -+ MALI_DEBUG_ASSERT_POINTER(session); ++ KBASE_DEBUG_ASSERT(buffer); + -+ if (1 == _mali_osk_atomic_inc_return(&stream_fd_if_used)) { ++ memcpy(&buffer[PACKET_HEADER_SIZE], &counter, sizeof(counter)); ++} + -+ s32 fd = anon_inode_getfd("[mali_profiling_stream]", &mali_profiling_stream_fops, -+ session, -+ O_RDONLY | O_CLOEXEC); ++/** ++ * kbasep_timeline_stream_reset - reset stream ++ * @stream: pointer to the stream structure ++ * ++ * Function discards all pending messages and resets packet counters. ++ */ ++static void kbasep_timeline_stream_reset(struct tl_stream *stream) ++{ ++ unsigned int i; + -+ args->stream_fd = fd; -+ if (0 > fd) { -+ _mali_osk_atomic_dec(&stream_fd_if_used); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ args->stream_fd = fd; -+ } else { -+ _mali_osk_atomic_dec(&stream_fd_if_used); -+ args->stream_fd = -1; -+ return _MALI_OSK_ERR_BUSY; ++ for (i = 0; i < PACKET_COUNT; i++) { ++ if (stream->numbered) ++ atomic_set( ++ &stream->buffer[i].size, ++ PACKET_HEADER_SIZE + ++ PACKET_NUMBER_SIZE); ++ else ++ atomic_set(&stream->buffer[i].size, PACKET_HEADER_SIZE); + } + -+ return _MALI_OSK_ERR_OK; ++ atomic_set(&stream->wbi, 0); ++ atomic_set(&stream->rbi, 0); +} + -+_mali_osk_errcode_t _mali_ukk_profiling_control_set(_mali_uk_profiling_control_set_s *args) ++/** ++ * kbasep_timeline_stream_init - initialize timeline stream ++ * @stream: pointer to the stream structure ++ * @stream_type: stream type ++ */ ++static void kbasep_timeline_stream_init( ++ struct tl_stream *stream, ++ enum tl_stream_type stream_type) +{ -+ u32 control_packet_size; -+ u32 output_buffer_size; ++ unsigned int i; + -+ struct mali_session_data *session = (struct mali_session_data *)(uintptr_t)args->ctx; -+ MALI_DEBUG_ASSERT_POINTER(session); ++ KBASE_DEBUG_ASSERT(stream); ++ KBASE_DEBUG_ASSERT(TL_STREAM_TYPE_COUNT > stream_type); + -+ if (NULL == global_mali_profiling_counters && MALI_FALSE == _mali_profiling_global_counters_init()) { -+ MALI_PRINT_ERROR(("Failed to create global_mali_profiling_counters.\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ spin_lock_init(&stream->lock); + -+ control_packet_size = args->control_packet_size; -+ output_buffer_size = args->response_packet_size; ++ /* All packets carrying tracepoints shall be numbered. */ ++ if (TL_PACKET_TYPE_BODY == tl_stream_cfg[stream_type].pkt_type) ++ stream->numbered = 1; ++ else ++ stream->numbered = 0; + -+ if (0 != control_packet_size) { -+ u8 control_type; -+ u8 *control_packet_data; -+ u8 *response_packet_data; -+ u32 version_length = sizeof(utgard_setup_version) - 1; ++ for (i = 0; i < PACKET_COUNT; i++) ++ kbasep_tlstream_packet_header_setup( ++ stream->buffer[i].data, ++ tl_stream_cfg[stream_type].pkt_family, ++ tl_stream_cfg[stream_type].pkt_class, ++ tl_stream_cfg[stream_type].pkt_type, ++ tl_stream_cfg[stream_type].stream_id, ++ stream->numbered); + -+ control_packet_data = (u8 *)(uintptr_t)args->control_packet_data; -+ MALI_DEBUG_ASSERT_POINTER(control_packet_data); -+ response_packet_data = (u8 *)(uintptr_t)args->response_packet_data; -+ MALI_DEBUG_ASSERT_POINTER(response_packet_data); ++ kbasep_timeline_stream_reset(tl_stream[stream_type]); ++} + -+ /*Decide if need to ignore Utgard setup version.*/ -+ if (control_packet_size >= version_length) { -+ if (0 == memcmp(control_packet_data, utgard_setup_version, version_length)) { -+ if (control_packet_size == version_length) { -+ args->response_packet_size = 0; -+ return _MALI_OSK_ERR_OK; -+ } else { -+ control_packet_data += version_length; -+ control_packet_size -= version_length; -+ } -+ } -+ } ++/** ++ * kbasep_timeline_stream_term - terminate timeline stream ++ * @stream: pointer to the stream structure ++ */ ++static void kbasep_timeline_stream_term(struct tl_stream *stream) ++{ ++ KBASE_DEBUG_ASSERT(stream); ++} + -+ current_profiling_pid = _mali_osk_get_pid(); ++/** ++ * kbasep_tlstream_msgbuf_submit - submit packet to the user space ++ * @stream: pointer to the stream structure ++ * @wb_idx_raw: write buffer index ++ * @wb_size: length of data stored in current buffer ++ * ++ * Function updates currently written buffer with packet header. Then write ++ * index is incremented and buffer is handled to user space. Parameters ++ * of new buffer are returned using provided arguments. ++ * ++ * Return: length of data in new buffer ++ * ++ * Warning: User must update the stream structure with returned value. ++ */ ++static size_t kbasep_tlstream_msgbuf_submit( ++ struct tl_stream *stream, ++ unsigned int wb_idx_raw, ++ unsigned int wb_size) ++{ ++ unsigned int rb_idx_raw = atomic_read(&stream->rbi); ++ unsigned int wb_idx = wb_idx_raw % PACKET_COUNT; + -+ control_type = control_packet_data[0]; -+ switch (control_type) { -+ case PACKET_HEADER_COUNTERS_REQUEST: { -+ int i; ++ /* Set stream as flushed. */ ++ atomic_set(&stream->autoflush_counter, -1); + -+ if (PACKET_HEADER_SIZE > control_packet_size || -+ control_packet_size != _mali_profiling_get_packet_size(control_packet_data + 1)) { -+ MALI_PRINT_ERROR(("Wrong control packet size, type 0x%x,size 0x%x.\n", control_packet_data[0], control_packet_size)); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ kbasep_tlstream_packet_header_update( ++ stream->buffer[wb_idx].data, ++ wb_size - PACKET_HEADER_SIZE); + -+ /* Send supported counters */ -+ if (PACKET_HEADER_SIZE > output_buffer_size) -+ return _MALI_OSK_ERR_FAULT; ++ if (stream->numbered) ++ kbasep_tlstream_packet_number_update( ++ stream->buffer[wb_idx].data, ++ wb_idx_raw); + -+ *response_packet_data = PACKET_HEADER_COUNTERS_ACK; -+ args->response_packet_size = PACKET_HEADER_SIZE; ++ /* Increasing write buffer index will expose this packet to the reader. ++ * As stream->lock is not taken on reader side we must make sure memory ++ * is updated correctly before this will happen. */ ++ smp_wmb(); ++ wb_idx_raw++; ++ atomic_set(&stream->wbi, wb_idx_raw); + -+ for (i = 0; i < num_global_mali_profiling_counters; ++i) { -+ u32 name_size = strlen(global_mali_profiling_counters[i].counter_name); ++ /* Inform user that packets are ready for reading. */ ++ wake_up_interruptible(&tl_event_queue); + -+ if ((args->response_packet_size + name_size + 1) > output_buffer_size) { -+ MALI_PRINT_ERROR(("Response packet data is too large..\n")); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ /* Detect and mark overflow in this stream. */ ++ if (PACKET_COUNT == wb_idx_raw - rb_idx_raw) { ++ /* Reader side depends on this increment to correctly handle ++ * overflows. The value shall be updated only if it was not ++ * modified by the reader. The data holding buffer will not be ++ * updated before stream->lock is released, however size of the ++ * buffer will. Make sure this increment is globally visible ++ * before information about selected write buffer size. */ ++ atomic_cmpxchg(&stream->rbi, rb_idx_raw, rb_idx_raw + 1); ++ } + -+ memcpy(response_packet_data + args->response_packet_size, -+ global_mali_profiling_counters[i].counter_name, name_size + 1); ++ wb_size = PACKET_HEADER_SIZE; ++ if (stream->numbered) ++ wb_size += PACKET_NUMBER_SIZE; + -+ args->response_packet_size += (name_size + 1); ++ return wb_size; ++} + -+ if (global_mali_profiling_counters[i].counter_id == COUNTER_VP_ACTIVITY) { -+ args->response_packet_size += _mali_profiling_pack_int(response_packet_data, -+ output_buffer_size, args->response_packet_size, (s32)1); -+ } else if (global_mali_profiling_counters[i].counter_id == COUNTER_FP_ACTIVITY) { -+ args->response_packet_size += _mali_profiling_pack_int(response_packet_data, -+ output_buffer_size, args->response_packet_size, (s32)mali_pp_get_glob_num_pp_cores()); -+ } else { -+ args->response_packet_size += _mali_profiling_pack_int(response_packet_data, -+ output_buffer_size, args->response_packet_size, (s32) - 1); -+ } -+ } ++/** ++ * kbasep_tlstream_msgbuf_acquire - lock selected stream and reserves buffer ++ * @stream_type: type of the stream that shall be locked ++ * @msg_size: message size ++ * @flags: pointer to store flags passed back on stream release ++ * ++ * Function will lock the stream and reserve the number of bytes requested ++ * in msg_size for the user. ++ * ++ * Return: pointer to the buffer where message can be stored ++ * ++ * Warning: Stream must be released with kbasep_tlstream_msgbuf_release(). ++ * Only atomic operations are allowed while stream is locked ++ * (i.e. do not use any operation that may sleep). ++ */ ++static char *kbasep_tlstream_msgbuf_acquire( ++ enum tl_stream_type stream_type, ++ size_t msg_size, ++ unsigned long *flags) __acquires(&stream->lock) ++{ ++ struct tl_stream *stream; ++ unsigned int wb_idx_raw; ++ unsigned int wb_idx; ++ size_t wb_size; + -+ _mali_profiling_set_packet_size(response_packet_data + 1, args->response_packet_size); -+ break; -+ } ++ KBASE_DEBUG_ASSERT(TL_STREAM_TYPE_COUNT > stream_type); ++ KBASE_DEBUG_ASSERT( ++ PACKET_SIZE - PACKET_HEADER_SIZE - PACKET_NUMBER_SIZE >= ++ msg_size); + -+ case PACKET_HEADER_COUNTERS_ENABLE: { -+ int i; -+ u32 request_pos = PACKET_HEADER_SIZE; -+ mali_bool sw_counter_if_enabled = MALI_FALSE; ++ stream = tl_stream[stream_type]; + -+ if (PACKET_HEADER_SIZE > control_packet_size || -+ control_packet_size != _mali_profiling_get_packet_size(control_packet_data + 1)) { -+ MALI_PRINT_ERROR(("Wrong control packet size , type 0x%x,size 0x%x.\n", control_packet_data[0], control_packet_size)); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ spin_lock_irqsave(&stream->lock, *flags); + -+ /* Init all counter states before enable requested counters.*/ -+ for (i = 0; i < num_global_mali_profiling_counters; ++i) { -+ _mali_profiling_set_event(global_mali_profiling_counters[i].counter_id, MALI_HW_CORE_NO_COUNTER); -+ global_mali_profiling_counters[i].enabled = 0; -+ global_mali_profiling_counters[i].prev_counter_value = 0; -+ global_mali_profiling_counters[i].current_counter_value = 0; ++ wb_idx_raw = atomic_read(&stream->wbi); ++ wb_idx = wb_idx_raw % PACKET_COUNT; ++ wb_size = atomic_read(&stream->buffer[wb_idx].size); + -+ if (global_mali_profiling_counters[i].counter_id >= FIRST_MEM_COUNTER && -+ global_mali_profiling_counters[i].counter_id <= LAST_MEM_COUNTER) { -+ _mali_profiling_notification_mem_counter(session, global_mali_profiling_counters[i].counter_id, 0, 0); -+ } -+ } ++ /* Select next buffer if data will not fit into current one. */ ++ if (PACKET_SIZE < wb_size + msg_size) { ++ wb_size = kbasep_tlstream_msgbuf_submit( ++ stream, wb_idx_raw, wb_size); ++ wb_idx = (wb_idx_raw + 1) % PACKET_COUNT; ++ } + -+ l2_cache_counter_if_enabled = MALI_FALSE; -+ num_counters_enabled = 0; -+ mem_counters_enabled = 0; -+ _mali_profiling_control(FBDUMP_CONTROL_ENABLE, 0); -+ _mali_profiling_control(SW_COUNTER_ENABLE, 0); -+ _mali_profiling_notification_enable(session, 0, 0); ++ /* Reserve space in selected buffer. */ ++ atomic_set(&stream->buffer[wb_idx].size, wb_size + msg_size); + -+ /* Enable requested counters */ -+ while (request_pos < control_packet_size) { -+ u32 begin = request_pos; -+ u32 event; -+ u32 key; ++#if MALI_UNIT_TEST ++ atomic_add(msg_size, &tlstream_bytes_generated); ++#endif /* MALI_UNIT_TEST */ + -+ /* Check the counter name which should be ended with null */ -+ while (request_pos < control_packet_size && control_packet_data[request_pos] != '\0') { -+ ++request_pos; -+ } ++ return &stream->buffer[wb_idx].data[wb_size]; ++} + -+ if (request_pos >= control_packet_size) -+ return _MALI_OSK_ERR_FAULT; ++/** ++ * kbasep_tlstream_msgbuf_release - unlock selected stream ++ * @stream_type: type of the stream that shall be locked ++ * @flags: value obtained during stream acquire ++ * ++ * Function releases stream that has been previously locked with a call to ++ * kbasep_tlstream_msgbuf_acquire(). ++ */ ++static void kbasep_tlstream_msgbuf_release( ++ enum tl_stream_type stream_type, ++ unsigned long flags) __releases(&stream->lock) ++{ ++ struct tl_stream *stream; + -+ ++request_pos; -+ event = _mali_profiling_read_packet_int(control_packet_data, &request_pos, control_packet_size); -+ key = _mali_profiling_read_packet_int(control_packet_data, &request_pos, control_packet_size); ++ KBASE_DEBUG_ASSERT(TL_STREAM_TYPE_COUNT > stream_type); + -+ for (i = 0; i < num_global_mali_profiling_counters; ++i) { -+ u32 name_size = strlen((char *)(control_packet_data + begin)); ++ stream = tl_stream[stream_type]; + -+ if (strncmp(global_mali_profiling_counters[i].counter_name, (char *)(control_packet_data + begin), name_size) == 0) { -+ if (!sw_counter_if_enabled && (FIRST_SW_COUNTER <= global_mali_profiling_counters[i].counter_id -+ && global_mali_profiling_counters[i].counter_id <= LAST_SW_COUNTER)) { -+ sw_counter_if_enabled = MALI_TRUE; -+ _mali_profiling_control(SW_COUNTER_ENABLE, 1); -+ } ++ /* Mark stream as containing unflushed data. */ ++ atomic_set(&stream->autoflush_counter, 0); + -+ if (COUNTER_FILMSTRIP == global_mali_profiling_counters[i].counter_id) { -+ _mali_profiling_control(FBDUMP_CONTROL_ENABLE, 1); -+ _mali_profiling_control(FBDUMP_CONTROL_RATE, event & 0xff); -+ _mali_profiling_control(FBDUMP_CONTROL_RESIZE_FACTOR, (event >> 8) & 0xff); -+ } ++ spin_unlock_irqrestore(&stream->lock, flags); ++} + -+ if (global_mali_profiling_counters[i].counter_id >= FIRST_MEM_COUNTER && -+ global_mali_profiling_counters[i].counter_id <= LAST_MEM_COUNTER) { -+ _mali_profiling_notification_mem_counter(session, global_mali_profiling_counters[i].counter_id, -+ key, 1); -+ mem_counters_enabled++; -+ } ++/*****************************************************************************/ + -+ global_mali_profiling_counters[i].counter_event = event; -+ global_mali_profiling_counters[i].key = key; -+ global_mali_profiling_counters[i].enabled = 1; ++/** ++ * kbasep_tlstream_flush_stream - flush stream ++ * @stype: type of stream to be flushed ++ * ++ * Flush pending data in timeline stream. ++ */ ++static void kbasep_tlstream_flush_stream(enum tl_stream_type stype) ++{ ++ struct tl_stream *stream = tl_stream[stype]; ++ unsigned long flags; ++ unsigned int wb_idx_raw; ++ unsigned int wb_idx; ++ size_t wb_size; ++ size_t min_size = PACKET_HEADER_SIZE; + -+ _mali_profiling_set_event(global_mali_profiling_counters[i].counter_id, -+ global_mali_profiling_counters[i].counter_event); -+ num_counters_enabled++; -+ break; -+ } -+ } ++ if (stream->numbered) ++ min_size += PACKET_NUMBER_SIZE; + -+ if (i == num_global_mali_profiling_counters) { -+ MALI_PRINT_ERROR(("Counter name does not match for type %u.\n", control_type)); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ } ++ spin_lock_irqsave(&stream->lock, flags); + -+ if (PACKET_HEADER_SIZE <= output_buffer_size) { -+ *response_packet_data = PACKET_HEADER_ACK; -+ _mali_profiling_set_packet_size(response_packet_data + 1, PACKET_HEADER_SIZE); -+ args->response_packet_size = PACKET_HEADER_SIZE; -+ } else { -+ return _MALI_OSK_ERR_FAULT; -+ } ++ wb_idx_raw = atomic_read(&stream->wbi); ++ wb_idx = wb_idx_raw % PACKET_COUNT; ++ wb_size = atomic_read(&stream->buffer[wb_idx].size); + -+ break; -+ } ++ if (wb_size > min_size) { ++ wb_size = kbasep_tlstream_msgbuf_submit( ++ stream, wb_idx_raw, wb_size); ++ wb_idx = (wb_idx_raw + 1) % PACKET_COUNT; ++ atomic_set(&stream->buffer[wb_idx].size, wb_size); ++ } ++ spin_unlock_irqrestore(&stream->lock, flags); ++} + -+ case PACKET_HEADER_START_CAPTURE_VALUE: { -+ u32 live_rate; -+ u32 request_pos = PACKET_HEADER_SIZE; ++/** ++ * kbasep_tlstream_autoflush_timer_callback - autoflush timer callback ++ * @data: unused ++ * ++ * Timer is executed periodically to check if any of the stream contains ++ * buffer ready to be submitted to user space. ++ */ ++static void kbasep_tlstream_autoflush_timer_callback(struct timer_list *t) ++{ ++ enum tl_stream_type stype; ++ int rcode; + -+ if (PACKET_HEADER_SIZE > control_packet_size || -+ control_packet_size != _mali_profiling_get_packet_size(control_packet_data + 1)) { -+ MALI_PRINT_ERROR(("Wrong control packet size , type 0x%x,size 0x%x.\n", control_packet_data[0], control_packet_size)); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ CSTD_UNUSED(t); + -+ /* Read samping rate in nanoseconds and live rate, start capture.*/ -+ profiling_sample_rate = _mali_profiling_read_packet_int(control_packet_data, -+ &request_pos, control_packet_size); ++ for (stype = 0; stype < TL_STREAM_TYPE_COUNT; stype++) { ++ struct tl_stream *stream = tl_stream[stype]; ++ unsigned long flags; ++ unsigned int wb_idx_raw; ++ unsigned int wb_idx; ++ size_t wb_size; ++ size_t min_size = PACKET_HEADER_SIZE; + -+ live_rate = _mali_profiling_read_packet_int(control_packet_data, &request_pos, control_packet_size); ++ int af_cnt = atomic_read(&stream->autoflush_counter); + -+ if (PACKET_HEADER_SIZE <= output_buffer_size) { -+ *response_packet_data = PACKET_HEADER_ACK; -+ _mali_profiling_set_packet_size(response_packet_data + 1, PACKET_HEADER_SIZE); -+ args->response_packet_size = PACKET_HEADER_SIZE; -+ } else { -+ return _MALI_OSK_ERR_FAULT; -+ } ++ /* Check if stream contain unflushed data. */ ++ if (0 > af_cnt) ++ continue; + -+ if (0 != num_counters_enabled && 0 != profiling_sample_rate) { -+ _mali_profiling_global_stream_list_free(); -+ if (mem_counters_enabled > 0) { -+ _mali_profiling_notification_enable(session, profiling_sample_rate, 1); -+ } -+ hrtimer_start(&profiling_sampling_timer, -+ ktime_set(profiling_sample_rate / 1000000000, profiling_sample_rate % 1000000000), -+ HRTIMER_MODE_REL_PINNED); -+ } ++ /* Check if stream should be flushed now. */ ++ if (af_cnt != atomic_cmpxchg( ++ &stream->autoflush_counter, ++ af_cnt, ++ af_cnt + 1)) ++ continue; ++ if (!af_cnt) ++ continue; + -+ break; -+ } -+ default: -+ MALI_PRINT_ERROR(("Unsupported profiling packet header type %u.\n", control_type)); -+ args->response_packet_size = 0; -+ return _MALI_OSK_ERR_FAULT; ++ /* Autoflush this stream. */ ++ if (stream->numbered) ++ min_size += PACKET_NUMBER_SIZE; ++ ++ spin_lock_irqsave(&stream->lock, flags); ++ ++ wb_idx_raw = atomic_read(&stream->wbi); ++ wb_idx = wb_idx_raw % PACKET_COUNT; ++ wb_size = atomic_read(&stream->buffer[wb_idx].size); ++ ++ if (wb_size > min_size) { ++ wb_size = kbasep_tlstream_msgbuf_submit( ++ stream, wb_idx_raw, wb_size); ++ wb_idx = (wb_idx_raw + 1) % PACKET_COUNT; ++ atomic_set(&stream->buffer[wb_idx].size, ++ wb_size); + } -+ } else { -+ _mali_osk_profiling_stop_sampling(current_profiling_pid); -+ _mali_profiling_notification_enable(session, 0, 0); ++ spin_unlock_irqrestore(&stream->lock, flags); + } + -+ return _MALI_OSK_ERR_OK; ++ if (atomic_read(&autoflush_timer_active)) ++ rcode = mod_timer( ++ &autoflush_timer, ++ jiffies + msecs_to_jiffies(AUTOFLUSH_INTERVAL)); ++ CSTD_UNUSED(rcode); +} + +/** -+ * Called by gator.ko to set HW counters ++ * kbasep_tlstream_packet_pending - check timeline streams for pending packets ++ * @stype: pointer to variable where stream type will be placed ++ * @rb_idx_raw: pointer to variable where read buffer index will be placed + * -+ * @param counter_id The counter ID. -+ * @param event_id Event ID that the counter should count (HW counter value from TRM). ++ * Function checks all streams for pending packets. It will stop as soon as ++ * packet ready to be submitted to user space is detected. Variables under ++ * pointers, passed as the parameters to this function will be updated with ++ * values pointing to right stream and buffer. + * -+ * @return 1 on success, 0 on failure. ++ * Return: non-zero if any of timeline streams has at last one packet ready + */ -+int _mali_profiling_set_event(u32 counter_id, s32 event_id) ++static int kbasep_tlstream_packet_pending( ++ enum tl_stream_type *stype, ++ unsigned int *rb_idx_raw) +{ -+ if (COUNTER_VP_0_C0 == counter_id) { -+ mali_gp_job_set_gp_counter_src0(event_id); -+ } else if (COUNTER_VP_0_C1 == counter_id) { -+ mali_gp_job_set_gp_counter_src1(event_id); -+ } else if (COUNTER_FP_0_C0 <= counter_id && COUNTER_FP_7_C1 >= counter_id) { -+ /* -+ * Two compatibility notes for this function: -+ * -+ * 1) Previously the DDK allowed per core counters. -+ * -+ * This did not make much sense on Mali-450 with the "virtual PP core" concept, -+ * so this option was removed, and only the same pair of HW counters was allowed on all cores, -+ * beginning with r3p2 release. -+ * -+ * Starting with r4p0, it is now possible to set different HW counters for the different sub jobs. -+ * This should be almost the same, since sub job 0 is designed to run on core 0, -+ * sub job 1 on core 1, and so on. -+ * -+ * The scheduling of PP sub jobs is not predictable, and this often led to situations where core 0 ran 2 -+ * sub jobs, while for instance core 1 ran zero. Having the counters set per sub job would thus increase -+ * the predictability of the returned data (as you would be guaranteed data for all the selected HW counters). -+ * -+ * PS: Core scaling needs to be disabled in order to use this reliably (goes for both solutions). -+ * -+ * The framework/#defines with Gator still indicates that the counter is for a particular core, -+ * but this is internally used as a sub job ID instead (no translation needed). -+ * -+ * 2) Global/default vs per sub job counters -+ * -+ * Releases before r3p2 had only per PP core counters. -+ * r3p2 releases had only one set of default/global counters which applied to all PP cores -+ * Starting with r4p0, we have both a set of default/global counters, -+ * and individual counters per sub job (equal to per core). -+ * -+ * To keep compatibility with Gator/DS-5/streamline, the following scheme is used: -+ * -+ * r3p2 release; only counters set for core 0 is handled, -+ * this is applied as the default/global set of counters, and will thus affect all cores. -+ * -+ * r4p0 release; counters set for core 0 is applied as both the global/default set of counters, -+ * and counters for sub job 0. -+ * Counters set for core 1-7 is only applied for the corresponding sub job. -+ * -+ * This should allow the DS-5/Streamline GUI to have a simple mode where it only allows setting the -+ * values for core 0, and thus this will be applied to all PP sub jobs/cores. -+ * Advanced mode will also be supported, where individual pairs of HW counters can be selected. -+ * -+ * The GUI will (until it is updated) still refer to cores instead of sub jobs, but this is probably -+ * something we can live with! -+ * -+ * Mali-450 note: Each job is not divided into a deterministic number of sub jobs, as the HW DLBU -+ * automatically distributes the load between whatever number of cores is available at this particular time. -+ * A normal PP job on Mali-450 is thus considered a single (virtual) job, and it will thus only be possible -+ * to use a single pair of HW counters (even if the job ran on multiple PP cores). -+ * In other words, only the global/default pair of PP HW counters will be used for normal Mali-450 jobs. -+ */ -+ u32 sub_job = (counter_id - COUNTER_FP_0_C0) >> 1; -+ u32 counter_src = (counter_id - COUNTER_FP_0_C0) & 1; -+ if (0 == counter_src) { -+ mali_pp_job_set_pp_counter_sub_job_src0(sub_job, event_id); -+ if (0 == sub_job) { -+ mali_pp_job_set_pp_counter_global_src0(event_id); -+ } -+ } else { -+ mali_pp_job_set_pp_counter_sub_job_src1(sub_job, event_id); -+ if (0 == sub_job) { -+ mali_pp_job_set_pp_counter_global_src1(event_id); -+ } -+ } -+ } else if (COUNTER_L2_0_C0 <= counter_id && COUNTER_L2_2_C1 >= counter_id) { -+ u32 core_id = (counter_id - COUNTER_L2_0_C0) >> 1; -+ struct mali_l2_cache_core *l2_cache_core = mali_l2_cache_core_get_glob_l2_core(core_id); ++ int pending = 0; + -+ if (NULL != l2_cache_core) { -+ u32 counter_src = (counter_id - COUNTER_L2_0_C0) & 1; -+ mali_l2_cache_core_set_counter_src(l2_cache_core, -+ counter_src, event_id); -+ l2_cache_counter_if_enabled = MALI_TRUE; ++ KBASE_DEBUG_ASSERT(stype); ++ KBASE_DEBUG_ASSERT(rb_idx_raw); ++ ++ for ( ++ *stype = 0; ++ (*stype < TL_STREAM_TYPE_COUNT) && !pending; ++ (*stype)++) { ++ if (NULL != tl_stream[*stype]) { ++ *rb_idx_raw = atomic_read(&tl_stream[*stype]->rbi); ++ /* Read buffer index may be updated by writer in case of ++ * overflow. Read and write buffer indexes must be ++ * loaded in correct order. */ ++ smp_rmb(); ++ if (atomic_read(&tl_stream[*stype]->wbi) != *rb_idx_raw) ++ pending = 1; + } -+ } else { -+ return 0; /* Failure, unknown event */ + } ++ (*stype)--; + -+ return 1; /* success */ ++ return pending; +} + +/** -+ * Called by gator.ko to retrieve the L2 cache counter values for all L2 cache cores. -+ * The L2 cache counters are unique in that they are polled by gator, rather than being -+ * transmitted via the tracepoint mechanism. ++ * kbasep_tlstream_read - copy data from streams to buffer provided by user ++ * @filp: pointer to file structure (unused) ++ * @buffer: pointer to the buffer provided by user ++ * @size: maximum amount of data that can be stored in the buffer ++ * @f_pos: pointer to file offset (unused) + * -+ * @param values Pointer to a _mali_profiling_l2_counter_values structure where -+ * the counter sources and values will be output -+ * @return 0 if all went well; otherwise, return the mask with the bits set for the powered off cores ++ * Return: number of bytes stored in the buffer + */ -+u32 _mali_profiling_get_l2_counters(_mali_profiling_l2_counter_values *values) ++static ssize_t kbasep_tlstream_read( ++ struct file *filp, ++ char __user *buffer, ++ size_t size, ++ loff_t *f_pos) +{ -+ u32 l2_cores_num = mali_l2_cache_core_get_glob_num_l2_cores(); -+ u32 i; ++ ssize_t copy_len = 0; + -+ MALI_DEBUG_ASSERT(l2_cores_num <= 3); ++ KBASE_DEBUG_ASSERT(filp); ++ KBASE_DEBUG_ASSERT(f_pos); + -+ for (i = 0; i < l2_cores_num; i++) { -+ struct mali_l2_cache_core *l2_cache = mali_l2_cache_core_get_glob_l2_core(i); ++ if (!buffer) ++ return -EINVAL; + -+ if (NULL == l2_cache) { -+ continue; ++ if ((0 > *f_pos) || (PACKET_SIZE > size)) ++ return -EINVAL; ++ ++ mutex_lock(&tl_reader_lock); ++ ++ while (copy_len < size) { ++ enum tl_stream_type stype; ++ unsigned int rb_idx_raw = 0; ++ unsigned int rb_idx; ++ size_t rb_size; ++ ++ /* If we don't have any data yet, wait for packet to be ++ * submitted. If we already read some packets and there is no ++ * packet pending return back to user. */ ++ if (0 < copy_len) { ++ if (!kbasep_tlstream_packet_pending( ++ &stype, ++ &rb_idx_raw)) ++ break; ++ } else { ++ if (wait_event_interruptible( ++ tl_event_queue, ++ kbasep_tlstream_packet_pending( ++ &stype, ++ &rb_idx_raw))) { ++ copy_len = -ERESTARTSYS; ++ break; ++ } + } + -+ mali_l2_cache_core_get_counter_values(l2_cache, -+ &values->cores[i].source0, -+ &values->cores[i].value0, -+ &values->cores[i].source1, -+ &values->cores[i].value1); ++ /* Check if this packet fits into the user buffer. ++ * If so copy its content. */ ++ rb_idx = rb_idx_raw % PACKET_COUNT; ++ rb_size = atomic_read(&tl_stream[stype]->buffer[rb_idx].size); ++ if (rb_size > size - copy_len) ++ break; ++ if (copy_to_user( ++ &buffer[copy_len], ++ tl_stream[stype]->buffer[rb_idx].data, ++ rb_size)) { ++ copy_len = -EFAULT; ++ break; ++ } ++ ++ /* If the rbi still points to the packet we just processed ++ * then there was no overflow so we add the copied size to ++ * copy_len and move rbi on to the next packet ++ */ ++ smp_rmb(); ++ if (atomic_read(&tl_stream[stype]->rbi) == rb_idx_raw) { ++ copy_len += rb_size; ++ atomic_inc(&tl_stream[stype]->rbi); ++ ++#if MALI_UNIT_TEST ++ atomic_add(rb_size, &tlstream_bytes_collected); ++#endif /* MALI_UNIT_TEST */ ++ } + } + -+ return 0; ++ mutex_unlock(&tl_reader_lock); ++ ++ return copy_len; +} + +/** -+ * Called by gator to control the production of profiling information at runtime. ++ * kbasep_tlstream_poll - poll timeline stream for packets ++ * @filp: pointer to file structure ++ * @wait: pointer to poll table ++ * Return: POLLIN if data can be read without blocking, otherwise zero + */ -+void _mali_profiling_control(u32 action, u32 value) ++static unsigned int kbasep_tlstream_poll(struct file *filp, poll_table *wait) +{ -+ switch (action) { -+ case FBDUMP_CONTROL_ENABLE: -+ mali_set_user_setting(_MALI_UK_USER_SETTING_COLORBUFFER_CAPTURE_ENABLED, (value == 0 ? MALI_FALSE : MALI_TRUE)); -+ break; -+ case FBDUMP_CONTROL_RATE: -+ mali_set_user_setting(_MALI_UK_USER_SETTING_BUFFER_CAPTURE_N_FRAMES, value); -+ break; -+ case SW_COUNTER_ENABLE: -+ mali_set_user_setting(_MALI_UK_USER_SETTING_SW_COUNTER_ENABLED, value); -+ break; -+ case FBDUMP_CONTROL_RESIZE_FACTOR: -+ mali_set_user_setting(_MALI_UK_USER_SETTING_BUFFER_CAPTURE_RESIZE_FACTOR, value); -+ break; -+ default: -+ break; /* Ignore unimplemented actions */ -+ } ++ enum tl_stream_type stream_type; ++ unsigned int rb_idx; ++ ++ KBASE_DEBUG_ASSERT(filp); ++ KBASE_DEBUG_ASSERT(wait); ++ ++ poll_wait(filp, &tl_event_queue, wait); ++ if (kbasep_tlstream_packet_pending(&stream_type, &rb_idx)) ++ return POLLIN; ++ return 0; +} + +/** -+ * Called by gator to get mali api version. ++ * kbasep_tlstream_release - release timeline stream descriptor ++ * @inode: pointer to inode structure ++ * @filp: pointer to file structure ++ * ++ * Return always return zero + */ -+u32 _mali_profiling_get_api_version(void) ++static int kbasep_tlstream_release(struct inode *inode, struct file *filp) +{ -+ return MALI_PROFILING_API_VERSION; ++ KBASE_DEBUG_ASSERT(inode); ++ KBASE_DEBUG_ASSERT(filp); ++ CSTD_UNUSED(inode); ++ CSTD_UNUSED(filp); ++ ++ /* Stop autoflush timer before releasing access to streams. */ ++ atomic_set(&autoflush_timer_active, 0); ++ del_timer_sync(&autoflush_timer); ++ ++ atomic_set(&kbase_tlstream_enabled, 0); ++ return 0; +} + +/** -+* Called by gator to get the data about Mali instance in use: -+* product id, version, number of cores -+*/ -+void _mali_profiling_get_mali_version(struct _mali_profiling_mali_version *values) ++ * kbasep_tlstream_timeline_header - prepare timeline header stream packet ++ * @stream_type: type of the stream that will carry header data ++ * @tp_desc: pointer to array with tracepoint descriptors ++ * @tp_count: number of descriptors in the given array ++ * ++ * Functions fills in information about tracepoints stored in body stream ++ * associated with this header stream. ++ */ ++static void kbasep_tlstream_timeline_header( ++ enum tl_stream_type stream_type, ++ const struct tp_desc *tp_desc, ++ u32 tp_count) +{ -+ values->mali_product_id = (u32)mali_kernel_core_get_product_id(); -+ values->mali_version_major = mali_kernel_core_get_gpu_major_version(); -+ values->mali_version_minor = mali_kernel_core_get_gpu_minor_version(); -+ values->num_of_l2_cores = mali_l2_cache_core_get_glob_num_l2_cores(); -+ values->num_of_fp_cores = mali_executor_get_num_cores_total(); -+ values->num_of_vp_cores = 1; -+} ++ const u8 tv = SWTRACE_VERSION; /* protocol version */ ++ const u8 ps = sizeof(void *); /* pointer size */ ++ size_t msg_size = sizeof(tv) + sizeof(ps) + sizeof(tp_count); ++ char *buffer; ++ size_t pos = 0; ++ unsigned long flags; ++ unsigned int i; + ++ KBASE_DEBUG_ASSERT(TL_STREAM_TYPE_COUNT > stream_type); ++ KBASE_DEBUG_ASSERT(tp_desc); + -+EXPORT_SYMBOL(_mali_profiling_set_event); -+EXPORT_SYMBOL(_mali_profiling_get_l2_counters); -+EXPORT_SYMBOL(_mali_profiling_control); -+EXPORT_SYMBOL(_mali_profiling_get_api_version); -+EXPORT_SYMBOL(_mali_profiling_get_mali_version); -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h b/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h -new file mode 100755 -index 000000000000..af51161f9da1 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h -@@ -0,0 +1,74 @@ -+/* -+ * Copyright (C) 2010, 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ /* Calculate the size of the timeline message. */ ++ for (i = 0; i < tp_count; i++) { ++ msg_size += sizeof(tp_desc[i].id); ++ msg_size += ++ strnlen(tp_desc[i].id_str, STRLEN_MAX) + ++ sizeof(char) + sizeof(u32); ++ msg_size += ++ strnlen(tp_desc[i].name, STRLEN_MAX) + ++ sizeof(char) + sizeof(u32); ++ msg_size += ++ strnlen(tp_desc[i].arg_types, STRLEN_MAX) + ++ sizeof(char) + sizeof(u32); ++ msg_size += ++ strnlen(tp_desc[i].arg_names, STRLEN_MAX) + ++ sizeof(char) + sizeof(u32); ++ } + -+/** -+ * @file mali_osk_specific.h -+ * Defines per-OS Kernel level specifics, such as unusual workarounds for -+ * certain OSs. -+ */ ++ KBASE_DEBUG_ASSERT(PACKET_SIZE - PACKET_HEADER_SIZE >= msg_size); + -+#ifndef __MALI_OSK_SPECIFIC_H__ -+#define __MALI_OSK_SPECIFIC_H__ ++ buffer = kbasep_tlstream_msgbuf_acquire(stream_type, msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+#include -+#include -+#include -+#include -+#include -+#include ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &tv, sizeof(tv)); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &ps, sizeof(ps)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &tp_count, sizeof(tp_count)); + ++ for (i = 0; i < tp_count; i++) { ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, ++ &tp_desc[i].id, sizeof(tp_desc[i].id)); ++ pos = kbasep_tlstream_write_string( ++ buffer, pos, ++ tp_desc[i].id_str, msg_size - pos); ++ pos = kbasep_tlstream_write_string( ++ buffer, pos, ++ tp_desc[i].name, msg_size - pos); ++ pos = kbasep_tlstream_write_string( ++ buffer, pos, ++ tp_desc[i].arg_types, msg_size - pos); ++ pos = kbasep_tlstream_write_string( ++ buffer, pos, ++ tp_desc[i].arg_names, msg_size - pos); ++ } + -+#include "mali_osk_types.h" -+#include "mali_kernel_linux.h" ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+#define MALI_STATIC_INLINE static inline -+#define MALI_NON_STATIC_INLINE inline ++ kbasep_tlstream_msgbuf_release(stream_type, flags); + -+typedef struct dma_pool *mali_dma_pool; ++ /* We don't expect any more data to be read in this stream. ++ * As header stream must be read before its associated body stream, ++ * make this packet visible to the user straightaway. */ ++ kbasep_tlstream_flush_stream(stream_type); ++} + -+typedef u32 mali_dma_addr; ++/*****************************************************************************/ + -+#if MALI_ENABLE_CPU_CYCLES -+/* Reads out the clock cycle performance counter of the current cpu. -+ It is useful for cost-free (2 cycle) measuring of the time spent -+ in a code path. Sample before and after, the diff number of cycles. -+ When the CPU is idle it will not increase this clock counter. -+ It means that the counter is accurate if only spin-locks are used, -+ but mutexes may lead to too low values since the cpu might "idle" -+ waiting for the mutex to become available. -+ The clock source is configured on the CPU during mali module load, -+ but will not give useful output after a CPU has been power cycled. -+ It is therefore important to configure the system to not turn of -+ the cpu cores when using this functionallity.*/ -+static inline unsigned int mali_get_cpu_cyclecount(void) ++int kbase_tlstream_init(void) +{ -+ unsigned int value; -+ /* Reading the CCNT Register - CPU clock counter */ -+ asm volatile("MRC p15, 0, %0, c9, c13, 0\t\n": "=r"(value)); -+ return value; -+} ++ enum tl_stream_type i; + -+void mali_init_cpu_time_counters(int reset, int enable_divide_by_64); -+#endif ++ /* Prepare stream structures. */ ++ for (i = 0; i < TL_STREAM_TYPE_COUNT; i++) { ++ tl_stream[i] = kmalloc(sizeof(**tl_stream), GFP_KERNEL); ++ if (!tl_stream[i]) ++ break; ++ kbasep_timeline_stream_init(tl_stream[i], i); ++ } ++ if (TL_STREAM_TYPE_COUNT > i) { ++ for (; i > 0; i--) { ++ kbasep_timeline_stream_term(tl_stream[i - 1]); ++ kfree(tl_stream[i - 1]); ++ } ++ return -ENOMEM; ++ } + ++ /* Initialize autoflush timer. */ ++ atomic_set(&autoflush_timer_active, 0); ++ timer_setup(&autoflush_timer, ++ kbasep_tlstream_autoflush_timer_callback, ++ 0); + -+MALI_STATIC_INLINE u32 _mali_osk_copy_from_user(void *to, void *from, u32 n) -+{ -+ return (u32)copy_from_user(to, from, (unsigned long)n); ++ return 0; +} + -+MALI_STATIC_INLINE mali_bool _mali_osk_in_atomic(void) ++void kbase_tlstream_term(void) +{ -+ return in_atomic(); ++ enum tl_stream_type i; ++ ++ for (i = 0; i < TL_STREAM_TYPE_COUNT; i++) { ++ kbasep_timeline_stream_term(tl_stream[i]); ++ kfree(tl_stream[i]); ++ } +} + -+#define _mali_osk_put_user(x, ptr) put_user(x, ptr) ++static void kbase_create_timeline_objects(struct kbase_context *kctx) ++{ ++ struct kbase_device *kbdev = kctx->kbdev; ++ unsigned int lpu_id; ++ unsigned int as_nr; ++ struct kbasep_kctx_list_element *element; + -+#endif /* __MALI_OSK_SPECIFIC_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c -new file mode 100755 -index 000000000000..d295e712ac7a ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c -@@ -0,0 +1,59 @@ -+/* -+ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ /* Create LPU objects. */ ++ for (lpu_id = 0; lpu_id < kbdev->gpu_props.num_job_slots; lpu_id++) { ++ u32 *lpu = ++ &kbdev->gpu_props.props.raw_props.js_features[lpu_id]; ++ KBASE_TLSTREAM_TL_SUMMARY_NEW_LPU(lpu, lpu_id, *lpu); ++ } + -+/** -+ * @file mali_osk_time.c -+ * Implementation of the OS abstraction layer for the kernel device driver -+ */ ++ /* Create Address Space objects. */ ++ for (as_nr = 0; as_nr < kbdev->nr_hw_address_spaces; as_nr++) ++ KBASE_TLSTREAM_TL_SUMMARY_NEW_AS(&kbdev->as[as_nr], as_nr); + -+#include "mali_osk.h" -+#include -+#include -+#include -+ -+mali_bool _mali_osk_time_after_eq(unsigned long ticka, unsigned long tickb) -+{ -+ return time_after_eq(ticka, tickb) ? -+ MALI_TRUE : MALI_FALSE; -+} -+ -+unsigned long _mali_osk_time_mstoticks(u32 ms) -+{ -+ return msecs_to_jiffies(ms); -+} ++ /* Create GPU object and make it retain all LPUs and address spaces. */ ++ KBASE_TLSTREAM_TL_SUMMARY_NEW_GPU( ++ kbdev, ++ kbdev->gpu_props.props.raw_props.gpu_id, ++ kbdev->gpu_props.num_cores); + -+u32 _mali_osk_time_tickstoms(unsigned long ticks) -+{ -+ return jiffies_to_msecs(ticks); -+} ++ for (lpu_id = 0; lpu_id < kbdev->gpu_props.num_job_slots; lpu_id++) { ++ void *lpu = ++ &kbdev->gpu_props.props.raw_props.js_features[lpu_id]; ++ KBASE_TLSTREAM_TL_SUMMARY_LIFELINK_LPU_GPU(lpu, kbdev); ++ } ++ for (as_nr = 0; as_nr < kbdev->nr_hw_address_spaces; as_nr++) ++ KBASE_TLSTREAM_TL_SUMMARY_LIFELINK_AS_GPU( ++ &kbdev->as[as_nr], ++ kbdev); + -+unsigned long _mali_osk_time_tickcount(void) -+{ -+ return jiffies; ++ /* Create object for each known context. */ ++ mutex_lock(&kbdev->kctx_list_lock); ++ list_for_each_entry(element, &kbdev->kctx_list, link) { ++ KBASE_TLSTREAM_TL_SUMMARY_NEW_CTX( ++ element->kctx, ++ (u32)(element->kctx->id), ++ (u32)(element->kctx->tgid)); ++ } ++ /* Before releasing the lock, reset body stream buffers. ++ * This will prevent context creation message to be directed to both ++ * summary and body stream. ++ */ ++ kbase_tlstream_reset_body_streams(); ++ mutex_unlock(&kbdev->kctx_list_lock); ++ /* Static object are placed into summary packet that needs to be ++ * transmitted first. Flush all streams to make it available to ++ * user space. ++ */ ++ kbase_tlstream_flush_streams(); +} + -+void _mali_osk_time_ubusydelay(u32 usecs) ++int kbase_tlstream_acquire(struct kbase_context *kctx, u32 flags) +{ -+ udelay(usecs); -+} ++ int ret; ++ u32 tlstream_enabled = TLSTREAM_ENABLED | flags; + -+u64 _mali_osk_time_get_ns(void) -+{ -+ struct timespec64 tsval; -+ ktime_get_real_ts64(&tsval); -+ return (u64)timespec64_to_ns(&tsval); -+} ++ if (0 == atomic_cmpxchg(&kbase_tlstream_enabled, 0, tlstream_enabled)) { ++ int rcode; + -+u64 _mali_osk_boot_time_get_ns(void) -+{ -+ struct timespec64 tsval; -+ ktime_get_boottime_ts64(&tsval); -+ return (u64)timespec64_to_ns(&tsval); -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c -new file mode 100755 -index 000000000000..d01c1148272a ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c -@@ -0,0 +1,76 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ ret = anon_inode_getfd( ++ "[mali_tlstream]", ++ &kbasep_tlstream_fops, ++ kctx, ++ O_RDONLY | O_CLOEXEC); ++ if (ret < 0) { ++ atomic_set(&kbase_tlstream_enabled, 0); ++ return ret; ++ } + -+/** -+ * @file mali_osk_timers.c -+ * Implementation of the OS abstraction layer for the kernel device driver -+ */ ++ /* Reset and initialize header streams. */ ++ kbasep_timeline_stream_reset( ++ tl_stream[TL_STREAM_TYPE_OBJ_HEADER]); ++ kbasep_timeline_stream_reset( ++ tl_stream[TL_STREAM_TYPE_OBJ_SUMMARY]); ++ kbasep_timeline_stream_reset( ++ tl_stream[TL_STREAM_TYPE_AUX_HEADER]); ++ kbasep_tlstream_timeline_header( ++ TL_STREAM_TYPE_OBJ_HEADER, ++ tp_desc_obj, ++ ARRAY_SIZE(tp_desc_obj)); ++ kbasep_tlstream_timeline_header( ++ TL_STREAM_TYPE_AUX_HEADER, ++ tp_desc_aux, ++ ARRAY_SIZE(tp_desc_aux)); + -+#include -+#include -+#include "mali_osk.h" -+#include "mali_kernel_common.h" ++ /* Start autoflush timer. */ ++ atomic_set(&autoflush_timer_active, 1); ++ rcode = mod_timer( ++ &autoflush_timer, ++ jiffies + msecs_to_jiffies(AUTOFLUSH_INTERVAL)); ++ CSTD_UNUSED(rcode); + -+struct _mali_osk_timer_t_struct { -+ struct timer_list timer; -+}; ++ /* If job dumping is enabled, readjust the software event's ++ * timeout as the default value of 3 seconds is often ++ * insufficient. */ ++ if (flags & BASE_TLSTREAM_JOB_DUMPING_ENABLED) { ++ dev_info(kctx->kbdev->dev, ++ "Job dumping is enabled, readjusting the software event's timeout\n"); ++ atomic_set(&kctx->kbdev->js_data.soft_job_timeout_ms, ++ 1800000); ++ } + -+typedef void (*timer_timeout_function_t)(unsigned long); ++ /* Summary stream was cleared during acquire. ++ * Create static timeline objects that will be ++ * read by client. ++ */ ++ kbase_create_timeline_objects(kctx); + -+_mali_osk_timer_t *_mali_osk_timer_init(_mali_osk_timer_callback_t callback) -+{ -+ _mali_osk_timer_t *t = (_mali_osk_timer_t *)kmalloc(sizeof(_mali_osk_timer_t), GFP_KERNEL); -+ if (NULL != t) -+ timer_setup(&t->timer, -+ (void (*)(struct timer_list *))callback, 0); -+ return t; -+} ++ } else { ++ ret = -EBUSY; ++ } + -+void _mali_osk_timer_add(_mali_osk_timer_t *tim, unsigned long ticks_to_expire) -+{ -+ MALI_DEBUG_ASSERT_POINTER(tim); -+ tim->timer.expires = jiffies + ticks_to_expire; -+ add_timer(&(tim->timer)); ++ return ret; +} + -+void _mali_osk_timer_mod(_mali_osk_timer_t *tim, unsigned long ticks_to_expire) ++void kbase_tlstream_flush_streams(void) +{ -+ MALI_DEBUG_ASSERT_POINTER(tim); -+ mod_timer(&(tim->timer), jiffies + ticks_to_expire); -+} ++ enum tl_stream_type stype; + -+void _mali_osk_timer_del(_mali_osk_timer_t *tim) -+{ -+ MALI_DEBUG_ASSERT_POINTER(tim); -+ del_timer_sync(&(tim->timer)); ++ for (stype = 0; stype < TL_STREAM_TYPE_COUNT; stype++) ++ kbasep_tlstream_flush_stream(stype); +} + -+void _mali_osk_timer_del_async(_mali_osk_timer_t *tim) ++void kbase_tlstream_reset_body_streams(void) +{ -+ MALI_DEBUG_ASSERT_POINTER(tim); -+ del_timer(&(tim->timer)); ++ kbasep_timeline_stream_reset( ++ tl_stream[TL_STREAM_TYPE_OBJ]); ++ kbasep_timeline_stream_reset( ++ tl_stream[TL_STREAM_TYPE_AUX]); +} + -+mali_bool _mali_osk_timer_pending(_mali_osk_timer_t *tim) ++#if MALI_UNIT_TEST ++void kbase_tlstream_stats(u32 *bytes_collected, u32 *bytes_generated) +{ -+ MALI_DEBUG_ASSERT_POINTER(tim); -+ return 1 == timer_pending(&(tim->timer)); ++ KBASE_DEBUG_ASSERT(bytes_collected); ++ KBASE_DEBUG_ASSERT(bytes_generated); ++ *bytes_collected = atomic_read(&tlstream_bytes_collected); ++ *bytes_generated = atomic_read(&tlstream_bytes_generated); +} ++#endif /* MALI_UNIT_TEST */ + -+void _mali_osk_timer_setcallback(_mali_osk_timer_t *tim, _mali_osk_timer_callback_t callback, void *data) -+{ -+ MALI_DEBUG_ASSERT_POINTER(tim); -+} ++/*****************************************************************************/ + -+void _mali_osk_timer_term(_mali_osk_timer_t *tim) ++void __kbase_tlstream_tl_summary_new_ctx(void *context, u32 nr, u32 tgid) +{ -+ MALI_DEBUG_ASSERT_POINTER(tim); -+ kfree(tim); -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c -new file mode 100755 -index 000000000000..fa12abd3f5dc ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c -@@ -0,0 +1,78 @@ -+/* -+ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ const u32 msg_id = KBASE_TL_NEW_CTX; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(context) + sizeof(nr) + ++ sizeof(tgid); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+/** -+ * @file mali_osk_wait_queue.c -+ * Implemenation of the OS abstraction layer for the kernel device driver -+ */ ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ_SUMMARY, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+#include -+#include -+#include ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &context, sizeof(context)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &nr, sizeof(nr)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &tgid, sizeof(tgid)); + -+#include "mali_osk.h" -+#include "mali_kernel_common.h" ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+struct _mali_osk_wait_queue_t_struct { -+ wait_queue_head_t wait_queue; -+}; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ_SUMMARY, flags); ++} + -+_mali_osk_wait_queue_t *_mali_osk_wait_queue_init(void) ++void __kbase_tlstream_tl_summary_new_gpu(void *gpu, u32 id, u32 core_count) +{ -+ _mali_osk_wait_queue_t *ret = NULL; -+ -+ ret = kmalloc(sizeof(_mali_osk_wait_queue_t), GFP_KERNEL); -+ -+ if (NULL == ret) { -+ return ret; -+ } -+ -+ init_waitqueue_head(&ret->wait_queue); -+ MALI_DEBUG_ASSERT(!waitqueue_active(&ret->wait_queue)); ++ const u32 msg_id = KBASE_TL_NEW_GPU; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(gpu) + sizeof(id) + ++ sizeof(core_count); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ return ret; -+} ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ_SUMMARY, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+void _mali_osk_wait_queue_wait_event(_mali_osk_wait_queue_t *queue, mali_bool(*condition)(void *), void *data) -+{ -+ MALI_DEBUG_ASSERT_POINTER(queue); -+ MALI_DEBUG_PRINT(6, ("Adding to wait queue %p\n", queue)); -+ wait_event(queue->wait_queue, condition(data)); -+} ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &gpu, sizeof(gpu)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &id, sizeof(id)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &core_count, sizeof(core_count)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+void _mali_osk_wait_queue_wait_event_timeout(_mali_osk_wait_queue_t *queue, mali_bool(*condition)(void *), void *data, u32 timeout) -+{ -+ MALI_DEBUG_ASSERT_POINTER(queue); -+ MALI_DEBUG_PRINT(6, ("Adding to wait queue %p\n", queue)); -+ wait_event_timeout(queue->wait_queue, condition(data), _mali_osk_time_mstoticks(timeout)); ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ_SUMMARY, flags); +} + -+void _mali_osk_wait_queue_wake_up(_mali_osk_wait_queue_t *queue) ++void __kbase_tlstream_tl_summary_new_lpu(void *lpu, u32 nr, u32 fn) +{ -+ MALI_DEBUG_ASSERT_POINTER(queue); -+ -+ /* if queue is empty, don't attempt to wake up its elements */ -+ if (!waitqueue_active(&queue->wait_queue)) return; ++ const u32 msg_id = KBASE_TL_NEW_LPU; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(lpu) + sizeof(nr) + ++ sizeof(fn); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ MALI_DEBUG_PRINT(6, ("Waking up elements in wait queue %p ....\n", queue)); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ_SUMMARY, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ wake_up_all(&queue->wait_queue); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &lpu, sizeof(lpu)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &nr, sizeof(nr)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &fn, sizeof(fn)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ MALI_DEBUG_PRINT(6, ("... elements in wait queue %p woken up\n", queue)); ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ_SUMMARY, flags); +} + -+void _mali_osk_wait_queue_term(_mali_osk_wait_queue_t *queue) ++void __kbase_tlstream_tl_summary_lifelink_lpu_gpu(void *lpu, void *gpu) +{ -+ /* Parameter validation */ -+ MALI_DEBUG_ASSERT_POINTER(queue); -+ -+ /* Linux requires no explicit termination of wait queues */ -+ kfree(queue); -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c -new file mode 100755 -index 000000000000..d5e258a83a29 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c -@@ -0,0 +1,240 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ const u32 msg_id = KBASE_TL_LIFELINK_LPU_GPU; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(lpu) + sizeof(gpu); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+/** -+ * @file mali_osk_wq.c -+ * Implementation of the OS abstraction layer for the kernel device driver -+ */ ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ_SUMMARY, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+#include /* For memory allocation */ -+#include -+#include -+#include ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &lpu, sizeof(lpu)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &gpu, sizeof(gpu)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_kernel_license.h" -+#include "mali_kernel_linux.h" ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ_SUMMARY, flags); ++} + -+typedef struct _mali_osk_wq_work_s { -+ _mali_osk_wq_work_handler_t handler; -+ void *data; -+ mali_bool high_pri; -+ struct work_struct work_handle; -+} mali_osk_wq_work_object_t; ++void __kbase_tlstream_tl_summary_new_as(void *as, u32 nr) ++{ ++ const u32 msg_id = KBASE_TL_NEW_AS; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(as) + sizeof(nr); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+typedef struct _mali_osk_wq_delayed_work_s { -+ _mali_osk_wq_work_handler_t handler; -+ void *data; -+ struct delayed_work work; -+} mali_osk_wq_delayed_work_object_t; ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ_SUMMARY, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+#if MALI_LICENSE_IS_GPL -+static struct workqueue_struct *mali_wq_normal = NULL; -+static struct workqueue_struct *mali_wq_high = NULL; -+#endif ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &as, sizeof(as)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &nr, sizeof(nr)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+static void _mali_osk_wq_work_func(struct work_struct *work); ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ_SUMMARY, flags); ++} + -+_mali_osk_errcode_t _mali_osk_wq_init(void) ++void __kbase_tlstream_tl_summary_lifelink_as_gpu(void *as, void *gpu) +{ -+#if MALI_LICENSE_IS_GPL -+ MALI_DEBUG_ASSERT(NULL == mali_wq_normal); -+ MALI_DEBUG_ASSERT(NULL == mali_wq_high); -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) -+ mali_wq_normal = alloc_workqueue("mali", WQ_UNBOUND, 0); -+ mali_wq_high = alloc_workqueue("mali_high_pri", WQ_HIGHPRI | WQ_UNBOUND, 0); -+#else -+ mali_wq_normal = create_workqueue("mali"); -+ mali_wq_high = create_workqueue("mali_high_pri"); -+#endif -+ if (NULL == mali_wq_normal || NULL == mali_wq_high) { -+ MALI_PRINT_ERROR(("Unable to create Mali workqueues\n")); -+ -+ if (mali_wq_normal) destroy_workqueue(mali_wq_normal); -+ if (mali_wq_high) destroy_workqueue(mali_wq_high); ++ const u32 msg_id = KBASE_TL_LIFELINK_AS_GPU; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(as) + sizeof(gpu); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ mali_wq_normal = NULL; -+ mali_wq_high = NULL; ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ_SUMMARY, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ return _MALI_OSK_ERR_FAULT; -+ } -+#endif /* MALI_LICENSE_IS_GPL */ ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &as, sizeof(as)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &gpu, sizeof(gpu)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ return _MALI_OSK_ERR_OK; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ_SUMMARY, flags); +} + -+void _mali_osk_wq_flush(void) -+{ -+#if MALI_LICENSE_IS_GPL -+ flush_workqueue(mali_wq_high); -+ flush_workqueue(mali_wq_normal); -+#else -+ flush_scheduled_work(); -+#endif -+} ++/*****************************************************************************/ + -+void _mali_osk_wq_term(void) ++void __kbase_tlstream_tl_new_ctx(void *context, u32 nr, u32 tgid) +{ -+#if MALI_LICENSE_IS_GPL -+ MALI_DEBUG_ASSERT(NULL != mali_wq_normal); -+ MALI_DEBUG_ASSERT(NULL != mali_wq_high); ++ const u32 msg_id = KBASE_TL_NEW_CTX; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(context) + sizeof(nr) + ++ sizeof(tgid); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ flush_workqueue(mali_wq_normal); -+ destroy_workqueue(mali_wq_normal); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ flush_workqueue(mali_wq_high); -+ destroy_workqueue(mali_wq_high); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &context, sizeof(context)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &nr, sizeof(nr)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &tgid, sizeof(tgid)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ mali_wq_normal = NULL; -+ mali_wq_high = NULL; -+#else -+ flush_scheduled_work(); -+#endif ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+_mali_osk_wq_work_t *_mali_osk_wq_create_work(_mali_osk_wq_work_handler_t handler, void *data) ++void __kbase_tlstream_tl_new_atom(void *atom, u32 nr) +{ -+ mali_osk_wq_work_object_t *work = kmalloc(sizeof(mali_osk_wq_work_object_t), GFP_KERNEL); -+ -+ if (NULL == work) return NULL; ++ const u32 msg_id = KBASE_TL_NEW_ATOM; ++ const size_t msg_size = sizeof(msg_id) + sizeof(u64) + sizeof(atom) + ++ sizeof(nr); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ work->handler = handler; -+ work->data = data; -+ work->high_pri = MALI_FALSE; ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ INIT_WORK(&work->work_handle, _mali_osk_wq_work_func); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &nr, sizeof(nr)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ return work; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+_mali_osk_wq_work_t *_mali_osk_wq_create_work_high_pri(_mali_osk_wq_work_handler_t handler, void *data) ++void __kbase_tlstream_tl_del_ctx(void *context) +{ -+ mali_osk_wq_work_object_t *work = kmalloc(sizeof(mali_osk_wq_work_object_t), GFP_KERNEL); -+ -+ if (NULL == work) return NULL; ++ const u32 msg_id = KBASE_TL_DEL_CTX; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(context); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ work->handler = handler; -+ work->data = data; -+ work->high_pri = MALI_TRUE; ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ INIT_WORK(&work->work_handle, _mali_osk_wq_work_func); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &context, sizeof(context)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ return work; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+void _mali_osk_wq_delete_work(_mali_osk_wq_work_t *work) ++void __kbase_tlstream_tl_del_atom(void *atom) +{ -+ mali_osk_wq_work_object_t *work_object = (mali_osk_wq_work_object_t *)work; -+ _mali_osk_wq_flush(); -+ kfree(work_object); -+} ++ const u32 msg_id = KBASE_TL_DEL_ATOM; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+void _mali_osk_wq_delete_work_nonflush(_mali_osk_wq_work_t *work) -+{ -+ mali_osk_wq_work_object_t *work_object = (mali_osk_wq_work_object_t *)work; -+ kfree(work_object); -+} ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+void _mali_osk_wq_schedule_work(_mali_osk_wq_work_t *work) -+{ -+ mali_osk_wq_work_object_t *work_object = (mali_osk_wq_work_object_t *)work; -+#if MALI_LICENSE_IS_GPL -+ queue_work(mali_wq_normal, &work_object->work_handle); -+#else -+ schedule_work(&work_object->work_handle); -+#endif -+} ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+void _mali_osk_wq_schedule_work_high_pri(_mali_osk_wq_work_t *work) -+{ -+ mali_osk_wq_work_object_t *work_object = (mali_osk_wq_work_object_t *)work; -+#if MALI_LICENSE_IS_GPL -+ queue_work(mali_wq_high, &work_object->work_handle); -+#else -+ schedule_work(&work_object->work_handle); -+#endif ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+static void _mali_osk_wq_work_func(struct work_struct *work) ++void __kbase_tlstream_tl_ret_ctx_lpu(void *context, void *lpu) +{ -+ mali_osk_wq_work_object_t *work_object; -+ -+ work_object = _MALI_OSK_CONTAINER_OF(work, mali_osk_wq_work_object_t, work_handle); -+ -+#if MALI_LICENSE_IS_GPL -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) -+ /* We want highest Dynamic priority of the thread so that the Jobs depending -+ ** on this thread could be scheduled in time. Without this, this thread might -+ ** sometimes need to wait for some threads in user mode to finish its round-robin -+ ** time, causing *bubble* in the Mali pipeline. Thanks to the new implementation -+ ** of high-priority workqueue in new kernel, this only happens in older kernel. -+ */ -+ if (MALI_TRUE == work_object->high_pri) { -+ set_user_nice(current, -19); -+ } -+#endif -+#endif /* MALI_LICENSE_IS_GPL */ ++ const u32 msg_id = KBASE_TL_RET_CTX_LPU; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(context) + sizeof(lpu); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ work_object->handler(work_object->data); -+} ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+static void _mali_osk_wq_delayed_work_func(struct work_struct *work) -+{ -+ mali_osk_wq_delayed_work_object_t *work_object; ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &context, sizeof(context)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &lpu, sizeof(lpu)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ work_object = _MALI_OSK_CONTAINER_OF(work, mali_osk_wq_delayed_work_object_t, work.work); -+ work_object->handler(work_object->data); ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+mali_osk_wq_delayed_work_object_t *_mali_osk_wq_delayed_create_work(_mali_osk_wq_work_handler_t handler, void *data) ++void __kbase_tlstream_tl_ret_atom_ctx(void *atom, void *context) +{ -+ mali_osk_wq_delayed_work_object_t *work = kmalloc(sizeof(mali_osk_wq_delayed_work_object_t), GFP_KERNEL); -+ -+ if (NULL == work) return NULL; -+ -+ work->handler = handler; -+ work->data = data; -+ -+ INIT_DELAYED_WORK(&work->work, _mali_osk_wq_delayed_work_func); ++ const u32 msg_id = KBASE_TL_RET_ATOM_CTX; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + sizeof(context); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ return work; -+} ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+void _mali_osk_wq_delayed_delete_work_nonflush(_mali_osk_wq_delayed_work_t *work) -+{ -+ mali_osk_wq_delayed_work_object_t *work_object = (mali_osk_wq_delayed_work_object_t *)work; -+ kfree(work_object); -+} ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &context, sizeof(context)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+void _mali_osk_wq_delayed_cancel_work_async(_mali_osk_wq_delayed_work_t *work) -+{ -+ mali_osk_wq_delayed_work_object_t *work_object = (mali_osk_wq_delayed_work_object_t *)work; -+ cancel_delayed_work(&work_object->work); ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+void _mali_osk_wq_delayed_cancel_work_sync(_mali_osk_wq_delayed_work_t *work) ++void __kbase_tlstream_tl_ret_atom_lpu( ++ void *atom, void *lpu, const char *attrib_match_list) +{ -+ mali_osk_wq_delayed_work_object_t *work_object = (mali_osk_wq_delayed_work_object_t *)work; -+ cancel_delayed_work_sync(&work_object->work); -+} ++ const u32 msg_id = KBASE_TL_RET_ATOM_LPU; ++ const size_t msg_s0 = sizeof(u32) + sizeof(char) + ++ strnlen(attrib_match_list, STRLEN_MAX); ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + ++ sizeof(atom) + sizeof(lpu) + msg_s0; ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+void _mali_osk_wq_delayed_schedule_work(_mali_osk_wq_delayed_work_t *work, u32 delay) -+{ -+ mali_osk_wq_delayed_work_object_t *work_object = (mali_osk_wq_delayed_work_object_t *)work; ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+#if MALI_LICENSE_IS_GPL -+ queue_delayed_work(mali_wq_normal, &work_object->work, delay); -+#else -+ schedule_delayed_work(&work_object->work, delay); -+#endif ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &lpu, sizeof(lpu)); ++ pos = kbasep_tlstream_write_string( ++ buffer, pos, attrib_match_list, msg_s0); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c b/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c -new file mode 100755 -index 000000000000..931d7f07a1d2 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c -@@ -0,0 +1,23 @@ -+/** -+ * Copyright (C) 2010, 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+/** -+ * @file mali_pmu_power_up_down.c -+ */ -+ -+#include -+#include "mali_executor.h" + -+int mali_perf_set_num_pp_cores(unsigned int num_cores) ++void __kbase_tlstream_tl_nret_ctx_lpu(void *context, void *lpu) +{ -+ return mali_executor_set_perf_level(num_cores, MALI_FALSE); -+} -+ -+EXPORT_SYMBOL(mali_perf_set_num_pp_cores); -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h -new file mode 100755 -index 000000000000..4661cac42b3f ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h -@@ -0,0 +1,17 @@ -+/* -+ * Copyright (C) 2012, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef __MALI_PROFILING_EVENTS_H__ -+#define __MALI_PROFILING_EVENTS_H__ -+ -+/* Simple wrapper in order to find the OS specific location of this file */ -+#include -+ -+#endif /* __MALI_PROFILING_EVENTS_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h -new file mode 100755 -index 000000000000..6fdaa427c4cf ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h -@@ -0,0 +1,17 @@ -+/* -+ * Copyright (C) 2012-2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef __MALI_PROFILING_GATOR_API_H__ -+#define __MALI_PROFILING_GATOR_API_H__ -+ -+/* Simple wrapper in order to find the OS specific location of this file */ -+#include -+ -+#endif /* __MALI_PROFILING_GATOR_API_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c -new file mode 100755 -index 000000000000..c3a526f0ad90 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c -@@ -0,0 +1,275 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_osk_mali.h" -+#include "mali_ukk.h" -+#include "mali_timestamp.h" -+#include "mali_osk_profiling.h" -+#include "mali_user_settings_db.h" -+#include "mali_profiling_internal.h" -+ -+typedef struct mali_profiling_entry { -+ u64 timestamp; -+ u32 event_id; -+ u32 data[5]; -+} mali_profiling_entry; -+ -+typedef enum mali_profiling_state { -+ MALI_PROFILING_STATE_UNINITIALIZED, -+ MALI_PROFILING_STATE_IDLE, -+ MALI_PROFILING_STATE_RUNNING, -+ MALI_PROFILING_STATE_RETURN, -+} mali_profiling_state; ++ const u32 msg_id = KBASE_TL_NRET_CTX_LPU; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(context) + sizeof(lpu); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+static _mali_osk_mutex_t *lock = NULL; -+static mali_profiling_state prof_state = MALI_PROFILING_STATE_UNINITIALIZED; -+static mali_profiling_entry *profile_entries = NULL; -+static _mali_osk_atomic_t profile_insert_index; -+static u32 profile_mask = 0; ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+static inline void add_event(u32 event_id, u32 data0, u32 data1, u32 data2, u32 data3, u32 data4); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &context, sizeof(context)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &lpu, sizeof(lpu)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+void probe_mali_timeline_event(void *data, TP_PROTO(unsigned int event_id, unsigned int d0, unsigned int d1, unsigned -+ int d2, unsigned int d3, unsigned int d4)) -+{ -+ add_event(event_id, d0, d1, d2, d3, d4); ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+_mali_osk_errcode_t _mali_internal_profiling_init(mali_bool auto_start) ++void __kbase_tlstream_tl_nret_atom_ctx(void *atom, void *context) +{ -+ profile_entries = NULL; -+ profile_mask = 0; -+ _mali_osk_atomic_init(&profile_insert_index, 0); -+ -+ lock = _mali_osk_mutex_init(_MALI_OSK_LOCKFLAG_ORDERED, _MALI_OSK_LOCK_ORDER_PROFILING); -+ if (NULL == lock) { -+ return _MALI_OSK_ERR_FAULT; -+ } -+ -+ prof_state = MALI_PROFILING_STATE_IDLE; ++ const u32 msg_id = KBASE_TL_NRET_ATOM_CTX; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + sizeof(context); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ if (MALI_TRUE == auto_start) { -+ u32 limit = MALI_PROFILING_MAX_BUFFER_ENTRIES; /* Use maximum buffer size */ ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ mali_set_user_setting(_MALI_UK_USER_SETTING_SW_EVENTS_ENABLE, MALI_TRUE); -+ if (_MALI_OSK_ERR_OK != _mali_internal_profiling_start(&limit)) { -+ return _MALI_OSK_ERR_FAULT; -+ } -+ } ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &context, sizeof(context)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ return _MALI_OSK_ERR_OK; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+void _mali_internal_profiling_term(void) ++void __kbase_tlstream_tl_dep_atom_atom(void *atom1, void *atom2) +{ -+ u32 count; -+ -+ /* Ensure profiling is stopped */ -+ _mali_internal_profiling_stop(&count); ++ const u32 msg_id = KBASE_TL_DEP_ATOM_ATOM; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom1) + sizeof(atom2); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ prof_state = MALI_PROFILING_STATE_UNINITIALIZED; ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ if (NULL != profile_entries) { -+ _mali_osk_vfree(profile_entries); -+ profile_entries = NULL; -+ } ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom1, sizeof(atom1)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom2, sizeof(atom2)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ if (NULL != lock) { -+ _mali_osk_mutex_term(lock); -+ lock = NULL; -+ } ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+_mali_osk_errcode_t _mali_internal_profiling_start(u32 *limit) ++void __kbase_tlstream_tl_ndep_atom_atom(void *atom1, void *atom2) +{ -+ _mali_osk_errcode_t ret; -+ mali_profiling_entry *new_profile_entries; -+ -+ _mali_osk_mutex_wait(lock); -+ -+ if (MALI_PROFILING_STATE_RUNNING == prof_state) { -+ _mali_osk_mutex_signal(lock); -+ return _MALI_OSK_ERR_BUSY; -+ } -+ -+ new_profile_entries = _mali_osk_valloc(*limit * sizeof(mali_profiling_entry)); -+ -+ if (NULL == new_profile_entries) { -+ _mali_osk_mutex_signal(lock); -+ _mali_osk_vfree(new_profile_entries); -+ return _MALI_OSK_ERR_NOMEM; -+ } -+ -+ if (MALI_PROFILING_MAX_BUFFER_ENTRIES < *limit) { -+ *limit = MALI_PROFILING_MAX_BUFFER_ENTRIES; -+ } -+ -+ profile_mask = 1; -+ while (profile_mask <= *limit) { -+ profile_mask <<= 1; -+ } -+ profile_mask >>= 1; -+ -+ *limit = profile_mask; -+ -+ profile_mask--; /* turns the power of two into a mask of one less */ -+ -+ if (MALI_PROFILING_STATE_IDLE != prof_state) { -+ _mali_osk_mutex_signal(lock); -+ _mali_osk_vfree(new_profile_entries); -+ return _MALI_OSK_ERR_INVALID_ARGS; /* invalid to call this function in this state */ -+ } -+ -+ profile_entries = new_profile_entries; -+ -+ ret = _mali_timestamp_reset(); ++ const u32 msg_id = KBASE_TL_NDEP_ATOM_ATOM; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom1) + sizeof(atom2); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ if (_MALI_OSK_ERR_OK == ret) { -+ prof_state = MALI_PROFILING_STATE_RUNNING; -+ } else { -+ _mali_osk_vfree(profile_entries); -+ profile_entries = NULL; -+ } ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ register_trace_mali_timeline_event(probe_mali_timeline_event, NULL); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom1, sizeof(atom1)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom2, sizeof(atom2)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ _mali_osk_mutex_signal(lock); -+ return ret; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+static inline void add_event(u32 event_id, u32 data0, u32 data1, u32 data2, u32 data3, u32 data4) ++void __kbase_tlstream_tl_rdep_atom_atom(void *atom1, void *atom2) +{ -+ u32 cur_index = (_mali_osk_atomic_inc_return(&profile_insert_index) - 1) & profile_mask; ++ const u32 msg_id = KBASE_TL_RDEP_ATOM_ATOM; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom1) + sizeof(atom2); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ profile_entries[cur_index].timestamp = _mali_timestamp_get(); -+ profile_entries[cur_index].event_id = event_id; -+ profile_entries[cur_index].data[0] = data0; -+ profile_entries[cur_index].data[1] = data1; -+ profile_entries[cur_index].data[2] = data2; -+ profile_entries[cur_index].data[3] = data3; -+ profile_entries[cur_index].data[4] = data4; ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ /* If event is "leave API function", add current memory usage to the event -+ * as data point 4. This is used in timeline profiling to indicate how -+ * much memory was used when leaving a function. */ -+ if (event_id == (MALI_PROFILING_EVENT_TYPE_SINGLE | MALI_PROFILING_EVENT_CHANNEL_SOFTWARE | MALI_PROFILING_EVENT_REASON_SINGLE_SW_LEAVE_API_FUNC)) { -+ profile_entries[cur_index].data[4] = _mali_ukk_report_memory_usage(); -+ } ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom1, sizeof(atom1)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom2, sizeof(atom2)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); ++ ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+_mali_osk_errcode_t _mali_internal_profiling_stop(u32 *count) ++void __kbase_tlstream_tl_nret_atom_lpu(void *atom, void *lpu) +{ -+ _mali_osk_mutex_wait(lock); -+ -+ if (MALI_PROFILING_STATE_RUNNING != prof_state) { -+ _mali_osk_mutex_signal(lock); -+ return _MALI_OSK_ERR_INVALID_ARGS; /* invalid to call this function in this state */ -+ } -+ -+ /* go into return state (user to retreive events), no more events will be added after this */ -+ prof_state = MALI_PROFILING_STATE_RETURN; -+ -+ unregister_trace_mali_timeline_event(probe_mali_timeline_event, NULL); -+ -+ _mali_osk_mutex_signal(lock); ++ const u32 msg_id = KBASE_TL_NRET_ATOM_LPU; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + sizeof(lpu); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ tracepoint_synchronize_unregister(); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ *count = _mali_osk_atomic_read(&profile_insert_index); -+ if (*count > profile_mask) *count = profile_mask; ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &lpu, sizeof(lpu)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ return _MALI_OSK_ERR_OK; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+u32 _mali_internal_profiling_get_count(void) ++void __kbase_tlstream_tl_ret_as_ctx(void *as, void *ctx) +{ -+ u32 retval = 0; ++ const u32 msg_id = KBASE_TL_RET_AS_CTX; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(as) + sizeof(ctx); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ _mali_osk_mutex_wait(lock); -+ if (MALI_PROFILING_STATE_RETURN == prof_state) { -+ retval = _mali_osk_atomic_read(&profile_insert_index); -+ if (retval > profile_mask) retval = profile_mask; -+ } -+ _mali_osk_mutex_signal(lock); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ return retval; ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &as, sizeof(as)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &ctx, sizeof(ctx)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); ++ ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+_mali_osk_errcode_t _mali_internal_profiling_get_event(u32 index, u64 *timestamp, u32 *event_id, u32 data[5]) ++void __kbase_tlstream_tl_nret_as_ctx(void *as, void *ctx) +{ -+ u32 raw_index = _mali_osk_atomic_read(&profile_insert_index); -+ -+ _mali_osk_mutex_wait(lock); -+ -+ if (index < profile_mask) { -+ if ((raw_index & ~profile_mask) != 0) { -+ index += raw_index; -+ index &= profile_mask; -+ } -+ -+ if (prof_state != MALI_PROFILING_STATE_RETURN) { -+ _mali_osk_mutex_signal(lock); -+ return _MALI_OSK_ERR_INVALID_ARGS; /* invalid to call this function in this state */ -+ } ++ const u32 msg_id = KBASE_TL_NRET_AS_CTX; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(as) + sizeof(ctx); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ if (index >= raw_index) { -+ _mali_osk_mutex_signal(lock); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ *timestamp = profile_entries[index].timestamp; -+ *event_id = profile_entries[index].event_id; -+ data[0] = profile_entries[index].data[0]; -+ data[1] = profile_entries[index].data[1]; -+ data[2] = profile_entries[index].data[2]; -+ data[3] = profile_entries[index].data[3]; -+ data[4] = profile_entries[index].data[4]; -+ } else { -+ _mali_osk_mutex_signal(lock); -+ return _MALI_OSK_ERR_FAULT; -+ } ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &as, sizeof(as)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &ctx, sizeof(ctx)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ _mali_osk_mutex_signal(lock); -+ return _MALI_OSK_ERR_OK; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+_mali_osk_errcode_t _mali_internal_profiling_clear(void) ++void __kbase_tlstream_tl_ret_atom_as(void *atom, void *as) +{ -+ _mali_osk_mutex_wait(lock); -+ -+ if (MALI_PROFILING_STATE_RETURN != prof_state) { -+ _mali_osk_mutex_signal(lock); -+ return _MALI_OSK_ERR_INVALID_ARGS; /* invalid to call this function in this state */ -+ } ++ const u32 msg_id = KBASE_TL_RET_ATOM_AS; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + sizeof(as); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ prof_state = MALI_PROFILING_STATE_IDLE; -+ profile_mask = 0; -+ _mali_osk_atomic_init(&profile_insert_index, 0); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ if (NULL != profile_entries) { -+ _mali_osk_vfree(profile_entries); -+ profile_entries = NULL; -+ } ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &as, sizeof(as)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ _mali_osk_mutex_signal(lock); -+ return _MALI_OSK_ERR_OK; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+mali_bool _mali_internal_profiling_is_recording(void) ++void __kbase_tlstream_tl_nret_atom_as(void *atom, void *as) +{ -+ return prof_state == MALI_PROFILING_STATE_RUNNING ? MALI_TRUE : MALI_FALSE; -+} ++ const u32 msg_id = KBASE_TL_NRET_ATOM_AS; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + sizeof(as); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+mali_bool _mali_internal_profiling_have_recording(void) -+{ -+ return prof_state == MALI_PROFILING_STATE_RETURN ? MALI_TRUE : MALI_FALSE; -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h -new file mode 100755 -index 000000000000..f17b4583307a ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h -@@ -0,0 +1,35 @@ -+/* -+ * Copyright (C) 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+#ifndef __MALI_PROFILING_INTERNAL_H__ -+#define __MALI_PROFILING_INTERNAL_H__ ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &as, sizeof(as)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+#ifdef __cplusplus -+extern "C" { -+#endif ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); ++} + -+#include "mali_osk.h" ++void __kbase_tlstream_tl_attrib_atom_config( ++ void *atom, u64 jd, u64 affinity, u32 config) ++{ ++ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_CONFIG; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + ++ sizeof(jd) + sizeof(affinity) + sizeof(config); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+int _mali_internal_profiling_init(mali_bool auto_start); -+void _mali_internal_profiling_term(void); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+mali_bool _mali_internal_profiling_is_recording(void); -+mali_bool _mali_internal_profiling_have_recording(void); -+_mali_osk_errcode_t _mali_internal_profiling_clear(void); -+_mali_osk_errcode_t _mali_internal_profiling_get_event(u32 index, u64 *timestamp, u32 *event_id, u32 data[5]); -+u32 _mali_internal_profiling_get_count(void); -+int _mali_internal_profiling_stop(u32 *count); -+int _mali_internal_profiling_start(u32 *limit); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &jd, sizeof(jd)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &affinity, sizeof(affinity)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &config, sizeof(config)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+#ifdef __cplusplus ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} -+#endif -+ -+#endif /* __MALI_PROFILING_INTERNAL_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_sync.c b/drivers/gpu/arm/mali400/mali/linux/mali_sync.c -new file mode 100755 -index 000000000000..0d98b518f1ac ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.c -@@ -0,0 +1,665 @@ -+/* -+ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ + -+#include "mali_sync.h" ++void __kbase_tlstream_tl_attrib_atom_priority(void *atom, u32 prio) ++{ ++ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_PRIORITY; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + sizeof(prio); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_timeline.h" -+#include "mali_executor.h" ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+#include -+#include -+#include ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &prio, sizeof(prio)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+struct mali_sync_pt { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ struct sync_pt sync_pt; -+#else -+ struct mali_internal_sync_point sync_pt; -+#endif -+ struct mali_sync_flag *flag; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ struct sync_timeline *sync_tl; /**< Sync timeline this pt is connected to. */ -+#else -+ struct mali_internal_sync_timeline *sync_tl; /**< Sync timeline this pt is connected to. */ -+#endif -+}; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); ++} + -+/** -+ * The sync flag is used to connect sync fences to the Mali Timeline system. Sync fences can be -+ * created from a sync flag, and when the flag is signaled, the sync fences will also be signaled. -+ */ -+struct mali_sync_flag { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ struct sync_timeline *sync_tl; /**< Sync timeline this flag is connected to. */ -+#else -+ struct mali_internal_sync_timeline *sync_tl; /**< Sync timeline this flag is connected to. */ -+#endif -+ u32 point; /**< Point on timeline. */ -+ int status; /**< 0 if unsignaled, 1 if signaled without error or negative if signaled with error. */ -+ struct kref refcount; /**< Reference count. */ -+}; ++void __kbase_tlstream_tl_attrib_atom_state(void *atom, u32 state) ++{ ++ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_STATE; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom) + sizeof(state); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+/** -+ * Mali sync timeline is used to connect mali timeline to sync_timeline. -+ * When fence timeout can print more detailed mali timeline system info. -+ */ -+struct mali_sync_timeline_container { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ struct sync_timeline sync_timeline; -+#else -+ struct mali_internal_sync_timeline sync_timeline; -+#endif -+ struct mali_timeline *timeline; -+}; ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+MALI_STATIC_INLINE struct mali_sync_pt *to_mali_sync_pt(struct sync_pt *pt) -+#else -+MALI_STATIC_INLINE struct mali_sync_pt *to_mali_sync_pt(struct mali_internal_sync_point *pt) -+#endif -+{ -+ return container_of(pt, struct mali_sync_pt, sync_pt); -+} ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &state, sizeof(state)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+MALI_STATIC_INLINE struct mali_sync_timeline_container *to_mali_sync_tl_container(struct sync_timeline *sync_tl) -+#else -+MALI_STATIC_INLINE struct mali_sync_timeline_container *to_mali_sync_tl_container(struct mali_internal_sync_timeline *sync_tl) -+#endif -+{ -+ return container_of(sync_tl, struct mali_sync_timeline_container, sync_timeline); ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+static int timeline_has_signaled(struct sync_pt *pt) -+#else -+static int timeline_has_signaled(struct mali_internal_sync_point *pt) -+#endif ++void __kbase_tlstream_tl_attrib_atom_priority_change(void *atom) +{ -+ struct mali_sync_pt *mpt; ++ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_PRIORITY_CHANGE; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ MALI_DEBUG_ASSERT_POINTER(pt); -+ mpt = to_mali_sync_pt(pt); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ MALI_DEBUG_ASSERT_POINTER(mpt->flag); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ return mpt->flag->status; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+static void timeline_free_pt(struct sync_pt *pt) -+#else -+static void timeline_free_pt(struct mali_internal_sync_point *pt) -+#endif ++void __kbase_tlstream_tl_attrib_atom_jit( ++ void *atom, u64 edit_addr, u64 new_addr) +{ -+ struct mali_sync_pt *mpt; ++ const u32 msg_id = KBASE_TL_ATTRIB_ATOM_JIT; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom) ++ + sizeof(edit_addr) + sizeof(new_addr); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ MALI_DEBUG_ASSERT_POINTER(pt); -+ mpt = to_mali_sync_pt(pt); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ mali_sync_flag_put(mpt->flag); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &edit_addr, sizeof(edit_addr)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &new_addr, sizeof(new_addr)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); ++ ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+static void timeline_release(struct sync_timeline *sync_timeline) -+#else -+static void timeline_release(struct mali_internal_sync_timeline *sync_timeline) -+#endif ++void __kbase_tlstream_tl_attrib_as_config( ++ void *as, u64 transtab, u64 memattr, u64 transcfg) +{ -+ struct mali_sync_timeline_container *mali_sync_tl = NULL; -+ struct mali_timeline *mali_tl = NULL; -+ -+ MALI_DEBUG_ASSERT_POINTER(sync_timeline); -+ -+ mali_sync_tl = to_mali_sync_tl_container(sync_timeline); -+ MALI_DEBUG_ASSERT_POINTER(mali_sync_tl); ++ const u32 msg_id = KBASE_TL_ATTRIB_AS_CONFIG; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(as) + ++ sizeof(transtab) + sizeof(memattr) + sizeof(transcfg); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ mali_tl = mali_sync_tl->timeline; ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ /* always signaled timeline didn't have mali container */ -+ if (mali_tl) { -+ if (NULL != mali_tl->spinlock) { -+ mali_spinlock_reentrant_term(mali_tl->spinlock); -+ } -+ _mali_osk_free(mali_tl); -+ } ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &as, sizeof(as)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &transtab, sizeof(transtab)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &memattr, sizeof(memattr)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &transcfg, sizeof(transcfg)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ module_put(THIS_MODULE); ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+static struct sync_pt *timeline_dup(struct sync_pt *pt) ++void __kbase_tlstream_tl_event_lpu_softstop(void *lpu) +{ -+ struct mali_sync_pt *mpt, *new_mpt; -+ struct sync_pt *new_pt; -+ MALI_DEBUG_ASSERT_POINTER(pt); -+ -+ mpt = to_mali_sync_pt(pt); -+ -+ new_pt = sync_pt_create(mpt->sync_tl, sizeof(struct mali_sync_pt)); -+ if (NULL == new_pt) return NULL; ++ const u32 msg_id = KBASE_TL_EVENT_LPU_SOFTSTOP; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(lpu); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ new_mpt = to_mali_sync_pt(new_pt); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ mali_sync_flag_get(mpt->flag); -+ new_mpt->flag = mpt->flag; -+ new_mpt->sync_tl = mpt->sync_tl; ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &lpu, sizeof(lpu)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ return new_pt; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+static int timeline_compare(struct sync_pt *pta, struct sync_pt *ptb) ++void __kbase_tlstream_tl_event_atom_softstop_ex(void *atom) +{ -+ struct mali_sync_pt *mpta; -+ struct mali_sync_pt *mptb; -+ u32 a, b; -+ -+ MALI_DEBUG_ASSERT_POINTER(pta); -+ MALI_DEBUG_ASSERT_POINTER(ptb); -+ mpta = to_mali_sync_pt(pta); -+ mptb = to_mali_sync_pt(ptb); -+ -+ MALI_DEBUG_ASSERT_POINTER(mpta->flag); -+ MALI_DEBUG_ASSERT_POINTER(mptb->flag); ++ const u32 msg_id = KBASE_TL_EVENT_ATOM_SOFTSTOP_EX; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ a = mpta->flag->point; -+ b = mptb->flag->point; ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ if (a == b) return 0; ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ return ((b - a) < (a - b) ? -1 : 1); ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} -+#endif + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) -+static void timeline_print_pt(struct seq_file *s, struct sync_pt *sync_pt) ++void __kbase_tlstream_tl_event_atom_softstop_issue(void *atom) +{ -+ struct mali_sync_pt *mpt; ++ const u32 msg_id = KBASE_TL_EVENT_ATOM_SOFTSTOP_ISSUE; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(atom); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ MALI_DEBUG_ASSERT_POINTER(s); -+ MALI_DEBUG_ASSERT_POINTER(sync_pt); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ mpt = to_mali_sync_pt(sync_pt); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &atom, sizeof(atom)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ /* It is possible this sync point is just under construct, -+ * make sure the flag is valid before accessing it -+ */ -+ if (mpt->flag) { -+ seq_printf(s, "%u", mpt->flag->point); -+ } else { -+ seq_printf(s, "uninitialized"); -+ } ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); +} + -+static void timeline_print_obj(struct seq_file *s, struct sync_timeline *sync_tl) ++void __kbase_tlstream_jd_gpu_soft_reset(void *gpu) +{ -+ struct mali_sync_timeline_container *mali_sync_tl = NULL; -+ struct mali_timeline *mali_tl = NULL; -+ -+ MALI_DEBUG_ASSERT_POINTER(sync_tl); -+ -+ mali_sync_tl = to_mali_sync_tl_container(sync_tl); -+ MALI_DEBUG_ASSERT_POINTER(mali_sync_tl); ++ const u32 msg_id = KBASE_JD_GPU_SOFT_RESET; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(gpu); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ mali_tl = mali_sync_tl->timeline; ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_OBJ, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ if (NULL != mali_tl) { -+ seq_printf(s, "oldest (%u) ", mali_tl->point_oldest); -+ seq_printf(s, "next (%u)", mali_tl->point_next); -+ seq_printf(s, "\n"); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &gpu, sizeof(gpu)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+#if defined(MALI_TIMELINE_DEBUG_FUNCTIONS) -+ { -+ u32 tid = _mali_osk_get_tid(); -+ struct mali_timeline_system *system = mali_tl->system; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_OBJ, flags); ++} + -+ mali_spinlock_reentrant_wait(mali_tl->spinlock, tid); -+ if (!mali_tl->destroyed) { -+ mali_spinlock_reentrant_wait(system->spinlock, tid); -+ mali_timeline_debug_print_timeline(mali_tl, s); -+ mali_spinlock_reentrant_signal(system->spinlock, tid); -+ } -+ mali_spinlock_reentrant_signal(mali_tl->spinlock, tid); ++/*****************************************************************************/ + -+ /* dump job queue status and group running status */ -+ mali_executor_status_dump(); -+ } -+#endif -+ } -+} -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+static void timeline_pt_value_str(struct sync_pt *pt, char *str, int size) ++void __kbase_tlstream_aux_pm_state(u32 core_type, u64 state) +{ -+ struct mali_sync_pt *mpt; ++ const u32 msg_id = KBASE_AUX_PM_STATE; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(core_type) + ++ sizeof(state); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ MALI_DEBUG_ASSERT_POINTER(str); -+ MALI_DEBUG_ASSERT_POINTER(pt); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_AUX, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ mpt = to_mali_sync_pt(pt); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &core_type, sizeof(core_type)); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &state, sizeof(state)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ /* It is possible this sync point is just under construct, -+ * make sure the flag is valid before accessing it -+ */ -+ if (mpt->flag) { -+ _mali_osk_snprintf(str, size, "%u", mpt->flag->point); -+ } else { -+ _mali_osk_snprintf(str, size, "uninitialized"); -+ } ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); +} + -+static void timeline_value_str(struct sync_timeline *timeline, char *str, int size) ++void __kbase_tlstream_aux_pagefault(u32 ctx_nr, u64 page_count_change) +{ -+ struct mali_sync_timeline_container *mali_sync_tl = NULL; -+ struct mali_timeline *mali_tl = NULL; ++ const u32 msg_id = KBASE_AUX_PAGEFAULT; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(ctx_nr) + ++ sizeof(page_count_change); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ MALI_DEBUG_ASSERT_POINTER(timeline); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_AUX, msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ mali_sync_tl = to_mali_sync_tl_container(timeline); -+ MALI_DEBUG_ASSERT_POINTER(mali_sync_tl); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &ctx_nr, sizeof(ctx_nr)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, ++ &page_count_change, sizeof(page_count_change)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ mali_tl = mali_sync_tl->timeline; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); ++} + -+ if (NULL != mali_tl) { -+ _mali_osk_snprintf(str, size, "oldest (%u) ", mali_tl->point_oldest); -+ _mali_osk_snprintf(str, size, "next (%u)", mali_tl->point_next); -+ _mali_osk_snprintf(str, size, "\n"); ++void __kbase_tlstream_aux_pagesalloc(u32 ctx_nr, u64 page_count) ++{ ++ const u32 msg_id = KBASE_AUX_PAGESALLOC; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(ctx_nr) + ++ sizeof(page_count); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+#if defined(MALI_TIMELINE_DEBUG_FUNCTIONS) -+ { -+ u32 tid = _mali_osk_get_tid(); -+ struct mali_timeline_system *system = mali_tl->system; ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_AUX, msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ mali_spinlock_reentrant_wait(mali_tl->spinlock, tid); -+ if (!mali_tl->destroyed) { -+ mali_spinlock_reentrant_wait(system->spinlock, tid); -+ mali_timeline_debug_direct_print_timeline(mali_tl); -+ mali_spinlock_reentrant_signal(system->spinlock, tid); -+ } -+ mali_spinlock_reentrant_signal(mali_tl->spinlock, tid); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &ctx_nr, sizeof(ctx_nr)); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &page_count, sizeof(page_count)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ /* dump job queue status and group running status */ -+ mali_executor_status_dump(); -+ } -+#endif -+ } ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); +} -+#else -+static void timeline_print_sync_pt(struct mali_internal_sync_point *sync_pt) ++ ++void __kbase_tlstream_aux_devfreq_target(u64 target_freq) +{ -+ struct mali_sync_pt *mpt; ++ const u32 msg_id = KBASE_AUX_DEVFREQ_TARGET; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(target_freq); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ MALI_DEBUG_ASSERT_POINTER(sync_pt); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_AUX, msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ mpt = to_mali_sync_pt(sync_pt); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &target_freq, sizeof(target_freq)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ if (mpt->flag) { -+ MALI_DEBUG_PRINT(2, ("mali_internal_sync_pt: %u\n", mpt->flag->point)); -+ } else { -+ MALI_DEBUG_PRINT(2, ("uninitialized\n", mpt->flag->point)); -+ } ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); +} -+#endif -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+static struct sync_timeline_ops mali_timeline_ops = { -+ .driver_name = "Mali", -+ .dup = timeline_dup, -+ .has_signaled = timeline_has_signaled, -+ .compare = timeline_compare, -+ .free_pt = timeline_free_pt, -+ .release_obj = timeline_release, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) -+ .print_pt = timeline_print_pt, -+ .print_obj = timeline_print_obj, -+#else -+ .pt_value_str = timeline_pt_value_str, -+ .timeline_value_str = timeline_value_str, -+#endif -+}; + -+struct sync_timeline *mali_sync_timeline_create(struct mali_timeline *timeline, const char *name) ++void __kbase_tlstream_aux_protected_enter_start(void *gpu) +{ -+ struct sync_timeline *sync_tl; -+ struct mali_sync_timeline_container *mali_sync_tl; -+ -+ sync_tl = sync_timeline_create(&mali_timeline_ops, sizeof(struct mali_sync_timeline_container), name); -+ if (NULL == sync_tl) return NULL; ++ const u32 msg_id = KBASE_AUX_PROTECTED_ENTER_START; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(gpu); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ mali_sync_tl = to_mali_sync_tl_container(sync_tl); -+ mali_sync_tl->timeline = timeline; ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_AUX, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ /* Grab a reference on the module to ensure the callbacks are present -+ * as long some timeline exists. The reference is released when the -+ * timeline is freed. -+ * Since this function is called from a ioctl on an open file we know -+ * we already have a reference, so using __module_get is safe. */ -+ __module_get(THIS_MODULE); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &gpu, sizeof(gpu)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ return sync_tl; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); +} -+ -+s32 mali_sync_fence_fd_alloc(struct sync_fence *sync_fence) ++void __kbase_tlstream_aux_protected_enter_end(void *gpu) +{ -+ s32 fd = -1; ++ const u32 msg_id = KBASE_AUX_PROTECTED_ENTER_END; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(gpu); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) -+ fd = get_unused_fd(); -+#else -+ fd = get_unused_fd_flags(0); -+#endif ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_AUX, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ if (fd < 0) { -+ sync_fence_put(sync_fence); -+ return -1; -+ } -+ sync_fence_install(sync_fence, fd); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &gpu, sizeof(gpu)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ return fd; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); +} + -+struct sync_fence *mali_sync_fence_merge(struct sync_fence *sync_fence1, struct sync_fence *sync_fence2) ++void __kbase_tlstream_aux_protected_leave_start(void *gpu) +{ -+ struct sync_fence *sync_fence; ++ const u32 msg_id = KBASE_AUX_PROTECTED_LEAVE_START; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(gpu); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ MALI_DEBUG_ASSERT_POINTER(sync_fence1); -+ MALI_DEBUG_ASSERT_POINTER(sync_fence1); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_AUX, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ sync_fence = sync_fence_merge("mali_merge_fence", sync_fence1, sync_fence2); -+ sync_fence_put(sync_fence1); -+ sync_fence_put(sync_fence2); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &gpu, sizeof(gpu)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ return sync_fence; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); +} -+ -+struct sync_fence *mali_sync_timeline_create_signaled_fence(struct sync_timeline *sync_tl) ++void __kbase_tlstream_aux_protected_leave_end(void *gpu) +{ -+ struct mali_sync_flag *flag; -+ struct sync_fence *sync_fence; -+ -+ MALI_DEBUG_ASSERT_POINTER(sync_tl); -+ -+ flag = mali_sync_flag_create(sync_tl, 0); -+ if (NULL == flag) return NULL; ++ const u32 msg_id = KBASE_AUX_PROTECTED_LEAVE_END; ++ const size_t msg_size = ++ sizeof(msg_id) + sizeof(u64) + sizeof(gpu); ++ unsigned long flags; ++ char *buffer; ++ size_t pos = 0; + -+ sync_fence = mali_sync_flag_create_fence(flag); ++ buffer = kbasep_tlstream_msgbuf_acquire( ++ TL_STREAM_TYPE_AUX, ++ msg_size, &flags); ++ KBASE_DEBUG_ASSERT(buffer); + -+ mali_sync_flag_signal(flag, 0); -+ mali_sync_flag_put(flag); ++ pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id)); ++ pos = kbasep_tlstream_write_timestamp(buffer, pos); ++ pos = kbasep_tlstream_write_bytes( ++ buffer, pos, &gpu, sizeof(gpu)); ++ KBASE_DEBUG_ASSERT(msg_size == pos); + -+ return sync_fence; ++ kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); +} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_tlstream.h b/drivers/gpu/arm/midgard/mali_kbase_tlstream.h +new file mode 100755 +index 000000000..c0a1117d5 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.h +@@ -0,0 +1,623 @@ ++/* ++ * ++ * (C) COPYRIGHT 2015-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+struct mali_sync_flag *mali_sync_flag_create(struct sync_timeline *sync_tl, mali_timeline_point point) -+{ -+ struct mali_sync_flag *flag; + -+ if (NULL == sync_tl) return NULL; + -+ flag = _mali_osk_calloc(1, sizeof(*flag)); -+ if (NULL == flag) return NULL; ++#if !defined(_KBASE_TLSTREAM_H) ++#define _KBASE_TLSTREAM_H + -+ flag->sync_tl = sync_tl; -+ flag->point = point; ++#include + -+ flag->status = 0; -+ kref_init(&flag->refcount); ++/*****************************************************************************/ + -+ return flag; -+} ++/** ++ * kbase_tlstream_init - initialize timeline infrastructure in kernel ++ * Return: zero on success, negative number on error ++ */ ++int kbase_tlstream_init(void); + +/** -+ * Create a sync point attached to given sync flag. -+ * -+ * @note Sync points must be triggered in *exactly* the same order as they are created. ++ * kbase_tlstream_term - terminate timeline infrastructure in kernel + * -+ * @param flag Sync flag. -+ * @return New sync point if successful, NULL if not. ++ * Timeline need have to been previously enabled with kbase_tlstream_init(). + */ -+static struct sync_pt *mali_sync_flag_create_pt(struct mali_sync_flag *flag) -+{ -+ struct sync_pt *pt; -+ struct mali_sync_pt *mpt; -+ -+ MALI_DEBUG_ASSERT_POINTER(flag); -+ MALI_DEBUG_ASSERT_POINTER(flag->sync_tl); -+ -+ pt = sync_pt_create(flag->sync_tl, sizeof(struct mali_sync_pt)); -+ if (NULL == pt) return NULL; ++void kbase_tlstream_term(void); + -+ mali_sync_flag_get(flag); ++/** ++ * kbase_tlstream_acquire - acquire timeline stream file descriptor ++ * @kctx: kernel common context ++ * @flags: timeline stream flags ++ * ++ * This descriptor is meant to be used by userspace timeline to gain access to ++ * kernel timeline stream. This stream is later broadcasted by user space to the ++ * timeline client. ++ * Only one entity can own the descriptor at any given time. Descriptor shall be ++ * closed if unused. If descriptor cannot be obtained (i.e. when it is already ++ * being used) return will be a negative value. ++ * ++ * Return: file descriptor on success, negative number on error ++ */ ++int kbase_tlstream_acquire(struct kbase_context *kctx, u32 flags); + -+ mpt = to_mali_sync_pt(pt); -+ mpt->flag = flag; -+ mpt->sync_tl = flag->sync_tl; ++/** ++ * kbase_tlstream_flush_streams - flush timeline streams. ++ * ++ * Function will flush pending data in all timeline streams. ++ */ ++void kbase_tlstream_flush_streams(void); + -+ return pt; -+} ++/** ++ * kbase_tlstream_reset_body_streams - reset timeline body streams. ++ * ++ * Function will discard pending data in all timeline body streams. ++ */ ++void kbase_tlstream_reset_body_streams(void); + -+struct sync_fence *mali_sync_flag_create_fence(struct mali_sync_flag *flag) -+{ -+ struct sync_pt *sync_pt; -+ struct sync_fence *sync_fence; ++#if MALI_UNIT_TEST ++/** ++ * kbase_tlstream_test - start timeline stream data generator ++ * @tpw_count: number of trace point writers in each context ++ * @msg_delay: time delay in milliseconds between trace points written by one ++ * writer ++ * @msg_count: number of trace points written by one writer ++ * @aux_msg: if non-zero aux messages will be included ++ * ++ * This test starts a requested number of asynchronous writers in both IRQ and ++ * thread context. Each writer will generate required number of test ++ * tracepoints (tracepoints with embedded information about writer that ++ * should be verified by user space reader). Tracepoints will be emitted in ++ * all timeline body streams. If aux_msg is non-zero writer will also ++ * generate not testable tracepoints (tracepoints without information about ++ * writer). These tracepoints are used to check correctness of remaining ++ * timeline message generating functions. Writer will wait requested time ++ * between generating another set of messages. This call blocks until all ++ * writers finish. ++ */ ++void kbase_tlstream_test( ++ unsigned int tpw_count, ++ unsigned int msg_delay, ++ unsigned int msg_count, ++ int aux_msg); + -+ MALI_DEBUG_ASSERT_POINTER(flag); -+ MALI_DEBUG_ASSERT_POINTER(flag->sync_tl); ++/** ++ * kbase_tlstream_stats - read timeline stream statistics ++ * @bytes_collected: will hold number of bytes read by the user ++ * @bytes_generated: will hold number of bytes generated by trace points ++ */ ++void kbase_tlstream_stats(u32 *bytes_collected, u32 *bytes_generated); ++#endif /* MALI_UNIT_TEST */ + -+ sync_pt = mali_sync_flag_create_pt(flag); -+ if (NULL == sync_pt) return NULL; ++/*****************************************************************************/ + -+ sync_fence = sync_fence_create("mali_flag_fence", sync_pt); -+ if (NULL == sync_fence) { -+ sync_pt_free(sync_pt); -+ return NULL; -+ } ++#define TL_ATOM_STATE_IDLE 0 ++#define TL_ATOM_STATE_READY 1 ++#define TL_ATOM_STATE_DONE 2 ++#define TL_ATOM_STATE_POSTED 3 + -+ return sync_fence; -+} -+#else -+static struct mali_internal_sync_timeline_ops mali_timeline_ops = { -+ .driver_name = "Mali", -+ .has_signaled = timeline_has_signaled, -+ .free_pt = timeline_free_pt, -+ .release_obj = timeline_release, -+ .print_sync_pt = timeline_print_sync_pt, -+}; -+ -+struct mali_internal_sync_timeline *mali_sync_timeline_create(struct mali_timeline *timeline, const char *name) -+{ -+ struct mali_internal_sync_timeline *sync_tl; -+ struct mali_sync_timeline_container *mali_sync_tl; -+ -+ sync_tl = mali_internal_sync_timeline_create(&mali_timeline_ops, sizeof(struct mali_sync_timeline_container), name); -+ if (NULL == sync_tl) return NULL; -+ -+ mali_sync_tl = to_mali_sync_tl_container(sync_tl); -+ mali_sync_tl->timeline = timeline; -+ -+ /* Grab a reference on the module to ensure the callbacks are present -+ * as long some timeline exists. The reference is released when the -+ * timeline is freed. -+ * Since this function is called from a ioctl on an open file we know -+ * we already have a reference, so using __module_get is safe. */ -+ __module_get(THIS_MODULE); -+ -+ return sync_tl; -+} -+ -+s32 mali_sync_fence_fd_alloc(struct mali_internal_sync_fence *sync_fence) -+{ -+ s32 fd = -1; -+ -+ fd = get_unused_fd_flags(0); -+ -+ if (fd < 0) { -+ fput(sync_fence->file); -+ return -1; -+ } -+ fd_install(fd, sync_fence->file); -+ return fd; -+} -+ -+struct mali_internal_sync_fence *mali_sync_fence_merge(struct mali_internal_sync_fence *sync_fence1, struct mali_internal_sync_fence *sync_fence2) -+{ -+ struct mali_internal_sync_fence *sync_fence; -+ -+ MALI_DEBUG_ASSERT_POINTER(sync_fence1); -+ MALI_DEBUG_ASSERT_POINTER(sync_fence1); -+ -+ sync_fence = mali_internal_sync_fence_merge(sync_fence1, sync_fence2); -+ fput(sync_fence1->file); -+ fput(sync_fence2->file); -+ -+ return sync_fence; -+} -+ -+struct mali_internal_sync_fence *mali_sync_timeline_create_signaled_fence(struct mali_internal_sync_timeline *sync_tl) -+{ -+ struct mali_sync_flag *flag; -+ struct mali_internal_sync_fence *sync_fence; -+ -+ MALI_DEBUG_ASSERT_POINTER(sync_tl); -+ -+ flag = mali_sync_flag_create(sync_tl, 0); -+ if (NULL == flag) return NULL; -+ -+ sync_fence = mali_sync_flag_create_fence(flag); -+ -+ mali_sync_flag_signal(flag, 0); -+ mali_sync_flag_put(flag); -+ -+ return sync_fence; -+} ++void __kbase_tlstream_tl_summary_new_ctx(void *context, u32 nr, u32 tgid); ++void __kbase_tlstream_tl_summary_new_gpu(void *gpu, u32 id, u32 core_count); ++void __kbase_tlstream_tl_summary_new_lpu(void *lpu, u32 nr, u32 fn); ++void __kbase_tlstream_tl_summary_lifelink_lpu_gpu(void *lpu, void *gpu); ++void __kbase_tlstream_tl_summary_new_as(void *as, u32 nr); ++void __kbase_tlstream_tl_summary_lifelink_as_gpu(void *as, void *gpu); ++void __kbase_tlstream_tl_new_ctx(void *context, u32 nr, u32 tgid); ++void __kbase_tlstream_tl_new_atom(void *atom, u32 nr); ++void __kbase_tlstream_tl_del_ctx(void *context); ++void __kbase_tlstream_tl_del_atom(void *atom); ++void __kbase_tlstream_tl_ret_ctx_lpu(void *context, void *lpu); ++void __kbase_tlstream_tl_ret_atom_ctx(void *atom, void *context); ++void __kbase_tlstream_tl_ret_atom_lpu( ++ void *atom, void *lpu, const char *attrib_match_list); ++void __kbase_tlstream_tl_nret_ctx_lpu(void *context, void *lpu); ++void __kbase_tlstream_tl_nret_atom_ctx(void *atom, void *context); ++void __kbase_tlstream_tl_nret_atom_lpu(void *atom, void *lpu); ++void __kbase_tlstream_tl_ret_as_ctx(void *as, void *ctx); ++void __kbase_tlstream_tl_nret_as_ctx(void *as, void *ctx); ++void __kbase_tlstream_tl_ret_atom_as(void *atom, void *as); ++void __kbase_tlstream_tl_nret_atom_as(void *atom, void *as); ++void __kbase_tlstream_tl_dep_atom_atom(void *atom1, void *atom2); ++void __kbase_tlstream_tl_ndep_atom_atom(void *atom1, void *atom2); ++void __kbase_tlstream_tl_rdep_atom_atom(void *atom1, void *atom2); ++void __kbase_tlstream_tl_attrib_atom_config( ++ void *atom, u64 jd, u64 affinity, u32 config); ++void __kbase_tlstream_tl_attrib_atom_priority(void *atom, u32 prio); ++void __kbase_tlstream_tl_attrib_atom_state(void *atom, u32 state); ++void __kbase_tlstream_tl_attrib_atom_priority_change(void *atom); ++void __kbase_tlstream_tl_attrib_atom_jit( ++ void *atom, u64 edit_addr, u64 new_addr); ++void __kbase_tlstream_tl_attrib_as_config( ++ void *as, u64 transtab, u64 memattr, u64 transcfg); ++void __kbase_tlstream_tl_event_atom_softstop_ex(void *atom); ++void __kbase_tlstream_tl_event_lpu_softstop(void *lpu); ++void __kbase_tlstream_tl_event_atom_softstop_issue(void *atom); ++void __kbase_tlstream_jd_gpu_soft_reset(void *gpu); ++void __kbase_tlstream_aux_pm_state(u32 core_type, u64 state); ++void __kbase_tlstream_aux_pagefault(u32 ctx_nr, u64 page_count_change); ++void __kbase_tlstream_aux_pagesalloc(u32 ctx_nr, u64 page_count); ++void __kbase_tlstream_aux_devfreq_target(u64 target_freq); ++void __kbase_tlstream_aux_protected_enter_start(void *gpu); ++void __kbase_tlstream_aux_protected_enter_end(void *gpu); ++void __kbase_tlstream_aux_protected_leave_start(void *gpu); ++void __kbase_tlstream_aux_protected_leave_end(void *gpu); + -+struct mali_sync_flag *mali_sync_flag_create(struct mali_internal_sync_timeline *sync_tl, mali_timeline_point point) -+{ -+ struct mali_sync_flag *flag; ++#define TLSTREAM_ENABLED (1 << 31) + -+ if (NULL == sync_tl) return NULL; ++extern atomic_t kbase_tlstream_enabled; + -+ flag = _mali_osk_calloc(1, sizeof(*flag)); -+ if (NULL == flag) return NULL; ++#define __TRACE_IF_ENABLED(trace_name, ...) \ ++ do { \ ++ int enabled = atomic_read(&kbase_tlstream_enabled); \ ++ if (enabled & TLSTREAM_ENABLED) \ ++ __kbase_tlstream_##trace_name(__VA_ARGS__); \ ++ } while (0) + -+ flag->sync_tl = sync_tl; -+ flag->point = point; ++#define __TRACE_IF_ENABLED_LATENCY(trace_name, ...) \ ++ do { \ ++ int enabled = atomic_read(&kbase_tlstream_enabled); \ ++ if (enabled & BASE_TLSTREAM_ENABLE_LATENCY_TRACEPOINTS) \ ++ __kbase_tlstream_##trace_name(__VA_ARGS__); \ ++ } while (0) + -+ flag->status = 0; -+ kref_init(&flag->refcount); ++#define __TRACE_IF_ENABLED_JD(trace_name, ...) \ ++ do { \ ++ int enabled = atomic_read(&kbase_tlstream_enabled); \ ++ if (enabled & BASE_TLSTREAM_JOB_DUMPING_ENABLED) \ ++ __kbase_tlstream_##trace_name(__VA_ARGS__); \ ++ } while (0) + -+ return flag; -+} ++/*****************************************************************************/ + +/** -+ * Create a sync point attached to given sync flag. -+ * -+ * @note Sync points must be triggered in *exactly* the same order as they are created. ++ * KBASE_TLSTREAM_TL_SUMMARY_NEW_CTX - create context object in timeline ++ * summary ++ * @context: name of the context object ++ * @nr: context number ++ * @tgid: thread Group Id + * -+ * @param flag Sync flag. -+ * @return New sync point if successful, NULL if not. ++ * Function emits a timeline message informing about context creation. Context ++ * is created with context number (its attribute), that can be used to link ++ * kbase context with userspace context. ++ * This message is directed to timeline summary stream. + */ -+static struct mali_internal_sync_point *mali_sync_flag_create_pt(struct mali_sync_flag *flag) -+{ -+ struct mali_internal_sync_point *pt; -+ struct mali_sync_pt *mpt; -+ -+ MALI_DEBUG_ASSERT_POINTER(flag); -+ MALI_DEBUG_ASSERT_POINTER(flag->sync_tl); -+ -+ pt = mali_internal_sync_point_create(flag->sync_tl, sizeof(struct mali_sync_pt)); -+ -+ if (pt == NULL) { -+ MALI_PRINT_ERROR(("Mali sync: sync_pt creation failed\n")); -+ return NULL; -+ } -+ mali_sync_flag_get(flag); -+ -+ mpt = to_mali_sync_pt(pt); -+ mpt->flag = flag; -+ mpt->sync_tl = flag->sync_tl; -+ -+ return pt; -+} -+ -+struct mali_internal_sync_fence *mali_sync_flag_create_fence(struct mali_sync_flag *flag) -+{ -+ struct mali_internal_sync_point *sync_pt; -+ struct mali_internal_sync_fence *sync_fence; -+ -+ MALI_DEBUG_ASSERT_POINTER(flag); -+ MALI_DEBUG_ASSERT_POINTER(flag->sync_tl); -+ -+ sync_pt = mali_sync_flag_create_pt(flag); -+ if (NULL == sync_pt) { -+ MALI_PRINT_ERROR(("Mali sync: sync_pt creation failed\n")); -+ return NULL; -+ } -+ sync_fence = (struct mali_internal_sync_fence *)sync_file_create(&sync_pt->base); -+ if (NULL == sync_fence) { -+ MALI_PRINT_ERROR(("Mali sync: sync_fence creation failed\n")); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -+ dma_fence_put(&sync_pt->base); -+#else -+ fence_put(&sync_pt->base); -+#endif -+ return NULL; -+ } -+ -+ /* 'sync_pt' no longer needs to hold a refcount of '*sync_pt', to put it off. */ -+ dma_fence_put(&sync_pt->base); -+ sync_pt = NULL; -+ -+ return sync_fence; -+} -+#endif -+ -+void mali_sync_flag_get(struct mali_sync_flag *flag) -+{ -+ MALI_DEBUG_ASSERT_POINTER(flag); -+ kref_get(&flag->refcount); -+} ++#define KBASE_TLSTREAM_TL_SUMMARY_NEW_CTX(context, nr, tgid) \ ++ __TRACE_IF_ENABLED(tl_summary_new_ctx, context, nr, tgid) + +/** -+ * Free sync flag. ++ * KBASE_TLSTREAM_TL_SUMMARY_NEW_GPU - create GPU object in timeline summary ++ * @gpu: name of the GPU object ++ * @id: id value of this GPU ++ * @core_count: number of cores this GPU hosts + * -+ * @param ref kref object embedded in sync flag that should be freed. ++ * Function emits a timeline message informing about GPU creation. GPU is ++ * created with two attributes: id and core count. ++ * This message is directed to timeline summary stream. + */ -+static void mali_sync_flag_free(struct kref *ref) -+{ -+ struct mali_sync_flag *flag; -+ -+ MALI_DEBUG_ASSERT_POINTER(ref); -+ flag = container_of(ref, struct mali_sync_flag, refcount); -+ -+ _mali_osk_free(flag); -+} -+ -+void mali_sync_flag_put(struct mali_sync_flag *flag) -+{ -+ MALI_DEBUG_ASSERT_POINTER(flag); -+ kref_put(&flag->refcount, mali_sync_flag_free); -+} -+ -+void mali_sync_flag_signal(struct mali_sync_flag *flag, int error) -+{ -+ MALI_DEBUG_ASSERT_POINTER(flag); -+ -+ MALI_DEBUG_ASSERT(0 == flag->status); -+ flag->status = (0 > error) ? error : 1; -+ -+ _mali_osk_write_mem_barrier(); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+ sync_timeline_signal(flag->sync_tl); -+#else -+ mali_internal_sync_timeline_signal(flag->sync_tl); -+#endif -+} -+ ++#define KBASE_TLSTREAM_TL_SUMMARY_NEW_GPU(gpu, id, core_count) \ ++ __TRACE_IF_ENABLED(tl_summary_new_gpu, gpu, id, core_count) + -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_sync.h b/drivers/gpu/arm/mali400/mali/linux/mali_sync.h -new file mode 100755 -index 000000000000..91be8b9cf314 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.h -@@ -0,0 +1,169 @@ -+/* -+ * Copyright (C) 2012-2015, 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * KBASE_TLSTREAM_TL_SUMMARY_NEW_LPU - create LPU object in timeline summary ++ * @lpu: name of the Logical Processing Unit object ++ * @nr: sequential number assigned to this LPU ++ * @fn: property describing this LPU's functional abilities ++ * ++ * Function emits a timeline message informing about LPU creation. LPU is ++ * created with two attributes: number linking this LPU with GPU's job slot ++ * and function bearing information about this LPU abilities. ++ * This message is directed to timeline summary stream. + */ ++#define KBASE_TLSTREAM_TL_SUMMARY_NEW_LPU(lpu, nr, fn) \ ++ __TRACE_IF_ENABLED(tl_summary_new_lpu, lpu, nr, fn) + +/** -+ * @file mali_sync.h ++ * KBASE_TLSTREAM_TL_SUMMARY_LIFELINK_LPU_GPU - lifelink LPU object to GPU ++ * @lpu: name of the Logical Processing Unit object ++ * @gpu: name of the GPU object + * -+ * Mali interface for Linux sync objects. ++ * Function emits a timeline message informing that LPU object shall be deleted ++ * along with GPU object. ++ * This message is directed to timeline summary stream. + */ ++#define KBASE_TLSTREAM_TL_SUMMARY_LIFELINK_LPU_GPU(lpu, gpu) \ ++ __TRACE_IF_ENABLED(tl_summary_lifelink_lpu_gpu, lpu, gpu) + -+#ifndef _MALI_SYNC_H_ -+#define _MALI_SYNC_H_ -+ -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ -+#include -+#include ++/** ++ * KBASE_TLSTREAM_TL_SUMMARY_NEW_AS - create address space object in timeline summary ++ * @as: name of the address space object ++ * @nr: sequential number assigned to this address space ++ * ++ * Function emits a timeline message informing about address space creation. ++ * Address space is created with one attribute: number identifying this ++ * address space. ++ * This message is directed to timeline summary stream. ++ */ ++#define KBASE_TLSTREAM_TL_SUMMARY_NEW_AS(as, nr) \ ++ __TRACE_IF_ENABLED(tl_summary_new_as, as, nr) + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) -+#include -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+#include -+#else -+#include "mali_internal_sync.h" -+#endif ++/** ++ * KBASE_TLSTREAM_TL_SUMMARY_LIFELINK_AS_GPU - lifelink address space object to GPU ++ * @as: name of the address space object ++ * @gpu: name of the GPU object ++ * ++ * Function emits a timeline message informing that address space object ++ * shall be deleted along with GPU object. ++ * This message is directed to timeline summary stream. ++ */ ++#define KBASE_TLSTREAM_TL_SUMMARY_LIFELINK_AS_GPU(as, gpu) \ ++ __TRACE_IF_ENABLED(tl_summary_lifelink_as_gpu, as, gpu) + ++/** ++ * KBASE_TLSTREAM_TL_NEW_CTX - create context object in timeline ++ * @context: name of the context object ++ * @nr: context number ++ * @tgid: thread Group Id ++ * ++ * Function emits a timeline message informing about context creation. Context ++ * is created with context number (its attribute), that can be used to link ++ * kbase context with userspace context. ++ */ ++#define KBASE_TLSTREAM_TL_NEW_CTX(context, nr, tgid) \ ++ __TRACE_IF_ENABLED(tl_new_ctx, context, nr, tgid) + -+#include "mali_osk.h" ++/** ++ * KBASE_TLSTREAM_TL_NEW_ATOM - create atom object in timeline ++ * @atom: name of the atom object ++ * @nr: sequential number assigned to this atom ++ * ++ * Function emits a timeline message informing about atom creation. Atom is ++ * created with atom number (its attribute) that links it with actual work ++ * bucket id understood by hardware. ++ */ ++#define KBASE_TLSTREAM_TL_NEW_ATOM(atom, nr) \ ++ __TRACE_IF_ENABLED(tl_new_atom, atom, nr) + -+struct mali_sync_flag; -+struct mali_timeline; ++/** ++ * KBASE_TLSTREAM_TL_DEL_CTX - destroy context object in timeline ++ * @context: name of the context object ++ * ++ * Function emits a timeline message informing that context object ceased to ++ * exist. ++ */ ++#define KBASE_TLSTREAM_TL_DEL_CTX(context) \ ++ __TRACE_IF_ENABLED(tl_del_ctx, context) + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) +/** -+ * Create a sync timeline. ++ * KBASE_TLSTREAM_TL_DEL_ATOM - destroy atom object in timeline ++ * @atom: name of the atom object + * -+ * @param name Name of the sync timeline. -+ * @return The new sync timeline if successful, NULL if not. ++ * Function emits a timeline message informing that atom object ceased to ++ * exist. + */ -+struct sync_timeline *mali_sync_timeline_create(struct mali_timeline *timeline, const char *name); ++#define KBASE_TLSTREAM_TL_DEL_ATOM(atom) \ ++ __TRACE_IF_ENABLED(tl_del_atom, atom) + +/** -+ * Creates a file descriptor representing the sync fence. Will release sync fence if allocation of -+ * file descriptor fails. ++ * KBASE_TLSTREAM_TL_RET_CTX_LPU - retain context by LPU ++ * @context: name of the context object ++ * @lpu: name of the Logical Processing Unit object + * -+ * @param sync_fence Sync fence. -+ * @return File descriptor representing sync fence if successful, or -1 if not. ++ * Function emits a timeline message informing that context is being held ++ * by LPU and must not be deleted unless it is released. + */ -+s32 mali_sync_fence_fd_alloc(struct sync_fence *sync_fence); ++#define KBASE_TLSTREAM_TL_RET_CTX_LPU(context, lpu) \ ++ __TRACE_IF_ENABLED(tl_ret_ctx_lpu, context, lpu) + +/** -+ * Merges two sync fences. Both input sync fences will be released. ++ * KBASE_TLSTREAM_TL_RET_ATOM_CTX - retain atom by context ++ * @atom: name of the atom object ++ * @context: name of the context object + * -+ * @param sync_fence1 First sync fence. -+ * @param sync_fence2 Second sync fence. -+ * @return New sync fence that is the result of the merger if successful, or NULL if not. ++ * Function emits a timeline message informing that atom object is being held ++ * by context and must not be deleted unless it is released. + */ -+struct sync_fence *mali_sync_fence_merge(struct sync_fence *sync_fence1, struct sync_fence *sync_fence2); ++#define KBASE_TLSTREAM_TL_RET_ATOM_CTX(atom, context) \ ++ __TRACE_IF_ENABLED(tl_ret_atom_ctx, atom, context) + +/** -+ * Create a sync fence that is already signaled. ++ * KBASE_TLSTREAM_TL_RET_ATOM_LPU - retain atom by LPU ++ * @atom: name of the atom object ++ * @lpu: name of the Logical Processing Unit object ++ * @attrib_match_list: list containing match operator attributes + * -+ * @param tl Sync timeline. -+ * @return New signaled sync fence if successful, NULL if not. ++ * Function emits a timeline message informing that atom object is being held ++ * by LPU and must not be deleted unless it is released. + */ -+struct sync_fence *mali_sync_timeline_create_signaled_fence(struct sync_timeline *sync_tl); ++#define KBASE_TLSTREAM_TL_RET_ATOM_LPU(atom, lpu, attrib_match_list) \ ++ __TRACE_IF_ENABLED(tl_ret_atom_lpu, atom, lpu, attrib_match_list) + ++/** ++ * KBASE_TLSTREAM_TL_NRET_CTX_LPU - release context by LPU ++ * @context: name of the context object ++ * @lpu: name of the Logical Processing Unit object ++ * ++ * Function emits a timeline message informing that context is being released ++ * by LPU object. ++ */ ++#define KBASE_TLSTREAM_TL_NRET_CTX_LPU(context, lpu) \ ++ __TRACE_IF_ENABLED(tl_nret_ctx_lpu, context, lpu) + +/** -+ * Create a sync flag. ++ * KBASE_TLSTREAM_TL_NRET_ATOM_CTX - release atom by context ++ * @atom: name of the atom object ++ * @context: name of the context object + * -+ * @param sync_tl Sync timeline. -+ * @param point Point on Mali timeline. -+ * @return New sync flag if successful, NULL if not. ++ * Function emits a timeline message informing that atom object is being ++ * released by context. + */ -+struct mali_sync_flag *mali_sync_flag_create(struct sync_timeline *sync_tl, u32 point); ++#define KBASE_TLSTREAM_TL_NRET_ATOM_CTX(atom, context) \ ++ __TRACE_IF_ENABLED(tl_nret_atom_ctx, atom, context) + +/** -+ * Create a sync fence attached to given sync flag. ++ * KBASE_TLSTREAM_TL_NRET_ATOM_LPU - release atom by LPU ++ * @atom: name of the atom object ++ * @lpu: name of the Logical Processing Unit object + * -+ * @param flag Sync flag. -+ * @return New sync fence if successful, NULL if not. ++ * Function emits a timeline message informing that atom object is being ++ * released by LPU. + */ -+struct sync_fence *mali_sync_flag_create_fence(struct mali_sync_flag *flag); -+#else ++#define KBASE_TLSTREAM_TL_NRET_ATOM_LPU(atom, lpu) \ ++ __TRACE_IF_ENABLED(tl_nret_atom_lpu, atom, lpu) ++ +/** -+ * Create a sync timeline. ++ * KBASE_TLSTREAM_TL_RET_AS_CTX - lifelink address space object to context ++ * @as: name of the address space object ++ * @ctx: name of the context object + * -+ * @param name Name of the sync timeline. -+ * @return The new sync timeline if successful, NULL if not. ++ * Function emits a timeline message informing that address space object ++ * is being held by the context object. + */ -+struct mali_internal_sync_timeline *mali_sync_timeline_create(struct mali_timeline *timeline, const char *name); ++#define KBASE_TLSTREAM_TL_RET_AS_CTX(as, ctx) \ ++ __TRACE_IF_ENABLED(tl_ret_as_ctx, as, ctx) + +/** -+ * Creates a file descriptor representing the sync fence. Will release sync fence if allocation of -+ * file descriptor fails. ++ * KBASE_TLSTREAM_TL_NRET_AS_CTX - release address space by context ++ * @as: name of the address space object ++ * @ctx: name of the context object + * -+ * @param sync_fence Sync fence. -+ * @return File descriptor representing sync fence if successful, or -1 if not. ++ * Function emits a timeline message informing that address space object ++ * is being released by atom. + */ -+s32 mali_sync_fence_fd_alloc(struct mali_internal_sync_fence *sync_fence); ++#define KBASE_TLSTREAM_TL_NRET_AS_CTX(as, ctx) \ ++ __TRACE_IF_ENABLED(tl_nret_as_ctx, as, ctx) + +/** -+ * Merges two sync fences. Both input sync fences will be released. ++ * KBASE_TLSTREAM_TL_RET_ATOM_AS - retain atom by address space ++ * @atom: name of the atom object ++ * @as: name of the address space object + * -+ * @param sync_fence1 First sync fence. -+ * @param sync_fence2 Second sync fence. -+ * @return New sync fence that is the result of the merger if successful, or NULL if not. ++ * Function emits a timeline message informing that atom object is being held ++ * by address space and must not be deleted unless it is released. + */ -+struct mali_internal_sync_fence *mali_sync_fence_merge(struct mali_internal_sync_fence *sync_fence1, struct mali_internal_sync_fence *sync_fence2); ++#define KBASE_TLSTREAM_TL_RET_ATOM_AS(atom, as) \ ++ __TRACE_IF_ENABLED(tl_ret_atom_as, atom, as) + +/** -+ * Create a sync fence that is already signaled. ++ * KBASE_TLSTREAM_TL_NRET_ATOM_AS - release atom by address space ++ * @atom: name of the atom object ++ * @as: name of the address space object + * -+ * @param tl Sync timeline. -+ * @return New signaled sync fence if successful, NULL if not. ++ * Function emits a timeline message informing that atom object is being ++ * released by address space. + */ -+struct mali_internal_sync_fence *mali_sync_timeline_create_signaled_fence(struct mali_internal_sync_timeline *sync_tl); ++#define KBASE_TLSTREAM_TL_NRET_ATOM_AS(atom, as) \ ++ __TRACE_IF_ENABLED(tl_nret_atom_as, atom, as) + ++/** ++ * KBASE_TLSTREAM_TL_DEP_ATOM_ATOM - parent atom depends on child atom ++ * @atom1: name of the child atom object ++ * @atom2: name of the parent atom object that depends on child atom ++ * ++ * Function emits a timeline message informing that parent atom waits for ++ * child atom object to be completed before start its execution. ++ */ ++#define KBASE_TLSTREAM_TL_DEP_ATOM_ATOM(atom1, atom2) \ ++ __TRACE_IF_ENABLED(tl_dep_atom_atom, atom1, atom2) + +/** -+ * Create a sync flag. ++ * KBASE_TLSTREAM_TL_NDEP_ATOM_ATOM - dependency between atoms resolved ++ * @atom1: name of the child atom object ++ * @atom2: name of the parent atom object that depended on child atom + * -+ * @param sync_tl Sync timeline. -+ * @param point Point on Mali timeline. -+ * @return New sync flag if successful, NULL if not. ++ * Function emits a timeline message informing that parent atom execution ++ * dependency on child atom has been resolved. + */ -+struct mali_sync_flag *mali_sync_flag_create(struct mali_internal_sync_timeline *sync_tl, u32 point); ++#define KBASE_TLSTREAM_TL_NDEP_ATOM_ATOM(atom1, atom2) \ ++ __TRACE_IF_ENABLED(tl_ndep_atom_atom, atom1, atom2) + +/** -+ * Create a sync fence attached to given sync flag. ++ * KBASE_TLSTREAM_TL_RDEP_ATOM_ATOM - information about already resolved dependency between atoms ++ * @atom1: name of the child atom object ++ * @atom2: name of the parent atom object that depended on child atom + * -+ * @param flag Sync flag. -+ * @return New sync fence if successful, NULL if not. ++ * Function emits a timeline message informing that parent atom execution ++ * dependency on child atom has been resolved. + */ -+struct mali_internal_sync_fence *mali_sync_flag_create_fence(struct mali_sync_flag *flag); ++#define KBASE_TLSTREAM_TL_RDEP_ATOM_ATOM(atom1, atom2) \ ++ __TRACE_IF_ENABLED(tl_rdep_atom_atom, atom1, atom2) + -+#endif +/** -+ * Grab sync flag reference. ++ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_CONFIG - atom job slot attributes ++ * @atom: name of the atom object ++ * @jd: job descriptor address ++ * @affinity: job affinity ++ * @config: job config + * -+ * @param flag Sync flag. ++ * Function emits a timeline message containing atom attributes. + */ -+void mali_sync_flag_get(struct mali_sync_flag *flag); ++#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_CONFIG(atom, jd, affinity, config) \ ++ __TRACE_IF_ENABLED(tl_attrib_atom_config, atom, jd, affinity, config) + +/** -+ * Release sync flag reference. If this was the last reference, the sync flag will be freed. ++ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY - atom priority ++ * @atom: name of the atom object ++ * @prio: atom priority + * -+ * @param flag Sync flag. ++ * Function emits a timeline message containing atom priority. + */ -+void mali_sync_flag_put(struct mali_sync_flag *flag); ++#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY(atom, prio) \ ++ __TRACE_IF_ENABLED_LATENCY(tl_attrib_atom_priority, atom, prio) + +/** -+ * Signal sync flag. All sync fences created from this flag will be signaled. ++ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE - atom state ++ * @atom: name of the atom object ++ * @state: atom state + * -+ * @param flag Sync flag to signal. -+ * @param error Negative error code, or 0 if no error. ++ * Function emits a timeline message containing atom state. + */ -+void mali_sync_flag_signal(struct mali_sync_flag *flag, int error); ++#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_STATE(atom, state) \ ++ __TRACE_IF_ENABLED_LATENCY(tl_attrib_atom_state, atom, state) + -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++/** ++ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY_CHANGE - atom caused priority change ++ * @atom: name of the atom object ++ * ++ * Function emits a timeline message signalling priority change ++ */ ++#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY_CHANGE(atom) \ ++ __TRACE_IF_ENABLED_LATENCY(tl_attrib_atom_priority_change, atom) + -+#endif /* _MALI_SYNC_H_ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h b/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h -new file mode 100755 -index 000000000000..68b27b8be067 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h -@@ -0,0 +1,17 @@ -+/* -+ * Copyright (C) 2012, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * KBASE_TLSTREAM_TL_ATTRIB_ATOM_JIT - jit happened on atom ++ * @atom: atom identifier ++ * @edit_addr: address edited by jit ++ * @new_addr: address placed into the edited location + */ ++#define KBASE_TLSTREAM_TL_ATTRIB_ATOM_JIT(atom, edit_addr, new_addr) \ ++ __TRACE_IF_ENABLED_JD(tl_attrib_atom_jit, atom, edit_addr, new_addr) + -+#ifndef __MALI_UK_TYPES_H__ -+#define __MALI_UK_TYPES_H__ ++/** ++ * KBASE_TLSTREAM_TL_ATTRIB_AS_CONFIG - address space attributes ++ * @as: assigned address space ++ * @transtab: configuration of the TRANSTAB register ++ * @memattr: configuration of the MEMATTR register ++ * @transcfg: configuration of the TRANSCFG register (or zero if not present) ++ * ++ * Function emits a timeline message containing address space attributes. ++ */ ++#define KBASE_TLSTREAM_TL_ATTRIB_AS_CONFIG(as, transtab, memattr, transcfg) \ ++ __TRACE_IF_ENABLED(tl_attrib_as_config, as, transtab, memattr, transcfg) + -+/* Simple wrapper in order to find the OS specific location of this file */ -+#include ++/** ++ * KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_ex ++ * @atom: atom identifier ++ */ ++#define KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_EX(atom) \ ++ __TRACE_IF_ENABLED(tl_event_atom_softstop_ex, atom) + -+#endif /* __MALI_UK_TYPES_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c -new file mode 100755 -index 000000000000..0bd1cddb10c6 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c -@@ -0,0 +1,171 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * KBASE_TLSTREAM_TL_EVENT_LPU_softstop ++ * @lpu: name of the LPU object + */ -+#include /* file system operations */ -+#include /* memort allocation functions */ -+#include /* user space access */ ++#define KBASE_TLSTREAM_TL_EVENT_LPU_SOFTSTOP(lpu) \ ++ __TRACE_IF_ENABLED(tl_event_lpu_softstop, lpu) + -+#include "mali_ukk.h" -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_session.h" -+#include "mali_ukk_wrappers.h" ++/** ++ * KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_issue ++ * @atom: atom identifier ++ */ ++#define KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_ISSUE(atom) \ ++ __TRACE_IF_ENABLED(tl_event_atom_softstop_issue, atom) + -+int get_api_version_wrapper(struct mali_session_data *session_data, _mali_uk_get_api_version_s __user *uargs) -+{ -+ _mali_uk_get_api_version_s kargs; -+ _mali_osk_errcode_t err; ++/** ++ * KBASE_TLSTREAM_JD_GPU_SOFT_RESET - The GPU is being soft reset ++ * @gpu: name of the GPU object ++ * ++ * This imperative tracepoint is specific to job dumping. ++ * Function emits a timeline message indicating GPU soft reset. ++ */ ++#define KBASE_TLSTREAM_JD_GPU_SOFT_RESET(gpu) \ ++ __TRACE_IF_ENABLED(jd_gpu_soft_reset, gpu) + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ if (0 != get_user(kargs.version, &uargs->version)) return -EFAULT; ++/** ++ * KBASE_TLSTREAM_AUX_PM_STATE - timeline message: power management state ++ * @core_type: core type (shader, tiler, l2 cache, l3 cache) ++ * @state: 64bits bitmask reporting power state of the cores (1-ON, 0-OFF) ++ */ ++#define KBASE_TLSTREAM_AUX_PM_STATE(core_type, state) \ ++ __TRACE_IF_ENABLED(aux_pm_state, core_type, state) + -+ kargs.ctx = (uintptr_t)session_data; -+ err = _mali_ukk_get_api_version(&kargs); -+ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); ++/** ++ * KBASE_TLSTREAM_AUX_PAGEFAULT - timeline message: MMU page fault event ++ * resulting in new pages being mapped ++ * @ctx_nr: kernel context number ++ * @page_count_change: number of pages to be added ++ */ ++#define KBASE_TLSTREAM_AUX_PAGEFAULT(ctx_nr, page_count_change) \ ++ __TRACE_IF_ENABLED(aux_pagefault, ctx_nr, page_count_change) + -+ if (0 != put_user(kargs.version, &uargs->version)) return -EFAULT; -+ if (0 != put_user(kargs.compatible, &uargs->compatible)) return -EFAULT; ++/** ++ * KBASE_TLSTREAM_AUX_PAGESALLOC - timeline message: total number of allocated ++ * pages is changed ++ * @ctx_nr: kernel context number ++ * @page_count: number of pages used by the context ++ */ ++#define KBASE_TLSTREAM_AUX_PAGESALLOC(ctx_nr, page_count) \ ++ __TRACE_IF_ENABLED(aux_pagesalloc, ctx_nr, page_count) + -+ return 0; -+} ++/** ++ * KBASE_TLSTREAM_AUX_DEVFREQ_TARGET - timeline message: new target DVFS ++ * frequency ++ * @target_freq: new target frequency ++ */ ++#define KBASE_TLSTREAM_AUX_DEVFREQ_TARGET(target_freq) \ ++ __TRACE_IF_ENABLED(aux_devfreq_target, target_freq) + -+int get_api_version_v2_wrapper(struct mali_session_data *session_data, _mali_uk_get_api_version_v2_s __user *uargs) -+{ -+ _mali_uk_get_api_version_v2_s kargs; -+ _mali_osk_errcode_t err; ++/** ++ * KBASE_TLSTREAM_AUX_PROTECTED_ENTER_START - The GPU has started transitioning ++ * to protected mode ++ * @gpu: name of the GPU object ++ * ++ * Function emits a timeline message indicating the GPU is starting to ++ * transition to protected mode. ++ */ ++#define KBASE_TLSTREAM_AUX_PROTECTED_ENTER_START(gpu) \ ++ __TRACE_IF_ENABLED_LATENCY(aux_protected_enter_start, gpu) + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++/** ++ * KBASE_TLSTREAM_AUX_PROTECTED_ENTER_END - The GPU has finished transitioning ++ * to protected mode ++ * @gpu: name of the GPU object ++ * ++ * Function emits a timeline message indicating the GPU has finished ++ * transitioning to protected mode. ++ */ ++#define KBASE_TLSTREAM_AUX_PROTECTED_ENTER_END(gpu) \ ++ __TRACE_IF_ENABLED_LATENCY(aux_protected_enter_end, gpu) + -+ if (0 != get_user(kargs.version, &uargs->version)) return -EFAULT; ++/** ++ * KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_START - The GPU has started transitioning ++ * to non-protected mode ++ * @gpu: name of the GPU object ++ * ++ * Function emits a timeline message indicating the GPU is starting to ++ * transition to non-protected mode. ++ */ ++#define KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_START(gpu) \ ++ __TRACE_IF_ENABLED_LATENCY(aux_protected_leave_start, gpu) + -+ kargs.ctx = (uintptr_t)session_data; -+ err = _mali_ukk_get_api_version_v2(&kargs); -+ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); ++/** ++ * KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_END - The GPU has finished transitioning ++ * to non-protected mode ++ * @gpu: name of the GPU object ++ * ++ * Function emits a timeline message indicating the GPU has finished ++ * transitioning to non-protected mode. ++ */ ++#define KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_END(gpu) \ ++ __TRACE_IF_ENABLED_LATENCY(aux_protected_leave_end, gpu) + -+ if (0 != put_user(kargs.version, &uargs->version)) return -EFAULT; -+ if (0 != put_user(kargs.compatible, &uargs->compatible)) return -EFAULT; ++#endif /* _KBASE_TLSTREAM_H */ + -+ return 0; -+} +diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h b/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h +new file mode 100755 +index 000000000..e2e054420 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h +@@ -0,0 +1,264 @@ ++/* ++ * ++ * (C) COPYRIGHT 2011-2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+/* rk_ext : 从对 r5p0-01rel0 集æˆå¼€å§‹, ä¸å†ä½¿ç”¨. */ -+#if 0 -+#define mali400_in_rk30_version 0x01 -+int get_mali_version_in_rk30_wrapper(struct mali_session_data *session_data, _mali_uk_get_mali_version_in_rk30_s __user *uargs) -+{ -+ _mali_uk_get_mali_version_in_rk30_s kargs; -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ kargs.ctx = (uintptr_t)session_data; -+ kargs.version = mali400_in_rk30_version; -+ if (0 != put_user(kargs.version, &uargs->version)) return -EFAULT; -+ return 0; -+} -+#else -+#include "../platform/rk/rk_ext.h" -+int get_rk_ko_version_wrapper(struct mali_session_data *session_data, _mali_rk_ko_version_s __user *uargs) -+{ -+ _mali_rk_ko_version_s kargs; -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ kargs.ctx = (uintptr_t)session_data; -+ kargs.version = RK_KO_VER; -+ if (0 != put_user(kargs.version, &uargs->version)) return -EFAULT; -+ return 0; -+} -+#endif + -+int wait_for_notification_wrapper(struct mali_session_data *session_data, _mali_uk_wait_for_notification_s __user *uargs) -+{ -+ _mali_uk_wait_for_notification_s kargs; -+ _mali_osk_errcode_t err; + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ kargs.ctx = (uintptr_t)session_data; -+ err = _mali_ukk_wait_for_notification(&kargs); -+ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); + -+ if (_MALI_NOTIFICATION_CORE_SHUTDOWN_IN_PROGRESS != kargs.type) { -+ kargs.ctx = (uintptr_t)NULL; /* prevent kernel address to be returned to user space */ -+ if (0 != copy_to_user(uargs, &kargs, sizeof(_mali_uk_wait_for_notification_s))) return -EFAULT; -+ } else { -+ if (0 != put_user(kargs.type, &uargs->type)) return -EFAULT; -+ } ++/* ***** IMPORTANT: THIS IS NOT A NORMAL HEADER FILE ***** ++ * ***** DO NOT INCLUDE DIRECTLY ***** ++ * ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ + -+ return 0; -+} ++/* ++ * The purpose of this header file is just to contain a list of trace code idenitifers ++ * ++ * Each identifier is wrapped in a macro, so that its string form and enum form can be created ++ * ++ * Each macro is separated with a comma, to allow insertion into an array initializer or enum definition block. ++ * ++ * This allows automatic creation of an enum and a corresponding array of strings ++ * ++ * Before #including, the includer MUST #define KBASE_TRACE_CODE_MAKE_CODE. ++ * After #including, the includer MUST #under KBASE_TRACE_CODE_MAKE_CODE. ++ * ++ * e.g.: ++ * #define KBASE_TRACE_CODE( X ) KBASE_TRACE_CODE_ ## X ++ * typedef enum ++ * { ++ * #define KBASE_TRACE_CODE_MAKE_CODE( X ) KBASE_TRACE_CODE( X ) ++ * #include "mali_kbase_trace_defs.h" ++ * #undef KBASE_TRACE_CODE_MAKE_CODE ++ * } kbase_trace_code; ++ * ++ * IMPORTANT: THIS FILE MUST NOT BE USED FOR ANY OTHER PURPOSE OTHER THAN THE ABOVE ++ * ++ * ++ * The use of the macro here is: ++ * - KBASE_TRACE_CODE_MAKE_CODE( X ) ++ * ++ * Which produces: ++ * - For an enum, KBASE_TRACE_CODE_X ++ * - For a string, "X" ++ * ++ * ++ * For example: ++ * - KBASE_TRACE_CODE_MAKE_CODE( JM_JOB_COMPLETE ) expands to: ++ * - KBASE_TRACE_CODE_JM_JOB_COMPLETE for the enum ++ * - "JM_JOB_COMPLETE" for the string ++ * - To use it to trace an event, do: ++ * - KBASE_TRACE_ADD( kbdev, JM_JOB_COMPLETE, subcode, kctx, uatom, val ); ++ */ + -+int post_notification_wrapper(struct mali_session_data *session_data, _mali_uk_post_notification_s __user *uargs) -+{ -+ _mali_uk_post_notification_s kargs; -+ _mali_osk_errcode_t err; ++#if 0 /* Dummy section to avoid breaking formatting */ ++int dummy_array[] = { ++#endif + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++/* ++ * Core events ++ */ ++ /* no info_val, no gpu_addr, no atom */ ++ KBASE_TRACE_CODE_MAKE_CODE(CORE_CTX_DESTROY), ++ /* no info_val, no gpu_addr, no atom */ ++ KBASE_TRACE_CODE_MAKE_CODE(CORE_CTX_HWINSTR_TERM), ++ /* info_val == GPU_IRQ_STATUS register */ ++ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_IRQ), ++ /* info_val == bits cleared */ ++ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_IRQ_CLEAR), ++ /* info_val == GPU_IRQ_STATUS register */ ++ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_IRQ_DONE), ++ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_SOFT_RESET), ++ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_HARD_RESET), ++ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_PRFCNT_CLEAR), ++ /* GPU addr==dump address */ ++ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_PRFCNT_SAMPLE), ++ KBASE_TRACE_CODE_MAKE_CODE(CORE_GPU_CLEAN_INV_CACHES), ++/* ++ * Job Slot management events ++ */ ++ /* info_val==irq rawstat at start */ ++ KBASE_TRACE_CODE_MAKE_CODE(JM_IRQ), ++ /* info_val==jobs processed */ ++ KBASE_TRACE_CODE_MAKE_CODE(JM_IRQ_END), ++/* In the following: ++ * ++ * - ctx is set if a corresponding job found (NULL otherwise, e.g. some soft-stop cases) ++ * - uatom==kernel-side mapped uatom address (for correlation with user-side) ++ */ ++ /* info_val==exit code; gpu_addr==chain gpuaddr */ ++ KBASE_TRACE_CODE_MAKE_CODE(JM_JOB_DONE), ++ /* gpu_addr==JS_HEAD_NEXT written, info_val==lower 32 bits of affinity */ ++ KBASE_TRACE_CODE_MAKE_CODE(JM_SUBMIT), ++ /* gpu_addr is as follows: ++ * - If JS_STATUS active after soft-stop, val==gpu addr written to ++ * JS_HEAD on submit ++ * - otherwise gpu_addr==0 */ ++ KBASE_TRACE_CODE_MAKE_CODE(JM_SOFTSTOP), ++ KBASE_TRACE_CODE_MAKE_CODE(JM_SOFTSTOP_0), ++ KBASE_TRACE_CODE_MAKE_CODE(JM_SOFTSTOP_1), ++ /* gpu_addr==JS_HEAD read */ ++ KBASE_TRACE_CODE_MAKE_CODE(JM_HARDSTOP), ++ /* gpu_addr==JS_HEAD read */ ++ KBASE_TRACE_CODE_MAKE_CODE(JM_HARDSTOP_0), ++ /* gpu_addr==JS_HEAD read */ ++ KBASE_TRACE_CODE_MAKE_CODE(JM_HARDSTOP_1), ++ /* gpu_addr==JS_TAIL read */ ++ KBASE_TRACE_CODE_MAKE_CODE(JM_UPDATE_HEAD), ++/* gpu_addr is as follows: ++ * - If JS_STATUS active before soft-stop, val==JS_HEAD ++ * - otherwise gpu_addr==0 ++ */ ++ /* gpu_addr==JS_HEAD read */ ++ KBASE_TRACE_CODE_MAKE_CODE(JM_CHECK_HEAD), ++ KBASE_TRACE_CODE_MAKE_CODE(JM_FLUSH_WORKQS), ++ KBASE_TRACE_CODE_MAKE_CODE(JM_FLUSH_WORKQS_DONE), ++ /* info_val == is_scheduled */ ++ KBASE_TRACE_CODE_MAKE_CODE(JM_ZAP_NON_SCHEDULED), ++ /* info_val == is_scheduled */ ++ KBASE_TRACE_CODE_MAKE_CODE(JM_ZAP_SCHEDULED), ++ KBASE_TRACE_CODE_MAKE_CODE(JM_ZAP_DONE), ++ /* info_val == nr jobs submitted */ ++ KBASE_TRACE_CODE_MAKE_CODE(JM_SLOT_SOFT_OR_HARD_STOP), ++ /* gpu_addr==JS_HEAD_NEXT last written */ ++ KBASE_TRACE_CODE_MAKE_CODE(JM_SLOT_EVICT), ++ KBASE_TRACE_CODE_MAKE_CODE(JM_SUBMIT_AFTER_RESET), ++ KBASE_TRACE_CODE_MAKE_CODE(JM_BEGIN_RESET_WORKER), ++ KBASE_TRACE_CODE_MAKE_CODE(JM_END_RESET_WORKER), ++/* ++ * Job dispatch events ++ */ ++ /* gpu_addr==value to write into JS_HEAD */ ++ KBASE_TRACE_CODE_MAKE_CODE(JD_DONE), ++ /* gpu_addr==value to write into JS_HEAD */ ++ KBASE_TRACE_CODE_MAKE_CODE(JD_DONE_WORKER), ++ /* gpu_addr==value to write into JS_HEAD */ ++ KBASE_TRACE_CODE_MAKE_CODE(JD_DONE_WORKER_END), ++ /* gpu_addr==value to write into JS_HEAD */ ++ KBASE_TRACE_CODE_MAKE_CODE(JD_DONE_TRY_RUN_NEXT_JOB), ++ /* gpu_addr==0, info_val==0, uatom==0 */ ++ KBASE_TRACE_CODE_MAKE_CODE(JD_ZAP_CONTEXT), ++ /* gpu_addr==value to write into JS_HEAD */ ++ KBASE_TRACE_CODE_MAKE_CODE(JD_CANCEL), ++ /* gpu_addr==value to write into JS_HEAD */ ++ KBASE_TRACE_CODE_MAKE_CODE(JD_CANCEL_WORKER), ++/* ++ * Scheduler Core events ++ */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_RETAIN_CTX_NOLOCK), ++ /* gpu_addr==value to write into JS_HEAD */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_ADD_JOB), ++ /* gpu_addr==last value written/would be written to JS_HEAD */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_REMOVE_JOB), ++ KBASE_TRACE_CODE_MAKE_CODE(JS_RETAIN_CTX), ++ KBASE_TRACE_CODE_MAKE_CODE(JS_RELEASE_CTX), ++ KBASE_TRACE_CODE_MAKE_CODE(JS_TRY_SCHEDULE_HEAD_CTX), ++ /* gpu_addr==value to write into JS_HEAD */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_JOB_DONE_TRY_RUN_NEXT_JOB), ++ /* gpu_addr==value to write into JS_HEAD */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_JOB_DONE_RETRY_NEEDED), ++ /* kctx is the one being evicted, info_val == kctx to put in */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_FAST_START_EVICTS_CTX), ++ KBASE_TRACE_CODE_MAKE_CODE(JS_AFFINITY_SUBMIT_TO_BLOCKED), ++ /* info_val == lower 32 bits of affinity */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_AFFINITY_CURRENT), ++ /* info_val == lower 32 bits of affinity */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_CORE_REF_REQUEST_CORES_FAILED), ++ /* info_val == lower 32 bits of affinity */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_CORE_REF_REGISTER_INUSE_FAILED), ++ /* info_val == lower 32 bits of rechecked affinity */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_CORE_REF_REQUEST_ON_RECHECK_FAILED), ++ /* info_val == lower 32 bits of rechecked affinity */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_CORE_REF_REGISTER_ON_RECHECK_FAILED), ++ /* info_val == lower 32 bits of affinity */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_CORE_REF_AFFINITY_WOULD_VIOLATE), ++ /* info_val == the ctx attribute now on ctx */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_CTX_ATTR_NOW_ON_CTX), ++ /* info_val == the ctx attribute now on runpool */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_CTX_ATTR_NOW_ON_RUNPOOL), ++ /* info_val == the ctx attribute now off ctx */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_CTX_ATTR_NOW_OFF_CTX), ++ /* info_val == the ctx attribute now off runpool */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_CTX_ATTR_NOW_OFF_RUNPOOL), ++/* ++ * Scheduler Policy events ++ */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_INIT_CTX), ++ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_TERM_CTX), ++ /* info_val == whether it was evicted */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_TRY_EVICT_CTX), ++ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_FOREACH_CTX_JOBS), ++ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_ENQUEUE_CTX), ++ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_DEQUEUE_HEAD_CTX), ++ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_RUNPOOL_ADD_CTX), ++ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_RUNPOOL_REMOVE_CTX), ++ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_DEQUEUE_JOB), ++ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_DEQUEUE_JOB_IRQ), ++ /* gpu_addr==JS_HEAD to write if the job were run */ ++ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_ENQUEUE_JOB), ++ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_TIMER_START), ++ KBASE_TRACE_CODE_MAKE_CODE(JS_POLICY_TIMER_END), ++/* ++ * Power Management Events ++ */ ++ KBASE_TRACE_CODE_MAKE_CODE(PM_JOB_SUBMIT_AFTER_POWERING_UP), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_JOB_SUBMIT_AFTER_POWERED_UP), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_PWRON), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_PWRON_TILER), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_PWRON_L2), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_PWROFF), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_PWROFF_TILER), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_PWROFF_L2), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_POWERED), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_POWERED_TILER), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_POWERED_L2), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_CHANGE_DESIRED), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_CHANGE_DESIRED_TILER), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_CHANGE_AVAILABLE), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_CHANGE_AVAILABLE_TILER), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_AVAILABLE), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_CORES_AVAILABLE_TILER), ++ /* PM_DESIRED_REACHED: gpu_addr == pm.gpu_in_desired_state */ ++ KBASE_TRACE_CODE_MAKE_CODE(PM_DESIRED_REACHED), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_DESIRED_REACHED_TILER), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_REGISTER_CHANGE_SHADER_INUSE), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_REGISTER_CHANGE_TILER_INUSE), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_REGISTER_CHANGE_SHADER_NEEDED), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_REGISTER_CHANGE_TILER_NEEDED), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_RELEASE_CHANGE_SHADER_INUSE), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_RELEASE_CHANGE_TILER_INUSE), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_UNREQUEST_CHANGE_SHADER_NEEDED), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_UNREQUEST_CHANGE_TILER_NEEDED), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_REQUEST_CHANGE_SHADER_NEEDED), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_REQUEST_CHANGE_TILER_NEEDED), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_WAKE_WAITERS), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_CONTEXT_ACTIVE), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_CONTEXT_IDLE), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_GPU_ON), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_GPU_OFF), ++ /* info_val == policy number, or -1 for "Already changing" */ ++ KBASE_TRACE_CODE_MAKE_CODE(PM_SET_POLICY), ++ KBASE_TRACE_CODE_MAKE_CODE(PM_CA_SET_POLICY), ++ /* info_val == policy number */ ++ KBASE_TRACE_CODE_MAKE_CODE(PM_CURRENT_POLICY_INIT), ++ /* info_val == policy number */ ++ KBASE_TRACE_CODE_MAKE_CODE(PM_CURRENT_POLICY_TERM), ++/* Unused code just to make it easier to not have a comma at the end. ++ * All other codes MUST come before this */ ++ KBASE_TRACE_CODE_MAKE_CODE(DUMMY) + -+ kargs.ctx = (uintptr_t)session_data; ++#if 0 /* Dummy section to avoid breaking formatting */ ++}; ++#endif + -+ if (0 != get_user(kargs.type, &uargs->type)) { -+ return -EFAULT; -+ } ++/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c +new file mode 100755 +index 000000000..5830e87f0 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c +@@ -0,0 +1,236 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ err = _mali_ukk_post_notification(&kargs); -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } + -+ return 0; -+} + -+int get_user_settings_wrapper(struct mali_session_data *session_data, _mali_uk_get_user_settings_s __user *uargs) -+{ -+ _mali_uk_get_user_settings_s kargs; -+ _mali_osk_errcode_t err; + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ kargs.ctx = (uintptr_t)session_data; -+ err = _mali_ukk_get_user_settings(&kargs); -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } ++#include ++#include ++#include + -+ kargs.ctx = 0; /* prevent kernel address to be returned to user space */ -+ if (0 != copy_to_user(uargs, &kargs, sizeof(_mali_uk_get_user_settings_s))) return -EFAULT; ++#define CREATE_TRACE_POINTS + -+ return 0; -+} ++#ifdef CONFIG_MALI_TRACE_TIMELINE ++#include "mali_timeline.h" + -+int request_high_priority_wrapper(struct mali_session_data *session_data, _mali_uk_request_high_priority_s __user *uargs) -+{ -+ _mali_uk_request_high_priority_s kargs; -+ _mali_osk_errcode_t err; ++#include ++#include + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_atoms_in_flight); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_atom); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_gpu_slot_active); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_gpu_slot_action); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_gpu_power_active); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_l2_power_active); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_pm_event); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_slot_atom); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_pm_checktrans); ++EXPORT_TRACEPOINT_SYMBOL_GPL(mali_timeline_context_active); + -+ kargs.ctx = (uintptr_t)session_data; -+ err = _mali_ukk_request_high_priority(&kargs); ++struct kbase_trace_timeline_desc { ++ char *enum_str; ++ char *desc; ++ char *format; ++ char *format_desc; ++}; + -+ kargs.ctx = 0; ++static struct kbase_trace_timeline_desc kbase_trace_timeline_desc_table[] = { ++ #define KBASE_TIMELINE_TRACE_CODE(enum_val, desc, format, format_desc) { #enum_val, desc, format, format_desc } ++ #include "mali_kbase_trace_timeline_defs.h" ++ #undef KBASE_TIMELINE_TRACE_CODE ++}; + -+ return map_errcode(err); -+} ++#define KBASE_NR_TRACE_CODES ARRAY_SIZE(kbase_trace_timeline_desc_table) + -+int pending_submit_wrapper(struct mali_session_data *session_data, _mali_uk_pending_submit_s __user *uargs) ++static void *kbasep_trace_timeline_seq_start(struct seq_file *s, loff_t *pos) +{ -+ _mali_uk_pending_submit_s kargs; -+ _mali_osk_errcode_t err; -+ -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ -+ kargs.ctx = (uintptr_t)session_data; -+ err = _mali_ukk_pending_submit(&kargs); -+ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); ++ if (*pos >= KBASE_NR_TRACE_CODES) ++ return NULL; + -+ return 0; ++ return &kbase_trace_timeline_desc_table[*pos]; +} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c -new file mode 100755 -index 000000000000..68fcd971938a ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c -@@ -0,0 +1,91 @@ -+/* -+ * Copyright (C) 2010, 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#include /* file system operations */ -+#include /* user space access */ -+ -+#include "mali_ukk.h" -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_session.h" -+#include "mali_ukk_wrappers.h" + -+int gp_start_job_wrapper(struct mali_session_data *session_data, _mali_uk_gp_start_job_s __user *uargs) ++static void kbasep_trace_timeline_seq_stop(struct seq_file *s, void *data) +{ -+ _mali_osk_errcode_t err; -+ -+ /* If the job was started successfully, 0 is returned. If there was an error, but the job -+ * was started, we return -ENOENT. For anything else returned, the job was not started. */ -+ -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); -+ -+ err = _mali_ukk_gp_start_job(session_data, uargs); -+ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); -+ -+ return 0; +} + -+int gp_get_core_version_wrapper(struct mali_session_data *session_data, _mali_uk_get_gp_core_version_s __user *uargs) ++static void *kbasep_trace_timeline_seq_next(struct seq_file *s, void *data, loff_t *pos) +{ -+ _mali_uk_get_gp_core_version_s kargs; -+ _mali_osk_errcode_t err; -+ -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); -+ -+ kargs.ctx = (uintptr_t)session_data; -+ err = _mali_ukk_get_gp_core_version(&kargs); -+ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); -+ -+ /* no known transactions to roll-back */ ++ (*pos)++; + -+ if (0 != put_user(kargs.version, &uargs->version)) return -EFAULT; ++ if (*pos == KBASE_NR_TRACE_CODES) ++ return NULL; + -+ return 0; ++ return &kbase_trace_timeline_desc_table[*pos]; +} + -+int gp_suspend_response_wrapper(struct mali_session_data *session_data, _mali_uk_gp_suspend_response_s __user *uargs) ++static int kbasep_trace_timeline_seq_show(struct seq_file *s, void *data) +{ -+ _mali_uk_gp_suspend_response_s kargs; -+ _mali_osk_errcode_t err; -+ -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); -+ -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_gp_suspend_response_s))) return -EFAULT; -+ -+ kargs.ctx = (uintptr_t)session_data; -+ err = _mali_ukk_gp_suspend_response(&kargs); -+ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); -+ -+ if (0 != put_user(kargs.cookie, &uargs->cookie)) return -EFAULT; ++ struct kbase_trace_timeline_desc *trace_desc = data; + -+ /* no known transactions to roll-back */ ++ seq_printf(s, "%s#%s#%s#%s\n", trace_desc->enum_str, trace_desc->desc, trace_desc->format, trace_desc->format_desc); + return 0; +} + -+int gp_get_number_of_cores_wrapper(struct mali_session_data *session_data, _mali_uk_get_gp_number_of_cores_s __user *uargs) -+{ -+ _mali_uk_get_gp_number_of_cores_s kargs; -+ _mali_osk_errcode_t err; + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); ++static const struct seq_operations kbasep_trace_timeline_seq_ops = { ++ .start = kbasep_trace_timeline_seq_start, ++ .next = kbasep_trace_timeline_seq_next, ++ .stop = kbasep_trace_timeline_seq_stop, ++ .show = kbasep_trace_timeline_seq_show, ++}; + -+ kargs.ctx = (uintptr_t)session_data; -+ err = _mali_ukk_get_gp_number_of_cores(&kargs); -+ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); ++static int kbasep_trace_timeline_debugfs_open(struct inode *inode, struct file *file) ++{ ++ return seq_open(file, &kbasep_trace_timeline_seq_ops); ++} + -+ /* no known transactions to roll-back */ ++static const struct file_operations kbasep_trace_timeline_debugfs_fops = { ++ .open = kbasep_trace_timeline_debugfs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = seq_release, ++}; + -+ if (0 != put_user(kargs.number_of_cores, &uargs->number_of_cores)) return -EFAULT; ++#ifdef CONFIG_DEBUG_FS + -+ return 0; ++void kbasep_trace_timeline_debugfs_init(struct kbase_device *kbdev) ++{ ++ debugfs_create_file("mali_timeline_defs", ++ S_IRUGO, kbdev->mali_debugfs_directory, NULL, ++ &kbasep_trace_timeline_debugfs_fops); +} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c -new file mode 100755 -index 000000000000..baea4c688db9 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c -@@ -0,0 +1,333 @@ -+/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#include /* file system operations */ -+#include /* user space access */ + -+#include "mali_ukk.h" -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_session.h" -+#include "mali_ukk_wrappers.h" ++#endif /* CONFIG_DEBUG_FS */ + -+int mem_alloc_wrapper(struct mali_session_data *session_data, _mali_uk_alloc_mem_s __user *uargs) ++void kbase_timeline_job_slot_submit(struct kbase_device *kbdev, struct kbase_context *kctx, ++ struct kbase_jd_atom *katom, int js) +{ -+ _mali_uk_alloc_mem_s kargs; -+ _mali_osk_errcode_t err; -+ -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); -+ -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_alloc_mem_s))) { -+ return -EFAULT; -+ } -+ kargs.ctx = (uintptr_t)session_data; -+ -+ err = _mali_ukk_mem_allocate(&kargs); ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } ++ if (kbdev->timeline.slot_atoms_submitted[js] > 0) { ++ KBASE_TIMELINE_JOB_START_NEXT(kctx, js, 1); ++ } else { ++ base_atom_id atom_number = kbase_jd_atom_id(kctx, katom); + -+ if (0 != put_user(kargs.backend_handle, &uargs->backend_handle)) { -+ return -EFAULT; ++ KBASE_TIMELINE_JOB_START_HEAD(kctx, js, 1); ++ KBASE_TIMELINE_JOB_START(kctx, js, atom_number); + } ++ ++kbdev->timeline.slot_atoms_submitted[js]; + -+ return 0; ++ KBASE_TIMELINE_ATOMS_SUBMITTED(kctx, js, kbdev->timeline.slot_atoms_submitted[js]); +} + -+int mem_free_wrapper(struct mali_session_data *session_data, _mali_uk_free_mem_s __user *uargs) ++void kbase_timeline_job_slot_done(struct kbase_device *kbdev, struct kbase_context *kctx, ++ struct kbase_jd_atom *katom, int js, ++ kbasep_js_atom_done_code done_code) +{ -+ _mali_uk_free_mem_s kargs; -+ _mali_osk_errcode_t err; ++ lockdep_assert_held(&kbdev->hwaccess_lock); + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); ++ if (done_code & KBASE_JS_ATOM_DONE_EVICTED_FROM_NEXT) { ++ KBASE_TIMELINE_JOB_START_NEXT(kctx, js, 0); ++ } else { ++ /* Job finished in JS_HEAD */ ++ base_atom_id atom_number = kbase_jd_atom_id(kctx, katom); + -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_free_mem_s))) { -+ return -EFAULT; -+ } -+ kargs.ctx = (uintptr_t)session_data; ++ KBASE_TIMELINE_JOB_START_HEAD(kctx, js, 0); ++ KBASE_TIMELINE_JOB_STOP(kctx, js, atom_number); + -+ err = _mali_ukk_mem_free(&kargs); ++ /* see if we need to trace the job in JS_NEXT moving to JS_HEAD */ ++ if (kbase_backend_nr_atoms_submitted(kbdev, js)) { ++ struct kbase_jd_atom *next_katom; ++ struct kbase_context *next_kctx; + -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); ++ /* Peek the next atom - note that the atom in JS_HEAD will already ++ * have been dequeued */ ++ next_katom = kbase_backend_inspect_head(kbdev, js); ++ WARN_ON(!next_katom); ++ next_kctx = next_katom->kctx; ++ KBASE_TIMELINE_JOB_START_NEXT(next_kctx, js, 0); ++ KBASE_TIMELINE_JOB_START_HEAD(next_kctx, js, 1); ++ KBASE_TIMELINE_JOB_START(next_kctx, js, kbase_jd_atom_id(next_kctx, next_katom)); ++ } + } + -+ if (0 != put_user(kargs.free_pages_nr, &uargs->free_pages_nr)) { -+ return -EFAULT; -+ } ++ --kbdev->timeline.slot_atoms_submitted[js]; + -+ return 0; ++ KBASE_TIMELINE_ATOMS_SUBMITTED(kctx, js, kbdev->timeline.slot_atoms_submitted[js]); +} + -+int mem_bind_wrapper(struct mali_session_data *session_data, _mali_uk_bind_mem_s __user *uargs) ++void kbase_timeline_pm_send_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event_sent) +{ -+ _mali_uk_bind_mem_s kargs; -+ _mali_osk_errcode_t err; -+ -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); ++ int uid = 0; ++ int old_uid; + -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_bind_mem_s))) { -+ return -EFAULT; -+ } -+ kargs.ctx = (uintptr_t)session_data; ++ /* If a producer already exists for the event, try to use their UID (multiple-producers) */ ++ uid = atomic_read(&kbdev->timeline.pm_event_uid[event_sent]); ++ old_uid = uid; + -+ err = _mali_ukk_mem_bind(&kargs); ++ /* Get a new non-zero UID if we don't have one yet */ ++ while (!uid) ++ uid = atomic_inc_return(&kbdev->timeline.pm_event_uid_counter); + -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } ++ /* Try to use this UID */ ++ if (old_uid != atomic_cmpxchg(&kbdev->timeline.pm_event_uid[event_sent], old_uid, uid)) ++ /* If it changed, raced with another producer: we've lost this UID */ ++ uid = 0; + -+ return 0; ++ KBASE_TIMELINE_PM_SEND_EVENT(kbdev, event_sent, uid); +} + -+int mem_unbind_wrapper(struct mali_session_data *session_data, _mali_uk_unbind_mem_s __user *uargs) ++void kbase_timeline_pm_check_handle_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event) +{ -+ _mali_uk_unbind_mem_s kargs; -+ _mali_osk_errcode_t err; -+ -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); -+ -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_unbind_mem_s))) { -+ return -EFAULT; -+ } -+ kargs.ctx = (uintptr_t)session_data; ++ int uid = atomic_read(&kbdev->timeline.pm_event_uid[event]); + -+ err = _mali_ukk_mem_unbind(&kargs); ++ if (uid != 0) { ++ if (uid != atomic_cmpxchg(&kbdev->timeline.pm_event_uid[event], uid, 0)) ++ /* If it changed, raced with another consumer: we've lost this UID */ ++ uid = 0; + -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); ++ KBASE_TIMELINE_PM_HANDLE_EVENT(kbdev, event, uid); + } -+ -+ return 0; +} + -+ -+int mem_cow_wrapper(struct mali_session_data *session_data, _mali_uk_cow_mem_s __user *uargs) ++void kbase_timeline_pm_handle_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event) +{ -+ _mali_uk_cow_mem_s kargs; -+ _mali_osk_errcode_t err; -+ -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); -+ -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_cow_mem_s))) { -+ return -EFAULT; -+ } -+ kargs.ctx = (uintptr_t)session_data; -+ -+ err = _mali_ukk_mem_cow(&kargs); ++ int uid = atomic_read(&kbdev->timeline.pm_event_uid[event]); + -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } ++ if (uid != atomic_cmpxchg(&kbdev->timeline.pm_event_uid[event], uid, 0)) ++ /* If it changed, raced with another consumer: we've lost this UID */ ++ uid = 0; + -+ if (0 != put_user(kargs.backend_handle, &uargs->backend_handle)) { -+ return -EFAULT; -+ } ++ KBASE_TIMELINE_PM_HANDLE_EVENT(kbdev, event, uid); ++} + -+ return 0; ++void kbase_timeline_pm_l2_transition_start(struct kbase_device *kbdev) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ /* Simply log the start of the transition */ ++ kbdev->timeline.l2_transitioning = true; ++ KBASE_TIMELINE_POWERING_L2(kbdev); +} + -+int mem_cow_modify_range_wrapper(struct mali_session_data *session_data, _mali_uk_cow_modify_range_s __user *uargs) ++void kbase_timeline_pm_l2_transition_done(struct kbase_device *kbdev) +{ -+ _mali_uk_cow_modify_range_s kargs; -+ _mali_osk_errcode_t err; ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++ /* Simply log the end of the transition */ ++ if (kbdev->timeline.l2_transitioning) { ++ kbdev->timeline.l2_transitioning = false; ++ KBASE_TIMELINE_POWERED_L2(kbdev); ++ } ++} + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); ++#endif /* CONFIG_MALI_TRACE_TIMELINE */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h +new file mode 100755 +index 000000000..a04f7c142 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h +@@ -0,0 +1,363 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_cow_modify_range_s))) { -+ return -EFAULT; -+ } -+ kargs.ctx = (uintptr_t)session_data; + -+ err = _mali_ukk_mem_cow_modify_range(&kargs); + -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } + -+ if (0 != put_user(kargs.change_pages_nr, &uargs->change_pages_nr)) { -+ return -EFAULT; -+ } -+ return 0; -+} + ++#if !defined(_KBASE_TRACE_TIMELINE_H) ++#define _KBASE_TRACE_TIMELINE_H + -+int mem_resize_mem_wrapper(struct mali_session_data *session_data, _mali_uk_mem_resize_s __user *uargs) -+{ -+ _mali_uk_mem_resize_s kargs; -+ _mali_osk_errcode_t err; ++#ifdef CONFIG_MALI_TRACE_TIMELINE + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); ++enum kbase_trace_timeline_code { ++ #define KBASE_TIMELINE_TRACE_CODE(enum_val, desc, format, format_desc) enum_val ++ #include "mali_kbase_trace_timeline_defs.h" ++ #undef KBASE_TIMELINE_TRACE_CODE ++}; + -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_mem_resize_s))) { -+ return -EFAULT; -+ } -+ kargs.ctx = (uintptr_t)session_data; ++#ifdef CONFIG_DEBUG_FS + -+ err = _mali_ukk_mem_resize(&kargs); ++/** Initialize Timeline DebugFS entries */ ++void kbasep_trace_timeline_debugfs_init(struct kbase_device *kbdev); + -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } ++#else /* CONFIG_DEBUG_FS */ + -+ return 0; -+} ++#define kbasep_trace_timeline_debugfs_init CSTD_NOP + -+int mem_write_safe_wrapper(struct mali_session_data *session_data, _mali_uk_mem_write_safe_s __user *uargs) -+{ -+ _mali_uk_mem_write_safe_s kargs; -+ _mali_osk_errcode_t err; ++#endif /* CONFIG_DEBUG_FS */ + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); ++/* mali_timeline.h defines kernel tracepoints used by the KBASE_TIMELINE ++ * functions. ++ * Output is timestamped by either sched_clock() (default), local_clock(), or ++ * cpu_clock(), depending on /sys/kernel/debug/tracing/trace_clock */ ++#include "mali_timeline.h" + -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_mem_write_safe_s))) { -+ return -EFAULT; -+ } ++/* Trace number of atoms in flight for kctx (atoms either not completed, or in ++ process of being returned to user */ ++#define KBASE_TIMELINE_ATOMS_IN_FLIGHT(kctx, count) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_atoms_in_flight(ts.tv_sec, ts.tv_nsec, \ ++ (int)kctx->timeline.owner_tgid, \ ++ count); \ ++ } while (0) + -+ kargs.ctx = (uintptr_t)session_data; ++/* Trace atom_id being Ready to Run */ ++#define KBASE_TIMELINE_ATOM_READY(kctx, atom_id) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_atom(ts.tv_sec, ts.tv_nsec, \ ++ CTX_FLOW_ATOM_READY, \ ++ (int)kctx->timeline.owner_tgid, \ ++ atom_id); \ ++ } while (0) + -+ /* Check if we can access the buffers */ -+ if (!access_ok((const void *)(uintptr_t)kargs.dest, kargs.size) || -+ !access_ok((const void *)(uintptr_t)kargs.src, kargs.size)) { -+ return -EINVAL; -+ } ++/* Trace number of atoms submitted to job slot js ++ * ++ * NOTE: This uses a different tracepoint to the head/next/soft-stop actions, ++ * so that those actions can be filtered out separately from this ++ * ++ * This is because this is more useful, as we can use it to calculate general ++ * utilization easily and accurately */ ++#define KBASE_TIMELINE_ATOMS_SUBMITTED(kctx, js, count) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_gpu_slot_active(ts.tv_sec, ts.tv_nsec, \ ++ SW_SET_GPU_SLOT_ACTIVE, \ ++ (int)kctx->timeline.owner_tgid, \ ++ js, count); \ ++ } while (0) + -+ /* Check if size wraps */ -+ if ((kargs.size + kargs.dest) <= kargs.dest -+ || (kargs.size + kargs.src) <= kargs.src) { -+ return -EINVAL; -+ } + -+ err = _mali_ukk_mem_write_safe(&kargs); -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } ++/* Trace atoms present in JS_NEXT */ ++#define KBASE_TIMELINE_JOB_START_NEXT(kctx, js, count) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_gpu_slot_action(ts.tv_sec, ts.tv_nsec, \ ++ SW_SET_GPU_SLOT_NEXT, \ ++ (int)kctx->timeline.owner_tgid, \ ++ js, count); \ ++ } while (0) + -+ if (0 != put_user(kargs.size, &uargs->size)) { -+ return -EFAULT; -+ } ++/* Trace atoms present in JS_HEAD */ ++#define KBASE_TIMELINE_JOB_START_HEAD(kctx, js, count) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_gpu_slot_action(ts.tv_sec, ts.tv_nsec, \ ++ SW_SET_GPU_SLOT_HEAD, \ ++ (int)kctx->timeline.owner_tgid, \ ++ js, count); \ ++ } while (0) + -+ return 0; -+} ++/* Trace that a soft stop/evict from next is being attempted on a slot */ ++#define KBASE_TIMELINE_TRY_SOFT_STOP(kctx, js, count) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_gpu_slot_action(ts.tv_sec, ts.tv_nsec, \ ++ SW_SET_GPU_SLOT_STOPPING, \ ++ (kctx) ? (int)kctx->timeline.owner_tgid : 0, \ ++ js, count); \ ++ } while (0) + + + -+int mem_query_mmu_page_table_dump_size_wrapper(struct mali_session_data *session_data, _mali_uk_query_mmu_page_table_dump_size_s __user *uargs) -+{ -+ _mali_uk_query_mmu_page_table_dump_size_s kargs; -+ _mali_osk_errcode_t err; ++/* Trace state of overall GPU power */ ++#define KBASE_TIMELINE_GPU_POWER(kbdev, active) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_gpu_power_active(ts.tv_sec, ts.tv_nsec, \ ++ SW_SET_GPU_POWER_ACTIVE, active); \ ++ } while (0) + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); ++/* Trace state of tiler power */ ++#define KBASE_TIMELINE_POWER_TILER(kbdev, bitmap) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_gpu_power_active(ts.tv_sec, ts.tv_nsec, \ ++ SW_SET_GPU_POWER_TILER_ACTIVE, \ ++ hweight64(bitmap)); \ ++ } while (0) + -+ kargs.ctx = (uintptr_t)session_data; ++/* Trace number of shaders currently powered */ ++#define KBASE_TIMELINE_POWER_SHADER(kbdev, bitmap) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_gpu_power_active(ts.tv_sec, ts.tv_nsec, \ ++ SW_SET_GPU_POWER_SHADER_ACTIVE, \ ++ hweight64(bitmap)); \ ++ } while (0) + -+ err = _mali_ukk_query_mmu_page_table_dump_size(&kargs); -+ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); ++/* Trace state of L2 power */ ++#define KBASE_TIMELINE_POWER_L2(kbdev, bitmap) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_gpu_power_active(ts.tv_sec, ts.tv_nsec, \ ++ SW_SET_GPU_POWER_L2_ACTIVE, \ ++ hweight64(bitmap)); \ ++ } while (0) + -+ if (0 != put_user(kargs.size, &uargs->size)) return -EFAULT; ++/* Trace state of L2 cache*/ ++#define KBASE_TIMELINE_POWERING_L2(kbdev) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_l2_power_active(ts.tv_sec, ts.tv_nsec, \ ++ SW_FLOW_GPU_POWER_L2_POWERING, \ ++ 1); \ ++ } while (0) + -+ return 0; -+} ++#define KBASE_TIMELINE_POWERED_L2(kbdev) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_l2_power_active(ts.tv_sec, ts.tv_nsec, \ ++ SW_FLOW_GPU_POWER_L2_ACTIVE, \ ++ 1); \ ++ } while (0) + -+int mem_dump_mmu_page_table_wrapper(struct mali_session_data *session_data, _mali_uk_dump_mmu_page_table_s __user *uargs) -+{ -+ _mali_uk_dump_mmu_page_table_s kargs; -+ _mali_osk_errcode_t err; -+ void __user *user_buffer; -+ void *buffer = NULL; -+ int rc = -EFAULT; ++/* Trace kbase_pm_send_event message send */ ++#define KBASE_TIMELINE_PM_SEND_EVENT(kbdev, event_type, pm_event_id) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_pm_event(ts.tv_sec, ts.tv_nsec, \ ++ SW_FLOW_PM_SEND_EVENT, \ ++ event_type, pm_event_id); \ ++ } while (0) + -+ /* validate input */ -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ /* the session_data pointer was validated by caller */ ++/* Trace kbase_pm_worker message receive */ ++#define KBASE_TIMELINE_PM_HANDLE_EVENT(kbdev, event_type, pm_event_id) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_pm_event(ts.tv_sec, ts.tv_nsec, \ ++ SW_FLOW_PM_HANDLE_EVENT, \ ++ event_type, pm_event_id); \ ++ } while (0) + -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_dump_mmu_page_table_s))) -+ goto err_exit; + -+ user_buffer = (void __user *)(uintptr_t)kargs.buffer; -+ if (!access_ok(user_buffer, kargs.size)) -+ goto err_exit; ++/* Trace atom_id starting in JS_HEAD */ ++#define KBASE_TIMELINE_JOB_START(kctx, js, _consumerof_atom_number) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_slot_atom(ts.tv_sec, ts.tv_nsec, \ ++ HW_START_GPU_JOB_CHAIN_SW_APPROX, \ ++ (int)kctx->timeline.owner_tgid, \ ++ js, _consumerof_atom_number); \ ++ } while (0) + -+ /* allocate temporary buffer (kernel side) to store mmu page table info */ -+ if (kargs.size <= 0) -+ return -EINVAL; -+ /* Allow at most 8MiB buffers, this is more than enough to dump a fully -+ * populated page table. */ -+ if (kargs.size > SZ_8M) -+ return -EINVAL; ++/* Trace atom_id stopping on JS_HEAD */ ++#define KBASE_TIMELINE_JOB_STOP(kctx, js, _producerof_atom_number_completed) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_slot_atom(ts.tv_sec, ts.tv_nsec, \ ++ HW_STOP_GPU_JOB_CHAIN_SW_APPROX, \ ++ (int)kctx->timeline.owner_tgid, \ ++ js, _producerof_atom_number_completed); \ ++ } while (0) + -+ buffer = (void *)(uintptr_t)_mali_osk_valloc(kargs.size); -+ if (NULL == buffer) { -+ rc = -ENOMEM; -+ goto err_exit; -+ } ++/** Trace beginning/end of a call to kbase_pm_check_transitions_nolock from a ++ * certin caller */ ++#define KBASE_TIMELINE_PM_CHECKTRANS(kbdev, trace_code) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_pm_checktrans(ts.tv_sec, ts.tv_nsec, \ ++ trace_code, 1); \ ++ } while (0) + -+ kargs.ctx = (uintptr_t)session_data; -+ kargs.buffer = (uintptr_t)buffer; -+ err = _mali_ukk_dump_mmu_page_table(&kargs); -+ if (_MALI_OSK_ERR_OK != err) { -+ rc = map_errcode(err); -+ goto err_exit; -+ } ++/* Trace number of contexts active */ ++#define KBASE_TIMELINE_CONTEXT_ACTIVE(kbdev, count) \ ++ do { \ ++ struct timespec64 ts; \ ++ ktime_get_raw_ts64(&ts); \ ++ trace_mali_timeline_context_active(ts.tv_sec, ts.tv_nsec, \ ++ count); \ ++ } while (0) + -+ /* copy mmu page table info back to user space and update pointers */ -+ if (0 != copy_to_user(user_buffer, buffer, kargs.size)) -+ goto err_exit; ++/* NOTE: kbase_timeline_pm_cores_func() is in mali_kbase_pm_policy.c */ + -+ kargs.register_writes = kargs.register_writes - -+ (uintptr_t)buffer + (uintptr_t)user_buffer; -+ kargs.page_table_dump = kargs.page_table_dump - -+ (uintptr_t)buffer + (uintptr_t)user_buffer; ++/** ++ * Trace that an atom is starting on a job slot ++ * ++ * The caller must be holding hwaccess_lock ++ */ ++void kbase_timeline_job_slot_submit(struct kbase_device *kbdev, struct kbase_context *kctx, ++ struct kbase_jd_atom *katom, int js); + -+ if (0 != copy_to_user(uargs, &kargs, sizeof(kargs))) -+ goto err_exit; ++/** ++ * Trace that an atom has done on a job slot ++ * ++ * 'Done' in this sense can occur either because: ++ * - the atom in JS_HEAD finished ++ * - the atom in JS_NEXT was evicted ++ * ++ * Whether the atom finished or was evicted is passed in @a done_code ++ * ++ * It is assumed that the atom has already been removed from the submit slot, ++ * with either: ++ * - kbasep_jm_dequeue_submit_slot() ++ * - kbasep_jm_dequeue_tail_submit_slot() ++ * ++ * The caller must be holding hwaccess_lock ++ */ ++void kbase_timeline_job_slot_done(struct kbase_device *kbdev, struct kbase_context *kctx, ++ struct kbase_jd_atom *katom, int js, ++ kbasep_js_atom_done_code done_code); + -+ rc = 0; + -+err_exit: -+ if (buffer) _mali_osk_vfree(buffer); -+ return rc; -+} ++/** Trace a pm event starting */ ++void kbase_timeline_pm_send_event(struct kbase_device *kbdev, ++ enum kbase_timeline_pm_event event_sent); + -+int mem_usage_get_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_memory_usage_get_s __user *uargs) -+{ -+ _mali_osk_errcode_t err; -+ _mali_uk_profiling_memory_usage_get_s kargs; ++/** Trace a pm event finishing */ ++void kbase_timeline_pm_check_handle_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event); + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); ++/** Check whether a pm event was present, and if so trace finishing it */ ++void kbase_timeline_pm_handle_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event); + -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_profiling_memory_usage_get_s))) { -+ return -EFAULT; -+ } ++/** Trace L2 power-up start */ ++void kbase_timeline_pm_l2_transition_start(struct kbase_device *kbdev); + -+ kargs.ctx = (uintptr_t)session_data; -+ err = _mali_ukk_mem_usage_get(&kargs); -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } ++/** Trace L2 power-up done */ ++void kbase_timeline_pm_l2_transition_done(struct kbase_device *kbdev); + -+ kargs.ctx = (uintptr_t)NULL; /* prevent kernel address to be returned to user space */ -+ if (0 != copy_to_user(uargs, &kargs, sizeof(_mali_uk_profiling_memory_usage_get_s))) { -+ return -EFAULT; -+ } ++#else + -+ return 0; -+} ++#define KBASE_TIMELINE_ATOMS_IN_FLIGHT(kctx, count) CSTD_NOP() + -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c -new file mode 100755 -index 000000000000..a9b0958c06aa ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c -@@ -0,0 +1,105 @@ -+/* -+ * Copyright (C) 2010, 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#include /* file system operations */ -+#include /* user space access */ ++#define KBASE_TIMELINE_ATOM_READY(kctx, atom_id) CSTD_NOP() + -+#include "mali_ukk.h" -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_session.h" -+#include "mali_ukk_wrappers.h" ++#define KBASE_TIMELINE_ATOMS_SUBMITTED(kctx, js, count) CSTD_NOP() + -+int pp_start_job_wrapper(struct mali_session_data *session_data, _mali_uk_pp_start_job_s __user *uargs) -+{ -+ _mali_osk_errcode_t err; ++#define KBASE_TIMELINE_JOB_START_NEXT(kctx, js, count) CSTD_NOP() + -+ /* If the job was started successfully, 0 is returned. If there was an error, but the job -+ * was started, we return -ENOENT. For anything else returned, the job was not started. */ ++#define KBASE_TIMELINE_JOB_START_HEAD(kctx, js, count) CSTD_NOP() + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); ++#define KBASE_TIMELINE_TRY_SOFT_STOP(kctx, js, count) CSTD_NOP() + -+ err = _mali_ukk_pp_start_job(session_data, uargs); -+ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); ++#define KBASE_TIMELINE_GPU_POWER(kbdev, active) CSTD_NOP() + -+ return 0; -+} ++#define KBASE_TIMELINE_POWER_TILER(kbdev, bitmap) CSTD_NOP() + -+int pp_and_gp_start_job_wrapper(struct mali_session_data *session_data, _mali_uk_pp_and_gp_start_job_s __user *uargs) -+{ -+ _mali_osk_errcode_t err; ++#define KBASE_TIMELINE_POWER_SHADER(kbdev, bitmap) CSTD_NOP() + -+ /* If the jobs were started successfully, 0 is returned. If there was an error, but the -+ * jobs were started, we return -ENOENT. For anything else returned, the jobs were not -+ * started. */ ++#define KBASE_TIMELINE_POWER_L2(kbdev, active) CSTD_NOP() + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); ++#define KBASE_TIMELINE_POWERING_L2(kbdev) CSTD_NOP() + -+ err = _mali_ukk_pp_and_gp_start_job(session_data, uargs); -+ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); ++#define KBASE_TIMELINE_POWERED_L2(kbdev) CSTD_NOP() + -+ return 0; -+} ++#define KBASE_TIMELINE_PM_SEND_EVENT(kbdev, event_type, pm_event_id) CSTD_NOP() + -+int pp_get_number_of_cores_wrapper(struct mali_session_data *session_data, _mali_uk_get_pp_number_of_cores_s __user *uargs) -+{ -+ _mali_uk_get_pp_number_of_cores_s kargs; -+ _mali_osk_errcode_t err; ++#define KBASE_TIMELINE_PM_HANDLE_EVENT(kbdev, event_type, pm_event_id) CSTD_NOP() + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); ++#define KBASE_TIMELINE_JOB_START(kctx, js, _consumerof_atom_number) CSTD_NOP() + -+ kargs.ctx = (uintptr_t)session_data; ++#define KBASE_TIMELINE_JOB_STOP(kctx, js, _producerof_atom_number_completed) CSTD_NOP() + -+ err = _mali_ukk_get_pp_number_of_cores(&kargs); -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } ++#define KBASE_TIMELINE_PM_CHECKTRANS(kbdev, trace_code) CSTD_NOP() + -+ kargs.ctx = (uintptr_t)NULL; /* prevent kernel address to be returned to user space */ -+ if (0 != copy_to_user(uargs, &kargs, sizeof(_mali_uk_get_pp_number_of_cores_s))) { -+ return -EFAULT; -+ } ++#define KBASE_TIMELINE_CONTEXT_ACTIVE(kbdev, count) CSTD_NOP() + -+ return 0; ++static inline void kbase_timeline_job_slot_submit(struct kbase_device *kbdev, struct kbase_context *kctx, ++ struct kbase_jd_atom *katom, int js) ++{ ++ lockdep_assert_held(&kbdev->hwaccess_lock); +} + -+int pp_get_core_version_wrapper(struct mali_session_data *session_data, _mali_uk_get_pp_core_version_s __user *uargs) ++static inline void kbase_timeline_job_slot_done(struct kbase_device *kbdev, struct kbase_context *kctx, ++ struct kbase_jd_atom *katom, int js, ++ kbasep_js_atom_done_code done_code) +{ -+ _mali_uk_get_pp_core_version_s kargs; -+ _mali_osk_errcode_t err; -+ -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); -+ -+ kargs.ctx = (uintptr_t)session_data; -+ err = _mali_ukk_get_pp_core_version(&kargs); -+ if (_MALI_OSK_ERR_OK != err) return map_errcode(err); ++ lockdep_assert_held(&kbdev->hwaccess_lock); ++} + -+ if (0 != put_user(kargs.version, &uargs->version)) return -EFAULT; ++static inline void kbase_timeline_pm_send_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event_sent) ++{ ++} + -+ return 0; ++static inline void kbase_timeline_pm_check_handle_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event) ++{ +} + -+int pp_disable_wb_wrapper(struct mali_session_data *session_data, _mali_uk_pp_disable_wb_s __user *uargs) ++static inline void kbase_timeline_pm_handle_event(struct kbase_device *kbdev, enum kbase_timeline_pm_event event) +{ -+ _mali_uk_pp_disable_wb_s kargs; ++} + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session_data, -EINVAL); ++static inline void kbase_timeline_pm_l2_transition_start(struct kbase_device *kbdev) ++{ ++} + -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_pp_disable_wb_s))) return -EFAULT; ++static inline void kbase_timeline_pm_l2_transition_done(struct kbase_device *kbdev) ++{ ++} ++#endif /* CONFIG_MALI_TRACE_TIMELINE */ + -+ kargs.ctx = (uintptr_t)session_data; -+ _mali_ukk_pp_job_disable_wb(&kargs); ++#endif /* _KBASE_TRACE_TIMELINE_H */ + -+ return 0; -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c +diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h new file mode 100755 -index 000000000000..8b49ebc50b95 +index 000000000..156a95a67 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c -@@ -0,0 +1,183 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h +@@ -0,0 +1,140 @@ +/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2012-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ -+#include /* file system operations */ -+#include /* user space access */ -+#include -+ -+#include "mali_ukk.h" -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_session.h" -+#include "mali_ukk_wrappers.h" -+ -+int profiling_add_event_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_add_event_s __user *uargs) -+{ -+ _mali_uk_profiling_add_event_s kargs; -+ _mali_osk_errcode_t err; + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_profiling_add_event_s))) { -+ return -EFAULT; -+ } + -+ kargs.ctx = (uintptr_t)session_data; -+ err = _mali_ukk_profiling_add_event(&kargs); -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } + -+ return 0; -+} + -+int profiling_report_sw_counters_wrapper(struct mali_session_data *session_data, _mali_uk_sw_counters_report_s __user *uargs) -+{ -+ _mali_uk_sw_counters_report_s kargs; -+ _mali_osk_errcode_t err; -+ u32 *counter_buffer; -+ u32 __user *counters; ++/* ***** IMPORTANT: THIS IS NOT A NORMAL HEADER FILE ***** ++ * ***** DO NOT INCLUDE DIRECTLY ***** ++ * ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++/* ++ * Conventions on Event Names: ++ * ++ * - The prefix determines something about how the timeline should be ++ * displayed, and is split up into various parts, separated by underscores: ++ * - 'SW' and 'HW' as the first part will be used to determine whether a ++ * timeline is to do with Software or Hardware - effectively, separate ++ * 'channels' for Software and Hardware ++ * - 'START', 'STOP', 'ENTER', 'LEAVE' can be used in the second part, and ++ * signify related pairs of events - these are optional. ++ * - 'FLOW' indicates a generic event, which can use dependencies ++ * - This gives events such as: ++ * - 'SW_ENTER_FOO' ++ * - 'SW_LEAVE_FOO' ++ * - 'SW_FLOW_BAR_1' ++ * - 'SW_FLOW_BAR_2' ++ * - 'HW_START_BAZ' ++ * - 'HW_STOP_BAZ' ++ * - And an unadorned HW event: ++ * - 'HW_BAZ_FROZBOZ' ++ */ + -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_sw_counters_report_s))) { -+ return -EFAULT; -+ } ++/* ++ * Conventions on parameter names: ++ * - anything with 'instance' in the name will have a separate timeline based ++ * on that instances. ++ * - underscored-prefixed parameters will by hidden by default on timelines ++ * ++ * Hence: ++ * - Different job slots have their own 'instance', based on the instance value ++ * - Per-context info (e.g. atoms on a context) have their own 'instance' ++ * (i.e. each context should be on a different timeline) ++ * ++ * Note that globally-shared resources can be tagged with a tgid, but we don't ++ * want an instance per context: ++ * - There's no point having separate Job Slot timelines for each context, that ++ * would be confusing - there's only really 3 job slots! ++ * - There's no point having separate Shader-powered timelines for each ++ * context, that would be confusing - all shader cores (whether it be 4, 8, ++ * etc) are shared in the system. ++ */ + -+ /* make sure that kargs.num_counters is [at least somewhat] sane */ -+ if (kargs.num_counters > 10000) { -+ MALI_DEBUG_PRINT(1, ("User space attempted to allocate too many counters.\n")); -+ return -EINVAL; -+ } ++ /* ++ * CTX events ++ */ ++ /* Separate timelines for each context 'instance'*/ ++ KBASE_TIMELINE_TRACE_CODE(CTX_SET_NR_ATOMS_IN_FLIGHT, "CTX: Atoms in flight", "%d,%d", "_instance_tgid,_value_number_of_atoms"), ++ KBASE_TIMELINE_TRACE_CODE(CTX_FLOW_ATOM_READY, "CTX: Atoms Ready to Run", "%d,%d,%d", "_instance_tgid,_consumerof_atom_number,_producerof_atom_number_ready"), + -+ counter_buffer = (u32 *)kmalloc(sizeof(u32) * kargs.num_counters, GFP_KERNEL); -+ if (NULL == counter_buffer) { -+ return -ENOMEM; -+ } ++ /* ++ * SW Events ++ */ ++ /* Separate timelines for each slot 'instance' */ ++ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_SLOT_ACTIVE, "SW: GPU slot active", "%d,%d,%d", "_tgid,_instance_slot,_value_number_of_atoms"), ++ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_SLOT_NEXT, "SW: GPU atom in NEXT", "%d,%d,%d", "_tgid,_instance_slot,_value_is_an_atom_in_next"), ++ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_SLOT_HEAD, "SW: GPU atom in HEAD", "%d,%d,%d", "_tgid,_instance_slot,_value_is_an_atom_in_head"), ++ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_SLOT_STOPPING, "SW: Try Soft-Stop on GPU slot", "%d,%d,%d", "_tgid,_instance_slot,_value_is_slot_stopping"), ++ /* Shader and overall power is shared - can't have separate instances of ++ * it, just tagging with the context */ ++ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_POWER_ACTIVE, "SW: GPU power active", "%d,%d", "_tgid,_value_is_power_active"), ++ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_POWER_TILER_ACTIVE, "SW: GPU tiler powered", "%d,%d", "_tgid,_value_number_of_tilers"), ++ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_POWER_SHADER_ACTIVE, "SW: GPU shaders powered", "%d,%d", "_tgid,_value_number_of_shaders"), ++ KBASE_TIMELINE_TRACE_CODE(SW_SET_GPU_POWER_L2_ACTIVE, "SW: GPU L2 powered", "%d,%d", "_tgid,_value_number_of_l2"), + -+ counters = (u32 *)(uintptr_t)kargs.counters; ++ /* SW Power event messaging. _event_type is one from the kbase_pm_event enum */ ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_SEND_EVENT, "SW: PM Send Event", "%d,%d,%d", "_tgid,_event_type,_writerof_pm_event_id"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_HANDLE_EVENT, "SW: PM Handle Event", "%d,%d,%d", "_tgid,_event_type,_finalconsumerof_pm_event_id"), ++ /* SW L2 power events */ ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_GPU_POWER_L2_POWERING, "SW: GPU L2 powering", "%d,%d", "_tgid,_writerof_l2_transitioning"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_GPU_POWER_L2_ACTIVE, "SW: GPU L2 powering done", "%d,%d", "_tgid,_finalconsumerof_l2_transitioning"), + -+ if (0 != copy_from_user(counter_buffer, counters, sizeof(u32) * kargs.num_counters)) { -+ kfree(counter_buffer); -+ return -EFAULT; -+ } ++ KBASE_TIMELINE_TRACE_CODE(SW_SET_CONTEXT_ACTIVE, "SW: Context Active", "%d,%d", "_tgid,_value_active"), + -+ kargs.ctx = (uintptr_t)session_data; -+ kargs.counters = (uintptr_t)counter_buffer; ++ /* ++ * BEGIN: Significant SW Functions that call kbase_pm_check_transitions_nolock() ++ */ ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_DO_POWEROFF_START, "SW: PM CheckTrans from kbase_pm_do_poweroff", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_do_poweroff"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_DO_POWEROFF_END, "SW: PM CheckTrans from kbase_pm_do_poweroff", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_do_poweroff"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_DO_POWERON_START, "SW: PM CheckTrans from kbase_pm_do_poweron", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_do_poweron"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_DO_POWERON_END, "SW: PM CheckTrans from kbase_pm_do_poweron", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_do_poweron"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_GPU_INTERRUPT_START, "SW: PM CheckTrans from kbase_gpu_interrupt", "%d,%d", "_tgid,_writerof_pm_checktrans_gpu_interrupt"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_GPU_INTERRUPT_END, "SW: PM CheckTrans from kbase_gpu_interrupt", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_gpu_interrupt"), + -+ err = _mali_ukk_sw_counters_report(&kargs); ++ /* ++ * Significant Indirect callers of kbase_pm_check_transitions_nolock() ++ */ ++ /* kbase_pm_request_cores */ ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_START, "SW: PM CheckTrans from kbase_pm_request_cores(shader)", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_request_cores_shader"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_END, "SW: PM CheckTrans from kbase_pm_request_cores(shader)", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_request_cores_shader"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_TILER_START, "SW: PM CheckTrans from kbase_pm_request_cores(tiler)", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_request_cores_tiler"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_TILER_END, "SW: PM CheckTrans from kbase_pm_request_cores(tiler)", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_request_cores_tiler"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_TILER_START, "SW: PM CheckTrans from kbase_pm_request_cores(shader+tiler)", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_request_cores_shader_tiler"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_REQUEST_CORES_SHADER_TILER_END, "SW: PM CheckTrans from kbase_pm_request_cores(shader+tiler)", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_request_cores_shader_tiler"), ++ /* kbase_pm_release_cores */ ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_START, "SW: PM CheckTrans from kbase_pm_release_cores(shader)", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_release_cores_shader"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_END, "SW: PM CheckTrans from kbase_pm_release_cores(shader)", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_release_cores_shader"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_TILER_START, "SW: PM CheckTrans from kbase_pm_release_cores(tiler)", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_release_cores_tiler"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_TILER_END, "SW: PM CheckTrans from kbase_pm_release_cores(tiler)", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_release_cores_tiler"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_TILER_START, "SW: PM CheckTrans from kbase_pm_release_cores(shader+tiler)", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_release_cores_shader_tiler"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_SHADER_TILER_END, "SW: PM CheckTrans from kbase_pm_release_cores(shader+tiler)", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_release_cores_shader_tiler"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_DEFERRED_START, "SW: PM CheckTrans from kbasep_pm_do_shader_poweroff_callback", "%d,%d", "_tgid,_writerof_pm_checktrans_pm_do_shader_poweroff_callback"), ++ KBASE_TIMELINE_TRACE_CODE(SW_FLOW_PM_CHECKTRANS_PM_RELEASE_CORES_DEFERRED_END, "SW: PM CheckTrans from kbasep_pm_do_shader_poweroff_callback", "%d,%d", "_tgid,_finalconsumerof_pm_checktrans_pm_do_shader_poweroff_callback"), ++ /* ++ * END: SW Functions that call kbase_pm_check_transitions_nolock() ++ */ + -+ kfree(counter_buffer); ++ /* ++ * HW Events ++ */ ++ KBASE_TIMELINE_TRACE_CODE(HW_MMU_FAULT, ++"HW: MMU Fault", "%d,%d,%d", "_tgid,fault_type,fault_stage,asid"), ++ KBASE_TIMELINE_TRACE_CODE(HW_START_GPU_JOB_CHAIN_SW_APPROX, ++"HW: Job Chain start (SW approximated)", "%d,%d,%d", ++"_tgid,job_slot,_consumerof_atom_number_ready"), ++ KBASE_TIMELINE_TRACE_CODE(HW_STOP_GPU_JOB_CHAIN_SW_APPROX, ++"HW: Job Chain stop (SW approximated)", "%d,%d,%d", ++"_tgid,job_slot,_producerof_atom_number_completed") +diff --git a/drivers/gpu/arm/midgard/mali_kbase_uku.h b/drivers/gpu/arm/midgard/mali_kbase_uku.h +new file mode 100755 +index 000000000..c22a59324 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_uku.h +@@ -0,0 +1,545 @@ ++/* ++ * ++ * (C) COPYRIGHT 2008-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } + -+ return 0; -+} + -+int profiling_get_stream_fd_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_stream_fd_get_s __user *uargs) -+{ -+ _mali_uk_profiling_stream_fd_get_s kargs; -+ _mali_osk_errcode_t err; + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); + -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_profiling_stream_fd_get_s))) { -+ return -EFAULT; -+ } ++#ifndef _KBASE_UKU_H_ ++#define _KBASE_UKU_H_ + -+ kargs.ctx = (uintptr_t)session_data; -+ err = _mali_ukk_profiling_stream_fd_get(&kargs); -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } ++#include "mali_uk.h" ++#include "mali_base_kernel.h" + -+ if (0 != copy_to_user(uargs, &kargs, sizeof(_mali_uk_profiling_stream_fd_get_s))) { -+ return -EFAULT; -+ } ++/* This file needs to support being included from kernel and userside (which use different defines) */ ++#if defined(CONFIG_MALI_ERROR_INJECT) || MALI_ERROR_INJECT_ON ++#define SUPPORT_MALI_ERROR_INJECT ++#endif /* defined(CONFIG_MALI_ERROR_INJECT) || MALI_ERROR_INJECT_ON */ ++#if defined(CONFIG_MALI_NO_MALI) ++#define SUPPORT_MALI_NO_MALI ++#elif defined(MALI_NO_MALI) ++#if MALI_NO_MALI ++#define SUPPORT_MALI_NO_MALI ++#endif ++#endif + -+ return 0; -+} ++#if defined(SUPPORT_MALI_NO_MALI) || defined(SUPPORT_MALI_ERROR_INJECT) ++#include "backend/gpu/mali_kbase_model_dummy.h" ++#endif + -+int profiling_control_set_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_control_set_s __user *uargs) -+{ -+ _mali_uk_profiling_control_set_s kargs; -+ _mali_osk_errcode_t err; -+ u8 *kernel_control_data = NULL; -+ u8 *kernel_response_data = NULL; ++#include "mali_kbase_gpuprops_types.h" + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++/* ++ * 10.1: ++ * - Do mmap in kernel for SAME_VA memory allocations rather then ++ * calling back into the kernel as a 2nd stage of the allocation request. ++ * ++ * 10.2: ++ * - Add KBASE_FUNC_MEM_JIT_INIT which allows clients to request a custom VA ++ * region for use with JIT (ignored on 32-bit platforms) ++ * ++ * 10.3: ++ * - base_jd_core_req typedef-ed to u32 (instead of to u16) ++ * - two flags added: BASE_JD_REQ_SKIP_CACHE_STAT / _END ++ * ++ * 10.4: ++ * - Removed KBASE_FUNC_EXT_BUFFER_LOCK used only in internal tests ++ * ++ * 10.5: ++ * - Reverted to performing mmap in user space so that tools like valgrind work. ++ * ++ * 10.6: ++ * - Add flags input variable to KBASE_FUNC_TLSTREAM_ACQUIRE ++ */ ++#define BASE_UK_VERSION_MAJOR 10 ++#define BASE_UK_VERSION_MINOR 6 + -+ if (0 != get_user(kargs.control_packet_size, &uargs->control_packet_size)) return -EFAULT; -+ if (0 != get_user(kargs.response_packet_size, &uargs->response_packet_size)) return -EFAULT; ++#define LINUX_UK_BASE_MAGIC 0x80 + -+ kargs.ctx = (uintptr_t)session_data; ++struct kbase_uk_mem_alloc { ++ union uk_header header; ++ /* IN */ ++ u64 va_pages; ++ u64 commit_pages; ++ u64 extent; ++ /* IN/OUT */ ++ u64 flags; ++ /* OUT */ ++ u64 gpu_va; ++ u16 va_alignment; ++ u8 padding[6]; ++}; + ++struct kbase_uk_mem_free { ++ union uk_header header; ++ /* IN */ ++ u64 gpu_addr; ++ /* OUT */ ++}; + -+ /* Sanity check about the size */ -+ if (kargs.control_packet_size > PAGE_SIZE || kargs.response_packet_size > PAGE_SIZE) -+ return -EINVAL; ++struct kbase_uk_mem_alias { ++ union uk_header header; ++ /* IN/OUT */ ++ u64 flags; ++ /* IN */ ++ u64 stride; ++ u64 nents; ++ union kbase_pointer ai; ++ /* OUT */ ++ u64 gpu_va; ++ u64 va_pages; ++}; + -+ if (0 != kargs.control_packet_size) { ++struct kbase_uk_mem_import { ++ union uk_header header; ++ /* IN */ ++ union kbase_pointer phandle; ++ u32 type; ++ u32 padding; ++ /* IN/OUT */ ++ u64 flags; ++ /* OUT */ ++ u64 gpu_va; ++ u64 va_pages; ++}; + -+ if (0 == kargs.response_packet_size) -+ return -EINVAL; ++struct kbase_uk_mem_flags_change { ++ union uk_header header; ++ /* IN */ ++ u64 gpu_va; ++ u64 flags; ++ u64 mask; ++}; + -+ kernel_control_data = _mali_osk_calloc(1, kargs.control_packet_size); -+ if (NULL == kernel_control_data) { -+ return -ENOMEM; -+ } ++struct kbase_uk_job_submit { ++ union uk_header header; ++ /* IN */ ++ union kbase_pointer addr; ++ u32 nr_atoms; ++ u32 stride; /* bytes between atoms, i.e. sizeof(base_jd_atom_v2) */ ++ /* OUT */ ++}; + -+ kernel_response_data = _mali_osk_calloc(1, kargs.response_packet_size); -+ if (NULL == kernel_response_data) { -+ _mali_osk_free(kernel_control_data); -+ return -ENOMEM; -+ } ++struct kbase_uk_post_term { ++ union uk_header header; ++}; + -+ kargs.control_packet_data = (uintptr_t)kernel_control_data; -+ kargs.response_packet_data = (uintptr_t)kernel_response_data; ++struct kbase_uk_sync_now { ++ union uk_header header; + -+ if (0 != copy_from_user((void *)(uintptr_t)kernel_control_data, (void *)(uintptr_t)uargs->control_packet_data, kargs.control_packet_size)) { -+ _mali_osk_free(kernel_control_data); -+ _mali_osk_free(kernel_response_data); -+ return -EFAULT; -+ } ++ /* IN */ ++ struct base_syncset sset; + -+ err = _mali_ukk_profiling_control_set(&kargs); -+ if (_MALI_OSK_ERR_OK != err) { -+ _mali_osk_free(kernel_control_data); -+ _mali_osk_free(kernel_response_data); -+ return map_errcode(err); -+ } ++ /* OUT */ ++}; + -+ if (0 != kargs.response_packet_size && 0 != copy_to_user(((void *)(uintptr_t)uargs->response_packet_data), ((void *)(uintptr_t)kargs.response_packet_data), kargs.response_packet_size)) { -+ _mali_osk_free(kernel_control_data); -+ _mali_osk_free(kernel_response_data); -+ return -EFAULT; -+ } ++struct kbase_uk_hwcnt_setup { ++ union uk_header header; + -+ if (0 != put_user(kargs.response_packet_size, &uargs->response_packet_size)) { -+ _mali_osk_free(kernel_control_data); -+ _mali_osk_free(kernel_response_data); -+ return -EFAULT; -+ } ++ /* IN */ ++ u64 dump_buffer; ++ u32 jm_bm; ++ u32 shader_bm; ++ u32 tiler_bm; ++ u32 unused_1; /* keep for backwards compatibility */ ++ u32 mmu_l2_bm; ++ u32 padding; ++ /* OUT */ ++}; + -+ _mali_osk_free(kernel_control_data); -+ _mali_osk_free(kernel_response_data); -+ } else { ++/** ++ * struct kbase_uk_hwcnt_reader_setup - User/Kernel space data exchange structure ++ * @header: UK structure header ++ * @buffer_count: requested number of dumping buffers ++ * @jm_bm: counters selection bitmask (JM) ++ * @shader_bm: counters selection bitmask (Shader) ++ * @tiler_bm: counters selection bitmask (Tiler) ++ * @mmu_l2_bm: counters selection bitmask (MMU_L2) ++ * @fd: dumping notification file descriptor ++ * ++ * This structure sets up HWC dumper/reader for this context. ++ * Multiple instances can be created for single context. ++ */ ++struct kbase_uk_hwcnt_reader_setup { ++ union uk_header header; + -+ err = _mali_ukk_profiling_control_set(&kargs); -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } ++ /* IN */ ++ u32 buffer_count; ++ u32 jm_bm; ++ u32 shader_bm; ++ u32 tiler_bm; ++ u32 mmu_l2_bm; + -+ } -+ return 0; -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c -new file mode 100755 -index 000000000000..1dd4a7c6fb1e ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c -@@ -0,0 +1,90 @@ -+/* -+ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#include /* file system operations */ -+#include /* user space access */ ++ /* OUT */ ++ s32 fd; ++}; + -+#include "mali_ukk.h" -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_session.h" -+#include "mali_ukk_wrappers.h" ++struct kbase_uk_hwcnt_dump { ++ union uk_header header; ++}; + -+#include "mali_soft_job.h" -+#include "mali_timeline.h" ++struct kbase_uk_hwcnt_clear { ++ union uk_header header; ++}; + -+int soft_job_start_wrapper(struct mali_session_data *session, _mali_uk_soft_job_start_s __user *uargs) -+{ -+ _mali_uk_soft_job_start_s kargs; -+ u32 type, point; -+ u64 user_job; -+ struct mali_timeline_fence fence; -+ struct mali_soft_job *job = NULL; -+ u32 __user *job_id_ptr = NULL; ++struct kbase_uk_fence_validate { ++ union uk_header header; ++ /* IN */ ++ s32 fd; ++ u32 padding; ++ /* OUT */ ++}; + -+ /* If the job was started successfully, 0 is returned. If there was an error, but the job -+ * was started, we return -ENOENT. For anything else returned, the job was not started. */ ++struct kbase_uk_stream_create { ++ union uk_header header; ++ /* IN */ ++ char name[32]; ++ /* OUT */ ++ s32 fd; ++ u32 padding; ++}; + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); -+ MALI_CHECK_NON_NULL(session, -EINVAL); ++struct kbase_uk_gpuprops { ++ union uk_header header; + -+ MALI_DEBUG_ASSERT_POINTER(session->soft_job_system); ++ /* IN */ ++ struct mali_base_gpu_props props; ++ /* OUT */ ++}; + -+ if (0 != copy_from_user(&kargs, uargs, sizeof(kargs))) { -+ return -EFAULT; -+ } ++struct kbase_uk_mem_query { ++ union uk_header header; ++ /* IN */ ++ u64 gpu_addr; ++#define KBASE_MEM_QUERY_COMMIT_SIZE 1 ++#define KBASE_MEM_QUERY_VA_SIZE 2 ++#define KBASE_MEM_QUERY_FLAGS 3 ++ u64 query; ++ /* OUT */ ++ u64 value; ++}; + -+ type = kargs.type; -+ user_job = kargs.user_job; -+ job_id_ptr = (u32 __user *)(uintptr_t)kargs.job_id_ptr; ++struct kbase_uk_mem_commit { ++ union uk_header header; ++ /* IN */ ++ u64 gpu_addr; ++ u64 pages; ++ /* OUT */ ++ u32 result_subcode; ++ u32 padding; ++}; + -+ mali_timeline_fence_copy_uk_fence(&fence, &kargs.fence); ++struct kbase_uk_find_cpu_offset { ++ union uk_header header; ++ /* IN */ ++ u64 gpu_addr; ++ u64 cpu_addr; ++ u64 size; ++ /* OUT */ ++ u64 offset; ++}; + -+ if ((MALI_SOFT_JOB_TYPE_USER_SIGNALED != type) && (MALI_SOFT_JOB_TYPE_SELF_SIGNALED != type)) { -+ MALI_DEBUG_PRINT_ERROR(("Invalid soft job type specified\n")); -+ return -EINVAL; -+ } ++#define KBASE_GET_VERSION_BUFFER_SIZE 64 ++struct kbase_uk_get_ddk_version { ++ union uk_header header; ++ /* OUT */ ++ char version_buffer[KBASE_GET_VERSION_BUFFER_SIZE]; ++ u32 version_string_size; ++ u32 padding; ++ u32 rk_version; ++}; + -+ /* Create soft job. */ -+ job = mali_soft_job_create(session->soft_job_system, (enum mali_soft_job_type)type, user_job); -+ if (unlikely(NULL == job)) { -+ return map_errcode(_MALI_OSK_ERR_NOMEM); -+ } ++struct kbase_uk_disjoint_query { ++ union uk_header header; ++ /* OUT */ ++ u32 counter; ++ u32 padding; ++}; + -+ /* Write job id back to user space. */ -+ if (0 != put_user(job->id, job_id_ptr)) { -+ MALI_PRINT_ERROR(("Mali Soft Job: failed to put job id")); -+ mali_soft_job_destroy(job); -+ return map_errcode(_MALI_OSK_ERR_NOMEM); -+ } ++struct kbase_uk_set_flags { ++ union uk_header header; ++ /* IN */ ++ u32 create_flags; ++ u32 padding; ++}; + -+ /* Start soft job. */ -+ point = mali_soft_job_start(job, &fence); ++#if MALI_UNIT_TEST ++#define TEST_ADDR_COUNT 4 ++#define KBASE_TEST_BUFFER_SIZE 128 ++struct kbase_exported_test_data { ++ u64 test_addr[TEST_ADDR_COUNT]; /**< memory address */ ++ u32 test_addr_pages[TEST_ADDR_COUNT]; /**< memory size in pages */ ++ union kbase_pointer kctx; /**< base context created by process */ ++ union kbase_pointer mm; /**< pointer to process address space */ ++ u8 buffer1[KBASE_TEST_BUFFER_SIZE]; /**< unit test defined parameter */ ++ u8 buffer2[KBASE_TEST_BUFFER_SIZE]; /**< unit test defined parameter */ ++}; + -+ if (0 != put_user(point, &uargs->point)) { -+ /* Let user space know that something failed after the job was started. */ -+ return -ENOENT; -+ } ++struct kbase_uk_set_test_data { ++ union uk_header header; ++ /* IN */ ++ struct kbase_exported_test_data test_data; ++}; + -+ return 0; -+} ++#endif /* MALI_UNIT_TEST */ + -+int soft_job_signal_wrapper(struct mali_session_data *session, _mali_uk_soft_job_signal_s __user *uargs) -+{ -+ u32 job_id; -+ _mali_osk_errcode_t err; ++#ifdef SUPPORT_MALI_ERROR_INJECT ++struct kbase_uk_error_params { ++ union uk_header header; ++ /* IN */ ++ struct kbase_error_params params; ++}; ++#endif /* SUPPORT_MALI_ERROR_INJECT */ + -+ MALI_DEBUG_ASSERT_POINTER(session); ++#ifdef SUPPORT_MALI_NO_MALI ++struct kbase_uk_model_control_params { ++ union uk_header header; ++ /* IN */ ++ struct kbase_model_control_params params; ++}; ++#endif /* SUPPORT_MALI_NO_MALI */ + -+ if (0 != get_user(job_id, &uargs->job_id)) return -EFAULT; ++#ifdef BASE_LEGACY_UK8_SUPPORT ++struct kbase_uk_keep_gpu_powered { ++ union uk_header header; ++ u32 enabled; ++ u32 padding; ++}; ++#endif /* BASE_LEGACY_UK8_SUPPORT */ + -+ err = mali_soft_job_system_signal_job(session->soft_job_system, job_id); ++struct kbase_uk_profiling_controls { ++ union uk_header header; ++ u32 profiling_controls[FBDUMP_CONTROL_MAX]; ++}; + -+ return map_errcode(err); -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c -new file mode 100755 -index 000000000000..ff0c909393a4 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c -@@ -0,0 +1,88 @@ -+/* -+ * Copyright (C) 2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#include /* file system operations */ -+#include /* user space access */ ++struct kbase_uk_debugfs_mem_profile_add { ++ union uk_header header; ++ u32 len; ++ u32 padding; ++ union kbase_pointer buf; ++}; + -+#include "mali_ukk.h" -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_session.h" -+#include "mali_ukk_wrappers.h" ++struct kbase_uk_context_id { ++ union uk_header header; ++ /* OUT */ ++ int id; ++}; + -+#include "mali_timeline.h" -+#include "mali_timeline_fence_wait.h" -+#include "mali_timeline_sync_fence.h" ++/** ++ * struct kbase_uk_tlstream_acquire - User/Kernel space data exchange structure ++ * @header: UK structure header ++ * @flags: timeline stream flags ++ * @fd: timeline stream file descriptor ++ * ++ * This structure is used when performing a call to acquire kernel side timeline ++ * stream file descriptor. ++ */ ++struct kbase_uk_tlstream_acquire { ++ union uk_header header; ++ /* IN */ ++ u32 flags; ++ /* OUT */ ++ s32 fd; ++}; + -+int timeline_get_latest_point_wrapper(struct mali_session_data *session, _mali_uk_timeline_get_latest_point_s __user *uargs) -+{ -+ u32 val; -+ mali_timeline_id timeline; -+ mali_timeline_point point; ++/** ++ * struct kbase_uk_tlstream_acquire_v10_4 - User/Kernel space data exchange ++ * structure ++ * @header: UK structure header ++ * @fd: timeline stream file descriptor ++ * ++ * This structure is used when performing a call to acquire kernel side timeline ++ * stream file descriptor. ++ */ ++struct kbase_uk_tlstream_acquire_v10_4 { ++ union uk_header header; ++ /* IN */ ++ /* OUT */ ++ s32 fd; ++}; + -+ MALI_DEBUG_ASSERT_POINTER(session); ++/** ++ * struct kbase_uk_tlstream_flush - User/Kernel space data exchange structure ++ * @header: UK structure header ++ * ++ * This structure is used when performing a call to flush kernel side ++ * timeline streams. ++ */ ++struct kbase_uk_tlstream_flush { ++ union uk_header header; ++ /* IN */ ++ /* OUT */ ++}; + -+ if (0 != get_user(val, &uargs->timeline)) return -EFAULT; ++#if MALI_UNIT_TEST ++/** ++ * struct kbase_uk_tlstream_test - User/Kernel space data exchange structure ++ * @header: UK structure header ++ * @tpw_count: number of trace point writers in each context ++ * @msg_delay: time delay between tracepoints from one writer in milliseconds ++ * @msg_count: number of trace points written by one writer ++ * @aux_msg: if non-zero aux messages will be included ++ * ++ * This structure is used when performing a call to start timeline stream test ++ * embedded in kernel. ++ */ ++struct kbase_uk_tlstream_test { ++ union uk_header header; ++ /* IN */ ++ u32 tpw_count; ++ u32 msg_delay; ++ u32 msg_count; ++ u32 aux_msg; ++ /* OUT */ ++}; + -+ if (MALI_UK_TIMELINE_MAX <= val) { -+ return -EINVAL; -+ } ++/** ++ * struct kbase_uk_tlstream_stats - User/Kernel space data exchange structure ++ * @header: UK structure header ++ * @bytes_collected: number of bytes read by user ++ * @bytes_generated: number of bytes generated by tracepoints ++ * ++ * This structure is used when performing a call to obtain timeline stream ++ * statistics. ++ */ ++struct kbase_uk_tlstream_stats { ++ union uk_header header; /**< UK structure header. */ ++ /* IN */ ++ /* OUT */ ++ u32 bytes_collected; ++ u32 bytes_generated; ++}; ++#endif /* MALI_UNIT_TEST */ + -+ timeline = (mali_timeline_id)val; ++/** ++ * struct struct kbase_uk_prfcnt_value for the KBASE_FUNC_SET_PRFCNT_VALUES ioctl ++ * @header: UK structure header ++ * @data: Counter samples for the dummy model ++ * @size:............Size of the counter sample data ++ */ ++struct kbase_uk_prfcnt_values { ++ union uk_header header; ++ /* IN */ ++ u32 *data; ++ u32 size; ++}; + -+ point = mali_timeline_system_get_latest_point(session->timeline_system, timeline); ++/** ++ * struct kbase_uk_soft_event_update - User/Kernel space data exchange structure ++ * @header: UK structure header ++ * @evt: the GPU address containing the event ++ * @new_status: the new event status, must be either BASE_JD_SOFT_EVENT_SET or ++ * BASE_JD_SOFT_EVENT_RESET ++ * @flags: reserved for future uses, must be set to 0 ++ * ++ * This structure is used to update the status of a software event. If the ++ * event's status is set to BASE_JD_SOFT_EVENT_SET, any job currently waiting ++ * on this event will complete. ++ */ ++struct kbase_uk_soft_event_update { ++ union uk_header header; ++ /* IN */ ++ u64 evt; ++ u32 new_status; ++ u32 flags; ++}; + -+ if (0 != put_user(point, &uargs->point)) return -EFAULT; ++/** ++ * struct kbase_uk_mem_jit_init - User/Kernel space data exchange structure ++ * @header: UK structure header ++ * @va_pages: Number of virtual pages required for JIT ++ * ++ * This structure is used when requesting initialization of JIT. ++ */ ++struct kbase_uk_mem_jit_init { ++ union uk_header header; ++ /* IN */ ++ u64 va_pages; ++}; + -+ return 0; -+} ++enum kbase_uk_function_id { ++ KBASE_FUNC_MEM_ALLOC = (UK_FUNC_ID + 0), ++ KBASE_FUNC_MEM_IMPORT = (UK_FUNC_ID + 1), ++ KBASE_FUNC_MEM_COMMIT = (UK_FUNC_ID + 2), ++ KBASE_FUNC_MEM_QUERY = (UK_FUNC_ID + 3), ++ KBASE_FUNC_MEM_FREE = (UK_FUNC_ID + 4), ++ KBASE_FUNC_MEM_FLAGS_CHANGE = (UK_FUNC_ID + 5), ++ KBASE_FUNC_MEM_ALIAS = (UK_FUNC_ID + 6), + -+int timeline_wait_wrapper(struct mali_session_data *session, _mali_uk_timeline_wait_s __user *uargs) -+{ -+ u32 timeout, status; -+ mali_bool ret; -+ _mali_uk_fence_t uk_fence; -+ struct mali_timeline_fence fence; ++#ifdef BASE_LEGACY_UK6_SUPPORT ++ KBASE_FUNC_JOB_SUBMIT_UK6 = (UK_FUNC_ID + 7), ++#endif /* BASE_LEGACY_UK6_SUPPORT */ + -+ MALI_DEBUG_ASSERT_POINTER(session); ++ KBASE_FUNC_SYNC = (UK_FUNC_ID + 8), + -+ if (0 != copy_from_user(&uk_fence, &uargs->fence, sizeof(_mali_uk_fence_t))) return -EFAULT; -+ if (0 != get_user(timeout, &uargs->timeout)) return -EFAULT; ++ KBASE_FUNC_POST_TERM = (UK_FUNC_ID + 9), + -+ mali_timeline_fence_copy_uk_fence(&fence, &uk_fence); ++ KBASE_FUNC_HWCNT_SETUP = (UK_FUNC_ID + 10), ++ KBASE_FUNC_HWCNT_DUMP = (UK_FUNC_ID + 11), ++ KBASE_FUNC_HWCNT_CLEAR = (UK_FUNC_ID + 12), + -+ ret = mali_timeline_fence_wait(session->timeline_system, &fence, timeout); -+ status = (MALI_TRUE == ret ? 1 : 0); ++ KBASE_FUNC_GPU_PROPS_REG_DUMP = (UK_FUNC_ID + 14), + -+ if (0 != put_user(status, &uargs->status)) return -EFAULT; ++ KBASE_FUNC_FIND_CPU_OFFSET = (UK_FUNC_ID + 15), + -+ return 0; -+} ++ KBASE_FUNC_GET_VERSION = (UK_FUNC_ID + 16), ++ KBASE_FUNC_SET_FLAGS = (UK_FUNC_ID + 18), + -+int timeline_create_sync_fence_wrapper(struct mali_session_data *session, _mali_uk_timeline_create_sync_fence_s __user *uargs) -+{ -+ s32 sync_fd = -1; -+ _mali_uk_fence_t uk_fence; -+ struct mali_timeline_fence fence; ++ KBASE_FUNC_SET_TEST_DATA = (UK_FUNC_ID + 19), ++ KBASE_FUNC_INJECT_ERROR = (UK_FUNC_ID + 20), ++ KBASE_FUNC_MODEL_CONTROL = (UK_FUNC_ID + 21), + -+ MALI_DEBUG_ASSERT_POINTER(session); ++#ifdef BASE_LEGACY_UK8_SUPPORT ++ KBASE_FUNC_KEEP_GPU_POWERED = (UK_FUNC_ID + 22), ++#endif /* BASE_LEGACY_UK8_SUPPORT */ + -+ if (0 != copy_from_user(&uk_fence, &uargs->fence, sizeof(_mali_uk_fence_t))) return -EFAULT; -+ mali_timeline_fence_copy_uk_fence(&fence, &uk_fence); ++ KBASE_FUNC_FENCE_VALIDATE = (UK_FUNC_ID + 23), ++ KBASE_FUNC_STREAM_CREATE = (UK_FUNC_ID + 24), ++ KBASE_FUNC_GET_PROFILING_CONTROLS = (UK_FUNC_ID + 25), ++ KBASE_FUNC_SET_PROFILING_CONTROLS = (UK_FUNC_ID + 26), ++ /* to be used only for testing ++ * purposes, otherwise these controls ++ * are set through gator API */ + -+#if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) -+ sync_fd = mali_timeline_sync_fence_create(session->timeline_system, &fence); -+#else -+ sync_fd = -1; -+#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ ++ KBASE_FUNC_DEBUGFS_MEM_PROFILE_ADD = (UK_FUNC_ID + 27), ++ KBASE_FUNC_JOB_SUBMIT = (UK_FUNC_ID + 28), ++ KBASE_FUNC_DISJOINT_QUERY = (UK_FUNC_ID + 29), + -+ if (0 != put_user(sync_fd, &uargs->sync_fd)) return -EFAULT; ++ KBASE_FUNC_GET_CONTEXT_ID = (UK_FUNC_ID + 31), + -+ return 0; -+} -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c -new file mode 100755 -index 000000000000..52519d1f96e0 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c -@@ -0,0 +1,39 @@ -+/* -+ * Copyright (C) 2011-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+#include /* file system operations */ -+#include /* user space access */ ++ KBASE_FUNC_TLSTREAM_ACQUIRE_V10_4 = (UK_FUNC_ID + 32), ++#if MALI_UNIT_TEST ++ KBASE_FUNC_TLSTREAM_TEST = (UK_FUNC_ID + 33), ++ KBASE_FUNC_TLSTREAM_STATS = (UK_FUNC_ID + 34), ++#endif /* MALI_UNIT_TEST */ ++ KBASE_FUNC_TLSTREAM_FLUSH = (UK_FUNC_ID + 35), + -+#include "mali_ukk.h" -+#include "mali_osk.h" -+#include "mali_kernel_common.h" -+#include "mali_session.h" -+#include "mali_ukk_wrappers.h" ++ KBASE_FUNC_HWCNT_READER_SETUP = (UK_FUNC_ID + 36), + ++#ifdef SUPPORT_MALI_NO_MALI ++ KBASE_FUNC_SET_PRFCNT_VALUES = (UK_FUNC_ID + 37), ++#endif + -+int vsync_event_report_wrapper(struct mali_session_data *session_data, _mali_uk_vsync_event_report_s __user *uargs) -+{ -+ _mali_uk_vsync_event_report_s kargs; -+ _mali_osk_errcode_t err; ++ KBASE_FUNC_SOFT_EVENT_UPDATE = (UK_FUNC_ID + 38), + -+ MALI_CHECK_NON_NULL(uargs, -EINVAL); ++ KBASE_FUNC_MEM_JIT_INIT = (UK_FUNC_ID + 39), + -+ if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_vsync_event_report_s))) { -+ return -EFAULT; -+ } ++ KBASE_FUNC_TLSTREAM_ACQUIRE = (UK_FUNC_ID + 40), + -+ kargs.ctx = (uintptr_t)session_data; -+ err = _mali_ukk_vsync_event_report(&kargs); -+ if (_MALI_OSK_ERR_OK != err) { -+ return map_errcode(err); -+ } ++ KBASE_FUNC_MAX ++}; + -+ return 0; -+} ++#endif /* _KBASE_UKU_H_ */ + -diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h +diff --git a/drivers/gpu/arm/midgard/mali_kbase_utility.c b/drivers/gpu/arm/midgard/mali_kbase_utility.c new file mode 100755 -index 000000000000..1add628fe323 +index 000000000..be474ff87 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h -@@ -0,0 +1,82 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_utility.c +@@ -0,0 +1,33 @@ +/* -+ * Copyright (C) 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+/** -+ * @file mali_ukk_wrappers.h -+ * Defines the wrapper functions for each user-kernel function ++ * ++ * (C) COPYRIGHT 2012-2013, 2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef __MALI_UKK_WRAPPERS_H__ -+#define __MALI_UKK_WRAPPERS_H__ -+ -+#include "mali_uk_types.h" -+#include "mali_osk.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+int wait_for_notification_wrapper(struct mali_session_data *session_data, _mali_uk_wait_for_notification_s __user *uargs); -+int get_api_version_wrapper(struct mali_session_data *session_data, _mali_uk_get_api_version_s __user *uargs); -+int get_api_version_v2_wrapper(struct mali_session_data *session_data, _mali_uk_get_api_version_v2_s __user *uargs); -+int get_user_settings_wrapper(struct mali_session_data *session_data, _mali_uk_get_user_settings_s __user *uargs); -+int post_notification_wrapper(struct mali_session_data *session_data, _mali_uk_post_notification_s __user *uargs); -+int request_high_priority_wrapper(struct mali_session_data *session_data, _mali_uk_request_high_priority_s __user *uargs); -+int pending_submit_wrapper(struct mali_session_data *session_data, _mali_uk_pending_submit_s __user *uargs); -+ -+/* rk_ext : 从对 r5p0-01rel0 集æˆå¼€å§‹, ä¸å†ä½¿ç”¨. */ -+#if 0 -+int get_mali_version_in_rk30_wrapper(struct mali_session_data *session_data, _mali_uk_get_mali_version_in_rk30_s __user *uargs); -+#else -+int get_rk_ko_version_wrapper(struct mali_session_data *session_data, _mali_rk_ko_version_s __user *uargs); -+#endif + -+int mem_alloc_wrapper(struct mali_session_data *session_data, _mali_uk_alloc_mem_s __user *uargs); -+int mem_free_wrapper(struct mali_session_data *session_data, _mali_uk_free_mem_s __user *uargs); -+int mem_bind_wrapper(struct mali_session_data *session_data, _mali_uk_bind_mem_s __user *uargs); -+int mem_unbind_wrapper(struct mali_session_data *session_data, _mali_uk_unbind_mem_s __user *uargs); -+int mem_cow_wrapper(struct mali_session_data *session_data, _mali_uk_cow_mem_s __user *uargs); -+int mem_cow_modify_range_wrapper(struct mali_session_data *session_data, _mali_uk_cow_modify_range_s __user *uargs); -+int mem_resize_mem_wrapper(struct mali_session_data *session_data, _mali_uk_mem_resize_s __user *uargs); -+int mem_write_safe_wrapper(struct mali_session_data *session_data, _mali_uk_mem_write_safe_s __user *uargs); -+int mem_query_mmu_page_table_dump_size_wrapper(struct mali_session_data *session_data, _mali_uk_query_mmu_page_table_dump_size_s __user *uargs); -+int mem_dump_mmu_page_table_wrapper(struct mali_session_data *session_data, _mali_uk_dump_mmu_page_table_s __user *uargs); -+int mem_usage_get_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_memory_usage_get_s __user *uargs); + -+int timeline_get_latest_point_wrapper(struct mali_session_data *session, _mali_uk_timeline_get_latest_point_s __user *uargs); -+int timeline_wait_wrapper(struct mali_session_data *session, _mali_uk_timeline_wait_s __user *uargs); -+int timeline_create_sync_fence_wrapper(struct mali_session_data *session, _mali_uk_timeline_create_sync_fence_s __user *uargs); -+int soft_job_start_wrapper(struct mali_session_data *session, _mali_uk_soft_job_start_s __user *uargs); -+int soft_job_signal_wrapper(struct mali_session_data *session, _mali_uk_soft_job_signal_s __user *uargs); -+int pp_start_job_wrapper(struct mali_session_data *session_data, _mali_uk_pp_start_job_s __user *uargs); -+int pp_and_gp_start_job_wrapper(struct mali_session_data *session_data, _mali_uk_pp_and_gp_start_job_s __user *uargs); -+int pp_get_number_of_cores_wrapper(struct mali_session_data *session_data, _mali_uk_get_pp_number_of_cores_s __user *uargs); -+int pp_get_core_version_wrapper(struct mali_session_data *session_data, _mali_uk_get_pp_core_version_s __user *uargs); -+int pp_disable_wb_wrapper(struct mali_session_data *session_data, _mali_uk_pp_disable_wb_s __user *uargs); -+int gp_start_job_wrapper(struct mali_session_data *session_data, _mali_uk_gp_start_job_s __user *uargs); -+int gp_get_number_of_cores_wrapper(struct mali_session_data *session_data, _mali_uk_get_gp_number_of_cores_s __user *uargs); -+int gp_get_core_version_wrapper(struct mali_session_data *session_data, _mali_uk_get_gp_core_version_s __user *uargs); -+int gp_suspend_response_wrapper(struct mali_session_data *session_data, _mali_uk_gp_suspend_response_s __user *uargs); + -+int profiling_add_event_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_add_event_s __user *uargs); -+int profiling_report_sw_counters_wrapper(struct mali_session_data *session_data, _mali_uk_sw_counters_report_s __user *uargs); -+int profiling_get_stream_fd_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_stream_fd_get_s __user *uargs); -+int profiling_control_set_wrapper(struct mali_session_data *session_data, _mali_uk_profiling_control_set_s __user *uargs); + -+int vsync_event_report_wrapper(struct mali_session_data *session_data, _mali_uk_vsync_event_report_s __user *uargs); ++#include + ++bool kbasep_list_member_of(const struct list_head *base, struct list_head *entry) ++{ ++ struct list_head *pos = base->next; + -+int map_errcode(_mali_osk_errcode_t err); ++ while (pos != base) { ++ if (pos == entry) ++ return true; + -+#ifdef __cplusplus ++ pos = pos->next; ++ } ++ return false; +} -+#endif -+ -+#endif /* __MALI_UKK_WRAPPERS_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm.c b/drivers/gpu/arm/mali400/mali/platform/arm/arm.c +diff --git a/drivers/gpu/arm/midgard/mali_kbase_utility.h b/drivers/gpu/arm/midgard/mali_kbase_utility.h new file mode 100755 -index 000000000000..fc7017bbfe08 +index 000000000..fd7252dab --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm.c -@@ -0,0 +1,629 @@ ++++ b/drivers/gpu/arm/midgard/mali_kbase_utility.h +@@ -0,0 +1,37 @@ +/* -+ * Copyright (C) 2010, 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2012-2013, 2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+/** -+ * @file mali_platform.c -+ * Platform specific Mali driver functions for: -+ * - Realview Versatile platforms with ARM11 Mpcore and virtex 5. -+ * - Versatile Express platforms with ARM Cortex-A9 and virtex 6. -+ */ -+#include -+#include -+#include -+#include "mali_kernel_linux.h" -+#ifdef CONFIG_PM_RUNTIME -+#include -+#endif -+#include -+#include -+#include "mali_kernel_common.h" -+#include -+#include + -+#include "arm_core_scaling.h" -+#include "mali_executor.h" + -+#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) -+#include -+#include -+#endif + -+static int mali_core_scaling_enable = 0; + -+void mali_gpu_utilization_callback(struct mali_gpu_utilization_data *data); -+static u32 mali_read_phys(u32 phys_addr); -+#if defined(CONFIG_ARCH_REALVIEW) -+static void mali_write_phys(u32 phys_addr, u32 value); -+#endif ++#ifndef _KBASE_UTILITY_H ++#define _KBASE_UTILITY_H + -+#if defined(CONFIG_ARCH_VEXPRESS) && defined(CONFIG_ARM64) ++#ifndef _KBASE_H_ ++#error "Don't include this file directly, use mali_kbase.h instead" ++#endif + -+#define SECURE_MODE_CONTROL_HANDLER 0x6F02006C -+void *secure_mode_mapped_addr = NULL; -+/** -+ * Reset GPU and enable/disable Mali secure mode. -+ * @Return value: -+ * 0: success -+ * non-0: failure. ++/** Test whether the given list entry is a member of the given list. ++ * ++ * @param base The head of the list to be tested ++ * @param entry The list entry to be tested ++ * ++ * @return true if entry is a member of base ++ * false otherwise + */ ++bool kbasep_list_member_of(const struct list_head *base, struct list_head *entry); + -+static int mali_gpu_reset_and_secure_mode_enable_juno(void) -+{ -+ u32 phys_offset = SECURE_MODE_CONTROL_HANDLER & 0x00001FFF; -+ MALI_DEBUG_ASSERT(NULL != secure_mode_mapped_addr); ++#endif /* _KBASE_UTILITY_H */ +diff --git a/drivers/gpu/arm/midgard/mali_kbase_vinstr.c b/drivers/gpu/arm/midgard/mali_kbase_vinstr.c +new file mode 100755 +index 000000000..8395568d0 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_kbase_vinstr.c +@@ -0,0 +1,2070 @@ ++/* ++ * ++ * (C) COPYRIGHT 2011-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ iowrite32(1, ((u8 *)secure_mode_mapped_addr) + phys_offset); + -+ if (1 == (u32)ioread32(((u8 *)secure_mode_mapped_addr) + phys_offset)) { -+ MALI_DEBUG_PRINT(3, ("Mali reset GPU and enable secured mode successfully! \n")); -+ return 0; -+ } + -+ MALI_PRINT_ERROR(("Failed to reset GPU and enable Mali secured mode !!! \n")); ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+ return -1; ++#include ++#include ++#include ++#include ++#include ++#include + -+} ++/*****************************************************************************/ + -+static int mali_gpu_reset_and_secure_mode_disable_juno(void) -+{ -+ u32 phys_offset = SECURE_MODE_CONTROL_HANDLER & 0x00001FFF; -+ MALI_DEBUG_ASSERT(NULL != secure_mode_mapped_addr); ++/* Hwcnt reader API version */ ++#define HWCNT_READER_API 1 + -+ iowrite32(0, ((u8 *)secure_mode_mapped_addr) + phys_offset); ++/* The number of nanoseconds in a second. */ ++#define NSECS_IN_SEC 1000000000ull /* ns */ + -+ if (0 == (u32)ioread32(((u8 *)secure_mode_mapped_addr) + phys_offset)) { -+ MALI_DEBUG_PRINT(3, ("Mali reset GPU and disable secured mode successfully! \n")); -+ return 0; -+ } ++/* The time resolution of dumping service. */ ++#define DUMPING_RESOLUTION 500000ull /* ns */ + -+ MALI_PRINT_ERROR(("Failed to reset GPU and disable mali secured mode !!! \n")); -+ return -1; -+} ++/* The maximal supported number of dumping buffers. */ ++#define MAX_BUFFER_COUNT 32 + -+static int mali_secure_mode_init_juno(void) -+{ -+ u32 phys_addr_page = SECURE_MODE_CONTROL_HANDLER & 0xFFFFE000; -+ u32 phys_offset = SECURE_MODE_CONTROL_HANDLER & 0x00001FFF; -+ u32 map_size = phys_offset + sizeof(u32); ++/* Size and number of hw counters blocks. */ ++#define NR_CNT_BLOCKS_PER_GROUP 8 ++#define NR_CNT_PER_BLOCK 64 ++#define NR_BYTES_PER_CNT 4 ++#define NR_BYTES_PER_HDR 16 ++#define PRFCNT_EN_MASK_OFFSET 0x8 + -+ MALI_DEBUG_ASSERT(NULL == secure_mode_mapped_addr); ++/*****************************************************************************/ + -+ secure_mode_mapped_addr = ioremap(phys_addr_page, map_size); -+ if (NULL != secure_mode_mapped_addr) { -+ return mali_gpu_reset_and_secure_mode_disable_juno(); -+ } -+ MALI_DEBUG_PRINT(2, ("Failed to ioremap for Mali secured mode! \n")); -+ return -1; -+} ++enum { ++ SHADER_HWCNT_BM, ++ TILER_HWCNT_BM, ++ MMU_L2_HWCNT_BM, ++ JM_HWCNT_BM ++}; + -+static void mali_secure_mode_deinit_juno(void) -+{ -+ if (NULL != secure_mode_mapped_addr) { -+ mali_gpu_reset_and_secure_mode_disable_juno(); -+ iounmap(secure_mode_mapped_addr); -+ secure_mode_mapped_addr = NULL; -+ } -+} -+#endif ++enum vinstr_state { ++ VINSTR_IDLE, ++ VINSTR_DUMPING, ++ VINSTR_SUSPENDING, ++ VINSTR_SUSPENDED, ++ VINSTR_RESUMING ++}; + -+#ifndef CONFIG_MALI_DT -+static void mali_platform_device_release(struct device *device); ++/** ++ * struct kbase_vinstr_context - vinstr context per device ++ * @lock: protects the entire vinstr context ++ * @kbdev: pointer to kbase device ++ * @kctx: pointer to kbase context ++ * @vmap: vinstr vmap for mapping hwcnt dump buffer ++ * @gpu_va: GPU hwcnt dump buffer address ++ * @cpu_va: the CPU side mapping of the hwcnt dump buffer ++ * @dump_size: size of the dump buffer in bytes ++ * @bitmap: current set of counters monitored, not always in sync ++ * with hardware ++ * @reprogram: when true, reprogram hwcnt block with the new set of ++ * counters ++ * @state: vinstr state ++ * @state_lock: protects information about vinstr state ++ * @suspend_waitq: notification queue to trigger state re-validation ++ * @suspend_cnt: reference counter of vinstr's suspend state ++ * @suspend_work: worker to execute on entering suspended state ++ * @resume_work: worker to execute on leaving suspended state ++ * @nclients: number of attached clients, pending or otherwise ++ * @waiting_clients: head of list of clients being periodically sampled ++ * @idle_clients: head of list of clients being idle ++ * @suspended_clients: head of list of clients being suspended ++ * @thread: periodic sampling thread ++ * @waitq: notification queue of sampling thread ++ * @request_pending: request for action for sampling thread ++ */ ++struct kbase_vinstr_context { ++ struct mutex lock; ++ struct kbase_device *kbdev; ++ struct kbase_context *kctx; + -+#if defined(CONFIG_ARCH_VEXPRESS) ++ struct kbase_vmap_struct vmap; ++ u64 gpu_va; ++ void *cpu_va; ++ size_t dump_size; ++ u32 bitmap[4]; ++ bool reprogram; + -+#if defined(CONFIG_ARM64) -+/* Juno + Mali-450 MP6 in V7 FPGA */ -+static struct resource mali_gpu_resources_m450_mp6[] = { -+ MALI_GPU_RESOURCES_MALI450_MP6_PMU(0x6F040000, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200) -+}; ++ enum vinstr_state state; ++ struct spinlock state_lock; ++ wait_queue_head_t suspend_waitq; ++ unsigned int suspend_cnt; ++ struct work_struct suspend_work; ++ struct work_struct resume_work; + -+static struct resource mali_gpu_resources_m470_mp4[] = { -+ MALI_GPU_RESOURCES_MALI470_MP4_PMU(0x6F040000, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200) -+}; ++ u32 nclients; ++ struct list_head waiting_clients; ++ struct list_head idle_clients; ++ struct list_head suspended_clients; + -+static struct resource mali_gpu_resources_m470_mp3[] = { -+ MALI_GPU_RESOURCES_MALI470_MP3_PMU(0x6F040000, 200, 200, 200, 200, 200, 200, 200, 200, 200) ++ struct task_struct *thread; ++ wait_queue_head_t waitq; ++ atomic_t request_pending; +}; + -+static struct resource mali_gpu_resources_m470_mp2[] = { -+ MALI_GPU_RESOURCES_MALI470_MP2_PMU(0x6F040000, 200, 200, 200, 200, 200, 200, 200) ++/** ++ * struct kbase_vinstr_client - a vinstr client attached to a vinstr context ++ * @vinstr_ctx: vinstr context client is attached to ++ * @list: node used to attach this client to list in vinstr context ++ * @buffer_count: number of buffers this client is using ++ * @event_mask: events this client reacts to ++ * @dump_size: size of one dump buffer in bytes ++ * @bitmap: bitmap request for JM, TILER, SHADER and MMU counters ++ * @legacy_buffer: userspace hwcnt dump buffer (legacy interface) ++ * @kernel_buffer: kernel hwcnt dump buffer (kernel client interface) ++ * @accum_buffer: temporary accumulation buffer for preserving counters ++ * @dump_time: next time this clients shall request hwcnt dump ++ * @dump_interval: interval between periodic hwcnt dumps ++ * @dump_buffers: kernel hwcnt dump buffers allocated by this client ++ * @dump_buffers_meta: metadata of dump buffers ++ * @meta_idx: index of metadata being accessed by userspace ++ * @read_idx: index of buffer read by userspace ++ * @write_idx: index of buffer being written by dumping service ++ * @waitq: client's notification queue ++ * @pending: when true, client has attached but hwcnt not yet updated ++ */ ++struct kbase_vinstr_client { ++ struct kbase_vinstr_context *vinstr_ctx; ++ struct list_head list; ++ unsigned int buffer_count; ++ u32 event_mask; ++ size_t dump_size; ++ u32 bitmap[4]; ++ void __user *legacy_buffer; ++ void *kernel_buffer; ++ void *accum_buffer; ++ u64 dump_time; ++ u32 dump_interval; ++ char *dump_buffers; ++ struct kbase_hwcnt_reader_metadata *dump_buffers_meta; ++ atomic_t meta_idx; ++ atomic_t read_idx; ++ atomic_t write_idx; ++ wait_queue_head_t waitq; ++ bool pending; +}; + -+static struct resource mali_gpu_resources_m470_mp1[] = { -+ MALI_GPU_RESOURCES_MALI470_MP1_PMU(0x6F040000, 200, 200, 200, 200, 200) ++/** ++ * struct kbasep_vinstr_wake_up_timer - vinstr service thread wake up timer ++ * @hrtimer: high resolution timer ++ * @vinstr_ctx: vinstr context ++ */ ++struct kbasep_vinstr_wake_up_timer { ++ struct hrtimer hrtimer; ++ struct kbase_vinstr_context *vinstr_ctx; +}; + -+#else -+static struct resource mali_gpu_resources_m450_mp8[] = { -+ MALI_GPU_RESOURCES_MALI450_MP8_PMU(0xFC040000, -1, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 68) -+}; ++/*****************************************************************************/ + -+static struct resource mali_gpu_resources_m450_mp6[] = { -+ MALI_GPU_RESOURCES_MALI450_MP6_PMU(0xFC040000, -1, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 68) -+}; ++static int kbasep_vinstr_service_task(void *data); + -+static struct resource mali_gpu_resources_m450_mp4[] = { -+ MALI_GPU_RESOURCES_MALI450_MP4_PMU(0xFC040000, -1, 70, 70, 70, 70, 70, 70, 70, 70, 70, 68) -+}; ++static unsigned int kbasep_vinstr_hwcnt_reader_poll( ++ struct file *filp, ++ poll_table *wait); ++static long kbasep_vinstr_hwcnt_reader_ioctl( ++ struct file *filp, ++ unsigned int cmd, ++ unsigned long arg); ++static int kbasep_vinstr_hwcnt_reader_mmap( ++ struct file *filp, ++ struct vm_area_struct *vma); ++static int kbasep_vinstr_hwcnt_reader_release( ++ struct inode *inode, ++ struct file *filp); + -+static struct resource mali_gpu_resources_m470_mp4[] = { -+ MALI_GPU_RESOURCES_MALI470_MP4_PMU(0xFC040000, -1, 70, 70, 70, 70, 70, 70, 70, 70, 70, 68) ++/* The timeline stream file operations structure. */ ++static const struct file_operations vinstr_client_fops = { ++ .poll = kbasep_vinstr_hwcnt_reader_poll, ++ .unlocked_ioctl = kbasep_vinstr_hwcnt_reader_ioctl, ++ .compat_ioctl = kbasep_vinstr_hwcnt_reader_ioctl, ++ .mmap = kbasep_vinstr_hwcnt_reader_mmap, ++ .release = kbasep_vinstr_hwcnt_reader_release, +}; -+#endif /* CONFIG_ARM64 */ -+ -+#elif defined(CONFIG_ARCH_REALVIEW) + -+static struct resource mali_gpu_resources_m300[] = { -+ MALI_GPU_RESOURCES_MALI300_PMU(0xC0000000, -1, -1, -1, -1) -+}; ++/*****************************************************************************/ + -+static struct resource mali_gpu_resources_m400_mp1[] = { -+ MALI_GPU_RESOURCES_MALI400_MP1_PMU(0xC0000000, -1, -1, -1, -1) -+}; ++static int enable_hwcnt(struct kbase_vinstr_context *vinstr_ctx) ++{ ++ struct kbase_context *kctx = vinstr_ctx->kctx; ++ struct kbase_device *kbdev = kctx->kbdev; ++ struct kbase_uk_hwcnt_setup setup; ++ int err; + -+static struct resource mali_gpu_resources_m400_mp2[] = { -+ MALI_GPU_RESOURCES_MALI400_MP2_PMU(0xC0000000, -1, -1, -1, -1, -1, -1) -+}; ++ setup.dump_buffer = vinstr_ctx->gpu_va; ++ setup.jm_bm = vinstr_ctx->bitmap[JM_HWCNT_BM]; ++ setup.tiler_bm = vinstr_ctx->bitmap[TILER_HWCNT_BM]; ++ setup.shader_bm = vinstr_ctx->bitmap[SHADER_HWCNT_BM]; ++ setup.mmu_l2_bm = vinstr_ctx->bitmap[MMU_L2_HWCNT_BM]; + -+#endif -+#endif ++ /* Mark the context as active so the GPU is kept turned on */ ++ /* A suspend won't happen here, because we're in a syscall from a ++ * userspace thread. */ ++ kbase_pm_context_active(kbdev); + -+#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) ++ /* Schedule the context in */ ++ kbasep_js_schedule_privileged_ctx(kbdev, kctx); ++ err = kbase_instr_hwcnt_enable_internal(kbdev, kctx, &setup); ++ if (err) { ++ /* Release the context. This had its own Power Manager Active ++ * reference */ ++ kbasep_js_release_privileged_ctx(kbdev, kctx); + -+#define FALLBACK_STATIC_TEMPERATURE 55000 ++ /* Also release our Power Manager Active reference */ ++ kbase_pm_context_idle(kbdev); ++ } + -+static struct thermal_zone_device *gpu_tz; ++ return err; ++} + -+/* Calculate gpu static power example for reference */ -+static unsigned long arm_model_static_power(struct devfreq *devfreq, -+ unsigned long voltage) ++static void disable_hwcnt(struct kbase_vinstr_context *vinstr_ctx) +{ -+ int temperature, temp; -+ int temp_squared, temp_cubed, temp_scaling_factor; -+ const unsigned long coefficient = (410UL << 20) / (729000000UL >> 10); -+ const unsigned long voltage_cubed = (voltage * voltage * voltage) >> 10; -+ unsigned long static_power; -+ -+ if (gpu_tz) { -+ int ret; ++ struct kbase_context *kctx = vinstr_ctx->kctx; ++ struct kbase_device *kbdev = kctx->kbdev; ++ int err; + -+ ret = gpu_tz->ops->get_temp(gpu_tz, &temperature); -+ if (ret) { -+ MALI_DEBUG_PRINT(2, ("Error reading temperature for gpu thermal zone: %d\n", ret)); -+ temperature = FALLBACK_STATIC_TEMPERATURE; -+ } -+ } else { -+ temperature = FALLBACK_STATIC_TEMPERATURE; ++ err = kbase_instr_hwcnt_disable_internal(kctx); ++ if (err) { ++ dev_warn(kbdev->dev, "Failed to disable HW counters (ctx:%p)", ++ kctx); ++ return; + } + -+ /* Calculate the temperature scaling factor. To be applied to the -+ * voltage scaled power. -+ */ -+ temp = temperature / 1000; -+ temp_squared = temp * temp; -+ temp_cubed = temp_squared * temp; -+ temp_scaling_factor = -+ (2 * temp_cubed) -+ - (80 * temp_squared) -+ + (4700 * temp) -+ + 32000; ++ /* Release the context. This had its own Power Manager Active reference. */ ++ kbasep_js_release_privileged_ctx(kbdev, kctx); + -+ static_power = (((coefficient * voltage_cubed) >> 20) -+ * temp_scaling_factor) -+ / 1000000; ++ /* Also release our Power Manager Active reference. */ ++ kbase_pm_context_idle(kbdev); + -+ return static_power; ++ dev_dbg(kbdev->dev, "HW counters dumping disabled for context %p", kctx); +} + -+/* Calculate gpu dynamic power example for reference */ -+static unsigned long arm_model_dynamic_power(struct devfreq *devfreq, -+ unsigned long freq, -+ unsigned long voltage) ++static int reprogram_hwcnt(struct kbase_vinstr_context *vinstr_ctx) +{ -+ /* The inputs: freq (f) is in Hz, and voltage (v) in mV. -+ * The coefficient (c) is in mW/(MHz mV mV). -+ * -+ * This function calculates the dynamic power after this formula: -+ * Pdyn (mW) = c (mW/(MHz*mV*mV)) * v (mV) * v (mV) * f (MHz) -+ */ -+ const unsigned long v2 = (voltage * voltage) / 1000; /* m*(V*V) */ -+ const unsigned long f_mhz = freq / 1000000; /* MHz */ -+ const unsigned long coefficient = 3600; /* mW/(MHz*mV*mV) */ -+ unsigned long dynamic_power; -+ -+ dynamic_power = (coefficient * v2 * f_mhz) / 1000000; /* mW */ ++ disable_hwcnt(vinstr_ctx); ++ return enable_hwcnt(vinstr_ctx); ++} + -+ return dynamic_power; ++static void hwcnt_bitmap_set(u32 dst[4], u32 src[4]) ++{ ++ dst[JM_HWCNT_BM] = src[JM_HWCNT_BM]; ++ dst[TILER_HWCNT_BM] = src[TILER_HWCNT_BM]; ++ dst[SHADER_HWCNT_BM] = src[SHADER_HWCNT_BM]; ++ dst[MMU_L2_HWCNT_BM] = src[MMU_L2_HWCNT_BM]; +} + -+struct devfreq_cooling_power arm_cooling_ops = { -+ .get_static_power = arm_model_static_power, -+ .get_dynamic_power = arm_model_dynamic_power, -+}; -+#endif ++static void hwcnt_bitmap_union(u32 dst[4], u32 src[4]) ++{ ++ dst[JM_HWCNT_BM] |= src[JM_HWCNT_BM]; ++ dst[TILER_HWCNT_BM] |= src[TILER_HWCNT_BM]; ++ dst[SHADER_HWCNT_BM] |= src[SHADER_HWCNT_BM]; ++ dst[MMU_L2_HWCNT_BM] |= src[MMU_L2_HWCNT_BM]; ++} + -+static struct mali_gpu_device_data mali_gpu_data = { -+#ifndef CONFIG_MALI_DT -+ .pmu_switch_delay = 0xFF, /* do not have to be this high on FPGA, but it is good for testing to have a delay */ -+#if defined(CONFIG_ARCH_VEXPRESS) -+ .shared_mem_size = 256 * 1024 * 1024, /* 256MB */ -+#endif -+#endif -+ .max_job_runtime = 60000, /* 60 seconds */ ++size_t kbase_vinstr_dump_size(struct kbase_device *kbdev) ++{ ++ size_t dump_size; + -+#if defined(CONFIG_ARCH_REALVIEW) -+ .dedicated_mem_start = 0x80000000, /* Physical start address (use 0xD0000000 for old indirect setup) */ -+ .dedicated_mem_size = 0x10000000, /* 256MB */ -+#endif -+#if defined(CONFIG_ARM64) -+ /* Some framebuffer drivers get the framebuffer dynamically, such as through GEM, -+ * in which the memory resource can't be predicted in advance. -+ */ -+ .fb_start = 0x0, -+ .fb_size = 0xFFFFF000, -+#else -+ .fb_start = 0xe0000000, -+ .fb_size = 0x01000000, -+#endif -+ .control_interval = 1000, /* 1000ms */ -+ .utilization_callback = mali_gpu_utilization_callback, -+ .get_clock_info = NULL, -+ .get_freq = NULL, -+ .set_freq = NULL, -+#if defined(CONFIG_ARCH_VEXPRESS) && defined(CONFIG_ARM64) -+ .secure_mode_init = mali_secure_mode_init_juno, -+ .secure_mode_deinit = mali_secure_mode_deinit_juno, -+ .gpu_reset_and_secure_mode_enable = mali_gpu_reset_and_secure_mode_enable_juno, -+ .gpu_reset_and_secure_mode_disable = mali_gpu_reset_and_secure_mode_disable_juno, -+#else -+ .secure_mode_init = NULL, -+ .secure_mode_deinit = NULL, -+ .gpu_reset_and_secure_mode_enable = NULL, -+ .gpu_reset_and_secure_mode_disable = NULL, -+#endif -+#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) -+ .gpu_cooling_ops = &arm_cooling_ops, -+#endif -+}; ++#ifndef CONFIG_MALI_NO_MALI ++ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_V4)) { ++ u32 nr_cg; + -+#ifndef CONFIG_MALI_DT -+static struct platform_device mali_gpu_device = { -+ .name = MALI_GPU_NAME_UTGARD, -+ .id = 0, -+ .dev.release = mali_platform_device_release, -+ .dev.dma_mask = &mali_gpu_device.dev.coherent_dma_mask, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), ++ nr_cg = kbdev->gpu_props.num_core_groups; ++ dump_size = nr_cg * NR_CNT_BLOCKS_PER_GROUP * ++ NR_CNT_PER_BLOCK * ++ NR_BYTES_PER_CNT; ++ } else ++#endif /* CONFIG_MALI_NO_MALI */ ++ { ++ /* assume v5 for now */ ++ base_gpu_props *props = &kbdev->gpu_props.props; ++ u32 nr_l2 = props->l2_props.num_l2_slices; ++ u64 core_mask = props->coherency_info.group[0].core_mask; ++ u32 nr_blocks = fls64(core_mask); + -+ .dev.platform_data = &mali_gpu_data, -+}; ++ /* JM and tiler counter blocks are always present */ ++ dump_size = (2 + nr_l2 + nr_blocks) * ++ NR_CNT_PER_BLOCK * ++ NR_BYTES_PER_CNT; ++ } ++ return dump_size; ++} ++KBASE_EXPORT_TEST_API(kbase_vinstr_dump_size); + -+int mali_platform_device_register(void) ++static size_t kbasep_vinstr_dump_size_ctx( ++ struct kbase_vinstr_context *vinstr_ctx) +{ -+ int err = -1; -+ int num_pp_cores = 0; -+#if defined(CONFIG_ARCH_REALVIEW) -+ u32 m400_gp_version; -+#endif -+ -+ MALI_DEBUG_PRINT(4, ("mali_platform_device_register() called\n")); ++ return kbase_vinstr_dump_size(vinstr_ctx->kctx->kbdev); ++} + -+ /* Detect present Mali GPU and connect the correct resources to the device */ -+#if defined(CONFIG_ARCH_VEXPRESS) ++static int kbasep_vinstr_map_kernel_dump_buffer( ++ struct kbase_vinstr_context *vinstr_ctx) ++{ ++ struct kbase_va_region *reg; ++ struct kbase_context *kctx = vinstr_ctx->kctx; ++ u64 flags, nr_pages; + -+#if defined(CONFIG_ARM64) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) -+ mali_gpu_device.dev.archdata.dma_ops = &dummy_dma_ops; -+#else -+ mali_gpu_device.dev.archdata.dma_ops = dma_ops; -+#endif -+ if ((mali_read_phys(0x6F000000) & 0x00600450) == 0x00600450) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-450 MP6 device\n")); -+ num_pp_cores = 6; -+ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m450_mp6); -+ mali_gpu_device.resource = mali_gpu_resources_m450_mp6; -+ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00400430) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP4 device\n")); -+ num_pp_cores = 4; -+ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m470_mp4); -+ mali_gpu_device.resource = mali_gpu_resources_m470_mp4; -+ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00300430) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP3 device\n")); -+ num_pp_cores = 3; -+ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m470_mp3); -+ mali_gpu_device.resource = mali_gpu_resources_m470_mp3; -+ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00200430) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP2 device\n")); -+ num_pp_cores = 2; -+ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m470_mp2); -+ mali_gpu_device.resource = mali_gpu_resources_m470_mp2; -+ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00100430) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP1 device\n")); -+ num_pp_cores = 1; -+ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m470_mp1); -+ mali_gpu_device.resource = mali_gpu_resources_m470_mp1; -+ } -+#else -+ if (mali_read_phys(0xFC000000) == 0x00000450) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-450 MP8 device\n")); -+ num_pp_cores = 8; -+ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m450_mp8); -+ mali_gpu_device.resource = mali_gpu_resources_m450_mp8; -+ } else if (mali_read_phys(0xFC000000) == 0x40600450) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-450 MP6 device\n")); -+ num_pp_cores = 6; -+ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m450_mp6); -+ mali_gpu_device.resource = mali_gpu_resources_m450_mp6; -+ } else if (mali_read_phys(0xFC000000) == 0x40400450) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-450 MP4 device\n")); -+ num_pp_cores = 4; -+ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m450_mp4); -+ mali_gpu_device.resource = mali_gpu_resources_m450_mp4; -+ } else if (mali_read_phys(0xFC000000) == 0xFFFFFFFF) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP4 device\n")); -+ num_pp_cores = 4; -+ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m470_mp4); -+ mali_gpu_device.resource = mali_gpu_resources_m470_mp4; -+ } -+#endif /* CONFIG_ARM64 */ ++ flags = BASE_MEM_PROT_CPU_RD | BASE_MEM_PROT_GPU_WR; ++ vinstr_ctx->dump_size = kbasep_vinstr_dump_size_ctx(vinstr_ctx); ++ nr_pages = PFN_UP(vinstr_ctx->dump_size); + -+#elif defined(CONFIG_ARCH_REALVIEW) ++ reg = kbase_mem_alloc(kctx, nr_pages, nr_pages, 0, &flags, ++ &vinstr_ctx->gpu_va); ++ if (!reg) ++ return -ENOMEM; + -+ m400_gp_version = mali_read_phys(0xC000006C); -+ if ((m400_gp_version & 0xFFFF0000) == 0x0C070000) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-300 device\n")); -+ num_pp_cores = 1; -+ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m300); -+ mali_gpu_device.resource = mali_gpu_resources_m300; -+ mali_write_phys(0xC0010020, 0xA); /* Enable direct memory mapping for FPGA */ -+ } else if ((m400_gp_version & 0xFFFF0000) == 0x0B070000) { -+ u32 fpga_fw_version = mali_read_phys(0xC0010000); -+ if (fpga_fw_version == 0x130C008F || fpga_fw_version == 0x110C008F) { -+ /* Mali-400 MP1 r1p0 or r1p1 */ -+ MALI_DEBUG_PRINT(4, ("Registering Mali-400 MP1 device\n")); -+ num_pp_cores = 1; -+ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m400_mp1); -+ mali_gpu_device.resource = mali_gpu_resources_m400_mp1; -+ mali_write_phys(0xC0010020, 0xA); /* Enable direct memory mapping for FPGA */ -+ } else if (fpga_fw_version == 0x130C000F) { -+ /* Mali-400 MP2 r1p1 */ -+ MALI_DEBUG_PRINT(4, ("Registering Mali-400 MP2 device\n")); -+ num_pp_cores = 2; -+ mali_gpu_device.num_resources = ARRAY_SIZE(mali_gpu_resources_m400_mp2); -+ mali_gpu_device.resource = mali_gpu_resources_m400_mp2; -+ mali_write_phys(0xC0010020, 0xA); /* Enable direct memory mapping for FPGA */ -+ } ++ vinstr_ctx->cpu_va = kbase_vmap( ++ kctx, ++ vinstr_ctx->gpu_va, ++ vinstr_ctx->dump_size, ++ &vinstr_ctx->vmap); ++ if (!vinstr_ctx->cpu_va) { ++ kbase_mem_free(kctx, vinstr_ctx->gpu_va); ++ return -ENOMEM; + } + -+#endif -+ /* Register the platform device */ -+ err = platform_device_register(&mali_gpu_device); -+ if (0 == err) { -+#ifdef CONFIG_PM_RUNTIME -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) -+ pm_runtime_set_autosuspend_delay(&(mali_gpu_device.dev), 1000); -+ pm_runtime_use_autosuspend(&(mali_gpu_device.dev)); -+#endif -+ pm_runtime_enable(&(mali_gpu_device.dev)); -+#endif -+ MALI_DEBUG_ASSERT(0 < num_pp_cores); -+ mali_core_scaling_init(num_pp_cores); ++ return 0; ++} + -+ return 0; -+ } ++static void kbasep_vinstr_unmap_kernel_dump_buffer( ++ struct kbase_vinstr_context *vinstr_ctx) ++{ ++ struct kbase_context *kctx = vinstr_ctx->kctx; + -+ return err; ++ kbase_vunmap(kctx, &vinstr_ctx->vmap); ++ kbase_mem_free(kctx, vinstr_ctx->gpu_va); +} + -+void mali_platform_device_unregister(void) ++/** ++ * kbasep_vinstr_create_kctx - create kernel context for vinstr ++ * @vinstr_ctx: vinstr context ++ * Return: zero on success ++ */ ++static int kbasep_vinstr_create_kctx(struct kbase_vinstr_context *vinstr_ctx) +{ -+ MALI_DEBUG_PRINT(4, ("mali_platform_device_unregister() called\n")); ++ struct kbase_device *kbdev = vinstr_ctx->kbdev; ++ struct kbasep_kctx_list_element *element; ++ unsigned long flags; ++ bool enable_backend = false; ++ int err; + -+ mali_core_scaling_term(); -+#ifdef CONFIG_PM_RUNTIME -+ pm_runtime_disable(&(mali_gpu_device.dev)); -+#endif -+ platform_device_unregister(&mali_gpu_device); ++ vinstr_ctx->kctx = kbase_create_context(vinstr_ctx->kbdev, true); ++ if (!vinstr_ctx->kctx) ++ return -ENOMEM; + -+ platform_device_put(&mali_gpu_device); ++ /* Map the master kernel dump buffer. The HW dumps the counters ++ * into this memory region. */ ++ err = kbasep_vinstr_map_kernel_dump_buffer(vinstr_ctx); ++ if (err) { ++ kbase_destroy_context(vinstr_ctx->kctx); ++ vinstr_ctx->kctx = NULL; ++ return err; ++ } + -+#if defined(CONFIG_ARCH_REALVIEW) -+ mali_write_phys(0xC0010020, 0x9); /* Restore default (legacy) memory mapping */ -+#endif -+} ++ /* Add kernel context to list of contexts associated with device. */ ++ element = kzalloc(sizeof(*element), GFP_KERNEL); ++ if (element) { ++ element->kctx = vinstr_ctx->kctx; ++ mutex_lock(&kbdev->kctx_list_lock); ++ list_add(&element->link, &kbdev->kctx_list); + -+static void mali_platform_device_release(struct device *device) -+{ -+ MALI_DEBUG_PRINT(4, ("mali_platform_device_release() called\n")); -+} ++ /* Inform timeline client about new context. ++ * Do this while holding the lock to avoid tracepoint ++ * being created in both body and summary stream. */ ++ KBASE_TLSTREAM_TL_NEW_CTX( ++ vinstr_ctx->kctx, ++ (u32)(vinstr_ctx->kctx->id), ++ (u32)(vinstr_ctx->kctx->tgid)); + -+#else /* CONFIG_MALI_DT */ -+int mali_platform_device_init(struct platform_device *device) -+{ -+ int num_pp_cores = 0; -+ int err = -1; -+#if defined(CONFIG_ARCH_REALVIEW) -+ u32 m400_gp_version; -+#endif ++ mutex_unlock(&kbdev->kctx_list_lock); ++ } else { ++ /* Don't treat this as a fail - just warn about it. */ ++ dev_warn(kbdev->dev, ++ "couldn't add kctx to kctx_list\n"); ++ } + -+ /* Detect present Mali GPU and connect the correct resources to the device */ -+#if defined(CONFIG_ARCH_VEXPRESS) ++ /* Don't enable hardware counters if vinstr is suspended. ++ * Note that vinstr resume code is run under vinstr context lock, ++ * lower layer will be enabled as needed on resume. */ ++ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); ++ if (VINSTR_IDLE == vinstr_ctx->state) ++ enable_backend = true; ++ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); ++ if (enable_backend) ++ err = enable_hwcnt(vinstr_ctx); + -+#if defined(CONFIG_ARM64) -+ if ((mali_read_phys(0x6F000000) & 0x00600450) == 0x00600450) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-450 MP6 device\n")); -+ num_pp_cores = 6; -+ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00400430) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP4 device\n")); -+ num_pp_cores = 4; -+ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00300430) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP3 device\n")); -+ num_pp_cores = 3; -+ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00200430) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP2 device\n")); -+ num_pp_cores = 2; -+ } else if ((mali_read_phys(0x6F000000) & 0x00F00430) == 0x00100430) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP1 device\n")); -+ num_pp_cores = 1; -+ } -+#else -+ if (mali_read_phys(0xFC000000) == 0x00000450) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-450 MP8 device\n")); -+ num_pp_cores = 8; -+ } else if (mali_read_phys(0xFC000000) == 0x40400450) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-450 MP4 device\n")); -+ num_pp_cores = 4; -+ } else if (mali_read_phys(0xFC000000) == 0xFFFFFFFF) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-470 MP4 device\n")); -+ num_pp_cores = 4; ++ if (err) { ++ kbasep_vinstr_unmap_kernel_dump_buffer(vinstr_ctx); ++ kbase_destroy_context(vinstr_ctx->kctx); ++ if (element) { ++ mutex_lock(&kbdev->kctx_list_lock); ++ list_del(&element->link); ++ kfree(element); ++ mutex_unlock(&kbdev->kctx_list_lock); ++ } ++ KBASE_TLSTREAM_TL_DEL_CTX(vinstr_ctx->kctx); ++ vinstr_ctx->kctx = NULL; ++ return err; + } -+#endif -+ -+#elif defined(CONFIG_ARCH_REALVIEW) + -+ m400_gp_version = mali_read_phys(0xC000006C); -+ if ((m400_gp_version & 0xFFFF0000) == 0x0C070000) { -+ MALI_DEBUG_PRINT(4, ("Registering Mali-300 device\n")); -+ num_pp_cores = 1; -+ mali_write_phys(0xC0010020, 0xA); /* Enable direct memory mapping for FPGA */ -+ } else if ((m400_gp_version & 0xFFFF0000) == 0x0B070000) { -+ u32 fpga_fw_version = mali_read_phys(0xC0010000); -+ if (fpga_fw_version == 0x130C008F || fpga_fw_version == 0x110C008F) { -+ /* Mali-400 MP1 r1p0 or r1p1 */ -+ MALI_DEBUG_PRINT(4, ("Registering Mali-400 MP1 device\n")); -+ num_pp_cores = 1; -+ mali_write_phys(0xC0010020, 0xA); /* Enable direct memory mapping for FPGA */ -+ } else if (fpga_fw_version == 0x130C000F) { -+ /* Mali-400 MP2 r1p1 */ -+ MALI_DEBUG_PRINT(4, ("Registering Mali-400 MP2 device\n")); -+ num_pp_cores = 2; -+ mali_write_phys(0xC0010020, 0xA); /* Enable direct memory mapping for FPGA */ ++ vinstr_ctx->thread = kthread_run( ++ kbasep_vinstr_service_task, ++ vinstr_ctx, ++ "mali_vinstr_service"); ++ if (!vinstr_ctx->thread) { ++ disable_hwcnt(vinstr_ctx); ++ kbasep_vinstr_unmap_kernel_dump_buffer(vinstr_ctx); ++ kbase_destroy_context(vinstr_ctx->kctx); ++ if (element) { ++ mutex_lock(&kbdev->kctx_list_lock); ++ list_del(&element->link); ++ kfree(element); ++ mutex_unlock(&kbdev->kctx_list_lock); + } ++ KBASE_TLSTREAM_TL_DEL_CTX(vinstr_ctx->kctx); ++ vinstr_ctx->kctx = NULL; ++ return -EFAULT; + } -+#endif + -+ /* After kernel 3.15 device tree will default set dev -+ * related parameters in of_platform_device_create_pdata. -+ * But kernel changes from version to version, -+ * For example 3.10 didn't include device->dev.dma_mask parameter setting, -+ * if we didn't include here will cause dma_mapping error, -+ * but in kernel 3.15 it include device->dev.dma_mask parameter setting, -+ * so it's better to set must need paramter by DDK itself. -+ */ -+ if (!device->dev.dma_mask) -+ device->dev.dma_mask = &device->dev.coherent_dma_mask; -+ device->dev.archdata.dma_ops = dma_ops; ++ return 0; ++} + -+ err = platform_device_add_data(device, &mali_gpu_data, sizeof(mali_gpu_data)); ++/** ++ * kbasep_vinstr_destroy_kctx - destroy vinstr's kernel context ++ * @vinstr_ctx: vinstr context ++ */ ++static void kbasep_vinstr_destroy_kctx(struct kbase_vinstr_context *vinstr_ctx) ++{ ++ struct kbase_device *kbdev = vinstr_ctx->kbdev; ++ struct kbasep_kctx_list_element *element; ++ struct kbasep_kctx_list_element *tmp; ++ bool found = false; + -+ if (0 == err) { -+#ifdef CONFIG_PM_RUNTIME -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) -+ pm_runtime_set_autosuspend_delay(&(device->dev), 1000); -+ pm_runtime_use_autosuspend(&(device->dev)); -+#endif -+ pm_runtime_enable(&(device->dev)); -+#endif -+ MALI_DEBUG_ASSERT(0 < num_pp_cores); -+ mali_core_scaling_init(num_pp_cores); -+ } ++ /* Release hw counters dumping resources. */ ++ vinstr_ctx->thread = NULL; ++ disable_hwcnt(vinstr_ctx); ++ kbasep_vinstr_unmap_kernel_dump_buffer(vinstr_ctx); ++ kbase_destroy_context(vinstr_ctx->kctx); + -+#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) -+ /* Some Socs didn't support the devfreq thermal for mali */ -+ if (of_machine_is_compatible("rockchip,rk3036")) -+ return 0; ++ /* Remove kernel context from the device's contexts list. */ ++ mutex_lock(&kbdev->kctx_list_lock); ++ list_for_each_entry_safe(element, tmp, &kbdev->kctx_list, link) { ++ if (element->kctx == vinstr_ctx->kctx) { ++ list_del(&element->link); ++ kfree(element); ++ found = true; ++ } ++ } ++ mutex_unlock(&kbdev->kctx_list_lock); + -+ /* Get thermal zone */ -+ gpu_tz = thermal_zone_get_zone_by_name("soc_thermal"); -+ if (IS_ERR(gpu_tz)) { -+ MALI_DEBUG_PRINT(2, ("Error getting gpu thermal zone (%ld), not yet ready?\n", -+ PTR_ERR(gpu_tz))); -+ gpu_tz = NULL; ++ if (!found) ++ dev_warn(kbdev->dev, "kctx not in kctx_list\n"); + -+ err = -EPROBE_DEFER; -+ } -+#endif ++ /* Inform timeline client about context destruction. */ ++ KBASE_TLSTREAM_TL_DEL_CTX(vinstr_ctx->kctx); + -+ return err; ++ vinstr_ctx->kctx = NULL; +} + -+int mali_platform_device_deinit(struct platform_device *device) ++/** ++ * kbasep_vinstr_attach_client - Attach a client to the vinstr core ++ * @vinstr_ctx: vinstr context ++ * @buffer_count: requested number of dump buffers ++ * @bitmap: bitmaps describing which counters should be enabled ++ * @argp: pointer where notification descriptor shall be stored ++ * @kernel_buffer: pointer to kernel side buffer ++ * ++ * Return: vinstr opaque client handle or NULL on failure ++ */ ++static struct kbase_vinstr_client *kbasep_vinstr_attach_client( ++ struct kbase_vinstr_context *vinstr_ctx, u32 buffer_count, ++ u32 bitmap[4], void *argp, void *kernel_buffer) +{ -+ MALI_IGNORE(device); ++ struct task_struct *thread = NULL; ++ struct kbase_vinstr_client *cli; + -+ MALI_DEBUG_PRINT(4, ("mali_platform_device_deinit() called\n")); ++ KBASE_DEBUG_ASSERT(vinstr_ctx); + -+ mali_core_scaling_term(); -+#ifdef CONFIG_PM_RUNTIME -+ pm_runtime_disable(&(device->dev)); -+#endif ++ if (buffer_count > MAX_BUFFER_COUNT ++ || (buffer_count & (buffer_count - 1))) ++ return NULL; + -+#if defined(CONFIG_ARCH_REALVIEW) -+ mali_write_phys(0xC0010020, 0x9); /* Restore default (legacy) memory mapping */ -+#endif ++ cli = kzalloc(sizeof(*cli), GFP_KERNEL); ++ if (!cli) ++ return NULL; + -+ return 0; -+} ++ cli->vinstr_ctx = vinstr_ctx; ++ cli->buffer_count = buffer_count; ++ cli->event_mask = ++ (1 << BASE_HWCNT_READER_EVENT_MANUAL) | ++ (1 << BASE_HWCNT_READER_EVENT_PERIODIC); ++ cli->pending = true; + -+#endif /* CONFIG_MALI_DT */ ++ hwcnt_bitmap_set(cli->bitmap, bitmap); + -+static u32 mali_read_phys(u32 phys_addr) -+{ -+ u32 phys_addr_page = phys_addr & 0xFFFFE000; -+ u32 phys_offset = phys_addr & 0x00001FFF; -+ u32 map_size = phys_offset + sizeof(u32); -+ u32 ret = 0xDEADBEEF; -+ void *mem_mapped = ioremap(phys_addr_page, map_size); -+ if (NULL != mem_mapped) { -+ ret = (u32)ioread32(((u8 *)mem_mapped) + phys_offset); -+ iounmap(mem_mapped); -+ } ++ mutex_lock(&vinstr_ctx->lock); + -+ return ret; -+} ++ hwcnt_bitmap_union(vinstr_ctx->bitmap, cli->bitmap); ++ vinstr_ctx->reprogram = true; + -+#if defined(CONFIG_ARCH_REALVIEW) -+static void mali_write_phys(u32 phys_addr, u32 value) -+{ -+ u32 phys_addr_page = phys_addr & 0xFFFFE000; -+ u32 phys_offset = phys_addr & 0x00001FFF; -+ u32 map_size = phys_offset + sizeof(u32); -+ void *mem_mapped = ioremap(phys_addr_page, map_size); -+ if (NULL != mem_mapped) { -+ iowrite32(value, ((u8 *)mem_mapped) + phys_offset); -+ iounmap(mem_mapped); ++ /* If this is the first client, create the vinstr kbase ++ * context. This context is permanently resident until the ++ * last client exits. */ ++ if (!vinstr_ctx->nclients) { ++ hwcnt_bitmap_set(vinstr_ctx->bitmap, cli->bitmap); ++ if (kbasep_vinstr_create_kctx(vinstr_ctx) < 0) ++ goto error; ++ ++ vinstr_ctx->reprogram = false; ++ cli->pending = false; + } -+} -+#endif + -+static int param_set_core_scaling(const char *val, const struct kernel_param *kp) -+{ -+ int ret = param_set_int(val, kp); ++ /* The GPU resets the counter block every time there is a request ++ * to dump it. We need a per client kernel buffer for accumulating ++ * the counters. */ ++ cli->dump_size = kbasep_vinstr_dump_size_ctx(vinstr_ctx); ++ cli->accum_buffer = kzalloc(cli->dump_size, GFP_KERNEL); ++ if (!cli->accum_buffer) ++ goto error; + -+ if (1 == mali_core_scaling_enable) { -+ mali_core_scaling_sync(mali_executor_get_num_cores_enabled()); -+ } -+ return ret; -+} ++ /* Prepare buffers. */ ++ if (cli->buffer_count) { ++ int *fd = (int *)argp; ++ size_t tmp; + -+static struct kernel_param_ops param_ops_core_scaling = { -+ .set = param_set_core_scaling, -+ .get = param_get_int, -+}; ++ /* Allocate area for buffers metadata storage. */ ++ tmp = sizeof(struct kbase_hwcnt_reader_metadata) * ++ cli->buffer_count; ++ cli->dump_buffers_meta = kmalloc(tmp, GFP_KERNEL); ++ if (!cli->dump_buffers_meta) ++ goto error; + -+module_param_cb(mali_core_scaling_enable, ¶m_ops_core_scaling, &mali_core_scaling_enable, 0644); -+MODULE_PARM_DESC(mali_core_scaling_enable, "1 means to enable core scaling policy, 0 means to disable core scaling policy"); ++ /* Allocate required number of dumping buffers. */ ++ cli->dump_buffers = (char *)__get_free_pages( ++ GFP_KERNEL | __GFP_ZERO, ++ get_order(cli->dump_size * cli->buffer_count)); ++ if (!cli->dump_buffers) ++ goto error; + -+void mali_gpu_utilization_callback(struct mali_gpu_utilization_data *data) -+{ -+ if (1 == mali_core_scaling_enable) { -+ mali_core_scaling_update(data); ++ /* Create descriptor for user-kernel data exchange. */ ++ *fd = anon_inode_getfd( ++ "[mali_vinstr_desc]", ++ &vinstr_client_fops, ++ cli, ++ O_RDONLY | O_CLOEXEC); ++ if (0 > *fd) ++ goto error; ++ } else if (kernel_buffer) { ++ cli->kernel_buffer = kernel_buffer; ++ } else { ++ cli->legacy_buffer = (void __user *)argp; + } -+} -diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c -new file mode 100755 -index 000000000000..7a2fc8107b4f ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c -@@ -0,0 +1,122 @@ -+/* -+ * Copyright (C) 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+/** -+ * @file arm_core_scaling.c -+ * Example core scaling policy. -+ */ + -+#include "arm_core_scaling.h" ++ atomic_set(&cli->read_idx, 0); ++ atomic_set(&cli->meta_idx, 0); ++ atomic_set(&cli->write_idx, 0); ++ init_waitqueue_head(&cli->waitq); + -+#include -+#include "mali_kernel_common.h" ++ vinstr_ctx->nclients++; ++ list_add(&cli->list, &vinstr_ctx->idle_clients); + -+#include ++ mutex_unlock(&vinstr_ctx->lock); + -+static int num_cores_total; -+static int num_cores_enabled; ++ return cli; + -+static struct work_struct wq_work; ++error: ++ kfree(cli->dump_buffers_meta); ++ if (cli->dump_buffers) ++ free_pages( ++ (unsigned long)cli->dump_buffers, ++ get_order(cli->dump_size * cli->buffer_count)); ++ kfree(cli->accum_buffer); ++ if (!vinstr_ctx->nclients && vinstr_ctx->kctx) { ++ thread = vinstr_ctx->thread; ++ kbasep_vinstr_destroy_kctx(vinstr_ctx); ++ } ++ kfree(cli); + -+static void set_num_cores(struct work_struct *work) -+{ -+ int err = mali_perf_set_num_pp_cores(num_cores_enabled); -+ MALI_DEBUG_ASSERT(0 == err); -+ MALI_IGNORE(err); -+} ++ mutex_unlock(&vinstr_ctx->lock); + -+static void enable_one_core(void) -+{ -+ if (num_cores_enabled < num_cores_total) { -+ ++num_cores_enabled; -+ schedule_work(&wq_work); -+ MALI_DEBUG_PRINT(3, ("Core scaling: Enabling one more core\n")); -+ } ++ /* Thread must be stopped after lock is released. */ ++ if (thread) ++ kthread_stop(thread); + -+ MALI_DEBUG_ASSERT(1 <= num_cores_enabled); -+ MALI_DEBUG_ASSERT(num_cores_total >= num_cores_enabled); ++ return NULL; +} + -+static void disable_one_core(void) ++void kbase_vinstr_detach_client(struct kbase_vinstr_client *cli) +{ -+ if (1 < num_cores_enabled) { -+ --num_cores_enabled; -+ schedule_work(&wq_work); -+ MALI_DEBUG_PRINT(3, ("Core scaling: Disabling one core\n")); ++ struct kbase_vinstr_context *vinstr_ctx; ++ struct kbase_vinstr_client *iter, *tmp; ++ struct task_struct *thread = NULL; ++ u32 zerobitmap[4] = { 0 }; ++ int cli_found = 0; ++ ++ KBASE_DEBUG_ASSERT(cli); ++ vinstr_ctx = cli->vinstr_ctx; ++ KBASE_DEBUG_ASSERT(vinstr_ctx); ++ ++ mutex_lock(&vinstr_ctx->lock); ++ ++ list_for_each_entry_safe(iter, tmp, &vinstr_ctx->idle_clients, list) { ++ if (iter == cli) { ++ vinstr_ctx->reprogram = true; ++ cli_found = 1; ++ list_del(&iter->list); ++ break; ++ } ++ } ++ if (!cli_found) { ++ list_for_each_entry_safe( ++ iter, tmp, &vinstr_ctx->waiting_clients, list) { ++ if (iter == cli) { ++ vinstr_ctx->reprogram = true; ++ cli_found = 1; ++ list_del(&iter->list); ++ break; ++ } ++ } + } ++ KBASE_DEBUG_ASSERT(cli_found); + -+ MALI_DEBUG_ASSERT(1 <= num_cores_enabled); -+ MALI_DEBUG_ASSERT(num_cores_total >= num_cores_enabled); -+} ++ kfree(cli->dump_buffers_meta); ++ free_pages( ++ (unsigned long)cli->dump_buffers, ++ get_order(cli->dump_size * cli->buffer_count)); ++ kfree(cli->accum_buffer); ++ kfree(cli); + -+static void enable_max_num_cores(void) -+{ -+ if (num_cores_enabled < num_cores_total) { -+ num_cores_enabled = num_cores_total; -+ schedule_work(&wq_work); -+ MALI_DEBUG_PRINT(3, ("Core scaling: Enabling maximum number of cores\n")); ++ vinstr_ctx->nclients--; ++ if (!vinstr_ctx->nclients) { ++ thread = vinstr_ctx->thread; ++ kbasep_vinstr_destroy_kctx(vinstr_ctx); + } + -+ MALI_DEBUG_ASSERT(num_cores_total == num_cores_enabled); ++ /* Rebuild context bitmap now that the client has detached */ ++ hwcnt_bitmap_set(vinstr_ctx->bitmap, zerobitmap); ++ list_for_each_entry(iter, &vinstr_ctx->idle_clients, list) ++ hwcnt_bitmap_union(vinstr_ctx->bitmap, iter->bitmap); ++ list_for_each_entry(iter, &vinstr_ctx->waiting_clients, list) ++ hwcnt_bitmap_union(vinstr_ctx->bitmap, iter->bitmap); ++ ++ mutex_unlock(&vinstr_ctx->lock); ++ ++ /* Thread must be stopped after lock is released. */ ++ if (thread) ++ kthread_stop(thread); +} ++KBASE_EXPORT_TEST_API(kbase_vinstr_detach_client); + -+void mali_core_scaling_init(int num_pp_cores) ++/* Accumulate counters in the dump buffer */ ++static void accum_dump_buffer(void *dst, void *src, size_t dump_size) +{ -+ INIT_WORK(&wq_work, set_num_cores); -+ -+ num_cores_total = num_pp_cores; -+ num_cores_enabled = num_pp_cores; ++ size_t block_size = NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT; ++ u32 *d = dst; ++ u32 *s = src; ++ size_t i, j; + -+ /* NOTE: Mali is not fully initialized at this point. */ ++ for (i = 0; i < dump_size; i += block_size) { ++ /* skip over the header block */ ++ d += NR_BYTES_PER_HDR / sizeof(u32); ++ s += NR_BYTES_PER_HDR / sizeof(u32); ++ for (j = 0; j < (block_size - NR_BYTES_PER_HDR) / sizeof(u32); j++) { ++ /* saturate result if addition would result in wraparound */ ++ if (U32_MAX - *d < *s) ++ *d = U32_MAX; ++ else ++ *d += *s; ++ d++; ++ s++; ++ } ++ } +} + -+void mali_core_scaling_sync(int num_cores) ++/* This is the Midgard v4 patch function. It copies the headers for each ++ * of the defined blocks from the master kernel buffer and then patches up ++ * the performance counter enable mask for each of the blocks to exclude ++ * counters that were not requested by the client. */ ++static void patch_dump_buffer_hdr_v4( ++ struct kbase_vinstr_context *vinstr_ctx, ++ struct kbase_vinstr_client *cli) +{ -+ num_cores_enabled = num_cores; ++ u32 *mask; ++ u8 *dst = cli->accum_buffer; ++ u8 *src = vinstr_ctx->cpu_va; ++ u32 nr_cg = vinstr_ctx->kctx->kbdev->gpu_props.num_core_groups; ++ size_t i, group_size, group; ++ enum { ++ SC0_BASE = 0 * NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT, ++ SC1_BASE = 1 * NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT, ++ SC2_BASE = 2 * NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT, ++ SC3_BASE = 3 * NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT, ++ TILER_BASE = 4 * NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT, ++ MMU_L2_BASE = 5 * NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT, ++ JM_BASE = 7 * NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT ++ }; ++ ++ group_size = NR_CNT_BLOCKS_PER_GROUP * ++ NR_CNT_PER_BLOCK * ++ NR_BYTES_PER_CNT; ++ for (i = 0; i < nr_cg; i++) { ++ group = i * group_size; ++ /* copy shader core headers */ ++ memcpy(&dst[group + SC0_BASE], &src[group + SC0_BASE], ++ NR_BYTES_PER_HDR); ++ memcpy(&dst[group + SC1_BASE], &src[group + SC1_BASE], ++ NR_BYTES_PER_HDR); ++ memcpy(&dst[group + SC2_BASE], &src[group + SC2_BASE], ++ NR_BYTES_PER_HDR); ++ memcpy(&dst[group + SC3_BASE], &src[group + SC3_BASE], ++ NR_BYTES_PER_HDR); ++ ++ /* copy tiler header */ ++ memcpy(&dst[group + TILER_BASE], &src[group + TILER_BASE], ++ NR_BYTES_PER_HDR); ++ ++ /* copy mmu header */ ++ memcpy(&dst[group + MMU_L2_BASE], &src[group + MMU_L2_BASE], ++ NR_BYTES_PER_HDR); ++ ++ /* copy job manager header */ ++ memcpy(&dst[group + JM_BASE], &src[group + JM_BASE], ++ NR_BYTES_PER_HDR); ++ ++ /* patch the shader core enable mask */ ++ mask = (u32 *)&dst[group + SC0_BASE + PRFCNT_EN_MASK_OFFSET]; ++ *mask &= cli->bitmap[SHADER_HWCNT_BM]; ++ mask = (u32 *)&dst[group + SC1_BASE + PRFCNT_EN_MASK_OFFSET]; ++ *mask &= cli->bitmap[SHADER_HWCNT_BM]; ++ mask = (u32 *)&dst[group + SC2_BASE + PRFCNT_EN_MASK_OFFSET]; ++ *mask &= cli->bitmap[SHADER_HWCNT_BM]; ++ mask = (u32 *)&dst[group + SC3_BASE + PRFCNT_EN_MASK_OFFSET]; ++ *mask &= cli->bitmap[SHADER_HWCNT_BM]; ++ ++ /* patch the tiler core enable mask */ ++ mask = (u32 *)&dst[group + TILER_BASE + PRFCNT_EN_MASK_OFFSET]; ++ *mask &= cli->bitmap[TILER_HWCNT_BM]; ++ ++ /* patch the mmu core enable mask */ ++ mask = (u32 *)&dst[group + MMU_L2_BASE + PRFCNT_EN_MASK_OFFSET]; ++ *mask &= cli->bitmap[MMU_L2_HWCNT_BM]; ++ ++ /* patch the job manager enable mask */ ++ mask = (u32 *)&dst[group + JM_BASE + PRFCNT_EN_MASK_OFFSET]; ++ *mask &= cli->bitmap[JM_HWCNT_BM]; ++ } +} + -+void mali_core_scaling_term(void) ++/* This is the Midgard v5 patch function. It copies the headers for each ++ * of the defined blocks from the master kernel buffer and then patches up ++ * the performance counter enable mask for each of the blocks to exclude ++ * counters that were not requested by the client. */ ++static void patch_dump_buffer_hdr_v5( ++ struct kbase_vinstr_context *vinstr_ctx, ++ struct kbase_vinstr_client *cli) +{ -+ flush_scheduled_work(); -+} ++ struct kbase_device *kbdev = vinstr_ctx->kctx->kbdev; ++ u32 i, nr_l2; ++ u64 core_mask; ++ u32 *mask; ++ u8 *dst = cli->accum_buffer; ++ u8 *src = vinstr_ctx->cpu_va; ++ size_t block_size = NR_CNT_PER_BLOCK * NR_BYTES_PER_CNT; + -+#define PERCENT_OF(percent, max) ((int) ((percent)*(max)/100.0 + 0.5)) ++ /* copy and patch job manager header */ ++ memcpy(dst, src, NR_BYTES_PER_HDR); ++ mask = (u32 *)&dst[PRFCNT_EN_MASK_OFFSET]; ++ *mask &= cli->bitmap[JM_HWCNT_BM]; ++ dst += block_size; ++ src += block_size; + -+void mali_core_scaling_update(struct mali_gpu_utilization_data *data) -+{ -+ /* -+ * This function implements a very trivial PP core scaling algorithm. -+ * -+ * It is _NOT_ of production quality. -+ * The only intention behind this algorithm is to exercise and test the -+ * core scaling functionality of the driver. -+ * It is _NOT_ tuned for neither power saving nor performance! -+ * -+ * Other metrics than PP utilization need to be considered as well -+ * in order to make a good core scaling algorithm. -+ */ ++ /* copy and patch tiler header */ ++ memcpy(dst, src, NR_BYTES_PER_HDR); ++ mask = (u32 *)&dst[PRFCNT_EN_MASK_OFFSET]; ++ *mask &= cli->bitmap[TILER_HWCNT_BM]; ++ dst += block_size; ++ src += block_size; + -+ MALI_DEBUG_PRINT(3, ("Utilization: (%3d, %3d, %3d), cores enabled: %d/%d\n", data->utilization_gpu, data->utilization_gp, data->utilization_pp, num_cores_enabled, num_cores_total)); ++ /* copy and patch MMU/L2C headers */ ++ nr_l2 = kbdev->gpu_props.props.l2_props.num_l2_slices; ++ for (i = 0; i < nr_l2; i++) { ++ memcpy(dst, src, NR_BYTES_PER_HDR); ++ mask = (u32 *)&dst[PRFCNT_EN_MASK_OFFSET]; ++ *mask &= cli->bitmap[MMU_L2_HWCNT_BM]; ++ dst += block_size; ++ src += block_size; ++ } + -+ /* NOTE: this function is normally called directly from the utilization callback which is in -+ * timer context. */ ++ /* copy and patch shader core headers */ ++ core_mask = kbdev->gpu_props.props.coherency_info.group[0].core_mask; ++ while (0ull != core_mask) { ++ memcpy(dst, src, NR_BYTES_PER_HDR); ++ if (0ull != (core_mask & 1ull)) { ++ /* if block is not reserved update header */ ++ mask = (u32 *)&dst[PRFCNT_EN_MASK_OFFSET]; ++ *mask &= cli->bitmap[SHADER_HWCNT_BM]; ++ } ++ dst += block_size; ++ src += block_size; + -+ if (PERCENT_OF(90, 256) < data->utilization_pp) { -+ enable_max_num_cores(); -+ } else if (PERCENT_OF(50, 256) < data->utilization_pp) { -+ enable_one_core(); -+ } else if (PERCENT_OF(40, 256) < data->utilization_pp) { -+ /* do nothing */ -+ } else if (PERCENT_OF(0, 256) < data->utilization_pp) { -+ disable_one_core(); -+ } else { -+ /* do nothing */ ++ core_mask >>= 1; + } +} -diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h -new file mode 100755 -index 000000000000..8e0101830749 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h -@@ -0,0 +1,44 @@ -+/* -+ * Copyright (C) 2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ + +/** -+ * @file arm_core_scaling.h -+ * Example core scaling policy. ++ * accum_clients - accumulate dumped hw counters for all known clients ++ * @vinstr_ctx: vinstr context + */ ++static void accum_clients(struct kbase_vinstr_context *vinstr_ctx) ++{ ++ struct kbase_vinstr_client *iter; ++ int v4 = 0; + -+#ifndef __ARM_CORE_SCALING_H__ -+#define __ARM_CORE_SCALING_H__ ++#ifndef CONFIG_MALI_NO_MALI ++ v4 = kbase_hw_has_feature(vinstr_ctx->kbdev, BASE_HW_FEATURE_V4); ++#endif + -+struct mali_gpu_utilization_data; ++ list_for_each_entry(iter, &vinstr_ctx->idle_clients, list) { ++ /* Don't bother accumulating clients whose hwcnt requests ++ * have not yet been honoured. */ ++ if (iter->pending) ++ continue; ++ if (v4) ++ patch_dump_buffer_hdr_v4(vinstr_ctx, iter); ++ else ++ patch_dump_buffer_hdr_v5(vinstr_ctx, iter); ++ accum_dump_buffer( ++ iter->accum_buffer, ++ vinstr_ctx->cpu_va, ++ iter->dump_size); ++ } ++ list_for_each_entry(iter, &vinstr_ctx->waiting_clients, list) { ++ /* Don't bother accumulating clients whose hwcnt requests ++ * have not yet been honoured. */ ++ if (iter->pending) ++ continue; ++ if (v4) ++ patch_dump_buffer_hdr_v4(vinstr_ctx, iter); ++ else ++ patch_dump_buffer_hdr_v5(vinstr_ctx, iter); ++ accum_dump_buffer( ++ iter->accum_buffer, ++ vinstr_ctx->cpu_va, ++ iter->dump_size); ++ } ++} ++ ++/*****************************************************************************/ + +/** -+ * Initialize core scaling policy. ++ * kbasep_vinstr_get_timestamp - return timestamp + * -+ * @note The core scaling policy will assume that all PP cores are on initially. ++ * Function returns timestamp value based on raw monotonic timer. Value will ++ * wrap around zero in case of overflow. + * -+ * @param num_pp_cores Total number of PP cores. ++ * Return: timestamp value + */ -+void mali_core_scaling_init(int num_pp_cores); ++static u64 kbasep_vinstr_get_timestamp(void) ++{ ++ struct timespec64 ts; ++ ++ ktime_get_raw_ts64(&ts); ++ return (u64)ts.tv_sec * NSECS_IN_SEC + ts.tv_nsec; ++} + +/** -+ * Terminate core scaling policy. ++ * kbasep_vinstr_add_dump_request - register client's dumping request ++ * @cli: requesting client ++ * @waiting_clients: list of pending dumping requests + */ -+void mali_core_scaling_term(void); ++static void kbasep_vinstr_add_dump_request( ++ struct kbase_vinstr_client *cli, ++ struct list_head *waiting_clients) ++{ ++ struct kbase_vinstr_client *tmp; ++ ++ if (list_empty(waiting_clients)) { ++ list_add(&cli->list, waiting_clients); ++ return; ++ } ++ list_for_each_entry(tmp, waiting_clients, list) { ++ if (tmp->dump_time > cli->dump_time) { ++ list_add_tail(&cli->list, &tmp->list); ++ return; ++ } ++ } ++ list_add_tail(&cli->list, waiting_clients); ++} + +/** -+ * Update core scaling policy with new utilization data. ++ * kbasep_vinstr_collect_and_accumulate - collect hw counters via low level ++ * dump and accumulate them for known ++ * clients ++ * @vinstr_ctx: vinstr context ++ * @timestamp: pointer where collection timestamp will be recorded + * -+ * @param data Utilization data. ++ * Return: zero on success + */ -+void mali_core_scaling_update(struct mali_gpu_utilization_data *data); ++static int kbasep_vinstr_collect_and_accumulate( ++ struct kbase_vinstr_context *vinstr_ctx, u64 *timestamp) ++{ ++ unsigned long flags; ++ int rcode; + -+void mali_core_scaling_sync(int num_cores); ++#ifdef CONFIG_MALI_NO_MALI ++ /* The dummy model needs the CPU mapping. */ ++ gpu_model_set_dummy_prfcnt_base_cpu(vinstr_ctx->cpu_va); ++#endif + -+#endif /* __ARM_CORE_SCALING_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c b/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c -new file mode 100755 -index 000000000000..e4e7ab8b2c2e ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c -@@ -0,0 +1,127 @@ -+/* -+ * Copyright (C) 2010, 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); ++ if (VINSTR_IDLE != vinstr_ctx->state) { ++ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); ++ return -EAGAIN; ++ } else { ++ vinstr_ctx->state = VINSTR_DUMPING; ++ } ++ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); + -+/** -+ * @file juno_opp.c -+ * Example: Set up opp table -+ * Using ARM64 juno specific SCPI_PROTOCOL get frequence inform -+ * Customer need implement your own platform releated logic -+ */ -+#ifdef CONFIG_ARCH_VEXPRESS -+#ifdef CONFIG_MALI_DEVFREQ -+#ifdef CONFIG_ARM64 -+#ifdef CONFIG_ARM_SCPI_PROTOCOL -+#include -+#include -+#include -+#include -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) -+#include -+#else /* Linux >= 3.13 */ -+/* In 3.13 the OPP include header file, types, and functions were all -+ * renamed. Use the old filename for the include, and define the new names to -+ * the old, when an old kernel is detected. -+ */ -+#include -+#define dev_pm_opp_add opp_add -+#define dev_pm_opp_remove opp_remove -+#endif /* Linux >= 3.13 */ ++ /* Request HW counters dump. ++ * Disable preemption to make dump timestamp more accurate. */ ++ preempt_disable(); ++ *timestamp = kbasep_vinstr_get_timestamp(); ++ rcode = kbase_instr_hwcnt_request_dump(vinstr_ctx->kctx); ++ preempt_enable(); + -+#include "mali_kernel_common.h" ++ if (!rcode) ++ rcode = kbase_instr_hwcnt_wait_for_dump(vinstr_ctx->kctx); ++ WARN_ON(rcode); + -+static int init_juno_opps_from_scpi(struct device *dev) ++ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); ++ switch (vinstr_ctx->state) ++ { ++ case VINSTR_SUSPENDING: ++ schedule_work(&vinstr_ctx->suspend_work); ++ break; ++ case VINSTR_DUMPING: ++ vinstr_ctx->state = VINSTR_IDLE; ++ wake_up_all(&vinstr_ctx->suspend_waitq); ++ break; ++ default: ++ break; ++ } ++ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); ++ ++ /* Accumulate values of collected counters. */ ++ if (!rcode) ++ accum_clients(vinstr_ctx); ++ ++ return rcode; ++} ++ ++/** ++ * kbasep_vinstr_fill_dump_buffer - copy accumulated counters to empty kernel ++ * buffer ++ * @cli: requesting client ++ * @timestamp: timestamp when counters were collected ++ * @event_id: id of event that caused triggered counters collection ++ * ++ * Return: zero on success ++ */ ++static int kbasep_vinstr_fill_dump_buffer( ++ struct kbase_vinstr_client *cli, u64 timestamp, ++ enum base_hwcnt_reader_event event_id) +{ -+ struct scpi_dvfs_info *sinfo; -+ struct scpi_ops *sops; ++ unsigned int write_idx = atomic_read(&cli->write_idx); ++ unsigned int read_idx = atomic_read(&cli->read_idx); + -+ int i; ++ struct kbase_hwcnt_reader_metadata *meta; ++ void *buffer; + -+ sops = get_scpi_ops(); -+ if (NULL == sops) { -+ MALI_DEBUG_PRINT(2, ("Mali didn't get any scpi ops \n")); ++ /* Check if there is a place to copy HWC block into. */ ++ if (write_idx - read_idx == cli->buffer_count) + return -1; -+ } ++ write_idx %= cli->buffer_count; + -+ /* Hard coded for Juno. 2 is GPU domain */ -+ sinfo = sops->dvfs_get_info(2); -+ if (IS_ERR_OR_NULL(sinfo)) -+ return PTR_ERR(sinfo); ++ /* Fill in dump buffer and its metadata. */ ++ buffer = &cli->dump_buffers[write_idx * cli->dump_size]; ++ meta = &cli->dump_buffers_meta[write_idx]; ++ meta->timestamp = timestamp; ++ meta->event_id = event_id; ++ meta->buffer_idx = write_idx; ++ memcpy(buffer, cli->accum_buffer, cli->dump_size); ++ return 0; ++} + -+ for (i = 0; i < sinfo->count; i++) { -+ struct scpi_opp *e = &sinfo->opps[i]; ++/** ++ * kbasep_vinstr_fill_dump_buffer_legacy - copy accumulated counters to buffer ++ * allocated in userspace ++ * @cli: requesting client ++ * ++ * Return: zero on success ++ * ++ * This is part of legacy ioctl interface. ++ */ ++static int kbasep_vinstr_fill_dump_buffer_legacy( ++ struct kbase_vinstr_client *cli) ++{ ++ void __user *buffer = cli->legacy_buffer; ++ int rcode; + -+ MALI_DEBUG_PRINT(2, ("Mali OPP from SCPI: %u Hz @ %u mV\n", e->freq, e->m_volt)); ++ /* Copy data to user buffer. */ ++ rcode = copy_to_user(buffer, cli->accum_buffer, cli->dump_size); ++ if (rcode) ++ pr_warn("error while copying buffer to user\n"); ++ return rcode; ++} + -+ dev_pm_opp_add(dev, e->freq, e->m_volt * 1000); -+ } ++/** ++ * kbasep_vinstr_fill_dump_buffer_kernel - copy accumulated counters to buffer ++ * allocated in kernel space ++ * @cli: requesting client ++ * ++ * Return: zero on success ++ * ++ * This is part of the kernel client interface. ++ */ ++static int kbasep_vinstr_fill_dump_buffer_kernel( ++ struct kbase_vinstr_client *cli) ++{ ++ memcpy(cli->kernel_buffer, cli->accum_buffer, cli->dump_size); + + return 0; +} + -+int setup_opps(void) ++/** ++ * kbasep_vinstr_reprogram - reprogram hwcnt set collected by inst ++ * @vinstr_ctx: vinstr context ++ */ ++static void kbasep_vinstr_reprogram( ++ struct kbase_vinstr_context *vinstr_ctx) +{ -+ struct device_node *np; -+ struct platform_device *pdev; -+ int err; -+ -+ np = of_find_node_by_name(NULL, "gpu"); -+ if (!np) { -+ pr_err("Failed to find DT entry for Mali\n"); -+ return -EFAULT; -+ } ++ unsigned long flags; ++ bool suspended = false; + -+ pdev = of_find_device_by_node(np); -+ if (!pdev) { -+ pr_err("Failed to find device for Mali\n"); -+ of_node_put(np); -+ return -EFAULT; -+ } ++ /* Don't enable hardware counters if vinstr is suspended. */ ++ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); ++ if (VINSTR_IDLE != vinstr_ctx->state) ++ suspended = true; ++ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); ++ if (suspended) ++ return; + -+ err = init_juno_opps_from_scpi(&pdev->dev); ++ /* Change to suspended state is done while holding vinstr context ++ * lock. Below code will then no re-enable the instrumentation. */ + -+ of_node_put(np); ++ if (vinstr_ctx->reprogram) { ++ struct kbase_vinstr_client *iter; + -+ return err; ++ if (!reprogram_hwcnt(vinstr_ctx)) { ++ vinstr_ctx->reprogram = false; ++ list_for_each_entry( ++ iter, ++ &vinstr_ctx->idle_clients, ++ list) ++ iter->pending = false; ++ list_for_each_entry( ++ iter, ++ &vinstr_ctx->waiting_clients, ++ list) ++ iter->pending = false; ++ } ++ } +} + -+int term_opps(struct device *dev) ++/** ++ * kbasep_vinstr_update_client - copy accumulated counters to user readable ++ * buffer and notify the user ++ * @cli: requesting client ++ * @timestamp: timestamp when counters were collected ++ * @event_id: id of event that caused triggered counters collection ++ * ++ * Return: zero on success ++ */ ++static int kbasep_vinstr_update_client( ++ struct kbase_vinstr_client *cli, u64 timestamp, ++ enum base_hwcnt_reader_event event_id) +{ -+ struct scpi_dvfs_info *sinfo; -+ struct scpi_ops *sops; -+ -+ int i; -+ -+ sops = get_scpi_ops(); -+ if (NULL == sops) { -+ MALI_DEBUG_PRINT(2, ("Mali didn't get any scpi ops \n")); -+ return -1; -+ } ++ int rcode = 0; + -+ /* Hard coded for Juno. 2 is GPU domain */ -+ sinfo = sops->dvfs_get_info(2); -+ if (IS_ERR_OR_NULL(sinfo)) -+ return PTR_ERR(sinfo); ++ /* Copy collected counters to user readable buffer. */ ++ if (cli->buffer_count) ++ rcode = kbasep_vinstr_fill_dump_buffer( ++ cli, timestamp, event_id); ++ else if (cli->kernel_buffer) ++ rcode = kbasep_vinstr_fill_dump_buffer_kernel(cli); ++ else ++ rcode = kbasep_vinstr_fill_dump_buffer_legacy(cli); + -+ for (i = 0; i < sinfo->count; i++) { -+ struct scpi_opp *e = &sinfo->opps[i]; ++ if (rcode) ++ goto exit; + -+ MALI_DEBUG_PRINT(2, ("Mali Remove OPP: %u Hz \n", e->freq)); + -+ dev_pm_opp_remove(dev, e->freq); -+ } ++ /* Notify client. Make sure all changes to memory are visible. */ ++ wmb(); ++ atomic_inc(&cli->write_idx); ++ wake_up_interruptible(&cli->waitq); + -+ return 0; ++ /* Prepare for next request. */ ++ memset(cli->accum_buffer, 0, cli->dump_size); + ++exit: ++ return rcode; +} -+#endif -+#endif -+#endif -+#endif -diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h b/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h -new file mode 100755 -index 000000000000..fe5e1224149e ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h -@@ -0,0 +1,209 @@ -+/* SPDX-License-Identifier: GPL-2.0 */ -+/* ---------------------------------------------------------------------------- -+ * File: custom_log.h -+ * -+ * Desc: ChenZhen å好的 log 输出的定制实现. -+ * -+ * -------------------------------------------------------------------- -+ * < 习语 å’Œ 缩略语 > : -+ * -+ * -------------------------------------------------------------------- -+ * Usage: -+ * -+ * Note: -+ * -+ * Author: ChenZhen ++ ++/** ++ * kbasep_vinstr_wake_up_callback - vinstr wake up timer wake up function + * -+ * ---------------------------------------------------------------------------- -+ * Version: -+ * v1.0 -+ * ---------------------------------------------------------------------------- -+ * Log: -+ ----Fri Nov 19 15:20:28 2010 v1.0 ++ * @hrtimer: high resolution timer + * -+ * ---------------------------------------------------------------------------- ++ * Return: High resolution timer restart enum. + */ ++static enum hrtimer_restart kbasep_vinstr_wake_up_callback( ++ struct hrtimer *hrtimer) ++{ ++ struct kbasep_vinstr_wake_up_timer *timer = ++ container_of( ++ hrtimer, ++ struct kbasep_vinstr_wake_up_timer, ++ hrtimer); + -+#ifndef __CUSTOM_LOG_H__ -+#define __CUSTOM_LOG_H__ ++ KBASE_DEBUG_ASSERT(timer); + -+#ifdef __cplusplus -+extern "C" { -+#endif ++ atomic_set(&timer->vinstr_ctx->request_pending, 1); ++ wake_up_all(&timer->vinstr_ctx->waitq); + -+/* ----------------------------------------------------------------------------- -+ * Include Files -+ * ----------------------------------------------------------------------------- -+ */ -+#include -+#include ++ return HRTIMER_NORESTART; ++} + -+/* ----------------------------------------------------------------------------- -+ * Macros Definition -+ * ----------------------------------------------------------------------------- ++#ifdef CONFIG_DEBUG_OBJECT_TIMERS ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)) ++/** ++ * kbase_destroy_hrtimer_on_stack - kernel's destroy_hrtimer_on_stack(), ++ * rewritten ++ * ++ * @timer: high resolution timer ++ * ++ * destroy_hrtimer_on_stack() was exported only for 4.7.0 kernel so for ++ * earlier kernel versions it is not possible to call it explicitly. ++ * Since this function must accompany hrtimer_init_on_stack(), which ++ * has to be used for hrtimer initialization if CONFIG_DEBUG_OBJECT_TIMERS ++ * is defined in order to avoid the warning about object on stack not being ++ * annotated, we rewrite it here to be used for earlier kernel versions. + */ ++static void kbase_destroy_hrtimer_on_stack(struct hrtimer *timer) ++{ ++ debug_object_free(timer, &hrtimer_debug_descr); ++} ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) */ ++#endif /* CONFIG_DEBUG_OBJECT_TIMERS */ + -+/** 若下列 macro 有被定义, æ‰ ä½¿èƒ½ log 输出. */ -+/* #define ENABLE_DEBUG_LOG */ ++/** ++ * kbasep_vinstr_service_task - HWC dumping service thread ++ * ++ * @data: Pointer to vinstr context structure. ++ * ++ * Return: Always returns zero. ++ */ ++static int kbasep_vinstr_service_task(void *data) ++{ ++ struct kbase_vinstr_context *vinstr_ctx = data; ++ struct kbasep_vinstr_wake_up_timer timer; + -+/*----------------------------------------------------------------------------*/ ++ KBASE_DEBUG_ASSERT(vinstr_ctx); + -+#ifdef ENABLE_VERBOSE_LOG -+/** Verbose log. */ -+#define V(fmt, args...) \ -+ pr_debug("V : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ -+ "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) -+#else -+#define V(...) ((void)0) -+#endif ++ hrtimer_init_on_stack(&timer.hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + -+#ifdef ENABLE_DEBUG_LOG -+/** Debug log. */ -+#define D(fmt, args...) \ -+ pr_info("D : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ -+ "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) -+#else -+#define D(...) ((void)0) -+#endif ++ timer.hrtimer.function = kbasep_vinstr_wake_up_callback; ++ timer.vinstr_ctx = vinstr_ctx; + -+#define I(fmt, args...) \ -+ pr_info("I : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ -+ "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) ++ while (!kthread_should_stop()) { ++ struct kbase_vinstr_client *cli = NULL; ++ struct kbase_vinstr_client *tmp; ++ int rcode; + -+#define W(fmt, args...) \ -+ pr_warn("W : [File] : %s; [Line] : %d; [Func] : %s(); " \ -+ fmt "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) ++ u64 timestamp = kbasep_vinstr_get_timestamp(); ++ u64 dump_time = 0; ++ struct list_head expired_requests; + -+#define E(fmt, args...) \ -+ pr_err("E : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ -+ "\n", \ -+ __FILE__, \ -+ __LINE__, \ -+ __func__, \ -+ ## args) ++ /* Hold lock while performing operations on lists of clients. */ ++ mutex_lock(&vinstr_ctx->lock); + -+/*-------------------------------------------------------*/ ++ /* Closing thread must not interact with client requests. */ ++ if (current == vinstr_ctx->thread) { ++ atomic_set(&vinstr_ctx->request_pending, 0); + -+/** 使用 D(), 以å进制的形å¼æ‰“å°å˜é‡ 'var' çš„ value. */ -+#define D_DEC(var) D(#var " = %d.", var) ++ if (!list_empty(&vinstr_ctx->waiting_clients)) { ++ cli = list_first_entry( ++ &vinstr_ctx->waiting_clients, ++ struct kbase_vinstr_client, ++ list); ++ dump_time = cli->dump_time; ++ } ++ } + -+#define E_DEC(var) E(#var " = %d.", var) ++ if (!cli || ((s64)timestamp - (s64)dump_time < 0ll)) { ++ mutex_unlock(&vinstr_ctx->lock); + -+/** 使用 D(), 以å六进制的形å¼æ‰“å°å˜é‡ 'var' çš„ value. */ -+#define D_HEX(var) D(#var " = 0x%x.", var) ++ /* Sleep until next dumping event or service request. */ ++ if (cli) { ++ u64 diff = dump_time - timestamp; + -+#define E_HEX(var) E(#var " = 0x%x.", var) ++ hrtimer_start( ++ &timer.hrtimer, ++ ns_to_ktime(diff), ++ HRTIMER_MODE_REL); ++ } ++ wait_event( ++ vinstr_ctx->waitq, ++ atomic_read( ++ &vinstr_ctx->request_pending) || ++ kthread_should_stop()); ++ hrtimer_cancel(&timer.hrtimer); ++ continue; ++ } + -+/** -+ * 使用 D(), 以å六进制的形å¼, -+ * 打å°æŒ‡é’ˆç±»åž‹å˜é‡ 'ptr' çš„ value. -+ */ -+#define D_PTR(ptr) D(#ptr " = %p.", ptr) ++ rcode = kbasep_vinstr_collect_and_accumulate(vinstr_ctx, ++ ×tamp); + -+#define E_PTR(ptr) E(#ptr " = %p.", ptr) ++ INIT_LIST_HEAD(&expired_requests); + -+/** 使用 D(), æ‰“å° char 字串. */ -+#define D_STR(p_str) \ -+do { \ -+ if (!p_str) { \ -+ D(#p_str " = NULL."); \ -+ else \ -+ D(#p_str " = '%s'.", p_str); \ -+} while (0) ++ /* Find all expired requests. */ ++ list_for_each_entry_safe( ++ cli, ++ tmp, ++ &vinstr_ctx->waiting_clients, ++ list) { ++ s64 tdiff = ++ (s64)(timestamp + DUMPING_RESOLUTION) - ++ (s64)cli->dump_time; ++ if (tdiff >= 0ll) { ++ list_del(&cli->list); ++ list_add(&cli->list, &expired_requests); ++ } else { ++ break; ++ } ++ } + -+#define E_STR(p_str) \ -+do { \ -+ if (!p_str) \ -+ E(#p_str " = NULL."); \ -+ else \ -+ E(#p_str " = '%s'.", p_str); \ -+} while (0) ++ /* Fill data for each request found. */ ++ list_for_each_entry_safe(cli, tmp, &expired_requests, list) { ++ /* Ensure that legacy buffer will not be used from ++ * this kthread context. */ ++ BUG_ON(0 == cli->buffer_count); ++ /* Expect only periodically sampled clients. */ ++ BUG_ON(0 == cli->dump_interval); + -+#ifdef ENABLE_DEBUG_LOG -+/** -+ * log 从 'p_start' 地å€å¼€å§‹çš„ 'len' 个字节的数æ®. -+ */ -+#define D_MEM(p_start, len) \ -+do { \ -+ int i = 0; \ -+ char *p = (char *)(p_start); \ -+ D("dump memory from addr of '" #p_start "', from %p, length %d' : ", \ -+ (p_start), \ -+ (len)); \ -+ pr_debug("\t\t"); \ -+ for (i = 0; i < (len); i++) \ -+ pr_debug("0x%02x, ", p[i]); \ -+ pr_debug("\n"); \ -+} while (0) -+#else -+#define D_MEM(...) ((void)0) -+#endif ++ if (!rcode) ++ kbasep_vinstr_update_client( ++ cli, ++ timestamp, ++ BASE_HWCNT_READER_EVENT_PERIODIC); + -+/*-------------------------------------------------------*/ ++ /* Set new dumping time. Drop missed probing times. */ ++ do { ++ cli->dump_time += cli->dump_interval; ++ } while (cli->dump_time < timestamp); + -+/** -+ * 在特定æ¡ä»¶ä¸‹, 判定 error å‘生, -+ * å°†å˜é‡ 'ret_var' 设置 'err_code', -+ * log 输出对应的 Error Caution, -+ * 然åŽè·³è½¬ 'label' 指定的代ç å¤„执行. -+ * @param msg -+ * 纯字串形å¼çš„æ示信æ¯. -+ * @param ret_var -+ * 标识函数执行状æ€æˆ–者结果的å˜é‡, -+ * 将被设置具体的 Error Code. -+ * 通常是 'ret' or 'result'. -+ * @param err_code -+ * 表å¾ç‰¹å®š error 的常数标识, -+ * 通常是 å®çš„å½¢æ€. -+ * @param label -+ * 程åºå°†è¦è·³è½¬åˆ°çš„错误处ç†ä»£ç çš„æ ‡å·, -+ * 通常就是 'EXIT'. -+ * @param args... -+ * 对应 'msg_fmt' 实å‚中, -+ * '%s', '%d', ... 等转æ¢è¯´æ˜Žç¬¦çš„具体å¯å˜é•¿å®žå‚. -+ */ -+#define SET_ERROR_AND_JUMP(msg_fmt, ret_var, err_code, label, args...) \ -+do { \ -+ E("To set '" #ret_var "' to %d('" #err_code "'), because : " msg_fmt, \ -+ (err_code), \ -+ ## args); \ -+ (ret_var) = (err_code); \ -+ goto label; \ -+} while (0) ++ list_del(&cli->list); ++ kbasep_vinstr_add_dump_request( ++ cli, ++ &vinstr_ctx->waiting_clients); ++ } + -+/* ----------------------------------------------------------------------------- -+ * Types and Structures Definition -+ * ----------------------------------------------------------------------------- -+ */ ++ /* Reprogram counters set if required. */ ++ kbasep_vinstr_reprogram(vinstr_ctx); + -+/* ----------------------------------------------------------------------------- -+ * Global Functions' Prototype -+ * ----------------------------------------------------------------------------- -+ */ ++ mutex_unlock(&vinstr_ctx->lock); ++ } + -+/* ----------------------------------------------------------------------------- -+ * Inline Functions Implementation -+ * ----------------------------------------------------------------------------- -+ */ ++#ifdef CONFIG_DEBUG_OBJECTS_TIMERS ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)) ++ kbase_destroy_hrtimer_on_stack(&timer.hrtimer); ++#else ++ destroy_hrtimer_on_stack(&timer.hrtimer); ++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)) */ ++#endif /* CONFIG_DEBUG_OBJECTS_TIMERS */ + -+#ifdef __cplusplus ++ return 0; +} -+#endif + -+#endif /* __CUSTOM_LOG_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/rk.c b/drivers/gpu/arm/mali400/mali/platform/rk/rk.c -new file mode 100755 -index 000000000000..9a012fdf8d35 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk.c -@@ -0,0 +1,676 @@ -+/* -+ * (C) COPYRIGHT RockChip Limited. All rights reserved. ++/*****************************************************************************/ ++ ++/** ++ * kbasep_vinstr_hwcnt_reader_buffer_ready - check if client has ready buffers ++ * @cli: pointer to vinstr client structure + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * Return: non-zero if client has at least one dumping buffer filled that was ++ * not notified to user yet + */ ++static int kbasep_vinstr_hwcnt_reader_buffer_ready( ++ struct kbase_vinstr_client *cli) ++{ ++ KBASE_DEBUG_ASSERT(cli); ++ return atomic_read(&cli->write_idx) != atomic_read(&cli->meta_idx); ++} + +/** -+ * @file rk.c -+ * implementation of platform_specific_code on rk platforms, such as rk3328h. ++ * kbasep_vinstr_hwcnt_reader_ioctl_get_buffer - hwcnt reader's ioctl command ++ * @cli: pointer to vinstr client structure ++ * @buffer: pointer to userspace buffer ++ * @size: size of buffer + * -+ * mali_device_driver(MDD) includes 2 parts : -+ * .DP : platform_dependent_part : -+ * located in /mali/platform// -+ * .DP : common_part : -+ * common part implemented by ARM. ++ * Return: zero on success + */ ++static long kbasep_vinstr_hwcnt_reader_ioctl_get_buffer( ++ struct kbase_vinstr_client *cli, void __user *buffer, ++ size_t size) ++{ ++ unsigned int meta_idx = atomic_read(&cli->meta_idx); ++ unsigned int idx = meta_idx % cli->buffer_count; + -+#define ENABLE_DEBUG_LOG -+#include "custom_log.h" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#ifdef CONFIG_PM -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include "mali_kernel_common.h" -+#include "../../common/mali_osk_mali.h" ++ struct kbase_hwcnt_reader_metadata *meta = &cli->dump_buffers_meta[idx]; + -+/*---------------------------------------------------------------------------*/ ++ /* Metadata sanity check. */ ++ KBASE_DEBUG_ASSERT(idx == meta->buffer_idx); + -+u32 mali_group_error; ++ if (sizeof(struct kbase_hwcnt_reader_metadata) != size) ++ return -EINVAL; + -+/*---------------------------------------------------------------------------*/ ++ /* Check if there is any buffer available. */ ++ if (atomic_read(&cli->write_idx) == meta_idx) ++ return -EAGAIN; + -+#define DEFAULT_UTILISATION_PERIOD_IN_MS (100) ++ /* Check if previously taken buffer was put back. */ ++ if (atomic_read(&cli->read_idx) != meta_idx) ++ return -EBUSY; + -+/* -+ * rk_platform_context_of_mali_device. -+ */ -+struct rk_context { -+ /* mali device. */ -+ struct device *dev; -+ /* is the GPU powered on? */ -+ bool is_powered; -+ /* debug only, the period in ms to count gpu_utilisation. */ -+ unsigned int utilisation_period; -+}; ++ /* Copy next available buffer's metadata to user. */ ++ if (copy_to_user(buffer, meta, size)) ++ return -EFAULT; + -+struct rk_context *s_rk_context; ++ atomic_inc(&cli->meta_idx); + -+/*---------------------------------------------------------------------------*/ ++ return 0; ++} + -+#ifdef CONFIG_MALI_DEVFREQ -+static ssize_t utilisation_period_show(struct device *dev, -+ struct device_attribute *attr, -+ char *buf) ++/** ++ * kbasep_vinstr_hwcnt_reader_ioctl_put_buffer - hwcnt reader's ioctl command ++ * @cli: pointer to vinstr client structure ++ * @buffer: pointer to userspace buffer ++ * @size: size of buffer ++ * ++ * Return: zero on success ++ */ ++static long kbasep_vinstr_hwcnt_reader_ioctl_put_buffer( ++ struct kbase_vinstr_client *cli, void __user *buffer, ++ size_t size) +{ -+ struct rk_context *platform = s_rk_context; -+ ssize_t ret = 0; ++ unsigned int read_idx = atomic_read(&cli->read_idx); ++ unsigned int idx = read_idx % cli->buffer_count; + -+ ret += snprintf(buf, PAGE_SIZE, "%u\n", platform->utilisation_period); ++ struct kbase_hwcnt_reader_metadata meta; + -+ return ret; -+} ++ if (sizeof(struct kbase_hwcnt_reader_metadata) != size) ++ return -EINVAL; + -+static ssize_t utilisation_period_store(struct device *dev, -+ struct device_attribute *attr, -+ const char *buf, -+ size_t count) -+{ -+ struct rk_context *platform = s_rk_context; -+ int ret = 0; ++ /* Check if any buffer was taken. */ ++ if (atomic_read(&cli->meta_idx) == read_idx) ++ return -EPERM; + -+ ret = kstrtouint(buf, 0, &platform->utilisation_period); -+ if (ret) { -+ E("invalid input period : %s.", buf); -+ return ret; -+ } -+ D("set utilisation_period to '%d'.", platform->utilisation_period); ++ /* Check if correct buffer is put back. */ ++ if (copy_from_user(&meta, buffer, size)) ++ return -EFAULT; ++ if (idx != meta.buffer_idx) ++ return -EINVAL; + -+ return count; ++ atomic_inc(&cli->read_idx); ++ ++ return 0; +} + -+static ssize_t utilisation_show(struct device *dev, -+ struct device_attribute *attr, -+ char *buf) ++/** ++ * kbasep_vinstr_hwcnt_reader_ioctl_set_interval - hwcnt reader's ioctl command ++ * @cli: pointer to vinstr client structure ++ * @interval: periodic dumping interval (disable periodic dumping if zero) ++ * ++ * Return: zero on success ++ */ ++static long kbasep_vinstr_hwcnt_reader_ioctl_set_interval( ++ struct kbase_vinstr_client *cli, u32 interval) +{ -+ struct rk_context *platform = s_rk_context; -+ struct mali_device *mdev = dev_get_drvdata(dev); -+ ssize_t ret = 0; -+ unsigned long period_in_us = platform->utilisation_period * 1000; -+ unsigned long total_time; -+ unsigned long busy_time; -+ unsigned long utilisation; -+ -+ mali_pm_reset_dvfs_utilisation(mdev); -+ usleep_range(period_in_us, period_in_us + 100); -+ mali_pm_get_dvfs_utilisation(mdev, &total_time, &busy_time); ++ struct kbase_vinstr_context *vinstr_ctx = cli->vinstr_ctx; + -+ /* 'devfreq_dev_profile' instance registered to devfreq -+ * also uses mali_pm_reset_dvfs_utilisation() -+ * and mali_pm_get_dvfs_utilisation(). -+ * So, it's better to disable GPU DVFS before reading this node. -+ */ -+ D("total_time : %lu, busy_time : %lu.", total_time, busy_time); ++ KBASE_DEBUG_ASSERT(vinstr_ctx); + -+ utilisation = busy_time / (total_time / 100); -+ ret += snprintf(buf, PAGE_SIZE, "%lu\n", utilisation); ++ mutex_lock(&vinstr_ctx->lock); + -+ return ret; -+} ++ list_del(&cli->list); + -+static DEVICE_ATTR_RW(utilisation_period); -+static DEVICE_ATTR_RO(utilisation); -+#endif ++ cli->dump_interval = interval; + -+static int rk_context_create_sysfs_files(struct device *dev) -+{ -+#ifdef CONFIG_MALI_DEVFREQ -+ int ret; ++ /* If interval is non-zero, enable periodic dumping for this client. */ ++ if (cli->dump_interval) { ++ if (DUMPING_RESOLUTION > cli->dump_interval) ++ cli->dump_interval = DUMPING_RESOLUTION; ++ cli->dump_time = ++ kbasep_vinstr_get_timestamp() + cli->dump_interval; + -+ ret = device_create_file(dev, &dev_attr_utilisation_period); -+ if (ret) { -+ E("fail to create sysfs file 'utilisation_period'."); -+ goto out; -+ } ++ kbasep_vinstr_add_dump_request( ++ cli, &vinstr_ctx->waiting_clients); + -+ ret = device_create_file(dev, &dev_attr_utilisation); -+ if (ret) { -+ E("fail to create sysfs file 'utilisation'."); -+ goto remove_utilisation_period; ++ atomic_set(&vinstr_ctx->request_pending, 1); ++ wake_up_all(&vinstr_ctx->waitq); ++ } else { ++ list_add(&cli->list, &vinstr_ctx->idle_clients); + } + -+ return 0; ++ mutex_unlock(&vinstr_ctx->lock); + -+remove_utilisation_period: -+ device_remove_file(dev, &dev_attr_utilisation_period); -+out: -+ return ret; -+#else + return 0; -+#endif -+} -+ -+static void rk_context_remove_sysfs_files(struct device *dev) -+{ -+#ifdef CONFIG_MALI_DEVFREQ -+ device_remove_file(dev, &dev_attr_utilisation_period); -+ device_remove_file(dev, &dev_attr_utilisation); -+#endif +} + -+/*---------------------------------------------------------------------------*/ -+ -+/* -+ * Init rk_platform_context of mali_device. ++/** ++ * kbasep_vinstr_hwcnt_reader_event_mask - return event mask for event id ++ * @event_id: id of event ++ * Return: event_mask or zero if event is not supported or maskable + */ -+static int rk_context_init(struct platform_device *pdev) ++static u32 kbasep_vinstr_hwcnt_reader_event_mask( ++ enum base_hwcnt_reader_event event_id) +{ -+ int ret = 0; -+ struct device *dev = &pdev->dev; -+ struct rk_context *platform; /* platform_context */ ++ u32 event_mask = 0; + -+ platform = kzalloc(sizeof(*platform), GFP_KERNEL); -+ if (!platform) { -+ E("no mem."); -+ return _MALI_OSK_ERR_NOMEM; ++ switch (event_id) { ++ case BASE_HWCNT_READER_EVENT_PREJOB: ++ case BASE_HWCNT_READER_EVENT_POSTJOB: ++ /* These event are maskable. */ ++ event_mask = (1 << event_id); ++ break; ++ ++ case BASE_HWCNT_READER_EVENT_MANUAL: ++ case BASE_HWCNT_READER_EVENT_PERIODIC: ++ /* These event are non-maskable. */ ++ default: ++ /* These event are not supported. */ ++ break; + } + -+ platform->dev = dev; -+ platform->is_powered = false; ++ return event_mask; ++} + -+ platform->utilisation_period = DEFAULT_UTILISATION_PERIOD_IN_MS; ++/** ++ * kbasep_vinstr_hwcnt_reader_ioctl_enable_event - hwcnt reader's ioctl command ++ * @cli: pointer to vinstr client structure ++ * @event_id: id of event to enable ++ * ++ * Return: zero on success ++ */ ++static long kbasep_vinstr_hwcnt_reader_ioctl_enable_event( ++ struct kbase_vinstr_client *cli, ++ enum base_hwcnt_reader_event event_id) ++{ ++ struct kbase_vinstr_context *vinstr_ctx = cli->vinstr_ctx; ++ u32 event_mask; + -+ ret = rk_context_create_sysfs_files(dev); -+ if (ret) { -+ E("fail to create sysfs files, ret = %d", ret); -+ goto EXIT; -+ } ++ KBASE_DEBUG_ASSERT(vinstr_ctx); + -+ s_rk_context = platform; ++ event_mask = kbasep_vinstr_hwcnt_reader_event_mask(event_id); ++ if (!event_mask) ++ return -EINVAL; + -+ pm_runtime_set_autosuspend_delay(dev, 1000); -+ pm_runtime_use_autosuspend(dev); -+ pm_runtime_enable(dev); ++ mutex_lock(&vinstr_ctx->lock); ++ cli->event_mask |= event_mask; ++ mutex_unlock(&vinstr_ctx->lock); + -+EXIT: -+ return ret; ++ return 0; +} + -+static void rk_context_deinit(struct platform_device *pdev) ++/** ++ * kbasep_vinstr_hwcnt_reader_ioctl_disable_event - hwcnt reader's ioctl command ++ * @cli: pointer to vinstr client structure ++ * @event_id: id of event to disable ++ * ++ * Return: zero on success ++ */ ++static long kbasep_vinstr_hwcnt_reader_ioctl_disable_event( ++ struct kbase_vinstr_client *cli, ++ enum base_hwcnt_reader_event event_id) +{ -+ struct device *dev = &pdev->dev; -+ struct rk_context *platform = s_rk_context; ++ struct kbase_vinstr_context *vinstr_ctx = cli->vinstr_ctx; ++ u32 event_mask; + -+ pm_runtime_disable(dev); ++ KBASE_DEBUG_ASSERT(vinstr_ctx); + -+ s_rk_context = NULL; ++ event_mask = kbasep_vinstr_hwcnt_reader_event_mask(event_id); ++ if (!event_mask) ++ return -EINVAL; + -+ rk_context_remove_sysfs_files(dev); ++ mutex_lock(&vinstr_ctx->lock); ++ cli->event_mask &= ~event_mask; ++ mutex_unlock(&vinstr_ctx->lock); + -+ if (platform) { -+ platform->is_powered = false; -+ platform->dev = NULL; -+ kfree(platform); -+ } ++ return 0; +} + -+/*---------------------------------------------------------------------------*/ -+/* for devfreq cooling. */ ++/** ++ * kbasep_vinstr_hwcnt_reader_ioctl_get_hwver - hwcnt reader's ioctl command ++ * @cli: pointer to vinstr client structure ++ * @hwver: pointer to user buffer where hw version will be stored ++ * ++ * Return: zero on success ++ */ ++static long kbasep_vinstr_hwcnt_reader_ioctl_get_hwver( ++ struct kbase_vinstr_client *cli, u32 __user *hwver) ++{ ++#ifndef CONFIG_MALI_NO_MALI ++ struct kbase_vinstr_context *vinstr_ctx = cli->vinstr_ctx; ++#endif + -+#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) ++ u32 ver = 5; + -+#define FALLBACK_STATIC_TEMPERATURE 55000 ++#ifndef CONFIG_MALI_NO_MALI ++ KBASE_DEBUG_ASSERT(vinstr_ctx); ++ if (kbase_hw_has_feature(vinstr_ctx->kbdev, BASE_HW_FEATURE_V4)) ++ ver = 4; ++#endif + -+static u32 dynamic_coefficient; -+static u32 static_coefficient; -+static s32 ts[4]; -+static struct thermal_zone_device *gpu_tz; ++ return put_user(ver, hwver); ++} + -+static int power_model_simple_init(struct platform_device *pdev) ++/** ++ * kbasep_vinstr_hwcnt_reader_ioctl - hwcnt reader's ioctl ++ * @filp: pointer to file structure ++ * @cmd: user command ++ * @arg: command's argument ++ * ++ * Return: zero on success ++ */ ++static long kbasep_vinstr_hwcnt_reader_ioctl(struct file *filp, ++ unsigned int cmd, unsigned long arg) +{ -+ struct device_node *power_model_node; -+ const char *tz_name; -+ u32 static_power, dynamic_power; -+ u32 voltage, voltage_squared, voltage_cubed, frequency; -+ -+ power_model_node = of_get_child_by_name(pdev->dev.of_node, -+ "power_model"); -+ if (!power_model_node) { -+ dev_err(&pdev->dev, "could not find power_model node\n"); -+ return -ENODEV; -+ } -+ if (!of_device_is_compatible(power_model_node, -+ "arm,mali-simple-power-model")) { -+ dev_err(&pdev->dev, "power_model incompatible with simple power model\n"); -+ return -ENODEV; -+ } ++ long rcode = 0; ++ struct kbase_vinstr_client *cli; + -+ if (of_property_read_string(power_model_node, "thermal-zone", -+ &tz_name)) { -+ dev_err(&pdev->dev, "ts in power_model not available\n"); -+ return -EINVAL; -+ } ++ KBASE_DEBUG_ASSERT(filp); + -+ gpu_tz = thermal_zone_get_zone_by_name(tz_name); -+ if (IS_ERR(gpu_tz)) { -+ pr_warn_ratelimited("Error getting gpu thermal zone '%s'(%ld), not yet ready?\n", -+ tz_name, -+ PTR_ERR(gpu_tz)); -+ gpu_tz = NULL; -+ } ++ cli = filp->private_data; ++ KBASE_DEBUG_ASSERT(cli); + -+ if (of_property_read_u32(power_model_node, "static-power", -+ &static_power)) { -+ dev_err(&pdev->dev, "static-power in power_model not available\n"); -+ return -EINVAL; -+ } -+ if (of_property_read_u32(power_model_node, "dynamic-power", -+ &dynamic_power)) { -+ dev_err(&pdev->dev, "dynamic-power in power_model not available\n"); -+ return -EINVAL; -+ } -+ if (of_property_read_u32(power_model_node, "voltage", -+ &voltage)) { -+ dev_err(&pdev->dev, "voltage in power_model not available\n"); -+ return -EINVAL; -+ } -+ if (of_property_read_u32(power_model_node, "frequency", -+ &frequency)) { -+ dev_err(&pdev->dev, "frequency in power_model not available\n"); ++ if (unlikely(KBASE_HWCNT_READER != _IOC_TYPE(cmd))) + return -EINVAL; -+ } -+ voltage_squared = (voltage * voltage) / 1000; -+ voltage_cubed = voltage * voltage * voltage; -+ static_coefficient = (static_power << 20) / (voltage_cubed >> 10); -+ dynamic_coefficient = (((dynamic_power * 1000) / voltage_squared) -+ * 1000) / frequency; + -+ if (of_property_read_u32_array(power_model_node, "ts", (u32 *)ts, 4)) { -+ dev_err(&pdev->dev, "ts in power_model not available\n"); -+ return -EINVAL; ++ switch (cmd) { ++ case KBASE_HWCNT_READER_GET_API_VERSION: ++ rcode = put_user(HWCNT_READER_API, (u32 __user *)arg); ++ break; ++ case KBASE_HWCNT_READER_GET_HWVER: ++ rcode = kbasep_vinstr_hwcnt_reader_ioctl_get_hwver( ++ cli, (u32 __user *)arg); ++ break; ++ case KBASE_HWCNT_READER_GET_BUFFER_SIZE: ++ KBASE_DEBUG_ASSERT(cli->vinstr_ctx); ++ rcode = put_user( ++ (u32)cli->vinstr_ctx->dump_size, ++ (u32 __user *)arg); ++ break; ++ case KBASE_HWCNT_READER_DUMP: ++ rcode = kbase_vinstr_hwc_dump( ++ cli, BASE_HWCNT_READER_EVENT_MANUAL); ++ break; ++ case KBASE_HWCNT_READER_CLEAR: ++ rcode = kbase_vinstr_hwc_clear(cli); ++ break; ++ case KBASE_HWCNT_READER_GET_BUFFER: ++ rcode = kbasep_vinstr_hwcnt_reader_ioctl_get_buffer( ++ cli, (void __user *)arg, _IOC_SIZE(cmd)); ++ break; ++ case KBASE_HWCNT_READER_PUT_BUFFER: ++ rcode = kbasep_vinstr_hwcnt_reader_ioctl_put_buffer( ++ cli, (void __user *)arg, _IOC_SIZE(cmd)); ++ break; ++ case KBASE_HWCNT_READER_SET_INTERVAL: ++ rcode = kbasep_vinstr_hwcnt_reader_ioctl_set_interval( ++ cli, (u32)arg); ++ break; ++ case KBASE_HWCNT_READER_ENABLE_EVENT: ++ rcode = kbasep_vinstr_hwcnt_reader_ioctl_enable_event( ++ cli, (enum base_hwcnt_reader_event)arg); ++ break; ++ case KBASE_HWCNT_READER_DISABLE_EVENT: ++ rcode = kbasep_vinstr_hwcnt_reader_ioctl_disable_event( ++ cli, (enum base_hwcnt_reader_event)arg); ++ break; ++ default: ++ rcode = -EINVAL; ++ break; + } + -+ return 0; ++ return rcode; +} + -+/* Calculate gpu static power example for reference */ -+static unsigned long rk_model_static_power(struct devfreq *devfreq, -+ unsigned long voltage) ++/** ++ * kbasep_vinstr_hwcnt_reader_poll - hwcnt reader's poll ++ * @filp: pointer to file structure ++ * @wait: pointer to poll table ++ * Return: POLLIN if data can be read without blocking, otherwise zero ++ */ ++static unsigned int kbasep_vinstr_hwcnt_reader_poll(struct file *filp, ++ poll_table *wait) +{ -+ int temperature, temp; -+ int temp_squared, temp_cubed, temp_scaling_factor; -+ const unsigned long voltage_cubed = (voltage * voltage * voltage) >> 10; -+ unsigned long static_power; -+ -+ if (gpu_tz) { -+ int ret; -+ -+ ret = gpu_tz->ops->get_temp(gpu_tz, &temperature); -+ if (ret) { -+ MALI_DEBUG_PRINT(2, ("fail to read temp: %d\n", ret)); -+ temperature = FALLBACK_STATIC_TEMPERATURE; -+ } -+ } else { -+ temperature = FALLBACK_STATIC_TEMPERATURE; -+ } ++ struct kbase_vinstr_client *cli; + -+ /* Calculate the temperature scaling factor. To be applied to the -+ * voltage scaled power. -+ */ -+ temp = temperature / 1000; -+ temp_squared = temp * temp; -+ temp_cubed = temp_squared * temp; -+ temp_scaling_factor = -+ (ts[3] * temp_cubed) -+ + (ts[2] * temp_squared) -+ + (ts[1] * temp) -+ + ts[0]; ++ KBASE_DEBUG_ASSERT(filp); ++ KBASE_DEBUG_ASSERT(wait); + -+ static_power = (((static_coefficient * voltage_cubed) >> 20) -+ * temp_scaling_factor) -+ / 1000000; ++ cli = filp->private_data; ++ KBASE_DEBUG_ASSERT(cli); + -+ return static_power; ++ poll_wait(filp, &cli->waitq, wait); ++ if (kbasep_vinstr_hwcnt_reader_buffer_ready(cli)) ++ return POLLIN; ++ return 0; +} + -+/* Calculate gpu dynamic power example for reference */ -+static unsigned long rk_model_dynamic_power(struct devfreq *devfreq, -+ unsigned long freq, -+ unsigned long voltage) ++/** ++ * kbasep_vinstr_hwcnt_reader_mmap - hwcnt reader's mmap ++ * @filp: pointer to file structure ++ * @vma: pointer to vma structure ++ * Return: zero on success ++ */ ++static int kbasep_vinstr_hwcnt_reader_mmap(struct file *filp, ++ struct vm_area_struct *vma) +{ -+ /* The inputs: freq (f) is in Hz, and voltage (v) in mV. -+ * The coefficient (c) is in mW/(MHz mV mV). -+ * -+ * This function calculates the dynamic power after this formula: -+ * Pdyn (mW) = c (mW/(MHz*mV*mV)) * v (mV) * v (mV) * f (MHz) -+ */ -+ const unsigned long v2 = (voltage * voltage) / 1000; /* m*(V*V) */ -+ const unsigned long f_mhz = freq / 1000000; /* MHz */ -+ unsigned long dynamic_power; ++ struct kbase_vinstr_client *cli; ++ unsigned long size, addr, pfn, offset; ++ unsigned long vm_size = vma->vm_end - vma->vm_start; + -+ dynamic_power = (dynamic_coefficient * v2 * f_mhz) / 1000000; /* mW */ ++ KBASE_DEBUG_ASSERT(filp); ++ KBASE_DEBUG_ASSERT(vma); + -+ return dynamic_power; -+} ++ cli = filp->private_data; ++ KBASE_DEBUG_ASSERT(cli); + -+struct devfreq_cooling_power rk_cooling_ops = { -+ .get_static_power = rk_model_static_power, -+ .get_dynamic_power = rk_model_dynamic_power, -+}; -+#endif ++ size = cli->buffer_count * cli->dump_size; + -+/*---------------------------------------------------------------------------*/ ++ if (vma->vm_pgoff > (size >> PAGE_SHIFT)) ++ return -EINVAL; + -+#ifdef CONFIG_PM ++ offset = vma->vm_pgoff << PAGE_SHIFT; ++ if (vm_size > size - offset) ++ return -EINVAL; + -+static int rk_platform_enable_clk_gpu(struct device *dev) -+{ -+ int ret = 0; -+#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_HAVE_CLK) -+ struct mali_device *mdev = dev_get_drvdata(dev); ++ addr = __pa((unsigned long)cli->dump_buffers + offset); ++ pfn = addr >> PAGE_SHIFT; + -+ if (mdev->clock) -+ ret = clk_enable(mdev->clock); -+#endif -+ return ret; ++ return remap_pfn_range( ++ vma, ++ vma->vm_start, ++ pfn, ++ vm_size, ++ vma->vm_page_prot); +} + -+static void rk_platform_disable_clk_gpu(struct device *dev) ++/** ++ * kbasep_vinstr_hwcnt_reader_release - hwcnt reader's release ++ * @inode: pointer to inode structure ++ * @filp: pointer to file structure ++ * Return always return zero ++ */ ++static int kbasep_vinstr_hwcnt_reader_release(struct inode *inode, ++ struct file *filp) +{ -+#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_HAVE_CLK) -+ struct mali_device *mdev = dev_get_drvdata(dev); ++ struct kbase_vinstr_client *cli; + -+ if (mdev->clock) -+ clk_disable(mdev->clock); -+#endif -+} ++ KBASE_DEBUG_ASSERT(inode); ++ KBASE_DEBUG_ASSERT(filp); + -+static int rk_platform_enable_gpu_regulator(struct device *dev) -+{ -+ int ret = 0; -+#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_REGULATOR) -+ struct mali_device *mdev = dev_get_drvdata(dev); ++ cli = filp->private_data; ++ KBASE_DEBUG_ASSERT(cli); + -+ if (mdev->regulator) -+ ret = regulator_enable(mdev->regulator); -+#endif -+ return ret; ++ kbase_vinstr_detach_client(cli); ++ return 0; +} + -+static void rk_platform_disable_gpu_regulator(struct device *dev) ++/*****************************************************************************/ ++ ++/** ++ * kbasep_vinstr_kick_scheduler - trigger scheduler cycle ++ * @kbdev: pointer to kbase device structure ++ */ ++static void kbasep_vinstr_kick_scheduler(struct kbase_device *kbdev) +{ -+#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_REGULATOR) -+ struct mali_device *mdev = dev_get_drvdata(dev); ++ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ unsigned long flags; + -+ if (mdev->regulator) -+ regulator_disable(mdev->regulator); -+#endif ++ down(&js_devdata->schedule_sem); ++ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ kbase_backend_slot_update(kbdev); ++ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ up(&js_devdata->schedule_sem); +} + -+static int rk_platform_power_on_gpu(struct device *dev) ++/** ++ * kbasep_vinstr_suspend_worker - worker suspending vinstr module ++ * @data: pointer to work structure ++ */ ++static void kbasep_vinstr_suspend_worker(struct work_struct *data) +{ -+ struct rk_context *platform = s_rk_context; -+ int ret = 0; ++ struct kbase_vinstr_context *vinstr_ctx; ++ unsigned long flags; + -+ if (!(platform->is_powered)) { -+ ret = rk_platform_enable_clk_gpu(dev); -+ if (ret) { -+ E("fail to enable clk_gpu, ret : %d.", ret); -+ goto fail_to_enable_clk; -+ } ++ vinstr_ctx = container_of(data, struct kbase_vinstr_context, ++ suspend_work); + -+ ret = rk_platform_enable_gpu_regulator(dev); -+ if (ret) { -+ E("fail to enable vdd_gpu, ret : %d.", ret); -+ goto fail_to_enable_regulator; -+ } ++ mutex_lock(&vinstr_ctx->lock); + -+ platform->is_powered = true; -+ } ++ if (vinstr_ctx->kctx) ++ disable_hwcnt(vinstr_ctx); + -+ return 0; ++ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); ++ vinstr_ctx->state = VINSTR_SUSPENDED; ++ wake_up_all(&vinstr_ctx->suspend_waitq); ++ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); + -+fail_to_enable_regulator: -+ rk_platform_disable_clk_gpu(dev); ++ mutex_unlock(&vinstr_ctx->lock); + -+fail_to_enable_clk: -+ return ret; ++ /* Kick GPU scheduler to allow entering protected mode. ++ * This must happen after vinstr was suspended. */ ++ kbasep_vinstr_kick_scheduler(vinstr_ctx->kbdev); +} + -+static void rk_platform_power_off_gpu(struct device *dev) ++/** ++ * kbasep_vinstr_suspend_worker - worker resuming vinstr module ++ * @data: pointer to work structure ++ */ ++static void kbasep_vinstr_resume_worker(struct work_struct *data) +{ -+ struct rk_context *platform = s_rk_context; ++ struct kbase_vinstr_context *vinstr_ctx; ++ unsigned long flags; + -+ if (platform->is_powered) { -+ rk_platform_disable_clk_gpu(dev); -+ rk_platform_disable_gpu_regulator(dev); ++ vinstr_ctx = container_of(data, struct kbase_vinstr_context, ++ resume_work); + -+ platform->is_powered = false; -+ } ++ mutex_lock(&vinstr_ctx->lock); ++ ++ if (vinstr_ctx->kctx) ++ enable_hwcnt(vinstr_ctx); ++ ++ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); ++ vinstr_ctx->state = VINSTR_IDLE; ++ wake_up_all(&vinstr_ctx->suspend_waitq); ++ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); ++ ++ mutex_unlock(&vinstr_ctx->lock); ++ ++ /* Kick GPU scheduler to allow entering protected mode. ++ * Note that scheduler state machine might requested re-entry to ++ * protected mode before vinstr was resumed. ++ * This must happen after vinstr was release. */ ++ kbasep_vinstr_kick_scheduler(vinstr_ctx->kbdev); +} + -+int rk_platform_init_opp_table(struct device *dev) ++/*****************************************************************************/ ++ ++struct kbase_vinstr_context *kbase_vinstr_init(struct kbase_device *kbdev) +{ -+ return rockchip_init_opp_table(dev, NULL, "gpu_leakage", "mali"); ++ struct kbase_vinstr_context *vinstr_ctx; ++ ++ vinstr_ctx = kzalloc(sizeof(*vinstr_ctx), GFP_KERNEL); ++ if (!vinstr_ctx) ++ return NULL; ++ ++ INIT_LIST_HEAD(&vinstr_ctx->idle_clients); ++ INIT_LIST_HEAD(&vinstr_ctx->waiting_clients); ++ mutex_init(&vinstr_ctx->lock); ++ spin_lock_init(&vinstr_ctx->state_lock); ++ vinstr_ctx->kbdev = kbdev; ++ vinstr_ctx->thread = NULL; ++ vinstr_ctx->state = VINSTR_IDLE; ++ vinstr_ctx->suspend_cnt = 0; ++ INIT_WORK(&vinstr_ctx->suspend_work, kbasep_vinstr_suspend_worker); ++ INIT_WORK(&vinstr_ctx->resume_work, kbasep_vinstr_resume_worker); ++ init_waitqueue_head(&vinstr_ctx->suspend_waitq); ++ ++ atomic_set(&vinstr_ctx->request_pending, 0); ++ init_waitqueue_head(&vinstr_ctx->waitq); ++ ++ return vinstr_ctx; +} + -+static int mali_runtime_suspend(struct device *device) ++void kbase_vinstr_term(struct kbase_vinstr_context *vinstr_ctx) +{ -+ int ret = 0; ++ struct kbase_vinstr_client *cli; + -+ MALI_DEBUG_PRINT(4, ("mali_runtime_suspend() called\n")); ++ /* Stop service thread first. */ ++ if (vinstr_ctx->thread) ++ kthread_stop(vinstr_ctx->thread); + -+ if (device->driver && -+ device->driver->pm && -+ device->driver->pm->runtime_suspend) { -+ /* Need to notify Mali driver about this event */ -+ ret = device->driver->pm->runtime_suspend(device); -+ } ++ /* Wait for workers. */ ++ flush_work(&vinstr_ctx->suspend_work); ++ flush_work(&vinstr_ctx->resume_work); + -+ if (!ret) -+ rk_platform_power_off_gpu(device); ++ while (1) { ++ struct list_head *list = &vinstr_ctx->idle_clients; + -+ return ret; ++ if (list_empty(list)) { ++ list = &vinstr_ctx->waiting_clients; ++ if (list_empty(list)) ++ break; ++ } ++ ++ cli = list_first_entry(list, struct kbase_vinstr_client, list); ++ list_del(&cli->list); ++ kfree(cli->accum_buffer); ++ kfree(cli); ++ vinstr_ctx->nclients--; ++ } ++ KBASE_DEBUG_ASSERT(!vinstr_ctx->nclients); ++ if (vinstr_ctx->kctx) ++ kbasep_vinstr_destroy_kctx(vinstr_ctx); ++ kfree(vinstr_ctx); +} + -+static int mali_runtime_resume(struct device *device) ++int kbase_vinstr_hwcnt_reader_setup(struct kbase_vinstr_context *vinstr_ctx, ++ struct kbase_uk_hwcnt_reader_setup *setup) +{ -+ int ret = 0; ++ struct kbase_vinstr_client *cli; ++ u32 bitmap[4]; + -+ MALI_DEBUG_PRINT(4, ("mali_runtime_resume() called\n")); ++ KBASE_DEBUG_ASSERT(vinstr_ctx); ++ KBASE_DEBUG_ASSERT(setup); ++ KBASE_DEBUG_ASSERT(setup->buffer_count); + -+ rk_platform_power_on_gpu(device); ++ bitmap[SHADER_HWCNT_BM] = setup->shader_bm; ++ bitmap[TILER_HWCNT_BM] = setup->tiler_bm; ++ bitmap[MMU_L2_HWCNT_BM] = setup->mmu_l2_bm; ++ bitmap[JM_HWCNT_BM] = setup->jm_bm; + -+ if (device->driver && -+ device->driver->pm && -+ device->driver->pm->runtime_resume) { -+ /* Need to notify Mali driver about this event */ -+ ret = device->driver->pm->runtime_resume(device); -+ } ++ cli = kbasep_vinstr_attach_client( ++ vinstr_ctx, ++ setup->buffer_count, ++ bitmap, ++ &setup->fd, ++ NULL); + -+ return ret; ++ if (!cli) ++ return -ENOMEM; ++ ++ return 0; +} + -+static int mali_runtime_idle(struct device *device) ++int kbase_vinstr_legacy_hwc_setup( ++ struct kbase_vinstr_context *vinstr_ctx, ++ struct kbase_vinstr_client **cli, ++ struct kbase_uk_hwcnt_setup *setup) +{ -+ int ret = 0; ++ KBASE_DEBUG_ASSERT(vinstr_ctx); ++ KBASE_DEBUG_ASSERT(setup); ++ KBASE_DEBUG_ASSERT(cli); + -+ MALI_DEBUG_PRINT(4, ("mali_runtime_idle() called\n")); ++ if (setup->dump_buffer) { ++ u32 bitmap[4]; + -+ if (device->driver && -+ device->driver->pm && -+ device->driver->pm->runtime_idle) { -+ /* Need to notify Mali driver about this event */ -+ ret = device->driver->pm->runtime_idle(device); -+ if (ret) -+ return ret; ++ bitmap[SHADER_HWCNT_BM] = setup->shader_bm; ++ bitmap[TILER_HWCNT_BM] = setup->tiler_bm; ++ bitmap[MMU_L2_HWCNT_BM] = setup->mmu_l2_bm; ++ bitmap[JM_HWCNT_BM] = setup->jm_bm; ++ ++ if (*cli) ++ return -EBUSY; ++ ++ *cli = kbasep_vinstr_attach_client( ++ vinstr_ctx, ++ 0, ++ bitmap, ++ (void *)(long)setup->dump_buffer, ++ NULL); ++ ++ if (!(*cli)) ++ return -ENOMEM; ++ } else { ++ if (!*cli) ++ return -EINVAL; ++ ++ kbase_vinstr_detach_client(*cli); ++ *cli = NULL; + } + + return 0; +} -+#endif + -+static int mali_os_suspend(struct device *device) ++struct kbase_vinstr_client *kbase_vinstr_hwcnt_kernel_setup( ++ struct kbase_vinstr_context *vinstr_ctx, ++ struct kbase_uk_hwcnt_reader_setup *setup, ++ void *kernel_buffer) +{ -+ int ret = 0; -+ -+ MALI_DEBUG_PRINT(4, ("mali_os_suspend() called\n")); ++ u32 bitmap[4]; + -+ if (device->driver && -+ device->driver->pm && -+ device->driver->pm->suspend) { -+ /* Need to notify Mali driver about this event */ -+ ret = device->driver->pm->suspend(device); -+ } ++ if (!vinstr_ctx || !setup || !kernel_buffer) ++ return NULL; + -+ if (!ret) -+ rk_platform_power_off_gpu(device); ++ bitmap[SHADER_HWCNT_BM] = setup->shader_bm; ++ bitmap[TILER_HWCNT_BM] = setup->tiler_bm; ++ bitmap[MMU_L2_HWCNT_BM] = setup->mmu_l2_bm; ++ bitmap[JM_HWCNT_BM] = setup->jm_bm; + -+ return ret; ++ return kbasep_vinstr_attach_client( ++ vinstr_ctx, ++ 0, ++ bitmap, ++ NULL, ++ kernel_buffer); +} ++KBASE_EXPORT_TEST_API(kbase_vinstr_hwcnt_kernel_setup); + -+static int mali_os_resume(struct device *device) ++int kbase_vinstr_hwc_dump(struct kbase_vinstr_client *cli, ++ enum base_hwcnt_reader_event event_id) +{ -+ int ret = 0; ++ int rcode = 0; ++ struct kbase_vinstr_context *vinstr_ctx; ++ u64 timestamp; ++ u32 event_mask; + -+ MALI_DEBUG_PRINT(4, ("mali_os_resume() called\n")); ++ if (!cli) ++ return -EINVAL; + -+ rk_platform_power_on_gpu(device); ++ vinstr_ctx = cli->vinstr_ctx; ++ KBASE_DEBUG_ASSERT(vinstr_ctx); + -+ if (device->driver && -+ device->driver->pm && -+ device->driver->pm->resume) { -+ /* Need to notify Mali driver about this event */ -+ ret = device->driver->pm->resume(device); -+ } ++ KBASE_DEBUG_ASSERT(event_id < BASE_HWCNT_READER_EVENT_COUNT); ++ event_mask = 1 << event_id; + -+ return ret; -+} ++ mutex_lock(&vinstr_ctx->lock); + -+static int mali_os_freeze(struct device *device) -+{ -+ int ret = 0; ++ if (event_mask & cli->event_mask) { ++ rcode = kbasep_vinstr_collect_and_accumulate( ++ vinstr_ctx, ++ ×tamp); ++ if (rcode) ++ goto exit; + -+ MALI_DEBUG_PRINT(4, ("mali_os_freeze() called\n")); ++ rcode = kbasep_vinstr_update_client(cli, timestamp, event_id); ++ if (rcode) ++ goto exit; + -+ if (device->driver && -+ device->driver->pm && -+ device->driver->pm->freeze) { -+ /* Need to notify Mali driver about this event */ -+ ret = device->driver->pm->freeze(device); ++ kbasep_vinstr_reprogram(vinstr_ctx); + } + -+ return ret; ++exit: ++ mutex_unlock(&vinstr_ctx->lock); ++ ++ return rcode; +} ++KBASE_EXPORT_TEST_API(kbase_vinstr_hwc_dump); + -+static int mali_os_thaw(struct device *device) ++int kbase_vinstr_hwc_clear(struct kbase_vinstr_client *cli) +{ -+ int ret = 0; ++ struct kbase_vinstr_context *vinstr_ctx; ++ int rcode; ++ u64 unused; + -+ MALI_DEBUG_PRINT(4, ("mali_os_thaw() called\n")); ++ if (!cli) ++ return -EINVAL; + -+ if (device->driver && -+ device->driver->pm && -+ device->driver->pm->thaw) { -+ /* Need to notify Mali driver about this event */ -+ ret = device->driver->pm->thaw(device); -+ } ++ vinstr_ctx = cli->vinstr_ctx; ++ KBASE_DEBUG_ASSERT(vinstr_ctx); + -+ return ret; -+} ++ mutex_lock(&vinstr_ctx->lock); + -+static const struct dev_pm_ops mali_gpu_device_type_pm_ops = { -+ .suspend = mali_os_suspend, -+ .resume = mali_os_resume, -+ .freeze = mali_os_freeze, -+ .thaw = mali_os_thaw, -+#ifdef CONFIG_PM -+ .runtime_suspend = mali_runtime_suspend, -+ .runtime_resume = mali_runtime_resume, -+ .runtime_idle = mali_runtime_idle, -+#endif -+}; ++ rcode = kbasep_vinstr_collect_and_accumulate(vinstr_ctx, &unused); ++ if (rcode) ++ goto exit; ++ rcode = kbase_instr_hwcnt_clear(vinstr_ctx->kctx); ++ if (rcode) ++ goto exit; ++ memset(cli->accum_buffer, 0, cli->dump_size); + -+static const struct device_type mali_gpu_device_device_type = { -+ .pm = &mali_gpu_device_type_pm_ops, -+}; ++ kbasep_vinstr_reprogram(vinstr_ctx); + -+/* -+ * platform_specific_data of platform_device of mali_gpu. -+ */ -+static const struct mali_gpu_device_data mali_gpu_data = { -+ .shared_mem_size = 1024 * 1024 * 1024, /* 1GB */ -+ .max_job_runtime = 60000, /* 60 seconds */ -+#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) -+ .gpu_cooling_ops = &rk_cooling_ops, -+#endif -+}; ++exit: ++ mutex_unlock(&vinstr_ctx->lock); + -+static void mali_platform_device_add_config(struct platform_device *pdev) -+{ -+ pdev->name = MALI_GPU_NAME_UTGARD, -+ pdev->id = 0; -+ pdev->dev.type = &mali_gpu_device_device_type; -+ pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask, -+ pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); ++ return rcode; +} + -+/*---------------------------------------------------------------------------*/ -+/* platform_device_functions called by common_part. */ -+ -+int mali_platform_device_init(struct platform_device *pdev) ++int kbase_vinstr_try_suspend(struct kbase_vinstr_context *vinstr_ctx) +{ -+ int err = 0; ++ unsigned long flags; ++ int ret = -EAGAIN; + -+ mali_platform_device_add_config(pdev); ++ KBASE_DEBUG_ASSERT(vinstr_ctx); + -+ D("to add platform_specific_data to platform_device_of_mali."); -+ err = platform_device_add_data(pdev, -+ &mali_gpu_data, -+ sizeof(mali_gpu_data)); -+ if (err) { -+ E("fail to add platform_specific_data. err : %d.", err); -+ goto add_data_failed; -+ } ++ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); ++ switch (vinstr_ctx->state) { ++ case VINSTR_SUSPENDED: ++ vinstr_ctx->suspend_cnt++; ++ /* overflow shall not happen */ ++ BUG_ON(0 == vinstr_ctx->suspend_cnt); ++ ret = 0; ++ break; + -+ err = rk_context_init(pdev); -+ if (err) { -+ E("fail to init rk_context. err : %d.", err); -+ goto init_rk_context_failed; -+ } ++ case VINSTR_IDLE: ++ vinstr_ctx->state = VINSTR_SUSPENDING; ++ schedule_work(&vinstr_ctx->suspend_work); ++ break; + -+#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) -+ if (of_machine_is_compatible("rockchip,rk3036")) -+ return 0; ++ case VINSTR_DUMPING: ++ vinstr_ctx->state = VINSTR_SUSPENDING; ++ break; + -+ err = power_model_simple_init(pdev); -+ if (err) { -+ E("fail to init simple_power_model, err : %d.", err); -+ goto init_power_model_failed; ++ case VINSTR_SUSPENDING: ++ /* fall through */ ++ case VINSTR_RESUMING: ++ break; ++ ++ default: ++ BUG(); ++ break; + } -+#endif ++ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); + -+ return 0; ++ return ret; ++} + -+#if defined(CONFIG_MALI_DEVFREQ) && defined(CONFIG_DEVFREQ_THERMAL) -+init_power_model_failed: -+ rk_context_deinit(pdev); -+#endif -+init_rk_context_failed: -+add_data_failed: -+ return err; ++void kbase_vinstr_suspend(struct kbase_vinstr_context *vinstr_ctx) ++{ ++ wait_event(vinstr_ctx->suspend_waitq, ++ (0 == kbase_vinstr_try_suspend(vinstr_ctx))); +} + -+void mali_platform_device_deinit(struct platform_device *pdev) ++void kbase_vinstr_resume(struct kbase_vinstr_context *vinstr_ctx) +{ -+ MALI_DEBUG_PRINT(4, ("mali_platform_device_unregister() called\n")); ++ unsigned long flags; + -+ rk_context_deinit(pdev); ++ KBASE_DEBUG_ASSERT(vinstr_ctx); ++ ++ spin_lock_irqsave(&vinstr_ctx->state_lock, flags); ++ BUG_ON(VINSTR_SUSPENDING == vinstr_ctx->state); ++ if (VINSTR_SUSPENDED == vinstr_ctx->state) { ++ BUG_ON(0 == vinstr_ctx->suspend_cnt); ++ vinstr_ctx->suspend_cnt--; ++ if (0 == vinstr_ctx->suspend_cnt) { ++ vinstr_ctx->state = VINSTR_RESUMING; ++ schedule_work(&vinstr_ctx->resume_work); ++ } ++ } ++ spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); +} -diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h b/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h +diff --git a/drivers/gpu/arm/midgard/mali_kbase_vinstr.h b/drivers/gpu/arm/midgard/mali_kbase_vinstr.h new file mode 100755 -index 000000000000..bd939350c425 +index 000000000..6207d25ae --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h -@@ -0,0 +1,37 @@ -+/* SPDX-License-Identifier: GPL-2.0 */ -+/* ---------------------------------------------------------------------------- -+ * File: rk_ext.h ++++ b/drivers/gpu/arm/midgard/mali_kbase_vinstr.h +@@ -0,0 +1,155 @@ ++/* + * -+ * Desc: rk_ext_on_mali_ko 中的 通行定义等. ++ * (C) COPYRIGHT 2015-2016 ARM Limited. All rights reserved. + * -+ * Usage: ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. + * -+ * Note: -+ * -+ * Author: ChenZhen -+ * -+ * Log: ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + * -+ * ---------------------------------------------------------------------------- + */ + -+#ifndef __RK_EXT_H__ -+#define __RK_EXT_H__ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/*---------------------------------------------------------------------------*/ + -+/** version of rk_ext on mali_ko, aka. rk_ko_ver. */ -+#define RK_KO_VER (5) + -+/*---------------------------------------------------------------------------*/ ++#ifndef _KBASE_VINSTR_H_ ++#define _KBASE_VINSTR_H_ + -+#ifdef __cplusplus -+} -+#endif ++#include ++#include + -+#endif /* __RK_EXT_H__ */ ++/*****************************************************************************/ + -diff --git a/drivers/gpu/arm/mali400/mali/readme.txt b/drivers/gpu/arm/mali400/mali/readme.txt -new file mode 100755 -index 000000000000..6785ac933b38 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/readme.txt -@@ -0,0 +1,28 @@ -+Building the Mali Device Driver for Linux -+----------------------------------------- ++struct kbase_vinstr_context; ++struct kbase_vinstr_client; + -+Build the Mali Device Driver for Linux by running the following make command: ++/*****************************************************************************/ + -+KDIR= USING_UMP= BUILD= make ++/** ++ * kbase_vinstr_init() - initialize the vinstr core ++ * @kbdev: kbase device ++ * ++ * Return: pointer to the vinstr context on success or NULL on failure ++ */ ++struct kbase_vinstr_context *kbase_vinstr_init(struct kbase_device *kbdev); + -+where -+ kdir_path: Path to your Linux Kernel directory -+ ump_option: 1 = Enable UMP support(*) -+ 0 = disable UMP support -+ build_option: debug = debug build of driver -+ release = release build of driver ++/** ++ * kbase_vinstr_term() - terminate the vinstr core ++ * @vinstr_ctx: vinstr context ++ */ ++void kbase_vinstr_term(struct kbase_vinstr_context *vinstr_ctx); + -+(*) For newer Linux Kernels, the Module.symvers file for the UMP device driver -+ must be available. The UMP_SYMVERS_FILE variable in the Makefile should -+ point to this file. This file is generated when the UMP driver is built. ++/** ++ * kbase_vinstr_hwcnt_reader_setup - configure hw counters reader ++ * @vinstr_ctx: vinstr context ++ * @setup: reader's configuration ++ * ++ * Return: zero on success ++ */ ++int kbase_vinstr_hwcnt_reader_setup( ++ struct kbase_vinstr_context *vinstr_ctx, ++ struct kbase_uk_hwcnt_reader_setup *setup); + -+The result will be a mali.ko file, which can be loaded into the Linux kernel -+by using the insmod command. ++/** ++ * kbase_vinstr_legacy_hwc_setup - configure hw counters for dumping ++ * @vinstr_ctx: vinstr context ++ * @cli: pointer where to store pointer to new vinstr client structure ++ * @setup: hwc configuration ++ * ++ * Return: zero on success ++ */ ++int kbase_vinstr_legacy_hwc_setup( ++ struct kbase_vinstr_context *vinstr_ctx, ++ struct kbase_vinstr_client **cli, ++ struct kbase_uk_hwcnt_setup *setup); + -+Use of UMP is not recommended. The dma-buf API in the Linux kernel has -+replaced UMP. The Mali Device Driver will be built with dma-buf support if the -+kernel config includes enabled dma-buf. ++/** ++ * kbase_vinstr_hwcnt_kernel_setup - configure hw counters for kernel side ++ * client ++ * @vinstr_ctx: vinstr context ++ * @setup: reader's configuration ++ * @kernel_buffer: pointer to dump buffer ++ * ++ * setup->buffer_count and setup->fd are not used for kernel side clients. ++ * ++ * Return: pointer to client structure, or NULL on failure ++ */ ++struct kbase_vinstr_client *kbase_vinstr_hwcnt_kernel_setup( ++ struct kbase_vinstr_context *vinstr_ctx, ++ struct kbase_uk_hwcnt_reader_setup *setup, ++ void *kernel_buffer); + -+The kernel needs to be provided with a platform_device struct for the Mali GPU -+device. See the mali_utgard.h header file for how to set up the Mali GPU -+resources. -diff --git a/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h b/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h -new file mode 100755 -index 000000000000..0345fb169a95 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h -@@ -0,0 +1,131 @@ -+/* -+ * Copyright (C) 2010, 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * kbase_vinstr_hwc_dump - issue counter dump for vinstr client ++ * @cli: pointer to vinstr client ++ * @event_id: id of event that triggered hwcnt dump ++ * ++ * Return: zero on success + */ ++int kbase_vinstr_hwc_dump( ++ struct kbase_vinstr_client *cli, ++ enum base_hwcnt_reader_event event_id); + -+#ifndef _MALI200_REGS_H_ -+#define _MALI200_REGS_H_ ++/** ++ * kbase_vinstr_hwc_clear - performs a reset of the hardware counters for ++ * a given kbase context ++ * @cli: pointer to vinstr client ++ * ++ * Return: zero on success ++ */ ++int kbase_vinstr_hwc_clear(struct kbase_vinstr_client *cli); + +/** -+ * Enum for management register addresses. ++ * kbase_vinstr_try_suspend - try suspending operation of a given vinstr context ++ * @vinstr_ctx: vinstr context ++ * ++ * Return: 0 on success, or negative if state change is in progress ++ * ++ * Warning: This API call is non-generic. It is meant to be used only by ++ * job scheduler state machine. ++ * ++ * Function initiates vinstr switch to suspended state. Once it was called ++ * vinstr enters suspending state. If function return non-zero value, it ++ * indicates that state switch is not complete and function must be called ++ * again. On state switch vinstr will trigger job scheduler state machine ++ * cycle. + */ -+enum mali200_mgmt_reg { -+ MALI200_REG_ADDR_MGMT_VERSION = 0x1000, -+ MALI200_REG_ADDR_MGMT_CURRENT_REND_LIST_ADDR = 0x1004, -+ MALI200_REG_ADDR_MGMT_STATUS = 0x1008, -+ MALI200_REG_ADDR_MGMT_CTRL_MGMT = 0x100c, ++int kbase_vinstr_try_suspend(struct kbase_vinstr_context *vinstr_ctx); + -+ MALI200_REG_ADDR_MGMT_INT_RAWSTAT = 0x1020, -+ MALI200_REG_ADDR_MGMT_INT_CLEAR = 0x1024, -+ MALI200_REG_ADDR_MGMT_INT_MASK = 0x1028, -+ MALI200_REG_ADDR_MGMT_INT_STATUS = 0x102c, ++/** ++ * kbase_vinstr_suspend - suspends operation of a given vinstr context ++ * @vinstr_ctx: vinstr context ++ * ++ * Function initiates vinstr switch to suspended state. Then it blocks until ++ * operation is completed. ++ */ ++void kbase_vinstr_suspend(struct kbase_vinstr_context *vinstr_ctx); + -+ MALI200_REG_ADDR_MGMT_BUS_ERROR_STATUS = 0x1050, ++/** ++ * kbase_vinstr_resume - resumes operation of a given vinstr context ++ * @vinstr_ctx: vinstr context ++ * ++ * Function can be called only if it was preceded by a successful call ++ * to kbase_vinstr_suspend. ++ */ ++void kbase_vinstr_resume(struct kbase_vinstr_context *vinstr_ctx); + -+ MALI200_REG_ADDR_MGMT_PERF_CNT_0_ENABLE = 0x1080, -+ MALI200_REG_ADDR_MGMT_PERF_CNT_0_SRC = 0x1084, -+ MALI200_REG_ADDR_MGMT_PERF_CNT_0_LIMIT = 0x1088, -+ MALI200_REG_ADDR_MGMT_PERF_CNT_0_VALUE = 0x108c, ++/** ++ * kbase_vinstr_dump_size - Return required size of dump buffer ++ * @kbdev: device pointer ++ * ++ * Return : buffer size in bytes ++ */ ++size_t kbase_vinstr_dump_size(struct kbase_device *kbdev); + -+ MALI200_REG_ADDR_MGMT_PERF_CNT_1_ENABLE = 0x10a0, -+ MALI200_REG_ADDR_MGMT_PERF_CNT_1_SRC = 0x10a4, -+ MALI200_REG_ADDR_MGMT_PERF_CNT_1_VALUE = 0x10ac, ++/** ++ * kbase_vinstr_detach_client - Detach a client from the vinstr core ++ * @cli: pointer to vinstr client ++ */ ++void kbase_vinstr_detach_client(struct kbase_vinstr_client *cli); + -+ MALI200_REG_ADDR_MGMT_PERFMON_CONTR = 0x10b0, -+ MALI200_REG_ADDR_MGMT_PERFMON_BASE = 0x10b4, ++#endif /* _KBASE_VINSTR_H_ */ + -+ MALI200_REG_SIZEOF_REGISTER_BANK = 0x10f0 +diff --git a/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h b/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h +new file mode 100755 +index 000000000..5d6b4021d +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h +@@ -0,0 +1,201 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+}; + -+#define MALI200_REG_VAL_PERF_CNT_ENABLE 1 + -+enum mali200_mgmt_ctrl_mgmt { -+ MALI200_REG_VAL_CTRL_MGMT_STOP_BUS = (1 << 0), -+ MALI200_REG_VAL_CTRL_MGMT_FLUSH_CACHES = (1 << 3), -+ MALI200_REG_VAL_CTRL_MGMT_FORCE_RESET = (1 << 5), -+ MALI200_REG_VAL_CTRL_MGMT_START_RENDERING = (1 << 6), -+ MALI400PP_REG_VAL_CTRL_MGMT_SOFT_RESET = (1 << 7), /* Only valid for Mali-300 and later */ -+}; + -+enum mali200_mgmt_irq { -+ MALI200_REG_VAL_IRQ_END_OF_FRAME = (1 << 0), -+ MALI200_REG_VAL_IRQ_END_OF_TILE = (1 << 1), -+ MALI200_REG_VAL_IRQ_HANG = (1 << 2), -+ MALI200_REG_VAL_IRQ_FORCE_HANG = (1 << 3), -+ MALI200_REG_VAL_IRQ_BUS_ERROR = (1 << 4), -+ MALI200_REG_VAL_IRQ_BUS_STOP = (1 << 5), -+ MALI200_REG_VAL_IRQ_CNT_0_LIMIT = (1 << 6), -+ MALI200_REG_VAL_IRQ_CNT_1_LIMIT = (1 << 7), -+ MALI200_REG_VAL_IRQ_WRITE_BOUNDARY_ERROR = (1 << 8), -+ MALI400PP_REG_VAL_IRQ_INVALID_PLIST_COMMAND = (1 << 9), -+ MALI400PP_REG_VAL_IRQ_CALL_STACK_UNDERFLOW = (1 << 10), -+ MALI400PP_REG_VAL_IRQ_CALL_STACK_OVERFLOW = (1 << 11), -+ MALI400PP_REG_VAL_IRQ_RESET_COMPLETED = (1 << 12), -+}; ++#if !defined(_TRACE_MALI_KBASE_H) || defined(TRACE_HEADER_MULTI_READ) ++#define _TRACE_MALI_KBASE_H + -+#define MALI200_REG_VAL_IRQ_MASK_ALL ((enum mali200_mgmt_irq) (\ -+ MALI200_REG_VAL_IRQ_END_OF_FRAME |\ -+ MALI200_REG_VAL_IRQ_END_OF_TILE |\ -+ MALI200_REG_VAL_IRQ_HANG |\ -+ MALI200_REG_VAL_IRQ_FORCE_HANG |\ -+ MALI200_REG_VAL_IRQ_BUS_ERROR |\ -+ MALI200_REG_VAL_IRQ_BUS_STOP |\ -+ MALI200_REG_VAL_IRQ_CNT_0_LIMIT |\ -+ MALI200_REG_VAL_IRQ_CNT_1_LIMIT |\ -+ MALI200_REG_VAL_IRQ_WRITE_BOUNDARY_ERROR |\ -+ MALI400PP_REG_VAL_IRQ_INVALID_PLIST_COMMAND |\ -+ MALI400PP_REG_VAL_IRQ_CALL_STACK_UNDERFLOW |\ -+ MALI400PP_REG_VAL_IRQ_CALL_STACK_OVERFLOW |\ -+ MALI400PP_REG_VAL_IRQ_RESET_COMPLETED)) ++#undef TRACE_SYSTEM ++#define TRACE_SYSTEM mali + -+#define MALI200_REG_VAL_IRQ_MASK_USED ((enum mali200_mgmt_irq) (\ -+ MALI200_REG_VAL_IRQ_END_OF_FRAME |\ -+ MALI200_REG_VAL_IRQ_FORCE_HANG |\ -+ MALI200_REG_VAL_IRQ_BUS_ERROR |\ -+ MALI200_REG_VAL_IRQ_WRITE_BOUNDARY_ERROR |\ -+ MALI400PP_REG_VAL_IRQ_INVALID_PLIST_COMMAND |\ -+ MALI400PP_REG_VAL_IRQ_CALL_STACK_UNDERFLOW |\ -+ MALI400PP_REG_VAL_IRQ_CALL_STACK_OVERFLOW)) ++#include + -+#define MALI200_REG_VAL_IRQ_MASK_NONE ((enum mali200_mgmt_irq)(0)) ++DECLARE_EVENT_CLASS(mali_slot_template, ++ TP_PROTO(int jobslot, unsigned int info_val), ++ TP_ARGS(jobslot, info_val), ++ TP_STRUCT__entry( ++ __field(unsigned int, jobslot) ++ __field(unsigned int, info_val) ++ ), ++ TP_fast_assign( ++ __entry->jobslot = jobslot; ++ __entry->info_val = info_val; ++ ), ++ TP_printk("jobslot=%u info=%u", __entry->jobslot, __entry->info_val) ++); + -+enum mali200_mgmt_status { -+ MALI200_REG_VAL_STATUS_RENDERING_ACTIVE = (1 << 0), -+ MALI200_REG_VAL_STATUS_BUS_STOPPED = (1 << 4), -+}; ++#define DEFINE_MALI_SLOT_EVENT(name) \ ++DEFINE_EVENT(mali_slot_template, mali_##name, \ ++ TP_PROTO(int jobslot, unsigned int info_val), \ ++ TP_ARGS(jobslot, info_val)) ++DEFINE_MALI_SLOT_EVENT(JM_SUBMIT); ++DEFINE_MALI_SLOT_EVENT(JM_JOB_DONE); ++DEFINE_MALI_SLOT_EVENT(JM_UPDATE_HEAD); ++DEFINE_MALI_SLOT_EVENT(JM_CHECK_HEAD); ++DEFINE_MALI_SLOT_EVENT(JM_SOFTSTOP); ++DEFINE_MALI_SLOT_EVENT(JM_SOFTSTOP_0); ++DEFINE_MALI_SLOT_EVENT(JM_SOFTSTOP_1); ++DEFINE_MALI_SLOT_EVENT(JM_HARDSTOP); ++DEFINE_MALI_SLOT_EVENT(JM_HARDSTOP_0); ++DEFINE_MALI_SLOT_EVENT(JM_HARDSTOP_1); ++DEFINE_MALI_SLOT_EVENT(JM_SLOT_SOFT_OR_HARD_STOP); ++DEFINE_MALI_SLOT_EVENT(JM_SLOT_EVICT); ++DEFINE_MALI_SLOT_EVENT(JM_BEGIN_RESET_WORKER); ++DEFINE_MALI_SLOT_EVENT(JM_END_RESET_WORKER); ++DEFINE_MALI_SLOT_EVENT(JS_CORE_REF_REGISTER_ON_RECHECK_FAILED); ++DEFINE_MALI_SLOT_EVENT(JS_AFFINITY_SUBMIT_TO_BLOCKED); ++DEFINE_MALI_SLOT_EVENT(JS_AFFINITY_CURRENT); ++DEFINE_MALI_SLOT_EVENT(JD_DONE_TRY_RUN_NEXT_JOB); ++DEFINE_MALI_SLOT_EVENT(JS_CORE_REF_REQUEST_CORES_FAILED); ++DEFINE_MALI_SLOT_EVENT(JS_CORE_REF_REGISTER_INUSE_FAILED); ++DEFINE_MALI_SLOT_EVENT(JS_CORE_REF_REQUEST_ON_RECHECK_FAILED); ++DEFINE_MALI_SLOT_EVENT(JS_CORE_REF_AFFINITY_WOULD_VIOLATE); ++DEFINE_MALI_SLOT_EVENT(JS_JOB_DONE_TRY_RUN_NEXT_JOB); ++DEFINE_MALI_SLOT_EVENT(JS_JOB_DONE_RETRY_NEEDED); ++DEFINE_MALI_SLOT_EVENT(JS_POLICY_DEQUEUE_JOB); ++DEFINE_MALI_SLOT_EVENT(JS_POLICY_DEQUEUE_JOB_IRQ); ++#undef DEFINE_MALI_SLOT_EVENT + -+enum mali200_render_unit { -+ MALI200_REG_ADDR_FRAME = 0x0000, -+ MALI200_REG_ADDR_RSW = 0x0004, -+ MALI200_REG_ADDR_STACK = 0x0030, -+ MALI200_REG_ADDR_STACK_SIZE = 0x0034, -+ MALI200_REG_ADDR_ORIGIN_OFFSET_X = 0x0040 -+}; ++DECLARE_EVENT_CLASS(mali_refcount_template, ++ TP_PROTO(int refcount, unsigned int info_val), ++ TP_ARGS(refcount, info_val), ++ TP_STRUCT__entry( ++ __field(unsigned int, refcount) ++ __field(unsigned int, info_val) ++ ), ++ TP_fast_assign( ++ __entry->refcount = refcount; ++ __entry->info_val = info_val; ++ ), ++ TP_printk("refcount=%u info=%u", __entry->refcount, __entry->info_val) ++); + -+enum mali200_wb_unit { -+ MALI200_REG_ADDR_WB0 = 0x0100, -+ MALI200_REG_ADDR_WB1 = 0x0200, -+ MALI200_REG_ADDR_WB2 = 0x0300 -+}; ++#define DEFINE_MALI_REFCOUNT_EVENT(name) \ ++DEFINE_EVENT(mali_refcount_template, mali_##name, \ ++ TP_PROTO(int refcount, unsigned int info_val), \ ++ TP_ARGS(refcount, info_val)) ++DEFINE_MALI_REFCOUNT_EVENT(JS_RETAIN_CTX_NOLOCK); ++DEFINE_MALI_REFCOUNT_EVENT(JS_ADD_JOB); ++DEFINE_MALI_REFCOUNT_EVENT(JS_REMOVE_JOB); ++DEFINE_MALI_REFCOUNT_EVENT(JS_RETAIN_CTX); ++DEFINE_MALI_REFCOUNT_EVENT(JS_RELEASE_CTX); ++DEFINE_MALI_REFCOUNT_EVENT(JS_TRY_SCHEDULE_HEAD_CTX); ++DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_INIT_CTX); ++DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_TERM_CTX); ++DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_ENQUEUE_CTX); ++DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_DEQUEUE_HEAD_CTX); ++DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_TRY_EVICT_CTX); ++DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_RUNPOOL_ADD_CTX); ++DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_RUNPOOL_REMOVE_CTX); ++DEFINE_MALI_REFCOUNT_EVENT(JS_POLICY_FOREACH_CTX_JOBS); ++DEFINE_MALI_REFCOUNT_EVENT(PM_CONTEXT_ACTIVE); ++DEFINE_MALI_REFCOUNT_EVENT(PM_CONTEXT_IDLE); ++#undef DEFINE_MALI_REFCOUNT_EVENT + -+enum mali200_wb_unit_regs { -+ MALI200_REG_ADDR_WB_SOURCE_SELECT = 0x0000, -+ MALI200_REG_ADDR_WB_SOURCE_ADDR = 0x0004, -+}; ++DECLARE_EVENT_CLASS(mali_add_template, ++ TP_PROTO(int gpu_addr, unsigned int info_val), ++ TP_ARGS(gpu_addr, info_val), ++ TP_STRUCT__entry( ++ __field(unsigned int, gpu_addr) ++ __field(unsigned int, info_val) ++ ), ++ TP_fast_assign( ++ __entry->gpu_addr = gpu_addr; ++ __entry->info_val = info_val; ++ ), ++ TP_printk("gpu_addr=%u info=%u", __entry->gpu_addr, __entry->info_val) ++); + -+/* This should be in the top 16 bit of the version register of Mali PP */ -+#define MALI200_PP_PRODUCT_ID 0xC807 -+#define MALI300_PP_PRODUCT_ID 0xCE07 -+#define MALI400_PP_PRODUCT_ID 0xCD07 -+#define MALI450_PP_PRODUCT_ID 0xCF07 -+#define MALI470_PP_PRODUCT_ID 0xCF08 ++#define DEFINE_MALI_ADD_EVENT(name) \ ++DEFINE_EVENT(mali_add_template, mali_##name, \ ++ TP_PROTO(int gpu_addr, unsigned int info_val), \ ++ TP_ARGS(gpu_addr, info_val)) ++DEFINE_MALI_ADD_EVENT(CORE_CTX_DESTROY); ++DEFINE_MALI_ADD_EVENT(CORE_CTX_HWINSTR_TERM); ++DEFINE_MALI_ADD_EVENT(CORE_GPU_IRQ); ++DEFINE_MALI_ADD_EVENT(CORE_GPU_IRQ_CLEAR); ++DEFINE_MALI_ADD_EVENT(CORE_GPU_IRQ_DONE); ++DEFINE_MALI_ADD_EVENT(CORE_GPU_SOFT_RESET); ++DEFINE_MALI_ADD_EVENT(CORE_GPU_HARD_RESET); ++DEFINE_MALI_ADD_EVENT(CORE_GPU_PRFCNT_SAMPLE); ++DEFINE_MALI_ADD_EVENT(CORE_GPU_PRFCNT_CLEAR); ++DEFINE_MALI_ADD_EVENT(CORE_GPU_CLEAN_INV_CACHES); ++DEFINE_MALI_ADD_EVENT(JD_DONE_WORKER); ++DEFINE_MALI_ADD_EVENT(JD_DONE_WORKER_END); ++DEFINE_MALI_ADD_EVENT(JD_CANCEL_WORKER); ++DEFINE_MALI_ADD_EVENT(JD_DONE); ++DEFINE_MALI_ADD_EVENT(JD_CANCEL); ++DEFINE_MALI_ADD_EVENT(JD_ZAP_CONTEXT); ++DEFINE_MALI_ADD_EVENT(JM_IRQ); ++DEFINE_MALI_ADD_EVENT(JM_IRQ_END); ++DEFINE_MALI_ADD_EVENT(JM_FLUSH_WORKQS); ++DEFINE_MALI_ADD_EVENT(JM_FLUSH_WORKQS_DONE); ++DEFINE_MALI_ADD_EVENT(JM_ZAP_NON_SCHEDULED); ++DEFINE_MALI_ADD_EVENT(JM_ZAP_SCHEDULED); ++DEFINE_MALI_ADD_EVENT(JM_ZAP_DONE); ++DEFINE_MALI_ADD_EVENT(JM_SUBMIT_AFTER_RESET); ++DEFINE_MALI_ADD_EVENT(JM_JOB_COMPLETE); ++DEFINE_MALI_ADD_EVENT(JS_FAST_START_EVICTS_CTX); ++DEFINE_MALI_ADD_EVENT(JS_CTX_ATTR_NOW_ON_RUNPOOL); ++DEFINE_MALI_ADD_EVENT(JS_CTX_ATTR_NOW_OFF_RUNPOOL); ++DEFINE_MALI_ADD_EVENT(JS_CTX_ATTR_NOW_ON_CTX); ++DEFINE_MALI_ADD_EVENT(JS_CTX_ATTR_NOW_OFF_CTX); ++DEFINE_MALI_ADD_EVENT(JS_POLICY_TIMER_END); ++DEFINE_MALI_ADD_EVENT(JS_POLICY_TIMER_START); ++DEFINE_MALI_ADD_EVENT(JS_POLICY_ENQUEUE_JOB); ++DEFINE_MALI_ADD_EVENT(PM_CORES_CHANGE_DESIRED); ++DEFINE_MALI_ADD_EVENT(PM_JOB_SUBMIT_AFTER_POWERING_UP); ++DEFINE_MALI_ADD_EVENT(PM_JOB_SUBMIT_AFTER_POWERED_UP); ++DEFINE_MALI_ADD_EVENT(PM_PWRON); ++DEFINE_MALI_ADD_EVENT(PM_PWRON_TILER); ++DEFINE_MALI_ADD_EVENT(PM_PWRON_L2); ++DEFINE_MALI_ADD_EVENT(PM_PWROFF); ++DEFINE_MALI_ADD_EVENT(PM_PWROFF_TILER); ++DEFINE_MALI_ADD_EVENT(PM_PWROFF_L2); ++DEFINE_MALI_ADD_EVENT(PM_CORES_POWERED); ++DEFINE_MALI_ADD_EVENT(PM_CORES_POWERED_TILER); ++DEFINE_MALI_ADD_EVENT(PM_CORES_POWERED_L2); ++DEFINE_MALI_ADD_EVENT(PM_DESIRED_REACHED); ++DEFINE_MALI_ADD_EVENT(PM_DESIRED_REACHED_TILER); ++DEFINE_MALI_ADD_EVENT(PM_UNREQUEST_CHANGE_SHADER_NEEDED); ++DEFINE_MALI_ADD_EVENT(PM_REQUEST_CHANGE_SHADER_NEEDED); ++DEFINE_MALI_ADD_EVENT(PM_REGISTER_CHANGE_SHADER_NEEDED); ++DEFINE_MALI_ADD_EVENT(PM_REGISTER_CHANGE_SHADER_INUSE); ++DEFINE_MALI_ADD_EVENT(PM_RELEASE_CHANGE_SHADER_INUSE); ++DEFINE_MALI_ADD_EVENT(PM_CORES_AVAILABLE); ++DEFINE_MALI_ADD_EVENT(PM_CORES_AVAILABLE_TILER); ++DEFINE_MALI_ADD_EVENT(PM_CORES_CHANGE_AVAILABLE); ++DEFINE_MALI_ADD_EVENT(PM_CORES_CHANGE_AVAILABLE_TILER); ++DEFINE_MALI_ADD_EVENT(PM_GPU_ON); ++DEFINE_MALI_ADD_EVENT(PM_GPU_OFF); ++DEFINE_MALI_ADD_EVENT(PM_SET_POLICY); ++DEFINE_MALI_ADD_EVENT(PM_CURRENT_POLICY_INIT); ++DEFINE_MALI_ADD_EVENT(PM_CURRENT_POLICY_TERM); ++DEFINE_MALI_ADD_EVENT(PM_CA_SET_POLICY); ++DEFINE_MALI_ADD_EVENT(PM_WAKE_WAITERS); ++#undef DEFINE_MALI_ADD_EVENT + ++#endif /* _TRACE_MALI_KBASE_H */ + ++#undef TRACE_INCLUDE_PATH ++#undef linux ++#define TRACE_INCLUDE_PATH . ++#undef TRACE_INCLUDE_FILE ++#define TRACE_INCLUDE_FILE mali_linux_kbase_trace + -+#endif /* _MALI200_REGS_H_ */ -diff --git a/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h b/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h ++/* This part must be outside protection */ ++#include +diff --git a/drivers/gpu/arm/midgard/mali_linux_trace.h b/drivers/gpu/arm/midgard/mali_linux_trace.h new file mode 100755 -index 000000000000..7f8b58fd6c49 +index 000000000..2be06a552 --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h -@@ -0,0 +1,172 @@ ++++ b/drivers/gpu/arm/midgard/mali_linux_trace.h +@@ -0,0 +1,189 @@ +/* -+ * Copyright (C) 2010, 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef _MALIGP2_CONROL_REGS_H_ -+#define _MALIGP2_CONROL_REGS_H_ + -+/** -+ * These are the different geometry processor control registers. -+ * Their usage is to control and monitor the operation of the -+ * Vertex Shader and the Polygon List Builder in the geometry processor. -+ * Addresses are in 32-bit word relative sizes. -+ * @see [P0081] "Geometry Processor Data Structures" for details -+ */ + -+typedef enum { -+ MALIGP2_REG_ADDR_MGMT_VSCL_START_ADDR = 0x00, -+ MALIGP2_REG_ADDR_MGMT_VSCL_END_ADDR = 0x04, -+ MALIGP2_REG_ADDR_MGMT_PLBUCL_START_ADDR = 0x08, -+ MALIGP2_REG_ADDR_MGMT_PLBUCL_END_ADDR = 0x0c, -+ MALIGP2_REG_ADDR_MGMT_PLBU_ALLOC_START_ADDR = 0x10, -+ MALIGP2_REG_ADDR_MGMT_PLBU_ALLOC_END_ADDR = 0x14, -+ MALIGP2_REG_ADDR_MGMT_CMD = 0x20, -+ MALIGP2_REG_ADDR_MGMT_INT_RAWSTAT = 0x24, -+ MALIGP2_REG_ADDR_MGMT_INT_CLEAR = 0x28, -+ MALIGP2_REG_ADDR_MGMT_INT_MASK = 0x2C, -+ MALIGP2_REG_ADDR_MGMT_INT_STAT = 0x30, -+ MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_ENABLE = 0x3C, -+ MALIGP2_REG_ADDR_MGMT_PERF_CNT_1_ENABLE = 0x40, -+ MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_SRC = 0x44, -+ MALIGP2_REG_ADDR_MGMT_PERF_CNT_1_SRC = 0x48, -+ MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_VALUE = 0x4C, -+ MALIGP2_REG_ADDR_MGMT_PERF_CNT_1_VALUE = 0x50, -+ MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_LIMIT = 0x54, -+ MALIGP2_REG_ADDR_MGMT_STATUS = 0x68, -+ MALIGP2_REG_ADDR_MGMT_VERSION = 0x6C, -+ MALIGP2_REG_ADDR_MGMT_VSCL_START_ADDR_READ = 0x80, -+ MALIGP2_REG_ADDR_MGMT_PLBCL_START_ADDR_READ = 0x84, -+ MALIGP2_CONTR_AXI_BUS_ERROR_STAT = 0x94, -+ MALIGP2_REGISTER_ADDRESS_SPACE_SIZE = 0x98, -+} maligp_reg_addr_mgmt_addr; ++#if !defined(_TRACE_MALI_H) || defined(TRACE_HEADER_MULTI_READ) ++#define _TRACE_MALI_H + -+#define MALIGP2_REG_VAL_PERF_CNT_ENABLE 1 ++#undef TRACE_SYSTEM ++#define TRACE_SYSTEM mali ++#define TRACE_INCLUDE_FILE mali_linux_trace + -+/** -+ * Commands to geometry processor. -+ * @see MALIGP2_CTRL_REG_CMD -+ */ -+typedef enum { -+ MALIGP2_REG_VAL_CMD_START_VS = (1 << 0), -+ MALIGP2_REG_VAL_CMD_START_PLBU = (1 << 1), -+ MALIGP2_REG_VAL_CMD_UPDATE_PLBU_ALLOC = (1 << 4), -+ MALIGP2_REG_VAL_CMD_RESET = (1 << 5), -+ MALIGP2_REG_VAL_CMD_FORCE_HANG = (1 << 6), -+ MALIGP2_REG_VAL_CMD_STOP_BUS = (1 << 9), -+ MALI400GP_REG_VAL_CMD_SOFT_RESET = (1 << 10), /* only valid for Mali-300 and later */ -+} mgp_contr_reg_val_cmd; ++#include + ++#define MALI_JOB_SLOTS_EVENT_CHANGED + -+/** @defgroup MALIGP2_IRQ -+ * Interrupt status of geometry processor. -+ * @see MALIGP2_CTRL_REG_INT_RAWSTAT, MALIGP2_REG_ADDR_MGMT_INT_CLEAR, -+ * MALIGP2_REG_ADDR_MGMT_INT_MASK, MALIGP2_REG_ADDR_MGMT_INT_STAT -+ * @{ ++/** ++ * mali_job_slots_event - called from mali_kbase_core_linux.c ++ * @event_id: ORed together bitfields representing a type of event, made with the GATOR_MAKE_EVENT() macro. + */ -+#define MALIGP2_REG_VAL_IRQ_VS_END_CMD_LST (1 << 0) -+#define MALIGP2_REG_VAL_IRQ_PLBU_END_CMD_LST (1 << 1) -+#define MALIGP2_REG_VAL_IRQ_PLBU_OUT_OF_MEM (1 << 2) -+#define MALIGP2_REG_VAL_IRQ_VS_SEM_IRQ (1 << 3) -+#define MALIGP2_REG_VAL_IRQ_PLBU_SEM_IRQ (1 << 4) -+#define MALIGP2_REG_VAL_IRQ_HANG (1 << 5) -+#define MALIGP2_REG_VAL_IRQ_FORCE_HANG (1 << 6) -+#define MALIGP2_REG_VAL_IRQ_PERF_CNT_0_LIMIT (1 << 7) -+#define MALIGP2_REG_VAL_IRQ_PERF_CNT_1_LIMIT (1 << 8) -+#define MALIGP2_REG_VAL_IRQ_WRITE_BOUND_ERR (1 << 9) -+#define MALIGP2_REG_VAL_IRQ_SYNC_ERROR (1 << 10) -+#define MALIGP2_REG_VAL_IRQ_AXI_BUS_ERROR (1 << 11) -+#define MALI400GP_REG_VAL_IRQ_AXI_BUS_STOPPED (1 << 12) -+#define MALI400GP_REG_VAL_IRQ_VS_INVALID_CMD (1 << 13) -+#define MALI400GP_REG_VAL_IRQ_PLB_INVALID_CMD (1 << 14) -+#define MALI400GP_REG_VAL_IRQ_RESET_COMPLETED (1 << 19) -+#define MALI400GP_REG_VAL_IRQ_SEMAPHORE_UNDERFLOW (1 << 20) -+#define MALI400GP_REG_VAL_IRQ_SEMAPHORE_OVERFLOW (1 << 21) -+#define MALI400GP_REG_VAL_IRQ_PTR_ARRAY_OUT_OF_BOUNDS (1 << 22) -+ -+/* Mask defining all IRQs in Mali GP */ -+#define MALIGP2_REG_VAL_IRQ_MASK_ALL \ -+ (\ -+ MALIGP2_REG_VAL_IRQ_VS_END_CMD_LST | \ -+ MALIGP2_REG_VAL_IRQ_PLBU_END_CMD_LST | \ -+ MALIGP2_REG_VAL_IRQ_PLBU_OUT_OF_MEM | \ -+ MALIGP2_REG_VAL_IRQ_VS_SEM_IRQ | \ -+ MALIGP2_REG_VAL_IRQ_PLBU_SEM_IRQ | \ -+ MALIGP2_REG_VAL_IRQ_HANG | \ -+ MALIGP2_REG_VAL_IRQ_FORCE_HANG | \ -+ MALIGP2_REG_VAL_IRQ_PERF_CNT_0_LIMIT | \ -+ MALIGP2_REG_VAL_IRQ_PERF_CNT_1_LIMIT | \ -+ MALIGP2_REG_VAL_IRQ_WRITE_BOUND_ERR | \ -+ MALIGP2_REG_VAL_IRQ_SYNC_ERROR | \ -+ MALIGP2_REG_VAL_IRQ_AXI_BUS_ERROR | \ -+ MALI400GP_REG_VAL_IRQ_AXI_BUS_STOPPED | \ -+ MALI400GP_REG_VAL_IRQ_VS_INVALID_CMD | \ -+ MALI400GP_REG_VAL_IRQ_PLB_INVALID_CMD | \ -+ MALI400GP_REG_VAL_IRQ_RESET_COMPLETED | \ -+ MALI400GP_REG_VAL_IRQ_SEMAPHORE_UNDERFLOW | \ -+ MALI400GP_REG_VAL_IRQ_SEMAPHORE_OVERFLOW | \ -+ MALI400GP_REG_VAL_IRQ_PTR_ARRAY_OUT_OF_BOUNDS) -+ -+/* Mask defining the IRQs in Mali GP which we use */ -+#define MALIGP2_REG_VAL_IRQ_MASK_USED \ -+ (\ -+ MALIGP2_REG_VAL_IRQ_VS_END_CMD_LST | \ -+ MALIGP2_REG_VAL_IRQ_PLBU_END_CMD_LST | \ -+ MALIGP2_REG_VAL_IRQ_PLBU_OUT_OF_MEM | \ -+ MALIGP2_REG_VAL_IRQ_FORCE_HANG | \ -+ MALIGP2_REG_VAL_IRQ_WRITE_BOUND_ERR | \ -+ MALIGP2_REG_VAL_IRQ_SYNC_ERROR | \ -+ MALIGP2_REG_VAL_IRQ_AXI_BUS_ERROR | \ -+ MALI400GP_REG_VAL_IRQ_VS_INVALID_CMD | \ -+ MALI400GP_REG_VAL_IRQ_PLB_INVALID_CMD | \ -+ MALI400GP_REG_VAL_IRQ_SEMAPHORE_UNDERFLOW | \ -+ MALI400GP_REG_VAL_IRQ_SEMAPHORE_OVERFLOW | \ -+ MALI400GP_REG_VAL_IRQ_PTR_ARRAY_OUT_OF_BOUNDS) -+ -+/* Mask defining non IRQs on MaliGP2*/ -+#define MALIGP2_REG_VAL_IRQ_MASK_NONE 0 ++TRACE_EVENT(mali_job_slots_event, ++ TP_PROTO(unsigned int event_id, unsigned int tgid, unsigned int pid, ++ unsigned char job_id), ++ TP_ARGS(event_id, tgid, pid, job_id), ++ TP_STRUCT__entry( ++ __field(unsigned int, event_id) ++ __field(unsigned int, tgid) ++ __field(unsigned int, pid) ++ __field(unsigned char, job_id) ++ ), ++ TP_fast_assign( ++ __entry->event_id = event_id; ++ __entry->tgid = tgid; ++ __entry->pid = pid; ++ __entry->job_id = job_id; ++ ), ++ TP_printk("event=%u tgid=%u pid=%u job_id=%u", ++ __entry->event_id, __entry->tgid, __entry->pid, __entry->job_id) ++); + -+/** }@ defgroup MALIGP2_IRQ*/ ++/** ++ * mali_pm_status - Called by mali_kbase_pm_driver.c ++ * @event_id: core type (shader, tiler, l2 cache) ++ * @value: 64bits bitmask reporting either power status of the cores (1-ON, 0-OFF) ++ */ ++TRACE_EVENT(mali_pm_status, ++ TP_PROTO(unsigned int event_id, unsigned long long value), ++ TP_ARGS(event_id, value), ++ TP_STRUCT__entry( ++ __field(unsigned int, event_id) ++ __field(unsigned long long, value) ++ ), ++ TP_fast_assign( ++ __entry->event_id = event_id; ++ __entry->value = value; ++ ), ++ TP_printk("event %u = %llu", __entry->event_id, __entry->value) ++); + -+/** @defgroup MALIGP2_STATUS -+ * The different Status values to the geometry processor. -+ * @see MALIGP2_CTRL_REG_STATUS -+ * @{ ++/** ++ * mali_pm_power_on - Called by mali_kbase_pm_driver.c ++ * @event_id: core type (shader, tiler, l2 cache) ++ * @value: 64bits bitmask reporting the cores to power up + */ -+#define MALIGP2_REG_VAL_STATUS_VS_ACTIVE 0x0002 -+#define MALIGP2_REG_VAL_STATUS_BUS_STOPPED 0x0004 -+#define MALIGP2_REG_VAL_STATUS_PLBU_ACTIVE 0x0008 -+#define MALIGP2_REG_VAL_STATUS_BUS_ERROR 0x0040 -+#define MALIGP2_REG_VAL_STATUS_WRITE_BOUND_ERR 0x0100 -+/** }@ defgroup MALIGP2_STATUS*/ ++TRACE_EVENT(mali_pm_power_on, ++ TP_PROTO(unsigned int event_id, unsigned long long value), ++ TP_ARGS(event_id, value), ++ TP_STRUCT__entry( ++ __field(unsigned int, event_id) ++ __field(unsigned long long, value) ++ ), ++ TP_fast_assign( ++ __entry->event_id = event_id; ++ __entry->value = value; ++ ), ++ TP_printk("event %u = %llu", __entry->event_id, __entry->value) ++); + -+#define MALIGP2_REG_VAL_STATUS_MASK_ACTIVE (\ -+ MALIGP2_REG_VAL_STATUS_VS_ACTIVE|\ -+ MALIGP2_REG_VAL_STATUS_PLBU_ACTIVE) ++/** ++ * mali_pm_power_off - Called by mali_kbase_pm_driver.c ++ * @event_id: core type (shader, tiler, l2 cache) ++ * @value: 64bits bitmask reporting the cores to power down ++ */ ++TRACE_EVENT(mali_pm_power_off, ++ TP_PROTO(unsigned int event_id, unsigned long long value), ++ TP_ARGS(event_id, value), ++ TP_STRUCT__entry( ++ __field(unsigned int, event_id) ++ __field(unsigned long long, value) ++ ), ++ TP_fast_assign( ++ __entry->event_id = event_id; ++ __entry->value = value; ++ ), ++ TP_printk("event %u = %llu", __entry->event_id, __entry->value) ++); + ++/** ++ * mali_page_fault_insert_pages - Called by page_fault_worker() ++ * it reports an MMU page fault resulting in new pages being mapped. ++ * @event_id: MMU address space number. ++ * @value: number of newly allocated pages ++ */ ++TRACE_EVENT(mali_page_fault_insert_pages, ++ TP_PROTO(int event_id, unsigned long value), ++ TP_ARGS(event_id, value), ++ TP_STRUCT__entry( ++ __field(int, event_id) ++ __field(unsigned long, value) ++ ), ++ TP_fast_assign( ++ __entry->event_id = event_id; ++ __entry->value = value; ++ ), ++ TP_printk("event %d = %lu", __entry->event_id, __entry->value) ++); + -+#define MALIGP2_REG_VAL_STATUS_MASK_ERROR (\ -+ MALIGP2_REG_VAL_STATUS_BUS_ERROR |\ -+ MALIGP2_REG_VAL_STATUS_WRITE_BOUND_ERR ) ++/** ++ * mali_mmu_as_in_use - Called by assign_and_activate_kctx_addr_space() ++ * it reports that a certain MMU address space is in use now. ++ * @event_id: MMU address space number. ++ */ ++TRACE_EVENT(mali_mmu_as_in_use, ++ TP_PROTO(int event_id), ++ TP_ARGS(event_id), ++ TP_STRUCT__entry( ++ __field(int, event_id) ++ ), ++ TP_fast_assign( ++ __entry->event_id = event_id; ++ ), ++ TP_printk("event=%d", __entry->event_id) ++); + -+/* This should be in the top 16 bit of the version register of gp.*/ -+#define MALI200_GP_PRODUCT_ID 0xA07 -+#define MALI300_GP_PRODUCT_ID 0xC07 -+#define MALI400_GP_PRODUCT_ID 0xB07 -+#define MALI450_GP_PRODUCT_ID 0xD07 ++/** ++ * mali_mmu_as_released - Called by kbasep_js_runpool_release_ctx_internal() ++ * it reports that a certain MMU address space has been released now. ++ * @event_id: MMU address space number. ++ */ ++TRACE_EVENT(mali_mmu_as_released, ++ TP_PROTO(int event_id), ++ TP_ARGS(event_id), ++ TP_STRUCT__entry( ++ __field(int, event_id) ++ ), ++ TP_fast_assign( ++ __entry->event_id = event_id; ++ ), ++ TP_printk("event=%d", __entry->event_id) ++); + +/** -+ * The different sources for instrumented on the geometry processor. -+ * @see MALIGP2_REG_ADDR_MGMT_PERF_CNT_0_SRC ++ * mali_total_alloc_pages_change - Called by kbase_atomic_add_pages() ++ * and by kbase_atomic_sub_pages() ++ * it reports that the total number of allocated pages is changed. ++ * @event_id: number of pages to be added or subtracted (according to the sign). + */ ++TRACE_EVENT(mali_total_alloc_pages_change, ++ TP_PROTO(long long int event_id), ++ TP_ARGS(event_id), ++ TP_STRUCT__entry( ++ __field(long long int, event_id) ++ ), ++ TP_fast_assign( ++ __entry->event_id = event_id; ++ ), ++ TP_printk("event=%lld", __entry->event_id) ++); + -+enum MALIGP2_cont_reg_perf_cnt_src { -+ MALIGP2_REG_VAL_PERF_CNT1_SRC_NUMBER_OF_VERTICES_PROCESSED = 0x0a, -+}; ++#endif /* _TRACE_MALI_H */ + -+#endif -diff --git a/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c ++#undef TRACE_INCLUDE_PATH ++#undef linux ++#define TRACE_INCLUDE_PATH . ++ ++/* This part must be outside protection */ ++#include +diff --git a/drivers/gpu/arm/midgard/mali_malisw.h b/drivers/gpu/arm/midgard/mali_malisw.h new file mode 100755 -index 000000000000..7df934c12122 +index 000000000..99452933e --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c -@@ -0,0 +1,13 @@ ++++ b/drivers/gpu/arm/midgard/mali_malisw.h +@@ -0,0 +1,131 @@ +/* -+ * Copyright (C) 2010-2011, 2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include "mali_timestamp.h" + -+/* This file is intentionally left empty, as all functions are inlined in mali_profiling_sampler.h */ -diff --git a/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h -new file mode 100755 -index 000000000000..f52097c1901b ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h -@@ -0,0 +1,48 @@ -+/* -+ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ + -+#ifndef __MALI_TIMESTAMP_H__ -+#define __MALI_TIMESTAMP_H__ ++/** ++ * Kernel-wide include for common macros and types. ++ */ + -+#include "mali_osk.h" ++#ifndef _MALISW_H_ ++#define _MALISW_H_ + -+MALI_STATIC_INLINE _mali_osk_errcode_t _mali_timestamp_reset(void) -+{ -+ /* -+ * reset counters and overflow flags -+ */ ++#include ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) ++#define U8_MAX ((u8)~0U) ++#define S8_MAX ((s8)(U8_MAX>>1)) ++#define S8_MIN ((s8)(-S8_MAX - 1)) ++#define U16_MAX ((u16)~0U) ++#define S16_MAX ((s16)(U16_MAX>>1)) ++#define S16_MIN ((s16)(-S16_MAX - 1)) ++#define U32_MAX ((u32)~0U) ++#define S32_MAX ((s32)(U32_MAX>>1)) ++#define S32_MIN ((s32)(-S32_MAX - 1)) ++#define U64_MAX ((u64)~0ULL) ++#define S64_MAX ((s64)(U64_MAX>>1)) ++#define S64_MIN ((s64)(-S64_MAX - 1)) ++#endif /* LINUX_VERSION_CODE */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) ++#define SIZE_MAX (~(size_t)0) ++#endif /* LINUX_VERSION_CODE */ + -+ u32 mask = (1 << 0) | /* enable all three counters */ -+ (0 << 1) | /* reset both Count Registers to 0x0 */ -+ (1 << 2) | /* reset the Cycle Counter Register to 0x0 */ -+ (0 << 3) | /* 1 = Cycle Counter Register counts every 64th processor clock cycle */ -+ (0 << 4) | /* Count Register 0 interrupt enable */ -+ (0 << 5) | /* Count Register 1 interrupt enable */ -+ (0 << 6) | /* Cycle Counter interrupt enable */ -+ (0 << 8) | /* Count Register 0 overflow flag (clear or write, flag on read) */ -+ (0 << 9) | /* Count Register 1 overflow flag (clear or write, flag on read) */ -+ (1 << 10); /* Cycle Counter Register overflow flag (clear or write, flag on read) */ ++/** ++ * MIN - Return the lesser of two values. ++ * ++ * As a macro it may evaluate its arguments more than once. ++ * Refer to MAX macro for more details ++ */ ++#define MIN(x, y) ((x) < (y) ? (x) : (y)) + -+ __asm__ __volatile__("MCR p15, 0, %0, c15, c12, 0" : : "r"(mask)); ++/** ++ * MAX - Return the greater of two values. ++ * ++ * As a macro it may evaluate its arguments more than once. ++ * If called on the same two arguments as MIN it is guaranteed to return ++ * the one that MIN didn't return. This is significant for types where not ++ * all values are comparable e.g. NaNs in floating-point types. But if you want ++ * to retrieve the min and max of two values, consider using a conditional swap ++ * instead. ++ */ ++#define MAX(x, y) ((x) < (y) ? (y) : (x)) + -+ return _MALI_OSK_ERR_OK; -+} ++/** ++ * @hideinitializer ++ * Function-like macro for suppressing unused variable warnings. Where possible ++ * such variables should be removed; this macro is present for cases where we ++ * much support API backwards compatibility. ++ */ ++#define CSTD_UNUSED(x) ((void)(x)) + -+MALI_STATIC_INLINE u64 _mali_timestamp_get(void) -+{ -+ u32 result; ++/** ++ * @hideinitializer ++ * Function-like macro for use where "no behavior" is desired. This is useful ++ * when compile time macros turn a function-like macro in to a no-op, but ++ * where having no statement is otherwise invalid. ++ */ ++#define CSTD_NOP(...) ((void)#__VA_ARGS__) + -+ /* this is for the clock cycles */ -+ __asm__ __volatile__("MRC p15, 0, %0, c15, c12, 1" : "=r"(result)); ++/** ++ * Function-like macro for converting a pointer in to a u64 for storing into ++ * an external data structure. This is commonly used when pairing a 32-bit ++ * CPU with a 64-bit peripheral, such as a Midgard GPU. C's type promotion ++ * is complex and a straight cast does not work reliably as pointers are ++ * often considered as signed. ++ */ ++#define PTR_TO_U64(x) ((uint64_t)((uintptr_t)(x))) + -+ return (u64)result; -+} ++/** ++ * @hideinitializer ++ * Function-like macro for stringizing a single level macro. ++ * @code ++ * #define MY_MACRO 32 ++ * CSTD_STR1( MY_MACRO ) ++ * > "MY_MACRO" ++ * @endcode ++ */ ++#define CSTD_STR1(x) #x + -+#endif /* __MALI_TIMESTAMP_H__ */ -diff --git a/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c -new file mode 100755 -index 000000000000..7df934c12122 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c -@@ -0,0 +1,13 @@ -+/* -+ * Copyright (C) 2010-2011, 2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * @hideinitializer ++ * Function-like macro for stringizing a macro's value. This should not be used ++ * if the macro is defined in a way which may have no value; use the ++ * alternative @c CSTD_STR2N macro should be used instead. ++ * @code ++ * #define MY_MACRO 32 ++ * CSTD_STR2( MY_MACRO ) ++ * > "32" ++ * @endcode + */ ++#define CSTD_STR2(x) CSTD_STR1(x) + -+#include "mali_timestamp.h" ++/** ++ * Specify an assertion value which is evaluated at compile time. Recommended ++ * usage is specification of a @c static @c INLINE function containing all of ++ * the assertions thus: ++ * ++ * @code ++ * static INLINE [module]_compile_time_assertions( void ) ++ * { ++ * COMPILE_TIME_ASSERT( sizeof(uintptr_t) == sizeof(intptr_t) ); ++ * } ++ * @endcode ++ * ++ * @note Use @c static not @c STATIC. We never want to turn off this @c static ++ * specification for testing purposes. ++ */ ++#define CSTD_COMPILE_TIME_ASSERT(expr) \ ++ do { switch (0) { case 0: case (expr):; } } while (false) + -+/* This file is intentionally left empty, as all functions are inlined in mali_profiling_sampler.h */ -diff --git a/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h ++#endif /* _MALISW_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_midg_coherency.h b/drivers/gpu/arm/midgard/mali_midg_coherency.h new file mode 100755 -index 000000000000..709a16a82f31 +index 000000000..a509cbd5f --- /dev/null -+++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h ++++ b/drivers/gpu/arm/midgard/mali_midg_coherency.h @@ -0,0 +1,26 @@ +/* -+ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef __MALI_TIMESTAMP_H__ -+#define __MALI_TIMESTAMP_H__ + -+#include "mali_osk.h" + -+MALI_STATIC_INLINE _mali_osk_errcode_t _mali_timestamp_reset(void) -+{ -+ return _MALI_OSK_ERR_OK; -+} ++#ifndef _MIDG_COHERENCY_H_ ++#define _MIDG_COHERENCY_H_ + -+MALI_STATIC_INLINE u64 _mali_timestamp_get(void) -+{ -+ return _mali_osk_boot_time_get_ns(); -+} ++#define COHERENCY_ACE_LITE 0 ++#define COHERENCY_ACE 1 ++#define COHERENCY_NONE 31 ++#define COHERENCY_FEATURE_BIT(x) (1 << (x)) + -+#endif /* __MALI_TIMESTAMP_H__ */ -diff --git a/drivers/gpu/arm/mali400/rk_ver_info.txt b/drivers/gpu/arm/mali400/rk_ver_info.txt ++#endif /* _MIDG_COHERENCY_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_midg_regmap.h b/drivers/gpu/arm/midgard/mali_midg_regmap.h new file mode 100755 -index 000000000000..2a6cbbbb5a97 +index 000000000..7d7b7bcd3 --- /dev/null -+++ b/drivers/gpu/arm/mali400/rk_ver_info.txt -@@ -0,0 +1,11 @@ ++++ b/drivers/gpu/arm/midgard/mali_midg_regmap.h +@@ -0,0 +1,611 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+r5p0-01rel0-1-x@0 -+ 对 arm_release_ver r5p0-01rel0 的定制集æˆ. -+ r5p0-01rel0 对 gpu çš„ dts 有大修改, 但这里出于兼容考虑, ä»æ—§ä½¿ç”¨ dts_for_mali_ko_befor_r5p0-01rel0. + -+r5p0-01rel0-2-x@0 -+ æ”¯æŒ mali_so æ¥èŽ·å– rk_ko_ver. -+ -+r5p0-01rel0-3-x@0 -+ 在 mali_control_timer_callback_chain 中使用 mod_timer, 而ä¸å†æ˜¯ add_timer. + -diff --git a/drivers/gpu/arm/mali400/ump/Kbuild b/drivers/gpu/arm/mali400/ump/Kbuild -new file mode 100755 -index 000000000000..a3067ba72459 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/Kbuild -@@ -0,0 +1,92 @@ -+# -+# Copyright (C) 2010-2012 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+# as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained from Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+# ++#ifndef _MIDGARD_REGMAP_H_ ++#define _MIDGARD_REGMAP_H_ + -+# Set default configuration to use, if Makefile didn't provide one. -+# Change this to use a different config.h -+CONFIG ?= default ++#include "mali_midg_coherency.h" ++#include "mali_kbase_gpu_id.h" + -+# Link arch to the selected arch-config directory -+$(shell [ -L $(src)/arch ] && rm $(src)/arch) -+$(shell ln -sf arch-$(CONFIG) $(src)/arch) -+$(shell touch $(src)/arch/config.h) ++/* ++ * Begin Register Offsets ++ */ + -+UDD_FILE_PREFIX = ../mali/ ++#define GPU_CONTROL_BASE 0x0000 ++#define GPU_CONTROL_REG(r) (GPU_CONTROL_BASE + (r)) ++#define GPU_ID 0x000 /* (RO) GPU and revision identifier */ ++#define L2_FEATURES 0x004 /* (RO) Level 2 cache features */ ++#define SUSPEND_SIZE 0x008 /* (RO) Fixed-function suspend buffer ++ size */ ++#define TILER_FEATURES 0x00C /* (RO) Tiler Features */ ++#define MEM_FEATURES 0x010 /* (RO) Memory system features */ ++#define MMU_FEATURES 0x014 /* (RO) MMU features */ ++#define AS_PRESENT 0x018 /* (RO) Address space slots present */ ++#define JS_PRESENT 0x01C /* (RO) Job slots present */ ++#define GPU_IRQ_RAWSTAT 0x020 /* (RW) */ ++#define GPU_IRQ_CLEAR 0x024 /* (WO) */ ++#define GPU_IRQ_MASK 0x028 /* (RW) */ ++#define GPU_IRQ_STATUS 0x02C /* (RO) */ + -+# Get subversion revision number, fall back to 0000 if no svn info is available -+SVN_INFO = (cd $(src); svn info 2>/dev/null) ++/* IRQ flags */ ++#define GPU_FAULT (1 << 0) /* A GPU Fault has occurred */ ++#define MULTIPLE_GPU_FAULTS (1 << 7) /* More than one GPU Fault occurred. */ ++#define RESET_COMPLETED (1 << 8) /* Set when a reset has completed. Intended to use with SOFT_RESET ++ commands which may take time. */ ++#define POWER_CHANGED_SINGLE (1 << 9) /* Set when a single core has finished powering up or down. */ ++#define POWER_CHANGED_ALL (1 << 10) /* Set when all cores have finished powering up or down ++ and the power manager is idle. */ + -+ifneq ($(shell $(SVN_INFO) 2>/dev/null),) -+# SVN detected -+SVN_REV := $(shell $(SVN_INFO) | grep '^Revision: '| sed -e 's/^Revision: //' 2>/dev/null) -+DRIVER_REV := $(MALI_RELEASE_NAME)-r$(SVN_REV) -+CHANGE_DATE := $(shell $(SVN_INFO) | grep '^Last Changed Date: ' | cut -d: -f2- | cut -b2-) -+CHANGED_REVISION := $(shell $(SVN_INFO) | grep '^Last Changed Rev: ' | cut -d: -f2- | cut -b2-) -+REPO_URL := $(shell $(SVN_INFO) | grep '^URL: ' | cut -d: -f2- | cut -b2-) ++#define PRFCNT_SAMPLE_COMPLETED (1 << 16) /* Set when a performance count sample has completed. */ ++#define CLEAN_CACHES_COMPLETED (1 << 17) /* Set when a cache clean operation has completed. */ + -+else # SVN -+GIT_REV := $(shell cd $(src); git describe --always 2>/dev/null) -+ifneq ($(GIT_REV),) -+# Git detected -+DRIVER_REV := $(MALI_RELEASE_NAME)-$(GIT_REV) -+CHANGE_DATE := $(shell cd $(src); git log -1 --format="%ci") -+CHANGED_REVISION := $(GIT_REV) -+REPO_URL := $(shell cd $(src); git describe --all --always 2>/dev/null) ++#define GPU_IRQ_REG_ALL (GPU_FAULT | MULTIPLE_GPU_FAULTS | RESET_COMPLETED \ ++ | POWER_CHANGED_ALL | PRFCNT_SAMPLE_COMPLETED) + -+else # Git -+# No Git or SVN detected -+DRIVER_REV := $(MALI_RELEASE_NAME) -+CHANGE_DATE := $(MALI_RELEASE_NAME) -+CHANGED_REVISION := $(MALI_RELEASE_NAME) -+endif -+endif ++#define GPU_COMMAND 0x030 /* (WO) */ ++#define GPU_STATUS 0x034 /* (RO) */ ++#define LATEST_FLUSH 0x038 /* (RO) */ + -+ccflags-y += -DSVN_REV=$(SVN_REV) -+ccflags-y += -DSVN_REV_STRING=\"$(DRIVER_REV)\" ++#define GROUPS_L2_COHERENT (1 << 0) /* Cores groups are l2 coherent */ ++#define GPU_DBGEN (1 << 8) /* DBGEN wire status */ + -+ccflags-y += -I$(src) -I$(src)/common -I$(src)/linux -I$(src)/../mali/common -I$(src)/../mali/linux -I$(src)/include -I$(src)/../../ump/include/ump -+ccflags-y += -DMALI_STATE_TRACKING=0 -+ccflags-y += -DMALI_ENABLE_CPU_CYCLES=0 -+ccflags-$(CONFIG_UMP_DEBUG) += -DDEBUG ++#define GPU_FAULTSTATUS 0x03C /* (RO) GPU exception type and fault status */ ++#define GPU_FAULTADDRESS_LO 0x040 /* (RO) GPU exception fault address, low word */ ++#define GPU_FAULTADDRESS_HI 0x044 /* (RO) GPU exception fault address, high word */ + -+# For customer releases the Linux Device Drivers will be provided as ARM proprietary and GPL releases: -+# The ARM proprietary product will only include the license/proprietary directory -+# The GPL product will only include the license/gpl directory ++#define PWR_KEY 0x050 /* (WO) Power manager key register */ ++#define PWR_OVERRIDE0 0x054 /* (RW) Power manager override settings */ ++#define PWR_OVERRIDE1 0x058 /* (RW) Power manager override settings */ + -+ifeq ($(wildcard $(src)/linux/license/gpl/*),) -+ccflags-y += -I$(src)/linux/license/proprietary -I$(src)/../mali/linux/license/proprietary -+else -+ccflags-y += -I$(src)/linux/license/gpl -I$(src)/../mali/linux/license/gpl -+endif ++#define PRFCNT_BASE_LO 0x060 /* (RW) Performance counter memory region base address, low word */ ++#define PRFCNT_BASE_HI 0x064 /* (RW) Performance counter memory region base address, high word */ ++#define PRFCNT_CONFIG 0x068 /* (RW) Performance counter configuration */ ++#define PRFCNT_JM_EN 0x06C /* (RW) Performance counter enable flags for Job Manager */ ++#define PRFCNT_SHADER_EN 0x070 /* (RW) Performance counter enable flags for shader cores */ ++#define PRFCNT_TILER_EN 0x074 /* (RW) Performance counter enable flags for tiler */ ++#define PRFCNT_MMU_L2_EN 0x07C /* (RW) Performance counter enable flags for MMU/L2 cache */ + -+ump-y = common/ump_kernel_common.o \ -+ common/ump_kernel_descriptor_mapping.o \ -+ common/ump_kernel_api.o \ -+ common/ump_kernel_ref_drv.o \ -+ linux/ump_kernel_linux.o \ -+ linux/ump_kernel_memory_backend_os.o \ -+ linux/ump_kernel_memory_backend_dedicated.o \ -+ linux/ump_memory_backend.o \ -+ linux/ump_ukk_wrappers.o \ -+ linux/ump_ukk_ref_wrappers.o \ -+ linux/ump_osk_atomics.o \ -+ linux/ump_osk_low_level_mem.o \ -+ linux/ump_osk_misc.o \ -+ linux/ump_kernel_random_mapping.o ++#define CYCLE_COUNT_LO 0x090 /* (RO) Cycle counter, low word */ ++#define CYCLE_COUNT_HI 0x094 /* (RO) Cycle counter, high word */ ++#define TIMESTAMP_LO 0x098 /* (RO) Global time stamp counter, low word */ ++#define TIMESTAMP_HI 0x09C /* (RO) Global time stamp counter, high word */ + -+ifneq ($(CONFIG_MALI400),y) -+ump-y += $(UDD_FILE_PREFIX)linux/mali_osk_atomics.o \ -+ $(UDD_FILE_PREFIX)linux/mali_osk_locks.o \ -+ $(UDD_FILE_PREFIX)linux/mali_osk_memory.o \ -+ $(UDD_FILE_PREFIX)linux/mali_osk_math.o \ -+ $(UDD_FILE_PREFIX)linux/mali_osk_misc.o -+endif ++#define THREAD_MAX_THREADS 0x0A0 /* (RO) Maximum number of threads per core */ ++#define THREAD_MAX_WORKGROUP_SIZE 0x0A4 /* (RO) Maximum workgroup size */ ++#define THREAD_MAX_BARRIER_SIZE 0x0A8 /* (RO) Maximum threads waiting at a barrier */ ++#define THREAD_FEATURES 0x0AC /* (RO) Thread features */ + -+obj-$(CONFIG_UMP) := ump.o ++#define TEXTURE_FEATURES_0 0x0B0 /* (RO) Support flags for indexed texture formats 0..31 */ ++#define TEXTURE_FEATURES_1 0x0B4 /* (RO) Support flags for indexed texture formats 32..63 */ ++#define TEXTURE_FEATURES_2 0x0B8 /* (RO) Support flags for indexed texture formats 64..95 */ + -diff --git a/drivers/gpu/arm/mali400/ump/Kconfig b/drivers/gpu/arm/mali400/ump/Kconfig -new file mode 100755 -index 000000000000..ec3509057732 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/Kconfig -@@ -0,0 +1,17 @@ -+# SPDX-License-Identifier: GPL-2.0 -+config UMP -+ tristate "UMP support" -+ depends on ARM -+ help -+ This enables support for the UMP memory allocation and sharing API. ++#define TEXTURE_FEATURES_REG(n) GPU_CONTROL_REG(TEXTURE_FEATURES_0 + ((n) << 2)) + -+ To compile this driver as a module, choose M here: the module will be -+ called ump. ++#define JS0_FEATURES 0x0C0 /* (RO) Features of job slot 0 */ ++#define JS1_FEATURES 0x0C4 /* (RO) Features of job slot 1 */ ++#define JS2_FEATURES 0x0C8 /* (RO) Features of job slot 2 */ ++#define JS3_FEATURES 0x0CC /* (RO) Features of job slot 3 */ ++#define JS4_FEATURES 0x0D0 /* (RO) Features of job slot 4 */ ++#define JS5_FEATURES 0x0D4 /* (RO) Features of job slot 5 */ ++#define JS6_FEATURES 0x0D8 /* (RO) Features of job slot 6 */ ++#define JS7_FEATURES 0x0DC /* (RO) Features of job slot 7 */ ++#define JS8_FEATURES 0x0E0 /* (RO) Features of job slot 8 */ ++#define JS9_FEATURES 0x0E4 /* (RO) Features of job slot 9 */ ++#define JS10_FEATURES 0x0E8 /* (RO) Features of job slot 10 */ ++#define JS11_FEATURES 0x0EC /* (RO) Features of job slot 11 */ ++#define JS12_FEATURES 0x0F0 /* (RO) Features of job slot 12 */ ++#define JS13_FEATURES 0x0F4 /* (RO) Features of job slot 13 */ ++#define JS14_FEATURES 0x0F8 /* (RO) Features of job slot 14 */ ++#define JS15_FEATURES 0x0FC /* (RO) Features of job slot 15 */ + -+config UMP_DEBUG -+ bool "Enable extra debug in UMP" -+ depends on UMP -+ default y -+ help -+ This enabled extra debug checks and messages in UMP. ++#define JS_FEATURES_REG(n) GPU_CONTROL_REG(JS0_FEATURES + ((n) << 2)) + -diff --git a/drivers/gpu/arm/mali400/ump/Makefile b/drivers/gpu/arm/mali400/ump/Makefile -new file mode 100755 -index 000000000000..88b02a22fce5 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/Makefile -@@ -0,0 +1,67 @@ -+# -+# Copyright (C) 2010-2012, 2014, 2016-2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+# as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained from Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+# ++#define SHADER_PRESENT_LO 0x100 /* (RO) Shader core present bitmap, low word */ ++#define SHADER_PRESENT_HI 0x104 /* (RO) Shader core present bitmap, high word */ + -+# For each arch check: CROSS_COMPILE , KDIR , CFLAGS += -DARCH ++#define TILER_PRESENT_LO 0x110 /* (RO) Tiler core present bitmap, low word */ ++#define TILER_PRESENT_HI 0x114 /* (RO) Tiler core present bitmap, high word */ + -+export ARCH ?= arm -+BUILD ?= debug ++#define L2_PRESENT_LO 0x120 /* (RO) Level 2 cache present bitmap, low word */ ++#define L2_PRESENT_HI 0x124 /* (RO) Level 2 cache present bitmap, high word */ + -+check_cc2 = \ -+ $(shell if $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ -+ then \ -+ echo "$(2)"; \ -+ else \ -+ echo "$(3)"; \ -+ fi ;) ++#define STACK_PRESENT_LO 0xE00 /* (RO) Core stack present bitmap, low word */ ++#define STACK_PRESENT_HI 0xE04 /* (RO) Core stack present bitmap, high word */ + -+# Check that required parameters are supplied. -+ifeq ($(CONFIG),) -+CONFIG := default -+endif -+ifeq ($(CPU)$(KDIR),) -+$(error "KDIR or CPU must be specified.") -+endif + -+# Get any user defined KDIR- or maybe even a hardcoded KDIR -+-include KDIR_CONFIGURATION ++#define SHADER_READY_LO 0x140 /* (RO) Shader core ready bitmap, low word */ ++#define SHADER_READY_HI 0x144 /* (RO) Shader core ready bitmap, high word */ + -+# Define host system directory -+KDIR-$(shell uname -m):=/lib/modules/$(shell uname -r)/build ++#define TILER_READY_LO 0x150 /* (RO) Tiler core ready bitmap, low word */ ++#define TILER_READY_HI 0x154 /* (RO) Tiler core ready bitmap, high word */ + -+ifeq ($(ARCH), arm) -+# when compiling for ARM we're cross compiling -+export CROSS_COMPILE ?= $(call check_cc2, arm-linux-gnueabi-gcc, arm-linux-gnueabi-, arm-none-linux-gnueabi-) -+endif ++#define L2_READY_LO 0x160 /* (RO) Level 2 cache ready bitmap, low word */ ++#define L2_READY_HI 0x164 /* (RO) Level 2 cache ready bitmap, high word */ + -+# look up KDIR based om CPU selection -+KDIR ?= $(KDIR-$(CPU)) ++#define STACK_READY_LO 0xE10 /* (RO) Core stack ready bitmap, low word */ ++#define STACK_READY_HI 0xE14 /* (RO) Core stack ready bitmap, high word */ + -+export CONFIG + -+export CONFIG_UMP := m -+ifeq ($(BUILD),debug) -+export CONFIG_UMP_DEBUG := y -+else -+export CONFIG_UMP_DEBUG := n -+endif ++#define SHADER_PWRON_LO 0x180 /* (WO) Shader core power on bitmap, low word */ ++#define SHADER_PWRON_HI 0x184 /* (WO) Shader core power on bitmap, high word */ + -+ifeq ($(KDIR),) -+$(error No KDIR found for platform $(CPU)) -+endif ++#define TILER_PWRON_LO 0x190 /* (WO) Tiler core power on bitmap, low word */ ++#define TILER_PWRON_HI 0x194 /* (WO) Tiler core power on bitmap, high word */ + -+all: -+ $(MAKE) -C $(KDIR) M=$(CURDIR) modules ++#define L2_PWRON_LO 0x1A0 /* (WO) Level 2 cache power on bitmap, low word */ ++#define L2_PWRON_HI 0x1A4 /* (WO) Level 2 cache power on bitmap, high word */ + -+kernelrelease: -+ $(MAKE) -C $(KDIR) kernelrelease ++#define STACK_PWRON_LO 0xE20 /* (RO) Core stack power on bitmap, low word */ ++#define STACK_PWRON_HI 0xE24 /* (RO) Core stack power on bitmap, high word */ + -+clean: -+ $(MAKE) -C $(KDIR) M=$(CURDIR) clean -+ $(MAKE) -C $(KDIR) M=$(CURDIR)/../mali clean -diff --git a/drivers/gpu/arm/mali400/ump/Makefile.common b/drivers/gpu/arm/mali400/ump/Makefile.common -new file mode 100755 -index 000000000000..ad2c18da98a0 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/Makefile.common -@@ -0,0 +1,20 @@ -+# -+# Copyright (C) 2010-2011, 2013, 2016-2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+# as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained from Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+# + -+SRC = $(UMP_FILE_PREFIX)common/ump_kernel_common.c \ -+ $(UMP_FILE_PREFIX)common/ump_kernel_descriptor_mapping.c \ -+ $(UMP_FILE_PREFIX)common/ump_kernel_api.c \ -+ $(UMP_FILE_PREFIX)common/ump_kernel_ref_drv.c ++#define SHADER_PWROFF_LO 0x1C0 /* (WO) Shader core power off bitmap, low word */ ++#define SHADER_PWROFF_HI 0x1C4 /* (WO) Shader core power off bitmap, high word */ + -+# Get subversion revision number, fall back to 0000 if no svn info is available -+SVN_REV:=$(shell ((svnversion | grep -qv exported && echo -n 'Revision: ' && svnversion) || git svn info | sed -e 's/$$$$/M/' | grep '^Revision: ' || echo ${MALI_RELEASE_NAME}) 2>/dev/null | sed -e 's/^Revision: //') ++#define TILER_PWROFF_LO 0x1D0 /* (WO) Tiler core power off bitmap, low word */ ++#define TILER_PWROFF_HI 0x1D4 /* (WO) Tiler core power off bitmap, high word */ + -+EXTRA_CFLAGS += -DSVN_REV=$(SVN_REV) -+EXTRA_CFLAGS += -DSVN_REV_STRING=\"$(SVN_REV)\" -diff --git a/drivers/gpu/arm/mali400/ump/arch-default/config.h b/drivers/gpu/arm/mali400/ump/arch-default/config.h -new file mode 100755 -index 000000000000..d4aef9dd09c7 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/arch-default/config.h -@@ -0,0 +1,24 @@ -+/* -+ * Copyright (C) 2010, 2012, 2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++#define L2_PWROFF_LO 0x1E0 /* (WO) Level 2 cache power off bitmap, low word */ ++#define L2_PWROFF_HI 0x1E4 /* (WO) Level 2 cache power off bitmap, high word */ + -+#ifndef __ARCH_CONFIG_H__ -+#define __ARCH_CONFIG_H__ ++#define STACK_PWROFF_LO 0xE30 /* (RO) Core stack power off bitmap, low word */ ++#define STACK_PRWOFF_HI 0xE34 /* (RO) Core stack power off bitmap, high word */ + -+/* Use OS memory. */ -+#define ARCH_UMP_BACKEND_DEFAULT 1 + -+/* OS memory won't need a base address. */ -+#define ARCH_UMP_MEMORY_ADDRESS_DEFAULT 0x00000000 ++#define SHADER_PWRTRANS_LO 0x200 /* (RO) Shader core power transition bitmap, low word */ ++#define SHADER_PWRTRANS_HI 0x204 /* (RO) Shader core power transition bitmap, high word */ + -+/* 512 MB maximum limit for UMP allocations. */ -+#define ARCH_UMP_MEMORY_SIZE_DEFAULT 512UL * 1024UL * 1024UL ++#define TILER_PWRTRANS_LO 0x210 /* (RO) Tiler core power transition bitmap, low word */ ++#define TILER_PWRTRANS_HI 0x214 /* (RO) Tiler core power transition bitmap, high word */ + ++#define L2_PWRTRANS_LO 0x220 /* (RO) Level 2 cache power transition bitmap, low word */ ++#define L2_PWRTRANS_HI 0x224 /* (RO) Level 2 cache power transition bitmap, high word */ + -+#endif /* __ARCH_CONFIG_H__ */ -diff --git a/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h b/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h -new file mode 100755 -index 000000000000..182e90c1d64f ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2010-2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++#define STACK_PWRTRANS_LO 0xE40 /* (RO) Core stack power transition bitmap, low word */ ++#define STACK_PRWTRANS_HI 0xE44 /* (RO) Core stack power transition bitmap, high word */ + -+#ifndef __ARCH_CONFIG_H__ -+#define __ARCH_CONFIG_H__ + -+#define ARCH_UMP_BACKEND_DEFAULT 0 -+#define ARCH_UMP_MEMORY_ADDRESS_DEFAULT 0xE1000000 -+#define ARCH_UMP_MEMORY_SIZE_DEFAULT 16UL * 1024UL * 1024UL ++#define SHADER_PWRACTIVE_LO 0x240 /* (RO) Shader core active bitmap, low word */ ++#define SHADER_PWRACTIVE_HI 0x244 /* (RO) Shader core active bitmap, high word */ + -+#endif /* __ARCH_CONFIG_H__ */ -diff --git a/drivers/gpu/arm/mali400/ump/arch/config.h b/drivers/gpu/arm/mali400/ump/arch/config.h -new file mode 100755 -index 000000000000..d4aef9dd09c7 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/arch/config.h -@@ -0,0 +1,24 @@ -+/* -+ * Copyright (C) 2010, 2012, 2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++#define TILER_PWRACTIVE_LO 0x250 /* (RO) Tiler core active bitmap, low word */ ++#define TILER_PWRACTIVE_HI 0x254 /* (RO) Tiler core active bitmap, high word */ + -+#ifndef __ARCH_CONFIG_H__ -+#define __ARCH_CONFIG_H__ ++#define L2_PWRACTIVE_LO 0x260 /* (RO) Level 2 cache active bitmap, low word */ ++#define L2_PWRACTIVE_HI 0x264 /* (RO) Level 2 cache active bitmap, high word */ + -+/* Use OS memory. */ -+#define ARCH_UMP_BACKEND_DEFAULT 1 ++#define COHERENCY_FEATURES 0x300 /* (RO) Coherency features present */ ++#define COHERENCY_ENABLE 0x304 /* (RW) Coherency enable */ + -+/* OS memory won't need a base address. */ -+#define ARCH_UMP_MEMORY_ADDRESS_DEFAULT 0x00000000 ++#define JM_CONFIG 0xF00 /* (RW) Job Manager configuration register (Implementation specific register) */ ++#define SHADER_CONFIG 0xF04 /* (RW) Shader core configuration settings (Implementation specific register) */ ++#define TILER_CONFIG 0xF08 /* (RW) Tiler core configuration settings (Implementation specific register) */ ++#define L2_MMU_CONFIG 0xF0C /* (RW) Configuration of the L2 cache and MMU (Implementation specific register) */ + -+/* 512 MB maximum limit for UMP allocations. */ -+#define ARCH_UMP_MEMORY_SIZE_DEFAULT 512UL * 1024UL * 1024UL ++#define JOB_CONTROL_BASE 0x1000 + ++#define JOB_CONTROL_REG(r) (JOB_CONTROL_BASE + (r)) + -+#endif /* __ARCH_CONFIG_H__ */ -diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c -new file mode 100755 -index 000000000000..36adb2f5383e ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c -@@ -0,0 +1,455 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++#define JOB_IRQ_RAWSTAT 0x000 /* Raw interrupt status register */ ++#define JOB_IRQ_CLEAR 0x004 /* Interrupt clear register */ ++#define JOB_IRQ_MASK 0x008 /* Interrupt mask register */ ++#define JOB_IRQ_STATUS 0x00C /* Interrupt status register */ ++#define JOB_IRQ_JS_STATE 0x010 /* status==active and _next == busy snapshot from last JOB_IRQ_CLEAR */ ++#define JOB_IRQ_THROTTLE 0x014 /* cycles to delay delivering an interrupt externally. The JOB_IRQ_STATUS is NOT affected by this, just the delivery of the interrupt. */ + -+#include "mali_osk.h" -+#include "mali_osk_list.h" -+#include "ump_osk.h" -+#include "ump_uk_types.h" -+#include "ump_kernel_interface.h" -+#include "ump_kernel_common.h" -+#include "ump_kernel_random_mapping.h" ++#define JOB_SLOT0 0x800 /* Configuration registers for job slot 0 */ ++#define JOB_SLOT1 0x880 /* Configuration registers for job slot 1 */ ++#define JOB_SLOT2 0x900 /* Configuration registers for job slot 2 */ ++#define JOB_SLOT3 0x980 /* Configuration registers for job slot 3 */ ++#define JOB_SLOT4 0xA00 /* Configuration registers for job slot 4 */ ++#define JOB_SLOT5 0xA80 /* Configuration registers for job slot 5 */ ++#define JOB_SLOT6 0xB00 /* Configuration registers for job slot 6 */ ++#define JOB_SLOT7 0xB80 /* Configuration registers for job slot 7 */ ++#define JOB_SLOT8 0xC00 /* Configuration registers for job slot 8 */ ++#define JOB_SLOT9 0xC80 /* Configuration registers for job slot 9 */ ++#define JOB_SLOT10 0xD00 /* Configuration registers for job slot 10 */ ++#define JOB_SLOT11 0xD80 /* Configuration registers for job slot 11 */ ++#define JOB_SLOT12 0xE00 /* Configuration registers for job slot 12 */ ++#define JOB_SLOT13 0xE80 /* Configuration registers for job slot 13 */ ++#define JOB_SLOT14 0xF00 /* Configuration registers for job slot 14 */ ++#define JOB_SLOT15 0xF80 /* Configuration registers for job slot 15 */ + ++#define JOB_SLOT_REG(n, r) (JOB_CONTROL_REG(JOB_SLOT0 + ((n) << 7)) + (r)) + ++#define JS_HEAD_LO 0x00 /* (RO) Job queue head pointer for job slot n, low word */ ++#define JS_HEAD_HI 0x04 /* (RO) Job queue head pointer for job slot n, high word */ ++#define JS_TAIL_LO 0x08 /* (RO) Job queue tail pointer for job slot n, low word */ ++#define JS_TAIL_HI 0x0C /* (RO) Job queue tail pointer for job slot n, high word */ ++#define JS_AFFINITY_LO 0x10 /* (RO) Core affinity mask for job slot n, low word */ ++#define JS_AFFINITY_HI 0x14 /* (RO) Core affinity mask for job slot n, high word */ ++#define JS_CONFIG 0x18 /* (RO) Configuration settings for job slot n */ ++#define JS_XAFFINITY 0x1C /* (RO) Extended affinity mask for job ++ slot n */ + -+/* ---------------- UMP kernel space API functions follows ---------------- */ ++#define JS_COMMAND 0x20 /* (WO) Command register for job slot n */ ++#define JS_STATUS 0x24 /* (RO) Status register for job slot n */ + ++#define JS_HEAD_NEXT_LO 0x40 /* (RW) Next job queue head pointer for job slot n, low word */ ++#define JS_HEAD_NEXT_HI 0x44 /* (RW) Next job queue head pointer for job slot n, high word */ + ++#define JS_AFFINITY_NEXT_LO 0x50 /* (RW) Next core affinity mask for job slot n, low word */ ++#define JS_AFFINITY_NEXT_HI 0x54 /* (RW) Next core affinity mask for job slot n, high word */ ++#define JS_CONFIG_NEXT 0x58 /* (RW) Next configuration settings for job slot n */ ++#define JS_XAFFINITY_NEXT 0x5C /* (RW) Next extended affinity mask for ++ job slot n */ + -+UMP_KERNEL_API_EXPORT ump_secure_id ump_dd_secure_id_get(ump_dd_handle memh) -+{ -+ ump_dd_mem *mem = (ump_dd_mem *)memh; ++#define JS_COMMAND_NEXT 0x60 /* (RW) Next command register for job slot n */ + -+ DEBUG_ASSERT_POINTER(mem); ++#define JS_FLUSH_ID_NEXT 0x70 /* (RW) Next job slot n cache flush ID */ + -+ DBG_MSG(5, ("Returning secure ID. ID: %u\n", mem->secure_id)); ++#define MEMORY_MANAGEMENT_BASE 0x2000 ++#define MMU_REG(r) (MEMORY_MANAGEMENT_BASE + (r)) + -+ return mem->secure_id; -+} ++#define MMU_IRQ_RAWSTAT 0x000 /* (RW) Raw interrupt status register */ ++#define MMU_IRQ_CLEAR 0x004 /* (WO) Interrupt clear register */ ++#define MMU_IRQ_MASK 0x008 /* (RW) Interrupt mask register */ ++#define MMU_IRQ_STATUS 0x00C /* (RO) Interrupt status register */ + ++#define MMU_AS0 0x400 /* Configuration registers for address space 0 */ ++#define MMU_AS1 0x440 /* Configuration registers for address space 1 */ ++#define MMU_AS2 0x480 /* Configuration registers for address space 2 */ ++#define MMU_AS3 0x4C0 /* Configuration registers for address space 3 */ ++#define MMU_AS4 0x500 /* Configuration registers for address space 4 */ ++#define MMU_AS5 0x540 /* Configuration registers for address space 5 */ ++#define MMU_AS6 0x580 /* Configuration registers for address space 6 */ ++#define MMU_AS7 0x5C0 /* Configuration registers for address space 7 */ ++#define MMU_AS8 0x600 /* Configuration registers for address space 8 */ ++#define MMU_AS9 0x640 /* Configuration registers for address space 9 */ ++#define MMU_AS10 0x680 /* Configuration registers for address space 10 */ ++#define MMU_AS11 0x6C0 /* Configuration registers for address space 11 */ ++#define MMU_AS12 0x700 /* Configuration registers for address space 12 */ ++#define MMU_AS13 0x740 /* Configuration registers for address space 13 */ ++#define MMU_AS14 0x780 /* Configuration registers for address space 14 */ ++#define MMU_AS15 0x7C0 /* Configuration registers for address space 15 */ + ++#define MMU_AS_REG(n, r) (MMU_REG(MMU_AS0 + ((n) << 6)) + (r)) + -+UMP_KERNEL_API_EXPORT ump_dd_handle ump_dd_handle_create_from_secure_id(ump_secure_id secure_id) -+{ -+ ump_dd_mem *mem; ++#define AS_TRANSTAB_LO 0x00 /* (RW) Translation Table Base Address for address space n, low word */ ++#define AS_TRANSTAB_HI 0x04 /* (RW) Translation Table Base Address for address space n, high word */ ++#define AS_MEMATTR_LO 0x08 /* (RW) Memory attributes for address space n, low word. */ ++#define AS_MEMATTR_HI 0x0C /* (RW) Memory attributes for address space n, high word. */ ++#define AS_LOCKADDR_LO 0x10 /* (RW) Lock region address for address space n, low word */ ++#define AS_LOCKADDR_HI 0x14 /* (RW) Lock region address for address space n, high word */ ++#define AS_COMMAND 0x18 /* (WO) MMU command register for address space n */ ++#define AS_FAULTSTATUS 0x1C /* (RO) MMU fault status register for address space n */ ++#define AS_FAULTADDRESS_LO 0x20 /* (RO) Fault Address for address space n, low word */ ++#define AS_FAULTADDRESS_HI 0x24 /* (RO) Fault Address for address space n, high word */ ++#define AS_STATUS 0x28 /* (RO) Status flags for address space n */ + -+ DBG_MSG(5, ("Getting handle from secure ID. ID: %u\n", secure_id)); -+ mem = ump_random_mapping_get(device.secure_id_map, (int)secure_id); -+ if (NULL == mem) { -+ DBG_MSG(1, ("Secure ID not found. ID: %u\n", secure_id)); -+ return UMP_DD_HANDLE_INVALID; -+ } + -+ /* Keep the reference taken in ump_random_mapping_get() */ ++/* (RW) Translation table configuration for address space n, low word */ ++#define AS_TRANSCFG_LO 0x30 ++/* (RW) Translation table configuration for address space n, high word */ ++#define AS_TRANSCFG_HI 0x34 ++/* (RO) Secondary fault address for address space n, low word */ ++#define AS_FAULTEXTRA_LO 0x38 ++/* (RO) Secondary fault address for address space n, high word */ ++#define AS_FAULTEXTRA_HI 0x3C + -+ return (ump_dd_handle)mem; -+} ++/* End Register Offsets */ + ++/* ++ * MMU_IRQ_RAWSTAT register values. Values are valid also for ++ MMU_IRQ_CLEAR, MMU_IRQ_MASK, MMU_IRQ_STATUS registers. ++ */ + ++#define MMU_PAGE_FAULT_FLAGS 16 + -+UMP_KERNEL_API_EXPORT unsigned long ump_dd_phys_block_count_get(ump_dd_handle memh) -+{ -+ ump_dd_mem *mem = (ump_dd_mem *) memh; ++/* Macros returning a bitmask to retrieve page fault or bus error flags from ++ * MMU registers */ ++#define MMU_PAGE_FAULT(n) (1UL << (n)) ++#define MMU_BUS_ERROR(n) (1UL << ((n) + MMU_PAGE_FAULT_FLAGS)) + -+ DEBUG_ASSERT_POINTER(mem); ++/* ++ * Begin LPAE MMU TRANSTAB register values ++ */ ++#define AS_TRANSTAB_LPAE_ADDR_SPACE_MASK 0xfffff000 ++#define AS_TRANSTAB_LPAE_ADRMODE_UNMAPPED (0u << 0) ++#define AS_TRANSTAB_LPAE_ADRMODE_IDENTITY (1u << 1) ++#define AS_TRANSTAB_LPAE_ADRMODE_TABLE (3u << 0) ++#define AS_TRANSTAB_LPAE_READ_INNER (1u << 2) ++#define AS_TRANSTAB_LPAE_SHARE_OUTER (1u << 4) + -+ return mem->nr_blocks; -+} ++#define AS_TRANSTAB_LPAE_ADRMODE_MASK 0x00000003 + ++/* ++ * Begin AARCH64 MMU TRANSTAB register values ++ */ ++#define MMU_HW_OUTA_BITS 40 ++#define AS_TRANSTAB_BASE_MASK ((1ULL << MMU_HW_OUTA_BITS) - (1ULL << 4)) + ++/* ++ * Begin MMU STATUS register values ++ */ ++#define AS_STATUS_AS_ACTIVE 0x01 + -+UMP_KERNEL_API_EXPORT ump_dd_status_code ump_dd_phys_blocks_get(ump_dd_handle memh, ump_dd_physical_block *blocks, unsigned long num_blocks) -+{ -+ ump_dd_mem *mem = (ump_dd_mem *)memh; ++#define AS_FAULTSTATUS_EXCEPTION_CODE_MASK (0x7<<3) ++#define AS_FAULTSTATUS_EXCEPTION_CODE_TRANSLATION_FAULT (0x0<<3) ++#define AS_FAULTSTATUS_EXCEPTION_CODE_PERMISSION_FAULT (0x1<<3) ++#define AS_FAULTSTATUS_EXCEPTION_CODE_TRANSTAB_BUS_FAULT (0x2<<3) ++#define AS_FAULTSTATUS_EXCEPTION_CODE_ACCESS_FLAG (0x3<<3) + -+ DEBUG_ASSERT_POINTER(mem); ++#define AS_FAULTSTATUS_EXCEPTION_CODE_ADDRESS_SIZE_FAULT (0x4<<3) ++#define AS_FAULTSTATUS_EXCEPTION_CODE_MEMORY_ATTRIBUTES_FAULT (0x5<<3) + -+ if (blocks == NULL) { -+ DBG_MSG(1, ("NULL parameter in ump_dd_phys_blocks_get()\n")); -+ return UMP_DD_INVALID; -+ } ++#define AS_FAULTSTATUS_ACCESS_TYPE_MASK (0x3<<8) ++#define AS_FAULTSTATUS_ACCESS_TYPE_ATOMIC (0x0<<8) ++#define AS_FAULTSTATUS_ACCESS_TYPE_EX (0x1<<8) ++#define AS_FAULTSTATUS_ACCESS_TYPE_READ (0x2<<8) ++#define AS_FAULTSTATUS_ACCESS_TYPE_WRITE (0x3<<8) + -+ if (mem->nr_blocks != num_blocks) { -+ DBG_MSG(1, ("Specified number of blocks do not match actual number of blocks\n")); -+ return UMP_DD_INVALID; -+ } ++/* ++ * Begin MMU TRANSCFG register values ++ */ + -+ DBG_MSG(5, ("Returning physical block information. ID: %u\n", mem->secure_id)); ++#define AS_TRANSCFG_ADRMODE_LEGACY 0 ++#define AS_TRANSCFG_ADRMODE_UNMAPPED 1 ++#define AS_TRANSCFG_ADRMODE_IDENTITY 2 ++#define AS_TRANSCFG_ADRMODE_AARCH64_4K 6 ++#define AS_TRANSCFG_ADRMODE_AARCH64_64K 8 + -+ _mali_osk_memcpy(blocks, mem->block_array, sizeof(ump_dd_physical_block) * mem->nr_blocks); ++#define AS_TRANSCFG_ADRMODE_MASK 0xF + -+ return UMP_DD_SUCCESS; -+} + ++/* ++ * Begin TRANSCFG register values ++ */ ++#define AS_TRANSCFG_PTW_MEMATTR_MASK (3 << 24) ++#define AS_TRANSCFG_PTW_MEMATTR_NON_CACHEABLE (1 << 24) ++#define AS_TRANSCFG_PTW_MEMATTR_WRITE_BACK (2 << 24) + ++#define AS_TRANSCFG_PTW_SH_MASK ((3 << 28)) ++#define AS_TRANSCFG_PTW_SH_OS (2 << 28) ++#define AS_TRANSCFG_PTW_SH_IS (3 << 28) + -+UMP_KERNEL_API_EXPORT ump_dd_status_code ump_dd_phys_block_get(ump_dd_handle memh, unsigned long index, ump_dd_physical_block *block) -+{ -+ ump_dd_mem *mem = (ump_dd_mem *)memh; ++/* ++ * Begin Command Values ++ */ + -+ DEBUG_ASSERT_POINTER(mem); ++/* JS_COMMAND register commands */ ++#define JS_COMMAND_NOP 0x00 /* NOP Operation. Writing this value is ignored */ ++#define JS_COMMAND_START 0x01 /* Start processing a job chain. Writing this value is ignored */ ++#define JS_COMMAND_SOFT_STOP 0x02 /* Gently stop processing a job chain */ ++#define JS_COMMAND_HARD_STOP 0x03 /* Rudely stop processing a job chain */ ++#define JS_COMMAND_SOFT_STOP_0 0x04 /* Execute SOFT_STOP if JOB_CHAIN_FLAG is 0 */ ++#define JS_COMMAND_HARD_STOP_0 0x05 /* Execute HARD_STOP if JOB_CHAIN_FLAG is 0 */ ++#define JS_COMMAND_SOFT_STOP_1 0x06 /* Execute SOFT_STOP if JOB_CHAIN_FLAG is 1 */ ++#define JS_COMMAND_HARD_STOP_1 0x07 /* Execute HARD_STOP if JOB_CHAIN_FLAG is 1 */ + -+ if (block == NULL) { -+ DBG_MSG(1, ("NULL parameter in ump_dd_phys_block_get()\n")); -+ return UMP_DD_INVALID; -+ } ++#define JS_COMMAND_MASK 0x07 /* Mask of bits currently in use by the HW */ + -+ if (index >= mem->nr_blocks) { -+ DBG_MSG(5, ("Invalid index specified in ump_dd_phys_block_get()\n")); -+ return UMP_DD_INVALID; -+ } ++/* AS_COMMAND register commands */ ++#define AS_COMMAND_NOP 0x00 /* NOP Operation */ ++#define AS_COMMAND_UPDATE 0x01 /* Broadcasts the values in AS_TRANSTAB and ASn_MEMATTR to all MMUs */ ++#define AS_COMMAND_LOCK 0x02 /* Issue a lock region command to all MMUs */ ++#define AS_COMMAND_UNLOCK 0x03 /* Issue a flush region command to all MMUs */ ++#define AS_COMMAND_FLUSH 0x04 /* Flush all L2 caches then issue a flush region command to all MMUs ++ (deprecated - only for use with T60x) */ ++#define AS_COMMAND_FLUSH_PT 0x04 /* Flush all L2 caches then issue a flush region command to all MMUs */ ++#define AS_COMMAND_FLUSH_MEM 0x05 /* Wait for memory accesses to complete, flush all the L1s cache then ++ flush all L2 caches then issue a flush region command to all MMUs */ + -+ DBG_MSG(5, ("Returning physical block information. ID: %u, index: %lu\n", mem->secure_id, index)); ++/* Possible values of JS_CONFIG and JS_CONFIG_NEXT registers */ ++#define JS_CONFIG_START_FLUSH_NO_ACTION (0u << 0) ++#define JS_CONFIG_START_FLUSH_CLEAN (1u << 8) ++#define JS_CONFIG_START_FLUSH_CLEAN_INVALIDATE (3u << 8) ++#define JS_CONFIG_START_MMU (1u << 10) ++#define JS_CONFIG_JOB_CHAIN_FLAG (1u << 11) ++#define JS_CONFIG_END_FLUSH_NO_ACTION JS_CONFIG_START_FLUSH_NO_ACTION ++#define JS_CONFIG_END_FLUSH_CLEAN (1u << 12) ++#define JS_CONFIG_END_FLUSH_CLEAN_INVALIDATE (3u << 12) ++#define JS_CONFIG_ENABLE_FLUSH_REDUCTION (1u << 14) ++#define JS_CONFIG_DISABLE_DESCRIPTOR_WR_BK (1u << 15) ++#define JS_CONFIG_THREAD_PRI(n) ((n) << 16) + -+ *block = mem->block_array[index]; ++/* JS_XAFFINITY register values */ ++#define JS_XAFFINITY_XAFFINITY_ENABLE (1u << 0) ++#define JS_XAFFINITY_TILER_ENABLE (1u << 8) ++#define JS_XAFFINITY_CACHE_ENABLE (1u << 16) + -+ return UMP_DD_SUCCESS; -+} ++/* JS_STATUS register values */ + ++/* NOTE: Please keep this values in sync with enum base_jd_event_code in mali_base_kernel.h. ++ * The values are separated to avoid dependency of userspace and kernel code. ++ */ + ++/* Group of values representing the job status insead a particular fault */ ++#define JS_STATUS_NO_EXCEPTION_BASE 0x00 ++#define JS_STATUS_INTERRUPTED (JS_STATUS_NO_EXCEPTION_BASE + 0x02) /* 0x02 means INTERRUPTED */ ++#define JS_STATUS_STOPPED (JS_STATUS_NO_EXCEPTION_BASE + 0x03) /* 0x03 means STOPPED */ ++#define JS_STATUS_TERMINATED (JS_STATUS_NO_EXCEPTION_BASE + 0x04) /* 0x04 means TERMINATED */ + -+UMP_KERNEL_API_EXPORT unsigned long ump_dd_size_get(ump_dd_handle memh) -+{ -+ ump_dd_mem *mem = (ump_dd_mem *)memh; ++/* General fault values */ ++#define JS_STATUS_FAULT_BASE 0x40 ++#define JS_STATUS_CONFIG_FAULT (JS_STATUS_FAULT_BASE) /* 0x40 means CONFIG FAULT */ ++#define JS_STATUS_POWER_FAULT (JS_STATUS_FAULT_BASE + 0x01) /* 0x41 means POWER FAULT */ ++#define JS_STATUS_READ_FAULT (JS_STATUS_FAULT_BASE + 0x02) /* 0x42 means READ FAULT */ ++#define JS_STATUS_WRITE_FAULT (JS_STATUS_FAULT_BASE + 0x03) /* 0x43 means WRITE FAULT */ ++#define JS_STATUS_AFFINITY_FAULT (JS_STATUS_FAULT_BASE + 0x04) /* 0x44 means AFFINITY FAULT */ ++#define JS_STATUS_BUS_FAULT (JS_STATUS_FAULT_BASE + 0x08) /* 0x48 means BUS FAULT */ + -+ DEBUG_ASSERT_POINTER(mem); ++/* Instruction or data faults */ ++#define JS_STATUS_INSTRUCTION_FAULT_BASE 0x50 ++#define JS_STATUS_INSTR_INVALID_PC (JS_STATUS_INSTRUCTION_FAULT_BASE) /* 0x50 means INSTR INVALID PC */ ++#define JS_STATUS_INSTR_INVALID_ENC (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x01) /* 0x51 means INSTR INVALID ENC */ ++#define JS_STATUS_INSTR_TYPE_MISMATCH (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x02) /* 0x52 means INSTR TYPE MISMATCH */ ++#define JS_STATUS_INSTR_OPERAND_FAULT (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x03) /* 0x53 means INSTR OPERAND FAULT */ ++#define JS_STATUS_INSTR_TLS_FAULT (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x04) /* 0x54 means INSTR TLS FAULT */ ++#define JS_STATUS_INSTR_BARRIER_FAULT (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x05) /* 0x55 means INSTR BARRIER FAULT */ ++#define JS_STATUS_INSTR_ALIGN_FAULT (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x06) /* 0x56 means INSTR ALIGN FAULT */ ++/* NOTE: No fault with 0x57 code defined in spec. */ ++#define JS_STATUS_DATA_INVALID_FAULT (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x08) /* 0x58 means DATA INVALID FAULT */ ++#define JS_STATUS_TILE_RANGE_FAULT (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x09) /* 0x59 means TILE RANGE FAULT */ ++#define JS_STATUS_ADDRESS_RANGE_FAULT (JS_STATUS_INSTRUCTION_FAULT_BASE + 0x0A) /* 0x5A means ADDRESS RANGE FAULT */ + -+ DBG_MSG(5, ("Returning size. ID: %u, size: %lu\n", mem->secure_id, mem->size_bytes)); ++/* Other faults */ ++#define JS_STATUS_MEMORY_FAULT_BASE 0x60 ++#define JS_STATUS_OUT_OF_MEMORY (JS_STATUS_MEMORY_FAULT_BASE) /* 0x60 means OUT OF MEMORY */ ++#define JS_STATUS_UNKNOWN 0x7F /* 0x7F means UNKNOWN */ + -+ return mem->size_bytes; -+} ++/* GPU_COMMAND values */ ++#define GPU_COMMAND_NOP 0x00 /* No operation, nothing happens */ ++#define GPU_COMMAND_SOFT_RESET 0x01 /* Stop all external bus interfaces, and then reset the entire GPU. */ ++#define GPU_COMMAND_HARD_RESET 0x02 /* Immediately reset the entire GPU. */ ++#define GPU_COMMAND_PRFCNT_CLEAR 0x03 /* Clear all performance counters, setting them all to zero. */ ++#define GPU_COMMAND_PRFCNT_SAMPLE 0x04 /* Sample all performance counters, writing them out to memory */ ++#define GPU_COMMAND_CYCLE_COUNT_START 0x05 /* Starts the cycle counter, and system timestamp propagation */ ++#define GPU_COMMAND_CYCLE_COUNT_STOP 0x06 /* Stops the cycle counter, and system timestamp propagation */ ++#define GPU_COMMAND_CLEAN_CACHES 0x07 /* Clean all caches */ ++#define GPU_COMMAND_CLEAN_INV_CACHES 0x08 /* Clean and invalidate all caches */ ++#define GPU_COMMAND_SET_PROTECTED_MODE 0x09 /* Places the GPU in protected mode */ + ++/* End Command Values */ + ++/* GPU_STATUS values */ ++#define GPU_STATUS_PRFCNT_ACTIVE (1 << 2) /* Set if the performance counters are active. */ ++#define GPU_STATUS_PROTECTED_MODE_ACTIVE (1 << 7) /* Set if protected mode is active */ + -+UMP_KERNEL_API_EXPORT void ump_dd_reference_add(ump_dd_handle memh) -+{ -+ ump_dd_mem *mem = (ump_dd_mem *)memh; -+ int new_ref; ++/* PRFCNT_CONFIG register values */ ++#define PRFCNT_CONFIG_MODE_SHIFT 0 /* Counter mode position. */ ++#define PRFCNT_CONFIG_AS_SHIFT 4 /* Address space bitmap position. */ ++#define PRFCNT_CONFIG_SETSELECT_SHIFT 8 /* Set select position. */ + -+ DEBUG_ASSERT_POINTER(mem); ++#define PRFCNT_CONFIG_MODE_OFF 0 /* The performance counters are disabled. */ ++#define PRFCNT_CONFIG_MODE_MANUAL 1 /* The performance counters are enabled, but are only written out when a PRFCNT_SAMPLE command is issued using the GPU_COMMAND register. */ ++#define PRFCNT_CONFIG_MODE_TILE 2 /* The performance counters are enabled, and are written out each time a tile finishes rendering. */ + -+ new_ref = _ump_osk_atomic_inc_and_read(&mem->ref_count); ++/* AS_MEMATTR values: */ ++/* Use GPU implementation-defined caching policy. */ ++#define AS_MEMATTR_IMPL_DEF_CACHE_POLICY 0x88ull ++/* The attribute set to force all resources to be cached. */ ++#define AS_MEMATTR_FORCE_TO_CACHE_ALL 0x8Full ++/* Inner write-alloc cache setup, no outer caching */ ++#define AS_MEMATTR_WRITE_ALLOC 0x8Dull + -+ DBG_MSG(5, ("Memory reference incremented. ID: %u, new value: %d\n", mem->secure_id, new_ref)); -+} ++/* Set to implementation defined, outer caching */ ++#define AS_MEMATTR_AARCH64_OUTER_IMPL_DEF 0x88ull ++/* Set to write back memory, outer caching */ ++#define AS_MEMATTR_AARCH64_OUTER_WA 0x8Dull + ++/* Use GPU implementation-defined caching policy. */ ++#define AS_MEMATTR_LPAE_IMPL_DEF_CACHE_POLICY 0x48ull ++/* The attribute set to force all resources to be cached. */ ++#define AS_MEMATTR_LPAE_FORCE_TO_CACHE_ALL 0x4Full ++/* Inner write-alloc cache setup, no outer caching */ ++#define AS_MEMATTR_LPAE_WRITE_ALLOC 0x4Dull ++/* Set to implementation defined, outer caching */ ++#define AS_MEMATTR_LPAE_OUTER_IMPL_DEF 0x88ull ++/* Set to write back memory, outer caching */ ++#define AS_MEMATTR_LPAE_OUTER_WA 0x8Dull + ++/* Symbol for default MEMATTR to use */ + -+UMP_KERNEL_API_EXPORT void ump_dd_reference_release(ump_dd_handle memh) -+{ -+ ump_dd_mem *mem = (ump_dd_mem *)memh; ++/* Default is - HW implementation defined caching */ ++#define AS_MEMATTR_INDEX_DEFAULT 0 ++#define AS_MEMATTR_INDEX_DEFAULT_ACE 3 + -+ DEBUG_ASSERT_POINTER(mem); ++/* HW implementation defined caching */ ++#define AS_MEMATTR_INDEX_IMPL_DEF_CACHE_POLICY 0 ++/* Force cache on */ ++#define AS_MEMATTR_INDEX_FORCE_TO_CACHE_ALL 1 ++/* Write-alloc */ ++#define AS_MEMATTR_INDEX_WRITE_ALLOC 2 ++/* Outer coherent, inner implementation defined policy */ ++#define AS_MEMATTR_INDEX_OUTER_IMPL_DEF 3 ++/* Outer coherent, write alloc inner */ ++#define AS_MEMATTR_INDEX_OUTER_WA 4 + -+ ump_random_mapping_put(mem); -+} ++/* JS_FEATURES register */ + ++#define JS_FEATURE_NULL_JOB (1u << 1) ++#define JS_FEATURE_SET_VALUE_JOB (1u << 2) ++#define JS_FEATURE_CACHE_FLUSH_JOB (1u << 3) ++#define JS_FEATURE_COMPUTE_JOB (1u << 4) ++#define JS_FEATURE_VERTEX_JOB (1u << 5) ++#define JS_FEATURE_GEOMETRY_JOB (1u << 6) ++#define JS_FEATURE_TILER_JOB (1u << 7) ++#define JS_FEATURE_FUSED_JOB (1u << 8) ++#define JS_FEATURE_FRAGMENT_JOB (1u << 9) + ++/* End JS_FEATURES register */ + -+/* --------------- Handling of user space requests follows --------------- */ ++/* L2_MMU_CONFIG register */ ++#define L2_MMU_CONFIG_ALLOW_SNOOP_DISPARITY_SHIFT (23) ++#define L2_MMU_CONFIG_ALLOW_SNOOP_DISPARITY (0x1 << L2_MMU_CONFIG_ALLOW_SNOOP_DISPARITY_SHIFT) ++#define L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_SHIFT (24) ++#define L2_MMU_CONFIG_LIMIT_EXTERNAL_READS (0x3 << L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_SHIFT) ++#define L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_OCTANT (0x1 << L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_SHIFT) ++#define L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_QUARTER (0x2 << L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_SHIFT) ++#define L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_HALF (0x3 << L2_MMU_CONFIG_LIMIT_EXTERNAL_READS_SHIFT) + ++#define L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_SHIFT (26) ++#define L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES (0x3 << L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_SHIFT) ++#define L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_OCTANT (0x1 << L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_SHIFT) ++#define L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_QUARTER (0x2 << L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_SHIFT) ++#define L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_HALF (0x3 << L2_MMU_CONFIG_LIMIT_EXTERNAL_WRITES_SHIFT) ++/* End L2_MMU_CONFIG register */ + -+_mali_osk_errcode_t _ump_uku_get_api_version(_ump_uk_api_version_s *args) -+{ -+ ump_session_data *session_data; ++/* THREAD_* registers */ + -+ DEBUG_ASSERT_POINTER(args); -+ DEBUG_ASSERT_POINTER(args->ctx); ++/* THREAD_FEATURES IMPLEMENTATION_TECHNOLOGY values */ ++#define IMPLEMENTATION_UNSPECIFIED 0 ++#define IMPLEMENTATION_SILICON 1 ++#define IMPLEMENTATION_FPGA 2 ++#define IMPLEMENTATION_MODEL 3 + -+ session_data = (ump_session_data *)args->ctx; ++/* Default values when registers are not supported by the implemented hardware */ ++#define THREAD_MT_DEFAULT 256 ++#define THREAD_MWS_DEFAULT 256 ++#define THREAD_MBS_DEFAULT 256 ++#define THREAD_MR_DEFAULT 1024 ++#define THREAD_MTQ_DEFAULT 4 ++#define THREAD_MTGS_DEFAULT 10 + -+ /* check compatability */ -+ if (args->version == UMP_IOCTL_API_VERSION) { -+ DBG_MSG(3, ("API version set to newest %d (compatible)\n", -+ GET_VERSION(args->version))); -+ args->compatible = 1; -+ session_data->api_version = args->version; -+ } else { -+ DBG_MSG(2, ("API version set to %d (incompatible with client version %d)\n", -+ GET_VERSION(UMP_IOCTL_API_VERSION), GET_VERSION(args->version))); -+ args->compatible = 0; -+ args->version = UMP_IOCTL_API_VERSION; /* report our version */ -+ } ++/* End THREAD_* registers */ + -+ return _MALI_OSK_ERR_OK; -+} ++/* SHADER_CONFIG register */ + ++#define SC_ALT_COUNTERS (1ul << 3) ++#define SC_OVERRIDE_FWD_PIXEL_KILL (1ul << 4) ++#define SC_SDC_DISABLE_OQ_DISCARD (1ul << 6) ++#define SC_LS_ALLOW_ATTR_TYPES (1ul << 16) ++#define SC_LS_PAUSEBUFFER_DISABLE (1ul << 16) ++#define SC_LS_ATTR_CHECK_DISABLE (1ul << 18) ++#define SC_ENABLE_TEXGRD_FLAGS (1ul << 25) ++/* End SHADER_CONFIG register */ + -+_mali_osk_errcode_t _ump_ukk_release(_ump_uk_release_s *release_info) -+{ -+ ump_session_memory_list_element *session_memory_element; -+ ump_session_memory_list_element *tmp; -+ ump_session_data *session_data; -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_INVALID_FUNC; -+ int secure_id; ++/* TILER_CONFIG register */ + -+ DEBUG_ASSERT_POINTER(release_info); -+ DEBUG_ASSERT_POINTER(release_info->ctx); ++#define TC_CLOCK_GATE_OVERRIDE (1ul << 0) + -+ /* Retreive the session data */ -+ session_data = (ump_session_data *)release_info->ctx; ++/* End TILER_CONFIG register */ + -+ /* If there are many items in the memory session list we -+ * could be de-referencing this pointer a lot so keep a local copy -+ */ -+ secure_id = release_info->secure_id; ++/* JM_CONFIG register */ + -+ DBG_MSG(4, ("Releasing memory with IOCTL, ID: %u\n", secure_id)); ++#define JM_TIMESTAMP_OVERRIDE (1ul << 0) ++#define JM_CLOCK_GATE_OVERRIDE (1ul << 1) ++#define JM_JOB_THROTTLE_ENABLE (1ul << 2) ++#define JM_JOB_THROTTLE_LIMIT_SHIFT (3) ++#define JM_MAX_JOB_THROTTLE_LIMIT (0x3F) ++#define JM_FORCE_COHERENCY_FEATURES_SHIFT (2) ++#define JM_IDVS_GROUP_SIZE_SHIFT (16) ++#define JM_MAX_IDVS_GROUP_SIZE (0x3F) ++/* End JM_CONFIG register */ + -+ /* Iterate through the memory list looking for the requested secure ID */ -+ _mali_osk_mutex_wait(session_data->lock); -+ _MALI_OSK_LIST_FOREACHENTRY(session_memory_element, tmp, &session_data->list_head_session_memory_list, ump_session_memory_list_element, list) { -+ if (session_memory_element->mem->secure_id == secure_id) { -+ ump_dd_mem *release_mem; + -+ release_mem = session_memory_element->mem; -+ _mali_osk_list_del(&session_memory_element->list); -+ ump_dd_reference_release(release_mem); -+ _mali_osk_free(session_memory_element); ++#endif /* _MIDGARD_REGMAP_H_ */ +diff --git a/drivers/gpu/arm/midgard/mali_timeline.h b/drivers/gpu/arm/midgard/mali_timeline.h +new file mode 100755 +index 000000000..bd5f6614b +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_timeline.h +@@ -0,0 +1,396 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ ret = _MALI_OSK_ERR_OK; -+ break; -+ } -+ } + -+ _mali_osk_mutex_signal(session_data->lock); -+ DBG_MSG_IF(1, _MALI_OSK_ERR_OK != ret, ("UMP memory with ID %u does not belong to this session.\n", secure_id)); + -+ DBG_MSG(4, ("_ump_ukk_release() returning 0x%x\n", ret)); -+ return ret; -+} + -+_mali_osk_errcode_t _ump_ukk_size_get(_ump_uk_size_get_s *user_interaction) -+{ -+ ump_dd_mem *mem; -+ _mali_osk_errcode_t ret = _MALI_OSK_ERR_FAULT; + -+ DEBUG_ASSERT_POINTER(user_interaction); ++#undef TRACE_SYSTEM ++#define TRACE_SYSTEM mali_timeline + -+ /* We lock the mappings so things don't get removed while we are looking for the memory */ -+ mem = ump_random_mapping_get(device.secure_id_map, user_interaction->secure_id); -+ if (NULL != mem) { -+ user_interaction->size = mem->size_bytes; -+ DBG_MSG(4, ("Returning size. ID: %u, size: %lu ", -+ (ump_secure_id)user_interaction->secure_id, -+ (unsigned long)user_interaction->size)); -+ ump_random_mapping_put(mem); -+ ret = _MALI_OSK_ERR_OK; -+ } else { -+ user_interaction->size = 0; -+ DBG_MSG(1, ("Failed to look up mapping in ump_ioctl_size_get(). ID: %u\n", -+ (ump_secure_id)user_interaction->secure_id)); -+ } ++#if !defined(_MALI_TIMELINE_H) || defined(TRACE_HEADER_MULTI_READ) ++#define _MALI_TIMELINE_H + -+ return ret; -+} ++#include + ++TRACE_EVENT(mali_timeline_atoms_in_flight, + ++ TP_PROTO(u64 ts_sec, ++ u32 ts_nsec, ++ int tgid, ++ int count), + -+void _ump_ukk_msync(_ump_uk_msync_s *args) -+{ -+ ump_dd_mem *mem = NULL; -+ void *virtual = NULL; -+ u32 size = 0; -+ u32 offset = 0; ++ TP_ARGS(ts_sec, ++ ts_nsec, ++ tgid, ++ count), + -+ mem = ump_random_mapping_get(device.secure_id_map, (int)args->secure_id); -+ if (NULL == mem) { -+ DBG_MSG(1, ("Failed to look up mapping in _ump_ukk_msync(). ID: %u\n", -+ (ump_secure_id)args->secure_id)); -+ return; -+ } ++ TP_STRUCT__entry( ++ __field(u64, ts_sec) ++ __field(u32, ts_nsec) ++ __field(int, tgid) ++ __field(int, count) ++ ), + -+ /* Returns the cache settings back to Userspace */ -+ args->is_cached = mem->is_cached; ++ TP_fast_assign( ++ __entry->ts_sec = ts_sec; ++ __entry->ts_nsec = ts_nsec; ++ __entry->tgid = tgid; ++ __entry->count = count; ++ ), + -+ /* If this flag is the only one set, we should not do the actual flush, only the readout */ -+ if (_UMP_UK_MSYNC_READOUT_CACHE_ENABLED == args->op) { -+ DBG_MSG(3, ("_ump_ukk_msync READOUT ID: %u Enabled: %d\n", (ump_secure_id)args->secure_id, mem->is_cached)); -+ goto msync_release_and_return; -+ } ++ TP_printk("%i,%i.%.9i,%i,%i", CTX_SET_NR_ATOMS_IN_FLIGHT, ++ (int)__entry->ts_sec, ++ (int)__entry->ts_nsec, ++ __entry->tgid, ++ __entry->count) ++); + -+ /* Nothing to do if the memory is not caches */ -+ if (0 == mem->is_cached) { -+ DBG_MSG(3, ("_ump_ukk_msync IGNORING ID: %u Enabled: %d OP: %d\n", (ump_secure_id)args->secure_id, mem->is_cached, args->op)); -+ goto msync_release_and_return; -+ } -+ DBG_MSG(3, ("UMP[%02u] _ump_ukk_msync Flush OP: %d Address: 0x%08x Mapping: 0x%08x\n", -+ (ump_secure_id)args->secure_id, args->op, args->address, args->mapping)); + -+ if (args->address) { -+ virtual = (void *)((u32)args->address); -+ offset = (u32)((args->address) - (args->mapping)); -+ } else { -+ /* Flush entire mapping when no address is specified. */ -+ virtual = args->mapping; -+ } -+ if (args->size) { -+ size = args->size; -+ } else { -+ /* Flush entire mapping when no size is specified. */ -+ size = mem->size_bytes - offset; -+ } ++TRACE_EVENT(mali_timeline_atom, + -+ if ((offset + size) > mem->size_bytes) { -+ DBG_MSG(1, ("Trying to flush more than the entire UMP allocation: offset: %u + size: %u > %u\n", offset, size, mem->size_bytes)); -+ goto msync_release_and_return; -+ } ++ TP_PROTO(u64 ts_sec, ++ u32 ts_nsec, ++ int event_type, ++ int tgid, ++ int atom_id), + -+ /* The actual cache flush - Implemented for each OS*/ -+ _ump_osk_msync(mem, virtual, offset, size, args->op, NULL); ++ TP_ARGS(ts_sec, ++ ts_nsec, ++ event_type, ++ tgid, ++ atom_id), + -+msync_release_and_return: -+ ump_random_mapping_put(mem); -+ return; -+} ++ TP_STRUCT__entry( ++ __field(u64, ts_sec) ++ __field(u32, ts_nsec) ++ __field(int, event_type) ++ __field(int, tgid) ++ __field(int, atom_id) ++ ), + -+void _ump_ukk_cache_operations_control(_ump_uk_cache_operations_control_s *args) -+{ -+ ump_session_data *session_data; -+ ump_uk_cache_op_control op; ++ TP_fast_assign( ++ __entry->ts_sec = ts_sec; ++ __entry->ts_nsec = ts_nsec; ++ __entry->event_type = event_type; ++ __entry->tgid = tgid; ++ __entry->atom_id = atom_id; ++ ), + -+ DEBUG_ASSERT_POINTER(args); -+ DEBUG_ASSERT_POINTER(args->ctx); ++ TP_printk("%i,%i.%.9i,%i,%i,%i", __entry->event_type, ++ (int)__entry->ts_sec, ++ (int)__entry->ts_nsec, ++ __entry->tgid, ++ __entry->atom_id, ++ __entry->atom_id) ++); + -+ op = args->op; -+ session_data = (ump_session_data *)args->ctx; ++TRACE_EVENT(mali_timeline_gpu_slot_active, + -+ _mali_osk_mutex_wait(session_data->lock); -+ if (op == _UMP_UK_CACHE_OP_START) { -+ session_data->cache_operations_ongoing++; -+ DBG_MSG(4, ("Cache ops start\n")); -+ if (session_data->cache_operations_ongoing != 1) { -+ DBG_MSG(2, ("UMP: Number of simultanious cache control ops: %d\n", session_data->cache_operations_ongoing)); -+ } -+ } else if (op == _UMP_UK_CACHE_OP_FINISH) { -+ DBG_MSG(4, ("Cache ops finish\n")); -+ session_data->cache_operations_ongoing--; -+#if 0 -+ if (session_data->has_pending_level1_cache_flush) { -+ /* This function will set has_pending_level1_cache_flush=0 */ -+ _ump_osk_msync(NULL, NULL, 0, 0, _UMP_UK_MSYNC_FLUSH_L1, session_data); -+ } -+#endif ++ TP_PROTO(u64 ts_sec, ++ u32 ts_nsec, ++ int event_type, ++ int tgid, ++ int js, ++ int count), + -+ /* to be on the safe side: always flush l1 cache when cache operations are done */ -+ _ump_osk_msync(NULL, NULL, 0, 0, _UMP_UK_MSYNC_FLUSH_L1, session_data); -+ DBG_MSG(4, ("Cache ops finish end\n")); -+ } else { -+ DBG_MSG(1, ("Illegal call to %s at line %d\n", __FUNCTION__, __LINE__)); -+ } -+ _mali_osk_mutex_signal(session_data->lock); ++ TP_ARGS(ts_sec, ++ ts_nsec, ++ event_type, ++ tgid, ++ js, ++ count), + -+} ++ TP_STRUCT__entry( ++ __field(u64, ts_sec) ++ __field(u32, ts_nsec) ++ __field(int, event_type) ++ __field(int, tgid) ++ __field(int, js) ++ __field(int, count) ++ ), + -+void _ump_ukk_switch_hw_usage(_ump_uk_switch_hw_usage_s *args) -+{ -+ ump_dd_mem *mem = NULL; -+ ump_uk_user old_user; -+ ump_uk_msync_op cache_op = _UMP_UK_MSYNC_CLEAN_AND_INVALIDATE; -+ ump_session_data *session_data; ++ TP_fast_assign( ++ __entry->ts_sec = ts_sec; ++ __entry->ts_nsec = ts_nsec; ++ __entry->event_type = event_type; ++ __entry->tgid = tgid; ++ __entry->js = js; ++ __entry->count = count; ++ ), + -+ DEBUG_ASSERT_POINTER(args); -+ DEBUG_ASSERT_POINTER(args->ctx); ++ TP_printk("%i,%i.%.9i,%i,%i,%i", __entry->event_type, ++ (int)__entry->ts_sec, ++ (int)__entry->ts_nsec, ++ __entry->tgid, ++ __entry->js, ++ __entry->count) ++); + -+ session_data = (ump_session_data *)args->ctx; ++TRACE_EVENT(mali_timeline_gpu_slot_action, + -+ mem = ump_random_mapping_get(device.secure_id_map, (int)args->secure_id); -+ if (NULL == mem) { -+ DBG_MSG(1, ("Failed to look up mapping in _ump_ukk_switch_hw_usage(). ID: %u\n", -+ (ump_secure_id)args->secure_id)); -+ return; -+ } ++ TP_PROTO(u64 ts_sec, ++ u32 ts_nsec, ++ int event_type, ++ int tgid, ++ int js, ++ int count), + -+ old_user = mem->hw_device; -+ mem->hw_device = args->new_user; ++ TP_ARGS(ts_sec, ++ ts_nsec, ++ event_type, ++ tgid, ++ js, ++ count), + -+ DBG_MSG(3, ("UMP[%02u] Switch usage Start New: %s Prev: %s.\n", -+ (ump_secure_id)args->secure_id, -+ args->new_user ? "MALI" : "CPU", -+ old_user ? "MALI" : "CPU")); ++ TP_STRUCT__entry( ++ __field(u64, ts_sec) ++ __field(u32, ts_nsec) ++ __field(int, event_type) ++ __field(int, tgid) ++ __field(int, js) ++ __field(int, count) ++ ), + -+ if (!mem->is_cached) { -+ DBG_MSG(3, ("UMP[%02u] Changing owner of uncached memory. Cache flushing not needed.\n", -+ (ump_secure_id)args->secure_id)); -+ goto out; -+ } ++ TP_fast_assign( ++ __entry->ts_sec = ts_sec; ++ __entry->ts_nsec = ts_nsec; ++ __entry->event_type = event_type; ++ __entry->tgid = tgid; ++ __entry->js = js; ++ __entry->count = count; ++ ), + -+ if (old_user == args->new_user) { -+ DBG_MSG(4, ("UMP[%02u] Setting the new_user equal to previous for. Cache flushing not needed.\n", -+ (ump_secure_id)args->secure_id)); -+ goto out; -+ } -+ if ( -+ /* Previous AND new is both different from CPU */ -+ (old_user != _UMP_UK_USED_BY_CPU) && (args->new_user != _UMP_UK_USED_BY_CPU) -+ ) { -+ DBG_MSG(4, ("UMP[%02u] Previous and new user is not CPU. Cache flushing not needed.\n", -+ (ump_secure_id)args->secure_id)); -+ goto out; -+ } ++ TP_printk("%i,%i.%.9i,%i,%i,%i", __entry->event_type, ++ (int)__entry->ts_sec, ++ (int)__entry->ts_nsec, ++ __entry->tgid, ++ __entry->js, ++ __entry->count) ++); + -+ if ((old_user != _UMP_UK_USED_BY_CPU) && (args->new_user == _UMP_UK_USED_BY_CPU)) { -+ cache_op = _UMP_UK_MSYNC_INVALIDATE; -+ DBG_MSG(4, ("UMP[%02u] Cache invalidation needed\n", (ump_secure_id)args->secure_id)); -+#ifdef UMP_SKIP_INVALIDATION -+#error -+ DBG_MSG(4, ("UMP[%02u] Performing Cache invalidation SKIPPED\n", (ump_secure_id)args->secure_id)); -+ goto out; -+#endif -+ } ++TRACE_EVENT(mali_timeline_gpu_power_active, + -+ /* Take lock to protect: session->cache_operations_ongoing and session->has_pending_level1_cache_flush */ -+ _mali_osk_mutex_wait(session_data->lock); -+ /* Actual cache flush */ -+ _ump_osk_msync(mem, NULL, 0, mem->size_bytes, cache_op, session_data); -+ _mali_osk_mutex_signal(session_data->lock); ++ TP_PROTO(u64 ts_sec, ++ u32 ts_nsec, ++ int event_type, ++ int active), + -+out: -+ ump_random_mapping_put(mem); -+ DBG_MSG(4, ("UMP[%02u] Switch usage Finish\n", (ump_secure_id)args->secure_id)); -+ return; -+} ++ TP_ARGS(ts_sec, ++ ts_nsec, ++ event_type, ++ active), + -+void _ump_ukk_lock(_ump_uk_lock_s *args) -+{ -+ ump_dd_mem *mem = NULL; ++ TP_STRUCT__entry( ++ __field(u64, ts_sec) ++ __field(u32, ts_nsec) ++ __field(int, event_type) ++ __field(int, active) ++ ), + -+ mem = ump_random_mapping_get(device.secure_id_map, (int)args->secure_id); -+ if (NULL == mem) { -+ DBG_MSG(1, ("UMP[%02u] Failed to look up mapping in _ump_ukk_lock(). ID: %u\n", -+ (ump_secure_id)args->secure_id)); -+ return; -+ } ++ TP_fast_assign( ++ __entry->ts_sec = ts_sec; ++ __entry->ts_nsec = ts_nsec; ++ __entry->event_type = event_type; ++ __entry->active = active; ++ ), + -+ DBG_MSG(1, ("UMP[%02u] Lock. New lock flag: %d. Old Lock flag:\n", (u32)args->secure_id, (u32)args->lock_usage, (u32) mem->lock_usage)); ++ TP_printk("%i,%i.%.9i,0,%i", __entry->event_type, ++ (int)__entry->ts_sec, ++ (int)__entry->ts_nsec, ++ __entry->active) + -+ mem->lock_usage = (ump_lock_usage) args->lock_usage; ++); + -+ ump_random_mapping_put(mem); -+} ++TRACE_EVENT(mali_timeline_l2_power_active, + -+void _ump_ukk_unlock(_ump_uk_unlock_s *args) -+{ -+ ump_dd_mem *mem = NULL; ++ TP_PROTO(u64 ts_sec, ++ u32 ts_nsec, ++ int event_type, ++ int state), + -+ mem = ump_random_mapping_get(device.secure_id_map, (int)args->secure_id); -+ if (NULL == mem) { -+ DBG_MSG(1, ("Failed to look up mapping in _ump_ukk_unlock(). ID: %u\n", -+ (ump_secure_id)args->secure_id)); -+ return; -+ } ++ TP_ARGS(ts_sec, ++ ts_nsec, ++ event_type, ++ state), + -+ DBG_MSG(1, ("UMP[%02u] Unlocking. Old Lock flag:\n", -+ (u32)args->secure_id, (u32) mem->lock_usage)); ++ TP_STRUCT__entry( ++ __field(u64, ts_sec) ++ __field(u32, ts_nsec) ++ __field(int, event_type) ++ __field(int, state) ++ ), + -+ mem->lock_usage = (ump_lock_usage) UMP_NOT_LOCKED; ++ TP_fast_assign( ++ __entry->ts_sec = ts_sec; ++ __entry->ts_nsec = ts_nsec; ++ __entry->event_type = event_type; ++ __entry->state = state; ++ ), + -+ ump_random_mapping_put(mem); -+} -diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c -new file mode 100755 -index 000000000000..73aa9e4c49f9 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c -@@ -0,0 +1,358 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++ TP_printk("%i,%i.%.9i,0,%i", __entry->event_type, ++ (int)__entry->ts_sec, ++ (int)__entry->ts_nsec, ++ __entry->state) + -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_osk_bitops.h" -+#include "mali_osk_list.h" -+#include "ump_osk.h" -+#include "ump_uk_types.h" -+#include "ump_ukk.h" -+#include "ump_kernel_common.h" -+#include "ump_kernel_descriptor_mapping.h" -+#include "ump_kernel_memory_backend.h" ++); ++TRACE_EVENT(mali_timeline_pm_event, + ++ TP_PROTO(u64 ts_sec, ++ u32 ts_nsec, ++ int event_type, ++ int pm_event_type, ++ unsigned int pm_event_id), + ++ TP_ARGS(ts_sec, ++ ts_nsec, ++ event_type, ++ pm_event_type, ++ pm_event_id), + -+/** -+ * Define the initial and maximum size of number of secure_ids on the system -+ */ -+#define UMP_SECURE_ID_TABLE_ENTRIES_INITIAL (128 ) -+#define UMP_SECURE_ID_TABLE_ENTRIES_MAXIMUM (4096 ) ++ TP_STRUCT__entry( ++ __field(u64, ts_sec) ++ __field(u32, ts_nsec) ++ __field(int, event_type) ++ __field(int, pm_event_type) ++ __field(unsigned int, pm_event_id) ++ ), + ++ TP_fast_assign( ++ __entry->ts_sec = ts_sec; ++ __entry->ts_nsec = ts_nsec; ++ __entry->event_type = event_type; ++ __entry->pm_event_type = pm_event_type; ++ __entry->pm_event_id = pm_event_id; ++ ), + -+/** -+ * Define the initial and maximum size of the ump_session_data::cookies_map, -+ * which is a \ref ump_descriptor_mapping. This limits how many secure_ids -+ * may be mapped into a particular process using _ump_ukk_map_mem(). -+ */ ++ TP_printk("%i,%i.%.9i,0,%i,%u", __entry->event_type, ++ (int)__entry->ts_sec, ++ (int)__entry->ts_nsec, ++ __entry->pm_event_type, __entry->pm_event_id) + -+#define UMP_COOKIES_PER_SESSION_INITIAL (UMP_SECURE_ID_TABLE_ENTRIES_INITIAL ) -+#define UMP_COOKIES_PER_SESSION_MAXIMUM (UMP_SECURE_ID_TABLE_ENTRIES_MAXIMUM) ++); + -+struct ump_dev device; ++TRACE_EVENT(mali_timeline_slot_atom, + -+_mali_osk_errcode_t ump_kernel_constructor(void) -+{ -+ _mali_osk_errcode_t err; ++ TP_PROTO(u64 ts_sec, ++ u32 ts_nsec, ++ int event_type, ++ int tgid, ++ int js, ++ int atom_id), + -+ /* Perform OS Specific initialization */ -+ err = _ump_osk_init(); -+ if (_MALI_OSK_ERR_OK != err) { -+ MSG_ERR(("Failed to initiaze the UMP Device Driver")); -+ return err; -+ } ++ TP_ARGS(ts_sec, ++ ts_nsec, ++ event_type, ++ tgid, ++ js, ++ atom_id), + -+ /* Init the global device */ -+ _mali_osk_memset(&device, 0, sizeof(device)); ++ TP_STRUCT__entry( ++ __field(u64, ts_sec) ++ __field(u32, ts_nsec) ++ __field(int, event_type) ++ __field(int, tgid) ++ __field(int, js) ++ __field(int, atom_id) ++ ), + -+ /* Create the descriptor map, which will be used for mapping secure ID to ump_dd_mem structs */ -+ device.secure_id_map = ump_random_mapping_create(); -+ if (NULL == device.secure_id_map) { -+ MSG_ERR(("Failed to create secure id lookup table\n")); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++ TP_fast_assign( ++ __entry->ts_sec = ts_sec; ++ __entry->ts_nsec = ts_nsec; ++ __entry->event_type = event_type; ++ __entry->tgid = tgid; ++ __entry->js = js; ++ __entry->atom_id = atom_id; ++ ), + -+ /* Init memory backend */ -+ device.backend = ump_memory_backend_create(); -+ if (NULL == device.backend) { -+ MSG_ERR(("Failed to create memory backend\n")); -+ ump_random_mapping_destroy(device.secure_id_map); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++ TP_printk("%i,%i.%.9i,%i,%i,%i", __entry->event_type, ++ (int)__entry->ts_sec, ++ (int)__entry->ts_nsec, ++ __entry->tgid, ++ __entry->js, ++ __entry->atom_id) ++); + -+ return _MALI_OSK_ERR_OK; -+} ++TRACE_EVENT(mali_timeline_pm_checktrans, + -+void ump_kernel_destructor(void) -+{ -+ DEBUG_ASSERT_POINTER(device.secure_id_map); ++ TP_PROTO(u64 ts_sec, ++ u32 ts_nsec, ++ int trans_code, ++ int trans_id), + -+ ump_random_mapping_destroy(device.secure_id_map); -+ device.secure_id_map = NULL; ++ TP_ARGS(ts_sec, ++ ts_nsec, ++ trans_code, ++ trans_id), + -+ device.backend->shutdown(device.backend); -+ device.backend = NULL; ++ TP_STRUCT__entry( ++ __field(u64, ts_sec) ++ __field(u32, ts_nsec) ++ __field(int, trans_code) ++ __field(int, trans_id) ++ ), + -+ ump_memory_backend_destroy(); ++ TP_fast_assign( ++ __entry->ts_sec = ts_sec; ++ __entry->ts_nsec = ts_nsec; ++ __entry->trans_code = trans_code; ++ __entry->trans_id = trans_id; ++ ), + -+ _ump_osk_term(); -+} ++ TP_printk("%i,%i.%.9i,0,%i", __entry->trans_code, ++ (int)__entry->ts_sec, ++ (int)__entry->ts_nsec, ++ __entry->trans_id) + -+/** Creates a new UMP session -+ */ -+_mali_osk_errcode_t _ump_ukk_open(void **context) -+{ -+ struct ump_session_data *session_data; ++); + -+ /* allocated struct to track this session */ -+ session_data = (struct ump_session_data *)_mali_osk_malloc(sizeof(struct ump_session_data)); -+ if (NULL == session_data) { -+ MSG_ERR(("Failed to allocate ump_session_data in ump_file_open()\n")); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++TRACE_EVENT(mali_timeline_context_active, + -+ session_data->lock = _mali_osk_mutex_init(_MALI_OSK_LOCKFLAG_UNORDERED, 0); -+ if (NULL == session_data->lock) { -+ MSG_ERR(("Failed to initialize lock for ump_session_data in ump_file_open()\n")); -+ _mali_osk_free(session_data); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++ TP_PROTO(u64 ts_sec, ++ u32 ts_nsec, ++ int count), + -+ session_data->cookies_map = ump_descriptor_mapping_create( -+ UMP_COOKIES_PER_SESSION_INITIAL, -+ UMP_COOKIES_PER_SESSION_MAXIMUM); ++ TP_ARGS(ts_sec, ++ ts_nsec, ++ count), + -+ if (NULL == session_data->cookies_map) { -+ MSG_ERR(("Failed to create descriptor mapping for _ump_ukk_map_mem cookies\n")); ++ TP_STRUCT__entry( ++ __field(u64, ts_sec) ++ __field(u32, ts_nsec) ++ __field(int, count) ++ ), + -+ _mali_osk_mutex_term(session_data->lock); -+ _mali_osk_free(session_data); -+ return _MALI_OSK_ERR_NOMEM; -+ } ++ TP_fast_assign( ++ __entry->ts_sec = ts_sec; ++ __entry->ts_nsec = ts_nsec; ++ __entry->count = count; ++ ), + -+ _MALI_OSK_INIT_LIST_HEAD(&session_data->list_head_session_memory_list); ++ TP_printk("%i,%i.%.9i,0,%i", SW_SET_CONTEXT_ACTIVE, ++ (int)__entry->ts_sec, ++ (int)__entry->ts_nsec, ++ __entry->count) ++); + -+ _MALI_OSK_INIT_LIST_HEAD(&session_data->list_head_session_memory_mappings_list); ++#endif /* _MALI_TIMELINE_H */ + -+ /* Since initial version of the UMP interface did not use the API_VERSION ioctl we have to assume -+ that it is this version, and not the "latest" one: UMP_IOCTL_API_VERSION -+ Current and later API versions would do an additional call to this IOCTL and update this variable -+ to the correct one.*/ -+ session_data->api_version = MAKE_VERSION_ID(1); ++#undef TRACE_INCLUDE_PATH ++#define TRACE_INCLUDE_PATH . + -+ *context = (void *)session_data; ++/* This part must be outside protection */ ++#include + -+ session_data->cache_operations_ongoing = 0 ; -+ session_data->has_pending_level1_cache_flush = 0; +diff --git a/drivers/gpu/arm/midgard/mali_uk.h b/drivers/gpu/arm/midgard/mali_uk.h +new file mode 100755 +index 000000000..841d03fb5 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/mali_uk.h +@@ -0,0 +1,141 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010, 2012-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ DBG_MSG(2, ("New session opened\n")); + -+ return _MALI_OSK_ERR_OK; -+} + -+_mali_osk_errcode_t _ump_ukk_close(void **context) -+{ -+ struct ump_session_data *session_data; -+ ump_session_memory_list_element *item; -+ ump_session_memory_list_element *tmp; + -+ session_data = (struct ump_session_data *)*context; -+ if (NULL == session_data) { -+ MSG_ERR(("Session data is NULL in _ump_ukk_close()\n")); -+ return _MALI_OSK_ERR_INVALID_ARGS; -+ } + -+ /* Unmap any descriptors mapped in. */ -+ if (0 == _mali_osk_list_empty(&session_data->list_head_session_memory_mappings_list)) { -+ ump_memory_allocation *descriptor; -+ ump_memory_allocation *temp; ++/** ++ * @file mali_uk.h ++ * Types and definitions that are common across OSs for both the user ++ * and kernel side of the User-Kernel interface. ++ */ + -+ DBG_MSG(1, ("Memory mappings found on session usage list during session termination\n")); ++#ifndef _UK_H_ ++#define _UK_H_ + -+ /* use the 'safe' list iterator, since freeing removes the active block from the list we're iterating */ -+ _MALI_OSK_LIST_FOREACHENTRY(descriptor, temp, &session_data->list_head_session_memory_mappings_list, ump_memory_allocation, list) { -+ _ump_uk_unmap_mem_s unmap_args; -+ DBG_MSG(4, ("Freeing block with phys address 0x%x size 0x%x mapped in user space at 0x%x\n", -+ descriptor->phys_addr, descriptor->size, descriptor->mapping)); -+ unmap_args.ctx = (void *)session_data; -+ unmap_args.mapping = descriptor->mapping; -+ unmap_args.size = descriptor->size; -+ unmap_args._ukk_private = NULL; /* NOTE: unused */ -+ unmap_args.cookie = descriptor->cookie; ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ + -+ /* NOTE: This modifies the list_head_session_memory_mappings_list */ -+ _ump_ukk_unmap_mem(&unmap_args); -+ } -+ } ++/** ++ * @addtogroup base_api ++ * @{ ++ */ + -+ /* ASSERT that we really did free everything, because _ump_ukk_unmap_mem() -+ * can fail silently. */ -+ DEBUG_ASSERT(_mali_osk_list_empty(&session_data->list_head_session_memory_mappings_list)); ++/** ++ * @defgroup uk_api User-Kernel Interface API ++ * ++ * The User-Kernel Interface abstracts the communication mechanism between the user and kernel-side code of device ++ * drivers developed as part of the Midgard DDK. Currently that includes the Base driver and the UMP driver. ++ * ++ * It exposes an OS independent API to user-side code (UKU) which routes functions calls to an OS-independent ++ * kernel-side API (UKK) via an OS-specific communication mechanism. ++ * ++ * This API is internal to the Midgard DDK and is not exposed to any applications. ++ * ++ * @{ ++ */ + -+ _MALI_OSK_LIST_FOREACHENTRY(item, tmp, &session_data->list_head_session_memory_list, ump_session_memory_list_element, list) { -+ _mali_osk_list_del(&item->list); -+ DBG_MSG(2, ("Releasing UMP memory %u as part of file close\n", item->mem->secure_id)); -+ ump_dd_reference_release(item->mem); -+ _mali_osk_free(item); -+ } ++/** ++ * These are identifiers for kernel-side drivers implementing a UK interface, aka UKK clients. The ++ * UK module maps this to an OS specific device name, e.g. "gpu_base" -> "GPU0:". Specify this ++ * identifier to select a UKK client to the uku_open() function. ++ * ++ * When a new UKK client driver is created a new identifier needs to be added to the uk_client_id ++ * enumeration and the uku_open() implemenation for the various OS ports need to be updated to ++ * provide a mapping of the identifier to the OS specific device name. ++ * ++ */ ++enum uk_client_id { ++ /** ++ * Value used to identify the Base driver UK client. ++ */ ++ UK_CLIENT_MALI_T600_BASE, + -+ ump_descriptor_mapping_destroy(session_data->cookies_map); ++ /** The number of uk clients supported. This must be the last member of the enum */ ++ UK_CLIENT_COUNT ++}; + -+ _mali_osk_mutex_term(session_data->lock); -+ _mali_osk_free(session_data); ++/** ++ * Each function callable through the UK interface has a unique number. ++ * Functions provided by UK clients start from number UK_FUNC_ID. ++ * Numbers below UK_FUNC_ID are used for internal UK functions. ++ */ ++enum uk_func { ++ UKP_FUNC_ID_CHECK_VERSION, /**< UKK Core internal function */ ++ /** ++ * Each UK client numbers the functions they provide starting from ++ * number UK_FUNC_ID. This number is then eventually assigned to the ++ * id field of the union uk_header structure when preparing to make a ++ * UK call. See your UK client for a list of their function numbers. ++ */ ++ UK_FUNC_ID = 512 ++}; + -+ DBG_MSG(2, ("Session closed\n")); ++/** ++ * Arguments for a UK call are stored in a structure. This structure consists ++ * of a fixed size header and a payload. The header carries a 32-bit number ++ * identifying the UK function to be called (see uk_func). When the UKK client ++ * receives this header and executed the requested UK function, it will use ++ * the same header to store the result of the function in the form of a ++ * int return code. The size of this structure is such that the ++ * first member of the payload following the header can be accessed efficiently ++ * on a 32 and 64-bit kernel and the structure has the same size regardless ++ * of a 32 or 64-bit kernel. The uk_kernel_size_type type should be defined ++ * accordingly in the OS specific mali_uk_os.h header file. ++ */ ++union uk_header { ++ /** ++ * 32-bit number identifying the UK function to be called. ++ * Also see uk_func. ++ */ ++ u32 id; ++ /** ++ * The int return code returned by the called UK function. ++ * See the specification of the particular UK function you are ++ * calling for the meaning of the error codes returned. All ++ * UK functions return 0 on success. ++ */ ++ u32 ret; ++ /* ++ * Used to ensure 64-bit alignment of this union. Do not remove. ++ * This field is used for padding and does not need to be initialized. ++ */ ++ u64 sizer; ++}; + -+ return _MALI_OSK_ERR_OK; ++/** ++ * This structure carries a 16-bit major and minor number and is sent along with an internal UK call ++ * used during uku_open to identify the versions of the UK module in use by the user-side and kernel-side. ++ */ ++struct uku_version_check_args { ++ union uk_header header; ++ /**< UK call header */ ++ u16 major; ++ /**< This field carries the user-side major version on input and the kernel-side major version on output */ ++ u16 minor; ++ /**< This field carries the user-side minor version on input and the kernel-side minor version on output. */ ++ u8 padding[4]; ++}; ++ ++/** @} end group uk_api */ ++ ++/** @} *//* end group base_api */ ++ ++#ifdef __cplusplus +} ++#endif /* __cplusplus */ ++#endif /* _UK_H_ */ +diff --git a/drivers/gpu/arm/midgard/platform/Kconfig b/drivers/gpu/arm/midgard/platform/Kconfig +new file mode 100755 +index 000000000..8fb4e917c +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/Kconfig +@@ -0,0 +1,24 @@ ++# ++# (C) COPYRIGHT 2012 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+_mali_osk_errcode_t _ump_ukk_map_mem(_ump_uk_map_mem_s *args) -+{ -+ struct ump_session_data *session_data; -+ ump_memory_allocation *descriptor; /* Describes current mapping of memory */ -+ _mali_osk_errcode_t err; -+ unsigned long offset = 0; -+ unsigned long left; -+ ump_dd_handle handle; /* The real UMP handle for this memory. Its real datatype is ump_dd_mem* */ -+ ump_dd_mem *mem; /* The real UMP memory. It is equal to the handle, but with exposed struct */ -+ u32 block; -+ int map_id; + -+ session_data = (ump_session_data *)args->ctx; -+ if (NULL == session_data) { -+ MSG_ERR(("Session data is NULL in _ump_ukk_map_mem()\n")); -+ return _MALI_OSK_ERR_INVALID_ARGS; -+ } + -+ descriptor = (ump_memory_allocation *) _mali_osk_calloc(1, sizeof(ump_memory_allocation)); -+ if (NULL == descriptor) { -+ MSG_ERR(("ump_ukk_map_mem: descriptor allocation failed\n")); -+ return _MALI_OSK_ERR_NOMEM; -+ } + -+ handle = ump_dd_handle_create_from_secure_id(args->secure_id); -+ if (UMP_DD_HANDLE_INVALID == handle) { -+ _mali_osk_free(descriptor); -+ DBG_MSG(1, ("Trying to map unknown secure ID %u\n", args->secure_id)); -+ return _MALI_OSK_ERR_FAULT; -+ } ++# Add your platform specific Kconfig file here ++# ++# "drivers/gpu/arm/midgard/platform/xxx/Kconfig" ++# ++# Where xxx is the platform name is the name set in MALI_PLATFORM_THIRDPARTY_NAME ++# + -+ mem = (ump_dd_mem *)handle; -+ DEBUG_ASSERT(mem); -+ if (mem->size_bytes != args->size) { -+ _mali_osk_free(descriptor); -+ ump_dd_reference_release(handle); -+ DBG_MSG(1, ("Trying to map too much or little. ID: %u, virtual size=%lu, UMP size: %lu\n", args->secure_id, args->size, mem->size_bytes)); -+ return _MALI_OSK_ERR_FAULT; -+ } +diff --git a/drivers/gpu/arm/midgard/platform/devicetree/Kbuild b/drivers/gpu/arm/midgard/platform/devicetree/Kbuild +new file mode 100755 +index 000000000..e888a42fc +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/devicetree/Kbuild +@@ -0,0 +1,18 @@ ++# ++# (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+ map_id = ump_descriptor_mapping_allocate_mapping(session_data->cookies_map, (void *) descriptor); + -+ if (map_id < 0) { -+ _mali_osk_free(descriptor); -+ ump_dd_reference_release(handle); -+ DBG_MSG(1, ("ump_ukk_map_mem: unable to allocate a descriptor_mapping for return cookie\n")); ++mali_kbase-y += \ ++ $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_devicetree.o \ ++ $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_runtime_pm.o +diff --git a/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c +new file mode 100755 +index 000000000..b2a7c93f1 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c +@@ -0,0 +1,31 @@ ++/* ++ * ++ * (C) COPYRIGHT 2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ return _MALI_OSK_ERR_NOMEM; -+ } + -+ descriptor->size = args->size; -+ descriptor->handle = handle; -+ descriptor->phys_addr = args->phys_addr; -+ descriptor->process_mapping_info = args->_ukk_private; -+ descriptor->ump_session = session_data; -+ descriptor->cookie = (u32)map_id; + -+ if (mem->is_cached) { -+ descriptor->is_cached = 1; -+ DBG_MSG(3, ("Mapping UMP secure_id: %d as cached.\n", args->secure_id)); -+ } else { -+ descriptor->is_cached = 0; -+ DBG_MSG(3, ("Mapping UMP secure_id: %d as Uncached.\n", args->secure_id)); -+ } ++#include + -+ _mali_osk_list_init(&descriptor->list); ++int kbase_platform_early_init(void) ++{ ++ /* Nothing needed at this stage */ ++ return 0; ++} + -+ err = _ump_osk_mem_mapregion_init(descriptor); -+ if (_MALI_OSK_ERR_OK != err) { -+ DBG_MSG(1, ("Failed to initialize memory mapping in _ump_ukk_map_mem(). ID: %u\n", args->secure_id)); -+ ump_descriptor_mapping_free(session_data->cookies_map, map_id); -+ _mali_osk_free(descriptor); -+ ump_dd_reference_release(mem); -+ return err; -+ } ++static struct kbase_platform_config dummy_platform_config; + -+ DBG_MSG(4, ("Mapping virtual to physical memory: ID: %u, size:%lu, first physical addr: 0x%08lx, number of regions: %lu\n", -+ mem->secure_id, -+ mem->size_bytes, -+ ((NULL != mem->block_array) ? mem->block_array->addr : 0), -+ mem->nr_blocks)); ++struct kbase_platform_config *kbase_get_platform_config(void) ++{ ++ return &dummy_platform_config; ++} +diff --git a/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h +new file mode 100755 +index 000000000..49e107f98 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h +@@ -0,0 +1,73 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ left = descriptor->size; -+ /* loop over all blocks and map them in */ -+ for (block = 0; block < mem->nr_blocks; block++) { -+ unsigned long size_to_map; + -+ if (left > mem->block_array[block].size) { -+ size_to_map = mem->block_array[block].size; -+ } else { -+ size_to_map = left; -+ } + -+ if (_MALI_OSK_ERR_OK != _ump_osk_mem_mapregion_map(descriptor, offset, (u32 *) & (mem->block_array[block].addr), size_to_map)) { -+ DBG_MSG(1, ("WARNING: _ump_ukk_map_mem failed to map memory into userspace\n")); -+ ump_descriptor_mapping_free(session_data->cookies_map, map_id); -+ ump_dd_reference_release(mem); -+ _ump_osk_mem_mapregion_term(descriptor); -+ _mali_osk_free(descriptor); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ left -= size_to_map; -+ offset += size_to_map; -+ } ++/** ++ * Maximum frequency GPU will be clocked at. Given in kHz. ++ * This must be specified as there is no default value. ++ * ++ * Attached value: number in kHz ++ * Default value: NA ++ */ ++#define GPU_FREQ_KHZ_MAX (5000) ++/** ++ * Minimum frequency GPU will be clocked at. Given in kHz. ++ * This must be specified as there is no default value. ++ * ++ * Attached value: number in kHz ++ * Default value: NA ++ */ ++#define GPU_FREQ_KHZ_MIN (5000) + -+ /* Add to the ump_memory_allocation tracking list */ -+ _mali_osk_mutex_wait(session_data->lock); -+ _mali_osk_list_add(&descriptor->list, &session_data->list_head_session_memory_mappings_list); -+ _mali_osk_mutex_signal(session_data->lock); ++/** ++ * CPU_SPEED_FUNC - A pointer to a function that calculates the CPU clock ++ * ++ * CPU clock speed of the platform is in MHz - see kbase_cpu_clk_speed_func ++ * for the function prototype. ++ * ++ * Attached value: A kbase_cpu_clk_speed_func. ++ * Default Value: NA ++ */ ++#define CPU_SPEED_FUNC (NULL) + -+ args->mapping = descriptor->mapping; -+ args->cookie = descriptor->cookie; ++/** ++ * GPU_SPEED_FUNC - A pointer to a function that calculates the GPU clock ++ * ++ * GPU clock speed of the platform in MHz - see kbase_gpu_clk_speed_func ++ * for the function prototype. ++ * ++ * Attached value: A kbase_gpu_clk_speed_func. ++ * Default Value: NA ++ */ ++#define GPU_SPEED_FUNC (NULL) + -+ return _MALI_OSK_ERR_OK; -+} ++/** ++ * Power management configuration ++ * ++ * Attached value: pointer to @ref kbase_pm_callback_conf ++ * Default value: See @ref kbase_pm_callback_conf ++ */ ++#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) + -+void _ump_ukk_unmap_mem(_ump_uk_unmap_mem_s *args) -+{ -+ struct ump_session_data *session_data; -+ ump_memory_allocation *descriptor; -+ ump_dd_handle handle; ++/** ++ * Platform specific configuration functions ++ * ++ * Attached value: pointer to @ref kbase_platform_funcs_conf ++ * Default value: See @ref kbase_platform_funcs_conf ++ */ ++#define PLATFORM_FUNCS (NULL) + -+ session_data = (ump_session_data *)args->ctx; ++extern struct kbase_pm_callback_conf pm_callbacks; +diff --git a/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c +new file mode 100755 +index 000000000..aa4376afd +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c +@@ -0,0 +1,100 @@ ++/* ++ * ++ * (C) COPYRIGHT 2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ if (NULL == session_data) { -+ MSG_ERR(("Session data is NULL in _ump_ukk_map_mem()\n")); -+ return; -+ } + -+ if (0 != ump_descriptor_mapping_get(session_data->cookies_map, (int)args->cookie, (void **)&descriptor)) { -+ MSG_ERR(("_ump_ukk_map_mem: cookie 0x%X not found for this session\n", args->cookie)); -+ return; -+ } + -+ DEBUG_ASSERT_POINTER(descriptor); ++#include ++#include ++#include ++#include + -+ handle = descriptor->handle; -+ if (UMP_DD_HANDLE_INVALID == handle) { -+ DBG_MSG(1, ("WARNING: Trying to unmap unknown handle: UNKNOWN\n")); -+ return; -+ } ++static int pm_callback_power_on(struct kbase_device *kbdev) ++{ ++ int ret; + -+ /* Remove the ump_memory_allocation from the list of tracked mappings */ -+ _mali_osk_mutex_wait(session_data->lock); -+ _mali_osk_list_del(&descriptor->list); -+ _mali_osk_mutex_signal(session_data->lock); ++ dev_dbg(kbdev->dev, "pm_callback_power_on %p\n", ++ (void *)kbdev->dev->pm_domain); + -+ ump_descriptor_mapping_free(session_data->cookies_map, (int)args->cookie); ++ ret = pm_runtime_get_sync(kbdev->dev); + -+ ump_dd_reference_release(handle); ++ dev_dbg(kbdev->dev, "pm_runtime_get returned %d\n", ret); + -+ _ump_osk_mem_mapregion_term(descriptor); -+ _mali_osk_free(descriptor); ++ return 1; +} + -+u32 _ump_ukk_report_memory_usage(void) ++static void pm_callback_power_off(struct kbase_device *kbdev) +{ -+ if (device.backend->stat) -+ return device.backend->stat(device.backend); -+ else -+ return 0; ++ dev_dbg(kbdev->dev, "pm_callback_power_off\n"); ++ ++ pm_runtime_put_autosuspend(kbdev->dev); +} -diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h -new file mode 100755 -index 000000000000..aa65f1cb6c88 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h -@@ -0,0 +1,125 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ + -+#ifndef __UMP_KERNEL_COMMON_H__ -+#define __UMP_KERNEL_COMMON_H__ ++int kbase_device_runtime_init(struct kbase_device *kbdev) ++{ ++ dev_dbg(kbdev->dev, "kbase_device_runtime_init\n"); ++ pm_runtime_enable(kbdev->dev); + -+#include "ump_kernel_types.h" -+#include "ump_kernel_interface.h" -+#include "ump_kernel_descriptor_mapping.h" -+#include "ump_kernel_random_mapping.h" -+#include "ump_kernel_memory_backend.h" ++ return 0; ++} + ++void kbase_device_runtime_disable(struct kbase_device *kbdev) ++{ ++ dev_dbg(kbdev->dev, "kbase_device_runtime_disable\n"); ++ pm_runtime_disable(kbdev->dev); ++} + -+#ifdef DEBUG -+extern int ump_debug_level; -+#define UMP_DEBUG_PRINT(args) _mali_osk_dbgmsg args -+#define UMP_DEBUG_CODE(args) args -+#define DBG_MSG(level,args) do { /* args should be in brackets */ \ -+ ((level) <= ump_debug_level)?\ -+ UMP_DEBUG_PRINT(("UMP<" #level ">: ")), \ -+ UMP_DEBUG_PRINT(args):0; \ -+ } while (0) ++static int pm_callback_runtime_on(struct kbase_device *kbdev) ++{ ++ dev_dbg(kbdev->dev, "pm_callback_runtime_on\n"); + -+#define DBG_MSG_IF(level,condition,args) /* args should be in brackets */ \ -+ if((condition)&&((level) <= ump_debug_level)) {\ -+ UMP_DEBUG_PRINT(("UMP<" #level ">: ")); \ -+ UMP_DEBUG_PRINT(args); \ -+ } ++ return 0; ++} + -+#define DBG_MSG_ELSE(level,args) /* args should be in brackets */ \ -+ else if((level) <= ump_debug_level) { \ -+ UMP_DEBUG_PRINT(("UMP<" #level ">: ")); \ -+ UMP_DEBUG_PRINT(args); \ -+ } ++static void pm_callback_runtime_off(struct kbase_device *kbdev) ++{ ++ dev_dbg(kbdev->dev, "pm_callback_runtime_off\n"); ++} + -+#define DEBUG_ASSERT_POINTER(pointer) do {if( (pointer)== NULL) MSG_ERR(("NULL pointer " #pointer)); } while(0) -+#define DEBUG_ASSERT(condition) do {if(!(condition)) MSG_ERR(("ASSERT failed: " #condition)); } while(0) -+#else /* DEBUG */ -+#define UMP_DEBUG_PRINT(args) do {} while(0) -+#define UMP_DEBUG_CODE(args) -+#define DBG_MSG(level,args) do {} while(0) -+#define DBG_MSG_IF(level,condition,args) do {} while(0) -+#define DBG_MSG_ELSE(level,args) do {} while(0) -+#define DEBUG_ASSERT(condition) do {} while(0) -+#define DEBUG_ASSERT_POINTER(pointer) do {} while(0) -+#endif /* DEBUG */ ++static void pm_callback_resume(struct kbase_device *kbdev) ++{ ++ int ret = pm_callback_runtime_on(kbdev); + -+#define MSG_ERR(args) do{ /* args should be in brackets */ \ -+ _mali_osk_dbgmsg("UMP: ERR: %s\n" ,__FILE__); \ -+ _mali_osk_dbgmsg( " %s()%4d\n", __FUNCTION__, __LINE__) ; \ -+ _mali_osk_dbgmsg args ; \ -+ _mali_osk_dbgmsg("\n"); \ -+ } while(0) ++ WARN_ON(ret); ++} + -+#define MSG(args) do{ /* args should be in brackets */ \ -+ _mali_osk_dbgmsg("UMP: "); \ -+ _mali_osk_dbgmsg args; \ -+ } while (0) ++static void pm_callback_suspend(struct kbase_device *kbdev) ++{ ++ pm_callback_runtime_off(kbdev); ++} + ++struct kbase_pm_callback_conf pm_callbacks = { ++ .power_on_callback = pm_callback_power_on, ++ .power_off_callback = pm_callback_power_off, ++ .power_suspend_callback = pm_callback_suspend, ++ .power_resume_callback = pm_callback_resume, ++#ifdef KBASE_PM_RUNTIME ++ .power_runtime_init_callback = kbase_device_runtime_init, ++ .power_runtime_term_callback = kbase_device_runtime_disable, ++ .power_runtime_on_callback = pm_callback_runtime_on, ++ .power_runtime_off_callback = pm_callback_runtime_off, ++#else /* KBASE_PM_RUNTIME */ ++ .power_runtime_init_callback = NULL, ++ .power_runtime_term_callback = NULL, ++ .power_runtime_on_callback = NULL, ++ .power_runtime_off_callback = NULL, ++#endif /* KBASE_PM_RUNTIME */ ++}; + + +diff --git a/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h +new file mode 100755 +index 000000000..c11085af5 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h +@@ -0,0 +1,28 @@ +/* -+ * This struct is used to store per session data. -+ * A session is created when someone open() the device, and -+ * closed when someone close() it or the user space application terminates. ++ * ++ * (C) COPYRIGHT 2010-2013 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ -+typedef struct ump_session_data { -+ _mali_osk_list_t list_head_session_memory_list; /**< List of ump allocations made by the process (elements are ump_session_memory_list_element) */ -+ _mali_osk_list_t list_head_session_memory_mappings_list; /**< List of ump_memory_allocations mapped in */ -+ int api_version; -+ _mali_osk_mutex_t *lock; -+ ump_descriptor_mapping *cookies_map; /**< Secure mapping of cookies from _ump_ukk_map_mem() */ -+ int cache_operations_ongoing; -+ int has_pending_level1_cache_flush; -+} ump_session_data; + ++#include + + -+/* -+ * This struct is used to track the UMP memory references a session has. -+ * We need to track this in order to be able to clean up after user space processes -+ * which don't do it themself (e.g. due to a crash or premature termination). ++/** ++ * @brief Entry point to transfer control to a platform for early initialization ++ * ++ * This function is called early on in the initialization during execution of ++ * @ref kbase_driver_init. ++ * ++ * @return Zero to indicate success non-zero for failure. + */ -+typedef struct ump_session_memory_list_element { -+ struct ump_dd_mem *mem; -+ _mali_osk_list_t list; -+} ump_session_memory_list_element; -+ -+ -+ ++int kbase_platform_early_init(void); ++int kbase_platform_rk_init_opp_table(struct kbase_device *kbdev); +diff --git a/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h +new file mode 100755 +index 000000000..01f9dfce9 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h +@@ -0,0 +1,38 @@ +/* -+ * Device specific data, created when device driver is loaded, and then kept as the global variable device. ++ * ++ * (C) COPYRIGHT 2010-2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ -+typedef struct ump_dev { -+ ump_random_mapping *secure_id_map; -+ ump_memory_backend *backend; -+} ump_dev; + + + -+extern int ump_debug_level; -+extern struct ump_dev device; ++#ifdef CONFIG_MALI_PLATFORM_FAKE + -+_mali_osk_errcode_t ump_kernel_constructor(void); -+void ump_kernel_destructor(void); -+int ump_map_errcode(_mali_osk_errcode_t err); ++/** ++ * kbase_platform_fake_register - Entry point for fake platform registration ++ * ++ * This function is called early on in the initialization during execution of ++ * kbase_driver_init. ++ * ++ * Return: 0 to indicate success, non-zero for failure. ++ */ ++int kbase_platform_fake_register(void); + +/** -+ * variables from user space cannot be dereferenced from kernel space; tagging them -+ * with __user allows the GCC compiler to generate a warning. Other compilers may -+ * not support this so we define it here as an empty macro if the compiler doesn't -+ * define it. ++ * kbase_platform_fake_unregister - Entry point for fake platform unregistration ++ * ++ * This function is called in the termination during execution of ++ * kbase_driver_exit. + */ -+#ifndef __user -+#define __user -+#endif ++void kbase_platform_fake_unregister(void); + -+#endif /* __UMP_KERNEL_COMMON_H__ */ -diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c ++#endif /* CONFIG_MALI_PLATFORM_FAKE */ +diff --git a/drivers/gpu/arm/midgard/platform/rk/Kbuild b/drivers/gpu/arm/midgard/platform/rk/Kbuild new file mode 100755 -index 000000000000..e4642f0394c2 +index 000000000..db993487e --- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c -@@ -0,0 +1,155 @@ -+/* -+ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++++ b/drivers/gpu/arm/midgard/platform/rk/Kbuild +@@ -0,0 +1,17 @@ ++# ++# (C) COPYRIGHT 2012-2013 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# ++ ++midgard_kbase-y += \ ++ $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_rk.o ++ +diff --git a/drivers/gpu/arm/midgard/platform/rk/custom_log.h b/drivers/gpu/arm/midgard/platform/rk/custom_log.h +new file mode 100755 +index 000000000..fe5e12241 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/rk/custom_log.h +@@ -0,0 +1,209 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ---------------------------------------------------------------------------- ++ * File: custom_log.h ++ * ++ * Desc: ChenZhen å好的 log 输出的定制实现. ++ * ++ * -------------------------------------------------------------------- ++ * < 习语 å’Œ 缩略语 > : ++ * ++ * -------------------------------------------------------------------- ++ * Usage: ++ * ++ * Note: ++ * ++ * Author: ChenZhen ++ * ++ * ---------------------------------------------------------------------------- ++ * Version: ++ * v1.0 ++ * ---------------------------------------------------------------------------- ++ * Log: ++ ----Fri Nov 19 15:20:28 2010 v1.0 ++ * ++ * ---------------------------------------------------------------------------- + */ + -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "mali_osk_bitops.h" -+#include "ump_kernel_common.h" -+#include "ump_kernel_descriptor_mapping.h" ++#ifndef __CUSTOM_LOG_H__ ++#define __CUSTOM_LOG_H__ + -+#define MALI_PAD_INT(x) (((x) + (BITS_PER_LONG - 1)) & ~(BITS_PER_LONG - 1)) ++#ifdef __cplusplus ++extern "C" { ++#endif + -+/** -+ * Allocate a descriptor table capable of holding 'count' mappings -+ * @param count Number of mappings in the table -+ * @return Pointer to a new table, NULL on error ++/* ----------------------------------------------------------------------------- ++ * Include Files ++ * ----------------------------------------------------------------------------- + */ -+static ump_descriptor_table *descriptor_table_alloc(int count); ++#include ++#include + -+/** -+ * Free a descriptor table -+ * @param table The table to free ++/* ----------------------------------------------------------------------------- ++ * Macros Definition ++ * ----------------------------------------------------------------------------- + */ -+static void descriptor_table_free(ump_descriptor_table *table); + -+ump_descriptor_mapping *ump_descriptor_mapping_create(int init_entries, int max_entries) -+{ -+ ump_descriptor_mapping *map = _mali_osk_calloc(1, sizeof(ump_descriptor_mapping)); ++/** 若下列 macro 有被定义, æ‰ ä½¿èƒ½ log 输出. */ ++/* #define ENABLE_DEBUG_LOG */ + -+ init_entries = MALI_PAD_INT(init_entries); -+ max_entries = MALI_PAD_INT(max_entries); ++/*----------------------------------------------------------------------------*/ + -+ if (NULL != map) { -+ map->table = descriptor_table_alloc(init_entries); -+ if (NULL != map->table) { -+ map->lock = _mali_osk_mutex_rw_init(_MALI_OSK_LOCKFLAG_UNORDERED, 0); -+ if (NULL != map->lock) { -+ _mali_osk_set_nonatomic_bit(0, map->table->usage); /* reserve bit 0 to prevent NULL/zero logic to kick in */ -+ map->max_nr_mappings_allowed = max_entries; -+ map->current_nr_mappings = init_entries; -+ return map; -+ } -+ descriptor_table_free(map->table); -+ } -+ _mali_osk_free(map); -+ } -+ return NULL; -+} ++#ifdef ENABLE_VERBOSE_LOG ++/** Verbose log. */ ++#define V(fmt, args...) \ ++ pr_debug("V : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ ++ "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) ++#else ++#define V(...) ((void)0) ++#endif + -+void ump_descriptor_mapping_destroy(ump_descriptor_mapping *map) -+{ -+ descriptor_table_free(map->table); -+ _mali_osk_mutex_rw_term(map->lock); -+ _mali_osk_free(map); -+} ++#ifdef ENABLE_DEBUG_LOG ++/** Debug log. */ ++#define D(fmt, args...) \ ++ pr_info("D : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ ++ "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) ++#else ++#define D(...) ((void)0) ++#endif + -+int ump_descriptor_mapping_allocate_mapping(ump_descriptor_mapping *map, void *target) -+{ -+ int descriptor = -1;/*-EFAULT;*/ -+ _mali_osk_mutex_rw_wait(map->lock, _MALI_OSK_LOCKMODE_RW); -+ descriptor = _mali_osk_find_first_zero_bit(map->table->usage, map->current_nr_mappings); -+ if (descriptor == map->current_nr_mappings) { -+ int nr_mappings_new; -+ /* no free descriptor, try to expand the table */ -+ ump_descriptor_table *new_table; -+ ump_descriptor_table *old_table = map->table; -+ nr_mappings_new = map->current_nr_mappings * 2; ++#define I(fmt, args...) \ ++ pr_info("I : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ ++ "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) + -+ if (map->current_nr_mappings >= map->max_nr_mappings_allowed) { -+ descriptor = -1; -+ goto unlock_and_exit; -+ } ++#define W(fmt, args...) \ ++ pr_warn("W : [File] : %s; [Line] : %d; [Func] : %s(); " \ ++ fmt "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) + -+ new_table = descriptor_table_alloc(nr_mappings_new); -+ if (NULL == new_table) { -+ descriptor = -1; -+ goto unlock_and_exit; -+ } ++#define E(fmt, args...) \ ++ pr_err("E : [File] : %s; [Line] : %d; [Func] : %s(); " fmt \ ++ "\n", \ ++ __FILE__, \ ++ __LINE__, \ ++ __func__, \ ++ ## args) + -+ _mali_osk_memcpy(new_table->usage, old_table->usage, (sizeof(unsigned long)*map->current_nr_mappings) / BITS_PER_LONG); -+ _mali_osk_memcpy(new_table->mappings, old_table->mappings, map->current_nr_mappings * sizeof(void *)); -+ map->table = new_table; -+ map->current_nr_mappings = nr_mappings_new; -+ descriptor_table_free(old_table); -+ } ++/*-------------------------------------------------------*/ + -+ /* we have found a valid descriptor, set the value and usage bit */ -+ _mali_osk_set_nonatomic_bit(descriptor, map->table->usage); -+ map->table->mappings[descriptor] = target; ++/** 使用 D(), 以å进制的形å¼æ‰“å°å˜é‡ 'var' çš„ value. */ ++#define D_DEC(var) D(#var " = %d.", var) + -+unlock_and_exit: -+ _mali_osk_mutex_rw_signal(map->lock, _MALI_OSK_LOCKMODE_RW); -+ return descriptor; -+} ++#define E_DEC(var) E(#var " = %d.", var) + -+int ump_descriptor_mapping_get(ump_descriptor_mapping *map, int descriptor, void **target) -+{ -+ int result = -1;/*-EFAULT;*/ -+ DEBUG_ASSERT(map); -+ _mali_osk_mutex_rw_wait(map->lock, _MALI_OSK_LOCKMODE_RO); -+ if ((descriptor > 0) && (descriptor < map->current_nr_mappings) && _mali_osk_test_bit(descriptor, map->table->usage)) { -+ *target = map->table->mappings[descriptor]; -+ result = 0; -+ } else *target = NULL; -+ _mali_osk_mutex_rw_signal(map->lock, _MALI_OSK_LOCKMODE_RO); -+ return result; -+} ++/** 使用 D(), 以å六进制的形å¼æ‰“å°å˜é‡ 'var' çš„ value. */ ++#define D_HEX(var) D(#var " = 0x%x.", var) + -+int ump_descriptor_mapping_set(ump_descriptor_mapping *map, int descriptor, void *target) -+{ -+ int result = -1;/*-EFAULT;*/ -+ _mali_osk_mutex_rw_wait(map->lock, _MALI_OSK_LOCKMODE_RO); -+ if ((descriptor > 0) && (descriptor < map->current_nr_mappings) && _mali_osk_test_bit(descriptor, map->table->usage)) { -+ map->table->mappings[descriptor] = target; -+ result = 0; -+ } -+ _mali_osk_mutex_rw_signal(map->lock, _MALI_OSK_LOCKMODE_RO); -+ return result; -+} ++#define E_HEX(var) E(#var " = 0x%x.", var) + -+void ump_descriptor_mapping_free(ump_descriptor_mapping *map, int descriptor) -+{ -+ _mali_osk_mutex_rw_wait(map->lock, _MALI_OSK_LOCKMODE_RW); -+ if ((descriptor > 0) && (descriptor < map->current_nr_mappings) && _mali_osk_test_bit(descriptor, map->table->usage)) { -+ map->table->mappings[descriptor] = NULL; -+ _mali_osk_clear_nonatomic_bit(descriptor, map->table->usage); -+ } -+ _mali_osk_mutex_rw_signal(map->lock, _MALI_OSK_LOCKMODE_RW); -+} ++/** ++ * 使用 D(), 以å六进制的形å¼, ++ * 打å°æŒ‡é’ˆç±»åž‹å˜é‡ 'ptr' çš„ value. ++ */ ++#define D_PTR(ptr) D(#ptr " = %p.", ptr) + -+static ump_descriptor_table *descriptor_table_alloc(int count) -+{ -+ ump_descriptor_table *table; ++#define E_PTR(ptr) E(#ptr " = %p.", ptr) + -+ table = _mali_osk_calloc(1, sizeof(ump_descriptor_table) + ((sizeof(unsigned long) * count) / BITS_PER_LONG) + (sizeof(void *) * count)); ++/** 使用 D(), æ‰“å° char 字串. */ ++#define D_STR(p_str) \ ++do { \ ++ if (!p_str) { \ ++ D(#p_str " = NULL."); \ ++ else \ ++ D(#p_str " = '%s'.", p_str); \ ++} while (0) + -+ if (NULL != table) { -+ table->usage = (u32 *)((u8 *)table + sizeof(ump_descriptor_table)); -+ table->mappings = (void **)((u8 *)table + sizeof(ump_descriptor_table) + ((sizeof(unsigned long) * count) / BITS_PER_LONG)); -+ } ++#define E_STR(p_str) \ ++do { \ ++ if (!p_str) \ ++ E(#p_str " = NULL."); \ ++ else \ ++ E(#p_str " = '%s'.", p_str); \ ++} while (0) + -+ return table; -+} ++#ifdef ENABLE_DEBUG_LOG ++/** ++ * log 从 'p_start' 地å€å¼€å§‹çš„ 'len' 个字节的数æ®. ++ */ ++#define D_MEM(p_start, len) \ ++do { \ ++ int i = 0; \ ++ char *p = (char *)(p_start); \ ++ D("dump memory from addr of '" #p_start "', from %p, length %d' : ", \ ++ (p_start), \ ++ (len)); \ ++ pr_debug("\t\t"); \ ++ for (i = 0; i < (len); i++) \ ++ pr_debug("0x%02x, ", p[i]); \ ++ pr_debug("\n"); \ ++} while (0) ++#else ++#define D_MEM(...) ((void)0) ++#endif + -+static void descriptor_table_free(ump_descriptor_table *table) -+{ -+ _mali_osk_free(table); -+} ++/*-------------------------------------------------------*/ + -diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h -new file mode 100755 -index 000000000000..a888ba833fbb ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h -@@ -0,0 +1,89 @@ -+/* -+ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * 在特定æ¡ä»¶ä¸‹, 判定 error å‘生, ++ * å°†å˜é‡ 'ret_var' 设置 'err_code', ++ * log 输出对应的 Error Caution, ++ * 然åŽè·³è½¬ 'label' 指定的代ç å¤„执行. ++ * @param msg ++ * 纯字串形å¼çš„æ示信æ¯. ++ * @param ret_var ++ * 标识函数执行状æ€æˆ–者结果的å˜é‡, ++ * 将被设置具体的 Error Code. ++ * 通常是 'ret' or 'result'. ++ * @param err_code ++ * 表å¾ç‰¹å®š error 的常数标识, ++ * 通常是 å®çš„å½¢æ€. ++ * @param label ++ * 程åºå°†è¦è·³è½¬åˆ°çš„错误处ç†ä»£ç çš„æ ‡å·, ++ * 通常就是 'EXIT'. ++ * @param args... ++ * 对应 'msg_fmt' 实å‚中, ++ * '%s', '%d', ... 等转æ¢è¯´æ˜Žç¬¦çš„具体å¯å˜é•¿å®žå‚. + */ ++#define SET_ERROR_AND_JUMP(msg_fmt, ret_var, err_code, label, args...) \ ++do { \ ++ E("To set '" #ret_var "' to %d('" #err_code "'), because : " msg_fmt, \ ++ (err_code), \ ++ ## args); \ ++ (ret_var) = (err_code); \ ++ goto label; \ ++} while (0) + -+/** -+ * @file ump_kernel_descriptor_mapping.h ++/* ----------------------------------------------------------------------------- ++ * Types and Structures Definition ++ * ----------------------------------------------------------------------------- + */ + -+#ifndef __UMP_KERNEL_DESCRIPTOR_MAPPING_H__ -+#define __UMP_KERNEL_DESCRIPTOR_MAPPING_H__ ++/* ----------------------------------------------------------------------------- ++ * Global Functions' Prototype ++ * ----------------------------------------------------------------------------- ++ */ + -+#include "mali_osk.h" ++/* ----------------------------------------------------------------------------- ++ * Inline Functions Implementation ++ * ----------------------------------------------------------------------------- ++ */ ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* __CUSTOM_LOG_H__ */ +diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h +new file mode 100755 +index 000000000..07c5b6f8a +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h +@@ -0,0 +1,88 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ */ + +/** -+ * The actual descriptor mapping table, never directly accessed by clients ++ * @file mali_kbase_config_platform.h ++ * 声明 platform_config_of_rk (platform_rk çš„ platform_config). + */ -+typedef struct ump_descriptor_table { -+ u32 *usage; /**< Pointer to bitpattern indicating if a descriptor is valid/used or not */ -+ void **mappings; /**< Array of the pointers the descriptors map to */ -+} ump_descriptor_table; + +/** -+ * The descriptor mapping object -+ * Provides a separate namespace where we can map an integer to a pointer ++ * Maximum frequency GPU will be clocked at. ++ * Given in kHz. ++ * This must be specified as there is no default value. ++ * ++ * Attached value: number in kHz ++ * Default value: NA + */ -+typedef struct ump_descriptor_mapping { -+ _mali_osk_mutex_rw_t *lock; /**< Lock protecting access to the mapping object */ -+ int max_nr_mappings_allowed; /**< Max number of mappings to support in this namespace */ -+ int current_nr_mappings; /**< Current number of possible mappings */ -+ ump_descriptor_table *table; /**< Pointer to the current mapping table */ -+} ump_descriptor_mapping; ++#define GPU_FREQ_KHZ_MAX (5000) + +/** -+ * Create a descriptor mapping object -+ * Create a descriptor mapping capable of holding init_entries growable to max_entries -+ * @param init_entries Number of entries to preallocate memory for -+ * @param max_entries Number of entries to max support -+ * @return Pointer to a descriptor mapping object, NULL on failure ++ * Minimum frequency GPU will be clocked at. ++ * Given in kHz. ++ * This must be specified as there is no default value. ++ * ++ * Attached value: number in kHz ++ * Default value: NA + */ -+ump_descriptor_mapping *ump_descriptor_mapping_create(int init_entries, int max_entries); ++#define GPU_FREQ_KHZ_MIN (5000) + +/** -+ * Destroy a descriptor mapping object -+ * @param map The map to free ++ * CPU_SPEED_FUNC ++ * - A pointer to a function that calculates the CPU clock ++ * ++ * CPU clock speed of the platform is in MHz ++ * - see kbase_cpu_clk_speed_func for the function prototype. ++ * ++ * Attached value: A kbase_cpu_clk_speed_func. ++ * Default Value: NA + */ -+void ump_descriptor_mapping_destroy(ump_descriptor_mapping *map); ++#define CPU_SPEED_FUNC (NULL) + +/** -+ * Allocate a new mapping entry (descriptor ID) -+ * Allocates a new entry in the map. -+ * @param map The map to allocate a new entry in -+ * @param target The value to map to -+ * @return The descriptor allocated, a negative value on error ++ * GPU_SPEED_FUNC ++ * - A pointer to a function that calculates the GPU clock ++ * ++ * GPU clock speed of the platform in MHz ++ * - see kbase_gpu_clk_speed_func for the function prototype. ++ * ++ * Attached value: A kbase_gpu_clk_speed_func. ++ * Default Value: NA + */ -+int ump_descriptor_mapping_allocate_mapping(ump_descriptor_mapping *map, void *target); ++#define GPU_SPEED_FUNC (NULL) + +/** -+ * Get the value mapped to by a descriptor ID -+ * @param map The map to lookup the descriptor id in -+ * @param descriptor The descriptor ID to lookup -+ * @param target Pointer to a pointer which will receive the stored value -+ * @return 0 on successful lookup, negative on error ++ * Power management configuration ++ * ++ * Attached value: ++ * pointer to @ref kbase_pm_callback_conf ++ * Default value: ++ * See @ref kbase_pm_callback_conf + */ -+int ump_descriptor_mapping_get(ump_descriptor_mapping *map, int descriptor, void **target); ++#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) ++extern struct kbase_pm_callback_conf pm_callbacks; + +/** -+ * Set the value mapped to by a descriptor ID -+ * @param map The map to lookup the descriptor id in -+ * @param descriptor The descriptor ID to lookup -+ * @param target Pointer to replace the current value with -+ * @return 0 on successful lookup, negative on error ++ * Platform specific configuration functions ++ * ++ * Attached value: ++ * pointer to @ref kbase_platform_funcs_conf ++ * Default value: ++ * See @ref kbase_platform_funcs_conf + */ -+int ump_descriptor_mapping_set(ump_descriptor_mapping *map, int descriptor, void *target); ++#define PLATFORM_FUNCS (&platform_funcs) ++extern struct kbase_platform_funcs_conf platform_funcs; + +/** -+ * Free the descriptor ID -+ * For the descriptor to be reused it has to be freed -+ * @param map The map to free the descriptor from -+ * @param descriptor The descriptor ID to free ++ * Secure mode switch ++ * ++ * Attached value: pointer to @ref kbase_secure_ops + */ -+void ump_descriptor_mapping_free(ump_descriptor_mapping *map, int descriptor); ++#define SECURE_CALLBACKS (NULL) + -+#endif /* __UMP_KERNEL_DESCRIPTOR_MAPPING_H__ */ -diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h +diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c new file mode 100755 -index 000000000000..2b69f68e87ac +index 000000000..8ad910c12 --- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h -@@ -0,0 +1,48 @@ ++++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c +@@ -0,0 +1,492 @@ +/* -+ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. + */ + ++/* #define ENABLE_DEBUG_LOG */ ++#include "custom_log.h" ++ ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "mali_kbase_rk.h" ++ +/** -+ * @file ump_kernel_memory_mapping.h ++ * @file mali_kbase_config_rk.c ++ * 对 platform_config_of_rk 的具体实现. ++ * ++ * mali_device_driver 包å«ä¸¤éƒ¨åˆ† : ++ * .DP : platform_dependent_part_in_mdd : ++ * ä¾èµ– platform 部分, ++ * æºç åœ¨ /platform// ++ * 在 mali_device_driver 内部, ++ * 记为 platform_dependent_part, ++ * 也被记为 platform_specific_code. ++ * .DP : common_parts_in_mdd : ++ * arm 实现的通用的部分, ++ * æºç åœ¨ / 下. ++ * 在 mali_device_driver 内部, 记为 common_parts. + */ + -+#ifndef __UMP_KERNEL_MEMORY_BACKEND_H__ -+#define __UMP_KERNEL_MEMORY_BACKEND_H__ ++/*---------------------------------------------------------------------------*/ + -+#include "ump_kernel_interface.h" -+#include "ump_kernel_types.h" ++#ifdef CONFIG_REGULATOR ++static int rk_pm_enable_regulator(struct kbase_device *kbdev); ++static void rk_pm_disable_regulator(struct kbase_device *kbdev); ++#else ++static inline int rk_pm_enable_regulator(struct kbase_device *kbdev) ++{ ++ return 0; ++} + ++static inline void rk_pm_disable_regulator(struct kbase_device *kbdev) ++{ ++} ++#endif + -+typedef struct ump_memory_allocation { -+ void *phys_addr; -+ void *mapping; -+ unsigned long size; -+ ump_dd_handle handle; -+ void *process_mapping_info; -+ u32 cookie; /**< necessary on some U/K interface implementations */ -+ struct ump_session_data *ump_session; /**< Session that this allocation belongs to */ -+ _mali_osk_list_t list; /**< List for linking together memory allocations into the session's memory head */ -+ u32 is_cached; -+} ump_memory_allocation; ++static int rk_pm_enable_clk(struct kbase_device *kbdev); + -+typedef struct ump_memory_backend { -+ int (*allocate)(void *ctx, ump_dd_mem *descriptor); -+ void (*release)(void *ctx, ump_dd_mem *descriptor); -+ void (*shutdown)(struct ump_memory_backend *backend); -+ u32(*stat)(struct ump_memory_backend *backend); -+ int (*pre_allocate_physical_check)(void *ctx, u32 size); -+ u32(*adjust_to_mali_phys)(void *ctx, u32 cpu_phys); -+ void *ctx; -+} ump_memory_backend; ++static void rk_pm_disable_clk(struct kbase_device *kbdev); + -+ump_memory_backend *ump_memory_backend_create(void); -+void ump_memory_backend_destroy(void); ++static int kbase_platform_rk_create_sysfs_files(struct device *dev); + -+#endif /*__UMP_KERNEL_MEMORY_BACKEND_H__ */ ++static void kbase_platform_rk_remove_sysfs_files(struct device *dev); + -diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c -new file mode 100755 -index 000000000000..0b6434bee00f ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c -@@ -0,0 +1,181 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++/*---------------------------------------------------------------------------*/ + -+#include "mali_osk.h" -+#include "mali_osk_list.h" -+#include "ump_osk.h" -+#include "ump_uk_types.h" ++static void rk_pm_power_off_delay_work(struct work_struct *work) ++{ ++ struct rk_context *platform = ++ container_of(to_delayed_work(work), struct rk_context, work); ++ struct kbase_device *kbdev = platform->kbdev; + -+#include "ump_kernel_interface_ref_drv.h" -+#include "ump_kernel_common.h" -+#include "ump_kernel_descriptor_mapping.h" ++ if (!platform->is_powered) { ++ D("mali_dev is already powered off."); ++ return; ++ } + -+#define UMP_MINIMUM_SIZE 4096 -+#define UMP_MINIMUM_SIZE_MASK (~(UMP_MINIMUM_SIZE-1)) -+#define UMP_SIZE_ALIGN(x) (((x)+UMP_MINIMUM_SIZE-1)&UMP_MINIMUM_SIZE_MASK) -+#define UMP_ADDR_ALIGN_OFFSET(x) ((x)&(UMP_MINIMUM_SIZE-1)) -+static void phys_blocks_release(void *ctx, struct ump_dd_mem *descriptor); ++ if (pm_runtime_enabled(kbdev->dev)) { ++ D("to put_sync_suspend mali_dev."); ++ pm_runtime_put_sync_suspend(kbdev->dev); ++ } + -+UMP_KERNEL_API_EXPORT ump_dd_handle ump_dd_handle_create_from_phys_blocks(ump_dd_physical_block *blocks, unsigned long num_blocks) ++ rk_pm_disable_regulator(kbdev); ++ ++ platform->is_powered = false; ++ KBASE_TIMELINE_GPU_POWER(kbdev, 0); ++ wake_unlock(&platform->wake_lock); ++} ++ ++static int kbase_platform_rk_init(struct kbase_device *kbdev) +{ -+ ump_dd_mem *mem; -+ unsigned long size_total = 0; -+ int ret; -+ u32 i; ++ int ret = 0; ++ struct rk_context *platform; + -+ /* Go through the input blocks and verify that they are sane */ -+ for (i = 0; i < num_blocks; i++) { -+ unsigned long addr = blocks[i].addr; -+ unsigned long size = blocks[i].size; ++ platform = kzalloc(sizeof(*platform), GFP_KERNEL); ++ if (!platform) { ++ E("err."); ++ return -ENOMEM; ++ } + -+ DBG_MSG(5, ("Adding physical memory to new handle. Address: 0x%08lx, size: %lu\n", addr, size)); -+ size_total += blocks[i].size; ++ platform->is_powered = false; ++ platform->kbdev = kbdev; + -+ if (0 != UMP_ADDR_ALIGN_OFFSET(addr)) { -+ MSG_ERR(("Trying to create UMP memory from unaligned physical address. Address: 0x%08lx\n", addr)); -+ return UMP_DD_HANDLE_INVALID; -+ } ++ platform->delay_ms = 200; ++ if (of_property_read_u32(kbdev->dev->of_node, "power-off-delay-ms", ++ &platform->delay_ms)) ++ W("power-off-delay-ms not available."); + -+ if (0 != UMP_ADDR_ALIGN_OFFSET(size)) { -+ MSG_ERR(("Trying to create UMP memory with unaligned size. Size: %lu\n", size)); -+ return UMP_DD_HANDLE_INVALID; -+ } ++ platform->power_off_wq = create_freezable_workqueue("gpu_power_off_wq"); ++ if (!platform->power_off_wq) { ++ E("couldn't create workqueue"); ++ ret = -ENOMEM; ++ goto err_wq; + } ++ INIT_DEFERRABLE_WORK(&platform->work, rk_pm_power_off_delay_work); + -+ /* Allocate the ump_dd_mem struct for this allocation */ -+ mem = _mali_osk_malloc(sizeof(*mem)); -+ if (NULL == mem) { -+ DBG_MSG(1, ("Could not allocate ump_dd_mem in ump_dd_handle_create_from_phys_blocks()\n")); -+ return UMP_DD_HANDLE_INVALID; -+ } ++ wake_lock_init(&platform->wake_lock, WAKE_LOCK_SUSPEND, "gpu"); + -+ /* Now, make a copy of the block information supplied by the user */ -+ mem->block_array = _mali_osk_malloc(sizeof(ump_dd_physical_block) * num_blocks); -+ if (NULL == mem->block_array) { -+ _mali_osk_free(mem); -+ DBG_MSG(1, ("Could not allocate a mem handle for function ump_dd_handle_create_from_phys_blocks().\n")); -+ return UMP_DD_HANDLE_INVALID; ++ platform->utilisation_period = DEFAULT_UTILISATION_PERIOD_IN_MS; ++ ++ ret = kbase_platform_rk_create_sysfs_files(kbdev->dev); ++ if (ret) { ++ E("fail to create sysfs_files. ret = %d.", ret); ++ goto err_sysfs_files; + } + -+ _mali_osk_memcpy(mem->block_array, blocks, sizeof(ump_dd_physical_block) * num_blocks); ++ kbdev->platform_context = (void *)platform; ++ pm_runtime_enable(kbdev->dev); + -+ /* And setup the rest of the ump_dd_mem struct */ -+ _mali_osk_atomic_init(&mem->ref_count, 1); -+ mem->size_bytes = size_total; -+ mem->nr_blocks = num_blocks; -+ mem->backend_info = NULL; -+ mem->ctx = NULL; -+ mem->release_func = phys_blocks_release; -+ /* For now UMP handles created by ump_dd_handle_create_from_phys_blocks() is forced to be Uncached */ -+ mem->is_cached = 0; -+ mem->hw_device = _UMP_UK_USED_BY_CPU; -+ mem->lock_usage = UMP_NOT_LOCKED; ++ return 0; + -+ /* Find a secure ID for this allocation */ -+ ret = ump_random_mapping_insert(device.secure_id_map, mem); -+ if (unlikely(ret)) { -+ _mali_osk_free(mem->block_array); -+ _mali_osk_free(mem); -+ DBG_MSG(1, ("Failed to allocate secure ID in ump_dd_handle_create_from_phys_blocks()\n")); -+ return UMP_DD_HANDLE_INVALID; -+ } ++err_sysfs_files: ++ wake_lock_destroy(&platform->wake_lock); ++ destroy_workqueue(platform->power_off_wq); ++err_wq: ++ return ret; ++} + -+ DBG_MSG(3, ("UMP memory created. ID: %u, size: %lu\n", mem->secure_id, mem->size_bytes)); ++static void kbase_platform_rk_term(struct kbase_device *kbdev) ++{ ++ struct rk_context *platform = ++ (struct rk_context *)kbdev->platform_context; + -+ return (ump_dd_handle)mem; ++ pm_runtime_disable(kbdev->dev); ++ kbdev->platform_context = NULL; ++ ++ if (platform) { ++ cancel_delayed_work_sync(&platform->work); ++ wake_lock_destroy(&platform->wake_lock); ++ destroy_workqueue(platform->power_off_wq); ++ platform->is_powered = false; ++ platform->kbdev = NULL; ++ kfree(platform); ++ } ++ kbase_platform_rk_remove_sysfs_files(kbdev->dev); +} + -+static void phys_blocks_release(void *ctx, struct ump_dd_mem *descriptor) ++struct kbase_platform_funcs_conf platform_funcs = { ++ .platform_init_func = &kbase_platform_rk_init, ++ .platform_term_func = &kbase_platform_rk_term, ++}; ++ ++/*---------------------------------------------------------------------------*/ ++ ++static int rk_pm_callback_runtime_on(struct kbase_device *kbdev) +{ -+ _mali_osk_free(descriptor->block_array); -+ descriptor->block_array = NULL; ++ return 0; +} + -+_mali_osk_errcode_t _ump_ukk_allocate(_ump_uk_allocate_s *user_interaction) ++static void rk_pm_callback_runtime_off(struct kbase_device *kbdev) +{ -+ ump_session_data *session_data = NULL; -+ ump_dd_mem *new_allocation = NULL; -+ ump_session_memory_list_element *session_memory_element = NULL; -+ int ret; ++} + -+ DEBUG_ASSERT_POINTER(user_interaction); -+ DEBUG_ASSERT_POINTER(user_interaction->ctx); ++static int rk_pm_callback_power_on(struct kbase_device *kbdev) ++{ ++ int ret = 1; /* Assume GPU has been powered off */ ++ int err = 0; ++ struct rk_context *platform = get_rk_context(kbdev); + -+ session_data = (ump_session_data *) user_interaction->ctx; ++ cancel_delayed_work_sync(&platform->work); + -+ session_memory_element = _mali_osk_calloc(1, sizeof(ump_session_memory_list_element)); -+ if (NULL == session_memory_element) { -+ DBG_MSG(1, ("Failed to allocate ump_session_memory_list_element in ump_ioctl_allocate()\n")); -+ return _MALI_OSK_ERR_NOMEM; ++ err = rk_pm_enable_clk(kbdev); ++ if (err) { ++ E("failed to enable clk: %d", err); ++ return err; + } + -+ -+ new_allocation = _mali_osk_calloc(1, sizeof(ump_dd_mem)); -+ if (NULL == new_allocation) { -+ _mali_osk_free(session_memory_element); -+ DBG_MSG(1, ("Failed to allocate ump_dd_mem in _ump_ukk_allocate()\n")); -+ return _MALI_OSK_ERR_NOMEM; ++ if (platform->is_powered) { ++ D("mali_device is already powered."); ++ return 0; + } + -+ /* Initialize the part of the new_allocation that we know so for */ -+ _mali_osk_atomic_init(&new_allocation->ref_count, 1); -+ if (0 == (UMP_REF_DRV_UK_CONSTRAINT_USE_CACHE & user_interaction->constraints)) -+ new_allocation->is_cached = 0; -+ else new_allocation->is_cached = 1; -+ -+ /* Special case a size of 0, we should try to emulate what malloc does -+ * in this case, which is to return a valid pointer that must be freed, -+ * but can't be dereferenced */ -+ if (0 == user_interaction->size) { -+ /* Emulate by actually allocating the minimum block size */ -+ user_interaction->size = 1; ++ /* we must enable vdd_gpu before pd_gpu_in_chip. */ ++ err = rk_pm_enable_regulator(kbdev); ++ if (err) { ++ E("fail to enable regulator, err : %d.", err); ++ return err; + } + -+ /* Page align the size */ -+ new_allocation->size_bytes = UMP_SIZE_ALIGN(user_interaction->size); -+ new_allocation->lock_usage = UMP_NOT_LOCKED; -+ -+ /* Now, ask the active memory backend to do the actual memory allocation */ -+ if (!device.backend->allocate(device.backend->ctx, new_allocation)) { -+ DBG_MSG(3, ("OOM: No more UMP memory left. Failed to allocate memory in ump_ioctl_allocate(). Size: %lu, requested size: %lu\n", -+ new_allocation->size_bytes, -+ (unsigned long)user_interaction->size)); -+ _mali_osk_free(new_allocation); -+ _mali_osk_free(session_memory_element); -+ return _MALI_OSK_ERR_INVALID_FUNC; ++ /* è‹¥ mali_dev çš„ runtime_pm 是 enabled çš„, 则... */ ++ if (pm_runtime_enabled(kbdev->dev)) { ++ D("to resume mali_dev syncly."); ++ /* 对 pd_in_chip çš„ on æ“作, ++ * 将在 pm_domain çš„ runtime_pm_callbacks 中完æˆ. ++ */ ++ err = pm_runtime_get_sync(kbdev->dev); ++ if (err < 0) { ++ E("failed to runtime resume device: %d.", err); ++ return err; ++ } else if (err == 1) { /* runtime_pm_status is still active */ ++ D("chip has NOT been powered off, no need to re-init."); ++ ret = 0; ++ } + } -+ new_allocation->hw_device = _UMP_UK_USED_BY_CPU; -+ new_allocation->ctx = device.backend->ctx; -+ new_allocation->release_func = device.backend->release; + -+ /* Initialize the session_memory_element, and add it to the session object */ -+ session_memory_element->mem = new_allocation; -+ _mali_osk_mutex_wait(session_data->lock); -+ _mali_osk_list_add(&(session_memory_element->list), &(session_data->list_head_session_memory_list)); -+ _mali_osk_mutex_signal(session_data->lock); ++ platform->is_powered = true; ++ KBASE_TIMELINE_GPU_POWER(kbdev, 1); ++ wake_lock(&platform->wake_lock); + -+ /* Create a secure ID for this allocation */ -+ ret = ump_random_mapping_insert(device.secure_id_map, new_allocation); -+ if (unlikely(ret)) { -+ new_allocation->release_func(new_allocation->ctx, new_allocation); -+ _mali_osk_free(session_memory_element); -+ _mali_osk_free(new_allocation); -+ DBG_MSG(1, ("Failed to allocate secure ID in ump_ioctl_allocate()\n")); -+ return _MALI_OSK_ERR_INVALID_FUNC; -+ } ++ return ret; ++} + -+ user_interaction->secure_id = new_allocation->secure_id; -+ user_interaction->size = new_allocation->size_bytes; -+ DBG_MSG(3, ("UMP memory allocated. ID: %u, size: %lu\n", -+ new_allocation->secure_id, -+ new_allocation->size_bytes)); ++static void rk_pm_callback_power_off(struct kbase_device *kbdev) ++{ ++ struct rk_context *platform = get_rk_context(kbdev); + -+ return _MALI_OSK_ERR_OK; ++ rk_pm_disable_clk(kbdev); ++ queue_delayed_work(platform->power_off_wq, &platform->work, ++ msecs_to_jiffies(platform->delay_ms)); +} -diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h -new file mode 100755 -index 000000000000..32f32ccbe9fc ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h -@@ -0,0 +1,58 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef __UMP_KERNEL_TYPES_H__ -+#define __UMP_KERNEL_TYPES_H__ -+ -+#include "ump_kernel_interface.h" -+#include "mali_osk.h" -+ -+#include -+#ifdef CONFIG_DMA_SHARED_BUFFER -+#include -+#endif -+ -+typedef enum { -+ UMP_USED_BY_CPU = 0, -+ UMP_USED_BY_MALI = 1, -+ UMP_USED_BY_UNKNOWN_DEVICE = 100, -+} ump_hw_usage; -+ -+typedef enum { -+ UMP_NOT_LOCKED = 0, -+ UMP_READ = 1, -+ UMP_READ_WRITE = 3, -+} ump_lock_usage; -+ -+/* -+ * This struct is what is "behind" a ump_dd_handle -+ */ -+typedef struct ump_dd_mem { -+ struct rb_node node; -+ ump_secure_id secure_id; -+ _mali_osk_atomic_t ref_count; -+ unsigned long size_bytes; -+ unsigned long nr_blocks; -+ ump_dd_physical_block *block_array; -+ void (*release_func)(void *ctx, struct ump_dd_mem *descriptor); -+ void *ctx; -+ void *backend_info; -+ int is_cached; -+ ump_hw_usage hw_device; -+ ump_lock_usage lock_usage; -+#ifdef CONFIG_DMA_SHARED_BUFFER -+ struct dma_buf_attachment *import_attach; -+ struct sg_table *sgt; -+#endif -+} ump_dd_mem; + ++int rk_kbase_device_runtime_init(struct kbase_device *kbdev) ++{ ++ return 0; ++} + ++void rk_kbase_device_runtime_disable(struct kbase_device *kbdev) ++{ ++} + -+#endif /* __UMP_KERNEL_TYPES_H__ */ -diff --git a/drivers/gpu/arm/mali400/ump/common/ump_osk.h b/drivers/gpu/arm/mali400/ump/common/ump_osk.h -new file mode 100755 -index 000000000000..9adc4d3df3f5 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/common/ump_osk.h -@@ -0,0 +1,48 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++struct kbase_pm_callback_conf pm_callbacks = { ++ .power_on_callback = rk_pm_callback_power_on, ++ .power_off_callback = rk_pm_callback_power_off, ++#ifdef CONFIG_PM ++ .power_runtime_init_callback = rk_kbase_device_runtime_init, ++ .power_runtime_term_callback = rk_kbase_device_runtime_disable, ++ .power_runtime_on_callback = rk_pm_callback_runtime_on, ++ .power_runtime_off_callback = rk_pm_callback_runtime_off, ++#else /* CONFIG_PM */ ++ .power_runtime_init_callback = NULL, ++ .power_runtime_term_callback = NULL, ++ .power_runtime_on_callback = NULL, ++ .power_runtime_off_callback = NULL, ++#endif /* CONFIG_PM */ ++}; + -+/** -+ * @file ump_osk.h -+ * Defines the OS abstraction layer for the UMP kernel device driver (OSK) -+ */ ++int kbase_platform_early_init(void) ++{ ++ /* Nothing needed at this stage */ ++ return 0; ++} + -+#ifndef __UMP_OSK_H__ -+#define __UMP_OSK_H__ ++/*---------------------------------------------------------------------------*/ + -+#include -+#include -+#include "ump_uk_types.h" -+#include "ump_kernel_common.h" ++void kbase_platform_rk_shutdown(struct kbase_device *kbdev) ++{ ++ I("to make vdd_gpu enabled for turning off pd_gpu in pm_framework."); ++ rk_pm_enable_regulator(kbdev); ++} + -+#ifdef __cplusplus -+extern "C" { -+#endif ++/*---------------------------------------------------------------------------*/ + -+_mali_osk_errcode_t _ump_osk_init(void); ++#ifdef CONFIG_REGULATOR ++static int rk_pm_enable_regulator(struct kbase_device *kbdev) ++{ ++ int ret = 0; + -+_mali_osk_errcode_t _ump_osk_term(void); ++ if (!kbdev->regulator) { ++ W("no mali regulator control, no need to enable."); ++ goto EXIT; ++ } + -+int _ump_osk_atomic_inc_and_read(_mali_osk_atomic_t *atom); ++ D("to enable regulator."); ++ ret = regulator_enable(kbdev->regulator); ++ if (ret) { ++ E("fail to enable regulator, ret : %d.", ret); ++ goto EXIT; ++ } + -+int _ump_osk_atomic_dec_and_read(_mali_osk_atomic_t *atom); ++EXIT: ++ return ret; ++} + -+_mali_osk_errcode_t _ump_osk_mem_mapregion_init(ump_memory_allocation *descriptor); ++static void rk_pm_disable_regulator(struct kbase_device *kbdev) ++{ ++ if (!(kbdev->regulator)) { ++ W("no mali regulator control, no need to disable."); ++ return; ++ } + -+_mali_osk_errcode_t _ump_osk_mem_mapregion_map(ump_memory_allocation *descriptor, u32 offset, u32 *phys_addr, unsigned long size); ++ D("to disable regulator."); ++ regulator_disable(kbdev->regulator); ++} ++#endif + -+void _ump_osk_mem_mapregion_term(ump_memory_allocation *descriptor); ++static int rk_pm_enable_clk(struct kbase_device *kbdev) ++{ ++ int err = 0; + -+void _ump_osk_msync(ump_dd_mem *mem, void *virt, u32 offset, u32 size, ump_uk_msync_op op, ump_session_data *session_data); ++ if (!(kbdev->clock)) { ++ W("no mali clock control, no need to enable."); ++ } else { ++ D("to enable clk."); ++ err = clk_enable(kbdev->clock); ++ if (err) ++ E("failed to enable clk: %d.", err); ++ } + -+#ifdef __cplusplus ++ return err; +} -+#endif -+ -+#endif -diff --git a/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h b/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h -new file mode 100755 -index 000000000000..db842cdcbeff ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h -@@ -0,0 +1,202 @@ -+/* -+ * Copyright (C) 2010, 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ + -+/** -+ * @file ump_uk_types.h -+ * Defines the types and constants used in the user-kernel interface -+ */ ++static void rk_pm_disable_clk(struct kbase_device *kbdev) ++{ ++ if (!(kbdev->clock)) { ++ W("no mali clock control, no need to disable."); ++ } else { ++ D("to disable clk."); ++ clk_disable(kbdev->clock); ++ } ++} + -+#ifndef __UMP_UK_TYPES_H__ -+#define __UMP_UK_TYPES_H__ ++/*---------------------------------------------------------------------------*/ + -+#ifdef __cplusplus -+extern "C" { -+#endif ++static ssize_t utilisation_period_show(struct device *dev, ++ struct device_attribute *attr, ++ char *buf) ++{ ++ struct kbase_device *kbdev = dev_get_drvdata(dev); ++ struct rk_context *platform = get_rk_context(kbdev); ++ ssize_t ret = 0; + -+/* Helpers for API version handling */ -+#define MAKE_VERSION_ID(x) (((x) << 16UL) | (x)) -+#define IS_VERSION_ID(x) (((x) & 0xFFFF) == (((x) >> 16UL) & 0xFFFF)) -+#define GET_VERSION(x) (((x) >> 16UL) & 0xFFFF) -+#define IS_API_MATCH(x, y) (IS_VERSION_ID((x)) && IS_VERSION_ID((y)) && (GET_VERSION((x)) == GET_VERSION((y)))) ++ ret += snprintf(buf, PAGE_SIZE, "%u\n", platform->utilisation_period); + -+/** -+ * API version define. -+ * Indicates the version of the kernel API -+ * The version is a 16bit integer incremented on each API change. -+ * The 16bit integer is stored twice in a 32bit integer -+ * So for version 1 the value would be 0x00010001 -+ */ -+#define UMP_IOCTL_API_VERSION MAKE_VERSION_ID(3) ++ return ret; ++} + -+typedef enum ++static ssize_t utilisation_period_store(struct device *dev, ++ struct device_attribute *attr, ++ const char *buf, ++ size_t count) +{ -+ _UMP_IOC_QUERY_API_VERSION = 1, -+ _UMP_IOC_ALLOCATE, -+ _UMP_IOC_RELEASE, -+ _UMP_IOC_SIZE_GET, -+ _UMP_IOC_MAP_MEM, /* not used in Linux */ -+ _UMP_IOC_UNMAP_MEM, /* not used in Linux */ -+ _UMP_IOC_MSYNC, -+ _UMP_IOC_CACHE_OPERATIONS_CONTROL, -+ _UMP_IOC_SWITCH_HW_USAGE, -+ _UMP_IOC_LOCK, -+ _UMP_IOC_UNLOCK, -+ _UMP_IOC_DMABUF_IMPORT, -+} _ump_uk_functions; ++ struct kbase_device *kbdev = dev_get_drvdata(dev); ++ struct rk_context *platform = get_rk_context(kbdev); ++ int ret = 0; + -+typedef enum -+{ -+ UMP_REF_DRV_UK_CONSTRAINT_NONE = 0, -+ UMP_REF_DRV_UK_CONSTRAINT_PHYSICALLY_LINEAR = 1, -+ UMP_REF_DRV_UK_CONSTRAINT_USE_CACHE = 4, -+} ump_uk_alloc_constraints; ++ ret = kstrtouint(buf, 0, &platform->utilisation_period); ++ if (ret) { ++ E("invalid input period : %s.", buf); ++ return ret; ++ } ++ D("set utilisation_period to '%d'.", platform->utilisation_period); + -+typedef enum -+{ -+ _UMP_UK_MSYNC_CLEAN = 0, -+ _UMP_UK_MSYNC_CLEAN_AND_INVALIDATE = 1, -+ _UMP_UK_MSYNC_INVALIDATE = 2, -+ _UMP_UK_MSYNC_FLUSH_L1 = 3, -+ _UMP_UK_MSYNC_READOUT_CACHE_ENABLED = 128, -+} ump_uk_msync_op; ++ return count; ++} + -+typedef enum ++static ssize_t utilisation_show(struct device *dev, ++ struct device_attribute *attr, ++ char *buf) +{ -+ _UMP_UK_CACHE_OP_START = 0, -+ _UMP_UK_CACHE_OP_FINISH = 1, -+} ump_uk_cache_op_control; ++ struct kbase_device *kbdev = dev_get_drvdata(dev); ++ struct rk_context *platform = get_rk_context(kbdev); ++ ssize_t ret = 0; ++ unsigned long period_in_us = platform->utilisation_period * 1000; ++ unsigned long total_time; ++ unsigned long busy_time; ++ unsigned long utilisation; + -+typedef enum -+{ -+ _UMP_UK_READ = 1, -+ _UMP_UK_READ_WRITE = 3, -+} ump_uk_lock_usage; ++ kbase_pm_reset_dvfs_utilisation(kbdev); ++ usleep_range(period_in_us, period_in_us + 100); ++ kbase_pm_get_dvfs_utilisation(kbdev, &total_time, &busy_time); ++ /* 'devfreq_dev_profile' instance registered to devfreq ++ * also uses kbase_pm_reset_dvfs_utilisation ++ * and kbase_pm_get_dvfs_utilisation. ++ * it's better to cat this file when DVFS is disabled. ++ */ ++ D("total_time : %lu, busy_time : %lu.", total_time, busy_time); + -+typedef enum -+{ -+ _UMP_UK_USED_BY_CPU = 0, -+ _UMP_UK_USED_BY_MALI = 1, -+ _UMP_UK_USED_BY_UNKNOWN_DEVICE = 100, -+} ump_uk_user; ++ utilisation = busy_time * 100 / total_time; ++ ret += snprintf(buf, PAGE_SIZE, "%ld\n", utilisation); + -+/** -+ * Get API version ([in,out] u32 api_version, [out] u32 compatible) -+ */ -+typedef struct _ump_uk_api_version_s -+{ -+ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 version; /**< Set to the user space version on entry, stores the device driver version on exit */ -+ u32 compatible; /**< Non-null if the device is compatible with the client */ -+} _ump_uk_api_version_s; ++ return ret; ++} + -+/** -+ * ALLOCATE ([out] u32 secure_id, [in,out] u32 size, [in] contraints) -+ */ -+typedef struct _ump_uk_allocate_s -+{ -+ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 secure_id; /**< Return value from DD to Userdriver */ -+ u32 size; /**< Input and output. Requested size; input. Returned size; output */ -+ ump_uk_alloc_constraints constraints; /**< Only input to Devicedriver */ -+} _ump_uk_allocate_s; ++static DEVICE_ATTR_RW(utilisation_period); ++static DEVICE_ATTR_RO(utilisation); + -+/** -+ * SIZE_GET ([in] u32 secure_id, [out]size ) -+ */ -+typedef struct _ump_uk_size_get_s ++static int kbase_platform_rk_create_sysfs_files(struct device *dev) +{ -+ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 secure_id; /**< Input to DD */ -+ u32 size; /**< Returned size; output */ -+} _ump_uk_size_get_s; ++ int ret = 0; + -+/** -+ * Release ([in] u32 secure_id) -+ */ -+typedef struct _ump_uk_release_s -+{ -+ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 secure_id; /**< Input to DD */ -+} _ump_uk_release_s; ++ ret = device_create_file(dev, &dev_attr_utilisation_period); ++ if (ret) { ++ E("fail to create sysfs file 'utilisation_period'."); ++ goto out; ++ } + -+typedef struct _ump_uk_map_mem_s -+{ -+ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ void *mapping; /**< [out] Returns user-space virtual address for the mapping */ -+ void *phys_addr; /**< [in] physical address */ -+ unsigned long size; /**< [in] size */ -+ u32 secure_id; /**< [in] secure_id to assign to mapping */ -+ void *_ukk_private; /**< Only used inside linux port between kernel frontend and common part to store vma */ -+ u32 cookie; -+ u32 is_cached; /**< [in,out] caching of CPU mappings */ -+} _ump_uk_map_mem_s; ++ ret = device_create_file(dev, &dev_attr_utilisation); ++ if (ret) { ++ E("fail to create sysfs file 'utilisation'."); ++ goto remove_utilisation_period; ++ } + -+typedef struct _ump_uk_unmap_mem_s -+{ -+ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ void *mapping; -+ u32 size; -+ void *_ukk_private; -+ u32 cookie; -+} _ump_uk_unmap_mem_s; ++ return 0; + -+typedef struct _ump_uk_msync_s ++remove_utilisation_period: ++ device_remove_file(dev, &dev_attr_utilisation_period); ++out: ++ return ret; ++} ++ ++static void kbase_platform_rk_remove_sysfs_files(struct device *dev) +{ -+ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ void *mapping; /**< [in] mapping addr */ -+ void *address; /**< [in] flush start addr */ -+ u32 size; /**< [in] size to flush */ -+ ump_uk_msync_op op; /**< [in] flush operation */ -+ u32 cookie; /**< [in] cookie stored with reference to the kernel mapping internals */ -+ u32 secure_id; /**< [in] secure_id that identifies the ump buffer */ -+ u32 is_cached; /**< [out] caching of CPU mappings */ -+} _ump_uk_msync_s; ++ device_remove_file(dev, &dev_attr_utilisation_period); ++ device_remove_file(dev, &dev_attr_utilisation); ++} + -+typedef struct _ump_uk_cache_operations_control_s ++static int rk3288_get_soc_info(struct device *dev, struct device_node *np, ++ int *bin, int *process) +{ -+ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ ump_uk_cache_op_control op; /**< [in] cache operations start/stop */ -+} _ump_uk_cache_operations_control_s; ++ int ret = -EINVAL; ++ u8 value = 0; ++ char *name; + ++ if (!bin) ++ goto out; + -+typedef struct _ump_uk_switch_hw_usage_s -+{ -+ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 secure_id; /**< [in] secure_id that identifies the ump buffer */ -+ ump_uk_user new_user; /**< [in] cookie stored with reference to the kernel mapping internals */ ++ if (soc_is_rk3288w()) ++ name = "performance-w"; ++ else ++ name = "performance"; ++ if (of_property_match_string(np, "nvmem-cell-names", name) >= 0) { ++ ret = rockchip_nvmem_cell_read_u8(np, name, &value); ++ if (ret) { ++ dev_err(dev, "Failed to get soc performance value\n"); ++ goto out; ++ } ++ if (value & 0x2) ++ *bin = 3; ++ else if (value & 0x01) ++ *bin = 2; ++ else ++ *bin = 0; ++ } else { ++ dev_err(dev, "Failed to get bin config\n"); ++ } ++ if (*bin >= 0) ++ dev_info(dev, "bin=%d\n", *bin); + -+} _ump_uk_switch_hw_usage_s; ++out: ++ return ret; ++} + -+typedef struct _ump_uk_lock_s -+{ -+ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 secure_id; /**< [in] secure_id that identifies the ump buffer */ -+ ump_uk_lock_usage lock_usage; -+} _ump_uk_lock_s; ++static const struct rockchip_opp_data rk3288_gpu_opp_data = { ++ .get_soc_info = rk3288_get_soc_info, ++}; + -+typedef struct _ump_uk_unlock_s -+{ -+ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ u32 secure_id; /**< [in] secure_id that identifies the ump buffer */ -+} _ump_uk_unlock_s; ++static const struct of_device_id rockchip_mali_of_match[] = { ++ { ++ .compatible = "rockchip,rk3288", ++ .data = (void *)&rk3288_gpu_opp_data, ++ }, ++ { ++ .compatible = "rockchip,rk3288w", ++ .data = (void *)&rk3288_gpu_opp_data, ++ }, ++ {}, ++}; + -+typedef struct _ump_uk_dmabuf_s ++int kbase_platform_rk_init_opp_table(struct kbase_device *kbdev) +{ -+ void *ctx; /**< [in,out] user-kernel context (trashed on output) */ -+ int fd; /**< [in] dmabuf_fd that identifies the dmabuf buffer */ -+ size_t size; /**< [in] size of the buffer */ -+ u32 secure_id; /**< [out] secure_id that identifies the ump buffer */ -+} _ump_uk_dmabuf_s; ++ rockchip_get_opp_data(rockchip_mali_of_match, &kbdev->opp_info); + -+#ifdef __cplusplus ++ return rockchip_init_opp_table(kbdev->dev, &kbdev->opp_info, ++ "gpu_leakage", "mali"); +} -+#endif -+ -+#endif /* __UMP_UK_TYPES_H__ */ -diff --git a/drivers/gpu/arm/mali400/ump/common/ump_ukk.h b/drivers/gpu/arm/mali400/ump/common/ump_ukk.h +diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h new file mode 100755 -index 000000000000..f2906768c37f +index 000000000..6eab25014 --- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/common/ump_ukk.h -@@ -0,0 +1,60 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h +@@ -0,0 +1,62 @@ ++/* drivers/gpu/t6xx/kbase/src/platform/rk/mali_kbase_platform.h ++ * Rockchip SoC Mali-Midgard platform-dependent codes ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software FoundatIon. + */ + +/** -+ * @file ump_ukk.h -+ * Defines the kernel-side interface of the user-kernel interface ++ * @file mali_kbase_rk.h ++ * ++ * defines work_context type of platform_dependent_part. + */ + -+#ifndef __UMP_UKK_H__ -+#define __UMP_UKK_H__ -+ -+#include "mali_osk.h" -+#include "ump_uk_types.h" -+ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+ -+_mali_osk_errcode_t _ump_ukk_open(void **context); ++#ifndef _MALI_KBASE_RK_H_ ++#define _MALI_KBASE_RK_H_ + -+_mali_osk_errcode_t _ump_ukk_close(void **context); ++#include + -+_mali_osk_errcode_t _ump_ukk_allocate(_ump_uk_allocate_s *user_interaction); ++/*---------------------------------------------------------------------------*/ + -+_mali_osk_errcode_t _ump_ukk_release(_ump_uk_release_s *release_info); ++#define DEFAULT_UTILISATION_PERIOD_IN_MS (100) + -+_mali_osk_errcode_t _ump_ukk_size_get(_ump_uk_size_get_s *user_interaction); ++/*---------------------------------------------------------------------------*/ + -+_mali_osk_errcode_t _ump_ukk_map_mem(_ump_uk_map_mem_s *args); ++/* ++ * struct rk_context - work_context of platform_dependent_part_of_rk. ++ */ ++struct rk_context { ++ /* ++ * record the status of common_parts calling 'power_on_callback' ++ * and 'power_off_callback'. ++ */ ++ bool is_powered; + -+_mali_osk_errcode_t _ump_uku_get_api_version(_ump_uk_api_version_s *args); ++ struct kbase_device *kbdev; + -+void _ump_ukk_unmap_mem(_ump_uk_unmap_mem_s *args); ++ struct workqueue_struct *power_off_wq; ++ /* delayed_work_to_power_off_gpu. */ ++ struct delayed_work work; ++ unsigned int delay_ms; + -+void _ump_ukk_msync(_ump_uk_msync_s *args); ++ /* ++ * WAKE_LOCK_SUSPEND for ensuring to run ++ * delayed_work_to_power_off_gpu before suspend. ++ */ ++ struct wake_lock wake_lock; + -+void _ump_ukk_cache_operations_control(_ump_uk_cache_operations_control_s *args); ++ /* debug only, the period in ms to count gpu_utilisation. */ ++ unsigned int utilisation_period; ++}; + -+void _ump_ukk_switch_hw_usage(_ump_uk_switch_hw_usage_s *args); ++/*---------------------------------------------------------------------------*/ + -+void _ump_ukk_lock(_ump_uk_lock_s *args); ++static inline struct rk_context *get_rk_context( ++ const struct kbase_device *kbdev) ++{ ++ return (struct rk_context *)(kbdev->platform_context); ++} + -+void _ump_ukk_unlock(_ump_uk_unlock_s *args); ++#endif /* _MALI_KBASE_RK_H_ */ + -+u32 _ump_ukk_report_memory_usage(void); +diff --git a/drivers/gpu/arm/midgard/platform/vexpress/Kbuild b/drivers/gpu/arm/midgard/platform/vexpress/Kbuild +new file mode 100755 +index 000000000..1caa29366 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/vexpress/Kbuild +@@ -0,0 +1,18 @@ ++# ++# (C) COPYRIGHT 2012-2013, 2016 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+#ifdef __cplusplus -+} -+#endif + -+#endif /* __UMP_UKK_H__ */ -diff --git a/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h b/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h ++mali_kbase-y += \ ++ $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_vexpress.o \ ++ $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_cpu_vexpress.o +diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h new file mode 100755 -index 000000000000..d0174055aa28 +index 000000000..02835f129 --- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h -@@ -0,0 +1,30 @@ ++++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h +@@ -0,0 +1,75 @@ +/* -+ * Copyright (C) 2010, 2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + ++ ++ ++#include "mali_kbase_cpu_vexpress.h" ++ +/** -+ * @file ump_kernel_license.h -+ * Defines for the macro MODULE_LICENSE. ++ * Maximum frequency GPU will be clocked at. Given in kHz. ++ * This must be specified as there is no default value. ++ * ++ * Attached value: number in kHz ++ * Default value: NA ++ */ ++#define GPU_FREQ_KHZ_MAX kbase_get_platform_max_freq() ++/** ++ * Minimum frequency GPU will be clocked at. Given in kHz. ++ * This must be specified as there is no default value. ++ * ++ * Attached value: number in kHz ++ * Default value: NA + */ ++#define GPU_FREQ_KHZ_MIN kbase_get_platform_min_freq() + -+#ifndef __UMP_KERNEL_LICENSE_H__ -+#define __UMP_KERNEL_LICENSE_H__ ++/** ++ * CPU_SPEED_FUNC - A pointer to a function that calculates the CPU clock ++ * ++ * CPU clock speed of the platform is in MHz - see kbase_cpu_clk_speed_func ++ * for the function prototype. ++ * ++ * Attached value: A kbase_cpu_clk_speed_func. ++ * Default Value: NA ++ */ ++#define CPU_SPEED_FUNC (&kbase_get_vexpress_cpu_clock_speed) + -+#ifdef __cplusplus -+extern "C" { -+#endif ++/** ++ * GPU_SPEED_FUNC - A pointer to a function that calculates the GPU clock ++ * ++ * GPU clock speed of the platform in MHz - see kbase_gpu_clk_speed_func ++ * for the function prototype. ++ * ++ * Attached value: A kbase_gpu_clk_speed_func. ++ * Default Value: NA ++ */ ++#define GPU_SPEED_FUNC (NULL) + -+#define UMP_KERNEL_LINUX_LICENSE "GPL" -+#define UMP_LICENSE_IS_GPL 1 ++/** ++ * Power management configuration ++ * ++ * Attached value: pointer to @ref kbase_pm_callback_conf ++ * Default value: See @ref kbase_pm_callback_conf ++ */ ++#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) + -+#ifdef __cplusplus -+} -+#endif ++/** ++ * Platform specific configuration functions ++ * ++ * Attached value: pointer to @ref kbase_platform_funcs_conf ++ * Default value: See @ref kbase_platform_funcs_conf ++ */ ++#define PLATFORM_FUNCS (NULL) + -+#endif /* __UMP_KERNEL_LICENSE_H__ */ -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h b/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h ++extern struct kbase_pm_callback_conf pm_callbacks; +diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000000..bfb4e8d64885 +index 000000000..15ce2bc5e --- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h -@@ -0,0 +1,54 @@ ++++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c +@@ -0,0 +1,85 @@ +/* -+ * Copyright (C) 2010-2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#ifndef __UMP_IOCTL_H__ -+#define __UMP_IOCTL_H__ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif + -+#include -+#include + -+#include + -+#ifndef __user -+#define __user -+#endif + ++#include ++#include ++#include ++#include ++#include "mali_kbase_cpu_vexpress.h" ++#include "mali_kbase_config_platform.h" + -+/** -+ * @file UMP_ioctl.h -+ * This file describes the interface needed to use the Linux device driver. -+ * The interface is used by the userpace UMP driver. -+ */ ++#define HARD_RESET_AT_POWER_OFF 0 + -+#define UMP_IOCTL_NR 0x90 ++#ifndef CONFIG_OF ++static struct kbase_io_resources io_resources = { ++ .job_irq_number = 68, ++ .mmu_irq_number = 69, ++ .gpu_irq_number = 70, ++ .io_memory_region = { ++ .start = 0xFC010000, ++ .end = 0xFC010000 + (4096 * 4) - 1 ++ } ++}; ++#endif /* CONFIG_OF */ + ++static int pm_callback_power_on(struct kbase_device *kbdev) ++{ ++ /* Nothing is needed on VExpress, but we may have destroyed GPU state (if the below HARD_RESET code is active) */ ++ return 1; ++} + -+#define UMP_IOC_QUERY_API_VERSION _IOR(UMP_IOCTL_NR, _UMP_IOC_QUERY_API_VERSION, _ump_uk_api_version_s) -+#define UMP_IOC_ALLOCATE _IOWR(UMP_IOCTL_NR, _UMP_IOC_ALLOCATE, _ump_uk_allocate_s) -+#define UMP_IOC_RELEASE _IOR(UMP_IOCTL_NR, _UMP_IOC_RELEASE, _ump_uk_release_s) -+#define UMP_IOC_SIZE_GET _IOWR(UMP_IOCTL_NR, _UMP_IOC_SIZE_GET, _ump_uk_size_get_s) -+#define UMP_IOC_MSYNC _IOW(UMP_IOCTL_NR, _UMP_IOC_MSYNC, _ump_uk_msync_s) ++static void pm_callback_power_off(struct kbase_device *kbdev) ++{ ++#if HARD_RESET_AT_POWER_OFF ++ /* Cause a GPU hard reset to test whether we have actually idled the GPU ++ * and that we properly reconfigure the GPU on power up. ++ * Usually this would be dangerous, but if the GPU is working correctly it should ++ * be completely safe as the GPU should not be active at this point. ++ * However this is disabled normally because it will most likely interfere with ++ * bus logging etc. ++ */ ++ KBASE_TRACE_ADD(kbdev, CORE_GPU_HARD_RESET, NULL, NULL, 0u, 0); ++ kbase_os_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), GPU_COMMAND_HARD_RESET); ++#endif ++} + -+#define UMP_IOC_CACHE_OPERATIONS_CONTROL _IOW(UMP_IOCTL_NR, _UMP_IOC_CACHE_OPERATIONS_CONTROL, _ump_uk_cache_operations_control_s) -+#define UMP_IOC_SWITCH_HW_USAGE _IOW(UMP_IOCTL_NR, _UMP_IOC_SWITCH_HW_USAGE, _ump_uk_switch_hw_usage_s) -+#define UMP_IOC_LOCK _IOW(UMP_IOCTL_NR, _UMP_IOC_LOCK, _ump_uk_lock_s) -+#define UMP_IOC_UNLOCK _IOW(UMP_IOCTL_NR, _UMP_IOC_UNLOCK, _ump_uk_unlock_s) ++struct kbase_pm_callback_conf pm_callbacks = { ++ .power_on_callback = pm_callback_power_on, ++ .power_off_callback = pm_callback_power_off, ++ .power_suspend_callback = NULL, ++ .power_resume_callback = NULL ++}; + -+#define UMP_IOC_DMABUF_IMPORT _IOW(UMP_IOCTL_NR, _UMP_IOC_DMABUF_IMPORT, _ump_uk_dmabuf_s) ++static struct kbase_platform_config versatile_platform_config = { ++#ifndef CONFIG_OF ++ .io_resources = &io_resources ++#endif ++}; + -+#ifdef __cplusplus ++struct kbase_platform_config *kbase_get_platform_config(void) ++{ ++ return &versatile_platform_config; +} -+#endif + -+#endif /* __UMP_IOCTL_H__ */ -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c ++ ++int kbase_platform_early_init(void) ++{ ++ /* Nothing needed at this stage */ ++ return 0; ++} +diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c new file mode 100755 -index 000000000000..71b30830c308 +index 000000000..4665f98cb --- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c -@@ -0,0 +1,449 @@ ++++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c +@@ -0,0 +1,279 @@ +/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include /* kernel module definitions */ -+#include /* file system operations */ -+#include /* character device definitions */ -+#include /* request_mem_region */ -+#include /* memory management functions and types */ -+#include /* user space access */ -+#include -+#include -+#include + -+#include "arch/config.h" /* Configuration for current platform. The symlinc for arch is set by Makefile */ -+#include "ump_ioctl.h" -+#include "ump_kernel_common.h" -+#include "ump_kernel_interface.h" -+#include "ump_kernel_interface_ref_drv.h" -+#include "ump_kernel_descriptor_mapping.h" -+#include "ump_kernel_memory_backend.h" -+#include "ump_kernel_memory_backend_os.h" -+#include "ump_kernel_memory_backend_dedicated.h" -+#include "ump_kernel_license.h" + -+#include "ump_osk.h" -+#include "ump_ukk.h" -+#include "ump_uk_types.h" -+#include "ump_ukk_wrappers.h" -+#include "ump_ukk_ref_wrappers.h" ++#include ++#include ++#include "mali_kbase_cpu_vexpress.h" + ++#define HZ_IN_MHZ (1000000) + -+/* Module parameter to control log level */ -+int ump_debug_level = 2; -+module_param(ump_debug_level, int, S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP | S_IROTH); /* rw-rw-r-- */ -+MODULE_PARM_DESC(ump_debug_level, "Higher number, more dmesg output"); ++#define CORETILE_EXPRESS_A9X4_SCC_START (0x100E2000) ++#define MOTHERBOARD_SYS_CFG_START (0x10000000) ++#define SYS_CFGDATA_OFFSET (0x000000A0) ++#define SYS_CFGCTRL_OFFSET (0x000000A4) ++#define SYS_CFGSTAT_OFFSET (0x000000A8) + -+/* By default the module uses any available major, but it's possible to set it at load time to a specific number */ -+int ump_major = 0; -+module_param(ump_major, int, S_IRUGO); /* r--r--r-- */ -+MODULE_PARM_DESC(ump_major, "Device major number"); ++#define SYS_CFGCTRL_START_BIT_VALUE (1 << 31) ++#define READ_REG_BIT_VALUE (0 << 30) ++#define DCC_DEFAULT_BIT_VALUE (0 << 26) ++#define SYS_CFG_OSC_FUNC_BIT_VALUE (1 << 20) ++#define SITE_DEFAULT_BIT_VALUE (1 << 16) ++#define BOARD_STACK_POS_DEFAULT_BIT_VALUE (0 << 12) ++#define DEVICE_DEFAULT_BIT_VALUE (2 << 0) ++#define SYS_CFG_COMPLETE_BIT_VALUE (1 << 0) ++#define SYS_CFG_ERROR_BIT_VALUE (1 << 1) + -+/* Name of the UMP device driver */ -+static char ump_dev_name[] = "ump"; /* should be const, but the functions we call requires non-cost */ ++#define FEED_REG_BIT_MASK (0x0F) ++#define FCLK_PA_DIVIDE_BIT_SHIFT (0x03) ++#define FCLK_PB_DIVIDE_BIT_SHIFT (0x07) ++#define FCLK_PC_DIVIDE_BIT_SHIFT (0x0B) ++#define AXICLK_PA_DIVIDE_BIT_SHIFT (0x0F) ++#define AXICLK_PB_DIVIDE_BIT_SHIFT (0x13) + ++/* the following three values used for reading ++ * HBI value of the LogicTile daughterboard */ ++#define VE_MOTHERBOARD_PERIPHERALS_SMB_CS7 (0x10000000) ++#define VE_SYS_PROC_ID1_OFFSET (0x00000088) ++#define VE_LOGIC_TILE_HBI_MASK (0x00000FFF) + -+#if UMP_LICENSE_IS_GPL -+static struct dentry *ump_debugfs_dir = NULL; -+#endif ++#define IS_SINGLE_BIT_SET(val, pos) (val&(1<> ++ FCLK_PA_DIVIDE_BIT_SHIFT); ++ /* CFGRW0[10:7] */ ++ pb_divide = ((reg_val & (FEED_REG_BIT_MASK << ++ FCLK_PB_DIVIDE_BIT_SHIFT)) >> ++ FCLK_PB_DIVIDE_BIT_SHIFT); ++ *cpu_clock = osc2_value * (pa_divide + 1) / (pb_divide + 1); ++ } else if (IS_SINGLE_BIT_SET(reg_val, 1)) { ++ /* CFGRW0[1] - CLKOC */ ++ /* CFGRW0[6:3] */ ++ pa_divide = ((reg_val & (FEED_REG_BIT_MASK << ++ FCLK_PA_DIVIDE_BIT_SHIFT)) >> ++ FCLK_PA_DIVIDE_BIT_SHIFT); ++ /* CFGRW0[14:11] */ ++ pc_divide = ((reg_val & (FEED_REG_BIT_MASK << ++ FCLK_PC_DIVIDE_BIT_SHIFT)) >> ++ FCLK_PC_DIVIDE_BIT_SHIFT); ++ *cpu_clock = osc2_value * (pa_divide + 1) / (pc_divide + 1); ++ } else if (IS_SINGLE_BIT_SET(reg_val, 2)) { ++ /* CFGRW0[2] - FACLK */ ++ /* CFGRW0[18:15] */ ++ pa_divide = ((reg_val & (FEED_REG_BIT_MASK << ++ AXICLK_PA_DIVIDE_BIT_SHIFT)) >> ++ AXICLK_PA_DIVIDE_BIT_SHIFT); ++ /* CFGRW0[22:19] */ ++ pb_divide = ((reg_val & (FEED_REG_BIT_MASK << ++ AXICLK_PB_DIVIDE_BIT_SHIFT)) >> ++ AXICLK_PB_DIVIDE_BIT_SHIFT); ++ *cpu_clock = osc2_value * (pa_divide + 1) / (pb_divide + 1); + } else { -+ /* use load time defined major number */ -+ dev = MKDEV(ump_major, 0); -+ err = register_chrdev_region(dev, 1, ump_dev_name); ++ err = -EIO; + } + -+ if (0 == err) { -+ memset(&ump_device, 0, sizeof(ump_device)); -+ -+ /* initialize our char dev data */ -+ cdev_init(&ump_device.cdev, &ump_fops); -+ ump_device.cdev.owner = THIS_MODULE; -+ ump_device.cdev.ops = &ump_fops; ++set_reg_error: ++ongoing_request: ++ raw_spin_unlock(&syscfg_lock); ++ *cpu_clock /= HZ_IN_MHZ; + -+ /* register char dev with the kernel */ -+ err = cdev_add(&ump_device.cdev, dev, 1/*count*/); -+ if (0 == err) { ++ if (!err) ++ cpu_clock_speed = *cpu_clock; + -+#if UMP_LICENSE_IS_GPL -+ ump_device.ump_class = class_create(THIS_MODULE, ump_dev_name); -+ if (IS_ERR(ump_device.ump_class)) { -+ err = PTR_ERR(ump_device.ump_class); -+ } else { -+ ump_global_mdev = device_create(ump_device.ump_class, NULL, dev, NULL, ump_dev_name); -+ if (!IS_ERR(ump_global_mdev)) { -+ return 0; -+ } ++ iounmap(scc_reg); + -+ err = PTR_ERR(ump_global_mdev); -+ } -+ cdev_del(&ump_device.cdev); -+#else -+ return 0; -+#endif -+ } ++scc_reg_map_failed: ++ iounmap(syscfg_reg); + -+ unregister_chrdev_region(dev, 1); -+ } ++syscfg_reg_map_failed: + + return err; +} + -+ -+ -+/* -+ * Terminate the UMP device driver ++/** ++ * kbase_get_platform_logic_tile_type - determines which LogicTile type ++ * is used by Versatile Express ++ * ++ * When platform_config build parameter is specified as vexpress, i.e., ++ * platform_config=vexpress, GPU frequency may vary dependent on the ++ * particular platform. The GPU frequency depends on the LogicTile type. ++ * ++ * This function determines which LogicTile type is used by the platform by ++ * reading the HBI value of the daughterboard which holds the LogicTile: ++ * ++ * 0x217 HBI0217 Virtex-6 ++ * 0x192 HBI0192 Virtex-5 ++ * 0x247 HBI0247 Virtex-7 ++ * ++ * Return: HBI value of the logic tile daughterboard, zero if not accessible + */ -+void ump_kernel_device_terminate(void) ++static u32 kbase_get_platform_logic_tile_type(void) +{ -+ dev_t dev = MKDEV(ump_major, 0); ++ void __iomem *syscfg_reg = NULL; ++ u32 sys_procid1 = 0; + -+#if UMP_LICENSE_IS_GPL -+ device_destroy(ump_device.ump_class, dev); -+ class_destroy(ump_device.ump_class); -+#endif ++ syscfg_reg = ioremap(VE_MOTHERBOARD_PERIPHERALS_SMB_CS7 + VE_SYS_PROC_ID1_OFFSET, 4); ++ if (NULL != syscfg_reg) { ++ sys_procid1 = readl(syscfg_reg); ++ iounmap(syscfg_reg); ++ } + -+ /* unregister char device */ -+ cdev_del(&ump_device.cdev); ++ return sys_procid1 & VE_LOGIC_TILE_HBI_MASK; ++} + -+ /* free major */ -+ unregister_chrdev_region(dev, 1); ++u32 kbase_get_platform_min_freq(void) ++{ ++ u32 ve_logic_tile = kbase_get_platform_logic_tile_type(); + -+#if UMP_LICENSE_IS_GPL -+ if (ump_debugfs_dir) -+ debugfs_remove_recursive(ump_debugfs_dir); -+#endif ++ switch (ve_logic_tile) { ++ case 0x217: ++ /* Virtex 6, HBI0217 */ ++ return VE_VIRTEX6_GPU_FREQ_MIN; ++ case 0x247: ++ /* Virtex 7, HBI0247 */ ++ return VE_VIRTEX7_GPU_FREQ_MIN; ++ default: ++ /* all other logic tiles, i.e., Virtex 5 HBI0192 ++ * or unsuccessful reading from the platform - ++ * fall back to some default value */ ++ return VE_DEFAULT_GPU_FREQ_MIN; ++ } +} + -+/* -+ * Open a new session. User space has called open() on us. -+ */ -+static int ump_file_open(struct inode *inode, struct file *filp) ++u32 kbase_get_platform_max_freq(void) +{ -+ struct ump_session_data *session_data; -+ _mali_osk_errcode_t err; ++ u32 ve_logic_tile = kbase_get_platform_logic_tile_type(); + -+ /* input validation */ -+ if (0 != MINOR(inode->i_rdev)) { -+ MSG_ERR(("Minor not zero in ump_file_open()\n")); -+ return -ENODEV; ++ switch (ve_logic_tile) { ++ case 0x217: ++ /* Virtex 6, HBI0217 */ ++ return VE_VIRTEX6_GPU_FREQ_MAX; ++ case 0x247: ++ /* Virtex 7, HBI0247 */ ++ return VE_VIRTEX7_GPU_FREQ_MAX; ++ default: ++ /* all other logic tiles, i.e., Virtex 5 HBI0192 ++ * or unsuccessful reading from the platform - ++ * fall back to some default value */ ++ return VE_DEFAULT_GPU_FREQ_MAX; + } ++} +diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h +new file mode 100755 +index 000000000..da8656981 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h +@@ -0,0 +1,38 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2013, 2015-2016 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ /* Call the OS-Independent UMP Open function */ -+ err = _ump_ukk_open((void **) &session_data); -+ if (_MALI_OSK_ERR_OK != err) { -+ MSG_ERR(("Ump failed to open a new session\n")); -+ return ump_map_errcode(err); -+ } + -+ filp->private_data = (void *)session_data; -+ filp->f_pos = 0; + -+ return 0; /* success */ -+} + + ++#ifndef _KBASE_CPU_VEXPRESS_H_ ++#define _KBASE_CPU_VEXPRESS_H_ + -+/* -+ * Close a session. User space has called close() or crashed/terminated. ++/** ++ * Versatile Express implementation of @ref kbase_cpu_clk_speed_func. + */ -+static int ump_file_release(struct inode *inode, struct file *filp) -+{ -+ _mali_osk_errcode_t err; ++int kbase_get_vexpress_cpu_clock_speed(u32 *cpu_clock); + -+ err = _ump_ukk_close((void **) &filp->private_data); -+ if (_MALI_OSK_ERR_OK != err) { -+ return ump_map_errcode(err); -+ } ++/** ++ * Get the minimum GPU frequency for the attached logic tile ++ */ ++u32 kbase_get_platform_min_freq(void); + -+ return 0; /* success */ -+} ++/** ++ * Get the maximum GPU frequency for the attached logic tile ++ */ ++u32 kbase_get_platform_max_freq(void); + ++#endif /* _KBASE_CPU_VEXPRESS_H_ */ +diff --git a/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild +new file mode 100755 +index 000000000..7efe8fa42 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild +@@ -0,0 +1,16 @@ ++# ++# (C) COPYRIGHT 2013-2014, 2016 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + + ++mali_kbase-y += $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_vexpress.o +diff --git a/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h +new file mode 100755 +index 000000000..0efbf3962 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h +@@ -0,0 +1,73 @@ +/* -+ * Handle IOCTL requests. ++ * ++ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ -+#ifdef HAVE_UNLOCKED_IOCTL -+static long ump_file_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) -+#else -+static int ump_file_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) -+#endif -+{ -+ int err = -ENOTTY; -+ void __user *argument; -+ struct ump_session_data *session_data; + -+#ifndef HAVE_UNLOCKED_IOCTL -+ (void)inode; /* inode not used */ -+#endif + -+ session_data = (struct ump_session_data *)filp->private_data; -+ if (NULL == session_data) { -+ MSG_ERR(("No session data attached to file object\n")); -+ return -ENOTTY; -+ } + -+ /* interpret the argument as a user pointer to something */ -+ argument = (void __user *)arg; ++/** ++ * Maximum frequency GPU will be clocked at. Given in kHz. ++ * This must be specified as there is no default value. ++ * ++ * Attached value: number in kHz ++ * Default value: NA ++ */ ++#define GPU_FREQ_KHZ_MAX 5000 ++/** ++ * Minimum frequency GPU will be clocked at. Given in kHz. ++ * This must be specified as there is no default value. ++ * ++ * Attached value: number in kHz ++ * Default value: NA ++ */ ++#define GPU_FREQ_KHZ_MIN 5000 + -+ switch (cmd) { -+ case UMP_IOC_QUERY_API_VERSION: -+ err = ump_get_api_version_wrapper((u32 __user *)argument, session_data); -+ break; ++/** ++ * CPU_SPEED_FUNC - A pointer to a function that calculates the CPU clock ++ * ++ * CPU clock speed of the platform is in MHz - see kbase_cpu_clk_speed_func ++ * for the function prototype. ++ * ++ * Attached value: A kbase_cpu_clk_speed_func. ++ * Default Value: NA ++ */ ++#define CPU_SPEED_FUNC (&kbase_cpuprops_get_default_clock_speed) + -+ case UMP_IOC_ALLOCATE : -+ err = ump_allocate_wrapper((u32 __user *)argument, session_data); -+ break; ++/** ++ * GPU_SPEED_FUNC - A pointer to a function that calculates the GPU clock ++ * ++ * GPU clock speed of the platform in MHz - see kbase_gpu_clk_speed_func ++ * for the function prototype. ++ * ++ * Attached value: A kbase_gpu_clk_speed_func. ++ * Default Value: NA ++ */ ++#define GPU_SPEED_FUNC (NULL) + -+ case UMP_IOC_RELEASE: -+ err = ump_release_wrapper((u32 __user *)argument, session_data); -+ break; ++/** ++ * Power management configuration ++ * ++ * Attached value: pointer to @ref kbase_pm_callback_conf ++ * Default value: See @ref kbase_pm_callback_conf ++ */ ++#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) + -+ case UMP_IOC_SIZE_GET: -+ err = ump_size_get_wrapper((u32 __user *)argument, session_data); -+ break; ++/** ++ * Platform specific configuration functions ++ * ++ * Attached value: pointer to @ref kbase_platform_funcs_conf ++ * Default value: See @ref kbase_platform_funcs_conf ++ */ ++#define PLATFORM_FUNCS (NULL) + -+ case UMP_IOC_MSYNC: -+ err = ump_msync_wrapper((u32 __user *)argument, session_data); -+ break; ++extern struct kbase_pm_callback_conf pm_callbacks; +diff --git a/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c +new file mode 100755 +index 000000000..3ff0930fb +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c +@@ -0,0 +1,79 @@ ++/* ++ * ++ * (C) COPYRIGHT 2011-2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ case UMP_IOC_CACHE_OPERATIONS_CONTROL: -+ err = ump_cache_operations_control_wrapper((u32 __user *)argument, session_data); -+ break; + -+ case UMP_IOC_SWITCH_HW_USAGE: -+ err = ump_switch_hw_usage_wrapper((u32 __user *)argument, session_data); -+ break; + -+ case UMP_IOC_LOCK: -+ err = ump_lock_wrapper((u32 __user *)argument, session_data); -+ break; ++#include ++#include ++#include ++#include + -+ case UMP_IOC_UNLOCK: -+ err = ump_unlock_wrapper((u32 __user *)argument, session_data); -+ break; ++#define HARD_RESET_AT_POWER_OFF 0 + -+ case UMP_IOC_DMABUF_IMPORT: -+#ifdef CONFIG_DMA_SHARED_BUFFER -+ err = ump_dmabuf_import_wrapper((u32 __user *)argument, session_data); -+#else -+ err = -EFAULT; -+ DBG_MSG(1, ("User space use dmabuf API, but kernel don't support DMA BUF\n")); ++#ifndef CONFIG_OF ++static struct kbase_io_resources io_resources = { ++ .job_irq_number = 68, ++ .mmu_irq_number = 69, ++ .gpu_irq_number = 70, ++ .io_memory_region = { ++ .start = 0x2f010000, ++ .end = 0x2f010000 + (4096 * 4) - 1} ++}; +#endif -+ break; -+ -+ default: -+ DBG_MSG(1, ("No handler for IOCTL. cmd: 0x%08x, arg: 0x%08lx\n", cmd, arg)); -+ err = -EFAULT; -+ break; -+ } + -+ return err; ++static int pm_callback_power_on(struct kbase_device *kbdev) ++{ ++ /* Nothing is needed on VExpress, but we may have destroyed GPU state (if the below HARD_RESET code is active) */ ++ return 1; +} + -+int ump_map_errcode(_mali_osk_errcode_t err) ++static void pm_callback_power_off(struct kbase_device *kbdev) +{ -+ switch (err) { -+ case _MALI_OSK_ERR_OK : -+ return 0; -+ case _MALI_OSK_ERR_FAULT: -+ return -EFAULT; -+ case _MALI_OSK_ERR_INVALID_FUNC: -+ return -ENOTTY; -+ case _MALI_OSK_ERR_INVALID_ARGS: -+ return -EINVAL; -+ case _MALI_OSK_ERR_NOMEM: -+ return -ENOMEM; -+ case _MALI_OSK_ERR_TIMEOUT: -+ return -ETIMEDOUT; -+ case _MALI_OSK_ERR_RESTARTSYSCALL: -+ return -ERESTARTSYS; -+ case _MALI_OSK_ERR_ITEM_NOT_FOUND: -+ return -ENOENT; -+ default: -+ return -EFAULT; -+ } ++#if HARD_RESET_AT_POWER_OFF ++ /* Cause a GPU hard reset to test whether we have actually idled the GPU ++ * and that we properly reconfigure the GPU on power up. ++ * Usually this would be dangerous, but if the GPU is working correctly it should ++ * be completely safe as the GPU should not be active at this point. ++ * However this is disabled normally because it will most likely interfere with ++ * bus logging etc. ++ */ ++ KBASE_TRACE_ADD(kbdev, CORE_GPU_HARD_RESET, NULL, NULL, 0u, 0); ++ kbase_os_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), GPU_COMMAND_HARD_RESET); ++#endif +} + -+/* -+ * Handle from OS to map specified virtual memory to specified UMP memory. -+ */ -+static int ump_file_mmap(struct file *filp, struct vm_area_struct *vma) -+{ -+ _ump_uk_map_mem_s args; -+ _mali_osk_errcode_t err; -+ struct ump_session_data *session_data; ++struct kbase_pm_callback_conf pm_callbacks = { ++ .power_on_callback = pm_callback_power_on, ++ .power_off_callback = pm_callback_power_off, ++ .power_suspend_callback = NULL, ++ .power_resume_callback = NULL ++}; + -+ /* Validate the session data */ -+ session_data = (struct ump_session_data *)filp->private_data; -+ if (NULL == session_data) { -+ MSG_ERR(("mmap() called without any session data available\n")); -+ return -EFAULT; -+ } ++static struct kbase_platform_config versatile_platform_config = { ++#ifndef CONFIG_OF ++ .io_resources = &io_resources ++#endif ++}; + -+ /* Re-pack the arguments that mmap() packed for us */ -+ args.ctx = session_data; -+ args.phys_addr = 0; -+ args.size = vma->vm_end - vma->vm_start; -+ args._ukk_private = vma; -+ args.secure_id = vma->vm_pgoff; ++struct kbase_platform_config *kbase_get_platform_config(void) ++{ ++ return &versatile_platform_config; ++} + -+ /* By setting this flag, during a process fork; the child process will not have the parent UMP mappings */ -+ vma->vm_flags |= VM_DONTCOPY; ++int kbase_platform_early_init(void) ++{ ++ /* Nothing needed at this stage */ ++ return 0; ++} +diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/Kbuild b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/Kbuild +new file mode 100755 +index 000000000..1caa29366 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/Kbuild +@@ -0,0 +1,18 @@ ++# ++# (C) COPYRIGHT 2012-2013, 2016 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+ DBG_MSG(4, ("UMP vma->flags: %x\n", vma->vm_flags)); + -+ /* Call the common mmap handler */ -+ err = _ump_ukk_map_mem(&args); -+ if (_MALI_OSK_ERR_OK != err) { -+ MSG_ERR(("_ump_ukk_map_mem() failed in function ump_file_mmap()")); -+ return ump_map_errcode(err); -+ } ++mali_kbase-y += \ ++ $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_vexpress.o \ ++ $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_cpu_vexpress.o +diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h +new file mode 100755 +index 000000000..dbdf21e00 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h +@@ -0,0 +1,75 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ return 0; /* success */ -+} + -+/* Export UMP kernel space API functions */ -+EXPORT_SYMBOL(ump_dd_secure_id_get); -+EXPORT_SYMBOL(ump_dd_handle_create_from_secure_id); -+EXPORT_SYMBOL(ump_dd_phys_block_count_get); -+EXPORT_SYMBOL(ump_dd_phys_block_get); -+EXPORT_SYMBOL(ump_dd_phys_blocks_get); -+EXPORT_SYMBOL(ump_dd_size_get); -+EXPORT_SYMBOL(ump_dd_reference_add); -+EXPORT_SYMBOL(ump_dd_reference_release); + -+/* Export our own extended kernel space allocator */ -+EXPORT_SYMBOL(ump_dd_handle_create_from_phys_blocks); ++#include "mali_kbase_cpu_vexpress.h" + -+/* Setup init and exit functions for this module */ -+module_init(ump_initialize_module); -+module_exit(ump_cleanup_module); ++/** ++ * Maximum frequency GPU will be clocked at. Given in kHz. ++ * This must be specified as there is no default value. ++ * ++ * Attached value: number in kHz ++ * Default value: NA ++ */ ++#define GPU_FREQ_KHZ_MAX 10000 ++/** ++ * Minimum frequency GPU will be clocked at. Given in kHz. ++ * This must be specified as there is no default value. ++ * ++ * Attached value: number in kHz ++ * Default value: NA ++ */ ++#define GPU_FREQ_KHZ_MIN 10000 + -+/* And some module informatio */ -+MODULE_LICENSE(UMP_KERNEL_LINUX_LICENSE); -+MODULE_AUTHOR("ARM Ltd."); -+MODULE_VERSION(SVN_REV_STRING); -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h -new file mode 100755 -index 000000000000..8d32ddbb5449 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2010-2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * CPU_SPEED_FUNC - A pointer to a function that calculates the CPU clock ++ * ++ * CPU clock speed of the platform is in MHz - see kbase_cpu_clk_speed_func ++ * for the function prototype. ++ * ++ * Attached value: A kbase_cpu_clk_speed_func. ++ * Default Value: NA + */ ++#define CPU_SPEED_FUNC (&kbase_get_vexpress_cpu_clock_speed) + -+#ifndef __UMP_KERNEL_LINUX_H__ -+#define __UMP_KERNEL_LINUX_H__ ++/** ++ * GPU_SPEED_FUNC - A pointer to a function that calculates the GPU clock ++ * ++ * GPU clock speed of the platform in MHz - see kbase_gpu_clk_speed_func ++ * for the function prototype. ++ * ++ * Attached value: A kbase_gpu_clk_speed_func. ++ * Default Value: NA ++ */ ++#define GPU_SPEED_FUNC (NULL) + -+int ump_kernel_device_initialize(void); -+void ump_kernel_device_terminate(void); ++/** ++ * Power management configuration ++ * ++ * Attached value: pointer to @ref kbase_pm_callback_conf ++ * Default value: See @ref kbase_pm_callback_conf ++ */ ++#define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) + ++/** ++ * Platform specific configuration functions ++ * ++ * Attached value: pointer to @ref kbase_platform_funcs_conf ++ * Default value: See @ref kbase_platform_funcs_conf ++ */ ++#define PLATFORM_FUNCS (NULL) + -+#endif /* __UMP_KERNEL_H__ */ -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c ++extern struct kbase_pm_callback_conf pm_callbacks; +diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000000..5a1257a25b82 +index 000000000..76ffe4a1e --- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c -@@ -0,0 +1,271 @@ ++++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c +@@ -0,0 +1,83 @@ +/* -+ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2011-2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+/* needed to detect kernel version specific code */ -+#include -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+#include -+#else /* pre 2.6.26 the file was in the arch specific location */ -+#include -+#endif -+ -+#include -+#include -+#include -+#include -+#include "ump_kernel_common.h" -+#include "ump_kernel_memory_backend.h" -+ + + -+#define UMP_BLOCK_SIZE (256UL * 1024UL) /* 256kB, remember to keep the ()s */ + + ++#include ++#include ++#include ++#include ++#include "mali_kbase_cpu_vexpress.h" + -+typedef struct block_info { -+ struct block_info *next; -+} block_info; ++#define HARD_RESET_AT_POWER_OFF 0 + ++#ifndef CONFIG_OF ++static struct kbase_io_resources io_resources = { ++ .job_irq_number = 75, ++ .mmu_irq_number = 76, ++ .gpu_irq_number = 77, ++ .io_memory_region = { ++ .start = 0x2F000000, ++ .end = 0x2F000000 + (4096 * 4) - 1} ++}; ++#endif + ++static int pm_callback_power_on(struct kbase_device *kbdev) ++{ ++ /* Nothing is needed on VExpress, but we may have destroyed GPU state (if the below HARD_RESET code is active) */ ++ return 1; ++} + -+typedef struct block_allocator { -+ struct semaphore mutex; -+ block_info *all_blocks; -+ block_info *first_free; -+ u32 base; -+ u32 num_blocks; -+ u32 num_free; -+} block_allocator; ++static void pm_callback_power_off(struct kbase_device *kbdev) ++{ ++#if HARD_RESET_AT_POWER_OFF ++ /* Cause a GPU hard reset to test whether we have actually idled the GPU ++ * and that we properly reconfigure the GPU on power up. ++ * Usually this would be dangerous, but if the GPU is working correctly it should ++ * be completely safe as the GPU should not be active at this point. ++ * However this is disabled normally because it will most likely interfere with ++ * bus logging etc. ++ */ ++ KBASE_TRACE_ADD(kbdev, CORE_GPU_HARD_RESET, NULL, NULL, 0u, 0); ++ kbase_os_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), GPU_COMMAND_HARD_RESET); ++#endif ++} + ++struct kbase_pm_callback_conf pm_callbacks = { ++ .power_on_callback = pm_callback_power_on, ++ .power_off_callback = pm_callback_power_off, ++ .power_suspend_callback = NULL, ++ .power_resume_callback = NULL ++}; + -+static void block_allocator_shutdown(ump_memory_backend *backend); -+static int block_allocator_allocate(void *ctx, ump_dd_mem *mem); -+static void block_allocator_release(void *ctx, ump_dd_mem *handle); -+static inline u32 get_phys(block_allocator *allocator, block_info *block); -+static u32 block_allocator_stat(struct ump_memory_backend *backend); ++static struct kbase_platform_config versatile_platform_config = { ++#ifndef CONFIG_OF ++ .io_resources = &io_resources ++#endif ++}; + ++struct kbase_platform_config *kbase_get_platform_config(void) ++{ ++ return &versatile_platform_config; ++} + ++int kbase_platform_early_init(void) ++{ ++ /* Nothing needed at this stage */ ++ return 0; ++} + +diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c +new file mode 100755 +index 000000000..816dff498 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c +@@ -0,0 +1,71 @@ +/* -+ * Create dedicated memory backend ++ * ++ * (C) COPYRIGHT 2011-2013 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ -+ump_memory_backend *ump_block_allocator_create(u32 base_address, u32 size) -+{ -+ ump_memory_backend *backend; -+ block_allocator *allocator; -+ u32 usable_size; -+ u32 num_blocks; -+ -+ usable_size = (size + UMP_BLOCK_SIZE - 1) & ~(UMP_BLOCK_SIZE - 1); -+ num_blocks = usable_size / UMP_BLOCK_SIZE; + -+ if (0 == usable_size) { -+ DBG_MSG(1, ("Memory block of size %u is unusable\n", size)); -+ return NULL; -+ } + -+ DBG_MSG(5, ("Creating dedicated UMP memory backend. Base address: 0x%08x, size: 0x%08x\n", base_address, size)); -+ DBG_MSG(6, ("%u usable bytes which becomes %u blocks\n", usable_size, num_blocks)); + -+ backend = kzalloc(sizeof(ump_memory_backend), GFP_KERNEL); -+ if (NULL != backend) { -+ allocator = kmalloc(sizeof(block_allocator), GFP_KERNEL); -+ if (NULL != allocator) { -+ allocator->all_blocks = kmalloc(sizeof(block_info) * num_blocks, GFP_KERNEL); -+ if (NULL != allocator->all_blocks) { -+ int i; + -+ allocator->first_free = NULL; -+ allocator->num_blocks = num_blocks; -+ allocator->num_free = num_blocks; -+ allocator->base = base_address; -+ sema_init(&allocator->mutex, 1); + -+ for (i = 0; i < num_blocks; i++) { -+ allocator->all_blocks[i].next = allocator->first_free; -+ allocator->first_free = &allocator->all_blocks[i]; -+ } ++#include ++#include ++#include "mali_kbase_cpu_vexpress.h" + -+ backend->ctx = allocator; -+ backend->allocate = block_allocator_allocate; -+ backend->release = block_allocator_release; -+ backend->shutdown = block_allocator_shutdown; -+ backend->stat = block_allocator_stat; -+ backend->pre_allocate_physical_check = NULL; -+ backend->adjust_to_mali_phys = NULL; ++#define HZ_IN_MHZ (1000000) + -+ return backend; -+ } -+ kfree(allocator); -+ } -+ kfree(backend); -+ } ++#define CORETILE_EXPRESS_A9X4_SCC_START (0x100E2000) ++#define MOTHERBOARD_SYS_CFG_START (0x10000000) ++#define SYS_CFGDATA_OFFSET (0x000000A0) ++#define SYS_CFGCTRL_OFFSET (0x000000A4) ++#define SYS_CFGSTAT_OFFSET (0x000000A8) + -+ return NULL; -+} ++#define SYS_CFGCTRL_START_BIT_VALUE (1 << 31) ++#define READ_REG_BIT_VALUE (0 << 30) ++#define DCC_DEFAULT_BIT_VALUE (0 << 26) ++#define SYS_CFG_OSC_FUNC_BIT_VALUE (1 << 20) ++#define SITE_DEFAULT_BIT_VALUE (1 << 16) ++#define BOARD_STACK_POS_DEFAULT_BIT_VALUE (0 << 12) ++#define DEVICE_DEFAULT_BIT_VALUE (2 << 0) ++#define SYS_CFG_COMPLETE_BIT_VALUE (1 << 0) ++#define SYS_CFG_ERROR_BIT_VALUE (1 << 1) + ++#define FEED_REG_BIT_MASK (0x0F) ++#define FCLK_PA_DIVIDE_BIT_SHIFT (0x03) ++#define FCLK_PB_DIVIDE_BIT_SHIFT (0x07) ++#define FCLK_PC_DIVIDE_BIT_SHIFT (0x0B) ++#define AXICLK_PA_DIVIDE_BIT_SHIFT (0x0F) ++#define AXICLK_PB_DIVIDE_BIT_SHIFT (0x13) + ++#define IS_SINGLE_BIT_SET(val, pos) (val&(1<ctx); ++#define CPU_CLOCK_SPEED_6XV7 50 + -+ allocator = (block_allocator *)backend->ctx; ++static u32 cpu_clock_speed = CPU_CLOCK_SPEED_UNDEFINED; + -+ DBG_MSG_IF(1, allocator->num_free != allocator->num_blocks, ("%u blocks still in use during shutdown\n", allocator->num_blocks - allocator->num_free)); ++static DEFINE_RAW_SPINLOCK(syscfg_lock); ++/** ++ * kbase_get_vendor_specific_cpu_clock_speed ++ * @brief Retrieves the CPU clock speed. ++ * The implementation is platform specific. ++ * @param[out] cpu_clock - the value of CPU clock speed in MHz ++ * @return 0 on success, 1 otherwise ++*/ ++int kbase_get_vexpress_cpu_clock_speed(u32 *cpu_clock) ++{ ++ /* TODO: MIDBASE-2873 - Provide runtime detection of CPU clock freq for 6XV7 board */ ++ *cpu_clock = CPU_CLOCK_SPEED_6XV7; + -+ kfree(allocator->all_blocks); -+ kfree(allocator); -+ kfree(backend); ++ return 0; +} +diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h +new file mode 100755 +index 000000000..23647ccb0 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h +@@ -0,0 +1,28 @@ ++/* ++ * ++ * (C) COPYRIGHT 2012-2013, 2015 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + + + -+static int block_allocator_allocate(void *ctx, ump_dd_mem *mem) -+{ -+ block_allocator *allocator; -+ u32 left; -+ block_info *last_allocated = NULL; -+ int i = 0; -+ -+ BUG_ON(!ctx); -+ BUG_ON(!mem); + -+ allocator = (block_allocator *)ctx; -+ left = mem->size_bytes; + -+ BUG_ON(!left); -+ BUG_ON(!&allocator->mutex); ++#ifndef _KBASE_CPU_VEXPRESS_H_ ++#define _KBASE_CPU_VEXPRESS_H_ + -+ mem->nr_blocks = ((left + UMP_BLOCK_SIZE - 1) & ~(UMP_BLOCK_SIZE - 1)) / UMP_BLOCK_SIZE; -+ mem->block_array = (ump_dd_physical_block *)vmalloc(sizeof(ump_dd_physical_block) * mem->nr_blocks); -+ if (NULL == mem->block_array) { -+ MSG_ERR(("Failed to allocate block array\n")); -+ return 0; -+ } ++/** ++ * Versatile Express implementation of @ref kbase_cpu_clk_speed_func. ++ */ ++int kbase_get_vexpress_cpu_clock_speed(u32 *cpu_clock); + -+ if (down_interruptible(&allocator->mutex)) { -+ MSG_ERR(("Could not get mutex to do block_allocate\n")); -+ return 0; -+ } ++#endif /* _KBASE_CPU_VEXPRESS_H_ */ +diff --git a/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h b/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h +new file mode 100755 +index 000000000..5fa9b39c4 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h +@@ -0,0 +1,53 @@ ++/* ++ * ++ * (C) COPYRIGHT 2010, 2012-2014 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ mem->size_bytes = 0; + -+ while ((left > 0) && (allocator->first_free)) { -+ block_info *block; + -+ block = allocator->first_free; -+ allocator->first_free = allocator->first_free->next; -+ block->next = last_allocated; -+ last_allocated = block; -+ allocator->num_free--; + -+ mem->block_array[i].addr = get_phys(allocator, block); -+ mem->block_array[i].size = UMP_BLOCK_SIZE; -+ mem->size_bytes += UMP_BLOCK_SIZE; + -+ i++; ++/** ++ * @file mali_ukk_os.h ++ * Types and definitions that are common for Linux OSs for the kernel side of the ++ * User-Kernel interface. ++ */ + -+ if (left < UMP_BLOCK_SIZE) left = 0; -+ else left -= UMP_BLOCK_SIZE; -+ } ++#ifndef _UKK_OS_H_ /* Linux version */ ++#define _UKK_OS_H_ + -+ if (left) { -+ block_info *block; -+ /* release all memory back to the pool */ -+ while (last_allocated) { -+ block = last_allocated->next; -+ last_allocated->next = allocator->first_free; -+ allocator->first_free = last_allocated; -+ last_allocated = block; -+ allocator->num_free++; -+ } ++#include + -+ vfree(mem->block_array); -+ mem->backend_info = NULL; -+ mem->block_array = NULL; ++/** ++ * @addtogroup uk_api User-Kernel Interface API ++ * @{ ++ */ + -+ DBG_MSG(4, ("Could not find a mem-block for the allocation.\n")); -+ up(&allocator->mutex); ++/** ++ * @addtogroup uk_api_kernel UKK (Kernel side) ++ * @{ ++ */ + -+ return 0; -+ } ++/** ++ * Internal OS specific data structure associated with each UKK session. Part ++ * of a ukk_session object. ++ */ ++typedef struct ukkp_session { ++ int dummy; /**< No internal OS specific data at this time */ ++} ukkp_session; + -+ mem->backend_info = last_allocated; ++/** @} end group uk_api_kernel */ + -+ up(&allocator->mutex); -+ mem->is_cached = 0; ++/** @} end group uk_api */ + -+ return 1; -+} ++#endif /* _UKK_OS_H__ */ +diff --git a/drivers/gpu/arm/midgard/protected_mode_switcher.h b/drivers/gpu/arm/midgard/protected_mode_switcher.h +new file mode 100755 +index 000000000..5dc2f3ba8 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/protected_mode_switcher.h +@@ -0,0 +1,64 @@ ++/* ++ * ++ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + + + -+static void block_allocator_release(void *ctx, ump_dd_mem *handle) -+{ -+ block_allocator *allocator; -+ block_info *block, * next; ++#ifndef _PROTECTED_MODE_SWITCH_H_ ++#define _PROTECTED_MODE_SWITCH_H_ + -+ BUG_ON(!ctx); -+ BUG_ON(!handle); ++struct protected_mode_device; + -+ allocator = (block_allocator *)ctx; -+ block = (block_info *)handle->backend_info; -+ BUG_ON(!block); ++/** ++ * struct protected_mode_ops - Callbacks for protected mode switch operations ++ * ++ * @protected_mode_enable: Callback to enable protected mode for device ++ * @protected_mode_disable: Callback to disable protected mode for device ++ */ ++struct protected_mode_ops { ++ /** ++ * protected_mode_enable() - Enable protected mode on device ++ * @dev: The struct device ++ * ++ * Return: 0 on success, non-zero on error ++ */ ++ int (*protected_mode_enable)( ++ struct protected_mode_device *protected_dev); + -+ if (down_interruptible(&allocator->mutex)) { -+ MSG_ERR(("Allocator release: Failed to get mutex - memory leak\n")); -+ return; -+ } ++ /** ++ * protected_mode_disable() - Disable protected mode on device, and ++ * reset device ++ * @dev: The struct device ++ * ++ * Return: 0 on success, non-zero on error ++ */ ++ int (*protected_mode_disable)( ++ struct protected_mode_device *protected_dev); ++}; + -+ while (block) { -+ next = block->next; ++/** ++ * struct protected_mode_device - Device structure for protected mode devices ++ * ++ * @ops - Callbacks associated with this device ++ * @data - Pointer to device private data ++ * ++ * This structure should be registered with the platform device using ++ * platform_set_drvdata(). ++ */ ++struct protected_mode_device { ++ struct protected_mode_ops ops; ++ void *data; ++}; + -+ BUG_ON((block < allocator->all_blocks) || (block > (allocator->all_blocks + allocator->num_blocks))); ++#endif /* _PROTECTED_MODE_SWITCH_H_ */ +diff --git a/drivers/gpu/arm/midgard/rename.h b/drivers/gpu/arm/midgard/rename.h +new file mode 100755 +index 000000000..821866618 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/rename.h +@@ -0,0 +1,426 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++#ifndef _RENAME_H ++#define _RENAME_H ++#define __crc_kbase_create_context midgard___crc_kbase_create_context ++#define __crc_kbase_destroy_context midgard___crc_kbase_destroy_context ++#define __crc_kbase_find_device midgard___crc_kbase_find_device ++#define __crc_kbase_instr_hwcnt_clear midgard___crc_kbase_instr_hwcnt_clear ++#define __crc_kbase_instr_hwcnt_dump_complete midgard___crc_kbase_instr_hwcnt_dump_complete ++#define __crc_kbase_instr_hwcnt_request_dump midgard___crc_kbase_instr_hwcnt_request_dump ++#define __crc_kbase_release_device midgard___crc_kbase_release_device ++#define jd_done_nolock midgard_jd_done_nolock ++#define kbase_add_va_region midgard_kbase_add_va_region ++#define kbase_alloc_free_region midgard_kbase_alloc_free_region ++#define kbase_alloc_phy_pages_helper midgard_kbase_alloc_phy_pages_helper ++#define kbase_alloc_phy_pages midgard_kbase_alloc_phy_pages ++#define kbase_as_fault_debugfs_init midgard_kbase_as_fault_debugfs_init ++#define kbase_backend_complete_wq midgard_kbase_backend_complete_wq ++#define kbase_backend_complete_wq_post_sched midgard_kbase_backend_complete_wq_post_sched ++#define kbase_backend_ctx_count_changed midgard_kbase_backend_ctx_count_changed ++#define kbase_backend_find_and_release_free_address_space midgard_kbase_backend_find_and_release_free_address_space ++#define kbase_backend_get_current_flush_id midgard_kbase_backend_get_current_flush_id ++#define kbase_backend_get_gpu_time midgard_kbase_backend_get_gpu_time ++#define kbase_backend_gpuprops_get_features midgard_kbase_backend_gpuprops_get_features ++#define kbase_backend_gpuprops_get midgard_kbase_backend_gpuprops_get ++#define kbase_backend_inspect_tail midgard_kbase_backend_inspect_tail ++#define kbase_backend_nr_atoms_on_slot midgard_kbase_backend_nr_atoms_on_slot ++#define kbase_backend_nr_atoms_submitted midgard_kbase_backend_nr_atoms_submitted ++#define kbase_backend_release_ctx_irq midgard_kbase_backend_release_ctx_irq ++#define kbase_backend_release_ctx_noirq midgard_kbase_backend_release_ctx_noirq ++#define kbase_backend_reset midgard_kbase_backend_reset ++#define kbase_backend_run_atom midgard_kbase_backend_run_atom ++#define kbase_backend_slot_free midgard_kbase_backend_slot_free ++#define kbase_backend_slot_update midgard_kbase_backend_slot_update ++#define kbase_backend_soft_hard_stop_slot midgard_kbase_backend_soft_hard_stop_slot ++#define kbase_backend_timeouts_changed midgard_kbase_backend_timeouts_changed ++#define kbase_backend_timer_init midgard_kbase_backend_timer_init ++#define kbase_backend_timer_resume midgard_kbase_backend_timer_resume ++#define kbase_backend_timer_suspend midgard_kbase_backend_timer_suspend ++#define kbase_backend_timer_term midgard_kbase_backend_timer_term ++#define kbase_backend_use_ctx midgard_kbase_backend_use_ctx ++#define kbase_backend_use_ctx_sched midgard_kbase_backend_use_ctx_sched ++#define kbase_cache_enabled midgard_kbase_cache_enabled ++#define kbase_cache_set_coherency_mode midgard_kbase_cache_set_coherency_mode ++#define kbase_cancel_soft_job midgard_kbase_cancel_soft_job ++#define kbase_check_alloc_flags midgard_kbase_check_alloc_flags ++#define kbase_check_import_flags midgard_kbase_check_import_flags ++#define kbase_clean_caches_done midgard_kbase_clean_caches_done ++#define kbase_create_context midgard_kbase_create_context ++#define kbase_ctx_sched_init midgard_kbase_ctx_sched_init ++#define kbase_ctx_sched_release_ctx midgard_kbase_ctx_sched_release_ctx ++#define kbase_ctx_sched_remove_ctx midgard_kbase_ctx_sched_remove_ctx ++#define kbase_ctx_sched_restore_all_as midgard_kbase_ctx_sched_restore_all_as ++#define kbase_ctx_sched_retain_ctx midgard_kbase_ctx_sched_retain_ctx ++#define kbase_ctx_sched_retain_ctx_refcount midgard_kbase_ctx_sched_retain_ctx_refcount ++#define kbase_ctx_sched_term midgard_kbase_ctx_sched_term ++#define kbase_debug_assert_register_hook midgard_kbase_debug_assert_register_hook ++#define kbase_debug_job_fault_context_init midgard_kbase_debug_job_fault_context_init ++#define kbase_debug_job_fault_context_term midgard_kbase_debug_job_fault_context_term ++#define kbase_debug_job_fault_debugfs_init midgard_kbase_debug_job_fault_debugfs_init ++#define kbase_debug_job_fault_dev_init midgard_kbase_debug_job_fault_dev_init ++#define kbase_debug_job_fault_dev_term midgard_kbase_debug_job_fault_dev_term ++#define kbase_debug_job_fault_process midgard_kbase_debug_job_fault_process ++#define kbase_debug_job_fault_reg_snapshot_init midgard_kbase_debug_job_fault_reg_snapshot_init ++#define kbase_debug_mem_view_init midgard_kbase_debug_mem_view_init ++#define kbase_destroy_context midgard_kbase_destroy_context ++#define kbase_devfreq_init midgard_kbase_devfreq_init ++#define kbase_devfreq_set_core_mask midgard_kbase_devfreq_set_core_mask ++#define kbase_devfreq_term midgard_kbase_devfreq_term ++#define kbase_device_alloc midgard_kbase_device_alloc ++#define kbase_device_free midgard_kbase_device_free ++#define kbase_device_init midgard_kbase_device_init ++#define kbase_device_term midgard_kbase_device_term ++#define kbase_disjoint_event_get midgard_kbase_disjoint_event_get ++#define kbase_disjoint_event midgard_kbase_disjoint_event ++#define kbase_disjoint_event_potential midgard_kbase_disjoint_event_potential ++#define kbase_disjoint_init midgard_kbase_disjoint_init ++#define kbase_disjoint_state_down midgard_kbase_disjoint_state_down ++#define kbase_disjoint_state_up midgard_kbase_disjoint_state_up ++#define kbase_drv_name midgard_kbase_drv_name ++#define kbase_event_cleanup midgard_kbase_event_cleanup ++#define kbase_event_close midgard_kbase_event_close ++#define kbase_event_dequeue midgard_kbase_event_dequeue ++#define kbase_event_init midgard_kbase_event_init ++#define kbase_event_pending midgard_kbase_event_pending ++#define kbase_event_post midgard_kbase_event_post ++#define kbase_event_wakeup midgard_kbase_event_wakeup ++#define kbase_fence_add_callback midgard_kbase_fence_add_callback ++#define kbase_fence_free_callbacks midgard_kbase_fence_free_callbacks ++#define kbase_fence_ops midgard_kbase_fence_ops ++#define kbase_fence_out_new midgard_kbase_fence_out_new ++#define kbase_find_device midgard_kbase_find_device ++#define kbase_finish_soft_job midgard_kbase_finish_soft_job ++#define kbase_flush_mmu_wqs midgard_kbase_flush_mmu_wqs ++#define kbase_free_alloced_region midgard_kbase_free_alloced_region ++#define kbase_free_phy_pages_helper midgard_kbase_free_phy_pages_helper ++#define kbase_get_real_power midgard_kbase_get_real_power ++#define kbase_gpu_complete_hw midgard_kbase_gpu_complete_hw ++#define kbase_gpu_dump_slots midgard_kbase_gpu_dump_slots ++#define kbase_gpu_inspect midgard_kbase_gpu_inspect ++#define kbase_gpu_interrupt midgard_kbase_gpu_interrupt ++#define kbase_gpu_irq_evict midgard_kbase_gpu_irq_evict ++#define kbase_gpu_mmap midgard_kbase_gpu_mmap ++#define kbase_gpu_munmap midgard_kbase_gpu_munmap ++#define kbase_gpuprops_populate_user_buffer midgard_kbase_gpuprops_populate_user_buffer ++#define kbase_gpuprops_set_features midgard_kbase_gpuprops_set_features ++#define kbase_gpuprops_set midgard_kbase_gpuprops_set ++#define kbase_gpuprops_update_core_props_gpu_id midgard_kbase_gpuprops_update_core_props_gpu_id ++#define kbase_gpu_vm_lock midgard_kbase_gpu_vm_lock ++#define kbase_gpu_vm_unlock midgard_kbase_gpu_vm_unlock ++#define kbase_hwaccess_pm_gpu_active midgard_kbase_hwaccess_pm_gpu_active ++#define kbase_hwaccess_pm_gpu_idle midgard_kbase_hwaccess_pm_gpu_idle ++#define kbase_hwaccess_pm_halt midgard_kbase_hwaccess_pm_halt ++#define kbase_hwaccess_pm_init midgard_kbase_hwaccess_pm_init ++#define kbase_hwaccess_pm_powerup midgard_kbase_hwaccess_pm_powerup ++#define kbase_hwaccess_pm_resume midgard_kbase_hwaccess_pm_resume ++#define kbase_hwaccess_pm_suspend midgard_kbase_hwaccess_pm_suspend ++#define kbase_hwaccess_pm_term midgard_kbase_hwaccess_pm_term ++#define kbase_hw_set_features_mask midgard_kbase_hw_set_features_mask ++#define kbase_hw_set_issues_mask midgard_kbase_hw_set_issues_mask ++#define kbase_install_interrupts midgard_kbase_install_interrupts ++#define kbase_instr_backend_init midgard_kbase_instr_backend_init ++#define kbase_instr_backend_term midgard_kbase_instr_backend_term ++#define kbase_instr_hwcnt_clear midgard_kbase_instr_hwcnt_clear ++#define kbase_instr_hwcnt_disable_internal midgard_kbase_instr_hwcnt_disable_internal ++#define kbase_instr_hwcnt_dump_complete midgard_kbase_instr_hwcnt_dump_complete ++#define kbase_instr_hwcnt_enable_internal midgard_kbase_instr_hwcnt_enable_internal ++#define kbase_instr_hwcnt_request_dump midgard_kbase_instr_hwcnt_request_dump ++#define kbase_instr_hwcnt_sample_done midgard_kbase_instr_hwcnt_sample_done ++#define kbase_instr_hwcnt_wait_for_dump midgard_kbase_instr_hwcnt_wait_for_dump ++#define kbase_invoke_smc_fid midgard_kbase_invoke_smc_fid ++#define kbase_invoke_smc midgard_kbase_invoke_smc ++#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_NO_MALI) ++#define kbase_io_history_dump midgard_kbase_io_history_dump ++#define kbase_io_history_init midgard_kbase_io_history_init ++#define kbase_io_history_term midgard_kbase_io_history_term ++#endif /* CONFIG_DEBUG_FS */ ++#define kbase_ipa_debugfs_init midgard_kbase_ipa_debugfs_init ++#define kbase_ipa_init midgard_kbase_ipa_init ++#define kbase_ipa_init_model midgard_kbase_ipa_init_model ++#define kbase_ipa_model_add_param_s32 midgard_kbase_ipa_model_add_param_s32 ++#define kbase_ipa_model_add_param_string midgard_kbase_ipa_model_add_param_string ++#define kbase_ipa_model_name_from_id midgard_kbase_ipa_model_name_from_id ++#define kbase_ipa_model_param_add midgard_kbase_ipa_model_param_add ++#define kbase_ipa_model_param_free_all midgard_kbase_ipa_model_param_free_all ++#define kbase_ipa_model_recalculate midgard_kbase_ipa_model_recalculate ++#define kbase_ipa_power_model_ops midgard_kbase_ipa_power_model_ops ++#define kbase_ipa_term midgard_kbase_ipa_term ++#define kbase_ipa_term_model midgard_kbase_ipa_term_model ++#define kbase_jd_cancel midgard_kbase_jd_cancel ++#define kbase_jd_done midgard_kbase_jd_done ++#define kbase_jd_done_worker midgard_kbase_jd_done_worker ++#define kbase_jd_exit midgard_kbase_jd_exit ++#define kbase_jd_free_external_resources midgard_kbase_jd_free_external_resources ++#define kbase_jd_init midgard_kbase_jd_init ++#define kbase_jd_submit midgard_kbase_jd_submit ++#define kbase_jd_zap_context midgard_kbase_jd_zap_context ++#define kbase_jit_allocate midgard_kbase_jit_allocate ++#define kbase_jit_backing_lost midgard_kbase_jit_backing_lost ++#define kbase_jit_debugfs_init midgard_kbase_jit_debugfs_init ++#define kbase_jit_evict midgard_kbase_jit_evict ++#define kbase_jit_free midgard_kbase_jit_free ++#define kbase_jit_init midgard_kbase_jit_init ++#define kbase_jit_term midgard_kbase_jit_term ++#define kbase_jm_complete midgard_kbase_jm_complete ++#define kbase_jm_idle_ctx midgard_kbase_jm_idle_ctx ++#define kbase_jm_kick midgard_kbase_jm_kick ++#define kbase_jm_return_atom_to_js midgard_kbase_jm_return_atom_to_js ++#define kbase_jm_try_kick_all midgard_kbase_jm_try_kick_all ++#define kbase_jm_try_kick midgard_kbase_jm_try_kick ++#define kbase_jm_wait_for_zero_jobs midgard_kbase_jm_wait_for_zero_jobs ++#define kbase_job_check_enter_disjoint midgard_kbase_job_check_enter_disjoint ++#define kbase_job_check_leave_disjoint midgard_kbase_job_check_leave_disjoint ++#define kbase_job_done midgard_kbase_job_done ++#define kbase_job_fault_get_reg_snapshot midgard_kbase_job_fault_get_reg_snapshot ++#define kbase_job_hw_submit midgard_kbase_job_hw_submit ++#define kbase_job_slot_ctx_priority_check_locked midgard_kbase_job_slot_ctx_priority_check_locked ++#define kbase_job_slot_halt midgard_kbase_job_slot_halt ++#define kbase_job_slot_hardstop midgard_kbase_job_slot_hardstop ++#define kbase_job_slot_init midgard_kbase_job_slot_init ++#define kbase_job_slot_softstop midgard_kbase_job_slot_softstop ++#define kbase_job_slot_softstop_swflags midgard_kbase_job_slot_softstop_swflags ++#define kbase_job_slot_term midgard_kbase_job_slot_term ++#define kbase_js_complete_atom midgard_kbase_js_complete_atom ++#define kbase_js_complete_atom_wq midgard_kbase_js_complete_atom_wq ++#define kbase_js_dep_resolved_submit midgard_kbase_js_dep_resolved_submit ++#define kbase_js_is_atom_valid midgard_kbase_js_is_atom_valid ++#define kbase_js_pull midgard_kbase_js_pull ++#define kbase_js_sched midgard_kbase_js_sched ++#define kbase_js_set_timeouts midgard_kbase_js_set_timeouts ++#define kbase_js_unpull midgard_kbase_js_unpull ++#define kbase_js_zap_context midgard_kbase_js_zap_context ++#define kbase_map_external_resource midgard_kbase_map_external_resource ++#define kbase_mem_alias midgard_kbase_mem_alias ++#define kbase_mem_alloc midgard_kbase_mem_alloc ++#define kbase_mem_alloc_page midgard_kbase_mem_alloc_page ++#define kbase_mem_commit midgard_kbase_mem_commit ++#define kbase_mem_evictable_deinit midgard_kbase_mem_evictable_deinit ++#define kbase_mem_evictable_init midgard_kbase_mem_evictable_init ++#define kbase_mem_evictable_make midgard_kbase_mem_evictable_make ++#define kbase_mem_evictable_unmake midgard_kbase_mem_evictable_unmake ++#define kbase_mem_flags_change midgard_kbase_mem_flags_change ++#define kbase_mem_free midgard_kbase_mem_free ++#define kbase_mem_free_region midgard_kbase_mem_free_region ++#define kbase_mem_grow_gpu_mapping midgard_kbase_mem_grow_gpu_mapping ++#define kbase_mem_halt midgard_kbase_mem_halt ++#define kbase_mem_import midgard_kbase_mem_import ++#define kbase_mem_init midgard_kbase_mem_init ++#define kbase_mem_kref_free midgard_kbase_mem_kref_free ++#define kbase_mem_pool_alloc midgard_kbase_mem_pool_alloc ++#define kbase_mem_pool_alloc_pages midgard_kbase_mem_pool_alloc_pages ++#define kbase_mem_pool_debugfs_init midgard_kbase_mem_pool_debugfs_init ++#define kbase_mem_pool_free midgard_kbase_mem_pool_free ++#define kbase_mem_pool_free_pages midgard_kbase_mem_pool_free_pages ++#define kbase_mem_pool_grow midgard_kbase_mem_pool_grow ++#define kbase_mem_pool_init midgard_kbase_mem_pool_init ++#define kbase_mem_pool_set_max_size midgard_kbase_mem_pool_set_max_size ++#define kbase_mem_pool_term midgard_kbase_mem_pool_term ++#define kbase_mem_pool_trim midgard_kbase_mem_pool_trim ++#define kbase_mem_query midgard_kbase_mem_query ++#define kbase_mem_term midgard_kbase_mem_term ++#define kbase_mmu_disable_as midgard_kbase_mmu_disable_as ++#define kbase_mmu_disable midgard_kbase_mmu_disable ++#define kbase_mmu_dump midgard_kbase_mmu_dump ++#define kbase_mmu_hw_clear_fault midgard_kbase_mmu_hw_clear_fault ++#define kbase_mmu_hw_configure midgard_kbase_mmu_hw_configure ++#define kbase_mmu_hw_do_operation midgard_kbase_mmu_hw_do_operation ++#define kbase_mmu_hw_enable_fault midgard_kbase_mmu_hw_enable_fault ++#define kbase_mmu_init midgard_kbase_mmu_init ++#define kbase_mmu_insert_pages midgard_kbase_mmu_insert_pages ++#define kbase_mmu_insert_pages_no_flush midgard_kbase_mmu_insert_pages_no_flush ++#define kbase_mmu_insert_single_page midgard_kbase_mmu_insert_single_page ++#define kbase_mmu_interrupt midgard_kbase_mmu_interrupt ++#define kbase_mmu_mode_get_aarch64 midgard_kbase_mmu_mode_get_aarch64 ++#define kbase_mmu_mode_get_lpae midgard_kbase_mmu_mode_get_lpae ++#define kbase_mmu_teardown_pages midgard_kbase_mmu_teardown_pages ++#define kbase_mmu_term midgard_kbase_mmu_term ++#define kbase_mmu_update midgard_kbase_mmu_update ++#define kbase_mmu_update_pages midgard_kbase_mmu_update_pages ++#define kbase_os_mem_map_lock midgard_kbase_os_mem_map_lock ++#define kbase_os_mem_map_unlock midgard_kbase_os_mem_map_unlock ++#define kbasep_cache_clean_worker midgard_kbasep_cache_clean_worker ++#define kbasep_common_test_interrupt_handlers midgard_kbasep_common_test_interrupt_handlers ++#define kbasep_complete_triggered_soft_events midgard_kbasep_complete_triggered_soft_events ++#define kbasep_debug_assert_call_hook midgard_kbasep_debug_assert_call_hook ++#define kbasep_find_enclosing_cpu_mapping_offset midgard_kbasep_find_enclosing_cpu_mapping_offset ++#define kbasep_gpu_memory_debugfs_init midgard_kbasep_gpu_memory_debugfs_init ++#define kbasep_jd_debugfs_ctx_init midgard_kbasep_jd_debugfs_ctx_init ++#define kbasep_job_slot_soft_or_hard_stop_do_action midgard_kbasep_job_slot_soft_or_hard_stop_do_action ++#define kbasep_js_add_job midgard_kbasep_js_add_job ++#define kbasep_js_atom_priority_to_relative midgard_kbasep_js_atom_priority_to_relative ++#define kbasep_js_ctx_attr_ctx_release_atom midgard_kbasep_js_ctx_attr_ctx_release_atom ++#define kbasep_js_ctx_attr_ctx_retain_atom midgard_kbasep_js_ctx_attr_ctx_retain_atom ++#define kbasep_js_ctx_attr_runpool_release_ctx midgard_kbasep_js_ctx_attr_runpool_release_ctx ++#define kbasep_js_ctx_attr_runpool_retain_ctx midgard_kbasep_js_ctx_attr_runpool_retain_ctx ++#define kbasep_js_devdata_halt midgard_kbasep_js_devdata_halt ++#define kbasep_js_devdata_init midgard_kbasep_js_devdata_init ++#define kbasep_js_devdata_term midgard_kbasep_js_devdata_term ++#define kbasep_js_kctx_init midgard_kbasep_js_kctx_init ++#define kbasep_js_kctx_term midgard_kbasep_js_kctx_term ++#define kbasep_js_relative_priority_to_atom midgard_kbasep_js_relative_priority_to_atom ++#define kbasep_js_release_privileged_ctx midgard_kbasep_js_release_privileged_ctx ++#define kbasep_js_remove_cancelled_job midgard_kbasep_js_remove_cancelled_job ++#define kbasep_js_remove_job midgard_kbasep_js_remove_job ++#define kbasep_js_resume midgard_kbasep_js_resume ++#define kbasep_js_runpool_release_ctx_and_katom_retained_state midgard_kbasep_js_runpool_release_ctx_and_katom_retained_state ++#define kbasep_js_runpool_release_ctx midgard_kbasep_js_runpool_release_ctx ++#define kbasep_js_runpool_release_ctx_nolock midgard_kbasep_js_runpool_release_ctx_nolock ++#define kbasep_js_runpool_requeue_or_kill_ctx midgard_kbasep_js_runpool_requeue_or_kill_ctx ++#define kbasep_js_schedule_privileged_ctx midgard_kbasep_js_schedule_privileged_ctx ++#define kbasep_js_suspend midgard_kbasep_js_suspend ++#define kbase_platform_early_init midgard_kbase_platform_early_init ++#define kbase_platform_rk_init_opp_table midgard_kbase_platform_rk_init_opp_table ++#define kbase_platform_rk_shutdown midgard_kbase_platform_rk_shutdown ++#define kbase_pm_always_on_policy_ops midgard_kbase_pm_always_on_policy_ops ++#define kbase_pm_cache_snoop_disable midgard_kbase_pm_cache_snoop_disable ++#define kbase_pm_cache_snoop_enable midgard_kbase_pm_cache_snoop_enable ++#define kbase_pm_ca_get_core_mask midgard_kbase_pm_ca_get_core_mask ++#define kbase_pm_ca_init midgard_kbase_pm_ca_init ++#define kbase_pm_ca_term midgard_kbase_pm_ca_term ++#define kbase_pm_clock_off midgard_kbase_pm_clock_off ++#define kbase_pm_clock_on midgard_kbase_pm_clock_on ++#define kbase_pm_coarse_demand_policy_ops midgard_kbase_pm_coarse_demand_policy_ops ++#define kbase_pm_context_active_handle_suspend midgard_kbase_pm_context_active_handle_suspend ++#define kbase_pm_context_active midgard_kbase_pm_context_active ++#define kbase_pm_context_idle midgard_kbase_pm_context_idle ++#define kbase_pm_disable_interrupts midgard_kbase_pm_disable_interrupts ++#define kbase_pm_disable_interrupts_nolock midgard_kbase_pm_disable_interrupts_nolock ++#define kbase_pm_do_poweroff midgard_kbase_pm_do_poweroff ++#define kbase_pm_do_poweron midgard_kbase_pm_do_poweron ++#define kbasep_mem_profile_debugfs_insert midgard_kbasep_mem_profile_debugfs_insert ++#define kbasep_mem_profile_debugfs_remove midgard_kbasep_mem_profile_debugfs_remove ++#define kbase_pm_enable_interrupts midgard_kbase_pm_enable_interrupts ++#define kbase_pm_get_active_cores midgard_kbase_pm_get_active_cores ++#define kbase_pm_get_policy midgard_kbase_pm_get_policy ++#define kbase_pm_get_present_cores midgard_kbase_pm_get_present_cores ++#define kbase_pm_get_ready_cores midgard_kbase_pm_get_ready_cores ++#define kbase_pm_get_trans_cores midgard_kbase_pm_get_trans_cores ++#define kbase_pm_halt midgard_kbase_pm_halt ++#define kbase_pm_init_hw midgard_kbase_pm_init_hw ++#define kbase_pm_list_policies midgard_kbase_pm_list_policies ++#define kbase_pm_metrics_update midgard_kbase_pm_metrics_update ++#define kbase_pm_policy_init midgard_kbase_pm_policy_init ++#define kbase_pm_policy_term midgard_kbase_pm_policy_term ++#define kbase_pm_power_changed midgard_kbase_pm_power_changed ++#define kbase_pm_powerup midgard_kbase_pm_powerup ++#define kbase_pm_register_access_disable midgard_kbase_pm_register_access_disable ++#define kbase_pm_register_access_enable midgard_kbase_pm_register_access_enable ++#define kbase_pm_release_gpu_cycle_counter midgard_kbase_pm_release_gpu_cycle_counter ++#define kbase_pm_release_gpu_cycle_counter_nolock midgard_kbase_pm_release_gpu_cycle_counter_nolock ++#define kbase_pm_request_gpu_cycle_counter_l2_is_on midgard_kbase_pm_request_gpu_cycle_counter_l2_is_on ++#define kbase_pm_request_gpu_cycle_counter midgard_kbase_pm_request_gpu_cycle_counter ++#define kbase_pm_reset_done midgard_kbase_pm_reset_done ++#define kbase_pm_resume midgard_kbase_pm_resume ++#define kbase_pm_set_debug_core_mask midgard_kbase_pm_set_debug_core_mask ++#define kbase_pm_set_policy midgard_kbase_pm_set_policy ++#define kbase_pm_suspend midgard_kbase_pm_suspend ++#define kbase_pm_update_active midgard_kbase_pm_update_active ++#define kbase_pm_update_cores_state midgard_kbase_pm_update_cores_state ++#define kbase_pm_update_cores_state_nolock midgard_kbase_pm_update_cores_state_nolock ++#define kbase_pm_wait_for_poweroff_complete midgard_kbase_pm_wait_for_poweroff_complete ++#define kbasep_os_process_page_usage_update midgard_kbasep_os_process_page_usage_update ++#define kbasep_platform_device_init midgard_kbasep_platform_device_init ++#define kbasep_platform_device_term midgard_kbasep_platform_device_term ++#define kbasep_pm_metrics_init midgard_kbasep_pm_metrics_init ++#define kbasep_pm_metrics_term midgard_kbasep_pm_metrics_term ++#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_NO_MALI) ++#define kbasep_regs_history_debugfs_init midgard_kbasep_regs_history_debugfs_init ++#endif /* CONFIG_DEBUG_FS */ ++#define kbasep_remove_waiting_soft_job midgard_kbasep_remove_waiting_soft_job ++#define kbase_prepare_soft_job midgard_kbase_prepare_soft_job ++#define kbase_prepare_to_reset_gpu_locked midgard_kbase_prepare_to_reset_gpu_locked ++#define kbase_prepare_to_reset_gpu midgard_kbase_prepare_to_reset_gpu ++#define kbase_process_soft_job midgard_kbase_process_soft_job ++#define kbasep_soft_job_timeout_worker midgard_kbasep_soft_job_timeout_worker ++#define kbase_region_tracker_find_region_base_address midgard_kbase_region_tracker_find_region_base_address ++#define kbase_region_tracker_find_region_enclosing_address midgard_kbase_region_tracker_find_region_enclosing_address ++#define kbase_region_tracker_init_jit midgard_kbase_region_tracker_init_jit ++#define kbase_region_tracker_init midgard_kbase_region_tracker_init ++#define kbase_region_tracker_term midgard_kbase_region_tracker_term ++#define kbase_reg_read midgard_kbase_reg_read ++#define kbase_reg_write midgard_kbase_reg_write ++#define kbase_release_device midgard_kbase_release_device ++#define kbase_release_interrupts midgard_kbase_release_interrupts ++#define kbase_reset_gpu_locked midgard_kbase_reset_gpu_locked ++#define kbase_reset_gpu midgard_kbase_reset_gpu ++#define kbase_reset_gpu_silent midgard_kbase_reset_gpu_silent ++#define kbase_resume_suspended_soft_jobs midgard_kbase_resume_suspended_soft_jobs ++#define kbase_scale_static_power midgard_kbase_scale_static_power ++#define kbase_set_custom_irq_handler midgard_kbase_set_custom_irq_handler ++#define kbase_simple_ipa_model_ops midgard_kbase_simple_ipa_model_ops ++#define kbase_soft_event_update midgard_kbase_soft_event_update ++#define kbase_soft_event_wait_callback midgard_kbase_soft_event_wait_callback ++#define kbase_sticky_resource_acquire midgard_kbase_sticky_resource_acquire ++#define kbase_sticky_resource_init midgard_kbase_sticky_resource_init ++#define kbase_sticky_resource_release midgard_kbase_sticky_resource_release ++#define kbase_sticky_resource_term midgard_kbase_sticky_resource_term ++#define kbase_sync_fence_in_cancel_wait midgard_kbase_sync_fence_in_cancel_wait ++#define kbase_sync_fence_in_dump midgard_kbase_sync_fence_in_dump ++#define kbase_sync_fence_in_from_fd midgard_kbase_sync_fence_in_from_fd ++#define kbase_sync_fence_in_info_get midgard_kbase_sync_fence_in_info_get ++#define kbase_sync_fence_in_remove midgard_kbase_sync_fence_in_remove ++#define kbase_sync_fence_in_wait midgard_kbase_sync_fence_in_wait ++#define kbase_sync_fence_out_create midgard_kbase_sync_fence_out_create ++#define kbase_sync_fence_out_info_get midgard_kbase_sync_fence_out_info_get ++#define kbase_sync_fence_out_remove midgard_kbase_sync_fence_out_remove ++#define kbase_sync_fence_out_trigger midgard_kbase_sync_fence_out_trigger ++#define kbase_sync_fence_stream_create midgard_kbase_sync_fence_stream_create ++#define kbase_sync_fence_validate midgard_kbase_sync_fence_validate ++#define kbase_sync_fence_wait_worker midgard_kbase_sync_fence_wait_worker ++#define kbase_synchronize_irqs midgard_kbase_synchronize_irqs ++#define kbase_sync_now midgard_kbase_sync_now ++#define kbase_sync_single_for_cpu midgard_kbase_sync_single_for_cpu ++#define kbase_sync_single_for_device midgard_kbase_sync_single_for_device ++#define kbase_sync_single midgard_kbase_sync_single ++#define kbase_sync_status_string midgard_kbase_sync_status_string ++#define kbase_timeline_name midgard_kbase_timeline_name ++#define __kbase_tlstream_aux_devfreq_target midgard___kbase_tlstream_aux_devfreq_target ++#define __kbase_tlstream_aux_pagefault midgard___kbase_tlstream_aux_pagefault ++#define __kbase_tlstream_aux_pagesalloc midgard___kbase_tlstream_aux_pagesalloc ++#define __kbase_tlstream_aux_pm_state midgard___kbase_tlstream_aux_pm_state ++#define __kbase_tlstream_aux_protected_enter_end midgard___kbase_tlstream_aux_protected_enter_end ++#define __kbase_tlstream_aux_protected_enter_start midgard___kbase_tlstream_aux_protected_enter_start ++#define __kbase_tlstream_aux_protected_leave_end midgard___kbase_tlstream_aux_protected_leave_end ++#define __kbase_tlstream_aux_protected_leave_start midgard___kbase_tlstream_aux_protected_leave_start ++#define kbase_tlstream_init midgard_kbase_tlstream_init ++#define __kbase_tlstream_jd_gpu_soft_reset midgard___kbase_tlstream_jd_gpu_soft_reset ++#define kbase_tlstream_term midgard_kbase_tlstream_term ++#define __kbase_tlstream_tl_attrib_as_config midgard___kbase_tlstream_tl_attrib_as_config ++#define __kbase_tlstream_tl_attrib_atom_config midgard___kbase_tlstream_tl_attrib_atom_config ++#define __kbase_tlstream_tl_attrib_atom_jit midgard___kbase_tlstream_tl_attrib_atom_jit ++#define __kbase_tlstream_tl_attrib_atom_priority midgard___kbase_tlstream_tl_attrib_atom_priority ++#define __kbase_tlstream_tl_attrib_atom_state midgard___kbase_tlstream_tl_attrib_atom_state ++#define __kbase_tlstream_tl_del_atom midgard___kbase_tlstream_tl_del_atom ++#define __kbase_tlstream_tl_del_ctx midgard___kbase_tlstream_tl_del_ctx ++#define __kbase_tlstream_tl_event_atom_softstop_ex midgard___kbase_tlstream_tl_event_atom_softstop_ex ++#define __kbase_tlstream_tl_event_atom_softstop_issue midgard___kbase_tlstream_tl_event_atom_softstop_issue ++#define __kbase_tlstream_tl_event_lpu_softstop midgard___kbase_tlstream_tl_event_lpu_softstop ++#define __kbase_tlstream_tl_new_atom midgard___kbase_tlstream_tl_new_atom ++#define __kbase_tlstream_tl_new_ctx midgard___kbase_tlstream_tl_new_ctx ++#define __kbase_tlstream_tl_nret_as_ctx midgard___kbase_tlstream_tl_nret_as_ctx ++#define __kbase_tlstream_tl_nret_atom_as midgard___kbase_tlstream_tl_nret_atom_as ++#define __kbase_tlstream_tl_nret_atom_ctx midgard___kbase_tlstream_tl_nret_atom_ctx ++#define __kbase_tlstream_tl_nret_atom_lpu midgard___kbase_tlstream_tl_nret_atom_lpu ++#define __kbase_tlstream_tl_nret_ctx_lpu midgard___kbase_tlstream_tl_nret_ctx_lpu ++#define __kbase_tlstream_tl_ret_as_ctx midgard___kbase_tlstream_tl_ret_as_ctx ++#define __kbase_tlstream_tl_ret_atom_as midgard___kbase_tlstream_tl_ret_atom_as ++#define __kbase_tlstream_tl_ret_atom_ctx midgard___kbase_tlstream_tl_ret_atom_ctx ++#define __kbase_tlstream_tl_ret_atom_lpu midgard___kbase_tlstream_tl_ret_atom_lpu ++#define __kbase_tlstream_tl_ret_ctx_lpu midgard___kbase_tlstream_tl_ret_ctx_lpu ++#define kbase_unmap_external_resource midgard_kbase_unmap_external_resource ++#define kbase_update_region_flags midgard_kbase_update_region_flags ++#define kbase_vinstr_hwcnt_reader_setup midgard_kbase_vinstr_hwcnt_reader_setup ++#define kbase_vinstr_init midgard_kbase_vinstr_init ++#define kbase_vinstr_resume midgard_kbase_vinstr_resume ++#define kbase_vinstr_suspend midgard_kbase_vinstr_suspend ++#define kbase_vinstr_term midgard_kbase_vinstr_term ++#define kbase_vmap midgard_kbase_vmap ++#define kbase_vmap_prot midgard_kbase_vmap_prot ++#define kbase_vm_ops midgard_kbase_vm_ops ++#define kbase_vunmap midgard_kbase_vunmap ++#define _mali_profiling_control midgard__mali_profiling_control ++#define platform_funcs midgard_platform_funcs ++#define pm_callbacks midgard_pm_callbacks ++#define rk_kbase_device_runtime_disable midgard_rk_kbase_device_runtime_disable ++#define rk_kbase_device_runtime_init midgard_rk_kbase_device_runtime_init ++#endif +diff --git a/drivers/gpu/arm/midgard/sconscript b/drivers/gpu/arm/midgard/sconscript +new file mode 100755 +index 000000000..ff23d7aeb +--- /dev/null ++++ b/drivers/gpu/arm/midgard/sconscript +@@ -0,0 +1,92 @@ ++# ++# (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+ block->next = allocator->first_free; -+ allocator->first_free = block; -+ allocator->num_free++; + -+ block = next; -+ } -+ DBG_MSG(3, ("%d blocks free after release call\n", allocator->num_free)); -+ up(&allocator->mutex); ++import sys ++Import('env') + -+ vfree(handle->block_array); -+ handle->block_array = NULL; -+} ++SConscript( 'tests/sconscript' ) ++ ++mock_test = 0 + ++# Fake platform is a transient solution for GPL drivers running in kernel that does not provide configuration via platform data. ++# For such kernels fake_platform_device should be set to 1. For kernels providing platform data fake_platform_device should be set to 0. ++if env['platform_config']=='devicetree' or env['platform_config']=='juno_soc': ++ fake_platform_device = 0 ++else: ++ fake_platform_device = 1 + ++# Source files required for kbase. ++kbase_src = [ ++ Glob('*.c'), ++ Glob('backend/*/*.c'), ++ Glob('internal/*/*.c'), ++ Glob('ipa/*.c') ++] + -+/* -+ * Helper function for calculating the physical base adderss of a memory block -+ */ -+static inline u32 get_phys(block_allocator *allocator, block_info *block) -+{ -+ return allocator->base + ((block - allocator->all_blocks) * UMP_BLOCK_SIZE); -+} ++if env['platform_config']=='juno_soc': ++ kbase_src += [Glob('platform/devicetree/*.c')] ++else: ++ kbase_src += [Glob('platform/%s/*.c' % env['platform_config'])] + -+static u32 block_allocator_stat(struct ump_memory_backend *backend) -+{ -+ block_allocator *allocator; -+ BUG_ON(!backend); -+ allocator = (block_allocator *)backend->ctx; -+ BUG_ON(!allocator); ++if Glob('#kernel/drivers/gpu/arm/midgard/tests/internal/src/mock') and env['unit'] == '1': ++ kbase_src += [Glob('#kernel/drivers/gpu/arm/midgard/tests/internal/src/mock/*.c')] ++ mock_test = 1 + -+ return (allocator->num_blocks - allocator->num_free) * UMP_BLOCK_SIZE; -+} -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h ++# we need platform config for GPL version using fake platform ++if fake_platform_device==1: ++ # Check if we are compiling for PBX ++ if env.KernelConfigEnabled("CONFIG_MACH_REALVIEW_PBX") and \ ++ env["platform_config"] in {"vexpress", "vexpress_6xvirtex7_10mhz"}: ++ sys.stderr.write("WARNING: Building for a PBX kernel but with platform_config=vexpress*\n") ++ # if the file platform config file is in the tpip directory then use that, otherwise use the default config directory ++ if Glob('#kernel/drivers/gpu/arm/midgard/config/tpip/*%s.c' % (env['platform_config'])): ++ kbase_src += Glob('#kernel/drivers/gpu/arm/midgard/config/tpip/*%s.c' % (env['platform_config'])) ++ else: ++ kbase_src += Glob('#kernel/drivers/gpu/arm/midgard/config/*%s.c' % (env['platform_config'])) ++ ++make_args = env.kernel_get_config_defines(ret_list = True, ++ fake = fake_platform_device) + [ ++ 'PLATFORM=%s' % env['platform'], ++ 'MALI_ERROR_INJECT_ON=%s' % env['error_inject'], ++ 'MALI_KERNEL_TEST_API=%s' % env['debug'], ++ 'MALI_UNIT_TEST=%s' % env['unit'], ++ 'MALI_RELEASE_NAME=%s' % env['mali_release_name'], ++ 'MALI_MOCK_TEST=%s' % mock_test, ++ 'MALI_CUSTOMER_RELEASE=%s' % env['release'], ++ 'MALI_INSTRUMENTATION_LEVEL=%s' % env['instr'], ++ 'MALI_COVERAGE=%s' % env['coverage'], ++ 'MALI_BUS_LOG=%s' % env['buslog'] ++] ++ ++kbase = env.BuildKernelModule('$STATIC_LIB_PATH/mali_kbase.ko', kbase_src, ++ make_args = make_args) ++ ++# Add a dependency on kds.ko. ++# Only necessary when KDS is not built into the kernel. ++# ++if env['os'] != 'android': ++ if not env.KernelConfigEnabled("CONFIG_KDS"): ++ env.Depends(kbase, '$STATIC_LIB_PATH/kds.ko') ++ ++# need Module.symvers from ump.ko build ++if int(env['ump']) == 1: ++ env.Depends(kbase, '$STATIC_LIB_PATH/ump.ko') ++ ++if 'smc_protected_mode_switcher' in env: ++ env.Depends('$STATIC_LIB_PATH/mali_kbase.ko', '$STATIC_LIB_PATH/smc_protected_mode_switcher.ko') ++ ++env.KernelObjTarget('kbase', kbase) ++ ++env.AppendUnique(BASE=['cutils_linked_list']) +diff --git a/drivers/gpu/arm/midgard/tests/Kbuild b/drivers/gpu/arm/midgard/tests/Kbuild new file mode 100755 -index 000000000000..949fd245c6af +index 000000000..b4bed0473 --- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h -@@ -0,0 +1,23 @@ ++++ b/drivers/gpu/arm/midgard/tests/Kbuild +@@ -0,0 +1,17 @@ ++# ++# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# ++ ++ ++obj-$(CONFIG_MALI_KUTF) += kutf/ ++obj-$(CONFIG_MALI_IRQ_LATENCY) += mali_kutf_irq_test/ +diff --git a/drivers/gpu/arm/midgard/tests/Kconfig b/drivers/gpu/arm/midgard/tests/Kconfig +new file mode 100755 +index 000000000..da0515c06 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/tests/Kconfig +@@ -0,0 +1,17 @@ ++# ++# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# ++ ++ ++source "drivers/gpu/arm/midgard/tests/kutf/Kconfig" ++source "drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig" +diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h +new file mode 100755 +index 000000000..0d145e42a +--- /dev/null ++++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h +@@ -0,0 +1,65 @@ +/* -+ * Copyright (C) 2010, 2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+/** -+ * @file ump_kernel_memory_backend_dedicated.h ++ ++ ++#ifndef _KERNEL_UTF_MEM_H_ ++#define _KERNEL_UTF_MEM_H_ ++ ++/* kutf_mem.h ++ * Functions for management of memory pools in the kernel. ++ * ++ * This module implements a memory pool allocator, allowing a test ++ * implementation to allocate linked allocations which can then be freed by a ++ * single free which releases all of the resources held by the entire pool. ++ * ++ * Note that it is not possible to free single resources within the pool once ++ * allocated. + */ + -+#ifndef __UMP_KERNEL_MEMORY_BACKEND_DEDICATED_H__ -+#define __UMP_KERNEL_MEMORY_BACKEND_DEDICATED_H__ ++#include + -+#include "ump_kernel_memory_backend.h" ++/** ++ * struct kutf_mempool - the memory pool context management structure ++ * @head: list head on which the allocations in this context are added to ++ * ++ */ ++struct kutf_mempool { ++ struct list_head head; ++}; + -+ump_memory_backend *ump_block_allocator_create(u32 base_address, u32 size); ++/** ++ * kutf_mempool_init() - Initialize a memory pool. ++ * @pool: Memory pool structure to initialize, provided by the user ++ * ++ * Return: zero on success ++ */ ++int kutf_mempool_init(struct kutf_mempool *pool); + -+#endif /* __UMP_KERNEL_MEMORY_BACKEND_DEDICATED_H__ */ ++/** ++ * kutf_mempool_alloc() - Allocate memory from a pool ++ * @pool: Memory pool to allocate from ++ * @size: Size of memory wanted in number of bytes ++ * ++ * Return: Pointer to memory on success, NULL on failure. ++ */ ++void *kutf_mempool_alloc(struct kutf_mempool *pool, size_t size); + -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c ++/** ++ * kutf_mempool_destroy() - Destroy a memory pool, freeing all memory within it. ++ * @pool: The memory pool to free ++ */ ++void kutf_mempool_destroy(struct kutf_mempool *pool); ++#endif /* _KERNEL_UTF_MEM_H_ */ +diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h new file mode 100755 -index 000000000000..7cd8d5d381cf +index 000000000..1cc85f1b7 --- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c -@@ -0,0 +1,235 @@ ++++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h +@@ -0,0 +1,121 @@ +/* -+ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+/* needed to detect kernel version specific code */ -+#include + -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+#include -+#else /* pre 2.6.26 the file was in the arch specific location */ -+#include -+#endif + -+#include -+#include -+#include -+#include -+#include -+#include -+#include "ump_kernel_common.h" -+#include "ump_kernel_memory_backend.h" ++#ifndef _KERNEL_UTF_RESULTSET_H_ ++#define _KERNEL_UTF_RESULTSET_H_ + ++/* kutf_resultset.h ++ * Functions and structures for handling test results and result sets. ++ * ++ * This section of the kernel UTF contains structures and functions used for the ++ * management of Results and Result Sets. ++ */ + ++/** ++ * enum kutf_result_status - Status values for a single Test error. ++ * @KUTF_RESULT_BENCHMARK: Result is a meta-result containing benchmark ++ * results. ++ * @KUTF_RESULT_SKIP: The test was skipped. ++ * @KUTF_RESULT_UNKNOWN: The test has an unknown result. ++ * @KUTF_RESULT_PASS: The test result passed. ++ * @KUTF_RESULT_DEBUG: The test result passed, but raised a debug ++ * message. ++ * @KUTF_RESULT_INFO: The test result passed, but raised ++ * an informative message. ++ * @KUTF_RESULT_WARN: The test result passed, but raised a warning ++ * message. ++ * @KUTF_RESULT_FAIL: The test result failed with a non-fatal error. ++ * @KUTF_RESULT_FATAL: The test result failed with a fatal error. ++ * @KUTF_RESULT_ABORT: The test result failed due to a non-UTF ++ * assertion failure. ++ * @KUTF_RESULT_COUNT: The current number of possible status messages. ++ */ ++enum kutf_result_status { ++ KUTF_RESULT_BENCHMARK = -3, ++ KUTF_RESULT_SKIP = -2, ++ KUTF_RESULT_UNKNOWN = -1, + -+typedef struct os_allocator { -+ struct semaphore mutex; -+ u32 num_pages_max; /**< Maximum number of pages to allocate from the OS */ -+ u32 num_pages_allocated; /**< Number of pages allocated from the OS */ -+} os_allocator; ++ KUTF_RESULT_PASS = 0, ++ KUTF_RESULT_DEBUG = 1, ++ KUTF_RESULT_INFO = 2, ++ KUTF_RESULT_WARN = 3, ++ KUTF_RESULT_FAIL = 4, ++ KUTF_RESULT_FATAL = 5, ++ KUTF_RESULT_ABORT = 6, + ++ KUTF_RESULT_COUNT ++}; + ++/* The maximum size of a kutf_result_status result when ++ * converted to a string ++ */ ++#define KUTF_ERROR_MAX_NAME_SIZE 21 + -+static void os_free(void *ctx, ump_dd_mem *descriptor); -+static int os_allocate(void *ctx, ump_dd_mem *descriptor); -+static void os_memory_backend_destroy(ump_memory_backend *backend); -+static u32 os_stat(struct ump_memory_backend *backend); ++#ifdef __KERNEL__ + ++#include + ++/** ++ * struct kutf_result - Represents a single test result. ++ * @node: Next result in the list of results. ++ * @status: The status summary (pass / warn / fail / etc). ++ * @message: A more verbose status message. ++ */ ++struct kutf_result { ++ struct list_head node; ++ enum kutf_result_status status; ++ const char *message; ++}; + -+/* -+ * Create OS memory backend ++/** ++ * kutf_create_result_set() - Create a new result set ++ * to which results can be added. ++ * ++ * Return: The created resultset. + */ -+ump_memory_backend *ump_os_memory_backend_create(const int max_allocation) -+{ -+ ump_memory_backend *backend; -+ os_allocator *info; ++struct kutf_result_set *kutf_create_result_set(void); + -+ info = kmalloc(sizeof(os_allocator), GFP_KERNEL); -+ if (NULL == info) { -+ return NULL; -+ } ++/** ++ * kutf_add_result() - Add a result to the end of an existing resultset. ++ * ++ * @mempool: The memory pool to allocate the result storage from. ++ * @set: The resultset to add the result to. ++ * @status: The result status to add. ++ * @message: The result message to add. ++ */ ++void kutf_add_result(struct kutf_mempool *mempool, struct kutf_result_set *set, ++ enum kutf_result_status status, const char *message); + -+ info->num_pages_max = max_allocation >> PAGE_SHIFT; -+ info->num_pages_allocated = 0; ++/** ++ * kutf_remove_result() - Remove a result from the head of a resultset. ++ * @set: The resultset. ++ * ++ * Return: result or NULL if there are no further results in the resultset. ++ */ ++struct kutf_result *kutf_remove_result( ++ struct kutf_result_set *set); + -+ sema_init(&info->mutex, 1); ++/** ++ * kutf_destroy_result_set() - Free a previously created resultset. ++ * ++ * @results: The result set whose resources to free. ++ */ ++void kutf_destroy_result_set(struct kutf_result_set *results); + -+ backend = kmalloc(sizeof(ump_memory_backend), GFP_KERNEL); -+ if (NULL == backend) { -+ kfree(info); -+ return NULL; -+ } ++#endif /* __KERNEL__ */ + -+ backend->ctx = info; -+ backend->allocate = os_allocate; -+ backend->release = os_free; -+ backend->shutdown = os_memory_backend_destroy; -+ backend->stat = os_stat; -+ backend->pre_allocate_physical_check = NULL; -+ backend->adjust_to_mali_phys = NULL; ++#endif /* _KERNEL_UTF_RESULTSET_H_ */ +diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h +new file mode 100755 +index 000000000..754c3adb1 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h +@@ -0,0 +1,508 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ return backend; -+} + + ++#ifndef _KERNEL_UTF_SUITE_H_ ++#define _KERNEL_UTF_SUITE_H_ + -+/* -+ * Destroy specified OS memory backend ++/* kutf_suite.h ++ * Functions for management of test suites. ++ * ++ * This collection of data structures, macros, and functions are used to ++ * create Test Suites, Tests within those Test Suites, and Fixture variants ++ * of each test. + */ -+static void os_memory_backend_destroy(ump_memory_backend *backend) -+{ -+ os_allocator *info = (os_allocator *)backend->ctx; + -+ DBG_MSG_IF(1, 0 != info->num_pages_allocated, ("%d pages still in use during shutdown\n", info->num_pages_allocated)); ++#include ++#include + -+ kfree(info); -+ kfree(backend); -+} ++/** ++ * Pseudo-flag indicating an absence of any specified test class. Note that ++ * tests should not be annotated with this constant as it is simply a zero ++ * value; tests without a more specific class must be marked with the flag ++ * KUTF_F_TEST_GENERIC. ++ */ ++#define KUTF_F_TEST_NONE ((unsigned int)(0)) + ++/** ++ * Class indicating this test is a smoke test. ++ * A given set of smoke tests should be quick to run, enabling rapid turn-around ++ * of "regress-on-commit" test runs. ++ */ ++#define KUTF_F_TEST_SMOKETEST ((unsigned int)(1 << 1)) + ++/** ++ * Class indicating this test is a performance test. ++ * These tests typically produce a performance metric, such as "time to run" or ++ * "frames per second", ++ */ ++#define KUTF_F_TEST_PERFORMANCE ((unsigned int)(1 << 2)) + -+/* -+ * Allocate UMP memory ++/** ++ * Class indicating that this test is a deprecated test. ++ * These tests have typically been replaced by an alternative test which is ++ * more efficient, or has better coverage. + */ -+static int os_allocate(void *ctx, ump_dd_mem *descriptor) -+{ -+ u32 left; -+ os_allocator *info; -+ int pages_allocated = 0; -+ int is_cached; ++#define KUTF_F_TEST_DEPRECATED ((unsigned int)(1 << 3)) + -+ BUG_ON(!descriptor); -+ BUG_ON(!ctx); ++/** ++ * Class indicating that this test is a known failure. ++ * These tests have typically been run and failed, but marking them as a known ++ * failure means it is easier to triage results. ++ * ++ * It is typically more convenient to triage known failures using the ++ * results database and web UI, as this means there is no need to modify the ++ * test code. ++ */ ++#define KUTF_F_TEST_EXPECTED_FAILURE ((unsigned int)(1 << 4)) + -+ info = (os_allocator *)ctx; -+ left = descriptor->size_bytes; -+ is_cached = descriptor->is_cached; ++/** ++ * Class indicating that this test is a generic test, which is not a member of ++ * a more specific test class. Tests which are not created with a specific set ++ * of filter flags by the user are assigned this test class by default. ++ */ ++#define KUTF_F_TEST_GENERIC ((unsigned int)(1 << 5)) + -+ if (down_interruptible(&info->mutex)) { -+ DBG_MSG(1, ("Failed to get mutex in os_free\n")); -+ return 0; /* failure */ -+ } ++/** ++ * Class indicating this test is a resource allocation failure test. ++ * A resource allocation failure test will test that an error code is ++ * correctly propagated when an allocation fails. ++ */ ++#define KUTF_F_TEST_RESFAIL ((unsigned int)(1 << 6)) + -+ descriptor->backend_info = NULL; -+ descriptor->nr_blocks = ((left + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)) >> PAGE_SHIFT; ++/** ++ * Additional flag indicating that this test is an expected failure when ++ * run in resource failure mode. These tests are never run when running ++ * the low resource mode. ++ */ ++#define KUTF_F_TEST_EXPECTED_FAILURE_RF ((unsigned int)(1 << 7)) + -+ DBG_MSG(5, ("Allocating page array. Size: %lu\n", descriptor->nr_blocks * sizeof(ump_dd_physical_block))); ++/** ++ * Flag reserved for user-defined filter zero. ++ */ ++#define KUTF_F_TEST_USER_0 ((unsigned int)(1 << 24)) + -+ descriptor->block_array = (ump_dd_physical_block *)vmalloc(sizeof(ump_dd_physical_block) * descriptor->nr_blocks); -+ if (NULL == descriptor->block_array) { -+ up(&info->mutex); -+ DBG_MSG(1, ("Block array could not be allocated\n")); -+ return 0; /* failure */ -+ } ++/** ++ * Flag reserved for user-defined filter one. ++ */ ++#define KUTF_F_TEST_USER_1 ((unsigned int)(1 << 25)) + -+ while (left > 0 && ((info->num_pages_allocated + pages_allocated) < info->num_pages_max)) { -+ struct page *new_page; ++/** ++ * Flag reserved for user-defined filter two. ++ */ ++#define KUTF_F_TEST_USER_2 ((unsigned int)(1 << 26)) + -+ if (is_cached) { -+ new_page = alloc_page(GFP_HIGHUSER | __GFP_ZERO | __GFP_REPEAT | __GFP_NOWARN); -+ } else { -+ new_page = alloc_page(GFP_HIGHUSER | __GFP_ZERO | __GFP_REPEAT | __GFP_NOWARN | __GFP_COLD); -+ } -+ if (NULL == new_page) { -+ break; -+ } ++/** ++ * Flag reserved for user-defined filter three. ++ */ ++#define KUTF_F_TEST_USER_3 ((unsigned int)(1 << 27)) + -+ /* Ensure page caches are flushed. */ -+ if (is_cached) { -+ descriptor->block_array[pages_allocated].addr = page_to_phys(new_page); -+ descriptor->block_array[pages_allocated].size = PAGE_SIZE; -+ } else { -+ descriptor->block_array[pages_allocated].addr = dma_map_page(NULL, new_page, 0, PAGE_SIZE, DMA_BIDIRECTIONAL); -+ descriptor->block_array[pages_allocated].size = PAGE_SIZE; -+ } ++/** ++ * Flag reserved for user-defined filter four. ++ */ ++#define KUTF_F_TEST_USER_4 ((unsigned int)(1 << 28)) + -+ DBG_MSG(5, ("Allocated page 0x%08lx cached: %d\n", descriptor->block_array[pages_allocated].addr, is_cached)); ++/** ++ * Flag reserved for user-defined filter five. ++ */ ++#define KUTF_F_TEST_USER_5 ((unsigned int)(1 << 29)) + -+ if (left < PAGE_SIZE) { -+ left = 0; -+ } else { -+ left -= PAGE_SIZE; -+ } ++/** ++ * Flag reserved for user-defined filter six. ++ */ ++#define KUTF_F_TEST_USER_6 ((unsigned int)(1 << 30)) + -+ pages_allocated++; -+ } ++/** ++ * Flag reserved for user-defined filter seven. ++ */ ++#define KUTF_F_TEST_USER_7 ((unsigned int)(1 << 31)) + -+ DBG_MSG(5, ("Alloce for ID:%2d got %d pages, cached: %d\n", descriptor->secure_id, pages_allocated)); ++/** ++ * Pseudo-flag indicating that all test classes should be executed. ++ */ ++#define KUTF_F_TEST_ALL ((unsigned int)(0xFFFFFFFFU)) + -+ if (left) { -+ DBG_MSG(1, ("Failed to allocate needed pages\n")); ++/** ++ * union kutf_callback_data - Union used to store test callback data ++ * @ptr_value: pointer to the location where test callback data ++ * are stored ++ * @u32_value: a number which represents test callback data ++ */ ++union kutf_callback_data { ++ void *ptr_value; ++ u32 u32_value; ++}; + -+ while (pages_allocated) { -+ pages_allocated--; -+ if (!is_cached) { -+ dma_unmap_page(NULL, descriptor->block_array[pages_allocated].addr, PAGE_SIZE, DMA_BIDIRECTIONAL); -+ } -+ __free_page(pfn_to_page(descriptor->block_array[pages_allocated].addr >> PAGE_SHIFT)); -+ } ++/** ++ * struct kutf_context - Structure representing a kernel test context ++ * @suite: Convenience pointer to the suite this context ++ * is running ++ * @test_fix: The fixture that is being run in this context ++ * @fixture_pool: The memory pool used for the duration of ++ * the fixture/text context. ++ * @fixture: The user provided fixture structure. ++ * @fixture_index: The index (id) of the current fixture. ++ * @fixture_name: The name of the current fixture (or NULL if unnamed). ++ * @test_data: Any user private data associated with this test ++ * @result_set: All the results logged by this test context ++ * @status: The status of the currently running fixture. ++ * @expected_status: The expected status on exist of the currently ++ * running fixture. ++ */ ++struct kutf_context { ++ struct kutf_suite *suite; ++ struct kutf_test_fixture *test_fix; ++ struct kutf_mempool fixture_pool; ++ void *fixture; ++ unsigned int fixture_index; ++ const char *fixture_name; ++ union kutf_callback_data test_data; ++ struct kutf_result_set *result_set; ++ enum kutf_result_status status; ++ enum kutf_result_status expected_status; ++}; + -+ up(&info->mutex); ++/** ++ * struct kutf_suite - Structure representing a kernel test suite ++ * @app: The application this suite belongs to. ++ * @name: The name of this suite. ++ * @suite_data: Any user private data associated with this ++ * suite. ++ * @create_fixture: Function used to create a new fixture instance ++ * @remove_fixture: Function used to destroy a new fixture instance ++ * @fixture_variants: The number of variants (must be at least 1). ++ * @suite_default_flags: Suite global filter flags which are set on ++ * all tests. ++ * @node: List node for suite_list ++ * @dir: The debugfs directory for this suite ++ * @test_list: List head to store all the tests which are ++ * part of this suite ++ */ ++struct kutf_suite { ++ struct kutf_application *app; ++ const char *name; ++ union kutf_callback_data suite_data; ++ void *(*create_fixture)(struct kutf_context *context); ++ void (*remove_fixture)(struct kutf_context *context); ++ unsigned int fixture_variants; ++ unsigned int suite_default_flags; ++ struct list_head node; ++ struct dentry *dir; ++ struct list_head test_list; ++}; + -+ return 0; /* failure */ -+ } ++/* ============================================================================ ++ Application functions ++============================================================================ */ + -+ info->num_pages_allocated += pages_allocated; ++/** ++ * kutf_create_application() - Create an in kernel test application. ++ * @name: The name of the test application. ++ * ++ * Return: pointer to the kutf_application on success or NULL ++ * on failure ++ */ ++struct kutf_application *kutf_create_application(const char *name); + -+ DBG_MSG(6, ("%d out of %d pages now allocated\n", info->num_pages_allocated, info->num_pages_max)); ++/** ++ * kutf_destroy_application() - Destroy an in kernel test application. ++ * ++ * @app: The test application to destroy. ++ */ ++void kutf_destroy_application(struct kutf_application *app); + -+ up(&info->mutex); ++/* ============================================================================ ++ Suite functions ++============================================================================ */ + -+ return 1; /* success*/ -+} ++/** ++ * kutf_create_suite() - Create a kernel test suite. ++ * @app: The test application to create the suite in. ++ * @name: The name of the suite. ++ * @fixture_count: The number of fixtures to run over the test ++ * functions in this suite ++ * @create_fixture: Callback used to create a fixture. The returned value ++ * is stored in the fixture pointer in the context for ++ * use in the test functions. ++ * @remove_fixture: Callback used to remove a previously created fixture. ++ * ++ * Suite names must be unique. Should two suites with the same name be ++ * registered with the same application then this function will fail, if they ++ * are registered with different applications then the function will not detect ++ * this and the call will succeed. ++ * ++ * Return: pointer to the created kutf_suite on success or NULL ++ * on failure ++ */ ++struct kutf_suite *kutf_create_suite( ++ struct kutf_application *app, ++ const char *name, ++ unsigned int fixture_count, ++ void *(*create_fixture)(struct kutf_context *context), ++ void (*remove_fixture)(struct kutf_context *context)); + ++/** ++ * kutf_create_suite_with_filters() - Create a kernel test suite with user ++ * defined default filters. ++ * @app: The test application to create the suite in. ++ * @name: The name of the suite. ++ * @fixture_count: The number of fixtures to run over the test ++ * functions in this suite ++ * @create_fixture: Callback used to create a fixture. The returned value ++ * is stored in the fixture pointer in the context for ++ * use in the test functions. ++ * @remove_fixture: Callback used to remove a previously created fixture. ++ * @filters: Filters to apply to a test if it doesn't provide its own ++ * ++ * Suite names must be unique. Should two suites with the same name be ++ * registered with the same application then this function will fail, if they ++ * are registered with different applications then the function will not detect ++ * this and the call will succeed. ++ * ++ * Return: pointer to the created kutf_suite on success or NULL on failure ++ */ ++struct kutf_suite *kutf_create_suite_with_filters( ++ struct kutf_application *app, ++ const char *name, ++ unsigned int fixture_count, ++ void *(*create_fixture)(struct kutf_context *context), ++ void (*remove_fixture)(struct kutf_context *context), ++ unsigned int filters); + -+/* -+ * Free specified UMP memory ++/** ++ * kutf_create_suite_with_filters_and_data() - Create a kernel test suite with ++ * user defined default filters. ++ * @app: The test application to create the suite in. ++ * @name: The name of the suite. ++ * @fixture_count: The number of fixtures to run over the test ++ * functions in this suite ++ * @create_fixture: Callback used to create a fixture. The returned value ++ * is stored in the fixture pointer in the context for ++ * use in the test functions. ++ * @remove_fixture: Callback used to remove a previously created fixture. ++ * @filters: Filters to apply to a test if it doesn't provide its own ++ * @suite_data: Suite specific callback data, provided during the ++ * running of the test in the kutf_context ++ * ++ * Return: pointer to the created kutf_suite on success or NULL ++ * on failure + */ -+static void os_free(void *ctx, ump_dd_mem *descriptor) -+{ -+ os_allocator *info; -+ int i; ++struct kutf_suite *kutf_create_suite_with_filters_and_data( ++ struct kutf_application *app, ++ const char *name, ++ unsigned int fixture_count, ++ void *(*create_fixture)(struct kutf_context *context), ++ void (*remove_fixture)(struct kutf_context *context), ++ unsigned int filters, ++ union kutf_callback_data suite_data); + -+ BUG_ON(!ctx); -+ BUG_ON(!descriptor); ++/** ++ * kutf_add_test() - Add a test to a kernel test suite. ++ * @suite: The suite to add the test to. ++ * @id: The ID of the test. ++ * @name: The name of the test. ++ * @execute: Callback to the test function to run. ++ * ++ * Note: As no filters are provided the test will use the suite filters instead ++ */ ++void kutf_add_test(struct kutf_suite *suite, ++ unsigned int id, ++ const char *name, ++ void (*execute)(struct kutf_context *context)); + -+ info = (os_allocator *)ctx; ++/** ++ * kutf_add_test_with_filters() - Add a test to a kernel test suite with filters ++ * @suite: The suite to add the test to. ++ * @id: The ID of the test. ++ * @name: The name of the test. ++ * @execute: Callback to the test function to run. ++ * @filters: A set of filtering flags, assigning test categories. ++ */ ++void kutf_add_test_with_filters(struct kutf_suite *suite, ++ unsigned int id, ++ const char *name, ++ void (*execute)(struct kutf_context *context), ++ unsigned int filters); + -+ BUG_ON(descriptor->nr_blocks > info->num_pages_allocated); ++/** ++ * kutf_add_test_with_filters_and_data() - Add a test to a kernel test suite ++ * with filters. ++ * @suite: The suite to add the test to. ++ * @id: The ID of the test. ++ * @name: The name of the test. ++ * @execute: Callback to the test function to run. ++ * @filters: A set of filtering flags, assigning test categories. ++ * @test_data: Test specific callback data, provoided during the ++ * running of the test in the kutf_context ++ */ ++void kutf_add_test_with_filters_and_data( ++ struct kutf_suite *suite, ++ unsigned int id, ++ const char *name, ++ void (*execute)(struct kutf_context *context), ++ unsigned int filters, ++ union kutf_callback_data test_data); + -+ if (down_interruptible(&info->mutex)) { -+ DBG_MSG(1, ("Failed to get mutex in os_free\n")); -+ return; -+ } ++/* ============================================================================ ++ Test functions ++============================================================================ */ ++/** ++ * kutf_test_log_result_external() - Log a result which has been created ++ * externally into a in a standard form ++ * recognized by the log parser. ++ * @context: The test context the test is running in ++ * @message: The message for this result ++ * @new_status: The result status of this log message ++ */ ++void kutf_test_log_result_external( ++ struct kutf_context *context, ++ const char *message, ++ enum kutf_result_status new_status); + -+ DBG_MSG(5, ("Releasing %lu OS pages\n", descriptor->nr_blocks)); ++/** ++ * kutf_test_expect_abort() - Tell the kernel that you expect the current ++ * fixture to produce an abort. ++ * @context: The test context this test is running in. ++ */ ++void kutf_test_expect_abort(struct kutf_context *context); + -+ info->num_pages_allocated -= descriptor->nr_blocks; ++/** ++ * kutf_test_expect_fatal() - Tell the kernel that you expect the current ++ * fixture to produce a fatal error. ++ * @context: The test context this test is running in. ++ */ ++void kutf_test_expect_fatal(struct kutf_context *context); + -+ up(&info->mutex); ++/** ++ * kutf_test_expect_fail() - Tell the kernel that you expect the current ++ * fixture to fail. ++ * @context: The test context this test is running in. ++ */ ++void kutf_test_expect_fail(struct kutf_context *context); + -+ for (i = 0; i < descriptor->nr_blocks; i++) { -+ DBG_MSG(6, ("Freeing physical page. Address: 0x%08lx\n", descriptor->block_array[i].addr)); -+ if (! descriptor->is_cached) { -+ dma_unmap_page(NULL, descriptor->block_array[i].addr, PAGE_SIZE, DMA_BIDIRECTIONAL); -+ } -+ __free_page(pfn_to_page(descriptor->block_array[i].addr >> PAGE_SHIFT)); -+ } ++/** ++ * kutf_test_expect_warn() - Tell the kernel that you expect the current ++ * fixture to produce a warning. ++ * @context: The test context this test is running in. ++ */ ++void kutf_test_expect_warn(struct kutf_context *context); + -+ vfree(descriptor->block_array); -+} ++/** ++ * kutf_test_expect_pass() - Tell the kernel that you expect the current ++ * fixture to pass. ++ * @context: The test context this test is running in. ++ */ ++void kutf_test_expect_pass(struct kutf_context *context); + ++/** ++ * kutf_test_skip() - Tell the kernel that the test should be skipped. ++ * @context: The test context this test is running in. ++ */ ++void kutf_test_skip(struct kutf_context *context); + -+static u32 os_stat(struct ump_memory_backend *backend) -+{ -+ os_allocator *info; -+ info = (os_allocator *)backend->ctx; -+ return info->num_pages_allocated * _MALI_OSK_MALI_PAGE_SIZE; -+} -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h -new file mode 100755 -index 000000000000..d21d503512ec ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h -@@ -0,0 +1,23 @@ -+/* -+ * Copyright (C) 2010, 2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++/** ++ * kutf_test_skip_msg() - Tell the kernel that this test has been skipped, ++ * supplying a reason string. ++ * @context: The test context this test is running in. ++ * @message: A message string containing the reason for the skip. ++ * ++ * Note: The message must not be freed during the lifetime of the test run. ++ * This means it should either be a prebaked string, or if a dynamic string ++ * is required it must be created with kutf_dsprintf which will store ++ * the resultant string in a buffer who's lifetime is the same as the test run. + */ ++void kutf_test_skip_msg(struct kutf_context *context, const char *message); + +/** -+ * @file ump_kernel_memory_backend_os.h ++ * kutf_test_pass() - Tell the kernel that this test has passed. ++ * @context: The test context this test is running in. ++ * @message: A message string containing the reason for the pass. ++ * ++ * Note: The message must not be freed during the lifetime of the test run. ++ * This means it should either be a pre-baked string, or if a dynamic string ++ * is required it must be created with kutf_dsprintf which will store ++ * the resultant string in a buffer who's lifetime is the same as the test run. + */ ++void kutf_test_pass(struct kutf_context *context, char const *message); + -+#ifndef __UMP_KERNEL_MEMORY_BACKEND_OS_H__ -+#define __UMP_KERNEL_MEMORY_BACKEND_OS_H__ ++/** ++ * kutf_test_debug() - Send a debug message ++ * @context: The test context this test is running in. ++ * @message: A message string containing the debug information. ++ * ++ * Note: The message must not be freed during the lifetime of the test run. ++ * This means it should either be a pre-baked string, or if a dynamic string ++ * is required it must be created with kutf_dsprintf which will store ++ * the resultant string in a buffer who's lifetime is the same as the test run. ++ */ ++void kutf_test_debug(struct kutf_context *context, char const *message); + -+#include "ump_kernel_memory_backend.h" ++/** ++ * kutf_test_info() - Send an information message ++ * @context: The test context this test is running in. ++ * @message: A message string containing the information message. ++ * ++ * Note: The message must not be freed during the lifetime of the test run. ++ * This means it should either be a pre-baked string, or if a dynamic string ++ * is required it must be created with kutf_dsprintf which will store ++ * the resultant string in a buffer who's lifetime is the same as the test run. ++ */ ++void kutf_test_info(struct kutf_context *context, char const *message); + -+ump_memory_backend *ump_os_memory_backend_create(const int max_allocation); ++/** ++ * kutf_test_warn() - Send a warning message ++ * @context: The test context this test is running in. ++ * @message: A message string containing the warning message. ++ * ++ * Note: The message must not be freed during the lifetime of the test run. ++ * This means it should either be a pre-baked string, or if a dynamic string ++ * is required it must be created with kutf_dsprintf which will store ++ * the resultant string in a buffer who's lifetime is the same as the test run. ++ */ ++void kutf_test_warn(struct kutf_context *context, char const *message); + -+#endif /* __UMP_KERNEL_MEMORY_BACKEND_OS_H__ */ ++/** ++ * kutf_test_fail() - Tell the kernel that a test has failed ++ * @context: The test context this test is running in. ++ * @message: A message string containing the failure message. ++ * ++ * Note: The message must not be freed during the lifetime of the test run. ++ * This means it should either be a pre-baked string, or if a dynamic string ++ * is required it must be created with kutf_dsprintf which will store ++ * the resultant string in a buffer who's lifetime is the same as the test run. ++ */ ++void kutf_test_fail(struct kutf_context *context, char const *message); + -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c ++/** ++ * kutf_test_fatal() - Tell the kernel that a test has triggered a fatal error ++ * @context: The test context this test is running in. ++ * @message: A message string containing the fatal error message. ++ * ++ * Note: The message must not be freed during the lifetime of the test run. ++ * This means it should either be a pre-baked string, or if a dynamic string ++ * is required it must be created with kutf_dsprintf which will store ++ * the resultant string in a buffer who's lifetime is the same as the test run. ++ */ ++void kutf_test_fatal(struct kutf_context *context, char const *message); ++ ++/** ++ * kutf_test_abort() - Tell the kernel that a test triggered an abort in the test ++ * ++ * @context: The test context this test is running in. ++ */ ++void kutf_test_abort(struct kutf_context *context); ++ ++#endif /* _KERNEL_UTF_SUITE_H_ */ +diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h new file mode 100755 -index 000000000000..6be0f86440de +index 000000000..c458c1f73 --- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c -@@ -0,0 +1,222 @@ ++++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h +@@ -0,0 +1,55 @@ +/* -+ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include "mali_kernel_common.h" -+#include "mali_osk.h" -+#include "ump_osk.h" -+#include "ump_kernel_common.h" -+#include "ump_kernel_types.h" -+#include "ump_kernel_random_mapping.h" + -+#include -+#include -+#include -+#include + ++#ifndef _KERNEL_UTF_UTILS_H_ ++#define _KERNEL_UTF_UTILS_H_ + -+static ump_dd_mem *search(struct rb_root *root, int id) -+{ -+ struct rb_node *node = root->rb_node; ++/* kutf_utils.h ++ * Utilities for the kernel UTF test infrastructure. ++ * ++ * This collection of library functions are provided for use by kernel UTF ++ * and users of kernel UTF which don't directly fit within the other ++ * code modules. ++ */ + -+ while (node) { -+ ump_dd_mem *e = container_of(node, ump_dd_mem, node); ++#include + -+ if (id < e->secure_id) { -+ node = node->rb_left; -+ } else if (id > e->secure_id) { -+ node = node->rb_right; -+ } else { -+ return e; -+ } -+ } ++/** ++ * Maximum size of the message strings within kernel UTF, messages longer then ++ * this will be truncated. ++ */ ++#define KUTF_MAX_DSPRINTF_LEN 1024 + -+ return NULL; -+} ++/** ++ * kutf_dsprintf() - dynamic sprintf ++ * @pool: memory pool to allocate from ++ * @fmt: The format string describing the string to document. ++ * @... The parameters to feed in to the format string. ++ * ++ * This function implements sprintf which dynamically allocates memory to store ++ * the string. The library will free the memory containing the string when the ++ * result set is cleared or destroyed. ++ * ++ * Note The returned string may be truncated to fit an internal temporary ++ * buffer, which is KUTF_MAX_DSPRINTF_LEN bytes in length. ++ * ++ * Return: Returns pointer to allocated string, or NULL on error. ++ */ ++const char *kutf_dsprintf(struct kutf_mempool *pool, ++ const char *fmt, ...); + -+static mali_bool insert(struct rb_root *root, int id, ump_dd_mem *mem) -+{ -+ struct rb_node **new = &(root->rb_node); -+ struct rb_node *parent = NULL; ++#endif /* _KERNEL_UTF_UTILS_H_ */ +diff --git a/drivers/gpu/arm/midgard/tests/kutf/Kbuild b/drivers/gpu/arm/midgard/tests/kutf/Kbuild +new file mode 100755 +index 000000000..6b840c2ef +--- /dev/null ++++ b/drivers/gpu/arm/midgard/tests/kutf/Kbuild +@@ -0,0 +1,20 @@ ++# ++# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+ while (*new) { -+ ump_dd_mem *this = container_of(*new, ump_dd_mem, node); + -+ parent = *new; -+ if (id < this->secure_id) { -+ new = &((*new)->rb_left); -+ } else if (id > this->secure_id) { -+ new = &((*new)->rb_right); -+ } else { -+ printk(KERN_ERR "UMP: ID already used %x\n", id); -+ return MALI_FALSE; -+ } -+ } ++ccflags-y += -I$(src)/../include + -+ rb_link_node(&mem->node, parent, new); -+ rb_insert_color(&mem->node, root); ++obj-$(CONFIG_MALI_KUTF) += kutf.o + -+ return MALI_TRUE; -+} ++kutf-y := kutf_mem.o kutf_resultset.o kutf_suite.o kutf_utils.o +diff --git a/drivers/gpu/arm/midgard/tests/kutf/Kconfig b/drivers/gpu/arm/midgard/tests/kutf/Kconfig +new file mode 100755 +index 000000000..84364716a +--- /dev/null ++++ b/drivers/gpu/arm/midgard/tests/kutf/Kconfig +@@ -0,0 +1,22 @@ ++# ++# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + + -+ump_random_mapping *ump_random_mapping_create(void) -+{ -+ ump_random_mapping *map = _mali_osk_calloc(1, sizeof(ump_random_mapping)); + -+ if (NULL == map) -+ return NULL; ++config MALI_KUTF ++ tristate "Mali Kernel Unit Test Framework" ++ default n ++ help ++ Enables MALI testing framework. To compile it as a module, ++ choose M here - this will generate a single module called kutf. +diff --git a/drivers/gpu/arm/midgard/tests/kutf/Makefile b/drivers/gpu/arm/midgard/tests/kutf/Makefile +new file mode 100755 +index 000000000..010c92ca3 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/tests/kutf/Makefile +@@ -0,0 +1,29 @@ ++# ++# (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+ map->lock = _mali_osk_mutex_rw_init(_MALI_OSK_LOCKFLAG_ORDERED, -+ _MALI_OSK_LOCK_ORDER_DESCRIPTOR_MAP); -+ if (NULL != map->lock) { -+ map->root = RB_ROOT; -+#if UMP_RANDOM_MAP_DELAY -+ map->failed.count = 0; -+ map->failed.timestamp = jiffies; -+#endif -+ return map; -+ } -+ return NULL; -+} + -+void ump_random_mapping_destroy(ump_random_mapping *map) -+{ -+ _mali_osk_mutex_rw_term(map->lock); -+ _mali_osk_free(map); -+} ++# linux build system bootstrap for out-of-tree module + -+int ump_random_mapping_insert(ump_random_mapping *map, ump_dd_mem *mem) -+{ -+ _mali_osk_mutex_rw_wait(map->lock, _MALI_OSK_LOCKMODE_RW); ++# default to building for the host ++ARCH ?= $(shell uname -m) + -+ while (1) { -+ u32 id; ++ifeq ($(KDIR),) ++$(error Must specify KDIR to point to the kernel to target)) ++endif + -+ get_random_bytes(&id, sizeof(id)); ++all: ++ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) $(SCONS_CONFIGS) EXTRA_CFLAGS=-I$(CURDIR)/../include modules + -+ /* Try a new random number if id happened to be the invalid -+ * secure ID (-1). */ -+ if (unlikely(id == UMP_INVALID_SECURE_ID)) -+ continue; ++clean: ++ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean +diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c +new file mode 100755 +index 000000000..5408e57d4 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c +@@ -0,0 +1,94 @@ ++/* ++ * ++ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ + -+ /* Insert into the tree. If the id was already in use, get a -+ * new random id and try again. */ -+ if (insert(&map->root, id, mem)) { -+ mem->secure_id = id; -+ break; -+ } -+ } -+ _mali_osk_mutex_rw_signal(map->lock, _MALI_OSK_LOCKMODE_RW); + -+ return 0; -+} + -+ump_dd_mem *ump_random_mapping_get(ump_random_mapping *map, int id) -+{ -+ ump_dd_mem *mem = NULL; -+#if UMP_RANDOM_MAP_DELAY -+ int do_delay = 0; -+#endif ++/* Kernel UTF memory management functions */ + -+ DEBUG_ASSERT(map); ++#include ++#include ++#include + -+ _mali_osk_mutex_rw_wait(map->lock, _MALI_OSK_LOCKMODE_RO); -+ mem = search(&map->root, id); ++#include + -+ if (unlikely(NULL == mem)) { -+#if UMP_RANDOM_MAP_DELAY -+ map->failed.count++; + -+ if (time_is_before_jiffies(map->failed.timestamp + -+ UMP_FAILED_LOOKUP_DELAY * HZ)) { -+ /* If it is a long time since last failure, reset -+ * the counter and skip the delay this time. */ -+ map->failed.count = 0; -+ } else if (map->failed.count > UMP_FAILED_LOOKUPS_ALLOWED) { -+ do_delay = 1; -+ } ++/** ++ * struct kutf_alloc_entry - Structure representing an allocation. ++ * @node: List node for use with kutf_mempool. ++ * @data: Data area of the allocation ++ */ ++struct kutf_alloc_entry { ++ struct list_head node; ++ u8 data[0]; ++}; + -+ map->failed.timestamp = jiffies; -+#endif /* UMP_RANDOM_MAP_DELAY */ -+ } else { -+ ump_dd_reference_add(mem); ++int kutf_mempool_init(struct kutf_mempool *pool) ++{ ++ if (!pool) { ++ pr_err("NULL pointer passed to %s\n", __func__); ++ return -1; + } -+ _mali_osk_mutex_rw_signal(map->lock, _MALI_OSK_LOCKMODE_RO); + -+#if UMP_RANDOM_MAP_DELAY -+ if (do_delay) { -+ /* Apply delay */ -+ schedule_timeout_killable(UMP_FAILED_LOOKUP_DELAY); -+ } -+#endif /* UMP_RANDOM_MAP_DELAY */ ++ INIT_LIST_HEAD(&pool->head); + -+ return mem; ++ return 0; +} ++EXPORT_SYMBOL(kutf_mempool_init); + -+static ump_dd_mem *ump_random_mapping_remove_internal(ump_random_mapping *map, int id) ++void kutf_mempool_destroy(struct kutf_mempool *pool) +{ -+ ump_dd_mem *mem = NULL; -+ -+ mem = search(&map->root, id); ++ struct list_head *remove; ++ struct list_head *tmp; + -+ if (mem) { -+ rb_erase(&mem->node, &map->root); ++ if (!pool) { ++ pr_err("NULL pointer passed to %s\n", __func__); ++ return; + } + -+ return mem; ++ list_for_each_safe(remove, tmp, &pool->head) { ++ struct kutf_alloc_entry *remove_alloc; ++ ++ remove_alloc = list_entry(remove, struct kutf_alloc_entry, node); ++ list_del(&remove_alloc->node); ++ kfree(remove_alloc); ++ } +} ++EXPORT_SYMBOL(kutf_mempool_destroy); + -+void ump_random_mapping_put(ump_dd_mem *mem) ++void *kutf_mempool_alloc(struct kutf_mempool *pool, size_t size) +{ -+ int new_ref; -+ -+ _mali_osk_mutex_rw_wait(device.secure_id_map->lock, _MALI_OSK_LOCKMODE_RW); -+ -+ new_ref = _ump_osk_atomic_dec_and_read(&mem->ref_count); -+ DBG_MSG(5, ("Memory reference decremented. ID: %u, new value: %d\n", -+ mem->secure_id, new_ref)); -+ -+ if (0 == new_ref) { -+ DBG_MSG(3, ("Final release of memory. ID: %u\n", mem->secure_id)); -+ -+#ifdef CONFIG_DMA_SHARED_BUFFER -+ if (mem->import_attach) { -+ struct dma_buf_attachment *attach = mem->import_attach; -+ struct dma_buf *dma_buf; -+ -+ if (mem->sgt) -+ dma_buf_unmap_attachment(attach, mem->sgt, -+ DMA_BIDIRECTIONAL); -+ -+ dma_buf = attach->dmabuf; -+ dma_buf_detach(attach->dmabuf, attach); -+ dma_buf_put(dma_buf); -+ -+ } -+#endif -+ ump_random_mapping_remove_internal(device.secure_id_map, mem->secure_id); ++ struct kutf_alloc_entry *ret; + -+ mem->release_func(mem->ctx, mem); -+ _mali_osk_free(mem); ++ if (!pool) { ++ pr_err("NULL pointer passed to %s\n", __func__); ++ goto fail_pool; + } + -+ _mali_osk_mutex_rw_signal(device.secure_id_map->lock, _MALI_OSK_LOCKMODE_RW); -+} ++ ret = kmalloc(sizeof(*ret) + size, GFP_KERNEL); ++ if (!ret) { ++ pr_err("Failed to allocate memory\n"); ++ goto fail_alloc; ++ } + -+ump_dd_mem *ump_random_mapping_remove(ump_random_mapping *map, int descriptor) -+{ -+ ump_dd_mem *mem; ++ INIT_LIST_HEAD(&ret->node); ++ list_add(&ret->node, &pool->head); + -+ _mali_osk_mutex_rw_wait(map->lock, _MALI_OSK_LOCKMODE_RW); -+ mem = ump_random_mapping_remove_internal(map, descriptor); -+ _mali_osk_mutex_rw_signal(map->lock, _MALI_OSK_LOCKMODE_RW); ++ return &ret->data[0]; + -+ return mem; ++fail_alloc: ++fail_pool: ++ return NULL; +} -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h ++EXPORT_SYMBOL(kutf_mempool_alloc); +diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c new file mode 100755 -index 000000000000..2cea6cedc380 +index 000000000..5bd04969f --- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h -@@ -0,0 +1,84 @@ ++++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c +@@ -0,0 +1,95 @@ +/* -+ * Copyright (C) 2010-2011, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+/** -+ * @file ump_kernel_random_mapping.h -+ */ + -+#ifndef __UMP_KERNEL_RANDOM_MAPPING_H__ -+#define __UMP_KERNEL_RANDOM_MAPPING_H__ + -+#include "mali_osk.h" -+#include ++/* Kernel UTF result management functions */ + -+#define UMP_RANDOM_MAP_DELAY 1 -+#define UMP_FAILED_LOOKUP_DELAY 10 /* ms */ -+#define UMP_FAILED_LOOKUPS_ALLOWED 10 /* number of allowed failed lookups */ ++#include ++#include ++#include + -+/** -+ * The random mapping object -+ * Provides a separate namespace where we can map an integer to a pointer -+ */ -+typedef struct ump_random_mapping { -+ _mali_osk_mutex_rw_t *lock; /**< Lock protecting access to the mapping object */ -+ struct rb_root root; -+#if UMP_RANDOM_MAP_DELAY -+ struct { -+ unsigned long count; -+ unsigned long timestamp; -+ } failed; -+#endif -+} ump_random_mapping; ++#include + +/** -+ * Create a random mapping object -+ * Create a random mapping capable of holding 2^20 entries -+ * @return Pointer to a random mapping object, NULL on failure ++ * struct kutf_result_set - Represents a set of results. ++ * @results: Pointer to the linked list where the results are stored. + */ -+ump_random_mapping *ump_random_mapping_create(void); ++struct kutf_result_set { ++ struct list_head results; ++}; + -+/** -+ * Destroy a random mapping object -+ * @param map The map to free -+ */ -+void ump_random_mapping_destroy(ump_random_mapping *map); ++struct kutf_result_set *kutf_create_result_set(void) ++{ ++ struct kutf_result_set *set; + -+/** -+ * Allocate a new mapping entry (random ID) -+ * Allocates a new entry in the map. -+ * @param map The map to allocate a new entry in -+ * @param target The value to map to -+ * @return The random allocated, a negative value on error -+ */ -+int ump_random_mapping_insert(ump_random_mapping *map, ump_dd_mem *mem); ++ set = kmalloc(sizeof(*set), GFP_KERNEL); ++ if (!set) { ++ pr_err("Failed to allocate resultset"); ++ goto fail_alloc; ++ } + -+/** -+ * Get the value mapped to by a random ID -+ * -+ * If the lookup fails, punish the calling thread by applying a delay. -+ * -+ * @param map The map to lookup the random id in -+ * @param id The ID to lookup -+ * @param target Pointer to a pointer which will receive the stored value -+ * @return ump_dd_mem pointer on successful lookup, NULL on error -+ */ -+ump_dd_mem *ump_random_mapping_get(ump_random_mapping *map, int id); ++ INIT_LIST_HEAD(&set->results); + -+void ump_random_mapping_put(ump_dd_mem *mem); ++ return set; + -+/** -+ * Free the random ID -+ * For the random to be reused it has to be freed -+ * @param map The map to free the random from -+ * @param id The ID to free -+ */ -+ump_dd_mem *ump_random_mapping_remove(ump_random_mapping *map, int id); ++fail_alloc: ++ return NULL; ++} + -+#endif /* __UMP_KERNEL_RANDOM_MAPPING_H__ */ -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c b/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c -new file mode 100755 -index 000000000000..e41931e1ea75 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c -@@ -0,0 +1,65 @@ -+/* -+ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++void kutf_add_result(struct kutf_mempool *mempool, ++ struct kutf_result_set *set, ++ enum kutf_result_status status, ++ const char *message) ++{ ++ /* Create the new result */ ++ struct kutf_result *new_result; + -+#include /* kernel module definitions */ -+#include /* request_mem_region */ ++ BUG_ON(set == NULL); + -+#include "arch/config.h" /* Configuration for current platform. The symlink for arch is set by Makefile */ ++ new_result = kutf_mempool_alloc(mempool, sizeof(*new_result)); ++ if (!new_result) { ++ pr_err("Result allocation failed\n"); ++ return; ++ } + -+#include "ump_osk.h" -+#include "ump_kernel_common.h" -+#include "ump_kernel_memory_backend_os.h" -+#include "ump_kernel_memory_backend_dedicated.h" ++ INIT_LIST_HEAD(&new_result->node); ++ new_result->status = status; ++ new_result->message = message; + -+/* Configure which dynamic memory allocator to use */ -+int ump_backend = ARCH_UMP_BACKEND_DEFAULT; -+module_param(ump_backend, int, S_IRUGO); /* r--r--r-- */ -+MODULE_PARM_DESC(ump_backend, "0 = dedicated memory backend (default), 1 = OS memory backend"); ++ list_add_tail(&new_result->node, &set->results); ++} + -+/* The base address of the memory block for the dedicated memory backend */ -+unsigned int ump_memory_address = ARCH_UMP_MEMORY_ADDRESS_DEFAULT; -+module_param(ump_memory_address, uint, S_IRUGO); /* r--r--r-- */ -+MODULE_PARM_DESC(ump_memory_address, "The physical address to map for the dedicated memory backend"); ++void kutf_destroy_result_set(struct kutf_result_set *set) ++{ ++ if (!list_empty(&set->results)) ++ pr_err("kutf_destroy_result_set: Unread results from test\n"); + -+/* The size of the memory block for the dedicated memory backend */ -+unsigned int ump_memory_size = ARCH_UMP_MEMORY_SIZE_DEFAULT; -+module_param(ump_memory_size, uint, S_IRUGO); /* r--r--r-- */ -+MODULE_PARM_DESC(ump_memory_size, "The size of fixed memory to map in the dedicated memory backend"); ++ kfree(set); ++} + -+ump_memory_backend *ump_memory_backend_create(void) ++struct kutf_result *kutf_remove_result(struct kutf_result_set *set) +{ -+ ump_memory_backend *backend = NULL; -+ -+ /* Create the dynamic memory allocator backend */ -+ if (0 == ump_backend) { -+ DBG_MSG(2, ("Using dedicated memory backend\n")); ++ if (!list_empty(&set->results)) { ++ struct kutf_result *ret; + -+ DBG_MSG(2, ("Requesting dedicated memory: 0x%08x, size: %u\n", ump_memory_address, ump_memory_size)); -+ /* Ask the OS if we can use the specified physical memory */ -+ if (NULL == request_mem_region(ump_memory_address, ump_memory_size, "UMP Memory")) { -+ MSG_ERR(("Failed to request memory region (0x%08X - 0x%08X). Is Mali DD already loaded?\n", ump_memory_address, ump_memory_address + ump_memory_size - 1)); -+ return NULL; -+ } -+ backend = ump_block_allocator_create(ump_memory_address, ump_memory_size); -+ } else if (1 == ump_backend) { -+ DBG_MSG(2, ("Using OS memory backend, allocation limit: %d\n", ump_memory_size)); -+ backend = ump_os_memory_backend_create(ump_memory_size); ++ ret = list_first_entry(&set->results, struct kutf_result, node); ++ list_del(&ret->node); ++ return ret; + } + -+ return backend; ++ return NULL; +} + -+void ump_memory_backend_destroy(void) -+{ -+ if (0 == ump_backend) { -+ DBG_MSG(2, ("Releasing dedicated memory: 0x%08x\n", ump_memory_address)); -+ release_mem_region(ump_memory_address, ump_memory_size); -+ } -+} -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c +diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c new file mode 100755 -index 000000000000..2b634ba79c6e +index 000000000..a7cfd3be9 --- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c -@@ -0,0 +1,27 @@ ++++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c +@@ -0,0 +1,1041 @@ +/* -+ * Copyright (C) 2010, 2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+/** -+ * @file ump_osk_atomics.c -+ * Implementation of the OS abstraction layer for the UMP kernel device driver ++ * ++ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include "ump_osk.h" -+#include -+ -+int _ump_osk_atomic_dec_and_read(_mali_osk_atomic_t *atom) -+{ -+ return atomic_dec_return((atomic_t *)&atom->u.val); -+} -+ -+int _ump_osk_atomic_inc_and_read(_mali_osk_atomic_t *atom) -+{ -+ return atomic_inc_return((atomic_t *)&atom->u.val); -+} -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c -new file mode 100755 -index 000000000000..e08bf25257b0 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c -@@ -0,0 +1,314 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ + -+/** -+ * @file ump_osk_memory.c -+ * Implementation of the OS abstraction layer for the kernel device driver -+ */ + -+/* needed to detect kernel version specific code */ -+#include ++/* Kernel UTF suite, test and fixture management including user to kernel ++ * interaction */ + -+#include "ump_osk.h" -+#include "ump_uk_types.h" -+#include "ump_ukk.h" -+#include "ump_kernel_common.h" -+#include /* kernel module definitions */ -+#include -+#include ++#include +#include ++#include ++#include ++#include ++#include ++#include ++#include + -+#include -+#include /* to verify pointers from user space */ -+#include -+#include ++#include + -+typedef struct ump_vma_usage_tracker { -+ atomic_t references; -+ ump_memory_allocation *descriptor; -+} ump_vma_usage_tracker; ++#include ++#include ++#include + -+static void ump_vma_open(struct vm_area_struct *vma); -+static void ump_vma_close(struct vm_area_struct *vma); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+static int ump_cpu_page_fault_handler(struct vm_area_struct *vma, struct vm_fault *vmf); -+#else -+static unsigned long ump_cpu_page_fault_handler(struct vm_area_struct *vma, unsigned long address); -+#endif ++#if defined(CONFIG_DEBUG_FS) + -+static struct vm_operations_struct ump_vm_ops = { -+ .open = ump_vma_open, -+ .close = ump_vma_close, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+ .fault = ump_cpu_page_fault_handler -+#else -+ .nopfn = ump_cpu_page_fault_handler -+#endif ++/** ++ * struct kutf_application - Structure which represents kutf application ++ * @name: The name of this test application. ++ * @dir: The debugfs directory for this test ++ * @suite_list: List head to store all the suites which are part of this ++ * application ++ */ ++struct kutf_application { ++ const char *name; ++ struct dentry *dir; ++ struct list_head suite_list; +}; + -+/* -+ * Page fault for VMA region -+ * This should never happen since we always map in the entire virtual memory range. ++/** ++ * struct kutf_test_function - Structure which represents kutf test function ++ * @suite: Back reference to the suite this test function ++ * belongs to ++ * @filters: Filters that apply to this test function ++ * @test_id: Test ID ++ * @execute: Function to run for this test ++ * @test_data: Static data for this test ++ * @node: List node for test_list ++ * @variant_list: List head to store all the variants which can run on ++ * this function ++ * @dir: debugfs directory for this test function + */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+static int ump_cpu_page_fault_handler(struct vm_area_struct *vma, struct vm_fault *vmf) -+#else -+static unsigned long ump_cpu_page_fault_handler(struct vm_area_struct *vma, unsigned long address) -+#endif -+{ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+ void __user *address; -+ address = vmf->virtual_address; -+#endif -+ MSG_ERR(("Page-fault in UMP memory region caused by the CPU\n")); -+ MSG_ERR(("VMA: 0x%08lx, virtual address: 0x%08lx\n", (unsigned long)vma, address)); -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+ return VM_FAULT_SIGBUS; -+#else -+ return NOPFN_SIGBUS; -+#endif -+} -+ -+static void ump_vma_open(struct vm_area_struct *vma) -+{ -+ ump_vma_usage_tracker *vma_usage_tracker; -+ int new_val; -+ -+ vma_usage_tracker = (ump_vma_usage_tracker *)vma->vm_private_data; -+ BUG_ON(NULL == vma_usage_tracker); -+ -+ new_val = atomic_inc_return(&vma_usage_tracker->references); -+ -+ DBG_MSG(4, ("VMA open, VMA reference count incremented. VMA: 0x%08lx, reference count: %d\n", (unsigned long)vma, new_val)); -+} ++struct kutf_test_function { ++ struct kutf_suite *suite; ++ unsigned int filters; ++ unsigned int test_id; ++ void (*execute)(struct kutf_context *context); ++ union kutf_callback_data test_data; ++ struct list_head node; ++ struct list_head variant_list; ++ struct dentry *dir; ++}; + -+static void ump_vma_close(struct vm_area_struct *vma) -+{ -+ ump_vma_usage_tracker *vma_usage_tracker; -+ _ump_uk_unmap_mem_s args; -+ int new_val; ++/** ++ * struct kutf_test_fixture - Structure which holds information on the kutf ++ * test fixture ++ * @test_func: Test function this fixture belongs to ++ * @fixture_index: Index of this fixture ++ * @node: List node for variant_list ++ * @dir: debugfs directory for this test fixture ++ */ ++struct kutf_test_fixture { ++ struct kutf_test_function *test_func; ++ unsigned int fixture_index; ++ struct list_head node; ++ struct dentry *dir; ++}; + -+ vma_usage_tracker = (ump_vma_usage_tracker *)vma->vm_private_data; -+ BUG_ON(NULL == vma_usage_tracker); ++struct dentry *base_dir; + -+ new_val = atomic_dec_return(&vma_usage_tracker->references); ++/** ++ * struct kutf_convert_table - Structure which keeps test results ++ * @result_name: Status of the test result ++ * @result: Status value for a single test ++ */ ++struct kutf_convert_table { ++ char result_name[50]; ++ enum kutf_result_status result; ++}; + -+ DBG_MSG(4, ("VMA close, VMA reference count decremented. VMA: 0x%08lx, reference count: %d\n", (unsigned long)vma, new_val)); ++struct kutf_convert_table kutf_convert[] = { ++#define ADD_UTF_RESULT(_name) \ ++{ \ ++ #_name, \ ++ _name, \ ++}, ++ADD_UTF_RESULT(KUTF_RESULT_BENCHMARK) ++ADD_UTF_RESULT(KUTF_RESULT_SKIP) ++ADD_UTF_RESULT(KUTF_RESULT_UNKNOWN) ++ADD_UTF_RESULT(KUTF_RESULT_PASS) ++ADD_UTF_RESULT(KUTF_RESULT_DEBUG) ++ADD_UTF_RESULT(KUTF_RESULT_INFO) ++ADD_UTF_RESULT(KUTF_RESULT_WARN) ++ADD_UTF_RESULT(KUTF_RESULT_FAIL) ++ADD_UTF_RESULT(KUTF_RESULT_FATAL) ++ADD_UTF_RESULT(KUTF_RESULT_ABORT) ++}; + -+ if (0 == new_val) { -+ ump_memory_allocation *descriptor; ++#define UTF_CONVERT_SIZE (ARRAY_SIZE(kutf_convert)) + -+ descriptor = vma_usage_tracker->descriptor; ++/** ++ * kutf_create_context() - Create a test context in which a specific fixture ++ * of an application will be run and its results ++ * reported back to the user ++ * @test_fix: Test fixture to be run. ++ * ++ * Return: Returns the created test context on success or NULL on failure ++ */ ++static struct kutf_context *kutf_create_context( ++ struct kutf_test_fixture *test_fix); + -+ args.ctx = descriptor->ump_session; -+ args.cookie = descriptor->cookie; -+ args.mapping = descriptor->mapping; -+ args.size = descriptor->size; ++/** ++ * kutf_destroy_context() - Destroy a previously created test context ++ * @context: Test context to destroy ++ */ ++static void kutf_destroy_context(struct kutf_context *context); + -+ args._ukk_private = NULL; /** @note unused */ ++/** ++ * kutf_set_result() - Set the test result against the specified test context ++ * @context: Test context ++ * @status: Result status ++ */ ++static void kutf_set_result(struct kutf_context *context, ++ enum kutf_result_status status); + -+ DBG_MSG(4, ("No more VMA references left, releasing UMP memory\n")); -+ _ump_ukk_unmap_mem(& args); ++/** ++ * kutf_set_expected_result() - Set the expected test result for the specified ++ * test context ++ * @context: Test context ++ * @expected_status: Expected result status ++ */ ++static void kutf_set_expected_result(struct kutf_context *context, ++ enum kutf_result_status expected_status); + -+ /* vma_usage_tracker is free()d by _ump_osk_mem_mapregion_term() */ -+ } -+} ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)) ++/* Pre 3.4.0 kernels don't have the simple_open helper */ + -+_mali_osk_errcode_t _ump_osk_mem_mapregion_init(ump_memory_allocation *descriptor) ++/** ++ * simple_open() - Helper for file opening which stores the inode private data ++ * into the file private data ++ * @inode: File entry representation ++ * @file: A specific opening of the file ++ * ++ * Return: always 0; if inode private data do not exist, the file will not ++ * be assigned private data ++ */ ++static int simple_open(struct inode *inode, struct file *file) +{ -+ ump_vma_usage_tracker *vma_usage_tracker; -+ struct vm_area_struct *vma; -+ -+ if (NULL == descriptor) return _MALI_OSK_ERR_FAULT; -+ -+ vma_usage_tracker = kmalloc(sizeof(ump_vma_usage_tracker), GFP_KERNEL); -+ if (NULL == vma_usage_tracker) { -+ DBG_MSG(1, ("Failed to allocate memory for ump_vma_usage_tracker in _mali_osk_mem_mapregion_init\n")); -+ return -_MALI_OSK_ERR_FAULT; -+ } -+ -+ vma = (struct vm_area_struct *)descriptor->process_mapping_info; -+ if (NULL == vma) { -+ kfree(vma_usage_tracker); -+ return _MALI_OSK_ERR_FAULT; -+ } -+ -+ vma->vm_private_data = vma_usage_tracker; -+ vma->vm_flags |= VM_IO; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) -+ vma->vm_flags |= VM_RESERVED; -+#else -+ vma->vm_flags |= VM_DONTDUMP; -+ vma->vm_flags |= VM_DONTEXPAND; -+ vma->vm_flags |= VM_PFNMAP; ++ if (inode->i_private) ++ file->private_data = inode->i_private; ++ return 0; ++} +#endif + ++/** ++ * kutf_result_to_string() - Converts a KUTF result into a string ++ * @result_str: Output result string ++ * @result: Result status to convert ++ * ++ * Return: 1 if test result was successfully converted to string, 0 otherwise ++ */ ++static int kutf_result_to_string(char **result_str, ++ enum kutf_result_status result) ++{ ++ int i; ++ int ret = 0; + -+ if (0 == descriptor->is_cached) { -+ vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); ++ for (i = 0; i < UTF_CONVERT_SIZE; i++) { ++ if (result == kutf_convert[i].result) { ++ *result_str = kutf_convert[i].result_name; ++ ret = 1; ++ } + } -+ DBG_MSG(3, ("Mapping with page_prot: 0x%x\n", vma->vm_page_prot)); -+ -+ /* Setup the functions which handle further VMA handling */ -+ vma->vm_ops = &ump_vm_ops; -+ -+ /* Do the va range allocation - in this case, it was done earlier, so we copy in that information */ -+ descriptor->mapping = (void __user *)vma->vm_start; ++ return ret; ++} + -+ atomic_set(&vma_usage_tracker->references, 1); /*this can later be increased if process is forked, see ump_vma_open() */ -+ vma_usage_tracker->descriptor = descriptor; ++/** ++ * kutf_debugfs_const_string_read() - Simple debugfs read callback which ++ * returns a constant string ++ * @file: Opened file to read from ++ * @buf: User buffer to write the data into ++ * @len: Amount of data to read ++ * @ppos: Offset into file to read from ++ * ++ * Return: On success, the number of bytes read and offset @ppos advanced by ++ * this number; on error, negative value ++ */ ++static ssize_t kutf_debugfs_const_string_read(struct file *file, ++ char __user *buf, size_t len, loff_t *ppos) ++{ ++ char *str = file->private_data; + -+ return _MALI_OSK_ERR_OK; ++ return simple_read_from_buffer(buf, len, ppos, str, strlen(str)); +} + -+void _ump_osk_mem_mapregion_term(ump_memory_allocation *descriptor) ++static const struct file_operations kutf_debugfs_const_string_ops = { ++ .owner = THIS_MODULE, ++ .open = simple_open, ++ .read = kutf_debugfs_const_string_read, ++ .llseek = default_llseek, ++}; ++ ++/** ++ * kutf_add_explicit_result() - Check if an explicit result needs to be added ++ * @context: KUTF test context ++ */ ++static void kutf_add_explicit_result(struct kutf_context *context) +{ -+ struct vm_area_struct *vma; -+ ump_vma_usage_tracker *vma_usage_tracker; ++ switch (context->expected_status) { ++ case KUTF_RESULT_UNKNOWN: ++ if (context->status == KUTF_RESULT_UNKNOWN) ++ kutf_test_pass(context, "(implicit pass)"); ++ break; + -+ if (NULL == descriptor) return; ++ case KUTF_RESULT_WARN: ++ if (context->status == KUTF_RESULT_WARN) ++ kutf_test_pass(context, ++ "Pass (expected warn occurred)"); ++ else if (context->status != KUTF_RESULT_SKIP) ++ kutf_test_fail(context, ++ "Fail (expected warn missing)"); ++ break; + -+ /* Linux does the right thing as part of munmap to remove the mapping -+ * All that remains is that we remove the vma_usage_tracker setup in init() */ -+ vma = (struct vm_area_struct *)descriptor->process_mapping_info; ++ case KUTF_RESULT_FAIL: ++ if (context->status == KUTF_RESULT_FAIL) ++ kutf_test_pass(context, ++ "Pass (expected fail occurred)"); ++ else if (context->status != KUTF_RESULT_SKIP) { ++ /* Force the expected status so the fail gets logged */ ++ context->expected_status = KUTF_RESULT_PASS; ++ kutf_test_fail(context, ++ "Fail (expected fail missing)"); ++ } ++ break; + -+ vma_usage_tracker = vma->vm_private_data; ++ case KUTF_RESULT_FATAL: ++ if (context->status == KUTF_RESULT_FATAL) ++ kutf_test_pass(context, ++ "Pass (expected fatal occurred)"); ++ else if (context->status != KUTF_RESULT_SKIP) ++ kutf_test_fail(context, ++ "Fail (expected fatal missing)"); ++ break; + -+ /* We only get called if mem_mapregion_init succeeded */ -+ kfree(vma_usage_tracker); -+ return; ++ case KUTF_RESULT_ABORT: ++ if (context->status == KUTF_RESULT_ABORT) ++ kutf_test_pass(context, ++ "Pass (expected abort occurred)"); ++ else if (context->status != KUTF_RESULT_SKIP) ++ kutf_test_fail(context, ++ "Fail (expected abort missing)"); ++ break; ++ default: ++ break; ++ } +} + -+_mali_osk_errcode_t _ump_osk_mem_mapregion_map(ump_memory_allocation *descriptor, u32 offset, u32 *phys_addr, unsigned long size) ++/** ++ * kutf_debugfs_run_open() Debugfs open callback for the "run" entry. ++ * @inode: inode of the opened file ++ * @file: Opened file to read from ++ * ++ * This function retrieves the test fixture data that is associated with the ++ * opened file and works back to get the test, suite and application so ++ * it can then run the test that is associated with the file entry. ++ * ++ * Return: 0 on success ++ */ ++static int kutf_debugfs_run_open(struct inode *inode, struct file *file) +{ -+ struct vm_area_struct *vma; -+ _mali_osk_errcode_t retval; -+ -+ if (NULL == descriptor) return _MALI_OSK_ERR_FAULT; ++ struct kutf_test_fixture *test_fix = inode->i_private; ++ struct kutf_test_function *test_func = test_fix->test_func; ++ struct kutf_suite *suite = test_func->suite; ++ struct kutf_context *test_context; + -+ vma = (struct vm_area_struct *)descriptor->process_mapping_info; ++ test_context = kutf_create_context(test_fix); ++ if (!test_context) ++ return -ENODEV; + -+ if (NULL == vma) return _MALI_OSK_ERR_FAULT; ++ file->private_data = test_context; + -+ retval = remap_pfn_range(vma, ((u32)descriptor->mapping) + offset, (*phys_addr) >> PAGE_SHIFT, size, vma->vm_page_prot) ? _MALI_OSK_ERR_FAULT : _MALI_OSK_ERR_OK;; ++ /* ++ * Call the create fixture function if required before the ++ * fixture is run ++ */ ++ if (suite->create_fixture) ++ test_context->fixture = suite->create_fixture(test_context); + -+ DBG_MSG(4, ("Mapping virtual to physical memory. ID: %u, vma: 0x%08lx, virtual addr:0x%08lx, physical addr: 0x%08lx, size:%lu, prot:0x%x, vm_flags:0x%x RETVAL: 0x%x\n", -+ ump_dd_secure_id_get(descriptor->handle), -+ (unsigned long)vma, -+ (unsigned long)(vma->vm_start + offset), -+ (unsigned long)*phys_addr, -+ size, -+ (unsigned int)vma->vm_page_prot, vma->vm_flags, retval)); ++ /* Only run the test if the fixture was created (if required) */ ++ if ((suite->create_fixture && test_context->fixture) || ++ (!suite->create_fixture)) { ++ /* Run this fixture */ ++ test_func->execute(test_context); + -+ return retval; -+} ++ if (suite->remove_fixture) ++ suite->remove_fixture(test_context); + -+static void level1_cache_flush_all(void) -+{ -+ DBG_MSG(4, ("UMP[xx] Flushing complete L1 cache\n")); -+ __cpuc_flush_kern_all(); ++ kutf_add_explicit_result(test_context); ++ } ++ return 0; +} + -+void _ump_osk_msync(ump_dd_mem *mem, void *virt, u32 offset, u32 size, ump_uk_msync_op op, ump_session_data *session_data) ++/** ++ * kutf_debugfs_run_read() - Debugfs read callback for the "run" entry. ++ * @file: Opened file to read from ++ * @buf: User buffer to write the data into ++ * @len: Amount of data to read ++ * @ppos: Offset into file to read from ++ * ++ * This function emits the results which where logged during the opening of ++ * the file kutf_debugfs_run_open. ++ * Results will be emitted one at a time, once all the results have been read ++ * 0 will be returned to indicate there is no more data. ++ * ++ * Return: Number of bytes read. ++ */ ++static ssize_t kutf_debugfs_run_read(struct file *file, char __user *buf, ++ size_t len, loff_t *ppos) +{ -+ int i; -+ -+ /* Flush L1 using virtual address, the entire range in one go. -+ * Only flush if user space process has a valid write mapping on given address. */ -+ if ((mem) && (virt != NULL) && (access_ok(virt, size))) { -+ __cpuc_flush_dcache_area(virt, size); -+ DBG_MSG(3, ("UMP[%02u] Flushing CPU L1 Cache. CPU address: %x, size: %x\n", mem->secure_id, virt, size)); -+ } else { -+ if (session_data) { -+ if (op == _UMP_UK_MSYNC_FLUSH_L1) { -+ DBG_MSG(4, ("UMP Pending L1 cache flushes: %d\n", session_data->has_pending_level1_cache_flush)); -+ session_data->has_pending_level1_cache_flush = 0; -+ level1_cache_flush_all(); -+ return; -+ } else { -+ if (session_data->cache_operations_ongoing) { -+ session_data->has_pending_level1_cache_flush++; -+ DBG_MSG(4, ("UMP[%02u] Defering the L1 flush. Nr pending:%d\n", mem->secure_id, session_data->has_pending_level1_cache_flush)); -+ } else { -+ /* Flushing the L1 cache for each switch_user() if ump_cache_operations_control(START) is not called */ -+ level1_cache_flush_all(); -+ } -+ } -+ } else { -+ DBG_MSG(4, ("Unkown state %s %d\n", __FUNCTION__, __LINE__)); -+ level1_cache_flush_all(); -+ } -+ } -+ -+ if (NULL == mem) return; ++ struct kutf_context *test_context = file->private_data; ++ struct kutf_result *res; ++ unsigned long bytes_not_copied; ++ ssize_t bytes_copied = 0; + -+ if (mem->size_bytes == size) { -+ DBG_MSG(3, ("UMP[%02u] Flushing CPU L2 Cache\n", mem->secure_id)); -+ } else { -+ DBG_MSG(3, ("UMP[%02u] Flushing CPU L2 Cache. Blocks:%u, TotalSize:%u. FlushSize:%u Offset:0x%x FirstPaddr:0x%08x\n", -+ mem->secure_id, mem->nr_blocks, mem->size_bytes, size, offset, mem->block_array[0].addr)); -+ } ++ /* Note: This code assumes a result is read completely */ ++ res = kutf_remove_result(test_context->result_set); ++ if (res) { ++ char *kutf_str_ptr = NULL; ++ unsigned int kutf_str_len = 0; ++ unsigned int message_len = 0; ++ char separator = ':'; ++ char terminator = '\n'; + ++ kutf_result_to_string(&kutf_str_ptr, res->status); ++ if (kutf_str_ptr) ++ kutf_str_len = strlen(kutf_str_ptr); + -+ /* Flush L2 using physical addresses, block for block. */ -+ for (i = 0 ; i < mem->nr_blocks; i++) { -+ u32 start_p, end_p; -+ ump_dd_physical_block *block; -+ block = &mem->block_array[i]; ++ if (res->message) ++ message_len = strlen(res->message); + -+ if (offset >= block->size) { -+ offset -= block->size; -+ continue; ++ if ((kutf_str_len + 1 + message_len + 1) > len) { ++ pr_err("Not enough space in user buffer for a single result"); ++ return 0; + } + -+ if (offset) { -+ start_p = (u32)block->addr + offset; -+ /* We'll zero the offset later, after using it to calculate end_p. */ -+ } else { -+ start_p = (u32)block->addr; ++ /* First copy the result string */ ++ if (kutf_str_ptr) { ++ bytes_not_copied = copy_to_user(&buf[0], kutf_str_ptr, ++ kutf_str_len); ++ bytes_copied += kutf_str_len - bytes_not_copied; ++ if (bytes_not_copied) ++ goto exit; + } + -+ if (size < block->size - offset) { -+ end_p = start_p + size; -+ size = 0; -+ } else { -+ if (offset) { -+ end_p = start_p + (block->size - offset); -+ size -= block->size - offset; -+ offset = 0; -+ } else { -+ end_p = start_p + block->size; -+ size -= block->size; -+ } -+ } ++ /* Then the separator */ ++ bytes_not_copied = copy_to_user(&buf[bytes_copied], ++ &separator, 1); ++ bytes_copied += 1 - bytes_not_copied; ++ if (bytes_not_copied) ++ goto exit; + -+ switch (op) { -+ case _UMP_UK_MSYNC_CLEAN: -+ outer_clean_range(start_p, end_p); -+ break; -+ case _UMP_UK_MSYNC_CLEAN_AND_INVALIDATE: -+ outer_flush_range(start_p, end_p); -+ break; -+ case _UMP_UK_MSYNC_INVALIDATE: -+ outer_inv_range(start_p, end_p); -+ break; -+ default: -+ break; ++ /* Finally Next copy the result string */ ++ if (res->message) { ++ bytes_not_copied = copy_to_user(&buf[bytes_copied], ++ res->message, message_len); ++ bytes_copied += message_len - bytes_not_copied; ++ if (bytes_not_copied) ++ goto exit; + } + -+ if (0 == size) { -+ /* Nothing left to flush. */ -+ break; -+ } ++ /* Finally the terminator */ ++ bytes_not_copied = copy_to_user(&buf[bytes_copied], ++ &terminator, 1); ++ bytes_copied += 1 - bytes_not_copied; + } -+ -+ return; ++exit: ++ return bytes_copied; +} -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c -new file mode 100755 -index 000000000000..58c9f1bf27b8 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c -@@ -0,0 +1,36 @@ -+/* -+ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ + +/** -+ * @file ump_osk_misc.c -+ * Implementation of the OS abstraction layer for the UMP kernel device driver ++ * kutf_debugfs_run_release() - Debugfs release callback for the "run" entry. ++ * @inode: File entry representation ++ * @file: A specific opening of the file ++ * ++ * Release any resources that where created during the opening of the file ++ * ++ * Return: 0 on success + */ -+ -+ -+#include "ump_osk.h" -+ -+#include -+#include "ump_kernel_linux.h" -+ -+/* is called from ump_kernel_constructor in common code */ -+_mali_osk_errcode_t _ump_osk_init(void) ++static int kutf_debugfs_run_release(struct inode *inode, struct file *file) +{ -+ if (0 != ump_kernel_device_initialize()) { -+ return _MALI_OSK_ERR_FAULT; -+ } ++ struct kutf_context *test_context = file->private_data; + -+ return _MALI_OSK_ERR_OK; ++ kutf_destroy_context(test_context); ++ return 0; +} + -+_mali_osk_errcode_t _ump_osk_term(void) -+{ -+ ump_kernel_device_terminate(); -+ return _MALI_OSK_ERR_OK; -+} -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c -new file mode 100755 -index 000000000000..56a787ff64dc ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c -@@ -0,0 +1,230 @@ -+/* -+ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++static const struct file_operations kutf_debugfs_run_ops = { ++ .owner = THIS_MODULE, ++ .open = kutf_debugfs_run_open, ++ .read = kutf_debugfs_run_read, ++ .release = kutf_debugfs_run_release, ++ .llseek = default_llseek, ++}; + +/** -+ * @file ump_ukk_wrappers.c -+ * Defines the wrapper functions which turn Linux IOCTL calls into _ukk_ calls for the reference implementation ++ * create_fixture_variant() - Creates a fixture variant for the specified ++ * test function and index and the debugfs entries ++ * that represent it. ++ * @test_func: Test function ++ * @fixture_index: Fixture index ++ * ++ * Return: 0 on success, negative value corresponding to error code in failure + */ ++static int create_fixture_variant(struct kutf_test_function *test_func, ++ unsigned int fixture_index) ++{ ++ struct kutf_test_fixture *test_fix; ++ char name[11]; /* Enough to print the MAX_UINT32 + the null terminator */ ++ struct dentry *tmp; ++ int err; + ++ test_fix = kmalloc(sizeof(*test_fix), GFP_KERNEL); ++ if (!test_fix) { ++ pr_err("Failed to create debugfs directory when adding fixture\n"); ++ err = -ENOMEM; ++ goto fail_alloc; ++ } + -+#include /* user space access */ ++ test_fix->test_func = test_func; ++ test_fix->fixture_index = fixture_index; + -+#include "ump_osk.h" -+#include "ump_uk_types.h" -+#include "ump_ukk.h" -+#include "ump_kernel_common.h" -+#include -+#include "ump_kernel_interface_ref_drv.h" -+#include "mali_osk_list.h" ++ snprintf(name, sizeof(name), "%d", fixture_index); ++ test_fix->dir = debugfs_create_dir(name, test_func->dir); ++ if (!test_func->dir) { ++ pr_err("Failed to create debugfs directory when adding fixture\n"); ++ /* Might not be the right error, we don't get it passed back to us */ ++ err = -EEXIST; ++ goto fail_dir; ++ } + -+extern struct device *ump_global_mdev; ++ tmp = debugfs_create_file("type", S_IROTH, test_fix->dir, "fixture\n", ++ &kutf_debugfs_const_string_ops); ++ if (!tmp) { ++ pr_err("Failed to create debugfs file \"type\" when adding fixture\n"); ++ /* Might not be the right error, we don't get it passed back to us */ ++ err = -EEXIST; ++ goto fail_file; ++ } + -+/* -+ * IOCTL operation; Allocate UMP memory ++ tmp = debugfs_create_file("run", S_IROTH, test_fix->dir, test_fix, ++ &kutf_debugfs_run_ops); ++ if (!tmp) { ++ pr_err("Failed to create debugfs file \"run\" when adding fixture\n"); ++ /* Might not be the right error, we don't get it passed back to us */ ++ err = -EEXIST; ++ goto fail_file; ++ } ++ ++ list_add(&test_fix->node, &test_func->variant_list); ++ return 0; ++ ++fail_file: ++ debugfs_remove_recursive(test_fix->dir); ++fail_dir: ++ kfree(test_fix); ++fail_alloc: ++ return err; ++} ++ ++/** ++ * kutf_remove_test_variant() - Destroy a previously created fixture variant. ++ * @test_fix: Test fixture + */ -+int ump_allocate_wrapper(u32 __user *argument, struct ump_session_data *session_data) ++static void kutf_remove_test_variant(struct kutf_test_fixture *test_fix) +{ -+ _ump_uk_allocate_s user_interaction; -+ _mali_osk_errcode_t err; ++ debugfs_remove_recursive(test_fix->dir); ++ kfree(test_fix); ++} + -+ /* Sanity check input parameters */ -+ if (NULL == argument || NULL == session_data) { -+ MSG_ERR(("NULL parameter in ump_ioctl_allocate()\n")); -+ return -ENOTTY; -+ } ++void kutf_add_test_with_filters_and_data( ++ struct kutf_suite *suite, ++ unsigned int id, ++ const char *name, ++ void (*execute)(struct kutf_context *context), ++ unsigned int filters, ++ union kutf_callback_data test_data) ++{ ++ struct kutf_test_function *test_func; ++ struct dentry *tmp; ++ unsigned int i; + -+ /* Copy the user space memory to kernel space (so we safely can read it) */ -+ if (0 != copy_from_user(&user_interaction, argument, sizeof(user_interaction))) { -+ MSG_ERR(("copy_from_user() in ump_ioctl_allocate()\n")); -+ return -EFAULT; ++ test_func = kmalloc(sizeof(*test_func), GFP_KERNEL); ++ if (!test_func) { ++ pr_err("Failed to allocate memory when adding test %s\n", name); ++ goto fail_alloc; + } + -+ user_interaction.ctx = (void *) session_data; ++ INIT_LIST_HEAD(&test_func->variant_list); + -+ err = _ump_ukk_allocate(&user_interaction); -+ if (_MALI_OSK_ERR_OK != err) { -+ DBG_MSG(1, ("_ump_ukk_allocate() failed in ump_ioctl_allocate()\n")); -+ return ump_map_errcode(err); ++ test_func->dir = debugfs_create_dir(name, suite->dir); ++ if (!test_func->dir) { ++ pr_err("Failed to create debugfs directory when adding test %s\n", name); ++ goto fail_dir; + } -+ user_interaction.ctx = NULL; + -+ if (0 != copy_to_user(argument, &user_interaction, sizeof(user_interaction))) { -+ /* If the copy fails then we should release the memory. We can use the IOCTL release to accomplish this */ -+ _ump_uk_release_s release_args; ++ tmp = debugfs_create_file("type", S_IROTH, test_func->dir, "test\n", ++ &kutf_debugfs_const_string_ops); ++ if (!tmp) { ++ pr_err("Failed to create debugfs file \"type\" when adding test %s\n", name); ++ goto fail_file; ++ } + -+ MSG_ERR(("copy_to_user() failed in ump_ioctl_allocate()\n")); ++ test_func->filters = filters; ++ tmp = debugfs_create_x32("filters", S_IROTH, test_func->dir, ++ &test_func->filters); ++ if (!tmp) { ++ pr_err("Failed to create debugfs file \"filters\" when adding test %s\n", name); ++ goto fail_file; ++ } + -+ release_args.ctx = (void *) session_data; -+ release_args.secure_id = user_interaction.secure_id; ++ test_func->test_id = id; ++ tmp = debugfs_create_u32("test_id", S_IROTH, test_func->dir, ++ &test_func->test_id); ++ if (!tmp) { ++ pr_err("Failed to create debugfs file \"test_id\" when adding test %s\n", name); ++ goto fail_file; ++ } + -+ err = _ump_ukk_release(&release_args); -+ if (_MALI_OSK_ERR_OK != err) { -+ MSG_ERR(("_ump_ukk_release() also failed when trying to release newly allocated memory in ump_ioctl_allocate()\n")); ++ for (i = 0; i < suite->fixture_variants; i++) { ++ if (create_fixture_variant(test_func, i)) { ++ pr_err("Failed to create fixture %d when adding test %s\n", i, name); ++ goto fail_file; + } -+ -+ return -EFAULT; + } + -+ return 0; /* success */ ++ test_func->suite = suite; ++ test_func->execute = execute; ++ test_func->test_data = test_data; ++ ++ list_add(&test_func->node, &suite->test_list); ++ return; ++ ++fail_file: ++ debugfs_remove_recursive(test_func->dir); ++fail_dir: ++ kfree(test_func); ++fail_alloc: ++ return; +} ++EXPORT_SYMBOL(kutf_add_test_with_filters_and_data); + -+#ifdef CONFIG_DMA_SHARED_BUFFER -+static ump_dd_handle get_ump_handle_from_dmabuf(struct ump_session_data *session_data, -+ struct dma_buf *dmabuf) ++void kutf_add_test_with_filters( ++ struct kutf_suite *suite, ++ unsigned int id, ++ const char *name, ++ void (*execute)(struct kutf_context *context), ++ unsigned int filters) +{ -+ ump_session_memory_list_element *session_mem, *tmp; -+ struct dma_buf_attachment *attach; -+ ump_dd_handle ump_handle; ++ union kutf_callback_data data; + -+ DEBUG_ASSERT_POINTER(session_data); ++ data.ptr_value = NULL; + -+ _mali_osk_mutex_wait(session_data->lock); ++ kutf_add_test_with_filters_and_data(suite, ++ id, ++ name, ++ execute, ++ suite->suite_default_flags, ++ data); ++} ++EXPORT_SYMBOL(kutf_add_test_with_filters); + -+ _MALI_OSK_LIST_FOREACHENTRY(session_mem, tmp, -+ &session_data->list_head_session_memory_list, -+ ump_session_memory_list_element, list) { -+ if (session_mem->mem->import_attach) { -+ attach = session_mem->mem->import_attach; -+ if (attach->dmabuf == dmabuf) { -+ _mali_osk_mutex_signal(session_data->lock); -+ ump_handle = (ump_dd_handle)session_mem->mem; -+ ump_random_mapping_get(device.secure_id_map, ump_dd_secure_id_get(ump_handle)); -+ return ump_handle; -+ } -+ } -+ } ++void kutf_add_test(struct kutf_suite *suite, ++ unsigned int id, ++ const char *name, ++ void (*execute)(struct kutf_context *context)) ++{ ++ union kutf_callback_data data; + -+ _mali_osk_mutex_signal(session_data->lock); ++ data.ptr_value = NULL; + -+ return NULL; ++ kutf_add_test_with_filters_and_data(suite, ++ id, ++ name, ++ execute, ++ suite->suite_default_flags, ++ data); +} ++EXPORT_SYMBOL(kutf_add_test); + -+int ump_dmabuf_import_wrapper(u32 __user *argument, -+ struct ump_session_data *session_data) ++/** ++ * kutf_remove_test(): Remove a previously added test function. ++ * @test_func: Test function ++ */ ++static void kutf_remove_test(struct kutf_test_function *test_func) +{ -+ ump_session_memory_list_element *session = NULL; -+ _ump_uk_dmabuf_s ump_dmabuf; -+ ump_dd_handle ump_handle; -+ ump_dd_physical_block *blocks = NULL; -+ struct dma_buf_attachment *attach = NULL; -+ struct dma_buf *dma_buf; -+ struct sg_table *sgt = NULL; -+ struct scatterlist *sgl; -+ unsigned int i = 0; -+ int ret = 0; ++ struct list_head *pos; ++ struct list_head *tmp; + -+ /* Sanity check input parameters */ -+ if (!argument || !session_data) { -+ MSG_ERR(("NULL parameter.\n")); -+ return -EINVAL; -+ } ++ list_for_each_safe(pos, tmp, &test_func->variant_list) { ++ struct kutf_test_fixture *test_fix; + -+ if (copy_from_user(&ump_dmabuf, argument, -+ sizeof(_ump_uk_dmabuf_s))) { -+ MSG_ERR(("copy_from_user() failed.\n")); -+ return -EFAULT; ++ test_fix = list_entry(pos, struct kutf_test_fixture, node); ++ kutf_remove_test_variant(test_fix); + } + -+ dma_buf = dma_buf_get(ump_dmabuf.fd); -+ if (IS_ERR(dma_buf)) -+ return PTR_ERR(dma_buf); -+ -+ /* -+ * if already imported then increase a refcount to the ump descriptor -+ * and call dma_buf_put() and then go to found to return previous -+ * ump secure id. -+ */ -+ ump_handle = get_ump_handle_from_dmabuf(session_data, dma_buf); -+ if (ump_handle) { -+ dma_buf_put(dma_buf); -+ goto found; -+ } ++ list_del(&test_func->node); ++ debugfs_remove_recursive(test_func->dir); ++ kfree(test_func); ++} + -+ attach = dma_buf_attach(dma_buf, ump_global_mdev); -+ if (IS_ERR(attach)) { -+ ret = PTR_ERR(attach); -+ goto err_dma_buf_put; -+ } ++struct kutf_suite *kutf_create_suite_with_filters_and_data( ++ struct kutf_application *app, ++ const char *name, ++ unsigned int fixture_count, ++ void *(*create_fixture)(struct kutf_context *context), ++ void (*remove_fixture)(struct kutf_context *context), ++ unsigned int filters, ++ union kutf_callback_data suite_data) ++{ ++ struct kutf_suite *suite; ++ struct dentry *tmp; + -+ sgt = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL); -+ if (IS_ERR(sgt)) { -+ ret = PTR_ERR(sgt); -+ goto err_dma_buf_detach; ++ suite = kmalloc(sizeof(*suite), GFP_KERNEL); ++ if (!suite) { ++ pr_err("Failed to allocate memory when creating suite %s\n", name); ++ goto fail_kmalloc; + } + -+ blocks = (ump_dd_physical_block *)_mali_osk_malloc(sizeof(ump_dd_physical_block) * sgt->nents); -+ if (!blocks) { -+ DBG_MSG(1, ("Failed to allocate blocks.\n")); -+ ret = -EFAULT; -+ goto err_dma_buf_unmap; -+ } -+ for_each_sg(sgt->sgl, sgl, sgt->nents, i) { -+ blocks[i].addr = sg_phys(sgl); -+ blocks[i].size = sg_dma_len(sgl); ++ suite->dir = debugfs_create_dir(name, app->dir); ++ if (!suite->dir) { ++ pr_err("Failed to create debugfs directory when adding test %s\n", name); ++ goto fail_debugfs; + } + -+ /* -+ * Initialize the session memory list element, and add it -+ * to the session object -+ */ -+ session = _mali_osk_calloc(1, sizeof(*session)); -+ if (!session) { -+ DBG_MSG(1, ("Failed to allocate session.\n")); -+ ret = -EFAULT; -+ goto err_free_block; ++ tmp = debugfs_create_file("type", S_IROTH, suite->dir, "suite\n", ++ &kutf_debugfs_const_string_ops); ++ if (!tmp) { ++ pr_err("Failed to create debugfs file \"type\" when adding test %s\n", name); ++ goto fail_file; + } + -+ ump_handle = ump_dd_handle_create_from_phys_blocks(blocks, i); -+ if (UMP_DD_HANDLE_INVALID == ump_handle) { -+ DBG_MSG(1, ("Failed to create ump handle.\n")); -+ ret = -EFAULT; -+ goto err_free_session; -+ } ++ INIT_LIST_HEAD(&suite->test_list); ++ suite->app = app; ++ suite->name = name; ++ suite->fixture_variants = fixture_count; ++ suite->create_fixture = create_fixture; ++ suite->remove_fixture = remove_fixture; ++ suite->suite_default_flags = filters; ++ suite->suite_data = suite_data; + -+ session->mem = (ump_dd_mem *)ump_handle; -+ session->mem->import_attach = attach; -+ session->mem->sgt = sgt; ++ list_add(&suite->node, &app->suite_list); + -+ _mali_osk_mutex_wait(session_data->lock); -+ _mali_osk_list_add(&(session->list), -+ &(session_data->list_head_session_memory_list)); -+ _mali_osk_mutex_signal(session_data->lock); ++ return suite; + -+ _mali_osk_free(blocks); ++fail_file: ++ debugfs_remove_recursive(suite->dir); ++fail_debugfs: ++ kfree(suite); ++fail_kmalloc: ++ return NULL; ++} ++EXPORT_SYMBOL(kutf_create_suite_with_filters_and_data); + -+found: -+ ump_dmabuf.ctx = (void *)session_data; -+ ump_dmabuf.secure_id = ump_dd_secure_id_get(ump_handle); -+ ump_dmabuf.size = ump_dd_size_get(ump_handle); ++struct kutf_suite *kutf_create_suite_with_filters( ++ struct kutf_application *app, ++ const char *name, ++ unsigned int fixture_count, ++ void *(*create_fixture)(struct kutf_context *context), ++ void (*remove_fixture)(struct kutf_context *context), ++ unsigned int filters) ++{ ++ union kutf_callback_data data; + -+ if (copy_to_user(argument, &ump_dmabuf, -+ sizeof(_ump_uk_dmabuf_s))) { -+ MSG_ERR(("copy_to_user() failed.\n")); -+ ret = -EFAULT; -+ goto err_release_ump_handle; -+ } ++ data.ptr_value = NULL; ++ return kutf_create_suite_with_filters_and_data(app, ++ name, ++ fixture_count, ++ create_fixture, ++ remove_fixture, ++ filters, ++ data); ++} ++EXPORT_SYMBOL(kutf_create_suite_with_filters); + -+ return ret; ++struct kutf_suite *kutf_create_suite( ++ struct kutf_application *app, ++ const char *name, ++ unsigned int fixture_count, ++ void *(*create_fixture)(struct kutf_context *context), ++ void (*remove_fixture)(struct kutf_context *context)) ++{ ++ union kutf_callback_data data; + -+err_release_ump_handle: -+ ump_dd_reference_release(ump_handle); -+err_free_session: -+ _mali_osk_free(session); -+err_free_block: -+ _mali_osk_free(blocks); -+err_dma_buf_unmap: -+ dma_buf_unmap_attachment(attach, sgt, DMA_BIDIRECTIONAL); -+err_dma_buf_detach: -+ dma_buf_detach(dma_buf, attach); -+err_dma_buf_put: -+ dma_buf_put(dma_buf); -+ return ret; ++ data.ptr_value = NULL; ++ return kutf_create_suite_with_filters_and_data(app, ++ name, ++ fixture_count, ++ create_fixture, ++ remove_fixture, ++ KUTF_F_TEST_GENERIC, ++ data); +} -+#endif -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h -new file mode 100755 -index 000000000000..61a7095a6920 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h -@@ -0,0 +1,36 @@ -+/* -+ * Copyright (C) 2010, 2013-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ ++EXPORT_SYMBOL(kutf_create_suite); + +/** -+ * @file ump_ukk_wrappers.h -+ * Defines the wrapper functions which turn Linux IOCTL calls into _ukk_ calls for the reference implementation ++ * kutf_destroy_suite() - Destroy a previously added test suite. ++ * @suite: Test suite + */ ++static void kutf_destroy_suite(struct kutf_suite *suite) ++{ ++ struct list_head *pos; ++ struct list_head *tmp; + -+#ifndef __UMP_UKK_REF_WRAPPERS_H__ -+#define __UMP_UKK_REF_WRAPPERS_H__ -+ -+#include -+#include "ump_kernel_common.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ ++ list_for_each_safe(pos, tmp, &suite->test_list) { ++ struct kutf_test_function *test_func; + -+int ump_allocate_wrapper(u32 __user *argument, struct ump_session_data *session_data); -+#ifdef CONFIG_DMA_SHARED_BUFFER -+int ump_dmabuf_import_wrapper(u32 __user *argument, struct ump_session_data *session_data); -+#endif ++ test_func = list_entry(pos, struct kutf_test_function, node); ++ kutf_remove_test(test_func); ++ } + -+#ifdef __cplusplus ++ list_del(&suite->node); ++ debugfs_remove_recursive(suite->dir); ++ kfree(suite); +} -+#endif -+ -+#endif /* __UMP_UKK_REF_WRAPPERS_H__ */ -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c -new file mode 100755 -index 000000000000..4d6b69608fd4 ---- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c -@@ -0,0 +1,280 @@ -+/* -+ * Copyright (C) 2010-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+/** -+ * @file ump_ukk_wrappers.c -+ * Defines the wrapper functions which turn Linux IOCTL calls into _ukk_ calls -+ */ -+ -+#include /* user space access */ -+ -+#include "ump_osk.h" -+#include "ump_uk_types.h" -+#include "ump_ukk.h" -+#include "ump_kernel_common.h" + -+/* -+ * IOCTL operation; Negotiate version of IOCTL API -+ */ -+int ump_get_api_version_wrapper(u32 __user *argument, struct ump_session_data *session_data) ++struct kutf_application *kutf_create_application(const char *name) +{ -+ _ump_uk_api_version_s version_info; -+ _mali_osk_errcode_t err; ++ struct kutf_application *app; ++ struct dentry *tmp; + -+ /* Sanity check input parameters */ -+ if (NULL == argument || NULL == session_data) { -+ MSG_ERR(("NULL parameter in ump_ioctl_get_api_version()\n")); -+ return -ENOTTY; ++ app = kmalloc(sizeof(*app), GFP_KERNEL); ++ if (!app) { ++ pr_err("Failed to create allocate memory when creating application %s\n", name); ++ goto fail_kmalloc; + } + -+ /* Copy the user space memory to kernel space (so we safely can read it) */ -+ if (0 != copy_from_user(&version_info, argument, sizeof(version_info))) { -+ MSG_ERR(("copy_from_user() in ump_ioctl_get_api_version()\n")); -+ return -EFAULT; ++ app->dir = debugfs_create_dir(name, base_dir); ++ if (!app->dir) { ++ pr_err("Failed to create debugfs direcotry when creating application %s\n", name); ++ goto fail_debugfs; + } + -+ version_info.ctx = (void *) session_data; -+ err = _ump_uku_get_api_version(&version_info); -+ if (_MALI_OSK_ERR_OK != err) { -+ MSG_ERR(("_ump_uku_get_api_version() failed in ump_ioctl_get_api_version()\n")); -+ return ump_map_errcode(err); ++ tmp = debugfs_create_file("type", S_IROTH, app->dir, "application\n", ++ &kutf_debugfs_const_string_ops); ++ if (!tmp) { ++ pr_err("Failed to create debugfs file \"type\" when creating application %s\n", name); ++ goto fail_file; + } + -+ version_info.ctx = NULL; ++ INIT_LIST_HEAD(&app->suite_list); ++ app->name = name; + -+ /* Copy ouput data back to user space */ -+ if (0 != copy_to_user(argument, &version_info, sizeof(version_info))) { -+ MSG_ERR(("copy_to_user() failed in ump_ioctl_get_api_version()\n")); -+ return -EFAULT; -+ } ++ return app; + -+ return 0; /* success */ ++fail_file: ++ debugfs_remove_recursive(app->dir); ++fail_debugfs: ++ kfree(app); ++fail_kmalloc: ++ return NULL; +} ++EXPORT_SYMBOL(kutf_create_application); + -+ -+/* -+ * IOCTL operation; Release reference to specified UMP memory. -+ */ -+int ump_release_wrapper(u32 __user *argument, struct ump_session_data *session_data) ++void kutf_destroy_application(struct kutf_application *app) +{ -+ _ump_uk_release_s release_args; -+ _mali_osk_errcode_t err; -+ -+ /* Sanity check input parameters */ -+ if (NULL == session_data) { -+ MSG_ERR(("NULL parameter in ump_ioctl_release()\n")); -+ return -ENOTTY; -+ } ++ struct list_head *pos; ++ struct list_head *tmp; + -+ /* Copy the user space memory to kernel space (so we safely can read it) */ -+ if (0 != copy_from_user(&release_args, argument, sizeof(release_args))) { -+ MSG_ERR(("copy_from_user() in ump_ioctl_get_api_version()\n")); -+ return -EFAULT; -+ } ++ list_for_each_safe(pos, tmp, &app->suite_list) { ++ struct kutf_suite *suite; + -+ release_args.ctx = (void *) session_data; -+ err = _ump_ukk_release(&release_args); -+ if (_MALI_OSK_ERR_OK != err) { -+ MSG_ERR(("_ump_ukk_release() failed in ump_ioctl_release()\n")); -+ return ump_map_errcode(err); ++ suite = list_entry(pos, struct kutf_suite, node); ++ kutf_destroy_suite(suite); + } + -+ -+ return 0; /* success */ ++ debugfs_remove_recursive(app->dir); ++ kfree(app); +} ++EXPORT_SYMBOL(kutf_destroy_application); + -+/* -+ * IOCTL operation; Return size for specified UMP memory. -+ */ -+int ump_size_get_wrapper(u32 __user *argument, struct ump_session_data *session_data) ++static struct kutf_context *kutf_create_context( ++ struct kutf_test_fixture *test_fix) +{ -+ _ump_uk_size_get_s user_interaction; -+ _mali_osk_errcode_t err; ++ struct kutf_context *new_context; + -+ /* Sanity check input parameters */ -+ if (NULL == argument || NULL == session_data) { -+ MSG_ERR(("NULL parameter in ump_ioctl_size_get()\n")); -+ return -ENOTTY; ++ new_context = kmalloc(sizeof(*new_context), GFP_KERNEL); ++ if (!new_context) { ++ pr_err("Failed to allocate test context"); ++ goto fail_alloc; + } + -+ if (0 != copy_from_user(&user_interaction, argument, sizeof(user_interaction))) { -+ MSG_ERR(("copy_from_user() in ump_ioctl_size_get()\n")); -+ return -EFAULT; ++ new_context->result_set = kutf_create_result_set(); ++ if (!new_context->result_set) { ++ pr_err("Failed to create resultset"); ++ goto fail_result_set; + } + -+ user_interaction.ctx = (void *) session_data; -+ err = _ump_ukk_size_get(&user_interaction); -+ if (_MALI_OSK_ERR_OK != err) { -+ MSG_ERR(("_ump_ukk_size_get() failed in ump_ioctl_size_get()\n")); -+ return ump_map_errcode(err); -+ } ++ new_context->test_fix = test_fix; ++ /* Save the pointer to the suite as the callbacks will require it */ ++ new_context->suite = test_fix->test_func->suite; ++ new_context->status = KUTF_RESULT_UNKNOWN; ++ new_context->expected_status = KUTF_RESULT_UNKNOWN; + -+ user_interaction.ctx = NULL; ++ kutf_mempool_init(&new_context->fixture_pool); ++ new_context->fixture = NULL; ++ new_context->fixture_index = test_fix->fixture_index; ++ new_context->fixture_name = NULL; ++ new_context->test_data = test_fix->test_func->test_data; + -+ if (0 != copy_to_user(argument, &user_interaction, sizeof(user_interaction))) { -+ MSG_ERR(("copy_to_user() failed in ump_ioctl_size_get()\n")); -+ return -EFAULT; -+ } ++ return new_context; + -+ return 0; /* success */ ++fail_result_set: ++ kfree(new_context); ++fail_alloc: ++ return NULL; +} + -+/* -+ * IOCTL operation; Do cache maintenance on specified UMP memory. -+ */ -+int ump_msync_wrapper(u32 __user *argument, struct ump_session_data *session_data) ++static void kutf_destroy_context(struct kutf_context *context) +{ -+ _ump_uk_msync_s user_interaction; -+ -+ /* Sanity check input parameters */ -+ if (NULL == argument || NULL == session_data) { -+ MSG_ERR(("NULL parameter in ump_ioctl_size_get()\n")); -+ return -ENOTTY; -+ } -+ -+ if (0 != copy_from_user(&user_interaction, argument, sizeof(user_interaction))) { -+ MSG_ERR(("copy_from_user() in ump_ioctl_msync()\n")); -+ return -EFAULT; -+ } ++ kutf_destroy_result_set(context->result_set); ++ kutf_mempool_destroy(&context->fixture_pool); ++ kfree(context); ++} + -+ user_interaction.ctx = (void *) session_data; ++static void kutf_set_result(struct kutf_context *context, ++ enum kutf_result_status status) ++{ ++ context->status = status; ++} + -+ _ump_ukk_msync(&user_interaction); ++static void kutf_set_expected_result(struct kutf_context *context, ++ enum kutf_result_status expected_status) ++{ ++ context->expected_status = expected_status; ++} + -+ user_interaction.ctx = NULL; ++/** ++ * kutf_test_log_result() - Log a result for the specified test context ++ * @context: Test context ++ * @message: Result string ++ * @new_status: Result status ++ */ ++static void kutf_test_log_result( ++ struct kutf_context *context, ++ const char *message, ++ enum kutf_result_status new_status) ++{ ++ if (context->status < new_status) ++ context->status = new_status; + -+ if (0 != copy_to_user(argument, &user_interaction, sizeof(user_interaction))) { -+ MSG_ERR(("copy_to_user() failed in ump_ioctl_msync()\n")); -+ return -EFAULT; -+ } ++ if (context->expected_status != new_status) ++ kutf_add_result(&context->fixture_pool, context->result_set, ++ new_status, message); ++} + -+ return 0; /* success */ ++void kutf_test_log_result_external( ++ struct kutf_context *context, ++ const char *message, ++ enum kutf_result_status new_status) ++{ ++ kutf_test_log_result(context, message, new_status); +} -+int ump_cache_operations_control_wrapper(u32 __user *argument, struct ump_session_data *session_data) ++EXPORT_SYMBOL(kutf_test_log_result_external); ++ ++void kutf_test_expect_abort(struct kutf_context *context) +{ -+ _ump_uk_cache_operations_control_s user_interaction; ++ kutf_set_expected_result(context, KUTF_RESULT_ABORT); ++} ++EXPORT_SYMBOL(kutf_test_expect_abort); + -+ /* Sanity check input parameters */ -+ if (NULL == argument || NULL == session_data) { -+ MSG_ERR(("NULL parameter in ump_ioctl_size_get()\n")); -+ return -ENOTTY; -+ } ++void kutf_test_expect_fatal(struct kutf_context *context) ++{ ++ kutf_set_expected_result(context, KUTF_RESULT_FATAL); ++} ++EXPORT_SYMBOL(kutf_test_expect_fatal); + -+ if (0 != copy_from_user(&user_interaction, argument, sizeof(user_interaction))) { -+ MSG_ERR(("copy_from_user() in ump_ioctl_cache_operations_control()\n")); -+ return -EFAULT; -+ } ++void kutf_test_expect_fail(struct kutf_context *context) ++{ ++ kutf_set_expected_result(context, KUTF_RESULT_FAIL); ++} ++EXPORT_SYMBOL(kutf_test_expect_fail); + -+ user_interaction.ctx = (void *) session_data; ++void kutf_test_expect_warn(struct kutf_context *context) ++{ ++ kutf_set_expected_result(context, KUTF_RESULT_WARN); ++} ++EXPORT_SYMBOL(kutf_test_expect_warn); + -+ _ump_ukk_cache_operations_control((_ump_uk_cache_operations_control_s *) &user_interaction); ++void kutf_test_expect_pass(struct kutf_context *context) ++{ ++ kutf_set_expected_result(context, KUTF_RESULT_PASS); ++} ++EXPORT_SYMBOL(kutf_test_expect_pass); + -+ user_interaction.ctx = NULL; ++void kutf_test_skip(struct kutf_context *context) ++{ ++ kutf_set_result(context, KUTF_RESULT_SKIP); ++ kutf_set_expected_result(context, KUTF_RESULT_UNKNOWN); + -+#if 0 /* No data to copy back */ -+ if (0 != copy_to_user(argument, &user_interaction, sizeof(user_interaction))) { -+ MSG_ERR(("copy_to_user() failed in ump_ioctl_cache_operations_control()\n")); -+ return -EFAULT; -+ } -+#endif -+ return 0; /* success */ ++ kutf_test_log_result(context, "Test skipped", KUTF_RESULT_SKIP); +} ++EXPORT_SYMBOL(kutf_test_skip); + -+int ump_switch_hw_usage_wrapper(u32 __user *argument, struct ump_session_data *session_data) ++void kutf_test_skip_msg(struct kutf_context *context, const char *message) +{ -+ _ump_uk_switch_hw_usage_s user_interaction; -+ -+ /* Sanity check input parameters */ -+ if (NULL == argument || NULL == session_data) { -+ MSG_ERR(("NULL parameter in ump_ioctl_size_get()\n")); -+ return -ENOTTY; -+ } ++ kutf_set_result(context, KUTF_RESULT_SKIP); ++ kutf_set_expected_result(context, KUTF_RESULT_UNKNOWN); + -+ if (0 != copy_from_user(&user_interaction, argument, sizeof(user_interaction))) { -+ MSG_ERR(("copy_from_user() in ump_ioctl_switch_hw_usage()\n")); -+ return -EFAULT; -+ } ++ kutf_test_log_result(context, kutf_dsprintf(&context->fixture_pool, ++ "Test skipped: %s", message), KUTF_RESULT_SKIP); ++ kutf_test_log_result(context, "!!!Test skipped!!!", KUTF_RESULT_SKIP); ++} ++EXPORT_SYMBOL(kutf_test_skip_msg); + -+ user_interaction.ctx = (void *) session_data; ++void kutf_test_debug(struct kutf_context *context, char const *message) ++{ ++ kutf_test_log_result(context, message, KUTF_RESULT_DEBUG); ++} ++EXPORT_SYMBOL(kutf_test_debug); + -+ _ump_ukk_switch_hw_usage(&user_interaction); ++void kutf_test_pass(struct kutf_context *context, char const *message) ++{ ++ static const char explicit_message[] = "(explicit pass)"; + -+ user_interaction.ctx = NULL; ++ if (!message) ++ message = explicit_message; + -+#if 0 /* No data to copy back */ -+ if (0 != copy_to_user(argument, &user_interaction, sizeof(user_interaction))) { -+ MSG_ERR(("copy_to_user() failed in ump_ioctl_switch_hw_usage()\n")); -+ return -EFAULT; -+ } -+#endif -+ return 0; /* success */ ++ kutf_test_log_result(context, message, KUTF_RESULT_PASS); +} ++EXPORT_SYMBOL(kutf_test_pass); + -+int ump_lock_wrapper(u32 __user *argument, struct ump_session_data *session_data) ++void kutf_test_info(struct kutf_context *context, char const *message) +{ -+ _ump_uk_lock_s user_interaction; ++ kutf_test_log_result(context, message, KUTF_RESULT_INFO); ++} ++EXPORT_SYMBOL(kutf_test_info); + -+ /* Sanity check input parameters */ -+ if (NULL == argument || NULL == session_data) { -+ MSG_ERR(("NULL parameter in ump_ioctl_size_get()\n")); -+ return -ENOTTY; -+ } ++void kutf_test_warn(struct kutf_context *context, char const *message) ++{ ++ kutf_test_log_result(context, message, KUTF_RESULT_WARN); ++} ++EXPORT_SYMBOL(kutf_test_warn); + -+ if (0 != copy_from_user(&user_interaction, argument, sizeof(user_interaction))) { -+ MSG_ERR(("copy_from_user() in ump_ioctl_switch_hw_usage()\n")); -+ return -EFAULT; -+ } ++void kutf_test_fail(struct kutf_context *context, char const *message) ++{ ++ kutf_test_log_result(context, message, KUTF_RESULT_FAIL); ++} ++EXPORT_SYMBOL(kutf_test_fail); + -+ user_interaction.ctx = (void *) session_data; ++void kutf_test_fatal(struct kutf_context *context, char const *message) ++{ ++ kutf_test_log_result(context, message, KUTF_RESULT_FATAL); ++} ++EXPORT_SYMBOL(kutf_test_fatal); + -+ _ump_ukk_lock(&user_interaction); ++void kutf_test_abort(struct kutf_context *context) ++{ ++ kutf_test_log_result(context, "", KUTF_RESULT_ABORT); ++} ++EXPORT_SYMBOL(kutf_test_abort); + -+ user_interaction.ctx = NULL; ++/** ++ * init_kutf_core() - Module entry point. ++ * ++ * Create the base entry point in debugfs. ++ */ ++static int __init init_kutf_core(void) ++{ ++ int ret; + -+#if 0 /* No data to copy back */ -+ if (0 != copy_to_user(argument, &user_interaction, sizeof(user_interaction))) { -+ MSG_ERR(("copy_to_user() failed in ump_ioctl_switch_hw_usage()\n")); -+ return -EFAULT; ++ base_dir = debugfs_create_dir("kutf_tests", NULL); ++ if (!base_dir) { ++ ret = -ENODEV; ++ goto exit_dir; + } -+#endif + -+ return 0; /* success */ ++ return 0; ++ ++exit_dir: ++ return ret; +} + -+int ump_unlock_wrapper(u32 __user *argument, struct ump_session_data *session_data) ++/** ++ * exit_kutf_core() - Module exit point. ++ * ++ * Remove the base entry point in debugfs. ++ */ ++static void __exit exit_kutf_core(void) +{ -+ _ump_uk_unlock_s user_interaction; -+ -+ /* Sanity check input parameters */ -+ if (NULL == argument || NULL == session_data) { -+ MSG_ERR(("NULL parameter in ump_ioctl_size_get()\n")); -+ return -ENOTTY; -+ } ++ debugfs_remove_recursive(base_dir); ++} + -+ if (0 != copy_from_user(&user_interaction, argument, sizeof(user_interaction))) { -+ MSG_ERR(("copy_from_user() in ump_ioctl_switch_hw_usage()\n")); -+ return -EFAULT; -+ } ++#else /* defined(CONFIG_DEBUG_FS) */ + -+ user_interaction.ctx = (void *) session_data; ++/** ++ * init_kutf_core() - Module entry point. ++ * ++ * Stub for when build against a kernel without debugfs support ++ */ ++static int __init init_kutf_core(void) ++{ ++ pr_debug("KUTF requires a kernel with debug fs support"); + -+ _ump_ukk_unlock(&user_interaction); ++ return -ENODEV; ++} + -+ user_interaction.ctx = NULL; ++/** ++ * exit_kutf_core() - Module exit point. ++ * ++ * Stub for when build against a kernel without debugfs support ++ */ ++static void __exit exit_kutf_core(void) ++{ ++} ++#endif /* defined(CONFIG_DEBUG_FS) */ + -+#if 0 /* No data to copy back */ -+ if (0 != copy_to_user(argument, &user_interaction, sizeof(user_interaction))) { -+ MSG_ERR(("copy_to_user() failed in ump_ioctl_switch_hw_usage()\n")); -+ return -EFAULT; -+ } -+#endif ++MODULE_LICENSE("GPL"); + -+ return 0; /* success */ -+} -diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h ++module_init(init_kutf_core); ++module_exit(exit_kutf_core); +diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c new file mode 100755 -index 000000000000..5f8fc683c8f5 +index 000000000..a429a2dbf --- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h -@@ -0,0 +1,46 @@ ++++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c +@@ -0,0 +1,71 @@ +/* -+ * Copyright (C) 2010, 2012-2014, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+/** -+ * @file ump_ukk_wrappers.h -+ * Defines the wrapper functions which turn Linux IOCTL calls into _ukk_ calls -+ */ + -+#ifndef __UMP_UKK_WRAPPERS_H__ -+#define __UMP_UKK_WRAPPERS_H__ + ++/* Kernel UTF utility functions */ ++ ++#include +#include -+#include "ump_kernel_common.h" ++#include ++#include + -+#ifdef __cplusplus -+extern "C" { -+#endif ++#include ++#include + ++static char tmp_buffer[KUTF_MAX_DSPRINTF_LEN]; + ++DEFINE_MUTEX(buffer_lock); + -+int ump_get_api_version_wrapper(u32 __user *argument, struct ump_session_data *session_data); -+int ump_release_wrapper(u32 __user *argument, struct ump_session_data *session_data); -+int ump_size_get_wrapper(u32 __user *argument, struct ump_session_data *session_data); -+int ump_msync_wrapper(u32 __user *argument, struct ump_session_data *session_data); -+int ump_cache_operations_control_wrapper(u32 __user *argument, struct ump_session_data *session_data); -+int ump_switch_hw_usage_wrapper(u32 __user *argument, struct ump_session_data *session_data); -+int ump_lock_wrapper(u32 __user *argument, struct ump_session_data *session_data); -+int ump_unlock_wrapper(u32 __user *argument, struct ump_session_data *session_data); ++const char *kutf_dsprintf(struct kutf_mempool *pool, ++ const char *fmt, ...) ++{ ++ va_list args; ++ int len; ++ int size; ++ void *buffer; + ++ mutex_lock(&buffer_lock); ++ va_start(args, fmt); ++ len = vsnprintf(tmp_buffer, sizeof(tmp_buffer), fmt, args); ++ va_end(args); + ++ if (len < 0) { ++ pr_err("kutf_dsprintf: Bad format dsprintf format %s\n", fmt); ++ goto fail_format; ++ } + ++ if (len >= sizeof(tmp_buffer)) { ++ pr_warn("kutf_dsprintf: Truncated dsprintf message %s\n", fmt); ++ size = sizeof(tmp_buffer); ++ } else { ++ size = len + 1; ++ } + -+#ifdef __cplusplus -+} -+#endif ++ buffer = kutf_mempool_alloc(pool, size); ++ if (!buffer) ++ goto fail_alloc; + ++ memcpy(buffer, tmp_buffer, size); ++ mutex_unlock(&buffer_lock); + ++ return buffer; + -+#endif /* __UMP_UKK_WRAPPERS_H__ */ -diff --git a/drivers/gpu/arm/mali400/ump/readme.txt b/drivers/gpu/arm/mali400/ump/readme.txt ++fail_alloc: ++fail_format: ++ mutex_unlock(&buffer_lock); ++ return NULL; ++} ++EXPORT_SYMBOL(kutf_dsprintf); +diff --git a/drivers/gpu/arm/midgard/tests/kutf/sconscript b/drivers/gpu/arm/midgard/tests/kutf/sconscript new file mode 100755 -index 000000000000..c238cf0f2b1f +index 000000000..d7f112448 --- /dev/null -+++ b/drivers/gpu/arm/mali400/ump/readme.txt -@@ -0,0 +1,28 @@ -+Building the UMP Device Driver for Linux -+---------------------------------------- -+ -+Build the UMP Device Driver for Linux by running the following make command: -+ -+KDIR= CONFIG= BUILD= make ++++ b/drivers/gpu/arm/midgard/tests/kutf/sconscript +@@ -0,0 +1,21 @@ ++# ++# (C) COPYRIGHT 2014-2016, 2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+where -+ kdir_path: Path to your Linux Kernel directory -+ your_config: Name of the sub-folder to find the required config.h file -+ ("arch-" will be prepended) -+ build_option: debug or release. Debug is default. + -+The config.h contains following configuration parameters: ++Import('kutf_env') + -+ARCH_UMP_BACKEND_DEFAULT -+ 0 specifies the dedicated memory allocator. -+ 1 specifies the OS memory allocator. -+ARCH_UMP_MEMORY_ADDRESS_DEFAULT -+ This is only required for the dedicated memory allocator, and specifies -+ the physical start address of the memory block reserved for UMP. -+ARCH_UMP_MEMORY_SIZE_DEFAULT -+ This specified the size of the memory block reserved for UMP, or the -+ maximum limit for allocations from the OS. ++make_args = kutf_env.kernel_get_config_defines(ret_list = True) + -+The result will be a ump.ko file, which can be loaded into the Linux kernel -+by using the insmod command. The driver can also be built as a part of the -+kernel itself. -diff --git a/drivers/gpu/arm/mali400/umplock/Makefile b/drivers/gpu/arm/mali400/umplock/Makefile ++mod = kutf_env.BuildKernelModule('$STATIC_LIB_PATH/kutf.ko', Glob('*.c'), make_args = make_args) ++kutf_env.KernelObjTarget('kutf', mod) +diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kbuild b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kbuild new file mode 100755 -index 000000000000..e5549a33f91d +index 000000000..0cd9cebe9 --- /dev/null -+++ b/drivers/gpu/arm/mali400/umplock/Makefile -@@ -0,0 +1,69 @@ ++++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kbuild +@@ -0,0 +1,20 @@ ++# ++# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. +# -+# Copyright (C) 2012, 2016-2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+# as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained from Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + -+# default to building for the host -+ARCH ?= $(shell uname -m) -+ -+# linux build system integration -+ -+ifneq ($(KERNELRELEASE),) -+# Inside the kernel build system -+ -+EXTRA_CFLAGS += -I$(KBUILD_EXTMOD) -+ -+SRC = umplock_driver.c -+ -+MODULE:=umplock.ko + -+obj-m := $(MODULE:.ko=.o) -+$(MODULE:.ko=-y) := $(SRC:.c=.o) ++ccflags-y += -I$(src)/../include -I$(src)/../../../ -I$(src)/../../ -I$(src)/../../backend/gpu -I$(srctree)/drivers/staging/android + -+$(MODULE:.ko=-objs) := $(SRC:.c=.o) ++obj-$(CONFIG_MALI_IRQ_LATENCY) += mali_kutf_irq_test.o + -+else -+# Outside the kernel build system ++mali_kutf_irq_test-y := mali_kutf_irq_test_main.o +diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig +new file mode 100755 +index 000000000..16f68d15c +--- /dev/null ++++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig +@@ -0,0 +1,23 @@ ++# ++# (C) COPYRIGHT 2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. +# +# + -+# Get any user defined KDIR- or maybe even a hardcoded KDIR -+-include KDIR_CONFIGURATION + -+# Define host system directory -+KDIR-$(shell uname -m):=/lib/modules/$(shell uname -r)/build ++config MALI_IRQ_LATENCY ++ tristate "Mali GPU IRQ latency measurement" ++ depends on MALI_MIDGARD && MALI_DEBUG && MALI_KUTF ++ default n ++ help ++ This option will build a test module mali_kutf_irq_test that ++ can determine the latency of the Mali GPU IRQ on your system. ++ Choosing M here will generate a single module called mali_kutf_irq_test. +diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile +new file mode 100755 +index 000000000..4e948767a +--- /dev/null ++++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile +@@ -0,0 +1,51 @@ ++# ++# (C) COPYRIGHT 2015, 2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+ifeq ($(ARCH), arm) -+ # when compiling for ARM we're cross compiling -+ export CROSS_COMPILE ?= arm-none-linux-gnueabi- -+ CONFIG ?= arm -+else -+ # Compiling for the host -+ CONFIG ?= $(shell uname -m) -+endif + -+# default cpu to select -+CPU ?= $(shell uname -m) ++# linux build system bootstrap for out-of-tree module + -+# look up KDIR based om CPU selection -+KDIR ?= $(KDIR-$(CPU)) ++# default to building for the host ++ARCH ?= $(shell uname -m) + +ifeq ($(KDIR),) -+$(error No KDIR found for platform $(CPU)) ++$(error Must specify KDIR to point to the kernel to target)) +endif + -+all: -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) ++TEST_CCFLAGS := \ ++ -DMALI_DEBUG=$(MALI_DEBUG) \ ++ -DMALI_BACKEND_KERNEL=$(MALI_BACKEND_KERNEL) \ ++ -DMALI_MODEL=$(MALI_MODEL) \ ++ -DMALI_NO_MALI=$(MALI_NO_MALI) \ ++ -DMALI_BASE_QA_LEAK=$(MALI_BASE_QA_LEAK) \ ++ -DMALI_BASE_QA_RESFAIL=$(MALI_BASE_QA_RESFAIL) \ ++ -DMALI_BASE_QA_USE_AFTER_FREE=$(MALI_BASE_QA_USE_AFTER_FREE) \ ++ -DMALI_UNIT_TEST=$(MALI_UNIT_TEST) \ ++ -DMALI_USE_UMP=$(MALI_USE_UMP) \ ++ -DMALI_ERROR_INJECT_ON=$(MALI_ERROR_INJECT_ON) \ ++ -DMALI_CUSTOMER_RELEASE=$(MALI_CUSTOMER_RELEASE) \ ++ $(SCONS_CFLAGS) \ ++ -I$(CURDIR)/../include \ ++ -I$(CURDIR)/../../../../../../include \ ++ -I$(CURDIR)/../../../ \ ++ -I$(CURDIR)/../../ \ ++ -I$(CURDIR)/../../backend/gpu \ ++ -I$(CURDIR)/ \ ++ -I$(srctree)/drivers/staging/android \ ++ -I$(srctree)/include/linux + -+kernelrelease: -+ $(MAKE) -C $(KDIR) kernelrelease ++all: ++ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) $(SCONS_CONFIGS) EXTRA_CFLAGS="$(TEST_CCFLAGS)" KBUILD_EXTRA_SYMBOLS="$(CURDIR)/../kutf/Module.symvers $(CURDIR)/../../Module.symvers" modules + +clean: + $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean -+ -+endif -diff --git a/drivers/gpu/arm/mali400/umplock/umplock_driver.c b/drivers/gpu/arm/mali400/umplock/umplock_driver.c +diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c new file mode 100755 -index 000000000000..173f4d9bb5c7 +index 000000000..e2ff4432b --- /dev/null -+++ b/drivers/gpu/arm/mali400/umplock/umplock_driver.c -@@ -0,0 +1,618 @@ ++++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c +@@ -0,0 +1,257 @@ +/* -+ * Copyright (C) 2012-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ * (C) COPYRIGHT 2016, 2017 ARM Limited. All rights reserved. ++ * ++ * This program is free software and is provided to you under the terms of the ++ * GNU General Public License version 2 as published by the Free Software ++ * Foundation, and any use by you of this program is subject to the terms ++ * of such GNU licence. ++ * ++ * A copy of the licence is included with the program, and can also be obtained ++ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * + */ + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "umplock_ioctl.h" -+#include + -+#define MAX_ITEMS 1024 -+#define MAX_PIDS 128 + -+typedef struct lock_cmd_priv { -+ uint32_t msg[128]; /*ioctl args*/ -+ u32 pid; /*process id*/ -+} _lock_cmd_priv; ++#include ++#include ++#include + -+typedef struct lock_ref { -+ int ref_count; -+ u32 pid; -+ u32 down_count; -+} _lock_ref; ++#include "mali_kbase.h" ++#include + -+typedef struct umplock_item { -+ u32 secure_id; -+ u32 id_ref_count; -+ u32 owner; -+ _lock_access_usage usage; -+ _lock_ref references[MAX_PIDS]; -+ struct semaphore item_lock; -+} umplock_item; ++#include ++#include + -+typedef struct umplock_device_private { -+ struct mutex item_list_lock; -+ atomic_t sessions; -+ umplock_item items[MAX_ITEMS]; -+ u32 pids[MAX_PIDS]; -+} umplock_device_private; ++/* ++ * This file contains the code which is used for measuring interrupt latency ++ * of the Mali GPU IRQ. In particular, function mali_kutf_irq_latency() is ++ * used with this purpose and it is called within KUTF framework - a kernel ++ * unit test framework. The measured latency provided by this test should ++ * be representative for the latency of the Mali JOB/MMU IRQs as well. ++ */ + -+struct umplock_device { -+ struct cdev cdev; -+ struct class *umplock_class; ++/* KUTF test application pointer for this test */ ++struct kutf_application *irq_app; ++ ++/** ++ * struct kutf_irq_fixture data - test fixture used by the test functions. ++ * @kbdev: kbase device for the GPU. ++ * ++ */ ++struct kutf_irq_fixture_data { ++ struct kbase_device *kbdev; +}; + -+static struct umplock_device umplock_device; -+static umplock_device_private device; -+static dev_t umplock_dev; -+static char umplock_dev_name[] = "umplock"; ++#define SEC_TO_NANO(s) ((s)*1000000000LL) + -+int umplock_debug_level = 0; -+module_param(umplock_debug_level, int, S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP | S_IROTH); /* rw-rw-r-- */ -+MODULE_PARM_DESC(umplock_debug_level, "set umplock_debug_level to print debug messages"); ++/* ID for the GPU IRQ */ ++#define GPU_IRQ_HANDLER 2 + -+#define PDEBUG(level, fmt, args...) do { if ((level) <= umplock_debug_level) printk(KERN_DEBUG "umplock: " fmt, ##args); } while (0) -+#define PERROR(fmt, args...) do { printk(KERN_ERR "umplock: " fmt, ##args); } while (0) ++#define NR_TEST_IRQS 1000000 + -+int umplock_find_item(u32 secure_id) -+{ -+ int i; -+ for (i = 0; i < MAX_ITEMS; i++) { -+ if (device.items[i].secure_id == secure_id) { -+ return i; -+ } -+ } ++/* IRQ for the test to trigger. Currently MULTIPLE_GPU_FAULTS as we would not ++ * expect to see this in normal use (e.g., when Android is running). */ ++#define TEST_IRQ MULTIPLE_GPU_FAULTS + -+ return -1; ++#define IRQ_TIMEOUT HZ ++ ++/* Kernel API for setting irq throttle hook callback and irq time in us*/ ++extern int kbase_set_custom_irq_handler(struct kbase_device *kbdev, ++ irq_handler_t custom_handler, ++ int irq_type); ++extern irqreturn_t kbase_gpu_irq_handler(int irq, void *data); ++ ++static DECLARE_WAIT_QUEUE_HEAD(wait); ++static bool triggered; ++static u64 irq_time; ++ ++static void *kbase_untag(void *ptr) ++{ ++ return (void *)(((uintptr_t) ptr) & ~3); +} + -+static int umplock_find_item_by_pid(_lock_cmd_priv *lock_cmd, int *item_slot, int *ref_slot) ++/** ++ * kbase_gpu_irq_custom_handler - Custom IRQ throttle handler ++ * @irq: IRQ number ++ * @data: Data associated with this IRQ ++ * ++ * Return: state of the IRQ ++ */ ++static irqreturn_t kbase_gpu_irq_custom_handler(int irq, void *data) +{ -+ _lock_item_s *lock_item; -+ int i, j; ++ struct kbase_device *kbdev = kbase_untag(data); ++ u32 val; + -+ lock_item = (_lock_item_s *)&lock_cmd->msg; ++ val = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_STATUS), NULL); ++ if (val & TEST_IRQ) { ++ struct timespec64 tval; + -+ i = umplock_find_item(lock_item->secure_id); ++ ktime_get_real_ts64(&tval); ++ irq_time = SEC_TO_NANO(tval.tv_sec) + (tval.tv_nsec); + -+ if (i < 0) { -+ return -1; -+ } ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), val, ++ NULL); + -+ for (j = 0; j < MAX_PIDS; j++) { -+ if (device.items[i].references[j].pid == lock_cmd->pid) { -+ *item_slot = i; -+ *ref_slot = j; -+ return 0; -+ } ++ triggered = true; ++ wake_up(&wait); ++ ++ return IRQ_HANDLED; + } -+ return -1 ; ++ ++ /* Trigger main irq handler */ ++ return kbase_gpu_irq_handler(irq, data); +} + -+static int umplock_find_client_valid(u32 pid) ++/** ++ * mali_kutf_irq_default_create_fixture() - Creates the fixture data required ++ * for all the tests in the irq suite. ++ * @context: KUTF context. ++ * ++ * Return: Fixture data created on success or NULL on failure ++ */ ++static void *mali_kutf_irq_default_create_fixture( ++ struct kutf_context *context) +{ -+ int i; ++ struct kutf_irq_fixture_data *data; + -+ if (pid == 0) { -+ return -1; -+ } ++ data = kutf_mempool_alloc(&context->fixture_pool, ++ sizeof(struct kutf_irq_fixture_data)); + -+ for (i = 0; i < MAX_PIDS; i++) { -+ if (device.pids[i] == pid) { -+ return i; -+ } ++ if (!data) ++ goto fail; ++ ++ /* Acquire the kbase device */ ++ data->kbdev = kbase_find_device(-1); ++ if (data->kbdev == NULL) { ++ kutf_test_fail(context, "Failed to find kbase device"); ++ goto fail; + } + -+ return -1; -+} ++ return data; + -+static int do_umplock_create_locked(_lock_cmd_priv *lock_cmd) -+{ -+ int i_index, ref_index; -+ int ret; -+ _lock_item_s *lock_item = (_lock_item_s *)&lock_cmd->msg; ++fail: ++ return NULL; ++} + -+ i_index = ref_index = -1; ++/** ++ * mali_kutf_irq_default_remove_fixture() - Destroy fixture data previously ++ * created by mali_kutf_irq_default_create_fixture. ++ * ++ * @context: KUTF context. ++ */ ++static void mali_kutf_irq_default_remove_fixture( ++ struct kutf_context *context) ++{ ++ struct kutf_irq_fixture_data *data = context->fixture; ++ struct kbase_device *kbdev = data->kbdev; + -+ ret = umplock_find_client_valid(lock_cmd->pid); -+ if (ret < 0) { -+ /*lock request from an invalid client pid, do nothing*/ -+ return -EINVAL; -+ } ++ kbase_release_device(kbdev); ++} + -+ ret = umplock_find_item_by_pid(lock_cmd, &i_index, &ref_index); -+ if (ret >= 0) { -+ } else if ((i_index = umplock_find_item(lock_item->secure_id)) >= 0) { -+ for (ref_index = 0; ref_index < MAX_PIDS; ref_index++) { -+ if (device.items[i_index].references[ref_index].pid == 0) { -+ break; -+ } -+ } -+ if (ref_index < MAX_PIDS) { -+ device.items[i_index].references[ref_index].pid = lock_cmd->pid; -+ device.items[i_index].references[ref_index].ref_count = 0; -+ device.items[i_index].references[ref_index].down_count = 0; -+ } else { -+ PERROR("whoops, item ran out of available reference slots\n"); -+ return -EINVAL; ++/** ++ * mali_kutf_irq_latency() - measure GPU IRQ latency ++ * @context: kutf context within which to perform the test ++ * ++ * The test triggers IRQs manually, and measures the ++ * time between triggering the IRQ and the IRQ handler being executed. ++ * ++ * This is not a traditional test, in that the pass/fail status has little ++ * meaning (other than indicating that the IRQ handler executed at all). Instead ++ * the results are in the latencies provided with the test result. There is no ++ * meaningful pass/fail result that can be obtained here, instead the latencies ++ * are provided for manual analysis only. ++ */ ++static void mali_kutf_irq_latency(struct kutf_context *context) ++{ ++ struct kutf_irq_fixture_data *data = context->fixture; ++ struct kbase_device *kbdev = data->kbdev; ++ u64 min_time = U64_MAX, max_time = 0, average_time = 0; ++ int i; ++ bool test_failed = false; + -+ } -+ } else { -+ i_index = umplock_find_item(0); ++ /* Force GPU to be powered */ ++ kbase_pm_context_active(kbdev); + -+ if (i_index >= 0) { -+ device.items[i_index].secure_id = lock_item->secure_id; -+ device.items[i_index].id_ref_count = 0; -+ device.items[i_index].usage = lock_item->usage; -+ device.items[i_index].references[0].pid = lock_cmd->pid; -+ device.items[i_index].references[0].ref_count = 0; -+ device.items[i_index].references[0].down_count = 0; -+ sema_init(&device.items[i_index].item_lock, 1); -+ } else { -+ PERROR("whoops, ran out of available slots\n"); -+ return -EINVAL; ++ kbase_set_custom_irq_handler(kbdev, kbase_gpu_irq_custom_handler, ++ GPU_IRQ_HANDLER); ++ ++ for (i = 0; i < NR_TEST_IRQS; i++) { ++ struct timespec64 tval; ++ u64 start_time; ++ int ret; ++ ++ triggered = false; ++ ktime_get_real_ts64(&tval); ++ start_time = SEC_TO_NANO(tval.tv_sec) + (tval.tv_nsec); ++ ++ /* Trigger fake IRQ */ ++ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_RAWSTAT), ++ TEST_IRQ, NULL); ++ ++ ret = wait_event_timeout(wait, triggered != false, IRQ_TIMEOUT); ++ ++ if (ret == 0) { ++ kutf_test_fail(context, "Timed out waiting for IRQ\n"); ++ test_failed = true; ++ break; + } ++ ++ if ((irq_time - start_time) < min_time) ++ min_time = irq_time - start_time; ++ if ((irq_time - start_time) > max_time) ++ max_time = irq_time - start_time; ++ average_time += irq_time - start_time; ++ ++ udelay(10); + } + -+ return 0; ++ /* Go back to default handler */ ++ kbase_set_custom_irq_handler(kbdev, NULL, GPU_IRQ_HANDLER); ++ ++ kbase_pm_context_idle(kbdev); ++ ++ if (!test_failed) { ++ const char *results; ++ ++ do_div(average_time, NR_TEST_IRQS); ++ results = kutf_dsprintf(&context->fixture_pool, ++ "Min latency = %lldns, Max latency = %lldns, Average latency = %lldns\n", ++ min_time, max_time, average_time); ++ kutf_test_pass(context, results); ++ } +} -+/** IOCTLs **/ + -+static int do_umplock_create(_lock_cmd_priv *lock_cmd) ++/** ++ * Module entry point for this test. ++ */ ++int mali_kutf_irq_test_main_init(void) +{ ++ struct kutf_suite *suite; ++ ++ irq_app = kutf_create_application("irq"); ++ suite = kutf_create_suite(irq_app, "irq_default", ++ 1, mali_kutf_irq_default_create_fixture, ++ mali_kutf_irq_default_remove_fixture); ++ ++ kutf_add_test(suite, 0x0, "irq_latency", ++ mali_kutf_irq_latency); + return 0; +} + -+static int do_umplock_process(_lock_cmd_priv *lock_cmd) ++/** ++ * Module exit point for this test. ++ */ ++void mali_kutf_irq_test_main_exit(void) +{ -+ int ret, i_index, ref_index; -+ _lock_item_s *lock_item = (_lock_item_s *)&lock_cmd->msg; ++ kutf_destroy_application(irq_app); ++} + -+ mutex_lock(&device.item_list_lock); ++module_init(mali_kutf_irq_test_main_init); ++module_exit(mali_kutf_irq_test_main_exit); + -+ if (0 == lock_item->secure_id) { -+ PERROR("IOCTL_UMPLOCK_PROCESS called with secure_id is 0, pid: %d\n", lock_cmd->pid); -+ mutex_unlock(&device.item_list_lock); -+ return -EINVAL; -+ } ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("ARM Ltd."); ++MODULE_VERSION("1.0"); +diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/sconscript b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/sconscript +new file mode 100755 +index 000000000..ec837f164 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/sconscript +@@ -0,0 +1,30 @@ ++# ++# (C) COPYRIGHT 2015, 2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+ ret = do_umplock_create_locked(lock_cmd); -+ if (ret < 0) { -+ mutex_unlock(&device.item_list_lock); -+ return -EINVAL; -+ } + -+ ret = umplock_find_item_by_pid(lock_cmd, &i_index, &ref_index); -+ if (ret < 0) { -+ /*fail to find a item*/ -+ PERROR("IOCTL_UMPLOCK_PROCESS called with invalid parameter, pid: %d\n", lock_cmd->pid); -+ mutex_unlock(&device.item_list_lock); -+ return -EINVAL; -+ } -+ device.items[i_index].references[ref_index].ref_count++; -+ device.items[i_index].id_ref_count++; -+ PDEBUG(1, "try to lock, pid: %d, secure_id: 0x%x, ref_count: %d\n", lock_cmd->pid, lock_item->secure_id, device.items[i_index].references[ref_index].ref_count); ++import os ++Import('env') + -+ if (lock_cmd->pid == device.items[i_index].owner) { -+ PDEBUG(1, "already own the lock, pid: %d, secure_id: 0x%x, ref_count: %d\n", lock_cmd->pid, lock_item->secure_id, device.items[i_index].references[ref_index].ref_count); -+ mutex_unlock(&device.item_list_lock); -+ return 0; -+ } ++src = [Glob('#kernel/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/*.c'), Glob('#kernel/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile')] + -+ device.items[i_index].references[ref_index].down_count++; -+ mutex_unlock(&device.item_list_lock); -+ if (down_interruptible(&device.items[i_index].item_lock)) { -+ /*wait up without hold the umplock. restore previous state and return*/ -+ mutex_lock(&device.item_list_lock); -+ device.items[i_index].references[ref_index].ref_count--; -+ device.items[i_index].id_ref_count--; -+ device.items[i_index].references[ref_index].down_count--; -+ if (0 == device.items[i_index].references[ref_index].ref_count) { -+ device.items[i_index].references[ref_index].pid = 0; -+ if (0 == device.items[i_index].id_ref_count) { -+ PDEBUG(1, "release item, pid: %d, secure_id: 0x%x\n", lock_cmd->pid, lock_item->secure_id); -+ device.items[i_index].secure_id = 0; -+ } -+ } ++if env.GetOption('clean') : ++ env.Execute(Action("make clean", '[CLEAN] mali_kutf_irq_test')) ++ cmd = env.Command('$STATIC_LIB_PATH/mali_kutf_irq_test.ko', src, []) ++ env.KernelObjTarget('mali_kutf_irq_test', cmd) ++else: ++ makeAction=Action("cd ${SOURCE.dir} && make MALI_DEBUG=${debug} MALI_BACKEND_KERNEL=1 MALI_ERROR_INJECT_ON=${error_inject} MALI_MODEL=${mali_model} MALI_NO_MALI=${no_mali} MALI_HW_VERSION=${hwver} MALI_UNIT_TEST=${unit} MALI_USE_UMP=${ump} MALI_CUSTOMER_RELEASE=${release} %s %s && ( ( [ -f mali_kutf_irq_test.ko ] && cp mali_kutf_irq_test.ko $STATIC_LIB_PATH/ ) || touch $STATIC_LIB_PATH/mali_kutf_irq_test.ko)" % (env.base_get_qa_settings(), env.kernel_get_config_defines()), '$MAKECOMSTR') ++ cmd = env.Command('$STATIC_LIB_PATH/mali_kutf_irq_test.ko', src, [makeAction]) ++ env.Depends('$STATIC_LIB_PATH/mali_kutf_irq_test.ko', '$STATIC_LIB_PATH/kutf.ko') ++ env.Depends('$STATIC_LIB_PATH/mali_kutf_irq_test.ko', '$STATIC_LIB_PATH/mali_kbase.ko') ++ env.KernelObjTarget('mali_kutf_irq_test', cmd) +diff --git a/drivers/gpu/arm/midgard/tests/sconscript b/drivers/gpu/arm/midgard/tests/sconscript +new file mode 100755 +index 000000000..5337e1078 +--- /dev/null ++++ b/drivers/gpu/arm/midgard/tests/sconscript +@@ -0,0 +1,37 @@ ++# ++# (C) COPYRIGHT 2010-2011, 2013, 2017 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# A copy of the licence is included with the program, and can also be obtained ++# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301, USA. ++# ++# + -+ PERROR("failed lock, pid: %d, secure_id: 0x%x, ref_count: %d\n", lock_cmd->pid, lock_item->secure_id, device.items[i_index].references[ref_index].ref_count); + -+ mutex_unlock(&device.item_list_lock); -+ return -ERESTARTSYS; -+ } ++Import ('env') + -+ mutex_lock(&device.item_list_lock); -+ PDEBUG(1, "got lock, pid: %d, secure_id: 0x%x, ref_count: %d\n", lock_cmd->pid, lock_item->secure_id, device.items[i_index].references[ref_index].ref_count); -+ device.items[i_index].owner = lock_cmd->pid; -+ mutex_unlock(&device.item_list_lock); ++kutf_env = env.Clone() ++kutf_env.Append(CPPPATH = '#kernel/drivers/gpu/arm/midgard/tests/include') ++Export('kutf_env') ++ ++if Glob('internal/sconscript'): ++ SConscript('internal/sconscript') ++ ++if kutf_env['debug'] == '1': ++ SConscript('kutf/sconscript') ++ SConscript('mali_kutf_irq_test/sconscript') ++ ++ if Glob('kutf_test/sconscript'): ++ SConscript('kutf_test/sconscript') ++ ++ if Glob('kutf_test_runner/sconscript'): ++ SConscript('kutf_test_runner/sconscript') ++ ++if env['unit'] == '1': ++ SConscript('mali_kutf_ipa_test/sconscript') ++ SConscript('mali_kutf_vinstr_test/sconscript') +diff --git a/drivers/gpu/arm/sconscript b/drivers/gpu/arm/sconscript +new file mode 100755 +index 000000000..a06092bd5 +--- /dev/null ++++ b/drivers/gpu/arm/sconscript +@@ -0,0 +1,25 @@ ++# ++# (C) COPYRIGHT 2015-2016 ARM Limited. All rights reserved. ++# ++# This program is free software and is provided to you under the terms of the ++# GNU General Public License version 2 as published by the Free Software ++# Foundation, and any use by you of this program is subject to the terms ++# of such GNU licence. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, you can access it online at ++# http://www.gnu.org/licenses/gpl-2.0.html. ++# ++# SPDX-License-Identifier: GPL-2.0 ++# ++# ++ ++import glob ++ ++ ++SConscript('midgard/sconscript') +diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig +index 4e9b3a95f..95994151a 100644 +--- a/drivers/gpu/drm/Kconfig ++++ b/drivers/gpu/drm/Kconfig +@@ -32,6 +32,10 @@ config DRM_MIPI_DBI + depends on DRM + select DRM_KMS_HELPER + ++config DRM_IGNORE_IOTCL_PERMIT ++ bool "Ignore drm ioctl permission" ++ depends on DRM && ANDROID && NO_GKI ++ + config DRM_MIPI_DSI + bool + depends on DRM +diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +index e8baa0745..53264c731 100644 +--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c ++++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +@@ -8,11 +8,13 @@ + + #include + #include ++#include + #include + #include + #include + #include + #include ++#include + #include + #include + #include +@@ -30,16 +32,52 @@ + + #include "analogix_dp_core.h" + #include "analogix_dp_reg.h" ++#include "../../rockchip/rockchip_drm_drv.h" + + #define to_dp(nm) container_of(nm, struct analogix_dp_device, nm) + + static const bool verify_fast_training; + ++#ifdef CONFIG_NO_GKI ++#undef EXTCON_DISP_DP ++#define EXTCON_DISP_DP EXTCON_DISP_EDP ++#endif ++ ++static const unsigned int analogix_dp_cable[] = { ++ EXTCON_DISP_DP, ++ EXTCON_NONE, ++}; ++ + struct bridge_init { + struct i2c_client *client; + struct device_node *node; + }; + ++static void analogix_dp_bridge_mode_set(struct drm_bridge *bridge, ++ const struct drm_display_mode *adj_mode); ++ ++static bool analogix_dp_bandwidth_ok(struct analogix_dp_device *dp, ++ const struct drm_display_mode *mode, ++ unsigned int rate, unsigned int lanes) ++{ ++ const struct drm_display_info *info; ++ u32 max_bw, req_bw, bpp = 24; ++ ++ if (dp->plat_data->skip_connector) ++ return true; ++ ++ info = &dp->connector.display_info; ++ if (info->bpc) ++ bpp = 3 * info->bpc; ++ ++ req_bw = mode->clock * bpp / 8; ++ max_bw = lanes * rate; ++ if (req_bw > max_bw) ++ return false; ++ ++ return true; ++} ++ + static int analogix_dp_init_dp(struct analogix_dp_device *dp) + { + int ret; +@@ -64,42 +102,56 @@ static int analogix_dp_init_dp(struct analogix_dp_device *dp) + return 0; + } + +-static int analogix_dp_detect_hpd(struct analogix_dp_device *dp) ++static int analogix_dp_panel_prepare(struct analogix_dp_device *dp) + { +- int timeout_loop = 0; ++ int ret; + +- while (timeout_loop < DP_TIMEOUT_LOOP_COUNT) { +- if (analogix_dp_get_plug_in_status(dp) == 0) +- return 0; ++ mutex_lock(&dp->panel_lock); + +- timeout_loop++; +- usleep_range(1000, 1100); +- } ++ if (dp->panel_is_prepared) ++ goto out; + +- /* +- * Some edp screen do not have hpd signal, so we can't just +- * return failed when hpd plug in detect failed, DT property +- * "force-hpd" would indicate whether driver need this. +- */ +- if (!dp->force_hpd) +- return -ETIMEDOUT; ++ ret = drm_panel_prepare(dp->plat_data->panel); ++ if (ret) ++ goto out; + +- /* +- * The eDP TRM indicate that if HPD_STATUS(RO) is 0, AUX CH +- * will not work, so we need to give a force hpd action to +- * set HPD_STATUS manually. +- */ +- dev_dbg(dp->dev, "failed to get hpd plug status, try to force hpd\n"); ++ dp->panel_is_prepared = true; + ++out: ++ mutex_unlock(&dp->panel_lock); + return 0; +} + -+static int do_umplock_release(_lock_cmd_priv *lock_cmd) ++static int analogix_dp_panel_unprepare(struct analogix_dp_device *dp) +{ -+ int ret, i_index, ref_index, call_up; -+ _lock_item_s *lock_item = (_lock_item_s *)&lock_cmd->msg; ++ int ret; + -+ mutex_lock(&device.item_list_lock); ++ mutex_lock(&dp->panel_lock); + -+ if (0 == lock_item->secure_id) { -+ PERROR("IOCTL_UMPLOCK_RELEASE called with secure_id is 0, pid: %d\n", lock_cmd->pid); -+ mutex_unlock(&device.item_list_lock); -+ return -EINVAL; -+ } ++ if (!dp->panel_is_prepared) ++ goto out; + -+ ret = umplock_find_client_valid(lock_cmd->pid); -+ if (ret < 0) { -+ /*lock request from an invalid client pid, do nothing*/ -+ mutex_unlock(&device.item_list_lock); -+ return -EPERM; -+ } ++ ret = drm_panel_unprepare(dp->plat_data->panel); ++ if (ret) ++ goto out; + -+ i_index = ref_index = -1; ++ dp->panel_is_prepared = false; + -+ ret = umplock_find_item_by_pid(lock_cmd, &i_index, &ref_index); -+ if (ret < 0) { -+ /*fail to find item*/ -+ PERROR("IOCTL_UMPLOCK_RELEASE called with invalid parameter pid: %d, secid: 0x%x\n", lock_cmd->pid, lock_item->secure_id); -+ mutex_unlock(&device.item_list_lock); -+ return -EINVAL; -+ } ++out: ++ mutex_unlock(&dp->panel_lock); ++ return 0; ++} + +- analogix_dp_force_hpd(dp); ++static int analogix_dp_detect_hpd(struct analogix_dp_device *dp) ++{ ++ if (dp->force_hpd) ++ analogix_dp_force_hpd(dp); + + if (analogix_dp_get_plug_in_status(dp) != 0) { + dev_err(dp->dev, "failed to get hpd plug in status\n"); + return -EINVAL; + } + +- dev_dbg(dp->dev, "success to get plug in status after force hpd\n"); +- + return 0; + } + +@@ -108,6 +160,9 @@ static bool analogix_dp_detect_sink_psr(struct analogix_dp_device *dp) + unsigned char psr_version; + int ret; + ++ if (!device_property_read_bool(dp->dev, "support-psr")) ++ return 0; + -+ /* if the lock is not owned by this process */ -+ if (lock_cmd->pid != device.items[i_index].owner) { -+ mutex_unlock(&device.item_list_lock); -+ return -EPERM; -+ } + ret = drm_dp_dpcd_readb(&dp->aux, DP_PSR_SUPPORT, &psr_version); + if (ret != 1) { + dev_err(dp->dev, "failed to get PSR version, disable it\n"); +@@ -216,8 +271,24 @@ static int analogix_dp_set_enhanced_mode(struct analogix_dp_device *dp) + if (ret < 0) + return ret; + ++ if (!data) { ++ /* ++ * A setting of 1 indicates that this is an eDP device that ++ * uses only Enhanced Framing, independently of the setting by ++ * the source of ENHANCED_FRAME_EN ++ */ ++ ret = drm_dp_dpcd_readb(&dp->aux, DP_EDP_CONFIGURATION_CAP, ++ &data); ++ if (ret < 0) ++ return ret; + -+ /* if the ref_count is 0, that means nothing to unlock, just return */ -+ if (0 == device.items[i_index].references[ref_index].ref_count) { -+ mutex_unlock(&device.item_list_lock); -+ return 0; ++ data = !!(data & DP_FRAMING_CHANGE_CAP); + } + -+ device.items[i_index].references[ref_index].ref_count--; -+ device.items[i_index].id_ref_count--; -+ PDEBUG(1, "unlock, pid: %d, secure_id: 0x%x, ref_count: %d\n", lock_cmd->pid, lock_item->secure_id, device.items[i_index].references[ref_index].ref_count); + analogix_dp_enable_enhanced_mode(dp, data); + ++ dp->link_train.enhanced_framing = data; + -+ call_up = 0; -+ if (device.items[i_index].references[ref_index].down_count > 1) { -+ call_up = 1; -+ device.items[i_index].references[ref_index].down_count--; -+ } -+ if (0 == device.items[i_index].references[ref_index].ref_count) { -+ device.items[i_index].references[ref_index].pid = 0; -+ if (0 == device.items[i_index].id_ref_count) { -+ PDEBUG(1, "release item, pid: %d, secure_id: 0x%x\n", lock_cmd->pid, lock_item->secure_id); -+ device.items[i_index].secure_id = 0; -+ } -+ device.items[i_index].owner = 0; -+ call_up = 1; -+ } -+ if (call_up) { -+ PDEBUG(1, "call up, pid: %d, secure_id: 0x%x\n", lock_cmd->pid, lock_item->secure_id); -+ up(&device.items[i_index].item_lock); -+ } -+ mutex_unlock(&device.item_list_lock); + return 0; + } + +@@ -233,32 +304,27 @@ static int analogix_dp_training_pattern_dis(struct analogix_dp_device *dp) + return ret < 0 ? ret : 0; + } + +-static void +-analogix_dp_set_lane_lane_pre_emphasis(struct analogix_dp_device *dp, +- int pre_emphasis, int lane) ++static bool analogix_dp_get_vrr_capable(struct analogix_dp_device *dp) + { +- switch (lane) { +- case 0: +- analogix_dp_set_lane0_pre_emphasis(dp, pre_emphasis); +- break; +- case 1: +- analogix_dp_set_lane1_pre_emphasis(dp, pre_emphasis); +- break; ++ struct drm_connector *connector = &dp->connector; ++ struct drm_display_info *info = &connector->display_info; + +- case 2: +- analogix_dp_set_lane2_pre_emphasis(dp, pre_emphasis); +- break; ++ if (!info->monitor_range.max_vfreq) ++ return false; ++ if (!info->monitor_range.min_vfreq) ++ return false; ++ if (info->monitor_range.max_vfreq < info->monitor_range.min_vfreq) ++ return false; ++ if (!drm_dp_sink_can_do_video_without_timing_msa(dp->dpcd)) ++ return false; + +- case 3: +- analogix_dp_set_lane3_pre_emphasis(dp, pre_emphasis); +- break; +- } ++ return true; + } + + static int analogix_dp_link_start(struct analogix_dp_device *dp) + { + u8 buf[4]; +- int lane, lane_count, pll_tries, retval; ++ int lane, lane_count, retval; + + lane_count = dp->link_train.lane_count; + +@@ -278,6 +344,16 @@ static int analogix_dp_link_start(struct analogix_dp_device *dp) + retval = drm_dp_dpcd_write(&dp->aux, DP_LINK_BW_SET, buf, 2); + if (retval < 0) + return retval; + -+ return 0; -+} ++ /* Spread AMP if required, enable 8b/10b coding */ ++ buf[0] = analogix_dp_ssc_supported(dp) ? DP_SPREAD_AMP_0_5 : 0; ++ if (analogix_dp_get_vrr_capable(dp)) ++ buf[0] |= DP_MSA_TIMING_PAR_IGNORE_EN; ++ buf[1] = DP_SET_ANSI_8B10B; ++ retval = drm_dp_dpcd_write(&dp->aux, DP_DOWNSPREAD_CTRL, buf, 2); ++ if (retval < 0) ++ return retval; + -+static int do_umplock_zap(void) + /* set enhanced mode if available */ + retval = analogix_dp_set_enhanced_mode(dp); + if (retval < 0) { +@@ -285,22 +361,12 @@ static int analogix_dp_link_start(struct analogix_dp_device *dp) + return retval; + } + +- /* Set TX pre-emphasis to minimum */ ++ /* Set TX voltage-swing and pre-emphasis to minimum */ + for (lane = 0; lane < lane_count; lane++) +- analogix_dp_set_lane_lane_pre_emphasis(dp, +- PRE_EMPHASIS_LEVEL_0, lane); +- +- /* Wait for PLL lock */ +- pll_tries = 0; +- while (analogix_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) { +- if (pll_tries == DP_TIMEOUT_LOOP_COUNT) { +- dev_err(dp->dev, "Wait for PLL lock timed out\n"); +- return -ETIMEDOUT; +- } +- +- pll_tries++; +- usleep_range(90, 120); +- } ++ dp->link_train.training_lane[lane] = ++ DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | ++ DP_TRAIN_PRE_EMPH_LEVEL_0; ++ analogix_dp_set_lane_link_training(dp); + + /* Set training pattern 1 */ + analogix_dp_set_training_pattern(dp, TRAINING_PTN1); +@@ -383,54 +449,6 @@ static unsigned char analogix_dp_get_adjust_request_pre_emphasis( + return ((link_value >> shift) & 0xc) >> 2; + } + +-static void analogix_dp_set_lane_link_training(struct analogix_dp_device *dp, +- u8 training_lane_set, int lane) +-{ +- switch (lane) { +- case 0: +- analogix_dp_set_lane0_link_training(dp, training_lane_set); +- break; +- case 1: +- analogix_dp_set_lane1_link_training(dp, training_lane_set); +- break; +- +- case 2: +- analogix_dp_set_lane2_link_training(dp, training_lane_set); +- break; +- +- case 3: +- analogix_dp_set_lane3_link_training(dp, training_lane_set); +- break; +- } +-} +- +-static unsigned int +-analogix_dp_get_lane_link_training(struct analogix_dp_device *dp, +- int lane) +-{ +- u32 reg; +- +- switch (lane) { +- case 0: +- reg = analogix_dp_get_lane0_link_training(dp); +- break; +- case 1: +- reg = analogix_dp_get_lane1_link_training(dp); +- break; +- case 2: +- reg = analogix_dp_get_lane2_link_training(dp); +- break; +- case 3: +- reg = analogix_dp_get_lane3_link_training(dp); +- break; +- default: +- WARN_ON(1); +- return 0; +- } +- +- return reg; +-} +- + static void analogix_dp_reduce_link_rate(struct analogix_dp_device *dp) + { + analogix_dp_training_pattern_dis(dp); +@@ -463,13 +481,27 @@ static void analogix_dp_get_adjust_training_lane(struct analogix_dp_device *dp, + } + } + ++static bool analogix_dp_tps3_supported(struct analogix_dp_device *dp) +{ -+ int i; ++ bool source_tps3_supported, sink_tps3_supported; ++ u8 dpcd = 0; + -+ PDEBUG(1, "ZAP ALL ENTRIES!\n"); ++ source_tps3_supported = ++ dp->video_info.max_link_rate == DP_LINK_BW_5_4; ++ drm_dp_dpcd_readb(&dp->aux, DP_MAX_LANE_COUNT, &dpcd); ++ sink_tps3_supported = dpcd & DP_TPS3_SUPPORTED; + -+ mutex_lock(&device.item_list_lock); ++ return source_tps3_supported && sink_tps3_supported; ++} + -+ for (i = 0; i < MAX_ITEMS; i++) { -+ device.items[i].secure_id = 0; -+ memset(&device.items[i].references, 0, sizeof(_lock_ref) * MAX_PIDS); -+ sema_init(&device.items[i].item_lock, 1); + static int analogix_dp_process_clock_recovery(struct analogix_dp_device *dp) + { + int lane, lane_count, retval; + u8 voltage_swing, pre_emphasis, training_lane; + u8 link_status[2], adjust_request[2]; ++ u8 training_pattern = TRAINING_PTN2; + +- usleep_range(100, 101); ++ drm_dp_link_train_clock_recovery_delay(dp->dpcd); + + lane_count = dp->link_train.lane_count; + +@@ -477,24 +509,30 @@ static int analogix_dp_process_clock_recovery(struct analogix_dp_device *dp) + if (retval < 0) + return retval; + +- retval = drm_dp_dpcd_read(&dp->aux, DP_ADJUST_REQUEST_LANE0_1, +- adjust_request, 2); +- if (retval < 0) +- return retval; +- + if (analogix_dp_clock_recovery_ok(link_status, lane_count) == 0) { +- /* set training pattern 2 for EQ */ +- analogix_dp_set_training_pattern(dp, TRAINING_PTN2); ++ if (analogix_dp_tps3_supported(dp)) ++ training_pattern = TRAINING_PTN3; ++ ++ /* set training pattern for EQ */ ++ analogix_dp_set_training_pattern(dp, training_pattern); + + retval = drm_dp_dpcd_writeb(&dp->aux, DP_TRAINING_PATTERN_SET, + DP_LINK_SCRAMBLING_DISABLE | +- DP_TRAINING_PATTERN_2); ++ (training_pattern == TRAINING_PTN3 ? ++ DP_TRAINING_PATTERN_3 : DP_TRAINING_PATTERN_2)); + if (retval < 0) + return retval; + + dev_dbg(dp->dev, "Link Training Clock Recovery success\n"); + dp->link_train.lt_state = EQUALIZER_TRAINING; ++ ++ return 0; + } else { ++ retval = drm_dp_dpcd_read(&dp->aux, DP_ADJUST_REQUEST_LANE0_1, ++ adjust_request, 2); ++ if (retval < 0) ++ return retval; ++ + for (lane = 0; lane < lane_count; lane++) { + training_lane = analogix_dp_get_lane_link_training( + dp, lane); +@@ -522,10 +560,7 @@ static int analogix_dp_process_clock_recovery(struct analogix_dp_device *dp) + } + + analogix_dp_get_adjust_training_lane(dp, adjust_request); +- +- for (lane = 0; lane < lane_count; lane++) +- analogix_dp_set_lane_link_training(dp, +- dp->link_train.training_lane[lane], lane); ++ analogix_dp_set_lane_link_training(dp); + + retval = drm_dp_dpcd_write(&dp->aux, DP_TRAINING_LANE0_SET, + dp->link_train.training_lane, lane_count); +@@ -537,11 +572,11 @@ static int analogix_dp_process_clock_recovery(struct analogix_dp_device *dp) + + static int analogix_dp_process_equalizer_training(struct analogix_dp_device *dp) + { +- int lane, lane_count, retval; ++ int lane_count, retval; + u32 reg; + u8 link_align, link_status[2], adjust_request[2]; + +- usleep_range(400, 401); ++ drm_dp_link_train_channel_eq_delay(dp->dpcd); + + lane_count = dp->link_train.lane_count; + +@@ -554,18 +589,11 @@ static int analogix_dp_process_equalizer_training(struct analogix_dp_device *dp) + return -EIO; + } + +- retval = drm_dp_dpcd_read(&dp->aux, DP_ADJUST_REQUEST_LANE0_1, +- adjust_request, 2); +- if (retval < 0) +- return retval; +- + retval = drm_dp_dpcd_readb(&dp->aux, DP_LANE_ALIGN_STATUS_UPDATED, + &link_align); + if (retval < 0) + return retval; + +- analogix_dp_get_adjust_training_lane(dp, adjust_request); +- + if (!analogix_dp_channel_eq_ok(link_status, link_align, lane_count)) { + /* traing pattern Set to Normal */ + retval = analogix_dp_training_pattern_dis(dp); +@@ -597,9 +625,13 @@ static int analogix_dp_process_equalizer_training(struct analogix_dp_device *dp) + return -EIO; + } + +- for (lane = 0; lane < lane_count; lane++) +- analogix_dp_set_lane_link_training(dp, +- dp->link_train.training_lane[lane], lane); ++ retval = drm_dp_dpcd_read(&dp->aux, DP_ADJUST_REQUEST_LANE0_1, ++ adjust_request, 2); ++ if (retval < 0) ++ return retval; ++ ++ analogix_dp_get_adjust_training_lane(dp, adjust_request); ++ analogix_dp_set_lane_link_training(dp); + + retval = drm_dp_dpcd_write(&dp->aux, DP_TRAINING_LANE0_SET, + dp->link_train.training_lane, lane_count); +@@ -609,10 +641,11 @@ static int analogix_dp_process_equalizer_training(struct analogix_dp_device *dp) + return 0; + } + +-static void analogix_dp_get_max_rx_bandwidth(struct analogix_dp_device *dp, +- u8 *bandwidth) ++static int analogix_dp_get_max_rx_bandwidth(struct analogix_dp_device *dp, ++ u8 *bandwidth) + { + u8 data; ++ int ret; + + /* + * For DP rev.1.1, Maximum link rate of Main Link lanes +@@ -620,28 +653,41 @@ static void analogix_dp_get_max_rx_bandwidth(struct analogix_dp_device *dp, + * For DP rev.1.2, Maximum link rate of Main Link lanes + * 0x06 = 1.62 Gbps, 0x0a = 2.7 Gbps, 0x14 = 5.4Gbps + */ +- drm_dp_dpcd_readb(&dp->aux, DP_MAX_LINK_RATE, &data); ++ ret = drm_dp_dpcd_readb(&dp->aux, DP_MAX_LINK_RATE, &data); ++ if (ret < 0) ++ return ret; ++ + *bandwidth = data; ++ ++ return 0; + } + +-static void analogix_dp_get_max_rx_lane_count(struct analogix_dp_device *dp, +- u8 *lane_count) ++static int analogix_dp_get_max_rx_lane_count(struct analogix_dp_device *dp, ++ u8 *lane_count) + { + u8 data; ++ int ret; + + /* + * For DP rev.1.1, Maximum number of Main Link lanes + * 0x01 = 1 lane, 0x02 = 2 lanes, 0x04 = 4 lanes + */ +- drm_dp_dpcd_readb(&dp->aux, DP_MAX_LANE_COUNT, &data); ++ ret = drm_dp_dpcd_readb(&dp->aux, DP_MAX_LANE_COUNT, &data); ++ if (ret < 0) ++ return ret; ++ + *lane_count = DPCD_MAX_LANE_COUNT(data); ++ ++ return 0; + } + + static int analogix_dp_full_link_train(struct analogix_dp_device *dp, + u32 max_lanes, u32 max_rate) + { ++ struct video_info *video = &dp->video_info; + int retval = 0; + bool training_finished = false; ++ u8 dpcd; + + /* + * MACRO_RST must be applied after the PLL_LOCK to avoid +@@ -653,25 +699,19 @@ static int analogix_dp_full_link_train(struct analogix_dp_device *dp, + analogix_dp_get_max_rx_bandwidth(dp, &dp->link_train.link_rate); + analogix_dp_get_max_rx_lane_count(dp, &dp->link_train.lane_count); + +- if ((dp->link_train.link_rate != DP_LINK_BW_1_62) && +- (dp->link_train.link_rate != DP_LINK_BW_2_7) && +- (dp->link_train.link_rate != DP_LINK_BW_5_4)) { +- dev_err(dp->dev, "Rx Max Link Rate is abnormal :%x !\n", +- dp->link_train.link_rate); +- dp->link_train.link_rate = DP_LINK_BW_1_62; +- } ++ /* Setup TX lane count & rate */ ++ dp->link_train.lane_count = min_t(u32, dp->link_train.lane_count, max_lanes); ++ dp->link_train.link_rate = min_t(u32, dp->link_train.link_rate, max_rate); + +- if (dp->link_train.lane_count == 0) { +- dev_err(dp->dev, "Rx Max Lane count is abnormal :%x !\n", +- dp->link_train.lane_count); +- dp->link_train.lane_count = (u8)LANE_COUNT1; ++ if (!analogix_dp_bandwidth_ok(dp, &video->mode, ++ drm_dp_bw_code_to_link_rate(dp->link_train.link_rate), ++ dp->link_train.lane_count)) { ++ dev_err(dp->dev, "bandwidth overflow\n"); ++ return -EINVAL; + } + +- /* Setup TX lane count & rate */ +- if (dp->link_train.lane_count > max_lanes) +- dp->link_train.lane_count = max_lanes; +- if (dp->link_train.link_rate > max_rate) +- dp->link_train.link_rate = max_rate; ++ drm_dp_dpcd_readb(&dp->aux, DP_MAX_DOWNSPREAD, &dpcd); ++ dp->link_train.ssc = !!(dpcd & DP_MAX_DOWNSPREAD_0_5); + + /* All DP analog module power up */ + analogix_dp_set_analog_power_down(dp, POWER_ALL, 0); +@@ -711,27 +751,15 @@ static int analogix_dp_full_link_train(struct analogix_dp_device *dp, + + static int analogix_dp_fast_link_train(struct analogix_dp_device *dp) + { +- int i, ret; ++ int ret; + u8 link_align, link_status[2]; +- enum pll_status status; + + analogix_dp_reset_macro(dp); + + analogix_dp_set_link_bandwidth(dp, dp->link_train.link_rate); + analogix_dp_set_lane_count(dp, dp->link_train.lane_count); +- +- for (i = 0; i < dp->link_train.lane_count; i++) { +- analogix_dp_set_lane_link_training(dp, +- dp->link_train.training_lane[i], i); +- } +- +- ret = readx_poll_timeout(analogix_dp_get_pll_lock_status, dp, status, +- status != PLL_UNLOCKED, 120, +- 120 * DP_TIMEOUT_LOOP_COUNT); +- if (ret) { +- DRM_DEV_ERROR(dp->dev, "Wait for pll lock failed %d\n", ret); +- return ret; +- } ++ analogix_dp_set_lane_link_training(dp); ++ analogix_dp_enable_enhanced_mode(dp, dp->link_train.enhanced_framing); + + /* source Set training pattern 1 */ + analogix_dp_set_training_pattern(dp, TRAINING_PTN1); +@@ -742,7 +770,6 @@ static int analogix_dp_fast_link_train(struct analogix_dp_device *dp) + /* From DP spec, pattern must be on-screen for a minimum 500us */ + usleep_range(500, 600); + +- /* TODO: enhanced_mode?*/ + analogix_dp_set_training_pattern(dp, DP_NONE); + + /* +@@ -822,7 +849,7 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp) + analogix_dp_set_video_cr_mn(dp, CALCULATED_M, 0, 0); + + /* For video bist, Video timing must be generated by register */ +- analogix_dp_set_video_timing_mode(dp, VIDEO_TIMING_FROM_CAPTURE); ++ analogix_dp_set_video_timing_mode(dp, VIDEO_TIMING_FROM_REGISTER); + + /* Disable video mute */ + analogix_dp_enable_video_mute(dp, 0); +@@ -884,123 +911,309 @@ static int analogix_dp_enable_scramble(struct analogix_dp_device *dp, + return ret < 0 ? ret : 0; + } + +-static irqreturn_t analogix_dp_hardirq(int irq, void *arg) ++static u8 analogix_dp_autotest_phy_pattern(struct analogix_dp_device *dp) + { +- struct analogix_dp_device *dp = arg; +- irqreturn_t ret = IRQ_NONE; +- enum dp_irq_type irq_type; ++ struct drm_dp_phy_test_params *data = &dp->compliance.phytest; + +- irq_type = analogix_dp_get_irq_type(dp); +- if (irq_type != DP_IRQ_TYPE_UNKNOWN) { +- analogix_dp_mute_hpd_interrupt(dp); +- ret = IRQ_WAKE_THREAD; ++ if (drm_dp_get_phy_test_pattern(&dp->aux, data)) { ++ dev_err(dp->dev, "DP Phy Test pattern AUX read failure\n"); ++ return DP_TEST_NAK; + } + +- return ret; ++ if (data->link_rate > drm_dp_bw_code_to_link_rate(dp->video_info.max_link_rate)) { ++ dev_err(dp->dev, "invalid link rate = 0x%x\n", data->link_rate); ++ return DP_TEST_NAK; + } + -+ for (i = 0; i < MAX_PIDS; i++) { -+ device.pids[i] = 0; ++ /* Set test active flag here so userspace doesn't interrupt things */ ++ dp->compliance.test_active = true; ++ ++ return DP_TEST_ACK; + } + +-static irqreturn_t analogix_dp_irq_thread(int irq, void *arg) ++static void analogix_dp_handle_test_request(struct analogix_dp_device *dp) + { +- struct analogix_dp_device *dp = arg; +- enum dp_irq_type irq_type; ++ u8 response = DP_TEST_NAK; ++ u8 request = 0; ++ int ret; + +- irq_type = analogix_dp_get_irq_type(dp); +- if (irq_type & DP_IRQ_TYPE_HP_CABLE_IN || +- irq_type & DP_IRQ_TYPE_HP_CABLE_OUT) { +- dev_dbg(dp->dev, "Detected cable status changed!\n"); +- if (dp->drm_dev) +- drm_helper_hpd_irq_event(dp->drm_dev); ++ ret = drm_dp_dpcd_readb(&dp->aux, DP_TEST_REQUEST, &request); ++ if (ret < 0) { ++ dev_err(dp->dev, "Could not read test request from sink\n"); ++ goto update_status; + } + +- if (irq_type != DP_IRQ_TYPE_UNKNOWN) { +- analogix_dp_clear_hotplug_interrupts(dp); +- analogix_dp_unmute_hpd_interrupt(dp); ++ switch (request) { ++ case DP_TEST_LINK_PHY_TEST_PATTERN: ++ dev_info(dp->dev, "PHY_PATTERN test requested\n"); ++ response = analogix_dp_autotest_phy_pattern(dp); ++ break; ++ default: ++ dev_err(dp->dev, "Invalid test request '%02x'\n", request); ++ break; + } + +- return IRQ_HANDLED; ++ if (response & DP_TEST_ACK) ++ dp->compliance.test_type = request; ++ ++update_status: ++ ret = drm_dp_dpcd_writeb(&dp->aux, DP_TEST_RESPONSE, response); ++ if (ret < 0) ++ dev_err(dp->dev, "Could not write test response to sink\n"); + } + +-static int analogix_dp_fast_link_train_detection(struct analogix_dp_device *dp) ++void analogix_dp_check_device_service_irq(struct analogix_dp_device *dp) + { ++ u8 val; + int ret; +- u8 spread; + +- ret = drm_dp_dpcd_readb(&dp->aux, DP_MAX_DOWNSPREAD, &spread); +- if (ret != 1) { +- dev_err(dp->dev, "failed to read downspread %d\n", ret); +- return ret; +- } +- dp->fast_train_enable = !!(spread & DP_NO_AUX_HANDSHAKE_LINK_TRAINING); +- dev_dbg(dp->dev, "fast link training %s\n", +- dp->fast_train_enable ? "supported" : "unsupported"); +- return 0; ++ ret = drm_dp_dpcd_readb(&dp->aux, DP_DEVICE_SERVICE_IRQ_VECTOR, &val); ++ if (ret < 0 || !val) ++ return; ++ ++ ret = drm_dp_dpcd_writeb(&dp->aux, DP_DEVICE_SERVICE_IRQ_VECTOR, val); ++ if (ret < 0) ++ return; ++ ++ if (val & DP_AUTOMATED_TEST_REQUEST) ++ analogix_dp_handle_test_request(dp); + } ++EXPORT_SYMBOL_GPL(analogix_dp_check_device_service_irq); + +-static int analogix_dp_commit(struct analogix_dp_device *dp) ++static void analogix_dp_process_phy_request(struct analogix_dp_device *dp) + { ++ struct drm_dp_phy_test_params *data = &dp->compliance.phytest; ++ u8 spread, adjust_request[2]; + int ret; + +- /* Keep the panel disabled while we configure video */ +- if (dp->plat_data->panel) { +- if (drm_panel_disable(dp->plat_data->panel)) +- DRM_ERROR("failed to disable the panel\n"); +- } +- +- ret = analogix_dp_train_link(dp); +- if (ret) { +- dev_err(dp->dev, "unable to do link train, ret=%d\n", ret); +- return ret; +- } ++ dp->link_train.link_rate = drm_dp_link_rate_to_bw_code(data->link_rate); ++ dp->link_train.lane_count = data->num_lanes; + +- ret = analogix_dp_enable_scramble(dp, 1); ++ ret = drm_dp_dpcd_readb(&dp->aux, DP_MAX_DOWNSPREAD, &spread); + if (ret < 0) { +- dev_err(dp->dev, "can not enable scramble\n"); +- return ret; ++ dev_err(dp->dev, "Could not read ssc from sink\n"); ++ return; + } + +- analogix_dp_init_video(dp); +- ret = analogix_dp_config_video(dp); +- if (ret) { +- dev_err(dp->dev, "unable to config video\n"); +- return ret; +- } ++ dp->link_train.ssc = !!(spread & DP_MAX_DOWNSPREAD_0_5); + +- /* Safe to enable the panel now */ +- if (dp->plat_data->panel) { +- ret = drm_panel_enable(dp->plat_data->panel); +- if (ret) { +- DRM_ERROR("failed to enable the panel\n"); +- return ret; +- } ++ ret = drm_dp_dpcd_read(&dp->aux, DP_ADJUST_REQUEST_LANE0_1, ++ adjust_request, 2); ++ if (ret < 0) { ++ dev_err(dp->dev, "Could not read swing/pre-emphasis\n"); ++ return; + } + +- /* Check whether panel supports fast training */ +- ret = analogix_dp_fast_link_train_detection(dp); +- if (ret) +- return ret; ++ analogix_dp_set_link_bandwidth(dp, dp->link_train.link_rate); ++ analogix_dp_set_lane_count(dp, dp->link_train.lane_count); ++ analogix_dp_get_adjust_training_lane(dp, adjust_request); ++ analogix_dp_set_lane_link_training(dp); + +- if (analogix_dp_detect_sink_psr(dp)) { +- ret = analogix_dp_enable_sink_psr(dp); +- if (ret) +- return ret; ++ switch (data->phy_pattern) { ++ case DP_PHY_TEST_PATTERN_NONE: ++ dev_info(dp->dev, "Disable Phy Test Pattern\n"); ++ analogix_dp_set_training_pattern(dp, DP_NONE); ++ break; ++ case DP_PHY_TEST_PATTERN_D10_2: ++ dev_info(dp->dev, "Set D10.2 Phy Test Pattern\n"); ++ analogix_dp_set_training_pattern(dp, D10_2); ++ break; ++ case DP_PHY_TEST_PATTERN_PRBS7: ++ dev_info(dp->dev, "Set PRBS7 Phy Test Pattern\n"); ++ analogix_dp_set_training_pattern(dp, PRBS7); ++ break; ++ case DP_PHY_TEST_PATTERN_80BIT_CUSTOM: ++ dev_info(dp->dev, "Set 80Bit Custom Phy Test Pattern\n"); ++ analogix_dp_set_training_pattern(dp, TEST_PATTERN_80BIT); ++ break; ++ case DP_PHY_TEST_PATTERN_CP2520: ++ dev_info(dp->dev, "Set HBR2 compliance Phy Test Pattern\n"); ++ analogix_dp_set_training_pattern(dp, TEST_PATTERN_HBR2); ++ break; ++ default: ++ dev_err(dp->dev, "Invalid Phy Test Pattern: %d\n", data->phy_pattern); ++ return; + } + +- return ret; ++ drm_dp_set_phy_test_pattern(&dp->aux, data, 0x11); + } + +-static int analogix_dp_enable_psr(struct analogix_dp_device *dp) ++void analogix_dp_phy_test(struct analogix_dp_device *dp) + { +- struct dp_sdp psr_vsc; ++ struct drm_device *dev = dp->drm_dev; ++ struct drm_modeset_acquire_ctx ctx; + int ret; +- u8 sink; + +- ret = drm_dp_dpcd_readb(&dp->aux, DP_PSR_STATUS, &sink); +- if (ret != 1) +- DRM_DEV_ERROR(dp->dev, "Failed to read psr status %d\n", ret); +- else if (sink == DP_PSR_SINK_ACTIVE_RFB) +- return 0; ++ DRM_DEV_INFO(dp->dev, "PHY test\n"); + +- /* Prepare VSC packet as per EDP 1.4 spec, Table 6.9 */ ++ drm_modeset_acquire_init(&ctx, 0); ++ for (;;) { ++ ret = drm_modeset_lock(&dev->mode_config.connection_mutex, &ctx); ++ if (ret != -EDEADLK) ++ break; ++ ++ drm_modeset_backoff(&ctx); + } -+ mutex_unlock(&device.item_list_lock); + -+ return 0; ++ analogix_dp_process_phy_request(dp); ++ drm_modeset_drop_locks(&ctx); ++ drm_modeset_acquire_fini(&ctx); +} ++EXPORT_SYMBOL_GPL(analogix_dp_phy_test); + -+static int do_umplock_dump(void) ++static irqreturn_t analogix_dp_hpd_irq_handler(int irq, void *arg) +{ -+ int i, j; ++ struct analogix_dp_device *dp = arg; + -+ mutex_lock(&device.item_list_lock); -+ PERROR("dump all the items begin\n"); -+ for (i = 0; i < MAX_ITEMS; i++) { -+ for (j = 0; j < MAX_PIDS; j++) { -+ if (device.items[i].secure_id != 0 && device.items[i].references[j].pid != 0) { -+ PERROR("item[%d]->secure_id=0x%x, owner=%d\t reference[%d].ref_count=%d.pid=%d\n", -+ i, -+ device.items[i].secure_id, -+ device.items[i].owner, -+ j, -+ device.items[i].references[j].ref_count, -+ device.items[i].references[j].pid); -+ } -+ } -+ } -+ PERROR("dump all the items end\n"); -+ mutex_unlock(&device.item_list_lock); ++ if (dp->drm_dev) ++ drm_helper_hpd_irq_event(dp->drm_dev); + -+ return 0; ++ return IRQ_HANDLED; +} + -+int do_umplock_client_add(_lock_cmd_priv *lock_cmd) ++static irqreturn_t analogix_dp_irq_thread(int irq, void *arg) +{ -+ int i; -+ mutex_lock(&device.item_list_lock); -+ for (i = 0; i < MAX_PIDS; i++) { -+ if (device.pids[i] == lock_cmd->pid) { -+ mutex_unlock(&device.item_list_lock); -+ return 0; -+ } -+ } -+ for (i = 0; i < MAX_PIDS; i++) { -+ if (device.pids[i] == 0) { -+ device.pids[i] = lock_cmd->pid; -+ break; -+ } -+ } -+ mutex_unlock(&device.item_list_lock); -+ if (i == MAX_PIDS) { -+ PERROR("Oops, Run out of client slots\n "); -+ return -EINVAL; ++ struct analogix_dp_device *dp = arg; ++ ++ analogix_dp_irq_handler(dp); ++ ++ return IRQ_HANDLED; ++} ++ ++static int analogix_dp_fast_link_train_detection(struct analogix_dp_device *dp) ++{ ++ int ret; ++ u8 spread; ++ ++ ret = drm_dp_dpcd_readb(&dp->aux, DP_MAX_DOWNSPREAD, &spread); ++ if (ret != 1) { ++ dev_err(dp->dev, "failed to read downspread %d\n", ret); ++ return ret; + } ++ dp->fast_train_enable = !!(spread & DP_NO_AUX_HANDSHAKE_LINK_TRAINING); ++ dev_dbg(dp->dev, "fast link training %s\n", ++ dp->fast_train_enable ? "supported" : "unsupported"); + return 0; +} + -+int do_umplock_client_delete(_lock_cmd_priv *lock_cmd) ++static int analogix_dp_link_power_up(struct analogix_dp_device *dp) +{ -+ int p_index = -1, i_index = -1, ref_index = -1; ++ u8 value; + int ret; -+ _lock_item_s *lock_item; -+ lock_item = (_lock_item_s *)&lock_cmd->msg; + -+ mutex_lock(&device.item_list_lock); -+ p_index = umplock_find_client_valid(lock_cmd->pid); -+ /*lock item pid is not valid.*/ -+ if (p_index < 0) { -+ mutex_unlock(&device.item_list_lock); ++ if (dp->dpcd[DP_DPCD_REV] < 0x11) + return 0; -+ } + -+ /*walk through umplock item list and release reference attached to this client*/ -+ for (i_index = 0; i_index < MAX_ITEMS; i_index++) { -+ lock_item->secure_id = device.items[i_index].secure_id; ++ ret = drm_dp_dpcd_readb(&dp->aux, DP_SET_POWER, &value); ++ if (ret < 0) ++ return ret; + -+ /*find the item index and reference slot for the lock_item*/ -+ ret = umplock_find_item_by_pid(lock_cmd, &i_index, &ref_index); ++ value &= ~DP_SET_POWER_MASK; ++ value |= DP_SET_POWER_D0; + -+ if (ret < 0) { -+ /*client has no reference on this umplock item, skip*/ -+ continue; -+ } -+ while (device.items[i_index].references[ref_index].ref_count) { -+ /*release references on this client*/ ++ ret = drm_dp_dpcd_writeb(&dp->aux, DP_SET_POWER, value); ++ if (ret < 0) ++ return ret; + -+ PDEBUG(1, "delete client, pid: %d, ref_count: %d\n", lock_cmd->pid, device.items[i_index].references[ref_index].ref_count); ++ usleep_range(1000, 2000); + -+ mutex_unlock(&device.item_list_lock); -+ do_umplock_release(lock_cmd); -+ mutex_lock(&device.item_list_lock); -+ } -+ } ++ return 0; ++} + -+ /*remove the pid from umplock valid pid list*/ -+ device.pids[p_index] = 0; -+ mutex_unlock(&device.item_list_lock); ++static int analogix_dp_link_power_down(struct analogix_dp_device *dp) ++{ ++ u8 value; ++ int ret; ++ ++ if (dp->dpcd[DP_DPCD_REV] < 0x11) ++ return 0; ++ ++ ret = drm_dp_dpcd_readb(&dp->aux, DP_SET_POWER, &value); ++ if (ret < 0) ++ return ret; ++ ++ value &= ~DP_SET_POWER_MASK; ++ value |= DP_SET_POWER_D3; ++ ++ ret = drm_dp_dpcd_writeb(&dp->aux, DP_SET_POWER, value); ++ if (ret < 0) ++ return ret; + + return 0; +} + -+static long umplock_driver_ioctl(struct file *f, unsigned int cmd, unsigned long arg) ++static int analogix_dp_commit(struct analogix_dp_device *dp) +{ ++ struct video_info *video = &dp->video_info; + int ret; -+ uint32_t size = _IOC_SIZE(cmd); -+ _lock_cmd_priv lock_cmd ; + -+ if (_IOC_TYPE(cmd) != LOCK_IOCTL_GROUP) { -+ return -ENOTTY; ++ ret = drm_dp_read_dpcd_caps(&dp->aux, dp->dpcd); ++ if (ret < 0) { ++ dev_err(dp->dev, "failed to read dpcd caps: %d\n", ret); ++ return ret; + } + -+ if (_IOC_NR(cmd) >= LOCK_IOCTL_MAX_CMDS) { -+ return -ENOTTY; ++ ret = analogix_dp_link_power_up(dp); ++ if (ret) { ++ dev_err(dp->dev, "failed to power up link: %d\n", ret); ++ return ret; + } + -+ switch (cmd) { -+ case LOCK_IOCTL_CREATE: -+ if (size != sizeof(_lock_item_s)) { -+ return -ENOTTY; -+ } ++ if (device_property_read_bool(dp->dev, "panel-self-test")) ++ return drm_dp_dpcd_writeb(&dp->aux, DP_EDP_CONFIGURATION_SET, ++ DP_PANEL_SELF_TEST_ENABLE); + -+ if (copy_from_user(&lock_cmd.msg, (void __user *)arg, size)) { -+ return -EFAULT; -+ } -+ lock_cmd.pid = (u32)current->tgid; -+ ret = do_umplock_create(&lock_cmd); -+ if (ret) { -+ return ret; -+ } -+ return 0; ++ ret = analogix_dp_train_link(dp); ++ if (ret) { ++ dev_err(dp->dev, "unable to do link train, ret=%d\n", ret); ++ return ret; ++ } + -+ case LOCK_IOCTL_PROCESS: -+ if (size != sizeof(_lock_item_s)) { -+ return -ENOTTY; -+ } ++ ret = analogix_dp_enable_scramble(dp, 1); ++ if (ret < 0) { ++ dev_err(dp->dev, "can not enable scramble\n"); ++ return ret; ++ } + -+ if (copy_from_user(&lock_cmd.msg, (void __user *)arg, size)) { -+ return -EFAULT; -+ } -+ lock_cmd.pid = (u32)current->tgid; -+ return do_umplock_process(&lock_cmd); ++ analogix_dp_init_video(dp); ++ analogix_dp_set_video_format(dp); + -+ case LOCK_IOCTL_RELEASE: -+ if (size != sizeof(_lock_item_s)) { -+ return -ENOTTY; -+ } ++ if (video->video_bist_enable) ++ analogix_dp_video_bist_enable(dp); + -+ if (copy_from_user(&lock_cmd.msg, (void __user *)arg, size)) { -+ return -EFAULT; -+ } -+ lock_cmd.pid = (u32)current->tgid; -+ ret = do_umplock_release(&lock_cmd); -+ if (ret) { -+ return ret; -+ } -+ return 0; ++ ret = analogix_dp_config_video(dp); ++ if (ret) { ++ dev_err(dp->dev, "unable to config video\n"); ++ return ret; ++ } + -+ case LOCK_IOCTL_ZAP: -+ do_umplock_zap(); -+ return 0; ++ /* Check whether panel supports fast training */ ++ ret = analogix_dp_fast_link_train_detection(dp); ++ if (ret) ++ return ret; + -+ case LOCK_IOCTL_DUMP: -+ do_umplock_dump(); -+ return 0; ++ if (analogix_dp_detect_sink_psr(dp)) { ++ ret = analogix_dp_enable_sink_psr(dp); ++ if (ret) ++ return ret; + } + -+ return -ENOIOCTLCMD; ++ return ret; +} + -+static int umplock_driver_open(struct inode *inode, struct file *filp) ++static int analogix_dp_enable_psr(struct analogix_dp_device *dp) +{ -+ _lock_cmd_priv lock_cmd; -+ -+ atomic_inc(&device.sessions); -+ PDEBUG(1, "OPEN SESSION (%i references)\n", atomic_read(&device.sessions)); ++ struct dp_sdp psr_vsc; ++ int ret; ++ u8 sink; + -+ lock_cmd.pid = (u32)current->tgid; -+ do_umplock_client_add(&lock_cmd); ++ ret = drm_dp_dpcd_readb(&dp->aux, DP_PSR_STATUS, &sink); ++ if (ret != 1) ++ DRM_DEV_ERROR(dp->dev, "Failed to read psr status %d\n", ret); ++ else if (sink == DP_PSR_SINK_ACTIVE_RFB) ++ return 0; + -+ return 0; -+} ++ /* Prepare VSC packet as per EDP 1.4 spec, Table 6.9 */ + memset(&psr_vsc, 0, sizeof(psr_vsc)); + psr_vsc.sdp_header.HB0 = 0; + psr_vsc.sdp_header.HB1 = 0x7; +@@ -1010,9 +1223,20 @@ static int analogix_dp_enable_psr(struct analogix_dp_device *dp) + psr_vsc.db[1] = EDP_VSC_PSR_STATE_ACTIVE | EDP_VSC_PSR_CRC_VALUES_VALID; + + ret = analogix_dp_send_psr_spd(dp, &psr_vsc, true); +- if (!ret) ++ if (!ret) { + analogix_dp_set_analog_power_down(dp, POWER_ALL, true); + ++ if (dp->phy) { ++ union phy_configure_opts phy_cfg = {0}; + -+static int umplock_driver_release(struct inode *inode, struct file *filp) -+{ -+ int sessions = 0; -+ _lock_cmd_priv lock_cmd; ++ phy_cfg.dp.lanes = 0; ++ phy_cfg.dp.set_lanes = true; ++ ret = phy_configure(dp->phy, &phy_cfg); ++ if (ret) ++ return ret; ++ } ++ } + -+ lock_cmd.pid = (u32)current->tgid; -+ do_umplock_client_delete(&lock_cmd); + return ret; + } + +@@ -1058,70 +1282,36 @@ static int analogix_dp_disable_psr(struct analogix_dp_device *dp) + return analogix_dp_send_psr_spd(dp, &psr_vsc, true); + } + +-/* +- * This function is a bit of a catch-all for panel preparation, hopefully +- * simplifying the logic of functions that need to prepare/unprepare the panel +- * below. +- * +- * If @prepare is true, this function will prepare the panel. Conversely, if it +- * is false, the panel will be unprepared. +- * +- * If @is_modeset_prepare is true, the function will disregard the current state +- * of the panel and either prepare/unprepare the panel based on @prepare. Once +- * it finishes, it will update dp->panel_is_modeset to reflect the current state +- * of the panel. +- */ +-static int analogix_dp_prepare_panel(struct analogix_dp_device *dp, +- bool prepare, bool is_modeset_prepare) +-{ +- int ret = 0; +- +- if (!dp->plat_data->panel) +- return 0; +- +- mutex_lock(&dp->panel_lock); +- +- /* +- * Exit early if this is a temporary prepare/unprepare and we're already +- * modeset (since we neither want to prepare twice or unprepare early). +- */ +- if (dp->panel_is_modeset && !is_modeset_prepare) +- goto out; +- +- if (prepare) +- ret = drm_panel_prepare(dp->plat_data->panel); +- else +- ret = drm_panel_unprepare(dp->plat_data->panel); +- +- if (ret) +- goto out; +- +- if (is_modeset_prepare) +- dp->panel_is_modeset = prepare; +- +-out: +- mutex_unlock(&dp->panel_lock); +- return ret; +-} +- + static int analogix_dp_get_modes(struct drm_connector *connector) + { + struct analogix_dp_device *dp = to_dp(connector); + struct edid *edid; + int ret, num_modes = 0; + +- if (dp->plat_data->panel) { ++ if (dp->plat_data->right && dp->plat_data->right->plat_data->bridge) { ++ struct drm_bridge *bridge = dp->plat_data->right->plat_data->bridge; + -+ mutex_lock(&device.item_list_lock); -+ atomic_dec(&device.sessions); -+ sessions = atomic_read(&device.sessions); -+ PDEBUG(1, "CLOSE SESSION (%i references)\n", sessions); -+ mutex_unlock(&device.item_list_lock); -+ if (sessions == 0) { -+ do_umplock_zap(); ++ if (bridge->ops & DRM_BRIDGE_OP_MODES) { ++ if (!drm_bridge_get_modes(bridge, connector)) ++ return 0; ++ } + } + -+ return 0; -+} ++ if (dp->plat_data->panel) + num_modes += drm_panel_get_modes(dp->plat_data->panel, connector); +- } else { +- ret = analogix_dp_prepare_panel(dp, true, false); +- if (ret) { +- DRM_ERROR("Failed to prepare panel (%d)\n", ret); + -+static struct file_operations umplock_fops = { -+ .owner = THIS_MODULE, -+ .open = umplock_driver_open, -+ .release = umplock_driver_release, -+ .unlocked_ioctl = umplock_driver_ioctl, -+}; ++ if (dp->plat_data->bridge) ++ num_modes += drm_bridge_get_modes(dp->plat_data->bridge, connector); + -+int umplock_device_initialize(void) -+{ -+ int err; ++ if (!num_modes) { ++ ret = analogix_dp_phy_power_on(dp); ++ if (ret) + return 0; +- } + +- pm_runtime_get_sync(dp->dev); ++ if (dp->plat_data->panel) ++ analogix_dp_panel_prepare(dp); + -+ err = alloc_chrdev_region(&umplock_dev, 0, 1, umplock_dev_name); + edid = drm_get_edid(connector, &dp->aux.ddc); +- pm_runtime_put(dp->dev); + if (edid) { + drm_connector_update_edid_property(&dp->connector, + edid); +@@ -1129,14 +1319,19 @@ static int analogix_dp_get_modes(struct drm_connector *connector) + kfree(edid); + } + +- ret = analogix_dp_prepare_panel(dp, false, false); +- if (ret) +- DRM_ERROR("Failed to unprepare panel (%d)\n", ret); ++ analogix_dp_phy_power_off(dp); + } + + if (dp->plat_data->get_modes) + num_modes += dp->plat_data->get_modes(dp->plat_data, connector); + ++ if (num_modes > 0 && dp->plat_data->split_mode) { ++ struct drm_display_mode *mode; + -+ if (0 == err) { -+ memset(&umplock_device, 0, sizeof(umplock_device)); -+ cdev_init(&umplock_device.cdev, &umplock_fops); -+ umplock_device.cdev.owner = THIS_MODULE; -+ umplock_device.cdev.ops = &umplock_fops; ++ list_for_each_entry(mode, &connector->probed_modes, head) ++ dp->plat_data->convert_to_split_mode(mode); ++ } + -+ err = cdev_add(&umplock_device.cdev, umplock_dev, 1); -+ if (0 == err) { -+ umplock_device.umplock_class = class_create(THIS_MODULE, umplock_dev_name); -+ if (IS_ERR(umplock_device.umplock_class)) { -+ err = PTR_ERR(umplock_device.umplock_class); -+ } else { -+ struct device *mdev; -+ mdev = device_create(umplock_device.umplock_class, NULL, umplock_dev, NULL, umplock_dev_name); -+ if (!IS_ERR(mdev)) { -+ return 0; /* all ok */ -+ } + return num_modes; + } + +@@ -1182,38 +1377,110 @@ static const struct drm_connector_helper_funcs analogix_dp_connector_helper_func + }; + + static enum drm_connector_status +-analogix_dp_detect(struct drm_connector *connector, bool force) ++analogix_dp_detect(struct analogix_dp_device *dp) + { +- struct analogix_dp_device *dp = to_dp(connector); + enum drm_connector_status status = connector_status_disconnected; + int ret; + +- if (dp->plat_data->panel) +- return connector_status_connected; +- +- ret = analogix_dp_prepare_panel(dp, true, false); ++ ret = analogix_dp_phy_power_on(dp); + if (ret) { +- DRM_ERROR("Failed to prepare panel (%d)\n", ret); ++ extcon_set_state_sync(dp->extcon, EXTCON_DISP_DP, false); + return connector_status_disconnected; + } + +- if (!analogix_dp_detect_hpd(dp)) ++ if (dp->plat_data->panel) ++ analogix_dp_panel_prepare(dp); + -+ err = PTR_ERR(mdev); -+ class_destroy(umplock_device.umplock_class); -+ } -+ cdev_del(&umplock_device.cdev); ++ if (!analogix_dp_detect_hpd(dp)) { ++ ret = analogix_dp_get_max_rx_bandwidth(dp, &dp->link_train.link_rate); ++ if (ret) { ++ dev_err(dp->dev, "failed to read max link rate\n"); ++ goto out; + } + -+ unregister_chrdev_region(umplock_dev, 1); -+ } else { -+ PERROR("alloc chardev region failed\n"); ++ ret = analogix_dp_get_max_rx_lane_count(dp, &dp->link_train.lane_count); ++ if (ret) { ++ dev_err(dp->dev, "failed to read max lane count\n"); ++ goto out; ++ } ++ + status = connector_status_connected; + } + +- ret = analogix_dp_prepare_panel(dp, false, false); +- if (ret) +- DRM_ERROR("Failed to unprepare panel (%d)\n", ret); ++ if (dp->plat_data->bridge) { ++ struct drm_bridge *next_bridge = dp->plat_data->bridge; + -+ return err; ++ if (next_bridge->ops & DRM_BRIDGE_OP_DETECT) ++ status = drm_bridge_detect(next_bridge); ++ } ++ ++out: ++ analogix_dp_phy_power_off(dp); ++ ++ if (status == connector_status_connected) ++ extcon_set_state_sync(dp->extcon, EXTCON_DISP_DP, true); ++ else ++ extcon_set_state_sync(dp->extcon, EXTCON_DISP_DP, false); + + return status; + } + ++static enum drm_connector_status ++analogix_dp_connector_detect(struct drm_connector *connector, bool force) ++{ ++ struct analogix_dp_device *dp = to_dp(connector); ++ ++ if (dp->plat_data->right && analogix_dp_detect(dp->plat_data->right) != connector_status_connected) ++ return connector_status_disconnected; ++ ++ return analogix_dp_detect(dp); +} + -+void umplock_device_terminate(void) ++static void analogix_dp_connector_force(struct drm_connector *connector) +{ -+ device_destroy(umplock_device.umplock_class, umplock_dev); -+ class_destroy(umplock_device.umplock_class); ++ struct analogix_dp_device *dp = to_dp(connector); + -+ cdev_del(&umplock_device.cdev); -+ unregister_chrdev_region(umplock_dev, 1); ++ if (connector->status == connector_status_connected) ++ extcon_set_state_sync(dp->extcon, EXTCON_DISP_DP, true); ++ else ++ extcon_set_state_sync(dp->extcon, EXTCON_DISP_DP, false); +} + -+static int __init umplock_initialize_module(void) ++static int ++analogix_dp_atomic_connector_get_property(struct drm_connector *connector, ++ const struct drm_connector_state *state, ++ struct drm_property *property, ++ uint64_t *val) +{ -+ PDEBUG(1, "Inserting UMP lock device driver. Compiled: %s, time: %s\n", __DATE__, __TIME__); ++ struct rockchip_drm_private *private = connector->dev->dev_private; ++ struct analogix_dp_device *dp = to_dp(connector); + -+ mutex_init(&device.item_list_lock); -+ if (umplock_device_initialize() != 0) { -+ PERROR("UMP lock device driver init failed\n"); -+ return -ENOTTY; ++ if (property == private->split_area_prop) { ++ switch (dp->split_area) { ++ case 1: ++ *val = ROCKCHIP_DRM_SPLIT_LEFT_SIDE; ++ break; ++ case 2: ++ *val = ROCKCHIP_DRM_SPLIT_RIGHT_SIDE; ++ break; ++ default: ++ *val = ROCKCHIP_DRM_SPLIT_UNSET; ++ break; ++ } + } -+ memset(&device.items, 0, sizeof(umplock_item) * MAX_ITEMS); -+ memset(&device.pids, 0, sizeof(u32) * MAX_PIDS); -+ atomic_set(&device.sessions, 0); -+ -+ PDEBUG(1, "UMP lock device driver loaded\n"); + + return 0; +} + -+static void __exit umplock_cleanup_module(void) -+{ -+ PDEBUG(1, "unloading UMP lock module\n"); -+ -+ memset(&device.items, 0, sizeof(umplock_item) * MAX_ITEMS); -+ memset(&device.pids, 0, sizeof(u32) * MAX_PIDS); -+ umplock_device_terminate(); -+ mutex_destroy(&device.item_list_lock); + static const struct drm_connector_funcs analogix_dp_connector_funcs = { + .fill_modes = drm_helper_probe_single_connector_modes, +- .detect = analogix_dp_detect, ++ .detect = analogix_dp_connector_detect, + .destroy = drm_connector_cleanup, + .reset = drm_atomic_helper_connector_reset, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, ++ .force = analogix_dp_connector_force, ++ .atomic_get_property = analogix_dp_atomic_connector_get_property, + }; + + static int analogix_dp_bridge_attach(struct drm_bridge *bridge, +@@ -1224,28 +1491,53 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge, + struct drm_connector *connector = NULL; + int ret = 0; + +- if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { +- DRM_ERROR("Fix bridge driver to make connector optional!"); +- return -EINVAL; +- } +- + if (!bridge->encoder) { + DRM_ERROR("Parent encoder object not found"); + return -ENODEV; + } + ++ if (dp->plat_data->bridge) { ++ ret = drm_bridge_attach(bridge->encoder, dp->plat_data->bridge, bridge, ++ dp->plat_data->skip_connector ? ++ 0 : DRM_BRIDGE_ATTACH_NO_CONNECTOR); ++ if (ret) { ++ DRM_ERROR("Failed to attach external bridge: %d\n", ret); ++ return ret; ++ } ++ } + -+ PDEBUG(1, "UMP lock module unloaded\n"); -+} ++ if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) ++ return 0; + -+module_init(umplock_initialize_module); -+module_exit(umplock_cleanup_module); + if (!dp->plat_data->skip_connector) { ++ int connector_type = DRM_MODE_CONNECTOR_eDP; ++ struct rockchip_drm_private *private; + ++ if (dp->plat_data->bridge && ++ dp->plat_data->bridge->type != DRM_MODE_CONNECTOR_Unknown) ++ connector_type = dp->plat_data->bridge->type; + -+MODULE_LICENSE("GPL"); -+MODULE_AUTHOR("ARM Ltd."); -+MODULE_DESCRIPTION("ARM UMP locker"); -diff --git a/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h b/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h -new file mode 100755 -index 000000000000..8afdaad7000f ---- /dev/null -+++ b/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h -@@ -0,0 +1,66 @@ -+/* -+ * Copyright (C) 2012-2013, 2016-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained from Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ + connector = &dp->connector; + connector->polled = DRM_CONNECTOR_POLL_HPD; ++ if (dp->plat_data->bridge && dp->plat_data->bridge->ops & DRM_BRIDGE_OP_DETECT) ++ connector->polled = DRM_CONNECTOR_POLL_CONNECT | ++ DRM_CONNECTOR_POLL_DISCONNECT; + + ret = drm_connector_init(dp->drm_dev, connector, + &analogix_dp_connector_funcs, +- DRM_MODE_CONNECTOR_eDP); ++ connector_type); + if (ret) { + DRM_ERROR("Failed to initialize connector with drm\n"); + return ret; + } + ++ private = connector->dev->dev_private; + -+#ifndef __UMPLOCK_IOCTL_H__ -+#define __UMPLOCK_IOCTL_H__ ++ if (dp->split_area) ++ drm_object_attach_property(&connector->base, ++ private->split_area_prop, ++ dp->split_area); + -+#ifdef __cplusplus -+extern "C" { -+#endif + drm_connector_helper_add(connector, + &analogix_dp_connector_helper_funcs); + drm_connector_attach_encoder(connector, encoder); +@@ -1268,6 +1560,14 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge, + return 0; + } + ++static void analogix_dp_bridge_detach(struct drm_bridge *bridge) ++{ ++ struct analogix_dp_device *dp = bridge->driver_private; + -+#include -+#include ++ if (dp->plat_data->detach) ++ dp->plat_data->detach(dp->plat_data, bridge); ++} + -+#ifndef __user -+#define __user -+#endif + static + struct drm_crtc *analogix_dp_get_old_crtc(struct analogix_dp_device *dp, + struct drm_atomic_state *state) +@@ -1291,7 +1591,8 @@ static + struct drm_crtc *analogix_dp_get_new_crtc(struct analogix_dp_device *dp, + struct drm_atomic_state *state) + { +- struct drm_encoder *encoder = dp->encoder; ++ struct drm_bridge *bridge = &dp->bridge; ++ struct drm_encoder *encoder = bridge->encoder; + struct drm_connector *connector; + struct drm_connector_state *conn_state; + +@@ -1313,39 +1614,35 @@ analogix_dp_bridge_atomic_pre_enable(struct drm_bridge *bridge, + struct drm_atomic_state *old_state = old_bridge_state->base.state; + struct analogix_dp_device *dp = bridge->driver_private; + struct drm_crtc *crtc; +- struct drm_crtc_state *old_crtc_state; +- int ret; ++ struct drm_crtc_state *old_crtc_state, *new_crtc_state; + + crtc = analogix_dp_get_new_crtc(dp, old_state); + if (!crtc) + return; + + old_crtc_state = drm_atomic_get_old_crtc_state(old_state, crtc); + ++ new_crtc_state = drm_atomic_get_new_crtc_state(old_state, crtc); ++ analogix_dp_bridge_mode_set(bridge, &new_crtc_state->adjusted_mode); + -+/** -+ * @file umplock_ioctl.h -+ * This file describes the interface needed to use the Linux device driver. -+ * The interface is used by the userpace Mali DDK. -+ */ + /* Don't touch the panel if we're coming back from PSR */ + if (old_crtc_state && old_crtc_state->self_refresh_active) + return; + +- ret = analogix_dp_prepare_panel(dp, true, true); +- if (ret) +- DRM_ERROR("failed to setup the panel ret = %d\n", ret); ++ if (dp->plat_data->panel) ++ analogix_dp_panel_prepare(dp); + } + + static int analogix_dp_set_bridge(struct analogix_dp_device *dp) + { + int ret; + +- pm_runtime_get_sync(dp->dev); +- +- ret = clk_prepare_enable(dp->clock); +- if (ret < 0) { +- DRM_ERROR("Failed to prepare_enable the clock clk [%d]\n", ret); +- goto out_dp_clk_pre; +- } +- + if (dp->plat_data->power_on_start) + dp->plat_data->power_on_start(dp->plat_data); + +- phy_power_on(dp->phy); ++ ret = analogix_dp_phy_power_on(dp); ++ if (ret) ++ return ret; + + ret = analogix_dp_init_dp(dp); + if (ret) +@@ -1363,28 +1660,35 @@ static int analogix_dp_set_bridge(struct analogix_dp_device *dp) + } + + ret = analogix_dp_commit(dp); +- if (ret) { ++ if (ret < 0) { + DRM_ERROR("dp commit error, ret = %d\n", ret); + goto out_dp_init; + } + ++ if (dp->plat_data->panel) ++ drm_panel_enable(dp->plat_data->panel); + -+typedef enum { -+ _LOCK_ACCESS_RENDERABLE = 1, -+ _LOCK_ACCESS_TEXTURE, -+ _LOCK_ACCESS_CPU_WRITE, -+ _LOCK_ACCESS_CPU_READ, -+} _lock_access_usage; + if (dp->plat_data->power_on_end) + dp->plat_data->power_on_end(dp->plat_data); + +- enable_irq(dp->irq); + return 0; + + out_dp_init: +- phy_power_off(dp->phy); ++ analogix_dp_phy_power_off(dp); + if (dp->plat_data->power_off) + dp->plat_data->power_off(dp->plat_data); +- clk_disable_unprepare(dp->clock); +-out_dp_clk_pre: +- pm_runtime_put_sync(dp->dev); +- + return ret; + } + ++static void analogix_dp_modeset_retry_work_fn(struct work_struct *work) ++{ ++ struct analogix_dp_device *dp = ++ container_of(work, typeof(*dp), modeset_retry_work); + -+typedef struct _lock_item_s { -+ unsigned int secure_id; -+ _lock_access_usage usage; -+} _lock_item_s; ++ /* Send Hotplug uevent so userspace can reprobe */ ++ drm_kms_helper_hotplug_event(dp->bridge.dev); ++} + + static void + analogix_dp_bridge_atomic_enable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) +@@ -1423,12 +1727,14 @@ analogix_dp_bridge_atomic_enable(struct drm_bridge *bridge, + usleep_range(10, 11); + } + dev_err(dp->dev, "too many times retry set bridge, give it up\n"); + -+#define LOCK_IOCTL_GROUP 0x91 ++ /* Schedule a Hotplug Uevent to userspace to start modeset */ ++ schedule_work(&dp->modeset_retry_work); + } + + static void analogix_dp_bridge_disable(struct drm_bridge *bridge) + { + struct analogix_dp_device *dp = bridge->driver_private; +- int ret; + + if (dp->dpms_mode != DRM_MODE_DPMS_ON) + return; +@@ -1440,27 +1746,29 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge) + } + } + +- disable_irq(dp->irq); ++ if (!analogix_dp_get_plug_in_status(dp)) ++ analogix_dp_link_power_down(dp); + + if (dp->plat_data->power_off) + dp->plat_data->power_off(dp->plat_data); + + analogix_dp_set_analog_power_down(dp, POWER_ALL, 1); +- phy_power_off(dp->phy); ++ analogix_dp_phy_power_off(dp); + +- clk_disable_unprepare(dp->clock); +- +- pm_runtime_put_sync(dp->dev); +- +- ret = analogix_dp_prepare_panel(dp, false, true); +- if (ret) +- DRM_ERROR("failed to setup the panel ret = %d\n", ret); ++ if (dp->plat_data->panel) ++ analogix_dp_panel_unprepare(dp); + + dp->fast_train_enable = false; + dp->psr_supported = false; + dp->dpms_mode = DRM_MODE_DPMS_OFF; + } + ++void analogix_dp_disable(struct analogix_dp_device *dp) ++{ ++ analogix_dp_bridge_disable(&dp->bridge); ++} ++EXPORT_SYMBOL_GPL(analogix_dp_disable); + -+#define _LOCK_IOCTL_CREATE_CMD 0 /* create kernel lock item */ -+#define _LOCK_IOCTL_PROCESS_CMD 1 /* process kernel lock item */ -+#define _LOCK_IOCTL_RELEASE_CMD 2 /* release kernel lock item */ -+#define _LOCK_IOCTL_ZAP_CMD 3 /* clean up all kernel lock items */ -+#define _LOCK_IOCTL_DUMP_CMD 4 /* dump all the items */ + static void + analogix_dp_bridge_atomic_disable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) +@@ -1525,33 +1833,38 @@ analogix_dp_bridge_atomic_post_disable(struct drm_bridge *bridge, + } + + static void analogix_dp_bridge_mode_set(struct drm_bridge *bridge, +- const struct drm_display_mode *orig_mode, +- const struct drm_display_mode *mode) ++ const struct drm_display_mode *adj_mode) + { + struct analogix_dp_device *dp = bridge->driver_private; + struct drm_display_info *display_info = &dp->connector.display_info; + struct video_info *video = &dp->video_info; ++ struct drm_display_mode *mode = &video->mode; + struct device_node *dp_node = dp->dev->of_node; + int vic; + ++ drm_mode_copy(mode, adj_mode); ++ if (dp->plat_data->split_mode) ++ dp->plat_data->convert_to_origin_mode(mode); + -+#define LOCK_IOCTL_MAX_CMDS 5 + /* Input video interlaces & hsync pol & vsync pol */ + video->interlaced = !!(mode->flags & DRM_MODE_FLAG_INTERLACE); +- video->v_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NVSYNC); +- video->h_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NHSYNC); ++ if (dp->plat_data->dev_type == RK3588_EDP) { ++ video->v_sync_polarity = true; ++ video->h_sync_polarity = true; ++ } else { ++ video->v_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NVSYNC); ++ video->h_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NHSYNC); ++ } + + /* Input video dynamic_range & colorimetry */ + vic = drm_match_cea_mode(mode); + if ((vic == 6) || (vic == 7) || (vic == 21) || (vic == 22) || +- (vic == 2) || (vic == 3) || (vic == 17) || (vic == 18)) { ++ (vic == 2) || (vic == 3) || (vic == 17) || (vic == 18)) + video->dynamic_range = CEA; +- video->ycbcr_coeff = COLOR_YCBCR601; +- } else if (vic) { ++ else if (vic) + video->dynamic_range = CEA; +- video->ycbcr_coeff = COLOR_YCBCR709; +- } else { ++ else + video->dynamic_range = VESA; +- video->ycbcr_coeff = COLOR_YCBCR709; +- } + + /* Input vide bpc and color_formats */ + switch (display_info->bpc) { +@@ -1571,12 +1884,16 @@ static void analogix_dp_bridge_mode_set(struct drm_bridge *bridge, + video->color_depth = COLOR_8; + break; + } +- if (display_info->color_formats & DRM_COLOR_FORMAT_YCRCB444) ++ if (display_info->color_formats & DRM_COLOR_FORMAT_YCRCB444) { + video->color_space = COLOR_YCBCR444; +- else if (display_info->color_formats & DRM_COLOR_FORMAT_YCRCB422) ++ video->ycbcr_coeff = COLOR_YCBCR709; ++ } else if (display_info->color_formats & DRM_COLOR_FORMAT_YCRCB422) { + video->color_space = COLOR_YCBCR422; +- else ++ video->ycbcr_coeff = COLOR_YCBCR709; ++ } else { + video->color_space = COLOR_RGB; ++ video->ycbcr_coeff = COLOR_YCBCR601; ++ } + + /* + * NOTE: those property parsing code is used for providing backward +@@ -1601,6 +1918,56 @@ static void analogix_dp_bridge_mode_set(struct drm_bridge *bridge, + video->interlaced = true; + } + ++static bool analogix_dp_link_config_validate(u8 link_rate, u8 lane_count) ++{ ++ switch (link_rate) { ++ case DP_LINK_BW_1_62: ++ case DP_LINK_BW_2_7: ++ case DP_LINK_BW_5_4: ++ break; ++ default: ++ return false; ++ } + -+#define LOCK_IOCTL_CREATE _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_CREATE_CMD, _lock_item_s ) -+#define LOCK_IOCTL_PROCESS _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_PROCESS_CMD, _lock_item_s ) -+#define LOCK_IOCTL_RELEASE _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_RELEASE_CMD, _lock_item_s ) -+#define LOCK_IOCTL_ZAP _IO ( LOCK_IOCTL_GROUP, _LOCK_IOCTL_ZAP_CMD ) -+#define LOCK_IOCTL_DUMP _IO ( LOCK_IOCTL_GROUP, _LOCK_IOCTL_DUMP_CMD ) ++ switch (lane_count) { ++ case 1: ++ case 2: ++ case 4: ++ break; ++ default: ++ return false; ++ } + -+#ifdef __cplusplus ++ return true; +} -+#endif + -+#endif /* __UMPLOCK_IOCTL_H__ */ ++static enum drm_mode_status ++analogix_dp_bridge_mode_valid(struct drm_bridge *bridge, ++ const struct drm_display_info *info, ++ const struct drm_display_mode *mode) ++{ ++ struct analogix_dp_device *dp = bridge->driver_private; ++ struct drm_display_mode m; ++ u32 max_link_rate, max_lane_count; + -diff --git a/drivers/gpu/arm/midgard/Kbuild b/drivers/gpu/arm/midgard/Kbuild -new file mode 100755 -index 000000000000..b2c2bbcda668 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/Kbuild -@@ -0,0 +1,221 @@ -+# -+# (C) COPYRIGHT 2012-2016, 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++ drm_mode_copy(&m, mode); + -+KBUILD_CFLAGS += -include rename.h ++ if (dp->plat_data->split_mode || dp->plat_data->dual_connector_split) ++ dp->plat_data->convert_to_origin_mode(&m); + -+# Driver version string which is returned to userspace via an ioctl -+MALI_RELEASE_NAME ?= "r18p0-01rel0" ++ max_link_rate = min_t(u32, dp->video_info.max_link_rate, ++ dp->link_train.link_rate); ++ max_lane_count = min_t(u32, dp->video_info.max_lane_count, ++ dp->link_train.lane_count); ++ if (analogix_dp_link_config_validate(max_link_rate, max_lane_count) && ++ !analogix_dp_bandwidth_ok(dp, &m, ++ drm_dp_bw_code_to_link_rate(max_link_rate), ++ max_lane_count)) ++ return MODE_BAD; + -+# Paths required for build ++ return MODE_OK; ++} + -+# make $(src) as absolute path if it isn't already, by prefixing $(srctree) -+src:=$(if $(patsubst /%,,$(src)),$(srctree)/$(src),$(src)) -+KBASE_PATH = $(src) -+KBASE_PLATFORM_PATH = $(KBASE_PATH)/platform_dummy -+UMP_PATH = $(src)/../../../base + static const struct drm_bridge_funcs analogix_dp_bridge_funcs = { + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, +@@ -1609,44 +1976,85 @@ static const struct drm_bridge_funcs analogix_dp_bridge_funcs = { + .atomic_enable = analogix_dp_bridge_atomic_enable, + .atomic_disable = analogix_dp_bridge_atomic_disable, + .atomic_post_disable = analogix_dp_bridge_atomic_post_disable, +- .mode_set = analogix_dp_bridge_mode_set, + .attach = analogix_dp_bridge_attach, ++ .detach = analogix_dp_bridge_detach, ++ .mode_valid = analogix_dp_bridge_mode_valid, + }; + +-static int analogix_dp_create_bridge(struct drm_device *drm_dev, +- struct analogix_dp_device *dp) ++static int analogix_dp_bridge_init(struct analogix_dp_device *dp) + { +- struct drm_bridge *bridge; ++ struct drm_bridge *bridge = &dp->bridge; + int ret; + +- bridge = devm_kzalloc(drm_dev->dev, sizeof(*bridge), GFP_KERNEL); +- if (!bridge) { +- DRM_ERROR("failed to allocate for drm bridge\n"); +- return -ENOMEM; ++ if (!dp->plat_data->left) { ++ ret = drm_bridge_attach(dp->encoder, bridge, NULL, 0); ++ if (ret) { ++ DRM_ERROR("failed to attach drm bridge\n"); ++ return ret; ++ } + } + +- dp->bridge = bridge; ++ if (dp->plat_data->right) { ++ struct analogix_dp_device *secondary = dp->plat_data->right; ++ struct drm_bridge *last_bridge = ++ list_last_entry(&bridge->encoder->bridge_chain, ++ struct drm_bridge, chain_node); + +- bridge->driver_private = dp; +- bridge->funcs = &analogix_dp_bridge_funcs; +- +- ret = drm_bridge_attach(dp->encoder, bridge, NULL, 0); +- if (ret) { +- DRM_ERROR("failed to attach drm bridge\n"); +- return -EINVAL; ++ ret = drm_bridge_attach(dp->encoder, &secondary->bridge, last_bridge, ++ DRM_BRIDGE_ATTACH_NO_CONNECTOR); ++ if (ret) ++ return ret; + } + + return 0; + } + ++static u32 analogix_dp_parse_link_frequencies(struct analogix_dp_device *dp) ++{ ++ struct device_node *node = dp->dev->of_node; ++ struct device_node *endpoint; ++ u64 frequency = 0; ++ int cnt; + -+ifeq ($(CONFIG_MALI_ERROR_INJECTION),y) -+MALI_ERROR_INJECT_ON = 1 -+endif ++ endpoint = of_graph_get_endpoint_by_regs(node, 1, 0); ++ if (!endpoint) ++ return 0; + -+# Set up defaults if not defined by build system -+MALI_CUSTOMER_RELEASE ?= 1 -+MALI_UNIT_TEST ?= 0 -+MALI_KERNEL_TEST_API ?= 0 -+MALI_ERROR_INJECT_ON ?= 0 -+MALI_MOCK_TEST ?= 0 -+MALI_COVERAGE ?= 0 -+MALI_INSTRUMENTATION_LEVEL ?= 0 -+# This workaround is for what seems to be a compiler bug we observed in -+# GCC 4.7 on AOSP 4.3. The bug caused an intermittent failure compiling -+# the "_Pragma" syntax, where an error message is returned: -+# -+# "internal compiler error: unspellable token PRAGMA" -+# -+# This regression has thus far only been seen on the GCC 4.7 compiler bundled -+# with AOSP 4.3.0. So this makefile, intended for in-tree kernel builds -+# which are not known to be used with AOSP, is hardcoded to disable the -+# workaround, i.e. set the define to 0. -+MALI_GCC_WORKAROUND_MIDCOM_4598 ?= 0 ++ cnt = of_property_count_u64_elems(endpoint, "link-frequencies"); ++ if (cnt > 0) ++ of_property_read_u64_index(endpoint, "link-frequencies", ++ cnt - 1, &frequency); ++ of_node_put(endpoint); + -+# Set up our defines, which will be passed to gcc -+DEFINES = \ -+ -DMALI_CUSTOMER_RELEASE=$(MALI_CUSTOMER_RELEASE) \ -+ -DMALI_KERNEL_TEST_API=$(MALI_KERNEL_TEST_API) \ -+ -DMALI_UNIT_TEST=$(MALI_UNIT_TEST) \ -+ -DMALI_ERROR_INJECT_ON=$(MALI_ERROR_INJECT_ON) \ -+ -DMALI_MOCK_TEST=$(MALI_MOCK_TEST) \ -+ -DMALI_COVERAGE=$(MALI_COVERAGE) \ -+ -DMALI_INSTRUMENTATION_LEVEL=$(MALI_INSTRUMENTATION_LEVEL) \ -+ -DMALI_RELEASE_NAME=\"$(MALI_RELEASE_NAME)\" \ -+ -DMALI_GCC_WORKAROUND_MIDCOM_4598=$(MALI_GCC_WORKAROUND_MIDCOM_4598) ++ if (!frequency) ++ return 0; + -+ifeq ($(KBUILD_EXTMOD),) -+# in-tree -+DEFINES +=-DMALI_KBASE_THIRDPARTY_PATH=../../$(src)/platform/$(CONFIG_MALI_PLATFORM_THIRDPARTY_NAME) -+else -+# out-of-tree -+DEFINES +=-DMALI_KBASE_THIRDPARTY_PATH=$(src)/platform/$(CONFIG_MALI_PLATFORM_THIRDPARTY_NAME) -+endif ++ do_div(frequency, 10 * 1000); /* symbol rate kbytes */ + -+DEFINES += -I$(srctree)/drivers/staging/android ++ switch (frequency) { ++ case 162000: ++ case 270000: ++ case 540000: ++ break; ++ default: ++ dev_err(dp->dev, "invalid link frequency value: %lld\n", frequency); ++ return 0; ++ } + -+# Use our defines when compiling -+ccflags-y += $(DEFINES) -I$(KBASE_PATH) -I$(KBASE_PLATFORM_PATH) -I$(UMP_PATH) -I$(srctree)/include/linux -+subdir-ccflags-y += $(DEFINES) -I$(KBASE_PATH) -I$(KBASE_PLATFORM_PATH) -I$(OSK_PATH) -I$(UMP_PATH) -I$(srctree)/include/linux ++ return frequency; ++} + -+SRC := \ -+ mali_kbase_device.c \ -+ mali_kbase_cache_policy.c \ -+ mali_kbase_mem.c \ -+ mali_kbase_mmu.c \ -+ mali_kbase_ctx_sched.c \ -+ mali_kbase_jd.c \ -+ mali_kbase_jd_debugfs.c \ -+ mali_kbase_jm.c \ -+ mali_kbase_gpuprops.c \ -+ mali_kbase_js.c \ -+ mali_kbase_js_ctx_attr.c \ -+ mali_kbase_event.c \ -+ mali_kbase_context.c \ -+ mali_kbase_pm.c \ -+ mali_kbase_config.c \ -+ mali_kbase_vinstr.c \ -+ mali_kbase_softjobs.c \ -+ mali_kbase_10969_workaround.c \ -+ mali_kbase_hw.c \ -+ mali_kbase_utility.c \ -+ mali_kbase_debug.c \ -+ mali_kbase_trace_timeline.c \ -+ mali_kbase_gpu_memory_debugfs.c \ -+ mali_kbase_mem_linux.c \ -+ mali_kbase_core_linux.c \ -+ mali_kbase_replay.c \ -+ mali_kbase_mem_profile_debugfs.c \ -+ mali_kbase_mmu_mode_lpae.c \ -+ mali_kbase_mmu_mode_aarch64.c \ -+ mali_kbase_disjoint_events.c \ -+ mali_kbase_gator_api.c \ -+ mali_kbase_debug_mem_view.c \ -+ mali_kbase_debug_job_fault.c \ -+ mali_kbase_smc.c \ -+ mali_kbase_mem_pool.c \ -+ mali_kbase_mem_pool_debugfs.c \ -+ mali_kbase_tlstream.c \ -+ mali_kbase_strings.c \ -+ mali_kbase_as_fault_debugfs.c \ -+ mali_kbase_regs_history_debugfs.c + static int analogix_dp_dt_parse_pdata(struct analogix_dp_device *dp) + { + struct device_node *dp_node = dp->dev->of_node; + struct video_info *video_info = &dp->video_info; ++ struct property *prop; ++ int ret, len, num_lanes; ++ u32 max_link_rate; + + switch (dp->plat_data->dev_type) { + case RK3288_DP: +- case RK3399_EDP: ++ case RK3568_EDP: + /* + * Like Rk3288 DisplayPort TRM indicate that "Main link + * containing 4 physical lanes of 2.7/1.62 Gbps/lane". +@@ -1654,6 +2062,11 @@ static int analogix_dp_dt_parse_pdata(struct analogix_dp_device *dp) + video_info->max_link_rate = 0x0A; + video_info->max_lane_count = 0x04; + break; ++ case RK3399_EDP: ++ case RK3588_EDP: ++ video_info->max_link_rate = 0x14; ++ video_info->max_lane_count = 0x04; ++ break; + case EXYNOS_DP: + /* + * NOTE: those property parseing code is used for +@@ -1666,6 +2079,44 @@ static int analogix_dp_dt_parse_pdata(struct analogix_dp_device *dp) + break; + } + ++ max_link_rate = analogix_dp_parse_link_frequencies(dp); ++ if (max_link_rate && max_link_rate < drm_dp_bw_code_to_link_rate(video_info->max_link_rate)) ++ video_info->max_link_rate = drm_dp_link_rate_to_bw_code(max_link_rate); + ++ video_info->video_bist_enable = ++ of_property_read_bool(dp_node, "analogix,video-bist-enable"); ++ video_info->force_stream_valid = ++ of_property_read_bool(dp_node, "analogix,force-stream-valid"); + ++ prop = of_find_property(dp_node, "data-lanes", &len); ++ if (!prop) { ++ video_info->lane_map[0] = 0; ++ video_info->lane_map[1] = 1; ++ video_info->lane_map[2] = 2; ++ video_info->lane_map[3] = 3; ++ DRM_DEV_DEBUG(dp->dev, "failed to find data lane mapping, using default\n"); ++ return 0; ++ } + ++ num_lanes = len / sizeof(u32); + -+ifeq ($(MALI_UNIT_TEST),1) -+ SRC += mali_kbase_tlstream_test.c -+endif ++ if (num_lanes < 1 || num_lanes > 4 || num_lanes == 3) { ++ DRM_DEV_ERROR(dp->dev, "bad number of data lanes\n"); ++ return -EINVAL; ++ } + -+ifeq ($(MALI_CUSTOMER_RELEASE),0) -+ SRC += mali_kbase_regs_dump_debugfs.c -+endif ++ video_info->max_lane_count = num_lanes; + ++ ret = of_property_read_u32_array(dp_node, "data-lanes", ++ video_info->lane_map, num_lanes); ++ if (ret) { ++ DRM_DEV_ERROR(dp->dev, "failed to read lane data\n"); ++ return ret; ++ } + -+ccflags-y += -I$(KBASE_PATH) ++ if (device_property_read_u32(dp->dev, "split-area", &dp->split_area)) ++ dp->split_area = 0; + -+ifeq ($(CONFIG_MALI_PLATFORM_FAKE),y) -+ SRC += mali_kbase_platform_fake.c + return 0; + } + +@@ -1688,13 +2139,116 @@ static ssize_t analogix_dpaux_transfer(struct drm_dp_aux *aux, + return ret; + } + ++int analogix_dp_audio_hw_params(struct analogix_dp_device *dp, ++ struct hdmi_codec_daifmt *daifmt, ++ struct hdmi_codec_params *params) ++{ ++ switch (daifmt->fmt) { ++ case HDMI_SPDIF: ++ analogix_dp_audio_config_spdif(dp); ++ break; ++ case HDMI_I2S: ++ analogix_dp_audio_config_i2s(dp); ++ break; ++ default: ++ DRM_DEV_ERROR(dp->dev, "invalid daifmt %d\n", daifmt->fmt); ++ return -EINVAL; ++ } + -+ ifeq ($(CONFIG_MALI_PLATFORM_VEXPRESS),y) -+ SRC += platform/vexpress/mali_kbase_config_vexpress.c \ -+ platform/vexpress/mali_kbase_cpu_vexpress.c -+ ccflags-y += -I$(src)/platform/vexpress -+ endif ++ return 0; ++} ++EXPORT_SYMBOL_GPL(analogix_dp_audio_hw_params); + -+ ifeq ($(CONFIG_MALI_PLATFORM_RTSM_VE),y) -+ SRC += platform/rtsm_ve/mali_kbase_config_vexpress.c -+ ccflags-y += -I$(src)/platform/rtsm_ve -+ endif ++void analogix_dp_audio_shutdown(struct analogix_dp_device *dp) ++{ ++ analogix_dp_audio_disable(dp); ++} ++EXPORT_SYMBOL_GPL(analogix_dp_audio_shutdown); + -+ ifeq ($(CONFIG_MALI_PLATFORM_VEXPRESS_1XV7_A57),y) -+ SRC += platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c -+ ccflags-y += -I$(src)/platform/vexpress_1xv7_a57 -+ endif ++int analogix_dp_audio_startup(struct analogix_dp_device *dp) ++{ ++ analogix_dp_audio_enable(dp); + -+ ifeq ($(CONFIG_MALI_PLATFORM_VEXPRESS_6XVIRTEX7_10MHZ),y) -+ SRC += platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c \ -+ platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c -+ ccflags-y += -I$(src)/platform/vexpress_6xvirtex7_10mhz -+ endif -+endif # CONFIG_MALI_PLATFORM_FAKE=y ++ return 0; ++} ++EXPORT_SYMBOL_GPL(analogix_dp_audio_startup); + -+# Tell the Linux build system from which .o file to create the kernel module -+obj-$(CONFIG_MALI_MIDGARD) += midgard_kbase.o ++int analogix_dp_audio_get_eld(struct analogix_dp_device *dp, u8 *buf, size_t len) ++{ ++ memcpy(buf, dp->connector.eld, min(sizeof(dp->connector.eld), len)); + -+# Tell the Linux build system to enable building of our .c files -+midgard_kbase-y := $(SRC:.c=.o) ++ return 0; ++} ++EXPORT_SYMBOL_GPL(analogix_dp_audio_get_eld); + -+ifeq ($(CONFIG_MALI_PLATFORM_THIRDPARTY),y) -+ # Kconfig passes in the name with quotes for in-tree builds - remove them. -+ platform_name := $(shell echo $(CONFIG_MALI_PLATFORM_THIRDPARTY_NAME)) -+ MALI_PLATFORM_THIRDPARTY_DIR := platform/$(platform_name) -+ ccflags-y += -I$(src)/$(MALI_PLATFORM_THIRDPARTY_DIR) -+ include $(src)/$(MALI_PLATFORM_THIRDPARTY_DIR)/Kbuild -+endif ++static void analogix_dp_link_train_restore(struct analogix_dp_device *dp) ++{ ++ u32 link_rate, lane_count; ++ u8 lane, spread; + -+ifeq ($(CONFIG_MALI_DEVFREQ),y) -+ ifeq ($(CONFIG_DEVFREQ_THERMAL),y) -+ include $(src)/ipa/Kbuild -+ endif -+endif ++ analogix_dp_get_link_bandwidth(dp, &link_rate); ++ analogix_dp_get_lane_count(dp, &lane_count); ++ drm_dp_dpcd_readb(&dp->aux, DP_MAX_DOWNSPREAD, &spread); + -+midgard_kbase-$(CONFIG_MALI_DMA_FENCE) += \ -+ mali_kbase_dma_fence.o \ -+ mali_kbase_fence.o -+midgard_kbase-$(CONFIG_SYNC) += \ -+ mali_kbase_sync_android.o \ -+ mali_kbase_sync_common.o -+midgard_kbase-$(CONFIG_SYNC_FILE) += \ -+ mali_kbase_sync_file.o \ -+ mali_kbase_sync_common.o \ -+ mali_kbase_fence.o ++ dp->link_train.link_rate = link_rate; ++ dp->link_train.lane_count = lane_count; ++ dp->link_train.enhanced_framing = analogix_dp_get_enhanced_mode(dp); ++ dp->link_train.ssc = !!(spread & DP_MAX_DOWNSPREAD_0_5); + -+MALI_BACKEND_PATH ?= backend -+CONFIG_MALI_BACKEND ?= gpu -+CONFIG_MALI_BACKEND_REAL ?= $(CONFIG_MALI_BACKEND) ++ for (lane = 0; lane < 4; lane++) ++ dp->link_train.training_lane[lane] = ++ analogix_dp_get_lane_link_training(dp, lane); ++} + -+ifeq ($(MALI_MOCK_TEST),1) -+ifeq ($(CONFIG_MALI_BACKEND_REAL),gpu) -+# Test functionality -+midgard_kbase-y += tests/internal/src/mock/mali_kbase_pm_driver_mock.o -+endif -+endif ++int analogix_dp_loader_protect(struct analogix_dp_device *dp) ++{ ++ u8 link_status[DP_LINK_STATUS_SIZE]; ++ int ret; + -+include $(src)/$(MALI_BACKEND_PATH)/$(CONFIG_MALI_BACKEND_REAL)/Kbuild -+midgard_kbase-y += $(BACKEND:.c=.o) ++ ret = analogix_dp_phy_power_on(dp); ++ if (ret) ++ return ret; + ++ dp->dpms_mode = DRM_MODE_DPMS_ON; + -+ccflags-y += -I$(src)/$(MALI_BACKEND_PATH)/$(CONFIG_MALI_BACKEND_REAL) -+subdir-ccflags-y += -I$(src)/$(MALI_BACKEND_PATH)/$(CONFIG_MALI_BACKEND_REAL) ++ analogix_dp_link_train_restore(dp); + -+# Default to devicetree platform if neither a fake platform or a thirdparty -+# platform is configured. -+ifeq ($(CONFIG_MALI_PLATFORM_THIRDPARTY)$(CONFIG_MALI_PLATFORM_FAKE),) -+CONFIG_MALI_PLATFORM_DEVICETREE := y -+endif ++ ret = analogix_dp_fast_link_train_detection(dp); ++ if (ret) ++ goto err_disable; + -+midgard_kbase-$(CONFIG_MALI_PLATFORM_DEVICETREE) += \ -+ platform/devicetree/mali_kbase_runtime_pm.o \ -+ platform/devicetree/mali_kbase_config_devicetree.o -+ccflags-$(CONFIG_MALI_PLATFORM_DEVICETREE) += -I$(src)/platform/devicetree ++ if (analogix_dp_detect_sink_psr(dp)) { ++ ret = analogix_dp_enable_sink_psr(dp); ++ if (ret) ++ goto err_disable; ++ } + -+# For kutf and mali_kutf_irq_latency_test -+obj-$(CONFIG_MALI_KUTF) += tests/ -diff --git a/drivers/gpu/arm/midgard/Kconfig b/drivers/gpu/arm/midgard/Kconfig -new file mode 100755 -index 000000000000..1b28bb73ad59 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/Kconfig -@@ -0,0 +1,248 @@ -+# -+# (C) COPYRIGHT 2012-2015 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# ++ ret = drm_dp_dpcd_read_link_status(&dp->aux, link_status); ++ if (ret < 0) { ++ dev_err(dp->dev, "Failed to read link status\n"); ++ goto err_disable; ++ } + ++ if (!drm_dp_channel_eq_ok(link_status, dp->link_train.lane_count)) { ++ dev_err(dp->dev, "Channel EQ or CR not ok\n"); ++ ret = -EINVAL; ++ goto err_disable; ++ } + ++ return 0; + -+menuconfig MALI_MIDGARD -+ tristate "Mali Midgard series support" -+ select GPU_TRACEPOINTS if ANDROID -+ default n -+ help -+ Enable this option to build support for a ARM Mali Midgard GPU. ++err_disable: ++ analogix_dp_disable(dp); ++ return ret; ++} ++EXPORT_SYMBOL_GPL(analogix_dp_loader_protect); + -+ To compile this driver as a module, choose M here: -+ this will generate a single module, called mali_kbase. -+ -+config MALI_GATOR_SUPPORT -+ bool "Streamline support via Gator" -+ depends on MALI_MIDGARD -+ default n -+ help -+ Adds diagnostic support for use with the ARM Streamline Performance Analyzer. -+ You will need the Gator device driver already loaded before loading this driver when enabling -+ Streamline debug support. -+ This is a legacy interface required by older versions of Streamline. -+ -+config MALI_MIDGARD_DVFS -+ bool "Enable legacy DVFS" -+ depends on MALI_MIDGARD && !MALI_DEVFREQ && !MALI_PLATFORM_DEVICETREE -+ default n -+ help -+ Choose this option to enable legacy DVFS in the Mali Midgard DDK. -+ -+config MALI_MIDGARD_ENABLE_TRACE -+ bool "Enable kbase tracing" -+ depends on MALI_MIDGARD -+ default n -+ help -+ Enables tracing in kbase. Trace log available through -+ the "mali_trace" debugfs file, when the CONFIG_DEBUG_FS is enabled -+ -+config MALI_DEVFREQ -+ bool "devfreq support for Mali" -+ depends on MALI_MIDGARD && PM_DEVFREQ -+ help -+ Support devfreq for Mali. -+ -+ Using the devfreq framework and, by default, the simpleondemand -+ governor, the frequency of Mali will be dynamically selected from the -+ available OPPs. -+ -+config MALI_DMA_FENCE -+ bool "DMA_BUF fence support for Mali" -+ depends on MALI_MIDGARD && !KDS -+ default n -+ help -+ Support DMA_BUF fences for Mali. -+ -+ This option should only be enabled if KDS is not present and -+ the Linux Kernel has built in support for DMA_BUF fences. -+ -+# MALI_EXPERT configuration options -+ -+menuconfig MALI_EXPERT -+ depends on MALI_MIDGARD -+ bool "Enable Expert Settings" -+ default n -+ help -+ Enabling this option and modifying the default settings may produce a driver with performance or -+ other limitations. -+ -+config MALI_CORESTACK -+ bool "Support controlling power to the GPU core stack" -+ depends on MALI_MIDGARD && MALI_EXPERT -+ default n -+ help -+ Enabling this feature on supported GPUs will let the driver powering -+ on/off the GPU core stack independently without involving the Power -+ Domain Controller. This should only be enabled on platforms which -+ integration of the PDC to the Mali GPU is known to be problematic. -+ This feature is currently only supported on t-Six and t-HEx GPUs. -+ -+ If unsure, say N. -+ -+config MALI_PRFCNT_SET_SECONDARY -+ bool "Use secondary set of performance counters" -+ depends on MALI_MIDGARD && MALI_EXPERT -+ default n -+ help -+ Select this option to use secondary set of performance counters. Kernel -+ features that depend on an access to the primary set of counters may -+ become unavailable. Enabling this option will prevent power management -+ from working optimally and may cause instrumentation tools to return -+ bogus results. -+ -+ If unsure, say N. -+ -+config MALI_PLATFORM_FAKE -+ bool "Enable fake platform device support" -+ depends on MALI_MIDGARD && MALI_EXPERT -+ default n -+ help -+ When you start to work with the Mali Midgard series device driver the platform-specific code of -+ the Linux kernel for your platform may not be complete. In this situation the kernel device driver -+ supports creating the platform device outside of the Linux platform-specific code. -+ Enable this option if would like to use a platform device configuration from within the device driver. -+ -+choice -+ prompt "Platform configuration" -+ depends on MALI_MIDGARD && MALI_EXPERT -+ default MALI_PLATFORM_DEVICETREE -+ help -+ Select the SOC platform that contains a Mali Midgard GPU -+ -+config MALI_PLATFORM_DEVICETREE -+ bool "Device Tree platform" -+ depends on OF -+ help -+ Select this option to use Device Tree with the Mali driver. -+ -+ When using this option the Mali driver will get the details of the -+ GPU hardware from the Device Tree. This means that the same driver -+ binary can run on multiple platforms as long as all the GPU hardware -+ details are described in the device tree. -+ -+ Device Tree is the recommended method for the Mali driver platform -+ integration. -+ -+config MALI_PLATFORM_VEXPRESS -+ depends on ARCH_VEXPRESS && (ARCH_VEXPRESS_CA9X4 || ARCH_VEXPRESS_CA15X4) -+ bool "Versatile Express" -+config MALI_PLATFORM_VEXPRESS_VIRTEX7_40MHZ -+ depends on ARCH_VEXPRESS && (ARCH_VEXPRESS_CA9X4 || ARCH_VEXPRESS_CA15X4) -+ bool "Versatile Express w/Virtex7 @ 40Mhz" -+config MALI_PLATFORM_GOLDFISH -+ depends on ARCH_GOLDFISH -+ bool "Android Goldfish virtual CPU" -+config MALI_PLATFORM_PBX -+ depends on ARCH_REALVIEW && REALVIEW_EB_A9MP && MACH_REALVIEW_PBX -+ bool "Realview PBX-A9" -+config MALI_PLATFORM_THIRDPARTY -+ bool "Third Party Platform" -+endchoice -+ -+config MALI_PLATFORM_THIRDPARTY_NAME -+ depends on MALI_MIDGARD && MALI_PLATFORM_THIRDPARTY && MALI_EXPERT -+ string "Third party platform name" -+ help -+ Enter the name of a third party platform that is supported. The third part configuration -+ file must be in midgard/config/tpip/mali_kbase_config_xxx.c where xxx is the name -+ specified here. -+ -+config MALI_DEBUG -+ bool "Debug build" -+ depends on MALI_MIDGARD && MALI_EXPERT -+ default n -+ help -+ Select this option for increased checking and reporting of errors. -+ -+config MALI_FENCE_DEBUG -+ bool "Debug sync fence usage" -+ depends on MALI_MIDGARD && MALI_EXPERT && (SYNC || SYNC_FILE) -+ default y if MALI_DEBUG -+ help -+ Select this option to enable additional checking and reporting on the -+ use of sync fences in the Mali driver. -+ -+ This will add a 3s timeout to all sync fence waits in the Mali -+ driver, so that when work for Mali has been waiting on a sync fence -+ for a long time a debug message will be printed, detailing what fence -+ is causing the block, and which dependent Mali atoms are blocked as a -+ result of this. -+ -+ The timeout can be changed at runtime through the js_soft_timeout -+ device attribute, where the timeout is specified in milliseconds. -+ -+config MALI_NO_MALI -+ bool "No Mali" -+ depends on MALI_MIDGARD && MALI_EXPERT -+ default n -+ help -+ This can be used to test the driver in a simulated environment -+ whereby the hardware is not physically present. If the hardware is physically -+ present it will not be used. This can be used to test the majority of the -+ driver without needing actual hardware or for software benchmarking. -+ All calls to the simulated hardware will complete immediately as if the hardware -+ completed the task. -+ -+config MALI_ERROR_INJECT -+ bool "Error injection" -+ depends on MALI_MIDGARD && MALI_EXPERT && MALI_NO_MALI -+ default n -+ help -+ Enables insertion of errors to test module failure and recovery mechanisms. -+ -+config MALI_TRACE_TIMELINE -+ bool "Timeline tracing" -+ depends on MALI_MIDGARD && MALI_EXPERT -+ default n -+ help -+ Enables timeline tracing through the kernel tracepoint system. -+ -+config MALI_SYSTEM_TRACE -+ bool "Enable system event tracing support" -+ depends on MALI_MIDGARD && MALI_EXPERT -+ default n -+ help -+ Choose this option to enable system trace events for each -+ kbase event. This is typically used for debugging but has -+ minimal overhead when not in use. Enable only if you know what -+ you are doing. -+ -+config MALI_GPU_MMU_AARCH64 -+ bool "Use AArch64 page tables" -+ depends on MALI_MIDGARD && MALI_EXPERT -+ default n -+ help -+ Use AArch64 format page tables for the GPU instead of LPAE-style. -+ The two formats have the same functionality and performance but a -+ future GPU may deprecate or remove the legacy LPAE-style format. -+ -+ The LPAE-style format is supported on all Midgard and current Bifrost -+ GPUs. Enabling AArch64 format restricts the driver to only supporting -+ Bifrost GPUs. -+ -+ If in doubt, say N. -+ -+config MALI_PWRSOFT_765 -+ bool "PWRSOFT-765 ticket" -+ depends on MALI_MIDGARD && MALI_EXPERT -+ default n -+ help -+ PWRSOFT-765 fixes devfreq cooling devices issues. However, they are -+ not merged in mainline kernel yet. So this define helps to guard those -+ parts of the code. -+ -+source "drivers/gpu/arm/midgard/platform/Kconfig" -+source "drivers/gpu/arm/midgard/tests/Kconfig" -diff --git a/drivers/gpu/arm/midgard/Makefile b/drivers/gpu/arm/midgard/Makefile -new file mode 100755 -index 000000000000..9aa242c4f8c4 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/Makefile -@@ -0,0 +1,42 @@ -+# -+# (C) COPYRIGHT 2010-2016, 2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# -+ -+ -+ -+KDIR ?= /lib/modules/$(shell uname -r)/build -+ -+BUSLOG_PATH_RELATIVE = $(CURDIR)/../../../.. -+UMP_PATH_RELATIVE = $(CURDIR)/../../../base/ump -+KBASE_PATH_RELATIVE = $(CURDIR) -+KDS_PATH_RELATIVE = $(CURDIR)/../../../.. -+EXTRA_SYMBOLS = $(UMP_PATH_RELATIVE)/src/Module.symvers -+ -+ifeq ($(MALI_UNIT_TEST), 1) -+ EXTRA_SYMBOLS += $(KBASE_PATH_RELATIVE)/tests/internal/src/kernel_assert_module/linux/Module.symvers -+endif -+ -+ifeq ($(MALI_BUS_LOG), 1) -+#Add bus logger symbols -+EXTRA_SYMBOLS += $(BUSLOG_PATH_RELATIVE)/drivers/base/bus_logger/Module.symvers -+endif -+ -+# GPL driver supports KDS -+EXTRA_SYMBOLS += $(KDS_PATH_RELATIVE)/drivers/base/kds/Module.symvers -+ -+# we get the symbols from modules using KBUILD_EXTRA_SYMBOLS to prevent warnings about unknown functions -+all: -+ $(MAKE) -C $(KDIR) M=$(CURDIR) EXTRA_CFLAGS="-I$(CURDIR)/../../../../include -I$(CURDIR)/../../../../tests/include $(SCONS_CFLAGS)" $(SCONS_CONFIGS) KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" modules -+ -+clean: -+ $(MAKE) -C $(KDIR) M=$(CURDIR) clean -diff --git a/drivers/gpu/arm/midgard/Makefile.kbase b/drivers/gpu/arm/midgard/Makefile.kbase -new file mode 100755 -index 000000000000..2bef9c25eaeb ---- /dev/null -+++ b/drivers/gpu/arm/midgard/Makefile.kbase -@@ -0,0 +1,17 @@ -+# -+# (C) COPYRIGHT 2010 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# -+ -+ -+EXTRA_CFLAGS += -I$(ROOT) -I$(KBASE_PATH) -I$(OSK_PATH)/src/linux/include -I$(KBASE_PATH)/platform_$(PLATFORM) -+ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/Kbuild b/drivers/gpu/arm/midgard/backend/gpu/Kbuild -new file mode 100755 -index 000000000000..5f700e9b6b44 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/Kbuild -@@ -0,0 +1,60 @@ -+# -+# (C) COPYRIGHT 2014,2017 ARM Limited. All rights reserved. -+# -+# This program is free software and is provided to you under the terms of the -+# GNU General Public License version 2 as published by the Free Software -+# Foundation, and any use by you of this program is subject to the terms -+# of such GNU licence. -+# -+# A copy of the licence is included with the program, and can also be obtained -+# from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+# -+ -+ -+BACKEND += \ -+ backend/gpu/mali_kbase_cache_policy_backend.c \ -+ backend/gpu/mali_kbase_device_hw.c \ -+ backend/gpu/mali_kbase_gpu.c \ -+ backend/gpu/mali_kbase_gpuprops_backend.c \ -+ backend/gpu/mali_kbase_debug_job_fault_backend.c \ -+ backend/gpu/mali_kbase_irq_linux.c \ -+ backend/gpu/mali_kbase_instr_backend.c \ -+ backend/gpu/mali_kbase_jm_as.c \ -+ backend/gpu/mali_kbase_jm_hw.c \ -+ backend/gpu/mali_kbase_jm_rb.c \ -+ backend/gpu/mali_kbase_js_affinity.c \ -+ backend/gpu/mali_kbase_js_backend.c \ -+ backend/gpu/mali_kbase_mmu_hw_direct.c \ -+ backend/gpu/mali_kbase_pm_backend.c \ -+ backend/gpu/mali_kbase_pm_driver.c \ -+ backend/gpu/mali_kbase_pm_metrics.c \ -+ backend/gpu/mali_kbase_pm_ca.c \ -+ backend/gpu/mali_kbase_pm_ca_fixed.c \ -+ backend/gpu/mali_kbase_pm_always_on.c \ -+ backend/gpu/mali_kbase_pm_coarse_demand.c \ -+ backend/gpu/mali_kbase_pm_demand.c \ -+ backend/gpu/mali_kbase_pm_policy.c \ -+ backend/gpu/mali_kbase_time.c -+ -+ifeq ($(MALI_CUSTOMER_RELEASE),0) -+BACKEND += \ -+ backend/gpu/mali_kbase_pm_ca_random.c \ -+ backend/gpu/mali_kbase_pm_demand_always_powered.c \ -+ backend/gpu/mali_kbase_pm_fast_start.c -+endif -+ -+ifeq ($(CONFIG_MALI_DEVFREQ),y) -+BACKEND += \ -+ backend/gpu/mali_kbase_devfreq.c \ -+ backend/gpu/mali_kbase_pm_ca_devfreq.c -+endif -+ -+ifeq ($(CONFIG_MALI_NO_MALI),y) -+ # Dummy model -+ BACKEND += backend/gpu/mali_kbase_model_dummy.c -+ BACKEND += backend/gpu/mali_kbase_model_linux.c -+ # HW error simulation -+ BACKEND += backend/gpu/mali_kbase_model_error_generator.c -+endif -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h -new file mode 100755 -index 000000000000..c8ae87eb84a2 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h -@@ -0,0 +1,29 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+/* -+ * Backend specific configuration -+ */ -+ -+#ifndef _KBASE_BACKEND_CONFIG_H_ -+#define _KBASE_BACKEND_CONFIG_H_ -+ -+/* Enable GPU reset API */ -+#define KBASE_GPU_RESET_EN 1 -+ -+#endif /* _KBASE_BACKEND_CONFIG_H_ */ -+ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c -new file mode 100755 -index 000000000000..fef9a2cb743e ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c -@@ -0,0 +1,29 @@ -+/* -+ * -+ * (C) COPYRIGHT 2015-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+#include "backend/gpu/mali_kbase_cache_policy_backend.h" -+#include -+ -+void kbase_cache_set_coherency_mode(struct kbase_device *kbdev, -+ u32 mode) -+{ -+ kbdev->current_gpu_coherency_mode = mode; -+ -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_COHERENCY_REG)) -+ kbase_reg_write(kbdev, COHERENCY_ENABLE, mode, NULL); -+} -+ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h -new file mode 100755 -index 000000000000..fe9869109a82 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h -@@ -0,0 +1,34 @@ -+/* -+ * -+ * (C) COPYRIGHT 2015-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+ -+#ifndef _KBASE_CACHE_POLICY_BACKEND_H_ -+#define _KBASE_CACHE_POLICY_BACKEND_H_ -+ -+#include "mali_kbase.h" -+#include "mali_base_kernel.h" -+ -+/** -+ * kbase_cache_set_coherency_mode() - Sets the system coherency mode -+ * in the GPU. -+ * @kbdev: Device pointer -+ * @mode: Coherency mode. COHERENCY_ACE/ACE_LITE -+ */ -+void kbase_cache_set_coherency_mode(struct kbase_device *kbdev, -+ u32 mode); -+ -+#endif /* _KBASE_CACHE_POLICY_H_ */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c -new file mode 100755 -index 000000000000..7851ea6466c7 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c -@@ -0,0 +1,157 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+#include -+#include -+#include "mali_kbase_debug_job_fault.h" -+ -+#ifdef CONFIG_DEBUG_FS -+ -+/*GPU_CONTROL_REG(r)*/ -+static int gpu_control_reg_snapshot[] = { -+ GPU_ID, -+ SHADER_READY_LO, -+ SHADER_READY_HI, -+ TILER_READY_LO, -+ TILER_READY_HI, -+ L2_READY_LO, -+ L2_READY_HI -+}; -+ -+/* JOB_CONTROL_REG(r) */ -+static int job_control_reg_snapshot[] = { -+ JOB_IRQ_MASK, -+ JOB_IRQ_STATUS -+}; -+ -+/* JOB_SLOT_REG(n,r) */ -+static int job_slot_reg_snapshot[] = { -+ JS_HEAD_LO, -+ JS_HEAD_HI, -+ JS_TAIL_LO, -+ JS_TAIL_HI, -+ JS_AFFINITY_LO, -+ JS_AFFINITY_HI, -+ JS_CONFIG, -+ JS_STATUS, -+ JS_HEAD_NEXT_LO, -+ JS_HEAD_NEXT_HI, -+ JS_AFFINITY_NEXT_LO, -+ JS_AFFINITY_NEXT_HI, -+ JS_CONFIG_NEXT -+}; -+ -+/*MMU_REG(r)*/ -+static int mmu_reg_snapshot[] = { -+ MMU_IRQ_MASK, -+ MMU_IRQ_STATUS -+}; -+ -+/* MMU_AS_REG(n,r) */ -+static int as_reg_snapshot[] = { -+ AS_TRANSTAB_LO, -+ AS_TRANSTAB_HI, -+ AS_MEMATTR_LO, -+ AS_MEMATTR_HI, -+ AS_FAULTSTATUS, -+ AS_FAULTADDRESS_LO, -+ AS_FAULTADDRESS_HI, -+ AS_STATUS -+}; -+ -+bool kbase_debug_job_fault_reg_snapshot_init(struct kbase_context *kctx, -+ int reg_range) -+{ -+ int i, j; -+ int offset = 0; -+ int slot_number; -+ int as_number; -+ -+ if (kctx->reg_dump == NULL) -+ return false; -+ -+ slot_number = kctx->kbdev->gpu_props.num_job_slots; -+ as_number = kctx->kbdev->gpu_props.num_address_spaces; -+ -+ /* get the GPU control registers*/ -+ for (i = 0; i < sizeof(gpu_control_reg_snapshot)/4; i++) { -+ kctx->reg_dump[offset] = -+ GPU_CONTROL_REG(gpu_control_reg_snapshot[i]); -+ offset += 2; -+ } -+ -+ /* get the Job control registers*/ -+ for (i = 0; i < sizeof(job_control_reg_snapshot)/4; i++) { -+ kctx->reg_dump[offset] = -+ JOB_CONTROL_REG(job_control_reg_snapshot[i]); -+ offset += 2; -+ } -+ -+ /* get the Job Slot registers*/ -+ for (j = 0; j < slot_number; j++) { -+ for (i = 0; i < sizeof(job_slot_reg_snapshot)/4; i++) { -+ kctx->reg_dump[offset] = -+ JOB_SLOT_REG(j, job_slot_reg_snapshot[i]); -+ offset += 2; + struct analogix_dp_device * + analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data) + { + struct platform_device *pdev = to_platform_device(dev); + struct analogix_dp_device *dp; + struct resource *res; +- unsigned int irq_flags; + int ret; + + if (!plat_data) { +@@ -1708,9 +2262,10 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data) + + dp->dev = &pdev->dev; + dp->dpms_mode = DRM_MODE_DPMS_OFF; ++ INIT_WORK(&dp->modeset_retry_work, analogix_dp_modeset_retry_work_fn); + + mutex_init(&dp->panel_lock); +- dp->panel_is_modeset = false; ++ dp->panel_is_prepared = false; + + /* + * platform dp driver need containor_of the plat_data to get +@@ -1739,21 +2294,19 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data) + } + } + +- dp->clock = devm_clk_get(&pdev->dev, "dp"); +- if (IS_ERR(dp->clock)) { +- dev_err(&pdev->dev, "failed to get clock\n"); +- return ERR_CAST(dp->clock); ++ ret = devm_clk_bulk_get_all(dev, &dp->clks); ++ if (ret < 0) { ++ dev_err(dev, "failed to get clocks %d\n", ret); ++ return ERR_PTR(ret); + } + +- clk_prepare_enable(dp->clock); ++ dp->nr_clks = ret; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + + dp->reg_base = devm_ioremap_resource(&pdev->dev, res); +- if (IS_ERR(dp->reg_base)) { +- ret = PTR_ERR(dp->reg_base); +- goto err_disable_clk; +- } ++ if (IS_ERR(dp->reg_base)) ++ return ERR_CAST(dp->reg_base); + + dp->force_hpd = of_property_read_bool(dev->of_node, "force-hpd"); + +@@ -1765,46 +2318,55 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data) + if (IS_ERR(dp->hpd_gpiod)) { + dev_err(dev, "error getting HDP GPIO: %ld\n", + PTR_ERR(dp->hpd_gpiod)); +- ret = PTR_ERR(dp->hpd_gpiod); +- goto err_disable_clk; ++ return ERR_CAST(dp->hpd_gpiod); + } + + if (dp->hpd_gpiod) { +- /* +- * Set up the hotplug GPIO from the device tree as an interrupt. +- * Simply specifying a different interrupt in the device tree +- * doesn't work since we handle hotplug rather differently when +- * using a GPIO. We also need the actual GPIO specifier so +- * that we can get the current state of the GPIO. +- */ +- dp->irq = gpiod_to_irq(dp->hpd_gpiod); +- irq_flags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING; +- } else { +- dp->irq = platform_get_irq(pdev, 0); +- irq_flags = 0; ++ ret = devm_request_threaded_irq(dev, ++ gpiod_to_irq(dp->hpd_gpiod), ++ NULL, ++ analogix_dp_hpd_irq_handler, ++ IRQF_TRIGGER_RISING | ++ IRQF_TRIGGER_FALLING | ++ IRQF_ONESHOT, ++ "analogix-hpd", dp); ++ if (ret) { ++ dev_err(dev, "failed to request hpd IRQ: %d\n", ret); ++ return ERR_PTR(ret); + } + } + ++ dp->irq = platform_get_irq(pdev, 0); + if (dp->irq == -ENXIO) { + dev_err(&pdev->dev, "failed to get irq\n"); +- ret = -ENODEV; +- goto err_disable_clk; ++ return ERR_PTR(-ENODEV); + } + +- ret = devm_request_threaded_irq(&pdev->dev, dp->irq, +- analogix_dp_hardirq, ++ irq_set_status_flags(dp->irq, IRQ_NOAUTOEN); ++ ret = devm_request_threaded_irq(dev, dp->irq, NULL, + analogix_dp_irq_thread, +- irq_flags, "analogix-dp", dp); ++ IRQF_ONESHOT, dev_name(dev), dp); + if (ret) { + dev_err(&pdev->dev, "failed to request irq\n"); +- goto err_disable_clk; ++ return ERR_PTR(ret); + } +- disable_irq(dp->irq); + +- return dp; ++ dp->extcon = devm_extcon_dev_allocate(dev, analogix_dp_cable); ++ if (IS_ERR(dp->extcon)) { ++ dev_err(dev, "failed to allocate extcon device\n"); ++ return ERR_CAST(dp->extcon); + } + -+ /* get the MMU registers*/ -+ for (i = 0; i < sizeof(mmu_reg_snapshot)/4; i++) { -+ kctx->reg_dump[offset] = MMU_REG(mmu_reg_snapshot[i]); -+ offset += 2; ++ ret = devm_extcon_dev_register(dev, dp->extcon); ++ if (ret) { ++ dev_err(dev, "failed to register extcon device\n"); ++ return ERR_PTR(ret); + } + +-err_disable_clk: +- clk_disable_unprepare(dp->clock); +- return ERR_PTR(ret); ++ dp->bridge.driver_private = dp; ++ dp->bridge.funcs = &analogix_dp_bridge_funcs; + -+ /* get the Address space registers*/ -+ for (j = 0; j < as_number; j++) { -+ for (i = 0; i < sizeof(as_reg_snapshot)/4; i++) { -+ kctx->reg_dump[offset] = -+ MMU_AS_REG(j, as_reg_snapshot[i]); -+ offset += 2; -+ } -+ } ++ return dp; + } + EXPORT_SYMBOL_GPL(analogix_dp_probe); + +@@ -1824,17 +2386,23 @@ int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev) + return ret; + + pm_runtime_enable(dp->dev); ++ pm_runtime_get_sync(dp->dev); ++ analogix_dp_init(dp); + +- ret = analogix_dp_create_bridge(drm_dev, dp); ++ ret = analogix_dp_bridge_init(dp); + if (ret) { +- DRM_ERROR("failed to create bridge (%d)\n", ret); ++ DRM_ERROR("failed to init bridge (%d)\n", ret); + goto err_disable_pm_runtime; + } + ++ enable_irq(dp->irq); + -+ WARN_ON(offset >= (reg_range*2/4)); + return 0; + + err_disable_pm_runtime: ++ pm_runtime_put(dp->dev); + pm_runtime_disable(dp->dev); ++ drm_dp_aux_unregister(&dp->aux); + + return ret; + } +@@ -1842,47 +2410,51 @@ EXPORT_SYMBOL_GPL(analogix_dp_bind); + + void analogix_dp_unbind(struct analogix_dp_device *dp) + { +- analogix_dp_bridge_disable(dp->bridge); +- dp->connector.funcs->destroy(&dp->connector); +- +- if (dp->plat_data->panel) { +- if (drm_panel_unprepare(dp->plat_data->panel)) +- DRM_ERROR("failed to turnoff the panel\n"); +- } +- ++ disable_irq(dp->irq); ++ if (dp->connector.funcs->destroy) ++ dp->connector.funcs->destroy(&dp->connector); + drm_dp_aux_unregister(&dp->aux); ++ pm_runtime_put(dp->dev); + pm_runtime_disable(dp->dev); + } + EXPORT_SYMBOL_GPL(analogix_dp_unbind); + + void analogix_dp_remove(struct analogix_dp_device *dp) + { +- clk_disable_unprepare(dp->clock); ++ cancel_work_sync(&dp->modeset_retry_work); + } + EXPORT_SYMBOL_GPL(analogix_dp_remove); + +-#ifdef CONFIG_PM + int analogix_dp_suspend(struct analogix_dp_device *dp) + { +- clk_disable_unprepare(dp->clock); ++ pm_runtime_force_suspend(dp->dev); + -+ /* set the termination flag*/ -+ kctx->reg_dump[offset] = REGISTER_DUMP_TERMINATION_FLAG; -+ kctx->reg_dump[offset + 1] = REGISTER_DUMP_TERMINATION_FLAG; + return 0; + } + EXPORT_SYMBOL_GPL(analogix_dp_suspend); + + int analogix_dp_resume(struct analogix_dp_device *dp) + { +- int ret; +- +- ret = clk_prepare_enable(dp->clock); +- if (ret < 0) { +- DRM_ERROR("Failed to prepare_enable the clock clk [%d]\n", ret); +- return ret; +- } ++ pm_runtime_force_resume(dp->dev); ++ analogix_dp_init(dp); + + return 0; + } + EXPORT_SYMBOL_GPL(analogix_dp_resume); +-#endif + -+ dev_dbg(kctx->kbdev->dev, "kbase_job_fault_reg_snapshot_init:%d\n", -+ offset); ++int analogix_dp_runtime_suspend(struct analogix_dp_device *dp) ++{ ++ clk_bulk_disable_unprepare(dp->nr_clks, dp->clks); + -+ return true; ++ return 0; +} ++EXPORT_SYMBOL_GPL(analogix_dp_runtime_suspend); + -+bool kbase_job_fault_get_reg_snapshot(struct kbase_context *kctx) ++int analogix_dp_runtime_resume(struct analogix_dp_device *dp) +{ -+ int offset = 0; -+ -+ if (kctx->reg_dump == NULL) -+ return false; -+ -+ while (kctx->reg_dump[offset] != REGISTER_DUMP_TERMINATION_FLAG) { -+ kctx->reg_dump[offset+1] = -+ kbase_reg_read(kctx->kbdev, -+ kctx->reg_dump[offset], NULL); -+ offset += 2; -+ } -+ return true; ++ return clk_bulk_prepare_enable(dp->nr_clks, dp->clks); +} ++EXPORT_SYMBOL_GPL(analogix_dp_runtime_resume); + + int analogix_dp_start_crc(struct drm_connector *connector) + { +diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +index c051502d7..f744058e5 100644 +--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h ++++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +@@ -10,6 +10,7 @@ + #define _ANALOGIX_DP_CORE_H + + #include ++#include + #include + + #define DP_TIMEOUT_LOOP_COUNT 100 +@@ -69,6 +70,9 @@ enum pattern_set { + D10_2, + TRAINING_PTN1, + TRAINING_PTN2, ++ TRAINING_PTN3, ++ TEST_PATTERN_80BIT, ++ TEST_PATTERN_HBR2, + DP_NONE + }; + +@@ -120,15 +124,9 @@ enum analog_power_block { + POWER_ALL + }; + +-enum dp_irq_type { +- DP_IRQ_TYPE_HP_CABLE_IN = BIT(0), +- DP_IRQ_TYPE_HP_CABLE_OUT = BIT(1), +- DP_IRQ_TYPE_HP_CHANGE = BIT(2), +- DP_IRQ_TYPE_UNKNOWN = BIT(3), +-}; +- + struct video_info { + char *name; ++ struct drm_display_mode mode; + + bool h_sync_polarity; + bool v_sync_polarity; +@@ -141,6 +139,10 @@ struct video_info { + + int max_link_rate; + enum link_lane_count_type max_lane_count; ++ u32 lane_map[4]; + -+ -+#endif -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c -new file mode 100755 -index 000000000000..ab14bc2e2ae4 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c -@@ -0,0 +1,458 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+#define ENABLE_DEBUG_LOG -+#include "../../platform/rk/custom_log.h" -+ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#ifdef CONFIG_DEVFREQ_THERMAL -+#include -+#endif -+ -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) -+#include -+#else /* Linux >= 3.13 */ -+/* In 3.13 the OPP include header file, types, and functions were all -+ * renamed. Use the old filename for the include, and define the new names to -+ * the old, when an old kernel is detected. -+ */ -+#include -+#define dev_pm_opp opp -+#define dev_pm_opp_get_voltage opp_get_voltage -+#define dev_pm_opp_get_opp_count opp_get_opp_count -+#define dev_pm_opp_find_freq_ceil opp_find_freq_ceil -+#define dev_pm_opp_find_freq_floor opp_find_freq_floor -+#endif /* Linux >= 3.13 */ -+#include -+#include -+ -+static struct devfreq_simple_ondemand_data ondemand_data; -+ -+static struct monitor_dev_profile mali_mdevp = { -+ .type = MONITOR_TPYE_DEV, -+ .low_temp_adjust = rockchip_monitor_dev_low_temp_adjust, -+ .high_temp_adjust = rockchip_monitor_dev_high_temp_adjust, ++ bool video_bist_enable; ++ bool force_stream_valid; + }; + + struct link_train { +@@ -150,18 +152,29 @@ struct link_train { + u8 link_rate; + u8 lane_count; + u8 training_lane[4]; ++ bool ssc; ++ bool enhanced_framing; + + enum link_training_state lt_state; + }; + ++struct analogix_dp_compliance { ++ struct drm_dp_phy_test_params phytest; ++ int test_link_rate; ++ u8 test_lane_count; ++ unsigned long test_type; ++ bool test_active; +}; + -+/** -+ * opp_translate - Translate nominal OPP frequency from devicetree into real -+ * frequency and core mask -+ * @kbdev: Device pointer -+ * @freq: Nominal frequency -+ * @core_mask: Pointer to u64 to store core mask to -+ * -+ * Return: Real target frequency -+ * -+ * This function will only perform translation if an operating-points-v2-mali -+ * table is present in devicetree. If one is not present then it will return an -+ * untranslated frequency and all cores enabled. -+ */ -+static unsigned long opp_translate(struct kbase_device *kbdev, -+ unsigned long freq, u64 *core_mask) -+{ -+ int i; + struct analogix_dp_device { + struct drm_encoder *encoder; + struct device *dev; + struct drm_device *drm_dev; + struct drm_connector connector; +- struct drm_bridge *bridge; ++ struct drm_bridge bridge; + struct drm_dp_aux aux; +- struct clk *clock; ++ struct clk_bulk_data *clks; ++ int nr_clks; + unsigned int irq; + void __iomem *reg_base; + +@@ -173,17 +186,22 @@ struct analogix_dp_device { + bool force_hpd; + bool fast_train_enable; + bool psr_supported; ++ struct work_struct modeset_retry_work; + + struct mutex panel_lock; +- bool panel_is_modeset; ++ bool panel_is_prepared; + ++ u8 dpcd[DP_RECEIVER_CAP_SIZE]; + struct analogix_dp_plat_data *plat_data; ++ struct extcon_dev *extcon; ++ struct analogix_dp_compliance compliance; + -+ for (i = 0; i < kbdev->num_opps; i++) { -+ if (kbdev->opp_table[i].opp_freq == freq) { -+ *core_mask = kbdev->opp_table[i].core_mask; -+ return kbdev->opp_table[i].real_freq; -+ } ++ u32 split_area; + }; + + /* analogix_dp_reg.c */ + void analogix_dp_enable_video_mute(struct analogix_dp_device *dp, bool enable); + void analogix_dp_stop_video(struct analogix_dp_device *dp); +-void analogix_dp_lane_swap(struct analogix_dp_device *dp, bool enable); + void analogix_dp_init_analog_param(struct analogix_dp_device *dp); + void analogix_dp_init_interrupt(struct analogix_dp_device *dp); + void analogix_dp_reset(struct analogix_dp_device *dp); +@@ -199,7 +217,6 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp, + int analogix_dp_init_analog_func(struct analogix_dp_device *dp); + void analogix_dp_init_hpd(struct analogix_dp_device *dp); + void analogix_dp_force_hpd(struct analogix_dp_device *dp); +-enum dp_irq_type analogix_dp_get_irq_type(struct analogix_dp_device *dp); + void analogix_dp_clear_hotplug_interrupts(struct analogix_dp_device *dp); + void analogix_dp_reset_aux(struct analogix_dp_device *dp); + void analogix_dp_init_aux(struct analogix_dp_device *dp); +@@ -211,28 +228,11 @@ void analogix_dp_set_lane_count(struct analogix_dp_device *dp, u32 count); + void analogix_dp_get_lane_count(struct analogix_dp_device *dp, u32 *count); + void analogix_dp_enable_enhanced_mode(struct analogix_dp_device *dp, + bool enable); ++bool analogix_dp_get_enhanced_mode(struct analogix_dp_device *dp); + void analogix_dp_set_training_pattern(struct analogix_dp_device *dp, + enum pattern_set pattern); +-void analogix_dp_set_lane0_pre_emphasis(struct analogix_dp_device *dp, +- u32 level); +-void analogix_dp_set_lane1_pre_emphasis(struct analogix_dp_device *dp, +- u32 level); +-void analogix_dp_set_lane2_pre_emphasis(struct analogix_dp_device *dp, +- u32 level); +-void analogix_dp_set_lane3_pre_emphasis(struct analogix_dp_device *dp, +- u32 level); +-void analogix_dp_set_lane0_link_training(struct analogix_dp_device *dp, +- u32 training_lane); +-void analogix_dp_set_lane1_link_training(struct analogix_dp_device *dp, +- u32 training_lane); +-void analogix_dp_set_lane2_link_training(struct analogix_dp_device *dp, +- u32 training_lane); +-void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp, +- u32 training_lane); +-u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp); +-u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp); +-u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp); +-u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp); ++void analogix_dp_set_lane_link_training(struct analogix_dp_device *dp); ++u32 analogix_dp_get_lane_link_training(struct analogix_dp_device *dp, u8 lane); + void analogix_dp_reset_macro(struct analogix_dp_device *dp); + void analogix_dp_init_video(struct analogix_dp_device *dp); + +@@ -255,5 +255,18 @@ int analogix_dp_send_psr_spd(struct analogix_dp_device *dp, + struct dp_sdp *vsc, bool blocking); + ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, + struct drm_dp_aux_msg *msg); ++void analogix_dp_set_video_format(struct analogix_dp_device *dp); ++void analogix_dp_video_bist_enable(struct analogix_dp_device *dp); ++bool analogix_dp_ssc_supported(struct analogix_dp_device *dp); ++int analogix_dp_phy_power_on(struct analogix_dp_device *dp); ++void analogix_dp_phy_power_off(struct analogix_dp_device *dp); ++void analogix_dp_audio_config_spdif(struct analogix_dp_device *dp); ++void analogix_dp_audio_config_i2s(struct analogix_dp_device *dp); ++void analogix_dp_audio_enable(struct analogix_dp_device *dp); ++void analogix_dp_audio_disable(struct analogix_dp_device *dp); ++void analogix_dp_init(struct analogix_dp_device *dp); ++void analogix_dp_irq_handler(struct analogix_dp_device *dp); ++void analogix_dp_phy_test(struct analogix_dp_device *dp); ++void analogix_dp_check_device_service_irq(struct analogix_dp_device *dp); + + #endif /* _ANALOGIX_DP_CORE_H */ +diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +index cab3f5c4e..e756d7cd3 100644 +--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c ++++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +@@ -11,30 +11,44 @@ + #include + #include + #include ++#include + + #include ++#include + + #include "analogix_dp_core.h" + #include "analogix_dp_reg.h" + +-#define COMMON_INT_MASK_1 0 +-#define COMMON_INT_MASK_2 0 +-#define COMMON_INT_MASK_3 0 +-#define COMMON_INT_MASK_4 (HOTPLUG_CHG | HPD_LOST | PLUG) +-#define INT_STA_MASK INT_HPD ++static void analogix_dp_write(struct analogix_dp_device *dp, u32 reg, u32 val) ++{ ++ if (dp->plat_data && is_rockchip(dp->plat_data->dev_type)) { ++ readl(dp->reg_base); ++ writel(val, dp->reg_base + reg); + } + -+ /* Failed to find OPP - return all cores enabled & nominal frequency */ -+ *core_mask = kbdev->gpu_props.props.raw_props.shader_present; -+ -+ return freq; ++ writel(val, dp->reg_base + reg); +} + -+static int -+kbase_devfreq_target(struct device *dev, unsigned long *target_freq, u32 flags) ++static u32 analogix_dp_read(struct analogix_dp_device *dp, u32 reg) +{ -+ struct kbase_device *kbdev = dev_get_drvdata(dev); -+ struct dev_pm_opp *opp; -+ unsigned long nominal_freq; -+ unsigned long freq = 0; -+ unsigned long old_freq = kbdev->current_freq; -+ unsigned long voltage; -+ int err; -+ u64 core_mask; -+ -+ freq = *target_freq; -+ -+ opp = devfreq_recommended_opp(dev, &freq, flags); -+ if (IS_ERR(opp)) { -+ dev_err(dev, "Failed to get opp (%ld)\n", PTR_ERR(opp)); -+ return PTR_ERR(opp); -+ } -+ voltage = dev_pm_opp_get_voltage(opp); -+ -+ nominal_freq = freq; -+ -+ /* -+ * Only update if there is a change of frequency -+ */ -+ if (kbdev->current_nominal_freq == nominal_freq) { -+ *target_freq = nominal_freq; -+#ifdef CONFIG_REGULATOR -+ if (kbdev->current_voltage == voltage) -+ return 0; -+ err = regulator_set_voltage(kbdev->regulator, voltage, INT_MAX); -+ if (err) { -+ dev_err(dev, "Failed to set voltage (%d)\n", err); -+ return err; -+ } -+ kbdev->current_voltage = voltage; -+#endif -+ return 0; -+ } ++ if (dp->plat_data && is_rockchip(dp->plat_data->dev_type)) ++ readl(dp->reg_base + reg); + -+ freq = opp_translate(kbdev, nominal_freq, &core_mask); -+#ifdef CONFIG_REGULATOR -+ if (kbdev->regulator && kbdev->current_voltage != voltage && -+ old_freq < freq) { -+ err = regulator_set_voltage(kbdev->regulator, voltage, INT_MAX); -+ if (err) { -+ dev_err(dev, "Failed to increase voltage (%d)\n", err); -+ return err; ++ return readl(dp->reg_base + reg); ++} + + void analogix_dp_enable_video_mute(struct analogix_dp_device *dp, bool enable) + { + u32 reg; + + if (enable) { +- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_VIDEO_CTL_1); + reg |= HDCP_VIDEO_MUTE; +- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1); ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_CTL_1, reg); + } else { +- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_VIDEO_CTL_1); + reg &= ~HDCP_VIDEO_MUTE; +- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1); ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_CTL_1, reg); + } + } + +@@ -42,23 +56,20 @@ void analogix_dp_stop_video(struct analogix_dp_device *dp) + { + u32 reg; + +- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_VIDEO_CTL_1); + reg &= ~VIDEO_EN; +- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1); ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_CTL_1, reg); + } + +-void analogix_dp_lane_swap(struct analogix_dp_device *dp, bool enable) ++static void analogix_dp_set_lane_map(struct analogix_dp_device *dp) + { +- u32 reg; ++ struct video_info *video_info = &dp->video_info; ++ u32 i, reg = 0; + +- if (enable) +- reg = LANE3_MAP_LOGIC_LANE_0 | LANE2_MAP_LOGIC_LANE_1 | +- LANE1_MAP_LOGIC_LANE_2 | LANE0_MAP_LOGIC_LANE_3; +- else +- reg = LANE3_MAP_LOGIC_LANE_3 | LANE2_MAP_LOGIC_LANE_2 | +- LANE1_MAP_LOGIC_LANE_1 | LANE0_MAP_LOGIC_LANE_0; ++ for (i = 0; i < video_info->max_lane_count; i++) ++ reg |= video_info->lane_map[i] << (2 * i); + +- writel(reg, dp->reg_base + ANALOGIX_DP_LANE_MAP); ++ analogix_dp_write(dp, ANALOGIX_DP_LANE_MAP, reg); + } + + void analogix_dp_init_analog_param(struct analogix_dp_device *dp) +@@ -66,53 +77,54 @@ void analogix_dp_init_analog_param(struct analogix_dp_device *dp) + u32 reg; + + reg = TX_TERMINAL_CTRL_50_OHM; +- writel(reg, dp->reg_base + ANALOGIX_DP_ANALOG_CTL_1); ++ analogix_dp_write(dp, ANALOGIX_DP_ANALOG_CTL_1, reg); + + reg = SEL_24M | TX_DVDD_BIT_1_0625V; +- writel(reg, dp->reg_base + ANALOGIX_DP_ANALOG_CTL_2); ++ analogix_dp_write(dp, ANALOGIX_DP_ANALOG_CTL_2, reg); + + if (dp->plat_data && is_rockchip(dp->plat_data->dev_type)) { + reg = REF_CLK_24M; + if (dp->plat_data->dev_type == RK3288_DP) + reg ^= REF_CLK_MASK; + +- writel(reg, dp->reg_base + ANALOGIX_DP_PLL_REG_1); +- writel(0x95, dp->reg_base + ANALOGIX_DP_PLL_REG_2); +- writel(0x40, dp->reg_base + ANALOGIX_DP_PLL_REG_3); +- writel(0x58, dp->reg_base + ANALOGIX_DP_PLL_REG_4); +- writel(0x22, dp->reg_base + ANALOGIX_DP_PLL_REG_5); ++ analogix_dp_write(dp, ANALOGIX_DP_PLL_REG_1, reg); ++ analogix_dp_write(dp, ANALOGIX_DP_PLL_REG_2, 0x99); ++ analogix_dp_write(dp, ANALOGIX_DP_PLL_REG_3, 0x40); ++ analogix_dp_write(dp, ANALOGIX_DP_PLL_REG_4, 0x58); ++ analogix_dp_write(dp, ANALOGIX_DP_PLL_REG_5, 0x22); ++ analogix_dp_write(dp, ANALOGIX_DP_BIAS, 0x44); + } + + reg = DRIVE_DVDD_BIT_1_0625V | VCO_BIT_600_MICRO; +- writel(reg, dp->reg_base + ANALOGIX_DP_ANALOG_CTL_3); ++ analogix_dp_write(dp, ANALOGIX_DP_ANALOG_CTL_3, reg); + + reg = PD_RING_OSC | AUX_TERMINAL_CTRL_50_OHM | + TX_CUR1_2X | TX_CUR_16_MA; +- writel(reg, dp->reg_base + ANALOGIX_DP_PLL_FILTER_CTL_1); ++ analogix_dp_write(dp, ANALOGIX_DP_PLL_FILTER_CTL_1, reg); + + reg = CH3_AMP_400_MV | CH2_AMP_400_MV | + CH1_AMP_400_MV | CH0_AMP_400_MV; +- writel(reg, dp->reg_base + ANALOGIX_DP_TX_AMP_TUNING_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_TX_AMP_TUNING_CTL, reg); + } + + void analogix_dp_init_interrupt(struct analogix_dp_device *dp) + { + /* Set interrupt pin assertion polarity as high */ +- writel(INT_POL1 | INT_POL0, dp->reg_base + ANALOGIX_DP_INT_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_INT_CTL, INT_POL1 | INT_POL0); + + /* Clear pending regisers */ +- writel(0xff, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_1); +- writel(0x4f, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_2); +- writel(0xe0, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_3); +- writel(0xe7, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_4); +- writel(0x63, dp->reg_base + ANALOGIX_DP_INT_STA); ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_STA_1, 0xff); ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_STA_2, 0x4f); ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_STA_3, 0xe0); ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_STA_4, 0xe7); ++ analogix_dp_write(dp, ANALOGIX_DP_INT_STA, 0x63); + + /* 0:mask,1: unmask */ +- writel(0x00, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_1); +- writel(0x00, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_2); +- writel(0x00, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_3); +- writel(0x00, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4); +- writel(0x00, dp->reg_base + ANALOGIX_DP_INT_STA_MASK); ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_MASK_1, 0x00); ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_MASK_2, 0x00); ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_MASK_3, 0x00); ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_MASK_4, 0x00); ++ analogix_dp_write(dp, ANALOGIX_DP_INT_STA_MASK, 0x00); + } + + void analogix_dp_reset(struct analogix_dp_device *dp) +@@ -130,65 +142,54 @@ void analogix_dp_reset(struct analogix_dp_device *dp) + AUD_FIFO_FUNC_EN_N | AUD_FUNC_EN_N | + HDCP_FUNC_EN_N | SW_FUNC_EN_N; + +- writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1); ++ analogix_dp_write(dp, ANALOGIX_DP_FUNC_EN_1, reg); + + reg = SSC_FUNC_EN_N | AUX_FUNC_EN_N | + SERDES_FIFO_FUNC_EN_N | + LS_CLK_DOMAIN_FUNC_EN_N; +- writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2); ++ analogix_dp_write(dp, ANALOGIX_DP_FUNC_EN_2, reg); + + usleep_range(20, 30); + +- analogix_dp_lane_swap(dp, 0); +- +- writel(0x0, dp->reg_base + ANALOGIX_DP_SYS_CTL_1); +- writel(0x40, dp->reg_base + ANALOGIX_DP_SYS_CTL_2); +- writel(0x0, dp->reg_base + ANALOGIX_DP_SYS_CTL_3); +- writel(0x0, dp->reg_base + ANALOGIX_DP_SYS_CTL_4); ++ analogix_dp_set_lane_map(dp); + +- writel(0x0, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL); +- writel(0x0, dp->reg_base + ANALOGIX_DP_HDCP_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_1, 0x0); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_2, 0x40); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_3, 0x0); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_4, 0x0); + +- writel(0x5e, dp->reg_base + ANALOGIX_DP_HPD_DEGLITCH_L); +- writel(0x1a, dp->reg_base + ANALOGIX_DP_HPD_DEGLITCH_H); ++ analogix_dp_write(dp, ANALOGIX_DP_PKT_SEND_CTL, 0x0); ++ analogix_dp_write(dp, ANALOGIX_DP_HDCP_CTL, 0x0); + +- writel(0x10, dp->reg_base + ANALOGIX_DP_LINK_DEBUG_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_LINK_DEBUG_CTL, 0x10); + +- writel(0x0, dp->reg_base + ANALOGIX_DP_PHY_TEST); ++ analogix_dp_write(dp, ANALOGIX_DP_PHY_TEST, 0x0); + +- writel(0x0, dp->reg_base + ANALOGIX_DP_VIDEO_FIFO_THRD); +- writel(0x20, dp->reg_base + ANALOGIX_DP_AUDIO_MARGIN); ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_FIFO_THRD, 0x0); ++ analogix_dp_write(dp, ANALOGIX_DP_AUDIO_MARGIN, 0x20); + +- writel(0x4, dp->reg_base + ANALOGIX_DP_M_VID_GEN_FILTER_TH); +- writel(0x2, dp->reg_base + ANALOGIX_DP_M_AUD_GEN_FILTER_TH); ++ analogix_dp_write(dp, ANALOGIX_DP_M_VID_GEN_FILTER_TH, 0x4); ++ analogix_dp_write(dp, ANALOGIX_DP_M_AUD_GEN_FILTER_TH, 0x2); + +- writel(0x00000101, dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_SOC_GENERAL_CTL, 0x00000101); + } + + void analogix_dp_swreset(struct analogix_dp_device *dp) + { +- writel(RESET_DP_TX, dp->reg_base + ANALOGIX_DP_TX_SW_RESET); ++ analogix_dp_write(dp, ANALOGIX_DP_TX_SW_RESET, RESET_DP_TX); + } + + void analogix_dp_config_interrupt(struct analogix_dp_device *dp) + { +- u32 reg; +- + /* 0: mask, 1: unmask */ +- reg = COMMON_INT_MASK_1; +- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_1); +- +- reg = COMMON_INT_MASK_2; +- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_2); +- +- reg = COMMON_INT_MASK_3; +- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_3); ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_MASK_1, 0); ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_MASK_2, 0); ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_MASK_3, 0); + +- reg = COMMON_INT_MASK_4; +- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4); +- +- reg = INT_STA_MASK; +- writel(reg, dp->reg_base + ANALOGIX_DP_INT_STA_MASK); ++ if (dp->force_hpd || dp->hpd_gpiod) ++ analogix_dp_mute_hpd_interrupt(dp); ++ else ++ analogix_dp_unmute_hpd_interrupt(dp); + } + + void analogix_dp_mute_hpd_interrupt(struct analogix_dp_device *dp) +@@ -196,13 +197,13 @@ void analogix_dp_mute_hpd_interrupt(struct analogix_dp_device *dp) + u32 reg; + + /* 0: mask, 1: unmask */ +- reg = readl(dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4); +- reg &= ~COMMON_INT_MASK_4; +- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_COMMON_INT_MASK_4); ++ reg &= ~HOTPLUG_CHG; ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_MASK_4, reg); + +- reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA_MASK); +- reg &= ~INT_STA_MASK; +- writel(reg, dp->reg_base + ANALOGIX_DP_INT_STA_MASK); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_INT_STA_MASK); ++ reg &= ~INT_HPD; ++ analogix_dp_write(dp, ANALOGIX_DP_INT_STA_MASK, reg); + } + + void analogix_dp_unmute_hpd_interrupt(struct analogix_dp_device *dp) +@@ -210,18 +211,20 @@ void analogix_dp_unmute_hpd_interrupt(struct analogix_dp_device *dp) + u32 reg; + + /* 0: mask, 1: unmask */ +- reg = COMMON_INT_MASK_4; +- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_COMMON_INT_MASK_4); ++ reg |= HOTPLUG_CHG; ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_MASK_4, reg); + +- reg = INT_STA_MASK; +- writel(reg, dp->reg_base + ANALOGIX_DP_INT_STA_MASK); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_INT_STA_MASK); ++ reg |= INT_HPD; ++ analogix_dp_write(dp, ANALOGIX_DP_INT_STA_MASK, reg); + } + + enum pll_status analogix_dp_get_pll_lock_status(struct analogix_dp_device *dp) + { + u32 reg; + +- reg = readl(dp->reg_base + ANALOGIX_DP_DEBUG_CTL); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_DEBUG_CTL); + if (reg & PLL_LOCK) + return PLL_LOCKED; + else +@@ -239,12 +242,12 @@ void analogix_dp_set_pll_power_down(struct analogix_dp_device *dp, bool enable) + mask = RK_PLL_PD; + } + +- reg = readl(dp->reg_base + pd_addr); ++ reg = analogix_dp_read(dp, pd_addr); + if (enable) + reg |= mask; + else + reg &= ~mask; +- writel(reg, dp->reg_base + pd_addr); ++ analogix_dp_write(dp, pd_addr, reg); + } + + void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp, +@@ -265,52 +268,54 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp, + else + mask = AUX_PD; + +- reg = readl(dp->reg_base + phy_pd_addr); +- if (enable) ++ reg = analogix_dp_read(dp, phy_pd_addr); ++ if (enable) { ++ reg &= ~(DP_INC_BG | DP_EXP_BG); + reg |= mask; +- else ++ } else { + reg &= ~mask; +- writel(reg, dp->reg_base + phy_pd_addr); + } -+ } -+#endif -+ -+ err = clk_set_rate(kbdev->clock, freq); -+ if (err) { -+ dev_err(dev, "Failed to set clock %lu (target %lu)\n", -+ freq, *target_freq); -+ return err; -+ } -+ *target_freq = freq; -+ kbdev->current_freq = freq; -+ if (kbdev->devfreq) -+ kbdev->devfreq->last_status.current_frequency = freq; -+#ifdef CONFIG_REGULATOR -+ if (kbdev->regulator && kbdev->current_voltage != voltage && -+ old_freq > freq) { -+ err = regulator_set_voltage(kbdev->regulator, voltage, INT_MAX); -+ if (err) { -+ dev_err(dev, "Failed to decrease voltage (%d)\n", err); -+ return err; ++ analogix_dp_write(dp, phy_pd_addr, reg); + break; + case CH0_BLOCK: + mask = CH0_PD; +- reg = readl(dp->reg_base + phy_pd_addr); ++ reg = analogix_dp_read(dp, phy_pd_addr); + + if (enable) + reg |= mask; + else + reg &= ~mask; +- writel(reg, dp->reg_base + phy_pd_addr); ++ analogix_dp_write(dp, phy_pd_addr, reg); + break; + case CH1_BLOCK: + mask = CH1_PD; +- reg = readl(dp->reg_base + phy_pd_addr); ++ reg = analogix_dp_read(dp, phy_pd_addr); + + if (enable) + reg |= mask; + else + reg &= ~mask; +- writel(reg, dp->reg_base + phy_pd_addr); ++ analogix_dp_write(dp, phy_pd_addr, reg); + break; + case CH2_BLOCK: + mask = CH2_PD; +- reg = readl(dp->reg_base + phy_pd_addr); ++ reg = analogix_dp_read(dp, phy_pd_addr); + + if (enable) + reg |= mask; + else + reg &= ~mask; +- writel(reg, dp->reg_base + phy_pd_addr); ++ analogix_dp_write(dp, phy_pd_addr, reg); + break; + case CH3_BLOCK: + mask = CH3_PD; +- reg = readl(dp->reg_base + phy_pd_addr); ++ reg = analogix_dp_read(dp, phy_pd_addr); + + if (enable) + reg |= mask; + else + reg &= ~mask; +- writel(reg, dp->reg_base + phy_pd_addr); ++ analogix_dp_write(dp, phy_pd_addr, reg); + break; + case ANALOG_TOTAL: + /* +@@ -323,29 +328,29 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp, + else + mask = DP_PHY_PD; + +- reg = readl(dp->reg_base + phy_pd_addr); ++ reg = analogix_dp_read(dp, phy_pd_addr); + if (enable) + reg |= mask; + else + reg &= ~mask; + +- writel(reg, dp->reg_base + phy_pd_addr); ++ analogix_dp_write(dp, phy_pd_addr, reg); + if (dp->plat_data && is_rockchip(dp->plat_data->dev_type)) + usleep_range(10, 15); + break; + case POWER_ALL: + if (enable) { + reg = DP_ALL_PD; +- writel(reg, dp->reg_base + phy_pd_addr); ++ analogix_dp_write(dp, phy_pd_addr, reg); + } else { + reg = DP_ALL_PD; +- writel(reg, dp->reg_base + phy_pd_addr); ++ analogix_dp_write(dp, phy_pd_addr, reg); + usleep_range(10, 15); + reg &= ~DP_INC_BG; +- writel(reg, dp->reg_base + phy_pd_addr); ++ analogix_dp_write(dp, phy_pd_addr, reg); + usleep_range(10, 15); + +- writel(0x00, dp->reg_base + phy_pd_addr); ++ analogix_dp_write(dp, phy_pd_addr, 0x00); + } + break; + default: +@@ -356,36 +361,24 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp, + int analogix_dp_init_analog_func(struct analogix_dp_device *dp) + { + u32 reg; +- int timeout_loop = 0; + + analogix_dp_set_analog_power_down(dp, POWER_ALL, 0); + + reg = PLL_LOCK_CHG; +- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_1); ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_STA_1, reg); + +- reg = readl(dp->reg_base + ANALOGIX_DP_DEBUG_CTL); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_DEBUG_CTL); + reg &= ~(F_PLL_LOCK | PLL_LOCK_CTRL); +- writel(reg, dp->reg_base + ANALOGIX_DP_DEBUG_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_DEBUG_CTL, reg); + + /* Power up PLL */ +- if (analogix_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) { +- analogix_dp_set_pll_power_down(dp, 0); +- +- while (analogix_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) { +- timeout_loop++; +- if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +- dev_err(dp->dev, "failed to get pll lock status\n"); +- return -ETIMEDOUT; +- } +- usleep_range(10, 20); +- } +- } ++ analogix_dp_set_pll_power_down(dp, 0); + + /* Enable Serdes FIFO function and Link symbol clock domain module */ +- reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_2); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_FUNC_EN_2); + reg &= ~(SERDES_FIFO_FUNC_EN_N | LS_CLK_DOMAIN_FUNC_EN_N + | AUX_FUNC_EN_N); +- writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2); ++ analogix_dp_write(dp, ANALOGIX_DP_FUNC_EN_2, reg); + return 0; + } + +@@ -397,10 +390,10 @@ void analogix_dp_clear_hotplug_interrupts(struct analogix_dp_device *dp) + return; + + reg = HOTPLUG_CHG | HPD_LOST | PLUG; +- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_4); ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_STA_4, reg); + + reg = INT_HPD; +- writel(reg, dp->reg_base + ANALOGIX_DP_INT_STA); ++ analogix_dp_write(dp, ANALOGIX_DP_INT_STA, reg); + } + + void analogix_dp_init_hpd(struct analogix_dp_device *dp) +@@ -410,47 +403,56 @@ void analogix_dp_init_hpd(struct analogix_dp_device *dp) + if (dp->hpd_gpiod) + return; + +- analogix_dp_clear_hotplug_interrupts(dp); ++ analogix_dp_write(dp, ANALOGIX_DP_HPD_DEGLITCH_H, 0xbb); ++ analogix_dp_write(dp, ANALOGIX_DP_HPD_DEGLITCH_L, 0x80); + +- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_3); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_3); + reg &= ~(F_HPD | HPD_CTRL); +- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_3, reg); + } + + void analogix_dp_force_hpd(struct analogix_dp_device *dp) + { + u32 reg; + +- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_3); +- reg = (F_HPD | HPD_CTRL); +- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_3); ++ reg |= (F_HPD | HPD_CTRL); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_3, reg); + } + +-enum dp_irq_type analogix_dp_get_irq_type(struct analogix_dp_device *dp) ++static void analogix_dp_handle_hpd_event(struct analogix_dp_device *dp) + { ++ bool changed = false; + u32 reg; + +- if (dp->hpd_gpiod) { +- reg = gpiod_get_value(dp->hpd_gpiod); +- if (reg) +- return DP_IRQ_TYPE_HP_CABLE_IN; +- else +- return DP_IRQ_TYPE_HP_CABLE_OUT; +- } else { +- /* Parse hotplug interrupt status register */ +- reg = readl(dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_4); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_INT_STA); ++ if (reg & INT_HPD) { ++ analogix_dp_write(dp, ANALOGIX_DP_INT_STA, INT_HPD); + +- if (reg & PLUG) +- return DP_IRQ_TYPE_HP_CABLE_IN; ++ memset(&dp->compliance, 0, sizeof(dp->compliance)); + +- if (reg & HPD_LOST) +- return DP_IRQ_TYPE_HP_CABLE_OUT; ++ analogix_dp_check_device_service_irq(dp); + +- if (reg & HOTPLUG_CHG) +- return DP_IRQ_TYPE_HP_CHANGE; ++ if (dp->compliance.test_active && ++ dp->compliance.test_type == DP_TEST_LINK_PHY_TEST_PATTERN) { ++ analogix_dp_phy_test(dp); ++ return; + } + } -+#endif -+ -+ if (kbdev->pm.backend.ca_current_policy->id == -+ KBASE_PM_CA_POLICY_ID_DEVFREQ) -+ kbase_devfreq_set_core_mask(kbdev, core_mask); -+ -+ *target_freq = nominal_freq; -+ kbdev->current_voltage = voltage; -+ kbdev->current_nominal_freq = nominal_freq; -+ kbdev->current_freq = freq; -+ kbdev->current_core_mask = core_mask; -+ -+ KBASE_TLSTREAM_AUX_DEVFREQ_TARGET((u64)nominal_freq); -+ -+ kbase_pm_reset_dvfs_utilisation(kbdev); + +- return DP_IRQ_TYPE_UNKNOWN; ++ reg = analogix_dp_read(dp, ANALOGIX_DP_COMMON_INT_STA_4); ++ if (reg & HOTPLUG_CHG) { ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_STA_4, HOTPLUG_CHG); ++ changed = true; + } + -+ return err; ++ if (changed) ++ drm_helper_hpd_irq_event(dp->drm_dev); +} + -+static int -+kbase_devfreq_cur_freq(struct device *dev, unsigned long *freq) ++void analogix_dp_irq_handler(struct analogix_dp_device *dp) +{ -+ struct kbase_device *kbdev = dev_get_drvdata(dev); -+ -+ *freq = kbdev->current_nominal_freq; -+ -+ return 0; ++ analogix_dp_handle_hpd_event(dp); + } + + void analogix_dp_reset_aux(struct analogix_dp_device *dp) +@@ -458,9 +460,9 @@ void analogix_dp_reset_aux(struct analogix_dp_device *dp) + u32 reg; + + /* Disable AUX channel module */ +- reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_2); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_FUNC_EN_2); + reg |= AUX_FUNC_EN_N; +- writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2); ++ analogix_dp_write(dp, ANALOGIX_DP_FUNC_EN_2, reg); + } + + void analogix_dp_init_aux(struct analogix_dp_device *dp) +@@ -469,7 +471,7 @@ void analogix_dp_init_aux(struct analogix_dp_device *dp) + + /* Clear inerrupts related to AUX channel */ + reg = RPLY_RECEIV | AUX_ERR; +- writel(reg, dp->reg_base + ANALOGIX_DP_INT_STA); ++ analogix_dp_write(dp, ANALOGIX_DP_INT_STA, reg); + + analogix_dp_set_analog_power_down(dp, AUX_BLOCK, true); + usleep_range(10, 11); +@@ -487,16 +489,17 @@ void analogix_dp_init_aux(struct analogix_dp_device *dp) + reg |= AUX_HW_RETRY_COUNT_SEL(0) | + AUX_HW_RETRY_INTERVAL_600_MICROSECONDS; + +- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_HW_RETRY_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_AUX_HW_RETRY_CTL, reg); + + /* Receive AUX Channel DEFER commands equal to DEFFER_COUNT*64 */ + reg = DEFER_CTRL_EN | DEFER_COUNT(1); +- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_DEFER_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_AUX_CH_DEFER_CTL, reg); + + /* Enable AUX channel module */ +- reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_2); ++ analogix_dp_enable_sw_function(dp); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_FUNC_EN_2); + reg &= ~AUX_FUNC_EN_N; +- writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2); ++ analogix_dp_write(dp, ANALOGIX_DP_FUNC_EN_2, reg); + } + + int analogix_dp_get_plug_in_status(struct analogix_dp_device *dp) +@@ -507,7 +510,7 @@ int analogix_dp_get_plug_in_status(struct analogix_dp_device *dp) + if (gpiod_get_value(dp->hpd_gpiod)) + return 0; + } else { +- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_3); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_3); + if (reg & HPD_STATUS) + return 0; + } +@@ -519,148 +522,193 @@ void analogix_dp_enable_sw_function(struct analogix_dp_device *dp) + { + u32 reg; + +- reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_1); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_FUNC_EN_1); + reg &= ~SW_FUNC_EN_N; +- writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1); ++ analogix_dp_write(dp, ANALOGIX_DP_FUNC_EN_1, reg); + } + +-int analogix_dp_start_aux_transaction(struct analogix_dp_device *dp) ++static void analogix_dp_ssc_enable(struct analogix_dp_device *dp) + { +- int reg; +- int retval = 0; +- int timeout_loop = 0; +- +- /* Enable AUX CH operation */ +- reg = readl(dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2); +- reg |= AUX_EN; +- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2); +- +- /* Is AUX CH command reply received? */ +- reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA); +- while (!(reg & RPLY_RECEIV)) { +- timeout_loop++; +- if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +- dev_err(dp->dev, "AUX CH command reply failed!\n"); +- return -ETIMEDOUT; +- } +- reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA); +- usleep_range(10, 11); +- } +- +- /* Clear interrupt source for AUX CH command reply */ +- writel(RPLY_RECEIV, dp->reg_base + ANALOGIX_DP_INT_STA); +- +- /* Clear interrupt source for AUX CH access error */ +- reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA); +- if (reg & AUX_ERR) { +- writel(AUX_ERR, dp->reg_base + ANALOGIX_DP_INT_STA); +- return -EREMOTEIO; +- } +- +- /* Check AUX CH error access status */ +- reg = readl(dp->reg_base + ANALOGIX_DP_AUX_CH_STA); +- if ((reg & AUX_STATUS_MASK) != 0) { +- dev_err(dp->dev, "AUX CH error happens: %d\n\n", +- reg & AUX_STATUS_MASK); +- return -EREMOTEIO; +- } ++ u32 reg; + +- return retval; ++ /* 4500ppm */ ++ writel(0x19, dp->reg_base + ANALOIGX_DP_SSC_REG); ++ /* ++ * To apply updated SSC parameters into SSC operation, ++ * firmware must disable and enable this bit. ++ */ ++ reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_2); ++ reg |= SSC_FUNC_EN_N; ++ writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2); ++ reg &= ~SSC_FUNC_EN_N; ++ writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2); + } + +-int analogix_dp_write_byte_to_dpcd(struct analogix_dp_device *dp, +- unsigned int reg_addr, +- unsigned char data) ++static void analogix_dp_ssc_disable(struct analogix_dp_device *dp) + { + u32 reg; +- int i; +- int retval; +- +- for (i = 0; i < 3; i++) { +- /* Clear AUX CH data buffer */ +- reg = BUF_CLR; +- writel(reg, dp->reg_base + ANALOGIX_DP_BUFFER_DATA_CTL); +- +- /* Select DPCD device address */ +- reg = AUX_ADDR_7_0(reg_addr); +- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_7_0); +- reg = AUX_ADDR_15_8(reg_addr); +- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_15_8); +- reg = AUX_ADDR_19_16(reg_addr); +- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_19_16); +- +- /* Write data buffer */ +- reg = (unsigned int)data; +- writel(reg, dp->reg_base + ANALOGIX_DP_BUF_DATA_0); +- +- /* +- * Set DisplayPort transaction and write 1 byte +- * If bit 3 is 1, DisplayPort transaction. +- * If Bit 3 is 0, I2C transaction. +- */ +- reg = AUX_TX_COMM_DP_TRANSACTION | AUX_TX_COMM_WRITE; +- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_1); +- +- /* Start AUX transaction */ +- retval = analogix_dp_start_aux_transaction(dp); +- if (retval == 0) +- break; + +- dev_dbg(dp->dev, "%s: Aux Transaction fail!\n", __func__); +- } ++ reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_2); ++ reg |= SSC_FUNC_EN_N; ++ writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2); +} -+ -+static int -+kbase_devfreq_status(struct device *dev, struct devfreq_dev_status *stat) + +- return retval; ++bool analogix_dp_ssc_supported(struct analogix_dp_device *dp) +{ -+ struct kbase_device *kbdev = dev_get_drvdata(dev); -+ -+ stat->current_frequency = kbdev->current_nominal_freq; -+ -+ kbase_pm_get_dvfs_utilisation(kbdev, -+ &stat->total_time, &stat->busy_time); -+ -+ stat->private_data = NULL; ++ /* Check if SSC is supported by both sides */ ++ return dp->plat_data->ssc && dp->link_train.ssc; + } + + void analogix_dp_set_link_bandwidth(struct analogix_dp_device *dp, u32 bwtype) + { +- u32 reg; ++ u32 status; ++ int ret; + -+ return 0; -+} ++ analogix_dp_write(dp, ANALOGIX_DP_LINK_BW_SET, bwtype); + -+static int kbase_devfreq_init_freq_table(struct kbase_device *kbdev, -+ struct devfreq_dev_profile *dp) -+{ -+ int count; -+ int i = 0; -+ unsigned long freq; -+ struct dev_pm_opp *opp; ++ if (dp->phy) { ++ union phy_configure_opts phy_cfg = {0}; + -+ count = dev_pm_opp_get_opp_count(kbdev->dev); -+ if (count < 0) { -+ return count; ++ phy_cfg.dp.lanes = dp->link_train.lane_count; ++ phy_cfg.dp.link_rate = ++ drm_dp_bw_code_to_link_rate(dp->link_train.link_rate) / 100; ++ phy_cfg.dp.ssc = analogix_dp_ssc_supported(dp); ++ phy_cfg.dp.set_lanes = false; ++ phy_cfg.dp.set_rate = true; ++ phy_cfg.dp.set_voltages = false; ++ ret = phy_configure(dp->phy, &phy_cfg); ++ if (ret && ret != -EOPNOTSUPP) { ++ dev_err(dp->dev, "%s: phy_configure failed: %d\n", ++ __func__, ret); ++ return; ++ } ++ } else { ++ if (analogix_dp_ssc_supported(dp)) ++ analogix_dp_ssc_enable(dp); ++ else ++ analogix_dp_ssc_disable(dp); + } -+ -+ dp->freq_table = kmalloc_array(count, sizeof(dp->freq_table[0]), -+ GFP_KERNEL); -+ if (!dp->freq_table) -+ return -ENOMEM; -+ -+ for (i = 0, freq = ULONG_MAX; i < count; i++, freq--) { -+ opp = dev_pm_opp_find_freq_floor(kbdev->dev, &freq); -+ if (IS_ERR(opp)) -+ break; -+ dev_pm_opp_put(opp); -+ -+ dp->freq_table[i] = freq; + +- reg = bwtype; +- if ((bwtype == DP_LINK_BW_2_7) || (bwtype == DP_LINK_BW_1_62)) +- writel(reg, dp->reg_base + ANALOGIX_DP_LINK_BW_SET); ++ ret = readx_poll_timeout(analogix_dp_get_pll_lock_status, dp, status, ++ status != PLL_UNLOCKED, 120, ++ 120 * DP_TIMEOUT_LOOP_COUNT); ++ if (ret) { ++ dev_err(dp->dev, "Wait for pll lock failed %d\n", ret); ++ return; + } + } + + void analogix_dp_get_link_bandwidth(struct analogix_dp_device *dp, u32 *bwtype) + { + u32 reg; + +- reg = readl(dp->reg_base + ANALOGIX_DP_LINK_BW_SET); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_LINK_BW_SET); + *bwtype = reg; + } + + void analogix_dp_set_lane_count(struct analogix_dp_device *dp, u32 count) + { + u32 reg; ++ int ret; + + reg = count; +- writel(reg, dp->reg_base + ANALOGIX_DP_LANE_COUNT_SET); ++ analogix_dp_write(dp, ANALOGIX_DP_LANE_COUNT_SET, reg); + -+ if (count != i) -+ dev_warn(kbdev->dev, "Unable to enumerate all OPPs (%d!=%d\n", -+ count, i); -+ -+ dp->max_state = i; -+ -+ return 0; -+} -+ -+static void kbase_devfreq_term_freq_table(struct kbase_device *kbdev) -+{ -+ struct devfreq_dev_profile *dp = kbdev->devfreq->profile; -+ -+ kfree(dp->freq_table); -+} -+ -+static void kbase_devfreq_exit(struct device *dev) -+{ -+ struct kbase_device *kbdev = dev_get_drvdata(dev); -+ -+ kbase_devfreq_term_freq_table(kbdev); -+} -+ -+static int kbase_devfreq_init_core_mask_table(struct kbase_device *kbdev) -+{ -+ struct device_node *opp_node = of_parse_phandle(kbdev->dev->of_node, -+ "operating-points-v2", 0); -+ struct device_node *node; -+ int i = 0; -+ int count; -+ -+ if (!opp_node) -+ return 0; -+ if (!of_device_is_compatible(opp_node, "operating-points-v2-mali")) -+ return 0; -+ -+ count = dev_pm_opp_get_opp_count(kbdev->dev); -+ kbdev->opp_table = kmalloc_array(count, -+ sizeof(struct kbase_devfreq_opp), GFP_KERNEL); -+ if (!kbdev->opp_table) -+ return -ENOMEM; -+ -+ for_each_available_child_of_node(opp_node, node) { -+ u64 core_mask; -+ u64 opp_freq, real_freq; -+ const void *core_count_p; ++ if (dp->phy) { ++ union phy_configure_opts phy_cfg = {0}; + -+ if (of_property_read_u64(node, "opp-hz", &opp_freq)) { -+ dev_warn(kbdev->dev, "OPP is missing required opp-hz property\n"); -+ continue; ++ phy_cfg.dp.lanes = dp->link_train.lane_count; ++ phy_cfg.dp.set_lanes = true; ++ phy_cfg.dp.set_rate = false; ++ phy_cfg.dp.set_voltages = false; ++ ret = phy_configure(dp->phy, &phy_cfg); ++ if (ret && ret != -EOPNOTSUPP) { ++ dev_err(dp->dev, "%s: phy_configure() failed: %d\n", ++ __func__, ret); ++ return; + } -+ if (of_property_read_u64(node, "opp-hz-real", &real_freq)) -+ real_freq = opp_freq; -+ if (of_property_read_u64(node, "opp-core-mask", &core_mask)) -+ core_mask = -+ kbdev->gpu_props.props.raw_props.shader_present; -+ core_count_p = of_get_property(node, "opp-core-count", NULL); -+ if (core_count_p) { -+ u64 remaining_core_mask = -+ kbdev->gpu_props.props.raw_props.shader_present; -+ int core_count = be32_to_cpup(core_count_p); ++ } + } + + void analogix_dp_get_lane_count(struct analogix_dp_device *dp, u32 *count) + { + u32 reg; + +- reg = readl(dp->reg_base + ANALOGIX_DP_LANE_COUNT_SET); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_LANE_COUNT_SET); + *count = reg; + } + ++void analogix_dp_set_lane_link_training(struct analogix_dp_device *dp) ++{ ++ u8 lane; ++ int ret; + -+ core_mask = 0; ++ for (lane = 0; lane < dp->link_train.lane_count; lane++) ++ analogix_dp_write(dp, ++ ANALOGIX_DP_LN0_LINK_TRAINING_CTL + 4 * lane, ++ dp->link_train.training_lane[lane]); + -+ for (; core_count > 0; core_count--) { -+ int core = ffs(remaining_core_mask); ++ if (dp->phy) { ++ union phy_configure_opts phy_cfg = {0}; + -+ if (!core) { -+ dev_err(kbdev->dev, "OPP has more cores than GPU\n"); -+ return -ENODEV; -+ } ++ for (lane = 0; lane < dp->link_train.lane_count; lane++) { ++ u8 training_lane = dp->link_train.training_lane[lane]; ++ u8 vs, pe; + -+ core_mask |= (1ull << (core-1)); -+ remaining_core_mask &= ~(1ull << (core-1)); -+ } ++ vs = (training_lane & DP_TRAIN_VOLTAGE_SWING_MASK) >> ++ DP_TRAIN_VOLTAGE_SWING_SHIFT; ++ pe = (training_lane & DP_TRAIN_PRE_EMPHASIS_MASK) >> ++ DP_TRAIN_PRE_EMPHASIS_SHIFT; ++ phy_cfg.dp.voltage[lane] = vs; ++ phy_cfg.dp.pre[lane] = pe; + } + -+ if (!core_mask) { -+ dev_err(kbdev->dev, "OPP has invalid core mask of 0\n"); -+ return -ENODEV; ++ phy_cfg.dp.lanes = dp->link_train.lane_count; ++ phy_cfg.dp.link_rate = ++ drm_dp_bw_code_to_link_rate(dp->link_train.link_rate) / 100; ++ phy_cfg.dp.set_lanes = false; ++ phy_cfg.dp.set_rate = false; ++ phy_cfg.dp.set_voltages = true; ++ ret = phy_configure(dp->phy, &phy_cfg); ++ if (ret && ret != -EOPNOTSUPP) { ++ dev_err(dp->dev, "%s: phy_configure() failed: %d\n", ++ __func__, ret); ++ return; + } -+ -+ kbdev->opp_table[i].opp_freq = opp_freq; -+ kbdev->opp_table[i].real_freq = real_freq; -+ kbdev->opp_table[i].core_mask = core_mask; -+ -+ dev_info(kbdev->dev, "OPP %d : opp_freq=%llu real_freq=%llu core_mask=%llx\n", -+ i, opp_freq, real_freq, core_mask); -+ -+ i++; + } -+ -+ kbdev->num_opps = i; -+ -+ return 0; +} + -+int kbase_devfreq_init(struct kbase_device *kbdev) ++u32 analogix_dp_get_lane_link_training(struct analogix_dp_device *dp, u8 lane) +{ -+ struct device_node *np = kbdev->dev->of_node; -+ struct devfreq_dev_profile *dp; -+ struct dev_pm_opp *opp; -+ unsigned long opp_rate; -+ int err; -+ -+ if (!kbdev->clock) { -+ dev_err(kbdev->dev, "Clock not available for devfreq\n"); -+ return -ENODEV; -+ } -+ -+ kbdev->current_freq = clk_get_rate(kbdev->clock); -+ kbdev->current_nominal_freq = kbdev->current_freq; -+ -+ dp = &kbdev->devfreq_profile; -+ -+ dp->initial_freq = kbdev->current_freq; -+ /* .KP : set devfreq_dvfs_interval_in_ms */ -+ dp->polling_ms = 20; -+ dp->target = kbase_devfreq_target; -+ dp->get_dev_status = kbase_devfreq_status; -+ dp->get_cur_freq = kbase_devfreq_cur_freq; -+ dp->exit = kbase_devfreq_exit; -+ -+ if (kbase_devfreq_init_freq_table(kbdev, dp)) -+ return -EFAULT; -+ -+ err = kbase_devfreq_init_core_mask_table(kbdev); -+ if (err) -+ return err; -+ -+ of_property_read_u32(np, "upthreshold", -+ &ondemand_data.upthreshold); -+ of_property_read_u32(np, "downdifferential", -+ &ondemand_data.downdifferential); -+ -+ kbdev->devfreq = devfreq_add_device(kbdev->dev, dp, -+ "simple_ondemand", &ondemand_data); -+ if (IS_ERR(kbdev->devfreq)) { -+ kbase_devfreq_term_freq_table(kbdev); -+ return PTR_ERR(kbdev->devfreq); -+ } -+ -+ /* devfreq_add_device only copies a few of kbdev->dev's fields, so -+ * set drvdata explicitly so IPA models can access kbdev. */ -+ dev_set_drvdata(&kbdev->devfreq->dev, kbdev); ++ return analogix_dp_read(dp, ++ ANALOGIX_DP_LN0_LINK_TRAINING_CTL + 4 * lane); ++} + -+ err = devfreq_register_opp_notifier(kbdev->dev, kbdev->devfreq); -+ if (err) { -+ dev_err(kbdev->dev, -+ "Failed to register OPP notifier (%d)\n", err); -+ goto opp_notifier_failed; -+ } + void analogix_dp_enable_enhanced_mode(struct analogix_dp_device *dp, + bool enable) + { + u32 reg; + + if (enable) { +- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_4); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_4); + reg |= ENHANCED; +- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_4); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_4, reg); + } else { +- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_4); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_4); + reg &= ~ENHANCED; +- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_4); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_4, reg); + } + } + ++bool analogix_dp_get_enhanced_mode(struct analogix_dp_device *dp) ++{ ++ u32 reg; + -+ opp_rate = kbdev->current_freq; -+ opp = devfreq_recommended_opp(kbdev->dev, &opp_rate, 0); -+ if (!IS_ERR(opp)) -+ dev_pm_opp_put(opp); -+ kbdev->devfreq->last_status.current_frequency = opp_rate; ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_4); + -+ mali_mdevp.data = kbdev->devfreq; -+ kbdev->mdev_info = rockchip_system_monitor_register(kbdev->dev, -+ &mali_mdevp); -+ if (IS_ERR(kbdev->mdev_info)) { -+ dev_dbg(kbdev->dev, "without system monitor\n"); -+ kbdev->mdev_info = NULL; -+ } -+#ifdef CONFIG_DEVFREQ_THERMAL -+ err = kbase_ipa_init(kbdev); -+ if (err) { -+ dev_err(kbdev->dev, "IPA initialization failed\n"); -+ goto cooling_failed; -+ } ++ return !!(reg & ENHANCED); ++} + -+ kbdev->devfreq_cooling = of_devfreq_cooling_register_power( -+ kbdev->dev->of_node, -+ kbdev->devfreq, -+ &kbase_ipa_power_model_ops); -+ if (IS_ERR_OR_NULL(kbdev->devfreq_cooling)) { -+ err = PTR_ERR(kbdev->devfreq_cooling); -+ dev_err(kbdev->dev, -+ "Failed to register cooling device (%d)\n", -+ err); -+ goto cooling_failed; + void analogix_dp_set_training_pattern(struct analogix_dp_device *dp, + enum pattern_set pattern) + { +@@ -669,144 +717,64 @@ void analogix_dp_set_training_pattern(struct analogix_dp_device *dp, + switch (pattern) { + case PRBS7: + reg = SCRAMBLING_ENABLE | LINK_QUAL_PATTERN_SET_PRBS7; +- writel(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET); ++ analogix_dp_write(dp, ANALOGIX_DP_TRAINING_PTN_SET, reg); + break; + case D10_2: + reg = SCRAMBLING_ENABLE | LINK_QUAL_PATTERN_SET_D10_2; +- writel(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET); ++ analogix_dp_write(dp, ANALOGIX_DP_TRAINING_PTN_SET, reg); + break; + case TRAINING_PTN1: + reg = SCRAMBLING_DISABLE | SW_TRAINING_PATTERN_SET_PTN1; +- writel(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET); ++ analogix_dp_write(dp, ANALOGIX_DP_TRAINING_PTN_SET, reg); + break; + case TRAINING_PTN2: + reg = SCRAMBLING_DISABLE | SW_TRAINING_PATTERN_SET_PTN2; +- writel(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET); ++ analogix_dp_write(dp, ANALOGIX_DP_TRAINING_PTN_SET, reg); ++ break; ++ case TRAINING_PTN3: ++ reg = SCRAMBLING_DISABLE | SW_TRAINING_PATTERN_SET_PTN3; ++ analogix_dp_write(dp, ANALOGIX_DP_TRAINING_PTN_SET, reg); ++ break; ++ case TEST_PATTERN_80BIT: ++ reg = 0x3e0f83e0; ++ analogix_dp_write(dp, ANALOGIX_DP_TEST_80B_PATTERN0, reg); ++ reg = 0x0f83e0f8; ++ analogix_dp_write(dp, ANALOGIX_DP_TEST_80B_PATTERN1, reg); ++ reg = 0x0000f83e; ++ analogix_dp_write(dp, ANALOGIX_DP_TEST_80B_PATTERN2, reg); ++ reg = SCRAMBLING_ENABLE | LINK_QUAL_PATTERN_SET_80BIT; ++ analogix_dp_write(dp, ANALOGIX_DP_TRAINING_PTN_SET, reg); ++ break; ++ case TEST_PATTERN_HBR2: ++ reg = 0xfb; ++ analogix_dp_write(dp, ANALOGIX_DP_TEST_HBR2_PATTERN, reg); ++ reg = SCRAMBLING_ENABLE | LINK_QUAL_PATTERN_SET_HBR2; ++ analogix_dp_write(dp, ANALOGIX_DP_TRAINING_PTN_SET, reg); + break; + case DP_NONE: + reg = SCRAMBLING_ENABLE | + LINK_QUAL_PATTERN_SET_DISABLE | + SW_TRAINING_PATTERN_SET_NORMAL; +- writel(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET); ++ analogix_dp_write(dp, ANALOGIX_DP_TRAINING_PTN_SET, reg); + break; + default: + break; + } + } + +-void analogix_dp_set_lane0_pre_emphasis(struct analogix_dp_device *dp, +- u32 level) +-{ +- u32 reg; +- +- reg = readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL); +- reg &= ~PRE_EMPHASIS_SET_MASK; +- reg |= level << PRE_EMPHASIS_SET_SHIFT; +- writel(reg, dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL); +-} +- +-void analogix_dp_set_lane1_pre_emphasis(struct analogix_dp_device *dp, +- u32 level) +-{ +- u32 reg; +- +- reg = readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL); +- reg &= ~PRE_EMPHASIS_SET_MASK; +- reg |= level << PRE_EMPHASIS_SET_SHIFT; +- writel(reg, dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL); +-} +- +-void analogix_dp_set_lane2_pre_emphasis(struct analogix_dp_device *dp, +- u32 level) +-{ +- u32 reg; +- +- reg = readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL); +- reg &= ~PRE_EMPHASIS_SET_MASK; +- reg |= level << PRE_EMPHASIS_SET_SHIFT; +- writel(reg, dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL); +-} +- +-void analogix_dp_set_lane3_pre_emphasis(struct analogix_dp_device *dp, +- u32 level) +-{ +- u32 reg; +- +- reg = readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL); +- reg &= ~PRE_EMPHASIS_SET_MASK; +- reg |= level << PRE_EMPHASIS_SET_SHIFT; +- writel(reg, dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL); +-} +- +-void analogix_dp_set_lane0_link_training(struct analogix_dp_device *dp, +- u32 training_lane) +-{ +- u32 reg; +- +- reg = training_lane; +- writel(reg, dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL); +-} +- +-void analogix_dp_set_lane1_link_training(struct analogix_dp_device *dp, +- u32 training_lane) +-{ +- u32 reg; +- +- reg = training_lane; +- writel(reg, dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL); +-} +- +-void analogix_dp_set_lane2_link_training(struct analogix_dp_device *dp, +- u32 training_lane) +-{ +- u32 reg; +- +- reg = training_lane; +- writel(reg, dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL); +-} +- +-void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp, +- u32 training_lane) +-{ +- u32 reg; +- +- reg = training_lane; +- writel(reg, dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL); +-} +- +-u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp) +-{ +- return readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL); +-} +- +-u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp) +-{ +- return readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL); +-} +- +-u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp) +-{ +- return readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL); +-} +- +-u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp) +-{ +- return readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL); +-} +- + void analogix_dp_reset_macro(struct analogix_dp_device *dp) + { + u32 reg; + +- reg = readl(dp->reg_base + ANALOGIX_DP_PHY_TEST); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_PHY_TEST); + reg |= MACRO_RST; +- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_TEST); ++ analogix_dp_write(dp, ANALOGIX_DP_PHY_TEST, reg); + + /* 10 us is the minimum reset time. */ + usleep_range(10, 20); + + reg &= ~MACRO_RST; +- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_TEST); ++ analogix_dp_write(dp, ANALOGIX_DP_PHY_TEST, reg); + } + + void analogix_dp_init_video(struct analogix_dp_device *dp) +@@ -814,19 +782,22 @@ void analogix_dp_init_video(struct analogix_dp_device *dp) + u32 reg; + + reg = VSYNC_DET | VID_FORMAT_CHG | VID_CLK_CHG; +- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_1); ++ analogix_dp_write(dp, ANALOGIX_DP_COMMON_INT_STA_1, reg); + + reg = 0x0; +- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_1); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_1, reg); + + reg = CHA_CRI(4) | CHA_CTRL; +- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_2); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_2, reg); + +- reg = 0x0; +- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3); ++ if (dp->video_info.force_stream_valid) { ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_3); ++ reg |= VALID_CTRL | F_VALID; ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_3, reg); + } -+ I("success initing power_model_simple."); -+#endif -+ -+ return 0; -+ -+#ifdef CONFIG_DEVFREQ_THERMAL -+cooling_failed: -+ devfreq_unregister_opp_notifier(kbdev->dev, kbdev->devfreq); -+#endif /* CONFIG_DEVFREQ_THERMAL */ -+opp_notifier_failed: -+ if (devfreq_remove_device(kbdev->devfreq)) -+ dev_err(kbdev->dev, "Failed to terminate devfreq (%d)\n", err); -+ else -+ kbdev->devfreq = NULL; -+ -+ return err; -+} -+ -+void kbase_devfreq_term(struct kbase_device *kbdev) + + reg = VID_HRES_TH(2) | VID_VRES_TH(0); +- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_8); ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_CTL_8, reg); + } + + void analogix_dp_set_video_color_format(struct analogix_dp_device *dp) +@@ -837,36 +808,36 @@ void analogix_dp_set_video_color_format(struct analogix_dp_device *dp) + reg = (dp->video_info.dynamic_range << IN_D_RANGE_SHIFT) | + (dp->video_info.color_depth << IN_BPC_SHIFT) | + (dp->video_info.color_space << IN_COLOR_F_SHIFT); +- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_2); ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_CTL_2, reg); + + /* Set Input Color YCbCr Coefficients to ITU601 or ITU709 */ +- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_3); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_VIDEO_CTL_3); + reg &= ~IN_YC_COEFFI_MASK; + if (dp->video_info.ycbcr_coeff) + reg |= IN_YC_COEFFI_ITU709; + else + reg |= IN_YC_COEFFI_ITU601; +- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_3); ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_CTL_3, reg); + } + + int analogix_dp_is_slave_video_stream_clock_on(struct analogix_dp_device *dp) + { + u32 reg; + +- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_1); +- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_1); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_1); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_1, reg); + +- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_1); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_1); + + if (!(reg & DET_STA)) { + dev_dbg(dp->dev, "Input stream clock not detected.\n"); + return -EINVAL; + } + +- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_2); +- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_2); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_2); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_2, reg); + +- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_2); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_2); + dev_dbg(dp->dev, "wait SYS_CTL_2.\n"); + + if (reg & CHA_STA) { +@@ -884,30 +855,30 @@ void analogix_dp_set_video_cr_mn(struct analogix_dp_device *dp, + u32 reg; + + if (type == REGISTER_M) { +- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_4); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_4); + reg |= FIX_M_VID; +- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_4); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_4, reg); + reg = m_value & 0xff; +- writel(reg, dp->reg_base + ANALOGIX_DP_M_VID_0); ++ analogix_dp_write(dp, ANALOGIX_DP_M_VID_0, reg); + reg = (m_value >> 8) & 0xff; +- writel(reg, dp->reg_base + ANALOGIX_DP_M_VID_1); ++ analogix_dp_write(dp, ANALOGIX_DP_M_VID_1, reg); + reg = (m_value >> 16) & 0xff; +- writel(reg, dp->reg_base + ANALOGIX_DP_M_VID_2); ++ analogix_dp_write(dp, ANALOGIX_DP_M_VID_2, reg); + + reg = n_value & 0xff; +- writel(reg, dp->reg_base + ANALOGIX_DP_N_VID_0); ++ analogix_dp_write(dp, ANALOGIX_DP_N_VID_0, reg); + reg = (n_value >> 8) & 0xff; +- writel(reg, dp->reg_base + ANALOGIX_DP_N_VID_1); ++ analogix_dp_write(dp, ANALOGIX_DP_N_VID_1, reg); + reg = (n_value >> 16) & 0xff; +- writel(reg, dp->reg_base + ANALOGIX_DP_N_VID_2); ++ analogix_dp_write(dp, ANALOGIX_DP_N_VID_2, reg); + } else { +- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_4); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_4); + reg &= ~FIX_M_VID; +- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_4); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_4, reg); + +- writel(0x00, dp->reg_base + ANALOGIX_DP_N_VID_0); +- writel(0x80, dp->reg_base + ANALOGIX_DP_N_VID_1); +- writel(0x00, dp->reg_base + ANALOGIX_DP_N_VID_2); ++ analogix_dp_write(dp, ANALOGIX_DP_N_VID_0, 0x00); ++ analogix_dp_write(dp, ANALOGIX_DP_N_VID_1, 0x80); ++ analogix_dp_write(dp, ANALOGIX_DP_N_VID_2, 0x00); + } + } + +@@ -916,13 +887,13 @@ void analogix_dp_set_video_timing_mode(struct analogix_dp_device *dp, u32 type) + u32 reg; + + if (type == VIDEO_TIMING_FROM_CAPTURE) { +- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_VIDEO_CTL_10); + reg &= ~FORMAT_SEL; +- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10); ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_CTL_10, reg); + } else { +- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_VIDEO_CTL_10); + reg |= FORMAT_SEL; +- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10); ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_CTL_10, reg); + } + } + +@@ -931,15 +902,15 @@ void analogix_dp_enable_video_master(struct analogix_dp_device *dp, bool enable) + u32 reg; + + if (enable) { +- reg = readl(dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SOC_GENERAL_CTL); + reg &= ~VIDEO_MODE_MASK; + reg |= VIDEO_MASTER_MODE_EN | VIDEO_MODE_MASTER_MODE; +- writel(reg, dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_SOC_GENERAL_CTL, reg); + } else { +- reg = readl(dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SOC_GENERAL_CTL); + reg &= ~VIDEO_MODE_MASK; + reg |= VIDEO_MODE_SLAVE_MODE; +- writel(reg, dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_SOC_GENERAL_CTL, reg); + } + } + +@@ -947,19 +918,19 @@ void analogix_dp_start_video(struct analogix_dp_device *dp) + { + u32 reg; + +- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_VIDEO_CTL_1); + reg |= VIDEO_EN; +- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1); ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_CTL_1, reg); + } + + int analogix_dp_is_video_stream_on(struct analogix_dp_device *dp) + { + u32 reg; + +- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_3); +- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_3); ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_3, reg); + +- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_3); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_3); + if (!(reg & STRM_VALID)) { + dev_dbg(dp->dev, "Input video stream is not detected.\n"); + return -EINVAL; +@@ -972,55 +943,55 @@ void analogix_dp_config_video_slave_mode(struct analogix_dp_device *dp) + { + u32 reg; + +- reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_1); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_FUNC_EN_1); + if (dp->plat_data && is_rockchip(dp->plat_data->dev_type)) { + reg &= ~(RK_VID_CAP_FUNC_EN_N | RK_VID_FIFO_FUNC_EN_N); + } else { + reg &= ~(MASTER_VID_FUNC_EN_N | SLAVE_VID_FUNC_EN_N); + reg |= MASTER_VID_FUNC_EN_N; + } +- writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1); ++ analogix_dp_write(dp, ANALOGIX_DP_FUNC_EN_1, reg); + +- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_VIDEO_CTL_10); + reg &= ~INTERACE_SCAN_CFG; + reg |= (dp->video_info.interlaced << 2); +- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10); ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_CTL_10, reg); + +- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_VIDEO_CTL_10); + reg &= ~VSYNC_POLARITY_CFG; + reg |= (dp->video_info.v_sync_polarity << 1); +- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10); ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_CTL_10, reg); + +- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_VIDEO_CTL_10); + reg &= ~HSYNC_POLARITY_CFG; + reg |= (dp->video_info.h_sync_polarity << 0); +- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10); ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_CTL_10, reg); + + reg = AUDIO_MODE_SPDIF_MODE | VIDEO_MODE_SLAVE_MODE; +- writel(reg, dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_SOC_GENERAL_CTL, reg); + } + + void analogix_dp_enable_scrambling(struct analogix_dp_device *dp) + { + u32 reg; + +- reg = readl(dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_TRAINING_PTN_SET); + reg &= ~SCRAMBLING_DISABLE; +- writel(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET); ++ analogix_dp_write(dp, ANALOGIX_DP_TRAINING_PTN_SET, reg); + } + + void analogix_dp_disable_scrambling(struct analogix_dp_device *dp) + { + u32 reg; + +- reg = readl(dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_TRAINING_PTN_SET); + reg |= SCRAMBLING_DISABLE; +- writel(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET); ++ analogix_dp_write(dp, ANALOGIX_DP_TRAINING_PTN_SET, reg); + } + + void analogix_dp_enable_psr_crc(struct analogix_dp_device *dp) + { +- writel(PSR_VID_CRC_ENABLE, dp->reg_base + ANALOGIX_DP_CRC_CON); ++ analogix_dp_write(dp, ANALOGIX_DP_CRC_CON, PSR_VID_CRC_ENABLE); + } + + static ssize_t analogix_dp_get_psr_status(struct analogix_dp_device *dp) +@@ -1036,6 +1007,24 @@ static ssize_t analogix_dp_get_psr_status(struct analogix_dp_device *dp) + return status; + } + ++static void analogix_dp_reuse_spd(struct analogix_dp_device *dp) +{ -+ int err; -+ -+ dev_dbg(kbdev->dev, "Term Mali devfreq\n"); -+ -+ rockchip_system_monitor_unregister(kbdev->mdev_info); -+#ifdef CONFIG_DEVFREQ_THERMAL -+ if (kbdev->devfreq_cooling) -+ devfreq_cooling_unregister(kbdev->devfreq_cooling); -+ -+ kbase_ipa_term(kbdev); -+#endif -+ -+ devfreq_unregister_opp_notifier(kbdev->dev, kbdev->devfreq); ++ u32 reg, val; + -+ err = devfreq_remove_device(kbdev->devfreq); -+ if (err) -+ dev_err(kbdev->dev, "Failed to terminate devfreq (%d)\n", err); -+ else -+ kbdev->devfreq = NULL; ++ switch (dp->plat_data->dev_type) { ++ case RK3588_EDP: ++ reg = ANALOGIX_DP_SPDIF_AUDIO_CTL_0; ++ break; ++ default: ++ reg = ANALOGIX_DP_VIDEO_CTL_3; ++ break; ++ } + -+ kfree(kbdev->opp_table); ++ val = analogix_dp_read(dp, reg); ++ val |= REUSE_SPD_EN; ++ analogix_dp_write(dp, reg, val); +} -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h -new file mode 100755 -index 000000000000..c0bf8b15b3bc ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h -@@ -0,0 +1,24 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ + -+#ifndef _BASE_DEVFREQ_H_ -+#define _BASE_DEVFREQ_H_ -+ -+int kbase_devfreq_init(struct kbase_device *kbdev); -+void kbase_devfreq_term(struct kbase_device *kbdev); + int analogix_dp_send_psr_spd(struct analogix_dp_device *dp, + struct dp_sdp *vsc, bool blocking) + { +@@ -1044,44 +1033,47 @@ int analogix_dp_send_psr_spd(struct analogix_dp_device *dp, + ssize_t psr_status; + + /* don't send info frame */ +- val = readl(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL); ++ val = analogix_dp_read(dp, ANALOGIX_DP_PKT_SEND_CTL); + val &= ~IF_EN; +- writel(val, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_PKT_SEND_CTL, val); + + /* configure single frame update mode */ +- writel(PSR_FRAME_UP_TYPE_BURST | PSR_CRC_SEL_HARDWARE, +- dp->reg_base + ANALOGIX_DP_PSR_FRAME_UPDATE_CTRL); ++ analogix_dp_write(dp, ANALOGIX_DP_PSR_FRAME_UPDATE_CTRL, ++ PSR_FRAME_UP_TYPE_BURST | PSR_CRC_SEL_HARDWARE); + + /* configure VSC HB0~HB3 */ +- writel(vsc->sdp_header.HB0, dp->reg_base + ANALOGIX_DP_SPD_HB0); +- writel(vsc->sdp_header.HB1, dp->reg_base + ANALOGIX_DP_SPD_HB1); +- writel(vsc->sdp_header.HB2, dp->reg_base + ANALOGIX_DP_SPD_HB2); +- writel(vsc->sdp_header.HB3, dp->reg_base + ANALOGIX_DP_SPD_HB3); ++ analogix_dp_write(dp, ANALOGIX_DP_SPD_HB0, vsc->sdp_header.HB0); ++ analogix_dp_write(dp, ANALOGIX_DP_SPD_HB1, vsc->sdp_header.HB1); ++ analogix_dp_write(dp, ANALOGIX_DP_SPD_HB2, vsc->sdp_header.HB2); ++ analogix_dp_write(dp, ANALOGIX_DP_SPD_HB3, vsc->sdp_header.HB3); + + /* configure reused VSC PB0~PB3, magic number from vendor */ +- writel(0x00, dp->reg_base + ANALOGIX_DP_SPD_PB0); +- writel(0x16, dp->reg_base + ANALOGIX_DP_SPD_PB1); +- writel(0xCE, dp->reg_base + ANALOGIX_DP_SPD_PB2); +- writel(0x5D, dp->reg_base + ANALOGIX_DP_SPD_PB3); ++ analogix_dp_write(dp, ANALOGIX_DP_SPD_PB0, 0x00); ++ analogix_dp_write(dp, ANALOGIX_DP_SPD_PB1, 0x16); ++ analogix_dp_write(dp, ANALOGIX_DP_SPD_PB2, 0xCE); ++ analogix_dp_write(dp, ANALOGIX_DP_SPD_PB3, 0x5D); + + /* configure DB0 / DB1 values */ +- writel(vsc->db[0], dp->reg_base + ANALOGIX_DP_VSC_SHADOW_DB0); +- writel(vsc->db[1], dp->reg_base + ANALOGIX_DP_VSC_SHADOW_DB1); ++ analogix_dp_write(dp, ANALOGIX_DP_VSC_SHADOW_DB0, vsc->db[0]); ++ analogix_dp_write(dp, ANALOGIX_DP_VSC_SHADOW_DB1, vsc->db[1]); + -+#endif /* _BASE_DEVFREQ_H_ */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c -new file mode 100755 -index 000000000000..dcdf15cdc3e8 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c -@@ -0,0 +1,255 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ /* configure PB0 / PB1 values */ ++ analogix_dp_write(dp, ANALOGIX_DP_VSC_SHADOW_PB0, ++ vsc->db[1] ? 0x8d : 0x00); ++ analogix_dp_write(dp, ANALOGIX_DP_VSC_SHADOW_PB1, 0x00); + + /* set reuse spd inforframe */ +- val = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_3); +- val |= REUSE_SPD_EN; +- writel(val, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_3); ++ analogix_dp_reuse_spd(dp); + + /* mark info frame update */ +- val = readl(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL); ++ val = analogix_dp_read(dp, ANALOGIX_DP_PKT_SEND_CTL); + val = (val | IF_UP) & ~IF_EN; +- writel(val, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_PKT_SEND_CTL, val); + + /* send info frame */ +- val = readl(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL); ++ val = analogix_dp_read(dp, ANALOGIX_DP_PKT_SEND_CTL); + val |= IF_EN; +- writel(val, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_PKT_SEND_CTL, val); + + if (!blocking) + return 0; +@@ -1108,11 +1100,46 @@ int analogix_dp_send_psr_spd(struct analogix_dp_device *dp, + return 0; + } + ++int analogix_dp_phy_power_on(struct analogix_dp_device *dp) ++{ ++ int ret; + ++ ret = phy_set_mode(dp->phy, PHY_MODE_DP); ++ if (ret) { ++ dev_err(dp->dev, "phy_set_mode failed: %d\n", ret); ++ return ret; ++ } + ++ ret = phy_power_on(dp->phy); ++ if (ret) { ++ dev_err(dp->dev, "phy_power_on failed: %d\n", ret); ++ return ret; ++ } + ++ return ret; ++} + -+/* -+ * -+ */ -+#include -+#include -+#include ++void analogix_dp_phy_power_off(struct analogix_dp_device *dp) ++{ ++ phy_power_off(dp->phy); ++} + -+#include ++enum { ++ AUX_STATUS_OK, ++ AUX_STATUS_NACK_ERROR, ++ AUX_STATUS_TIMEOUT_ERROR, ++ AUX_STATUS_UNKNOWN_ERROR, ++ AUX_STATUS_MUCH_DEFER_ERROR, ++ AUX_STATUS_TX_SHORT_ERROR, ++ AUX_STATUS_RX_SHORT_ERROR, ++ AUX_STATUS_NACK_WITHOUT_M_ERROR, ++ AUX_STATUS_I2C_NACK_ERROR ++}; + -+#if !defined(CONFIG_MALI_NO_MALI) + ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, + struct drm_dp_aux_msg *msg) + { + u32 reg; +- u32 status_reg; + u8 *buffer = msg->buffer; + unsigned int i; + int num_transferred = 0; +@@ -1124,7 +1151,7 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, + + /* Clear AUX CH data buffer */ + reg = BUF_CLR; +- writel(reg, dp->reg_base + ANALOGIX_DP_BUFFER_DATA_CTL); ++ analogix_dp_write(dp, ANALOGIX_DP_BUFFER_DATA_CTL, reg); + + switch (msg->request & ~DP_AUX_I2C_MOT) { + case DP_AUX_I2C_WRITE: +@@ -1152,21 +1179,21 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, + } + + reg |= AUX_LENGTH(msg->size); +- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_1); ++ analogix_dp_write(dp, ANALOGIX_DP_AUX_CH_CTL_1, reg); + + /* Select DPCD device address */ + reg = AUX_ADDR_7_0(msg->address); +- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_7_0); ++ analogix_dp_write(dp, ANALOGIX_DP_AUX_ADDR_7_0, reg); + reg = AUX_ADDR_15_8(msg->address); +- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_15_8); ++ analogix_dp_write(dp, ANALOGIX_DP_AUX_ADDR_15_8, reg); + reg = AUX_ADDR_19_16(msg->address); +- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_19_16); ++ analogix_dp_write(dp, ANALOGIX_DP_AUX_ADDR_19_16, reg); + + if (!(msg->request & DP_AUX_I2C_READ)) { + for (i = 0; i < msg->size; i++) { + reg = buffer[i]; +- writel(reg, dp->reg_base + ANALOGIX_DP_BUF_DATA_0 + +- 4 * i); ++ analogix_dp_write(dp, ANALOGIX_DP_BUF_DATA_0 + 4 * i, ++ reg); + num_transferred++; + } + } +@@ -1178,7 +1205,7 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, + if (msg->size < 1) + reg |= ADDR_ONLY; + +- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2); ++ analogix_dp_write(dp, ANALOGIX_DP_AUX_CH_CTL_2, reg); + + ret = readx_poll_timeout(readl, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2, + reg, !(reg & AUX_EN), 25, 500 * 1000); +@@ -1197,30 +1224,31 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, + } + + /* Clear interrupt source for AUX CH command reply */ +- writel(RPLY_RECEIV, dp->reg_base + ANALOGIX_DP_INT_STA); ++ analogix_dp_write(dp, ANALOGIX_DP_INT_STA, RPLY_RECEIV); + +- /* Clear interrupt source for AUX CH access error */ +- reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA); +- status_reg = readl(dp->reg_base + ANALOGIX_DP_AUX_CH_STA); +- if ((reg & AUX_ERR) || (status_reg & AUX_STATUS_MASK)) { +- writel(AUX_ERR, dp->reg_base + ANALOGIX_DP_INT_STA); +- +- dev_warn(dp->dev, "AUX CH error happened: %#x (%d)\n", +- status_reg & AUX_STATUS_MASK, !!(reg & AUX_ERR)); +- goto aux_error; +- } ++ reg = analogix_dp_read(dp, ANALOGIX_DP_AUX_CH_STA); ++ if ((reg & AUX_STATUS_MASK) == AUX_STATUS_TIMEOUT_ERROR) ++ return -ETIMEDOUT; + + if (msg->request & DP_AUX_I2C_READ) { ++ size_t buf_data_count; + ++ reg = analogix_dp_read(dp, ANALOGIX_DP_BUFFER_DATA_CTL); ++ buf_data_count = BUF_DATA_COUNT(reg); + -+#ifdef CONFIG_DEBUG_FS ++ if (buf_data_count != msg->size) ++ return -EBUSY; + + for (i = 0; i < msg->size; i++) { +- reg = readl(dp->reg_base + ANALOGIX_DP_BUF_DATA_0 + +- 4 * i); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_BUF_DATA_0 + ++ 4 * i); + buffer[i] = (unsigned char)reg; + num_transferred++; + } + } + + /* Check if Rx sends defer */ +- reg = readl(dp->reg_base + ANALOGIX_DP_AUX_RX_COMM); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_AUX_RX_COMM); + if (reg == AUX_RX_COMM_AUX_DEFER) + msg->reply = DP_AUX_NATIVE_REPLY_DEFER; + else if (reg == AUX_RX_COMM_I2C_DEFER) +@@ -1232,7 +1260,7 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, + (msg->request & ~DP_AUX_I2C_MOT) == DP_AUX_NATIVE_READ) + msg->reply = DP_AUX_NATIVE_REPLY_ACK; + +- return num_transferred > 0 ? num_transferred : -EBUSY; ++ return (num_transferred == msg->size) ? num_transferred : -EBUSY; + + aux_error: + /* if aux err happen, reset aux */ +@@ -1240,3 +1268,127 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, + + return -EREMOTEIO; + } + -+int kbase_io_history_resize(struct kbase_io_history *h, u16 new_size) ++void analogix_dp_set_video_format(struct analogix_dp_device *dp) +{ -+ struct kbase_io_access *old_buf; -+ struct kbase_io_access *new_buf; -+ unsigned long flags; ++ struct video_info *video = &dp->video_info; ++ const struct drm_display_mode *mode = &video->mode; ++ unsigned int hsw, hfp, hbp, vsw, vfp, vbp; + -+ if (!new_size) -+ goto out_err; /* The new size must not be 0 */ ++ hsw = mode->hsync_end - mode->hsync_start; ++ hfp = mode->hsync_start - mode->hdisplay; ++ hbp = mode->htotal - mode->hsync_end; ++ vsw = mode->vsync_end - mode->vsync_start; ++ vfp = mode->vsync_start - mode->vdisplay; ++ vbp = mode->vtotal - mode->vsync_end; + -+ new_buf = vmalloc(new_size * sizeof(*h->buf)); -+ if (!new_buf) -+ goto out_err; ++ /* Set Video Format Parameters */ ++ analogix_dp_write(dp, ANALOGIX_DP_TOTAL_LINE_CFG_L, ++ TOTAL_LINE_CFG_L(mode->vtotal)); ++ analogix_dp_write(dp, ANALOGIX_DP_TOTAL_LINE_CFG_H, ++ TOTAL_LINE_CFG_H(mode->vtotal >> 8)); ++ analogix_dp_write(dp, ANALOGIX_DP_ACTIVE_LINE_CFG_L, ++ ACTIVE_LINE_CFG_L(mode->vdisplay)); ++ analogix_dp_write(dp, ANALOGIX_DP_ACTIVE_LINE_CFG_H, ++ ACTIVE_LINE_CFG_H(mode->vdisplay >> 8)); ++ analogix_dp_write(dp, ANALOGIX_DP_V_F_PORCH_CFG, ++ V_F_PORCH_CFG(vfp)); ++ analogix_dp_write(dp, ANALOGIX_DP_V_SYNC_WIDTH_CFG, ++ V_SYNC_WIDTH_CFG(vsw)); ++ analogix_dp_write(dp, ANALOGIX_DP_V_B_PORCH_CFG, ++ V_B_PORCH_CFG(vbp)); ++ analogix_dp_write(dp, ANALOGIX_DP_TOTAL_PIXEL_CFG_L, ++ TOTAL_PIXEL_CFG_L(mode->htotal)); ++ analogix_dp_write(dp, ANALOGIX_DP_TOTAL_PIXEL_CFG_H, ++ TOTAL_PIXEL_CFG_H(mode->htotal >> 8)); ++ analogix_dp_write(dp, ANALOGIX_DP_ACTIVE_PIXEL_CFG_L, ++ ACTIVE_PIXEL_CFG_L(mode->hdisplay)); ++ analogix_dp_write(dp, ANALOGIX_DP_ACTIVE_PIXEL_CFG_H, ++ ACTIVE_PIXEL_CFG_H(mode->hdisplay >> 8)); ++ analogix_dp_write(dp, ANALOGIX_DP_H_F_PORCH_CFG_L, ++ H_F_PORCH_CFG_L(hfp)); ++ analogix_dp_write(dp, ANALOGIX_DP_H_F_PORCH_CFG_H, ++ H_F_PORCH_CFG_H(hfp >> 8)); ++ analogix_dp_write(dp, ANALOGIX_DP_H_SYNC_CFG_L, ++ H_SYNC_CFG_L(hsw)); ++ analogix_dp_write(dp, ANALOGIX_DP_H_SYNC_CFG_H, ++ H_SYNC_CFG_H(hsw >> 8)); ++ analogix_dp_write(dp, ANALOGIX_DP_H_B_PORCH_CFG_L, ++ H_B_PORCH_CFG_L(hbp)); ++ analogix_dp_write(dp, ANALOGIX_DP_H_B_PORCH_CFG_H, ++ H_B_PORCH_CFG_H(hbp >> 8)); ++} + -+ spin_lock_irqsave(&h->lock, flags); ++void analogix_dp_video_bist_enable(struct analogix_dp_device *dp) ++{ ++ u32 reg; + -+ old_buf = h->buf; ++ /* Enable Video BIST */ ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_CTL_4, BIST_EN); + -+ /* Note: we won't bother with copying the old data over. The dumping -+ * logic wouldn't work properly as it relies on 'count' both as a -+ * counter and as an index to the buffer which would have changed with -+ * the new array. This is a corner case that we don't need to support. ++ /* ++ * Note that if BIST_EN is set to 1, F_SEL must be cleared to 0 ++ * although video format information comes from registers set by user. + */ -+ h->count = 0; -+ h->size = new_size; -+ h->buf = new_buf; -+ -+ spin_unlock_irqrestore(&h->lock, flags); -+ -+ vfree(old_buf); -+ -+ return 0; -+ -+out_err: -+ return -1; ++ reg = analogix_dp_read(dp, ANALOGIX_DP_VIDEO_CTL_10); ++ reg &= ~FORMAT_SEL; ++ analogix_dp_write(dp, ANALOGIX_DP_VIDEO_CTL_10, reg); +} + -+ -+int kbase_io_history_init(struct kbase_io_history *h, u16 n) ++void analogix_dp_audio_config_i2s(struct analogix_dp_device *dp) +{ -+ h->enabled = false; -+ spin_lock_init(&h->lock); -+ h->count = 0; -+ h->size = 0; -+ h->buf = NULL; -+ if (kbase_io_history_resize(h, n)) -+ return -1; -+ -+ return 0; -+} ++ u32 reg; + ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_4); ++ reg &= ~FIX_M_AUD; ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_4, reg); + -+void kbase_io_history_term(struct kbase_io_history *h) -+{ -+ vfree(h->buf); -+ h->buf = NULL; ++ reg = analogix_dp_read(dp, ANALOGIX_DP_I2S_CTRL); ++ reg |= I2S_EN; ++ analogix_dp_write(dp, ANALOGIX_DP_I2S_CTRL, reg); +} + -+ -+/* kbase_io_history_add - add new entry to the register access history -+ * -+ * @h: Pointer to the history data structure -+ * @addr: Register address -+ * @value: The value that is either read from or written to the register -+ * @write: 1 if it's a register write, 0 if it's a read -+ */ -+static void kbase_io_history_add(struct kbase_io_history *h, -+ void __iomem const *addr, u32 value, u8 write) ++void analogix_dp_audio_config_spdif(struct analogix_dp_device *dp) +{ -+ struct kbase_io_access *io; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&h->lock, flags); ++ u32 reg; + -+ io = &h->buf[h->count % h->size]; -+ io->addr = (uintptr_t)addr | write; -+ io->value = value; -+ ++h->count; -+ /* If count overflows, move the index by the buffer size so the entire -+ * buffer will still be dumped later */ -+ if (unlikely(!h->count)) -+ h->count = h->size; ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SYS_CTL_4); ++ reg &= ~FIX_M_AUD; ++ analogix_dp_write(dp, ANALOGIX_DP_SYS_CTL_4, reg); + -+ spin_unlock_irqrestore(&h->lock, flags); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_SPDIF_AUDIO_CTL_0); ++ reg |= AUD_SPDIF_EN; ++ analogix_dp_write(dp, ANALOGIX_DP_SPDIF_AUDIO_CTL_0, reg); +} + -+ -+void kbase_io_history_dump(struct kbase_device *kbdev) ++void analogix_dp_audio_enable(struct analogix_dp_device *dp) +{ -+ struct kbase_io_history *const h = &kbdev->io_history; -+ u16 i; -+ size_t iters; -+ unsigned long flags; ++ u32 reg; + -+ if (!unlikely(h->enabled)) -+ return; ++ reg = analogix_dp_read(dp, ANALOGIX_DP_FUNC_EN_1); ++ reg &= ~(AUD_FIFO_FUNC_EN_N | AUD_FUNC_EN_N); ++ analogix_dp_write(dp, ANALOGIX_DP_FUNC_EN_1, reg); + -+ spin_lock_irqsave(&h->lock, flags); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_AUD_CTL); ++ reg |= MISC_CTRL_RESET | DP_AUDIO_EN; ++ analogix_dp_write(dp, ANALOGIX_DP_AUD_CTL, reg); ++} + -+ dev_err(kbdev->dev, "Register IO History:"); -+ iters = (h->size > h->count) ? h->count : h->size; -+ dev_err(kbdev->dev, "Last %zu register accesses of %zu total:\n", iters, -+ h->count); -+ for (i = 0; i < iters; ++i) { -+ struct kbase_io_access *io = -+ &h->buf[(h->count - iters + i) % h->size]; -+ char const access = (io->addr & 1) ? 'w' : 'r'; ++void analogix_dp_audio_disable(struct analogix_dp_device *dp) ++{ ++ u32 reg; + -+ dev_err(kbdev->dev, "%6i: %c: reg 0x%p val %08x\n", i, access, -+ (void *)(io->addr & ~0x1), io->value); -+ } ++ analogix_dp_write(dp, ANALOGIX_DP_AUD_CTL, 0); + -+ spin_unlock_irqrestore(&h->lock, flags); ++ reg = analogix_dp_read(dp, ANALOGIX_DP_FUNC_EN_1); ++ reg |= AUD_FIFO_FUNC_EN_N | AUD_FUNC_EN_N; ++ analogix_dp_write(dp, ANALOGIX_DP_FUNC_EN_1, reg); +} + ++void analogix_dp_init(struct analogix_dp_device *dp) ++{ ++ analogix_dp_init_interrupt(dp); ++ analogix_dp_config_interrupt(dp); ++ analogix_dp_init_hpd(dp); ++ analogix_dp_init_aux(dp); ++} +diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h +index e284ee8da..0a368b172 100644 +--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h ++++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h +@@ -15,9 +15,27 @@ + #define ANALOGIX_DP_VIDEO_CTL_1 0x20 + #define ANALOGIX_DP_VIDEO_CTL_2 0x24 + #define ANALOGIX_DP_VIDEO_CTL_3 0x28 ++#define ANALOGIX_DP_VIDEO_CTL_4 0x2C + + #define ANALOGIX_DP_VIDEO_CTL_8 0x3C + #define ANALOGIX_DP_VIDEO_CTL_10 0x44 ++#define ANALOGIX_DP_TOTAL_LINE_CFG_L 0x48 ++#define ANALOGIX_DP_TOTAL_LINE_CFG_H 0x4C ++#define ANALOGIX_DP_ACTIVE_LINE_CFG_L 0x50 ++#define ANALOGIX_DP_ACTIVE_LINE_CFG_H 0x54 ++#define ANALOGIX_DP_V_F_PORCH_CFG 0x58 ++#define ANALOGIX_DP_V_SYNC_WIDTH_CFG 0x5C ++#define ANALOGIX_DP_V_B_PORCH_CFG 0x60 ++#define ANALOGIX_DP_TOTAL_PIXEL_CFG_L 0x64 ++#define ANALOGIX_DP_TOTAL_PIXEL_CFG_H 0x68 ++#define ANALOGIX_DP_ACTIVE_PIXEL_CFG_L 0x6C ++#define ANALOGIX_DP_ACTIVE_PIXEL_CFG_H 0x70 ++#define ANALOGIX_DP_H_F_PORCH_CFG_L 0x74 ++#define ANALOGIX_DP_H_F_PORCH_CFG_H 0x78 ++#define ANALOGIX_DP_H_SYNC_CFG_L 0x7C ++#define ANALOGIX_DP_H_SYNC_CFG_H 0x80 ++#define ANALOGIX_DP_H_B_PORCH_CFG_L 0x84 ++#define ANALOGIX_DP_H_B_PORCH_CFG_H 0x88 + + #define ANALOGIX_DP_SPDIF_AUDIO_CTL_0 0xD8 + +@@ -27,6 +45,8 @@ + #define ANALOGIX_DP_PLL_REG_4 0x9ec + #define ANALOGIX_DP_PLL_REG_5 0xa00 + ++#define ANALOIGX_DP_SSC_REG 0x104 ++#define ANALOGIX_DP_BIAS 0x124 + #define ANALOGIX_DP_PD 0x12c + + #define ANALOGIX_DP_IF_TYPE 0x244 +@@ -43,6 +63,8 @@ + #define ANALOGIX_DP_PSR_FRAME_UPDATE_CTRL 0x318 + #define ANALOGIX_DP_VSC_SHADOW_DB0 0x31C + #define ANALOGIX_DP_VSC_SHADOW_DB1 0x320 ++#define ANALOGIX_DP_VSC_SHADOW_PB0 0x33C ++#define ANALOGIX_DP_VSC_SHADOW_PB1 0x340 + + #define ANALOGIX_DP_LANE_MAP 0x35C + +@@ -70,7 +92,7 @@ + #define ANALOGIX_DP_SYS_CTL_2 0x604 + #define ANALOGIX_DP_SYS_CTL_3 0x608 + #define ANALOGIX_DP_SYS_CTL_4 0x60C +- ++#define ANALOGIX_DP_AUD_CTL 0x618 + #define ANALOGIX_DP_PKT_SEND_CTL 0x640 + #define ANALOGIX_DP_HDCP_CTL 0x648 + +@@ -116,8 +138,13 @@ + #define ANALOGIX_DP_BUF_DATA_0 0x7C0 + + #define ANALOGIX_DP_SOC_GENERAL_CTL 0x800 +- ++#define ANALOGIX_DP_TEST_80B_PATTERN0 0x81C ++#define ANALOGIX_DP_TEST_80B_PATTERN1 0x820 ++#define ANALOGIX_DP_TEST_80B_PATTERN2 0x824 ++#define ANALOGIX_DP_TEST_HBR2_PATTERN 0x828 ++#define ANALOGIX_DP_AUD_CHANNEL_CTL 0x834 + #define ANALOGIX_DP_CRC_CON 0x890 ++#define ANALOGIX_DP_I2S_CTRL 0x9C8 + + /* ANALOGIX_DP_TX_SW_RESET */ + #define RESET_DP_TX (0x1 << 0) +@@ -171,6 +198,11 @@ + #define VID_CHK_UPDATE_TYPE_0 (0x0 << 4) + #define REUSE_SPD_EN (0x1 << 3) + ++/* ANALOGIX_DP_VIDEO_CTL_4 */ ++#define BIST_EN (0x1 << 3) ++#define BIST_WIDTH(x) (((x) & 0x1) << 2) ++#define BIST_TYPE(x) (((x) & 0x3) << 0) + -+#endif /* CONFIG_DEBUG_FS */ + /* ANALOGIX_DP_VIDEO_CTL_8 */ + #define VID_HRES_TH(x) (((x) & 0xf) << 4) + #define VID_VRES_TH(x) (((x) & 0xf) << 0) +@@ -181,6 +213,60 @@ + #define VSYNC_POLARITY_CFG (0x1 << 1) + #define HSYNC_POLARITY_CFG (0x1 << 0) + ++/* ANALOGIX_DP_TOTAL_LINE_CFG_L */ ++#define TOTAL_LINE_CFG_L(x) (((x) & 0xff) << 0) + ++/* ANALOGIX_DP_TOTAL_LINE_CFG_H */ ++#define TOTAL_LINE_CFG_H(x) (((x) & 0xf) << 0) + -+void kbase_reg_write(struct kbase_device *kbdev, u16 offset, u32 value, -+ struct kbase_context *kctx) -+{ -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_powered); -+ KBASE_DEBUG_ASSERT(kctx == NULL || kctx->as_nr != KBASEP_AS_NR_INVALID); -+ KBASE_DEBUG_ASSERT(kbdev->dev != NULL); ++/* ANALOGIX_DP_ACTIVE_LINE_CFG_L */ ++#define ACTIVE_LINE_CFG_L(x) (((x) & 0xff) << 0) + -+ writel(value, kbdev->reg + offset); ++/* ANALOGIX_DP_ACTIVE_LINE_CFG_H */ ++#define ACTIVE_LINE_CFG_H(x) (((x) & 0xf) << 0) + -+#ifdef CONFIG_DEBUG_FS -+ if (unlikely(kbdev->io_history.enabled)) -+ kbase_io_history_add(&kbdev->io_history, kbdev->reg + offset, -+ value, 1); -+#endif /* CONFIG_DEBUG_FS */ -+ dev_dbg(kbdev->dev, "w: reg %04x val %08x", offset, value); ++/* ANALOGIX_DP_V_F_PORCH_CFG */ ++#define V_F_PORCH_CFG(x) (((x) & 0xff) << 0) + -+ if (kctx && kctx->jctx.tb) -+ kbase_device_trace_register_access(kctx, REG_WRITE, offset, -+ value); -+} ++/* ANALOGIX_DP_V_SYNC_WIDTH_CFG */ ++#define V_SYNC_WIDTH_CFG(x) (((x) & 0xff) << 0) + -+KBASE_EXPORT_TEST_API(kbase_reg_write); ++/* ANALOGIX_DP_V_B_PORCH_CFG */ ++#define V_B_PORCH_CFG(x) (((x) & 0xff) << 0) + -+u32 kbase_reg_read(struct kbase_device *kbdev, u16 offset, -+ struct kbase_context *kctx) -+{ -+ u32 val; -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_powered); -+ KBASE_DEBUG_ASSERT(kctx == NULL || kctx->as_nr != KBASEP_AS_NR_INVALID); -+ KBASE_DEBUG_ASSERT(kbdev->dev != NULL); ++/* ANALOGIX_DP_TOTAL_PIXEL_CFG_L */ ++#define TOTAL_PIXEL_CFG_L(x) (((x) & 0xff) << 0) + -+ val = readl(kbdev->reg + offset); ++/* ANALOGIX_DP_TOTAL_PIXEL_CFG_H */ ++#define TOTAL_PIXEL_CFG_H(x) (((x) & 0x3f) << 0) + -+#ifdef CONFIG_DEBUG_FS -+ if (unlikely(kbdev->io_history.enabled)) -+ kbase_io_history_add(&kbdev->io_history, kbdev->reg + offset, -+ val, 0); -+#endif /* CONFIG_DEBUG_FS */ -+ dev_dbg(kbdev->dev, "r: reg %04x val %08x", offset, val); ++/* ANALOGIX_DP_ACTIVE_PIXEL_CFG_L */ ++#define ACTIVE_PIXEL_CFG_L(x) (((x) & 0xff) << 0) + -+ if (kctx && kctx->jctx.tb) -+ kbase_device_trace_register_access(kctx, REG_READ, offset, val); -+ return val; -+} ++/* ANALOGIX_DP_ACTIVE_PIXEL_CFG_H */ ++#define ACTIVE_PIXEL_CFG_H(x) (((x) & 0x3f) << 0) + -+KBASE_EXPORT_TEST_API(kbase_reg_read); -+#endif /* !defined(CONFIG_MALI_NO_MALI) */ ++/* ANALOGIX_DP_H_F_PORCH_CFG_L */ ++#define H_F_PORCH_CFG_L(x) (((x) & 0xff) << 0) + -+/** -+ * kbase_report_gpu_fault - Report a GPU fault. -+ * @kbdev: Kbase device pointer -+ * @multiple: Zero if only GPU_FAULT was raised, non-zero if MULTIPLE_GPU_FAULTS -+ * was also set -+ * -+ * This function is called from the interrupt handler when a GPU fault occurs. -+ * It reports the details of the fault using dev_warn(). -+ */ -+static void kbase_report_gpu_fault(struct kbase_device *kbdev, int multiple) -+{ -+ u32 status; -+ u64 address; ++/* ANALOGIX_DP_H_F_PORCH_CFG_H */ ++#define H_F_PORCH_CFG_H(x) (((x) & 0xf) << 0) + -+ status = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_FAULTSTATUS), NULL); -+ address = (u64) kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(GPU_FAULTADDRESS_HI), NULL) << 32; -+ address |= kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(GPU_FAULTADDRESS_LO), NULL); ++/* ANALOGIX_DP_H_SYNC_CFG_L */ ++#define H_SYNC_CFG_L(x) (((x) & 0xff) << 0) + -+ dev_warn(kbdev->dev, "GPU Fault 0x%08x (%s) at 0x%016llx", -+ status & 0xFF, -+ kbase_exception_name(kbdev, status), -+ address); -+ if (multiple) -+ dev_warn(kbdev->dev, "There were multiple GPU faults - some have not been reported\n"); -+} ++/* ANALOGIX_DP_H_SYNC_CFG_H */ ++#define H_SYNC_CFG_H(x) (((x) & 0xf) << 0) + -+void kbase_gpu_interrupt(struct kbase_device *kbdev, u32 val) -+{ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_IRQ, NULL, NULL, 0u, val); -+ if (val & GPU_FAULT) -+ kbase_report_gpu_fault(kbdev, val & MULTIPLE_GPU_FAULTS); ++/* ANALOGIX_DP_H_B_PORCH_CFG_L */ ++#define H_B_PORCH_CFG_L(x) (((x) & 0xff) << 0) + -+ if (val & RESET_COMPLETED) -+ kbase_pm_reset_done(kbdev); ++/* ANALOGIX_DP_H_B_PORCH_CFG_H */ ++#define H_B_PORCH_CFG_H(x) (((x) & 0xf) << 0) + -+ if (val & PRFCNT_SAMPLE_COMPLETED) -+ kbase_instr_hwcnt_sample_done(kbdev); ++/* ANALOGIX_DP_SPDIF_AUDIO_CTL_0 */ ++#define AUD_SPDIF_EN (0x1 << 7) + -+ if (val & CLEAN_CACHES_COMPLETED) -+ kbase_clean_caches_done(kbdev); + /* ANALOGIX_DP_PLL_REG_1 */ + #define REF_CLK_24M (0x1 << 0) + #define REF_CLK_27M (0x0 << 0) +@@ -309,16 +395,23 @@ + #define FIX_M_VID (0x1 << 2) + #define M_VID_UPDATE_CTRL (0x3 << 0) + ++/* ANALOGIX_DP_AUD_CTL */ ++#define MISC_CTRL_RESET (0x1 << 4) ++#define DP_AUDIO_EN (0x1 << 0) + -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_IRQ_CLEAR, NULL, NULL, 0u, val); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), val, NULL); + /* ANALOGIX_DP_TRAINING_PTN_SET */ + #define SCRAMBLER_TYPE (0x1 << 9) + #define HW_LINK_TRAINING_PATTERN (0x1 << 8) + #define SCRAMBLING_DISABLE (0x1 << 5) + #define SCRAMBLING_ENABLE (0x0 << 5) +-#define LINK_QUAL_PATTERN_SET_MASK (0x3 << 2) ++#define LINK_QUAL_PATTERN_SET_MASK (0x7 << 2) ++#define LINK_QUAL_PATTERN_SET_HBR2 (0x5 << 2) ++#define LINK_QUAL_PATTERN_SET_80BIT (0x4 << 2) + #define LINK_QUAL_PATTERN_SET_PRBS7 (0x3 << 2) + #define LINK_QUAL_PATTERN_SET_D10_2 (0x1 << 2) + #define LINK_QUAL_PATTERN_SET_DISABLE (0x0 << 2) + #define SW_TRAINING_PATTERN_SET_MASK (0x3 << 0) ++#define SW_TRAINING_PATTERN_SET_PTN3 (0x3 << 0) + #define SW_TRAINING_PATTERN_SET_PTN2 (0x2 << 0) + #define SW_TRAINING_PATTERN_SET_PTN1 (0x1 << 0) + #define SW_TRAINING_PATTERN_SET_NORMAL (0x0 << 0) +@@ -406,6 +499,11 @@ + #define VIDEO_MODE_SLAVE_MODE (0x1 << 0) + #define VIDEO_MODE_MASTER_MODE (0x0 << 0) + ++/* ANALOGIX_DP_AUD_CHANNEL_CTL */ ++#define AUD_CHANNEL_COUNT_6 (0x5 << 0) ++#define AUD_CHANNEL_COUNT_4 (0x3 << 0) ++#define AUD_CHANNEL_COUNT_2 (0x1 << 0) + -+ /* kbase_pm_check_transitions must be called after the IRQ has been -+ * cleared. This is because it might trigger further power transitions -+ * and we don't want to miss the interrupt raised to notify us that -+ * these further transitions have finished. -+ */ -+ if (val & POWER_CHANGED_ALL) -+ kbase_pm_power_changed(kbdev); + /* ANALOGIX_DP_PKT_SEND_CTL */ + #define IF_UP (0x1 << 4) + #define IF_EN (0x1 << 0) +@@ -414,4 +512,7 @@ + #define PSR_VID_CRC_FLUSH (0x1 << 2) + #define PSR_VID_CRC_ENABLE (0x1 << 0) + ++/* ANALOGIX_DP_I2S_CTRL */ ++#define I2S_EN (0x1 << 4) + -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_IRQ_DONE, NULL, NULL, 0u, val); + #endif /* _ANALOGIX_DP_REG_H */ +diff --git a/drivers/gpu/drm/bridge/synopsys/Makefile b/drivers/gpu/drm/bridge/synopsys/Makefile +index 91d746ad5..757f5526f 100644 +--- a/drivers/gpu/drm/bridge/synopsys/Makefile ++++ b/drivers/gpu/drm/bridge/synopsys/Makefile +@@ -1,7 +1,8 @@ + # SPDX-License-Identifier: GPL-2.0-only +-obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o ++obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o dw-hdmi-hdcp.o \ ++ dw-hdmi-qp.o dw-hdmi-qp-hdcp.o + obj-$(CONFIG_DRM_DW_HDMI_AHB_AUDIO) += dw-hdmi-ahb-audio.o +-obj-$(CONFIG_DRM_DW_HDMI_I2S_AUDIO) += dw-hdmi-i2s-audio.o +-obj-$(CONFIG_DRM_DW_HDMI_CEC) += dw-hdmi-cec.o ++obj-$(CONFIG_DRM_DW_HDMI_I2S_AUDIO) += dw-hdmi-i2s-audio.o dw-hdmi-qp-i2s-audio.o ++obj-$(CONFIG_DRM_DW_HDMI_CEC) += dw-hdmi-cec.o dw-hdmi-qp-cec.o + + obj-$(CONFIG_DRM_DW_MIPI_DSI) += dw-mipi-dsi.o +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h +index f72d27208..966d297ef 100644 +--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h +@@ -17,6 +17,7 @@ struct dw_hdmi_i2s_audio_data { + + void (*write)(struct dw_hdmi *hdmi, u8 val, int offset); + u8 (*read)(struct dw_hdmi *hdmi, int offset); ++ void (*mod)(struct dw_hdmi *hdmi, u8 data, u8 mask, unsigned int reg); + u8 *(*get_eld)(struct dw_hdmi *hdmi); + }; + +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +index 70ab4fbdc..414d601bf 100644 +--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +@@ -4,14 +4,17 @@ + * + * Copyright (C) 2015-2017 Russell King. + */ ++#include + #include + #include ++#include + #include + #include + #include + #include + + #include ++#include + + #include + #include +@@ -21,8 +24,11 @@ + enum { + HDMI_IH_CEC_STAT0 = 0x0106, + HDMI_IH_MUTE_CEC_STAT0 = 0x0186, ++ HDMI_IH_MUTE = 0x01ff, + + HDMI_CEC_CTRL = 0x7d00, ++ CEC_TRANS_MASK = 0x7, ++ CEC_CTRL_STANDBY = BIT(4), + CEC_CTRL_START = BIT(0), + CEC_CTRL_FRAME_TYP = 3 << 1, + CEC_CTRL_RETRY = 0 << 1, +@@ -47,12 +53,15 @@ enum { + HDMI_CEC_RX_CNT = 0x7d08, + HDMI_CEC_TX_DATA0 = 0x7d10, + HDMI_CEC_RX_DATA0 = 0x7d20, ++ HDMI_CEC_RX_DATA1 = 0x7d21, + HDMI_CEC_LOCK = 0x7d30, + HDMI_CEC_WKUPCTRL = 0x7d31, + }; + + struct dw_hdmi_cec { ++ struct device *dev; + struct dw_hdmi *hdmi; ++ struct miscdevice misc_dev; + const struct dw_hdmi_cec_ops *ops; + u32 addresses; + struct cec_adapter *adap; +@@ -61,7 +70,12 @@ struct dw_hdmi_cec { + bool tx_done; + bool rx_done; + struct cec_notifier *notify; ++ struct input_dev *devinput; + int irq; ++ int wake_irq; ++ bool wake_en; ++ bool standby_en; ++ struct mutex wake_lock; + }; + + static void dw_hdmi_write(struct dw_hdmi_cec *cec, u8 val, int offset) +@@ -74,6 +88,11 @@ static u8 dw_hdmi_read(struct dw_hdmi_cec *cec, int offset) + return cec->ops->read(cec->hdmi, offset); + } + ++static void dw_hdmi_mod(struct dw_hdmi_cec *cec, unsigned int offset, u8 mask, u8 val) ++{ ++ cec->ops->mod(cec->hdmi, val, mask, offset); +} -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h -new file mode 100755 -index 000000000000..5b20445932fb ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h -@@ -0,0 +1,67 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ + + static int dw_hdmi_cec_log_addr(struct cec_adapter *adap, u8 logical_addr) + { + struct dw_hdmi_cec *cec = cec_get_drvdata(adap); +@@ -112,7 +131,7 @@ static int dw_hdmi_cec_transmit(struct cec_adapter *adap, u8 attempts, + dw_hdmi_write(cec, msg->msg[i], HDMI_CEC_TX_DATA0 + i); + + dw_hdmi_write(cec, msg->len, HDMI_CEC_TX_CNT); +- dw_hdmi_write(cec, ctrl | CEC_CTRL_START, HDMI_CEC_CTRL); ++ dw_hdmi_mod(cec, HDMI_CEC_CTRL, CEC_TRANS_MASK, ctrl | CEC_CTRL_START); + + return 0; + } +@@ -188,20 +207,28 @@ static int dw_hdmi_cec_enable(struct cec_adapter *adap, bool enable) + struct dw_hdmi_cec *cec = cec_get_drvdata(adap); + + if (!enable) { +- dw_hdmi_write(cec, ~0, HDMI_CEC_MASK); +- dw_hdmi_write(cec, ~0, HDMI_IH_MUTE_CEC_STAT0); + dw_hdmi_write(cec, 0, HDMI_CEC_POLARITY); + +- cec->ops->disable(cec->hdmi); ++ if (cec->wake_en && cec->standby_en) { ++ dw_hdmi_write(cec, 0xff, HDMI_IH_CEC_STAT0); ++ dw_hdmi_mod(cec, HDMI_CEC_CTRL, CEC_CTRL_STANDBY, CEC_CTRL_STANDBY); ++ dw_hdmi_write(cec, 0, HDMI_CEC_LOCK); ++ dw_hdmi_write(cec, 0xff, HDMI_CEC_WKUPCTRL); ++ dw_hdmi_write(cec, ~(1 << 6), HDMI_CEC_MASK); ++ dw_hdmi_write(cec, ~(1 << 6), HDMI_IH_MUTE_CEC_STAT0); ++ dw_hdmi_write(cec, 0x01, HDMI_IH_MUTE); ++ } else { ++ cec->ops->disable(cec->hdmi); ++ } + } else { + unsigned int irqs; + +- dw_hdmi_write(cec, 0, HDMI_CEC_CTRL); ++ dw_hdmi_cec_log_addr(cec->adap, CEC_LOG_ADDR_INVALID); ++ dw_hdmi_mod(cec, HDMI_CEC_CTRL, CEC_CTRL_STANDBY, 0); ++ dw_hdmi_write(cec, 0x02, HDMI_IH_MUTE); + dw_hdmi_write(cec, ~0, HDMI_IH_CEC_STAT0); + dw_hdmi_write(cec, 0, HDMI_CEC_LOCK); + +- dw_hdmi_cec_log_addr(cec->adap, CEC_LOG_ADDR_INVALID); +- + cec->ops->enable(cec->hdmi); + + irqs = CEC_STAT_ERROR_INIT | CEC_STAT_NACK | CEC_STAT_EOM | +@@ -226,6 +253,173 @@ static void dw_hdmi_cec_del(void *data) + cec_delete_adapter(cec->adap); + } + ++static irqreturn_t dw_hdmi_cec_wake_irq(int irq, void *data) ++{ ++ struct cec_adapter *adap = data; ++ struct dw_hdmi_cec *cec = cec_get_drvdata(adap); ++ u8 cec_int; + ++ cec_int = dw_hdmi_read(cec, HDMI_IH_CEC_STAT0); ++ if (!cec_int) ++ return IRQ_NONE; + ++ dw_hdmi_write(cec, 0x02, HDMI_IH_MUTE); ++ dw_hdmi_write(cec, cec_int, HDMI_IH_CEC_STAT0); ++ dw_hdmi_write(cec, 0x00, HDMI_CEC_WKUPCTRL); + ++ if (!cec->wake_en) ++ return IRQ_HANDLED; + -+/* -+ * Backend-specific HW access device APIs -+ */ ++ return IRQ_WAKE_THREAD; ++} + -+#ifndef _KBASE_DEVICE_INTERNAL_H_ -+#define _KBASE_DEVICE_INTERNAL_H_ ++static irqreturn_t dw_hdmi_cec_wake_thread(int irq, void *data) ++{ ++ struct cec_adapter *adap = data; ++ struct dw_hdmi_cec *cec = cec_get_drvdata(adap); + -+/** -+ * kbase_reg_write - write to GPU register -+ * @kbdev: Kbase device pointer -+ * @offset: Offset of register -+ * @value: Value to write -+ * @kctx: Kbase context pointer. May be NULL -+ * -+ * Caller must ensure the GPU is powered (@kbdev->pm.gpu_powered != false). If -+ * @kctx is not NULL then the caller must ensure it is scheduled (@kctx->as_nr -+ * != KBASEP_AS_NR_INVALID). -+ */ -+void kbase_reg_write(struct kbase_device *kbdev, u16 offset, u32 value, -+ struct kbase_context *kctx); ++ mutex_lock(&cec->wake_lock); + -+/** -+ * kbase_reg_read - read from GPU register -+ * @kbdev: Kbase device pointer -+ * @offset: Offset of register -+ * @kctx: Kbase context pointer. May be NULL -+ * -+ * Caller must ensure the GPU is powered (@kbdev->pm.gpu_powered != false). If -+ * @kctx is not NULL then the caller must ensure it is scheduled (@kctx->as_nr -+ * != KBASEP_AS_NR_INVALID). -+ * -+ * Return: Value in desired register -+ */ -+u32 kbase_reg_read(struct kbase_device *kbdev, u16 offset, -+ struct kbase_context *kctx); ++ if (!cec->standby_en) { ++ mutex_unlock(&cec->wake_lock); ++ return IRQ_HANDLED; ++ } ++ cec->standby_en = false; + ++ dev_dbg(cec->dev, "wakeup opcode:0x%x\n", dw_hdmi_read(cec, HDMI_CEC_RX_DATA1)); ++ input_event(cec->devinput, EV_KEY, KEY_POWER, 1); ++ input_sync(cec->devinput); ++ input_event(cec->devinput, EV_KEY, KEY_POWER, 0); ++ input_sync(cec->devinput); ++ mutex_unlock(&cec->wake_lock); + -+/** -+ * kbase_gpu_interrupt - GPU interrupt handler -+ * @kbdev: Kbase device pointer -+ * @val: The value of the GPU IRQ status register which triggered the call -+ * -+ * This function is called from the interrupt handler when a GPU irq is to be -+ * handled. -+ */ -+void kbase_gpu_interrupt(struct kbase_device *kbdev, u32 val); ++ return IRQ_HANDLED; ++} + -+#endif /* _KBASE_DEVICE_INTERNAL_H_ */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c -new file mode 100755 -index 000000000000..d578fd78e825 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c -@@ -0,0 +1,123 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++static int rockchip_hdmi_cec_input_init(struct dw_hdmi_cec *cec) ++{ ++ int err; + ++ cec->devinput = devm_input_allocate_device(cec->dev); ++ if (!cec->devinput) ++ return -EPERM; + ++ cec->devinput->name = "hdmi_cec_key"; ++ cec->devinput->phys = "hdmi_cec_key/input0"; ++ cec->devinput->id.bustype = BUS_HOST; ++ cec->devinput->id.vendor = 0x0001; ++ cec->devinput->id.product = 0x0001; ++ cec->devinput->id.version = 0x0100; + ++ err = input_register_device(cec->devinput); ++ if (err < 0) { ++ input_free_device(cec->devinput); ++ return err; ++ } ++ input_set_capability(cec->devinput, EV_KEY, KEY_POWER); + -+/* -+ * Register-based HW access backend APIs -+ */ -+#include -+#include -+#include -+#include -+#include -+#include ++ return 0; ++} + -+int kbase_backend_early_init(struct kbase_device *kbdev) ++static long cec_standby(struct cec_adapter *adap, __u8 __user *parg) +{ -+ int err; ++ u8 en; ++ int ret; ++ struct dw_hdmi_cec *cec = cec_get_drvdata(adap); + -+ err = kbasep_platform_device_init(kbdev); -+ if (err) -+ return err; ++ mutex_lock(&cec->wake_lock); ++ if (copy_from_user(&en, parg, sizeof(en))) { ++ mutex_unlock(&cec->wake_lock); ++ return -EFAULT; ++ } + -+ /* Ensure we can access the GPU registers */ -+ kbase_pm_register_access_enable(kbdev); ++ cec->standby_en = !en; ++ ret = adap->ops->adap_enable(adap, en); ++ mutex_unlock(&cec->wake_lock); + -+ /* Find out GPU properties based on the GPU feature registers */ -+ kbase_gpuprops_set(kbdev); ++ return ret; ++} + -+ /* We're done accessing the GPU registers for now. */ -+ kbase_pm_register_access_disable(kbdev); ++static long cec_func_en(struct dw_hdmi_cec *cec, int __user *parg) ++{ ++ int en_mask; + -+ err = kbase_hwaccess_pm_init(kbdev); -+ if (err) -+ goto fail_pm; ++ if (copy_from_user(&en_mask, parg, sizeof(en_mask))) ++ return -EFAULT; + -+ err = kbase_install_interrupts(kbdev); -+ if (err) -+ goto fail_interrupts; ++ cec->wake_en = (en_mask & CEC_EN) && (en_mask & CEC_WAKE); + + return 0; -+ -+fail_interrupts: -+ kbase_hwaccess_pm_term(kbdev); -+fail_pm: -+ kbasep_platform_device_term(kbdev); -+ -+ return err; -+} -+ -+void kbase_backend_early_term(struct kbase_device *kbdev) -+{ -+ kbase_release_interrupts(kbdev); -+ kbase_hwaccess_pm_term(kbdev); -+ kbasep_platform_device_term(kbdev); +} + -+int kbase_backend_late_init(struct kbase_device *kbdev) ++static long dw_hdmi_cec_ioctl(struct file *f, unsigned int cmd, unsigned long arg) +{ -+ int err; ++ struct dw_hdmi_cec *cec; ++ struct miscdevice *misc_dev; ++ void __user *data; + -+ err = kbase_hwaccess_pm_powerup(kbdev, PM_HW_ISSUES_DETECT); -+ if (err) -+ return err; ++ if (!f) ++ return -EFAULT; + -+ err = kbase_backend_timer_init(kbdev); -+ if (err) -+ goto fail_timer; ++ misc_dev = f->private_data; ++ cec = container_of(misc_dev, struct dw_hdmi_cec, misc_dev); ++ data = (void __user *)arg; + -+#ifdef CONFIG_MALI_DEBUG -+#ifndef CONFIG_MALI_NO_MALI -+ if (kbasep_common_test_interrupt_handlers(kbdev) != 0) { -+ dev_err(kbdev->dev, "Interrupt assigment check failed.\n"); -+ err = -EINVAL; -+ goto fail_interrupt_test; ++ switch (cmd) { ++ case CEC_STANDBY: ++ return cec_standby(cec->adap, data); ++ case CEC_FUNC_EN: ++ return cec_func_en(cec, data); ++ default: ++ return -EINVAL; + } -+#endif /* !CONFIG_MALI_NO_MALI */ -+#endif /* CONFIG_MALI_DEBUG */ -+ -+ err = kbase_job_slot_init(kbdev); -+ if (err) -+ goto fail_job_slot; + -+ init_waitqueue_head(&kbdev->hwaccess.backend.reset_wait); ++ return -ENOTTY; ++} + ++static int dw_hdmi_cec_open(struct inode *inode, struct file *f) ++{ + return 0; -+ -+fail_job_slot: -+ -+#ifdef CONFIG_MALI_DEBUG -+#ifndef CONFIG_MALI_NO_MALI -+fail_interrupt_test: -+#endif /* !CONFIG_MALI_NO_MALI */ -+#endif /* CONFIG_MALI_DEBUG */ -+ -+ kbase_backend_timer_term(kbdev); -+fail_timer: -+ kbase_hwaccess_pm_halt(kbdev); -+ -+ return err; +} + -+void kbase_backend_late_term(struct kbase_device *kbdev) ++static int dw_hdmi_cec_release(struct inode *inode, struct file *f) +{ -+ kbase_job_slot_halt(kbdev); -+ kbase_job_slot_term(kbdev); -+ kbase_backend_timer_term(kbdev); -+ kbase_hwaccess_pm_halt(kbdev); ++ return 0; +} + -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c -new file mode 100755 -index 000000000000..b395325b556b ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c -@@ -0,0 +1,110 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+ ++static const struct file_operations dw_hdmi_cec_file_operations = { ++ .compat_ioctl = dw_hdmi_cec_ioctl, ++ .unlocked_ioctl = dw_hdmi_cec_ioctl, ++ .open = dw_hdmi_cec_open, ++ .release = dw_hdmi_cec_release, ++ .owner = THIS_MODULE, ++}; + -+/* -+ * Base kernel property query backend APIs -+ */ ++static void dw_hdmi_cec_hpd_wake_up(struct platform_device *pdev) ++{ ++ struct dw_hdmi_cec *cec = platform_get_drvdata(pdev); + -+#include -+#include -+#include -+#include ++ mutex_lock(&cec->wake_lock); + -+void kbase_backend_gpuprops_get(struct kbase_device *kbdev, -+ struct kbase_gpuprops_regdump *regdump) -+{ -+ int i; ++ if (!cec->standby_en) { ++ mutex_unlock(&cec->wake_lock); ++ return; ++ } ++ cec->standby_en = false; + -+ /* Fill regdump with the content of the relevant registers */ -+ regdump->gpu_id = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_ID), NULL); ++ dw_hdmi_write(cec, 0x02, HDMI_IH_MUTE); + -+ regdump->l2_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(L2_FEATURES), NULL); -+ regdump->suspend_size = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(SUSPEND_SIZE), NULL); -+ regdump->tiler_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(TILER_FEATURES), NULL); -+ regdump->mem_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(MEM_FEATURES), NULL); -+ regdump->mmu_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(MMU_FEATURES), NULL); -+ regdump->as_present = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(AS_PRESENT), NULL); -+ regdump->js_present = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(JS_PRESENT), NULL); ++ input_event(cec->devinput, EV_KEY, KEY_POWER, 1); ++ input_sync(cec->devinput); ++ input_event(cec->devinput, EV_KEY, KEY_POWER, 0); ++ input_sync(cec->devinput); ++ mutex_unlock(&cec->wake_lock); ++} + -+ for (i = 0; i < GPU_MAX_JOB_SLOTS; i++) -+ regdump->js_features[i] = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(JS_FEATURES_REG(i)), NULL); ++static const struct dw_hdmi_cec_wake_ops cec_ops = { ++ .hpd_wake_up = dw_hdmi_cec_hpd_wake_up, ++}; + -+ for (i = 0; i < BASE_GPU_NUM_TEXTURE_FEATURES_REGISTERS; i++) -+ regdump->texture_features[i] = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(TEXTURE_FEATURES_REG(i)), NULL); + static int dw_hdmi_cec_probe(struct platform_device *pdev) + { + struct dw_hdmi_cec_data *data = dev_get_platdata(&pdev->dev); +@@ -244,10 +438,14 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev) + if (!cec) + return -ENOMEM; + ++ cec->dev = &pdev->dev; + cec->irq = data->irq; ++ cec->wake_irq = data->wake_irq; + cec->ops = data->ops; + cec->hdmi = data->hdmi; + ++ mutex_init(&cec->wake_lock); + -+ regdump->thread_max_threads = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(THREAD_MAX_THREADS), NULL); -+ regdump->thread_max_workgroup_size = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(THREAD_MAX_WORKGROUP_SIZE), -+ NULL); -+ regdump->thread_max_barrier_size = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(THREAD_MAX_BARRIER_SIZE), NULL); -+ regdump->thread_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(THREAD_FEATURES), NULL); + platform_set_drvdata(pdev, cec); + + dw_hdmi_write(cec, 0, HDMI_CEC_TX_CNT); +@@ -262,6 +460,8 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev) + if (IS_ERR(cec->adap)) + return PTR_ERR(cec->adap); + ++ dw_hdmi_set_cec_adap(cec->hdmi, cec->adap); + -+ regdump->shader_present_lo = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(SHADER_PRESENT_LO), NULL); -+ regdump->shader_present_hi = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(SHADER_PRESENT_HI), NULL); + /* override the module pointer */ + cec->adap->owner = THIS_MODULE; + +@@ -273,11 +473,27 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev) + + ret = devm_request_threaded_irq(&pdev->dev, cec->irq, + dw_hdmi_cec_hardirq, +- dw_hdmi_cec_thread, IRQF_SHARED, ++ dw_hdmi_cec_thread, IRQF_SHARED | IRQF_ONESHOT, + "dw-hdmi-cec", cec->adap); + if (ret < 0) + return ret; + ++ if (cec->wake_irq > 0) { ++ ret = devm_request_threaded_irq(&pdev->dev, cec->wake_irq, ++ dw_hdmi_cec_wake_irq, ++ dw_hdmi_cec_wake_thread, ++ IRQF_TRIGGER_HIGH | IRQF_ONESHOT, ++ "cec-wakeup", cec->adap); ++ if (ret) { ++ dev_err(&pdev->dev, ++ "hdmi_cec request_irq failed (%d).\n", ++ ret); ++ return ret; ++ } ++ device_init_wakeup(&pdev->dev, 1); ++ enable_irq_wake(cec->wake_irq); ++ } + -+ regdump->tiler_present_lo = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(TILER_PRESENT_LO), NULL); -+ regdump->tiler_present_hi = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(TILER_PRESENT_HI), NULL); + cec->notify = cec_notifier_cec_adap_register(pdev->dev.parent, + NULL, cec->adap); + if (!cec->notify) +@@ -295,7 +511,20 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev) + */ + devm_remove_action(&pdev->dev, dw_hdmi_cec_del, cec); + +- return 0; ++ rockchip_hdmi_cec_input_init(cec); + -+ regdump->l2_present_lo = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(L2_PRESENT_LO), NULL); -+ regdump->l2_present_hi = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(L2_PRESENT_HI), NULL); ++ cec->misc_dev.name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "rk_cec"); ++ if (!cec->misc_dev.name) ++ return -ENOMEM; ++ cec->misc_dev.minor = MISC_DYNAMIC_MINOR; ++ cec->misc_dev.fops = &dw_hdmi_cec_file_operations; ++ cec->misc_dev.mode = 0666; + -+ regdump->stack_present_lo = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(STACK_PRESENT_LO), NULL); -+ regdump->stack_present_hi = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(STACK_PRESENT_HI), NULL); -+} ++ ret = misc_register(&cec->misc_dev); + -+void kbase_backend_gpuprops_get_features(struct kbase_device *kbdev, -+ struct kbase_gpuprops_regdump *regdump) -+{ -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_COHERENCY_REG)) { -+ /* Ensure we can access the GPU registers */ -+ kbase_pm_register_access_enable(kbdev); ++ dw_hdmi_cec_wake_ops_register(cec->hdmi, &cec_ops); + -+ regdump->coherency_features = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(COHERENCY_FEATURES), NULL); ++ return ret; + } + + static int dw_hdmi_cec_remove(struct platform_device *pdev) +@@ -304,6 +533,7 @@ static int dw_hdmi_cec_remove(struct platform_device *pdev) + + cec_notifier_cec_adap_unregister(cec->notify, cec->adap); + cec_unregister_adapter(cec->adap); ++ misc_deregister(&cec->misc_dev); + + return 0; + } +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h +index cf4dc121a..ec10660a7 100644 +--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h +@@ -3,17 +3,24 @@ + + struct dw_hdmi; + ++#define CEC_EN BIT(0) ++#define CEC_WAKE BIT(1) + -+ /* We're done accessing the GPU registers for now. */ -+ kbase_pm_register_access_disable(kbdev); -+ } else { -+ /* Pre COHERENCY_FEATURES we only supported ACE_LITE */ -+ regdump->coherency_features = -+ COHERENCY_FEATURE_BIT(COHERENCY_NONE) | -+ COHERENCY_FEATURE_BIT(COHERENCY_ACE_LITE); -+ } -+} + struct dw_hdmi_cec_ops { + void (*write)(struct dw_hdmi *hdmi, u8 val, int offset); + u8 (*read)(struct dw_hdmi *hdmi, int offset); + void (*enable)(struct dw_hdmi *hdmi); + void (*disable)(struct dw_hdmi *hdmi); ++ void (*mod)(struct dw_hdmi *hdmi, u8 data, u8 mask, unsigned int reg); + }; + + struct dw_hdmi_cec_data { + struct dw_hdmi *hdmi; + const struct dw_hdmi_cec_ops *ops; + int irq; ++ int wake_irq; + }; + ++void dw_hdmi_hpd_wake_up(struct platform_device *pdev); + -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c + #endif +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c new file mode 100755 -index 000000000000..7ad309e8d7f4 +index 000000000..24aab5043 --- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c -@@ -0,0 +1,492 @@ ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c +@@ -0,0 +1,748 @@ +/* ++ * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd ++ * Author Huicong Xu + * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * This software is licensed under the terms of the GNU General Public ++ * License version 2, as published by the Free Software Foundation, and ++ * may be copied, distributed, and modified under those terms. + * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. + */ + ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + ++#include "dw-hdmi.h" ++#include "dw-hdmi-hdcp.h" + ++#define HDCP_KEY_SIZE 308 ++#define HDCP_KEY_SEED_SIZE 2 + ++#define KSV_LEN 5 ++#define HEADER 10 ++#define SHAMAX 20 + -+/* -+ * GPU backend instrumentation APIs. -+ */ ++#define MAX_DOWNSTREAM_DEVICE_NUM 5 ++#define DPK_WR_OK_TIMEOUT_US 30000 ++#define HDMI_HDCP1X_ID 5 + -+#include -+#include -+#include -+#include -+#include -+#include ++/* HDCP Registers */ ++#define HDMI_HDCPREG_RMCTL 0x780e ++#define HDMI_HDCPREG_RMSTS 0x780f ++#define HDMI_HDCPREG_SEED0 0x7810 ++#define HDMI_HDCPREG_SEED1 0x7811 ++#define HDMI_HDCPREG_DPK0 0x7812 ++#define HDMI_HDCPREG_DPK1 0x7813 ++#define HDMI_HDCPREG_DPK2 0x7814 ++#define HDMI_HDCPREG_DPK3 0x7815 ++#define HDMI_HDCPREG_DPK4 0x7816 ++#define HDMI_HDCPREG_DPK5 0x7817 ++#define HDMI_HDCPREG_DPK6 0x7818 ++#define HDMI_HDCP2REG_CTRL 0x7904 ++#define HDMI_HDCP2REG_MASK 0x790c ++#define HDMI_HDCP2REG_MUTE 0x790e + -+/** -+ * kbasep_instr_hwcnt_cacheclean - Issue Cache Clean & Invalidate command to -+ * hardware -+ * -+ * @kbdev: Kbase device -+ */ -+static void kbasep_instr_hwcnt_cacheclean(struct kbase_device *kbdev) -+{ -+ unsigned long flags; -+ unsigned long pm_flags; -+ u32 irq_mask; ++enum dw_hdmi_hdcp_state { ++ DW_HDCP_DISABLED, ++ DW_HDCP_AUTH_START, ++ DW_HDCP_AUTH_SUCCESS, ++ DW_HDCP_AUTH_FAIL, ++}; + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == -+ KBASE_INSTR_STATE_REQUEST_CLEAN); ++enum { ++ DW_HDMI_HDCP_KSV_LEN = 8, ++ DW_HDMI_HDCP_SHA_LEN = 20, ++ DW_HDMI_HDCP_DPK_LEN = 280, ++ DW_HDMI_HDCP_KEY_LEN = 308, ++ DW_HDMI_HDCP_SEED_LEN = 2, ++}; + -+ /* Enable interrupt */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); -+ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), NULL); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), -+ irq_mask | CLEAN_CACHES_COMPLETED, NULL); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); ++enum { ++ HDMI_MC_CLKDIS_HDCPCLK_MASK = 0x40, ++ HDMI_MC_CLKDIS_HDCPCLK_ENABLE = 0x00, + -+ /* clean&invalidate the caches so we're sure the mmu tables for the dump -+ * buffer is valid */ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_CLEAN_INV_CACHES, NULL, NULL, 0u, 0); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_CLEAN_INV_CACHES, NULL); -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_CLEANING; ++ HDMI_A_SRMCTRL_SHA1_FAIL_MASK = 0X08, ++ HDMI_A_SRMCTRL_SHA1_FAIL_DISABLE = 0X00, ++ HDMI_A_SRMCTRL_SHA1_FAIL_ENABLE = 0X08, + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+} ++ HDMI_A_SRMCTRL_KSV_UPDATE_MASK = 0X04, ++ HDMI_A_SRMCTRL_KSV_UPDATE_DISABLE = 0X00, ++ HDMI_A_SRMCTRL_KSV_UPDATE_ENABLE = 0X04, + -+int kbase_instr_hwcnt_enable_internal(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ struct kbase_uk_hwcnt_setup *setup) -+{ -+ unsigned long flags, pm_flags; -+ int err = -EINVAL; -+ u32 irq_mask; -+ int ret; -+ u64 shader_cores_needed; -+ u32 prfcnt_config; ++ HDMI_A_SRMCTRL_KSV_MEM_REQ_MASK = 0X01, ++ HDMI_A_SRMCTRL_KSV_MEM_REQ_DISABLE = 0X00, ++ HDMI_A_SRMCTRL_KSV_MEM_REQ_ENABLE = 0X01, + -+ shader_cores_needed = kbase_pm_get_present_cores(kbdev, -+ KBASE_PM_CORE_SHADER); ++ HDMI_A_SRMCTRL_KSV_MEM_ACCESS_MASK = 0X02, ++ HDMI_A_SRMCTRL_KSV_MEM_ACCESS_DISABLE = 0X00, ++ HDMI_A_SRMCTRL_KSV_MEM_ACCESS_ENABLE = 0X02, + -+ /* alignment failure */ -+ if ((setup->dump_buffer == 0ULL) || (setup->dump_buffer & (2048 - 1))) -+ goto out_err; ++ HDMI_A_SRM_BASE_MAX_DEVS_EXCEEDED = 0x80, ++ HDMI_A_SRM_BASE_DEVICE_COUNT = 0x7f, + -+ /* Override core availability policy to ensure all cores are available -+ */ -+ kbase_pm_ca_instr_enable(kbdev); ++ HDMI_A_SRM_BASE_MAX_CASCADE_EXCEEDED = 0x08, + -+ /* Request the cores early on synchronously - we'll release them on any -+ * errors (e.g. instrumentation already active) */ -+ kbase_pm_request_cores_sync(kbdev, true, shader_cores_needed); ++ HDMI_A_APIINTSTAT_KSVSHA1_CALC_INT = 0x02, + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ /* HDCPREG_RMSTS field values */ ++ DPK_WR_OK_STS = 0x40, + -+ if (kbdev->hwcnt.backend.state != KBASE_INSTR_STATE_DISABLED) { -+ /* Instrumentation is already enabled */ -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ goto out_unrequest_cores; -+ } ++ HDMI_A_HDCP22_MASK = 0x40, + -+ /* Enable interrupt */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); -+ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), NULL); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), irq_mask | -+ PRFCNT_SAMPLE_COMPLETED, NULL); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); ++ HDMI_HDCP2_OVR_EN_MASK = 0x02, ++ HDMI_HDCP2_OVR_ENABLE = 0x02, ++ HDMI_HDCP2_OVR_DISABLE = 0x00, + -+ /* In use, this context is the owner */ -+ kbdev->hwcnt.kctx = kctx; -+ /* Remember the dump address so we can reprogram it later */ -+ kbdev->hwcnt.addr = setup->dump_buffer; ++ HDMI_HDCP2_FORCE_MASK = 0x04, ++ HDMI_HDCP2_FORCE_ENABLE = 0x04, ++ HDMI_HDCP2_FORCE_DISABLE = 0x00, ++}; + -+ /* Request the clean */ -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_REQUEST_CLEAN; -+ kbdev->hwcnt.backend.triggered = 0; -+ /* Clean&invalidate the caches so we're sure the mmu tables for the dump -+ * buffer is valid */ -+ ret = queue_work(kbdev->hwcnt.backend.cache_clean_wq, -+ &kbdev->hwcnt.backend.cache_clean_work); -+ KBASE_DEBUG_ASSERT(ret); ++struct sha_t { ++ u8 mlength[8]; ++ u8 mblock[64]; ++ int mindex; ++ int mcomputed; ++ int mcorrupted; ++ unsigned int mdigest[5]; ++}; + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++static struct dw_hdcp *g_hdcp; + -+ /* Wait for cacheclean to complete */ -+ wait_event(kbdev->hwcnt.backend.wait, -+ kbdev->hwcnt.backend.triggered != 0); ++static inline unsigned int shacircularshift(unsigned int bits, ++ unsigned int word) ++{ ++ return (((word << bits) & 0xFFFFFFFF) | (word >> (32 - bits))); ++} + -+ KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == -+ KBASE_INSTR_STATE_IDLE); ++static void hdcp_modb(struct dw_hdcp *hdcp, u8 data, u8 mask, unsigned int reg) ++{ ++ struct dw_hdmi *hdmi = hdcp->hdmi; ++ u8 val = hdcp->read(hdmi, reg) & ~mask; + -+ kbase_pm_request_l2_caches(kbdev); ++ val |= data & mask; ++ hdcp->write(hdmi, val, reg); ++} + -+ /* Configure */ -+ prfcnt_config = kctx->as_nr << PRFCNT_CONFIG_AS_SHIFT; -+#ifdef CONFIG_MALI_PRFCNT_SET_SECONDARY -+ { -+ u32 gpu_id = kbdev->gpu_props.props.raw_props.gpu_id; -+ u32 product_id = (gpu_id & GPU_ID_VERSION_PRODUCT_ID) -+ >> GPU_ID_VERSION_PRODUCT_ID_SHIFT; -+ int arch_v6 = GPU_ID_IS_NEW_FORMAT(product_id); ++static void sha_reset(struct sha_t *sha) ++{ ++ u32 i = 0; + -+ if (arch_v6) -+ prfcnt_config |= 1 << PRFCNT_CONFIG_SETSELECT_SHIFT; -+ } -+#endif ++ sha->mindex = 0; ++ sha->mcomputed = false; ++ sha->mcorrupted = false; ++ for (i = 0; i < sizeof(sha->mlength); i++) ++ sha->mlength[i] = 0; + -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_CONFIG), -+ prfcnt_config | PRFCNT_CONFIG_MODE_OFF, kctx); ++ sha1_init(sha->mdigest); ++} + -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_LO), -+ setup->dump_buffer & 0xFFFFFFFF, kctx); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_HI), -+ setup->dump_buffer >> 32, kctx); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_JM_EN), -+ setup->jm_bm, kctx); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_SHADER_EN), -+ setup->shader_bm, kctx); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_MMU_L2_EN), -+ setup->mmu_l2_bm, kctx); -+ /* Due to PRLAM-8186 we need to disable the Tiler before we enable the -+ * HW counter dump. */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8186)) -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_TILER_EN), 0, -+ kctx); -+ else -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_TILER_EN), -+ setup->tiler_bm, kctx); ++static void sha_processblock(struct sha_t *sha) ++{ ++ u32 array[SHA1_WORKSPACE_WORDS]; + -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_CONFIG), -+ prfcnt_config | PRFCNT_CONFIG_MODE_MANUAL, kctx); ++ sha1_transform(sha->mdigest, sha->mblock, array); ++ sha->mindex = 0; ++} + -+ /* If HW has PRLAM-8186 we can now re-enable the tiler HW counters dump ++static void sha_padmessage(struct sha_t *sha) ++{ ++ /* ++ * Check to see if the current message block is too small to hold ++ * the initial padding bits and length. If so, we will pad the ++ * block, process it, and then continue padding into a second ++ * block. + */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8186)) -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_TILER_EN), -+ setup->tiler_bm, kctx); ++ if (sha->mindex > 55) { ++ sha->mblock[sha->mindex++] = 0x80; ++ while (sha->mindex < 64) ++ sha->mblock[sha->mindex++] = 0; + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ sha_processblock(sha); ++ while (sha->mindex < 56) ++ sha->mblock[sha->mindex++] = 0; ++ } else { ++ sha->mblock[sha->mindex++] = 0x80; ++ while (sha->mindex < 56) ++ sha->mblock[sha->mindex++] = 0; ++ } + -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; -+ kbdev->hwcnt.backend.triggered = 1; -+ wake_up(&kbdev->hwcnt.backend.wait); ++ /* Store the message length as the last 8 octets */ ++ sha->mblock[56] = sha->mlength[7]; ++ sha->mblock[57] = sha->mlength[6]; ++ sha->mblock[58] = sha->mlength[5]; ++ sha->mblock[59] = sha->mlength[4]; ++ sha->mblock[60] = sha->mlength[3]; ++ sha->mblock[61] = sha->mlength[2]; ++ sha->mblock[62] = sha->mlength[1]; ++ sha->mblock[63] = sha->mlength[0]; + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ sha_processblock(sha); ++} + -+ err = 0; ++static int sha_result(struct sha_t *sha) ++{ ++ if (sha->mcorrupted) ++ return false; + -+ dev_dbg(kbdev->dev, "HW counters dumping set-up for context %p", kctx); -+ return err; -+ out_unrequest_cores: -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_pm_unrequest_cores(kbdev, true, shader_cores_needed); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ out_err: -+ return err; ++ if (sha->mcomputed == 0) { ++ sha_padmessage(sha); ++ sha->mcomputed = true; ++ } ++ return true; +} + -+int kbase_instr_hwcnt_disable_internal(struct kbase_context *kctx) ++static void sha_input(struct sha_t *sha, const u8 *data, u32 size) +{ -+ unsigned long flags, pm_flags; -+ int err = -EINVAL; -+ u32 irq_mask; -+ struct kbase_device *kbdev = kctx->kbdev; ++ int i = 0; ++ unsigned int j = 0; ++ int rc = true; + -+ while (1) { -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ if (data == 0 || size == 0) ++ return; + -+ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_DISABLED) { -+ /* Instrumentation is not enabled */ -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ goto out; -+ } ++ if (sha->mcomputed || sha->mcorrupted) { ++ sha->mcorrupted = true; ++ return; ++ } ++ while (size-- && !sha->mcorrupted) { ++ sha->mblock[sha->mindex++] = *data; + -+ if (kbdev->hwcnt.kctx != kctx) { -+ /* Instrumentation has been setup for another context */ -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ goto out; ++ for (i = 0; i < 8; i++) { ++ rc = true; ++ for (j = 0; j < sizeof(sha->mlength); j++) { ++ sha->mlength[j]++; ++ if (sha->mlength[j] != 0) { ++ rc = false; ++ break; ++ } ++ } ++ sha->mcorrupted = (sha->mcorrupted || ++ rc) ? true : false; + } -+ -+ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_IDLE) -+ break; -+ -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ -+ /* Ongoing dump/setup - wait for its completion */ -+ wait_event(kbdev->hwcnt.backend.wait, -+ kbdev->hwcnt.backend.triggered != 0); ++ /* if corrupted then message is too long */ ++ if (sha->mindex == 64) ++ sha_processblock(sha); ++ data++; + } ++} + -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_DISABLED; -+ kbdev->hwcnt.backend.triggered = 0; -+ -+ /* Disable interrupt */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); -+ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), NULL); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), -+ irq_mask & ~PRFCNT_SAMPLE_COMPLETED, NULL); -+ -+ /* Disable the counters */ -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_CONFIG), 0, kctx); -+ -+ kbdev->hwcnt.kctx = NULL; -+ kbdev->hwcnt.addr = 0ULL; ++static int hdcp_verify_ksv(const u8 *data, u32 size) ++{ ++ u32 i = 0; ++ struct sha_t sha; + -+ kbase_pm_ca_instr_disable(kbdev); ++ if ((!data) || (size < (HEADER + SHAMAX))) ++ return false; + -+ kbase_pm_unrequest_cores(kbdev, true, -+ kbase_pm_get_present_cores(kbdev, KBASE_PM_CORE_SHADER)); ++ sha_reset(&sha); ++ sha_input(&sha, data, size - SHAMAX); ++ if (sha_result(&sha) == false) ++ return false; + -+ kbase_pm_release_l2_caches(kbdev); ++ for (i = 0; i < SHAMAX; i++) { ++ if (data[size - SHAMAX + i] != (u8)(sha.mdigest[i / 4] ++ >> ((i % 4) * 8))) ++ return false; ++ } ++ return true; ++} + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++static int hdcp_load_keys_cb(struct dw_hdcp *hdcp) ++{ ++ u32 size; ++ u8 hdcp_vendor_data[320]; + -+ dev_dbg(kbdev->dev, "HW counters dumping disabled for context %p", -+ kctx); ++ hdcp->keys = kmalloc(HDCP_KEY_SIZE, GFP_KERNEL); ++ if (!hdcp->keys) ++ return -ENOMEM; + -+ err = 0; ++ hdcp->seeds = kmalloc(HDCP_KEY_SEED_SIZE, GFP_KERNEL); ++ if (!hdcp->seeds) { ++ kfree(hdcp->keys); ++ return -ENOMEM; ++ } + -+ out: -+ return err; ++ size = rk_vendor_read(HDMI_HDCP1X_ID, hdcp_vendor_data, 314); ++ if (size < (HDCP_KEY_SIZE + HDCP_KEY_SEED_SIZE)) { ++ dev_dbg(hdcp->dev, "HDCP: read size %d\n", size); ++ memset(hdcp->keys, 0, HDCP_KEY_SIZE); ++ memset(hdcp->seeds, 0, HDCP_KEY_SEED_SIZE); ++ } else { ++ memcpy(hdcp->keys, hdcp_vendor_data, HDCP_KEY_SIZE); ++ memcpy(hdcp->seeds, hdcp_vendor_data + HDCP_KEY_SIZE, ++ HDCP_KEY_SEED_SIZE); ++ } ++ return 0; +} + -+int kbase_instr_hwcnt_request_dump(struct kbase_context *kctx) ++static int dw_hdmi_hdcp_load_key(struct dw_hdcp *hdcp) +{ -+ unsigned long flags; -+ int err = -EINVAL; -+ struct kbase_device *kbdev = kctx->kbdev; -+ -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ -+ if (kbdev->hwcnt.kctx != kctx) { -+ /* The instrumentation has been setup for another context */ -+ goto unlock; -+ } ++ int i, j; ++ int ret, val; ++ void __iomem *reg_rmsts_addr; ++ struct hdcp_keys *hdcp_keys; ++ struct dw_hdmi *hdmi = hdcp->hdmi; + -+ if (kbdev->hwcnt.backend.state != KBASE_INSTR_STATE_IDLE) { -+ /* HW counters are disabled or another dump is ongoing, or we're -+ * resetting */ -+ goto unlock; ++ if (!hdcp->keys) { ++ ret = hdcp_load_keys_cb(hdcp); ++ if (ret) ++ return ret; + } ++ hdcp_keys = hdcp->keys; + -+ kbdev->hwcnt.backend.triggered = 0; ++ if (hdcp->reg_io_width == 4) ++ reg_rmsts_addr = hdcp->regs + (HDMI_HDCPREG_RMSTS << 2); ++ else if (hdcp->reg_io_width == 1) ++ reg_rmsts_addr = hdcp->regs + HDMI_HDCPREG_RMSTS; ++ else ++ return -EPERM; + -+ /* Mark that we're dumping - the PF handler can signal that we faulted -+ */ -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_DUMPING; ++ /* Disable decryption logic */ ++ hdcp->write(hdmi, 0, HDMI_HDCPREG_RMCTL); ++ ret = readx_poll_timeout(readl, reg_rmsts_addr, val, ++ val & DPK_WR_OK_STS, 1000, ++ DPK_WR_OK_TIMEOUT_US); ++ if (ret) ++ return ret; ++ hdcp->write(hdmi, 0, HDMI_HDCPREG_DPK6); ++ hdcp->write(hdmi, 0, HDMI_HDCPREG_DPK5); + -+ /* Reconfigure the dump address */ -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_LO), -+ kbdev->hwcnt.addr & 0xFFFFFFFF, NULL); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(PRFCNT_BASE_HI), -+ kbdev->hwcnt.addr >> 32, NULL); ++ /* The useful data in ksv should be 5 byte */ ++ for (i = 4; i >= 0; i--) ++ hdcp->write(hdmi, hdcp_keys->KSV[i], HDMI_HDCPREG_DPK0 + i); ++ ret = readx_poll_timeout(readl, reg_rmsts_addr, val, ++ val & DPK_WR_OK_STS, 1000, ++ DPK_WR_OK_TIMEOUT_US); + -+ /* Start dumping */ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_PRFCNT_SAMPLE, NULL, NULL, -+ kbdev->hwcnt.addr, 0); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_PRFCNT_SAMPLE, kctx); ++ if (ret) ++ return ret; + -+ dev_dbg(kbdev->dev, "HW counters dumping done for context %p", kctx); ++ /* Enable decryption logic */ ++ if (hdcp->seeds) { ++ hdcp->write(hdmi, 1, HDMI_HDCPREG_RMCTL); ++ hdcp->write(hdmi, hdcp->seeds[0], HDMI_HDCPREG_SEED1); ++ hdcp->write(hdmi, hdcp->seeds[1], HDMI_HDCPREG_SEED0); ++ } else { ++ hdcp->write(hdmi, 0, HDMI_HDCPREG_RMCTL); ++ } + -+ err = 0; ++ /* Write encrypt device private key */ ++ for (i = 0; i < DW_HDMI_HDCP_DPK_LEN - 6; i += 7) { ++ for (j = 6; j >= 0; j--) ++ hdcp->write(hdmi, hdcp_keys->devicekey[i + j], ++ HDMI_HDCPREG_DPK0 + j); ++ ret = readx_poll_timeout(readl, reg_rmsts_addr, val, ++ val & DPK_WR_OK_STS, 1000, ++ DPK_WR_OK_TIMEOUT_US); + -+ unlock: -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ return err; ++ if (ret) ++ return ret; ++ } ++ return 0; +} -+KBASE_EXPORT_SYMBOL(kbase_instr_hwcnt_request_dump); + -+bool kbase_instr_hwcnt_dump_complete(struct kbase_context *kctx, -+ bool * const success) ++static int dw_hdmi_hdcp_start(struct dw_hdcp *hdcp) +{ -+ unsigned long flags; -+ bool complete = false; -+ struct kbase_device *kbdev = kctx->kbdev; ++ struct dw_hdmi *hdmi = hdcp->hdmi; + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ if (!hdcp->enable) ++ return -EPERM; + -+ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_IDLE) { -+ *success = true; -+ complete = true; -+ } else if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_FAULT) { -+ *success = false; -+ complete = true; -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; ++ if (!(hdcp->read(hdmi, HDMI_HDCPREG_RMSTS) & 0x3f)) ++ dw_hdmi_hdcp_load_key(hdcp); ++ ++ hdcp_modb(hdcp, HDMI_FC_INVIDCONF_HDCP_KEEPOUT_ACTIVE, ++ HDMI_FC_INVIDCONF_HDCP_KEEPOUT_MASK, ++ HDMI_FC_INVIDCONF); ++ ++ hdcp->remaining_times = hdcp->retry_times; ++ if (hdcp->read(hdmi, HDMI_CONFIG1_ID) & HDMI_A_HDCP22_MASK) { ++ if (hdcp->hdcp2_enable == 0) { ++ hdcp_modb(hdcp, HDMI_HDCP2_OVR_ENABLE | ++ HDMI_HDCP2_FORCE_DISABLE, ++ HDMI_HDCP2_OVR_EN_MASK | ++ HDMI_HDCP2_FORCE_MASK, ++ HDMI_HDCP2REG_CTRL); ++ hdcp->write(hdmi, 0xff, HDMI_HDCP2REG_MASK); ++ hdcp->write(hdmi, 0xff, HDMI_HDCP2REG_MUTE); ++ } else { ++ hdcp_modb(hdcp, HDMI_HDCP2_OVR_DISABLE | ++ HDMI_HDCP2_FORCE_DISABLE, ++ HDMI_HDCP2_OVR_EN_MASK | ++ HDMI_HDCP2_FORCE_MASK, ++ HDMI_HDCP2REG_CTRL); ++ hdcp->write(hdmi, 0x00, HDMI_HDCP2REG_MASK); ++ hdcp->write(hdmi, 0x00, HDMI_HDCP2REG_MUTE); ++ } + } + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ hdcp->write(hdmi, 0x40, HDMI_A_OESSWCFG); ++ hdcp_modb(hdcp, HDMI_A_HDCPCFG0_BYPENCRYPTION_DISABLE | ++ HDMI_A_HDCPCFG0_EN11FEATURE_DISABLE | ++ HDMI_A_HDCPCFG0_SYNCRICHECK_ENABLE, ++ HDMI_A_HDCPCFG0_BYPENCRYPTION_MASK | ++ HDMI_A_HDCPCFG0_EN11FEATURE_MASK | ++ HDMI_A_HDCPCFG0_SYNCRICHECK_MASK, HDMI_A_HDCPCFG0); + -+ return complete; ++ hdcp_modb(hdcp, HDMI_A_HDCPCFG1_ENCRYPTIONDISABLE_ENABLE | ++ HDMI_A_HDCPCFG1_PH2UPSHFTENC_ENABLE, ++ HDMI_A_HDCPCFG1_ENCRYPTIONDISABLE_MASK | ++ HDMI_A_HDCPCFG1_PH2UPSHFTENC_MASK, HDMI_A_HDCPCFG1); ++ ++ /* Reset HDCP Engine */ ++ if (hdcp->read(hdmi, HDMI_MC_CLKDIS) & HDMI_MC_CLKDIS_HDCPCLK_MASK) { ++ hdcp_modb(hdcp, HDMI_A_HDCPCFG1_SWRESET_ASSERT, ++ HDMI_A_HDCPCFG1_SWRESET_MASK, HDMI_A_HDCPCFG1); ++ } ++ ++ hdcp->write(hdmi, 0x00, HDMI_A_APIINTMSK); ++ hdcp_modb(hdcp, HDMI_A_HDCPCFG0_RXDETECT_ENABLE, ++ HDMI_A_HDCPCFG0_RXDETECT_MASK, HDMI_A_HDCPCFG0); ++ ++ /* ++ * XXX: to sleep 100ms here between output hdmi and enable hdcpclk, ++ * otherwise hdcp auth fail when Connect to repeater ++ */ ++ msleep(100); ++ hdcp_modb(hdcp, HDMI_MC_CLKDIS_HDCPCLK_ENABLE, ++ HDMI_MC_CLKDIS_HDCPCLK_MASK, HDMI_MC_CLKDIS); ++ ++ hdcp->status = DW_HDCP_AUTH_START; ++ dev_dbg(hdcp->dev, "%s success\n", __func__); ++ return 0; +} -+KBASE_EXPORT_SYMBOL(kbase_instr_hwcnt_dump_complete); + -+void kbasep_cache_clean_worker(struct work_struct *data) ++static int dw_hdmi_hdcp_stop(struct dw_hdcp *hdcp) +{ -+ struct kbase_device *kbdev; -+ unsigned long flags; ++ struct dw_hdmi *hdmi = hdcp->hdmi; + -+ kbdev = container_of(data, struct kbase_device, -+ hwcnt.backend.cache_clean_work); ++ if (!hdcp->enable) ++ return -EPERM; + -+ mutex_lock(&kbdev->cacheclean_lock); -+ kbasep_instr_hwcnt_cacheclean(kbdev); ++ hdcp_modb(hdcp, HDMI_MC_CLKDIS_HDCPCLK_DISABLE, ++ HDMI_MC_CLKDIS_HDCPCLK_MASK, HDMI_MC_CLKDIS); ++ hdcp->write(hdmi, 0xff, HDMI_A_APIINTMSK); + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ /* Wait for our condition, and any reset to complete */ -+ while (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_CLEANING) { -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ wait_event(kbdev->hwcnt.backend.cache_clean_wait, -+ kbdev->hwcnt.backend.state != -+ KBASE_INSTR_STATE_CLEANING); -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ } -+ KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == -+ KBASE_INSTR_STATE_CLEANED); ++ hdcp_modb(hdcp, HDMI_A_HDCPCFG0_RXDETECT_DISABLE, ++ HDMI_A_HDCPCFG0_RXDETECT_MASK, HDMI_A_HDCPCFG0); + -+ /* All finished and idle */ -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; -+ kbdev->hwcnt.backend.triggered = 1; -+ wake_up(&kbdev->hwcnt.backend.wait); ++ hdcp_modb(hdcp, HDMI_A_SRMCTRL_SHA1_FAIL_DISABLE | ++ HDMI_A_SRMCTRL_KSV_UPDATE_DISABLE, ++ HDMI_A_SRMCTRL_SHA1_FAIL_MASK | ++ HDMI_A_SRMCTRL_KSV_UPDATE_MASK, HDMI_A_SRMCTRL); + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ mutex_unlock(&kbdev->cacheclean_lock); ++ hdcp->status = DW_HDCP_DISABLED; ++ return 0; +} + -+void kbase_instr_hwcnt_sample_done(struct kbase_device *kbdev) ++static int dw_hdmi_hdcp_ksvsha1(struct dw_hdcp *hdcp) +{ -+ unsigned long flags; ++ int rc = 0, value, list, i; ++ char bstaus0, bstaus1; ++ char *ksvlistbuf; ++ struct dw_hdmi *hdmi = hdcp->hdmi; + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ hdcp_modb(hdcp, HDMI_A_SRMCTRL_KSV_MEM_REQ_ENABLE, ++ HDMI_A_SRMCTRL_KSV_MEM_REQ_MASK, HDMI_A_SRMCTRL); + -+ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_FAULT) { -+ kbdev->hwcnt.backend.triggered = 1; -+ wake_up(&kbdev->hwcnt.backend.wait); -+ } else if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_DUMPING) { -+ int ret; -+ /* Always clean and invalidate the cache after a successful dump -+ */ -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_REQUEST_CLEAN; -+ ret = queue_work(kbdev->hwcnt.backend.cache_clean_wq, -+ &kbdev->hwcnt.backend.cache_clean_work); -+ KBASE_DEBUG_ASSERT(ret); ++ list = 20; ++ do { ++ value = hdcp->read(hdmi, HDMI_A_SRMCTRL); ++ usleep_range(500, 1000); ++ } while ((value & HDMI_A_SRMCTRL_KSV_MEM_ACCESS_MASK) == 0 && --list); ++ ++ if ((value & HDMI_A_SRMCTRL_KSV_MEM_ACCESS_MASK) == 0) { ++ dev_err(hdcp->dev, "KSV memory can not access\n"); ++ rc = -EPERM; ++ goto out; + } + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ hdcp->read(hdmi, HDMI_A_SRM_BASE); ++ bstaus0 = hdcp->read(hdmi, HDMI_A_SRM_BASE + 1); ++ bstaus1 = hdcp->read(hdmi, HDMI_A_SRM_BASE + 2); ++ ++ if (bstaus0 & HDMI_A_SRM_BASE_MAX_DEVS_EXCEEDED) { ++ dev_err(hdcp->dev, "MAX_DEVS_EXCEEDED\n"); ++ rc = -EPERM; ++ goto out; ++ } ++ ++ list = bstaus0 & HDMI_A_SRM_BASE_DEVICE_COUNT; ++ if (list > MAX_DOWNSTREAM_DEVICE_NUM) { ++ dev_err(hdcp->dev, "MAX_DOWNSTREAM_DEVICE_NUM\n"); ++ rc = -EPERM; ++ goto out; ++ } ++ if (bstaus1 & HDMI_A_SRM_BASE_MAX_CASCADE_EXCEEDED) { ++ dev_err(hdcp->dev, "MAX_CASCADE_EXCEEDED\n"); ++ rc = -EPERM; ++ goto out; ++ } ++ ++ value = (list * KSV_LEN) + HEADER + SHAMAX; ++ ksvlistbuf = kmalloc(value, GFP_KERNEL); ++ if (!ksvlistbuf) { ++ rc = -ENOMEM; ++ goto out; ++ } ++ ++ ksvlistbuf[(list * KSV_LEN)] = bstaus0; ++ ksvlistbuf[(list * KSV_LEN) + 1] = bstaus1; ++ for (i = 2; i < value; i++) { ++ if (i < HEADER) /* BSTATUS & M0 */ ++ ksvlistbuf[(list * KSV_LEN) + i] = ++ hdcp->read(hdmi, HDMI_A_SRM_BASE + i + 1); ++ else if (i < (HEADER + (list * KSV_LEN))) /* KSV list */ ++ ksvlistbuf[i - HEADER] = ++ hdcp->read(hdmi, HDMI_A_SRM_BASE + i + 1); ++ else /* SHA */ ++ ksvlistbuf[i] = ++ hdcp->read(hdmi, HDMI_A_SRM_BASE + i + 1); ++ } ++ if (hdcp_verify_ksv(ksvlistbuf, value) == true) { ++ rc = 0; ++ dev_dbg(hdcp->dev, "ksv check valid\n"); ++ } else { ++ dev_err(hdcp->dev, "ksv check invalid\n"); ++ rc = -1; ++ } ++ kfree(ksvlistbuf); ++out: ++ hdcp_modb(hdcp, HDMI_A_SRMCTRL_KSV_MEM_REQ_DISABLE, ++ HDMI_A_SRMCTRL_KSV_MEM_REQ_MASK, HDMI_A_SRMCTRL); ++ return rc; +} + -+void kbase_clean_caches_done(struct kbase_device *kbdev) ++static void dw_hdmi_hdcp_2nd_auth(struct dw_hdcp *hdcp) +{ -+ u32 irq_mask; ++ if (dw_hdmi_hdcp_ksvsha1(hdcp)) ++ hdcp_modb(hdcp, HDMI_A_SRMCTRL_SHA1_FAIL_ENABLE | ++ HDMI_A_SRMCTRL_KSV_UPDATE_ENABLE, ++ HDMI_A_SRMCTRL_SHA1_FAIL_MASK | ++ HDMI_A_SRMCTRL_KSV_UPDATE_MASK, HDMI_A_SRMCTRL); ++ else ++ hdcp_modb(hdcp, HDMI_A_SRMCTRL_SHA1_FAIL_DISABLE | ++ HDMI_A_SRMCTRL_KSV_UPDATE_ENABLE, ++ HDMI_A_SRMCTRL_SHA1_FAIL_MASK | ++ HDMI_A_SRMCTRL_KSV_UPDATE_MASK, HDMI_A_SRMCTRL); ++} + -+ if (kbdev->hwcnt.backend.state != KBASE_INSTR_STATE_DISABLED) { -+ unsigned long flags; -+ unsigned long pm_flags; ++static void dw_hdmi_hdcp_isr(struct dw_hdcp *hdcp, int hdcp_int) ++{ ++ dev_dbg(hdcp->dev, "hdcp_int is 0x%02x\n", hdcp_int); ++ if (hdcp_int & HDMI_A_APIINTSTAT_KSVSHA1_CALC_INT) { ++ dev_dbg(hdcp->dev, "hdcp sink is a repeater\n"); ++ dw_hdmi_hdcp_2nd_auth(hdcp); ++ } ++ if (hdcp_int & 0x40) { ++ hdcp->status = DW_HDCP_AUTH_FAIL; ++ if (hdcp->remaining_times > 1) ++ hdcp->remaining_times--; ++ else if (hdcp->remaining_times == 1) ++ hdcp_modb(hdcp, ++ HDMI_A_HDCPCFG1_ENCRYPTIONDISABLE_DISABLE, ++ HDMI_A_HDCPCFG1_ENCRYPTIONDISABLE_MASK, ++ HDMI_A_HDCPCFG1); ++ } ++ if (hdcp_int & 0x80) { ++ dev_dbg(hdcp->dev, "hdcp auth success\n"); ++ hdcp->status = DW_HDCP_AUTH_SUCCESS; ++ } ++} + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ /* Disable interrupt */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, pm_flags); -+ irq_mask = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), -+ NULL); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), -+ irq_mask & ~CLEAN_CACHES_COMPLETED, NULL); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, pm_flags); ++static ssize_t hdcp_enable_read(struct device *device, ++ struct device_attribute *attr, char *buf) ++{ ++ bool enable = 0; ++ struct dw_hdcp *hdcp = g_hdcp; + -+ /* Wakeup... */ -+ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_CLEANING) { -+ /* Only wake if we weren't resetting */ -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_CLEANED; -+ wake_up(&kbdev->hwcnt.backend.cache_clean_wait); -+ } ++ if (hdcp) ++ enable = hdcp->enable; + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ } ++ return snprintf(buf, PAGE_SIZE, "%d\n", enable); +} + -+int kbase_instr_hwcnt_wait_for_dump(struct kbase_context *kctx) ++static ssize_t hdcp_enable_write(struct device *device, ++ struct device_attribute *attr, ++ const char *buf, size_t count) +{ -+ struct kbase_device *kbdev = kctx->kbdev; -+ unsigned long flags; -+ int err; ++ bool enable; ++ struct dw_hdcp *hdcp = g_hdcp; + -+ /* Wait for dump & cacheclean to complete */ -+ wait_event(kbdev->hwcnt.backend.wait, -+ kbdev->hwcnt.backend.triggered != 0); ++ if (!hdcp) ++ return -EINVAL; + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ if (kstrtobool(buf, &enable)) ++ return -EINVAL; + -+ if (kbdev->hwcnt.backend.state == KBASE_INSTR_STATE_FAULT) { -+ err = -EINVAL; -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_IDLE; -+ } else { -+ /* Dump done */ -+ KBASE_DEBUG_ASSERT(kbdev->hwcnt.backend.state == -+ KBASE_INSTR_STATE_IDLE); -+ err = 0; ++ if (hdcp->enable != enable) { ++ if (enable) { ++ hdcp->enable = enable; ++ if (hdcp->read(hdcp->hdmi, HDMI_PHY_STAT0) & ++ HDMI_PHY_HPD) ++ dw_hdmi_hdcp_start(hdcp); ++ } else { ++ dw_hdmi_hdcp_stop(hdcp); ++ hdcp->enable = enable; ++ } + } + -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ return count; ++} + -+ return err; ++static DEVICE_ATTR(enable, 0644, hdcp_enable_read, hdcp_enable_write); ++ ++static ssize_t hdcp_trytimes_read(struct device *device, ++ struct device_attribute *attr, char *buf) ++{ ++ int trytimes = 0; ++ struct dw_hdcp *hdcp = g_hdcp; ++ ++ if (hdcp) ++ trytimes = hdcp->retry_times; ++ ++ return snprintf(buf, PAGE_SIZE, "%d\n", trytimes); +} + -+int kbase_instr_hwcnt_clear(struct kbase_context *kctx) ++static ssize_t hdcp_trytimes_write(struct device *device, ++ struct device_attribute *attr, ++ const char *buf, size_t count) +{ -+ unsigned long flags; -+ int err = -EINVAL; -+ struct kbase_device *kbdev = kctx->kbdev; ++ int trytimes; ++ struct dw_hdcp *hdcp = g_hdcp; + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); ++ if (!hdcp) ++ return -EINVAL; + -+ /* Check it's the context previously set up and we're not already -+ * dumping */ -+ if (kbdev->hwcnt.kctx != kctx || kbdev->hwcnt.backend.state != -+ KBASE_INSTR_STATE_IDLE) -+ goto out; ++ if (kstrtoint(buf, 0, &trytimes)) ++ return -EINVAL; + -+ /* Clear the counters */ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_PRFCNT_CLEAR, NULL, NULL, 0u, 0); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_PRFCNT_CLEAR, kctx); ++ if (hdcp->retry_times != trytimes) { ++ hdcp->retry_times = trytimes; ++ hdcp->remaining_times = hdcp->retry_times; ++ } + -+ err = 0; ++ return count; ++} + -+out: -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); -+ return err; ++static DEVICE_ATTR(trytimes, 0644, hdcp_trytimes_read, hdcp_trytimes_write); ++ ++static ssize_t hdcp_status_read(struct device *device, ++ struct device_attribute *attr, char *buf) ++{ ++ int status = DW_HDCP_DISABLED; ++ struct dw_hdcp *hdcp = g_hdcp; ++ ++ if (hdcp) ++ status = hdcp->status; ++ ++ if (status == DW_HDCP_DISABLED) ++ return snprintf(buf, PAGE_SIZE, "hdcp disable\n"); ++ else if (status == DW_HDCP_AUTH_START) ++ return snprintf(buf, PAGE_SIZE, "hdcp_auth_start\n"); ++ else if (status == DW_HDCP_AUTH_SUCCESS) ++ return snprintf(buf, PAGE_SIZE, "hdcp_auth_success\n"); ++ else if (status == DW_HDCP_AUTH_FAIL) ++ return snprintf(buf, PAGE_SIZE, "hdcp_auth_fail\n"); ++ else ++ return snprintf(buf, PAGE_SIZE, "unknown status\n"); +} -+KBASE_EXPORT_SYMBOL(kbase_instr_hwcnt_clear); + -+int kbase_instr_backend_init(struct kbase_device *kbdev) ++static DEVICE_ATTR(status, 0444, hdcp_status_read, NULL); ++ ++static int dw_hdmi_hdcp_probe(struct platform_device *pdev) +{ + int ret = 0; ++ struct dw_hdcp *hdcp = pdev->dev.platform_data; + -+ kbdev->hwcnt.backend.state = KBASE_INSTR_STATE_DISABLED; ++ g_hdcp = hdcp; ++ hdcp->mdev.minor = MISC_DYNAMIC_MINOR; ++ hdcp->mdev.name = "hdmi_hdcp1x"; ++ hdcp->mdev.mode = 0666; + -+ init_waitqueue_head(&kbdev->hwcnt.backend.wait); -+ init_waitqueue_head(&kbdev->hwcnt.backend.cache_clean_wait); -+ INIT_WORK(&kbdev->hwcnt.backend.cache_clean_work, -+ kbasep_cache_clean_worker); -+ kbdev->hwcnt.backend.triggered = 0; ++ if (misc_register(&hdcp->mdev)) { ++ dev_err(&pdev->dev, "HDCP: Could not add character driver\n"); ++ return -EINVAL; ++ } + -+ kbdev->hwcnt.backend.cache_clean_wq = -+ alloc_workqueue("Mali cache cleaning workqueue", 0, 1); -+ if (NULL == kbdev->hwcnt.backend.cache_clean_wq) ++ ret = device_create_file(hdcp->mdev.this_device, &dev_attr_enable); ++ if (ret) { ++ dev_err(&pdev->dev, "HDCP: Could not add sys file enable\n"); ++ ret = -EINVAL; ++ goto error0; ++ } ++ ++ ret = device_create_file(hdcp->mdev.this_device, &dev_attr_trytimes); ++ if (ret) { ++ dev_err(&pdev->dev, "HDCP: Could not add sys file trytimes\n"); ++ ret = -EINVAL; ++ goto error1; ++ } ++ ++ ret = device_create_file(hdcp->mdev.this_device, &dev_attr_status); ++ if (ret) { ++ dev_err(&pdev->dev, "HDCP: Could not add sys file status\n"); + ret = -EINVAL; ++ goto error2; ++ } ++ ++ /* retry time if hdcp auth fail. unlimited time if set 0 */ ++ hdcp->retry_times = 0; ++ hdcp->dev = &pdev->dev; ++ hdcp->hdcp_start = dw_hdmi_hdcp_start; ++ hdcp->hdcp_stop = dw_hdmi_hdcp_stop; ++ hdcp->hdcp_isr = dw_hdmi_hdcp_isr; ++ dev_dbg(hdcp->dev, "%s success\n", __func__); ++ return 0; + ++error2: ++ device_remove_file(hdcp->mdev.this_device, &dev_attr_trytimes); ++error1: ++ device_remove_file(hdcp->mdev.this_device, &dev_attr_enable); ++error0: ++ misc_deregister(&hdcp->mdev); + return ret; +} + -+void kbase_instr_backend_term(struct kbase_device *kbdev) ++static int dw_hdmi_hdcp_remove(struct platform_device *pdev) +{ -+ destroy_workqueue(kbdev->hwcnt.backend.cache_clean_wq); ++ struct dw_hdcp *hdcp = pdev->dev.platform_data; ++ ++ device_remove_file(hdcp->mdev.this_device, &dev_attr_trytimes); ++ device_remove_file(hdcp->mdev.this_device, &dev_attr_enable); ++ device_remove_file(hdcp->mdev.this_device, &dev_attr_status); ++ misc_deregister(&hdcp->mdev); ++ ++ kfree(hdcp->keys); ++ kfree(hdcp->seeds); ++ ++ return 0; +} + -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h ++static struct platform_driver dw_hdmi_hdcp_driver = { ++ .probe = dw_hdmi_hdcp_probe, ++ .remove = dw_hdmi_hdcp_remove, ++ .driver = { ++ .name = DW_HDCP_DRIVER_NAME, ++ }, ++}; ++ ++module_platform_driver(dw_hdmi_hdcp_driver); ++MODULE_DESCRIPTION("DW HDMI transmitter HDCP driver"); ++MODULE_LICENSE("GPL"); +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h new file mode 100755 -index 000000000000..4794672da8f0 +index 000000000..d138f91f3 --- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h -@@ -0,0 +1,58 @@ ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h +@@ -0,0 +1,54 @@ +/* ++ * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd ++ * Author Huicong Xu + * -+ * (C) COPYRIGHT 2014, 2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * This software is licensed under the terms of the GNU General Public ++ * License version 2, as published by the Free Software Foundation, and ++ * may be copied, distributed, and modified under those terms. + * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. + */ + ++#ifndef DW_HDMI_HDCP_H ++#define DW_HDMI_HDCP_H + ++#include + -+/* -+ * Backend-specific instrumentation definitions -+ */ -+ -+#ifndef _KBASE_INSTR_DEFS_H_ -+#define _KBASE_INSTR_DEFS_H_ ++#define DW_HDCP_DRIVER_NAME "dw-hdmi-hdcp" ++#define HDCP_PRIVATE_KEY_SIZE 280 ++#define HDCP_KEY_SHA_SIZE 20 + -+/* -+ * Instrumentation State Machine States -+ */ -+enum kbase_instr_state { -+ /* State where instrumentation is not active */ -+ KBASE_INSTR_STATE_DISABLED = 0, -+ /* State machine is active and ready for a command. */ -+ KBASE_INSTR_STATE_IDLE, -+ /* Hardware is currently dumping a frame. */ -+ KBASE_INSTR_STATE_DUMPING, -+ /* We've requested a clean to occur on a workqueue */ -+ KBASE_INSTR_STATE_REQUEST_CLEAN, -+ /* Hardware is currently cleaning and invalidating caches. */ -+ KBASE_INSTR_STATE_CLEANING, -+ /* Cache clean completed, and either a) a dump is complete, or -+ * b) instrumentation can now be setup. */ -+ KBASE_INSTR_STATE_CLEANED, -+ /* An error has occured during DUMPING (page fault). */ -+ KBASE_INSTR_STATE_FAULT ++struct hdcp_keys { ++ u8 KSV[8]; ++ u8 devicekey[HDCP_PRIVATE_KEY_SIZE]; ++ u8 sha1[HDCP_KEY_SHA_SIZE]; +}; + -+/* Structure used for instrumentation and HW counters dumping */ -+struct kbase_instr_backend { -+ wait_queue_head_t wait; -+ int triggered; ++struct dw_hdcp { ++ bool enable; ++ int retry_times; ++ int remaining_times; ++ char *seeds; ++ int invalidkey; ++ char *invalidkeys; ++ int hdcp2_enable; ++ int status; ++ u32 reg_io_width; + -+ enum kbase_instr_state state; -+ wait_queue_head_t cache_clean_wait; -+ struct workqueue_struct *cache_clean_wq; -+ struct work_struct cache_clean_work; ++ struct miscdevice mdev; ++ struct hdcp_keys *keys; ++ struct device *dev; ++ struct dw_hdmi *hdmi; ++ void __iomem *regs; ++ ++ void (*write)(struct dw_hdmi *hdmi, u8 val, int offset); ++ u8 (*read)(struct dw_hdmi *hdmi, int offset); ++ int (*hdcp_start)(struct dw_hdcp *hdcp); ++ int (*hdcp_stop)(struct dw_hdcp *hdcp); ++ void (*hdcp_isr)(struct dw_hdcp *hdcp, int hdcp_int); +}; + -+#endif /* _KBASE_INSTR_DEFS_H_ */ ++#endif +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +index 968241605..7ec390d46 100644 +--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +@@ -34,6 +34,14 @@ static inline u8 hdmi_read(struct dw_hdmi_i2s_audio_data *audio, int offset) + return audio->read(hdmi, offset); + } + ++static inline void hdmi_update_bits(struct dw_hdmi_i2s_audio_data *audio, ++ u8 data, u8 mask, unsigned int reg) ++{ ++ struct dw_hdmi *hdmi = audio->hdmi; + -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h ++ audio->mod(hdmi, data, mask, reg); ++} ++ + static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, + struct hdmi_codec_daifmt *fmt, + struct hdmi_codec_params *hparms) +@@ -42,6 +50,7 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, + struct dw_hdmi *hdmi = audio->hdmi; + u8 conf0 = 0; + u8 conf1 = 0; ++ u8 conf2 = 0; + u8 inputclkfs = 0; + + /* it cares I2S only */ +@@ -51,7 +60,8 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, + } + + /* Reset the FIFOs before applying new params */ +- hdmi_write(audio, HDMI_AUD_CONF0_SW_RESET, HDMI_AUD_CONF0); ++ hdmi_update_bits(audio, HDMI_AUD_CONF0_SW_RESET, ++ HDMI_AUD_CONF0_SW_RESET, HDMI_AUD_CONF0); + hdmi_write(audio, (u8)~HDMI_MC_SWRSTZ_I2SSWRST_REQ, HDMI_MC_SWRSTZ); + + inputclkfs = HDMI_AUD_INPUTCLKFS_64FS; +@@ -101,6 +111,23 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, + return -EINVAL; + } + ++ switch (fmt->bit_fmt) { ++ case SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE: ++ conf1 = HDMI_AUD_CONF1_WIDTH_21; ++ conf2 = (hparms->channels == 8) ? HDMI_AUD_CONF2_HBR : HDMI_AUD_CONF2_NLPCM; ++ break; ++ default: ++ /* ++ * dw-hdmi introduced insert_pcuv bit in version 2.10a. ++ * When set (1'b1), this bit enables the insertion of the PCUV ++ * (Parity, Channel Status, User bit and Validity) bits on the ++ * incoming audio stream (support limited to Linear PCM audio) ++ */ ++ if (hdmi_read(audio, HDMI_DESIGN_ID) >= 0x21) ++ conf2 = HDMI_AUD_CONF2_INSERT_PCUV; ++ break; ++ } ++ + dw_hdmi_set_sample_rate(hdmi, hparms->sample_rate); + dw_hdmi_set_channel_status(hdmi, hparms->iec.status); + dw_hdmi_set_channel_count(hdmi, hparms->channels); +@@ -109,10 +136,18 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, + hdmi_write(audio, inputclkfs, HDMI_AUD_INPUTCLKFS); + hdmi_write(audio, conf0, HDMI_AUD_CONF0); + hdmi_write(audio, conf1, HDMI_AUD_CONF1); ++ hdmi_write(audio, conf2, HDMI_AUD_CONF2); + + return 0; + } + ++static int dw_hdmi_i2s_prepare(struct device *dev, void *data, ++ struct hdmi_codec_daifmt *fmt, ++ struct hdmi_codec_params *hparms) ++{ ++ return dw_hdmi_i2s_hw_params(dev, data, fmt, hparms); ++} ++ + static int dw_hdmi_i2s_audio_startup(struct device *dev, void *data) + { + struct dw_hdmi_i2s_audio_data *audio = data; +@@ -179,6 +214,7 @@ static int dw_hdmi_i2s_hook_plugged_cb(struct device *dev, void *data, + + static struct hdmi_codec_ops dw_hdmi_i2s_ops = { + .hw_params = dw_hdmi_i2s_hw_params, ++ .prepare = dw_hdmi_i2s_prepare, + .audio_startup = dw_hdmi_i2s_audio_startup, + .audio_shutdown = dw_hdmi_i2s_audio_shutdown, + .get_eld = dw_hdmi_i2s_get_eld, +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h new file mode 100755 -index 000000000000..e96aeae786e1 +index 000000000..93f1a4295 --- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h -@@ -0,0 +1,45 @@ ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h +@@ -0,0 +1,29 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * -+ * (C) COPYRIGHT 2014 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * ++ * Copyright (c) 2021 Rockchip Electronics Co. Ltd. ++ * Author: Sugar Zhang + */ + ++#ifndef DW_HDMI_QP_AUDIO_H ++#define DW_HDMI_QP_AUDIO_H ++ ++struct dw_hdmi_qp; + ++struct dw_hdmi_qp_audio_data { ++ phys_addr_t phys; ++ void __iomem *base; ++ int irq; ++ struct dw_hdmi_qp *hdmi; ++ u8 *eld; ++}; + ++struct dw_hdmi_qp_i2s_audio_data { ++ struct dw_hdmi_qp *hdmi; ++ u8 *eld; + ++ void (*write)(struct dw_hdmi_qp *hdmi, u32 val, int offset); ++ u32 (*read)(struct dw_hdmi_qp *hdmi, int offset); ++ void (*mod)(struct dw_hdmi_qp *hdmi, u32 val, u32 mask, u32 reg); ++}; + ++#endif +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.c +new file mode 100644 +index 000000000..2d2320ed0 +--- /dev/null ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.c +@@ -0,0 +1,336 @@ ++// SPDX-License-Identifier: GPL-2.0+ +/* -+ * Backend-specific HW access instrumentation APIs ++ * Copyright (C) Rockchip Electronics Co.Ltd ++ * Author: ++ * Algea Cao + */ ++#include ++#include ++#include ++#include ++#include ++#include + -+#ifndef _KBASE_INSTR_INTERNAL_H_ -+#define _KBASE_INSTR_INTERNAL_H_ ++#include ++#include + -+/** -+ * kbasep_cache_clean_worker() - Workqueue for handling cache cleaning -+ * @data: a &struct work_struct -+ */ -+void kbasep_cache_clean_worker(struct work_struct *data); ++#include ++#include + -+/** -+ * kbase_clean_caches_done() - Cache clean interrupt received -+ * @kbdev: Kbase device -+ */ -+void kbase_clean_caches_done(struct kbase_device *kbdev); ++#include "dw-hdmi-qp-cec.h" + -+/** -+ * kbase_instr_hwcnt_sample_done() - Dump complete interrupt received -+ * @kbdev: Kbase device -+ */ -+void kbase_instr_hwcnt_sample_done(struct kbase_device *kbdev); ++enum { ++ CEC_TX_CONTROL = 0x1000, ++ CEC_CTRL_CLEAR = BIT(0), ++ CEC_CTRL_START = BIT(0), ++ ++ CEC_STAT_DONE = BIT(0), ++ CEC_STAT_NACK = BIT(1), ++ CEC_STAT_ARBLOST = BIT(2), ++ CEC_STAT_LINE_ERR = BIT(3), ++ CEC_STAT_RETRANS_FAIL = BIT(4), ++ CEC_STAT_DISCARD = BIT(5), ++ CEC_STAT_TX_BUSY = BIT(8), ++ CEC_STAT_RX_BUSY = BIT(9), ++ CEC_STAT_DRIVE_ERR = BIT(10), ++ CEC_STAT_EOM = BIT(11), ++ CEC_STAT_NOTIFY_ERR = BIT(12), ++ ++ CEC_CONFIG = 0x1008, ++ CEC_ADDR = 0x100c, ++ CEC_TX_CNT = 0x1020, ++ CEC_RX_CNT = 0x1040, ++ CEC_TX_DATA3_0 = 0x1024, ++ CEC_RX_DATA3_0 = 0x1044, ++ CEC_LOCK_CONTROL = 0x1054, ++ ++ CEC_INT_STATUS = 0x4000, ++ CEC_INT_MASK_N = 0x4004, ++ CEC_INT_CLEAR = 0x4008, ++}; ++ ++struct dw_hdmi_qp_cec { ++ struct dw_hdmi_qp *hdmi; ++ const struct dw_hdmi_qp_cec_ops *ops; ++ u32 addresses; ++ struct cec_adapter *adap; ++ struct cec_msg rx_msg; ++ unsigned int tx_status; ++ bool tx_done; ++ bool rx_done; ++ struct cec_notifier *notify; ++ int irq; ++}; + -+#endif /* _KBASE_INSTR_INTERNAL_H_ */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h -new file mode 100755 -index 000000000000..8781561e73d0 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h -@@ -0,0 +1,39 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++static void dw_hdmi_qp_write(struct dw_hdmi_qp_cec *cec, u32 val, int offset) ++{ ++ cec->ops->write(cec->hdmi, val, offset); ++} + ++static u32 dw_hdmi_qp_read(struct dw_hdmi_qp_cec *cec, int offset) ++{ ++ return cec->ops->read(cec->hdmi, offset); ++} + ++static int dw_hdmi_qp_cec_log_addr(struct cec_adapter *adap, u8 logical_addr) ++{ ++ struct dw_hdmi_qp_cec *cec = cec_get_drvdata(adap); + -+/* -+ * Backend specific IRQ APIs -+ */ ++ if (logical_addr == CEC_LOG_ADDR_INVALID) ++ cec->addresses = 0; ++ else ++ cec->addresses |= BIT(logical_addr) | BIT(15); + -+#ifndef _KBASE_IRQ_INTERNAL_H_ -+#define _KBASE_IRQ_INTERNAL_H_ ++ dw_hdmi_qp_write(cec, cec->addresses, CEC_ADDR); + -+int kbase_install_interrupts(struct kbase_device *kbdev); ++ return 0; ++} + -+void kbase_release_interrupts(struct kbase_device *kbdev); ++static int dw_hdmi_qp_cec_transmit(struct cec_adapter *adap, u8 attempts, ++ u32 signal_free_time, struct cec_msg *msg) ++{ ++ struct dw_hdmi_qp_cec *cec = cec_get_drvdata(adap); ++ unsigned int i; ++ u32 val; + -+/** -+ * kbase_synchronize_irqs - Ensure that all IRQ handlers have completed -+ * execution -+ * @kbdev: The kbase device -+ */ -+void kbase_synchronize_irqs(struct kbase_device *kbdev); ++ for (i = 0; i < msg->len; i++) { ++ if (!(i % 4)) ++ val = msg->msg[i]; ++ if ((i % 4) == 1) ++ val |= msg->msg[i] << 8; ++ if ((i % 4) == 2) ++ val |= msg->msg[i] << 16; ++ if ((i % 4) == 3) ++ val |= msg->msg[i] << 24; + -+int kbasep_common_test_interrupt_handlers( -+ struct kbase_device * const kbdev); ++ if (i == (msg->len - 1) || (i % 4) == 3) ++ dw_hdmi_qp_write(cec, val, CEC_TX_DATA3_0 + (i / 4) * 4); ++ } + -+#endif /* _KBASE_IRQ_INTERNAL_H_ */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c -new file mode 100755 -index 000000000000..8416b80e8b77 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c -@@ -0,0 +1,469 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ dw_hdmi_qp_write(cec, msg->len - 1, CEC_TX_CNT); ++ dw_hdmi_qp_write(cec, CEC_CTRL_START, CEC_TX_CONTROL); + ++ return 0; ++} + ++static irqreturn_t dw_hdmi_qp_cec_hardirq(int irq, void *data) ++{ ++ struct cec_adapter *adap = data; ++ struct dw_hdmi_qp_cec *cec = cec_get_drvdata(adap); ++ u32 stat = dw_hdmi_qp_read(cec, CEC_INT_STATUS); ++ irqreturn_t ret = IRQ_HANDLED; + -+#include -+#include -+#include ++ if (stat == 0) ++ return IRQ_NONE; + -+#include ++ dw_hdmi_qp_write(cec, stat, CEC_INT_CLEAR); + -+#if !defined(CONFIG_MALI_NO_MALI) ++ if (stat & CEC_STAT_LINE_ERR) { ++ cec->tx_status = CEC_TX_STATUS_ERROR; ++ cec->tx_done = true; ++ ret = IRQ_WAKE_THREAD; ++ } else if (stat & CEC_STAT_DONE) { ++ cec->tx_status = CEC_TX_STATUS_OK; ++ cec->tx_done = true; ++ ret = IRQ_WAKE_THREAD; ++ } else if (stat & CEC_STAT_NACK) { ++ cec->tx_status = CEC_TX_STATUS_NACK; ++ cec->tx_done = true; ++ ret = IRQ_WAKE_THREAD; ++ } + -+/* GPU IRQ Tags */ -+#define JOB_IRQ_TAG 0 -+#define MMU_IRQ_TAG 1 -+#define GPU_IRQ_TAG 2 ++ if (stat & CEC_STAT_EOM) { ++ unsigned int len, i, val; + -+static void *kbase_tag(void *ptr, u32 tag) -+{ -+ return (void *)(((uintptr_t) ptr) | tag); -+} ++ val = dw_hdmi_qp_read(cec, CEC_RX_CNT); ++ len = (val & 0xf) + 1; + -+static void *kbase_untag(void *ptr) -+{ -+ return (void *)(((uintptr_t) ptr) & ~3); ++ if (len > sizeof(cec->rx_msg.msg)) ++ len = sizeof(cec->rx_msg.msg); ++ ++ for (i = 0; i < 4; i++) { ++ val = dw_hdmi_qp_read(cec, CEC_RX_DATA3_0 + i * 4); ++ cec->rx_msg.msg[i * 4] = val & 0xff; ++ cec->rx_msg.msg[i * 4 + 1] = (val >> 8) & 0xff; ++ cec->rx_msg.msg[i * 4 + 2] = (val >> 16) & 0xff; ++ cec->rx_msg.msg[i * 4 + 3] = (val >> 24) & 0xff; ++ } ++ ++ dw_hdmi_qp_write(cec, 1, CEC_LOCK_CONTROL); ++ ++ cec->rx_msg.len = len; ++ cec->rx_done = true; ++ ++ ret = IRQ_WAKE_THREAD; ++ } ++ ++ return ret; +} + -+static irqreturn_t kbase_job_irq_handler(int irq, void *data) ++static irqreturn_t dw_hdmi_qp_cec_thread(int irq, void *data) +{ -+ unsigned long flags; -+ struct kbase_device *kbdev = kbase_untag(data); -+ u32 val; -+ -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); ++ struct cec_adapter *adap = data; ++ struct dw_hdmi_qp_cec *cec = cec_get_drvdata(adap); + -+ if (!kbdev->pm.backend.gpu_powered) { -+ /* GPU is turned off - IRQ is not for us */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, -+ flags); -+ return IRQ_NONE; ++ if (cec->tx_done) { ++ cec->tx_done = false; ++ cec_transmit_attempt_done(adap, cec->tx_status); + } ++ if (cec->rx_done) { ++ cec->rx_done = false; ++ cec_received_msg(adap, &cec->rx_msg); ++ } ++ return IRQ_HANDLED; ++} + -+ val = kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_STATUS), NULL); ++static int dw_hdmi_qp_cec_enable(struct cec_adapter *adap, bool enable) ++{ ++ struct dw_hdmi_qp_cec *cec = cec_get_drvdata(adap); + -+#ifdef CONFIG_MALI_DEBUG -+ if (!kbdev->pm.backend.driver_ready_for_irqs) -+ dev_warn(kbdev->dev, "%s: irq %d irqstatus 0x%x before driver is ready\n", -+ __func__, irq, val); -+#endif /* CONFIG_MALI_DEBUG */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); ++ if (!enable) { ++ dw_hdmi_qp_write(cec, 0, CEC_INT_MASK_N); ++ dw_hdmi_qp_write(cec, ~0, CEC_INT_CLEAR); ++ cec->ops->disable(cec->hdmi); ++ } else { ++ unsigned int irqs; + -+ if (!val) -+ return IRQ_NONE; ++ cec->ops->enable(cec->hdmi); + -+ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); ++ dw_hdmi_qp_write(cec, ~0, CEC_INT_CLEAR); ++ dw_hdmi_qp_write(cec, 1, CEC_LOCK_CONTROL); + -+ kbase_job_done(kbdev, val); ++ dw_hdmi_qp_cec_log_addr(cec->adap, CEC_LOG_ADDR_INVALID); + -+ return IRQ_HANDLED; ++ irqs = CEC_STAT_LINE_ERR | CEC_STAT_NACK | CEC_STAT_EOM | ++ CEC_STAT_DONE; ++ dw_hdmi_qp_write(cec, ~0, CEC_INT_CLEAR); ++ dw_hdmi_qp_write(cec, irqs, CEC_INT_MASK_N); ++ } ++ return 0; +} + -+KBASE_EXPORT_TEST_API(kbase_job_irq_handler); ++static const struct cec_adap_ops dw_hdmi_qp_cec_ops = { ++ .adap_enable = dw_hdmi_qp_cec_enable, ++ .adap_log_addr = dw_hdmi_qp_cec_log_addr, ++ .adap_transmit = dw_hdmi_qp_cec_transmit, ++}; + -+static irqreturn_t kbase_mmu_irq_handler(int irq, void *data) ++static void dw_hdmi_qp_cec_del(void *data) +{ -+ unsigned long flags; -+ struct kbase_device *kbdev = kbase_untag(data); -+ u32 val; ++ struct dw_hdmi_qp_cec *cec = data; + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); ++ cec_delete_adapter(cec->adap); ++} + -+ if (!kbdev->pm.backend.gpu_powered) { -+ /* GPU is turned off - IRQ is not for us */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, -+ flags); -+ return IRQ_NONE; ++static int dw_hdmi_qp_cec_probe(struct platform_device *pdev) ++{ ++ struct dw_hdmi_qp_cec_data *data = dev_get_platdata(&pdev->dev); ++ struct dw_hdmi_qp_cec *cec; ++ int ret; ++ ++ if (!data) { ++ dev_err(&pdev->dev, "can't get data\n"); ++ return -ENXIO; + } + -+ atomic_inc(&kbdev->faults_pending); ++ /* ++ * Our device is just a convenience - we want to link to the real ++ * hardware device here, so that userspace can see the association ++ * between the HDMI hardware and its associated CEC chardev. ++ */ ++ cec = devm_kzalloc(&pdev->dev, sizeof(*cec), GFP_KERNEL); ++ if (!cec) ++ return -ENOMEM; + -+ val = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_STATUS), NULL); ++ cec->ops = data->ops; ++ cec->hdmi = data->hdmi; ++ cec->irq = data->irq; + -+#ifdef CONFIG_MALI_DEBUG -+ if (!kbdev->pm.backend.driver_ready_for_irqs) -+ dev_warn(kbdev->dev, "%s: irq %d irqstatus 0x%x before driver is ready\n", -+ __func__, irq, val); -+#endif /* CONFIG_MALI_DEBUG */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); ++ platform_set_drvdata(pdev, cec); + -+ if (!val) { -+ atomic_dec(&kbdev->faults_pending); -+ return IRQ_NONE; -+ } ++ dw_hdmi_qp_write(cec, 0, CEC_TX_CNT); ++ dw_hdmi_qp_write(cec, ~0, CEC_INT_CLEAR); ++ dw_hdmi_qp_write(cec, 0, CEC_INT_MASK_N); + -+ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); ++ cec->adap = cec_allocate_adapter(&dw_hdmi_qp_cec_ops, cec, "dw_hdmi_qp", ++ CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | ++ CEC_CAP_RC | CEC_CAP_PASSTHROUGH, ++ CEC_MAX_LOG_ADDRS); ++ if (IS_ERR(cec->adap)) { ++ dev_err(&pdev->dev, "cec allocate adapter failed\n"); ++ return PTR_ERR(cec->adap); ++ } + -+ kbase_mmu_interrupt(kbdev, val); ++ dw_hdmi_qp_set_cec_adap(cec->hdmi, cec->adap); + -+ atomic_dec(&kbdev->faults_pending); ++ /* override the module pointer */ ++ cec->adap->owner = THIS_MODULE; + -+ return IRQ_HANDLED; -+} ++ ret = devm_add_action(&pdev->dev, dw_hdmi_qp_cec_del, cec); ++ if (ret) { ++ dev_err(&pdev->dev, "cec add action failed\n"); ++ cec_delete_adapter(cec->adap); ++ return ret; ++ } + -+static irqreturn_t kbase_gpu_irq_handler(int irq, void *data) -+{ -+ unsigned long flags; -+ struct kbase_device *kbdev = kbase_untag(data); -+ u32 val; ++ if (cec->irq < 0) { ++ ret = cec->irq; ++ dev_err(&pdev->dev, "cec get irq failed\n"); ++ return ret; ++ } + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); ++ ret = devm_request_threaded_irq(&pdev->dev, cec->irq, ++ dw_hdmi_qp_cec_hardirq, ++ dw_hdmi_qp_cec_thread, IRQF_SHARED, ++ "dw-hdmi-qp-cec", cec->adap); ++ if (ret < 0) { ++ dev_err(&pdev->dev, "cec request irq thread failed\n"); ++ return ret; ++ } + -+ if (!kbdev->pm.backend.gpu_powered) { -+ /* GPU is turned off - IRQ is not for us */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, -+ flags); -+ return IRQ_NONE; ++ cec->notify = cec_notifier_cec_adap_register(pdev->dev.parent, ++ NULL, cec->adap); ++ if (!cec->notify) { ++ dev_err(&pdev->dev, "cec notifier adap register failed\n"); ++ return -ENOMEM; + } + -+ val = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_STATUS), NULL); ++ ret = cec_register_adapter(cec->adap, pdev->dev.parent); ++ if (ret < 0) { ++ dev_err(&pdev->dev, "cec adap register failed\n"); ++ cec_notifier_cec_adap_unregister(cec->notify, cec->adap); ++ return ret; ++ } + -+#ifdef CONFIG_MALI_DEBUG -+ if (!kbdev->pm.backend.driver_ready_for_irqs) -+ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x before driver is ready\n", -+ __func__, irq, val); -+#endif /* CONFIG_MALI_DEBUG */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); ++ /* ++ * CEC documentation says we must not call cec_delete_adapter ++ * after a successful call to cec_register_adapter(). ++ */ ++ devm_remove_action(&pdev->dev, dw_hdmi_qp_cec_del, cec); + -+ if (!val) -+ return IRQ_NONE; ++ return 0; ++} + -+ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); ++static int dw_hdmi_qp_cec_remove(struct platform_device *pdev) ++{ ++ struct dw_hdmi_qp_cec *cec = platform_get_drvdata(pdev); + -+ kbase_gpu_interrupt(kbdev, val); ++ cec_notifier_cec_adap_unregister(cec->notify, cec->adap); ++ cec_unregister_adapter(cec->adap); + -+ return IRQ_HANDLED; ++ return 0; +} + -+KBASE_EXPORT_TEST_API(kbase_gpu_irq_handler); ++static struct platform_driver dw_hdmi_qp_cec_driver = { ++ .probe = dw_hdmi_qp_cec_probe, ++ .remove = dw_hdmi_qp_cec_remove, ++ .driver = { ++ .name = "dw-hdmi-qp-cec", ++ }, ++}; ++module_platform_driver(dw_hdmi_qp_cec_driver); + -+static irq_handler_t kbase_handler_table[] = { -+ [JOB_IRQ_TAG] = kbase_job_irq_handler, -+ [MMU_IRQ_TAG] = kbase_mmu_irq_handler, -+ [GPU_IRQ_TAG] = kbase_gpu_irq_handler, ++MODULE_AUTHOR("Algea Cao "); ++MODULE_DESCRIPTION("Synopsys Designware HDMI QP CEC driver"); ++MODULE_LICENSE("GPL"); ++MODULE_ALIAS(PLATFORM_MODULE_PREFIX "dw-hdmi-qp-cec"); +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.h +new file mode 100644 +index 000000000..c0977c612 +--- /dev/null ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.h +@@ -0,0 +1,25 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) Rockchip Electronics Co.Ltd ++ * Author: ++ * Algea Cao ++ */ ++#ifndef DW_HDMI_QP_CEC_H ++#define DW_HDMI_QP_CEC_H ++ ++struct dw_hdmi_qp; ++ ++struct dw_hdmi_qp_cec_ops { ++ void (*enable)(struct dw_hdmi_qp *hdmi); ++ void (*disable)(struct dw_hdmi_qp *hdmi); ++ void (*write)(struct dw_hdmi_qp *hdmi, u32 val, int offset); ++ u32 (*read)(struct dw_hdmi_qp *hdmi, int offset); +}; + -+#ifdef CONFIG_MALI_DEBUG -+#define JOB_IRQ_HANDLER JOB_IRQ_TAG -+#define MMU_IRQ_HANDLER MMU_IRQ_TAG -+#define GPU_IRQ_HANDLER GPU_IRQ_TAG ++struct dw_hdmi_qp_cec_data { ++ struct dw_hdmi_qp *hdmi; ++ const struct dw_hdmi_qp_cec_ops *ops; ++ int irq; ++}; + -+/** -+ * kbase_set_custom_irq_handler - Set a custom IRQ handler -+ * @kbdev: Device for which the handler is to be registered -+ * @custom_handler: Handler to be registered -+ * @irq_type: Interrupt type -+ * -+ * Registers given interrupt handler for requested interrupt type -+ * In the case where irq handler is not specified, the default handler shall be -+ * registered -+ * -+ * Return: 0 case success, error code otherwise ++#endif +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.c +new file mode 100644 +index 000000000..7f55f7201 +--- /dev/null ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.c +@@ -0,0 +1,650 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) Rockchip Electronics Co.Ltd ++ * Author: ++ * Algea Cao + */ -+int kbase_set_custom_irq_handler(struct kbase_device *kbdev, -+ irq_handler_t custom_handler, -+ int irq_type) -+{ -+ int result = 0; -+ irq_handler_t requested_irq_handler = NULL; -+ -+ KBASE_DEBUG_ASSERT((JOB_IRQ_HANDLER <= irq_type) && -+ (GPU_IRQ_HANDLER >= irq_type)); ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+ /* Release previous handler */ -+ if (kbdev->irqs[irq_type].irq) -+ free_irq(kbdev->irqs[irq_type].irq, kbase_tag(kbdev, irq_type)); ++#include "dw-hdmi-qp.h" ++#include "dw-hdmi-qp-hdcp.h" + -+ requested_irq_handler = (NULL != custom_handler) ? custom_handler : -+ kbase_handler_table[irq_type]; ++#define HDCP_KEY_SIZE 308 ++#define HDCP_KEY_SEED_SIZE 2 + -+ if (0 != request_irq(kbdev->irqs[irq_type].irq, -+ requested_irq_handler, -+ kbdev->irqs[irq_type].flags | IRQF_SHARED, -+ dev_name(kbdev->dev), kbase_tag(kbdev, irq_type))) { -+ result = -EINVAL; -+ dev_err(kbdev->dev, "Can't request interrupt %d (index %d)\n", -+ kbdev->irqs[irq_type].irq, irq_type); -+#ifdef CONFIG_SPARSE_IRQ -+ dev_err(kbdev->dev, "You have CONFIG_SPARSE_IRQ support enabled - is the interrupt number correct for this configuration?\n"); -+#endif /* CONFIG_SPARSE_IRQ */ -+ } ++#define KSV_LEN 5 ++#define HEADER 10 ++#define SHAMAX 20 + -+ return result; -+} ++#define MAX_DOWNSTREAM_DEVICE_NUM 5 ++#define DPK_WR_OK_TIMEOUT_US 30000 ++#define HDMI_HDCP1X_ID 5 + -+KBASE_EXPORT_TEST_API(kbase_set_custom_irq_handler); ++/* HDCP Registers */ ++#define HDMI_HDCPREG_RMCTL 0x780e ++#define HDMI_HDCPREG_RMSTS 0x780f ++#define HDMI_HDCPREG_SEED0 0x7810 ++#define HDMI_HDCPREG_SEED1 0x7811 ++#define HDMI_HDCPREG_DPK0 0x7812 ++#define HDMI_HDCPREG_DPK1 0x7813 ++#define HDMI_HDCPREG_DPK2 0x7814 ++#define HDMI_HDCPREG_DPK3 0x7815 ++#define HDMI_HDCPREG_DPK4 0x7816 ++#define HDMI_HDCPREG_DPK5 0x7817 ++#define HDMI_HDCPREG_DPK6 0x7818 ++#define HDMI_HDCP2REG_CTRL 0x7904 ++#define HDMI_HDCP2REG_MASK 0x790c ++#define HDMI_HDCP2REG_MUTE 0x790e + -+/* test correct interrupt assigment and reception by cpu */ -+struct kbasep_irq_test { -+ struct hrtimer timer; -+ wait_queue_head_t wait; -+ int triggered; -+ u32 timeout; ++enum dw_hdmi_hdcp_state { ++ DW_HDCP_DISABLED, ++ DW_HDCP_AUTH_START, ++ DW_HDCP_AUTH_SUCCESS, ++ DW_HDCP_AUTH_FAIL, +}; + -+static struct kbasep_irq_test kbasep_irq_test_data; -+ -+#define IRQ_TEST_TIMEOUT 500 ++enum { ++ DW_HDMI_HDCP_KSV_LEN = 8, ++ DW_HDMI_HDCP_SHA_LEN = 20, ++ DW_HDMI_HDCP_DPK_LEN = 280, ++ DW_HDMI_HDCP_KEY_LEN = 308, ++ DW_HDMI_HDCP_SEED_LEN = 2, ++}; + -+static irqreturn_t kbase_job_irq_test_handler(int irq, void *data) -+{ -+ unsigned long flags; -+ struct kbase_device *kbdev = kbase_untag(data); -+ u32 val; ++enum { ++ HDCP14_R0_TIMER_OVR_EN_MASK = 0x01, ++ HDCP14_R0_TIMER_OVR_EN = 0x01, ++ HDCP14_R0_TIMER_OVR_DISABLE = 0x00, + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); ++ HDCP14_RI_TIMER_OVR_EN_MASK = 0x80, ++ HDCP14_RI_TIMER_OVR_EN = 0x80, ++ HDCP14_RI_TIMER_OVR_DISABLE = 0x00, + -+ if (!kbdev->pm.backend.gpu_powered) { -+ /* GPU is turned off - IRQ is not for us */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, -+ flags); -+ return IRQ_NONE; -+ } ++ HDCP14_R0_TIMER_OVR_VALUE_MASK = 0x1e, ++ HDCP14_RI_TIMER_OVR_VALUE_MASK = 0xff00, + -+ val = kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_STATUS), NULL); ++ HDCP14_KEY_WR_OK = 0x100, + -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); ++ HDCP14_HPD_MASK = 0x01, ++ HDCP14_HPD_EN = 0x01, ++ HDCP14_HPD_DISABLE = 0x00, + -+ if (!val) -+ return IRQ_NONE; ++ HDCP14_ENCRYPTION_ENABLE_MASK = 0x04, ++ HDCP14_ENCRYPTION_ENABLE = 0x04, ++ HDCP14_ENCRYPTION_DISABLE = 0x04, + -+ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); ++ HDCP14_KEY_DECRYPT_EN_MASK = 0x400, ++ HDCP14_KEY_DECRYPT_EN = 0x400, ++ HDCP14_KEY_DECRYPT_DISABLE = 0x00, + -+ kbasep_irq_test_data.triggered = 1; -+ wake_up(&kbasep_irq_test_data.wait); ++ HDMI_A_SRMCTRL_SHA1_FAIL_MASK = 0X08, ++ HDMI_A_SRMCTRL_SHA1_FAIL_DISABLE = 0X00, ++ HDMI_A_SRMCTRL_SHA1_FAIL_ENABLE = 0X08, + -+ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_CLEAR), val, NULL); ++ HDMI_A_SRMCTRL_KSV_UPDATE_MASK = 0X04, ++ HDMI_A_SRMCTRL_KSV_UPDATE_DISABLE = 0X00, ++ HDMI_A_SRMCTRL_KSV_UPDATE_ENABLE = 0X04, + -+ return IRQ_HANDLED; -+} ++ HDMI_A_SRMCTRL_KSV_MEM_REQ_MASK = 0X01, ++ HDMI_A_SRMCTRL_KSV_MEM_REQ_DISABLE = 0X00, ++ HDMI_A_SRMCTRL_KSV_MEM_REQ_ENABLE = 0X01, + -+static irqreturn_t kbase_mmu_irq_test_handler(int irq, void *data) -+{ -+ unsigned long flags; -+ struct kbase_device *kbdev = kbase_untag(data); -+ u32 val; ++ HDMI_A_SRMCTRL_KSV_MEM_ACCESS_MASK = 0X02, ++ HDMI_A_SRMCTRL_KSV_MEM_ACCESS_DISABLE = 0X00, ++ HDMI_A_SRMCTRL_KSV_MEM_ACCESS_ENABLE = 0X02, + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, flags); ++ HDMI_A_SRM_BASE_MAX_DEVS_EXCEEDED = 0x80, ++ HDMI_A_SRM_BASE_DEVICE_COUNT = 0x7f, + -+ if (!kbdev->pm.backend.gpu_powered) { -+ /* GPU is turned off - IRQ is not for us */ -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, -+ flags); -+ return IRQ_NONE; -+ } ++ HDMI_A_SRM_BASE_MAX_CASCADE_EXCEEDED = 0x08, + -+ val = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_STATUS), NULL); ++ HDMI_A_APIINTSTAT_KSVSHA1_CALC_INT = 0x02, + -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, flags); ++ /* HDCPREG_RMSTS field values */ ++ DPK_WR_OK_STS = 0x40, + -+ if (!val) -+ return IRQ_NONE; ++ HDMI_A_HDCP22_MASK = 0x40, + -+ dev_dbg(kbdev->dev, "%s: irq %d irqstatus 0x%x\n", __func__, irq, val); ++ HDMI_HDCP2_OVR_EN_MASK = 0x02, ++ HDMI_HDCP2_OVR_ENABLE = 0x02, ++ HDMI_HDCP2_OVR_DISABLE = 0x00, + -+ kbasep_irq_test_data.triggered = 1; -+ wake_up(&kbasep_irq_test_data.wait); ++ HDMI_HDCP2_FORCE_MASK = 0x04, ++ HDMI_HDCP2_FORCE_ENABLE = 0x04, ++ HDMI_HDCP2_FORCE_DISABLE = 0x00, ++}; + -+ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_CLEAR), val, NULL); ++struct sha_t { ++ u8 mlength[8]; ++ u8 mblock[64]; ++ int mindex; ++ int mcomputed; ++ int mcorrupted; ++ unsigned int mdigest[5]; ++}; + -+ return IRQ_HANDLED; ++static inline unsigned int shacircularshift(unsigned int bits, ++ unsigned int word) ++{ ++ return (((word << bits) & 0xFFFFFFFF) | (word >> (32 - bits))); +} + -+static enum hrtimer_restart kbasep_test_interrupt_timeout(struct hrtimer *timer) ++static void hdcp_modb(struct dw_qp_hdcp *hdcp, u32 data, u32 mask, u32 reg) +{ -+ struct kbasep_irq_test *test_data = container_of(timer, -+ struct kbasep_irq_test, timer); ++ struct dw_hdmi_qp *hdmi = hdcp->hdmi; ++ u32 val = hdcp->read(hdmi, reg) & ~mask; + -+ test_data->timeout = 1; -+ test_data->triggered = 1; -+ wake_up(&test_data->wait); -+ return HRTIMER_NORESTART; ++ val |= data & mask; ++ hdcp->write(hdmi, val, reg); +} + -+static int kbasep_common_test_interrupt( -+ struct kbase_device * const kbdev, u32 tag) ++static int hdcp_load_keys_cb(struct dw_qp_hdcp *hdcp) +{ -+ int err = 0; -+ irq_handler_t test_handler; ++ u32 size; ++ u8 hdcp_vendor_data[320]; + -+ u32 old_mask_val; -+ u16 mask_offset; -+ u16 rawstat_offset; ++ hdcp->keys = kmalloc(HDCP_KEY_SIZE, GFP_KERNEL); ++ if (!hdcp->keys) ++ return -ENOMEM; + -+ switch (tag) { -+ case JOB_IRQ_TAG: -+ test_handler = kbase_job_irq_test_handler; -+ rawstat_offset = JOB_CONTROL_REG(JOB_IRQ_RAWSTAT); -+ mask_offset = JOB_CONTROL_REG(JOB_IRQ_MASK); -+ break; -+ case MMU_IRQ_TAG: -+ test_handler = kbase_mmu_irq_test_handler; -+ rawstat_offset = MMU_REG(MMU_IRQ_RAWSTAT); -+ mask_offset = MMU_REG(MMU_IRQ_MASK); -+ break; -+ case GPU_IRQ_TAG: -+ /* already tested by pm_driver - bail out */ -+ default: -+ return 0; ++ hdcp->seeds = kmalloc(HDCP_KEY_SEED_SIZE, GFP_KERNEL); ++ if (!hdcp->seeds) { ++ kfree(hdcp->keys); ++ return -ENOMEM; + } + -+ /* store old mask */ -+ old_mask_val = kbase_reg_read(kbdev, mask_offset, NULL); -+ /* mask interrupts */ -+ kbase_reg_write(kbdev, mask_offset, 0x0, NULL); ++ size = rk_vendor_read(HDMI_HDCP1X_ID, hdcp_vendor_data, 314); ++ if (size < (HDCP_KEY_SIZE + HDCP_KEY_SEED_SIZE)) { ++ dev_err(hdcp->dev, "HDCP: read size %d\n", size); ++ memset(hdcp->keys, 0, HDCP_KEY_SIZE); ++ memset(hdcp->seeds, 0, HDCP_KEY_SEED_SIZE); ++ } else { ++ memcpy(hdcp->keys, hdcp_vendor_data, HDCP_KEY_SIZE); ++ memcpy(hdcp->seeds, hdcp_vendor_data + HDCP_KEY_SIZE, ++ HDCP_KEY_SEED_SIZE); ++ } + -+ if (kbdev->irqs[tag].irq) { -+ /* release original handler and install test handler */ -+ if (kbase_set_custom_irq_handler(kbdev, test_handler, tag) != 0) { -+ err = -EINVAL; -+ } else { -+ kbasep_irq_test_data.timeout = 0; -+ hrtimer_init(&kbasep_irq_test_data.timer, -+ CLOCK_MONOTONIC, HRTIMER_MODE_REL); -+ kbasep_irq_test_data.timer.function = -+ kbasep_test_interrupt_timeout; ++ return 0; ++} + -+ /* trigger interrupt */ -+ kbase_reg_write(kbdev, mask_offset, 0x1, NULL); -+ kbase_reg_write(kbdev, rawstat_offset, 0x1, NULL); ++static int dw_hdcp_qp_hdcp_load_key(struct dw_qp_hdcp *hdcp) ++{ ++ int i, j; ++ int ret, val; ++ void __iomem *reg_rmsts_addr; ++ struct dw_hdmi_qp_hdcp_keys *hdcp_keys; ++ struct dw_hdmi_qp *hdmi = hdcp->hdmi; ++ u32 ksv, dkl, dkh; + -+ hrtimer_start(&kbasep_irq_test_data.timer, -+ HR_TIMER_DELAY_MSEC(IRQ_TEST_TIMEOUT), -+ HRTIMER_MODE_REL); ++ if (!hdcp->keys) { ++ ret = hdcp_load_keys_cb(hdcp); ++ if (ret) ++ return ret; ++ } ++ hdcp_keys = hdcp->keys; + -+ wait_event(kbasep_irq_test_data.wait, -+ kbasep_irq_test_data.triggered != 0); ++ reg_rmsts_addr = hdcp->regs + HDCP14_KEY_STATUS; + -+ if (kbasep_irq_test_data.timeout != 0) { -+ dev_err(kbdev->dev, "Interrupt %d (index %d) didn't reach CPU.\n", -+ kbdev->irqs[tag].irq, tag); -+ err = -EINVAL; -+ } else { -+ dev_dbg(kbdev->dev, "Interrupt %d (index %d) reached CPU.\n", -+ kbdev->irqs[tag].irq, tag); -+ } ++ /* hdcp key has been written */ ++ if (hdcp->read(hdmi, HDCP14_KEY_STATUS) & 0x3f) { ++ dev_info(hdcp->dev, "hdcp key has been written\n"); ++ return 0; ++ } + -+ hrtimer_cancel(&kbasep_irq_test_data.timer); -+ kbasep_irq_test_data.triggered = 0; ++ ksv = hdcp_keys->KSV[0] | hdcp_keys->KSV[1] << 8 | ++ hdcp_keys->KSV[2] << 16 | hdcp_keys->KSV[3] << 24; ++ hdcp->write(hdmi, ksv, HDCP14_AKSV_L); + -+ /* mask interrupts */ -+ kbase_reg_write(kbdev, mask_offset, 0x0, NULL); ++ ksv = hdcp_keys->KSV[4]; ++ hdcp->write(hdmi, ksv, HDCP14_AKSV_H); + -+ /* release test handler */ -+ free_irq(kbdev->irqs[tag].irq, kbase_tag(kbdev, tag)); -+ } ++ if (hdcp->seeds) { ++ hdcp_modb(hdcp, HDCP14_KEY_DECRYPT_EN, ++ HDCP14_KEY_DECRYPT_EN_MASK, ++ HDCP14_CONFIG0); ++ hdcp->write(hdmi, (hdcp->seeds[0] << 8) | hdcp->seeds[1], ++ HDCP14_KEY_SEED); ++ } else { ++ hdcp_modb(hdcp, HDCP14_KEY_DECRYPT_DISABLE, ++ HDCP14_KEY_DECRYPT_EN_MASK, ++ HDCP14_CONFIG0); ++ } + -+ /* restore original interrupt */ -+ if (request_irq(kbdev->irqs[tag].irq, kbase_handler_table[tag], -+ kbdev->irqs[tag].flags | IRQF_SHARED, -+ dev_name(kbdev->dev), kbase_tag(kbdev, tag))) { -+ dev_err(kbdev->dev, "Can't restore original interrupt %d (index %d)\n", -+ kbdev->irqs[tag].irq, tag); -+ err = -EINVAL; ++ for (i = 0; i < DW_HDMI_HDCP_DPK_LEN - 6; i += 7) { ++ dkl = 0; ++ dkh = 0; ++ for (j = 0; j < 4; j++) ++ dkl |= hdcp_keys->devicekey[i + j] << (j * 8); ++ for (j = 4; j < 7; j++) ++ dkh |= hdcp_keys->devicekey[i + j] << ((j - 4) * 8); ++ ++ hdcp->write(hdmi, dkh, HDCP14_KEY_H); ++ hdcp->write(hdmi, dkl, HDCP14_KEY_L); ++ ++ ret = readx_poll_timeout(readl, reg_rmsts_addr, val, ++ val & HDCP14_KEY_WR_OK, 1000, ++ DPK_WR_OK_TIMEOUT_US); ++ if (ret) { ++ dev_err(hdcp->dev, "hdcp key write err\n"); ++ return ret; + } + } -+ /* restore old mask */ -+ kbase_reg_write(kbdev, mask_offset, old_mask_val, NULL); + -+ return err; ++ return 0; +} + -+int kbasep_common_test_interrupt_handlers( -+ struct kbase_device * const kbdev) ++static void dw_hdcp_qp_hdcp_restart(struct dw_qp_hdcp *hdcp) +{ -+ int err; -+ -+ init_waitqueue_head(&kbasep_irq_test_data.wait); -+ kbasep_irq_test_data.triggered = 0; -+ -+ /* A suspend won't happen during startup/insmod */ -+ kbase_pm_context_active(kbdev); ++ mutex_lock(&hdcp->mutex); + -+ err = kbasep_common_test_interrupt(kbdev, JOB_IRQ_TAG); -+ if (err) { -+ dev_err(kbdev->dev, "Interrupt JOB_IRQ didn't reach CPU. Check interrupt assignments.\n"); -+ goto out; ++ if (!hdcp->remaining_times) { ++ mutex_unlock(&hdcp->mutex); ++ return; + } + -+ err = kbasep_common_test_interrupt(kbdev, MMU_IRQ_TAG); -+ if (err) { -+ dev_err(kbdev->dev, "Interrupt MMU_IRQ didn't reach CPU. Check interrupt assignments.\n"); -+ goto out; -+ } ++ hdcp_modb(hdcp, 0, HDCP14_ENCRYPTION_ENABLE_MASK | HDCP14_HPD_MASK, ++ HDCP14_CONFIG0); + -+ dev_dbg(kbdev->dev, "Interrupts are correctly assigned.\n"); ++ hdcp->write(hdcp->hdmi, 1, HDCP14_CONFIG1); ++ mdelay(50); ++ hdcp->write(hdcp->hdmi, HDCP14_AUTH_CHG_MASK_N | HDCP14_KSV_LIST_DONE_MASK_N, ++ AVP_1_INT_CLEAR); ++ hdcp_modb(hdcp, HDCP14_AUTH_CHG_MASK_N | HDCP14_KSV_LIST_DONE_MASK_N, ++ HDCP14_AUTH_CHG_MASK_N | HDCP14_KSV_LIST_DONE_MASK_N, AVP_1_INT_MASK_N); + -+ out: -+ kbase_pm_context_idle(kbdev); ++ hdcp_modb(hdcp, HDCP14_ENCRYPTION_ENABLE_MASK | HDCP14_HPD_MASK, ++ HDCP14_ENCRYPTION_ENABLE_MASK | HDCP14_HPD_MASK, ++ HDCP14_CONFIG0); + -+ return err; ++ hdcp->remaining_times--; ++ mutex_unlock(&hdcp->mutex); +} -+#endif /* CONFIG_MALI_DEBUG */ + -+int kbase_install_interrupts(struct kbase_device *kbdev) ++static int dw_hdcp_qp_hdcp_start(struct dw_qp_hdcp *hdcp) +{ -+ u32 nr = ARRAY_SIZE(kbase_handler_table); -+ int err; -+ u32 i; ++ struct dw_hdmi_qp *hdmi = hdcp->hdmi; + -+ for (i = 0; i < nr; i++) { -+ err = request_irq(kbdev->irqs[i].irq, kbase_handler_table[i], -+ kbdev->irqs[i].flags | IRQF_SHARED, -+ dev_name(kbdev->dev), -+ kbase_tag(kbdev, i)); -+ if (err) { -+ dev_err(kbdev->dev, "Can't request interrupt %d (index %d)\n", -+ kbdev->irqs[i].irq, i); -+#ifdef CONFIG_SPARSE_IRQ -+ dev_err(kbdev->dev, "You have CONFIG_SPARSE_IRQ support enabled - is the interrupt number correct for this configuration?\n"); -+#endif /* CONFIG_SPARSE_IRQ */ -+ goto release; -+ } -+ } ++ dw_hdcp_qp_hdcp_load_key(hdcp); + -+ return 0; ++ mutex_lock(&hdcp->mutex); ++ hdcp->remaining_times = hdcp->retry_times; + -+ release: -+ while (i-- > 0) -+ free_irq(kbdev->irqs[i].irq, kbase_tag(kbdev, i)); ++ hdcp->write(hdmi, HDCP14_AUTH_CHG_MASK_N | HDCP14_KSV_LIST_DONE_MASK_N, AVP_1_INT_CLEAR); ++ hdcp_modb(hdcp, HDCP14_AUTH_CHG_MASK_N | HDCP14_KSV_LIST_DONE_MASK_N, ++ HDCP14_AUTH_CHG_MASK_N | HDCP14_KSV_LIST_DONE_MASK_N, AVP_1_INT_MASK_N); + -+ return err; -+} ++ mdelay(50); + -+void kbase_release_interrupts(struct kbase_device *kbdev) -+{ -+ u32 nr = ARRAY_SIZE(kbase_handler_table); -+ u32 i; ++ hdcp_modb(hdcp, HDCP14_ENCRYPTION_ENABLE | HDCP14_HPD_EN, ++ HDCP14_ENCRYPTION_ENABLE_MASK | HDCP14_HPD_MASK, ++ HDCP14_CONFIG0); + -+ for (i = 0; i < nr; i++) { -+ if (kbdev->irqs[i].irq) -+ free_irq(kbdev->irqs[i].irq, kbase_tag(kbdev, i)); -+ } ++ hdcp->status = DW_HDCP_AUTH_START; ++ dev_info(hdcp->dev, "start hdcp\n"); ++ mutex_unlock(&hdcp->mutex); ++ ++ queue_work(hdcp->workqueue, &hdcp->work); ++ return 0; +} + -+void kbase_synchronize_irqs(struct kbase_device *kbdev) ++static int dw_hdcp_qp_hdcp_stop(struct dw_qp_hdcp *hdcp) +{ -+ u32 nr = ARRAY_SIZE(kbase_handler_table); -+ u32 i; ++ mutex_lock(&hdcp->mutex); ++ hdcp_modb(hdcp, 0, HDCP14_ENCRYPTION_ENABLE_MASK | HDCP14_HPD_MASK, ++ HDCP14_CONFIG0); + -+ for (i = 0; i < nr; i++) { -+ if (kbdev->irqs[i].irq) -+ synchronize_irq(kbdev->irqs[i].irq); -+ } ++ hdcp_modb(hdcp, 0, HDCP14_AUTH_CHG_MASK_N | HDCP14_KSV_LIST_DONE_MASK_N, AVP_1_INT_MASK_N); ++ hdcp->write(hdcp->hdmi, 0, HDCP14_CONFIG1); ++ hdcp->status = DW_HDCP_DISABLED; ++ mutex_unlock(&hdcp->mutex); ++ return 0; +} + -+#endif /* !defined(CONFIG_MALI_NO_MALI) */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c -new file mode 100755 -index 000000000000..92358f2bf298 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c -@@ -0,0 +1,237 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ ++static void sha_reset(struct sha_t *sha) ++{ ++ u32 i = 0; + ++ sha->mindex = 0; ++ sha->mcomputed = false; ++ sha->mcorrupted = false; ++ for (i = 0; i < sizeof(sha->mlength); i++) ++ sha->mlength[i] = 0; + ++ sha1_init(sha->mdigest); ++} + -+/* -+ * Register backend context / address space management -+ */ ++static void sha_processblock(struct sha_t *sha) ++{ ++ u32 array[SHA1_WORKSPACE_WORDS]; + -+#include -+#include -+#include ++ sha1_transform(sha->mdigest, sha->mblock, array); ++ sha->mindex = 0; ++} + -+/** -+ * assign_and_activate_kctx_addr_space - Assign an AS to a context -+ * @kbdev: Kbase device -+ * @kctx: Kbase context -+ * @current_as: Address Space to assign -+ * -+ * Assign an Address Space (AS) to a context, and add the context to the Policy. -+ * -+ * This includes -+ * setting up the global runpool_irq structure and the context on the AS, -+ * Activating the MMU on the AS, -+ * Allowing jobs to be submitted on the AS. -+ * -+ * Context: -+ * kbasep_js_kctx_info.jsctx_mutex held, -+ * kbasep_js_device_data.runpool_mutex held, -+ * AS transaction mutex held, -+ * Runpool IRQ lock held -+ */ -+static void assign_and_activate_kctx_addr_space(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ struct kbase_as *current_as) ++static void sha_padmessage(struct sha_t *sha) +{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; ++ /* ++ * Check to see if the current message block is too small to hold ++ * the initial padding bits and length. If so, we will pad the ++ * block, process it, and then continue padding into a second ++ * block. ++ */ ++ if (sha->mindex > 55) { ++ sha->mblock[sha->mindex++] = 0x80; ++ while (sha->mindex < 64) ++ sha->mblock[sha->mindex++] = 0; + -+ lockdep_assert_held(&kctx->jctx.sched_info.ctx.jsctx_mutex); -+ lockdep_assert_held(&js_devdata->runpool_mutex); -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ sha_processblock(sha); ++ while (sha->mindex < 56) ++ sha->mblock[sha->mindex++] = 0; ++ } else { ++ sha->mblock[sha->mindex++] = 0x80; ++ while (sha->mindex < 56) ++ sha->mblock[sha->mindex++] = 0; ++ } + -+ /* Attribute handling */ -+ kbasep_js_ctx_attr_runpool_retain_ctx(kbdev, kctx); ++ /* Store the message length as the last 8 octets */ ++ sha->mblock[56] = sha->mlength[7]; ++ sha->mblock[57] = sha->mlength[6]; ++ sha->mblock[58] = sha->mlength[5]; ++ sha->mblock[59] = sha->mlength[4]; ++ sha->mblock[60] = sha->mlength[3]; ++ sha->mblock[61] = sha->mlength[2]; ++ sha->mblock[62] = sha->mlength[1]; ++ sha->mblock[63] = sha->mlength[0]; + -+ /* Allow it to run jobs */ -+ kbasep_js_set_submit_allowed(js_devdata, kctx); ++ sha_processblock(sha); ++} + -+ kbase_js_runpool_inc_context_count(kbdev, kctx); ++static int sha_result(struct sha_t *sha) ++{ ++ if (sha->mcorrupted) ++ return false; ++ ++ if (sha->mcomputed == 0) { ++ sha_padmessage(sha); ++ sha->mcomputed = true; ++ } ++ return true; +} + -+bool kbase_backend_use_ctx_sched(struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++static void sha_input(struct sha_t *sha, const u8 *data, u32 size) +{ -+ int i; ++ int i = 0; ++ unsigned int j = 0; ++ int rc = true; + -+ if (kbdev->hwaccess.active_kctx == kctx) { -+ /* Context is already active */ -+ return true; ++ if (data == 0 || size == 0) ++ return; ++ ++ if (sha->mcomputed || sha->mcorrupted) { ++ sha->mcorrupted = true; ++ return; + } ++ while (size-- && !sha->mcorrupted) { ++ sha->mblock[sha->mindex++] = *data; + -+ for (i = 0; i < kbdev->nr_hw_address_spaces; i++) { -+ if (kbdev->as_to_kctx[i] == kctx) { -+ /* Context already has ASID - mark as active */ -+ return true; ++ for (i = 0; i < 8; i++) { ++ rc = true; ++ for (j = 0; j < sizeof(sha->mlength); j++) { ++ sha->mlength[j]++; ++ if (sha->mlength[j] != 0) { ++ rc = false; ++ break; ++ } ++ } ++ sha->mcorrupted = (sha->mcorrupted || ++ rc) ? true : false; + } ++ /* if corrupted then message is too long */ ++ if (sha->mindex == 64) ++ sha_processblock(sha); ++ data++; + } -+ -+ /* Context does not have address space assigned */ -+ return false; +} + -+void kbase_backend_release_ctx_irq(struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++static int hdcp_verify_ksv(const u8 *data, u32 size) +{ -+ int as_nr = kctx->as_nr; ++ u32 i = 0; ++ struct sha_t sha; + -+ if (as_nr == KBASEP_AS_NR_INVALID) { -+ WARN(1, "Attempting to release context without ASID\n"); -+ return; ++ if ((!data) || (size < (HEADER + SHAMAX))) ++ return false; ++ ++ sha_reset(&sha); ++ sha_input(&sha, data, size - SHAMAX); ++ if (sha_result(&sha) == false) ++ return false; ++ ++ for (i = 0; i < SHAMAX; i++) { ++ if (data[size - SHAMAX + i] != (u8)(sha.mdigest[i / 4] >> ((i % 4) * 8))) ++ return false; + } ++ return true; ++} + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++static void dw_hdcp_qp_hdcp_2nd_auth(struct dw_qp_hdcp *hdcp) ++{ ++ u8 *data; ++ u32 len; + -+ if (atomic_read(&kctx->refcount) != 1) { -+ WARN(1, "Attempting to release active ASID\n"); ++ len = (hdcp->read(hdcp->hdmi, HDCP14_STATUS0) & HDCP14_RPT_DEVICE_COUNT) >> 9; ++ len = len * KSV_LEN + BSTATUS_LEN + M0_LEN + SHAMAX; ++ ++ data = kmalloc(len, GFP_KERNEL); ++ if (!data) + return; -+ } + -+ kbasep_js_clear_submit_allowed(&kbdev->js_data, kctx); ++ hdcp->get_mem(hdcp->hdmi, data, len); + -+ kbase_ctx_sched_release_ctx(kctx); -+ kbase_js_runpool_dec_context_count(kbdev, kctx); ++ if (hdcp_verify_ksv(data, len)) ++ hdcp->write(hdcp->hdmi, HDCP14_SHA1_MSG_CORRECT_P, HDCP14_CONFIG1); ++ else ++ dw_hdcp_qp_hdcp_restart(hdcp); +} + -+void kbase_backend_release_ctx_noirq(struct kbase_device *kbdev, -+ struct kbase_context *kctx) ++static void dw_hdcp_qp_hdcp_auth(struct dw_qp_hdcp *hdcp, u32 hdcp_status) +{ ++ if (!(hdcp_status & BIT(2))) { ++ mutex_lock(&hdcp->mutex); ++ if (hdcp->status == DW_HDCP_DISABLED) { ++ mutex_unlock(&hdcp->mutex); ++ return; ++ } ++ dev_err(hdcp->dev, "hdcp auth failed\n"); ++ hdcp_modb(hdcp, 0, HDCP14_ENCRYPTION_ENABLE_MASK | HDCP14_HPD_MASK, ++ HDCP14_CONFIG0); ++ hdcp->status = DW_HDCP_AUTH_FAIL; ++ mutex_unlock(&hdcp->mutex); ++ ++ dw_hdcp_qp_hdcp_restart(hdcp); ++ } else { ++ mutex_lock(&hdcp->mutex); ++ dev_info(hdcp->dev, "hdcp auth success\n"); ++ hdcp->status = DW_HDCP_AUTH_SUCCESS; ++ mutex_unlock(&hdcp->mutex); ++ } +} + -+int kbase_backend_find_and_release_free_address_space( -+ struct kbase_device *kbdev, struct kbase_context *kctx) ++static void dw_hdcp_qp_hdcp_isr(struct dw_qp_hdcp *hdcp, u32 avp_int, u32 hdcp_status) +{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ unsigned long flags; -+ int i; ++ if (hdcp->status == DW_HDCP_DISABLED) ++ return; + -+ js_devdata = &kbdev->js_data; -+ js_kctx_info = &kctx->jctx.sched_info; ++ dev_info(hdcp->dev, "hdcp_int is 0x%02x\n", hdcp_status); + -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_lock(&js_devdata->runpool_mutex); ++ if (avp_int & HDCP14_KSV_LIST_DONE_MASK_N) ++ dw_hdcp_qp_hdcp_2nd_auth(hdcp); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ if (avp_int & HDCP14_AUTH_CHG_MASK_N) ++ dw_hdcp_qp_hdcp_auth(hdcp, hdcp_status); ++} + -+ for (i = 0; i < kbdev->nr_hw_address_spaces; i++) { -+ struct kbasep_js_kctx_info *as_js_kctx_info; -+ struct kbase_context *as_kctx; ++static ssize_t trytimes_show(struct device *device, ++ struct device_attribute *attr, char *buf) ++{ ++ int trytimes = 0; ++ struct dw_qp_hdcp *hdcp = dev_get_drvdata(device); + -+ as_kctx = kbdev->as_to_kctx[i]; -+ as_js_kctx_info = &as_kctx->jctx.sched_info; ++ if (hdcp) ++ trytimes = hdcp->retry_times; + -+ /* Don't release privileged or active contexts, or contexts with -+ * jobs running. -+ * Note that a context will have at least 1 reference (which -+ * was previously taken by kbasep_js_schedule_ctx()) until -+ * descheduled. -+ */ -+ if (as_kctx && !kbase_ctx_flag(as_kctx, KCTX_PRIVILEGED) && -+ atomic_read(&as_kctx->refcount) == 1) { -+ if (!kbasep_js_runpool_retain_ctx_nolock(kbdev, -+ as_kctx)) { -+ WARN(1, "Failed to retain active context\n"); ++ return snprintf(buf, PAGE_SIZE, "%d\n", trytimes); ++} + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, -+ flags); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++static ssize_t trytimes_store(struct device *device, ++ struct device_attribute *attr, ++ const char *buf, size_t count) ++{ ++ int trytimes; ++ struct dw_qp_hdcp *hdcp = dev_get_drvdata(device); + -+ return KBASEP_AS_NR_INVALID; -+ } ++ if (!hdcp) ++ return -EINVAL; + -+ kbasep_js_clear_submit_allowed(js_devdata, as_kctx); ++ if (kstrtoint(buf, 0, &trytimes)) ++ return -EINVAL; + -+ /* Drop and retake locks to take the jsctx_mutex on the -+ * context we're about to release without violating lock -+ * ordering -+ */ -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ if (hdcp->retry_times != trytimes) { ++ hdcp->retry_times = trytimes; ++ hdcp->remaining_times = hdcp->retry_times; ++ } + ++ return count; ++} + -+ /* Release context from address space */ -+ mutex_lock(&as_js_kctx_info->ctx.jsctx_mutex); -+ mutex_lock(&js_devdata->runpool_mutex); ++static DEVICE_ATTR_RW(trytimes); + -+ kbasep_js_runpool_release_ctx_nolock(kbdev, as_kctx); ++static ssize_t status_show(struct device *device, ++ struct device_attribute *attr, char *buf) ++{ ++ int status = DW_HDCP_DISABLED; ++ struct dw_qp_hdcp *hdcp = dev_get_drvdata(device); + -+ if (!kbase_ctx_flag(as_kctx, KCTX_SCHEDULED)) { -+ kbasep_js_runpool_requeue_or_kill_ctx(kbdev, -+ as_kctx, -+ true); ++ if (hdcp) ++ status = hdcp->status; + -+ mutex_unlock(&js_devdata->runpool_mutex); -+ mutex_unlock(&as_js_kctx_info->ctx.jsctx_mutex); ++ if (status == DW_HDCP_DISABLED) ++ return snprintf(buf, PAGE_SIZE, "hdcp disable\n"); ++ else if (status == DW_HDCP_AUTH_START) ++ return snprintf(buf, PAGE_SIZE, "hdcp_auth_start\n"); ++ else if (status == DW_HDCP_AUTH_SUCCESS) ++ return snprintf(buf, PAGE_SIZE, "hdcp_auth_success\n"); ++ else if (status == DW_HDCP_AUTH_FAIL) ++ return snprintf(buf, PAGE_SIZE, "hdcp_auth_fail\n"); ++ else ++ return snprintf(buf, PAGE_SIZE, "unknown status\n"); ++} + -+ return i; -+ } ++static DEVICE_ATTR_RO(status); + -+ /* Context was retained while locks were dropped, -+ * continue looking for free AS */ ++static struct attribute *dw_hdmi_qp_hdcp_attrs[] = { ++ &dev_attr_trytimes.attr, ++ &dev_attr_status.attr, ++ NULL ++}; ++ATTRIBUTE_GROUPS(dw_hdmi_qp_hdcp); + -+ mutex_unlock(&js_devdata->runpool_mutex); -+ mutex_unlock(&as_js_kctx_info->ctx.jsctx_mutex); ++/* If sink is a repeater, we need to wait ksv list ready */ ++static void dw_hdmi_qp_hdcp(struct work_struct *p_work) ++{ ++ struct dw_qp_hdcp *hdcp = container_of(p_work, struct dw_qp_hdcp, work); ++ u32 val; ++ int i = 500; + -+ mutex_lock(&js_kctx_info->ctx.jsctx_mutex); -+ mutex_lock(&js_devdata->runpool_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ while (i--) { ++ usleep_range(7000, 8000); ++ ++ mutex_lock(&hdcp->mutex); ++ if (hdcp->status == DW_HDCP_DISABLED) { ++ dev_dbg(hdcp->dev, "hdcp is disabled, don't wait repeater ready\n"); ++ mutex_unlock(&hdcp->mutex); ++ return; + } -+ } + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ val = hdcp->read(hdcp->hdmi, HDCP14_STATUS1); + -+ mutex_unlock(&js_devdata->runpool_mutex); -+ mutex_unlock(&js_kctx_info->ctx.jsctx_mutex); ++ /* sink isn't repeater or ksv fifo ready, stop waiting */ ++ if (!(val & HDCP14_RCV_REPEATER) || (val & HDCP14_RCV_KSV_FIFO_READY)) { ++ dev_dbg(hdcp->dev, "wait ksv fifo finished\n"); ++ mutex_unlock(&hdcp->mutex); ++ return; ++ } + -+ return KBASEP_AS_NR_INVALID; ++ mutex_unlock(&hdcp->mutex); ++ } ++ ++ if (i < 0) { ++ dev_err(hdcp->dev, "wait repeater ready time out\n"); ++ dw_hdcp_qp_hdcp_restart(hdcp); ++ } +} + -+bool kbase_backend_use_ctx(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int as_nr) ++static int dw_hdcp_qp_hdcp_probe(struct platform_device *pdev) +{ -+ struct kbasep_js_device_data *js_devdata; -+ struct kbasep_js_kctx_info *js_kctx_info; -+ struct kbase_as *new_address_space = NULL; ++ int ret = 0; ++ struct dw_qp_hdcp *hdcp = pdev->dev.platform_data; + -+ js_devdata = &kbdev->js_data; -+ js_kctx_info = &kctx->jctx.sched_info; ++ /* retry time if hdcp auth fail. unlimited time if set 0 */ ++ hdcp->dev = &pdev->dev; ++ hdcp->hdcp_start = dw_hdcp_qp_hdcp_start; ++ hdcp->hdcp_stop = dw_hdcp_qp_hdcp_stop; ++ hdcp->hdcp_isr = dw_hdcp_qp_hdcp_isr; + -+ if (kbdev->hwaccess.active_kctx == kctx) { -+ WARN(1, "Context is already scheduled in\n"); -+ return false; ++ ret = device_add_groups(hdcp->dev, dw_hdmi_qp_hdcp_groups); ++ if (ret) { ++ dev_err(hdcp->dev, "Failed to add sysfs files group\n"); ++ return ret; + } + -+ new_address_space = &kbdev->as[as_nr]; -+ -+ lockdep_assert_held(&js_devdata->runpool_mutex); -+ lockdep_assert_held(&kbdev->mmu_hw_mutex); -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ platform_set_drvdata(pdev, hdcp); + -+ assign_and_activate_kctx_addr_space(kbdev, kctx, new_address_space); ++ hdcp->workqueue = create_workqueue("hdcp_queue"); ++ INIT_WORK(&hdcp->work, dw_hdmi_qp_hdcp); + -+ if (kbase_ctx_flag(kctx, KCTX_PRIVILEGED)) { -+ /* We need to retain it to keep the corresponding address space -+ */ -+ kbasep_js_runpool_retain_ctx_nolock(kbdev, kctx); -+ } ++ hdcp->retry_times = 3; ++ mutex_init(&hdcp->mutex); + -+ return true; ++ dev_info(hdcp->dev, "%s success\n", __func__); ++ return 0; +} + -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h -new file mode 100755 -index 000000000000..08a7400e66d5 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h -@@ -0,0 +1,123 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++static int dw_hdcp_qp_hdcp_remove(struct platform_device *pdev) ++{ ++ struct dw_qp_hdcp *hdcp = pdev->dev.platform_data; + ++ cancel_work_sync(&hdcp->work); ++ flush_workqueue(hdcp->workqueue); ++ destroy_workqueue(hdcp->workqueue); + ++ device_remove_groups(hdcp->dev, dw_hdmi_qp_hdcp_groups); ++ kfree(hdcp->keys); ++ kfree(hdcp->seeds); ++ ++ return 0; ++} + ++static struct platform_driver dw_hdcp_qp_hdcp_driver = { ++ .probe = dw_hdcp_qp_hdcp_probe, ++ .remove = dw_hdcp_qp_hdcp_remove, ++ .driver = { ++ .name = DW_HDCP_QP_DRIVER_NAME, ++ }, ++}; + ++module_platform_driver(dw_hdcp_qp_hdcp_driver); ++MODULE_DESCRIPTION("DW HDMI QP transmitter HDCP driver"); ++MODULE_LICENSE("GPL"); +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.h +new file mode 100644 +index 000000000..48c3a4843 +--- /dev/null ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.h +@@ -0,0 +1,55 @@ ++/* SPDX-License-Identifier: GPL-2.0+ */ +/* -+ * Register-based HW access backend specific definitions ++ * Copyright (C) Rockchip Electronics Co.Ltd ++ * Author: ++ * Algea Cao + */ ++#ifndef DW_HDMI_QP_HDCP_H ++#define DW_HDMI_QP_HDCP_H + -+#ifndef _KBASE_HWACCESS_GPU_DEFS_H_ -+#define _KBASE_HWACCESS_GPU_DEFS_H_ ++#include + -+/* SLOT_RB_SIZE must be < 256 */ -+#define SLOT_RB_SIZE 2 -+#define SLOT_RB_MASK (SLOT_RB_SIZE - 1) ++#define DW_HDCP_QP_DRIVER_NAME "dw-hdmi-qp-hdcp" ++#define PRIVATE_KEY_SIZE 280 ++#define KEY_SHA_SIZE 20 + -+/** -+ * struct rb_entry - Ringbuffer entry -+ * @katom: Atom associated with this entry -+ */ -+struct rb_entry { -+ struct kbase_jd_atom *katom; ++#define KSV_LEN 5 ++#define BSTATUS_LEN 2 ++#define M0_LEN 8 ++#define SHAMAX 20 ++ ++struct dw_hdmi_qp_hdcp_keys { ++ u8 KSV[8]; ++ u8 devicekey[PRIVATE_KEY_SIZE]; ++ u8 sha1[KEY_SHA_SIZE]; +}; + -+/** -+ * struct slot_rb - Slot ringbuffer -+ * @entries: Ringbuffer entries -+ * @last_context: The last context to submit a job on this slot -+ * @read_idx: Current read index of buffer -+ * @write_idx: Current write index of buffer -+ * @job_chain_flag: Flag used to implement jobchain disambiguation -+ */ -+struct slot_rb { -+ struct rb_entry entries[SLOT_RB_SIZE]; ++struct dw_qp_hdcp { ++ int retry_times; ++ int remaining_times; ++ char *seeds; ++ int invalidkey; ++ char *invalidkeys; ++ int hdcp2_enable; ++ int status; ++ u32 reg_io_width; + -+ struct kbase_context *last_context; ++ struct dw_hdmi_qp_hdcp_keys *keys; ++ struct device *dev; ++ struct dw_hdmi_qp *hdmi; ++ void __iomem *regs; + -+ u8 read_idx; -+ u8 write_idx; ++ struct mutex mutex; + -+ u8 job_chain_flag; ++ struct work_struct work; ++ struct workqueue_struct *workqueue; ++ ++ void (*write)(struct dw_hdmi_qp *hdmi, u32 val, int offset); ++ u32 (*read)(struct dw_hdmi_qp *hdmi, int offset); ++ void (*get_mem)(struct dw_hdmi_qp *hdmi, u8 *data, u32 len); ++ int (*hdcp_start)(struct dw_qp_hdcp *hdcp); ++ int (*hdcp_stop)(struct dw_qp_hdcp *hdcp); ++ void (*hdcp_isr)(struct dw_qp_hdcp *hdcp, u32 avp_int, u32 hdcp_status); +}; + -+/** -+ * struct kbase_backend_data - GPU backend specific data for HW access layer -+ * @slot_rb: Slot ringbuffers -+ * @rmu_workaround_flag: When PRLAM-8987 is present, this flag determines -+ * whether slots 0/1 or slot 2 are currently being -+ * pulled from -+ * @scheduling_timer: The timer tick used for rescheduling jobs -+ * @timer_running: Is the timer running? The runpool_mutex must be -+ * held whilst modifying this. -+ * @suspend_timer: Is the timer suspended? Set when a suspend -+ * occurs and cleared on resume. The runpool_mutex -+ * must be held whilst modifying this. -+ * @reset_gpu: Set to a KBASE_RESET_xxx value (see comments) -+ * @reset_workq: Work queue for performing the reset -+ * @reset_work: Work item for performing the reset -+ * @reset_wait: Wait event signalled when the reset is complete -+ * @reset_timer: Timeout for soft-stops before the reset -+ * @timeouts_updated: Have timeout values just been updated? ++#endif +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c +new file mode 100755 +index 000000000..5ece777c1 +--- /dev/null ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c +@@ -0,0 +1,188 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * dw-hdmi-qp-i2s-audio.c + * -+ * The hwaccess_lock (a spinlock) must be held when accessing this structure ++ * Copyright (c) 2021 Rockchip Electronics Co. Ltd. ++ * Author: Sugar Zhang + */ -+struct kbase_backend_data { -+ struct slot_rb slot_rb[BASE_JM_MAX_NR_SLOTS]; + -+ bool rmu_workaround_flag; ++#include ++#include + -+ struct hrtimer scheduling_timer; ++#include ++#include + -+ bool timer_running; -+ bool suspend_timer; ++#include + -+ atomic_t reset_gpu; ++#include "dw-hdmi-qp.h" ++#include "dw-hdmi-qp-audio.h" + -+/* The GPU reset isn't pending */ -+#define KBASE_RESET_GPU_NOT_PENDING 0 -+/* kbase_prepare_to_reset_gpu has been called */ -+#define KBASE_RESET_GPU_PREPARED 1 -+/* kbase_reset_gpu has been called - the reset will now definitely happen -+ * within the timeout period */ -+#define KBASE_RESET_GPU_COMMITTED 2 -+/* The GPU reset process is currently occuring (timeout has expired or -+ * kbasep_try_reset_gpu_early was called) */ -+#define KBASE_RESET_GPU_HAPPENING 3 -+/* Reset the GPU silently, used when resetting the GPU as part of normal -+ * behavior (e.g. when exiting protected mode). */ -+#define KBASE_RESET_GPU_SILENT 4 -+ struct workqueue_struct *reset_workq; -+ struct work_struct reset_work; -+ wait_queue_head_t reset_wait; -+ struct hrtimer reset_timer; ++#define DRIVER_NAME "dw-hdmi-qp-i2s-audio" + -+ bool timeouts_updated; -+}; ++static inline void hdmi_write(struct dw_hdmi_qp_i2s_audio_data *audio, ++ u32 val, int offset) ++{ ++ struct dw_hdmi_qp *hdmi = audio->hdmi; + -+/** -+ * struct kbase_jd_atom_backend - GPU backend specific katom data -+ */ -+struct kbase_jd_atom_backend { -+}; ++ audio->write(hdmi, val, offset); ++} + -+/** -+ * struct kbase_context_backend - GPU backend specific context data -+ */ -+struct kbase_context_backend { -+}; ++static inline u32 hdmi_read(struct dw_hdmi_qp_i2s_audio_data *audio, int offset) ++{ ++ struct dw_hdmi_qp *hdmi = audio->hdmi; + -+#endif /* _KBASE_HWACCESS_GPU_DEFS_H_ */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c -new file mode 100755 -index 000000000000..a6fb097b94f9 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c -@@ -0,0 +1,1518 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ return audio->read(hdmi, offset); ++} + ++static inline void hdmi_mod(struct dw_hdmi_qp_i2s_audio_data *audio, ++ u32 data, u32 mask, u32 reg) ++{ ++ struct dw_hdmi_qp *hdmi = audio->hdmi; + ++ return audio->mod(hdmi, data, mask, reg); ++} + -+/* -+ * Base kernel job manager APIs -+ */ ++static int dw_hdmi_qp_i2s_hw_params(struct device *dev, void *data, ++ struct hdmi_codec_daifmt *fmt, ++ struct hdmi_codec_params *hparms) ++{ ++ struct dw_hdmi_qp_i2s_audio_data *audio = data; ++ struct dw_hdmi_qp *hdmi = audio->hdmi; ++ bool ref2stream = false; + -+#include -+#include -+#include -+#if defined(CONFIG_MALI_GATOR_SUPPORT) -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++ if (fmt->bit_clk_master | fmt->frame_clk_master) { ++ dev_err(dev, "unsupported clock settings\n"); ++ return -EINVAL; ++ } + -+#define beenthere(kctx, f, a...) \ -+ dev_dbg(kctx->kbdev->dev, "%s:" f, __func__, ##a) ++ if (fmt->bit_fmt == SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE) ++ ref2stream = true; + -+#if KBASE_GPU_RESET_EN -+static void kbasep_try_reset_gpu_early(struct kbase_device *kbdev); -+static void kbasep_reset_timeout_worker(struct work_struct *data); -+static enum hrtimer_restart kbasep_reset_timer_callback(struct hrtimer *timer); -+#endif /* KBASE_GPU_RESET_EN */ ++ dw_hdmi_qp_set_audio_interface(hdmi, fmt, hparms); ++ dw_hdmi_qp_set_sample_rate(hdmi, hparms->sample_rate); ++ dw_hdmi_qp_set_channel_status(hdmi, hparms->iec.status, ref2stream); ++ dw_hdmi_qp_set_channel_count(hdmi, hparms->channels); ++ dw_hdmi_qp_set_channel_allocation(hdmi, hparms->cea.channel_allocation); ++ dw_hdmi_qp_set_audio_infoframe(hdmi, hparms); + -+static inline int kbasep_jm_is_js_free(struct kbase_device *kbdev, int js, -+ struct kbase_context *kctx) -+{ -+ return !kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_COMMAND_NEXT), kctx); ++ return 0; +} + -+void kbase_job_hw_submit(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, -+ int js) ++static int dw_hdmi_qp_i2s_audio_startup(struct device *dev, void *data) +{ -+ struct kbase_context *kctx; -+ u32 cfg; -+ u64 jc_head = katom->jc; -+ -+ KBASE_DEBUG_ASSERT(kbdev); -+ KBASE_DEBUG_ASSERT(katom); ++ struct dw_hdmi_qp_i2s_audio_data *audio = data; ++ struct dw_hdmi_qp *hdmi = audio->hdmi; + -+ kctx = katom->kctx; ++ dw_hdmi_qp_audio_enable(hdmi); + -+ /* Command register must be available */ -+ KBASE_DEBUG_ASSERT(kbasep_jm_is_js_free(kbdev, js, kctx)); -+ /* Affinity is not violating */ -+ kbase_js_debug_log_current_affinities(kbdev); -+ KBASE_DEBUG_ASSERT(!kbase_js_affinity_would_violate(kbdev, js, -+ katom->affinity)); ++ return 0; ++} + -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_LO), -+ jc_head & 0xFFFFFFFF, kctx); -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_HI), -+ jc_head >> 32, kctx); ++static void dw_hdmi_qp_i2s_audio_shutdown(struct device *dev, void *data) ++{ ++ struct dw_hdmi_qp_i2s_audio_data *audio = data; ++ struct dw_hdmi_qp *hdmi = audio->hdmi; + -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_AFFINITY_NEXT_LO), -+ katom->affinity & 0xFFFFFFFF, kctx); -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_AFFINITY_NEXT_HI), -+ katom->affinity >> 32, kctx); ++ dw_hdmi_qp_audio_disable(hdmi); ++} + -+ /* start MMU, medium priority, cache clean/flush on end, clean/flush on -+ * start */ -+ cfg = kctx->as_nr; ++static int dw_hdmi_qp_i2s_get_eld(struct device *dev, void *data, uint8_t *buf, ++ size_t len) ++{ ++ struct dw_hdmi_qp_i2s_audio_data *audio = data; + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_FLUSH_REDUCTION)) -+ cfg |= JS_CONFIG_ENABLE_FLUSH_REDUCTION; ++ memcpy(buf, audio->eld, min_t(size_t, MAX_ELD_BYTES, len)); + -+#ifndef CONFIG_MALI_COH_GPU -+ if (0 != (katom->core_req & BASE_JD_REQ_SKIP_CACHE_START)) -+ cfg |= JS_CONFIG_START_FLUSH_NO_ACTION; -+ else -+ cfg |= JS_CONFIG_START_FLUSH_CLEAN_INVALIDATE; ++ return 0; ++} + -+ if (0 != (katom->core_req & BASE_JD_REQ_SKIP_CACHE_END)) -+ cfg |= JS_CONFIG_END_FLUSH_NO_ACTION; -+ else -+ cfg |= JS_CONFIG_END_FLUSH_CLEAN_INVALIDATE; -+#endif /* CONFIG_MALI_COH_GPU */ ++static int dw_hdmi_qp_i2s_get_dai_id(struct snd_soc_component *component, ++ struct device_node *endpoint) ++{ ++ struct of_endpoint of_ep; ++ int ret; + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10649)) -+ cfg |= JS_CONFIG_START_MMU; ++ ret = of_graph_parse_endpoint(endpoint, &of_ep); ++ if (ret < 0) ++ return ret; + -+ cfg |= JS_CONFIG_THREAD_PRI(8); ++ /* ++ * HDMI sound should be located as reg = <2> ++ * Then, it is sound port 0 ++ */ ++ if (of_ep.port == 2) ++ return 0; + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_MODE) && -+ (katom->atom_flags & KBASE_KATOM_FLAG_PROTECTED)) -+ cfg |= JS_CONFIG_DISABLE_DESCRIPTOR_WR_BK; ++ return -EINVAL; ++} + -+ if (kbase_hw_has_feature(kbdev, -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION)) { -+ if (!kbdev->hwaccess.backend.slot_rb[js].job_chain_flag) { -+ cfg |= JS_CONFIG_JOB_CHAIN_FLAG; -+ katom->atom_flags |= KBASE_KATOM_FLAGS_JOBCHAIN; -+ kbdev->hwaccess.backend.slot_rb[js].job_chain_flag = -+ true; -+ } else { -+ katom->atom_flags &= ~KBASE_KATOM_FLAGS_JOBCHAIN; -+ kbdev->hwaccess.backend.slot_rb[js].job_chain_flag = -+ false; -+ } -+ } ++static int dw_hdmi_qp_i2s_hook_plugged_cb(struct device *dev, void *data, ++ hdmi_codec_plugged_cb fn, ++ struct device *codec_dev) ++{ ++ struct dw_hdmi_qp_i2s_audio_data *audio = data; ++ struct dw_hdmi_qp *hdmi = audio->hdmi; + -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_CONFIG_NEXT), cfg, kctx); ++ return dw_hdmi_qp_set_plugged_cb(hdmi, fn, codec_dev); ++} + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_FLUSH_REDUCTION)) -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_FLUSH_ID_NEXT), -+ katom->flush_id, kctx); ++static struct hdmi_codec_ops dw_hdmi_qp_i2s_ops = { ++ .hw_params = dw_hdmi_qp_i2s_hw_params, ++ .audio_startup = dw_hdmi_qp_i2s_audio_startup, ++ .audio_shutdown = dw_hdmi_qp_i2s_audio_shutdown, ++ .get_eld = dw_hdmi_qp_i2s_get_eld, ++ .get_dai_id = dw_hdmi_qp_i2s_get_dai_id, ++ .hook_plugged_cb = dw_hdmi_qp_i2s_hook_plugged_cb, ++}; + -+ /* Write an approximate start timestamp. -+ * It's approximate because there might be a job in the HEAD register. -+ */ -+ katom->start_timestamp = ktime_get(); ++static int snd_dw_hdmi_qp_probe(struct platform_device *pdev) ++{ ++ struct dw_hdmi_qp_i2s_audio_data *audio = pdev->dev.platform_data; ++ struct platform_device_info pdevinfo; ++ struct hdmi_codec_pdata pdata; ++ struct platform_device *platform; + -+ /* GO ! */ -+ dev_dbg(kbdev->dev, "JS: Submitting atom %p from ctx %p to js[%d] with head=0x%llx, affinity=0x%llx", -+ katom, kctx, js, jc_head, katom->affinity); ++ pdata.ops = &dw_hdmi_qp_i2s_ops; ++ pdata.i2s = 1; ++ pdata.max_i2s_channels = 8; ++ pdata.data = audio; + -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, JM_SUBMIT, kctx, katom, jc_head, js, -+ (u32) katom->affinity); ++ memset(&pdevinfo, 0, sizeof(pdevinfo)); ++ pdevinfo.parent = pdev->dev.parent; ++ pdevinfo.id = PLATFORM_DEVID_AUTO; ++ pdevinfo.name = HDMI_CODEC_DRV_NAME; ++ pdevinfo.data = &pdata; ++ pdevinfo.size_data = sizeof(pdata); ++ pdevinfo.dma_mask = DMA_BIT_MASK(32); + -+#if defined(CONFIG_MALI_GATOR_SUPPORT) -+ kbase_trace_mali_job_slots_event( -+ GATOR_MAKE_EVENT(GATOR_JOB_SLOT_START, js), -+ kctx, kbase_jd_atom_id(kctx, katom)); -+#endif -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_CONFIG(katom, jc_head, -+ katom->affinity, cfg); -+ KBASE_TLSTREAM_TL_RET_CTX_LPU( -+ kctx, -+ &kbdev->gpu_props.props.raw_props.js_features[ -+ katom->slot_nr]); -+ KBASE_TLSTREAM_TL_RET_ATOM_AS(katom, &kbdev->as[kctx->as_nr]); -+ KBASE_TLSTREAM_TL_RET_ATOM_LPU( -+ katom, -+ &kbdev->gpu_props.props.raw_props.js_features[js], -+ "ctx_nr,atom_nr"); -+#ifdef CONFIG_GPU_TRACEPOINTS -+ if (!kbase_backend_nr_atoms_submitted(kbdev, js)) { -+ /* If this is the only job on the slot, trace it as starting */ -+ char js_string[16]; ++ platform = platform_device_register_full(&pdevinfo); ++ if (IS_ERR(platform)) ++ return PTR_ERR(platform); + -+ trace_gpu_sched_switch( -+ kbasep_make_job_slot_string(js, js_string, -+ sizeof(js_string)), -+ ktime_to_ns(katom->start_timestamp), -+ (u32)katom->kctx->id, 0, katom->work_id); -+ kbdev->hwaccess.backend.slot_rb[js].last_context = katom->kctx; -+ } -+#endif -+ kbase_timeline_job_slot_submit(kbdev, kctx, katom, js); ++ dev_set_drvdata(&pdev->dev, platform); + -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_COMMAND_NEXT), -+ JS_COMMAND_START, katom->kctx); ++ return 0; +} + -+/** -+ * kbasep_job_slot_update_head_start_timestamp - Update timestamp -+ * @kbdev: kbase device -+ * @js: job slot -+ * @end_timestamp: timestamp -+ * -+ * Update the start_timestamp of the job currently in the HEAD, based on the -+ * fact that we got an IRQ for the previous set of completed jobs. -+ * -+ * The estimate also takes into account the time the job was submitted, to -+ * work out the best estimate (which might still result in an over-estimate to -+ * the calculated time spent) -+ */ -+static void kbasep_job_slot_update_head_start_timestamp( -+ struct kbase_device *kbdev, -+ int js, -+ ktime_t end_timestamp) ++static int snd_dw_hdmi_qp_remove(struct platform_device *pdev) +{ -+ if (kbase_backend_nr_atoms_on_slot(kbdev, js) > 0) { -+ struct kbase_jd_atom *katom; -+ ktime_t timestamp_diff; -+ /* The atom in the HEAD */ -+ katom = kbase_gpu_inspect(kbdev, js, 0); ++ struct platform_device *platform = dev_get_drvdata(&pdev->dev); + -+ KBASE_DEBUG_ASSERT(katom != NULL); ++ platform_device_unregister(platform); + -+ timestamp_diff = ktime_sub(end_timestamp, -+ katom->start_timestamp); -+ if (ktime_to_ns(timestamp_diff) >= 0) { -+ /* Only update the timestamp if it's a better estimate -+ * than what's currently stored. This is because our -+ * estimate that accounts for the throttle time may be -+ * too much of an overestimate */ -+ katom->start_timestamp = end_timestamp; -+ } -+ } ++ return 0; +} + -+/** -+ * kbasep_trace_tl_event_lpu_softstop - Call event_lpu_softstop timeline -+ * tracepoint -+ * @kbdev: kbase device -+ * @js: job slot -+ * -+ * Make a tracepoint call to the instrumentation module informing that -+ * softstop happened on given lpu (job slot). ++static struct platform_driver snd_dw_hdmi_qp_driver = { ++ .probe = snd_dw_hdmi_qp_probe, ++ .remove = snd_dw_hdmi_qp_remove, ++ .driver = { ++ .name = DRIVER_NAME, ++ }, ++}; ++module_platform_driver(snd_dw_hdmi_qp_driver); ++ ++MODULE_AUTHOR("Sugar Zhang "); ++MODULE_DESCRIPTION("Synopsis Designware HDMI QP I2S ALSA SoC interface"); ++MODULE_LICENSE("GPL v2"); ++MODULE_ALIAS("platform:" DRIVER_NAME); +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +new file mode 100755 +index 000000000..ee2918156 +--- /dev/null ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +@@ -0,0 +1,4109 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) Rockchip Electronics Co.Ltd ++ * Author: ++ * Algea Cao + */ -+static void kbasep_trace_tl_event_lpu_softstop(struct kbase_device *kbdev, -+ int js) -+{ -+ KBASE_TLSTREAM_TL_EVENT_LPU_SOFTSTOP( -+ &kbdev->gpu_props.props.raw_props.js_features[js]); -+} ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+void kbase_job_done(struct kbase_device *kbdev, u32 done) -+{ -+ unsigned long flags; -+ int i; -+ u32 count = 0; -+ ktime_t end_timestamp = ktime_get(); -+ struct kbasep_js_device_data *js_devdata; ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+ KBASE_DEBUG_ASSERT(kbdev); -+ js_devdata = &kbdev->js_data; ++#include ++#include + -+ KBASE_TRACE_ADD(kbdev, JM_IRQ, NULL, NULL, 0, done); ++#include "dw-hdmi-qp-audio.h" ++#include "dw-hdmi-qp.h" ++#include "dw-hdmi-qp-cec.h" ++#include "dw-hdmi-qp-hdcp.h" + -+ memset(&kbdev->slot_submit_count_irq[0], 0, -+ sizeof(kbdev->slot_submit_count_irq)); ++#include + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++#define DDC_CI_ADDR 0x37 ++#define DDC_SEGMENT_ADDR 0x30 + -+ while (done) { -+ u32 failed = done >> 16; ++#define HDMI_EDID_LEN 512 + -+ /* treat failed slots as finished slots */ -+ u32 finished = (done & 0xFFFF) | failed; ++/* DW-HDMI Controller >= 0x200a are at least compliant with SCDC version 1 */ ++#define SCDC_MIN_SOURCE_VERSION 0x1 + -+ /* Note: This is inherently unfair, as we always check -+ * for lower numbered interrupts before the higher -+ * numbered ones.*/ -+ i = ffs(finished) - 1; -+ KBASE_DEBUG_ASSERT(i >= 0); ++#define HDMI14_MAX_TMDSCLK 340000000 ++#define HDMI20_MAX_TMDSCLK_KHZ 600000 + -+ do { -+ int nr_done; -+ u32 active; -+ u32 completion_code = BASE_JD_EVENT_DONE;/* assume OK */ -+ u64 job_tail = 0; ++#define HDMI_VH0 0x20 ++#define HDMI_HDCP_ADDR 0x3a ++#define HDMI_BCAPS 0x40 ++#define HDMI_HDCP14_SUPPORT BIT(7) ++#define HDMI_HDCP2_VERSION 0x50 ++#define HDMI_HDCP2_SUPPORT BIT(2) + -+ if (failed & (1u << i)) { -+ /* read out the job slot status code if the job -+ * slot reported failure */ -+ completion_code = kbase_reg_read(kbdev, -+ JOB_SLOT_REG(i, JS_STATUS), NULL); ++#define SINK_CAP_HDCP14 BIT(0) ++#define SINK_CAP_HDCP2 BIT(1) + -+ switch (completion_code) { -+ case BASE_JD_EVENT_STOPPED: -+#if defined(CONFIG_MALI_GATOR_SUPPORT) -+ kbase_trace_mali_job_slots_event( -+ GATOR_MAKE_EVENT( -+ GATOR_JOB_SLOT_SOFT_STOPPED, i), -+ NULL, 0); -+#endif ++#define HDMI_HDCP2_AUTH BIT(1) ++#define HDMI_HDCP14_AUTH BIT(0) + -+ kbasep_trace_tl_event_lpu_softstop( -+ kbdev, i); ++static const unsigned int dw_hdmi_cable[] = { ++ EXTCON_DISP_HDMI, ++ EXTCON_NONE, ++}; + -+ /* Soft-stopped job - read the value of -+ * JS_TAIL so that the job chain can -+ * be resumed */ -+ job_tail = (u64)kbase_reg_read(kbdev, -+ JOB_SLOT_REG(i, JS_TAIL_LO), -+ NULL) | -+ ((u64)kbase_reg_read(kbdev, -+ JOB_SLOT_REG(i, JS_TAIL_HI), -+ NULL) << 32); -+ break; -+ case BASE_JD_EVENT_NOT_STARTED: -+ /* PRLAM-10673 can cause a TERMINATED -+ * job to come back as NOT_STARTED, but -+ * the error interrupt helps us detect -+ * it */ -+ completion_code = -+ BASE_JD_EVENT_TERMINATED; -+ /* fall through */ -+ default: -+ dev_warn(kbdev->dev, "error detected from slot %d, job status 0x%08x (%s)", -+ i, completion_code, -+ kbase_exception_name -+ (kbdev, -+ completion_code)); -+ } ++/* ++ * Recommended N and Expected CTS Values in FRL Mode in chapter 9.2.2 ++ * of HDMI Specification 2.1. ++ */ ++static const struct dw_hdmi_audio_frl_n common_frl_n_table[] = { ++ { .r_bit = 3, .n_32k = 4224, .n_44k1 = 5292, .n_48k = 5760, }, ++ { .r_bit = 6, .n_32k = 4032, .n_44k1 = 5292, .n_48k = 6048, }, ++ { .r_bit = 8, .n_32k = 4032, .n_44k1 = 3969, .n_48k = 6048, }, ++ { .r_bit = 10, .n_32k = 3456, .n_44k1 = 3969, .n_48k = 5184, }, ++ { .r_bit = 12, .n_32k = 3072, .n_44k1 = 3969, .n_48k = 4752, }, ++}; + -+ kbase_gpu_irq_evict(kbdev, i); -+ } ++/* ++ * Unless otherwise noted, entries in this table are 100% optimization. ++ * Values can be obtained from hdmi_compute_n() but that function is ++ * slow so we pre-compute values we expect to see. ++ * ++ * All 32k and 48k values are expected to be the same (due to the way ++ * the math works) for any rate that's an exact kHz. ++ */ ++static const struct dw_hdmi_audio_tmds_n common_tmds_n_table[] = { ++ { .tmds = 25175000, .n_32k = 4096, .n_44k1 = 12854, .n_48k = 6144, }, ++ { .tmds = 25200000, .n_32k = 4096, .n_44k1 = 5656, .n_48k = 6144, }, ++ { .tmds = 27000000, .n_32k = 4096, .n_44k1 = 5488, .n_48k = 6144, }, ++ { .tmds = 28320000, .n_32k = 4096, .n_44k1 = 5586, .n_48k = 6144, }, ++ { .tmds = 30240000, .n_32k = 4096, .n_44k1 = 5642, .n_48k = 6144, }, ++ { .tmds = 31500000, .n_32k = 4096, .n_44k1 = 5600, .n_48k = 6144, }, ++ { .tmds = 32000000, .n_32k = 4096, .n_44k1 = 5733, .n_48k = 6144, }, ++ { .tmds = 33750000, .n_32k = 4096, .n_44k1 = 6272, .n_48k = 6144, }, ++ { .tmds = 36000000, .n_32k = 4096, .n_44k1 = 5684, .n_48k = 6144, }, ++ { .tmds = 40000000, .n_32k = 4096, .n_44k1 = 5733, .n_48k = 6144, }, ++ { .tmds = 49500000, .n_32k = 4096, .n_44k1 = 5488, .n_48k = 6144, }, ++ { .tmds = 50000000, .n_32k = 4096, .n_44k1 = 5292, .n_48k = 6144, }, ++ { .tmds = 54000000, .n_32k = 4096, .n_44k1 = 5684, .n_48k = 6144, }, ++ { .tmds = 65000000, .n_32k = 4096, .n_44k1 = 7056, .n_48k = 6144, }, ++ { .tmds = 68250000, .n_32k = 4096, .n_44k1 = 5376, .n_48k = 6144, }, ++ { .tmds = 71000000, .n_32k = 4096, .n_44k1 = 7056, .n_48k = 6144, }, ++ { .tmds = 72000000, .n_32k = 4096, .n_44k1 = 5635, .n_48k = 6144, }, ++ { .tmds = 73250000, .n_32k = 4096, .n_44k1 = 14112, .n_48k = 6144, }, ++ { .tmds = 74250000, .n_32k = 4096, .n_44k1 = 6272, .n_48k = 6144, }, ++ { .tmds = 75000000, .n_32k = 4096, .n_44k1 = 5880, .n_48k = 6144, }, ++ { .tmds = 78750000, .n_32k = 4096, .n_44k1 = 5600, .n_48k = 6144, }, ++ { .tmds = 78800000, .n_32k = 4096, .n_44k1 = 5292, .n_48k = 6144, }, ++ { .tmds = 79500000, .n_32k = 4096, .n_44k1 = 4704, .n_48k = 6144, }, ++ { .tmds = 83500000, .n_32k = 4096, .n_44k1 = 7056, .n_48k = 6144, }, ++ { .tmds = 85500000, .n_32k = 4096, .n_44k1 = 5488, .n_48k = 6144, }, ++ { .tmds = 88750000, .n_32k = 4096, .n_44k1 = 14112, .n_48k = 6144, }, ++ { .tmds = 97750000, .n_32k = 4096, .n_44k1 = 14112, .n_48k = 6144, }, ++ { .tmds = 101000000, .n_32k = 4096, .n_44k1 = 7056, .n_48k = 6144, }, ++ { .tmds = 106500000, .n_32k = 4096, .n_44k1 = 4704, .n_48k = 6144, }, ++ { .tmds = 108000000, .n_32k = 4096, .n_44k1 = 5684, .n_48k = 6144, }, ++ { .tmds = 115500000, .n_32k = 4096, .n_44k1 = 5712, .n_48k = 6144, }, ++ { .tmds = 119000000, .n_32k = 4096, .n_44k1 = 5544, .n_48k = 6144, }, ++ { .tmds = 135000000, .n_32k = 4096, .n_44k1 = 5488, .n_48k = 6144, }, ++ { .tmds = 146250000, .n_32k = 4096, .n_44k1 = 6272, .n_48k = 6144, }, ++ { .tmds = 148500000, .n_32k = 4096, .n_44k1 = 5488, .n_48k = 6144, }, ++ { .tmds = 154000000, .n_32k = 4096, .n_44k1 = 5544, .n_48k = 6144, }, ++ { .tmds = 162000000, .n_32k = 4096, .n_44k1 = 5684, .n_48k = 6144, }, + -+ kbase_reg_write(kbdev, JOB_CONTROL_REG(JOB_IRQ_CLEAR), -+ done & ((1 << i) | (1 << (i + 16))), -+ NULL); -+ active = kbase_reg_read(kbdev, -+ JOB_CONTROL_REG(JOB_IRQ_JS_STATE), -+ NULL); ++ /* For 297 MHz+ HDMI spec have some other rule for setting N */ ++ { .tmds = 297000000, .n_32k = 3073, .n_44k1 = 4704, .n_48k = 5120, }, ++ { .tmds = 594000000, .n_32k = 3073, .n_44k1 = 9408, .n_48k = 10240, }, + -+ if (((active >> i) & 1) == 0 && -+ (((done >> (i + 16)) & 1) == 0)) { -+ /* There is a potential race we must work -+ * around: -+ * -+ * 1. A job slot has a job in both current and -+ * next registers -+ * 2. The job in current completes -+ * successfully, the IRQ handler reads -+ * RAWSTAT and calls this function with the -+ * relevant bit set in "done" -+ * 3. The job in the next registers becomes the -+ * current job on the GPU -+ * 4. Sometime before the JOB_IRQ_CLEAR line -+ * above the job on the GPU _fails_ -+ * 5. The IRQ_CLEAR clears the done bit but not -+ * the failed bit. This atomically sets -+ * JOB_IRQ_JS_STATE. However since both jobs -+ * have now completed the relevant bits for -+ * the slot are set to 0. -+ * -+ * If we now did nothing then we'd incorrectly -+ * assume that _both_ jobs had completed -+ * successfully (since we haven't yet observed -+ * the fail bit being set in RAWSTAT). -+ * -+ * So at this point if there are no active jobs -+ * left we check to see if RAWSTAT has a failure -+ * bit set for the job slot. If it does we know -+ * that there has been a new failure that we -+ * didn't previously know about, so we make sure -+ * that we record this in active (but we wait -+ * for the next loop to deal with it). -+ * -+ * If we were handling a job failure (i.e. done -+ * has the relevant high bit set) then we know -+ * that the value read back from -+ * JOB_IRQ_JS_STATE is the correct number of -+ * remaining jobs because the failed job will -+ * have prevented any futher jobs from starting -+ * execution. -+ */ -+ u32 rawstat = kbase_reg_read(kbdev, -+ JOB_CONTROL_REG(JOB_IRQ_RAWSTAT), NULL); ++ /* End of table */ ++ { .tmds = 0, .n_32k = 0, .n_44k1 = 0, .n_48k = 0, }, ++}; + -+ if ((rawstat >> (i + 16)) & 1) { -+ /* There is a failed job that we've -+ * missed - add it back to active */ -+ active |= (1u << i); -+ } -+ } ++static const struct drm_display_mode dw_hdmi_default_modes[] = { ++ /* 16 - 1920x1080@60Hz 16:9 */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008, ++ 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), ++ .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, ++ /* 2 - 720x480@60Hz 4:3 */ ++ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 27000, 720, 736, ++ 798, 858, 0, 480, 489, 495, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC), ++ .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, }, ++ /* 4 - 1280x720@60Hz 16:9 */ ++ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1390, ++ 1430, 1650, 0, 720, 725, 730, 750, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), ++ .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, ++ /* 31 - 1920x1080@50Hz 16:9 */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2448, ++ 2492, 2640, 0, 1080, 1084, 1089, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), ++ .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, ++ /* 19 - 1280x720@50Hz 16:9 */ ++ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1720, ++ 1760, 1980, 0, 720, 725, 730, 750, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), ++ .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, ++ /* 17 - 720x576@50Hz 4:3 */ ++ { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 27000, 720, 732, ++ 796, 864, 0, 576, 581, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC), ++ .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, }, ++ /* 2 - 720x480@60Hz 4:3 */ ++ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 27000, 720, 736, ++ 798, 858, 0, 480, 489, 495, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC), ++ .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, }, ++}; + -+ dev_dbg(kbdev->dev, "Job ended with status 0x%08X\n", -+ completion_code); ++enum frl_mask { ++ FRL_3GBPS_3LANE = 1, ++ FRL_6GBPS_3LANE, ++ FRL_6GBPS_4LANE, ++ FRL_8GBPS_4LANE, ++ FRL_10GBPS_4LANE, ++ FRL_12GBPS_4LANE, ++}; + -+ nr_done = kbase_backend_nr_atoms_submitted(kbdev, i); -+ nr_done -= (active >> i) & 1; -+ nr_done -= (active >> (i + 16)) & 1; ++struct hdmi_vmode_qp { ++ bool mdataenablepolarity; + -+ if (nr_done <= 0) { -+ dev_warn(kbdev->dev, "Spurious interrupt on slot %d", -+ i); ++ unsigned int previous_pixelclock; ++ unsigned long mpixelclock; ++ unsigned int mpixelrepetitioninput; ++ unsigned int mpixelrepetitionoutput; ++ unsigned long previous_tmdsclock; ++ unsigned int mtmdsclock; ++}; + -+ goto spurious; -+ } ++struct hdmi_qp_data_info { ++ unsigned int enc_in_bus_format; ++ unsigned int enc_out_bus_format; ++ unsigned int enc_in_encoding; ++ unsigned int enc_out_encoding; ++ unsigned int quant_range; ++ unsigned int pix_repet_factor; ++ struct hdmi_vmode_qp video_mode; ++ bool update; ++}; + -+ count += nr_done; ++struct dw_hdmi_qp_i2c { ++ struct i2c_adapter adap; + -+ while (nr_done) { -+ if (nr_done == 1) { -+ kbase_gpu_complete_hw(kbdev, i, -+ completion_code, -+ job_tail, -+ &end_timestamp); -+ kbase_jm_try_kick_all(kbdev); -+ } else { -+ /* More than one job has completed. -+ * Since this is not the last job being -+ * reported this time it must have -+ * passed. This is because the hardware -+ * will not allow further jobs in a job -+ * slot to complete until the failed job -+ * is cleared from the IRQ status. -+ */ -+ kbase_gpu_complete_hw(kbdev, i, -+ BASE_JD_EVENT_DONE, -+ 0, -+ &end_timestamp); -+ } -+ nr_done--; -+ } -+ spurious: -+ done = kbase_reg_read(kbdev, -+ JOB_CONTROL_REG(JOB_IRQ_RAWSTAT), NULL); ++ struct mutex lock; /* used to serialize data transfers */ ++ struct completion cmp; ++ u32 stat; + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10883)) { -+ /* Workaround for missing interrupt caused by -+ * PRLAM-10883 */ -+ if (((active >> i) & 1) && (0 == -+ kbase_reg_read(kbdev, -+ JOB_SLOT_REG(i, -+ JS_STATUS), NULL))) { -+ /* Force job slot to be processed again -+ */ -+ done |= (1u << i); -+ } -+ } ++ u8 slave_reg; ++ bool is_regaddr; ++ bool is_segment; + -+ failed = done >> 16; -+ finished = (done & 0xFFFF) | failed; -+ if (done) -+ end_timestamp = ktime_get(); -+ } while (finished & (1 << i)); ++ unsigned int scl_high_ns; ++ unsigned int scl_low_ns; ++}; + -+ kbasep_job_slot_update_head_start_timestamp(kbdev, i, -+ end_timestamp); -+ } ++struct dw_hdmi_phy_data { ++ enum dw_hdmi_phy_type type; ++ const char *name; ++ unsigned int gen; ++ bool has_svsret; ++ int (*configure)(struct dw_hdmi_qp *hdmi, ++ const struct dw_hdmi_plat_data *pdata, ++ unsigned long mpixelclock); ++}; + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+#if KBASE_GPU_RESET_EN -+ if (atomic_read(&kbdev->hwaccess.backend.reset_gpu) == -+ KBASE_RESET_GPU_COMMITTED) { -+ /* If we're trying to reset the GPU then we might be able to do -+ * it early (without waiting for a timeout) because some jobs -+ * have completed -+ */ -+ kbasep_try_reset_gpu_early(kbdev); -+ } -+#endif /* KBASE_GPU_RESET_EN */ -+ KBASE_TRACE_ADD(kbdev, JM_IRQ_END, NULL, NULL, 0, count); -+} -+KBASE_EXPORT_TEST_API(kbase_job_done); ++struct dw_hdmi_qp { ++ struct drm_connector connector; ++ struct drm_bridge bridge; ++ struct drm_bridge *next_bridge; ++ struct drm_panel *panel; ++ struct platform_device *hdcp_dev; ++ struct platform_device *audio; ++ struct platform_device *cec; ++ struct device *dev; ++ struct dw_hdmi_qp_i2c *i2c; + -+static bool kbasep_soft_stop_allowed(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) -+{ -+ bool soft_stops_allowed = true; ++ struct hdmi_qp_data_info hdmi_data; ++ const struct dw_hdmi_plat_data *plat_data; ++ struct dw_qp_hdcp *hdcp; ++ int vic; ++ int main_irq; ++ int avp_irq; ++ int earc_irq; + -+ if (kbase_jd_katom_is_protected(katom)) { -+ soft_stops_allowed = false; -+ } else if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8408)) { -+ if ((katom->core_req & BASE_JD_REQ_T) != 0) -+ soft_stops_allowed = false; -+ } -+ return soft_stops_allowed; -+} ++ u8 edid[HDMI_EDID_LEN]; + -+static bool kbasep_hard_stop_allowed(struct kbase_device *kbdev, -+ base_jd_core_req core_reqs) -+{ -+ bool hard_stops_allowed = true; ++ struct { ++ const struct dw_hdmi_qp_phy_ops *ops; ++ const char *name; ++ void *data; ++ bool enabled; ++ } phy; + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8394)) { -+ if ((core_reqs & BASE_JD_REQ_T) != 0) -+ hard_stops_allowed = false; -+ } -+ return hard_stops_allowed; -+} ++ struct drm_display_mode previous_mode; + -+void kbasep_job_slot_soft_or_hard_stop_do_action(struct kbase_device *kbdev, -+ int js, -+ u32 action, -+ base_jd_core_req core_reqs, -+ struct kbase_jd_atom *target_katom) -+{ -+ struct kbase_context *kctx = target_katom->kctx; -+#if KBASE_TRACE_ENABLE -+ u32 status_reg_before; -+ u64 job_in_head_before; -+ u32 status_reg_after; ++ struct i2c_adapter *ddc; ++ void __iomem *regs; ++ void __iomem *hdcp14_mem; ++ bool sink_is_hdmi; ++ bool sink_has_audio; ++ bool dclk_en; ++ bool frl_switch; ++ bool cec_enable; ++ bool allm_enable; ++ bool support_hdmi; ++ bool skip_connector; ++ int force_output; ++ int vp_id; ++ int old_vp_id; + -+ KBASE_DEBUG_ASSERT(!(action & (~JS_COMMAND_MASK))); ++ struct mutex mutex; /* for state below and previous_mode */ ++ struct drm_connector *curr_conn;/* current connector (only valid when !disabled) */ ++ enum drm_connector_force force; /* mutex-protected force state */ ++ bool disabled; /* DRM has disabled our bridge */ ++ bool bridge_is_on; /* indicates the bridge is on */ ++ bool rxsense; /* rxsense state */ ++ u8 phy_mask; /* desired phy int mask settings */ ++ u8 mc_clkdis; /* clock disable register */ ++ u8 hdcp_caps; ++ u8 hdcp_status; + -+ /* Check the head pointer */ -+ job_in_head_before = ((u64) kbase_reg_read(kbdev, -+ JOB_SLOT_REG(js, JS_HEAD_LO), NULL)) -+ | (((u64) kbase_reg_read(kbdev, -+ JOB_SLOT_REG(js, JS_HEAD_HI), NULL)) -+ << 32); -+ status_reg_before = kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_STATUS), -+ NULL); -+#endif ++ bool update; ++ bool hdr2sdr; + -+ if (action == JS_COMMAND_SOFT_STOP) { -+ bool soft_stop_allowed = kbasep_soft_stop_allowed(kbdev, -+ target_katom); ++ u32 scdc_intr; ++ u32 flt_intr; ++ u32 earc_intr; + -+ if (!soft_stop_allowed) { -+#ifdef CONFIG_MALI_DEBUG -+ dev_dbg(kbdev->dev, -+ "Attempt made to soft-stop a job that cannot be soft-stopped. core_reqs = 0x%X", -+ (unsigned int)core_reqs); -+#endif /* CONFIG_MALI_DEBUG */ -+ return; -+ } ++ struct mutex audio_mutex; ++ unsigned int sample_rate; ++ unsigned int audio_cts; ++ unsigned int audio_n; ++ bool audio_enable; ++ void (*enable_audio)(struct dw_hdmi_qp *hdmi); ++ void (*disable_audio)(struct dw_hdmi_qp *hdmi); + -+ /* We are about to issue a soft stop, so mark the atom as having -+ * been soft stopped */ -+ target_katom->atom_flags |= KBASE_KATOM_FLAG_BEEN_SOFT_STOPPPED; ++ struct dentry *debugfs_dir; ++ bool scramble_low_rates; + -+ /* Mark the point where we issue the soft-stop command */ -+ KBASE_TLSTREAM_TL_EVENT_ATOM_SOFTSTOP_ISSUE(target_katom); ++ struct extcon_dev *extcon; + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8316)) { -+ int i; ++ struct regmap *regm; + -+ for (i = 0; -+ i < kbase_backend_nr_atoms_submitted(kbdev, js); -+ i++) { -+ struct kbase_jd_atom *katom; ++ bool initialized; /* hdmi is enabled before bind */ ++ bool logo_plug_out; /* hdmi is plug out when kernel logo */ ++ struct completion flt_cmp; ++ struct completion earc_cmp; + -+ katom = kbase_gpu_inspect(kbdev, js, i); ++ struct cec_notifier *cec_notifier; ++ struct cec_adapter *cec_adap; ++ struct mutex cec_notifier_mutex; + -+ KBASE_DEBUG_ASSERT(katom); ++ hdmi_codec_plugged_cb plugged_cb; ++ struct device *codec_dev; ++ enum drm_connector_status last_connector_result; ++}; + -+ /* For HW_ISSUE_8316, only 'bad' jobs attacking -+ * the system can cause this issue: normally, -+ * all memory should be allocated in multiples -+ * of 4 pages, and growable memory should be -+ * changed size in multiples of 4 pages. -+ * -+ * Whilst such 'bad' jobs can be cleared by a -+ * GPU reset, the locking up of a uTLB entry -+ * caused by the bad job could also stall other -+ * ASs, meaning that other ASs' jobs don't -+ * complete in the 'grace' period before the -+ * reset. We don't want to lose other ASs' jobs -+ * when they would normally complete fine, so we -+ * must 'poke' the MMU regularly to help other -+ * ASs complete */ -+ kbase_as_poking_timer_retain_atom( -+ kbdev, katom->kctx, katom); -+ } -+ } ++static inline void hdmi_writel(struct dw_hdmi_qp *hdmi, u32 val, int offset) ++{ ++ regmap_write(hdmi->regm, offset, val); ++} + -+ if (kbase_hw_has_feature( -+ kbdev, -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION)) { -+ action = (target_katom->atom_flags & -+ KBASE_KATOM_FLAGS_JOBCHAIN) ? -+ JS_COMMAND_SOFT_STOP_1 : -+ JS_COMMAND_SOFT_STOP_0; -+ } -+ } else if (action == JS_COMMAND_HARD_STOP) { -+ bool hard_stop_allowed = kbasep_hard_stop_allowed(kbdev, -+ core_reqs); ++static inline u32 hdmi_readl(struct dw_hdmi_qp *hdmi, int offset) ++{ ++ unsigned int val = 0; + -+ if (!hard_stop_allowed) { -+ /* Jobs can be hard-stopped for the following reasons: -+ * * CFS decides the job has been running too long (and -+ * soft-stop has not occurred). In this case the GPU -+ * will be reset by CFS if the job remains on the -+ * GPU. -+ * -+ * * The context is destroyed, kbase_jd_zap_context -+ * will attempt to hard-stop the job. However it also -+ * has a watchdog which will cause the GPU to be -+ * reset if the job remains on the GPU. -+ * -+ * * An (unhandled) MMU fault occurred. As long as -+ * BASE_HW_ISSUE_8245 is defined then the GPU will be -+ * reset. -+ * -+ * All three cases result in the GPU being reset if the -+ * hard-stop fails, so it is safe to just return and -+ * ignore the hard-stop request. -+ */ -+ dev_warn(kbdev->dev, -+ "Attempt made to hard-stop a job that cannot be hard-stopped. core_reqs = 0x%X", -+ (unsigned int)core_reqs); -+ return; -+ } -+ target_katom->atom_flags |= KBASE_KATOM_FLAG_BEEN_HARD_STOPPED; ++ regmap_read(hdmi->regm, offset, &val); + -+ if (kbase_hw_has_feature( -+ kbdev, -+ BASE_HW_FEATURE_JOBCHAIN_DISAMBIGUATION)) { -+ action = (target_katom->atom_flags & -+ KBASE_KATOM_FLAGS_JOBCHAIN) ? -+ JS_COMMAND_HARD_STOP_1 : -+ JS_COMMAND_HARD_STOP_0; -+ } -+ } ++ return val; ++} + -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_COMMAND), action, kctx); ++static void handle_plugged_change(struct dw_hdmi_qp *hdmi, bool plugged) ++{ ++ if (hdmi->plugged_cb && hdmi->codec_dev) ++ hdmi->plugged_cb(hdmi->codec_dev, plugged); ++} + -+#if KBASE_TRACE_ENABLE -+ status_reg_after = kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_STATUS), -+ NULL); -+ if (status_reg_after == BASE_JD_EVENT_ACTIVE) { -+ struct kbase_jd_atom *head; -+ struct kbase_context *head_kctx; ++int dw_hdmi_qp_set_plugged_cb(struct dw_hdmi_qp *hdmi, hdmi_codec_plugged_cb fn, ++ struct device *codec_dev) ++{ ++ bool plugged; + -+ head = kbase_gpu_inspect(kbdev, js, 0); -+ head_kctx = head->kctx; ++ mutex_lock(&hdmi->mutex); ++ hdmi->plugged_cb = fn; ++ hdmi->codec_dev = codec_dev; ++ plugged = hdmi->last_connector_result == connector_status_connected; ++ handle_plugged_change(hdmi, plugged); ++ mutex_unlock(&hdmi->mutex); + -+ if (status_reg_before == BASE_JD_EVENT_ACTIVE) -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_CHECK_HEAD, head_kctx, -+ head, job_in_head_before, js); -+ else -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_CHECK_HEAD, NULL, NULL, -+ 0, js); ++ return 0; ++} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_set_plugged_cb); + -+ switch (action) { -+ case JS_COMMAND_SOFT_STOP: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP, head_kctx, -+ head, head->jc, js); -+ break; -+ case JS_COMMAND_SOFT_STOP_0: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP_0, head_kctx, -+ head, head->jc, js); -+ break; -+ case JS_COMMAND_SOFT_STOP_1: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP_1, head_kctx, -+ head, head->jc, js); -+ break; -+ case JS_COMMAND_HARD_STOP: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP, head_kctx, -+ head, head->jc, js); -+ break; -+ case JS_COMMAND_HARD_STOP_0: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP_0, head_kctx, -+ head, head->jc, js); -+ break; -+ case JS_COMMAND_HARD_STOP_1: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP_1, head_kctx, -+ head, head->jc, js); -+ break; -+ default: -+ BUG(); -+ break; -+ } -+ } else { -+ if (status_reg_before == BASE_JD_EVENT_ACTIVE) -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_CHECK_HEAD, NULL, NULL, -+ job_in_head_before, js); -+ else -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_CHECK_HEAD, NULL, NULL, -+ 0, js); ++static void hdmi_modb(struct dw_hdmi_qp *hdmi, u32 data, u32 mask, u32 reg) ++{ ++ regmap_update_bits(hdmi->regm, reg, mask, data); ++} + -+ switch (action) { -+ case JS_COMMAND_SOFT_STOP: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP, NULL, NULL, 0, -+ js); -+ break; -+ case JS_COMMAND_SOFT_STOP_0: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP_0, NULL, NULL, -+ 0, js); -+ break; -+ case JS_COMMAND_SOFT_STOP_1: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_SOFTSTOP_1, NULL, NULL, -+ 0, js); -+ break; -+ case JS_COMMAND_HARD_STOP: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP, NULL, NULL, 0, -+ js); -+ break; -+ case JS_COMMAND_HARD_STOP_0: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP_0, NULL, NULL, -+ 0, js); -+ break; -+ case JS_COMMAND_HARD_STOP_1: -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_HARDSTOP_1, NULL, NULL, -+ 0, js); -+ break; -+ default: -+ BUG(); ++static void hdmi_set_cts_n(struct dw_hdmi_qp *hdmi, unsigned int cts, ++ unsigned int n) ++{ ++ /* Set N */ ++ hdmi_modb(hdmi, n, AUDPKT_ACR_N_VALUE, AUDPKT_ACR_CONTROL0); ++ ++ /* Set CTS */ ++ if (cts) ++ hdmi_modb(hdmi, AUDPKT_ACR_CTS_OVR_EN, AUDPKT_ACR_CTS_OVR_EN_MSK, ++ AUDPKT_ACR_CONTROL1); ++ else ++ hdmi_modb(hdmi, 0, AUDPKT_ACR_CTS_OVR_EN_MSK, ++ AUDPKT_ACR_CONTROL1); ++ ++ hdmi_modb(hdmi, AUDPKT_ACR_CTS_OVR_VAL(cts), AUDPKT_ACR_CTS_OVR_VAL_MSK, ++ AUDPKT_ACR_CONTROL1); ++} ++ ++static int hdmi_match_frl_n_table(struct dw_hdmi_qp *hdmi, ++ unsigned long r_bit, ++ unsigned long freq) ++{ ++ const struct dw_hdmi_audio_frl_n *frl_n = NULL; ++ int i = 0, n = 0; ++ ++ for (i = 0; ARRAY_SIZE(common_frl_n_table); i++) { ++ if (r_bit == common_frl_n_table[i].r_bit) { ++ frl_n = &common_frl_n_table[i]; + break; + } + } -+#endif ++ ++ if (!frl_n) ++ goto err; ++ ++ switch (freq) { ++ case 32000: ++ case 64000: ++ case 128000: ++ n = (freq / 32000) * frl_n->n_32k; ++ break; ++ case 44100: ++ case 88200: ++ case 176400: ++ n = (freq / 44100) * frl_n->n_44k1; ++ break; ++ case 48000: ++ case 96000: ++ case 192000: ++ n = (freq / 48000) * frl_n->n_48k; ++ break; ++ default: ++ goto err; ++ } ++ ++ return n; ++err: ++ dev_err(hdmi->dev, "FRL; unexpected Rbit: %lu Gbps\n", r_bit); ++ ++ return 0; +} + -+void kbase_backend_jm_kill_jobs_from_kctx(struct kbase_context *kctx) ++static int hdmi_match_tmds_n_table(struct dw_hdmi_qp *hdmi, ++ unsigned long pixel_clk, ++ unsigned long freq) +{ -+ unsigned long flags; -+ struct kbase_device *kbdev; -+ struct kbasep_js_device_data *js_devdata; ++ const struct dw_hdmi_plat_data *plat_data = hdmi->plat_data; ++ const struct dw_hdmi_audio_tmds_n *tmds_n = NULL; + int i; + -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ kbdev = kctx->kbdev; -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ js_devdata = &kbdev->js_data; -+ -+ /* Cancel any remaining running jobs for this kctx */ -+ mutex_lock(&kctx->jctx.lock); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ if (plat_data->tmds_n_table) { ++ for (i = 0; plat_data->tmds_n_table[i].tmds != 0; i++) { ++ if (pixel_clk == plat_data->tmds_n_table[i].tmds) { ++ tmds_n = &plat_data->tmds_n_table[i]; ++ break; ++ } ++ } ++ } + -+ /* Invalidate all jobs in context, to prevent re-submitting */ -+ for (i = 0; i < BASE_JD_ATOM_COUNT; i++) { -+ if (!work_pending(&kctx->jctx.atoms[i].work)) -+ kctx->jctx.atoms[i].event_code = -+ BASE_JD_EVENT_JOB_CANCELLED; ++ if (tmds_n == NULL) { ++ for (i = 0; common_tmds_n_table[i].tmds != 0; i++) { ++ if (pixel_clk == common_tmds_n_table[i].tmds) { ++ tmds_n = &common_tmds_n_table[i]; ++ break; ++ } ++ } + } + -+ for (i = 0; i < kbdev->gpu_props.num_job_slots; i++) -+ kbase_job_slot_hardstop(kctx, i, NULL); ++ if (tmds_n == NULL) ++ return -ENOENT; + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kctx->jctx.lock); ++ switch (freq) { ++ case 32000: ++ return tmds_n->n_32k; ++ case 44100: ++ case 88200: ++ case 176400: ++ return (freq / 44100) * tmds_n->n_44k1; ++ case 48000: ++ case 96000: ++ case 192000: ++ return (freq / 48000) * tmds_n->n_48k; ++ default: ++ return -ENOENT; ++ } +} + -+void kbase_job_slot_ctx_priority_check_locked(struct kbase_context *kctx, -+ struct kbase_jd_atom *target_katom) ++static u64 hdmi_audio_math_diff(unsigned int freq, unsigned int n, ++ unsigned int pixel_clk) +{ -+ struct kbase_device *kbdev; -+ int js = target_katom->slot_nr; -+ int priority = target_katom->sched_priority; -+ int i; -+ bool stop_sent = false; ++ u64 final, diff; ++ u64 cts; + -+ KBASE_DEBUG_ASSERT(kctx != NULL); -+ kbdev = kctx->kbdev; -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ final = (u64)pixel_clk * n; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ cts = final; ++ do_div(cts, 128 * freq); + -+ for (i = 0; i < kbase_backend_nr_atoms_on_slot(kbdev, js); i++) { -+ struct kbase_jd_atom *katom; ++ diff = final - (u64)cts * (128 * freq); + -+ katom = kbase_gpu_inspect(kbdev, js, i); -+ if (!katom) -+ continue; ++ return diff; ++} + -+ if (katom->kctx != kctx) -+ continue; ++static unsigned int hdmi_compute_n(struct dw_hdmi_qp *hdmi, ++ unsigned long pixel_clk, ++ unsigned long freq) ++{ ++ unsigned int min_n = DIV_ROUND_UP((128 * freq), 1500); ++ unsigned int max_n = (128 * freq) / 300; ++ unsigned int ideal_n = (128 * freq) / 1000; ++ unsigned int best_n_distance = ideal_n; ++ unsigned int best_n = 0; ++ u64 best_diff = U64_MAX; ++ int n; + -+ if (katom->sched_priority > priority) { -+ if (!stop_sent) -+ KBASE_TLSTREAM_TL_ATTRIB_ATOM_PRIORITY_CHANGE( -+ target_katom); ++ /* If the ideal N could satisfy the audio math, then just take it */ ++ if (hdmi_audio_math_diff(freq, ideal_n, pixel_clk) == 0) ++ return ideal_n; + -+ kbase_job_slot_softstop(kbdev, js, katom); -+ stop_sent = true; ++ for (n = min_n; n <= max_n; n++) { ++ u64 diff = hdmi_audio_math_diff(freq, n, pixel_clk); ++ ++ if (diff < best_diff || (diff == best_diff && ++ abs(n - ideal_n) < best_n_distance)) { ++ best_n = n; ++ best_diff = diff; ++ best_n_distance = abs(best_n - ideal_n); + } ++ ++ /* ++ * The best N already satisfy the audio math, and also be ++ * the closest value to ideal N, so just cut the loop. ++ */ ++ if ((best_diff == 0) && (abs(n - ideal_n) > best_n_distance)) ++ break; + } -+} + -+struct zap_reset_data { -+ /* The stages are: -+ * 1. The timer has never been called -+ * 2. The zap has timed out, all slots are soft-stopped - the GPU reset -+ * will happen. The GPU has been reset when -+ * kbdev->hwaccess.backend.reset_waitq is signalled -+ * -+ * (-1 - The timer has been cancelled) -+ */ -+ int stage; -+ struct kbase_device *kbdev; -+ struct hrtimer timer; -+ spinlock_t lock; /* protects updates to stage member */ -+}; ++ return best_n; ++} + -+static enum hrtimer_restart zap_timeout_callback(struct hrtimer *timer) ++static unsigned int hdmi_find_n(struct dw_hdmi_qp *hdmi, unsigned long pixel_clk, ++ unsigned long sample_rate) +{ -+ struct zap_reset_data *reset_data = container_of(timer, -+ struct zap_reset_data, timer); -+ struct kbase_device *kbdev = reset_data->kbdev; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&reset_data->lock, flags); -+ -+ if (reset_data->stage == -1) -+ goto out; ++ struct dw_hdmi_link_config *link_cfg = NULL; ++ void *data = hdmi->plat_data->phy_data; ++ int n; + -+#if KBASE_GPU_RESET_EN -+ if (kbase_prepare_to_reset_gpu(kbdev)) { -+ dev_err(kbdev->dev, "Issueing GPU soft-reset because jobs failed to be killed (within %d ms) as part of context termination (e.g. process exit)\n", -+ ZAP_TIMEOUT); -+ kbase_reset_gpu(kbdev); ++ if (hdmi->plat_data->get_link_cfg) { ++ link_cfg = hdmi->plat_data->get_link_cfg(data); ++ if (link_cfg && link_cfg->frl_mode) ++ return hdmi_match_frl_n_table(hdmi, link_cfg->rate_per_lane, sample_rate); + } -+#endif /* KBASE_GPU_RESET_EN */ -+ reset_data->stage = 2; + -+ out: -+ spin_unlock_irqrestore(&reset_data->lock, flags); ++ n = hdmi_match_tmds_n_table(hdmi, pixel_clk, sample_rate); ++ if (n > 0) ++ return n; + -+ return HRTIMER_NORESTART; ++ dev_warn(hdmi->dev, "Rate %lu missing; compute N dynamically\n", ++ pixel_clk); ++ ++ return hdmi_compute_n(hdmi, pixel_clk, sample_rate); +} + -+void kbase_jm_wait_for_zero_jobs(struct kbase_context *kctx) ++void dw_hdmi_qp_set_audio_interface(struct dw_hdmi_qp *hdmi, ++ struct hdmi_codec_daifmt *fmt, ++ struct hdmi_codec_params *hparms) +{ -+ struct kbase_device *kbdev = kctx->kbdev; -+ struct zap_reset_data reset_data; -+ unsigned long flags; ++ u32 conf0 = 0; + -+ hrtimer_init_on_stack(&reset_data.timer, CLOCK_MONOTONIC, -+ HRTIMER_MODE_REL); -+ reset_data.timer.function = zap_timeout_callback; ++ mutex_lock(&hdmi->audio_mutex); ++ if (!hdmi->dclk_en) { ++ mutex_unlock(&hdmi->audio_mutex); ++ return; ++ } + -+ spin_lock_init(&reset_data.lock); ++ /* Reset the audio data path of the AVP */ ++ hdmi_writel(hdmi, AVP_DATAPATH_PACKET_AUDIO_SWINIT_P, GLOBAL_SWRESET_REQUEST); + -+ reset_data.kbdev = kbdev; -+ reset_data.stage = 1; ++ /* Disable AUDS, ACR, AUDI */ ++ hdmi_modb(hdmi, 0, ++ PKTSCHED_ACR_TX_EN | PKTSCHED_AUDS_TX_EN | PKTSCHED_AUDI_TX_EN, ++ PKTSCHED_PKT_EN); + -+ hrtimer_start(&reset_data.timer, HR_TIMER_DELAY_MSEC(ZAP_TIMEOUT), -+ HRTIMER_MODE_REL); ++ /* Clear the audio FIFO */ ++ hdmi_writel(hdmi, AUDIO_FIFO_CLR_P, AUDIO_INTERFACE_CONTROL0); + -+ /* Wait for all jobs to finish, and for the context to be not-scheduled -+ * (due to kbase_job_zap_context(), we also guarentee it's not in the JS -+ * policy queue either */ -+ wait_event(kctx->jctx.zero_jobs_wait, kctx->jctx.job_nr == 0); -+ wait_event(kctx->jctx.sched_info.ctx.is_scheduled_wait, -+ !kbase_ctx_flag(kctx, KCTX_SCHEDULED)); ++ /* Select I2S interface as the audio source */ ++ hdmi_modb(hdmi, AUD_IF_I2S, AUD_IF_SEL_MSK, AUDIO_INTERFACE_CONFIG0); + -+ spin_lock_irqsave(&reset_data.lock, flags); -+ if (reset_data.stage == 1) { -+ /* The timer hasn't run yet - so cancel it */ -+ reset_data.stage = -1; ++ /* Enable the active i2s lanes */ ++ switch (hparms->channels) { ++ case 7 ... 8: ++ conf0 |= I2S_LINES_EN(3); ++ fallthrough; ++ case 5 ... 6: ++ conf0 |= I2S_LINES_EN(2); ++ fallthrough; ++ case 3 ... 4: ++ conf0 |= I2S_LINES_EN(1); ++ fallthrough; ++ default: ++ conf0 |= I2S_LINES_EN(0); ++ break; + } -+ spin_unlock_irqrestore(&reset_data.lock, flags); + -+ hrtimer_cancel(&reset_data.timer); ++ hdmi_modb(hdmi, conf0, I2S_LINES_EN_MSK, AUDIO_INTERFACE_CONFIG0); + -+ if (reset_data.stage == 2) { -+ /* The reset has already started. -+ * Wait for the reset to complete -+ */ -+ wait_event(kbdev->hwaccess.backend.reset_wait, -+ atomic_read(&kbdev->hwaccess.backend.reset_gpu) -+ == KBASE_RESET_GPU_NOT_PENDING); ++ /* ++ * Enable bpcuv generated internally for L-PCM, or received ++ * from stream for NLPCM/HBR. ++ */ ++ switch (fmt->bit_fmt) { ++ case SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE: ++ conf0 = (hparms->channels == 8) ? AUD_HBR : AUD_ASP; ++ conf0 |= I2S_BPCUV_RCV_EN; ++ break; ++ default: ++ conf0 = AUD_ASP | I2S_BPCUV_RCV_DIS; ++ break; + } -+ destroy_hrtimer_on_stack(&reset_data.timer); + -+ dev_dbg(kbdev->dev, "Zap: Finished Context %p", kctx); ++ hdmi_modb(hdmi, conf0, I2S_BPCUV_RCV_MSK | AUD_FORMAT_MSK, ++ AUDIO_INTERFACE_CONFIG0); + -+ /* Ensure that the signallers of the waitqs have finished */ -+ mutex_lock(&kctx->jctx.lock); -+ mutex_lock(&kctx->jctx.sched_info.ctx.jsctx_mutex); -+ mutex_unlock(&kctx->jctx.sched_info.ctx.jsctx_mutex); -+ mutex_unlock(&kctx->jctx.lock); ++ /* Enable audio FIFO auto clear when overflow */ ++ hdmi_modb(hdmi, AUD_FIFO_INIT_ON_OVF_EN, AUD_FIFO_INIT_ON_OVF_MSK, ++ AUDIO_INTERFACE_CONFIG0); ++ ++ mutex_unlock(&hdmi->audio_mutex); +} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_set_audio_interface); + -+u32 kbase_backend_get_current_flush_id(struct kbase_device *kbdev) ++/* ++ * When transmitting IEC60958 linear PCM audio, these registers allow to ++ * configure the channel status information of all the channel status ++ * bits in the IEC60958 frame. For the moment this configuration is only ++ * used when the I2S audio interface, General Purpose Audio (GPA), ++ * or AHB audio DMA (AHBAUDDMA) interface is active ++ * (for S/PDIF interface this information comes from the stream). ++ */ ++void dw_hdmi_qp_set_channel_status(struct dw_hdmi_qp *hdmi, ++ u8 *channel_status, bool ref2stream) +{ -+ u32 flush_id = 0; ++ mutex_lock(&hdmi->audio_mutex); ++ if (!hdmi->dclk_en) { ++ mutex_unlock(&hdmi->audio_mutex); ++ return; ++ } + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_FLUSH_REDUCTION)) { -+ mutex_lock(&kbdev->pm.lock); -+ if (kbdev->pm.backend.gpu_powered) -+ flush_id = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(LATEST_FLUSH), NULL); -+ mutex_unlock(&kbdev->pm.lock); ++ /* ++ * AUDPKT_CHSTATUS_OVR0: { RSV, RSV, CS1, CS0 } ++ * AUDPKT_CHSTATUS_OVR1: { CS6, CS5, CS4, CS3 } ++ * ++ * | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | ++ * CS0: | Mode | d | c | b | a | ++ * CS1: | Category Code | ++ * CS2: | Channel Number | Source Number | ++ * CS3: | Clock Accuracy | Sample Freq | ++ * CS4: | Ori Sample Freq | Word Length | ++ * CS5: | | CGMS-A | ++ * CS6~CS23: Reserved ++ * ++ * a: use of channel status block ++ * b: linear PCM identification: 0 for lpcm, 1 for nlpcm ++ * c: copyright information ++ * d: additional format information ++ */ ++ ++ if (ref2stream) ++ channel_status[0] |= IEC958_AES0_NONAUDIO; ++ ++ if ((hdmi_readl(hdmi, AUDIO_INTERFACE_CONFIG0) & GENMASK(25, 24)) == AUD_HBR) { ++ /* fixup cs for HBR */ ++ channel_status[3] = (channel_status[3] & 0xf0) | IEC958_AES3_CON_FS_768000; ++ channel_status[4] = (channel_status[4] & 0x0f) | IEC958_AES4_CON_ORIGFS_NOTID; + } + -+ return flush_id; ++ hdmi_writel(hdmi, channel_status[0] | (channel_status[1] << 8), ++ AUDPKT_CHSTATUS_OVR0); ++ ++ regmap_bulk_write(hdmi->regm, AUDPKT_CHSTATUS_OVR1, &channel_status[3], 1); ++ ++ if (ref2stream) ++ hdmi_modb(hdmi, 0, ++ AUDPKT_PBIT_FORCE_EN_MASK | AUDPKT_CHSTATUS_OVR_EN_MASK, ++ AUDPKT_CONTROL0); ++ else ++ hdmi_modb(hdmi, AUDPKT_PBIT_FORCE_EN | AUDPKT_CHSTATUS_OVR_EN, ++ AUDPKT_PBIT_FORCE_EN_MASK | AUDPKT_CHSTATUS_OVR_EN_MASK, ++ AUDPKT_CONTROL0); ++ ++ mutex_unlock(&hdmi->audio_mutex); +} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_set_channel_status); + -+int kbase_job_slot_init(struct kbase_device *kbdev) ++static void hdmi_set_clk_regenerator(struct dw_hdmi_qp *hdmi, ++ unsigned long pixel_clk, unsigned int sample_rate) +{ -+#if KBASE_GPU_RESET_EN -+ kbdev->hwaccess.backend.reset_workq = alloc_workqueue( -+ "Mali reset workqueue", 0, 1); -+ if (NULL == kbdev->hwaccess.backend.reset_workq) -+ return -EINVAL; ++ unsigned int n = 0, cts = 0; + -+ KBASE_DEBUG_ASSERT(0 == -+ object_is_on_stack(&kbdev->hwaccess.backend.reset_work)); -+ INIT_WORK(&kbdev->hwaccess.backend.reset_work, -+ kbasep_reset_timeout_worker); ++ n = hdmi_find_n(hdmi, pixel_clk, sample_rate); + -+ hrtimer_init(&kbdev->hwaccess.backend.reset_timer, CLOCK_MONOTONIC, -+ HRTIMER_MODE_REL); -+ kbdev->hwaccess.backend.reset_timer.function = -+ kbasep_reset_timer_callback; -+#endif ++ hdmi->audio_n = n; ++ hdmi->audio_cts = cts; ++ hdmi_set_cts_n(hdmi, cts, hdmi->audio_enable ? n : 0); ++} + -+ return 0; ++static void hdmi_init_clk_regenerator(struct dw_hdmi_qp *hdmi) ++{ ++ mutex_lock(&hdmi->audio_mutex); ++ if (hdmi->dclk_en) ++ hdmi_set_clk_regenerator(hdmi, 74250000, hdmi->sample_rate); ++ mutex_unlock(&hdmi->audio_mutex); +} -+KBASE_EXPORT_TEST_API(kbase_job_slot_init); + -+void kbase_job_slot_halt(struct kbase_device *kbdev) ++static void hdmi_clk_regenerator_update_pixel_clock(struct dw_hdmi_qp *hdmi) +{ -+ CSTD_UNUSED(kbdev); ++ mutex_lock(&hdmi->audio_mutex); ++ if (hdmi->dclk_en) ++ hdmi_set_clk_regenerator(hdmi, hdmi->hdmi_data.video_mode.mtmdsclock, ++ hdmi->sample_rate); ++ mutex_unlock(&hdmi->audio_mutex); +} + -+void kbase_job_slot_term(struct kbase_device *kbdev) ++void dw_hdmi_qp_set_sample_rate(struct dw_hdmi_qp *hdmi, unsigned int rate) +{ -+#if KBASE_GPU_RESET_EN -+ destroy_workqueue(kbdev->hwaccess.backend.reset_workq); -+#endif ++ mutex_lock(&hdmi->audio_mutex); ++ if (hdmi->dclk_en) { ++ hdmi->sample_rate = rate; ++ hdmi_set_clk_regenerator(hdmi, hdmi->hdmi_data.video_mode.mtmdsclock, ++ hdmi->sample_rate); ++ } ++ mutex_unlock(&hdmi->audio_mutex); +} -+KBASE_EXPORT_TEST_API(kbase_job_slot_term); ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_set_sample_rate); + -+#if KBASE_GPU_RESET_EN -+/** -+ * kbasep_check_for_afbc_on_slot() - Check whether AFBC is in use on this slot -+ * @kbdev: kbase device pointer -+ * @kctx: context to check against -+ * @js: slot to check -+ * @target_katom: An atom to check, or NULL if all atoms from @kctx on -+ * slot @js should be checked -+ * -+ * This checks are based upon parameters that would normally be passed to -+ * kbase_job_slot_hardstop(). -+ * -+ * In the event of @target_katom being NULL, this will check the last jobs that -+ * are likely to be running on the slot to see if a) they belong to kctx, and -+ * so would be stopped, and b) whether they have AFBC -+ * -+ * In that case, It's guaranteed that a job currently executing on the HW with -+ * AFBC will be detected. However, this is a conservative check because it also -+ * detects jobs that have just completed too. -+ * -+ * Return: true when hard-stop _might_ stop an afbc atom, else false. -+ */ -+static bool kbasep_check_for_afbc_on_slot(struct kbase_device *kbdev, -+ struct kbase_context *kctx, int js, -+ struct kbase_jd_atom *target_katom) ++void dw_hdmi_qp_set_channel_count(struct dw_hdmi_qp *hdmi, unsigned int cnt) +{ -+ bool ret = false; -+ int i; ++} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_set_channel_count); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++void dw_hdmi_qp_set_channel_allocation(struct dw_hdmi_qp *hdmi, unsigned int ca) ++{ ++} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_set_channel_allocation); + -+ /* When we have an atom the decision can be made straight away. */ -+ if (target_katom) -+ return !!(target_katom->core_req & BASE_JD_REQ_FS_AFBC); ++static int dw_hdmi_qp_init_audio_infoframe(struct dw_hdmi_qp *hdmi) ++{ ++ struct hdmi_audio_infoframe frame; ++ u8 infoframe_buf[HDMI_INFOFRAME_SIZE(AUDIO)]; ++ int ret = 0; + -+ /* Otherwise, we must chweck the hardware to see if it has atoms from -+ * this context with AFBC. */ -+ for (i = 0; i < kbase_backend_nr_atoms_on_slot(kbdev, js); i++) { -+ struct kbase_jd_atom *katom; ++ hdmi_audio_infoframe_init(&frame); + -+ katom = kbase_gpu_inspect(kbdev, js, i); -+ if (!katom) -+ continue; ++ frame.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM; ++ frame.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM; ++ frame.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM; ++ frame.channels = 2; + -+ /* Ignore atoms from other contexts, they won't be stopped when -+ * we use this for checking if we should hard-stop them */ -+ if (katom->kctx != kctx) -+ continue; ++ ret = hdmi_audio_infoframe_pack(&frame, infoframe_buf, ++ sizeof(infoframe_buf)); ++ if (ret < 0) { ++ dev_err(hdmi->dev, "%s: Failed to pack audio infoframe: %d\n", ++ __func__, ret); ++ return ret; ++ } + -+ /* An atom on this slot and this context: check for AFBC */ -+ if (katom->core_req & BASE_JD_REQ_FS_AFBC) { -+ ret = true; -+ break; -+ } ++ regmap_bulk_write(hdmi->regm, PKT_AUDI_CONTENTS1, &infoframe_buf[3], 2); ++ hdmi_modb(hdmi, ++ PKTSCHED_ACR_TX_EN | PKTSCHED_AUDI_TX_EN, ++ PKTSCHED_ACR_TX_EN | PKTSCHED_AUDI_TX_EN, ++ PKTSCHED_PKT_EN); ++ ++ return 0; ++} ++ ++void dw_hdmi_qp_set_audio_infoframe(struct dw_hdmi_qp *hdmi, ++ struct hdmi_codec_params *hparms) ++{ ++ u8 infoframe_buf[HDMI_INFOFRAME_SIZE(AUDIO)]; ++ int ret = 0; ++ ++ ret = hdmi_audio_infoframe_pack(&hparms->cea, infoframe_buf, ++ sizeof(infoframe_buf)); ++ if (!ret) { ++ dev_err(hdmi->dev, "%s: Failed to pack audio infoframe: %d\n", ++ __func__, ret); ++ return; + } + -+ return ret; ++ mutex_lock(&hdmi->audio_mutex); ++ if (!hdmi->dclk_en) { ++ mutex_unlock(&hdmi->audio_mutex); ++ return; ++ } ++ ++ /* ++ * AUDI_CONTENTS0: { RSV, HB2, HB1, RSV } ++ * AUDI_CONTENTS1: { PB3, PB2, PB1, PB0 } ++ * AUDI_CONTENTS2: { PB7, PB6, PB5, PB4 } ++ * ++ * PB0: CheckSum ++ * PB1: | CT3 | CT2 | CT1 | CT0 | F13 | CC2 | CC1 | CC0 | ++ * PB2: | F27 | F26 | F25 | SF2 | SF1 | SF0 | SS1 | SS0 | ++ * PB3: | F37 | F36 | F35 | F34 | F33 | F32 | F31 | F30 | ++ * PB4: | CA7 | CA6 | CA5 | CA4 | CA3 | CA2 | CA1 | CA0 | ++ * PB5: | DM_INH | LSV3 | LSV2 | LSV1 | LSV0 | F52 | F51 | F50 | ++ * PB6~PB10: Reserved ++ * ++ * AUDI_CONTENTS0 default value defined by HDMI specification, ++ * and shall only be changed for debug purposes. ++ * So, we only configure payload byte from PB0~PB7(2 word total). ++ */ ++ regmap_bulk_write(hdmi->regm, PKT_AUDI_CONTENTS1, &infoframe_buf[3], 2); ++ ++ /* Enable ACR, AUDI */ ++ hdmi_modb(hdmi, PKTSCHED_ACR_TX_EN | PKTSCHED_AUDI_TX_EN, ++ PKTSCHED_ACR_TX_EN | PKTSCHED_AUDI_TX_EN, ++ PKTSCHED_PKT_EN); ++ ++ /* Enable AUDS */ ++ hdmi_modb(hdmi, PKTSCHED_AUDS_TX_EN, PKTSCHED_AUDS_TX_EN, PKTSCHED_PKT_EN); ++ mutex_unlock(&hdmi->audio_mutex); +} -+#endif /* KBASE_GPU_RESET_EN */ ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_set_audio_infoframe); + -+/** -+ * kbase_job_slot_softstop_swflags - Soft-stop a job with flags -+ * @kbdev: The kbase device -+ * @js: The job slot to soft-stop -+ * @target_katom: The job that should be soft-stopped (or NULL for any job) -+ * @sw_flags: Flags to pass in about the soft-stop -+ * -+ * Context: -+ * The job slot lock must be held when calling this function. -+ * The job slot must not already be in the process of being soft-stopped. -+ * -+ * Soft-stop the specified job slot, with extra information about the stop -+ * -+ * Where possible any job in the next register is evicted before the soft-stop. -+ */ -+void kbase_job_slot_softstop_swflags(struct kbase_device *kbdev, int js, -+ struct kbase_jd_atom *target_katom, u32 sw_flags) ++static void hdmi_enable_audio_clk(struct dw_hdmi_qp *hdmi, bool enable) +{ -+ KBASE_DEBUG_ASSERT(!(sw_flags & JS_COMMAND_MASK)); -+ kbase_backend_soft_hard_stop_slot(kbdev, NULL, js, target_katom, -+ JS_COMMAND_SOFT_STOP | sw_flags); ++ if (enable) ++ hdmi_modb(hdmi, 0, ++ AVP_DATAPATH_PACKET_AUDIO_SWDISABLE, GLOBAL_SWDISABLE); ++ else ++ hdmi_modb(hdmi, AVP_DATAPATH_PACKET_AUDIO_SWDISABLE, ++ AVP_DATAPATH_PACKET_AUDIO_SWDISABLE, GLOBAL_SWDISABLE); +} + -+/** -+ * kbase_job_slot_softstop - Soft-stop the specified job slot -+ * @kbdev: The kbase device -+ * @js: The job slot to soft-stop -+ * @target_katom: The job that should be soft-stopped (or NULL for any job) -+ * Context: -+ * The job slot lock must be held when calling this function. -+ * The job slot must not already be in the process of being soft-stopped. -+ * -+ * Where possible any job in the next register is evicted before the soft-stop. -+ */ -+void kbase_job_slot_softstop(struct kbase_device *kbdev, int js, -+ struct kbase_jd_atom *target_katom) ++static void dw_hdmi_i2s_audio_enable(struct dw_hdmi_qp *hdmi) +{ -+ kbase_job_slot_softstop_swflags(kbdev, js, target_katom, 0u); ++ hdmi_set_cts_n(hdmi, hdmi->audio_cts, hdmi->audio_n); ++ hdmi_enable_audio_clk(hdmi, true); +} + -+/** -+ * kbase_job_slot_hardstop - Hard-stop the specified job slot -+ * @kctx: The kbase context that contains the job(s) that should -+ * be hard-stopped -+ * @js: The job slot to hard-stop -+ * @target_katom: The job that should be hard-stopped (or NULL for all -+ * jobs from the context) -+ * Context: -+ * The job slot lock must be held when calling this function. -+ */ -+void kbase_job_slot_hardstop(struct kbase_context *kctx, int js, -+ struct kbase_jd_atom *target_katom) ++static void dw_hdmi_i2s_audio_disable(struct dw_hdmi_qp *hdmi) +{ -+ struct kbase_device *kbdev = kctx->kbdev; -+ bool stopped; -+#if KBASE_GPU_RESET_EN -+ /* We make the check for AFBC before evicting/stopping atoms. Note -+ * that no other thread can modify the slots whilst we have the -+ * hwaccess_lock. */ -+ int needs_workaround_for_afbc = -+ kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_T76X_3542) -+ && kbasep_check_for_afbc_on_slot(kbdev, kctx, js, -+ target_katom); -+#endif ++ /* ++ * Keep ACR, AUDI, AUDS packet always on to make SINK device ++ * active for better compatibility and user experience. ++ * ++ * This also fix POP sound on some SINK devices which wakeup ++ * from suspend to active. ++ */ ++ hdmi_modb(hdmi, I2S_BPCUV_RCV_DIS, I2S_BPCUV_RCV_MSK, ++ AUDIO_INTERFACE_CONFIG0); ++ hdmi_modb(hdmi, AUDPKT_PBIT_FORCE_EN | AUDPKT_CHSTATUS_OVR_EN, ++ AUDPKT_PBIT_FORCE_EN_MASK | AUDPKT_CHSTATUS_OVR_EN_MASK, ++ AUDPKT_CONTROL0); ++} + -+ stopped = kbase_backend_soft_hard_stop_slot(kbdev, kctx, js, -+ target_katom, -+ JS_COMMAND_HARD_STOP); -+#if KBASE_GPU_RESET_EN -+ if (stopped && (kbase_hw_has_issue(kctx->kbdev, BASE_HW_ISSUE_8401) || -+ kbase_hw_has_issue(kctx->kbdev, BASE_HW_ISSUE_9510) || -+ needs_workaround_for_afbc)) { -+ /* MIDBASE-2916 if a fragment job with AFBC encoding is -+ * hardstopped, ensure to do a soft reset also in order to -+ * clear the GPU status. -+ * Workaround for HW issue 8401 has an issue,so after -+ * hard-stopping just reset the GPU. This will ensure that the -+ * jobs leave the GPU.*/ -+ if (kbase_prepare_to_reset_gpu_locked(kbdev)) { -+ dev_err(kbdev->dev, "Issueing GPU soft-reset after hard stopping due to hardware issue"); -+ kbase_reset_gpu_locked(kbdev); -+ } ++void dw_hdmi_qp_audio_enable(struct dw_hdmi_qp *hdmi) ++{ ++ mutex_lock(&hdmi->audio_mutex); ++ if (hdmi->dclk_en) { ++ hdmi->audio_enable = true; ++ if (hdmi->enable_audio) ++ hdmi->enable_audio(hdmi); + } -+#endif ++ mutex_unlock(&hdmi->audio_mutex); +} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_audio_enable); + -+/** -+ * kbase_job_check_enter_disjoint - potentiall enter disjoint mode -+ * @kbdev: kbase device -+ * @action: the event which has occurred -+ * @core_reqs: core requirements of the atom -+ * @target_katom: the atom which is being affected -+ * -+ * For a certain soft/hard-stop action, work out whether to enter disjoint -+ * state. -+ * -+ * This does not register multiple disjoint events if the atom has already -+ * started a disjoint period -+ * -+ * @core_reqs can be supplied as 0 if the atom had not started on the hardware -+ * (and so a 'real' soft/hard-stop was not required, but it still interrupted -+ * flow, perhaps on another context) -+ * -+ * kbase_job_check_leave_disjoint() should be used to end the disjoint -+ * state when the soft/hard-stop action is complete -+ */ -+void kbase_job_check_enter_disjoint(struct kbase_device *kbdev, u32 action, -+ base_jd_core_req core_reqs, struct kbase_jd_atom *target_katom) ++void dw_hdmi_qp_audio_disable(struct dw_hdmi_qp *hdmi) +{ -+ u32 hw_action = action & JS_COMMAND_MASK; ++ mutex_lock(&hdmi->audio_mutex); ++ if (hdmi->dclk_en) { ++ hdmi->audio_enable = false; ++ if (hdmi->disable_audio) ++ hdmi->disable_audio(hdmi); ++ } ++ mutex_unlock(&hdmi->audio_mutex); ++} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_audio_disable); + -+ /* For hard-stop, don't enter if hard-stop not allowed */ -+ if (hw_action == JS_COMMAND_HARD_STOP && -+ !kbasep_hard_stop_allowed(kbdev, core_reqs)) -+ return; ++static bool hdmi_bus_fmt_is_rgb(unsigned int bus_format) ++{ ++ switch (bus_format) { ++ case MEDIA_BUS_FMT_RGB888_1X24: ++ case MEDIA_BUS_FMT_RGB101010_1X30: ++ case MEDIA_BUS_FMT_RGB121212_1X36: ++ case MEDIA_BUS_FMT_RGB161616_1X48: ++ return true; + -+ /* For soft-stop, don't enter if soft-stop not allowed, or isn't -+ * causing disjoint */ -+ if (hw_action == JS_COMMAND_SOFT_STOP && -+ !(kbasep_soft_stop_allowed(kbdev, target_katom) && -+ (action & JS_COMMAND_SW_CAUSES_DISJOINT))) -+ return; ++ default: ++ return false; ++ } ++} + -+ /* Nothing to do if already logged disjoint state on this atom */ -+ if (target_katom->atom_flags & KBASE_KATOM_FLAG_IN_DISJOINT) -+ return; ++static bool hdmi_bus_fmt_is_yuv444(unsigned int bus_format) ++{ ++ switch (bus_format) { ++ case MEDIA_BUS_FMT_YUV8_1X24: ++ case MEDIA_BUS_FMT_YUV10_1X30: ++ case MEDIA_BUS_FMT_YUV12_1X36: ++ case MEDIA_BUS_FMT_YUV16_1X48: ++ return true; + -+ target_katom->atom_flags |= KBASE_KATOM_FLAG_IN_DISJOINT; -+ kbase_disjoint_state_up(kbdev); ++ default: ++ return false; ++ } +} + -+/** -+ * kbase_job_check_enter_disjoint - potentially leave disjoint state -+ * @kbdev: kbase device -+ * @target_katom: atom which is finishing -+ * -+ * Work out whether to leave disjoint state when finishing an atom that was -+ * originated by kbase_job_check_enter_disjoint(). -+ */ -+void kbase_job_check_leave_disjoint(struct kbase_device *kbdev, -+ struct kbase_jd_atom *target_katom) ++static bool hdmi_bus_fmt_is_yuv422(unsigned int bus_format) +{ -+ if (target_katom->atom_flags & KBASE_KATOM_FLAG_IN_DISJOINT) { -+ target_katom->atom_flags &= ~KBASE_KATOM_FLAG_IN_DISJOINT; -+ kbase_disjoint_state_down(kbdev); ++ switch (bus_format) { ++ case MEDIA_BUS_FMT_UYVY8_1X16: ++ case MEDIA_BUS_FMT_UYVY10_1X20: ++ case MEDIA_BUS_FMT_UYVY12_1X24: ++ case MEDIA_BUS_FMT_YUYV8_1X16: ++ case MEDIA_BUS_FMT_YUYV10_1X20: ++ case MEDIA_BUS_FMT_YUYV12_1X24: ++ return true; ++ ++ default: ++ return false; + } +} + -+ -+#if KBASE_GPU_RESET_EN -+static void kbase_debug_dump_registers(struct kbase_device *kbdev) ++static bool hdmi_bus_fmt_is_yuv420(unsigned int bus_format) +{ -+ int i; -+ -+ kbase_io_history_dump(kbdev); ++ switch (bus_format) { ++ case MEDIA_BUS_FMT_UYYVYY8_0_5X24: ++ case MEDIA_BUS_FMT_UYYVYY10_0_5X30: ++ case MEDIA_BUS_FMT_UYYVYY12_0_5X36: ++ case MEDIA_BUS_FMT_UYYVYY16_0_5X48: ++ return true; + -+ dev_err(kbdev->dev, "Register state:"); -+ dev_err(kbdev->dev, " GPU_IRQ_RAWSTAT=0x%08x GPU_STATUS=0x%08x", -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_RAWSTAT), NULL), -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_STATUS), NULL)); -+ dev_err(kbdev->dev, " JOB_IRQ_RAWSTAT=0x%08x JOB_IRQ_JS_STATE=0x%08x", -+ kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_RAWSTAT), NULL), -+ kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_JS_STATE), NULL)); -+ for (i = 0; i < 3; i++) { -+ dev_err(kbdev->dev, " JS%d_STATUS=0x%08x JS%d_HEAD_LO=0x%08x", -+ i, kbase_reg_read(kbdev, JOB_SLOT_REG(i, JS_STATUS), -+ NULL), -+ i, kbase_reg_read(kbdev, JOB_SLOT_REG(i, JS_HEAD_LO), -+ NULL)); ++ default: ++ return false; + } -+ dev_err(kbdev->dev, " MMU_IRQ_RAWSTAT=0x%08x GPU_FAULTSTATUS=0x%08x", -+ kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_RAWSTAT), NULL), -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_FAULTSTATUS), NULL)); -+ dev_err(kbdev->dev, " GPU_IRQ_MASK=0x%08x JOB_IRQ_MASK=0x%08x MMU_IRQ_MASK=0x%08x", -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), NULL), -+ kbase_reg_read(kbdev, JOB_CONTROL_REG(JOB_IRQ_MASK), NULL), -+ kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_MASK), NULL)); -+ dev_err(kbdev->dev, " PWR_OVERRIDE0=0x%08x PWR_OVERRIDE1=0x%08x", -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(PWR_OVERRIDE0), NULL), -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(PWR_OVERRIDE1), NULL)); -+ dev_err(kbdev->dev, " SHADER_CONFIG=0x%08x L2_MMU_CONFIG=0x%08x", -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(SHADER_CONFIG), NULL), -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(L2_MMU_CONFIG), NULL)); -+ dev_err(kbdev->dev, " TILER_CONFIG=0x%08x JM_CONFIG=0x%08x", -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(TILER_CONFIG), NULL), -+ kbase_reg_read(kbdev, GPU_CONTROL_REG(JM_CONFIG), NULL)); +} + -+static void kbasep_reset_timeout_worker(struct work_struct *data) ++static int hdmi_bus_fmt_color_depth(unsigned int bus_format) +{ -+ unsigned long flags; -+ struct kbase_device *kbdev; -+ ktime_t end_timestamp = ktime_get(); -+ struct kbasep_js_device_data *js_devdata; -+ bool try_schedule = false; -+ bool silent = false; -+ u32 max_loops = KBASE_CLEAN_CACHE_MAX_LOOPS; ++ switch (bus_format) { ++ case MEDIA_BUS_FMT_RGB888_1X24: ++ case MEDIA_BUS_FMT_YUV8_1X24: ++ case MEDIA_BUS_FMT_UYVY8_1X16: ++ case MEDIA_BUS_FMT_YUYV8_1X16: ++ case MEDIA_BUS_FMT_UYYVYY8_0_5X24: ++ return 8; + -+ KBASE_DEBUG_ASSERT(data); ++ case MEDIA_BUS_FMT_RGB101010_1X30: ++ case MEDIA_BUS_FMT_YUV10_1X30: ++ case MEDIA_BUS_FMT_UYVY10_1X20: ++ case MEDIA_BUS_FMT_YUYV10_1X20: ++ case MEDIA_BUS_FMT_UYYVYY10_0_5X30: ++ return 10; + -+ kbdev = container_of(data, struct kbase_device, -+ hwaccess.backend.reset_work); ++ case MEDIA_BUS_FMT_RGB121212_1X36: ++ case MEDIA_BUS_FMT_YUV12_1X36: ++ case MEDIA_BUS_FMT_UYVY12_1X24: ++ case MEDIA_BUS_FMT_YUYV12_1X24: ++ case MEDIA_BUS_FMT_UYYVYY12_0_5X36: ++ return 12; + -+ KBASE_DEBUG_ASSERT(kbdev); -+ js_devdata = &kbdev->js_data; ++ case MEDIA_BUS_FMT_RGB161616_1X48: ++ case MEDIA_BUS_FMT_YUV16_1X48: ++ case MEDIA_BUS_FMT_UYYVYY16_0_5X48: ++ return 16; + -+ if (atomic_read(&kbdev->hwaccess.backend.reset_gpu) == -+ KBASE_RESET_GPU_SILENT) -+ silent = true; ++ default: ++ return 0; ++ } ++} + -+ KBASE_TRACE_ADD(kbdev, JM_BEGIN_RESET_WORKER, NULL, NULL, 0u, 0); ++static void dw_hdmi_i2c_init(struct dw_hdmi_qp *hdmi) ++{ ++ /* Software reset */ ++ hdmi_writel(hdmi, 0x01, I2CM_CONTROL0); + -+ /* Suspend vinstr. -+ * This call will block until vinstr is suspended. */ -+ kbase_vinstr_suspend(kbdev->vinstr_ctx); ++ hdmi_modb(hdmi, 0, I2CM_FM_EN, I2CM_INTERFACE_CONTROL0); + -+ /* Make sure the timer has completed - this cannot be done from -+ * interrupt context, so this cannot be done within -+ * kbasep_try_reset_gpu_early. */ -+ hrtimer_cancel(&kbdev->hwaccess.backend.reset_timer); ++ /* Clear DONE and ERROR interrupts */ ++ hdmi_writel(hdmi, I2CM_OP_DONE_CLEAR | I2CM_NACK_RCVD_CLEAR, ++ MAINUNIT_1_INT_CLEAR); ++} + -+ if (kbase_pm_context_active_handle_suspend(kbdev, -+ KBASE_PM_SUSPEND_HANDLER_DONT_REACTIVATE)) { -+ /* This would re-activate the GPU. Since it's already idle, -+ * there's no need to reset it */ -+ atomic_set(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_NOT_PENDING); -+ kbase_disjoint_state_down(kbdev); -+ wake_up(&kbdev->hwaccess.backend.reset_wait); -+ kbase_vinstr_resume(kbdev->vinstr_ctx); -+ return; ++static int dw_hdmi_i2c_read(struct dw_hdmi_qp *hdmi, ++ unsigned char *buf, unsigned int length) ++{ ++ struct dw_hdmi_qp_i2c *i2c = hdmi->i2c; ++ int stat; ++ ++ if (!i2c->is_regaddr) { ++ dev_dbg(hdmi->dev, "set read register address to 0\n"); ++ i2c->slave_reg = 0x00; ++ i2c->is_regaddr = true; + } + -+ KBASE_DEBUG_ASSERT(kbdev->irq_reset_flush == false); ++ while (length--) { ++ reinit_completion(&i2c->cmp); + -+ spin_lock_irqsave(&kbdev->hwcnt.lock, flags); -+ spin_lock(&kbdev->hwaccess_lock); -+ spin_lock(&kbdev->mmu_mask_change); -+ /* We're about to flush out the IRQs and their bottom half's */ -+ kbdev->irq_reset_flush = true; ++ hdmi_modb(hdmi, i2c->slave_reg++ << 12, I2CM_ADDR, ++ I2CM_INTERFACE_CONTROL0); + -+ /* Disable IRQ to avoid IRQ handlers to kick in after releasing the -+ * spinlock; this also clears any outstanding interrupts */ -+ kbase_pm_disable_interrupts_nolock(kbdev); ++ if (i2c->is_segment) ++ hdmi_modb(hdmi, I2CM_EXT_READ, I2CM_WR_MASK, ++ I2CM_INTERFACE_CONTROL0); ++ else ++ hdmi_modb(hdmi, I2CM_FM_READ, I2CM_WR_MASK, ++ I2CM_INTERFACE_CONTROL0); + -+ spin_unlock(&kbdev->mmu_mask_change); -+ spin_unlock(&kbdev->hwaccess_lock); -+ spin_unlock_irqrestore(&kbdev->hwcnt.lock, flags); ++ stat = wait_for_completion_timeout(&i2c->cmp, HZ / 10); ++ if (!stat) { ++ dev_err(hdmi->dev, "i2c read time out!\n"); ++ hdmi_writel(hdmi, 0x01, I2CM_CONTROL0); ++ return -EAGAIN; ++ } + -+ /* Ensure that any IRQ handlers have finished -+ * Must be done without any locks IRQ handlers will take */ -+ kbase_synchronize_irqs(kbdev); ++ /* Check for error condition on the bus */ ++ if (i2c->stat & I2CM_NACK_RCVD_IRQ) { ++ dev_err(hdmi->dev, "i2c read err!\n"); ++ hdmi_writel(hdmi, 0x01, I2CM_CONTROL0); ++ return -EIO; ++ } + -+ /* Flush out any in-flight work items */ -+ kbase_flush_mmu_wqs(kbdev); ++ *buf++ = hdmi_readl(hdmi, I2CM_INTERFACE_RDDATA_0_3) & 0xff; ++ dev_dbg(hdmi->dev, "i2c read done! i2c->stat:%02x 0x%02x\n", ++ i2c->stat, hdmi_readl(hdmi, I2CM_INTERFACE_RDDATA_0_3)); ++ hdmi_modb(hdmi, 0, I2CM_WR_MASK, I2CM_INTERFACE_CONTROL0); ++ } ++ i2c->is_segment = false; + -+ /* The flush has completed so reset the active indicator */ -+ kbdev->irq_reset_flush = false; ++ return 0; ++} + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TMIX_8463)) { -+ /* Ensure that L2 is not transitioning when we send the reset -+ * command */ -+ while (--max_loops && kbase_pm_get_trans_cores(kbdev, -+ KBASE_PM_CORE_L2)) -+ ; ++static int dw_hdmi_i2c_write(struct dw_hdmi_qp *hdmi, ++ unsigned char *buf, unsigned int length) ++{ ++ struct dw_hdmi_qp_i2c *i2c = hdmi->i2c; ++ int stat; + -+ WARN(!max_loops, "L2 power transition timed out while trying to reset\n"); ++ if (!i2c->is_regaddr) { ++ /* Use the first write byte as register address */ ++ i2c->slave_reg = buf[0]; ++ length--; ++ buf++; ++ i2c->is_regaddr = true; + } + -+ mutex_lock(&kbdev->pm.lock); -+ /* We hold the pm lock, so there ought to be a current policy */ -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.pm_current_policy); ++ while (length--) { ++ reinit_completion(&i2c->cmp); + -+ /* All slot have been soft-stopped and we've waited -+ * SOFT_STOP_RESET_TIMEOUT for the slots to clear, at this point we -+ * assume that anything that is still left on the GPU is stuck there and -+ * we'll kill it when we reset the GPU */ ++ hdmi_writel(hdmi, *buf++, I2CM_INTERFACE_WRDATA_0_3); ++ hdmi_modb(hdmi, i2c->slave_reg++ << 12, I2CM_ADDR, ++ I2CM_INTERFACE_CONTROL0); ++ hdmi_modb(hdmi, I2CM_FM_WRITE, I2CM_WR_MASK, ++ I2CM_INTERFACE_CONTROL0); + -+ if (!silent) -+ dev_err(kbdev->dev, "Resetting GPU (allowing up to %d ms)", -+ RESET_TIMEOUT); ++ stat = wait_for_completion_timeout(&i2c->cmp, HZ / 10); ++ if (!stat) { ++ dev_err(hdmi->dev, "i2c write time out!\n"); ++ hdmi_writel(hdmi, 0x01, I2CM_CONTROL0); ++ return -EAGAIN; ++ } + -+ /* Output the state of some interesting registers to help in the -+ * debugging of GPU resets */ -+ if (!silent) -+ kbase_debug_dump_registers(kbdev); ++ /* Check for error condition on the bus */ ++ if (i2c->stat & I2CM_NACK_RCVD_IRQ) { ++ dev_err(hdmi->dev, "i2c write nack!\n"); ++ hdmi_writel(hdmi, 0x01, I2CM_CONTROL0); ++ return -EIO; ++ } ++ hdmi_modb(hdmi, 0, I2CM_WR_MASK, I2CM_INTERFACE_CONTROL0); ++ } ++ dev_dbg(hdmi->dev, "i2c write done!\n"); ++ return 0; ++} + -+ /* Complete any jobs that were still on the GPU */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbdev->protected_mode = false; -+ kbase_backend_reset(kbdev, &end_timestamp); -+ kbase_pm_metrics_update(kbdev, NULL); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++static int dw_hdmi_i2c_xfer(struct i2c_adapter *adap, ++ struct i2c_msg *msgs, int num) ++{ ++ struct dw_hdmi_qp *hdmi = i2c_get_adapdata(adap); ++ struct dw_hdmi_qp_i2c *i2c = hdmi->i2c; ++ u8 addr = msgs[0].addr; ++ int i, ret = 0; + -+ /* Reset the GPU */ -+ kbase_pm_init_hw(kbdev, 0); ++ if (addr == DDC_CI_ADDR) ++ /* ++ * The internal I2C controller does not support the multi-byte ++ * read and write operations needed for DDC/CI. ++ * TOFIX: Blacklist the DDC/CI address until we filter out ++ * unsupported I2C operations. ++ */ ++ return -EOPNOTSUPP; + -+ mutex_unlock(&kbdev->pm.lock); ++ dev_dbg(hdmi->dev, "i2c xfer: num: %d, addr: %#x\n", num, addr); + -+ mutex_lock(&js_devdata->runpool_mutex); ++ for (i = 0; i < num; i++) { ++ if (msgs[i].len == 0) { ++ dev_err(hdmi->dev, ++ "unsupported transfer %d/%d, no data\n", ++ i + 1, num); ++ return -EOPNOTSUPP; ++ } ++ } + -+ mutex_lock(&kbdev->mmu_hw_mutex); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_ctx_sched_restore_all_as(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ mutex_unlock(&kbdev->mmu_hw_mutex); ++ mutex_lock(&i2c->lock); + -+ kbase_pm_enable_interrupts(kbdev); ++ /* Unmute DONE and ERROR interrupts */ ++ hdmi_modb(hdmi, I2CM_NACK_RCVD_MASK_N | I2CM_OP_DONE_MASK_N, ++ I2CM_NACK_RCVD_MASK_N | I2CM_OP_DONE_MASK_N, ++ MAINUNIT_1_INT_MASK_N); + -+ atomic_set(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_NOT_PENDING); ++ /* Set slave device address taken from the first I2C message */ ++ if (addr == DDC_SEGMENT_ADDR && msgs[0].len == 1) ++ addr = DDC_ADDR; + -+ kbase_disjoint_state_down(kbdev); ++ hdmi_modb(hdmi, addr << 5, I2CM_SLVADDR, I2CM_INTERFACE_CONTROL0); + -+ wake_up(&kbdev->hwaccess.backend.reset_wait); -+ if (!silent) -+ dev_err(kbdev->dev, "Reset complete"); ++ /* Set slave device register address on transfer */ ++ i2c->is_regaddr = false; + -+ if (js_devdata->nr_contexts_pullable > 0 && !kbdev->poweroff_pending) -+ try_schedule = true; ++ /* Set segment pointer for I2C extended read mode operation */ ++ i2c->is_segment = false; + -+ mutex_unlock(&js_devdata->runpool_mutex); ++ for (i = 0; i < num; i++) { ++ dev_dbg(hdmi->dev, "xfer: num: %d/%d, len: %d, flags: %#x\n", ++ i + 1, num, msgs[i].len, msgs[i].flags); + -+ mutex_lock(&kbdev->pm.lock); ++ if (msgs[i].addr == DDC_SEGMENT_ADDR && msgs[i].len == 1) { ++ i2c->is_segment = true; ++ hdmi_modb(hdmi, DDC_SEGMENT_ADDR, I2CM_SEG_ADDR, ++ I2CM_INTERFACE_CONTROL1); ++ hdmi_modb(hdmi, *msgs[i].buf << 7, I2CM_SEG_PTR, ++ I2CM_INTERFACE_CONTROL1); ++ } else { ++ if (msgs[i].flags & I2C_M_RD) ++ ret = dw_hdmi_i2c_read(hdmi, msgs[i].buf, ++ msgs[i].len); ++ else ++ ret = dw_hdmi_i2c_write(hdmi, msgs[i].buf, ++ msgs[i].len); ++ } ++ if (ret < 0) ++ break; ++ } + -+ /* Find out what cores are required now */ -+ kbase_pm_update_cores_state(kbdev); ++ if (!ret) ++ ret = num; + -+ /* Synchronously request and wait for those cores, because if -+ * instrumentation is enabled it would need them immediately. */ -+ kbase_pm_check_transitions_sync(kbdev); ++ /* Mute DONE and ERROR interrupts */ ++ hdmi_modb(hdmi, 0, I2CM_OP_DONE_MASK_N | I2CM_NACK_RCVD_MASK_N, ++ MAINUNIT_1_INT_MASK_N); + -+ mutex_unlock(&kbdev->pm.lock); ++ mutex_unlock(&i2c->lock); + -+ /* Try submitting some jobs to restart processing */ -+ if (try_schedule) { -+ KBASE_TRACE_ADD(kbdev, JM_SUBMIT_AFTER_RESET, NULL, NULL, 0u, -+ 0); -+ kbase_js_sched_all(kbdev); -+ } ++ return ret; ++} + -+ /* Process any pending slot updates */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_backend_slot_update(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++static u32 dw_hdmi_i2c_func(struct i2c_adapter *adapter) ++{ ++ return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; ++} + -+ kbase_pm_context_idle(kbdev); ++static const struct i2c_algorithm dw_hdmi_algorithm = { ++ .master_xfer = dw_hdmi_i2c_xfer, ++ .functionality = dw_hdmi_i2c_func, ++}; + -+ /* Release vinstr */ -+ kbase_vinstr_resume(kbdev->vinstr_ctx); ++static struct i2c_adapter *dw_hdmi_i2c_adapter(struct dw_hdmi_qp *hdmi) ++{ ++ struct i2c_adapter *adap; ++ struct dw_hdmi_qp_i2c *i2c; ++ int ret; + -+ KBASE_TRACE_ADD(kbdev, JM_END_RESET_WORKER, NULL, NULL, 0u, 0); -+} ++ i2c = devm_kzalloc(hdmi->dev, sizeof(*i2c), GFP_KERNEL); ++ if (!i2c) ++ return ERR_PTR(-ENOMEM); + -+static enum hrtimer_restart kbasep_reset_timer_callback(struct hrtimer *timer) -+{ -+ struct kbase_device *kbdev = container_of(timer, struct kbase_device, -+ hwaccess.backend.reset_timer); ++ mutex_init(&i2c->lock); ++ init_completion(&i2c->cmp); + -+ KBASE_DEBUG_ASSERT(kbdev); ++ adap = &i2c->adap; ++ adap->class = I2C_CLASS_DDC; ++ adap->owner = THIS_MODULE; ++ adap->dev.parent = hdmi->dev; ++ adap->algo = &dw_hdmi_algorithm; ++ strscpy(adap->name, "ddc", sizeof(adap->name)); ++ i2c_set_adapdata(adap, hdmi); + -+ /* Reset still pending? */ -+ if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_COMMITTED, KBASE_RESET_GPU_HAPPENING) == -+ KBASE_RESET_GPU_COMMITTED) -+ queue_work(kbdev->hwaccess.backend.reset_workq, -+ &kbdev->hwaccess.backend.reset_work); ++ ret = i2c_add_adapter(adap); ++ if (ret) { ++ dev_warn(hdmi->dev, "cannot add %s I2C adapter\n", adap->name); ++ devm_kfree(hdmi->dev, i2c); ++ return ERR_PTR(ret); ++ } + -+ return HRTIMER_NORESTART; ++ hdmi->i2c = i2c; ++ ++ dev_info(hdmi->dev, "registered %s I2C bus driver\n", adap->name); ++ ++ return adap; +} + -+/* -+ * If all jobs are evicted from the GPU then we can reset the GPU -+ * immediately instead of waiting for the timeout to elapse -+ */ ++#define HDMI_PHY_EARC_MASK BIT(29) + -+static void kbasep_try_reset_gpu_early_locked(struct kbase_device *kbdev) ++int dw_hdmi_qp_set_earc(struct dw_hdmi_qp *hdmi) +{ -+ int i; -+ int pending_jobs = 0; ++ u32 stat, ret; + -+ KBASE_DEBUG_ASSERT(kbdev); ++ /* set hdmi phy earc mode */ ++ hdmi->phy.ops->set_mode(hdmi, hdmi->phy.data, HDMI_PHY_EARC_MASK, ++ true); + -+ /* Count the number of jobs */ -+ for (i = 0; i < kbdev->gpu_props.num_job_slots; i++) -+ pending_jobs += kbase_backend_nr_atoms_submitted(kbdev, i); ++ ret = hdmi->phy.ops->init(hdmi, hdmi->phy.data, ++ &hdmi->previous_mode); ++ if (ret) ++ return ret; + -+ if (pending_jobs > 0) { -+ /* There are still jobs on the GPU - wait */ -+ return; -+ } ++ hdmi->disabled = false; + -+ /* To prevent getting incorrect registers when dumping failed job, -+ * skip early reset. ++ reinit_completion(&hdmi->earc_cmp); ++ ++ hdmi_modb(hdmi, EARCRX_CMDC_DISCOVERY_TIMEOUT_IRQ | ++ EARCRX_CMDC_DISCOVERY_DONE_IRQ, ++ EARCRX_CMDC_DISCOVERY_TIMEOUT_IRQ | ++ EARCRX_CMDC_DISCOVERY_DONE_IRQ, EARCRX_0_INT_MASK_N); ++ ++ /* start discovery */ ++ hdmi_modb(hdmi, EARCRX_CMDC_DISCOVERY_EN, EARCRX_CMDC_DISCOVERY_EN, ++ EARCRX_CMDC_CONTROL); ++ ++ /* ++ * The eARC TX device drives a logic-high-voltage-level ++ * pulse on the physical HPD connector pin, after ++ * at least 100 ms of low voltage level to start the ++ * eARC Discovery process. + */ -+ if (kbdev->job_fault_debug != false) -+ return; ++ hdmi_modb(hdmi, EARCRX_CONNECTOR_HPD, EARCRX_CONNECTOR_HPD, ++ EARCRX_CMDC_CONTROL); + -+ /* Check that the reset has been committed to (i.e. kbase_reset_gpu has -+ * been called), and that no other thread beat this thread to starting -+ * the reset */ -+ if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_COMMITTED, KBASE_RESET_GPU_HAPPENING) != -+ KBASE_RESET_GPU_COMMITTED) { -+ /* Reset has already occurred */ -+ return; ++ stat = wait_for_completion_timeout(&hdmi->earc_cmp, HZ / 10); ++ if (!stat) ++ return -EAGAIN; ++ ++ if (hdmi->earc_intr & EARCRX_CMDC_DISCOVERY_TIMEOUT_IRQ) { ++ dev_err(hdmi->dev, "discovery timeout\n"); ++ return -ETIMEDOUT; ++ } else if (hdmi->earc_intr & EARCRX_CMDC_DISCOVERY_DONE_IRQ) { ++ dev_info(hdmi->dev, "discovery done\n"); ++ } else { ++ dev_err(hdmi->dev, "discovery failed\n"); ++ return -EINVAL; + } + -+ queue_work(kbdev->hwaccess.backend.reset_workq, -+ &kbdev->hwaccess.backend.reset_work); -+} ++ hdmi_writel(hdmi, 1, EARCRX_DMAC_PHY_CONTROL); ++ hdmi_modb(hdmi, EARCRX_CMDC_SWINIT_P, EARCRX_CMDC_SWINIT_P, ++ EARCRX_CMDC_CONFIG0); + -+static void kbasep_try_reset_gpu_early(struct kbase_device *kbdev) -+{ -+ unsigned long flags; -+ struct kbasep_js_device_data *js_devdata; ++ hdmi_writel(hdmi, 0xf3, EARCRX_DMAC_CONFIG); ++ hdmi_writel(hdmi, 0x63, EARCRX_DMAC_CONTROL0); ++ hdmi_writel(hdmi, 0xff, EARCRX_DMAC_CONTROL1); + -+ js_devdata = &kbdev->js_data; -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbasep_try_reset_gpu_early_locked(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ hdmi_modb(hdmi, EARCRX_XACTREAD_STOP_CFG | EARCRX_XACTREAD_RETRY_CFG | ++ EARCRX_CMDC_DSCVR_EARCVALID0_TO_DISC1 | EARCRX_CMDC_XACT_RESTART_EN, ++ EARCRX_XACTREAD_STOP_CFG | EARCRX_XACTREAD_RETRY_CFG | ++ EARCRX_CMDC_DSCVR_EARCVALID0_TO_DISC1 | EARCRX_CMDC_XACT_RESTART_EN, ++ EARCRX_CMDC_CONFIG0); ++ ++ hdmi_writel(hdmi, 0, EARCRX_DMAC_CHSTATUS_STREAMER0); ++ hdmi_writel(hdmi, 0x1b0e, EARCRX_DMAC_CHSTATUS_STREAMER1); ++ hdmi_writel(hdmi, 0, EARCRX_DMAC_CHSTATUS_STREAMER2); ++ hdmi_writel(hdmi, 0, EARCRX_DMAC_CHSTATUS_STREAMER3); ++ hdmi_writel(hdmi, 0xf2000000, EARCRX_DMAC_CHSTATUS_STREAMER4); ++ hdmi_writel(hdmi, 0, EARCRX_DMAC_CHSTATUS_STREAMER5); ++ hdmi_writel(hdmi, 0, EARCRX_DMAC_CHSTATUS_STREAMER6); ++ hdmi_writel(hdmi, 0, EARCRX_DMAC_CHSTATUS_STREAMER7); ++ hdmi_writel(hdmi, 0, EARCRX_DMAC_CHSTATUS_STREAMER8); ++ ++ return 0; +} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_set_earc); + -+/** -+ * kbase_prepare_to_reset_gpu_locked - Prepare for resetting the GPU -+ * @kbdev: kbase device -+ * -+ * This function just soft-stops all the slots to ensure that as many jobs as -+ * possible are saved. -+ * -+ * Return: -+ * The function returns a boolean which should be interpreted as follows: -+ * true - Prepared for reset, kbase_reset_gpu_locked should be called. -+ * false - Another thread is performing a reset, kbase_reset_gpu should -+ * not be called. ++/* ----------------------------------------------------------------------------- ++ * HDMI TX Setup + */ -+bool kbase_prepare_to_reset_gpu_locked(struct kbase_device *kbdev) ++ ++static void hdmi_infoframe_set_checksum(u8 *ptr, int size) +{ ++ u8 csum = 0; + int i; + -+ KBASE_DEBUG_ASSERT(kbdev); -+ -+ if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_NOT_PENDING, -+ KBASE_RESET_GPU_PREPARED) != -+ KBASE_RESET_GPU_NOT_PENDING) { -+ /* Some other thread is already resetting the GPU */ -+ return false; -+ } ++ ptr[3] = 0; ++ /* compute checksum */ ++ for (i = 0; i < size; i++) ++ csum += ptr[i]; + -+ kbase_disjoint_state_up(kbdev); ++ ptr[3] = 256 - csum; ++} + -+ for (i = 0; i < kbdev->gpu_props.num_job_slots; i++) -+ kbase_job_slot_softstop(kbdev, i, NULL); ++static bool is_hdmi2_sink(const struct drm_connector *connector) ++{ ++ if (!connector) ++ return true; + -+ return true; ++ return connector->display_info.hdmi.scdc.supported || ++ connector->display_info.color_formats & DRM_COLOR_FORMAT_YCRCB420; +} + -+bool kbase_prepare_to_reset_gpu(struct kbase_device *kbdev) ++static void hdmi_config_AVI(struct dw_hdmi_qp *hdmi, ++ const struct drm_connector *connector, ++ const struct drm_display_mode *mode) +{ -+ unsigned long flags; -+ bool ret; -+ struct kbasep_js_device_data *js_devdata; ++ struct hdmi_avi_infoframe frame; ++ u32 val, i, j; ++ u8 buff[17]; ++ enum hdmi_quantization_range rgb_quant_range = ++ hdmi->hdmi_data.quant_range; + -+ js_devdata = &kbdev->js_data; -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ ret = kbase_prepare_to_reset_gpu_locked(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ /* Initialise info frame from DRM mode */ ++ drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode); + -+ return ret; -+} -+KBASE_EXPORT_TEST_API(kbase_prepare_to_reset_gpu); ++ /* ++ * Ignore monitor selectable quantization, use quantization set ++ * by the user ++ */ ++ drm_hdmi_avi_infoframe_quant_range(&frame, connector, mode, rgb_quant_range); ++ if (hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) ++ frame.colorspace = HDMI_COLORSPACE_YUV444; ++ else if (hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) ++ frame.colorspace = HDMI_COLORSPACE_YUV422; ++ else if (hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_out_bus_format)) ++ frame.colorspace = HDMI_COLORSPACE_YUV420; ++ else ++ frame.colorspace = HDMI_COLORSPACE_RGB; + -+/* -+ * This function should be called after kbase_prepare_to_reset_gpu if it -+ * returns true. It should never be called without a corresponding call to -+ * kbase_prepare_to_reset_gpu. -+ * -+ * After this function is called (or not called if kbase_prepare_to_reset_gpu -+ * returned false), the caller should wait for -+ * kbdev->hwaccess.backend.reset_waitq to be signalled to know when the reset -+ * has completed. -+ */ -+void kbase_reset_gpu(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev); ++ /* Set up colorimetry and quant range */ ++ if (!hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) { ++ switch (hdmi->hdmi_data.enc_out_encoding) { ++ case V4L2_YCBCR_ENC_601: ++ if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV601) ++ frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; ++ else ++ frame.colorimetry = HDMI_COLORIMETRY_ITU_601; ++ frame.extended_colorimetry = ++ HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; ++ break; ++ case V4L2_YCBCR_ENC_709: ++ if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV709) ++ frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; ++ else ++ frame.colorimetry = HDMI_COLORIMETRY_ITU_709; ++ frame.extended_colorimetry = ++ HDMI_EXTENDED_COLORIMETRY_XV_YCC_709; ++ break; ++ case V4L2_YCBCR_ENC_BT2020: ++ if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_BT2020) ++ frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; ++ else ++ frame.colorimetry = HDMI_COLORIMETRY_ITU_709; ++ frame.extended_colorimetry = ++ HDMI_EXTENDED_COLORIMETRY_BT2020; ++ break; ++ default: /* Carries no data */ ++ frame.colorimetry = HDMI_COLORIMETRY_ITU_601; ++ frame.extended_colorimetry = ++ HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; ++ break; ++ } + -+ /* Note this is an assert/atomic_set because it is a software issue for -+ * a race to be occuring here */ -+ KBASE_DEBUG_ASSERT(atomic_read(&kbdev->hwaccess.backend.reset_gpu) == -+ KBASE_RESET_GPU_PREPARED); -+ atomic_set(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_COMMITTED); ++ frame.ycc_quantization_range = HDMI_YCC_QUANTIZATION_RANGE_LIMITED; ++ } else { ++ if (hdmi->hdmi_data.enc_out_encoding == V4L2_YCBCR_ENC_BT2020) { ++ frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; ++ frame.extended_colorimetry = ++ HDMI_EXTENDED_COLORIMETRY_BT2020; ++ } else { ++ frame.colorimetry = HDMI_COLORIMETRY_NONE; ++ frame.extended_colorimetry = ++ HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; ++ } + -+ dev_err(kbdev->dev, "Preparing to soft-reset GPU: Waiting (upto %d ms) for all jobs to complete soft-stop\n", -+ kbdev->reset_timeout_ms); ++ if (is_hdmi2_sink(connector) && ++ frame.quantization_range == HDMI_QUANTIZATION_RANGE_FULL) ++ frame.ycc_quantization_range = HDMI_YCC_QUANTIZATION_RANGE_FULL; ++ else ++ frame.ycc_quantization_range = HDMI_YCC_QUANTIZATION_RANGE_LIMITED; ++ } + -+ hrtimer_start(&kbdev->hwaccess.backend.reset_timer, -+ HR_TIMER_DELAY_MSEC(kbdev->reset_timeout_ms), -+ HRTIMER_MODE_REL); ++ frame.scan_mode = HDMI_SCAN_MODE_NONE; + -+ /* Try resetting early */ -+ kbasep_try_reset_gpu_early(kbdev); -+} -+KBASE_EXPORT_TEST_API(kbase_reset_gpu); ++ hdmi_avi_infoframe_pack_only(&frame, buff, 17); + -+void kbase_reset_gpu_locked(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev); ++ /* mode which vic >= 128 must use avi version 3 */ ++ if (hdmi->vic >= 128) { ++ frame.version = 3; ++ buff[1] = frame.version; ++ buff[4] &= 0x1f; ++ buff[4] |= ((frame.colorspace & 0x7) << 5); ++ buff[7] = hdmi->vic; ++ hdmi_infoframe_set_checksum(buff, 17); ++ } else if (is_hdmi2_sink(connector)) { ++ buff[7] = hdmi->vic; ++ } + -+ /* Note this is an assert/atomic_set because it is a software issue for -+ * a race to be occuring here */ -+ KBASE_DEBUG_ASSERT(atomic_read(&kbdev->hwaccess.backend.reset_gpu) == -+ KBASE_RESET_GPU_PREPARED); -+ atomic_set(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_COMMITTED); ++ /* ++ * The Designware IP uses a different byte format from standard ++ * AVI info frames, though generally the bits are in the correct ++ * bytes. ++ */ + -+ dev_err(kbdev->dev, "Preparing to soft-reset GPU: Waiting (upto %d ms) for all jobs to complete soft-stop\n", -+ kbdev->reset_timeout_ms); -+ hrtimer_start(&kbdev->hwaccess.backend.reset_timer, -+ HR_TIMER_DELAY_MSEC(kbdev->reset_timeout_ms), -+ HRTIMER_MODE_REL); ++ val = (frame.version << 8) | (frame.length << 16); ++ hdmi_writel(hdmi, val, PKT_AVI_CONTENTS0); + -+ /* Try resetting early */ -+ kbasep_try_reset_gpu_early_locked(kbdev); -+} ++ for (i = 0; i < 4; i++) { ++ for (j = 0; j < 4; j++) { ++ if (i * 4 + j >= 14) ++ break; ++ if (!j) ++ val = buff[i * 4 + j + 3]; ++ val |= buff[i * 4 + j + 3] << (8 * j); ++ } + -+void kbase_reset_gpu_silent(struct kbase_device *kbdev) -+{ -+ if (atomic_cmpxchg(&kbdev->hwaccess.backend.reset_gpu, -+ KBASE_RESET_GPU_NOT_PENDING, -+ KBASE_RESET_GPU_SILENT) != -+ KBASE_RESET_GPU_NOT_PENDING) { -+ /* Some other thread is already resetting the GPU */ -+ return; ++ hdmi_writel(hdmi, val, PKT_AVI_CONTENTS1 + i * 4); + } + -+ kbase_disjoint_state_up(kbdev); ++ hdmi_modb(hdmi, 0, PKTSCHED_AVI_FIELDRATE, PKTSCHED_PKT_CONFIG1); + -+ queue_work(kbdev->hwaccess.backend.reset_workq, -+ &kbdev->hwaccess.backend.reset_work); ++ hdmi_modb(hdmi, PKTSCHED_AVI_TX_EN, PKTSCHED_AVI_TX_EN, PKTSCHED_PKT_EN); +} + -+bool kbase_reset_gpu_active(struct kbase_device *kbdev) ++#define VSI_PKT_TYPE 0x81 ++#define VSI_PKT_VERSION 1 ++#define HDMI_FORUM_OUI 0xc45dd8 ++#define ALLM_MODE BIT(1) ++#define HDMI_FORUM_LEN 9 ++ ++static void hdmi_config_vendor_specific_infoframe(struct dw_hdmi_qp *hdmi, ++ const struct drm_connector *connector, ++ const struct drm_display_mode *mode) +{ -+ if (atomic_read(&kbdev->hwaccess.backend.reset_gpu) == -+ KBASE_RESET_GPU_NOT_PENDING) -+ return false; -+ -+ return true; -+} -+#endif /* KBASE_GPU_RESET_EN */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h -new file mode 100755 -index 000000000000..1f382b3c1af4 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h -@@ -0,0 +1,164 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ struct hdmi_vendor_infoframe frame; ++ u8 buffer[10]; ++ u32 val; ++ ssize_t err; ++ int i, reg; ++ struct dw_hdmi_link_config *link_cfg = NULL; ++ void *data = hdmi->plat_data->phy_data; + ++ if (hdmi->plat_data->get_link_cfg) ++ link_cfg = hdmi->plat_data->get_link_cfg(data); + ++ hdmi_modb(hdmi, 0, PKTSCHED_VSI_TX_EN, PKTSCHED_PKT_EN); ++ for (i = 0; i <= 7; i++) ++ hdmi_writel(hdmi, 0, PKT_VSI_CONTENTS0 + i * 4); + ++ if (hdmi->allm_enable && (link_cfg->add_func & SUPPORT_HDMI_ALLM)) { ++ buffer[0] = VSI_PKT_TYPE; ++ buffer[1] = VSI_PKT_VERSION; ++ buffer[2] = 5; ++ buffer[4] = HDMI_FORUM_OUI & 0xff; ++ buffer[5] = (HDMI_FORUM_OUI >> 8) & 0xff; ++ buffer[6] = (HDMI_FORUM_OUI >> 16) & 0xff; ++ buffer[7] = VSI_PKT_VERSION; ++ buffer[8] = ALLM_MODE; + ++ hdmi_infoframe_set_checksum(buffer, HDMI_FORUM_LEN); + -+/* -+ * Job Manager backend-specific low-level APIs. -+ */ ++ err = 9; ++ } else { ++ if (is_hdmi2_sink(connector)) { ++ hdmi_modb(hdmi, 0, PKTSCHED_VSI_TX_EN, PKTSCHED_PKT_EN); ++ return; ++ } ++ err = drm_hdmi_vendor_infoframe_from_display_mode(&frame, connector, ++ mode); ++ if (err < 0) ++ /* ++ * Going into that statement does not means vendor infoframe ++ * fails. It just informed us that vendor infoframe is not ++ * needed for the selected mode. Only 4k or stereoscopic 3D ++ * mode requires vendor infoframe. So just simply return. ++ */ ++ return; + -+#ifndef _KBASE_JM_HWACCESS_H_ -+#define _KBASE_JM_HWACCESS_H_ ++ err = hdmi_vendor_infoframe_pack(&frame, buffer, sizeof(buffer)); ++ if (err < 0) { ++ dev_err(hdmi->dev, "Failed to pack vendor infoframe: %zd\n", ++ err); ++ return; ++ } ++ } + -+#include -+#include -+#include ++ /* vsi header */ ++ val = (buffer[2] << 16) | (buffer[1] << 8) | buffer[0]; ++ hdmi_writel(hdmi, val, PKT_VSI_CONTENTS0); + -+#include ++ reg = PKT_VSI_CONTENTS1; ++ for (i = 3; i < err; i++) { ++ if (i % 4 == 3) ++ val = buffer[i]; ++ if (i % 4 == 0) ++ val |= buffer[i] << 8; ++ if (i % 4 == 1) ++ val |= buffer[i] << 16; ++ if (i % 4 == 2) ++ val |= buffer[i] << 24; + -+/** -+ * kbase_job_submit_nolock() - Submit a job to a certain job-slot -+ * @kbdev: Device pointer -+ * @katom: Atom to submit -+ * @js: Job slot to submit on -+ * -+ * The caller must check kbasep_jm_is_submit_slots_free() != false before -+ * calling this. -+ * -+ * The following locking conditions are made on the caller: -+ * - it must hold the hwaccess_lock -+ */ -+void kbase_job_submit_nolock(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, int js); ++ if ((i % 4 == 2) || (i == (err - 1))) { ++ hdmi_writel(hdmi, val, reg); ++ reg += 4; ++ } ++ } + -+/** -+ * kbase_job_done_slot() - Complete the head job on a particular job-slot -+ * @kbdev: Device pointer -+ * @s: Job slot -+ * @completion_code: Completion code of job reported by GPU -+ * @job_tail: Job tail address reported by GPU -+ * @end_timestamp: Timestamp of job completion -+ */ -+void kbase_job_done_slot(struct kbase_device *kbdev, int s, u32 completion_code, -+ u64 job_tail, ktime_t *end_timestamp); ++ hdmi_writel(hdmi, 0, PKT_VSI_CONTENTS7); + -+#ifdef CONFIG_GPU_TRACEPOINTS -+static inline char *kbasep_make_job_slot_string(int js, char *js_string, -+ size_t js_size) -+{ -+ snprintf(js_string, js_size, "job_slot_%i", js); -+ return js_string; ++ hdmi_modb(hdmi, 0, PKTSCHED_VSI_FIELDRATE, PKTSCHED_PKT_CONFIG1); ++ hdmi_modb(hdmi, PKTSCHED_VSI_TX_EN, PKTSCHED_VSI_TX_EN, ++ PKTSCHED_PKT_EN); +} -+#endif + -+/** -+ * kbase_job_hw_submit() - Submit a job to the GPU -+ * @kbdev: Device pointer -+ * @katom: Atom to submit -+ * @js: Job slot to submit on -+ * -+ * The caller must check kbasep_jm_is_submit_slots_free() != false before -+ * calling this. -+ * -+ * The following locking conditions are made on the caller: -+ * - it must hold the hwaccess_lock -+ */ -+void kbase_job_hw_submit(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, -+ int js); ++static void hdmi_config_CVTEM(struct dw_hdmi_qp *hdmi) ++{ ++ u8 ds_type = 0; ++ u8 sync = 1; ++ u8 vfr = 1; ++ u8 afr = 0; ++ u8 new = 1; ++ u8 end = 0; ++ u8 data_set_length = 136; ++ u8 hb1[6] = { 0x80, 0, 0, 0, 0, 0x40 }; ++ u8 *pps_body; ++ u32 val, i, reg; ++ struct drm_display_mode *mode = &hdmi->previous_mode; ++ int hsync, hfront, hback; ++ struct dw_hdmi_link_config *link_cfg; ++ void *data = hdmi->plat_data->phy_data; + -+/** -+ * kbasep_job_slot_soft_or_hard_stop_do_action() - Perform a soft or hard stop -+ * on the specified atom -+ * @kbdev: Device pointer -+ * @js: Job slot to stop on -+ * @action: The action to perform, either JSn_COMMAND_HARD_STOP or -+ * JSn_COMMAND_SOFT_STOP -+ * @core_reqs: Core requirements of atom to stop -+ * @target_katom: Atom to stop -+ * -+ * The following locking conditions are made on the caller: -+ * - it must hold the hwaccess_lock -+ */ -+void kbasep_job_slot_soft_or_hard_stop_do_action(struct kbase_device *kbdev, -+ int js, -+ u32 action, -+ base_jd_core_req core_reqs, -+ struct kbase_jd_atom *target_katom); ++ hdmi_modb(hdmi, 0, PKTSCHED_EMP_CVTEM_TX_EN, PKTSCHED_PKT_EN); + -+/** -+ * kbase_backend_soft_hard_stop_slot() - Soft or hard stop jobs on a given job -+ * slot belonging to a given context. -+ * @kbdev: Device pointer -+ * @kctx: Context pointer. May be NULL -+ * @katom: Specific atom to stop. May be NULL -+ * @js: Job slot to hard stop -+ * @action: The action to perform, either JSn_COMMAND_HARD_STOP or -+ * JSn_COMMAND_SOFT_STOP -+ * -+ * If no context is provided then all jobs on the slot will be soft or hard -+ * stopped. -+ * -+ * If a katom is provided then only that specific atom will be stopped. In this -+ * case the kctx parameter is ignored. -+ * -+ * Jobs that are on the slot but are not yet on the GPU will be unpulled and -+ * returned to the job scheduler. -+ * -+ * Return: true if an atom was stopped, false otherwise -+ */ -+bool kbase_backend_soft_hard_stop_slot(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js, -+ struct kbase_jd_atom *katom, -+ u32 action); ++ if (hdmi->plat_data->get_link_cfg) { ++ link_cfg = hdmi->plat_data->get_link_cfg(data); ++ } else { ++ dev_err(hdmi->dev, "can't get frl link cfg\n"); ++ return; ++ } + -+/** -+ * kbase_job_slot_init - Initialise job slot framework -+ * @kbdev: Device pointer -+ * -+ * Called on driver initialisation -+ * -+ * Return: 0 on success -+ */ -+int kbase_job_slot_init(struct kbase_device *kbdev); ++ if (!link_cfg->dsc_mode) { ++ dev_info(hdmi->dev, "don't use dsc mode\n"); ++ return; ++ } + -+/** -+ * kbase_job_slot_halt - Halt the job slot framework -+ * @kbdev: Device pointer -+ * -+ * Should prevent any further job slot processing -+ */ -+void kbase_job_slot_halt(struct kbase_device *kbdev); ++ pps_body = link_cfg->pps_payload; + -+/** -+ * kbase_job_slot_term - Terminate job slot framework -+ * @kbdev: Device pointer -+ * -+ * Called on driver termination -+ */ -+void kbase_job_slot_term(struct kbase_device *kbdev); ++ hsync = mode->hsync_end - mode->hsync_start; ++ hback = mode->htotal - mode->hsync_end; ++ hfront = mode->hsync_start - mode->hdisplay; + -+/** -+ * kbase_gpu_cacheclean - Cause a GPU cache clean & flush -+ * @kbdev: Device pointer -+ * -+ * Caller must not be in IRQ context -+ */ -+void kbase_gpu_cacheclean(struct kbase_device *kbdev); ++ for (i = 0; i < 6; i++) { ++ val = i << 16 | hb1[i] << 8; ++ hdmi_writel(hdmi, val, PKT0_EMP_CVTEM_CONTENTS0 + i * 0x20); ++ } + -+#endif /* _KBASE_JM_HWACCESS_H_ */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c -new file mode 100755 -index 000000000000..4b4541660ec4 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c -@@ -0,0 +1,1952 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ val = new << 7 | end << 6 | ds_type << 4 | afr << 3 | ++ vfr << 2 | sync << 1; ++ hdmi_writel(hdmi, val, PKT0_EMP_CVTEM_CONTENTS1); + ++ val = data_set_length << 16 | pps_body[0] << 24; ++ hdmi_writel(hdmi, val, PKT0_EMP_CVTEM_CONTENTS2); + ++ reg = PKT0_EMP_CVTEM_CONTENTS3; ++ for (i = 1; i < 125; i++) { ++ if (reg == PKT1_EMP_CVTEM_CONTENTS0 || ++ reg == PKT2_EMP_CVTEM_CONTENTS0 || ++ reg == PKT3_EMP_CVTEM_CONTENTS0 || ++ reg == PKT4_EMP_CVTEM_CONTENTS0 || ++ reg == PKT5_EMP_CVTEM_CONTENTS0) { ++ reg += 4; ++ i--; ++ continue; ++ } ++ if (i % 4 == 1) ++ val = pps_body[i]; ++ if (i % 4 == 2) ++ val |= pps_body[i] << 8; ++ if (i % 4 == 3) ++ val |= pps_body[i] << 16; ++ if (!(i % 4)) { ++ val |= pps_body[i] << 24; ++ hdmi_writel(hdmi, val, reg); ++ reg += 4; ++ } ++ } + ++ val = (hfront & 0xff) << 24 | pps_body[127] << 16 | ++ pps_body[126] << 8 | pps_body[125]; ++ hdmi_writel(hdmi, val, PKT4_EMP_CVTEM_CONTENTS6); + -+/* -+ * Register-based HW access backend specific APIs -+ */ ++ val = (hback & 0xff) << 24 | ((hsync >> 8) & 0xff) << 16 | ++ (hsync & 0xff) << 8 | ((hfront >> 8) & 0xff); ++ hdmi_writel(hdmi, val, PKT4_EMP_CVTEM_CONTENTS7); + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++ val = link_cfg->hcactive << 8 | ((hback >> 8) & 0xff); ++ hdmi_writel(hdmi, val, PKT5_EMP_CVTEM_CONTENTS1); + -+/* Return whether the specified ringbuffer is empty. HW access lock must be -+ * held */ -+#define SLOT_RB_EMPTY(rb) (rb->write_idx == rb->read_idx) -+/* Return number of atoms currently in the specified ringbuffer. HW access lock -+ * must be held */ -+#define SLOT_RB_ENTRIES(rb) (int)(s8)(rb->write_idx - rb->read_idx) ++ for (i = PKT5_EMP_CVTEM_CONTENTS2; i <= PKT5_EMP_CVTEM_CONTENTS7; i += 4) ++ hdmi_writel(hdmi, 0, i); + -+static void kbase_gpu_release_atom(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, -+ ktime_t *end_timestamp); ++ hdmi_modb(hdmi, PKTSCHED_EMP_CVTEM_TX_EN, PKTSCHED_EMP_CVTEM_TX_EN, ++ PKTSCHED_PKT_EN); ++} + -+/** -+ * kbase_gpu_enqueue_atom - Enqueue an atom in the HW access ringbuffer -+ * @kbdev: Device pointer -+ * @katom: Atom to enqueue -+ * -+ * Context: Caller must hold the HW access lock -+ */ -+static void kbase_gpu_enqueue_atom(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) ++static void hdmi_config_drm_infoframe(struct dw_hdmi_qp *hdmi, ++ const struct drm_connector *connector) +{ -+ struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[katom->slot_nr]; ++ const struct drm_connector_state *conn_state = connector->state; ++ struct hdr_output_metadata *hdr_metadata; ++ struct hdmi_drm_infoframe frame; ++ u8 buffer[30]; ++ ssize_t err; ++ int i; ++ u32 val; + -+ WARN_ON(SLOT_RB_ENTRIES(rb) >= SLOT_RB_SIZE); ++ if (!hdmi->plat_data->use_drm_infoframe) ++ return; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ hdmi_modb(hdmi, 0, PKTSCHED_DRMI_TX_EN, PKTSCHED_PKT_EN); + -+ rb->entries[rb->write_idx & SLOT_RB_MASK].katom = katom; -+ rb->write_idx++; ++ if (!hdmi->connector.hdr_sink_metadata.hdmi_type1.eotf) { ++ DRM_DEBUG("No need to set HDR metadata in infoframe\n"); ++ return; ++ } + -+ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_WAITING_BLOCKED; -+} ++ if (!conn_state->hdr_output_metadata) { ++ DRM_DEBUG("source metadata not set yet\n"); ++ return; ++ } + -+/** -+ * kbase_gpu_dequeue_atom - Remove an atom from the HW access ringbuffer, once -+ * it has been completed -+ * @kbdev: Device pointer -+ * @js: Job slot to remove atom from -+ * @end_timestamp: Pointer to timestamp of atom completion. May be NULL, in -+ * which case current time will be used. -+ * -+ * Context: Caller must hold the HW access lock -+ * -+ * Return: Atom removed from ringbuffer -+ */ -+static struct kbase_jd_atom *kbase_gpu_dequeue_atom(struct kbase_device *kbdev, -+ int js, -+ ktime_t *end_timestamp) -+{ -+ struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[js]; -+ struct kbase_jd_atom *katom; ++ hdr_metadata = (struct hdr_output_metadata *) ++ conn_state->hdr_output_metadata->data; + -+ if (SLOT_RB_EMPTY(rb)) { -+ WARN(1, "GPU ringbuffer unexpectedly empty\n"); -+ return NULL; ++ if (!(hdmi->connector.hdr_sink_metadata.hdmi_type1.eotf & ++ BIT(hdr_metadata->hdmi_metadata_type1.eotf))) { ++ DRM_ERROR("Not support EOTF %d\n", ++ hdr_metadata->hdmi_metadata_type1.eotf); ++ return; + } + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ err = drm_hdmi_infoframe_set_hdr_metadata(&frame, conn_state); ++ if (err < 0) ++ return; + -+ katom = rb->entries[rb->read_idx & SLOT_RB_MASK].katom; ++ err = hdmi_drm_infoframe_pack(&frame, buffer, sizeof(buffer)); ++ if (err < 0) { ++ dev_err(hdmi->dev, "Failed to pack drm infoframe: %zd\n", err); ++ return; ++ } + -+ kbase_gpu_release_atom(kbdev, katom, end_timestamp); ++ val = (frame.version << 8) | (frame.length << 16); ++ hdmi_writel(hdmi, val, PKT_DRMI_CONTENTS0); + -+ rb->read_idx++; ++ for (i = 0; i <= frame.length; i++) { ++ if (i % 4 == 0) ++ val = buffer[3 + i]; ++ val |= buffer[3 + i] << ((i % 4) * 8); + -+ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB; ++ if (i % 4 == 3 || (i == (frame.length))) ++ hdmi_writel(hdmi, val, PKT_DRMI_CONTENTS1 + ((i / 4) * 4)); ++ } + -+ kbase_js_debug_log_current_affinities(kbdev); ++ hdmi_modb(hdmi, 0, PKTSCHED_DRMI_FIELDRATE, PKTSCHED_PKT_CONFIG1); + -+ return katom; ++ /* ++ * avi and hdr infoframe cannot be sent at the same time ++ * for compatibility with Huawei TV ++ */ ++ mdelay(50); ++ hdmi_modb(hdmi, PKTSCHED_DRMI_TX_EN, PKTSCHED_DRMI_TX_EN, PKTSCHED_PKT_EN); ++ ++ DRM_DEBUG("%s eotf %d end\n", __func__, ++ hdr_metadata->hdmi_metadata_type1.eotf); +} + -+struct kbase_jd_atom *kbase_gpu_inspect(struct kbase_device *kbdev, int js, -+ int idx) ++/* Filter out invalid setups to avoid configuring SCDC and scrambling */ ++static bool dw_hdmi_support_scdc(struct dw_hdmi_qp *hdmi, ++ const struct drm_display_info *display) +{ -+ struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[js]; ++ /* Disable if no DDC bus */ ++ if (!hdmi->ddc) ++ return false; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ /* Disable if SCDC is not supported, or if an HF-VSDB block is absent */ ++ if (!display->hdmi.scdc.supported || ++ !display->hdmi.scdc.scrambling.supported) ++ return false; + -+ if ((SLOT_RB_ENTRIES(rb) - 1) < idx) -+ return NULL; /* idx out of range */ ++ /* ++ * Disable if display only support low TMDS rates and scrambling ++ * for low rates is not supported either ++ */ ++ if (!display->hdmi.scdc.scrambling.low_rates && ++ display->max_tmds_clock <= 340000) ++ return false; + -+ return rb->entries[(rb->read_idx + idx) & SLOT_RB_MASK].katom; ++ return true; +} + -+struct kbase_jd_atom *kbase_backend_inspect_head(struct kbase_device *kbdev, -+ int js) ++static int hdmi_set_frl_mask(int frl_rate) +{ -+ return kbase_gpu_inspect(kbdev, js, 0); ++ switch (frl_rate) { ++ case 48: ++ return FRL_12GBPS_4LANE; ++ case 40: ++ return FRL_10GBPS_4LANE; ++ case 32: ++ return FRL_8GBPS_4LANE; ++ case 24: ++ return FRL_6GBPS_4LANE; ++ case 18: ++ return FRL_6GBPS_3LANE; ++ case 9: ++ return FRL_3GBPS_3LANE; ++ } ++ ++ return 0; +} + -+struct kbase_jd_atom *kbase_backend_inspect_tail(struct kbase_device *kbdev, -+ int js) ++static int hdmi_start_flt(struct dw_hdmi_qp *hdmi, u8 rate) +{ -+ struct slot_rb *rb = &kbdev->hwaccess.backend.slot_rb[js]; ++ u8 val; ++ u32 value; ++ u8 ffe_lv = 0; ++ int i = 0; ++ bool ltsp = false; + -+ if (SLOT_RB_EMPTY(rb)) -+ return NULL; ++ hdmi_modb(hdmi, AVP_DATAPATH_VIDEO_SWDISABLE, ++ AVP_DATAPATH_VIDEO_SWDISABLE, GLOBAL_SWDISABLE); + -+ return rb->entries[(rb->write_idx - 1) & SLOT_RB_MASK].katom; -+} ++ /* reset avp data path */ ++ hdmi_writel(hdmi, BIT(6), GLOBAL_SWRESET_REQUEST); + -+/** -+ * kbase_gpu_atoms_submitted - Inspect whether a slot has any atoms currently -+ * on the GPU -+ * @kbdev: Device pointer -+ * @js: Job slot to inspect -+ * -+ * Return: true if there are atoms on the GPU for slot js, -+ * false otherwise -+ */ -+static bool kbase_gpu_atoms_submitted(struct kbase_device *kbdev, int js) -+{ -+ int i; ++ /* FLT_READY & FFE_LEVELS read */ ++ for (i = 0; i < 20; i++) { ++ drm_scdc_readb(hdmi->ddc, SCDC_STATUS_FLAGS_0, &val); ++ if (val & BIT(6)) ++ break; ++ msleep(20); ++ } + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ if (i == 20) { ++ dev_err(hdmi->dev, "sink flt isn't ready\n"); ++ return -EINVAL; ++ } + -+ for (i = 0; i < SLOT_RB_SIZE; i++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, i); ++ /* clear flt flags */ ++ drm_scdc_readb(hdmi->ddc, 0x10, &val); ++ if (val & BIT(5)) ++ drm_scdc_writeb(hdmi->ddc, 0x10, BIT(5)); + -+ if (!katom) -+ return false; -+ if (katom->gpu_rb_state == KBASE_ATOM_GPU_RB_SUBMITTED || -+ katom->gpu_rb_state == KBASE_ATOM_GPU_RB_READY) -+ return true; -+ } ++ /* max ffe level 3 */ ++ val = 0 << 4 | hdmi_set_frl_mask(rate); ++ drm_scdc_writeb(hdmi->ddc, 0x31, val); + -+ return false; -+} ++ /* select FRL_RATE & FFE_LEVELS */ ++ hdmi_writel(hdmi, ffe_lv, FLT_CONFIG0); + -+/** -+ * kbase_gpu_atoms_submitted_any() - Inspect whether there are any atoms -+ * currently on the GPU -+ * @kbdev: Device pointer -+ * -+ * Return: true if there are any atoms on the GPU, false otherwise -+ */ -+static bool kbase_gpu_atoms_submitted_any(struct kbase_device *kbdev) -+{ -+ int js; -+ int i; ++ /* we set max 2s timeout */ ++ i = 4000; ++ while (i--) { ++ /* source should poll update flag every 2ms or less */ ++ usleep_range(400, 500); ++ drm_scdc_readb(hdmi->ddc, 0x10, &val); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ if (!(val & 0x30)) ++ continue; + -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ for (i = 0; i < SLOT_RB_SIZE; i++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, i); ++ if (val & BIT(5)) { ++ u8 reg_val, ln0, ln1, ln2, ln3; + -+ if (katom && katom->gpu_rb_state == KBASE_ATOM_GPU_RB_SUBMITTED) -+ return true; -+ } -+ } -+ return false; -+} ++ drm_scdc_readb(hdmi->ddc, 0x41, ®_val); ++ ln0 = reg_val & 0xf; ++ ln1 = (reg_val >> 4) & 0xf; + -+int kbase_backend_nr_atoms_submitted(struct kbase_device *kbdev, int js) -+{ -+ int nr = 0; -+ int i; ++ drm_scdc_readb(hdmi->ddc, 0x42, ®_val); ++ ln2 = reg_val & 0xf; ++ ln3 = (reg_val >> 4) & 0xf; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ if (!ln0 && !ln1 && !ln2 && !ln3) { ++ dev_info(hdmi->dev, "goto ltsp\n"); ++ ltsp = true; ++ hdmi_writel(hdmi, 0, FLT_CONFIG1); ++ } else if ((ln0 == 0xf) | (ln1 == 0xf) | (ln2 == 0xf) | (ln3 == 0xf)) { ++ dev_err(hdmi->dev, "goto lts4\n"); ++ break; ++ } else if ((ln0 == 0xe) | (ln1 == 0xe) | (ln2 == 0xe) | (ln3 == 0xe)) { ++ dev_info(hdmi->dev, "goto ffe\n"); ++ break; ++ } else { ++ value = (ln3 << 16) | (ln2 << 12) | (ln1 << 8) | (ln0 << 4) | 0xf; ++ hdmi_writel(hdmi, value, FLT_CONFIG1); ++ } ++ } + -+ for (i = 0; i < SLOT_RB_SIZE; i++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, i); ++ /* only clear frl_start and flt_update */ ++ drm_scdc_writeb(hdmi->ddc, 0x10, val & 0x30); + -+ if (katom && (katom->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_SUBMITTED)) -+ nr++; ++ if ((val & BIT(4)) && ltsp) { ++ hdmi_modb(hdmi, 0, AVP_DATAPATH_VIDEO_SWDISABLE, GLOBAL_SWDISABLE); ++ dev_info(hdmi->dev, "flt success\n"); ++ break; ++ } + } + -+ return nr; ++ if (i < 0) { ++ dev_err(hdmi->dev, "flt time out\n"); ++ return -ETIMEDOUT; ++ } ++ ++ return 0; +} + -+int kbase_backend_nr_atoms_on_slot(struct kbase_device *kbdev, int js) ++#define HDMI_MODE_FRL_MASK BIT(30) ++ ++static int hdmi_set_op_mode(struct dw_hdmi_qp *hdmi, ++ struct dw_hdmi_link_config *link_cfg, ++ const struct drm_connector *connector) +{ -+ int nr = 0; -+ int i; ++ int frl_rate; ++ int i, ret = 0; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ if (hdmi->frl_switch) ++ return 0; + -+ for (i = 0; i < SLOT_RB_SIZE; i++) { -+ if (kbase_gpu_inspect(kbdev, js, i)) -+ nr++; ++ if (!link_cfg->frl_mode) { ++ dev_info(hdmi->dev, "dw hdmi qp use tmds mode\n"); ++ hdmi_modb(hdmi, 0, OPMODE_FRL, LINK_CONFIG0); ++ hdmi_modb(hdmi, 0, OPMODE_FRL_4LANES, LINK_CONFIG0); ++ if (!hdmi->update) { ++ ret = hdmi->phy.ops->init(hdmi, hdmi->phy.data, &hdmi->previous_mode); ++ if (!ret) ++ hdmi->disabled = false; ++ } ++ ++ return ret; + } + -+ return nr; -+} ++ if (hdmi->update) ++ return 0; + -+static int kbase_gpu_nr_atoms_on_slot_min(struct kbase_device *kbdev, int js, -+ enum kbase_atom_gpu_rb_state min_rb_state) -+{ -+ int nr = 0; -+ int i; ++ if (link_cfg->frl_lanes == 4) ++ hdmi_modb(hdmi, OPMODE_FRL_4LANES, OPMODE_FRL_4LANES, ++ LINK_CONFIG0); ++ else ++ hdmi_modb(hdmi, 0, OPMODE_FRL_4LANES, LINK_CONFIG0); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ hdmi_modb(hdmi, 1, OPMODE_FRL, LINK_CONFIG0); + -+ for (i = 0; i < SLOT_RB_SIZE; i++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, i); ++ frl_rate = link_cfg->frl_lanes * link_cfg->rate_per_lane; + -+ if (katom && (katom->gpu_rb_state >= min_rb_state)) -+ nr++; ++ ret = hdmi->phy.ops->init(hdmi, hdmi->phy.data, &hdmi->previous_mode); ++ if (ret) ++ return ret; ++ hdmi->disabled = false; ++ ++ msleep(50); ++ ++ ret = hdmi_start_flt(hdmi, frl_rate); ++ if (ret) { ++ hdmi_writel(hdmi, 0, FLT_CONFIG0); ++ drm_scdc_writeb(hdmi->ddc, 0x31, 0); ++ hdmi_modb(hdmi, 0, AVP_DATAPATH_VIDEO_SWDISABLE, GLOBAL_SWDISABLE); ++ return ret; + } + -+ return nr; ++ for (i = 0; i < 200; i++) { ++ hdmi_modb(hdmi, PKTSCHED_NULL_TX_EN, PKTSCHED_NULL_TX_EN, PKTSCHED_PKT_EN); ++ usleep_range(50, 60); ++ hdmi_modb(hdmi, 0, PKTSCHED_NULL_TX_EN, PKTSCHED_PKT_EN); ++ usleep_range(50, 60); ++ } ++ ++ return 0; +} + -+/** -+ * check_secure_atom - Check if the given atom is in the given secure state and -+ * has a ringbuffer state of at least -+ * KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION -+ * @katom: Atom pointer -+ * @secure: Desired secure state -+ * -+ * Return: true if atom is in the given state, false otherwise -+ */ -+static bool check_secure_atom(struct kbase_jd_atom *katom, bool secure) ++static unsigned long ++hdmi_get_tmdsclock(struct dw_hdmi_qp *hdmi, unsigned long mpixelclock) +{ -+ if (katom->gpu_rb_state >= -+ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION && -+ ((kbase_jd_katom_is_protected(katom) && secure) || -+ (!kbase_jd_katom_is_protected(katom) && !secure))) -+ return true; ++ unsigned long tmdsclock = mpixelclock; ++ unsigned int depth = ++ hdmi_bus_fmt_color_depth(hdmi->hdmi_data.enc_out_bus_format); + -+ return false; ++ if (!hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) { ++ switch (depth) { ++ case 16: ++ tmdsclock = mpixelclock * 2; ++ break; ++ case 12: ++ tmdsclock = mpixelclock * 3 / 2; ++ break; ++ case 10: ++ tmdsclock = mpixelclock * 5 / 4; ++ break; ++ default: ++ break; ++ } ++ } ++ ++ return tmdsclock; +} + -+/** -+ * kbase_gpu_check_secure_atoms - Check if there are any atoms in the given -+ * secure state in the ringbuffers of at least -+ * state -+ * KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE -+ * @kbdev: Device pointer -+ * @secure: Desired secure state -+ * -+ * Return: true if any atoms are in the given state, false otherwise -+ */ -+static bool kbase_gpu_check_secure_atoms(struct kbase_device *kbdev, -+ bool secure) ++static void dw_hdmi_qp_hdcp_enable(struct dw_hdmi_qp *hdmi, ++ struct drm_connector *connector) +{ -+ int js, i; ++ int ret, val; ++ const struct drm_connector_state *conn_state = connector->state; ++ void *data = hdmi->plat_data->phy_data; + -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ for (i = 0; i < SLOT_RB_SIZE; i++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, -+ js, i); ++ if (conn_state->content_protection != DRM_MODE_CONTENT_PROTECTION_DESIRED) ++ return; + -+ if (katom) { -+ if (check_secure_atom(katom, secure)) -+ return true; -+ } ++ /* sink support hdcp2.x */ ++ if (hdmi->hdcp_caps & SINK_CAP_HDCP2) { ++ hdmi_writel(hdmi, HDCP2_ESM_P0_GPIO_OUT_2_CHG_IRQ, AVP_3_INT_CLEAR); ++ hdmi_modb(hdmi, HDCP2_ESM_P0_GPIO_OUT_2_CHG_IRQ, ++ HDCP2_ESM_P0_GPIO_OUT_2_CHG_IRQ, AVP_3_INT_MASK_N); ++ ++ hdmi_writel(hdmi, 0x35, HDCP2LOGIC_ESM_GPIO_IN); ++ hdmi_modb(hdmi, 0, HDCP2_BYPASS, HDCP2LOGIC_CONFIG0); ++ if (hdmi->plat_data->set_hdcp2_enable) ++ hdmi->plat_data->set_hdcp2_enable(data, true); ++ ++ /* wait hdcp2.X auth success */ ++ ret = regmap_read_poll_timeout(hdmi->regm, HDCP2LOGIC_ESM_GPIO_OUT, val, ++ FIELD_GET(HDCP2_AUTHENTICATION_SUCCESS, val), ++ 10000, 2000000); ++ if (ret) { ++ hdmi->hdcp_status &= ~HDMI_HDCP2_AUTH; ++ dev_info(hdmi->dev, "hdcp2 auth failed,start hdcp1.4\n"); ++ ++ hdmi_writel(hdmi, 0, HDCP2LOGIC_ESM_GPIO_IN); ++ hdmi_modb(hdmi, HDCP2_BYPASS, HDCP2_BYPASS, HDCP2LOGIC_CONFIG0); ++ ++ if (hdmi->plat_data->set_hdcp2_enable) ++ hdmi->plat_data->set_hdcp2_enable(data, false); ++ ++ if (hdmi->hdcp && hdmi->hdcp->hdcp_start) ++ hdmi->hdcp->hdcp_start(hdmi->hdcp); ++ goto exit; + } -+ } + -+ return false; ++ hdmi->hdcp_status |= HDMI_HDCP2_AUTH; ++ drm_hdcp_update_content_protection(connector, DRM_MODE_CONTENT_PROTECTION_ENABLED); ++ dev_info(hdmi->dev, "HDCP2 authentication succeed\n"); ++ } else { ++ if (hdmi->hdcp && hdmi->hdcp->hdcp_start) ++ hdmi->hdcp->hdcp_start(hdmi->hdcp); ++ } ++exit: ++ if (hdmi->plat_data->set_hdcp_status) ++ hdmi->plat_data->set_hdcp_status(data, hdmi->hdcp_status); +} + -+int kbase_backend_slot_free(struct kbase_device *kbdev, int js) ++static int dw_hdmi_qp_setup(struct dw_hdmi_qp *hdmi, ++ const struct drm_connector *connector, ++ struct drm_display_mode *mode) +{ -+ if (atomic_read(&kbdev->hwaccess.backend.reset_gpu) != -+ KBASE_RESET_GPU_NOT_PENDING) { -+ /* The GPU is being reset - so prevent submission */ -+ return 0; ++ void *data = hdmi->plat_data->phy_data; ++ struct hdmi_vmode_qp *vmode = &hdmi->hdmi_data.video_mode; ++ struct dw_hdmi_link_config *link_cfg; ++ u8 bytes = 0; ++ ++ hdmi->vic = drm_match_cea_mode(mode); ++ if (!hdmi->vic) ++ dev_dbg(hdmi->dev, "Non-CEA mode used in HDMI\n"); ++ else ++ dev_dbg(hdmi->dev, "CEA mode used vic=%d\n", hdmi->vic); ++ ++ if (hdmi->plat_data->get_enc_out_encoding) ++ hdmi->hdmi_data.enc_out_encoding = ++ hdmi->plat_data->get_enc_out_encoding(data); ++ else if ((hdmi->vic == 6) || (hdmi->vic == 7) || ++ (hdmi->vic == 21) || (hdmi->vic == 22) || ++ (hdmi->vic == 2) || (hdmi->vic == 3) || ++ (hdmi->vic == 17) || (hdmi->vic == 18)) ++ hdmi->hdmi_data.enc_out_encoding = V4L2_YCBCR_ENC_601; ++ else ++ hdmi->hdmi_data.enc_out_encoding = V4L2_YCBCR_ENC_709; ++ ++ if (mode->flags & DRM_MODE_FLAG_DBLCLK) { ++ hdmi->hdmi_data.video_mode.mpixelrepetitionoutput = 1; ++ hdmi->hdmi_data.video_mode.mpixelrepetitioninput = 1; ++ } else { ++ hdmi->hdmi_data.video_mode.mpixelrepetitionoutput = 0; ++ hdmi->hdmi_data.video_mode.mpixelrepetitioninput = 0; + } + -+ return SLOT_RB_SIZE - kbase_backend_nr_atoms_on_slot(kbdev, js); -+} ++ /* Get input format from plat data or fallback to RGB888 */ ++ if (hdmi->plat_data->get_input_bus_format) ++ hdmi->hdmi_data.enc_in_bus_format = ++ hdmi->plat_data->get_input_bus_format(data); ++ else if (hdmi->plat_data->input_bus_format) ++ hdmi->hdmi_data.enc_in_bus_format = ++ hdmi->plat_data->input_bus_format; ++ else ++ hdmi->hdmi_data.enc_in_bus_format = MEDIA_BUS_FMT_RGB888_1X24; + ++ /* Default to RGB888 output format */ ++ if (hdmi->plat_data->get_output_bus_format) ++ hdmi->hdmi_data.enc_out_bus_format = ++ hdmi->plat_data->get_output_bus_format(data); ++ else ++ hdmi->hdmi_data.enc_out_bus_format = MEDIA_BUS_FMT_RGB888_1X24; + -+static void kbasep_js_job_check_deref_cores(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom); ++ if (hdmi->plat_data->set_prev_bus_format) ++ hdmi->plat_data->set_prev_bus_format(data, hdmi->hdmi_data.enc_out_bus_format); + -+static bool kbasep_js_job_check_ref_cores(struct kbase_device *kbdev, -+ int js, -+ struct kbase_jd_atom *katom) -+{ -+ /* The most recently checked affinity. Having this at this scope allows -+ * us to guarantee that we've checked the affinity in this function -+ * call. -+ */ -+ u64 recently_chosen_affinity = 0; -+ bool chosen_affinity = false; -+ bool retry; ++ /* Get input encoding from plat data or fallback to none */ ++ if (hdmi->plat_data->get_enc_in_encoding) ++ hdmi->hdmi_data.enc_in_encoding = ++ hdmi->plat_data->get_enc_in_encoding(data); ++ else if (hdmi->plat_data->input_bus_encoding) ++ hdmi->hdmi_data.enc_in_encoding = ++ hdmi->plat_data->input_bus_encoding; ++ else ++ hdmi->hdmi_data.enc_in_encoding = V4L2_YCBCR_ENC_DEFAULT; + -+ do { -+ retry = false; ++ if (hdmi->plat_data->get_quant_range) ++ hdmi->hdmi_data.quant_range = ++ hdmi->plat_data->get_quant_range(data); ++ else ++ hdmi->hdmi_data.quant_range = HDMI_QUANTIZATION_RANGE_DEFAULT; + -+ /* NOTE: The following uses a number of FALLTHROUGHs to optimize -+ * the calls to this function. Ending of the function is -+ * indicated by BREAK OUT */ -+ switch (katom->coreref_state) { -+ /* State when job is first attempted to be run */ -+ case KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED: -+ KBASE_DEBUG_ASSERT(katom->affinity == 0); ++ if (hdmi->plat_data->get_link_cfg) ++ link_cfg = hdmi->plat_data->get_link_cfg(data); ++ else ++ return -EINVAL; + -+ /* Compute affinity */ -+ if (false == kbase_js_choose_affinity( -+ &recently_chosen_affinity, kbdev, katom, -+ js)) { -+ /* No cores are currently available */ -+ /* *** BREAK OUT: No state transition *** */ -+ break; -+ } ++ hdmi->phy.ops->set_mode(hdmi, hdmi->phy.data, HDMI_MODE_FRL_MASK, ++ link_cfg->frl_mode); + -+ chosen_affinity = true; ++ if (!hdmi->update && !hdmi->frl_switch && hdmi->plat_data->link_clk_set) ++ hdmi->plat_data->link_clk_set(data, true); + -+ /* Request the cores */ -+ kbase_pm_request_cores(kbdev, -+ katom->core_req & BASE_JD_REQ_T, -+ recently_chosen_affinity); ++ /* ++ * According to the dw-hdmi specification 6.4.2 ++ * vp_pr_cd[3:0]: ++ * 0000b: No pixel repetition (pixel sent only once) ++ * 0001b: Pixel sent two times (pixel repeated once) ++ */ ++ hdmi->hdmi_data.pix_repet_factor = ++ (mode->flags & DRM_MODE_FLAG_DBLCLK) ? 1 : 0; ++ hdmi->hdmi_data.video_mode.mdataenablepolarity = true; + -+ katom->affinity = recently_chosen_affinity; ++ vmode->previous_pixelclock = vmode->mpixelclock; ++ if (hdmi->plat_data->split_mode) ++ mode->crtc_clock /= 2; ++ vmode->mpixelclock = mode->crtc_clock * 1000; ++ if ((mode->flags & DRM_MODE_FLAG_3D_MASK) == DRM_MODE_FLAG_3D_FRAME_PACKING) ++ vmode->mpixelclock *= 2; ++ dev_dbg(hdmi->dev, "final pixclk = %ld\n", vmode->mpixelclock); ++ vmode->previous_tmdsclock = vmode->mtmdsclock; ++ vmode->mtmdsclock = hdmi_get_tmdsclock(hdmi, vmode->mpixelclock); ++ if (hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_out_bus_format)) ++ vmode->mtmdsclock /= 2; ++ dev_info(hdmi->dev, "final tmdsclk = %d\n", vmode->mtmdsclock); + -+ /* Proceed to next state */ -+ katom->coreref_state = -+ KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES; ++ if (hdmi->plat_data->set_grf_cfg) ++ hdmi->plat_data->set_grf_cfg(data); + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES: -+ { -+ enum kbase_pm_cores_ready cores_ready; ++ if (hdmi->sink_has_audio) { ++ dev_dbg(hdmi->dev, "sink has audio support\n"); + -+ KBASE_DEBUG_ASSERT(katom->affinity != 0 || -+ (katom->core_req & BASE_JD_REQ_T)); ++ /* HDMI Initialization Step E - Configure audio */ ++ hdmi_clk_regenerator_update_pixel_clock(hdmi); ++ hdmi_enable_audio_clk(hdmi, hdmi->audio_enable); ++ } + -+ cores_ready = kbase_pm_register_inuse_cores( -+ kbdev, -+ katom->core_req & BASE_JD_REQ_T, -+ katom->affinity); -+ if (cores_ready == KBASE_NEW_AFFINITY) { -+ /* Affinity no longer valid - return to -+ * previous state */ -+ kbasep_js_job_check_deref_cores(kbdev, -+ katom); -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, -+ JS_CORE_REF_REGISTER_INUSE_FAILED, -+ katom->kctx, katom, -+ katom->jc, js, -+ (u32) katom->affinity); -+ /* *** BREAK OUT: Return to previous -+ * state, retry *** */ -+ retry = true; -+ break; -+ } -+ if (cores_ready == KBASE_CORES_NOT_READY) { -+ /* Stay in this state and return, to -+ * retry at this state later */ -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, -+ JS_CORE_REF_REGISTER_INUSE_FAILED, -+ katom->kctx, katom, -+ katom->jc, js, -+ (u32) katom->affinity); -+ /* *** BREAK OUT: No state transition -+ * *** */ -+ break; -+ } -+ /* Proceed to next state */ -+ katom->coreref_state = -+ KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY; -+ } ++ /* not for DVI mode */ ++ if (hdmi->sink_is_hdmi) { ++ int ret; + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY: -+ KBASE_DEBUG_ASSERT(katom->affinity != 0 || -+ (katom->core_req & BASE_JD_REQ_T)); ++ dev_dbg(hdmi->dev, "%s HDMI mode\n", __func__); ++ hdmi_modb(hdmi, 0, OPMODE_DVI, LINK_CONFIG0); ++ hdmi_modb(hdmi, HDCP2_BYPASS, HDCP2_BYPASS, HDCP2LOGIC_CONFIG0); ++ hdmi_modb(hdmi, KEEPOUT_REKEY_ALWAYS, KEEPOUT_REKEY_CFG, FRAME_COMPOSER_CONFIG9); + -+ /* Optimize out choosing the affinity twice in the same -+ * function call */ -+ if (chosen_affinity == false) { -+ /* See if the affinity changed since a previous -+ * call. */ -+ if (false == kbase_js_choose_affinity( -+ &recently_chosen_affinity, -+ kbdev, katom, js)) { -+ /* No cores are currently available */ -+ kbasep_js_job_check_deref_cores(kbdev, -+ katom); -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, -+ JS_CORE_REF_REQUEST_ON_RECHECK_FAILED, -+ katom->kctx, katom, -+ katom->jc, js, -+ (u32) recently_chosen_affinity); -+ /* *** BREAK OUT: Transition to lower -+ * state *** */ -+ break; -+ } -+ chosen_affinity = true; ++ if (!link_cfg->frl_mode && dw_hdmi_support_scdc(hdmi, &connector->display_info) && ++ !hdmi->update) { ++ if (vmode->mtmdsclock > HDMI14_MAX_TMDSCLK) { ++ drm_scdc_readb(hdmi->ddc, SCDC_SINK_VERSION, &bytes); ++ drm_scdc_writeb(hdmi->ddc, SCDC_SOURCE_VERSION, ++ min_t(u8, bytes, SCDC_MIN_SOURCE_VERSION)); ++ drm_scdc_set_high_tmds_clock_ratio(hdmi->ddc, 1); ++ drm_scdc_set_scrambling(hdmi->ddc, 1); ++ hdmi_writel(hdmi, 1, SCRAMB_CONFIG0); ++ /* Wait for resuming transmission of TMDS clock and data */ ++ msleep(100); ++ } else { ++ drm_scdc_set_high_tmds_clock_ratio(hdmi->ddc, 0); ++ drm_scdc_set_scrambling(hdmi->ddc, 0); ++ hdmi_writel(hdmi, 0, SCRAMB_CONFIG0); + } ++ } ++ /* HDMI Initialization Step F - Configure AVI InfoFrame */ ++ hdmi_config_AVI(hdmi, connector, mode); ++ hdmi_config_vendor_specific_infoframe(hdmi, connector, mode); ++ hdmi_config_CVTEM(hdmi); ++ hdmi_config_drm_infoframe(hdmi, connector); ++ ret = hdmi_set_op_mode(hdmi, link_cfg, connector); ++ if (ret) { ++ dev_err(hdmi->dev, "%s hdmi set operation mode failed\n", __func__); ++ hdmi->frl_switch = false; ++ return ret; ++ } ++ } else { ++ hdmi_modb(hdmi, HDCP2_BYPASS, HDCP2_BYPASS, HDCP2LOGIC_CONFIG0); ++ hdmi_modb(hdmi, OPMODE_DVI, OPMODE_DVI, LINK_CONFIG0); ++ hdmi_writel(hdmi, 2, PKTSCHED_PKT_CONTROL0); ++ hdmi_modb(hdmi, PKTSCHED_GCP_TX_EN, PKTSCHED_GCP_TX_EN, PKTSCHED_PKT_EN); ++ hdmi->phy.ops->init(hdmi, hdmi->phy.data, &hdmi->previous_mode); ++ dev_info(hdmi->dev, "%s DVI mode\n", __func__); ++ } + -+ /* Now see if this requires a different set of cores */ -+ if (recently_chosen_affinity != katom->affinity) { -+ enum kbase_pm_cores_ready cores_ready; ++ dw_hdmi_qp_hdcp_enable(hdmi, hdmi->curr_conn); ++ hdmi->frl_switch = false; ++ return 0; ++} + -+ kbase_pm_request_cores(kbdev, -+ katom->core_req & BASE_JD_REQ_T, -+ recently_chosen_affinity); ++static enum drm_connector_status ++dw_hdmi_connector_detect(struct drm_connector *connector, bool force) ++{ ++ struct dw_hdmi_qp *hdmi = ++ container_of(connector, struct dw_hdmi_qp, connector); ++ struct dw_hdmi_qp *secondary = NULL; ++ enum drm_connector_status result, result_secondary; + -+ /* Register new cores whilst we still hold the -+ * old ones, to minimize power transitions */ -+ cores_ready = -+ kbase_pm_register_inuse_cores(kbdev, -+ katom->core_req & BASE_JD_REQ_T, -+ recently_chosen_affinity); -+ kbasep_js_job_check_deref_cores(kbdev, katom); ++ mutex_lock(&hdmi->mutex); ++ hdmi->force = DRM_FORCE_UNSPECIFIED; ++ mutex_unlock(&hdmi->mutex); + -+ /* Fixup the state that was reduced by -+ * deref_cores: */ -+ katom->coreref_state = -+ KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY; -+ katom->affinity = recently_chosen_affinity; -+ if (cores_ready == KBASE_NEW_AFFINITY) { -+ /* Affinity no longer valid - return to -+ * previous state */ -+ katom->coreref_state = -+ KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES; ++ if (hdmi->panel) ++ return connector_status_connected; + -+ kbasep_js_job_check_deref_cores(kbdev, -+ katom); ++ if (hdmi->next_bridge && hdmi->next_bridge->ops & DRM_BRIDGE_OP_DETECT) ++ return drm_bridge_detect(hdmi->next_bridge); + -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, -+ JS_CORE_REF_REGISTER_INUSE_FAILED, -+ katom->kctx, katom, -+ katom->jc, js, -+ (u32) katom->affinity); -+ /* *** BREAK OUT: Return to previous -+ * state, retry *** */ -+ retry = true; -+ break; -+ } -+ /* Now might be waiting for powerup again, with -+ * a new affinity */ -+ if (cores_ready == KBASE_CORES_NOT_READY) { -+ /* Return to previous state */ -+ katom->coreref_state = -+ KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES; -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, -+ JS_CORE_REF_REGISTER_ON_RECHECK_FAILED, -+ katom->kctx, katom, -+ katom->jc, js, -+ (u32) katom->affinity); -+ /* *** BREAK OUT: Transition to lower -+ * state *** */ -+ break; -+ } -+ } -+ /* Proceed to next state */ -+ katom->coreref_state = -+ KBASE_ATOM_COREREF_STATE_CHECK_AFFINITY_VIOLATIONS; ++ if (hdmi->plat_data->left) ++ secondary = hdmi->plat_data->left; ++ else if (hdmi->plat_data->right) ++ secondary = hdmi->plat_data->right; + -+ /* ***FALLTHROUGH: TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_COREREF_STATE_CHECK_AFFINITY_VIOLATIONS: -+ KBASE_DEBUG_ASSERT(katom->affinity != 0 || -+ (katom->core_req & BASE_JD_REQ_T)); -+ KBASE_DEBUG_ASSERT(katom->affinity == -+ recently_chosen_affinity); ++ result = hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data); + -+ /* Note: this is where the caller must've taken the -+ * hwaccess_lock */ ++ if (secondary) { ++ result_secondary = secondary->phy.ops->read_hpd(secondary, secondary->phy.data); ++ if (result == connector_status_connected && ++ result_secondary == connector_status_connected) ++ result = connector_status_connected; ++ else ++ result = connector_status_disconnected; ++ } + -+ /* Check for affinity violations - if there are any, -+ * then we just ask the caller to requeue and try again -+ * later */ -+ if (kbase_js_affinity_would_violate(kbdev, js, -+ katom->affinity) != false) { -+ /* Return to previous state */ -+ katom->coreref_state = -+ KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY; -+ /* *** BREAK OUT: Transition to lower state *** -+ */ -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, -+ JS_CORE_REF_AFFINITY_WOULD_VIOLATE, -+ katom->kctx, katom, katom->jc, js, -+ (u32) katom->affinity); -+ break; -+ } ++ return result; ++} + -+ /* No affinity violations would result, so the cores are -+ * ready */ -+ katom->coreref_state = KBASE_ATOM_COREREF_STATE_READY; -+ /* *** BREAK OUT: Cores Ready *** */ -+ break; ++static int ++dw_hdmi_update_hdr_property(struct drm_connector *connector) ++{ ++ struct drm_device *dev = connector->dev; ++ struct dw_hdmi_qp *hdmi = container_of(connector, struct dw_hdmi_qp, ++ connector); ++ void *data = hdmi->plat_data->phy_data; ++ const struct hdr_static_metadata *metadata = ++ &connector->hdr_sink_metadata.hdmi_type1; ++ size_t size = sizeof(*metadata); ++ struct drm_property *property; ++ struct drm_property_blob *blob; ++ int ret; + -+ default: -+ KBASE_DEBUG_ASSERT_MSG(false, -+ "Unhandled kbase_atom_coreref_state %d", -+ katom->coreref_state); -+ break; -+ } -+ } while (retry != false); ++ if (hdmi->plat_data->get_hdr_property) ++ property = hdmi->plat_data->get_hdr_property(data); ++ else ++ return -EINVAL; + -+ return (katom->coreref_state == KBASE_ATOM_COREREF_STATE_READY); ++ if (hdmi->plat_data->get_hdr_blob) ++ blob = hdmi->plat_data->get_hdr_blob(data); ++ else ++ return -EINVAL; ++ ++ ret = drm_property_replace_global_blob(dev, &blob, size, metadata, ++ &connector->base, property); ++ return ret; +} + -+static void kbasep_js_job_check_deref_cores(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) ++static bool dw_hdmi_qp_check_output_type_changed(struct dw_hdmi_qp *hdmi) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(katom != NULL); ++ bool sink_hdmi; + -+ switch (katom->coreref_state) { -+ case KBASE_ATOM_COREREF_STATE_READY: -+ /* State where atom was submitted to the HW - just proceed to -+ * power-down */ -+ KBASE_DEBUG_ASSERT(katom->affinity != 0 || -+ (katom->core_req & BASE_JD_REQ_T)); ++ sink_hdmi = hdmi->sink_is_hdmi; + -+ /* fallthrough */ ++ if (hdmi->force_output == 1) ++ hdmi->sink_is_hdmi = true; ++ else if (hdmi->force_output == 2) ++ hdmi->sink_is_hdmi = false; ++ else ++ hdmi->sink_is_hdmi = hdmi->support_hdmi; + -+ case KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY: -+ /* State where cores were registered */ -+ KBASE_DEBUG_ASSERT(katom->affinity != 0 || -+ (katom->core_req & BASE_JD_REQ_T)); -+ kbase_pm_release_cores(kbdev, katom->core_req & BASE_JD_REQ_T, -+ katom->affinity); ++ if (sink_hdmi != hdmi->sink_is_hdmi) ++ return true; + -+ break; ++ return false; ++} + -+ case KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES: -+ /* State where cores were requested, but not registered */ -+ KBASE_DEBUG_ASSERT(katom->affinity != 0 || -+ (katom->core_req & BASE_JD_REQ_T)); -+ kbase_pm_unrequest_cores(kbdev, katom->core_req & BASE_JD_REQ_T, -+ katom->affinity); -+ break; ++static ssize_t hdcp_ddc_read(struct i2c_adapter *adapter, u8 address, ++ u8 offset, void *buffer) ++{ ++ int ret; ++ struct i2c_msg msgs[2] = { ++ { ++ .addr = address, ++ .flags = 0, ++ .len = 1, ++ .buf = &offset, ++ }, { ++ .addr = address, ++ .flags = I2C_M_RD, ++ .len = 1, ++ .buf = buffer, ++ } ++ }; + -+ case KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED: -+ /* Initial state - nothing required */ -+ KBASE_DEBUG_ASSERT(katom->affinity == 0); -+ break; ++ ret = i2c_transfer(adapter, msgs, ARRAY_SIZE(msgs)); ++ if (ret < 0) ++ return ret; ++ if (ret != ARRAY_SIZE(msgs)) ++ return -EPROTO; + -+ default: -+ KBASE_DEBUG_ASSERT_MSG(false, -+ "Unhandled coreref_state: %d", -+ katom->coreref_state); -+ break; ++ return 0; ++} ++ ++static u8 dw_hdmi_qp_hdcp_capable(struct dw_hdmi_qp *hdmi) ++{ ++ u8 version = 0; ++ u8 bcaps; ++ int ret; ++ ++ ret = hdcp_ddc_read(hdmi->ddc, HDMI_HDCP_ADDR, HDMI_BCAPS, &bcaps); ++ if (ret < 0) { ++ dev_err(hdmi->dev, "get hdcp1.4 capable failed:%d\n", ret); ++ return 0; + } ++ if (bcaps & HDMI_HDCP14_SUPPORT) ++ version |= SINK_CAP_HDCP14; + -+ katom->affinity = 0; -+ katom->coreref_state = KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED; ++ ret = hdcp_ddc_read(hdmi->ddc, HDMI_HDCP_ADDR, HDMI_HDCP2_VERSION, &bcaps); ++ if (ret < 0) { ++ dev_err(hdmi->dev, "get hdcp2.x capable failed:%d\n", ret); ++ return 0; ++ } ++ if (bcaps & HDMI_HDCP2_SUPPORT) ++ version |= SINK_CAP_HDCP2; ++ ++ return version; +} + -+static void kbasep_js_job_check_deref_cores_nokatom(struct kbase_device *kbdev, -+ base_jd_core_req core_req, u64 affinity, -+ enum kbase_atom_coreref_state coreref_state) ++static int dw_hdmi_connector_get_modes(struct drm_connector *connector) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ struct dw_hdmi_qp *hdmi = ++ container_of(connector, struct dw_hdmi_qp, connector); ++ struct hdr_static_metadata *metedata = ++ &connector->hdr_sink_metadata.hdmi_type1; ++ struct edid *edid; ++ struct drm_display_mode *mode; ++ struct drm_display_info *info = &connector->display_info; ++ void *data = hdmi->plat_data->phy_data; ++ struct drm_property_blob *edid_blob_ptr = connector->edid_blob_ptr; ++ int i, ret = 0; + -+ switch (coreref_state) { -+ case KBASE_ATOM_COREREF_STATE_READY: -+ /* State where atom was submitted to the HW - just proceed to -+ * power-down */ -+ KBASE_DEBUG_ASSERT(affinity != 0 || -+ (core_req & BASE_JD_REQ_T)); ++ if (hdmi->plat_data->right && hdmi->plat_data->right->next_bridge) { ++ struct drm_bridge *bridge = hdmi->plat_data->right->next_bridge; + -+ /* fallthrough */ ++ if (bridge->ops & DRM_BRIDGE_OP_MODES) { ++ if (!drm_bridge_get_modes(bridge, connector)) ++ return 0; ++ } ++ } + -+ case KBASE_ATOM_COREREF_STATE_RECHECK_AFFINITY: -+ /* State where cores were registered */ -+ KBASE_DEBUG_ASSERT(affinity != 0 || -+ (core_req & BASE_JD_REQ_T)); -+ kbase_pm_release_cores(kbdev, core_req & BASE_JD_REQ_T, -+ affinity); ++ if (hdmi->panel) ++ return drm_panel_get_modes(hdmi->panel, connector); + -+ break; ++ if (hdmi->next_bridge && hdmi->next_bridge->ops & DRM_BRIDGE_OP_MODES) ++ return drm_bridge_get_modes(hdmi->next_bridge, connector); + -+ case KBASE_ATOM_COREREF_STATE_WAITING_FOR_REQUESTED_CORES: -+ /* State where cores were requested, but not registered */ -+ KBASE_DEBUG_ASSERT(affinity != 0 || -+ (core_req & BASE_JD_REQ_T)); -+ kbase_pm_unrequest_cores(kbdev, core_req & BASE_JD_REQ_T, -+ affinity); -+ break; ++ if (!hdmi->ddc) ++ return 0; + -+ case KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED: -+ /* Initial state - nothing required */ -+ KBASE_DEBUG_ASSERT(affinity == 0); -+ break; ++ memset(metedata, 0, sizeof(*metedata)); + -+ default: -+ KBASE_DEBUG_ASSERT_MSG(false, -+ "Unhandled coreref_state: %d", -+ coreref_state); -+ break; ++ if (edid_blob_ptr && edid_blob_ptr->length) { ++ edid = kmalloc(edid_blob_ptr->length, GFP_KERNEL); ++ if (!edid) ++ return -ENOMEM; ++ memcpy(edid, edid_blob_ptr->data, edid_blob_ptr->length); ++ } else { ++ edid = drm_get_edid(connector, hdmi->ddc); ++ hdmi->hdcp_caps = dw_hdmi_qp_hdcp_capable(hdmi); + } -+} -+ -+static void kbase_gpu_release_atom(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, -+ ktime_t *end_timestamp) -+{ -+ struct kbase_context *kctx = katom->kctx; + -+ switch (katom->gpu_rb_state) { -+ case KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB: -+ /* Should be impossible */ -+ WARN(1, "Attempting to release atom not in ringbuffer\n"); -+ break; ++ if (edid) { ++ dev_dbg(hdmi->dev, "got edid: width[%d] x height[%d]\n", ++ edid->width_cm, edid->height_cm); + -+ case KBASE_ATOM_GPU_RB_SUBMITTED: -+ /* Inform power management at start/finish of atom so it can -+ * update its GPU utilisation metrics. Mark atom as not -+ * submitted beforehand. */ -+ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_READY; -+ kbase_pm_metrics_update(kbdev, end_timestamp); ++ hdmi->support_hdmi = drm_detect_hdmi_monitor(edid); ++ hdmi->sink_has_audio = drm_detect_monitor_audio(edid); ++ drm_connector_update_edid_property(connector, edid); ++ if (hdmi->cec_notifier) ++ cec_notifier_set_phys_addr_from_edid(hdmi->cec_notifier, edid); ++ if (hdmi->plat_data->get_edid_dsc_info) ++ hdmi->plat_data->get_edid_dsc_info(data, edid); ++ ret = drm_add_edid_modes(connector, edid); ++ if (hdmi->plat_data->get_colorimetry) ++ hdmi->plat_data->get_colorimetry(data, edid); ++ if (hdmi->plat_data->get_yuv422_format) ++ hdmi->plat_data->get_yuv422_format(connector, edid); ++ dw_hdmi_update_hdr_property(connector); ++ hdmi->hdcp_caps = dw_hdmi_qp_hdcp_capable(hdmi); ++ if (ret > 0 && hdmi->plat_data->split_mode) { ++ struct dw_hdmi_qp *secondary = NULL; ++ void *secondary_data; ++ ++ if (hdmi->plat_data->left) ++ secondary = hdmi->plat_data->left; ++ else if (hdmi->plat_data->right) ++ secondary = hdmi->plat_data->right; ++ ++ if (!secondary) { ++ kfree(edid); ++ return -ENOMEM; ++ } ++ secondary_data = secondary->plat_data->phy_data; + -+ if (katom->core_req & BASE_JD_REQ_PERMON) -+ kbase_pm_release_gpu_cycle_counter_nolock(kbdev); -+ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ ++ list_for_each_entry(mode, &connector->probed_modes, head) ++ hdmi->plat_data->convert_to_split_mode(mode); + -+ KBASE_TLSTREAM_TL_NRET_ATOM_LPU(katom, -+ &kbdev->gpu_props.props.raw_props.js_features -+ [katom->slot_nr]); -+ KBASE_TLSTREAM_TL_NRET_ATOM_AS(katom, &kbdev->as[kctx->as_nr]); -+ KBASE_TLSTREAM_TL_NRET_CTX_LPU(kctx, -+ &kbdev->gpu_props.props.raw_props.js_features -+ [katom->slot_nr]); -+ /* fallthrough */ -+ case KBASE_ATOM_GPU_RB_READY: -+ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_GPU_RB_WAITING_AFFINITY: -+ kbase_js_affinity_release_slot_cores(kbdev, katom->slot_nr, -+ katom->affinity); -+ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE: -+ break; ++ secondary->sink_is_hdmi = drm_detect_hdmi_monitor(edid); ++ secondary->sink_has_audio = drm_detect_monitor_audio(edid); ++ if (secondary->cec_notifier) ++ cec_notifier_set_phys_addr_from_edid(secondary->cec_notifier, ++ edid); ++ if (secondary->plat_data->get_edid_dsc_info) ++ secondary->plat_data->get_edid_dsc_info(secondary_data, edid); ++ } ++ kfree(edid); ++ } else { ++ hdmi->support_hdmi = true; ++ hdmi->sink_has_audio = true; + -+ case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION: -+ if (katom->protected_state.enter != -+ KBASE_ATOM_ENTER_PROTECTED_CHECK || -+ katom->protected_state.exit != -+ KBASE_ATOM_EXIT_PROTECTED_CHECK) -+ kbdev->protected_mode_transition = false; ++ if (hdmi->plat_data->split_mode) { ++ if (hdmi->plat_data->left) { ++ hdmi->plat_data->left->sink_is_hdmi = true; ++ hdmi->plat_data->left->sink_has_audio = true; ++ } else if (hdmi->plat_data->right) { ++ hdmi->plat_data->right->sink_is_hdmi = true; ++ hdmi->plat_data->right->sink_has_audio = true; ++ } ++ } + -+ if (kbase_jd_katom_is_protected(katom) && -+ (katom->protected_state.enter == -+ KBASE_ATOM_ENTER_PROTECTED_IDLE_L2)) { -+ kbase_vinstr_resume(kbdev->vinstr_ctx); ++ for (i = 0; i < ARRAY_SIZE(dw_hdmi_default_modes); i++) { ++ const struct drm_display_mode *ptr = ++ &dw_hdmi_default_modes[i]; + -+ /* Go back to configured model for IPA */ -+ kbase_ipa_model_use_configured_locked(kbdev); ++ mode = drm_mode_duplicate(connector->dev, ptr); ++ if (mode) { ++ if (!i) ++ mode->type = DRM_MODE_TYPE_PREFERRED; ++ drm_mode_probed_add(connector, mode); ++ ret++; ++ } + } ++ if (ret > 0 && hdmi->plat_data->split_mode) { ++ struct drm_display_mode *mode; + ++ list_for_each_entry(mode, &connector->probed_modes, head) ++ hdmi->plat_data->convert_to_split_mode(mode); ++ } ++ info->edid_hdmi_dc_modes = 0; ++ info->hdmi.y420_dc_modes = 0; ++ info->color_formats = 0; + -+ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV: -+ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_GPU_RB_WAITING_BLOCKED: -+ /* ***FALLTHROUGH: TRANSITION TO LOWER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_GPU_RB_RETURN_TO_JS: -+ break; ++ dev_info(hdmi->dev, "failed to get edid\n"); + } + -+ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_WAITING_BLOCKED; -+ katom->protected_state.exit = KBASE_ATOM_EXIT_PROTECTED_CHECK; ++ return ret; +} + -+static void kbase_gpu_mark_atom_for_return(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) ++void dw_hdmi_qp_set_allm_enable(struct dw_hdmi_qp *hdmi, bool enable) +{ -+ kbase_gpu_release_atom(kbdev, katom, NULL); -+ katom->gpu_rb_state = KBASE_ATOM_GPU_RB_RETURN_TO_JS; -+} ++ struct dw_hdmi_link_config *link_cfg = NULL; ++ void *data; + -+static inline bool kbase_gpu_rmu_workaround(struct kbase_device *kbdev, int js) -+{ -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; -+ bool slot_busy[3]; ++ if (!hdmi || !hdmi->curr_conn) ++ return; + -+ if (!kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987)) -+ return true; -+ slot_busy[0] = kbase_gpu_nr_atoms_on_slot_min(kbdev, 0, -+ KBASE_ATOM_GPU_RB_WAITING_AFFINITY); -+ slot_busy[1] = kbase_gpu_nr_atoms_on_slot_min(kbdev, 1, -+ KBASE_ATOM_GPU_RB_WAITING_AFFINITY); -+ slot_busy[2] = kbase_gpu_nr_atoms_on_slot_min(kbdev, 2, -+ KBASE_ATOM_GPU_RB_WAITING_AFFINITY); ++ data = hdmi->plat_data->phy_data; + -+ if ((js == 2 && !(slot_busy[0] || slot_busy[1])) || -+ (js != 2 && !slot_busy[2])) -+ return true; ++ if (hdmi->plat_data->get_link_cfg) ++ link_cfg = hdmi->plat_data->get_link_cfg(data); + -+ /* Don't submit slot 2 atom while GPU has jobs on slots 0/1 */ -+ if (js == 2 && (kbase_gpu_atoms_submitted(kbdev, 0) || -+ kbase_gpu_atoms_submitted(kbdev, 1) || -+ backend->rmu_workaround_flag)) -+ return false; ++ if (!link_cfg) ++ return; + -+ /* Don't submit slot 0/1 atom while GPU has jobs on slot 2 */ -+ if (js != 2 && (kbase_gpu_atoms_submitted(kbdev, 2) || -+ !backend->rmu_workaround_flag)) -+ return false; ++ if (enable == hdmi->allm_enable) ++ return; + -+ backend->rmu_workaround_flag = !backend->rmu_workaround_flag; ++ hdmi->allm_enable = enable; + -+ return true; ++ if (enable && !(link_cfg->add_func & SUPPORT_HDMI_ALLM)) { ++ hdmi->allm_enable = false; ++ dev_err(hdmi->dev, "sink don't support allm, allm won't be enabled\n"); ++ return; ++ } ++ ++ hdmi_config_vendor_specific_infoframe(hdmi, hdmi->curr_conn, &hdmi->previous_mode); +} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_set_allm_enable); + -+/** -+ * other_slots_busy - Determine if any job slots other than @js are currently -+ * running atoms -+ * @kbdev: Device pointer -+ * @js: Job slot -+ * -+ * Return: true if any slots other than @js are busy, false otherwise -+ */ -+static inline bool other_slots_busy(struct kbase_device *kbdev, int js) ++static int ++dw_hdmi_atomic_connector_set_property(struct drm_connector *connector, ++ struct drm_connector_state *state, ++ struct drm_property *property, ++ uint64_t val) +{ -+ int slot; ++ struct dw_hdmi_qp *hdmi = ++ container_of(connector, struct dw_hdmi_qp, connector); ++ const struct dw_hdmi_property_ops *ops = hdmi->plat_data->property_ops; + -+ for (slot = 0; slot < kbdev->gpu_props.num_job_slots; slot++) { -+ if (slot == js) -+ continue; ++ if (ops && ops->set_property) ++ return ops->set_property(connector, state, property, ++ val, hdmi->plat_data->phy_data); ++ else ++ return -EINVAL; ++} + -+ if (kbase_gpu_nr_atoms_on_slot_min(kbdev, slot, -+ KBASE_ATOM_GPU_RB_SUBMITTED)) -+ return true; -+ } ++static int ++dw_hdmi_atomic_connector_get_property(struct drm_connector *connector, ++ const struct drm_connector_state *state, ++ struct drm_property *property, ++ uint64_t *val) ++{ ++ struct dw_hdmi_qp *hdmi = ++ container_of(connector, struct dw_hdmi_qp, connector); ++ const struct dw_hdmi_property_ops *ops = hdmi->plat_data->property_ops; + -+ return false; ++ if (ops && ops->get_property) ++ return ops->get_property(connector, state, property, ++ val, hdmi->plat_data->phy_data); ++ else ++ return -EINVAL; +} + -+static inline bool kbase_gpu_in_protected_mode(struct kbase_device *kbdev) ++static int ++dw_hdmi_connector_set_property(struct drm_connector *connector, ++ struct drm_property *property, uint64_t val) +{ -+ return kbdev->protected_mode; ++ return dw_hdmi_atomic_connector_set_property(connector, NULL, ++ property, val); +} + -+static int kbase_gpu_protected_mode_enter(struct kbase_device *kbdev) ++static void dw_hdmi_attach_properties(struct dw_hdmi_qp *hdmi) +{ -+ int err = -EINVAL; ++ u32 val; ++ u64 color = MEDIA_BUS_FMT_YUV8_1X24; ++ const struct dw_hdmi_property_ops *ops = ++ hdmi->plat_data->property_ops; ++ void *data = hdmi->plat_data->phy_data; ++ enum drm_connector_status connect_status = ++ hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ if ((connect_status == connector_status_connected) && ++ hdmi->initialized) { ++ if (hdmi->plat_data->get_grf_color_fmt) ++ color = hdmi->plat_data->get_grf_color_fmt(data); + -+ WARN_ONCE(!kbdev->protected_ops, -+ "Cannot enter protected mode: protected callbacks not specified.\n"); ++ val = (hdmi_readl(hdmi, PKT_VSI_CONTENTS1) >> 8) & 0xffffff; ++ if (val == HDMI_FORUM_OUI) ++ hdmi->allm_enable = true; ++ else ++ hdmi->allm_enable = false; ++ } + + /* -+ * When entering into protected mode, we must ensure that the -+ * GPU is not operating in coherent mode as well. This is to -+ * ensure that no protected memory can be leaked. ++ * Because all hdmi registers are configured the same value ++ * between yuv422 8/10 bit. We set a useless bit in uboot to mark ++ * yuv422 10bit. + */ -+ if (kbdev->system_coherency == COHERENCY_ACE) -+ kbase_cache_set_coherency_mode(kbdev, COHERENCY_ACE_LITE); ++ if (color == MEDIA_BUS_FMT_YUYV10_1X20 && ++ !(hdmi_readl(hdmi, VIDEO_INTERFACE_CONFIG0) & BIT(20))) ++ color = MEDIA_BUS_FMT_YUYV8_1X16; + -+ if (kbdev->protected_ops) { -+ /* Switch GPU to protected mode */ -+ err = kbdev->protected_ops->protected_mode_enable( -+ kbdev->protected_dev); ++ if (ops && ops->attach_properties) ++ return ops->attach_properties(&hdmi->connector, color, 0, ++ hdmi->plat_data->phy_data, hdmi->allm_enable); ++} + -+ if (err) -+ dev_warn(kbdev->dev, "Failed to enable protected mode: %d\n", -+ err); -+ else -+ kbdev->protected_mode = true; -+ } ++static void dw_hdmi_destroy_properties(struct dw_hdmi_qp *hdmi) ++{ ++ const struct dw_hdmi_property_ops *ops = ++ hdmi->plat_data->property_ops; + -+ return err; ++ if (ops && ops->destroy_properties) ++ return ops->destroy_properties(&hdmi->connector, ++ hdmi->plat_data->phy_data); +} + -+static int kbase_gpu_protected_mode_reset(struct kbase_device *kbdev) ++static struct drm_encoder * ++dw_hdmi_connector_best_encoder(struct drm_connector *connector) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ struct dw_hdmi_qp *hdmi = ++ container_of(connector, struct dw_hdmi_qp, connector); + -+ WARN_ONCE(!kbdev->protected_ops, -+ "Cannot exit protected mode: protected callbacks not specified.\n"); ++ return hdmi->bridge.encoder; ++} + -+ if (!kbdev->protected_ops) -+ return -EINVAL; ++static bool dw_hdmi_color_changed(struct drm_connector *connector, ++ struct drm_atomic_state *state) ++{ ++ struct dw_hdmi_qp *hdmi = ++ container_of(connector, struct dw_hdmi_qp, connector); ++ void *data = hdmi->plat_data->phy_data; ++ struct drm_connector_state *old_state = ++ drm_atomic_get_old_connector_state(state, connector); ++ struct drm_connector_state *new_state = ++ drm_atomic_get_new_connector_state(state, connector); ++ bool ret = false; + -+ /* The protected mode disable callback will be called as part of reset -+ */ -+ kbase_reset_gpu_silent(kbdev); ++ if (hdmi->plat_data->get_color_changed) ++ ret = hdmi->plat_data->get_color_changed(data); + -+ return 0; ++ if (new_state->colorspace != old_state->colorspace) ++ ret = true; ++ ++ return ret; +} + -+static int kbase_jm_enter_protected_mode(struct kbase_device *kbdev, -+ struct kbase_jd_atom **katom, int idx, int js) ++static bool hdr_metadata_equal(struct dw_hdmi_qp *hdmi, const struct drm_connector_state *old_state, ++ const struct drm_connector_state *new_state) +{ -+ int err = 0; ++ struct drm_property_blob *old_blob = old_state->hdr_output_metadata; ++ struct drm_property_blob *new_blob = new_state->hdr_output_metadata; ++ int i, ret; ++ u8 *data; + -+ switch (katom[idx]->protected_state.enter) { -+ case KBASE_ATOM_ENTER_PROTECTED_CHECK: -+ KBASE_TLSTREAM_AUX_PROTECTED_ENTER_START(kbdev); -+ /* The checks in KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV -+ * should ensure that we are not already transitiong, and that -+ * there are no atoms currently on the GPU. */ -+ WARN_ON(kbdev->protected_mode_transition); -+ WARN_ON(kbase_gpu_atoms_submitted_any(kbdev)); ++ hdmi->hdr2sdr = false; + -+ kbdev->protected_mode_transition = true; -+ katom[idx]->protected_state.enter = -+ KBASE_ATOM_ENTER_PROTECTED_VINSTR; ++ if (!old_blob && !new_blob) ++ return true; + -+ /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_ENTER_PROTECTED_VINSTR: -+ if (kbase_vinstr_try_suspend(kbdev->vinstr_ctx) < 0) { -+ /* -+ * We can't switch now because -+ * the vinstr core state switch -+ * is not done yet. -+ */ -+ return -EAGAIN; -+ } ++ if (!old_blob) { ++ data = (u8 *)new_blob->data; + -+ /* Use generic model for IPA in protected mode */ -+ kbase_ipa_model_use_fallback_locked(kbdev); ++ for (i = 0; i < new_blob->length; i++) ++ if (data[i]) ++ return false; + -+ /* Once reaching this point GPU must be -+ * switched to protected mode or vinstr -+ * re-enabled. */ ++ return true; ++ } + -+ /* -+ * Not in correct mode, begin protected mode switch. -+ * Entering protected mode requires us to power down the L2, -+ * and drop out of fully coherent mode. -+ */ -+ katom[idx]->protected_state.enter = -+ KBASE_ATOM_ENTER_PROTECTED_IDLE_L2; ++ if (!new_blob) { ++ data = (u8 *)old_blob->data; + -+ kbase_pm_update_cores_state_nolock(kbdev); ++ for (i = 0; i < old_blob->length; i++) ++ if (data[i]) ++ return false; + -+ /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_ENTER_PROTECTED_IDLE_L2: -+ /* Avoid unnecessary waiting on non-ACE platforms. */ -+ if (kbdev->current_gpu_coherency_mode == COHERENCY_ACE) { -+ if (kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_L2) || -+ kbase_pm_get_trans_cores(kbdev, KBASE_PM_CORE_L2)) { -+ /* -+ * The L2 is still powered, wait for all the users to -+ * finish with it before doing the actual reset. -+ */ -+ return -EAGAIN; -+ } -+ } ++ return true; ++ } + -+ katom[idx]->protected_state.enter = -+ KBASE_ATOM_ENTER_PROTECTED_FINISHED; ++ if (old_blob->length != new_blob->length) ++ return false; + -+ /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_ENTER_PROTECTED_FINISHED: ++ ret = !memcmp(old_blob->data, new_blob->data, old_blob->length); + -+ /* No jobs running, so we can switch GPU mode right now. */ -+ err = kbase_gpu_protected_mode_enter(kbdev); ++ if (!ret && new_blob) { ++ data = (u8 *)new_blob->data; + -+ /* -+ * Regardless of result, we are no longer transitioning -+ * the GPU. -+ */ -+ kbdev->protected_mode_transition = false; -+ KBASE_TLSTREAM_AUX_PROTECTED_ENTER_END(kbdev); -+ if (err) { -+ /* -+ * Failed to switch into protected mode, resume -+ * vinstr core and fail atom. -+ */ -+ kbase_vinstr_resume(kbdev->vinstr_ctx); -+ katom[idx]->event_code = BASE_JD_EVENT_JOB_INVALID; -+ kbase_gpu_mark_atom_for_return(kbdev, katom[idx]); -+ /* Only return if head atom or previous atom -+ * already removed - as atoms must be returned -+ * in order. */ -+ if (idx == 0 || katom[0]->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { -+ kbase_gpu_dequeue_atom(kbdev, js, NULL); -+ kbase_jm_return_atom_to_js(kbdev, katom[idx]); -+ } ++ for (i = 0; i < new_blob->length; i++) ++ if (data[i]) ++ break; + -+ /* Go back to configured model for IPA */ -+ kbase_ipa_model_use_configured_locked(kbdev); ++ if (i == new_blob->length) ++ hdmi->hdr2sdr = true; ++ } + -+ return -EINVAL; -+ } ++ return ret; ++} + -+ /* Protected mode sanity checks. */ -+ KBASE_DEBUG_ASSERT_MSG( -+ kbase_jd_katom_is_protected(katom[idx]) == -+ kbase_gpu_in_protected_mode(kbdev), -+ "Protected mode of atom (%d) doesn't match protected mode of GPU (%d)", -+ kbase_jd_katom_is_protected(katom[idx]), -+ kbase_gpu_in_protected_mode(kbdev)); -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_READY; ++static bool check_hdr_color_change(struct drm_connector_state *old_state, ++ struct drm_connector_state *new_state, ++ struct dw_hdmi_qp *hdmi) ++{ ++ void *data = hdmi->plat_data->phy_data; ++ ++ if (!hdr_metadata_equal(hdmi, old_state, new_state)) { ++ hdmi->plat_data->check_hdr_color_change(new_state, data); ++ return true; + } + -+ return 0; ++ return false; +} + -+static int kbase_jm_exit_protected_mode(struct kbase_device *kbdev, -+ struct kbase_jd_atom **katom, int idx, int js) ++static bool check_dw_hdcp_state_changed(struct drm_connector *conn, ++ struct drm_atomic_state *state) +{ -+ int err = 0; ++ struct drm_connector_state *old_state, *new_state; ++ u64 old_cp, new_cp; + ++ old_state = drm_atomic_get_old_connector_state(state, conn); ++ new_state = drm_atomic_get_new_connector_state(state, conn); ++ old_cp = old_state->content_protection; ++ new_cp = new_state->content_protection; + -+ switch (katom[idx]->protected_state.exit) { -+ case KBASE_ATOM_EXIT_PROTECTED_CHECK: -+ KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_START(kbdev); -+ /* The checks in KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV -+ * should ensure that we are not already transitiong, and that -+ * there are no atoms currently on the GPU. */ -+ WARN_ON(kbdev->protected_mode_transition); -+ WARN_ON(kbase_gpu_atoms_submitted_any(kbdev)); ++ if (old_state->hdcp_content_type != new_state->hdcp_content_type && ++ new_cp != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) { ++ new_state->content_protection = DRM_MODE_CONTENT_PROTECTION_DESIRED; ++ return true; ++ } + -+ /* -+ * Exiting protected mode requires a reset, but first the L2 -+ * needs to be powered down to ensure it's not active when the -+ * reset is issued. -+ */ -+ katom[idx]->protected_state.exit = -+ KBASE_ATOM_EXIT_PROTECTED_IDLE_L2; ++ if (!new_state->crtc) { ++ if (old_cp == DRM_MODE_CONTENT_PROTECTION_ENABLED) ++ new_state->content_protection = DRM_MODE_CONTENT_PROTECTION_DESIRED; ++ return false; ++ } + -+ kbdev->protected_mode_transition = true; -+ kbase_pm_update_cores_state_nolock(kbdev); ++ if (old_cp == new_cp || ++ (old_cp == DRM_MODE_CONTENT_PROTECTION_DESIRED && ++ new_cp == DRM_MODE_CONTENT_PROTECTION_ENABLED)) ++ return false; + -+ /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_EXIT_PROTECTED_IDLE_L2: -+ if (kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_L2) || -+ kbase_pm_get_trans_cores(kbdev, KBASE_PM_CORE_L2)) { -+ /* -+ * The L2 is still powered, wait for all the users to -+ * finish with it before doing the actual reset. -+ */ -+ return -EAGAIN; -+ } -+ katom[idx]->protected_state.exit = -+ KBASE_ATOM_EXIT_PROTECTED_RESET; ++ return true; ++} + -+ /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_EXIT_PROTECTED_RESET: -+ /* Issue the reset to the GPU */ -+ err = kbase_gpu_protected_mode_reset(kbdev); ++static int dw_hdmi_connector_atomic_check(struct drm_connector *connector, ++ struct drm_atomic_state *state) ++{ ++ struct drm_connector_state *old_state = ++ drm_atomic_get_old_connector_state(state, connector); ++ struct drm_connector_state *new_state = ++ drm_atomic_get_new_connector_state(state, connector); ++ struct drm_crtc *crtc = new_state->crtc; ++ struct drm_crtc *old_crtc = old_state->crtc; ++ struct drm_crtc_state *crtc_state, *old_crtc_state; ++ struct dw_hdmi_qp *hdmi = ++ container_of(connector, struct dw_hdmi_qp, connector); ++ struct drm_display_mode mode; ++ void *data = hdmi->plat_data->phy_data; ++ struct hdmi_vmode_qp *vmode = &hdmi->hdmi_data.video_mode; + -+ if (err) { -+ kbdev->protected_mode_transition = false; ++ if (old_crtc) { ++ old_crtc_state = drm_atomic_get_crtc_state(state, old_crtc); ++ if (IS_ERR(old_crtc_state)) ++ return PTR_ERR(old_crtc_state); + -+ /* Failed to exit protected mode, fail atom */ -+ katom[idx]->event_code = BASE_JD_EVENT_JOB_INVALID; -+ kbase_gpu_mark_atom_for_return(kbdev, katom[idx]); -+ /* Only return if head atom or previous atom -+ * already removed - as atoms must be returned -+ * in order */ -+ if (idx == 0 || katom[0]->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { -+ kbase_gpu_dequeue_atom(kbdev, js, NULL); -+ kbase_jm_return_atom_to_js(kbdev, katom[idx]); -+ } ++ if (hdmi->plat_data->get_vp_id) ++ hdmi->old_vp_id = hdmi->plat_data->get_vp_id(old_crtc_state); ++ } + -+ kbase_vinstr_resume(kbdev->vinstr_ctx); ++ if (!crtc) ++ return 0; + -+ /* Use generic model for IPA in protected mode */ -+ kbase_ipa_model_use_fallback_locked(kbdev); ++ crtc_state = drm_atomic_get_crtc_state(state, crtc); ++ if (IS_ERR(crtc_state)) ++ return PTR_ERR(crtc_state); + -+ return -EINVAL; -+ } ++ if (hdmi->plat_data->get_vp_id) ++ hdmi->vp_id = hdmi->plat_data->get_vp_id(crtc_state); + -+ katom[idx]->protected_state.exit = -+ KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT; ++ memcpy(&mode, &crtc_state->mode, sizeof(mode)); ++ /* ++ * If HDMI is enabled in uboot, it's need to record ++ * drm_display_mode and set phy status to enabled. ++ */ ++ if (!vmode->mpixelclock) { ++ struct dw_hdmi_qp *secondary = NULL; ++ u8 val; + -+ /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT: -+ /* A GPU reset is issued when exiting protected mode. Once the -+ * reset is done all atoms' state will also be reset. For this -+ * reason, if the atom is still in this state we can safely -+ * say that the reset has not completed i.e., we have not -+ * finished exiting protected mode yet. ++ if (hdmi->plat_data->left) ++ secondary = hdmi->plat_data->left; ++ else if (hdmi->plat_data->right) ++ secondary = hdmi->plat_data->right; ++ hdmi->curr_conn = connector; ++ if (secondary) ++ secondary->curr_conn = connector; ++ if (hdmi->plat_data->get_enc_in_encoding) ++ hdmi->hdmi_data.enc_in_encoding = ++ hdmi->plat_data->get_enc_in_encoding(data); ++ if (hdmi->plat_data->get_enc_out_encoding) ++ hdmi->hdmi_data.enc_out_encoding = ++ hdmi->plat_data->get_enc_out_encoding(data); ++ if (hdmi->plat_data->get_input_bus_format) ++ hdmi->hdmi_data.enc_in_bus_format = ++ hdmi->plat_data->get_input_bus_format(data); ++ if (hdmi->plat_data->get_output_bus_format) ++ hdmi->hdmi_data.enc_out_bus_format = ++ hdmi->plat_data->get_output_bus_format(data); ++ ++ if (hdmi->plat_data->split_mode) { ++ hdmi->plat_data->convert_to_origin_mode(&mode); ++ mode.crtc_clock /= 2; ++ } ++ memcpy(&hdmi->previous_mode, &mode, sizeof(hdmi->previous_mode)); ++ vmode->mpixelclock = mode.crtc_clock * 1000; ++ vmode->previous_pixelclock = mode.clock; ++ vmode->previous_tmdsclock = mode.clock; ++ vmode->mtmdsclock = hdmi_get_tmdsclock(hdmi, ++ vmode->mpixelclock); ++ if (hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_out_bus_format)) ++ vmode->mtmdsclock /= 2; ++ ++ /* ++ * If uboot logo enabled, atomic_enable won't be called, ++ * but atomic_disable will be called when hdmi plug out. ++ * That will cause dclk enable count is incorrect. So ++ * we should check ipi/link/video clk to determine whether ++ * uboot logo is enabled. + */ -+ return -EAGAIN; ++ if (hdmi->initialized && !hdmi->dclk_en) { ++ mutex_lock(&hdmi->audio_mutex); ++ if (hdmi->plat_data->dclk_set) ++ hdmi->plat_data->dclk_set(data, true, hdmi->vp_id); ++ hdmi->dclk_en = true; ++ mutex_unlock(&hdmi->audio_mutex); ++ hdmi->curr_conn = connector; ++ extcon_set_state_sync(hdmi->extcon, EXTCON_DISP_HDMI, true); ++ } ++ ++ drm_scdc_readb(hdmi->ddc, SCDC_TMDS_CONFIG, &val); ++ /* if plug out before hdmi bind, reset hdmi */ ++ if (vmode->mtmdsclock >= 340000000 && vmode->mpixelclock <= 600000000 && ++ !(val & SCDC_TMDS_BIT_CLOCK_RATIO_BY_40)) ++ hdmi->logo_plug_out = true; + } + -+ return 0; -+} ++ if (check_hdr_color_change(old_state, new_state, hdmi) || hdmi->logo_plug_out || ++ dw_hdmi_color_changed(connector, state) || ++ dw_hdmi_qp_check_output_type_changed(hdmi)) { ++ u32 mtmdsclk; + -+void kbase_backend_slot_update(struct kbase_device *kbdev) -+{ -+ int js; ++ crtc_state = drm_atomic_get_crtc_state(state, crtc); ++ if (IS_ERR(crtc_state)) ++ return PTR_ERR(crtc_state); + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ if (hdmi->plat_data->update_color_format) ++ hdmi->plat_data->update_color_format(new_state, data); ++ if (hdmi->plat_data->get_enc_in_encoding) ++ hdmi->hdmi_data.enc_in_encoding = ++ hdmi->plat_data->get_enc_in_encoding(data); ++ if (hdmi->plat_data->get_enc_out_encoding) ++ hdmi->hdmi_data.enc_out_encoding = ++ hdmi->plat_data->get_enc_out_encoding(data); ++ if (hdmi->plat_data->get_input_bus_format) ++ hdmi->hdmi_data.enc_in_bus_format = ++ hdmi->plat_data->get_input_bus_format(data); ++ if (hdmi->plat_data->get_output_bus_format) ++ hdmi->hdmi_data.enc_out_bus_format = ++ hdmi->plat_data->get_output_bus_format(data); + -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ struct kbase_jd_atom *katom[2]; -+ int idx; ++ mtmdsclk = hdmi_get_tmdsclock(hdmi, mode.clock); ++ if (hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_out_bus_format)) ++ mtmdsclk /= 2; + -+ katom[0] = kbase_gpu_inspect(kbdev, js, 0); -+ katom[1] = kbase_gpu_inspect(kbdev, js, 1); -+ WARN_ON(katom[1] && !katom[0]); ++ if (hdmi->hdmi_data.video_mode.mpixelclock == (mode.clock * 1000) && ++ hdmi->hdmi_data.video_mode.mtmdsclock == (mtmdsclk * 1000) && ++ mode.clock <= 600000 && !hdmi->disabled && !hdmi->logo_plug_out) { ++ hdmi->update = true; ++ hdmi_writel(hdmi, 1, PKTSCHED_PKT_CONTROL0); ++ hdmi_modb(hdmi, PKTSCHED_GCP_TX_EN, PKTSCHED_GCP_TX_EN, PKTSCHED_PKT_EN); ++ mdelay(50); ++ } else if (!hdmi->disabled) { ++ if (hdmi->previous_mode.clock > 600000 && mode.clock > 600000) ++ hdmi->frl_switch = true; ++ hdmi->update = false; ++ crtc_state->mode_changed = true; ++ hdmi->logo_plug_out = false; ++ } ++ } + -+ for (idx = 0; idx < SLOT_RB_SIZE; idx++) { -+ bool cores_ready; -+ int ret; ++ if (check_dw_hdcp_state_changed(connector, state)) ++ crtc_state->mode_changed = true; + -+ if (!katom[idx]) -+ continue; ++ return 0; ++} + -+ switch (katom[idx]->gpu_rb_state) { -+ case KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB: -+ /* Should be impossible */ -+ WARN(1, "Attempting to update atom not in ringbuffer\n"); -+ break; ++static void dw_hdmi_connector_atomic_commit(struct drm_connector *connector, ++ struct drm_connector_state *state) ++{ ++ struct dw_hdmi_qp *hdmi = ++ container_of(connector, struct dw_hdmi_qp, connector); + -+ case KBASE_ATOM_GPU_RB_WAITING_BLOCKED: -+ if (katom[idx]->atom_flags & -+ KBASE_KATOM_FLAG_X_DEP_BLOCKED) -+ break; ++ if (hdmi->update) { ++ dw_hdmi_qp_setup(hdmi, hdmi->curr_conn, &hdmi->previous_mode); ++ msleep(50); ++ hdmi_writel(hdmi, 2, PKTSCHED_PKT_CONTROL0); ++ hdmi->update = false; ++ } ++} + -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV; ++void dw_hdmi_qp_set_output_type(struct dw_hdmi_qp *hdmi, u64 val) ++{ ++ hdmi->force_output = val; ++} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_set_output_type); + -+ /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_PREV: -+ if (kbase_gpu_check_secure_atoms(kbdev, -+ !kbase_jd_katom_is_protected( -+ katom[idx]))) -+ break; ++bool dw_hdmi_qp_get_output_whether_hdmi(struct dw_hdmi_qp *hdmi) ++{ ++ return hdmi->sink_is_hdmi; ++} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_get_output_whether_hdmi); + -+ if ((idx == 1) && (kbase_jd_katom_is_protected( -+ katom[0]) != -+ kbase_jd_katom_is_protected( -+ katom[1]))) -+ break; ++int dw_hdmi_qp_get_output_type_cap(struct dw_hdmi_qp *hdmi) ++{ ++ return hdmi->support_hdmi; ++} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_get_output_type_cap); + -+ if (kbdev->protected_mode_transition) -+ break; ++static void dw_hdmi_connector_force(struct drm_connector *connector) ++{ ++ struct dw_hdmi_qp *hdmi = ++ container_of(connector, struct dw_hdmi_qp, connector); + -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION; ++ mutex_lock(&hdmi->mutex); + -+ /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_GPU_RB_WAITING_PROTECTED_MODE_TRANSITION: ++ if (hdmi->force != connector->force) { ++ if (!hdmi->disabled && connector->force == DRM_FORCE_OFF) ++ extcon_set_state_sync(hdmi->extcon, EXTCON_DISP_HDMI, ++ false); ++ else if (hdmi->disabled && connector->force == DRM_FORCE_ON) ++ extcon_set_state_sync(hdmi->extcon, EXTCON_DISP_HDMI, ++ true); ++ } + -+ /* -+ * Exiting protected mode must be done before -+ * the references on the cores are taken as -+ * a power down the L2 is required which -+ * can't happen after the references for this -+ * atom are taken. -+ */ ++ hdmi->force = connector->force; ++ mutex_unlock(&hdmi->mutex); ++} + -+ if (!kbase_gpu_in_protected_mode(kbdev) && -+ kbase_jd_katom_is_protected(katom[idx])) { -+ /* Atom needs to transition into protected mode. */ -+ ret = kbase_jm_enter_protected_mode(kbdev, -+ katom, idx, js); -+ if (ret) -+ break; -+ } else if (kbase_gpu_in_protected_mode(kbdev) && -+ !kbase_jd_katom_is_protected(katom[idx])) { -+ /* Atom needs to transition out of protected mode. */ -+ ret = kbase_jm_exit_protected_mode(kbdev, -+ katom, idx, js); -+ if (ret) -+ break; -+ } -+ katom[idx]->protected_state.exit = -+ KBASE_ATOM_EXIT_PROTECTED_CHECK; ++static const struct drm_connector_funcs dw_hdmi_connector_funcs = { ++ .fill_modes = drm_helper_probe_single_connector_modes, ++ .detect = dw_hdmi_connector_detect, ++ .destroy = drm_connector_cleanup, ++ .force = dw_hdmi_connector_force, ++ .reset = drm_atomic_helper_connector_reset, ++ .set_property = dw_hdmi_connector_set_property, ++ .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, ++ .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, ++ .atomic_set_property = dw_hdmi_atomic_connector_set_property, ++ .atomic_get_property = dw_hdmi_atomic_connector_get_property, ++}; + -+ /* Atom needs no protected mode transition. */ ++static const struct drm_connector_helper_funcs dw_hdmi_connector_helper_funcs = { ++ .get_modes = dw_hdmi_connector_get_modes, ++ .best_encoder = dw_hdmi_connector_best_encoder, ++ .atomic_check = dw_hdmi_connector_atomic_check, ++ .atomic_commit = dw_hdmi_connector_atomic_commit, ++}; + -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE; ++static int dw_hdmi_qp_bridge_attach(struct drm_bridge *bridge, ++ enum drm_bridge_attach_flags flags) ++{ ++ struct dw_hdmi_qp *hdmi = bridge->driver_private; ++ struct drm_encoder *encoder = bridge->encoder; ++ struct drm_connector *connector = &hdmi->connector; ++ struct cec_connector_info conn_info; ++ struct cec_notifier *notifier; ++ bool skip_connector = false; + -+ /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_GPU_RB_WAITING_FOR_CORE_AVAILABLE: -+ if (katom[idx]->will_fail_event_code) { -+ kbase_gpu_mark_atom_for_return(kbdev, -+ katom[idx]); -+ /* Set EVENT_DONE so this atom will be -+ completed, not unpulled. */ -+ katom[idx]->event_code = -+ BASE_JD_EVENT_DONE; -+ /* Only return if head atom or previous -+ * atom already removed - as atoms must -+ * be returned in order. */ -+ if (idx == 0 || katom[0]->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { -+ kbase_gpu_dequeue_atom(kbdev, js, NULL); -+ kbase_jm_return_atom_to_js(kbdev, katom[idx]); -+ } -+ break; -+ } ++ if (hdmi->next_bridge) { ++ struct drm_bridge *next_bridge = hdmi->next_bridge; ++ int ret; + -+ cores_ready = -+ kbasep_js_job_check_ref_cores(kbdev, js, -+ katom[idx]); ++ ret = drm_bridge_attach(bridge->encoder, next_bridge, bridge, ++ next_bridge->ops & DRM_BRIDGE_OP_MODES ? ++ DRM_BRIDGE_ATTACH_NO_CONNECTOR : 0); ++ if (ret) { ++ DRM_ERROR("failed to attach next bridge: %d\n", ret); ++ return ret; ++ } + -+ if (katom[idx]->event_code == -+ BASE_JD_EVENT_PM_EVENT) { -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_RETURN_TO_JS; -+ break; -+ } ++ skip_connector = !(next_bridge->ops & DRM_BRIDGE_OP_MODES); ++ } + -+ if (!cores_ready) -+ break; ++ hdmi->skip_connector = skip_connector; ++ if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR || skip_connector) ++ return 0; + -+ kbase_js_affinity_retain_slot_cores(kbdev, js, -+ katom[idx]->affinity); -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_WAITING_AFFINITY; ++ connector->interlace_allowed = 1; ++ connector->polled = DRM_CONNECTOR_POLL_HPD; ++ if (hdmi->next_bridge && hdmi->next_bridge->ops & DRM_BRIDGE_OP_DETECT) ++ connector->polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT; ++ drm_connector_helper_add(connector, &dw_hdmi_connector_helper_funcs); + -+ /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_GPU_RB_WAITING_AFFINITY: -+ if (!kbase_gpu_rmu_workaround(kbdev, js)) -+ break; ++ drm_connector_init(bridge->dev, connector, &dw_hdmi_connector_funcs, ++ DRM_MODE_CONNECTOR_HDMIA); + -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_READY; ++ drm_connector_attach_encoder(connector, encoder); ++ dw_hdmi_attach_properties(hdmi); + -+ /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_GPU_RB_READY: ++ if (hdmi->cec_enable) { ++ cec_fill_conn_info_from_drm(&conn_info, connector); ++ notifier = cec_notifier_conn_register(hdmi->dev, NULL, &conn_info); ++ if (!notifier) ++ return -ENOMEM; + -+ if (idx == 1) { -+ /* Only submit if head atom or previous -+ * atom already submitted */ -+ if ((katom[0]->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_SUBMITTED && -+ katom[0]->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB)) -+ break; ++ mutex_lock(&hdmi->cec_notifier_mutex); ++ hdmi->cec_notifier = notifier; ++ mutex_unlock(&hdmi->cec_notifier_mutex); ++ } + -+ /* If intra-slot serialization in use -+ * then don't submit atom to NEXT slot -+ */ -+ if (kbdev->serialize_jobs & -+ KBASE_SERIALIZE_INTRA_SLOT) -+ break; -+ } ++ return 0; ++} + -+ /* If inter-slot serialization in use then don't -+ * submit atom if any other slots are in use */ -+ if ((kbdev->serialize_jobs & -+ KBASE_SERIALIZE_INTER_SLOT) && -+ other_slots_busy(kbdev, js)) -+ break; ++static void dw_hdmi_qp_bridge_detach(struct drm_bridge *bridge) ++{ ++ struct dw_hdmi_qp *hdmi = bridge->driver_private; + -+ if ((kbdev->serialize_jobs & -+ KBASE_SERIALIZE_RESET) && -+ kbase_reset_gpu_active(kbdev)) -+ break; ++ if (hdmi->cec_notifier) { ++ mutex_lock(&hdmi->cec_notifier_mutex); ++ cec_notifier_conn_unregister(hdmi->cec_notifier); ++ hdmi->cec_notifier = NULL; ++ mutex_unlock(&hdmi->cec_notifier_mutex); ++ } ++} + -+ /* Check if this job needs the cycle counter -+ * enabled before submission */ -+ if (katom[idx]->core_req & BASE_JD_REQ_PERMON) -+ kbase_pm_request_gpu_cycle_counter_l2_is_on( -+ kbdev); ++static enum drm_mode_status ++dw_hdmi_qp_bridge_mode_valid(struct drm_bridge *bridge, ++ const struct drm_display_info *info, ++ const struct drm_display_mode *mode) ++{ ++ struct dw_hdmi_qp *hdmi = bridge->driver_private; ++ const struct dw_hdmi_plat_data *pdata = hdmi->plat_data; + -+ kbase_job_hw_submit(kbdev, katom[idx], js); -+ katom[idx]->gpu_rb_state = -+ KBASE_ATOM_GPU_RB_SUBMITTED; ++ if (mode->hdisplay == 7680) { ++ if (mode->clock == 1186813 || mode->clock == 2373626) ++ return MODE_ERROR; ++ } + -+ /* Inform power management at start/finish of -+ * atom so it can update its GPU utilisation -+ * metrics. */ -+ kbase_pm_metrics_update(kbdev, -+ &katom[idx]->start_timestamp); ++ if (mode->clock <= 25000) ++ return MODE_CLOCK_RANGE; + -+ /* ***TRANSITION TO HIGHER STATE*** */ -+ /* fallthrough */ -+ case KBASE_ATOM_GPU_RB_SUBMITTED: -+ /* Atom submitted to HW, nothing else to do */ -+ break; ++ if (!hdmi->sink_is_hdmi && mode->clock > 340000) ++ return MODE_BAD; + -+ case KBASE_ATOM_GPU_RB_RETURN_TO_JS: -+ /* Only return if head atom or previous atom -+ * already removed - as atoms must be returned -+ * in order */ -+ if (idx == 0 || katom[0]->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB) { -+ kbase_gpu_dequeue_atom(kbdev, js, NULL); -+ kbase_jm_return_atom_to_js(kbdev, -+ katom[idx]); -+ } -+ break; -+ } -+ } -+ } ++ if (pdata->mode_valid) ++ return pdata->mode_valid(NULL, pdata->priv_data, info, ++ mode); + -+ /* Warn if PRLAM-8987 affinity restrictions are violated */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987)) -+ WARN_ON((kbase_gpu_atoms_submitted(kbdev, 0) || -+ kbase_gpu_atoms_submitted(kbdev, 1)) && -+ kbase_gpu_atoms_submitted(kbdev, 2)); ++ return MODE_OK; +} + -+ -+void kbase_backend_run_atom(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) ++static void dw_hdmi_qp_bridge_mode_set(struct drm_bridge *bridge, ++ const struct drm_display_mode *orig_mode, ++ const struct drm_display_mode *mode) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ kbase_gpu_enqueue_atom(kbdev, katom); -+ kbase_backend_slot_update(kbdev); -+} ++ struct dw_hdmi_qp *hdmi = bridge->driver_private; + -+#define HAS_DEP(katom) (katom->pre_dep || katom->atom_flags & \ -+ (KBASE_KATOM_FLAG_X_DEP_BLOCKED | KBASE_KATOM_FLAG_FAIL_BLOCKER)) ++ mutex_lock(&hdmi->mutex); + -+bool kbase_gpu_irq_evict(struct kbase_device *kbdev, int js) ++ if (!drm_mode_equal(orig_mode, mode)) ++ hdmi->frl_switch = false; ++ /* Store the display mode for plugin/DKMS poweron events */ ++ memcpy(&hdmi->previous_mode, mode, sizeof(hdmi->previous_mode)); ++ if (hdmi->plat_data->split_mode) ++ hdmi->plat_data->convert_to_origin_mode(&hdmi->previous_mode); ++ ++ mutex_unlock(&hdmi->mutex); ++} ++ ++static void dw_hdmi_qp_bridge_atomic_disable(struct drm_bridge *bridge, ++ struct drm_bridge_state *old_state) +{ -+ struct kbase_jd_atom *katom; -+ struct kbase_jd_atom *next_katom; ++ struct dw_hdmi_qp *hdmi = bridge->driver_private; ++ void *data = hdmi->plat_data->phy_data; ++ const struct drm_connector_state *conn_state = hdmi->curr_conn->state; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ if (hdmi->panel) ++ drm_panel_disable(hdmi->panel); + -+ katom = kbase_gpu_inspect(kbdev, js, 0); -+ next_katom = kbase_gpu_inspect(kbdev, js, 1); ++ /* set avmute */ ++ hdmi_writel(hdmi, 1, PKTSCHED_PKT_CONTROL0); ++ mdelay(50); + -+ if (next_katom && katom->kctx == next_katom->kctx && -+ next_katom->gpu_rb_state == KBASE_ATOM_GPU_RB_SUBMITTED && -+ HAS_DEP(next_katom) && -+ (kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_LO), NULL) -+ != 0 || -+ kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_HEAD_NEXT_HI), NULL) -+ != 0)) { -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, JS_COMMAND_NEXT), -+ JS_COMMAND_NOP, NULL); -+ next_katom->gpu_rb_state = KBASE_ATOM_GPU_RB_READY; ++ hdmi_modb(hdmi, 0, HDCP2_ESM_P0_GPIO_OUT_2_CHG_IRQ, ++ AVP_3_INT_MASK_N); ++ if (hdmi->hdcp && hdmi->hdcp->hdcp_stop) ++ hdmi->hdcp->hdcp_stop(hdmi->hdcp); + -+ KBASE_TLSTREAM_TL_NRET_ATOM_LPU(katom, -+ &kbdev->gpu_props.props.raw_props.js_features -+ [katom->slot_nr]); -+ KBASE_TLSTREAM_TL_NRET_ATOM_AS(katom, &kbdev->as -+ [katom->kctx->as_nr]); -+ KBASE_TLSTREAM_TL_NRET_CTX_LPU(katom->kctx, -+ &kbdev->gpu_props.props.raw_props.js_features -+ [katom->slot_nr]); ++ hdmi_writel(hdmi, 0, HDCP2LOGIC_ESM_GPIO_IN); ++ if (conn_state->content_protection != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) ++ drm_hdcp_update_content_protection(hdmi->curr_conn, ++ DRM_MODE_CONTENT_PROTECTION_DESIRED); + -+ return true; ++ if (hdmi->plat_data->set_hdcp_status) ++ hdmi->plat_data->set_hdcp_status(data, hdmi->hdcp_status); ++ ++ extcon_set_state_sync(hdmi->extcon, EXTCON_DISP_HDMI, false); ++ handle_plugged_change(hdmi, false); ++ mutex_lock(&hdmi->mutex); ++ ++ if (hdmi->dclk_en) { ++ mutex_lock(&hdmi->audio_mutex); ++ if (hdmi->plat_data->dclk_set) ++ hdmi->plat_data->dclk_set(data, false, hdmi->old_vp_id); ++ hdmi->dclk_en = false; ++ mutex_unlock(&hdmi->audio_mutex); ++ }; ++ ++ if (hdmi->phy.ops->disable && !hdmi->frl_switch) { ++ hdmi_writel(hdmi, 0, FLT_CONFIG0); ++ hdmi_writel(hdmi, 0, SCRAMB_CONFIG0); ++ /* set sink frl mode disable */ ++ if (dw_hdmi_support_scdc(hdmi, &hdmi->curr_conn->display_info)) ++ drm_scdc_writeb(hdmi->ddc, 0x31, 0); ++ ++ hdmi->phy.ops->disable(hdmi, hdmi->phy.data); ++ hdmi->disabled = true; ++ if (hdmi->plat_data->link_clk_set) ++ hdmi->plat_data->link_clk_set(data, false); + } + -+ return false; ++ hdmi->curr_conn = NULL; ++ mutex_unlock(&hdmi->mutex); ++ ++ if (hdmi->panel) ++ drm_panel_unprepare(hdmi->panel); +} + -+void kbase_gpu_complete_hw(struct kbase_device *kbdev, int js, -+ u32 completion_code, -+ u64 job_tail, -+ ktime_t *end_timestamp) ++static void dw_hdmi_qp_bridge_atomic_enable(struct drm_bridge *bridge, ++ struct drm_bridge_state *old_state) +{ -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, js, 0); -+ struct kbase_context *kctx = katom->kctx; ++ struct dw_hdmi_qp *hdmi = bridge->driver_private; ++ struct drm_atomic_state *state = old_state->base.state; ++ struct drm_connector *connector; ++ void *data = hdmi->plat_data->phy_data; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ if (hdmi->panel) ++ drm_panel_prepare(hdmi->panel); + -+ /* -+ * When a hard-stop is followed close after a soft-stop, the completion -+ * code may be set to STOPPED, even though the job is terminated -+ */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TMIX_8438)) { -+ if (completion_code == BASE_JD_EVENT_STOPPED && -+ (katom->atom_flags & -+ KBASE_KATOM_FLAG_BEEN_HARD_STOPPED)) { -+ completion_code = BASE_JD_EVENT_TERMINATED; -+ } -+ } ++ connector = drm_atomic_get_new_connector_for_encoder(state, ++ bridge->encoder); + -+ if ((kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_6787) || (katom->core_req & -+ BASE_JD_REQ_SKIP_CACHE_END)) && -+ completion_code != BASE_JD_EVENT_DONE && -+ !(completion_code & BASE_JD_SW_EVENT)) { -+ /* When a job chain fails, on a T60x or when -+ * BASE_JD_REQ_SKIP_CACHE_END is set, the GPU cache is not -+ * flushed. To prevent future evictions causing possible memory -+ * corruption we need to flush the cache manually before any -+ * affected memory gets reused. */ -+ katom->need_cache_flush_cores_retained = katom->affinity; -+ kbase_pm_request_cores(kbdev, false, katom->affinity); -+ } else if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10676)) { -+ if (kbdev->gpu_props.num_core_groups > 1 && -+ !(katom->affinity & -+ kbdev->gpu_props.props.coherency_info.group[0].core_mask -+ ) && -+ (katom->affinity & -+ kbdev->gpu_props.props.coherency_info.group[1].core_mask -+ )) { -+ dev_info(kbdev->dev, "JD: Flushing cache due to PRLAM-10676\n"); -+ katom->need_cache_flush_cores_retained = -+ katom->affinity; -+ kbase_pm_request_cores(kbdev, false, -+ katom->affinity); -+ } -+ } -+ -+ katom = kbase_gpu_dequeue_atom(kbdev, js, end_timestamp); -+ kbase_timeline_job_slot_done(kbdev, katom->kctx, katom, js, 0); -+ -+ if (completion_code == BASE_JD_EVENT_STOPPED) { -+ struct kbase_jd_atom *next_katom = kbase_gpu_inspect(kbdev, js, -+ 0); ++ mutex_lock(&hdmi->mutex); ++ hdmi->curr_conn = connector; + -+ /* -+ * Dequeue next atom from ringbuffers on same slot if required. -+ * This atom will already have been removed from the NEXT -+ * registers by kbase_gpu_soft_hard_stop_slot(), to ensure that -+ * the atoms on this slot are returned in the correct order. -+ */ -+ if (next_katom && katom->kctx == next_katom->kctx && -+ next_katom->sched_priority == -+ katom->sched_priority) { -+ kbase_gpu_dequeue_atom(kbdev, js, end_timestamp); -+ kbase_jm_return_atom_to_js(kbdev, next_katom); -+ } -+ } else if (completion_code != BASE_JD_EVENT_DONE) { -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ int i; ++ dw_hdmi_qp_setup(hdmi, hdmi->curr_conn, &hdmi->previous_mode); ++ hdmi_writel(hdmi, 2, PKTSCHED_PKT_CONTROL0); ++ hdmi_modb(hdmi, PKTSCHED_GCP_TX_EN, PKTSCHED_GCP_TX_EN, PKTSCHED_PKT_EN); ++ mutex_unlock(&hdmi->mutex); + -+#if KBASE_TRACE_DUMP_ON_JOB_SLOT_ERROR != 0 -+ KBASE_TRACE_DUMP(kbdev); -+#endif -+ kbasep_js_clear_submit_allowed(js_devdata, katom->kctx); ++ if (!hdmi->dclk_en) { ++ mutex_lock(&hdmi->audio_mutex); ++ if (hdmi->plat_data->dclk_set) ++ hdmi->plat_data->dclk_set(data, true, hdmi->vp_id); ++ hdmi->dclk_en = true; ++ mutex_unlock(&hdmi->audio_mutex); ++ } ++ dw_hdmi_qp_init_audio_infoframe(hdmi); ++ dw_hdmi_qp_audio_enable(hdmi); ++ hdmi_clk_regenerator_update_pixel_clock(hdmi); + -+ /* -+ * Remove all atoms on the same context from ringbuffers. This -+ * will not remove atoms that are already on the GPU, as these -+ * are guaranteed not to have fail dependencies on the failed -+ * atom. -+ */ -+ for (i = 0; i < kbdev->gpu_props.num_job_slots; i++) { -+ struct kbase_jd_atom *katom_idx0 = -+ kbase_gpu_inspect(kbdev, i, 0); -+ struct kbase_jd_atom *katom_idx1 = -+ kbase_gpu_inspect(kbdev, i, 1); ++ extcon_set_state_sync(hdmi->extcon, EXTCON_DISP_HDMI, true); ++ handle_plugged_change(hdmi, true); + -+ if (katom_idx0 && katom_idx0->kctx == katom->kctx && -+ HAS_DEP(katom_idx0) && -+ katom_idx0->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_SUBMITTED) { -+ /* Dequeue katom_idx0 from ringbuffer */ -+ kbase_gpu_dequeue_atom(kbdev, i, end_timestamp); ++ if (hdmi->panel) ++ drm_panel_enable(hdmi->panel); ++} + -+ if (katom_idx1 && -+ katom_idx1->kctx == katom->kctx -+ && HAS_DEP(katom_idx1) && -+ katom_idx0->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_SUBMITTED) { -+ /* Dequeue katom_idx1 from ringbuffer */ -+ kbase_gpu_dequeue_atom(kbdev, i, -+ end_timestamp); ++static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = { ++ .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, ++ .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, ++ .atomic_reset = drm_atomic_helper_bridge_reset, ++ .attach = dw_hdmi_qp_bridge_attach, ++ .detach = dw_hdmi_qp_bridge_detach, ++ .mode_set = dw_hdmi_qp_bridge_mode_set, ++ .mode_valid = dw_hdmi_qp_bridge_mode_valid, ++ .atomic_enable = dw_hdmi_qp_bridge_atomic_enable, ++ .atomic_disable = dw_hdmi_qp_bridge_atomic_disable, ++}; + -+ katom_idx1->event_code = -+ BASE_JD_EVENT_STOPPED; -+ kbase_jm_return_atom_to_js(kbdev, -+ katom_idx1); -+ } -+ katom_idx0->event_code = BASE_JD_EVENT_STOPPED; -+ kbase_jm_return_atom_to_js(kbdev, katom_idx0); ++void dw_hdmi_qp_set_cec_adap(struct dw_hdmi_qp *hdmi, struct cec_adapter *adap) ++{ ++ hdmi->cec_adap = adap; ++} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_set_cec_adap); + -+ } else if (katom_idx1 && -+ katom_idx1->kctx == katom->kctx && -+ HAS_DEP(katom_idx1) && -+ katom_idx1->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_SUBMITTED) { -+ /* Can not dequeue this atom yet - will be -+ * dequeued when atom at idx0 completes */ -+ katom_idx1->event_code = BASE_JD_EVENT_STOPPED; -+ kbase_gpu_mark_atom_for_return(kbdev, -+ katom_idx1); -+ } -+ } -+ } ++static irqreturn_t dw_hdmi_qp_main_hardirq(int irq, void *dev_id) ++{ ++ struct dw_hdmi_qp *hdmi = dev_id; ++ struct dw_hdmi_qp_i2c *i2c = hdmi->i2c; ++ u32 stat; + -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, JM_JOB_DONE, kctx, katom, katom->jc, -+ js, completion_code); ++ stat = hdmi_readl(hdmi, MAINUNIT_1_INT_STATUS); + -+ if (job_tail != 0 && job_tail != katom->jc) { -+ bool was_updated = (job_tail != katom->jc); ++ i2c->stat = stat & (I2CM_OP_DONE_IRQ | I2CM_READ_REQUEST_IRQ | ++ I2CM_NACK_RCVD_IRQ); ++ hdmi->scdc_intr = stat & (SCDC_UPD_FLAGS_RD_IRQ | ++ SCDC_UPD_FLAGS_CHG_IRQ | ++ SCDC_UPD_FLAGS_CLR_IRQ | ++ SCDC_RR_REPLY_STOP_IRQ | ++ SCDC_NACK_RCVD_IRQ); ++ hdmi->flt_intr = stat & (FLT_EXIT_TO_LTSP_IRQ | ++ FLT_EXIT_TO_LTS4_IRQ | ++ FLT_EXIT_TO_LTSL_IRQ); + -+ /* Some of the job has been executed, so we update the job chain -+ * address to where we should resume from */ -+ katom->jc = job_tail; -+ if (was_updated) -+ KBASE_TRACE_ADD_SLOT(kbdev, JM_UPDATE_HEAD, katom->kctx, -+ katom, job_tail, js); ++ dev_dbg(hdmi->dev, "i2c main unit irq:%#x\n", stat); ++ if (i2c->stat) { ++ hdmi_writel(hdmi, i2c->stat, MAINUNIT_1_INT_CLEAR); ++ complete(&i2c->cmp); + } + -+ /* Only update the event code for jobs that weren't cancelled */ -+ if (katom->event_code != BASE_JD_EVENT_JOB_CANCELLED) -+ katom->event_code = (base_jd_event_code)completion_code; -+ -+ kbase_device_trace_register_access(kctx, REG_WRITE, -+ JOB_CONTROL_REG(JOB_IRQ_CLEAR), -+ 1 << js); -+ -+ /* Complete the job, and start new ones -+ * -+ * Also defer remaining work onto the workqueue: -+ * - Re-queue Soft-stopped jobs -+ * - For any other jobs, queue the job back into the dependency system -+ * - Schedule out the parent context if necessary, and schedule a new -+ * one in. -+ */ -+#ifdef CONFIG_GPU_TRACEPOINTS -+ { -+ /* The atom in the HEAD */ -+ struct kbase_jd_atom *next_katom = kbase_gpu_inspect(kbdev, js, -+ 0); ++ if (hdmi->flt_intr) { ++ dev_dbg(hdmi->dev, "i2c flt irq:%#x\n", hdmi->flt_intr); ++ hdmi_writel(hdmi, hdmi->flt_intr, MAINUNIT_1_INT_CLEAR); ++ complete(&hdmi->flt_cmp); ++ } + -+ if (next_katom && next_katom->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_SUBMITTED) { -+ char js_string[16]; ++ if (hdmi->scdc_intr) { ++ u8 val; + -+ trace_gpu_sched_switch(kbasep_make_job_slot_string(js, -+ js_string, -+ sizeof(js_string)), -+ ktime_to_ns(*end_timestamp), -+ (u32)next_katom->kctx->id, 0, -+ next_katom->work_id); -+ kbdev->hwaccess.backend.slot_rb[js].last_context = -+ next_katom->kctx; -+ } else { -+ char js_string[16]; ++ dev_dbg(hdmi->dev, "i2c scdc irq:%#x\n", hdmi->scdc_intr); ++ hdmi_writel(hdmi, hdmi->scdc_intr, MAINUNIT_1_INT_CLEAR); ++ val = hdmi_readl(hdmi, SCDC_STATUS0); + -+ trace_gpu_sched_switch(kbasep_make_job_slot_string(js, -+ js_string, -+ sizeof(js_string)), -+ ktime_to_ns(ktime_get()), 0, 0, -+ 0); -+ kbdev->hwaccess.backend.slot_rb[js].last_context = 0; ++ /* frl start */ ++ if (val & BIT(4)) { ++ hdmi_modb(hdmi, 0, SCDC_UPD_FLAGS_POLL_EN | ++ SCDC_UPD_FLAGS_AUTO_CLR, SCDC_CONFIG0); ++ hdmi_modb(hdmi, 0, SCDC_UPD_FLAGS_RD_IRQ, ++ MAINUNIT_1_INT_MASK_N); ++ dev_info(hdmi->dev, "frl start\n"); + } ++ + } -+#endif + -+ if (kbdev->serialize_jobs & KBASE_SERIALIZE_RESET) -+ kbase_reset_gpu_silent(kbdev); ++ if (stat) ++ return IRQ_HANDLED; + -+ if (completion_code == BASE_JD_EVENT_STOPPED) -+ katom = kbase_jm_return_atom_to_js(kbdev, katom); -+ else -+ katom = kbase_jm_complete(kbdev, katom, end_timestamp); ++ return IRQ_NONE; ++} + -+ if (katom) { -+ /* Cross-slot dependency has now become runnable. Try to submit -+ * it. */ ++static irqreturn_t dw_hdmi_qp_avp_hardirq(int irq, void *dev_id) ++{ ++ struct dw_hdmi_qp *hdmi = dev_id; ++ u32 stat1, stat3; + -+ /* Check if there are lower priority jobs to soft stop */ -+ kbase_job_slot_ctx_priority_check_locked(kctx, katom); ++ stat1 = hdmi_readl(hdmi, AVP_1_INT_STATUS); ++ stat3 = hdmi_readl(hdmi, AVP_3_INT_STATUS); + -+ kbase_jm_try_kick(kbdev, 1 << katom->slot_nr); -+ } ++ if (!stat1 && !stat3) ++ return IRQ_NONE; + -+ /* Job completion may have unblocked other atoms. Try to update all job -+ * slots */ -+ kbase_backend_slot_update(kbdev); ++ return IRQ_WAKE_THREAD; +} + -+void kbase_backend_reset(struct kbase_device *kbdev, ktime_t *end_timestamp) ++static irqreturn_t dw_hdmi_qp_avp_irq(int irq, void *dev_id) +{ -+ int js; -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ /* Reset should always take the GPU out of protected mode */ -+ WARN_ON(kbase_gpu_in_protected_mode(kbdev)); -+ -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ int atom_idx = 0; -+ int idx; ++ struct dw_hdmi_qp *hdmi = dev_id; ++ struct drm_connector_state *conn_state; ++ void *data = hdmi->plat_data->phy_data; ++ u32 stat1, stat3, val; + -+ for (idx = 0; idx < SLOT_RB_SIZE; idx++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, -+ js, atom_idx); -+ bool keep_in_jm_rb = false; ++ stat1 = hdmi_readl(hdmi, AVP_1_INT_STATUS); ++ stat3 = hdmi_readl(hdmi, AVP_3_INT_STATUS); + -+ if (!katom) -+ break; -+ if (katom->protected_state.exit == -+ KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT) -+ { -+ KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_END(kbdev); ++ hdmi_writel(hdmi, stat1, AVP_1_INT_CLEAR); ++ hdmi_writel(hdmi, stat3, AVP_3_INT_CLEAR); + -+ kbase_vinstr_resume(kbdev->vinstr_ctx); ++ if (!hdmi->curr_conn || !hdmi->curr_conn->state) ++ return IRQ_HANDLED; + -+ /* protected mode sanity checks */ -+ KBASE_DEBUG_ASSERT_MSG( -+ kbase_jd_katom_is_protected(katom) == kbase_gpu_in_protected_mode(kbdev), -+ "Protected mode of atom (%d) doesn't match protected mode of GPU (%d)", -+ kbase_jd_katom_is_protected(katom), kbase_gpu_in_protected_mode(kbdev)); -+ KBASE_DEBUG_ASSERT_MSG( -+ (kbase_jd_katom_is_protected(katom) && js == 0) || -+ !kbase_jd_katom_is_protected(katom), -+ "Protected atom on JS%d not supported", js); -+ } -+ if (katom->gpu_rb_state < KBASE_ATOM_GPU_RB_SUBMITTED) -+ keep_in_jm_rb = true; ++ conn_state = hdmi->curr_conn->state; ++ val = conn_state->content_protection; + -+ kbase_gpu_release_atom(kbdev, katom, NULL); ++ if (hdmi->hdcp && hdmi->hdcp->hdcp_isr) { ++ u32 hdcp_status = hdmi_readl(hdmi, HDCP14_STATUS0); + -+ /* -+ * If the atom wasn't on HW when the reset was issued -+ * then leave it in the RB and next time we're kicked -+ * it will be processed again from the starting state. -+ */ -+ if (keep_in_jm_rb) { -+ kbasep_js_job_check_deref_cores(kbdev, katom); -+ katom->coreref_state = KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED; -+ katom->affinity = 0; -+ katom->protected_state.exit = KBASE_ATOM_EXIT_PROTECTED_CHECK; -+ /* As the atom was not removed, increment the -+ * index so that we read the correct atom in the -+ * next iteration. */ -+ atom_idx++; -+ continue; ++ if (stat1 & HDCP14_AUTH_CHG_MASK_N) { ++ /* hdcp14 auth success */ ++ if (hdcp_status & BIT(2)) { ++ hdmi->hdcp_status |= HDMI_HDCP14_AUTH; ++ if (conn_state->content_protection != ++ DRM_MODE_CONTENT_PROTECTION_UNDESIRED) ++ val = DRM_MODE_CONTENT_PROTECTION_ENABLED; ++ } else if (!(hdcp_status & BIT(2))) { ++ hdmi->hdcp_status &= ~HDMI_HDCP14_AUTH; ++ if (conn_state->content_protection != ++ DRM_MODE_CONTENT_PROTECTION_UNDESIRED) ++ val = DRM_MODE_CONTENT_PROTECTION_DESIRED; + } -+ -+ /* -+ * The atom was on the HW when the reset was issued -+ * all we can do is fail the atom. -+ */ -+ kbase_gpu_dequeue_atom(kbdev, js, NULL); -+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; -+ kbase_jm_complete(kbdev, katom, end_timestamp); ++ conn_state->content_protection = val; + } ++ hdmi->hdcp->hdcp_isr(hdmi->hdcp, stat1, hdcp_status); + } + -+ kbdev->protected_mode_transition = false; -+} -+ -+static inline void kbase_gpu_stop_atom(struct kbase_device *kbdev, -+ int js, -+ struct kbase_jd_atom *katom, -+ u32 action) -+{ -+ u32 hw_action = action & JS_COMMAND_MASK; -+ -+ kbase_job_check_enter_disjoint(kbdev, action, katom->core_req, katom); -+ kbasep_job_slot_soft_or_hard_stop_do_action(kbdev, js, hw_action, -+ katom->core_req, katom); -+ katom->kctx->blocked_js[js][katom->sched_priority] = true; -+} ++ if (stat3 & HDCP2_ESM_P0_GPIO_OUT_2_CHG_IRQ) { ++ stat3 = hdmi_readl(hdmi, HDCP2LOGIC_ESM_GPIO_OUT); ++ if (stat3 & HDCP2_AUTHENTICATION_SUCCESS) { ++ hdmi->hdcp_status |= HDMI_HDCP2_AUTH; ++ if (conn_state->content_protection != ++ DRM_MODE_CONTENT_PROTECTION_UNDESIRED) ++ val = DRM_MODE_CONTENT_PROTECTION_ENABLED; ++ } else if (!(stat3 & HDCP2_AUTHENTICATION_SUCCESS)) { ++ hdmi->hdcp_status &= ~HDMI_HDCP2_AUTH; ++ if (conn_state->content_protection != ++ DRM_MODE_CONTENT_PROTECTION_UNDESIRED) ++ val = DRM_MODE_CONTENT_PROTECTION_DESIRED; ++ } ++ conn_state->content_protection = val; ++ } + -+static inline void kbase_gpu_remove_atom(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, -+ u32 action, -+ bool disjoint) -+{ -+ katom->event_code = BASE_JD_EVENT_REMOVED_FROM_NEXT; -+ kbase_gpu_mark_atom_for_return(kbdev, katom); -+ katom->kctx->blocked_js[katom->slot_nr][katom->sched_priority] = true; ++ if (hdmi->plat_data->set_hdcp_status) ++ hdmi->plat_data->set_hdcp_status(data, hdmi->hdcp_status); + -+ if (disjoint) -+ kbase_job_check_enter_disjoint(kbdev, action, katom->core_req, -+ katom); ++ return IRQ_HANDLED; +} + -+static int should_stop_x_dep_slot(struct kbase_jd_atom *katom) ++static irqreturn_t dw_hdmi_qp_earc_hardirq(int irq, void *dev_id) +{ -+ if (katom->x_post_dep) { -+ struct kbase_jd_atom *dep_atom = katom->x_post_dep; ++ struct dw_hdmi_qp *hdmi = dev_id; ++ u32 stat; + -+ if (dep_atom->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_NOT_IN_SLOT_RB && -+ dep_atom->gpu_rb_state != -+ KBASE_ATOM_GPU_RB_RETURN_TO_JS) -+ return dep_atom->slot_nr; ++ stat = hdmi_readl(hdmi, EARCRX_0_INT_STATUS); ++ if (stat) { ++ dev_dbg(hdmi->dev, "earc irq %#x\n", stat); ++ stat &= ~stat; ++ hdmi_writel(hdmi, stat, EARCRX_0_INT_MASK_N); ++ return IRQ_WAKE_THREAD; + } -+ return -1; -+} + -+static void kbase_job_evicted(struct kbase_jd_atom *katom) -+{ -+ kbase_timeline_job_slot_done(katom->kctx->kbdev, katom->kctx, katom, -+ katom->slot_nr, KBASE_JS_ATOM_DONE_EVICTED_FROM_NEXT); ++ return IRQ_NONE; +} + -+bool kbase_backend_soft_hard_stop_slot(struct kbase_device *kbdev, -+ struct kbase_context *kctx, -+ int js, -+ struct kbase_jd_atom *katom, -+ u32 action) ++static irqreturn_t dw_hdmi_qp_earc_irq(int irq, void *dev_id) +{ -+ struct kbase_jd_atom *katom_idx0; -+ struct kbase_jd_atom *katom_idx1; -+ -+ bool katom_idx0_valid, katom_idx1_valid; -+ -+ bool ret = false; -+ -+ int stop_x_dep_idx0 = -1, stop_x_dep_idx1 = -1; -+ int prio_idx0 = 0, prio_idx1 = 0; -+ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ -+ katom_idx0 = kbase_gpu_inspect(kbdev, js, 0); -+ katom_idx1 = kbase_gpu_inspect(kbdev, js, 1); -+ -+ if (katom_idx0) -+ prio_idx0 = katom_idx0->sched_priority; -+ if (katom_idx1) -+ prio_idx1 = katom_idx1->sched_priority; ++ struct dw_hdmi_qp *hdmi = dev_id; ++ u32 stat; + -+ if (katom) { -+ katom_idx0_valid = (katom_idx0 == katom); -+ /* If idx0 is to be removed and idx1 is on the same context, -+ * then idx1 must also be removed otherwise the atoms might be -+ * returned out of order */ -+ if (katom_idx1) -+ katom_idx1_valid = (katom_idx1 == katom) || -+ (katom_idx0_valid && -+ (katom_idx0->kctx == -+ katom_idx1->kctx)); -+ else -+ katom_idx1_valid = false; -+ } else { -+ katom_idx0_valid = (katom_idx0 && -+ (!kctx || katom_idx0->kctx == kctx)); -+ katom_idx1_valid = (katom_idx1 && -+ (!kctx || katom_idx1->kctx == kctx) && -+ prio_idx0 == prio_idx1); -+ } ++ stat = hdmi_readl(hdmi, EARCRX_0_INT_STATUS); + -+ if (katom_idx0_valid) -+ stop_x_dep_idx0 = should_stop_x_dep_slot(katom_idx0); -+ if (katom_idx1_valid) -+ stop_x_dep_idx1 = should_stop_x_dep_slot(katom_idx1); ++ if (!stat) ++ return IRQ_NONE; + -+ if (katom_idx0_valid) { -+ if (katom_idx0->gpu_rb_state != KBASE_ATOM_GPU_RB_SUBMITTED) { -+ /* Simple case - just dequeue and return */ -+ kbase_gpu_dequeue_atom(kbdev, js, NULL); -+ if (katom_idx1_valid) { -+ kbase_gpu_dequeue_atom(kbdev, js, NULL); -+ katom_idx1->event_code = -+ BASE_JD_EVENT_REMOVED_FROM_NEXT; -+ kbase_jm_return_atom_to_js(kbdev, katom_idx1); -+ katom_idx1->kctx->blocked_js[js][prio_idx1] = -+ true; -+ } ++ hdmi_writel(hdmi, stat, EARCRX_0_INT_CLEAR); + -+ katom_idx0->event_code = -+ BASE_JD_EVENT_REMOVED_FROM_NEXT; -+ kbase_jm_return_atom_to_js(kbdev, katom_idx0); -+ katom_idx0->kctx->blocked_js[js][prio_idx0] = true; -+ } else { -+ /* katom_idx0 is on GPU */ -+ if (katom_idx1 && katom_idx1->gpu_rb_state == -+ KBASE_ATOM_GPU_RB_SUBMITTED) { -+ /* katom_idx0 and katom_idx1 are on GPU */ ++ hdmi->earc_intr = stat; ++ complete(&hdmi->earc_cmp); + -+ if (kbase_reg_read(kbdev, JOB_SLOT_REG(js, -+ JS_COMMAND_NEXT), NULL) == 0) { -+ /* idx0 has already completed - stop -+ * idx1 if needed*/ -+ if (katom_idx1_valid) { -+ kbase_gpu_stop_atom(kbdev, js, -+ katom_idx1, -+ action); -+ ret = true; -+ } -+ } else { -+ /* idx1 is in NEXT registers - attempt -+ * to remove */ -+ kbase_reg_write(kbdev, -+ JOB_SLOT_REG(js, -+ JS_COMMAND_NEXT), -+ JS_COMMAND_NOP, NULL); ++ return IRQ_HANDLED; ++} + -+ if (kbase_reg_read(kbdev, -+ JOB_SLOT_REG(js, -+ JS_HEAD_NEXT_LO), NULL) -+ != 0 || -+ kbase_reg_read(kbdev, -+ JOB_SLOT_REG(js, -+ JS_HEAD_NEXT_HI), NULL) -+ != 0) { -+ /* idx1 removed successfully, -+ * will be handled in IRQ */ -+ kbase_job_evicted(katom_idx1); -+ kbase_gpu_remove_atom(kbdev, -+ katom_idx1, -+ action, true); -+ stop_x_dep_idx1 = -+ should_stop_x_dep_slot(katom_idx1); ++static int dw_hdmi_detect_phy(struct dw_hdmi_qp *hdmi) ++{ ++ u8 phy_type; + -+ /* stop idx0 if still on GPU */ -+ kbase_gpu_stop_atom(kbdev, js, -+ katom_idx0, -+ action); -+ ret = true; -+ } else if (katom_idx1_valid) { -+ /* idx0 has already completed, -+ * stop idx1 if needed */ -+ kbase_gpu_stop_atom(kbdev, js, -+ katom_idx1, -+ action); -+ ret = true; -+ } -+ } -+ } else if (katom_idx1_valid) { -+ /* idx1 not on GPU but must be dequeued*/ ++ phy_type = hdmi->plat_data->phy_force_vendor ? ++ DW_HDMI_PHY_VENDOR_PHY : 0; + -+ /* idx1 will be handled in IRQ */ -+ kbase_gpu_remove_atom(kbdev, katom_idx1, action, -+ false); -+ /* stop idx0 */ -+ /* This will be repeated for anything removed -+ * from the next registers, since their normal -+ * flow was also interrupted, and this function -+ * might not enter disjoint state e.g. if we -+ * don't actually do a hard stop on the head -+ * atom */ -+ kbase_gpu_stop_atom(kbdev, js, katom_idx0, -+ action); -+ ret = true; -+ } else { -+ /* no atom in idx1 */ -+ /* just stop idx0 */ -+ kbase_gpu_stop_atom(kbdev, js, katom_idx0, -+ action); -+ ret = true; -+ } ++ if (phy_type == DW_HDMI_PHY_VENDOR_PHY) { ++ /* Vendor PHYs require support from the glue layer. */ ++ if (!hdmi->plat_data->qp_phy_ops || !hdmi->plat_data->phy_name) { ++ dev_err(hdmi->dev, ++ "Vendor HDMI PHY not supported by glue layer\n"); ++ return -ENODEV; + } -+ } else if (katom_idx1_valid) { -+ if (katom_idx1->gpu_rb_state != KBASE_ATOM_GPU_RB_SUBMITTED) { -+ /* Mark for return */ -+ /* idx1 will be returned once idx0 completes */ -+ kbase_gpu_remove_atom(kbdev, katom_idx1, action, -+ false); -+ } else { -+ /* idx1 is on GPU */ -+ if (kbase_reg_read(kbdev, JOB_SLOT_REG(js, -+ JS_COMMAND_NEXT), NULL) == 0) { -+ /* idx0 has already completed - stop idx1 */ -+ kbase_gpu_stop_atom(kbdev, js, katom_idx1, -+ action); -+ ret = true; -+ } else { -+ /* idx1 is in NEXT registers - attempt to -+ * remove */ -+ kbase_reg_write(kbdev, JOB_SLOT_REG(js, -+ JS_COMMAND_NEXT), -+ JS_COMMAND_NOP, NULL); + -+ if (kbase_reg_read(kbdev, JOB_SLOT_REG(js, -+ JS_HEAD_NEXT_LO), NULL) != 0 || -+ kbase_reg_read(kbdev, JOB_SLOT_REG(js, -+ JS_HEAD_NEXT_HI), NULL) != 0) { -+ /* idx1 removed successfully, will be -+ * handled in IRQ once idx0 completes */ -+ kbase_job_evicted(katom_idx1); -+ kbase_gpu_remove_atom(kbdev, katom_idx1, -+ action, -+ false); -+ } else { -+ /* idx0 has already completed - stop -+ * idx1 */ -+ kbase_gpu_stop_atom(kbdev, js, -+ katom_idx1, -+ action); -+ ret = true; -+ } -+ } -+ } ++ hdmi->phy.ops = hdmi->plat_data->qp_phy_ops; ++ hdmi->phy.data = hdmi->plat_data->phy_data; ++ hdmi->phy.name = hdmi->plat_data->phy_name; + } + -+ -+ if (stop_x_dep_idx0 != -1) -+ kbase_backend_soft_hard_stop_slot(kbdev, kctx, stop_x_dep_idx0, -+ NULL, action); -+ -+ if (stop_x_dep_idx1 != -1) -+ kbase_backend_soft_hard_stop_slot(kbdev, kctx, stop_x_dep_idx1, -+ NULL, action); -+ -+ return ret; ++ return 0; +} + -+void kbase_gpu_cacheclean(struct kbase_device *kbdev) ++void dw_hdmi_qp_cec_set_hpd(struct dw_hdmi_qp *hdmi, bool plug_in, bool change) +{ -+ /* Limit the number of loops to avoid a hang if the interrupt is missed -+ */ -+ u32 max_loops = KBASE_CLEAN_CACHE_MAX_LOOPS; -+ -+ mutex_lock(&kbdev->cacheclean_lock); -+ -+ /* use GPU_COMMAND completion solution */ -+ /* clean & invalidate the caches */ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_CLEAN_INV_CACHES, NULL, NULL, 0u, 0); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), -+ GPU_COMMAND_CLEAN_INV_CACHES, NULL); -+ -+ /* wait for cache flush to complete before continuing */ -+ while (--max_loops && -+ (kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_RAWSTAT), NULL) & -+ CLEAN_CACHES_COMPLETED) == 0) -+ ; -+ -+ /* clear the CLEAN_CACHES_COMPLETED irq */ -+ KBASE_TRACE_ADD(kbdev, CORE_GPU_IRQ_CLEAR, NULL, NULL, 0u, -+ CLEAN_CACHES_COMPLETED); -+ kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), -+ CLEAN_CACHES_COMPLETED, NULL); -+ KBASE_DEBUG_ASSERT_MSG(kbdev->hwcnt.backend.state != -+ KBASE_INSTR_STATE_CLEANING, -+ "Instrumentation code was cleaning caches, but Job Management code cleared their IRQ - Instrumentation code will now hang."); -+ -+ mutex_unlock(&kbdev->cacheclean_lock); -+} ++ enum drm_connector_status status = plug_in ? ++ connector_status_connected : connector_status_disconnected; + -+void kbase_backend_cacheclean(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) -+{ -+ if (katom->need_cache_flush_cores_retained) { -+ unsigned long flags; ++ if (!hdmi->cec_notifier) ++ return; + -+ kbase_gpu_cacheclean(kbdev); ++ if (!plug_in) ++ cec_notifier_set_phys_addr(hdmi->cec_notifier, ++ CEC_PHYS_ADDR_INVALID); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_pm_unrequest_cores(kbdev, false, -+ katom->need_cache_flush_cores_retained); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ katom->need_cache_flush_cores_retained = 0; ++ if (hdmi->bridge.dev) { ++ if (change && hdmi->cec_adap && hdmi->cec_adap->devnode.registered) ++ cec_queue_pin_hpd_event(hdmi->cec_adap, plug_in, ktime_get()); ++ drm_bridge_hpd_notify(&hdmi->bridge, status); + } +} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_cec_set_hpd); + -+void kbase_backend_complete_wq(struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom) ++static void dw_hdmi_qp_cec_enable(struct dw_hdmi_qp *hdmi) +{ -+ /* -+ * If cache flush required due to HW workaround then perform the flush -+ * now -+ */ -+ kbase_backend_cacheclean(kbdev, katom); -+ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_10969) && -+ (katom->core_req & BASE_JD_REQ_FS) && -+ katom->event_code == BASE_JD_EVENT_TILE_RANGE_FAULT && -+ (katom->atom_flags & KBASE_KATOM_FLAG_BEEN_SOFT_STOPPPED) && -+ !(katom->atom_flags & KBASE_KATOM_FLAGS_RERUN)) { -+ dev_dbg(kbdev->dev, "Soft-stopped fragment shader job got a TILE_RANGE_FAULT. Possible HW issue, trying SW workaround\n"); -+ if (kbasep_10969_workaround_clamp_coordinates(katom)) { -+ /* The job had a TILE_RANGE_FAULT after was soft-stopped -+ * Due to an HW issue we try to execute the job again. -+ */ -+ dev_dbg(kbdev->dev, -+ "Clamping has been executed, try to rerun the job\n" -+ ); -+ katom->event_code = BASE_JD_EVENT_STOPPED; -+ katom->atom_flags |= KBASE_KATOM_FLAGS_RERUN; -+ } -+ } -+ -+ /* Clear the coreref_state now - while check_deref_cores() may not have -+ * been called yet, the caller will have taken a copy of this field. If -+ * this is not done, then if the atom is re-scheduled (following a soft -+ * stop) then the core reference would not be retaken. */ -+ katom->coreref_state = KBASE_ATOM_COREREF_STATE_NO_CORES_REQUESTED; -+ katom->affinity = 0; ++ mutex_lock(&hdmi->mutex); ++ hdmi_modb(hdmi, 0, CEC_SWDISABLE, GLOBAL_SWDISABLE); ++ mutex_unlock(&hdmi->mutex); +} + -+void kbase_backend_complete_wq_post_sched(struct kbase_device *kbdev, -+ base_jd_core_req core_req, u64 affinity, -+ enum kbase_atom_coreref_state coreref_state) ++static void dw_hdmi_qp_cec_disable(struct dw_hdmi_qp *hdmi) +{ -+ unsigned long flags; ++ mutex_lock(&hdmi->mutex); ++ hdmi_modb(hdmi, CEC_SWDISABLE, CEC_SWDISABLE, GLOBAL_SWDISABLE); ++ mutex_unlock(&hdmi->mutex); ++} + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbasep_js_job_check_deref_cores_nokatom(kbdev, core_req, affinity, -+ coreref_state); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++static const struct dw_hdmi_qp_cec_ops dw_hdmi_qp_cec_ops = { ++ .enable = dw_hdmi_qp_cec_enable, ++ .disable = dw_hdmi_qp_cec_disable, ++ .write = hdmi_writel, ++ .read = hdmi_readl, ++}; + -+ if (!kbdev->pm.active_count) { -+ mutex_lock(&kbdev->js_data.runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); -+ kbase_pm_update_active(kbdev); -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&kbdev->js_data.runpool_mutex); -+ } -+} ++static const struct regmap_config hdmi_regmap_config = { ++ .reg_bits = 32, ++ .val_bits = 32, ++ .reg_stride = 4, ++ .max_register = EARCRX_1_INT_FORCE, ++}; + -+void kbase_gpu_dump_slots(struct kbase_device *kbdev) -+{ -+ struct kbasep_js_device_data *js_devdata; -+ unsigned long flags; -+ int js; ++struct dw_hdmi_qp_reg_table { ++ int reg_base; ++ int reg_end; ++}; + -+ js_devdata = &kbdev->js_data; ++static const struct dw_hdmi_qp_reg_table hdmi_reg_table[] = { ++ {0x0, 0xc}, ++ {0x14, 0x1c}, ++ {0x44, 0x48}, ++ {0x50, 0x58}, ++ {0x80, 0x84}, ++ {0xa0, 0xc4}, ++ {0xe0, 0xe8}, ++ {0xf0, 0x118}, ++ {0x140, 0x140}, ++ {0x150, 0x150}, ++ {0x160, 0x168}, ++ {0x180, 0x180}, ++ {0x800, 0x800}, ++ {0x808, 0x808}, ++ {0x814, 0x814}, ++ {0x81c, 0x824}, ++ {0x834, 0x834}, ++ {0x840, 0x864}, ++ {0x86c, 0x86c}, ++ {0x880, 0x89c}, ++ {0x8e0, 0x8e8}, ++ {0x900, 0x900}, ++ {0x908, 0x90c}, ++ {0x920, 0x938}, ++ {0x920, 0x938}, ++ {0x960, 0x960}, ++ {0x968, 0x968}, ++ {0xa20, 0xa20}, ++ {0xa30, 0xa30}, ++ {0xa40, 0xa40}, ++ {0xa54, 0xa54}, ++ {0xa80, 0xaac}, ++ {0xab4, 0xab8}, ++ {0xb00, 0xcbc}, ++ {0xce0, 0xce0}, ++ {0xd00, 0xddc}, ++ {0xe20, 0xe24}, ++ {0xe40, 0xe44}, ++ {0xe4c, 0xe4c}, ++ {0xe60, 0xe80}, ++ {0xea0, 0xf24}, ++ {0x1004, 0x100c}, ++ {0x1020, 0x1030}, ++ {0x1040, 0x1050}, ++ {0x1060, 0x1068}, ++ {0x1800, 0x1820}, ++ {0x182c, 0x182c}, ++ {0x1840, 0x1940}, ++ {0x1960, 0x1a60}, ++ {0x1b00, 0x1b00}, ++ {0x1c00, 0x1c00}, ++ {0x3000, 0x3000}, ++ {0x3010, 0x3014}, ++ {0x3020, 0x3024}, ++ {0x3800, 0x3800}, ++ {0x3810, 0x3814}, ++ {0x3820, 0x3824}, ++ {0x3830, 0x3834}, ++ {0x3840, 0x3844}, ++ {0x3850, 0x3854}, ++ {0x3860, 0x3864}, ++ {0x3870, 0x3874}, ++ {0x4000, 0x4004}, ++ {0x4800, 0x4800}, ++ {0x4810, 0x4814}, ++}; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++static int dw_hdmi_ctrl_show(struct seq_file *s, void *v) ++{ ++ struct dw_hdmi_qp *hdmi = s->private; ++ u32 i = 0, j = 0, val = 0; + -+ dev_info(kbdev->dev, "kbase_gpu_dump_slots:\n"); ++ if (hdmi->disabled) { ++ dev_err(hdmi->dev, "hdmi is disabled\n"); ++ return -EACCES; ++ } + -+ for (js = 0; js < kbdev->gpu_props.num_job_slots; js++) { -+ int idx; ++ seq_puts(s, "\n---------------------------------------------------"); + -+ for (idx = 0; idx < SLOT_RB_SIZE; idx++) { -+ struct kbase_jd_atom *katom = kbase_gpu_inspect(kbdev, -+ js, -+ idx); ++ for (i = 0; i < ARRAY_SIZE(hdmi_reg_table); i++) { ++ for (j = hdmi_reg_table[i].reg_base; ++ j <= hdmi_reg_table[i].reg_end; j += 4) { ++ val = hdmi_readl(hdmi, j); + -+ if (katom) -+ dev_info(kbdev->dev, -+ " js%d idx%d : katom=%p gpu_rb_state=%d\n", -+ js, idx, katom, katom->gpu_rb_state); -+ else -+ dev_info(kbdev->dev, " js%d idx%d : empty\n", -+ js, idx); ++ if ((j - hdmi_reg_table[i].reg_base) % 16 == 0) ++ seq_printf(s, "\n>>>hdmi_ctl %04x:", j); ++ seq_printf(s, " %08x", val); + } + } ++ seq_puts(s, "\n---------------------------------------------------\n"); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ return 0; +} + -+ -+ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h -new file mode 100755 -index 000000000000..1e0e05ad3ea4 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h -@@ -0,0 +1,76 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+ -+/* -+ * Register-based HW access backend specific APIs -+ */ -+ -+#ifndef _KBASE_HWACCESS_GPU_H_ -+#define _KBASE_HWACCESS_GPU_H_ -+ -+#include -+ -+/** -+ * kbase_gpu_irq_evict - Evict an atom from a NEXT slot -+ * -+ * @kbdev: Device pointer -+ * @js: Job slot to evict from -+ * -+ * Evict the atom in the NEXT slot for the specified job slot. This function is -+ * called from the job complete IRQ handler when the previous job has failed. -+ * -+ * Return: true if job evicted from NEXT registers, false otherwise -+ */ -+bool kbase_gpu_irq_evict(struct kbase_device *kbdev, int js); -+ -+/** -+ * kbase_gpu_complete_hw - Complete an atom on job slot js -+ * -+ * @kbdev: Device pointer -+ * @js: Job slot that has completed -+ * @completion_code: Event code from job that has completed -+ * @job_tail: The tail address from the hardware if the job has partially -+ * completed -+ * @end_timestamp: Time of completion -+ */ -+void kbase_gpu_complete_hw(struct kbase_device *kbdev, int js, -+ u32 completion_code, -+ u64 job_tail, -+ ktime_t *end_timestamp); -+ -+/** -+ * kbase_gpu_inspect - Inspect the contents of the HW access ringbuffer -+ * -+ * @kbdev: Device pointer -+ * @js: Job slot to inspect -+ * @idx: Index into ringbuffer. 0 is the job currently running on -+ * the slot, 1 is the job waiting, all other values are invalid. -+ * Return: The atom at that position in the ringbuffer -+ * or NULL if no atom present -+ */ -+struct kbase_jd_atom *kbase_gpu_inspect(struct kbase_device *kbdev, int js, -+ int idx); -+ -+/** -+ * kbase_gpu_dump_slots - Print the contents of the slot ringbuffers -+ * -+ * @kbdev: Device pointer -+ */ -+void kbase_gpu_dump_slots(struct kbase_device *kbdev); -+ -+#endif /* _KBASE_HWACCESS_GPU_H_ */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c -new file mode 100755 -index 000000000000..54d8ddd80097 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c -@@ -0,0 +1,303 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+ -+ -+/* -+ * Base kernel affinity manager APIs -+ */ -+ -+#include -+#include "mali_kbase_js_affinity.h" -+#include "mali_kbase_hw.h" -+ -+#include -+ -+ -+bool kbase_js_can_run_job_on_slot_no_lock(struct kbase_device *kbdev, -+ int js) ++static int dw_hdmi_ctrl_open(struct inode *inode, struct file *file) +{ -+ /* -+ * Here are the reasons for using job slot 2: -+ * - BASE_HW_ISSUE_8987 (which is entirely used for that purpose) -+ * - In absence of the above, then: -+ * - Atoms with BASE_JD_REQ_COHERENT_GROUP -+ * - But, only when there aren't contexts with -+ * KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES, because the atoms that run on -+ * all cores on slot 1 could be blocked by those using a coherent group -+ * on slot 2 -+ * - And, only when you actually have 2 or more coregroups - if you -+ * only have 1 coregroup, then having jobs for slot 2 implies they'd -+ * also be for slot 1, meaning you'll get interference from them. Jobs -+ * able to run on slot 2 could also block jobs that can only run on -+ * slot 1 (tiler jobs) -+ */ -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_8987)) -+ return true; -+ -+ if (js != 2) -+ return true; -+ -+ /* Only deal with js==2 now: */ -+ if (kbdev->gpu_props.num_core_groups > 1) { -+ /* Only use slot 2 in the 2+ coregroup case */ -+ if (kbasep_js_ctx_attr_is_attr_on_runpool(kbdev, -+ KBASEP_JS_CTX_ATTR_COMPUTE_ALL_CORES) == -+ false) { -+ /* ...But only when we *don't* have atoms that run on -+ * all cores */ -+ -+ /* No specific check for BASE_JD_REQ_COHERENT_GROUP -+ * atoms - the policy will sort that out */ -+ return true; -+ } -+ } -+ -+ /* Above checks failed mean we shouldn't use slot 2 */ -+ return false; ++ return single_open(file, dw_hdmi_ctrl_show, inode->i_private); +} + -+/* -+ * As long as it has been decided to have a deeper modification of -+ * what job scheduler, power manager and affinity manager will -+ * implement, this function is just an intermediate step that -+ * assumes: -+ * - all working cores will be powered on when this is called. -+ * - largest current configuration is 2 core groups. -+ * - It has been decided not to have hardcoded values so the low -+ * and high cores in a core split will be evently distributed. -+ * - Odd combinations of core requirements have been filtered out -+ * and do not get to this function (e.g. CS+T+NSS is not -+ * supported here). -+ * - This function is frequently called and can be optimized, -+ * (see notes in loops), but as the functionallity will likely -+ * be modified, optimization has not been addressed. -+*/ -+bool kbase_js_choose_affinity(u64 * const affinity, -+ struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, int js) ++static ssize_t ++dw_hdmi_ctrl_write(struct file *file, const char __user *buf, ++ size_t count, loff_t *ppos) +{ -+ base_jd_core_req core_req = katom->core_req; -+ unsigned int num_core_groups = kbdev->gpu_props.num_core_groups; -+ u64 core_availability_mask; ++ struct dw_hdmi_qp *hdmi = ++ ((struct seq_file *)file->private_data)->private; ++ u32 reg, val; ++ char kbuf[25]; + -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ if (hdmi->disabled) { ++ dev_err(hdmi->dev, "hdmi is disabled\n"); ++ return -EACCES; ++ } + -+ core_availability_mask = kbase_pm_ca_get_core_mask(kbdev); ++ if (count > 24) { ++ dev_err(hdmi->dev, "out of buf range\n"); ++ return count; ++ } + -+ /* -+ * If no cores are currently available (core availability policy is -+ * transitioning) then fail. -+ */ -+ if (0 == core_availability_mask) { -+ *affinity = 0; -+ return false; ++ if (copy_from_user(kbuf, buf, count)) ++ return -EFAULT; ++ kbuf[count - 1] = '\0'; ++ ++ if (sscanf(kbuf, "%x %x", ®, &val) == -1) ++ return -EFAULT; ++ if (reg > EARCRX_1_INT_FORCE) { ++ dev_err(hdmi->dev, "it is no a hdmi register\n"); ++ return count; + } ++ dev_info(hdmi->dev, "/**********hdmi register config******/"); ++ dev_info(hdmi->dev, "\n reg=%x val=%x\n", reg, val); ++ hdmi_writel(hdmi, val, reg); ++ return count; ++} + -+ KBASE_DEBUG_ASSERT(js >= 0); ++static const struct file_operations dw_hdmi_ctrl_fops = { ++ .owner = THIS_MODULE, ++ .open = dw_hdmi_ctrl_open, ++ .read = seq_read, ++ .write = dw_hdmi_ctrl_write, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; + -+ if ((core_req & (BASE_JD_REQ_FS | BASE_JD_REQ_CS | BASE_JD_REQ_T)) == -+ BASE_JD_REQ_T) { -+ /* If the hardware supports XAFFINITY then we'll only enable -+ * the tiler (which is the default so this is a no-op), -+ * otherwise enable shader core 0. */ -+ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_XAFFINITY)) -+ *affinity = 1; -+ else -+ *affinity = 0; ++static int dw_hdmi_status_show(struct seq_file *s, void *v) ++{ ++ struct dw_hdmi_qp *hdmi = s->private; ++ u32 val; + -+ return true; ++ seq_puts(s, "PHY: "); ++ if (hdmi->disabled) { ++ seq_puts(s, "disabled\n"); ++ return 0; + } ++ seq_puts(s, "enabled\t\t\tMode: "); ++ if (hdmi->sink_is_hdmi) ++ seq_puts(s, "HDMI\n"); ++ else ++ seq_puts(s, "DVI\n"); + -+ if (1 == kbdev->gpu_props.num_cores) { -+ /* trivial case only one core, nothing to do */ -+ *affinity = core_availability_mask & -+ kbdev->pm.debug_core_mask[js]; ++ if (hdmi->hdmi_data.video_mode.mpixelclock > 600000000) { ++ seq_printf(s, "FRL Mode Pixel Clk: %luHz\n", ++ hdmi->hdmi_data.video_mode.mpixelclock); + } else { -+ if ((core_req & (BASE_JD_REQ_COHERENT_GROUP | -+ BASE_JD_REQ_SPECIFIC_COHERENT_GROUP))) { -+ if (js == 0 || num_core_groups == 1) { -+ /* js[0] and single-core-group systems just get -+ * the first core group */ -+ *affinity = -+ kbdev->gpu_props.props.coherency_info.group[0].core_mask -+ & core_availability_mask & -+ kbdev->pm.debug_core_mask[js]; -+ } else { -+ /* js[1], js[2] use core groups 0, 1 for -+ * dual-core-group systems */ -+ u32 core_group_idx = ((u32) js) - 1; ++ if (hdmi->hdmi_data.video_mode.mtmdsclock > 340000000) ++ val = hdmi->hdmi_data.video_mode.mtmdsclock / 4; ++ else ++ val = hdmi->hdmi_data.video_mode.mtmdsclock; ++ seq_printf(s, "TMDS Mode Pixel Clk: %luHz\t\tTMDS Clk: %uHz\n", ++ hdmi->hdmi_data.video_mode.mpixelclock, val); ++ } ++ seq_printf(s, "ALLM: %d\n", hdmi->allm_enable); ++ seq_puts(s, "Color Format: "); ++ if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) ++ seq_puts(s, "RGB"); ++ else if (hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) ++ seq_puts(s, "YUV444"); ++ else if (hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) ++ seq_puts(s, "YUV422"); ++ else if (hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_out_bus_format)) ++ seq_puts(s, "YUV420"); ++ else ++ seq_puts(s, "UNKNOWN"); ++ val = hdmi_bus_fmt_color_depth(hdmi->hdmi_data.enc_out_bus_format); ++ seq_printf(s, "\t\tColor Depth: %d bit\n", val); ++ seq_puts(s, "Colorimetry: "); ++ switch (hdmi->hdmi_data.enc_out_encoding) { ++ case V4L2_YCBCR_ENC_601: ++ seq_puts(s, "ITU.BT601"); ++ break; ++ case V4L2_YCBCR_ENC_709: ++ seq_puts(s, "ITU.BT709"); ++ break; ++ case V4L2_YCBCR_ENC_BT2020: ++ seq_puts(s, "ITU.BT2020"); ++ break; ++ default: /* Carries no data */ ++ seq_puts(s, "ITU.BT601"); ++ break; ++ } + -+ KBASE_DEBUG_ASSERT(core_group_idx < -+ num_core_groups); -+ *affinity = -+ kbdev->gpu_props.props.coherency_info.group[core_group_idx].core_mask -+ & core_availability_mask & -+ kbdev->pm.debug_core_mask[js]; ++ seq_puts(s, "\t\tEOTF: "); + -+ /* If the job is specifically targeting core -+ * group 1 and the core availability policy is -+ * keeping that core group off, then fail */ -+ if (*affinity == 0 && core_group_idx == 1 && -+ kbdev->pm.backend.cg1_disabled -+ == true) -+ katom->event_code = -+ BASE_JD_EVENT_PM_EVENT; -+ } -+ } else { -+ /* All cores are available when no core split is -+ * required */ -+ *affinity = core_availability_mask & -+ kbdev->pm.debug_core_mask[js]; -+ } ++ val = hdmi_readl(hdmi, PKTSCHED_PKT_EN); ++ if (!(val & PKTSCHED_DRMI_TX_EN)) { ++ seq_puts(s, "Off\n"); ++ return 0; + } + -+ /* -+ * If no cores are currently available in the desired core group(s) -+ * (core availability policy is transitioning) then fail. -+ */ -+ if (*affinity == 0) -+ return false; -+ -+ /* Enable core 0 if tiler required for hardware without XAFFINITY -+ * support (notes above) */ -+ if (core_req & BASE_JD_REQ_T) { -+ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_XAFFINITY)) -+ *affinity = *affinity | 1; ++ val = hdmi_readl(hdmi, PKT_DRMI_CONTENTS1); ++ val = (val >> 8) & 0x7; ++ switch (val) { ++ case HDMI_EOTF_TRADITIONAL_GAMMA_SDR: ++ seq_puts(s, "SDR"); ++ break; ++ case HDMI_EOTF_TRADITIONAL_GAMMA_HDR: ++ seq_puts(s, "HDR"); ++ break; ++ case HDMI_EOTF_SMPTE_ST2084: ++ seq_puts(s, "ST2084"); ++ break; ++ case HDMI_EOTF_BT_2100_HLG: ++ seq_puts(s, "HLG"); ++ break; ++ default: ++ seq_puts(s, "Not Defined\n"); ++ return 0; + } + -+ return true; ++ val = hdmi_readl(hdmi, PKT_DRMI_CONTENTS1); ++ val = (val >> 16) & 0xffff; ++ seq_printf(s, "\nx0: %d", val); ++ val = hdmi_readl(hdmi, PKT_DRMI_CONTENTS2); ++ val = val & 0xffff; ++ seq_printf(s, "\t\t\t\ty0: %d\n", val); ++ val = hdmi_readl(hdmi, PKT_DRMI_CONTENTS2); ++ val = (val >> 16) & 0xffff; ++ seq_printf(s, "x1: %d", val); ++ val = hdmi_readl(hdmi, PKT_DRMI_CONTENTS3); ++ val = val & 0xffff; ++ seq_printf(s, "\t\t\t\ty1: %d\n", val); ++ val = hdmi_readl(hdmi, PKT_DRMI_CONTENTS3); ++ val = (val >> 16) & 0xffff; ++ seq_printf(s, "x2: %d", val); ++ val = hdmi_readl(hdmi, PKT_DRMI_CONTENTS4); ++ val = val & 0xffff; ++ seq_printf(s, "\t\t\t\ty2: %d\n", val); ++ val = hdmi_readl(hdmi, PKT_DRMI_CONTENTS4); ++ val = (val >> 16) & 0xffff; ++ seq_printf(s, "white x: %d", val); ++ val = hdmi_readl(hdmi, PKT_DRMI_CONTENTS5); ++ val = val & 0xffff; ++ seq_printf(s, "\t\t\twhite y: %d\n", val); ++ val = hdmi_readl(hdmi, PKT_DRMI_CONTENTS5); ++ val = (val >> 16) & 0xffff; ++ seq_printf(s, "max lum: %d", val); ++ val = hdmi_readl(hdmi, PKT_DRMI_CONTENTS6); ++ val = val & 0xffff; ++ seq_printf(s, "\t\t\tmin lum: %d\n", val); ++ val = hdmi_readl(hdmi, PKT_DRMI_CONTENTS6); ++ val = (val >> 16) & 0xffff; ++ seq_printf(s, "max cll: %d", val); ++ val = hdmi_readl(hdmi, PKT_DRMI_CONTENTS7); ++ val = val & 0xffff; ++ seq_printf(s, "\t\t\tmax fall: %d\n", val); ++ return 0; +} + -+static inline bool kbase_js_affinity_is_violating( -+ struct kbase_device *kbdev, -+ u64 *affinities) ++static int dw_hdmi_status_open(struct inode *inode, struct file *file) +{ -+ /* This implementation checks whether the two slots involved in Generic -+ * thread creation have intersecting affinity. This is due to micro- -+ * architectural issues where a job in slot A targetting cores used by -+ * slot B could prevent the job in slot B from making progress until the -+ * job in slot A has completed. -+ */ -+ u64 affinity_set_left; -+ u64 affinity_set_right; -+ u64 intersection; -+ -+ KBASE_DEBUG_ASSERT(affinities != NULL); ++ return single_open(file, dw_hdmi_status_show, inode->i_private); ++} + -+ affinity_set_left = affinities[1]; ++static const struct file_operations dw_hdmi_status_fops = { ++ .owner = THIS_MODULE, ++ .open = dw_hdmi_status_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; + -+ affinity_set_right = affinities[2]; ++static void dw_hdmi_register_debugfs(struct device *dev, struct dw_hdmi_qp *hdmi) ++{ ++ u8 buf[11]; + -+ /* A violation occurs when any bit in the left_set is also in the -+ * right_set */ -+ intersection = affinity_set_left & affinity_set_right; ++ snprintf(buf, sizeof(buf), "dw-hdmi%d", hdmi->plat_data->id); ++ hdmi->debugfs_dir = debugfs_create_dir(buf, NULL); ++ if (IS_ERR(hdmi->debugfs_dir)) { ++ dev_err(dev, "failed to create debugfs dir!\n"); ++ return; ++ } + -+ return (bool) (intersection != (u64) 0u); ++ debugfs_create_file("status", 0400, hdmi->debugfs_dir, ++ hdmi, &dw_hdmi_status_fops); ++ debugfs_create_file("ctrl", 0600, hdmi->debugfs_dir, ++ hdmi, &dw_hdmi_ctrl_fops); +} + -+bool kbase_js_affinity_would_violate(struct kbase_device *kbdev, int js, -+ u64 affinity) ++static void dw_hdmi_qp_hdcp14_get_mem(struct dw_hdmi_qp *hdmi, u8 *data, u32 len) +{ -+ struct kbasep_js_device_data *js_devdata; -+ u64 new_affinities[BASE_JM_MAX_NR_SLOTS]; ++ u32 ksv_len, i, val; ++ void *hdmi_data = hdmi->plat_data->phy_data; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(js < BASE_JM_MAX_NR_SLOTS); -+ js_devdata = &kbdev->js_data; ++ if (hdmi->plat_data->set_hdcp14_mem) ++ hdmi->plat_data->set_hdcp14_mem(hdmi_data, true); + -+ memcpy(new_affinities, js_devdata->runpool_irq.slot_affinities, -+ sizeof(js_devdata->runpool_irq.slot_affinities)); ++ ksv_len = len - BSTATUS_LEN - M0_LEN - SHAMAX; ++ for (i = 0; i < len; i++) { ++ /* read ksv list */ ++ if (i < ksv_len) ++ val = readl(hdmi->hdcp14_mem + HDMI_HDCP14_MEM_KSV0 + i * 4); ++ /* read bstatus */ ++ else if (i < len - SHAMAX - M0_LEN) ++ val = readl(hdmi->hdcp14_mem + HDMI_HDCP14_MEM_BSTATUS0 + ++ (i - ksv_len) * 4); ++ /* read M0 */ ++ else if (i < len - SHAMAX) ++ val = readl(hdmi->hdcp14_mem + HDMI_HDCP14_MEM_M0_1 + ++ (i - ksv_len - BSTATUS_LEN) * 4); ++ else ++ /* VH0 save in external memory is error, we need to read VH0 via ddc */ ++ hdcp_ddc_read(hdmi->ddc, HDMI_HDCP_ADDR, HDMI_VH0 + i - (len - SHAMAX), ++ &val); + -+ new_affinities[js] |= affinity; ++ data[i] = val; ++ } + -+ return kbase_js_affinity_is_violating(kbdev, new_affinities); ++ if (hdmi->plat_data->set_hdcp14_mem) ++ hdmi->plat_data->set_hdcp14_mem(hdmi_data, false); +} + -+void kbase_js_affinity_retain_slot_cores(struct kbase_device *kbdev, int js, -+ u64 affinity) ++static int dw_hdmi_qp_register_hdcp(struct device *dev, ++ struct dw_hdmi_qp *hdmi) +{ -+ struct kbasep_js_device_data *js_devdata; -+ u64 cores; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(js < BASE_JM_MAX_NR_SLOTS); -+ js_devdata = &kbdev->js_data; -+ -+ KBASE_DEBUG_ASSERT(kbase_js_affinity_would_violate(kbdev, js, affinity) -+ == false); -+ -+ cores = affinity; -+ while (cores) { -+ int bitnum = fls64(cores) - 1; -+ u64 bit = 1ULL << bitnum; -+ s8 cnt; -+ -+ cnt = -+ ++(js_devdata->runpool_irq.slot_affinity_refcount[js][bitnum]); ++ struct dw_qp_hdcp hdmi_hdcp = { ++ .hdmi = hdmi, ++ .write = hdmi_writel, ++ .read = hdmi_readl, ++ .regs = hdmi->regs, ++ .get_mem = dw_hdmi_qp_hdcp14_get_mem, ++ }; ++ struct platform_device_info hdcp_device_info = { ++ .parent = dev, ++ .id = PLATFORM_DEVID_AUTO, ++ .res = NULL, ++ .num_res = 0, ++ .name = DW_HDCP_QP_DRIVER_NAME, ++ .data = &hdmi_hdcp, ++ .size_data = sizeof(hdmi_hdcp), ++ .dma_mask = DMA_BIT_MASK(32), ++ }; ++ hdmi->hdcp_dev = platform_device_register_full(&hdcp_device_info); ++ if (IS_ERR(hdmi->hdcp_dev)) { ++ dev_err(dev, "failed to register hdcp!\n"); ++ return -ENOMEM; ++ } + -+ if (cnt == 1) -+ js_devdata->runpool_irq.slot_affinities[js] |= bit; ++ hdmi->hdcp = hdmi->hdcp_dev->dev.platform_data; + -+ cores &= ~bit; -+ } ++ return 0; +} + -+void kbase_js_affinity_release_slot_cores(struct kbase_device *kbdev, int js, -+ u64 affinity) ++static struct dw_hdmi_qp * ++__dw_hdmi_probe(struct platform_device *pdev, ++ const struct dw_hdmi_plat_data *plat_data) +{ -+ struct kbasep_js_device_data *js_devdata; -+ u64 cores; ++ struct device *dev = &pdev->dev; ++ struct device_node *np = dev->of_node; ++ struct device_node *ddc_node; ++ struct dw_hdmi_qp *hdmi; ++ struct dw_hdmi_qp_i2s_audio_data audio; ++ struct platform_device_info pdevinfo; ++ struct dw_hdmi_qp_cec_data cec; ++ struct resource *iores = NULL; ++ struct drm_panel *panel = NULL; ++ struct drm_bridge *bridge = NULL; ++ int irq; ++ int ret; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(js < BASE_JM_MAX_NR_SLOTS); -+ js_devdata = &kbdev->js_data; ++ ret = drm_of_find_panel_or_bridge(np, 1, -1, &panel, &bridge); ++ if (ret < 0 && ret != -ENODEV) ++ return ERR_PTR(ret); + -+ cores = affinity; -+ while (cores) { -+ int bitnum = fls64(cores) - 1; -+ u64 bit = 1ULL << bitnum; -+ s8 cnt; ++ hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL); ++ if (!hdmi) ++ return ERR_PTR(-ENOMEM); + -+ KBASE_DEBUG_ASSERT( -+ js_devdata->runpool_irq.slot_affinity_refcount[js][bitnum] > 0); ++ hdmi->panel = panel; ++ hdmi->next_bridge = bridge; ++ hdmi->connector.stereo_allowed = 1; ++ hdmi->plat_data = plat_data; ++ hdmi->dev = dev; ++ hdmi->sample_rate = 48000; ++ hdmi->disabled = true; + -+ cnt = -+ --(js_devdata->runpool_irq.slot_affinity_refcount[js][bitnum]); ++ mutex_init(&hdmi->mutex); ++ mutex_init(&hdmi->audio_mutex); ++ mutex_init(&hdmi->cec_notifier_mutex); + -+ if (0 == cnt) -+ js_devdata->runpool_irq.slot_affinities[js] &= ~bit; ++ ddc_node = of_parse_phandle(np, "ddc-i2c-bus", 0); ++ if (ddc_node) { ++ hdmi->ddc = of_get_i2c_adapter_by_node(ddc_node); ++ of_node_put(ddc_node); ++ if (!hdmi->ddc) { ++ dev_dbg(hdmi->dev, "failed to read ddc node\n"); ++ return ERR_PTR(-EPROBE_DEFER); ++ } + -+ cores &= ~bit; ++ } else { ++ dev_dbg(hdmi->dev, "no ddc property found\n"); + } -+} + -+#if KBASE_TRACE_ENABLE -+void kbase_js_debug_log_current_affinities(struct kbase_device *kbdev) -+{ -+ struct kbasep_js_device_data *js_devdata; -+ int slot_nr; -+ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ js_devdata = &kbdev->js_data; ++ if (!plat_data->regm) { ++ const struct regmap_config *reg_config; + -+ for (slot_nr = 0; slot_nr < 3; ++slot_nr) -+ KBASE_TRACE_ADD_SLOT_INFO(kbdev, JS_AFFINITY_CURRENT, NULL, -+ NULL, 0u, slot_nr, -+ (u32) js_devdata->runpool_irq.slot_affinities[slot_nr]); -+} -+#endif /* KBASE_TRACE_ENABLE */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h -new file mode 100755 -index 000000000000..35d9781ae092 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h -@@ -0,0 +1,129 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ reg_config = &hdmi_regmap_config; + ++ iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ hdmi->regs = devm_ioremap_resource(dev, iores); ++ if (IS_ERR(hdmi->regs)) { ++ ret = PTR_ERR(hdmi->regs); ++ goto err_ddc; ++ } + ++ hdmi->regm = devm_regmap_init_mmio(dev, hdmi->regs, reg_config); ++ if (IS_ERR(hdmi->regm)) { ++ dev_err(dev, "Failed to configure regmap\n"); ++ ret = PTR_ERR(hdmi->regm); ++ goto err_ddc; ++ } ++ } else { ++ hdmi->regm = plat_data->regm; ++ } + ++ ret = dw_hdmi_detect_phy(hdmi); ++ if (ret < 0) ++ goto err_ddc; + ++ hdmi_writel(hdmi, 0, MAINUNIT_0_INT_MASK_N); ++ hdmi_writel(hdmi, 0, MAINUNIT_1_INT_MASK_N); ++ hdmi_writel(hdmi, 428571429, TIMER_BASE_CONFIG0); ++ hdmi->logo_plug_out = false; ++ if (hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data) == connector_status_connected && ++ hdmi_readl(hdmi, I2CM_INTERFACE_CONTROL0)) { ++ hdmi->initialized = true; ++ hdmi->disabled = false; ++ } + -+/* -+ * Affinity Manager internal APIs. -+ */ ++ hdmi->sink_is_hdmi = true; + -+#ifndef _KBASE_JS_AFFINITY_H_ -+#define _KBASE_JS_AFFINITY_H_ ++ /* If DDC bus is not specified, try to register HDMI I2C bus */ ++ if (!hdmi->ddc) { ++ hdmi->ddc = dw_hdmi_i2c_adapter(hdmi); ++ if (IS_ERR(hdmi->ddc)) ++ hdmi->ddc = NULL; ++ /* ++ * Read high and low time from device tree. If not available use ++ * the default timing scl clock rate is about 99.6KHz. ++ */ ++ if (of_property_read_u32(np, "ddc-i2c-scl-high-time-ns", ++ &hdmi->i2c->scl_high_ns)) ++ hdmi->i2c->scl_high_ns = 4708; ++ if (of_property_read_u32(np, "ddc-i2c-scl-low-time-ns", ++ &hdmi->i2c->scl_low_ns)) ++ hdmi->i2c->scl_low_ns = 4916; ++ } + -+/** -+ * kbase_js_can_run_job_on_slot_no_lock - Decide whether it is possible to -+ * submit a job to a particular job slot in the current status -+ * -+ * @kbdev: The kbase device structure of the device -+ * @js: Job slot number to check for allowance -+ * -+ * Will check if submitting to the given job slot is allowed in the current -+ * status. For example using job slot 2 while in soft-stoppable state and only -+ * having 1 coregroup is not allowed by the policy. This function should be -+ * called prior to submitting a job to a slot to make sure policy rules are not -+ * violated. -+ * -+ * The following locking conditions are made on the caller -+ * - it must hold hwaccess_lock -+ */ -+bool kbase_js_can_run_job_on_slot_no_lock(struct kbase_device *kbdev, int js); ++ /* Reset HDMI DDC I2C master controller and mute I2CM interrupts */ ++ if (hdmi->i2c) ++ dw_hdmi_i2c_init(hdmi); + -+/** -+ * kbase_js_choose_affinity - Compute affinity for a given job. -+ * -+ * @affinity: Affinity bitmap computed -+ * @kbdev: The kbase device structure of the device -+ * @katom: Job chain of which affinity is going to be found -+ * @js: Slot the job chain is being submitted -+ * -+ * Currently assumes an all-on/all-off power management policy. -+ * Also assumes there is at least one core with tiler available. -+ * -+ * Returns true if a valid affinity was chosen, false if -+ * no cores were available. -+ */ -+bool kbase_js_choose_affinity(u64 * const affinity, -+ struct kbase_device *kbdev, -+ struct kbase_jd_atom *katom, -+ int js); ++ init_completion(&hdmi->flt_cmp); ++ init_completion(&hdmi->earc_cmp); + -+/** -+ * kbase_js_affinity_would_violate - Determine whether a proposed affinity on -+ * job slot @js would cause a violation of affinity restrictions. -+ * -+ * @kbdev: Kbase device structure -+ * @js: The job slot to test -+ * @affinity: The affinity mask to test -+ * -+ * The following locks must be held by the caller -+ * - hwaccess_lock -+ * -+ * Return: true if the affinity would violate the restrictions -+ */ -+bool kbase_js_affinity_would_violate(struct kbase_device *kbdev, int js, -+ u64 affinity); ++ if (of_property_read_bool(np, "scramble-low-rates")) ++ hdmi->scramble_low_rates = true; + -+/** -+ * kbase_js_affinity_retain_slot_cores - Affinity tracking: retain cores used by -+ * a slot -+ * -+ * @kbdev: Kbase device structure -+ * @js: The job slot retaining the cores -+ * @affinity: The cores to retain -+ * -+ * The following locks must be held by the caller -+ * - hwaccess_lock -+ */ -+void kbase_js_affinity_retain_slot_cores(struct kbase_device *kbdev, int js, -+ u64 affinity); ++ hdmi_init_clk_regenerator(hdmi); + -+/** -+ * kbase_js_affinity_release_slot_cores - Affinity tracking: release cores used -+ * by a slot -+ * -+ * @kbdev: Kbase device structure -+ * @js: Job slot -+ * @affinity: Bit mask of core to be released -+ * -+ * Cores must be released as soon as a job is dequeued from a slot's 'submit -+ * slots', and before another job is submitted to those slots. Otherwise, the -+ * refcount could exceed the maximum number submittable to a slot, -+ * %BASE_JM_SUBMIT_SLOTS. -+ * -+ * The following locks must be held by the caller -+ * - hwaccess_lock -+ */ -+void kbase_js_affinity_release_slot_cores(struct kbase_device *kbdev, int js, -+ u64 affinity); ++ hdmi->bridge.driver_private = hdmi; ++ hdmi->bridge.funcs = &dw_hdmi_bridge_funcs; ++#ifdef CONFIG_OF ++ hdmi->bridge.of_node = pdev->dev.of_node; ++#endif + -+/** -+ * kbase_js_debug_log_current_affinities - log the current affinities -+ * -+ * @kbdev: Kbase device structure -+ * -+ * Output to the Trace log the current tracked affinities on all slots -+ */ -+#if KBASE_TRACE_ENABLE -+void kbase_js_debug_log_current_affinities(struct kbase_device *kbdev); -+#else /* KBASE_TRACE_ENABLE */ -+static inline void -+kbase_js_debug_log_current_affinities(struct kbase_device *kbdev) -+{ -+} -+#endif /* KBASE_TRACE_ENABLE */ ++ if (hdmi->phy.ops->setup_hpd) ++ hdmi->phy.ops->setup_hpd(hdmi, hdmi->phy.data); + -+#endif /* _KBASE_JS_AFFINITY_H_ */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c -new file mode 100755 -index 000000000000..a8c1af23a369 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c -@@ -0,0 +1,356 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ hdmi->connector.ycbcr_420_allowed = hdmi->plat_data->ycbcr_420_allowed; + ++ audio.hdmi = hdmi; ++ audio.eld = hdmi->connector.eld; ++ audio.write = hdmi_writel; ++ audio.read = hdmi_readl; ++ audio.mod = hdmi_modb; ++ hdmi->enable_audio = dw_hdmi_i2s_audio_enable; ++ hdmi->disable_audio = dw_hdmi_i2s_audio_disable; + ++ memset(&pdevinfo, 0, sizeof(pdevinfo)); ++ pdevinfo.parent = dev; ++ pdevinfo.id = PLATFORM_DEVID_AUTO; ++ pdevinfo.name = "dw-hdmi-qp-i2s-audio"; ++ pdevinfo.data = &audio; ++ pdevinfo.size_data = sizeof(audio); ++ pdevinfo.dma_mask = DMA_BIT_MASK(32); ++ hdmi->audio = platform_device_register_full(&pdevinfo); + ++ hdmi->extcon = devm_extcon_dev_allocate(hdmi->dev, dw_hdmi_cable); ++ if (IS_ERR(hdmi->extcon)) { ++ dev_err(hdmi->dev, "allocate extcon failed\n"); ++ ret = PTR_ERR(hdmi->extcon); ++ goto err_aud; ++ } + -+/* -+ * Register-based HW access backend specific job scheduler APIs -+ */ ++ ret = devm_extcon_dev_register(hdmi->dev, hdmi->extcon); ++ if (ret) { ++ dev_err(hdmi->dev, "failed to register extcon: %d\n", ret); ++ goto err_aud; ++ } + -+#include -+#include -+#include -+#include ++ ret = extcon_set_property_capability(hdmi->extcon, EXTCON_DISP_HDMI, ++ EXTCON_PROP_DISP_HPD); ++ if (ret) { ++ dev_err(hdmi->dev, ++ "failed to set USB property capability: %d\n", ret); ++ goto err_aud; ++ } + -+/* -+ * Define for when dumping is enabled. -+ * This should not be based on the instrumentation level as whether dumping is -+ * enabled for a particular level is down to the integrator. However this is -+ * being used for now as otherwise the cinstr headers would be needed. -+ */ -+#define CINSTR_DUMPING_ENABLED (2 == MALI_INSTRUMENTATION_LEVEL) ++ irq = platform_get_irq(pdev, 0); ++ if (irq < 0) { ++ ret = irq; ++ goto err_aud; ++ } + -+/* -+ * Hold the runpool_mutex for this -+ */ -+static inline bool timer_callback_should_run(struct kbase_device *kbdev) -+{ -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; -+ s8 nr_running_ctxs; ++ hdmi->avp_irq = irq; ++ ret = devm_request_threaded_irq(dev, hdmi->avp_irq, ++ dw_hdmi_qp_avp_hardirq, ++ dw_hdmi_qp_avp_irq, IRQF_ONESHOT, ++ dev_name(dev), hdmi); ++ if (ret) ++ goto err_aud; + -+ lockdep_assert_held(&kbdev->js_data.runpool_mutex); ++ irq = platform_get_irq(pdev, 1); ++ if (irq < 0) { ++ ret = irq; ++ goto err_aud; ++ } + -+ /* Timer must stop if we are suspending */ -+ if (backend->suspend_timer) -+ return false; ++ cec.irq = irq; + -+ /* nr_contexts_pullable is updated with the runpool_mutex. However, the -+ * locking in the caller gives us a barrier that ensures -+ * nr_contexts_pullable is up-to-date for reading */ -+ nr_running_ctxs = atomic_read(&kbdev->js_data.nr_contexts_runnable); ++ if (of_property_read_bool(np, "cec-enable")) { ++ hdmi->cec_enable = true; ++ cec.hdmi = hdmi; ++ cec.ops = &dw_hdmi_qp_cec_ops; ++ pdevinfo.name = "dw-hdmi-qp-cec"; ++ pdevinfo.data = &cec; ++ pdevinfo.size_data = sizeof(cec); ++ pdevinfo.dma_mask = 0; ++ hdmi->cec = platform_device_register_full(&pdevinfo); ++ } + -+#ifdef CONFIG_MALI_DEBUG -+ if (kbdev->js_data.softstop_always) { -+ /* Debug support for allowing soft-stop on a single context */ -+ return true; ++ irq = platform_get_irq(pdev, 2); ++ if (irq < 0) { ++ ret = irq; ++ goto err_cec; + } -+#endif /* CONFIG_MALI_DEBUG */ + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_9435)) { -+ /* Timeouts would have to be 4x longer (due to micro- -+ * architectural design) to support OpenCL conformance tests, so -+ * only run the timer when there's: -+ * - 2 or more CL contexts -+ * - 1 or more GLES contexts -+ * -+ * NOTE: We will treat a context that has both Compute and Non- -+ * Compute jobs will be treated as an OpenCL context (hence, we -+ * don't check KBASEP_JS_CTX_ATTR_NON_COMPUTE). -+ */ -+ { -+ s8 nr_compute_ctxs = -+ kbasep_js_ctx_attr_count_on_runpool(kbdev, -+ KBASEP_JS_CTX_ATTR_COMPUTE); -+ s8 nr_noncompute_ctxs = nr_running_ctxs - -+ nr_compute_ctxs; ++ hdmi->earc_irq = irq; ++ ret = devm_request_threaded_irq(dev, hdmi->earc_irq, ++ dw_hdmi_qp_earc_hardirq, ++ dw_hdmi_qp_earc_irq, IRQF_SHARED, ++ dev_name(dev), hdmi); ++ if (ret) ++ goto err_cec; + -+ return (bool) (nr_compute_ctxs >= 2 || -+ nr_noncompute_ctxs > 0); -+ } -+ } else { -+ /* Run the timer callback whenever you have at least 1 context -+ */ -+ return (bool) (nr_running_ctxs > 0); ++ irq = platform_get_irq(pdev, 3); ++ if (irq < 0) { ++ ret = irq; ++ goto err_cec; + } -+} -+ -+static enum hrtimer_restart timer_callback(struct hrtimer *timer) -+{ -+ unsigned long flags; -+ struct kbase_device *kbdev; -+ struct kbasep_js_device_data *js_devdata; -+ struct kbase_backend_data *backend; -+ int s; -+ bool reset_needed = false; + -+ KBASE_DEBUG_ASSERT(timer != NULL); ++ hdmi->main_irq = irq; ++ ret = devm_request_threaded_irq(dev, hdmi->main_irq, ++ dw_hdmi_qp_main_hardirq, NULL, ++ IRQF_SHARED, dev_name(dev), hdmi); ++ if (ret) ++ goto err_cec; + -+ backend = container_of(timer, struct kbase_backend_data, -+ scheduling_timer); -+ kbdev = container_of(backend, struct kbase_device, hwaccess.backend); -+ js_devdata = &kbdev->js_data; ++ dw_hdmi_register_debugfs(dev, hdmi); + -+ /* Loop through the slots */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ for (s = 0; s < kbdev->gpu_props.num_job_slots; s++) { -+ struct kbase_jd_atom *atom = NULL; ++ if (hdmi_readl(hdmi, CONFIG_REG) & CONFIG_HDCP14) { ++ iores = platform_get_resource(pdev, IORESOURCE_MEM, 1); ++ hdmi->hdcp14_mem = devm_ioremap_resource(dev, iores); + -+ if (kbase_backend_nr_atoms_on_slot(kbdev, s) > 0) { -+ atom = kbase_gpu_inspect(kbdev, s, 0); -+ KBASE_DEBUG_ASSERT(atom != NULL); ++ if (IS_ERR(hdmi->hdcp14_mem)) { ++ ret = PTR_ERR(hdmi->hdcp14_mem); ++ goto err_cec; + } + -+ if (atom != NULL) { -+ /* The current version of the model doesn't support -+ * Soft-Stop */ -+ if (!kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_5736)) { -+ u32 ticks = atom->ticks++; ++ ret = dw_hdmi_qp_register_hdcp(dev, hdmi); ++ if (ret) ++ goto err_cec; ++ } + -+#if !CINSTR_DUMPING_ENABLED -+ u32 soft_stop_ticks, hard_stop_ticks, -+ gpu_reset_ticks; -+ if (atom->core_req & BASE_JD_REQ_ONLY_COMPUTE) { -+ soft_stop_ticks = -+ js_devdata->soft_stop_ticks_cl; -+ hard_stop_ticks = -+ js_devdata->hard_stop_ticks_cl; -+ gpu_reset_ticks = -+ js_devdata->gpu_reset_ticks_cl; -+ } else { -+ soft_stop_ticks = -+ js_devdata->soft_stop_ticks; -+ hard_stop_ticks = -+ js_devdata->hard_stop_ticks_ss; -+ gpu_reset_ticks = -+ js_devdata->gpu_reset_ticks_ss; -+ } ++ return hdmi; + -+ /* If timeouts have been changed then ensure -+ * that atom tick count is not greater than the -+ * new soft_stop timeout. This ensures that -+ * atoms do not miss any of the timeouts due to -+ * races between this worker and the thread -+ * changing the timeouts. */ -+ if (backend->timeouts_updated && -+ ticks > soft_stop_ticks) -+ ticks = atom->ticks = soft_stop_ticks; ++err_cec: ++ if (!IS_ERR(hdmi->cec)) ++ platform_device_unregister(hdmi->cec); + -+ /* Job is Soft-Stoppable */ -+ if (ticks == soft_stop_ticks) { -+ int disjoint_threshold = -+ KBASE_DISJOINT_STATE_INTERLEAVED_CONTEXT_COUNT_THRESHOLD; -+ u32 softstop_flags = 0u; -+ /* Job has been scheduled for at least -+ * js_devdata->soft_stop_ticks ticks. -+ * Soft stop the slot so we can run -+ * other jobs. -+ */ -+ dev_dbg(kbdev->dev, "Soft-stop"); -+#if !KBASE_DISABLE_SCHEDULING_SOFT_STOPS -+ /* nr_user_contexts_running is updated -+ * with the runpool_mutex, but we can't -+ * take that here. -+ * -+ * However, if it's about to be -+ * increased then the new context can't -+ * run any jobs until they take the -+ * hwaccess_lock, so it's OK to observe -+ * the older value. -+ * -+ * Similarly, if it's about to be -+ * decreased, the last job from another -+ * context has already finished, so it's -+ * not too bad that we observe the older -+ * value and register a disjoint event -+ * when we try soft-stopping */ -+ if (js_devdata->nr_user_contexts_running -+ >= disjoint_threshold) -+ softstop_flags |= -+ JS_COMMAND_SW_CAUSES_DISJOINT; ++err_aud: ++ if (hdmi->audio && !IS_ERR(hdmi->audio)) ++ platform_device_unregister(hdmi->audio); + -+ kbase_job_slot_softstop_swflags(kbdev, -+ s, atom, softstop_flags); -+#endif -+ } else if (ticks == hard_stop_ticks) { -+ /* Job has been scheduled for at least -+ * js_devdata->hard_stop_ticks_ss ticks. -+ * It should have been soft-stopped by -+ * now. Hard stop the slot. -+ */ -+#if !KBASE_DISABLE_SCHEDULING_HARD_STOPS -+ int ms = -+ js_devdata->scheduling_period_ns -+ / 1000000u; -+ dev_warn(kbdev->dev, "JS: Job Hard-Stopped (took more than %lu ticks at %lu ms/tick)", -+ (unsigned long)ticks, -+ (unsigned long)ms); -+ kbase_job_slot_hardstop(atom->kctx, s, -+ atom); -+#endif -+ } else if (ticks == gpu_reset_ticks) { -+ /* Job has been scheduled for at least -+ * js_devdata->gpu_reset_ticks_ss ticks. -+ * It should have left the GPU by now. -+ * Signal that the GPU needs to be -+ * reset. -+ */ -+ reset_needed = true; -+ } -+#else /* !CINSTR_DUMPING_ENABLED */ -+ /* NOTE: During CINSTR_DUMPING_ENABLED, we use -+ * the alternate timeouts, which makes the hard- -+ * stop and GPU reset timeout much longer. We -+ * also ensure that we don't soft-stop at all. -+ */ -+ if (ticks == js_devdata->soft_stop_ticks) { -+ /* Job has been scheduled for at least -+ * js_devdata->soft_stop_ticks. We do -+ * not soft-stop during -+ * CINSTR_DUMPING_ENABLED, however. -+ */ -+ dev_dbg(kbdev->dev, "Soft-stop"); -+ } else if (ticks == -+ js_devdata->hard_stop_ticks_dumping) { -+ /* Job has been scheduled for at least -+ * js_devdata->hard_stop_ticks_dumping -+ * ticks. Hard stop the slot. -+ */ -+#if !KBASE_DISABLE_SCHEDULING_HARD_STOPS -+ int ms = -+ js_devdata->scheduling_period_ns -+ / 1000000u; -+ dev_warn(kbdev->dev, "JS: Job Hard-Stopped (took more than %lu ticks at %lu ms/tick)", -+ (unsigned long)ticks, -+ (unsigned long)ms); -+ kbase_job_slot_hardstop(atom->kctx, s, -+ atom); -+#endif -+ } else if (ticks == -+ js_devdata->gpu_reset_ticks_dumping) { -+ /* Job has been scheduled for at least -+ * js_devdata->gpu_reset_ticks_dumping -+ * ticks. It should have left the GPU by -+ * now. Signal that the GPU needs to be -+ * reset. -+ */ -+ reset_needed = true; -+ } -+#endif /* !CINSTR_DUMPING_ENABLED */ -+ } -+ } -+ } -+#if KBASE_GPU_RESET_EN -+ if (reset_needed) { -+ dev_err(kbdev->dev, "JS: Job has been on the GPU for too long (JS_RESET_TICKS_SS/DUMPING timeout hit). Issueing GPU soft-reset to resolve."); ++err_ddc: ++ if (hdmi->i2c) ++ i2c_del_adapter(&hdmi->i2c->adap); ++ else ++ i2c_put_adapter(hdmi->ddc); + -+ if (kbase_prepare_to_reset_gpu_locked(kbdev)) -+ kbase_reset_gpu_locked(kbdev); ++ if (!hdmi->plat_data->first_screen) { ++ dw_hdmi_destroy_properties(hdmi); ++ hdmi->connector.funcs->destroy(&hdmi->connector); + } -+#endif /* KBASE_GPU_RESET_EN */ -+ /* the timer is re-issued if there is contexts in the run-pool */ + -+ if (backend->timer_running) -+ hrtimer_start(&backend->scheduling_timer, -+ HR_TIMER_DELAY_NSEC(js_devdata->scheduling_period_ns), -+ HRTIMER_MODE_REL); -+ -+ backend->timeouts_updated = false; -+ -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ if (hdmi->bridge.encoder && !hdmi->plat_data->first_screen) ++ hdmi->bridge.encoder->funcs->destroy(hdmi->bridge.encoder); + -+ return HRTIMER_NORESTART; ++ return ERR_PTR(ret); +} + -+void kbase_backend_ctx_count_changed(struct kbase_device *kbdev) ++static void __dw_hdmi_remove(struct dw_hdmi_qp *hdmi) +{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; -+ unsigned long flags; ++ if (hdmi->avp_irq) ++ disable_irq(hdmi->avp_irq); + -+ lockdep_assert_held(&js_devdata->runpool_mutex); ++ if (hdmi->main_irq) ++ disable_irq(hdmi->main_irq); + -+ if (!timer_callback_should_run(kbdev)) { -+ /* Take spinlock to force synchronisation with timer */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ backend->timer_running = false; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ /* From now on, return value of timer_callback_should_run() will -+ * also cause the timer to not requeue itself. Its return value -+ * cannot change, because it depends on variables updated with -+ * the runpool_mutex held, which the caller of this must also -+ * hold */ -+ hrtimer_cancel(&backend->scheduling_timer); -+ } ++ if (hdmi->earc_irq) ++ disable_irq(hdmi->earc_irq); + -+ if (timer_callback_should_run(kbdev) && !backend->timer_running) { -+ /* Take spinlock to force synchronisation with timer */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ backend->timer_running = true; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ hrtimer_start(&backend->scheduling_timer, -+ HR_TIMER_DELAY_NSEC(js_devdata->scheduling_period_ns), -+ HRTIMER_MODE_REL); ++ debugfs_remove_recursive(hdmi->debugfs_dir); + -+ KBASE_TRACE_ADD(kbdev, JS_POLICY_TIMER_START, NULL, NULL, 0u, -+ 0u); ++ if (!hdmi->plat_data->first_screen) { ++ dw_hdmi_destroy_properties(hdmi); ++ hdmi->connector.funcs->destroy(&hdmi->connector); + } -+} -+ -+int kbase_backend_timer_init(struct kbase_device *kbdev) -+{ -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; -+ -+ hrtimer_init(&backend->scheduling_timer, CLOCK_MONOTONIC, -+ HRTIMER_MODE_REL); -+ backend->scheduling_timer.function = timer_callback; + -+ backend->timer_running = false; ++ if (hdmi->audio && !IS_ERR(hdmi->audio)) ++ platform_device_unregister(hdmi->audio); + -+ return 0; ++ if (hdmi->bridge.encoder && !hdmi->plat_data->first_screen) ++ hdmi->bridge.encoder->funcs->destroy(hdmi->bridge.encoder); ++ if (!IS_ERR(hdmi->cec)) ++ platform_device_unregister(hdmi->cec); ++ if (!IS_ERR(hdmi->hdcp_dev)) ++ platform_device_unregister(hdmi->hdcp_dev); ++ if (hdmi->i2c) ++ i2c_del_adapter(&hdmi->i2c->adap); ++ else ++ i2c_put_adapter(hdmi->ddc); +} + -+void kbase_backend_timer_term(struct kbase_device *kbdev) ++/* ----------------------------------------------------------------------------- ++ * Bind/unbind API, used from platforms based on the component framework. ++ */ ++struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev, ++ struct drm_encoder *encoder, ++ struct dw_hdmi_plat_data *plat_data) +{ -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; ++ struct dw_hdmi_qp *hdmi; ++ int ret; + -+ hrtimer_cancel(&backend->scheduling_timer); -+} ++ hdmi = __dw_hdmi_probe(pdev, plat_data); ++ if (IS_ERR(hdmi)) ++ return hdmi; + -+void kbase_backend_timer_suspend(struct kbase_device *kbdev) -+{ -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; ++ if (!plat_data->first_screen) { ++ ret = drm_bridge_attach(encoder, &hdmi->bridge, NULL, 0); ++ if (ret) { ++ __dw_hdmi_remove(hdmi); ++ dev_err(hdmi->dev, "Failed to initialize bridge with drm\n"); ++ return ERR_PTR(ret); ++ } + -+ backend->suspend_timer = true; ++ plat_data->connector = &hdmi->connector; ++ if (hdmi->skip_connector && hdmi->next_bridge) ++ plat_data->bridge = hdmi->next_bridge; ++ else ++ plat_data->bridge = NULL; ++ } + -+ kbase_backend_ctx_count_changed(kbdev); -+} ++ if (plat_data->split_mode && !hdmi->plat_data->first_screen) { ++ struct dw_hdmi_qp *secondary = NULL; + -+void kbase_backend_timer_resume(struct kbase_device *kbdev) -+{ -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; ++ if (hdmi->plat_data->left) ++ secondary = hdmi->plat_data->left; ++ else if (hdmi->plat_data->right) ++ secondary = hdmi->plat_data->right; + -+ backend->suspend_timer = false; ++ if (!secondary) ++ return ERR_PTR(-ENOMEM); ++ ret = drm_bridge_attach(encoder, &secondary->bridge, &hdmi->bridge, ++ DRM_BRIDGE_ATTACH_NO_CONNECTOR); ++ if (ret) ++ return ERR_PTR(ret); ++ } + -+ kbase_backend_ctx_count_changed(kbdev); ++ return hdmi; +} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_bind); + -+void kbase_backend_timeouts_changed(struct kbase_device *kbdev) ++void dw_hdmi_qp_unbind(struct dw_hdmi_qp *hdmi) +{ -+ struct kbase_backend_data *backend = &kbdev->hwaccess.backend; -+ -+ backend->timeouts_updated = true; ++ __dw_hdmi_remove(hdmi); +} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_unbind); + -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h -new file mode 100755 -index 000000000000..3f53779c6747 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h -@@ -0,0 +1,69 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+ -+/* -+ * Register-based HW access backend specific job scheduler APIs -+ */ -+ -+#ifndef _KBASE_JS_BACKEND_H_ -+#define _KBASE_JS_BACKEND_H_ -+ -+/** -+ * kbase_backend_timer_init() - Initialise the JS scheduling timer -+ * @kbdev: Device pointer -+ * -+ * This function should be called at driver initialisation -+ * -+ * Return: 0 on success -+ */ -+int kbase_backend_timer_init(struct kbase_device *kbdev); -+ -+/** -+ * kbase_backend_timer_term() - Terminate the JS scheduling timer -+ * @kbdev: Device pointer -+ * -+ * This function should be called at driver termination -+ */ -+void kbase_backend_timer_term(struct kbase_device *kbdev); -+ -+/** -+ * kbase_backend_timer_suspend - Suspend is happening, stop the JS scheduling -+ * timer -+ * @kbdev: Device pointer -+ * -+ * This function should be called on suspend, after the active count has reached -+ * zero. This is required as the timer may have been started on job submission -+ * to the job scheduler, but before jobs are submitted to the GPU. -+ * -+ * Caller must hold runpool_mutex. -+ */ -+void kbase_backend_timer_suspend(struct kbase_device *kbdev); -+ -+/** -+ * kbase_backend_timer_resume - Resume is happening, re-evaluate the JS -+ * scheduling timer -+ * @kbdev: Device pointer -+ * -+ * This function should be called on resume. Note that is is not guaranteed to -+ * re-start the timer, only evalute whether it should be re-started. -+ * -+ * Caller must hold runpool_mutex. -+ */ -+void kbase_backend_timer_resume(struct kbase_device *kbdev); -+ -+#endif /* _KBASE_JS_BACKEND_H_ */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c -new file mode 100755 -index 000000000000..ba826184dd3f ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c -@@ -0,0 +1,407 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+/* #define ENABLE_DEBUG_LOG */ -+#include "../../platform/rk/custom_log.h" -+ -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static inline u64 lock_region(struct kbase_device *kbdev, u64 pfn, -+ u32 num_pages) ++void dw_hdmi_qp_suspend(struct device *dev, struct dw_hdmi_qp *hdmi) +{ -+ u64 region; ++ if (!hdmi) { ++ dev_warn(dev, "Hdmi has not been initialized\n"); ++ return; ++ } + -+ /* can't lock a zero sized range */ -+ KBASE_DEBUG_ASSERT(num_pages); ++ mutex_lock(&hdmi->mutex); + -+ region = pfn << PAGE_SHIFT; + /* -+ * fls returns (given the ASSERT above): -+ * 1 .. 32 -+ * -+ * 10 + fls(num_pages) -+ * results in the range (11 .. 42) ++ * When system shutdown, hdmi should be disabled. ++ * When system suspend, dw_hdmi_qp_bridge_disable will disable hdmi first. ++ * To prevent duplicate operation, we should determine whether hdmi ++ * has been disabled. + */ ++ if (!hdmi->disabled) ++ hdmi->disabled = true; ++ mutex_unlock(&hdmi->mutex); + -+ /* gracefully handle num_pages being zero */ -+ if (0 == num_pages) { -+ region |= 11; -+ } else { -+ u8 region_width; ++ if (hdmi->avp_irq) ++ disable_irq(hdmi->avp_irq); + -+ region_width = 10 + fls(num_pages); -+ if (num_pages != (1ul << (region_width - 11))) { -+ /* not pow2, so must go up to the next pow2 */ -+ region_width += 1; -+ } -+ KBASE_DEBUG_ASSERT(region_width <= KBASE_LOCK_REGION_MAX_SIZE); -+ KBASE_DEBUG_ASSERT(region_width >= KBASE_LOCK_REGION_MIN_SIZE); -+ region |= region_width; -+ } ++ if (hdmi->main_irq) ++ disable_irq(hdmi->main_irq); + -+ return region; ++ if (hdmi->earc_irq) ++ disable_irq(hdmi->earc_irq); ++ ++ pinctrl_pm_select_sleep_state(dev); ++ drm_connector_update_edid_property(&hdmi->connector, NULL); +} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_suspend); + -+static int wait_ready(struct kbase_device *kbdev, -+ unsigned int as_nr, struct kbase_context *kctx) ++void dw_hdmi_qp_resume(struct device *dev, struct dw_hdmi_qp *hdmi) +{ -+ unsigned int max_loops = KBASE_AS_INACTIVE_MAX_LOOPS; -+ u32 val = kbase_reg_read(kbdev, MMU_AS_REG(as_nr, AS_STATUS), kctx); -+ -+ /* Wait for the MMU status to indicate there is no active command, in -+ * case one is pending. Do not log remaining register accesses. */ -+ while (--max_loops && (val & AS_STATUS_AS_ACTIVE)) -+ val = kbase_reg_read(kbdev, MMU_AS_REG(as_nr, AS_STATUS), NULL); -+ -+ if (max_loops == 0) { -+ dev_err(kbdev->dev, "AS_ACTIVE bit stuck\n"); -+ return -1; ++ if (!hdmi) { ++ dev_warn(dev, "Hdmi has not been initialized\n"); ++ return; + } + -+ /* If waiting in loop was performed, log last read value. */ -+ if (KBASE_AS_INACTIVE_MAX_LOOPS - 1 > max_loops) -+ kbase_reg_read(kbdev, MMU_AS_REG(as_nr, AS_STATUS), kctx); ++ hdmi_writel(hdmi, 0, MAINUNIT_0_INT_MASK_N); ++ hdmi_writel(hdmi, 0, MAINUNIT_1_INT_MASK_N); ++ hdmi_writel(hdmi, 428571429, TIMER_BASE_CONFIG0); + -+ return 0; -+} ++ pinctrl_pm_select_default_state(dev); + -+static int write_cmd(struct kbase_device *kbdev, int as_nr, u32 cmd, -+ struct kbase_context *kctx) -+{ -+ int status; ++ if (hdmi->cec_adap) ++ hdmi->cec_adap->ops->adap_enable(hdmi->cec_adap, true); + -+ /* write AS_COMMAND when MMU is ready to accept another command */ -+ status = wait_ready(kbdev, as_nr, kctx); -+ if (status == 0) -+ kbase_reg_write(kbdev, MMU_AS_REG(as_nr, AS_COMMAND), cmd, -+ kctx); ++ mutex_lock(&hdmi->mutex); ++ if (hdmi->i2c) ++ dw_hdmi_i2c_init(hdmi); ++ if (hdmi->avp_irq) ++ enable_irq(hdmi->avp_irq); + -+ return status; -+} ++ if (hdmi->main_irq) ++ enable_irq(hdmi->main_irq); + -+static void validate_protected_page_fault(struct kbase_device *kbdev, -+ struct kbase_context *kctx) -+{ -+ /* GPUs which support (native) protected mode shall not report page -+ * fault addresses unless it has protected debug mode and protected -+ * debug mode is turned on */ -+ u32 protected_debug_mode = 0; ++ if (hdmi->earc_irq) ++ enable_irq(hdmi->earc_irq); + -+ if (!kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_MODE)) -+ return; ++ mutex_unlock(&hdmi->mutex); ++} ++EXPORT_SYMBOL_GPL(dw_hdmi_qp_resume); + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_PROTECTED_DEBUG_MODE)) { -+ protected_debug_mode = kbase_reg_read(kbdev, -+ GPU_CONTROL_REG(GPU_STATUS), -+ kctx) & GPU_DBGEN; -+ } ++MODULE_AUTHOR("Algea Cao "); ++MODULE_DESCRIPTION("DW HDMI QP transmitter driver"); ++MODULE_LICENSE("GPL"); ++MODULE_ALIAS("platform:dw-hdmi-qp"); +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h +new file mode 100755 +index 000000000..e9b5e19a3 +--- /dev/null ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h +@@ -0,0 +1,850 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) Rockchip Electronics Co.Ltd ++ * Author: ++ * Algea Cao ++ */ ++#ifndef __DW_HDMI_QP_H__ ++#define __DW_HDMI_QP_H__ ++/* Main Unit Registers */ ++#define CORE_ID 0x0 ++#define VER_NUMBER 0x4 ++#define VER_TYPE 0x8 ++#define CONFIG_REG 0xc ++#define CONFIG_CEC BIT(28) ++#define CONFIG_AUD_UD BIT(23) ++#define CONFIG_HDCP14 BIT(8) ++#define CORE_TIMESTAMP_HHMM 0x14 ++#define CORE_TIMESTAMP_MMDD 0x18 ++#define CORE_TIMESTAMP_YYYY 0x1c ++/* Reset Manager Registers */ ++#define GLOBAL_SWRESET_REQUEST 0x40 ++#define EARCRX_CMDC_SWINIT_P BIT(27) ++#define AVP_DATAPATH_PACKET_AUDIO_SWINIT_P BIT(10) ++#define GLOBAL_SWDISABLE 0x44 ++#define CEC_SWDISABLE BIT(17) ++#define AVP_DATAPATH_PACKET_AUDIO_SWDISABLE BIT(10) ++#define AVP_DATAPATH_VIDEO_SWDISABLE BIT(6) ++#define RESET_MANAGER_CONFIG0 0x48 ++#define RESET_MANAGER_STATUS0 0x50 ++#define RESET_MANAGER_STATUS1 0x54 ++#define RESET_MANAGER_STATUS2 0x58 ++/* Timer Base Registers */ ++#define TIMER_BASE_CONFIG0 0x80 ++#define TIMER_BASE_STATUS0 0x84 ++/* CMU Registers */ ++#define CMU_CONFIG0 0xa0 ++#define CMU_CONFIG1 0xa4 ++#define CMU_CONFIG2 0xa8 ++#define CMU_CONFIG3 0xac ++#define CMU_STATUS 0xb0 ++#define DISPLAY_CLK_MONITOR 0x3f ++#define DISPLAY_CLK_LOCKED 0X15 ++#define EARC_BPCLK_OFF BIT(9) ++#define AUDCLK_OFF BIT(7) ++#define LINKQPCLK_OFF BIT(5) ++#define VIDQPCLK_OFF BIT(3) ++#define IPI_CLK_OFF BIT(1) ++#define CMU_IPI_CLK_FREQ 0xb4 ++#define CMU_VIDQPCLK_FREQ 0xb8 ++#define CMU_LINKQPCLK_FREQ 0xbc ++#define CMU_AUDQPCLK_FREQ 0xc0 ++#define CMU_EARC_BPCLK_FREQ 0xc4 ++/* I2CM Registers */ ++#define I2CM_SM_SCL_CONFIG0 0xe0 ++#define I2CM_FM_SCL_CONFIG0 0xe4 ++#define I2CM_CONFIG0 0xe8 ++#define I2CM_CONTROL0 0xec ++#define I2CM_STATUS0 0xf0 ++#define I2CM_INTERFACE_CONTROL0 0xf4 ++#define I2CM_ADDR 0xff000 ++#define I2CM_SLVADDR 0xfe0 ++#define I2CM_WR_MASK 0x1e ++#define I2CM_EXT_READ BIT(4) ++#define I2CM_SHORT_READ BIT(3) ++#define I2CM_FM_READ BIT(2) ++#define I2CM_FM_WRITE BIT(1) ++#define I2CM_FM_EN BIT(0) ++#define I2CM_INTERFACE_CONTROL1 0xf8 ++#define I2CM_SEG_PTR 0x7f80 ++#define I2CM_SEG_ADDR 0x7f ++#define I2CM_INTERFACE_WRDATA_0_3 0xfc ++#define I2CM_INTERFACE_WRDATA_4_7 0x100 ++#define I2CM_INTERFACE_WRDATA_8_11 0x104 ++#define I2CM_INTERFACE_WRDATA_12_15 0x108 ++#define I2CM_INTERFACE_RDDATA_0_3 0x10c ++#define I2CM_INTERFACE_RDDATA_4_7 0x110 ++#define I2CM_INTERFACE_RDDATA_8_11 0x114 ++#define I2CM_INTERFACE_RDDATA_12_15 0x118 ++/* SCDC Registers */ ++#define SCDC_CONFIG0 0x140 ++#define SCDC_I2C_FM_EN BIT(12) ++#define SCDC_UPD_FLAGS_AUTO_CLR BIT(6) ++#define SCDC_UPD_FLAGS_POLL_EN BIT(4) ++#define SCDC_CONTROL0 0x148 ++#define SCDC_STATUS0 0x150 ++#define STATUS_UPDATE BIT(0) ++#define FRL_START BIT(4) ++#define FLT_UPDATE BIT(5) ++/* FLT Registers */ ++#define FLT_CONFIG0 0x160 ++#define FLT_CONFIG1 0x164 ++#define FLT_CONFIG2 0x168 ++#define FLT_CONTROL0 0x170 ++/* Main Unit 2 Registers */ ++#define MAINUNIT_STATUS0 0x180 ++/* Video Interface Registers */ ++#define VIDEO_INTERFACE_CONFIG0 0x800 ++#define VIDEO_INTERFACE_CONFIG1 0x804 ++#define VIDEO_INTERFACE_CONFIG2 0x808 ++#define VIDEO_INTERFACE_CONTROL0 0x80c ++#define VIDEO_INTERFACE_STATUS0 0x814 ++/* Video Packing Registers */ ++#define VIDEO_PACKING_CONFIG0 0x81c ++/* Audio Interface Registers */ ++#define AUDIO_INTERFACE_CONFIG0 0x820 ++#define AUD_IF_SEL_MSK 0x3 ++#define AUD_IF_SPDIF 0x2 ++#define AUD_IF_I2S 0x1 ++#define AUD_IF_PAI 0x0 ++#define AUD_FIFO_INIT_ON_OVF_MSK BIT(2) ++#define AUD_FIFO_INIT_ON_OVF_EN BIT(2) ++#define I2S_LINES_EN_MSK GENMASK(7, 4) ++#define I2S_LINES_EN(x) BIT(x + 4) ++#define I2S_BPCUV_RCV_MSK BIT(12) ++#define I2S_BPCUV_RCV_EN BIT(12) ++#define I2S_BPCUV_RCV_DIS 0 ++#define SPDIF_LINES_EN GENMASK(19, 16) ++#define AUD_FORMAT_MSK GENMASK(26, 24) ++#define AUD_3DOBA (0x7 << 24) ++#define AUD_3DASP (0x6 << 24) ++#define AUD_MSOBA (0x5 << 24) ++#define AUD_MSASP (0x4 << 24) ++#define AUD_HBR (0x3 << 24) ++#define AUD_DST (0x2 << 24) ++#define AUD_OBA (0x1 << 24) ++#define AUD_ASP (0x0 << 24) ++#define AUDIO_INTERFACE_CONFIG1 0x824 ++#define AUDIO_INTERFACE_CONTROL0 0x82c ++#define AUDIO_FIFO_CLR_P BIT(0) ++#define AUDIO_INTERFACE_STATUS0 0x834 ++/* Frame Composer Registers */ ++#define FRAME_COMPOSER_CONFIG0 0x840 ++#define FRAME_COMPOSER_CONFIG1 0x844 ++#define FRAME_COMPOSER_CONFIG2 0x848 ++#define FRAME_COMPOSER_CONFIG3 0x84c ++#define FRAME_COMPOSER_CONFIG4 0x850 ++#define FRAME_COMPOSER_CONFIG5 0x854 ++#define FRAME_COMPOSER_CONFIG6 0x858 ++#define FRAME_COMPOSER_CONFIG7 0x85c ++#define FRAME_COMPOSER_CONFIG8 0x860 ++#define FRAME_COMPOSER_CONFIG9 0x864 ++#define KEEPOUT_REKEY_CFG GENMASK(9, 8) ++#define KEEPOUT_REKEY_ALWAYS (0x2 << 8) ++#define FRAME_COMPOSER_CONTROL0 0x86c ++/* Video Monitor Registers */ ++#define VIDEO_MONITOR_CONFIG0 0x880 ++#define VIDEO_MONITOR_STATUS0 0x884 ++#define VIDEO_MONITOR_STATUS1 0x888 ++#define VIDEO_MONITOR_STATUS2 0x88c ++#define VIDEO_MONITOR_STATUS3 0x890 ++#define VIDEO_MONITOR_STATUS4 0x894 ++#define VIDEO_MONITOR_STATUS5 0x898 ++#define VIDEO_MONITOR_STATUS6 0x89c ++/* HDCP2 Logic Registers */ ++#define HDCP2LOGIC_CONFIG0 0x8e0 ++#define HDCP2_BYPASS BIT(0) ++#define HDCP2LOGIC_ESM_GPIO_IN 0x8e4 ++#define HDCP2LOGIC_ESM_GPIO_OUT 0x8e8 ++#define HDCP2_AUTHENTICATION_SUCCESS BIT(6) ++/* HDCP14 Registers */ ++#define HDCP14_CONFIG0 0x900 ++#define HDCP14_OESS_ESSS_OVR_VALUE BIT(14) ++#define HDCP14_OESS_ESSS_OVR_EN BIT(13) ++#define HDCP14_CONFIG1 0x904 ++#define HDCP14_SHA1_MSG_CORRECT_P BIT(3) ++#define HDCP14_CONFIG2 0x908 ++#define HDCP14_CONFIG3 0x90c ++#define HDCP14_KEY_SEED 0x914 ++#define HDCP14_KEY_H 0x918 ++#define HDCP14_KEY_L 0x91c ++#define HDCP14_KEY_STATUS 0x920 ++#define HDCP14_AKSV_H 0x924 ++#define HDCP14_AKSV_L 0x928 ++#define HDCP14_AN_H 0x92c ++#define HDCP14_AN_L 0x930 ++#define HDCP14_STATUS0 0x934 ++#define HDCP14_RPT_DEVICE_COUNT 0xFE00 ++#define HDCP14_STATUS1 0x938 ++#define HDCP14_RCV_REPEATER BIT(6) ++#define HDCP14_RCV_KSV_FIFO_READY BIT(5) ++/* Scrambler Registers */ ++#define SCRAMB_CONFIG0 0x960 ++/* Video Configuration Registers */ ++#define LINK_CONFIG0 0x968 ++#define OPMODE_FRL_4LANES BIT(8) ++#define OPMODE_DVI BIT(4) ++#define OPMODE_FRL BIT(0) ++/* TMDS FIFO Registers */ ++#define TMDS_FIFO_CONFIG0 0x970 ++#define TMDS_FIFO_CONTROL0 0x974 ++/* FRL RSFEC Registers */ ++#define FRL_RSFEC_CONFIG0 0xa20 ++#define FRL_RSFEC_STATUS0 0xa30 ++/* FRL Packetizer Registers */ ++#define FRL_PKTZ_CONFIG0 0xa40 ++#define FRL_PKTZ_CONTROL0 0xa44 ++#define FRL_PKTZ_CONTROL1 0xa50 ++#define FRL_PKTZ_STATUS1 0xa54 ++/* Packet Scheduler Registers */ ++#define PKTSCHED_CONFIG0 0xa80 ++#define PKTSCHED_PRQUEUE0_CONFIG0 0xa84 ++#define PKTSCHED_PRQUEUE1_CONFIG0 0xa88 ++#define PKTSCHED_PRQUEUE2_CONFIG0 0xa8c ++#define PKTSCHED_PRQUEUE2_CONFIG1 0xa90 ++#define PKTSCHED_PRQUEUE2_CONFIG2 0xa94 ++#define PKTSCHED_PKT_CONFIG0 0xa98 ++#define PKTSCHED_PKT_CONFIG1 0xa9c ++#define PKTSCHED_VSI_FIELDRATE BIT(14) ++#define PKTSCHED_DRMI_FIELDRATE BIT(13) ++#define PKTSCHED_AVI_FIELDRATE BIT(12) ++#define PKTSCHED_PKT_CONFIG2 0xaa0 ++#define PKTSCHED_PKT_CONFIG3 0xaa4 ++#define PKTSCHED_PKT_EN 0xaa8 ++#define PKTSCHED_DRMI_TX_EN BIT(17) ++#define PKTSCHED_AUDI_TX_EN BIT(15) ++#define PKTSCHED_AVI_TX_EN BIT(13) ++#define PKTSCHED_VSI_TX_EN BIT(12) ++#define PKTSCHED_EMP_CVTEM_TX_EN BIT(10) ++#define PKTSCHED_AMD_TX_EN BIT(8) ++#define PKTSCHED_GCP_TX_EN BIT(3) ++#define PKTSCHED_AUDS_TX_EN BIT(2) ++#define PKTSCHED_ACR_TX_EN BIT(1) ++#define PKTSCHED_NULL_TX_EN BIT(0) ++#define PKTSCHED_PKT_CONTROL0 0xaac ++#define PKTSCHED_PKT_SEND 0xab0 ++#define PKTSCHED_PKT_STATUS0 0xab4 ++#define PKTSCHED_PKT_STATUS1 0xab8 ++#define PKT_NULL_CONTENTS0 0xb00 ++#define PKT_NULL_CONTENTS1 0xb04 ++#define PKT_NULL_CONTENTS2 0xb08 ++#define PKT_NULL_CONTENTS3 0xb0c ++#define PKT_NULL_CONTENTS4 0xb10 ++#define PKT_NULL_CONTENTS5 0xb14 ++#define PKT_NULL_CONTENTS6 0xb18 ++#define PKT_NULL_CONTENTS7 0xb1c ++#define PKT_ACP_CONTENTS0 0xb20 ++#define PKT_ACP_CONTENTS1 0xb24 ++#define PKT_ACP_CONTENTS2 0xb28 ++#define PKT_ACP_CONTENTS3 0xb2c ++#define PKT_ACP_CONTENTS4 0xb30 ++#define PKT_ACP_CONTENTS5 0xb34 ++#define PKT_ACP_CONTENTS6 0xb38 ++#define PKT_ACP_CONTENTS7 0xb3c ++#define PKT_ISRC1_CONTENTS0 0xb40 ++#define PKT_ISRC1_CONTENTS1 0xb44 ++#define PKT_ISRC1_CONTENTS2 0xb48 ++#define PKT_ISRC1_CONTENTS3 0xb4c ++#define PKT_ISRC1_CONTENTS4 0xb50 ++#define PKT_ISRC1_CONTENTS5 0xb54 ++#define PKT_ISRC1_CONTENTS6 0xb58 ++#define PKT_ISRC1_CONTENTS7 0xb5c ++#define PKT_ISRC2_CONTENTS0 0xb60 ++#define PKT_ISRC2_CONTENTS1 0xb64 ++#define PKT_ISRC2_CONTENTS2 0xb68 ++#define PKT_ISRC2_CONTENTS3 0xb6c ++#define PKT_ISRC2_CONTENTS4 0xb70 ++#define PKT_ISRC2_CONTENTS5 0xb74 ++#define PKT_ISRC2_CONTENTS6 0xb78 ++#define PKT_ISRC2_CONTENTS7 0xb7c ++#define PKT_GMD_CONTENTS0 0xb80 ++#define PKT_GMD_CONTENTS1 0xb84 ++#define PKT_GMD_CONTENTS2 0xb88 ++#define PKT_GMD_CONTENTS3 0xb8c ++#define PKT_GMD_CONTENTS4 0xb90 ++#define PKT_GMD_CONTENTS5 0xb94 ++#define PKT_GMD_CONTENTS6 0xb98 ++#define PKT_GMD_CONTENTS7 0xb9c ++#define PKT_AMD_CONTENTS0 0xba0 ++#define PKT_AMD_CONTENTS1 0xba4 ++#define PKT_AMD_CONTENTS2 0xba8 ++#define PKT_AMD_CONTENTS3 0xbac ++#define PKT_AMD_CONTENTS4 0xbb0 ++#define PKT_AMD_CONTENTS5 0xbb4 ++#define PKT_AMD_CONTENTS6 0xbb8 ++#define PKT_AMD_CONTENTS7 0xbbc ++#define PKT_VSI_CONTENTS0 0xbc0 ++#define PKT_VSI_CONTENTS1 0xbc4 ++#define PKT_VSI_CONTENTS2 0xbc8 ++#define PKT_VSI_CONTENTS3 0xbcc ++#define PKT_VSI_CONTENTS4 0xbd0 ++#define PKT_VSI_CONTENTS5 0xbd4 ++#define PKT_VSI_CONTENTS6 0xbd8 ++#define PKT_VSI_CONTENTS7 0xbdc ++#define PKT_AVI_CONTENTS0 0xbe0 ++#define HDMI_FC_AVICONF0_ACTIVE_FMT_INFO_PRESENT BIT(4) ++#define HDMI_FC_AVICONF0_BAR_DATA_VERT_BAR 0x04 ++#define HDMI_FC_AVICONF0_BAR_DATA_HORIZ_BAR 0x08 ++#define HDMI_FC_AVICONF2_IT_CONTENT_VALID 0x80 ++#define PKT_AVI_CONTENTS1 0xbe4 ++#define PKT_AVI_CONTENTS2 0xbe8 ++#define PKT_AVI_CONTENTS3 0xbec ++#define PKT_AVI_CONTENTS4 0xbf0 ++#define PKT_AVI_CONTENTS5 0xbf4 ++#define PKT_AVI_CONTENTS6 0xbf8 ++#define PKT_AVI_CONTENTS7 0xbfc ++#define PKT_SPDI_CONTENTS0 0xc00 ++#define PKT_SPDI_CONTENTS1 0xc04 ++#define PKT_SPDI_CONTENTS2 0xc08 ++#define PKT_SPDI_CONTENTS3 0xc0c ++#define PKT_SPDI_CONTENTS4 0xc10 ++#define PKT_SPDI_CONTENTS5 0xc14 ++#define PKT_SPDI_CONTENTS6 0xc18 ++#define PKT_SPDI_CONTENTS7 0xc1c ++#define PKT_AUDI_CONTENTS0 0xc20 ++#define PKT_AUDI_CONTENTS1 0xc24 ++#define PKT_AUDI_CONTENTS2 0xc28 ++#define PKT_AUDI_CONTENTS3 0xc2c ++#define PKT_AUDI_CONTENTS4 0xc30 ++#define PKT_AUDI_CONTENTS5 0xc34 ++#define PKT_AUDI_CONTENTS6 0xc38 ++#define PKT_AUDI_CONTENTS7 0xc3c ++#define PKT_NVI_CONTENTS0 0xc40 ++#define PKT_NVI_CONTENTS1 0xc44 ++#define PKT_NVI_CONTENTS2 0xc48 ++#define PKT_NVI_CONTENTS3 0xc4c ++#define PKT_NVI_CONTENTS4 0xc50 ++#define PKT_NVI_CONTENTS5 0xc54 ++#define PKT_NVI_CONTENTS6 0xc58 ++#define PKT_NVI_CONTENTS7 0xc5c ++#define PKT_DRMI_CONTENTS0 0xc60 ++#define PKT_DRMI_CONTENTS1 0xc64 ++#define PKT_DRMI_CONTENTS2 0xc68 ++#define PKT_DRMI_CONTENTS3 0xc6c ++#define PKT_DRMI_CONTENTS4 0xc70 ++#define PKT_DRMI_CONTENTS5 0xc74 ++#define PKT_DRMI_CONTENTS6 0xc78 ++#define PKT_DRMI_CONTENTS7 0xc7c ++#define PKT_GHDMI1_CONTENTS0 0xc80 ++#define PKT_GHDMI1_CONTENTS1 0xc84 ++#define PKT_GHDMI1_CONTENTS2 0xc88 ++#define PKT_GHDMI1_CONTENTS3 0xc8c ++#define PKT_GHDMI1_CONTENTS4 0xc90 ++#define PKT_GHDMI1_CONTENTS5 0xc94 ++#define PKT_GHDMI1_CONTENTS6 0xc98 ++#define PKT_GHDMI1_CONTENTS7 0xc9c ++#define PKT_GHDMI2_CONTENTS0 0xca0 ++#define PKT_GHDMI2_CONTENTS1 0xca4 ++#define PKT_GHDMI2_CONTENTS2 0xca8 ++#define PKT_GHDMI2_CONTENTS3 0xcac ++#define PKT_GHDMI2_CONTENTS4 0xcb0 ++#define PKT_GHDMI2_CONTENTS5 0xcb4 ++#define PKT_GHDMI2_CONTENTS6 0xcb8 ++#define PKT_GHDMI2_CONTENTS7 0xcbc ++/* EMP Packetizer Registers */ ++#define PKT_EMP_CONFIG0 0xce0 ++#define PKT_EMP_CONTROL0 0xcec ++#define PKT_EMP_CONTROL1 0xcf0 ++#define PKT_EMP_CONTROL2 0xcf4 ++#define PKT_EMP_VTEM_CONTENTS0 0xd00 ++#define PKT_EMP_VTEM_CONTENTS1 0xd04 ++#define PKT_EMP_VTEM_CONTENTS2 0xd08 ++#define PKT_EMP_VTEM_CONTENTS3 0xd0c ++#define PKT_EMP_VTEM_CONTENTS4 0xd10 ++#define PKT_EMP_VTEM_CONTENTS5 0xd14 ++#define PKT_EMP_VTEM_CONTENTS6 0xd18 ++#define PKT_EMP_VTEM_CONTENTS7 0xd1c ++#define PKT0_EMP_CVTEM_CONTENTS0 0xd20 ++#define PKT0_EMP_CVTEM_CONTENTS1 0xd24 ++#define PKT0_EMP_CVTEM_CONTENTS2 0xd28 ++#define PKT0_EMP_CVTEM_CONTENTS3 0xd2c ++#define PKT0_EMP_CVTEM_CONTENTS4 0xd30 ++#define PKT0_EMP_CVTEM_CONTENTS5 0xd34 ++#define PKT0_EMP_CVTEM_CONTENTS6 0xd38 ++#define PKT0_EMP_CVTEM_CONTENTS7 0xd3c ++#define PKT1_EMP_CVTEM_CONTENTS0 0xd40 ++#define PKT1_EMP_CVTEM_CONTENTS1 0xd44 ++#define PKT1_EMP_CVTEM_CONTENTS2 0xd48 ++#define PKT1_EMP_CVTEM_CONTENTS3 0xd4c ++#define PKT1_EMP_CVTEM_CONTENTS4 0xd50 ++#define PKT1_EMP_CVTEM_CONTENTS5 0xd54 ++#define PKT1_EMP_CVTEM_CONTENTS6 0xd58 ++#define PKT1_EMP_CVTEM_CONTENTS7 0xd5c ++#define PKT2_EMP_CVTEM_CONTENTS0 0xd60 ++#define PKT2_EMP_CVTEM_CONTENTS1 0xd64 ++#define PKT2_EMP_CVTEM_CONTENTS2 0xd68 ++#define PKT2_EMP_CVTEM_CONTENTS3 0xd6c ++#define PKT2_EMP_CVTEM_CONTENTS4 0xd70 ++#define PKT2_EMP_CVTEM_CONTENTS5 0xd74 ++#define PKT2_EMP_CVTEM_CONTENTS6 0xd78 ++#define PKT2_EMP_CVTEM_CONTENTS7 0xd7c ++#define PKT3_EMP_CVTEM_CONTENTS0 0xd80 ++#define PKT3_EMP_CVTEM_CONTENTS1 0xd84 ++#define PKT3_EMP_CVTEM_CONTENTS2 0xd88 ++#define PKT3_EMP_CVTEM_CONTENTS3 0xd8c ++#define PKT3_EMP_CVTEM_CONTENTS4 0xd90 ++#define PKT3_EMP_CVTEM_CONTENTS5 0xd94 ++#define PKT3_EMP_CVTEM_CONTENTS6 0xd98 ++#define PKT3_EMP_CVTEM_CONTENTS7 0xd9c ++#define PKT4_EMP_CVTEM_CONTENTS0 0xda0 ++#define PKT4_EMP_CVTEM_CONTENTS1 0xda4 ++#define PKT4_EMP_CVTEM_CONTENTS2 0xda8 ++#define PKT4_EMP_CVTEM_CONTENTS3 0xdac ++#define PKT4_EMP_CVTEM_CONTENTS4 0xdb0 ++#define PKT4_EMP_CVTEM_CONTENTS5 0xdb4 ++#define PKT4_EMP_CVTEM_CONTENTS6 0xdb8 ++#define PKT4_EMP_CVTEM_CONTENTS7 0xdbc ++#define PKT5_EMP_CVTEM_CONTENTS0 0xdc0 ++#define PKT5_EMP_CVTEM_CONTENTS1 0xdc4 ++#define PKT5_EMP_CVTEM_CONTENTS2 0xdc8 ++#define PKT5_EMP_CVTEM_CONTENTS3 0xdcc ++#define PKT5_EMP_CVTEM_CONTENTS4 0xdd0 ++#define PKT5_EMP_CVTEM_CONTENTS5 0xdd4 ++#define PKT5_EMP_CVTEM_CONTENTS6 0xdd8 ++#define PKT5_EMP_CVTEM_CONTENTS7 0xddc ++/* Audio Packetizer Registers */ ++#define AUDPKT_CONTROL0 0xe20 ++#define AUDPKT_PBIT_FORCE_EN_MASK BIT(12) ++#define AUDPKT_PBIT_FORCE_EN BIT(12) ++#define AUDPKT_CHSTATUS_OVR_EN_MASK BIT(0) ++#define AUDPKT_CHSTATUS_OVR_EN BIT(0) ++#define AUDPKT_CONTROL1 0xe24 ++#define AUDPKT_ACR_CONTROL0 0xe40 ++#define AUDPKT_ACR_N_VALUE 0xfffff ++#define AUDPKT_ACR_CONTROL1 0xe44 ++#define AUDPKT_ACR_CTS_OVR_VAL_MSK GENMASK(23, 4) ++#define AUDPKT_ACR_CTS_OVR_VAL(x) ((x) << 4) ++#define AUDPKT_ACR_CTS_OVR_EN_MSK BIT(1) ++#define AUDPKT_ACR_CTS_OVR_EN BIT(1) ++#define AUDPKT_ACR_STATUS0 0xe4c ++#define AUDPKT_CHSTATUS_OVR0 0xe60 ++#define AUDPKT_CHSTATUS_OVR1 0xe64 ++/* IEC60958 Byte 3: Sampleing frenuency Bits 24 to 27 */ ++#define AUDPKT_CHSTATUS_SR_MASK GENMASK(3, 0) ++#define AUDPKT_CHSTATUS_SR_22050 0x4 ++#define AUDPKT_CHSTATUS_SR_24000 0x6 ++#define AUDPKT_CHSTATUS_SR_32000 0x3 ++#define AUDPKT_CHSTATUS_SR_44100 0x0 ++#define AUDPKT_CHSTATUS_SR_48000 0x2 ++#define AUDPKT_CHSTATUS_SR_88200 0x8 ++#define AUDPKT_CHSTATUS_SR_96000 0xa ++#define AUDPKT_CHSTATUS_SR_176400 0xc ++#define AUDPKT_CHSTATUS_SR_192000 0xe ++#define AUDPKT_CHSTATUS_SR_768000 0x9 ++#define AUDPKT_CHSTATUS_SR_NOT_INDICATED 0x1 ++/* IEC60958 Byte 4: Original Sampleing frenuency Bits 36 to 39 */ ++#define AUDPKT_CHSTATUS_0SR_MASK GENMASK(15, 12) ++#define AUDPKT_CHSTATUS_OSR_8000 0x6 ++#define AUDPKT_CHSTATUS_OSR_11025 0xa ++#define AUDPKT_CHSTATUS_OSR_12000 0x2 ++#define AUDPKT_CHSTATUS_OSR_16000 0x8 ++#define AUDPKT_CHSTATUS_OSR_22050 0xb ++#define AUDPKT_CHSTATUS_OSR_24000 0x9 ++#define AUDPKT_CHSTATUS_OSR_32000 0xc ++#define AUDPKT_CHSTATUS_OSR_44100 0xf ++#define AUDPKT_CHSTATUS_OSR_48000 0xd ++#define AUDPKT_CHSTATUS_OSR_88200 0x7 ++#define AUDPKT_CHSTATUS_OSR_96000 0x5 ++#define AUDPKT_CHSTATUS_OSR_176400 0x3 ++#define AUDPKT_CHSTATUS_OSR_192000 0x1 ++#define AUDPKT_CHSTATUS_OSR_NOT_INDICATED 0x0 ++#define AUDPKT_CHSTATUS_OVR2 0xe68 ++#define AUDPKT_CHSTATUS_OVR3 0xe6c ++#define AUDPKT_CHSTATUS_OVR4 0xe70 ++#define AUDPKT_CHSTATUS_OVR5 0xe74 ++#define AUDPKT_CHSTATUS_OVR6 0xe78 ++#define AUDPKT_CHSTATUS_OVR7 0xe7c ++#define AUDPKT_CHSTATUS_OVR8 0xe80 ++#define AUDPKT_CHSTATUS_OVR9 0xe84 ++#define AUDPKT_CHSTATUS_OVR10 0xe88 ++#define AUDPKT_CHSTATUS_OVR11 0xe8c ++#define AUDPKT_CHSTATUS_OVR12 0xe90 ++#define AUDPKT_CHSTATUS_OVR13 0xe94 ++#define AUDPKT_CHSTATUS_OVR14 0xe98 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC0 0xea0 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC1 0xea4 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC2 0xea8 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC3 0xeac ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC4 0xeb0 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC5 0xeb4 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC6 0xeb8 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC7 0xebc ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC8 0xec0 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC9 0xec4 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC10 0xec8 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC11 0xecc ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC12 0xed0 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC13 0xed4 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC14 0xed8 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC15 0xedc ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC16 0xee0 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC17 0xee4 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC18 0xee8 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC19 0xeec ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC20 0xef0 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC21 0xef4 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC22 0xef8 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC23 0xefc ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC24 0xf00 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC25 0xf04 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC26 0xf08 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC27 0xf0c ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC28 0xf10 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC29 0xf14 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC30 0xf18 ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC31 0xf1c ++#define AUDPKT_USRDATA_OVR_MSG_GENERIC32 0xf20 ++#define AUDPKT_VBIT_OVR0 0xf24 ++/* CEC Registers */ ++#define CEC_TX_CONTROL 0x1000 ++#define CEC_STATUS 0x1004 ++#define CEC_CONFIG 0x1008 ++#define CEC_ADDR 0x100c ++#define CEC_TX_COUNT 0x1020 ++#define CEC_TX_DATA3_0 0x1024 ++#define CEC_TX_DATA7_4 0x1028 ++#define CEC_TX_DATA11_8 0x102c ++#define CEC_TX_DATA15_12 0x1030 ++#define CEC_RX_COUNT_STATUS 0x1040 ++#define CEC_RX_DATA3_0 0x1044 ++#define CEC_RX_DATA7_4 0x1048 ++#define CEC_RX_DATA11_8 0x104c ++#define CEC_RX_DATA15_12 0x1050 ++#define CEC_LOCK_CONTROL 0x1054 ++#define CEC_RXQUAL_BITTIME_CONFIG 0x1060 ++#define CEC_RX_BITTIME_CONFIG 0x1064 ++#define CEC_TX_BITTIME_CONFIG 0x1068 ++/* eARC RX CMDC Registers */ ++#define EARCRX_CMDC_CONFIG0 0x1800 ++#define EARCRX_XACTREAD_STOP_CFG BIT(26) ++#define EARCRX_XACTREAD_RETRY_CFG BIT(25) ++#define EARCRX_CMDC_DSCVR_EARCVALID0_TO_DISC1 BIT(24) ++#define EARCRX_CMDC_XACT_RESTART_EN BIT(18) ++#define EARCRX_CMDC_CONFIG1 0x1804 ++#define EARCRX_CMDC_CONTROL 0x1808 ++#define EARCRX_CMDC_HEARTBEAT_LOSS_EN BIT(4) ++#define EARCRX_CMDC_DISCOVERY_EN BIT(3) ++#define EARCRX_CONNECTOR_HPD BIT(1) ++#define EARCRX_CMDC_WHITELIST0_CONFIG 0x180c ++#define EARCRX_CMDC_WHITELIST1_CONFIG 0x1810 ++#define EARCRX_CMDC_WHITELIST2_CONFIG 0x1814 ++#define EARCRX_CMDC_WHITELIST3_CONFIG 0x1818 ++#define EARCRX_CMDC_STATUS 0x181c ++#define EARCRX_CMDC_XACT_INFO 0x1820 ++#define EARCRX_CMDC_XACT_ACTION 0x1824 ++#define EARCRX_CMDC_HEARTBEAT_RXSTAT_SE 0x1828 ++#define EARCRX_CMDC_HEARTBEAT_STATUS 0x182c ++#define EARCRX_CMDC_XACT_WR0 0x1840 ++#define EARCRX_CMDC_XACT_WR1 0x1844 ++#define EARCRX_CMDC_XACT_WR2 0x1848 ++#define EARCRX_CMDC_XACT_WR3 0x184c ++#define EARCRX_CMDC_XACT_WR4 0x1850 ++#define EARCRX_CMDC_XACT_WR5 0x1854 ++#define EARCRX_CMDC_XACT_WR6 0x1858 ++#define EARCRX_CMDC_XACT_WR7 0x185c ++#define EARCRX_CMDC_XACT_WR8 0x1860 ++#define EARCRX_CMDC_XACT_WR9 0x1864 ++#define EARCRX_CMDC_XACT_WR10 0x1868 ++#define EARCRX_CMDC_XACT_WR11 0x186c ++#define EARCRX_CMDC_XACT_WR12 0x1870 ++#define EARCRX_CMDC_XACT_WR13 0x1874 ++#define EARCRX_CMDC_XACT_WR14 0x1878 ++#define EARCRX_CMDC_XACT_WR15 0x187c ++#define EARCRX_CMDC_XACT_WR16 0x1880 ++#define EARCRX_CMDC_XACT_WR17 0x1884 ++#define EARCRX_CMDC_XACT_WR18 0x1888 ++#define EARCRX_CMDC_XACT_WR19 0x188c ++#define EARCRX_CMDC_XACT_WR20 0x1890 ++#define EARCRX_CMDC_XACT_WR21 0x1894 ++#define EARCRX_CMDC_XACT_WR22 0x1898 ++#define EARCRX_CMDC_XACT_WR23 0x189c ++#define EARCRX_CMDC_XACT_WR24 0x18a0 ++#define EARCRX_CMDC_XACT_WR25 0x18a4 ++#define EARCRX_CMDC_XACT_WR26 0x18a8 ++#define EARCRX_CMDC_XACT_WR27 0x18ac ++#define EARCRX_CMDC_XACT_WR28 0x18b0 ++#define EARCRX_CMDC_XACT_WR29 0x18b4 ++#define EARCRX_CMDC_XACT_WR30 0x18b8 ++#define EARCRX_CMDC_XACT_WR31 0x18bc ++#define EARCRX_CMDC_XACT_WR32 0x18c0 ++#define EARCRX_CMDC_XACT_WR33 0x18c4 ++#define EARCRX_CMDC_XACT_WR34 0x18c8 ++#define EARCRX_CMDC_XACT_WR35 0x18cc ++#define EARCRX_CMDC_XACT_WR36 0x18d0 ++#define EARCRX_CMDC_XACT_WR37 0x18d4 ++#define EARCRX_CMDC_XACT_WR38 0x18d8 ++#define EARCRX_CMDC_XACT_WR39 0x18dc ++#define EARCRX_CMDC_XACT_WR40 0x18e0 ++#define EARCRX_CMDC_XACT_WR41 0x18e4 ++#define EARCRX_CMDC_XACT_WR42 0x18e8 ++#define EARCRX_CMDC_XACT_WR43 0x18ec ++#define EARCRX_CMDC_XACT_WR44 0x18f0 ++#define EARCRX_CMDC_XACT_WR45 0x18f4 ++#define EARCRX_CMDC_XACT_WR46 0x18f8 ++#define EARCRX_CMDC_XACT_WR47 0x18fc ++#define EARCRX_CMDC_XACT_WR48 0x1900 ++#define EARCRX_CMDC_XACT_WR49 0x1904 ++#define EARCRX_CMDC_XACT_WR50 0x1908 ++#define EARCRX_CMDC_XACT_WR51 0x190c ++#define EARCRX_CMDC_XACT_WR52 0x1910 ++#define EARCRX_CMDC_XACT_WR53 0x1914 ++#define EARCRX_CMDC_XACT_WR54 0x1918 ++#define EARCRX_CMDC_XACT_WR55 0x191c ++#define EARCRX_CMDC_XACT_WR56 0x1920 ++#define EARCRX_CMDC_XACT_WR57 0x1924 ++#define EARCRX_CMDC_XACT_WR58 0x1928 ++#define EARCRX_CMDC_XACT_WR59 0x192c ++#define EARCRX_CMDC_XACT_WR60 0x1930 ++#define EARCRX_CMDC_XACT_WR61 0x1934 ++#define EARCRX_CMDC_XACT_WR62 0x1938 ++#define EARCRX_CMDC_XACT_WR63 0x193c ++#define EARCRX_CMDC_XACT_WR64 0x1940 ++#define EARCRX_CMDC_XACT_RD0 0x1960 ++#define EARCRX_CMDC_XACT_RD1 0x1964 ++#define EARCRX_CMDC_XACT_RD2 0x1968 ++#define EARCRX_CMDC_XACT_RD3 0x196c ++#define EARCRX_CMDC_XACT_RD4 0x1970 ++#define EARCRX_CMDC_XACT_RD5 0x1974 ++#define EARCRX_CMDC_XACT_RD6 0x1978 ++#define EARCRX_CMDC_XACT_RD7 0x197c ++#define EARCRX_CMDC_XACT_RD8 0x1980 ++#define EARCRX_CMDC_XACT_RD9 0x1984 ++#define EARCRX_CMDC_XACT_RD10 0x1988 ++#define EARCRX_CMDC_XACT_RD11 0x198c ++#define EARCRX_CMDC_XACT_RD12 0x1990 ++#define EARCRX_CMDC_XACT_RD13 0x1994 ++#define EARCRX_CMDC_XACT_RD14 0x1998 ++#define EARCRX_CMDC_XACT_RD15 0x199c ++#define EARCRX_CMDC_XACT_RD16 0x19a0 ++#define EARCRX_CMDC_XACT_RD17 0x19a4 ++#define EARCRX_CMDC_XACT_RD18 0x19a8 ++#define EARCRX_CMDC_XACT_RD19 0x19ac ++#define EARCRX_CMDC_XACT_RD20 0x19b0 ++#define EARCRX_CMDC_XACT_RD21 0x19b4 ++#define EARCRX_CMDC_XACT_RD22 0x19b8 ++#define EARCRX_CMDC_XACT_RD23 0x19bc ++#define EARCRX_CMDC_XACT_RD24 0x19c0 ++#define EARCRX_CMDC_XACT_RD25 0x19c4 ++#define EARCRX_CMDC_XACT_RD26 0x19c8 ++#define EARCRX_CMDC_XACT_RD27 0x19cc ++#define EARCRX_CMDC_XACT_RD28 0x19d0 ++#define EARCRX_CMDC_XACT_RD29 0x19d4 ++#define EARCRX_CMDC_XACT_RD30 0x19d8 ++#define EARCRX_CMDC_XACT_RD31 0x19dc ++#define EARCRX_CMDC_XACT_RD32 0x19e0 ++#define EARCRX_CMDC_XACT_RD33 0x19e4 ++#define EARCRX_CMDC_XACT_RD34 0x19e8 ++#define EARCRX_CMDC_XACT_RD35 0x19ec ++#define EARCRX_CMDC_XACT_RD36 0x19f0 ++#define EARCRX_CMDC_XACT_RD37 0x19f4 ++#define EARCRX_CMDC_XACT_RD38 0x19f8 ++#define EARCRX_CMDC_XACT_RD39 0x19fc ++#define EARCRX_CMDC_XACT_RD40 0x1a00 ++#define EARCRX_CMDC_XACT_RD41 0x1a04 ++#define EARCRX_CMDC_XACT_RD42 0x1a08 ++#define EARCRX_CMDC_XACT_RD43 0x1a0c ++#define EARCRX_CMDC_XACT_RD44 0x1a10 ++#define EARCRX_CMDC_XACT_RD45 0x1a14 ++#define EARCRX_CMDC_XACT_RD46 0x1a18 ++#define EARCRX_CMDC_XACT_RD47 0x1a1c ++#define EARCRX_CMDC_XACT_RD48 0x1a20 ++#define EARCRX_CMDC_XACT_RD49 0x1a24 ++#define EARCRX_CMDC_XACT_RD50 0x1a28 ++#define EARCRX_CMDC_XACT_RD51 0x1a2c ++#define EARCRX_CMDC_XACT_RD52 0x1a30 ++#define EARCRX_CMDC_XACT_RD53 0x1a34 ++#define EARCRX_CMDC_XACT_RD54 0x1a38 ++#define EARCRX_CMDC_XACT_RD55 0x1a3c ++#define EARCRX_CMDC_XACT_RD56 0x1a40 ++#define EARCRX_CMDC_XACT_RD57 0x1a44 ++#define EARCRX_CMDC_XACT_RD58 0x1a48 ++#define EARCRX_CMDC_XACT_RD59 0x1a4c ++#define EARCRX_CMDC_XACT_RD60 0x1a50 ++#define EARCRX_CMDC_XACT_RD61 0x1a54 ++#define EARCRX_CMDC_XACT_RD62 0x1a58 ++#define EARCRX_CMDC_XACT_RD63 0x1a5c ++#define EARCRX_CMDC_XACT_RD64 0x1a60 ++#define EARCRX_CMDC_SYNC_CONFIG 0x1b00 ++/* eARC RX DMAC Registers */ ++#define EARCRX_DMAC_PHY_CONTROL 0x1c00 ++#define EARCRX_DMAC_CONFIG 0x1c08 ++#define EARCRX_DMAC_CONTROL0 0x1c0c ++#define EARCRX_DMAC_AUDIO_EN BIT(1) ++#define EARCRX_DMAC_EN BIT(0) ++#define EARCRX_DMAC_CONTROL1 0x1c10 ++#define EARCRX_DMAC_STATUS 0x1c14 ++#define EARCRX_DMAC_CHSTATUS0 0x1c18 ++#define EARCRX_DMAC_CHSTATUS1 0x1c1c ++#define EARCRX_DMAC_CHSTATUS2 0x1c20 ++#define EARCRX_DMAC_CHSTATUS3 0x1c24 ++#define EARCRX_DMAC_CHSTATUS4 0x1c28 ++#define EARCRX_DMAC_CHSTATUS5 0x1c2c ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC0 0x1c30 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC1 0x1c34 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC2 0x1c38 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC3 0x1c3c ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC4 0x1c40 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC5 0x1c44 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC6 0x1c48 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC7 0x1c4c ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC8 0x1c50 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC9 0x1c54 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC10 0x1c58 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC11 0x1c5c ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT0 0x1c60 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT1 0x1c64 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT2 0x1c68 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT3 0x1c6c ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT4 0x1c70 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT5 0x1c74 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT6 0x1c78 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT7 0x1c7c ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT8 0x1c80 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT9 0x1c84 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT10 0x1c88 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT11 0x1c8c ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT0 0x1c90 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT1 0x1c94 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT2 0x1c98 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT3 0x1c9c ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT4 0x1ca0 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT5 0x1ca4 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT6 0x1ca8 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT7 0x1cac ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT8 0x1cb0 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT9 0x1cb4 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT10 0x1cb8 ++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT11 0x1cbc ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC0 0x1cc0 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC1 0x1cc4 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC2 0x1cc8 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC3 0x1ccc ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC4 0x1cd0 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC5 0x1cd4 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC6 0x1cd8 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC7 0x1cdc ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC8 0x1ce0 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC9 0x1ce4 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC10 0x1ce8 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC11 0x1cec ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC12 0x1cf0 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC13 0x1cf4 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC14 0x1cf8 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC15 0x1cfc ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC16 0x1d00 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC17 0x1d04 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC18 0x1d08 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC19 0x1d0c ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC20 0x1d10 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC21 0x1d14 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC22 0x1d18 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC23 0x1d1c ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC24 0x1d20 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC25 0x1d24 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC26 0x1d28 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC27 0x1d2c ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC28 0x1d30 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC29 0x1d34 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC30 0x1d38 ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC31 0x1d3c ++#define EARCRX_DMAC_USRDATA_MSG_GENERIC32 0x1d40 ++#define EARCRX_DMAC_CHSTATUS_STREAMER0 0x1d44 ++#define EARCRX_DMAC_CHSTATUS_STREAMER1 0x1d48 ++#define EARCRX_DMAC_CHSTATUS_STREAMER2 0x1d4c ++#define EARCRX_DMAC_CHSTATUS_STREAMER3 0x1d50 ++#define EARCRX_DMAC_CHSTATUS_STREAMER4 0x1d54 ++#define EARCRX_DMAC_CHSTATUS_STREAMER5 0x1d58 ++#define EARCRX_DMAC_CHSTATUS_STREAMER6 0x1d5c ++#define EARCRX_DMAC_CHSTATUS_STREAMER7 0x1d60 ++#define EARCRX_DMAC_CHSTATUS_STREAMER8 0x1d64 ++#define EARCRX_DMAC_CHSTATUS_STREAMER9 0x1d68 ++#define EARCRX_DMAC_CHSTATUS_STREAMER10 0x1d6c ++#define EARCRX_DMAC_CHSTATUS_STREAMER11 0x1d70 ++#define EARCRX_DMAC_CHSTATUS_STREAMER12 0x1d74 ++#define EARCRX_DMAC_CHSTATUS_STREAMER13 0x1d78 ++#define EARCRX_DMAC_CHSTATUS_STREAMER14 0x1d7c ++#define EARCRX_DMAC_USRDATA_STREAMER0 0x1d80 ++/* Main Unit Interrupt Registers */ ++#define MAIN_INTVEC_INDEX 0x3000 ++#define MAINUNIT_0_INT_STATUS 0x3010 ++#define MAINUNIT_0_INT_MASK_N 0x3014 ++#define MAINUNIT_0_INT_CLEAR 0x3018 ++#define MAINUNIT_0_INT_FORCE 0x301c ++#define MAINUNIT_1_INT_STATUS 0x3020 ++#define FLT_EXIT_TO_LTSL_IRQ BIT(22) ++#define FLT_EXIT_TO_LTS4_IRQ BIT(21) ++#define FLT_EXIT_TO_LTSP_IRQ BIT(20) ++#define SCDC_NACK_RCVD_IRQ BIT(12) ++#define SCDC_RR_REPLY_STOP_IRQ BIT(11) ++#define SCDC_UPD_FLAGS_CLR_IRQ BIT(10) ++#define SCDC_UPD_FLAGS_CHG_IRQ BIT(9) ++#define SCDC_UPD_FLAGS_RD_IRQ BIT(8) ++#define I2CM_NACK_RCVD_IRQ BIT(2) ++#define I2CM_READ_REQUEST_IRQ BIT(1) ++#define I2CM_OP_DONE_IRQ BIT(0) ++#define MAINUNIT_1_INT_MASK_N 0x3024 ++#define I2CM_NACK_RCVD_MASK_N BIT(2) ++#define I2CM_READ_REQUEST_MASK_N BIT(1) ++#define I2CM_OP_DONE_MASK_N BIT(0) ++#define MAINUNIT_1_INT_CLEAR 0x3028 ++#define I2CM_NACK_RCVD_CLEAR BIT(2) ++#define I2CM_READ_REQUEST_CLEAR BIT(1) ++#define I2CM_OP_DONE_CLEAR BIT(0) ++#define MAINUNIT_1_INT_FORCE 0x302c ++/* AVPUNIT Interrupt Registers */ ++#define AVP_INTVEC_INDEX 0x3800 ++#define AVP_0_INT_STATUS 0x3810 ++#define AVP_0_INT_MASK_N 0x3814 ++#define AVP_0_INT_CLEAR 0x3818 ++#define AVP_0_INT_FORCE 0x381c ++#define AVP_1_INT_STATUS 0x3820 ++#define AVP_1_INT_MASK_N 0x3824 ++#define HDCP14_AUTH_CHG_MASK_N BIT(6) ++#define HDCP14_KSV_LIST_DONE_MASK_N BIT(1) ++#define AVP_1_INT_CLEAR 0x3828 ++#define AVP_1_INT_FORCE 0x382c ++#define AVP_2_INT_STATUS 0x3830 ++#define AVP_2_INT_MASK_N 0x3834 ++#define AVP_2_INT_CLEAR 0x3838 ++#define AVP_2_INT_FORCE 0x383c ++#define AVP_3_INT_STATUS 0x3840 ++#define AVP_3_INT_MASK_N 0x3844 ++#define AVP_3_INT_CLEAR 0x3848 ++#define AVP_3_INT_FORCE 0x384c ++#define HDCP2_ESM_P0_GPIO_OUT_2_CHG_IRQ BIT(17) ++#define AVP_4_INT_STATUS 0x3850 ++#define AVP_4_INT_MASK_N 0x3854 ++#define AVP_4_INT_CLEAR 0x3858 ++#define AVP_4_INT_FORCE 0x385c ++#define AVP_5_INT_STATUS 0x3860 ++#define AVP_5_INT_MASK_N 0x3864 ++#define AVP_5_INT_CLEAR 0x3868 ++#define AVP_5_INT_FORCE 0x386c ++#define AVP_6_INT_STATUS 0x3870 ++#define AVP_6_INT_MASK_N 0x3874 ++#define AVP_6_INT_CLEAR 0x3878 ++#define AVP_6_INT_FORCE 0x387c ++/* CEC Interrupt Registers */ ++#define CEC_INT_STATUS 0x4000 ++#define CEC_INT_MASK_N 0x4004 ++#define CEC_INT_CLEAR 0x4008 ++#define CEC_INT_FORCE 0x400c ++/* eARC RX Interrupt Registers */ ++#define EARCRX_INTVEC_INDEX 0x4800 ++#define EARCRX_0_INT_STATUS 0x4810 ++#define EARCRX_CMDC_DISCOVERY_TIMEOUT_IRQ BIT(9) ++#define EARCRX_CMDC_DISCOVERY_DONE_IRQ BIT(8) ++#define EARCRX_0_INT_MASK_N 0x4814 ++#define EARCRX_0_INT_CLEAR 0x4818 ++#define EARCRX_0_INT_FORCE 0x481c ++#define EARCRX_1_INT_STATUS 0x4820 ++#define EARCRX_1_INT_MASK_N 0x4824 ++#define EARCRX_1_INT_CLEAR 0x4828 ++#define EARCRX_1_INT_FORCE 0x482c + -+ if (!protected_debug_mode) { -+ /* fault_addr should never be reported in protected mode. -+ * However, we just continue by printing an error message */ -+ dev_err(kbdev->dev, "Fault address reported in protected mode\n"); -+ } -+} ++#define HDMI_HDCP14_MEM_KSV0 0x4f08 ++#define HDMI_HDCP14_MEM_BSTATUS0 0x5958 ++#define HDMI_HDCP14_MEM_M0_1 0x5960 ++#define HDMI_HDCP14_MEM_M0_7 0x597c + -+void kbase_mmu_interrupt(struct kbase_device *kbdev, u32 irq_stat) -+{ -+ const int num_as = 16; -+ const int busfault_shift = MMU_PAGE_FAULT_FLAGS; -+ const int pf_shift = 0; -+ const unsigned long as_bit_mask = (1UL << num_as) - 1; -+ unsigned long flags; -+ u32 new_mask; -+ u32 tmp; ++#endif /* __DW_HDMI_QP_H__ */ +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +index 2c3c743df..5d20a72a1 100644 +--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +@@ -9,6 +9,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +@@ -18,6 +20,7 @@ + #include + #include + #include ++#include + + #include + +@@ -36,18 +39,25 @@ + + #include "dw-hdmi-audio.h" + #include "dw-hdmi-cec.h" ++#include "dw-hdmi-hdcp.h" + #include "dw-hdmi.h" + + #define DDC_CI_ADDR 0x37 + #define DDC_SEGMENT_ADDR 0x30 + + #define HDMI_EDID_LEN 512 ++#define HDMI_EDID_BLOCK_LEN 128 + + /* DW-HDMI Controller >= 0x200a are at least compliant with SCDC version 1 */ + #define SCDC_MIN_SOURCE_VERSION 0x1 + + #define HDMI14_MAX_TMDSCLK 340000000 + ++static const unsigned int dw_hdmi_cable[] = { ++ EXTCON_DISP_HDMI, ++ EXTCON_NONE, ++}; + -+ /* bus faults */ -+ u32 bf_bits = (irq_stat >> busfault_shift) & as_bit_mask; -+ /* page faults (note: Ignore ASes with both pf and bf) */ -+ u32 pf_bits = ((irq_stat >> pf_shift) & as_bit_mask) & ~bf_bits; + enum hdmi_datamap { + RGB444_8B = 0x01, + RGB444_10B = 0x03, +@@ -62,6 +72,61 @@ enum hdmi_datamap { + YCbCr422_12B = 0x12, + }; + ++/* ++ * Unless otherwise noted, entries in this table are 100% optimization. ++ * Values can be obtained from hdmi_compute_n() but that function is ++ * slow so we pre-compute values we expect to see. ++ * ++ * All 32k and 48k values are expected to be the same (due to the way ++ * the math works) for any rate that's an exact kHz. ++ */ ++static const struct dw_hdmi_audio_tmds_n common_tmds_n_table[] = { ++ { .tmds = 25175000, .n_32k = 4096, .n_44k1 = 12854, .n_48k = 6144, }, ++ { .tmds = 25200000, .n_32k = 4096, .n_44k1 = 5656, .n_48k = 6144, }, ++ { .tmds = 27000000, .n_32k = 4096, .n_44k1 = 5488, .n_48k = 6144, }, ++ { .tmds = 28320000, .n_32k = 4096, .n_44k1 = 5586, .n_48k = 6144, }, ++ { .tmds = 30240000, .n_32k = 4096, .n_44k1 = 5642, .n_48k = 6144, }, ++ { .tmds = 31500000, .n_32k = 4096, .n_44k1 = 5600, .n_48k = 6144, }, ++ { .tmds = 32000000, .n_32k = 4096, .n_44k1 = 5733, .n_48k = 6144, }, ++ { .tmds = 33750000, .n_32k = 4096, .n_44k1 = 6272, .n_48k = 6144, }, ++ { .tmds = 36000000, .n_32k = 4096, .n_44k1 = 5684, .n_48k = 6144, }, ++ { .tmds = 40000000, .n_32k = 4096, .n_44k1 = 5733, .n_48k = 6144, }, ++ { .tmds = 49500000, .n_32k = 4096, .n_44k1 = 5488, .n_48k = 6144, }, ++ { .tmds = 50000000, .n_32k = 4096, .n_44k1 = 5292, .n_48k = 6144, }, ++ { .tmds = 54000000, .n_32k = 4096, .n_44k1 = 5684, .n_48k = 6144, }, ++ { .tmds = 65000000, .n_32k = 4096, .n_44k1 = 7056, .n_48k = 6144, }, ++ { .tmds = 68250000, .n_32k = 4096, .n_44k1 = 5376, .n_48k = 6144, }, ++ { .tmds = 71000000, .n_32k = 4096, .n_44k1 = 7056, .n_48k = 6144, }, ++ { .tmds = 72000000, .n_32k = 4096, .n_44k1 = 5635, .n_48k = 6144, }, ++ { .tmds = 73250000, .n_32k = 4096, .n_44k1 = 14112, .n_48k = 6144, }, ++ { .tmds = 74250000, .n_32k = 4096, .n_44k1 = 6272, .n_48k = 6144, }, ++ { .tmds = 75000000, .n_32k = 4096, .n_44k1 = 5880, .n_48k = 6144, }, ++ { .tmds = 78750000, .n_32k = 4096, .n_44k1 = 5600, .n_48k = 6144, }, ++ { .tmds = 78800000, .n_32k = 4096, .n_44k1 = 5292, .n_48k = 6144, }, ++ { .tmds = 79500000, .n_32k = 4096, .n_44k1 = 4704, .n_48k = 6144, }, ++ { .tmds = 83500000, .n_32k = 4096, .n_44k1 = 7056, .n_48k = 6144, }, ++ { .tmds = 85500000, .n_32k = 4096, .n_44k1 = 5488, .n_48k = 6144, }, ++ { .tmds = 88750000, .n_32k = 4096, .n_44k1 = 14112, .n_48k = 6144, }, ++ { .tmds = 97750000, .n_32k = 4096, .n_44k1 = 14112, .n_48k = 6144, }, ++ { .tmds = 101000000, .n_32k = 4096, .n_44k1 = 7056, .n_48k = 6144, }, ++ { .tmds = 106500000, .n_32k = 4096, .n_44k1 = 4704, .n_48k = 6144, }, ++ { .tmds = 108000000, .n_32k = 4096, .n_44k1 = 5684, .n_48k = 6144, }, ++ { .tmds = 115500000, .n_32k = 4096, .n_44k1 = 5712, .n_48k = 6144, }, ++ { .tmds = 119000000, .n_32k = 4096, .n_44k1 = 5544, .n_48k = 6144, }, ++ { .tmds = 135000000, .n_32k = 4096, .n_44k1 = 5488, .n_48k = 6144, }, ++ { .tmds = 146250000, .n_32k = 4096, .n_44k1 = 6272, .n_48k = 6144, }, ++ { .tmds = 148500000, .n_32k = 4096, .n_44k1 = 5488, .n_48k = 6144, }, ++ { .tmds = 154000000, .n_32k = 4096, .n_44k1 = 5544, .n_48k = 6144, }, ++ { .tmds = 162000000, .n_32k = 4096, .n_44k1 = 5684, .n_48k = 6144, }, + -+ KBASE_DEBUG_ASSERT(NULL != kbdev); ++ /* For 297 MHz+ HDMI spec have some other rule for setting N */ ++ { .tmds = 297000000, .n_32k = 3073, .n_44k1 = 4704, .n_48k = 5120, }, ++ { .tmds = 594000000, .n_32k = 3073, .n_44k1 = 9408, .n_48k = 10240, }, + -+ /* remember current mask */ -+ spin_lock_irqsave(&kbdev->mmu_mask_change, flags); -+ new_mask = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_MASK), NULL); -+ /* mask interrupts for now */ -+ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_MASK), 0, NULL); -+ spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); ++ /* End of table */ ++ { .tmds = 0, .n_32k = 0, .n_44k1 = 0, .n_48k = 0, }, ++}; + -+ while (bf_bits | pf_bits) { -+ struct kbase_as *as; -+ int as_no; -+ struct kbase_context *kctx; + static const u16 csc_coeff_default[3][4] = { + { 0x2000, 0x0000, 0x0000, 0x0000 }, + { 0x0000, 0x2000, 0x0000, 0x0000 }, +@@ -98,12 +163,47 @@ static const u16 csc_coeff_rgb_full_to_rgb_limited[3][4] = { + { 0x0000, 0x0000, 0x1b7c, 0x0020 } + }; + ++static const struct drm_display_mode dw_hdmi_default_modes[] = { ++ /* 4 - 1280x720@60Hz 16:9 */ ++ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1390, ++ 1430, 1650, 0, 720, 725, 730, 750, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), ++ .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, ++ /* 16 - 1920x1080@60Hz 16:9 */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008, ++ 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), ++ .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, ++ /* 31 - 1920x1080@50Hz 16:9 */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2448, ++ 2492, 2640, 0, 1080, 1084, 1089, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), ++ .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, ++ /* 19 - 1280x720@50Hz 16:9 */ ++ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1720, ++ 1760, 1980, 0, 720, 725, 730, 750, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), ++ .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, ++ /* 17 - 720x576@50Hz 4:3 */ ++ { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 27000, 720, 732, ++ 796, 864, 0, 576, 581, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC), ++ .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, }, ++ /* 2 - 720x480@60Hz 4:3 */ ++ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 27000, 720, 736, ++ 798, 858, 0, 480, 489, 495, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC), ++ .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, }, ++}; + -+ /* -+ * the while logic ensures we have a bit set, no need to check -+ * for not-found here -+ */ -+ as_no = ffs(bf_bits | pf_bits) - 1; -+ as = &kbdev->as[as_no]; + struct hdmi_vmode { + bool mdataenablepolarity; + ++ unsigned int previous_pixelclock; + unsigned int mpixelclock; + unsigned int mpixelrepetitioninput; + unsigned int mpixelrepetitionoutput; ++ unsigned int previous_tmdsclock; + unsigned int mtmdsclock; + }; + +@@ -112,8 +212,8 @@ struct hdmi_data_info { + unsigned int enc_out_bus_format; + unsigned int enc_in_encoding; + unsigned int enc_out_encoding; ++ unsigned int quant_range; + unsigned int pix_repet_factor; +- unsigned int hdcp_enable; + struct hdmi_vmode video_mode; + bool rgb_limited_range; + }; +@@ -128,6 +228,9 @@ struct dw_hdmi_i2c { + u8 slave_reg; + bool is_regaddr; + bool is_segment; + -+ /* -+ * Refcount the kctx ASAP - it shouldn't disappear anyway, since -+ * Bus/Page faults _should_ only occur whilst jobs are running, -+ * and a job causing the Bus/Page fault shouldn't complete until -+ * the MMU is updated -+ */ -+ kctx = kbasep_js_runpool_lookup_ctx(kbdev, as_no); -+ if (!kctx) { -+ E("fail to lookup ctx, to break out."); -+ break; -+ } ++ unsigned int scl_high_ns; ++ unsigned int scl_low_ns; + }; + + struct dw_hdmi_phy_data { +@@ -143,6 +246,8 @@ struct dw_hdmi_phy_data { + struct dw_hdmi { + struct drm_connector connector; + struct drm_bridge bridge; ++ struct drm_bridge *next_bridge; ++ struct platform_device *hdcp_dev; + + unsigned int version; + +@@ -156,8 +261,11 @@ struct dw_hdmi { + + struct hdmi_data_info hdmi_data; + const struct dw_hdmi_plat_data *plat_data; ++ const struct dw_hdmi_cec_wake_ops *cec_ops; ++ struct dw_hdcp *hdcp; + + int vic; ++ int irq; + + u8 edid[HDMI_EDID_LEN]; + +@@ -174,6 +282,13 @@ struct dw_hdmi { + void __iomem *regs; + bool sink_is_hdmi; + bool sink_has_audio; ++ bool hpd_state; ++ bool support_hdmi; ++ bool force_logo; ++ int force_output; + ++ struct delayed_work work; ++ struct workqueue_struct *workqueue; + + struct pinctrl *pinctrl; + struct pinctrl_state *default_state; +@@ -190,10 +305,14 @@ struct dw_hdmi { + + spinlock_t audio_lock; + struct mutex audio_mutex; ++ struct dentry *debugfs_dir; + unsigned int sample_rate; + unsigned int audio_cts; + unsigned int audio_n; + bool audio_enable; ++ bool scramble_low_rates; + -+ /* find faulting address */ -+ as->fault_addr = kbase_reg_read(kbdev, -+ MMU_AS_REG(as_no, -+ AS_FAULTADDRESS_HI), -+ kctx); -+ as->fault_addr <<= 32; -+ as->fault_addr |= kbase_reg_read(kbdev, -+ MMU_AS_REG(as_no, -+ AS_FAULTADDRESS_LO), -+ kctx); ++ struct extcon_dev *extcon; + + unsigned int reg_shift; + struct regmap *regm; +@@ -202,10 +321,15 @@ struct dw_hdmi { + + struct mutex cec_notifier_mutex; + struct cec_notifier *cec_notifier; ++ struct cec_adapter *cec_adap; + + hdmi_codec_plugged_cb plugged_cb; + struct device *codec_dev; + enum drm_connector_status last_connector_result; ++ bool initialized; /* hdmi is enabled before bind */ ++ bool logo_plug_out; /* hdmi is plug out when kernel logo */ ++ bool update; ++ bool hdr2sdr; /* from hdr to sdr */ + }; + + #define HDMI_IH_PHY_STAT0_RX_SENSE \ +@@ -263,6 +387,129 @@ static void hdmi_mask_writeb(struct dw_hdmi *hdmi, u8 data, unsigned int reg, + hdmi_modb(hdmi, data << shift, mask, reg); + } + ++static bool dw_hdmi_check_output_type_changed(struct dw_hdmi *hdmi) ++{ ++ bool sink_hdmi; + -+ /* Mark the fault protected or not */ -+ as->protected_mode = kbdev->protected_mode; ++ sink_hdmi = hdmi->sink_is_hdmi; + -+ if (kbdev->protected_mode && as->fault_addr) -+ { -+ /* check if address reporting is allowed */ -+ validate_protected_page_fault(kbdev, kctx); -+ } ++ if (hdmi->force_output == 1) ++ hdmi->sink_is_hdmi = true; ++ else if (hdmi->force_output == 2) ++ hdmi->sink_is_hdmi = false; ++ else ++ hdmi->sink_is_hdmi = hdmi->support_hdmi; + -+ /* report the fault to debugfs */ -+ kbase_as_fault_debugfs_new(kbdev, as_no); ++ if (sink_hdmi != hdmi->sink_is_hdmi) ++ return true; + -+ /* record the fault status */ -+ as->fault_status = kbase_reg_read(kbdev, -+ MMU_AS_REG(as_no, -+ AS_FAULTSTATUS), -+ kctx); ++ return false; ++} + -+ /* find the fault type */ -+ as->fault_type = (bf_bits & (1 << as_no)) ? -+ KBASE_MMU_FAULT_TYPE_BUS : -+ KBASE_MMU_FAULT_TYPE_PAGE; ++static void repo_hpd_event(struct work_struct *p_work) ++{ ++ struct dw_hdmi *hdmi = container_of(p_work, struct dw_hdmi, work.work); ++ enum drm_connector_status status = hdmi->hpd_state ? ++ connector_status_connected : connector_status_disconnected; ++ u8 phy_stat = hdmi_readb(hdmi, HDMI_PHY_STAT0); + -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) { -+ as->fault_extra_addr = kbase_reg_read(kbdev, -+ MMU_AS_REG(as_no, AS_FAULTEXTRA_HI), -+ kctx); -+ as->fault_extra_addr <<= 32; -+ as->fault_extra_addr |= kbase_reg_read(kbdev, -+ MMU_AS_REG(as_no, AS_FAULTEXTRA_LO), -+ kctx); -+ } ++ mutex_lock(&hdmi->mutex); ++ if (!(phy_stat & HDMI_PHY_RX_SENSE)) ++ hdmi->rxsense = false; ++ if (phy_stat & HDMI_PHY_HPD) ++ hdmi->rxsense = true; ++ mutex_unlock(&hdmi->mutex); + -+ if (kbase_as_has_bus_fault(as)) { -+ /* Mark bus fault as handled. -+ * Note that a bus fault is processed first in case -+ * where both a bus fault and page fault occur. -+ */ -+ bf_bits &= ~(1UL << as_no); ++ if (hdmi->bridge.dev) { ++ bool change; ++ void *data = hdmi->plat_data->phy_data; + -+ /* remove the queued BF (and PF) from the mask */ -+ new_mask &= ~(MMU_BUS_ERROR(as_no) | -+ MMU_PAGE_FAULT(as_no)); -+ } else { -+ /* Mark page fault as handled */ -+ pf_bits &= ~(1UL << as_no); ++ change = drm_helper_hpd_irq_event(hdmi->bridge.dev); + -+ /* remove the queued PF from the mask */ -+ new_mask &= ~MMU_PAGE_FAULT(as_no); ++ if (change) { ++ if (hdmi->plat_data->set_ddc_io) ++ hdmi->plat_data->set_ddc_io(data, hdmi->hpd_state); ++ if (hdmi->cec_adap->devnode.registered) ++ cec_queue_pin_hpd_event(hdmi->cec_adap, ++ hdmi->hpd_state, ++ ktime_get()); + } -+ -+ /* Process the interrupt for this address space */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbase_mmu_interrupt_process(kbdev, kctx, as); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ drm_bridge_hpd_notify(&hdmi->bridge, status); + } -+ -+ /* reenable interrupts */ -+ spin_lock_irqsave(&kbdev->mmu_mask_change, flags); -+ tmp = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_MASK), NULL); -+ new_mask |= tmp; -+ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_MASK), new_mask, NULL); -+ spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); +} + -+void kbase_mmu_hw_configure(struct kbase_device *kbdev, struct kbase_as *as, -+ struct kbase_context *kctx) ++static bool check_hdmi_irq(struct dw_hdmi *hdmi, int intr_stat, ++ int phy_int_pol) +{ -+ struct kbase_mmu_setup *current_setup = &as->current_setup; -+ u32 transcfg = 0; -+ -+ if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_AARCH64_MMU)) { -+ transcfg = current_setup->transcfg & 0xFFFFFFFFUL; -+ -+ /* Set flag AS_TRANSCFG_PTW_MEMATTR_WRITE_BACK */ -+ /* Clear PTW_MEMATTR bits */ -+ transcfg &= ~AS_TRANSCFG_PTW_MEMATTR_MASK; -+ /* Enable correct PTW_MEMATTR bits */ -+ transcfg |= AS_TRANSCFG_PTW_MEMATTR_WRITE_BACK; ++ int msecs; + -+ if (kbdev->system_coherency == COHERENCY_ACE) { -+ /* Set flag AS_TRANSCFG_PTW_SH_OS (outer shareable) */ -+ /* Clear PTW_SH bits */ -+ transcfg = (transcfg & ~AS_TRANSCFG_PTW_SH_MASK); -+ /* Enable correct PTW_SH bits */ -+ transcfg = (transcfg | AS_TRANSCFG_PTW_SH_OS); -+ } ++ /* To determine whether interrupt type is HPD */ ++ if (!(intr_stat & HDMI_IH_PHY_STAT0_HPD)) ++ return false; + -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSCFG_LO), -+ transcfg, kctx); -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSCFG_HI), -+ (current_setup->transcfg >> 32) & 0xFFFFFFFFUL, -+ kctx); ++ if (phy_int_pol & HDMI_PHY_HPD) { ++ dev_dbg(hdmi->dev, "dw hdmi plug in\n"); ++ msecs = 150; ++ hdmi->hpd_state = true; + } else { -+ if (kbdev->system_coherency == COHERENCY_ACE) -+ current_setup->transtab |= AS_TRANSTAB_LPAE_SHARE_OUTER; ++ dev_dbg(hdmi->dev, "dw hdmi plug out\n"); ++ msecs = 20; ++ hdmi->hpd_state = false; + } ++ mod_delayed_work(hdmi->workqueue, &hdmi->work, msecs_to_jiffies(msecs)); + -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSTAB_LO), -+ current_setup->transtab & 0xFFFFFFFFUL, kctx); -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_TRANSTAB_HI), -+ (current_setup->transtab >> 32) & 0xFFFFFFFFUL, kctx); -+ -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_MEMATTR_LO), -+ current_setup->memattr & 0xFFFFFFFFUL, kctx); -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_MEMATTR_HI), -+ (current_setup->memattr >> 32) & 0xFFFFFFFFUL, kctx); -+ -+ KBASE_TLSTREAM_TL_ATTRIB_AS_CONFIG(as, -+ current_setup->transtab, -+ current_setup->memattr, -+ transcfg); ++ return true; ++} + -+ write_cmd(kbdev, as->number, AS_COMMAND_UPDATE, kctx); ++static void init_hpd_work(struct dw_hdmi *hdmi) ++{ ++ hdmi->workqueue = create_workqueue("hpd_queue"); ++ INIT_DELAYED_WORK(&hdmi->work, repo_hpd_event); +} + -+int kbase_mmu_hw_do_operation(struct kbase_device *kbdev, struct kbase_as *as, -+ struct kbase_context *kctx, u64 vpfn, u32 nr, u32 op, -+ unsigned int handling_irq) ++static void dw_hdmi_i2c_set_divs(struct dw_hdmi *hdmi) +{ -+ int ret; ++ unsigned long clk_rate_khz; ++ unsigned long low_ns, high_ns; ++ unsigned long div_low, div_high; + -+ lockdep_assert_held(&kbdev->mmu_hw_mutex); ++ /* Standard-mode */ ++ if (hdmi->i2c->scl_high_ns < 4000) ++ high_ns = 4708; ++ else ++ high_ns = hdmi->i2c->scl_high_ns; + -+ if (op == AS_COMMAND_UNLOCK) { -+ /* Unlock doesn't require a lock first */ -+ ret = write_cmd(kbdev, as->number, AS_COMMAND_UNLOCK, kctx); -+ } else { -+ u64 lock_addr = lock_region(kbdev, vpfn, nr); ++ if (hdmi->i2c->scl_low_ns < 4700) ++ low_ns = 4916; ++ else ++ low_ns = hdmi->i2c->scl_low_ns; + -+ /* Lock the region that needs to be updated */ -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_LOCKADDR_LO), -+ lock_addr & 0xFFFFFFFFUL, kctx); -+ kbase_reg_write(kbdev, MMU_AS_REG(as->number, AS_LOCKADDR_HI), -+ (lock_addr >> 32) & 0xFFFFFFFFUL, kctx); -+ write_cmd(kbdev, as->number, AS_COMMAND_LOCK, kctx); ++ /* Adjust to avoid overflow */ ++ clk_rate_khz = DIV_ROUND_UP(clk_get_rate(hdmi->isfr_clk), 1000); + -+ /* Run the MMU operation */ -+ write_cmd(kbdev, as->number, op, kctx); ++ div_low = (clk_rate_khz * low_ns) / 1000000; ++ if ((clk_rate_khz * low_ns) % 1000000) ++ div_low++; + -+ /* Wait for the flush to complete */ -+ ret = wait_ready(kbdev, as->number, kctx); ++ div_high = (clk_rate_khz * high_ns) / 1000000; ++ if ((clk_rate_khz * high_ns) % 1000000) ++ div_high++; + -+ if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_9630)) { -+ /* Issue an UNLOCK command to ensure that valid page -+ tables are re-read by the GPU after an update. -+ Note that, the FLUSH command should perform all the -+ actions necessary, however the bus logs show that if -+ multiple page faults occur within an 8 page region -+ the MMU does not always re-read the updated page -+ table entries for later faults or is only partially -+ read, it subsequently raises the page fault IRQ for -+ the same addresses, the unlock ensures that the MMU -+ cache is flushed, so updates can be re-read. As the -+ region is now unlocked we need to issue 2 UNLOCK -+ commands in order to flush the MMU/uTLB, -+ see PRLAM-8812. -+ */ -+ write_cmd(kbdev, as->number, AS_COMMAND_UNLOCK, kctx); -+ write_cmd(kbdev, as->number, AS_COMMAND_UNLOCK, kctx); -+ } -+ } ++ /* Maximum divider supported by hw is 0xffff */ ++ if (div_low > 0xffff) ++ div_low = 0xffff; + -+ return ret; ++ if (div_high > 0xffff) ++ div_high = 0xffff; ++ ++ hdmi_writeb(hdmi, div_high & 0xff, HDMI_I2CM_SS_SCL_HCNT_0_ADDR); ++ hdmi_writeb(hdmi, (div_high >> 8) & 0xff, ++ HDMI_I2CM_SS_SCL_HCNT_1_ADDR); ++ hdmi_writeb(hdmi, div_low & 0xff, HDMI_I2CM_SS_SCL_LCNT_0_ADDR); ++ hdmi_writeb(hdmi, (div_low >> 8) & 0xff, ++ HDMI_I2CM_SS_SCL_LCNT_1_ADDR); +} + -+void kbase_mmu_hw_clear_fault(struct kbase_device *kbdev, struct kbase_as *as, -+ struct kbase_context *kctx, enum kbase_mmu_fault_type type) -+{ -+ unsigned long flags; -+ u32 pf_bf_mask; + static void dw_hdmi_i2c_init(struct dw_hdmi *hdmi) + { + hdmi_writeb(hdmi, HDMI_PHY_I2CM_INT_ADDR_DONE_POL, +@@ -276,7 +523,8 @@ static void dw_hdmi_i2c_init(struct dw_hdmi *hdmi) + hdmi_writeb(hdmi, 0x00, HDMI_I2CM_SOFTRSTZ); + + /* Set Standard Mode speed (determined to be 100KHz on iMX6) */ +- hdmi_writeb(hdmi, 0x00, HDMI_I2CM_DIV); ++ hdmi_modb(hdmi, HDMI_I2CM_DIV_STD_MODE, ++ HDMI_I2CM_DIV_FAST_STD_MODE, HDMI_I2CM_DIV); + + /* Set done, not acknowledged and arbitration interrupt polarities */ + hdmi_writeb(hdmi, HDMI_I2CM_INT_DONE_POL, HDMI_I2CM_INT); +@@ -290,6 +538,13 @@ static void dw_hdmi_i2c_init(struct dw_hdmi *hdmi) + /* Mute DONE and ERROR interrupts */ + hdmi_writeb(hdmi, HDMI_IH_I2CM_STAT0_ERROR | HDMI_IH_I2CM_STAT0_DONE, + HDMI_IH_MUTE_I2CM_STAT0); + -+ spin_lock_irqsave(&kbdev->mmu_mask_change, flags); ++ /* Only configure when we use the internal I2C controller */ ++ if (hdmi->i2c) { ++ /* set SDA high level holding time */ ++ hdmi_writeb(hdmi, 0x48, HDMI_I2CM_SDA_HOLD); ++ dw_hdmi_i2c_set_divs(hdmi); ++ } + } + + static bool dw_hdmi_i2c_unwedge(struct dw_hdmi *hdmi) +@@ -367,7 +622,8 @@ static int dw_hdmi_i2c_read(struct dw_hdmi *hdmi, + unsigned char *buf, unsigned int length) + { + struct dw_hdmi_i2c *i2c = hdmi->i2c; +- int ret; ++ int ret, retry, i; ++ bool read_edid = false; + + if (!i2c->is_regaddr) { + dev_dbg(hdmi->dev, "set read register address to 0\n"); +@@ -375,23 +631,76 @@ static int dw_hdmi_i2c_read(struct dw_hdmi *hdmi, + i2c->is_regaddr = true; + } + +- while (length--) { +- reinit_completion(&i2c->cmp); ++ /* edid reads are in 128 bytes. scdc reads are in 1 byte */ ++ if (length == HDMI_EDID_BLOCK_LEN) ++ read_edid = true; + +- hdmi_writeb(hdmi, i2c->slave_reg++, HDMI_I2CM_ADDRESS); +- if (i2c->is_segment) +- hdmi_writeb(hdmi, HDMI_I2CM_OPERATION_READ_EXT, +- HDMI_I2CM_OPERATION); +- else +- hdmi_writeb(hdmi, HDMI_I2CM_OPERATION_READ, +- HDMI_I2CM_OPERATION); ++ while (length > 0) { ++ retry = 100; ++ hdmi_writeb(hdmi, i2c->slave_reg, HDMI_I2CM_ADDRESS); + +- ret = dw_hdmi_i2c_wait(hdmi); +- if (ret) +- return ret; ++ if (read_edid) { ++ i2c->slave_reg += 8; ++ length -= 8; ++ } else { ++ i2c->slave_reg++; ++ length--; ++ } + -+ /* -+ * A reset is in-flight and we're flushing the IRQ + bottom half -+ * so don't update anything as it could race with the reset code. -+ */ -+ if (kbdev->irq_reset_flush) -+ goto unlock; ++ while (retry > 0) { ++ if (!(hdmi_readb(hdmi, HDMI_PHY_STAT0) & HDMI_PHY_HPD)) { ++ dev_dbg(hdmi->dev, "hdmi disconnect, stop ddc read\n"); ++ return -EPERM; ++ } + -+ /* Clear the page (and bus fault IRQ as well in case one occurred) */ -+ pf_bf_mask = MMU_PAGE_FAULT(as->number); -+ if (type == KBASE_MMU_FAULT_TYPE_BUS || -+ type == KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED) -+ pf_bf_mask |= MMU_BUS_ERROR(as->number); ++ if (i2c->is_segment) { ++ if (read_edid) ++ hdmi_writeb(hdmi, HDMI_I2CM_OPERATION_READ8_EXT, ++ HDMI_I2CM_OPERATION); ++ else ++ hdmi_writeb(hdmi, HDMI_I2CM_OPERATION_READ_EXT, ++ HDMI_I2CM_OPERATION); ++ } else { ++ if (read_edid) ++ hdmi_writeb(hdmi, HDMI_I2CM_OPERATION_READ8, ++ HDMI_I2CM_OPERATION); ++ else ++ hdmi_writeb(hdmi, HDMI_I2CM_OPERATION_READ, ++ HDMI_I2CM_OPERATION); ++ } + -+ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_CLEAR), pf_bf_mask, kctx); ++ ret = dw_hdmi_i2c_wait(hdmi); ++ if (ret == -EAGAIN) { ++ dev_dbg(hdmi->dev, "ddc read time out\n"); ++ hdmi_writeb(hdmi, 0, HDMI_I2CM_SOFTRSTZ); ++ hdmi_writeb(hdmi, HDMI_I2CM_OPERATION_BUS_CLEAR, ++ HDMI_I2CM_OPERATION); ++ retry -= 10; ++ continue; ++ } else if (ret == -EIO) { ++ dev_dbg(hdmi->dev, "ddc read err\n"); ++ hdmi_writeb(hdmi, 0, HDMI_I2CM_SOFTRSTZ); ++ hdmi_writeb(hdmi, HDMI_I2CM_OPERATION_BUS_CLEAR, ++ HDMI_I2CM_OPERATION); ++ retry--; ++ usleep_range(10000, 11000); ++ continue; ++ } ++ /* read success */ ++ break; ++ } ++ if (retry <= 0) { ++ dev_err(hdmi->dev, "ddc read failed\n"); ++ return -EIO; ++ } + +- *buf++ = hdmi_readb(hdmi, HDMI_I2CM_DATAI); ++ if (read_edid) ++ for (i = 0; i < 8; i++) ++ *buf++ = hdmi_readb(hdmi, HDMI_I2CM_READ_BUFF0 + i); ++ else ++ *buf++ = hdmi_readb(hdmi, HDMI_I2CM_DATAI); + } + -+unlock: -+ spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); -+} + i2c->is_segment = false; + + return 0; +@@ -401,7 +710,7 @@ static int dw_hdmi_i2c_write(struct dw_hdmi *hdmi, + unsigned char *buf, unsigned int length) + { + struct dw_hdmi_i2c *i2c = hdmi->i2c; +- int ret; ++ int ret, retry; + + if (!i2c->is_regaddr) { + /* Use the first write byte as register address */ +@@ -412,16 +721,47 @@ static int dw_hdmi_i2c_write(struct dw_hdmi *hdmi, + } + + while (length--) { +- reinit_completion(&i2c->cmp); ++ retry = 100; + + hdmi_writeb(hdmi, *buf++, HDMI_I2CM_DATAO); + hdmi_writeb(hdmi, i2c->slave_reg++, HDMI_I2CM_ADDRESS); +- hdmi_writeb(hdmi, HDMI_I2CM_OPERATION_WRITE, +- HDMI_I2CM_OPERATION); + +- ret = dw_hdmi_i2c_wait(hdmi); +- if (ret) +- return ret; ++ while (retry > 0) { ++ if (!(hdmi_readb(hdmi, HDMI_PHY_STAT0) & HDMI_PHY_HPD)) { ++ dev_dbg(hdmi->dev, "hdmi disconnect, stop ddc write\n"); ++ return -EPERM; ++ } + -+void kbase_mmu_hw_enable_fault(struct kbase_device *kbdev, struct kbase_as *as, -+ struct kbase_context *kctx, enum kbase_mmu_fault_type type) -+{ -+ unsigned long flags; -+ u32 irq_mask; ++ reinit_completion(&i2c->cmp); ++ hdmi_writeb(hdmi, HDMI_I2CM_OPERATION_WRITE, ++ HDMI_I2CM_OPERATION); + -+ /* Enable the page fault IRQ (and bus fault IRQ as well in case one -+ * occurred) */ -+ spin_lock_irqsave(&kbdev->mmu_mask_change, flags); ++ ret = dw_hdmi_i2c_wait(hdmi); ++ if (ret == -EAGAIN) { ++ dev_dbg(hdmi->dev, "ddc write time out\n"); ++ hdmi_writeb(hdmi, 0, HDMI_I2CM_SOFTRSTZ); ++ hdmi_writeb(hdmi, HDMI_I2CM_OPERATION_BUS_CLEAR, ++ HDMI_I2CM_OPERATION); ++ retry -= 10; ++ continue; ++ } else if (ret == -EIO) { ++ dev_dbg(hdmi->dev, "ddc write err\n"); ++ hdmi_writeb(hdmi, 0, HDMI_I2CM_SOFTRSTZ); ++ hdmi_writeb(hdmi, HDMI_I2CM_OPERATION_BUS_CLEAR, ++ HDMI_I2CM_OPERATION); ++ retry--; ++ usleep_range(10000, 11000); ++ continue; ++ } + -+ /* -+ * A reset is in-flight and we're flushing the IRQ + bottom half -+ * so don't update anything as it could race with the reset code. -+ */ -+ if (kbdev->irq_reset_flush) -+ goto unlock; ++ /* write success */ ++ break; ++ } + -+ irq_mask = kbase_reg_read(kbdev, MMU_REG(MMU_IRQ_MASK), kctx) | -+ MMU_PAGE_FAULT(as->number); ++ if (retry <= 0) { ++ dev_err(hdmi->dev, "ddc write failed\n"); ++ return -EIO; ++ } + } + + return 0; +@@ -457,10 +797,15 @@ static int dw_hdmi_i2c_xfer(struct i2c_adapter *adap, + + mutex_lock(&i2c->lock); + ++ hdmi_writeb(hdmi, 0, HDMI_I2CM_SOFTRSTZ); ++ udelay(100); + -+ if (type == KBASE_MMU_FAULT_TYPE_BUS || -+ type == KBASE_MMU_FAULT_TYPE_BUS_UNEXPECTED) -+ irq_mask |= MMU_BUS_ERROR(as->number); + /* Unmute DONE and ERROR interrupts */ + hdmi_writeb(hdmi, 0x00, HDMI_IH_MUTE_I2CM_STAT0); + + /* Set slave device address taken from the first I2C message */ ++ if (addr == DDC_SEGMENT_ADDR && msgs[0].len == 1) ++ addr = DDC_ADDR; + hdmi_writeb(hdmi, addr, HDMI_I2CM_SLAVE); + + /* Set slave device register address on transfer */ +@@ -570,60 +915,117 @@ static void hdmi_set_cts_n(struct dw_hdmi *hdmi, unsigned int cts, + hdmi_writeb(hdmi, n & 0xff, HDMI_AUD_N1); + } + +-static unsigned int hdmi_compute_n(unsigned int freq, unsigned long pixel_clk) ++static int hdmi_match_tmds_n_table(struct dw_hdmi *hdmi, ++ unsigned long pixel_clk, ++ unsigned long freq) + { +- unsigned int n = (128 * freq) / 1000; +- unsigned int mult = 1; ++ const struct dw_hdmi_plat_data *plat_data = hdmi->plat_data; ++ const struct dw_hdmi_audio_tmds_n *tmds_n = NULL; ++ int i; + -+ kbase_reg_write(kbdev, MMU_REG(MMU_IRQ_MASK), irq_mask, kctx); ++ if (plat_data->tmds_n_table) { ++ for (i = 0; plat_data->tmds_n_table[i].tmds != 0; i++) { ++ if (pixel_clk == plat_data->tmds_n_table[i].tmds) { ++ tmds_n = &plat_data->tmds_n_table[i]; ++ break; ++ } ++ } ++ } + +- while (freq > 48000) { +- mult *= 2; +- freq /= 2; ++ if (tmds_n == NULL) { ++ for (i = 0; common_tmds_n_table[i].tmds != 0; i++) { ++ if (pixel_clk == common_tmds_n_table[i].tmds) { ++ tmds_n = &common_tmds_n_table[i]; ++ break; ++ } ++ } + } + ++ if (tmds_n == NULL) ++ return -ENOENT; + -+unlock: -+ spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); + switch (freq) { + case 32000: +- if (pixel_clk == 25175000) +- n = 4576; +- else if (pixel_clk == 27027000) +- n = 4096; +- else if (pixel_clk == 74176000 || pixel_clk == 148352000) +- n = 11648; +- else +- n = 4096; +- n *= mult; +- break; +- ++ return tmds_n->n_32k; + case 44100: +- if (pixel_clk == 25175000) +- n = 7007; +- else if (pixel_clk == 74176000) +- n = 17836; +- else if (pixel_clk == 148352000) +- n = 8918; +- else +- n = 6272; +- n *= mult; +- break; +- ++ case 88200: ++ case 176400: ++ return (freq / 44100) * tmds_n->n_44k1; + case 48000: +- if (pixel_clk == 25175000) +- n = 6864; +- else if (pixel_clk == 27027000) +- n = 6144; +- else if (pixel_clk == 74176000) +- n = 11648; +- else if (pixel_clk == 148352000) +- n = 5824; +- else +- n = 6144; +- n *= mult; +- break; +- ++ case 96000: ++ case 192000: ++ return (freq / 48000) * tmds_n->n_48k; + default: +- break; ++ return -ENOENT; ++ } +} -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h -new file mode 100755 -index 000000000000..c02253c6acc3 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h -@@ -0,0 +1,42 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ + ++static u64 hdmi_audio_math_diff(unsigned int freq, unsigned int n, ++ unsigned int pixel_clk) ++{ ++ u64 final, diff; ++ u64 cts; + ++ final = (u64)pixel_clk * n; + -+/* -+ * Interface file for the direct implementation for MMU hardware access -+ * -+ * Direct MMU hardware interface -+ * -+ * This module provides the interface(s) that are required by the direct -+ * register access implementation of the MMU hardware interface -+ */ ++ cts = final; ++ do_div(cts, 128 * freq); + -+#ifndef _MALI_KBASE_MMU_HW_DIRECT_H_ -+#define _MALI_KBASE_MMU_HW_DIRECT_H_ ++ diff = final - (u64)cts * (128 * freq); + -+#include ++ return diff; ++} + -+/** -+ * kbase_mmu_interrupt - Process an MMU interrupt. -+ * -+ * Process the MMU interrupt that was reported by the &kbase_device. -+ * -+ * @kbdev: kbase context to clear the fault from. -+ * @irq_stat: Value of the MMU_IRQ_STATUS register -+ */ -+void kbase_mmu_interrupt(struct kbase_device *kbdev, u32 irq_stat); ++static unsigned int hdmi_compute_n(struct dw_hdmi *hdmi, ++ unsigned long pixel_clk, ++ unsigned long freq) ++{ ++ unsigned int min_n = DIV_ROUND_UP((128 * freq), 1500); ++ unsigned int max_n = (128 * freq) / 300; ++ unsigned int ideal_n = (128 * freq) / 1000; ++ unsigned int best_n_distance = ideal_n; ++ unsigned int best_n = 0; ++ u64 best_diff = U64_MAX; ++ int n; + -+#endif /* _MALI_KBASE_MMU_HW_DIRECT_H_ */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c -new file mode 100755 -index 000000000000..0614348e935a ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c -@@ -0,0 +1,63 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ /* If the ideal N could satisfy the audio math, then just take it */ ++ if (hdmi_audio_math_diff(freq, ideal_n, pixel_clk) == 0) ++ return ideal_n; + ++ for (n = min_n; n <= max_n; n++) { ++ u64 diff = hdmi_audio_math_diff(freq, n, pixel_clk); + ++ if (diff < best_diff || (diff == best_diff && ++ abs(n - ideal_n) < best_n_distance)) { ++ best_n = n; ++ best_diff = diff; ++ best_n_distance = abs(best_n - ideal_n); ++ } + ++ /* ++ * The best N already satisfy the audio math, and also be ++ * the closest value to ideal N, so just cut the loop. ++ */ ++ if ((best_diff == 0) && (abs(n - ideal_n) > best_n_distance)) ++ break; + } + +- return n; ++ return best_n; ++} + ++static unsigned int hdmi_find_n(struct dw_hdmi *hdmi, unsigned long pixel_clk, ++ unsigned long sample_rate) ++{ ++ int n; + -+/* -+ * "Always on" power management policy -+ */ ++ n = hdmi_match_tmds_n_table(hdmi, pixel_clk, sample_rate); ++ if (n > 0) ++ return n; + -+#include -+#include ++ dev_warn(hdmi->dev, "Rate %lu missing; compute N dynamically\n", ++ pixel_clk); + -+static u64 always_on_get_core_mask(struct kbase_device *kbdev) ++ return hdmi_compute_n(hdmi, pixel_clk, sample_rate); + } + + /* +@@ -654,7 +1056,7 @@ static void hdmi_set_clk_regenerator(struct dw_hdmi *hdmi, + u8 config3; + u64 tmp; + +- n = hdmi_compute_n(sample_rate, pixel_clk); ++ n = hdmi_find_n(hdmi, pixel_clk, sample_rate); + + config3 = hdmi_readb(hdmi, HDMI_CONFIG3_ID); + +@@ -1013,6 +1415,15 @@ static bool is_csc_needed(struct dw_hdmi *hdmi) + is_color_space_interpolation(hdmi); + } + ++static bool is_rgb_full_to_limited_needed(struct dw_hdmi *hdmi) +{ -+ return kbdev->gpu_props.props.raw_props.shader_present; -+} ++ if (hdmi->hdmi_data.quant_range == HDMI_QUANTIZATION_RANGE_LIMITED || ++ (!hdmi->hdmi_data.quant_range && hdmi->hdmi_data.rgb_limited_range)) ++ return true; + -+static bool always_on_get_core_active(struct kbase_device *kbdev) -+{ -+ return true; ++ return false; +} + -+static void always_on_init(struct kbase_device *kbdev) + static void dw_hdmi_update_csc_coeffs(struct dw_hdmi *hdmi) + { + const u16 (*csc_coeff)[3][4] = &csc_coeff_default; +@@ -1035,7 +1446,7 @@ static void dw_hdmi_update_csc_coeffs(struct dw_hdmi *hdmi) + csc_coeff = &csc_coeff_rgb_in_eitu709; + csc_scale = 0; + } else if (is_input_rgb && is_output_rgb && +- hdmi->hdmi_data.rgb_limited_range) { ++ is_rgb_full_to_limited_needed(hdmi)) { + csc_coeff = &csc_coeff_rgb_full_to_rgb_limited; + } + +@@ -1067,7 +1478,7 @@ static void hdmi_video_csc(struct dw_hdmi *hdmi) + if (is_color_space_interpolation(hdmi)) + interpolation = HDMI_CSC_CFG_INTMODE_CHROMA_INT_FORMULA1; + else if (is_color_space_decimation(hdmi)) +- decimation = HDMI_CSC_CFG_DECMODE_CHROMA_INT_FORMULA3; ++ decimation = HDMI_CSC_CFG_DECMODE_CHROMA_INT_FORMULA1; + + switch (hdmi_bus_fmt_color_depth(hdmi->hdmi_data.enc_out_bus_format)) { + case 8: +@@ -1114,7 +1525,7 @@ static void hdmi_video_packetize(struct dw_hdmi *hdmi) + switch (hdmi_bus_fmt_color_depth( + hdmi->hdmi_data.enc_out_bus_format)) { + case 8: +- color_depth = 4; ++ color_depth = 0; + output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS; + break; + case 10: +@@ -1152,18 +1563,15 @@ static void hdmi_video_packetize(struct dw_hdmi *hdmi) + } + + /* set the packetizer registers */ +- val = ((color_depth << HDMI_VP_PR_CD_COLOR_DEPTH_OFFSET) & +- HDMI_VP_PR_CD_COLOR_DEPTH_MASK) | +- ((hdmi_data->pix_repet_factor << +- HDMI_VP_PR_CD_DESIRED_PR_FACTOR_OFFSET) & +- HDMI_VP_PR_CD_DESIRED_PR_FACTOR_MASK); ++ val = (color_depth << HDMI_VP_PR_CD_COLOR_DEPTH_OFFSET) & ++ HDMI_VP_PR_CD_COLOR_DEPTH_MASK; + hdmi_writeb(hdmi, val, HDMI_VP_PR_CD); + + hdmi_modb(hdmi, HDMI_VP_STUFF_PR_STUFFING_STUFFING_MODE, + HDMI_VP_STUFF_PR_STUFFING_MASK, HDMI_VP_STUFF); + + /* Data from pixel repeater block */ +- if (hdmi_data->pix_repet_factor > 1) { ++ if (hdmi_data->pix_repet_factor > 0) { + vp_conf = HDMI_VP_CONF_PR_EN_ENABLE | + HDMI_VP_CONF_BYPASS_SELECT_PIX_REPEATER; + } else { /* data from packetizer block */ +@@ -1175,9 +1583,7 @@ static void hdmi_video_packetize(struct dw_hdmi *hdmi) + HDMI_VP_CONF_PR_EN_MASK | + HDMI_VP_CONF_BYPASS_SELECT_MASK, HDMI_VP_CONF); + +- hdmi_modb(hdmi, 1 << HDMI_VP_STUFF_IDEFAULT_PHASE_OFFSET, +- HDMI_VP_STUFF_IDEFAULT_PHASE_MASK, HDMI_VP_STUFF); +- ++ hdmi_modb(hdmi, 0, HDMI_VP_STUFF_IDEFAULT_PHASE_MASK, HDMI_VP_STUFF); + hdmi_writeb(hdmi, remap_size, HDMI_VP_REMAP); + + if (output_select == HDMI_VP_CONF_OUTPUT_SELECTOR_PP) { +@@ -1277,6 +1683,23 @@ static bool dw_hdmi_support_scdc(struct dw_hdmi *hdmi, + return true; + } + ++static int hdmi_phy_i2c_read(struct dw_hdmi *hdmi, unsigned char addr) +{ -+ CSTD_UNUSED(kbdev); -+} ++ int val; + -+static void always_on_term(struct kbase_device *kbdev) -+{ -+ CSTD_UNUSED(kbdev); ++ hdmi_writeb(hdmi, 0xFF, HDMI_IH_I2CMPHY_STAT0); ++ hdmi_writeb(hdmi, addr, HDMI_PHY_I2CM_ADDRESS_ADDR); ++ hdmi_writeb(hdmi, 0, HDMI_PHY_I2CM_DATAI_1_ADDR); ++ hdmi_writeb(hdmi, 0, HDMI_PHY_I2CM_DATAI_0_ADDR); ++ hdmi_writeb(hdmi, HDMI_PHY_I2CM_OPERATION_ADDR_READ, ++ HDMI_PHY_I2CM_OPERATION_ADDR); ++ hdmi_phy_wait_i2c_done(hdmi, 1000); ++ val = hdmi_readb(hdmi, HDMI_PHY_I2CM_DATAI_1_ADDR); ++ val = (val & 0xff) << 8; ++ val += hdmi_readb(hdmi, HDMI_PHY_I2CM_DATAI_0_ADDR) & 0xff; ++ return val; +} + -+/* -+ * The struct kbase_pm_policy structure for the demand power policy. -+ * -+ * This is the static structure that defines the demand power policy's callback -+ * and name. -+ */ -+const struct kbase_pm_policy kbase_pm_always_on_policy_ops = { -+ "always_on", /* name */ -+ always_on_init, /* init */ -+ always_on_term, /* term */ -+ always_on_get_core_mask, /* get_core_mask */ -+ always_on_get_core_active, /* get_core_active */ -+ 0u, /* flags */ -+ KBASE_PM_POLICY_ID_ALWAYS_ON, /* id */ -+}; + /* + * HDMI2.0 Specifies the following procedure for High TMDS Bit Rates: + * - The Source shall suspend transmission of the TMDS clock and data +@@ -1454,6 +1877,13 @@ static int hdmi_phy_configure_dwc_hdmi_3d_tx(struct dw_hdmi *hdmi, + const struct dw_hdmi_mpll_config *mpll_config = pdata->mpll_cfg; + const struct dw_hdmi_curr_ctrl *curr_ctrl = pdata->cur_ctr; + const struct dw_hdmi_phy_config *phy_config = pdata->phy_config; ++ unsigned int tmdsclock = hdmi->hdmi_data.video_mode.mtmdsclock; ++ unsigned int depth = ++ hdmi_bus_fmt_color_depth(hdmi->hdmi_data.enc_out_bus_format); + -+KBASE_EXPORT_TEST_API(kbase_pm_always_on_policy_ops); -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h -new file mode 100755 -index 000000000000..f9d244b01bc2 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h -@@ -0,0 +1,77 @@ ++ if (hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_out_bus_format) && ++ pdata->mpll_cfg_420) ++ mpll_config = pdata->mpll_cfg_420; + + /* TOFIX Will need 420 specific PHY configuration tables */ + +@@ -1463,11 +1893,11 @@ static int hdmi_phy_configure_dwc_hdmi_3d_tx(struct dw_hdmi *hdmi, + break; + + for (; curr_ctrl->mpixelclock != ~0UL; curr_ctrl++) +- if (mpixelclock <= curr_ctrl->mpixelclock) ++ if (tmdsclock <= curr_ctrl->mpixelclock) + break; + + for (; phy_config->mpixelclock != ~0UL; phy_config++) +- if (mpixelclock <= phy_config->mpixelclock) ++ if (tmdsclock <= phy_config->mpixelclock) + break; + + if (mpll_config->mpixelclock == ~0UL || +@@ -1475,11 +1905,18 @@ static int hdmi_phy_configure_dwc_hdmi_3d_tx(struct dw_hdmi *hdmi, + phy_config->mpixelclock == ~0UL) + return -EINVAL; + +- dw_hdmi_phy_i2c_write(hdmi, mpll_config->res[0].cpce, ++ if (!hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) ++ depth = fls(depth - 8); ++ else ++ depth = 0; ++ if (depth) ++ depth--; + -+/* -+ * -+ * (C) COPYRIGHT 2011-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ dw_hdmi_phy_i2c_write(hdmi, mpll_config->res[depth].cpce, + HDMI_3D_TX_PHY_CPCE_CTRL); +- dw_hdmi_phy_i2c_write(hdmi, mpll_config->res[0].gmp, ++ dw_hdmi_phy_i2c_write(hdmi, mpll_config->res[depth].gmp, + HDMI_3D_TX_PHY_GMPCTRL); +- dw_hdmi_phy_i2c_write(hdmi, curr_ctrl->curr[0], ++ dw_hdmi_phy_i2c_write(hdmi, curr_ctrl->curr[depth], + HDMI_3D_TX_PHY_CURRCTRL); + + dw_hdmi_phy_i2c_write(hdmi, 0, HDMI_3D_TX_PHY_PLLPHBYCTRL); +@@ -1492,10 +1929,6 @@ static int hdmi_phy_configure_dwc_hdmi_3d_tx(struct dw_hdmi *hdmi, + dw_hdmi_phy_i2c_write(hdmi, phy_config->vlev_ctr, + HDMI_3D_TX_PHY_VLEVCTRL); + +- /* Override and disable clock termination. */ +- dw_hdmi_phy_i2c_write(hdmi, HDMI_3D_TX_PHY_CKCALCTRL_OVERRIDE, +- HDMI_3D_TX_PHY_CKCALCTRL); +- + return 0; + } + +@@ -1597,14 +2030,16 @@ void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi, void *data) + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, + HDMI_IH_PHY_STAT0); + +- /* Enable cable hot plug irq. */ +- hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); ++ if (!hdmi->next_bridge) { ++ /* Enable cable hot plug irq. */ ++ hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); + +- /* Clear and unmute interrupts. */ +- hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, +- HDMI_IH_PHY_STAT0); +- hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), +- HDMI_IH_MUTE_PHY_STAT0); ++ /* Clear and unmute interrupts. */ ++ hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, ++ HDMI_IH_PHY_STAT0); ++ hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), ++ HDMI_IH_MUTE_PHY_STAT0); ++ } + } + EXPORT_SYMBOL_GPL(dw_hdmi_phy_setup_hpd); + +@@ -1620,23 +2055,36 @@ static const struct dw_hdmi_phy_ops dw_hdmi_synopsys_phy_ops = { + * HDMI TX Setup + */ + +-static void hdmi_tx_hdcp_config(struct dw_hdmi *hdmi) ++static void hdmi_tx_hdcp_config(struct dw_hdmi *hdmi, ++ const struct drm_display_mode *mode) + { +- u8 de; +- +- if (hdmi->hdmi_data.video_mode.mdataenablepolarity) +- de = HDMI_A_VIDPOLCFG_DATAENPOL_ACTIVE_HIGH; +- else +- de = HDMI_A_VIDPOLCFG_DATAENPOL_ACTIVE_LOW; +- +- /* disable rx detect */ +- hdmi_modb(hdmi, HDMI_A_HDCPCFG0_RXDETECT_DISABLE, +- HDMI_A_HDCPCFG0_RXDETECT_MASK, HDMI_A_HDCPCFG0); +- +- hdmi_modb(hdmi, de, HDMI_A_VIDPOLCFG_DATAENPOL_MASK, HDMI_A_VIDPOLCFG); +- +- hdmi_modb(hdmi, HDMI_A_HDCPCFG1_ENCRYPTIONDISABLE_DISABLE, +- HDMI_A_HDCPCFG1_ENCRYPTIONDISABLE_MASK, HDMI_A_HDCPCFG1); ++ struct hdmi_vmode *vmode = &hdmi->hdmi_data.video_mode; ++ u8 vsync_pol, hsync_pol, data_pol, hdmi_dvi; + ++ /* Configure the video polarity */ ++ vsync_pol = mode->flags & DRM_MODE_FLAG_PVSYNC ? ++ HDMI_A_VIDPOLCFG_VSYNCPOL_ACTIVE_HIGH : ++ HDMI_A_VIDPOLCFG_VSYNCPOL_ACTIVE_LOW; ++ hsync_pol = mode->flags & DRM_MODE_FLAG_PHSYNC ? ++ HDMI_A_VIDPOLCFG_HSYNCPOL_ACTIVE_HIGH : ++ HDMI_A_VIDPOLCFG_HSYNCPOL_ACTIVE_LOW; ++ data_pol = vmode->mdataenablepolarity ? ++ HDMI_A_VIDPOLCFG_DATAENPOL_ACTIVE_HIGH : ++ HDMI_A_VIDPOLCFG_DATAENPOL_ACTIVE_LOW; ++ hdmi_modb(hdmi, vsync_pol | hsync_pol | data_pol, ++ HDMI_A_VIDPOLCFG_VSYNCPOL_MASK | ++ HDMI_A_VIDPOLCFG_HSYNCPOL_MASK | ++ HDMI_A_VIDPOLCFG_DATAENPOL_MASK, ++ HDMI_A_VIDPOLCFG); + ++ /* Config the display mode */ ++ hdmi_dvi = hdmi->sink_is_hdmi ? HDMI_A_HDCPCFG0_HDMIDVI_HDMI : ++ HDMI_A_HDCPCFG0_HDMIDVI_DVI; ++ hdmi_modb(hdmi, hdmi_dvi, HDMI_A_HDCPCFG0_HDMIDVI_MASK, ++ HDMI_A_HDCPCFG0); + ++ if (hdmi->hdcp && hdmi->hdcp->hdcp_start) ++ hdmi->hdcp->hdcp_start(hdmi->hdcp); + } + + static void hdmi_config_AVI(struct dw_hdmi *hdmi, +@@ -1645,15 +2093,24 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, + { + struct hdmi_avi_infoframe frame; + u8 val; ++ bool is_hdmi2; ++ const struct drm_display_info *info = &connector->display_info; + ++ is_hdmi2 = info->hdmi.scdc.supported || (info->color_formats & DRM_COLOR_FORMAT_YCRCB420); + + /* Initialise info frame from DRM mode */ + drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode); + + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) { +- drm_hdmi_avi_infoframe_quant_range(&frame, connector, mode, +- hdmi->hdmi_data.rgb_limited_range ? +- HDMI_QUANTIZATION_RANGE_LIMITED : +- HDMI_QUANTIZATION_RANGE_FULL); ++ /* default range */ ++ if (!hdmi->hdmi_data.quant_range) ++ drm_hdmi_avi_infoframe_quant_range(&frame, connector, mode, ++ hdmi->hdmi_data.rgb_limited_range ? ++ HDMI_QUANTIZATION_RANGE_LIMITED : ++ HDMI_QUANTIZATION_RANGE_FULL); ++ else ++ drm_hdmi_avi_infoframe_quant_range(&frame, connector, mode, ++ hdmi->hdmi_data.quant_range); + } else { + frame.quantization_range = HDMI_QUANTIZATION_RANGE_DEFAULT; + frame.ycc_quantization_range = +@@ -1688,16 +2145,36 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, + frame.extended_colorimetry = + HDMI_EXTENDED_COLORIMETRY_XV_YCC_709; + break; ++ case V4L2_YCBCR_ENC_BT2020: ++ if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_BT2020) ++ frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; ++ else ++ frame.colorimetry = HDMI_COLORIMETRY_ITU_709; ++ frame.extended_colorimetry = ++ HDMI_EXTENDED_COLORIMETRY_BT2020; ++ break; + default: /* Carries no data */ + frame.colorimetry = HDMI_COLORIMETRY_ITU_601; + frame.extended_colorimetry = + HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; + break; + } ++ frame.ycc_quantization_range = HDMI_YCC_QUANTIZATION_RANGE_LIMITED; + } else { +- frame.colorimetry = HDMI_COLORIMETRY_NONE; +- frame.extended_colorimetry = +- HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; ++ if (hdmi->hdmi_data.enc_out_encoding == V4L2_YCBCR_ENC_BT2020) { ++ frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; ++ frame.extended_colorimetry = ++ HDMI_EXTENDED_COLORIMETRY_BT2020; ++ } else { ++ frame.colorimetry = HDMI_COLORIMETRY_NONE; ++ frame.extended_colorimetry = ++ HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; ++ } + -+/* -+ * "Always on" power management policy -+ */ ++ if (is_hdmi2 && frame.quantization_range == HDMI_QUANTIZATION_RANGE_FULL) ++ frame.ycc_quantization_range = HDMI_YCC_QUANTIZATION_RANGE_FULL; ++ else ++ frame.ycc_quantization_range = HDMI_YCC_QUANTIZATION_RANGE_LIMITED; + } + + /* +@@ -1735,7 +2212,11 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, + hdmi_writeb(hdmi, val, HDMI_FC_AVICONF2); + + /* AVI data byte 4 differences: none */ +- val = frame.video_code & 0x7f; ++ if (hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_out_bus_format) || ++ hdmi->connector.display_info.hdmi.scdc.supported) ++ val = hdmi->vic; ++ else ++ val = frame.video_code & 0x7f; + hdmi_writeb(hdmi, val, HDMI_FC_AVIVID); + + /* AVI Data Byte 5- set up input and output pixel repetition */ +@@ -1774,7 +2255,16 @@ static void hdmi_config_vendor_specific_infoframe(struct dw_hdmi *hdmi, + u8 buffer[10]; + ssize_t err; + +- err = drm_hdmi_vendor_infoframe_from_display_mode(&frame, connector, ++ /* if sink support hdmi2.0, don't send vsi */ ++ if (hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_out_bus_format) || ++ hdmi->connector.display_info.hdmi.scdc.supported) { ++ hdmi_mask_writeb(hdmi, 0, HDMI_FC_DATAUTO0, HDMI_FC_DATAUTO0_VSD_OFFSET, ++ HDMI_FC_DATAUTO0_VSD_MASK); ++ return; ++ } + -+#ifndef MALI_KBASE_PM_ALWAYS_ON_H -+#define MALI_KBASE_PM_ALWAYS_ON_H ++ err = drm_hdmi_vendor_infoframe_from_display_mode(&frame, ++ &hdmi->connector, + mode); + if (err < 0) + /* +@@ -1824,17 +2314,44 @@ static void hdmi_config_drm_infoframe(struct dw_hdmi *hdmi, + const struct drm_connector *connector) + { + const struct drm_connector_state *conn_state = connector->state; ++ struct hdr_output_metadata *hdr_metadata; + struct hdmi_drm_infoframe frame; + u8 buffer[30]; + ssize_t err; + int i; + ++ /* Dynamic Range and Mastering Infoframe is introduced in v2.11a. */ ++ if (hdmi->version < 0x211a) { ++ dev_dbg(hdmi->dev, "Not support DRM Infoframe\n"); ++ return; ++ } + -+/** -+ * DOC: -+ * The "Always on" power management policy has the following -+ * characteristics: -+ * -+ * - When KBase indicates that the GPU will be powered up, but we don't yet -+ * know which Job Chains are to be run: -+ * All Shader Cores are powered up, regardless of whether or not they will -+ * be needed later. -+ * -+ * - When KBase indicates that a set of Shader Cores are needed to submit the -+ * currently queued Job Chains: -+ * All Shader Cores are kept powered, regardless of whether or not they will -+ * be needed -+ * -+ * - When KBase indicates that the GPU need not be powered: -+ * The Shader Cores are kept powered, regardless of whether or not they will -+ * be needed. The GPU itself is also kept powered, even though it is not -+ * needed. -+ * -+ * This policy is automatically overridden during system suspend: the desired -+ * core state is ignored, and the cores are forced off regardless of what the -+ * policy requests. After resuming from suspend, new changes to the desired -+ * core state made by the policy are honored. -+ * -+ * Note: -+ * -+ * - KBase indicates the GPU will be powered up when it has a User Process that -+ * has just started to submit Job Chains. -+ * -+ * - KBase indicates the GPU need not be powered when all the Job Chains from -+ * User Processes have finished, and it is waiting for a User Process to -+ * submit some more Job Chains. -+ */ + if (!hdmi->plat_data->use_drm_infoframe) + return; + + hdmi_modb(hdmi, HDMI_FC_PACKET_TX_EN_DRM_DISABLE, + HDMI_FC_PACKET_TX_EN_DRM_MASK, HDMI_FC_PACKET_TX_EN); + ++ if (!hdmi->connector.hdr_sink_metadata.hdmi_type1.eotf) { ++ DRM_DEBUG("No need to set HDR metadata in infoframe\n"); ++ return; ++ } + -+/** -+ * struct kbasep_pm_policy_always_on - Private struct for policy instance data -+ * @dummy: unused dummy variable -+ * -+ * This contains data that is private to the particular power policy that is -+ * active. -+ */ -+struct kbasep_pm_policy_always_on { -+ int dummy; -+}; -+ -+extern const struct kbase_pm_policy kbase_pm_always_on_policy_ops; -+ -+#endif /* MALI_KBASE_PM_ALWAYS_ON_H */ -+ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c -new file mode 100755 -index 000000000000..146fd48bab92 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c -@@ -0,0 +1,482 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+ -+/* -+ * GPU backend implementation of base kernel power management APIs -+ */ -+ -+#include -+#include -+#include -+#ifdef CONFIG_MALI_PLATFORM_DEVICETREE -+#include -+#endif /* CONFIG_MALI_PLATFORM_DEVICETREE */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static void kbase_pm_gpu_poweroff_wait_wq(struct work_struct *data); ++ if (!conn_state->hdr_output_metadata) { ++ DRM_DEBUG("source metadata not set yet\n"); ++ return; ++ } + -+void kbase_pm_register_access_enable(struct kbase_device *kbdev) -+{ -+ struct kbase_pm_callback_conf *callbacks; ++ hdr_metadata = (struct hdr_output_metadata *) ++ conn_state->hdr_output_metadata->data; + -+ callbacks = (struct kbase_pm_callback_conf *)POWER_MANAGEMENT_CALLBACKS; ++ if (!(hdmi->connector.hdr_sink_metadata.hdmi_type1.eotf & ++ BIT(hdr_metadata->hdmi_metadata_type1.eotf))) { ++ DRM_ERROR("Not support EOTF %d\n", ++ hdr_metadata->hdmi_metadata_type1.eotf); ++ return; ++ } + -+ if (callbacks) -+ callbacks->power_on_callback(kbdev); + err = drm_hdmi_infoframe_set_hdr_metadata(&frame, conn_state); + if (err < 0) + return; +@@ -1852,53 +2369,73 @@ static void hdmi_config_drm_infoframe(struct dw_hdmi *hdmi, + hdmi_writeb(hdmi, buffer[4 + i], HDMI_FC_DRM_PB0 + i); + + hdmi_writeb(hdmi, 1, HDMI_FC_DRM_UP); ++ /* ++ * avi and hdr infoframe cannot be sent at the same time ++ * for compatibility with Huawei TV ++ */ ++ msleep(300); + hdmi_modb(hdmi, HDMI_FC_PACKET_TX_EN_DRM_ENABLE, + HDMI_FC_PACKET_TX_EN_DRM_MASK, HDMI_FC_PACKET_TX_EN); + -+ kbdev->pm.backend.gpu_powered = true; ++ DRM_DEBUG("%s eotf %d end\n", __func__, ++ hdr_metadata->hdmi_metadata_type1.eotf); + } + +-static void hdmi_av_composer(struct dw_hdmi *hdmi, +- const struct drm_display_info *display, +- const struct drm_display_mode *mode) ++static unsigned int ++hdmi_get_tmdsclock(struct dw_hdmi *hdmi, unsigned long mpixelclock) + { +- u8 inv_val, bytes; +- const struct drm_hdmi_info *hdmi_info = &display->hdmi; +- struct hdmi_vmode *vmode = &hdmi->hdmi_data.video_mode; +- int hblank, vblank, h_de_hs, v_de_vs, hsync_len, vsync_len; +- unsigned int vdisplay, hdisplay; +- +- vmode->mpixelclock = mode->clock * 1000; +- +- dev_dbg(hdmi->dev, "final pixclk = %d\n", vmode->mpixelclock); +- +- vmode->mtmdsclock = vmode->mpixelclock; ++ unsigned int tmdsclock = mpixelclock; ++ unsigned int depth = ++ hdmi_bus_fmt_color_depth(hdmi->hdmi_data.enc_out_bus_format); + + if (!hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) { +- switch (hdmi_bus_fmt_color_depth( +- hdmi->hdmi_data.enc_out_bus_format)) { ++ switch (depth) { + case 16: +- vmode->mtmdsclock = vmode->mpixelclock * 2; ++ tmdsclock = mpixelclock * 2; + break; + case 12: +- vmode->mtmdsclock = vmode->mpixelclock * 3 / 2; ++ tmdsclock = mpixelclock * 3 / 2; + break; + case 10: +- vmode->mtmdsclock = vmode->mpixelclock * 5 / 4; ++ tmdsclock = mpixelclock * 5 / 4; ++ break; ++ default: + break; + } + } + ++ return tmdsclock; +} + -+void kbase_pm_register_access_disable(struct kbase_device *kbdev) ++static void hdmi_av_composer(struct dw_hdmi *hdmi, ++ const struct drm_display_info *display, ++ const struct drm_display_mode *mode) +{ -+ struct kbase_pm_callback_conf *callbacks; ++ u8 inv_val, bytes; ++ const struct drm_hdmi_info *hdmi_info = &display->hdmi; ++ struct hdmi_vmode *vmode = &hdmi->hdmi_data.video_mode; ++ int hblank, vblank, h_de_hs, v_de_vs, hsync_len, vsync_len; ++ unsigned int vdisplay, hdisplay; + -+ callbacks = (struct kbase_pm_callback_conf *)POWER_MANAGEMENT_CALLBACKS; ++ vmode->previous_pixelclock = vmode->mpixelclock; ++ vmode->mpixelclock = mode->crtc_clock * 1000; ++ dev_dbg(hdmi->dev, "final pixclk = %d\n", vmode->mpixelclock); + -+ if (callbacks) -+ callbacks->power_off_callback(kbdev); ++ vmode->previous_tmdsclock = vmode->mtmdsclock; ++ vmode->mtmdsclock = hdmi_get_tmdsclock(hdmi, vmode->mpixelclock); + if (hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_out_bus_format)) + vmode->mtmdsclock /= 2; +- + dev_dbg(hdmi->dev, "final tmdsclock = %d\n", vmode->mtmdsclock); + +- /* Set up HDMI_FC_INVIDCONF */ +- inv_val = (hdmi->hdmi_data.hdcp_enable || +- (dw_hdmi_support_scdc(hdmi, display) && +- (vmode->mtmdsclock > HDMI14_MAX_TMDSCLK || +- hdmi_info->scdc.scrambling.low_rates)) ? +- HDMI_FC_INVIDCONF_HDCP_KEEPOUT_ACTIVE : +- HDMI_FC_INVIDCONF_HDCP_KEEPOUT_INACTIVE); ++ if (hdmi->update) ++ return; + -+ kbdev->pm.backend.gpu_powered = false; -+} ++ /* Set up HDMI_FC_INVIDCONF ++ * Some display equipments require that the interval ++ * between Video Data and Data island must be at least 58 pixels, ++ * and fc_invidconf.HDCP_keepout set (1'b1) can meet the requirement. ++ */ ++ inv_val = HDMI_FC_INVIDCONF_HDCP_KEEPOUT_ACTIVE; + + inv_val |= mode->flags & DRM_MODE_FLAG_PVSYNC ? + HDMI_FC_INVIDCONF_VSYNC_IN_POLARITY_ACTIVE_HIGH : +@@ -1964,7 +2501,8 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi, + /* Scrambling Control */ + if (dw_hdmi_support_scdc(hdmi, display)) { + if (vmode->mtmdsclock > HDMI14_MAX_TMDSCLK || +- hdmi_info->scdc.scrambling.low_rates) { ++ (hdmi_info->scdc.scrambling.low_rates && ++ hdmi->scramble_low_rates)) { + /* + * HDMI2.0 Specifies the following procedure: + * After the Source Device has determined that +@@ -1998,6 +2536,8 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi, + HDMI_MC_SWRSTZ); + drm_scdc_set_scrambling(hdmi->ddc, 0); + } ++ } else { ++ hdmi_writeb(hdmi, 0, HDMI_FC_SCRAMBLER_CTRL); + } + + /* Set up horizontal active pixel width */ +@@ -2044,17 +2584,25 @@ static void dw_hdmi_enable_video_path(struct dw_hdmi *hdmi) + hdmi_writeb(hdmi, 0x21, HDMI_FC_CH2PREAM); + + /* Enable pixel clock and tmds data path */ +- hdmi->mc_clkdis |= HDMI_MC_CLKDIS_HDCPCLK_DISABLE | +- HDMI_MC_CLKDIS_CSCCLK_DISABLE | +- HDMI_MC_CLKDIS_AUDCLK_DISABLE | +- HDMI_MC_CLKDIS_PREPCLK_DISABLE | +- HDMI_MC_CLKDIS_TMDSCLK_DISABLE; ++ ++ if (!hdmi->update) ++ hdmi->mc_clkdis |= HDMI_MC_CLKDIS_HDCPCLK_DISABLE | ++ HDMI_MC_CLKDIS_CSCCLK_DISABLE | ++ HDMI_MC_CLKDIS_AUDCLK_DISABLE | ++ HDMI_MC_CLKDIS_PREPCLK_DISABLE | ++ HDMI_MC_CLKDIS_TMDSCLK_DISABLE; + hdmi->mc_clkdis &= ~HDMI_MC_CLKDIS_PIXELCLK_DISABLE; + hdmi_writeb(hdmi, hdmi->mc_clkdis, HDMI_MC_CLKDIS); + + hdmi->mc_clkdis &= ~HDMI_MC_CLKDIS_TMDSCLK_DISABLE; + hdmi_writeb(hdmi, hdmi->mc_clkdis, HDMI_MC_CLKDIS); + ++ /* Enable pixel repetition path */ ++ if (hdmi->hdmi_data.video_mode.mpixelrepetitioninput) { ++ hdmi->mc_clkdis &= ~HDMI_MC_CLKDIS_PREPCLK_DISABLE; ++ hdmi_writeb(hdmi, hdmi->mc_clkdis, HDMI_MC_CLKDIS); ++ } + -+int kbase_hwaccess_pm_init(struct kbase_device *kbdev) + /* Enable csc path */ + if (is_csc_needed(hdmi)) { + hdmi->mc_clkdis &= ~HDMI_MC_CLKDIS_CSCCLK_DISABLE; +@@ -2125,11 +2673,44 @@ static void hdmi_disable_overflow_interrupts(struct dw_hdmi *hdmi) + HDMI_IH_MUTE_FC_STAT2); + } + ++static void dw_hdmi_force_output_pattern(struct dw_hdmi *hdmi, const struct drm_display_mode *mode) +{ -+ int ret = 0; -+ struct kbase_pm_callback_conf *callbacks; ++ /* force output black */ ++ if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) { ++ enum hdmi_quantization_range rgb_quant_range = drm_default_rgb_quant_range(mode); + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ if (hdmi->hdmi_data.quant_range == HDMI_QUANTIZATION_RANGE_FULL) { ++ hdmi_writeb(hdmi, 0x00, HDMI_FC_DBGTMDS2); /*R*/ ++ hdmi_writeb(hdmi, 0x00, HDMI_FC_DBGTMDS1); /*G*/ ++ hdmi_writeb(hdmi, 0x00, HDMI_FC_DBGTMDS0); /*B*/ ++ } else if (hdmi->hdmi_data.quant_range == HDMI_QUANTIZATION_RANGE_LIMITED) { ++ hdmi_writeb(hdmi, 0x10, HDMI_FC_DBGTMDS2); /*R*/ ++ hdmi_writeb(hdmi, 0x10, HDMI_FC_DBGTMDS1); /*G*/ ++ hdmi_writeb(hdmi, 0x10, HDMI_FC_DBGTMDS0); /*B*/ ++ } else if (hdmi->hdmi_data.quant_range == HDMI_QUANTIZATION_RANGE_DEFAULT) { ++ if (rgb_quant_range == HDMI_QUANTIZATION_RANGE_FULL) { ++ hdmi_writeb(hdmi, 0x00, HDMI_FC_DBGTMDS2); /*R*/ ++ hdmi_writeb(hdmi, 0x00, HDMI_FC_DBGTMDS1); /*G*/ ++ hdmi_writeb(hdmi, 0x00, HDMI_FC_DBGTMDS0); /*B*/ ++ } else if (rgb_quant_range == HDMI_QUANTIZATION_RANGE_LIMITED) { ++ hdmi_writeb(hdmi, 0x10, HDMI_FC_DBGTMDS2); /*R*/ ++ hdmi_writeb(hdmi, 0x10, HDMI_FC_DBGTMDS1); /*G*/ ++ hdmi_writeb(hdmi, 0x10, HDMI_FC_DBGTMDS0); /*B*/ ++ } ++ } ++ } else { ++ hdmi_writeb(hdmi, 0x80, HDMI_FC_DBGTMDS2); /*Cr*/ ++ hdmi_writeb(hdmi, 0x10, HDMI_FC_DBGTMDS1); /*Y*/ ++ hdmi_writeb(hdmi, 0x80, HDMI_FC_DBGTMDS0); /*Cb*/ ++ } ++} + -+ mutex_init(&kbdev->pm.lock); + static int dw_hdmi_setup(struct dw_hdmi *hdmi, + const struct drm_connector *connector, + const struct drm_display_mode *mode) + { + int ret; ++ void *data = hdmi->plat_data->phy_data; + + hdmi_disable_overflow_interrupts(hdmi); + +@@ -2141,48 +2722,82 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, + dev_dbg(hdmi->dev, "CEA mode used vic=%d\n", hdmi->vic); + } + +- if ((hdmi->vic == 6) || (hdmi->vic == 7) || +- (hdmi->vic == 21) || (hdmi->vic == 22) || +- (hdmi->vic == 2) || (hdmi->vic == 3) || +- (hdmi->vic == 17) || (hdmi->vic == 18)) ++ if (hdmi->plat_data->get_enc_out_encoding) ++ hdmi->hdmi_data.enc_out_encoding = ++ hdmi->plat_data->get_enc_out_encoding(data); ++ else if ((hdmi->vic == 6) || (hdmi->vic == 7) || ++ (hdmi->vic == 21) || (hdmi->vic == 22) || ++ (hdmi->vic == 2) || (hdmi->vic == 3) || ++ (hdmi->vic == 17) || (hdmi->vic == 18)) + hdmi->hdmi_data.enc_out_encoding = V4L2_YCBCR_ENC_601; + else + hdmi->hdmi_data.enc_out_encoding = V4L2_YCBCR_ENC_709; + +- hdmi->hdmi_data.video_mode.mpixelrepetitionoutput = 0; +- hdmi->hdmi_data.video_mode.mpixelrepetitioninput = 0; ++ if (mode->flags & DRM_MODE_FLAG_DBLCLK) { ++ hdmi->hdmi_data.video_mode.mpixelrepetitionoutput = 1; ++ hdmi->hdmi_data.video_mode.mpixelrepetitioninput = 1; ++ } else { ++ hdmi->hdmi_data.video_mode.mpixelrepetitionoutput = 0; ++ hdmi->hdmi_data.video_mode.mpixelrepetitioninput = 0; ++ } ++ /* TOFIX: Get input format from plat data or fallback to RGB888 */ ++ if (hdmi->plat_data->get_input_bus_format) ++ hdmi->hdmi_data.enc_in_bus_format = ++ hdmi->plat_data->get_input_bus_format(data); ++ else if (hdmi->plat_data->input_bus_format) ++ hdmi->hdmi_data.enc_in_bus_format = ++ hdmi->plat_data->input_bus_format; ++ else ++ hdmi->hdmi_data.enc_in_bus_format = ++ MEDIA_BUS_FMT_RGB888_1X24; + -+ kbdev->pm.backend.gpu_poweroff_wait_wq = alloc_workqueue("kbase_pm_poweroff_wait", -+ WQ_HIGHPRI | WQ_UNBOUND, 1); -+ if (!kbdev->pm.backend.gpu_poweroff_wait_wq) -+ return -ENOMEM; ++ /* TOFIX: Default to RGB888 output format */ ++ if (hdmi->plat_data->get_output_bus_format) ++ hdmi->hdmi_data.enc_out_bus_format = ++ hdmi->plat_data->get_output_bus_format(data); ++ else ++ hdmi->hdmi_data.enc_out_bus_format = ++ MEDIA_BUS_FMT_RGB888_1X24; + +- if (hdmi->hdmi_data.enc_in_bus_format == MEDIA_BUS_FMT_FIXED) +- hdmi->hdmi_data.enc_in_bus_format = MEDIA_BUS_FMT_RGB888_1X24; ++ if (hdmi->plat_data->set_prev_bus_format) ++ hdmi->plat_data->set_prev_bus_format(data, hdmi->hdmi_data.enc_out_bus_format); + + /* TOFIX: Get input encoding from plat data or fallback to none */ +- if (hdmi->plat_data->input_bus_encoding) ++ if (hdmi->plat_data->get_enc_in_encoding) ++ hdmi->hdmi_data.enc_in_encoding = ++ hdmi->plat_data->get_enc_in_encoding(data); ++ else if (hdmi->plat_data->input_bus_encoding) + hdmi->hdmi_data.enc_in_encoding = + hdmi->plat_data->input_bus_encoding; + else + hdmi->hdmi_data.enc_in_encoding = V4L2_YCBCR_ENC_DEFAULT; + +- if (hdmi->hdmi_data.enc_out_bus_format == MEDIA_BUS_FMT_FIXED) +- hdmi->hdmi_data.enc_out_bus_format = MEDIA_BUS_FMT_RGB888_1X24; + -+ INIT_WORK(&kbdev->pm.backend.gpu_poweroff_wait_work, -+ kbase_pm_gpu_poweroff_wait_wq); ++ if (hdmi->plat_data->get_quant_range) ++ hdmi->hdmi_data.quant_range = ++ hdmi->plat_data->get_quant_range(data); + + hdmi->hdmi_data.rgb_limited_range = hdmi->sink_is_hdmi && + drm_default_rgb_quant_range(mode) == + HDMI_QUANTIZATION_RANGE_LIMITED; + +- hdmi->hdmi_data.pix_repet_factor = 0; +- hdmi->hdmi_data.hdcp_enable = 0; +- hdmi->hdmi_data.video_mode.mdataenablepolarity = true; ++ if (!hdmi->sink_is_hdmi) ++ hdmi->hdmi_data.quant_range = HDMI_QUANTIZATION_RANGE_FULL; + +- /* HDMI Initialization Step B.1 */ +- hdmi_av_composer(hdmi, &connector->display_info, mode); ++ /* ++ * According to the dw-hdmi specification 6.4.2 ++ * vp_pr_cd[3:0]: ++ * 0000b: No pixel repetition (pixel sent only once) ++ * 0001b: Pixel sent two times (pixel repeated once) ++ */ ++ hdmi->hdmi_data.pix_repet_factor = ++ (mode->flags & DRM_MODE_FLAG_DBLCLK) ? 1 : 0; ++ hdmi->hdmi_data.video_mode.mdataenablepolarity = true; + +- /* HDMI Initializateion Step B.2 */ +- ret = hdmi->phy.ops->init(hdmi, hdmi->phy.data, +- &connector->display_info, +- &hdmi->previous_mode); +- if (ret) +- return ret; +- hdmi->phy.enabled = true; ++ dw_hdmi_force_output_pattern(hdmi, mode); + -+ kbdev->pm.backend.gpu_powered = false; -+ kbdev->pm.suspending = false; -+#ifdef CONFIG_MALI_DEBUG -+ kbdev->pm.backend.driver_ready_for_irqs = false; -+#endif /* CONFIG_MALI_DEBUG */ -+ kbdev->pm.backend.gpu_in_desired_state = true; -+ init_waitqueue_head(&kbdev->pm.backend.gpu_in_desired_state_wait); ++ /* HDMI Initialization Step B.1 */ ++ hdmi_av_composer(hdmi, &connector->display_info, mode); + + /* HDMI Initialization Step B.3 */ + dw_hdmi_enable_video_path(hdmi); +@@ -2210,10 +2825,34 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, + hdmi_video_packetize(hdmi); + hdmi_video_csc(hdmi); + hdmi_video_sample(hdmi); +- hdmi_tx_hdcp_config(hdmi); ++ hdmi_tx_hdcp_config(hdmi, mode); + -+ callbacks = (struct kbase_pm_callback_conf *)POWER_MANAGEMENT_CALLBACKS; -+ if (callbacks) { -+ kbdev->pm.backend.callback_power_on = -+ callbacks->power_on_callback; -+ kbdev->pm.backend.callback_power_off = -+ callbacks->power_off_callback; -+ kbdev->pm.backend.callback_power_suspend = -+ callbacks->power_suspend_callback; -+ kbdev->pm.backend.callback_power_resume = -+ callbacks->power_resume_callback; -+ kbdev->pm.callback_power_runtime_init = -+ callbacks->power_runtime_init_callback; -+ kbdev->pm.callback_power_runtime_term = -+ callbacks->power_runtime_term_callback; -+ kbdev->pm.backend.callback_power_runtime_on = -+ callbacks->power_runtime_on_callback; -+ kbdev->pm.backend.callback_power_runtime_off = -+ callbacks->power_runtime_off_callback; -+ kbdev->pm.backend.callback_power_runtime_idle = -+ callbacks->power_runtime_idle_callback; -+ } else { -+ kbdev->pm.backend.callback_power_on = NULL; -+ kbdev->pm.backend.callback_power_off = NULL; -+ kbdev->pm.backend.callback_power_suspend = NULL; -+ kbdev->pm.backend.callback_power_resume = NULL; -+ kbdev->pm.callback_power_runtime_init = NULL; -+ kbdev->pm.callback_power_runtime_term = NULL; -+ kbdev->pm.backend.callback_power_runtime_on = NULL; -+ kbdev->pm.backend.callback_power_runtime_off = NULL; -+ kbdev->pm.backend.callback_power_runtime_idle = NULL; ++ /* HDMI Enable phy output */ ++ if (!hdmi->phy.enabled || ++ hdmi->hdmi_data.video_mode.previous_pixelclock != ++ hdmi->hdmi_data.video_mode.mpixelclock || ++ hdmi->hdmi_data.video_mode.previous_tmdsclock != ++ hdmi->hdmi_data.video_mode.mtmdsclock) { ++ ret = hdmi->phy.ops->init(hdmi, hdmi->phy.data, ++ &connector->display_info, ++ &hdmi->previous_mode); ++ if (ret) ++ return ret; ++ hdmi->phy.enabled = true; ++ } + + dw_hdmi_clear_overflow(hdmi); + ++ /* ++ * konka tv should switch pattern after set to yuv420 10bit or ++ * the TV might not recognize the signal. ++ */ ++ if (!hdmi->update) { ++ hdmi_writeb(hdmi, 1, HDMI_FC_DBGFORCE); ++ msleep(50); ++ hdmi_writeb(hdmi, 0, HDMI_FC_DBGFORCE); + } + -+ /* Initialise the metrics subsystem */ -+ ret = kbasep_pm_metrics_init(kbdev); -+ if (ret) -+ return ret; + return 0; + } + +@@ -2286,6 +2925,8 @@ static void dw_hdmi_poweroff(struct dw_hdmi *hdmi) + hdmi->phy.enabled = false; + } + ++ if (hdmi->hdcp && hdmi->hdcp->hdcp_stop) ++ hdmi->hdcp->hdcp_stop(hdmi->hdcp); + hdmi->bridge_is_on = false; + } + +@@ -2303,6 +2944,11 @@ static void dw_hdmi_update_power(struct dw_hdmi *hdmi) + } + + if (force == DRM_FORCE_OFF) { ++ if (hdmi->initialized) { ++ hdmi->initialized = false; ++ hdmi->disabled = true; ++ hdmi->logo_plug_out = true; ++ } + if (hdmi->bridge_is_on) + dw_hdmi_poweroff(hdmi); + } else { +@@ -2335,8 +2981,15 @@ static enum drm_connector_status dw_hdmi_detect(struct dw_hdmi *hdmi) + { + enum drm_connector_status result; + +- result = hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data); ++ if (!hdmi->force_logo) { ++ mutex_lock(&hdmi->mutex); ++ hdmi->force = DRM_FORCE_UNSPECIFIED; ++ dw_hdmi_update_power(hdmi); ++ dw_hdmi_update_phy_mask(hdmi); ++ mutex_unlock(&hdmi->mutex); ++ } + ++ result = hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data); + mutex_lock(&hdmi->mutex); + if (result != hdmi->last_connector_result) { + dev_dbg(hdmi->dev, "read_hpd result: %d", result); +@@ -2346,6 +2999,11 @@ static enum drm_connector_status dw_hdmi_detect(struct dw_hdmi *hdmi) + } + mutex_unlock(&hdmi->mutex); + ++ if (result == connector_status_connected) ++ extcon_set_state_sync(hdmi->extcon, EXTCON_DISP_HDMI, true); ++ else ++ extcon_set_state_sync(hdmi->extcon, EXTCON_DISP_HDMI, false); + -+ init_waitqueue_head(&kbdev->pm.backend.l2_powered_wait); -+ kbdev->pm.backend.l2_powered = 0; + return result; + } + +@@ -2366,7 +3024,7 @@ static struct edid *dw_hdmi_get_edid(struct dw_hdmi *hdmi, + dev_dbg(hdmi->dev, "got edid: width[%d] x height[%d]\n", + edid->width_cm, edid->height_cm); + +- hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid); ++ hdmi->support_hdmi = drm_detect_hdmi_monitor(edid); + hdmi->sink_has_audio = drm_detect_monitor_audio(edid); + + return edid; +@@ -2384,38 +3042,187 @@ dw_hdmi_connector_detect(struct drm_connector *connector, bool force) + return dw_hdmi_detect(hdmi); + } + ++static int ++dw_hdmi_update_hdr_property(struct drm_connector *connector) ++{ ++ struct drm_device *dev = connector->dev; ++ struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi, ++ connector); ++ void *data = hdmi->plat_data->phy_data; ++ const struct hdr_static_metadata *metadata = ++ &connector->hdr_sink_metadata.hdmi_type1; ++ size_t size = sizeof(*metadata); ++ struct drm_property *property; ++ struct drm_property_blob *blob; ++ int ret; + -+ init_waitqueue_head(&kbdev->pm.backend.reset_done_wait); -+ kbdev->pm.backend.reset_done = false; ++ if (hdmi->plat_data->get_hdr_property) ++ property = hdmi->plat_data->get_hdr_property(data); ++ else ++ return -EINVAL; + -+ init_waitqueue_head(&kbdev->pm.zero_active_count_wait); -+ kbdev->pm.active_count = 0; ++ if (hdmi->plat_data->get_hdr_blob) ++ blob = hdmi->plat_data->get_hdr_blob(data); ++ else ++ return -EINVAL; + -+ spin_lock_init(&kbdev->pm.backend.gpu_cycle_counter_requests_lock); -+ spin_lock_init(&kbdev->pm.backend.gpu_powered_lock); ++ ret = drm_property_replace_global_blob(dev, &blob, size, metadata, ++ &connector->base, property); ++ return ret; ++} + -+ init_waitqueue_head(&kbdev->pm.backend.poweroff_wait); + static int dw_hdmi_connector_get_modes(struct drm_connector *connector) + { + struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi, + connector); ++ struct hdr_static_metadata *metedata = ++ &connector->hdr_sink_metadata.hdmi_type1; + struct edid *edid; +- int ret; ++ struct drm_display_mode *mode; ++ struct drm_display_info *info = &connector->display_info; ++ void *data = hdmi->plat_data->phy_data; ++ int i, ret = 0; + ++ memset(metedata, 0, sizeof(*metedata)); + edid = dw_hdmi_get_edid(hdmi, connector); +- if (!edid) +- return 0; ++ if (edid) { ++ int vic = 0; + -+ if (kbase_pm_ca_init(kbdev) != 0) -+ goto workq_fail; ++ dev_dbg(hdmi->dev, "got edid: width[%d] x height[%d]\n", ++ edid->width_cm, edid->height_cm); ++ drm_connector_update_edid_property(connector, edid); ++ cec_notifier_set_phys_addr_from_edid(hdmi->cec_notifier, edid); ++ ret = drm_add_edid_modes(connector, edid); ++ if (hdmi->plat_data->get_color_changed) ++ hdmi->plat_data->get_yuv422_format(connector, edid); ++ if (hdmi->plat_data->get_colorimetry) ++ hdmi->plat_data->get_colorimetry(data, edid); + -+ if (kbase_pm_policy_init(kbdev) != 0) -+ goto pm_policy_fail; ++ list_for_each_entry(mode, &connector->probed_modes, head) { ++ vic = drm_match_cea_mode(mode); + -+ return 0; ++ if (mode->picture_aspect_ratio == HDMI_PICTURE_ASPECT_NONE) { ++ if (vic >= 93 && vic <= 95) ++ mode->picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9; ++ else if (vic == 98) ++ mode->picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135; ++ } ++ } + -+pm_policy_fail: -+ kbase_pm_ca_term(kbdev); -+workq_fail: -+ kbasep_pm_metrics_term(kbdev); -+ return -EINVAL; -+} ++ kfree(edid); ++ } else { ++ hdmi->support_hdmi = true; ++ hdmi->sink_has_audio = true; ++ for (i = 0; i < ARRAY_SIZE(dw_hdmi_default_modes); i++) { ++ const struct drm_display_mode *ptr = ++ &dw_hdmi_default_modes[i]; + -+void kbase_pm_do_poweron(struct kbase_device *kbdev, bool is_resume) ++ mode = drm_mode_duplicate(connector->dev, ptr); ++ if (mode) { ++ if (!i) ++ mode->type = DRM_MODE_TYPE_PREFERRED; ++ drm_mode_probed_add(connector, mode); ++ ret++; ++ } ++ } ++ info->edid_hdmi_dc_modes = 0; ++ info->hdmi.y420_dc_modes = 0; ++ info->color_formats = 0; + +- drm_connector_update_edid_property(connector, edid); +- cec_notifier_set_phys_addr_from_edid(hdmi->cec_notifier, edid); +- ret = drm_add_edid_modes(connector, edid); +- kfree(edid); ++ dev_info(hdmi->dev, "failed to get edid\n"); ++ } ++ dw_hdmi_update_hdr_property(connector); ++ dw_hdmi_check_output_type_changed(hdmi); + + return ret; + } + +-static bool hdr_metadata_equal(const struct drm_connector_state *old_state, ++static struct drm_encoder * ++dw_hdmi_connector_best_encoder(struct drm_connector *connector) +{ -+ lockdep_assert_held(&kbdev->pm.lock); -+ -+ /* Turn clocks and interrupts on - no-op if we haven't done a previous -+ * kbase_pm_clock_off() */ -+ kbase_pm_clock_on(kbdev, is_resume); -+ -+ /* Update core status as required by the policy */ -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, -+ SW_FLOW_PM_CHECKTRANS_PM_DO_POWERON_START); -+ kbase_pm_update_cores_state(kbdev); -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, -+ SW_FLOW_PM_CHECKTRANS_PM_DO_POWERON_END); ++ struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi, ++ connector); + -+ /* NOTE: We don't wait to reach the desired state, since running atoms -+ * will wait for that state to be reached anyway */ ++ return hdmi->bridge.encoder; +} + -+static void kbase_pm_gpu_poweroff_wait_wq(struct work_struct *data) ++static bool dw_hdmi_color_changed(struct drm_connector *connector) +{ -+ struct kbase_device *kbdev = container_of(data, struct kbase_device, -+ pm.backend.gpu_poweroff_wait_work); -+ struct kbase_pm_device_data *pm = &kbdev->pm; -+ struct kbase_pm_backend_data *backend = &pm->backend; -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ unsigned long flags; -+ -+#if !PLATFORM_POWER_DOWN_ONLY -+ /* Wait for power transitions to complete. We do this with no locks held -+ * so that we don't deadlock with any pending workqueues */ -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, -+ SW_FLOW_PM_CHECKTRANS_PM_DO_POWEROFF_START); -+ kbase_pm_check_transitions_sync(kbdev); -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, -+ SW_FLOW_PM_CHECKTRANS_PM_DO_POWEROFF_END); -+#endif /* !PLATFORM_POWER_DOWN_ONLY */ -+ -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); ++ struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi, ++ connector); ++ void *data = hdmi->plat_data->phy_data; ++ bool ret = false; + -+#if PLATFORM_POWER_DOWN_ONLY -+ if (kbdev->pm.backend.gpu_powered) { -+ if (kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_L2)) { -+ /* If L2 cache is powered then we must flush it before -+ * we power off the GPU. Normally this would have been -+ * handled when the L2 was powered off. */ -+ kbase_gpu_cacheclean(kbdev); -+ } -+ } -+#endif /* PLATFORM_POWER_DOWN_ONLY */ ++ if (hdmi->plat_data->get_color_changed) ++ ret = hdmi->plat_data->get_color_changed(data); + -+ if (!backend->poweron_required) { -+#if !PLATFORM_POWER_DOWN_ONLY -+ unsigned long flags; ++ return ret; ++} + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ WARN_ON(kbdev->l2_available_bitmap || -+ kbdev->shader_available_bitmap || -+ kbdev->tiler_available_bitmap); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+#endif /* !PLATFORM_POWER_DOWN_ONLY */ ++static bool hdr_metadata_equal(struct dw_hdmi *hdmi, const struct drm_connector_state *old_state, + const struct drm_connector_state *new_state) + { + struct drm_property_blob *old_blob = old_state->hdr_output_metadata; + struct drm_property_blob *new_blob = new_state->hdr_output_metadata; ++ int i, ret; ++ u8 *data; + -+ /* Consume any change-state events */ -+ kbase_timeline_pm_check_handle_event(kbdev, -+ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED); ++ hdmi->hdr2sdr = false; + +- if (!old_blob || !new_blob) +- return old_blob == new_blob; ++ if (!old_blob && !new_blob) ++ return true; + -+ /* Disable interrupts and turn the clock off */ -+ if (!kbase_pm_clock_off(kbdev, backend->poweroff_is_suspend)) { -+ /* -+ * Page/bus faults are pending, must drop locks to -+ * process. Interrupts are disabled so no more faults -+ * should be generated at this point. -+ */ -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ kbase_flush_mmu_wqs(kbdev); -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); ++ if (!old_blob) { ++ data = (u8 *)new_blob->data; + -+ /* Turn off clock now that fault have been handled. We -+ * dropped locks so poweron_required may have changed - -+ * power back on if this is the case.*/ -+ if (backend->poweron_required) -+ kbase_pm_clock_on(kbdev, false); -+ else -+ WARN_ON(!kbase_pm_clock_off(kbdev, -+ backend->poweroff_is_suspend)); -+ } -+ } ++ for (i = 0; i < new_blob->length; i++) ++ if (data[i]) ++ return false; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ backend->poweroff_wait_in_progress = false; -+ if (backend->poweron_required) { -+ backend->poweron_required = false; -+ kbase_pm_update_cores_state_nolock(kbdev); -+ kbase_backend_slot_update(kbdev); ++ return true; + } -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ -+ wake_up(&kbdev->pm.backend.poweroff_wait); -+} + -+void kbase_pm_do_poweroff(struct kbase_device *kbdev, bool is_suspend) -+{ -+ unsigned long flags; ++ if (!new_blob) { ++ data = (u8 *)old_blob->data; + -+ lockdep_assert_held(&kbdev->pm.lock); ++ for (i = 0; i < old_blob->length; i++) ++ if (data[i]) ++ return false; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ if (!kbdev->pm.backend.poweroff_wait_in_progress) { -+ /* Force all cores off */ -+ kbdev->pm.backend.desired_shader_state = 0; -+ kbdev->pm.backend.desired_tiler_state = 0; ++ return true; ++ } + + if (old_blob->length != new_blob->length) + return false; + +- return !memcmp(old_blob->data, new_blob->data, old_blob->length); ++ ret = !memcmp(old_blob->data, new_blob->data, old_blob->length); + -+ /* Force all cores to be unavailable, in the situation where -+ * transitions are in progress for some cores but not others, -+ * and kbase_pm_check_transitions_nolock can not immediately -+ * power off the cores */ -+ kbdev->shader_available_bitmap = 0; -+ kbdev->tiler_available_bitmap = 0; -+ kbdev->l2_available_bitmap = 0; ++ if (!ret && new_blob) { ++ data = (u8 *)new_blob->data; + -+ kbdev->pm.backend.poweroff_wait_in_progress = true; -+ kbdev->pm.backend.poweroff_is_suspend = is_suspend; ++ for (i = 0; i < new_blob->length; i++) ++ if (data[i]) ++ break; + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); -+ /*Kick off wq here. Callers will have to wait*/ -+ queue_work(kbdev->pm.backend.gpu_poweroff_wait_wq, -+ &kbdev->pm.backend.gpu_poweroff_wait_work); -+ } else { -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ if (i == new_blob->length) ++ hdmi->hdr2sdr = true; + } ++ ++ return ret; +} + -+static bool is_poweroff_in_progress(struct kbase_device *kbdev) ++static bool check_hdr_color_change(struct drm_connector_state *old_state, ++ struct drm_connector_state *new_state, ++ struct dw_hdmi *hdmi) +{ -+ bool ret; -+ unsigned long flags; ++ void *data = hdmi->plat_data->phy_data; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ ret = (kbdev->pm.backend.poweroff_wait_in_progress == false); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ if (!hdr_metadata_equal(hdmi, old_state, new_state)) { ++ hdmi->plat_data->check_hdr_color_change(new_state, data); ++ return true; ++ } + -+ return ret; -+} ++ return false; + } + + static int dw_hdmi_connector_atomic_check(struct drm_connector *connector, +@@ -2427,27 +3234,231 @@ static int dw_hdmi_connector_atomic_check(struct drm_connector *connector, + drm_atomic_get_new_connector_state(state, connector); + struct drm_crtc *crtc = new_state->crtc; + struct drm_crtc_state *crtc_state; ++ struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi, ++ connector); ++ struct drm_display_mode *mode = NULL; ++ void *data = hdmi->plat_data->phy_data; ++ struct hdmi_vmode *vmode = &hdmi->hdmi_data.video_mode; + + if (!crtc) + return 0; + +- if (!hdr_metadata_equal(old_state, new_state)) { +- crtc_state = drm_atomic_get_crtc_state(state, crtc); +- if (IS_ERR(crtc_state)) +- return PTR_ERR(crtc_state); ++ crtc_state = drm_atomic_get_crtc_state(state, crtc); ++ if (IS_ERR(crtc_state)) ++ return PTR_ERR(crtc_state); + -+void kbase_pm_wait_for_poweroff_complete(struct kbase_device *kbdev) -+{ -+ wait_event_killable(kbdev->pm.backend.poweroff_wait, -+ is_poweroff_in_progress(kbdev)); -+} ++ mode = &crtc_state->mode; + +- crtc_state->mode_changed = true; ++ /* ++ * If HDMI is enabled in uboot, it's need to record ++ * drm_display_mode and set phy status to enabled. ++ */ ++ if (!vmode->mpixelclock) { ++ u8 val; + -+int kbase_hwaccess_pm_powerup(struct kbase_device *kbdev, -+ unsigned int flags) -+{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ unsigned long irq_flags; -+ int ret; ++ hdmi->curr_conn = connector; + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ if (hdmi->plat_data->get_enc_in_encoding) ++ hdmi->hdmi_data.enc_in_encoding = ++ hdmi->plat_data->get_enc_in_encoding(data); ++ if (hdmi->plat_data->get_enc_out_encoding) ++ hdmi->hdmi_data.enc_out_encoding = ++ hdmi->plat_data->get_enc_out_encoding(data); ++ if (hdmi->plat_data->get_input_bus_format) ++ hdmi->hdmi_data.enc_in_bus_format = ++ hdmi->plat_data->get_input_bus_format(data); ++ if (hdmi->plat_data->get_output_bus_format) ++ hdmi->hdmi_data.enc_out_bus_format = ++ hdmi->plat_data->get_output_bus_format(data); + -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); ++ memcpy(&hdmi->previous_mode, mode, sizeof(hdmi->previous_mode)); ++ vmode->mpixelclock = mode->crtc_clock * 1000; ++ vmode->previous_pixelclock = mode->clock * 1000; ++ vmode->previous_tmdsclock = mode->clock * 1000; ++ vmode->mtmdsclock = hdmi_get_tmdsclock(hdmi, ++ vmode->mpixelclock); ++ if (hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_out_bus_format)) ++ vmode->mtmdsclock /= 2; + -+ /* A suspend won't happen during startup/insmod */ -+ KBASE_DEBUG_ASSERT(!kbase_pm_is_suspending(kbdev)); ++ dw_hdmi_force_output_pattern(hdmi, mode); ++ drm_scdc_readb(hdmi->ddc, SCDC_TMDS_CONFIG, &val); + -+ /* Power up the GPU, don't enable IRQs as we are not ready to receive -+ * them. */ -+ ret = kbase_pm_init_hw(kbdev, flags); -+ if (ret) { -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); -+ return ret; ++ /* if plug out before hdmi bind, reset hdmi */ ++ if (vmode->mtmdsclock >= 340000000 && !(val & SCDC_TMDS_BIT_CLOCK_RATIO_BY_40)) ++ hdmi->logo_plug_out = true; + } + -+ kbasep_pm_init_core_use_bitmaps(kbdev); -+ -+ kbdev->pm.debug_core_mask_all = kbdev->pm.debug_core_mask[0] = -+ kbdev->pm.debug_core_mask[1] = -+ kbdev->pm.debug_core_mask[2] = -+ kbdev->gpu_props.props.raw_props.shader_present; ++ if (check_hdr_color_change(old_state, new_state, hdmi) || hdmi->logo_plug_out || ++ dw_hdmi_color_changed(connector)) { ++ u32 mtmdsclk; + -+ /* Pretend the GPU is active to prevent a power policy turning the GPU -+ * cores off */ -+ kbdev->pm.active_count = 1; ++ if (hdmi->plat_data->update_color_format) ++ hdmi->plat_data->update_color_format(new_state, data); ++ if (hdmi->plat_data->get_enc_in_encoding) ++ hdmi->hdmi_data.enc_in_encoding = ++ hdmi->plat_data->get_enc_in_encoding(data); ++ if (hdmi->plat_data->get_enc_out_encoding) ++ hdmi->hdmi_data.enc_out_encoding = ++ hdmi->plat_data->get_enc_out_encoding(data); ++ if (hdmi->plat_data->get_input_bus_format) ++ hdmi->hdmi_data.enc_in_bus_format = ++ hdmi->plat_data->get_input_bus_format(data); ++ if (hdmi->plat_data->get_output_bus_format) ++ hdmi->hdmi_data.enc_out_bus_format = ++ hdmi->plat_data->get_output_bus_format(data); + -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_cycle_counter_requests_lock, -+ irq_flags); -+ /* Ensure cycle counter is off */ -+ kbdev->pm.backend.gpu_cycle_counter_requests = 0; -+ spin_unlock_irqrestore( -+ &kbdev->pm.backend.gpu_cycle_counter_requests_lock, -+ irq_flags); ++ mtmdsclk = hdmi_get_tmdsclock(hdmi, mode->clock); + -+ /* We are ready to receive IRQ's now as power policy is set up, so -+ * enable them now. */ -+#ifdef CONFIG_MALI_DEBUG -+ spin_lock_irqsave(&kbdev->pm.backend.gpu_powered_lock, irq_flags); -+ kbdev->pm.backend.driver_ready_for_irqs = true; -+ spin_unlock_irqrestore(&kbdev->pm.backend.gpu_powered_lock, irq_flags); -+#endif -+ kbase_pm_enable_interrupts(kbdev); ++ if (hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_out_bus_format)) ++ mtmdsclk /= 2; + -+ /* Turn on the GPU and any cores needed by the policy */ -+ kbase_pm_do_poweron(kbdev, false); -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); ++ if (!(hdmi_readb(hdmi, HDMI_PHY_STAT0) & HDMI_PHY_HPD)) ++ return 0; + -+ /* Idle the GPU and/or cores, if the policy wants it to */ -+ kbase_pm_context_idle(kbdev); ++ if (hdmi->hdmi_data.video_mode.mpixelclock == (mode->clock * 1000) && ++ hdmi->hdmi_data.video_mode.mtmdsclock == (mtmdsclk * 1000) && ++ !hdmi->logo_plug_out && !hdmi->disabled) { ++ hdmi->update = true; ++ hdmi_writeb(hdmi, HDMI_FC_GCP_SET_AVMUTE, HDMI_FC_GCP); ++ mdelay(180); ++ handle_plugged_change(hdmi, false); ++ } else { ++ hdmi->update = false; ++ crtc_state->mode_changed = true; ++ hdmi->logo_plug_out = false; ++ } + } + + return 0; + } + ++static int ++dw_hdmi_atomic_connector_set_property(struct drm_connector *connector, ++ struct drm_connector_state *state, ++ struct drm_property *property, ++ uint64_t val) ++{ ++ struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi, ++ connector); ++ const struct dw_hdmi_property_ops *ops = ++ hdmi->plat_data->property_ops; + -+ return 0; ++ if (ops && ops->set_property) ++ return ops->set_property(connector, state, property, ++ val, hdmi->plat_data->phy_data); ++ else ++ return -EINVAL; +} + -+void kbase_hwaccess_pm_halt(struct kbase_device *kbdev) ++static int ++dw_hdmi_atomic_connector_get_property(struct drm_connector *connector, ++ const struct drm_connector_state *state, ++ struct drm_property *property, ++ uint64_t *val) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi, ++ connector); ++ const struct dw_hdmi_property_ops *ops = ++ hdmi->plat_data->property_ops; + -+ mutex_lock(&kbdev->pm.lock); -+ kbase_pm_cancel_deferred_poweroff(kbdev); -+ kbase_pm_do_poweroff(kbdev, false); -+ mutex_unlock(&kbdev->pm.lock); ++ if (ops && ops->get_property) ++ return ops->get_property(connector, state, property, ++ val, hdmi->plat_data->phy_data); ++ else ++ return -EINVAL; +} + -+KBASE_EXPORT_TEST_API(kbase_hwaccess_pm_halt); ++static int ++dw_hdmi_connector_set_property(struct drm_connector *connector, ++ struct drm_property *property, uint64_t val) ++{ ++ return dw_hdmi_atomic_connector_set_property(connector, NULL, ++ property, val); ++} + -+void kbase_hwaccess_pm_term(struct kbase_device *kbdev) ++static void dw_hdmi_connector_atomic_commit(struct drm_connector *connector, ++ struct drm_connector_state *state) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(kbdev->pm.active_count == 0); -+ KBASE_DEBUG_ASSERT(kbdev->pm.backend.gpu_cycle_counter_requests == 0); ++ struct dw_hdmi *hdmi = ++ container_of(connector, struct dw_hdmi, connector); + -+ /* Free any resources the policy allocated */ -+ kbase_pm_policy_term(kbdev); -+ kbase_pm_ca_term(kbdev); ++ if (hdmi->update) { ++ dw_hdmi_setup(hdmi, hdmi->curr_conn, &hdmi->previous_mode); ++ mdelay(50); ++ handle_plugged_change(hdmi, true); ++ hdmi_writeb(hdmi, HDMI_FC_GCP_CLEAR_AVMUTE, HDMI_FC_GCP); ++ hdmi->update = false; ++ } ++} + -+ /* Shut down the metrics subsystem */ -+ kbasep_pm_metrics_term(kbdev); ++void dw_hdmi_set_quant_range(struct dw_hdmi *hdmi) ++{ ++ if (!hdmi->bridge_is_on) ++ return; + -+ destroy_workqueue(kbdev->pm.backend.gpu_poweroff_wait_wq); ++ hdmi_writeb(hdmi, HDMI_FC_GCP_SET_AVMUTE, HDMI_FC_GCP); ++ dw_hdmi_setup(hdmi, hdmi->curr_conn, &hdmi->previous_mode); ++ hdmi_writeb(hdmi, HDMI_FC_GCP_CLEAR_AVMUTE, HDMI_FC_GCP); +} ++EXPORT_SYMBOL_GPL(dw_hdmi_set_quant_range); + -+void kbase_pm_power_changed(struct kbase_device *kbdev) ++void dw_hdmi_set_output_type(struct dw_hdmi *hdmi, u64 val) +{ -+ bool cores_are_available; -+ unsigned long flags; ++ hdmi->force_output = val; + -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, -+ SW_FLOW_PM_CHECKTRANS_GPU_INTERRUPT_START); -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ cores_are_available = kbase_pm_check_transitions_nolock(kbdev); -+ KBASE_TIMELINE_PM_CHECKTRANS(kbdev, -+ SW_FLOW_PM_CHECKTRANS_GPU_INTERRUPT_END); ++ if (!dw_hdmi_check_output_type_changed(hdmi)) ++ return; + -+ if (cores_are_available) { -+ /* Log timelining information that a change in state has -+ * completed */ -+ kbase_timeline_pm_handle_event(kbdev, -+ KBASE_TIMELINE_PM_EVENT_GPU_STATE_CHANGED); ++ if (!hdmi->bridge_is_on) ++ return; + -+ kbase_backend_slot_update(kbdev); -+ } -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ hdmi_writeb(hdmi, HDMI_FC_GCP_SET_AVMUTE, HDMI_FC_GCP); ++ dw_hdmi_setup(hdmi, hdmi->curr_conn, &hdmi->previous_mode); ++ hdmi_writeb(hdmi, HDMI_FC_GCP_CLEAR_AVMUTE, HDMI_FC_GCP); +} ++EXPORT_SYMBOL_GPL(dw_hdmi_set_output_type); + -+void kbase_pm_set_debug_core_mask(struct kbase_device *kbdev, -+ u64 new_core_mask_js0, u64 new_core_mask_js1, -+ u64 new_core_mask_js2) ++bool dw_hdmi_get_output_whether_hdmi(struct dw_hdmi *hdmi) +{ -+ kbdev->pm.debug_core_mask[0] = new_core_mask_js0; -+ kbdev->pm.debug_core_mask[1] = new_core_mask_js1; -+ kbdev->pm.debug_core_mask[2] = new_core_mask_js2; -+ kbdev->pm.debug_core_mask_all = new_core_mask_js0 | new_core_mask_js1 | -+ new_core_mask_js2; -+ -+ kbase_pm_update_cores_state_nolock(kbdev); ++ return hdmi->sink_is_hdmi; +} ++EXPORT_SYMBOL_GPL(dw_hdmi_get_output_whether_hdmi); + -+void kbase_hwaccess_pm_gpu_active(struct kbase_device *kbdev) ++int dw_hdmi_get_output_type_cap(struct dw_hdmi *hdmi) +{ -+ kbase_pm_update_active(kbdev); ++ return hdmi->support_hdmi; +} ++EXPORT_SYMBOL_GPL(dw_hdmi_get_output_type_cap); + -+void kbase_hwaccess_pm_gpu_idle(struct kbase_device *kbdev) ++void dw_hdmi_set_hpd_wake(struct dw_hdmi *hdmi) +{ -+ kbase_pm_update_active(kbdev); ++ if (!hdmi->cec) ++ return; ++ ++ if (!hdmi->cec_ops) ++ return; ++ ++ if (hdmi->cec_ops->hpd_wake_up) ++ hdmi->cec_ops->hpd_wake_up(hdmi->cec); +} ++EXPORT_SYMBOL_GPL(dw_hdmi_set_hpd_wake); + -+void kbase_hwaccess_pm_suspend(struct kbase_device *kbdev) -+{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; + static void dw_hdmi_connector_force(struct drm_connector *connector) + { + struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi, + connector); + + mutex_lock(&hdmi->mutex); + -+ /* Force power off the GPU and all cores (regardless of policy), only -+ * after the PM active count reaches zero (otherwise, we risk turning it -+ * off prematurely) */ -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); ++ if (hdmi->force != connector->force) { ++ if (!hdmi->disabled && connector->force == DRM_FORCE_OFF) ++ extcon_set_state_sync(hdmi->extcon, EXTCON_DISP_HDMI, ++ false); ++ else if (hdmi->disabled && connector->force == DRM_FORCE_ON) ++ extcon_set_state_sync(hdmi->extcon, EXTCON_DISP_HDMI, ++ true); ++ } + -+ kbase_pm_cancel_deferred_poweroff(kbdev); -+ kbase_pm_do_poweroff(kbdev, true); + hdmi->force = connector->force; + dw_hdmi_update_power(hdmi); + dw_hdmi_update_phy_mask(hdmi); +@@ -2460,15 +3471,99 @@ static const struct drm_connector_funcs dw_hdmi_connector_funcs = { + .destroy = drm_connector_cleanup, + .force = dw_hdmi_connector_force, + .reset = drm_atomic_helper_connector_reset, ++ .set_property = dw_hdmi_connector_set_property, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, ++ .atomic_set_property = dw_hdmi_atomic_connector_set_property, ++ .atomic_get_property = dw_hdmi_atomic_connector_get_property, + }; + + static const struct drm_connector_helper_funcs dw_hdmi_connector_helper_funcs = { + .get_modes = dw_hdmi_connector_get_modes, ++ .best_encoder = dw_hdmi_connector_best_encoder, + .atomic_check = dw_hdmi_connector_atomic_check, ++ .atomic_commit = dw_hdmi_connector_atomic_commit, + }; + ++static void dw_hdmi_attach_properties(struct dw_hdmi *hdmi) ++{ ++ unsigned int color = MEDIA_BUS_FMT_RGB888_1X24; ++ int video_mapping, colorspace; ++ enum drm_connector_status connect_status = ++ hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data); ++ const struct dw_hdmi_property_ops *ops = ++ hdmi->plat_data->property_ops; + -+ kbase_backend_timer_suspend(kbdev); ++ if (connect_status == connector_status_connected) { ++ video_mapping = (hdmi_readb(hdmi, HDMI_TX_INVID0) & ++ HDMI_TX_INVID0_VIDEO_MAPPING_MASK); ++ colorspace = (hdmi_readb(hdmi, HDMI_FC_AVICONF0) & ++ HDMI_FC_AVICONF0_PIX_FMT_MASK); ++ switch (video_mapping) { ++ case 0x01: ++ color = MEDIA_BUS_FMT_RGB888_1X24; ++ break; ++ case 0x03: ++ color = MEDIA_BUS_FMT_RGB101010_1X30; ++ break; ++ case 0x09: ++ if (colorspace == HDMI_COLORSPACE_YUV420) ++ color = MEDIA_BUS_FMT_UYYVYY8_0_5X24; ++ else if (colorspace == HDMI_COLORSPACE_YUV422) ++ color = MEDIA_BUS_FMT_UYVY8_1X16; ++ else ++ color = MEDIA_BUS_FMT_YUV8_1X24; ++ break; ++ case 0x0b: ++ if (colorspace == HDMI_COLORSPACE_YUV420) ++ color = MEDIA_BUS_FMT_UYYVYY10_0_5X30; ++ else if (colorspace == HDMI_COLORSPACE_YUV422) ++ color = MEDIA_BUS_FMT_UYVY10_1X20; ++ else ++ color = MEDIA_BUS_FMT_YUV10_1X30; ++ break; ++ case 0x14: ++ color = MEDIA_BUS_FMT_UYVY10_1X20; ++ break; ++ case 0x16: ++ color = MEDIA_BUS_FMT_UYVY8_1X16; ++ break; ++ default: ++ color = MEDIA_BUS_FMT_RGB888_1X24; ++ dev_err(hdmi->dev, "unexpected mapping: 0x%x\n", ++ video_mapping); ++ } + -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); ++ hdmi->hdmi_data.enc_in_bus_format = color; ++ hdmi->hdmi_data.enc_out_bus_format = color; ++ /* ++ * input format will be set as yuv444 when output ++ * format is yuv420 ++ */ ++ if (color == MEDIA_BUS_FMT_UYVY10_1X20) ++ hdmi->hdmi_data.enc_in_bus_format = ++ MEDIA_BUS_FMT_YUV10_1X30; ++ else if (color == MEDIA_BUS_FMT_UYVY8_1X16) ++ hdmi->hdmi_data.enc_in_bus_format = ++ MEDIA_BUS_FMT_YUV8_1X24; ++ } + -+ kbase_pm_wait_for_poweroff_complete(kbdev); ++ if (ops && ops->attach_properties) ++ return ops->attach_properties(&hdmi->connector, ++ color, hdmi->version, ++ hdmi->plat_data->phy_data, 0); +} + -+void kbase_hwaccess_pm_resume(struct kbase_device *kbdev) ++static void dw_hdmi_destroy_properties(struct dw_hdmi *hdmi) +{ -+ struct kbasep_js_device_data *js_devdata = &kbdev->js_data; -+ -+ mutex_lock(&js_devdata->runpool_mutex); -+ mutex_lock(&kbdev->pm.lock); -+ -+ kbdev->pm.suspending = false; -+ kbase_pm_do_poweron(kbdev, true); -+ -+ kbase_backend_timer_resume(kbdev); ++ const struct dw_hdmi_property_ops *ops = ++ hdmi->plat_data->property_ops; + -+ mutex_unlock(&kbdev->pm.lock); -+ mutex_unlock(&js_devdata->runpool_mutex); ++ if (ops && ops->destroy_properties) ++ return ops->destroy_properties(&hdmi->connector, ++ hdmi->plat_data->phy_data); +} -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c -new file mode 100755 -index 000000000000..85890f1e85f5 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c -@@ -0,0 +1,182 @@ -+/* -+ * -+ * (C) COPYRIGHT 2013-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ + + static int dw_hdmi_connector_create(struct dw_hdmi *hdmi) + { + struct drm_connector *connector = &hdmi->connector; +@@ -2505,6 +3600,8 @@ static int dw_hdmi_connector_create(struct dw_hdmi *hdmi) + + drm_connector_attach_encoder(connector, hdmi->bridge.encoder); + ++ dw_hdmi_attach_properties(hdmi); + -+/* -+ * Base kernel core availability APIs -+ */ + cec_fill_conn_info_from_drm(&conn_info, connector); + + notifier = cec_notifier_conn_register(hdmi->dev, NULL, &conn_info); +@@ -2780,16 +3877,36 @@ static int dw_hdmi_bridge_atomic_check(struct drm_bridge *bridge, + struct drm_connector_state *conn_state) + { + struct dw_hdmi *hdmi = bridge->driver_private; ++ void *data = hdmi->plat_data->phy_data; + +- hdmi->hdmi_data.enc_out_bus_format = +- bridge_state->output_bus_cfg.format; ++ if (bridge_state->output_bus_cfg.format == MEDIA_BUS_FMT_FIXED) { ++ if (hdmi->plat_data->get_output_bus_format) ++ hdmi->hdmi_data.enc_out_bus_format = ++ hdmi->plat_data->get_output_bus_format(data); ++ else ++ hdmi->hdmi_data.enc_out_bus_format = ++ MEDIA_BUS_FMT_RGB888_1X24; + -+#include -+#include -+#include ++ if (hdmi->plat_data->get_input_bus_format) ++ hdmi->hdmi_data.enc_in_bus_format = ++ hdmi->plat_data->get_input_bus_format(data); ++ else if (hdmi->plat_data->input_bus_format) ++ hdmi->hdmi_data.enc_in_bus_format = ++ hdmi->plat_data->input_bus_format; ++ else ++ hdmi->hdmi_data.enc_in_bus_format = ++ MEDIA_BUS_FMT_RGB888_1X24; ++ } else { ++ hdmi->hdmi_data.enc_out_bus_format = ++ bridge_state->output_bus_cfg.format; + +- hdmi->hdmi_data.enc_in_bus_format = +- bridge_state->input_bus_cfg.format; ++ hdmi->hdmi_data.enc_in_bus_format = ++ bridge_state->input_bus_cfg.format; + +- dev_dbg(hdmi->dev, "input format 0x%04x, output format 0x%04x\n", +- bridge_state->input_bus_cfg.format, +- bridge_state->output_bus_cfg.format); ++ dev_dbg(hdmi->dev, "input format 0x%04x, output format 0x%04x\n", ++ bridge_state->input_bus_cfg.format, ++ bridge_state->output_bus_cfg.format); ++ } + + return 0; + } +@@ -2798,10 +3915,22 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge, + enum drm_bridge_attach_flags flags) + { + struct dw_hdmi *hdmi = bridge->driver_private; ++ int ret; + + if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) + return 0; + ++ if (hdmi->next_bridge) { ++ hdmi->next_bridge->encoder = bridge->encoder; ++ ret = drm_bridge_attach(bridge->encoder, hdmi->next_bridge, bridge, flags); ++ if (ret) { ++ DRM_ERROR("Failed to attach bridge with dw-hdmi\n"); ++ return ret; ++ } + -+static const struct kbase_pm_ca_policy *const policy_list[] = { -+ &kbase_pm_ca_fixed_policy_ops, -+#ifdef CONFIG_MALI_DEVFREQ -+ &kbase_pm_ca_devfreq_policy_ops, -+#endif -+#if !MALI_CUSTOMER_RELEASE -+ &kbase_pm_ca_random_policy_ops -+#endif -+}; ++ return 0; ++ } + -+/** -+ * POLICY_COUNT - The number of policies available in the system. -+ * -+ * This is derived from the number of functions listed in policy_list. -+ */ -+#define POLICY_COUNT (sizeof(policy_list)/sizeof(*policy_list)) + return dw_hdmi_connector_create(hdmi); + } + +@@ -2824,9 +3953,11 @@ dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge, + const struct dw_hdmi_plat_data *pdata = hdmi->plat_data; + enum drm_mode_status mode_status = MODE_OK; + +- /* We don't support double-clocked modes */ +- if (mode->flags & DRM_MODE_FLAG_DBLCLK) +- return MODE_BAD; ++ if (hdmi->next_bridge) ++ return MODE_OK; + -+int kbase_pm_ca_init(struct kbase_device *kbdev) ++ if (!(hdmi_readb(hdmi, HDMI_PHY_STAT0) & HDMI_PHY_HPD) && hdmi->hdr2sdr) ++ return MODE_OK; + + if (pdata->mode_valid) + mode_status = pdata->mode_valid(hdmi, pdata->priv_data, info, +@@ -2856,9 +3987,12 @@ static void dw_hdmi_bridge_atomic_disable(struct drm_bridge *bridge, + + mutex_lock(&hdmi->mutex); + hdmi->disabled = true; ++ handle_plugged_change(hdmi, false); + hdmi->curr_conn = NULL; + dw_hdmi_update_power(hdmi); + dw_hdmi_update_phy_mask(hdmi); ++ if (hdmi->plat_data->dclk_set) ++ hdmi->plat_data->dclk_set(hdmi->plat_data->phy_data, false, 0); + mutex_unlock(&hdmi->mutex); + } + +@@ -2875,8 +4009,11 @@ static void dw_hdmi_bridge_atomic_enable(struct drm_bridge *bridge, + mutex_lock(&hdmi->mutex); + hdmi->disabled = false; + hdmi->curr_conn = connector; ++ if (hdmi->plat_data->dclk_set) ++ hdmi->plat_data->dclk_set(hdmi->plat_data->phy_data, true, 0); + dw_hdmi_update_power(hdmi); + dw_hdmi_update_phy_mask(hdmi); ++ handle_plugged_change(hdmi, true); + mutex_unlock(&hdmi->mutex); + } + +@@ -2912,6 +4049,12 @@ static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = { + .get_edid = dw_hdmi_bridge_get_edid, + }; + ++void dw_hdmi_set_cec_adap(struct dw_hdmi *hdmi, struct cec_adapter *adap) +{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ -+ kbdev->pm.backend.ca_current_policy = policy_list[0]; ++ hdmi->cec_adap = adap; ++} ++EXPORT_SYMBOL_GPL(dw_hdmi_set_cec_adap); + -+ kbdev->pm.backend.ca_current_policy->init(kbdev); + /* ----------------------------------------------------------------------------- + * IRQ Handling + */ +@@ -2937,7 +4080,7 @@ static irqreturn_t dw_hdmi_i2c_irq(struct dw_hdmi *hdmi) + static irqreturn_t dw_hdmi_hardirq(int irq, void *dev_id) + { + struct dw_hdmi *hdmi = dev_id; +- u8 intr_stat; ++ u8 intr_stat, hdcp_stat; + irqreturn_t ret = IRQ_NONE; + + if (hdmi->i2c) +@@ -2949,6 +4092,13 @@ static irqreturn_t dw_hdmi_hardirq(int irq, void *dev_id) + return IRQ_WAKE_THREAD; + } + ++ hdcp_stat = hdmi_readb(hdmi, HDMI_A_APIINTSTAT); ++ if (hdcp_stat) { ++ dev_dbg(hdmi->dev, "HDCP irq %#x\n", hdcp_stat); ++ hdmi_writeb(hdmi, 0xff, HDMI_A_APIINTMSK); ++ return IRQ_WAKE_THREAD; ++ } + -+ return 0; -+} + return ret; + } + +@@ -2956,7 +4106,7 @@ void dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense) + { + mutex_lock(&hdmi->mutex); + +- if (!hdmi->force) { ++ if (!hdmi->force && !hdmi->force_logo) { + /* + * If the RX sense status indicates we're disconnected, + * clear the software rxsense status. +@@ -2983,8 +4133,7 @@ EXPORT_SYMBOL_GPL(dw_hdmi_setup_rx_sense); + static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) + { + struct dw_hdmi *hdmi = dev_id; +- u8 intr_stat, phy_int_pol, phy_pol_mask, phy_stat; +- enum drm_connector_status status = connector_status_unknown; ++ u8 intr_stat, phy_int_pol, phy_pol_mask, phy_stat, hdcp_stat; + + intr_stat = hdmi_readb(hdmi, HDMI_IH_PHY_STAT0); + phy_int_pol = hdmi_readb(hdmi, HDMI_PHY_POL0); +@@ -3023,29 +4172,23 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) + cec_notifier_phys_addr_invalidate(hdmi->cec_notifier); + mutex_unlock(&hdmi->cec_notifier_mutex); + } +- +- if (phy_stat & HDMI_PHY_HPD) +- status = connector_status_connected; +- +- if (!(phy_stat & (HDMI_PHY_HPD | HDMI_PHY_RX_SENSE))) +- status = connector_status_disconnected; + } + +- if (status != connector_status_unknown) { +- dev_dbg(hdmi->dev, "EVENT=%s\n", +- status == connector_status_connected ? +- "plugin" : "plugout"); +- +- if (hdmi->bridge.dev) { +- drm_helper_hpd_irq_event(hdmi->bridge.dev); +- drm_bridge_hpd_notify(&hdmi->bridge, status); +- } +- } ++ check_hdmi_irq(hdmi, intr_stat, phy_int_pol); + + hdmi_writeb(hdmi, intr_stat, HDMI_IH_PHY_STAT0); +- hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), +- HDMI_IH_MUTE_PHY_STAT0); +- ++ if (!hdmi->next_bridge) ++ hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | ++ HDMI_IH_PHY_STAT0_RX_SENSE), ++ HDMI_IH_MUTE_PHY_STAT0); + -+void kbase_pm_ca_term(struct kbase_device *kbdev) ++ hdcp_stat = hdmi_readb(hdmi, HDMI_A_APIINTSTAT); ++ if (hdcp_stat) { ++ if (hdmi->hdcp) ++ hdmi->hdcp->hdcp_isr(hdmi->hdcp, hdcp_stat); ++ hdmi_writeb(hdmi, hdcp_stat, HDMI_A_APIINTCLR); ++ hdmi_writeb(hdmi, 0x00, HDMI_A_APIINTMSK); ++ } + return IRQ_HANDLED; + } + +@@ -3152,6 +4295,7 @@ static void dw_hdmi_cec_disable(struct dw_hdmi *hdmi) + static const struct dw_hdmi_cec_ops dw_hdmi_cec_ops = { + .write = hdmi_writeb, + .read = hdmi_readb, ++ .mod = hdmi_modb, + .enable = dw_hdmi_cec_enable, + .disable = dw_hdmi_cec_disable, + }; +@@ -3160,14 +4304,14 @@ static const struct regmap_config hdmi_regmap_8bit_config = { + .reg_bits = 32, + .val_bits = 8, + .reg_stride = 1, +- .max_register = HDMI_I2CM_FS_SCL_LCNT_0_ADDR, ++ .max_register = HDMI_I2CM_SCDC_UPDATE1, + }; + + static const struct regmap_config hdmi_regmap_32bit_config = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +- .max_register = HDMI_I2CM_FS_SCL_LCNT_0_ADDR << 2, ++ .max_register = HDMI_I2CM_SCDC_UPDATE1 << 2, + }; + + static void dw_hdmi_init_hw(struct dw_hdmi *hdmi) +@@ -3185,6 +4329,367 @@ static void dw_hdmi_init_hw(struct dw_hdmi *hdmi) + hdmi->phy.ops->setup_hpd(hdmi, hdmi->phy.data); + } + ++static int dw_hdmi_status_show(struct seq_file *s, void *v) +{ -+ kbdev->pm.backend.ca_current_policy->term(kbdev); -+} ++ struct dw_hdmi *hdmi = s->private; ++ u32 val; + -+int kbase_pm_ca_list_policies(const struct kbase_pm_ca_policy * const **list) -+{ -+ if (!list) -+ return POLICY_COUNT; ++ seq_puts(s, "PHY: "); ++ if (!hdmi->phy.enabled) { ++ seq_puts(s, "disabled\n"); ++ return 0; ++ } ++ seq_puts(s, "enabled\t\t\tMode: "); ++ if (hdmi->sink_is_hdmi) ++ seq_puts(s, "HDMI\n"); ++ else ++ seq_puts(s, "DVI\n"); ++ if (hdmi->hdmi_data.video_mode.mtmdsclock > 340000000) ++ val = hdmi->hdmi_data.video_mode.mtmdsclock / 4; ++ else ++ val = hdmi->hdmi_data.video_mode.mtmdsclock; ++ seq_printf(s, "Pixel Clk: %uHz\t\tTMDS Clk: %uHz\n", ++ hdmi->hdmi_data.video_mode.mpixelclock, val); ++ seq_puts(s, "Color Format: "); ++ if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) ++ seq_puts(s, "RGB"); ++ else if (hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) ++ seq_puts(s, "YUV444"); ++ else if (hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) ++ seq_puts(s, "YUV422"); ++ else if (hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_out_bus_format)) ++ seq_puts(s, "YUV420"); ++ else ++ seq_puts(s, "UNKNOWN"); ++ val = hdmi_bus_fmt_color_depth(hdmi->hdmi_data.enc_out_bus_format); ++ seq_printf(s, "\t\tColor Depth: %d bit\n", val); ++ seq_puts(s, "Colorimetry: "); ++ switch (hdmi->hdmi_data.enc_out_encoding) { ++ case V4L2_YCBCR_ENC_601: ++ seq_puts(s, "ITU.BT601"); ++ break; ++ case V4L2_YCBCR_ENC_709: ++ seq_puts(s, "ITU.BT709"); ++ break; ++ case V4L2_YCBCR_ENC_BT2020: ++ seq_puts(s, "ITU.BT2020"); ++ break; ++ default: /* Carries no data */ ++ seq_puts(s, "ITU.BT601"); ++ break; ++ } + -+ *list = policy_list; ++ seq_puts(s, "\t\tEOTF: "); + -+ return POLICY_COUNT; -+} ++ if (hdmi->version < 0x211a) { ++ seq_puts(s, "Unsupported\n"); ++ return 0; ++ } + -+KBASE_EXPORT_TEST_API(kbase_pm_ca_list_policies); ++ val = hdmi_readb(hdmi, HDMI_FC_PACKET_TX_EN); ++ if (!(val & HDMI_FC_PACKET_TX_EN_DRM_MASK)) { ++ seq_puts(s, "Off\n"); ++ return 0; ++ } + -+const struct kbase_pm_ca_policy -+*kbase_pm_ca_get_policy(struct kbase_device *kbdev) -+{ -+ KBASE_DEBUG_ASSERT(kbdev != NULL); ++ switch (hdmi_readb(hdmi, HDMI_FC_DRM_PB0)) { ++ case HDMI_EOTF_TRADITIONAL_GAMMA_SDR: ++ seq_puts(s, "SDR"); ++ break; ++ case HDMI_EOTF_TRADITIONAL_GAMMA_HDR: ++ seq_puts(s, "HDR"); ++ break; ++ case HDMI_EOTF_SMPTE_ST2084: ++ seq_puts(s, "ST2084"); ++ break; ++ case HDMI_EOTF_BT_2100_HLG: ++ seq_puts(s, "HLG"); ++ break; ++ default: ++ seq_puts(s, "Not Defined\n"); ++ return 0; ++ } + -+ return kbdev->pm.backend.ca_current_policy; ++ val = hdmi_readb(hdmi, HDMI_FC_DRM_PB3) << 8; ++ val |= hdmi_readb(hdmi, HDMI_FC_DRM_PB2); ++ seq_printf(s, "\nx0: %d", val); ++ val = hdmi_readb(hdmi, HDMI_FC_DRM_PB5) << 8; ++ val |= hdmi_readb(hdmi, HDMI_FC_DRM_PB4); ++ seq_printf(s, "\t\t\t\ty0: %d\n", val); ++ val = hdmi_readb(hdmi, HDMI_FC_DRM_PB7) << 8; ++ val |= hdmi_readb(hdmi, HDMI_FC_DRM_PB6); ++ seq_printf(s, "x1: %d", val); ++ val = hdmi_readb(hdmi, HDMI_FC_DRM_PB9) << 8; ++ val |= hdmi_readb(hdmi, HDMI_FC_DRM_PB8); ++ seq_printf(s, "\t\t\t\ty1: %d\n", val); ++ val = hdmi_readb(hdmi, HDMI_FC_DRM_PB11) << 8; ++ val |= hdmi_readb(hdmi, HDMI_FC_DRM_PB10); ++ seq_printf(s, "x2: %d", val); ++ val = hdmi_readb(hdmi, HDMI_FC_DRM_PB13) << 8; ++ val |= hdmi_readb(hdmi, HDMI_FC_DRM_PB12); ++ seq_printf(s, "\t\t\t\ty2: %d\n", val); ++ val = hdmi_readb(hdmi, HDMI_FC_DRM_PB15) << 8; ++ val |= hdmi_readb(hdmi, HDMI_FC_DRM_PB14); ++ seq_printf(s, "white x: %d", val); ++ val = hdmi_readb(hdmi, HDMI_FC_DRM_PB17) << 8; ++ val |= hdmi_readb(hdmi, HDMI_FC_DRM_PB16); ++ seq_printf(s, "\t\t\twhite y: %d\n", val); ++ val = hdmi_readb(hdmi, HDMI_FC_DRM_PB19) << 8; ++ val |= hdmi_readb(hdmi, HDMI_FC_DRM_PB18); ++ seq_printf(s, "max lum: %d", val); ++ val = hdmi_readb(hdmi, HDMI_FC_DRM_PB21) << 8; ++ val |= hdmi_readb(hdmi, HDMI_FC_DRM_PB20); ++ seq_printf(s, "\t\t\tmin lum: %d\n", val); ++ val = hdmi_readb(hdmi, HDMI_FC_DRM_PB23) << 8; ++ val |= hdmi_readb(hdmi, HDMI_FC_DRM_PB22); ++ seq_printf(s, "max cll: %d", val); ++ val = hdmi_readb(hdmi, HDMI_FC_DRM_PB25) << 8; ++ val |= hdmi_readb(hdmi, HDMI_FC_DRM_PB24); ++ seq_printf(s, "\t\t\tmax fall: %d\n", val); ++ return 0; +} + -+KBASE_EXPORT_TEST_API(kbase_pm_ca_get_policy); -+ -+void kbase_pm_ca_set_policy(struct kbase_device *kbdev, -+ const struct kbase_pm_ca_policy *new_policy) ++static int dw_hdmi_status_open(struct inode *inode, struct file *file) +{ -+ const struct kbase_pm_ca_policy *old_policy; -+ unsigned long flags; ++ return single_open(file, dw_hdmi_status_show, inode->i_private); ++} + -+ KBASE_DEBUG_ASSERT(kbdev != NULL); -+ KBASE_DEBUG_ASSERT(new_policy != NULL); ++static const struct file_operations dw_hdmi_status_fops = { ++ .owner = THIS_MODULE, ++ .open = dw_hdmi_status_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; + -+ KBASE_TRACE_ADD(kbdev, PM_CA_SET_POLICY, NULL, NULL, 0u, -+ new_policy->id); ++#include ++#include ++#include + -+ /* During a policy change we pretend the GPU is active */ -+ /* A suspend won't happen here, because we're in a syscall from a -+ * userspace thread */ -+ kbase_pm_context_active(kbdev); ++struct dw_hdmi_reg_table { ++ int reg_base; ++ int reg_end; ++}; + -+ mutex_lock(&kbdev->pm.lock); ++static const struct dw_hdmi_reg_table hdmi_reg_table[] = { ++ {HDMI_DESIGN_ID, HDMI_CONFIG3_ID}, ++ {HDMI_IH_FC_STAT0, HDMI_IH_MUTE}, ++ {HDMI_TX_INVID0, HDMI_TX_BCBDATA1}, ++ {HDMI_VP_STATUS, HDMI_VP_POL}, ++ {HDMI_FC_INVIDCONF, HDMI_FC_DBGTMDS2}, ++ {HDMI_PHY_CONF0, HDMI_PHY_POL0}, ++ {HDMI_PHY_I2CM_SLAVE_ADDR, HDMI_PHY_I2CM_FS_SCL_LCNT_0_ADDR}, ++ {HDMI_AUD_CONF0, 0x3624}, ++ {HDMI_MC_SFRDIV, HDMI_MC_HEACPHY_RST}, ++ {HDMI_CSC_CFG, HDMI_CSC_COEF_C4_LSB}, ++ {HDMI_A_HDCPCFG0, 0x52bb}, ++ {0x7800, 0x7818}, ++ {0x7900, 0x790e}, ++ {HDMI_CEC_CTRL, HDMI_CEC_WKUPCTRL}, ++ {HDMI_I2CM_SLAVE, 0x7e31}, ++}; + -+ /* Remove the policy to prevent IRQ handlers from working on it */ -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ old_policy = kbdev->pm.backend.ca_current_policy; -+ kbdev->pm.backend.ca_current_policy = NULL; -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++static int dw_hdmi_ctrl_show(struct seq_file *s, void *v) ++{ ++ struct dw_hdmi *hdmi = s->private; ++ u32 i = 0, j = 0, val = 0; + -+ if (old_policy->term) -+ old_policy->term(kbdev); ++ seq_puts(s, "\n>>>hdmi_ctl reg "); ++ for (i = 0; i < 16; i++) ++ seq_printf(s, " %2x", i); ++ seq_puts(s, "\n---------------------------------------------------"); + -+ if (new_policy->init) -+ new_policy->init(kbdev); ++ for (i = 0; i < ARRAY_SIZE(hdmi_reg_table); i++) { ++ for (j = hdmi_reg_table[i].reg_base; ++ j <= hdmi_reg_table[i].reg_end; j++) { ++ val = hdmi_readb(hdmi, j); ++ if ((j - hdmi_reg_table[i].reg_base) % 16 == 0) ++ seq_printf(s, "\n>>>hdmi_ctl %04x:", j); ++ seq_printf(s, " %02x", val); ++ } ++ } ++ seq_puts(s, "\n---------------------------------------------------\n"); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbdev->pm.backend.ca_current_policy = new_policy; ++ return 0; ++} + -+ /* If any core power state changes were previously attempted, but -+ * couldn't be made because the policy was changing (current_policy was -+ * NULL), then re-try them here. */ -+ kbase_pm_update_cores_state_nolock(kbdev); ++static int dw_hdmi_ctrl_open(struct inode *inode, struct file *file) ++{ ++ return single_open(file, dw_hdmi_ctrl_show, inode->i_private); ++} + -+ kbdev->pm.backend.ca_current_policy->update_core_status(kbdev, -+ kbdev->shader_ready_bitmap, -+ kbdev->shader_transitioning_bitmap); ++static ssize_t ++dw_hdmi_ctrl_write(struct file *file, const char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ struct dw_hdmi *hdmi = ++ ((struct seq_file *)file->private_data)->private; ++ u32 reg, val; ++ char kbuf[25]; + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ if (copy_from_user(kbuf, buf, count)) ++ return -EFAULT; ++ if (sscanf(kbuf, "%x%x", ®, &val) == -1) ++ return -EFAULT; ++ if (reg > HDMI_I2CM_FS_SCL_LCNT_0_ADDR) { ++ dev_err(hdmi->dev, "it is no a hdmi register\n"); ++ return count; ++ } ++ dev_info(hdmi->dev, "/**********hdmi register config******/"); ++ dev_info(hdmi->dev, "\n reg=%x val=%x\n", reg, val); ++ hdmi_writeb(hdmi, val, reg); ++ return count; ++} + -+ mutex_unlock(&kbdev->pm.lock); ++static const struct file_operations dw_hdmi_ctrl_fops = { ++ .owner = THIS_MODULE, ++ .open = dw_hdmi_ctrl_open, ++ .read = seq_read, ++ .write = dw_hdmi_ctrl_write, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; + -+ /* Now the policy change is finished, we release our fake context active -+ * reference */ -+ kbase_pm_context_idle(kbdev); ++static int dw_hdmi_phy_show(struct seq_file *s, void *v) ++{ ++ struct dw_hdmi *hdmi = s->private; ++ u32 i; ++ ++ seq_puts(s, "\n>>>hdmi_phy reg "); ++ for (i = 0; i < 0x28; i++) ++ seq_printf(s, "regs %02x val %04x\n", ++ i, hdmi_phy_i2c_read(hdmi, i)); ++ return 0; +} + -+KBASE_EXPORT_TEST_API(kbase_pm_ca_set_policy); ++static int dw_hdmi_phy_open(struct inode *inode, struct file *file) ++{ ++ return single_open(file, dw_hdmi_phy_show, inode->i_private); ++} + -+u64 kbase_pm_ca_get_core_mask(struct kbase_device *kbdev) ++static ssize_t ++dw_hdmi_phy_write(struct file *file, const char __user *buf, ++ size_t count, loff_t *ppos) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ struct dw_hdmi *hdmi = ++ ((struct seq_file *)file->private_data)->private; ++ u32 reg, val; ++ char kbuf[25]; + -+ /* All cores must be enabled when instrumentation is in use */ -+ if (kbdev->pm.backend.instr_enabled) -+ return kbdev->gpu_props.props.raw_props.shader_present & -+ kbdev->pm.debug_core_mask_all; ++ if (copy_from_user(kbuf, buf, count)) ++ return -EFAULT; ++ if (sscanf(kbuf, "%x%x", ®, &val) == -1) ++ return -EFAULT; ++ if (reg > 0x28) { ++ dev_err(hdmi->dev, "it is not a hdmi phy register\n"); ++ return count; ++ } ++ dev_info(hdmi->dev, "/*******hdmi phy register config******/"); ++ dev_info(hdmi->dev, "\n reg=%x val=%x\n", reg, val); ++ dw_hdmi_phy_i2c_write(hdmi, val, reg); ++ return count; ++} + -+ if (kbdev->pm.backend.ca_current_policy == NULL) -+ return kbdev->gpu_props.props.raw_props.shader_present & -+ kbdev->pm.debug_core_mask_all; ++static const struct file_operations dw_hdmi_phy_fops = { ++ .owner = THIS_MODULE, ++ .open = dw_hdmi_phy_open, ++ .read = seq_read, ++ .write = dw_hdmi_phy_write, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; + -+ return kbdev->pm.backend.ca_current_policy->get_core_mask(kbdev) & -+ kbdev->pm.debug_core_mask_all; ++static void dw_hdmi_register_debugfs(struct device *dev, struct dw_hdmi *hdmi) ++{ ++ hdmi->debugfs_dir = debugfs_create_dir("dw-hdmi", NULL); ++ if (IS_ERR(hdmi->debugfs_dir)) { ++ dev_err(dev, "failed to create debugfs dir!\n"); ++ return; ++ } ++ debugfs_create_file("status", 0400, hdmi->debugfs_dir, ++ hdmi, &dw_hdmi_status_fops); ++ debugfs_create_file("ctrl", 0400, hdmi->debugfs_dir, ++ hdmi, &dw_hdmi_ctrl_fops); ++ debugfs_create_file("phy", 0400, hdmi->debugfs_dir, ++ hdmi, &dw_hdmi_phy_fops); +} + -+KBASE_EXPORT_TEST_API(kbase_pm_ca_get_core_mask); -+ -+void kbase_pm_ca_update_core_status(struct kbase_device *kbdev, u64 cores_ready, -+ u64 cores_transitioning) ++static void dw_hdmi_register_hdcp(struct device *dev, struct dw_hdmi *hdmi, ++ u32 val, bool hdcp1x_enable) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); ++ struct dw_hdcp hdmi_hdcp = { ++ .hdmi = hdmi, ++ .write = hdmi_writeb, ++ .read = hdmi_readb, ++ .regs = hdmi->regs, ++ .reg_io_width = val, ++ .enable = hdcp1x_enable, ++ }; ++ struct platform_device_info hdcp_device_info = { ++ .parent = dev, ++ .id = PLATFORM_DEVID_AUTO, ++ .res = NULL, ++ .num_res = 0, ++ .name = DW_HDCP_DRIVER_NAME, ++ .data = &hdmi_hdcp, ++ .size_data = sizeof(hdmi_hdcp), ++ .dma_mask = DMA_BIT_MASK(32), ++ }; + -+ if (kbdev->pm.backend.ca_current_policy != NULL) -+ kbdev->pm.backend.ca_current_policy->update_core_status(kbdev, -+ cores_ready, -+ cores_transitioning); ++ hdmi->hdcp_dev = platform_device_register_full(&hdcp_device_info); ++ if (IS_ERR(hdmi->hdcp_dev)) ++ dev_err(dev, "failed to register hdcp!\n"); ++ else ++ hdmi->hdcp = hdmi->hdcp_dev->dev.platform_data; +} + -+void kbase_pm_ca_instr_enable(struct kbase_device *kbdev) ++static int get_force_logo_property(struct dw_hdmi *hdmi) +{ -+ unsigned long flags; ++ struct device_node *dss; ++ struct device_node *route; ++ struct device_node *route_hdmi; + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); -+ kbdev->pm.backend.instr_enabled = true; ++ dss = of_find_node_by_name(NULL, "display-subsystem"); ++ if (!dss) { ++ dev_err(hdmi->dev, "can't find display-subsystem\n"); ++ return -ENODEV; ++ } + -+ kbase_pm_update_cores_state_nolock(kbdev); -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ route = of_find_node_by_name(dss, "route"); ++ if (!route) { ++ dev_err(hdmi->dev, "can't find route\n"); ++ of_node_put(dss); ++ return -ENODEV; ++ } ++ of_node_put(dss); ++ ++ route_hdmi = of_find_node_by_name(route, "route-hdmi"); ++ if (!route_hdmi) { ++ dev_err(hdmi->dev, "can't find route-hdmi\n"); ++ of_node_put(route); ++ return -ENODEV; ++ } ++ of_node_put(route); ++ ++ hdmi->force_logo = ++ of_property_read_bool(route_hdmi, "force-output"); ++ ++ of_node_put(route_hdmi); ++ ++ return 0; +} + -+void kbase_pm_ca_instr_disable(struct kbase_device *kbdev) ++void ++dw_hdmi_cec_wake_ops_register(struct dw_hdmi *hdmi, const struct dw_hdmi_cec_wake_ops *cec_ops) +{ -+ lockdep_assert_held(&kbdev->hwaccess_lock); -+ kbdev->pm.backend.instr_enabled = false; ++ if (!cec_ops || !hdmi) ++ return; + -+ kbase_pm_update_cores_state_nolock(kbdev); ++ hdmi->cec_ops = cec_ops; +} -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h -new file mode 100755 -index 000000000000..ee9e751f2d79 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h -@@ -0,0 +1,92 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++EXPORT_SYMBOL_GPL(dw_hdmi_cec_wake_ops_register); + + + /* ----------------------------------------------------------------------------- + * Probe/remove API, used from platforms based on the DRM bridge API. + */ +@@ -3193,6 +4698,7 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev, + { + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; ++ struct device_node *endpoint; + struct platform_device_info pdevinfo; + struct device_node *ddc_node; + struct dw_hdmi_cec_data cec; +@@ -3205,11 +4711,13 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev, + u8 prod_id1; + u8 config0; + u8 config3; ++ bool hdcp1x_enable = 0; + + hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL); + if (!hdmi) + return ERR_PTR(-ENOMEM); + ++ hdmi->connector.stereo_allowed = 1; + hdmi->plat_data = plat_data; + hdmi->dev = dev; + hdmi->sample_rate = 48000; +@@ -3340,7 +4848,31 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev, + prod_id1 & HDMI_PRODUCT_ID1_HDCP ? "with" : "without", + hdmi->phy.name); + +- dw_hdmi_init_hw(hdmi); ++ ret = get_force_logo_property(hdmi); ++ if (ret) ++ goto err_iahb; + -+/* -+ * Base kernel core availability APIs -+ */ ++ hdmi->logo_plug_out = false; ++ hdmi->initialized = false; ++ ret = hdmi_readb(hdmi, HDMI_PHY_STAT0); ++ if (((ret & HDMI_PHY_TX_PHY_LOCK) && (ret & HDMI_PHY_HPD) && ++ hdmi_readb(hdmi, HDMI_FC_EXCTRLDUR)) || hdmi->force_logo) { ++ hdmi->mc_clkdis = hdmi_readb(hdmi, HDMI_MC_CLKDIS); ++ hdmi->disabled = false; ++ hdmi->bridge_is_on = true; ++ hdmi->phy.enabled = true; ++ hdmi->initialized = true; ++ if (hdmi->plat_data->set_ddc_io) ++ hdmi->plat_data->set_ddc_io(hdmi->plat_data->phy_data, true); ++ if (hdmi->plat_data->dclk_set) ++ hdmi->plat_data->dclk_set(hdmi->plat_data->phy_data, true, 0); ++ } else if (ret & HDMI_PHY_TX_PHY_LOCK) { ++ hdmi->phy.ops->disable(hdmi, hdmi->phy.data); ++ if (hdmi->plat_data->set_ddc_io) ++ hdmi->plat_data->set_ddc_io(hdmi->plat_data->phy_data, false); ++ } + -+#ifndef _KBASE_PM_CA_H_ -+#define _KBASE_PM_CA_H_ ++ init_hpd_work(hdmi); + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { +@@ -3348,8 +4880,9 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev, + goto err_iahb; + } + ++ hdmi->irq = irq; + ret = devm_request_threaded_irq(dev, irq, dw_hdmi_hardirq, +- dw_hdmi_irq, IRQF_SHARED, ++ dw_hdmi_irq, IRQF_SHARED | IRQF_ONESHOT, + dev_name(dev), hdmi); + if (ret) + goto err_iahb; +@@ -3383,8 +4916,20 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev, + hdmi->ddc = dw_hdmi_i2c_adapter(hdmi); + if (IS_ERR(hdmi->ddc)) + hdmi->ddc = NULL; ++ /* ++ * Read high and low time from device tree. If not available use ++ * the default timing scl clock rate is about 99.6KHz. ++ */ ++ if (of_property_read_u32(np, "ddc-i2c-scl-high-time-ns", ++ &hdmi->i2c->scl_high_ns)) ++ hdmi->i2c->scl_high_ns = 4708; ++ if (of_property_read_u32(np, "ddc-i2c-scl-low-time-ns", ++ &hdmi->i2c->scl_low_ns)) ++ hdmi->i2c->scl_low_ns = 4916; + } + ++ dw_hdmi_init_hw(hdmi); + -+/** -+ * kbase_pm_ca_init - Initialize core availability framework -+ * -+ * Must be called before calling any other core availability function -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * Return: 0 if the core availability framework was successfully initialized, -+ * -errno otherwise -+ */ -+int kbase_pm_ca_init(struct kbase_device *kbdev); + hdmi->bridge.driver_private = hdmi; + hdmi->bridge.funcs = &dw_hdmi_bridge_funcs; + hdmi->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID +@@ -3393,6 +4938,30 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev, + hdmi->bridge.of_node = pdev->dev.of_node; + #endif + ++ endpoint = of_graph_get_endpoint_by_regs(hdmi->dev->of_node, 1, -1); ++ if (endpoint && of_device_is_available(endpoint)) { ++ struct device_node *remote; + -+/** -+ * kbase_pm_ca_term - Terminate core availability framework -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ */ -+void kbase_pm_ca_term(struct kbase_device *kbdev); ++ remote = of_graph_get_remote_port_parent(endpoint); ++ of_node_put(endpoint); ++ if (!remote || !of_device_is_available(remote)) { ++ of_node_put(remote); ++ ret = -ENODEV; ++ goto err_iahb; ++ } + -+/** -+ * kbase_pm_ca_get_core_mask - Get currently available shaders core mask -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * Returns a mask of the currently available shader cores. -+ * Calls into the core availability policy -+ * -+ * Return: The bit mask of available cores -+ */ -+u64 kbase_pm_ca_get_core_mask(struct kbase_device *kbdev); ++ hdmi->next_bridge = of_drm_find_bridge(remote); ++ of_node_put(remote); ++ if (!hdmi->next_bridge) { ++ dev_err(hdmi->dev, "can't find next bridge\n"); ++ ret = -EPROBE_DEFER; ++ goto err_iahb; ++ } + -+/** -+ * kbase_pm_ca_update_core_status - Update core status -+ * -+ * @kbdev: The kbase device structure for the device (must be -+ * a valid pointer) -+ * @cores_ready: The bit mask of cores ready for job submission -+ * @cores_transitioning: The bit mask of cores that are transitioning power -+ * state -+ * -+ * Update core availability policy with current core power status -+ * -+ * Calls into the core availability policy -+ */ -+void kbase_pm_ca_update_core_status(struct kbase_device *kbdev, u64 cores_ready, -+ u64 cores_transitioning); ++ hdmi->sink_is_hdmi = true; ++ hdmi->sink_has_audio = true; ++ } + -+/** -+ * kbase_pm_ca_instr_enable - Enable override for instrumentation -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * This overrides the output of the core availability policy, ensuring that all -+ * cores are available -+ */ -+void kbase_pm_ca_instr_enable(struct kbase_device *kbdev); + memset(&pdevinfo, 0, sizeof(pdevinfo)); + pdevinfo.parent = dev; + pdevinfo.id = PLATFORM_DEVID_AUTO; +@@ -3423,6 +4992,7 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev, + audio.get_eld = hdmi_audio_get_eld; + audio.write = hdmi_writeb; + audio.read = hdmi_readb; ++ audio.mod = hdmi_modb; + hdmi->enable_audio = dw_hdmi_i2s_audio_enable; + hdmi->disable_audio = dw_hdmi_i2s_audio_disable; + +@@ -3438,6 +5008,12 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev, + cec.ops = &dw_hdmi_cec_ops; + cec.irq = irq; + ++ irq = platform_get_irq(pdev, 1); ++ if (irq < 0) ++ dev_dbg(hdmi->dev, "can't get cec wake up irq\n"); ++ ++ cec.wake_irq = irq; ++ + pdevinfo.name = "dw-hdmi-cec"; + pdevinfo.data = &cec; + pdevinfo.size_data = sizeof(cec); +@@ -3446,8 +5022,40 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev, + hdmi->cec = platform_device_register_full(&pdevinfo); + } + ++ hdmi->extcon = devm_extcon_dev_allocate(hdmi->dev, dw_hdmi_cable); ++ if (IS_ERR(hdmi->extcon)) { ++ ret = PTR_ERR(hdmi->extcon); ++ dev_err(hdmi->dev, "allocate extcon failed: %d\n", ret); ++ goto err_iahb; ++ } + -+/** -+ * kbase_pm_ca_instr_disable - Disable override for instrumentation -+ * -+ * @kbdev: The kbase device structure for the device (must be a valid pointer) -+ * -+ * This disables any previously enabled override, and resumes normal policy -+ * functionality -+ */ -+void kbase_pm_ca_instr_disable(struct kbase_device *kbdev); ++ ret = devm_extcon_dev_register(hdmi->dev, hdmi->extcon); ++ if (ret) { ++ dev_err(hdmi->dev, "failed to register extcon: %d\n", ++ ret); ++ goto err_iahb; ++ } + -+#endif /* _KBASE_PM_CA_H_ */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c -new file mode 100755 -index 000000000000..66bf660cffb6 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c -@@ -0,0 +1,129 @@ -+/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ ret = extcon_set_property_capability(hdmi->extcon, EXTCON_DISP_HDMI, ++ EXTCON_PROP_DISP_HPD); ++ if (ret) { ++ dev_err(hdmi->dev, ++ "failed to set USB property capability: %d\n", ++ ret); ++ goto err_iahb; ++ } + + drm_bridge_add(&hdmi->bridge); + ++ dw_hdmi_register_debugfs(dev, hdmi); + ++ if (of_property_read_bool(np, "scramble-low-rates")) ++ hdmi->scramble_low_rates = true; + -+/* -+ * A core availability policy implementing core mask selection from devfreq OPPs -+ * -+ */ ++ if (of_property_read_bool(np, "hdcp1x-enable")) ++ hdcp1x_enable = 1; ++ dw_hdmi_register_hdcp(dev, hdmi, val, hdcp1x_enable); + -+#include -+#include -+#include -+#include + return hdmi; + + err_iahb: +@@ -3457,7 +5065,10 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev, + err_isfr: + clk_disable_unprepare(hdmi->isfr_clk); + err_res: +- i2c_put_adapter(hdmi->ddc); ++ if (hdmi->i2c) ++ i2c_del_adapter(&hdmi->i2c->adap); ++ else ++ i2c_put_adapter(hdmi->ddc); + + return ERR_PTR(ret); + } +@@ -3465,16 +5076,35 @@ EXPORT_SYMBOL_GPL(dw_hdmi_probe); + + void dw_hdmi_remove(struct dw_hdmi *hdmi) + { ++ if (hdmi->irq) ++ disable_irq(hdmi->irq); + -+void kbase_devfreq_set_core_mask(struct kbase_device *kbdev, u64 core_mask) -+{ -+ struct kbasep_pm_ca_policy_devfreq *data = -+ &kbdev->pm.backend.ca_policy_data.devfreq; -+ unsigned long flags; ++ cancel_delayed_work(&hdmi->work); ++ flush_workqueue(hdmi->workqueue); ++ destroy_workqueue(hdmi->workqueue); + -+ spin_lock_irqsave(&kbdev->hwaccess_lock, flags); ++ debugfs_remove_recursive(hdmi->debugfs_dir); + -+ data->cores_desired = core_mask; + drm_bridge_remove(&hdmi->bridge); + + if (hdmi->audio && !IS_ERR(hdmi->audio)) + platform_device_unregister(hdmi->audio); ++ if (hdmi->hdcp_dev && !IS_ERR(hdmi->hdcp_dev)) ++ platform_device_unregister(hdmi->hdcp_dev); + if (!IS_ERR(hdmi->cec)) + platform_device_unregister(hdmi->cec); + + /* Disable all interrupts */ + hdmi_writeb(hdmi, ~0, HDMI_IH_MUTE_PHY_STAT0); + ++ if (!hdmi->next_bridge) { ++ dw_hdmi_destroy_properties(hdmi); ++ hdmi->connector.funcs->destroy(&hdmi->connector); ++ } + -+ /* Disable any cores that are now unwanted */ -+ data->cores_enabled &= data->cores_desired; ++ if (hdmi->bridge.encoder) ++ hdmi->bridge.encoder->funcs->destroy(hdmi->bridge.encoder); + -+ kbdev->pm.backend.ca_in_transition = true; + clk_disable_unprepare(hdmi->iahb_clk); + clk_disable_unprepare(hdmi->isfr_clk); + if (hdmi->cec_clk) +@@ -3492,7 +5122,7 @@ EXPORT_SYMBOL_GPL(dw_hdmi_remove); + */ + struct dw_hdmi *dw_hdmi_bind(struct platform_device *pdev, + struct drm_encoder *encoder, +- const struct dw_hdmi_plat_data *plat_data) ++ struct dw_hdmi_plat_data *plat_data) + { + struct dw_hdmi *hdmi; + int ret; +@@ -3508,6 +5138,9 @@ struct dw_hdmi *dw_hdmi_bind(struct platform_device *pdev, + return ERR_PTR(ret); + } + ++ if (!hdmi->next_bridge) ++ plat_data->connector = &hdmi->connector; + -+ /* If there are no cores to be powered off then power on desired cores -+ */ -+ if (!(data->cores_used & ~data->cores_desired)) { -+ data->cores_enabled = data->cores_desired; -+ kbdev->pm.backend.ca_in_transition = false; -+ } + return hdmi; + } + EXPORT_SYMBOL_GPL(dw_hdmi_bind); +@@ -3518,9 +5151,86 @@ void dw_hdmi_unbind(struct dw_hdmi *hdmi) + } + EXPORT_SYMBOL_GPL(dw_hdmi_unbind); + ++static void dw_hdmi_reg_initial(struct dw_hdmi *hdmi) ++{ ++ if (hdmi_readb(hdmi, HDMI_IH_MUTE)) { ++ initialize_hdmi_ih_mutes(hdmi); ++ /* unmute cec irq */ ++ hdmi_writeb(hdmi, 0x68, HDMI_IH_MUTE_CEC_STAT0); + -+ kbase_pm_update_cores_state_nolock(kbdev); ++ hdmi_writeb(hdmi, HDMI_PHY_I2CM_INT_ADDR_DONE_POL, ++ HDMI_PHY_I2CM_INT_ADDR); + -+ spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); ++ hdmi_writeb(hdmi, HDMI_PHY_I2CM_CTLINT_ADDR_NAC_POL | ++ HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL, ++ HDMI_PHY_I2CM_CTLINT_ADDR); + -+ dev_dbg(kbdev->dev, "Devfreq policy : new core mask=%llX %llX\n", -+ data->cores_desired, data->cores_enabled); ++ if (!hdmi->next_bridge) { ++ hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, ++ HDMI_PHY_POL0); ++ hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); ++ hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | ++ HDMI_IH_PHY_STAT0_RX_SENSE), ++ HDMI_IH_MUTE_PHY_STAT0); ++ } ++ } +} + -+static void devfreq_init(struct kbase_device *kbdev) ++void dw_hdmi_suspend(struct dw_hdmi *hdmi) +{ -+ struct kbasep_pm_ca_policy_devfreq *data = -+ &kbdev->pm.backend.ca_policy_data.devfreq; ++ if (!hdmi) ++ return; + -+ if (kbdev->current_core_mask) { -+ data->cores_enabled = kbdev->current_core_mask; -+ data->cores_desired = kbdev->current_core_mask; -+ } else { -+ data->cores_enabled = -+ kbdev->gpu_props.props.raw_props.shader_present; -+ data->cores_desired = -+ kbdev->gpu_props.props.raw_props.shader_present; ++ mutex_lock(&hdmi->mutex); ++ ++ /* ++ * When system shutdown, hdmi should be disabled. ++ * When system suspend, dw_hdmi_bridge_disable will disable hdmi first. ++ * To prevent duplicate operation, we should determine whether hdmi ++ * has been disabled. ++ */ ++ if (!hdmi->disabled) { ++ hdmi->disabled = true; ++ dw_hdmi_update_power(hdmi); ++ dw_hdmi_update_phy_mask(hdmi); + } -+ data->cores_used = 0; -+ kbdev->pm.backend.ca_in_transition = false; -+} ++ mutex_unlock(&hdmi->mutex); + -+static void devfreq_term(struct kbase_device *kbdev) -+{ ++ if (hdmi->irq) ++ disable_irq(hdmi->irq); ++ cancel_delayed_work(&hdmi->work); ++ flush_workqueue(hdmi->workqueue); ++ pinctrl_pm_select_sleep_state(hdmi->dev); +} ++EXPORT_SYMBOL_GPL(dw_hdmi_suspend); + -+static u64 devfreq_get_core_mask(struct kbase_device *kbdev) + void dw_hdmi_resume(struct dw_hdmi *hdmi) + { +- dw_hdmi_init_hw(hdmi); ++ if (!hdmi) ++ return; ++ ++ pinctrl_pm_select_default_state(hdmi->dev); ++ mutex_lock(&hdmi->mutex); ++ dw_hdmi_reg_initial(hdmi); ++ dw_hdmi_i2c_init(hdmi); ++ if (hdmi->irq) ++ enable_irq(hdmi->irq); ++ /* ++ * HDMI status maybe incorrect in the following condition: ++ * HDMI plug in -> system sleep -> HDMI plug out -> system wake up. ++ * At this time, cat /sys/class/drm/card 0-HDMI-A-1/status is connected. ++ * There is no hpd interrupt, because HDMI is powerdown during suspend. ++ * So we need check the current HDMI status in this case. ++ */ ++ if (hdmi->connector.status == connector_status_connected) { ++ if (hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data) == ++ connector_status_disconnected) { ++ hdmi->hpd_state = false; ++ mod_delayed_work(hdmi->workqueue, &hdmi->work, ++ msecs_to_jiffies(20)); ++ } ++ } ++ mutex_unlock(&hdmi->mutex); + } + EXPORT_SYMBOL_GPL(dw_hdmi_resume); + +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +index 1999db05b..71e476bcf 100644 +--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +@@ -509,6 +509,51 @@ + #define HDMI_A_PRESETUP 0x501A + #define HDMI_A_SRM_BASE 0x5020 + ++/* CEC Engine Registers */ ++#define HDMI_CEC_CTRL 0x7D00 ++#define HDMI_CEC_STAT 0x7D01 ++#define HDMI_CEC_MASK 0x7D02 ++#define HDMI_CEC_POLARITY 0x7D03 ++#define HDMI_CEC_INT 0x7D04 ++#define HDMI_CEC_ADDR_L 0x7D05 ++#define HDMI_CEC_ADDR_H 0x7D06 ++#define HDMI_CEC_TX_CNT 0x7D07 ++#define HDMI_CEC_RX_CNT 0x7D08 ++#define HDMI_CEC_TX_DATA0 0x7D10 ++#define HDMI_CEC_TX_DATA1 0x7D11 ++#define HDMI_CEC_TX_DATA2 0x7D12 ++#define HDMI_CEC_TX_DATA3 0x7D13 ++#define HDMI_CEC_TX_DATA4 0x7D14 ++#define HDMI_CEC_TX_DATA5 0x7D15 ++#define HDMI_CEC_TX_DATA6 0x7D16 ++#define HDMI_CEC_TX_DATA7 0x7D17 ++#define HDMI_CEC_TX_DATA8 0x7D18 ++#define HDMI_CEC_TX_DATA9 0x7D19 ++#define HDMI_CEC_TX_DATA10 0x7D1a ++#define HDMI_CEC_TX_DATA11 0x7D1b ++#define HDMI_CEC_TX_DATA12 0x7D1c ++#define HDMI_CEC_TX_DATA13 0x7D1d ++#define HDMI_CEC_TX_DATA14 0x7D1e ++#define HDMI_CEC_TX_DATA15 0x7D1f ++#define HDMI_CEC_RX_DATA0 0x7D20 ++#define HDMI_CEC_RX_DATA1 0x7D21 ++#define HDMI_CEC_RX_DATA2 0x7D22 ++#define HDMI_CEC_RX_DATA3 0x7D23 ++#define HDMI_CEC_RX_DATA4 0x7D24 ++#define HDMI_CEC_RX_DATA5 0x7D25 ++#define HDMI_CEC_RX_DATA6 0x7D26 ++#define HDMI_CEC_RX_DATA7 0x7D27 ++#define HDMI_CEC_RX_DATA8 0x7D28 ++#define HDMI_CEC_RX_DATA9 0x7D29 ++#define HDMI_CEC_RX_DATA10 0x7D2a ++#define HDMI_CEC_RX_DATA11 0x7D2b ++#define HDMI_CEC_RX_DATA12 0x7D2c ++#define HDMI_CEC_RX_DATA13 0x7D2d ++#define HDMI_CEC_RX_DATA14 0x7D2e ++#define HDMI_CEC_RX_DATA15 0x7D2f ++#define HDMI_CEC_LOCK 0x7D30 ++#define HDMI_CEC_WKUPCTRL 0x7D31 ++ + /* I2C Master Registers (E-DDC) */ + #define HDMI_I2CM_SLAVE 0x7E00 + #define HDMI_I2CM_ADDRESS 0x7E01 +@@ -529,6 +574,17 @@ + #define HDMI_I2CM_FS_SCL_HCNT_0_ADDR 0x7E10 + #define HDMI_I2CM_FS_SCL_LCNT_1_ADDR 0x7E11 + #define HDMI_I2CM_FS_SCL_LCNT_0_ADDR 0x7E12 ++#define HDMI_I2CM_SDA_HOLD 0x7E13 ++#define HDMI_I2CM_SCDC_READ_UPDATE 0x7E14 ++#define HDMI_I2CM_READ_REQ_EN_MSK BIT(4) ++#define HDMI_I2CM_READ_REQ_EN_OFFSET 4 ++#define HDMI_I2CM_READ_UPDATE_MSK BIT(0) ++#define HDMI_I2CM_READ_UPDATE_OFFSET 0 ++#define HDMI_I2CM_I2CM_UPRD_VSYNC_EN_MSK BIT(5) ++#define HDMI_I2CM_I2CM_UPRD_VSYNC_EN_OFFSET 5 ++#define HDMI_I2CM_READ_BUFF0 0x7E20 ++#define HDMI_I2CM_SCDC_UPDATE0 0x7E30 ++#define HDMI_I2CM_SCDC_UPDATE1 0x7E31 + + enum { + /* PRODUCT_ID0 field values */ +@@ -842,6 +898,10 @@ enum { + HDMI_FC_AVICONF3_QUANT_RANGE_LIMITED = 0x00, + HDMI_FC_AVICONF3_QUANT_RANGE_FULL = 0x04, + ++/* HDMI_FC_GCP */ ++ HDMI_FC_GCP_SET_AVMUTE = 0x2, ++ HDMI_FC_GCP_CLEAR_AVMUTE = 0x1, ++ + /* FC_DBGFORCE field values */ + HDMI_FC_DBGFORCE_FORCEAUDIO = 0x10, + HDMI_FC_DBGFORCE_FORCEVIDEO = 0x1, +@@ -917,8 +977,14 @@ enum { + HDMI_AUD_CONF1_MODE_BURST_1 = 0x60, + HDMI_AUD_CONF1_MODE_BURST_2 = 0x80, + HDMI_AUD_CONF1_WIDTH_16 = 0x10, ++ HDMI_AUD_CONF1_WIDTH_21 = 0x15, + HDMI_AUD_CONF1_WIDTH_24 = 0x18, + ++/* AUD_CONF2 filed values */ ++ HDMI_AUD_CONF2_HBR = 0x1, ++ HDMI_AUD_CONF2_NLPCM = 0x2, ++ HDMI_AUD_CONF2_INSERT_PCUV = 0x04, ++ + /* AUD_CTS3 field values */ + HDMI_AUD_CTS3_N_SHIFT_OFFSET = 5, + HDMI_AUD_CTS3_N_SHIFT_MASK = 0xe0, +@@ -1072,7 +1138,10 @@ enum { + HDMI_A_VIDPOLCFG_HSYNCPOL_ACTIVE_LOW = 0x0, + + /* I2CM_OPERATION field values */ ++ HDMI_I2CM_OPERATION_BUS_CLEAR = 0x20, + HDMI_I2CM_OPERATION_WRITE = 0x10, ++ HDMI_I2CM_OPERATION_READ8_EXT = 0x8, ++ HDMI_I2CM_OPERATION_READ8 = 0x4, + HDMI_I2CM_OPERATION_READ_EXT = 0x2, + HDMI_I2CM_OPERATION_READ = 0x1, + +@@ -1085,6 +1154,11 @@ enum { + HDMI_I2CM_CTLINT_NAC_MASK = 0x40, + HDMI_I2CM_CTLINT_ARB_POL = 0x8, + HDMI_I2CM_CTLINT_ARB_MASK = 0x4, ++ ++/* I2CM_DIV field values */ ++ HDMI_I2CM_DIV_FAST_STD_MODE = 0x8, ++ HDMI_I2CM_DIV_FAST_MODE = 0x8, ++ HDMI_I2CM_DIV_STD_MODE = 0, + }; + + /* +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +index 376fa6eb4..71f0daa5f 100644 +--- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c ++++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +@@ -26,6 +26,8 @@ + #include + #include + #include ++#include ++#include + #include + + #define HWVER_131 0x31333100 /* IP version 1.31 */ +@@ -83,8 +85,12 @@ + #define ENABLE_CMD_MODE BIT(0) + + #define DSI_VID_MODE_CFG 0x38 +-#define ENABLE_LOW_POWER (0x3f << 8) +-#define ENABLE_LOW_POWER_MASK (0x3f << 8) ++#define LP_HFP_EN BIT(13) ++#define LP_HBP_EN BIT(12) ++#define LP_VACT_EN BIT(11) ++#define LP_VFP_EN BIT(10) ++#define LP_VBP_EN BIT(9) ++#define LP_VSA_EN BIT(8) + #define VID_MODE_TYPE_NON_BURST_SYNC_PULSES 0x0 + #define VID_MODE_TYPE_NON_BURST_SYNC_EVENTS 0x1 + #define VID_MODE_TYPE_BURST 0x2 +@@ -239,17 +245,21 @@ struct debugfs_entries { + + struct dw_mipi_dsi { + struct drm_bridge bridge; ++ struct drm_connector connector; ++ struct drm_encoder *encoder; + struct mipi_dsi_host dsi_host; +- struct drm_bridge *panel_bridge; ++ struct drm_panel *panel; ++ struct drm_bridge *next_bridge; + struct device *dev; + void __iomem *base; + +- struct clk *pclk; ++ struct reset_control *apb_rst; + + unsigned int lane_mbps; /* per lane */ + u32 channel; + u32 lanes; + u32 format; ++ struct drm_display_mode mode; + unsigned long mode_flags; + + #ifdef CONFIG_DEBUG_FS +@@ -299,6 +309,11 @@ static inline struct dw_mipi_dsi *bridge_to_dsi(struct drm_bridge *bridge) + return container_of(bridge, struct dw_mipi_dsi, bridge); + } + ++static inline struct dw_mipi_dsi *con_to_dsi(struct drm_connector *con) +{ -+ return kbdev->pm.backend.ca_policy_data.devfreq.cores_enabled; ++ return container_of(con, struct dw_mipi_dsi, connector); +} + -+static void devfreq_update_core_status(struct kbase_device *kbdev, -+ u64 cores_ready, -+ u64 cores_transitioning) -+{ -+ struct kbasep_pm_ca_policy_devfreq *data = -+ &kbdev->pm.backend.ca_policy_data.devfreq; + static inline void dsi_write(struct dw_mipi_dsi *dsi, u32 reg, u32 val) + { + writel(val, dsi->base + reg); +@@ -314,35 +329,21 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, + { + struct dw_mipi_dsi *dsi = host_to_dsi(host); + const struct dw_mipi_dsi_plat_data *pdata = dsi->plat_data; +- struct drm_bridge *bridge; +- struct drm_panel *panel; ++ int max_data_lanes = dsi->plat_data->max_data_lanes; + int ret; + +- if (device->lanes > dsi->plat_data->max_data_lanes) { +- dev_err(dsi->dev, "the number of data lanes(%u) is too many\n", +- device->lanes); +- return -EINVAL; +- } +- +- dsi->lanes = device->lanes; ++ dsi->lanes = (device->lanes > max_data_lanes) ? device->lanes / 2 : device->lanes; + dsi->channel = device->channel; + dsi->format = device->format; + dsi->mode_flags = device->mode_flags; + +- ret = drm_of_find_panel_or_bridge(host->dev->of_node, 1, 0, +- &panel, &bridge); +- if (ret) ++ ret = drm_of_find_panel_or_bridge(host->dev->of_node, 1, -1, ++ &dsi->panel, &dsi->next_bridge); ++ if (ret) { ++ DRM_DEV_ERROR(dsi->dev, "Failed to find panel or bridge: %d\n", ret); + return ret; +- +- if (panel) { +- bridge = drm_panel_bridge_add_typed(panel, +- DRM_MODE_CONNECTOR_DSI); +- if (IS_ERR(bridge)) +- return PTR_ERR(bridge); + } + +- dsi->panel_bridge = bridge; +- + drm_bridge_add(&dsi->bridge); + + if (pdata->host_ops && pdata->host_ops->attach) { +@@ -379,6 +380,7 @@ static void dw_mipi_message_config(struct dw_mipi_dsi *dsi, + { + bool lpm = msg->flags & MIPI_DSI_MSG_USE_LPM; + u32 val = 0; ++ u32 ctrl = 0; + + /* + * TODO dw drv improvements +@@ -397,11 +399,17 @@ static void dw_mipi_message_config(struct dw_mipi_dsi *dsi, + dsi_write(dsi, DSI_CMD_MODE_CFG, val); + + val = dsi_read(dsi, DSI_VID_MODE_CFG); +- if (lpm) ++ ctrl = dsi_read(dsi, DSI_LPCLK_CTRL); ++ if (lpm) { + val |= ENABLE_LOW_POWER_CMD; +- else ++ ctrl &= ~PHY_TXREQUESTCLKHS; ++ } else { + val &= ~ENABLE_LOW_POWER_CMD; ++ ctrl |= PHY_TXREQUESTCLKHS; ++ } + -+ lockdep_assert_held(&kbdev->hwaccess_lock); + dsi_write(dsi, DSI_VID_MODE_CFG, val); ++ dsi_write(dsi, DSI_LPCLK_CTRL, ctrl); + } + + static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 hdr_val) +@@ -547,14 +555,14 @@ static const struct mipi_dsi_host_ops dw_mipi_dsi_host_ops = { + + static void dw_mipi_dsi_video_mode_config(struct dw_mipi_dsi *dsi) + { +- u32 val; ++ u32 val = LP_VSA_EN | LP_VBP_EN | LP_VFP_EN | ++ LP_VACT_EN | LP_HBP_EN | LP_HFP_EN; + +- /* +- * TODO dw drv improvements +- * enabling low power is panel-dependent, we should use the +- * panel configuration here... +- */ +- val = ENABLE_LOW_POWER; ++ if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_HFP) ++ val &= ~LP_HFP_EN; + -+ data->cores_used = cores_ready | cores_transitioning; ++ if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_HBP) ++ val &= ~LP_HBP_EN; + + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) + val |= VID_MODE_TYPE_BURST; +@@ -578,8 +586,6 @@ static void dw_mipi_dsi_video_mode_config(struct dw_mipi_dsi *dsi) + static void dw_mipi_dsi_set_mode(struct dw_mipi_dsi *dsi, + unsigned long mode_flags) + { +- u32 val; +- + dsi_write(dsi, DSI_PWR_UP, RESET); + + if (mode_flags & MIPI_DSI_MODE_VIDEO) { +@@ -589,18 +595,16 @@ static void dw_mipi_dsi_set_mode(struct dw_mipi_dsi *dsi, + dsi_write(dsi, DSI_MODE_CFG, ENABLE_CMD_MODE); + } + +- val = PHY_TXREQUESTCLKHS; +- if (dsi->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS) +- val |= AUTO_CLKLANE_CTRL; +- dsi_write(dsi, DSI_LPCLK_CTRL, val); +- + dsi_write(dsi, DSI_PWR_UP, POWERUP); + } + + static void dw_mipi_dsi_disable(struct dw_mipi_dsi *dsi) + { +- dsi_write(dsi, DSI_PWR_UP, RESET); +- dsi_write(dsi, DSI_PHY_RSTZ, PHY_RSTZ); ++ dsi_write(dsi, DSI_LPCLK_CTRL, 0); ++ dsi_write(dsi, DSI_EDPI_CMD_SIZE, 0); ++ dw_mipi_dsi_set_mode(dsi, 0); ++ if (dsi->slave) ++ dw_mipi_dsi_disable(dsi->slave); + } + + static void dw_mipi_dsi_init(struct dw_mipi_dsi *dsi) +@@ -715,16 +719,16 @@ static u32 dw_mipi_dsi_get_hcomponent_lbcc(struct dw_mipi_dsi *dsi, + const struct drm_display_mode *mode, + u32 hcomponent) + { +- u32 frac, lbcc; ++ u32 lbcc; + + lbcc = hcomponent * dsi->lane_mbps * MSEC_PER_SEC / 8; + +- frac = lbcc % mode->clock; +- lbcc = lbcc / mode->clock; +- if (frac) +- lbcc++; ++ if (mode->clock == 0) { ++ DRM_ERROR("dsi mode clock is 0!\n"); ++ return 0; ++ } + +- return lbcc; ++ return DIV_ROUND_CLOSEST_ULL(lbcc, mode->clock); + } + + static void dw_mipi_dsi_line_timer_config(struct dw_mipi_dsi *dsi, +@@ -837,13 +841,13 @@ static void dw_mipi_dsi_dphy_enable(struct dw_mipi_dsi *dsi) + ret = readl_poll_timeout(dsi->base + DSI_PHY_STATUS, val, + val & PHY_LOCK, 1000, PHY_STATUS_TIMEOUT_US); + if (ret) +- DRM_DEBUG_DRIVER("failed to wait phy lock state\n"); ++ DRM_ERROR("failed to wait phy lock state\n"); + + ret = readl_poll_timeout(dsi->base + DSI_PHY_STATUS, + val, val & PHY_STOP_STATE_CLK_LANE, 1000, + PHY_STATUS_TIMEOUT_US); + if (ret) +- DRM_DEBUG_DRIVER("failed to wait phy clk lane stop state\n"); ++ DRM_ERROR("failed to wait phy clk lane stop state\n"); + } + + static void dw_mipi_dsi_clear_err(struct dw_mipi_dsi *dsi) +@@ -854,40 +858,47 @@ static void dw_mipi_dsi_clear_err(struct dw_mipi_dsi *dsi) + dsi_write(dsi, DSI_INT_MSK1, 0); + } + ++static void dw_mipi_dsi_post_disable(struct dw_mipi_dsi *dsi) ++{ ++ const struct dw_mipi_dsi_phy_ops *phy_ops = dsi->plat_data->phy_ops; + -+ /* If in desired state then clear transition flag */ -+ if (data->cores_enabled == data->cores_desired) -+ kbdev->pm.backend.ca_in_transition = false; ++ if (phy_ops->power_off) ++ phy_ops->power_off(dsi->plat_data->priv_data); + -+ /* If all undesired cores are now off then power on desired cores. -+ * The direct comparison against cores_enabled limits potential -+ * recursion to one level */ -+ if (!(data->cores_used & ~data->cores_desired) && -+ data->cores_enabled != data->cores_desired) { -+ data->cores_enabled = data->cores_desired; ++ dsi_write(dsi, DSI_PWR_UP, RESET); ++ dsi_write(dsi, DSI_PHY_RSTZ, PHY_RSTZ); ++ pm_runtime_put(dsi->dev); + -+ kbase_pm_update_cores_state_nolock(kbdev); ++ if (dsi->slave) ++ dw_mipi_dsi_post_disable(dsi->slave); ++} + -+ kbdev->pm.backend.ca_in_transition = false; -+ } + static void dw_mipi_dsi_bridge_post_disable(struct drm_bridge *bridge) + { + struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge); +- const struct dw_mipi_dsi_phy_ops *phy_ops = dsi->plat_data->phy_ops; ++ const struct dw_mipi_dsi_plat_data *pdata = dsi->plat_data; + +- /* +- * Switch to command mode before panel-bridge post_disable & +- * panel unprepare. +- * Note: panel-bridge disable & panel disable has been called +- * before by the drm framework. +- */ +- dw_mipi_dsi_set_mode(dsi, 0); ++ if (dsi->panel) ++ drm_panel_unprepare(dsi->panel); + +- /* +- * TODO Only way found to call panel-bridge post_disable & +- * panel unprepare before the dsi "final" disable... +- * This needs to be fixed in the drm_bridge framework and the API +- * needs to be updated to manage our own call chains... +- */ +- if (dsi->panel_bridge->funcs->post_disable) +- dsi->panel_bridge->funcs->post_disable(dsi->panel_bridge); ++ dw_mipi_dsi_post_disable(dsi); + +- if (phy_ops->power_off) +- phy_ops->power_off(dsi->plat_data->priv_data); ++ if (pdata->stream_standby) ++ pdata->stream_standby(pdata->priv_data, 0); +} + +- if (dsi->slave) { +- dw_mipi_dsi_disable(dsi->slave); +- clk_disable_unprepare(dsi->slave->pclk); +- pm_runtime_put(dsi->slave->dev); +- } +- dw_mipi_dsi_disable(dsi); ++static void dw_mipi_dsi_bridge_disable(struct drm_bridge *bridge) ++{ ++ struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge); ++ const struct dw_mipi_dsi_plat_data *pdata = dsi->plat_data; + +- clk_disable_unprepare(dsi->pclk); +- pm_runtime_put(dsi->dev); ++ if (dsi->panel) ++ drm_panel_disable(dsi->panel); + -+/* -+ * The struct kbase_pm_ca_policy structure for the devfreq core availability -+ * policy. -+ * -+ * This is the static structure that defines the devfreq core availability power -+ * policy's callback and name. -+ */ -+const struct kbase_pm_ca_policy kbase_pm_ca_devfreq_policy_ops = { -+ "devfreq", /* name */ -+ devfreq_init, /* init */ -+ devfreq_term, /* term */ -+ devfreq_get_core_mask, /* get_core_mask */ -+ devfreq_update_core_status, /* update_core_status */ -+ 0u, /* flags */ -+ KBASE_PM_CA_POLICY_ID_DEVFREQ, /* id */ -+}; ++ if (pdata->stream_standby) ++ pdata->stream_standby(pdata->priv_data, 1); + -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h -new file mode 100755 -index 000000000000..7ab3cd4d8460 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h -@@ -0,0 +1,55 @@ -+/* -+ * -+ * (C) COPYRIGHT 2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ dw_mipi_dsi_disable(dsi); + } + + static unsigned int dw_mipi_dsi_get_lanes(struct dw_mipi_dsi *dsi) +@@ -904,15 +915,31 @@ static unsigned int dw_mipi_dsi_get_lanes(struct dw_mipi_dsi *dsi) + return dsi->lanes; + } + +-static void dw_mipi_dsi_mode_set(struct dw_mipi_dsi *dsi, +- const struct drm_display_mode *adjusted_mode) ++static void dw_mipi_dsi_bridge_mode_set(struct drm_bridge *bridge, ++ const struct drm_display_mode *mode, ++ const struct drm_display_mode *adjusted_mode) ++{ ++ struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge); + ++ drm_mode_copy(&dsi->mode, adjusted_mode); + ++ if (dsi->slave) ++ drm_mode_copy(&dsi->slave->mode, adjusted_mode); ++} + -+/* -+ * A core availability policy for use with devfreq, where core masks are -+ * associated with OPPs. -+ */ ++static void dw_mipi_dsi_pre_enable(struct dw_mipi_dsi *dsi) + { + const struct dw_mipi_dsi_phy_ops *phy_ops = dsi->plat_data->phy_ops; + void *priv_data = dsi->plat_data->priv_data; ++ const struct drm_display_mode *adjusted_mode = &dsi->mode; + int ret; + u32 lanes = dw_mipi_dsi_get_lanes(dsi); + +- clk_prepare_enable(dsi->pclk); ++ if (dsi->apb_rst) { ++ reset_control_assert(dsi->apb_rst); ++ usleep_range(10, 20); ++ reset_control_deassert(dsi->apb_rst); ++ } + + ret = phy_ops->get_lane_mbps(priv_data, adjusted_mode, dsi->mode_flags, + lanes, dsi->format, &dsi->lane_mbps); +@@ -939,6 +966,9 @@ static void dw_mipi_dsi_mode_set(struct dw_mipi_dsi *dsi, + if (ret) + DRM_DEBUG_DRIVER("Phy init() failed\n"); + ++ if (phy_ops->power_on) ++ phy_ops->power_on(dsi->plat_data->priv_data); + -+#ifndef MALI_KBASE_PM_CA_DEVFREQ_H -+#define MALI_KBASE_PM_CA_DEVFREQ_H + dw_mipi_dsi_dphy_enable(dsi); + + dw_mipi_dsi_wait_for_two_frames(adjusted_mode); +@@ -946,29 +976,60 @@ static void dw_mipi_dsi_mode_set(struct dw_mipi_dsi *dsi, + /* Switch to cmd mode for panel-bridge pre_enable & panel prepare */ + dw_mipi_dsi_set_mode(dsi, 0); + +- if (phy_ops->power_on) +- phy_ops->power_on(dsi->plat_data->priv_data); ++ if (dsi->slave) ++ dw_mipi_dsi_pre_enable(dsi->slave); + } + +-static void dw_mipi_dsi_bridge_mode_set(struct drm_bridge *bridge, +- const struct drm_display_mode *mode, +- const struct drm_display_mode *adjusted_mode) ++static void dw_mipi_dsi_bridge_pre_enable(struct drm_bridge *bridge) + { + struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge); ++ const struct dw_mipi_dsi_plat_data *pdata = dsi->plat_data; + -+/** -+ * struct kbasep_pm_ca_policy_devfreq - Private structure for devfreq ca policy -+ * -+ * This contains data that is private to the devfreq core availability -+ * policy. -+ * -+ * @cores_desired: Cores that the policy wants to be available -+ * @cores_enabled: Cores that the policy is currently returning as available -+ * @cores_used: Cores currently powered or transitioning -+ */ -+struct kbasep_pm_ca_policy_devfreq { -+ u64 cores_desired; -+ u64 cores_enabled; -+ u64 cores_used; -+}; ++ if (pdata->stream_standby) ++ pdata->stream_standby(pdata->priv_data, 1); + -+extern const struct kbase_pm_ca_policy kbase_pm_ca_devfreq_policy_ops; ++ dw_mipi_dsi_pre_enable(dsi); + -+/** -+ * kbase_devfreq_set_core_mask - Set core mask for policy to use -+ * @kbdev: Device pointer -+ * @core_mask: New core mask -+ * -+ * The new core mask will have immediate effect if the GPU is powered, or will -+ * take effect when it is next powered on. -+ */ -+void kbase_devfreq_set_core_mask(struct kbase_device *kbdev, u64 core_mask); ++ if (dsi->panel) ++ drm_panel_prepare(dsi->panel); ++} + -+#endif /* MALI_KBASE_PM_CA_DEVFREQ_H */ ++static void dw_mipi_dsi_enable(struct dw_mipi_dsi *dsi) ++{ ++ u32 val; + -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c -new file mode 100755 -index 000000000000..864612d31f9b ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c -@@ -0,0 +1,65 @@ -+/* -+ * -+ * (C) COPYRIGHT 2013-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++ val = PHY_TXREQUESTCLKHS; ++ if (dsi->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS) ++ val |= AUTO_CLKLANE_CTRL; + ++ dsi_write(dsi, DSI_LPCLK_CTRL, val); + ++ if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO) { ++ dw_mipi_dsi_set_mode(dsi, MIPI_DSI_MODE_VIDEO); ++ } else { ++ dsi_write(dsi, DSI_EDPI_CMD_SIZE, dsi->mode.hdisplay); ++ dw_mipi_dsi_set_mode(dsi, 0); ++ } + +- dw_mipi_dsi_mode_set(dsi, adjusted_mode); + if (dsi->slave) +- dw_mipi_dsi_mode_set(dsi->slave, adjusted_mode); ++ dw_mipi_dsi_enable(dsi->slave); + } + + static void dw_mipi_dsi_bridge_enable(struct drm_bridge *bridge) + { + struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge); ++ const struct dw_mipi_dsi_plat_data *pdata = dsi->plat_data; + +- /* Switch to video mode for panel-bridge enable & panel enable */ +- dw_mipi_dsi_set_mode(dsi, MIPI_DSI_MODE_VIDEO); +- if (dsi->slave) +- dw_mipi_dsi_set_mode(dsi->slave, MIPI_DSI_MODE_VIDEO); ++ dw_mipi_dsi_enable(dsi); + -+/* -+ * A power policy implementing fixed core availability -+ */ ++ if (pdata->stream_standby) ++ pdata->stream_standby(pdata->priv_data, 0); + -+#include -+#include ++ if (dsi->panel) ++ drm_panel_enable(dsi->panel); + -+static void fixed_init(struct kbase_device *kbdev) -+{ -+ kbdev->pm.backend.ca_in_transition = false; -+} ++ DRM_DEV_INFO(dsi->dev, "final DSI-Link bandwidth: %u x %d Mbps\n", ++ dsi->lane_mbps, dsi->slave ? dsi->lanes * 2 : dsi->lanes); + } + + static enum drm_mode_status +@@ -999,15 +1060,20 @@ static int dw_mipi_dsi_bridge_attach(struct drm_bridge *bridge, + /* Set the encoder type as caller does not know it */ + bridge->encoder->encoder_type = DRM_MODE_ENCODER_DSI; + +- /* Attach the panel-bridge to the dsi bridge */ +- return drm_bridge_attach(bridge->encoder, dsi->panel_bridge, bridge, +- flags); ++ /* Attach the next-bridge to the dsi bridge */ ++ if (dsi->next_bridge) ++ return drm_bridge_attach(bridge->encoder, dsi->next_bridge, ++ bridge, flags); + -+static void fixed_term(struct kbase_device *kbdev) ++ return 0; + } + + static const struct drm_bridge_funcs dw_mipi_dsi_bridge_funcs = { + .mode_set = dw_mipi_dsi_bridge_mode_set, ++ .pre_enable = dw_mipi_dsi_bridge_pre_enable, + .enable = dw_mipi_dsi_bridge_enable, + .post_disable = dw_mipi_dsi_bridge_post_disable, ++ .disable = dw_mipi_dsi_bridge_disable, + .mode_valid = dw_mipi_dsi_bridge_mode_valid, + .attach = dw_mipi_dsi_bridge_attach, + }; +@@ -1103,7 +1169,6 @@ __dw_mipi_dsi_probe(struct platform_device *pdev, + const struct dw_mipi_dsi_plat_data *plat_data) + { + struct device *dev = &pdev->dev; +- struct reset_control *apb_rst; + struct dw_mipi_dsi *dsi; + int ret; + +@@ -1129,20 +1194,13 @@ __dw_mipi_dsi_probe(struct platform_device *pdev, + dsi->base = plat_data->base; + } + +- dsi->pclk = devm_clk_get(dev, "pclk"); +- if (IS_ERR(dsi->pclk)) { +- ret = PTR_ERR(dsi->pclk); +- dev_err(dev, "Unable to get pclk: %d\n", ret); +- return ERR_PTR(ret); +- } +- + /* + * Note that the reset was not defined in the initial device tree, so + * we have to be prepared for it not being found. + */ +- apb_rst = devm_reset_control_get_optional_exclusive(dev, "apb"); +- if (IS_ERR(apb_rst)) { +- ret = PTR_ERR(apb_rst); ++ dsi->apb_rst = devm_reset_control_get_optional_exclusive(dev, "apb"); ++ if (IS_ERR(dsi->apb_rst)) { ++ ret = PTR_ERR(dsi->apb_rst); + + if (ret != -EPROBE_DEFER) + dev_err(dev, "Unable to get reset control: %d\n", ret); +@@ -1150,20 +1208,6 @@ __dw_mipi_dsi_probe(struct platform_device *pdev, + return ERR_PTR(ret); + } + +- if (apb_rst) { +- ret = clk_prepare_enable(dsi->pclk); +- if (ret) { +- dev_err(dev, "%s: Failed to enable pclk\n", __func__); +- return ERR_PTR(ret); +- } +- +- reset_control_assert(apb_rst); +- usleep_range(10, 20); +- reset_control_deassert(apb_rst); +- +- clk_disable_unprepare(dsi->pclk); +- } +- + dw_mipi_dsi_debugfs_init(dsi); + pm_runtime_enable(dev); + +@@ -1225,6 +1269,81 @@ void dw_mipi_dsi_remove(struct dw_mipi_dsi *dsi) + } + EXPORT_SYMBOL_GPL(dw_mipi_dsi_remove); + ++static int dw_mipi_dsi_connector_get_modes(struct drm_connector *connector) +{ -+ CSTD_UNUSED(kbdev); -+} ++ struct dw_mipi_dsi *dsi = con_to_dsi(connector); + -+static u64 fixed_get_core_mask(struct kbase_device *kbdev) -+{ -+ return kbdev->gpu_props.props.raw_props.shader_present; -+} ++ if (dsi->next_bridge && (dsi->next_bridge->ops & DRM_BRIDGE_OP_MODES)) ++ return drm_bridge_get_modes(dsi->next_bridge, connector); + -+static void fixed_update_core_status(struct kbase_device *kbdev, -+ u64 cores_ready, -+ u64 cores_transitioning) -+{ -+ CSTD_UNUSED(kbdev); -+ CSTD_UNUSED(cores_ready); -+ CSTD_UNUSED(cores_transitioning); ++ if (dsi->panel) ++ return drm_panel_get_modes(dsi->panel, connector); ++ ++ return -EINVAL; +} + -+/* -+ * The struct kbase_pm_policy structure for the fixed power policy. -+ * -+ * This is the static structure that defines the fixed power policy's callback -+ * and name. -+ */ -+const struct kbase_pm_ca_policy kbase_pm_ca_fixed_policy_ops = { -+ "fixed", /* name */ -+ fixed_init, /* init */ -+ fixed_term, /* term */ -+ fixed_get_core_mask, /* get_core_mask */ -+ fixed_update_core_status, /* update_core_status */ -+ 0u, /* flags */ -+ KBASE_PM_CA_POLICY_ID_FIXED, /* id */ ++static struct drm_connector_helper_funcs dw_mipi_dsi_connector_helper_funcs = { ++ .get_modes = dw_mipi_dsi_connector_get_modes, +}; + -+KBASE_EXPORT_TEST_API(kbase_pm_ca_fixed_policy_ops); -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h -new file mode 100755 -index 000000000000..a763155cb703 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h -@@ -0,0 +1,40 @@ -+/* -+ * -+ * (C) COPYRIGHT 2013-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ ++static enum drm_connector_status ++dw_mipi_dsi_connector_detect(struct drm_connector *connector, bool force) ++{ ++ struct dw_mipi_dsi *dsi = con_to_dsi(connector); + ++ if (dsi->next_bridge && (dsi->next_bridge->ops & DRM_BRIDGE_OP_DETECT)) ++ return drm_bridge_detect(dsi->next_bridge); + -+/* -+ * A power policy implementing fixed core availability -+ */ ++ return connector_status_connected; ++} + -+#ifndef MALI_KBASE_PM_CA_FIXED_H -+#define MALI_KBASE_PM_CA_FIXED_H ++static void dw_mipi_dsi_drm_connector_destroy(struct drm_connector *connector) ++{ ++ drm_connector_unregister(connector); ++ drm_connector_cleanup(connector); ++} + -+/** -+ * struct kbasep_pm_ca_policy_fixed - Private structure for policy instance data -+ * -+ * @dummy: Dummy member - no state is needed -+ * -+ * This contains data that is private to the particular power policy that is -+ * active. -+ */ -+struct kbasep_pm_ca_policy_fixed { -+ int dummy; ++static const struct drm_connector_funcs dw_mipi_dsi_atomic_connector_funcs = { ++ .fill_modes = drm_helper_probe_single_connector_modes, ++ .detect = dw_mipi_dsi_connector_detect, ++ .destroy = dw_mipi_dsi_drm_connector_destroy, ++ .reset = drm_atomic_helper_connector_reset, ++ .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, ++ .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + -+extern const struct kbase_pm_ca_policy kbase_pm_ca_fixed_policy_ops; -+ -+#endif /* MALI_KBASE_PM_CA_FIXED_H */ -+ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c -new file mode 100755 -index 000000000000..f891fa225a89 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c -@@ -0,0 +1,70 @@ -+/* -+ * -+ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ ++static int dw_mipi_dsi_connector_init(struct dw_mipi_dsi *dsi) ++{ ++ struct drm_encoder *encoder = dsi->encoder; ++ struct drm_connector *connector = &dsi->connector; ++ struct drm_device *drm_dev = dsi->bridge.dev; ++ struct device *dev = dsi->dev; ++ int ret; + ++ ret = drm_connector_init(drm_dev, connector, ++ &dw_mipi_dsi_atomic_connector_funcs, ++ DRM_MODE_CONNECTOR_DSI); ++ if (ret) { ++ DRM_DEV_ERROR(dev, "Failed to initialize connector\n"); ++ return ret; ++ } + ++ drm_connector_helper_add(connector, ++ &dw_mipi_dsi_connector_helper_funcs); ++ ret = drm_connector_attach_encoder(connector, encoder); ++ if (ret < 0) { ++ DRM_DEV_ERROR(dev, "Failed to attach encoder: %d\n", ret); ++ goto connector_cleanup; ++ } + ++ return 0; + ++connector_cleanup: ++ connector->funcs->destroy(connector); + -+/* -+ * "Coarse Demand" power management policy -+ */ ++ return ret; ++} + -+#include -+#include + /* + * Bind/unbind API, used from platforms based on the component framework. + */ +@@ -1232,6 +1351,8 @@ int dw_mipi_dsi_bind(struct dw_mipi_dsi *dsi, struct drm_encoder *encoder) + { + int ret; + ++ dsi->encoder = encoder; + -+static u64 coarse_demand_get_core_mask(struct kbase_device *kbdev) + ret = drm_bridge_attach(encoder, &dsi->bridge, NULL, 0); + if (ret) { + DRM_ERROR("Failed to initialize bridge with drm\n"); +@@ -1247,6 +1368,38 @@ void dw_mipi_dsi_unbind(struct dw_mipi_dsi *dsi) + } + EXPORT_SYMBOL_GPL(dw_mipi_dsi_unbind); + ++struct drm_connector *dw_mipi_dsi_get_connector(struct dw_mipi_dsi *dsi) +{ -+ if (kbdev->pm.active_count == 0) -+ return 0; ++ struct drm_connector *connector = NULL; ++ enum drm_bridge_attach_flags flags = 0; ++ int ret; + -+ return kbdev->gpu_props.props.raw_props.shader_present; -+} ++ if (dsi->next_bridge) { ++ enum drm_bridge_attach_flags flags; ++ struct list_head *connector_list = ++ &dsi->next_bridge->dev->mode_config.connector_list; + -+static bool coarse_demand_get_core_active(struct kbase_device *kbdev) -+{ -+ if (0 == kbdev->pm.active_count && !(kbdev->shader_needed_bitmap | -+ kbdev->shader_inuse_bitmap) && !kbdev->tiler_needed_cnt -+ && !kbdev->tiler_inuse_cnt) -+ return false; ++ flags = dsi->next_bridge->ops & DRM_BRIDGE_OP_MODES ? ++ DRM_BRIDGE_ATTACH_NO_CONNECTOR : 0; ++ if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) ++ list_for_each_entry(connector, connector_list, head) ++ if (drm_connector_has_possible_encoder(connector, ++ dsi->encoder)) ++ break; ++ } + -+ return true; -+} ++ if (dsi->panel || (dsi->next_bridge && (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR))) { ++ ret = dw_mipi_dsi_connector_init(dsi); ++ if (ret) ++ return ERR_PTR(ret); + -+static void coarse_demand_init(struct kbase_device *kbdev) -+{ -+ CSTD_UNUSED(kbdev); -+} ++ connector = &dsi->connector; ++ } + -+static void coarse_demand_term(struct kbase_device *kbdev) -+{ -+ CSTD_UNUSED(kbdev); ++ return connector; +} ++EXPORT_SYMBOL_GPL(dw_mipi_dsi_get_connector); + -+/* The struct kbase_pm_policy structure for the demand power policy. -+ * -+ * This is the static structure that defines the demand power policy's callback -+ * and name. -+ */ -+const struct kbase_pm_policy kbase_pm_coarse_demand_policy_ops = { -+ "coarse_demand", /* name */ -+ coarse_demand_init, /* init */ -+ coarse_demand_term, /* term */ -+ coarse_demand_get_core_mask, /* get_core_mask */ -+ coarse_demand_get_core_active, /* get_core_active */ -+ 0u, /* flags */ -+ KBASE_PM_POLICY_ID_COARSE_DEMAND, /* id */ -+}; -+ -+KBASE_EXPORT_TEST_API(kbase_pm_coarse_demand_policy_ops); -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h -new file mode 100755 -index 000000000000..749d305eee9a ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h -@@ -0,0 +1,64 @@ -+/* + MODULE_AUTHOR("Chris Zhong "); + MODULE_AUTHOR("Philippe Cornu "); + MODULE_DESCRIPTION("DW MIPI DSI host controller driver"); +diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c +index 7fc8e7000..4108c7265 100644 +--- a/drivers/gpu/drm/drm_atomic_helper.c ++++ b/drivers/gpu/drm/drm_atomic_helper.c +@@ -296,12 +296,14 @@ update_connector_routing(struct drm_atomic_state *state, + if (old_connector_state->crtc != new_connector_state->crtc) { + if (old_connector_state->crtc) { + crtc_state = drm_atomic_get_new_crtc_state(state, old_connector_state->crtc); +- crtc_state->connectors_changed = true; ++ if (connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK) ++ crtc_state->connectors_changed = true; + } + + if (new_connector_state->crtc) { + crtc_state = drm_atomic_get_new_crtc_state(state, new_connector_state->crtc); +- crtc_state->connectors_changed = true; ++ if (connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK) ++ crtc_state->connectors_changed = true; + } + } + +@@ -386,7 +388,8 @@ update_connector_routing(struct drm_atomic_state *state, + + set_best_encoder(state, new_connector_state, new_encoder); + +- crtc_state->connectors_changed = true; ++ if (connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK) ++ crtc_state->connectors_changed = true; + + DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d:%s]\n", + connector->base.id, +@@ -3554,6 +3557,9 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, + replaced = drm_property_replace_blob(&crtc_state->degamma_lut, NULL); + replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL); + replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, blob); ++#if defined(CONFIG_ROCKCHIP_DRM_CUBIC_LUT) ++ replaced |= drm_property_replace_blob(&crtc_state->cubic_lut, NULL); ++#endif + crtc_state->color_mgmt_changed |= replaced; + + ret = drm_atomic_commit(state); +diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c +index 9ad740451..c29183d2a 100644 +--- a/drivers/gpu/drm/drm_atomic_state_helper.c ++++ b/drivers/gpu/drm/drm_atomic_state_helper.c +@@ -141,6 +141,10 @@ void __drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc, + drm_property_blob_get(state->ctm); + if (state->gamma_lut) + drm_property_blob_get(state->gamma_lut); ++#if defined(CONFIG_ROCKCHIP_DRM_CUBIC_LUT) ++ if (state->cubic_lut) ++ drm_property_blob_get(state->cubic_lut); ++#endif + state->mode_changed = false; + state->active_changed = false; + state->planes_changed = false; +@@ -213,6 +217,9 @@ void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc_state *state) + drm_property_blob_put(state->degamma_lut); + drm_property_blob_put(state->ctm); + drm_property_blob_put(state->gamma_lut); ++#if defined(CONFIG_ROCKCHIP_DRM_CUBIC_LUT) ++ drm_property_blob_put(state->cubic_lut); ++#endif + } + EXPORT_SYMBOL(__drm_atomic_helper_crtc_destroy_state); + +diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c +index b60628333..1184ba39d 100644 +--- a/drivers/gpu/drm/drm_atomic_uapi.c ++++ b/drivers/gpu/drm/drm_atomic_uapi.c +@@ -461,6 +461,16 @@ static int drm_atomic_crtc_set_property(struct drm_crtc *crtc, + &replaced); + state->color_mgmt_changed |= replaced; + return ret; ++#if defined(CONFIG_ROCKCHIP_DRM_CUBIC_LUT) ++ } else if (property == config->cubic_lut_property) { ++ ret = drm_atomic_replace_property_blob_from_id(dev, ++ &state->cubic_lut, ++ val, ++ -1, sizeof(struct drm_color_lut), ++ &replaced); ++ state->color_mgmt_changed |= replaced; ++ return ret; ++#endif + } else if (property == config->prop_out_fence_ptr) { + s32 __user *fence_ptr = u64_to_user_ptr(val); + +@@ -503,6 +513,10 @@ drm_atomic_crtc_get_property(struct drm_crtc *crtc, + *val = (state->ctm) ? state->ctm->base.id : 0; + else if (property == config->gamma_lut_property) + *val = (state->gamma_lut) ? state->gamma_lut->base.id : 0; ++#if defined(CONFIG_ROCKCHIP_DRM_CUBIC_LUT) ++ else if (property == config->cubic_lut_property) ++ *val = (state->cubic_lut) ? state->cubic_lut->base.id : 0; ++#endif + else if (property == config->prop_out_fence_ptr) + *val = 0; + else if (crtc->funcs->atomic_get_property) +diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c +index c7adbeaf1..232abbba3 100644 +--- a/drivers/gpu/drm/drm_auth.c ++++ b/drivers/gpu/drm/drm_auth.c +@@ -135,18 +135,16 @@ static void drm_set_master(struct drm_device *dev, struct drm_file *fpriv, + static int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv) + { + struct drm_master *old_master; +- struct drm_master *new_master; + + lockdep_assert_held_once(&dev->master_mutex); + + WARN_ON(fpriv->is_master); + old_master = fpriv->master; +- new_master = drm_master_create(dev); +- if (!new_master) ++ fpriv->master = drm_master_create(dev); ++ if (!fpriv->master) { ++ fpriv->master = old_master; + return -ENOMEM; +- spin_lock(&fpriv->master_lookup_lock); +- fpriv->master = new_master; +- spin_unlock(&fpriv->master_lookup_lock); ++ } + + fpriv->is_master = 1; + fpriv->authenticated = 1; +@@ -304,13 +302,10 @@ int drm_master_open(struct drm_file *file_priv) + /* if there is no current master make this fd it, but do not create + * any master object for render clients */ + mutex_lock(&dev->master_mutex); +- if (!dev->master) { ++ if (!dev->master) + ret = drm_new_set_master(dev, file_priv); +- } else { +- spin_lock(&file_priv->master_lookup_lock); ++ else + file_priv->master = drm_master_get(dev->master); +- spin_unlock(&file_priv->master_lookup_lock); +- } + mutex_unlock(&dev->master_mutex); + + return ret; +@@ -376,31 +371,6 @@ struct drm_master *drm_master_get(struct drm_master *master) + } + EXPORT_SYMBOL(drm_master_get); + +-/** +- * drm_file_get_master - reference &drm_file.master of @file_priv +- * @file_priv: DRM file private +- * +- * Increments the reference count of @file_priv's &drm_file.master and returns +- * the &drm_file.master. If @file_priv has no &drm_file.master, returns NULL. +- * +- * Master pointers returned from this function should be unreferenced using +- * drm_master_put(). +- */ +-struct drm_master *drm_file_get_master(struct drm_file *file_priv) +-{ +- struct drm_master *master = NULL; +- +- spin_lock(&file_priv->master_lookup_lock); +- if (!file_priv->master) +- goto unlock; +- master = drm_master_get(file_priv->master); +- +-unlock: +- spin_unlock(&file_priv->master_lookup_lock); +- return master; +-} +-EXPORT_SYMBOL(drm_file_get_master); +- + static void drm_master_destroy(struct kref *kref) + { + struct drm_master *master = container_of(kref, struct drm_master, refcount); +diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c +index 138ff34b3..7b270b68a 100644 +--- a/drivers/gpu/drm/drm_color_mgmt.c ++++ b/drivers/gpu/drm/drm_color_mgmt.c +@@ -33,7 +33,7 @@ + /** + * DOC: overview + * +- * Color management or color space adjustments is supported through a set of 5 ++ * Color management or color space adjustments is supported through a set of 7 + * properties on the &drm_crtc object. They are set up by calling + * drm_crtc_enable_color_mgmt(). + * +@@ -60,7 +60,7 @@ + * “CTMâ€: + * Blob property to set the current transformation matrix (CTM) apply to + * pixel data after the lookup through the degamma LUT and before the +- * lookup through the gamma LUT. The data is interpreted as a struct ++ * lookup through the cubic LUT. The data is interpreted as a struct + * &drm_color_ctm. + * + * Setting this to NULL (blob property value set to 0) means a +@@ -68,13 +68,40 @@ + * boot-up state too. Drivers can access the blob for the color conversion + * matrix through &drm_crtc_state.ctm. + * ++ * â€CUBIC_LUTâ€: ++ * Blob property to set the cubic (3D) lookup table performing color ++ * mapping after the transformation matrix and before the lookup through ++ * the gamma LUT. Unlike the degamma and gamma LUTs that map color ++ * components independently, the 3D LUT converts an input color to an ++ * output color by indexing into the 3D table using the color components ++ * as a 3D coordinate. The LUT is subsampled as 8-bit (or more) precision ++ * would require too much storage space in the hardware, so the precision ++ * of the color components is reduced before the look up, and the low ++ * order bits may be used to interpolate between the nearest points in 3D ++ * space. + * -+ * (C) COPYRIGHT 2012-2015 ARM Limited. All rights reserved. ++ * The data is interpreted as an array of &struct drm_color_lut elements. ++ * Hardware might choose not to use the full precision of the LUT ++ * elements. + * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++ * Setting this to NULL (blob property value set to 0) means the output ++ * color is identical to the input color. This is generally the driver ++ * boot-up state too. Drivers can access this blob through ++ * &drm_crtc_state.cubic_lut. + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * â€CUBIC_LUT_SIZEâ€: ++ * Unsigned range property to give the size of the lookup table to be set ++ * on the CUBIC_LUT property (the size depends on the underlying hardware). ++ * If drivers support multiple LUT sizes then they should publish the ++ * largest size, and sub-sample smaller sized LUTs appropriately. + * -+ */ + * “GAMMA_LUTâ€: + * Blob property to set the gamma lookup table (LUT) mapping pixel data +- * after the transformation matrix to data sent to the connector. The +- * data is interpreted as an array of &struct drm_color_lut elements. +- * Hardware might choose not to use the full precision of the LUT elements +- * nor use all the elements of the LUT (for example the hardware might +- * choose to interpolate between LUT[0] and LUT[4]). ++ * after the cubic LUT to data sent to the connector. The data is ++ * interpreted as an array of &struct drm_color_lut elements. Hardware ++ * might choose not to use the full precision of the LUT elements nor use ++ * all the elements of the LUT (for example the hardware might choose to ++ * interpolate between LUT[0] and LUT[4]). + * + * Setting this to NULL (blob property value set to 0) means a + * linear/pass-thru gamma table should be used. This is generally the +diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c +index b0a826489..3d7182001 100644 +--- a/drivers/gpu/drm/drm_debugfs.c ++++ b/drivers/gpu/drm/drm_debugfs.c +@@ -91,7 +91,6 @@ static int drm_clients_info(struct seq_file *m, void *data) + mutex_lock(&dev->filelist_mutex); + list_for_each_entry_reverse(priv, &dev->filelist, lhead) { + struct task_struct *task; +- bool is_current_master = drm_is_current_master(priv); + + rcu_read_lock(); /* locks pid_task()->comm */ + task = pid_task(priv->pid, PIDTYPE_PID); +@@ -100,7 +99,7 @@ static int drm_clients_info(struct seq_file *m, void *data) + task ? task->comm : "", + pid_vnr(priv->pid), + priv->minor->index, +- is_current_master ? 'y' : 'n', ++ drm_is_current_master(priv) ? 'y' : 'n', + priv->authenticated ? 'y' : 'n', + from_kuid_munged(seq_user_ns(m), uid), + priv->magic); +diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c +index 39eb39e78..efc2372d3 100644 +--- a/drivers/gpu/drm/drm_edid.c ++++ b/drivers/gpu/drm/drm_edid.c +@@ -1835,20 +1835,11 @@ static void connector_bad_edid(struct drm_connector *connector, + u8 *edid, int num_blocks) + { + int i; +- u8 last_block; +- +- /* +- * 0x7e in the EDID is the number of extension blocks. The EDID +- * is 1 (base block) + num_ext_blocks big. That means we can think +- * of 0x7e in the EDID of the _index_ of the last block in the +- * combined chunk of memory. +- */ +- last_block = edid[0x7e]; ++ u8 num_of_ext = edid[0x7e]; + + /* Calculate real checksum for the last edid extension block data */ +- if (last_block < num_blocks) +- connector->real_edid_checksum = +- drm_edid_block_checksum(edid + last_block * EDID_LENGTH); ++ connector->real_edid_checksum = ++ drm_edid_block_checksum(edid + num_of_ext * EDID_LENGTH); + + if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS)) + return; +@@ -4861,6 +4852,43 @@ static void drm_parse_vcdb(struct drm_connector *connector, const u8 *db) + info->rgb_quant_range_selectable = true; + } + ++#ifdef CONFIG_NO_GKI ++static ++void drm_get_max_frl_rate(int max_frl_rate, u8 *max_lanes, u8 *max_rate_per_lane) ++{ ++ switch (max_frl_rate) { ++ case 1: ++ *max_lanes = 3; ++ *max_rate_per_lane = 3; ++ break; ++ case 2: ++ *max_lanes = 3; ++ *max_rate_per_lane = 6; ++ break; ++ case 3: ++ *max_lanes = 4; ++ *max_rate_per_lane = 6; ++ break; ++ case 4: ++ *max_lanes = 4; ++ *max_rate_per_lane = 8; ++ break; ++ case 5: ++ *max_lanes = 4; ++ *max_rate_per_lane = 10; ++ break; ++ case 6: ++ *max_lanes = 4; ++ *max_rate_per_lane = 12; ++ break; ++ case 0: ++ default: ++ *max_lanes = 0; ++ *max_rate_per_lane = 0; ++ } ++} ++#endif + + static void drm_parse_ycbcr420_deep_color_info(struct drm_connector *connector, + const u8 *db) + { +@@ -4914,6 +4942,76 @@ static void drm_parse_hdmi_forum_vsdb(struct drm_connector *connector, + } + } + ++#ifdef CONFIG_NO_GKI ++ if (hf_vsdb[7]) { ++ u8 max_frl_rate; ++ u8 dsc_max_frl_rate; ++ u8 dsc_max_slices; ++ struct drm_hdmi_dsc_cap *hdmi_dsc = &hdmi->dsc_cap; + ++ DRM_DEBUG_KMS("hdmi_21 sink detected. parsing edid\n"); ++ max_frl_rate = (hf_vsdb[7] & DRM_EDID_MAX_FRL_RATE_MASK) >> 4; ++ drm_get_max_frl_rate(max_frl_rate, &hdmi->max_lanes, ++ &hdmi->max_frl_rate_per_lane); ++ hdmi_dsc->v_1p2 = hf_vsdb[11] & DRM_EDID_DSC_1P2; + ++ if (hdmi_dsc->v_1p2) { ++ hdmi_dsc->native_420 = hf_vsdb[11] & DRM_EDID_DSC_NATIVE_420; ++ hdmi_dsc->all_bpp = hf_vsdb[11] & DRM_EDID_DSC_ALL_BPP; + ++ if (hf_vsdb[11] & DRM_EDID_DSC_16BPC) ++ hdmi_dsc->bpc_supported = 16; ++ else if (hf_vsdb[11] & DRM_EDID_DSC_12BPC) ++ hdmi_dsc->bpc_supported = 12; ++ else if (hf_vsdb[11] & DRM_EDID_DSC_10BPC) ++ hdmi_dsc->bpc_supported = 10; ++ else ++ hdmi_dsc->bpc_supported = 0; + -+/* -+ * "Coarse Demand" power management policy -+ */ ++ dsc_max_frl_rate = (hf_vsdb[12] & DRM_EDID_DSC_MAX_FRL_RATE_MASK) >> 4; ++ drm_get_max_frl_rate(dsc_max_frl_rate, &hdmi_dsc->max_lanes, ++ &hdmi_dsc->max_frl_rate_per_lane); ++ hdmi_dsc->total_chunk_kbytes = hf_vsdb[13] & DRM_EDID_DSC_TOTAL_CHUNK_KBYTES; + -+#ifndef MALI_KBASE_PM_COARSE_DEMAND_H -+#define MALI_KBASE_PM_COARSE_DEMAND_H ++ dsc_max_slices = hf_vsdb[12] & DRM_EDID_DSC_MAX_SLICES; ++ switch (dsc_max_slices) { ++ case 1: ++ hdmi_dsc->max_slices = 1; ++ hdmi_dsc->clk_per_slice = 340; ++ break; ++ case 2: ++ hdmi_dsc->max_slices = 2; ++ hdmi_dsc->clk_per_slice = 340; ++ break; ++ case 3: ++ hdmi_dsc->max_slices = 4; ++ hdmi_dsc->clk_per_slice = 340; ++ break; ++ case 4: ++ hdmi_dsc->max_slices = 8; ++ hdmi_dsc->clk_per_slice = 340; ++ break; ++ case 5: ++ hdmi_dsc->max_slices = 8; ++ hdmi_dsc->clk_per_slice = 400; ++ break; ++ case 6: ++ hdmi_dsc->max_slices = 12; ++ hdmi_dsc->clk_per_slice = 400; ++ break; ++ case 7: ++ hdmi_dsc->max_slices = 16; ++ hdmi_dsc->clk_per_slice = 400; ++ break; ++ case 0: ++ default: ++ hdmi_dsc->max_slices = 0; ++ hdmi_dsc->clk_per_slice = 0; ++ } ++ } ++ } ++#endif + -+/** -+ * DOC: -+ * The "Coarse" demand power management policy has the following -+ * characteristics: -+ * - When KBase indicates that the GPU will be powered up, but we don't yet -+ * know which Job Chains are to be run: -+ * - All Shader Cores are powered up, regardless of whether or not they will -+ * be needed later. -+ * - When KBase indicates that a set of Shader Cores are needed to submit the -+ * currently queued Job Chains: -+ * - All Shader Cores are kept powered, regardless of whether or not they will -+ * be needed -+ * - When KBase indicates that the GPU need not be powered: -+ * - The Shader Cores are powered off, and the GPU itself is powered off too. -+ * -+ * @note: -+ * - KBase indicates the GPU will be powered up when it has a User Process that -+ * has just started to submit Job Chains. -+ * - KBase indicates the GPU need not be powered when all the Job Chains from -+ * User Processes have finished, and it is waiting for a User Process to -+ * submit some more Job Chains. -+ */ + drm_parse_ycbcr420_deep_color_info(connector, hf_vsdb); + } + +diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c +index 537e7de8e..01670305d 100644 +--- a/drivers/gpu/drm/drm_file.c ++++ b/drivers/gpu/drm/drm_file.c +@@ -177,7 +177,6 @@ struct drm_file *drm_file_alloc(struct drm_minor *minor) + init_waitqueue_head(&file->event_wait); + file->event_space = 4096; /* set aside 4k for event buffer */ + +- spin_lock_init(&file->master_lookup_lock); + mutex_init(&file->event_read_lock); + + if (drm_core_check_feature(dev, DRIVER_GEM)) +@@ -776,20 +775,19 @@ void drm_event_cancel_free(struct drm_device *dev, + EXPORT_SYMBOL(drm_event_cancel_free); + + /** +- * drm_send_event_locked - send DRM event to file descriptor ++ * drm_send_event_helper - send DRM event to file descriptor + * @dev: DRM device + * @e: DRM event to deliver ++ * @timestamp: timestamp to set for the fence event in kernel's CLOCK_MONOTONIC ++ * time domain + * +- * This function sends the event @e, initialized with drm_event_reserve_init(), +- * to its associated userspace DRM file. Callers must already hold +- * &drm_device.event_lock, see drm_send_event() for the unlocked version. +- * +- * Note that the core will take care of unlinking and disarming events when the +- * corresponding DRM file is closed. Drivers need not worry about whether the +- * DRM file for this event still exists and can call this function upon +- * completion of the asynchronous work unconditionally. ++ * This helper function sends the event @e, initialized with ++ * drm_event_reserve_init(), to its associated userspace DRM file. ++ * The timestamp variant of dma_fence_signal is used when the caller ++ * sends a valid timestamp. + */ +-void drm_send_event_locked(struct drm_device *dev, struct drm_pending_event *e) ++void drm_send_event_helper(struct drm_device *dev, ++ struct drm_pending_event *e, ktime_t timestamp) + { + assert_spin_locked(&dev->event_lock); + +@@ -800,7 +798,10 @@ void drm_send_event_locked(struct drm_device *dev, struct drm_pending_event *e) + } + + if (e->fence) { +- dma_fence_signal(e->fence); ++ if (timestamp) ++ dma_fence_signal_timestamp(e->fence, timestamp); ++ else ++ dma_fence_signal(e->fence); + dma_fence_put(e->fence); + } + +@@ -815,6 +816,48 @@ void drm_send_event_locked(struct drm_device *dev, struct drm_pending_event *e) + wake_up_interruptible_poll(&e->file_priv->event_wait, + EPOLLIN | EPOLLRDNORM); + } + +/** -+ * struct kbasep_pm_policy_coarse_demand - Private structure for coarse demand -+ * policy ++ * drm_send_event_timestamp_locked - send DRM event to file descriptor ++ * @dev: DRM device ++ * @e: DRM event to deliver ++ * @timestamp: timestamp to set for the fence event in kernel's CLOCK_MONOTONIC ++ * time domain + * -+ * This contains data that is private to the coarse demand power policy. ++ * This function sends the event @e, initialized with drm_event_reserve_init(), ++ * to its associated userspace DRM file. Callers must already hold ++ * &drm_device.event_lock. + * -+ * @dummy: Dummy member - no state needed ++ * Note that the core will take care of unlinking and disarming events when the ++ * corresponding DRM file is closed. Drivers need not worry about whether the ++ * DRM file for this event still exists and can call this function upon ++ * completion of the asynchronous work unconditionally. + */ -+struct kbasep_pm_policy_coarse_demand { -+ int dummy; -+}; -+ -+extern const struct kbase_pm_policy kbase_pm_coarse_demand_policy_ops; ++void drm_send_event_timestamp_locked(struct drm_device *dev, ++ struct drm_pending_event *e, ktime_t timestamp) ++{ ++ drm_send_event_helper(dev, e, timestamp); ++} ++EXPORT_SYMBOL(drm_send_event_timestamp_locked); + -+#endif /* MALI_KBASE_PM_COARSE_DEMAND_H */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h -new file mode 100755 -index 000000000000..352744ee6d73 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h -@@ -0,0 +1,519 @@ -+/* -+ * -+ * (C) COPYRIGHT 2014-2017 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. ++/** ++ * drm_send_event_locked - send DRM event to file descriptor ++ * @dev: DRM device ++ * @e: DRM event to deliver + * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. ++ * This function sends the event @e, initialized with drm_event_reserve_init(), ++ * to its associated userspace DRM file. Callers must already hold ++ * &drm_device.event_lock, see drm_send_event() for the unlocked version. + * ++ * Note that the core will take care of unlinking and disarming events when the ++ * corresponding DRM file is closed. Drivers need not worry about whether the ++ * DRM file for this event still exists and can call this function upon ++ * completion of the asynchronous work unconditionally. + */ -+ -+ -+ -+/* -+ * Backend-specific Power Manager definitions -+ */ -+ -+#ifndef _KBASE_PM_HWACCESS_DEFS_H_ -+#define _KBASE_PM_HWACCESS_DEFS_H_ -+ -+#include "mali_kbase_pm_ca_fixed.h" -+#include "mali_kbase_pm_ca_devfreq.h" -+#if !MALI_CUSTOMER_RELEASE -+#include "mali_kbase_pm_ca_random.h" ++void drm_send_event_locked(struct drm_device *dev, struct drm_pending_event *e) ++{ ++ drm_send_event_helper(dev, e, 0); ++} + EXPORT_SYMBOL(drm_send_event_locked); + + /** +@@ -837,7 +880,7 @@ void drm_send_event(struct drm_device *dev, struct drm_pending_event *e) + unsigned long irqflags; + + spin_lock_irqsave(&dev->event_lock, irqflags); +- drm_send_event_locked(dev, e); ++ drm_send_event_helper(dev, e, 0); + spin_unlock_irqrestore(&dev->event_lock, irqflags); + } + EXPORT_SYMBOL(drm_send_event); +diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c +index 8d1064061..e4c8aa361 100644 +--- a/drivers/gpu/drm/drm_fourcc.c ++++ b/drivers/gpu/drm/drm_fourcc.c +@@ -282,6 +282,16 @@ const struct drm_format_info *__drm_format_info(u32 format) + .num_planes = 2, .char_per_block = { 5, 5, 0 }, + .block_w = { 4, 2, 0 }, .block_h = { 1, 1, 0 }, .hsub = 2, + .vsub = 2, .is_yuv = true }, ++#ifdef CONFIG_NO_GKI ++ { .format = DRM_FORMAT_NV20, .depth = 0, ++ .num_planes = 2, .char_per_block = { 5, 5, 0 }, ++ .block_w = { 4, 2, 0 }, .block_h = { 1, 1, 0 }, .hsub = 2, ++ .vsub = 1, .is_yuv = true }, ++ { .format = DRM_FORMAT_NV30, .depth = 0, ++ .num_planes = 2, .char_per_block = { 5, 5, 0 }, ++ .block_w = { 4, 2, 0 }, .block_h = { 1, 1, 0 }, .hsub = 1, ++ .vsub = 1, .is_yuv = true }, +#endif -+ -+#include "mali_kbase_pm_always_on.h" -+#include "mali_kbase_pm_coarse_demand.h" -+#include "mali_kbase_pm_demand.h" -+#if !MALI_CUSTOMER_RELEASE -+#include "mali_kbase_pm_demand_always_powered.h" -+#include "mali_kbase_pm_fast_start.h" + { .format = DRM_FORMAT_Q410, .depth = 0, + .num_planes = 3, .char_per_block = { 2, 2, 2 }, + .block_w = { 1, 1, 1 }, .block_h = { 1, 1, 1 }, .hsub = 1, +diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c +index c160a45a4..73818ffa0 100644 +--- a/drivers/gpu/drm/drm_ioctl.c ++++ b/drivers/gpu/drm/drm_ioctl.c +@@ -543,6 +543,7 @@ int drm_version(struct drm_device *dev, void *data, + */ + int drm_ioctl_permit(u32 flags, struct drm_file *file_priv) + { ++#ifndef CONFIG_DRM_IGNORE_IOTCL_PERMIT + /* ROOT_ONLY is only for CAP_SYS_ADMIN */ + if (unlikely((flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN))) + return -EACCES; +@@ -561,6 +562,7 @@ int drm_ioctl_permit(u32 flags, struct drm_file *file_priv) + if (unlikely(!(flags & DRM_RENDER_ALLOW) && + drm_is_render_client(file_priv))) + return -EACCES; +#endif + + return 0; + } +@@ -684,9 +686,9 @@ static const struct drm_ioctl_desc drm_ioctls[] = { + DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb_ioctl, 0), + DRM_IOCTL_DEF(DRM_IOCTL_MODE_PAGE_FLIP, drm_mode_page_flip_ioctl, DRM_MASTER), + DRM_IOCTL_DEF(DRM_IOCTL_MODE_DIRTYFB, drm_mode_dirtyfb_ioctl, DRM_MASTER), +- DRM_IOCTL_DEF(DRM_IOCTL_MODE_CREATE_DUMB, drm_mode_create_dumb_ioctl, 0), +- DRM_IOCTL_DEF(DRM_IOCTL_MODE_MAP_DUMB, drm_mode_mmap_dumb_ioctl, 0), +- DRM_IOCTL_DEF(DRM_IOCTL_MODE_DESTROY_DUMB, drm_mode_destroy_dumb_ioctl, 0), ++ DRM_IOCTL_DEF(DRM_IOCTL_MODE_CREATE_DUMB, drm_mode_create_dumb_ioctl, DRM_RENDER_ALLOW), ++ DRM_IOCTL_DEF(DRM_IOCTL_MODE_MAP_DUMB, drm_mode_mmap_dumb_ioctl, DRM_RENDER_ALLOW), ++ DRM_IOCTL_DEF(DRM_IOCTL_MODE_DESTROY_DUMB, drm_mode_destroy_dumb_ioctl, DRM_RENDER_ALLOW), + DRM_IOCTL_DEF(DRM_IOCTL_MODE_OBJ_GETPROPERTIES, drm_mode_obj_get_properties_ioctl, 0), + DRM_IOCTL_DEF(DRM_IOCTL_MODE_OBJ_SETPROPERTY, drm_mode_obj_set_property_ioctl, DRM_MASTER), + DRM_IOCTL_DEF(DRM_IOCTL_MODE_CURSOR2, drm_mode_cursor2_ioctl, DRM_MASTER), +diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c +index aef226340..da4f085fc 100644 +--- a/drivers/gpu/drm/drm_lease.c ++++ b/drivers/gpu/drm/drm_lease.c +@@ -107,19 +107,10 @@ static bool _drm_has_leased(struct drm_master *master, int id) + */ + bool _drm_lease_held(struct drm_file *file_priv, int id) + { +- bool ret; +- struct drm_master *master; +- +- if (!file_priv) ++ if (!file_priv || !file_priv->master) + return true; + +- master = drm_file_get_master(file_priv); +- if (!master) +- return true; +- ret = _drm_lease_held_master(master, id); +- drm_master_put(&master); +- +- return ret; ++ return _drm_lease_held_master(file_priv->master, id); + } + + /** +@@ -138,22 +129,13 @@ bool drm_lease_held(struct drm_file *file_priv, int id) + struct drm_master *master; + bool ret; + +- if (!file_priv) ++ if (!file_priv || !file_priv->master || !file_priv->master->lessor) + return true; + +- master = drm_file_get_master(file_priv); +- if (!master) +- return true; +- if (!master->lessor) { +- ret = true; +- goto out; +- } ++ master = file_priv->master; + mutex_lock(&master->dev->mode_config.idr_mutex); + ret = _drm_lease_held_master(master, id); + mutex_unlock(&master->dev->mode_config.idr_mutex); +- +-out: +- drm_master_put(&master); + return ret; + } + +@@ -173,16 +155,10 @@ uint32_t drm_lease_filter_crtcs(struct drm_file *file_priv, uint32_t crtcs_in) + int count_in, count_out; + uint32_t crtcs_out = 0; + +- if (!file_priv) ++ if (!file_priv || !file_priv->master || !file_priv->master->lessor) + return crtcs_in; + +- master = drm_file_get_master(file_priv); +- if (!master) +- return crtcs_in; +- if (!master->lessor) { +- crtcs_out = crtcs_in; +- goto out; +- } ++ master = file_priv->master; + dev = master->dev; + + count_in = count_out = 0; +@@ -201,9 +177,6 @@ uint32_t drm_lease_filter_crtcs(struct drm_file *file_priv, uint32_t crtcs_in) + count_in++; + } + mutex_unlock(&master->dev->mode_config.idr_mutex); +- +-out: +- drm_master_put(&master); + return crtcs_out; + } + +@@ -517,7 +490,7 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, + size_t object_count; + int ret = 0; + struct idr leases; +- struct drm_master *lessor; ++ struct drm_master *lessor = lessor_priv->master; + struct drm_master *lessee = NULL; + struct file *lessee_file = NULL; + struct file *lessor_file = lessor_priv->filp; +@@ -529,6 +502,12 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return -EOPNOTSUPP; + ++ /* Do not allow sub-leases */ ++ if (lessor->lessor) { ++ DRM_DEBUG_LEASE("recursive leasing not allowed\n"); ++ return -EINVAL; ++ } + -+/* Forward definition - see mali_kbase.h */ -+struct kbase_device; -+struct kbase_jd_atom; + /* need some objects */ + if (cl->object_count == 0) { + DRM_DEBUG_LEASE("no objects in lease\n"); +@@ -540,22 +519,12 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, + return -EINVAL; + } + +- lessor = drm_file_get_master(lessor_priv); +- /* Do not allow sub-leases */ +- if (lessor->lessor) { +- DRM_DEBUG_LEASE("recursive leasing not allowed\n"); +- ret = -EINVAL; +- goto out_lessor; +- } +- + object_count = cl->object_count; + + object_ids = memdup_user(u64_to_user_ptr(cl->object_ids), + array_size(object_count, sizeof(__u32))); +- if (IS_ERR(object_ids)) { +- ret = PTR_ERR(object_ids); +- goto out_lessor; +- } ++ if (IS_ERR(object_ids)) ++ return PTR_ERR(object_ids); + + idr_init(&leases); + +@@ -566,15 +535,14 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, + if (ret) { + DRM_DEBUG_LEASE("lease object lookup failed: %i\n", ret); + idr_destroy(&leases); +- goto out_lessor; ++ return ret; + } + + /* Allocate a file descriptor for the lease */ + fd = get_unused_fd_flags(cl->flags & (O_CLOEXEC | O_NONBLOCK)); + if (fd < 0) { + idr_destroy(&leases); +- ret = fd; +- goto out_lessor; ++ return fd; + } + + DRM_DEBUG_LEASE("Creating lease\n"); +@@ -610,7 +578,6 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, + /* Hook up the fd */ + fd_install(fd, lessee_file); + +- drm_master_put(&lessor); + DRM_DEBUG_LEASE("drm_mode_create_lease_ioctl succeeded\n"); + return 0; + +@@ -620,8 +587,6 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, + out_leases: + put_unused_fd(fd); + +-out_lessor: +- drm_master_put(&lessor); + DRM_DEBUG_LEASE("drm_mode_create_lease_ioctl failed: %d\n", ret); + return ret; + } +@@ -644,7 +609,7 @@ int drm_mode_list_lessees_ioctl(struct drm_device *dev, + struct drm_mode_list_lessees *arg = data; + __u32 __user *lessee_ids = (__u32 __user *) (uintptr_t) (arg->lessees_ptr); + __u32 count_lessees = arg->count_lessees; +- struct drm_master *lessor, *lessee; ++ struct drm_master *lessor = lessor_priv->master, *lessee; + int count; + int ret = 0; + +@@ -655,7 +620,6 @@ int drm_mode_list_lessees_ioctl(struct drm_device *dev, + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return -EOPNOTSUPP; + +- lessor = drm_file_get_master(lessor_priv); + DRM_DEBUG_LEASE("List lessees for %d\n", lessor->lessee_id); + + mutex_lock(&dev->mode_config.idr_mutex); +@@ -679,7 +643,6 @@ int drm_mode_list_lessees_ioctl(struct drm_device *dev, + arg->count_lessees = count; + + mutex_unlock(&dev->mode_config.idr_mutex); +- drm_master_put(&lessor); + + return ret; + } +@@ -699,7 +662,7 @@ int drm_mode_get_lease_ioctl(struct drm_device *dev, + struct drm_mode_get_lease *arg = data; + __u32 __user *object_ids = (__u32 __user *) (uintptr_t) (arg->objects_ptr); + __u32 count_objects = arg->count_objects; +- struct drm_master *lessee; ++ struct drm_master *lessee = lessee_priv->master; + struct idr *object_idr; + int count; + void *entry; +@@ -713,7 +676,6 @@ int drm_mode_get_lease_ioctl(struct drm_device *dev, + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return -EOPNOTSUPP; + +- lessee = drm_file_get_master(lessee_priv); + DRM_DEBUG_LEASE("get lease for %d\n", lessee->lessee_id); + + mutex_lock(&dev->mode_config.idr_mutex); +@@ -741,7 +703,6 @@ int drm_mode_get_lease_ioctl(struct drm_device *dev, + arg->count_objects = count; + + mutex_unlock(&dev->mode_config.idr_mutex); +- drm_master_put(&lessee); + + return ret; + } +@@ -760,7 +721,7 @@ int drm_mode_revoke_lease_ioctl(struct drm_device *dev, + void *data, struct drm_file *lessor_priv) + { + struct drm_mode_revoke_lease *arg = data; +- struct drm_master *lessor; ++ struct drm_master *lessor = lessor_priv->master; + struct drm_master *lessee; + int ret = 0; + +@@ -770,7 +731,6 @@ int drm_mode_revoke_lease_ioctl(struct drm_device *dev, + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return -EOPNOTSUPP; + +- lessor = drm_file_get_master(lessor_priv); + mutex_lock(&dev->mode_config.idr_mutex); + + lessee = _drm_find_lessee(lessor, arg->lessee_id); +@@ -791,7 +751,6 @@ int drm_mode_revoke_lease_ioctl(struct drm_device *dev, + + fail: + mutex_unlock(&dev->mode_config.idr_mutex); +- drm_master_put(&lessor); + + return ret; + } +diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c +index 0c806e99e..fddc041aa 100644 +--- a/drivers/gpu/drm/drm_mipi_dsi.c ++++ b/drivers/gpu/drm/drm_mipi_dsi.c +@@ -356,6 +356,7 @@ static ssize_t mipi_dsi_device_transfer(struct mipi_dsi_device *dsi, + + if (dsi->mode_flags & MIPI_DSI_MODE_LPM) + msg->flags |= MIPI_DSI_MSG_USE_LPM; ++ msg->flags |= MIPI_DSI_MSG_LASTCOMMAND; + + return ops->transfer(dsi->host, msg); + } +diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c +index fad2c1181..58050d4ae 100644 +--- a/drivers/gpu/drm/drm_mode_config.c ++++ b/drivers/gpu/drm/drm_mode_config.c +@@ -364,6 +364,22 @@ static int drm_mode_create_standard_properties(struct drm_device *dev) + return -ENOMEM; + dev->mode_config.gamma_lut_size_property = prop; + ++#if defined(CONFIG_ROCKCHIP_DRM_CUBIC_LUT) ++ prop = drm_property_create(dev, ++ DRM_MODE_PROP_BLOB, ++ "CUBIC_LUT", 0); ++ if (!prop) ++ return -ENOMEM; ++ dev->mode_config.cubic_lut_property = prop; + -+/** -+ * enum kbase_pm_core_type - The types of core in a GPU. -+ * -+ * These enumerated values are used in calls to -+ * - kbase_pm_get_present_cores() -+ * - kbase_pm_get_active_cores() -+ * - kbase_pm_get_trans_cores() -+ * - kbase_pm_get_ready_cores(). -+ * -+ * They specify which type of core should be acted on. These values are set in -+ * a manner that allows core_type_to_reg() function to be simpler and more -+ * efficient. -+ * -+ * @KBASE_PM_CORE_L2: The L2 cache -+ * @KBASE_PM_CORE_SHADER: Shader cores -+ * @KBASE_PM_CORE_TILER: Tiler cores -+ * @KBASE_PM_CORE_STACK: Core stacks -+ */ -+enum kbase_pm_core_type { -+ KBASE_PM_CORE_L2 = L2_PRESENT_LO, -+ KBASE_PM_CORE_SHADER = SHADER_PRESENT_LO, -+ KBASE_PM_CORE_TILER = TILER_PRESENT_LO, -+ KBASE_PM_CORE_STACK = STACK_PRESENT_LO -+}; ++ prop = drm_property_create_range(dev, ++ DRM_MODE_PROP_IMMUTABLE, ++ "CUBIC_LUT_SIZE", 0, UINT_MAX); ++ if (!prop) ++ return -ENOMEM; ++ dev->mode_config.cubic_lut_size_property = prop; ++#endif + + prop = drm_property_create(dev, + DRM_MODE_PROP_IMMUTABLE | DRM_MODE_PROP_BLOB, + "IN_FORMATS", 0); +diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c +index 0f99e5453..d42c7310b 100644 +--- a/drivers/gpu/drm/drm_modes.c ++++ b/drivers/gpu/drm/drm_modes.c +@@ -1940,6 +1940,7 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, + strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN); + out->name[DRM_DISPLAY_MODE_LEN-1] = 0; + } ++EXPORT_SYMBOL_GPL(drm_mode_convert_to_umode); + + /** + * drm_crtc_convert_umode - convert a modeinfo into a drm_display_mode +@@ -2016,6 +2017,7 @@ int drm_mode_convert_umode(struct drm_device *dev, + + return 0; + } ++EXPORT_SYMBOL_GPL(drm_mode_convert_umode); + + /** + * drm_mode_is_420_only - if a given videomode can be only supported in YCBCR420 +diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c +index 825499ea3..272e5cdd6 100644 +--- a/drivers/gpu/drm/drm_prime.c ++++ b/drivers/gpu/drm/drm_prime.c +@@ -784,6 +784,28 @@ int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma) + } + EXPORT_SYMBOL(drm_gem_dmabuf_mmap); + +/** -+ * struct kbasep_pm_metrics_data - Metrics data collected for use by the power -+ * management framework. ++ * drm_gem_dmabuf_get_uuid - dma_buf get_uuid implementation for GEM ++ * @dma_buf: buffer to query ++ * @uuid: uuid outparam + * -+ * @time_period_start: time at which busy/idle measurements started -+ * @time_busy: number of ns the GPU was busy executing jobs since the -+ * @time_period_start timestamp. -+ * @time_idle: number of ns since time_period_start the GPU was not executing -+ * jobs since the @time_period_start timestamp. -+ * @prev_busy: busy time in ns of previous time period. -+ * Updated when metrics are reset. -+ * @prev_idle: idle time in ns of previous time period -+ * Updated when metrics are reset. -+ * @gpu_active: true when the GPU is executing jobs. false when -+ * not. Updated when the job scheduler informs us a job in submitted -+ * or removed from a GPU slot. -+ * @busy_cl: number of ns the GPU was busy executing CL jobs. Note that -+ * if two CL jobs were active for 400ns, this value would be updated -+ * with 800. -+ * @busy_gl: number of ns the GPU was busy executing GL jobs. Note that -+ * if two GL jobs were active for 400ns, this value would be updated -+ * with 800. -+ * @active_cl_ctx: number of CL jobs active on the GPU. Array is per-device. -+ * @active_gl_ctx: number of GL jobs active on the GPU. Array is per-slot. As -+ * GL jobs never run on slot 2 this slot is not recorded. -+ * @lock: spinlock protecting the kbasep_pm_metrics_data structure -+ * @timer: timer to regularly make DVFS decisions based on the power -+ * management metrics. -+ * @timer_active: boolean indicating @timer is running -+ * @platform_data: pointer to data controlled by platform specific code -+ * @kbdev: pointer to kbase device for which metrics are collected ++ * Queries the buffer's virtio UUID. This can be used as the ++ * &dma_buf_ops.get_uuid callback. Calls into &drm_driver.gem_prime_get_uuid. + * ++ * Returns 0 on success or a negative error code on failure. + */ -+struct kbasep_pm_metrics_data { -+ ktime_t time_period_start; -+ u32 time_busy; -+ u32 time_idle; -+ u32 prev_busy; -+ u32 prev_idle; -+ bool gpu_active; -+ u32 busy_cl[2]; -+ u32 busy_gl; -+ u32 active_cl_ctx[2]; -+ u32 active_gl_ctx[2]; /* GL jobs can only run on 2 of the 3 job slots */ -+ spinlock_t lock; -+ -+#ifdef CONFIG_MALI_MIDGARD_DVFS -+ struct hrtimer timer; -+ bool timer_active; -+#endif -+ -+ void *platform_data; -+ struct kbase_device *kbdev; -+}; ++int drm_gem_dmabuf_get_uuid(struct dma_buf *dma_buf, uuid_t *uuid) ++{ ++ struct drm_gem_object *obj = dma_buf->priv; ++ struct drm_device *dev = obj->dev; + -+union kbase_pm_policy_data { -+ struct kbasep_pm_policy_always_on always_on; -+ struct kbasep_pm_policy_coarse_demand coarse_demand; -+ struct kbasep_pm_policy_demand demand; -+#if !MALI_CUSTOMER_RELEASE -+ struct kbasep_pm_policy_demand_always_powered demand_always_powered; -+ struct kbasep_pm_policy_fast_start fast_start; -+#endif -+}; ++ if (!dev->driver->gem_prime_get_uuid) ++ return -ENODEV; + -+union kbase_pm_ca_policy_data { -+ struct kbasep_pm_ca_policy_fixed fixed; -+ struct kbasep_pm_ca_policy_devfreq devfreq; -+#if !MALI_CUSTOMER_RELEASE -+ struct kbasep_pm_ca_policy_random random; -+#endif -+}; ++ return dev->driver->gem_prime_get_uuid(obj, uuid); ++} ++EXPORT_SYMBOL(drm_gem_dmabuf_get_uuid); + -+/** -+ * struct kbase_pm_backend_data - Data stored per device for power management. + static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { + .cache_sgt_mapping = true, + .attach = drm_gem_map_attach, +@@ -794,6 +816,7 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { + .mmap = drm_gem_dmabuf_mmap, + .vmap = drm_gem_dmabuf_vmap, + .vunmap = drm_gem_dmabuf_vunmap, ++ .get_uuid = drm_gem_dmabuf_get_uuid, + }; + + /** +diff --git a/drivers/gpu/drm/drm_sync_helper.c b/drivers/gpu/drm/drm_sync_helper.c +new file mode 100755 +index 000000000..0c6aa875b +--- /dev/null ++++ b/drivers/gpu/drm/drm_sync_helper.c +@@ -0,0 +1,314 @@ ++/* ++ * drm_sync_helper.c: software fence and helper functions for fences and ++ * reservations used for dma buffer access synchronization between drivers. + * -+ * This structure contains data for the power management framework. There is one -+ * instance of this structure per device in the system. ++ * Copyright 2014 Google, Inc. + * -+ * @ca_current_policy: The policy that is currently actively controlling core -+ * availability. -+ * @pm_current_policy: The policy that is currently actively controlling the -+ * power state. -+ * @ca_policy_data: Private data for current CA policy -+ * @pm_policy_data: Private data for current PM policy -+ * @ca_in_transition: Flag indicating when core availability policy is -+ * transitioning cores. The core availability policy must -+ * set this when a change in core availability is occurring. -+ * power_change_lock must be held when accessing this. -+ * @reset_done: Flag when a reset is complete -+ * @reset_done_wait: Wait queue to wait for changes to @reset_done -+ * @l2_powered_wait: Wait queue for whether the l2 cache has been powered as -+ * requested -+ * @l2_powered: State indicating whether all the l2 caches are powered. -+ * Non-zero indicates they're *all* powered -+ * Zero indicates that some (or all) are not powered -+ * @gpu_cycle_counter_requests: The reference count of active gpu cycle counter -+ * users -+ * @gpu_cycle_counter_requests_lock: Lock to protect @gpu_cycle_counter_requests -+ * @desired_shader_state: A bit mask identifying the shader cores that the -+ * power policy would like to be on. The current state -+ * of the cores may be different, but there should be -+ * transitions in progress that will eventually achieve -+ * this state (assuming that the policy doesn't change -+ * its mind in the mean time). -+ * @powering_on_shader_state: A bit mask indicating which shader cores are -+ * currently in a power-on transition -+ * @desired_tiler_state: A bit mask identifying the tiler cores that the power -+ * policy would like to be on. See @desired_shader_state -+ * @powering_on_tiler_state: A bit mask indicating which tiler core are -+ * currently in a power-on transition -+ * @powering_on_l2_state: A bit mask indicating which l2-caches are currently -+ * in a power-on transition -+ * @powering_on_stack_state: A bit mask indicating which core stacks are -+ * currently in a power-on transition -+ * @gpu_in_desired_state: This flag is set if the GPU is powered as requested -+ * by the desired_xxx_state variables -+ * @gpu_in_desired_state_wait: Wait queue set when @gpu_in_desired_state != 0 -+ * @gpu_powered: Set to true when the GPU is powered and register -+ * accesses are possible, false otherwise -+ * @instr_enabled: Set to true when instrumentation is enabled, -+ * false otherwise -+ * @cg1_disabled: Set if the policy wants to keep the second core group -+ * powered off -+ * @driver_ready_for_irqs: Debug state indicating whether sufficient -+ * initialization of the driver has occurred to handle -+ * IRQs -+ * @gpu_powered_lock: Spinlock that must be held when writing @gpu_powered or -+ * accessing @driver_ready_for_irqs -+ * @metrics: Structure to hold metrics for the GPU -+ * @gpu_poweroff_pending: number of poweroff timer ticks until the GPU is -+ * powered off -+ * @shader_poweroff_pending_time: number of poweroff timer ticks until shaders -+ * and/or timers are powered off -+ * @gpu_poweroff_timer: Timer for powering off GPU -+ * @gpu_poweroff_wq: Workqueue to power off GPU on when timer fires -+ * @gpu_poweroff_work: Workitem used on @gpu_poweroff_wq -+ * @shader_poweroff_pending: Bit mask of shaders to be powered off on next -+ * timer callback -+ * @tiler_poweroff_pending: Bit mask of tilers to be powered off on next timer -+ * callback -+ * @poweroff_timer_needed: true if the poweroff timer is currently required, -+ * false otherwise -+ * @poweroff_timer_running: true if the poweroff timer is currently running, -+ * false otherwise -+ * power_change_lock should be held when accessing, -+ * unless there is no way the timer can be running (eg -+ * hrtimer_cancel() was called immediately before) -+ * @poweroff_wait_in_progress: true if a wait for GPU power off is in progress. -+ * hwaccess_lock must be held when accessing -+ * @poweron_required: true if a GPU power on is required. Should only be set -+ * when poweroff_wait_in_progress is true, and therefore the -+ * GPU can not immediately be powered on. pm.lock must be -+ * held when accessing -+ * @poweroff_is_suspend: true if the GPU is being powered off due to a suspend -+ * request. pm.lock must be held when accessing -+ * @gpu_poweroff_wait_wq: workqueue for waiting for GPU to power off -+ * @gpu_poweroff_wait_work: work item for use with @gpu_poweroff_wait_wq -+ * @poweroff_wait: waitqueue for waiting for @gpu_poweroff_wait_work to complete -+ * @callback_power_on: Callback when the GPU needs to be turned on. See -+ * &struct kbase_pm_callback_conf -+ * @callback_power_off: Callback when the GPU may be turned off. See -+ * &struct kbase_pm_callback_conf -+ * @callback_power_suspend: Callback when a suspend occurs and the GPU needs to -+ * be turned off. See &struct kbase_pm_callback_conf -+ * @callback_power_resume: Callback when a resume occurs and the GPU needs to -+ * be turned on. See &struct kbase_pm_callback_conf -+ * @callback_power_runtime_on: Callback when the GPU needs to be turned on. See -+ * &struct kbase_pm_callback_conf -+ * @callback_power_runtime_off: Callback when the GPU may be turned off. See -+ * &struct kbase_pm_callback_conf -+ * @callback_power_runtime_idle: Optional callback when the GPU may be idle. See -+ * &struct kbase_pm_callback_conf ++ * This software is licensed under the terms of the GNU General Public ++ * License version 2, as published by the Free Software Foundation, and ++ * may be copied, distributed, and modified under those terms. + * -+ * Note: -+ * During an IRQ, @ca_current_policy or @pm_current_policy can be NULL when the -+ * policy is being changed with kbase_pm_ca_set_policy() or -+ * kbase_pm_set_policy(). The change is protected under -+ * kbase_device.pm.power_change_lock. Direct access to this -+ * from IRQ context must therefore check for NULL. If NULL, then -+ * kbase_pm_ca_set_policy() or kbase_pm_set_policy() will re-issue the policy -+ * functions that would have been done under IRQ. ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. + */ -+struct kbase_pm_backend_data { -+ const struct kbase_pm_ca_policy *ca_current_policy; -+ const struct kbase_pm_policy *pm_current_policy; -+ union kbase_pm_ca_policy_data ca_policy_data; -+ union kbase_pm_policy_data pm_policy_data; -+ bool ca_in_transition; -+ bool reset_done; -+ wait_queue_head_t reset_done_wait; -+ wait_queue_head_t l2_powered_wait; -+ int l2_powered; -+ int gpu_cycle_counter_requests; -+ spinlock_t gpu_cycle_counter_requests_lock; -+ -+ u64 desired_shader_state; -+ u64 powering_on_shader_state; -+ u64 desired_tiler_state; -+ u64 powering_on_tiler_state; -+ u64 powering_on_l2_state; -+#ifdef CONFIG_MALI_CORESTACK -+ u64 powering_on_stack_state; -+#endif /* CONFIG_MALI_CORESTACK */ -+ -+ bool gpu_in_desired_state; -+ wait_queue_head_t gpu_in_desired_state_wait; + -+ bool gpu_powered; ++#include ++#include ++#include ++#include + -+ bool instr_enabled; ++static DEFINE_SPINLOCK(sw_fence_lock); + -+ bool cg1_disabled; ++void drm_add_reservation(struct reservation_object *resv, ++ struct reservation_object **resvs, ++ unsigned long *excl_resvs_bitmap, ++ unsigned int *num_resvs, bool exclusive) ++{ ++ unsigned int r; + -+#ifdef CONFIG_MALI_DEBUG -+ bool driver_ready_for_irqs; -+#endif /* CONFIG_MALI_DEBUG */ ++ for (r = 0; r < *num_resvs; r++) { ++ if (resvs[r] == resv) ++ return; ++ } ++ resvs[*num_resvs] = resv; ++ if (exclusive) ++ set_bit(*num_resvs, excl_resvs_bitmap); ++ (*num_resvs)++; ++} ++EXPORT_SYMBOL(drm_add_reservation); + -+ spinlock_t gpu_powered_lock; ++int drm_lock_reservations(struct reservation_object **resvs, ++ unsigned int num_resvs, struct ww_acquire_ctx *ctx) ++{ ++ unsigned int r; ++ struct reservation_object *slow_res = NULL; + ++ ww_acquire_init(ctx, &reservation_ww_class); + -+ struct kbasep_pm_metrics_data metrics; ++retry: ++ for (r = 0; r < num_resvs; r++) { ++ int ret; ++ /* skip the resv we locked with slow lock */ ++ if (resvs[r] == slow_res) { ++ slow_res = NULL; ++ continue; ++ } ++ ret = ww_mutex_lock(&resvs[r]->lock, ctx); ++ if (ret < 0) { ++ unsigned int slow_r = r; ++ /* ++ * undo all the locks we already done, ++ * in reverse order ++ */ ++ while (r > 0) { ++ r--; ++ ww_mutex_unlock(&resvs[r]->lock); ++ } ++ if (slow_res) ++ ww_mutex_unlock(&slow_res->lock); ++ if (ret == -EDEADLK) { ++ slow_res = resvs[slow_r]; ++ ww_mutex_lock_slow(&slow_res->lock, ctx); ++ goto retry; ++ } ++ ww_acquire_fini(ctx); ++ return ret; ++ } ++ } + -+ int gpu_poweroff_pending; -+ int shader_poweroff_pending_time; ++ ww_acquire_done(ctx); ++ return 0; ++} ++EXPORT_SYMBOL(drm_lock_reservations); + -+ struct hrtimer gpu_poweroff_timer; -+ struct workqueue_struct *gpu_poweroff_wq; -+ struct work_struct gpu_poweroff_work; ++void drm_unlock_reservations(struct reservation_object **resvs, ++ unsigned int num_resvs, ++ struct ww_acquire_ctx *ctx) ++{ ++ unsigned int r; + -+ u64 shader_poweroff_pending; -+ u64 tiler_poweroff_pending; ++ for (r = 0; r < num_resvs; r++) ++ ww_mutex_unlock(&resvs[r]->lock); + -+ bool poweroff_timer_needed; -+ bool poweroff_timer_running; ++ ww_acquire_fini(ctx); ++} ++EXPORT_SYMBOL(drm_unlock_reservations); + -+ bool poweroff_wait_in_progress; -+ bool poweron_required; -+ bool poweroff_is_suspend; ++static void reservation_cb_fence_cb(struct fence *fence, struct fence_cb *cb) ++{ ++ struct drm_reservation_fence_cb *rfcb = ++ container_of(cb, struct drm_reservation_fence_cb, base); ++ struct drm_reservation_cb *rcb = rfcb->parent; + -+ struct workqueue_struct *gpu_poweroff_wait_wq; -+ struct work_struct gpu_poweroff_wait_work; ++ if (atomic_dec_and_test(&rcb->count)) ++ schedule_work(&rcb->work); ++} + -+ wait_queue_head_t poweroff_wait; ++static void ++reservation_cb_cleanup(struct drm_reservation_cb *rcb) ++{ ++ unsigned cb; + -+ int (*callback_power_on)(struct kbase_device *kbdev); -+ void (*callback_power_off)(struct kbase_device *kbdev); -+ void (*callback_power_suspend)(struct kbase_device *kbdev); -+ void (*callback_power_resume)(struct kbase_device *kbdev); -+ int (*callback_power_runtime_on)(struct kbase_device *kbdev); -+ void (*callback_power_runtime_off)(struct kbase_device *kbdev); -+ int (*callback_power_runtime_idle)(struct kbase_device *kbdev); -+}; -+ -+ -+/* List of policy IDs */ -+enum kbase_pm_policy_id { -+ KBASE_PM_POLICY_ID_DEMAND = 1, -+ KBASE_PM_POLICY_ID_ALWAYS_ON, -+ KBASE_PM_POLICY_ID_COARSE_DEMAND, -+#if !MALI_CUSTOMER_RELEASE -+ KBASE_PM_POLICY_ID_DEMAND_ALWAYS_POWERED, -+ KBASE_PM_POLICY_ID_FAST_START -+#endif -+}; -+ -+typedef u32 kbase_pm_policy_flags; -+ -+/** -+ * struct kbase_pm_policy - Power policy structure. -+ * -+ * Each power policy exposes a (static) instance of this structure which -+ * contains function pointers to the policy's methods. -+ * -+ * @name: The name of this policy -+ * @init: Function called when the policy is selected -+ * @term: Function called when the policy is unselected -+ * @get_core_mask: Function called to get the current shader core mask -+ * @get_core_active: Function called to get the current overall GPU power -+ * state -+ * @flags: Field indicating flags for this policy -+ * @id: Field indicating an ID for this policy. This is not -+ * necessarily the same as its index in the list returned -+ * by kbase_pm_list_policies(). -+ * It is used purely for debugging. -+ */ -+struct kbase_pm_policy { -+ char *name; ++ for (cb = 0; cb < rcb->num_fence_cbs; cb++) { ++ if (rcb->fence_cbs[cb]) { ++ fence_remove_callback(rcb->fence_cbs[cb]->fence, ++ &rcb->fence_cbs[cb]->base); ++ fence_put(rcb->fence_cbs[cb]->fence); ++ kfree(rcb->fence_cbs[cb]); ++ rcb->fence_cbs[cb] = NULL; ++ } ++ } ++ kfree(rcb->fence_cbs); ++ rcb->fence_cbs = NULL; ++ rcb->num_fence_cbs = 0; ++} + -+ /** -+ * Function called when the policy is selected -+ * -+ * This should initialize the kbdev->pm.pm_policy_data structure. It -+ * should not attempt to make any changes to hardware state. -+ * -+ * It is undefined what state the cores are in when the function is -+ * called. -+ * -+ * @kbdev: The kbase device structure for the device (must be a -+ * valid pointer) ++static void reservation_cb_work(struct work_struct *pwork) ++{ ++ struct drm_reservation_cb *rcb = ++ container_of(pwork, struct drm_reservation_cb, work); ++ /* ++ * clean up everything before calling the callback, because the callback ++ * may free structure containing rcb and work_struct + */ -+ void (*init)(struct kbase_device *kbdev); ++ reservation_cb_cleanup(rcb); ++ rcb->func(rcb, rcb->context); ++} + -+ /** -+ * Function called when the policy is unselected. -+ * -+ * @kbdev: The kbase device structure for the device (must be a -+ * valid pointer) -+ */ -+ void (*term)(struct kbase_device *kbdev); ++static int ++reservation_cb_add_fence_cb(struct drm_reservation_cb *rcb, struct fence *fence) ++{ ++ int ret = 0; ++ struct drm_reservation_fence_cb *fence_cb; ++ struct drm_reservation_fence_cb **new_fence_cbs; + -+ /** -+ * Function called to get the current shader core mask -+ * -+ * The returned mask should meet or exceed (kbdev->shader_needed_bitmap -+ * | kbdev->shader_inuse_bitmap). -+ * -+ * @kbdev: The kbase device structure for the device (must be a -+ * valid pointer) -+ * -+ * Return: The mask of shader cores to be powered -+ */ -+ u64 (*get_core_mask)(struct kbase_device *kbdev); ++ new_fence_cbs = krealloc(rcb->fence_cbs, ++ (rcb->num_fence_cbs + 1) ++ * sizeof(struct drm_reservation_fence_cb *), ++ GFP_KERNEL); ++ if (!new_fence_cbs) ++ return -ENOMEM; ++ rcb->fence_cbs = new_fence_cbs; + -+ /** -+ * Function called to get the current overall GPU power state -+ * -+ * This function should consider the state of kbdev->pm.active_count. If -+ * this count is greater than 0 then there is at least one active -+ * context on the device and the GPU should be powered. If it is equal -+ * to 0 then there are no active contexts and the GPU could be powered -+ * off if desired. -+ * -+ * @kbdev: The kbase device structure for the device (must be a -+ * valid pointer) -+ * -+ * Return: true if the GPU should be powered, false otherwise ++ fence_cb = kzalloc(sizeof(struct drm_reservation_fence_cb), GFP_KERNEL); ++ if (!fence_cb) ++ return -ENOMEM; ++ ++ /* ++ * do not want for fence to disappear on us while we are waiting for ++ * callback and we need it in case we want to remove callbacks + */ -+ bool (*get_core_active)(struct kbase_device *kbdev); ++ fence_get(fence); ++ fence_cb->fence = fence; ++ fence_cb->parent = rcb; ++ rcb->fence_cbs[rcb->num_fence_cbs] = fence_cb; ++ atomic_inc(&rcb->count); ++ ret = fence_add_callback(fence, &fence_cb->base, ++ reservation_cb_fence_cb); ++ if (ret == -ENOENT) { ++ /* already signaled */ ++ atomic_dec(&rcb->count); ++ fence_put(fence_cb->fence); ++ kfree(fence_cb); ++ ret = 0; ++ } else if (ret < 0) { ++ atomic_dec(&rcb->count); ++ fence_put(fence_cb->fence); ++ kfree(fence_cb); ++ return ret; ++ } else { ++ rcb->num_fence_cbs++; ++ } ++ return ret; ++} + -+ kbase_pm_policy_flags flags; -+ enum kbase_pm_policy_id id; -+}; ++void ++drm_reservation_cb_init(struct drm_reservation_cb *rcb, ++ drm_reservation_cb_func_t func, void *context) ++{ ++ INIT_WORK(&rcb->work, reservation_cb_work); ++ atomic_set(&rcb->count, 1); ++ rcb->num_fence_cbs = 0; ++ rcb->fence_cbs = NULL; ++ rcb->func = func; ++ rcb->context = context; ++} ++EXPORT_SYMBOL(drm_reservation_cb_init); + ++int ++drm_reservation_cb_add(struct drm_reservation_cb *rcb, ++ struct reservation_object *resv, bool exclusive) ++{ ++ int ret = 0; ++ struct fence *fence; ++ unsigned shared_count = 0, f; ++ struct fence **shared_fences = NULL; + -+enum kbase_pm_ca_policy_id { -+ KBASE_PM_CA_POLICY_ID_FIXED = 1, -+ KBASE_PM_CA_POLICY_ID_DEVFREQ, -+ KBASE_PM_CA_POLICY_ID_RANDOM -+}; ++ /* enum all the fences in the reservation and add callbacks */ ++ ret = reservation_object_get_fences_rcu(resv, &fence, ++ &shared_count, &shared_fences); ++ if (ret < 0) ++ return ret; + -+typedef u32 kbase_pm_ca_policy_flags; ++ if (fence) { ++ ret = reservation_cb_add_fence_cb(rcb, fence); ++ if (ret < 0) { ++ reservation_cb_cleanup(rcb); ++ goto error; ++ } ++ } + -+/** -+ * Maximum length of a CA policy names -+ */ -+#define KBASE_PM_CA_MAX_POLICY_NAME_LEN 15 ++ if (exclusive) { ++ for (f = 0; f < shared_count; f++) { ++ ret = reservation_cb_add_fence_cb(rcb, ++ shared_fences[f]); ++ if (ret < 0) { ++ reservation_cb_cleanup(rcb); ++ goto error; ++ } ++ } ++ } + -+/** -+ * struct kbase_pm_ca_policy - Core availability policy structure. -+ * -+ * Each core availability policy exposes a (static) instance of this structure -+ * which contains function pointers to the policy's methods. -+ * -+ * @name: The name of this policy -+ * @init: Function called when the policy is selected -+ * @term: Function called when the policy is unselected -+ * @get_core_mask: Function called to get the current shader core -+ * availability mask -+ * @update_core_status: Function called to update the current core status -+ * @flags: Field indicating flags for this policy -+ * @id: Field indicating an ID for this policy. This is not -+ * necessarily the same as its index in the list returned -+ * by kbase_pm_list_policies(). -+ * It is used purely for debugging. -+ */ -+struct kbase_pm_ca_policy { -+ char name[KBASE_PM_CA_MAX_POLICY_NAME_LEN + 1]; ++error: ++ if (fence) ++ fence_put(fence); ++ if (shared_fences) { ++ for (f = 0; f < shared_count; f++) ++ fence_put(shared_fences[f]); ++ kfree(shared_fences); ++ } ++ return ret; ++} ++EXPORT_SYMBOL(drm_reservation_cb_add); + -+ /** -+ * Function called when the policy is selected -+ * -+ * This should initialize the kbdev->pm.ca_policy_data structure. It -+ * should not attempt to make any changes to hardware state. -+ * -+ * It is undefined what state the cores are in when the function is -+ * called. -+ * -+ * @kbdev The kbase device structure for the device (must be a -+ * valid pointer) ++void ++drm_reservation_cb_done(struct drm_reservation_cb *rcb) ++{ ++ /* ++ * we need to decrement from initial 1 ++ * and trigger the callback in case all the ++ * fences were already triggered + */ -+ void (*init)(struct kbase_device *kbdev); ++ if (atomic_dec_and_test(&rcb->count)) { ++ /* ++ * we could call the callback here directly but in case ++ * the callback function needs to lock the same mutex ++ * as our caller it could cause a deadlock, so it is ++ * safer to call it from a worker ++ */ ++ schedule_work(&rcb->work); ++ } ++} ++EXPORT_SYMBOL(drm_reservation_cb_done); + -+ /** -+ * Function called when the policy is unselected. -+ * -+ * @kbdev The kbase device structure for the device (must be a -+ * valid pointer) -+ */ -+ void (*term)(struct kbase_device *kbdev); ++void ++drm_reservation_cb_fini(struct drm_reservation_cb *rcb) ++{ ++ /* make sure no work will be triggered */ ++ atomic_set(&rcb->count, 0); ++ cancel_work_sync(&rcb->work); ++ reservation_cb_cleanup(rcb); ++} ++EXPORT_SYMBOL(drm_reservation_cb_fini); + -+ /** -+ * Function called to get the current shader core availability mask -+ * -+ * When a change in core availability is occurring, the policy must set -+ * kbdev->pm.ca_in_transition to true. This is to indicate that -+ * reporting changes in power state cannot be optimized out, even if -+ * kbdev->pm.desired_shader_state remains unchanged. This must be done -+ * by any functions internal to the Core Availability Policy that change -+ * the return value of kbase_pm_ca_policy::get_core_mask. -+ * -+ * @kbdev The kbase device structure for the device (must be a -+ * valid pointer) -+ * -+ * Return: The current core availability mask -+ */ -+ u64 (*get_core_mask)(struct kbase_device *kbdev); ++static bool sw_fence_enable_signaling(struct fence *f) ++{ ++ return true; ++} + -+ /** -+ * Function called to update the current core status -+ * -+ * If none of the cores in core group 0 are ready or transitioning, then -+ * the policy must ensure that the next call to get_core_mask does not -+ * return 0 for all cores in core group 0. It is an error to disable -+ * core group 0 through the core availability policy. -+ * -+ * When a change in core availability has finished, the policy must set -+ * kbdev->pm.ca_in_transition to false. This is to indicate that -+ * changes in power state can once again be optimized out when -+ * kbdev->pm.desired_shader_state is unchanged. -+ * -+ * @kbdev: The kbase device structure for the device -+ * (must be a valid pointer) -+ * @cores_ready: The mask of cores currently powered and -+ * ready to run jobs -+ * @cores_transitioning: The mask of cores currently transitioning -+ * power state -+ */ -+ void (*update_core_status)(struct kbase_device *kbdev, u64 cores_ready, -+ u64 cores_transitioning); ++static const char *sw_fence_get_get_driver_name(struct fence *fence) ++{ ++ return "drm_sync_helper"; ++} + -+ kbase_pm_ca_policy_flags flags; ++static const char *sw_fence_get_timeline_name(struct fence *f) ++{ ++ return "drm_sync.sw"; ++} + -+ /** -+ * Field indicating an ID for this policy. This is not necessarily the -+ * same as its index in the list returned by kbase_pm_list_policies(). -+ * It is used purely for debugging. -+ */ -+ enum kbase_pm_ca_policy_id id; ++static const struct fence_ops sw_fence_ops = { ++ .get_driver_name = sw_fence_get_get_driver_name, ++ .get_timeline_name = sw_fence_get_timeline_name, ++ .enable_signaling = sw_fence_enable_signaling, ++ .signaled = NULL, ++ .wait = fence_default_wait, ++ .release = NULL +}; + -+#endif /* _KBASE_PM_HWACCESS_DEFS_H_ */ -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c -new file mode 100755 -index 000000000000..81322fd0dd17 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c -@@ -0,0 +1,73 @@ -+/* -+ * -+ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+ -+ -+ -+ -+/* -+ * A simple demand based power management policy -+ */ -+ -+#include -+#include -+ -+static u64 demand_get_core_mask(struct kbase_device *kbdev) ++struct fence *drm_sw_fence_new(unsigned int context, unsigned seqno) +{ -+ u64 desired = kbdev->shader_needed_bitmap | kbdev->shader_inuse_bitmap; ++ struct fence *fence; + -+ if (0 == kbdev->pm.active_count) -+ return 0; ++ fence = kzalloc(sizeof(*fence), GFP_KERNEL); ++ if (!fence) ++ return ERR_PTR(-ENOMEM); ++ fence_init(fence, ++ &sw_fence_ops, ++ &sw_fence_lock, ++ context, seqno); + -+ return desired; ++ return fence; +} -+ -+static bool demand_get_core_active(struct kbase_device *kbdev) ++EXPORT_SYMBOL(drm_sw_fence_new); +diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c +index f135b7959..286edbe1b 100644 +--- a/drivers/gpu/drm/drm_vblank.c ++++ b/drivers/gpu/drm/drm_vblank.c +@@ -1000,7 +1000,14 @@ static void send_vblank_event(struct drm_device *dev, + break; + } + trace_drm_vblank_event_delivered(e->base.file_priv, e->pipe, seq); +- drm_send_event_locked(dev, &e->base); ++ /* ++ * Use the same timestamp for any associated fence signal to avoid ++ * mismatch in timestamps for vsync & fence events triggered by the ++ * same HW event. Frameworks like SurfaceFlinger in Android expects the ++ * retire-fence timestamp to match exactly with HW vsync as it uses it ++ * for its software vsync modeling. ++ */ ++ drm_send_event_timestamp_locked(dev, &e->base, now); + } + + /** +diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c +index c940ac3aa..a19537706 100644 +--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c ++++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c +@@ -305,9 +305,8 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id) + engine->i915 = i915; + engine->gt = gt; + engine->uncore = gt->uncore; ++ engine->hw_id = engine->guc_id = info->hw_id; + engine->mmio_base = __engine_mmio_base(i915, info->mmio_bases); +- engine->hw_id = info->hw_id; +- engine->guc_id = MAKE_GUC_ID(info->class, info->instance); + + engine->class = info->class; + engine->instance = info->instance; +diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c +index 6909da1e1..942c7c187 100644 +--- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c ++++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c +@@ -213,6 +213,23 @@ static u32 guc_ctl_feature_flags(struct intel_guc *guc) + return flags; + } + ++static u32 guc_ctl_ctxinfo_flags(struct intel_guc *guc) +{ -+ if (0 == kbdev->pm.active_count && !(kbdev->shader_needed_bitmap | -+ kbdev->shader_inuse_bitmap) && !kbdev->tiler_needed_cnt -+ && !kbdev->tiler_inuse_cnt) -+ return false; ++ u32 flags = 0; + -+ return true; -+} ++ if (intel_guc_submission_is_used(guc)) { ++ u32 ctxnum, base; + -+static void demand_init(struct kbase_device *kbdev) -+{ -+ CSTD_UNUSED(kbdev); -+} ++ base = intel_guc_ggtt_offset(guc, guc->stage_desc_pool); ++ ctxnum = GUC_MAX_STAGE_DESCRIPTORS / 16; + -+static void demand_term(struct kbase_device *kbdev) -+{ -+ CSTD_UNUSED(kbdev); ++ base >>= PAGE_SHIFT; ++ flags |= (base << GUC_CTL_BASE_ADDR_SHIFT) | ++ (ctxnum << GUC_CTL_CTXNUM_IN16_SHIFT); ++ } ++ return flags; +} + -+/* -+ * The struct kbase_pm_policy structure for the demand power policy. -+ * -+ * This is the static structure that defines the demand power policy's callback -+ * and name. -+ */ -+const struct kbase_pm_policy kbase_pm_demand_policy_ops = { -+ "demand", /* name */ -+ demand_init, /* init */ -+ demand_term, /* term */ -+ demand_get_core_mask, /* get_core_mask */ -+ demand_get_core_active, /* get_core_active */ -+ 0u, /* flags */ -+ KBASE_PM_POLICY_ID_DEMAND, /* id */ -+}; -+ -+KBASE_EXPORT_TEST_API(kbase_pm_demand_policy_ops); -diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h -new file mode 100755 -index 000000000000..c0c84b6e9189 ---- /dev/null -+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h -@@ -0,0 +1,64 @@ -+/* -+ * -+ * (C) COPYRIGHT 2011-2015 ARM Limited. All rights reserved. -+ * -+ * This program is free software and is provided to you under the terms of the -+ * GNU General Public License version 2 as published by the Free Software -+ * Foundation, and any use by you of this program is subject to the terms -+ * of such GNU licence. -+ * -+ * A copy of the licence is included with the program, and can also be obtained -+ * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ + static u32 guc_ctl_log_params_flags(struct intel_guc *guc) + { + u32 offset = intel_guc_ggtt_offset(guc, guc->log.vma) >> PAGE_SHIFT; +@@ -274,6 +291,7 @@ static void guc_init_params(struct intel_guc *guc) + + BUILD_BUG_ON(sizeof(guc->params) != GUC_CTL_MAX_DWORDS * sizeof(u32)); + ++ params[GUC_CTL_CTXINFO] = guc_ctl_ctxinfo_flags(guc); + params[GUC_CTL_LOG_PARAMS] = guc_ctl_log_params_flags(guc); + params[GUC_CTL_FEATURE] = guc_ctl_feature_flags(guc); + params[GUC_CTL_DEBUG] = guc_ctl_debug_flags(guc); +diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +index 7950d28be..d44061033 100644 +--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c ++++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +@@ -10,52 +10,11 @@ + + /* + * The Additional Data Struct (ADS) has pointers for different buffers used by +- * the GuC. One single gem object contains the ADS struct itself (guc_ads) and +- * all the extra buffers indirectly linked via the ADS struct's entries. +- * +- * Layout of the ADS blob allocated for the GuC: +- * +- * +---------------------------------------+ <== base +- * | guc_ads | +- * +---------------------------------------+ +- * | guc_policies | +- * +---------------------------------------+ +- * | guc_gt_system_info | +- * +---------------------------------------+ +- * | guc_clients_info | +- * +---------------------------------------+ +- * | guc_ct_pool_entry[size] | +- * +---------------------------------------+ +- * | padding | +- * +---------------------------------------+ <== 4K aligned +- * | private data | +- * +---------------------------------------+ +- * | padding | +- * +---------------------------------------+ <== 4K aligned ++ * the GuC. One single gem object contains the ADS struct itself (guc_ads), the ++ * scheduling policies (guc_policies), a structure describing a collection of ++ * register sets (guc_mmio_reg_state) and some extra pages for the GuC to save ++ * its internal state for sleep. + */ +-struct __guc_ads_blob { +- struct guc_ads ads; +- struct guc_policies policies; +- struct guc_gt_system_info system_info; +- struct guc_clients_info clients_info; +- struct guc_ct_pool_entry ct_pool[GUC_CT_POOL_SIZE]; +-} __packed; +- +-static u32 guc_ads_private_data_size(struct intel_guc *guc) +-{ +- return PAGE_ALIGN(guc->fw.private_data_size); +-} +- +-static u32 guc_ads_private_data_offset(struct intel_guc *guc) +-{ +- return PAGE_ALIGN(sizeof(struct __guc_ads_blob)); +-} +- +-static u32 guc_ads_blob_size(struct intel_guc *guc) +-{ +- return guc_ads_private_data_offset(guc) + +- guc_ads_private_data_size(guc); +-} + + static void guc_policy_init(struct guc_policy *policy) + { +@@ -89,37 +48,26 @@ static void guc_ct_pool_entries_init(struct guc_ct_pool_entry *pool, u32 num) + memset(pool, 0, num * sizeof(*pool)); + } + +-static void guc_mapping_table_init(struct intel_gt *gt, +- struct guc_gt_system_info *system_info) +-{ +- unsigned int i, j; +- struct intel_engine_cs *engine; +- enum intel_engine_id id; +- +- /* Table must be set to invalid values for entries not used */ +- for (i = 0; i < GUC_MAX_ENGINE_CLASSES; ++i) +- for (j = 0; j < GUC_MAX_INSTANCES_PER_CLASS; ++j) +- system_info->mapping_table[i][j] = +- GUC_MAX_INSTANCES_PER_CLASS; +- +- for_each_engine(engine, gt, id) { +- u8 guc_class = engine->class; +- +- system_info->mapping_table[guc_class][engine->instance] = +- engine->instance; +- } +-} +- + /* + * The first 80 dwords of the register state context, containing the + * execlists and ppgtt registers. + */ + #define LR_HW_CONTEXT_SIZE (80 * sizeof(u32)) + ++/* The ads obj includes the struct itself and buffers passed to GuC */ ++struct __guc_ads_blob { ++ struct guc_ads ads; ++ struct guc_policies policies; ++ struct guc_mmio_reg_state reg_state; ++ struct guc_gt_system_info system_info; ++ struct guc_clients_info clients_info; ++ struct guc_ct_pool_entry ct_pool[GUC_CT_POOL_SIZE]; ++ u8 reg_state_buffer[GUC_S3_SAVE_SPACE_PAGES * PAGE_SIZE]; ++} __packed; + + static void __guc_ads_init(struct intel_guc *guc) + { + struct intel_gt *gt = guc_to_gt(guc); +- struct drm_i915_private *i915 = gt->i915; + struct __guc_ads_blob *blob = guc->ads_blob; + const u32 skipped_size = LRC_PPHWSP_SZ * PAGE_SIZE + LR_HW_CONTEXT_SIZE; + u32 base; +@@ -151,25 +99,13 @@ static void __guc_ads_init(struct intel_guc *guc) + } + + /* System info */ +- blob->system_info.engine_enabled_masks[RENDER_CLASS] = 1; +- blob->system_info.engine_enabled_masks[COPY_ENGINE_CLASS] = 1; +- blob->system_info.engine_enabled_masks[VIDEO_DECODE_CLASS] = VDBOX_MASK(gt); +- blob->system_info.engine_enabled_masks[VIDEO_ENHANCEMENT_CLASS] = VEBOX_MASK(gt); +- +- blob->system_info.generic_gt_sysinfo[GUC_GENERIC_GT_SYSINFO_SLICE_ENABLED] = +- hweight8(gt->info.sseu.slice_mask); +- blob->system_info.generic_gt_sysinfo[GUC_GENERIC_GT_SYSINFO_VDBOX_SFC_SUPPORT_MASK] = +- gt->info.vdbox_sfc_access; +- +- if (INTEL_GEN(i915) >= 12 && !IS_DGFX(i915)) { +- u32 distdbreg = intel_uncore_read(gt->uncore, +- GEN12_DIST_DBS_POPULATED); +- blob->system_info.generic_gt_sysinfo[GUC_GENERIC_GT_SYSINFO_DOORBELL_COUNT_PER_SQIDI] = +- ((distdbreg >> GEN12_DOORBELLS_PER_SQIDI_SHIFT) & +- GEN12_DOORBELLS_PER_SQIDI) + 1; +- } ++ blob->system_info.slice_enabled = hweight8(gt->info.sseu.slice_mask); ++ blob->system_info.rcs_enabled = 1; ++ blob->system_info.bcs_enabled = 1; + +- guc_mapping_table_init(guc_to_gt(guc), &blob->system_info); ++ blob->system_info.vdbox_enable_mask = VDBOX_MASK(gt); ++ blob->system_info.vebox_enable_mask = VEBOX_MASK(gt); ++ blob->system_info.vdbox_sfc_support_mask = gt->info.vdbox_sfc_access; + + base = intel_guc_ggtt_offset(guc, guc->ads_vma); + +@@ -182,12 +118,11 @@ static void __guc_ads_init(struct intel_guc *guc) + + /* ADS */ + blob->ads.scheduler_policies = base + ptr_offset(blob, policies); ++ blob->ads.reg_state_buffer = base + ptr_offset(blob, reg_state_buffer); ++ blob->ads.reg_state_addr = base + ptr_offset(blob, reg_state); + blob->ads.gt_system_info = base + ptr_offset(blob, system_info); + blob->ads.clients_info = base + ptr_offset(blob, clients_info); + +- /* Private Data */ +- blob->ads.private_data = base + guc_ads_private_data_offset(guc); +- + i915_gem_object_flush_map(guc->ads_vma->obj); + } + +@@ -200,15 +135,14 @@ static void __guc_ads_init(struct intel_guc *guc) + */ + int intel_guc_ads_create(struct intel_guc *guc) + { +- u32 size; ++ const u32 size = PAGE_ALIGN(sizeof(struct __guc_ads_blob)); + int ret; + + GEM_BUG_ON(guc->ads_vma); + +- size = guc_ads_blob_size(guc); +- + ret = intel_guc_allocate_and_map_vma(guc, size, &guc->ads_vma, + (void **)&guc->ads_blob); + + if (ret) + return ret; + +@@ -222,18 +156,6 @@ void intel_guc_ads_destroy(struct intel_guc *guc) + i915_vma_unpin_and_release(&guc->ads_vma, I915_VMA_RELEASE_MAP); + } + +-static void guc_ads_private_data_reset(struct intel_guc *guc) +-{ +- u32 size; +- +- size = guc_ads_private_data_size(guc); +- if (!size) +- return; +- +- memset((void *)guc->ads_blob + guc_ads_private_data_offset(guc), 0, +- size); +-} +- + /** + * intel_guc_ads_reset() - prepares GuC Additional Data Struct for reuse + * @guc: intel_guc struct +@@ -246,8 +168,5 @@ void intel_guc_ads_reset(struct intel_guc *guc) + { + if (!guc->ads_vma) + return; +- + __guc_ads_init(guc); +- +- guc_ads_private_data_reset(guc); + } +diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +index 79c560d9c..a6b733c14 100644 +--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h ++++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +@@ -26,8 +26,8 @@ + #define GUC_VIDEO_ENGINE2 4 + #define GUC_MAX_ENGINES_NUM (GUC_VIDEO_ENGINE2 + 1) + +-#define GUC_MAX_ENGINE_CLASSES 16 +-#define GUC_MAX_INSTANCES_PER_CLASS 32 ++#define GUC_MAX_ENGINE_CLASSES 5 ++#define GUC_MAX_INSTANCES_PER_CLASS 16 + + #define GUC_DOORBELL_INVALID 256 + +@@ -62,7 +62,12 @@ + #define GUC_STAGE_DESC_ATTR_PCH BIT(6) + #define GUC_STAGE_DESC_ATTR_TERMINATED BIT(7) + +-#define GUC_CTL_LOG_PARAMS 0 ++/* New GuC control data */ ++#define GUC_CTL_CTXINFO 0 ++#define GUC_CTL_CTXNUM_IN16_SHIFT 0 ++#define GUC_CTL_BASE_ADDR_SHIFT 12 + ++#define GUC_CTL_LOG_PARAMS 1 + #define GUC_LOG_VALID (1 << 0) + #define GUC_LOG_NOTIFY_ON_HALF_FULL (1 << 1) + #define GUC_LOG_ALLOC_IN_MEGABYTE (1 << 3) +@@ -74,11 +79,11 @@ + #define GUC_LOG_ISR_MASK (0x7 << GUC_LOG_ISR_SHIFT) + #define GUC_LOG_BUF_ADDR_SHIFT 12 + +-#define GUC_CTL_WA 1 +-#define GUC_CTL_FEATURE 2 ++#define GUC_CTL_WA 2 ++#define GUC_CTL_FEATURE 3 + #define GUC_CTL_DISABLE_SCHEDULER (1 << 14) + +-#define GUC_CTL_DEBUG 3 ++#define GUC_CTL_DEBUG 4 + #define GUC_LOG_VERBOSITY_SHIFT 0 + #define GUC_LOG_VERBOSITY_LOW (0 << GUC_LOG_VERBOSITY_SHIFT) + #define GUC_LOG_VERBOSITY_MED (1 << GUC_LOG_VERBOSITY_SHIFT) +@@ -92,37 +97,12 @@ + #define GUC_LOG_DISABLED (1 << 6) + #define GUC_PROFILE_ENABLED (1 << 7) + +-#define GUC_CTL_ADS 4 ++#define GUC_CTL_ADS 5 + #define GUC_ADS_ADDR_SHIFT 1 + #define GUC_ADS_ADDR_MASK (0xFFFFF << GUC_ADS_ADDR_SHIFT) + + #define GUC_CTL_MAX_DWORDS (SOFT_SCRATCH_COUNT - 2) /* [1..14] */ + +-/* Generic GT SysInfo data types */ +-#define GUC_GENERIC_GT_SYSINFO_SLICE_ENABLED 0 +-#define GUC_GENERIC_GT_SYSINFO_VDBOX_SFC_SUPPORT_MASK 1 +-#define GUC_GENERIC_GT_SYSINFO_DOORBELL_COUNT_PER_SQIDI 2 +-#define GUC_GENERIC_GT_SYSINFO_MAX 16 +- +-/* +- * The class goes in bits [0..2] of the GuC ID, the instance in bits [3..6]. +- * Bit 7 can be used for operations that apply to all engine classes&instances. +- */ +-#define GUC_ENGINE_CLASS_SHIFT 0 +-#define GUC_ENGINE_CLASS_MASK (0x7 << GUC_ENGINE_CLASS_SHIFT) +-#define GUC_ENGINE_INSTANCE_SHIFT 3 +-#define GUC_ENGINE_INSTANCE_MASK (0xf << GUC_ENGINE_INSTANCE_SHIFT) +-#define GUC_ENGINE_ALL_INSTANCES BIT(7) +- +-#define MAKE_GUC_ID(class, instance) \ +- (((class) << GUC_ENGINE_CLASS_SHIFT) | \ +- ((instance) << GUC_ENGINE_INSTANCE_SHIFT)) +- +-#define GUC_ID_TO_ENGINE_CLASS(guc_id) \ +- (((guc_id) & GUC_ENGINE_CLASS_MASK) >> GUC_ENGINE_CLASS_SHIFT) +-#define GUC_ID_TO_ENGINE_INSTANCE(guc_id) \ +- (((guc_id) & GUC_ENGINE_INSTANCE_MASK) >> GUC_ENGINE_INSTANCE_SHIFT) +- + /* Work item for submitting workloads into work queue of GuC. */ + struct guc_wq_item { + u32 header; +@@ -356,6 +336,11 @@ struct guc_policies { + } __packed; + + /* GuC MMIO reg state struct */ + + -+/* -+ * A simple demand based power management policy -+ */ ++#define GUC_REGSET_MAX_REGISTERS 64 ++#define GUC_S3_SAVE_SPACE_PAGES 10 + -+#ifndef MALI_KBASE_PM_DEMAND_H -+#define MALI_KBASE_PM_DEMAND_H + struct guc_mmio_reg { + u32 offset; + u32 value; +@@ -363,18 +348,28 @@ struct guc_mmio_reg { + #define GUC_REGSET_MASKED (1 << 0) + } __packed; + ++struct guc_mmio_regset { ++ struct guc_mmio_reg registers[GUC_REGSET_MAX_REGISTERS]; ++ u32 values_valid; ++ u32 number_of_registers; ++} __packed; + -+/** -+ * DOC: Demand power management policy -+ * -+ * The demand power management policy has the following characteristics: -+ * - When KBase indicates that the GPU will be powered up, but we don't yet -+ * know which Job Chains are to be run: -+ * - The Shader Cores are not powered up -+ * -+ * - When KBase indicates that a set of Shader Cores are needed to submit the -+ * currently queued Job Chains: -+ * - Only those Shader Cores are powered up -+ * -+ * - When KBase indicates that the GPU need not be powered: -+ * - The Shader Cores are powered off, and the GPU itself is powered off too. -+ * -+ * Note: -+ * - KBase indicates the GPU will be powered up when it has a User Process that -+ * has just started to submit Job Chains. + /* GuC register sets */ +-struct guc_mmio_reg_set { +- u32 address; +- u16 count; +- u16 reserved; ++struct guc_mmio_reg_state { ++ struct guc_mmio_regset engine_reg[GUC_MAX_ENGINE_CLASSES][GUC_MAX_INSTANCES_PER_CLASS]; ++ u32 reserved[98]; + } __packed; + + /* HW info */ + struct guc_gt_system_info { +- u8 mapping_table[GUC_MAX_ENGINE_CLASSES][GUC_MAX_INSTANCES_PER_CLASS]; +- u32 engine_enabled_masks[GUC_MAX_ENGINE_CLASSES]; +- u32 generic_gt_sysinfo[GUC_GENERIC_GT_SYSINFO_MAX]; ++ u32 slice_enabled; ++ u32 rcs_enabled; ++ u32 reserved0; ++ u32 bcs_enabled; ++ u32 vdbox_enable_mask; ++ u32 vdbox_sfc_support_mask; ++ u32 vebox_enable_mask; ++ u32 reserved[9]; + } __packed; + + /* Clients info */ +@@ -395,16 +390,15 @@ struct guc_clients_info { + + /* GuC Additional Data Struct */ + struct guc_ads { +- struct guc_mmio_reg_set reg_state_list[GUC_MAX_ENGINE_CLASSES][GUC_MAX_INSTANCES_PER_CLASS]; +- u32 reserved0; ++ u32 reg_state_addr; ++ u32 reg_state_buffer; + u32 scheduler_policies; + u32 gt_system_info; + u32 clients_info; + u32 control_data; + u32 golden_context_lrca[GUC_MAX_ENGINE_CLASSES]; + u32 eng_state_size[GUC_MAX_ENGINE_CLASSES]; +- u32 private_data; +- u32 reserved[15]; ++ u32 reserved[16]; + } __packed; + + /* GuC logging structures */ +diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h +index b37fc2ffa..1949346e7 100644 +--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h ++++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h +@@ -118,11 +118,6 @@ struct guc_doorbell_info { + #define GEN8_DRB_VALID (1<<0) + #define GEN8_DRBREGU(x) _MMIO(0x1000 + (x) * 8 + 4) + +-#define GEN12_DIST_DBS_POPULATED _MMIO(0xd08) +-#define GEN12_DOORBELLS_PER_SQIDI_SHIFT 16 +-#define GEN12_DOORBELLS_PER_SQIDI (0xff) +-#define GEN12_SQIDIS_DOORBELL_EXIST (0xffff) +- + #define DE_GUCRMR _MMIO(0x44054) + + #define GUC_BCS_RCS_IER _MMIO(0xC550) +diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +index ee4ac3922..80e8b6c3b 100644 +--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c ++++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +@@ -44,19 +44,23 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, + * List of required GuC and HuC binaries per-platform. + * Must be ordered based on platform + revid, from newer to older. + * ++ * TGL 35.2 is interface-compatible with 33.0 for previous Gens. The deltas ++ * between 33.0 and 35.2 are only related to new additions to support new Gen12 ++ * features. + * -+ * - KBase indicates the GPU need not be powered when all the Job Chains from -+ * User Processes have finished, and it is waiting for a User Process to -+ * submit some more Job Chains. -+ */ + * Note that RKL uses the same firmware as TGL. + */ + #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \ +- fw_def(ROCKETLAKE, 0, guc_def(tgl, 49, 0, 1), huc_def(tgl, 7, 5, 0)) \ +- fw_def(TIGERLAKE, 0, guc_def(tgl, 49, 0, 1), huc_def(tgl, 7, 5, 0)) \ +- fw_def(ELKHARTLAKE, 0, guc_def(ehl, 49, 0, 1), huc_def(ehl, 9, 0, 0)) \ +- fw_def(ICELAKE, 0, guc_def(icl, 49, 0, 1), huc_def(icl, 9, 0, 0)) \ +- fw_def(COMETLAKE, 5, guc_def(cml, 49, 0, 1), huc_def(cml, 4, 0, 0)) \ +- fw_def(COFFEELAKE, 0, guc_def(kbl, 49, 0, 1), huc_def(kbl, 4, 0, 0)) \ +- fw_def(GEMINILAKE, 0, guc_def(glk, 49, 0, 1), huc_def(glk, 4, 0, 0)) \ +- fw_def(KABYLAKE, 0, guc_def(kbl, 49, 0, 1), huc_def(kbl, 4, 0, 0)) \ +- fw_def(BROXTON, 0, guc_def(bxt, 49, 0, 1), huc_def(bxt, 2, 0, 0)) \ +- fw_def(SKYLAKE, 0, guc_def(skl, 49, 0, 1), huc_def(skl, 2, 0, 0)) ++ fw_def(ROCKETLAKE, 0, guc_def(tgl, 35, 2, 0), huc_def(tgl, 7, 5, 0)) \ ++ fw_def(TIGERLAKE, 0, guc_def(tgl, 35, 2, 0), huc_def(tgl, 7, 5, 0)) \ ++ fw_def(ELKHARTLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl, 9, 0, 0)) \ ++ fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 9, 0, 0)) \ ++ fw_def(COMETLAKE, 5, guc_def(cml, 33, 0, 0), huc_def(cml, 4, 0, 0)) \ ++ fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0, 0)) \ ++ fw_def(GEMINILAKE, 0, guc_def(glk, 33, 0, 0), huc_def(glk, 4, 0, 0)) \ ++ fw_def(KABYLAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0, 0)) \ ++ fw_def(BROXTON, 0, guc_def(bxt, 33, 0, 0), huc_def(bxt, 2, 0, 0)) \ ++ fw_def(SKYLAKE, 0, guc_def(skl, 33, 0, 0), huc_def(skl, 2, 0, 0)) + + #define __MAKE_UC_FW_PATH(prefix_, name_, major_, minor_, patch_) \ + "i915/" \ +@@ -367,9 +371,6 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw) + } + } + +- if (uc_fw->type == INTEL_UC_FW_TYPE_GUC) +- uc_fw->private_data_size = css->private_data_size; +- + obj = i915_gem_object_create_shmem_from_data(i915, fw->data, fw->size); + if (IS_ERR(obj)) { + err = PTR_ERR(obj); +diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h +index 99bb1fe1a..23d3a423a 100644 +--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h ++++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h +@@ -88,8 +88,6 @@ struct intel_uc_fw { + + u32 rsa_size; + u32 ucode_size; +- +- u32 private_data_size; + }; + + #ifdef CONFIG_DRM_I915_DEBUG_GUC +diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h +index e41ffc7a7..029214cde 100644 +--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h ++++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h +@@ -69,11 +69,7 @@ struct uc_css_header { + #define CSS_SW_VERSION_UC_MAJOR (0xFF << 16) + #define CSS_SW_VERSION_UC_MINOR (0xFF << 8) + #define CSS_SW_VERSION_UC_PATCH (0xFF << 0) +- u32 reserved0[13]; +- union { +- u32 private_data_size; /* only applies to GuC */ +- u32 reserved1; +- }; ++ u32 reserved[14]; + u32 header_info; + } __packed; + static_assert(sizeof(struct uc_css_header) == 128); +diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c +index 8e15ff95b..92ed8d456 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_drm.c ++++ b/drivers/gpu/drm/nouveau/nouveau_drm.c +@@ -563,7 +563,6 @@ nouveau_drm_device_init(struct drm_device *dev) + nvkm_dbgopt(nouveau_debug, "DRM"); + + INIT_LIST_HEAD(&drm->clients); +- mutex_init(&drm->clients_lock); + spin_lock_init(&drm->tile.lock); + + /* workaround an odd issue on nvc1 by disabling the device's +@@ -634,7 +633,6 @@ nouveau_drm_device_init(struct drm_device *dev) + static void + nouveau_drm_device_fini(struct drm_device *dev) + { +- struct nouveau_cli *cli, *temp_cli; + struct nouveau_drm *drm = nouveau_drm(dev); + + if (nouveau_pmops_runtime()) { +@@ -659,28 +657,9 @@ nouveau_drm_device_fini(struct drm_device *dev) + nouveau_ttm_fini(drm); + nouveau_vga_fini(drm); + +- /* +- * There may be existing clients from as-yet unclosed files. For now, +- * clean them up here rather than deferring until the file is closed, +- * but this likely not correct if we want to support hot-unplugging +- * properly. +- */ +- mutex_lock(&drm->clients_lock); +- list_for_each_entry_safe(cli, temp_cli, &drm->clients, head) { +- list_del(&cli->head); +- mutex_lock(&cli->mutex); +- if (cli->abi16) +- nouveau_abi16_fini(cli->abi16); +- mutex_unlock(&cli->mutex); +- nouveau_cli_fini(cli); +- kfree(cli); +- } +- mutex_unlock(&drm->clients_lock); +- + nouveau_cli_fini(&drm->client); + nouveau_cli_fini(&drm->master); + nvif_parent_dtor(&drm->parent); +- mutex_destroy(&drm->clients_lock); + kfree(drm); + } + +@@ -819,7 +798,7 @@ nouveau_drm_device_remove(struct drm_device *dev) + struct nvkm_client *client; + struct nvkm_device *device; + +- drm_dev_unplug(dev); ++ drm_dev_unregister(dev); + + dev->irq_enabled = false; + client = nvxx_client(&drm->client.base); +@@ -1113,9 +1092,9 @@ nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv) + + fpriv->driver_priv = cli; + +- mutex_lock(&drm->clients_lock); ++ mutex_lock(&drm->client.mutex); + list_add(&cli->head, &drm->clients); +- mutex_unlock(&drm->clients_lock); ++ mutex_unlock(&drm->client.mutex); + + done: + if (ret && cli) { +@@ -1133,16 +1112,6 @@ nouveau_drm_postclose(struct drm_device *dev, struct drm_file *fpriv) + { + struct nouveau_cli *cli = nouveau_cli(fpriv); + struct nouveau_drm *drm = nouveau_drm(dev); +- int dev_index; +- +- /* +- * The device is gone, and as it currently stands all clients are +- * cleaned up in the removal codepath. In the future this may change +- * so that we can support hot-unplugging, but for now we immediately +- * return to avoid a double-free situation. +- */ +- if (!drm_dev_enter(dev, &dev_index)) +- return; + + pm_runtime_get_sync(dev->dev); + +@@ -1151,15 +1120,14 @@ nouveau_drm_postclose(struct drm_device *dev, struct drm_file *fpriv) + nouveau_abi16_fini(cli->abi16); + mutex_unlock(&cli->mutex); + +- mutex_lock(&drm->clients_lock); ++ mutex_lock(&drm->client.mutex); + list_del(&cli->head); +- mutex_unlock(&drm->clients_lock); ++ mutex_unlock(&drm->client.mutex); + + nouveau_cli_fini(cli); + kfree(cli); + pm_runtime_mark_last_busy(dev->dev); + pm_runtime_put_autosuspend(dev->dev); +- drm_dev_exit(dev_index); + } + + static const struct drm_ioctl_desc +diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h +index 8b252dca0..b8025507a 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_drv.h ++++ b/drivers/gpu/drm/nouveau/nouveau_drv.h +@@ -142,11 +142,6 @@ struct nouveau_drm { + + struct list_head clients; + +- /** +- * @clients_lock: Protects access to the @clients list of &struct nouveau_cli. +- */ +- struct mutex clients_lock; +- + u8 old_pm_cap; + + struct { +diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig +index 6153972e0..b9dbedf8f 100644 +--- a/drivers/gpu/drm/panel/Kconfig ++++ b/drivers/gpu/drm/panel/Kconfig +@@ -233,7 +233,6 @@ config DRM_PANEL_OLIMEX_LCD_OLINUXINO + depends on OF + depends on I2C + depends on BACKLIGHT_CLASS_DEVICE +- select CRC32 + help + The panel is used with different sizes LCDs, from 480x272 to + 1280x800, and 24 bit per pixel. +diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +index 534dd7414..0145129d7 100644 +--- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c ++++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +@@ -590,14 +590,14 @@ static const struct drm_display_mode k101_im2byl02_default_mode = { + .clock = 69700, + + .hdisplay = 800, +- .hsync_start = 800 + 52, +- .hsync_end = 800 + 52 + 8, +- .htotal = 800 + 52 + 8 + 48, ++ .hsync_start = 800 + 6, ++ .hsync_end = 800 + 6 + 15, ++ .htotal = 800 + 6 + 15 + 16, + + .vdisplay = 1280, +- .vsync_start = 1280 + 16, +- .vsync_end = 1280 + 16 + 6, +- .vtotal = 1280 + 16 + 6 + 15, ++ .vsync_start = 1280 + 8, ++ .vsync_end = 1280 + 8 + 48, ++ .vtotal = 1280 + 8 + 48 + 52, + + .width_mm = 135, + .height_mm = 217, +diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c +index 1a87cc445..d6c0bbc03 100644 +--- a/drivers/gpu/drm/panel/panel-simple.c ++++ b/drivers/gpu/drm/panel/panel-simple.c +@@ -30,6 +30,7 @@ + #include + + #include